From 41c582e943b05324519f42e464273fffb5e19db7 Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Fri, 18 Dec 2015 12:10:42 +0000
Subject: [PATCH 001/101] Bug 1233121 - Refactor ObjectBox tracing r=terrence

---
 js/src/frontend/ParseNode.cpp   | 40 ++++++++++++++++++++-------------
 js/src/frontend/ParseNode.h     |  4 +++-
 js/src/frontend/Parser.cpp      |  2 +-
 js/src/frontend/SharedContext.h |  4 ++++
 4 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/js/src/frontend/ParseNode.cpp b/js/src/frontend/ParseNode.cpp
index 245831c077f1..3a87e2db7fd9 100644
--- a/js/src/frontend/ParseNode.cpp
+++ b/js/src/frontend/ParseNode.cpp
@@ -1162,22 +1162,32 @@ ObjectBox::asModuleBox()
     return static_cast<ModuleBox*>(this);
 }
 
+/* static */ void
+ObjectBox::TraceList(JSTracer* trc, ObjectBox* listHead)
+{
+    for (ObjectBox* box = listHead; box; box = box->traceLink)
+        box->trace(trc);
+}
+
 void
 ObjectBox::trace(JSTracer* trc)
 {
-    ObjectBox* box = this;
-    while (box) {
-        TraceRoot(trc, &box->object, "parser.object");
-        if (box->isFunctionBox()) {
-            FunctionBox* funbox = box->asFunctionBox();
-            funbox->bindings.trace(trc);
-            if (funbox->enclosingStaticScope_)
-                TraceRoot(trc, &funbox->enclosingStaticScope_, "funbox-enclosingStaticScope");
-        } else if (box->isModuleBox()) {
-            ModuleBox* modulebox = box->asModuleBox();
-            modulebox->bindings.trace(trc);
-            modulebox->exportNames.trace(trc);
-        }
-        box = box->traceLink;
-    }
+    TraceRoot(trc, &object, "parser.object");
+}
+
+void
+FunctionBox::trace(JSTracer* trc)
+{
+    ObjectBox::trace(trc);
+    bindings.trace(trc);
+    if (enclosingStaticScope_)
+        TraceRoot(trc, &enclosingStaticScope_, "funbox-enclosingStaticScope");
+}
+
+void
+ModuleBox::trace(JSTracer* trc)
+{
+    ObjectBox::trace(trc);
+    bindings.trace(trc);
+    exportNames.trace(trc);
 }
diff --git a/js/src/frontend/ParseNode.h b/js/src/frontend/ParseNode.h
index d70a0689295c..471af411a8fc 100644
--- a/js/src/frontend/ParseNode.h
+++ b/js/src/frontend/ParseNode.h
@@ -1713,7 +1713,9 @@ class ObjectBox
     FunctionBox* asFunctionBox();
     bool isModuleBox() { return object->is<ModuleObject>(); }
     ModuleBox* asModuleBox();
-    void trace(JSTracer* trc);
+    virtual void trace(JSTracer* trc);
+
+    static void TraceList(JSTracer* trc, ObjectBox* listHead);
 
   protected:
     friend struct CGObjectList;
diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp
index 248218ca861e..e1db8d057143 100644
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -852,7 +852,7 @@ template <typename ParseHandler>
 void
 Parser<ParseHandler>::trace(JSTracer* trc)
 {
-    traceListHead->trace(trc);
+    ObjectBox::TraceList(trc, traceListHead);
 }
 
 void
diff --git a/js/src/frontend/SharedContext.h b/js/src/frontend/SharedContext.h
index 1cf641180678..177e7edb4b9e 100644
--- a/js/src/frontend/SharedContext.h
+++ b/js/src/frontend/SharedContext.h
@@ -411,6 +411,8 @@ class FunctionBox : public ObjectBox, public SharedContext
                isDerivedClassConstructor() ||
                isGenerator();
     }
+
+    void trace(JSTracer* trc) override;
 };
 
 class ModuleBox : public ObjectBox, public SharedContext
@@ -426,6 +428,8 @@ class ModuleBox : public ObjectBox, public SharedContext
     ObjectBox* toObjectBox() override { return this; }
     ModuleObject* module() const { return &object->as<ModuleObject>(); }
     JSObject* staticScope() const override { return module(); }
+
+    void trace(JSTracer* trc) override;
 };
 
 inline FunctionBox*

From f0cf897a7be9e1e8f7460153c748068db3d73eaa Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Fri, 18 Dec 2015 12:11:20 +0000
Subject: [PATCH 002/101] Bug 1233124 - Remove mis-named duplicate typedefs for
 rooted import and export entries r=terrence

---
 js/src/builtin/ModuleObject.cpp | 15 ++++++---------
 js/src/builtin/ModuleObject.h   |  3 +++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/js/src/builtin/ModuleObject.cpp b/js/src/builtin/ModuleObject.cpp
index 33d4e344d580..1d2085bf77f6 100644
--- a/js/src/builtin/ModuleObject.cpp
+++ b/js/src/builtin/ModuleObject.cpp
@@ -16,9 +16,6 @@
 using namespace js;
 using namespace js::frontend;
 
-typedef JS::Rooted<ImportEntryObject*> RootedImportEntry;
-typedef JS::Rooted<ExportEntryObject*> RootedExportEntry;
-
 template<typename T, Value ValueGetter(T* obj)>
 static bool
 ModuleValueGetterImpl(JSContext* cx, const CallArgs& args)
@@ -121,7 +118,7 @@ ImportEntryObject::create(JSContext* cx,
     if (!obj)
         return nullptr;
 
-    RootedImportEntry self(cx, &obj->as<ImportEntryObject>());
+    RootedImportEntryObject self(cx, &obj->as<ImportEntryObject>());
     self->initReservedSlot(ModuleRequestSlot, StringValue(moduleRequest));
     self->initReservedSlot(ImportNameSlot, StringValue(importName));
     self->initReservedSlot(LocalNameSlot, StringValue(localName));
@@ -194,7 +191,7 @@ ExportEntryObject::create(JSContext* cx,
     if (!obj)
         return nullptr;
 
-    RootedExportEntry self(cx, &obj->as<ExportEntryObject>());
+    RootedExportEntryObject self(cx, &obj->as<ExportEntryObject>());
     self->initReservedSlot(ExportNameSlot, StringOrNullValue(maybeExportName));
     self->initReservedSlot(ModuleRequestSlot, StringOrNullValue(maybeModuleRequest));
     self->initReservedSlot(ImportNameSlot, StringOrNullValue(maybeImportName));
@@ -941,9 +938,9 @@ ModuleBuilder::buildAndInit(frontend::ParseNode* moduleNode)
     }
 
     for (const auto& e : exportEntries_) {
-        RootedExportEntry exp(cx_, e);
+        RootedExportEntryObject exp(cx_, e);
         if (!exp->moduleRequest()) {
-            RootedImportEntry importEntry(cx_, importEntryFor(exp->localName()));
+            RootedImportEntryObject importEntry(cx_, importEntryFor(exp->localName()));
             if (!importEntry) {
                 if (!appendLocalExportEntry(exp))
                     return false;
@@ -955,7 +952,7 @@ ModuleBuilder::buildAndInit(frontend::ParseNode* moduleNode)
                     RootedAtom exportName(cx_, exp->exportName());
                     RootedAtom moduleRequest(cx_, importEntry->moduleRequest());
                     RootedAtom importName(cx_, importEntry->importName());
-                    RootedExportEntry exportEntry(cx_);
+                    RootedExportEntryObject exportEntry(cx_);
                     exportEntry = ExportEntryObject::create(cx_,
                                                             exportName,
                                                             moduleRequest,
@@ -1039,7 +1036,7 @@ ModuleBuilder::processImport(frontend::ParseNode* pn)
         if (!importedBoundNames_.append(localName))
             return false;
 
-        RootedImportEntry importEntry(cx_);
+        RootedImportEntryObject importEntry(cx_);
         importEntry = ImportEntryObject::create(cx_, module, importName, localName);
         if (!importEntry || !importEntries_.append(importEntry))
             return false;
diff --git a/js/src/builtin/ModuleObject.h b/js/src/builtin/ModuleObject.h
index cdcf4e5a2a15..bd6a61dc1896 100644
--- a/js/src/builtin/ModuleObject.h
+++ b/js/src/builtin/ModuleObject.h
@@ -54,6 +54,9 @@ class ImportEntryObject : public NativeObject
     JSAtom* localName();
 };
 
+typedef Rooted<ImportEntryObject*> RootedImportEntryObject;
+typedef Handle<ImportEntryObject*> HandleImportEntryObject;
+
 class ExportEntryObject : public NativeObject
 {
   public:

From e0a0fc4ef4bde4bb6aebaf75e74ca8f2e3d52acd Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Fri, 18 Dec 2015 12:12:02 +0000
Subject: [PATCH 003/101] Bug 1225203 - Make backtracking register allocator
 spew / dump output threadsafe r=bhackett

---
 js/src/jit/BacktrackingAllocator.cpp | 107 +++++++++------------
 js/src/jit/BacktrackingAllocator.h   |  16 ++--
 js/src/jit/C1Spewer.cpp              |   2 +-
 js/src/jit/JSONSpewer.cpp            |   2 +-
 js/src/jit/LIR.cpp                   | 136 +++++++++++++--------------
 js/src/jit/LIR.h                     |   4 +-
 js/src/jit/RegisterAllocator.cpp     |  44 ++++-----
 7 files changed, 142 insertions(+), 169 deletions(-)

diff --git a/js/src/jit/BacktrackingAllocator.cpp b/js/src/jit/BacktrackingAllocator.cpp
index 0ab3682bc852..8d1ec94aae98 100644
--- a/js/src/jit/BacktrackingAllocator.cpp
+++ b/js/src/jit/BacktrackingAllocator.cpp
@@ -1229,7 +1229,7 @@ BacktrackingAllocator::processBundle(LiveBundle* bundle)
 {
     if (JitSpewEnabled(JitSpew_RegAlloc)) {
         JitSpew(JitSpew_RegAlloc, "Allocating %s [priority %lu] [weight %lu]",
-                bundle->toString(), computePriority(bundle), computeSpillWeight(bundle));
+                bundle->toString().get(), computePriority(bundle), computeSpillWeight(bundle));
     }
 
     // A bundle can be processed by doing any of the following:
@@ -1322,7 +1322,7 @@ BacktrackingAllocator::computeRequirement(LiveBundle* bundle,
             if (policy == LDefinition::FIXED) {
                 // Fixed policies get a FIXED requirement.
                 JitSpew(JitSpew_RegAlloc, "  Requirement %s, fixed by definition",
-                        reg.def()->output()->toString());
+                        reg.def()->output()->toString().get());
                 if (!requirement->merge(Requirement(*reg.def()->output())))
                     return false;
             } else if (reg.ins()->isPhi()) {
@@ -1398,7 +1398,7 @@ BacktrackingAllocator::tryAllocateRegister(PhysicalRegister& r, LiveBundle* bund
                     return false;
             } else {
                 JitSpew(JitSpew_RegAlloc, "  %s collides with fixed use %s",
-                        rAlias.reg.name(), existing->toString());
+                        rAlias.reg.name(), existing->toString().get());
                 *pfixed = true;
                 return true;
             }
@@ -1417,13 +1417,13 @@ BacktrackingAllocator::tryAllocateRegister(PhysicalRegister& r, LiveBundle* bund
             if (aliasedConflicting.length() == 1) {
                 LiveBundle* existing = aliasedConflicting[0];
                 JitSpew(JitSpew_RegAlloc, "  %s collides with %s [weight %lu]",
-                        r.reg.name(), existing->toString(), computeSpillWeight(existing));
+                        r.reg.name(), existing->toString().get(), computeSpillWeight(existing));
             } else {
                 JitSpew(JitSpew_RegAlloc, "  %s collides with the following", r.reg.name());
                 for (size_t i = 0; i < aliasedConflicting.length(); i++) {
                     LiveBundle* existing = aliasedConflicting[i];
                     JitSpew(JitSpew_RegAlloc, "      %s [weight %lu]",
-                            existing->toString(), computeSpillWeight(existing));
+                            existing->toString().get(), computeSpillWeight(existing));
                 }
             }
         }
@@ -1460,7 +1460,7 @@ BacktrackingAllocator::evictBundle(LiveBundle* bundle)
 {
     if (JitSpewEnabled(JitSpew_RegAlloc)) {
         JitSpew(JitSpew_RegAlloc, "  Evicting %s [priority %lu] [weight %lu]",
-                bundle->toString(), computePriority(bundle), computeSpillWeight(bundle));
+                bundle->toString().get(), computePriority(bundle), computeSpillWeight(bundle));
     }
 
     AnyRegister reg(bundle->allocation().toRegister());
@@ -1483,9 +1483,9 @@ BacktrackingAllocator::splitAndRequeueBundles(LiveBundle* bundle,
                                               const LiveBundleVector& newBundles)
 {
     if (JitSpewEnabled(JitSpew_RegAlloc)) {
-        JitSpew(JitSpew_RegAlloc, "    splitting bundle %s into:", bundle->toString());
+        JitSpew(JitSpew_RegAlloc, "    splitting bundle %s into:", bundle->toString().get());
         for (size_t i = 0; i < newBundles.length(); i++)
-            JitSpew(JitSpew_RegAlloc, "      %s", newBundles[i]->toString());
+            JitSpew(JitSpew_RegAlloc, "      %s", newBundles[i]->toString().get());
     }
 
     // Remove all ranges in the old bundle from their register's list.
@@ -2220,74 +2220,55 @@ BacktrackingAllocator::annotateMoveGroups()
 // Debugging methods
 /////////////////////////////////////////////////////////////////////
 
-#ifdef DEBUG
+#ifdef JS_JITSPEW
 
-const char*
+UniqueChars
 LiveRange::toString() const
 {
-    // Not reentrant!
-    static char buf[10000];
+    AutoEnterOOMUnsafeRegion oomUnsafe;
 
-    char* cursor = buf;
-    char* end = cursor + sizeof(buf);
+    char* buf = JS_smprintf("v%u [%u,%u)", hasVreg() ? vreg() : 0, from().bits(), to().bits());
 
-    uint32_t n = JS_snprintf(cursor, end - cursor, "v%u [%u,%u)",
-                        hasVreg() ? vreg() : 0, from().bits(), to().bits());
-    if (n >= uint32_t(end - cursor))
-        return "(truncated)";
-    cursor += n;
+    if (buf && bundle() && !bundle()->allocation().isBogus())
+        buf = JS_sprintf_append(buf, " %s", bundle()->allocation().toString().get());
 
-    if (bundle() && !bundle()->allocation().isBogus()) {
-        n = JS_snprintf(cursor, end - cursor, " %s", bundle()->allocation().toString());
-        if (n >= uint32_t(end - cursor))
-            return " (truncated)";
-        cursor += n;
-    }
+    if (buf && hasDefinition())
+        buf = JS_sprintf_append(buf, " (def)");
 
-    if (hasDefinition()) {
-        n = JS_snprintf(cursor, end - cursor, " (def)");
-        if (n >= uint32_t(end - cursor))
-            return " (truncated)";
-        cursor += n;
-    }
+    for (UsePositionIterator iter = usesBegin(); buf && iter; iter++)
+        buf = JS_sprintf_append(buf, " %s@%u", iter->use()->toString().get(), iter->pos.bits());
 
-    for (UsePositionIterator iter = usesBegin(); iter; iter++) {
-        n = JS_snprintf(cursor, end - cursor, " %s@%u", iter->use()->toString(), iter->pos.bits());
-        if (n >= uint32_t(end - cursor))
-            return " (truncated)";
-        cursor += n;
-    }
+    if (!buf)
+        oomUnsafe.crash("LiveRange::toString()");
 
-    return buf;
+    return UniqueChars(buf);
 }
 
-const char*
+UniqueChars
 LiveBundle::toString() const
 {
-    // Not reentrant!
-    static char buf[10000];
+    AutoEnterOOMUnsafeRegion oomUnsafe;
 
-    char* cursor = buf;
-    char* end = cursor + sizeof(buf);
+    char *buf = JS_smprintf("");
 
-    for (LiveRange::BundleLinkIterator iter = rangesBegin(); iter; iter++) {
-        uint32_t n = JS_snprintf(cursor, end - cursor, "%s %s",
-                            (iter == rangesBegin()) ? "" : " ##",
-                            LiveRange::get(*iter)->toString());
-        if (n >= uint32_t(end - cursor))
-            return "(truncated)";
-        cursor += n;
+    for (LiveRange::BundleLinkIterator iter = rangesBegin(); buf && iter; iter++) {
+        buf = JS_smprintf(buf, "%s %s",
+                          (iter == rangesBegin()) ? "" : " ##",
+                          LiveRange::get(*iter)->toString().get());
     }
 
-    return buf;
+    if (!buf)
+        oomUnsafe.crash("LiveBundle::toString()");
+
+    return UniqueChars(buf);
 }
 
-#endif // DEBUG
+#endif // JS_JITSPEW
 
 void
 BacktrackingAllocator::dumpVregs()
 {
-#ifdef DEBUG
+#ifdef JS_JITSPEW
     MOZ_ASSERT(!vregs[0u].hasRanges());
 
     fprintf(stderr, "Live ranges by virtual register:\n");
@@ -2298,7 +2279,7 @@ BacktrackingAllocator::dumpVregs()
         for (LiveRange::RegisterLinkIterator iter = reg.rangesBegin(); iter; iter++) {
             if (iter != reg.rangesBegin())
                 fprintf(stderr, " ## ");
-            fprintf(stderr, "%s", LiveRange::get(*iter)->toString());
+            fprintf(stderr, "%s", LiveRange::get(*iter)->toString().get());
         }
         fprintf(stderr, "\n");
     }
@@ -2315,7 +2296,7 @@ BacktrackingAllocator::dumpVregs()
                 for (LiveRange::BundleLinkIterator iter = bundle->rangesBegin(); iter; iter++) {
                     if (iter != bundle->rangesBegin())
                         fprintf(stderr, " ## ");
-                    fprintf(stderr, "%s", LiveRange::get(*iter)->toString());
+                    fprintf(stderr, "%s", LiveRange::get(*iter)->toString().get());
                 }
                 fprintf(stderr, "\n");
             }
@@ -2327,12 +2308,12 @@ BacktrackingAllocator::dumpVregs()
 void
 BacktrackingAllocator::dumpFixedRanges()
 {
-#ifdef DEBUG
-    fprintf(stderr, "Live ranges by physical register: %s\n", callRanges->toString());
-#endif // DEBUG
+#ifdef JS_JITSPEW
+    fprintf(stderr, "Live ranges by physical register: %s\n", callRanges->toString().get());
+#endif // JS_JITSPEW
 }
 
-#ifdef DEBUG
+#ifdef JS_JITSPEW
 struct BacktrackingAllocator::PrintLiveRange
 {
     bool& first_;
@@ -2345,7 +2326,7 @@ struct BacktrackingAllocator::PrintLiveRange
             first_ = false;
         else
             fprintf(stderr, " /");
-        fprintf(stderr, " %s", range->toString());
+        fprintf(stderr, " %s", range->toString().get());
     }
 };
 #endif
@@ -2353,7 +2334,7 @@ struct BacktrackingAllocator::PrintLiveRange
 void
 BacktrackingAllocator::dumpAllocations()
 {
-#ifdef DEBUG
+#ifdef JS_JITSPEW
     fprintf(stderr, "Allocations:\n");
 
     dumpVregs();
@@ -2370,7 +2351,7 @@ BacktrackingAllocator::dumpAllocations()
     }
 
     fprintf(stderr, "\n");
-#endif // DEBUG
+#endif // JS_JITSPEW
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -2569,7 +2550,7 @@ BacktrackingAllocator::trySplitAcrossHotcode(LiveBundle* bundle, bool* success)
         return true;
     }
 
-    JitSpew(JitSpew_RegAlloc, "  split across hot range %s", hotRange->toString());
+    JitSpew(JitSpew_RegAlloc, "  split across hot range %s", hotRange->toString().get());
 
     // Tweak the splitting method when compiling asm.js code to look at actual
     // uses within the hot/cold code. This heuristic is in place as the below
diff --git a/js/src/jit/BacktrackingAllocator.h b/js/src/jit/BacktrackingAllocator.h
index 9103f2a4531b..0a3af0f33382 100644
--- a/js/src/jit/BacktrackingAllocator.h
+++ b/js/src/jit/BacktrackingAllocator.h
@@ -344,11 +344,9 @@ class LiveRange : public TempObject
         hasDefinition_ = true;
     }
 
-    // Return a string describing this range. This is not re-entrant!
-#ifdef DEBUG
-    const char* toString() const;
-#else
-    const char* toString() const { return "???"; }
+#ifdef JS_JITSPEW
+    // Return a string describing this range.
+    UniqueChars toString() const;
 #endif
 
     // Comparator for use in range splay trees.
@@ -467,11 +465,9 @@ class LiveBundle : public TempObject
         return spillParent_;
     }
 
-    // Return a string describing this bundle. This is not re-entrant!
-#ifdef DEBUG
-    const char* toString() const;
-#else
-    const char* toString() const { return "???"; }
+#ifdef JS_JITSPEW
+    // Return a string describing this bundle.
+    UniqueChars toString() const;
 #endif
 };
 
diff --git a/js/src/jit/C1Spewer.cpp b/js/src/jit/C1Spewer.cpp
index f1df190ca224..4ab3913d8fdf 100644
--- a/js/src/jit/C1Spewer.cpp
+++ b/js/src/jit/C1Spewer.cpp
@@ -97,7 +97,7 @@ C1Spewer::spewRanges(GenericPrinter& out, BacktrackingAllocator* regalloc, LNode
         for (LiveRange::RegisterLinkIterator iter = vreg->rangesBegin(); iter; iter++) {
             LiveRange* range = LiveRange::get(*iter);
             out.printf("%d object \"", id);
-            out.printf("%s", range->bundle()->allocation().toString());
+            out.printf("%s", range->bundle()->allocation().toString().get());
             out.printf("\" %d -1", id);
             out.printf(" [%u, %u[", range->from().bits(), range->to().bits());
             for (UsePositionIterator usePos(range->usesBegin()); usePos; usePos++)
diff --git a/js/src/jit/JSONSpewer.cpp b/js/src/jit/JSONSpewer.cpp
index a3d6046453a8..39dc0a50fd81 100644
--- a/js/src/jit/JSONSpewer.cpp
+++ b/js/src/jit/JSONSpewer.cpp
@@ -371,7 +371,7 @@ JSONSpewer::spewRanges(BacktrackingAllocator* regalloc)
 
                     beginObject();
                     property("allocation");
-                    out_.printf("\"%s\"", range->bundle()->allocation().toString());
+                    out_.printf("\"%s\"", range->bundle()->allocation().toString().get());
                     integerProperty("start", range->from().bits());
                     integerProperty("end", range->to().bits());
                     endObject();
diff --git a/js/src/jit/LIR.cpp b/js/src/jit/LIR.cpp
index 6d72352abf36..a4ac19ec65f9 100644
--- a/js/src/jit/LIR.cpp
+++ b/js/src/jit/LIR.cpp
@@ -358,109 +358,107 @@ static const char * const TypeChars[] =
 #endif
 };
 
-static void
-PrintDefinition(char* buf, size_t size, const LDefinition& def)
-{
-    char* cursor = buf;
-    char* end = buf + size;
-
-    cursor += JS_snprintf(cursor, end - cursor, "v%u", def.virtualRegister());
-    cursor += JS_snprintf(cursor, end - cursor, "<%s>", TypeChars[def.type()]);
-
-    if (def.policy() == LDefinition::FIXED)
-        cursor += JS_snprintf(cursor, end - cursor, ":%s", def.output()->toString());
-    else if (def.policy() == LDefinition::MUST_REUSE_INPUT)
-        cursor += JS_snprintf(cursor, end - cursor, ":tied(%u)", def.getReusedInput());
-}
-
-const char*
+UniqueChars
 LDefinition::toString() const
 {
-    // Not reentrant!
-    static char buf[40];
+    AutoEnterOOMUnsafeRegion oomUnsafe;
 
-    if (isBogusTemp())
-        return "bogus";
+    char* buf;
+    if (isBogusTemp()) {
+        buf = JS_smprintf("bogus");
+    } else {
+        buf = JS_smprintf("v%u<%s>", virtualRegister(), TypeChars[type()]);
+        if (buf) {
+            if (policy() == LDefinition::FIXED)
+                buf = JS_sprintf_append(buf, ":%s", output()->toString().get());
+            else if (policy() == LDefinition::MUST_REUSE_INPUT)
+                buf = JS_sprintf_append(buf, ":tied(%u)", getReusedInput());
+        }
+    }
 
-    PrintDefinition(buf, sizeof(buf), *this);
-    return buf;
+    if (!buf)
+        oomUnsafe.crash("LDefinition::toString()");
+
+    return UniqueChars(buf);
 }
 
-static void
-PrintUse(char* buf, size_t size, const LUse* use)
+static char*
+PrintUse(const LUse* use)
 {
     switch (use->policy()) {
       case LUse::REGISTER:
-        JS_snprintf(buf, size, "v%d:r", use->virtualRegister());
-        break;
+        return JS_smprintf("v%d:r", use->virtualRegister());
       case LUse::FIXED:
-        JS_snprintf(buf, size, "v%d:%s", use->virtualRegister(),
-                    AnyRegister::FromCode(use->registerCode()).name());
-        break;
+        return JS_smprintf("v%d:%s", use->virtualRegister(),
+                           AnyRegister::FromCode(use->registerCode()).name());
       case LUse::ANY:
-        JS_snprintf(buf, size, "v%d:r?", use->virtualRegister());
-        break;
+        return JS_smprintf("v%d:r?", use->virtualRegister());
       case LUse::KEEPALIVE:
-        JS_snprintf(buf, size, "v%d:*", use->virtualRegister());
-        break;
+        return JS_smprintf("v%d:*", use->virtualRegister());
       case LUse::RECOVERED_INPUT:
-        JS_snprintf(buf, size, "v%d:**", use->virtualRegister());
-        break;
+        return JS_smprintf("v%d:**", use->virtualRegister());
       default:
         MOZ_CRASH("invalid use policy");
     }
 }
 
-const char*
+UniqueChars
 LAllocation::toString() const
 {
-    // Not reentrant!
-    static char buf[40];
+    AutoEnterOOMUnsafeRegion oomUnsafe;
 
-    if (isBogus())
-        return "bogus";
-
-    switch (kind()) {
-      case LAllocation::CONSTANT_VALUE:
-      case LAllocation::CONSTANT_INDEX:
-        return "c";
-      case LAllocation::GPR:
-        JS_snprintf(buf, sizeof(buf), "%s", toGeneralReg()->reg().name());
-        return buf;
-      case LAllocation::FPU:
-        JS_snprintf(buf, sizeof(buf), "%s", toFloatReg()->reg().name());
-        return buf;
-      case LAllocation::STACK_SLOT:
-        JS_snprintf(buf, sizeof(buf), "stack:%d", toStackSlot()->slot());
-        return buf;
-      case LAllocation::ARGUMENT_SLOT:
-        JS_snprintf(buf, sizeof(buf), "arg:%d", toArgument()->index());
-        return buf;
-      case LAllocation::USE:
-        PrintUse(buf, sizeof(buf), toUse());
-        return buf;
-      default:
-        MOZ_CRASH("what?");
+    char* buf;
+    if (isBogus()) {
+        buf = JS_smprintf("bogus");
+    } else {
+        switch (kind()) {
+          case LAllocation::CONSTANT_VALUE:
+          case LAllocation::CONSTANT_INDEX:
+            buf = JS_smprintf("c");
+            break;
+          case LAllocation::GPR:
+            buf = JS_smprintf("%s", toGeneralReg()->reg().name());
+            break;
+          case LAllocation::FPU:
+            buf = JS_smprintf("%s", toFloatReg()->reg().name());
+            break;
+          case LAllocation::STACK_SLOT:
+            buf = JS_smprintf("stack:%d", toStackSlot()->slot());
+            break;
+          case LAllocation::ARGUMENT_SLOT:
+            buf = JS_smprintf("arg:%d", toArgument()->index());
+            break;
+          case LAllocation::USE:
+            buf = PrintUse(toUse());
+            break;
+          default:
+            MOZ_CRASH("what?");
+        }
     }
+
+    if (!buf)
+        oomUnsafe.crash("LAllocation::toString()");
+
+    return UniqueChars(buf);
 }
 
 void
 LAllocation::dump() const
 {
-    fprintf(stderr, "%s\n", toString());
+    fprintf(stderr, "%s\n", toString().get());
 }
 
 void
 LDefinition::dump() const
 {
-    fprintf(stderr, "%s\n", toString());
+    fprintf(stderr, "%s\n", toString().get());
 }
 
 void
 LNode::printOperands(GenericPrinter& out)
 {
     for (size_t i = 0, e = numOperands(); i < e; i++) {
-        out.printf(" (%s)", getOperand(i)->toString());
+        out.printf(" (%s)", getOperand(i)->toString().get());
         if (i != numOperands() - 1)
             out.printf(",");
     }
@@ -490,7 +488,7 @@ LNode::dump(GenericPrinter& out)
     if (numDefs() != 0) {
         out.printf("{");
         for (size_t i = 0; i < numDefs(); i++) {
-            out.printf("%s", getDef(i)->toString());
+            out.printf("%s", getDef(i)->toString().get());
             if (i != numDefs() - 1)
                 out.printf(", ");
         }
@@ -503,7 +501,7 @@ LNode::dump(GenericPrinter& out)
     if (numTemps()) {
         out.printf(" t=(");
         for (size_t i = 0; i < numTemps(); i++) {
-            out.printf("%s", getTemp(i)->toString());
+            out.printf("%s", getTemp(i)->toString().get());
             if (i != numTemps() - 1)
                 out.printf(", ");
         }
@@ -599,9 +597,7 @@ LMoveGroup::printOperands(GenericPrinter& out)
 {
     for (size_t i = 0; i < numMoves(); i++) {
         const LMove& move = getMove(i);
-        // Use two printfs, as LAllocation::toString is not reentrant.
-        out.printf(" [%s", move.from().toString());
-        out.printf(" -> %s", move.to().toString());
+        out.printf(" [%s -> %s", move.from().toString().get(), move.to().toString().get());
 #ifdef DEBUG
         out.printf(", %s", TypeChars[move.type()]);
 #endif
diff --git a/js/src/jit/LIR.h b/js/src/jit/LIR.h
index b4ff10a4c629..102d7300aabd 100644
--- a/js/src/jit/LIR.h
+++ b/js/src/jit/LIR.h
@@ -183,7 +183,7 @@ class LAllocation : public TempObject
         return bits_;
     }
 
-    const char* toString() const;
+    UniqueChars toString() const;
     bool aliases(const LAllocation& other) const;
     void dump() const;
 
@@ -577,7 +577,7 @@ class LDefinition
         }
     }
 
-    const char* toString() const;
+    UniqueChars toString() const;
 
     void dump() const;
 };
diff --git a/js/src/jit/RegisterAllocator.cpp b/js/src/jit/RegisterAllocator.cpp
index 1fb9370a55ca..1dc315f0f278 100644
--- a/js/src/jit/RegisterAllocator.cpp
+++ b/js/src/jit/RegisterAllocator.cpp
@@ -291,7 +291,7 @@ AllocationIntegrityState::checkSafepointAllocation(LInstruction* ins,
       case LDefinition::OBJECT:
         if (populateSafepoints) {
             JitSpew(JitSpew_RegAlloc, "Safepoint object v%u i%u %s",
-                    vreg, ins->id(), alloc.toString());
+                    vreg, ins->id(), alloc.toString().get());
             if (!safepoint->addGcPointer(alloc))
                 return false;
         }
@@ -300,7 +300,7 @@ AllocationIntegrityState::checkSafepointAllocation(LInstruction* ins,
       case LDefinition::SLOTS:
         if (populateSafepoints) {
             JitSpew(JitSpew_RegAlloc, "Safepoint slots v%u i%u %s",
-                    vreg, ins->id(), alloc.toString());
+                    vreg, ins->id(), alloc.toString().get());
             if (!safepoint->addSlotsOrElementsPointer(alloc))
                 return false;
         }
@@ -314,7 +314,7 @@ AllocationIntegrityState::checkSafepointAllocation(LInstruction* ins,
       case LDefinition::TYPE:
         if (populateSafepoints) {
             JitSpew(JitSpew_RegAlloc, "Safepoint type v%u i%u %s",
-                    vreg, ins->id(), alloc.toString());
+                    vreg, ins->id(), alloc.toString().get());
             if (!safepoint->addNunboxType(vreg, alloc))
                 return false;
         }
@@ -322,7 +322,7 @@ AllocationIntegrityState::checkSafepointAllocation(LInstruction* ins,
       case LDefinition::PAYLOAD:
         if (populateSafepoints) {
             JitSpew(JitSpew_RegAlloc, "Safepoint payload v%u i%u %s",
-                    vreg, ins->id(), alloc.toString());
+                    vreg, ins->id(), alloc.toString().get());
             if (!safepoint->addNunboxPayload(vreg, alloc))
                 return false;
         }
@@ -332,7 +332,7 @@ AllocationIntegrityState::checkSafepointAllocation(LInstruction* ins,
       case LDefinition::BOX:
         if (populateSafepoints) {
             JitSpew(JitSpew_RegAlloc, "Safepoint boxed value v%u i%u %s",
-                    vreg, ins->id(), alloc.toString());
+                    vreg, ins->id(), alloc.toString().get());
             if (!safepoint->addBoxedValue(alloc))
                 return false;
         }
@@ -391,9 +391,9 @@ AllocationIntegrityState::dump()
             fprintf(stderr, "[%u,%u Phi] [def %s] ",
                     input.bits(),
                     output.bits(),
-                    phi->getDef(0)->toString());
+                    phi->getDef(0)->toString().get());
             for (size_t j = 0; j < phi->numOperands(); j++)
-                fprintf(stderr, " [use %s]", info.inputs[j].toString());
+                fprintf(stderr, " [use %s]", info.inputs[j].toString().get());
             fprintf(stderr, "\n");
         }
 
@@ -412,29 +412,29 @@ AllocationIntegrityState::dump()
             if (ins->isMoveGroup()) {
                 LMoveGroup* group = ins->toMoveGroup();
                 for (int i = group->numMoves() - 1; i >= 0; i--) {
-                    // Use two printfs, as LAllocation::toString is not reentrant.
-                    fprintf(stderr, " [%s", group->getMove(i).from().toString());
-                    fprintf(stderr, " -> %s]", group->getMove(i).to().toString());
+                    fprintf(stderr, " [%s -> %s]",
+                            group->getMove(i).from().toString().get(),
+                            group->getMove(i).to().toString().get());
                 }
                 fprintf(stderr, "\n");
                 continue;
             }
 
             for (size_t i = 0; i < ins->numDefs(); i++)
-                fprintf(stderr, " [def %s]", ins->getDef(i)->toString());
+                fprintf(stderr, " [def %s]", ins->getDef(i)->toString().get());
 
             for (size_t i = 0; i < ins->numTemps(); i++) {
                 LDefinition* temp = ins->getTemp(i);
                 if (!temp->isBogusTemp())
                     fprintf(stderr, " [temp v%u %s]", info.temps[i].virtualRegister(),
-                           temp->toString());
+                            temp->toString().get());
             }
 
             size_t index = 0;
             for (LInstruction::InputIterator alloc(*ins); alloc.more(); alloc.next()) {
-                fprintf(stderr, " [use %s", info.inputs[index++].toString());
+                fprintf(stderr, " [use %s", info.inputs[index++].toString().get());
                 if (!alloc->isConstant())
-                    fprintf(stderr, " %s", alloc->toString());
+                    fprintf(stderr, " %s", alloc->toString().get());
                 fprintf(stderr, "]");
             }
 
@@ -459,7 +459,7 @@ AllocationIntegrityState::dump()
         for (size_t i = 0; i < seenOrdered.length(); i++) {
             IntegrityItem item = seenOrdered[i];
             fprintf(stderr, "  block %u reg v%u alloc %s\n",
-                   item.block->mir()->id(), item.vreg, item.alloc.toString());
+                    item.block->mir()->id(), item.vreg, item.alloc.toString().get());
         }
     }
 
@@ -535,9 +535,9 @@ RegisterAllocator::dumpInstructions()
             fprintf(stderr, "[%u,%u Phi] [def %s]",
                     inputOf(phi).bits(),
                     outputOf(phi).bits(),
-                    phi->getDef(0)->toString());
+                    phi->getDef(0)->toString().get());
             for (size_t j = 0; j < phi->numOperands(); j++)
-                fprintf(stderr, " [use %s]", phi->getOperand(j)->toString());
+                fprintf(stderr, " [use %s]", phi->getOperand(j)->toString().get());
             fprintf(stderr, "\n");
         }
 
@@ -553,25 +553,25 @@ RegisterAllocator::dumpInstructions()
                 LMoveGroup* group = ins->toMoveGroup();
                 for (int i = group->numMoves() - 1; i >= 0; i--) {
                     // Use two printfs, as LAllocation::toString is not reentant.
-                    fprintf(stderr, " [%s", group->getMove(i).from().toString());
-                    fprintf(stderr, " -> %s]", group->getMove(i).to().toString());
+                    fprintf(stderr, " [%s", group->getMove(i).from().toString().get());
+                    fprintf(stderr, " -> %s]", group->getMove(i).to().toString().get());
                 }
                 fprintf(stderr, "\n");
                 continue;
             }
 
             for (size_t i = 0; i < ins->numDefs(); i++)
-                fprintf(stderr, " [def %s]", ins->getDef(i)->toString());
+                fprintf(stderr, " [def %s]", ins->getDef(i)->toString().get());
 
             for (size_t i = 0; i < ins->numTemps(); i++) {
                 LDefinition* temp = ins->getTemp(i);
                 if (!temp->isBogusTemp())
-                    fprintf(stderr, " [temp %s]", temp->toString());
+                    fprintf(stderr, " [temp %s]", temp->toString().get());
             }
 
             for (LInstruction::InputIterator alloc(*ins); alloc.more(); alloc.next()) {
                 if (!alloc->isBogus())
-                    fprintf(stderr, " [use %s]", alloc->toString());
+                    fprintf(stderr, " [use %s]", alloc->toString().get());
             }
 
             fprintf(stderr, "\n");

From 1cc56207d58e510216d2a495635fdd06ae041582 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Fri, 18 Dec 2015 15:02:50 +0200
Subject: [PATCH 004/101] Bug 1227569 - Remove unsupported OpenVMS code.
 r=mccr8

---
 config/system-headers                         |  5 ----
 modules/libpref/Preferences.cpp               |  4 +--
 toolkit/profile/nsProfileLock.cpp             | 25 -------------------
 .../exthandler/nsExternalHelperAppService.cpp |  4 +--
 xpcom/components/nsNativeModuleLoader.cpp     |  5 ----
 xpcom/io/SpecialSystemDirectory.cpp           | 18 +------------
 xpcom/io/nsLocalFileUnix.cpp                  | 19 --------------
 7 files changed, 3 insertions(+), 77 deletions(-)

diff --git a/config/system-headers b/config/system-headers
index 403fa8d95142..cde1cad17b8f 100644
--- a/config/system-headers
+++ b/config/system-headers
@@ -418,7 +418,6 @@ ExDisp.h
 exe386.h
 execinfo.h
 extras.h
-fabdef.h
 fcntl.h
 features.h
 fibdef.h
@@ -628,7 +627,6 @@ libgnome/libgnome.h
 libgnomeui/gnome-icon-lookup.h
 libgnomeui/gnome-icon-theme.h
 libgnomeui/gnome-ui-init.h
-lib$routines.h
 limits
 limits.h
 link.h
@@ -889,7 +887,6 @@ resolv.h
 Resources.h
 Retrace.h
 rld_interface.h
-rmsdef.h
 Roster.h
 rpc.h
 rpcproxy.h
@@ -927,7 +924,6 @@ someincludefile.h
 Sound.h
 soundcard.h
 sqlite3.h
-ssdef.h
 sstream
 stack
 #ifdef ANDROID
@@ -1154,7 +1150,6 @@ unikbd.h
 unistd.h
 unix.h
 unixio.h
-unixlib.h
 unknwn.h
 UPrinting.h
 UQuickTime.h
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
index 159b96ad05c0..8df6564dc37c 100644
--- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp
@@ -1270,9 +1270,7 @@ static nsresult pref_InitInitialObjects()
     "winpref.js"
 #elif defined(XP_UNIX)
     "unix.js"
-#if defined(VMS)
-    , "openvms.js"
-#elif defined(_AIX)
+#if defined(_AIX)
     , "aix.js"
 #endif
 #elif defined(XP_BEOS)
diff --git a/toolkit/profile/nsProfileLock.cpp b/toolkit/profile/nsProfileLock.cpp
index 9b26087cba33..0b4cdba6d663 100644
--- a/toolkit/profile/nsProfileLock.cpp
+++ b/toolkit/profile/nsProfileLock.cpp
@@ -30,10 +30,6 @@
 #include "prenv.h"
 #endif
 
-#ifdef VMS
-#include <rmsdef.h>
-#endif
-
 #if defined(MOZ_WIDGET_GONK) && !defined(MOZ_CRASHREPORTER)
 #include <sys/syscall.h>
 #endif
@@ -617,27 +613,6 @@ nsresult nsProfileLock::Lock(nsIFile* aProfileDir,
         }
         return NS_ERROR_FILE_ACCESS_DENIED;
     }
-#elif defined(VMS)
-    nsAutoCString filePath;
-    rv = lockFile->GetNativePath(filePath);
-    if (NS_FAILED(rv))
-        return rv;
-
-    lockFile->GetLastModifiedTime(&mReplacedLockTime);
-
-    mLockFileDesc = open_noshr(filePath.get(), O_CREAT, 0666);
-    if (mLockFileDesc == -1)
-    {
-        if ((errno == EVMSERR) && (vaxc$errno == RMS$_FLK))
-        {
-            return NS_ERROR_FILE_ACCESS_DENIED;
-        }
-        else
-        {
-            NS_ERROR("Failed to open lock file.");
-            return NS_ERROR_FAILURE;
-        }
-    }
 #endif
 
     mHaveLock = true;
diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp
index 384406690051..e44c6552ac50 100644
--- a/uriloader/exthandler/nsExternalHelperAppService.cpp
+++ b/uriloader/exthandler/nsExternalHelperAppService.cpp
@@ -552,9 +552,7 @@ struct nsExtraMimeTypeEntry {
  */
 static nsExtraMimeTypeEntry extraMimeEntries [] =
 {
-#if defined(VMS)
-  { APPLICATION_OCTET_STREAM, "exe,com,bin,sav,bck,pcsi,dcx_axpexe,dcx_vaxexe,sfx_axpexe,sfx_vaxexe", "Binary File" },
-#elif defined(XP_MACOSX) // don't define .bin on the mac...use internet config to look that up...
+#if defined(XP_MACOSX) // don't define .bin on the mac...use internet config to look that up...
   { APPLICATION_OCTET_STREAM, "exe,com", "Binary File" },
 #else
   { APPLICATION_OCTET_STREAM, "exe,com,bin", "Binary File" },
diff --git a/xpcom/components/nsNativeModuleLoader.cpp b/xpcom/components/nsNativeModuleLoader.cpp
index c632675a63b4..7c9e331e9168 100644
--- a/xpcom/components/nsNativeModuleLoader.cpp
+++ b/xpcom/components/nsNativeModuleLoader.cpp
@@ -38,11 +38,6 @@
 #include <signal.h>
 #endif
 
-#ifdef VMS
-#include <lib$routines.h>
-#include <ssdef.h>
-#endif
-
 #ifdef DEBUG
 #define IMPLEMENT_BREAK_AFTER_LOAD
 #endif
diff --git a/xpcom/io/SpecialSystemDirectory.cpp b/xpcom/io/SpecialSystemDirectory.cpp
index e26544e69f4f..b9731a5b9ecf 100644
--- a/xpcom/io/SpecialSystemDirectory.cpp
+++ b/xpcom/io/SpecialSystemDirectory.cpp
@@ -34,10 +34,6 @@ using mozilla::IsWin7OrLater;
 
 #endif
 
-#if defined(VMS)
-#include <unixlib.h>
-#endif
-
 #ifndef MAXPATHLEN
 #ifdef PATH_MAX
 #define MAXPATHLEN PATH_MAX
@@ -221,19 +217,7 @@ GetRegWindowsAppDataFolder(bool aLocal, nsIFile** aFile)
 static nsresult
 GetUnixHomeDir(nsIFile** aFile)
 {
-#ifdef VMS
-  char* pHome;
-  pHome = getenv("HOME");
-  if (*pHome == '/') {
-    return NS_NewNativeLocalFile(nsDependentCString(pHome),
-                                 true,
-                                 aFile);
-  } else {
-    return NS_NewNativeLocalFile(nsDependentCString(decc$translate_vms(pHome)),
-                                 true,
-                                 aFile);
-  }
-#elif defined(ANDROID)
+#if defined(ANDROID)
   // XXX no home dir on android; maybe we should return the sdcard if present?
   return NS_ERROR_FAILURE;
 #else
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
index 3f6eb176aa7c..ce53ce389ab5 100644
--- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp
@@ -20,9 +20,6 @@
 #include <dirent.h>
 #include <ctype.h>
 #include <locale.h>
-#if defined(VMS)
-#include <fabdef.h>
-#endif
 
 #if defined(HAVE_SYS_QUOTA_H) && defined(HAVE_LINUX_QUOTA_H)
 #define USE_LINUX_QUOTACTL
@@ -1007,11 +1004,7 @@ nsLocalFile::MoveToNative(nsIFile* aNewParent, const nsACString& aNewName)
 
   // try for atomic rename, falling back to copy/delete
   if (rename(mPath.get(), newPathName.get()) < 0) {
-#ifdef VMS
-    if (errno == EXDEV || errno == ENXIO) {
-#else
     if (errno == EXDEV) {
-#endif
       rv = CopyToNative(aNewParent, aNewName);
       if (NS_SUCCEEDED(rv)) {
         rv = Remove(true);
@@ -1231,14 +1224,6 @@ nsLocalFile::GetFileSize(int64_t* aFileSize)
   *aFileSize = 0;
   ENSURE_STAT_CACHE();
 
-#if defined(VMS)
-  /* Only two record formats can report correct file content size */
-  if ((mCachedStat.st_fab_rfm != FAB$C_STMLF) &&
-      (mCachedStat.st_fab_rfm != FAB$C_STMCR)) {
-    return NS_ERROR_FAILURE;
-  }
-#endif
-
   if (!S_ISDIR(mCachedStat.st_mode)) {
     *aFileSize = (int64_t)mCachedStat.st_size;
   }
@@ -2177,11 +2162,7 @@ nsLocalFile::RenameToNative(nsIFile* aNewParentDir, const nsACString& aNewName)
 
   // try for atomic rename
   if (rename(mPath.get(), newPathName.get()) < 0) {
-#ifdef VMS
-    if (errno == EXDEV || errno == ENXIO) {
-#else
     if (errno == EXDEV) {
-#endif
       rv = NS_ERROR_FILE_ACCESS_DENIED;
     } else {
       rv = NSRESULT_FOR_ERRNO();

From 67d3279e836447e64f97e99f564cf4a743d36998 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Fri, 18 Dec 2015 15:02:50 +0200
Subject: [PATCH 005/101] Bug 1221104 - Revoke 'midi' permission queries with
 TypeError. r=baku

According to the spec, we should reject unsupported permissions with a
TypeError. This removes the 'midi' entry entirely so that we get the expected
behaviour.
---
 dom/permission/PermissionUtils.cpp             | 3 +--
 dom/permission/Permissions.cpp                 | 2 +-
 dom/permission/tests/test_permissions_api.html | 8 ++++++--
 dom/webidl/Permissions.webidl                  | 4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/dom/permission/PermissionUtils.cpp b/dom/permission/PermissionUtils.cpp
index 47853a1c8a41..1bb1c1c0d173 100644
--- a/dom/permission/PermissionUtils.cpp
+++ b/dom/permission/PermissionUtils.cpp
@@ -13,8 +13,7 @@ const char* kPermissionTypes[] = {
   "geo",
   "desktop-notification",
   // Alias `push` to `desktop-notification`.
-  "desktop-notification",
-  "midi"
+  "desktop-notification"
 };
 
 // `-1` for the last null entry.
diff --git a/dom/permission/Permissions.cpp b/dom/permission/Permissions.cpp
index 816bbd2c2fd5..3b2ac32f1b50 100644
--- a/dom/permission/Permissions.cpp
+++ b/dom/permission/Permissions.cpp
@@ -84,8 +84,8 @@ CreatePermissionStatus(JSContext* aCx,
     case PermissionName::Push:
       return CreatePushPermissionStatus(aCx, aPermission, aWindow, aRv);
 
-    case PermissionName::Midi:
     default:
+      MOZ_ASSERT_UNREACHABLE("Unhandled type");
       aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
       return nullptr;
   }
diff --git a/dom/permission/tests/test_permissions_api.html b/dom/permission/tests/test_permissions_api.html
index bec08592d112..c936b46e91a2 100644
--- a/dom/permission/tests/test_permissions_api.html
+++ b/dom/permission/tests/test_permissions_api.html
@@ -27,7 +27,8 @@ const PERMISSIONS = [
 ];
 
 const UNSUPPORTED_PERMISSIONS = [
-  'midi',
+  'foobarbaz',  // Not in spec, for testing only.
+  'midi'
 ];
 
 function setup() {
@@ -61,7 +62,10 @@ function checkUnsupportedPermissions() {
   return Promise.all(UNSUPPORTED_PERMISSIONS.map(name => {
     return navigator.permissions.query({ name }).then(
       result => ok(false, `query should not have resolved for '${name}'`),
-      error => ok(true, `query should have rejected for '${name}'`));
+      error => {
+        is(error.name, 'TypeError',
+           `query should have thrown TypeError for '${name}'`);
+      });
   }));
 }
 
diff --git a/dom/webidl/Permissions.webidl b/dom/webidl/Permissions.webidl
index fa1f6d874a3f..776a22ff8437 100644
--- a/dom/webidl/Permissions.webidl
+++ b/dom/webidl/Permissions.webidl
@@ -10,8 +10,8 @@
 enum PermissionName {
   "geolocation",
   "notifications",
-  "push",
-  "midi"
+  "push"
+  // Unsupported: "midi"
 };
 
 dictionary PermissionDescriptor {

From e84dd12876004fa952533a18c17e6ff91d8e8a2d Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Fri, 18 Dec 2015 15:02:50 +0200
Subject: [PATCH 006/101] Bug 1221104 - Throw NS_ERROR_NOT_IMPLEMENTED instead
 of NS_ERROR_UNEXPECTED for PushPermissionDescriptor.userVisible. r=baku

This is merely for clarity. The spec does not require a TypeError to be thrown here.
---
 dom/permission/Permissions.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/permission/Permissions.cpp b/dom/permission/Permissions.cpp
index 3b2ac32f1b50..03512a22ecfc 100644
--- a/dom/permission/Permissions.cpp
+++ b/dom/permission/Permissions.cpp
@@ -56,7 +56,7 @@ CreatePushPermissionStatus(JSContext* aCx,
   }
 
   if (permission.mUserVisible) {
-    aRv.Throw(NS_ERROR_UNEXPECTED);
+    aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
     return nullptr;
   }
 

From 6dced946b9413637a0e59807214c0d30621db6f0 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Fri, 18 Dec 2015 15:02:50 +0200
Subject: [PATCH 007/101] Bug 1221106 - Let Permissions API ride the trains.
 r=baku

---
 modules/libpref/init/all.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 291084294bdc..510d1e6833c3 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -128,11 +128,7 @@ pref("dom.indexedDB.logging.profiler-marks", false);
 pref("dom.fileHandle.enabled", true);
 
 // Whether or not the Permissions API is enabled.
-#ifdef NIGHTLY_BUILD
 pref("dom.permissions.enabled", true);
-#else
-pref("dom.permissions.enabled", false);
-#endif
 
 // Whether or not selection events are enabled
 #ifdef NIGHTLY_BUILD

From ae19b61b33f5bb3539bed8460fa14cfbfce0d981 Mon Sep 17 00:00:00 2001
From: Patrick McManus <mcmanus@ducksong.com>
Date: Thu, 17 Dec 2015 17:37:53 -0500
Subject: [PATCH 008/101] Bug 513129 - Dont reuse connections after security
 prefs change r=hurley

---
 netwerk/protocol/http/nsHttpHandler.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp
index 46a6b5e1ae29..55425cc023c7 100644
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -88,6 +88,7 @@
 #define TELEMETRY_ENABLED        "toolkit.telemetry.enabled"
 #define ALLOW_EXPERIMENTS        "network.allow-experiments"
 #define SAFE_HINT_HEADER_VALUE   "safeHint.enabled"
+#define SECURITY_PREFIX          "security."
 
 #define UA_PREF(_pref) UA_PREF_PREFIX _pref
 #define HTTP_PREF(_pref) HTTP_PREF_PREFIX _pref
@@ -281,6 +282,7 @@ nsHttpHandler::Init()
         prefBranch->AddObserver(HTTP_PREF("tcp_keepalive.short_lived_connections"), this, true);
         prefBranch->AddObserver(HTTP_PREF("tcp_keepalive.long_lived_connections"), this, true);
         prefBranch->AddObserver(SAFE_HINT_HEADER_VALUE, this, true);
+        prefBranch->AddObserver(SECURITY_PREFIX, this, true);
         PrefsChanged(prefBranch, nullptr);
     }
 
@@ -920,6 +922,15 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
 #define MULTI_PREF_CHANGED(p) \
   ((pref == nullptr) || !PL_strncmp(pref, p, sizeof(p) - 1))
 
+    // If a security pref changed, lets clear our connection pool reuse
+    if (MULTI_PREF_CHANGED(SECURITY_PREFIX)) {
+        LOG(("nsHttpHandler::PrefsChanged Security Pref Changed %s\n", pref));
+        if (mConnMgr) {
+            mConnMgr->DoShiftReloadConnectionCleanup(nullptr);
+            mConnMgr->PruneDeadConnections();
+        }
+    }
+
     //
     // UA components
     //

From 7e9f2cf66ca39007960ab8e733df580718f607ee Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Fri, 18 Dec 2015 23:00:51 +0900
Subject: [PATCH 009/101] Bug 1197191 - Add .pdf and media file types to
 OpenWithProgids. r=rstrong

---
 browser/installer/windows/nsis/shared.nsh         | 1 +
 toolkit/mozapps/installer/windows/nsis/common.nsh | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/browser/installer/windows/nsis/shared.nsh b/browser/installer/windows/nsis/shared.nsh
index 9b5341a4a76c..187eb57553d0 100755
--- a/browser/installer/windows/nsis/shared.nsh
+++ b/browser/installer/windows/nsis/shared.nsh
@@ -352,6 +352,7 @@ ${EndIf}
   ${If} ${Errors}
     WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}"  "" "FirefoxHTML"
   ${EndIf}
+  WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}\OpenWithProgids" "FirefoxHTML" ""
 !macroend
 !define AddAssociationIfNoneExist "!insertmacro AddAssociationIfNoneExist"
 
diff --git a/toolkit/mozapps/installer/windows/nsis/common.nsh b/toolkit/mozapps/installer/windows/nsis/common.nsh
index efc2ae0aa05d..f5b11c6d9601 100755
--- a/toolkit/mozapps/installer/windows/nsis/common.nsh
+++ b/toolkit/mozapps/installer/windows/nsis/common.nsh
@@ -2985,10 +2985,18 @@
       Exch $R8
       Push $R7
 
+      DeleteRegValue HKCU "Software\Classes\$R9\OpenWithProgids" $R8
+      EnumRegValue $R7 HKCU "Software\Classes\$R9\OpenWithProgids" 0
+      StrCmp "$R7" "" +1 +2
+      DeleteRegKey HKCU "Software\Classes\$R9\OpenWithProgids"
       ReadRegStr $R7 HKCU "Software\Classes\$R9" ""
       StrCmp "$R7" "$R8" +1 +2
       DeleteRegKey HKCU "Software\Classes\$R9"
 
+      DeleteRegValue HKLM "Software\Classes\$R9\OpenWithProgids" $R8
+      EnumRegValue $R7 HKLM "Software\Classes\$R9\OpenWithProgids" 0
+      StrCmp "$R7" "" +1 +2
+      DeleteRegKey HKLM "Software\Classes\$R9\OpenWithProgids"
       ReadRegStr $R7 HKLM "Software\Classes\$R9" ""
       StrCmp "$R7" "$R8" +1 +2
       DeleteRegValue HKLM "Software\Classes\$R9" ""

From e68333bfabb83d283baa989809960b7797a7d6f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Pag=C3=A8s?= <j.parkouss@gmail.com>
Date: Thu, 17 Dec 2015 12:11:28 +0100
Subject: [PATCH 010/101] Bug 1229379 - use mozlog in talos. r=jmaher

--HG--
extra : commitid : CYOw9aTaJj3
extra : rebase_source : 2911bc37e4ddcd95f1c5e76af4a9cfb5a8bcf94f
---
 .../mozharness/mozilla/testing/talos.py       | 13 ++++++-
 testing/talos/requirements.txt                |  1 +
 testing/talos/talos/cmdline.py                |  6 ++--
 testing/talos/talos/config.py                 |  6 ++--
 testing/talos/talos/ffsetup.py                | 28 +++++++++------
 testing/talos/talos/output.py                 | 31 +++++++++--------
 testing/talos/talos/run_tests.py              | 23 +++++++------
 testing/talos/talos/sps_profile.py            | 34 +++++++++++--------
 .../talos/startup_test/media/media_manager.py | 11 +++---
 testing/talos/talos/talos_process.py          | 16 ++++++---
 testing/talos/talos/ttest.py                  | 17 ++++++----
 testing/talos/talos/utils.py                  | 12 ++-----
 12 files changed, 117 insertions(+), 81 deletions(-)

diff --git a/testing/mozharness/mozharness/mozilla/testing/talos.py b/testing/mozharness/mozharness/mozilla/testing/talos.py
index 77c6b117fc56..86dae3107c17 100755
--- a/testing/mozharness/mozharness/mozilla/testing/talos.py
+++ b/testing/mozharness/mozharness/mozilla/testing/talos.py
@@ -382,7 +382,18 @@ class Talos(TestingMixin, MercurialScript, BlobUploadMixin):
         output_timeout = self.config.get('talos_output_timeout', 3600)
         # run talos tests
         run_tests = os.path.join(self.talos_path, 'talos', 'run_tests.py')
-        command = [python, run_tests, '--debug'] + options
+
+        mozlog_opts = ['--log-tbpl-level=debug']
+        if not self.run_local and 'suite' in self.config:
+            fname_pattern = '%s_%%s.log' % self.config['suite']
+            mozlog_opts.append('--log-errorsummary=%s'
+                               % os.path.join(env['MOZ_UPLOAD_DIR'],
+                                              fname_pattern % 'errorsummary'))
+            mozlog_opts.append('--log-raw=%s'
+                               % os.path.join(env['MOZ_UPLOAD_DIR'],
+                                              fname_pattern % 'raw'))
+
+        command = [python, run_tests] + options + mozlog_opts
         self.return_code = self.run_command(command, cwd=self.workdir,
                                             output_timeout=output_timeout,
                                             output_parser=parser,
diff --git a/testing/talos/requirements.txt b/testing/talos/requirements.txt
index c19cb0bb9040..f378ace783dd 100644
--- a/testing/talos/requirements.txt
+++ b/testing/talos/requirements.txt
@@ -1,3 +1,4 @@
+mozlog>=3.1
 mozcrash>=0.15
 mozfile>=1.2
 mozhttpd>=0.7
diff --git a/testing/talos/talos/cmdline.py b/testing/talos/talos/cmdline.py
index 1c00fd8aba43..1ef22222bc31 100644
--- a/testing/talos/talos/cmdline.py
+++ b/testing/talos/talos/cmdline.py
@@ -5,6 +5,8 @@
 import argparse
 import os
 
+from mozlog.commandline import add_logging_group
+
 
 class _StopAction(argparse.Action):
     def __init__(self, option_strings, dest=argparse.SUPPRESS,
@@ -137,8 +139,8 @@ def create_parser(mach_interface=False):
             help="print available tests")
     add_arg('--print-suites', action=_ListSuite,
             help="list available suites")
-    add_arg('--debug', action='store_true',
-            help='show debug information')
+
+    add_logging_group(parser)
     return parser
 
 
diff --git a/testing/talos/talos/config.py b/testing/talos/talos/config.py
index 27ce7d8dc2e2..84773a471126 100644
--- a/testing/talos/talos/config.py
+++ b/testing/talos/talos/config.py
@@ -6,6 +6,8 @@ import sys
 import os
 import copy
 
+from mozlog.commandline import setup_logging
+
 from talos import utils, test
 from talos.cmdline import parse_args
 
@@ -448,12 +450,12 @@ def get_config(argv=None):
             raise ConfigurationError('No such suite: %r' % cli_opts.suite)
         argv += ['-a', ':'.join(suite_conf['tests'])]
         argv += suite_conf.get('talos_options', [])
-        # and reparse the args
-        cli_opts = parse_args(argv=argv)
+        # args needs to be reparsed now
     elif not cli_opts.activeTests:
         raise ConfigurationError('--activeTests or --suite required!')
 
     cli_opts = parse_args(argv=argv)
+    setup_logging("talos", cli_opts, {"tbpl": sys.stdout})
     config = copy.deepcopy(DEFAULTS)
     config.update(cli_opts.__dict__)
     for validate in CONF_VALIDATORS:
diff --git a/testing/talos/talos/ffsetup.py b/testing/talos/talos/ffsetup.py
index 81f34755276f..b206cfd5ff3f 100644
--- a/testing/talos/talos/ffsetup.py
+++ b/testing/talos/talos/ffsetup.py
@@ -9,16 +9,20 @@ Set up a browser environment before running a test.
 import os
 import re
 import tempfile
-import logging
 import mozfile
 from mozprocess import ProcessHandler
 from mozprofile.profile import Profile
 
+from mozlog import get_proxy_logger
+
 from talos import utils
 from talos.utils import TalosError
 from talos.sps_profile import SpsProfile
 
 
+LOG = get_proxy_logger()
+
+
 class FFSetup(object):
     """
     Initialize the browser environment before running a test.
@@ -111,30 +115,32 @@ class FFSetup(object):
         )
 
         def browser_log(line):
-            logging.debug('BROWSER_OUTPUT: %s', line)
+            LOG.process_output(browser.pid, line)
 
         browser = ProcessHandler(command_args, env=self.env,
                                  processOutputLine=browser_log)
         browser.run()
+        LOG.process_start(browser.pid, ' '.join(command_args))
         try:
-            browser.wait()
+            exit_code = browser.wait()
         except KeyboardInterrupt:
             browser.kill()
             raise
 
+        LOG.process_exit(browser.pid, exit_code)
         results_raw = '\n'.join(browser.output)
 
         if not self.PROFILE_REGEX.search(results_raw):
-            logging.info("Could not find %s in browser output",
-                         self.PROFILE_REGEX.pattern)
-            logging.info("Raw results:%s", results_raw)
+            LOG.info("Could not find %s in browser output"
+                     % self.PROFILE_REGEX.pattern)
+            LOG.info("Raw results:%s" % results_raw)
             raise TalosError("browser failed to close after being initialized")
 
     def _init_sps_profile(self):
         upload_dir = os.getenv('MOZ_UPLOAD_DIR')
         if self.test_config.get('sps_profile') and not upload_dir:
-            logging.critical("Profiling ignored because MOZ_UPLOAD_DIR was not"
-                             " set")
+            LOG.critical("Profiling ignored because MOZ_UPLOAD_DIR was not"
+                         " set")
         if upload_dir and self.test_config.get('sps_profile'):
             self.sps_profile = SpsProfile(upload_dir,
                                           self.browser_config,
@@ -147,8 +153,8 @@ class FFSetup(object):
             self.sps_profile.clean()
 
     def __enter__(self):
-        logging.info('Initialising browser for %s test...',
-                     self.test_config['name'])
+        LOG.info('Initialising browser for %s test...'
+                 % self.test_config['name'])
         self._init_env()
         self._init_profile()
         try:
@@ -157,7 +163,7 @@ class FFSetup(object):
             self.clean()
             raise
         self._init_sps_profile()
-        logging.info('Browser initialized.')
+        LOG.info('Browser initialized.')
         return self
 
     def __exit__(self, type, value, tb):
diff --git a/testing/talos/talos/output.py b/testing/talos/talos/output.py
index 04fbc4cacf3e..57a15801231b 100755
--- a/testing/talos/talos/output.py
+++ b/testing/talos/talos/output.py
@@ -7,15 +7,17 @@
 
 import filter
 import json
-import logging
 import post_file
 import time
 import utils
 
+from StringIO import StringIO
+from mozlog import get_proxy_logger
+
 # NOTE: we have a circular dependecy with output.py when we import results
 import results as TalosResults
 
-from StringIO import StringIO
+LOG = get_proxy_logger()
 
 
 def filesizeformat(bytes):
@@ -108,14 +110,14 @@ class Output(object):
     def JS_Metric(cls, val_list):
         """v8 benchmark score"""
         results = [i for i, j in val_list]
-        logging.info("javascript benchmark")
+        LOG.info("javascript benchmark")
         return sum(results)
 
     @classmethod
     def CanvasMark_Metric(cls, val_list):
         """CanvasMark benchmark score (NOTE: this is identical to JS_Metric)"""
         results = [i for i, j in val_list]
-        logging.info("CanvasMark benchmark")
+        LOG.info("CanvasMark benchmark")
         return sum(results)
 
 
@@ -150,7 +152,7 @@ class GraphserverOutput(Output):
         )
 
         for test in self.results.results:
-            logging.debug("Working with test: %s", test.name())
+            LOG.debug("Working with test: %s" % test.name())
 
             # get full name of test
             testname = test.name()
@@ -161,7 +163,7 @@ class GraphserverOutput(Output):
                 # /run_tests.py#l176
                 testname += test.extension()
 
-            logging.debug("Generating results file: %s" % test.name())
+            LOG.debug("Generating results file: %s" % test.name())
 
             # HACK: when running xperf, we upload xperf counters to the graph
             # server but we do not want to
@@ -184,7 +186,7 @@ class GraphserverOutput(Output):
                                              self.shortName(counter_type))
                     if not values:
                         # failed to collect any data for this counter
-                        logging.error(
+                        LOG.error(
                             "No results collected for: " + counterName
                         )
 # NOTE: we are not going to enforce this warning for now as this happens too
@@ -218,7 +220,7 @@ class GraphserverOutput(Output):
                     info['testname'] = counterName
 
                     # append the counter string
-                    logging.info(
+                    LOG.info(
                         "Generating results file: %s" % counterName)
                     result_strings.append(self.construct_results(vals, **info))
 
@@ -276,7 +278,7 @@ class GraphserverOutput(Output):
                 try:
                     buffer.write("%d,%.2f,%s\n" % (i, float(val), page))
                 except ValueError:
-                    logging.info(
+                    LOG.info(
                         "We expected a numeric value and recieved '%s' instead"
                         % val
                     )
@@ -292,7 +294,7 @@ class GraphserverOutput(Output):
             if line.find("RETURN\t") > -1:
                 line = line.replace("RETURN\t", "")
                 links += line + '\n'
-            logging.debug("process_Request line: %s", line)
+            LOG.debug("process_Request line: %s" % line)
         if not links:
             raise utils.TalosError("send failed, graph server says:\n%s"
                                    % post)
@@ -308,9 +310,10 @@ class GraphserverOutput(Output):
             times = 0
             msg = ""
             while times < self.retries:
-                logging.info(
-                    "Posting result %d of %d to %s://%s%s, attempt %d",
-                    index, len(results), scheme, server, path, times)
+                LOG.info(
+                    "Posting result %d of %d to %s://%s%s, attempt %d" % (
+                        index, len(results), scheme, server, path, times)
+                )
                 try:
                     links.append(self.process_Request(
                         post_file.post_multipart(server, path,
@@ -404,7 +407,7 @@ class PerfherderOutput(Output):
 
         # This is the output that treeherder expects to find when parsing the
         # log file
-        logging.info("PERFHERDER_DATA: %s" % json.dumps(results))
+        LOG.info("PERFHERDER_DATA: %s" % json.dumps(results))
         if results_scheme in ('file'):
             json.dump(results, file(results_path, 'w'), indent=2,
                       sort_keys=True)
diff --git a/testing/talos/talos/run_tests.py b/testing/talos/talos/run_tests.py
index e6e5ec326b63..cc88037271fe 100755
--- a/testing/talos/talos/run_tests.py
+++ b/testing/talos/talos/run_tests.py
@@ -5,7 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import mozversion
-import logging
 import os
 import sys
 import time
@@ -14,6 +13,8 @@ import urllib
 import utils
 import mozhttpd
 
+from mozlog import get_proxy_logger
+
 from talos.results import TalosResults
 from talos.ttest import TTest
 from talos.utils import TalosError, TalosCrash, TalosRegression
@@ -21,6 +22,7 @@ from talos.config import get_configs, ConfigurationError
 
 # directory of this file
 here = os.path.dirname(os.path.realpath(__file__))
+LOG = get_proxy_logger()
 
 
 def useBaseTestDefaults(base, tests):
@@ -67,7 +69,7 @@ def buildCommandLine(test):
 
 def setup_webserver(webserver):
     """use mozhttpd to setup a webserver"""
-    logging.info("starting webserver on %r" % webserver)
+    LOG.info("starting webserver on %r" % webserver)
 
     host, port = webserver.split(':')
     return mozhttpd.MozHttpd(host=host, port=int(port), docroot=here)
@@ -153,8 +155,8 @@ def run_tests(config, browser_config):
                                              '%a, %d %b %Y %H:%M:%S GMT')))
     else:
         date = int(time.time())
-    logging.debug("using testdate: %d", date)
-    logging.debug("actual date: %d", int(time.time()))
+    LOG.debug("using testdate: %d" % date)
+    LOG.debug("actual date: %d" % int(time.time()))
 
     # results container
     talos_results = TalosResults(title=title,
@@ -185,20 +187,20 @@ def run_tests(config, browser_config):
     try:
         # run the tests
         timer = utils.Timer()
-        logging.info("Starting test suite %s", title)
+        LOG.info("Starting test suite %s" % title)
         for test in tests:
             testname = test['name']
             testtimer = utils.Timer()
-            logging.info("Starting test %s", testname)
+            LOG.info("Starting test %s" % testname)
 
             mytest = TTest()
             talos_results.add(mytest.runTest(browser_config, test))
 
-            logging.info("Completed test %s (%s)", testname,
-                         testtimer.elapsed())
+            LOG.info("Completed test %s (%s)"
+                     % (testname,  testtimer.elapsed()))
 
     except TalosRegression:
-        logging.error("Detected a regression for %s", testname)
+        LOG.error("Detected a regression for %s" % testname)
         # by returning 1, we report an orange to buildbot
         # http://docs.buildbot.net/latest/developer/results.html
         return 1
@@ -212,7 +214,7 @@ def run_tests(config, browser_config):
     finally:
         httpd.stop()
 
-    logging.info("Completed test suite (%s)", timer.elapsed())
+    LOG.info("Completed test suite (%s)" % timer.elapsed())
 
     # output results
     if results_urls:
@@ -233,7 +235,6 @@ def main(args=sys.argv[1:]):
         config, browser_config = get_configs()
     except ConfigurationError, exc:
         sys.exit("ERROR: %s" % exc)
-    utils.startLogger('debug' if config['debug'] else 'info')
     sys.exit(run_tests(config, browser_config))
 
 
diff --git a/testing/talos/talos/sps_profile.py b/testing/talos/talos/sps_profile.py
index c48c8ea007fa..9c778007a08f 100644
--- a/testing/talos/talos/sps_profile.py
+++ b/testing/talos/talos/sps_profile.py
@@ -8,14 +8,16 @@ module to handle sps profilling.
 
 import os
 import tempfile
-import logging
 import zipfile
 import json
-
 import mozfile
 
+from mozlog import get_proxy_logger
+
 from talos.profiler import symbolication, sps
 
+LOG = get_proxy_logger()
+
 
 class SpsProfile(object):
     """
@@ -42,7 +44,7 @@ class SpsProfile(object):
             self.upload_dir,
             "profile_{0}.sps.zip".format(test_config['name'])
         )
-        logging.info("Clearing archive {0}".format(self.profile_arcname))
+        LOG.info("Clearing archive {0}".format(self.profile_arcname))
         mozfile.remove(self.profile_arcname)
 
         self.symbol_paths = {
@@ -51,11 +53,11 @@ class SpsProfile(object):
             'WINDOWS': tempfile.mkdtemp()
         }
 
-        logging.info("Activating Gecko Profiling. Temp. profile dir:"
-                     " {0}, interval: {1}, entries: {2}"
-                     .format(sps_profile_dir,
-                             sps_profile_interval,
-                             sps_profile_entries))
+        LOG.info("Activating Gecko Profiling. Temp. profile dir:"
+                 " {0}, interval: {1}, entries: {2}"
+                 .format(sps_profile_dir,
+                         sps_profile_interval,
+                         sps_profile_entries))
 
         self.profiling_info = {
             "sps_profile_interval": sps_profile_interval,
@@ -94,15 +96,17 @@ class SpsProfile(object):
             symbolicator.symbolicate_profile(profile)
             sps.save_profile(profile, profile_path)
         except MemoryError:
-            logging.exception(
+            LOG.critical(
                 "Ran out of memory while trying"
                 " to symbolicate profile {0} (cycle {1})"
-                .format(profile_path, cycle)
+                .format(profile_path, cycle),
+                exc_info=True
             )
         except Exception:
-            logging.exception("Encountered an exception during profile"
-                              " symbolication {0} (cycle {1})"
-                              .format(profile_path, cycle))
+            LOG.critical("Encountered an exception during profile"
+                         " symbolication {0} (cycle {1})"
+                         .format(profile_path, cycle),
+                         exc_info=True)
 
     def symbolicate(self, cycle):
         """
@@ -182,14 +186,14 @@ class SpsProfile(object):
                         testname,
                         cycle_name
                     )
-                logging.info(
+                LOG.info(
                     "Adding profile {0} to archive {1}"
                     .format(path_in_zip, self.profile_arcname)
                 )
                 try:
                     arc.write(profile_path, path_in_zip)
                 except Exception:
-                    logging.exception(
+                    LOG.exception(
                         "Failed to copy profile {0} as {1} to"
                         " archive {2}".format(profile_path,
                                               path_in_zip,
diff --git a/testing/talos/talos/startup_test/media/media_manager.py b/testing/talos/talos/startup_test/media/media_manager.py
index da83120f7392..a27bca29a932 100755
--- a/testing/talos/talos/startup_test/media/media_manager.py
+++ b/testing/talos/talos/startup_test/media/media_manager.py
@@ -6,11 +6,14 @@
 import sys
 import platform
 import optparse
-import logging
 import mozhttpd
 # media test utilities
 import media_utils
 
+from mozlog import get_proxy_logger
+
+LOG = get_proxy_logger()
+
 """
 MediaManager serves as entry point for running media performance tests.
 It is responsible for the following
@@ -134,9 +137,9 @@ def run_server(doc_root):
         ]
     )
 
-    logging.info("Server %s at %s:%s",
-                 httpd_server.docroot, httpd_server.host,
-                 httpd_server.port)
+    LOG.info("Server %s at %s:%s" % (httpd_server.docroot,
+                                     httpd_server.host,
+                                     httpd_server.port))
     ObjectDb.httpd_server = httpd_server
     httpd_server.start()
     return httpd_server
diff --git a/testing/talos/talos/talos_process.py b/testing/talos/talos/talos_process.py
index d70d837900af..f688bb934452 100644
--- a/testing/talos/talos/talos_process.py
+++ b/testing/talos/talos/talos_process.py
@@ -3,14 +3,17 @@
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import time
-import logging
 import psutil
 import mozcrash
 from mozprocess import ProcessHandler
 from threading import Event
 
+from mozlog import get_proxy_logger
+
 from utils import TalosError
 
+LOG = get_proxy_logger()
+
 
 class ProcessContext(object):
     """
@@ -26,7 +29,7 @@ class ProcessContext(object):
 
     def kill_process(self):
         if self.process and self.process.is_running():
-            logging.debug("Terminating %s", self.process)
+            LOG.debug("Terminating %s" % self.process)
             self.process.terminate()
             try:
                 self.process.wait(3)
@@ -43,6 +46,7 @@ class Reader(object):
         self.got_timeout = False
         self.timeout_message = ''
         self.event = event
+        self.proc = None
 
     def __call__(self, line):
         if line.find('__endTimestamp') != -1:
@@ -55,7 +59,7 @@ class Reader(object):
 
         if not (line.startswith('JavaScript error:') or
                 line.startswith('JavaScript warning:')):
-            logging.debug('BROWSER_OUTPUT: %s', line)
+            LOG.process_output(self.proc.pid, line)
             self.output.append(line)
 
 
@@ -94,7 +98,9 @@ def run_browser(command, minidump_dir, timeout=None, on_started=None,
     kwargs['processOutputLine'] = reader
     kwargs['onFinish'] = event.set
     proc = ProcessHandler(command, **kwargs)
+    reader.proc = proc
     proc.run()
+    LOG.process_start(proc.pid, ' '.join(command))
     try:
         context.process = psutil.Process(proc.pid)
         if on_started:
@@ -110,7 +116,7 @@ def run_browser(command, minidump_dir, timeout=None, on_started=None,
                 if proc.wait(1) is not None:
                     break
             if proc.poll() is None:
-                logging.info(
+                LOG.info(
                     "Browser shutdown timed out after {0} seconds, terminating"
                     " process.".format(wait_for_quit_timeout)
                 )
@@ -129,6 +135,6 @@ def run_browser(command, minidump_dir, timeout=None, on_started=None,
         "__startAfterTerminationTimestamp%d__endAfterTerminationTimestamp"
         % (int(time.time()) * 1000))
 
-    logging.info("Browser exited with error code: {0}".format(return_code))
+    LOG.process_exit(proc.pid, return_code)
     context.output = reader.output
     return context
diff --git a/testing/talos/talos/ttest.py b/testing/talos/talos/ttest.py
index 40ab51f33633..272c94a38547 100644
--- a/testing/talos/talos/ttest.py
+++ b/testing/talos/talos/ttest.py
@@ -22,13 +22,16 @@ import mozcrash
 import talosconfig
 import shutil
 import mozfile
-import logging
+
+from mozlog import get_proxy_logger
 
 from talos.utils import TalosCrash, TalosRegression
 from talos.talos_process import run_browser
 from talos.ffsetup import FFSetup
 from talos.cmanager import CounterManagement
 
+LOG = get_proxy_logger()
+
 
 class TTest(object):
     platform_type = utils.PLATFORM_TYPE
@@ -56,7 +59,7 @@ class TTest(object):
 
         """
 
-        logging.debug("operating with platform_type : %s", self.platform_type)
+        LOG.debug("operating with platform_type : %s" % self.platform_type)
         with FFSetup(browser_config, test_config) as setup:
             return self._runTest(browser_config, test_config, setup)
 
@@ -103,8 +106,8 @@ class TTest(object):
         )
 
         for i in range(test_config['cycles']):
-            logging.info("Running cycle %d/%d for %s test...",
-                         i+1, test_config['cycles'], test_config['name'])
+            LOG.info("Running cycle %d/%d for %s test..."
+                     % (i+1, test_config['cycles'], test_config['name']))
 
             # remove the browser  error file
             mozfile.remove(browser_config['error_filename'])
@@ -116,8 +119,8 @@ class TTest(object):
                     origin = os.path.join(test_config['profile_path'],
                                           keep)
                     dest = os.path.join(setup.profile_dir, keep)
-                    logging.debug("Reinstalling %s on top of %s", origin,
-                                  dest)
+                    LOG.debug("Reinstalling %s on top of %s"
+                              % (origin, dest))
                     shutil.copy(origin, dest)
 
             # Run the test
@@ -245,7 +248,7 @@ class TTest(object):
         )
         for c in test_results.all_counter_results:
             for key, value in c.items():
-                logging.debug("COUNTER %r: %s", key, value)
+                LOG.debug("COUNTER %r: %s" % (key, value))
 
         # return results
         return test_results
diff --git a/testing/talos/talos/utils.py b/testing/talos/talos/utils.py
index 56f5aed15570..e07807c75c7a 100755
--- a/testing/talos/talos/utils.py
+++ b/testing/talos/talos/utils.py
@@ -9,13 +9,15 @@ import time
 import urlparse
 import string
 import urllib
-import logging
 import json
 import re
 import platform
 
+from mozlog import get_proxy_logger
+
 # directory of this file for use with interpolatePath()
 here = os.path.dirname(os.path.realpath(__file__))
+LOG = get_proxy_logger()
 
 
 def _get_platform():
@@ -53,13 +55,6 @@ class Timer(object):
         return time.strftime("%H:%M:%S", time.gmtime(seconds))
 
 
-def startLogger(levelChoice):
-    # declare and define global logger object to send logging messages to
-    log_levels = {'debug': logging.DEBUG, 'info': logging.INFO}
-    logging.basicConfig(format='%(asctime)-15s %(levelname)s : %(message)s',
-                        level=log_levels[levelChoice])
-
-
 class TalosError(Exception):
     "Errors found while running the talos harness."
 
@@ -179,7 +174,6 @@ def GenerateBrowserCommandLine(browser_path, extra_args, profile_dir,
     if url.find('media_manager.py') != -1:
         command_args = url.split(' ')
 
-    logging.debug("command line: %s", ' '.join(command_args))
     return command_args
 
 

From b2f9b8b3afb448ee81f66c124eb3184d5e4f319e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Pag=C3=A8s?= <j.parkouss@gmail.com>
Date: Mon, 14 Dec 2015 15:15:42 +0100
Subject: [PATCH 011/101] Bug 1229379 - use mozlog test report protocol in
 talos. r=jmaher

--HG--
extra : commitid : 89i3Uz8AKrd
extra : rebase_source : 23ff3e021dcb2bbf4eea52110e219eaabb8952a9
---
 testing/talos/talos/run_tests.py | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/testing/talos/talos/run_tests.py b/testing/talos/talos/run_tests.py
index cc88037271fe..878dc24790ab 100755
--- a/testing/talos/talos/run_tests.py
+++ b/testing/talos/talos/run_tests.py
@@ -17,7 +17,7 @@ from mozlog import get_proxy_logger
 
 from talos.results import TalosResults
 from talos.ttest import TTest
-from talos.utils import TalosError, TalosCrash, TalosRegression
+from talos.utils import TalosError, TalosRegression
 from talos.config import get_configs, ConfigurationError
 
 # directory of this file
@@ -184,34 +184,36 @@ def run_tests(config, browser_config):
     httpd.start()
 
     testname = None
+    # run the tests
+    timer = utils.Timer()
+    LOG.suite_start(tests=[test['name'] for test in tests])
     try:
-        # run the tests
-        timer = utils.Timer()
-        LOG.info("Starting test suite %s" % title)
         for test in tests:
             testname = test['name']
-            testtimer = utils.Timer()
-            LOG.info("Starting test %s" % testname)
+            LOG.test_start(testname)
 
             mytest = TTest()
             talos_results.add(mytest.runTest(browser_config, test))
 
-            LOG.info("Completed test %s (%s)"
-                     % (testname,  testtimer.elapsed()))
+            LOG.test_end(testname, status='OK')
 
-    except TalosRegression:
+    except TalosRegression as exc:
         LOG.error("Detected a regression for %s" % testname)
         # by returning 1, we report an orange to buildbot
         # http://docs.buildbot.net/latest/developer/results.html
+        LOG.test_end(testname, status='FAIL', message=unicode(exc),
+                     stack=traceback.format_exc())
         return 1
-    except (TalosCrash, TalosError):
+    except Exception as exc:
         # NOTE: if we get into this condition, talos has an internal
         # problem and cannot continue
         #       this will prevent future tests from running
-        traceback.print_exception(*sys.exc_info())
+        LOG.test_end(testname, status='ERROR', message=unicode(exc),
+                     stack=traceback.format_exc())
         # indicate a failure to buildbot, turn the job red
         return 2
     finally:
+        LOG.suite_end()
         httpd.stop()
 
     LOG.info("Completed test suite (%s)" % timer.elapsed())

From eda3570f56181b30d1ec1ef72cab903b29ffb4d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Pag=C3=A8s?= <j.parkouss@gmail.com>
Date: Fri, 18 Dec 2015 12:22:55 +0100
Subject: [PATCH 012/101] Bug 1233664 - talos failure when firefox exit code is
 not detected. r=jmaher

--HG--
extra : commitid : 4fg5pDclZb3
extra : rebase_source : ea88c9a9613c37274a29662a300788e256cee1fa
---
 testing/talos/talos/talos_process.py | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/testing/talos/talos/talos_process.py b/testing/talos/talos/talos_process.py
index f688bb934452..b601240f33a3 100644
--- a/testing/talos/talos/talos_process.py
+++ b/testing/talos/talos/talos_process.py
@@ -28,15 +28,19 @@ class ProcessContext(object):
         return self.process and self.process.pid
 
     def kill_process(self):
+        """
+        Kill the process, returning the exit code or None if the process
+        is already finished.
+        """
         if self.process and self.process.is_running():
             LOG.debug("Terminating %s" % self.process)
             self.process.terminate()
             try:
-                self.process.wait(3)
+                return self.process.wait(3)
             except psutil.TimeoutExpired:
                 self.process.kill()
                 # will raise TimeoutExpired if unable to kill
-                self.process.wait(3)
+                return self.process.wait(3)
 
 
 class Reader(object):
@@ -125,8 +129,9 @@ def run_browser(command, minidump_dir, timeout=None, on_started=None,
     finally:
         # this also handle KeyboardInterrupt
         # ensure early the process is really terminated
-        context.kill_process()
-        return_code = proc.wait(1)
+        return_code = context.kill_process()
+        if return_code is None:
+            return_code = proc.wait(1)
 
     reader.output.append(
         "__startBeforeLaunchTimestamp%d__endBeforeLaunchTimestamp"
@@ -135,6 +140,9 @@ def run_browser(command, minidump_dir, timeout=None, on_started=None,
         "__startAfterTerminationTimestamp%d__endAfterTerminationTimestamp"
         % (int(time.time()) * 1000))
 
-    LOG.process_exit(proc.pid, return_code)
+    if return_code is not None:
+        LOG.process_exit(proc.pid, return_code)
+    else:
+        LOG.debug("Unable to detect exit code of the process %s." % proc.pid)
     context.output = reader.output
     return context

From 591c11db903e24dbb67dfb421db296e043cf8523 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Sun, 6 Dec 2015 07:54:29 -0500
Subject: [PATCH 013/101] Bug 1232458 - use UniquePtr<T[]> instead of
 nsAutoArrayPtr<T> in WindowsDllBlocklist.cpp; r=aklotz

---
 mozglue/build/WindowsDllBlocklist.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/mozglue/build/WindowsDllBlocklist.cpp b/mozglue/build/WindowsDllBlocklist.cpp
index de47976cc9fc..90e962502ff9 100644
--- a/mozglue/build/WindowsDllBlocklist.cpp
+++ b/mozglue/build/WindowsDllBlocklist.cpp
@@ -16,6 +16,7 @@
 #include "nsAutoPtr.h"
 
 #include "nsWindowsDllInterceptor.h"
+#include "mozilla/UniquePtrExtensions.h"
 #include "mozilla/WindowsVersion.h"
 #include "nsWindowsHelpers.h"
 
@@ -478,8 +479,8 @@ DllBlockSet::Write(HANDLE file)
   ::LeaveCriticalSection(&sLock);
 }
 
-static
-wchar_t* getFullPath (PWCHAR filePath, wchar_t* fname)
+static UniquePtr<wchar_t[]>
+getFullPath (PWCHAR filePath, wchar_t* fname)
 {
   // In Windows 8, the first parameter seems to be used for more than just the
   // path name.  For example, its numerical value can be 1.  Passing a non-valid
@@ -494,7 +495,7 @@ wchar_t* getFullPath (PWCHAR filePath, wchar_t* fname)
     return nullptr;
   }
 
-  wchar_t* full_fname = new wchar_t[pathlen+1];
+  auto full_fname = MakeUniqueFallible<wchar_t[]>(pathlen+1);
   if (!full_fname) {
     // couldn't allocate memory?
     return nullptr;
@@ -529,7 +530,7 @@ patched_LdrLoadDll (PWCHAR filePath, PULONG flags, PUNICODE_STRING moduleFileNam
 
   int len = moduleFileName->Length / 2;
   wchar_t *fname = moduleFileName->Buffer;
-  nsAutoArrayPtr<wchar_t> full_fname;
+  UniquePtr<wchar_t[]> full_fname;
 
   // The filename isn't guaranteed to be null terminated, but in practice
   // it always will be; ensure that this is so, and bail if not.
@@ -652,22 +653,22 @@ patched_LdrLoadDll (PWCHAR filePath, PULONG flags, PUNICODE_STRING moduleFileNam
       }
 
       if (info->flags & DllBlockInfo::USE_TIMESTAMP) {
-        fVersion = GetTimestamp(full_fname);
+        fVersion = GetTimestamp(full_fname.get());
         if (fVersion > info->maxVersion) {
           load_ok = true;
         }
       } else {
         DWORD zero;
-        DWORD infoSize = GetFileVersionInfoSizeW(full_fname, &zero);
+        DWORD infoSize = GetFileVersionInfoSizeW(full_fname.get(), &zero);
 
         // If we failed to get the version information, we block.
 
         if (infoSize != 0) {
-          nsAutoArrayPtr<unsigned char> infoData(new unsigned char[infoSize]);
+          auto infoData = MakeUnique<unsigned char[]>(infoSize);
           VS_FIXEDFILEINFO *vInfo;
           UINT vInfoLen;
 
-          if (GetFileVersionInfoW(full_fname, 0, infoSize, infoData) &&
+          if (GetFileVersionInfoW(full_fname.get(), 0, infoSize, infoData.get()) &&
               VerQueryValueW(infoData, L"\\", (LPVOID*) &vInfo, &vInfoLen))
           {
             fVersion =
@@ -704,7 +705,7 @@ continue_loading:
       return STATUS_DLL_NOT_FOUND;
     }
 
-    if (IsVistaOrLater() && !CheckASLR(full_fname)) {
+    if (IsVistaOrLater() && !CheckASLR(full_fname.get())) {
       printf_stderr("LdrLoadDll: Blocking load of '%s'.  XPCOM components must support ASLR.\n", dllName);
       return STATUS_DLL_NOT_FOUND;
     }

From 1df1729578060cec6c9aa36e9b51973f59c90250 Mon Sep 17 00:00:00 2001
From: Armen Zambrano Gasparnian <armenzg@mozilla.com>
Date: Fri, 18 Dec 2015 10:02:01 -0500
Subject: [PATCH 014/101] Bug 1228632 - Fix Linux 64 mochitest-other definition
 for TC jobs. DONTBUILD. r=jmaher

--HG--
extra : commitid : 88aG50jCW0u
---
 testing/taskcluster/tasks/tests/fx_linux64_mochitest_other.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/taskcluster/tasks/tests/fx_linux64_mochitest_other.yml b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_other.yml
index 884f5a870491..411df6d82453 100644
--- a/testing/taskcluster/tasks/tests/fx_linux64_mochitest_other.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_other.yml
@@ -15,7 +15,7 @@ task:
   extra:
     suite:
       name: mochitest
-      flavor: mochitest-other
+      flavor: chrome,a11y
     treeherder:
       groupName: Desktop mochitests
       groupSymbol: tc-M

From b5c707b43388da41928124f6d24b0ff960ada52f Mon Sep 17 00:00:00 2001
From: Paul Adenot <paul@paul.cx>
Date: Tue, 1 Dec 2015 11:36:28 +0100
Subject: [PATCH 015/101] Bug 1203585 - Add a comment block on how
 MediaStreamGraph switch GraphDrivers. r=jesup

--HG--
extra : commitid : CVaELpK3iU1
---
 dom/media/GraphDriver.h | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/dom/media/GraphDriver.h b/dom/media/GraphDriver.h
index 59732766355f..23ec2205c000 100644
--- a/dom/media/GraphDriver.h
+++ b/dom/media/GraphDriver.h
@@ -61,6 +61,46 @@ class OfflineClockDriver;
  * OfflineClockDriver, if the graph is offline, or a SystemClockDriver, if the
  * graph is real time.
  * A MediaStreamGraph holds an owning reference to its driver.
+ *
+ * The lifetime of drivers is a complicated affair. Here are the different
+ * scenarii that can happen:
+ *
+ * Starting a MediaStreamGraph with an AudioCallbackDriver
+ * - A new thread T is created, from the main thread.
+ * - On this thread T, cubeb is initialized if needed, and a cubeb_stream is
+ *   created and started
+ * - The thread T posts a message to the main thread to terminate itself.
+ * - The graph runs off the audio thread
+ *
+ * Starting a MediaStreamGraph with a SystemClockDriver:
+ * - A new thread T is created from the main thread.
+ * - The graph runs off this thread.
+ *
+ * Switching from a SystemClockDriver to an AudioCallbackDriver:
+ * - A new AudioCallabackDriver is created and initialized on the graph thread
+ * - At the end of the MSG iteration, the SystemClockDriver transfers its timing
+ *   info and a reference to itself to the AudioCallbackDriver. It then starts
+ *   the AudioCallbackDriver.
+ * - When the AudioCallbackDriver starts, it checks if it has been switched from
+ *   a SystemClockDriver, and if that is the case, sends a message to the main
+ *   thread to shut the SystemClockDriver thread down.
+ * - The graph now runs off an audio callback
+ *
+ * Switching from an AudioCallbackDriver to a SystemClockDriver:
+ * - A new SystemClockDriver is created, and set as mNextDriver.
+ * - At the end of the MSG iteration, the AudioCallbackDriver transfers its
+ *   timing info and a reference to itself to the SystemClockDriver. A new
+ *   SystemClockDriver is started from the current audio thread.
+ * - When starting, the SystemClockDriver checks if it has been switched from an
+ *   AudioCallbackDriver. If yes, it creates a new temporary thread to release
+ *   the cubeb_streams. This temporary thread closes the cubeb_stream, and
+ *   then dispatches a message to the main thread to be terminated.
+ * - The graph now runs off a normal thread.
+ *
+ * Two drivers cannot run at the same time for the same graph. The thread safety
+ * of the different attributes of drivers, and they access pattern is documented
+ * next to the members themselves.
+ *
  */
 class GraphDriver
 {

From 50fb8956370f620e6aa132b966332395eee7ca26 Mon Sep 17 00:00:00 2001
From: Paul Adenot <paul@paul.cx>
Date: Tue, 1 Dec 2015 11:47:31 +0100
Subject: [PATCH 016/101] Bug 1203585 - Add new methods to GraphDriver to
 assert that locks are held. r=jesup

--HG--
extra : commitid : E8XmcSExg9V
---
 dom/media/GraphDriver.cpp | 150 ++++++++++++++++++++++++--------------
 dom/media/GraphDriver.h   |  14 ++--
 2 files changed, 102 insertions(+), 62 deletions(-)

diff --git a/dom/media/GraphDriver.cpp b/dom/media/GraphDriver.cpp
index bb3e5ae09b16..ad56bb2ca846 100644
--- a/dom/media/GraphDriver.cpp
+++ b/dom/media/GraphDriver.cpp
@@ -64,9 +64,9 @@ void GraphDriver::SetGraphTime(GraphDriver* aPreviousDriver,
   mIterationStart = aLastSwitchNextIterationStart;
   mIterationEnd = aLastSwitchNextIterationEnd;
 
-  STREAM_LOG(LogLevel::Debug, ("Setting previous driver: %p (%s)", aPreviousDriver, aPreviousDriver->AsAudioCallbackDriver() ? "AudioCallbackDriver" : "SystemClockDriver"));
-  MOZ_ASSERT(!mPreviousDriver);
-  mPreviousDriver = aPreviousDriver;
+  STREAM_LOG(LogLevel::Debug, ("Setting previous driver: %p (%s)", PreviousDriver(), PreviousDriver()->AsAudioCallbackDriver() ? "AudioCallbackDriver" : "SystemClockDriver"));
+  MOZ_ASSERT(!PreviousDriver());
+  SetPreviousDriver(aPreviousDriver);
 }
 
 void GraphDriver::SwitchAtNextIteration(GraphDriver* aNextDriver)
@@ -78,23 +78,15 @@ void GraphDriver::SwitchAtNextIteration(GraphDriver* aNextDriver)
   // request to switch, since we know we will switch back to the old
   // AudioCallbackDriver when it has recovered from the device switching.
   if (aNextDriver->AsAudioCallbackDriver() &&
-      mPreviousDriver &&
-      mPreviousDriver->AsAudioCallbackDriver()->IsSwitchingDevice() &&
-      mPreviousDriver != aNextDriver) {
+      PreviousDriver() &&
+      PreviousDriver()->AsAudioCallbackDriver()->IsSwitchingDevice() &&
+      PreviousDriver() != aNextDriver) {
     return;
   }
   LIFECYCLE_LOG("Switching to new driver: %p (%s)",
       aNextDriver, aNextDriver->AsAudioCallbackDriver() ?
       "AudioCallbackDriver" : "SystemClockDriver");
-  mNextDriver = aNextDriver;
-}
-
-void GraphDriver::EnsureImmediateWakeUpLocked()
-{
-  mGraphImpl->GetMonitor().AssertCurrentThreadOwns();
-  mWaitState = WAITSTATE_WAKING_UP;
-  mGraphImpl->mGraphDriverAsleep = false; // atomic
-  mGraphImpl->GetMonitor().Notify();
+  SetNextDriver(aNextDriver);
 }
 
 GraphTime
@@ -151,6 +143,36 @@ void GraphDriver::Shutdown()
   }
 }
 
+bool GraphDriver::Switching()
+{
+  GraphImpl()->GetMonitor().AssertCurrentThreadOwns();
+  return mNextDriver || mPreviousDriver;
+}
+
+GraphDriver* GraphDriver::NextDriver()
+{
+  GraphImpl()->GetMonitor().AssertCurrentThreadOwns();
+  return mNextDriver;
+}
+
+GraphDriver* GraphDriver::PreviousDriver()
+{
+  GraphImpl()->GetMonitor().AssertCurrentThreadOwns();
+  return mPreviousDriver;
+}
+
+void GraphDriver::SetNextDriver(GraphDriver* aNextDriver)
+{
+  GraphImpl()->GetMonitor().AssertCurrentThreadOwns();
+  mNextDriver = aNextDriver;
+}
+
+void GraphDriver::SetPreviousDriver(GraphDriver* aPreviousDriver)
+{
+  GraphImpl()->GetMonitor().AssertCurrentThreadOwns();
+  mPreviousDriver = aPreviousDriver;
+}
+
 ThreadedDriver::ThreadedDriver(MediaStreamGraphImpl* aGraphImpl)
   : GraphDriver(aGraphImpl)
 { }
@@ -174,20 +196,28 @@ public:
     profiler_register_thread("MediaStreamGraph", &aLocal);
     LIFECYCLE_LOG("Starting a new system driver for graph %p\n",
                   mDriver->mGraphImpl);
-    if (mDriver->mPreviousDriver) {
+
+    GraphDriver* previousDriver = nullptr;
+    {
+      MonitorAutoLock mon(mDriver->mGraphImpl->GetMonitor());
+      previousDriver = mDriver->PreviousDriver();
+    }
+    if (previousDriver) {
       LIFECYCLE_LOG("%p releasing an AudioCallbackDriver(%p), for graph %p\n",
                     mDriver,
-                    mDriver->mPreviousDriver.get(),
+                    previousDriver,
                     mDriver->GraphImpl());
       MOZ_ASSERT(!mDriver->AsAudioCallbackDriver());
       // Stop and release the previous driver off-main-thread, but only if we're
       // not in the situation where we've fallen back to a system clock driver
       // because the osx audio stack is currently switching output device.
-      if (!mDriver->mPreviousDriver->AsAudioCallbackDriver()->IsSwitchingDevice()) {
+      if (!previousDriver->AsAudioCallbackDriver()->IsSwitchingDevice()) {
         RefPtr<AsyncCubebTask> releaseEvent =
-          new AsyncCubebTask(mDriver->mPreviousDriver->AsAudioCallbackDriver(), AsyncCubebOperation::SHUTDOWN);
-        mDriver->mPreviousDriver = nullptr;
+          new AsyncCubebTask(previousDriver->AsAudioCallbackDriver(), AsyncCubebOperation::SHUTDOWN);
         releaseEvent->Dispatch();
+
+        MonitorAutoLock mon(mDriver->mGraphImpl->GetMonitor());
+        mDriver->SetPreviousDriver(nullptr);
       }
     } else {
       MonitorAutoLock mon(mDriver->mGraphImpl->GetMonitor());
@@ -228,10 +258,10 @@ ThreadedDriver::Revive()
   // If we were switching, switch now. Otherwise, tell thread to run the main
   // loop again.
   MonitorAutoLock mon(mGraphImpl->GetMonitor());
-  if (mNextDriver) {
-    mNextDriver->SetGraphTime(this, mIterationStart, mIterationEnd);
-    mGraphImpl->SetCurrentDriver(mNextDriver);
-    mNextDriver->Start();
+  if (NextDriver()) {
+    NextDriver()->SetGraphTime(this, mIterationStart, mIterationEnd);
+    mGraphImpl->SetCurrentDriver(NextDriver());
+    NextDriver()->Start();
   } else {
     nsCOMPtr<nsIRunnable> event = new MediaStreamGraphInitThreadRunnable(this);
     mThread->Dispatch(event, NS_DISPATCH_NORMAL);
@@ -302,11 +332,12 @@ ThreadedDriver::RunThread()
 
     stillProcessing = mGraphImpl->OneIteration(nextStateComputedTime);
 
-    if (mNextDriver && stillProcessing) {
+    MonitorAutoLock lock(GraphImpl()->GetMonitor());
+    if (NextDriver() && stillProcessing) {
       STREAM_LOG(LogLevel::Debug, ("Switching to AudioCallbackDriver"));
-      mNextDriver->SetGraphTime(this, mIterationStart, mIterationEnd);
-      mGraphImpl->SetCurrentDriver(mNextDriver);
-      mNextDriver->Start();
+      NextDriver()->SetGraphTime(this, mIterationStart, mIterationEnd);
+      mGraphImpl->SetCurrentDriver(NextDriver());
+      NextDriver()->Start();
       return;
     }
   }
@@ -373,8 +404,7 @@ SystemClockDriver::WaitForNextIteration()
   mGraphImpl->mNeedAnotherIteration = false;
 }
 
-void
-SystemClockDriver::WakeUp()
+void SystemClockDriver::WakeUp()
 {
   mGraphImpl->GetMonitor().AssertCurrentThreadOwns();
   mWaitState = WAITSTATE_WAKING_UP;
@@ -568,12 +598,13 @@ AudioCallbackDriver::Init()
   } else {
     NS_WARNING("Could not create a cubeb stream for MediaStreamGraph, falling back to a SystemClockDriver");
     // Fall back to a driver using a normal thread.
-    mNextDriver = new SystemClockDriver(GraphImpl());
-    mNextDriver->SetGraphTime(this, mIterationStart, mIterationEnd);
-    mGraphImpl->SetCurrentDriver(mNextDriver);
+    MonitorAutoLock lock(GraphImpl()->GetMonitor());
+    SetNextDriver(new SystemClockDriver(GraphImpl()));
+    NextDriver()->SetGraphTime(this, mIterationStart, mIterationEnd);
+    mGraphImpl->SetCurrentDriver(NextDriver());
     DebugOnly<bool> found = mGraphImpl->RemoveMixerCallback(this);
     NS_WARN_IF_FALSE(!found, "Mixer callback not added when switching?");
-    mNextDriver->Start();
+    NextDriver()->Start();
     return;
   }
 
@@ -614,18 +645,23 @@ AudioCallbackDriver::Start()
     initEvent->Dispatch();
   } else {
     STREAM_LOG(LogLevel::Debug, ("Starting audio threads for MediaStreamGraph %p from the previous driver's thread", mGraphImpl));
-    Init();
+    {
+      MonitorAutoUnlock mon(GraphImpl()->GetMonitor());
+      Init();
+    }
 
     // Check if we need to resolve promises because the driver just got switched
     // because of a resuming AudioContext
     if (!mPromisesForOperation.IsEmpty()) {
+      // CompleteAudioContextOperations takes the lock as needed
+      MonitorAutoUnlock mon(GraphImpl()->GetMonitor());
       CompleteAudioContextOperations(AsyncCubebOperation::INIT);
     }
 
-    if (mPreviousDriver) {
+    if (PreviousDriver()) {
       nsCOMPtr<nsIRunnable> event =
-        new MediaStreamGraphShutdownThreadRunnable(mPreviousDriver);
-      mPreviousDriver = nullptr;
+        new MediaStreamGraphShutdownThreadRunnable(PreviousDriver());
+      SetPreviousDriver(nullptr);
       NS_DispatchToMainThread(event);
     }
   }
@@ -661,10 +697,10 @@ AudioCallbackDriver::Revive()
   STREAM_LOG(LogLevel::Debug, ("AudioCallbackDriver reviving."));
   // If we were switching, switch now. Otherwise, start the audio thread again.
   MonitorAutoLock mon(mGraphImpl->GetMonitor());
-  if (mNextDriver) {
-    mNextDriver->SetGraphTime(this, mIterationStart, mIterationEnd);
-    mGraphImpl->SetCurrentDriver(mNextDriver);
-    mNextDriver->Start();
+  if (NextDriver()) {
+    NextDriver()->SetGraphTime(this, mIterationStart, mIterationEnd);
+    mGraphImpl->SetCurrentDriver(NextDriver());
+    NextDriver()->Start();
   } else {
     STREAM_LOG(LogLevel::Debug, ("Starting audio threads for MediaStreamGraph %p from a new thread.", mGraphImpl));
     RefPtr<AsyncCubebTask> initEvent =
@@ -743,7 +779,7 @@ AudioCallbackDriver::OSXDeviceSwitchingWorkaround()
       // the self reference and unref the SystemClockDriver we fallen back on.
       if (GraphImpl()->CurrentDriver() == this) {
         mSelfReference.Drop(this);
-        mNextDriver = nullptr;
+        SetNextDriver(nullptr);
       } else {
         GraphImpl()->CurrentDriver()->SwitchAtNextIteration(this);
       }
@@ -853,19 +889,23 @@ AudioCallbackDriver::DataCallback(AudioDataValue* aBuffer, long aFrames)
 
   mBuffer.BufferFilled();
 
-  if (mNextDriver && stillProcessing) {
-    {
-      // If the audio stream has not been started by the previous driver or
-      // the graph itself, keep it alive.
-      MonitorAutoLock mon(mGraphImpl->GetMonitor());
-      if (!IsStarted()) {
-        return aFrames;
-      }
+  bool switching = false;
+  {
+    MonitorAutoLock mon(mGraphImpl->GetMonitor());
+    switching = !!NextDriver();
+  }
+
+  if (switching && stillProcessing) {
+    // If the audio stream has not been started by the previous driver or
+    // the graph itself, keep it alive.
+    MonitorAutoLock mon(mGraphImpl->GetMonitor());
+    if (!IsStarted()) {
+      return aFrames;
     }
     STREAM_LOG(LogLevel::Debug, ("Switching to system driver."));
-    mNextDriver->SetGraphTime(this, mIterationStart, mIterationEnd);
-    mGraphImpl->SetCurrentDriver(mNextDriver);
-    mNextDriver->Start();
+    NextDriver()->SetGraphTime(this, mIterationStart, mIterationEnd);
+    mGraphImpl->SetCurrentDriver(NextDriver());
+    NextDriver()->Start();
     // Returning less than aFrames starts the draining and eventually stops the
     // audio thread. This function will never get called again.
     return aFrames - 1;
@@ -968,7 +1008,7 @@ AudioCallbackDriver::DeviceChangedCallback() {
   STREAM_LOG(LogLevel::Error, ("Switching to SystemClockDriver during output switch"));
   mSelfReference.Take(this);
   mCallbackReceivedWhileSwitching = 0;
-  mNextDriver = new SystemClockDriver(GraphImpl());
+  SetNextDriver(new SystemClockDriver(GraphImpl()));
   mNextDriver->SetGraphTime(this, mIterationStart, mIterationEnd);
   mGraphImpl->SetCurrentDriver(mNextDriver);
   mNextDriver->Start();
diff --git a/dom/media/GraphDriver.h b/dom/media/GraphDriver.h
index 23ec2205c000..96e81ca5cf50 100644
--- a/dom/media/GraphDriver.h
+++ b/dom/media/GraphDriver.h
@@ -132,14 +132,14 @@ public:
   virtual uint32_t IterationDuration() = 0;
 
   /* Return whether we are switching or not. */
-  bool Switching() {
-    return mNextDriver || mPreviousDriver;
-  }
+  bool Switching();
 
-  GraphDriver* NextDriver()
-  {
-    return mNextDriver;
-  }
+  // Those are simply or setting the associated pointer, but assert that the
+  // lock is held.
+  GraphDriver* NextDriver();
+  GraphDriver* PreviousDriver();
+  void SetNextDriver(GraphDriver* aNextDriver);
+  void SetPreviousDriver(GraphDriver* aPreviousDriver);
 
   /**
    * If we are running a real time graph, get the current time stamp to schedule

From 2a78933e7922781c411145b1af5b2c7d9b70e7c3 Mon Sep 17 00:00:00 2001
From: Paul Adenot <paul@paul.cx>
Date: Tue, 1 Dec 2015 11:47:59 +0100
Subject: [PATCH 017/101] Bug 1203585 - Add threading assertions to GraphDriver
 switching methods. r=jesup

--HG--
extra : commitid : 6stjXK4ET1x
---
 dom/media/GraphDriver.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dom/media/GraphDriver.cpp b/dom/media/GraphDriver.cpp
index ad56bb2ca846..663a7020db92 100644
--- a/dom/media/GraphDriver.cpp
+++ b/dom/media/GraphDriver.cpp
@@ -57,6 +57,7 @@ void GraphDriver::SetGraphTime(GraphDriver* aPreviousDriver,
                                GraphTime aLastSwitchNextIterationStart,
                                GraphTime aLastSwitchNextIterationEnd)
 {
+  GraphImpl()->GetMonitor().AssertCurrentThreadOwns();
   // We set mIterationEnd here, because the first thing a driver do when it
   // does an iteration is to update graph times, so we are in fact setting
   // mIterationStart of the next iteration by setting the end of the previous
@@ -71,6 +72,7 @@ void GraphDriver::SetGraphTime(GraphDriver* aPreviousDriver,
 
 void GraphDriver::SwitchAtNextIteration(GraphDriver* aNextDriver)
 {
+  GraphImpl()->GetMonitor().AssertCurrentThreadOwns();
   // This is the situation where `mPreviousDriver` is an AudioCallbackDriver
   // that is switching device, and the graph has found the current driver is not
   // an AudioCallbackDriver, but tries to switch to a _new_ AudioCallbackDriver

From 507c38edb6feebec6b978cf22050eb3a6e8fbfcd Mon Sep 17 00:00:00 2001
From: Paul Adenot <paul@paul.cx>
Date: Tue, 1 Dec 2015 11:48:02 +0100
Subject: [PATCH 018/101] Bug 1203585 - Update the MediaStreamGraph code to
 lock properly. r=jesup

--HG--
extra : commitid : 1Z2bwSfIbnB
---
 dom/media/MediaStreamGraph.cpp | 52 +++++++++++++++++++++++++++-------
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/dom/media/MediaStreamGraph.cpp b/dom/media/MediaStreamGraph.cpp
index 868b97b0de7a..24185d544923 100644
--- a/dom/media/MediaStreamGraph.cpp
+++ b/dom/media/MediaStreamGraph.cpp
@@ -361,9 +361,15 @@ MediaStreamGraphImpl::UpdateStreamOrder()
     }
   }
 
+  bool switching = false;
+  {
+    MonitorAutoLock mon(mMonitor);
+    switching = CurrentDriver()->Switching();
+  }
+
   if (audioTrackPresent && mRealtime &&
       !CurrentDriver()->AsAudioCallbackDriver() &&
-      !CurrentDriver()->Switching()) {
+      !switching) {
     MonitorAutoLock mon(mMonitor);
     if (mLifecycleState == LIFECYCLE_RUNNING) {
       AudioCallbackDriver* driver = new AudioCallbackDriver(this);
@@ -621,8 +627,15 @@ MediaStreamGraphImpl::CreateOrDestroyAudioStreams(MediaStream* aStream)
       audioOutputStream->mLastTickWritten = 0;
       audioOutputStream->mTrackID = tracks->GetID();
 
+      bool switching = false;
+
+      {
+        MonitorAutoLock lock(mMonitor);
+        switching = CurrentDriver()->Switching();
+      }
+
       if (!CurrentDriver()->AsAudioCallbackDriver() &&
-          !CurrentDriver()->Switching()) {
+          !switching) {
         MonitorAutoLock mon(mMonitor);
         if (mLifecycleState == LIFECYCLE_RUNNING) {
           AudioCallbackDriver* driver = new AudioCallbackDriver(this);
@@ -1164,8 +1177,13 @@ MediaStreamGraphImpl::Process()
 
   // If we are switching away from an AudioCallbackDriver, we don't need the
   // mixer anymore.
+  bool switching = false;
+  {
+    MonitorAutoLock lock(mMonitor);
+    switching = CurrentDriver()->Switching();
+  }
   if (CurrentDriver()->AsAudioCallbackDriver() &&
-      CurrentDriver()->Switching()) {
+      switching) {
     bool isStarted;
     {
       MonitorAutoLock mon(mMonitor);
@@ -3023,6 +3041,16 @@ MediaStreamGraphImpl::ApplyAudioContextOperationImpl(
 
   SuspendOrResumeStreams(aOperation, aStreams);
 
+  bool switching = false;
+  GraphDriver* nextDriver = nullptr;
+  {
+    MonitorAutoLock lock(mMonitor);
+    switching = CurrentDriver()->Switching();
+    if (switching) {
+      nextDriver = CurrentDriver()->NextDriver();
+    }
+  }
+
   // If we have suspended the last AudioContext, and we don't have other
   // streams that have audio, this graph will automatically switch to a
   // SystemCallbackDriver, because it can't find a MediaStream that has an audio
@@ -3032,12 +3060,13 @@ MediaStreamGraphImpl::ApplyAudioContextOperationImpl(
   if (aOperation == AudioContextOperation::Resume) {
     if (!CurrentDriver()->AsAudioCallbackDriver()) {
       AudioCallbackDriver* driver;
-      if (CurrentDriver()->Switching()) {
-        MOZ_ASSERT(CurrentDriver()->NextDriver()->AsAudioCallbackDriver());
-        driver = CurrentDriver()->NextDriver()->AsAudioCallbackDriver();
+      if (switching) {
+        MOZ_ASSERT(nextDriver->AsAudioCallbackDriver());
+        driver = nextDriver->AsAudioCallbackDriver();
       } else {
         driver = new AudioCallbackDriver(this);
         mMixer.AddCallback(driver);
+        MonitorAutoLock lock(mMonitor);
         CurrentDriver()->SwitchAtNextIteration(driver);
       }
       driver->EnqueueStreamAndPromiseForOperation(aDestinationStream,
@@ -3071,19 +3100,20 @@ MediaStreamGraphImpl::ApplyAudioContextOperationImpl(
                                             aOperation);
 
       SystemClockDriver* driver;
-      if (CurrentDriver()->NextDriver()) {
-        MOZ_ASSERT(!CurrentDriver()->NextDriver()->AsAudioCallbackDriver());
+      if (nextDriver) {
+        MOZ_ASSERT(!nextDriver->AsAudioCallbackDriver());
       } else {
         driver = new SystemClockDriver(this);
         mMixer.RemoveCallback(CurrentDriver()->AsAudioCallbackDriver());
+        MonitorAutoLock lock(mMonitor);
         CurrentDriver()->SwitchAtNextIteration(driver);
       }
       // We are closing or suspending an AudioContext, but we just got resumed.
       // Queue the operation on the next driver so that the ordering is
       // preserved.
-    } else if (!audioTrackPresent && CurrentDriver()->Switching()) {
-      MOZ_ASSERT(CurrentDriver()->NextDriver()->AsAudioCallbackDriver());
-      CurrentDriver()->NextDriver()->AsAudioCallbackDriver()->
+    } else if (!audioTrackPresent && switching) {
+      MOZ_ASSERT(nextDriver->AsAudioCallbackDriver());
+      nextDriver->AsAudioCallbackDriver()->
         EnqueueStreamAndPromiseForOperation(aDestinationStream, aPromise,
                                             aOperation);
     } else {

From fa96e4558d45b3cbf140fb614a2ac332f79bbd24 Mon Sep 17 00:00:00 2001
From: Paul Adenot <paul@paul.cx>
Date: Tue, 1 Dec 2015 11:48:06 +0100
Subject: [PATCH 019/101] Bug 1203585 - Add comments about threading and
 locking on GraphDriver's members. r=jesup

--HG--
extra : commitid : DLgo3xduShJ
---
 dom/media/GraphDriver.h | 40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/dom/media/GraphDriver.h b/dom/media/GraphDriver.h
index 96e81ca5cf50..3ae3fb9cf336 100644
--- a/dom/media/GraphDriver.h
+++ b/dom/media/GraphDriver.h
@@ -219,12 +219,15 @@ public:
 protected:
   GraphTime StateComputedTime() const;
 
-  // Time of the start of this graph iteration.
+  // Time of the start of this graph iteration. This must be accessed while
+  // having the monitor.
   GraphTime mIterationStart;
-  // Time of the end of this graph iteration.
+  // Time of the end of this graph iteration. This must be accessed while having
+  // the monitor.
   GraphTime mIterationEnd;
   // The MediaStreamGraphImpl that owns this driver. This has a lifetime longer
-  // than the driver, and will never be null.
+  // than the driver, and will never be null. Hence, it can be accesed without
+  // monitor.
   MediaStreamGraphImpl* mGraphImpl;
 
   // This enum specifies the wait state of the driver.
@@ -240,15 +243,26 @@ protected:
     // but it hasn't done so yet
     WAITSTATE_WAKING_UP
   };
+  // This must be access with the monitor.
   WaitState mWaitState;
 
+  // This is used on the main thread (during initialization), and the graph
+  // thread. No monitor needed because we know the graph thread does not run
+  // during the initialization.
   TimeStamp mCurrentTimeStamp;
   // This is non-null only when this driver has recently switched from an other
   // driver, and has not cleaned it up yet (for example because the audio stream
   // is currently calling the callback during initialization).
+  //
+  // This is written to when changing driver, from the previous driver's thread,
+  // or a thread created for the occasion. This is read each time we need to
+  // check whether we're changing driver (in Switching()), from the graph
+  // thread.
+  // This must be accessed using the {Set,Get}PreviousDriver methods.
   RefPtr<GraphDriver> mPreviousDriver;
   // This is non-null only when this driver is going to switch to an other
   // driver at the end of this iteration.
+  // This must be accessed using the {Set,Get}NextDriver methods.
   RefPtr<GraphDriver> mNextDriver;
   virtual ~GraphDriver()
   { }
@@ -304,6 +318,8 @@ public:
 
 
 private:
+  // Those are only modified (after initialization) on the graph thread. The
+  // graph thread does not run during the initialization.
   TimeStamp mInitialTimeStamp;
   TimeStamp mLastTimeStamp;
 };
@@ -460,18 +476,22 @@ private:
   /* The size of this buffer comes from the fact that some audio backends can
    * call back with a number of frames lower than one block (128 frames), so we
    * need to keep at most two block in the SpillBuffer, because we always round
-   * up to block boundaries during an iteration. */
+   * up to block boundaries during an iteration.
+   * This is only ever accessed on the audio callback thread. */
   SpillBuffer<AudioDataValue, WEBAUDIO_BLOCK_SIZE * 2, ChannelCount> mScratchBuffer;
   /* Wrapper to ensure we write exactly the number of frames we need in the
-   * audio buffer cubeb passes us. */
+   * audio buffer cubeb passes us. This is only ever accessed on the audio
+   * callback thread. */
   AudioCallbackBufferWrapper<AudioDataValue, ChannelCount> mBuffer;
   /* cubeb stream for this graph. This is guaranteed to be non-null after Init()
-   * has been called. */
+   * has been called, and is synchronized internaly. */
   nsAutoRef<cubeb_stream> mAudioStream;
-  /* The sample rate for the aforementionned cubeb stream. */
+  /* The sample rate for the aforementionned cubeb stream. This is set on
+   * initialization and can be read safely afterwards. */
   uint32_t mSampleRate;
   /* Approximation of the time between two callbacks. This is used to schedule
-   * video frames. This is in milliseconds. */
+   * video frames. This is in milliseconds. Only even used (after
+   * inizatialization) on the audio callback thread. */
   uint32_t mIterationDurationMS;
   /* cubeb_stream_init calls the audio callback to prefill the buffers. The
    * previous driver has to be kept alive until the audio stream has been
@@ -499,8 +519,12 @@ private:
   /* Thread for off-main-thread initialization and
    * shutdown of the audio stream. */
   nsCOMPtr<nsIThread> mInitShutdownThread;
+  /* This must be accessed with the graph monitor held. */
   nsAutoTArray<StreamAndPromiseForOperation, 1> mPromisesForOperation;
+  /* This is set during initialization, and ca be read safely afterwards. */
   dom::AudioChannel mAudioChannel;
+  /* This is atomic and is set by the audio callback thread. It can be read by
+   * any thread safely. */
   Atomic<bool> mInCallback;
   /* A thread has been created to be able to pause and restart the audio thread,
    * but has not done so yet. This indicates that the callback should return

From 8ea628a72b7235991f4a998165deb1abce421866 Mon Sep 17 00:00:00 2001
From: Paul Adenot <paul@paul.cx>
Date: Tue, 1 Dec 2015 11:48:08 +0100
Subject: [PATCH 020/101] Bug 1203585 - Remove some dead code in
 GraphDriver.cpp. r=jesup

--HG--
extra : commitid : LDSLPjpJdAz
---
 dom/media/GraphDriver.cpp |  6 ------
 dom/media/GraphDriver.h   | 24 ------------------------
 2 files changed, 30 deletions(-)

diff --git a/dom/media/GraphDriver.cpp b/dom/media/GraphDriver.cpp
index 663a7020db92..fafb393ddd31 100644
--- a/dom/media/GraphDriver.cpp
+++ b/dom/media/GraphDriver.cpp
@@ -541,7 +541,6 @@ AudioCallbackDriver::AudioCallbackDriver(MediaStreamGraphImpl* aGraphImpl)
   , mStarted(false)
   , mAudioChannel(aGraphImpl->AudioChannel())
   , mInCallback(false)
-  , mPauseRequested(false)
   , mMicrophoneActive(false)
 #ifdef XP_MACOSX
   , mCallbackReceivedWhileSwitching(0)
@@ -799,11 +798,6 @@ AudioCallbackDriver::DataCallback(AudioDataValue* aBuffer, long aFrames)
 {
   bool stillProcessing;
 
-  if (mPauseRequested) {
-    PodZero(aBuffer, aFrames * mGraphImpl->AudioChannelCount());
-    return aFrames;
-  }
-
 #ifdef XP_MACOSX
   if (OSXDeviceSwitchingWorkaround()) {
     PodZero(aBuffer, aFrames * mGraphImpl->AudioChannelCount());
diff --git a/dom/media/GraphDriver.h b/dom/media/GraphDriver.h
index 3ae3fb9cf336..9604064f995d 100644
--- a/dom/media/GraphDriver.h
+++ b/dom/media/GraphDriver.h
@@ -149,19 +149,6 @@ public:
     return mCurrentTimeStamp;
   }
 
-  bool IsWaiting() {
-    return mWaitState == WAITSTATE_WAITING_INDEFINITELY ||
-           mWaitState == WAITSTATE_WAITING_FOR_NEXT_ITERATION;
-  }
-
-  bool IsWaitingIndefinitly() {
-    return mWaitState == WAITSTATE_WAITING_INDEFINITELY;
-  }
-
-  GraphTime IterationStart() {
-    return mIterationStart;
-  }
-
   GraphTime IterationEnd() {
     return mIterationEnd;
   }
@@ -191,13 +178,6 @@ public:
   void SetGraphTime(GraphDriver* aPreviousDriver,
                     GraphTime aLastSwitchNextIterationStart,
                     GraphTime aLastSwitchNextIterationEnd);
-
-  /**
-   * Call this to indicate that another iteration of the control loop is
-   * required immediately. The monitor must already be held.
-   */
-  void EnsureImmediateWakeUpLocked();
-
   /**
    * Call this to indicate that another iteration of the control loop is
    * required on its regular schedule. The monitor must not be held.
@@ -526,10 +506,6 @@ private:
   /* This is atomic and is set by the audio callback thread. It can be read by
    * any thread safely. */
   Atomic<bool> mInCallback;
-  /* A thread has been created to be able to pause and restart the audio thread,
-   * but has not done so yet. This indicates that the callback should return
-   * early */
-  bool mPauseRequested;
   /**
    * True if microphone is being used by this process. This is synchronized by
    * the graph's monitor. */

From 84e7525fab4fa73b6ab57902d2280b7346563154 Mon Sep 17 00:00:00 2001
From: James Graham <james@hoppipolla.co.uk>
Date: Thu, 17 Dec 2015 09:46:17 +0000
Subject: [PATCH 021/101] Bug 1233726 - Update web-platform-tests to revision
 624dc5e68d545fe2212a5a0af2565237bb9db81e, a=testonly

--HG--
rename : testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction.xhtml => testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Document-getElementsByTagName.xhtml => testing/web-platform/tests/dom/nodes/Document-getElementsByTagName-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/DocumentType-literal.xhtml => testing/web-platform/tests/dom/nodes/DocumentType-literal-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-childElement-null.svg => testing/web-platform/tests/dom/nodes/Element-childElement-null-svg.svg
rename : testing/web-platform/tests/dom/nodes/Element-childElement-null.xhtml => testing/web-platform/tests/dom/nodes/Element-childElement-null-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add.svg => testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add-svg.svg
rename : testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add.xhtml => testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove.svg => testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove-svg.svg
rename : testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove.xhtml => testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild.svg => testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild-svg.svg
rename : testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild.xhtml => testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-childElementCount.svg => testing/web-platform/tests/dom/nodes/Element-childElementCount-svg.svg
rename : testing/web-platform/tests/dom/nodes/Element-childElementCount.xhtml => testing/web-platform/tests/dom/nodes/Element-childElementCount-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-firstElementChild-entity.xhtml => testing/web-platform/tests/dom/nodes/Element-firstElementChild-entity-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace.svg => testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace-svg.svg
rename : testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace.xhtml => testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-firstElementChild.svg => testing/web-platform/tests/dom/nodes/Element-firstElementChild-svg.svg
rename : testing/web-platform/tests/dom/nodes/Element-firstElementChild.xhtml => testing/web-platform/tests/dom/nodes/Element-firstElementChild-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-lastElementChild.svg => testing/web-platform/tests/dom/nodes/Element-lastElementChild-svg.svg
rename : testing/web-platform/tests/dom/nodes/Element-lastElementChild.xhtml => testing/web-platform/tests/dom/nodes/Element-lastElementChild-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-nextElementSibling.svg => testing/web-platform/tests/dom/nodes/Element-nextElementSibling-svg.svg
rename : testing/web-platform/tests/dom/nodes/Element-nextElementSibling.xhtml => testing/web-platform/tests/dom/nodes/Element-nextElementSibling-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-previousElementSibling.svg => testing/web-platform/tests/dom/nodes/Element-previousElementSibling-svg.svg
rename : testing/web-platform/tests/dom/nodes/Element-previousElementSibling.xhtml => testing/web-platform/tests/dom/nodes/Element-previousElementSibling-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-siblingElement-null.svg => testing/web-platform/tests/dom/nodes/Element-siblingElement-null-svg.svg
rename : testing/web-platform/tests/dom/nodes/Element-siblingElement-null.xhtml => testing/web-platform/tests/dom/nodes/Element-siblingElement-null-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Node-nodeName.xhtml => testing/web-platform/tests/dom/nodes/Node-nodeName-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/ParentNode-querySelector-All.xht => testing/web-platform/tests/dom/nodes/ParentNode-querySelector-All-xht.xht
rename : testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.xhtml => testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case-xhtml.xhtml
rename : testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.xhtml => testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id-xhtml.xhtml
rename : testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.xhtml => testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace-xhtml.xhtml
rename : testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.xhtml => testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements-xhtml.xhtml
rename : testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.xhtml => testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef-xhtml.xhtml
rename : testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.xhtml => testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param-xhtml.xhtml
rename : testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-event.xhtml => testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-event-xhtml.xhtml
rename : testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text.xhtml => testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text-xhtml.xhtml
rename : testing/web-platform/tests/url/a-element.xhtml => testing/web-platform/tests/url/a-element-xhtml.xhtml
---
 testing/web-platform/meta/MANIFEST.json       |  277 +--
 testing/web-platform/meta/mozilla-sync        |    2 +-
 .../battery-created-manual.html               |   54 -
 .../tests/conformance-checkers/messages.json  | 1582 ++++++++---------
 .../media-src/media-src-redir-bug.sub.html    |   66 +
 .../media-src-redir-bug.sub.html.sub.headers  |    6 +
 ...t-createProcessingInstruction-xhtml.xhtml} |    0
 ...Document-getElementsByTagName-xhtml.xhtml} |    0
 ...xhtml => DocumentType-literal-xhtml.xhtml} |    0
 ....svg => Element-childElement-null-svg.svg} |    0
 ... => Element-childElement-null-xhtml.xhtml} |    0
 ...ent-childElementCount-dynamic-add-svg.svg} |    0
 ...childElementCount-dynamic-add-xhtml.xhtml} |    0
 ...-childElementCount-dynamic-remove-svg.svg} |    0
 ...ldElementCount-dynamic-remove-xhtml.xhtml} |    0
 ...Element-childElementCount-nochild-svg.svg} |    0
 ...ent-childElementCount-nochild-xhtml.xhtml} |    0
 ....svg => Element-childElementCount-svg.svg} |    0
 ... => Element-childElementCount-xhtml.xhtml} |    0
 ...ment-firstElementChild-entity-xhtml.xhtml} |    0
 ...ement-firstElementChild-namespace-svg.svg} |    0
 ...t-firstElementChild-namespace-xhtml.xhtml} |    0
 ....svg => Element-firstElementChild-svg.svg} |    0
 ... => Element-firstElementChild-xhtml.xhtml} |    0
 ...d.svg => Element-lastElementChild-svg.svg} |    0
 ...l => Element-lastElementChild-xhtml.xhtml} |    0
 ...svg => Element-nextElementSibling-svg.svg} |    0
 ...=> Element-nextElementSibling-xhtml.xhtml} |    0
 ...=> Element-previousElementSibling-svg.svg} |    0
 ...lement-previousElementSibling-xhtml.xhtml} |    0
 ...vg => Element-siblingElement-null-svg.svg} |    0
 ...> Element-siblingElement-null-xhtml.xhtml} |    0
 ...deName.xhtml => Node-nodeName-xhtml.xhtml} |    0
 ...t => ParentNode-querySelector-All-xht.xht} |    0
 ...cument.getElementsByName-case-xhtml.xhtml} |    0
 ...document.getElementsByName-id-xhtml.xhtml} |    0
 ...t.getElementsByName-namespace-xhtml.xhtml} |    0
 ...getElementsByName-newelements-xhtml.xhtml} |    0
 ....getElementsByName-null-undef-xhtml.xhtml} |    0
 ...ument.getElementsByName-param-xhtml.xhtml} |    0
 .../document-color-02.html                    |    6 +
 .../document-color-03.html                    |    6 +
 .../current-pixel-density/basic.html          |    8 +-
 .../the-input-element/maxlength-manual.html   |   37 +
 .../forms/the-input-element/maxlength.html    |   55 +
 ...ent.xhtml => script-for-event-xhtml.xhtml} |    0
 ...ipt-text.xhtml => script-text-xhtml.xhtml} |    0
 .../tests/html/syntax/parsing/README          |    2 +-
 .../tests/html/syntax/parsing/test.js         |   17 +-
 .../web-platform/tests/resources/docs/api.md  |    2 +-
 .../tests/resources/idlharness.js             |   24 +
 .../tests/resources/webidl2/README.md         |   39 +-
 .../tests/resources/webidl2/lib/webidl2.js    |   76 +-
 .../tests/resources/webidl2/package.json      |   10 +-
 .../test/invalid/idl/maplike-1type.widl       |    3 -
 .../test/invalid/idl/readonly-iterable.widl   |    3 -
 .../test/invalid/idl/setlike-2types.widl      |    3 -
 .../test/invalid/idl/typedef-nested.widl      |   22 -
 .../test/invalid/json/maplike-1type.json      |    4 -
 .../test/invalid/json/readonly-iterable.json  |    4 -
 .../test/invalid/json/setlike-2types.json     |    4 -
 .../test/invalid/json/typedef-nested.json     |    4 -
 .../tests/resources/webidl2/test/syntax.js    |    7 +-
 .../webidl2/test/syntax/idl/callback.widl     |    4 +-
 .../webidl2/test/syntax/idl/enum.widl         |    4 +-
 .../test/syntax/idl/extended-attributes.widl  |    6 -
 .../webidl2/test/syntax/idl/iterable.widl     |    7 -
 .../test/syntax/idl/legacyiterable.widl       |    3 -
 .../webidl2/test/syntax/idl/maplike.widl      |    7 -
 .../webidl2/test/syntax/idl/setlike.widl      |    7 -
 .../test/syntax/idl/typedef-nested.widl       |   22 -
 .../webidl2/test/syntax/json/callback.json    |   43 -
 .../webidl2/test/syntax/json/enum.json        |   10 -
 .../test/syntax/json/extended-attributes.json |   30 -
 .../webidl2/test/syntax/json/iterable.json    |   55 -
 .../test/syntax/json/legacyiterable.json      |   24 -
 .../webidl2/test/syntax/json/maplike.json     |   67 -
 .../webidl2/test/syntax/json/setlike.json     |   47 -
 .../test/syntax/json/typedef-nested.json      |  226 ---
 .../test/syntax/opt/typedef-nested.json       |    3 -
 .../attribute-case/semantics.html             |   22 +-
 .../attribute-case/syntax.html                |    2 +
 .../web-platform/tests/svg/interfaces.html    | 1568 ++++++++++++++++
 .../web-platform/tests/tools/manifest/item.py |   10 +-
 .../tests/tools/manifest/manifest.py          |   14 +-
 .../tests/tools/manifest/utils.py             |    6 +
 ...{a-element.xhtml => a-element-xhtml.xhtml} |    0
 .../tests/webgl/compressedTexSubImage2D.html  |    2 -
 88 files changed, 2769 insertions(+), 1743 deletions(-)
 delete mode 100644 testing/web-platform/tests/battery-status/battery-created-manual.html
 create mode 100644 testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html
 create mode 100644 testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html.sub.headers
 rename testing/web-platform/tests/dom/nodes/{Document-createProcessingInstruction.xhtml => Document-createProcessingInstruction-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Document-getElementsByTagName.xhtml => Document-getElementsByTagName-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{DocumentType-literal.xhtml => DocumentType-literal-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElement-null.svg => Element-childElement-null-svg.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElement-null.xhtml => Element-childElement-null-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElementCount-dynamic-add.svg => Element-childElementCount-dynamic-add-svg.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElementCount-dynamic-add.xhtml => Element-childElementCount-dynamic-add-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElementCount-dynamic-remove.svg => Element-childElementCount-dynamic-remove-svg.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElementCount-dynamic-remove.xhtml => Element-childElementCount-dynamic-remove-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElementCount-nochild.svg => Element-childElementCount-nochild-svg.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElementCount-nochild.xhtml => Element-childElementCount-nochild-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElementCount.svg => Element-childElementCount-svg.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElementCount.xhtml => Element-childElementCount-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-firstElementChild-entity.xhtml => Element-firstElementChild-entity-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-firstElementChild-namespace.svg => Element-firstElementChild-namespace-svg.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-firstElementChild-namespace.xhtml => Element-firstElementChild-namespace-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-firstElementChild.svg => Element-firstElementChild-svg.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-firstElementChild.xhtml => Element-firstElementChild-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-lastElementChild.svg => Element-lastElementChild-svg.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-lastElementChild.xhtml => Element-lastElementChild-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-nextElementSibling.svg => Element-nextElementSibling-svg.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-nextElementSibling.xhtml => Element-nextElementSibling-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-previousElementSibling.svg => Element-previousElementSibling-svg.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-previousElementSibling.xhtml => Element-previousElementSibling-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-siblingElement-null.svg => Element-siblingElement-null-svg.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-siblingElement-null.xhtml => Element-siblingElement-null-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Node-nodeName.xhtml => Node-nodeName-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{ParentNode-querySelector-All.xht => ParentNode-querySelector-All-xht.xht} (100%)
 rename testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/{document.getElementsByName-case.xhtml => document.getElementsByName-case-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/{document.getElementsByName-id.xhtml => document.getElementsByName-id-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/{document.getElementsByName-namespace.xhtml => document.getElementsByName-namespace-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/{document.getElementsByName-newelements.xhtml => document.getElementsByName-newelements-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/{document.getElementsByName-null-undef.xhtml => document.getElementsByName-null-undef-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/{document.getElementsByName-param.xhtml => document.getElementsByName-param-xhtml.xhtml} (100%)
 create mode 100644 testing/web-platform/tests/html/semantics/forms/the-input-element/maxlength-manual.html
 create mode 100644 testing/web-platform/tests/html/semantics/forms/the-input-element/maxlength.html
 rename testing/web-platform/tests/html/semantics/scripting-1/the-script-element/{script-for-event.xhtml => script-for-event-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/html/semantics/scripting-1/the-script-element/{script-text.xhtml => script-text-xhtml.xhtml} (100%)
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/invalid/idl/maplike-1type.widl
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/invalid/idl/readonly-iterable.widl
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/invalid/idl/setlike-2types.widl
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/invalid/idl/typedef-nested.widl
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/invalid/json/maplike-1type.json
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/invalid/json/readonly-iterable.json
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/invalid/json/setlike-2types.json
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/invalid/json/typedef-nested.json
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/idl/extended-attributes.widl
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/idl/iterable.widl
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/idl/legacyiterable.widl
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/idl/maplike.widl
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/idl/setlike.widl
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/idl/typedef-nested.widl
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/json/extended-attributes.json
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/json/iterable.json
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/json/legacyiterable.json
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/json/maplike.json
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/json/setlike.json
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/json/typedef-nested.json
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/opt/typedef-nested.json
 create mode 100644 testing/web-platform/tests/svg/interfaces.html
 rename testing/web-platform/tests/url/{a-element.xhtml => a-element-xhtml.xhtml} (100%)

diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
index 4212224a2310..bfc10281dd9e 100644
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -101,10 +101,6 @@
         "path": "battery-status/battery-charging-manual.html",
         "url": "/battery-status/battery-charging-manual.html"
       },
-      {
-        "path": "battery-status/battery-created-manual.html",
-        "url": "/battery-status/battery-created-manual.html"
-      },
       {
         "path": "battery-status/battery-discharging-manual.html",
         "url": "/battery-status/battery-discharging-manual.html"
@@ -777,6 +773,10 @@
         "path": "html/semantics/forms/the-input-element/file-manual.html",
         "url": "/html/semantics/forms/the-input-element/file-manual.html"
       },
+      {
+        "path": "html/semantics/forms/the-input-element/maxlength-manual.html",
+        "url": "/html/semantics/forms/the-input-element/maxlength-manual.html"
+      },
       {
         "path": "html/semantics/forms/the-optgroup-element/optgroup-disabled-manual.html",
         "url": "/html/semantics/forms/the-optgroup-element/optgroup-disabled-manual.html"
@@ -13091,6 +13091,10 @@
         "path": "content-security-policy/media-src/media-src-7_3_2.html",
         "url": "/content-security-policy/media-src/media-src-7_3_2.html"
       },
+      {
+        "path": "content-security-policy/media-src/media-src-redir-bug.sub.html",
+        "url": "/content-security-policy/media-src/media-src-redir-bug.sub.html"
+      },
       {
         "path": "content-security-policy/meta/meta-img-src.html",
         "url": "/content-security-policy/meta/meta-img-src.html"
@@ -13267,10 +13271,6 @@
         "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-move-element-test.html",
         "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-move-element-test.html"
       },
-      {
-        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-test.html",
-        "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-test.html"
-      },
       {
         "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-change-attribute-test.html",
         "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-change-attribute-test.html"
@@ -13740,12 +13740,12 @@
         "url": "/dom/nodes/Document-createEvent.html"
       },
       {
-        "path": "dom/nodes/Document-createProcessingInstruction.html",
-        "url": "/dom/nodes/Document-createProcessingInstruction.html"
+        "path": "dom/nodes/Document-createProcessingInstruction-xhtml.xhtml",
+        "url": "/dom/nodes/Document-createProcessingInstruction-xhtml.xhtml"
       },
       {
-        "path": "dom/nodes/Document-createProcessingInstruction.xhtml",
-        "url": "/dom/nodes/Document-createProcessingInstruction.xhtml"
+        "path": "dom/nodes/Document-createProcessingInstruction.html",
+        "url": "/dom/nodes/Document-createProcessingInstruction.html"
       },
       {
         "path": "dom/nodes/Document-createTextNode.html",
@@ -13764,12 +13764,12 @@
         "url": "/dom/nodes/Document-getElementById.html"
       },
       {
-        "path": "dom/nodes/Document-getElementsByTagName.html",
-        "url": "/dom/nodes/Document-getElementsByTagName.html"
+        "path": "dom/nodes/Document-getElementsByTagName-xhtml.xhtml",
+        "url": "/dom/nodes/Document-getElementsByTagName-xhtml.xhtml"
       },
       {
-        "path": "dom/nodes/Document-getElementsByTagName.xhtml",
-        "url": "/dom/nodes/Document-getElementsByTagName.xhtml"
+        "path": "dom/nodes/Document-getElementsByTagName.html",
+        "url": "/dom/nodes/Document-getElementsByTagName.html"
       },
       {
         "path": "dom/nodes/Document-getElementsByTagNameNS.html",
@@ -13784,77 +13784,77 @@
         "url": "/dom/nodes/Document-importNode.html"
       },
       {
-        "path": "dom/nodes/DocumentType-literal.html",
-        "url": "/dom/nodes/DocumentType-literal.html"
+        "path": "dom/nodes/DocumentType-literal-xhtml.xhtml",
+        "url": "/dom/nodes/DocumentType-literal-xhtml.xhtml"
       },
       {
-        "path": "dom/nodes/DocumentType-literal.xhtml",
-        "url": "/dom/nodes/DocumentType-literal.xhtml"
+        "path": "dom/nodes/DocumentType-literal.html",
+        "url": "/dom/nodes/DocumentType-literal.html"
       },
       {
         "path": "dom/nodes/DocumentType-remove.html",
         "url": "/dom/nodes/DocumentType-remove.html"
       },
+      {
+        "path": "dom/nodes/Element-childElement-null-svg.svg",
+        "url": "/dom/nodes/Element-childElement-null-svg.svg"
+      },
+      {
+        "path": "dom/nodes/Element-childElement-null-xhtml.xhtml",
+        "url": "/dom/nodes/Element-childElement-null-xhtml.xhtml"
+      },
       {
         "path": "dom/nodes/Element-childElement-null.html",
         "url": "/dom/nodes/Element-childElement-null.html"
       },
       {
-        "path": "dom/nodes/Element-childElement-null.svg",
-        "url": "/dom/nodes/Element-childElement-null.svg"
+        "path": "dom/nodes/Element-childElementCount-dynamic-add-svg.svg",
+        "url": "/dom/nodes/Element-childElementCount-dynamic-add-svg.svg"
       },
       {
-        "path": "dom/nodes/Element-childElement-null.xhtml",
-        "url": "/dom/nodes/Element-childElement-null.xhtml"
+        "path": "dom/nodes/Element-childElementCount-dynamic-add-xhtml.xhtml",
+        "url": "/dom/nodes/Element-childElementCount-dynamic-add-xhtml.xhtml"
       },
       {
         "path": "dom/nodes/Element-childElementCount-dynamic-add.html",
         "url": "/dom/nodes/Element-childElementCount-dynamic-add.html"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-dynamic-add.svg",
-        "url": "/dom/nodes/Element-childElementCount-dynamic-add.svg"
+        "path": "dom/nodes/Element-childElementCount-dynamic-remove-svg.svg",
+        "url": "/dom/nodes/Element-childElementCount-dynamic-remove-svg.svg"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-dynamic-add.xhtml",
-        "url": "/dom/nodes/Element-childElementCount-dynamic-add.xhtml"
+        "path": "dom/nodes/Element-childElementCount-dynamic-remove-xhtml.xhtml",
+        "url": "/dom/nodes/Element-childElementCount-dynamic-remove-xhtml.xhtml"
       },
       {
         "path": "dom/nodes/Element-childElementCount-dynamic-remove.html",
         "url": "/dom/nodes/Element-childElementCount-dynamic-remove.html"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-dynamic-remove.svg",
-        "url": "/dom/nodes/Element-childElementCount-dynamic-remove.svg"
+        "path": "dom/nodes/Element-childElementCount-nochild-svg.svg",
+        "url": "/dom/nodes/Element-childElementCount-nochild-svg.svg"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-dynamic-remove.xhtml",
-        "url": "/dom/nodes/Element-childElementCount-dynamic-remove.xhtml"
+        "path": "dom/nodes/Element-childElementCount-nochild-xhtml.xhtml",
+        "url": "/dom/nodes/Element-childElementCount-nochild-xhtml.xhtml"
       },
       {
         "path": "dom/nodes/Element-childElementCount-nochild.html",
         "url": "/dom/nodes/Element-childElementCount-nochild.html"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-nochild.svg",
-        "url": "/dom/nodes/Element-childElementCount-nochild.svg"
+        "path": "dom/nodes/Element-childElementCount-svg.svg",
+        "url": "/dom/nodes/Element-childElementCount-svg.svg"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-nochild.xhtml",
-        "url": "/dom/nodes/Element-childElementCount-nochild.xhtml"
+        "path": "dom/nodes/Element-childElementCount-xhtml.xhtml",
+        "url": "/dom/nodes/Element-childElementCount-xhtml.xhtml"
       },
       {
         "path": "dom/nodes/Element-childElementCount.html",
         "url": "/dom/nodes/Element-childElementCount.html"
       },
-      {
-        "path": "dom/nodes/Element-childElementCount.svg",
-        "url": "/dom/nodes/Element-childElementCount.svg"
-      },
-      {
-        "path": "dom/nodes/Element-childElementCount.xhtml",
-        "url": "/dom/nodes/Element-childElementCount.xhtml"
-      },
       {
         "path": "dom/nodes/Element-children.html",
         "url": "/dom/nodes/Element-children.html"
@@ -13867,38 +13867,38 @@
         "path": "dom/nodes/Element-closest.html",
         "url": "/dom/nodes/Element-closest.html"
       },
+      {
+        "path": "dom/nodes/Element-firstElementChild-entity-xhtml.xhtml",
+        "url": "/dom/nodes/Element-firstElementChild-entity-xhtml.xhtml"
+      },
       {
         "path": "dom/nodes/Element-firstElementChild-entity.svg",
         "url": "/dom/nodes/Element-firstElementChild-entity.svg"
       },
       {
-        "path": "dom/nodes/Element-firstElementChild-entity.xhtml",
-        "url": "/dom/nodes/Element-firstElementChild-entity.xhtml"
+        "path": "dom/nodes/Element-firstElementChild-namespace-svg.svg",
+        "url": "/dom/nodes/Element-firstElementChild-namespace-svg.svg"
+      },
+      {
+        "path": "dom/nodes/Element-firstElementChild-namespace-xhtml.xhtml",
+        "url": "/dom/nodes/Element-firstElementChild-namespace-xhtml.xhtml"
       },
       {
         "path": "dom/nodes/Element-firstElementChild-namespace.html",
         "url": "/dom/nodes/Element-firstElementChild-namespace.html"
       },
       {
-        "path": "dom/nodes/Element-firstElementChild-namespace.svg",
-        "url": "/dom/nodes/Element-firstElementChild-namespace.svg"
+        "path": "dom/nodes/Element-firstElementChild-svg.svg",
+        "url": "/dom/nodes/Element-firstElementChild-svg.svg"
       },
       {
-        "path": "dom/nodes/Element-firstElementChild-namespace.xhtml",
-        "url": "/dom/nodes/Element-firstElementChild-namespace.xhtml"
+        "path": "dom/nodes/Element-firstElementChild-xhtml.xhtml",
+        "url": "/dom/nodes/Element-firstElementChild-xhtml.xhtml"
       },
       {
         "path": "dom/nodes/Element-firstElementChild.html",
         "url": "/dom/nodes/Element-firstElementChild.html"
       },
-      {
-        "path": "dom/nodes/Element-firstElementChild.svg",
-        "url": "/dom/nodes/Element-firstElementChild.svg"
-      },
-      {
-        "path": "dom/nodes/Element-firstElementChild.xhtml",
-        "url": "/dom/nodes/Element-firstElementChild.xhtml"
-      },
       {
         "path": "dom/nodes/Element-getElementsByClassName.html",
         "url": "/dom/nodes/Element-getElementsByClassName.html"
@@ -13915,46 +13915,46 @@
         "path": "dom/nodes/Element-getElementsByTagNameNS.html",
         "url": "/dom/nodes/Element-getElementsByTagNameNS.html"
       },
+      {
+        "path": "dom/nodes/Element-lastElementChild-svg.svg",
+        "url": "/dom/nodes/Element-lastElementChild-svg.svg"
+      },
+      {
+        "path": "dom/nodes/Element-lastElementChild-xhtml.xhtml",
+        "url": "/dom/nodes/Element-lastElementChild-xhtml.xhtml"
+      },
       {
         "path": "dom/nodes/Element-lastElementChild.html",
         "url": "/dom/nodes/Element-lastElementChild.html"
       },
-      {
-        "path": "dom/nodes/Element-lastElementChild.svg",
-        "url": "/dom/nodes/Element-lastElementChild.svg"
-      },
-      {
-        "path": "dom/nodes/Element-lastElementChild.xhtml",
-        "url": "/dom/nodes/Element-lastElementChild.xhtml"
-      },
       {
         "path": "dom/nodes/Element-matches.html",
         "url": "/dom/nodes/Element-matches.html"
       },
+      {
+        "path": "dom/nodes/Element-nextElementSibling-svg.svg",
+        "url": "/dom/nodes/Element-nextElementSibling-svg.svg"
+      },
+      {
+        "path": "dom/nodes/Element-nextElementSibling-xhtml.xhtml",
+        "url": "/dom/nodes/Element-nextElementSibling-xhtml.xhtml"
+      },
       {
         "path": "dom/nodes/Element-nextElementSibling.html",
         "url": "/dom/nodes/Element-nextElementSibling.html"
       },
       {
-        "path": "dom/nodes/Element-nextElementSibling.svg",
-        "url": "/dom/nodes/Element-nextElementSibling.svg"
+        "path": "dom/nodes/Element-previousElementSibling-svg.svg",
+        "url": "/dom/nodes/Element-previousElementSibling-svg.svg"
       },
       {
-        "path": "dom/nodes/Element-nextElementSibling.xhtml",
-        "url": "/dom/nodes/Element-nextElementSibling.xhtml"
+        "path": "dom/nodes/Element-previousElementSibling-xhtml.xhtml",
+        "url": "/dom/nodes/Element-previousElementSibling-xhtml.xhtml"
       },
       {
         "path": "dom/nodes/Element-previousElementSibling.html",
         "url": "/dom/nodes/Element-previousElementSibling.html"
       },
-      {
-        "path": "dom/nodes/Element-previousElementSibling.svg",
-        "url": "/dom/nodes/Element-previousElementSibling.svg"
-      },
-      {
-        "path": "dom/nodes/Element-previousElementSibling.xhtml",
-        "url": "/dom/nodes/Element-previousElementSibling.xhtml"
-      },
       {
         "path": "dom/nodes/Element-remove.html",
         "url": "/dom/nodes/Element-remove.html"
@@ -13963,18 +13963,18 @@
         "path": "dom/nodes/Element-removeAttributeNS.html",
         "url": "/dom/nodes/Element-removeAttributeNS.html"
       },
+      {
+        "path": "dom/nodes/Element-siblingElement-null-svg.svg",
+        "url": "/dom/nodes/Element-siblingElement-null-svg.svg"
+      },
+      {
+        "path": "dom/nodes/Element-siblingElement-null-xhtml.xhtml",
+        "url": "/dom/nodes/Element-siblingElement-null-xhtml.xhtml"
+      },
       {
         "path": "dom/nodes/Element-siblingElement-null.html",
         "url": "/dom/nodes/Element-siblingElement-null.html"
       },
-      {
-        "path": "dom/nodes/Element-siblingElement-null.svg",
-        "url": "/dom/nodes/Element-siblingElement-null.svg"
-      },
-      {
-        "path": "dom/nodes/Element-siblingElement-null.xhtml",
-        "url": "/dom/nodes/Element-siblingElement-null.xhtml"
-      },
       {
         "path": "dom/nodes/Element-tagName.html",
         "url": "/dom/nodes/Element-tagName.html"
@@ -14056,12 +14056,12 @@
         "url": "/dom/nodes/Node-lookupPrefix.xhtml"
       },
       {
-        "path": "dom/nodes/Node-nodeName.html",
-        "url": "/dom/nodes/Node-nodeName.html"
+        "path": "dom/nodes/Node-nodeName-xhtml.xhtml",
+        "url": "/dom/nodes/Node-nodeName-xhtml.xhtml"
       },
       {
-        "path": "dom/nodes/Node-nodeName.xhtml",
-        "url": "/dom/nodes/Node-nodeName.xhtml"
+        "path": "dom/nodes/Node-nodeName.html",
+        "url": "/dom/nodes/Node-nodeName.html"
       },
       {
         "path": "dom/nodes/Node-nodeValue.html",
@@ -14104,12 +14104,12 @@
         "url": "/dom/nodes/ParentNode-prepend.html"
       },
       {
-        "path": "dom/nodes/ParentNode-querySelector-All.html",
-        "url": "/dom/nodes/ParentNode-querySelector-All.html"
+        "path": "dom/nodes/ParentNode-querySelector-All-xht.xht",
+        "url": "/dom/nodes/ParentNode-querySelector-All-xht.xht"
       },
       {
-        "path": "dom/nodes/ParentNode-querySelector-All.xht",
-        "url": "/dom/nodes/ParentNode-querySelector-All.xht"
+        "path": "dom/nodes/ParentNode-querySelector-All.html",
+        "url": "/dom/nodes/ParentNode-querySelector-All.html"
       },
       {
         "path": "dom/nodes/ProcessingInstruction-literal-1.xhtml",
@@ -15047,10 +15047,6 @@
         "path": "html/browsers/browsing-the-web/scroll-to-fragid/006.html",
         "url": "/html/browsers/browsing-the-web/scroll-to-fragid/006.html"
       },
-      {
-        "path": "html/browsers/browsing-the-web/scroll-to-fragid/007.html",
-        "url": "/html/browsers/browsing-the-web/scroll-to-fragid/007.html"
-      },
       {
         "path": "html/browsers/browsing-the-web/unloading-documents/001.html",
         "url": "/html/browsers/browsing-the-web/unloading-documents/001.html"
@@ -15491,10 +15487,6 @@
         "path": "html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload.html",
         "url": "/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload.html"
       },
-      {
-        "path": "html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html",
-        "url": "/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html"
-      },
       {
         "path": "html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1.html",
         "url": "/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1.html"
@@ -15631,58 +15623,58 @@
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByClassName-same.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByClassName-same.html"
       },
+      {
+        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case-xhtml.xhtml",
+        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case-xhtml.xhtml"
+      },
       {
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.xhtml",
-        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.xhtml"
+        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id-xhtml.xhtml",
+        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id-xhtml.xhtml"
       },
       {
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.html"
       },
-      {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.xhtml",
-        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.xhtml"
-      },
       {
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-interface.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-interface.html"
       },
+      {
+        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace-xhtml.xhtml",
+        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace-xhtml.xhtml"
+      },
       {
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.xhtml",
-        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.xhtml"
+        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements-xhtml.xhtml",
+        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements-xhtml.xhtml"
       },
       {
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.xhtml",
-        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.xhtml"
+        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef-xhtml.xhtml",
+        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef-xhtml.xhtml"
       },
       {
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.xhtml",
-        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.xhtml"
+        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param-xhtml.xhtml",
+        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param-xhtml.xhtml"
       },
       {
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.html"
       },
-      {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.xhtml",
-        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.xhtml"
-      },
       {
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-same.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-same.html"
@@ -18015,6 +18007,10 @@
         "path": "html/semantics/forms/the-input-element/input-type-checkbox.html",
         "url": "/html/semantics/forms/the-input-element/input-type-checkbox.html"
       },
+      {
+        "path": "html/semantics/forms/the-input-element/maxlength.html",
+        "url": "/html/semantics/forms/the-input-element/maxlength.html"
+      },
       {
         "path": "html/semantics/forms/the-input-element/month.html",
         "url": "/html/semantics/forms/the-input-element/month.html"
@@ -18296,12 +18292,12 @@
         "url": "/html/semantics/scripting-1/the-script-element/script-before-after-events.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/script-for-event.html",
-        "url": "/html/semantics/scripting-1/the-script-element/script-for-event.html"
+        "path": "html/semantics/scripting-1/the-script-element/script-for-event-xhtml.xhtml",
+        "url": "/html/semantics/scripting-1/the-script-element/script-for-event-xhtml.xhtml"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/script-for-event.xhtml",
-        "url": "/html/semantics/scripting-1/the-script-element/script-for-event.xhtml"
+        "path": "html/semantics/scripting-1/the-script-element/script-for-event.html",
+        "url": "/html/semantics/scripting-1/the-script-element/script-for-event.html"
       },
       {
         "path": "html/semantics/scripting-1/the-script-element/script-language-type.html",
@@ -18324,12 +18320,12 @@
         "url": "/html/semantics/scripting-1/the-script-element/script-onload-string.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/script-text.html",
-        "url": "/html/semantics/scripting-1/the-script-element/script-text.html"
+        "path": "html/semantics/scripting-1/the-script-element/script-text-xhtml.xhtml",
+        "url": "/html/semantics/scripting-1/the-script-element/script-text-xhtml.xhtml"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/script-text.xhtml",
-        "url": "/html/semantics/scripting-1/the-script-element/script-text.xhtml"
+        "path": "html/semantics/scripting-1/the-script-element/script-text.html",
+        "url": "/html/semantics/scripting-1/the-script-element/script-text.html"
       },
       {
         "path": "html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/node-document.html",
@@ -26407,6 +26403,10 @@
         "path": "shadow-dom/untriaged/user-interaction/ranges-and-selections/test-002.html",
         "url": "/shadow-dom/untriaged/user-interaction/ranges-and-selections/test-002.html"
       },
+      {
+        "path": "svg/interfaces.html",
+        "url": "/svg/interfaces.html"
+      },
       {
         "path": "touch-events/create-touch-touchlist.html",
         "url": "/touch-events/create-touch-touchlist.html"
@@ -26440,12 +26440,12 @@
         "url": "/typedarrays/constructors.html"
       },
       {
-        "path": "url/a-element.html",
-        "url": "/url/a-element.html"
+        "path": "url/a-element-xhtml.xhtml",
+        "url": "/url/a-element-xhtml.xhtml"
       },
       {
-        "path": "url/a-element.xhtml",
-        "url": "/url/a-element.xhtml"
+        "path": "url/a-element.html",
+        "url": "/url/a-element.html"
       },
       {
         "path": "url/historical.html",
@@ -28797,6 +28797,11 @@
         "timeout": "long",
         "url": "/custom-elements/concepts/custom-elements-type-allowed-chars.html"
       },
+      {
+        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-test.html",
+        "timeout": "long",
+        "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-test.html"
+      },
       {
         "path": "dom/nodes/Document-characterSet-normalization.html",
         "timeout": "long",
@@ -28937,6 +28942,11 @@
         "timeout": "long",
         "url": "/eventsource/shared-worker/eventsource-constructor-non-same-origin.htm"
       },
+      {
+        "path": "html/browsers/browsing-the-web/scroll-to-fragid/007.html",
+        "timeout": "long",
+        "url": "/html/browsers/browsing-the-web/scroll-to-fragid/007.html"
+      },
       {
         "path": "html/browsers/history/the-history-interface/007.html",
         "timeout": "long",
@@ -28947,6 +28957,11 @@
         "timeout": "long",
         "url": "/html/browsers/origin/cross-origin-objects/cross-origin-objects.sub.html"
       },
+      {
+        "path": "html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html",
+        "timeout": "long",
+        "url": "/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html"
+      },
       {
         "path": "html/dom/interfaces.html",
         "timeout": "long",
@@ -35854,7 +35869,7 @@
       }
     ]
   },
-  "rev": "63bf7b5e1e12b308ba6ed20480ad7dc93afa1943",
+  "rev": "05c55fbdc527eacdc7b875f298a8cb1b6db0dfcd",
   "url_base": "/",
   "version": 2
 }
diff --git a/testing/web-platform/meta/mozilla-sync b/testing/web-platform/meta/mozilla-sync
index 4155cc4d71e9..d924ac6dc356 100644
--- a/testing/web-platform/meta/mozilla-sync
+++ b/testing/web-platform/meta/mozilla-sync
@@ -1 +1 @@
-42122dea7c41a71c8cb06a91b91e71afa2d6664c
\ No newline at end of file
+d5e5a44a8bbe62751a66677491623a41b766275d
\ No newline at end of file
diff --git a/testing/web-platform/tests/battery-status/battery-created-manual.html b/testing/web-platform/tests/battery-status/battery-created-manual.html
deleted file mode 100644
index e3b8d69cf4da..000000000000
--- a/testing/web-platform/tests/battery-status/battery-created-manual.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Battery Test: no backend implementation, charger unplugged in</title>
-<meta name="flags" content="interact">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<h2>Description</h2>
-<p>
-  <strong>
-    This test is only useful on devices that expose the BatteryManager interface,
-    but lack a backend implementation.
-  </strong>
-</p>
-<p>
-  This test validates that all of the BatteryManager attributes exist and are set to their default values.
-</p>
-
-<h2>Preconditions</h2>
-<ol>
-  <li>
-    The implementation is unable to report the battery's charging state,
-    charging time, level or remaining time respectively.
-  </li>
-  <li>
-    The device is unplugged from the charger before this test case is run.
-  </li>
-</ol>
-
-<div id="log"></div>
-
-<script>
-
-async_test(function (t) {
-  navigator.getBattery().then(function (battery) {
-    t.step(function () {
-      assert_true(battery.charging, 'charging must be set to true');
-      assert_equals(battery.chargingTime, 0, 'chargingTime must be set to 0');
-      assert_equals(battery.dischargingTime, Infinity, 'dischargingTime must be set to Infinity');
-      assert_equals(battery.level, 1.0, 'level must be set to 1.0');
-    });
-    t.done();
-  }, function (error) {
-    t.step(function () {
-      assert_unreached(error.message);
-    });
-    t.done();
-  });
-}, 'When a BatteryManager object is created, charging must be set to true, ' +
-   'chargingTime to 0, level to 1.0 and dischargingTime to the value positive ' +
-   'Infinity, if the implementation is unable to report the battery\'s charging ' +
-   'state, charging time, level or remaining time respectively.');
-
-</script>
diff --git a/testing/web-platform/tests/conformance-checkers/messages.json b/testing/web-platform/tests/conformance-checkers/messages.json
index 1b5daba1f65a..4a7959a4a3c5 100644
--- a/testing/web-platform/tests/conformance-checkers/messages.json
+++ b/testing/web-platform/tests/conformance-checkers/messages.json
@@ -51,12 +51,12 @@
     "html/attributes/lang/xmllang-only-novalid.html": "When the attribute \u201cxml:lang\u201d in no namespace is specified, the element must also have the attribute \u201clang\u201d present with the same value.",
     "html/attributes/role/unrecognized-role-name-novalid.html": "Discarding unrecognized tokens \u201cswitch\u201d, \u201cinput\u201d from value of attribute \u201crole\u201d. Browsers ignore any token that is not a defined ARIA non-abstract role.",
     "html/attributes/spellcheck/value-bad-novalid.html": "Bad value \u201cbadvalue\u201d for attribute \u201cspellcheck\u201d on element \u201cp\u201d.",
-    "html/elements/a/href/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/a/href/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/a/href/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/a/href/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/a/href/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/a/href/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/a/href/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/a/href/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/a/href/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/a/href/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/a/href/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/a/href/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/a/href/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/a/href/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: empty host.",
@@ -64,38 +64,38 @@
     "html/elements/a/href/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/a/href/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/a/href/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/a/href/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/a/href/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port.",
+    "html/elements/a/href/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/a/href/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/a/href/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/a/href/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/a/href/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/a/href/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/a/href/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/a/href/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/a/href/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/a/href/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/a/href/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/a/href/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/a/href/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/a/href/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/a/href/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/a/href/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/a/href/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/a/href/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/a/href/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/a/href/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/a/href/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/a/href/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/a/href/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/a/href/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port.",
-    "html/elements/a/href/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port.",
-    "html/elements/a/href/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port.",
-    "html/elements/a/href/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port.",
+    "html/elements/a/href/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/a/href/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/a/href/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/a/href/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/a/href/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/a/href/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port.",
-    "html/elements/a/href/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port.",
+    "html/elements/a/href/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/a/href/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/a/href/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/a/href/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/a/href/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/a/href/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/a/href/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/a/href/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/a/href/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/a/href/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/a/href/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/a/href/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/a/href/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/a/href/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/a/href/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/a/href/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/a/href/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Expected a slash (\"/\").",
@@ -106,26 +106,26 @@
     "html/elements/a/href/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/a/href/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/a/href/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: syntax error",
-    "html/elements/a/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/a/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/a/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/a/href/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/a/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/a/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/a/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/a/href/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/a/href/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/a/href/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/a/href/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/a/href/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/a/href/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/a/href/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/a/href/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/a/href/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/a/media-novalid.html": "Attribute \u201cmedia\u201d not allowed on element \u201ca\u201d in this context.",
     "html/elements/a/model-novalid.html": "Element \u201cp\u201d not allowed in this context. (The parent was element \u201ca\u201d.) Suppressing further errors from this subtree.",
     "html/elements/a/name-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201cname\u201d on element \u201ca\u201d: Bad id: An ID must not be the empty string.",
     "html/elements/abbr/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/address/model-novalid.html": "The element \u201caddress\u201d must not appear as a descendant of the \u201caddress\u201d element.",
-    "html/elements/area/href/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/area/href/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/area/href/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/area/href/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/area/href/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/area/href/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/area/href/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/area/href/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/area/href/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/area/href/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/area/href/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/area/href/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/area/href/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/area/href/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: empty host.",
@@ -133,38 +133,38 @@
     "html/elements/area/href/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/area/href/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/area/href/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/area/href/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/area/href/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port.",
+    "html/elements/area/href/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/area/href/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/area/href/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/area/href/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/area/href/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/area/href/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/area/href/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/area/href/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/area/href/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/area/href/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/area/href/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/area/href/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/area/href/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/area/href/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/area/href/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/area/href/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/area/href/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/area/href/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/area/href/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/area/href/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/area/href/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/area/href/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/area/href/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/area/href/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port.",
-    "html/elements/area/href/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port.",
-    "html/elements/area/href/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port.",
-    "html/elements/area/href/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port.",
+    "html/elements/area/href/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/area/href/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/area/href/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/area/href/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/area/href/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/area/href/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port.",
-    "html/elements/area/href/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port.",
+    "html/elements/area/href/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/area/href/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/area/href/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/area/href/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/area/href/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/area/href/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/area/href/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/area/href/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/area/href/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/area/href/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/area/href/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/area/href/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/area/href/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/area/href/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/area/href/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/area/href/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/area/href/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Expected a slash (\"/\").",
@@ -175,26 +175,26 @@
     "html/elements/area/href/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/area/href/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/area/href/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: syntax error",
-    "html/elements/area/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/area/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/area/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/area/href/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/area/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/area/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/area/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/area/href/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/area/href/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/area/href/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/area/href/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/area/href/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/area/href/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/area/href/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/area/href/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/area/href/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/area/media-novalid.html": "Attribute \u201cmedia\u201d not allowed on element \u201carea\u201d in this context.",
     "html/elements/area/model-novalid.html": "Attribute \u201ccoords\u201d not allowed on element \u201carea\u201d in this context.",
     "html/elements/audio/model-novalid.html": "Element \u201cp\u201d not allowed in this context. (The parent was element \u201caudio\u201d.) Suppressing further errors from this subtree.",
     "html/elements/audio/src-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Must be non-empty.",
     "html/elements/audio/src-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Must be non-empty.",
-    "html/elements/audio/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/audio/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/audio/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/audio/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/audio/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/audio/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/audio/src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/audio/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/audio/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/audio/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/audio/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/audio/src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/audio/src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/audio/src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: empty host.",
@@ -202,38 +202,38 @@
     "html/elements/audio/src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/audio/src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/audio/src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/audio/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/audio/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port.",
+    "html/elements/audio/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/audio/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/audio/src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/audio/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/audio/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/audio/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/audio/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/audio/src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/audio/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/audio/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/audio/src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/audio/src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/audio/src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/audio/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/audio/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/audio/src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/audio/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/audio/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/audio/src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/audio/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/audio/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/audio/src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/audio/src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/audio/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port.",
-    "html/elements/audio/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port.",
-    "html/elements/audio/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port.",
-    "html/elements/audio/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port.",
+    "html/elements/audio/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/audio/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/audio/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/audio/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/audio/src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/audio/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port.",
-    "html/elements/audio/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port.",
+    "html/elements/audio/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/audio/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/audio/src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/audio/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/audio/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/audio/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/audio/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/audio/src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/audio/src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/audio/src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/audio/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/audio/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/audio/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/audio/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/audio/src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/audio/src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/audio/src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Expected a slash (\"/\").",
@@ -244,22 +244,22 @@
     "html/elements/audio/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/audio/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/audio/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: syntax error",
-    "html/elements/audio/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/audio/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/audio/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/audio/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/audio/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/audio/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/audio/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/audio/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/audio/src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/audio/src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/audio/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/audio/src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/audio/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/audio/src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/audio/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/audio/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/base/href-and-target-missing-novalid.html": "Element \u201cbase\u201d is missing one or more of the following attributes: [href, target].",
-    "html/elements/base/href/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/base/href/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/base/href/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/base/href/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/base/href/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/base/href/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/base/href/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/base/href/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/base/href/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/base/href/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/base/href/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/base/href/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/base/href/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/base/href/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: empty host.",
@@ -267,38 +267,38 @@
     "html/elements/base/href/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/base/href/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/base/href/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/base/href/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/base/href/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port.",
+    "html/elements/base/href/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/base/href/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/base/href/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/base/href/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/base/href/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/base/href/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/base/href/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/base/href/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/base/href/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/base/href/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/base/href/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/base/href/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/base/href/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/base/href/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/base/href/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/base/href/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/base/href/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/base/href/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/base/href/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/base/href/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/base/href/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/base/href/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/base/href/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/base/href/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port.",
-    "html/elements/base/href/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port.",
-    "html/elements/base/href/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port.",
-    "html/elements/base/href/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port.",
+    "html/elements/base/href/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/base/href/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/base/href/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/base/href/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/base/href/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/base/href/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port.",
-    "html/elements/base/href/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port.",
+    "html/elements/base/href/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/base/href/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/base/href/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/base/href/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/base/href/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/base/href/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/base/href/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/base/href/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/base/href/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/base/href/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/base/href/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/base/href/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/base/href/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/base/href/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/base/href/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/base/href/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/base/href/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Expected a slash (\"/\").",
@@ -309,22 +309,22 @@
     "html/elements/base/href/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/base/href/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/base/href/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: syntax error",
-    "html/elements/base/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/base/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/base/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/base/href/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/base/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/base/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/base/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/base/href/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/base/href/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/base/href/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/base/href/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/base/href/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/base/href/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/base/href/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/base/href/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/base/href/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/bdo/model-novalid.html": "Element \u201cbdo\u201d must have attribute \u201cdir\u201d.",
-    "html/elements/blockquote/cite/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/blockquote/cite/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/blockquote/cite/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/blockquote/cite/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/blockquote/cite/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/blockquote/cite/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/blockquote/cite/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/blockquote/cite/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/blockquote/cite/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/blockquote/cite/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/blockquote/cite/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/blockquote/cite/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/blockquote/cite/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/blockquote/cite/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: empty host.",
@@ -332,38 +332,38 @@
     "html/elements/blockquote/cite/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/blockquote/cite/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/blockquote/cite/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/blockquote/cite/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/blockquote/cite/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port.",
+    "html/elements/blockquote/cite/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/blockquote/cite/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/blockquote/cite/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/blockquote/cite/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/blockquote/cite/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/blockquote/cite/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/blockquote/cite/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/blockquote/cite/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/blockquote/cite/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/blockquote/cite/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/blockquote/cite/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/blockquote/cite/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/blockquote/cite/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/blockquote/cite/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/blockquote/cite/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/blockquote/cite/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/blockquote/cite/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/blockquote/cite/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/blockquote/cite/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/blockquote/cite/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/blockquote/cite/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/blockquote/cite/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/blockquote/cite/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/blockquote/cite/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port.",
-    "html/elements/blockquote/cite/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port.",
-    "html/elements/blockquote/cite/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port.",
-    "html/elements/blockquote/cite/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port.",
+    "html/elements/blockquote/cite/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/blockquote/cite/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/blockquote/cite/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/blockquote/cite/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/blockquote/cite/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/blockquote/cite/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port.",
-    "html/elements/blockquote/cite/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port.",
+    "html/elements/blockquote/cite/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/blockquote/cite/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/blockquote/cite/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/blockquote/cite/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/blockquote/cite/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/blockquote/cite/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/blockquote/cite/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/blockquote/cite/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/blockquote/cite/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/blockquote/cite/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/blockquote/cite/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/blockquote/cite/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/blockquote/cite/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/blockquote/cite/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/blockquote/cite/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/blockquote/cite/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/blockquote/cite/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Expected a slash (\"/\").",
@@ -374,25 +374,25 @@
     "html/elements/blockquote/cite/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/blockquote/cite/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/blockquote/cite/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: syntax error",
-    "html/elements/blockquote/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/blockquote/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/blockquote/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/blockquote/cite/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/blockquote/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/blockquote/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/blockquote/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/blockquote/cite/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/blockquote/cite/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/blockquote/cite/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/blockquote/cite/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/blockquote/cite/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/blockquote/cite/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/blockquote/cite/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/blockquote/cite/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/blockquote/cite/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/blockquote/model-novalid.html": "No \u201cp\u201d element in scope but a \u201cp\u201d end tag seen.",
     "html/elements/br/model-novalid.html": "End tag \u201cbr\u201d.",
     "html/elements/button/formaction-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Must be non-empty.",
     "html/elements/button/formaction-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Must be non-empty.",
-    "html/elements/button/formaction/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/button/formaction/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/button/formaction/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/button/formaction/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/button/formaction/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/button/formaction/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/button/formaction/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/button/formaction/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/button/formaction/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/button/formaction/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/button/formaction/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/button/formaction/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/button/formaction/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/button/formaction/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: empty host.",
@@ -400,38 +400,38 @@
     "html/elements/button/formaction/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/button/formaction/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/button/formaction/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/button/formaction/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/button/formaction/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port.",
+    "html/elements/button/formaction/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/button/formaction/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/button/formaction/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/button/formaction/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/button/formaction/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/button/formaction/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/button/formaction/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/button/formaction/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/button/formaction/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/button/formaction/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/button/formaction/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/button/formaction/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/button/formaction/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/button/formaction/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/button/formaction/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/button/formaction/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/button/formaction/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/button/formaction/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/button/formaction/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/button/formaction/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/button/formaction/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/button/formaction/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/button/formaction/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/button/formaction/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port.",
-    "html/elements/button/formaction/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port.",
-    "html/elements/button/formaction/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port.",
-    "html/elements/button/formaction/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port.",
+    "html/elements/button/formaction/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/button/formaction/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/button/formaction/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/button/formaction/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/button/formaction/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/button/formaction/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port.",
-    "html/elements/button/formaction/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port.",
+    "html/elements/button/formaction/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/button/formaction/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/button/formaction/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/button/formaction/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/button/formaction/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/button/formaction/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/button/formaction/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/button/formaction/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/button/formaction/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/button/formaction/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/button/formaction/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/button/formaction/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/button/formaction/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/button/formaction/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/button/formaction/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/button/formaction/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/button/formaction/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Expected a slash (\"/\").",
@@ -442,24 +442,24 @@
     "html/elements/button/formaction/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/button/formaction/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/button/formaction/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: syntax error",
-    "html/elements/button/formaction/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/button/formaction/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/button/formaction/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/button/formaction/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/button/formaction/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/button/formaction/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/button/formaction/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/button/formaction/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/button/formaction/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/button/formaction/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/button/formaction/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/button/formaction/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/button/formaction/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/button/formaction/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/button/formaction/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/button/formaction/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/canvas/model-novalid.html": "Element \u201cp\u201d not allowed in this context. (The parent was element \u201ccanvas\u201d.) Suppressing further errors from this subtree.",
     "html/elements/cite/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/code/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
-    "html/elements/del/cite/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/del/cite/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/del/cite/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/del/cite/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/del/cite/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/del/cite/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/del/cite/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/del/cite/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/del/cite/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/del/cite/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/del/cite/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/del/cite/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/del/cite/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/del/cite/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: empty host.",
@@ -467,38 +467,38 @@
     "html/elements/del/cite/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/del/cite/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/del/cite/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/del/cite/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/del/cite/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port.",
+    "html/elements/del/cite/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/del/cite/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/del/cite/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/del/cite/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/del/cite/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/del/cite/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/del/cite/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/del/cite/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/del/cite/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/del/cite/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/del/cite/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/del/cite/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/del/cite/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/del/cite/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/del/cite/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/del/cite/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/del/cite/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/del/cite/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/del/cite/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/del/cite/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/del/cite/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/del/cite/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/del/cite/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/del/cite/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port.",
-    "html/elements/del/cite/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port.",
-    "html/elements/del/cite/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port.",
-    "html/elements/del/cite/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port.",
+    "html/elements/del/cite/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/del/cite/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/del/cite/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/del/cite/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/del/cite/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/del/cite/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port.",
-    "html/elements/del/cite/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port.",
+    "html/elements/del/cite/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/del/cite/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/del/cite/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/del/cite/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/del/cite/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/del/cite/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/del/cite/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/del/cite/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/del/cite/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/del/cite/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/del/cite/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/del/cite/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/del/cite/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/del/cite/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/del/cite/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/del/cite/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/del/cite/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Expected a slash (\"/\").",
@@ -509,15 +509,15 @@
     "html/elements/del/cite/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/del/cite/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/del/cite/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: syntax error",
-    "html/elements/del/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/del/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/del/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/del/cite/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/del/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/del/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/del/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/del/cite/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/del/cite/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/del/cite/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/del/cite/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/del/cite/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/del/cite/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/del/cite/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/del/cite/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/del/cite/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/del/date-0004-02-29-haswarn.html": "Bad value \u201c0004-02-29\u201d for attribute \u201cdatetime\u201d on element \u201cdel\u201d: Bad date: Year may be mistyped. Bad datetime with timezone: The literal did not satisfy the datetime with timezone format.",
     "html/elements/del/date-0005-02-29-novalid.html": "Bad value \u201c0005-02-29\u201d for attribute \u201cdatetime\u201d on element \u201cdel\u201d: Bad datetime with timezone: The literal did not satisfy the datetime with timezone format. Bad date: Day out of range.",
     "html/elements/del/date-0214-09-29-haswarn.html": "Bad value \u201c0214-09-29\u201d for attribute \u201cdatetime\u201d on element \u201cdel\u201d: Bad date: Year may be mistyped. Bad datetime with timezone: The literal did not satisfy the datetime with timezone format.",
@@ -616,12 +616,12 @@
     "html/elements/embed/height-novalid.html": "Bad value \u201c20%\u201d for attribute \u201cheight\u201d on element \u201cembed\u201d: Bad non-negative integer: Expected a digit but saw \u201c%\u201d instead.",
     "html/elements/embed/src-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Must be non-empty.",
     "html/elements/embed/src-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Must be non-empty.",
-    "html/elements/embed/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/embed/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/embed/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/embed/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/embed/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/embed/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/embed/src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/embed/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/embed/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/embed/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/embed/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/embed/src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/embed/src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/embed/src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: empty host.",
@@ -629,38 +629,38 @@
     "html/elements/embed/src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/embed/src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/embed/src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/embed/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/embed/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port.",
+    "html/elements/embed/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/embed/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/embed/src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/embed/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/embed/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/embed/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/embed/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/embed/src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/embed/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/embed/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/embed/src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/embed/src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/embed/src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/embed/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/embed/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/embed/src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/embed/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/embed/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/embed/src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/embed/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/embed/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/embed/src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/embed/src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/embed/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port.",
-    "html/elements/embed/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port.",
-    "html/elements/embed/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port.",
-    "html/elements/embed/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port.",
+    "html/elements/embed/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/embed/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/embed/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/embed/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/embed/src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/embed/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port.",
-    "html/elements/embed/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port.",
+    "html/elements/embed/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/embed/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/embed/src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/embed/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/embed/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/embed/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/embed/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/embed/src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/embed/src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/embed/src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/embed/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/embed/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/embed/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/embed/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/embed/src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/embed/src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/embed/src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Expected a slash (\"/\").",
@@ -671,27 +671,27 @@
     "html/elements/embed/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/embed/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/embed/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: syntax error",
-    "html/elements/embed/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/embed/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/embed/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/embed/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/embed/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/embed/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/embed/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/embed/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/embed/src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/embed/src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/embed/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/embed/src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/embed/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/embed/src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/embed/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/embed/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/embed/type-novalid.html": "Bad value \u201cfoo\u201d for attribute \u201ctype\u201d on element \u201cembed\u201d: Bad MIME type: Subtype missing.",
     "html/elements/embed/width-novalid.html": "Bad value \u201c20%\u201d for attribute \u201cwidth\u201d on element \u201cembed\u201d: Bad non-negative integer: Expected a digit but saw \u201c%\u201d instead.",
     "html/elements/footer/nested-footer-novalid.html": "The element \u201cfooter\u201d must not appear as a descendant of the \u201cfooter\u201d element.",
     "html/elements/footer/nested-header-novalid.html": "The element \u201cheader\u201d must not appear as a descendant of the \u201cfooter\u201d element.",
     "html/elements/form/action-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Must be non-empty.",
     "html/elements/form/action-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Must be non-empty.",
-    "html/elements/form/action/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/form/action/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/form/action/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/form/action/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/form/action/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/form/action/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/form/action/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/form/action/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/form/action/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/form/action/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/form/action/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/form/action/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/form/action/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/form/action/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: empty host.",
@@ -699,38 +699,38 @@
     "html/elements/form/action/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/form/action/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/form/action/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/form/action/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/form/action/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port.",
+    "html/elements/form/action/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/form/action/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/form/action/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/form/action/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/form/action/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/form/action/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/form/action/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/form/action/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/form/action/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/form/action/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/form/action/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/form/action/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/form/action/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/form/action/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/form/action/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/form/action/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/form/action/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/form/action/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/form/action/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/form/action/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/form/action/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/form/action/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/form/action/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/form/action/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port.",
-    "html/elements/form/action/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port.",
-    "html/elements/form/action/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port.",
-    "html/elements/form/action/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port.",
+    "html/elements/form/action/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/form/action/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/form/action/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/form/action/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/form/action/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/form/action/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port.",
-    "html/elements/form/action/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port.",
+    "html/elements/form/action/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/form/action/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/form/action/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/form/action/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/form/action/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/form/action/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/form/action/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/form/action/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/form/action/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/form/action/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/form/action/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/form/action/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/form/action/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/form/action/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/form/action/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/form/action/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/form/action/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Expected a slash (\"/\").",
@@ -741,15 +741,15 @@
     "html/elements/form/action/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/form/action/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/form/action/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: syntax error",
-    "html/elements/form/action/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/form/action/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/form/action/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/form/action/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/form/action/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/form/action/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/form/action/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/form/action/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/form/action/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/form/action/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/form/action/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/form/action/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/form/action/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/form/action/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/form/action/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/form/action/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/h1/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/h2/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/h3/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
@@ -761,12 +761,12 @@
     "html/elements/hr/model-novalid.html": "No \u201cp\u201d element in scope but a \u201cp\u201d end tag seen.",
     "html/elements/html/manifest-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Must be non-empty.",
     "html/elements/html/manifest-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Must be non-empty.",
-    "html/elements/html/manifest/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/html/manifest/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/html/manifest/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/html/manifest/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/html/manifest/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/html/manifest/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/html/manifest/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/html/manifest/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/html/manifest/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/html/manifest/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/html/manifest/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/html/manifest/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/html/manifest/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/html/manifest/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: empty host.",
@@ -774,38 +774,38 @@
     "html/elements/html/manifest/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/html/manifest/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/html/manifest/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/html/manifest/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/html/manifest/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port.",
+    "html/elements/html/manifest/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/html/manifest/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/html/manifest/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/html/manifest/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/html/manifest/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/html/manifest/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/html/manifest/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/html/manifest/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/html/manifest/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/html/manifest/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/html/manifest/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/html/manifest/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/html/manifest/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/html/manifest/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/html/manifest/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/html/manifest/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/html/manifest/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/html/manifest/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/html/manifest/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/html/manifest/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/html/manifest/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/html/manifest/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/html/manifest/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/html/manifest/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port.",
-    "html/elements/html/manifest/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port.",
-    "html/elements/html/manifest/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port.",
-    "html/elements/html/manifest/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port.",
+    "html/elements/html/manifest/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/html/manifest/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/html/manifest/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/html/manifest/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/html/manifest/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/html/manifest/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port.",
-    "html/elements/html/manifest/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port.",
+    "html/elements/html/manifest/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/html/manifest/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/html/manifest/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/html/manifest/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/html/manifest/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/html/manifest/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/html/manifest/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/html/manifest/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/html/manifest/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/html/manifest/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/html/manifest/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/html/manifest/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/html/manifest/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/html/manifest/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/html/manifest/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/html/manifest/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/html/manifest/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Expected a slash (\"/\").",
@@ -816,25 +816,25 @@
     "html/elements/html/manifest/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/html/manifest/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/html/manifest/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: syntax error",
-    "html/elements/html/manifest/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/html/manifest/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/html/manifest/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/html/manifest/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/html/manifest/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/html/manifest/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/html/manifest/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/html/manifest/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/html/manifest/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/html/manifest/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/html/manifest/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/html/manifest/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/html/manifest/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/html/manifest/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/html/manifest/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/html/manifest/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/i/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/iframe/model-novalid.html": "The \u201cframeborder\u201d attribute on the \u201ciframe\u201d element is obsolete. Use CSS instead.",
     "html/elements/iframe/src-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Must be non-empty.",
     "html/elements/iframe/src-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Must be non-empty.",
-    "html/elements/iframe/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/iframe/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/iframe/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/iframe/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/iframe/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/iframe/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/iframe/src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/iframe/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/iframe/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/iframe/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/iframe/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/iframe/src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/iframe/src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/iframe/src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: empty host.",
@@ -842,38 +842,38 @@
     "html/elements/iframe/src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/iframe/src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/iframe/src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/iframe/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/iframe/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port.",
+    "html/elements/iframe/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/iframe/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/iframe/src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/iframe/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/iframe/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/iframe/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/iframe/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/iframe/src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/iframe/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/iframe/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/iframe/src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/iframe/src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/iframe/src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/iframe/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/iframe/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/iframe/src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/iframe/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/iframe/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/iframe/src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/iframe/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/iframe/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/iframe/src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/iframe/src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/iframe/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port.",
-    "html/elements/iframe/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port.",
-    "html/elements/iframe/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port.",
-    "html/elements/iframe/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port.",
+    "html/elements/iframe/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/iframe/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/iframe/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/iframe/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/iframe/src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/iframe/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port.",
-    "html/elements/iframe/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port.",
+    "html/elements/iframe/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/iframe/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/iframe/src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/iframe/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/iframe/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/iframe/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/iframe/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/iframe/src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/iframe/src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/iframe/src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/iframe/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/iframe/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/iframe/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/iframe/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/iframe/src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/iframe/src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/iframe/src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Expected a slash (\"/\").",
@@ -884,24 +884,24 @@
     "html/elements/iframe/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/iframe/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/iframe/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: syntax error",
-    "html/elements/iframe/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/iframe/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/iframe/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/iframe/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/iframe/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/iframe/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/iframe/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/iframe/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/iframe/src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/iframe/src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/iframe/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/iframe/src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/iframe/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/iframe/src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/iframe/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/iframe/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/img/model-novalid.html": "Bad value \u201curl\u201d for attribute \u201cusemap\u201d on element \u201cimg\u201d: Bad hash-name reference: A hash-name reference must start with \u201c#\u201d.",
     "html/elements/img/src-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Must be non-empty.",
     "html/elements/img/src-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Must be non-empty.",
-    "html/elements/img/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/img/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/img/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/img/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/img/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/img/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/img/src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/img/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/img/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/img/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/img/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/img/src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/img/src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/img/src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: empty host.",
@@ -909,38 +909,38 @@
     "html/elements/img/src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/img/src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/img/src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/img/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/img/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port.",
+    "html/elements/img/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/img/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/img/src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/img/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/img/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/img/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/img/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/img/src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/img/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/img/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/img/src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/img/src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/img/src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/img/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/img/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/img/src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/img/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/img/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/img/src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/img/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/img/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/img/src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/img/src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/img/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port.",
-    "html/elements/img/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port.",
-    "html/elements/img/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port.",
-    "html/elements/img/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port.",
+    "html/elements/img/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/img/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/img/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/img/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/img/src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/img/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port.",
-    "html/elements/img/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port.",
+    "html/elements/img/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/img/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/img/src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/img/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/img/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/img/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/img/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/img/src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/img/src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/img/src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/img/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/img/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/img/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/img/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/img/src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/img/src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/img/src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Expected a slash (\"/\").",
@@ -951,15 +951,15 @@
     "html/elements/img/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/img/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/img/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: syntax error",
-    "html/elements/img/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/img/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/img/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/img/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/img/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/img/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/img/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/img/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/img/src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/img/src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/img/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/img/src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/img/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/img/src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/img/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/img/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/img/usemap-bad-value-novalid.html": "Bad value \u201c#\u201d for attribute \u201cusemap\u201d on element \u201cimg\u201d: Bad hash-name reference: A hash-name reference must have at least one character after \u201c#\u201d.",
     "html/elements/img/width-height-negative-novalid.html": "Bad value \u201c-1\u201d for attribute \u201cwidth\u201d on element \u201cimg\u201d: Bad non-negative integer: Expected a digit but saw \u201c-\u201d instead.",
     "html/elements/input/list-novalid.html": "The \u201clist\u201d attribute of the \u201cinput\u201d element must refer to a \u201cdatalist\u201d element.",
@@ -967,12 +967,12 @@
     "html/elements/input/pattern-paren-novalid.html": "Bad value \u201c(\u201d for attribute \u201cpattern\u201d on element \u201cinput\u201d: Bad pattern: Unterminated parenthetical ",
     "html/elements/input/type-image-formaction-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Must be non-empty.",
     "html/elements/input/type-image-formaction-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Must be non-empty.",
-    "html/elements/input/type-image-formaction/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/input/type-image-formaction/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/input/type-image-formaction/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/input/type-image-formaction/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/input/type-image-formaction/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-formaction/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/input/type-image-formaction/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/input/type-image-formaction/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/input/type-image-formaction/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/input/type-image-formaction/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/input/type-image-formaction/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
@@ -980,38 +980,38 @@
     "html/elements/input/type-image-formaction/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/input/type-image-formaction/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/input/type-image-formaction/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-formaction/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/input/type-image-formaction/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-image-formaction/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/input/type-image-formaction/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/input/type-image-formaction/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-formaction/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/input/type-image-formaction/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/input/type-image-formaction/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/input/type-image-formaction/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/input/type-image-formaction/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-image-formaction/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/input/type-image-formaction/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/input/type-image-formaction/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/input/type-image-formaction/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-image-formaction/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-image-formaction/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/input/type-image-formaction/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/input/type-image-formaction/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-image-formaction/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/input/type-image-formaction/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-formaction/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-image-formaction/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/input/type-image-formaction/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/input/type-image-formaction/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-formaction/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
-    "html/elements/input/type-image-formaction/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
-    "html/elements/input/type-image-formaction/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
-    "html/elements/input/type-image-formaction/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-image-formaction/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/input/type-image-formaction/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-formaction/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
-    "html/elements/input/type-image-formaction/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-image-formaction/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/input/type-image-formaction/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-formaction/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/input/type-image-formaction/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/input/type-image-formaction/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/input/type-image-formaction/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/input/type-image-formaction/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/input/type-image-formaction/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/input/type-image-formaction/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-image-formaction/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/input/type-image-formaction/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-image-formaction/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/input/type-image-formaction/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-formaction/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-formaction/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1022,23 +1022,23 @@
     "html/elements/input/type-image-formaction/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-formaction/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-formaction/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: syntax error",
-    "html/elements/input/type-image-formaction/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/input/type-image-formaction/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/input/type-image-formaction/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/input/type-image-formaction/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/input/type-image-formaction/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/input/type-image-formaction/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/input/type-image-formaction/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/input/type-image-formaction/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/input/type-image-formaction/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-image-formaction/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/input/type-image-formaction/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/input/type-image-formaction/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/input/type-image-formaction/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/input/type-image-formaction/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/input/type-image-formaction/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/input/type-image-src-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Must be non-empty.",
     "html/elements/input/type-image-src-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Must be non-empty.",
-    "html/elements/input/type-image-src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/input/type-image-src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/input/type-image-src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/input/type-image-src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/input/type-image-src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/input/type-image-src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/input/type-image-src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/input/type-image-src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/input/type-image-src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/input/type-image-src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/input/type-image-src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/input/type-image-src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/input/type-image-src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
@@ -1046,38 +1046,38 @@
     "html/elements/input/type-image-src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/input/type-image-src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/input/type-image-src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/input/type-image-src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-image-src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/input/type-image-src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/input/type-image-src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/input/type-image-src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/input/type-image-src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/input/type-image-src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/input/type-image-src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/input/type-image-src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-image-src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/input/type-image-src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/input/type-image-src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/input/type-image-src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-image-src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-image-src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/input/type-image-src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/input/type-image-src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-image-src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/input/type-image-src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-image-src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/input/type-image-src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/input/type-image-src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
-    "html/elements/input/type-image-src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
-    "html/elements/input/type-image-src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
-    "html/elements/input/type-image-src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-image-src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/input/type-image-src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/input/type-image-src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/input/type-image-src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/input/type-image-src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
-    "html/elements/input/type-image-src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-image-src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/input/type-image-src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/input/type-image-src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/input/type-image-src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/input/type-image-src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/input/type-image-src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/input/type-image-src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/input/type-image-src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/input/type-image-src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-image-src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/input/type-image-src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-image-src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/input/type-image-src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/input/type-image-src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1088,23 +1088,23 @@
     "html/elements/input/type-image-src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: syntax error",
-    "html/elements/input/type-image-src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/input/type-image-src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/input/type-image-src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/input/type-image-src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/input/type-image-src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/input/type-image-src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/input/type-image-src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/input/type-image-src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/input/type-image-src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-image-src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/input/type-image-src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/input/type-image-src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/input/type-image-src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/input/type-image-src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/input/type-image-src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/input/type-image-src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/input/type-submit-formaction-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Must be non-empty.",
     "html/elements/input/type-submit-formaction-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Must be non-empty.",
-    "html/elements/input/type-submit-formaction/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/input/type-submit-formaction/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/input/type-submit-formaction/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/input/type-submit-formaction/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/input/type-submit-formaction/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-submit-formaction/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/input/type-submit-formaction/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/input/type-submit-formaction/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/input/type-submit-formaction/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/input/type-submit-formaction/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/input/type-submit-formaction/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
@@ -1112,38 +1112,38 @@
     "html/elements/input/type-submit-formaction/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/input/type-submit-formaction/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/input/type-submit-formaction/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-submit-formaction/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/input/type-submit-formaction/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-submit-formaction/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/input/type-submit-formaction/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/input/type-submit-formaction/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-submit-formaction/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/input/type-submit-formaction/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/input/type-submit-formaction/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/input/type-submit-formaction/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/input/type-submit-formaction/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-submit-formaction/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/input/type-submit-formaction/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/input/type-submit-formaction/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/input/type-submit-formaction/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-submit-formaction/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-submit-formaction/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/input/type-submit-formaction/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/input/type-submit-formaction/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-submit-formaction/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/input/type-submit-formaction/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-submit-formaction/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-submit-formaction/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/input/type-submit-formaction/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/input/type-submit-formaction/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-submit-formaction/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
-    "html/elements/input/type-submit-formaction/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
-    "html/elements/input/type-submit-formaction/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
-    "html/elements/input/type-submit-formaction/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-submit-formaction/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/input/type-submit-formaction/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-submit-formaction/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
-    "html/elements/input/type-submit-formaction/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-submit-formaction/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/input/type-submit-formaction/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-submit-formaction/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/input/type-submit-formaction/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/input/type-submit-formaction/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/input/type-submit-formaction/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/input/type-submit-formaction/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/input/type-submit-formaction/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/input/type-submit-formaction/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-submit-formaction/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/input/type-submit-formaction/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-submit-formaction/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/input/type-submit-formaction/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-submit-formaction/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-submit-formaction/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1154,25 +1154,25 @@
     "html/elements/input/type-submit-formaction/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-submit-formaction/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-submit-formaction/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: syntax error",
-    "html/elements/input/type-submit-formaction/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/input/type-submit-formaction/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/input/type-submit-formaction/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/input/type-submit-formaction/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/input/type-submit-formaction/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/input/type-submit-formaction/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/input/type-submit-formaction/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/input/type-submit-formaction/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/input/type-submit-formaction/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-submit-formaction/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/input/type-submit-formaction/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/input/type-submit-formaction/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/input/type-submit-formaction/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/input/type-submit-formaction/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/input/type-submit-formaction/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/input/type-url-value/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c#\\\u201d is not an absolute URL.",
-    "html/elements/input/type-url-value/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/input/type-url-value/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
     "html/elements/input/type-url-value/fragment-empty-hash-only-no-path-relative-novalid.html": "Bad value \u201c#\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c#\u201d is not an absolute URL.",
-    "html/elements/input/type-url-value/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/input/type-url-value/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in fragment: space is not allowed.",
     "html/elements/input/type-url-value/fragment-non-ascii-relative-novalid.html": "Bad value \u201c#\u03b2\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c#\u03b2\u201d is not an absolute URL.",
     "html/elements/input/type-url-value/fragment-semicolon-question-mark-relative-novalid.html": "Bad value \u201c#;?\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c#;?\u201d is not an absolute URL.",
     "html/elements/input/type-url-value/fragment-slash-relative-novalid.html": "Bad value \u201c#/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c#/\u201d is not an absolute URL.",
     "html/elements/input/type-url-value/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-url-value/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/input/type-url-value/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/input/type-url-value/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/input/type-url-value/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/input/type-url-value/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: empty host.",
     "html/elements/input/type-url-value/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: empty host.",
     "html/elements/input/type-url-value/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: empty host.",
@@ -1180,17 +1180,17 @@
     "html/elements/input/type-url-value/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/input/type-url-value/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/input/type-url-value/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-url-value/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/input/type-url-value/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port.",
+    "html/elements/input/type-url-value/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/input/type-url-value/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/input/type-url-value/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-url-value/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/input/type-url-value/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/input/type-url-value/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/input/type-url-value/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/input/type-url-value/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
     "html/elements/input/type-url-value/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c/a/ /c\u201d is not an absolute URL.",
     "html/elements/input/type-url-value/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/input/type-url-value/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c:\\\u201d is not an absolute URL.",
     "html/elements/input/type-url-value/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c:foo.com\\\u201d is not an absolute URL.",
-    "html/elements/input/type-url-value/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-url-value/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in path segment: space is not allowed.",
     "html/elements/input/type-url-value/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
     "html/elements/input/type-url-value/path-percent-encoded-slash-plus-slashes-relative-novalid.html": "Bad value \u201c/a/%2f/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c/a/%2f/c\u201d is not an absolute URL.",
     "html/elements/input/type-url-value/path-percent-encoded-slash-relative-novalid.html": "Bad value \u201c/a%2fc\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c/a%2fc\u201d is not an absolute URL.",
@@ -1198,25 +1198,25 @@
     "html/elements/input/type-url-value/path-simple-relative-novalid.html": "Bad value \u201c/a/b/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c/a/b/c\u201d is not an absolute URL.",
     "html/elements/input/type-url-value/path-slash-only-relative-novalid.html": "Bad value \u201c/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c/\u201d is not an absolute URL.",
     "html/elements/input/type-url-value/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-url-value/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-url-value/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in path segment: space is not allowed.",
     "html/elements/input/type-url-value/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/input/type-url-value/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-url-value/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port.",
-    "html/elements/input/type-url-value/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port.",
-    "html/elements/input/type-url-value/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port.",
-    "html/elements/input/type-url-value/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port.",
+    "html/elements/input/type-url-value/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/input/type-url-value/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/input/type-url-value/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/input/type-url-value/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/input/type-url-value/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-url-value/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port.",
-    "html/elements/input/type-url-value/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port.",
+    "html/elements/input/type-url-value/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/input/type-url-value/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/input/type-url-value/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Tab, new line or carriage return found.",
     "html/elements/input/type-url-value/query-empty-no-path-relative-novalid.html": "Bad value \u201c?\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c?\u201d is not an absolute URL.",
-    "html/elements/input/type-url-value/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in query: not a URL code point.",
-    "html/elements/input/type-url-value/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in query: not a URL code point.",
+    "html/elements/input/type-url-value/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in query: space is not allowed.",
+    "html/elements/input/type-url-value/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in query: space is not allowed.",
     "html/elements/input/type-url-value/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/input/type-url-value/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/input/type-url-value/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-url-value/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/input/type-url-value/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-url-value/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/input/type-url-value/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/input/type-url-value/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Expected a slash (\"/\").",
     "html/elements/input/type-url-value/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Expected a slash (\"/\").",
     "html/elements/input/type-url-value/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Expected a slash (\"/\").",
@@ -1228,21 +1228,21 @@
     "html/elements/input/type-url-value/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Expected a slash (\"/\").",
     "html/elements/input/type-url-value/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: syntax error",
     "html/elements/input/type-url-value/scheme-schemeless-relative-novalid.html": "Bad value \u201c//foo/bar\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c//foo/bar\u201d is not an absolute URL.",
-    "html/elements/input/type-url-value/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/input/type-url-value/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/input/type-url-value/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/input/type-url-value/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/input/type-url-value/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/input/type-url-value/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/input/type-url-value/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/input/type-url-value/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/input/type-url-value/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-url-value/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/input/type-url-value/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/input/type-url-value/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/input/type-url-value/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/input/type-url-value/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/input/type-url-value/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in user or password: not a URL code point.",
-    "html/elements/ins/cite/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/ins/cite/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/ins/cite/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/input/type-url-value/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/ins/cite/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/ins/cite/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/ins/cite/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/ins/cite/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/ins/cite/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/ins/cite/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/ins/cite/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/ins/cite/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/ins/cite/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/ins/cite/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/ins/cite/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: empty host.",
@@ -1250,38 +1250,38 @@
     "html/elements/ins/cite/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/ins/cite/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/ins/cite/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/ins/cite/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/ins/cite/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port.",
+    "html/elements/ins/cite/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/ins/cite/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/ins/cite/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/ins/cite/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/ins/cite/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/ins/cite/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/ins/cite/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/ins/cite/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/ins/cite/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/ins/cite/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/ins/cite/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/ins/cite/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/ins/cite/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/ins/cite/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/ins/cite/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/ins/cite/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/ins/cite/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/ins/cite/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/ins/cite/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/ins/cite/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/ins/cite/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/ins/cite/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/ins/cite/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/ins/cite/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port.",
-    "html/elements/ins/cite/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port.",
-    "html/elements/ins/cite/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port.",
-    "html/elements/ins/cite/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port.",
+    "html/elements/ins/cite/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/ins/cite/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/ins/cite/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/ins/cite/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/ins/cite/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/ins/cite/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port.",
-    "html/elements/ins/cite/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port.",
+    "html/elements/ins/cite/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/ins/cite/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/ins/cite/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/ins/cite/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/ins/cite/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/ins/cite/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/ins/cite/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/ins/cite/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/ins/cite/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/ins/cite/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/ins/cite/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/ins/cite/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/ins/cite/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/ins/cite/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/ins/cite/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/ins/cite/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/ins/cite/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1292,15 +1292,15 @@
     "html/elements/ins/cite/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/ins/cite/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/ins/cite/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: syntax error",
-    "html/elements/ins/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/ins/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/ins/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/ins/cite/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/ins/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/ins/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/ins/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/ins/cite/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/ins/cite/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/ins/cite/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/ins/cite/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/ins/cite/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/ins/cite/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/ins/cite/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/ins/cite/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/ins/cite/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/ins/date-0004-02-29-haswarn.html": "Bad value \u201c0004-02-29\u201d for attribute \u201cdatetime\u201d on element \u201cins\u201d: Bad date: Year may be mistyped. Bad datetime with timezone: The literal did not satisfy the datetime with timezone format.",
     "html/elements/ins/date-0005-02-29-novalid.html": "Bad value \u201c0005-02-29\u201d for attribute \u201cdatetime\u201d on element \u201cins\u201d: Bad datetime with timezone: The literal did not satisfy the datetime with timezone format. Bad date: Day out of range.",
     "html/elements/ins/date-0214-09-29-haswarn.html": "Bad value \u201c0214-09-29\u201d for attribute \u201cdatetime\u201d on element \u201cins\u201d: Bad date: Year may be mistyped. Bad datetime with timezone: The literal did not satisfy the datetime with timezone format.",
@@ -1404,12 +1404,12 @@
     "html/elements/link/href-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Must be non-empty.",
     "html/elements/link/href-missing-novalid.html": "Element \u201clink\u201d is missing required attribute \u201chref\u201d.",
     "html/elements/link/href-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Must be non-empty.",
-    "html/elements/link/href/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/link/href/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/link/href/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/link/href/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/link/href/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/link/href/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/link/href/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/link/href/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/link/href/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/link/href/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/link/href/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/link/href/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/link/href/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/link/href/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: empty host.",
@@ -1417,38 +1417,38 @@
     "html/elements/link/href/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/link/href/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/link/href/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/link/href/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/link/href/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port.",
+    "html/elements/link/href/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/link/href/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/link/href/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/link/href/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/link/href/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/link/href/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/link/href/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/link/href/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/link/href/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/link/href/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/link/href/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/link/href/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/link/href/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/link/href/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/link/href/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/link/href/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/link/href/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/link/href/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/link/href/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/link/href/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/link/href/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/link/href/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/link/href/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/link/href/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port.",
-    "html/elements/link/href/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port.",
-    "html/elements/link/href/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port.",
-    "html/elements/link/href/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port.",
+    "html/elements/link/href/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/link/href/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/link/href/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/link/href/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/link/href/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/link/href/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port.",
-    "html/elements/link/href/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port.",
+    "html/elements/link/href/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/link/href/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/link/href/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/link/href/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/link/href/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/link/href/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/link/href/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/link/href/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/link/href/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/link/href/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/link/href/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/link/href/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/link/href/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/link/href/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/link/href/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/link/href/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/link/href/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1459,25 +1459,25 @@
     "html/elements/link/href/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/link/href/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/link/href/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: syntax error",
-    "html/elements/link/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/link/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/link/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/link/href/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/link/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/link/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/link/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/link/href/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/link/href/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/link/href/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/link/href/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/link/href/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/link/href/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/link/href/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/link/href/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/link/href/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/map/model-novalid.html": "The \u201cid\u201d attribute on a \u201cmap\u201d element must have an the same value as the \u201cname\u201d attribute.",
     "html/elements/object/data-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Must be non-empty.",
     "html/elements/object/data-type-missing-novalid.html": "Element \u201cobject\u201d is missing one or more of the following attributes: [data, type].",
     "html/elements/object/data-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Must be non-empty.",
-    "html/elements/object/data/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/object/data/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/object/data/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/object/data/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/object/data/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/object/data/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/object/data/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/object/data/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/object/data/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/object/data/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/object/data/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/object/data/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/object/data/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/object/data/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: empty host.",
@@ -1485,38 +1485,38 @@
     "html/elements/object/data/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/object/data/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/object/data/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/object/data/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/object/data/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port.",
+    "html/elements/object/data/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/object/data/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/object/data/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/object/data/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/object/data/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/object/data/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/object/data/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/object/data/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/object/data/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/object/data/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/object/data/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/object/data/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/object/data/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/object/data/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/object/data/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/object/data/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/object/data/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/object/data/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/object/data/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/object/data/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/object/data/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/object/data/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/object/data/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/object/data/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port.",
-    "html/elements/object/data/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port.",
-    "html/elements/object/data/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port.",
-    "html/elements/object/data/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port.",
+    "html/elements/object/data/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/object/data/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/object/data/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/object/data/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/object/data/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/object/data/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port.",
-    "html/elements/object/data/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port.",
+    "html/elements/object/data/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/object/data/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/object/data/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/object/data/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/object/data/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/object/data/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/object/data/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/object/data/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/object/data/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/object/data/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/object/data/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/object/data/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/object/data/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/object/data/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/object/data/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/object/data/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/object/data/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1527,15 +1527,15 @@
     "html/elements/object/data/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/object/data/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/object/data/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: syntax error",
-    "html/elements/object/data/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/object/data/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/object/data/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/object/data/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/object/data/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/object/data/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/object/data/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/object/data/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/object/data/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/object/data/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/object/data/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/object/data/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/object/data/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/object/data/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/object/data/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/object/data/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/object/model-novalid.html": "Element \u201cobject\u201d is missing one or more of the following attributes: [data, type].",
     "html/elements/ol/model-novalid.html": "Duplicate ID \u201cid\u201d.",
     "html/elements/option/label-novalid.html": "Bad value \u201c\u201d for attribute \u201clabel\u201d on element \u201coption\u201d: Bad non-empty string: Must not be empty.",
@@ -1740,12 +1740,12 @@
     "html/elements/picture/video-source-srcset-src-novalid.html": "Attribute \u201csrcset\u201d not allowed on element \u201csource\u201d in this context.",
     "html/elements/picture/video-srcset-novalid.html": "Attribute \u201csrcset\u201d not allowed on element \u201cvideo\u201d in this context.",
     "html/elements/pre/model-novalid.html": "No \u201cp\u201d element in scope but a \u201cp\u201d end tag seen.",
-    "html/elements/q/cite/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/q/cite/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/q/cite/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/q/cite/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/q/cite/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/q/cite/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/q/cite/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/q/cite/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/q/cite/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/q/cite/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/q/cite/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/q/cite/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/q/cite/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/q/cite/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: empty host.",
@@ -1753,38 +1753,38 @@
     "html/elements/q/cite/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/q/cite/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/q/cite/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/q/cite/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/q/cite/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port.",
+    "html/elements/q/cite/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/q/cite/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/q/cite/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/q/cite/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/q/cite/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/q/cite/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/q/cite/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/q/cite/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/q/cite/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/q/cite/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/q/cite/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/q/cite/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/q/cite/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/q/cite/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/q/cite/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/q/cite/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/q/cite/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/q/cite/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/q/cite/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/q/cite/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/q/cite/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/q/cite/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/q/cite/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/q/cite/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port.",
-    "html/elements/q/cite/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port.",
-    "html/elements/q/cite/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port.",
-    "html/elements/q/cite/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port.",
+    "html/elements/q/cite/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/q/cite/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/q/cite/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/q/cite/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/q/cite/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/q/cite/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port.",
-    "html/elements/q/cite/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port.",
+    "html/elements/q/cite/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/q/cite/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/q/cite/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/q/cite/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/q/cite/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/q/cite/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/q/cite/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/q/cite/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/q/cite/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/q/cite/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/q/cite/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/q/cite/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/q/cite/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/q/cite/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/q/cite/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/q/cite/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/q/cite/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1795,15 +1795,15 @@
     "html/elements/q/cite/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/q/cite/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/q/cite/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: syntax error",
-    "html/elements/q/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/q/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/q/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/q/cite/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/q/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/q/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/q/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/q/cite/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/q/cite/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/q/cite/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/q/cite/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/q/cite/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/q/cite/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/q/cite/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/q/cite/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/q/cite/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/q/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/ruby/empty-novalid.html": "Element \u201cruby\u201d is missing one or more of the following child elements: [rp, rt, rtc].",
     "html/elements/ruby/missing-rt-novalid.html": "Element \u201cruby\u201d is missing one or more of the following child elements: [rt, rtc].",
@@ -1811,12 +1811,12 @@
     "html/elements/script/language-novalid.html": "The \u201clanguage\u201d attribute on the \u201cscript\u201d element is obsolete. Use the \u201ctype\u201d attribute instead.",
     "html/elements/script/src-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Must be non-empty.",
     "html/elements/script/src-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Must be non-empty.",
-    "html/elements/script/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/script/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/script/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/script/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/script/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/script/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/script/src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/script/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/script/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/script/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/script/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/script/src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/script/src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/script/src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: empty host.",
@@ -1824,38 +1824,38 @@
     "html/elements/script/src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/script/src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/script/src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/script/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/script/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port.",
+    "html/elements/script/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/script/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/script/src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/script/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/script/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/script/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/script/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/script/src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/script/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/script/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/script/src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/script/src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/script/src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/script/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/script/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/script/src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/script/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/script/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/script/src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/script/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/script/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/script/src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/script/src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/script/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port.",
-    "html/elements/script/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port.",
-    "html/elements/script/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port.",
-    "html/elements/script/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port.",
+    "html/elements/script/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/script/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/script/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/script/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/script/src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/script/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port.",
-    "html/elements/script/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port.",
+    "html/elements/script/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/script/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/script/src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/script/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/script/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/script/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/script/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/script/src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/script/src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/script/src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/script/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/script/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/script/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/script/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/script/src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/script/src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/script/src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1866,24 +1866,24 @@
     "html/elements/script/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/script/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/script/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: syntax error",
-    "html/elements/script/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/script/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/script/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/script/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/script/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/script/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/script/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/script/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/script/src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/script/src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/script/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/script/src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/script/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/script/src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/script/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/script/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/small/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/source/src-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Must be non-empty.",
     "html/elements/source/src-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Must be non-empty.",
-    "html/elements/source/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/source/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/source/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/source/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/source/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/source/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/source/src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/source/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/source/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/source/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/source/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/source/src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/source/src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/source/src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: empty host.",
@@ -1891,38 +1891,38 @@
     "html/elements/source/src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/source/src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/source/src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/source/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/source/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port.",
+    "html/elements/source/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/source/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/source/src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/source/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/source/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/source/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/source/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/source/src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/source/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/source/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/source/src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/source/src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/source/src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/source/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/source/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/source/src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/source/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/source/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/source/src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/source/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/source/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/source/src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/source/src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/source/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port.",
-    "html/elements/source/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port.",
-    "html/elements/source/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port.",
-    "html/elements/source/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port.",
+    "html/elements/source/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/source/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/source/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/source/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/source/src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/source/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port.",
-    "html/elements/source/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port.",
+    "html/elements/source/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/source/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/source/src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/source/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/source/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/source/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/source/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/source/src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/source/src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/source/src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/source/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/source/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/source/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/source/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/source/src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/source/src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/source/src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1933,15 +1933,15 @@
     "html/elements/source/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/source/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/source/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: syntax error",
-    "html/elements/source/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/source/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/source/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/source/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/source/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/source/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/source/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/source/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/source/src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/source/src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/source/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/source/src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/source/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/source/src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/source/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/source/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/span/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/strong/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/style/scoped-as-p-child-novalid.html": "Element \u201cstyle\u201d not allowed in this context. (The parent was element \u201cp\u201d.) Suppressing further errors from this subtree.",
@@ -1956,12 +1956,12 @@
     "html/elements/title/missing-novalid.html": "Element \u201chead\u201d is missing required child element \u201ctitle\u201d.",
     "html/elements/track/src-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Must be non-empty.",
     "html/elements/track/src-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Must be non-empty.",
-    "html/elements/track/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/track/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/track/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/track/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/track/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/track/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/track/src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/track/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/track/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/track/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/track/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/track/src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/track/src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/track/src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: empty host.",
@@ -1969,38 +1969,38 @@
     "html/elements/track/src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/track/src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/track/src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/track/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/track/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port.",
+    "html/elements/track/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/track/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/track/src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/track/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/track/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/track/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/track/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/track/src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/track/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/track/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/track/src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/track/src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/track/src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/track/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/track/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/track/src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/track/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/track/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/track/src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/track/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/track/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/track/src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/track/src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/track/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port.",
-    "html/elements/track/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port.",
-    "html/elements/track/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port.",
-    "html/elements/track/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port.",
+    "html/elements/track/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/track/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/track/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/track/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/track/src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/track/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port.",
-    "html/elements/track/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port.",
+    "html/elements/track/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/track/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/track/src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/track/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/track/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/track/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/track/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/track/src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/track/src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/track/src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/track/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/track/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/track/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/track/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/track/src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/track/src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/track/src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Expected a slash (\"/\").",
@@ -2011,26 +2011,26 @@
     "html/elements/track/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/track/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/track/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: syntax error",
-    "html/elements/track/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/track/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/track/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/track/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/track/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/track/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/track/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/track/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/track/src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/track/src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/track/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/track/src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/track/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/track/src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/track/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/track/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/ul/model-novalid.html": "Duplicate ID \u201cid\u201d.",
     "html/elements/var/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/video/model-novalid.html": "Element \u201cp\u201d not allowed in this context. (The parent was element \u201cvideo\u201d.) Suppressing further errors from this subtree.",
     "html/elements/video/poster-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Must be non-empty.",
     "html/elements/video/poster-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Must be non-empty.",
-    "html/elements/video/poster/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/video/poster/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/video/poster/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/video/poster/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/video/poster/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/video/poster/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/video/poster/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/poster/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/video/poster/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/video/poster/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/video/poster/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/video/poster/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/video/poster/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/video/poster/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: empty host.",
@@ -2038,38 +2038,38 @@
     "html/elements/video/poster/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/video/poster/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/video/poster/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/poster/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/video/poster/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
+    "html/elements/video/poster/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/video/poster/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/video/poster/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/poster/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/video/poster/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/video/poster/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/video/poster/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/video/poster/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/video/poster/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/video/poster/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/video/poster/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/video/poster/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/video/poster/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/video/poster/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/video/poster/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/video/poster/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/video/poster/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/video/poster/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/video/poster/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/poster/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/video/poster/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/video/poster/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/video/poster/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/poster/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
-    "html/elements/video/poster/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
-    "html/elements/video/poster/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
-    "html/elements/video/poster/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
+    "html/elements/video/poster/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/video/poster/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/video/poster/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/video/poster/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/video/poster/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/poster/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
-    "html/elements/video/poster/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
+    "html/elements/video/poster/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/video/poster/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/video/poster/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/poster/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/video/poster/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/video/poster/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/video/poster/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/video/poster/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/video/poster/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/video/poster/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/video/poster/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/video/poster/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/video/poster/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/video/poster/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/video/poster/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/poster/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/poster/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
@@ -2080,21 +2080,21 @@
     "html/elements/video/poster/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/poster/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/poster/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: syntax error",
-    "html/elements/video/poster/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/video/poster/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/video/poster/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/video/poster/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/video/poster/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/video/poster/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/video/poster/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/video/poster/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/video/poster/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/video/poster/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/video/poster/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/video/poster/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/video/poster/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/video/poster/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/video/poster/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
-    "html/elements/video/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/video/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/video/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/video/poster/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/video/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/video/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/video/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/video/src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/video/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/video/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/video/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/video/src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/video/src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/video/src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: empty host.",
@@ -2102,38 +2102,38 @@
     "html/elements/video/src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/video/src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/video/src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/video/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
+    "html/elements/video/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/video/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/video/src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/video/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/video/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/video/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/video/src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/video/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/video/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/video/src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/video/src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/video/src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/video/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/video/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/video/src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/video/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/video/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/video/src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/video/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/video/src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/video/src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
-    "html/elements/video/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
-    "html/elements/video/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
-    "html/elements/video/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
+    "html/elements/video/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/video/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/video/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/video/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/video/src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
-    "html/elements/video/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
+    "html/elements/video/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/video/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/video/src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/video/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/video/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/video/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/video/src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/video/src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/video/src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/video/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/video/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/video/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/video/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/video/src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
@@ -2144,15 +2144,15 @@
     "html/elements/video/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: syntax error",
-    "html/elements/video/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/video/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/video/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/video/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/video/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/video/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/video/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/video/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/video/src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/video/src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/video/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/video/src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/video/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/video/src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/video/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/video/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/media-queries/001-novalid.html": "Bad value \u201cscreen and\u201d for attribute \u201cmedia\u201d on element \u201clink\u201d: Bad media query: Media query ended prematurely.",
     "html/media-queries/002-novalid.html": "Bad value \u201calla\u201d for attribute \u201cmedia\u201d on element \u201clink\u201d: Bad media query: Expected a CSS media type but the query ended.",
     "html/media-queries/003-novalid.html": "Bad value \u201cPROJECT\u0130ON\u201d for attribute \u201cmedia\u201d on element \u201clink\u201d: Bad media query: Expected a letter, hyphen or whitespace but saw \u201c\u0130\u201d instead.",
@@ -2177,12 +2177,12 @@
     "html/media-queries/projection-novalid.html": "Bad value \u201cprojection\u201d for attribute \u201cmedia\u201d on element \u201clink\u201d: Bad media query: Deprecated media type \u201cprojection\u201d. For guidance, see the Media Types section in the current Media Queries specification.",
     "html/media-queries/tv-novalid.html": "Bad value \u201ctv and (scan: progressive)\u201d for attribute \u201cmedia\u201d on element \u201clink\u201d: Bad media query: Deprecated media type \u201ctv\u201d. For guidance, see the Media Types section in the current Media Queries specification.",
     "html/microdata/itemid-scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
-    "html/microdata/itemid/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/microdata/itemid/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/microdata/itemid/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/microdata/itemid/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/microdata/itemid/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/microdata/itemid/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/microdata/itemid/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/microdata/itemid/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/microdata/itemid/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/microdata/itemid/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/microdata/itemid/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/microdata/itemid/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: empty host.",
     "html/microdata/itemid/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: empty host.",
     "html/microdata/itemid/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: empty host.",
@@ -2190,37 +2190,37 @@
     "html/microdata/itemid/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/microdata/itemid/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/microdata/itemid/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/microdata/itemid/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/microdata/itemid/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port.",
+    "html/microdata/itemid/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/microdata/itemid/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/microdata/itemid/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/microdata/itemid/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/microdata/itemid/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/microdata/itemid/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/microdata/itemid/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/microdata/itemid/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/microdata/itemid/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/microdata/itemid/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/microdata/itemid/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/microdata/itemid/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/microdata/itemid/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/microdata/itemid/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/microdata/itemid/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/microdata/itemid/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/microdata/itemid/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/microdata/itemid/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/microdata/itemid/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/microdata/itemid/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/microdata/itemid/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/microdata/itemid/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/microdata/itemid/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/microdata/itemid/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port.",
-    "html/microdata/itemid/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port.",
-    "html/microdata/itemid/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port.",
-    "html/microdata/itemid/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port.",
+    "html/microdata/itemid/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/microdata/itemid/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/microdata/itemid/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/microdata/itemid/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/microdata/itemid/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/microdata/itemid/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port.",
-    "html/microdata/itemid/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port.",
+    "html/microdata/itemid/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/microdata/itemid/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/microdata/itemid/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/microdata/itemid/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/microdata/itemid/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/microdata/itemid/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/microdata/itemid/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/microdata/itemid/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/microdata/itemid/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/microdata/itemid/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/microdata/itemid/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/microdata/itemid/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/microdata/itemid/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/microdata/itemid/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Expected a slash (\"/\").",
     "html/microdata/itemid/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Expected a slash (\"/\").",
     "html/microdata/itemid/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Expected a slash (\"/\").",
@@ -2231,27 +2231,27 @@
     "html/microdata/itemid/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Expected a slash (\"/\").",
     "html/microdata/itemid/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Expected a slash (\"/\").",
     "html/microdata/itemid/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: syntax error",
-    "html/microdata/itemid/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/microdata/itemid/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/microdata/itemid/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/microdata/itemid/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/microdata/itemid/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/microdata/itemid/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/microdata/itemid/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/microdata/itemid/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/microdata/itemid/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/microdata/itemid/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/microdata/itemid/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/microdata/itemid/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/microdata/itemid/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/microdata/itemid/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/microdata/itemid/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/microdata/itemid/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/microdata/itemtype-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d.",
     "html/microdata/itemtype-scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/microdata/itemtype/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c#\\\u201d is not an absolute URL.",
-    "html/microdata/itemtype/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in fragment: not a URL code point.",
+    "html/microdata/itemtype/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
     "html/microdata/itemtype/fragment-empty-hash-only-no-path-relative-novalid.html": "Bad value \u201c#\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c#\u201d is not an absolute URL.",
     "html/microdata/itemtype/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201ce\u201d is not an absolute URL.",
     "html/microdata/itemtype/fragment-non-ascii-relative-novalid.html": "Bad value \u201c#\u03b2\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c#\u03b2\u201d is not an absolute URL.",
     "html/microdata/itemtype/fragment-semicolon-question-mark-relative-novalid.html": "Bad value \u201c#;?\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c#;?\u201d is not an absolute URL.",
     "html/microdata/itemtype/fragment-slash-relative-novalid.html": "Bad value \u201c#/\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c#/\u201d is not an absolute URL.",
     "html/microdata/itemtype/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201corg\u201d is not an absolute URL.",
-    "html/microdata/itemtype/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: Domain contains invalid character: %.",
-    "html/microdata/itemtype/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: Domain contains invalid character: %.",
+    "html/microdata/itemtype/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/microdata/itemtype/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/microdata/itemtype/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: empty host.",
     "html/microdata/itemtype/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: empty host.",
     "html/microdata/itemtype/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: empty host.",
@@ -2260,10 +2260,10 @@
     "html/microdata/itemtype/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/microdata/itemtype/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201corg\u201d is not an absolute URL.",
     "html/microdata/itemtype/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c.org\u201d is not an absolute URL.",
-    "html/microdata/itemtype/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port.",
+    "html/microdata/itemtype/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/microdata/itemtype/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c.org\u201d is not an absolute URL.",
-    "html/microdata/itemtype/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: Domain contains invalid character: %.",
-    "html/microdata/itemtype/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: Domain contains invalid character: %.",
+    "html/microdata/itemtype/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/microdata/itemtype/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/microdata/itemtype/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
     "html/microdata/itemtype/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c/a/\u201d is not an absolute URL.",
     "html/microdata/itemtype/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Backslash (\"\\\") used as path segment delimiter.",
@@ -2280,12 +2280,12 @@
     "html/microdata/itemtype/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c?\u201d is not an absolute URL.",
     "html/microdata/itemtype/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/microdata/itemtype/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c/c\u201d is not an absolute URL.",
-    "html/microdata/itemtype/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port.",
-    "html/microdata/itemtype/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port.",
-    "html/microdata/itemtype/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port.",
-    "html/microdata/itemtype/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port.",
+    "html/microdata/itemtype/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/microdata/itemtype/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/microdata/itemtype/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/microdata/itemtype/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/microdata/itemtype/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c/c\u201d is not an absolute URL.",
-    "html/microdata/itemtype/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port.",
+    "html/microdata/itemtype/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port: \u201cb\u201d is not allowed.",
     "html/microdata/itemtype/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c/c\u201d is not an absolute URL.",
     "html/microdata/itemtype/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c/c\u201d is not an absolute URL.",
     "html/microdata/itemtype/query-empty-no-path-relative-novalid.html": "Bad value \u201c?\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c?\u201d is not an absolute URL.",
@@ -2308,10 +2308,10 @@
     "html/microdata/itemtype/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201cfoo.com\u201d is not an absolute URL.",
     "html/microdata/itemtype/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201cfoo.com\u201d is not an absolute URL.",
     "html/microdata/itemtype/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/microdata/itemtype/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/microdata/itemtype/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in user or password: not a URL code point.",
+    "html/microdata/itemtype/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/microdata/itemtype/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/microdata/itemtype/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/microdata/itemtype/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in user or password: not a URL code point.",
+    "html/microdata/itemtype/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/mime-types/001-novalid.html": "Bad value \u201ctext/html \u201d for attribute \u201ctype\u201d on element \u201clink\u201d: Bad MIME type: Extraneous trailing whitespace.",
     "html/mime-types/002-novalid.html": "Bad value \u201c TEXT/HTML\u201d for attribute \u201ctype\u201d on element \u201clink\u201d: Bad MIME type: Expected a token character but saw \u201c \u201d instead.",
     "html/mime-types/003-novalid.html": "Bad value \u201ctext/html;charset=\u201d for attribute \u201ctype\u201d on element \u201clink\u201d: Bad MIME type: Parameter value missing.",
diff --git a/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html b/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html
new file mode 100644
index 000000000000..f12f8ffc56ff
--- /dev/null
+++ b/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html
@@ -0,0 +1,66 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <title>Video element src attribute must match src list - positive test</title>
+    <script src='/resources/testharness.js'></script>
+    <script src='/resources/testharnessreport.js'></script>
+</head>
+<body>
+    <h1>Video element in media-src list - redirect test</h1>
+    <div id='log'></div>
+    
+  <p>This test tests a buggy interaction in Chrome 46.  Two hosts (self and www2) are both allowed
+    as media-src, but only one (self) is allowed for connect-src.  If a video src starts on
+    an allowed host (self), and is redirected to another allowed media-src host, it should succeed. But a bug
+    causes the redirect to be done in a fetch context to which connect-src is being applied instead, so
+    the load is blocked. (This test passes in Firefox 45, modulo an event listener not firing.)</p>
+
+  <script>
+    var src_test = async_test("In-policy async video src");
+    var src_redir_test = async_test("in-policy async video src w/redir")
+    var source_test = async_test("In-policy async video source element");
+    var source_redir_test = async_test("In-policy async video source element w/redir");
+
+    function media_loaded(t) {
+      t.done();
+    }
+
+    function media_error_handler(t) {
+      t.step( function () {
+          assert_unreached("Media error handler shouldn't be triggered for allowed domain.");
+      });
+      t.done();
+    }
+  </script>
+
+    <video id="videoObject" width="320" height="240" controls
+           onloadeddata="media_loaded(source_test)">
+        <source id="videoSourceObject"
+                type="video/mp4"
+                onerror="media_error_handler(source_test)"
+                src="http://www2.{{host}}:{{ports[http][0]}}/media/white.mp4">
+    </video>
+    
+    <video id="videoObject2" width="320" height="240" controls
+           onerror="media_error_handler(src_test)"
+           onloadeddata="media_loaded(src_test)"
+           src="http://www2.{{host}}:{{ports[http][0]}}/media/white.mp4">
+
+    <video id="videoObject3" width="320" height="240" controls
+           onloadeddata="media_loaded(source_redir_test)">
+        <source id="videoSourceObject"
+                type="video/mp4"
+                onerror="media_error_handler(source_test)"
+                src="/common/redirect.py?location=http://www2.{{host}}:{{ports[http][0]}}/media/white.mp4">
+    </video>
+        
+    <video id="videoObject2" width="320" height="240" controls
+           onerror="media_error_handler(src_test)"
+           onloadeddata="media_loaded(src_test)"
+           src="/common/redirect.py?location=http://www2.{{host}}:{{ports[http][0]}}/media/white.mp4">
+        
+  <script async defer src="../support/checkReport.sub.js?reportExists=false">
+  </script>
+
+</body>
+</html>
diff --git a/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html.sub.headers b/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html.sub.headers
new file mode 100644
index 000000000000..4ce3e428a8ee
--- /dev/null
+++ b/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html.sub.headers
@@ -0,0 +1,6 @@
+Expires: Mon, 26 Jul 1997 05:00:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate
+Cache-Control: post-check=0, pre-check=0, false
+Pragma: no-cache
+Set-Cookie: media-src-redir-bug={{$id:uuid()}}; Path=/content-security-policy/media-src/
+Content-Security-Policy: script-src * 'unsafe-inline'; media-src http://www2.{{host}}:{{ports[http][0]}}/ 'self'; connect-src 'self'; report-uri  ../support/report.py?op=put&reportID={{$id}}
diff --git a/testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction.xhtml b/testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction.xhtml
rename to testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Document-getElementsByTagName.xhtml b/testing/web-platform/tests/dom/nodes/Document-getElementsByTagName-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Document-getElementsByTagName.xhtml
rename to testing/web-platform/tests/dom/nodes/Document-getElementsByTagName-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/DocumentType-literal.xhtml b/testing/web-platform/tests/dom/nodes/DocumentType-literal-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/DocumentType-literal.xhtml
rename to testing/web-platform/tests/dom/nodes/DocumentType-literal-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElement-null.svg b/testing/web-platform/tests/dom/nodes/Element-childElement-null-svg.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElement-null.svg
rename to testing/web-platform/tests/dom/nodes/Element-childElement-null-svg.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElement-null.xhtml b/testing/web-platform/tests/dom/nodes/Element-childElement-null-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElement-null.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-childElement-null-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add.svg b/testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add-svg.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add.svg
rename to testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add-svg.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add.xhtml b/testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove.svg b/testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove-svg.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove.svg
rename to testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove-svg.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove.xhtml b/testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild.svg b/testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild-svg.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild.svg
rename to testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild-svg.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild.xhtml b/testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElementCount.svg b/testing/web-platform/tests/dom/nodes/Element-childElementCount-svg.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElementCount.svg
rename to testing/web-platform/tests/dom/nodes/Element-childElementCount-svg.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElementCount.xhtml b/testing/web-platform/tests/dom/nodes/Element-childElementCount-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElementCount.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-childElementCount-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-firstElementChild-entity.xhtml b/testing/web-platform/tests/dom/nodes/Element-firstElementChild-entity-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-firstElementChild-entity.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-firstElementChild-entity-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace.svg b/testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace-svg.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace.svg
rename to testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace-svg.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace.xhtml b/testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-firstElementChild.svg b/testing/web-platform/tests/dom/nodes/Element-firstElementChild-svg.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-firstElementChild.svg
rename to testing/web-platform/tests/dom/nodes/Element-firstElementChild-svg.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-firstElementChild.xhtml b/testing/web-platform/tests/dom/nodes/Element-firstElementChild-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-firstElementChild.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-firstElementChild-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-lastElementChild.svg b/testing/web-platform/tests/dom/nodes/Element-lastElementChild-svg.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-lastElementChild.svg
rename to testing/web-platform/tests/dom/nodes/Element-lastElementChild-svg.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-lastElementChild.xhtml b/testing/web-platform/tests/dom/nodes/Element-lastElementChild-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-lastElementChild.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-lastElementChild-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-nextElementSibling.svg b/testing/web-platform/tests/dom/nodes/Element-nextElementSibling-svg.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-nextElementSibling.svg
rename to testing/web-platform/tests/dom/nodes/Element-nextElementSibling-svg.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-nextElementSibling.xhtml b/testing/web-platform/tests/dom/nodes/Element-nextElementSibling-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-nextElementSibling.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-nextElementSibling-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-previousElementSibling.svg b/testing/web-platform/tests/dom/nodes/Element-previousElementSibling-svg.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-previousElementSibling.svg
rename to testing/web-platform/tests/dom/nodes/Element-previousElementSibling-svg.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-previousElementSibling.xhtml b/testing/web-platform/tests/dom/nodes/Element-previousElementSibling-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-previousElementSibling.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-previousElementSibling-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-siblingElement-null.svg b/testing/web-platform/tests/dom/nodes/Element-siblingElement-null-svg.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-siblingElement-null.svg
rename to testing/web-platform/tests/dom/nodes/Element-siblingElement-null-svg.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-siblingElement-null.xhtml b/testing/web-platform/tests/dom/nodes/Element-siblingElement-null-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-siblingElement-null.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-siblingElement-null-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Node-nodeName.xhtml b/testing/web-platform/tests/dom/nodes/Node-nodeName-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Node-nodeName.xhtml
rename to testing/web-platform/tests/dom/nodes/Node-nodeName-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/ParentNode-querySelector-All.xht b/testing/web-platform/tests/dom/nodes/ParentNode-querySelector-All-xht.xht
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/ParentNode-querySelector-All.xht
rename to testing/web-platform/tests/dom/nodes/ParentNode-querySelector-All-xht.xht
diff --git a/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.xhtml b/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.xhtml
rename to testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case-xhtml.xhtml
diff --git a/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.xhtml b/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.xhtml
rename to testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id-xhtml.xhtml
diff --git a/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.xhtml b/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.xhtml
rename to testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace-xhtml.xhtml
diff --git a/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.xhtml b/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.xhtml
rename to testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements-xhtml.xhtml
diff --git a/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.xhtml b/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.xhtml
rename to testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef-xhtml.xhtml
diff --git a/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.xhtml b/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.xhtml
rename to testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param-xhtml.xhtml
diff --git a/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html b/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html
index daf74e1344e2..ebf15e79cd50 100644
--- a/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html
+++ b/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html
@@ -14,6 +14,12 @@ test(function() {
   assert_equals(document.vlinkColor, document.body.vLink);
   assert_equals(document.alinkColor, document.body.aLink);
 })
+test(function() {
+  document.fgColor = null;
+  assert_equals(document.fgColor, "");
+  assert_equals(document.body.text, "");
+  assert_equals(document.body.getAttribute("text"), "");
+})
 test(function() {
   document.fgColor = "blue";
   assert_equals(document.fgColor, "blue");
diff --git a/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html b/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html
index e020a3853da0..629c24627ce0 100644
--- a/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html
+++ b/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html
@@ -14,6 +14,12 @@ test(function() {
   assert_equals(document.vlinkColor, document.body.vLink);
   assert_equals(document.alinkColor, document.body.aLink);
 })
+test(function() {
+  document.body.text = null;
+  assert_equals(document.fgColor, "");
+  assert_equals(document.body.text, "");
+  assert_equals(document.body.getAttribute("text"), "");
+})
 test(function() {
   document.body.text = "blue";
   assert_equals(document.fgColor, "blue");
diff --git a/testing/web-platform/tests/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html b/testing/web-platform/tests/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html
index a7904bf0fe0d..f7d47b3640df 100644
--- a/testing/web-platform/tests/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html
+++ b/testing/web-platform/tests/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html
@@ -14,6 +14,10 @@
 <img srcset="/images/green-256x256.png 256w" sizes="512px" data-expect="512">
 <img srcset="/images/green-256x256.png 256w" sizes="1px" data-expect="1">
 <img srcset="/images/green-256x256.png 256w" sizes="0px" data-expect="0">
+<!-- SVG -->
+<img srcset="data:image/svg+xml,<svg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='-1%20-1%202%202'%20width='20'%20height='20'><circle%20r='1'/></svg> 2x" data-expect="10">
+<img srcset="data:image/svg+xml,<svg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='-1%20-1%202%202'%20width='20'><circle%20r='1'/></svg> 2x" data-expect="10">
+<img srcset="data:image/svg+xml,<svg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='-1%20-1%202%202'%20height='20'><circle%20r='1'/></svg> 2x" data-expect="10">
 <script>
 setup({explicit_done:true});
 onload = function() {
@@ -24,8 +28,8 @@ onload = function() {
       assert_equals(img.height, expected, 'height');
       assert_equals(img.clientWidth, expected, 'clientWidth');
       assert_equals(img.clientHeight, expected, 'clientHeight');
-      assert_equals(img.naturalWidth, 256, 'naturalWidth');
-      assert_equals(img.naturalHeight, 256, 'naturalHeight');
+      assert_equals(img.naturalWidth, expected, 'naturalWidth');
+      assert_equals(img.naturalHeight, expected, 'naturalHeight');
     }, img.outerHTML);
   });
   done();
diff --git a/testing/web-platform/tests/html/semantics/forms/the-input-element/maxlength-manual.html b/testing/web-platform/tests/html/semantics/forms/the-input-element/maxlength-manual.html
new file mode 100644
index 000000000000..fdf6c264410d
--- /dev/null
+++ b/testing/web-platform/tests/html/semantics/forms/the-input-element/maxlength-manual.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset=utf-8>
+    <title>input max length</title>
+    <link rel="author" title="Sam Gibson" href="mailto:sam@ifdown.net">
+    <link rel=help href="https://html.spec.whatwg.org/multipage/forms.html#the-maxlength-and-minlength-attributes">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+
+  <body>
+    <div id="log"></div>
+    <p>Type a letter anywhere into the input field (do not select any text, or otherwise manipulate the input)</p>
+    <input type=text maxlength=4 id=only-four value="inpu"></input>
+
+    <script>
+      var input;
+      setup(function() {
+        input = document.getElementById('only-four');
+      }, {explicit_done: true, explicit_timeout: true});
+
+
+      on_event(input, 'keyup', function(event) {
+          if  ((event.keyCode >= 65 && event.keyCode <= 90) ||
+                (event.keyCode >= 97 && event.keyCode <= 122)) {
+            test(function() {
+              assert_equals(input.value, "inpu");
+            }, 'input content should limit to maxlength')
+
+            done();
+          }
+      });
+    </script>
+  </body>
+</html>
+
diff --git a/testing/web-platform/tests/html/semantics/forms/the-input-element/maxlength.html b/testing/web-platform/tests/html/semantics/forms/the-input-element/maxlength.html
new file mode 100644
index 000000000000..8f0a2567d40e
--- /dev/null
+++ b/testing/web-platform/tests/html/semantics/forms/the-input-element/maxlength.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>input max length</title>
+    <link rel="author" title="Sam Gibson" href="mailto:sam@ifdown.net">
+    <link rel=help href="https://html.spec.whatwg.org/multipage/forms.html#the-maxlength-and-minlength-attributes">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+
+  <body>
+    <h1>Text input element</h1>
+
+    <div style="display: none">
+      <input id="none" />
+      <input id="negative" type="-5" />
+      <input id="non-numeric" type="not-a-number" />
+      <input id="assign-negative" />
+      <input id="assign-non-numeric" />
+    </div>
+
+    <div id="log"></div>
+
+    <script type="text/javascript">
+      test(
+        function() {
+          assert_equals(document.getElementById("none").maxLength, -1);
+        }, "Unset maxlength is -1");
+
+      test(
+        function() {
+          assert_equals(document.getElementById("negative").maxLength, -1);
+        }, "Negative maxlength is always -1");
+
+      test(
+        function() {
+          assert_equals(document.getElementById("non-numeric").maxLength, -1);
+        }, "Non-numeric maxlength is -1");
+
+      test(
+          function() {
+            assert_throws("INDEX_SIZE_ERR", function() {
+              document.getElementById("assign-negative").maxLength = -5;
+            });
+          }, "Assigning negative integer throws IndexSizeError");
+
+      test(
+          function() {
+            document.getElementById("assign-non-numeric").maxLength = "not-a-number";
+            assert_equals(document.getElementById("assign-non-numeric").maxLength, 0);
+          }, "Assigning non-numeric to maxlength sets maxlength to 0");
+    </script>
+  </body>
+</html>
+
diff --git a/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-event.xhtml b/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-event-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-event.xhtml
rename to testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-event-xhtml.xhtml
diff --git a/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text.xhtml b/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text.xhtml
rename to testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text-xhtml.xhtml
diff --git a/testing/web-platform/tests/html/syntax/parsing/README b/testing/web-platform/tests/html/syntax/parsing/README
index 8e4ae0808b6f..343ebaff746a 100644
--- a/testing/web-platform/tests/html/syntax/parsing/README
+++ b/testing/web-platform/tests/html/syntax/parsing/README
@@ -1,4 +1,4 @@
 Note: the html5lib_* files in this directory are autogenerated.
 
-To update them use the script /tools/scripts/update_html5lib_tests.py.
+To update them use the script /html/tools/update_html5lib_tests.py.
 Further instructions are provided in that file.
\ No newline at end of file
diff --git a/testing/web-platform/tests/html/syntax/parsing/test.js b/testing/web-platform/tests/html/syntax/parsing/test.js
index e2c1aabb39d5..362272a2f188 100644
--- a/testing/web-platform/tests/html/syntax/parsing/test.js
+++ b/testing/web-platform/tests/html/syntax/parsing/test.js
@@ -127,18 +127,23 @@ function get_type() {
   return run_type;
 };
 
-var test_in_data_uri = get_test_func(function (iframe, uri_encoded_input) {
-                                       iframe.src = "data:text/html;charset=utf8," + uri_encoded_input;
+var test_in_blob_uri = get_test_func(function (iframe, uri_encoded_input, t) {
+                                       var b = new Blob([decodeURIComponent(uri_encoded_input)], { type: "text/html" });
+                                       var blobURL = URL.createObjectURL(b);
+                                       iframe.src = blobURL;
+                                       t.add_cleanup(function() {
+                                         URL.revokeObjectURL(blobURL);
+                                       });
                                      });
 
-var test_document_write = get_test_func(function(iframe, uri_encoded_input) {
+var test_document_write = get_test_func(function(iframe, uri_encoded_input, t) {
                                           iframe.contentDocument.open();
                                           var input = decodeURIComponent(uri_encoded_input);
                                           iframe.contentDocument.write(input);
                                           iframe.contentDocument.close();
                                         });
 
-var test_document_write_single = get_test_func(function(iframe, uri_encoded_input) {
+var test_document_write_single = get_test_func(function(iframe, uri_encoded_input, t) {
                                                  iframe.contentDocument.open();
                                                  var input = decodeURIComponent(uri_encoded_input);
                                                  for (var i=0; i< input.length; i++) {
@@ -166,7 +171,7 @@ function get_test_func(inject_func) {
              }
             );
     };
-    inject_func(iframe, uri_encoded_input);
+    inject_func(iframe, uri_encoded_input, t);
   }
   return test_func;
 }
@@ -248,7 +253,7 @@ function init_tests(test_type) {
   var test_funcs = {
     "write":test_document_write,
     "write_single":test_document_write_single,
-    "uri":test_in_data_uri,
+    "uri":test_in_blob_uri,
     "innerHTML":test_fragment
   };
   var tests_started = 0;
diff --git a/testing/web-platform/tests/resources/docs/api.md b/testing/web-platform/tests/resources/docs/api.md
index d3ac4169d45e..accd18b8a423 100644
--- a/testing/web-platform/tests/resources/docs/api.md
+++ b/testing/web-platform/tests/resources/docs/api.md
@@ -203,7 +203,7 @@ eventWatcher.wait_for(t, 'animationstart').then(t.step_func(function() {
                                 'animationend']);
 })).then(t.step_func(function() {
   assertExpectedStateAtEndOfAnimation();
-  test.done();
+  t.done();
 }));
 ```
 
diff --git a/testing/web-platform/tests/resources/idlharness.js b/testing/web-platform/tests/resources/idlharness.js
index 9f324e089ebf..02304ca10600 100644
--- a/testing/web-platform/tests/resources/idlharness.js
+++ b/testing/web-platform/tests/resources/idlharness.js
@@ -772,6 +772,30 @@ IdlInterface.prototype.test_self = function()
         }.bind(this), this.name + " interface object length");
     }
 
+    if (!this.is_callback() || this.has_constants()) {
+        test(function() {
+            // This function tests WebIDL as of 2015-11-17.
+            // https://heycam.github.io/webidl/#interface-object
+
+            assert_own_property(self, this.name,
+                                "self does not have own property " + format_value(this.name));
+
+            // "All interface objects must have a property named “name” with
+            // attributes { [[Writable]]: false, [[Enumerable]]: false,
+            // [[Configurable]]: true } whose value is the identifier of the
+            // corresponding interface."
+
+            assert_own_property(self[this.name], "name");
+            var desc = Object.getOwnPropertyDescriptor(self[this.name], "name");
+            assert_false("get" in desc, this.name + ".name has getter");
+            assert_false("set" in desc, this.name + ".name has setter");
+            assert_false(desc.writable, this.name + ".name is writable");
+            assert_false(desc.enumerable, this.name + ".name is enumerable");
+            assert_true(desc.configurable, this.name + ".name is not configurable");
+            assert_equals(self[this.name].name, this.name, "wrong value for " + this.name + ".name");
+        }.bind(this), this.name + " interface object name");
+    }
+
     // TODO: Test named constructors if I find any interfaces that have them.
 
     test(function()
diff --git a/testing/web-platform/tests/resources/webidl2/README.md b/testing/web-platform/tests/resources/webidl2/README.md
index f7d03fcdef30..0243bdf51bf8 100644
--- a/testing/web-platform/tests/resources/webidl2/README.md
+++ b/testing/web-platform/tests/resources/webidl2/README.md
@@ -61,22 +61,6 @@ In the browser:
       var tree = WebIDL2.parse("string of WebIDL");
     </script>
 
-Advanced Parsing
-----------------
-
-`parse()` can optionally accept a second parameter, an options object, which can be used to
-modify parsing behavior.
-
-The following options are recognized:
-```javascript
-{
-    allowNestedTypedefs: false # 
-}
-```
-And their meanings are as follows:
-
-* `allowNestedTypedefs`: Boolean indicating whether the parser should accept `typedef`s as valid members of `interface`s. This is non-standard syntax and therefore the default is `false`.
-
 Errors
 ------
 When there is a syntax error in the WebIDL, it throws an exception object with the following
@@ -676,8 +660,9 @@ The fields are as follows:
   whereas the lack thereof will yield a `null`. If there is an `rhs` field then
   they are the right-hand side's arguments, otherwise they apply to the extended
   attribute directly.
-* `rhs`: If there is a right-hand side, this will capture its `type` (which can be
-  "identifier" or "identifier-list") and its `value`.
+* `rhs`: If there is a right-hand side, this will capture its `type` (always
+  "identifier" in practice, though it may be extended in the future) and its
+  `value`.
 * `typePair`: If the extended attribute is a `MapClass` this will capture the
   map's key type and value type respectively.
 
@@ -696,24 +681,6 @@ For Infinity:
 
 * `negative`: Boolean indicating whether this is negative Infinity or not.
 
-### `iterable<>`, `legacyiterable<>`, `maplike<>`, `setlike<>` declarations
-
-These appear as members of interfaces that look like this:
-
-        {
-            "type": "maplike", // or "legacyiterable" / "iterable" / "setlike"
-            "idlType": /* One or two types */,
-            "readonly": false, // only for maplike and setlike
-            "extAttrs": []
-        }
-
-The fields are as follows:
-
-* `type`: Always one of "iterable", "legacyiterable", "maplike" or "setlike".
-* `idlType`: An [IDL Type](#idl-type) (or an array of two types) representing the declared type arguments.
-* `readonly`: Whether the maplike or setlike is declared as read only.
-* `extAttrs`: A list of [extended attributes](#extended-attributes).
-
 
 Testing
 =======
diff --git a/testing/web-platform/tests/resources/webidl2/lib/webidl2.js b/testing/web-platform/tests/resources/webidl2/lib/webidl2.js
index 9e504fc6e1fd..50d3950dd70f 100644
--- a/testing/web-platform/tests/resources/webidl2/lib/webidl2.js
+++ b/testing/web-platform/tests/resources/webidl2/lib/webidl2.js
@@ -336,7 +336,6 @@
                   ret.rhs = rhs
                 }
                 else if (consume(OTHER, "(")) {
-                    // [Exposed=(Window,Worker)]
                     rhs = [];
                     var id = consume(ID);
                     if (id) {
@@ -344,10 +343,7 @@
                     }
                     identifiers(rhs);
                     consume(OTHER, ")") || error("Unexpected token in extended attribute argument list or type pair");
-                    ret.rhs = {
-                        type: "identifier-list",
-                        value: rhs
-                    };
+                    ret.rhs = rhs;
                 }
                 if (!ret.rhs) return error("No right hand side to extended attribute assignment");
             }
@@ -582,7 +578,7 @@
                 return ret;
             }
             else if (consume(ID, "stringifier")) {
-                ret.stringifier = true;-
+                ret.stringifier = true;
                 all_ws();
                 if (consume(OTHER, ";")) return ret;
                 ret.idlType = return_type();
@@ -687,69 +683,6 @@
             }
             return ret;
         };
-
-        var iterable_type = function() {
-            if (consume(ID, "iterable")) return "iterable";
-            else if (consume(ID, "legacyiterable")) return "legacyiterable";
-            else if (consume(ID, "maplike")) return "maplike";
-            else if (consume(ID, "setlike")) return "setlike";
-            else return;
-        }
-
-        var readonly_iterable_type = function() {
-            if (consume(ID, "maplike")) return "maplike";
-            else if (consume(ID, "setlike")) return "setlike";
-            else return;
-        }
-
-        var iterable = function (store) {
-            all_ws(store, "pea");
-            var grabbed = [],
-                ret = {type: null, idlType: null, readonly: false};
-            if (consume(ID, "readonly")) {
-                ret.readonly = true;
-                grabbed.push(last_token);
-                var w = all_ws();
-                if (w) grabbed.push(w);
-            }
-            var consumeItType = ret.readonly ? readonly_iterable_type : iterable_type;
-
-            var ittype = consumeItType();
-            if (!ittype) {
-                tokens = grabbed.concat(tokens);
-                return;
-            }
-
-            var secondTypeRequired = ittype === "maplike";
-            var secondTypeAllowed = secondTypeRequired || ittype === "iterable";
-            ret.type = ittype;
-            if (ret.type !== 'maplike' && ret.type !== 'setlike')
-                delete ret.readonly;
-            all_ws();
-            if (consume(OTHER, "<")) {
-                ret.idlType = type() || error("Error parsing " + ittype + " declaration");
-                all_ws();
-                if (secondTypeAllowed) {
-                    var type2 = null;
-                    if (consume(OTHER, ",")) {
-                        all_ws();
-                        type2 = type();
-                        all_ws();                        
-                    }
-                    if (type2)
-                        ret.idlType = [ret.idlType, type2];
-                    else if (secondTypeRequired)
-                        error("Missing second type argument in " + ittype + " declaration");
-                }
-                if (!consume(OTHER, ">")) error("Unterminated " + ittype + " declaration");
-                all_ws();
-                if (!consume(OTHER, ";")) error("Missing semicolon after " + ittype + " declaration");
-            }
-            else
-                error("Error parsing " + ittype + " declaration");
-
-            return ret;            
-        }        
         
         var interface_ = function (isPartial, store) {
             all_ws(isPartial ? null : store, "pea");
@@ -781,9 +714,7 @@
                     ret.members.push(cnt);
                     continue;
                 }
-                var mem = (opt.allowNestedTypedefs && typedef(store ? mems : null)) ||
-                          iterable(store ? mems : null) ||
-                          serialiser(store ? mems : null) ||
+                var mem = serialiser(store ? mems : null) ||
                           attribute(store ? mems : null) ||
                           operation(store ? mems : null) ||
                           error("Unknown member");
@@ -907,6 +838,7 @@
                 all_ws(store ? vals : null);
                 if (consume(OTHER, "}")) {
                     all_ws();
+                    if (saw_comma) error("Trailing comma in enum");
                     consume(OTHER, ";") || error("No semicolon after enum");
                     return ret;
                 }
diff --git a/testing/web-platform/tests/resources/webidl2/package.json b/testing/web-platform/tests/resources/webidl2/package.json
index c5ae7da2d593..e0e6ec4eac86 100644
--- a/testing/web-platform/tests/resources/webidl2/package.json
+++ b/testing/web-platform/tests/resources/webidl2/package.json
@@ -1,17 +1,17 @@
 {
   "name": "webidl2",
   "description": "A WebIDL Parser",
-  "version": "2.0.11",
+  "version": "2.0.10",
   "author": "Robin Berjon <robin@berjon.com>",
   "license": "MIT",
   "dependencies": {},
   "devDependencies": {
-    "mocha": "2.2.5",
+    "mocha": "2.1.0",
     "expect.js": "0.3.1",
-    "underscore": "1.8.3",
-    "jsondiffpatch": "0.1.31",
+    "underscore": "1.7.0",
+    "jsondiffpatch": "0.1.27",
     "benchmark": "*",
-    "microtime": "1.4.2"
+    "microtime": "1.1.0"
   },
   "scripts": {
     "test": "mocha"
diff --git a/testing/web-platform/tests/resources/webidl2/test/invalid/idl/maplike-1type.widl b/testing/web-platform/tests/resources/webidl2/test/invalid/idl/maplike-1type.widl
deleted file mode 100644
index 33c274b8b9a8..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/invalid/idl/maplike-1type.widl
+++ /dev/null
@@ -1,3 +0,0 @@
-interface MapLikeOneType {
-	maplike<long>;
-}
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/invalid/idl/readonly-iterable.widl b/testing/web-platform/tests/resources/webidl2/test/invalid/idl/readonly-iterable.widl
deleted file mode 100644
index fc4ae2be9084..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/invalid/idl/readonly-iterable.widl
+++ /dev/null
@@ -1,3 +0,0 @@
-interface ReadonlyIterable {
-	readonly iterable<long>;
-}
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/invalid/idl/setlike-2types.widl b/testing/web-platform/tests/resources/webidl2/test/invalid/idl/setlike-2types.widl
deleted file mode 100644
index 1ecae22c0106..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/invalid/idl/setlike-2types.widl
+++ /dev/null
@@ -1,3 +0,0 @@
-interface SetLikeTwoTypes {
-	setlike<long, long>;
-}
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/invalid/idl/typedef-nested.widl b/testing/web-platform/tests/resources/webidl2/test/invalid/idl/typedef-nested.widl
deleted file mode 100644
index 106f30b8f72e..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/invalid/idl/typedef-nested.widl
+++ /dev/null
@@ -1,22 +0,0 @@
-
-      interface Point {
-        attribute float x;
-        attribute float y;
-      };
-
-
-      interface Rect {
-        attribute Point topleft;
-        attribute Point bottomright;
-      };
-
-  interface Widget {
-    typedef sequence<Point> PointSequence;
-
-    readonly attribute Rect bounds;
-
-    boolean pointWithinBounds(Point p);
-    boolean allPointsWithinBounds(PointSequence ps);
-  };
-
-  typedef [Clamp] octet value; 
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/invalid/json/maplike-1type.json b/testing/web-platform/tests/resources/webidl2/test/invalid/json/maplike-1type.json
deleted file mode 100644
index 859a820a4910..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/invalid/json/maplike-1type.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "message": "Missing second type argument in maplike declaration",
-    "line": 2
-}
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/invalid/json/readonly-iterable.json b/testing/web-platform/tests/resources/webidl2/test/invalid/json/readonly-iterable.json
deleted file mode 100644
index c6f52a246158..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/invalid/json/readonly-iterable.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "message": "Invalid operation",
-    "line": 2
-}
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/invalid/json/setlike-2types.json b/testing/web-platform/tests/resources/webidl2/test/invalid/json/setlike-2types.json
deleted file mode 100644
index c9e49b6756d5..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/invalid/json/setlike-2types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "message": "Unterminated setlike declaration",
-    "line": 2
-}
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/invalid/json/typedef-nested.json b/testing/web-platform/tests/resources/webidl2/test/invalid/json/typedef-nested.json
deleted file mode 100644
index d7fb9182f86e..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/invalid/json/typedef-nested.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "message":  "Invalid operation"
-,   "line":     14
-}
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax.js b/testing/web-platform/tests/resources/webidl2/test/syntax.js
index 712542a6be8e..6f9de3637d17 100644
--- a/testing/web-platform/tests/resources/webidl2/test/syntax.js
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax.js
@@ -17,16 +17,11 @@ describe("Parses all of the IDLs to produce the correct ASTs", function () {
     
     for (var i = 0, n = idls.length; i < n; i++) {
         var idl = idls[i], json = jsons[i];
-
         var func = (function (idl, json) {
             return function () {
                 try {
-                    var optFile = pth.join(__dirname, "syntax/opt", pth.basename(json));
-                    var opt = undefined;
-                    if (fs.existsSync(optFile))
-                        opt = JSON.parse(fs.readFileSync(optFile, "utf8"));
                     var diff = jdp.diff(JSON.parse(fs.readFileSync(json, "utf8")),
-                                        wp.parse(fs.readFileSync(idl, "utf8"), opt));
+                                        wp.parse(fs.readFileSync(idl, "utf8")));
                     if (diff && debug) console.log(JSON.stringify(diff, null, 4));
                     expect(diff).to.be(undefined);
                 }
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/callback.widl b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/callback.widl
index adaf75e049c9..d92f6a18c0a5 100644
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/callback.widl
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/callback.widl
@@ -2,6 +2,4 @@ callback AsyncOperationCallback = void (DOMString status);
 
 callback interface EventHandler {
   void eventOccurred(DOMString details);
-};
-
-callback SortCallback = boolean (any a, any b);
+};
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/enum.widl b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/enum.widl
index 37c4ffddee31..851fca2e6f61 100644
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/enum.widl
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/enum.widl
@@ -5,6 +5,4 @@ interface Meal {
   attribute float size;     // in grams
 
   void initialize(MealType type, float size);
-};
-
-enum AltMealType { "rice", "noodles", "other", };
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/extended-attributes.widl b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/extended-attributes.widl
deleted file mode 100644
index f769c2559cc7..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/extended-attributes.widl
+++ /dev/null
@@ -1,6 +0,0 @@
-// Extracted from http://www.w3.org/TR/2015/WD-service-workers-20150205/
-
-[Global=(Worker,ServiceWorker), Exposed=ServiceWorker]
-interface ServiceWorkerGlobalScope : WorkerGlobalScope {
-  
-};
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/iterable.widl b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/iterable.widl
deleted file mode 100644
index c7dfafa4daa8..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/iterable.widl
+++ /dev/null
@@ -1,7 +0,0 @@
-interface IterableOne {
-	iterable<long>;
-};
-
-interface IterableTwo {
-	iterable<short, double?>;
-};
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/legacyiterable.widl b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/legacyiterable.widl
deleted file mode 100644
index eafa7cf04459..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/legacyiterable.widl
+++ /dev/null
@@ -1,3 +0,0 @@
-interface LegacyIterable {
-	legacyiterable<long>;
-};
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/maplike.widl b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/maplike.widl
deleted file mode 100644
index 7b79b3888026..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/maplike.widl
+++ /dev/null
@@ -1,7 +0,0 @@
-interface MapLike {
-	maplike<long, float>;
-};
-
-interface ReadOnlyMapLike {
-	readonly maplike<long, float>;
-};
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/setlike.widl b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/setlike.widl
deleted file mode 100644
index 890e8e5a7597..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/setlike.widl
+++ /dev/null
@@ -1,7 +0,0 @@
-interface SetLike {
-	setlike<long>;
-};
-
-interface ReadOnlySetLike {
-	readonly setlike<long>;
-};
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/typedef-nested.widl b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/typedef-nested.widl
deleted file mode 100644
index 106f30b8f72e..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/typedef-nested.widl
+++ /dev/null
@@ -1,22 +0,0 @@
-
-      interface Point {
-        attribute float x;
-        attribute float y;
-      };
-
-
-      interface Rect {
-        attribute Point topleft;
-        attribute Point bottomright;
-      };
-
-  interface Widget {
-    typedef sequence<Point> PointSequence;
-
-    readonly attribute Rect bounds;
-
-    boolean pointWithinBounds(Point p);
-    boolean allPointsWithinBounds(PointSequence ps);
-  };
-
-  typedef [Clamp] octet value; 
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/json/callback.json b/testing/web-platform/tests/resources/webidl2/test/syntax/json/callback.json
index 43a517510467..19ef4a6fa4e2 100644
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/json/callback.json
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax/json/callback.json
@@ -72,48 +72,5 @@
         ],
         "inheritance": null,
         "extAttrs": []
-    },
-    {
-        "type": "callback",
-        "name": "SortCallback",
-        "idlType": {
-            "sequence": false,
-            "generic": null,
-            "nullable": false,
-            "array": false,
-            "union": false,
-            "idlType": "boolean"
-        },
-        "arguments": [
-            {
-                "optional": false,
-                "variadic": false,
-                "extAttrs": [],
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "any"
-                },
-                "name": "a"
-            },
-            {
-                "optional": false,
-                "variadic": false,
-                "extAttrs": [],
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "any"
-                },
-                "name": "b"
-            }
-        ],
-        "extAttrs": []
     }
 ]
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/json/enum.json b/testing/web-platform/tests/resources/webidl2/test/syntax/json/enum.json
index 196ee4e6405f..bd9058c594f6 100644
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/json/enum.json
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax/json/enum.json
@@ -101,15 +101,5 @@
         ],
         "inheritance": null,
         "extAttrs": []
-    },
-    {
-        "type": "enum",
-        "name": "AltMealType",
-        "values": [
-            "rice",
-            "noodles",
-            "other"
-        ],
-        "extAttrs": []
     }
 ]
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/json/extended-attributes.json b/testing/web-platform/tests/resources/webidl2/test/syntax/json/extended-attributes.json
deleted file mode 100644
index 228c4b824be3..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/json/extended-attributes.json
+++ /dev/null
@@ -1,30 +0,0 @@
-[
-    {
-        "type": "interface",
-        "name": "ServiceWorkerGlobalScope",
-        "partial": false,
-        "members": [],
-        "inheritance": "WorkerGlobalScope",
-        "extAttrs": [
-            {
-                "name": "Global",
-                "arguments": null,
-                "rhs": {
-                    "type": "identifier-list",
-                    "value": [
-                        "Worker",
-                        "ServiceWorker"
-                    ]
-                }
-            },
-            {
-                "name": "Exposed",
-                "arguments": null,
-                "rhs": {
-                    "type": "identifier",
-                    "value": "ServiceWorker"
-                }
-            }
-        ]
-    }
-]
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/json/iterable.json b/testing/web-platform/tests/resources/webidl2/test/syntax/json/iterable.json
deleted file mode 100644
index 3e38991dd9db..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/json/iterable.json
+++ /dev/null
@@ -1,55 +0,0 @@
-[
-    {
-        "type": "interface",
-        "name": "IterableOne",
-        "partial": false,
-        "members": [
-            {
-                "type": "iterable",
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "long"
-                },
-                "extAttrs": []
-            }
-        ],
-        "inheritance": null,
-        "extAttrs": []
-    },
-    {
-        "type": "interface",
-        "name": "IterableTwo",
-        "partial": false,
-        "members": [
-            {
-                "type": "iterable",
-                "idlType": [
-                    {
-                        "sequence": false,
-                        "generic": null,
-                        "nullable": false,
-                        "array": false,
-                        "union": false,
-                        "idlType": "short"
-                    },
-                    {
-                        "sequence": false,
-                        "generic": null,
-                        "nullable": true,
-                        "array": false,
-                        "union": false,
-                        "idlType": "double"
-                    }
-                ],
-                "extAttrs": []
-            }
-        ],
-        "inheritance": null,
-        "extAttrs": []
-    }
-]
-
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/json/legacyiterable.json b/testing/web-platform/tests/resources/webidl2/test/syntax/json/legacyiterable.json
deleted file mode 100644
index e63f99de43f4..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/json/legacyiterable.json
+++ /dev/null
@@ -1,24 +0,0 @@
-[
-    {
-        "type": "interface",
-        "name": "LegacyIterable",
-        "partial": false,
-        "members": [
-            {
-                "type": "legacyiterable",
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "long"
-                },
-                "extAttrs": []
-            }
-        ],
-        "inheritance": null,
-        "extAttrs": []
-    }
-]
-
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/json/maplike.json b/testing/web-platform/tests/resources/webidl2/test/syntax/json/maplike.json
deleted file mode 100644
index 017d8b3f3ec2..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/json/maplike.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-    {
-        "type": "interface",
-        "name": "MapLike",
-        "partial": false,
-        "members": [
-            {
-                "type": "maplike",
-                "idlType": [
-                    {
-                        "sequence": false,
-                        "generic": null,
-                        "nullable": false,
-                        "array": false,
-                        "union": false,
-                        "idlType": "long"
-                    },
-                    {
-                        "sequence": false,
-                        "generic": null,
-                        "nullable": false,
-                        "array": false,
-                        "union": false,
-                        "idlType": "float"
-                    }
-                ],
-                "readonly": false,
-                "extAttrs": []
-            }
-        ],
-        "inheritance": null,
-        "extAttrs": []
-    },
-    {
-        "type": "interface",
-        "name": "ReadOnlyMapLike",
-        "partial": false,
-        "members": [
-            {
-                "type": "maplike",
-                "idlType": [
-                    {
-                        "sequence": false,
-                        "generic": null,
-                        "nullable": false,
-                        "array": false,
-                        "union": false,
-                        "idlType": "long"
-                    },
-                    {
-                        "sequence": false,
-                        "generic": null,
-                        "nullable": false,
-                        "array": false,
-                        "union": false,
-                        "idlType": "float"
-                    }
-                ],
-                "readonly": true,
-                "extAttrs": []
-            }
-        ],
-        "inheritance": null,
-        "extAttrs": []
-    }
-]
-
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/json/setlike.json b/testing/web-platform/tests/resources/webidl2/test/syntax/json/setlike.json
deleted file mode 100644
index d44043a944aa..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/json/setlike.json
+++ /dev/null
@@ -1,47 +0,0 @@
-[
-    {
-        "type": "interface",
-        "name": "SetLike",
-        "partial": false,
-        "members": [
-            {
-                "type": "setlike",
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "long"
-                },
-                "readonly": false,
-                "extAttrs": []
-            }
-        ],
-        "inheritance": null,
-        "extAttrs": []
-    },
-    {
-        "type": "interface",
-        "name": "ReadOnlySetLike",
-        "partial": false,
-        "members": [
-            {
-                "type": "setlike",
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "long"
-                },
-                "readonly": true,
-                "extAttrs": []
-            }
-        ],
-        "inheritance": null,
-        "extAttrs": []
-    }
-]
-
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/json/typedef-nested.json b/testing/web-platform/tests/resources/webidl2/test/syntax/json/typedef-nested.json
deleted file mode 100644
index 76d138408ddf..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/json/typedef-nested.json
+++ /dev/null
@@ -1,226 +0,0 @@
-[
-    {
-        "type": "interface",
-        "name": "Point",
-        "partial": false,
-        "members": [
-            {
-                "type": "attribute",
-                "static": false,
-                "stringifier": false,
-                "inherit": false,
-                "readonly": false,
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "float"
-                },
-                "name": "x",
-                "extAttrs": []
-            },
-            {
-                "type": "attribute",
-                "static": false,
-                "stringifier": false,
-                "inherit": false,
-                "readonly": false,
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "float"
-                },
-                "name": "y",
-                "extAttrs": []
-            }
-        ],
-        "inheritance": null,
-        "extAttrs": []
-    },
-    {
-        "type": "interface",
-        "name": "Rect",
-        "partial": false,
-        "members": [
-            {
-                "type": "attribute",
-                "static": false,
-                "stringifier": false,
-                "inherit": false,
-                "readonly": false,
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "Point"
-                },
-                "name": "topleft",
-                "extAttrs": []
-            },
-            {
-                "type": "attribute",
-                "static": false,
-                "stringifier": false,
-                "inherit": false,
-                "readonly": false,
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "Point"
-                },
-                "name": "bottomright",
-                "extAttrs": []
-            }
-        ],
-        "inheritance": null,
-        "extAttrs": []
-    },
-    {
-        "type": "interface",
-        "name": "Widget",
-        "partial": false,
-        "members": [
-            {
-                "type": "typedef",
-                "typeExtAttrs": [],
-                "idlType": {
-                    "sequence": true,
-                    "generic": "sequence",
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": {
-                        "sequence": false,
-                        "generic": null,
-                        "nullable": false,
-                        "array": false,
-                        "union": false,
-                        "idlType": "Point"
-                    }
-                },
-                "name": "PointSequence",
-                "extAttrs": []
-            },
-            {
-                "type": "attribute",
-                "static": false,
-                "stringifier": false,
-                "inherit": false,
-                "readonly": true,
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "Rect"
-                },
-                "name": "bounds",
-                "extAttrs": []
-            },
-            {
-                "type": "operation",
-                "getter": false,
-                "setter": false,
-                "creator": false,
-                "deleter": false,
-                "legacycaller": false,
-                "static": false,
-                "stringifier": false,
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "boolean"
-                },
-                "name": "pointWithinBounds",
-                "arguments": [
-                    {
-                        "optional": false,
-                        "variadic": false,
-                        "extAttrs": [],
-                        "idlType": {
-                            "sequence": false,
-                            "generic": null,
-                            "nullable": false,
-                            "array": false,
-                            "union": false,
-                            "idlType": "Point"
-                        },
-                        "name": "p"
-                    }
-                ],
-                "extAttrs": []
-            },
-            {
-                "type": "operation",
-                "getter": false,
-                "setter": false,
-                "creator": false,
-                "deleter": false,
-                "legacycaller": false,
-                "static": false,
-                "stringifier": false,
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "boolean"
-                },
-                "name": "allPointsWithinBounds",
-                "arguments": [
-                    {
-                        "optional": false,
-                        "variadic": false,
-                        "extAttrs": [],
-                        "idlType": {
-                            "sequence": false,
-                            "generic": null,
-                            "nullable": false,
-                            "array": false,
-                            "union": false,
-                            "idlType": "PointSequence"
-                        },
-                        "name": "ps"
-                    }
-                ],
-                "extAttrs": []
-            }
-        ],
-        "inheritance": null,
-        "extAttrs": []
-    },
-    {
-        "type": "typedef",
-        "typeExtAttrs": [
-            {
-                "name": "Clamp",
-                "arguments": null
-            }
-        ],
-        "idlType": {
-            "sequence": false,
-            "generic": null,
-            "nullable": false,
-            "array": false,
-            "union": false,
-            "idlType": "octet"
-        },
-        "name": "value",
-        "extAttrs": []
-    }
-]
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/opt/typedef-nested.json b/testing/web-platform/tests/resources/webidl2/test/syntax/opt/typedef-nested.json
deleted file mode 100644
index f0794e74e07e..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/opt/typedef-nested.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "allowNestedTypedefs": true
-}
\ No newline at end of file
diff --git a/testing/web-platform/tests/selectors/attribute-selectors/attribute-case/semantics.html b/testing/web-platform/tests/selectors/attribute-selectors/attribute-case/semantics.html
index 7b6d7373af0b..c455e26686ef 100644
--- a/testing/web-platform/tests/selectors/attribute-selectors/attribute-case/semantics.html
+++ b/testing/web-platform/tests/selectors/attribute-selectors/attribute-case/semantics.html
@@ -19,12 +19,12 @@ var match = [
   ["[*|foo='bar' i]", ["", "foo", "BAR"], ["a", "foo", "x"], ["b", "foo", "x"], ["c", "foo", "x"]],
   ["[align='left' i]", ["", "align", "LEFT"]],
   ["[align='LEFT' i]", ["", "align", "left"]],
-  ["[class='a' i]", ["", "class", "A"]],
-  ["[class='A' i]", ["", "class", "a"]],
-  ["[id='a' i]", ["", "id", "A"]],
-  ["[id='A' i]", ["", "id", "a"]],
-  ["[lang='a' i]", ["", "lang", "A"]],
-  ["[lang='A' i]", ["", "lang", "a"]],
+  ["[class~='a' i]", ["", "class", "X A B"]],
+  ["[class~='A' i]", ["", "class", "x a b"]],
+  ["[id^='a' i]", ["", "id", "AB"]],
+  ["[id$='A' i]", ["", "id", "xa"]],
+  ["[lang|='a' i]", ["", "lang", "A-B"]],
+  ["[lang*='A' i]", ["", "lang", "xab"]],
   ["[*|lang='a' i]", ["http://www.w3.org/XML/1998/namespace", "lang", "A"]],
   ["[*|lang='A' i]", ["http://www.w3.org/XML/1998/namespace", "lang", "a"]],
   ["@namespace x 'http://www.w3.org/XML/1998/namespace'; [x|lang='A' i]", ["http://www.w3.org/XML/1998/namespace", "lang", "a"]],
@@ -40,11 +40,11 @@ var nomatch = [
   ["[foo='\u00E4' i]", ["", "foo", "\u00C4"]],
   ["[foo='\u00C4' i]", ["", "foo", "\u00E4"]],
   ["[foo='a\u0308' i] /* COMBINING in selector */", ["", "foo", "\u00C4"]],
-  ["[foo='a\u0308' i] /* COMBINING in selector */", ["", "foo", "\u00E4"]],
-  ["[foo='A\u0308' i] /* COMBINING in selector */", ["", "foo", "\u00C4"]],
-  ["[foo='A\u0308' i] /* COMBINING in selector */", ["", "foo", "\u00E4"]],
-  ["[foo='\u00E4' i] /* COMBINING in attribute */", ["", "foo", "a\u0308"]],
-  ["[foo='\u00E4' i] /* COMBINING in attribute */", ["", "foo", "A\u0308"]],
+  ["[foo~='a\u0308' i] /* COMBINING in selector */", ["", "foo", "\u00E4"]],
+  ["[foo^='A\u0308' i] /* COMBINING in selector */", ["", "foo", "\u00C4"]],
+  ["[foo$='A\u0308' i] /* COMBINING in selector */", ["", "foo", "\u00E4"]],
+  ["[foo*='\u00E4' i] /* COMBINING in attribute */", ["", "foo", "a\u0308"]],
+  ["[foo|='\u00E4' i] /* COMBINING in attribute */", ["", "foo", "A\u0308"]],
   ["[foo='\u00C4' i] /* COMBINING in attribute */", ["", "foo", "a\u0308"]],
   ["[foo='\u00C4' i] /* COMBINING in attribute */", ["", "foo", "A\u0308"]],
   ["[foo='a\u0308' i] /* COMBINING in selector */", ["", "foo", "a"]],
diff --git a/testing/web-platform/tests/selectors/attribute-selectors/attribute-case/syntax.html b/testing/web-platform/tests/selectors/attribute-selectors/attribute-case/syntax.html
index 754af95c9d01..1a6aa5b369db 100644
--- a/testing/web-platform/tests/selectors/attribute-selectors/attribute-case/syntax.html
+++ b/testing/web-platform/tests/selectors/attribute-selectors/attribute-case/syntax.html
@@ -29,6 +29,8 @@ var valid = [
   "[foo~='bar' i]",
   "[foo^='bar' i]",
   "[foo$='bar' i]",
+  "[foo*='bar' i]",
+  "[foo|='bar' i]",
   "[|foo='bar' i]",
   "[*|foo='bar' i]",
 ];
diff --git a/testing/web-platform/tests/svg/interfaces.html b/testing/web-platform/tests/svg/interfaces.html
new file mode 100644
index 000000000000..15c447734867
--- /dev/null
+++ b/testing/web-platform/tests/svg/interfaces.html
@@ -0,0 +1,1568 @@
+<!doctype html>
+<title>SVG interface tests</title>
+<div id=log></div>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/resources/WebIDLParser.js></script>
+<script src=/resources/idlharness.js></script>
+<script type=text/plain id=untested_idl>
+interface EventTarget {};
+interface Node : EventTarget {};
+interface Document : Node {};
+interface ProcessingInstruction : Node {};
+interface Element : Node {};
+interface HTMLElement : Element {};
+[PrimaryGlobal] interface Window {};
+
+[TreatNonObjectAsNull]
+callback EventHandlerNonNull = any (Event event);
+typedef EventHandlerNonNull? EventHandler;
+
+[TreatNonObjectAsNull]
+callback OnErrorEventHandlerNonNull = any ((Event or DOMString) event, optional DOMString source, optional unsigned long lineno, optional unsigned long column, optional any error);
+typedef OnErrorEventHandlerNonNull? OnErrorEventHandler;
+
+[TreatNonObjectAsNull]
+callback OnBeforeUnloadEventHandlerNonNull = DOMString? (Event event);
+typedef OnBeforeUnloadEventHandlerNonNull? OnBeforeUnloadEventHandler;
+
+[NoInterfaceObject]
+interface GlobalEventHandlers {
+  attribute EventHandler onabort;
+  attribute EventHandler onautocomplete;
+  attribute EventHandler onautocompleteerror;
+  attribute EventHandler onblur;
+  attribute EventHandler oncancel;
+  attribute EventHandler oncanplay;
+  attribute EventHandler oncanplaythrough;
+  attribute EventHandler onchange;
+  attribute EventHandler onclick;
+  attribute EventHandler onclose;
+  attribute EventHandler oncontextmenu;
+  attribute EventHandler oncuechange;
+  attribute EventHandler ondblclick;
+  attribute EventHandler ondrag;
+  attribute EventHandler ondragend;
+  attribute EventHandler ondragenter;
+  attribute EventHandler ondragexit;
+  attribute EventHandler ondragleave;
+  attribute EventHandler ondragover;
+  attribute EventHandler ondragstart;
+  attribute EventHandler ondrop;
+  attribute EventHandler ondurationchange;
+  attribute EventHandler onemptied;
+  attribute EventHandler onended;
+  attribute OnErrorEventHandler onerror;
+  attribute EventHandler onfocus;
+  attribute EventHandler oninput;
+  attribute EventHandler oninvalid;
+  attribute EventHandler onkeydown;
+  attribute EventHandler onkeypress;
+  attribute EventHandler onkeyup;
+  attribute EventHandler onload;
+  attribute EventHandler onloadeddata;
+  attribute EventHandler onloadedmetadata;
+  attribute EventHandler onloadstart;
+  attribute EventHandler onmousedown;
+  [LenientThis] attribute EventHandler onmouseenter;
+  [LenientThis] attribute EventHandler onmouseleave;
+  attribute EventHandler onmousemove;
+  attribute EventHandler onmouseout;
+  attribute EventHandler onmouseover;
+  attribute EventHandler onmouseup;
+  attribute EventHandler onwheel;
+  attribute EventHandler onpause;
+  attribute EventHandler onplay;
+  attribute EventHandler onplaying;
+  attribute EventHandler onprogress;
+  attribute EventHandler onratechange;
+  attribute EventHandler onreset;
+  attribute EventHandler onresize;
+  attribute EventHandler onscroll;
+  attribute EventHandler onseeked;
+  attribute EventHandler onseeking;
+  attribute EventHandler onselect;
+  attribute EventHandler onshow;
+  attribute EventHandler onsort;
+  attribute EventHandler onstalled;
+  attribute EventHandler onsubmit;
+  attribute EventHandler onsuspend;
+  attribute EventHandler ontimeupdate;
+  attribute EventHandler ontoggle;
+  attribute EventHandler onvolumechange;
+  attribute EventHandler onwaiting;
+};
+
+[NoInterfaceObject]
+interface WindowEventHandlers {
+  attribute EventHandler onafterprint;
+  attribute EventHandler onbeforeprint;
+  attribute OnBeforeUnloadEventHandler onbeforeunload;
+  attribute EventHandler onhashchange;
+  attribute EventHandler onlanguagechange;
+  attribute EventHandler onmessage;
+  attribute EventHandler onoffline;
+  attribute EventHandler ononline;
+  attribute EventHandler onpagehide;
+  attribute EventHandler onpageshow;
+  attribute EventHandler onpopstate;
+  attribute EventHandler onrejectionhandled;
+  attribute EventHandler onstorage;
+  attribute EventHandler onunhandledrejection;
+  attribute EventHandler onunload;
+};
+
+[NoInterfaceObject]interface LinkStyle {
+  readonly attribute StyleSheet? sheet;
+};
+
+
+[Constructor(optional unrestricted double x = 0, optional unrestricted double y = 0,
+             optional unrestricted double z = 0, optional unrestricted double w = 1),
+ Exposed=(Window,Worker)]
+interface DOMPointReadOnly {
+    [NewObject] static DOMPointReadOnly fromPoint(optional DOMPointInit point);
+
+    readonly attribute unrestricted double x;
+    readonly attribute unrestricted double y;
+    readonly attribute unrestricted double z;
+    readonly attribute unrestricted double w;
+
+    DOMPoint matrixTransform(optional DOMMatrixInit matrix);
+};
+
+[Constructor(optional unrestricted double x = 0, optional unrestricted double y = 0,
+             optional unrestricted double z = 0, optional unrestricted double w = 1),
+ Exposed=(Window,Worker)]
+interface DOMPoint : DOMPointReadOnly {
+    [NewObject] static DOMPoint fromPoint(optional DOMPointInit other);
+
+    inherit attribute unrestricted double x;
+    inherit attribute unrestricted double y;
+    inherit attribute unrestricted double z;
+    inherit attribute unrestricted double w;
+};
+
+dictionary DOMPointInit {
+    unrestricted double x = 0;
+    unrestricted double y = 0;
+    unrestricted double z = 0;
+    unrestricted double w = 1;
+};
+
+[Constructor(optional unrestricted double x = 0, optional unrestricted double y = 0,
+             optional unrestricted double width = 0, optional unrestricted double height = 0),
+ Exposed=(Window,Worker)]
+interface DOMRectReadOnly {
+    [NewObject] static DOMRectReadOnly fromRect(optional DOMRectInit other);
+
+    readonly attribute unrestricted double x;
+    readonly attribute unrestricted double y;
+    readonly attribute unrestricted double width;
+    readonly attribute unrestricted double height;
+    readonly attribute unrestricted double top;
+    readonly attribute unrestricted double right;
+    readonly attribute unrestricted double bottom;
+    readonly attribute unrestricted double left;
+};
+
+[Constructor(optional unrestricted double x = 0, optional unrestricted double y = 0,
+             optional unrestricted double width = 0, optional unrestricted double height = 0),
+ Exposed=(Window,Worker)]
+interface DOMRect : DOMRectReadOnly {
+    [NewObject] static DOMRect fromRect(optional DOMRectInit other);
+
+    inherit attribute unrestricted double x;
+    inherit attribute unrestricted double y;
+    inherit attribute unrestricted double width;
+    inherit attribute unrestricted double height;
+};
+
+dictionary DOMRectInit {
+    unrestricted double x = 0;
+    unrestricted double y = 0;
+    unrestricted double width = 0;
+    unrestricted double height = 0;
+};
+
+[Constructor(sequence<unrestricted double> numberSequence),
+ Exposed=(Window,Worker)]
+interface DOMMatrixReadOnly {
+    [NewObject] static DOMMatrixReadOnly fromMatrix(optional DOMMatrixInit other);
+    [NewObject] static DOMMatrixReadOnly fromString(DOMString transformList);
+    [NewObject] static DOMMatrixReadOnly fromFloat32Array(Float32Array array32);
+    [NewObject] static DOMMatrixReadOnly fromFloat64Array(Float64Array array64);
+
+    // These attributes are simple aliases for certain elements of the 4x4 matrix
+    readonly attribute unrestricted double a;
+    readonly attribute unrestricted double b;
+    readonly attribute unrestricted double c;
+    readonly attribute unrestricted double d;
+    readonly attribute unrestricted double e;
+    readonly attribute unrestricted double f;
+
+    readonly attribute unrestricted double m11;
+    readonly attribute unrestricted double m12;
+    readonly attribute unrestricted double m13;
+    readonly attribute unrestricted double m14;
+    readonly attribute unrestricted double m21;
+    readonly attribute unrestricted double m22;
+    readonly attribute unrestricted double m23;
+    readonly attribute unrestricted double m24;
+    readonly attribute unrestricted double m31;
+    readonly attribute unrestricted double m32;
+    readonly attribute unrestricted double m33;
+    readonly attribute unrestricted double m34;
+    readonly attribute unrestricted double m41;
+    readonly attribute unrestricted double m42;
+    readonly attribute unrestricted double m43;
+    readonly attribute unrestricted double m44;
+
+    readonly attribute boolean is2D;
+    readonly attribute boolean isIdentity;
+
+    // Immutable transform methods
+    DOMMatrix translate(unrestricted double tx,
+                        unrestricted double ty,
+                        optional unrestricted double tz = 0);
+    DOMMatrix scale(unrestricted double scale,
+                    optional unrestricted double originX = 0,
+                    optional unrestricted double originY = 0);
+    DOMMatrix scale3d(unrestricted double scale,
+                      optional unrestricted double originX = 0,
+                      optional unrestricted double originY = 0,
+                      optional unrestricted double originZ = 0);
+    DOMMatrix scaleNonUniform(unrestricted double scaleX,
+                              optional unrestricted double scaleY = 1,
+                              optional unrestricted double scaleZ = 1,
+                              optional unrestricted double originX = 0,
+                              optional unrestricted double originY = 0,
+                              optional unrestricted double originZ = 0);
+    DOMMatrix rotate(unrestricted double angle,
+                     optional unrestricted double originX = 0,
+                     optional unrestricted double originY = 0);
+    DOMMatrix rotateFromVector(unrestricted double x,
+                               unrestricted double y);
+    DOMMatrix rotateAxisAngle(unrestricted double x,
+                              unrestricted double y,
+                              unrestricted double z,
+                              unrestricted double angle);
+    DOMMatrix skewX(unrestricted double sx);
+    DOMMatrix skewY(unrestricted double sy);
+    DOMMatrix multiply(optional DOMMatrixInit other);
+    DOMMatrix flipX();
+    DOMMatrix flipY();
+    DOMMatrix inverse();
+
+    DOMPoint            transformPoint(optional DOMPointInit point);
+    Float32Array        toFloat32Array();
+    Float64Array        toFloat64Array();
+                        stringifier;
+};
+
+[Constructor(sequence<unrestricted double> numberSequence),
+ Exposed=(Window,Worker)]
+interface DOMMatrix : DOMMatrixReadOnly {
+    [NewObject] static DOMMatrix fromMatrix(optional DOMMatrixInit other);
+    [NewObject] static DOMMatrix fromString(DOMString transformList);
+    [NewObject] static DOMMatrix fromFloat32Array(Float32Array array32);
+    [NewObject] static DOMMatrix fromFloat64Array(Float64Array array64);
+
+    // These attributes are simple aliases for certain elements of the 4x4 matrix
+    inherit attribute unrestricted double a;
+    inherit attribute unrestricted double b;
+    inherit attribute unrestricted double c;
+    inherit attribute unrestricted double d;
+    inherit attribute unrestricted double e;
+    inherit attribute unrestricted double f;
+
+    inherit attribute unrestricted double m11;
+    inherit attribute unrestricted double m12;
+    inherit attribute unrestricted double m13;
+    inherit attribute unrestricted double m14;
+    inherit attribute unrestricted double m21;
+    inherit attribute unrestricted double m22;
+    inherit attribute unrestricted double m23;
+    inherit attribute unrestricted double m24;
+    inherit attribute unrestricted double m31;
+    inherit attribute unrestricted double m32;
+    inherit attribute unrestricted double m33;
+    inherit attribute unrestricted double m34;
+    inherit attribute unrestricted double m41;
+    inherit attribute unrestricted double m42;
+    inherit attribute unrestricted double m43;
+    inherit attribute unrestricted double m44;
+
+    // Mutable transform methods
+    DOMMatrix multiplySelf(optional DOMMatrixInit other);
+    DOMMatrix preMultiplySelf(optional DOMMatrixInit other);
+    DOMMatrix translateSelf(unrestricted double tx,
+                     unrestricted double ty,
+                     optional unrestricted double tz = 0);
+    DOMMatrix scaleSelf(unrestricted double scale,
+                 optional unrestricted double originX = 0,
+                 optional unrestricted double originY = 0);
+    DOMMatrix scale3dSelf(unrestricted double scale,
+                   optional unrestricted double originX = 0,
+                   optional unrestricted double originY = 0,
+                   optional unrestricted double originZ = 0);
+    DOMMatrix scaleNonUniformSelf(unrestricted double scaleX,
+                           optional unrestricted double scaleY = 1,
+                           optional unrestricted double scaleZ = 1,
+                           optional unrestricted double originX = 0,
+                           optional unrestricted double originY = 0,
+                           optional unrestricted double originZ = 0);
+    DOMMatrix rotateSelf(unrestricted double angle,
+                  optional unrestricted double originX = 0,
+                  optional unrestricted double originY = 0);
+    DOMMatrix rotateFromVectorSelf(unrestricted double x,
+                            unrestricted double y);
+    DOMMatrix rotateAxisAngleSelf(unrestricted double x,
+                           unrestricted double y,
+                           unrestricted double z,
+                           unrestricted double angle);
+    DOMMatrix skewXSelf(unrestricted double sx);
+    DOMMatrix skewYSelf(unrestricted double sy);
+    DOMMatrix invertSelf();
+
+    DOMMatrix setMatrixValue(DOMString transformList);
+};
+
+dictionary DOMMatrixInit {
+    unrestricted double a;
+    unrestricted double b;
+    unrestricted double c;
+    unrestricted double d;
+    unrestricted double e;
+    unrestricted double f;
+    unrestricted double m11;
+    unrestricted double m12;
+    unrestricted double m13 = 0;
+    unrestricted double m14 = 0;
+    unrestricted double m21;
+    unrestricted double m22;
+    unrestricted double m23 = 0;
+    unrestricted double m24 = 0;
+    unrestricted double m31 = 0;
+    unrestricted double m32 = 0;
+    unrestricted double m33 = 1;
+    unrestricted double m34 = 0;
+    unrestricted double m41;
+    unrestricted double m42;
+    unrestricted double m43 = 0;
+    unrestricted double m44 = 1;
+    boolean is2D;
+};
+</script>
+<script type=text/plain id=idl>
+interface SVGElement : Element {
+
+  [SameObject] readonly attribute SVGAnimatedString className;
+
+  readonly attribute SVGSVGElement? ownerSVGElement;
+  readonly attribute SVGElement? viewportElement;
+
+  attribute long tabIndex;
+  void focus();
+  void blur();
+};
+
+SVGElement implements GlobalEventHandlers;
+
+dictionary SVGBoundingBoxOptions {
+  boolean fill = true;
+  boolean stroke = false;
+  boolean markers = false;
+  boolean clipped = false;
+};
+
+interface SVGGraphicsElement : SVGElement {
+  [SameObject] readonly attribute SVGAnimatedTransformList transform;
+
+  DOMRect getBBox(optional SVGBoundingBoxOptions options);
+  DOMMatrix? getCTM();
+  DOMMatrix? getScreenCTM();
+};
+
+SVGGraphicsElement implements SVGTests;
+
+interface SVGGeometryElement : SVGGraphicsElement {
+  boolean isPointInFill(DOMPoint point);
+  boolean isPointInStroke(DOMPoint point);
+};
+
+interface SVGNumber {
+  attribute float value;
+};
+
+interface SVGLength {
+
+  // Length Unit Types
+  const unsigned short SVG_LENGTHTYPE_UNKNOWN = 0;
+  const unsigned short SVG_LENGTHTYPE_NUMBER = 1;
+  const unsigned short SVG_LENGTHTYPE_PERCENTAGE = 2;
+  const unsigned short SVG_LENGTHTYPE_EMS = 3;
+  const unsigned short SVG_LENGTHTYPE_EXS = 4;
+  const unsigned short SVG_LENGTHTYPE_PX = 5;
+  const unsigned short SVG_LENGTHTYPE_CM = 6;
+  const unsigned short SVG_LENGTHTYPE_MM = 7;
+  const unsigned short SVG_LENGTHTYPE_IN = 8;
+  const unsigned short SVG_LENGTHTYPE_PT = 9;
+  const unsigned short SVG_LENGTHTYPE_PC = 10;
+
+  readonly attribute unsigned short unitType;
+           attribute float value;
+           attribute float valueInSpecifiedUnits;
+           attribute DOMString valueAsString;
+
+  void newValueSpecifiedUnits(unsigned short unitType, float valueInSpecifiedUnits);
+  void convertToSpecifiedUnits(unsigned short unitType);
+};
+
+interface SVGAngle {
+
+  // Angle Unit Types
+  const unsigned short SVG_ANGLETYPE_UNKNOWN = 0;
+  const unsigned short SVG_ANGLETYPE_UNSPECIFIED = 1;
+  const unsigned short SVG_ANGLETYPE_DEG = 2;
+  const unsigned short SVG_ANGLETYPE_RAD = 3;
+  const unsigned short SVG_ANGLETYPE_GRAD = 4;
+
+  readonly attribute unsigned short unitType;
+           attribute float value;
+           attribute float valueInSpecifiedUnits;
+           attribute DOMString valueAsString;
+
+  void newValueSpecifiedUnits(unsigned short unitType, float valueInSpecifiedUnits);
+  void convertToSpecifiedUnits(unsigned short unitType);
+};
+
+interface SVGNumberList {
+
+  readonly attribute unsigned long length;
+  readonly attribute unsigned long numberOfItems;
+
+  void clear();
+  SVGNumber initialize(SVGNumber newItem);
+  getter SVGNumber getItem(unsigned long index);
+  SVGNumber insertItemBefore(SVGNumber newItem, unsigned long index);
+  SVGNumber replaceItem(SVGNumber newItem, unsigned long index);
+  SVGNumber removeItem(unsigned long index);
+  SVGNumber appendItem(SVGNumber newItem);
+  setter void (unsigned long index, SVGNumber newItem);
+};
+
+interface SVGLengthList {
+
+  readonly attribute unsigned long length;
+  readonly attribute unsigned long numberOfItems;
+
+  void clear();
+  SVGLength initialize(SVGLength newItem);
+  getter SVGLength getItem(unsigned long index);
+  SVGLength insertItemBefore(SVGLength newItem, unsigned long index);
+  SVGLength replaceItem(SVGLength newItem, unsigned long index);
+  SVGLength removeItem(unsigned long index);
+  SVGLength appendItem(SVGLength newItem);
+  setter void (unsigned long index, SVGLength newItem);
+};
+
+interface SVGAnimatedBoolean {
+           attribute boolean baseVal;
+  readonly attribute boolean animVal;
+};
+
+interface SVGAnimatedEnumeration {
+           attribute unsigned short baseVal;
+  readonly attribute unsigned short animVal;
+};
+
+interface SVGAnimatedInteger {
+           attribute long baseVal;
+  readonly attribute long animVal;
+};
+
+interface SVGAnimatedNumber {
+           attribute float baseVal;
+  readonly attribute float animVal;
+};
+
+interface SVGAnimatedLength {
+  [SameObject] readonly attribute SVGLength baseVal;
+  [SameObject] readonly attribute SVGLength animVal;
+};
+
+interface SVGAnimatedAngle {
+  [SameObject] readonly attribute SVGAngle baseVal;
+  [SameObject] readonly attribute SVGAngle animVal;
+};
+
+interface SVGAnimatedString {
+           attribute DOMString baseVal;
+  readonly attribute DOMString animVal;
+};
+
+interface SVGAnimatedRect {
+  [SameObject] readonly attribute DOMRect baseVal;
+  [SameObject] readonly attribute DOMRectReadOnly animVal;
+};
+
+interface SVGAnimatedNumberList {
+  [SameObject] readonly attribute SVGNumberList baseVal;
+  [SameObject] readonly attribute SVGNumberList animVal;
+};
+
+interface SVGAnimatedLengthList {
+  [SameObject] readonly attribute SVGLengthList baseVal;
+  [SameObject] readonly attribute SVGLengthList animVal;
+};
+
+interface SVGStringList {
+
+  readonly attribute unsigned long length;
+  readonly attribute unsigned long numberOfItems;
+
+  void clear();
+  DOMString initialize(DOMString newItem);
+  getter DOMString getItem(unsigned long index);
+  DOMString insertItemBefore(DOMString newItem, unsigned long index);
+  DOMString replaceItem(DOMString newItem, unsigned long index);
+  DOMString removeItem(unsigned long index);
+  DOMString appendItem(DOMString newItem);
+  setter void (unsigned long index, DOMString newItem);
+};
+
+[NoInterfaceObject]
+interface SVGUnitTypes {
+  // Unit Types
+  const unsigned short SVG_UNIT_TYPE_UNKNOWN = 0;
+  const unsigned short SVG_UNIT_TYPE_USERSPACEONUSE = 1;
+  const unsigned short SVG_UNIT_TYPE_OBJECTBOUNDINGBOX = 2;
+};
+
+[NoInterfaceObject]
+interface SVGTests {
+  [SameObject] readonly attribute SVGStringList requiredExtensions;
+  [SameObject] readonly attribute SVGStringList systemLanguage;
+};
+
+[NoInterfaceObject]
+interface SVGFitToViewBox {
+  [SameObject] readonly attribute SVGAnimatedRect viewBox;
+  [SameObject] readonly attribute SVGAnimatedPreserveAspectRatio preserveAspectRatio;
+};
+
+[NoInterfaceObject]
+interface SVGZoomAndPan {
+
+  // Zoom and Pan Types
+  const unsigned short SVG_ZOOMANDPAN_UNKNOWN = 0;
+  const unsigned short SVG_ZOOMANDPAN_DISABLE = 1;
+  const unsigned short SVG_ZOOMANDPAN_MAGNIFY = 2;
+
+  attribute unsigned short zoomAndPan;
+};
+
+[NoInterfaceObject]
+interface SVGURIReference {
+  [SameObject] readonly attribute SVGAnimatedString href;
+};
+
+partial interface Document {
+  readonly attribute SVGSVGElement rootElement;
+};
+
+interface SVGSVGElement : SVGGraphicsElement {
+
+  [SameObject] readonly attribute SVGAnimatedLength x;
+  [SameObject] readonly attribute SVGAnimatedLength y;
+  [SameObject] readonly attribute SVGAnimatedLength width;
+  [SameObject] readonly attribute SVGAnimatedLength height;
+
+  attribute float currentScale;
+  [SameObject] readonly attribute DOMPointReadOnly currentTranslate;
+
+  NodeList getIntersectionList(DOMRectReadOnly rect, SVGElement? referenceElement);
+  NodeList getEnclosureList(DOMRectReadOnly rect, SVGElement? referenceElement);
+  boolean checkIntersection(SVGElement element, DOMRectReadOnly rect);
+  boolean checkEnclosure(SVGElement element, DOMRectReadOnly rect);
+
+  void deselectAll();
+
+  SVGNumber createSVGNumber();
+  SVGLength createSVGLength();
+  SVGAngle createSVGAngle();
+  DOMPoint createSVGPoint();
+  DOMMatrix createSVGMatrix();
+  DOMRect createSVGRect();
+  SVGTransform createSVGTransform();
+  SVGTransform createSVGTransformFromMatrix(DOMMatrixReadOnly matrix);
+
+  // Deprecated methods that have no effect when called,
+  // but which are kept for compatibility reasons.
+  unsigned long suspendRedraw(unsigned long maxWaitMilliseconds);
+  void unsuspendRedraw(unsigned long suspendHandleID);
+  void unsuspendRedrawAll();
+  void forceRedraw();
+};
+
+SVGSVGElement implements SVGFitToViewBox;
+SVGSVGElement implements SVGZoomAndPan;
+SVGSVGElement implements WindowEventHandlers;
+
+interface SVGGElement : SVGGraphicsElement {
+};
+
+interface SVGUnknownElement : SVGGraphicsElement {
+};
+
+interface SVGDefsElement : SVGGraphicsElement {
+};
+
+interface SVGDescElement : SVGElement {
+};
+
+interface SVGMetadataElement : SVGElement {
+};
+
+interface SVGTitleElement : SVGElement {
+};
+
+interface SVGSymbolElement : SVGElement {
+};
+
+SVGSymbolElement implements SVGFitToViewBox;
+
+interface SVGUseElement : SVGGraphicsElement {
+  [SameObject] readonly attribute SVGAnimatedLength x;
+  [SameObject] readonly attribute SVGAnimatedLength y;
+  [SameObject] readonly attribute SVGAnimatedLength width;
+  [SameObject] readonly attribute SVGAnimatedLength height;
+};
+
+SVGUseElement implements SVGURIReference;
+
+interface SVGSwitchElement : SVGGraphicsElement {
+};
+
+[NoInterfaceObject]
+interface GetSVGDocument {
+  Document getSVGDocument();
+};
+
+interface SVGStyleElement : SVGElement {
+  attribute DOMString type;
+  attribute DOMString media;
+  attribute DOMString title;
+};
+
+SVGStyleElement implements LinkStyle;
+
+interface SVGTransform {
+
+  // Transform Types
+  const unsigned short SVG_TRANSFORM_UNKNOWN = 0;
+  const unsigned short SVG_TRANSFORM_MATRIX = 1;
+  const unsigned short SVG_TRANSFORM_TRANSLATE = 2;
+  const unsigned short SVG_TRANSFORM_SCALE = 3;
+  const unsigned short SVG_TRANSFORM_ROTATE = 4;
+  const unsigned short SVG_TRANSFORM_SKEWX = 5;
+  const unsigned short SVG_TRANSFORM_SKEWY = 6;
+
+  readonly attribute unsigned short type;
+  [SameObject] readonly attribute DOMMatrix matrix;
+  readonly attribute float angle;
+
+  void setMatrix(DOMMatrixReadOnly matrix);
+  void setTranslate(float tx, float ty);
+  void setScale(float sx, float sy);
+  void setRotate(float angle, float cx, float cy);
+  void setSkewX(float angle);
+  void setSkewY(float angle);
+};
+
+interface SVGTransformList {
+
+  readonly attribute unsigned long length;
+  readonly attribute unsigned long numberOfItems;
+
+  void clear();
+  SVGTransform initialize(SVGTransform newItem);
+  getter SVGTransform getItem(unsigned long index);
+  SVGTransform insertItemBefore(SVGTransform newItem, unsigned long index);
+  SVGTransform replaceItem(SVGTransform newItem, unsigned long index);
+  SVGTransform removeItem(unsigned long index);
+  SVGTransform appendItem(SVGTransform newItem);
+  setter void (unsigned long index, SVGTransform newItem);
+
+  // Additional methods not common to other list interfaces.
+  SVGTransform createSVGTransformFromMatrix(DOMMatrixReadOnly matrix);
+  SVGTransform? consolidate();
+};
+
+interface SVGAnimatedTransformList {
+  [SameObject] readonly attribute SVGTransformList baseVal;
+  [SameObject] readonly attribute SVGTransformList animVal;
+};
+
+interface SVGPreserveAspectRatio {
+
+  // Alignment Types
+  const unsigned short SVG_PRESERVEASPECTRATIO_UNKNOWN = 0;
+  const unsigned short SVG_PRESERVEASPECTRATIO_NONE = 1;
+  const unsigned short SVG_PRESERVEASPECTRATIO_XMINYMIN = 2;
+  const unsigned short SVG_PRESERVEASPECTRATIO_XMIDYMIN = 3;
+  const unsigned short SVG_PRESERVEASPECTRATIO_XMAXYMIN = 4;
+  const unsigned short SVG_PRESERVEASPECTRATIO_XMINYMID = 5;
+  const unsigned short SVG_PRESERVEASPECTRATIO_XMIDYMID = 6;
+  const unsigned short SVG_PRESERVEASPECTRATIO_XMAXYMID = 7;
+  const unsigned short SVG_PRESERVEASPECTRATIO_XMINYMAX = 8;
+  const unsigned short SVG_PRESERVEASPECTRATIO_XMIDYMAX = 9;
+  const unsigned short SVG_PRESERVEASPECTRATIO_XMAXYMAX = 10;
+
+  // Meet-or-slice Types
+  const unsigned short SVG_MEETORSLICE_UNKNOWN = 0;
+  const unsigned short SVG_MEETORSLICE_MEET = 1;
+  const unsigned short SVG_MEETORSLICE_SLICE = 2;
+
+  attribute unsigned short align;
+  attribute unsigned short meetOrSlice;
+};
+
+interface SVGAnimatedPreserveAspectRatio {
+  [SameObject] readonly attribute SVGPreserveAspectRatio baseVal;
+  [SameObject] readonly attribute SVGPreserveAspectRatio animVal;
+};
+
+interface SVGPathElement : SVGGeometryElement {
+
+  [SameObject] readonly attribute SVGAnimatedNumber pathLength;
+
+  float getTotalLength();
+  DOMPoint getPointAtLength(float distance);
+};
+
+interface SVGRectElement : SVGGeometryElement {
+  [SameObject] readonly attribute SVGAnimatedLength x;
+  [SameObject] readonly attribute SVGAnimatedLength y;
+  [SameObject] readonly attribute SVGAnimatedLength width;
+  [SameObject] readonly attribute SVGAnimatedLength height;
+  [SameObject] readonly attribute SVGAnimatedLength rx;
+  [SameObject] readonly attribute SVGAnimatedLength ry;
+};
+
+interface SVGCircleElement : SVGGeometryElement {
+  [SameObject] readonly attribute SVGAnimatedLength cx;
+  [SameObject] readonly attribute SVGAnimatedLength cy;
+  [SameObject] readonly attribute SVGAnimatedLength r;
+};
+
+interface SVGEllipseElement : SVGGeometryElement {
+  [SameObject] readonly attribute SVGAnimatedLength cx;
+  [SameObject] readonly attribute SVGAnimatedLength cy;
+  [SameObject] readonly attribute SVGAnimatedLength rx;
+  [SameObject] readonly attribute SVGAnimatedLength ry;
+};
+
+interface SVGLineElement : SVGGeometryElement {
+  [SameObject] readonly attribute SVGAnimatedLength x1;
+  [SameObject] readonly attribute SVGAnimatedLength y1;
+  [SameObject] readonly attribute SVGAnimatedLength x2;
+  [SameObject] readonly attribute SVGAnimatedLength y2;
+};
+
+[NoInterfaceObject]
+interface SVGAnimatedPoints {
+  [SameObject] readonly attribute SVGPointList points;
+  [SameObject] readonly attribute SVGPointList animatedPoints;
+};
+
+interface SVGPointList {
+
+  readonly attribute unsigned long length;
+  readonly attribute unsigned long numberOfItems;
+
+  void clear();
+  DOMPoint initialize(DOMPoint newItem);
+  getter DOMPoint getItem(unsigned long index);
+  DOMPoint insertItemBefore(DOMPoint newItem, unsigned long index);
+  DOMPoint replaceItem(DOMPoint newItem, unsigned long index);
+  DOMPoint removeItem(unsigned long index);
+  DOMPoint appendItem(DOMPoint newItem);
+  setter void (unsigned long index, DOMPoint newItem);
+};
+
+interface SVGPolylineElement : SVGGeometryElement {
+};
+
+SVGPolylineElement implements SVGAnimatedPoints;
+
+interface SVGPolygonElement : SVGGeometryElement {
+};
+
+SVGPolygonElement implements SVGAnimatedPoints;
+
+interface SVGTextContentElement : SVGGraphicsElement {
+
+  // lengthAdjust Types
+  const unsigned short LENGTHADJUST_UNKNOWN = 0;
+  const unsigned short LENGTHADJUST_SPACING = 1;
+  const unsigned short LENGTHADJUST_SPACINGANDGLYPHS = 2;
+
+  [SameObject] readonly attribute SVGAnimatedLength textLength;
+  [SameObject] readonly attribute SVGAnimatedEnumeration lengthAdjust;
+
+  long getNumberOfChars();
+  float getComputedTextLength();
+  float getSubStringLength(unsigned long charnum, unsigned long nchars);
+  DOMPoint getStartPositionOfChar(unsigned long charnum);
+  DOMPoint getEndPositionOfChar(unsigned long charnum);
+  DOMRect getExtentOfChar(unsigned long charnum);
+  float getRotationOfChar(unsigned long charnum);
+  long getCharNumAtPosition(DOMPoint point);
+  void selectSubString(unsigned long charnum, unsigned long nchars);
+};
+
+interface SVGTextPositioningElement : SVGTextContentElement {
+  [SameObject] readonly attribute SVGAnimatedLengthList x;
+  [SameObject] readonly attribute SVGAnimatedLengthList y;
+  [SameObject] readonly attribute SVGAnimatedLengthList dx;
+  [SameObject] readonly attribute SVGAnimatedLengthList dy;
+  [SameObject] readonly attribute SVGAnimatedNumberList rotate;
+};
+
+interface SVGTextElement : SVGTextPositioningElement {
+};
+
+interface SVGTSpanElement : SVGTextPositioningElement {
+};
+
+interface SVGTextPathElement : SVGTextContentElement {
+
+  // textPath Method Types
+  const unsigned short TEXTPATH_METHODTYPE_UNKNOWN = 0;
+  const unsigned short TEXTPATH_METHODTYPE_ALIGN = 1;
+  const unsigned short TEXTPATH_METHODTYPE_STRETCH = 2;
+
+  // textPath Spacing Types
+  const unsigned short TEXTPATH_SPACINGTYPE_UNKNOWN = 0;
+  const unsigned short TEXTPATH_SPACINGTYPE_AUTO = 1;
+  const unsigned short TEXTPATH_SPACINGTYPE_EXACT = 2;
+
+  [SameObject] readonly attribute SVGAnimatedLength startOffset;
+  [SameObject] readonly attribute SVGAnimatedEnumeration method;
+  [SameObject] readonly attribute SVGAnimatedEnumeration spacing;
+};
+
+SVGTextPathElement implements SVGURIReference;
+
+interface SVGImageElement : SVGGraphicsElement {
+  [SameObject] readonly attribute SVGAnimatedLength x;
+  [SameObject] readonly attribute SVGAnimatedLength y;
+  [SameObject] readonly attribute SVGAnimatedLength width;
+  [SameObject] readonly attribute SVGAnimatedLength height;
+  [SameObject] readonly attribute SVGAnimatedPreserveAspectRatio preserveAspectRatio;
+  attribute DOMString crossOrigin;
+};
+
+SVGImageElement implements SVGURIReference;
+
+interface SVGForeignObjectElement : SVGGraphicsElement {
+  [SameObject] readonly attribute SVGAnimatedLength x;
+  [SameObject] readonly attribute SVGAnimatedLength y;
+  [SameObject] readonly attribute SVGAnimatedLength width;
+  [SameObject] readonly attribute SVGAnimatedLength height;
+};
+
+interface SVGMarkerElement : SVGElement {
+
+  // Marker Unit Types
+  const unsigned short SVG_MARKERUNITS_UNKNOWN = 0;
+  const unsigned short SVG_MARKERUNITS_USERSPACEONUSE = 1;
+  const unsigned short SVG_MARKERUNITS_STROKEWIDTH = 2;
+
+  // Marker Orientation Types
+  const unsigned short SVG_MARKER_ORIENT_UNKNOWN = 0;
+  const unsigned short SVG_MARKER_ORIENT_AUTO = 1;
+  const unsigned short SVG_MARKER_ORIENT_ANGLE = 2;
+
+  [SameObject] readonly attribute SVGAnimatedLength refX;
+  [SameObject] readonly attribute SVGAnimatedLength refY;
+  [SameObject] readonly attribute SVGAnimatedEnumeration markerUnits;
+  [SameObject] readonly attribute SVGAnimatedLength markerWidth;
+  [SameObject] readonly attribute SVGAnimatedLength markerHeight;
+  [SameObject] readonly attribute SVGAnimatedEnumeration orientType;
+  [SameObject] readonly attribute SVGAnimatedAngle orientAngle;
+  attribute DOMString orient;
+
+  void setOrientToAuto();
+  void setOrientToAngle(SVGAngle angle);
+};
+
+SVGMarkerElement implements SVGFitToViewBox;
+
+interface SVGSolidcolorElement : SVGElement {
+};
+
+interface SVGGradientElement : SVGElement {
+
+  // Spread Method Types
+  const unsigned short SVG_SPREADMETHOD_UNKNOWN = 0;
+  const unsigned short SVG_SPREADMETHOD_PAD = 1;
+  const unsigned short SVG_SPREADMETHOD_REFLECT = 2;
+  const unsigned short SVG_SPREADMETHOD_REPEAT = 3;
+
+  [SameObject] readonly attribute SVGAnimatedEnumeration gradientUnits;
+  [SameObject] readonly attribute SVGAnimatedTransformList gradientTransform;
+  [SameObject] readonly attribute SVGAnimatedEnumeration spreadMethod;
+};
+
+SVGGradientElement implements SVGURIReference;
+SVGGradientElement implements SVGUnitTypes;
+
+interface SVGLinearGradientElement : SVGGradientElement {
+  [SameObject] readonly attribute SVGAnimatedLength x1;
+  [SameObject] readonly attribute SVGAnimatedLength y1;
+  [SameObject] readonly attribute SVGAnimatedLength x2;
+  [SameObject] readonly attribute SVGAnimatedLength y2;
+};
+
+interface SVGRadialGradientElement : SVGGradientElement {
+  [SameObject] readonly attribute SVGAnimatedLength cx;
+  [SameObject] readonly attribute SVGAnimatedLength cy;
+  [SameObject] readonly attribute SVGAnimatedLength r;
+  [SameObject] readonly attribute SVGAnimatedLength fx;
+  [SameObject] readonly attribute SVGAnimatedLength fy;
+  [SameObject] readonly attribute SVGAnimatedLength fr;
+};
+
+interface SVGMeshElement : SVGGradientElement {
+};
+
+interface SVGMeshrowElement : SVGElement {
+};
+
+interface SVGMeshpatchElement : SVGElement {
+};
+
+interface SVGStopElement : SVGElement {
+  [SameObject] readonly attribute SVGAnimatedNumber offset;
+};
+
+interface SVGPatternElement : SVGElement {
+  [SameObject] readonly attribute SVGAnimatedEnumeration patternUnits;
+  [SameObject] readonly attribute SVGAnimatedEnumeration patternContentUnits;
+  [SameObject] readonly attribute SVGAnimatedTransformList patternTransform;
+  [SameObject] readonly attribute SVGAnimatedLength x;
+  [SameObject] readonly attribute SVGAnimatedLength y;
+  [SameObject] readonly attribute SVGAnimatedLength width;
+  [SameObject] readonly attribute SVGAnimatedLength height;
+};
+
+SVGPatternElement implements SVGFitToViewBox;
+SVGPatternElement implements SVGURIReference;
+SVGPatternElement implements SVGUnitTypes;
+
+interface SVGHatchElement : SVGElement {
+};
+
+interface SVGHatchpathElement : SVGElement {
+};
+
+interface SVGCursorElement : SVGElement {
+  [SameObject] readonly attribute SVGAnimatedLength x;
+  [SameObject] readonly attribute SVGAnimatedLength y;
+};
+
+SVGCursorElement implements SVGURIReference;
+
+interface SVGScriptElement : SVGElement {
+  attribute DOMString type;
+  attribute DOMString crossOrigin;
+};
+
+SVGScriptElement implements SVGURIReference;
+
+interface SVGZoomEvent : UIEvent {
+  [SameObject] readonly attribute DOMRectReadOnly zoomRectScreen;
+  readonly attribute float previousScale;
+  [SameObject] readonly attribute DOMPointReadOnly previousTranslate;
+  readonly attribute float newScale;
+  [SameObject] readonly attribute DOMPointReadOnly newTranslate;
+};
+
+interface SVGAElement : SVGGraphicsElement {
+  [SameObject] readonly attribute SVGAnimatedString target;
+};
+
+SVGAElement implements SVGURIReference;
+
+interface SVGViewElement : SVGElement {};
+
+SVGViewElement implements SVGFitToViewBox;
+SVGViewElement implements SVGZoomAndPan;
+
+interface SVGFilterElement : SVGElement {
+  readonly attribute SVGAnimatedEnumeration filterUnits;
+  readonly attribute SVGAnimatedEnumeration primitiveUnits;
+  readonly attribute SVGAnimatedLength x;
+  readonly attribute SVGAnimatedLength y;
+  readonly attribute SVGAnimatedLength width;
+  readonly attribute SVGAnimatedLength height;
+};
+
+SVGFilterElement implements SVGURIReference;
+SVGFilterElement implements SVGUnitTypes;
+
+[NoInterfaceObject]
+interface SVGFilterPrimitiveStandardAttributes {
+  readonly attribute SVGAnimatedLength x;
+  readonly attribute SVGAnimatedLength y;
+  readonly attribute SVGAnimatedLength width;
+  readonly attribute SVGAnimatedLength height;
+  readonly attribute SVGAnimatedString result;
+};
+
+interface SVGFEBlendElement : SVGElement {
+
+  // Blend Mode Types
+  const unsigned short SVG_FEBLEND_MODE_UNKNOWN = 0;
+  const unsigned short SVG_FEBLEND_MODE_NORMAL = 1;
+  const unsigned short SVG_FEBLEND_MODE_MULTIPLY = 2;
+  const unsigned short SVG_FEBLEND_MODE_SCREEN = 3;
+  const unsigned short SVG_FEBLEND_MODE_DARKEN = 4;
+  const unsigned short SVG_FEBLEND_MODE_LIGHTEN = 5;
+
+  readonly attribute SVGAnimatedString in1;
+  readonly attribute SVGAnimatedString in2;
+  readonly attribute SVGAnimatedEnumeration mode;
+};
+
+SVGFEBlendElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFEColorMatrixElement : SVGElement {
+
+  // Color Matrix Types
+  const unsigned short SVG_FECOLORMATRIX_TYPE_UNKNOWN = 0;
+  const unsigned short SVG_FECOLORMATRIX_TYPE_MATRIX = 1;
+  const unsigned short SVG_FECOLORMATRIX_TYPE_SATURATE = 2;
+  const unsigned short SVG_FECOLORMATRIX_TYPE_HUEROTATE = 3;
+  const unsigned short SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA = 4;
+
+  readonly attribute SVGAnimatedString in1;
+  readonly attribute SVGAnimatedEnumeration type;
+  readonly attribute SVGAnimatedNumberList values;
+};
+
+SVGFEColorMatrixElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFEComponentTransferElement : SVGElement {
+  readonly attribute SVGAnimatedString in1;
+};
+
+SVGFEComponentTransferElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGComponentTransferFunctionElement : SVGElement {
+
+  // Component Transfer Types
+  const unsigned short SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN = 0;
+  const unsigned short SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY = 1;
+  const unsigned short SVG_FECOMPONENTTRANSFER_TYPE_TABLE = 2;
+  const unsigned short SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE = 3;
+  const unsigned short SVG_FECOMPONENTTRANSFER_TYPE_LINEAR = 4;
+  const unsigned short SVG_FECOMPONENTTRANSFER_TYPE_GAMMA = 5;
+
+  readonly attribute SVGAnimatedEnumeration type;
+  readonly attribute SVGAnimatedNumberList tableValues;
+  readonly attribute SVGAnimatedNumber slope;
+  readonly attribute SVGAnimatedNumber intercept;
+  readonly attribute SVGAnimatedNumber amplitude;
+  readonly attribute SVGAnimatedNumber exponent;
+  readonly attribute SVGAnimatedNumber offset;
+};
+
+interface SVGFEFuncRElement : SVGComponentTransferFunctionElement {
+};
+
+interface SVGFEFuncGElement : SVGComponentTransferFunctionElement {
+};
+
+interface SVGFEFuncBElement : SVGComponentTransferFunctionElement {
+};
+
+interface SVGFEFuncAElement : SVGComponentTransferFunctionElement {
+};
+
+interface SVGFECompositeElement : SVGElement {
+
+  // Composite Operators
+  const unsigned short SVG_FECOMPOSITE_OPERATOR_UNKNOWN = 0;
+  const unsigned short SVG_FECOMPOSITE_OPERATOR_OVER = 1;
+  const unsigned short SVG_FECOMPOSITE_OPERATOR_IN = 2;
+  const unsigned short SVG_FECOMPOSITE_OPERATOR_OUT = 3;
+  const unsigned short SVG_FECOMPOSITE_OPERATOR_ATOP = 4;
+  const unsigned short SVG_FECOMPOSITE_OPERATOR_XOR = 5;
+  const unsigned short SVG_FECOMPOSITE_OPERATOR_ARITHMETIC = 6;
+
+  readonly attribute SVGAnimatedString in1;
+  readonly attribute SVGAnimatedString in2;
+  readonly attribute SVGAnimatedEnumeration operator;
+  readonly attribute SVGAnimatedNumber k1;
+  readonly attribute SVGAnimatedNumber k2;
+  readonly attribute SVGAnimatedNumber k3;
+  readonly attribute SVGAnimatedNumber k4;
+};
+
+SVGFECompositeElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFEConvolveMatrixElement : SVGElement {
+
+  // Edge Mode Values
+  const unsigned short SVG_EDGEMODE_UNKNOWN = 0;
+  const unsigned short SVG_EDGEMODE_DUPLICATE = 1;
+  const unsigned short SVG_EDGEMODE_WRAP = 2;
+  const unsigned short SVG_EDGEMODE_NONE = 3;
+
+  readonly attribute SVGAnimatedString in1;
+  readonly attribute SVGAnimatedInteger orderX;
+  readonly attribute SVGAnimatedInteger orderY;
+  readonly attribute SVGAnimatedNumberList kernelMatrix;
+  readonly attribute SVGAnimatedNumber divisor;
+  readonly attribute SVGAnimatedNumber bias;
+  readonly attribute SVGAnimatedInteger targetX;
+  readonly attribute SVGAnimatedInteger targetY;
+  readonly attribute SVGAnimatedEnumeration edgeMode;
+  readonly attribute SVGAnimatedNumber kernelUnitLengthX;
+  readonly attribute SVGAnimatedNumber kernelUnitLengthY;
+};
+
+SVGFEConvolveMatrixElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFEDiffuseLightingElement : SVGElement {
+  readonly attribute SVGAnimatedString in1;
+  readonly attribute SVGAnimatedNumber surfaceScale;
+  readonly attribute SVGAnimatedNumber diffuseConstant;
+  readonly attribute SVGAnimatedNumber kernelUnitLengthX;
+  readonly attribute SVGAnimatedNumber kernelUnitLengthY;
+};
+
+SVGFEDiffuseLightingElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFEDistantLightElement : SVGElement {
+  readonly attribute SVGAnimatedNumber azimuth;
+  readonly attribute SVGAnimatedNumber elevation;
+};
+
+interface SVGFEPointLightElement : SVGElement {
+  readonly attribute SVGAnimatedNumber x;
+  readonly attribute SVGAnimatedNumber y;
+  readonly attribute SVGAnimatedNumber z;
+};
+
+interface SVGFESpotLightElement : SVGElement {
+  readonly attribute SVGAnimatedNumber x;
+  readonly attribute SVGAnimatedNumber y;
+  readonly attribute SVGAnimatedNumber z;
+  readonly attribute SVGAnimatedNumber pointsAtX;
+  readonly attribute SVGAnimatedNumber pointsAtY;
+  readonly attribute SVGAnimatedNumber pointsAtZ;
+  readonly attribute SVGAnimatedNumber specularExponent;
+  readonly attribute SVGAnimatedNumber limitingConeAngle;
+};
+
+interface SVGFEDisplacementMapElement : SVGElement {
+
+  // Channel Selectors
+  const unsigned short SVG_CHANNEL_UNKNOWN = 0;
+  const unsigned short SVG_CHANNEL_R = 1;
+  const unsigned short SVG_CHANNEL_G = 2;
+  const unsigned short SVG_CHANNEL_B = 3;
+  const unsigned short SVG_CHANNEL_A = 4;
+
+  readonly attribute SVGAnimatedString in1;
+  readonly attribute SVGAnimatedString in2;
+  readonly attribute SVGAnimatedNumber scale;
+  readonly attribute SVGAnimatedEnumeration xChannelSelector;
+  readonly attribute SVGAnimatedEnumeration yChannelSelector;
+};
+
+SVGFEDisplacementMapElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFEDropShadowElement : SVGElement {
+  readonly attribute SVGAnimatedString in1;
+  readonly attribute SVGAnimatedNumber dx;
+  readonly attribute SVGAnimatedNumber dy;
+  readonly attribute SVGAnimatedNumber stdDeviationX;
+  readonly attribute SVGAnimatedNumber stdDeviationY;
+
+  void setStdDeviation(float stdDeviationX, float stdDeviationY);
+};
+
+SVGFEDropShadowElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFEFloodElement : SVGElement {
+};
+
+SVGFEFloodElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFEGaussianBlurElement : SVGElement {
+
+  // Edge Mode Values
+  const unsigned short SVG_EDGEMODE_UNKNOWN = 0;
+  const unsigned short SVG_EDGEMODE_DUPLICATE = 1;
+  const unsigned short SVG_EDGEMODE_WRAP = 2;
+  const unsigned short SVG_EDGEMODE_NONE = 3;
+
+  readonly attribute SVGAnimatedString in1;
+  readonly attribute SVGAnimatedNumber stdDeviationX;
+  readonly attribute SVGAnimatedNumber stdDeviationY;
+  readonly attribute SVGAnimatedEnumeration edgeMode;
+
+  void setStdDeviation(float stdDeviationX, float stdDeviationY);
+};
+
+SVGFEGaussianBlurElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFEImageElement : SVGElement {
+  readonly attribute SVGAnimatedPreserveAspectRatio preserveAspectRatio;
+  readonly attribute SVGAnimatedString crossOrigin;
+};
+
+SVGFEImageElement implements SVGFilterPrimitiveStandardAttributes;
+SVGFEImageElement implements SVGURIReference;
+
+interface SVGFEMergeElement : SVGElement {
+};
+
+SVGFEMergeElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFEMergeNodeElement : SVGElement {
+  readonly attribute SVGAnimatedString in1;
+};
+
+interface SVGFEMorphologyElement : SVGElement {
+
+  // Morphology Operators
+  const unsigned short SVG_MORPHOLOGY_OPERATOR_UNKNOWN = 0;
+  const unsigned short SVG_MORPHOLOGY_OPERATOR_ERODE = 1;
+  const unsigned short SVG_MORPHOLOGY_OPERATOR_DILATE = 2;
+
+  readonly attribute SVGAnimatedString in1;
+  readonly attribute SVGAnimatedEnumeration operator;
+  readonly attribute SVGAnimatedNumber radiusX;
+  readonly attribute SVGAnimatedNumber radiusY;
+};
+
+SVGFEMorphologyElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFEOffsetElement : SVGElement {
+  readonly attribute SVGAnimatedString in1;
+  readonly attribute SVGAnimatedNumber dx;
+  readonly attribute SVGAnimatedNumber dy;
+};
+
+SVGFEOffsetElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFESpecularLightingElement : SVGElement {
+  readonly attribute SVGAnimatedString in1;
+  readonly attribute SVGAnimatedNumber surfaceScale;
+  readonly attribute SVGAnimatedNumber specularConstant;
+  readonly attribute SVGAnimatedNumber specularExponent;
+  readonly attribute SVGAnimatedNumber kernelUnitLengthX;
+  readonly attribute SVGAnimatedNumber kernelUnitLengthY;
+};
+
+SVGFESpecularLightingElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFETileElement : SVGElement {
+  readonly attribute SVGAnimatedString in1;
+};
+
+SVGFETileElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFETurbulenceElement : SVGElement {
+
+  // Turbulence Types
+  const unsigned short SVG_TURBULENCE_TYPE_UNKNOWN = 0;
+  const unsigned short SVG_TURBULENCE_TYPE_FRACTALNOISE = 1;
+  const unsigned short SVG_TURBULENCE_TYPE_TURBULENCE = 2;
+
+  // Stitch Options
+  const unsigned short SVG_STITCHTYPE_UNKNOWN = 0;
+  const unsigned short SVG_STITCHTYPE_STITCH = 1;
+  const unsigned short SVG_STITCHTYPE_NOSTITCH = 2;
+
+  readonly attribute SVGAnimatedNumber baseFrequencyX;
+  readonly attribute SVGAnimatedNumber baseFrequencyY;
+  readonly attribute SVGAnimatedInteger numOctaves;
+  readonly attribute SVGAnimatedNumber seed;
+  readonly attribute SVGAnimatedEnumeration stitchTiles;
+  readonly attribute SVGAnimatedEnumeration type;
+};
+
+SVGFETurbulenceElement implements SVGFilterPrimitiveStandardAttributes;
+</script>
+<script>
+var svg = document.createElementNS("http://www.w3.org/2000/svg", "svg");
+var g = document.createElementNS("http://www.w3.org/2000/svg", "g");
+var defs = document.createElementNS("http://www.w3.org/2000/svg", "defs");
+var Desc = document.createElementNS("http://www.w3.org/2000/svg", "desc");
+var title = document.createElementNS("http://www.w3.org/2000/svg", "title");
+var symbol = document.createElementNS("http://www.w3.org/2000/svg", "symbol");
+var use = document.createElementNS("http://www.w3.org/2000/svg", "use");
+var image = document.createElementNS("http://www.w3.org/2000/svg", "image");
+var Switch = document.createElementNS("http://www.w3.org/2000/svg", "switch");
+var style = document.createElementNS("http://www.w3.org/2000/svg", "style");
+var path = document.createElementNS("http://www.w3.org/2000/svg", "path");
+var rect = document.createElementNS("http://www.w3.org/2000/svg", "rect");
+var circle = document.createElementNS("http://www.w3.org/2000/svg", "circle");
+var ellipse = document.createElementNS("http://www.w3.org/2000/svg", "ellipse");
+var line = document.createElementNS("http://www.w3.org/2000/svg", "line");
+var polyline = document.createElementNS("http://www.w3.org/2000/svg", "polyline");
+var polygon = document.createElementNS("http://www.w3.org/2000/svg", "polygon");
+var textContent = document.createElementNS("http://www.w3.org/2000/svg",
+                                           "textContent");
+var text = document.createElementNS("http://www.w3.org/2000/svg", "text");
+var tspan = document.createElementNS("http://www.w3.org/2000/svg", "tspan");
+var tref = document.createElementNS("http://www.w3.org/2000/svg", "tref");
+var textPath = document.createElementNS("http://www.w3.org/2000/svg", "textPath");
+var altGlyph = document.createElementNS("http://www.w3.org/2000/svg", "altGlyph");
+var altGlyphDef = document.createElementNS("http://www.w3.org/2000/svg",
+                                           "altGlyphDef");
+var altGlyphItem = document.createElementNS("http://www.w3.org/2000/svg",
+                                            "altGlyphItem");
+var glyphRef = document.createElementNS("http://www.w3.org/2000/svg",
+                                        "glyphRef");
+var glyphRef = document.createElementNS("http://www.w3.org/2000/svg",
+                                        "glyphRef");
+var marker = document.createElementNS("http://www.w3.org/2000/svg", "marker");
+var colorProfile = document.createElementNS("http://www.w3.org/2000/svg",
+                                            "color-profile");
+var linearGradient = document.createElementNS("http://www.w3.org/2000/svg",
+                                              "linearGradient");
+var radialGradient = document.createElementNS("http://www.w3.org/2000/svg",
+                                              "radialGradient");
+var meshGradient = document.createElementNS("http://www.w3.org/2000/svg",
+                                            "meshGradient");
+var stop = document.createElementNS("http://www.w3.org/2000/svg", "stop");
+var pattern = document.createElementNS("http://www.w3.org/2000/svg", "pattern");
+var clipPath = document.createElementNS("http://www.w3.org/2000/svg", "clipPath");
+var mask = document.createElementNS("http://www.w3.org/2000/svg", "mask");
+var cursor = document.createElementNS("http://www.w3.org/2000/svg", "cursor");
+var a = document.createElementNS("http://www.w3.org/2000/svg", "a");
+var view = document.createElementNS("http://www.w3.org/2000/svg", "view");
+var script = document.createElementNS("http://www.w3.org/2000/svg", "script");
+var animate = document.createElementNS("http://www.w3.org/2000/svg", "animate");
+var set = document.createElementNS("http://www.w3.org/2000/svg", "set");
+var animateMotion = document.createElementNS("http://www.w3.org/2000/svg",
+                                             "animateMotion");
+var mPath = document.createElementNS("http://www.w3.org/2000/svg", "mPath");
+var animateColor = document.createElementNS("http://www.w3.org/2000/svg",
+                                            "animateColor");
+var animateColor = document.createElementNS("http://www.w3.org/2000/svg",
+                                            "animateColor");
+var animateTransform = document.createElementNS("http://www.w3.org/2000/svg",
+                                                "animateTransform");
+var font = document.createElementNS("http://www.w3.org/2000/svg", "font");
+var glyph = document.createElementNS("http://www.w3.org/2000/svg", "glyph");
+var missingglyph = document.createElementNS("http://www.w3.org/2000/svg",
+                                            "missing-glyph");
+var khern = document.createElementNS("http://www.w3.org/2000/svg", "hkern");
+var vkern = document.createElementNS("http://www.w3.org/2000/svg", "vkern");
+var fontface = document.createElementNS("http://www.w3.org/2000/svg", "font-face");
+var fontfacesrc = document.createElementNS("http://www.w3.org/2000/svg",
+                                           "font-face-src");
+var fontfaceuri = document.createElementNS("http://www.w3.org/2000/svg",
+                                           "font-face-uri");
+var fontfaceformat = document.createElementNS("http://www.w3.org/2000/svg",
+                                              "font-face-format");
+var fontfacename = document.createElementNS("http://www.w3.org/2000/svg",
+                                            "font-face-name");
+var metadata = document.createElementNS("http://www.w3.org/2000/svg",
+                                        "metadata");
+var foreignObject = document.createElementNS("http://www.w3.org/2000/svg",
+                                             "foreignObject");
+var filter = document.createElementNS("http://www.w3.org/2000/svg", "filter");
+var feBlend = document.createElementNS("http://www.w3.org/2000/svg", "feBlend");
+var feColorMatrix = document.createElementNS("http://www.w3.org/2000/svg",
+                                             "feColorMatrix");
+var feColorMatrix = document.createElementNS("http://www.w3.org/2000/svg",
+                                             "feColorMatrix");
+var feComponentTransfer = document.createElementNS("http://www.w3.org/2000/svg",
+                                                   "feComponentTransfer");
+var feFuncR = document.createElementNS("http://www.w3.org/2000/svg", "feFuncR");
+var feFuncG = document.createElementNS("http://www.w3.org/2000/svg", "feFuncG");
+var feFuncB = document.createElementNS("http://www.w3.org/2000/svg", "feFuncB");
+var feFuncA = document.createElementNS("http://www.w3.org/2000/svg", "feFuncA");
+var feComposite = document.createElementNS("http://www.w3.org/2000/svg",
+                                           "feComposite");
+var feConvolveMatrix = document.createElementNS("http://www.w3.org/2000/svg",
+                                                "feConvolveMatrix");
+var feDiffuseLighting = document.createElementNS("http://www.w3.org/2000/svg",
+                                                 "feDiffuseLighting");
+var fePointLight = document.createElementNS("http://www.w3.org/2000/svg",
+                                            "fePointLight");
+var feSpotLight = document.createElementNS("http://www.w3.org/2000/svg",
+                                           "feSpotLight");
+var feDisplacementMap = document.createElementNS("http://www.w3.org/2000/svg",
+                                                 "feDisplacementMap");
+var feDropShadow = document.createElementNS("http://www.w3.org/2000/svg",
+                                            "feDropShadow");
+var feFlood = document.createElementNS("http://www.w3.org/2000/svg", "feFlood");
+var feGaussianBlur = document.createElementNS("http://www.w3.org/2000/svg",
+                                              "feGaussianBlur");
+var feDisplacementMap = document.createElementNS("http://www.w3.org/2000/svg",
+                                                 "feDisplacementMap");
+var feDropShadow = document.createElementNS("http://www.w3.org/2000/svg",
+                                            "feDropShadow");
+var feFlood = document.createElementNS("http://www.w3.org/2000/svg", "feFlood");
+var feGaussianBlur = document.createElementNS("http://www.w3.org/2000/svg",
+                                              "feGaussianBlue");
+var feImage = document.createElementNS("http://www.w3.org/2000/svg", "feImage");
+var feMerge = document.createElementNS("http://www.w3.org/2000/svg", "feMerge");
+var feMergeNode = document.createElementNS("http://www.w3.org/2000/svg",
+                                           "feMergeNode");
+var feMorphology = document.createElementNS("http://www.w3.org/2000/svg",
+                                            "feMorphology");
+var feSpecularLighting = document.createElementNS("http://www.w3.org/2000/svg",
+                                                  "feSpecularLighting");
+var feTile = document.createElementNS("http://www.w3.org/2000/svg",
+                                      "feTile");
+var feTurbulence = document.createElementNS("http://www.w3.org/2000/svg",
+                                            "feTurbulence");
+
+
+var idlArray = new IdlArray();
+var idls = document.getElementById("idl").textContent;
+var untestedIdls = document.getElementById("untested_idl").textContent;
+idlArray.add_untested_idls(untestedIdls);
+idlArray.add_idls(idls);
+idlArray.add_objects({
+  SVGAnimatedBoolean: ['feConvolveMatrix.preserveAlpha'],
+  SVGAnimatedString: ['a.target'],
+  SVGStringList: ['a.requiredFeatures'],
+  SVGAnimatedEnumeration: ['text.lengthAdjust'],
+  SVGAnimatedInteger: ['feConvolveMatrix.orderX'],
+  SVGNumber: ['svg.createSVGNumber()'],
+  SVGAnimatedNumber: ['stop.offset'],
+  SVGNumberList: ['text.rotate.baseVal'],
+  SVGAnimatedNumberList: ['text.rotate'],
+  SVGLength: ['svg.createSVGLength()'],
+  SVGAnimatedLength: ['svg.x'],
+  SVGAnimatedLengthList: ['text.x'],
+  SVGAngle: ['svg.createSVGAngle()'],
+  SVGAnimatedAngle: ['marker.orientAngle'],
+  SVGRect: ['svg.createSVGRect()'],
+  SVGAnimatedRect: ['svg.viewBox'],
+  SVGSVGElement: ['svg'],
+  SVGGElement: ['g'],
+  SVGDefsElement: ['defs'],
+  SVGDescElement: ['Desc'],
+  SVGTitleElement: ['title'],
+  SVGSymbolElement: ['symbol'],
+  SVGUseElement: ['use'],
+  SVGImageElement: ['image'],
+  SVGSwitchElement: ['Switch'],
+  SVGStyleElement: ['style'],
+  SVGPoint: ['svg.createSVGPoint()'],
+  SVGPointList: ['polygon.points'],
+  SVGMatrix: ['svg.createSVGMatrix()'],
+  SVGTransform: ['svg.createSVGTransform()'],
+  SVGTransformList: ['pattern.patternTransform.baseVal'],
+  SVGAnimatedTransformList: ['pattern.patternTransform'],
+  SVGPreserveAspectRatio: ['image.preserveAspectRatio.baseVal'],
+  SVGAnimatedPreserveAspectRatio: ['image.preserveAspectRatio'],
+  SVGPathSegClosePath: ['path.createSVGPathSegClosePath()'],
+  SVGPathSegMovetoAbs: ['path.createSVGPathSegMovetoAbs(0,0)'],
+  SVGPathSegMovetoRel: ['path.createSVGPathSegMovetoRel(0,0)'],
+  SVGPathSegLinetoAbs: ['path.createSVGPathSegLinetoAbs(0,0)'],
+  SVGPathSegLinetoRel: ['path.createSVGPathSegLinetoRel(0,0)'],
+  SVGPathSegCurvetoCubicAbs: ['path.createSVGPathSegCurvetoCubicAbs(0,0,0,0,0,0)'],
+  SVGPathSegCurvetoCubicRel: ['path.createSVGPathSegCurvetoCubicRel(0,0,0,0,0,0)'],
+  SVGPathSegCurvetoQuadraticAbs: ['path.createSVGPathSegCurvetoQuadraticAbs(0,0,0,0)'],
+  SVGPathSegCurvetoQuadraticRel: ['path.createSVGPathSegCurvetoQuadraticRel(0,0,0,0)'],
+  SVGPathSegArcAbs: ['path.createSVGPathSegArcAbs(0,0,0,0,0,true,true)'],
+  SVGPathSegArcRel: ['path.createSVGPathSegArcRel(0,0,0,0,0,true,true)'],
+  SVGPathSegLinetoHorizontalAbs: ['path.createSVGPathSegLinetoHorizontalAbs(0)'],
+  SVGPathSegLinetoHorizontalRel: ['path.createSVGPathSegLinetoHorizontalRel(0)'],
+  SVGPathSegLinetoVerticalAbs: ['path.createSVGPathSegLinetoVerticalAbs(0)'],
+  SVGPathSegLinetoVerticalRel: ['path.createSVGPathSegLinetoVerticalRel(0)'],
+  SVGPathSegCurvetoCubicSmoothAbs: ['path.createSVGPathSegCurvetoCubicSmoothAbs(0,0,0,0)'],
+  SVGPathSegCurvetoCubicSmoothRel: ['path.createSVGPathSegCurvetoCubicSmoothRel(0,0,0,0)'],
+  SVGPathSegCurvetoQuadraticSmoothAbs: ['path.createSVGPathSegCurvetoQuadraticSmoothAbs(0,0)'],
+  SVGPathSegCurvetoQuadraticSmoothRel: ['path.createSVGPathSegCurvetoQuadraticSmoothRel(0,0)'],
+  SVGPathSegList: ['path.pathSegList'],
+  SVGPathElement: ['path'],
+  SVGRectElement: ['rect'],
+  SVGCircleElement: ['circle'],
+  SVGEllipseElement: ['ellipse'],
+  SVGLineElement: ['line'],
+  SVGPolylineElement: ['polyline'],
+  SVGPolygonElement: ['polygon'],
+  SVGTextContentElement: ['textContent'],
+  SVGTextElement: ['text'],
+  SVGTSpanElement: ['tspan'],
+  SVGTRefElement: ['tref'],
+  SVGTextPathElement: ['textPath'],
+  SVGAltGlyphElement: ['altGlyph'],
+  SVGAltGlyphDefElement: ['altGlyphDef'],
+  SVGAltGlyphItemElement: ['altGlyphItem'],
+  SVGGlyphRefElement: ['glyphRef'],
+  SVGMarkerElement: ['marker'],
+  SVGColorProfileElement: ['colorProfile'],
+  SVGLinearGradientElement: ['linearGradient'],
+  SVGRadialGradientElement: ['radialGradient'],
+  SVGMeshGradientElement: ['meshGradient'],
+  SVGStopElement: ['stop'],
+  SVGPatternElement: ['pattern'],
+  SVGClipPathElement: ['clipPath'],
+  SVGMaskElement: ['mask'],
+  SVGCursorElement: ['cursor'],
+  SVGAElement: ['a'],
+  SVGViewElement: ['view'],
+  SVGScriptElement: ['script'],
+  SVGAnimateElement: ['animate'],
+  SVGSetElement: ['set'],
+  SVGAnimateMotionElement: ['animateMotion'],
+  SVGMPathElement: ['mPath'],
+  SVGAnimateColorElement: ['animateColor'],
+  SVGAnimateTransformElement: ['animateTransform'],
+  SVGFontElement: ['font'],
+  SVGGlyphElement: ['glyph'],
+  SVGMissingGlyphElement: ['missingglyph'],
+  SVGHKernElement: ['hkern'],
+  SVGVKernElement: ['vkern'],
+  SVGFontFaceElement: ['fontface'],
+  SVGFontFaceSrcElement: ['fontfacesrc'],
+  SVGFontFaceUriElement: ['fontfaceuri'],
+  SVGFontFaceFormatElement: ['fontfaceformat'],
+  SVGMetadataElement: ['metadata'],
+  SVGForeignObjectElement: ['foreignObject'],
+  SVGFilterElement: ['filter'],
+  SVGFEBlendElement: ['feBlend'],
+  SVGFEColorMatrixElement: ['feColorMatrix'],
+  SVGFEComponentTransferElement: ['feComponentTransfer'],
+  SVGFEFuncRElement: ['feFuncR'],
+  SVGFEFuncGElement: ['feFuncG'],
+  SVGFEFuncBElement: ['feFuncB'],
+  SVGFEFuncAElement: ['feFuncA'],
+  SVGFECompositeElement: ['feComposite'],
+  SVGFEConvolveMatrixElement: ['feConvolveMatrix'],
+  SVGFEDiffuseLightingElement: ['feDiffuseLighting'],
+  SVGFEPointLightElement: ['fePointLight'],
+  SVGFESpotLightElement: ['feSpotLight'],
+  SVGFEDisplacementMapElement: ['feDisplacementMap'],
+  SVGFEDropShadowElement: ['feDropShadow'],
+  SVGFEFloodElement: ['feFlood'],
+  SVGFEGaussianBlurElement: ['feGaussianBlur'],
+  SVGFEImageElement: ['feImage'],
+  SVGFEMergeElement: ['feMerge'],
+  SVGFEMergeNodeElement: ['feMergeNode'],
+  SVGFEMorphologyElement: ['feMorphology'],
+  SVGFESpecularLightingElement: ['feSpecularLighting'],
+  SVGFETileElement: ['feTile'],
+  SVGFETurbulenceElement: ['feTurbulence']
+});
+idlArray.test();
+</script>
+
diff --git a/testing/web-platform/tests/tools/manifest/item.py b/testing/web-platform/tests/tools/manifest/item.py
index 3dee3173bd0f..58ff22a3b0e8 100644
--- a/testing/web-platform/tests/tools/manifest/item.py
+++ b/testing/web-platform/tests/tools/manifest/item.py
@@ -2,17 +2,11 @@ import os
 import urlparse
 from abc import ABCMeta, abstractmethod, abstractproperty
 
+from utils import from_os_path, to_os_path
+
 item_types = ["testharness", "reftest", "manual", "stub", "wdspec"]
 
 
-def from_os_path(path):
-    return path.replace(os.path.sep, "/")
-
-
-def to_os_path(path):
-    return path.replace("/", os.path.sep)
-
-
 def get_source_file(source_files, tests_root, manifest, path):
     def make_new():
         from sourcefile import SourceFile
diff --git a/testing/web-platform/tests/tools/manifest/manifest.py b/testing/web-platform/tests/tools/manifest/manifest.py
index 75a7aef02980..1128f416ddb4 100644
--- a/testing/web-platform/tests/tools/manifest/manifest.py
+++ b/testing/web-platform/tests/tools/manifest/manifest.py
@@ -5,6 +5,7 @@ from collections import defaultdict
 from item import item_types, ManualTest, WebdriverSpecTest, Stub, RefTest, TestharnessTest
 from log import get_logger
 from sourcefile import SourceFile
+from utils import from_os_path, to_os_path
 
 
 CURRENT_VERSION = 2
@@ -207,7 +208,7 @@ class Manifest(object):
             for item_type, items in self._data.iteritems()
         }
 
-        reftest_nodes = {key:[v.to_json() for v in value]
+        reftest_nodes = {from_os_path(key): [v.to_json() for v in value]
                          for key, value in self.reftest_nodes.iteritems()}
 
         rv = {"url_base": self.url_base,
@@ -246,6 +247,7 @@ class Manifest(object):
                 self._add(manifest_item)
 
         for path, values in obj["reftest_nodes"].iteritems():
+            path = to_os_path(path)
             for v in values:
                 item = RefTest.from_json(self, tests_root, v,
                                          source_files=source_files)
@@ -306,17 +308,16 @@ class LocalChanges(object):
         return self._data[item_type]
 
     def to_json(self):
-        reftest_nodes = {key:[v.to_json() for v in value]
+        reftest_nodes = {from_os_path(key): [v.to_json() for v in value]
                          for key, value in self.reftest_nodes.iteritems()}
 
         rv = {"items": defaultdict(dict),
               "reftest_nodes": reftest_nodes,
-              "deleted": []}
-
-        rv["deleted"].extend(self._deleted)
+              "deleted": [from_os_path(path) for path in self._deleted]}
 
         for test_type, paths in self._data.iteritems():
             for path, tests in paths.iteritems():
+                path = from_os_path(path)
                 rv["items"][test_type][path] = [test.to_json() for test in tests]
 
         return rv
@@ -343,6 +344,7 @@ class LocalChanges(object):
                     self.add(manifest_item)
 
         for path, values in obj["reftest_nodes"].iteritems():
+            path = to_os_path(path)
             for v in values:
                 item = RefTest.from_json(self.manifest, tests_root, v,
                                          source_files=source_files)
@@ -350,7 +352,7 @@ class LocalChanges(object):
                 self.reftest_nodes_by_url[item.url] = item
 
         for item in obj["deleted"]:
-            self.add_deleted(item)
+            self.add_deleted(to_os_path(item))
 
         return self
 
diff --git a/testing/web-platform/tests/tools/manifest/utils.py b/testing/web-platform/tests/tools/manifest/utils.py
index 60e00ee74d34..668b14c05ba7 100644
--- a/testing/web-platform/tests/tools/manifest/utils.py
+++ b/testing/web-platform/tests/tools/manifest/utils.py
@@ -21,6 +21,12 @@ def is_blacklisted(url):
             return True
     return False
 
+def from_os_path(path):
+    return path.replace(os.path.sep, "/")
+
+def to_os_path(path):
+    return path.replace("/", os.path.sep)
+
 class ContextManagerStringIO(StringIO):
     def __enter__(self):
         return self
diff --git a/testing/web-platform/tests/url/a-element.xhtml b/testing/web-platform/tests/url/a-element-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/url/a-element.xhtml
rename to testing/web-platform/tests/url/a-element-xhtml.xhtml
diff --git a/testing/web-platform/tests/webgl/compressedTexSubImage2D.html b/testing/web-platform/tests/webgl/compressedTexSubImage2D.html
index dd26c4f193c4..539f9e17f8a8 100644
--- a/testing/web-platform/tests/webgl/compressedTexSubImage2D.html
+++ b/testing/web-platform/tests/webgl/compressedTexSubImage2D.html
@@ -15,7 +15,6 @@ test(function() {
   var tex = gl.createTexture();
   gl.bindTexture(gl.TEXTURE_2D, tex);
 
-  /* Bug 1226336
   shouldGenerateGLError(gl, gl.INVALID_ENUM, function() {
     gl.compressedTexSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 10, 10, COMPRESSED_RGB_S3TC_DXT1_EXT, new Uint8Array(8));
   });
@@ -27,6 +26,5 @@ test(function() {
       gl.compressedTexSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 10, 10, COMPRESSED_RGB_S3TC_DXT1_EXT);
     });
   }, "Should throw a TypeError when passing too few arguments.");
-  */
 });
 </script>

From be25cf421c9c91a789384369242c1c9bd89827d5 Mon Sep 17 00:00:00 2001
From: James Graham <james@hoppipolla.co.uk>
Date: Fri, 18 Dec 2015 09:26:21 +0000
Subject: [PATCH 022/101] Bug 1233726 - Update web-platform-tests expected data
 to revision 05c55fbdc527eacdc7b875f298a8cb1b6db0dfcd, a=testonly

---
 .../meta/FileAPI/idlharness.worker.js.ini     |  138 +
 .../media-src-redir-bug.sub.html.ini          |   21 +
 ...creating_browsing_context_test_01.html.ini |    2 +-
 .../unknown-element.html.ini                  |    1 -
 .../meta/html/dom/interfaces.html.ini         |   75 +
 .../current-pixel-density/basic.html.ini      |   22 +-
 .../bdi-neutral-number.html.ini               |    4 +
 .../attribute-case/semantics.html.ini         |  198 ++
 .../attribute-case/syntax.html.ini            |   36 +
 .../web-platform/meta/svg/interfaces.html.ini | 2450 +++++++++++++++++
 ...nt.xhtml.ini => a-element-xhtml.xhtml.ini} |   95 +-
 .../web-platform/meta/url/interfaces.html.ini |    1 +
 .../webgl/compressedTexSubImage2D.html.ini    |    6 +
 .../meta/webvtt/interfaces.html.ini           |    3 +
 .../underline_timestamp_past.html.ini         |    3 +-
 ...er-then-register-new-script.https.html.ini |    1 +
 16 files changed, 2969 insertions(+), 87 deletions(-)
 create mode 100644 testing/web-platform/meta/content-security-policy/media-src/media-src-redir-bug.sub.html.ini
 create mode 100644 testing/web-platform/meta/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number.html.ini
 create mode 100644 testing/web-platform/meta/svg/interfaces.html.ini
 rename testing/web-platform/meta/url/{a-element.xhtml.ini => a-element-xhtml.xhtml.ini} (81%)

diff --git a/testing/web-platform/meta/FileAPI/idlharness.worker.js.ini b/testing/web-platform/meta/FileAPI/idlharness.worker.js.ini
index 37b8a3949920..243d5609ddfd 100644
--- a/testing/web-platform/meta/FileAPI/idlharness.worker.js.ini
+++ b/testing/web-platform/meta/FileAPI/idlharness.worker.js.ini
@@ -41,3 +41,141 @@
 
   [FileList interface: attribute length]
     expected: FAIL
+
+  [FileReader interface: existence and properties of interface object]
+    expected: FAIL
+
+  [FileReader interface object length]
+    expected: FAIL
+
+  [FileReader interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [FileReader interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [FileReader interface: operation readAsArrayBuffer(Blob)]
+    expected: FAIL
+
+  [FileReader interface: operation readAsText(Blob,DOMString)]
+    expected: FAIL
+
+  [FileReader interface: operation readAsDataURL(Blob)]
+    expected: FAIL
+
+  [FileReader interface: operation abort()]
+    expected: FAIL
+
+  [FileReader interface: constant EMPTY on interface object]
+    expected: FAIL
+
+  [FileReader interface: constant EMPTY on interface prototype object]
+    expected: FAIL
+
+  [FileReader interface: constant LOADING on interface object]
+    expected: FAIL
+
+  [FileReader interface: constant LOADING on interface prototype object]
+    expected: FAIL
+
+  [FileReader interface: constant DONE on interface object]
+    expected: FAIL
+
+  [FileReader interface: constant DONE on interface prototype object]
+    expected: FAIL
+
+  [FileReader interface: attribute readyState]
+    expected: FAIL
+
+  [FileReader interface: attribute result]
+    expected: FAIL
+
+  [FileReader interface: attribute error]
+    expected: FAIL
+
+  [FileReader interface: attribute onloadstart]
+    expected: FAIL
+
+  [FileReader interface: attribute onprogress]
+    expected: FAIL
+
+  [FileReader interface: attribute onload]
+    expected: FAIL
+
+  [FileReader interface: attribute onabort]
+    expected: FAIL
+
+  [FileReader interface: attribute onerror]
+    expected: FAIL
+
+  [FileReader interface: attribute onloadend]
+    expected: FAIL
+
+  [FileReader must be primary interface of new FileReader()]
+    expected: FAIL
+
+  [Stringification of new FileReader()]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "readAsArrayBuffer" with the proper type (0)]
+    expected: FAIL
+
+  [FileReader interface: calling readAsArrayBuffer(Blob) on new FileReader() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "readAsText" with the proper type (1)]
+    expected: FAIL
+
+  [FileReader interface: calling readAsText(Blob,DOMString) on new FileReader() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "readAsDataURL" with the proper type (2)]
+    expected: FAIL
+
+  [FileReader interface: calling readAsDataURL(Blob) on new FileReader() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "abort" with the proper type (3)]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "EMPTY" with the proper type (4)]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "LOADING" with the proper type (5)]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "DONE" with the proper type (6)]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "readyState" with the proper type (7)]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "result" with the proper type (8)]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "error" with the proper type (9)]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "onloadstart" with the proper type (10)]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "onprogress" with the proper type (11)]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "onload" with the proper type (12)]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "onabort" with the proper type (13)]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "onerror" with the proper type (14)]
+    expected: FAIL
+
+  [FileReader interface: new FileReader() must inherit property "onloadend" with the proper type (15)]
+    expected: FAIL
+
+  [FileList interface object name]
+    expected: FAIL
+
+  [FileReader interface object name]
+    expected: FAIL
diff --git a/testing/web-platform/meta/content-security-policy/media-src/media-src-redir-bug.sub.html.ini b/testing/web-platform/meta/content-security-policy/media-src/media-src-redir-bug.sub.html.ini
new file mode 100644
index 000000000000..0d2298df6641
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/media-src/media-src-redir-bug.sub.html.ini
@@ -0,0 +1,21 @@
+[media-src-redir-bug.sub.html]
+  type: testharness
+  expected: TIMEOUT
+  [In-policy async video src]
+    expected:
+      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
+      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
+
+  [in-policy async video src w/redir]
+    expected: NOTRUN
+
+  [In-policy async video source element]
+    expected:
+      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
+      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
+
+  [In-policy async video source element w/redir]
+    expected:
+      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): NOTRUN
+      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): NOTRUN
+
diff --git a/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini b/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
index f1076887e18a..f2ff2e9813d7 100644
--- a/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
+++ b/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
@@ -1,4 +1,4 @@
 [creating_browsing_context_test_01.html]
   type: testharness
   disabled:
-    if (os == "linux"): https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
+    if os == "linux": https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
diff --git a/testing/web-platform/meta/html/dom/elements/elements-in-the-dom/unknown-element.html.ini b/testing/web-platform/meta/html/dom/elements/elements-in-the-dom/unknown-element.html.ini
index 541b6b2f715a..259477aab6c5 100644
--- a/testing/web-platform/meta/html/dom/elements/elements-in-the-dom/unknown-element.html.ini
+++ b/testing/web-platform/meta/html/dom/elements/elements-in-the-dom/unknown-element.html.ini
@@ -2,4 +2,3 @@
   type: testharness
   expected:
     if not debug and e10s and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86") and (bits == 32): TIMEOUT
diff --git a/testing/web-platform/meta/html/dom/interfaces.html.ini b/testing/web-platform/meta/html/dom/interfaces.html.ini
index 17f26f44db08..9c2a3a3a81cb 100644
--- a/testing/web-platform/meta/html/dom/interfaces.html.ini
+++ b/testing/web-platform/meta/html/dom/interfaces.html.ini
@@ -2749,3 +2749,78 @@
   [WorkerLocation interface: attribute hash]
     expected: FAIL
 
+  [DOMElementMap interface object name]
+    expected: FAIL
+
+  [AudioTrackList interface object name]
+    expected: FAIL
+
+  [AudioTrack interface object name]
+    expected: FAIL
+
+  [VideoTrackList interface object name]
+    expected: FAIL
+
+  [VideoTrack interface object name]
+    expected: FAIL
+
+  [MediaController interface object name]
+    expected: FAIL
+
+  [HTMLTableDataCellElement interface object name]
+    expected: FAIL
+
+  [HTMLTableHeaderCellElement interface object name]
+    expected: FAIL
+
+  [HTMLKeygenElement interface object name]
+    expected: FAIL
+
+  [AutocompleteErrorEvent interface object name]
+    expected: FAIL
+
+  [HTMLDetailsElement interface object name]
+    expected: FAIL
+
+  [RelatedEvent interface object name]
+    expected: FAIL
+
+  [HTMLDialogElement interface object name]
+    expected: FAIL
+
+  [CanvasProxy interface object name]
+    expected: FAIL
+
+  [DrawingStyle interface object name]
+    expected: FAIL
+
+  [DataTransferItemList interface object name]
+    expected: FAIL
+
+  [DataTransferItem interface object name]
+    expected: FAIL
+
+  [ApplicationCache interface object name]
+    expected: FAIL
+
+  [PortCollection interface object name]
+    expected: FAIL
+
+  [WorkerGlobalScope interface object name]
+    expected: FAIL
+
+  [DedicatedWorkerGlobalScope interface object name]
+    expected: FAIL
+
+  [SharedWorkerGlobalScope interface object name]
+    expected: FAIL
+
+  [WorkerNavigator interface object name]
+    expected: FAIL
+
+  [WorkerLocation interface object name]
+    expected: FAIL
+
+  [HTMLMarqueeElement interface object name]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html.ini
index 4c8bcf5137a1..32292c722ad7 100644
--- a/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html.ini
+++ b/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html.ini
@@ -1,26 +1,8 @@
 [basic.html]
   type: testharness
-  [<img srcset="/images/green-256x256.png 1.6x" data-expect="160">]
+  [<img srcset="data:image/svg+xml,<svg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='-1%20-1%202%202'%20width='20'><circle%20r='1'/></svg> 2x" data-expect="10">]
     expected: FAIL
 
-  [<img srcset="/images/green-256x256.png 2x" data-expect="128">]
-    expected: FAIL
-
-  [<img srcset="/images/green-256x256.png 10000x" data-expect="0">]
-    expected: FAIL
-
-  [<img srcset="/images/green-256x256.png 9e99999999999999999999999x" data-expect="0">]
-    expected: FAIL
-
-  [<img srcset="/images/green-256x256.png 512w" sizes="256px" data-expect="128">]
-    expected: FAIL
-
-  [<img srcset="/images/green-256x256.png 256w" sizes="512px" data-expect="512">]
-    expected: FAIL
-
-  [<img srcset="/images/green-256x256.png 256w" sizes="1px" data-expect="1">]
-    expected: FAIL
-
-  [<img srcset="/images/green-256x256.png 256w" sizes="0px" data-expect="0">]
+  [<img srcset="data:image/svg+xml,<svg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='-1%20-1%202%202'%20height='20'><circle%20r='1'/></svg> 2x" data-expect="10">]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number.html.ini b/testing/web-platform/meta/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number.html.ini
new file mode 100644
index 000000000000..e65fe96b0b49
--- /dev/null
+++ b/testing/web-platform/meta/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number.html.ini
@@ -0,0 +1,4 @@
+[bdi-neutral-number.html]
+  type: reftest
+  expected:
+    if debug and not e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): TIMEOUT
diff --git a/testing/web-platform/meta/selectors/attribute-selectors/attribute-case/semantics.html.ini b/testing/web-platform/meta/selectors/attribute-selectors/attribute-case/semantics.html.ini
index 4508ca5f03e8..3766611ecf82 100644
--- a/testing/web-platform/meta/selectors/attribute-selectors/attribute-case/semantics.html.ini
+++ b/testing/web-platform/meta/selectors/attribute-selectors/attribute-case/semantics.html.ini
@@ -1017,3 +1017,201 @@
   [[foo='bar' i\] <div baz="BAR"> with querySelector in XML]
     expected: FAIL
 
+  [[class~='a' i\] <div class="X A B"> in standards mode]
+    expected: FAIL
+
+  [[class~='a' i\] <div class="X A B"> with querySelector in standards mode]
+    expected: FAIL
+
+  [[class~='A' i\] <div class="x a b"> in standards mode]
+    expected: FAIL
+
+  [[class~='A' i\] <div class="x a b"> with querySelector in standards mode]
+    expected: FAIL
+
+  [[id^='a' i\] <div id="AB"> in standards mode]
+    expected: FAIL
+
+  [[id^='a' i\] <div id="AB"> with querySelector in standards mode]
+    expected: FAIL
+
+  [[id$='A' i\] <div id="xa"> in standards mode]
+    expected: FAIL
+
+  [[id$='A' i\] <div id="xa"> with querySelector in standards mode]
+    expected: FAIL
+
+  [[lang|='a' i\] <div lang="A-B"> in standards mode]
+    expected: FAIL
+
+  [[lang|='a' i\] <div lang="A-B"> with querySelector in standards mode]
+    expected: FAIL
+
+  [[lang*='A' i\] <div lang="xab"> in standards mode]
+    expected: FAIL
+
+  [[lang*='A' i\] <div lang="xab"> with querySelector in standards mode]
+    expected: FAIL
+
+  [[foo~='ä' i\] /* COMBINING in selector */ <div foo="ä"> in standards mode]
+    expected: FAIL
+
+  [[foo~='ä' i\] /* COMBINING in selector */ <div foo="ä"> with querySelector in standards mode]
+    expected: FAIL
+
+  [[foo^='Ä' i\] /* COMBINING in selector */ <div foo="Ä"> in standards mode]
+    expected: FAIL
+
+  [[foo^='Ä' i\] /* COMBINING in selector */ <div foo="Ä"> with querySelector in standards mode]
+    expected: FAIL
+
+  [[foo$='Ä' i\] /* COMBINING in selector */ <div foo="ä"> in standards mode]
+    expected: FAIL
+
+  [[foo$='Ä' i\] /* COMBINING in selector */ <div foo="ä"> with querySelector in standards mode]
+    expected: FAIL
+
+  [[foo*='ä' i\] /* COMBINING in attribute */ <div foo="ä"> in standards mode]
+    expected: FAIL
+
+  [[foo*='ä' i\] /* COMBINING in attribute */ <div foo="ä"> with querySelector in standards mode]
+    expected: FAIL
+
+  [[foo|='ä' i\] /* COMBINING in attribute */ <div foo="Ä"> in standards mode]
+    expected: FAIL
+
+  [[foo|='ä' i\] /* COMBINING in attribute */ <div foo="Ä"> with querySelector in standards mode]
+    expected: FAIL
+
+  [[class~='a' i\] <div class="X A B"> in quirks mode]
+    expected: FAIL
+
+  [[class~='a' i\] <div class="X A B"> with querySelector in quirks mode]
+    expected: FAIL
+
+  [[class~='A' i\] <div class="x a b"> in quirks mode]
+    expected: FAIL
+
+  [[class~='A' i\] <div class="x a b"> with querySelector in quirks mode]
+    expected: FAIL
+
+  [[id^='a' i\] <div id="AB"> in quirks mode]
+    expected: FAIL
+
+  [[id^='a' i\] <div id="AB"> with querySelector in quirks mode]
+    expected: FAIL
+
+  [[id$='A' i\] <div id="xa"> in quirks mode]
+    expected: FAIL
+
+  [[id$='A' i\] <div id="xa"> with querySelector in quirks mode]
+    expected: FAIL
+
+  [[lang|='a' i\] <div lang="A-B"> in quirks mode]
+    expected: FAIL
+
+  [[lang|='a' i\] <div lang="A-B"> with querySelector in quirks mode]
+    expected: FAIL
+
+  [[lang*='A' i\] <div lang="xab"> in quirks mode]
+    expected: FAIL
+
+  [[lang*='A' i\] <div lang="xab"> with querySelector in quirks mode]
+    expected: FAIL
+
+  [[foo~='ä' i\] /* COMBINING in selector */ <div foo="ä"> in quirks mode]
+    expected: FAIL
+
+  [[foo~='ä' i\] /* COMBINING in selector */ <div foo="ä"> with querySelector in quirks mode]
+    expected: FAIL
+
+  [[foo^='Ä' i\] /* COMBINING in selector */ <div foo="Ä"> in quirks mode]
+    expected: FAIL
+
+  [[foo^='Ä' i\] /* COMBINING in selector */ <div foo="Ä"> with querySelector in quirks mode]
+    expected: FAIL
+
+  [[foo$='Ä' i\] /* COMBINING in selector */ <div foo="ä"> in quirks mode]
+    expected: FAIL
+
+  [[foo$='Ä' i\] /* COMBINING in selector */ <div foo="ä"> with querySelector in quirks mode]
+    expected: FAIL
+
+  [[foo*='ä' i\] /* COMBINING in attribute */ <div foo="ä"> in quirks mode]
+    expected: FAIL
+
+  [[foo*='ä' i\] /* COMBINING in attribute */ <div foo="ä"> with querySelector in quirks mode]
+    expected: FAIL
+
+  [[foo|='ä' i\] /* COMBINING in attribute */ <div foo="Ä"> in quirks mode]
+    expected: FAIL
+
+  [[foo|='ä' i\] /* COMBINING in attribute */ <div foo="Ä"> with querySelector in quirks mode]
+    expected: FAIL
+
+  [[class~='a' i\] <div class="X A B"> in XML]
+    expected: FAIL
+
+  [[class~='a' i\] <div class="X A B"> with querySelector in XML]
+    expected: FAIL
+
+  [[class~='A' i\] <div class="x a b"> in XML]
+    expected: FAIL
+
+  [[class~='A' i\] <div class="x a b"> with querySelector in XML]
+    expected: FAIL
+
+  [[id^='a' i\] <div id="AB"> in XML]
+    expected: FAIL
+
+  [[id^='a' i\] <div id="AB"> with querySelector in XML]
+    expected: FAIL
+
+  [[id$='A' i\] <div id="xa"> in XML]
+    expected: FAIL
+
+  [[id$='A' i\] <div id="xa"> with querySelector in XML]
+    expected: FAIL
+
+  [[lang|='a' i\] <div lang="A-B"> in XML]
+    expected: FAIL
+
+  [[lang|='a' i\] <div lang="A-B"> with querySelector in XML]
+    expected: FAIL
+
+  [[lang*='A' i\] <div lang="xab"> in XML]
+    expected: FAIL
+
+  [[lang*='A' i\] <div lang="xab"> with querySelector in XML]
+    expected: FAIL
+
+  [[foo~='ä' i\] /* COMBINING in selector */ <div foo="ä"> in XML]
+    expected: FAIL
+
+  [[foo~='ä' i\] /* COMBINING in selector */ <div foo="ä"> with querySelector in XML]
+    expected: FAIL
+
+  [[foo^='Ä' i\] /* COMBINING in selector */ <div foo="Ä"> in XML]
+    expected: FAIL
+
+  [[foo^='Ä' i\] /* COMBINING in selector */ <div foo="Ä"> with querySelector in XML]
+    expected: FAIL
+
+  [[foo$='Ä' i\] /* COMBINING in selector */ <div foo="ä"> in XML]
+    expected: FAIL
+
+  [[foo$='Ä' i\] /* COMBINING in selector */ <div foo="ä"> with querySelector in XML]
+    expected: FAIL
+
+  [[foo*='ä' i\] /* COMBINING in attribute */ <div foo="ä"> in XML]
+    expected: FAIL
+
+  [[foo*='ä' i\] /* COMBINING in attribute */ <div foo="ä"> with querySelector in XML]
+    expected: FAIL
+
+  [[foo|='ä' i\] /* COMBINING in attribute */ <div foo="Ä"> in XML]
+    expected: FAIL
+
+  [[foo|='ä' i\] /* COMBINING in attribute */ <div foo="Ä"> with querySelector in XML]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/selectors/attribute-selectors/attribute-case/syntax.html.ini b/testing/web-platform/meta/selectors/attribute-selectors/attribute-case/syntax.html.ini
index 60b4facf43c7..459f3b1d2802 100644
--- a/testing/web-platform/meta/selectors/attribute-selectors/attribute-case/syntax.html.ini
+++ b/testing/web-platform/meta/selectors/attribute-selectors/attribute-case/syntax.html.ini
@@ -369,3 +369,39 @@
   [[foo /* sanity check (invalid) */ with querySelector in XML]
     expected: FAIL
 
+  [[foo*='bar' i\] in standards mode]
+    expected: FAIL
+
+  [[foo*='bar' i\] with querySelector in standards mode]
+    expected: FAIL
+
+  [[foo|='bar' i\] in standards mode]
+    expected: FAIL
+
+  [[foo|='bar' i\] with querySelector in standards mode]
+    expected: FAIL
+
+  [[foo*='bar' i\] in quirks mode]
+    expected: FAIL
+
+  [[foo*='bar' i\] with querySelector in quirks mode]
+    expected: FAIL
+
+  [[foo|='bar' i\] in quirks mode]
+    expected: FAIL
+
+  [[foo|='bar' i\] with querySelector in quirks mode]
+    expected: FAIL
+
+  [[foo*='bar' i\] in XML]
+    expected: FAIL
+
+  [[foo*='bar' i\] with querySelector in XML]
+    expected: FAIL
+
+  [[foo|='bar' i\] in XML]
+    expected: FAIL
+
+  [[foo|='bar' i\] with querySelector in XML]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/svg/interfaces.html.ini b/testing/web-platform/meta/svg/interfaces.html.ini
new file mode 100644
index 000000000000..b9049f887914
--- /dev/null
+++ b/testing/web-platform/meta/svg/interfaces.html.ini
@@ -0,0 +1,2450 @@
+[interfaces.html]
+  type: testharness
+  [Document interface: attribute rootElement]
+    expected: FAIL
+
+  [SVGElement interface: attribute tabIndex]
+    expected: FAIL
+
+  [SVGElement interface: operation focus()]
+    expected: FAIL
+
+  [SVGElement interface: operation blur()]
+    expected: FAIL
+
+  [SVGGeometryElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGGeometryElement interface object length]
+    expected: FAIL
+
+  [SVGGeometryElement interface object name]
+    expected: FAIL
+
+  [SVGGeometryElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGGeometryElement interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [SVGGeometryElement interface: operation isPointInFill(DOMPoint)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: operation isPointInStroke(DOMPoint)]
+    expected: FAIL
+
+  [SVGNumber interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGSVGElement interface: operation getIntersectionList(DOMRectReadOnly,SVGElement)]
+    expected: FAIL
+
+  [SVGSVGElement interface: operation getEnclosureList(DOMRectReadOnly,SVGElement)]
+    expected: FAIL
+
+  [SVGSVGElement interface: operation checkIntersection(SVGElement,DOMRectReadOnly)]
+    expected: FAIL
+
+  [SVGSVGElement interface: operation checkEnclosure(SVGElement,DOMRectReadOnly)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "currentTranslate" with the proper type (5)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "getIntersectionList" with the proper type (6)]
+    expected: FAIL
+
+  [SVGSVGElement interface: calling getIntersectionList(DOMRectReadOnly,SVGElement) on svg with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "getEnclosureList" with the proper type (7)]
+    expected: FAIL
+
+  [SVGSVGElement interface: calling getEnclosureList(DOMRectReadOnly,SVGElement) on svg with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "checkIntersection" with the proper type (8)]
+    expected: FAIL
+
+  [SVGSVGElement interface: calling checkIntersection(SVGElement,DOMRectReadOnly) on svg with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "checkEnclosure" with the proper type (9)]
+    expected: FAIL
+
+  [SVGSVGElement interface: calling checkEnclosure(SVGElement,DOMRectReadOnly) on svg with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onafterprint" with the proper type (29)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onbeforeprint" with the proper type (30)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onbeforeunload" with the proper type (31)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onhashchange" with the proper type (32)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onlanguagechange" with the proper type (33)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onmessage" with the proper type (34)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onoffline" with the proper type (35)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "ononline" with the proper type (36)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onpagehide" with the proper type (37)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onpageshow" with the proper type (38)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onpopstate" with the proper type (39)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onrejectionhandled" with the proper type (40)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onstorage" with the proper type (41)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onunhandledrejection" with the proper type (42)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onunload" with the proper type (43)]
+    expected: FAIL
+
+  [SVGElement interface: svg must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: svg must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: svg must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: svg must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: svg must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: svg must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: svg must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: svg must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: svg must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: svg must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: svg must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: g must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: g must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: g must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: g must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: g must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: g must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: g must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: g must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: g must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: g must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: g must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGUnknownElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGUnknownElement interface object length]
+    expected: FAIL
+
+  [SVGUnknownElement interface object name]
+    expected: FAIL
+
+  [SVGUnknownElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGUnknownElement interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [SVGElement interface: defs must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: defs must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: defs must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: defs must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: defs must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: defs must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: defs must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: defs must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: defs must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: defs must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: defs must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: Desc must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: Desc must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: Desc must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: Desc must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: Desc must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: Desc must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: Desc must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: Desc must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: Desc must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: Desc must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: Desc must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: metadata must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: metadata must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: metadata must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: metadata must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: metadata must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: metadata must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: metadata must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: metadata must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: metadata must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: metadata must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: metadata must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: title must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: title must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: title must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: title must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: title must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: title must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: title must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: title must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: title must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: title must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: title must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: symbol must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: symbol must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: symbol must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: symbol must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: symbol must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: symbol must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: symbol must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: symbol must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: symbol must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: symbol must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: symbol must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: use must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: use must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: use must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: use must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: use must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: use must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: use must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: use must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: use must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: use must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: use must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: Switch must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: Switch must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: Switch must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: Switch must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: Switch must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: Switch must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: Switch must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: Switch must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: Switch must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: Switch must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: Switch must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGStyleElement interface: style must inherit property "sheet" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: style must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: style must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: style must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: style must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: style must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: style must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: style must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: style must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: style must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: style must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: style must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGTransform interface: svg.createSVGTransform() must inherit property "matrix" with the proper type (8)]
+    expected: FAIL
+
+  [SVGPathElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGPathElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGGeometryElement interface: path must inherit property "isPointInFill" with the proper type (0)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInFill(DOMPoint) on path with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGGeometryElement interface: path must inherit property "isPointInStroke" with the proper type (1)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on path with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGElement interface: path must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: path must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: path must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: path must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: path must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: path must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: path must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: path must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: path must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: path must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: path must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGRectElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGRectElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGGeometryElement interface: rect must inherit property "isPointInFill" with the proper type (0)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInFill(DOMPoint) on rect with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGGeometryElement interface: rect must inherit property "isPointInStroke" with the proper type (1)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on rect with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGElement interface: rect must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: rect must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: rect must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: rect must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: rect must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: rect must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: rect must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: rect must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: rect must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: rect must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: rect must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGCircleElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGCircleElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGGeometryElement interface: circle must inherit property "isPointInFill" with the proper type (0)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInFill(DOMPoint) on circle with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGGeometryElement interface: circle must inherit property "isPointInStroke" with the proper type (1)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on circle with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGElement interface: circle must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: circle must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: circle must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: circle must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: circle must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: circle must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: circle must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: circle must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: circle must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: circle must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: circle must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGEllipseElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGEllipseElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGGeometryElement interface: ellipse must inherit property "isPointInFill" with the proper type (0)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInFill(DOMPoint) on ellipse with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGGeometryElement interface: ellipse must inherit property "isPointInStroke" with the proper type (1)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on ellipse with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGElement interface: ellipse must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: ellipse must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: ellipse must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: ellipse must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: ellipse must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: ellipse must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: ellipse must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: ellipse must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: ellipse must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: ellipse must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: ellipse must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGLineElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGLineElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGGeometryElement interface: line must inherit property "isPointInFill" with the proper type (0)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInFill(DOMPoint) on line with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGGeometryElement interface: line must inherit property "isPointInStroke" with the proper type (1)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on line with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGElement interface: line must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: line must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: line must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: line must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: line must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: line must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: line must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: line must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: line must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: line must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: line must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGPolylineElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGPolylineElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGGeometryElement interface: polyline must inherit property "isPointInFill" with the proper type (0)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInFill(DOMPoint) on polyline with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGGeometryElement interface: polyline must inherit property "isPointInStroke" with the proper type (1)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on polyline with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGElement interface: polyline must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: polyline must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: polyline must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: polyline must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: polyline must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: polyline must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: polyline must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: polyline must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: polyline must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: polyline must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: polyline must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGPolygonElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGPolygonElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGGeometryElement interface: polygon must inherit property "isPointInFill" with the proper type (0)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInFill(DOMPoint) on polygon with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGGeometryElement interface: polygon must inherit property "isPointInStroke" with the proper type (1)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on polygon with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGElement interface: polygon must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: polygon must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: polygon must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: polygon must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: polygon must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: polygon must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: polygon must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: polygon must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: polygon must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: polygon must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: polygon must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGTextContentElement must be primary interface of textContent]
+    expected: FAIL
+
+  [Stringification of textContent]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "LENGTHADJUST_UNKNOWN" with the proper type (0)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "LENGTHADJUST_SPACING" with the proper type (1)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "LENGTHADJUST_SPACINGANDGLYPHS" with the proper type (2)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "textLength" with the proper type (3)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "lengthAdjust" with the proper type (4)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "getNumberOfChars" with the proper type (5)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "getComputedTextLength" with the proper type (6)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "getSubStringLength" with the proper type (7)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: calling getSubStringLength(unsigned long,unsigned long) on textContent with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "getStartPositionOfChar" with the proper type (8)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: calling getStartPositionOfChar(unsigned long) on textContent with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "getEndPositionOfChar" with the proper type (9)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: calling getEndPositionOfChar(unsigned long) on textContent with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "getExtentOfChar" with the proper type (10)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: calling getExtentOfChar(unsigned long) on textContent with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "getRotationOfChar" with the proper type (11)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: calling getRotationOfChar(unsigned long) on textContent with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "getCharNumAtPosition" with the proper type (12)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: calling getCharNumAtPosition(DOMPoint) on textContent with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "selectSubString" with the proper type (13)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: calling selectSubString(unsigned long,unsigned long) on textContent with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGGraphicsElement interface: textContent must inherit property "transform" with the proper type (0)]
+    expected: FAIL
+
+  [SVGGraphicsElement interface: textContent must inherit property "getBBox" with the proper type (1)]
+    expected: FAIL
+
+  [SVGGraphicsElement interface: calling getBBox(SVGBoundingBoxOptions) on textContent with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGGraphicsElement interface: textContent must inherit property "getCTM" with the proper type (2)]
+    expected: FAIL
+
+  [SVGGraphicsElement interface: textContent must inherit property "getScreenCTM" with the proper type (3)]
+    expected: FAIL
+
+  [SVGGraphicsElement interface: textContent must inherit property "requiredExtensions" with the proper type (4)]
+    expected: FAIL
+
+  [SVGGraphicsElement interface: textContent must inherit property "systemLanguage" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: textContent must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: textContent must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: textContent must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: textContent must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: textContent must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: textContent must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: textContent must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: textContent must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: textContent must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: textContent must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: textContent must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: text must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: text must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: text must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: text must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: text must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: text must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: text must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: text must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: text must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: text must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: text must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: tspan must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: tspan must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: tspan must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: tspan must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: tspan must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: tspan must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: tspan must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: tspan must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: tspan must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: tspan must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: tspan must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: textPath must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: textPath must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: textPath must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: textPath must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: textPath must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: textPath must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: textPath must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: textPath must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: textPath must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: textPath must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: textPath must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGImageElement interface: attribute crossOrigin]
+    expected: FAIL
+
+  [SVGImageElement interface: image must inherit property "crossOrigin" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: image must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: image must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: image must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: image must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: image must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: image must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: image must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: image must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: image must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: image must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: image must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: foreignObject must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: foreignObject must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: foreignObject must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: foreignObject must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: foreignObject must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: foreignObject must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: foreignObject must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: foreignObject must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: foreignObject must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: foreignObject must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: foreignObject must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGMarkerElement interface: attribute orient]
+    expected: FAIL
+
+  [SVGMarkerElement interface: marker must inherit property "orient" with the proper type (13)]
+    expected: FAIL
+
+  [SVGElement interface: marker must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: marker must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: marker must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: marker must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: marker must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: marker must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: marker must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: marker must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: marker must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: marker must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: marker must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGSolidcolorElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGSolidcolorElement interface object length]
+    expected: FAIL
+
+  [SVGSolidcolorElement interface object name]
+    expected: FAIL
+
+  [SVGSolidcolorElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGSolidcolorElement interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [SVGElement interface: linearGradient must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: linearGradient must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: linearGradient must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: linearGradient must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: linearGradient must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: linearGradient must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: linearGradient must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: linearGradient must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: linearGradient must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: linearGradient must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: linearGradient must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGRadialGradientElement interface: attribute fr]
+    expected: FAIL
+
+  [SVGRadialGradientElement interface: radialGradient must inherit property "fr" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: radialGradient must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: radialGradient must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: radialGradient must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: radialGradient must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: radialGradient must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: radialGradient must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: radialGradient must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: radialGradient must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: radialGradient must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: radialGradient must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: radialGradient must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGMeshElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGMeshElement interface object length]
+    expected: FAIL
+
+  [SVGMeshElement interface object name]
+    expected: FAIL
+
+  [SVGMeshElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGMeshElement interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [SVGMeshrowElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGMeshrowElement interface object length]
+    expected: FAIL
+
+  [SVGMeshrowElement interface object name]
+    expected: FAIL
+
+  [SVGMeshrowElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGMeshrowElement interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [SVGMeshpatchElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGMeshpatchElement interface object length]
+    expected: FAIL
+
+  [SVGMeshpatchElement interface object name]
+    expected: FAIL
+
+  [SVGMeshpatchElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGMeshpatchElement interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [SVGElement interface: stop must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: stop must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: stop must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: stop must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: stop must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: stop must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: stop must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: stop must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: stop must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: stop must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: stop must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: pattern must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: pattern must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: pattern must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: pattern must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: pattern must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: pattern must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: pattern must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: pattern must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: pattern must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: pattern must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: pattern must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGHatchElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGHatchElement interface object length]
+    expected: FAIL
+
+  [SVGHatchElement interface object name]
+    expected: FAIL
+
+  [SVGHatchElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGHatchElement interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [SVGHatchpathElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGHatchpathElement interface object length]
+    expected: FAIL
+
+  [SVGHatchpathElement interface object name]
+    expected: FAIL
+
+  [SVGHatchpathElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGHatchpathElement interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [SVGCursorElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGCursorElement interface object length]
+    expected: FAIL
+
+  [SVGCursorElement interface object name]
+    expected: FAIL
+
+  [SVGCursorElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGCursorElement interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [SVGCursorElement interface: attribute x]
+    expected: FAIL
+
+  [SVGCursorElement interface: attribute y]
+    expected: FAIL
+
+  [SVGCursorElement interface: attribute href]
+    expected: FAIL
+
+  [SVGCursorElement must be primary interface of cursor]
+    expected: FAIL
+
+  [Stringification of cursor]
+    expected: FAIL
+
+  [SVGCursorElement interface: cursor must inherit property "x" with the proper type (0)]
+    expected: FAIL
+
+  [SVGCursorElement interface: cursor must inherit property "y" with the proper type (1)]
+    expected: FAIL
+
+  [SVGCursorElement interface: cursor must inherit property "href" with the proper type (2)]
+    expected: FAIL
+
+  [SVGElement interface: cursor must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: cursor must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: cursor must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: cursor must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: cursor must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: cursor must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: cursor must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: cursor must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: cursor must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: cursor must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: cursor must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGScriptElement interface: script must inherit property "crossOrigin" with the proper type (1)]
+    expected: FAIL
+
+  [SVGElement interface: script must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: script must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: script must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: script must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: script must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: script must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: script must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: script must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: script must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: script must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: script must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGZoomEvent interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGZoomEvent interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGZoomEvent interface: attribute zoomRectScreen]
+    expected: FAIL
+
+  [SVGElement interface: a must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: a must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: a must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: a must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: a must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: a must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: a must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: a must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: a must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: a must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: a must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: view must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: view must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: view must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: view must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: view must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: view must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: view must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: view must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: view must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: view must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: view must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: filter must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: filter must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: filter must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: filter must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: filter must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: filter must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: filter must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: filter must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: filter must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: filter must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: filter must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feBlend must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feBlend must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feBlend must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feBlend must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feBlend must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feBlend must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feBlend must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feBlend must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feBlend must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feBlend must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feBlend must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feColorMatrix must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feColorMatrix must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feColorMatrix must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feColorMatrix must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feColorMatrix must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feColorMatrix must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feColorMatrix must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feColorMatrix must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feColorMatrix must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feColorMatrix must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feColorMatrix must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feComponentTransfer must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feComponentTransfer must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feComponentTransfer must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feComponentTransfer must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feComponentTransfer must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feComponentTransfer must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feComponentTransfer must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feComponentTransfer must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feComponentTransfer must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feComponentTransfer must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feComponentTransfer must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncR must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncR must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncR must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncR must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncR must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncR must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncR must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncR must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncR must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncR must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncR must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncG must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncG must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncG must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncG must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncG must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncG must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncG must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncG must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncG must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncG must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncG must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncB must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncB must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncB must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncB must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncB must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncB must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncB must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncB must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncB must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncB must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncB must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncA must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncA must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncA must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncA must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncA must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncA must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncA must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncA must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncA must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncA must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncA must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feComposite must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feComposite must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feComposite must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feComposite must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feComposite must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feComposite must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feComposite must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feComposite must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feComposite must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feComposite must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feComposite must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feConvolveMatrix must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feConvolveMatrix must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feConvolveMatrix must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feConvolveMatrix must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feConvolveMatrix must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feConvolveMatrix must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feConvolveMatrix must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feConvolveMatrix must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feConvolveMatrix must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feConvolveMatrix must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feConvolveMatrix must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feDiffuseLighting must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feDiffuseLighting must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feDiffuseLighting must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feDiffuseLighting must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feDiffuseLighting must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feDiffuseLighting must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feDiffuseLighting must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feDiffuseLighting must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feDiffuseLighting must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feDiffuseLighting must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feDiffuseLighting must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: fePointLight must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: fePointLight must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: fePointLight must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: fePointLight must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: fePointLight must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: fePointLight must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: fePointLight must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: fePointLight must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: fePointLight must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: fePointLight must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: fePointLight must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feSpotLight must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feSpotLight must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feSpotLight must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feSpotLight must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feSpotLight must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feSpotLight must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feSpotLight must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feSpotLight must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feSpotLight must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feSpotLight must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feSpotLight must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feDisplacementMap must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feDisplacementMap must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feDisplacementMap must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feDisplacementMap must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feDisplacementMap must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feDisplacementMap must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feDisplacementMap must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feDisplacementMap must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feDisplacementMap must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feDisplacementMap must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feDisplacementMap must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feDropShadow must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feDropShadow must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feDropShadow must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feDropShadow must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feDropShadow must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feDropShadow must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feDropShadow must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feDropShadow must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feDropShadow must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feDropShadow must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feDropShadow must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feFlood must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feFlood must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feFlood must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feFlood must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feFlood must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feFlood must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feFlood must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feFlood must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feFlood must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feFlood must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feFlood must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: constant SVG_EDGEMODE_UNKNOWN on interface object]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: constant SVG_EDGEMODE_UNKNOWN on interface prototype object]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: constant SVG_EDGEMODE_DUPLICATE on interface object]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: constant SVG_EDGEMODE_DUPLICATE on interface prototype object]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: constant SVG_EDGEMODE_WRAP on interface object]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: constant SVG_EDGEMODE_WRAP on interface prototype object]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: constant SVG_EDGEMODE_NONE on interface object]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: constant SVG_EDGEMODE_NONE on interface prototype object]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: attribute edgeMode]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement must be primary interface of feGaussianBlur]
+    expected: FAIL
+
+  [Stringification of feGaussianBlur]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "SVG_EDGEMODE_UNKNOWN" with the proper type (0)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "SVG_EDGEMODE_DUPLICATE" with the proper type (1)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "SVG_EDGEMODE_WRAP" with the proper type (2)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "SVG_EDGEMODE_NONE" with the proper type (3)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "in1" with the proper type (4)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "stdDeviationX" with the proper type (5)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "stdDeviationY" with the proper type (6)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "edgeMode" with the proper type (7)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "setStdDeviation" with the proper type (8)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: calling setStdDeviation(float,float) on feGaussianBlur with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "x" with the proper type (9)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "y" with the proper type (10)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "width" with the proper type (11)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "height" with the proper type (12)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "result" with the proper type (13)]
+    expected: FAIL
+
+  [SVGElement interface: feGaussianBlur must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feGaussianBlur must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feGaussianBlur must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feGaussianBlur must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feGaussianBlur must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feGaussianBlur must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feGaussianBlur must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feGaussianBlur must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feGaussianBlur must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feGaussianBlur must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feGaussianBlur must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGFEImageElement interface: attribute crossOrigin]
+    expected: FAIL
+
+  [SVGFEImageElement interface: feImage must inherit property "crossOrigin" with the proper type (1)]
+    expected: FAIL
+
+  [SVGElement interface: feImage must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feImage must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feImage must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feImage must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feImage must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feImage must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feImage must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feImage must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feImage must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feImage must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feImage must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feMerge must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feMerge must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feMerge must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feMerge must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feMerge must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feMerge must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feMerge must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feMerge must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feMerge must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feMerge must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feMerge must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feMergeNode must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feMergeNode must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feMergeNode must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feMergeNode must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feMergeNode must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feMergeNode must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feMergeNode must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feMergeNode must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feMergeNode must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feMergeNode must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feMergeNode must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feMorphology must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feMorphology must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feMorphology must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feMorphology must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feMorphology must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feMorphology must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feMorphology must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feMorphology must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feMorphology must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feMorphology must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feMorphology must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feSpecularLighting must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feSpecularLighting must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feSpecularLighting must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feSpecularLighting must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feSpecularLighting must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feSpecularLighting must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feSpecularLighting must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feSpecularLighting must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feSpecularLighting must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feSpecularLighting must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feSpecularLighting must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feTile must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feTile must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feTile must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feTile must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feTile must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feTile must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feTile must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feTile must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feTile must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feTile must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feTile must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feTurbulence must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feTurbulence must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feTurbulence must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feTurbulence must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feTurbulence must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feTurbulence must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feTurbulence must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feTurbulence must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feTurbulence must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feTurbulence must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feTurbulence must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/url/a-element.xhtml.ini b/testing/web-platform/meta/url/a-element-xhtml.xhtml.ini
similarity index 81%
rename from testing/web-platform/meta/url/a-element.xhtml.ini
rename to testing/web-platform/meta/url/a-element-xhtml.xhtml.ini
index 1dcc41184ac6..97761ad3034a 100644
--- a/testing/web-platform/meta/url/a-element.xhtml.ini
+++ b/testing/web-platform/meta/url/a-element-xhtml.xhtml.ini
@@ -1,8 +1,11 @@
-[a-element.xhtml]
+[a-element-xhtml.xhtml]
   type: testharness
   [Parsing: <a:\t foo.com> against <http://example.org/foo/bar>]
     expected: FAIL
 
+  [Parsing: <http://f:21/ b ? d # e > against <http://example.org/foo/bar>]
+    expected: FAIL
+
   [Parsing: <http://f:b/c> against <http://example.org/foo/bar>]
     expected: FAIL
 
@@ -78,6 +81,9 @@
   [Parsing: <madeupscheme:/example.com/> against <http://example.org/foo/bar>]
     expected: FAIL
 
+  [Parsing: <file:/example.com/> against <http://example.org/foo/bar>]
+    expected: FAIL
+
   [Parsing: <ftps:/example.com/> against <http://example.org/foo/bar>]
     expected: FAIL
 
@@ -111,33 +117,14 @@
   [Parsing: <mailto:example.com/> against <http://example.org/foo/bar>]
     expected: FAIL
 
+  [Parsing: <#β> against <http://example.org/foo/bar>]
+    expected: FAIL
+
   [Parsing: <data:text/html,test#test> against <http://example.org/foo/bar>]
     expected: FAIL
 
   [Parsing: <file:c:\\foo\\bar.html> against <file:///tmp/mock/path>]
-    expected:
-      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    expected: FAIL
 
   [Parsing: <  File:c|////foo\\bar.html> against <file:///tmp/mock/path>]
     expected: FAIL
@@ -160,6 +147,12 @@
   [Parsing: </\\server/file> against <file:///tmp/mock/path>]
     expected: FAIL
 
+  [Parsing: <file:///foo/bar.txt> against <file:///tmp/mock/path>]
+    expected: FAIL
+
+  [Parsing: <file:///home/me> against <file:///tmp/mock/path>]
+    expected: FAIL
+
   [Parsing: <//> against <file:///tmp/mock/path>]
     expected: FAIL
 
@@ -193,6 +186,9 @@
   [Parsing: <http://example.com\\\\foo\\\\bar> against <about:blank>]
     expected: FAIL
 
+  [Parsing: <http://www.google.com/foo?bar=baz# »> against <about:blank>]
+    expected: FAIL
+
   [Parsing: <data:test# »> against <about:blank>]
     expected: FAIL
 
@@ -223,6 +219,9 @@
   [Parsing: <madeupscheme:/example.com/> against <about:blank>]
     expected: FAIL
 
+  [Parsing: <file:/example.com/> against <about:blank>]
+    expected: FAIL
+
   [Parsing: <ftps:/example.com/> against <about:blank>]
     expected: FAIL
 
@@ -310,12 +309,21 @@
   [Parsing: <http://:@www.example.com> against <about:blank>]
     expected: FAIL
 
+  [Parsing: <file:..> against <http://www.example.com/test>]
+    expected: FAIL
+
   [Parsing: <http://example example.com> against <http://other.com/>]
     expected: FAIL
 
   [Parsing: <http://Goo%20 goo%7C|.com> against <http://other.com/>]
     expected: FAIL
 
+  [Parsing: <http://[\]> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <http://[:\]> against <http://other.com/>]
+    expected: FAIL
+
   [Parsing: <http://GOO 　goo.com> against <http://other.com/>]
     expected: FAIL
 
@@ -370,42 +378,6 @@
   [Parsing: <http://[google.com\]> against <http://other.com/>]
     expected: FAIL
 
-  [Parsing: <x> against <test:test>]
-    expected: FAIL
-
-  [Parsing: <http://f:21/ b ? d # e > against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <#β> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <http://www.google.com/foo?bar=baz# »> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <#β> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <http://www.google.com/foo?bar=baz# »> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://[\]> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <http://[:\]> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <file:/example.com/> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <file:///foo/bar.txt> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <file:///home/me> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <file:/example.com/> against <about:blank>]
-    expected: FAIL
-
   [Parsing: <#> against <test:test>]
     expected: FAIL
 
@@ -514,6 +486,3 @@
   [Parsing: <sc:\\../> against <about:blank>]
     expected: FAIL
 
-  [Parsing: <file:..> against <http://www.example.com/test>]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/url/interfaces.html.ini b/testing/web-platform/meta/url/interfaces.html.ini
index 5797a138bf23..5c5d8df9270a 100644
--- a/testing/web-platform/meta/url/interfaces.html.ini
+++ b/testing/web-platform/meta/url/interfaces.html.ini
@@ -1,5 +1,6 @@
 [interfaces.html]
   type: testharness
+  expected: ERROR
   [URL interface: operation domainToASCII(ScalarValueString)]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/webgl/compressedTexSubImage2D.html.ini b/testing/web-platform/meta/webgl/compressedTexSubImage2D.html.ini
index 777d51687dca..5a4db990cafb 100644
--- a/testing/web-platform/meta/webgl/compressedTexSubImage2D.html.ini
+++ b/testing/web-platform/meta/webgl/compressedTexSubImage2D.html.ini
@@ -7,3 +7,9 @@
       if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
 
+  [Calling function () {\n    gl.compressedTexSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 10, 10, COMPRESSED_RGB_S3TC_DXT1_EXT, new Uint8Array(8));\n  } should generate a 1280 error.]
+    expected: FAIL
+
+  [Calling function () {\n    gl.compressedTexSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 10, 10, COMPRESSED_RGB_S3TC_DXT1_EXT, new Uint8Array(8), null);\n  } should generate a 1280 error.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/webvtt/interfaces.html.ini b/testing/web-platform/meta/webvtt/interfaces.html.ini
index 8fed81605172..ceb09ef7ed95 100644
--- a/testing/web-platform/meta/webvtt/interfaces.html.ini
+++ b/testing/web-platform/meta/webvtt/interfaces.html.ini
@@ -78,3 +78,6 @@
   [VTTRegion interface: new VTTRegion() must inherit property "scroll" with the proper type (6)]
     expected: FAIL
 
+  [VTTRegion interface object name]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past.html.ini
index b0f53fb7b7fa..628f60bc5646 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past.html.ini
@@ -1,4 +1,3 @@
 [underline_timestamp_past.html]
   type: reftest
-  expected:
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/mozilla/meta/service-workers/service-worker/unregister-then-register-new-script.https.html.ini b/testing/web-platform/mozilla/meta/service-workers/service-worker/unregister-then-register-new-script.https.html.ini
index 63fbb4369bfc..d09035f56a35 100644
--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/unregister-then-register-new-script.https.html.ini
+++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/unregister-then-register-new-script.https.html.ini
@@ -2,3 +2,4 @@
   type: testharness
   [Registering a new script URL while an unregistered registration is in use]
     disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1231974
+

From 08a3c62a6fd42f521758b8397ebb6a0db6e78428 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Fri, 18 Dec 2015 10:57:17 -0500
Subject: [PATCH 023/101] Bug 1232458 - fix Windows build bustage on a CLOSED
 TREE; r=me

---
 mozglue/build/WindowsDllBlocklist.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mozglue/build/WindowsDllBlocklist.cpp b/mozglue/build/WindowsDllBlocklist.cpp
index 90e962502ff9..7e0b61775b15 100644
--- a/mozglue/build/WindowsDllBlocklist.cpp
+++ b/mozglue/build/WindowsDllBlocklist.cpp
@@ -502,7 +502,7 @@ getFullPath (PWCHAR filePath, wchar_t* fname)
   }
 
   // now actually grab it
-  SearchPathW(sanitizedFilePath, fname, L".dll", pathlen + 1, full_fname,
+  SearchPathW(sanitizedFilePath, fname, L".dll", pathlen + 1, full_fname.get(),
               nullptr);
   return full_fname;
 }
@@ -669,7 +669,7 @@ patched_LdrLoadDll (PWCHAR filePath, PULONG flags, PUNICODE_STRING moduleFileNam
           UINT vInfoLen;
 
           if (GetFileVersionInfoW(full_fname.get(), 0, infoSize, infoData.get()) &&
-              VerQueryValueW(infoData, L"\\", (LPVOID*) &vInfo, &vInfoLen))
+              VerQueryValueW(infoData.get(), L"\\", (LPVOID*) &vInfo, &vInfoLen))
           {
             fVersion =
               ((unsigned long long)vInfo->dwFileVersionMS) << 32 |

From 5b56c0c0916e1e4ac1ba6eb857cb5a1e0d3df6fb Mon Sep 17 00:00:00 2001
From: Ben Kelly <ben@wanderview.com>
Date: Fri, 18 Dec 2015 11:04:39 -0500
Subject: [PATCH 024/101] Bug 1231974 P1 Remove unneeded
 ServiceWorkerScriptJobBase abstract class. r=baku

---
 dom/workers/ServiceWorkerManager.cpp | 52 ++++++++--------------------
 1 file changed, 15 insertions(+), 37 deletions(-)

diff --git a/dom/workers/ServiceWorkerManager.cpp b/dom/workers/ServiceWorkerManager.cpp
index 4402b81caaff..0a4e662319e9 100644
--- a/dom/workers/ServiceWorkerManager.cpp
+++ b/dom/workers/ServiceWorkerManager.cpp
@@ -944,22 +944,18 @@ private:
 class ServiceWorkerJobBase : public ServiceWorkerJob
 {
 public:
-  ServiceWorkerJobBase(ServiceWorkerJobQueue* aQueue,
-                       ServiceWorkerJob::Type aJobType,
-                       ServiceWorkerUpdateFinishCallback* aCallback)
-    : ServiceWorkerJobBase(aQueue, aJobType, aCallback, nullptr, nullptr)
-  { }
-
   ServiceWorkerJobBase(ServiceWorkerJobQueue* aQueue,
                        ServiceWorkerJob::Type aJobType,
                        ServiceWorkerUpdateFinishCallback* aCallback,
                        ServiceWorkerRegistrationInfo* aRegistration,
-                       ServiceWorkerInfo* aServiceWorkerInfo)
+                       ServiceWorkerInfo* aServiceWorkerInfo,
+                       const nsACString& aScriptSpec)
     : ServiceWorkerJob(aQueue, aJobType)
     , mCallback(aCallback)
-    , mCanceled(false)
     , mRegistration(aRegistration)
     , mUpdateAndInstallInfo(aServiceWorkerInfo)
+    , mScriptSpec(aScriptSpec)
+    , mCanceled(false)
   {
     AssertIsOnMainThread();
   }
@@ -973,9 +969,10 @@ public:
 
 protected:
   RefPtr<ServiceWorkerUpdateFinishCallback> mCallback;
-  bool mCanceled;
   RefPtr<ServiceWorkerRegistrationInfo> mRegistration;
   RefPtr<ServiceWorkerInfo> mUpdateAndInstallInfo;
+  const nsCString mScriptSpec;
+  bool mCanceled;
 
   ~ServiceWorkerJobBase()
   { }
@@ -990,25 +987,6 @@ protected:
       mCallback = nullptr;
     }
   }
-};
-
-// Base type for jobs that work with a specific service worker script.
-class ServiceWorkerScriptJobBase : public ServiceWorkerJobBase
-{
-protected:
-  const nsCString mScriptSpec;
-
-  ServiceWorkerScriptJobBase(ServiceWorkerJobQueue* aQueue,
-                             ServiceWorkerJob::Type aJobType,
-                             ServiceWorkerUpdateFinishCallback* aCallback,
-                             ServiceWorkerRegistrationInfo* aRegistration,
-                             ServiceWorkerInfo* aServiceWorkerInfo,
-                             const nsACString& aScriptSpec)
-    : ServiceWorkerJobBase(aQueue, aJobType, aCallback, aRegistration,
-                           aServiceWorkerInfo)
-    , mScriptSpec(aScriptSpec)
-  {
-  }
 
   // This MUST only be called when the job is still performing actions related
   // to registration or update. After the spec resolves the update promise, use
@@ -1073,7 +1051,7 @@ protected:
   }
 };
 
-class ServiceWorkerInstallJob final : public ServiceWorkerScriptJobBase
+class ServiceWorkerInstallJob final : public ServiceWorkerJobBase
 {
   friend class ContinueInstallTask;
 
@@ -1083,9 +1061,9 @@ public:
                           ServiceWorkerRegistrationInfo* aRegistration,
                           ServiceWorkerInfo* aServiceWorkerInfo,
                           const nsACString& aScriptSpec)
-    : ServiceWorkerScriptJobBase(aQueue, Type::InstallJob, aCallback,
-                                 aRegistration, aServiceWorkerInfo,
-                                 aScriptSpec)
+    : ServiceWorkerJobBase(aQueue, Type::InstallJob, aCallback,
+                           aRegistration, aServiceWorkerInfo,
+                           aScriptSpec)
   {
     MOZ_ASSERT(aRegistration);
   }
@@ -1210,7 +1188,7 @@ public:
   }
 };
 
-class ServiceWorkerRegisterJob final : public ServiceWorkerScriptJobBase,
+class ServiceWorkerRegisterJob final : public ServiceWorkerJobBase,
                                        public serviceWorkerScriptCache::CompareCallback
 {
   friend class ContinueUpdateRunnable;
@@ -1232,8 +1210,8 @@ public:
                            ServiceWorkerUpdateFinishCallback* aCallback,
                            nsIPrincipal* aPrincipal,
                            nsILoadGroup* aLoadGroup)
-    : ServiceWorkerScriptJobBase(aQueue, Type::RegisterJob, aCallback, nullptr,
-                                 nullptr, aScriptSpec)
+    : ServiceWorkerJobBase(aQueue, Type::RegisterJob, aCallback, nullptr,
+                           nullptr, aScriptSpec)
     , mScope(aScope)
     , mPrincipal(aPrincipal)
     , mLoadGroup(aLoadGroup)
@@ -1248,8 +1226,8 @@ public:
                            ServiceWorkerRegistrationInfo* aRegistration,
                            ServiceWorkerUpdateFinishCallback* aCallback,
                            const nsACString& aScriptSpec)
-    : ServiceWorkerScriptJobBase(aQueue, Type::UpdateJob, aCallback,
-                                 aRegistration, nullptr, aScriptSpec)
+    : ServiceWorkerJobBase(aQueue, Type::UpdateJob, aCallback,
+                           aRegistration, nullptr, aScriptSpec)
   {
     AssertIsOnMainThread();
   }

From 8eab0e72f83383e71207101d6beac7abdcea0097 Mon Sep 17 00:00:00 2001
From: Ben Kelly <ben@wanderview.com>
Date: Fri, 18 Dec 2015 11:04:39 -0500
Subject: [PATCH 025/101] Bug 1231974 P2 Store scope on ServiceWorkerJobBase.
 r=baku

---
 dom/workers/ServiceWorkerManager.cpp | 55 +++++++++++++++-------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/dom/workers/ServiceWorkerManager.cpp b/dom/workers/ServiceWorkerManager.cpp
index 0a4e662319e9..8d3c6364c96a 100644
--- a/dom/workers/ServiceWorkerManager.cpp
+++ b/dom/workers/ServiceWorkerManager.cpp
@@ -946,15 +946,17 @@ class ServiceWorkerJobBase : public ServiceWorkerJob
 public:
   ServiceWorkerJobBase(ServiceWorkerJobQueue* aQueue,
                        ServiceWorkerJob::Type aJobType,
+                       const nsACString& aScope,
+                       const nsACString& aScriptSpec,
                        ServiceWorkerUpdateFinishCallback* aCallback,
                        ServiceWorkerRegistrationInfo* aRegistration,
-                       ServiceWorkerInfo* aServiceWorkerInfo,
-                       const nsACString& aScriptSpec)
+                       ServiceWorkerInfo* aServiceWorkerInfo)
     : ServiceWorkerJob(aQueue, aJobType)
+    , mScope(aScope)
+    , mScriptSpec(aScriptSpec)
     , mCallback(aCallback)
     , mRegistration(aRegistration)
     , mUpdateAndInstallInfo(aServiceWorkerInfo)
-    , mScriptSpec(aScriptSpec)
     , mCanceled(false)
   {
     AssertIsOnMainThread();
@@ -968,10 +970,11 @@ public:
   }
 
 protected:
+  const nsCString mScope;
+  const nsCString mScriptSpec;
   RefPtr<ServiceWorkerUpdateFinishCallback> mCallback;
   RefPtr<ServiceWorkerRegistrationInfo> mRegistration;
   RefPtr<ServiceWorkerInfo> mUpdateAndInstallInfo;
-  const nsCString mScriptSpec;
   bool mCanceled;
 
   ~ServiceWorkerJobBase()
@@ -1057,13 +1060,13 @@ class ServiceWorkerInstallJob final : public ServiceWorkerJobBase
 
 public:
   ServiceWorkerInstallJob(ServiceWorkerJobQueue* aQueue,
+                          const nsACString& aScope,
+                          const nsACString& aScriptSpec,
                           ServiceWorkerUpdateFinishCallback* aCallback,
                           ServiceWorkerRegistrationInfo* aRegistration,
-                          ServiceWorkerInfo* aServiceWorkerInfo,
-                          const nsACString& aScriptSpec)
-    : ServiceWorkerJobBase(aQueue, Type::InstallJob, aCallback,
-                           aRegistration, aServiceWorkerInfo,
-                           aScriptSpec)
+                          ServiceWorkerInfo* aServiceWorkerInfo)
+    : ServiceWorkerJobBase(aQueue, Type::InstallJob, aScope, aScriptSpec,
+                           aCallback, aRegistration, aServiceWorkerInfo)
   {
     MOZ_ASSERT(aRegistration);
   }
@@ -1193,7 +1196,6 @@ class ServiceWorkerRegisterJob final : public ServiceWorkerJobBase,
 {
   friend class ContinueUpdateRunnable;
 
-  nsCString mScope;
   nsCOMPtr<nsIPrincipal> mPrincipal;
   nsCOMPtr<nsILoadGroup> mLoadGroup;
 
@@ -1205,14 +1207,13 @@ public:
 
   // [[Register]]
   ServiceWorkerRegisterJob(ServiceWorkerJobQueue* aQueue,
-                           const nsCString& aScope,
-                           const nsCString& aScriptSpec,
+                           const nsACString& aScope,
+                           const nsACString& aScriptSpec,
                            ServiceWorkerUpdateFinishCallback* aCallback,
                            nsIPrincipal* aPrincipal,
                            nsILoadGroup* aLoadGroup)
-    : ServiceWorkerJobBase(aQueue, Type::RegisterJob, aCallback, nullptr,
-                           nullptr, aScriptSpec)
-    , mScope(aScope)
+    : ServiceWorkerJobBase(aQueue, Type::RegisterJob, aScope, aScriptSpec,
+                           aCallback, nullptr, nullptr)
     , mPrincipal(aPrincipal)
     , mLoadGroup(aLoadGroup)
   {
@@ -1223,11 +1224,12 @@ public:
 
   // [[Update]]
   ServiceWorkerRegisterJob(ServiceWorkerJobQueue* aQueue,
+                           const nsACString& aScope,
+                           const nsACString& aScriptSpec,
                            ServiceWorkerRegistrationInfo* aRegistration,
-                           ServiceWorkerUpdateFinishCallback* aCallback,
-                           const nsACString& aScriptSpec)
-    : ServiceWorkerJobBase(aQueue, Type::UpdateJob, aCallback,
-                           aRegistration, nullptr, aScriptSpec)
+                           ServiceWorkerUpdateFinishCallback* aCallback)
+    : ServiceWorkerJobBase(aQueue, Type::UpdateJob, aScope, aScriptSpec,
+                           aCallback, aRegistration, nullptr)
   {
     AssertIsOnMainThread();
   }
@@ -1413,8 +1415,8 @@ private:
     }
 
     RefPtr<ServiceWorkerInstallJob> job =
-      new ServiceWorkerInstallJob(mQueue, mCallback, mRegistration,
-                                  mUpdateAndInstallInfo, mScriptSpec);
+      new ServiceWorkerInstallJob(mQueue, mScope, mScriptSpec, mCallback,
+                                  mRegistration, mUpdateAndInstallInfo);
     mQueue->Append(job);
     Done(NS_OK);
   }
@@ -1713,7 +1715,8 @@ ServiceWorkerManager::Register(nsIDOMWindow* aWindow,
   MOZ_ALWAYS_TRUE(NS_SUCCEEDED(rv));
 
   RefPtr<ServiceWorkerRegisterJob> job =
-    new ServiceWorkerRegisterJob(queue, cleanedScope, spec, cb, documentPrincipal, loadGroup);
+    new ServiceWorkerRegisterJob(queue, cleanedScope, spec, cb,
+                                 documentPrincipal, loadGroup);
   queue->Append(job);
 
   AssertIsOnMainThread();
@@ -3730,8 +3733,8 @@ ServiceWorkerManager::SoftUpdate(const OriginAttributes& aOriginAttributes,
     MOZ_ASSERT(queue);
 
     RefPtr<ServiceWorkerRegisterJob> job =
-      new ServiceWorkerRegisterJob(queue, registration, nullptr,
-                                   newest->ScriptSpec());
+      new ServiceWorkerRegisterJob(queue, registration->mScope,
+                                   newest->ScriptSpec(), registration, nullptr);
     queue->Append(job);
   }
 }
@@ -3782,8 +3785,8 @@ ServiceWorkerManager::Update(nsIPrincipal* aPrincipal,
   // "Invoke Update algorithm, or its equivalent, with client, registration as
   // its argument."
   RefPtr<ServiceWorkerRegisterJob> job =
-    new ServiceWorkerRegisterJob(queue, registration, aCallback,
-                                 newest->ScriptSpec());
+    new ServiceWorkerRegisterJob(queue, registration->mScope,
+                                 newest->ScriptSpec(), registration, aCallback);
   queue->Append(job);
 }
 

From 9af4ff4976ead5a0f316d4670b76ddf7488a6d18 Mon Sep 17 00:00:00 2001
From: Ben Kelly <ben@wanderview.com>
Date: Fri, 18 Dec 2015 11:04:39 -0500
Subject: [PATCH 026/101] Bug 1231974 P3 Store the principal on the
 ServiceWorkerJobBase. r=baku

---
 dom/workers/ServiceWorkerManager.cpp | 51 +++++++++++++++++++---------
 dom/workers/ServiceWorkerManager.h   |  2 +-
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/dom/workers/ServiceWorkerManager.cpp b/dom/workers/ServiceWorkerManager.cpp
index 8d3c6364c96a..1f6b5c0daae4 100644
--- a/dom/workers/ServiceWorkerManager.cpp
+++ b/dom/workers/ServiceWorkerManager.cpp
@@ -946,12 +946,14 @@ class ServiceWorkerJobBase : public ServiceWorkerJob
 public:
   ServiceWorkerJobBase(ServiceWorkerJobQueue* aQueue,
                        ServiceWorkerJob::Type aJobType,
+                       nsIPrincipal* aPrincipal,
                        const nsACString& aScope,
                        const nsACString& aScriptSpec,
                        ServiceWorkerUpdateFinishCallback* aCallback,
                        ServiceWorkerRegistrationInfo* aRegistration,
                        ServiceWorkerInfo* aServiceWorkerInfo)
     : ServiceWorkerJob(aQueue, aJobType)
+    , mPrincipal(aPrincipal)
     , mScope(aScope)
     , mScriptSpec(aScriptSpec)
     , mCallback(aCallback)
@@ -960,6 +962,7 @@ public:
     , mCanceled(false)
   {
     AssertIsOnMainThread();
+    MOZ_ASSERT(aPrincipal);
   }
 
   void
@@ -970,6 +973,7 @@ public:
   }
 
 protected:
+  nsCOMPtr<nsIPrincipal> mPrincipal;
   const nsCString mScope;
   const nsCString mScriptSpec;
   RefPtr<ServiceWorkerUpdateFinishCallback> mCallback;
@@ -1060,13 +1064,15 @@ class ServiceWorkerInstallJob final : public ServiceWorkerJobBase
 
 public:
   ServiceWorkerInstallJob(ServiceWorkerJobQueue* aQueue,
+                          nsIPrincipal* aPrincipal,
                           const nsACString& aScope,
                           const nsACString& aScriptSpec,
                           ServiceWorkerUpdateFinishCallback* aCallback,
                           ServiceWorkerRegistrationInfo* aRegistration,
                           ServiceWorkerInfo* aServiceWorkerInfo)
-    : ServiceWorkerJobBase(aQueue, Type::InstallJob, aScope, aScriptSpec,
-                           aCallback, aRegistration, aServiceWorkerInfo)
+    : ServiceWorkerJobBase(aQueue, Type::InstallJob, aPrincipal, aScope,
+                           aScriptSpec, aCallback, aRegistration,
+                           aServiceWorkerInfo)
   {
     MOZ_ASSERT(aRegistration);
   }
@@ -1196,7 +1202,6 @@ class ServiceWorkerRegisterJob final : public ServiceWorkerJobBase,
 {
   friend class ContinueUpdateRunnable;
 
-  nsCOMPtr<nsIPrincipal> mPrincipal;
   nsCOMPtr<nsILoadGroup> mLoadGroup;
 
   ~ServiceWorkerRegisterJob()
@@ -1207,14 +1212,13 @@ public:
 
   // [[Register]]
   ServiceWorkerRegisterJob(ServiceWorkerJobQueue* aQueue,
+                           nsIPrincipal* aPrincipal,
                            const nsACString& aScope,
                            const nsACString& aScriptSpec,
                            ServiceWorkerUpdateFinishCallback* aCallback,
-                           nsIPrincipal* aPrincipal,
                            nsILoadGroup* aLoadGroup)
-    : ServiceWorkerJobBase(aQueue, Type::RegisterJob, aScope, aScriptSpec,
-                           aCallback, nullptr, nullptr)
-    , mPrincipal(aPrincipal)
+    : ServiceWorkerJobBase(aQueue, Type::RegisterJob, aPrincipal, aScope,
+                           aScriptSpec, aCallback, nullptr, nullptr)
     , mLoadGroup(aLoadGroup)
   {
     AssertIsOnMainThread();
@@ -1224,12 +1228,13 @@ public:
 
   // [[Update]]
   ServiceWorkerRegisterJob(ServiceWorkerJobQueue* aQueue,
+                           nsIPrincipal* aPrincipal,
                            const nsACString& aScope,
                            const nsACString& aScriptSpec,
                            ServiceWorkerRegistrationInfo* aRegistration,
                            ServiceWorkerUpdateFinishCallback* aCallback)
-    : ServiceWorkerJobBase(aQueue, Type::UpdateJob, aScope, aScriptSpec,
-                           aCallback, aRegistration, nullptr)
+    : ServiceWorkerJobBase(aQueue, Type::UpdateJob, aPrincipal, aScope,
+                           aScriptSpec, aCallback, aRegistration, nullptr)
   {
     AssertIsOnMainThread();
   }
@@ -1415,8 +1420,9 @@ private:
     }
 
     RefPtr<ServiceWorkerInstallJob> job =
-      new ServiceWorkerInstallJob(mQueue, mScope, mScriptSpec, mCallback,
-                                  mRegistration, mUpdateAndInstallInfo);
+      new ServiceWorkerInstallJob(mQueue, mPrincipal, mScope, mScriptSpec,
+                                  mCallback, mRegistration,
+                                  mUpdateAndInstallInfo);
     mQueue->Append(job);
     Done(NS_OK);
   }
@@ -1715,8 +1721,8 @@ ServiceWorkerManager::Register(nsIDOMWindow* aWindow,
   MOZ_ALWAYS_TRUE(NS_SUCCEEDED(rv));
 
   RefPtr<ServiceWorkerRegisterJob> job =
-    new ServiceWorkerRegisterJob(queue, cleanedScope, spec, cb,
-                                 documentPrincipal, loadGroup);
+    new ServiceWorkerRegisterJob(queue, documentPrincipal, cleanedScope, spec,
+                                 cb, loadGroup);
   queue->Append(job);
 
   AssertIsOnMainThread();
@@ -3693,10 +3699,23 @@ ServiceWorkerManager::NotifyServiceWorkerRegistrationRemoved(ServiceWorkerRegist
 }
 
 void
-ServiceWorkerManager::SoftUpdate(const OriginAttributes& aOriginAttributes,
+ServiceWorkerManager::SoftUpdate(const PrincipalOriginAttributes& aOriginAttributes,
                                  const nsACString& aScope)
 {
   AssertIsOnMainThread();
+
+  nsCOMPtr<nsIURI> scopeURI;
+  nsresult rv = NS_NewURI(getter_AddRefs(scopeURI), aScope);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return;
+  }
+
+  nsCOMPtr<nsIPrincipal> principal =
+    BasePrincipal::CreateCodebasePrincipal(scopeURI, aOriginAttributes);
+  if (NS_WARN_IF(!principal)) {
+    return;
+  }
+
   nsAutoCString scopeKey;
   aOriginAttributes.CreateSuffix(scopeKey);
 
@@ -3733,7 +3752,7 @@ ServiceWorkerManager::SoftUpdate(const OriginAttributes& aOriginAttributes,
     MOZ_ASSERT(queue);
 
     RefPtr<ServiceWorkerRegisterJob> job =
-      new ServiceWorkerRegisterJob(queue, registration->mScope,
+      new ServiceWorkerRegisterJob(queue, principal, registration->mScope,
                                    newest->ScriptSpec(), registration, nullptr);
     queue->Append(job);
   }
@@ -3785,7 +3804,7 @@ ServiceWorkerManager::Update(nsIPrincipal* aPrincipal,
   // "Invoke Update algorithm, or its equivalent, with client, registration as
   // its argument."
   RefPtr<ServiceWorkerRegisterJob> job =
-    new ServiceWorkerRegisterJob(queue, registration->mScope,
+    new ServiceWorkerRegisterJob(queue, aPrincipal, registration->mScope,
                                  newest->ScriptSpec(), registration, aCallback);
   queue->Append(job);
 }
diff --git a/dom/workers/ServiceWorkerManager.h b/dom/workers/ServiceWorkerManager.h
index 49dadcab9462..aafcf0a1f41d 100644
--- a/dom/workers/ServiceWorkerManager.h
+++ b/dom/workers/ServiceWorkerManager.h
@@ -393,7 +393,7 @@ public:
          ServiceWorkerUpdateFinishCallback* aCallback);
 
   void
-  SoftUpdate(const OriginAttributes& aOriginAttributes,
+  SoftUpdate(const PrincipalOriginAttributes& aOriginAttributes,
              const nsACString& aScope);
 
   void

From 13e36422abb4668317b989eda747c9a17d6d6c5b Mon Sep 17 00:00:00 2001
From: Ben Kelly <ben@wanderview.com>
Date: Fri, 18 Dec 2015 11:04:40 -0500
Subject: [PATCH 027/101] Bug 1231974 P4 Lazy load registration and verify it
 does not change in service worker jobs. r=baku

---
 dom/workers/ServiceWorkerManager.cpp | 120 +++++++++++++++++++++------
 1 file changed, 93 insertions(+), 27 deletions(-)

diff --git a/dom/workers/ServiceWorkerManager.cpp b/dom/workers/ServiceWorkerManager.cpp
index 1f6b5c0daae4..aa44b1eca239 100644
--- a/dom/workers/ServiceWorkerManager.cpp
+++ b/dom/workers/ServiceWorkerManager.cpp
@@ -950,14 +950,12 @@ public:
                        const nsACString& aScope,
                        const nsACString& aScriptSpec,
                        ServiceWorkerUpdateFinishCallback* aCallback,
-                       ServiceWorkerRegistrationInfo* aRegistration,
                        ServiceWorkerInfo* aServiceWorkerInfo)
     : ServiceWorkerJob(aQueue, aJobType)
     , mPrincipal(aPrincipal)
     , mScope(aScope)
     , mScriptSpec(aScriptSpec)
     , mCallback(aCallback)
-    , mRegistration(aRegistration)
     , mUpdateAndInstallInfo(aServiceWorkerInfo)
     , mCanceled(false)
   {
@@ -984,6 +982,38 @@ protected:
   ~ServiceWorkerJobBase()
   { }
 
+  // Ensure that mRegistration is set for the job.  Also, if mRegistration was
+  // already set, ensure that a new registration object has not replaced it in
+  // the ServiceWorkerManager.  This can happen when jobs race such that the
+  // registration is cleared and recreated while an update job is executing.
+  nsresult
+  EnsureAndVerifyRegistration()
+  {
+    AssertIsOnMainThread();
+
+    RefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
+    if (NS_WARN_IF(!swm)) {
+      mRegistration = nullptr;
+      return NS_ERROR_NOT_AVAILABLE;
+    }
+
+    RefPtr<ServiceWorkerRegistrationInfo> registration =
+      swm->GetRegistration(mPrincipal, mScope);
+
+    if (NS_WARN_IF(!registration)) {
+      mRegistration = nullptr;
+      return NS_ERROR_NOT_AVAILABLE;
+    }
+
+    if (NS_WARN_IF(mRegistration && registration != mRegistration)) {
+      mRegistration = nullptr;
+      return NS_ERROR_NOT_AVAILABLE;
+    }
+
+    mRegistration = registration.forget();
+    return NS_OK;
+  }
+
   void
   Succeed()
   {
@@ -1003,7 +1033,6 @@ protected:
   FailWithErrorResult(ErrorResult& aRv)
   {
     AssertIsOnMainThread();
-    MOZ_ASSERT(mRegistration);
 
     // With cancellation support, we may only be running with one reference
     // from another object like a stream loader or something.
@@ -1021,7 +1050,7 @@ protected:
       aRv.SuppressException();
 
       NS_ConvertUTF8toUTF16 scriptSpec(mScriptSpec);
-      NS_ConvertUTF8toUTF16 scope(mRegistration->mScope);
+      NS_ConvertUTF8toUTF16 scope(mScope);
 
       // Throw the type error with a generic error message.
       aRv.ThrowTypeError<MSG_SW_INSTALL_ERROR>(scriptSpec, scope);
@@ -1035,8 +1064,14 @@ protected:
     aRv.SuppressException();
 
     mUpdateAndInstallInfo = nullptr;
+
+    if (!mRegistration) {
+      Done(origStatus);
+      return;
+    }
+
     if (mRegistration->mInstallingWorker) {
-      nsresult rv = serviceWorkerScriptCache::PurgeCache(mRegistration->mPrincipal,
+      nsresult rv = serviceWorkerScriptCache::PurgeCache(mPrincipal,
                                                          mRegistration->mInstallingWorker->CacheName());
       if (NS_FAILED(rv)) {
         NS_WARNING("Failed to purge the installing worker cache.");
@@ -1068,13 +1103,10 @@ public:
                           const nsACString& aScope,
                           const nsACString& aScriptSpec,
                           ServiceWorkerUpdateFinishCallback* aCallback,
-                          ServiceWorkerRegistrationInfo* aRegistration,
                           ServiceWorkerInfo* aServiceWorkerInfo)
     : ServiceWorkerJobBase(aQueue, Type::InstallJob, aPrincipal, aScope,
-                           aScriptSpec, aCallback, aRegistration,
-                           aServiceWorkerInfo)
+                           aScriptSpec, aCallback, aServiceWorkerInfo)
   {
-    MOZ_ASSERT(aRegistration);
   }
 
   void
@@ -1090,10 +1122,15 @@ public:
   Install()
   {
     RefPtr<ServiceWorkerJob> kungFuDeathGrip = this;
+
     if (mCanceled) {
       return Fail(NS_ERROR_DOM_ABORT_ERR);
     }
-    MOZ_ASSERT(mRegistration);
+
+    nsresult rv = EnsureAndVerifyRegistration();
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return Fail(NS_ERROR_DOM_ABORT_ERR);
+    }
 
     // Begin [[Install]] atomic step 3.
     if (mRegistration->mInstallingWorker) {
@@ -1135,8 +1172,8 @@ public:
     // which sends the install event to the worker.
     ServiceWorkerPrivate* workerPrivate =
       mRegistration->mInstallingWorker->WorkerPrivate();
-    nsresult rv = workerPrivate->SendLifeCycleEvent(NS_LITERAL_STRING("install"),
-                                                    callback, failRunnable);
+    rv = workerPrivate->SendLifeCycleEvent(NS_LITERAL_STRING("install"),
+                                           callback, failRunnable);
 
     if (NS_WARN_IF(NS_FAILED(rv))) {
       ContinueAfterInstallEvent(false /* aSuccess */);
@@ -1150,6 +1187,11 @@ public:
       return Done(NS_ERROR_DOM_ABORT_ERR);
     }
 
+    nsresult rv = EnsureAndVerifyRegistration();
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return Fail(NS_ERROR_DOM_ABORT_ERR);
+    }
+
     if (!mRegistration->mInstallingWorker) {
       NS_WARNING("mInstallingWorker was null.");
       return Done(NS_ERROR_DOM_ABORT_ERR);
@@ -1218,7 +1260,7 @@ public:
                            ServiceWorkerUpdateFinishCallback* aCallback,
                            nsILoadGroup* aLoadGroup)
     : ServiceWorkerJobBase(aQueue, Type::RegisterJob, aPrincipal, aScope,
-                           aScriptSpec, aCallback, nullptr, nullptr)
+                           aScriptSpec, aCallback, nullptr)
     , mLoadGroup(aLoadGroup)
   {
     AssertIsOnMainThread();
@@ -1231,10 +1273,9 @@ public:
                            nsIPrincipal* aPrincipal,
                            const nsACString& aScope,
                            const nsACString& aScriptSpec,
-                           ServiceWorkerRegistrationInfo* aRegistration,
                            ServiceWorkerUpdateFinishCallback* aCallback)
     : ServiceWorkerJobBase(aQueue, Type::UpdateJob, aPrincipal, aScope,
-                           aScriptSpec, aCallback, aRegistration, nullptr)
+                           aScriptSpec, aCallback, nullptr)
   {
     AssertIsOnMainThread();
   }
@@ -1254,6 +1295,7 @@ public:
     }
 
     if (mJobType == RegisterJob) {
+      MOZ_ASSERT(!mRegistration);
       mRegistration = swm->GetRegistration(mPrincipal, mScope);
 
       if (mRegistration) {
@@ -1281,10 +1323,19 @@ public:
     } else {
       MOZ_ASSERT(mJobType == UpdateJob);
 
+      nsresult rv = EnsureAndVerifyRegistration();
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        // Do nothing here, but since mRegistration is nullptr we will
+        // trigger the async Fail() call below.
+        MOZ_ASSERT(!mRegistration);
+      }
+
       // If a different script spec has been registered between when this update
       // was scheduled and it running now, then simply abort.
-      RefPtr<ServiceWorkerInfo> newest = mRegistration->Newest();
-      if (newest && !mScriptSpec.Equals(newest->ScriptSpec())) {
+      RefPtr<ServiceWorkerInfo> newest = mRegistration ? mRegistration->Newest()
+                                                       : nullptr;
+      if (!mRegistration ||
+          (newest && !mScriptSpec.Equals(newest->ScriptSpec()))) {
 
         // Done() must always be called async from Start()
         nsCOMPtr<nsIRunnable> runnable =
@@ -1307,6 +1358,7 @@ public:
                    const nsACString& aMaxScope) override
   {
     RefPtr<ServiceWorkerRegisterJob> kungFuDeathGrip = this;
+
     if (NS_WARN_IF(mCanceled)) {
       Fail(NS_ERROR_DOM_ABORT_ERR);
       return;
@@ -1317,6 +1369,11 @@ public:
       return;
     }
 
+    nsresult rv = EnsureAndVerifyRegistration();
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return Fail(NS_ERROR_DOM_ABORT_ERR);
+    }
+
     if (aInCacheAndEqual) {
       Succeed();
       Done(NS_OK);
@@ -1329,7 +1386,7 @@ public:
     RefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
 
     nsCOMPtr<nsIURI> scriptURI;
-    nsresult rv = NS_NewURI(getter_AddRefs(scriptURI), mScriptSpec);
+    rv = NS_NewURI(getter_AddRefs(scriptURI), mScriptSpec);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       Fail(NS_ERROR_DOM_SECURITY_ERR);
       return;
@@ -1402,7 +1459,12 @@ private:
   ContinueInstall(bool aScriptEvaluationResult)
   {
     AssertIsOnMainThread();
-    MOZ_ASSERT(mRegistration);
+
+    nsresult rv = EnsureAndVerifyRegistration();
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return Fail(NS_ERROR_DOM_ABORT_ERR);
+    }
+
     mRegistration->mUpdating = false;
 
     RefPtr<ServiceWorkerRegisterJob> kungFuDeathGrip = this;
@@ -1421,8 +1483,7 @@ private:
 
     RefPtr<ServiceWorkerInstallJob> job =
       new ServiceWorkerInstallJob(mQueue, mPrincipal, mScope, mScriptSpec,
-                                  mCallback, mRegistration,
-                                  mUpdateAndInstallInfo);
+                                  mCallback, mUpdateAndInstallInfo);
     mQueue->Append(job);
     Done(NS_OK);
   }
@@ -1449,10 +1510,16 @@ private:
   {
     AssertIsOnMainThread();
     RefPtr<ServiceWorkerRegisterJob> kungFuDeathGrip = this;
+
     if (mCanceled) {
       return Fail(NS_ERROR_DOM_ABORT_ERR);
     }
 
+    nsresult rv = EnsureAndVerifyRegistration();
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return Fail(NS_ERROR_DOM_ABORT_ERR);
+    }
+
     if (mRegistration->mInstallingWorker) {
       mRegistration->mInstallingWorker->UpdateState(ServiceWorkerState::Redundant);
       mRegistration->mInstallingWorker->WorkerPrivate()->TerminateWorker();
@@ -1469,10 +1536,9 @@ private:
       cacheName = workerInfo->CacheName();
     }
 
-    nsresult rv =
-      serviceWorkerScriptCache::Compare(mRegistration, mRegistration->mPrincipal, cacheName,
-                                        NS_ConvertUTF8toUTF16(mScriptSpec), this,
-                                        mLoadGroup);
+    rv = serviceWorkerScriptCache::Compare(mRegistration, mPrincipal, cacheName,
+                                           NS_ConvertUTF8toUTF16(mScriptSpec),
+                                           this, mLoadGroup);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return Fail(rv);
     }
@@ -3753,7 +3819,7 @@ ServiceWorkerManager::SoftUpdate(const PrincipalOriginAttributes& aOriginAttribu
 
     RefPtr<ServiceWorkerRegisterJob> job =
       new ServiceWorkerRegisterJob(queue, principal, registration->mScope,
-                                   newest->ScriptSpec(), registration, nullptr);
+                                   newest->ScriptSpec(), nullptr);
     queue->Append(job);
   }
 }
@@ -3805,7 +3871,7 @@ ServiceWorkerManager::Update(nsIPrincipal* aPrincipal,
   // its argument."
   RefPtr<ServiceWorkerRegisterJob> job =
     new ServiceWorkerRegisterJob(queue, aPrincipal, registration->mScope,
-                                 newest->ScriptSpec(), registration, aCallback);
+                                 newest->ScriptSpec(), aCallback);
   queue->Append(job);
 }
 

From 866d26fe7589155d151b10ac7c6d7dac1186c618 Mon Sep 17 00:00:00 2001
From: Ben Kelly <ben@wanderview.com>
Date: Fri, 18 Dec 2015 11:04:40 -0500
Subject: [PATCH 028/101] Bug 1231974 P5 Re-enable
 unregister-then-register-new-script.https.html. r=baku

---
 .../unregister-then-register-new-script.https.html.ini       | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 testing/web-platform/mozilla/meta/service-workers/service-worker/unregister-then-register-new-script.https.html.ini

diff --git a/testing/web-platform/mozilla/meta/service-workers/service-worker/unregister-then-register-new-script.https.html.ini b/testing/web-platform/mozilla/meta/service-workers/service-worker/unregister-then-register-new-script.https.html.ini
deleted file mode 100644
index d09035f56a35..000000000000
--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/unregister-then-register-new-script.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[unregister-then-register-new-script.https.html]
-  type: testharness
-  [Registering a new script URL while an unregistered registration is in use]
-    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1231974
-

From 113be0f30a13b849f9dc796703ecea48deafedf8 Mon Sep 17 00:00:00 2001
From: Ben Kelly <ben@wanderview.com>
Date: Fri, 18 Dec 2015 11:04:40 -0500
Subject: [PATCH 029/101] Bug 1231974 P6 Abort update-triggered install jobs if
 the service worker script has changed. r=baku

---
 dom/workers/ServiceWorkerManager.cpp | 37 ++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/dom/workers/ServiceWorkerManager.cpp b/dom/workers/ServiceWorkerManager.cpp
index aa44b1eca239..dc0760de8a22 100644
--- a/dom/workers/ServiceWorkerManager.cpp
+++ b/dom/workers/ServiceWorkerManager.cpp
@@ -1098,14 +1098,21 @@ class ServiceWorkerInstallJob final : public ServiceWorkerJobBase
   friend class ContinueInstallTask;
 
 public:
+  enum InstallType {
+    UpdateSameScript,
+    OverwriteScript
+  };
+
   ServiceWorkerInstallJob(ServiceWorkerJobQueue* aQueue,
                           nsIPrincipal* aPrincipal,
                           const nsACString& aScope,
                           const nsACString& aScriptSpec,
                           ServiceWorkerUpdateFinishCallback* aCallback,
-                          ServiceWorkerInfo* aServiceWorkerInfo)
+                          ServiceWorkerInfo* aServiceWorkerInfo,
+                          InstallType aType)
     : ServiceWorkerJobBase(aQueue, Type::InstallJob, aPrincipal, aScope,
                            aScriptSpec, aCallback, aServiceWorkerInfo)
+    , mType(aType)
   {
   }
 
@@ -1132,6 +1139,16 @@ public:
       return Fail(NS_ERROR_DOM_ABORT_ERR);
     }
 
+    // If we are trying to install an update for an existing script, then
+    // make sure we don't overwrite a recent script change or resurrect a
+    // dead registration.
+    if (mType == UpdateSameScript) {
+      RefPtr<ServiceWorkerInfo> newest = mRegistration->Newest();
+      if (!newest || !mScriptSpec.Equals(newest->ScriptSpec())) {
+        return Fail(NS_ERROR_DOM_ABORT_ERR);
+      }
+    }
+
     // Begin [[Install]] atomic step 3.
     if (mRegistration->mInstallingWorker) {
       mRegistration->mInstallingWorker->UpdateState(ServiceWorkerState::Redundant);
@@ -1237,6 +1254,9 @@ public:
     // Activate() is invoked out of band of atomic.
     mRegistration->TryToActivate();
   }
+
+private:
+  const InstallType mType;
 };
 
 class ServiceWorkerRegisterJob final : public ServiceWorkerJobBase,
@@ -1481,9 +1501,22 @@ private:
       return FailWithErrorResult(error);
     }
 
+    // For updates we want to make sure our install job does not end up
+    // changing the script for the registration.  Since a registration
+    // script change can be queued in an install job, we can not
+    // conclusively verify that the update install should proceed here.
+    // Instead, we have to pass a flag into our install job indicating
+    // if a script change is allowed or not.  This can then be used to
+    // check the current script after all previous install jobs have been
+    // flushed.
+    ServiceWorkerInstallJob::InstallType installType =
+      mJobType == UpdateJob ? ServiceWorkerInstallJob::UpdateSameScript
+                            : ServiceWorkerInstallJob::OverwriteScript;
+
     RefPtr<ServiceWorkerInstallJob> job =
       new ServiceWorkerInstallJob(mQueue, mPrincipal, mScope, mScriptSpec,
-                                  mCallback, mUpdateAndInstallInfo);
+                                  mCallback, mUpdateAndInstallInfo,
+                                  installType);
     mQueue->Append(job);
     Done(NS_OK);
   }

From c0b2a6dda83b649d4f683962055e408b70116248 Mon Sep 17 00:00:00 2001
From: Ben Kelly <ben@wanderview.com>
Date: Fri, 18 Dec 2015 11:04:40 -0500
Subject: [PATCH 030/101] Bug 1232444 Only store service worker registrations
 after install is successful. r=baku

---
 dom/workers/ServiceWorkerManager.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dom/workers/ServiceWorkerManager.cpp b/dom/workers/ServiceWorkerManager.cpp
index dc0760de8a22..3a90cc1ac698 100644
--- a/dom/workers/ServiceWorkerManager.cpp
+++ b/dom/workers/ServiceWorkerManager.cpp
@@ -1242,6 +1242,7 @@ public:
     mRegistration->mWaitingWorker = mRegistration->mInstallingWorker.forget();
     mRegistration->mWaitingWorker->UpdateState(ServiceWorkerState::Installed);
     mRegistration->NotifyListenersOnChange();
+    swm->StoreRegistration(mPrincipal, mRegistration);
     swm->InvalidateServiceWorkerRegistrationWorker(mRegistration,
                                                    WhichServiceWorker::INSTALLING_WORKER | WhichServiceWorker::WAITING_WORKER);
 
@@ -1322,7 +1323,6 @@ public:
         mRegistration->mPendingUninstall = false;
         RefPtr<ServiceWorkerInfo> newest = mRegistration->Newest();
         if (newest && mScriptSpec.Equals(newest->ScriptSpec())) {
-          swm->StoreRegistration(mPrincipal, mRegistration);
           Succeed();
 
           // Done() must always be called async from Start()
@@ -1338,8 +1338,6 @@ public:
       } else {
         mRegistration = swm->CreateNewRegistration(mScope, mPrincipal);
       }
-
-      swm->StoreRegistration(mPrincipal, mRegistration);
     } else {
       MOZ_ASSERT(mJobType == UpdateJob);
 

From 92878f1e77728813766d721d1d1c72d013d6433a Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Fri, 18 Dec 2015 11:15:10 -0500
Subject: [PATCH 031/101] Backout 62dab36901e2 and 9b4445c0f202 (bug 1232458)
 for Windows bustage; r=me

---
 mozglue/build/WindowsDllBlocklist.cpp | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/mozglue/build/WindowsDllBlocklist.cpp b/mozglue/build/WindowsDllBlocklist.cpp
index 7e0b61775b15..de47976cc9fc 100644
--- a/mozglue/build/WindowsDllBlocklist.cpp
+++ b/mozglue/build/WindowsDllBlocklist.cpp
@@ -16,7 +16,6 @@
 #include "nsAutoPtr.h"
 
 #include "nsWindowsDllInterceptor.h"
-#include "mozilla/UniquePtrExtensions.h"
 #include "mozilla/WindowsVersion.h"
 #include "nsWindowsHelpers.h"
 
@@ -479,8 +478,8 @@ DllBlockSet::Write(HANDLE file)
   ::LeaveCriticalSection(&sLock);
 }
 
-static UniquePtr<wchar_t[]>
-getFullPath (PWCHAR filePath, wchar_t* fname)
+static
+wchar_t* getFullPath (PWCHAR filePath, wchar_t* fname)
 {
   // In Windows 8, the first parameter seems to be used for more than just the
   // path name.  For example, its numerical value can be 1.  Passing a non-valid
@@ -495,14 +494,14 @@ getFullPath (PWCHAR filePath, wchar_t* fname)
     return nullptr;
   }
 
-  auto full_fname = MakeUniqueFallible<wchar_t[]>(pathlen+1);
+  wchar_t* full_fname = new wchar_t[pathlen+1];
   if (!full_fname) {
     // couldn't allocate memory?
     return nullptr;
   }
 
   // now actually grab it
-  SearchPathW(sanitizedFilePath, fname, L".dll", pathlen + 1, full_fname.get(),
+  SearchPathW(sanitizedFilePath, fname, L".dll", pathlen + 1, full_fname,
               nullptr);
   return full_fname;
 }
@@ -530,7 +529,7 @@ patched_LdrLoadDll (PWCHAR filePath, PULONG flags, PUNICODE_STRING moduleFileNam
 
   int len = moduleFileName->Length / 2;
   wchar_t *fname = moduleFileName->Buffer;
-  UniquePtr<wchar_t[]> full_fname;
+  nsAutoArrayPtr<wchar_t> full_fname;
 
   // The filename isn't guaranteed to be null terminated, but in practice
   // it always will be; ensure that this is so, and bail if not.
@@ -653,23 +652,23 @@ patched_LdrLoadDll (PWCHAR filePath, PULONG flags, PUNICODE_STRING moduleFileNam
       }
 
       if (info->flags & DllBlockInfo::USE_TIMESTAMP) {
-        fVersion = GetTimestamp(full_fname.get());
+        fVersion = GetTimestamp(full_fname);
         if (fVersion > info->maxVersion) {
           load_ok = true;
         }
       } else {
         DWORD zero;
-        DWORD infoSize = GetFileVersionInfoSizeW(full_fname.get(), &zero);
+        DWORD infoSize = GetFileVersionInfoSizeW(full_fname, &zero);
 
         // If we failed to get the version information, we block.
 
         if (infoSize != 0) {
-          auto infoData = MakeUnique<unsigned char[]>(infoSize);
+          nsAutoArrayPtr<unsigned char> infoData(new unsigned char[infoSize]);
           VS_FIXEDFILEINFO *vInfo;
           UINT vInfoLen;
 
-          if (GetFileVersionInfoW(full_fname.get(), 0, infoSize, infoData.get()) &&
-              VerQueryValueW(infoData.get(), L"\\", (LPVOID*) &vInfo, &vInfoLen))
+          if (GetFileVersionInfoW(full_fname, 0, infoSize, infoData) &&
+              VerQueryValueW(infoData, L"\\", (LPVOID*) &vInfo, &vInfoLen))
           {
             fVersion =
               ((unsigned long long)vInfo->dwFileVersionMS) << 32 |
@@ -705,7 +704,7 @@ continue_loading:
       return STATUS_DLL_NOT_FOUND;
     }
 
-    if (IsVistaOrLater() && !CheckASLR(full_fname.get())) {
+    if (IsVistaOrLater() && !CheckASLR(full_fname)) {
       printf_stderr("LdrLoadDll: Blocking load of '%s'.  XPCOM components must support ASLR.\n", dllName);
       return STATUS_DLL_NOT_FOUND;
     }

From 205a7b8ebb2d51abb208114d25f8eac6bd7f6aaa Mon Sep 17 00:00:00 2001
From: Mason Chang <mchang@mozilla.com>
Date: Fri, 18 Dec 2015 08:32:21 -0800
Subject: [PATCH 032/101] Bug 1233576. Ensure vsync timestamps are monotonic on
 Windows 10. r=kats

---
 gfx/thebes/gfxWindowsPlatform.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp
index 99ee4466daee..5b8172b135d6 100755
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -2901,6 +2901,11 @@ public:
         LARGE_INTEGER frequency;
         QueryPerformanceFrequency(&frequency);
         TimeStamp vsync = TimeStamp::Now();
+        // On Windows 10, DwmGetCompositionInfo returns the upcoming vsync.
+        // See GetAdjustedVsyncTimestamp.
+        // On start, set mPrevVsync to the "next" vsync
+        // So we'll use this timestamp on the 2nd loop iteration.
+        mPrevVsync = vsync + mSoftwareVsyncRate;
 
         for (;;) {
           { // scope lock

From c7edced5284be695ef8e9ab3046d39000e399b2f Mon Sep 17 00:00:00 2001
From: Andrea Marchesini <amarchesini@mozilla.com>
Date: Fri, 18 Dec 2015 16:51:07 +0000
Subject: [PATCH 033/101] Bug 1233654 - MInor styling issues in about:profiles,
 r=alfredkayser

---
 toolkit/themes/shared/aboutProfiles.css | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/toolkit/themes/shared/aboutProfiles.css b/toolkit/themes/shared/aboutProfiles.css
index 61bbe8218032..ab54ff044e84 100644
--- a/toolkit/themes/shared/aboutProfiles.css
+++ b/toolkit/themes/shared/aboutProfiles.css
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 html {
-  --aboutSupport-table-background: #ebebeb;
+  --aboutProfiles-table-background: #ebebeb;
   background-color: var(--in-content-page-background);
 }
 
@@ -21,7 +21,7 @@ button {
 }
 
 table {
-  background-color: var(--aboutSupport-table-background);
+  background-color: var(--aboutProfiles-table-background);
   color: var(--in-content-text-color);
   font: message-box;
   text-align: start;
@@ -33,10 +33,10 @@ table {
 th, td {
   border: 1px solid var(--in-content-border-color);
   padding: 4px;
+  text-align: start;
 }
 
 th {
-  text-align: start;
   background-color: var(--in-content-table-header-background);
   color: var(--in-content-selected-text);
 }
@@ -47,12 +47,11 @@ th.column {
 }
 
 td {
-  text-align: start;
   border-color: var(--in-content-table-border-dark-color);
 }
 
 #action-box {
-  background-color: var(--aboutSupport-table-background);
+  background-color: var(--aboutProfiles-table-background);
   border: 1px solid var(--in-content-border-color);
   color: var(--in-content-text-color);
   float: right;
@@ -68,10 +67,6 @@ td {
   float: left;
 }
 
-#reset-box > h3 {
-  margin-top: 0;
-}
-
 #action-box button {
   display: block;
 }

From d233600c4d0dacaf1bf25973f22563ba75b60ea5 Mon Sep 17 00:00:00 2001
From: Andrea Marchesini <amarchesini@mozilla.com>
Date: Fri, 18 Dec 2015 16:57:02 +0000
Subject: [PATCH 034/101] Bug 1233079 - Current profile is not correctly
 selected in about:profiles?manage, r=ehsan

---
 toolkit/content/aboutProfiles.js | 39 +++++++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/toolkit/content/aboutProfiles.js b/toolkit/content/aboutProfiles.js
index 760a0c60849b..462c248118d9 100644
--- a/toolkit/content/aboutProfiles.js
+++ b/toolkit/content/aboutProfiles.js
@@ -21,6 +21,37 @@ const gManage = window.location.href.indexOf('?manage') != -1;
 const bundle = Services.strings.createBundle(
   'chrome://global/locale/aboutProfiles.properties');
 
+// nsIToolkitProfileService.selectProfile can be used only during the selection
+// of the profile in the ProfileManager. If we are showing about:profiles in a
+// tab, the selectedProfile returns the default profile.
+// In this function we use the ProfD to find the current profile.
+function findCurrentProfile() {
+  let cpd;
+  try {
+    cpd = Cc["@mozilla.org/file/directory_service;1"]
+            .getService(Ci.nsIProperties)
+            .get("ProfD", Ci.nsIFile);
+  } catch(e) {}
+
+  if (cpd) {
+    let itr = ProfileService.profiles;
+    while(itr.hasMoreElements()) {
+      let profile = itr.getNext().QueryInterface(Ci.nsIToolkitProfile);
+      if (profile.rootDir.path == cpd.path) {
+        return profile;
+      }
+    }
+  }
+
+  // selectedProfile can trow if nothing is selected or if the selected profile
+  // has been deleted.
+  try {
+    return ProfileService.selectedProfile;
+  } catch(e) {
+    return null;
+  }
+}
+
 function refreshUI() {
   if (gManage) {
     document.getElementById('action-box').style.display = 'none';
@@ -31,12 +62,14 @@ function refreshUI() {
     parent.removeChild(parent.firstChild);
   }
 
+  let currentProfile = findCurrentProfile() || ProfileService.defaultProfile;
+
   let iter = ProfileService.profiles;
   while (iter.hasMoreElements()) {
     let profile = iter.getNext().QueryInterface(Ci.nsIToolkitProfile);
     display({ profile: profile,
               isDefault: profile == ProfileService.defaultProfile,
-              isCurrentProfile: !gManage && profile == ProfileService.selectedProfile });
+              isCurrentProfile: profile == currentProfile });
   }
 
   let createButton = document.getElementById('create-button');
@@ -66,7 +99,7 @@ function display(profileData) {
   name.appendChild(document.createTextNode(nameStr));
   div.appendChild(name);
 
-  if (profileData.isCurrentProfile) {
+  if (!gManage && profileData.isCurrentProfile) {
     let currentProfile = document.createElement('h3');
     let currentProfileStr = bundle.GetStringFromName('currentProfile');
     currentProfile.appendChild(document.createTextNode(currentProfileStr));
@@ -129,7 +162,7 @@ function display(profileData) {
   };
   div.appendChild(renameButton);
 
-  if (!profileData.isCurrentProfile) {
+  if (gManage || !profileData.isCurrentProfile) {
     let removeButton = document.createElement('button');
     removeButton.appendChild(document.createTextNode(bundle.GetStringFromName('remove')));
     removeButton.onclick = function() {

From c24cce8cb660fbcf5c8be746b250aace8cc7af92 Mon Sep 17 00:00:00 2001
From: Andrea Marchesini <amarchesini@mozilla.com>
Date: Fri, 18 Dec 2015 16:58:31 +0000
Subject: [PATCH 035/101] Bug 1233016 - about:profiles should handle errors
 when the defaultProfile is not set, r=ehsan

---
 toolkit/content/aboutProfiles.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/toolkit/content/aboutProfiles.js b/toolkit/content/aboutProfiles.js
index 462c248118d9..8ce11b1e7f16 100644
--- a/toolkit/content/aboutProfiles.js
+++ b/toolkit/content/aboutProfiles.js
@@ -62,13 +62,18 @@ function refreshUI() {
     parent.removeChild(parent.firstChild);
   }
 
-  let currentProfile = findCurrentProfile() || ProfileService.defaultProfile;
+  let defaultProfile;
+  try {
+    defaultProfile = ProfileService.defaultProfile;
+  } catch(e) {}
+
+  let currentProfile = findCurrentProfile() || defaultProfile;
 
   let iter = ProfileService.profiles;
   while (iter.hasMoreElements()) {
     let profile = iter.getNext().QueryInterface(Ci.nsIToolkitProfile);
     display({ profile: profile,
-              isDefault: profile == ProfileService.defaultProfile,
+              isDefault: profile == defaultProfile,
               isCurrentProfile: profile == currentProfile });
   }
 

From fc0b454f92a4f77b56c922609a8b9393557268fe Mon Sep 17 00:00:00 2001
From: Sebastian Hengst <archaeopteryx@coole-files.de>
Date: Fri, 18 Dec 2015 19:44:12 +0100
Subject: [PATCH 036/101] Backed out changesets b34d80ec0e6c, b11446d7201f (bug
 1233726) for W(1) failures. r=backout

--HG--
rename : testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction-xhtml.xhtml => testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction.xhtml
rename : testing/web-platform/tests/dom/nodes/Document-getElementsByTagName-xhtml.xhtml => testing/web-platform/tests/dom/nodes/Document-getElementsByTagName.xhtml
rename : testing/web-platform/tests/dom/nodes/DocumentType-literal-xhtml.xhtml => testing/web-platform/tests/dom/nodes/DocumentType-literal.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-childElement-null-svg.svg => testing/web-platform/tests/dom/nodes/Element-childElement-null.svg
rename : testing/web-platform/tests/dom/nodes/Element-childElement-null-xhtml.xhtml => testing/web-platform/tests/dom/nodes/Element-childElement-null.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add-svg.svg => testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add.svg
rename : testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add-xhtml.xhtml => testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove-svg.svg => testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove.svg
rename : testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove-xhtml.xhtml => testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild-svg.svg => testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild.svg
rename : testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild-xhtml.xhtml => testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-childElementCount-svg.svg => testing/web-platform/tests/dom/nodes/Element-childElementCount.svg
rename : testing/web-platform/tests/dom/nodes/Element-childElementCount-xhtml.xhtml => testing/web-platform/tests/dom/nodes/Element-childElementCount.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-firstElementChild-entity-xhtml.xhtml => testing/web-platform/tests/dom/nodes/Element-firstElementChild-entity.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace-svg.svg => testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace.svg
rename : testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace-xhtml.xhtml => testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-firstElementChild-svg.svg => testing/web-platform/tests/dom/nodes/Element-firstElementChild.svg
rename : testing/web-platform/tests/dom/nodes/Element-firstElementChild-xhtml.xhtml => testing/web-platform/tests/dom/nodes/Element-firstElementChild.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-lastElementChild-svg.svg => testing/web-platform/tests/dom/nodes/Element-lastElementChild.svg
rename : testing/web-platform/tests/dom/nodes/Element-lastElementChild-xhtml.xhtml => testing/web-platform/tests/dom/nodes/Element-lastElementChild.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-nextElementSibling-svg.svg => testing/web-platform/tests/dom/nodes/Element-nextElementSibling.svg
rename : testing/web-platform/tests/dom/nodes/Element-nextElementSibling-xhtml.xhtml => testing/web-platform/tests/dom/nodes/Element-nextElementSibling.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-previousElementSibling-svg.svg => testing/web-platform/tests/dom/nodes/Element-previousElementSibling.svg
rename : testing/web-platform/tests/dom/nodes/Element-previousElementSibling-xhtml.xhtml => testing/web-platform/tests/dom/nodes/Element-previousElementSibling.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-siblingElement-null-svg.svg => testing/web-platform/tests/dom/nodes/Element-siblingElement-null.svg
rename : testing/web-platform/tests/dom/nodes/Element-siblingElement-null-xhtml.xhtml => testing/web-platform/tests/dom/nodes/Element-siblingElement-null.xhtml
rename : testing/web-platform/tests/dom/nodes/Node-nodeName-xhtml.xhtml => testing/web-platform/tests/dom/nodes/Node-nodeName.xhtml
rename : testing/web-platform/tests/dom/nodes/ParentNode-querySelector-All-xht.xht => testing/web-platform/tests/dom/nodes/ParentNode-querySelector-All.xht
rename : testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case-xhtml.xhtml => testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.xhtml
rename : testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id-xhtml.xhtml => testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.xhtml
rename : testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace-xhtml.xhtml => testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.xhtml
rename : testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements-xhtml.xhtml => testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.xhtml
rename : testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef-xhtml.xhtml => testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.xhtml
rename : testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param-xhtml.xhtml => testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.xhtml
rename : testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-event-xhtml.xhtml => testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-event.xhtml
rename : testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text-xhtml.xhtml => testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text.xhtml
rename : testing/web-platform/tests/url/a-element-xhtml.xhtml => testing/web-platform/tests/url/a-element.xhtml
---
 .../meta/FileAPI/idlharness.worker.js.ini     |  138 -
 testing/web-platform/meta/MANIFEST.json       |  277 +-
 .../media-src-redir-bug.sub.html.ini          |   21 -
 ...creating_browsing_context_test_01.html.ini |    2 +-
 .../unknown-element.html.ini                  |    1 +
 .../meta/html/dom/interfaces.html.ini         |   75 -
 .../current-pixel-density/basic.html.ini      |   22 +-
 .../bdi-neutral-number.html.ini               |    4 -
 testing/web-platform/meta/mozilla-sync        |    2 +-
 .../attribute-case/semantics.html.ini         |  198 --
 .../attribute-case/syntax.html.ini            |   36 -
 .../web-platform/meta/svg/interfaces.html.ini | 2450 -----------------
 .../meta/url/a-element-xhtml.xhtml.ini        |  488 ----
 .../web-platform/meta/url/interfaces.html.ini |    1 -
 .../webgl/compressedTexSubImage2D.html.ini    |    6 -
 .../meta/webvtt/interfaces.html.ini           |    3 -
 .../underline_timestamp_past.html.ini         |    3 +-
 .../battery-created-manual.html               |   54 +
 .../tests/conformance-checkers/messages.json  | 1582 +++++------
 .../media-src/media-src-redir-bug.sub.html    |   66 -
 .../media-src-redir-bug.sub.html.sub.headers  |    6 -
 ...ocument-createProcessingInstruction.xhtml} |    0
 ...ml => Document-getElementsByTagName.xhtml} |    0
 ...xhtml.xhtml => DocumentType-literal.xhtml} |    0
 ...-svg.svg => Element-childElement-null.svg} |    0
 ....xhtml => Element-childElement-null.xhtml} |    0
 ...Element-childElementCount-dynamic-add.svg} |    0
 ...ement-childElementCount-dynamic-add.xhtml} |    0
 ...ment-childElementCount-dynamic-remove.svg} |    0
 ...nt-childElementCount-dynamic-remove.xhtml} |    0
 ... => Element-childElementCount-nochild.svg} |    0
 ...> Element-childElementCount-nochild.xhtml} |    0
 ...-svg.svg => Element-childElementCount.svg} |    0
 ....xhtml => Element-childElementCount.xhtml} |    0
 ...=> Element-firstElementChild-entity.xhtml} |    0
 ...> Element-firstElementChild-namespace.svg} |    0
 ...Element-firstElementChild-namespace.xhtml} |    0
 ...-svg.svg => Element-firstElementChild.svg} |    0
 ....xhtml => Element-firstElementChild.xhtml} |    0
 ...d-svg.svg => Element-lastElementChild.svg} |    0
 ...l.xhtml => Element-lastElementChild.xhtml} |    0
 ...svg.svg => Element-nextElementSibling.svg} |    0
 ...xhtml => Element-nextElementSibling.xhtml} |    0
 ...svg => Element-previousElementSibling.svg} |    0
 ...l => Element-previousElementSibling.xhtml} |    0
 ...vg.svg => Element-siblingElement-null.svg} |    0
 ...html => Element-siblingElement-null.xhtml} |    0
 ...deName-xhtml.xhtml => Node-nodeName.xhtml} |    0
 ...t.xht => ParentNode-querySelector-All.xht} |    0
 ... => document.getElementsByName-case.xhtml} |    0
 ...ml => document.getElementsByName-id.xhtml} |    0
 ...ocument.getElementsByName-namespace.xhtml} |    0
 ...ument.getElementsByName-newelements.xhtml} |    0
 ...cument.getElementsByName-null-undef.xhtml} |    0
 ...=> document.getElementsByName-param.xhtml} |    0
 .../document-color-02.html                    |    6 -
 .../document-color-03.html                    |    6 -
 .../current-pixel-density/basic.html          |    8 +-
 .../the-input-element/maxlength-manual.html   |   37 -
 .../forms/the-input-element/maxlength.html    |   55 -
 ...ent-xhtml.xhtml => script-for-event.xhtml} |    0
 ...ipt-text-xhtml.xhtml => script-text.xhtml} |    0
 .../tests/html/syntax/parsing/README          |    2 +-
 .../tests/html/syntax/parsing/test.js         |   17 +-
 .../web-platform/tests/resources/docs/api.md  |    2 +-
 .../tests/resources/idlharness.js             |   24 -
 .../tests/resources/webidl2/README.md         |   39 +-
 .../tests/resources/webidl2/lib/webidl2.js    |   76 +-
 .../tests/resources/webidl2/package.json      |   10 +-
 .../test/invalid/idl/maplike-1type.widl       |    3 +
 .../test/invalid/idl/readonly-iterable.widl   |    3 +
 .../test/invalid/idl/setlike-2types.widl      |    3 +
 .../test/invalid/idl/typedef-nested.widl      |   22 +
 .../test/invalid/json/maplike-1type.json      |    4 +
 .../test/invalid/json/readonly-iterable.json  |    4 +
 .../test/invalid/json/setlike-2types.json     |    4 +
 .../test/invalid/json/typedef-nested.json     |    4 +
 .../tests/resources/webidl2/test/syntax.js    |    7 +-
 .../webidl2/test/syntax/idl/callback.widl     |    4 +-
 .../webidl2/test/syntax/idl/enum.widl         |    4 +-
 .../test/syntax/idl/extended-attributes.widl  |    6 +
 .../webidl2/test/syntax/idl/iterable.widl     |    7 +
 .../test/syntax/idl/legacyiterable.widl       |    3 +
 .../webidl2/test/syntax/idl/maplike.widl      |    7 +
 .../webidl2/test/syntax/idl/setlike.widl      |    7 +
 .../test/syntax/idl/typedef-nested.widl       |   22 +
 .../webidl2/test/syntax/json/callback.json    |   43 +
 .../webidl2/test/syntax/json/enum.json        |   10 +
 .../test/syntax/json/extended-attributes.json |   30 +
 .../webidl2/test/syntax/json/iterable.json    |   55 +
 .../test/syntax/json/legacyiterable.json      |   24 +
 .../webidl2/test/syntax/json/maplike.json     |   67 +
 .../webidl2/test/syntax/json/setlike.json     |   47 +
 .../test/syntax/json/typedef-nested.json      |  226 ++
 .../test/syntax/opt/typedef-nested.json       |    3 +
 .../attribute-case/semantics.html             |   22 +-
 .../attribute-case/syntax.html                |    2 -
 .../web-platform/tests/svg/interfaces.html    | 1568 -----------
 .../web-platform/tests/tools/manifest/item.py |   10 +-
 .../tests/tools/manifest/manifest.py          |   14 +-
 .../tests/tools/manifest/utils.py             |    6 -
 ...{a-element-xhtml.xhtml => a-element.xhtml} |    0
 .../tests/webgl/compressedTexSubImage2D.html  |    2 +
 103 files changed, 1767 insertions(+), 6193 deletions(-)
 delete mode 100644 testing/web-platform/meta/content-security-policy/media-src/media-src-redir-bug.sub.html.ini
 delete mode 100644 testing/web-platform/meta/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number.html.ini
 delete mode 100644 testing/web-platform/meta/svg/interfaces.html.ini
 delete mode 100644 testing/web-platform/meta/url/a-element-xhtml.xhtml.ini
 create mode 100644 testing/web-platform/tests/battery-status/battery-created-manual.html
 delete mode 100644 testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html
 delete mode 100644 testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html.sub.headers
 rename testing/web-platform/tests/dom/nodes/{Document-createProcessingInstruction-xhtml.xhtml => Document-createProcessingInstruction.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Document-getElementsByTagName-xhtml.xhtml => Document-getElementsByTagName.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{DocumentType-literal-xhtml.xhtml => DocumentType-literal.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElement-null-svg.svg => Element-childElement-null.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElement-null-xhtml.xhtml => Element-childElement-null.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElementCount-dynamic-add-svg.svg => Element-childElementCount-dynamic-add.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElementCount-dynamic-add-xhtml.xhtml => Element-childElementCount-dynamic-add.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElementCount-dynamic-remove-svg.svg => Element-childElementCount-dynamic-remove.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElementCount-dynamic-remove-xhtml.xhtml => Element-childElementCount-dynamic-remove.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElementCount-nochild-svg.svg => Element-childElementCount-nochild.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElementCount-nochild-xhtml.xhtml => Element-childElementCount-nochild.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElementCount-svg.svg => Element-childElementCount.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElementCount-xhtml.xhtml => Element-childElementCount.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-firstElementChild-entity-xhtml.xhtml => Element-firstElementChild-entity.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-firstElementChild-namespace-svg.svg => Element-firstElementChild-namespace.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-firstElementChild-namespace-xhtml.xhtml => Element-firstElementChild-namespace.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-firstElementChild-svg.svg => Element-firstElementChild.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-firstElementChild-xhtml.xhtml => Element-firstElementChild.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-lastElementChild-svg.svg => Element-lastElementChild.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-lastElementChild-xhtml.xhtml => Element-lastElementChild.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-nextElementSibling-svg.svg => Element-nextElementSibling.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-nextElementSibling-xhtml.xhtml => Element-nextElementSibling.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-previousElementSibling-svg.svg => Element-previousElementSibling.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-previousElementSibling-xhtml.xhtml => Element-previousElementSibling.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-siblingElement-null-svg.svg => Element-siblingElement-null.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-siblingElement-null-xhtml.xhtml => Element-siblingElement-null.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Node-nodeName-xhtml.xhtml => Node-nodeName.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{ParentNode-querySelector-All-xht.xht => ParentNode-querySelector-All.xht} (100%)
 rename testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/{document.getElementsByName-case-xhtml.xhtml => document.getElementsByName-case.xhtml} (100%)
 rename testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/{document.getElementsByName-id-xhtml.xhtml => document.getElementsByName-id.xhtml} (100%)
 rename testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/{document.getElementsByName-namespace-xhtml.xhtml => document.getElementsByName-namespace.xhtml} (100%)
 rename testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/{document.getElementsByName-newelements-xhtml.xhtml => document.getElementsByName-newelements.xhtml} (100%)
 rename testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/{document.getElementsByName-null-undef-xhtml.xhtml => document.getElementsByName-null-undef.xhtml} (100%)
 rename testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/{document.getElementsByName-param-xhtml.xhtml => document.getElementsByName-param.xhtml} (100%)
 delete mode 100644 testing/web-platform/tests/html/semantics/forms/the-input-element/maxlength-manual.html
 delete mode 100644 testing/web-platform/tests/html/semantics/forms/the-input-element/maxlength.html
 rename testing/web-platform/tests/html/semantics/scripting-1/the-script-element/{script-for-event-xhtml.xhtml => script-for-event.xhtml} (100%)
 rename testing/web-platform/tests/html/semantics/scripting-1/the-script-element/{script-text-xhtml.xhtml => script-text.xhtml} (100%)
 create mode 100644 testing/web-platform/tests/resources/webidl2/test/invalid/idl/maplike-1type.widl
 create mode 100644 testing/web-platform/tests/resources/webidl2/test/invalid/idl/readonly-iterable.widl
 create mode 100644 testing/web-platform/tests/resources/webidl2/test/invalid/idl/setlike-2types.widl
 create mode 100644 testing/web-platform/tests/resources/webidl2/test/invalid/idl/typedef-nested.widl
 create mode 100644 testing/web-platform/tests/resources/webidl2/test/invalid/json/maplike-1type.json
 create mode 100644 testing/web-platform/tests/resources/webidl2/test/invalid/json/readonly-iterable.json
 create mode 100644 testing/web-platform/tests/resources/webidl2/test/invalid/json/setlike-2types.json
 create mode 100644 testing/web-platform/tests/resources/webidl2/test/invalid/json/typedef-nested.json
 create mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/idl/extended-attributes.widl
 create mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/idl/iterable.widl
 create mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/idl/legacyiterable.widl
 create mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/idl/maplike.widl
 create mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/idl/setlike.widl
 create mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/idl/typedef-nested.widl
 create mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/json/extended-attributes.json
 create mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/json/iterable.json
 create mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/json/legacyiterable.json
 create mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/json/maplike.json
 create mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/json/setlike.json
 create mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/json/typedef-nested.json
 create mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/opt/typedef-nested.json
 delete mode 100644 testing/web-platform/tests/svg/interfaces.html
 rename testing/web-platform/tests/url/{a-element-xhtml.xhtml => a-element.xhtml} (100%)

diff --git a/testing/web-platform/meta/FileAPI/idlharness.worker.js.ini b/testing/web-platform/meta/FileAPI/idlharness.worker.js.ini
index 243d5609ddfd..37b8a3949920 100644
--- a/testing/web-platform/meta/FileAPI/idlharness.worker.js.ini
+++ b/testing/web-platform/meta/FileAPI/idlharness.worker.js.ini
@@ -41,141 +41,3 @@
 
   [FileList interface: attribute length]
     expected: FAIL
-
-  [FileReader interface: existence and properties of interface object]
-    expected: FAIL
-
-  [FileReader interface object length]
-    expected: FAIL
-
-  [FileReader interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [FileReader interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [FileReader interface: operation readAsArrayBuffer(Blob)]
-    expected: FAIL
-
-  [FileReader interface: operation readAsText(Blob,DOMString)]
-    expected: FAIL
-
-  [FileReader interface: operation readAsDataURL(Blob)]
-    expected: FAIL
-
-  [FileReader interface: operation abort()]
-    expected: FAIL
-
-  [FileReader interface: constant EMPTY on interface object]
-    expected: FAIL
-
-  [FileReader interface: constant EMPTY on interface prototype object]
-    expected: FAIL
-
-  [FileReader interface: constant LOADING on interface object]
-    expected: FAIL
-
-  [FileReader interface: constant LOADING on interface prototype object]
-    expected: FAIL
-
-  [FileReader interface: constant DONE on interface object]
-    expected: FAIL
-
-  [FileReader interface: constant DONE on interface prototype object]
-    expected: FAIL
-
-  [FileReader interface: attribute readyState]
-    expected: FAIL
-
-  [FileReader interface: attribute result]
-    expected: FAIL
-
-  [FileReader interface: attribute error]
-    expected: FAIL
-
-  [FileReader interface: attribute onloadstart]
-    expected: FAIL
-
-  [FileReader interface: attribute onprogress]
-    expected: FAIL
-
-  [FileReader interface: attribute onload]
-    expected: FAIL
-
-  [FileReader interface: attribute onabort]
-    expected: FAIL
-
-  [FileReader interface: attribute onerror]
-    expected: FAIL
-
-  [FileReader interface: attribute onloadend]
-    expected: FAIL
-
-  [FileReader must be primary interface of new FileReader()]
-    expected: FAIL
-
-  [Stringification of new FileReader()]
-    expected: FAIL
-
-  [FileReader interface: new FileReader() must inherit property "readAsArrayBuffer" with the proper type (0)]
-    expected: FAIL
-
-  [FileReader interface: calling readAsArrayBuffer(Blob) on new FileReader() with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [FileReader interface: new FileReader() must inherit property "readAsText" with the proper type (1)]
-    expected: FAIL
-
-  [FileReader interface: calling readAsText(Blob,DOMString) on new FileReader() with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [FileReader interface: new FileReader() must inherit property "readAsDataURL" with the proper type (2)]
-    expected: FAIL
-
-  [FileReader interface: calling readAsDataURL(Blob) on new FileReader() with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [FileReader interface: new FileReader() must inherit property "abort" with the proper type (3)]
-    expected: FAIL
-
-  [FileReader interface: new FileReader() must inherit property "EMPTY" with the proper type (4)]
-    expected: FAIL
-
-  [FileReader interface: new FileReader() must inherit property "LOADING" with the proper type (5)]
-    expected: FAIL
-
-  [FileReader interface: new FileReader() must inherit property "DONE" with the proper type (6)]
-    expected: FAIL
-
-  [FileReader interface: new FileReader() must inherit property "readyState" with the proper type (7)]
-    expected: FAIL
-
-  [FileReader interface: new FileReader() must inherit property "result" with the proper type (8)]
-    expected: FAIL
-
-  [FileReader interface: new FileReader() must inherit property "error" with the proper type (9)]
-    expected: FAIL
-
-  [FileReader interface: new FileReader() must inherit property "onloadstart" with the proper type (10)]
-    expected: FAIL
-
-  [FileReader interface: new FileReader() must inherit property "onprogress" with the proper type (11)]
-    expected: FAIL
-
-  [FileReader interface: new FileReader() must inherit property "onload" with the proper type (12)]
-    expected: FAIL
-
-  [FileReader interface: new FileReader() must inherit property "onabort" with the proper type (13)]
-    expected: FAIL
-
-  [FileReader interface: new FileReader() must inherit property "onerror" with the proper type (14)]
-    expected: FAIL
-
-  [FileReader interface: new FileReader() must inherit property "onloadend" with the proper type (15)]
-    expected: FAIL
-
-  [FileList interface object name]
-    expected: FAIL
-
-  [FileReader interface object name]
-    expected: FAIL
diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
index bfc10281dd9e..4212224a2310 100644
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -101,6 +101,10 @@
         "path": "battery-status/battery-charging-manual.html",
         "url": "/battery-status/battery-charging-manual.html"
       },
+      {
+        "path": "battery-status/battery-created-manual.html",
+        "url": "/battery-status/battery-created-manual.html"
+      },
       {
         "path": "battery-status/battery-discharging-manual.html",
         "url": "/battery-status/battery-discharging-manual.html"
@@ -773,10 +777,6 @@
         "path": "html/semantics/forms/the-input-element/file-manual.html",
         "url": "/html/semantics/forms/the-input-element/file-manual.html"
       },
-      {
-        "path": "html/semantics/forms/the-input-element/maxlength-manual.html",
-        "url": "/html/semantics/forms/the-input-element/maxlength-manual.html"
-      },
       {
         "path": "html/semantics/forms/the-optgroup-element/optgroup-disabled-manual.html",
         "url": "/html/semantics/forms/the-optgroup-element/optgroup-disabled-manual.html"
@@ -13091,10 +13091,6 @@
         "path": "content-security-policy/media-src/media-src-7_3_2.html",
         "url": "/content-security-policy/media-src/media-src-7_3_2.html"
       },
-      {
-        "path": "content-security-policy/media-src/media-src-redir-bug.sub.html",
-        "url": "/content-security-policy/media-src/media-src-redir-bug.sub.html"
-      },
       {
         "path": "content-security-policy/meta/meta-img-src.html",
         "url": "/content-security-policy/meta/meta-img-src.html"
@@ -13271,6 +13267,10 @@
         "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-move-element-test.html",
         "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-move-element-test.html"
       },
+      {
+        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-test.html",
+        "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-test.html"
+      },
       {
         "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-change-attribute-test.html",
         "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-change-attribute-test.html"
@@ -13739,14 +13739,14 @@
         "path": "dom/nodes/Document-createEvent.html",
         "url": "/dom/nodes/Document-createEvent.html"
       },
-      {
-        "path": "dom/nodes/Document-createProcessingInstruction-xhtml.xhtml",
-        "url": "/dom/nodes/Document-createProcessingInstruction-xhtml.xhtml"
-      },
       {
         "path": "dom/nodes/Document-createProcessingInstruction.html",
         "url": "/dom/nodes/Document-createProcessingInstruction.html"
       },
+      {
+        "path": "dom/nodes/Document-createProcessingInstruction.xhtml",
+        "url": "/dom/nodes/Document-createProcessingInstruction.xhtml"
+      },
       {
         "path": "dom/nodes/Document-createTextNode.html",
         "url": "/dom/nodes/Document-createTextNode.html"
@@ -13763,14 +13763,14 @@
         "path": "dom/nodes/Document-getElementById.html",
         "url": "/dom/nodes/Document-getElementById.html"
       },
-      {
-        "path": "dom/nodes/Document-getElementsByTagName-xhtml.xhtml",
-        "url": "/dom/nodes/Document-getElementsByTagName-xhtml.xhtml"
-      },
       {
         "path": "dom/nodes/Document-getElementsByTagName.html",
         "url": "/dom/nodes/Document-getElementsByTagName.html"
       },
+      {
+        "path": "dom/nodes/Document-getElementsByTagName.xhtml",
+        "url": "/dom/nodes/Document-getElementsByTagName.xhtml"
+      },
       {
         "path": "dom/nodes/Document-getElementsByTagNameNS.html",
         "url": "/dom/nodes/Document-getElementsByTagNameNS.html"
@@ -13783,78 +13783,78 @@
         "path": "dom/nodes/Document-importNode.html",
         "url": "/dom/nodes/Document-importNode.html"
       },
-      {
-        "path": "dom/nodes/DocumentType-literal-xhtml.xhtml",
-        "url": "/dom/nodes/DocumentType-literal-xhtml.xhtml"
-      },
       {
         "path": "dom/nodes/DocumentType-literal.html",
         "url": "/dom/nodes/DocumentType-literal.html"
       },
+      {
+        "path": "dom/nodes/DocumentType-literal.xhtml",
+        "url": "/dom/nodes/DocumentType-literal.xhtml"
+      },
       {
         "path": "dom/nodes/DocumentType-remove.html",
         "url": "/dom/nodes/DocumentType-remove.html"
       },
-      {
-        "path": "dom/nodes/Element-childElement-null-svg.svg",
-        "url": "/dom/nodes/Element-childElement-null-svg.svg"
-      },
-      {
-        "path": "dom/nodes/Element-childElement-null-xhtml.xhtml",
-        "url": "/dom/nodes/Element-childElement-null-xhtml.xhtml"
-      },
       {
         "path": "dom/nodes/Element-childElement-null.html",
         "url": "/dom/nodes/Element-childElement-null.html"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-dynamic-add-svg.svg",
-        "url": "/dom/nodes/Element-childElementCount-dynamic-add-svg.svg"
+        "path": "dom/nodes/Element-childElement-null.svg",
+        "url": "/dom/nodes/Element-childElement-null.svg"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-dynamic-add-xhtml.xhtml",
-        "url": "/dom/nodes/Element-childElementCount-dynamic-add-xhtml.xhtml"
+        "path": "dom/nodes/Element-childElement-null.xhtml",
+        "url": "/dom/nodes/Element-childElement-null.xhtml"
       },
       {
         "path": "dom/nodes/Element-childElementCount-dynamic-add.html",
         "url": "/dom/nodes/Element-childElementCount-dynamic-add.html"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-dynamic-remove-svg.svg",
-        "url": "/dom/nodes/Element-childElementCount-dynamic-remove-svg.svg"
+        "path": "dom/nodes/Element-childElementCount-dynamic-add.svg",
+        "url": "/dom/nodes/Element-childElementCount-dynamic-add.svg"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-dynamic-remove-xhtml.xhtml",
-        "url": "/dom/nodes/Element-childElementCount-dynamic-remove-xhtml.xhtml"
+        "path": "dom/nodes/Element-childElementCount-dynamic-add.xhtml",
+        "url": "/dom/nodes/Element-childElementCount-dynamic-add.xhtml"
       },
       {
         "path": "dom/nodes/Element-childElementCount-dynamic-remove.html",
         "url": "/dom/nodes/Element-childElementCount-dynamic-remove.html"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-nochild-svg.svg",
-        "url": "/dom/nodes/Element-childElementCount-nochild-svg.svg"
+        "path": "dom/nodes/Element-childElementCount-dynamic-remove.svg",
+        "url": "/dom/nodes/Element-childElementCount-dynamic-remove.svg"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-nochild-xhtml.xhtml",
-        "url": "/dom/nodes/Element-childElementCount-nochild-xhtml.xhtml"
+        "path": "dom/nodes/Element-childElementCount-dynamic-remove.xhtml",
+        "url": "/dom/nodes/Element-childElementCount-dynamic-remove.xhtml"
       },
       {
         "path": "dom/nodes/Element-childElementCount-nochild.html",
         "url": "/dom/nodes/Element-childElementCount-nochild.html"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-svg.svg",
-        "url": "/dom/nodes/Element-childElementCount-svg.svg"
+        "path": "dom/nodes/Element-childElementCount-nochild.svg",
+        "url": "/dom/nodes/Element-childElementCount-nochild.svg"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-xhtml.xhtml",
-        "url": "/dom/nodes/Element-childElementCount-xhtml.xhtml"
+        "path": "dom/nodes/Element-childElementCount-nochild.xhtml",
+        "url": "/dom/nodes/Element-childElementCount-nochild.xhtml"
       },
       {
         "path": "dom/nodes/Element-childElementCount.html",
         "url": "/dom/nodes/Element-childElementCount.html"
       },
+      {
+        "path": "dom/nodes/Element-childElementCount.svg",
+        "url": "/dom/nodes/Element-childElementCount.svg"
+      },
+      {
+        "path": "dom/nodes/Element-childElementCount.xhtml",
+        "url": "/dom/nodes/Element-childElementCount.xhtml"
+      },
       {
         "path": "dom/nodes/Element-children.html",
         "url": "/dom/nodes/Element-children.html"
@@ -13867,38 +13867,38 @@
         "path": "dom/nodes/Element-closest.html",
         "url": "/dom/nodes/Element-closest.html"
       },
-      {
-        "path": "dom/nodes/Element-firstElementChild-entity-xhtml.xhtml",
-        "url": "/dom/nodes/Element-firstElementChild-entity-xhtml.xhtml"
-      },
       {
         "path": "dom/nodes/Element-firstElementChild-entity.svg",
         "url": "/dom/nodes/Element-firstElementChild-entity.svg"
       },
       {
-        "path": "dom/nodes/Element-firstElementChild-namespace-svg.svg",
-        "url": "/dom/nodes/Element-firstElementChild-namespace-svg.svg"
-      },
-      {
-        "path": "dom/nodes/Element-firstElementChild-namespace-xhtml.xhtml",
-        "url": "/dom/nodes/Element-firstElementChild-namespace-xhtml.xhtml"
+        "path": "dom/nodes/Element-firstElementChild-entity.xhtml",
+        "url": "/dom/nodes/Element-firstElementChild-entity.xhtml"
       },
       {
         "path": "dom/nodes/Element-firstElementChild-namespace.html",
         "url": "/dom/nodes/Element-firstElementChild-namespace.html"
       },
       {
-        "path": "dom/nodes/Element-firstElementChild-svg.svg",
-        "url": "/dom/nodes/Element-firstElementChild-svg.svg"
+        "path": "dom/nodes/Element-firstElementChild-namespace.svg",
+        "url": "/dom/nodes/Element-firstElementChild-namespace.svg"
       },
       {
-        "path": "dom/nodes/Element-firstElementChild-xhtml.xhtml",
-        "url": "/dom/nodes/Element-firstElementChild-xhtml.xhtml"
+        "path": "dom/nodes/Element-firstElementChild-namespace.xhtml",
+        "url": "/dom/nodes/Element-firstElementChild-namespace.xhtml"
       },
       {
         "path": "dom/nodes/Element-firstElementChild.html",
         "url": "/dom/nodes/Element-firstElementChild.html"
       },
+      {
+        "path": "dom/nodes/Element-firstElementChild.svg",
+        "url": "/dom/nodes/Element-firstElementChild.svg"
+      },
+      {
+        "path": "dom/nodes/Element-firstElementChild.xhtml",
+        "url": "/dom/nodes/Element-firstElementChild.xhtml"
+      },
       {
         "path": "dom/nodes/Element-getElementsByClassName.html",
         "url": "/dom/nodes/Element-getElementsByClassName.html"
@@ -13915,46 +13915,46 @@
         "path": "dom/nodes/Element-getElementsByTagNameNS.html",
         "url": "/dom/nodes/Element-getElementsByTagNameNS.html"
       },
-      {
-        "path": "dom/nodes/Element-lastElementChild-svg.svg",
-        "url": "/dom/nodes/Element-lastElementChild-svg.svg"
-      },
-      {
-        "path": "dom/nodes/Element-lastElementChild-xhtml.xhtml",
-        "url": "/dom/nodes/Element-lastElementChild-xhtml.xhtml"
-      },
       {
         "path": "dom/nodes/Element-lastElementChild.html",
         "url": "/dom/nodes/Element-lastElementChild.html"
       },
+      {
+        "path": "dom/nodes/Element-lastElementChild.svg",
+        "url": "/dom/nodes/Element-lastElementChild.svg"
+      },
+      {
+        "path": "dom/nodes/Element-lastElementChild.xhtml",
+        "url": "/dom/nodes/Element-lastElementChild.xhtml"
+      },
       {
         "path": "dom/nodes/Element-matches.html",
         "url": "/dom/nodes/Element-matches.html"
       },
-      {
-        "path": "dom/nodes/Element-nextElementSibling-svg.svg",
-        "url": "/dom/nodes/Element-nextElementSibling-svg.svg"
-      },
-      {
-        "path": "dom/nodes/Element-nextElementSibling-xhtml.xhtml",
-        "url": "/dom/nodes/Element-nextElementSibling-xhtml.xhtml"
-      },
       {
         "path": "dom/nodes/Element-nextElementSibling.html",
         "url": "/dom/nodes/Element-nextElementSibling.html"
       },
       {
-        "path": "dom/nodes/Element-previousElementSibling-svg.svg",
-        "url": "/dom/nodes/Element-previousElementSibling-svg.svg"
+        "path": "dom/nodes/Element-nextElementSibling.svg",
+        "url": "/dom/nodes/Element-nextElementSibling.svg"
       },
       {
-        "path": "dom/nodes/Element-previousElementSibling-xhtml.xhtml",
-        "url": "/dom/nodes/Element-previousElementSibling-xhtml.xhtml"
+        "path": "dom/nodes/Element-nextElementSibling.xhtml",
+        "url": "/dom/nodes/Element-nextElementSibling.xhtml"
       },
       {
         "path": "dom/nodes/Element-previousElementSibling.html",
         "url": "/dom/nodes/Element-previousElementSibling.html"
       },
+      {
+        "path": "dom/nodes/Element-previousElementSibling.svg",
+        "url": "/dom/nodes/Element-previousElementSibling.svg"
+      },
+      {
+        "path": "dom/nodes/Element-previousElementSibling.xhtml",
+        "url": "/dom/nodes/Element-previousElementSibling.xhtml"
+      },
       {
         "path": "dom/nodes/Element-remove.html",
         "url": "/dom/nodes/Element-remove.html"
@@ -13963,18 +13963,18 @@
         "path": "dom/nodes/Element-removeAttributeNS.html",
         "url": "/dom/nodes/Element-removeAttributeNS.html"
       },
-      {
-        "path": "dom/nodes/Element-siblingElement-null-svg.svg",
-        "url": "/dom/nodes/Element-siblingElement-null-svg.svg"
-      },
-      {
-        "path": "dom/nodes/Element-siblingElement-null-xhtml.xhtml",
-        "url": "/dom/nodes/Element-siblingElement-null-xhtml.xhtml"
-      },
       {
         "path": "dom/nodes/Element-siblingElement-null.html",
         "url": "/dom/nodes/Element-siblingElement-null.html"
       },
+      {
+        "path": "dom/nodes/Element-siblingElement-null.svg",
+        "url": "/dom/nodes/Element-siblingElement-null.svg"
+      },
+      {
+        "path": "dom/nodes/Element-siblingElement-null.xhtml",
+        "url": "/dom/nodes/Element-siblingElement-null.xhtml"
+      },
       {
         "path": "dom/nodes/Element-tagName.html",
         "url": "/dom/nodes/Element-tagName.html"
@@ -14055,14 +14055,14 @@
         "path": "dom/nodes/Node-lookupPrefix.xhtml",
         "url": "/dom/nodes/Node-lookupPrefix.xhtml"
       },
-      {
-        "path": "dom/nodes/Node-nodeName-xhtml.xhtml",
-        "url": "/dom/nodes/Node-nodeName-xhtml.xhtml"
-      },
       {
         "path": "dom/nodes/Node-nodeName.html",
         "url": "/dom/nodes/Node-nodeName.html"
       },
+      {
+        "path": "dom/nodes/Node-nodeName.xhtml",
+        "url": "/dom/nodes/Node-nodeName.xhtml"
+      },
       {
         "path": "dom/nodes/Node-nodeValue.html",
         "url": "/dom/nodes/Node-nodeValue.html"
@@ -14103,14 +14103,14 @@
         "path": "dom/nodes/ParentNode-prepend.html",
         "url": "/dom/nodes/ParentNode-prepend.html"
       },
-      {
-        "path": "dom/nodes/ParentNode-querySelector-All-xht.xht",
-        "url": "/dom/nodes/ParentNode-querySelector-All-xht.xht"
-      },
       {
         "path": "dom/nodes/ParentNode-querySelector-All.html",
         "url": "/dom/nodes/ParentNode-querySelector-All.html"
       },
+      {
+        "path": "dom/nodes/ParentNode-querySelector-All.xht",
+        "url": "/dom/nodes/ParentNode-querySelector-All.xht"
+      },
       {
         "path": "dom/nodes/ProcessingInstruction-literal-1.xhtml",
         "url": "/dom/nodes/ProcessingInstruction-literal-1.xhtml"
@@ -15047,6 +15047,10 @@
         "path": "html/browsers/browsing-the-web/scroll-to-fragid/006.html",
         "url": "/html/browsers/browsing-the-web/scroll-to-fragid/006.html"
       },
+      {
+        "path": "html/browsers/browsing-the-web/scroll-to-fragid/007.html",
+        "url": "/html/browsers/browsing-the-web/scroll-to-fragid/007.html"
+      },
       {
         "path": "html/browsers/browsing-the-web/unloading-documents/001.html",
         "url": "/html/browsers/browsing-the-web/unloading-documents/001.html"
@@ -15487,6 +15491,10 @@
         "path": "html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload.html",
         "url": "/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload.html"
       },
+      {
+        "path": "html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html",
+        "url": "/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html"
+      },
       {
         "path": "html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1.html",
         "url": "/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1.html"
@@ -15623,58 +15631,58 @@
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByClassName-same.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByClassName-same.html"
       },
-      {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case-xhtml.xhtml",
-        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case-xhtml.xhtml"
-      },
       {
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id-xhtml.xhtml",
-        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id-xhtml.xhtml"
+        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.xhtml",
+        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.xhtml"
       },
       {
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-interface.html",
-        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-interface.html"
+        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.xhtml",
+        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.xhtml"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace-xhtml.xhtml",
-        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace-xhtml.xhtml"
+        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-interface.html",
+        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-interface.html"
       },
       {
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements-xhtml.xhtml",
-        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements-xhtml.xhtml"
+        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.xhtml",
+        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.xhtml"
       },
       {
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef-xhtml.xhtml",
-        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef-xhtml.xhtml"
+        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.xhtml",
+        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.xhtml"
       },
       {
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param-xhtml.xhtml",
-        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param-xhtml.xhtml"
+        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.xhtml",
+        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.xhtml"
       },
       {
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.html"
       },
+      {
+        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.xhtml",
+        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.xhtml"
+      },
       {
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-same.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-same.html"
@@ -18007,10 +18015,6 @@
         "path": "html/semantics/forms/the-input-element/input-type-checkbox.html",
         "url": "/html/semantics/forms/the-input-element/input-type-checkbox.html"
       },
-      {
-        "path": "html/semantics/forms/the-input-element/maxlength.html",
-        "url": "/html/semantics/forms/the-input-element/maxlength.html"
-      },
       {
         "path": "html/semantics/forms/the-input-element/month.html",
         "url": "/html/semantics/forms/the-input-element/month.html"
@@ -18291,14 +18295,14 @@
         "path": "html/semantics/scripting-1/the-script-element/script-before-after-events.html",
         "url": "/html/semantics/scripting-1/the-script-element/script-before-after-events.html"
       },
-      {
-        "path": "html/semantics/scripting-1/the-script-element/script-for-event-xhtml.xhtml",
-        "url": "/html/semantics/scripting-1/the-script-element/script-for-event-xhtml.xhtml"
-      },
       {
         "path": "html/semantics/scripting-1/the-script-element/script-for-event.html",
         "url": "/html/semantics/scripting-1/the-script-element/script-for-event.html"
       },
+      {
+        "path": "html/semantics/scripting-1/the-script-element/script-for-event.xhtml",
+        "url": "/html/semantics/scripting-1/the-script-element/script-for-event.xhtml"
+      },
       {
         "path": "html/semantics/scripting-1/the-script-element/script-language-type.html",
         "url": "/html/semantics/scripting-1/the-script-element/script-language-type.html"
@@ -18319,14 +18323,14 @@
         "path": "html/semantics/scripting-1/the-script-element/script-onload-string.html",
         "url": "/html/semantics/scripting-1/the-script-element/script-onload-string.html"
       },
-      {
-        "path": "html/semantics/scripting-1/the-script-element/script-text-xhtml.xhtml",
-        "url": "/html/semantics/scripting-1/the-script-element/script-text-xhtml.xhtml"
-      },
       {
         "path": "html/semantics/scripting-1/the-script-element/script-text.html",
         "url": "/html/semantics/scripting-1/the-script-element/script-text.html"
       },
+      {
+        "path": "html/semantics/scripting-1/the-script-element/script-text.xhtml",
+        "url": "/html/semantics/scripting-1/the-script-element/script-text.xhtml"
+      },
       {
         "path": "html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/node-document.html",
         "url": "/html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/node-document.html"
@@ -26403,10 +26407,6 @@
         "path": "shadow-dom/untriaged/user-interaction/ranges-and-selections/test-002.html",
         "url": "/shadow-dom/untriaged/user-interaction/ranges-and-selections/test-002.html"
       },
-      {
-        "path": "svg/interfaces.html",
-        "url": "/svg/interfaces.html"
-      },
       {
         "path": "touch-events/create-touch-touchlist.html",
         "url": "/touch-events/create-touch-touchlist.html"
@@ -26439,14 +26439,14 @@
         "path": "typedarrays/constructors.html",
         "url": "/typedarrays/constructors.html"
       },
-      {
-        "path": "url/a-element-xhtml.xhtml",
-        "url": "/url/a-element-xhtml.xhtml"
-      },
       {
         "path": "url/a-element.html",
         "url": "/url/a-element.html"
       },
+      {
+        "path": "url/a-element.xhtml",
+        "url": "/url/a-element.xhtml"
+      },
       {
         "path": "url/historical.html",
         "url": "/url/historical.html"
@@ -28797,11 +28797,6 @@
         "timeout": "long",
         "url": "/custom-elements/concepts/custom-elements-type-allowed-chars.html"
       },
-      {
-        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-test.html",
-        "timeout": "long",
-        "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-test.html"
-      },
       {
         "path": "dom/nodes/Document-characterSet-normalization.html",
         "timeout": "long",
@@ -28942,11 +28937,6 @@
         "timeout": "long",
         "url": "/eventsource/shared-worker/eventsource-constructor-non-same-origin.htm"
       },
-      {
-        "path": "html/browsers/browsing-the-web/scroll-to-fragid/007.html",
-        "timeout": "long",
-        "url": "/html/browsers/browsing-the-web/scroll-to-fragid/007.html"
-      },
       {
         "path": "html/browsers/history/the-history-interface/007.html",
         "timeout": "long",
@@ -28957,11 +28947,6 @@
         "timeout": "long",
         "url": "/html/browsers/origin/cross-origin-objects/cross-origin-objects.sub.html"
       },
-      {
-        "path": "html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html",
-        "timeout": "long",
-        "url": "/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html"
-      },
       {
         "path": "html/dom/interfaces.html",
         "timeout": "long",
@@ -35869,7 +35854,7 @@
       }
     ]
   },
-  "rev": "05c55fbdc527eacdc7b875f298a8cb1b6db0dfcd",
+  "rev": "63bf7b5e1e12b308ba6ed20480ad7dc93afa1943",
   "url_base": "/",
   "version": 2
 }
diff --git a/testing/web-platform/meta/content-security-policy/media-src/media-src-redir-bug.sub.html.ini b/testing/web-platform/meta/content-security-policy/media-src/media-src-redir-bug.sub.html.ini
deleted file mode 100644
index 0d2298df6641..000000000000
--- a/testing/web-platform/meta/content-security-policy/media-src/media-src-redir-bug.sub.html.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-[media-src-redir-bug.sub.html]
-  type: testharness
-  expected: TIMEOUT
-  [In-policy async video src]
-    expected:
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [in-policy async video src w/redir]
-    expected: NOTRUN
-
-  [In-policy async video source element]
-    expected:
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-
-  [In-policy async video source element w/redir]
-    expected:
-      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): NOTRUN
-      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): NOTRUN
-
diff --git a/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini b/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
index f2ff2e9813d7..f1076887e18a 100644
--- a/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
+++ b/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
@@ -1,4 +1,4 @@
 [creating_browsing_context_test_01.html]
   type: testharness
   disabled:
-    if os == "linux": https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
+    if (os == "linux"): https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
diff --git a/testing/web-platform/meta/html/dom/elements/elements-in-the-dom/unknown-element.html.ini b/testing/web-platform/meta/html/dom/elements/elements-in-the-dom/unknown-element.html.ini
index 259477aab6c5..541b6b2f715a 100644
--- a/testing/web-platform/meta/html/dom/elements/elements-in-the-dom/unknown-element.html.ini
+++ b/testing/web-platform/meta/html/dom/elements/elements-in-the-dom/unknown-element.html.ini
@@ -2,3 +2,4 @@
   type: testharness
   expected:
     if not debug and e10s and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): TIMEOUT
+    if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86") and (bits == 32): TIMEOUT
diff --git a/testing/web-platform/meta/html/dom/interfaces.html.ini b/testing/web-platform/meta/html/dom/interfaces.html.ini
index 9c2a3a3a81cb..17f26f44db08 100644
--- a/testing/web-platform/meta/html/dom/interfaces.html.ini
+++ b/testing/web-platform/meta/html/dom/interfaces.html.ini
@@ -2749,78 +2749,3 @@
   [WorkerLocation interface: attribute hash]
     expected: FAIL
 
-  [DOMElementMap interface object name]
-    expected: FAIL
-
-  [AudioTrackList interface object name]
-    expected: FAIL
-
-  [AudioTrack interface object name]
-    expected: FAIL
-
-  [VideoTrackList interface object name]
-    expected: FAIL
-
-  [VideoTrack interface object name]
-    expected: FAIL
-
-  [MediaController interface object name]
-    expected: FAIL
-
-  [HTMLTableDataCellElement interface object name]
-    expected: FAIL
-
-  [HTMLTableHeaderCellElement interface object name]
-    expected: FAIL
-
-  [HTMLKeygenElement interface object name]
-    expected: FAIL
-
-  [AutocompleteErrorEvent interface object name]
-    expected: FAIL
-
-  [HTMLDetailsElement interface object name]
-    expected: FAIL
-
-  [RelatedEvent interface object name]
-    expected: FAIL
-
-  [HTMLDialogElement interface object name]
-    expected: FAIL
-
-  [CanvasProxy interface object name]
-    expected: FAIL
-
-  [DrawingStyle interface object name]
-    expected: FAIL
-
-  [DataTransferItemList interface object name]
-    expected: FAIL
-
-  [DataTransferItem interface object name]
-    expected: FAIL
-
-  [ApplicationCache interface object name]
-    expected: FAIL
-
-  [PortCollection interface object name]
-    expected: FAIL
-
-  [WorkerGlobalScope interface object name]
-    expected: FAIL
-
-  [DedicatedWorkerGlobalScope interface object name]
-    expected: FAIL
-
-  [SharedWorkerGlobalScope interface object name]
-    expected: FAIL
-
-  [WorkerNavigator interface object name]
-    expected: FAIL
-
-  [WorkerLocation interface object name]
-    expected: FAIL
-
-  [HTMLMarqueeElement interface object name]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html.ini
index 32292c722ad7..4c8bcf5137a1 100644
--- a/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html.ini
+++ b/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html.ini
@@ -1,8 +1,26 @@
 [basic.html]
   type: testharness
-  [<img srcset="data:image/svg+xml,<svg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='-1%20-1%202%202'%20width='20'><circle%20r='1'/></svg> 2x" data-expect="10">]
+  [<img srcset="/images/green-256x256.png 1.6x" data-expect="160">]
     expected: FAIL
 
-  [<img srcset="data:image/svg+xml,<svg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='-1%20-1%202%202'%20height='20'><circle%20r='1'/></svg> 2x" data-expect="10">]
+  [<img srcset="/images/green-256x256.png 2x" data-expect="128">]
+    expected: FAIL
+
+  [<img srcset="/images/green-256x256.png 10000x" data-expect="0">]
+    expected: FAIL
+
+  [<img srcset="/images/green-256x256.png 9e99999999999999999999999x" data-expect="0">]
+    expected: FAIL
+
+  [<img srcset="/images/green-256x256.png 512w" sizes="256px" data-expect="128">]
+    expected: FAIL
+
+  [<img srcset="/images/green-256x256.png 256w" sizes="512px" data-expect="512">]
+    expected: FAIL
+
+  [<img srcset="/images/green-256x256.png 256w" sizes="1px" data-expect="1">]
+    expected: FAIL
+
+  [<img srcset="/images/green-256x256.png 256w" sizes="0px" data-expect="0">]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number.html.ini b/testing/web-platform/meta/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number.html.ini
deleted file mode 100644
index e65fe96b0b49..000000000000
--- a/testing/web-platform/meta/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bdi-neutral-number.html]
-  type: reftest
-  expected:
-    if debug and not e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): TIMEOUT
diff --git a/testing/web-platform/meta/mozilla-sync b/testing/web-platform/meta/mozilla-sync
index d924ac6dc356..4155cc4d71e9 100644
--- a/testing/web-platform/meta/mozilla-sync
+++ b/testing/web-platform/meta/mozilla-sync
@@ -1 +1 @@
-d5e5a44a8bbe62751a66677491623a41b766275d
\ No newline at end of file
+42122dea7c41a71c8cb06a91b91e71afa2d6664c
\ No newline at end of file
diff --git a/testing/web-platform/meta/selectors/attribute-selectors/attribute-case/semantics.html.ini b/testing/web-platform/meta/selectors/attribute-selectors/attribute-case/semantics.html.ini
index 3766611ecf82..4508ca5f03e8 100644
--- a/testing/web-platform/meta/selectors/attribute-selectors/attribute-case/semantics.html.ini
+++ b/testing/web-platform/meta/selectors/attribute-selectors/attribute-case/semantics.html.ini
@@ -1017,201 +1017,3 @@
   [[foo='bar' i\] <div baz="BAR"> with querySelector in XML]
     expected: FAIL
 
-  [[class~='a' i\] <div class="X A B"> in standards mode]
-    expected: FAIL
-
-  [[class~='a' i\] <div class="X A B"> with querySelector in standards mode]
-    expected: FAIL
-
-  [[class~='A' i\] <div class="x a b"> in standards mode]
-    expected: FAIL
-
-  [[class~='A' i\] <div class="x a b"> with querySelector in standards mode]
-    expected: FAIL
-
-  [[id^='a' i\] <div id="AB"> in standards mode]
-    expected: FAIL
-
-  [[id^='a' i\] <div id="AB"> with querySelector in standards mode]
-    expected: FAIL
-
-  [[id$='A' i\] <div id="xa"> in standards mode]
-    expected: FAIL
-
-  [[id$='A' i\] <div id="xa"> with querySelector in standards mode]
-    expected: FAIL
-
-  [[lang|='a' i\] <div lang="A-B"> in standards mode]
-    expected: FAIL
-
-  [[lang|='a' i\] <div lang="A-B"> with querySelector in standards mode]
-    expected: FAIL
-
-  [[lang*='A' i\] <div lang="xab"> in standards mode]
-    expected: FAIL
-
-  [[lang*='A' i\] <div lang="xab"> with querySelector in standards mode]
-    expected: FAIL
-
-  [[foo~='ä' i\] /* COMBINING in selector */ <div foo="ä"> in standards mode]
-    expected: FAIL
-
-  [[foo~='ä' i\] /* COMBINING in selector */ <div foo="ä"> with querySelector in standards mode]
-    expected: FAIL
-
-  [[foo^='Ä' i\] /* COMBINING in selector */ <div foo="Ä"> in standards mode]
-    expected: FAIL
-
-  [[foo^='Ä' i\] /* COMBINING in selector */ <div foo="Ä"> with querySelector in standards mode]
-    expected: FAIL
-
-  [[foo$='Ä' i\] /* COMBINING in selector */ <div foo="ä"> in standards mode]
-    expected: FAIL
-
-  [[foo$='Ä' i\] /* COMBINING in selector */ <div foo="ä"> with querySelector in standards mode]
-    expected: FAIL
-
-  [[foo*='ä' i\] /* COMBINING in attribute */ <div foo="ä"> in standards mode]
-    expected: FAIL
-
-  [[foo*='ä' i\] /* COMBINING in attribute */ <div foo="ä"> with querySelector in standards mode]
-    expected: FAIL
-
-  [[foo|='ä' i\] /* COMBINING in attribute */ <div foo="Ä"> in standards mode]
-    expected: FAIL
-
-  [[foo|='ä' i\] /* COMBINING in attribute */ <div foo="Ä"> with querySelector in standards mode]
-    expected: FAIL
-
-  [[class~='a' i\] <div class="X A B"> in quirks mode]
-    expected: FAIL
-
-  [[class~='a' i\] <div class="X A B"> with querySelector in quirks mode]
-    expected: FAIL
-
-  [[class~='A' i\] <div class="x a b"> in quirks mode]
-    expected: FAIL
-
-  [[class~='A' i\] <div class="x a b"> with querySelector in quirks mode]
-    expected: FAIL
-
-  [[id^='a' i\] <div id="AB"> in quirks mode]
-    expected: FAIL
-
-  [[id^='a' i\] <div id="AB"> with querySelector in quirks mode]
-    expected: FAIL
-
-  [[id$='A' i\] <div id="xa"> in quirks mode]
-    expected: FAIL
-
-  [[id$='A' i\] <div id="xa"> with querySelector in quirks mode]
-    expected: FAIL
-
-  [[lang|='a' i\] <div lang="A-B"> in quirks mode]
-    expected: FAIL
-
-  [[lang|='a' i\] <div lang="A-B"> with querySelector in quirks mode]
-    expected: FAIL
-
-  [[lang*='A' i\] <div lang="xab"> in quirks mode]
-    expected: FAIL
-
-  [[lang*='A' i\] <div lang="xab"> with querySelector in quirks mode]
-    expected: FAIL
-
-  [[foo~='ä' i\] /* COMBINING in selector */ <div foo="ä"> in quirks mode]
-    expected: FAIL
-
-  [[foo~='ä' i\] /* COMBINING in selector */ <div foo="ä"> with querySelector in quirks mode]
-    expected: FAIL
-
-  [[foo^='Ä' i\] /* COMBINING in selector */ <div foo="Ä"> in quirks mode]
-    expected: FAIL
-
-  [[foo^='Ä' i\] /* COMBINING in selector */ <div foo="Ä"> with querySelector in quirks mode]
-    expected: FAIL
-
-  [[foo$='Ä' i\] /* COMBINING in selector */ <div foo="ä"> in quirks mode]
-    expected: FAIL
-
-  [[foo$='Ä' i\] /* COMBINING in selector */ <div foo="ä"> with querySelector in quirks mode]
-    expected: FAIL
-
-  [[foo*='ä' i\] /* COMBINING in attribute */ <div foo="ä"> in quirks mode]
-    expected: FAIL
-
-  [[foo*='ä' i\] /* COMBINING in attribute */ <div foo="ä"> with querySelector in quirks mode]
-    expected: FAIL
-
-  [[foo|='ä' i\] /* COMBINING in attribute */ <div foo="Ä"> in quirks mode]
-    expected: FAIL
-
-  [[foo|='ä' i\] /* COMBINING in attribute */ <div foo="Ä"> with querySelector in quirks mode]
-    expected: FAIL
-
-  [[class~='a' i\] <div class="X A B"> in XML]
-    expected: FAIL
-
-  [[class~='a' i\] <div class="X A B"> with querySelector in XML]
-    expected: FAIL
-
-  [[class~='A' i\] <div class="x a b"> in XML]
-    expected: FAIL
-
-  [[class~='A' i\] <div class="x a b"> with querySelector in XML]
-    expected: FAIL
-
-  [[id^='a' i\] <div id="AB"> in XML]
-    expected: FAIL
-
-  [[id^='a' i\] <div id="AB"> with querySelector in XML]
-    expected: FAIL
-
-  [[id$='A' i\] <div id="xa"> in XML]
-    expected: FAIL
-
-  [[id$='A' i\] <div id="xa"> with querySelector in XML]
-    expected: FAIL
-
-  [[lang|='a' i\] <div lang="A-B"> in XML]
-    expected: FAIL
-
-  [[lang|='a' i\] <div lang="A-B"> with querySelector in XML]
-    expected: FAIL
-
-  [[lang*='A' i\] <div lang="xab"> in XML]
-    expected: FAIL
-
-  [[lang*='A' i\] <div lang="xab"> with querySelector in XML]
-    expected: FAIL
-
-  [[foo~='ä' i\] /* COMBINING in selector */ <div foo="ä"> in XML]
-    expected: FAIL
-
-  [[foo~='ä' i\] /* COMBINING in selector */ <div foo="ä"> with querySelector in XML]
-    expected: FAIL
-
-  [[foo^='Ä' i\] /* COMBINING in selector */ <div foo="Ä"> in XML]
-    expected: FAIL
-
-  [[foo^='Ä' i\] /* COMBINING in selector */ <div foo="Ä"> with querySelector in XML]
-    expected: FAIL
-
-  [[foo$='Ä' i\] /* COMBINING in selector */ <div foo="ä"> in XML]
-    expected: FAIL
-
-  [[foo$='Ä' i\] /* COMBINING in selector */ <div foo="ä"> with querySelector in XML]
-    expected: FAIL
-
-  [[foo*='ä' i\] /* COMBINING in attribute */ <div foo="ä"> in XML]
-    expected: FAIL
-
-  [[foo*='ä' i\] /* COMBINING in attribute */ <div foo="ä"> with querySelector in XML]
-    expected: FAIL
-
-  [[foo|='ä' i\] /* COMBINING in attribute */ <div foo="Ä"> in XML]
-    expected: FAIL
-
-  [[foo|='ä' i\] /* COMBINING in attribute */ <div foo="Ä"> with querySelector in XML]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/selectors/attribute-selectors/attribute-case/syntax.html.ini b/testing/web-platform/meta/selectors/attribute-selectors/attribute-case/syntax.html.ini
index 459f3b1d2802..60b4facf43c7 100644
--- a/testing/web-platform/meta/selectors/attribute-selectors/attribute-case/syntax.html.ini
+++ b/testing/web-platform/meta/selectors/attribute-selectors/attribute-case/syntax.html.ini
@@ -369,39 +369,3 @@
   [[foo /* sanity check (invalid) */ with querySelector in XML]
     expected: FAIL
 
-  [[foo*='bar' i\] in standards mode]
-    expected: FAIL
-
-  [[foo*='bar' i\] with querySelector in standards mode]
-    expected: FAIL
-
-  [[foo|='bar' i\] in standards mode]
-    expected: FAIL
-
-  [[foo|='bar' i\] with querySelector in standards mode]
-    expected: FAIL
-
-  [[foo*='bar' i\] in quirks mode]
-    expected: FAIL
-
-  [[foo*='bar' i\] with querySelector in quirks mode]
-    expected: FAIL
-
-  [[foo|='bar' i\] in quirks mode]
-    expected: FAIL
-
-  [[foo|='bar' i\] with querySelector in quirks mode]
-    expected: FAIL
-
-  [[foo*='bar' i\] in XML]
-    expected: FAIL
-
-  [[foo*='bar' i\] with querySelector in XML]
-    expected: FAIL
-
-  [[foo|='bar' i\] in XML]
-    expected: FAIL
-
-  [[foo|='bar' i\] with querySelector in XML]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/svg/interfaces.html.ini b/testing/web-platform/meta/svg/interfaces.html.ini
deleted file mode 100644
index b9049f887914..000000000000
--- a/testing/web-platform/meta/svg/interfaces.html.ini
+++ /dev/null
@@ -1,2450 +0,0 @@
-[interfaces.html]
-  type: testharness
-  [Document interface: attribute rootElement]
-    expected: FAIL
-
-  [SVGElement interface: attribute tabIndex]
-    expected: FAIL
-
-  [SVGElement interface: operation focus()]
-    expected: FAIL
-
-  [SVGElement interface: operation blur()]
-    expected: FAIL
-
-  [SVGGeometryElement interface: existence and properties of interface object]
-    expected: FAIL
-
-  [SVGGeometryElement interface object length]
-    expected: FAIL
-
-  [SVGGeometryElement interface object name]
-    expected: FAIL
-
-  [SVGGeometryElement interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [SVGGeometryElement interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [SVGGeometryElement interface: operation isPointInFill(DOMPoint)]
-    expected: FAIL
-
-  [SVGGeometryElement interface: operation isPointInStroke(DOMPoint)]
-    expected: FAIL
-
-  [SVGNumber interface: existence and properties of interface object]
-    expected: FAIL
-
-  [SVGSVGElement interface: operation getIntersectionList(DOMRectReadOnly,SVGElement)]
-    expected: FAIL
-
-  [SVGSVGElement interface: operation getEnclosureList(DOMRectReadOnly,SVGElement)]
-    expected: FAIL
-
-  [SVGSVGElement interface: operation checkIntersection(SVGElement,DOMRectReadOnly)]
-    expected: FAIL
-
-  [SVGSVGElement interface: operation checkEnclosure(SVGElement,DOMRectReadOnly)]
-    expected: FAIL
-
-  [SVGSVGElement interface: svg must inherit property "currentTranslate" with the proper type (5)]
-    expected: FAIL
-
-  [SVGSVGElement interface: svg must inherit property "getIntersectionList" with the proper type (6)]
-    expected: FAIL
-
-  [SVGSVGElement interface: calling getIntersectionList(DOMRectReadOnly,SVGElement) on svg with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGSVGElement interface: svg must inherit property "getEnclosureList" with the proper type (7)]
-    expected: FAIL
-
-  [SVGSVGElement interface: calling getEnclosureList(DOMRectReadOnly,SVGElement) on svg with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGSVGElement interface: svg must inherit property "checkIntersection" with the proper type (8)]
-    expected: FAIL
-
-  [SVGSVGElement interface: calling checkIntersection(SVGElement,DOMRectReadOnly) on svg with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGSVGElement interface: svg must inherit property "checkEnclosure" with the proper type (9)]
-    expected: FAIL
-
-  [SVGSVGElement interface: calling checkEnclosure(SVGElement,DOMRectReadOnly) on svg with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGSVGElement interface: svg must inherit property "onafterprint" with the proper type (29)]
-    expected: FAIL
-
-  [SVGSVGElement interface: svg must inherit property "onbeforeprint" with the proper type (30)]
-    expected: FAIL
-
-  [SVGSVGElement interface: svg must inherit property "onbeforeunload" with the proper type (31)]
-    expected: FAIL
-
-  [SVGSVGElement interface: svg must inherit property "onhashchange" with the proper type (32)]
-    expected: FAIL
-
-  [SVGSVGElement interface: svg must inherit property "onlanguagechange" with the proper type (33)]
-    expected: FAIL
-
-  [SVGSVGElement interface: svg must inherit property "onmessage" with the proper type (34)]
-    expected: FAIL
-
-  [SVGSVGElement interface: svg must inherit property "onoffline" with the proper type (35)]
-    expected: FAIL
-
-  [SVGSVGElement interface: svg must inherit property "ononline" with the proper type (36)]
-    expected: FAIL
-
-  [SVGSVGElement interface: svg must inherit property "onpagehide" with the proper type (37)]
-    expected: FAIL
-
-  [SVGSVGElement interface: svg must inherit property "onpageshow" with the proper type (38)]
-    expected: FAIL
-
-  [SVGSVGElement interface: svg must inherit property "onpopstate" with the proper type (39)]
-    expected: FAIL
-
-  [SVGSVGElement interface: svg must inherit property "onrejectionhandled" with the proper type (40)]
-    expected: FAIL
-
-  [SVGSVGElement interface: svg must inherit property "onstorage" with the proper type (41)]
-    expected: FAIL
-
-  [SVGSVGElement interface: svg must inherit property "onunhandledrejection" with the proper type (42)]
-    expected: FAIL
-
-  [SVGSVGElement interface: svg must inherit property "onunload" with the proper type (43)]
-    expected: FAIL
-
-  [SVGElement interface: svg must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: svg must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: svg must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: svg must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: svg must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: svg must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: svg must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: svg must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: svg must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: svg must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: svg must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: g must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: g must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: g must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: g must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: g must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: g must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: g must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: g must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: g must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: g must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: g must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGUnknownElement interface: existence and properties of interface object]
-    expected: FAIL
-
-  [SVGUnknownElement interface object length]
-    expected: FAIL
-
-  [SVGUnknownElement interface object name]
-    expected: FAIL
-
-  [SVGUnknownElement interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [SVGUnknownElement interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [SVGElement interface: defs must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: defs must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: defs must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: defs must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: defs must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: defs must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: defs must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: defs must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: defs must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: defs must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: defs must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: Desc must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: Desc must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: Desc must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: Desc must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: Desc must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: Desc must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: Desc must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: Desc must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: Desc must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: Desc must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: Desc must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: metadata must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: metadata must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: metadata must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: metadata must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: metadata must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: metadata must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: metadata must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: metadata must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: metadata must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: metadata must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: metadata must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: title must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: title must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: title must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: title must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: title must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: title must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: title must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: title must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: title must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: title must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: title must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: symbol must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: symbol must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: symbol must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: symbol must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: symbol must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: symbol must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: symbol must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: symbol must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: symbol must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: symbol must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: symbol must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: use must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: use must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: use must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: use must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: use must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: use must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: use must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: use must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: use must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: use must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: use must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: Switch must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: Switch must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: Switch must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: Switch must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: Switch must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: Switch must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: Switch must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: Switch must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: Switch must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: Switch must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: Switch must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGStyleElement interface: style must inherit property "sheet" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: style must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: style must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: style must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: style must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: style must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: style must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: style must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: style must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: style must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: style must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: style must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGTransform interface: svg.createSVGTransform() must inherit property "matrix" with the proper type (8)]
-    expected: FAIL
-
-  [SVGPathElement interface: existence and properties of interface object]
-    expected: FAIL
-
-  [SVGPathElement interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [SVGGeometryElement interface: path must inherit property "isPointInFill" with the proper type (0)]
-    expected: FAIL
-
-  [SVGGeometryElement interface: calling isPointInFill(DOMPoint) on path with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGGeometryElement interface: path must inherit property "isPointInStroke" with the proper type (1)]
-    expected: FAIL
-
-  [SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on path with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGElement interface: path must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: path must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: path must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: path must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: path must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: path must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: path must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: path must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: path must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: path must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: path must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGRectElement interface: existence and properties of interface object]
-    expected: FAIL
-
-  [SVGRectElement interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [SVGGeometryElement interface: rect must inherit property "isPointInFill" with the proper type (0)]
-    expected: FAIL
-
-  [SVGGeometryElement interface: calling isPointInFill(DOMPoint) on rect with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGGeometryElement interface: rect must inherit property "isPointInStroke" with the proper type (1)]
-    expected: FAIL
-
-  [SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on rect with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGElement interface: rect must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: rect must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: rect must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: rect must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: rect must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: rect must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: rect must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: rect must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: rect must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: rect must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: rect must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGCircleElement interface: existence and properties of interface object]
-    expected: FAIL
-
-  [SVGCircleElement interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [SVGGeometryElement interface: circle must inherit property "isPointInFill" with the proper type (0)]
-    expected: FAIL
-
-  [SVGGeometryElement interface: calling isPointInFill(DOMPoint) on circle with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGGeometryElement interface: circle must inherit property "isPointInStroke" with the proper type (1)]
-    expected: FAIL
-
-  [SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on circle with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGElement interface: circle must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: circle must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: circle must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: circle must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: circle must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: circle must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: circle must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: circle must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: circle must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: circle must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: circle must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGEllipseElement interface: existence and properties of interface object]
-    expected: FAIL
-
-  [SVGEllipseElement interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [SVGGeometryElement interface: ellipse must inherit property "isPointInFill" with the proper type (0)]
-    expected: FAIL
-
-  [SVGGeometryElement interface: calling isPointInFill(DOMPoint) on ellipse with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGGeometryElement interface: ellipse must inherit property "isPointInStroke" with the proper type (1)]
-    expected: FAIL
-
-  [SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on ellipse with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGElement interface: ellipse must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: ellipse must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: ellipse must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: ellipse must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: ellipse must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: ellipse must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: ellipse must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: ellipse must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: ellipse must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: ellipse must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: ellipse must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGLineElement interface: existence and properties of interface object]
-    expected: FAIL
-
-  [SVGLineElement interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [SVGGeometryElement interface: line must inherit property "isPointInFill" with the proper type (0)]
-    expected: FAIL
-
-  [SVGGeometryElement interface: calling isPointInFill(DOMPoint) on line with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGGeometryElement interface: line must inherit property "isPointInStroke" with the proper type (1)]
-    expected: FAIL
-
-  [SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on line with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGElement interface: line must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: line must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: line must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: line must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: line must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: line must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: line must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: line must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: line must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: line must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: line must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGPolylineElement interface: existence and properties of interface object]
-    expected: FAIL
-
-  [SVGPolylineElement interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [SVGGeometryElement interface: polyline must inherit property "isPointInFill" with the proper type (0)]
-    expected: FAIL
-
-  [SVGGeometryElement interface: calling isPointInFill(DOMPoint) on polyline with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGGeometryElement interface: polyline must inherit property "isPointInStroke" with the proper type (1)]
-    expected: FAIL
-
-  [SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on polyline with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGElement interface: polyline must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: polyline must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: polyline must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: polyline must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: polyline must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: polyline must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: polyline must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: polyline must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: polyline must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: polyline must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: polyline must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGPolygonElement interface: existence and properties of interface object]
-    expected: FAIL
-
-  [SVGPolygonElement interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [SVGGeometryElement interface: polygon must inherit property "isPointInFill" with the proper type (0)]
-    expected: FAIL
-
-  [SVGGeometryElement interface: calling isPointInFill(DOMPoint) on polygon with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGGeometryElement interface: polygon must inherit property "isPointInStroke" with the proper type (1)]
-    expected: FAIL
-
-  [SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on polygon with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGElement interface: polygon must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: polygon must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: polygon must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: polygon must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: polygon must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: polygon must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: polygon must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: polygon must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: polygon must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: polygon must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: polygon must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGTextContentElement must be primary interface of textContent]
-    expected: FAIL
-
-  [Stringification of textContent]
-    expected: FAIL
-
-  [SVGTextContentElement interface: textContent must inherit property "LENGTHADJUST_UNKNOWN" with the proper type (0)]
-    expected: FAIL
-
-  [SVGTextContentElement interface: textContent must inherit property "LENGTHADJUST_SPACING" with the proper type (1)]
-    expected: FAIL
-
-  [SVGTextContentElement interface: textContent must inherit property "LENGTHADJUST_SPACINGANDGLYPHS" with the proper type (2)]
-    expected: FAIL
-
-  [SVGTextContentElement interface: textContent must inherit property "textLength" with the proper type (3)]
-    expected: FAIL
-
-  [SVGTextContentElement interface: textContent must inherit property "lengthAdjust" with the proper type (4)]
-    expected: FAIL
-
-  [SVGTextContentElement interface: textContent must inherit property "getNumberOfChars" with the proper type (5)]
-    expected: FAIL
-
-  [SVGTextContentElement interface: textContent must inherit property "getComputedTextLength" with the proper type (6)]
-    expected: FAIL
-
-  [SVGTextContentElement interface: textContent must inherit property "getSubStringLength" with the proper type (7)]
-    expected: FAIL
-
-  [SVGTextContentElement interface: calling getSubStringLength(unsigned long,unsigned long) on textContent with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGTextContentElement interface: textContent must inherit property "getStartPositionOfChar" with the proper type (8)]
-    expected: FAIL
-
-  [SVGTextContentElement interface: calling getStartPositionOfChar(unsigned long) on textContent with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGTextContentElement interface: textContent must inherit property "getEndPositionOfChar" with the proper type (9)]
-    expected: FAIL
-
-  [SVGTextContentElement interface: calling getEndPositionOfChar(unsigned long) on textContent with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGTextContentElement interface: textContent must inherit property "getExtentOfChar" with the proper type (10)]
-    expected: FAIL
-
-  [SVGTextContentElement interface: calling getExtentOfChar(unsigned long) on textContent with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGTextContentElement interface: textContent must inherit property "getRotationOfChar" with the proper type (11)]
-    expected: FAIL
-
-  [SVGTextContentElement interface: calling getRotationOfChar(unsigned long) on textContent with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGTextContentElement interface: textContent must inherit property "getCharNumAtPosition" with the proper type (12)]
-    expected: FAIL
-
-  [SVGTextContentElement interface: calling getCharNumAtPosition(DOMPoint) on textContent with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGTextContentElement interface: textContent must inherit property "selectSubString" with the proper type (13)]
-    expected: FAIL
-
-  [SVGTextContentElement interface: calling selectSubString(unsigned long,unsigned long) on textContent with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGGraphicsElement interface: textContent must inherit property "transform" with the proper type (0)]
-    expected: FAIL
-
-  [SVGGraphicsElement interface: textContent must inherit property "getBBox" with the proper type (1)]
-    expected: FAIL
-
-  [SVGGraphicsElement interface: calling getBBox(SVGBoundingBoxOptions) on textContent with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGGraphicsElement interface: textContent must inherit property "getCTM" with the proper type (2)]
-    expected: FAIL
-
-  [SVGGraphicsElement interface: textContent must inherit property "getScreenCTM" with the proper type (3)]
-    expected: FAIL
-
-  [SVGGraphicsElement interface: textContent must inherit property "requiredExtensions" with the proper type (4)]
-    expected: FAIL
-
-  [SVGGraphicsElement interface: textContent must inherit property "systemLanguage" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: textContent must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: textContent must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: textContent must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: textContent must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: textContent must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: textContent must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: textContent must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: textContent must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: textContent must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: textContent must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: textContent must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: text must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: text must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: text must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: text must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: text must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: text must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: text must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: text must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: text must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: text must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: text must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: tspan must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: tspan must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: tspan must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: tspan must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: tspan must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: tspan must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: tspan must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: tspan must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: tspan must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: tspan must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: tspan must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: textPath must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: textPath must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: textPath must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: textPath must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: textPath must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: textPath must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: textPath must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: textPath must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: textPath must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: textPath must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: textPath must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGImageElement interface: attribute crossOrigin]
-    expected: FAIL
-
-  [SVGImageElement interface: image must inherit property "crossOrigin" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: image must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: image must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: image must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: image must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: image must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: image must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: image must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: image must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: image must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: image must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: image must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: foreignObject must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: foreignObject must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: foreignObject must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: foreignObject must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: foreignObject must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: foreignObject must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: foreignObject must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: foreignObject must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: foreignObject must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: foreignObject must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: foreignObject must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGMarkerElement interface: attribute orient]
-    expected: FAIL
-
-  [SVGMarkerElement interface: marker must inherit property "orient" with the proper type (13)]
-    expected: FAIL
-
-  [SVGElement interface: marker must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: marker must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: marker must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: marker must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: marker must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: marker must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: marker must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: marker must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: marker must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: marker must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: marker must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGSolidcolorElement interface: existence and properties of interface object]
-    expected: FAIL
-
-  [SVGSolidcolorElement interface object length]
-    expected: FAIL
-
-  [SVGSolidcolorElement interface object name]
-    expected: FAIL
-
-  [SVGSolidcolorElement interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [SVGSolidcolorElement interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [SVGElement interface: linearGradient must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: linearGradient must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: linearGradient must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: linearGradient must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: linearGradient must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: linearGradient must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: linearGradient must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: linearGradient must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: linearGradient must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: linearGradient must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: linearGradient must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGRadialGradientElement interface: attribute fr]
-    expected: FAIL
-
-  [SVGRadialGradientElement interface: radialGradient must inherit property "fr" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: radialGradient must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: radialGradient must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: radialGradient must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: radialGradient must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: radialGradient must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: radialGradient must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: radialGradient must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: radialGradient must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: radialGradient must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: radialGradient must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: radialGradient must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGMeshElement interface: existence and properties of interface object]
-    expected: FAIL
-
-  [SVGMeshElement interface object length]
-    expected: FAIL
-
-  [SVGMeshElement interface object name]
-    expected: FAIL
-
-  [SVGMeshElement interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [SVGMeshElement interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [SVGMeshrowElement interface: existence and properties of interface object]
-    expected: FAIL
-
-  [SVGMeshrowElement interface object length]
-    expected: FAIL
-
-  [SVGMeshrowElement interface object name]
-    expected: FAIL
-
-  [SVGMeshrowElement interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [SVGMeshrowElement interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [SVGMeshpatchElement interface: existence and properties of interface object]
-    expected: FAIL
-
-  [SVGMeshpatchElement interface object length]
-    expected: FAIL
-
-  [SVGMeshpatchElement interface object name]
-    expected: FAIL
-
-  [SVGMeshpatchElement interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [SVGMeshpatchElement interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [SVGElement interface: stop must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: stop must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: stop must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: stop must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: stop must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: stop must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: stop must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: stop must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: stop must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: stop must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: stop must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: pattern must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: pattern must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: pattern must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: pattern must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: pattern must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: pattern must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: pattern must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: pattern must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: pattern must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: pattern must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: pattern must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGHatchElement interface: existence and properties of interface object]
-    expected: FAIL
-
-  [SVGHatchElement interface object length]
-    expected: FAIL
-
-  [SVGHatchElement interface object name]
-    expected: FAIL
-
-  [SVGHatchElement interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [SVGHatchElement interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [SVGHatchpathElement interface: existence and properties of interface object]
-    expected: FAIL
-
-  [SVGHatchpathElement interface object length]
-    expected: FAIL
-
-  [SVGHatchpathElement interface object name]
-    expected: FAIL
-
-  [SVGHatchpathElement interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [SVGHatchpathElement interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [SVGCursorElement interface: existence and properties of interface object]
-    expected: FAIL
-
-  [SVGCursorElement interface object length]
-    expected: FAIL
-
-  [SVGCursorElement interface object name]
-    expected: FAIL
-
-  [SVGCursorElement interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [SVGCursorElement interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [SVGCursorElement interface: attribute x]
-    expected: FAIL
-
-  [SVGCursorElement interface: attribute y]
-    expected: FAIL
-
-  [SVGCursorElement interface: attribute href]
-    expected: FAIL
-
-  [SVGCursorElement must be primary interface of cursor]
-    expected: FAIL
-
-  [Stringification of cursor]
-    expected: FAIL
-
-  [SVGCursorElement interface: cursor must inherit property "x" with the proper type (0)]
-    expected: FAIL
-
-  [SVGCursorElement interface: cursor must inherit property "y" with the proper type (1)]
-    expected: FAIL
-
-  [SVGCursorElement interface: cursor must inherit property "href" with the proper type (2)]
-    expected: FAIL
-
-  [SVGElement interface: cursor must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: cursor must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: cursor must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: cursor must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: cursor must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: cursor must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: cursor must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: cursor must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: cursor must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: cursor must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: cursor must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGScriptElement interface: script must inherit property "crossOrigin" with the proper type (1)]
-    expected: FAIL
-
-  [SVGElement interface: script must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: script must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: script must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: script must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: script must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: script must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: script must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: script must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: script must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: script must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: script must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGZoomEvent interface: existence and properties of interface object]
-    expected: FAIL
-
-  [SVGZoomEvent interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [SVGZoomEvent interface: attribute zoomRectScreen]
-    expected: FAIL
-
-  [SVGElement interface: a must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: a must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: a must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: a must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: a must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: a must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: a must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: a must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: a must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: a must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: a must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: view must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: view must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: view must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: view must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: view must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: view must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: view must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: view must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: view must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: view must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: view must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: filter must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: filter must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: filter must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: filter must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: filter must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: filter must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: filter must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: filter must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: filter must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: filter must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: filter must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: feBlend must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: feBlend must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: feBlend must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: feBlend must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: feBlend must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: feBlend must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: feBlend must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: feBlend must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: feBlend must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: feBlend must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: feBlend must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: feColorMatrix must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: feColorMatrix must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: feColorMatrix must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: feColorMatrix must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: feColorMatrix must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: feColorMatrix must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: feColorMatrix must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: feColorMatrix must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: feColorMatrix must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: feColorMatrix must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: feColorMatrix must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: feComponentTransfer must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: feComponentTransfer must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: feComponentTransfer must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: feComponentTransfer must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: feComponentTransfer must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: feComponentTransfer must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: feComponentTransfer must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: feComponentTransfer must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: feComponentTransfer must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: feComponentTransfer must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: feComponentTransfer must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncR must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncR must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncR must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncR must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncR must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncR must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncR must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncR must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncR must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncR must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncR must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncG must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncG must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncG must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncG must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncG must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncG must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncG must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncG must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncG must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncG must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncG must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncB must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncB must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncB must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncB must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncB must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncB must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncB must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncB must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncB must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncB must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncB must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncA must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncA must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncA must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncA must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncA must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncA must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncA must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncA must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncA must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncA must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: feFuncA must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: feComposite must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: feComposite must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: feComposite must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: feComposite must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: feComposite must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: feComposite must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: feComposite must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: feComposite must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: feComposite must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: feComposite must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: feComposite must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: feConvolveMatrix must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: feConvolveMatrix must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: feConvolveMatrix must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: feConvolveMatrix must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: feConvolveMatrix must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: feConvolveMatrix must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: feConvolveMatrix must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: feConvolveMatrix must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: feConvolveMatrix must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: feConvolveMatrix must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: feConvolveMatrix must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: feDiffuseLighting must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: feDiffuseLighting must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: feDiffuseLighting must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: feDiffuseLighting must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: feDiffuseLighting must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: feDiffuseLighting must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: feDiffuseLighting must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: feDiffuseLighting must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: feDiffuseLighting must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: feDiffuseLighting must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: feDiffuseLighting must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: fePointLight must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: fePointLight must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: fePointLight must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: fePointLight must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: fePointLight must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: fePointLight must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: fePointLight must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: fePointLight must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: fePointLight must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: fePointLight must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: fePointLight must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: feSpotLight must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: feSpotLight must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: feSpotLight must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: feSpotLight must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: feSpotLight must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: feSpotLight must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: feSpotLight must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: feSpotLight must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: feSpotLight must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: feSpotLight must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: feSpotLight must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: feDisplacementMap must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: feDisplacementMap must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: feDisplacementMap must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: feDisplacementMap must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: feDisplacementMap must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: feDisplacementMap must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: feDisplacementMap must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: feDisplacementMap must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: feDisplacementMap must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: feDisplacementMap must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: feDisplacementMap must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: feDropShadow must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: feDropShadow must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: feDropShadow must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: feDropShadow must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: feDropShadow must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: feDropShadow must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: feDropShadow must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: feDropShadow must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: feDropShadow must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: feDropShadow must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: feDropShadow must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: feFlood must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: feFlood must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: feFlood must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: feFlood must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: feFlood must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: feFlood must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: feFlood must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: feFlood must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: feFlood must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: feFlood must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: feFlood must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGFEGaussianBlurElement interface: constant SVG_EDGEMODE_UNKNOWN on interface object]
-    expected: FAIL
-
-  [SVGFEGaussianBlurElement interface: constant SVG_EDGEMODE_UNKNOWN on interface prototype object]
-    expected: FAIL
-
-  [SVGFEGaussianBlurElement interface: constant SVG_EDGEMODE_DUPLICATE on interface object]
-    expected: FAIL
-
-  [SVGFEGaussianBlurElement interface: constant SVG_EDGEMODE_DUPLICATE on interface prototype object]
-    expected: FAIL
-
-  [SVGFEGaussianBlurElement interface: constant SVG_EDGEMODE_WRAP on interface object]
-    expected: FAIL
-
-  [SVGFEGaussianBlurElement interface: constant SVG_EDGEMODE_WRAP on interface prototype object]
-    expected: FAIL
-
-  [SVGFEGaussianBlurElement interface: constant SVG_EDGEMODE_NONE on interface object]
-    expected: FAIL
-
-  [SVGFEGaussianBlurElement interface: constant SVG_EDGEMODE_NONE on interface prototype object]
-    expected: FAIL
-
-  [SVGFEGaussianBlurElement interface: attribute edgeMode]
-    expected: FAIL
-
-  [SVGFEGaussianBlurElement must be primary interface of feGaussianBlur]
-    expected: FAIL
-
-  [Stringification of feGaussianBlur]
-    expected: FAIL
-
-  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "SVG_EDGEMODE_UNKNOWN" with the proper type (0)]
-    expected: FAIL
-
-  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "SVG_EDGEMODE_DUPLICATE" with the proper type (1)]
-    expected: FAIL
-
-  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "SVG_EDGEMODE_WRAP" with the proper type (2)]
-    expected: FAIL
-
-  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "SVG_EDGEMODE_NONE" with the proper type (3)]
-    expected: FAIL
-
-  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "in1" with the proper type (4)]
-    expected: FAIL
-
-  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "stdDeviationX" with the proper type (5)]
-    expected: FAIL
-
-  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "stdDeviationY" with the proper type (6)]
-    expected: FAIL
-
-  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "edgeMode" with the proper type (7)]
-    expected: FAIL
-
-  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "setStdDeviation" with the proper type (8)]
-    expected: FAIL
-
-  [SVGFEGaussianBlurElement interface: calling setStdDeviation(float,float) on feGaussianBlur with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "x" with the proper type (9)]
-    expected: FAIL
-
-  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "y" with the proper type (10)]
-    expected: FAIL
-
-  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "width" with the proper type (11)]
-    expected: FAIL
-
-  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "height" with the proper type (12)]
-    expected: FAIL
-
-  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "result" with the proper type (13)]
-    expected: FAIL
-
-  [SVGElement interface: feGaussianBlur must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: feGaussianBlur must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: feGaussianBlur must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: feGaussianBlur must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: feGaussianBlur must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: feGaussianBlur must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: feGaussianBlur must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: feGaussianBlur must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: feGaussianBlur must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: feGaussianBlur must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: feGaussianBlur must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGFEImageElement interface: attribute crossOrigin]
-    expected: FAIL
-
-  [SVGFEImageElement interface: feImage must inherit property "crossOrigin" with the proper type (1)]
-    expected: FAIL
-
-  [SVGElement interface: feImage must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: feImage must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: feImage must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: feImage must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: feImage must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: feImage must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: feImage must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: feImage must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: feImage must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: feImage must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: feImage must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: feMerge must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: feMerge must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: feMerge must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: feMerge must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: feMerge must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: feMerge must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: feMerge must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: feMerge must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: feMerge must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: feMerge must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: feMerge must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: feMergeNode must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: feMergeNode must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: feMergeNode must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: feMergeNode must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: feMergeNode must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: feMergeNode must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: feMergeNode must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: feMergeNode must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: feMergeNode must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: feMergeNode must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: feMergeNode must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: feMorphology must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: feMorphology must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: feMorphology must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: feMorphology must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: feMorphology must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: feMorphology must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: feMorphology must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: feMorphology must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: feMorphology must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: feMorphology must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: feMorphology must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: feSpecularLighting must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: feSpecularLighting must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: feSpecularLighting must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: feSpecularLighting must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: feSpecularLighting must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: feSpecularLighting must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: feSpecularLighting must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: feSpecularLighting must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: feSpecularLighting must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: feSpecularLighting must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: feSpecularLighting must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: feTile must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: feTile must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: feTile must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: feTile must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: feTile must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: feTile must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: feTile must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: feTile must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: feTile must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: feTile must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: feTile must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
-  [SVGElement interface: feTurbulence must inherit property "tabIndex" with the proper type (3)]
-    expected: FAIL
-
-  [SVGElement interface: feTurbulence must inherit property "focus" with the proper type (4)]
-    expected: FAIL
-
-  [SVGElement interface: feTurbulence must inherit property "blur" with the proper type (5)]
-    expected: FAIL
-
-  [SVGElement interface: feTurbulence must inherit property "onautocomplete" with the proper type (7)]
-    expected: FAIL
-
-  [SVGElement interface: feTurbulence must inherit property "onautocompleteerror" with the proper type (8)]
-    expected: FAIL
-
-  [SVGElement interface: feTurbulence must inherit property "oncancel" with the proper type (10)]
-    expected: FAIL
-
-  [SVGElement interface: feTurbulence must inherit property "onclose" with the proper type (15)]
-    expected: FAIL
-
-  [SVGElement interface: feTurbulence must inherit property "oncuechange" with the proper type (17)]
-    expected: FAIL
-
-  [SVGElement interface: feTurbulence must inherit property "ondragexit" with the proper type (22)]
-    expected: FAIL
-
-  [SVGElement interface: feTurbulence must inherit property "onsort" with the proper type (61)]
-    expected: FAIL
-
-  [SVGElement interface: feTurbulence must inherit property "ontoggle" with the proper type (66)]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/url/a-element-xhtml.xhtml.ini b/testing/web-platform/meta/url/a-element-xhtml.xhtml.ini
deleted file mode 100644
index 97761ad3034a..000000000000
--- a/testing/web-platform/meta/url/a-element-xhtml.xhtml.ini
+++ /dev/null
@@ -1,488 +0,0 @@
-[a-element-xhtml.xhtml]
-  type: testharness
-  [Parsing: <a:\t foo.com> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <http://f:21/ b ? d # e > against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <http://f:b/c> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <http://f: /c> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <http://f:fifty-two/c> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <http://f: 21 / b ? d # e > against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <:foo.com\\> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <:\\> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <foo://> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <http::@c:29> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <http://&a:foo(b\]c@d:2/> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <http://::@c@d:2> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <http://foo.com:b@d/> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <http://foo.com/\\@> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <http:\\\\foo.com\\> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <http:\\\\a\\b:c\\d@foo.com\\> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <foo:/> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <foo:/bar.com/> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <foo://///////> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <foo://///////bar.com/> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <foo:////://///> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <c:/foo> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <http://[1::2\]:3:4> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <http://2001::1> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <http://2001::1\]> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <http://2001::1\]:80> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <madeupscheme:/example.com/> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <file:/example.com/> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <ftps:/example.com/> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <gopher:/example.com/> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <data:/example.com/> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <javascript:/example.com/> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <mailto:/example.com/> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <madeupscheme:example.com/> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <ftps:example.com/> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <gopher:example.com/> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <data:example.com/> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <javascript:example.com/> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <mailto:example.com/> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <#β> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <data:text/html,test#test> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <file:c:\\foo\\bar.html> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <  File:c|////foo\\bar.html> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <C|/foo/bar> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: </C|\\foo\\bar> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <//C|/foo/bar> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <//server/file> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <\\\\server\\file> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: </\\server/file> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <file:///foo/bar.txt> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <file:///home/me> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <//> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <///> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <///test> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <file://test> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <file://localhost> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <file://localhost/> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <file://localhost/test> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <test> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <file:test> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <http://example.com/foo/%2e> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://example.com\\\\foo\\\\bar> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://www.google.com/foo?bar=baz# »> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <data:test# »> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://[www.google.com\]/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://192.0x00A80001> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://user:pass@/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http:\\\\www.google.com\\foo> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <httpa://foo:80/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://foo:-80/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <gopher://foo:70/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <gopher://foo:443/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <madeupscheme:/example.com/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file:/example.com/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <ftps:/example.com/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <gopher:/example.com/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <data:/example.com/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <javascript:/example.com/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <mailto:/example.com/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <madeupscheme:example.com/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <ftps:example.com/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <gopher:example.com/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <data:example.com/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <javascript:example.com/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <mailto:example.com/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http::b@www.example.com> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http:/:b@www.example.com> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://:b@www.example.com> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http:/:@/www.example.com> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://user@/www.example.com> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http:@/www.example.com> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http:/@/www.example.com> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://@/www.example.com> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <https:@/www.example.com> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http:a:b@/www.example.com> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http:/a:b@/www.example.com> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://a:b@/www.example.com> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http::@/www.example.com> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://www.@pple.com> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http:@:www.example.com> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http:/@:www.example.com> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://@:www.example.com> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://:@www.example.com> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <file:..> against <http://www.example.com/test>]
-    expected: FAIL
-
-  [Parsing: <http://example example.com> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <http://Goo%20 goo%7C|.com> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <http://[\]> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <http://[:\]> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <http://GOO 　goo.com> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <http://﷐zyx.com> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <http://%ef%b7%90zyx.com> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <http://％４１.com> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <http://%ef%bc%85%ef%bc%94%ef%bc%91.com> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <http://％００.com> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <http://%ef%bc%85%ef%bc%90%ef%bc%90.com> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <http://你好你好> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <http://%zz%66%a.com> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <http://%25> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <http://hello%00> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <http://%30%78%63%30%2e%30%32%35%30.01> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <http://%30%78%63%30%2e%30%32%35%30.01%2e> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <http://192.168.0.257> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <http://%3g%78%63%30%2e%30%32%35%30%2E.01> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <http://192.168.0.1 hello> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <http://０Ｘｃ０．０２５０．０１> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <http://[google.com\]> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <#> against <test:test>]
-    expected: FAIL
-
-  [Parsing: <#x> against <mailto:x@x.com>]
-    expected: FAIL
-
-  [Parsing: <#x> against <data:,>]
-    expected: FAIL
-
-  [Parsing: <#x> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <#> against <test:test?test>]
-    expected: FAIL
-
-  [Parsing: <i> against <sc:sd>]
-    expected: FAIL
-
-  [Parsing: <i> against <sc:sd/sd>]
-    expected: FAIL
-
-  [Parsing: <i> against <sc:/pa/pa>]
-    expected: FAIL
-
-  [Parsing: <i> against <sc://ho/pa>]
-    expected: FAIL
-
-  [Parsing: <i> against <sc:///pa/pa>]
-    expected: FAIL
-
-  [Parsing: <../i> against <sc:sd>]
-    expected: FAIL
-
-  [Parsing: <../i> against <sc:sd/sd>]
-    expected: FAIL
-
-  [Parsing: <../i> against <sc:/pa/pa>]
-    expected: FAIL
-
-  [Parsing: <../i> against <sc://ho/pa>]
-    expected: FAIL
-
-  [Parsing: <../i> against <sc:///pa/pa>]
-    expected: FAIL
-
-  [Parsing: </i> against <sc:sd>]
-    expected: FAIL
-
-  [Parsing: </i> against <sc:sd/sd>]
-    expected: FAIL
-
-  [Parsing: </i> against <sc:/pa/pa>]
-    expected: FAIL
-
-  [Parsing: </i> against <sc://ho/pa>]
-    expected: FAIL
-
-  [Parsing: </i> against <sc:///pa/pa>]
-    expected: FAIL
-
-  [Parsing: <?i> against <sc:sd>]
-    expected: FAIL
-
-  [Parsing: <?i> against <sc:sd/sd>]
-    expected: FAIL
-
-  [Parsing: <?i> against <sc:/pa/pa>]
-    expected: FAIL
-
-  [Parsing: <?i> against <sc://ho/pa>]
-    expected: FAIL
-
-  [Parsing: <?i> against <sc:///pa/pa>]
-    expected: FAIL
-
-  [Parsing: <#i> against <sc:sd>]
-    expected: FAIL
-
-  [Parsing: <#i> against <sc:sd/sd>]
-    expected: FAIL
-
-  [Parsing: <#i> against <sc:/pa/pa>]
-    expected: FAIL
-
-  [Parsing: <#i> against <sc://ho/pa>]
-    expected: FAIL
-
-  [Parsing: <#i> against <sc:///pa/pa>]
-    expected: FAIL
-
-  [Parsing: <about:/../> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <data:/../> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <javascript:/../> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <mailto:/../> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc://ñ.test/> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <sc:\\../> against <about:blank>]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/url/interfaces.html.ini b/testing/web-platform/meta/url/interfaces.html.ini
index 5c5d8df9270a..5797a138bf23 100644
--- a/testing/web-platform/meta/url/interfaces.html.ini
+++ b/testing/web-platform/meta/url/interfaces.html.ini
@@ -1,6 +1,5 @@
 [interfaces.html]
   type: testharness
-  expected: ERROR
   [URL interface: operation domainToASCII(ScalarValueString)]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/webgl/compressedTexSubImage2D.html.ini b/testing/web-platform/meta/webgl/compressedTexSubImage2D.html.ini
index 5a4db990cafb..777d51687dca 100644
--- a/testing/web-platform/meta/webgl/compressedTexSubImage2D.html.ini
+++ b/testing/web-platform/meta/webgl/compressedTexSubImage2D.html.ini
@@ -7,9 +7,3 @@
       if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
 
-  [Calling function () {\n    gl.compressedTexSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 10, 10, COMPRESSED_RGB_S3TC_DXT1_EXT, new Uint8Array(8));\n  } should generate a 1280 error.]
-    expected: FAIL
-
-  [Calling function () {\n    gl.compressedTexSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 10, 10, COMPRESSED_RGB_S3TC_DXT1_EXT, new Uint8Array(8), null);\n  } should generate a 1280 error.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/webvtt/interfaces.html.ini b/testing/web-platform/meta/webvtt/interfaces.html.ini
index ceb09ef7ed95..8fed81605172 100644
--- a/testing/web-platform/meta/webvtt/interfaces.html.ini
+++ b/testing/web-platform/meta/webvtt/interfaces.html.ini
@@ -78,6 +78,3 @@
   [VTTRegion interface: new VTTRegion() must inherit property "scroll" with the proper type (6)]
     expected: FAIL
 
-  [VTTRegion interface object name]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past.html.ini
index 628f60bc5646..b0f53fb7b7fa 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past.html.ini
@@ -1,3 +1,4 @@
 [underline_timestamp_past.html]
   type: reftest
-  expected: FAIL
+  expected:
+    FAIL
diff --git a/testing/web-platform/tests/battery-status/battery-created-manual.html b/testing/web-platform/tests/battery-status/battery-created-manual.html
new file mode 100644
index 000000000000..e3b8d69cf4da
--- /dev/null
+++ b/testing/web-platform/tests/battery-status/battery-created-manual.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Battery Test: no backend implementation, charger unplugged in</title>
+<meta name="flags" content="interact">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<h2>Description</h2>
+<p>
+  <strong>
+    This test is only useful on devices that expose the BatteryManager interface,
+    but lack a backend implementation.
+  </strong>
+</p>
+<p>
+  This test validates that all of the BatteryManager attributes exist and are set to their default values.
+</p>
+
+<h2>Preconditions</h2>
+<ol>
+  <li>
+    The implementation is unable to report the battery's charging state,
+    charging time, level or remaining time respectively.
+  </li>
+  <li>
+    The device is unplugged from the charger before this test case is run.
+  </li>
+</ol>
+
+<div id="log"></div>
+
+<script>
+
+async_test(function (t) {
+  navigator.getBattery().then(function (battery) {
+    t.step(function () {
+      assert_true(battery.charging, 'charging must be set to true');
+      assert_equals(battery.chargingTime, 0, 'chargingTime must be set to 0');
+      assert_equals(battery.dischargingTime, Infinity, 'dischargingTime must be set to Infinity');
+      assert_equals(battery.level, 1.0, 'level must be set to 1.0');
+    });
+    t.done();
+  }, function (error) {
+    t.step(function () {
+      assert_unreached(error.message);
+    });
+    t.done();
+  });
+}, 'When a BatteryManager object is created, charging must be set to true, ' +
+   'chargingTime to 0, level to 1.0 and dischargingTime to the value positive ' +
+   'Infinity, if the implementation is unable to report the battery\'s charging ' +
+   'state, charging time, level or remaining time respectively.');
+
+</script>
diff --git a/testing/web-platform/tests/conformance-checkers/messages.json b/testing/web-platform/tests/conformance-checkers/messages.json
index 4a7959a4a3c5..1b5daba1f65a 100644
--- a/testing/web-platform/tests/conformance-checkers/messages.json
+++ b/testing/web-platform/tests/conformance-checkers/messages.json
@@ -51,12 +51,12 @@
     "html/attributes/lang/xmllang-only-novalid.html": "When the attribute \u201cxml:lang\u201d in no namespace is specified, the element must also have the attribute \u201clang\u201d present with the same value.",
     "html/attributes/role/unrecognized-role-name-novalid.html": "Discarding unrecognized tokens \u201cswitch\u201d, \u201cinput\u201d from value of attribute \u201crole\u201d. Browsers ignore any token that is not a defined ARIA non-abstract role.",
     "html/attributes/spellcheck/value-bad-novalid.html": "Bad value \u201cbadvalue\u201d for attribute \u201cspellcheck\u201d on element \u201cp\u201d.",
-    "html/elements/a/href/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
-    "html/elements/a/href/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
-    "html/elements/a/href/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
+    "html/elements/a/href/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/a/href/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/a/href/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
     "html/elements/a/href/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/a/href/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/a/href/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/a/href/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/a/href/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/a/href/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/a/href/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/a/href/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: empty host.",
@@ -64,38 +64,38 @@
     "html/elements/a/href/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/a/href/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/a/href/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/a/href/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/elements/a/href/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/a/href/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
+    "html/elements/a/href/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port.",
     "html/elements/a/href/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/a/href/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/a/href/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/a/href/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/a/href/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/a/href/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/a/href/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/a/href/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/a/href/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/a/href/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/a/href/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/a/href/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/a/href/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/a/href/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/a/href/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
+    "html/elements/a/href/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/a/href/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/a/href/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/a/href/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/a/href/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/a/href/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/a/href/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/a/href/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/a/href/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/elements/a/href/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/elements/a/href/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port.",
+    "html/elements/a/href/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port.",
+    "html/elements/a/href/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port.",
+    "html/elements/a/href/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port.",
     "html/elements/a/href/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/a/href/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/elements/a/href/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/elements/a/href/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port.",
+    "html/elements/a/href/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port.",
     "html/elements/a/href/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/a/href/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in query: space is not allowed.",
-    "html/elements/a/href/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/a/href/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/a/href/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in query: not a URL code point.",
     "html/elements/a/href/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/a/href/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/a/href/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/a/href/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/elements/a/href/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/a/href/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/a/href/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/a/href/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/a/href/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/a/href/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Expected a slash (\"/\").",
@@ -106,26 +106,26 @@
     "html/elements/a/href/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/a/href/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/a/href/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: syntax error",
-    "html/elements/a/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/a/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/a/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
-    "html/elements/a/href/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
+    "html/elements/a/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/a/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/a/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/a/href/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
     "html/elements/a/href/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/a/href/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/elements/a/href/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/a/href/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/elements/a/href/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/a/href/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/a/href/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/a/href/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/a/media-novalid.html": "Attribute \u201cmedia\u201d not allowed on element \u201ca\u201d in this context.",
     "html/elements/a/model-novalid.html": "Element \u201cp\u201d not allowed in this context. (The parent was element \u201ca\u201d.) Suppressing further errors from this subtree.",
     "html/elements/a/name-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201cname\u201d on element \u201ca\u201d: Bad id: An ID must not be the empty string.",
     "html/elements/abbr/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/address/model-novalid.html": "The element \u201caddress\u201d must not appear as a descendant of the \u201caddress\u201d element.",
-    "html/elements/area/href/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
-    "html/elements/area/href/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
-    "html/elements/area/href/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
+    "html/elements/area/href/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/area/href/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/area/href/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
     "html/elements/area/href/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/area/href/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/area/href/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/area/href/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/area/href/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/area/href/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/area/href/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/area/href/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: empty host.",
@@ -133,38 +133,38 @@
     "html/elements/area/href/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/area/href/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/area/href/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/area/href/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/elements/area/href/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/area/href/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
+    "html/elements/area/href/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port.",
     "html/elements/area/href/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/area/href/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/area/href/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/area/href/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/area/href/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/area/href/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/area/href/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/area/href/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/area/href/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/area/href/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/area/href/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/area/href/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/area/href/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/area/href/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/area/href/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
+    "html/elements/area/href/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/area/href/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/area/href/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/area/href/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/area/href/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/area/href/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/area/href/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/area/href/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/area/href/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/elements/area/href/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/elements/area/href/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port.",
+    "html/elements/area/href/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port.",
+    "html/elements/area/href/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port.",
+    "html/elements/area/href/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port.",
     "html/elements/area/href/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/area/href/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/elements/area/href/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/elements/area/href/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port.",
+    "html/elements/area/href/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port.",
     "html/elements/area/href/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/area/href/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in query: space is not allowed.",
-    "html/elements/area/href/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/area/href/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/area/href/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in query: not a URL code point.",
     "html/elements/area/href/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/area/href/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/area/href/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/area/href/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/elements/area/href/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/area/href/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/area/href/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/area/href/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/area/href/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/area/href/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Expected a slash (\"/\").",
@@ -175,26 +175,26 @@
     "html/elements/area/href/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/area/href/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/area/href/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: syntax error",
-    "html/elements/area/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/area/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/area/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
-    "html/elements/area/href/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
+    "html/elements/area/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/area/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/area/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/area/href/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
     "html/elements/area/href/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/area/href/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/elements/area/href/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/area/href/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/elements/area/href/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/area/href/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/area/href/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/area/href/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/area/media-novalid.html": "Attribute \u201cmedia\u201d not allowed on element \u201carea\u201d in this context.",
     "html/elements/area/model-novalid.html": "Attribute \u201ccoords\u201d not allowed on element \u201carea\u201d in this context.",
     "html/elements/audio/model-novalid.html": "Element \u201cp\u201d not allowed in this context. (The parent was element \u201caudio\u201d.) Suppressing further errors from this subtree.",
     "html/elements/audio/src-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Must be non-empty.",
     "html/elements/audio/src-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Must be non-empty.",
-    "html/elements/audio/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
-    "html/elements/audio/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
-    "html/elements/audio/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
+    "html/elements/audio/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/audio/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/audio/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
     "html/elements/audio/src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/audio/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/audio/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/audio/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/audio/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/audio/src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/audio/src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/audio/src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: empty host.",
@@ -202,38 +202,38 @@
     "html/elements/audio/src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/audio/src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/audio/src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/audio/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/elements/audio/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/audio/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
+    "html/elements/audio/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port.",
     "html/elements/audio/src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/audio/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/audio/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/audio/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/audio/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/audio/src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/audio/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/audio/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/audio/src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/audio/src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/audio/src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/audio/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/audio/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/audio/src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/audio/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
+    "html/elements/audio/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/audio/src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/audio/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/audio/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/audio/src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/audio/src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/audio/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/audio/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/audio/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/elements/audio/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/elements/audio/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port.",
+    "html/elements/audio/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port.",
+    "html/elements/audio/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port.",
+    "html/elements/audio/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port.",
     "html/elements/audio/src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/audio/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/elements/audio/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/elements/audio/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port.",
+    "html/elements/audio/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port.",
     "html/elements/audio/src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/audio/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in query: space is not allowed.",
-    "html/elements/audio/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/audio/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/audio/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in query: not a URL code point.",
     "html/elements/audio/src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/audio/src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/audio/src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/audio/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/elements/audio/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/audio/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/audio/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/audio/src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/audio/src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/audio/src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Expected a slash (\"/\").",
@@ -244,22 +244,22 @@
     "html/elements/audio/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/audio/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/audio/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: syntax error",
-    "html/elements/audio/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/audio/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/audio/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
-    "html/elements/audio/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
+    "html/elements/audio/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/audio/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/audio/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/audio/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
     "html/elements/audio/src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/audio/src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/elements/audio/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/audio/src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/elements/audio/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/audio/src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/audio/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/audio/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/base/href-and-target-missing-novalid.html": "Element \u201cbase\u201d is missing one or more of the following attributes: [href, target].",
-    "html/elements/base/href/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
-    "html/elements/base/href/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
-    "html/elements/base/href/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
+    "html/elements/base/href/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/base/href/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/base/href/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
     "html/elements/base/href/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/base/href/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/base/href/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/base/href/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/base/href/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/base/href/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/base/href/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/base/href/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: empty host.",
@@ -267,38 +267,38 @@
     "html/elements/base/href/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/base/href/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/base/href/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/base/href/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/elements/base/href/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/base/href/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
+    "html/elements/base/href/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port.",
     "html/elements/base/href/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/base/href/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/base/href/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/base/href/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/base/href/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/base/href/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/base/href/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/base/href/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/base/href/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/base/href/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/base/href/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/base/href/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/base/href/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/base/href/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/base/href/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
+    "html/elements/base/href/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/base/href/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/base/href/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/base/href/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/base/href/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/base/href/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/base/href/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/base/href/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/base/href/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/elements/base/href/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/elements/base/href/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port.",
+    "html/elements/base/href/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port.",
+    "html/elements/base/href/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port.",
+    "html/elements/base/href/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port.",
     "html/elements/base/href/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/base/href/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/elements/base/href/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/elements/base/href/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port.",
+    "html/elements/base/href/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port.",
     "html/elements/base/href/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/base/href/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in query: space is not allowed.",
-    "html/elements/base/href/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/base/href/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/base/href/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in query: not a URL code point.",
     "html/elements/base/href/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/base/href/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/base/href/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/base/href/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/elements/base/href/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/base/href/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/base/href/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/base/href/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/base/href/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/base/href/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Expected a slash (\"/\").",
@@ -309,22 +309,22 @@
     "html/elements/base/href/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/base/href/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/base/href/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: syntax error",
-    "html/elements/base/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/base/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/base/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
-    "html/elements/base/href/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
+    "html/elements/base/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/base/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/base/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/base/href/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
     "html/elements/base/href/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/base/href/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/elements/base/href/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/base/href/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/elements/base/href/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/base/href/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/base/href/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/base/href/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/bdo/model-novalid.html": "Element \u201cbdo\u201d must have attribute \u201cdir\u201d.",
-    "html/elements/blockquote/cite/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
-    "html/elements/blockquote/cite/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
-    "html/elements/blockquote/cite/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
+    "html/elements/blockquote/cite/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/blockquote/cite/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/blockquote/cite/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
     "html/elements/blockquote/cite/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/blockquote/cite/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/blockquote/cite/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/blockquote/cite/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/blockquote/cite/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/blockquote/cite/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/blockquote/cite/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/blockquote/cite/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: empty host.",
@@ -332,38 +332,38 @@
     "html/elements/blockquote/cite/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/blockquote/cite/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/blockquote/cite/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/blockquote/cite/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/elements/blockquote/cite/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/blockquote/cite/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
+    "html/elements/blockquote/cite/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port.",
     "html/elements/blockquote/cite/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/blockquote/cite/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/blockquote/cite/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/blockquote/cite/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/blockquote/cite/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/blockquote/cite/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/blockquote/cite/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/blockquote/cite/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/blockquote/cite/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/blockquote/cite/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/blockquote/cite/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/blockquote/cite/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/blockquote/cite/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/blockquote/cite/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/blockquote/cite/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
+    "html/elements/blockquote/cite/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/blockquote/cite/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/blockquote/cite/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/blockquote/cite/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/blockquote/cite/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/blockquote/cite/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/blockquote/cite/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/blockquote/cite/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/blockquote/cite/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/elements/blockquote/cite/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/elements/blockquote/cite/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port.",
+    "html/elements/blockquote/cite/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port.",
+    "html/elements/blockquote/cite/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port.",
+    "html/elements/blockquote/cite/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port.",
     "html/elements/blockquote/cite/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/blockquote/cite/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/elements/blockquote/cite/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/elements/blockquote/cite/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port.",
+    "html/elements/blockquote/cite/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port.",
     "html/elements/blockquote/cite/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/blockquote/cite/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in query: space is not allowed.",
-    "html/elements/blockquote/cite/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/blockquote/cite/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/blockquote/cite/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in query: not a URL code point.",
     "html/elements/blockquote/cite/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/blockquote/cite/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/blockquote/cite/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/blockquote/cite/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/elements/blockquote/cite/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/blockquote/cite/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/blockquote/cite/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/blockquote/cite/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/blockquote/cite/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/blockquote/cite/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Expected a slash (\"/\").",
@@ -374,25 +374,25 @@
     "html/elements/blockquote/cite/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/blockquote/cite/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/blockquote/cite/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: syntax error",
-    "html/elements/blockquote/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/blockquote/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/blockquote/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
-    "html/elements/blockquote/cite/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
+    "html/elements/blockquote/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/blockquote/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/blockquote/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/blockquote/cite/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
     "html/elements/blockquote/cite/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/blockquote/cite/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/elements/blockquote/cite/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/blockquote/cite/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/elements/blockquote/cite/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/blockquote/cite/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/blockquote/cite/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/blockquote/cite/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/blockquote/model-novalid.html": "No \u201cp\u201d element in scope but a \u201cp\u201d end tag seen.",
     "html/elements/br/model-novalid.html": "End tag \u201cbr\u201d.",
     "html/elements/button/formaction-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Must be non-empty.",
     "html/elements/button/formaction-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Must be non-empty.",
-    "html/elements/button/formaction/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
-    "html/elements/button/formaction/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
-    "html/elements/button/formaction/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
+    "html/elements/button/formaction/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/button/formaction/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/button/formaction/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
     "html/elements/button/formaction/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/button/formaction/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/button/formaction/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/button/formaction/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/button/formaction/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/button/formaction/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/button/formaction/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/button/formaction/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: empty host.",
@@ -400,38 +400,38 @@
     "html/elements/button/formaction/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/button/formaction/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/button/formaction/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/button/formaction/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/elements/button/formaction/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/button/formaction/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
+    "html/elements/button/formaction/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port.",
     "html/elements/button/formaction/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/button/formaction/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/button/formaction/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/button/formaction/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/button/formaction/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/button/formaction/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/button/formaction/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/button/formaction/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/button/formaction/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/button/formaction/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/button/formaction/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/button/formaction/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/button/formaction/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/button/formaction/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/button/formaction/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
+    "html/elements/button/formaction/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/button/formaction/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/button/formaction/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/button/formaction/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/button/formaction/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/button/formaction/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/button/formaction/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/button/formaction/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/button/formaction/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/elements/button/formaction/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/elements/button/formaction/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port.",
+    "html/elements/button/formaction/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port.",
+    "html/elements/button/formaction/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port.",
+    "html/elements/button/formaction/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port.",
     "html/elements/button/formaction/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/button/formaction/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/elements/button/formaction/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/elements/button/formaction/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port.",
+    "html/elements/button/formaction/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port.",
     "html/elements/button/formaction/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/button/formaction/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in query: space is not allowed.",
-    "html/elements/button/formaction/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/button/formaction/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/button/formaction/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in query: not a URL code point.",
     "html/elements/button/formaction/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/button/formaction/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/button/formaction/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/button/formaction/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/elements/button/formaction/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/button/formaction/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/button/formaction/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/button/formaction/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/button/formaction/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/button/formaction/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Expected a slash (\"/\").",
@@ -442,24 +442,24 @@
     "html/elements/button/formaction/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/button/formaction/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/button/formaction/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: syntax error",
-    "html/elements/button/formaction/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/button/formaction/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/button/formaction/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
-    "html/elements/button/formaction/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
+    "html/elements/button/formaction/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/button/formaction/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/button/formaction/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/button/formaction/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
     "html/elements/button/formaction/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/button/formaction/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/elements/button/formaction/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/button/formaction/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/elements/button/formaction/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/button/formaction/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/button/formaction/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/button/formaction/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/canvas/model-novalid.html": "Element \u201cp\u201d not allowed in this context. (The parent was element \u201ccanvas\u201d.) Suppressing further errors from this subtree.",
     "html/elements/cite/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/code/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
-    "html/elements/del/cite/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
-    "html/elements/del/cite/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
-    "html/elements/del/cite/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
+    "html/elements/del/cite/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/del/cite/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/del/cite/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
     "html/elements/del/cite/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/del/cite/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/del/cite/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/del/cite/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/del/cite/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/del/cite/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/del/cite/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/del/cite/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: empty host.",
@@ -467,38 +467,38 @@
     "html/elements/del/cite/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/del/cite/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/del/cite/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/del/cite/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/elements/del/cite/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/del/cite/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
+    "html/elements/del/cite/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port.",
     "html/elements/del/cite/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/del/cite/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/del/cite/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/del/cite/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/del/cite/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/del/cite/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/del/cite/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/del/cite/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/del/cite/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/del/cite/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/del/cite/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/del/cite/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/del/cite/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/del/cite/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/del/cite/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
+    "html/elements/del/cite/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/del/cite/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/del/cite/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/del/cite/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/del/cite/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/del/cite/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/del/cite/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/del/cite/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/del/cite/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/elements/del/cite/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/elements/del/cite/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port.",
+    "html/elements/del/cite/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port.",
+    "html/elements/del/cite/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port.",
+    "html/elements/del/cite/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port.",
     "html/elements/del/cite/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/del/cite/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/elements/del/cite/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/elements/del/cite/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port.",
+    "html/elements/del/cite/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port.",
     "html/elements/del/cite/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/del/cite/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in query: space is not allowed.",
-    "html/elements/del/cite/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/del/cite/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/del/cite/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in query: not a URL code point.",
     "html/elements/del/cite/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/del/cite/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/del/cite/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/del/cite/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/elements/del/cite/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/del/cite/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/del/cite/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/del/cite/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/del/cite/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/del/cite/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Expected a slash (\"/\").",
@@ -509,15 +509,15 @@
     "html/elements/del/cite/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/del/cite/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/del/cite/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: syntax error",
-    "html/elements/del/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/del/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/del/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
-    "html/elements/del/cite/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
+    "html/elements/del/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/del/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/del/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/del/cite/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
     "html/elements/del/cite/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/del/cite/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/elements/del/cite/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/del/cite/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/elements/del/cite/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/del/cite/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/del/cite/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/del/cite/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/del/date-0004-02-29-haswarn.html": "Bad value \u201c0004-02-29\u201d for attribute \u201cdatetime\u201d on element \u201cdel\u201d: Bad date: Year may be mistyped. Bad datetime with timezone: The literal did not satisfy the datetime with timezone format.",
     "html/elements/del/date-0005-02-29-novalid.html": "Bad value \u201c0005-02-29\u201d for attribute \u201cdatetime\u201d on element \u201cdel\u201d: Bad datetime with timezone: The literal did not satisfy the datetime with timezone format. Bad date: Day out of range.",
     "html/elements/del/date-0214-09-29-haswarn.html": "Bad value \u201c0214-09-29\u201d for attribute \u201cdatetime\u201d on element \u201cdel\u201d: Bad date: Year may be mistyped. Bad datetime with timezone: The literal did not satisfy the datetime with timezone format.",
@@ -616,12 +616,12 @@
     "html/elements/embed/height-novalid.html": "Bad value \u201c20%\u201d for attribute \u201cheight\u201d on element \u201cembed\u201d: Bad non-negative integer: Expected a digit but saw \u201c%\u201d instead.",
     "html/elements/embed/src-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Must be non-empty.",
     "html/elements/embed/src-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Must be non-empty.",
-    "html/elements/embed/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
-    "html/elements/embed/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
-    "html/elements/embed/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
+    "html/elements/embed/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/embed/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/embed/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
     "html/elements/embed/src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/embed/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/embed/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/embed/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/embed/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/embed/src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/embed/src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/embed/src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: empty host.",
@@ -629,38 +629,38 @@
     "html/elements/embed/src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/embed/src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/embed/src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/embed/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/elements/embed/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/embed/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
+    "html/elements/embed/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port.",
     "html/elements/embed/src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/embed/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/embed/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/embed/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/embed/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/embed/src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/embed/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/embed/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/embed/src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/embed/src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/embed/src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/embed/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/embed/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/embed/src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/embed/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
+    "html/elements/embed/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/embed/src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/embed/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/embed/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/embed/src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/embed/src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/embed/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/embed/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/embed/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/elements/embed/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/elements/embed/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port.",
+    "html/elements/embed/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port.",
+    "html/elements/embed/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port.",
+    "html/elements/embed/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port.",
     "html/elements/embed/src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/embed/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/elements/embed/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/elements/embed/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port.",
+    "html/elements/embed/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port.",
     "html/elements/embed/src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/embed/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in query: space is not allowed.",
-    "html/elements/embed/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/embed/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/embed/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in query: not a URL code point.",
     "html/elements/embed/src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/embed/src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/embed/src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/embed/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/elements/embed/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/embed/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/embed/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/embed/src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/embed/src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/embed/src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Expected a slash (\"/\").",
@@ -671,27 +671,27 @@
     "html/elements/embed/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/embed/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/embed/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: syntax error",
-    "html/elements/embed/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/embed/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/embed/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
-    "html/elements/embed/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
+    "html/elements/embed/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/embed/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/embed/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/embed/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
     "html/elements/embed/src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/embed/src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/elements/embed/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/embed/src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/elements/embed/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/embed/src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/embed/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/embed/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/embed/type-novalid.html": "Bad value \u201cfoo\u201d for attribute \u201ctype\u201d on element \u201cembed\u201d: Bad MIME type: Subtype missing.",
     "html/elements/embed/width-novalid.html": "Bad value \u201c20%\u201d for attribute \u201cwidth\u201d on element \u201cembed\u201d: Bad non-negative integer: Expected a digit but saw \u201c%\u201d instead.",
     "html/elements/footer/nested-footer-novalid.html": "The element \u201cfooter\u201d must not appear as a descendant of the \u201cfooter\u201d element.",
     "html/elements/footer/nested-header-novalid.html": "The element \u201cheader\u201d must not appear as a descendant of the \u201cfooter\u201d element.",
     "html/elements/form/action-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Must be non-empty.",
     "html/elements/form/action-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Must be non-empty.",
-    "html/elements/form/action/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
-    "html/elements/form/action/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
-    "html/elements/form/action/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
+    "html/elements/form/action/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/form/action/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/form/action/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
     "html/elements/form/action/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/form/action/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/form/action/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/form/action/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/form/action/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/form/action/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/form/action/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/form/action/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: empty host.",
@@ -699,38 +699,38 @@
     "html/elements/form/action/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/form/action/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/form/action/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/form/action/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/elements/form/action/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/form/action/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
+    "html/elements/form/action/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port.",
     "html/elements/form/action/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/form/action/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/form/action/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/form/action/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/form/action/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/form/action/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/form/action/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/form/action/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/form/action/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/form/action/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/form/action/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/form/action/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/form/action/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/form/action/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/form/action/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
+    "html/elements/form/action/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/form/action/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/form/action/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/form/action/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/form/action/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/form/action/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/form/action/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/form/action/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/form/action/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/elements/form/action/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/elements/form/action/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port.",
+    "html/elements/form/action/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port.",
+    "html/elements/form/action/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port.",
+    "html/elements/form/action/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port.",
     "html/elements/form/action/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/form/action/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/elements/form/action/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/elements/form/action/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port.",
+    "html/elements/form/action/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port.",
     "html/elements/form/action/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/form/action/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in query: space is not allowed.",
-    "html/elements/form/action/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/form/action/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/form/action/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in query: not a URL code point.",
     "html/elements/form/action/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/form/action/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/form/action/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/form/action/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/elements/form/action/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/form/action/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/form/action/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/form/action/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/form/action/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/form/action/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Expected a slash (\"/\").",
@@ -741,15 +741,15 @@
     "html/elements/form/action/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/form/action/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/form/action/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: syntax error",
-    "html/elements/form/action/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/form/action/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/form/action/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
-    "html/elements/form/action/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
+    "html/elements/form/action/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/form/action/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/form/action/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/form/action/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
     "html/elements/form/action/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/form/action/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/elements/form/action/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/form/action/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/elements/form/action/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/form/action/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/form/action/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/form/action/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/h1/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/h2/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/h3/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
@@ -761,12 +761,12 @@
     "html/elements/hr/model-novalid.html": "No \u201cp\u201d element in scope but a \u201cp\u201d end tag seen.",
     "html/elements/html/manifest-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Must be non-empty.",
     "html/elements/html/manifest-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Must be non-empty.",
-    "html/elements/html/manifest/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
-    "html/elements/html/manifest/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
-    "html/elements/html/manifest/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
+    "html/elements/html/manifest/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/html/manifest/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/html/manifest/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
     "html/elements/html/manifest/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/html/manifest/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/html/manifest/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/html/manifest/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/html/manifest/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/html/manifest/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/html/manifest/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/html/manifest/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: empty host.",
@@ -774,38 +774,38 @@
     "html/elements/html/manifest/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/html/manifest/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/html/manifest/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/html/manifest/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/elements/html/manifest/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/html/manifest/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
+    "html/elements/html/manifest/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port.",
     "html/elements/html/manifest/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/html/manifest/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/html/manifest/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/html/manifest/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/html/manifest/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/html/manifest/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/html/manifest/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/html/manifest/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/html/manifest/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/html/manifest/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/html/manifest/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/html/manifest/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/html/manifest/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/html/manifest/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/html/manifest/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
+    "html/elements/html/manifest/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/html/manifest/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/html/manifest/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/html/manifest/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/html/manifest/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/html/manifest/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/html/manifest/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/html/manifest/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/html/manifest/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/elements/html/manifest/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/elements/html/manifest/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port.",
+    "html/elements/html/manifest/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port.",
+    "html/elements/html/manifest/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port.",
+    "html/elements/html/manifest/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port.",
     "html/elements/html/manifest/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/html/manifest/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/elements/html/manifest/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/elements/html/manifest/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port.",
+    "html/elements/html/manifest/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port.",
     "html/elements/html/manifest/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/html/manifest/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in query: space is not allowed.",
-    "html/elements/html/manifest/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/html/manifest/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/html/manifest/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in query: not a URL code point.",
     "html/elements/html/manifest/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/html/manifest/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/html/manifest/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/html/manifest/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/elements/html/manifest/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/html/manifest/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/html/manifest/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/html/manifest/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/html/manifest/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/html/manifest/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Expected a slash (\"/\").",
@@ -816,25 +816,25 @@
     "html/elements/html/manifest/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/html/manifest/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/html/manifest/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: syntax error",
-    "html/elements/html/manifest/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/html/manifest/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/html/manifest/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
-    "html/elements/html/manifest/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
+    "html/elements/html/manifest/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/html/manifest/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/html/manifest/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/html/manifest/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
     "html/elements/html/manifest/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/html/manifest/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/elements/html/manifest/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/html/manifest/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/elements/html/manifest/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/html/manifest/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/html/manifest/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/html/manifest/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/i/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/iframe/model-novalid.html": "The \u201cframeborder\u201d attribute on the \u201ciframe\u201d element is obsolete. Use CSS instead.",
     "html/elements/iframe/src-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Must be non-empty.",
     "html/elements/iframe/src-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Must be non-empty.",
-    "html/elements/iframe/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
-    "html/elements/iframe/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
-    "html/elements/iframe/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
+    "html/elements/iframe/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/iframe/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/iframe/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
     "html/elements/iframe/src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/iframe/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/iframe/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/iframe/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/iframe/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/iframe/src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/iframe/src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/iframe/src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: empty host.",
@@ -842,38 +842,38 @@
     "html/elements/iframe/src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/iframe/src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/iframe/src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/iframe/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/elements/iframe/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/iframe/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
+    "html/elements/iframe/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port.",
     "html/elements/iframe/src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/iframe/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/iframe/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/iframe/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/iframe/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/iframe/src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/iframe/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/iframe/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/iframe/src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/iframe/src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/iframe/src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/iframe/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/iframe/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/iframe/src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/iframe/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
+    "html/elements/iframe/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/iframe/src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/iframe/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/iframe/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/iframe/src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/iframe/src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/iframe/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/iframe/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/iframe/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/elements/iframe/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/elements/iframe/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port.",
+    "html/elements/iframe/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port.",
+    "html/elements/iframe/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port.",
+    "html/elements/iframe/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port.",
     "html/elements/iframe/src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/iframe/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/elements/iframe/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/elements/iframe/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port.",
+    "html/elements/iframe/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port.",
     "html/elements/iframe/src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/iframe/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in query: space is not allowed.",
-    "html/elements/iframe/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/iframe/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/iframe/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in query: not a URL code point.",
     "html/elements/iframe/src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/iframe/src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/iframe/src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/iframe/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/elements/iframe/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/iframe/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/iframe/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/iframe/src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/iframe/src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/iframe/src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Expected a slash (\"/\").",
@@ -884,24 +884,24 @@
     "html/elements/iframe/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/iframe/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/iframe/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: syntax error",
-    "html/elements/iframe/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/iframe/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/iframe/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
-    "html/elements/iframe/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
+    "html/elements/iframe/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/iframe/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/iframe/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/iframe/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
     "html/elements/iframe/src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/iframe/src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/elements/iframe/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/iframe/src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/elements/iframe/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/iframe/src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/iframe/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/iframe/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/img/model-novalid.html": "Bad value \u201curl\u201d for attribute \u201cusemap\u201d on element \u201cimg\u201d: Bad hash-name reference: A hash-name reference must start with \u201c#\u201d.",
     "html/elements/img/src-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Must be non-empty.",
     "html/elements/img/src-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Must be non-empty.",
-    "html/elements/img/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
-    "html/elements/img/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
-    "html/elements/img/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
+    "html/elements/img/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/img/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/img/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
     "html/elements/img/src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/img/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/img/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/img/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/img/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/img/src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/img/src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/img/src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: empty host.",
@@ -909,38 +909,38 @@
     "html/elements/img/src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/img/src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/img/src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/img/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/elements/img/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/img/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
+    "html/elements/img/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port.",
     "html/elements/img/src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/img/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/img/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/img/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/img/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/img/src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/img/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/img/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/img/src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/img/src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/img/src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/img/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/img/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/img/src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/img/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
+    "html/elements/img/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/img/src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/img/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/img/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/img/src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/img/src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/img/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/img/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/img/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/elements/img/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/elements/img/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port.",
+    "html/elements/img/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port.",
+    "html/elements/img/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port.",
+    "html/elements/img/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port.",
     "html/elements/img/src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/img/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/elements/img/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/elements/img/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port.",
+    "html/elements/img/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port.",
     "html/elements/img/src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/img/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in query: space is not allowed.",
-    "html/elements/img/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/img/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/img/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in query: not a URL code point.",
     "html/elements/img/src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/img/src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/img/src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/img/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/elements/img/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/img/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/img/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/img/src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/img/src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/img/src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Expected a slash (\"/\").",
@@ -951,15 +951,15 @@
     "html/elements/img/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/img/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/img/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: syntax error",
-    "html/elements/img/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/img/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/img/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
-    "html/elements/img/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
+    "html/elements/img/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/img/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/img/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/img/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
     "html/elements/img/src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/img/src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/elements/img/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/img/src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/elements/img/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/img/src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/img/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/img/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/img/usemap-bad-value-novalid.html": "Bad value \u201c#\u201d for attribute \u201cusemap\u201d on element \u201cimg\u201d: Bad hash-name reference: A hash-name reference must have at least one character after \u201c#\u201d.",
     "html/elements/img/width-height-negative-novalid.html": "Bad value \u201c-1\u201d for attribute \u201cwidth\u201d on element \u201cimg\u201d: Bad non-negative integer: Expected a digit but saw \u201c-\u201d instead.",
     "html/elements/input/list-novalid.html": "The \u201clist\u201d attribute of the \u201cinput\u201d element must refer to a \u201cdatalist\u201d element.",
@@ -967,12 +967,12 @@
     "html/elements/input/pattern-paren-novalid.html": "Bad value \u201c(\u201d for attribute \u201cpattern\u201d on element \u201cinput\u201d: Bad pattern: Unterminated parenthetical ",
     "html/elements/input/type-image-formaction-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Must be non-empty.",
     "html/elements/input/type-image-formaction-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Must be non-empty.",
-    "html/elements/input/type-image-formaction/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
-    "html/elements/input/type-image-formaction/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
-    "html/elements/input/type-image-formaction/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
+    "html/elements/input/type-image-formaction/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/input/type-image-formaction/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/input/type-image-formaction/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
     "html/elements/input/type-image-formaction/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-formaction/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/input/type-image-formaction/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/input/type-image-formaction/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/input/type-image-formaction/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/input/type-image-formaction/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/input/type-image-formaction/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
@@ -980,38 +980,38 @@
     "html/elements/input/type-image-formaction/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/input/type-image-formaction/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/input/type-image-formaction/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-formaction/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/elements/input/type-image-formaction/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
+    "html/elements/input/type-image-formaction/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
     "html/elements/input/type-image-formaction/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-formaction/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/input/type-image-formaction/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/input/type-image-formaction/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/input/type-image-formaction/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/input/type-image-formaction/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/input/type-image-formaction/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/input/type-image-formaction/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/input/type-image-formaction/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/input/type-image-formaction/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-image-formaction/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/input/type-image-formaction/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/input/type-image-formaction/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/input/type-image-formaction/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/input/type-image-formaction/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-formaction/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/input/type-image-formaction/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/input/type-image-formaction/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/input/type-image-formaction/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-formaction/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/input/type-image-formaction/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/input/type-image-formaction/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/elements/input/type-image-formaction/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-image-formaction/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-image-formaction/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-image-formaction/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
     "html/elements/input/type-image-formaction/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-formaction/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/elements/input/type-image-formaction/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/elements/input/type-image-formaction/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-image-formaction/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
     "html/elements/input/type-image-formaction/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-formaction/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: space is not allowed.",
-    "html/elements/input/type-image-formaction/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/input/type-image-formaction/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/input/type-image-formaction/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: not a URL code point.",
     "html/elements/input/type-image-formaction/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/input/type-image-formaction/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/input/type-image-formaction/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-image-formaction/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/elements/input/type-image-formaction/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-image-formaction/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/input/type-image-formaction/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-formaction/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-formaction/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1022,23 +1022,23 @@
     "html/elements/input/type-image-formaction/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-formaction/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-formaction/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: syntax error",
-    "html/elements/input/type-image-formaction/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/input/type-image-formaction/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/input/type-image-formaction/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
-    "html/elements/input/type-image-formaction/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
+    "html/elements/input/type-image-formaction/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/input/type-image-formaction/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/input/type-image-formaction/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/input/type-image-formaction/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
     "html/elements/input/type-image-formaction/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-image-formaction/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/elements/input/type-image-formaction/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/elements/input/type-image-formaction/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/input/type-image-formaction/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/input/type-image-formaction/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/input/type-image-src-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Must be non-empty.",
     "html/elements/input/type-image-src-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Must be non-empty.",
-    "html/elements/input/type-image-src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
-    "html/elements/input/type-image-src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
-    "html/elements/input/type-image-src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
+    "html/elements/input/type-image-src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/input/type-image-src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/input/type-image-src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
     "html/elements/input/type-image-src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/input/type-image-src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/input/type-image-src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/input/type-image-src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/input/type-image-src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/input/type-image-src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/input/type-image-src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
@@ -1046,38 +1046,38 @@
     "html/elements/input/type-image-src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/input/type-image-src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/input/type-image-src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/elements/input/type-image-src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/input/type-image-src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
+    "html/elements/input/type-image-src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
     "html/elements/input/type-image-src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/input/type-image-src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/input/type-image-src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/input/type-image-src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/input/type-image-src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/input/type-image-src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/input/type-image-src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/input/type-image-src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/input/type-image-src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/input/type-image-src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-image-src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/input/type-image-src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/input/type-image-src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/input/type-image-src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
+    "html/elements/input/type-image-src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/input/type-image-src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/input/type-image-src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/input/type-image-src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/input/type-image-src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/input/type-image-src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/input/type-image-src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/elements/input/type-image-src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/elements/input/type-image-src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-image-src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-image-src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-image-src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
     "html/elements/input/type-image-src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/elements/input/type-image-src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/elements/input/type-image-src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-image-src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
     "html/elements/input/type-image-src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: space is not allowed.",
-    "html/elements/input/type-image-src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/input/type-image-src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/input/type-image-src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: not a URL code point.",
     "html/elements/input/type-image-src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/input/type-image-src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/input/type-image-src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-image-src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/elements/input/type-image-src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/input/type-image-src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-image-src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/input/type-image-src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1088,23 +1088,23 @@
     "html/elements/input/type-image-src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: syntax error",
-    "html/elements/input/type-image-src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/input/type-image-src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/input/type-image-src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
-    "html/elements/input/type-image-src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
+    "html/elements/input/type-image-src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/input/type-image-src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/input/type-image-src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/input/type-image-src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
     "html/elements/input/type-image-src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-image-src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/elements/input/type-image-src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/input/type-image-src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/elements/input/type-image-src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/input/type-image-src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/input/type-image-src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/input/type-image-src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/input/type-submit-formaction-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Must be non-empty.",
     "html/elements/input/type-submit-formaction-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Must be non-empty.",
-    "html/elements/input/type-submit-formaction/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
-    "html/elements/input/type-submit-formaction/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
-    "html/elements/input/type-submit-formaction/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
+    "html/elements/input/type-submit-formaction/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/input/type-submit-formaction/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/input/type-submit-formaction/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
     "html/elements/input/type-submit-formaction/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-submit-formaction/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/input/type-submit-formaction/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/input/type-submit-formaction/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/input/type-submit-formaction/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/input/type-submit-formaction/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/input/type-submit-formaction/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
@@ -1112,38 +1112,38 @@
     "html/elements/input/type-submit-formaction/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/input/type-submit-formaction/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/input/type-submit-formaction/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-submit-formaction/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/elements/input/type-submit-formaction/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
+    "html/elements/input/type-submit-formaction/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
     "html/elements/input/type-submit-formaction/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-submit-formaction/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/input/type-submit-formaction/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/input/type-submit-formaction/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/input/type-submit-formaction/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/input/type-submit-formaction/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/input/type-submit-formaction/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/input/type-submit-formaction/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/input/type-submit-formaction/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/input/type-submit-formaction/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-submit-formaction/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/input/type-submit-formaction/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/input/type-submit-formaction/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/input/type-submit-formaction/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/input/type-submit-formaction/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-submit-formaction/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/input/type-submit-formaction/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/input/type-submit-formaction/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/input/type-submit-formaction/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-submit-formaction/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/input/type-submit-formaction/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/input/type-submit-formaction/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/elements/input/type-submit-formaction/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-submit-formaction/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-submit-formaction/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-submit-formaction/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
     "html/elements/input/type-submit-formaction/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-submit-formaction/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/elements/input/type-submit-formaction/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-submit-formaction/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
     "html/elements/input/type-submit-formaction/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-submit-formaction/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: space is not allowed.",
-    "html/elements/input/type-submit-formaction/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/input/type-submit-formaction/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/input/type-submit-formaction/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: not a URL code point.",
     "html/elements/input/type-submit-formaction/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/input/type-submit-formaction/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/input/type-submit-formaction/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-submit-formaction/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/elements/input/type-submit-formaction/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-submit-formaction/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/input/type-submit-formaction/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-submit-formaction/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-submit-formaction/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1154,25 +1154,25 @@
     "html/elements/input/type-submit-formaction/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-submit-formaction/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-submit-formaction/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: syntax error",
-    "html/elements/input/type-submit-formaction/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/input/type-submit-formaction/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/input/type-submit-formaction/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
-    "html/elements/input/type-submit-formaction/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
+    "html/elements/input/type-submit-formaction/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/input/type-submit-formaction/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/input/type-submit-formaction/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/input/type-submit-formaction/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
     "html/elements/input/type-submit-formaction/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-submit-formaction/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/elements/input/type-submit-formaction/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/elements/input/type-submit-formaction/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/input/type-submit-formaction/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/input/type-submit-formaction/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/input/type-url-value/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c#\\\u201d is not an absolute URL.",
-    "html/elements/input/type-url-value/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/input/type-url-value/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in fragment: not a URL code point.",
     "html/elements/input/type-url-value/fragment-empty-hash-only-no-path-relative-novalid.html": "Bad value \u201c#\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c#\u201d is not an absolute URL.",
-    "html/elements/input/type-url-value/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in fragment: space is not allowed.",
+    "html/elements/input/type-url-value/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in fragment: not a URL code point.",
     "html/elements/input/type-url-value/fragment-non-ascii-relative-novalid.html": "Bad value \u201c#\u03b2\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c#\u03b2\u201d is not an absolute URL.",
     "html/elements/input/type-url-value/fragment-semicolon-question-mark-relative-novalid.html": "Bad value \u201c#;?\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c#;?\u201d is not an absolute URL.",
     "html/elements/input/type-url-value/fragment-slash-relative-novalid.html": "Bad value \u201c#/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c#/\u201d is not an absolute URL.",
     "html/elements/input/type-url-value/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-url-value/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/input/type-url-value/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/input/type-url-value/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/input/type-url-value/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/input/type-url-value/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: empty host.",
     "html/elements/input/type-url-value/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: empty host.",
     "html/elements/input/type-url-value/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: empty host.",
@@ -1180,17 +1180,17 @@
     "html/elements/input/type-url-value/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/input/type-url-value/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/input/type-url-value/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-url-value/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/elements/input/type-url-value/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/input/type-url-value/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Domain contains invalid character:  .",
+    "html/elements/input/type-url-value/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port.",
     "html/elements/input/type-url-value/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-url-value/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/input/type-url-value/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/input/type-url-value/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/input/type-url-value/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/input/type-url-value/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
     "html/elements/input/type-url-value/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c/a/ /c\u201d is not an absolute URL.",
     "html/elements/input/type-url-value/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/input/type-url-value/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c:\\\u201d is not an absolute URL.",
     "html/elements/input/type-url-value/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c:foo.com\\\u201d is not an absolute URL.",
-    "html/elements/input/type-url-value/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/input/type-url-value/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in path segment: not a URL code point.",
     "html/elements/input/type-url-value/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
     "html/elements/input/type-url-value/path-percent-encoded-slash-plus-slashes-relative-novalid.html": "Bad value \u201c/a/%2f/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c/a/%2f/c\u201d is not an absolute URL.",
     "html/elements/input/type-url-value/path-percent-encoded-slash-relative-novalid.html": "Bad value \u201c/a%2fc\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c/a%2fc\u201d is not an absolute URL.",
@@ -1198,25 +1198,25 @@
     "html/elements/input/type-url-value/path-simple-relative-novalid.html": "Bad value \u201c/a/b/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c/a/b/c\u201d is not an absolute URL.",
     "html/elements/input/type-url-value/path-slash-only-relative-novalid.html": "Bad value \u201c/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c/\u201d is not an absolute URL.",
     "html/elements/input/type-url-value/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-url-value/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/input/type-url-value/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in path segment: not a URL code point.",
     "html/elements/input/type-url-value/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/input/type-url-value/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-url-value/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/input/type-url-value/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/input/type-url-value/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/elements/input/type-url-value/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/elements/input/type-url-value/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port.",
+    "html/elements/input/type-url-value/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port.",
+    "html/elements/input/type-url-value/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port.",
+    "html/elements/input/type-url-value/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port.",
     "html/elements/input/type-url-value/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-url-value/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/elements/input/type-url-value/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/elements/input/type-url-value/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port.",
+    "html/elements/input/type-url-value/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port.",
     "html/elements/input/type-url-value/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Tab, new line or carriage return found.",
     "html/elements/input/type-url-value/query-empty-no-path-relative-novalid.html": "Bad value \u201c?\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c?\u201d is not an absolute URL.",
-    "html/elements/input/type-url-value/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in query: space is not allowed.",
-    "html/elements/input/type-url-value/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in query: space is not allowed.",
+    "html/elements/input/type-url-value/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in query: not a URL code point.",
+    "html/elements/input/type-url-value/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in query: not a URL code point.",
     "html/elements/input/type-url-value/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/input/type-url-value/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/input/type-url-value/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-url-value/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/elements/input/type-url-value/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/input/type-url-value/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-url-value/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in path segment: not a URL code point.",
     "html/elements/input/type-url-value/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Expected a slash (\"/\").",
     "html/elements/input/type-url-value/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Expected a slash (\"/\").",
     "html/elements/input/type-url-value/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Expected a slash (\"/\").",
@@ -1228,21 +1228,21 @@
     "html/elements/input/type-url-value/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Expected a slash (\"/\").",
     "html/elements/input/type-url-value/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: syntax error",
     "html/elements/input/type-url-value/scheme-schemeless-relative-novalid.html": "Bad value \u201c//foo/bar\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c//foo/bar\u201d is not an absolute URL.",
-    "html/elements/input/type-url-value/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/input/type-url-value/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/input/type-url-value/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: space is not allowed.",
-    "html/elements/input/type-url-value/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: tab is not allowed.",
+    "html/elements/input/type-url-value/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/input/type-url-value/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/input/type-url-value/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/input/type-url-value/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: not a URL code point.",
     "html/elements/input/type-url-value/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-url-value/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/elements/input/type-url-value/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/input/type-url-value/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/elements/input/type-url-value/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in user or password: not a URL code point.",
     "html/elements/input/type-url-value/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/input/type-url-value/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
-    "html/elements/ins/cite/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
-    "html/elements/ins/cite/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
-    "html/elements/ins/cite/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
+    "html/elements/input/type-url-value/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/ins/cite/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/ins/cite/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/ins/cite/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
     "html/elements/ins/cite/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/ins/cite/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/ins/cite/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/ins/cite/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/ins/cite/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/ins/cite/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/ins/cite/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/ins/cite/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: empty host.",
@@ -1250,38 +1250,38 @@
     "html/elements/ins/cite/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/ins/cite/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/ins/cite/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/ins/cite/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/elements/ins/cite/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/ins/cite/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
+    "html/elements/ins/cite/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port.",
     "html/elements/ins/cite/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/ins/cite/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/ins/cite/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/ins/cite/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/ins/cite/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/ins/cite/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/ins/cite/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/ins/cite/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/ins/cite/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/ins/cite/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/ins/cite/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/ins/cite/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/ins/cite/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/ins/cite/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/ins/cite/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
+    "html/elements/ins/cite/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/ins/cite/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/ins/cite/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/ins/cite/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/ins/cite/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/ins/cite/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/ins/cite/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/ins/cite/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/ins/cite/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/elements/ins/cite/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/elements/ins/cite/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port.",
+    "html/elements/ins/cite/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port.",
+    "html/elements/ins/cite/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port.",
+    "html/elements/ins/cite/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port.",
     "html/elements/ins/cite/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/ins/cite/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/elements/ins/cite/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/elements/ins/cite/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port.",
+    "html/elements/ins/cite/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port.",
     "html/elements/ins/cite/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/ins/cite/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in query: space is not allowed.",
-    "html/elements/ins/cite/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/ins/cite/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/ins/cite/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in query: not a URL code point.",
     "html/elements/ins/cite/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/ins/cite/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/ins/cite/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/ins/cite/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/elements/ins/cite/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/ins/cite/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/ins/cite/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/ins/cite/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/ins/cite/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/ins/cite/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1292,15 +1292,15 @@
     "html/elements/ins/cite/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/ins/cite/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/ins/cite/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: syntax error",
-    "html/elements/ins/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/ins/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/ins/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
-    "html/elements/ins/cite/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
+    "html/elements/ins/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/ins/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/ins/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/ins/cite/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
     "html/elements/ins/cite/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/ins/cite/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/elements/ins/cite/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/ins/cite/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/elements/ins/cite/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/ins/cite/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/ins/cite/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/ins/cite/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/ins/date-0004-02-29-haswarn.html": "Bad value \u201c0004-02-29\u201d for attribute \u201cdatetime\u201d on element \u201cins\u201d: Bad date: Year may be mistyped. Bad datetime with timezone: The literal did not satisfy the datetime with timezone format.",
     "html/elements/ins/date-0005-02-29-novalid.html": "Bad value \u201c0005-02-29\u201d for attribute \u201cdatetime\u201d on element \u201cins\u201d: Bad datetime with timezone: The literal did not satisfy the datetime with timezone format. Bad date: Day out of range.",
     "html/elements/ins/date-0214-09-29-haswarn.html": "Bad value \u201c0214-09-29\u201d for attribute \u201cdatetime\u201d on element \u201cins\u201d: Bad date: Year may be mistyped. Bad datetime with timezone: The literal did not satisfy the datetime with timezone format.",
@@ -1404,12 +1404,12 @@
     "html/elements/link/href-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Must be non-empty.",
     "html/elements/link/href-missing-novalid.html": "Element \u201clink\u201d is missing required attribute \u201chref\u201d.",
     "html/elements/link/href-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Must be non-empty.",
-    "html/elements/link/href/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
-    "html/elements/link/href/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
-    "html/elements/link/href/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
+    "html/elements/link/href/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/link/href/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/link/href/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
     "html/elements/link/href/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/link/href/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/link/href/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/link/href/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/link/href/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/link/href/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/link/href/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/link/href/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: empty host.",
@@ -1417,38 +1417,38 @@
     "html/elements/link/href/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/link/href/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/link/href/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/link/href/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/elements/link/href/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/link/href/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
+    "html/elements/link/href/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port.",
     "html/elements/link/href/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/link/href/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/link/href/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/link/href/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/link/href/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/link/href/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/link/href/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/link/href/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/link/href/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/link/href/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/link/href/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/link/href/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/link/href/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/link/href/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/link/href/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
+    "html/elements/link/href/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/link/href/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/link/href/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/link/href/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/link/href/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/link/href/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/link/href/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/link/href/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/link/href/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/elements/link/href/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/elements/link/href/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port.",
+    "html/elements/link/href/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port.",
+    "html/elements/link/href/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port.",
+    "html/elements/link/href/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port.",
     "html/elements/link/href/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/link/href/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/elements/link/href/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/elements/link/href/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port.",
+    "html/elements/link/href/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port.",
     "html/elements/link/href/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/link/href/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in query: space is not allowed.",
-    "html/elements/link/href/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/link/href/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/link/href/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in query: not a URL code point.",
     "html/elements/link/href/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/link/href/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/link/href/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/link/href/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/elements/link/href/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/link/href/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/link/href/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/link/href/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/link/href/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/link/href/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1459,25 +1459,25 @@
     "html/elements/link/href/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/link/href/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/link/href/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: syntax error",
-    "html/elements/link/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/link/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/link/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
-    "html/elements/link/href/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
+    "html/elements/link/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/link/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/link/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/link/href/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
     "html/elements/link/href/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/link/href/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/elements/link/href/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/link/href/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/elements/link/href/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/link/href/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/link/href/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/link/href/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/map/model-novalid.html": "The \u201cid\u201d attribute on a \u201cmap\u201d element must have an the same value as the \u201cname\u201d attribute.",
     "html/elements/object/data-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Must be non-empty.",
     "html/elements/object/data-type-missing-novalid.html": "Element \u201cobject\u201d is missing one or more of the following attributes: [data, type].",
     "html/elements/object/data-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Must be non-empty.",
-    "html/elements/object/data/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
-    "html/elements/object/data/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
-    "html/elements/object/data/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
+    "html/elements/object/data/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/object/data/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/object/data/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
     "html/elements/object/data/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/object/data/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/object/data/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/object/data/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/object/data/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/object/data/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/object/data/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/object/data/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: empty host.",
@@ -1485,38 +1485,38 @@
     "html/elements/object/data/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/object/data/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/object/data/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/object/data/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/elements/object/data/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/object/data/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
+    "html/elements/object/data/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port.",
     "html/elements/object/data/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/object/data/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/object/data/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/object/data/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/object/data/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/object/data/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/object/data/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/object/data/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/object/data/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/object/data/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/object/data/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/object/data/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/object/data/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/object/data/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/object/data/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
+    "html/elements/object/data/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/object/data/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/object/data/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/object/data/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/object/data/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/object/data/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/object/data/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/object/data/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/object/data/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/elements/object/data/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/elements/object/data/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port.",
+    "html/elements/object/data/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port.",
+    "html/elements/object/data/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port.",
+    "html/elements/object/data/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port.",
     "html/elements/object/data/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/object/data/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/elements/object/data/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/elements/object/data/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port.",
+    "html/elements/object/data/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port.",
     "html/elements/object/data/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/object/data/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in query: space is not allowed.",
-    "html/elements/object/data/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/object/data/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/object/data/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in query: not a URL code point.",
     "html/elements/object/data/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/object/data/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/object/data/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/object/data/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/elements/object/data/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/object/data/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/object/data/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/object/data/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/object/data/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/object/data/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1527,15 +1527,15 @@
     "html/elements/object/data/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/object/data/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/object/data/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: syntax error",
-    "html/elements/object/data/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/object/data/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/object/data/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
-    "html/elements/object/data/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
+    "html/elements/object/data/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/object/data/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/object/data/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/object/data/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
     "html/elements/object/data/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/object/data/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/elements/object/data/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/object/data/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/elements/object/data/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/object/data/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/object/data/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/object/data/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/object/model-novalid.html": "Element \u201cobject\u201d is missing one or more of the following attributes: [data, type].",
     "html/elements/ol/model-novalid.html": "Duplicate ID \u201cid\u201d.",
     "html/elements/option/label-novalid.html": "Bad value \u201c\u201d for attribute \u201clabel\u201d on element \u201coption\u201d: Bad non-empty string: Must not be empty.",
@@ -1740,12 +1740,12 @@
     "html/elements/picture/video-source-srcset-src-novalid.html": "Attribute \u201csrcset\u201d not allowed on element \u201csource\u201d in this context.",
     "html/elements/picture/video-srcset-novalid.html": "Attribute \u201csrcset\u201d not allowed on element \u201cvideo\u201d in this context.",
     "html/elements/pre/model-novalid.html": "No \u201cp\u201d element in scope but a \u201cp\u201d end tag seen.",
-    "html/elements/q/cite/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
-    "html/elements/q/cite/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
-    "html/elements/q/cite/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
+    "html/elements/q/cite/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/q/cite/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/q/cite/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
     "html/elements/q/cite/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/q/cite/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/q/cite/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/q/cite/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/q/cite/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/q/cite/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/q/cite/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/q/cite/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: empty host.",
@@ -1753,38 +1753,38 @@
     "html/elements/q/cite/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/q/cite/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/q/cite/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/q/cite/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/elements/q/cite/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/q/cite/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
+    "html/elements/q/cite/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port.",
     "html/elements/q/cite/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/q/cite/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/q/cite/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/q/cite/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/q/cite/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/q/cite/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/q/cite/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/q/cite/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/q/cite/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/q/cite/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/q/cite/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/q/cite/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/q/cite/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/q/cite/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/q/cite/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
+    "html/elements/q/cite/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/q/cite/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/q/cite/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/q/cite/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/q/cite/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/q/cite/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/q/cite/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/q/cite/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/q/cite/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/elements/q/cite/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/elements/q/cite/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port.",
+    "html/elements/q/cite/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port.",
+    "html/elements/q/cite/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port.",
+    "html/elements/q/cite/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port.",
     "html/elements/q/cite/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/q/cite/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/elements/q/cite/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/elements/q/cite/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port.",
+    "html/elements/q/cite/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port.",
     "html/elements/q/cite/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/q/cite/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in query: space is not allowed.",
-    "html/elements/q/cite/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/q/cite/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/q/cite/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in query: not a URL code point.",
     "html/elements/q/cite/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/q/cite/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/q/cite/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/q/cite/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/elements/q/cite/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/q/cite/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/q/cite/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/q/cite/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/q/cite/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/q/cite/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1795,15 +1795,15 @@
     "html/elements/q/cite/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/q/cite/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/q/cite/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: syntax error",
-    "html/elements/q/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/q/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/q/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
-    "html/elements/q/cite/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
+    "html/elements/q/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/q/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/q/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/q/cite/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
     "html/elements/q/cite/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/q/cite/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/elements/q/cite/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/q/cite/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/elements/q/cite/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/q/cite/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/q/cite/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/q/cite/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/q/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/ruby/empty-novalid.html": "Element \u201cruby\u201d is missing one or more of the following child elements: [rp, rt, rtc].",
     "html/elements/ruby/missing-rt-novalid.html": "Element \u201cruby\u201d is missing one or more of the following child elements: [rt, rtc].",
@@ -1811,12 +1811,12 @@
     "html/elements/script/language-novalid.html": "The \u201clanguage\u201d attribute on the \u201cscript\u201d element is obsolete. Use the \u201ctype\u201d attribute instead.",
     "html/elements/script/src-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Must be non-empty.",
     "html/elements/script/src-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Must be non-empty.",
-    "html/elements/script/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
-    "html/elements/script/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
-    "html/elements/script/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
+    "html/elements/script/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/script/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/script/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
     "html/elements/script/src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/script/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/script/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/script/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/script/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/script/src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/script/src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/script/src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: empty host.",
@@ -1824,38 +1824,38 @@
     "html/elements/script/src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/script/src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/script/src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/script/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/elements/script/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/script/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
+    "html/elements/script/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port.",
     "html/elements/script/src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/script/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/script/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/script/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/script/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/script/src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/script/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/script/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/script/src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/script/src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/script/src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/script/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/script/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/script/src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/script/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
+    "html/elements/script/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/script/src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/script/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/script/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/script/src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/script/src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/script/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/script/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/script/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/elements/script/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/elements/script/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port.",
+    "html/elements/script/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port.",
+    "html/elements/script/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port.",
+    "html/elements/script/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port.",
     "html/elements/script/src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/script/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/elements/script/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/elements/script/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port.",
+    "html/elements/script/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port.",
     "html/elements/script/src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/script/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in query: space is not allowed.",
-    "html/elements/script/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/script/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/script/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in query: not a URL code point.",
     "html/elements/script/src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/script/src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/script/src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/script/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/elements/script/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/script/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/script/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/script/src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/script/src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/script/src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1866,24 +1866,24 @@
     "html/elements/script/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/script/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/script/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: syntax error",
-    "html/elements/script/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/script/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/script/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
-    "html/elements/script/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
+    "html/elements/script/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/script/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/script/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/script/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
     "html/elements/script/src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/script/src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/elements/script/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/script/src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/elements/script/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/script/src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/script/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/script/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/small/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/source/src-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Must be non-empty.",
     "html/elements/source/src-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Must be non-empty.",
-    "html/elements/source/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
-    "html/elements/source/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
-    "html/elements/source/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
+    "html/elements/source/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/source/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/source/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
     "html/elements/source/src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/source/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/source/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/source/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/source/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/source/src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/source/src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/source/src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: empty host.",
@@ -1891,38 +1891,38 @@
     "html/elements/source/src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/source/src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/source/src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/source/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/elements/source/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/source/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
+    "html/elements/source/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port.",
     "html/elements/source/src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/source/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/source/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/source/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/source/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/source/src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/source/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/source/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/source/src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/source/src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/source/src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/source/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/source/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/source/src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/source/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
+    "html/elements/source/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/source/src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/source/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/source/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/source/src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/source/src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/source/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/source/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/source/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/elements/source/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/elements/source/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port.",
+    "html/elements/source/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port.",
+    "html/elements/source/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port.",
+    "html/elements/source/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port.",
     "html/elements/source/src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/source/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/elements/source/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/elements/source/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port.",
+    "html/elements/source/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port.",
     "html/elements/source/src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/source/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in query: space is not allowed.",
-    "html/elements/source/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/source/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/source/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in query: not a URL code point.",
     "html/elements/source/src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/source/src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/source/src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/source/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/elements/source/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/source/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/source/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/source/src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/source/src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/source/src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1933,15 +1933,15 @@
     "html/elements/source/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/source/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/source/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: syntax error",
-    "html/elements/source/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/source/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/source/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
-    "html/elements/source/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
+    "html/elements/source/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/source/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/source/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/source/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
     "html/elements/source/src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/source/src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/elements/source/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/source/src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/elements/source/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/source/src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/source/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/source/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/span/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/strong/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/style/scoped-as-p-child-novalid.html": "Element \u201cstyle\u201d not allowed in this context. (The parent was element \u201cp\u201d.) Suppressing further errors from this subtree.",
@@ -1956,12 +1956,12 @@
     "html/elements/title/missing-novalid.html": "Element \u201chead\u201d is missing required child element \u201ctitle\u201d.",
     "html/elements/track/src-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Must be non-empty.",
     "html/elements/track/src-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Must be non-empty.",
-    "html/elements/track/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
-    "html/elements/track/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
-    "html/elements/track/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
+    "html/elements/track/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/track/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/track/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
     "html/elements/track/src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/track/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/track/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/track/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/track/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/track/src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/track/src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/track/src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: empty host.",
@@ -1969,38 +1969,38 @@
     "html/elements/track/src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/track/src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/track/src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/track/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/elements/track/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/track/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
+    "html/elements/track/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port.",
     "html/elements/track/src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/track/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/track/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/track/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/track/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/track/src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/track/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/track/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/track/src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/track/src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/track/src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/track/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/track/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/track/src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/track/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
+    "html/elements/track/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/track/src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/track/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/track/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/track/src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/track/src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/track/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/track/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/track/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/elements/track/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/elements/track/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port.",
+    "html/elements/track/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port.",
+    "html/elements/track/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port.",
+    "html/elements/track/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port.",
     "html/elements/track/src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/track/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/elements/track/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/elements/track/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port.",
+    "html/elements/track/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port.",
     "html/elements/track/src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/track/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in query: space is not allowed.",
-    "html/elements/track/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/track/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/track/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in query: not a URL code point.",
     "html/elements/track/src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/track/src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/track/src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/track/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/elements/track/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/track/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/track/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/track/src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/track/src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/track/src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Expected a slash (\"/\").",
@@ -2011,26 +2011,26 @@
     "html/elements/track/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/track/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/track/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: syntax error",
-    "html/elements/track/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/track/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/track/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
-    "html/elements/track/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
+    "html/elements/track/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/track/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/track/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/track/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
     "html/elements/track/src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/track/src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/elements/track/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/track/src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/elements/track/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/track/src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/track/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/track/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/ul/model-novalid.html": "Duplicate ID \u201cid\u201d.",
     "html/elements/var/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/video/model-novalid.html": "Element \u201cp\u201d not allowed in this context. (The parent was element \u201cvideo\u201d.) Suppressing further errors from this subtree.",
     "html/elements/video/poster-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Must be non-empty.",
     "html/elements/video/poster-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Must be non-empty.",
-    "html/elements/video/poster/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
-    "html/elements/video/poster/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
-    "html/elements/video/poster/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
+    "html/elements/video/poster/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/video/poster/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/video/poster/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
     "html/elements/video/poster/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/poster/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/video/poster/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/video/poster/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/video/poster/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/video/poster/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/video/poster/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/video/poster/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: empty host.",
@@ -2038,38 +2038,38 @@
     "html/elements/video/poster/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/video/poster/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/video/poster/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/poster/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/elements/video/poster/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/video/poster/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
+    "html/elements/video/poster/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
     "html/elements/video/poster/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/poster/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/video/poster/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/video/poster/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/video/poster/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/video/poster/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/video/poster/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/video/poster/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/video/poster/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/video/poster/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/video/poster/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/video/poster/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/video/poster/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/video/poster/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/video/poster/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
+    "html/elements/video/poster/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/video/poster/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/poster/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/video/poster/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/video/poster/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/video/poster/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/poster/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/video/poster/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/video/poster/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/elements/video/poster/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/elements/video/poster/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
+    "html/elements/video/poster/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
+    "html/elements/video/poster/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
+    "html/elements/video/poster/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
     "html/elements/video/poster/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/poster/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/elements/video/poster/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/elements/video/poster/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
+    "html/elements/video/poster/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
     "html/elements/video/poster/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/poster/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in query: space is not allowed.",
-    "html/elements/video/poster/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/video/poster/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/video/poster/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in query: not a URL code point.",
     "html/elements/video/poster/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/video/poster/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/video/poster/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/video/poster/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/elements/video/poster/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/video/poster/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/video/poster/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/video/poster/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/poster/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/poster/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
@@ -2080,21 +2080,21 @@
     "html/elements/video/poster/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/poster/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/poster/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: syntax error",
-    "html/elements/video/poster/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/video/poster/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/video/poster/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
-    "html/elements/video/poster/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
+    "html/elements/video/poster/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/video/poster/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/video/poster/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/video/poster/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
     "html/elements/video/poster/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/video/poster/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/elements/video/poster/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/video/poster/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/elements/video/poster/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/video/poster/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/video/poster/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
-    "html/elements/video/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
-    "html/elements/video/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
-    "html/elements/video/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
+    "html/elements/video/poster/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/video/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/video/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/video/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
     "html/elements/video/src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/video/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/video/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/video/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/video/src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/video/src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/video/src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: empty host.",
@@ -2102,38 +2102,38 @@
     "html/elements/video/src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/video/src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/video/src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/elements/video/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/video/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
+    "html/elements/video/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
     "html/elements/video/src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/elements/video/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/video/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/video/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/elements/video/src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/video/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/video/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/video/src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/video/src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/video/src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/video/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/video/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/video/src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/video/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
+    "html/elements/video/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/video/src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/elements/video/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/video/src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/video/src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/video/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/elements/video/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/elements/video/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/elements/video/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
+    "html/elements/video/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
+    "html/elements/video/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
+    "html/elements/video/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
     "html/elements/video/src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/elements/video/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/elements/video/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
+    "html/elements/video/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
     "html/elements/video/src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in query: space is not allowed.",
-    "html/elements/video/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/video/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/video/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in query: not a URL code point.",
     "html/elements/video/src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/video/src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/video/src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/video/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/elements/video/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/video/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/video/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/elements/video/src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
@@ -2144,15 +2144,15 @@
     "html/elements/video/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: syntax error",
-    "html/elements/video/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/video/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/elements/video/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
-    "html/elements/video/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
+    "html/elements/video/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/video/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/video/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/video/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
     "html/elements/video/src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/video/src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/elements/video/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/video/src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/elements/video/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/elements/video/src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/video/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/video/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/media-queries/001-novalid.html": "Bad value \u201cscreen and\u201d for attribute \u201cmedia\u201d on element \u201clink\u201d: Bad media query: Media query ended prematurely.",
     "html/media-queries/002-novalid.html": "Bad value \u201calla\u201d for attribute \u201cmedia\u201d on element \u201clink\u201d: Bad media query: Expected a CSS media type but the query ended.",
     "html/media-queries/003-novalid.html": "Bad value \u201cPROJECT\u0130ON\u201d for attribute \u201cmedia\u201d on element \u201clink\u201d: Bad media query: Expected a letter, hyphen or whitespace but saw \u201c\u0130\u201d instead.",
@@ -2177,12 +2177,12 @@
     "html/media-queries/projection-novalid.html": "Bad value \u201cprojection\u201d for attribute \u201cmedia\u201d on element \u201clink\u201d: Bad media query: Deprecated media type \u201cprojection\u201d. For guidance, see the Media Types section in the current Media Queries specification.",
     "html/media-queries/tv-novalid.html": "Bad value \u201ctv and (scan: progressive)\u201d for attribute \u201cmedia\u201d on element \u201clink\u201d: Bad media query: Deprecated media type \u201ctv\u201d. For guidance, see the Media Types section in the current Media Queries specification.",
     "html/microdata/itemid-scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
-    "html/microdata/itemid/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
-    "html/microdata/itemid/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
-    "html/microdata/itemid/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
+    "html/microdata/itemid/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/microdata/itemid/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/microdata/itemid/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
     "html/microdata/itemid/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/microdata/itemid/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/microdata/itemid/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/microdata/itemid/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/microdata/itemid/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/microdata/itemid/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: empty host.",
     "html/microdata/itemid/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: empty host.",
     "html/microdata/itemid/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: empty host.",
@@ -2190,37 +2190,37 @@
     "html/microdata/itemid/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/microdata/itemid/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/microdata/itemid/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/microdata/itemid/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
-    "html/microdata/itemid/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/microdata/itemid/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
+    "html/microdata/itemid/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port.",
     "html/microdata/itemid/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/microdata/itemid/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/microdata/itemid/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/microdata/itemid/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/microdata/itemid/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
     "html/microdata/itemid/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/microdata/itemid/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/microdata/itemid/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/microdata/itemid/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/microdata/itemid/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/microdata/itemid/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/microdata/itemid/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/microdata/itemid/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/microdata/itemid/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/microdata/itemid/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
+    "html/microdata/itemid/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/microdata/itemid/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/microdata/itemid/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
+    "html/microdata/itemid/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/microdata/itemid/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/microdata/itemid/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/microdata/itemid/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/microdata/itemid/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/microdata/itemid/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/microdata/itemid/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/microdata/itemid/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port.",
+    "html/microdata/itemid/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port.",
+    "html/microdata/itemid/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port.",
+    "html/microdata/itemid/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port.",
     "html/microdata/itemid/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/microdata/itemid/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
-    "html/microdata/itemid/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
+    "html/microdata/itemid/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port.",
+    "html/microdata/itemid/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port.",
     "html/microdata/itemid/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/microdata/itemid/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in query: space is not allowed.",
-    "html/microdata/itemid/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/microdata/itemid/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/microdata/itemid/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in query: not a URL code point.",
     "html/microdata/itemid/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/microdata/itemid/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/microdata/itemid/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
-    "html/microdata/itemid/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/microdata/itemid/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/microdata/itemid/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
     "html/microdata/itemid/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Expected a slash (\"/\").",
     "html/microdata/itemid/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Expected a slash (\"/\").",
     "html/microdata/itemid/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Expected a slash (\"/\").",
@@ -2231,27 +2231,27 @@
     "html/microdata/itemid/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Expected a slash (\"/\").",
     "html/microdata/itemid/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Expected a slash (\"/\").",
     "html/microdata/itemid/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: syntax error",
-    "html/microdata/itemid/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/microdata/itemid/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
-    "html/microdata/itemid/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
-    "html/microdata/itemid/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
+    "html/microdata/itemid/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/microdata/itemid/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/microdata/itemid/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/microdata/itemid/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
     "html/microdata/itemid/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/microdata/itemid/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/microdata/itemid/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/microdata/itemid/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/microdata/itemid/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/microdata/itemid/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/microdata/itemid/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/microdata/itemid/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
     "html/microdata/itemtype-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d.",
     "html/microdata/itemtype-scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/microdata/itemtype/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c#\\\u201d is not an absolute URL.",
-    "html/microdata/itemtype/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/microdata/itemtype/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in fragment: not a URL code point.",
     "html/microdata/itemtype/fragment-empty-hash-only-no-path-relative-novalid.html": "Bad value \u201c#\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c#\u201d is not an absolute URL.",
     "html/microdata/itemtype/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201ce\u201d is not an absolute URL.",
     "html/microdata/itemtype/fragment-non-ascii-relative-novalid.html": "Bad value \u201c#\u03b2\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c#\u03b2\u201d is not an absolute URL.",
     "html/microdata/itemtype/fragment-semicolon-question-mark-relative-novalid.html": "Bad value \u201c#;?\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c#;?\u201d is not an absolute URL.",
     "html/microdata/itemtype/fragment-slash-relative-novalid.html": "Bad value \u201c#/\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c#/\u201d is not an absolute URL.",
     "html/microdata/itemtype/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201corg\u201d is not an absolute URL.",
-    "html/microdata/itemtype/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/microdata/itemtype/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/microdata/itemtype/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: Domain contains invalid character: %.",
+    "html/microdata/itemtype/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: Domain contains invalid character: %.",
     "html/microdata/itemtype/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: empty host.",
     "html/microdata/itemtype/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: empty host.",
     "html/microdata/itemtype/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: empty host.",
@@ -2260,10 +2260,10 @@
     "html/microdata/itemtype/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/microdata/itemtype/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201corg\u201d is not an absolute URL.",
     "html/microdata/itemtype/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c.org\u201d is not an absolute URL.",
-    "html/microdata/itemtype/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/microdata/itemtype/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port.",
     "html/microdata/itemtype/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c.org\u201d is not an absolute URL.",
-    "html/microdata/itemtype/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
-    "html/microdata/itemtype/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/microdata/itemtype/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: Domain contains invalid character: %.",
+    "html/microdata/itemtype/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: Domain contains invalid character: %.",
     "html/microdata/itemtype/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
     "html/microdata/itemtype/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c/a/\u201d is not an absolute URL.",
     "html/microdata/itemtype/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Backslash (\"\\\") used as path segment delimiter.",
@@ -2280,12 +2280,12 @@
     "html/microdata/itemtype/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c?\u201d is not an absolute URL.",
     "html/microdata/itemtype/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/microdata/itemtype/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c/c\u201d is not an absolute URL.",
-    "html/microdata/itemtype/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/microdata/itemtype/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port: \u201c:\u201d is not allowed.",
-    "html/microdata/itemtype/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port: \u201c-\u201d is not allowed.",
-    "html/microdata/itemtype/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port: \u201cf\u201d is not allowed.",
+    "html/microdata/itemtype/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port.",
+    "html/microdata/itemtype/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port.",
+    "html/microdata/itemtype/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port.",
+    "html/microdata/itemtype/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port.",
     "html/microdata/itemtype/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c/c\u201d is not an absolute URL.",
-    "html/microdata/itemtype/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/microdata/itemtype/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port.",
     "html/microdata/itemtype/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c/c\u201d is not an absolute URL.",
     "html/microdata/itemtype/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c/c\u201d is not an absolute URL.",
     "html/microdata/itemtype/query-empty-no-path-relative-novalid.html": "Bad value \u201c?\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c?\u201d is not an absolute URL.",
@@ -2308,10 +2308,10 @@
     "html/microdata/itemtype/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201cfoo.com\u201d is not an absolute URL.",
     "html/microdata/itemtype/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201cfoo.com\u201d is not an absolute URL.",
     "html/microdata/itemtype/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/microdata/itemtype/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
-    "html/microdata/itemtype/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/microdata/itemtype/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
+    "html/microdata/itemtype/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in user or password: not a URL code point.",
     "html/microdata/itemtype/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/microdata/itemtype/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/microdata/itemtype/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in user or password: not a URL code point.",
     "html/mime-types/001-novalid.html": "Bad value \u201ctext/html \u201d for attribute \u201ctype\u201d on element \u201clink\u201d: Bad MIME type: Extraneous trailing whitespace.",
     "html/mime-types/002-novalid.html": "Bad value \u201c TEXT/HTML\u201d for attribute \u201ctype\u201d on element \u201clink\u201d: Bad MIME type: Expected a token character but saw \u201c \u201d instead.",
     "html/mime-types/003-novalid.html": "Bad value \u201ctext/html;charset=\u201d for attribute \u201ctype\u201d on element \u201clink\u201d: Bad MIME type: Parameter value missing.",
diff --git a/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html b/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html
deleted file mode 100644
index f12f8ffc56ff..000000000000
--- a/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-    <title>Video element src attribute must match src list - positive test</title>
-    <script src='/resources/testharness.js'></script>
-    <script src='/resources/testharnessreport.js'></script>
-</head>
-<body>
-    <h1>Video element in media-src list - redirect test</h1>
-    <div id='log'></div>
-    
-  <p>This test tests a buggy interaction in Chrome 46.  Two hosts (self and www2) are both allowed
-    as media-src, but only one (self) is allowed for connect-src.  If a video src starts on
-    an allowed host (self), and is redirected to another allowed media-src host, it should succeed. But a bug
-    causes the redirect to be done in a fetch context to which connect-src is being applied instead, so
-    the load is blocked. (This test passes in Firefox 45, modulo an event listener not firing.)</p>
-
-  <script>
-    var src_test = async_test("In-policy async video src");
-    var src_redir_test = async_test("in-policy async video src w/redir")
-    var source_test = async_test("In-policy async video source element");
-    var source_redir_test = async_test("In-policy async video source element w/redir");
-
-    function media_loaded(t) {
-      t.done();
-    }
-
-    function media_error_handler(t) {
-      t.step( function () {
-          assert_unreached("Media error handler shouldn't be triggered for allowed domain.");
-      });
-      t.done();
-    }
-  </script>
-
-    <video id="videoObject" width="320" height="240" controls
-           onloadeddata="media_loaded(source_test)">
-        <source id="videoSourceObject"
-                type="video/mp4"
-                onerror="media_error_handler(source_test)"
-                src="http://www2.{{host}}:{{ports[http][0]}}/media/white.mp4">
-    </video>
-    
-    <video id="videoObject2" width="320" height="240" controls
-           onerror="media_error_handler(src_test)"
-           onloadeddata="media_loaded(src_test)"
-           src="http://www2.{{host}}:{{ports[http][0]}}/media/white.mp4">
-
-    <video id="videoObject3" width="320" height="240" controls
-           onloadeddata="media_loaded(source_redir_test)">
-        <source id="videoSourceObject"
-                type="video/mp4"
-                onerror="media_error_handler(source_test)"
-                src="/common/redirect.py?location=http://www2.{{host}}:{{ports[http][0]}}/media/white.mp4">
-    </video>
-        
-    <video id="videoObject2" width="320" height="240" controls
-           onerror="media_error_handler(src_test)"
-           onloadeddata="media_loaded(src_test)"
-           src="/common/redirect.py?location=http://www2.{{host}}:{{ports[http][0]}}/media/white.mp4">
-        
-  <script async defer src="../support/checkReport.sub.js?reportExists=false">
-  </script>
-
-</body>
-</html>
diff --git a/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html.sub.headers b/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html.sub.headers
deleted file mode 100644
index 4ce3e428a8ee..000000000000
--- a/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: media-src-redir-bug={{$id:uuid()}}; Path=/content-security-policy/media-src/
-Content-Security-Policy: script-src * 'unsafe-inline'; media-src http://www2.{{host}}:{{ports[http][0]}}/ 'self'; connect-src 'self'; report-uri  ../support/report.py?op=put&reportID={{$id}}
diff --git a/testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction-xhtml.xhtml b/testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction-xhtml.xhtml
rename to testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Document-getElementsByTagName-xhtml.xhtml b/testing/web-platform/tests/dom/nodes/Document-getElementsByTagName.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Document-getElementsByTagName-xhtml.xhtml
rename to testing/web-platform/tests/dom/nodes/Document-getElementsByTagName.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/DocumentType-literal-xhtml.xhtml b/testing/web-platform/tests/dom/nodes/DocumentType-literal.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/DocumentType-literal-xhtml.xhtml
rename to testing/web-platform/tests/dom/nodes/DocumentType-literal.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElement-null-svg.svg b/testing/web-platform/tests/dom/nodes/Element-childElement-null.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElement-null-svg.svg
rename to testing/web-platform/tests/dom/nodes/Element-childElement-null.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElement-null-xhtml.xhtml b/testing/web-platform/tests/dom/nodes/Element-childElement-null.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElement-null-xhtml.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-childElement-null.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add-svg.svg b/testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add-svg.svg
rename to testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add-xhtml.xhtml b/testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add-xhtml.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove-svg.svg b/testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove-svg.svg
rename to testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove-xhtml.xhtml b/testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove-xhtml.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild-svg.svg b/testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild-svg.svg
rename to testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild-xhtml.xhtml b/testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild-xhtml.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElementCount-svg.svg b/testing/web-platform/tests/dom/nodes/Element-childElementCount.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElementCount-svg.svg
rename to testing/web-platform/tests/dom/nodes/Element-childElementCount.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElementCount-xhtml.xhtml b/testing/web-platform/tests/dom/nodes/Element-childElementCount.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElementCount-xhtml.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-childElementCount.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-firstElementChild-entity-xhtml.xhtml b/testing/web-platform/tests/dom/nodes/Element-firstElementChild-entity.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-firstElementChild-entity-xhtml.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-firstElementChild-entity.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace-svg.svg b/testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace-svg.svg
rename to testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace-xhtml.xhtml b/testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace-xhtml.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-firstElementChild-svg.svg b/testing/web-platform/tests/dom/nodes/Element-firstElementChild.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-firstElementChild-svg.svg
rename to testing/web-platform/tests/dom/nodes/Element-firstElementChild.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-firstElementChild-xhtml.xhtml b/testing/web-platform/tests/dom/nodes/Element-firstElementChild.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-firstElementChild-xhtml.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-firstElementChild.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-lastElementChild-svg.svg b/testing/web-platform/tests/dom/nodes/Element-lastElementChild.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-lastElementChild-svg.svg
rename to testing/web-platform/tests/dom/nodes/Element-lastElementChild.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-lastElementChild-xhtml.xhtml b/testing/web-platform/tests/dom/nodes/Element-lastElementChild.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-lastElementChild-xhtml.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-lastElementChild.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-nextElementSibling-svg.svg b/testing/web-platform/tests/dom/nodes/Element-nextElementSibling.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-nextElementSibling-svg.svg
rename to testing/web-platform/tests/dom/nodes/Element-nextElementSibling.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-nextElementSibling-xhtml.xhtml b/testing/web-platform/tests/dom/nodes/Element-nextElementSibling.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-nextElementSibling-xhtml.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-nextElementSibling.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-previousElementSibling-svg.svg b/testing/web-platform/tests/dom/nodes/Element-previousElementSibling.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-previousElementSibling-svg.svg
rename to testing/web-platform/tests/dom/nodes/Element-previousElementSibling.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-previousElementSibling-xhtml.xhtml b/testing/web-platform/tests/dom/nodes/Element-previousElementSibling.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-previousElementSibling-xhtml.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-previousElementSibling.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-siblingElement-null-svg.svg b/testing/web-platform/tests/dom/nodes/Element-siblingElement-null.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-siblingElement-null-svg.svg
rename to testing/web-platform/tests/dom/nodes/Element-siblingElement-null.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-siblingElement-null-xhtml.xhtml b/testing/web-platform/tests/dom/nodes/Element-siblingElement-null.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-siblingElement-null-xhtml.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-siblingElement-null.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Node-nodeName-xhtml.xhtml b/testing/web-platform/tests/dom/nodes/Node-nodeName.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Node-nodeName-xhtml.xhtml
rename to testing/web-platform/tests/dom/nodes/Node-nodeName.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/ParentNode-querySelector-All-xht.xht b/testing/web-platform/tests/dom/nodes/ParentNode-querySelector-All.xht
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/ParentNode-querySelector-All-xht.xht
rename to testing/web-platform/tests/dom/nodes/ParentNode-querySelector-All.xht
diff --git a/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case-xhtml.xhtml b/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.xhtml
similarity index 100%
rename from testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case-xhtml.xhtml
rename to testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.xhtml
diff --git a/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id-xhtml.xhtml b/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.xhtml
similarity index 100%
rename from testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id-xhtml.xhtml
rename to testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.xhtml
diff --git a/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace-xhtml.xhtml b/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.xhtml
similarity index 100%
rename from testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace-xhtml.xhtml
rename to testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.xhtml
diff --git a/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements-xhtml.xhtml b/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.xhtml
similarity index 100%
rename from testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements-xhtml.xhtml
rename to testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.xhtml
diff --git a/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef-xhtml.xhtml b/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.xhtml
similarity index 100%
rename from testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef-xhtml.xhtml
rename to testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.xhtml
diff --git a/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param-xhtml.xhtml b/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.xhtml
similarity index 100%
rename from testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param-xhtml.xhtml
rename to testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.xhtml
diff --git a/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html b/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html
index ebf15e79cd50..daf74e1344e2 100644
--- a/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html
+++ b/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html
@@ -14,12 +14,6 @@ test(function() {
   assert_equals(document.vlinkColor, document.body.vLink);
   assert_equals(document.alinkColor, document.body.aLink);
 })
-test(function() {
-  document.fgColor = null;
-  assert_equals(document.fgColor, "");
-  assert_equals(document.body.text, "");
-  assert_equals(document.body.getAttribute("text"), "");
-})
 test(function() {
   document.fgColor = "blue";
   assert_equals(document.fgColor, "blue");
diff --git a/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html b/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html
index 629c24627ce0..e020a3853da0 100644
--- a/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html
+++ b/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html
@@ -14,12 +14,6 @@ test(function() {
   assert_equals(document.vlinkColor, document.body.vLink);
   assert_equals(document.alinkColor, document.body.aLink);
 })
-test(function() {
-  document.body.text = null;
-  assert_equals(document.fgColor, "");
-  assert_equals(document.body.text, "");
-  assert_equals(document.body.getAttribute("text"), "");
-})
 test(function() {
   document.body.text = "blue";
   assert_equals(document.fgColor, "blue");
diff --git a/testing/web-platform/tests/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html b/testing/web-platform/tests/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html
index f7d47b3640df..a7904bf0fe0d 100644
--- a/testing/web-platform/tests/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html
+++ b/testing/web-platform/tests/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html
@@ -14,10 +14,6 @@
 <img srcset="/images/green-256x256.png 256w" sizes="512px" data-expect="512">
 <img srcset="/images/green-256x256.png 256w" sizes="1px" data-expect="1">
 <img srcset="/images/green-256x256.png 256w" sizes="0px" data-expect="0">
-<!-- SVG -->
-<img srcset="data:image/svg+xml,<svg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='-1%20-1%202%202'%20width='20'%20height='20'><circle%20r='1'/></svg> 2x" data-expect="10">
-<img srcset="data:image/svg+xml,<svg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='-1%20-1%202%202'%20width='20'><circle%20r='1'/></svg> 2x" data-expect="10">
-<img srcset="data:image/svg+xml,<svg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='-1%20-1%202%202'%20height='20'><circle%20r='1'/></svg> 2x" data-expect="10">
 <script>
 setup({explicit_done:true});
 onload = function() {
@@ -28,8 +24,8 @@ onload = function() {
       assert_equals(img.height, expected, 'height');
       assert_equals(img.clientWidth, expected, 'clientWidth');
       assert_equals(img.clientHeight, expected, 'clientHeight');
-      assert_equals(img.naturalWidth, expected, 'naturalWidth');
-      assert_equals(img.naturalHeight, expected, 'naturalHeight');
+      assert_equals(img.naturalWidth, 256, 'naturalWidth');
+      assert_equals(img.naturalHeight, 256, 'naturalHeight');
     }, img.outerHTML);
   });
   done();
diff --git a/testing/web-platform/tests/html/semantics/forms/the-input-element/maxlength-manual.html b/testing/web-platform/tests/html/semantics/forms/the-input-element/maxlength-manual.html
deleted file mode 100644
index fdf6c264410d..000000000000
--- a/testing/web-platform/tests/html/semantics/forms/the-input-element/maxlength-manual.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset=utf-8>
-    <title>input max length</title>
-    <link rel="author" title="Sam Gibson" href="mailto:sam@ifdown.net">
-    <link rel=help href="https://html.spec.whatwg.org/multipage/forms.html#the-maxlength-and-minlength-attributes">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-
-  <body>
-    <div id="log"></div>
-    <p>Type a letter anywhere into the input field (do not select any text, or otherwise manipulate the input)</p>
-    <input type=text maxlength=4 id=only-four value="inpu"></input>
-
-    <script>
-      var input;
-      setup(function() {
-        input = document.getElementById('only-four');
-      }, {explicit_done: true, explicit_timeout: true});
-
-
-      on_event(input, 'keyup', function(event) {
-          if  ((event.keyCode >= 65 && event.keyCode <= 90) ||
-                (event.keyCode >= 97 && event.keyCode <= 122)) {
-            test(function() {
-              assert_equals(input.value, "inpu");
-            }, 'input content should limit to maxlength')
-
-            done();
-          }
-      });
-    </script>
-  </body>
-</html>
-
diff --git a/testing/web-platform/tests/html/semantics/forms/the-input-element/maxlength.html b/testing/web-platform/tests/html/semantics/forms/the-input-element/maxlength.html
deleted file mode 100644
index 8f0a2567d40e..000000000000
--- a/testing/web-platform/tests/html/semantics/forms/the-input-element/maxlength.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>input max length</title>
-    <link rel="author" title="Sam Gibson" href="mailto:sam@ifdown.net">
-    <link rel=help href="https://html.spec.whatwg.org/multipage/forms.html#the-maxlength-and-minlength-attributes">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-
-  <body>
-    <h1>Text input element</h1>
-
-    <div style="display: none">
-      <input id="none" />
-      <input id="negative" type="-5" />
-      <input id="non-numeric" type="not-a-number" />
-      <input id="assign-negative" />
-      <input id="assign-non-numeric" />
-    </div>
-
-    <div id="log"></div>
-
-    <script type="text/javascript">
-      test(
-        function() {
-          assert_equals(document.getElementById("none").maxLength, -1);
-        }, "Unset maxlength is -1");
-
-      test(
-        function() {
-          assert_equals(document.getElementById("negative").maxLength, -1);
-        }, "Negative maxlength is always -1");
-
-      test(
-        function() {
-          assert_equals(document.getElementById("non-numeric").maxLength, -1);
-        }, "Non-numeric maxlength is -1");
-
-      test(
-          function() {
-            assert_throws("INDEX_SIZE_ERR", function() {
-              document.getElementById("assign-negative").maxLength = -5;
-            });
-          }, "Assigning negative integer throws IndexSizeError");
-
-      test(
-          function() {
-            document.getElementById("assign-non-numeric").maxLength = "not-a-number";
-            assert_equals(document.getElementById("assign-non-numeric").maxLength, 0);
-          }, "Assigning non-numeric to maxlength sets maxlength to 0");
-    </script>
-  </body>
-</html>
-
diff --git a/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-event-xhtml.xhtml b/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-event.xhtml
similarity index 100%
rename from testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-event-xhtml.xhtml
rename to testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-event.xhtml
diff --git a/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text-xhtml.xhtml b/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text.xhtml
similarity index 100%
rename from testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text-xhtml.xhtml
rename to testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text.xhtml
diff --git a/testing/web-platform/tests/html/syntax/parsing/README b/testing/web-platform/tests/html/syntax/parsing/README
index 343ebaff746a..8e4ae0808b6f 100644
--- a/testing/web-platform/tests/html/syntax/parsing/README
+++ b/testing/web-platform/tests/html/syntax/parsing/README
@@ -1,4 +1,4 @@
 Note: the html5lib_* files in this directory are autogenerated.
 
-To update them use the script /html/tools/update_html5lib_tests.py.
+To update them use the script /tools/scripts/update_html5lib_tests.py.
 Further instructions are provided in that file.
\ No newline at end of file
diff --git a/testing/web-platform/tests/html/syntax/parsing/test.js b/testing/web-platform/tests/html/syntax/parsing/test.js
index 362272a2f188..e2c1aabb39d5 100644
--- a/testing/web-platform/tests/html/syntax/parsing/test.js
+++ b/testing/web-platform/tests/html/syntax/parsing/test.js
@@ -127,23 +127,18 @@ function get_type() {
   return run_type;
 };
 
-var test_in_blob_uri = get_test_func(function (iframe, uri_encoded_input, t) {
-                                       var b = new Blob([decodeURIComponent(uri_encoded_input)], { type: "text/html" });
-                                       var blobURL = URL.createObjectURL(b);
-                                       iframe.src = blobURL;
-                                       t.add_cleanup(function() {
-                                         URL.revokeObjectURL(blobURL);
-                                       });
+var test_in_data_uri = get_test_func(function (iframe, uri_encoded_input) {
+                                       iframe.src = "data:text/html;charset=utf8," + uri_encoded_input;
                                      });
 
-var test_document_write = get_test_func(function(iframe, uri_encoded_input, t) {
+var test_document_write = get_test_func(function(iframe, uri_encoded_input) {
                                           iframe.contentDocument.open();
                                           var input = decodeURIComponent(uri_encoded_input);
                                           iframe.contentDocument.write(input);
                                           iframe.contentDocument.close();
                                         });
 
-var test_document_write_single = get_test_func(function(iframe, uri_encoded_input, t) {
+var test_document_write_single = get_test_func(function(iframe, uri_encoded_input) {
                                                  iframe.contentDocument.open();
                                                  var input = decodeURIComponent(uri_encoded_input);
                                                  for (var i=0; i< input.length; i++) {
@@ -171,7 +166,7 @@ function get_test_func(inject_func) {
              }
             );
     };
-    inject_func(iframe, uri_encoded_input, t);
+    inject_func(iframe, uri_encoded_input);
   }
   return test_func;
 }
@@ -253,7 +248,7 @@ function init_tests(test_type) {
   var test_funcs = {
     "write":test_document_write,
     "write_single":test_document_write_single,
-    "uri":test_in_blob_uri,
+    "uri":test_in_data_uri,
     "innerHTML":test_fragment
   };
   var tests_started = 0;
diff --git a/testing/web-platform/tests/resources/docs/api.md b/testing/web-platform/tests/resources/docs/api.md
index accd18b8a423..d3ac4169d45e 100644
--- a/testing/web-platform/tests/resources/docs/api.md
+++ b/testing/web-platform/tests/resources/docs/api.md
@@ -203,7 +203,7 @@ eventWatcher.wait_for(t, 'animationstart').then(t.step_func(function() {
                                 'animationend']);
 })).then(t.step_func(function() {
   assertExpectedStateAtEndOfAnimation();
-  t.done();
+  test.done();
 }));
 ```
 
diff --git a/testing/web-platform/tests/resources/idlharness.js b/testing/web-platform/tests/resources/idlharness.js
index 02304ca10600..9f324e089ebf 100644
--- a/testing/web-platform/tests/resources/idlharness.js
+++ b/testing/web-platform/tests/resources/idlharness.js
@@ -772,30 +772,6 @@ IdlInterface.prototype.test_self = function()
         }.bind(this), this.name + " interface object length");
     }
 
-    if (!this.is_callback() || this.has_constants()) {
-        test(function() {
-            // This function tests WebIDL as of 2015-11-17.
-            // https://heycam.github.io/webidl/#interface-object
-
-            assert_own_property(self, this.name,
-                                "self does not have own property " + format_value(this.name));
-
-            // "All interface objects must have a property named “name” with
-            // attributes { [[Writable]]: false, [[Enumerable]]: false,
-            // [[Configurable]]: true } whose value is the identifier of the
-            // corresponding interface."
-
-            assert_own_property(self[this.name], "name");
-            var desc = Object.getOwnPropertyDescriptor(self[this.name], "name");
-            assert_false("get" in desc, this.name + ".name has getter");
-            assert_false("set" in desc, this.name + ".name has setter");
-            assert_false(desc.writable, this.name + ".name is writable");
-            assert_false(desc.enumerable, this.name + ".name is enumerable");
-            assert_true(desc.configurable, this.name + ".name is not configurable");
-            assert_equals(self[this.name].name, this.name, "wrong value for " + this.name + ".name");
-        }.bind(this), this.name + " interface object name");
-    }
-
     // TODO: Test named constructors if I find any interfaces that have them.
 
     test(function()
diff --git a/testing/web-platform/tests/resources/webidl2/README.md b/testing/web-platform/tests/resources/webidl2/README.md
index 0243bdf51bf8..f7d03fcdef30 100644
--- a/testing/web-platform/tests/resources/webidl2/README.md
+++ b/testing/web-platform/tests/resources/webidl2/README.md
@@ -61,6 +61,22 @@ In the browser:
       var tree = WebIDL2.parse("string of WebIDL");
     </script>
 
+Advanced Parsing
+----------------
+
+`parse()` can optionally accept a second parameter, an options object, which can be used to
+modify parsing behavior.
+
+The following options are recognized:
+```javascript
+{
+    allowNestedTypedefs: false # 
+}
+```
+And their meanings are as follows:
+
+* `allowNestedTypedefs`: Boolean indicating whether the parser should accept `typedef`s as valid members of `interface`s. This is non-standard syntax and therefore the default is `false`.
+
 Errors
 ------
 When there is a syntax error in the WebIDL, it throws an exception object with the following
@@ -660,9 +676,8 @@ The fields are as follows:
   whereas the lack thereof will yield a `null`. If there is an `rhs` field then
   they are the right-hand side's arguments, otherwise they apply to the extended
   attribute directly.
-* `rhs`: If there is a right-hand side, this will capture its `type` (always
-  "identifier" in practice, though it may be extended in the future) and its
-  `value`.
+* `rhs`: If there is a right-hand side, this will capture its `type` (which can be
+  "identifier" or "identifier-list") and its `value`.
 * `typePair`: If the extended attribute is a `MapClass` this will capture the
   map's key type and value type respectively.
 
@@ -681,6 +696,24 @@ For Infinity:
 
 * `negative`: Boolean indicating whether this is negative Infinity or not.
 
+### `iterable<>`, `legacyiterable<>`, `maplike<>`, `setlike<>` declarations
+
+These appear as members of interfaces that look like this:
+
+        {
+            "type": "maplike", // or "legacyiterable" / "iterable" / "setlike"
+            "idlType": /* One or two types */,
+            "readonly": false, // only for maplike and setlike
+            "extAttrs": []
+        }
+
+The fields are as follows:
+
+* `type`: Always one of "iterable", "legacyiterable", "maplike" or "setlike".
+* `idlType`: An [IDL Type](#idl-type) (or an array of two types) representing the declared type arguments.
+* `readonly`: Whether the maplike or setlike is declared as read only.
+* `extAttrs`: A list of [extended attributes](#extended-attributes).
+
 
 Testing
 =======
diff --git a/testing/web-platform/tests/resources/webidl2/lib/webidl2.js b/testing/web-platform/tests/resources/webidl2/lib/webidl2.js
index 50d3950dd70f..9e504fc6e1fd 100644
--- a/testing/web-platform/tests/resources/webidl2/lib/webidl2.js
+++ b/testing/web-platform/tests/resources/webidl2/lib/webidl2.js
@@ -336,6 +336,7 @@
                   ret.rhs = rhs
                 }
                 else if (consume(OTHER, "(")) {
+                    // [Exposed=(Window,Worker)]
                     rhs = [];
                     var id = consume(ID);
                     if (id) {
@@ -343,7 +344,10 @@
                     }
                     identifiers(rhs);
                     consume(OTHER, ")") || error("Unexpected token in extended attribute argument list or type pair");
-                    ret.rhs = rhs;
+                    ret.rhs = {
+                        type: "identifier-list",
+                        value: rhs
+                    };
                 }
                 if (!ret.rhs) return error("No right hand side to extended attribute assignment");
             }
@@ -578,7 +582,7 @@
                 return ret;
             }
             else if (consume(ID, "stringifier")) {
-                ret.stringifier = true;
+                ret.stringifier = true;-
                 all_ws();
                 if (consume(OTHER, ";")) return ret;
                 ret.idlType = return_type();
@@ -683,6 +687,69 @@
             }
             return ret;
         };
+
+        var iterable_type = function() {
+            if (consume(ID, "iterable")) return "iterable";
+            else if (consume(ID, "legacyiterable")) return "legacyiterable";
+            else if (consume(ID, "maplike")) return "maplike";
+            else if (consume(ID, "setlike")) return "setlike";
+            else return;
+        }
+
+        var readonly_iterable_type = function() {
+            if (consume(ID, "maplike")) return "maplike";
+            else if (consume(ID, "setlike")) return "setlike";
+            else return;
+        }
+
+        var iterable = function (store) {
+            all_ws(store, "pea");
+            var grabbed = [],
+                ret = {type: null, idlType: null, readonly: false};
+            if (consume(ID, "readonly")) {
+                ret.readonly = true;
+                grabbed.push(last_token);
+                var w = all_ws();
+                if (w) grabbed.push(w);
+            }
+            var consumeItType = ret.readonly ? readonly_iterable_type : iterable_type;
+
+            var ittype = consumeItType();
+            if (!ittype) {
+                tokens = grabbed.concat(tokens);
+                return;
+            }
+
+            var secondTypeRequired = ittype === "maplike";
+            var secondTypeAllowed = secondTypeRequired || ittype === "iterable";
+            ret.type = ittype;
+            if (ret.type !== 'maplike' && ret.type !== 'setlike')
+                delete ret.readonly;
+            all_ws();
+            if (consume(OTHER, "<")) {
+                ret.idlType = type() || error("Error parsing " + ittype + " declaration");
+                all_ws();
+                if (secondTypeAllowed) {
+                    var type2 = null;
+                    if (consume(OTHER, ",")) {
+                        all_ws();
+                        type2 = type();
+                        all_ws();                        
+                    }
+                    if (type2)
+                        ret.idlType = [ret.idlType, type2];
+                    else if (secondTypeRequired)
+                        error("Missing second type argument in " + ittype + " declaration");
+                }
+                if (!consume(OTHER, ">")) error("Unterminated " + ittype + " declaration");
+                all_ws();
+                if (!consume(OTHER, ";")) error("Missing semicolon after " + ittype + " declaration");
+            }
+            else
+                error("Error parsing " + ittype + " declaration");
+
+            return ret;            
+        }        
         
         var interface_ = function (isPartial, store) {
             all_ws(isPartial ? null : store, "pea");
@@ -714,7 +781,9 @@
                     ret.members.push(cnt);
                     continue;
                 }
-                var mem = serialiser(store ? mems : null) ||
+                var mem = (opt.allowNestedTypedefs && typedef(store ? mems : null)) ||
+                          iterable(store ? mems : null) ||
+                          serialiser(store ? mems : null) ||
                           attribute(store ? mems : null) ||
                           operation(store ? mems : null) ||
                           error("Unknown member");
@@ -838,7 +907,6 @@
                 all_ws(store ? vals : null);
                 if (consume(OTHER, "}")) {
                     all_ws();
-                    if (saw_comma) error("Trailing comma in enum");
                     consume(OTHER, ";") || error("No semicolon after enum");
                     return ret;
                 }
diff --git a/testing/web-platform/tests/resources/webidl2/package.json b/testing/web-platform/tests/resources/webidl2/package.json
index e0e6ec4eac86..c5ae7da2d593 100644
--- a/testing/web-platform/tests/resources/webidl2/package.json
+++ b/testing/web-platform/tests/resources/webidl2/package.json
@@ -1,17 +1,17 @@
 {
   "name": "webidl2",
   "description": "A WebIDL Parser",
-  "version": "2.0.10",
+  "version": "2.0.11",
   "author": "Robin Berjon <robin@berjon.com>",
   "license": "MIT",
   "dependencies": {},
   "devDependencies": {
-    "mocha": "2.1.0",
+    "mocha": "2.2.5",
     "expect.js": "0.3.1",
-    "underscore": "1.7.0",
-    "jsondiffpatch": "0.1.27",
+    "underscore": "1.8.3",
+    "jsondiffpatch": "0.1.31",
     "benchmark": "*",
-    "microtime": "1.1.0"
+    "microtime": "1.4.2"
   },
   "scripts": {
     "test": "mocha"
diff --git a/testing/web-platform/tests/resources/webidl2/test/invalid/idl/maplike-1type.widl b/testing/web-platform/tests/resources/webidl2/test/invalid/idl/maplike-1type.widl
new file mode 100644
index 000000000000..33c274b8b9a8
--- /dev/null
+++ b/testing/web-platform/tests/resources/webidl2/test/invalid/idl/maplike-1type.widl
@@ -0,0 +1,3 @@
+interface MapLikeOneType {
+	maplike<long>;
+}
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/invalid/idl/readonly-iterable.widl b/testing/web-platform/tests/resources/webidl2/test/invalid/idl/readonly-iterable.widl
new file mode 100644
index 000000000000..fc4ae2be9084
--- /dev/null
+++ b/testing/web-platform/tests/resources/webidl2/test/invalid/idl/readonly-iterable.widl
@@ -0,0 +1,3 @@
+interface ReadonlyIterable {
+	readonly iterable<long>;
+}
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/invalid/idl/setlike-2types.widl b/testing/web-platform/tests/resources/webidl2/test/invalid/idl/setlike-2types.widl
new file mode 100644
index 000000000000..1ecae22c0106
--- /dev/null
+++ b/testing/web-platform/tests/resources/webidl2/test/invalid/idl/setlike-2types.widl
@@ -0,0 +1,3 @@
+interface SetLikeTwoTypes {
+	setlike<long, long>;
+}
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/invalid/idl/typedef-nested.widl b/testing/web-platform/tests/resources/webidl2/test/invalid/idl/typedef-nested.widl
new file mode 100644
index 000000000000..106f30b8f72e
--- /dev/null
+++ b/testing/web-platform/tests/resources/webidl2/test/invalid/idl/typedef-nested.widl
@@ -0,0 +1,22 @@
+
+      interface Point {
+        attribute float x;
+        attribute float y;
+      };
+
+
+      interface Rect {
+        attribute Point topleft;
+        attribute Point bottomright;
+      };
+
+  interface Widget {
+    typedef sequence<Point> PointSequence;
+
+    readonly attribute Rect bounds;
+
+    boolean pointWithinBounds(Point p);
+    boolean allPointsWithinBounds(PointSequence ps);
+  };
+
+  typedef [Clamp] octet value; 
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/invalid/json/maplike-1type.json b/testing/web-platform/tests/resources/webidl2/test/invalid/json/maplike-1type.json
new file mode 100644
index 000000000000..859a820a4910
--- /dev/null
+++ b/testing/web-platform/tests/resources/webidl2/test/invalid/json/maplike-1type.json
@@ -0,0 +1,4 @@
+{
+    "message": "Missing second type argument in maplike declaration",
+    "line": 2
+}
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/invalid/json/readonly-iterable.json b/testing/web-platform/tests/resources/webidl2/test/invalid/json/readonly-iterable.json
new file mode 100644
index 000000000000..c6f52a246158
--- /dev/null
+++ b/testing/web-platform/tests/resources/webidl2/test/invalid/json/readonly-iterable.json
@@ -0,0 +1,4 @@
+{
+    "message": "Invalid operation",
+    "line": 2
+}
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/invalid/json/setlike-2types.json b/testing/web-platform/tests/resources/webidl2/test/invalid/json/setlike-2types.json
new file mode 100644
index 000000000000..c9e49b6756d5
--- /dev/null
+++ b/testing/web-platform/tests/resources/webidl2/test/invalid/json/setlike-2types.json
@@ -0,0 +1,4 @@
+{
+    "message": "Unterminated setlike declaration",
+    "line": 2
+}
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/invalid/json/typedef-nested.json b/testing/web-platform/tests/resources/webidl2/test/invalid/json/typedef-nested.json
new file mode 100644
index 000000000000..d7fb9182f86e
--- /dev/null
+++ b/testing/web-platform/tests/resources/webidl2/test/invalid/json/typedef-nested.json
@@ -0,0 +1,4 @@
+{
+    "message":  "Invalid operation"
+,   "line":     14
+}
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax.js b/testing/web-platform/tests/resources/webidl2/test/syntax.js
index 6f9de3637d17..712542a6be8e 100644
--- a/testing/web-platform/tests/resources/webidl2/test/syntax.js
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax.js
@@ -17,11 +17,16 @@ describe("Parses all of the IDLs to produce the correct ASTs", function () {
     
     for (var i = 0, n = idls.length; i < n; i++) {
         var idl = idls[i], json = jsons[i];
+
         var func = (function (idl, json) {
             return function () {
                 try {
+                    var optFile = pth.join(__dirname, "syntax/opt", pth.basename(json));
+                    var opt = undefined;
+                    if (fs.existsSync(optFile))
+                        opt = JSON.parse(fs.readFileSync(optFile, "utf8"));
                     var diff = jdp.diff(JSON.parse(fs.readFileSync(json, "utf8")),
-                                        wp.parse(fs.readFileSync(idl, "utf8")));
+                                        wp.parse(fs.readFileSync(idl, "utf8"), opt));
                     if (diff && debug) console.log(JSON.stringify(diff, null, 4));
                     expect(diff).to.be(undefined);
                 }
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/callback.widl b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/callback.widl
index d92f6a18c0a5..adaf75e049c9 100644
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/callback.widl
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/callback.widl
@@ -2,4 +2,6 @@ callback AsyncOperationCallback = void (DOMString status);
 
 callback interface EventHandler {
   void eventOccurred(DOMString details);
-};
\ No newline at end of file
+};
+
+callback SortCallback = boolean (any a, any b);
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/enum.widl b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/enum.widl
index 851fca2e6f61..37c4ffddee31 100644
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/enum.widl
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/enum.widl
@@ -5,4 +5,6 @@ interface Meal {
   attribute float size;     // in grams
 
   void initialize(MealType type, float size);
-};
\ No newline at end of file
+};
+
+enum AltMealType { "rice", "noodles", "other", };
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/extended-attributes.widl b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/extended-attributes.widl
new file mode 100644
index 000000000000..f769c2559cc7
--- /dev/null
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/extended-attributes.widl
@@ -0,0 +1,6 @@
+// Extracted from http://www.w3.org/TR/2015/WD-service-workers-20150205/
+
+[Global=(Worker,ServiceWorker), Exposed=ServiceWorker]
+interface ServiceWorkerGlobalScope : WorkerGlobalScope {
+  
+};
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/iterable.widl b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/iterable.widl
new file mode 100644
index 000000000000..c7dfafa4daa8
--- /dev/null
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/iterable.widl
@@ -0,0 +1,7 @@
+interface IterableOne {
+	iterable<long>;
+};
+
+interface IterableTwo {
+	iterable<short, double?>;
+};
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/legacyiterable.widl b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/legacyiterable.widl
new file mode 100644
index 000000000000..eafa7cf04459
--- /dev/null
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/legacyiterable.widl
@@ -0,0 +1,3 @@
+interface LegacyIterable {
+	legacyiterable<long>;
+};
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/maplike.widl b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/maplike.widl
new file mode 100644
index 000000000000..7b79b3888026
--- /dev/null
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/maplike.widl
@@ -0,0 +1,7 @@
+interface MapLike {
+	maplike<long, float>;
+};
+
+interface ReadOnlyMapLike {
+	readonly maplike<long, float>;
+};
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/setlike.widl b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/setlike.widl
new file mode 100644
index 000000000000..890e8e5a7597
--- /dev/null
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/setlike.widl
@@ -0,0 +1,7 @@
+interface SetLike {
+	setlike<long>;
+};
+
+interface ReadOnlySetLike {
+	readonly setlike<long>;
+};
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/typedef-nested.widl b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/typedef-nested.widl
new file mode 100644
index 000000000000..106f30b8f72e
--- /dev/null
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/typedef-nested.widl
@@ -0,0 +1,22 @@
+
+      interface Point {
+        attribute float x;
+        attribute float y;
+      };
+
+
+      interface Rect {
+        attribute Point topleft;
+        attribute Point bottomright;
+      };
+
+  interface Widget {
+    typedef sequence<Point> PointSequence;
+
+    readonly attribute Rect bounds;
+
+    boolean pointWithinBounds(Point p);
+    boolean allPointsWithinBounds(PointSequence ps);
+  };
+
+  typedef [Clamp] octet value; 
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/json/callback.json b/testing/web-platform/tests/resources/webidl2/test/syntax/json/callback.json
index 19ef4a6fa4e2..43a517510467 100644
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/json/callback.json
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax/json/callback.json
@@ -72,5 +72,48 @@
         ],
         "inheritance": null,
         "extAttrs": []
+    },
+    {
+        "type": "callback",
+        "name": "SortCallback",
+        "idlType": {
+            "sequence": false,
+            "generic": null,
+            "nullable": false,
+            "array": false,
+            "union": false,
+            "idlType": "boolean"
+        },
+        "arguments": [
+            {
+                "optional": false,
+                "variadic": false,
+                "extAttrs": [],
+                "idlType": {
+                    "sequence": false,
+                    "generic": null,
+                    "nullable": false,
+                    "array": false,
+                    "union": false,
+                    "idlType": "any"
+                },
+                "name": "a"
+            },
+            {
+                "optional": false,
+                "variadic": false,
+                "extAttrs": [],
+                "idlType": {
+                    "sequence": false,
+                    "generic": null,
+                    "nullable": false,
+                    "array": false,
+                    "union": false,
+                    "idlType": "any"
+                },
+                "name": "b"
+            }
+        ],
+        "extAttrs": []
     }
 ]
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/json/enum.json b/testing/web-platform/tests/resources/webidl2/test/syntax/json/enum.json
index bd9058c594f6..196ee4e6405f 100644
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/json/enum.json
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax/json/enum.json
@@ -101,5 +101,15 @@
         ],
         "inheritance": null,
         "extAttrs": []
+    },
+    {
+        "type": "enum",
+        "name": "AltMealType",
+        "values": [
+            "rice",
+            "noodles",
+            "other"
+        ],
+        "extAttrs": []
     }
 ]
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/json/extended-attributes.json b/testing/web-platform/tests/resources/webidl2/test/syntax/json/extended-attributes.json
new file mode 100644
index 000000000000..228c4b824be3
--- /dev/null
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax/json/extended-attributes.json
@@ -0,0 +1,30 @@
+[
+    {
+        "type": "interface",
+        "name": "ServiceWorkerGlobalScope",
+        "partial": false,
+        "members": [],
+        "inheritance": "WorkerGlobalScope",
+        "extAttrs": [
+            {
+                "name": "Global",
+                "arguments": null,
+                "rhs": {
+                    "type": "identifier-list",
+                    "value": [
+                        "Worker",
+                        "ServiceWorker"
+                    ]
+                }
+            },
+            {
+                "name": "Exposed",
+                "arguments": null,
+                "rhs": {
+                    "type": "identifier",
+                    "value": "ServiceWorker"
+                }
+            }
+        ]
+    }
+]
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/json/iterable.json b/testing/web-platform/tests/resources/webidl2/test/syntax/json/iterable.json
new file mode 100644
index 000000000000..3e38991dd9db
--- /dev/null
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax/json/iterable.json
@@ -0,0 +1,55 @@
+[
+    {
+        "type": "interface",
+        "name": "IterableOne",
+        "partial": false,
+        "members": [
+            {
+                "type": "iterable",
+                "idlType": {
+                    "sequence": false,
+                    "generic": null,
+                    "nullable": false,
+                    "array": false,
+                    "union": false,
+                    "idlType": "long"
+                },
+                "extAttrs": []
+            }
+        ],
+        "inheritance": null,
+        "extAttrs": []
+    },
+    {
+        "type": "interface",
+        "name": "IterableTwo",
+        "partial": false,
+        "members": [
+            {
+                "type": "iterable",
+                "idlType": [
+                    {
+                        "sequence": false,
+                        "generic": null,
+                        "nullable": false,
+                        "array": false,
+                        "union": false,
+                        "idlType": "short"
+                    },
+                    {
+                        "sequence": false,
+                        "generic": null,
+                        "nullable": true,
+                        "array": false,
+                        "union": false,
+                        "idlType": "double"
+                    }
+                ],
+                "extAttrs": []
+            }
+        ],
+        "inheritance": null,
+        "extAttrs": []
+    }
+]
+
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/json/legacyiterable.json b/testing/web-platform/tests/resources/webidl2/test/syntax/json/legacyiterable.json
new file mode 100644
index 000000000000..e63f99de43f4
--- /dev/null
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax/json/legacyiterable.json
@@ -0,0 +1,24 @@
+[
+    {
+        "type": "interface",
+        "name": "LegacyIterable",
+        "partial": false,
+        "members": [
+            {
+                "type": "legacyiterable",
+                "idlType": {
+                    "sequence": false,
+                    "generic": null,
+                    "nullable": false,
+                    "array": false,
+                    "union": false,
+                    "idlType": "long"
+                },
+                "extAttrs": []
+            }
+        ],
+        "inheritance": null,
+        "extAttrs": []
+    }
+]
+
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/json/maplike.json b/testing/web-platform/tests/resources/webidl2/test/syntax/json/maplike.json
new file mode 100644
index 000000000000..017d8b3f3ec2
--- /dev/null
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax/json/maplike.json
@@ -0,0 +1,67 @@
+[
+    {
+        "type": "interface",
+        "name": "MapLike",
+        "partial": false,
+        "members": [
+            {
+                "type": "maplike",
+                "idlType": [
+                    {
+                        "sequence": false,
+                        "generic": null,
+                        "nullable": false,
+                        "array": false,
+                        "union": false,
+                        "idlType": "long"
+                    },
+                    {
+                        "sequence": false,
+                        "generic": null,
+                        "nullable": false,
+                        "array": false,
+                        "union": false,
+                        "idlType": "float"
+                    }
+                ],
+                "readonly": false,
+                "extAttrs": []
+            }
+        ],
+        "inheritance": null,
+        "extAttrs": []
+    },
+    {
+        "type": "interface",
+        "name": "ReadOnlyMapLike",
+        "partial": false,
+        "members": [
+            {
+                "type": "maplike",
+                "idlType": [
+                    {
+                        "sequence": false,
+                        "generic": null,
+                        "nullable": false,
+                        "array": false,
+                        "union": false,
+                        "idlType": "long"
+                    },
+                    {
+                        "sequence": false,
+                        "generic": null,
+                        "nullable": false,
+                        "array": false,
+                        "union": false,
+                        "idlType": "float"
+                    }
+                ],
+                "readonly": true,
+                "extAttrs": []
+            }
+        ],
+        "inheritance": null,
+        "extAttrs": []
+    }
+]
+
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/json/setlike.json b/testing/web-platform/tests/resources/webidl2/test/syntax/json/setlike.json
new file mode 100644
index 000000000000..d44043a944aa
--- /dev/null
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax/json/setlike.json
@@ -0,0 +1,47 @@
+[
+    {
+        "type": "interface",
+        "name": "SetLike",
+        "partial": false,
+        "members": [
+            {
+                "type": "setlike",
+                "idlType": {
+                    "sequence": false,
+                    "generic": null,
+                    "nullable": false,
+                    "array": false,
+                    "union": false,
+                    "idlType": "long"
+                },
+                "readonly": false,
+                "extAttrs": []
+            }
+        ],
+        "inheritance": null,
+        "extAttrs": []
+    },
+    {
+        "type": "interface",
+        "name": "ReadOnlySetLike",
+        "partial": false,
+        "members": [
+            {
+                "type": "setlike",
+                "idlType": {
+                    "sequence": false,
+                    "generic": null,
+                    "nullable": false,
+                    "array": false,
+                    "union": false,
+                    "idlType": "long"
+                },
+                "readonly": true,
+                "extAttrs": []
+            }
+        ],
+        "inheritance": null,
+        "extAttrs": []
+    }
+]
+
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/json/typedef-nested.json b/testing/web-platform/tests/resources/webidl2/test/syntax/json/typedef-nested.json
new file mode 100644
index 000000000000..76d138408ddf
--- /dev/null
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax/json/typedef-nested.json
@@ -0,0 +1,226 @@
+[
+    {
+        "type": "interface",
+        "name": "Point",
+        "partial": false,
+        "members": [
+            {
+                "type": "attribute",
+                "static": false,
+                "stringifier": false,
+                "inherit": false,
+                "readonly": false,
+                "idlType": {
+                    "sequence": false,
+                    "generic": null,
+                    "nullable": false,
+                    "array": false,
+                    "union": false,
+                    "idlType": "float"
+                },
+                "name": "x",
+                "extAttrs": []
+            },
+            {
+                "type": "attribute",
+                "static": false,
+                "stringifier": false,
+                "inherit": false,
+                "readonly": false,
+                "idlType": {
+                    "sequence": false,
+                    "generic": null,
+                    "nullable": false,
+                    "array": false,
+                    "union": false,
+                    "idlType": "float"
+                },
+                "name": "y",
+                "extAttrs": []
+            }
+        ],
+        "inheritance": null,
+        "extAttrs": []
+    },
+    {
+        "type": "interface",
+        "name": "Rect",
+        "partial": false,
+        "members": [
+            {
+                "type": "attribute",
+                "static": false,
+                "stringifier": false,
+                "inherit": false,
+                "readonly": false,
+                "idlType": {
+                    "sequence": false,
+                    "generic": null,
+                    "nullable": false,
+                    "array": false,
+                    "union": false,
+                    "idlType": "Point"
+                },
+                "name": "topleft",
+                "extAttrs": []
+            },
+            {
+                "type": "attribute",
+                "static": false,
+                "stringifier": false,
+                "inherit": false,
+                "readonly": false,
+                "idlType": {
+                    "sequence": false,
+                    "generic": null,
+                    "nullable": false,
+                    "array": false,
+                    "union": false,
+                    "idlType": "Point"
+                },
+                "name": "bottomright",
+                "extAttrs": []
+            }
+        ],
+        "inheritance": null,
+        "extAttrs": []
+    },
+    {
+        "type": "interface",
+        "name": "Widget",
+        "partial": false,
+        "members": [
+            {
+                "type": "typedef",
+                "typeExtAttrs": [],
+                "idlType": {
+                    "sequence": true,
+                    "generic": "sequence",
+                    "nullable": false,
+                    "array": false,
+                    "union": false,
+                    "idlType": {
+                        "sequence": false,
+                        "generic": null,
+                        "nullable": false,
+                        "array": false,
+                        "union": false,
+                        "idlType": "Point"
+                    }
+                },
+                "name": "PointSequence",
+                "extAttrs": []
+            },
+            {
+                "type": "attribute",
+                "static": false,
+                "stringifier": false,
+                "inherit": false,
+                "readonly": true,
+                "idlType": {
+                    "sequence": false,
+                    "generic": null,
+                    "nullable": false,
+                    "array": false,
+                    "union": false,
+                    "idlType": "Rect"
+                },
+                "name": "bounds",
+                "extAttrs": []
+            },
+            {
+                "type": "operation",
+                "getter": false,
+                "setter": false,
+                "creator": false,
+                "deleter": false,
+                "legacycaller": false,
+                "static": false,
+                "stringifier": false,
+                "idlType": {
+                    "sequence": false,
+                    "generic": null,
+                    "nullable": false,
+                    "array": false,
+                    "union": false,
+                    "idlType": "boolean"
+                },
+                "name": "pointWithinBounds",
+                "arguments": [
+                    {
+                        "optional": false,
+                        "variadic": false,
+                        "extAttrs": [],
+                        "idlType": {
+                            "sequence": false,
+                            "generic": null,
+                            "nullable": false,
+                            "array": false,
+                            "union": false,
+                            "idlType": "Point"
+                        },
+                        "name": "p"
+                    }
+                ],
+                "extAttrs": []
+            },
+            {
+                "type": "operation",
+                "getter": false,
+                "setter": false,
+                "creator": false,
+                "deleter": false,
+                "legacycaller": false,
+                "static": false,
+                "stringifier": false,
+                "idlType": {
+                    "sequence": false,
+                    "generic": null,
+                    "nullable": false,
+                    "array": false,
+                    "union": false,
+                    "idlType": "boolean"
+                },
+                "name": "allPointsWithinBounds",
+                "arguments": [
+                    {
+                        "optional": false,
+                        "variadic": false,
+                        "extAttrs": [],
+                        "idlType": {
+                            "sequence": false,
+                            "generic": null,
+                            "nullable": false,
+                            "array": false,
+                            "union": false,
+                            "idlType": "PointSequence"
+                        },
+                        "name": "ps"
+                    }
+                ],
+                "extAttrs": []
+            }
+        ],
+        "inheritance": null,
+        "extAttrs": []
+    },
+    {
+        "type": "typedef",
+        "typeExtAttrs": [
+            {
+                "name": "Clamp",
+                "arguments": null
+            }
+        ],
+        "idlType": {
+            "sequence": false,
+            "generic": null,
+            "nullable": false,
+            "array": false,
+            "union": false,
+            "idlType": "octet"
+        },
+        "name": "value",
+        "extAttrs": []
+    }
+]
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/opt/typedef-nested.json b/testing/web-platform/tests/resources/webidl2/test/syntax/opt/typedef-nested.json
new file mode 100644
index 000000000000..f0794e74e07e
--- /dev/null
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax/opt/typedef-nested.json
@@ -0,0 +1,3 @@
+{
+    "allowNestedTypedefs": true
+}
\ No newline at end of file
diff --git a/testing/web-platform/tests/selectors/attribute-selectors/attribute-case/semantics.html b/testing/web-platform/tests/selectors/attribute-selectors/attribute-case/semantics.html
index c455e26686ef..7b6d7373af0b 100644
--- a/testing/web-platform/tests/selectors/attribute-selectors/attribute-case/semantics.html
+++ b/testing/web-platform/tests/selectors/attribute-selectors/attribute-case/semantics.html
@@ -19,12 +19,12 @@ var match = [
   ["[*|foo='bar' i]", ["", "foo", "BAR"], ["a", "foo", "x"], ["b", "foo", "x"], ["c", "foo", "x"]],
   ["[align='left' i]", ["", "align", "LEFT"]],
   ["[align='LEFT' i]", ["", "align", "left"]],
-  ["[class~='a' i]", ["", "class", "X A B"]],
-  ["[class~='A' i]", ["", "class", "x a b"]],
-  ["[id^='a' i]", ["", "id", "AB"]],
-  ["[id$='A' i]", ["", "id", "xa"]],
-  ["[lang|='a' i]", ["", "lang", "A-B"]],
-  ["[lang*='A' i]", ["", "lang", "xab"]],
+  ["[class='a' i]", ["", "class", "A"]],
+  ["[class='A' i]", ["", "class", "a"]],
+  ["[id='a' i]", ["", "id", "A"]],
+  ["[id='A' i]", ["", "id", "a"]],
+  ["[lang='a' i]", ["", "lang", "A"]],
+  ["[lang='A' i]", ["", "lang", "a"]],
   ["[*|lang='a' i]", ["http://www.w3.org/XML/1998/namespace", "lang", "A"]],
   ["[*|lang='A' i]", ["http://www.w3.org/XML/1998/namespace", "lang", "a"]],
   ["@namespace x 'http://www.w3.org/XML/1998/namespace'; [x|lang='A' i]", ["http://www.w3.org/XML/1998/namespace", "lang", "a"]],
@@ -40,11 +40,11 @@ var nomatch = [
   ["[foo='\u00E4' i]", ["", "foo", "\u00C4"]],
   ["[foo='\u00C4' i]", ["", "foo", "\u00E4"]],
   ["[foo='a\u0308' i] /* COMBINING in selector */", ["", "foo", "\u00C4"]],
-  ["[foo~='a\u0308' i] /* COMBINING in selector */", ["", "foo", "\u00E4"]],
-  ["[foo^='A\u0308' i] /* COMBINING in selector */", ["", "foo", "\u00C4"]],
-  ["[foo$='A\u0308' i] /* COMBINING in selector */", ["", "foo", "\u00E4"]],
-  ["[foo*='\u00E4' i] /* COMBINING in attribute */", ["", "foo", "a\u0308"]],
-  ["[foo|='\u00E4' i] /* COMBINING in attribute */", ["", "foo", "A\u0308"]],
+  ["[foo='a\u0308' i] /* COMBINING in selector */", ["", "foo", "\u00E4"]],
+  ["[foo='A\u0308' i] /* COMBINING in selector */", ["", "foo", "\u00C4"]],
+  ["[foo='A\u0308' i] /* COMBINING in selector */", ["", "foo", "\u00E4"]],
+  ["[foo='\u00E4' i] /* COMBINING in attribute */", ["", "foo", "a\u0308"]],
+  ["[foo='\u00E4' i] /* COMBINING in attribute */", ["", "foo", "A\u0308"]],
   ["[foo='\u00C4' i] /* COMBINING in attribute */", ["", "foo", "a\u0308"]],
   ["[foo='\u00C4' i] /* COMBINING in attribute */", ["", "foo", "A\u0308"]],
   ["[foo='a\u0308' i] /* COMBINING in selector */", ["", "foo", "a"]],
diff --git a/testing/web-platform/tests/selectors/attribute-selectors/attribute-case/syntax.html b/testing/web-platform/tests/selectors/attribute-selectors/attribute-case/syntax.html
index 1a6aa5b369db..754af95c9d01 100644
--- a/testing/web-platform/tests/selectors/attribute-selectors/attribute-case/syntax.html
+++ b/testing/web-platform/tests/selectors/attribute-selectors/attribute-case/syntax.html
@@ -29,8 +29,6 @@ var valid = [
   "[foo~='bar' i]",
   "[foo^='bar' i]",
   "[foo$='bar' i]",
-  "[foo*='bar' i]",
-  "[foo|='bar' i]",
   "[|foo='bar' i]",
   "[*|foo='bar' i]",
 ];
diff --git a/testing/web-platform/tests/svg/interfaces.html b/testing/web-platform/tests/svg/interfaces.html
deleted file mode 100644
index 15c447734867..000000000000
--- a/testing/web-platform/tests/svg/interfaces.html
+++ /dev/null
@@ -1,1568 +0,0 @@
-<!doctype html>
-<title>SVG interface tests</title>
-<div id=log></div>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/resources/WebIDLParser.js></script>
-<script src=/resources/idlharness.js></script>
-<script type=text/plain id=untested_idl>
-interface EventTarget {};
-interface Node : EventTarget {};
-interface Document : Node {};
-interface ProcessingInstruction : Node {};
-interface Element : Node {};
-interface HTMLElement : Element {};
-[PrimaryGlobal] interface Window {};
-
-[TreatNonObjectAsNull]
-callback EventHandlerNonNull = any (Event event);
-typedef EventHandlerNonNull? EventHandler;
-
-[TreatNonObjectAsNull]
-callback OnErrorEventHandlerNonNull = any ((Event or DOMString) event, optional DOMString source, optional unsigned long lineno, optional unsigned long column, optional any error);
-typedef OnErrorEventHandlerNonNull? OnErrorEventHandler;
-
-[TreatNonObjectAsNull]
-callback OnBeforeUnloadEventHandlerNonNull = DOMString? (Event event);
-typedef OnBeforeUnloadEventHandlerNonNull? OnBeforeUnloadEventHandler;
-
-[NoInterfaceObject]
-interface GlobalEventHandlers {
-  attribute EventHandler onabort;
-  attribute EventHandler onautocomplete;
-  attribute EventHandler onautocompleteerror;
-  attribute EventHandler onblur;
-  attribute EventHandler oncancel;
-  attribute EventHandler oncanplay;
-  attribute EventHandler oncanplaythrough;
-  attribute EventHandler onchange;
-  attribute EventHandler onclick;
-  attribute EventHandler onclose;
-  attribute EventHandler oncontextmenu;
-  attribute EventHandler oncuechange;
-  attribute EventHandler ondblclick;
-  attribute EventHandler ondrag;
-  attribute EventHandler ondragend;
-  attribute EventHandler ondragenter;
-  attribute EventHandler ondragexit;
-  attribute EventHandler ondragleave;
-  attribute EventHandler ondragover;
-  attribute EventHandler ondragstart;
-  attribute EventHandler ondrop;
-  attribute EventHandler ondurationchange;
-  attribute EventHandler onemptied;
-  attribute EventHandler onended;
-  attribute OnErrorEventHandler onerror;
-  attribute EventHandler onfocus;
-  attribute EventHandler oninput;
-  attribute EventHandler oninvalid;
-  attribute EventHandler onkeydown;
-  attribute EventHandler onkeypress;
-  attribute EventHandler onkeyup;
-  attribute EventHandler onload;
-  attribute EventHandler onloadeddata;
-  attribute EventHandler onloadedmetadata;
-  attribute EventHandler onloadstart;
-  attribute EventHandler onmousedown;
-  [LenientThis] attribute EventHandler onmouseenter;
-  [LenientThis] attribute EventHandler onmouseleave;
-  attribute EventHandler onmousemove;
-  attribute EventHandler onmouseout;
-  attribute EventHandler onmouseover;
-  attribute EventHandler onmouseup;
-  attribute EventHandler onwheel;
-  attribute EventHandler onpause;
-  attribute EventHandler onplay;
-  attribute EventHandler onplaying;
-  attribute EventHandler onprogress;
-  attribute EventHandler onratechange;
-  attribute EventHandler onreset;
-  attribute EventHandler onresize;
-  attribute EventHandler onscroll;
-  attribute EventHandler onseeked;
-  attribute EventHandler onseeking;
-  attribute EventHandler onselect;
-  attribute EventHandler onshow;
-  attribute EventHandler onsort;
-  attribute EventHandler onstalled;
-  attribute EventHandler onsubmit;
-  attribute EventHandler onsuspend;
-  attribute EventHandler ontimeupdate;
-  attribute EventHandler ontoggle;
-  attribute EventHandler onvolumechange;
-  attribute EventHandler onwaiting;
-};
-
-[NoInterfaceObject]
-interface WindowEventHandlers {
-  attribute EventHandler onafterprint;
-  attribute EventHandler onbeforeprint;
-  attribute OnBeforeUnloadEventHandler onbeforeunload;
-  attribute EventHandler onhashchange;
-  attribute EventHandler onlanguagechange;
-  attribute EventHandler onmessage;
-  attribute EventHandler onoffline;
-  attribute EventHandler ononline;
-  attribute EventHandler onpagehide;
-  attribute EventHandler onpageshow;
-  attribute EventHandler onpopstate;
-  attribute EventHandler onrejectionhandled;
-  attribute EventHandler onstorage;
-  attribute EventHandler onunhandledrejection;
-  attribute EventHandler onunload;
-};
-
-[NoInterfaceObject]interface LinkStyle {
-  readonly attribute StyleSheet? sheet;
-};
-
-
-[Constructor(optional unrestricted double x = 0, optional unrestricted double y = 0,
-             optional unrestricted double z = 0, optional unrestricted double w = 1),
- Exposed=(Window,Worker)]
-interface DOMPointReadOnly {
-    [NewObject] static DOMPointReadOnly fromPoint(optional DOMPointInit point);
-
-    readonly attribute unrestricted double x;
-    readonly attribute unrestricted double y;
-    readonly attribute unrestricted double z;
-    readonly attribute unrestricted double w;
-
-    DOMPoint matrixTransform(optional DOMMatrixInit matrix);
-};
-
-[Constructor(optional unrestricted double x = 0, optional unrestricted double y = 0,
-             optional unrestricted double z = 0, optional unrestricted double w = 1),
- Exposed=(Window,Worker)]
-interface DOMPoint : DOMPointReadOnly {
-    [NewObject] static DOMPoint fromPoint(optional DOMPointInit other);
-
-    inherit attribute unrestricted double x;
-    inherit attribute unrestricted double y;
-    inherit attribute unrestricted double z;
-    inherit attribute unrestricted double w;
-};
-
-dictionary DOMPointInit {
-    unrestricted double x = 0;
-    unrestricted double y = 0;
-    unrestricted double z = 0;
-    unrestricted double w = 1;
-};
-
-[Constructor(optional unrestricted double x = 0, optional unrestricted double y = 0,
-             optional unrestricted double width = 0, optional unrestricted double height = 0),
- Exposed=(Window,Worker)]
-interface DOMRectReadOnly {
-    [NewObject] static DOMRectReadOnly fromRect(optional DOMRectInit other);
-
-    readonly attribute unrestricted double x;
-    readonly attribute unrestricted double y;
-    readonly attribute unrestricted double width;
-    readonly attribute unrestricted double height;
-    readonly attribute unrestricted double top;
-    readonly attribute unrestricted double right;
-    readonly attribute unrestricted double bottom;
-    readonly attribute unrestricted double left;
-};
-
-[Constructor(optional unrestricted double x = 0, optional unrestricted double y = 0,
-             optional unrestricted double width = 0, optional unrestricted double height = 0),
- Exposed=(Window,Worker)]
-interface DOMRect : DOMRectReadOnly {
-    [NewObject] static DOMRect fromRect(optional DOMRectInit other);
-
-    inherit attribute unrestricted double x;
-    inherit attribute unrestricted double y;
-    inherit attribute unrestricted double width;
-    inherit attribute unrestricted double height;
-};
-
-dictionary DOMRectInit {
-    unrestricted double x = 0;
-    unrestricted double y = 0;
-    unrestricted double width = 0;
-    unrestricted double height = 0;
-};
-
-[Constructor(sequence<unrestricted double> numberSequence),
- Exposed=(Window,Worker)]
-interface DOMMatrixReadOnly {
-    [NewObject] static DOMMatrixReadOnly fromMatrix(optional DOMMatrixInit other);
-    [NewObject] static DOMMatrixReadOnly fromString(DOMString transformList);
-    [NewObject] static DOMMatrixReadOnly fromFloat32Array(Float32Array array32);
-    [NewObject] static DOMMatrixReadOnly fromFloat64Array(Float64Array array64);
-
-    // These attributes are simple aliases for certain elements of the 4x4 matrix
-    readonly attribute unrestricted double a;
-    readonly attribute unrestricted double b;
-    readonly attribute unrestricted double c;
-    readonly attribute unrestricted double d;
-    readonly attribute unrestricted double e;
-    readonly attribute unrestricted double f;
-
-    readonly attribute unrestricted double m11;
-    readonly attribute unrestricted double m12;
-    readonly attribute unrestricted double m13;
-    readonly attribute unrestricted double m14;
-    readonly attribute unrestricted double m21;
-    readonly attribute unrestricted double m22;
-    readonly attribute unrestricted double m23;
-    readonly attribute unrestricted double m24;
-    readonly attribute unrestricted double m31;
-    readonly attribute unrestricted double m32;
-    readonly attribute unrestricted double m33;
-    readonly attribute unrestricted double m34;
-    readonly attribute unrestricted double m41;
-    readonly attribute unrestricted double m42;
-    readonly attribute unrestricted double m43;
-    readonly attribute unrestricted double m44;
-
-    readonly attribute boolean is2D;
-    readonly attribute boolean isIdentity;
-
-    // Immutable transform methods
-    DOMMatrix translate(unrestricted double tx,
-                        unrestricted double ty,
-                        optional unrestricted double tz = 0);
-    DOMMatrix scale(unrestricted double scale,
-                    optional unrestricted double originX = 0,
-                    optional unrestricted double originY = 0);
-    DOMMatrix scale3d(unrestricted double scale,
-                      optional unrestricted double originX = 0,
-                      optional unrestricted double originY = 0,
-                      optional unrestricted double originZ = 0);
-    DOMMatrix scaleNonUniform(unrestricted double scaleX,
-                              optional unrestricted double scaleY = 1,
-                              optional unrestricted double scaleZ = 1,
-                              optional unrestricted double originX = 0,
-                              optional unrestricted double originY = 0,
-                              optional unrestricted double originZ = 0);
-    DOMMatrix rotate(unrestricted double angle,
-                     optional unrestricted double originX = 0,
-                     optional unrestricted double originY = 0);
-    DOMMatrix rotateFromVector(unrestricted double x,
-                               unrestricted double y);
-    DOMMatrix rotateAxisAngle(unrestricted double x,
-                              unrestricted double y,
-                              unrestricted double z,
-                              unrestricted double angle);
-    DOMMatrix skewX(unrestricted double sx);
-    DOMMatrix skewY(unrestricted double sy);
-    DOMMatrix multiply(optional DOMMatrixInit other);
-    DOMMatrix flipX();
-    DOMMatrix flipY();
-    DOMMatrix inverse();
-
-    DOMPoint            transformPoint(optional DOMPointInit point);
-    Float32Array        toFloat32Array();
-    Float64Array        toFloat64Array();
-                        stringifier;
-};
-
-[Constructor(sequence<unrestricted double> numberSequence),
- Exposed=(Window,Worker)]
-interface DOMMatrix : DOMMatrixReadOnly {
-    [NewObject] static DOMMatrix fromMatrix(optional DOMMatrixInit other);
-    [NewObject] static DOMMatrix fromString(DOMString transformList);
-    [NewObject] static DOMMatrix fromFloat32Array(Float32Array array32);
-    [NewObject] static DOMMatrix fromFloat64Array(Float64Array array64);
-
-    // These attributes are simple aliases for certain elements of the 4x4 matrix
-    inherit attribute unrestricted double a;
-    inherit attribute unrestricted double b;
-    inherit attribute unrestricted double c;
-    inherit attribute unrestricted double d;
-    inherit attribute unrestricted double e;
-    inherit attribute unrestricted double f;
-
-    inherit attribute unrestricted double m11;
-    inherit attribute unrestricted double m12;
-    inherit attribute unrestricted double m13;
-    inherit attribute unrestricted double m14;
-    inherit attribute unrestricted double m21;
-    inherit attribute unrestricted double m22;
-    inherit attribute unrestricted double m23;
-    inherit attribute unrestricted double m24;
-    inherit attribute unrestricted double m31;
-    inherit attribute unrestricted double m32;
-    inherit attribute unrestricted double m33;
-    inherit attribute unrestricted double m34;
-    inherit attribute unrestricted double m41;
-    inherit attribute unrestricted double m42;
-    inherit attribute unrestricted double m43;
-    inherit attribute unrestricted double m44;
-
-    // Mutable transform methods
-    DOMMatrix multiplySelf(optional DOMMatrixInit other);
-    DOMMatrix preMultiplySelf(optional DOMMatrixInit other);
-    DOMMatrix translateSelf(unrestricted double tx,
-                     unrestricted double ty,
-                     optional unrestricted double tz = 0);
-    DOMMatrix scaleSelf(unrestricted double scale,
-                 optional unrestricted double originX = 0,
-                 optional unrestricted double originY = 0);
-    DOMMatrix scale3dSelf(unrestricted double scale,
-                   optional unrestricted double originX = 0,
-                   optional unrestricted double originY = 0,
-                   optional unrestricted double originZ = 0);
-    DOMMatrix scaleNonUniformSelf(unrestricted double scaleX,
-                           optional unrestricted double scaleY = 1,
-                           optional unrestricted double scaleZ = 1,
-                           optional unrestricted double originX = 0,
-                           optional unrestricted double originY = 0,
-                           optional unrestricted double originZ = 0);
-    DOMMatrix rotateSelf(unrestricted double angle,
-                  optional unrestricted double originX = 0,
-                  optional unrestricted double originY = 0);
-    DOMMatrix rotateFromVectorSelf(unrestricted double x,
-                            unrestricted double y);
-    DOMMatrix rotateAxisAngleSelf(unrestricted double x,
-                           unrestricted double y,
-                           unrestricted double z,
-                           unrestricted double angle);
-    DOMMatrix skewXSelf(unrestricted double sx);
-    DOMMatrix skewYSelf(unrestricted double sy);
-    DOMMatrix invertSelf();
-
-    DOMMatrix setMatrixValue(DOMString transformList);
-};
-
-dictionary DOMMatrixInit {
-    unrestricted double a;
-    unrestricted double b;
-    unrestricted double c;
-    unrestricted double d;
-    unrestricted double e;
-    unrestricted double f;
-    unrestricted double m11;
-    unrestricted double m12;
-    unrestricted double m13 = 0;
-    unrestricted double m14 = 0;
-    unrestricted double m21;
-    unrestricted double m22;
-    unrestricted double m23 = 0;
-    unrestricted double m24 = 0;
-    unrestricted double m31 = 0;
-    unrestricted double m32 = 0;
-    unrestricted double m33 = 1;
-    unrestricted double m34 = 0;
-    unrestricted double m41;
-    unrestricted double m42;
-    unrestricted double m43 = 0;
-    unrestricted double m44 = 1;
-    boolean is2D;
-};
-</script>
-<script type=text/plain id=idl>
-interface SVGElement : Element {
-
-  [SameObject] readonly attribute SVGAnimatedString className;
-
-  readonly attribute SVGSVGElement? ownerSVGElement;
-  readonly attribute SVGElement? viewportElement;
-
-  attribute long tabIndex;
-  void focus();
-  void blur();
-};
-
-SVGElement implements GlobalEventHandlers;
-
-dictionary SVGBoundingBoxOptions {
-  boolean fill = true;
-  boolean stroke = false;
-  boolean markers = false;
-  boolean clipped = false;
-};
-
-interface SVGGraphicsElement : SVGElement {
-  [SameObject] readonly attribute SVGAnimatedTransformList transform;
-
-  DOMRect getBBox(optional SVGBoundingBoxOptions options);
-  DOMMatrix? getCTM();
-  DOMMatrix? getScreenCTM();
-};
-
-SVGGraphicsElement implements SVGTests;
-
-interface SVGGeometryElement : SVGGraphicsElement {
-  boolean isPointInFill(DOMPoint point);
-  boolean isPointInStroke(DOMPoint point);
-};
-
-interface SVGNumber {
-  attribute float value;
-};
-
-interface SVGLength {
-
-  // Length Unit Types
-  const unsigned short SVG_LENGTHTYPE_UNKNOWN = 0;
-  const unsigned short SVG_LENGTHTYPE_NUMBER = 1;
-  const unsigned short SVG_LENGTHTYPE_PERCENTAGE = 2;
-  const unsigned short SVG_LENGTHTYPE_EMS = 3;
-  const unsigned short SVG_LENGTHTYPE_EXS = 4;
-  const unsigned short SVG_LENGTHTYPE_PX = 5;
-  const unsigned short SVG_LENGTHTYPE_CM = 6;
-  const unsigned short SVG_LENGTHTYPE_MM = 7;
-  const unsigned short SVG_LENGTHTYPE_IN = 8;
-  const unsigned short SVG_LENGTHTYPE_PT = 9;
-  const unsigned short SVG_LENGTHTYPE_PC = 10;
-
-  readonly attribute unsigned short unitType;
-           attribute float value;
-           attribute float valueInSpecifiedUnits;
-           attribute DOMString valueAsString;
-
-  void newValueSpecifiedUnits(unsigned short unitType, float valueInSpecifiedUnits);
-  void convertToSpecifiedUnits(unsigned short unitType);
-};
-
-interface SVGAngle {
-
-  // Angle Unit Types
-  const unsigned short SVG_ANGLETYPE_UNKNOWN = 0;
-  const unsigned short SVG_ANGLETYPE_UNSPECIFIED = 1;
-  const unsigned short SVG_ANGLETYPE_DEG = 2;
-  const unsigned short SVG_ANGLETYPE_RAD = 3;
-  const unsigned short SVG_ANGLETYPE_GRAD = 4;
-
-  readonly attribute unsigned short unitType;
-           attribute float value;
-           attribute float valueInSpecifiedUnits;
-           attribute DOMString valueAsString;
-
-  void newValueSpecifiedUnits(unsigned short unitType, float valueInSpecifiedUnits);
-  void convertToSpecifiedUnits(unsigned short unitType);
-};
-
-interface SVGNumberList {
-
-  readonly attribute unsigned long length;
-  readonly attribute unsigned long numberOfItems;
-
-  void clear();
-  SVGNumber initialize(SVGNumber newItem);
-  getter SVGNumber getItem(unsigned long index);
-  SVGNumber insertItemBefore(SVGNumber newItem, unsigned long index);
-  SVGNumber replaceItem(SVGNumber newItem, unsigned long index);
-  SVGNumber removeItem(unsigned long index);
-  SVGNumber appendItem(SVGNumber newItem);
-  setter void (unsigned long index, SVGNumber newItem);
-};
-
-interface SVGLengthList {
-
-  readonly attribute unsigned long length;
-  readonly attribute unsigned long numberOfItems;
-
-  void clear();
-  SVGLength initialize(SVGLength newItem);
-  getter SVGLength getItem(unsigned long index);
-  SVGLength insertItemBefore(SVGLength newItem, unsigned long index);
-  SVGLength replaceItem(SVGLength newItem, unsigned long index);
-  SVGLength removeItem(unsigned long index);
-  SVGLength appendItem(SVGLength newItem);
-  setter void (unsigned long index, SVGLength newItem);
-};
-
-interface SVGAnimatedBoolean {
-           attribute boolean baseVal;
-  readonly attribute boolean animVal;
-};
-
-interface SVGAnimatedEnumeration {
-           attribute unsigned short baseVal;
-  readonly attribute unsigned short animVal;
-};
-
-interface SVGAnimatedInteger {
-           attribute long baseVal;
-  readonly attribute long animVal;
-};
-
-interface SVGAnimatedNumber {
-           attribute float baseVal;
-  readonly attribute float animVal;
-};
-
-interface SVGAnimatedLength {
-  [SameObject] readonly attribute SVGLength baseVal;
-  [SameObject] readonly attribute SVGLength animVal;
-};
-
-interface SVGAnimatedAngle {
-  [SameObject] readonly attribute SVGAngle baseVal;
-  [SameObject] readonly attribute SVGAngle animVal;
-};
-
-interface SVGAnimatedString {
-           attribute DOMString baseVal;
-  readonly attribute DOMString animVal;
-};
-
-interface SVGAnimatedRect {
-  [SameObject] readonly attribute DOMRect baseVal;
-  [SameObject] readonly attribute DOMRectReadOnly animVal;
-};
-
-interface SVGAnimatedNumberList {
-  [SameObject] readonly attribute SVGNumberList baseVal;
-  [SameObject] readonly attribute SVGNumberList animVal;
-};
-
-interface SVGAnimatedLengthList {
-  [SameObject] readonly attribute SVGLengthList baseVal;
-  [SameObject] readonly attribute SVGLengthList animVal;
-};
-
-interface SVGStringList {
-
-  readonly attribute unsigned long length;
-  readonly attribute unsigned long numberOfItems;
-
-  void clear();
-  DOMString initialize(DOMString newItem);
-  getter DOMString getItem(unsigned long index);
-  DOMString insertItemBefore(DOMString newItem, unsigned long index);
-  DOMString replaceItem(DOMString newItem, unsigned long index);
-  DOMString removeItem(unsigned long index);
-  DOMString appendItem(DOMString newItem);
-  setter void (unsigned long index, DOMString newItem);
-};
-
-[NoInterfaceObject]
-interface SVGUnitTypes {
-  // Unit Types
-  const unsigned short SVG_UNIT_TYPE_UNKNOWN = 0;
-  const unsigned short SVG_UNIT_TYPE_USERSPACEONUSE = 1;
-  const unsigned short SVG_UNIT_TYPE_OBJECTBOUNDINGBOX = 2;
-};
-
-[NoInterfaceObject]
-interface SVGTests {
-  [SameObject] readonly attribute SVGStringList requiredExtensions;
-  [SameObject] readonly attribute SVGStringList systemLanguage;
-};
-
-[NoInterfaceObject]
-interface SVGFitToViewBox {
-  [SameObject] readonly attribute SVGAnimatedRect viewBox;
-  [SameObject] readonly attribute SVGAnimatedPreserveAspectRatio preserveAspectRatio;
-};
-
-[NoInterfaceObject]
-interface SVGZoomAndPan {
-
-  // Zoom and Pan Types
-  const unsigned short SVG_ZOOMANDPAN_UNKNOWN = 0;
-  const unsigned short SVG_ZOOMANDPAN_DISABLE = 1;
-  const unsigned short SVG_ZOOMANDPAN_MAGNIFY = 2;
-
-  attribute unsigned short zoomAndPan;
-};
-
-[NoInterfaceObject]
-interface SVGURIReference {
-  [SameObject] readonly attribute SVGAnimatedString href;
-};
-
-partial interface Document {
-  readonly attribute SVGSVGElement rootElement;
-};
-
-interface SVGSVGElement : SVGGraphicsElement {
-
-  [SameObject] readonly attribute SVGAnimatedLength x;
-  [SameObject] readonly attribute SVGAnimatedLength y;
-  [SameObject] readonly attribute SVGAnimatedLength width;
-  [SameObject] readonly attribute SVGAnimatedLength height;
-
-  attribute float currentScale;
-  [SameObject] readonly attribute DOMPointReadOnly currentTranslate;
-
-  NodeList getIntersectionList(DOMRectReadOnly rect, SVGElement? referenceElement);
-  NodeList getEnclosureList(DOMRectReadOnly rect, SVGElement? referenceElement);
-  boolean checkIntersection(SVGElement element, DOMRectReadOnly rect);
-  boolean checkEnclosure(SVGElement element, DOMRectReadOnly rect);
-
-  void deselectAll();
-
-  SVGNumber createSVGNumber();
-  SVGLength createSVGLength();
-  SVGAngle createSVGAngle();
-  DOMPoint createSVGPoint();
-  DOMMatrix createSVGMatrix();
-  DOMRect createSVGRect();
-  SVGTransform createSVGTransform();
-  SVGTransform createSVGTransformFromMatrix(DOMMatrixReadOnly matrix);
-
-  // Deprecated methods that have no effect when called,
-  // but which are kept for compatibility reasons.
-  unsigned long suspendRedraw(unsigned long maxWaitMilliseconds);
-  void unsuspendRedraw(unsigned long suspendHandleID);
-  void unsuspendRedrawAll();
-  void forceRedraw();
-};
-
-SVGSVGElement implements SVGFitToViewBox;
-SVGSVGElement implements SVGZoomAndPan;
-SVGSVGElement implements WindowEventHandlers;
-
-interface SVGGElement : SVGGraphicsElement {
-};
-
-interface SVGUnknownElement : SVGGraphicsElement {
-};
-
-interface SVGDefsElement : SVGGraphicsElement {
-};
-
-interface SVGDescElement : SVGElement {
-};
-
-interface SVGMetadataElement : SVGElement {
-};
-
-interface SVGTitleElement : SVGElement {
-};
-
-interface SVGSymbolElement : SVGElement {
-};
-
-SVGSymbolElement implements SVGFitToViewBox;
-
-interface SVGUseElement : SVGGraphicsElement {
-  [SameObject] readonly attribute SVGAnimatedLength x;
-  [SameObject] readonly attribute SVGAnimatedLength y;
-  [SameObject] readonly attribute SVGAnimatedLength width;
-  [SameObject] readonly attribute SVGAnimatedLength height;
-};
-
-SVGUseElement implements SVGURIReference;
-
-interface SVGSwitchElement : SVGGraphicsElement {
-};
-
-[NoInterfaceObject]
-interface GetSVGDocument {
-  Document getSVGDocument();
-};
-
-interface SVGStyleElement : SVGElement {
-  attribute DOMString type;
-  attribute DOMString media;
-  attribute DOMString title;
-};
-
-SVGStyleElement implements LinkStyle;
-
-interface SVGTransform {
-
-  // Transform Types
-  const unsigned short SVG_TRANSFORM_UNKNOWN = 0;
-  const unsigned short SVG_TRANSFORM_MATRIX = 1;
-  const unsigned short SVG_TRANSFORM_TRANSLATE = 2;
-  const unsigned short SVG_TRANSFORM_SCALE = 3;
-  const unsigned short SVG_TRANSFORM_ROTATE = 4;
-  const unsigned short SVG_TRANSFORM_SKEWX = 5;
-  const unsigned short SVG_TRANSFORM_SKEWY = 6;
-
-  readonly attribute unsigned short type;
-  [SameObject] readonly attribute DOMMatrix matrix;
-  readonly attribute float angle;
-
-  void setMatrix(DOMMatrixReadOnly matrix);
-  void setTranslate(float tx, float ty);
-  void setScale(float sx, float sy);
-  void setRotate(float angle, float cx, float cy);
-  void setSkewX(float angle);
-  void setSkewY(float angle);
-};
-
-interface SVGTransformList {
-
-  readonly attribute unsigned long length;
-  readonly attribute unsigned long numberOfItems;
-
-  void clear();
-  SVGTransform initialize(SVGTransform newItem);
-  getter SVGTransform getItem(unsigned long index);
-  SVGTransform insertItemBefore(SVGTransform newItem, unsigned long index);
-  SVGTransform replaceItem(SVGTransform newItem, unsigned long index);
-  SVGTransform removeItem(unsigned long index);
-  SVGTransform appendItem(SVGTransform newItem);
-  setter void (unsigned long index, SVGTransform newItem);
-
-  // Additional methods not common to other list interfaces.
-  SVGTransform createSVGTransformFromMatrix(DOMMatrixReadOnly matrix);
-  SVGTransform? consolidate();
-};
-
-interface SVGAnimatedTransformList {
-  [SameObject] readonly attribute SVGTransformList baseVal;
-  [SameObject] readonly attribute SVGTransformList animVal;
-};
-
-interface SVGPreserveAspectRatio {
-
-  // Alignment Types
-  const unsigned short SVG_PRESERVEASPECTRATIO_UNKNOWN = 0;
-  const unsigned short SVG_PRESERVEASPECTRATIO_NONE = 1;
-  const unsigned short SVG_PRESERVEASPECTRATIO_XMINYMIN = 2;
-  const unsigned short SVG_PRESERVEASPECTRATIO_XMIDYMIN = 3;
-  const unsigned short SVG_PRESERVEASPECTRATIO_XMAXYMIN = 4;
-  const unsigned short SVG_PRESERVEASPECTRATIO_XMINYMID = 5;
-  const unsigned short SVG_PRESERVEASPECTRATIO_XMIDYMID = 6;
-  const unsigned short SVG_PRESERVEASPECTRATIO_XMAXYMID = 7;
-  const unsigned short SVG_PRESERVEASPECTRATIO_XMINYMAX = 8;
-  const unsigned short SVG_PRESERVEASPECTRATIO_XMIDYMAX = 9;
-  const unsigned short SVG_PRESERVEASPECTRATIO_XMAXYMAX = 10;
-
-  // Meet-or-slice Types
-  const unsigned short SVG_MEETORSLICE_UNKNOWN = 0;
-  const unsigned short SVG_MEETORSLICE_MEET = 1;
-  const unsigned short SVG_MEETORSLICE_SLICE = 2;
-
-  attribute unsigned short align;
-  attribute unsigned short meetOrSlice;
-};
-
-interface SVGAnimatedPreserveAspectRatio {
-  [SameObject] readonly attribute SVGPreserveAspectRatio baseVal;
-  [SameObject] readonly attribute SVGPreserveAspectRatio animVal;
-};
-
-interface SVGPathElement : SVGGeometryElement {
-
-  [SameObject] readonly attribute SVGAnimatedNumber pathLength;
-
-  float getTotalLength();
-  DOMPoint getPointAtLength(float distance);
-};
-
-interface SVGRectElement : SVGGeometryElement {
-  [SameObject] readonly attribute SVGAnimatedLength x;
-  [SameObject] readonly attribute SVGAnimatedLength y;
-  [SameObject] readonly attribute SVGAnimatedLength width;
-  [SameObject] readonly attribute SVGAnimatedLength height;
-  [SameObject] readonly attribute SVGAnimatedLength rx;
-  [SameObject] readonly attribute SVGAnimatedLength ry;
-};
-
-interface SVGCircleElement : SVGGeometryElement {
-  [SameObject] readonly attribute SVGAnimatedLength cx;
-  [SameObject] readonly attribute SVGAnimatedLength cy;
-  [SameObject] readonly attribute SVGAnimatedLength r;
-};
-
-interface SVGEllipseElement : SVGGeometryElement {
-  [SameObject] readonly attribute SVGAnimatedLength cx;
-  [SameObject] readonly attribute SVGAnimatedLength cy;
-  [SameObject] readonly attribute SVGAnimatedLength rx;
-  [SameObject] readonly attribute SVGAnimatedLength ry;
-};
-
-interface SVGLineElement : SVGGeometryElement {
-  [SameObject] readonly attribute SVGAnimatedLength x1;
-  [SameObject] readonly attribute SVGAnimatedLength y1;
-  [SameObject] readonly attribute SVGAnimatedLength x2;
-  [SameObject] readonly attribute SVGAnimatedLength y2;
-};
-
-[NoInterfaceObject]
-interface SVGAnimatedPoints {
-  [SameObject] readonly attribute SVGPointList points;
-  [SameObject] readonly attribute SVGPointList animatedPoints;
-};
-
-interface SVGPointList {
-
-  readonly attribute unsigned long length;
-  readonly attribute unsigned long numberOfItems;
-
-  void clear();
-  DOMPoint initialize(DOMPoint newItem);
-  getter DOMPoint getItem(unsigned long index);
-  DOMPoint insertItemBefore(DOMPoint newItem, unsigned long index);
-  DOMPoint replaceItem(DOMPoint newItem, unsigned long index);
-  DOMPoint removeItem(unsigned long index);
-  DOMPoint appendItem(DOMPoint newItem);
-  setter void (unsigned long index, DOMPoint newItem);
-};
-
-interface SVGPolylineElement : SVGGeometryElement {
-};
-
-SVGPolylineElement implements SVGAnimatedPoints;
-
-interface SVGPolygonElement : SVGGeometryElement {
-};
-
-SVGPolygonElement implements SVGAnimatedPoints;
-
-interface SVGTextContentElement : SVGGraphicsElement {
-
-  // lengthAdjust Types
-  const unsigned short LENGTHADJUST_UNKNOWN = 0;
-  const unsigned short LENGTHADJUST_SPACING = 1;
-  const unsigned short LENGTHADJUST_SPACINGANDGLYPHS = 2;
-
-  [SameObject] readonly attribute SVGAnimatedLength textLength;
-  [SameObject] readonly attribute SVGAnimatedEnumeration lengthAdjust;
-
-  long getNumberOfChars();
-  float getComputedTextLength();
-  float getSubStringLength(unsigned long charnum, unsigned long nchars);
-  DOMPoint getStartPositionOfChar(unsigned long charnum);
-  DOMPoint getEndPositionOfChar(unsigned long charnum);
-  DOMRect getExtentOfChar(unsigned long charnum);
-  float getRotationOfChar(unsigned long charnum);
-  long getCharNumAtPosition(DOMPoint point);
-  void selectSubString(unsigned long charnum, unsigned long nchars);
-};
-
-interface SVGTextPositioningElement : SVGTextContentElement {
-  [SameObject] readonly attribute SVGAnimatedLengthList x;
-  [SameObject] readonly attribute SVGAnimatedLengthList y;
-  [SameObject] readonly attribute SVGAnimatedLengthList dx;
-  [SameObject] readonly attribute SVGAnimatedLengthList dy;
-  [SameObject] readonly attribute SVGAnimatedNumberList rotate;
-};
-
-interface SVGTextElement : SVGTextPositioningElement {
-};
-
-interface SVGTSpanElement : SVGTextPositioningElement {
-};
-
-interface SVGTextPathElement : SVGTextContentElement {
-
-  // textPath Method Types
-  const unsigned short TEXTPATH_METHODTYPE_UNKNOWN = 0;
-  const unsigned short TEXTPATH_METHODTYPE_ALIGN = 1;
-  const unsigned short TEXTPATH_METHODTYPE_STRETCH = 2;
-
-  // textPath Spacing Types
-  const unsigned short TEXTPATH_SPACINGTYPE_UNKNOWN = 0;
-  const unsigned short TEXTPATH_SPACINGTYPE_AUTO = 1;
-  const unsigned short TEXTPATH_SPACINGTYPE_EXACT = 2;
-
-  [SameObject] readonly attribute SVGAnimatedLength startOffset;
-  [SameObject] readonly attribute SVGAnimatedEnumeration method;
-  [SameObject] readonly attribute SVGAnimatedEnumeration spacing;
-};
-
-SVGTextPathElement implements SVGURIReference;
-
-interface SVGImageElement : SVGGraphicsElement {
-  [SameObject] readonly attribute SVGAnimatedLength x;
-  [SameObject] readonly attribute SVGAnimatedLength y;
-  [SameObject] readonly attribute SVGAnimatedLength width;
-  [SameObject] readonly attribute SVGAnimatedLength height;
-  [SameObject] readonly attribute SVGAnimatedPreserveAspectRatio preserveAspectRatio;
-  attribute DOMString crossOrigin;
-};
-
-SVGImageElement implements SVGURIReference;
-
-interface SVGForeignObjectElement : SVGGraphicsElement {
-  [SameObject] readonly attribute SVGAnimatedLength x;
-  [SameObject] readonly attribute SVGAnimatedLength y;
-  [SameObject] readonly attribute SVGAnimatedLength width;
-  [SameObject] readonly attribute SVGAnimatedLength height;
-};
-
-interface SVGMarkerElement : SVGElement {
-
-  // Marker Unit Types
-  const unsigned short SVG_MARKERUNITS_UNKNOWN = 0;
-  const unsigned short SVG_MARKERUNITS_USERSPACEONUSE = 1;
-  const unsigned short SVG_MARKERUNITS_STROKEWIDTH = 2;
-
-  // Marker Orientation Types
-  const unsigned short SVG_MARKER_ORIENT_UNKNOWN = 0;
-  const unsigned short SVG_MARKER_ORIENT_AUTO = 1;
-  const unsigned short SVG_MARKER_ORIENT_ANGLE = 2;
-
-  [SameObject] readonly attribute SVGAnimatedLength refX;
-  [SameObject] readonly attribute SVGAnimatedLength refY;
-  [SameObject] readonly attribute SVGAnimatedEnumeration markerUnits;
-  [SameObject] readonly attribute SVGAnimatedLength markerWidth;
-  [SameObject] readonly attribute SVGAnimatedLength markerHeight;
-  [SameObject] readonly attribute SVGAnimatedEnumeration orientType;
-  [SameObject] readonly attribute SVGAnimatedAngle orientAngle;
-  attribute DOMString orient;
-
-  void setOrientToAuto();
-  void setOrientToAngle(SVGAngle angle);
-};
-
-SVGMarkerElement implements SVGFitToViewBox;
-
-interface SVGSolidcolorElement : SVGElement {
-};
-
-interface SVGGradientElement : SVGElement {
-
-  // Spread Method Types
-  const unsigned short SVG_SPREADMETHOD_UNKNOWN = 0;
-  const unsigned short SVG_SPREADMETHOD_PAD = 1;
-  const unsigned short SVG_SPREADMETHOD_REFLECT = 2;
-  const unsigned short SVG_SPREADMETHOD_REPEAT = 3;
-
-  [SameObject] readonly attribute SVGAnimatedEnumeration gradientUnits;
-  [SameObject] readonly attribute SVGAnimatedTransformList gradientTransform;
-  [SameObject] readonly attribute SVGAnimatedEnumeration spreadMethod;
-};
-
-SVGGradientElement implements SVGURIReference;
-SVGGradientElement implements SVGUnitTypes;
-
-interface SVGLinearGradientElement : SVGGradientElement {
-  [SameObject] readonly attribute SVGAnimatedLength x1;
-  [SameObject] readonly attribute SVGAnimatedLength y1;
-  [SameObject] readonly attribute SVGAnimatedLength x2;
-  [SameObject] readonly attribute SVGAnimatedLength y2;
-};
-
-interface SVGRadialGradientElement : SVGGradientElement {
-  [SameObject] readonly attribute SVGAnimatedLength cx;
-  [SameObject] readonly attribute SVGAnimatedLength cy;
-  [SameObject] readonly attribute SVGAnimatedLength r;
-  [SameObject] readonly attribute SVGAnimatedLength fx;
-  [SameObject] readonly attribute SVGAnimatedLength fy;
-  [SameObject] readonly attribute SVGAnimatedLength fr;
-};
-
-interface SVGMeshElement : SVGGradientElement {
-};
-
-interface SVGMeshrowElement : SVGElement {
-};
-
-interface SVGMeshpatchElement : SVGElement {
-};
-
-interface SVGStopElement : SVGElement {
-  [SameObject] readonly attribute SVGAnimatedNumber offset;
-};
-
-interface SVGPatternElement : SVGElement {
-  [SameObject] readonly attribute SVGAnimatedEnumeration patternUnits;
-  [SameObject] readonly attribute SVGAnimatedEnumeration patternContentUnits;
-  [SameObject] readonly attribute SVGAnimatedTransformList patternTransform;
-  [SameObject] readonly attribute SVGAnimatedLength x;
-  [SameObject] readonly attribute SVGAnimatedLength y;
-  [SameObject] readonly attribute SVGAnimatedLength width;
-  [SameObject] readonly attribute SVGAnimatedLength height;
-};
-
-SVGPatternElement implements SVGFitToViewBox;
-SVGPatternElement implements SVGURIReference;
-SVGPatternElement implements SVGUnitTypes;
-
-interface SVGHatchElement : SVGElement {
-};
-
-interface SVGHatchpathElement : SVGElement {
-};
-
-interface SVGCursorElement : SVGElement {
-  [SameObject] readonly attribute SVGAnimatedLength x;
-  [SameObject] readonly attribute SVGAnimatedLength y;
-};
-
-SVGCursorElement implements SVGURIReference;
-
-interface SVGScriptElement : SVGElement {
-  attribute DOMString type;
-  attribute DOMString crossOrigin;
-};
-
-SVGScriptElement implements SVGURIReference;
-
-interface SVGZoomEvent : UIEvent {
-  [SameObject] readonly attribute DOMRectReadOnly zoomRectScreen;
-  readonly attribute float previousScale;
-  [SameObject] readonly attribute DOMPointReadOnly previousTranslate;
-  readonly attribute float newScale;
-  [SameObject] readonly attribute DOMPointReadOnly newTranslate;
-};
-
-interface SVGAElement : SVGGraphicsElement {
-  [SameObject] readonly attribute SVGAnimatedString target;
-};
-
-SVGAElement implements SVGURIReference;
-
-interface SVGViewElement : SVGElement {};
-
-SVGViewElement implements SVGFitToViewBox;
-SVGViewElement implements SVGZoomAndPan;
-
-interface SVGFilterElement : SVGElement {
-  readonly attribute SVGAnimatedEnumeration filterUnits;
-  readonly attribute SVGAnimatedEnumeration primitiveUnits;
-  readonly attribute SVGAnimatedLength x;
-  readonly attribute SVGAnimatedLength y;
-  readonly attribute SVGAnimatedLength width;
-  readonly attribute SVGAnimatedLength height;
-};
-
-SVGFilterElement implements SVGURIReference;
-SVGFilterElement implements SVGUnitTypes;
-
-[NoInterfaceObject]
-interface SVGFilterPrimitiveStandardAttributes {
-  readonly attribute SVGAnimatedLength x;
-  readonly attribute SVGAnimatedLength y;
-  readonly attribute SVGAnimatedLength width;
-  readonly attribute SVGAnimatedLength height;
-  readonly attribute SVGAnimatedString result;
-};
-
-interface SVGFEBlendElement : SVGElement {
-
-  // Blend Mode Types
-  const unsigned short SVG_FEBLEND_MODE_UNKNOWN = 0;
-  const unsigned short SVG_FEBLEND_MODE_NORMAL = 1;
-  const unsigned short SVG_FEBLEND_MODE_MULTIPLY = 2;
-  const unsigned short SVG_FEBLEND_MODE_SCREEN = 3;
-  const unsigned short SVG_FEBLEND_MODE_DARKEN = 4;
-  const unsigned short SVG_FEBLEND_MODE_LIGHTEN = 5;
-
-  readonly attribute SVGAnimatedString in1;
-  readonly attribute SVGAnimatedString in2;
-  readonly attribute SVGAnimatedEnumeration mode;
-};
-
-SVGFEBlendElement implements SVGFilterPrimitiveStandardAttributes;
-
-interface SVGFEColorMatrixElement : SVGElement {
-
-  // Color Matrix Types
-  const unsigned short SVG_FECOLORMATRIX_TYPE_UNKNOWN = 0;
-  const unsigned short SVG_FECOLORMATRIX_TYPE_MATRIX = 1;
-  const unsigned short SVG_FECOLORMATRIX_TYPE_SATURATE = 2;
-  const unsigned short SVG_FECOLORMATRIX_TYPE_HUEROTATE = 3;
-  const unsigned short SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA = 4;
-
-  readonly attribute SVGAnimatedString in1;
-  readonly attribute SVGAnimatedEnumeration type;
-  readonly attribute SVGAnimatedNumberList values;
-};
-
-SVGFEColorMatrixElement implements SVGFilterPrimitiveStandardAttributes;
-
-interface SVGFEComponentTransferElement : SVGElement {
-  readonly attribute SVGAnimatedString in1;
-};
-
-SVGFEComponentTransferElement implements SVGFilterPrimitiveStandardAttributes;
-
-interface SVGComponentTransferFunctionElement : SVGElement {
-
-  // Component Transfer Types
-  const unsigned short SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN = 0;
-  const unsigned short SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY = 1;
-  const unsigned short SVG_FECOMPONENTTRANSFER_TYPE_TABLE = 2;
-  const unsigned short SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE = 3;
-  const unsigned short SVG_FECOMPONENTTRANSFER_TYPE_LINEAR = 4;
-  const unsigned short SVG_FECOMPONENTTRANSFER_TYPE_GAMMA = 5;
-
-  readonly attribute SVGAnimatedEnumeration type;
-  readonly attribute SVGAnimatedNumberList tableValues;
-  readonly attribute SVGAnimatedNumber slope;
-  readonly attribute SVGAnimatedNumber intercept;
-  readonly attribute SVGAnimatedNumber amplitude;
-  readonly attribute SVGAnimatedNumber exponent;
-  readonly attribute SVGAnimatedNumber offset;
-};
-
-interface SVGFEFuncRElement : SVGComponentTransferFunctionElement {
-};
-
-interface SVGFEFuncGElement : SVGComponentTransferFunctionElement {
-};
-
-interface SVGFEFuncBElement : SVGComponentTransferFunctionElement {
-};
-
-interface SVGFEFuncAElement : SVGComponentTransferFunctionElement {
-};
-
-interface SVGFECompositeElement : SVGElement {
-
-  // Composite Operators
-  const unsigned short SVG_FECOMPOSITE_OPERATOR_UNKNOWN = 0;
-  const unsigned short SVG_FECOMPOSITE_OPERATOR_OVER = 1;
-  const unsigned short SVG_FECOMPOSITE_OPERATOR_IN = 2;
-  const unsigned short SVG_FECOMPOSITE_OPERATOR_OUT = 3;
-  const unsigned short SVG_FECOMPOSITE_OPERATOR_ATOP = 4;
-  const unsigned short SVG_FECOMPOSITE_OPERATOR_XOR = 5;
-  const unsigned short SVG_FECOMPOSITE_OPERATOR_ARITHMETIC = 6;
-
-  readonly attribute SVGAnimatedString in1;
-  readonly attribute SVGAnimatedString in2;
-  readonly attribute SVGAnimatedEnumeration operator;
-  readonly attribute SVGAnimatedNumber k1;
-  readonly attribute SVGAnimatedNumber k2;
-  readonly attribute SVGAnimatedNumber k3;
-  readonly attribute SVGAnimatedNumber k4;
-};
-
-SVGFECompositeElement implements SVGFilterPrimitiveStandardAttributes;
-
-interface SVGFEConvolveMatrixElement : SVGElement {
-
-  // Edge Mode Values
-  const unsigned short SVG_EDGEMODE_UNKNOWN = 0;
-  const unsigned short SVG_EDGEMODE_DUPLICATE = 1;
-  const unsigned short SVG_EDGEMODE_WRAP = 2;
-  const unsigned short SVG_EDGEMODE_NONE = 3;
-
-  readonly attribute SVGAnimatedString in1;
-  readonly attribute SVGAnimatedInteger orderX;
-  readonly attribute SVGAnimatedInteger orderY;
-  readonly attribute SVGAnimatedNumberList kernelMatrix;
-  readonly attribute SVGAnimatedNumber divisor;
-  readonly attribute SVGAnimatedNumber bias;
-  readonly attribute SVGAnimatedInteger targetX;
-  readonly attribute SVGAnimatedInteger targetY;
-  readonly attribute SVGAnimatedEnumeration edgeMode;
-  readonly attribute SVGAnimatedNumber kernelUnitLengthX;
-  readonly attribute SVGAnimatedNumber kernelUnitLengthY;
-};
-
-SVGFEConvolveMatrixElement implements SVGFilterPrimitiveStandardAttributes;
-
-interface SVGFEDiffuseLightingElement : SVGElement {
-  readonly attribute SVGAnimatedString in1;
-  readonly attribute SVGAnimatedNumber surfaceScale;
-  readonly attribute SVGAnimatedNumber diffuseConstant;
-  readonly attribute SVGAnimatedNumber kernelUnitLengthX;
-  readonly attribute SVGAnimatedNumber kernelUnitLengthY;
-};
-
-SVGFEDiffuseLightingElement implements SVGFilterPrimitiveStandardAttributes;
-
-interface SVGFEDistantLightElement : SVGElement {
-  readonly attribute SVGAnimatedNumber azimuth;
-  readonly attribute SVGAnimatedNumber elevation;
-};
-
-interface SVGFEPointLightElement : SVGElement {
-  readonly attribute SVGAnimatedNumber x;
-  readonly attribute SVGAnimatedNumber y;
-  readonly attribute SVGAnimatedNumber z;
-};
-
-interface SVGFESpotLightElement : SVGElement {
-  readonly attribute SVGAnimatedNumber x;
-  readonly attribute SVGAnimatedNumber y;
-  readonly attribute SVGAnimatedNumber z;
-  readonly attribute SVGAnimatedNumber pointsAtX;
-  readonly attribute SVGAnimatedNumber pointsAtY;
-  readonly attribute SVGAnimatedNumber pointsAtZ;
-  readonly attribute SVGAnimatedNumber specularExponent;
-  readonly attribute SVGAnimatedNumber limitingConeAngle;
-};
-
-interface SVGFEDisplacementMapElement : SVGElement {
-
-  // Channel Selectors
-  const unsigned short SVG_CHANNEL_UNKNOWN = 0;
-  const unsigned short SVG_CHANNEL_R = 1;
-  const unsigned short SVG_CHANNEL_G = 2;
-  const unsigned short SVG_CHANNEL_B = 3;
-  const unsigned short SVG_CHANNEL_A = 4;
-
-  readonly attribute SVGAnimatedString in1;
-  readonly attribute SVGAnimatedString in2;
-  readonly attribute SVGAnimatedNumber scale;
-  readonly attribute SVGAnimatedEnumeration xChannelSelector;
-  readonly attribute SVGAnimatedEnumeration yChannelSelector;
-};
-
-SVGFEDisplacementMapElement implements SVGFilterPrimitiveStandardAttributes;
-
-interface SVGFEDropShadowElement : SVGElement {
-  readonly attribute SVGAnimatedString in1;
-  readonly attribute SVGAnimatedNumber dx;
-  readonly attribute SVGAnimatedNumber dy;
-  readonly attribute SVGAnimatedNumber stdDeviationX;
-  readonly attribute SVGAnimatedNumber stdDeviationY;
-
-  void setStdDeviation(float stdDeviationX, float stdDeviationY);
-};
-
-SVGFEDropShadowElement implements SVGFilterPrimitiveStandardAttributes;
-
-interface SVGFEFloodElement : SVGElement {
-};
-
-SVGFEFloodElement implements SVGFilterPrimitiveStandardAttributes;
-
-interface SVGFEGaussianBlurElement : SVGElement {
-
-  // Edge Mode Values
-  const unsigned short SVG_EDGEMODE_UNKNOWN = 0;
-  const unsigned short SVG_EDGEMODE_DUPLICATE = 1;
-  const unsigned short SVG_EDGEMODE_WRAP = 2;
-  const unsigned short SVG_EDGEMODE_NONE = 3;
-
-  readonly attribute SVGAnimatedString in1;
-  readonly attribute SVGAnimatedNumber stdDeviationX;
-  readonly attribute SVGAnimatedNumber stdDeviationY;
-  readonly attribute SVGAnimatedEnumeration edgeMode;
-
-  void setStdDeviation(float stdDeviationX, float stdDeviationY);
-};
-
-SVGFEGaussianBlurElement implements SVGFilterPrimitiveStandardAttributes;
-
-interface SVGFEImageElement : SVGElement {
-  readonly attribute SVGAnimatedPreserveAspectRatio preserveAspectRatio;
-  readonly attribute SVGAnimatedString crossOrigin;
-};
-
-SVGFEImageElement implements SVGFilterPrimitiveStandardAttributes;
-SVGFEImageElement implements SVGURIReference;
-
-interface SVGFEMergeElement : SVGElement {
-};
-
-SVGFEMergeElement implements SVGFilterPrimitiveStandardAttributes;
-
-interface SVGFEMergeNodeElement : SVGElement {
-  readonly attribute SVGAnimatedString in1;
-};
-
-interface SVGFEMorphologyElement : SVGElement {
-
-  // Morphology Operators
-  const unsigned short SVG_MORPHOLOGY_OPERATOR_UNKNOWN = 0;
-  const unsigned short SVG_MORPHOLOGY_OPERATOR_ERODE = 1;
-  const unsigned short SVG_MORPHOLOGY_OPERATOR_DILATE = 2;
-
-  readonly attribute SVGAnimatedString in1;
-  readonly attribute SVGAnimatedEnumeration operator;
-  readonly attribute SVGAnimatedNumber radiusX;
-  readonly attribute SVGAnimatedNumber radiusY;
-};
-
-SVGFEMorphologyElement implements SVGFilterPrimitiveStandardAttributes;
-
-interface SVGFEOffsetElement : SVGElement {
-  readonly attribute SVGAnimatedString in1;
-  readonly attribute SVGAnimatedNumber dx;
-  readonly attribute SVGAnimatedNumber dy;
-};
-
-SVGFEOffsetElement implements SVGFilterPrimitiveStandardAttributes;
-
-interface SVGFESpecularLightingElement : SVGElement {
-  readonly attribute SVGAnimatedString in1;
-  readonly attribute SVGAnimatedNumber surfaceScale;
-  readonly attribute SVGAnimatedNumber specularConstant;
-  readonly attribute SVGAnimatedNumber specularExponent;
-  readonly attribute SVGAnimatedNumber kernelUnitLengthX;
-  readonly attribute SVGAnimatedNumber kernelUnitLengthY;
-};
-
-SVGFESpecularLightingElement implements SVGFilterPrimitiveStandardAttributes;
-
-interface SVGFETileElement : SVGElement {
-  readonly attribute SVGAnimatedString in1;
-};
-
-SVGFETileElement implements SVGFilterPrimitiveStandardAttributes;
-
-interface SVGFETurbulenceElement : SVGElement {
-
-  // Turbulence Types
-  const unsigned short SVG_TURBULENCE_TYPE_UNKNOWN = 0;
-  const unsigned short SVG_TURBULENCE_TYPE_FRACTALNOISE = 1;
-  const unsigned short SVG_TURBULENCE_TYPE_TURBULENCE = 2;
-
-  // Stitch Options
-  const unsigned short SVG_STITCHTYPE_UNKNOWN = 0;
-  const unsigned short SVG_STITCHTYPE_STITCH = 1;
-  const unsigned short SVG_STITCHTYPE_NOSTITCH = 2;
-
-  readonly attribute SVGAnimatedNumber baseFrequencyX;
-  readonly attribute SVGAnimatedNumber baseFrequencyY;
-  readonly attribute SVGAnimatedInteger numOctaves;
-  readonly attribute SVGAnimatedNumber seed;
-  readonly attribute SVGAnimatedEnumeration stitchTiles;
-  readonly attribute SVGAnimatedEnumeration type;
-};
-
-SVGFETurbulenceElement implements SVGFilterPrimitiveStandardAttributes;
-</script>
-<script>
-var svg = document.createElementNS("http://www.w3.org/2000/svg", "svg");
-var g = document.createElementNS("http://www.w3.org/2000/svg", "g");
-var defs = document.createElementNS("http://www.w3.org/2000/svg", "defs");
-var Desc = document.createElementNS("http://www.w3.org/2000/svg", "desc");
-var title = document.createElementNS("http://www.w3.org/2000/svg", "title");
-var symbol = document.createElementNS("http://www.w3.org/2000/svg", "symbol");
-var use = document.createElementNS("http://www.w3.org/2000/svg", "use");
-var image = document.createElementNS("http://www.w3.org/2000/svg", "image");
-var Switch = document.createElementNS("http://www.w3.org/2000/svg", "switch");
-var style = document.createElementNS("http://www.w3.org/2000/svg", "style");
-var path = document.createElementNS("http://www.w3.org/2000/svg", "path");
-var rect = document.createElementNS("http://www.w3.org/2000/svg", "rect");
-var circle = document.createElementNS("http://www.w3.org/2000/svg", "circle");
-var ellipse = document.createElementNS("http://www.w3.org/2000/svg", "ellipse");
-var line = document.createElementNS("http://www.w3.org/2000/svg", "line");
-var polyline = document.createElementNS("http://www.w3.org/2000/svg", "polyline");
-var polygon = document.createElementNS("http://www.w3.org/2000/svg", "polygon");
-var textContent = document.createElementNS("http://www.w3.org/2000/svg",
-                                           "textContent");
-var text = document.createElementNS("http://www.w3.org/2000/svg", "text");
-var tspan = document.createElementNS("http://www.w3.org/2000/svg", "tspan");
-var tref = document.createElementNS("http://www.w3.org/2000/svg", "tref");
-var textPath = document.createElementNS("http://www.w3.org/2000/svg", "textPath");
-var altGlyph = document.createElementNS("http://www.w3.org/2000/svg", "altGlyph");
-var altGlyphDef = document.createElementNS("http://www.w3.org/2000/svg",
-                                           "altGlyphDef");
-var altGlyphItem = document.createElementNS("http://www.w3.org/2000/svg",
-                                            "altGlyphItem");
-var glyphRef = document.createElementNS("http://www.w3.org/2000/svg",
-                                        "glyphRef");
-var glyphRef = document.createElementNS("http://www.w3.org/2000/svg",
-                                        "glyphRef");
-var marker = document.createElementNS("http://www.w3.org/2000/svg", "marker");
-var colorProfile = document.createElementNS("http://www.w3.org/2000/svg",
-                                            "color-profile");
-var linearGradient = document.createElementNS("http://www.w3.org/2000/svg",
-                                              "linearGradient");
-var radialGradient = document.createElementNS("http://www.w3.org/2000/svg",
-                                              "radialGradient");
-var meshGradient = document.createElementNS("http://www.w3.org/2000/svg",
-                                            "meshGradient");
-var stop = document.createElementNS("http://www.w3.org/2000/svg", "stop");
-var pattern = document.createElementNS("http://www.w3.org/2000/svg", "pattern");
-var clipPath = document.createElementNS("http://www.w3.org/2000/svg", "clipPath");
-var mask = document.createElementNS("http://www.w3.org/2000/svg", "mask");
-var cursor = document.createElementNS("http://www.w3.org/2000/svg", "cursor");
-var a = document.createElementNS("http://www.w3.org/2000/svg", "a");
-var view = document.createElementNS("http://www.w3.org/2000/svg", "view");
-var script = document.createElementNS("http://www.w3.org/2000/svg", "script");
-var animate = document.createElementNS("http://www.w3.org/2000/svg", "animate");
-var set = document.createElementNS("http://www.w3.org/2000/svg", "set");
-var animateMotion = document.createElementNS("http://www.w3.org/2000/svg",
-                                             "animateMotion");
-var mPath = document.createElementNS("http://www.w3.org/2000/svg", "mPath");
-var animateColor = document.createElementNS("http://www.w3.org/2000/svg",
-                                            "animateColor");
-var animateColor = document.createElementNS("http://www.w3.org/2000/svg",
-                                            "animateColor");
-var animateTransform = document.createElementNS("http://www.w3.org/2000/svg",
-                                                "animateTransform");
-var font = document.createElementNS("http://www.w3.org/2000/svg", "font");
-var glyph = document.createElementNS("http://www.w3.org/2000/svg", "glyph");
-var missingglyph = document.createElementNS("http://www.w3.org/2000/svg",
-                                            "missing-glyph");
-var khern = document.createElementNS("http://www.w3.org/2000/svg", "hkern");
-var vkern = document.createElementNS("http://www.w3.org/2000/svg", "vkern");
-var fontface = document.createElementNS("http://www.w3.org/2000/svg", "font-face");
-var fontfacesrc = document.createElementNS("http://www.w3.org/2000/svg",
-                                           "font-face-src");
-var fontfaceuri = document.createElementNS("http://www.w3.org/2000/svg",
-                                           "font-face-uri");
-var fontfaceformat = document.createElementNS("http://www.w3.org/2000/svg",
-                                              "font-face-format");
-var fontfacename = document.createElementNS("http://www.w3.org/2000/svg",
-                                            "font-face-name");
-var metadata = document.createElementNS("http://www.w3.org/2000/svg",
-                                        "metadata");
-var foreignObject = document.createElementNS("http://www.w3.org/2000/svg",
-                                             "foreignObject");
-var filter = document.createElementNS("http://www.w3.org/2000/svg", "filter");
-var feBlend = document.createElementNS("http://www.w3.org/2000/svg", "feBlend");
-var feColorMatrix = document.createElementNS("http://www.w3.org/2000/svg",
-                                             "feColorMatrix");
-var feColorMatrix = document.createElementNS("http://www.w3.org/2000/svg",
-                                             "feColorMatrix");
-var feComponentTransfer = document.createElementNS("http://www.w3.org/2000/svg",
-                                                   "feComponentTransfer");
-var feFuncR = document.createElementNS("http://www.w3.org/2000/svg", "feFuncR");
-var feFuncG = document.createElementNS("http://www.w3.org/2000/svg", "feFuncG");
-var feFuncB = document.createElementNS("http://www.w3.org/2000/svg", "feFuncB");
-var feFuncA = document.createElementNS("http://www.w3.org/2000/svg", "feFuncA");
-var feComposite = document.createElementNS("http://www.w3.org/2000/svg",
-                                           "feComposite");
-var feConvolveMatrix = document.createElementNS("http://www.w3.org/2000/svg",
-                                                "feConvolveMatrix");
-var feDiffuseLighting = document.createElementNS("http://www.w3.org/2000/svg",
-                                                 "feDiffuseLighting");
-var fePointLight = document.createElementNS("http://www.w3.org/2000/svg",
-                                            "fePointLight");
-var feSpotLight = document.createElementNS("http://www.w3.org/2000/svg",
-                                           "feSpotLight");
-var feDisplacementMap = document.createElementNS("http://www.w3.org/2000/svg",
-                                                 "feDisplacementMap");
-var feDropShadow = document.createElementNS("http://www.w3.org/2000/svg",
-                                            "feDropShadow");
-var feFlood = document.createElementNS("http://www.w3.org/2000/svg", "feFlood");
-var feGaussianBlur = document.createElementNS("http://www.w3.org/2000/svg",
-                                              "feGaussianBlur");
-var feDisplacementMap = document.createElementNS("http://www.w3.org/2000/svg",
-                                                 "feDisplacementMap");
-var feDropShadow = document.createElementNS("http://www.w3.org/2000/svg",
-                                            "feDropShadow");
-var feFlood = document.createElementNS("http://www.w3.org/2000/svg", "feFlood");
-var feGaussianBlur = document.createElementNS("http://www.w3.org/2000/svg",
-                                              "feGaussianBlue");
-var feImage = document.createElementNS("http://www.w3.org/2000/svg", "feImage");
-var feMerge = document.createElementNS("http://www.w3.org/2000/svg", "feMerge");
-var feMergeNode = document.createElementNS("http://www.w3.org/2000/svg",
-                                           "feMergeNode");
-var feMorphology = document.createElementNS("http://www.w3.org/2000/svg",
-                                            "feMorphology");
-var feSpecularLighting = document.createElementNS("http://www.w3.org/2000/svg",
-                                                  "feSpecularLighting");
-var feTile = document.createElementNS("http://www.w3.org/2000/svg",
-                                      "feTile");
-var feTurbulence = document.createElementNS("http://www.w3.org/2000/svg",
-                                            "feTurbulence");
-
-
-var idlArray = new IdlArray();
-var idls = document.getElementById("idl").textContent;
-var untestedIdls = document.getElementById("untested_idl").textContent;
-idlArray.add_untested_idls(untestedIdls);
-idlArray.add_idls(idls);
-idlArray.add_objects({
-  SVGAnimatedBoolean: ['feConvolveMatrix.preserveAlpha'],
-  SVGAnimatedString: ['a.target'],
-  SVGStringList: ['a.requiredFeatures'],
-  SVGAnimatedEnumeration: ['text.lengthAdjust'],
-  SVGAnimatedInteger: ['feConvolveMatrix.orderX'],
-  SVGNumber: ['svg.createSVGNumber()'],
-  SVGAnimatedNumber: ['stop.offset'],
-  SVGNumberList: ['text.rotate.baseVal'],
-  SVGAnimatedNumberList: ['text.rotate'],
-  SVGLength: ['svg.createSVGLength()'],
-  SVGAnimatedLength: ['svg.x'],
-  SVGAnimatedLengthList: ['text.x'],
-  SVGAngle: ['svg.createSVGAngle()'],
-  SVGAnimatedAngle: ['marker.orientAngle'],
-  SVGRect: ['svg.createSVGRect()'],
-  SVGAnimatedRect: ['svg.viewBox'],
-  SVGSVGElement: ['svg'],
-  SVGGElement: ['g'],
-  SVGDefsElement: ['defs'],
-  SVGDescElement: ['Desc'],
-  SVGTitleElement: ['title'],
-  SVGSymbolElement: ['symbol'],
-  SVGUseElement: ['use'],
-  SVGImageElement: ['image'],
-  SVGSwitchElement: ['Switch'],
-  SVGStyleElement: ['style'],
-  SVGPoint: ['svg.createSVGPoint()'],
-  SVGPointList: ['polygon.points'],
-  SVGMatrix: ['svg.createSVGMatrix()'],
-  SVGTransform: ['svg.createSVGTransform()'],
-  SVGTransformList: ['pattern.patternTransform.baseVal'],
-  SVGAnimatedTransformList: ['pattern.patternTransform'],
-  SVGPreserveAspectRatio: ['image.preserveAspectRatio.baseVal'],
-  SVGAnimatedPreserveAspectRatio: ['image.preserveAspectRatio'],
-  SVGPathSegClosePath: ['path.createSVGPathSegClosePath()'],
-  SVGPathSegMovetoAbs: ['path.createSVGPathSegMovetoAbs(0,0)'],
-  SVGPathSegMovetoRel: ['path.createSVGPathSegMovetoRel(0,0)'],
-  SVGPathSegLinetoAbs: ['path.createSVGPathSegLinetoAbs(0,0)'],
-  SVGPathSegLinetoRel: ['path.createSVGPathSegLinetoRel(0,0)'],
-  SVGPathSegCurvetoCubicAbs: ['path.createSVGPathSegCurvetoCubicAbs(0,0,0,0,0,0)'],
-  SVGPathSegCurvetoCubicRel: ['path.createSVGPathSegCurvetoCubicRel(0,0,0,0,0,0)'],
-  SVGPathSegCurvetoQuadraticAbs: ['path.createSVGPathSegCurvetoQuadraticAbs(0,0,0,0)'],
-  SVGPathSegCurvetoQuadraticRel: ['path.createSVGPathSegCurvetoQuadraticRel(0,0,0,0)'],
-  SVGPathSegArcAbs: ['path.createSVGPathSegArcAbs(0,0,0,0,0,true,true)'],
-  SVGPathSegArcRel: ['path.createSVGPathSegArcRel(0,0,0,0,0,true,true)'],
-  SVGPathSegLinetoHorizontalAbs: ['path.createSVGPathSegLinetoHorizontalAbs(0)'],
-  SVGPathSegLinetoHorizontalRel: ['path.createSVGPathSegLinetoHorizontalRel(0)'],
-  SVGPathSegLinetoVerticalAbs: ['path.createSVGPathSegLinetoVerticalAbs(0)'],
-  SVGPathSegLinetoVerticalRel: ['path.createSVGPathSegLinetoVerticalRel(0)'],
-  SVGPathSegCurvetoCubicSmoothAbs: ['path.createSVGPathSegCurvetoCubicSmoothAbs(0,0,0,0)'],
-  SVGPathSegCurvetoCubicSmoothRel: ['path.createSVGPathSegCurvetoCubicSmoothRel(0,0,0,0)'],
-  SVGPathSegCurvetoQuadraticSmoothAbs: ['path.createSVGPathSegCurvetoQuadraticSmoothAbs(0,0)'],
-  SVGPathSegCurvetoQuadraticSmoothRel: ['path.createSVGPathSegCurvetoQuadraticSmoothRel(0,0)'],
-  SVGPathSegList: ['path.pathSegList'],
-  SVGPathElement: ['path'],
-  SVGRectElement: ['rect'],
-  SVGCircleElement: ['circle'],
-  SVGEllipseElement: ['ellipse'],
-  SVGLineElement: ['line'],
-  SVGPolylineElement: ['polyline'],
-  SVGPolygonElement: ['polygon'],
-  SVGTextContentElement: ['textContent'],
-  SVGTextElement: ['text'],
-  SVGTSpanElement: ['tspan'],
-  SVGTRefElement: ['tref'],
-  SVGTextPathElement: ['textPath'],
-  SVGAltGlyphElement: ['altGlyph'],
-  SVGAltGlyphDefElement: ['altGlyphDef'],
-  SVGAltGlyphItemElement: ['altGlyphItem'],
-  SVGGlyphRefElement: ['glyphRef'],
-  SVGMarkerElement: ['marker'],
-  SVGColorProfileElement: ['colorProfile'],
-  SVGLinearGradientElement: ['linearGradient'],
-  SVGRadialGradientElement: ['radialGradient'],
-  SVGMeshGradientElement: ['meshGradient'],
-  SVGStopElement: ['stop'],
-  SVGPatternElement: ['pattern'],
-  SVGClipPathElement: ['clipPath'],
-  SVGMaskElement: ['mask'],
-  SVGCursorElement: ['cursor'],
-  SVGAElement: ['a'],
-  SVGViewElement: ['view'],
-  SVGScriptElement: ['script'],
-  SVGAnimateElement: ['animate'],
-  SVGSetElement: ['set'],
-  SVGAnimateMotionElement: ['animateMotion'],
-  SVGMPathElement: ['mPath'],
-  SVGAnimateColorElement: ['animateColor'],
-  SVGAnimateTransformElement: ['animateTransform'],
-  SVGFontElement: ['font'],
-  SVGGlyphElement: ['glyph'],
-  SVGMissingGlyphElement: ['missingglyph'],
-  SVGHKernElement: ['hkern'],
-  SVGVKernElement: ['vkern'],
-  SVGFontFaceElement: ['fontface'],
-  SVGFontFaceSrcElement: ['fontfacesrc'],
-  SVGFontFaceUriElement: ['fontfaceuri'],
-  SVGFontFaceFormatElement: ['fontfaceformat'],
-  SVGMetadataElement: ['metadata'],
-  SVGForeignObjectElement: ['foreignObject'],
-  SVGFilterElement: ['filter'],
-  SVGFEBlendElement: ['feBlend'],
-  SVGFEColorMatrixElement: ['feColorMatrix'],
-  SVGFEComponentTransferElement: ['feComponentTransfer'],
-  SVGFEFuncRElement: ['feFuncR'],
-  SVGFEFuncGElement: ['feFuncG'],
-  SVGFEFuncBElement: ['feFuncB'],
-  SVGFEFuncAElement: ['feFuncA'],
-  SVGFECompositeElement: ['feComposite'],
-  SVGFEConvolveMatrixElement: ['feConvolveMatrix'],
-  SVGFEDiffuseLightingElement: ['feDiffuseLighting'],
-  SVGFEPointLightElement: ['fePointLight'],
-  SVGFESpotLightElement: ['feSpotLight'],
-  SVGFEDisplacementMapElement: ['feDisplacementMap'],
-  SVGFEDropShadowElement: ['feDropShadow'],
-  SVGFEFloodElement: ['feFlood'],
-  SVGFEGaussianBlurElement: ['feGaussianBlur'],
-  SVGFEImageElement: ['feImage'],
-  SVGFEMergeElement: ['feMerge'],
-  SVGFEMergeNodeElement: ['feMergeNode'],
-  SVGFEMorphologyElement: ['feMorphology'],
-  SVGFESpecularLightingElement: ['feSpecularLighting'],
-  SVGFETileElement: ['feTile'],
-  SVGFETurbulenceElement: ['feTurbulence']
-});
-idlArray.test();
-</script>
-
diff --git a/testing/web-platform/tests/tools/manifest/item.py b/testing/web-platform/tests/tools/manifest/item.py
index 58ff22a3b0e8..3dee3173bd0f 100644
--- a/testing/web-platform/tests/tools/manifest/item.py
+++ b/testing/web-platform/tests/tools/manifest/item.py
@@ -2,11 +2,17 @@ import os
 import urlparse
 from abc import ABCMeta, abstractmethod, abstractproperty
 
-from utils import from_os_path, to_os_path
-
 item_types = ["testharness", "reftest", "manual", "stub", "wdspec"]
 
 
+def from_os_path(path):
+    return path.replace(os.path.sep, "/")
+
+
+def to_os_path(path):
+    return path.replace("/", os.path.sep)
+
+
 def get_source_file(source_files, tests_root, manifest, path):
     def make_new():
         from sourcefile import SourceFile
diff --git a/testing/web-platform/tests/tools/manifest/manifest.py b/testing/web-platform/tests/tools/manifest/manifest.py
index 1128f416ddb4..75a7aef02980 100644
--- a/testing/web-platform/tests/tools/manifest/manifest.py
+++ b/testing/web-platform/tests/tools/manifest/manifest.py
@@ -5,7 +5,6 @@ from collections import defaultdict
 from item import item_types, ManualTest, WebdriverSpecTest, Stub, RefTest, TestharnessTest
 from log import get_logger
 from sourcefile import SourceFile
-from utils import from_os_path, to_os_path
 
 
 CURRENT_VERSION = 2
@@ -208,7 +207,7 @@ class Manifest(object):
             for item_type, items in self._data.iteritems()
         }
 
-        reftest_nodes = {from_os_path(key): [v.to_json() for v in value]
+        reftest_nodes = {key:[v.to_json() for v in value]
                          for key, value in self.reftest_nodes.iteritems()}
 
         rv = {"url_base": self.url_base,
@@ -247,7 +246,6 @@ class Manifest(object):
                 self._add(manifest_item)
 
         for path, values in obj["reftest_nodes"].iteritems():
-            path = to_os_path(path)
             for v in values:
                 item = RefTest.from_json(self, tests_root, v,
                                          source_files=source_files)
@@ -308,16 +306,17 @@ class LocalChanges(object):
         return self._data[item_type]
 
     def to_json(self):
-        reftest_nodes = {from_os_path(key): [v.to_json() for v in value]
+        reftest_nodes = {key:[v.to_json() for v in value]
                          for key, value in self.reftest_nodes.iteritems()}
 
         rv = {"items": defaultdict(dict),
               "reftest_nodes": reftest_nodes,
-              "deleted": [from_os_path(path) for path in self._deleted]}
+              "deleted": []}
+
+        rv["deleted"].extend(self._deleted)
 
         for test_type, paths in self._data.iteritems():
             for path, tests in paths.iteritems():
-                path = from_os_path(path)
                 rv["items"][test_type][path] = [test.to_json() for test in tests]
 
         return rv
@@ -344,7 +343,6 @@ class LocalChanges(object):
                     self.add(manifest_item)
 
         for path, values in obj["reftest_nodes"].iteritems():
-            path = to_os_path(path)
             for v in values:
                 item = RefTest.from_json(self.manifest, tests_root, v,
                                          source_files=source_files)
@@ -352,7 +350,7 @@ class LocalChanges(object):
                 self.reftest_nodes_by_url[item.url] = item
 
         for item in obj["deleted"]:
-            self.add_deleted(to_os_path(item))
+            self.add_deleted(item)
 
         return self
 
diff --git a/testing/web-platform/tests/tools/manifest/utils.py b/testing/web-platform/tests/tools/manifest/utils.py
index 668b14c05ba7..60e00ee74d34 100644
--- a/testing/web-platform/tests/tools/manifest/utils.py
+++ b/testing/web-platform/tests/tools/manifest/utils.py
@@ -21,12 +21,6 @@ def is_blacklisted(url):
             return True
     return False
 
-def from_os_path(path):
-    return path.replace(os.path.sep, "/")
-
-def to_os_path(path):
-    return path.replace("/", os.path.sep)
-
 class ContextManagerStringIO(StringIO):
     def __enter__(self):
         return self
diff --git a/testing/web-platform/tests/url/a-element-xhtml.xhtml b/testing/web-platform/tests/url/a-element.xhtml
similarity index 100%
rename from testing/web-platform/tests/url/a-element-xhtml.xhtml
rename to testing/web-platform/tests/url/a-element.xhtml
diff --git a/testing/web-platform/tests/webgl/compressedTexSubImage2D.html b/testing/web-platform/tests/webgl/compressedTexSubImage2D.html
index 539f9e17f8a8..dd26c4f193c4 100644
--- a/testing/web-platform/tests/webgl/compressedTexSubImage2D.html
+++ b/testing/web-platform/tests/webgl/compressedTexSubImage2D.html
@@ -15,6 +15,7 @@ test(function() {
   var tex = gl.createTexture();
   gl.bindTexture(gl.TEXTURE_2D, tex);
 
+  /* Bug 1226336
   shouldGenerateGLError(gl, gl.INVALID_ENUM, function() {
     gl.compressedTexSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 10, 10, COMPRESSED_RGB_S3TC_DXT1_EXT, new Uint8Array(8));
   });
@@ -26,5 +27,6 @@ test(function() {
       gl.compressedTexSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 10, 10, COMPRESSED_RGB_S3TC_DXT1_EXT);
     });
   }, "Should throw a TypeError when passing too few arguments.");
+  */
 });
 </script>

From b491c675dffb89f5578f4e8162db50533c22a9fc Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Thu, 17 Dec 2015 16:25:25 -0500
Subject: [PATCH 037/101] Bug 1233542 - re-export variables prior to running JS
 subconfigure; r=glandium

We need to do this for the same reason we do it for ICU: msys messes
with environment variables (as suggested in build/subconfigure.py).
---
 configure.in | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/configure.in b/configure.in
index c210a39ff919..c8cc10b1e9c1 100644
--- a/configure.in
+++ b/configure.in
@@ -9260,6 +9260,22 @@ export DIST
 export MOZ_LINKER
 export ZLIB_IN_MOZGLUE
 export MOZ_MEMORY
+export AR
+export RANLIB
+export CPP
+export CC
+export CXX
+export LD
+export ARFLAGS
+export CPPFLAGS
+export CFLAGS
+export CXXFLAGS
+export LDFLAGS
+export HOST_CC
+export HOST_CXX
+export HOST_CFLAGS
+export HOST_CXXFLAGS
+export HOST_LDFLAGS
 
 if ! test -e js; then
     mkdir js

From 231d83f99e7739dded15f4fc5661b76129a2cf88 Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@mozilla.com>
Date: Fri, 18 Dec 2015 13:53:25 -0500
Subject: [PATCH 038/101] Bug 1082598 - Part 1: Update Skia to master revision
 53c5d5fb795fe04bec050c0583223027c25b839b. r=jrmuizel

---
 .../skia/include/android/SkBRDAllocator.h     |   29 +
 .../include/android/SkBitmapRegionDecoder.h   |   90 +
 gfx/skia/skia/include/c/sk_canvas.h           |  154 +
 gfx/skia/skia/include/c/sk_data.h             |   70 +
 gfx/skia/skia/include/c/sk_image.h            |   71 +
 gfx/skia/skia/include/c/sk_maskfilter.h       |   47 +
 gfx/skia/skia/include/c/sk_matrix.h           |   49 +
 gfx/skia/skia/include/c/sk_paint.h            |  145 +
 gfx/skia/skia/include/c/sk_path.h             |   84 +
 gfx/skia/skia/include/c/sk_picture.h          |   70 +
 gfx/skia/skia/include/c/sk_shader.h           |  143 +
 gfx/skia/skia/include/c/sk_surface.h          |   73 +
 gfx/skia/skia/include/c/sk_types.h            |  205 +
 gfx/skia/skia/include/codec/SkAndroidCodec.h  |  230 +
 gfx/skia/skia/include/codec/SkCodec.h         |  614 ++
 gfx/skia/skia/include/codec/SkEncodedFormat.h |   27 +
 gfx/skia/skia/include/config/SkUserConfig.h   |   84 +-
 gfx/skia/skia/include/core/SkAnnotation.h     |    9 +-
 gfx/skia/skia/include/core/SkBBHFactory.h     |   46 +-
 gfx/skia/skia/include/core/SkBitmap.h         |  235 +-
 gfx/skia/skia/include/core/SkBitmapDevice.h   |  116 +-
 gfx/skia/skia/include/core/SkBlitRow.h        |   51 +-
 gfx/skia/skia/include/core/SkCanvas.h         |  611 +-
 gfx/skia/skia/include/core/SkChunkAlloc.h     |   14 +-
 gfx/skia/skia/include/core/SkClipStack.h      |   15 +-
 gfx/skia/skia/include/core/SkColor.h          |    8 +-
 gfx/skia/skia/include/core/SkColorFilter.h    |   78 +-
 gfx/skia/skia/include/core/SkColorPriv.h      |   97 +-
 gfx/skia/skia/include/core/SkColorTable.h     |   90 +-
 gfx/skia/skia/include/core/SkComposeShader.h  |   17 +-
 gfx/skia/skia/include/core/SkData.h           |   83 +-
 gfx/skia/skia/include/core/SkDataTable.h      |    2 -
 gfx/skia/skia/include/core/SkDevice.h         |  207 +-
 .../skia/include/core/SkDeviceProperties.h    |  103 -
 gfx/skia/skia/include/core/SkDocument.h       |  111 +-
 gfx/skia/skia/include/core/SkDraw.h           |   37 +-
 gfx/skia/skia/include/core/SkDrawFilter.h     |    2 -
 gfx/skia/skia/include/core/SkDrawLooper.h     |    8 +-
 .../skia/include/core/SkDrawPictureCallback.h |   29 -
 gfx/skia/skia/include/core/SkDrawable.h       |   77 +
 .../skia/include/core/SkDynamicAnnotations.h  |  113 -
 gfx/skia/skia/include/core/SkFilterQuality.h  |   24 +
 gfx/skia/skia/include/core/SkFixed.h          |   80 +-
 gfx/skia/skia/include/core/SkFlattenable.h    |   61 +-
 .../skia/include/core/SkFlattenableBuffers.h  |   10 -
 gfx/skia/skia/include/core/SkFont.h           |   16 +-
 gfx/skia/skia/include/core/SkFontHost.h       |   36 -
 .../include/{ports => core}/SkFontStyle.h     |    2 +
 gfx/skia/skia/include/core/SkGraphics.h       |   98 +-
 gfx/skia/skia/include/core/SkImage.h          |  342 +-
 gfx/skia/skia/include/core/SkImageDecoder.h   |  237 +-
 gfx/skia/skia/include/core/SkImageEncoder.h   |   14 +-
 gfx/skia/skia/include/core/SkImageFilter.h    |  285 +-
 gfx/skia/skia/include/core/SkImageGenerator.h |  189 +-
 gfx/skia/skia/include/core/SkImageInfo.h      |  173 +-
 gfx/skia/skia/include/core/SkInstCnt.h        |  147 -
 gfx/skia/skia/include/core/SkMallocPixelRef.h |   33 +-
 gfx/skia/skia/include/core/SkMask.h           |   20 +-
 gfx/skia/skia/include/core/SkMaskFilter.h     |   71 +-
 gfx/skia/skia/include/core/SkMath.h           |   37 +-
 gfx/skia/skia/include/core/SkMatrix.h         |  164 +-
 gfx/skia/skia/include/core/SkMetaData.h       |    2 +-
 .../skia/include/core/SkMultiPictureDraw.h    |   75 +
 gfx/skia/skia/include/core/SkOSFile.h         |   66 +-
 gfx/skia/skia/include/core/SkPackBits.h       |   47 +-
 gfx/skia/skia/include/core/SkPaint.h          |  191 +-
 .../skia/include/core/SkPaintOptionsAndroid.h |  130 -
 gfx/skia/skia/include/core/SkPatch.h          |  124 -
 gfx/skia/skia/include/core/SkPath.h           |  356 +-
 gfx/skia/skia/include/core/SkPathEffect.h     |   43 +-
 gfx/skia/skia/include/core/SkPathMeasure.h    |    3 +
 gfx/skia/skia/include/core/SkPathRef.h        |  117 +-
 gfx/skia/skia/include/core/SkPicture.h        |  287 +-
 .../skia/include/core/SkPictureRecorder.h     |   93 +-
 gfx/skia/skia/include/core/SkPixelRef.h       |  199 +-
 .../skia/include/core/SkPixelSerializer.h     |   52 +
 gfx/skia/skia/include/core/SkPixmap.h         |  265 +
 gfx/skia/skia/include/core/SkPngChunkReader.h |   45 +
 gfx/skia/skia/include/core/SkPoint.h          |   31 +-
 gfx/skia/skia/include/core/SkPoint3.h         |  124 +
 gfx/skia/skia/include/core/SkPostConfig.h     |  165 +-
 gfx/skia/skia/include/core/SkPreConfig.h      |   53 +-
 gfx/skia/skia/include/core/SkRRect.h          |   60 +-
 gfx/skia/skia/include/core/SkRSXform.h        |   67 +
 gfx/skia/skia/include/core/SkRasterizer.h     |    4 -
 gfx/skia/skia/include/core/SkRect.h           |  189 +-
 gfx/skia/skia/include/core/SkRefCnt.h         |  146 +-
 gfx/skia/skia/include/core/SkRegion.h         |    1 -
 gfx/skia/skia/include/core/SkScalar.h         |  275 +-
 gfx/skia/skia/include/core/SkShader.h         |  175 +-
 gfx/skia/skia/include/core/SkStream.h         |  160 +-
 gfx/skia/skia/include/core/SkString.h         |   30 +-
 gfx/skia/skia/include/core/SkStrokeRec.h      |   58 +-
 gfx/skia/skia/include/core/SkSurface.h        |  182 +-
 gfx/skia/skia/include/core/SkSurfaceProps.h   |   86 +
 gfx/skia/skia/include/core/SkTArray.h         |   73 +-
 gfx/skia/skia/include/core/SkTDArray.h        |   53 +-
 gfx/skia/skia/include/core/SkTInternalLList.h |   18 +-
 gfx/skia/skia/include/core/SkTLazy.h          |   50 +-
 gfx/skia/skia/include/core/SkTSearch.h        |    2 +-
 gfx/skia/skia/include/core/SkTextBlob.h       |  184 +
 gfx/skia/skia/include/core/SkThread.h         |  143 -
 gfx/skia/skia/include/core/SkTime.h           |    9 +-
 .../skia/include/core/SkTraceMemoryDump.h     |   80 +
 gfx/skia/skia/include/core/SkTypeface.h       |  107 +-
 gfx/skia/skia/include/core/SkTypes.h          |   77 +-
 gfx/skia/skia/include/core/SkUtils.h          |   51 +-
 gfx/skia/skia/include/core/SkWriteBuffer.h    |   28 +-
 gfx/skia/skia/include/core/SkWriter32.h       |   13 +-
 gfx/skia/skia/include/core/SkXfermode.h       |  132 +-
 .../skia/include/device/xps/SkXPSDevice.h     |   57 +-
 .../skia/include/effects/Sk1DPathEffect.h     |   18 +-
 .../skia/include/effects/Sk2DPathEffect.h     |   28 +-
 .../skia/include/effects/SkArcToPathEffect.h  |   40 +
 .../skia/include/effects/SkAvoidXfermode.h    |   68 -
 .../skia/include/effects/SkBitmapSource.h     |   43 -
 .../skia/include/effects/SkBlurDrawLooper.h   |   13 +-
 .../skia/include/effects/SkBlurImageFilter.h  |   32 +-
 .../skia/include/effects/SkColorCubeFilter.h  |   77 +
 .../effects/SkColorFilterImageFilter.h        |   21 +-
 gfx/skia/skia/include/effects/SkColorMatrix.h |    8 +-
 .../include/effects/SkColorMatrixFilter.h     |   22 +-
 .../include/effects/SkComposeImageFilter.h    |   23 +-
 .../skia/include/effects/SkCornerPathEffect.h |   14 +-
 .../skia/include/effects/SkDashPathEffect.h   |   18 +-
 .../include/effects/SkDiscretePathEffect.h    |   13 +-
 .../include/effects/SkDisplacementMapEffect.h |   21 +-
 .../include/effects/SkDropShadowImageFilter.h |   40 +-
 .../skia/include/effects/SkEmbossMaskFilter.h |    7 +-
 .../skia/include/effects/SkGradientShader.h   |   84 -
 gfx/skia/skia/include/effects/SkImageSource.h |   48 +
 .../skia/include/effects/SkLayerDrawLooper.h  |   21 +-
 .../skia/include/effects/SkLayerRasterizer.h  |    5 +-
 .../skia/include/effects/SkLerpXfermode.h     |    9 +-
 .../include/effects/SkLightingImageFilter.h   |   42 +-
 .../skia/include/effects/SkLumaColorFilter.h  |    7 +-
 .../include/effects/SkMagnifierImageFilter.h  |   17 +-
 .../effects/SkMatrixConvolutionImageFilter.h  |   22 +-
 .../skia/include/effects/SkMergeImageFilter.h |   36 +-
 .../skia/include/effects/SkModeColorFilter.h  |   65 +
 .../include/effects/SkMorphologyImageFilter.h |   54 +-
 .../include/effects/SkOffsetImageFilter.h     |   31 +-
 .../include/effects/SkPaintFlagsDrawFilter.h  |    2 +-
 .../include/effects/SkPerlinNoiseShader.h     |   34 +-
 .../include/effects/SkPictureImageFilter.h    |   57 +-
 .../skia/include/effects/SkPixelXorXfermode.h |   14 +-
 gfx/skia/skia/include/effects/SkPorterDuff.h  |   79 -
 .../include/effects/SkRectShaderImageFilter.h |   16 +-
 .../include/effects/SkStippleMaskFilter.h     |   45 -
 .../skia/include/effects/SkTableColorFilter.h |    6 +
 .../skia/include/effects/SkTableMaskFilter.h  |   29 +-
 .../skia/include/effects/SkTestImageFilters.h |   32 +-
 .../skia/include/effects/SkTileImageFilter.h  |   28 +-
 .../include/effects/SkTransparentShader.h     |   46 -
 .../include/effects/SkXfermodeImageFilter.h   |   22 +-
 .../skia/include/gpu/GrBackendEffectFactory.h |  144 -
 gfx/skia/skia/include/gpu/GrBlend.h           |  228 +
 gfx/skia/skia/include/gpu/GrCaps.h            |  287 +
 gfx/skia/skia/include/gpu/GrClip.h            |  185 +
 gfx/skia/skia/include/gpu/GrClipData.h        |   61 -
 gfx/skia/skia/include/gpu/GrColor.h           |  111 +-
 gfx/skia/skia/include/gpu/GrConfig.h          |   87 +-
 gfx/skia/skia/include/gpu/GrContext.h         | 1063 +---
 gfx/skia/skia/include/gpu/GrContextFactory.h  |  199 -
 gfx/skia/skia/include/gpu/GrContextOptions.h  |   65 +
 gfx/skia/skia/include/gpu/GrCoordTransform.h  |  122 +-
 gfx/skia/skia/include/gpu/GrDrawContext.h     |  313 ++
 gfx/skia/skia/include/gpu/GrDrawEffect.h      |   50 -
 gfx/skia/skia/include/gpu/GrEffect.h          |  230 -
 gfx/skia/skia/include/gpu/GrEffectStage.h     |  141 -
 gfx/skia/skia/include/gpu/GrEffectUnitTest.h  |  101 -
 gfx/skia/skia/include/gpu/GrFontScaler.h      |   85 -
 .../skia/include/gpu/GrFragmentProcessor.h    |  219 +
 gfx/skia/skia/include/gpu/GrGpuResource.h     |  340 +-
 gfx/skia/skia/include/gpu/GrGpuResourceRef.h  |  213 +
 gfx/skia/skia/include/gpu/GrInvariantOutput.h |  330 ++
 gfx/skia/skia/include/gpu/GrPaint.h           |  241 +-
 gfx/skia/skia/include/gpu/GrProcessor.h       |  153 +
 .../skia/include/gpu/GrProcessorUnitTest.h    |  153 +
 gfx/skia/skia/include/gpu/GrProgramElement.h  |  148 +
 gfx/skia/skia/include/gpu/GrRenderTarget.h    |  175 +-
 gfx/skia/skia/include/gpu/GrResourceKey.h     |  321 ++
 gfx/skia/skia/include/gpu/GrShaderVar.h       |  191 +
 gfx/skia/skia/include/gpu/GrSurface.h         |  132 +-
 .../include/gpu/GrTBackendEffectFactory.h     |   77 -
 gfx/skia/skia/include/gpu/GrTestUtils.h       |  105 +
 gfx/skia/skia/include/gpu/GrTexture.h         |  180 +-
 gfx/skia/skia/include/gpu/GrTextureAccess.h   |  123 +-
 gfx/skia/skia/include/gpu/GrTextureParams.h   |  110 +
 gfx/skia/skia/include/gpu/GrTextureProvider.h |  191 +
 gfx/skia/skia/include/gpu/GrTypes.h           |  293 +-
 gfx/skia/skia/include/gpu/GrTypesPriv.h       |  230 +-
 gfx/skia/skia/include/gpu/GrUserConfig.h      |   40 -
 gfx/skia/skia/include/gpu/GrXferProcessor.h   |  389 ++
 gfx/skia/skia/include/gpu/SkGpuDevice.h       |  221 -
 gfx/skia/skia/include/gpu/SkGr.h              |  125 +-
 gfx/skia/skia/include/gpu/SkGrPixelRef.h      |   24 +-
 .../gpu/effects/GrConstColorProcessor.h       |   66 +
 .../include/gpu/effects/GrCoverageSetOpXP.h   |   56 +
 .../include/gpu/effects/GrCustomXfermode.h    |   24 +
 .../gpu/effects/GrPorterDuffXferProcessor.h   |   75 +
 .../gpu/effects/GrXfermodeFragmentProcessor.h |   34 +
 gfx/skia/skia/include/gpu/gl/GrGLConfig.h     |   58 +-
 .../skia/include/gpu/gl/GrGLConfig_chrome.h   |   15 -
 gfx/skia/skia/include/gpu/gl/GrGLExtensions.h |   11 +-
 gfx/skia/skia/include/gpu/gl/GrGLFunctions.h  |  568 +-
 gfx/skia/skia/include/gpu/gl/GrGLInterface.h  |  193 +-
 .../skia/include/gpu/gl/GrGLSLPrettyPrint.h   |   19 +
 gfx/skia/skia/include/gpu/gl/GrGLTypes.h      |   86 +
 .../skia/include/gpu/gl/SkANGLEGLContext.h    |   51 -
 .../skia/include/gpu/gl/SkDebugGLContext.h    |   27 -
 gfx/skia/skia/include/gpu/gl/SkGLContext.h    |  133 +
 .../skia/include/gpu/gl/SkGLContextHelper.h   |   87 -
 .../skia/include/gpu/gl/SkMesaGLContext.h     |   51 -
 .../skia/include/gpu/gl/SkNativeGLContext.h   |   88 -
 .../skia/include/gpu/gl/SkNullGLContext.h     |   21 +-
 .../include/gpu/gl/angle/SkANGLEGLContext.h   |   54 +
 .../command_buffer/SkCommandBufferGLContext.h |   66 +
 .../include/images/SkDecodingImageGenerator.h |   16 +-
 gfx/skia/skia/include/images/SkForceLinking.h |    2 +-
 gfx/skia/skia/include/images/SkMovie.h        |    2 +-
 gfx/skia/skia/include/pathops/SkPathOps.h     |   43 +-
 gfx/skia/skia/include/pdf/SkPDFDevice.h       |  345 --
 gfx/skia/skia/include/pdf/SkPDFDocument.h     |  113 -
 gfx/skia/skia/include/pipe/SkGPipe.h          |    8 +-
 .../skia/include/ports/SkAtomics_atomic.h     |   59 +
 gfx/skia/skia/include/ports/SkAtomics_std.h   |   71 +
 gfx/skia/skia/include/ports/SkAtomics_sync.h  |   73 +
 .../include/ports/SkFontConfigInterface.h     |   29 +-
 gfx/skia/skia/include/ports/SkFontMgr.h       |   42 +-
 .../skia/include/ports/SkFontMgr_android.h    |   47 +
 .../skia/include/ports/SkFontMgr_custom.h     |   18 +
 .../skia/include/ports/SkFontMgr_fontconfig.h |   22 +
 .../skia/include/ports/SkFontMgr_indirect.h   |   33 +-
 .../skia/include/ports/SkRemotableFontMgr.h   |   14 +-
 .../skia/include/ports/SkTypeface_android.h   |   77 -
 .../skia/include/ports/SkTypeface_cairo.h     |    2 +-
 gfx/skia/skia/include/ports/SkTypeface_mac.h  |   30 +-
 gfx/skia/skia/include/ports/SkTypeface_win.h  |    5 +-
 gfx/skia/skia/include/private/SkAtomics.h     |  137 +
 gfx/skia/skia/include/private/SkChecksum.h    |   75 +
 .../include/{core => private}/SkFloatBits.h   |    1 -
 .../{core => private}/SkFloatingPoint.h       |  111 +-
 .../skia/include/private/SkGpuFenceSync.h     |   29 +
 .../skia/include/private/SkMiniRecorder.h     |   60 +
 gfx/skia/skia/include/private/SkMutex.h       |  125 +
 .../skia/include/{core => private}/SkOnce.h   |   61 +-
 gfx/skia/skia/include/private/SkOncePtr.h     |  106 +
 gfx/skia/skia/include/private/SkRecords.h     |  370 ++
 gfx/skia/skia/include/private/SkSemaphore.h   |   86 +
 gfx/skia/skia/include/private/SkSpinlock.h    |   44 +
 gfx/skia/skia/include/private/SkTHash.h       |  301 +
 gfx/skia/skia/include/private/SkTLogic.h      |  228 +
 .../include/{core => private}/SkTemplates.h   |  228 +-
 gfx/skia/skia/include/private/SkThreadID.h    |   19 +
 gfx/skia/skia/include/private/SkUniquePtr.h   |  400 ++
 gfx/skia/skia/include/private/SkUtility.h     |   32 +
 .../include/{core => private}/SkWeakRefCnt.h  |    6 +-
 gfx/skia/skia/include/record/SkRecording.h    |   75 -
 gfx/skia/skia/include/svg/SkSVGCanvas.h       |   31 +
 .../include/svg/{ => parser}/SkSVGAttribute.h |    3 +-
 .../skia/include/svg/{ => parser}/SkSVGBase.h |    0
 .../svg/{ => parser}/SkSVGPaintState.h        |    0
 .../include/svg/{ => parser}/SkSVGParser.h    |    1 -
 .../include/svg/{ => parser}/SkSVGTypes.h     |    0
 gfx/skia/skia/include/utils/SkBoundaryPatch.h |    2 +-
 gfx/skia/skia/include/utils/SkCamera.h        |    4 +-
 .../skia/include/utils/SkCanvasStateUtils.h   |    9 +-
 gfx/skia/skia/include/utils/SkCondVar.h       |   78 -
 gfx/skia/skia/include/utils/SkDebugUtils.h    |    8 +-
 .../skia/include/utils/SkDeferredCanvas.h     |  253 -
 gfx/skia/skia/include/utils/SkDumpCanvas.h    |   95 +-
 gfx/skia/skia/include/utils/SkEventTracer.h   |    7 +-
 .../include/utils/SkFrontBufferedStream.h     |    6 +-
 gfx/skia/skia/include/utils/SkJSONCPP.h       |   30 +-
 gfx/skia/skia/include/utils/SkLayer.h         |    2 +-
 gfx/skia/skia/include/utils/SkLua.h           |    2 +
 gfx/skia/skia/include/utils/SkLuaCanvas.h     |   76 +-
 gfx/skia/skia/include/utils/SkMatrix44.h      |   57 +-
 gfx/skia/skia/include/utils/SkNWayCanvas.h    |   90 +-
 .../skia/include/utils/SkNoSaveLayerCanvas.h  |   21 +-
 .../skia/include/utils/SkPaintFilterCanvas.h  |  102 +
 gfx/skia/skia/include/utils/SkParse.h         |    2 +-
 gfx/skia/skia/include/utils/SkPathUtils.h     |   40 -
 gfx/skia/skia/include/utils/SkPictureUtils.h  |   71 +-
 gfx/skia/skia/include/utils/SkProxyCanvas.h   |   89 -
 gfx/skia/skia/include/utils/SkRTConf.h        |   11 +-
 gfx/skia/skia/include/utils/SkRandom.h        |  139 -
 gfx/skia/skia/include/utils/SkRunnable.h      |   25 -
 .../skia/include/{views => utils}/SkTextBox.h |   10 +
 gfx/skia/skia/include/utils/SkThreadPool.h    |  221 -
 .../skia/include/utils/ios/SkStream_NSData.h  |   41 -
 gfx/skia/skia/include/utils/mac/SkCGUtils.h   |   22 +-
 .../include/utils/win/SkAutoCoInitialize.h    |   11 +-
 gfx/skia/skia/include/utils/win/SkHRESULT.h   |    4 +-
 gfx/skia/skia/include/utils/win/SkIStream.h   |   15 +-
 .../skia/include/utils/win/SkTScopedComPtr.h  |    9 +-
 gfx/skia/skia/include/views/SkEvent.h         |    2 +-
 gfx/skia/skia/include/views/SkEventSink.h     |    2 +-
 .../skia/include/views/SkOSWindow_Android.h   |   34 +-
 gfx/skia/skia/include/views/SkOSWindow_Mac.h  |   14 +-
 gfx/skia/skia/include/views/SkOSWindow_NaCl.h |   52 -
 gfx/skia/skia/include/views/SkOSWindow_SDL.h  |   52 +-
 gfx/skia/skia/include/views/SkOSWindow_Unix.h |   21 +-
 gfx/skia/skia/include/views/SkOSWindow_Win.h  |   68 +-
 gfx/skia/skia/include/views/SkOSWindow_iOS.h  |    9 +-
 gfx/skia/skia/include/views/SkView.h          |   12 +-
 gfx/skia/skia/include/views/SkWidget.h        |    8 +-
 gfx/skia/skia/include/views/SkWindow.h        |   42 +-
 .../include/views/android/AndroidKeyToSkKey.h |   35 -
 .../include/views/animated/SkWidgetViews.h    |    2 +-
 gfx/skia/skia/include/xml/SkBML_WXMLParser.h  |    2 +-
 gfx/skia/skia/include/xml/SkDOM.h             |   14 +-
 gfx/skia/skia/include/xml/SkJS.h              |   39 -
 gfx/skia/skia/include/xml/SkXMLWriter.h       |   28 +-
 .../skia/src/android/SkBitmapRegionCanvas.cpp |  140 +
 .../skia/src/android/SkBitmapRegionCanvas.h   |   41 +
 .../skia/src/android/SkBitmapRegionCodec.cpp  |  147 +
 .../skia/src/android/SkBitmapRegionCodec.h    |   37 +
 .../src/android/SkBitmapRegionDecoder.cpp     |   76 +
 .../src/android/SkBitmapRegionDecoderPriv.h   |   59 +
 .../{SkDrawable.cpp => SkADrawable.cpp}       |   10 +-
 .../animator/{SkDrawable.h => SkADrawable.h}  |    8 +-
 gfx/skia/skia/src/animator/SkAnimate.h        |    6 +-
 .../skia/src/animator/SkAnimateActive.cpp     |   16 +-
 gfx/skia/skia/src/animator/SkAnimateActive.h  |    2 +-
 gfx/skia/skia/src/animator/SkAnimateBase.cpp  |   10 +-
 gfx/skia/skia/src/animator/SkAnimateBase.h    |   20 +-
 gfx/skia/skia/src/animator/SkAnimateField.cpp |   12 +-
 gfx/skia/skia/src/animator/SkAnimateMaker.cpp |   24 +-
 gfx/skia/skia/src/animator/SkAnimateMaker.h   |    2 +-
 gfx/skia/skia/src/animator/SkAnimateSet.cpp   |    8 +-
 gfx/skia/skia/src/animator/SkAnimateSet.h     |    6 +-
 gfx/skia/skia/src/animator/SkAnimator.cpp     |   78 +-
 .../skia/src/animator/SkAnimatorScript.cpp    |   24 +-
 .../skia/src/animator/SkAnimatorScript2.cpp   |   20 +-
 gfx/skia/skia/src/animator/SkBoundable.cpp    |    2 +-
 gfx/skia/skia/src/animator/SkBoundable.h      |    6 +-
 .../src/animator/SkBuildCondensedInfo.cpp     |   14 +-
 gfx/skia/skia/src/animator/SkDisplayAdd.cpp   |   28 +-
 gfx/skia/skia/src/animator/SkDisplayAdd.h     |   24 +-
 gfx/skia/skia/src/animator/SkDisplayApply.cpp |   80 +-
 gfx/skia/skia/src/animator/SkDisplayApply.h   |   42 +-
 gfx/skia/skia/src/animator/SkDisplayBounds.h  |    2 +-
 gfx/skia/skia/src/animator/SkDisplayEvent.cpp |   12 +-
 gfx/skia/skia/src/animator/SkDisplayEvent.h   |   12 +-
 .../skia/src/animator/SkDisplayEvents.cpp     |   14 +-
 .../skia/src/animator/SkDisplayInclude.cpp    |    7 -
 gfx/skia/skia/src/animator/SkDisplayInclude.h |    6 +-
 gfx/skia/skia/src/animator/SkDisplayInput.cpp |    2 +-
 gfx/skia/skia/src/animator/SkDisplayInput.h   |    8 +-
 gfx/skia/skia/src/animator/SkDisplayList.cpp  |   24 +-
 gfx/skia/skia/src/animator/SkDisplayList.h    |   10 +-
 gfx/skia/skia/src/animator/SkDisplayMath.cpp  |    2 +-
 gfx/skia/skia/src/animator/SkDisplayMath.h    |    8 +-
 gfx/skia/skia/src/animator/SkDisplayMovie.cpp |    6 +-
 gfx/skia/skia/src/animator/SkDisplayMovie.h   |   24 +-
 gfx/skia/skia/src/animator/SkDisplayNumber.h  |    2 +-
 gfx/skia/skia/src/animator/SkDisplayPost.cpp  |   16 +-
 gfx/skia/skia/src/animator/SkDisplayPost.h    |   18 +-
 gfx/skia/skia/src/animator/SkDisplayRandom.h  |    6 +-
 gfx/skia/skia/src/animator/SkDisplayType.cpp  |   31 +-
 gfx/skia/skia/src/animator/SkDisplayTypes.cpp |    2 +-
 gfx/skia/skia/src/animator/SkDisplayTypes.h   |   16 +-
 .../skia/src/animator/SkDisplayXMLParser.cpp  |   34 +-
 gfx/skia/skia/src/animator/SkDisplayable.cpp  |   32 +-
 gfx/skia/skia/src/animator/SkDraw3D.cpp       |    2 +-
 gfx/skia/skia/src/animator/SkDraw3D.h         |   12 +-
 gfx/skia/skia/src/animator/SkDrawBitmap.cpp   |    6 +-
 gfx/skia/skia/src/animator/SkDrawBitmap.h     |   18 +-
 gfx/skia/skia/src/animator/SkDrawBlur.cpp     |    2 +-
 gfx/skia/skia/src/animator/SkDrawBlur.h       |    2 +-
 gfx/skia/skia/src/animator/SkDrawClip.cpp     |    6 +-
 gfx/skia/skia/src/animator/SkDrawClip.h       |    6 +-
 gfx/skia/skia/src/animator/SkDrawColor.cpp    |    8 +-
 gfx/skia/skia/src/animator/SkDrawColor.h      |   18 +-
 gfx/skia/skia/src/animator/SkDrawDash.cpp     |    2 +-
 gfx/skia/skia/src/animator/SkDrawDash.h       |    2 +-
 gfx/skia/skia/src/animator/SkDrawDiscrete.cpp |    2 +-
 gfx/skia/skia/src/animator/SkDrawDiscrete.h   |    2 +-
 gfx/skia/skia/src/animator/SkDrawEmboss.cpp   |    2 +-
 gfx/skia/skia/src/animator/SkDrawEmboss.h     |    2 +-
 .../src/animator/SkDrawExtraPathEffect.cpp    |   72 +-
 gfx/skia/skia/src/animator/SkDrawFull.h       |    2 +-
 gfx/skia/skia/src/animator/SkDrawGradient.cpp |    4 +-
 gfx/skia/skia/src/animator/SkDrawGradient.h   |   14 +-
 gfx/skia/skia/src/animator/SkDrawGroup.cpp    |   66 +-
 gfx/skia/skia/src/animator/SkDrawGroup.h      |   40 +-
 gfx/skia/skia/src/animator/SkDrawLine.h       |    2 +-
 gfx/skia/skia/src/animator/SkDrawMatrix.cpp   |   14 +-
 gfx/skia/skia/src/animator/SkDrawMatrix.h     |   28 +-
 gfx/skia/skia/src/animator/SkDrawOval.h       |    2 +-
 gfx/skia/skia/src/animator/SkDrawPaint.cpp    |   26 +-
 gfx/skia/skia/src/animator/SkDrawPaint.h      |   22 +-
 gfx/skia/skia/src/animator/SkDrawPath.cpp     |    2 +-
 gfx/skia/skia/src/animator/SkDrawPath.h       |   30 +-
 gfx/skia/skia/src/animator/SkDrawPoint.h      |    2 +-
 .../skia/src/animator/SkDrawRectangle.cpp     |    2 +-
 gfx/skia/skia/src/animator/SkDrawRectangle.h  |   18 +-
 .../skia/src/animator/SkDrawSaveLayer.cpp     |    2 +-
 gfx/skia/skia/src/animator/SkDrawSaveLayer.h  |    6 +-
 gfx/skia/skia/src/animator/SkDrawShader.cpp   |   22 +-
 gfx/skia/skia/src/animator/SkDrawShader.h     |    4 +-
 gfx/skia/skia/src/animator/SkDrawText.h       |    6 +-
 gfx/skia/skia/src/animator/SkDrawTextBox.h    |    8 +-
 gfx/skia/skia/src/animator/SkDrawTo.cpp       |    2 +-
 gfx/skia/skia/src/animator/SkDrawTo.h         |    4 +-
 .../src/animator/SkDrawTransparentShader.cpp  |   15 -
 .../src/animator/SkDrawTransparentShader.h    |   18 -
 gfx/skia/skia/src/animator/SkDump.cpp         |    6 +-
 gfx/skia/skia/src/animator/SkDump.h           |   10 +-
 .../skia/src/animator/SkGetCondensedInfo.cpp  |   14 +-
 gfx/skia/skia/src/animator/SkHitClear.h       |    4 +-
 gfx/skia/skia/src/animator/SkHitTest.h        |   12 +-
 gfx/skia/skia/src/animator/SkIntArray.h       |    4 +-
 gfx/skia/skia/src/animator/SkMatrixParts.cpp  |   22 +-
 gfx/skia/skia/src/animator/SkMatrixParts.h    |   24 +-
 gfx/skia/skia/src/animator/SkMemberInfo.cpp   |   30 +-
 gfx/skia/skia/src/animator/SkMemberInfo.h     |   57 +-
 gfx/skia/skia/src/animator/SkOperand.h        |    6 +-
 .../src/animator/SkOperandIterpolator.cpp     |    2 +-
 gfx/skia/skia/src/animator/SkPaintPart.cpp    |   12 +-
 gfx/skia/skia/src/animator/SkPaintPart.h      |   12 +-
 gfx/skia/skia/src/animator/SkParseSVGPath.cpp |    2 +-
 gfx/skia/skia/src/animator/SkPathParts.cpp    |    8 +-
 gfx/skia/skia/src/animator/SkPathParts.h      |   28 +-
 gfx/skia/skia/src/animator/SkPostParts.cpp    |    2 +-
 gfx/skia/skia/src/animator/SkPostParts.h      |    8 +-
 gfx/skia/skia/src/animator/SkScript.cpp       |   34 +-
 .../skia/src/animator/SkScriptRuntime.cpp     |   16 +-
 .../skia/src/animator/SkScriptTokenizer.cpp   |   32 +-
 gfx/skia/skia/src/animator/SkSnapshot.h       |    6 +-
 .../src/animator/SkTDArray_Experimental.h     |   18 +-
 gfx/skia/skia/src/animator/SkTextOnPath.cpp   |    2 +-
 gfx/skia/skia/src/animator/SkTextOnPath.h     |    2 +-
 gfx/skia/skia/src/animator/SkTextToPath.cpp   |    4 +-
 gfx/skia/skia/src/animator/SkTextToPath.h     |    6 +-
 gfx/skia/skia/src/animator/SkTime.cpp         |   18 -
 gfx/skia/skia/src/animator/SkTypedArray.cpp   |   14 +-
 .../skia/src/animator/SkXMLAnimatorWriter.cpp |    6 +-
 .../skia/src/animator/SkXMLAnimatorWriter.h   |   11 +-
 gfx/skia/skia/src/c/sk_c_from_to.h            |   34 +
 gfx/skia/skia/src/c/sk_paint.cpp              |  170 +
 gfx/skia/skia/src/c/sk_surface.cpp            |  708 +++
 gfx/skia/skia/src/c/sk_types_priv.h           |   41 +
 gfx/skia/skia/src/codec/SkAndroidCodec.cpp    |  132 +
 gfx/skia/skia/src/codec/SkBmpCodec.cpp        |  580 ++
 gfx/skia/skia/src/codec/SkBmpCodec.h          |  152 +
 gfx/skia/skia/src/codec/SkBmpMaskCodec.cpp    |  108 +
 gfx/skia/skia/src/codec/SkBmpMaskCodec.h      |   62 +
 gfx/skia/skia/src/codec/SkBmpRLECodec.cpp     |  514 ++
 gfx/skia/skia/src/codec/SkBmpRLECodec.h       |  103 +
 .../skia/src/codec/SkBmpStandardCodec.cpp     |  298 +
 gfx/skia/skia/src/codec/SkBmpStandardCodec.h  |   90 +
 gfx/skia/skia/src/codec/SkCodec.cpp           |  361 ++
 gfx/skia/skia/src/codec/SkCodecPriv.h         |  256 +
 gfx/skia/skia/src/codec/SkCodec_libgif.cpp    |  591 ++
 gfx/skia/skia/src/codec/SkCodec_libgif.h      |  207 +
 gfx/skia/skia/src/codec/SkCodec_libico.cpp    |  302 +
 gfx/skia/skia/src/codec/SkCodec_libico.h      |   63 +
 gfx/skia/skia/src/codec/SkCodec_libpng.cpp    |  875 +++
 gfx/skia/skia/src/codec/SkCodec_libpng.h      |   83 +
 gfx/skia/skia/src/codec/SkCodec_wbmp.cpp      |  209 +
 gfx/skia/skia/src/codec/SkCodec_wbmp.h        |   63 +
 gfx/skia/skia/src/codec/SkJpegCodec.cpp       |  456 ++
 gfx/skia/skia/src/codec/SkJpegCodec.h         |  126 +
 gfx/skia/skia/src/codec/SkJpegDecoderMgr.cpp  |   74 +
 gfx/skia/skia/src/codec/SkJpegDecoderMgr.h    |   76 +
 .../skia/src/codec/SkJpegUtility_codec.cpp    |   94 +
 gfx/skia/skia/src/codec/SkJpegUtility_codec.h |   50 +
 gfx/skia/skia/src/codec/SkMaskSwizzler.cpp    |  400 ++
 gfx/skia/skia/src/codec/SkMaskSwizzler.h      |   71 +
 gfx/skia/skia/src/codec/SkMasks.cpp           |  161 +
 gfx/skia/skia/src/codec/SkMasks.h             |   86 +
 gfx/skia/skia/src/codec/SkSampledCodec.cpp    |  296 +
 gfx/skia/skia/src/codec/SkSampledCodec.h      |   64 +
 gfx/skia/skia/src/codec/SkSampler.cpp         |  102 +
 gfx/skia/skia/src/codec/SkSampler.h           |   62 +
 gfx/skia/skia/src/codec/SkSwizzler.cpp        |  835 +++
 gfx/skia/skia/src/codec/SkSwizzler.h          |  278 +
 .../skia/src/codec/SkWebpAdapterCodec.cpp     |   46 +
 gfx/skia/skia/src/codec/SkWebpAdapterCodec.h  |   41 +
 gfx/skia/skia/src/codec/SkWebpCodec.cpp       |  255 +
 gfx/skia/skia/src/codec/SkWebpCodec.h         |   42 +
 gfx/skia/skia/src/core/Sk4px.h                |  249 +
 gfx/skia/skia/src/core/SkAAClip.cpp           |  149 +-
 gfx/skia/skia/src/core/SkAAClip.h             |   29 +-
 .../src/core/SkAdvancedTypefaceMetrics.cpp    |    6 +-
 .../core/SkAdvancedTypefaceMetrics.h          |   34 +-
 gfx/skia/skia/src/core/SkAnnotation.cpp       |   14 +-
 gfx/skia/skia/src/core/SkBBHFactory.cpp       |   38 +-
 gfx/skia/skia/src/core/SkBBoxHierarchy.h      |   79 +-
 .../skia/src/core/SkBBoxHierarchyRecord.cpp   |  112 -
 .../skia/src/core/SkBBoxHierarchyRecord.h     |   47 -
 gfx/skia/skia/src/core/SkBBoxRecord.cpp       |  347 --
 gfx/skia/skia/src/core/SkBBoxRecord.h         |   91 -
 gfx/skia/skia/src/core/SkBigPicture.cpp       |   99 +
 gfx/skia/skia/src/core/SkBigPicture.h         |   89 +
 gfx/skia/skia/src/core/SkBitmap.cpp           |  717 ++-
 gfx/skia/skia/src/core/SkBitmapCache.cpp      |  306 +
 gfx/skia/skia/src/core/SkBitmapCache.h        |   81 +
 gfx/skia/skia/src/core/SkBitmapController.cpp |  221 +
 gfx/skia/skia/src/core/SkBitmapController.h   |   65 +
 gfx/skia/skia/src/core/SkBitmapDevice.cpp     |  207 +-
 gfx/skia/skia/src/core/SkBitmapFilter.cpp     |  130 +-
 gfx/skia/skia/src/core/SkBitmapFilter.h       |   16 +-
 gfx/skia/skia/src/core/SkBitmapHeap.cpp       |   82 +-
 gfx/skia/skia/src/core/SkBitmapHeap.h         |   48 +-
 gfx/skia/skia/src/core/SkBitmapProcShader.cpp |  252 +-
 gfx/skia/skia/src/core/SkBitmapProcShader.h   |   57 +-
 gfx/skia/skia/src/core/SkBitmapProcState.cpp  |  587 +-
 gfx/skia/skia/src/core/SkBitmapProcState.h    |   74 +-
 .../skia/src/core/SkBitmapProcState_matrix.h  |   12 +-
 .../core/SkBitmapProcState_matrixProcs.cpp    |   26 +-
 .../core/SkBitmapProcState_matrix_template.h  |   12 +-
 .../skia/src/core/SkBitmapProcState_procs.h   |   69 +-
 .../skia/src/core/SkBitmapProcState_sample.h  |   52 +-
 .../src/core/SkBitmapProcState_shaderproc.h   |   12 +-
 gfx/skia/skia/src/core/SkBitmapProvider.cpp   |   87 +
 gfx/skia/skia/src/core/SkBitmapProvider.h     |   45 +
 gfx/skia/skia/src/core/SkBitmapScaler.cpp     |  165 +-
 gfx/skia/skia/src/core/SkBitmapScaler.h       |   66 +-
 gfx/skia/skia/src/core/SkBitmap_scroll.cpp    |  105 -
 gfx/skia/skia/src/core/SkBlitBWMaskTemplate.h |   10 +-
 gfx/skia/skia/src/core/SkBlitMask.h           |   22 +-
 gfx/skia/skia/src/core/SkBlitMask_D32.cpp     |  331 +-
 gfx/skia/skia/src/core/SkBlitRow_D16.cpp      |   72 +-
 gfx/skia/skia/src/core/SkBlitRow_D32.cpp      |  124 +-
 gfx/skia/skia/src/core/SkBlitter.cpp          |  324 +-
 gfx/skia/skia/src/core/SkBlitter.h            |  121 +-
 gfx/skia/skia/src/core/SkBlitter_A8.cpp       |   60 +-
 gfx/skia/skia/src/core/SkBlitter_ARGB32.cpp   |  117 +-
 gfx/skia/skia/src/core/SkBlitter_RGB16.cpp    |  227 +-
 gfx/skia/skia/src/core/SkBlitter_Sprite.cpp   |   26 +-
 gfx/skia/skia/src/core/SkBuffer.cpp           |   10 +-
 gfx/skia/skia/src/core/SkBuffer.h             |    3 +-
 gfx/skia/skia/src/core/SkCachedData.cpp       |  198 +
 gfx/skia/skia/src/core/SkCachedData.h         |  112 +
 gfx/skia/skia/src/core/SkCanvas.cpp           | 2332 ++++----
 gfx/skia/skia/src/core/SkCanvasPriv.h         |   23 +
 gfx/skia/skia/src/core/SkChecksum.cpp         |   47 +
 gfx/skia/skia/src/core/SkChecksum.h           |  155 -
 gfx/skia/skia/src/core/SkChunkAlloc.cpp       |  127 +-
 gfx/skia/skia/src/core/SkClipStack.cpp        |  133 +-
 gfx/skia/skia/src/core/SkColor.cpp            |   17 +-
 gfx/skia/skia/src/core/SkColorFilter.cpp      |  131 +-
 .../{include => src}/core/SkColorShader.h     |   40 +-
 gfx/skia/skia/src/core/SkColorTable.cpp       |  112 +-
 gfx/skia/skia/src/core/SkComposeShader.cpp    |   82 +-
 gfx/skia/skia/src/core/SkConfig8888.cpp       |   82 +-
 gfx/skia/skia/src/core/SkConfig8888.h         |   15 +-
 gfx/skia/skia/src/core/SkConvolver.cpp        |   31 +-
 gfx/skia/skia/src/core/SkConvolver.h          |   15 +-
 gfx/skia/skia/src/core/SkCoreBlitters.h       |   90 +-
 gfx/skia/skia/src/core/SkData.cpp             |  126 +-
 gfx/skia/skia/src/core/SkDataTable.cpp        |   37 +-
 gfx/skia/skia/src/core/SkDebug.cpp            |    6 +
 gfx/skia/skia/src/core/SkDeque.cpp            |   92 +-
 gfx/skia/skia/src/core/SkDescriptor.h         |   29 +-
 gfx/skia/skia/src/core/SkDevice.cpp           |  381 +-
 .../skia/src/core/SkDeviceImageFilterProxy.h  |   33 -
 gfx/skia/skia/src/core/SkDeviceLooper.cpp     |   38 +-
 gfx/skia/skia/src/core/SkDeviceLooper.h       |   15 +-
 gfx/skia/skia/src/core/SkDeviceProfile.cpp    |    8 +-
 gfx/skia/skia/src/core/SkDeviceProfile.h      |    6 +-
 gfx/skia/skia/src/core/SkDiscardableMemory.h  |    4 +-
 gfx/skia/skia/src/core/SkDistanceFieldGen.cpp |   16 +-
 gfx/skia/skia/src/core/SkDistanceFieldGen.h   |    4 +-
 gfx/skia/skia/src/core/SkDraw.cpp             |  894 +--
 gfx/skia/skia/src/core/SkDrawLooper.cpp       |    9 +-
 gfx/skia/skia/src/core/SkDrawProcs.h          |   73 -
 gfx/skia/skia/src/core/SkDrawable.cpp         |   85 +
 gfx/skia/skia/src/core/SkEdge.cpp             |   23 +-
 gfx/skia/skia/src/core/SkEdge.h               |    7 +-
 gfx/skia/skia/src/core/SkEdgeBuilder.cpp      |   61 +-
 gfx/skia/skia/src/core/SkEdgeBuilder.h        |    8 +-
 gfx/skia/skia/src/core/SkEdgeClipper.cpp      |  192 +-
 gfx/skia/skia/src/core/SkEdgeClipper.h        |    5 +
 gfx/skia/skia/src/core/SkEmptyShader.h        |   16 +-
 .../skia/{include => src}/core/SkEndian.h     |    6 +-
 gfx/skia/skia/src/core/SkError.cpp            |   32 +-
 gfx/skia/skia/src/core/SkFilterShader.cpp     |   41 +-
 gfx/skia/skia/src/core/SkFilterShader.h       |   17 +-
 gfx/skia/skia/src/core/SkFindAndPlaceGlyph.h  |  712 +++
 gfx/skia/skia/src/core/SkFlate.cpp            |  140 -
 gfx/skia/skia/src/core/SkFlate.h              |   52 -
 gfx/skia/skia/src/core/SkFlattenable.cpp      |   36 +-
 .../src/core/SkFlattenableSerialization.cpp   |    6 +-
 gfx/skia/skia/src/core/SkFloat.cpp            |  387 --
 gfx/skia/skia/src/core/SkFloat.h              |  107 -
 gfx/skia/skia/src/core/SkFloatBits.cpp        |   24 +-
 gfx/skia/skia/src/core/SkFont.cpp             |   10 +-
 gfx/skia/skia/src/core/SkFontDescriptor.cpp   |   81 +-
 gfx/skia/skia/src/core/SkFontDescriptor.h     |   55 +-
 gfx/skia/skia/src/core/SkFontHost.cpp         |  208 -
 gfx/skia/skia/src/core/SkFontMgr.cpp          |  268 +
 gfx/skia/skia/src/core/SkFontStream.cpp       |    2 +-
 gfx/skia/skia/src/core/SkFontStream.h         |    2 +-
 gfx/skia/skia/src/core/SkFontStyle.cpp        |   33 +
 .../skia/src/core/SkForceCPlusPlusLinking.cpp |   20 +
 gfx/skia/skia/src/core/SkGeometry.cpp         |  753 +--
 gfx/skia/skia/src/core/SkGeometry.h           |  135 +-
 gfx/skia/skia/src/core/SkGlyph.h              |   96 +-
 gfx/skia/skia/src/core/SkGlyphCache.cpp       |  584 +-
 gfx/skia/skia/src/core/SkGlyphCache.h         |  247 +-
 gfx/skia/skia/src/core/SkGlyphCache_Globals.h |   40 +-
 gfx/skia/skia/src/core/SkGraphics.cpp         |   92 +-
 gfx/skia/skia/src/core/SkHalf.cpp             |   97 +
 gfx/skia/skia/src/core/SkHalf.h               |   26 +
 gfx/skia/skia/src/core/SkImageCacherator.cpp  |  355 ++
 gfx/skia/skia/src/core/SkImageCacherator.h    |  101 +
 gfx/skia/skia/src/core/SkImageFilter.cpp      |  515 +-
 gfx/skia/skia/src/core/SkImageGenerator.cpp   |  190 +-
 gfx/skia/skia/src/core/SkImageGeneratorPriv.h |   15 +-
 gfx/skia/skia/src/core/SkImageInfo.cpp        |   62 +-
 gfx/skia/skia/src/core/SkLayerInfo.h          |   85 +
 gfx/skia/skia/src/core/SkLazyFnPtr.h          |   67 -
 gfx/skia/skia/src/core/SkLazyPtr.h            |  158 -
 gfx/skia/skia/src/core/SkLight.h              |   56 +
 gfx/skia/skia/src/core/SkLightingShader.cpp   |  725 +++
 gfx/skia/skia/src/core/SkLightingShader.h     |  100 +
 gfx/skia/skia/src/core/SkLineClipper.cpp      |   14 +-
 gfx/skia/skia/src/core/SkLineClipper.h        |    5 +-
 .../src/core/SkLocalMatrixImageFilter.cpp     |   58 +
 .../skia/src/core/SkLocalMatrixImageFilter.h  |   40 +
 .../skia/src/core/SkLocalMatrixShader.cpp     |   24 +-
 gfx/skia/skia/src/core/SkLocalMatrixShader.h  |   39 +-
 gfx/skia/skia/src/core/SkMallocPixelRef.cpp   |  100 +-
 gfx/skia/skia/src/core/SkMask.cpp             |   15 +-
 gfx/skia/skia/src/core/SkMaskCache.cpp        |  191 +
 gfx/skia/skia/src/core/SkMaskCache.h          |   44 +
 gfx/skia/skia/src/core/SkMaskFilter.cpp       |   47 +-
 gfx/skia/skia/src/core/SkMaskGamma.cpp        |   12 +-
 gfx/skia/skia/src/core/SkMaskGamma.h          |   12 +-
 gfx/skia/skia/src/core/SkMath.cpp             |  134 -
 gfx/skia/skia/src/core/SkMathPriv.h           |   14 +-
 gfx/skia/skia/src/core/SkMatrix.cpp           |  445 +-
 .../skia/src/core/SkMatrixClipStateMgr.cpp    |  419 --
 gfx/skia/skia/src/core/SkMatrixClipStateMgr.h |  406 --
 .../{effects => core}/SkMatrixImageFilter.cpp |   60 +-
 .../core}/SkMatrixImageFilter.h               |   20 +-
 gfx/skia/skia/src/core/SkMessageBus.h         |   35 +-
 gfx/skia/skia/src/core/SkMetaData.cpp         |   22 +-
 gfx/skia/skia/src/core/SkMiniRecorder.cpp     |  140 +
 gfx/skia/skia/src/core/SkMipMap.cpp           |  270 +-
 gfx/skia/skia/src/core/SkMipMap.h             |   23 +-
 gfx/skia/skia/src/core/SkMultiPictureDraw.cpp |  207 +
 gfx/skia/skia/src/core/SkNextID.h             |   21 +
 gfx/skia/skia/src/core/SkNinePatchIter.cpp    |   72 +
 gfx/skia/skia/src/core/SkNinePatchIter.h      |   42 +
 gfx/skia/skia/src/core/SkNx.h                 |  336 ++
 gfx/skia/skia/src/core/SkOpts.cpp             |  135 +
 gfx/skia/skia/src/core/SkOpts.h               |   62 +
 gfx/skia/skia/src/core/SkPackBits.cpp         |  354 +-
 gfx/skia/skia/src/core/SkPaint.cpp            | 1148 ++--
 .../skia/src/core/SkPaintOptionsAndroid.cpp   |   41 -
 gfx/skia/skia/src/core/SkPaintPriv.cpp        |  100 +-
 gfx/skia/skia/src/core/SkPaintPriv.h          |   52 +-
 gfx/skia/skia/src/core/SkPatch.cpp            |  224 -
 gfx/skia/skia/src/core/SkPath.cpp             | 1202 ++--
 gfx/skia/skia/src/core/SkPathEffect.cpp       |   46 +-
 gfx/skia/skia/src/core/SkPathHeap.cpp         |   95 -
 gfx/skia/skia/src/core/SkPathHeap.h           |   76 -
 gfx/skia/skia/src/core/SkPathMeasure.cpp      |  142 +-
 gfx/skia/skia/src/core/SkPathPriv.h           |   68 +
 gfx/skia/skia/src/core/SkPathRef.cpp          |  258 +-
 gfx/skia/skia/src/core/SkPicture.cpp          |  553 +-
 gfx/skia/skia/src/core/SkPictureCommon.h      |  151 +
 .../skia/src/core/SkPictureContentInfo.cpp    |  175 +
 gfx/skia/skia/src/core/SkPictureContentInfo.h |   89 +
 gfx/skia/skia/src/core/SkPictureData.cpp      | 1070 +---
 gfx/skia/skia/src/core/SkPictureData.h        |  192 +-
 gfx/skia/skia/src/core/SkPictureFlat.cpp      |   24 +-
 gfx/skia/skia/src/core/SkPictureFlat.h        |  120 +-
 .../skia/src/core/SkPictureImageGenerator.cpp |  161 +
 gfx/skia/skia/src/core/SkPicturePlayback.cpp  |  242 +-
 gfx/skia/skia/src/core/SkPicturePlayback.h    |   34 +-
 .../skia/src/core/SkPictureRangePlayback.cpp  |   57 -
 .../skia/src/core/SkPictureRangePlayback.h    |   41 -
 gfx/skia/skia/src/core/SkPictureRecord.cpp    | 1472 ++---
 gfx/skia/skia/src/core/SkPictureRecord.h      |  239 +-
 gfx/skia/skia/src/core/SkPictureRecorder.cpp  |  211 +-
 .../src/core/SkPictureReplacementPlayback.cpp |  171 -
 .../src/core/SkPictureReplacementPlayback.h   |   86 -
 gfx/skia/skia/src/core/SkPictureShader.cpp    |  266 +-
 gfx/skia/skia/src/core/SkPictureShader.h      |   40 +-
 gfx/skia/skia/src/core/SkPictureStateTree.cpp |  218 -
 gfx/skia/skia/src/core/SkPictureStateTree.h   |  162 -
 gfx/skia/skia/src/core/SkPixelRef.cpp         |  341 +-
 gfx/skia/skia/src/core/SkPixmap.cpp           |  275 +
 gfx/skia/skia/src/core/SkPoint.cpp            |   25 +-
 gfx/skia/skia/src/core/SkPoint3.cpp           |   80 +
 .../skia/src/core/SkProcSpriteBlitter.cpp     |   47 -
 gfx/skia/skia/src/core/SkPtrRecorder.cpp      |    4 +-
 gfx/skia/skia/src/core/SkPtrRecorder.h        |   31 +-
 gfx/skia/skia/src/core/SkPx.h                 |   89 +
 gfx/skia/skia/src/core/SkQuadTree.cpp         |  219 -
 gfx/skia/skia/src/core/SkQuadTree.h           |  113 -
 gfx/skia/skia/src/core/SkRRect.cpp            |  191 +-
 gfx/skia/skia/src/core/SkRTree.cpp            |  564 +-
 gfx/skia/skia/src/core/SkRTree.h              |  175 +-
 gfx/skia/skia/src/core/SkRWBuffer.cpp         |  349 ++
 gfx/skia/skia/src/core/SkRWBuffer.h           |   97 +
 gfx/skia/skia/src/core/SkRasterClip.cpp       |  186 +-
 gfx/skia/skia/src/core/SkRasterClip.h         |   39 +-
 gfx/skia/skia/src/core/SkRasterizer.cpp       |    7 +-
 gfx/skia/skia/src/core/SkReadBuffer.cpp       |  117 +-
 .../skia/{include => src}/core/SkReadBuffer.h |   21 +-
 .../skia/{include => src}/core/SkReader32.h   |   18 +-
 gfx/skia/skia/src/core/SkRecord.cpp           |   42 +
 gfx/skia/skia/src/core/SkRecord.h             |  170 +-
 gfx/skia/skia/src/core/SkRecordAnalysis.cpp   |   66 -
 gfx/skia/skia/src/core/SkRecordAnalysis.h     |    8 -
 gfx/skia/skia/src/core/SkRecordDraw.cpp       |  806 ++-
 gfx/skia/skia/src/core/SkRecordDraw.h         |   70 +-
 gfx/skia/skia/src/core/SkRecordOpts.cpp       |  369 +-
 gfx/skia/skia/src/core/SkRecordOpts.h         |   15 +-
 gfx/skia/skia/src/core/SkRecordPattern.h      |  126 +-
 gfx/skia/skia/src/core/SkRecorder.cpp         |  363 +-
 gfx/skia/skia/src/core/SkRecorder.h           |  156 +-
 gfx/skia/skia/src/core/SkRecording.cpp        |   44 -
 gfx/skia/skia/src/core/SkRecords.cpp          |   32 +
 gfx/skia/skia/src/core/SkRecords.h            |  291 -
 gfx/skia/skia/src/core/SkRect.cpp             |  172 +-
 gfx/skia/skia/src/core/SkRefDict.cpp          |   14 +-
 gfx/skia/skia/src/core/SkRefDict.h            |    8 +-
 gfx/skia/skia/src/core/SkRegion.cpp           |   26 +-
 gfx/skia/skia/src/core/SkRegionPriv.h         |    9 +-
 gfx/skia/skia/src/core/SkRegion_path.cpp      |   82 +-
 gfx/skia/skia/src/core/SkRemote.cpp           |  758 +++
 gfx/skia/skia/src/core/SkRemote.h             |  116 +
 gfx/skia/skia/src/core/SkRemote_protocol.h    |   36 +
 gfx/skia/skia/src/core/SkResourceCache.cpp    |  709 +++
 gfx/skia/skia/src/core/SkResourceCache.h      |  286 +
 gfx/skia/skia/src/core/SkScalar.cpp           |    6 +-
 gfx/skia/skia/src/core/SkScaledImageCache.cpp |  796 ---
 gfx/skia/skia/src/core/SkScaledImageCache.h   |  214 -
 gfx/skia/skia/src/core/SkScalerContext.cpp    |  415 +-
 gfx/skia/skia/src/core/SkScalerContext.h      |  105 +-
 gfx/skia/skia/src/core/SkScan.h               |   21 +-
 gfx/skia/skia/src/core/SkScan_AntiPath.cpp    |  106 +-
 gfx/skia/skia/src/core/SkScan_Antihair.cpp    |  319 +-
 gfx/skia/skia/src/core/SkScan_Hairline.cpp    |  372 +-
 gfx/skia/skia/src/core/SkScan_Path.cpp        |  140 +-
 gfx/skia/skia/src/core/SkSemaphore.cpp        |   99 +
 gfx/skia/skia/src/core/SkShader.cpp           |  116 +-
 gfx/skia/skia/src/core/SkSharedMutex.cpp      |  350 ++
 gfx/skia/skia/src/core/SkSharedMutex.h        |   82 +
 gfx/skia/skia/src/core/SkSinTable.h           |  277 -
 gfx/skia/skia/src/core/SkSmallAllocator.h     |   76 +-
 gfx/skia/skia/src/core/SkSpinlock.cpp         |   13 +
 gfx/skia/skia/src/core/SkSpriteBlitter.h      |   30 +-
 .../skia/src/core/SkSpriteBlitterTemplate.h   |   24 +-
 .../skia/src/core/SkSpriteBlitter_ARGB32.cpp  |  101 +-
 .../skia/src/core/SkSpriteBlitter_RGB16.cpp   |  116 +-
 gfx/skia/skia/src/core/SkStream.cpp           |  264 +-
 gfx/skia/skia/src/core/SkStreamPriv.h         |    8 +-
 gfx/skia/skia/src/core/SkString.cpp           |  102 +-
 gfx/skia/skia/src/core/SkStringUtils.cpp      |   44 +
 gfx/skia/skia/src/core/SkStringUtils.h        |   18 +
 gfx/skia/skia/src/core/SkStroke.cpp           | 1273 ++++-
 gfx/skia/skia/src/core/SkStroke.h             |   22 +
 gfx/skia/skia/src/core/SkStrokeRec.cpp        |   43 +-
 gfx/skia/skia/src/core/SkStrokerPriv.cpp      |   35 +-
 gfx/skia/skia/src/core/SkSurfacePriv.h        |   25 +
 gfx/skia/skia/src/core/SkTDPQueue.h           |  195 +
 gfx/skia/skia/src/core/SkTDynamicHash.h       |   22 +-
 gfx/skia/skia/src/core/SkTInternalSList.h     |  132 -
 gfx/skia/skia/src/core/SkTLList.h             |  206 +-
 gfx/skia/skia/src/core/SkTLS.cpp              |   33 +-
 gfx/skia/skia/src/core/SkTLS.h                |   19 +-
 gfx/skia/skia/src/core/SkTMultiMap.h          |   45 +-
 gfx/skia/skia/src/core/SkTObjectPool.h        |  109 -
 gfx/skia/skia/src/core/SkTRefArray.h          |  112 -
 gfx/skia/skia/src/core/SkTSearch.cpp          |    2 +-
 gfx/skia/skia/src/core/SkTTopoSort.h          |  112 +
 gfx/skia/skia/src/core/SkTaskGroup.cpp        |  228 +
 gfx/skia/skia/src/core/SkTaskGroup.h          |   98 +
 gfx/skia/skia/src/core/SkTextBlob.cpp         |  649 +++
 .../skia/src/core/SkTextBlobRunIterator.h     |   40 +
 gfx/skia/skia/src/core/SkTextFormatParams.h   |   10 +-
 gfx/skia/skia/src/core/SkTextMapStateProc.h   |   26 +-
 gfx/skia/skia/src/core/SkThreadID.cpp         |   16 +
 gfx/skia/skia/src/core/SkThreadPriv.h         |   23 -
 gfx/skia/skia/src/core/SkTileGrid.cpp         |  132 -
 gfx/skia/skia/src/core/SkTileGrid.h           |  142 -
 gfx/skia/skia/src/core/SkTime.cpp             |   69 +
 gfx/skia/skia/src/core/SkTraceEvent.h         |  739 +--
 gfx/skia/skia/src/core/SkTraceEventCommon.h   | 1038 ++++
 gfx/skia/skia/src/core/SkTypeface.cpp         |  285 +-
 gfx/skia/skia/src/core/SkTypefaceCache.cpp    |   72 +-
 gfx/skia/skia/src/core/SkTypefaceCache.h      |   24 +-
 gfx/skia/skia/src/core/SkUtils.cpp            |  158 +-
 gfx/skia/skia/src/core/SkUtilsArm.cpp         |   85 +-
 gfx/skia/skia/src/core/SkUtilsArm.h           |    4 +-
 .../skia/src/core/SkValidatingReadBuffer.cpp  |   21 +-
 .../skia/src/core/SkValidatingReadBuffer.h    |   56 +-
 gfx/skia/skia/src/core/SkVarAlloc.cpp         |   70 +
 gfx/skia/skia/src/core/SkVarAlloc.h           |   55 +
 gfx/skia/skia/src/core/SkVertState.cpp        |    2 +-
 gfx/skia/skia/src/core/SkVertState.h          |    2 +-
 gfx/skia/skia/src/core/SkWriteBuffer.cpp      |  114 +-
 gfx/skia/skia/src/core/SkWriter32.cpp         |   30 +-
 gfx/skia/skia/src/core/SkXfermode.cpp         | 1128 +---
 .../src/core/SkXfermodeInterpretation.cpp     |   51 +
 .../skia/src/core/SkXfermodeInterpretation.h  |   30 +
 gfx/skia/skia/src/core/SkXfermode_proccoeff.h |   59 +-
 gfx/skia/skia/src/core/SkYUVPlanesCache.cpp   |   89 +
 gfx/skia/skia/src/core/SkYUVPlanesCache.h     |   50 +
 gfx/skia/skia/src/device/xps/SkXPSDevice.cpp  |  655 +--
 gfx/skia/skia/src/doc/SkDocument.cpp          |   16 +-
 gfx/skia/skia/src/doc/SkDocument_PDF.cpp      |  430 +-
 gfx/skia/skia/src/doc/SkDocument_PDF_None.cpp |    9 +
 gfx/skia/skia/src/doc/SkDocument_XPS.cpp      |   82 +
 gfx/skia/skia/src/doc/SkDocument_XPS_None.cpp |   15 +
 .../effects/GrCircleBlurFragmentProcessor.cpp |  261 +
 .../effects/GrCircleBlurFragmentProcessor.h   |   87 +
 gfx/skia/skia/src/effects/Sk1DPathEffect.cpp  |   40 +-
 gfx/skia/skia/src/effects/Sk2DPathEffect.cpp  |   50 +-
 .../src/effects/SkAlphaThresholdFilter.cpp    |  312 +-
 .../skia/src/effects/SkArcToPathEffect.cpp    |   78 +
 .../skia/src/effects/SkArithmeticMode.cpp     |  255 +-
 .../skia/src/effects/SkArithmeticMode_gpu.cpp |  321 ++
 .../skia/src/effects/SkArithmeticMode_gpu.h   |  122 +
 gfx/skia/skia/src/effects/SkAvoidXfermode.cpp |  180 -
 gfx/skia/skia/src/effects/SkBitmapSource.cpp  |   93 -
 .../skia/src/effects/SkBlurDrawLooper.cpp     |   25 +-
 .../skia/src/effects/SkBlurImageFilter.cpp    |  247 +-
 gfx/skia/skia/src/effects/SkBlurMask.cpp      |   20 +-
 gfx/skia/skia/src/effects/SkBlurMask.h        |   13 +-
 .../skia/src/effects/SkBlurMaskFilter.cpp     |  919 +--
 .../skia/src/effects/SkColorCubeFilter.cpp    |  336 ++
 .../src/effects/SkColorFilterImageFilter.cpp  |  121 +-
 gfx/skia/skia/src/effects/SkColorFilters.cpp  |  519 +-
 gfx/skia/skia/src/effects/SkColorMatrix.cpp   |   97 +-
 .../skia/src/effects/SkColorMatrixFilter.cpp  |  406 +-
 .../skia/src/effects/SkComposeImageFilter.cpp |   63 +-
 .../skia/src/effects/SkCornerPathEffect.cpp   |   38 +-
 .../skia/src/effects/SkDashPathEffect.cpp     |  184 +-
 .../skia/src/effects/SkDiscretePathEffect.cpp |   70 +-
 .../src/effects/SkDisplacementMapEffect.cpp   |  352 +-
 .../src/effects/SkDropShadowImageFilter.cpp   |   79 +-
 .../skia/src/effects/SkEmbossMaskFilter.cpp   |   26 +-
 gfx/skia/skia/src/effects/SkGpuBlurUtils.cpp  |  398 +-
 gfx/skia/skia/src/effects/SkGpuBlurUtils.h    |   15 +-
 gfx/skia/skia/src/effects/SkImageSource.cpp   |  118 +
 .../skia/src/effects/SkLayerDrawLooper.cpp    |   66 +-
 .../skia/src/effects/SkLayerRasterizer.cpp    |   61 +-
 gfx/skia/skia/src/effects/SkLerpXfermode.cpp  |   12 +-
 .../src/effects/SkLightingImageFilter.cpp     | 1591 ++++--
 .../skia/src/effects/SkLumaColorFilter.cpp    |  104 +-
 .../src/effects/SkMagnifierImageFilter.cpp    |  335 +-
 .../SkMatrixConvolutionImageFilter.cpp        |  188 +-
 .../skia/src/effects/SkMergeImageFilter.cpp   |  130 +-
 .../src/effects/SkMorphologyImageFilter.cpp   |  595 +-
 .../skia/src/effects/SkOffsetImageFilter.cpp  |   29 +-
 .../skia/src/effects/SkPerlinNoiseShader.cpp  |  486 +-
 .../skia/src/effects/SkPictureImageFilter.cpp |  149 +-
 .../skia/src/effects/SkPixelXorXfermode.cpp   |    6 +-
 gfx/skia/skia/src/effects/SkPorterDuff.cpp    |   87 -
 .../src/effects/SkRectShaderImageFilter.cpp   |   39 +-
 .../skia/src/effects/SkStippleMaskFilter.cpp  |   52 -
 .../skia/src/effects/SkTableColorFilter.cpp   |  455 +-
 .../skia/src/effects/SkTableMaskFilter.cpp    |   15 +-
 .../skia/src/effects/SkTestImageFilters.cpp   |   31 +-
 .../skia/src/effects/SkTileImageFilter.cpp    |   49 +-
 .../skia/src/effects/SkTransparentShader.cpp  |  126 -
 .../src/effects/SkXfermodeImageFilter.cpp     |  108 +-
 .../src/effects/gradients/SkClampRange.cpp    |  102 +-
 .../skia/src/effects/gradients/SkClampRange.h |   26 +-
 ...mapCache.cpp => SkGradientBitmapCache.cpp} |   36 +-
 ...kBitmapCache.h => SkGradientBitmapCache.h} |   14 +-
 .../effects/gradients/SkGradientShader.cpp    |  715 +--
 .../effects/gradients/SkGradientShaderPriv.h  |  127 +-
 .../effects/gradients/SkLinearGradient.cpp    |  588 +-
 .../src/effects/gradients/SkLinearGradient.h  |   51 +-
 .../effects/gradients/SkRadialGradient.cpp    |  337 +-
 .../src/effects/gradients/SkRadialGradient.h  |   29 +-
 .../src/effects/gradients/SkSweepGradient.cpp |  174 +-
 .../src/effects/gradients/SkSweepGradient.h   |   29 +-
 .../gradients/SkTwoPointConicalGradient.cpp   |  141 +-
 .../gradients/SkTwoPointConicalGradient.h     |   29 +-
 .../SkTwoPointConicalGradient_gpu.cpp         |  847 +--
 .../gradients/SkTwoPointConicalGradient_gpu.h |    6 +-
 .../gradients/SkTwoPointRadialGradient.cpp    |  714 ---
 .../gradients/SkTwoPointRadialGradient.h      |   64 -
 .../skia/src/fonts/SkFontMgr_fontconfig.cpp   |   94 +-
 .../skia/src/fonts/SkFontMgr_indirect.cpp     |  166 +-
 gfx/skia/skia/src/fonts/SkGScalerContext.cpp  |   30 +-
 gfx/skia/skia/src/fonts/SkGScalerContext.h    |   33 +-
 .../skia/src/fonts/SkRandomScalerContext.cpp  |  256 +
 .../skia/src/fonts/SkRandomScalerContext.h    |   55 +
 .../skia/src/fonts/SkRemotableFontMgr.cpp     |   11 +-
 .../skia/src/fonts/SkTestScalerContext.cpp    |  283 +-
 gfx/skia/skia/src/fonts/SkTestScalerContext.h |   98 +-
 .../skia/src/gpu/GrAAConvexPathRenderer.cpp   |  716 ---
 .../skia/src/gpu/GrAAConvexPathRenderer.h     |   30 -
 .../skia/src/gpu/GrAAHairLinePathRenderer.cpp | 1042 ----
 .../skia/src/gpu/GrAAHairLinePathRenderer.h   |   65 -
 gfx/skia/skia/src/gpu/GrAARectRenderer.cpp    |  929 ----
 gfx/skia/skia/src/gpu/GrAARectRenderer.h      |  118 -
 .../src/gpu/GrAddPathRenderers_default.cpp    |   34 -
 gfx/skia/skia/src/gpu/GrAllocPool.cpp         |  116 -
 gfx/skia/skia/src/gpu/GrAllocPool.h           |   60 -
 gfx/skia/skia/src/gpu/GrAllocator.h           |   63 +-
 gfx/skia/skia/src/gpu/GrAtlas.cpp             |  293 -
 gfx/skia/skia/src/gpu/GrAtlas.h               |  133 -
 gfx/skia/skia/src/gpu/GrAtlasTextBlob.cpp     |  109 +
 gfx/skia/skia/src/gpu/GrAtlasTextBlob.h       |  250 +
 gfx/skia/skia/src/gpu/GrAtlasTextContext.cpp  | 1398 +++++
 gfx/skia/skia/src/gpu/GrAtlasTextContext.h    |  193 +
 gfx/skia/skia/src/gpu/GrAutoLocaleSetter.h    |   66 +
 gfx/skia/skia/src/gpu/GrBatchAtlas.cpp        |  264 +
 gfx/skia/skia/src/gpu/GrBatchAtlas.h          |  265 +
 gfx/skia/skia/src/gpu/GrBatchFlushState.cpp   |   30 +
 gfx/skia/skia/src/gpu/GrBatchFlushState.h     |  194 +
 gfx/skia/skia/src/gpu/GrBatchFontCache.cpp    |  236 +
 gfx/skia/skia/src/gpu/GrBatchFontCache.h      |  228 +
 gfx/skia/skia/src/gpu/GrBatchTest.cpp         |   57 +
 gfx/skia/skia/src/gpu/GrBatchTest.h           |   39 +
 gfx/skia/skia/src/gpu/GrBinHashKey.h          |  160 -
 gfx/skia/skia/src/gpu/GrBitmapTextContext.cpp |  594 --
 gfx/skia/skia/src/gpu/GrBitmapTextContext.h   |   55 -
 gfx/skia/skia/src/gpu/GrBlend.cpp             |  242 +-
 gfx/skia/skia/src/gpu/GrBlend.h               |   45 -
 gfx/skia/skia/src/gpu/GrBlurUtils.cpp         |  347 ++
 gfx/skia/skia/src/gpu/GrBlurUtils.h           |   59 +
 gfx/skia/skia/src/gpu/GrBufferAllocPool.cpp   |  337 +-
 gfx/skia/skia/src/gpu/GrBufferAllocPool.h     |  155 +-
 gfx/skia/skia/src/gpu/GrCacheID.cpp           |   34 -
 gfx/skia/skia/src/gpu/GrCaps.cpp              |  251 +
 gfx/skia/skia/src/gpu/GrClip.cpp              |   53 +
 gfx/skia/skia/src/gpu/GrClipData.cpp          |   34 -
 gfx/skia/skia/src/gpu/GrClipMaskCache.cpp     |   21 -
 gfx/skia/skia/src/gpu/GrClipMaskCache.h       |  235 -
 gfx/skia/skia/src/gpu/GrClipMaskManager.cpp   | 1169 ++--
 gfx/skia/skia/src/gpu/GrClipMaskManager.h     |  169 +-
 gfx/skia/skia/src/gpu/GrContext.cpp           | 2146 ++-----
 gfx/skia/skia/src/gpu/GrContextFactory.cpp    |  123 +
 gfx/skia/skia/src/gpu/GrContextFactory.h      |  147 +
 gfx/skia/skia/src/gpu/GrCoordTransform.cpp    |   64 +
 .../skia/src/gpu/GrDefaultGeoProcFactory.cpp  |  343 ++
 .../skia/src/gpu/GrDefaultGeoProcFactory.h    |  138 +
 .../skia/src/gpu/GrDefaultPathRenderer.cpp    |  537 --
 gfx/skia/skia/src/gpu/GrDefaultPathRenderer.h |   62 -
 .../src/gpu/GrDistanceFieldTextContext.cpp    |  599 --
 .../skia/src/gpu/GrDistanceFieldTextContext.h |   55 -
 gfx/skia/skia/src/gpu/GrDrawContext.cpp       |  806 +++
 gfx/skia/skia/src/gpu/GrDrawState.cpp         |  506 --
 gfx/skia/skia/src/gpu/GrDrawState.h           | 1018 ----
 gfx/skia/skia/src/gpu/GrDrawTarget.cpp        | 1579 ++----
 gfx/skia/skia/src/gpu/GrDrawTarget.h          | 1134 +---
 gfx/skia/skia/src/gpu/GrDrawTargetCaps.h      |  107 -
 gfx/skia/skia/src/gpu/GrDrawingManager.cpp    |  197 +
 gfx/skia/skia/src/gpu/GrDrawingManager.h      |   92 +
 gfx/skia/skia/src/gpu/GrEffect.cpp            |   96 -
 gfx/skia/skia/src/gpu/GrFontScaler.cpp        |  164 +-
 gfx/skia/skia/src/gpu/GrFontScaler.h          |   69 +
 gfx/skia/skia/src/gpu/GrFragmentProcessor.cpp |  378 ++
 gfx/skia/skia/src/gpu/GrGeometryBuffer.h      |   25 +-
 gfx/skia/skia/src/gpu/GrGeometryProcessor.h   |   86 +
 gfx/skia/skia/{include => src}/gpu/GrGlyph.h  |   43 +-
 gfx/skia/skia/src/gpu/GrGpu.cpp               |  744 +--
 gfx/skia/skia/src/gpu/GrGpu.h                 |  702 ++-
 gfx/skia/skia/src/gpu/GrGpuFactory.cpp        |   50 +-
 gfx/skia/skia/src/gpu/GrGpuFactory.h          |   24 +
 gfx/skia/skia/src/gpu/GrGpuResource.cpp       |  190 +-
 .../skia/src/gpu/GrGpuResourceCacheAccess.h   |  102 +
 gfx/skia/skia/src/gpu/GrGpuResourcePriv.h     |   86 +
 gfx/skia/skia/src/gpu/GrGpuResourceRef.cpp    |  117 +
 .../skia/src/gpu/GrImageIDTextureAdjuster.cpp |   98 +
 .../skia/src/gpu/GrImageIDTextureAdjuster.h   |   69 +
 gfx/skia/skia/src/gpu/GrInOrderDrawBuffer.cpp | 1001 ----
 gfx/skia/skia/src/gpu/GrInOrderDrawBuffer.h   |  295 -
 gfx/skia/skia/src/gpu/GrIndexBuffer.h         |   22 +-
 gfx/skia/skia/src/gpu/GrInvariantOutput.cpp   |   32 +
 gfx/skia/skia/src/gpu/GrLayerAtlas.cpp        |  170 +
 gfx/skia/skia/src/gpu/GrLayerAtlas.h          |  158 +
 gfx/skia/skia/src/gpu/GrLayerCache.cpp        |  481 +-
 gfx/skia/skia/src/gpu/GrLayerCache.h          |  385 +-
 gfx/skia/skia/src/gpu/GrLayerHoister.cpp      |  401 ++
 gfx/skia/skia/src/gpu/GrLayerHoister.h        |  124 +
 gfx/skia/skia/src/gpu/GrMemoryPool.cpp        |   29 +-
 gfx/skia/skia/src/gpu/GrMemoryPool.h          |    8 +
 gfx/skia/skia/src/gpu/GrNonAtomicRef.h        |   49 +
 gfx/skia/skia/src/gpu/GrOrderedSet.h          |  154 -
 gfx/skia/skia/src/gpu/GrOvalRenderer.cpp      | 2263 +++++---
 gfx/skia/skia/src/gpu/GrOvalRenderer.h        |   78 +-
 gfx/skia/skia/src/gpu/GrPaint.cpp             |  132 +-
 gfx/skia/skia/src/gpu/GrPath.cpp              |  238 +-
 gfx/skia/skia/src/gpu/GrPath.h                |   36 +-
 gfx/skia/skia/src/gpu/GrPathProcessor.cpp     |  142 +
 gfx/skia/skia/src/gpu/GrPathProcessor.h       |   57 +
 gfx/skia/skia/src/gpu/GrPathRange.cpp         |   55 +
 gfx/skia/skia/src/gpu/GrPathRange.h           |  145 +-
 gfx/skia/skia/src/gpu/GrPathRenderer.h        |  285 +-
 gfx/skia/skia/src/gpu/GrPathRendererChain.cpp |   65 +-
 .../gpu/GrPathRendererChain.h                 |   38 +-
 gfx/skia/skia/src/gpu/GrPathRendering.cpp     |   82 +
 gfx/skia/skia/src/gpu/GrPathRendering.h       |  203 +
 gfx/skia/skia/src/gpu/GrPathUtils.cpp         |  165 +-
 gfx/skia/skia/src/gpu/GrPathUtils.h           |   23 +-
 .../skia/src/gpu/GrPendingProgramElement.h    |   56 +
 gfx/skia/skia/src/gpu/GrPictureUtils.cpp      |  275 -
 gfx/skia/skia/src/gpu/GrPictureUtils.h        |   79 -
 gfx/skia/skia/src/gpu/GrPipeline.cpp          |  235 +
 gfx/skia/skia/src/gpu/GrPipeline.h            |  201 +
 gfx/skia/skia/src/gpu/GrPipelineBuilder.cpp   |   97 +
 gfx/skia/skia/src/gpu/GrPipelineBuilder.h     |  388 ++
 gfx/skia/skia/src/gpu/GrPlotMgr.h             |   73 -
 .../skia/src/gpu/GrPrimitiveProcessor.cpp     |   68 +
 gfx/skia/skia/src/gpu/GrPrimitiveProcessor.h  |  229 +
 gfx/skia/skia/src/gpu/GrProcOptInfo.cpp       |   70 +
 gfx/skia/skia/src/gpu/GrProcOptInfo.h         |   93 +
 gfx/skia/skia/src/gpu/GrProcessor.cpp         |  133 +
 gfx/skia/skia/src/gpu/GrProcessorUnitTest.cpp |   23 +
 gfx/skia/skia/src/gpu/GrProgramDesc.h         |  144 +
 gfx/skia/skia/src/gpu/GrProgramElement.cpp    |   37 +
 gfx/skia/skia/src/gpu/GrQuad.h                |   65 +
 gfx/skia/skia/src/gpu/GrRecordReplaceDraw.cpp |  230 +
 gfx/skia/skia/src/gpu/GrRecordReplaceDraw.h   |   26 +
 gfx/skia/skia/src/gpu/GrRectanizer_pow2.cpp   |    2 +-
 gfx/skia/skia/src/gpu/GrRectanizer_pow2.h     |    6 +-
 .../skia/src/gpu/GrRectanizer_skyline.cpp     |    2 +-
 gfx/skia/skia/src/gpu/GrRectanizer_skyline.h  |    8 +-
 gfx/skia/skia/src/gpu/GrRedBlackTree.h        |  948 ----
 gfx/skia/skia/src/gpu/GrReducedClip.cpp       |  338 +-
 gfx/skia/skia/src/gpu/GrReducedClip.h         |   61 +-
 gfx/skia/skia/src/gpu/GrRenderTarget.cpp      |  109 +-
 gfx/skia/skia/src/gpu/GrRenderTargetPriv.h    |   50 +
 gfx/skia/skia/src/gpu/GrResourceCache.cpp     | 1139 ++--
 gfx/skia/skia/src/gpu/GrResourceCache.h       |  673 +--
 gfx/skia/skia/src/gpu/GrResourceProvider.cpp  |  219 +
 gfx/skia/skia/src/gpu/GrResourceProvider.h    |  162 +
 gfx/skia/skia/src/gpu/GrSWMaskHelper.cpp      |  285 +-
 gfx/skia/skia/src/gpu/GrSWMaskHelper.h        |   60 +-
 .../skia/src/gpu/GrSoftwarePathRenderer.cpp   |   85 +-
 .../skia/src/gpu/GrSoftwarePathRenderer.h     |   21 +-
 .../src/gpu/GrStencilAndCoverPathRenderer.cpp |  103 -
 .../src/gpu/GrStencilAndCoverPathRenderer.h   |   55 -
 .../src/gpu/GrStencilAndCoverTextContext.cpp  |  856 +--
 .../src/gpu/GrStencilAndCoverTextContext.h    |  147 +-
 gfx/skia/skia/src/gpu/GrStencilAttachment.cpp |   19 +
 ...rStencilBuffer.h => GrStencilAttachment.h} |   25 +-
 gfx/skia/skia/src/gpu/GrStencilBuffer.cpp     |   47 -
 gfx/skia/skia/src/gpu/GrStrokeInfo.cpp        |   94 +
 gfx/skia/skia/src/gpu/GrStrokeInfo.h          |  172 +-
 gfx/skia/skia/src/gpu/GrSurface.cpp           |  188 +-
 gfx/skia/skia/src/gpu/GrSurfacePriv.h         |   71 +
 gfx/skia/skia/src/gpu/GrTBSearch.h            |   44 -
 gfx/skia/skia/src/gpu/GrTHashTable.h          |  215 -
 gfx/skia/skia/src/gpu/GrTRecorder.h           |  390 ++
 gfx/skia/skia/src/gpu/GrTemplates.h           |   68 -
 gfx/skia/skia/src/gpu/GrTest.cpp              |  356 +-
 gfx/skia/skia/src/gpu/GrTest.h                |   19 +-
 gfx/skia/skia/src/gpu/GrTestUtils.cpp         |  262 +
 gfx/skia/skia/src/gpu/GrTextBlobCache.cpp     |   58 +
 gfx/skia/skia/src/gpu/GrTextBlobCache.h       |  158 +
 gfx/skia/skia/src/gpu/GrTextContext.cpp       |  257 +-
 gfx/skia/skia/src/gpu/GrTextContext.h         |   80 +-
 gfx/skia/skia/src/gpu/GrTextStrike.cpp        |  336 --
 gfx/skia/skia/src/gpu/GrTextStrike.h          |  134 -
 gfx/skia/skia/src/gpu/GrTextStrike_impl.h     |   64 -
 gfx/skia/skia/src/gpu/GrTexture.cpp           |  210 +-
 gfx/skia/skia/src/gpu/GrTextureAccess.cpp     |   16 +-
 .../skia/src/gpu/GrTextureParamsAdjuster.cpp  |  484 ++
 .../skia/src/gpu/GrTextureParamsAdjuster.h    |  203 +
 gfx/skia/skia/src/gpu/GrTexturePriv.h         |   75 +
 gfx/skia/skia/src/gpu/GrTextureProvider.cpp   |  135 +
 gfx/skia/skia/src/gpu/GrTraceMarker.cpp       |    2 +-
 gfx/skia/skia/src/gpu/GrTraceMarker.h         |    1 -
 gfx/skia/skia/src/gpu/GrTracing.h             |   60 +-
 gfx/skia/skia/src/gpu/GrVertexBuffer.h        |   22 +-
 gfx/skia/skia/src/gpu/GrVertices.h            |  179 +
 gfx/skia/skia/src/gpu/GrXferProcessor.cpp     |  219 +
 gfx/skia/skia/src/gpu/GrYUVProvider.cpp       |  143 +
 gfx/skia/skia/src/gpu/GrYUVProvider.h         |   69 +
 gfx/skia/skia/src/gpu/SkGpuDevice.cpp         | 2389 ++++----
 gfx/skia/skia/src/gpu/SkGpuDevice.h           |  259 +
 .../skia/src/gpu/SkGpuDevice_drawTexture.cpp  |  240 +
 gfx/skia/skia/src/gpu/SkGr.cpp                |  877 +--
 gfx/skia/skia/src/gpu/SkGrPixelRef.cpp        |  199 +-
 gfx/skia/skia/src/gpu/SkGrPriv.h              |  138 +
 .../gpu/batches/GrAAConvexPathRenderer.cpp    | 1031 ++++
 .../src/gpu/batches/GrAAConvexPathRenderer.h  |   24 +
 .../src/gpu/batches/GrAAConvexTessellator.cpp | 1027 ++++
 .../src/gpu/batches/GrAAConvexTessellator.h   |  270 +
 .../batches/GrAADistanceFieldPathRenderer.cpp |  642 +++
 .../batches/GrAADistanceFieldPathRenderer.h   |   92 +
 .../src/gpu/batches/GrAAFillRectBatch.cpp     |  421 ++
 .../skia/src/gpu/batches/GrAAFillRectBatch.h  |   54 +
 .../gpu/batches/GrAAHairLinePathRenderer.cpp  | 1002 ++++
 .../gpu/batches/GrAAHairLinePathRenderer.h    |   31 +
 .../GrAALinearizingConvexPathRenderer.cpp     |  357 ++
 .../GrAALinearizingConvexPathRenderer.h       |   24 +
 .../src/gpu/batches/GrAAStrokeRectBatch.cpp   |  665 +++
 .../src/gpu/batches/GrAAStrokeRectBatch.h     |   43 +
 .../skia/src/gpu/batches/GrAtlasTextBatch.cpp |  575 ++
 .../skia/src/gpu/batches/GrAtlasTextBatch.h   |  229 +
 gfx/skia/skia/src/gpu/batches/GrBatch.cpp     |   58 +
 gfx/skia/skia/src/gpu/batches/GrBatch.h       |  161 +
 gfx/skia/skia/src/gpu/batches/GrClearBatch.h  |   99 +
 .../src/gpu/batches/GrCopySurfaceBatch.cpp    |   79 +
 .../skia/src/gpu/batches/GrCopySurfaceBatch.h |   67 +
 .../gpu/batches/GrDashLinePathRenderer.cpp    |   26 +
 .../src/gpu/batches/GrDashLinePathRenderer.h  |   29 +
 .../src/gpu/batches/GrDefaultPathRenderer.cpp |  773 +++
 .../src/gpu/batches/GrDefaultPathRenderer.h   |   46 +
 .../skia/src/gpu/batches/GrDiscardBatch.h     |   52 +
 .../skia/src/gpu/batches/GrDrawAtlasBatch.cpp |  267 +
 .../skia/src/gpu/batches/GrDrawAtlasBatch.h   |   75 +
 gfx/skia/skia/src/gpu/batches/GrDrawBatch.cpp |   35 +
 gfx/skia/skia/src/gpu/batches/GrDrawBatch.h   |  106 +
 .../skia/src/gpu/batches/GrDrawPathBatch.cpp  |  143 +
 .../skia/src/gpu/batches/GrDrawPathBatch.h    |  184 +
 .../src/gpu/batches/GrDrawVerticesBatch.cpp   |  327 ++
 .../src/gpu/batches/GrDrawVerticesBatch.h     |   82 +
 gfx/skia/skia/src/gpu/batches/GrNinePatch.cpp |  184 +
 gfx/skia/skia/src/gpu/batches/GrNinePatch.h   |   24 +
 .../src/gpu/batches/GrNonAAFillRectBatch.cpp  |  338 ++
 .../src/gpu/batches/GrNonAAFillRectBatch.h    |   39 +
 .../gpu/batches/GrNonAAStrokeRectBatch.cpp    |  254 +
 .../src/gpu/batches/GrNonAAStrokeRectBatch.h  |   35 +
 .../src/gpu/batches/GrRectBatchFactory.cpp    |   30 +
 .../skia/src/gpu/batches/GrRectBatchFactory.h |   77 +
 .../batches/GrStencilAndCoverPathRenderer.cpp |  158 +
 .../batches/GrStencilAndCoverPathRenderer.h   |   45 +
 .../skia/src/gpu/batches/GrStencilPathBatch.h |   78 +
 .../skia/src/gpu/batches/GrTInstanceBatch.h   |  154 +
 .../batches/GrTessellatingPathRenderer.cpp    | 1671 ++++++
 .../gpu/batches/GrTessellatingPathRenderer.h  |   33 +
 gfx/skia/skia/src/gpu/batches/GrTestBatch.h   |   90 +
 .../skia/src/gpu/batches/GrVertexBatch.cpp    |   86 +
 gfx/skia/skia/src/gpu/batches/GrVertexBatch.h |   86 +
 .../skia/src/gpu/effects/Gr1DKernelEffect.h   |    9 +-
 .../skia/src/gpu/effects/GrBezierEffect.cpp   |  797 ++-
 .../skia/src/gpu/effects/GrBezierEffect.h     |  248 +-
 .../skia/src/gpu/effects/GrBicubicEffect.cpp  |  176 +-
 .../skia/src/gpu/effects/GrBicubicEffect.h    |   59 +-
 .../src/gpu/effects/GrBitmapTextGeoProc.cpp   |  201 +
 .../src/gpu/effects/GrBitmapTextGeoProc.h     |   66 +
 .../gpu/effects/GrConfigConversionEffect.cpp  |  246 +-
 .../gpu/effects/GrConfigConversionEffect.h    |   33 +-
 .../src/gpu/effects/GrConstColorProcessor.cpp |  135 +
 .../src/gpu/effects/GrConvexPolyEffect.cpp    |  351 +-
 .../skia/src/gpu/effects/GrConvexPolyEffect.h |   55 +-
 .../src/gpu/effects/GrConvolutionEffect.cpp   |  163 +-
 .../src/gpu/effects/GrConvolutionEffect.h     |   67 +-
 .../src/gpu/effects/GrCoverageSetOpXP.cpp     |  342 ++
 .../effects/GrCustomCoordsTextureEffect.cpp   |  107 -
 .../gpu/effects/GrCustomCoordsTextureEffect.h |   49 -
 .../skia/src/gpu/effects/GrCustomXfermode.cpp |  409 ++
 .../skia/src/gpu/effects/GrDashingEffect.cpp  | 1563 ++++--
 .../skia/src/gpu/effects/GrDashingEffect.h    |   28 +-
 .../skia/src/gpu/effects/GrDisableColorXP.cpp |  109 +
 .../skia/src/gpu/effects/GrDisableColorXP.h   |   50 +
 .../gpu/effects/GrDistanceFieldGeoProc.cpp    |  793 +++
 .../src/gpu/effects/GrDistanceFieldGeoProc.h  |  232 +
 .../effects/GrDistanceFieldTextureEffect.cpp  |  503 --
 .../effects/GrDistanceFieldTextureEffect.h    |  121 -
 .../skia/src/gpu/effects/GrDitherEffect.cpp   |  101 +-
 .../skia/src/gpu/effects/GrDitherEffect.h     |    4 +-
 .../gpu/effects/GrMatrixConvolutionEffect.cpp |  357 +-
 .../gpu/effects/GrMatrixConvolutionEffect.h   |   98 +-
 .../skia/src/gpu/effects/GrOvalEffect.cpp     |  381 +-
 gfx/skia/skia/src/gpu/effects/GrOvalEffect.h  |    4 +-
 .../gpu/effects/GrPorterDuffXferProcessor.cpp |  920 +++
 .../skia/src/gpu/effects/GrRRectEffect.cpp    |  564 +-
 gfx/skia/skia/src/gpu/effects/GrRRectEffect.h |    7 +-
 .../src/gpu/effects/GrSimpleTextureEffect.cpp |   78 +-
 .../src/gpu/effects/GrSimpleTextureEffect.h   |   60 +-
 .../src/gpu/effects/GrSingleTextureEffect.cpp |    6 +-
 .../src/gpu/effects/GrSingleTextureEffect.h   |   40 +-
 .../skia/src/gpu/effects/GrTextureDomain.cpp  |  309 +-
 .../skia/src/gpu/effects/GrTextureDomain.h    |  120 +-
 .../src/gpu/effects/GrTextureStripAtlas.cpp   |  143 +-
 .../src/gpu/effects/GrTextureStripAtlas.h     |   36 +-
 .../skia/src/gpu/effects/GrVertexEffect.h     |   37 -
 .../effects/GrXfermodeFragmentProcessor.cpp   |  312 ++
 .../skia/src/gpu/effects/GrYUVtoRGBEffect.cpp |  193 +-
 .../skia/src/gpu/effects/GrYUVtoRGBEffect.h   |    7 +-
 .../src/gpu/gl/GrGLAssembleGLESInterface.h    |  286 -
 .../skia/src/gpu/gl/GrGLAssembleInterface.cpp |  578 +-
 .../skia/src/gpu/gl/GrGLAssembleInterface.h   |   15 +-
 gfx/skia/skia/src/gpu/gl/GrGLBufferImpl.cpp   |  178 +-
 gfx/skia/skia/src/gpu/gl/GrGLBufferImpl.h     |   17 +-
 gfx/skia/skia/src/gpu/gl/GrGLCaps.cpp         |  967 +++-
 gfx/skia/skia/src/gpu/gl/GrGLCaps.h           |  176 +-
 gfx/skia/skia/src/gpu/gl/GrGLContext.cpp      |  122 +-
 gfx/skia/skia/src/gpu/gl/GrGLContext.h        |   77 +-
 .../gpu/gl/GrGLCreateNativeInterface_none.cpp |    2 +-
 .../src/gpu/gl/GrGLCreateNullInterface.cpp    |  225 +-
 .../src/gpu/gl/GrGLDefaultInterface_none.cpp  |    2 +-
 gfx/skia/skia/src/gpu/gl/GrGLDefines.h        |  300 +-
 gfx/skia/skia/src/gpu/gl/GrGLEffect.h         |  105 -
 gfx/skia/skia/src/gpu/gl/GrGLExtensions.cpp   |   58 +-
 gfx/skia/skia/src/gpu/gl/GrGLGLSL.cpp         |   50 +
 gfx/skia/skia/src/gpu/gl/GrGLGLSL.h           |   25 +
 gfx/skia/skia/src/gpu/gl/GrGLGpu.cpp          | 3406 ++++++++++++
 gfx/skia/skia/src/gpu/gl/GrGLGpu.h            |  537 ++
 .../skia/src/gpu/gl/GrGLGpuProgramCache.cpp   |  215 +
 gfx/skia/skia/src/gpu/gl/GrGLIndexBuffer.cpp  |   18 +-
 gfx/skia/skia/src/gpu/gl/GrGLIndexBuffer.h    |   27 +-
 gfx/skia/skia/src/gpu/gl/GrGLInterface.cpp    |  671 ++-
 .../skia/src/gpu/gl/GrGLNameAllocator.cpp     |   44 +-
 gfx/skia/skia/src/gpu/gl/GrGLNameAllocator.h  |    2 +-
 .../skia/src/gpu/gl/GrGLNoOpInterface.cpp     |   43 +-
 gfx/skia/skia/src/gpu/gl/GrGLNoOpInterface.h  |   29 +-
 gfx/skia/skia/src/gpu/gl/GrGLPath.cpp         |  277 +-
 gfx/skia/skia/src/gpu/gl/GrGLPath.h           |   36 +-
 gfx/skia/skia/src/gpu/gl/GrGLPathRange.cpp    |  108 +-
 gfx/skia/skia/src/gpu/gl/GrGLPathRange.h      |   45 +-
 .../skia/src/gpu/gl/GrGLPathRendering.cpp     |  298 +
 gfx/skia/skia/src/gpu/gl/GrGLPathRendering.h  |  120 +
 gfx/skia/skia/src/gpu/gl/GrGLProgram.cpp      |  323 +-
 gfx/skia/skia/src/gpu/gl/GrGLProgram.h        |  172 +-
 .../src/gpu/gl/GrGLProgramDataManager.cpp     |  301 +
 .../skia/src/gpu/gl/GrGLProgramDataManager.h  |  112 +
 gfx/skia/skia/src/gpu/gl/GrGLProgramDesc.cpp  |  394 +-
 gfx/skia/skia/src/gpu/gl/GrGLProgramDesc.h    |  271 +-
 .../skia/src/gpu/gl/GrGLProgramEffects.cpp    |  510 --
 gfx/skia/skia/src/gpu/gl/GrGLProgramEffects.h |  335 --
 gfx/skia/skia/src/gpu/gl/GrGLRenderTarget.cpp |  226 +-
 gfx/skia/skia/src/gpu/gl/GrGLRenderTarget.h   |  109 +-
 gfx/skia/skia/src/gpu/gl/GrGLSL.cpp           |   98 -
 .../skia/src/gpu/gl/GrGLShaderBuilder.cpp     | 1106 ----
 gfx/skia/skia/src/gpu/gl/GrGLShaderBuilder.h  |  522 --
 .../skia/src/gpu/gl/GrGLStencilAttachment.cpp |   44 +
 ...tencilBuffer.h => GrGLStencilAttachment.h} |   38 +-
 .../skia/src/gpu/gl/GrGLStencilBuffer.cpp     |   39 -
 gfx/skia/skia/src/gpu/gl/GrGLTexture.cpp      |   78 +-
 gfx/skia/skia/src/gpu/gl/GrGLTexture.h        |   90 +-
 .../src/gpu/gl/GrGLTextureRenderTarget.cpp    |   39 +
 .../skia/src/gpu/gl/GrGLTextureRenderTarget.h |   63 +
 gfx/skia/skia/src/gpu/gl/GrGLUniformHandle.h  |   15 -
 .../skia/src/gpu/gl/GrGLUniformManager.cpp    |  280 -
 gfx/skia/skia/src/gpu/gl/GrGLUniformManager.h |  120 -
 gfx/skia/skia/src/gpu/gl/GrGLUtil.cpp         |  231 +-
 gfx/skia/skia/src/gpu/gl/GrGLUtil.h           |   51 +-
 .../skia/src/gpu/gl/GrGLVaryingHandler.cpp    |   31 +
 gfx/skia/skia/src/gpu/gl/GrGLVaryingHandler.h |   38 +
 gfx/skia/skia/src/gpu/gl/GrGLVertexArray.cpp  |   55 +-
 gfx/skia/skia/src/gpu/gl/GrGLVertexArray.h    |   39 +-
 gfx/skia/skia/src/gpu/gl/GrGLVertexBuffer.cpp |   18 +-
 gfx/skia/skia/src/gpu/gl/GrGLVertexBuffer.h   |   27 +-
 gfx/skia/skia/src/gpu/gl/GrGLVertexEffect.h   |   52 -
 gfx/skia/skia/src/gpu/gl/GrGpuGL.cpp          | 3027 ----------
 gfx/skia/skia/src/gpu/gl/GrGpuGL.h            |  487 --
 gfx/skia/skia/src/gpu/gl/GrGpuGL_program.cpp  |  377 --
 gfx/skia/skia/src/gpu/gl/SkGLContext.cpp      |  154 +
 .../skia/src/gpu/gl/SkGLContextHelper.cpp     |  136 -
 gfx/skia/skia/src/gpu/gl/SkNullGLContext.cpp  |  554 +-
 .../GrGLCreateNativeInterface_android.cpp     |  257 +-
 .../gl/android/SkNativeGLContext_android.cpp  |  182 -
 .../gpu/gl/angle/GrGLCreateANGLEInterface.cpp |  205 +-
 .../src/gpu/gl/angle/SkANGLEGLContext.cpp     |  237 +-
 .../gpu/gl/builders/GrGLProgramBuilder.cpp    |  540 ++
 .../src/gpu/gl/builders/GrGLProgramBuilder.h  |  178 +
 .../src/gpu/gl/builders/GrGLSLPrettyPrint.cpp |  204 +
 .../gl/builders/GrGLShaderStringBuilder.cpp   |   95 +
 .../gpu/gl/builders/GrGLShaderStringBuilder.h |   24 +
 .../SkCommandBufferGLContext.cpp              |  311 ++
 gfx/skia/skia/src/gpu/gl/debug/GrBufferObj.h  |    4 +-
 gfx/skia/skia/src/gpu/gl/debug/GrDebugGL.cpp  |   42 +-
 gfx/skia/skia/src/gpu/gl/debug/GrDebugGL.h    |   15 +-
 gfx/skia/skia/src/gpu/gl/debug/GrFakeRefObj.h |   14 +-
 .../skia/src/gpu/gl/debug/GrFrameBufferObj.h  |   20 +-
 .../gpu/gl/debug/GrGLCreateDebugInterface.cpp |   89 +-
 gfx/skia/skia/src/gpu/gl/debug/GrProgramObj.h |    2 +-
 .../skia/src/gpu/gl/debug/GrRenderBufferObj.h |    2 +-
 gfx/skia/skia/src/gpu/gl/debug/GrShaderObj.h  |    2 +-
 gfx/skia/skia/src/gpu/gl/debug/GrTextureObj.h |    2 +-
 .../skia/src/gpu/gl/debug/GrTextureUnitObj.h  |    2 +-
 .../src/gpu/gl/debug/SkDebugGLContext.cpp     |   14 +-
 .../skia/src/gpu/gl/debug/SkDebugGLContext.h  |   31 +
 .../gl/egl/GrGLCreateNativeInterface_egl.cpp  |   30 +
 .../gl/egl/SkCreatePlatformGLContext_egl.cpp  |  328 ++
 .../gl/glx/GrGLCreateNativeInterface_glx.cpp  |   27 +
 .../SkCreatePlatformGLContext_glx.cpp}        |  292 +-
 .../gl/iOS/GrGLCreateNativeInterface_iOS.cpp  |  206 +-
 .../gl/iOS/SkCreatePlatformGLContext_iOS.mm   |  102 +
 .../src/gpu/gl/iOS/SkNativeGLContext_iOS.mm   |   68 -
 .../gl/mac/GrGLCreateNativeInterface_mac.cpp  |   10 +-
 .../gl/mac/SkCreatePlatformGLContext_mac.cpp  |  124 +
 .../src/gpu/gl/mac/SkNativeGLContext_mac.cpp  |   84 -
 .../gpu/gl/mesa/GrGLCreateMesaInterface.cpp   |   10 +-
 .../skia/src/gpu/gl/mesa/SkMesaGLContext.cpp  |  101 +-
 .../skia/src/gpu/gl/mesa/SkMesaGLContext.h    |   48 +
 .../nacl/SkCreatePlatformGLContext_nacl.cpp}  |   10 +-
 .../gpu/gl/nacl/SkNativeGLContext_nacl.cpp    |   37 -
 .../unix/GrGLCreateNativeInterface_unix.cpp   |   44 -
 .../gl/win/GrGLCreateNativeInterface_win.cpp  |   41 +-
 ....cpp => SkCreatePlatformGLContext_win.cpp} |  149 +-
 gfx/skia/skia/src/gpu/glsl/GrGLSL.cpp         |   56 +
 gfx/skia/skia/src/gpu/{gl => glsl}/GrGLSL.h   |   55 +-
 gfx/skia/skia/src/gpu/glsl/GrGLSLBlend.cpp    |  482 ++
 gfx/skia/skia/src/gpu/glsl/GrGLSLBlend.h      |   28 +
 gfx/skia/skia/src/gpu/glsl/GrGLSLCaps.cpp     |   77 +
 gfx/skia/skia/src/gpu/glsl/GrGLSLCaps.h       |  163 +
 .../src/gpu/glsl/GrGLSLFragmentProcessor.cpp  |  108 +
 .../src/gpu/glsl/GrGLSLFragmentProcessor.h    |  123 +
 .../gpu/glsl/GrGLSLFragmentShaderBuilder.cpp  |  262 +
 .../gpu/glsl/GrGLSLFragmentShaderBuilder.h    |  202 +
 .../src/gpu/glsl/GrGLSLGeometryProcessor.cpp  |  160 +
 .../src/gpu/glsl/GrGLSLGeometryProcessor.h    |  120 +
 .../gpu/glsl/GrGLSLGeometryShaderBuilder.cpp  |   20 +
 .../gpu/glsl/GrGLSLGeometryShaderBuilder.h    |   27 +
 .../src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp |   47 +
 .../src/gpu/glsl/GrGLSLPrimitiveProcessor.h   |  109 +
 .../skia/src/gpu/glsl/GrGLSLProcessorTypes.h  |   20 +
 .../src/gpu/glsl/GrGLSLProgramBuilder.cpp     |   39 +
 .../skia/src/gpu/glsl/GrGLSLProgramBuilder.h  |  176 +
 .../src/gpu/glsl/GrGLSLProgramDataManager.h   |   80 +
 .../skia/src/gpu/glsl/GrGLSLShaderBuilder.cpp |  205 +
 .../skia/src/gpu/glsl/GrGLSLShaderBuilder.h   |  197 +
 .../GrGLSLShaderVar.h}                        |  222 +-
 .../skia/src/gpu/glsl/GrGLSLTextureSampler.h  |   39 +
 gfx/skia/skia/src/gpu/glsl/GrGLSLUtil.cpp     |   52 +
 gfx/skia/skia/src/gpu/glsl/GrGLSLUtil.h       |   19 +
 gfx/skia/skia/src/gpu/glsl/GrGLSLVarying.cpp  |  132 +
 gfx/skia/skia/src/gpu/glsl/GrGLSLVarying.h    |  136 +
 .../gpu/glsl/GrGLSLVertexShaderBuilder.cpp    |   62 +
 .../src/gpu/glsl/GrGLSLVertexShaderBuilder.h  |   31 +
 .../skia/src/gpu/glsl/GrGLSLXferProcessor.cpp |   89 +
 .../skia/src/gpu/glsl/GrGLSLXferProcessor.h   |  101 +
 .../skia/src/gpu/{gl => glsl}/GrGLSL_impl.h   |    0
 gfx/skia/skia/src/image/SkImage.cpp           |  432 +-
 gfx/skia/skia/src/image/SkImagePriv.cpp       |   68 -
 gfx/skia/skia/src/image/SkImagePriv.h         |   44 +-
 gfx/skia/skia/src/image/SkImageShader.cpp     |  134 +
 gfx/skia/skia/src/image/SkImageShader.h       |   43 +
 gfx/skia/skia/src/image/SkImage_Base.h        |   66 +-
 gfx/skia/skia/src/image/SkImage_Codec.cpp     |   75 -
 gfx/skia/skia/src/image/SkImage_Generator.cpp |  102 +
 gfx/skia/skia/src/image/SkImage_Gpu.cpp       |  435 +-
 gfx/skia/skia/src/image/SkImage_Gpu.h         |   63 +
 gfx/skia/skia/src/image/SkImage_Raster.cpp    |  284 +-
 gfx/skia/skia/src/image/SkReadPixelsRec.h     |   41 +
 gfx/skia/skia/src/image/SkSurface.cpp         |  149 +-
 gfx/skia/skia/src/image/SkSurface_Base.h      |   44 +-
 gfx/skia/skia/src/image/SkSurface_Gpu.cpp     |  233 +-
 gfx/skia/skia/src/image/SkSurface_Gpu.h       |   40 +
 gfx/skia/skia/src/image/SkSurface_Raster.cpp  |  106 +-
 .../src/images/SkDecodingImageGenerator.cpp   |  154 +-
 gfx/skia/skia/src/images/SkForceLinking.cpp   |    9 +-
 gfx/skia/skia/src/images/SkImageDecoder.cpp   |  177 +-
 .../images/SkImageDecoder_FactoryDefault.cpp  |    4 +-
 .../SkImageDecoder_FactoryRegistrar.cpp       |   10 +-
 .../skia/src/images/SkImageDecoder_astc.cpp   |  203 +
 .../skia/src/images/SkImageDecoder_ktx.cpp    |  124 +-
 .../skia/src/images/SkImageDecoder_libbmp.cpp |   26 +-
 .../skia/src/images/SkImageDecoder_libgif.cpp |   85 +-
 .../skia/src/images/SkImageDecoder_libico.cpp |  204 +-
 .../src/images/SkImageDecoder_libjpeg.cpp     |  689 +--
 .../skia/src/images/SkImageDecoder_libpng.cpp |  460 +-
 .../src/images/SkImageDecoder_libwebp.cpp     |  195 +-
 .../skia/src/images/SkImageDecoder_pkm.cpp    |   37 +-
 .../skia/src/images/SkImageDecoder_wbmp.cpp   |   26 +-
 gfx/skia/skia/src/images/SkImageEncoder.cpp   |   14 +-
 .../src/images/SkImageEncoder_Factory.cpp     |    6 +-
 .../skia/src/images/SkImageEncoder_argb.cpp   |   11 +-
 gfx/skia/skia/src/images/SkJpegUtility.cpp    |   18 +-
 gfx/skia/skia/src/images/SkJpegUtility.h      |    3 +-
 gfx/skia/skia/src/images/SkMovie.cpp          |    4 +-
 gfx/skia/skia/src/images/SkMovie_gif.cpp      |   49 +-
 .../skia/src/images/SkScaledBitmapSampler.cpp |   95 +-
 .../skia/src/images/SkScaledBitmapSampler.h   |    4 +-
 gfx/skia/skia/src/images/bmpdecoderhelper.cpp |    2 +-
 gfx/skia/skia/src/images/bmpdecoderhelper.h   |    2 +-
 gfx/skia/skia/src/lazy/SkCachingPixelRef.cpp  |   97 -
 gfx/skia/skia/src/lazy/SkCachingPixelRef.h    |   63 -
 .../skia/src/lazy/SkDiscardableMemoryPool.cpp |   90 +-
 .../skia/src/lazy/SkDiscardableMemoryPool.h   |    3 +-
 .../skia/src/lazy/SkDiscardablePixelRef.cpp   |   99 +-
 .../skia/src/lazy/SkDiscardablePixelRef.h     |   34 +-
 gfx/skia/skia/src/opts/Sk4px_NEON.h           |  170 +
 gfx/skia/skia/src/opts/Sk4px_SSE2.h           |  179 +
 gfx/skia/skia/src/opts/Sk4px_none.h           |  140 +
 .../src/opts/SkBitmapFilter_opts_SSE2.cpp     |  144 +-
 .../skia/src/opts/SkBitmapFilter_opts_SSE2.h  |    9 +-
 .../src/opts/SkBitmapProcState_arm_neon.cpp   |   23 +-
 .../src/opts/SkBitmapProcState_filter_neon.h  |    2 -
 .../src/opts/SkBitmapProcState_matrix_neon.h  |   31 +-
 .../src/opts/SkBitmapProcState_opts_SSE2.cpp  |   48 +-
 .../src/opts/SkBitmapProcState_opts_SSE2.h    |    2 -
 .../src/opts/SkBitmapProcState_opts_SSSE3.cpp |   71 +-
 .../src/opts/SkBitmapProcState_opts_SSSE3.h   |    7 +
 .../src/opts/SkBitmapProcState_opts_arm.cpp   |  207 +-
 .../opts/SkBitmapProcState_opts_mips_dsp.cpp  |   36 +-
 .../src/opts/SkBitmapProcState_opts_none.cpp  |    1 -
 gfx/skia/skia/src/opts/SkBlitMask_opts.h      |  206 +
 .../skia/src/opts/SkBlitMask_opts_arm.cpp     |   28 +-
 .../src/opts/SkBlitMask_opts_arm_neon.cpp     |  203 +-
 .../skia/src/opts/SkBlitMask_opts_arm_neon.h  |    9 +-
 .../skia/src/opts/SkBlitMask_opts_none.cpp    |   10 +-
 .../skia/src/opts/SkBlitRect_opts_SSE2.cpp    |  132 -
 gfx/skia/skia/src/opts/SkBlitRect_opts_SSE2.h |   21 -
 gfx/skia/skia/src/opts/SkBlitRow_opts.h       |   35 +
 .../skia/src/opts/SkBlitRow_opts_SSE2.cpp     |  460 +-
 gfx/skia/skia/src/opts/SkBlitRow_opts_SSE2.h  |    7 +-
 .../skia/src/opts/SkBlitRow_opts_SSE4.cpp     |   71 +
 gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4.h  |   19 +-
 .../skia/src/opts/SkBlitRow_opts_SSE4_asm.S   |  473 --
 .../src/opts/SkBlitRow_opts_SSE4_x64_asm.S    |  470 --
 gfx/skia/skia/src/opts/SkBlitRow_opts_arm.cpp |  381 +-
 .../skia/src/opts/SkBlitRow_opts_arm_neon.cpp |  425 +-
 .../skia/src/opts/SkBlitRow_opts_arm_neon.h   |    6 +-
 .../skia/src/opts/SkBlitRow_opts_mips_dsp.cpp |   51 +-
 .../skia/src/opts/SkBlitRow_opts_none.cpp     |   18 +-
 .../skia/src/opts/SkBlurImageFilter_opts.h    |  318 ++
 gfx/skia/skia/src/opts/SkBlurImage_opts.h     |   20 -
 .../skia/src/opts/SkBlurImage_opts_SSE2.cpp   |  108 -
 .../skia/src/opts/SkBlurImage_opts_SSE2.h     |   18 -
 .../skia/src/opts/SkBlurImage_opts_SSE4.cpp   |  123 -
 .../skia/src/opts/SkBlurImage_opts_SSE4.h     |   18 -
 .../skia/src/opts/SkBlurImage_opts_arm.cpp    |   25 -
 .../skia/src/opts/SkBlurImage_opts_neon.cpp   |  188 -
 .../skia/src/opts/SkBlurImage_opts_neon.h     |   13 -
 .../skia/src/opts/SkBlurImage_opts_none.cpp   |   15 -
 .../skia/src/opts/SkColorCubeFilter_opts.h    |   84 +
 gfx/skia/skia/src/opts/SkColor_opts_SSE2.h    |   66 +-
 gfx/skia/skia/src/opts/SkColor_opts_neon.h    |    7 +
 gfx/skia/skia/src/opts/SkFloatingPoint_opts.h |   35 +
 gfx/skia/skia/src/opts/SkMath_opts_SSE2.h     |   51 -
 gfx/skia/skia/src/opts/SkMatrix_opts.h        |  106 +
 .../src/opts/SkMorphologyImageFilter_opts.h   |  137 +
 gfx/skia/skia/src/opts/SkMorphology_opts.h    |   22 -
 .../skia/src/opts/SkMorphology_opts_SSE2.cpp  |   81 -
 .../skia/src/opts/SkMorphology_opts_SSE2.h    |   22 -
 .../skia/src/opts/SkMorphology_opts_arm.cpp   |   34 -
 .../skia/src/opts/SkMorphology_opts_neon.cpp  |   80 -
 .../skia/src/opts/SkMorphology_opts_neon.h    |   15 -
 .../skia/src/opts/SkMorphology_opts_none.cpp  |   12 -
 gfx/skia/skia/src/opts/SkNx_avx.h             |   90 +
 gfx/skia/skia/src/opts/SkNx_neon.h            |  337 ++
 gfx/skia/skia/src/opts/SkNx_sse.h             |  304 +
 gfx/skia/skia/src/opts/SkOpts_avx.cpp         |   17 +
 gfx/skia/skia/src/opts/SkOpts_neon.cpp        |   51 +
 gfx/skia/skia/src/opts/SkOpts_sse41.cpp       |   19 +
 gfx/skia/skia/src/opts/SkOpts_ssse3.cpp       |   20 +
 gfx/skia/skia/src/opts/SkPx_neon.h            |  188 +
 gfx/skia/skia/src/opts/SkPx_none.h            |  111 +
 gfx/skia/skia/src/opts/SkPx_sse.h             |  155 +
 .../skia/src/opts/SkTextureCompression_opts.h |   17 -
 .../opts/SkTextureCompression_opts_arm.cpp    |   38 -
 .../opts/SkTextureCompression_opts_neon.cpp   |  239 -
 .../src/opts/SkTextureCompression_opts_neon.h |   14 -
 .../opts/SkTextureCompression_opts_none.cpp   |   13 -
 .../skia/src/opts/SkTextureCompressor_opts.h  |  267 +
 gfx/skia/skia/src/opts/SkUtils_opts.h         |  110 +
 gfx/skia/skia/src/opts/SkUtils_opts_SSE2.cpp  |   99 -
 gfx/skia/skia/src/opts/SkUtils_opts_SSE2.h    |   17 -
 gfx/skia/skia/src/opts/SkUtils_opts_arm.cpp   |   57 -
 gfx/skia/skia/src/opts/SkUtils_opts_none.cpp  |   22 -
 gfx/skia/skia/src/opts/SkXfermode_opts.h      |  339 ++
 .../skia/src/opts/SkXfermode_opts_SSE2.cpp    |  819 ---
 gfx/skia/skia/src/opts/SkXfermode_opts_SSE2.h |   38 -
 .../skia/src/opts/SkXfermode_opts_arm.cpp     |   26 -
 .../src/opts/SkXfermode_opts_arm_neon.cpp     | 1028 ----
 .../skia/src/opts/SkXfermode_opts_arm_neon.h  |   35 -
 .../skia/src/opts/SkXfermode_opts_none.cpp    |   17 -
 gfx/skia/skia/src/opts/memset.arm.S           |  111 -
 gfx/skia/skia/src/opts/memset16_neon.S        |  143 -
 gfx/skia/skia/src/opts/memset32_neon.S        |  113 -
 gfx/skia/skia/src/opts/opts_check_x86.cpp     |  253 +-
 .../skia/src/pathops/SkAddIntersections.cpp   |  357 +-
 .../skia/src/pathops/SkAddIntersections.h     |    8 +-
 .../src/pathops/SkDConicLineIntersection.cpp  |  363 ++
 .../skia/src/pathops/SkDCubicIntersection.cpp |  698 ---
 .../src/pathops/SkDCubicLineIntersection.cpp  |  106 +-
 gfx/skia/skia/src/pathops/SkDCubicToQuads.cpp |  158 +-
 .../skia/src/pathops/SkDLineIntersection.cpp  |  106 +-
 gfx/skia/skia/src/pathops/SkDQuadImplicit.cpp |  117 -
 gfx/skia/skia/src/pathops/SkDQuadImplicit.h   |   39 -
 .../skia/src/pathops/SkDQuadIntersection.cpp  |  555 --
 .../src/pathops/SkDQuadLineIntersection.cpp   |  123 +-
 .../skia/src/pathops/SkIntersectionHelper.h   |   94 +-
 gfx/skia/skia/src/pathops/SkIntersections.cpp |  153 +-
 gfx/skia/skia/src/pathops/SkIntersections.h   |  143 +-
 gfx/skia/skia/src/pathops/SkOpAngle.cpp       |  825 ++-
 gfx/skia/skia/src/pathops/SkOpAngle.h         |  195 +-
 gfx/skia/skia/src/pathops/SkOpBuilder.cpp     |  173 +
 gfx/skia/skia/src/pathops/SkOpCoincidence.cpp |  676 +++
 gfx/skia/skia/src/pathops/SkOpCoincidence.h   |  126 +
 gfx/skia/skia/src/pathops/SkOpContour.cpp     |  778 +--
 gfx/skia/skia/src/pathops/SkOpContour.h       |  595 +-
 gfx/skia/skia/src/pathops/SkOpCubicHull.cpp   |  150 +
 gfx/skia/skia/src/pathops/SkOpEdgeBuilder.cpp |  142 +-
 gfx/skia/skia/src/pathops/SkOpEdgeBuilder.h   |   47 +-
 gfx/skia/skia/src/pathops/SkOpSegment.cpp     | 4949 ++++-------------
 gfx/skia/skia/src/pathops/SkOpSegment.h       |  754 ++-
 gfx/skia/skia/src/pathops/SkOpSpan.cpp        |  385 ++
 gfx/skia/skia/src/pathops/SkOpSpan.h          |  520 +-
 gfx/skia/skia/src/pathops/SkOpTAllocator.h    |   33 +
 gfx/skia/skia/src/pathops/SkPathOpsBounds.cpp |   40 -
 gfx/skia/skia/src/pathops/SkPathOpsBounds.h   |   29 +-
 gfx/skia/skia/src/pathops/SkPathOpsCommon.cpp |  774 +--
 gfx/skia/skia/src/pathops/SkPathOpsCommon.h   |   29 +-
 gfx/skia/skia/src/pathops/SkPathOpsConic.cpp  |  166 +
 gfx/skia/skia/src/pathops/SkPathOpsConic.h    |  123 +
 gfx/skia/skia/src/pathops/SkPathOpsCubic.cpp  |  407 +-
 gfx/skia/skia/src/pathops/SkPathOpsCubic.h    |  102 +-
 gfx/skia/skia/src/pathops/SkPathOpsCurve.cpp  |   39 +
 gfx/skia/skia/src/pathops/SkPathOpsCurve.h    |  267 +-
 gfx/skia/skia/src/pathops/SkPathOpsDebug.cpp  | 2108 +++++--
 gfx/skia/skia/src/pathops/SkPathOpsDebug.h    |  223 +-
 gfx/skia/skia/src/pathops/SkPathOpsLine.cpp   |   50 +-
 gfx/skia/skia/src/pathops/SkPathOpsLine.h     |   17 +-
 gfx/skia/skia/src/pathops/SkPathOpsOp.cpp     |  488 +-
 gfx/skia/skia/src/pathops/SkPathOpsPoint.cpp  |    5 -
 gfx/skia/skia/src/pathops/SkPathOpsPoint.h    |   80 +-
 gfx/skia/skia/src/pathops/SkPathOpsQuad.cpp   |  180 +-
 gfx/skia/skia/src/pathops/SkPathOpsQuad.h     |   51 +-
 gfx/skia/skia/src/pathops/SkPathOpsRect.cpp   |   73 +-
 gfx/skia/skia/src/pathops/SkPathOpsRect.h     |   48 +-
 .../skia/src/pathops/SkPathOpsSimplify.cpp    |  227 +-
 gfx/skia/skia/src/pathops/SkPathOpsTSect.cpp  |   50 +
 gfx/skia/skia/src/pathops/SkPathOpsTSect.h    | 2237 ++++++++
 .../skia/src/pathops/SkPathOpsTightBounds.cpp |   22 +-
 .../skia/src/pathops/SkPathOpsTriangle.cpp    |   51 -
 gfx/skia/skia/src/pathops/SkPathOpsTriangle.h |   20 -
 gfx/skia/skia/src/pathops/SkPathOpsTypes.cpp  |   27 +-
 gfx/skia/skia/src/pathops/SkPathOpsTypes.h    |  161 +-
 .../skia/src/pathops/SkPathOpsWinding.cpp     |  407 ++
 gfx/skia/skia/src/pathops/SkPathWriter.cpp    |   18 +
 gfx/skia/skia/src/pathops/SkPathWriter.h      |    1 +
 gfx/skia/skia/src/pathops/SkQuarticRoot.cpp   |  168 -
 gfx/skia/skia/src/pathops/SkQuarticRoot.h     |   16 -
 gfx/skia/skia/src/pathops/SkReduceOrder.cpp   |   39 +-
 gfx/skia/skia/src/pathops/SkReduceOrder.h     |    3 +-
 gfx/skia/skia/src/pdf/SkDeflate.cpp           |  119 +
 gfx/skia/skia/src/pdf/SkDeflate.h             |   45 +
 gfx/skia/skia/src/pdf/SkJpegInfo.cpp          |  121 +
 gfx/skia/skia/src/pdf/SkJpegInfo.h            |   31 +
 gfx/skia/skia/src/pdf/SkPDFBitmap.cpp         |  490 ++
 gfx/skia/skia/src/pdf/SkPDFBitmap.h           |   21 +
 gfx/skia/skia/src/pdf/SkPDFCanon.cpp          |  151 +
 gfx/skia/skia/src/pdf/SkPDFCanon.h            |  117 +
 gfx/skia/skia/src/pdf/SkPDFCatalog.cpp        |  215 -
 gfx/skia/skia/src/pdf/SkPDFCatalog.h          |  137 -
 gfx/skia/skia/src/pdf/SkPDFDevice.cpp         | 1390 ++---
 gfx/skia/skia/src/pdf/SkPDFDevice.h           |  319 ++
 .../skia/src/pdf/SkPDFDeviceFlattener.cpp     |  154 -
 gfx/skia/skia/src/pdf/SkPDFDeviceFlattener.h  |   53 -
 gfx/skia/skia/src/pdf/SkPDFDocument.cpp       |  351 --
 gfx/skia/skia/src/pdf/SkPDFFont.cpp           |  536 +-
 gfx/skia/skia/src/pdf/SkPDFFont.h             |   65 +-
 gfx/skia/skia/src/pdf/SkPDFFontImpl.h         |   34 +-
 gfx/skia/skia/src/pdf/SkPDFFormXObject.cpp    |   45 +-
 gfx/skia/skia/src/pdf/SkPDFFormXObject.h      |   13 +-
 gfx/skia/skia/src/pdf/SkPDFGraphicState.cpp   |  374 +-
 gfx/skia/skia/src/pdf/SkPDFGraphicState.h     |   85 +-
 gfx/skia/skia/src/pdf/SkPDFImage.cpp          |  631 ---
 gfx/skia/skia/src/pdf/SkPDFImage.h            |   98 -
 gfx/skia/skia/src/pdf/SkPDFMetadata.cpp       |  350 ++
 gfx/skia/skia/src/pdf/SkPDFMetadata.h         |   33 +
 gfx/skia/skia/src/pdf/SkPDFPage.cpp           |  158 -
 gfx/skia/skia/src/pdf/SkPDFPage.h             |  109 -
 gfx/skia/skia/src/pdf/SkPDFResourceDict.cpp   |  121 +-
 gfx/skia/skia/src/pdf/SkPDFResourceDict.h     |   63 +-
 gfx/skia/skia/src/pdf/SkPDFShader.cpp         |  607 +-
 gfx/skia/skia/src/pdf/SkPDFShader.h           |   94 +-
 gfx/skia/skia/src/pdf/SkPDFStream.cpp         |  139 +-
 gfx/skia/skia/src/pdf/SkPDFStream.h           |   73 +-
 gfx/skia/skia/src/pdf/SkPDFTypes.cpp          |  911 +--
 gfx/skia/skia/src/pdf/SkPDFTypes.h            |  598 +-
 gfx/skia/skia/src/pdf/SkPDFUtils.cpp          |  189 +-
 gfx/skia/skia/src/pdf/SkPDFUtils.h            |    8 +-
 gfx/skia/skia/src/pdf/SkTSet.h                |  356 --
 gfx/skia/skia/src/pipe/SkGPipePriv.h          |   46 +-
 gfx/skia/skia/src/pipe/SkGPipeRead.cpp        |  267 +-
 gfx/skia/skia/src/pipe/SkGPipeWrite.cpp       |  626 ++-
 .../src/pipe/utils/SamplePipeControllers.cpp  |   13 +-
 .../src/pipe/utils/SamplePipeControllers.h    |   20 +-
 gfx/skia/skia/src/ports/SkAtomics_sync.h      |   55 -
 gfx/skia/skia/src/ports/SkAtomics_win.h       |   54 -
 gfx/skia/skia/src/ports/SkBarriers_arm.h      |   36 -
 gfx/skia/skia/src/ports/SkBarriers_tsan.h     |   31 -
 gfx/skia/skia/src/ports/SkBarriers_x86.h      |   39 -
 gfx/skia/skia/src/ports/SkDebug_android.cpp   |   26 +-
 gfx/skia/skia/src/ports/SkDebug_nacl.cpp      |   38 -
 gfx/skia/skia/src/ports/SkDebug_stdio.cpp     |    4 +-
 gfx/skia/skia/src/ports/SkDebug_win.cpp       |    8 +-
 .../src/ports/SkDiscardableMemory_none.cpp    |    1 +
 .../ports/SkFontConfigInterface_android.cpp   |  743 ---
 .../ports/SkFontConfigInterface_direct.cpp    |  235 +-
 .../src/ports/SkFontConfigInterface_direct.h  |   43 +
 .../SkFontConfigInterface_direct_factory.cpp  |   20 +
 .../SkFontConfigInterface_direct_google3.cpp  |   34 +
 .../SkFontConfigInterface_direct_google3.h    |   26 +
 ...ConfigInterface_direct_google3_factory.cpp |   20 +
 .../src/ports/SkFontConfigParser_android.cpp  |  349 --
 .../src/ports/SkFontConfigParser_android.h    |   62 -
 .../skia/src/ports/SkFontConfigTypeface.h     |   40 +-
 .../skia/src/ports/SkFontHost_FreeType.cpp    |  962 ++--
 .../src/ports/SkFontHost_FreeType_common.cpp  |   32 +-
 .../src/ports/SkFontHost_FreeType_common.h    |   59 +-
 .../skia/src/ports/SkFontHost_android_old.cpp |  585 --
 gfx/skia/skia/src/ports/SkFontHost_cairo.cpp  |   92 +-
 .../skia/src/ports/SkFontHost_fontconfig.cpp  |  179 +-
 gfx/skia/skia/src/ports/SkFontHost_linux.cpp  |  407 --
 gfx/skia/skia/src/ports/SkFontHost_mac.cpp    | 1186 ++--
 gfx/skia/skia/src/ports/SkFontHost_win.cpp    |  501 +-
 gfx/skia/skia/src/ports/SkFontMgr_android.cpp |  495 +-
 .../src/ports/SkFontMgr_android_factory.cpp   |   47 +
 .../src/ports/SkFontMgr_android_parser.cpp    |  799 +++
 .../skia/src/ports/SkFontMgr_android_parser.h |  218 +
 gfx/skia/skia/src/ports/SkFontMgr_custom.cpp  |  508 ++
 .../SkFontMgr_custom_directory_factory.cpp    |   17 +
 .../SkFontMgr_custom_embedded_factory.cpp     |   17 +
 .../skia/src/ports/SkFontMgr_default_dw.cpp   |    6 -
 .../skia/src/ports/SkFontMgr_default_gdi.cpp  |    6 -
 ...t_none.cpp => SkFontMgr_empty_factory.cpp} |    6 +-
 .../skia/src/ports/SkFontMgr_fontconfig.cpp   |  882 +++
 .../ports/SkFontMgr_fontconfig_factory.cpp    |   14 +
 gfx/skia/skia/src/ports/SkFontMgr_win_dw.cpp  |  457 +-
 .../src/ports/SkFontMgr_win_dw_factory.cpp    |   18 +
 .../src/ports/SkFontMgr_win_gdi_factory.cpp   |   18 +
 .../ports/SkGlobalInitialization_chromium.cpp |  140 +-
 .../ports/SkGlobalInitialization_default.cpp  |  128 +-
 gfx/skia/skia/src/ports/SkImageDecoder_CG.cpp |  108 +-
 .../skia/src/ports/SkImageDecoder_WIC.cpp     |   42 +-
 .../skia/src/ports/SkImageDecoder_empty.cpp   |   55 +-
 .../skia/src/ports/SkImageGenerator_none.cpp  |   12 +
 .../skia/src/ports/SkImageGenerator_skia.cpp  |  105 +
 gfx/skia/skia/src/ports/SkMemory_malloc.cpp   |    8 +-
 gfx/skia/skia/src/ports/SkMutex_pthread.h     |  101 -
 gfx/skia/skia/src/ports/SkMutex_win.h         |   79 -
 gfx/skia/skia/src/ports/SkOSFile_none.cpp     |   30 -
 gfx/skia/skia/src/ports/SkOSFile_posix.cpp    |  115 +-
 gfx/skia/skia/src/ports/SkOSFile_stdio.cpp    |  109 +-
 gfx/skia/skia/src/ports/SkOSFile_win.cpp      |  151 +-
 gfx/skia/skia/src/ports/SkOSLibrary.h         |   16 +
 gfx/skia/skia/src/ports/SkOSLibrary_posix.cpp |   22 +
 gfx/skia/skia/src/ports/SkOSLibrary_win.cpp   |   22 +
 .../src/ports/SkRemotableFontMgr_win_dw.cpp   |  130 +-
 .../skia/src/ports/SkScalerContext_win_dw.cpp |  329 +-
 .../skia/src/ports/SkScalerContext_win_dw.h   |   25 +-
 gfx/skia/skia/src/ports/SkTLS_none.cpp        |    2 +-
 gfx/skia/skia/src/ports/SkTLS_pthread.cpp     |    2 +-
 gfx/skia/skia/src/ports/SkTLS_win.cpp         |   12 +-
 gfx/skia/skia/src/ports/SkTime_Unix.cpp       |   15 +-
 gfx/skia/skia/src/ports/SkTime_win.cpp        |   34 +-
 gfx/skia/skia/src/ports/SkTypeface_win_dw.cpp |  176 +-
 gfx/skia/skia/src/ports/SkTypeface_win_dw.h   |   67 +-
 gfx/skia/skia/src/ports/SkXMLParser_empty.cpp |   23 -
 gfx/skia/skia/src/sfnt/SkIBMFamilyClass.h     |    2 +-
 gfx/skia/skia/src/sfnt/SkOTTableTypes.h       |    5 +-
 gfx/skia/skia/src/sfnt/SkOTTable_OS_2.h       |   12 +-
 gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V0.h    |    2 +-
 gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V1.h    |    2 +-
 gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V2.h    |    2 +-
 gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V3.h    |    2 +-
 gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V4.h    |    2 +-
 gfx/skia/skia/src/sfnt/SkOTTable_OS_2_VA.h    |    2 +-
 gfx/skia/skia/src/sfnt/SkOTTable_gasp.h       |    4 +-
 gfx/skia/skia/src/sfnt/SkOTTable_head.h       |    4 +-
 gfx/skia/skia/src/sfnt/SkOTTable_hhea.h       |    4 +-
 gfx/skia/skia/src/sfnt/SkOTTable_maxp_CFF.h   |    4 +-
 gfx/skia/skia/src/sfnt/SkOTTable_maxp_TT.h    |    4 +-
 gfx/skia/skia/src/sfnt/SkOTTable_name.cpp     |    2 +-
 gfx/skia/skia/src/sfnt/SkOTTable_name.h       |   10 +-
 gfx/skia/skia/src/sfnt/SkOTTable_post.h       |    4 +-
 gfx/skia/skia/src/sfnt/SkOTUtils.cpp          |   28 +-
 gfx/skia/skia/src/sfnt/SkOTUtils.h            |   12 +-
 gfx/skia/skia/src/sfnt/SkPanose.h             |    2 +-
 gfx/skia/skia/src/sfnt/SkSFNTHeader.h         |    4 +-
 gfx/skia/skia/src/sfnt/SkTTCFHeader.h         |    2 +-
 gfx/skia/skia/src/svg/SkSVGCanvas.cpp         |   17 +
 gfx/skia/skia/src/svg/SkSVGDevice.cpp         |  818 +++
 gfx/skia/skia/src/svg/SkSVGDevice.h           |   76 +
 gfx/skia/skia/src/svg/{ => parser}/SkSVG.cpp  |    0
 .../skia/src/svg/{ => parser}/SkSVGCircle.cpp |    0
 .../skia/src/svg/{ => parser}/SkSVGCircle.h   |    0
 .../src/svg/{ => parser}/SkSVGClipPath.cpp    |    2 +-
 .../skia/src/svg/{ => parser}/SkSVGClipPath.h |    0
 .../skia/src/svg/{ => parser}/SkSVGDefs.cpp   |    0
 .../skia/src/svg/{ => parser}/SkSVGDefs.h     |    0
 .../src/svg/{ => parser}/SkSVGElements.cpp    |    4 +-
 .../skia/src/svg/{ => parser}/SkSVGElements.h |    0
 .../src/svg/{ => parser}/SkSVGEllipse.cpp     |    0
 .../skia/src/svg/{ => parser}/SkSVGEllipse.h  |    0
 .../svg/{ => parser}/SkSVGFeColorMatrix.cpp   |    0
 .../src/svg/{ => parser}/SkSVGFeColorMatrix.h |    0
 .../skia/src/svg/{ => parser}/SkSVGFilter.cpp |    0
 .../skia/src/svg/{ => parser}/SkSVGFilter.h   |    0
 gfx/skia/skia/src/svg/{ => parser}/SkSVGG.cpp |    0
 gfx/skia/skia/src/svg/{ => parser}/SkSVGG.h   |    0
 .../src/svg/{ => parser}/SkSVGGradient.cpp    |    2 +-
 .../skia/src/svg/{ => parser}/SkSVGGradient.h |    0
 .../skia/src/svg/{ => parser}/SkSVGGroup.cpp  |    4 +-
 .../skia/src/svg/{ => parser}/SkSVGGroup.h    |    0
 .../skia/src/svg/{ => parser}/SkSVGImage.cpp  |    0
 .../skia/src/svg/{ => parser}/SkSVGImage.h    |    0
 .../skia/src/svg/{ => parser}/SkSVGLine.cpp   |    0
 .../skia/src/svg/{ => parser}/SkSVGLine.h     |    0
 .../svg/{ => parser}/SkSVGLinearGradient.cpp  |    0
 .../svg/{ => parser}/SkSVGLinearGradient.h    |    0
 .../skia/src/svg/{ => parser}/SkSVGMask.cpp   |    0
 .../skia/src/svg/{ => parser}/SkSVGMask.h     |    0
 .../src/svg/{ => parser}/SkSVGMetadata.cpp    |    0
 .../skia/src/svg/{ => parser}/SkSVGMetadata.h |    0
 .../src/svg/{ => parser}/SkSVGPaintState.cpp  |   10 +-
 .../skia/src/svg/{ => parser}/SkSVGParser.cpp |   20 +-
 .../skia/src/svg/{ => parser}/SkSVGPath.cpp   |    2 +-
 .../skia/src/svg/{ => parser}/SkSVGPath.h     |    0
 .../src/svg/{ => parser}/SkSVGPolygon.cpp     |    0
 .../skia/src/svg/{ => parser}/SkSVGPolygon.h  |    0
 .../src/svg/{ => parser}/SkSVGPolyline.cpp    |    0
 .../skia/src/svg/{ => parser}/SkSVGPolyline.h |    0
 .../svg/{ => parser}/SkSVGRadialGradient.cpp  |    0
 .../svg/{ => parser}/SkSVGRadialGradient.h    |    0
 .../skia/src/svg/{ => parser}/SkSVGRect.cpp   |    0
 .../skia/src/svg/{ => parser}/SkSVGRect.h     |    0
 .../skia/src/svg/{ => parser}/SkSVGSVG.cpp    |    7 +-
 gfx/skia/skia/src/svg/{ => parser}/SkSVGSVG.h |    0
 .../skia/src/svg/{ => parser}/SkSVGStop.cpp   |    0
 .../skia/src/svg/{ => parser}/SkSVGStop.h     |    0
 .../skia/src/svg/{ => parser}/SkSVGSymbol.cpp |    0
 .../skia/src/svg/{ => parser}/SkSVGSymbol.h   |    0
 .../skia/src/svg/{ => parser}/SkSVGText.cpp   |    0
 .../skia/src/svg/{ => parser}/SkSVGText.h     |    0
 .../skia/src/svg/{ => parser}/SkSVGUse.cpp    |    0
 gfx/skia/skia/src/svg/{ => parser}/SkSVGUse.h |    0
 gfx/skia/skia/src/utils/SkBase64.cpp          |    4 +-
 gfx/skia/skia/src/utils/SkBase64.h            |    2 +-
 gfx/skia/skia/src/utils/SkBitSet.cpp          |   29 +-
 gfx/skia/skia/src/utils/SkBitSet.h            |   15 +-
 .../src/utils/SkBitmapSourceDeserializer.cpp  |   34 +
 .../src/utils/SkBitmapSourceDeserializer.h    |   21 +
 gfx/skia/skia/src/utils/SkBoundaryPatch.cpp   |    4 +-
 gfx/skia/skia/src/utils/SkCamera.cpp          |   10 +-
 gfx/skia/skia/src/utils/SkCanvasStack.h       |   16 +-
 .../skia/src/utils/SkCanvasStateUtils.cpp     |   46 +-
 gfx/skia/skia/src/utils/SkCondVar.cpp         |   68 -
 gfx/skia/skia/src/utils/SkCullPoints.cpp      |    4 +-
 gfx/skia/skia/src/utils/SkDashPath.cpp        |   14 +-
 gfx/skia/skia/src/utils/SkDashPathPriv.h      |    4 +-
 gfx/skia/skia/src/utils/SkDeferredCanvas.cpp  |  926 ---
 gfx/skia/skia/src/utils/SkDumpCanvas.cpp      |  173 +-
 gfx/skia/skia/src/utils/SkEventTracer.cpp     |   53 +-
 .../skia/src/utils/SkFrontBufferedStream.cpp  |   63 +-
 .../src/utils/SkGatherPixelRefsAndRects.cpp   |   25 -
 .../src/utils/SkGatherPixelRefsAndRects.h     |  326 --
 .../skia/src/utils/SkImageGeneratorUtils.cpp  |  134 +
 .../skia/src/utils/SkImageGeneratorUtils.h    |   29 +
 gfx/skia/skia/src/utils/SkInterpolator.cpp    |   23 +-
 gfx/skia/skia/src/utils/SkLayer.cpp           |   16 +-
 gfx/skia/skia/src/utils/SkLua.cpp             |  730 ++-
 gfx/skia/skia/src/utils/SkLuaCanvas.cpp       |   69 +-
 gfx/skia/skia/src/utils/SkMD5.h               |   10 +-
 gfx/skia/skia/src/utils/SkMatrix44.cpp        |  132 +-
 gfx/skia/skia/src/utils/SkMeshUtils.cpp       |   10 +-
 gfx/skia/skia/src/utils/SkNWayCanvas.cpp      |  116 +-
 gfx/skia/skia/src/utils/SkNinePatch.cpp       |   14 +-
 gfx/skia/skia/src/utils/SkNullCanvas.cpp      |    2 +-
 gfx/skia/skia/src/utils/SkOSFile.cpp          |  222 +-
 gfx/skia/skia/src/utils/SkPDFRasterizer.cpp   |   86 -
 gfx/skia/skia/src/utils/SkPDFRasterizer.h     |   21 -
 .../skia/src/utils/SkPaintFilterCanvas.cpp    |  170 +
 gfx/skia/skia/src/utils/SkParse.cpp           |   20 +-
 gfx/skia/skia/src/utils/SkParseColor.cpp      |   22 +-
 gfx/skia/skia/src/utils/SkParsePath.cpp       |   16 +-
 gfx/skia/skia/src/utils/SkPatchGrid.cpp       |  189 +
 gfx/skia/skia/src/utils/SkPatchGrid.h         |  144 +
 gfx/skia/skia/src/utils/SkPatchUtils.cpp      |  331 ++
 gfx/skia/skia/src/utils/SkPatchUtils.h        |  121 +
 gfx/skia/skia/src/utils/SkPathUtils.cpp       |  152 -
 gfx/skia/skia/src/utils/SkPictureUtils.cpp    |  220 -
 gfx/skia/skia/src/utils/SkProxyCanvas.cpp     |  170 -
 gfx/skia/skia/src/utils/SkRTConf.cpp          |   53 +-
 .../SkInstCnt.cpp => utils/SkRunnable.h}      |   10 +-
 gfx/skia/skia/src/utils/SkSHA1.h              |    4 +-
 gfx/skia/skia/src/utils/SkTFitsIn.h           |   60 +-
 gfx/skia/skia/src/utils/SkTLogic.h            |  110 -
 .../skia/src/{views => utils}/SkTextBox.cpp   |   74 +-
 .../skia/src/utils/SkTextureCompressor.cpp    |  217 +-
 gfx/skia/skia/src/utils/SkTextureCompressor.h |   81 +-
 .../src/utils/SkTextureCompressor_ASTC.cpp    | 1852 +++++-
 .../skia/src/utils/SkTextureCompressor_ASTC.h |   11 +-
 .../src/utils/SkTextureCompressor_Blitter.h   |  733 +++
 .../src/utils/SkTextureCompressor_LATC.cpp    |  309 +-
 .../skia/src/utils/SkTextureCompressor_LATC.h |   11 +-
 .../src/utils/SkTextureCompressor_R11EAC.cpp  |  568 +-
 .../src/utils/SkTextureCompressor_R11EAC.h    |   11 +-
 .../src/utils/SkTextureCompressor_Utils.h     |   68 +
 gfx/skia/skia/src/utils/SkThreadUtils.h       |    9 +-
 .../skia/src/utils/SkThreadUtils_pthread.cpp  |   10 +-
 .../src/utils/SkThreadUtils_pthread_linux.cpp |   46 -
 .../src/utils/SkThreadUtils_pthread_mach.cpp  |   30 -
 gfx/skia/skia/src/utils/SkThreadUtils_win.cpp |   59 +-
 .../skia/src/utils/SkWhitelistChecksums.cpp   |   50 +
 .../skia/src/utils/SkWhitelistTypefaces.cpp   |  268 +
 .../src/utils/android/SkAndroidSDKCanvas.cpp  |  374 ++
 .../src/utils/android/SkAndroidSDKCanvas.h    |  112 +
 .../skia/src/utils/debugger/SkDebugCanvas.cpp |  455 +-
 .../skia/src/utils/debugger/SkDebugCanvas.h   |  194 +-
 .../skia/src/utils/debugger/SkDrawCommand.cpp |  620 ++-
 .../skia/src/utils/debugger/SkDrawCommand.h   |  391 +-
 .../src/utils/debugger/SkObjectParser.cpp     |   56 +-
 .../skia/src/utils/debugger/SkObjectParser.h  |   12 +-
 gfx/skia/skia/src/utils/ios/SkFontHost_iOS.mm |  262 -
 .../skia/src/utils/ios/SkImageDecoder_iOS.mm  |   65 -
 gfx/skia/skia/src/utils/ios/SkOSFile_iOS.mm   |   98 -
 .../skia/src/utils/ios/SkStream_NSData.mm     |   44 -
 .../skia/src/utils/mac/SkCreateCGImageRef.cpp |   47 +-
 gfx/skia/skia/src/utils/mac/SkStream_mac.cpp  |   24 +-
 .../skia/src/utils/win/SkAutoCoInitialize.cpp |    7 +-
 gfx/skia/skia/src/utils/win/SkDWrite.cpp      |   42 +-
 gfx/skia/skia/src/utils/win/SkDWrite.h        |   37 +-
 .../src/utils/win/SkDWriteFontFileStream.cpp  |   45 +-
 .../src/utils/win/SkDWriteFontFileStream.h    |   28 +-
 .../src/utils/win/SkDWriteGeometrySink.cpp    |    7 +-
 .../skia/src/utils/win/SkDWriteGeometrySink.h |   20 +-
 gfx/skia/skia/src/utils/win/SkHRESULT.cpp     |   15 +-
 gfx/skia/skia/src/utils/win/SkIStream.cpp     |   29 +-
 .../{include/utils => src/utils/win}/SkWGL.h  |    0
 gfx/skia/skia/src/utils/win/SkWGL_win.cpp     |   82 +-
 gfx/skia/skia/src/views/SkEvent.cpp           |   44 +-
 gfx/skia/skia/src/views/SkEventSink.cpp       |   28 +-
 gfx/skia/skia/src/views/SkOSMenu.cpp          |   18 +-
 gfx/skia/skia/src/views/SkParsePaint.cpp      |   16 +-
 gfx/skia/skia/src/views/SkProgressView.cpp    |   22 +-
 gfx/skia/skia/src/views/SkStackViewLayout.cpp |    8 +-
 gfx/skia/skia/src/views/SkTagList.cpp         |    6 +-
 gfx/skia/skia/src/views/SkTagList.h           |    2 +-
 gfx/skia/skia/src/views/SkTouchGesture.cpp    |    8 +-
 gfx/skia/skia/src/views/SkView.cpp            |  126 +-
 gfx/skia/skia/src/views/SkViewInflate.cpp     |   18 +-
 gfx/skia/skia/src/views/SkViewPriv.cpp        |   12 +-
 gfx/skia/skia/src/views/SkWidgets.cpp         |   28 +-
 gfx/skia/skia/src/views/SkWindow.cpp          |   89 +-
 .../skia/src/views/animated/SkBorderView.cpp  |    4 +-
 .../skia/src/views/animated/SkImageView.cpp   |   20 +-
 .../src/views/animated/SkProgressBarView.cpp  |    4 +-
 .../src/views/animated/SkScrollBarView.cpp    |    4 +-
 .../src/views/animated/SkStaticTextView.cpp   |   14 +-
 .../skia/src/views/animated/SkWidgetViews.cpp |   22 +-
 .../skia/src/views/mac/SampleApp-Info.plist   |   34 -
 gfx/skia/skia/src/views/mac/SampleApp.xib     | 3962 -------------
 .../skia/src/views/mac/SampleAppDelegate.h    |   24 -
 .../skia/src/views/mac/SampleAppDelegate.mm   |   16 -
 gfx/skia/skia/src/views/mac/SkNSView.h        |    5 +
 gfx/skia/skia/src/views/mac/SkNSView.mm       |   48 +-
 .../skia/src/views/mac/SkOSWindow_Mac.cpp     |  542 --
 gfx/skia/skia/src/views/mac/SkOSWindow_Mac.mm |   16 +-
 gfx/skia/skia/src/views/mac/SkSampleNSView.mm |    5 -
 gfx/skia/skia/src/views/mac/skia_mac.mm       |  114 +-
 .../skia/src/views/sdl/SkOSWindow_SDL.cpp     |  442 +-
 .../skia/src/views/unix/SkOSWindow_Unix.cpp   |  161 +-
 .../views/unix/XkeysToSkKeys.h                |    0
 .../{include => src}/views/unix/keysym2ucs.h  |    0
 gfx/skia/skia/src/views/unix/skia_unix.cpp    |    2 +-
 .../skia/src/views/win/SkOSWindow_win.cpp     |  234 +-
 gfx/skia/skia/src/views/win/skia_win.cpp      |  269 +-
 gfx/skia/skia/src/xml/SkBML_XMLParser.cpp     |    2 +-
 gfx/skia/skia/src/xml/SkDOM.cpp               |  158 +-
 gfx/skia/skia/src/xml/SkJS.cpp                |  228 -
 gfx/skia/skia/src/xml/SkJSDisplayable.cpp     |  452 --
 gfx/skia/skia/src/xml/SkXMLParser.cpp         |   17 +-
 gfx/skia/skia/src/xml/SkXMLPullParser.cpp     |   10 +-
 gfx/skia/skia/src/xml/SkXMLWriter.cpp         |   60 +-
 1862 files changed, 166314 insertions(+), 122058 deletions(-)
 create mode 100644 gfx/skia/skia/include/android/SkBRDAllocator.h
 create mode 100644 gfx/skia/skia/include/android/SkBitmapRegionDecoder.h
 create mode 100644 gfx/skia/skia/include/c/sk_canvas.h
 create mode 100644 gfx/skia/skia/include/c/sk_data.h
 create mode 100644 gfx/skia/skia/include/c/sk_image.h
 create mode 100644 gfx/skia/skia/include/c/sk_maskfilter.h
 create mode 100644 gfx/skia/skia/include/c/sk_matrix.h
 create mode 100644 gfx/skia/skia/include/c/sk_paint.h
 create mode 100644 gfx/skia/skia/include/c/sk_path.h
 create mode 100644 gfx/skia/skia/include/c/sk_picture.h
 create mode 100644 gfx/skia/skia/include/c/sk_shader.h
 create mode 100644 gfx/skia/skia/include/c/sk_surface.h
 create mode 100644 gfx/skia/skia/include/c/sk_types.h
 create mode 100644 gfx/skia/skia/include/codec/SkAndroidCodec.h
 create mode 100644 gfx/skia/skia/include/codec/SkCodec.h
 create mode 100644 gfx/skia/skia/include/codec/SkEncodedFormat.h
 delete mode 100644 gfx/skia/skia/include/core/SkDeviceProperties.h
 delete mode 100644 gfx/skia/skia/include/core/SkDrawPictureCallback.h
 create mode 100644 gfx/skia/skia/include/core/SkDrawable.h
 delete mode 100644 gfx/skia/skia/include/core/SkDynamicAnnotations.h
 create mode 100644 gfx/skia/skia/include/core/SkFilterQuality.h
 delete mode 100644 gfx/skia/skia/include/core/SkFlattenableBuffers.h
 rename gfx/skia/skia/include/{ports => core}/SkFontStyle.h (93%)
 delete mode 100644 gfx/skia/skia/include/core/SkInstCnt.h
 create mode 100644 gfx/skia/skia/include/core/SkMultiPictureDraw.h
 delete mode 100644 gfx/skia/skia/include/core/SkPaintOptionsAndroid.h
 delete mode 100644 gfx/skia/skia/include/core/SkPatch.h
 create mode 100644 gfx/skia/skia/include/core/SkPixelSerializer.h
 create mode 100644 gfx/skia/skia/include/core/SkPixmap.h
 create mode 100644 gfx/skia/skia/include/core/SkPngChunkReader.h
 create mode 100644 gfx/skia/skia/include/core/SkPoint3.h
 create mode 100644 gfx/skia/skia/include/core/SkRSXform.h
 create mode 100644 gfx/skia/skia/include/core/SkSurfaceProps.h
 create mode 100644 gfx/skia/skia/include/core/SkTextBlob.h
 delete mode 100644 gfx/skia/skia/include/core/SkThread.h
 create mode 100644 gfx/skia/skia/include/core/SkTraceMemoryDump.h
 create mode 100644 gfx/skia/skia/include/effects/SkArcToPathEffect.h
 delete mode 100644 gfx/skia/skia/include/effects/SkAvoidXfermode.h
 delete mode 100644 gfx/skia/skia/include/effects/SkBitmapSource.h
 create mode 100644 gfx/skia/skia/include/effects/SkColorCubeFilter.h
 create mode 100644 gfx/skia/skia/include/effects/SkImageSource.h
 create mode 100644 gfx/skia/skia/include/effects/SkModeColorFilter.h
 delete mode 100644 gfx/skia/skia/include/effects/SkPorterDuff.h
 delete mode 100644 gfx/skia/skia/include/effects/SkStippleMaskFilter.h
 delete mode 100644 gfx/skia/skia/include/effects/SkTransparentShader.h
 delete mode 100644 gfx/skia/skia/include/gpu/GrBackendEffectFactory.h
 create mode 100644 gfx/skia/skia/include/gpu/GrBlend.h
 create mode 100644 gfx/skia/skia/include/gpu/GrCaps.h
 create mode 100644 gfx/skia/skia/include/gpu/GrClip.h
 delete mode 100644 gfx/skia/skia/include/gpu/GrClipData.h
 delete mode 100644 gfx/skia/skia/include/gpu/GrContextFactory.h
 create mode 100644 gfx/skia/skia/include/gpu/GrContextOptions.h
 create mode 100644 gfx/skia/skia/include/gpu/GrDrawContext.h
 delete mode 100644 gfx/skia/skia/include/gpu/GrDrawEffect.h
 delete mode 100644 gfx/skia/skia/include/gpu/GrEffect.h
 delete mode 100644 gfx/skia/skia/include/gpu/GrEffectStage.h
 delete mode 100644 gfx/skia/skia/include/gpu/GrEffectUnitTest.h
 delete mode 100644 gfx/skia/skia/include/gpu/GrFontScaler.h
 create mode 100644 gfx/skia/skia/include/gpu/GrFragmentProcessor.h
 create mode 100644 gfx/skia/skia/include/gpu/GrGpuResourceRef.h
 create mode 100644 gfx/skia/skia/include/gpu/GrInvariantOutput.h
 create mode 100644 gfx/skia/skia/include/gpu/GrProcessor.h
 create mode 100644 gfx/skia/skia/include/gpu/GrProcessorUnitTest.h
 create mode 100644 gfx/skia/skia/include/gpu/GrProgramElement.h
 create mode 100644 gfx/skia/skia/include/gpu/GrResourceKey.h
 create mode 100644 gfx/skia/skia/include/gpu/GrShaderVar.h
 delete mode 100644 gfx/skia/skia/include/gpu/GrTBackendEffectFactory.h
 create mode 100644 gfx/skia/skia/include/gpu/GrTestUtils.h
 create mode 100644 gfx/skia/skia/include/gpu/GrTextureParams.h
 create mode 100644 gfx/skia/skia/include/gpu/GrTextureProvider.h
 delete mode 100644 gfx/skia/skia/include/gpu/GrUserConfig.h
 create mode 100644 gfx/skia/skia/include/gpu/GrXferProcessor.h
 delete mode 100644 gfx/skia/skia/include/gpu/SkGpuDevice.h
 create mode 100644 gfx/skia/skia/include/gpu/effects/GrConstColorProcessor.h
 create mode 100644 gfx/skia/skia/include/gpu/effects/GrCoverageSetOpXP.h
 create mode 100644 gfx/skia/skia/include/gpu/effects/GrCustomXfermode.h
 create mode 100644 gfx/skia/skia/include/gpu/effects/GrPorterDuffXferProcessor.h
 create mode 100644 gfx/skia/skia/include/gpu/effects/GrXfermodeFragmentProcessor.h
 create mode 100644 gfx/skia/skia/include/gpu/gl/GrGLSLPrettyPrint.h
 create mode 100644 gfx/skia/skia/include/gpu/gl/GrGLTypes.h
 delete mode 100644 gfx/skia/skia/include/gpu/gl/SkANGLEGLContext.h
 delete mode 100644 gfx/skia/skia/include/gpu/gl/SkDebugGLContext.h
 create mode 100644 gfx/skia/skia/include/gpu/gl/SkGLContext.h
 delete mode 100644 gfx/skia/skia/include/gpu/gl/SkGLContextHelper.h
 delete mode 100644 gfx/skia/skia/include/gpu/gl/SkMesaGLContext.h
 delete mode 100644 gfx/skia/skia/include/gpu/gl/SkNativeGLContext.h
 create mode 100644 gfx/skia/skia/include/gpu/gl/angle/SkANGLEGLContext.h
 create mode 100644 gfx/skia/skia/include/gpu/gl/command_buffer/SkCommandBufferGLContext.h
 delete mode 100644 gfx/skia/skia/include/pdf/SkPDFDevice.h
 delete mode 100644 gfx/skia/skia/include/pdf/SkPDFDocument.h
 create mode 100644 gfx/skia/skia/include/ports/SkAtomics_atomic.h
 create mode 100644 gfx/skia/skia/include/ports/SkAtomics_std.h
 create mode 100644 gfx/skia/skia/include/ports/SkAtomics_sync.h
 create mode 100644 gfx/skia/skia/include/ports/SkFontMgr_android.h
 create mode 100644 gfx/skia/skia/include/ports/SkFontMgr_custom.h
 create mode 100644 gfx/skia/skia/include/ports/SkFontMgr_fontconfig.h
 delete mode 100644 gfx/skia/skia/include/ports/SkTypeface_android.h
 create mode 100644 gfx/skia/skia/include/private/SkAtomics.h
 create mode 100644 gfx/skia/skia/include/private/SkChecksum.h
 rename gfx/skia/skia/include/{core => private}/SkFloatBits.h (98%)
 rename gfx/skia/skia/include/{core => private}/SkFloatingPoint.h (60%)
 create mode 100644 gfx/skia/skia/include/private/SkGpuFenceSync.h
 create mode 100644 gfx/skia/skia/include/private/SkMiniRecorder.h
 create mode 100644 gfx/skia/skia/include/private/SkMutex.h
 rename gfx/skia/skia/include/{core => private}/SkOnce.h (70%)
 create mode 100644 gfx/skia/skia/include/private/SkOncePtr.h
 create mode 100644 gfx/skia/skia/include/private/SkRecords.h
 create mode 100644 gfx/skia/skia/include/private/SkSemaphore.h
 create mode 100644 gfx/skia/skia/include/private/SkSpinlock.h
 create mode 100644 gfx/skia/skia/include/private/SkTHash.h
 create mode 100644 gfx/skia/skia/include/private/SkTLogic.h
 rename gfx/skia/skia/include/{core => private}/SkTemplates.h (69%)
 create mode 100644 gfx/skia/skia/include/private/SkThreadID.h
 create mode 100644 gfx/skia/skia/include/private/SkUniquePtr.h
 create mode 100644 gfx/skia/skia/include/private/SkUtility.h
 rename gfx/skia/skia/include/{core => private}/SkWeakRefCnt.h (97%)
 delete mode 100644 gfx/skia/skia/include/record/SkRecording.h
 create mode 100644 gfx/skia/skia/include/svg/SkSVGCanvas.h
 rename gfx/skia/skia/include/svg/{ => parser}/SkSVGAttribute.h (86%)
 rename gfx/skia/skia/include/svg/{ => parser}/SkSVGBase.h (100%)
 rename gfx/skia/skia/include/svg/{ => parser}/SkSVGPaintState.h (100%)
 rename gfx/skia/skia/include/svg/{ => parser}/SkSVGParser.h (99%)
 rename gfx/skia/skia/include/svg/{ => parser}/SkSVGTypes.h (100%)
 delete mode 100644 gfx/skia/skia/include/utils/SkCondVar.h
 delete mode 100644 gfx/skia/skia/include/utils/SkDeferredCanvas.h
 create mode 100644 gfx/skia/skia/include/utils/SkPaintFilterCanvas.h
 delete mode 100644 gfx/skia/skia/include/utils/SkPathUtils.h
 delete mode 100644 gfx/skia/skia/include/utils/SkProxyCanvas.h
 delete mode 100644 gfx/skia/skia/include/utils/SkRunnable.h
 rename gfx/skia/skia/include/{views => utils}/SkTextBox.h (86%)
 delete mode 100644 gfx/skia/skia/include/utils/SkThreadPool.h
 delete mode 100644 gfx/skia/skia/include/utils/ios/SkStream_NSData.h
 delete mode 100644 gfx/skia/skia/include/views/SkOSWindow_NaCl.h
 delete mode 100644 gfx/skia/skia/include/views/android/AndroidKeyToSkKey.h
 delete mode 100644 gfx/skia/skia/include/xml/SkJS.h
 create mode 100644 gfx/skia/skia/src/android/SkBitmapRegionCanvas.cpp
 create mode 100644 gfx/skia/skia/src/android/SkBitmapRegionCanvas.h
 create mode 100644 gfx/skia/skia/src/android/SkBitmapRegionCodec.cpp
 create mode 100644 gfx/skia/skia/src/android/SkBitmapRegionCodec.h
 create mode 100644 gfx/skia/skia/src/android/SkBitmapRegionDecoder.cpp
 create mode 100644 gfx/skia/skia/src/android/SkBitmapRegionDecoderPriv.h
 rename gfx/skia/skia/src/animator/{SkDrawable.cpp => SkADrawable.cpp} (51%)
 rename gfx/skia/skia/src/animator/{SkDrawable.h => SkADrawable.h} (79%)
 delete mode 100644 gfx/skia/skia/src/animator/SkDrawTransparentShader.cpp
 delete mode 100644 gfx/skia/skia/src/animator/SkDrawTransparentShader.h
 create mode 100644 gfx/skia/skia/src/c/sk_c_from_to.h
 create mode 100644 gfx/skia/skia/src/c/sk_paint.cpp
 create mode 100644 gfx/skia/skia/src/c/sk_surface.cpp
 create mode 100644 gfx/skia/skia/src/c/sk_types_priv.h
 create mode 100644 gfx/skia/skia/src/codec/SkAndroidCodec.cpp
 create mode 100644 gfx/skia/skia/src/codec/SkBmpCodec.cpp
 create mode 100644 gfx/skia/skia/src/codec/SkBmpCodec.h
 create mode 100644 gfx/skia/skia/src/codec/SkBmpMaskCodec.cpp
 create mode 100644 gfx/skia/skia/src/codec/SkBmpMaskCodec.h
 create mode 100644 gfx/skia/skia/src/codec/SkBmpRLECodec.cpp
 create mode 100644 gfx/skia/skia/src/codec/SkBmpRLECodec.h
 create mode 100644 gfx/skia/skia/src/codec/SkBmpStandardCodec.cpp
 create mode 100644 gfx/skia/skia/src/codec/SkBmpStandardCodec.h
 create mode 100644 gfx/skia/skia/src/codec/SkCodec.cpp
 create mode 100644 gfx/skia/skia/src/codec/SkCodecPriv.h
 create mode 100644 gfx/skia/skia/src/codec/SkCodec_libgif.cpp
 create mode 100644 gfx/skia/skia/src/codec/SkCodec_libgif.h
 create mode 100644 gfx/skia/skia/src/codec/SkCodec_libico.cpp
 create mode 100644 gfx/skia/skia/src/codec/SkCodec_libico.h
 create mode 100644 gfx/skia/skia/src/codec/SkCodec_libpng.cpp
 create mode 100644 gfx/skia/skia/src/codec/SkCodec_libpng.h
 create mode 100644 gfx/skia/skia/src/codec/SkCodec_wbmp.cpp
 create mode 100644 gfx/skia/skia/src/codec/SkCodec_wbmp.h
 create mode 100644 gfx/skia/skia/src/codec/SkJpegCodec.cpp
 create mode 100644 gfx/skia/skia/src/codec/SkJpegCodec.h
 create mode 100644 gfx/skia/skia/src/codec/SkJpegDecoderMgr.cpp
 create mode 100644 gfx/skia/skia/src/codec/SkJpegDecoderMgr.h
 create mode 100644 gfx/skia/skia/src/codec/SkJpegUtility_codec.cpp
 create mode 100644 gfx/skia/skia/src/codec/SkJpegUtility_codec.h
 create mode 100644 gfx/skia/skia/src/codec/SkMaskSwizzler.cpp
 create mode 100644 gfx/skia/skia/src/codec/SkMaskSwizzler.h
 create mode 100644 gfx/skia/skia/src/codec/SkMasks.cpp
 create mode 100644 gfx/skia/skia/src/codec/SkMasks.h
 create mode 100644 gfx/skia/skia/src/codec/SkSampledCodec.cpp
 create mode 100644 gfx/skia/skia/src/codec/SkSampledCodec.h
 create mode 100644 gfx/skia/skia/src/codec/SkSampler.cpp
 create mode 100644 gfx/skia/skia/src/codec/SkSampler.h
 create mode 100644 gfx/skia/skia/src/codec/SkSwizzler.cpp
 create mode 100644 gfx/skia/skia/src/codec/SkSwizzler.h
 create mode 100644 gfx/skia/skia/src/codec/SkWebpAdapterCodec.cpp
 create mode 100644 gfx/skia/skia/src/codec/SkWebpAdapterCodec.h
 create mode 100644 gfx/skia/skia/src/codec/SkWebpCodec.cpp
 create mode 100644 gfx/skia/skia/src/codec/SkWebpCodec.h
 create mode 100644 gfx/skia/skia/src/core/Sk4px.h
 rename gfx/skia/skia/{include => src}/core/SkAdvancedTypefaceMetrics.h (86%)
 delete mode 100644 gfx/skia/skia/src/core/SkBBoxHierarchyRecord.cpp
 delete mode 100644 gfx/skia/skia/src/core/SkBBoxHierarchyRecord.h
 delete mode 100644 gfx/skia/skia/src/core/SkBBoxRecord.cpp
 delete mode 100644 gfx/skia/skia/src/core/SkBBoxRecord.h
 create mode 100644 gfx/skia/skia/src/core/SkBigPicture.cpp
 create mode 100644 gfx/skia/skia/src/core/SkBigPicture.h
 create mode 100644 gfx/skia/skia/src/core/SkBitmapCache.cpp
 create mode 100644 gfx/skia/skia/src/core/SkBitmapCache.h
 create mode 100644 gfx/skia/skia/src/core/SkBitmapController.cpp
 create mode 100644 gfx/skia/skia/src/core/SkBitmapController.h
 create mode 100644 gfx/skia/skia/src/core/SkBitmapProvider.cpp
 create mode 100644 gfx/skia/skia/src/core/SkBitmapProvider.h
 delete mode 100644 gfx/skia/skia/src/core/SkBitmap_scroll.cpp
 create mode 100644 gfx/skia/skia/src/core/SkCachedData.cpp
 create mode 100644 gfx/skia/skia/src/core/SkCachedData.h
 create mode 100644 gfx/skia/skia/src/core/SkCanvasPriv.h
 create mode 100644 gfx/skia/skia/src/core/SkChecksum.cpp
 delete mode 100644 gfx/skia/skia/src/core/SkChecksum.h
 rename gfx/skia/skia/{include => src}/core/SkColorShader.h (52%)
 delete mode 100644 gfx/skia/skia/src/core/SkDeviceImageFilterProxy.h
 create mode 100644 gfx/skia/skia/src/core/SkDrawable.cpp
 rename gfx/skia/skia/{include => src}/core/SkEndian.h (97%)
 create mode 100644 gfx/skia/skia/src/core/SkFindAndPlaceGlyph.h
 delete mode 100644 gfx/skia/skia/src/core/SkFlate.cpp
 delete mode 100644 gfx/skia/skia/src/core/SkFlate.h
 delete mode 100644 gfx/skia/skia/src/core/SkFloat.cpp
 delete mode 100644 gfx/skia/skia/src/core/SkFloat.h
 create mode 100644 gfx/skia/skia/src/core/SkFontMgr.cpp
 create mode 100644 gfx/skia/skia/src/core/SkFontStyle.cpp
 create mode 100644 gfx/skia/skia/src/core/SkForceCPlusPlusLinking.cpp
 mode change 100755 => 100644 gfx/skia/skia/src/core/SkGlyphCache.cpp
 create mode 100644 gfx/skia/skia/src/core/SkHalf.cpp
 create mode 100644 gfx/skia/skia/src/core/SkHalf.h
 create mode 100644 gfx/skia/skia/src/core/SkImageCacherator.cpp
 create mode 100644 gfx/skia/skia/src/core/SkImageCacherator.h
 create mode 100644 gfx/skia/skia/src/core/SkLayerInfo.h
 delete mode 100644 gfx/skia/skia/src/core/SkLazyFnPtr.h
 delete mode 100644 gfx/skia/skia/src/core/SkLazyPtr.h
 create mode 100644 gfx/skia/skia/src/core/SkLight.h
 create mode 100644 gfx/skia/skia/src/core/SkLightingShader.cpp
 create mode 100644 gfx/skia/skia/src/core/SkLightingShader.h
 create mode 100644 gfx/skia/skia/src/core/SkLocalMatrixImageFilter.cpp
 create mode 100644 gfx/skia/skia/src/core/SkLocalMatrixImageFilter.h
 create mode 100644 gfx/skia/skia/src/core/SkMaskCache.cpp
 create mode 100644 gfx/skia/skia/src/core/SkMaskCache.h
 delete mode 100644 gfx/skia/skia/src/core/SkMatrixClipStateMgr.cpp
 delete mode 100644 gfx/skia/skia/src/core/SkMatrixClipStateMgr.h
 rename gfx/skia/skia/src/{effects => core}/SkMatrixImageFilter.cpp (64%)
 rename gfx/skia/skia/{include/effects => src/core}/SkMatrixImageFilter.h (71%)
 create mode 100644 gfx/skia/skia/src/core/SkMiniRecorder.cpp
 create mode 100644 gfx/skia/skia/src/core/SkMultiPictureDraw.cpp
 create mode 100644 gfx/skia/skia/src/core/SkNextID.h
 create mode 100644 gfx/skia/skia/src/core/SkNinePatchIter.cpp
 create mode 100644 gfx/skia/skia/src/core/SkNinePatchIter.h
 create mode 100644 gfx/skia/skia/src/core/SkNx.h
 create mode 100644 gfx/skia/skia/src/core/SkOpts.cpp
 create mode 100644 gfx/skia/skia/src/core/SkOpts.h
 delete mode 100644 gfx/skia/skia/src/core/SkPaintOptionsAndroid.cpp
 delete mode 100644 gfx/skia/skia/src/core/SkPatch.cpp
 delete mode 100644 gfx/skia/skia/src/core/SkPathHeap.cpp
 delete mode 100644 gfx/skia/skia/src/core/SkPathHeap.h
 create mode 100644 gfx/skia/skia/src/core/SkPathPriv.h
 create mode 100644 gfx/skia/skia/src/core/SkPictureCommon.h
 create mode 100644 gfx/skia/skia/src/core/SkPictureContentInfo.cpp
 create mode 100644 gfx/skia/skia/src/core/SkPictureContentInfo.h
 create mode 100644 gfx/skia/skia/src/core/SkPictureImageGenerator.cpp
 delete mode 100644 gfx/skia/skia/src/core/SkPictureRangePlayback.cpp
 delete mode 100644 gfx/skia/skia/src/core/SkPictureRangePlayback.h
 delete mode 100644 gfx/skia/skia/src/core/SkPictureReplacementPlayback.cpp
 delete mode 100644 gfx/skia/skia/src/core/SkPictureReplacementPlayback.h
 delete mode 100644 gfx/skia/skia/src/core/SkPictureStateTree.cpp
 delete mode 100644 gfx/skia/skia/src/core/SkPictureStateTree.h
 create mode 100644 gfx/skia/skia/src/core/SkPixmap.cpp
 create mode 100644 gfx/skia/skia/src/core/SkPoint3.cpp
 delete mode 100644 gfx/skia/skia/src/core/SkProcSpriteBlitter.cpp
 create mode 100644 gfx/skia/skia/src/core/SkPx.h
 delete mode 100644 gfx/skia/skia/src/core/SkQuadTree.cpp
 delete mode 100644 gfx/skia/skia/src/core/SkQuadTree.h
 create mode 100644 gfx/skia/skia/src/core/SkRWBuffer.cpp
 create mode 100644 gfx/skia/skia/src/core/SkRWBuffer.h
 rename gfx/skia/skia/{include => src}/core/SkReadBuffer.h (92%)
 rename gfx/skia/skia/{include => src}/core/SkReader32.h (88%)
 create mode 100644 gfx/skia/skia/src/core/SkRecord.cpp
 delete mode 100644 gfx/skia/skia/src/core/SkRecordAnalysis.cpp
 delete mode 100644 gfx/skia/skia/src/core/SkRecordAnalysis.h
 delete mode 100644 gfx/skia/skia/src/core/SkRecording.cpp
 create mode 100644 gfx/skia/skia/src/core/SkRecords.cpp
 delete mode 100644 gfx/skia/skia/src/core/SkRecords.h
 create mode 100644 gfx/skia/skia/src/core/SkRemote.cpp
 create mode 100644 gfx/skia/skia/src/core/SkRemote.h
 create mode 100644 gfx/skia/skia/src/core/SkRemote_protocol.h
 create mode 100644 gfx/skia/skia/src/core/SkResourceCache.cpp
 create mode 100644 gfx/skia/skia/src/core/SkResourceCache.h
 delete mode 100644 gfx/skia/skia/src/core/SkScaledImageCache.cpp
 delete mode 100644 gfx/skia/skia/src/core/SkScaledImageCache.h
 create mode 100644 gfx/skia/skia/src/core/SkSemaphore.cpp
 create mode 100644 gfx/skia/skia/src/core/SkSharedMutex.cpp
 create mode 100644 gfx/skia/skia/src/core/SkSharedMutex.h
 delete mode 100644 gfx/skia/skia/src/core/SkSinTable.h
 create mode 100644 gfx/skia/skia/src/core/SkSpinlock.cpp
 create mode 100644 gfx/skia/skia/src/core/SkSurfacePriv.h
 create mode 100644 gfx/skia/skia/src/core/SkTDPQueue.h
 delete mode 100644 gfx/skia/skia/src/core/SkTInternalSList.h
 delete mode 100644 gfx/skia/skia/src/core/SkTObjectPool.h
 delete mode 100644 gfx/skia/skia/src/core/SkTRefArray.h
 create mode 100644 gfx/skia/skia/src/core/SkTTopoSort.h
 create mode 100644 gfx/skia/skia/src/core/SkTaskGroup.cpp
 create mode 100644 gfx/skia/skia/src/core/SkTaskGroup.h
 create mode 100644 gfx/skia/skia/src/core/SkTextBlob.cpp
 create mode 100644 gfx/skia/skia/src/core/SkTextBlobRunIterator.h
 create mode 100644 gfx/skia/skia/src/core/SkThreadID.cpp
 delete mode 100644 gfx/skia/skia/src/core/SkThreadPriv.h
 delete mode 100644 gfx/skia/skia/src/core/SkTileGrid.cpp
 delete mode 100644 gfx/skia/skia/src/core/SkTileGrid.h
 create mode 100644 gfx/skia/skia/src/core/SkTime.cpp
 create mode 100644 gfx/skia/skia/src/core/SkTraceEventCommon.h
 create mode 100644 gfx/skia/skia/src/core/SkVarAlloc.cpp
 create mode 100644 gfx/skia/skia/src/core/SkVarAlloc.h
 create mode 100644 gfx/skia/skia/src/core/SkXfermodeInterpretation.cpp
 create mode 100644 gfx/skia/skia/src/core/SkXfermodeInterpretation.h
 create mode 100644 gfx/skia/skia/src/core/SkYUVPlanesCache.cpp
 create mode 100644 gfx/skia/skia/src/core/SkYUVPlanesCache.h
 create mode 100644 gfx/skia/skia/src/doc/SkDocument_PDF_None.cpp
 create mode 100644 gfx/skia/skia/src/doc/SkDocument_XPS.cpp
 create mode 100644 gfx/skia/skia/src/doc/SkDocument_XPS_None.cpp
 create mode 100644 gfx/skia/skia/src/effects/GrCircleBlurFragmentProcessor.cpp
 create mode 100644 gfx/skia/skia/src/effects/GrCircleBlurFragmentProcessor.h
 create mode 100644 gfx/skia/skia/src/effects/SkArcToPathEffect.cpp
 create mode 100644 gfx/skia/skia/src/effects/SkArithmeticMode_gpu.cpp
 create mode 100644 gfx/skia/skia/src/effects/SkArithmeticMode_gpu.h
 delete mode 100644 gfx/skia/skia/src/effects/SkAvoidXfermode.cpp
 delete mode 100644 gfx/skia/skia/src/effects/SkBitmapSource.cpp
 create mode 100644 gfx/skia/skia/src/effects/SkColorCubeFilter.cpp
 mode change 100755 => 100644 gfx/skia/skia/src/effects/SkColorFilterImageFilter.cpp
 create mode 100644 gfx/skia/skia/src/effects/SkImageSource.cpp
 delete mode 100644 gfx/skia/skia/src/effects/SkPorterDuff.cpp
 delete mode 100644 gfx/skia/skia/src/effects/SkStippleMaskFilter.cpp
 delete mode 100644 gfx/skia/skia/src/effects/SkTransparentShader.cpp
 rename gfx/skia/skia/src/effects/gradients/{SkBitmapCache.cpp => SkGradientBitmapCache.cpp} (75%)
 rename gfx/skia/skia/src/effects/gradients/{SkBitmapCache.h => SkGradientBitmapCache.h} (69%)
 delete mode 100644 gfx/skia/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp
 delete mode 100644 gfx/skia/skia/src/effects/gradients/SkTwoPointRadialGradient.h
 create mode 100644 gfx/skia/skia/src/fonts/SkRandomScalerContext.cpp
 create mode 100644 gfx/skia/skia/src/fonts/SkRandomScalerContext.h
 delete mode 100644 gfx/skia/skia/src/gpu/GrAAConvexPathRenderer.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/GrAAConvexPathRenderer.h
 delete mode 100644 gfx/skia/skia/src/gpu/GrAAHairLinePathRenderer.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/GrAAHairLinePathRenderer.h
 delete mode 100644 gfx/skia/skia/src/gpu/GrAARectRenderer.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/GrAARectRenderer.h
 delete mode 100644 gfx/skia/skia/src/gpu/GrAddPathRenderers_default.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/GrAllocPool.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/GrAllocPool.h
 delete mode 100644 gfx/skia/skia/src/gpu/GrAtlas.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/GrAtlas.h
 create mode 100644 gfx/skia/skia/src/gpu/GrAtlasTextBlob.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrAtlasTextBlob.h
 create mode 100644 gfx/skia/skia/src/gpu/GrAtlasTextContext.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrAtlasTextContext.h
 create mode 100644 gfx/skia/skia/src/gpu/GrAutoLocaleSetter.h
 create mode 100644 gfx/skia/skia/src/gpu/GrBatchAtlas.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrBatchAtlas.h
 create mode 100644 gfx/skia/skia/src/gpu/GrBatchFlushState.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrBatchFlushState.h
 create mode 100644 gfx/skia/skia/src/gpu/GrBatchFontCache.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrBatchFontCache.h
 create mode 100644 gfx/skia/skia/src/gpu/GrBatchTest.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrBatchTest.h
 delete mode 100644 gfx/skia/skia/src/gpu/GrBinHashKey.h
 delete mode 100755 gfx/skia/skia/src/gpu/GrBitmapTextContext.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/GrBitmapTextContext.h
 delete mode 100644 gfx/skia/skia/src/gpu/GrBlend.h
 create mode 100644 gfx/skia/skia/src/gpu/GrBlurUtils.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrBlurUtils.h
 delete mode 100644 gfx/skia/skia/src/gpu/GrCacheID.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrCaps.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrClip.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/GrClipData.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/GrClipMaskCache.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/GrClipMaskCache.h
 mode change 100755 => 100644 gfx/skia/skia/src/gpu/GrContext.cpp
 create mode 100755 gfx/skia/skia/src/gpu/GrContextFactory.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrContextFactory.h
 create mode 100644 gfx/skia/skia/src/gpu/GrCoordTransform.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrDefaultGeoProcFactory.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrDefaultGeoProcFactory.h
 delete mode 100644 gfx/skia/skia/src/gpu/GrDefaultPathRenderer.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/GrDefaultPathRenderer.h
 delete mode 100755 gfx/skia/skia/src/gpu/GrDistanceFieldTextContext.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/GrDistanceFieldTextContext.h
 create mode 100644 gfx/skia/skia/src/gpu/GrDrawContext.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/GrDrawState.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/GrDrawState.h
 delete mode 100644 gfx/skia/skia/src/gpu/GrDrawTargetCaps.h
 create mode 100644 gfx/skia/skia/src/gpu/GrDrawingManager.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrDrawingManager.h
 delete mode 100644 gfx/skia/skia/src/gpu/GrEffect.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrFontScaler.h
 create mode 100644 gfx/skia/skia/src/gpu/GrFragmentProcessor.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrGeometryProcessor.h
 rename gfx/skia/skia/{include => src}/gpu/GrGlyph.h (62%)
 create mode 100644 gfx/skia/skia/src/gpu/GrGpuFactory.h
 create mode 100644 gfx/skia/skia/src/gpu/GrGpuResourceCacheAccess.h
 create mode 100644 gfx/skia/skia/src/gpu/GrGpuResourcePriv.h
 create mode 100644 gfx/skia/skia/src/gpu/GrGpuResourceRef.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrImageIDTextureAdjuster.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrImageIDTextureAdjuster.h
 delete mode 100644 gfx/skia/skia/src/gpu/GrInOrderDrawBuffer.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/GrInOrderDrawBuffer.h
 create mode 100644 gfx/skia/skia/src/gpu/GrInvariantOutput.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrLayerAtlas.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrLayerAtlas.h
 create mode 100644 gfx/skia/skia/src/gpu/GrLayerHoister.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrLayerHoister.h
 create mode 100644 gfx/skia/skia/src/gpu/GrNonAtomicRef.h
 delete mode 100644 gfx/skia/skia/src/gpu/GrOrderedSet.h
 create mode 100644 gfx/skia/skia/src/gpu/GrPathProcessor.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrPathProcessor.h
 create mode 100644 gfx/skia/skia/src/gpu/GrPathRange.cpp
 rename gfx/skia/skia/{include => src}/gpu/GrPathRendererChain.h (70%)
 create mode 100644 gfx/skia/skia/src/gpu/GrPathRendering.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrPathRendering.h
 create mode 100644 gfx/skia/skia/src/gpu/GrPendingProgramElement.h
 delete mode 100644 gfx/skia/skia/src/gpu/GrPictureUtils.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/GrPictureUtils.h
 create mode 100644 gfx/skia/skia/src/gpu/GrPipeline.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrPipeline.h
 create mode 100644 gfx/skia/skia/src/gpu/GrPipelineBuilder.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrPipelineBuilder.h
 delete mode 100644 gfx/skia/skia/src/gpu/GrPlotMgr.h
 create mode 100644 gfx/skia/skia/src/gpu/GrPrimitiveProcessor.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrPrimitiveProcessor.h
 create mode 100644 gfx/skia/skia/src/gpu/GrProcOptInfo.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrProcOptInfo.h
 create mode 100644 gfx/skia/skia/src/gpu/GrProcessor.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrProcessorUnitTest.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrProgramDesc.h
 create mode 100644 gfx/skia/skia/src/gpu/GrProgramElement.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrQuad.h
 create mode 100644 gfx/skia/skia/src/gpu/GrRecordReplaceDraw.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrRecordReplaceDraw.h
 mode change 100755 => 100644 gfx/skia/skia/src/gpu/GrRectanizer_skyline.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/GrRedBlackTree.h
 create mode 100644 gfx/skia/skia/src/gpu/GrRenderTargetPriv.h
 create mode 100644 gfx/skia/skia/src/gpu/GrResourceProvider.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrResourceProvider.h
 delete mode 100644 gfx/skia/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/GrStencilAndCoverPathRenderer.h
 create mode 100644 gfx/skia/skia/src/gpu/GrStencilAttachment.cpp
 rename gfx/skia/skia/src/gpu/{GrStencilBuffer.h => GrStencilAttachment.h} (72%)
 delete mode 100644 gfx/skia/skia/src/gpu/GrStencilBuffer.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrStrokeInfo.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrSurfacePriv.h
 delete mode 100644 gfx/skia/skia/src/gpu/GrTBSearch.h
 delete mode 100644 gfx/skia/skia/src/gpu/GrTHashTable.h
 create mode 100644 gfx/skia/skia/src/gpu/GrTRecorder.h
 delete mode 100644 gfx/skia/skia/src/gpu/GrTemplates.h
 create mode 100644 gfx/skia/skia/src/gpu/GrTestUtils.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrTextBlobCache.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrTextBlobCache.h
 delete mode 100644 gfx/skia/skia/src/gpu/GrTextStrike.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/GrTextStrike.h
 delete mode 100644 gfx/skia/skia/src/gpu/GrTextStrike_impl.h
 create mode 100644 gfx/skia/skia/src/gpu/GrTextureParamsAdjuster.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrTextureParamsAdjuster.h
 create mode 100644 gfx/skia/skia/src/gpu/GrTexturePriv.h
 create mode 100644 gfx/skia/skia/src/gpu/GrTextureProvider.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrVertices.h
 create mode 100644 gfx/skia/skia/src/gpu/GrXferProcessor.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrYUVProvider.cpp
 create mode 100644 gfx/skia/skia/src/gpu/GrYUVProvider.h
 create mode 100644 gfx/skia/skia/src/gpu/SkGpuDevice.h
 create mode 100644 gfx/skia/skia/src/gpu/SkGpuDevice_drawTexture.cpp
 create mode 100644 gfx/skia/skia/src/gpu/SkGrPriv.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrAAConvexPathRenderer.cpp
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrAAConvexPathRenderer.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrAAConvexTessellator.cpp
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrAAConvexTessellator.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrAADistanceFieldPathRenderer.cpp
 create mode 100755 gfx/skia/skia/src/gpu/batches/GrAADistanceFieldPathRenderer.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrAAFillRectBatch.cpp
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrAAFillRectBatch.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrAAHairLinePathRenderer.cpp
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrAAHairLinePathRenderer.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrAALinearizingConvexPathRenderer.cpp
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrAALinearizingConvexPathRenderer.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrAAStrokeRectBatch.cpp
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrAAStrokeRectBatch.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrAtlasTextBatch.cpp
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrAtlasTextBatch.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrBatch.cpp
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrBatch.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrClearBatch.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrCopySurfaceBatch.cpp
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrCopySurfaceBatch.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrDashLinePathRenderer.cpp
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrDashLinePathRenderer.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrDefaultPathRenderer.cpp
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrDefaultPathRenderer.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrDiscardBatch.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrDrawAtlasBatch.cpp
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrDrawAtlasBatch.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrDrawBatch.cpp
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrDrawBatch.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrDrawPathBatch.cpp
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrDrawPathBatch.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrDrawVerticesBatch.cpp
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrDrawVerticesBatch.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrNinePatch.cpp
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrNinePatch.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrNonAAFillRectBatch.cpp
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrNonAAFillRectBatch.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrNonAAStrokeRectBatch.cpp
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrNonAAStrokeRectBatch.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrRectBatchFactory.cpp
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrRectBatchFactory.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrStencilAndCoverPathRenderer.cpp
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrStencilAndCoverPathRenderer.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrStencilPathBatch.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrTInstanceBatch.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrTessellatingPathRenderer.cpp
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrTessellatingPathRenderer.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrTestBatch.h
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrVertexBatch.cpp
 create mode 100644 gfx/skia/skia/src/gpu/batches/GrVertexBatch.h
 create mode 100644 gfx/skia/skia/src/gpu/effects/GrBitmapTextGeoProc.cpp
 create mode 100644 gfx/skia/skia/src/gpu/effects/GrBitmapTextGeoProc.h
 create mode 100644 gfx/skia/skia/src/gpu/effects/GrConstColorProcessor.cpp
 create mode 100644 gfx/skia/skia/src/gpu/effects/GrCoverageSetOpXP.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/effects/GrCustomCoordsTextureEffect.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/effects/GrCustomCoordsTextureEffect.h
 create mode 100644 gfx/skia/skia/src/gpu/effects/GrCustomXfermode.cpp
 create mode 100644 gfx/skia/skia/src/gpu/effects/GrDisableColorXP.cpp
 create mode 100644 gfx/skia/skia/src/gpu/effects/GrDisableColorXP.h
 create mode 100644 gfx/skia/skia/src/gpu/effects/GrDistanceFieldGeoProc.cpp
 create mode 100644 gfx/skia/skia/src/gpu/effects/GrDistanceFieldGeoProc.h
 delete mode 100755 gfx/skia/skia/src/gpu/effects/GrDistanceFieldTextureEffect.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/effects/GrDistanceFieldTextureEffect.h
 create mode 100644 gfx/skia/skia/src/gpu/effects/GrPorterDuffXferProcessor.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/effects/GrVertexEffect.h
 create mode 100644 gfx/skia/skia/src/gpu/effects/GrXfermodeFragmentProcessor.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/gl/GrGLAssembleGLESInterface.h
 delete mode 100644 gfx/skia/skia/src/gpu/gl/GrGLEffect.h
 create mode 100755 gfx/skia/skia/src/gpu/gl/GrGLGLSL.cpp
 create mode 100755 gfx/skia/skia/src/gpu/gl/GrGLGLSL.h
 create mode 100644 gfx/skia/skia/src/gpu/gl/GrGLGpu.cpp
 create mode 100644 gfx/skia/skia/src/gpu/gl/GrGLGpu.h
 create mode 100644 gfx/skia/skia/src/gpu/gl/GrGLGpuProgramCache.cpp
 create mode 100644 gfx/skia/skia/src/gpu/gl/GrGLPathRendering.cpp
 create mode 100644 gfx/skia/skia/src/gpu/gl/GrGLPathRendering.h
 create mode 100644 gfx/skia/skia/src/gpu/gl/GrGLProgramDataManager.cpp
 create mode 100644 gfx/skia/skia/src/gpu/gl/GrGLProgramDataManager.h
 delete mode 100644 gfx/skia/skia/src/gpu/gl/GrGLProgramEffects.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/gl/GrGLProgramEffects.h
 delete mode 100644 gfx/skia/skia/src/gpu/gl/GrGLSL.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/gl/GrGLShaderBuilder.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/gl/GrGLShaderBuilder.h
 create mode 100644 gfx/skia/skia/src/gpu/gl/GrGLStencilAttachment.cpp
 rename gfx/skia/skia/src/gpu/gl/{GrGLStencilBuffer.h => GrGLStencilAttachment.h} (53%)
 delete mode 100644 gfx/skia/skia/src/gpu/gl/GrGLStencilBuffer.cpp
 create mode 100644 gfx/skia/skia/src/gpu/gl/GrGLTextureRenderTarget.cpp
 create mode 100644 gfx/skia/skia/src/gpu/gl/GrGLTextureRenderTarget.h
 delete mode 100644 gfx/skia/skia/src/gpu/gl/GrGLUniformHandle.h
 delete mode 100644 gfx/skia/skia/src/gpu/gl/GrGLUniformManager.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/gl/GrGLUniformManager.h
 create mode 100644 gfx/skia/skia/src/gpu/gl/GrGLVaryingHandler.cpp
 create mode 100644 gfx/skia/skia/src/gpu/gl/GrGLVaryingHandler.h
 delete mode 100644 gfx/skia/skia/src/gpu/gl/GrGLVertexEffect.h
 delete mode 100644 gfx/skia/skia/src/gpu/gl/GrGpuGL.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/gl/GrGpuGL.h
 delete mode 100644 gfx/skia/skia/src/gpu/gl/GrGpuGL_program.cpp
 create mode 100644 gfx/skia/skia/src/gpu/gl/SkGLContext.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/gl/SkGLContextHelper.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/gl/android/SkNativeGLContext_android.cpp
 create mode 100644 gfx/skia/skia/src/gpu/gl/builders/GrGLProgramBuilder.cpp
 create mode 100644 gfx/skia/skia/src/gpu/gl/builders/GrGLProgramBuilder.h
 create mode 100644 gfx/skia/skia/src/gpu/gl/builders/GrGLSLPrettyPrint.cpp
 create mode 100644 gfx/skia/skia/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp
 create mode 100644 gfx/skia/skia/src/gpu/gl/builders/GrGLShaderStringBuilder.h
 create mode 100644 gfx/skia/skia/src/gpu/gl/command_buffer/SkCommandBufferGLContext.cpp
 create mode 100644 gfx/skia/skia/src/gpu/gl/debug/SkDebugGLContext.h
 create mode 100644 gfx/skia/skia/src/gpu/gl/egl/GrGLCreateNativeInterface_egl.cpp
 create mode 100644 gfx/skia/skia/src/gpu/gl/egl/SkCreatePlatformGLContext_egl.cpp
 create mode 100644 gfx/skia/skia/src/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp
 rename gfx/skia/skia/src/gpu/gl/{unix/SkNativeGLContext_unix.cpp => glx/SkCreatePlatformGLContext_glx.cpp} (57%)
 create mode 100644 gfx/skia/skia/src/gpu/gl/iOS/SkCreatePlatformGLContext_iOS.mm
 delete mode 100644 gfx/skia/skia/src/gpu/gl/iOS/SkNativeGLContext_iOS.mm
 create mode 100644 gfx/skia/skia/src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/gl/mac/SkNativeGLContext_mac.cpp
 create mode 100644 gfx/skia/skia/src/gpu/gl/mesa/SkMesaGLContext.h
 rename gfx/skia/skia/src/{utils/SkThreadUtils_pthread_other.cpp => gpu/gl/nacl/SkCreatePlatformGLContext_nacl.cpp} (55%)
 delete mode 100644 gfx/skia/skia/src/gpu/gl/nacl/SkNativeGLContext_nacl.cpp
 delete mode 100644 gfx/skia/skia/src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp
 rename gfx/skia/skia/src/gpu/gl/win/{SkNativeGLContext_win.cpp => SkCreatePlatformGLContext_win.cpp} (58%)
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSL.cpp
 rename gfx/skia/skia/src/gpu/{gl => glsl}/GrGLSL.h (86%)
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLBlend.cpp
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLBlend.h
 create mode 100755 gfx/skia/skia/src/gpu/glsl/GrGLSLCaps.cpp
 create mode 100755 gfx/skia/skia/src/gpu/glsl/GrGLSLCaps.h
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLFragmentProcessor.cpp
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLFragmentProcessor.h
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLGeometryProcessor.cpp
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLGeometryProcessor.h
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLGeometryShaderBuilder.cpp
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLGeometryShaderBuilder.h
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLPrimitiveProcessor.h
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLProcessorTypes.h
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLProgramBuilder.cpp
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLProgramBuilder.h
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLProgramDataManager.h
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLShaderBuilder.cpp
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLShaderBuilder.h
 rename gfx/skia/skia/src/gpu/{gl/GrGLShaderVar.h => glsl/GrGLSLShaderVar.h} (53%)
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLTextureSampler.h
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLUtil.cpp
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLUtil.h
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLVarying.cpp
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLVarying.h
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLVertexShaderBuilder.cpp
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLVertexShaderBuilder.h
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLXferProcessor.cpp
 create mode 100644 gfx/skia/skia/src/gpu/glsl/GrGLSLXferProcessor.h
 rename gfx/skia/skia/src/gpu/{gl => glsl}/GrGLSL_impl.h (100%)
 delete mode 100644 gfx/skia/skia/src/image/SkImagePriv.cpp
 create mode 100644 gfx/skia/skia/src/image/SkImageShader.cpp
 create mode 100644 gfx/skia/skia/src/image/SkImageShader.h
 delete mode 100644 gfx/skia/skia/src/image/SkImage_Codec.cpp
 create mode 100644 gfx/skia/skia/src/image/SkImage_Generator.cpp
 create mode 100644 gfx/skia/skia/src/image/SkImage_Gpu.h
 create mode 100644 gfx/skia/skia/src/image/SkReadPixelsRec.h
 create mode 100644 gfx/skia/skia/src/image/SkSurface_Gpu.h
 create mode 100644 gfx/skia/skia/src/images/SkImageDecoder_astc.cpp
 delete mode 100644 gfx/skia/skia/src/lazy/SkCachingPixelRef.cpp
 delete mode 100644 gfx/skia/skia/src/lazy/SkCachingPixelRef.h
 create mode 100644 gfx/skia/skia/src/opts/Sk4px_NEON.h
 create mode 100644 gfx/skia/skia/src/opts/Sk4px_SSE2.h
 create mode 100644 gfx/skia/skia/src/opts/Sk4px_none.h
 create mode 100644 gfx/skia/skia/src/opts/SkBlitMask_opts.h
 delete mode 100644 gfx/skia/skia/src/opts/SkBlitRect_opts_SSE2.cpp
 delete mode 100644 gfx/skia/skia/src/opts/SkBlitRect_opts_SSE2.h
 create mode 100644 gfx/skia/skia/src/opts/SkBlitRow_opts.h
 create mode 100644 gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4.cpp
 delete mode 100644 gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4_asm.S
 delete mode 100644 gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4_x64_asm.S
 create mode 100644 gfx/skia/skia/src/opts/SkBlurImageFilter_opts.h
 delete mode 100644 gfx/skia/skia/src/opts/SkBlurImage_opts.h
 delete mode 100644 gfx/skia/skia/src/opts/SkBlurImage_opts_SSE2.cpp
 delete mode 100644 gfx/skia/skia/src/opts/SkBlurImage_opts_SSE2.h
 delete mode 100644 gfx/skia/skia/src/opts/SkBlurImage_opts_SSE4.cpp
 delete mode 100644 gfx/skia/skia/src/opts/SkBlurImage_opts_SSE4.h
 delete mode 100644 gfx/skia/skia/src/opts/SkBlurImage_opts_arm.cpp
 delete mode 100644 gfx/skia/skia/src/opts/SkBlurImage_opts_neon.cpp
 delete mode 100644 gfx/skia/skia/src/opts/SkBlurImage_opts_neon.h
 delete mode 100644 gfx/skia/skia/src/opts/SkBlurImage_opts_none.cpp
 create mode 100644 gfx/skia/skia/src/opts/SkColorCubeFilter_opts.h
 create mode 100644 gfx/skia/skia/src/opts/SkFloatingPoint_opts.h
 delete mode 100644 gfx/skia/skia/src/opts/SkMath_opts_SSE2.h
 create mode 100644 gfx/skia/skia/src/opts/SkMatrix_opts.h
 create mode 100644 gfx/skia/skia/src/opts/SkMorphologyImageFilter_opts.h
 delete mode 100644 gfx/skia/skia/src/opts/SkMorphology_opts.h
 delete mode 100644 gfx/skia/skia/src/opts/SkMorphology_opts_SSE2.cpp
 delete mode 100644 gfx/skia/skia/src/opts/SkMorphology_opts_SSE2.h
 delete mode 100644 gfx/skia/skia/src/opts/SkMorphology_opts_arm.cpp
 delete mode 100644 gfx/skia/skia/src/opts/SkMorphology_opts_neon.cpp
 delete mode 100644 gfx/skia/skia/src/opts/SkMorphology_opts_neon.h
 delete mode 100644 gfx/skia/skia/src/opts/SkMorphology_opts_none.cpp
 create mode 100644 gfx/skia/skia/src/opts/SkNx_avx.h
 create mode 100644 gfx/skia/skia/src/opts/SkNx_neon.h
 create mode 100644 gfx/skia/skia/src/opts/SkNx_sse.h
 create mode 100644 gfx/skia/skia/src/opts/SkOpts_avx.cpp
 create mode 100644 gfx/skia/skia/src/opts/SkOpts_neon.cpp
 create mode 100644 gfx/skia/skia/src/opts/SkOpts_sse41.cpp
 create mode 100644 gfx/skia/skia/src/opts/SkOpts_ssse3.cpp
 create mode 100644 gfx/skia/skia/src/opts/SkPx_neon.h
 create mode 100644 gfx/skia/skia/src/opts/SkPx_none.h
 create mode 100644 gfx/skia/skia/src/opts/SkPx_sse.h
 delete mode 100644 gfx/skia/skia/src/opts/SkTextureCompression_opts.h
 delete mode 100644 gfx/skia/skia/src/opts/SkTextureCompression_opts_arm.cpp
 delete mode 100644 gfx/skia/skia/src/opts/SkTextureCompression_opts_neon.cpp
 delete mode 100644 gfx/skia/skia/src/opts/SkTextureCompression_opts_neon.h
 delete mode 100644 gfx/skia/skia/src/opts/SkTextureCompression_opts_none.cpp
 create mode 100644 gfx/skia/skia/src/opts/SkTextureCompressor_opts.h
 create mode 100644 gfx/skia/skia/src/opts/SkUtils_opts.h
 delete mode 100644 gfx/skia/skia/src/opts/SkUtils_opts_SSE2.cpp
 delete mode 100644 gfx/skia/skia/src/opts/SkUtils_opts_SSE2.h
 delete mode 100644 gfx/skia/skia/src/opts/SkUtils_opts_arm.cpp
 delete mode 100644 gfx/skia/skia/src/opts/SkUtils_opts_none.cpp
 create mode 100644 gfx/skia/skia/src/opts/SkXfermode_opts.h
 delete mode 100644 gfx/skia/skia/src/opts/SkXfermode_opts_SSE2.cpp
 delete mode 100644 gfx/skia/skia/src/opts/SkXfermode_opts_SSE2.h
 delete mode 100644 gfx/skia/skia/src/opts/SkXfermode_opts_arm.cpp
 delete mode 100644 gfx/skia/skia/src/opts/SkXfermode_opts_arm_neon.cpp
 delete mode 100644 gfx/skia/skia/src/opts/SkXfermode_opts_arm_neon.h
 delete mode 100644 gfx/skia/skia/src/opts/SkXfermode_opts_none.cpp
 delete mode 100644 gfx/skia/skia/src/opts/memset.arm.S
 delete mode 100644 gfx/skia/skia/src/opts/memset16_neon.S
 delete mode 100644 gfx/skia/skia/src/opts/memset32_neon.S
 create mode 100644 gfx/skia/skia/src/pathops/SkDConicLineIntersection.cpp
 delete mode 100644 gfx/skia/skia/src/pathops/SkDCubicIntersection.cpp
 delete mode 100644 gfx/skia/skia/src/pathops/SkDQuadImplicit.cpp
 delete mode 100644 gfx/skia/skia/src/pathops/SkDQuadImplicit.h
 delete mode 100644 gfx/skia/skia/src/pathops/SkDQuadIntersection.cpp
 create mode 100644 gfx/skia/skia/src/pathops/SkOpBuilder.cpp
 create mode 100755 gfx/skia/skia/src/pathops/SkOpCoincidence.cpp
 create mode 100644 gfx/skia/skia/src/pathops/SkOpCoincidence.h
 create mode 100644 gfx/skia/skia/src/pathops/SkOpCubicHull.cpp
 create mode 100755 gfx/skia/skia/src/pathops/SkOpSpan.cpp
 create mode 100644 gfx/skia/skia/src/pathops/SkOpTAllocator.h
 delete mode 100644 gfx/skia/skia/src/pathops/SkPathOpsBounds.cpp
 create mode 100644 gfx/skia/skia/src/pathops/SkPathOpsConic.cpp
 create mode 100644 gfx/skia/skia/src/pathops/SkPathOpsConic.h
 create mode 100644 gfx/skia/skia/src/pathops/SkPathOpsCurve.cpp
 create mode 100644 gfx/skia/skia/src/pathops/SkPathOpsTSect.cpp
 create mode 100644 gfx/skia/skia/src/pathops/SkPathOpsTSect.h
 delete mode 100644 gfx/skia/skia/src/pathops/SkPathOpsTriangle.cpp
 delete mode 100644 gfx/skia/skia/src/pathops/SkPathOpsTriangle.h
 create mode 100644 gfx/skia/skia/src/pathops/SkPathOpsWinding.cpp
 delete mode 100644 gfx/skia/skia/src/pathops/SkQuarticRoot.cpp
 delete mode 100644 gfx/skia/skia/src/pathops/SkQuarticRoot.h
 create mode 100644 gfx/skia/skia/src/pdf/SkDeflate.cpp
 create mode 100644 gfx/skia/skia/src/pdf/SkDeflate.h
 create mode 100644 gfx/skia/skia/src/pdf/SkJpegInfo.cpp
 create mode 100644 gfx/skia/skia/src/pdf/SkJpegInfo.h
 create mode 100644 gfx/skia/skia/src/pdf/SkPDFBitmap.cpp
 create mode 100644 gfx/skia/skia/src/pdf/SkPDFBitmap.h
 create mode 100644 gfx/skia/skia/src/pdf/SkPDFCanon.cpp
 create mode 100644 gfx/skia/skia/src/pdf/SkPDFCanon.h
 delete mode 100644 gfx/skia/skia/src/pdf/SkPDFCatalog.cpp
 delete mode 100644 gfx/skia/skia/src/pdf/SkPDFCatalog.h
 create mode 100644 gfx/skia/skia/src/pdf/SkPDFDevice.h
 delete mode 100644 gfx/skia/skia/src/pdf/SkPDFDeviceFlattener.cpp
 delete mode 100644 gfx/skia/skia/src/pdf/SkPDFDeviceFlattener.h
 delete mode 100644 gfx/skia/skia/src/pdf/SkPDFDocument.cpp
 delete mode 100644 gfx/skia/skia/src/pdf/SkPDFImage.cpp
 delete mode 100644 gfx/skia/skia/src/pdf/SkPDFImage.h
 create mode 100644 gfx/skia/skia/src/pdf/SkPDFMetadata.cpp
 create mode 100644 gfx/skia/skia/src/pdf/SkPDFMetadata.h
 delete mode 100644 gfx/skia/skia/src/pdf/SkPDFPage.cpp
 delete mode 100644 gfx/skia/skia/src/pdf/SkPDFPage.h
 delete mode 100644 gfx/skia/skia/src/pdf/SkTSet.h
 delete mode 100644 gfx/skia/skia/src/ports/SkAtomics_sync.h
 delete mode 100644 gfx/skia/skia/src/ports/SkAtomics_win.h
 delete mode 100644 gfx/skia/skia/src/ports/SkBarriers_arm.h
 delete mode 100644 gfx/skia/skia/src/ports/SkBarriers_tsan.h
 delete mode 100644 gfx/skia/skia/src/ports/SkBarriers_x86.h
 delete mode 100644 gfx/skia/skia/src/ports/SkDebug_nacl.cpp
 delete mode 100644 gfx/skia/skia/src/ports/SkFontConfigInterface_android.cpp
 create mode 100644 gfx/skia/skia/src/ports/SkFontConfigInterface_direct.h
 create mode 100644 gfx/skia/skia/src/ports/SkFontConfigInterface_direct_factory.cpp
 create mode 100644 gfx/skia/skia/src/ports/SkFontConfigInterface_direct_google3.cpp
 create mode 100644 gfx/skia/skia/src/ports/SkFontConfigInterface_direct_google3.h
 create mode 100644 gfx/skia/skia/src/ports/SkFontConfigInterface_direct_google3_factory.cpp
 delete mode 100644 gfx/skia/skia/src/ports/SkFontConfigParser_android.cpp
 delete mode 100644 gfx/skia/skia/src/ports/SkFontConfigParser_android.h
 delete mode 100644 gfx/skia/skia/src/ports/SkFontHost_android_old.cpp
 delete mode 100644 gfx/skia/skia/src/ports/SkFontHost_linux.cpp
 mode change 100755 => 100644 gfx/skia/skia/src/ports/SkFontHost_mac.cpp
 mode change 100755 => 100644 gfx/skia/skia/src/ports/SkFontHost_win.cpp
 create mode 100644 gfx/skia/skia/src/ports/SkFontMgr_android_factory.cpp
 create mode 100644 gfx/skia/skia/src/ports/SkFontMgr_android_parser.cpp
 create mode 100644 gfx/skia/skia/src/ports/SkFontMgr_android_parser.h
 create mode 100644 gfx/skia/skia/src/ports/SkFontMgr_custom.cpp
 create mode 100644 gfx/skia/skia/src/ports/SkFontMgr_custom_directory_factory.cpp
 create mode 100644 gfx/skia/skia/src/ports/SkFontMgr_custom_embedded_factory.cpp
 delete mode 100644 gfx/skia/skia/src/ports/SkFontMgr_default_dw.cpp
 delete mode 100644 gfx/skia/skia/src/ports/SkFontMgr_default_gdi.cpp
 rename gfx/skia/skia/src/ports/{SkFontHost_none.cpp => SkFontMgr_empty_factory.cpp} (67%)
 create mode 100644 gfx/skia/skia/src/ports/SkFontMgr_fontconfig.cpp
 create mode 100644 gfx/skia/skia/src/ports/SkFontMgr_fontconfig_factory.cpp
 create mode 100644 gfx/skia/skia/src/ports/SkFontMgr_win_dw_factory.cpp
 create mode 100644 gfx/skia/skia/src/ports/SkFontMgr_win_gdi_factory.cpp
 create mode 100644 gfx/skia/skia/src/ports/SkImageGenerator_none.cpp
 create mode 100644 gfx/skia/skia/src/ports/SkImageGenerator_skia.cpp
 delete mode 100644 gfx/skia/skia/src/ports/SkMutex_pthread.h
 delete mode 100644 gfx/skia/skia/src/ports/SkMutex_win.h
 delete mode 100644 gfx/skia/skia/src/ports/SkOSFile_none.cpp
 create mode 100644 gfx/skia/skia/src/ports/SkOSLibrary.h
 create mode 100644 gfx/skia/skia/src/ports/SkOSLibrary_posix.cpp
 create mode 100644 gfx/skia/skia/src/ports/SkOSLibrary_win.cpp
 delete mode 100644 gfx/skia/skia/src/ports/SkXMLParser_empty.cpp
 create mode 100644 gfx/skia/skia/src/svg/SkSVGCanvas.cpp
 create mode 100644 gfx/skia/skia/src/svg/SkSVGDevice.cpp
 create mode 100644 gfx/skia/skia/src/svg/SkSVGDevice.h
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVG.cpp (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGCircle.cpp (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGCircle.h (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGClipPath.cpp (96%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGClipPath.h (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGDefs.cpp (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGDefs.h (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGElements.cpp (94%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGElements.h (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGEllipse.cpp (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGEllipse.h (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGFeColorMatrix.cpp (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGFeColorMatrix.h (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGFilter.cpp (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGFilter.h (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGG.cpp (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGG.h (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGGradient.cpp (99%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGGradient.h (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGGroup.cpp (94%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGGroup.h (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGImage.cpp (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGImage.h (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGLine.cpp (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGLine.h (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGLinearGradient.cpp (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGLinearGradient.h (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGMask.cpp (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGMask.h (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGMetadata.cpp (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGMetadata.h (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGPaintState.cpp (98%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGParser.cpp (96%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGPath.cpp (97%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGPath.h (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGPolygon.cpp (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGPolygon.h (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGPolyline.cpp (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGPolyline.h (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGRadialGradient.cpp (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGRadialGradient.h (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGRect.cpp (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGRect.h (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGSVG.cpp (90%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGSVG.h (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGStop.cpp (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGStop.h (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGSymbol.cpp (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGSymbol.h (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGText.cpp (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGText.h (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGUse.cpp (100%)
 rename gfx/skia/skia/src/svg/{ => parser}/SkSVGUse.h (100%)
 create mode 100644 gfx/skia/skia/src/utils/SkBitmapSourceDeserializer.cpp
 create mode 100644 gfx/skia/skia/src/utils/SkBitmapSourceDeserializer.h
 delete mode 100644 gfx/skia/skia/src/utils/SkCondVar.cpp
 delete mode 100644 gfx/skia/skia/src/utils/SkDeferredCanvas.cpp
 delete mode 100644 gfx/skia/skia/src/utils/SkGatherPixelRefsAndRects.cpp
 delete mode 100644 gfx/skia/skia/src/utils/SkGatherPixelRefsAndRects.h
 create mode 100644 gfx/skia/skia/src/utils/SkImageGeneratorUtils.cpp
 create mode 100644 gfx/skia/skia/src/utils/SkImageGeneratorUtils.h
 delete mode 100644 gfx/skia/skia/src/utils/SkPDFRasterizer.cpp
 delete mode 100644 gfx/skia/skia/src/utils/SkPDFRasterizer.h
 create mode 100644 gfx/skia/skia/src/utils/SkPaintFilterCanvas.cpp
 create mode 100644 gfx/skia/skia/src/utils/SkPatchGrid.cpp
 create mode 100644 gfx/skia/skia/src/utils/SkPatchGrid.h
 create mode 100644 gfx/skia/skia/src/utils/SkPatchUtils.cpp
 create mode 100644 gfx/skia/skia/src/utils/SkPatchUtils.h
 delete mode 100644 gfx/skia/skia/src/utils/SkPathUtils.cpp
 delete mode 100644 gfx/skia/skia/src/utils/SkPictureUtils.cpp
 delete mode 100644 gfx/skia/skia/src/utils/SkProxyCanvas.cpp
 rename gfx/skia/skia/src/{core/SkInstCnt.cpp => utils/SkRunnable.h} (52%)
 delete mode 100644 gfx/skia/skia/src/utils/SkTLogic.h
 rename gfx/skia/skia/src/{views => utils}/SkTextBox.cpp (77%)
 create mode 100644 gfx/skia/skia/src/utils/SkTextureCompressor_Blitter.h
 create mode 100755 gfx/skia/skia/src/utils/SkTextureCompressor_Utils.h
 delete mode 100644 gfx/skia/skia/src/utils/SkThreadUtils_pthread_linux.cpp
 delete mode 100644 gfx/skia/skia/src/utils/SkThreadUtils_pthread_mach.cpp
 create mode 100644 gfx/skia/skia/src/utils/SkWhitelistChecksums.cpp
 create mode 100644 gfx/skia/skia/src/utils/SkWhitelistTypefaces.cpp
 create mode 100644 gfx/skia/skia/src/utils/android/SkAndroidSDKCanvas.cpp
 create mode 100644 gfx/skia/skia/src/utils/android/SkAndroidSDKCanvas.h
 delete mode 100755 gfx/skia/skia/src/utils/ios/SkFontHost_iOS.mm
 delete mode 100755 gfx/skia/skia/src/utils/ios/SkImageDecoder_iOS.mm
 delete mode 100755 gfx/skia/skia/src/utils/ios/SkOSFile_iOS.mm
 delete mode 100755 gfx/skia/skia/src/utils/ios/SkStream_NSData.mm
 rename gfx/skia/skia/{include/utils => src/utils/win}/SkWGL.h (100%)
 delete mode 100644 gfx/skia/skia/src/views/mac/SampleApp-Info.plist
 delete mode 100644 gfx/skia/skia/src/views/mac/SampleApp.xib
 delete mode 100644 gfx/skia/skia/src/views/mac/SampleAppDelegate.h
 delete mode 100644 gfx/skia/skia/src/views/mac/SampleAppDelegate.mm
 delete mode 100644 gfx/skia/skia/src/views/mac/SkOSWindow_Mac.cpp
 rename gfx/skia/skia/{include => src}/views/unix/XkeysToSkKeys.h (100%)
 rename gfx/skia/skia/{include => src}/views/unix/keysym2ucs.h (100%)
 delete mode 100644 gfx/skia/skia/src/xml/SkJS.cpp
 delete mode 100644 gfx/skia/skia/src/xml/SkJSDisplayable.cpp

diff --git a/gfx/skia/skia/include/android/SkBRDAllocator.h b/gfx/skia/skia/include/android/SkBRDAllocator.h
new file mode 100644
index 000000000000..3ca30c9b4119
--- /dev/null
+++ b/gfx/skia/skia/include/android/SkBRDAllocator.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkBRDAllocator_DEFINED
+#define SkBRDAllocator_DEFINED
+
+#include "SkBitmap.h"
+#include "SkCodec.h"
+
+/**
+ *  Abstract subclass of SkBitmap's allocator.
+ *  Allows the allocator to indicate if the memory it allocates
+ *  is zero initialized.
+ */
+class SkBRDAllocator : public SkBitmap::Allocator {
+public:
+
+    /**
+     *  Indicates if the memory allocated by this allocator is
+     *  zero initialized.
+     */
+    virtual SkCodec::ZeroInitialized zeroInit() const = 0;
+};
+
+#endif // SkBRDAllocator_DEFINED
diff --git a/gfx/skia/skia/include/android/SkBitmapRegionDecoder.h b/gfx/skia/skia/include/android/SkBitmapRegionDecoder.h
new file mode 100644
index 000000000000..575ad9dc01a1
--- /dev/null
+++ b/gfx/skia/skia/include/android/SkBitmapRegionDecoder.h
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkBitmapRegionDecoder_DEFINED
+#define SkBitmapRegionDecoder_DEFINED
+
+#include "SkBitmap.h"
+#include "SkBRDAllocator.h"
+#include "SkEncodedFormat.h"
+#include "SkStream.h"
+
+/*
+ * This class aims to provide an interface to test multiple implementations of
+ * SkBitmapRegionDecoder.
+ */
+class SkBitmapRegionDecoder {
+public:
+
+    enum Strategy {
+        kCanvas_Strategy,       // Draw to the canvas, uses SkCodec
+        kAndroidCodec_Strategy, // Uses SkAndroidCodec for scaling and subsetting
+    };
+
+    /*
+     * @param data     Refs the data while this object exists, unrefs on destruction
+     * @param strategy Strategy used for scaling and subsetting
+     * @return         Tries to create an SkBitmapRegionDecoder, returns NULL on failure
+     */
+    static SkBitmapRegionDecoder* Create(
+            SkData* data, Strategy strategy);
+
+    /*
+     * @param stream   Takes ownership of the stream
+     * @param strategy Strategy used for scaling and subsetting
+     * @return         Tries to create an SkBitmapRegionDecoder, returns NULL on failure
+     */
+    static SkBitmapRegionDecoder* Create(
+            SkStreamRewindable* stream, Strategy strategy);
+
+    /*
+     * Decode a scaled region of the encoded image stream
+     *
+     * @param bitmap          Container for decoded pixels.  It is assumed that the pixels
+     *                        are initially unallocated and will be allocated by this function.
+     * @param allocator       Allocator for the pixels.  If this is NULL, the default
+     *                        allocator (HeapAllocator) will be used.
+     * @param desiredSubset   Subset of the original image to decode.
+     * @param sampleSize      An integer downscaling factor for the decode.
+     * @param colorType       Preferred output colorType.
+     *                        New implementations should return NULL if they do not support
+     *                        decoding to this color type.
+     *                        The old kOriginal_Strategy will decode to a default color type
+     *                        if this color type is unsupported.
+     * @param requireUnpremul If the image is not opaque, we will use this to determine the
+     *                        alpha type to use.
+     *
+     */
+    virtual bool decodeRegion(SkBitmap* bitmap, SkBRDAllocator* allocator,
+                              const SkIRect& desiredSubset, int sampleSize,
+                              SkColorType colorType, bool requireUnpremul) = 0;
+    /*
+     * @param  Requested destination color type
+     * @return true if we support the requested color type and false otherwise
+     */
+    virtual bool conversionSupported(SkColorType colorType) = 0;
+
+    virtual SkEncodedFormat getEncodedFormat() = 0;
+
+    int width() const { return fWidth; }
+    int height() const { return fHeight; }
+
+    virtual ~SkBitmapRegionDecoder() {}
+
+protected:
+
+    SkBitmapRegionDecoder(int width, int height)
+        : fWidth(width)
+        , fHeight(height)
+    {}
+
+private:
+    const int fWidth;
+    const int fHeight;
+};
+
+#endif
diff --git a/gfx/skia/skia/include/c/sk_canvas.h b/gfx/skia/skia/include/c/sk_canvas.h
new file mode 100644
index 000000000000..f6c0d4e1c143
--- /dev/null
+++ b/gfx/skia/skia/include/c/sk_canvas.h
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+// EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL
+// DO NOT USE -- FOR INTERNAL TESTING ONLY
+
+#ifndef sk_canvas_DEFINED
+#define sk_canvas_DEFINED
+
+#include "sk_types.h"
+
+SK_C_PLUS_PLUS_BEGIN_GUARD
+
+/**
+    Save the current matrix and clip on the canvas.  When the
+    balancing call to sk_canvas_restore() is made, the previous matrix
+    and clip are restored.
+*/
+SK_API void sk_canvas_save(sk_canvas_t*);
+/**
+    This behaves the same as sk_canvas_save(), but in addition it
+    allocates an offscreen surface. All drawing calls are directed
+    there, and only when the balancing call to sk_canvas_restore() is
+    made is that offscreen transfered to the canvas (or the previous
+    layer).
+
+    @param sk_rect_t* (may be null) This rect, if non-null, is used as
+                      a hint to limit the size of the offscreen, and
+                      thus drawing may be clipped to it, though that
+                      clipping is not guaranteed to happen. If exact
+                      clipping is desired, use sk_canvas_clip_rect().
+    @param sk_paint_t* (may be null) The paint is copied, and is applied
+                       to the offscreen when sk_canvas_restore() is
+                       called.
+*/
+SK_API void sk_canvas_save_layer(sk_canvas_t*, const sk_rect_t*, const sk_paint_t*);
+/**
+    This call balances a previous call to sk_canvas_save() or
+    sk_canvas_save_layer(), and is used to remove all modifications to
+    the matrix and clip state since the last save call.  It is an
+    error to call sk_canvas_restore() more times than save and
+    save_layer were called.
+*/
+SK_API void sk_canvas_restore(sk_canvas_t*);
+
+/**
+    Preconcat the current coordinate transformation matrix with the
+    specified translation.
+*/
+SK_API void sk_canvas_translate(sk_canvas_t*, float dx, float dy);
+/**
+    Preconcat the current coordinate transformation matrix with the
+    specified scale.
+*/
+SK_API void sk_canvas_scale(sk_canvas_t*, float sx, float sy);
+/**
+    Preconcat the current coordinate transformation matrix with the
+    specified rotation in degrees.
+*/
+SK_API void sk_canvas_rotate_degrees(sk_canvas_t*, float degrees);
+/**
+    Preconcat the current coordinate transformation matrix with the
+    specified rotation in radians.
+*/
+SK_API void sk_canvas_rotate_radians(sk_canvas_t*, float radians);
+/**
+    Preconcat the current coordinate transformation matrix with the
+    specified skew.
+*/
+SK_API void sk_canvas_skew(sk_canvas_t*, float sx, float sy);
+/**
+    Preconcat the current coordinate transformation matrix with the
+    specified matrix.
+*/
+SK_API void sk_canvas_concat(sk_canvas_t*, const sk_matrix_t*);
+
+/**
+    Modify the current clip with the specified rectangle.  The new
+    current clip will be the intersection of the old clip and the
+    rectange.
+*/
+SK_API void sk_canvas_clip_rect(sk_canvas_t*, const sk_rect_t*);
+/**
+    Modify the current clip with the specified path.  The new
+    current clip will be the intersection of the old clip and the
+    path.
+*/
+SK_API void sk_canvas_clip_path(sk_canvas_t*, const sk_path_t*);
+
+/**
+    Fill the entire canvas (restricted to the current clip) with the
+    specified paint.
+*/
+SK_API void sk_canvas_draw_paint(sk_canvas_t*, const sk_paint_t*);
+/**
+    Draw the specified rectangle using the specified paint. The
+    rectangle will be filled or stroked based on the style in the
+    paint.
+*/
+SK_API void sk_canvas_draw_rect(sk_canvas_t*, const sk_rect_t*, const sk_paint_t*);
+/**
+    Draw the specified oval using the specified paint. The oval will be
+    filled or framed based on the style in the paint
+*/
+SK_API void sk_canvas_draw_oval(sk_canvas_t*, const sk_rect_t*, const sk_paint_t*);
+/**
+    Draw the specified path using the specified paint. The path will be
+    filled or framed based on the style in the paint
+*/
+SK_API void sk_canvas_draw_path(sk_canvas_t*, const sk_path_t*, const sk_paint_t*);
+/**
+    Draw the specified image, with its top/left corner at (x,y), using
+    the specified paint, transformed by the current matrix.
+
+    @param sk_paint_t* (may be NULL) the paint used to draw the image.
+*/
+SK_API void sk_canvas_draw_image(sk_canvas_t*, const sk_image_t*,
+                                 float x, float y, const sk_paint_t*);
+/**
+    Draw the specified image, scaling and translating so that it fills
+    the specified dst rect. If the src rect is non-null, only that
+    subset of the image is transformed and drawn.
+
+    @param sk_paint_t* (may be NULL) The paint used to draw the image.
+*/
+SK_API void sk_canvas_draw_image_rect(sk_canvas_t*, const sk_image_t*,
+                                      const sk_rect_t* src,
+                                      const sk_rect_t* dst, const sk_paint_t*);
+
+/**
+    Draw the picture into this canvas (replay the pciture's drawing commands).
+
+    @param sk_matrix_t* If non-null, apply that matrix to the CTM when
+                        drawing this picture. This is logically
+                        equivalent to: save, concat, draw_picture,
+                        restore.
+
+    @param sk_paint_t* If non-null, draw the picture into a temporary
+                       buffer, and then apply the paint's alpha,
+                       colorfilter, imagefilter, and xfermode to that
+                       buffer as it is drawn to the canvas.  This is
+                       logically equivalent to save_layer(paint),
+                       draw_picture, restore.
+*/
+SK_API void sk_canvas_draw_picture(sk_canvas_t*, const sk_picture_t*,
+                                   const sk_matrix_t*, const sk_paint_t*);
+
+SK_C_PLUS_PLUS_END_GUARD
+
+#endif
diff --git a/gfx/skia/skia/include/c/sk_data.h b/gfx/skia/skia/include/c/sk_data.h
new file mode 100644
index 000000000000..90333bba5f77
--- /dev/null
+++ b/gfx/skia/skia/include/c/sk_data.h
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+// EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL
+// DO NOT USE -- FOR INTERNAL TESTING ONLY
+
+#ifndef sk_data_DEFINED
+#define sk_data_DEFINED
+
+#include "sk_types.h"
+
+SK_C_PLUS_PLUS_BEGIN_GUARD
+
+/**
+    Returns a new empty sk_data_t.  This call must be balanced with a call to
+    sk_data_unref().
+*/
+SK_API sk_data_t* sk_data_new_empty();
+/**
+    Returns a new sk_data_t by copying the specified source data.
+    This call must be balanced with a call to sk_data_unref().
+*/
+SK_API sk_data_t* sk_data_new_with_copy(const void* src, size_t length);
+/**
+    Pass ownership of the given memory to a new sk_data_t, which will
+    call free() when the refernce count of the data goes to zero.  For
+    example:
+        size_t length = 1024;
+        void* buffer = malloc(length);
+        memset(buffer, 'X', length);
+        sk_data_t* data = sk_data_new_from_malloc(buffer, length);
+    This call must be balanced with a call to sk_data_unref().
+*/
+SK_API sk_data_t* sk_data_new_from_malloc(const void* memory, size_t length);
+/**
+    Returns a new sk_data_t using a subset of the data in the
+    specified source sk_data_t.  This call must be balanced with a
+    call to sk_data_unref().
+*/
+SK_API sk_data_t* sk_data_new_subset(const sk_data_t* src, size_t offset, size_t length);
+
+/**
+    Increment the reference count on the given sk_data_t. Must be
+    balanced by a call to sk_data_unref().
+*/
+SK_API void sk_data_ref(const sk_data_t*);
+/**
+    Decrement the reference count. If the reference count is 1 before
+    the decrement, then release both the memory holding the sk_data_t
+    and the memory it is managing.  New sk_data_t are created with a
+    reference count of 1.
+*/
+SK_API void sk_data_unref(const sk_data_t*);
+
+/**
+    Returns the number of bytes stored.
+*/
+SK_API size_t sk_data_get_size(const sk_data_t*);
+/**
+    Returns the pointer to the data.
+ */
+SK_API const void* sk_data_get_data(const sk_data_t*);
+
+SK_C_PLUS_PLUS_END_GUARD
+
+#endif
diff --git a/gfx/skia/skia/include/c/sk_image.h b/gfx/skia/skia/include/c/sk_image.h
new file mode 100644
index 000000000000..e90649d75d49
--- /dev/null
+++ b/gfx/skia/skia/include/c/sk_image.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+// EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL
+// DO NOT USE -- FOR INTERNAL TESTING ONLY
+
+#ifndef sk_image_DEFINED
+#define sk_image_DEFINED
+
+#include "sk_types.h"
+
+SK_C_PLUS_PLUS_BEGIN_GUARD
+
+/**
+ *  Return a new image that has made a copy of the provided pixels, or NULL on failure.
+ *  Balance with a call to sk_image_unref().
+ */
+SK_API sk_image_t* sk_image_new_raster_copy(const sk_imageinfo_t*, const void* pixels, size_t rowBytes);
+
+/**
+ *  If the specified data can be interpreted as a compressed image (e.g. PNG or JPEG) then this
+ *  returns an image. If the encoded data is not supported, returns NULL.
+ *
+ *  On success, the encoded data may be processed immediately, or it may be ref()'d for later
+ *  use.
+ */
+SK_API sk_image_t* sk_image_new_from_encoded(const sk_data_t* encoded, const sk_irect_t* subset);
+
+/**
+ *  Encode the image's pixels and return the result as a new PNG in a
+ *  sk_data_t, which the caller must manage: call sk_data_unref() when
+ *  they are done.
+ *
+ *  If the image type cannot be encoded, this will return NULL.
+ */
+SK_API sk_data_t* sk_image_encode(const sk_image_t*);
+
+/**
+ *  Increment the reference count on the given sk_image_t. Must be
+ *  balanced by a call to sk_image_unref().
+*/
+SK_API void sk_image_ref(const sk_image_t*);
+/**
+ *  Decrement the reference count. If the reference count is 1 before
+ *  the decrement, then release both the memory holding the sk_image_t
+ *  and the memory it is managing.  New sk_image_t are created with a
+    reference count of 1.
+*/
+SK_API void sk_image_unref(const sk_image_t*);
+
+/**
+ *  Return the width of the sk_image_t/
+ */
+SK_API int sk_image_get_width(const sk_image_t*);
+/**
+ *  Return the height of the sk_image_t/
+ */
+SK_API int sk_image_get_height(const sk_image_t*);
+
+/**
+ *  Returns a non-zero value unique among all images.
+ */
+SK_API uint32_t sk_image_get_unique_id(const sk_image_t*);
+
+SK_C_PLUS_PLUS_END_GUARD
+
+#endif
diff --git a/gfx/skia/skia/include/c/sk_maskfilter.h b/gfx/skia/skia/include/c/sk_maskfilter.h
new file mode 100644
index 000000000000..5c22a063914f
--- /dev/null
+++ b/gfx/skia/skia/include/c/sk_maskfilter.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+// EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL
+// DO NOT USE -- FOR INTERNAL TESTING ONLY
+
+#ifndef sk_maskfilter_DEFINED
+#define sk_maskfilter_DEFINED
+
+#include "sk_types.h"
+
+typedef enum {
+    NORMAL_SK_BLUR_STYLE,   //!< fuzzy inside and outside
+    SOLID_SK_BLUR_STYLE,    //!< solid inside, fuzzy outside
+    OUTER_SK_BLUR_STYLE,    //!< nothing inside, fuzzy outside
+    INNER_SK_BLUR_STYLE,    //!< fuzzy inside, nothing outside
+} sk_blurstyle_t;
+
+SK_C_PLUS_PLUS_BEGIN_GUARD
+
+/**
+    Increment the reference count on the given sk_maskfilter_t. Must be
+    balanced by a call to sk_maskfilter_unref().
+*/
+void sk_maskfilter_ref(sk_maskfilter_t*);
+/**
+    Decrement the reference count. If the reference count is 1 before
+    the decrement, then release both the memory holding the
+    sk_maskfilter_t and any other associated resources.  New
+    sk_maskfilter_t are created with a reference count of 1.
+*/
+void sk_maskfilter_unref(sk_maskfilter_t*);
+
+/**
+    Create a blur maskfilter.
+    @param sk_blurstyle_t The SkBlurStyle to use
+    @param sigma Standard deviation of the Gaussian blur to apply. Must be > 0.
+*/
+sk_maskfilter_t* sk_maskfilter_new_blur(sk_blurstyle_t, float sigma);
+
+SK_C_PLUS_PLUS_END_GUARD
+
+#endif
diff --git a/gfx/skia/skia/include/c/sk_matrix.h b/gfx/skia/skia/include/c/sk_matrix.h
new file mode 100644
index 000000000000..83f0122b00a8
--- /dev/null
+++ b/gfx/skia/skia/include/c/sk_matrix.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+// EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL
+// DO NOT USE -- FOR INTERNAL TESTING ONLY
+
+#ifndef sk_matrix_DEFINED
+#define sk_matrix_DEFINED
+
+#include "sk_types.h"
+
+SK_C_PLUS_PLUS_BEGIN_GUARD
+
+/** Set the matrix to identity */
+void sk_matrix_set_identity(sk_matrix_t*);
+
+/** Set the matrix to translate by (tx, ty). */
+void sk_matrix_set_translate(sk_matrix_t*, float tx, float ty);
+/**
+    Preconcats the matrix with the specified translation.
+        M' = M * T(dx, dy)
+*/
+void sk_matrix_pre_translate(sk_matrix_t*, float tx, float ty);
+/**
+    Postconcats the matrix with the specified translation.
+        M' = T(dx, dy) * M
+*/
+void sk_matrix_post_translate(sk_matrix_t*, float tx, float ty);
+
+/** Set the matrix to scale by sx and sy. */
+void sk_matrix_set_scale(sk_matrix_t*, float sx, float sy);
+/**
+    Preconcats the matrix with the specified scale.
+        M' = M * S(sx, sy)
+*/
+void sk_matrix_pre_scale(sk_matrix_t*, float sx, float sy);
+/**
+    Postconcats the matrix with the specified scale.
+        M' = S(sx, sy) * M
+*/
+void sk_matrix_post_scale(sk_matrix_t*, float sx, float sy);
+
+SK_C_PLUS_PLUS_END_GUARD
+
+#endif
diff --git a/gfx/skia/skia/include/c/sk_paint.h b/gfx/skia/skia/include/c/sk_paint.h
new file mode 100644
index 000000000000..e0886ad34965
--- /dev/null
+++ b/gfx/skia/skia/include/c/sk_paint.h
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+// EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL
+// DO NOT USE -- FOR INTERNAL TESTING ONLY
+
+#ifndef sk_paint_DEFINED
+#define sk_paint_DEFINED
+
+#include "sk_types.h"
+
+SK_C_PLUS_PLUS_BEGIN_GUARD
+
+/**
+    Create a new paint with default settings:
+        antialias : false
+        stroke : false
+        stroke width : 0.0f (hairline)
+        stroke miter : 4.0f
+        stroke cap : BUTT_SK_STROKE_CAP
+        stroke join : MITER_SK_STROKE_JOIN
+        color : opaque black
+        shader : NULL
+        maskfilter : NULL
+        xfermode_mode : SRCOVER_SK_XFERMODE_MODE
+*/
+SK_API sk_paint_t* sk_paint_new();
+/**
+    Release the memory storing the sk_paint_t and unref() all
+    associated objects.
+*/
+SK_API void sk_paint_delete(sk_paint_t*);
+
+/**
+    Return true iff the paint has antialiasing enabled.
+*/
+SK_API bool sk_paint_is_antialias(const sk_paint_t*);
+/**
+    Set to true to enable antialiasing, false to disable it on this
+    sk_paint_t.
+*/
+SK_API void sk_paint_set_antialias(sk_paint_t*, bool);
+
+/**
+    Return the paint's curent drawing color.
+*/
+SK_API sk_color_t sk_paint_get_color(const sk_paint_t*);
+/**
+    Set the paint's curent drawing color.
+*/
+SK_API void sk_paint_set_color(sk_paint_t*, sk_color_t);
+
+/* stroke settings */
+
+/**
+    Return true iff stroking is enabled rather than filling on this
+    sk_paint_t.
+*/
+SK_API bool sk_paint_is_stroke(const sk_paint_t*);
+/**
+    Set to true to enable stroking rather than filling with this
+    sk_paint_t.
+*/
+SK_API void sk_paint_set_stroke(sk_paint_t*, bool);
+
+/**
+    Return the width for stroking.  A value of 0 strokes in hairline mode.
+ */
+SK_API float sk_paint_get_stroke_width(const sk_paint_t*);
+/**
+   Set the width for stroking.  A value of 0 strokes in hairline mode
+   (always draw 1-pixel wide, regardless of the matrix).
+ */
+SK_API void sk_paint_set_stroke_width(sk_paint_t*, float width);
+
+/**
+    Return the paint's stroke miter value. This is used to control the
+    behavior of miter joins when the joins angle is sharp.
+*/
+SK_API float sk_paint_get_stroke_miter(const sk_paint_t*);
+/**
+   Set the paint's stroke miter value. This is used to control the
+   behavior of miter joins when the joins angle is sharp. This value
+   must be >= 0.
+*/
+SK_API void sk_paint_set_stroke_miter(sk_paint_t*, float miter);
+
+typedef enum {
+    BUTT_SK_STROKE_CAP,
+    ROUND_SK_STROKE_CAP,
+    SQUARE_SK_STROKE_CAP
+} sk_stroke_cap_t;
+
+/**
+    Return the paint's stroke cap type, controlling how the start and
+    end of stroked lines and paths are treated.
+*/
+SK_API sk_stroke_cap_t sk_paint_get_stroke_cap(const sk_paint_t*);
+/**
+    Set the paint's stroke cap type, controlling how the start and
+    end of stroked lines and paths are treated.
+*/
+SK_API void sk_paint_set_stroke_cap(sk_paint_t*, sk_stroke_cap_t);
+
+typedef enum {
+    MITER_SK_STROKE_JOIN,
+    ROUND_SK_STROKE_JOIN,
+    BEVEL_SK_STROKE_JOIN
+} sk_stroke_join_t;
+
+/**
+    Return the paint's stroke join type, specifies the treatment that
+    is applied to corners in paths and rectangles
+ */
+SK_API sk_stroke_join_t sk_paint_get_stroke_join(const sk_paint_t*);
+/**
+    Set the paint's stroke join type, specifies the treatment that
+    is applied to corners in paths and rectangles
+ */
+SK_API void sk_paint_set_stroke_join(sk_paint_t*, sk_stroke_join_t);
+
+/**
+ *  Set the paint's shader to the specified parameter. This will automatically call unref() on
+ *  any previous value, and call ref() on the new value.
+ */
+SK_API void sk_paint_set_shader(sk_paint_t*, sk_shader_t*);
+
+/**
+ *  Set the paint's maskfilter to the specified parameter. This will automatically call unref() on
+ *  any previous value, and call ref() on the new value.
+ */
+SK_API void sk_paint_set_maskfilter(sk_paint_t*, sk_maskfilter_t*);
+
+/**
+ *  Set the paint's xfermode to the specified parameter.
+ */
+SK_API void sk_paint_set_xfermode_mode(sk_paint_t*, sk_xfermode_mode_t);
+
+SK_C_PLUS_PLUS_END_GUARD
+
+#endif
diff --git a/gfx/skia/skia/include/c/sk_path.h b/gfx/skia/skia/include/c/sk_path.h
new file mode 100644
index 000000000000..6b4e83d3b2a6
--- /dev/null
+++ b/gfx/skia/skia/include/c/sk_path.h
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+// EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL
+// DO NOT USE -- FOR INTERNAL TESTING ONLY
+
+#ifndef sk_path_DEFINED
+#define sk_path_DEFINED
+
+#include "sk_types.h"
+
+SK_C_PLUS_PLUS_BEGIN_GUARD
+
+typedef enum {
+    CW_SK_PATH_DIRECTION,
+    CCW_SK_PATH_DIRECTION,
+} sk_path_direction_t;
+
+/** Create a new, empty path. */
+SK_API sk_path_t* sk_path_new();
+/** Release the memory used by a sk_path_t. */
+SK_API void sk_path_delete(sk_path_t*);
+
+/** Set the beginning of the next contour to the point (x,y). */
+SK_API void sk_path_move_to(sk_path_t*, float x, float y);
+/**
+    Add a line from the last point to the specified point (x,y). If no
+    sk_path_move_to() call has been made for this contour, the first
+    point is automatically set to (0,0).
+*/
+SK_API void sk_path_line_to(sk_path_t*, float x, float y);
+/**
+    Add a quadratic bezier from the last point, approaching control
+    point (x0,y0), and ending at (x1,y1). If no sk_path_move_to() call
+    has been made for this contour, the first point is automatically
+    set to (0,0).
+*/
+SK_API void sk_path_quad_to(sk_path_t*, float x0, float y0, float x1, float y1);
+/**
+    Add a conic curve from the last point, approaching control point
+    (x0,y01), and ending at (x1,y1) with weight w.  If no
+    sk_path_move_to() call has been made for this contour, the first
+    point is automatically set to (0,0).
+*/
+SK_API void sk_path_conic_to(sk_path_t*, float x0, float y0, float x1, float y1, float w);
+/**
+    Add a cubic bezier from the last point, approaching control points
+    (x0,y0) and (x1,y1), and ending at (x2,y2). If no
+    sk_path_move_to() call has been made for this contour, the first
+    point is automatically set to (0,0).
+*/
+SK_API void sk_path_cubic_to(sk_path_t*,
+                             float x0, float y0,
+                             float x1, float y1,
+                             float x2, float y2);
+/**
+   Close the current contour. If the current point is not equal to the
+   first point of the contour, a line segment is automatically added.
+*/
+SK_API void sk_path_close(sk_path_t*);
+
+/**
+    Add a closed rectangle contour to the path.
+*/
+SK_API void sk_path_add_rect(sk_path_t*, const sk_rect_t*, sk_path_direction_t);
+/**
+    Add a closed oval contour to the path
+*/
+SK_API void sk_path_add_oval(sk_path_t*, const sk_rect_t*, sk_path_direction_t);
+
+/**
+ *  If the path is empty, return false and set the rect parameter to [0, 0, 0, 0].
+ *  else return true and set the rect parameter to the bounds of the control-points
+ *  of the path.
+ */
+SK_API bool sk_path_get_bounds(const sk_path_t*, sk_rect_t*);
+
+SK_C_PLUS_PLUS_END_GUARD
+
+#endif
diff --git a/gfx/skia/skia/include/c/sk_picture.h b/gfx/skia/skia/include/c/sk_picture.h
new file mode 100644
index 000000000000..338b7d906ac8
--- /dev/null
+++ b/gfx/skia/skia/include/c/sk_picture.h
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+// EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL
+// DO NOT USE -- FOR INTERNAL TESTING ONLY
+
+#ifndef sk_picture_DEFINED
+#define sk_picture_DEFINED
+
+#include "sk_types.h"
+
+SK_C_PLUS_PLUS_BEGIN_GUARD
+
+/**
+    Create a new sk_picture_recorder_t.  Its resources should be
+    released with a call to sk_picture_recorder_delete().
+*/
+sk_picture_recorder_t* sk_picture_recorder_new();
+/**
+    Release the memory and other resources used by this
+    sk_picture_recorder_t.
+*/
+void sk_picture_recorder_delete(sk_picture_recorder_t*);
+
+/**
+   Returns the canvas that records the drawing commands
+
+   @param sk_rect_t* the cull rect used when recording this
+                     picture. Any drawing the falls outside of this
+                     rect is undefined, and may be drawn or it may not.
+*/
+sk_canvas_t* sk_picture_recorder_begin_recording(sk_picture_recorder_t*, const sk_rect_t*);
+/**
+    Signal that the caller is done recording. This invalidates the
+    canvas returned by begin_recording. Ownership of the sk_picture_t
+    is passed to the caller, who must call sk_picture_unref() when
+    they are done using it.  The returned picture is immutable.
+*/
+sk_picture_t* sk_picture_recorder_end_recording(sk_picture_recorder_t*);
+
+/**
+    Increment the reference count on the given sk_picture_t. Must be
+    balanced by a call to sk_picture_unref().
+*/
+void sk_picture_ref(sk_picture_t*);
+/**
+    Decrement the reference count. If the reference count is 1 before
+    the decrement, then release both the memory holding the
+    sk_picture_t and any resouces it may be managing.  New
+    sk_picture_t are created with a reference count of 1.
+*/
+void sk_picture_unref(sk_picture_t*);
+
+/**
+    Returns a non-zero value unique among all pictures.
+ */
+uint32_t sk_picture_get_unique_id(sk_picture_t*);
+
+/**
+    Return the cull rect specified when this picture was recorded.
+*/
+sk_rect_t sk_picture_get_bounds(sk_picture_t*);
+
+SK_C_PLUS_PLUS_END_GUARD
+
+#endif
diff --git a/gfx/skia/skia/include/c/sk_shader.h b/gfx/skia/skia/include/c/sk_shader.h
new file mode 100644
index 000000000000..702cda7fd454
--- /dev/null
+++ b/gfx/skia/skia/include/c/sk_shader.h
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+// EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL
+// DO NOT USE -- FOR INTERNAL TESTING ONLY
+
+#ifndef sk_shader_DEFINED
+#define sk_shader_DEFINED
+
+#include "sk_types.h"
+
+SK_C_PLUS_PLUS_BEGIN_GUARD
+
+void sk_shader_ref(sk_shader_t*);
+void sk_shader_unref(sk_shader_t*);
+
+typedef enum {
+    CLAMP_SK_SHADER_TILEMODE,
+    REPEAT_SK_SHADER_TILEMODE,
+    MIRROR_SK_SHADER_TILEMODE,
+} sk_shader_tilemode_t;
+
+/**
+    Returns a shader that generates a linear gradient between the two
+    specified points.
+
+    @param points The start and end points for the gradient.
+    @param colors The array[count] of colors, to be distributed between
+                  the two points
+    @param colorPos May be NULL. array[count] of SkScalars, or NULL, of
+                    the relative position of each corresponding color
+                    in the colors array. If this is NULL, the the
+                    colors are distributed evenly between the start
+                    and end point.  If this is not null, the values
+                    must begin with 0, end with 1.0, and intermediate
+                    values must be strictly increasing.
+    @param colorCount Must be >=2. The number of colors (and pos if not
+                      NULL) entries.
+    @param mode The tiling mode
+*/
+sk_shader_t* sk_shader_new_linear_gradient(const sk_point_t points[2],
+                                           const sk_color_t colors[],
+                                           const float colorPos[],
+                                           int colorCount,
+                                           sk_shader_tilemode_t tileMode,
+                                           const sk_matrix_t* localMatrix);
+
+
+/**
+    Returns a shader that generates a radial gradient given the center
+    and radius.
+
+    @param center The center of the circle for this gradient
+    @param radius Must be positive. The radius of the circle for this
+                  gradient
+    @param colors The array[count] of colors, to be distributed
+                  between the center and edge of the circle
+    @param colorPos May be NULL. The array[count] of the relative
+                    position of each corresponding color in the colors
+                    array. If this is NULL, the the colors are
+                    distributed evenly between the center and edge of
+                    the circle.  If this is not null, the values must
+                    begin with 0, end with 1.0, and intermediate
+                    values must be strictly increasing.
+    @param count Must be >= 2. The number of colors (and pos if not
+                 NULL) entries
+    @param tileMode The tiling mode
+    @param localMatrix May be NULL
+*/
+sk_shader_t* sk_shader_new_radial_gradient(const sk_point_t* center,
+                                           float radius,
+                                           const sk_color_t colors[],
+                                           const float colorPos[],
+                                           int colorCount,
+                                           sk_shader_tilemode_t tileMode,
+                                           const sk_matrix_t* localMatrix);
+
+/**
+    Returns a shader that generates a sweep gradient given a center.
+
+    @param center The coordinates of the center of the sweep
+    @param colors The array[count] of colors, to be distributed around
+                  the center.
+    @param colorPos May be NULL. The array[count] of the relative
+                    position of each corresponding color in the colors
+                    array. If this is NULL, the the colors are
+                    distributed evenly between the center and edge of
+                    the circle.  If this is not null, the values must
+                    begin with 0, end with 1.0, and intermediate
+                    values must be strictly increasing.
+    @param colorCount Must be >= 2. The number of colors (and pos if
+                      not NULL) entries
+    @param localMatrix May be NULL
+*/
+sk_shader_t* sk_shader_new_sweep_gradient(const sk_point_t* center,
+                                          const sk_color_t colors[],
+                                          const float colorPos[],
+                                          int colorCount,
+                                          const sk_matrix_t* localMatrix);
+
+/**
+    Returns a shader that generates a conical gradient given two circles, or
+    returns NULL if the inputs are invalid. The gradient interprets the
+    two circles according to the following HTML spec.
+    http://dev.w3.org/html5/2dcontext/#dom-context-2d-createradialgradient
+
+    Returns a shader that generates a sweep gradient given a center.
+
+    @param start, startRadius Defines the first circle.
+    @param end, endRadius Defines the first circle.
+    @param colors The array[count] of colors, to be distributed between
+                  the two circles.
+    @param colorPos May be NULL. The array[count] of the relative
+                    position of each corresponding color in the colors
+                    array. If this is NULL, the the colors are
+                    distributed evenly between the two circles.  If
+                    this is not null, the values must begin with 0,
+                    end with 1.0, and intermediate values must be
+                    strictly increasing.
+    @param colorCount Must be >= 2. The number of colors (and pos if
+                      not NULL) entries
+    @param tileMode The tiling mode
+    @param localMatrix May be NULL
+
+*/
+sk_shader_t* sk_shader_new_two_point_conical_gradient(
+        const sk_point_t* start,
+        float startRadius,
+        const sk_point_t* end,
+        float endRadius,
+        const sk_color_t colors[],
+        const float colorPos[],
+        int colorCount,
+        sk_shader_tilemode_t tileMode,
+        const sk_matrix_t* localMatrix);
+
+SK_C_PLUS_PLUS_END_GUARD
+
+#endif
diff --git a/gfx/skia/skia/include/c/sk_surface.h b/gfx/skia/skia/include/c/sk_surface.h
new file mode 100644
index 000000000000..d634185eec5c
--- /dev/null
+++ b/gfx/skia/skia/include/c/sk_surface.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+// EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL
+// DO NOT USE -- FOR INTERNAL TESTING ONLY
+
+#ifndef sk_surface_DEFINED
+#define sk_surface_DEFINED
+
+#include "sk_types.h"
+
+SK_C_PLUS_PLUS_BEGIN_GUARD
+
+/**
+    Return a new surface, with the memory for the pixels automatically
+    allocated.  If the requested surface cannot be created, or the
+    request is not a supported configuration, NULL will be returned.
+
+    @param sk_imageinfo_t* Specify the width, height, color type, and
+                           alpha type for the surface.
+
+    @param sk_surfaceprops_t* If not NULL, specify additional non-default
+                              properties of the surface.
+*/
+SK_API sk_surface_t* sk_surface_new_raster(const sk_imageinfo_t*, const sk_surfaceprops_t*);
+
+/**
+    Create a new surface which will draw into the specified pixels
+    with the specified rowbytes.  If the requested surface cannot be
+    created, or the request is not a supported configuration, NULL
+    will be returned.
+
+    @param sk_imageinfo_t* Specify the width, height, color type, and
+                           alpha type for the surface.
+    @param void* pixels Specify the location in memory where the
+                        destination pixels are.  This memory must
+                        outlast this surface.
+     @param size_t rowBytes Specify the difference, in bytes, between
+                           each adjacent row.  Should be at least
+                           (width * sizeof(one pixel)).
+    @param sk_surfaceprops_t* If not NULL, specify additional non-default
+                              properties of the surface.
+*/
+SK_API sk_surface_t* sk_surface_new_raster_direct(const sk_imageinfo_t*,
+                                                  void* pixels, size_t rowBytes,
+                                                  const sk_surfaceprops_t* props);
+
+/**
+    Decrement the reference count. If the reference count is 1 before
+    the decrement, then release both the memory holding the
+    sk_surface_t and any pixel memory it may be managing.  New
+    sk_surface_t are created with a reference count of 1.
+*/
+SK_API void sk_surface_unref(sk_surface_t*);
+
+/**
+ *  Return the canvas associated with this surface. Note: the canvas is owned by the surface,
+ *  so the returned object is only valid while the owning surface is valid.
+ */
+SK_API sk_canvas_t* sk_surface_get_canvas(sk_surface_t*);
+
+/**
+ *  Call sk_image_unref() when the returned image is no longer used.
+ */
+SK_API sk_image_t* sk_surface_new_image_snapshot(sk_surface_t*);
+
+SK_C_PLUS_PLUS_END_GUARD
+
+#endif
diff --git a/gfx/skia/skia/include/c/sk_types.h b/gfx/skia/skia/include/c/sk_types.h
new file mode 100644
index 000000000000..41dd2715b064
--- /dev/null
+++ b/gfx/skia/skia/include/c/sk_types.h
@@ -0,0 +1,205 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+// EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL EXPERIMENTAL
+// DO NOT USE -- FOR INTERNAL TESTING ONLY
+
+#ifndef sk_types_DEFINED
+#define sk_types_DEFINED
+
+#include <stdint.h>
+#include <stddef.h>
+
+#ifdef __cplusplus
+    #define SK_C_PLUS_PLUS_BEGIN_GUARD    extern "C" {
+    #define SK_C_PLUS_PLUS_END_GUARD      }
+#else
+    #include <stdbool.h>
+    #define SK_C_PLUS_PLUS_BEGIN_GUARD
+    #define SK_C_PLUS_PLUS_END_GUARD
+#endif
+
+#ifndef SK_API
+#define SK_API
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+SK_C_PLUS_PLUS_BEGIN_GUARD
+
+typedef uint32_t sk_color_t;
+
+/* This macro assumes all arguments are >=0 and <=255. */
+#define sk_color_set_argb(a, r, g, b)   (((a) << 24) | ((r) << 16) | ((g) << 8) | (b))
+#define sk_color_get_a(c)               (((c) >> 24) & 0xFF)
+#define sk_color_get_r(c)               (((c) >> 16) & 0xFF)
+#define sk_color_get_g(c)               (((c) >>  8) & 0xFF)
+#define sk_color_get_b(c)               (((c) >>  0) & 0xFF)
+
+typedef enum {
+    UNKNOWN_SK_COLORTYPE,
+    RGBA_8888_SK_COLORTYPE,
+    BGRA_8888_SK_COLORTYPE,
+    ALPHA_8_SK_COLORTYPE,
+} sk_colortype_t;
+
+typedef enum {
+    OPAQUE_SK_ALPHATYPE,
+    PREMUL_SK_ALPHATYPE,
+    UNPREMUL_SK_ALPHATYPE,
+} sk_alphatype_t;
+
+typedef enum {
+    INTERSECT_SK_CLIPTYPE,
+    DIFFERENCE_SK_CLIPTYPE,
+} sk_cliptype_t;
+
+typedef enum {
+    UNKNOWN_SK_PIXELGEOMETRY,
+    RGB_H_SK_PIXELGEOMETRY,
+    BGR_H_SK_PIXELGEOMETRY,
+    RGB_V_SK_PIXELGEOMETRY,
+    BGR_V_SK_PIXELGEOMETRY,
+} sk_pixelgeometry_t;
+
+/**
+    Return the default sk_colortype_t; this is operating-system dependent.
+*/
+SK_API sk_colortype_t sk_colortype_get_default_8888();
+
+typedef struct {
+    int32_t         width;
+    int32_t         height;
+    sk_colortype_t  colorType;
+    sk_alphatype_t  alphaType;
+} sk_imageinfo_t;
+
+typedef struct {
+    sk_pixelgeometry_t pixelGeometry;
+} sk_surfaceprops_t;
+
+typedef struct {
+    float   x;
+    float   y;
+} sk_point_t;
+
+typedef struct {
+    int32_t left;
+    int32_t top;
+    int32_t right;
+    int32_t bottom;
+} sk_irect_t;
+
+typedef struct {
+    float   left;
+    float   top;
+    float   right;
+    float   bottom;
+} sk_rect_t;
+
+typedef struct {
+    float   mat[9];
+} sk_matrix_t;
+
+/**
+    A sk_canvas_t encapsulates all of the state about drawing into a
+    destination This includes a reference to the destination itself,
+    and a stack of matrix/clip values.
+*/
+typedef struct sk_canvas_t sk_canvas_t;
+/**
+    A sk_data_ holds an immutable data buffer.
+*/
+typedef struct sk_data_t sk_data_t;
+/**
+    A sk_image_t is an abstraction for drawing a rectagle of pixels.
+    The content of the image is always immutable, though the actual
+    storage may change, if for example that image can be re-created via
+    encoded data or other means.
+*/
+typedef struct sk_image_t sk_image_t;
+/**
+    A sk_maskfilter_t is an object that perform transformations on an
+    alpha-channel mask before drawing it; it may be installed into a
+    sk_paint_t.  Each time a primitive is drawn, it is first
+    scan-converted into a alpha mask, which os handed to the
+    maskfilter, which may create a new mask is to render into the
+    destination.
+ */
+typedef struct sk_maskfilter_t sk_maskfilter_t;
+/**
+    A sk_paint_t holds the style and color information about how to
+    draw geometries, text and bitmaps.
+*/
+typedef struct sk_paint_t sk_paint_t;
+/**
+    A sk_path_t encapsulates compound (multiple contour) geometric
+    paths consisting of straight line segments, quadratic curves, and
+    cubic curves.
+*/
+typedef struct sk_path_t sk_path_t;
+/**
+    A sk_picture_t holds recorded canvas drawing commands to be played
+    back at a later time.
+*/
+typedef struct sk_picture_t sk_picture_t;
+/**
+    A sk_picture_recorder_t holds a sk_canvas_t that records commands
+    to create a sk_picture_t.
+*/
+typedef struct sk_picture_recorder_t sk_picture_recorder_t;
+/**
+    A sk_shader_t specifies the source color(s) for what is being drawn. If a
+    paint has no shader, then the paint's color is used. If the paint
+    has a shader, then the shader's color(s) are use instead, but they
+    are modulated by the paint's alpha.
+*/
+typedef struct sk_shader_t sk_shader_t;
+/**
+    A sk_surface_t holds the destination for drawing to a canvas. For
+    raster drawing, the destination is an array of pixels in memory.
+    For GPU drawing, the destination is a texture or a framebuffer.
+*/
+typedef struct sk_surface_t sk_surface_t;
+
+typedef enum {
+    CLEAR_SK_XFERMODE_MODE,
+    SRC_SK_XFERMODE_MODE,
+    DST_SK_XFERMODE_MODE,
+    SRCOVER_SK_XFERMODE_MODE,
+    DSTOVER_SK_XFERMODE_MODE,
+    SRCIN_SK_XFERMODE_MODE,
+    DSTIN_SK_XFERMODE_MODE,
+    SRCOUT_SK_XFERMODE_MODE,
+    DSTOUT_SK_XFERMODE_MODE,
+    SRCATOP_SK_XFERMODE_MODE,
+    DSTATOP_SK_XFERMODE_MODE,
+    XOR_SK_XFERMODE_MODE,
+    PLUS_SK_XFERMODE_MODE,
+    MODULATE_SK_XFERMODE_MODE,
+    SCREEN_SK_XFERMODE_MODE,
+    OVERLAY_SK_XFERMODE_MODE,
+    DARKEN_SK_XFERMODE_MODE,
+    LIGHTEN_SK_XFERMODE_MODE,
+    COLORDODGE_SK_XFERMODE_MODE,
+    COLORBURN_SK_XFERMODE_MODE,
+    HARDLIGHT_SK_XFERMODE_MODE,
+    SOFTLIGHT_SK_XFERMODE_MODE,
+    DIFFERENCE_SK_XFERMODE_MODE,
+    EXCLUSION_SK_XFERMODE_MODE,
+    MULTIPLY_SK_XFERMODE_MODE,
+    HUE_SK_XFERMODE_MODE,
+    SATURATION_SK_XFERMODE_MODE,
+    COLOR_SK_XFERMODE_MODE,
+    LUMINOSITY_SK_XFERMODE_MODE,
+} sk_xfermode_mode_t;
+
+//////////////////////////////////////////////////////////////////////////////////////////
+
+SK_C_PLUS_PLUS_END_GUARD
+
+#endif
diff --git a/gfx/skia/skia/include/codec/SkAndroidCodec.h b/gfx/skia/skia/include/codec/SkAndroidCodec.h
new file mode 100644
index 000000000000..f979886a43ec
--- /dev/null
+++ b/gfx/skia/skia/include/codec/SkAndroidCodec.h
@@ -0,0 +1,230 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkAndroidCodec_DEFINED
+#define SkAndroidCodec_DEFINED
+
+#include "SkCodec.h"
+#include "SkEncodedFormat.h"
+#include "SkStream.h"
+#include "SkTypes.h"
+
+/**
+ *  Abstract interface defining image codec functionality that is necessary for
+ *  Android.
+ */
+class SkAndroidCodec : SkNoncopyable {
+public:
+    /**
+     *  If this stream represents an encoded image that we know how to decode,
+     *  return an SkAndroidCodec that can decode it. Otherwise return NULL.
+     *
+     *  The SkPngChunkReader handles unknown chunks in PNGs.
+     *  See SkCodec.h for more details.
+     *
+     *  If NULL is returned, the stream is deleted immediately. Otherwise, the
+     *  SkCodec takes ownership of it, and will delete it when done with it.
+     */
+    static SkAndroidCodec* NewFromStream(SkStream*, SkPngChunkReader* = NULL);
+
+    /**
+     *  If this data represents an encoded image that we know how to decode,
+     *  return an SkAndroidCodec that can decode it. Otherwise return NULL.
+     *
+     *  The SkPngChunkReader handles unknown chunks in PNGs.
+     *  See SkCodec.h for more details.
+     *
+     *  Will take a ref if it returns a codec, else will not affect the data.
+     */
+    static SkAndroidCodec* NewFromData(SkData*, SkPngChunkReader* = NULL);
+
+    virtual ~SkAndroidCodec() {}
+
+
+    const SkImageInfo& getInfo() const { return fInfo; }
+
+    /**
+     *  Format of the encoded data.
+     */
+    SkEncodedFormat getEncodedFormat() const { return this->onGetEncodedFormat(); }
+
+    /**
+     *  Returns the dimensions of the scaled output image, for an input
+     *  sampleSize.
+     *
+     *  When the sample size divides evenly into the original dimensions, the
+     *  scaled output dimensions will simply be equal to the original
+     *  dimensions divided by the sample size.
+     *
+     *  When the sample size does not divide even into the original
+     *  dimensions, the codec may round up or down, depending on what is most
+     *  efficient to decode.
+     *
+     *  Finally, the codec will always recommend a non-zero output, so the output
+     *  dimension will always be one if the sampleSize is greater than the
+     *  original dimension.
+     */
+    SkISize getSampledDimensions(int sampleSize) const;
+
+    /**
+     *  Return (via desiredSubset) a subset which can decoded from this codec,
+     *  or false if the input subset is invalid.
+     *
+     *  @param desiredSubset in/out parameter
+     *                       As input, a desired subset of the original bounds
+     *                       (as specified by getInfo).
+     *                       As output, if true is returned, desiredSubset may
+     *                       have been modified to a subset which is
+     *                       supported. Although a particular change may have
+     *                       been made to desiredSubset to create something
+     *                       supported, it is possible other changes could
+     *                       result in a valid subset.  If false is returned,
+     *                       desiredSubset's value is undefined.
+     *  @return true         If the input desiredSubset is valid.
+     *                       desiredSubset may be modified to a subset
+     *                       supported by the codec.
+     *          false        If desiredSubset is invalid (NULL or not fully
+     *                       contained within the image).
+     */
+    bool getSupportedSubset(SkIRect* desiredSubset) const;
+    // TODO: Rename SkCodec::getValidSubset() to getSupportedSubset()
+
+    /**
+     *  Returns the dimensions of the scaled, partial output image, for an
+     *  input sampleSize and subset.
+     *
+     *  @param sampleSize Factor to scale down by.
+     *  @param subset     Must be a valid subset of the original image
+     *                    dimensions and a subset supported by SkAndroidCodec.
+     *                    getSubset() can be used to obtain a subset supported
+     *                    by SkAndroidCodec.
+     *  @return           Size of the scaled partial image.  Or zero size
+     *                    if either of the inputs is invalid.
+     */
+    SkISize getSampledSubsetDimensions(int sampleSize, const SkIRect& subset) const;
+
+    /**
+     *  Additional options to pass to getAndroidPixels().
+     */
+    // FIXME: It's a bit redundant to name these AndroidOptions when this class is already
+    //        called SkAndroidCodec.  On the other hand, it's may be a bit confusing to call
+    //        these Options when SkCodec has a slightly different set of Options.  Maybe these
+    //        should be DecodeOptions or SamplingOptions?
+    struct AndroidOptions {
+        AndroidOptions()
+            : fZeroInitialized(SkCodec::kNo_ZeroInitialized)
+            , fSubset(nullptr)
+            , fColorPtr(nullptr)
+            , fColorCount(nullptr)
+            , fSampleSize(1)
+        {}
+
+        /**
+         *  Indicates is destination pixel memory is zero initialized.
+         */
+        SkCodec::ZeroInitialized fZeroInitialized;
+
+        /**
+         *  If not NULL, represents a subset of the original image to decode.
+         *
+         *  Must be within the bounds returned by getInfo().
+         *
+         *  If the EncodedFormat is kWEBP_SkEncodedFormat, the top and left
+         *  values must be even.
+         */
+        SkIRect* fSubset;
+
+        /**
+         *  If the client has requested a decode to kIndex8_SkColorType
+         *  (specified in the SkImageInfo), then the caller must provide
+         *  storage for up to 256 SkPMColor values in fColorPtr.  On success,
+         *  the codec must copy N colors into that storage, (where N is the
+         *  logical number of table entries) and set fColorCount to N.
+         *
+         *  If the client does not request kIndex8_SkColorType, then the last
+         *  two parameters may be NULL. If fColorCount is not null, it will be
+         *  set to 0.
+         */
+        SkPMColor* fColorPtr;
+        int*       fColorCount;
+
+        /**
+         *  The client may provide an integer downscale factor for the decode.
+         *  The codec may implement this downscaling by sampling or another
+         *  method if it is more efficient.
+         */
+        int fSampleSize;
+    };
+
+    /**
+     *  Decode into the given pixels, a block of memory of size at
+     *  least (info.fHeight - 1) * rowBytes + (info.fWidth *
+     *  bytesPerPixel)
+     *
+     *  Repeated calls to this function should give the same results,
+     *  allowing the PixelRef to be immutable.
+     *
+     *  @param info A description of the format (config, size)
+     *         expected by the caller.  This can simply be identical
+     *         to the info returned by getInfo().
+     *
+     *         This contract also allows the caller to specify
+     *         different output-configs, which the implementation can
+     *         decide to support or not.
+     *
+     *         A size that does not match getInfo() implies a request
+     *         to scale or subset. If the codec cannot perform this
+     *         scaling or subsetting, it will return an error code.
+     *
+     *  If info is kIndex8_SkColorType, then the caller must provide storage for up to 256
+     *  SkPMColor values in options->fColorPtr. On success the codec must copy N colors into
+     *  that storage, (where N is the logical number of table entries) and set
+     *  options->fColorCount to N.
+     *
+     *  If info is not kIndex8_SkColorType, options->fColorPtr and options->fColorCount may
+     *  be nullptr.
+     *
+     *  The AndroidOptions object is also used to specify any requested scaling or subsetting
+     *  using options->fSampleSize and options->fSubset.
+     *
+     *  @return Result kSuccess, or another value explaining the type of failure.
+     */
+    // FIXME: It's a bit redundant to name this getAndroidPixels() when this class is already
+    //        called SkAndroidCodec.  On the other hand, it's may be a bit confusing to call
+    //        this getPixels() when it is a slightly different API than SkCodec's getPixels().
+    //        Maybe this should be decode() or decodeSubset()?
+    SkCodec::Result getAndroidPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
+            const AndroidOptions* options);
+
+    /**
+     *  Simplified version of getAndroidPixels() where we supply the default AndroidOptions.
+     *
+     *  This will return an error if the info is kIndex_8_SkColorType and also will not perform
+     *  any scaling or subsetting.
+     */
+    SkCodec::Result getAndroidPixels(const SkImageInfo& info, void* pixels, size_t rowBytes);
+
+protected:
+
+    SkAndroidCodec(const SkImageInfo&);
+
+    virtual SkEncodedFormat onGetEncodedFormat() const = 0;
+
+    virtual SkISize onGetSampledDimensions(int sampleSize) const = 0;
+
+    virtual bool onGetSupportedSubset(SkIRect* desiredSubset) const = 0;
+
+    virtual SkCodec::Result onGetAndroidPixels(const SkImageInfo& info, void* pixels,
+            size_t rowBytes, const AndroidOptions& options) = 0;
+
+private:
+
+    // This will always be a reference to the info that is contained by the
+    // embedded SkCodec.
+    const SkImageInfo& fInfo;
+};
+#endif // SkAndroidCodec_DEFINED
diff --git a/gfx/skia/skia/include/codec/SkCodec.h b/gfx/skia/skia/include/codec/SkCodec.h
new file mode 100644
index 000000000000..9f28af010edf
--- /dev/null
+++ b/gfx/skia/skia/include/codec/SkCodec.h
@@ -0,0 +1,614 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkCodec_DEFINED
+#define SkCodec_DEFINED
+
+#include "../private/SkTemplates.h"
+#include "SkColor.h"
+#include "SkEncodedFormat.h"
+#include "SkImageInfo.h"
+#include "SkSize.h"
+#include "SkStream.h"
+#include "SkTypes.h"
+
+class SkData;
+class SkPngChunkReader;
+class SkSampler;
+
+/**
+ *  Abstraction layer directly on top of an image codec.
+ */
+class SkCodec : SkNoncopyable {
+public:
+    /**
+     *  If this stream represents an encoded image that we know how to decode,
+     *  return an SkCodec that can decode it. Otherwise return NULL.
+     *
+     *  If the SkPngChunkReader is not NULL then:
+     *      If the image is not a PNG, the SkPngChunkReader will be ignored.
+     *      If the image is a PNG, the SkPngChunkReader will be reffed.
+     *      If the PNG has unknown chunks, the SkPngChunkReader will be used
+     *      to handle these chunks.  SkPngChunkReader will be called to read
+     *      any unknown chunk at any point during the creation of the codec
+     *      or the decode.  Note that if SkPngChunkReader fails to read a
+     *      chunk, this could result in a failure to create the codec or a
+     *      failure to decode the image.
+     *      If the PNG does not contain unknown chunks, the SkPngChunkReader
+     *      will not be used or modified.
+     *
+     *  If NULL is returned, the stream is deleted immediately. Otherwise, the
+     *  SkCodec takes ownership of it, and will delete it when done with it.
+     */
+    static SkCodec* NewFromStream(SkStream*, SkPngChunkReader* = NULL);
+
+    /**
+     *  If this data represents an encoded image that we know how to decode,
+     *  return an SkCodec that can decode it. Otherwise return NULL.
+     *
+     *  If the SkPngChunkReader is not NULL then:
+     *      If the image is not a PNG, the SkPngChunkReader will be ignored.
+     *      If the image is a PNG, the SkPngChunkReader will be reffed.
+     *      If the PNG has unknown chunks, the SkPngChunkReader will be used
+     *      to handle these chunks.  SkPngChunkReader will be called to read
+     *      any unknown chunk at any point during the creation of the codec
+     *      or the decode.  Note that if SkPngChunkReader fails to read a
+     *      chunk, this could result in a failure to create the codec or a
+     *      failure to decode the image.
+     *      If the PNG does not contain unknown chunks, the SkPngChunkReader
+     *      will not be used or modified.
+     *
+     *  Will take a ref if it returns a codec, else will not affect the data.
+     */
+    static SkCodec* NewFromData(SkData*, SkPngChunkReader* = NULL);
+
+    virtual ~SkCodec();
+
+    /**
+     *  Return the ImageInfo associated with this codec.
+     */
+    const SkImageInfo& getInfo() const { return fSrcInfo; }
+
+    /**
+     *  Return a size that approximately supports the desired scale factor.
+     *  The codec may not be able to scale efficiently to the exact scale
+     *  factor requested, so return a size that approximates that scale.
+     *  The returned value is the codec's suggestion for the closest valid
+     *  scale that it can natively support
+     */
+    SkISize getScaledDimensions(float desiredScale) const {
+        // Negative and zero scales are errors.
+        SkASSERT(desiredScale > 0.0f);
+        if (desiredScale <= 0.0f) {
+            return SkISize::Make(0, 0);
+        }
+
+        // Upscaling is not supported. Return the original size if the client
+        // requests an upscale.
+        if (desiredScale >= 1.0f) {
+            return this->getInfo().dimensions();
+        }
+        return this->onGetScaledDimensions(desiredScale);
+    }
+
+    /**
+     *  Return (via desiredSubset) a subset which can decoded from this codec,
+     *  or false if this codec cannot decode subsets or anything similar to
+     *  desiredSubset.
+     *
+     *  @param desiredSubset In/out parameter. As input, a desired subset of
+     *      the original bounds (as specified by getInfo). If true is returned,
+     *      desiredSubset may have been modified to a subset which is
+     *      supported. Although a particular change may have been made to
+     *      desiredSubset to create something supported, it is possible other
+     *      changes could result in a valid subset.
+     *      If false is returned, desiredSubset's value is undefined.
+     *  @return true if this codec supports decoding desiredSubset (as
+     *      returned, potentially modified)
+     */
+    bool getValidSubset(SkIRect* desiredSubset) const {
+        return this->onGetValidSubset(desiredSubset);
+    }
+
+    /**
+     *  Format of the encoded data.
+     */
+    SkEncodedFormat getEncodedFormat() const { return this->onGetEncodedFormat(); }
+
+    /**
+     *  Used to describe the result of a call to getPixels().
+     *
+     *  Result is the union of possible results from subclasses.
+     */
+    enum Result {
+        /**
+         *  General return value for success.
+         */
+        kSuccess,
+        /**
+         *  The input is incomplete. A partial image was generated.
+         */
+        kIncompleteInput,
+        /**
+         *  The generator cannot convert to match the request, ignoring
+         *  dimensions.
+         */
+        kInvalidConversion,
+        /**
+         *  The generator cannot scale to requested size.
+         */
+        kInvalidScale,
+        /**
+         *  Parameters (besides info) are invalid. e.g. NULL pixels, rowBytes
+         *  too small, etc.
+         */
+        kInvalidParameters,
+        /**
+         *  The input did not contain a valid image.
+         */
+        kInvalidInput,
+        /**
+         *  Fulfilling this request requires rewinding the input, which is not
+         *  supported for this input.
+         */
+        kCouldNotRewind,
+        /**
+         *  This method is not implemented by this codec.
+         *  FIXME: Perhaps this should be kUnsupported?
+         */
+        kUnimplemented,
+    };
+
+    /**
+     *  Whether or not the memory passed to getPixels is zero initialized.
+     */
+    enum ZeroInitialized {
+        /**
+         *  The memory passed to getPixels is zero initialized. The SkCodec
+         *  may take advantage of this by skipping writing zeroes.
+         */
+        kYes_ZeroInitialized,
+        /**
+         *  The memory passed to getPixels has not been initialized to zero,
+         *  so the SkCodec must write all zeroes to memory.
+         *
+         *  This is the default. It will be used if no Options struct is used.
+         */
+        kNo_ZeroInitialized,
+    };
+
+    /**
+     *  Additional options to pass to getPixels.
+     */
+    struct Options {
+        Options()
+            : fZeroInitialized(kNo_ZeroInitialized)
+            , fSubset(NULL)
+        {}
+
+        ZeroInitialized fZeroInitialized;
+        /**
+         *  If not NULL, represents a subset of the original image to decode.
+         *  Must be within the bounds returned by getInfo().
+         *  If the EncodedFormat is kWEBP_SkEncodedFormat (the only one which
+         *  currently supports subsets), the top and left values must be even.
+         *
+         *  In getPixels, we will attempt to decode the exact rectangular
+         *  subset specified by fSubset.
+         *
+         *  In a scanline decode, it does not make sense to specify a subset
+         *  top or subset height, since the client already controls which rows
+         *  to get and which rows to skip.  During scanline decodes, we will
+         *  require that the subset top be zero and the subset height be equal
+         *  to the full height.  We will, however, use the values of
+         *  subset left and subset width to decode partial scanlines on calls
+         *  to getScanlines().
+         */
+        SkIRect*        fSubset;
+    };
+
+    /**
+     *  Decode into the given pixels, a block of memory of size at
+     *  least (info.fHeight - 1) * rowBytes + (info.fWidth *
+     *  bytesPerPixel)
+     *
+     *  Repeated calls to this function should give the same results,
+     *  allowing the PixelRef to be immutable.
+     *
+     *  @param info A description of the format (config, size)
+     *         expected by the caller.  This can simply be identical
+     *         to the info returned by getInfo().
+     *
+     *         This contract also allows the caller to specify
+     *         different output-configs, which the implementation can
+     *         decide to support or not.
+     *
+     *         A size that does not match getInfo() implies a request
+     *         to scale. If the generator cannot perform this scale,
+     *         it will return kInvalidScale.
+     *
+     *  If info is kIndex8_SkColorType, then the caller must provide storage for up to 256
+     *  SkPMColor values in ctable. On success the generator must copy N colors into that storage,
+     *  (where N is the logical number of table entries) and set ctableCount to N.
+     *
+     *  If info is not kIndex8_SkColorType, then the last two parameters may be NULL. If ctableCount
+     *  is not null, it will be set to 0.
+     *
+     *  If a scanline decode is in progress, scanline mode will end, requiring the client to call
+     *  startScanlineDecode() in order to return to decoding scanlines.
+     *
+     *  @return Result kSuccess, or another value explaining the type of failure.
+     */
+    Result getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, const Options*,
+                     SkPMColor ctable[], int* ctableCount);
+
+    /**
+     *  Simplified version of getPixels() that asserts that info is NOT kIndex8_SkColorType and
+     *  uses the default Options.
+     */
+    Result getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes);
+
+    /**
+     *  Some images may initially report that they have alpha due to the format
+     *  of the encoded data, but then never use any colors which have alpha
+     *  less than 100%. This function can be called *after* decoding to
+     *  determine if such an image truly had alpha. Calling it before decoding
+     *  is undefined.
+     *  FIXME: see skbug.com/3582.
+     */
+    bool reallyHasAlpha() const {
+        return this->onReallyHasAlpha();
+    }
+
+    /**
+     * The remaining functions revolve around decoding scanlines.
+     */
+
+    /**
+     *  Prepare for a scanline decode with the specified options.
+     *
+     *  After this call, this class will be ready to decode the first scanline.
+     *
+     *  This must be called in order to call getScanlines or skipScanlines.
+     *
+     *  This may require rewinding the stream.
+     *
+     *  Not all SkCodecs support this.
+     *
+     *  @param dstInfo Info of the destination. If the dimensions do not match
+     *      those of getInfo, this implies a scale.
+     *  @param options Contains decoding options, including if memory is zero
+     *      initialized.
+     *  @param ctable A pointer to a color table.  When dstInfo.colorType() is
+     *      kIndex8, this should be non-NULL and have enough storage for 256
+     *      colors.  The color table will be populated after decoding the palette.
+     *  @param ctableCount A pointer to the size of the color table.  When
+     *      dstInfo.colorType() is kIndex8, this should be non-NULL.  It will
+     *      be modified to the true size of the color table (<= 256) after
+     *      decoding the palette.
+     *  @return Enum representing success or reason for failure.
+     */
+    Result startScanlineDecode(const SkImageInfo& dstInfo, const SkCodec::Options* options,
+            SkPMColor ctable[], int* ctableCount);
+
+    /**
+     *  Simplified version of startScanlineDecode() that asserts that info is NOT
+     *  kIndex8_SkColorType and uses the default Options.
+     */
+    Result startScanlineDecode(const SkImageInfo& dstInfo);
+
+    /**
+     *  Write the next countLines scanlines into dst.
+     *
+     *  Not valid to call before calling startScanlineDecode().
+     *
+     *  @param dst Must be non-null, and large enough to hold countLines
+     *      scanlines of size rowBytes.
+     *  @param countLines Number of lines to write.
+     *  @param rowBytes Number of bytes per row. Must be large enough to hold
+     *      a scanline based on the SkImageInfo used to create this object.
+     *  @return the number of lines successfully decoded.  If this value is
+     *      less than countLines, this will fill the remaining lines with a
+     *      default value.
+     */
+    int getScanlines(void* dst, int countLines, size_t rowBytes);
+
+    /**
+     *  Skip count scanlines.
+     *
+     *  Not valid to call before calling startScanlineDecode().
+     *
+     *  The default version just calls onGetScanlines and discards the dst.
+     *  NOTE: If skipped lines are the only lines with alpha, this default
+     *  will make reallyHasAlpha return true, when it could have returned
+     *  false.
+     *
+     *  @return true if the scanlines were successfully skipped
+     *          false on failure, possible reasons for failure include:
+     *              An incomplete input image stream.
+     *              Calling this function before calling startScanlineDecode().
+     *              If countLines is less than zero or so large that it moves
+     *                  the current scanline past the end of the image.
+     */
+    bool skipScanlines(int countLines);
+
+    /**
+     *  The order in which rows are output from the scanline decoder is not the
+     *  same for all variations of all image types.  This explains the possible
+     *  output row orderings.
+     */
+    enum SkScanlineOrder {
+        /*
+         * By far the most common, this indicates that the image can be decoded
+         * reliably using the scanline decoder, and that rows will be output in
+         * the logical order.
+         */
+        kTopDown_SkScanlineOrder,
+
+        /*
+         * This indicates that the scanline decoder reliably outputs rows, but
+         * they will be returned in reverse order.  If the scanline format is
+         * kBottomUp, the nextScanline() API can be used to determine the actual
+         * y-coordinate of the next output row, but the client is not forced
+         * to take advantage of this, given that it's not too tough to keep
+         * track independently.
+         *
+         * For full image decodes, it is safe to get all of the scanlines at
+         * once, since the decoder will handle inverting the rows as it
+         * decodes.
+         *
+         * For subset decodes and sampling, it is simplest to get and skip
+         * scanlines one at a time, using the nextScanline() API.  It is
+         * possible to ask for larger chunks at a time, but this should be used
+         * with caution.  As with full image decodes, the decoder will handle
+         * inverting the requested rows, but rows will still be delivered
+         * starting from the bottom of the image.
+         *
+         * Upside down bmps are an example.
+         */
+        kBottomUp_SkScanlineOrder,
+
+        /*
+         * This indicates that the scanline decoder reliably outputs rows, but
+         * they will not be in logical order.  If the scanline format is
+         * kOutOfOrder, the nextScanline() API should be used to determine the
+         * actual y-coordinate of the next output row.
+         *
+         * For this scanline ordering, it is advisable to get and skip
+         * scanlines one at a time.
+         *
+         * Interlaced gifs are an example.
+         */
+        kOutOfOrder_SkScanlineOrder,
+
+        /*
+         * Indicates that the entire image must be decoded in order to output
+         * any amount of scanlines.  In this case, it is a REALLY BAD IDEA to
+         * request scanlines 1-by-1 or in small chunks.  The client should
+         * determine which scanlines are needed and ask for all of them in
+         * a single call to getScanlines().
+         *
+         * Interlaced pngs are an example.
+         */
+        kNone_SkScanlineOrder,
+    };
+
+    /**
+     *  An enum representing the order in which scanlines will be returned by
+     *  the scanline decoder.
+     */
+    SkScanlineOrder getScanlineOrder() const { return this->onGetScanlineOrder(); }
+
+    /**
+     *  Returns the y-coordinate of the next row to be returned by the scanline
+     *  decoder.
+     *
+     *  This will equal fCurrScanline, except in the case of strangely
+     *  encoded image types (bottom-up bmps, interlaced gifs).
+     *
+     *  Results are undefined when not in scanline decoding mode.
+     */
+    int nextScanline() const { return this->outputScanline(fCurrScanline); }
+
+    /**
+     * Returns the output y-coordinate of the row that corresponds to an input
+     * y-coordinate.  The input y-coordinate represents where the scanline
+     * is located in the encoded data.
+     *
+     *  This will equal inputScanline, except in the case of strangely
+     *  encoded image types (bottom-up bmps, interlaced gifs).
+     */
+    int outputScanline(int inputScanline) const;
+
+protected:
+    SkCodec(const SkImageInfo&, SkStream*);
+
+    virtual SkISize onGetScaledDimensions(float /* desiredScale */) const {
+        // By default, scaling is not supported.
+        return this->getInfo().dimensions();
+    }
+
+    // FIXME: What to do about subsets??
+    /**
+     *  Subclasses should override if they support dimensions other than the
+     *  srcInfo's.
+     */
+    virtual bool onDimensionsSupported(const SkISize&) {
+        return false;
+    }
+
+    virtual SkEncodedFormat onGetEncodedFormat() const = 0;
+
+    /**
+     * @param rowsDecoded When the encoded image stream is incomplete, this function
+     *                    will return kIncompleteInput and rowsDecoded will be set to
+     *                    the number of scanlines that were successfully decoded.
+     *                    This will allow getPixels() to fill the uninitialized memory.
+     */
+    virtual Result onGetPixels(const SkImageInfo& info,
+                               void* pixels, size_t rowBytes, const Options&,
+                               SkPMColor ctable[], int* ctableCount,
+                               int* rowsDecoded) = 0;
+
+    virtual bool onGetValidSubset(SkIRect* /* desiredSubset */) const {
+        // By default, subsets are not supported.
+        return false;
+    }
+
+    virtual bool onReallyHasAlpha() const { return false; }
+
+    /**
+     *  If the stream was previously read, attempt to rewind.
+     *
+     *  If the stream needed to be rewound, call onRewind.
+     *  @returns true if the codec is at the right position and can be used.
+     *      false if there was a failure to rewind.
+     *
+     *  This is called by getPixels() and start(). Subclasses may call if they
+     *  need to rewind at another time.
+     */
+    bool SK_WARN_UNUSED_RESULT rewindIfNeeded();
+
+    /**
+     *  Called by rewindIfNeeded, if the stream needed to be rewound.
+     *
+     *  Subclasses should do any set up needed after a rewind.
+     */
+    virtual bool onRewind() {
+        return true;
+    }
+
+    /**
+     * On an incomplete input, getPixels() and getScanlines() will fill any uninitialized
+     * scanlines.  This allows the subclass to indicate what value to fill with.
+     *
+     * @param colorType Destination color type.
+     * @param alphaType Destination alpha type.
+     * @return          The value with which to fill uninitialized pixels.
+     *
+     * Note that we can interpret the return value as an SkPMColor, a 16-bit 565 color,
+     * an 8-bit gray color, or an 8-bit index into a color table, depending on the color
+     * type.
+     */
+    uint32_t getFillValue(SkColorType colorType, SkAlphaType alphaType) const {
+        return this->onGetFillValue(colorType, alphaType);
+    }
+
+    /**
+     * Some subclasses will override this function, but this is a useful default for the color
+     * types that we support.  Note that for color types that do not use the full 32-bits,
+     * we will simply take the low bits of the fill value.
+     *
+     * kN32_SkColorType: Transparent or Black
+     * kRGB_565_SkColorType: Black
+     * kGray_8_SkColorType: Black
+     * kIndex_8_SkColorType: First color in color table
+     */
+    virtual uint32_t onGetFillValue(SkColorType /*colorType*/, SkAlphaType alphaType) const {
+        return kOpaque_SkAlphaType == alphaType ? SK_ColorBLACK : SK_ColorTRANSPARENT;
+    }
+
+    /**
+     * Get method for the input stream
+     */
+    SkStream* stream() {
+        return fStream.get();
+    }
+
+    /**
+     *  The remaining functions revolve around decoding scanlines.
+     */
+
+    /**
+     *  Most images types will be kTopDown and will not need to override this function.
+     */
+    virtual SkScanlineOrder onGetScanlineOrder() const { return kTopDown_SkScanlineOrder; }
+
+    /**
+     *  Update the next scanline. Used by interlaced png.
+     */
+    void updateNextScanline(int newY) { fCurrScanline = newY; }
+
+    const SkImageInfo& dstInfo() const { return fDstInfo; }
+
+    const SkCodec::Options& options() const { return fOptions; }
+
+    virtual int onOutputScanline(int inputScanline) const;
+
+private:
+    const SkImageInfo       fSrcInfo;
+    SkAutoTDelete<SkStream> fStream;
+    bool                    fNeedsRewind;
+    // These fields are only meaningful during scanline decodes.
+    SkImageInfo             fDstInfo;
+    SkCodec::Options        fOptions;
+    int                     fCurrScanline;
+
+    /**
+     *  Return whether these dimensions are supported as a scale.
+     *
+     *  The codec may choose to cache the information about scale and subset.
+     *  Either way, the same information will be passed to onGetPixels/onStart
+     *  on success.
+     *
+     *  This must return true for a size returned from getScaledDimensions.
+     */
+    bool dimensionsSupported(const SkISize& dim) {
+        return dim == fSrcInfo.dimensions() || this->onDimensionsSupported(dim);
+    }
+
+    // Methods for scanline decoding.
+    virtual SkCodec::Result onStartScanlineDecode(const SkImageInfo& /*dstInfo*/,
+            const SkCodec::Options& /*options*/, SkPMColor* /*ctable*/, int* /*ctableCount*/) {
+        return kUnimplemented;
+    }
+
+    // Naive default version just calls onGetScanlines on temp memory.
+    virtual bool onSkipScanlines(int countLines) {
+        // FIXME (msarett): Make this a pure virtual and always override this.
+        SkAutoMalloc storage(fDstInfo.minRowBytes());
+
+        // Note that we pass 0 to rowBytes so we continue to use the same memory.
+        // Also note that while getScanlines checks that rowBytes is big enough,
+        // onGetScanlines bypasses that check.
+        // Calling the virtual method also means we do not double count
+        // countLines.
+        return countLines == this->onGetScanlines(storage.get(), countLines, 0);
+    }
+
+    virtual int onGetScanlines(void* /*dst*/, int /*countLines*/, size_t /*rowBytes*/) { return 0; }
+
+    /**
+     * On an incomplete decode, getPixels() and getScanlines() will call this function
+     * to fill any uinitialized memory.
+     *
+     * @param dstInfo        Contains the destination color type
+     *                       Contains the destination alpha type
+     *                       Contains the destination width
+     *                       The height stored in this info is unused
+     * @param dst            Pointer to the start of destination pixel memory
+     * @param rowBytes       Stride length in destination pixel memory
+     * @param zeroInit       Indicates if memory is zero initialized
+     * @param linesRequested Number of lines that the client requested
+     * @param linesDecoded   Number of lines that were successfully decoded
+     */
+    void fillIncompleteImage(const SkImageInfo& dstInfo, void* dst, size_t rowBytes,
+            ZeroInitialized zeroInit, int linesRequested, int linesDecoded);
+
+    /**
+     *  Return an object which will allow forcing scanline decodes to sample in X.
+     *
+     *  May create a sampler, if one is not currently being used. Otherwise, does
+     *  not affect ownership.
+     *
+     *  Only valid during scanline decoding.
+     */
+    virtual SkSampler* getSampler(bool /*createIfNecessary*/) { return nullptr; }
+
+    friend class SkSampledCodec;
+};
+#endif // SkCodec_DEFINED
diff --git a/gfx/skia/skia/include/codec/SkEncodedFormat.h b/gfx/skia/skia/include/codec/SkEncodedFormat.h
new file mode 100644
index 000000000000..003159a8de27
--- /dev/null
+++ b/gfx/skia/skia/include/codec/SkEncodedFormat.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkEncodedFormat_DEFINED
+#define SkEncodedFormat_DEFINED
+
+/**
+ *  Enum describing format of encoded data.
+ */
+enum SkEncodedFormat {
+    kUnknown_SkEncodedFormat,
+    kBMP_SkEncodedFormat,
+    kGIF_SkEncodedFormat,
+    kICO_SkEncodedFormat,
+    kJPEG_SkEncodedFormat,
+    kPNG_SkEncodedFormat,
+    kWBMP_SkEncodedFormat,
+    kWEBP_SkEncodedFormat,
+    kPKM_SkEncodedFormat,
+    kKTX_SkEncodedFormat,
+    kASTC_SkEncodedFormat,
+};
+#endif  // SkEncodedFormat_DEFINED
diff --git a/gfx/skia/skia/include/config/SkUserConfig.h b/gfx/skia/skia/include/config/SkUserConfig.h
index 3d21b4c689d4..f1a4959cadbc 100644
--- a/gfx/skia/skia/include/config/SkUserConfig.h
+++ b/gfx/skia/skia/include/config/SkUserConfig.h
@@ -58,13 +58,6 @@
 //#define SK_DEBUG_GLYPH_CACHE
 //#define SK_DEBUG_PATH
 
-/*  To assist debugging, Skia provides an instance counting utility in
-    include/core/SkInstCount.h. This flag turns on and off that utility to
-    allow instance count tracking in either debug or release builds. By
-    default it is enabled in debug but disabled in release.
- */
-#define SK_ENABLE_INST_COUNT 0
-
 /*  If, in debugging mode, Skia needs to stop (presumably to invoke a debugger)
     it will call SK_CRASH(). If this is not defined it, it is defined in
     SkPostConfig.h to write to an illegal address
@@ -107,14 +100,6 @@
  */
 //#define SK_DEFAULT_IMAGE_CACHE_LIMIT (1024 * 1024)
 
-/*  If zlib is available and you want to support the flate compression
-    algorithm (used in PDF generation), define SK_ZLIB_INCLUDE to be the
-    include path. Alternatively, define SK_SYSTEM_ZLIB to use the system zlib
-    library specified as "#include <zlib.h>".
- */
-//#define SK_ZLIB_INCLUDE <zlib.h>
-//#define SK_SYSTEM_ZLIB
-
 /*  Define this to allow PDF scalars above 32k.  The PDF/A spec doesn't allow
     them, but modern PDF interpreters should handle them just fine.
  */
@@ -139,17 +124,15 @@
 //#define SK_SUPPORT_UNITTEST
 #endif
 
-/* If your system embeds skia and has complex event logging, define this
-   symbol to name a file that maps the following macros to your system's
-   equivalents:
-       SK_TRACE_EVENT0(event)
-       SK_TRACE_EVENT1(event, name1, value1)
-       SK_TRACE_EVENT2(event, name1, value1, name2, value2)
-   src/utils/SkDebugTrace.h has a trivial implementation that writes to
-   the debug output stream. If SK_USER_TRACE_INCLUDE_FILE is not defined,
-   SkTrace.h will define the above three macros to do nothing.
-*/
-//#undef SK_USER_TRACE_INCLUDE_FILE
+/*  Change the ordering to work in X windows.
+ */
+//#ifdef SK_SAMPLES_FOR_X
+//        #define SK_R32_SHIFT    16
+//        #define SK_G32_SHIFT    8
+//        #define SK_B32_SHIFT    0
+//        #define SK_A32_SHIFT    24
+//#endif
+
 
 /* Determines whether to build code that supports the GPU backend. Some classes
    that are not GPU-specific, such as SkShader subclasses, have optional code
@@ -161,40 +144,14 @@
 //#define SK_SUPPORT_GPU 1
 
 
-/* The PDF generation code uses Path Ops to generate inverse fills and complex
- * clipping paths, but at this time, Path Ops is not release ready yet. So,
- * the code is hidden behind this #define guard. If you are feeling adventurous
- * and want the latest and greatest PDF generation code, uncomment the #define.
+/* The PDF generation code uses Path Ops to handle complex clipping paths,
+ * but at this time, Path Ops is not release ready yet. So, the code is
+ * hidden behind this #define guard. If you are feeling adventurous and
+ * want the latest and greatest PDF generation code, uncomment the #define.
  * When Path Ops is release ready, the define guards and this user config
  * define should be removed entirely.
  */
-//#define SK_PDF_USE_PATHOPS
-
-/* Skia uses these defines as the target of include preprocessor directives.
- * The header files pointed to by these defines provide declarations and
- * possibly inline implementations of threading primitives.
- *
- * See SkThread.h for documentation on what these includes must contain.
- */
-//#define SK_ATOMICS_PLATFORM_H "SkAtomics_xxx.h"
-//#define SK_MUTEX_PLATFORM_H "SkMutex_xxx.h"
-#if defined(_MSC_VER)
-#  define SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_win.h"
-#else
-#  define SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_sync.h"
-#endif
-
-#if defined(_WIN32)
-#  define SK_MUTEX_PLATFORM_H   "../../src/ports/SkMutex_win.h"
-#else
-#  define SK_MUTEX_PLATFORM_H   "../../src/ports/SkMutex_pthread.h"
-#endif
-
-#if defined(SK_CPU_ARM32) || defined(SK_CPU_ARM64)
-#  define SK_BARRIERS_PLATFORM_H "../../src/ports/SkBarriers_arm.h"
-#else
-#  define SK_BARRIERS_PLATFORM_H "../../src/ports/SkBarriers_x86.h"
-#endif
+//#define SK_PDF_USE_PATHOPS_CLIPPING
 
 // On all platforms we have this byte order
 #define SK_A32_SHIFT 24
@@ -205,8 +162,21 @@
 #define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 0
 
 #define SK_SUPPORT_LEGACY_GETDEVICE
+
 #define SK_IGNORE_ETC1_SUPPORT
 
 #define SK_RASTERIZE_EVEN_ROUNDING
 
+#define GR_GL_PER_GL_FUNC_CALLBACK 1
+
+#define MOZ_SKIA 1
+
+#ifndef MOZ_IMPLICIT
+#  ifdef MOZ_CLANG_PLUGIN
+#    define MOZ_IMPLICIT __attribute__((annotate("moz_implicit")))
+#  else
+#    define MOZ_IMPLICIT
+#  endif
+#endif
+
 #endif
diff --git a/gfx/skia/skia/include/core/SkAnnotation.h b/gfx/skia/skia/include/core/SkAnnotation.h
index d7b9b84529d3..80503c78d21d 100644
--- a/gfx/skia/skia/include/core/SkAnnotation.h
+++ b/gfx/skia/skia/include/core/SkAnnotation.h
@@ -10,12 +10,11 @@
 
 #include "SkRefCnt.h"
 #include "SkString.h"
+#include "SkTypes.h"
 
 class SkData;
 class SkReadBuffer;
 class SkWriteBuffer;
-class SkStream;
-class SkWStream;
 struct SkPoint;
 
 /**
@@ -27,12 +26,10 @@ public:
     virtual ~SkAnnotation();
 
     static SkAnnotation* Create(const char key[], SkData* value) {
-        return SkNEW_ARGS(SkAnnotation, (key, value));
+        return new SkAnnotation(key, value);
     }
 
-    static SkAnnotation* Create(SkReadBuffer& buffer) {
-        return SkNEW_ARGS(SkAnnotation, (buffer));
-    }
+    static SkAnnotation* Create(SkReadBuffer& buffer) { return new SkAnnotation(buffer); }
 
     /**
      *  Return the data for the specified key, or NULL.
diff --git a/gfx/skia/skia/include/core/SkBBHFactory.h b/gfx/skia/skia/include/core/SkBBHFactory.h
index 4c0384422117..ca7040409d37 100644
--- a/gfx/skia/skia/include/core/SkBBHFactory.h
+++ b/gfx/skia/skia/include/core/SkBBHFactory.h
@@ -8,62 +8,24 @@
 #ifndef SkBBHFactory_DEFINED
 #define SkBBHFactory_DEFINED
 
-#include "SkSize.h"
-#include "SkPoint.h"
-
+#include "SkTypes.h"
 class SkBBoxHierarchy;
+struct SkRect;
 
 class SK_API SkBBHFactory {
 public:
     /**
      *  Allocate a new SkBBoxHierarchy. Return NULL on failure.
      */
-    virtual SkBBoxHierarchy* operator()(int width, int height) const = 0;
+    virtual SkBBoxHierarchy* operator()(const SkRect& bounds) const = 0;
     virtual ~SkBBHFactory() {};
 };
 
-class SK_API SkQuadTreeFactory : public SkBBHFactory {
-public:
-    virtual SkBBoxHierarchy* operator()(int width, int height) const SK_OVERRIDE;
-private:
-    typedef SkBBHFactory INHERITED;
-};
-
-
 class SK_API SkRTreeFactory : public SkBBHFactory {
 public:
-    virtual SkBBoxHierarchy* operator()(int width, int height) const SK_OVERRIDE;
+    SkBBoxHierarchy* operator()(const SkRect& bounds) const override;
 private:
     typedef SkBBHFactory INHERITED;
 };
 
-class SK_API SkTileGridFactory : public SkBBHFactory {
-public:
-    struct TileGridInfo {
-        /** Tile placement interval */
-        SkISize  fTileInterval;
-
-        /** Pixel coverage overlap between adjacent tiles */
-        SkISize  fMargin;
-
-        /** Offset added to device-space bounding box positions to convert
-          * them to tile-grid space. This can be used to adjust the "phase"
-          * of the tile grid to match probable query rectangles that will be
-          * used to search into the tile grid. As long as the offset is smaller
-          * or equal to the margin, there is no need to extend the domain of
-          * the tile grid to prevent data loss.
-          */
-        SkIPoint fOffset;
-    };
-
-    SkTileGridFactory(const TileGridInfo& info) : fInfo(info) { }
-
-    virtual SkBBoxHierarchy* operator()(int width, int height) const SK_OVERRIDE;
-
-private:
-    TileGridInfo fInfo;
-
-    typedef SkBBHFactory INHERITED;
-};
-
 #endif
diff --git a/gfx/skia/skia/include/core/SkBitmap.h b/gfx/skia/skia/include/core/SkBitmap.h
index 0e847f2a4cf6..eda13b3c5239 100644
--- a/gfx/skia/skia/include/core/SkBitmap.h
+++ b/gfx/skia/skia/include/core/SkBitmap.h
@@ -11,6 +11,7 @@
 #include "SkColor.h"
 #include "SkColorTable.h"
 #include "SkImageInfo.h"
+#include "SkPixmap.h"
 #include "SkPoint.h"
 #include "SkRefCnt.h"
 
@@ -38,29 +39,6 @@ class SK_API SkBitmap {
 public:
     class SK_API Allocator;
 
-#ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG
-    enum Config {
-        kNo_Config,         //!< bitmap has not been configured
-        kA8_Config,         //!< 8-bits per pixel, with only alpha specified (0 is transparent, 0xFF is opaque)
-        kIndex8_Config,     //!< 8-bits per pixel, using SkColorTable to specify the colors
-        kRGB_565_Config,    //!< 16-bits per pixel, (see SkColorPriv.h for packing)
-        kARGB_4444_Config,  //!< 16-bits per pixel, (see SkColorPriv.h for packing)
-        kARGB_8888_Config,  //!< 32-bits per pixel, (see SkColorPriv.h for packing)
-    };
-
-    // do not add this to the Config enum, otherwise the compiler will let us
-    // pass this as a valid parameter for Config.
-    enum {
-        kConfigCount = kARGB_8888_Config + 1
-    };
-
-    /** Return the config for the bitmap. */
-    Config  config() const;
-    
-    SK_ATTR_DEPRECATED("use config()")
-    Config  getConfig() const { return this->config(); }
-#endif
-
     /**
      *  Default construct creates a bitmap with zero width and height, and no pixels.
      *  Its colortype is set to kUnknown_SkColorType.
@@ -91,10 +69,11 @@ public:
 
     const SkImageInfo& info() const { return fInfo; }
 
-    int width() const { return fInfo.fWidth; }
-    int height() const { return fInfo.fHeight; }
-    SkColorType colorType() const { return fInfo.fColorType; }
-    SkAlphaType alphaType() const { return fInfo.fAlphaType; }
+    int width() const { return fInfo.width(); }
+    int height() const { return fInfo.height(); }
+    SkColorType colorType() const { return fInfo.colorType(); }
+    SkAlphaType alphaType() const { return fInfo.alphaType(); }
+    SkColorProfileType profileType() const { return fInfo.profileType(); }
 
     /**
      *  Return the number of bytes per pixel based on the colortype. If the colortype is
@@ -155,7 +134,7 @@ public:
         Note this truncates the result to 32bits. Call getSize64() to detect
         if the real size exceeds 32bits.
     */
-    size_t getSize() const { return fInfo.fHeight * fRowBytes; }
+    size_t getSize() const { return fInfo.height() * fRowBytes; }
 
     /** Return the number of bytes from the pointer returned by getPixels()
         to the end of the allocated space in the buffer. Required in
@@ -167,7 +146,7 @@ public:
      *  Return the full size of the bitmap, in bytes.
      */
     int64_t computeSize64() const {
-        return sk_64_mul(fInfo.fHeight, fRowBytes);
+        return sk_64_mul(fInfo.height(), fRowBytes);
     }
 
     /**
@@ -233,6 +212,14 @@ public:
     void getBounds(SkRect* bounds) const;
     void getBounds(SkIRect* bounds) const;
 
+    SkIRect bounds() const { return fInfo.bounds(); }
+    SkISize dimensions() const { return fInfo.dimensions(); }
+    // Returns the bounds of this bitmap, offset by its pixelref origin.
+    SkIRect getSubset() const {
+        return SkIRect::MakeXYWH(fPixelRefOrigin.x(), fPixelRefOrigin.y(),
+                                 fInfo.width(), fInfo.height());
+    }
+
     bool setInfo(const SkImageInfo&, size_t rowBytes = 0);
 
     /**
@@ -241,7 +228,13 @@ public:
      *  a colortable, then ColorTable must be non-null, and will be ref'd.
      *  On failure, the bitmap will be set to empty and return false.
      */
-    bool allocPixels(const SkImageInfo&, SkPixelRefFactory*, SkColorTable*);
+    bool SK_WARN_UNUSED_RESULT tryAllocPixels(const SkImageInfo&, SkPixelRefFactory*, SkColorTable*);
+
+    void allocPixels(const SkImageInfo& info, SkPixelRefFactory* factory, SkColorTable* ctable) {
+        if (!this->tryAllocPixels(info, factory, ctable)) {
+            sk_throw();
+        }
+    }
 
     /**
      *  Allocate the bitmap's pixels to match the requested image info and
@@ -251,24 +244,32 @@ public:
      *  the pixel size specified by info.colorType()) then false is returned
      *  and the bitmap is set to empty.
      */
-    bool allocPixels(const SkImageInfo& info, size_t rowBytes);
+    bool SK_WARN_UNUSED_RESULT tryAllocPixels(const SkImageInfo& info, size_t rowBytes);
 
-    /**
-     *  Allocate a pixelref to match the specified image info, using the default
-     *  allocator.
-     *  On success, the bitmap's pixels will be "locked", and return true.
-     *  On failure, the bitmap will be set to empty and return false.
-     */
-    bool allocPixels(const SkImageInfo& info) {
-        return this->allocPixels(info, info.minRowBytes());
+    void allocPixels(const SkImageInfo& info, size_t rowBytes) {
+        if (!this->tryAllocPixels(info, rowBytes)) {
+            sk_throw();
+        }
     }
 
-    bool allocN32Pixels(int width, int height, bool isOpaque = false) {
-        SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
-        if (isOpaque) {
-            info.fAlphaType = kOpaque_SkAlphaType;
-        }
-        return this->allocPixels(info);
+    bool SK_WARN_UNUSED_RESULT tryAllocPixels(const SkImageInfo& info) {
+        return this->tryAllocPixels(info, info.minRowBytes());
+    }
+
+    void allocPixels(const SkImageInfo& info) {
+        this->allocPixels(info, info.minRowBytes());
+    }
+
+    bool SK_WARN_UNUSED_RESULT tryAllocN32Pixels(int width, int height, bool isOpaque = false) {
+        SkImageInfo info = SkImageInfo::MakeN32(width, height,
+                                            isOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType);
+        return this->tryAllocPixels(info);
+    }
+
+    void allocN32Pixels(int width, int height, bool isOpaque = false) {
+        SkImageInfo info = SkImageInfo::MakeN32(width, height,
+                                            isOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType);
+        this->allocPixels(info);
     }
 
     /**
@@ -277,6 +278,9 @@ public:
      *  referenced, if releaseProc is not null, it will be called with the
      *  pixels and context as parameters.
      *  On failure, the bitmap will be set to empty and return false.
+     *
+     *  If specified, the releaseProc will always be called, even on failure. It is also possible
+     *  for success but the releaseProc is immediately called (e.g. valid Info but NULL pixels).
      */
     bool installPixels(const SkImageInfo&, void* pixels, size_t rowBytes, SkColorTable*,
                        void (*releaseProc)(void* addr, void* context), void* context);
@@ -343,8 +347,12 @@ public:
         @return true if the allocation succeeds. If not the pixelref field of
                      the bitmap will be unchanged.
     */
-    bool allocPixels(SkColorTable* ctable = NULL) {
-        return this->allocPixels(NULL, ctable);
+    bool SK_WARN_UNUSED_RESULT tryAllocPixels(SkColorTable* ctable = NULL) {
+        return this->tryAllocPixels(NULL, ctable);
+    }
+
+    void allocPixels(SkColorTable* ctable = NULL) {
+        this->allocPixels(NULL, ctable);
     }
 
     /** Use the specified Allocator to create the pixelref that manages the
@@ -365,7 +373,13 @@ public:
         @return true if the allocation succeeds. If not the pixelref field of
                      the bitmap will be unchanged.
     */
-    bool allocPixels(Allocator* allocator, SkColorTable* ctable);
+    bool SK_WARN_UNUSED_RESULT tryAllocPixels(Allocator* allocator, SkColorTable* ctable);
+
+    void allocPixels(Allocator* allocator, SkColorTable* ctable) {
+        if (!this->tryAllocPixels(allocator, ctable)) {
+            sk_throw();
+        }
+    }
 
     /**
      *  Return the current pixelref object or NULL if there is none. This does
@@ -423,13 +437,15 @@ public:
      */
     bool lockPixelsAreWritable() const;
 
+    bool requestLock(SkAutoPixmapUnlock* result) const;
+
     /** Call this to be sure that the bitmap is valid enough to be drawn (i.e.
         it has non-null pixels, and if required by its colortype, it has a
         non-null colortable. Returns true if all of the above are met.
     */
     bool readyToDraw() const {
         return this->getPixels() != NULL &&
-               (this->colorType() != kIndex_8_SkColorType || NULL != fColorTable);
+               (this->colorType() != kIndex_8_SkColorType || fColorTable);
     }
 
     /** Returns the pixelRef's texture, or NULL
@@ -462,10 +478,7 @@ public:
      *  of the color is ignored (treated as opaque). If the colortype only supports
      *  alpha (e.g. A1 or A8) then the color's r,g,b components are ignored.
      */
-    void eraseColor(SkColor c) const {
-        this->eraseARGB(SkColorGetA(c), SkColorGetR(c), SkColorGetG(c),
-                        SkColorGetB(c));
-    }
+    void eraseColor(SkColor c) const;
 
     /**
      *  Fill the entire bitmap with the specified color.
@@ -473,7 +486,9 @@ public:
      *  of the color is ignored (treated as opaque). If the colortype only supports
      *  alpha (e.g. A1 or A8) then the color's r,g,b components are ignored.
      */
-    void eraseARGB(U8CPU a, U8CPU r, U8CPU g, U8CPU b) const;
+    void eraseARGB(U8CPU a, U8CPU r, U8CPU g, U8CPU b) const {
+        this->eraseColor(SkColorSetARGB(a, r, g, b));
+    }
 
     SK_ATTR_DEPRECATED("use eraseARGB or eraseColor")
     void eraseRGB(U8CPU r, U8CPU g, U8CPU b) const {
@@ -486,29 +501,12 @@ public:
      *  of the color is ignored (treated as opaque). If the colortype only supports
      *  alpha (e.g. A1 or A8) then the color's r,g,b components are ignored.
      */
-    void eraseArea(const SkIRect& area, SkColor c) const;
+    void erase(SkColor c, const SkIRect& area) const;
 
-    /** Scroll (a subset of) the contents of this bitmap by dx/dy. If there are
-        no pixels allocated (i.e. getPixels() returns null) the method will
-        still update the inval region (if present). If the bitmap is immutable,
-        do nothing and return false.
-
-        @param subset The subset of the bitmap to scroll/move. To scroll the
-                      entire contents, specify [0, 0, width, height] or just
-                      pass null.
-        @param dx The amount to scroll in X
-        @param dy The amount to scroll in Y
-        @param inval Optional (may be null). Returns the area of the bitmap that
-                     was scrolled away. E.g. if dx = dy = 0, then inval would
-                     be set to empty. If dx >= width or dy >= height, then
-                     inval would be set to the entire bounds of the bitmap.
-        @return true if the scroll was doable. Will return false if the colortype is kUnkown or
-                     if the bitmap is immutable.
-                     If no pixels are present (i.e. getPixels() returns false)
-                     inval will still be updated, and true will be returned.
-    */
-    bool scrollRect(const SkIRect* subset, int dx, int dy,
-                    SkRegion* inval = NULL) const;
+    // DEPRECATED
+    void eraseArea(const SkIRect& area, SkColor c) const {
+        this->erase(c, area);
+    }
 
     /**
      *  Return the SkColor of the specified pixel.  In most cases this will
@@ -665,12 +663,21 @@ public:
     bool extractAlpha(SkBitmap* dst, const SkPaint* paint, Allocator* allocator,
                       SkIPoint* offset) const;
 
+    /**
+     *  If the pixels are available from this bitmap (w/o locking) return true, and fill out the
+     *  specified pixmap (if not null). If the pixels are not available (either because there are
+     *  none, or becuase accessing them would require locking or other machinary) return false and
+     *  ignore the pixmap parameter.
+     *
+     *  Note: if this returns true, the results (in the pixmap) are only valid until the bitmap
+     *  is changed in anyway, in which case the results are invalid.
+     */
+    bool peekPixels(SkPixmap*) const;
+
     SkDEBUGCODE(void validate() const;)
 
     class Allocator : public SkRefCnt {
     public:
-        SK_DECLARE_INST_COUNT(Allocator)
-
         /** Allocate the pixel memory for the bitmap, given its dimensions and
             colortype. Return true on success, where success means either setPixels
             or setPixelRef was called. The pixels need not be locked when this
@@ -689,7 +696,7 @@ public:
     */
     class HeapAllocator : public Allocator {
     public:
-        virtual bool allocPixelRef(SkBitmap*, SkColorTable*) SK_OVERRIDE;
+        bool allocPixelRef(SkBitmap*, SkColorTable*) override;
     };
 
     class RLEPixels {
@@ -736,24 +743,17 @@ private:
     };
 
     SkImageInfo fInfo;
-
     uint32_t    fRowBytes;
-
     uint8_t     fFlags;
 
-    void internalErase(const SkIRect&, U8CPU a, U8CPU r, U8CPU g, U8CPU b)const;
-
     /*  Unreference any pixelrefs or colortables
     */
     void freePixels();
     void updatePixelsFromRef() const;
 
-    void legacyUnflatten(SkReadBuffer&);
-
     static void WriteRawPixels(SkWriteBuffer*, const SkBitmap&);
     static bool ReadRawPixels(SkReadBuffer*, SkBitmap*);
 
-    friend class SkBitmapSource;    // unflatten
     friend class SkReadBuffer;      // unflatten, rawpixels
     friend class SkWriteBuffer;     // rawpixels
     friend struct SkBitmapProcState;
@@ -780,60 +780,6 @@ private:
 //TODO(mtklein): uncomment when 71713004 lands and Chromium's fixed.
 //#define SkAutoLockPixels(...) SK_REQUIRE_LOCAL_VAR(SkAutoLockPixels)
 
-/** Helper class that performs the lock/unlockColors calls on a colortable.
-    The destructor will call unlockColors(false) if it has a bitmap's colortable
-*/
-class SkAutoLockColors : SkNoncopyable {
-public:
-    /** Initialize with no bitmap. Call lockColors(bitmap) to lock bitmap's
-        colortable
-     */
-    SkAutoLockColors() : fCTable(NULL), fColors(NULL) {}
-    /** Initialize with bitmap, locking its colortable if present
-     */
-    explicit SkAutoLockColors(const SkBitmap& bm) {
-        fCTable = bm.getColorTable();
-        fColors = fCTable ? fCTable->lockColors() : NULL;
-    }
-    /** Initialize with a colortable (may be null)
-     */
-    explicit SkAutoLockColors(SkColorTable* ctable) {
-        fCTable = ctable;
-        fColors = ctable ? ctable->lockColors() : NULL;
-    }
-    ~SkAutoLockColors() {
-        if (fCTable) {
-            fCTable->unlockColors();
-        }
-    }
-
-    /** Return the currently locked colors, or NULL if no bitmap's colortable
-        is currently locked.
-    */
-    const SkPMColor* colors() const { return fColors; }
-
-    /** Locks the table and returns is colors (assuming ctable is not null) and
-        unlocks the previous table if one was present
-     */
-    const SkPMColor* lockColors(SkColorTable* ctable) {
-        if (fCTable) {
-            fCTable->unlockColors();
-        }
-        fCTable = ctable;
-        fColors = ctable ? ctable->lockColors() : NULL;
-        return fColors;
-    }
-
-    const SkPMColor* lockColors(const SkBitmap& bm) {
-        return this->lockColors(bm.getColorTable());
-    }
-
-private:
-    SkColorTable*    fCTable;
-    const SkPMColor* fColors;
-};
-#define SkAutoLockColors(...) SK_REQUIRE_LOCAL_VAR(SkAutoLockColors)
-
 ///////////////////////////////////////////////////////////////////////////////
 
 inline uint32_t* SkBitmap::getAddr32(int x, int y) const {
@@ -865,13 +811,4 @@ inline SkPMColor SkBitmap::getIndex8Color(int x, int y) const {
     return (*fColorTable)[*((const uint8_t*)fPixels + y * fRowBytes + x)];
 }
 
-#ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG
-///////////////////////////////////////////////////////////////////////////////
-//
-// Helpers until we can fully deprecate SkBitmap::Config
-//
-SK_API SkBitmap::Config SkColorTypeToBitmapConfig(SkColorType);
-SK_API SkColorType SkBitmapConfigToColorType(SkBitmap::Config);
-#endif
-
 #endif
diff --git a/gfx/skia/skia/include/core/SkBitmapDevice.h b/gfx/skia/skia/include/core/SkBitmapDevice.h
index e1765e56abc3..d1cb9ad0f866 100644
--- a/gfx/skia/skia/include/core/SkBitmapDevice.h
+++ b/gfx/skia/skia/include/core/SkBitmapDevice.h
@@ -9,54 +9,74 @@
 #ifndef SkBitmapDevice_DEFINED
 #define SkBitmapDevice_DEFINED
 
+#include "SkBitmap.h"
+#include "SkCanvas.h"
+#include "SkColor.h"
 #include "SkDevice.h"
+#include "SkImageFilter.h"
+#include "SkImageInfo.h"
+#include "SkRect.h"
+#include "SkScalar.h"
+#include "SkSize.h"
+#include "SkSurfaceProps.h"
+#include "SkTypes.h"
+
+class SkDraw;
+class SkMatrix;
+class SkPaint;
+class SkPath;
+class SkPixelRef;
+class SkPixmap;
+class SkRRect;
+class SkSurface;
+class SkXfermode;
+struct SkPoint;
 
 ///////////////////////////////////////////////////////////////////////////////
 class SK_API SkBitmapDevice : public SkBaseDevice {
 public:
-    SK_DECLARE_INST_COUNT(SkBitmapDevice)
-
     /**
      *  Construct a new device with the specified bitmap as its backend. It is
      *  valid for the bitmap to have no pixels associated with it. In that case,
      *  any drawing to this device will have no effect.
-    */
+     */
     SkBitmapDevice(const SkBitmap& bitmap);
 
+    /**
+     * Create a new device along with its requisite pixel memory using
+     * default SkSurfaceProps (i.e., kLegacyFontHost_InitType-style).
+     * Note: this entry point is slated for removal - no one should call it.
+     */
+    static SkBitmapDevice* Create(const SkImageInfo& info);
+
     /**
      *  Construct a new device with the specified bitmap as its backend. It is
      *  valid for the bitmap to have no pixels associated with it. In that case,
      *  any drawing to this device will have no effect.
-    */
-    SkBitmapDevice(const SkBitmap& bitmap, const SkDeviceProperties& deviceProperties);
+     */
+    SkBitmapDevice(const SkBitmap& bitmap, const SkSurfaceProps& surfaceProps);
 
-    static SkBitmapDevice* Create(const SkImageInfo&,
-                                  const SkDeviceProperties* = NULL);
+    static SkBitmapDevice* Create(const SkImageInfo&, const SkSurfaceProps&);
 
-    virtual SkImageInfo imageInfo() const SK_OVERRIDE;
+    SkImageInfo imageInfo() const override;
 
 protected:
-    virtual bool filterTextFlags(const SkPaint& paint, TextFlags*) SK_OVERRIDE;
-
-    /** Clears the entire device to the specified color (including alpha).
-     *  Ignores the clip.
-     */
-    virtual void clear(SkColor color) SK_OVERRIDE;
+    bool onShouldDisableLCD(const SkPaint&) const override;
 
     /** These are called inside the per-device-layer loop for each draw call.
      When these are called, we have already applied any saveLayer operations,
      and are handling any looping from the paint, and any effects from the
      DrawFilter.
      */
-    virtual void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE;
+    void drawPaint(const SkDraw&, const SkPaint& paint) override;
     virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode, size_t count,
-                            const SkPoint[], const SkPaint& paint) SK_OVERRIDE;
+                            const SkPoint[], const SkPaint& paint) override;
     virtual void drawRect(const SkDraw&, const SkRect& r,
-                          const SkPaint& paint) SK_OVERRIDE;
+                          const SkPaint& paint) override;
     virtual void drawOval(const SkDraw&, const SkRect& oval,
-                          const SkPaint& paint) SK_OVERRIDE;
+                          const SkPaint& paint) override;
     virtual void drawRRect(const SkDraw&, const SkRRect& rr,
-                           const SkPaint& paint) SK_OVERRIDE;
+                           const SkPaint& paint) override;
 
     /**
      *  If pathIsMutable, then the implementation is allowed to cast path to a
@@ -72,43 +92,34 @@ protected:
     virtual void drawPath(const SkDraw&, const SkPath& path,
                           const SkPaint& paint,
                           const SkMatrix* prePathMatrix = NULL,
-                          bool pathIsMutable = false) SK_OVERRIDE;
+                          bool pathIsMutable = false) override;
     virtual void drawBitmap(const SkDraw&, const SkBitmap& bitmap,
-                            const SkMatrix& matrix, const SkPaint& paint) SK_OVERRIDE;
+                            const SkMatrix& matrix, const SkPaint& paint) override;
     virtual void drawSprite(const SkDraw&, const SkBitmap& bitmap,
-                            int x, int y, const SkPaint& paint) SK_OVERRIDE;
+                            int x, int y, const SkPaint& paint) override;
 
     /**
      *  The default impl. will create a bitmap-shader from the bitmap,
      *  and call drawRect with it.
      */
-    virtual void drawBitmapRect(const SkDraw&, const SkBitmap&,
-                                const SkRect* srcOrNull, const SkRect& dst,
-                                const SkPaint& paint,
-                                SkCanvas::DrawBitmapRectFlags flags) SK_OVERRIDE;
+    void drawBitmapRect(const SkDraw&, const SkBitmap&, const SkRect*, const SkRect&,
+                        const SkPaint&, SkCanvas::SrcRectConstraint) override;
 
     /**
      *  Does not handle text decoration.
      *  Decorations (underline and stike-thru) will be handled by SkCanvas.
      */
     virtual void drawText(const SkDraw&, const void* text, size_t len,
-                          SkScalar x, SkScalar y, const SkPaint& paint) SK_OVERRIDE;
+                          SkScalar x, SkScalar y, const SkPaint& paint) override;
     virtual void drawPosText(const SkDraw&, const void* text, size_t len,
-                             const SkScalar pos[], SkScalar constY,
-                             int scalarsPerPos, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawTextOnPath(const SkDraw&, const void* text, size_t len,
-                                const SkPath& path, const SkMatrix* matrix,
-                                const SkPaint& paint) SK_OVERRIDE;
+                             const SkScalar pos[], int scalarsPerPos,
+                             const SkPoint& offset, const SkPaint& paint) override;
     virtual void drawVertices(const SkDraw&, SkCanvas::VertexMode, int vertexCount,
                               const SkPoint verts[], const SkPoint texs[],
                               const SkColor colors[], SkXfermode* xmode,
                               const uint16_t indices[], int indexCount,
-                              const SkPaint& paint) SK_OVERRIDE;
-    /** The SkBaseDevice passed will be an SkBaseDevice which was returned by a call to
-        onCreateDevice on this device with kSaveLayer_Usage.
-     */
-    virtual void drawDevice(const SkDraw&, SkBaseDevice*, int x, int y,
-                            const SkPaint&) SK_OVERRIDE;
+                              const SkPaint& paint) override;
+    virtual void drawDevice(const SkDraw&, SkBaseDevice*, int x, int y, const SkPaint&) override;
 
     ///////////////////////////////////////////////////////////////////////////
 
@@ -117,7 +128,7 @@ protected:
         altered. The config/width/height/rowbytes must remain unchanged.
         @return the device contents as a bitmap
     */
-    virtual const SkBitmap& onAccessBitmap() SK_OVERRIDE;
+    const SkBitmap& onAccessBitmap() override;
 
     SkPixelRef* getPixelRef() const { return fBitmap.pixelRef(); }
     // just for subclasses, to assign a custom pixelref
@@ -126,15 +137,12 @@ protected:
         return pr;
     }
 
-    virtual bool onReadPixels(const SkImageInfo&, void*, size_t, int x, int y) SK_OVERRIDE;
-    virtual bool onWritePixels(const SkImageInfo&, const void*, size_t, int, int) SK_OVERRIDE;
-    virtual void* onAccessPixels(SkImageInfo* info, size_t* rowBytes) SK_OVERRIDE;
-
-    /** Called when this device is installed into a Canvas. Balanced by a call
-        to unlockPixels() when the device is removed from a Canvas.
-    */
-    virtual void lockPixels() SK_OVERRIDE;
-    virtual void unlockPixels() SK_OVERRIDE;
+    bool onReadPixels(const SkImageInfo&, void*, size_t, int x, int y) override;
+    bool onWritePixels(const SkImageInfo&, const void*, size_t, int, int) override;
+    bool onPeekPixels(SkPixmap*) override;
+    bool onAccessPixels(SkPixmap*) override;
+    void onAttachToCanvas(SkCanvas*) override;
+    void onDetachFromCanvas() override;
 
 private:
     friend class SkCanvas;
@@ -142,22 +150,24 @@ private:
     friend class SkDraw;
     friend class SkDrawIter;
     friend class SkDeviceFilteredPaint;
-    friend class SkDeviceImageFilterProxy;
 
     friend class SkSurface_Raster;
 
     // used to change the backend's pixels (and possibly config/rowbytes)
     // but cannot change the width/height, so there should be no change to
     // any clip information.
-    virtual void replaceBitmapBackendForRasterSurface(const SkBitmap&) SK_OVERRIDE;
+    void replaceBitmapBackendForRasterSurface(const SkBitmap&) override;
 
-    virtual SkBaseDevice* onCreateDevice(const SkImageInfo&, Usage) SK_OVERRIDE;
+    SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) override;
 
-    virtual SkSurface* newSurface(const SkImageInfo&) SK_OVERRIDE;
-    virtual const void* peekPixels(SkImageInfo*, size_t* rowBytes) SK_OVERRIDE;
+    SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&) override;
+
+    SkImageFilter::Cache* getImageFilterCache() override;
 
     SkBitmap    fBitmap;
 
+    void setNewSize(const SkISize&);  // Used by SkCanvas for resetForNextPicture().
+
     typedef SkBaseDevice INHERITED;
 };
 
diff --git a/gfx/skia/skia/include/core/SkBlitRow.h b/gfx/skia/skia/include/core/SkBlitRow.h
index 9393589b82b1..56121eba78e2 100644
--- a/gfx/skia/skia/include/core/SkBlitRow.h
+++ b/gfx/skia/skia/include/core/SkBlitRow.h
@@ -26,17 +26,26 @@ public:
         a corresponding scanline of 16bit colors (specific format based on the
         config passed to the Factory.
 
-        The x,y params are useful just for dithering
+        The x,y params provide the dithering phase for the start of the scanline
 
         @param alpha A global alpha to be applied to all of the src colors
         @param x The x coordinate of the beginning of the scanline
         @param y THe y coordinate of the scanline
      */
-    typedef void (*Proc)(uint16_t* dst,
-                         const SkPMColor* src,
-                         int count, U8CPU alpha, int x, int y);
+    typedef void (*Proc16)(uint16_t dst[], const SkPMColor src[], int count,
+                           U8CPU alpha, int x, int y);
 
-    static Proc Factory(unsigned flags, SkColorType);
+    static Proc16 Factory16(unsigned flags);
+
+    /**
+     *  Function pointer that blends a single src color onto a scaline of dst colors.
+     *
+     *  The x,y params provide the dithering phase for the start of the scanline
+     */
+    typedef void (*ColorProc16)(uint16_t dst[], SkPMColor src, int count, int x, int y);
+
+    // Note : we ignore the kGlobalAlpha_Flag setting, but do respect kSrcPixelAlpha_Flag
+    static ColorProc16 ColorFactory16(unsigned flags);
 
     ///////////// D32 version
 
@@ -51,38 +60,15 @@ public:
         @param count number of colors to blend
         @param alpha global alpha to be applied to all src colors
      */
-    typedef void (*Proc32)(uint32_t* dst,
-                         const SkPMColor* src,
-                         int count, U8CPU alpha);
+    typedef void (*Proc32)(uint32_t dst[], const SkPMColor src[], int count, U8CPU alpha);
 
     static Proc32 Factory32(unsigned flags32);
 
-   /** Function pointer that blends a single color with a row of 32-bit colors
-       onto a 32-bit destination
-   */
-   typedef void (*ColorProc)(SkPMColor* dst, const SkPMColor* src, int count,
-                             SkPMColor color);
-
     /** Blend a single color onto a row of S32 pixels, writing the result
         into a row of D32 pixels. src and dst may be the same memory, but
         if they are not, they may not overlap.
      */
-    static void Color32(SkPMColor dst[], const SkPMColor src[],
-                        int count, SkPMColor color);
-
-    //! Public entry-point to return a blit function ptr
-    static ColorProc ColorProcFactory();
-
-    /** Function pointer that blends a single color onto a 32-bit rectangle.  */
-    typedef void (*ColorRectProc)(SkPMColor* dst, int width, int height,
-                                  size_t rowBytes, SkPMColor color);
-
-    /** Blend a single color into a rectangle of D32 pixels. */
-    static void ColorRect32(SkPMColor* dst, int width, int height,
-                            size_t rowBytes, SkPMColor color);
-
-    //! Public entry-point to return a blit function ptr
-    static ColorRectProc ColorRectProcFactory();
+    static void Color32(SkPMColor dst[], const SkPMColor src[], int count, SkPMColor color);
 
     /** These static functions are called by the Factory and Factory32
         functions, and should return either NULL, or a
@@ -91,8 +77,9 @@ public:
      */
 
     static Proc32 PlatformProcs32(unsigned flags);
-    static Proc PlatformProcs565(unsigned flags);
-    static ColorProc PlatformColorProc();
+
+    static Proc16 PlatformFactory565(unsigned flags);
+    static ColorProc16 PlatformColorFactory565(unsigned flags);
 
 private:
     enum {
diff --git a/gfx/skia/skia/include/core/SkCanvas.h b/gfx/skia/skia/include/core/SkCanvas.h
index d68a9c50ab80..53f6dda88b09 100644
--- a/gfx/skia/skia/include/core/SkCanvas.h
+++ b/gfx/skia/skia/include/core/SkCanvas.h
@@ -11,30 +11,31 @@
 #include "SkTypes.h"
 #include "SkBitmap.h"
 #include "SkDeque.h"
-#include "SkClipStack.h"
 #include "SkPaint.h"
 #include "SkRefCnt.h"
-#include "SkPath.h"
 #include "SkRegion.h"
+#include "SkSurfaceProps.h"
 #include "SkXfermode.h"
 
-#ifdef SK_SUPPORT_LEGACY_DRAWTEXT_VIRTUAL
-    #define SK_LEGACY_DRAWTEXT_VIRTUAL  virtual
-#else
-    #define SK_LEGACY_DRAWTEXT_VIRTUAL
-#endif
-
-class SkCanvasClipVisitor;
-class SkBaseDevice;
-class SkDraw;
-class SkDrawFilter;
-class SkMetaData;
-class SkPicture;
-class SkRRect;
-class SkSurface;
-class SkSurface_Base;
 class GrContext;
 class GrRenderTarget;
+class SkBaseDevice;
+class SkCanvasClipVisitor;
+class SkClipStack;
+class SkDraw;
+class SkDrawable;
+class SkDrawFilter;
+class SkImage;
+class SkImageFilter;
+class SkMetaData;
+class SkPath;
+class SkPicture;
+class SkPixmap;
+class SkRRect;
+struct SkRSXform;
+class SkSurface;
+class SkSurface_Base;
+class SkTextBlob;
 
 /** \class SkCanvas
 
@@ -53,37 +54,6 @@ class GrRenderTarget;
 */
 class SK_API SkCanvas : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkCanvas)
-
-    /**
-     *  Attempt to allocate an offscreen raster canvas, matching the ImageInfo.
-     *  On success, return a new canvas that will draw into that offscreen.
-     *
-     *  The caller can access the pixels after drawing into this canvas by
-     *  calling readPixels() or peekPixels().
-     *
-     *  If the requested ImageInfo is opaque (either the colortype is
-     *  intrinsically opaque like RGB_565, or the info's alphatype is kOpaque)
-     *  then the pixel memory may be uninitialized. Otherwise, the pixel memory
-     *  will be initialized to 0, which is interpreted as transparent.
-     *
-     *  On failure, return NULL. This can fail for several reasons:
-     *  1. the memory allocation failed (e.g. request is too large)
-     *  2. invalid ImageInfo (e.g. negative dimensions)
-     *  3. unsupported ImageInfo for a canvas
-     *      - kUnknown_SkColorType, kIndex_8_SkColorType
-     *      - kIgnore_SkAlphaType
-     *      - this list is not complete, so others may also be unsupported
-     *
-     *  Note: it is valid to request a supported ImageInfo, but with zero
-     *  dimensions.
-     */
-    static SkCanvas* NewRaster(const SkImageInfo&);
-
-    static SkCanvas* NewRasterN32(int width, int height) {
-        return NewRaster(SkImageInfo::MakeN32Premul(width, height));
-    }
-
     /**
      *  Attempt to allocate raster canvas, matching the ImageInfo, that will draw directly into the
      *  specified pixels. To access the pixels after drawing to them, the caller should call
@@ -93,7 +63,7 @@ public:
      *  1. invalid ImageInfo (e.g. negative dimensions)
      *  2. unsupported ImageInfo for a canvas
      *      - kUnknown_SkColorType, kIndex_8_SkColorType
-     *      - kIgnore_SkAlphaType
+     *      - kUnknown_SkAlphaType
      *      - this list is not complete, so others may also be unsupported
      *
      *  Note: it is valid to request a supported ImageInfo, but with zero
@@ -116,7 +86,7 @@ public:
      *  by any device/pixels. Typically this use used by subclasses who handle
      *  the draw calls in some other way.
      */
-    SkCanvas(int width, int height);
+    SkCanvas(int width, int height, const SkSurfaceProps* = NULL);
 
     /** Construct a canvas with the specified device to draw into.
 
@@ -129,6 +99,14 @@ public:
                         structure are copied to the canvas.
     */
     explicit SkCanvas(const SkBitmap& bitmap);
+
+    /** Construct a canvas with the specified bitmap to draw into.
+        @param bitmap   Specifies a bitmap for the canvas to draw into. Its
+                        structure are copied to the canvas.
+        @param props    New canvas surface properties.
+    */
+    SkCanvas(const SkBitmap& bitmap, const SkSurfaceProps& props);
+
     virtual ~SkCanvas();
 
     SkMetaData& getMetaData();
@@ -151,7 +129,7 @@ public:
      * origin of the base layer is always (0,0). The current drawable area may be
      * smaller (due to clipping or saveLayer).
      */
-    SkISize getBaseLayerSize() const;
+    virtual SkISize getBaseLayerSize() const;
 
     /**
      *  DEPRECATED: call getBaseLayerSize
@@ -169,6 +147,9 @@ protected:  // Can we make this private?
 #endif
     SkBaseDevice* getDevice() const;
 public:
+    SkBaseDevice* getDevice_just_for_deprecated_compatibility_testing() const {
+        return this->getDevice();
+    }
 
     /**
      *  saveLayer() can create another device (which is later drawn onto
@@ -193,8 +174,12 @@ public:
      *  Create a new surface matching the specified info, one that attempts to
      *  be maximally compatible when used with this canvas. If there is no matching Surface type,
      *  NULL is returned.
+     *
+     *  If surfaceprops is specified, those are passed to the new surface, otherwise the new surface
+     *  inherits the properties of the surface that owns this canvas. If this canvas has no parent
+     *  surface, then the new surface is created with default properties.
      */
-    SkSurface* newSurface(const SkImageInfo&);
+    SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps* = NULL);
 
     /**
      * Return the GPU context of the device that is associated with the canvas.
@@ -347,6 +332,9 @@ public:
         @return The value to pass to restoreToCount() to balance this save()
     */
     int saveLayer(const SkRect* bounds, const SkPaint* paint);
+    int saveLayer(const SkRect& bounds, const SkPaint* paint) {
+        return this->saveLayer(&bounds, paint);
+    }
 
     /** DEPRECATED - use saveLayer(const SkRect*, const SkPaint*) instead.
 
@@ -417,11 +405,6 @@ public:
     */
     void restoreToCount(int saveCount);
 
-    /** Returns true if drawing is currently going to a layer (from saveLayer)
-     *  rather than to the root device.
-     */
-    virtual bool isDrawingToLayer() const;
-
     /** Preconcat the current matrix with the specified translation
         @param dx   The distance to translate in X
         @param dy   The distance to translate in Y
@@ -609,24 +592,15 @@ public:
         @param color    the color to draw with
         @param mode the mode to apply the color in (defaults to SrcOver)
     */
-    void drawColor(SkColor color,
-                   SkXfermode::Mode mode = SkXfermode::kSrcOver_Mode);
+    void drawColor(SkColor color, SkXfermode::Mode mode = SkXfermode::kSrcOver_Mode);
 
     /**
-     *  This erases the entire drawing surface to the specified color,
-     *  irrespective of the clip. It does not blend with the previous pixels,
-     *  but always overwrites them.
-     *
-     *  It is roughly equivalent to the following:
-     *      canvas.save();
-     *      canvas.clipRect(hugeRect, kReplace_Op);
-     *      paint.setColor(color);
-     *      paint.setXfermodeMode(kSrc_Mode);
-     *      canvas.drawPaint(paint);
-     *      canvas.restore();
-     *  though it is almost always much more efficient.
+     *  Helper method for drawing a color in SRC mode, completely replacing all the pixels
+     *  in the current clip with this color.
      */
-    virtual void clear(SkColor);
+    void clear(SkColor color) {
+        this->drawColor(color, SkXfermode::kSrc_Mode);
+    }
 
     /**
      * This makes the contents of the canvas undefined. Subsequent calls that
@@ -647,7 +621,7 @@ public:
      *  specified paint.
      *  @param paint    The paint used to fill the canvas
      */
-    virtual void drawPaint(const SkPaint& paint);
+    void drawPaint(const SkPaint& paint);
 
     enum PointMode {
         /** drawPoints draws each point separately */
@@ -679,8 +653,7 @@ public:
         @param pts      Array of points to draw
         @param paint    The paint used to draw the points
     */
-    virtual void drawPoints(PointMode mode, size_t count, const SkPoint pts[],
-                            const SkPaint& paint);
+    void drawPoints(PointMode mode, size_t count, const SkPoint pts[], const SkPaint& paint);
 
     /** Helper method for drawing a single point. See drawPoints() for a more
         details.
@@ -711,7 +684,7 @@ public:
         @param rect     The rect to be drawn
         @param paint    The paint used to draw the rect
     */
-    virtual void drawRect(const SkRect& rect, const SkPaint& paint);
+    void drawRect(const SkRect& rect, const SkPaint& paint);
 
     /** Draw the specified rectangle using the specified paint. The rectangle
         will be filled or framed based on the Style in the paint.
@@ -740,7 +713,7 @@ public:
         @param oval     The rectangle bounds of the oval to be drawn
         @param paint    The paint used to draw the oval
     */
-    virtual void drawOval(const SkRect& oval, const SkPaint&);
+    void drawOval(const SkRect& oval, const SkPaint&);
 
     /**
      *  Draw the specified RRect using the specified paint The rrect will be filled or stroked
@@ -749,7 +722,7 @@ public:
      *  @param rrect    The round-rect to draw
      *  @param paint    The paint used to draw the round-rect
      */
-    virtual void drawRRect(const SkRRect& rrect, const SkPaint& paint);
+    void drawRRect(const SkRRect& rrect, const SkPaint& paint);
 
     /**
      *  Draw the annulus formed by the outer and inner rrects. The results
@@ -797,7 +770,84 @@ public:
         @param path     The path to be drawn
         @param paint    The paint used to draw the path
     */
-    virtual void drawPath(const SkPath& path, const SkPaint& paint);
+    void drawPath(const SkPath& path, const SkPaint& paint);
+
+    /** Draw the specified image, with its top/left corner at (x,y), using the
+        specified paint, transformed by the current matrix.
+
+        @param image    The image to be drawn
+        @param left     The position of the left side of the image being drawn
+        @param top      The position of the top side of the image being drawn
+        @param paint    The paint used to draw the image, or NULL
+     */
+    void drawImage(const SkImage* image, SkScalar left, SkScalar top, const SkPaint* paint = NULL);
+
+    /**
+     *  Controls the behavior at the edge of the src-rect, when specified in drawImageRect,
+     *  trading off speed for exactness.
+     *
+     *  When filtering is enabled (in the Paint), skia may need to sample in a neighborhood around
+     *  the pixels in the image. If there is a src-rect specified, it is intended to restrict the
+     *  pixels that will be read. However, for performance reasons, some implementations may slow
+     *  down if they cannot read 1-pixel past the src-rect boundary at times.
+     *
+     *  This enum allows the caller to specify if such a 1-pixel "slop" will be visually acceptable.
+     *  If it is, the caller should pass kFast, and it may result in a faster draw. If the src-rect
+     *  must be strictly respected, the caller should pass kStrict.
+     */
+    enum SrcRectConstraint {
+        /**
+         *  If kStrict is specified, the implementation must respect the src-rect
+         *  (if specified) strictly, and will never sample outside of those bounds during sampling
+         *  even when filtering. This may be slower than kFast.
+         */
+        kStrict_SrcRectConstraint,
+
+        /**
+         *  If kFast is specified, the implementation may sample outside of the src-rect
+         *  (if specified) by half the width of filter. This allows greater flexibility
+         *  to the implementation and can make the draw much faster.
+         */
+        kFast_SrcRectConstraint,
+    };
+
+    /** Draw the specified image, scaling and translating so that it fills the specified
+     *  dst rect. If the src rect is non-null, only that subset of the image is transformed
+     *  and drawn.
+     *
+     *  @param image      The image to be drawn
+     *  @param src        Optional: specify the subset of the image to be drawn
+     *  @param dst        The destination rectangle where the scaled/translated
+     *                    image will be drawn
+     *  @param paint      The paint used to draw the image, or NULL
+     *  @param constraint Control the tradeoff between speed and exactness w.r.t. the src-rect.
+     */
+    void drawImageRect(const SkImage* image, const SkRect& src, const SkRect& dst,
+                       const SkPaint* paint,
+                       SrcRectConstraint constraint = kStrict_SrcRectConstraint);
+    // variant that takes src SkIRect
+    void drawImageRect(const SkImage* image, const SkIRect& isrc, const SkRect& dst,
+                       const SkPaint* paint, SrcRectConstraint = kStrict_SrcRectConstraint);
+    // variant that assumes src == image-bounds
+    void drawImageRect(const SkImage* image, const SkRect& dst, const SkPaint* paint,
+                       SrcRectConstraint = kStrict_SrcRectConstraint);
+
+    /**
+     *  Draw the image stretched differentially to fit into dst.
+     *  center is a rect within the image, and logically divides the image
+     *  into 9 sections (3x3). For example, if the middle pixel of a [5x5]
+     *  image is the "center", then the center-rect should be [2, 2, 3, 3].
+     *
+     *  If the dst is >= the image size, then...
+     *  - The 4 corners are not stretched at all.
+     *  - The sides are stretched in only one axis.
+     *  - The center is stretched in both axes.
+     * Else, for each axis where dst < image,
+     *  - The corners shrink proportionally
+     *  - The sides (along the shrink axis) and center are not drawn
+     */
+    void drawImageNine(const SkImage*, const SkIRect& center, const SkRect& dst,
+                        const SkPaint* paint = NULL);
 
     /** Draw the specified bitmap, with its top/left corner at (x,y), using the
         specified paint, transformed by the current matrix. Note: if the paint
@@ -815,51 +865,27 @@ public:
         @param top      The position of the top side of the bitmap being drawn
         @param paint    The paint used to draw the bitmap, or NULL
     */
-    virtual void drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top,
-                            const SkPaint* paint = NULL);
+    void drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top,
+                    const SkPaint* paint = NULL);
 
-    enum DrawBitmapRectFlags {
-        kNone_DrawBitmapRectFlag            = 0x0,
-        /**
-         *  When filtering is enabled, allow the color samples outside of
-         *  the src rect (but still in the src bitmap) to bleed into the
-         *  drawn portion
-         */
-        kBleed_DrawBitmapRectFlag           = 0x1,
-    };
-
-    /** Draw the specified bitmap, with the specified matrix applied (before the
-        canvas' matrix is applied).
-        @param bitmap   The bitmap to be drawn
-        @param src      Optional: specify the subset of the bitmap to be drawn
-        @param dst      The destination rectangle where the scaled/translated
-                        image will be drawn
-        @param paint    The paint used to draw the bitmap, or NULL
-    */
-    virtual void drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src,
-                                      const SkRect& dst,
-                                      const SkPaint* paint = NULL,
-                                      DrawBitmapRectFlags flags = kNone_DrawBitmapRectFlag);
-
-    void drawBitmapRect(const SkBitmap& bitmap, const SkRect& dst,
-                        const SkPaint* paint = NULL) {
-        this->drawBitmapRectToRect(bitmap, NULL, dst, paint, kNone_DrawBitmapRectFlag);
-    }
-
-    void drawBitmapRect(const SkBitmap& bitmap, const SkIRect* isrc,
-                        const SkRect& dst, const SkPaint* paint = NULL,
-                        DrawBitmapRectFlags flags = kNone_DrawBitmapRectFlag) {
-        SkRect realSrcStorage;
-        SkRect* realSrcPtr = NULL;
-        if (isrc) {
-            realSrcStorage.set(*isrc);
-            realSrcPtr = &realSrcStorage;
-        }
-        this->drawBitmapRectToRect(bitmap, realSrcPtr, dst, paint, flags);
-    }
-
-    virtual void drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m,
-                                  const SkPaint* paint = NULL);
+    /** Draw the specified bitmap, scaling and translating so that it fills the specified
+     *  dst rect. If the src rect is non-null, only that subset of the bitmap is transformed
+     *  and drawn.
+     *
+     *  @param bitmap     The bitmap to be drawn
+     *  @param src        Optional: specify the subset of the bitmap to be drawn
+     *  @param dst        The destination rectangle where the scaled/translated
+     *                    bitmap will be drawn
+     *  @param paint      The paint used to draw the bitmap, or NULL
+     *  @param constraint Control the tradeoff between speed and exactness w.r.t. the src-rect.
+     */
+    void drawBitmapRect(const SkBitmap& bitmap, const SkRect& src, const SkRect& dst,
+                        const SkPaint* paint, SrcRectConstraint = kStrict_SrcRectConstraint);
+    // variant where src is SkIRect
+    void drawBitmapRect(const SkBitmap& bitmap, const SkIRect& isrc, const SkRect& dst,
+                        const SkPaint* paint, SrcRectConstraint = kStrict_SrcRectConstraint);
+    void drawBitmapRect(const SkBitmap& bitmap, const SkRect& dst, const SkPaint* paint,
+                        SrcRectConstraint = kStrict_SrcRectConstraint);
 
     /**
      *  Draw the bitmap stretched differentially to fit into dst.
@@ -875,8 +901,8 @@ public:
      *  - The corners shrink proportionally
      *  - The sides (along the shrink axis) and center are not drawn
      */
-    virtual void drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
-                                const SkRect& dst, const SkPaint* paint = NULL);
+    void drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center, const SkRect& dst,
+                        const SkPaint* paint = NULL);
 
     /** Draw the specified bitmap, with its top/left corner at (x,y),
         NOT transformed by the current matrix. Note: if the paint
@@ -889,8 +915,7 @@ public:
         @param top      The position of the top side of the bitmap being drawn
         @param paint    The paint used to draw the bitmap, or NULL
     */
-    virtual void drawSprite(const SkBitmap& bitmap, int left, int top,
-                            const SkPaint* paint = NULL);
+    void drawSprite(const SkBitmap& bitmap, int left, int top, const SkPaint* paint = NULL);
 
     /** Draw the text, with origin at (x,y), using the specified paint.
         The origin is interpreted based on the Align setting in the paint.
@@ -900,8 +925,8 @@ public:
         @param y        The y-coordinate of the origin of the text being drawn
         @param paint    The paint used for the text (e.g. color, size, style)
     */
-    SK_LEGACY_DRAWTEXT_VIRTUAL void drawText(const void* text, size_t byteLength, SkScalar x,
-                          SkScalar y, const SkPaint& paint);
+    void drawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
+                  const SkPaint& paint);
 
     /** Draw the text, with each character/glyph origin specified by the pos[]
         array. The origin is interpreted by the Align setting in the paint.
@@ -910,8 +935,8 @@ public:
         @param pos      Array of positions, used to position each character
         @param paint    The paint used for the text (e.g. color, size, style)
         */
-    SK_LEGACY_DRAWTEXT_VIRTUAL void drawPosText(const void* text, size_t byteLength,
-                             const SkPoint pos[], const SkPaint& paint);
+    void drawPosText(const void* text, size_t byteLength, const SkPoint pos[],
+                     const SkPaint& paint);
 
     /** Draw the text, with each character/glyph origin specified by the x
         coordinate taken from the xpos[] array, and the y from the constY param.
@@ -922,9 +947,8 @@ public:
         @param constY   The shared Y coordinate for all of the positions
         @param paint    The paint used for the text (e.g. color, size, style)
         */
-    SK_LEGACY_DRAWTEXT_VIRTUAL void drawPosTextH(const void* text, size_t byteLength,
-                              const SkScalar xpos[], SkScalar constY,
-                              const SkPaint& paint);
+    void drawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], SkScalar constY,
+                      const SkPaint& paint);
 
     /** Draw the text, with origin at (x,y), using the specified paint, along
         the specified path. The paint's Align setting determins where along the
@@ -938,8 +962,7 @@ public:
                             position the text
         @param paint        The paint used for the text
     */
-    void drawTextOnPathHV(const void* text, size_t byteLength,
-                          const SkPath& path, SkScalar hOffset,
+    void drawTextOnPathHV(const void* text, size_t byteLength, const SkPath& path, SkScalar hOffset,
                           SkScalar vOffset, const SkPaint& paint);
 
     /** Draw the text, with origin at (x,y), using the specified paint, along
@@ -952,17 +975,16 @@ public:
                             mapped onto the path
         @param paint        The paint used for the text
         */
-    SK_LEGACY_DRAWTEXT_VIRTUAL void drawTextOnPath(const void* text, size_t byteLength,
-                                const SkPath& path, const SkMatrix* matrix,
-                                const SkPaint& paint);
+    void drawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
+                        const SkMatrix* matrix, const SkPaint& paint);
 
-    /** PRIVATE / EXPERIMENTAL -- do not call
-        Perform back-end analysis/optimization of a picture. This may attach
-        optimization data to the picture which can be used by a later
-        drawPicture call.
-        @param picture The recorded drawing commands to analyze/optimize
+    /** Draw the text blob, offset by (x,y), using the specified paint.
+        @param blob     The text blob to be drawn
+        @param x        The x-offset of the text being drawn
+        @param y        The y-offset of the text being drawn
+        @param paint    The paint used for the text (e.g. color, size, style)
     */
-    void EXPERIMENTAL_optimize(const SkPicture* picture);
+    void drawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y, const SkPaint& paint);
 
     /** Draw the picture into this canvas. This method effective brackets the
         playback of the picture's draw calls with save/restore, so the state
@@ -970,7 +992,23 @@ public:
         @param picture The recorded drawing commands to playback into this
                        canvas.
     */
-    void drawPicture(const SkPicture* picture);
+    void drawPicture(const SkPicture* picture) {
+        this->drawPicture(picture, NULL, NULL);
+    }
+
+    /**
+     *  Draw the picture into this canvas.
+     *
+     *  If matrix is non-null, apply that matrix to the CTM when drawing this picture. This is
+     *  logically equivalent to
+     *      save/concat/drawPicture/restore
+     *
+     *  If paint is non-null, draw the picture into a temporary buffer, and then apply the paint's
+     *  alpha/colorfilter/imagefilter/xfermode to that buffer as it is drawn to the canvas.
+     *  This is logically equivalent to
+     *      saveLayer(paint)/drawPicture/restore
+     */
+    void drawPicture(const SkPicture*, const SkMatrix* matrix, const SkPaint* paint);
 
     enum VertexMode {
         kTriangles_VertexMode,
@@ -1001,48 +1039,64 @@ public:
         @param indexCount number of entries in the indices array (if not null)
         @param paint Specifies the shader/texture if present.
     */
-    virtual void drawVertices(VertexMode vmode, int vertexCount,
-                              const SkPoint vertices[], const SkPoint texs[],
-                              const SkColor colors[], SkXfermode* xmode,
-                              const uint16_t indices[], int indexCount,
-                              const SkPaint& paint);
+    void drawVertices(VertexMode vmode, int vertexCount,
+                      const SkPoint vertices[], const SkPoint texs[],
+                      const SkColor colors[], SkXfermode* xmode,
+                      const uint16_t indices[], int indexCount,
+                      const SkPaint& paint);
 
-    /** Send a blob of data to the canvas.
-        For canvases that draw, this call is effectively a no-op, as the data
-        is not parsed, but just ignored. However, this call exists for
-        subclasses like SkPicture's recording canvas, that can store the data
-        and then play it back later (via another call to drawData).
-     */
-    virtual void drawData(const void* data, size_t length) {
-        // do nothing. Subclasses may do something with the data
-    }
+    /**
+     Draw a cubic coons patch
 
-    /** Add comments. beginCommentGroup/endCommentGroup open/close a new group.
-        Each comment added via addComment is notionally attached to its
-        enclosing group. Top-level comments simply belong to no group.
+     @param cubic specifies the 4 bounding cubic bezier curves of a patch with clockwise order
+                    starting at the top left corner.
+     @param colors specifies the colors for the corners which will be bilerp across the patch,
+                    their order is clockwise starting at the top left corner.
+     @param texCoords specifies the texture coordinates that will be bilerp across the patch,
+                    their order is the same as the colors.
+     @param xmode specifies how are the colors and the textures combined if both of them are
+                    present.
+     @param paint Specifies the shader/texture if present.
      */
-    virtual void beginCommentGroup(const char* description) {
-        // do nothing. Subclasses may do something
-    }
-    virtual void addComment(const char* kywd, const char* value) {
-        // do nothing. Subclasses may do something
-    }
-    virtual void endCommentGroup() {
-        // do nothing. Subclasses may do something
+    void drawPatch(const SkPoint cubics[12], const SkColor colors[4],
+                   const SkPoint texCoords[4], SkXfermode* xmode, const SkPaint& paint);
+
+    /**
+     *  Draw a set of sprites from the atlas. Each is specified by a tex rectangle in the
+     *  coordinate space of the atlas, and a corresponding xform which transforms the tex rectangle
+     *  into a quad.
+     *
+     *      xform maps [0, 0, tex.width, tex.height] -> quad
+     *
+     *  The color array is optional. When specified, each color modulates the pixels in its
+     *  corresponding quad (via the specified SkXfermode::Mode).
+     *
+     *  The cullRect is optional. When specified, it must be a conservative bounds of all of the
+     *  resulting transformed quads, allowing the canvas to skip drawing if the cullRect does not
+     *  intersect the current clip.
+     *
+     *  The paint is optional. If specified, its antialiasing, alpha, color-filter, image-filter
+     *  and xfermode are used to affect each of the quads.
+     */
+    void drawAtlas(const SkImage* atlas, const SkRSXform xform[], const SkRect tex[],
+                   const SkColor colors[], int count, SkXfermode::Mode, const SkRect* cullRect,
+                   const SkPaint* paint);
+
+    void drawAtlas(const SkImage* atlas, const SkRSXform xform[], const SkRect tex[], int count,
+                   const SkRect* cullRect, const SkPaint* paint) {
+        this->drawAtlas(atlas, xform, tex, NULL, count, SkXfermode::kDst_Mode, cullRect, paint);
     }
 
     /**
-     *  With this call the client asserts that subsequent draw operations (up to the
-     *  matching popCull()) are fully contained within the given bounding box. The assertion
-     *  is not enforced, but the information might be used to quick-reject command blocks,
-     *  so an incorrect bounding box may result in incomplete rendering.
+     *  Draw the contents of this drawable into the canvas. If the canvas is async
+     *  (e.g. it is recording into a picture) then the drawable will be referenced instead,
+     *  to have its draw() method called when the picture is finalized.
+     *
+     *  If the intent is to force the contents of the drawable into this canvas immediately,
+     *  then drawable->draw(canvas) may be called.
      */
-    void pushCull(const SkRect& cullRect);
-
-    /**
-     *  Terminates the current culling block, and restores the previous one (if any).
-     */
-    void popCull();
+    void drawDrawable(SkDrawable* drawable, const SkMatrix* = NULL);
+    void drawDrawable(SkDrawable*, SkScalar x, SkScalar y);
 
     //////////////////////////////////////////////////////////////////////////
 
@@ -1085,25 +1139,13 @@ public:
     */
     const SkMatrix& getTotalMatrix() const;
 
-#ifdef SK_SUPPORT_LEGACY_GETCLIPTYPE
-    enum ClipType {
-        kEmpty_ClipType = 0,
-        kRect_ClipType,
-        kComplex_ClipType
-    };
-    /** Returns a description of the total clip; may be cheaper than
-        getting the clip and querying it directly.
-    */
-    virtual ClipType getClipType() const;
-#endif
-
     /** Return the clip stack. The clip stack stores all the individual
      *  clips organized by the save/restore frame in which they were
      *  added.
      *  @return the current clip stack ("list" of individual clip elements)
      */
     const SkClipStack* getClipStack() const {
-        return &fClipStack;
+        return fClipStack;
     }
 
     typedef SkCanvasClipVisitor ClipVisitor;
@@ -1154,20 +1196,30 @@ public:
         bool              fDone;
     };
 
-    // don't call
-    const SkRegion& internal_private_getTotalClip() const;
-    // don't call
-    void internal_private_getTotalClipAsPath(SkPath*) const;
     // don't call
     GrRenderTarget* internal_private_accessTopLayerRenderTarget();
 
+    // don't call
+    static void Internal_Private_SetIgnoreSaveLayerBounds(bool);
+    static bool Internal_Private_GetIgnoreSaveLayerBounds();
+    static void Internal_Private_SetTreatSpriteAsBitmap(bool);
+    static bool Internal_Private_GetTreatSpriteAsBitmap();
+
+    // TEMP helpers until we switch virtual over to const& for src-rect
+    void legacy_drawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
+                              const SkPaint* paint,
+                              SrcRectConstraint constraint = kStrict_SrcRectConstraint);
+    void legacy_drawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst,
+                               const SkPaint* paint,
+                               SrcRectConstraint constraint = kStrict_SrcRectConstraint);
+
 protected:
     // default impl defers to getDevice()->newSurface(info)
-    virtual SkSurface* onNewSurface(const SkImageInfo&);
+    virtual SkSurface* onNewSurface(const SkImageInfo&, const SkSurfaceProps&);
 
     // default impl defers to its device
-    virtual const void* onPeekPixels(SkImageInfo*, size_t* rowBytes);
-    virtual void* onAccessTopLayerPixels(SkImageInfo*, size_t* rowBytes);
+    virtual bool onPeekPixels(SkPixmap*);
+    virtual bool onAccessTopLayerPixels(SkPixmap*);
 
     // Subclass save/restore notifiers.
     // Overriders should call the corresponding INHERITED method up the inheritance chain.
@@ -1182,6 +1234,7 @@ protected:
         return kFullLayer_SaveLayerStrategy;
     }
     virtual void willRestore() {}
+    virtual void didRestore() {}
     virtual void didConcat(const SkMatrix&) {}
     virtual void didSetMatrix(const SkMatrix&) {}
 
@@ -1201,6 +1254,39 @@ protected:
                                   const SkPath& path, const SkMatrix* matrix,
                                   const SkPaint& paint);
 
+    virtual void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
+                                const SkPaint& paint);
+
+    virtual void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
+                           const SkPoint texCoords[4], SkXfermode* xmode, const SkPaint& paint);
+
+    virtual void onDrawDrawable(SkDrawable*, const SkMatrix*);
+
+    virtual void onDrawPaint(const SkPaint&);
+    virtual void onDrawRect(const SkRect&, const SkPaint&);
+    virtual void onDrawOval(const SkRect&, const SkPaint&);
+    virtual void onDrawRRect(const SkRRect&, const SkPaint&);
+    virtual void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&);
+    virtual void onDrawVertices(VertexMode, int vertexCount, const SkPoint vertices[],
+                                const SkPoint texs[], const SkColor colors[], SkXfermode*,
+                                const uint16_t indices[], int indexCount, const SkPaint&);
+
+    virtual void onDrawAtlas(const SkImage*, const SkRSXform[], const SkRect[], const SkColor[],
+                             int count, SkXfermode::Mode, const SkRect* cull, const SkPaint*);
+    virtual void onDrawPath(const SkPath&, const SkPaint&);
+    virtual void onDrawImage(const SkImage*, SkScalar dx, SkScalar dy, const SkPaint*);
+    virtual void onDrawImageRect(const SkImage*, const SkRect*, const SkRect&, const SkPaint*,
+                                 SrcRectConstraint);
+    virtual void onDrawImageNine(const SkImage*, const SkIRect& center, const SkRect& dst,
+                                 const SkPaint*);
+
+    virtual void onDrawBitmap(const SkBitmap&, SkScalar dx, SkScalar dy, const SkPaint*);
+    virtual void onDrawBitmapRect(const SkBitmap&, const SkRect*, const SkRect&, const SkPaint*,
+                                  SrcRectConstraint);
+    virtual void onDrawBitmapNine(const SkBitmap&, const SkIRect& center, const SkRect& dst,
+                                  const SkPaint*);
+    virtual void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*);
+
     enum ClipEdgeStyle {
         kHard_ClipEdgeStyle,
         kSoft_ClipEdgeStyle
@@ -1213,7 +1299,7 @@ protected:
 
     virtual void onDiscard();
 
-    virtual void onDrawPicture(const SkPicture* picture);
+    virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*);
 
     // Returns the canvas to be used by DrawIter. Default implementation
     // returns this. Subclasses that encapsulate an indirect canvas may
@@ -1229,30 +1315,40 @@ protected:
                         SkIRect* intersection,
                         const SkImageFilter* imageFilter = NULL);
 
-    // Called by child classes that override clipPath and clipRRect to only
-    // track fast conservative clip bounds, rather than exact clips.
-    void updateClipConservativelyUsingBounds(const SkRect&, SkRegion::Op,
-                                             bool inverseFilled);
+private:
+    enum ShaderOverrideOpacity {
+        kNone_ShaderOverrideOpacity,        //!< there is no overriding shader (bitmap or image)
+        kOpaque_ShaderOverrideOpacity,      //!< the overriding shader is opaque
+        kNotOpaque_ShaderOverrideOpacity,   //!< the overriding shader may not be opaque
+    };
 
     // notify our surface (if we have one) that we are about to draw, so it
     // can perform copy-on-write or invalidate any cached images
-    void predrawNotify();
+    void predrawNotify(bool willOverwritesEntireSurface = false);
+    void predrawNotify(const SkRect* rect, const SkPaint* paint, ShaderOverrideOpacity);
+    void predrawNotify(const SkRect* rect, const SkPaint* paint, bool shaderOverrideIsOpaque) {
+        this->predrawNotify(rect, paint, shaderOverrideIsOpaque ? kOpaque_ShaderOverrideOpacity
+                                                                : kNotOpaque_ShaderOverrideOpacity);
+    }
 
-    virtual void onPushCull(const SkRect& cullRect);
-    virtual void onPopCull();
-
-private:
     class MCRec;
 
-    SkClipStack fClipStack;
+    SkAutoTUnref<SkClipStack> fClipStack;
     SkDeque     fMCStack;
     // points to top of stack
     MCRec*      fMCRec;
     // the first N recs that can fit here mean we won't call malloc
-    uint32_t    fMCRecStorage[32];
+    enum {
+        kMCRecSize      = 128,  // most recent measurement
+        kMCRecCount     = 32,   // common depth for save/restores
+        kDeviceCMSize   = 136,  // most recent measurement
+    };
+    intptr_t fMCRecStorage[kMCRecSize * kMCRecCount / sizeof(intptr_t)];
+    intptr_t fDeviceCMStorage[kDeviceCMSize / sizeof(intptr_t)];
 
-    int         fSaveLayerCount;    // number of successful saveLayer calls
-    int         fCullCount;         // number of active culls
+    const SkSurfaceProps fProps;
+
+    int         fSaveCount;         // value returned by getSaveCount()
 
     SkMetaData* fMetaData;
 
@@ -1267,25 +1363,37 @@ private:
     bool fDeviceCMDirty;            // cleared by updateDeviceCMCache()
     void updateDeviceCMCache();
 
+    void doSave();
+    void checkForDeferredSave();
+
     friend class SkDrawIter;        // needs setupDrawForLayerDevice()
     friend class AutoDrawLooper;
     friend class SkLua;             // needs top layer size and offset
     friend class SkDebugCanvas;     // needs experimental fAllowSimplifyClip
-    friend class SkDeferredDevice;  // needs getTopDevice()
     friend class SkSurface_Raster;  // needs getDevice()
+    friend class SkRecorder;        // InitFlags
+    friend class SkNoSaveLayerCanvas;   // InitFlags
+    friend class SkPictureImageFilter;  // SkCanvas(SkBaseDevice*, SkSurfaceProps*, InitFlags)
+    friend class SkPictureRecord;   // predrawNotify (why does it need it? <reed>)
 
-    SkBaseDevice* createLayerDevice(const SkImageInfo&);
+    enum InitFlags {
+        kDefault_InitFlags                  = 0,
+        kConservativeRasterClip_InitFlag    = 1 << 0,
+    };
+    SkCanvas(const SkIRect& bounds, InitFlags);
+    SkCanvas(SkBaseDevice* device, InitFlags);
 
-    SkBaseDevice* init(SkBaseDevice*);
+    void resetForNextPicture(const SkIRect& bounds);
 
-    /**
-     *  DEPRECATED
-     *
-     *  Specify a device for this canvas to draw into. If it is not null, its
-     *  reference count is incremented. If the canvas was already holding a
-     *  device, its reference count is decremented. The new device is returned.
-     */
-    SkBaseDevice* setRootDevice(SkBaseDevice* device);
+    // needs gettotalclip()
+    friend class SkCanvasStateUtils;
+
+    // call this each time we attach ourselves to a device
+    //  - constructor
+    //  - internalSaveLayer
+    void setupDevice(SkBaseDevice*);
+
+    SkBaseDevice* init(SkBaseDevice*, InitFlags);
 
     /**
      * Gets the size/origin of the top level layer in global canvas coordinates. We don't want this
@@ -1294,21 +1402,15 @@ private:
     SkISize getTopLayerSize() const;
     SkIPoint getTopLayerOrigin() const;
 
-    // internal methods are not virtual, so they can safely be called by other
-    // canvas apis, without confusing subclasses (like SkPictureRecording)
-    void internalDrawBitmap(const SkBitmap&, const SkMatrix& m, const SkPaint* paint);
     void internalDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src,
                                 const SkRect& dst, const SkPaint* paint,
-                                DrawBitmapRectFlags flags);
-    void internalDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
-                                const SkRect& dst, const SkPaint* paint);
+                                SrcRectConstraint);
     void internalDrawPaint(const SkPaint& paint);
-    int internalSaveLayer(const SkRect* bounds, const SkPaint* paint,
-                          SaveFlags, bool justForImageFilter, SaveLayerStrategy strategy);
-    void internalDrawDevice(SkBaseDevice*, int x, int y, const SkPaint*);
+    void internalSaveLayer(const SkRect* bounds, const SkPaint*, SaveFlags, SaveLayerStrategy);
+    void internalDrawDevice(SkBaseDevice*, int x, int y, const SkPaint*, bool isBitmapDevice);
 
     // shared by save() and saveLayer()
-    int internalSave();
+    void internalSave();
     void internalRestore();
     static void DrawRect(const SkDraw& draw, const SkPaint& paint,
                          const SkRect& r, SkScalar textSize);
@@ -1316,6 +1418,17 @@ private:
                                     const char text[], size_t byteLength,
                                     SkScalar x, SkScalar y);
 
+    // only for canvasutils
+    const SkRegion& internal_private_getTotalClip() const;
+
+    /*
+     *  Returns true if drawing the specified rect (or all if it is null) with the specified
+     *  paint (or default if null) would overwrite the entire root device of the canvas
+     *  (i.e. the canvas' surface if it had one).
+     */
+    bool wouldOverwriteEntireSurface(const SkRect*, const SkPaint*, ShaderOverrideOpacity) const;
+
+
     /*  These maintain a cache of the clip bounds in local coordinates,
         (converted to 2s-compliment if floats are slow).
      */
@@ -1323,6 +1436,7 @@ private:
     mutable bool   fCachedLocalClipBoundsDirty;
     bool fAllowSoftClip;
     bool fAllowSimplifyClip;
+    const bool fConservativeRasterClip;
 
     const SkRect& getLocalClipBounds() const {
         if (fCachedLocalClipBoundsDirty) {
@@ -1346,9 +1460,6 @@ private:
     };
 
 #ifdef SK_DEBUG
-    // The cull stack rects are in device-space
-    SkTDArray<SkIRect> fCullStack;
-    void validateCull(const SkIRect&);
     void validateClip() const;
 #else
     void validateClip() const {}
@@ -1394,28 +1505,6 @@ private:
 };
 #define SkAutoCanvasRestore(...) SK_REQUIRE_LOCAL_VAR(SkAutoCanvasRestore)
 
-/** Stack helper class to automatically open and close a comment block
- */
-class SkAutoCommentBlock : SkNoncopyable {
-public:
-    SkAutoCommentBlock(SkCanvas* canvas, const char* description) {
-        fCanvas = canvas;
-        if (NULL != fCanvas) {
-            fCanvas->beginCommentGroup(description);
-        }
-    }
-
-    ~SkAutoCommentBlock() {
-        if (NULL != fCanvas) {
-            fCanvas->endCommentGroup();
-        }
-    }
-
-private:
-    SkCanvas* fCanvas;
-};
-#define SkAutoCommentBlock(...) SK_REQUIRE_LOCAL_VAR(SkAutoCommentBlock)
-
 /**
  *  If the caller wants read-only access to the pixels in a canvas, it can just
  *  call canvas->peekPixels(), since that is the fastest way to "peek" at the
diff --git a/gfx/skia/skia/include/core/SkChunkAlloc.h b/gfx/skia/skia/include/core/SkChunkAlloc.h
index e13e2b99c640..9699842e6b42 100644
--- a/gfx/skia/skia/include/core/SkChunkAlloc.h
+++ b/gfx/skia/skia/include/core/SkChunkAlloc.h
@@ -22,6 +22,11 @@ public:
      *  pointers.
      */
     void reset();
+    /**
+     *  Reset to 0 used bytes preserving as much memory as possible.
+     *  This invalidates all returned pointers.
+     */
+    void rewind();
 
     enum AllocFailType {
         kReturnNil_AllocFailType,
@@ -43,7 +48,8 @@ public:
 
     size_t totalCapacity() const { return fTotalCapacity; }
     size_t totalUsed() const { return fTotalUsed; }
-    int blockCount() const { return fBlockCount; }
+    SkDEBUGCODE(int blockCount() const { return fBlockCount; })
+    SkDEBUGCODE(size_t totalLost() const { return fTotalLost; })
 
     /**
      *  Returns true if the specified address is within one of the chunks, and
@@ -60,9 +66,13 @@ private:
     size_t  fChunkSize;
     size_t  fTotalCapacity;
     size_t  fTotalUsed;     // will be <= fTotalCapacity
-    int     fBlockCount;
+    SkDEBUGCODE(int     fBlockCount;)
+    SkDEBUGCODE(size_t  fTotalLost;)     // will be <= fTotalCapacity
 
     Block* newBlock(size_t bytes, AllocFailType ftype);
+    Block* addBlockIfNecessary(size_t bytes, AllocFailType ftype);
+
+    SkDEBUGCODE(void validate();)
 };
 
 #endif
diff --git a/gfx/skia/skia/include/core/SkClipStack.h b/gfx/skia/skia/include/core/SkClipStack.h
index 95e41e622087..b74e47697f91 100644
--- a/gfx/skia/skia/include/core/SkClipStack.h
+++ b/gfx/skia/skia/include/core/SkClipStack.h
@@ -24,7 +24,7 @@ class SkCanvasClipVisitor;
 // (i.e., the fSaveCount in force when it was added). Restores are thus
 // implemented by removing clips from fDeque that have an fSaveCount larger
 // then the freshly decremented count.
-class SK_API SkClipStack {
+class SK_API SkClipStack : public SkNVRefCnt<SkClipStack> {
 public:
     enum BoundsType {
         // The bounding box contains all the pixels that can be written to
@@ -309,13 +309,6 @@ public:
                    BoundsType* boundType,
                    bool* isIntersectionOfRects = NULL) const;
 
-    /**
-     * Takes an input rect in device space and conservatively clips it to the
-     * clip-stack. If false is returned then the rect does not intersect the
-     * clip and is unmodified.
-     */
-    bool intersectRectWithClip(SkRect* devRect) const;
-
     /**
      * Returns true if the input rect in device space is entirely contained
      * by the clip. A return value of false does not guarantee that the rect
@@ -323,6 +316,12 @@ public:
      */
     bool quickContains(const SkRect& devRect) const;
 
+    /**
+     * Flattens the clip stack into a single SkPath. Returns true if any of
+     * the clip stack components requires anti-aliasing.
+     */
+    bool asPath(SkPath* path) const;
+
     void clipDevRect(const SkIRect& ir, SkRegion::Op op) {
         SkRect r;
         r.set(ir);
diff --git a/gfx/skia/skia/include/core/SkColor.h b/gfx/skia/skia/include/core/SkColor.h
index 7faeca7f84b3..1ba1331c1a72 100644
--- a/gfx/skia/skia/include/core/SkColor.h
+++ b/gfx/skia/skia/include/core/SkColor.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,11 +5,11 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkColor_DEFINED
 #define SkColor_DEFINED
 
 #include "SkScalar.h"
+#include "SkTypes.h"
 
 /** \file SkColor.h
 
@@ -161,9 +160,4 @@ SK_API SkPMColor SkPreMultiplyColor(SkColor c);
 */
 typedef SkPMColor (*SkXfermodeProc)(SkPMColor src, SkPMColor dst);
 
-/** Define a function pointer type for combining a premultiplied src color
-    and a 16bit device color.
-*/
-typedef uint16_t (*SkXfermodeProc16)(SkPMColor src, uint16_t dst);
-
 #endif
diff --git a/gfx/skia/skia/include/core/SkColorFilter.h b/gfx/skia/skia/include/core/SkColorFilter.h
index 25e6bbe746bb..57650fbd9859 100644
--- a/gfx/skia/skia/include/core/SkColorFilter.h
+++ b/gfx/skia/skia/include/core/SkColorFilter.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,17 +5,17 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkColorFilter_DEFINED
 #define SkColorFilter_DEFINED
 
 #include "SkColor.h"
 #include "SkFlattenable.h"
+#include "SkTDArray.h"
 #include "SkXfermode.h"
 
-class SkBitmap;
-class GrEffect;
 class GrContext;
+class GrFragmentProcessor;
+class SkBitmap;
 
 /**
  *  ColorFilters are optional objects in the drawing pipeline. When present in
@@ -28,8 +27,6 @@ class GrContext;
  */
 class SK_API SkColorFilter : public SkFlattenable {
 public:
-    SK_DECLARE_INST_COUNT(SkColorFilter)
-
     /**
      *  If the filter can be represented by a source color plus Mode, this
      *  returns true, and sets (if not NULL) the color and mode appropriately.
@@ -69,34 +66,27 @@ public:
         @param count    the number of entries in the src[] and result[] arrays
         @param result   written by the filter
     */
-    virtual void filterSpan(const SkPMColor src[], int count,
-                            SkPMColor result[]) const = 0;
-    /** Called with a scanline of colors, as if there was a shader installed.
-        The implementation writes out its filtered version into result[].
-        Note: shader and result may be the same buffer.
-        @param src      array of colors, possibly generated by a shader
-        @param count    the number of entries in the src[] and result[] arrays
-        @param result   written by the filter
-    */
-    virtual void filterSpan16(const uint16_t shader[], int count,
-                              uint16_t result[]) const;
+    virtual void filterSpan(const SkPMColor src[], int count, SkPMColor result[]) const = 0;
 
     enum Flags {
-        /** If set the filter methods will not change the alpha channel of the
-            colors.
+        /** If set the filter methods will not change the alpha channel of the colors.
         */
         kAlphaUnchanged_Flag = 0x01,
-        /** If set, this subclass implements filterSpan16(). If this flag is
-            set, then kAlphaUnchanged_Flag must also be set.
-        */
-        kHasFilter16_Flag    = 0x02
     };
 
-    /** Returns the flags for this filter. Override in subclasses to return
-        custom flags.
+    /** Returns the flags for this filter. Override in subclasses to return custom flags.
     */
     virtual uint32_t getFlags() const { return 0; }
 
+    /**
+     *  If this subclass can optimally createa composition with the inner filter, return it as
+     *  a new filter (which the caller must unref() when it is done). If no such optimization
+     *  is known, return NULL.
+     *
+     *  e.g. result(color) == this_filter(inner(color))
+     */
+    virtual SkColorFilter* newComposed(const SkColorFilter* /*inner*/) const { return NULL; }
+
     /**
      *  Apply this colorfilter to the specified SkColor. This routine handles
      *  converting to SkPMColor, calling the filter, and then converting back
@@ -123,10 +113,31 @@ public:
     */
     static SkColorFilter* CreateLightingFilter(SkColor mul, SkColor add);
 
-    /** A subclass may implement this factory function to work with the GPU backend. If the return
-        is non-NULL then the caller owns a ref on the returned object.
+    /** Construct a colorfilter whose effect is to first apply the inner filter and then apply
+     *  the outer filter to the result of the inner's.
+     *  The reference counts for outer and inner are incremented.
+     *
+     *  Due to internal limits, it is possible that this will return NULL, so the caller must
+     *  always check.
      */
-    virtual GrEffect* asNewEffect(GrContext*) const;
+    static SkColorFilter* CreateComposeFilter(SkColorFilter* outer, SkColorFilter* inner);
+
+    /**
+     *  A subclass may implement this factory function to work with the GPU backend. It returns
+     *  a GrFragmentProcessor that implemets the color filter in GPU shader code.
+     *
+     *  The fragment processor receives a premultiplied input color and produces a premultiplied
+     *  output color.
+     *
+     *  A null return indicates that the color filter isn't implemented for the GPU backend.
+     */
+    virtual const GrFragmentProcessor* asFragmentProcessor(GrContext*) const {
+        return nullptr;
+    }
+
+    bool affectsTransparentBlack() const {
+        return this->filterColor(0) != 0;
+    }
 
     SK_TO_STRING_PUREVIRT()
 
@@ -135,9 +146,18 @@ public:
 
 protected:
     SkColorFilter() {}
-    SkColorFilter(SkReadBuffer& rb) : INHERITED(rb) {}
 
 private:
+    /*
+     *  Returns 1 if this is a single filter (not a composition of other filters), otherwise it
+     *  reutrns the number of leaf-node filters in a composition. This should be the same value
+     *  as the number of GrFragmentProcessors returned by asFragmentProcessors's array parameter.
+     *
+     *  e.g. compose(filter, compose(compose(filter, filter), filter)) --> 4
+     */
+    virtual int privateComposedFilterCount() const { return 1; }
+    friend class SkComposeColorFilter;
+
     typedef SkFlattenable INHERITED;
 };
 
diff --git a/gfx/skia/skia/include/core/SkColorPriv.h b/gfx/skia/skia/include/core/SkColorPriv.h
index 6f23f9be1498..6347660dbc99 100644
--- a/gfx/skia/skia/include/core/SkColorPriv.h
+++ b/gfx/skia/skia/include/core/SkColorPriv.h
@@ -193,7 +193,7 @@ static inline unsigned Sk255To256(U8CPU value) {
 /** Multiplify value by 0..256, and shift the result down 8
     (i.e. return (value * alpha256) >> 8)
  */
-#define SkAlphaMul(value, alpha256)     (SkMulS16(value, alpha256) >> 8)
+#define SkAlphaMul(value, alpha256)     (((value) * (alpha256)) >> 8)
 
 //  The caller may want negative values, so keep all params signed (int)
 //  so we don't accidentally slip into unsigned math and lose the sign
@@ -213,11 +213,21 @@ static inline int SkAlphaBlend255(S16CPU src, S16CPU dst, U8CPU alpha) {
     SkASSERT((int16_t)dst == dst);
     SkASSERT((uint8_t)alpha == alpha);
 
-    int prod = SkMulS16(src - dst, alpha) + 128;
+    int prod = (src - dst) * alpha + 128;
     prod = (prod + (prod >> 8)) >> 8;
     return dst + prod;
 }
 
+static inline U8CPU SkUnitScalarClampToByte(SkScalar x) {
+    if (x < 0) {
+        return 0;
+    }
+    if (x >= SK_Scalar1) {
+        return 255;
+    }
+    return SkScalarToFixed(x) >> 8;
+}
+
 #define SK_R16_BITS     5
 #define SK_G16_BITS     6
 #define SK_B16_BITS     5
@@ -281,6 +291,16 @@ static inline U16CPU SkAlphaMulRGB16(U16CPU c, unsigned scale) {
 // this helper explicitly returns a clean 16bit value (but slower)
 #define SkAlphaMulRGB16_ToU16(c, s)  (uint16_t)SkAlphaMulRGB16(c, s)
 
+/** Blend pre-expanded RGB32 with 16bit color value by the 0..32 scale parameter.
+    The computation yields only 16bits of valid data, but we claim to return
+    32bits, so that the compiler won't generate extra instructions to "clean"
+    the top 16bits.
+*/
+static inline U16CPU SkBlend32_RGB16(uint32_t src_expand, uint16_t dst, unsigned scale) {
+    uint32_t dst_expand = SkExpand_rgb_16(dst) * scale;
+    return SkCompact_rgb_16((src_expand + dst_expand) >> 5);
+}
+
 /** Blend src and dst 16bit colors by the 0..256 scale parameter.
     The computation yields only 16bits of valid data, but we claim
     to return 32bits, so that the compiler won't generate extra instructions to
@@ -306,7 +326,8 @@ static inline void SkBlendRGB16(const uint16_t src[], uint16_t dst[],
     do {
         uint32_t src32 = SkExpand_rgb_16(*src++);
         uint32_t dst32 = SkExpand_rgb_16(*dst);
-        *dst++ = SkCompact_rgb_16(dst32 + ((src32 - dst32) * srcScale >> 5));
+        *dst++ = static_cast<uint16_t>(
+            SkCompact_rgb_16(dst32 + ((src32 - dst32) * srcScale >> 5)));
     } while (--count > 0);
 }
 
@@ -345,21 +366,31 @@ static inline void SkBlendRGB16(const uint16_t src[], uint16_t dst[],
 #define SkB32Assert(b)  SkASSERT((unsigned)(b) <= SK_B32_MASK)
 
 #ifdef SK_DEBUG
-    static inline void SkPMColorAssert(SkPMColor c) {
-        unsigned a = SkGetPackedA32(c);
-        unsigned r = SkGetPackedR32(c);
-        unsigned g = SkGetPackedG32(c);
-        unsigned b = SkGetPackedB32(c);
-
-        SkA32Assert(a);
-        SkASSERT(r <= a);
-        SkASSERT(g <= a);
-        SkASSERT(b <= a);
-    }
+    #define SkPMColorAssert(color_value)                                    \
+        do {                                                                \
+            SkPMColor pm_color_value = (color_value);                       \
+            uint32_t alpha_color_value = SkGetPackedA32(pm_color_value);    \
+            SkA32Assert(alpha_color_value);                                 \
+            SkASSERT(SkGetPackedR32(pm_color_value) <= alpha_color_value);  \
+            SkASSERT(SkGetPackedG32(pm_color_value) <= alpha_color_value);  \
+            SkASSERT(SkGetPackedB32(pm_color_value) <= alpha_color_value);  \
+        } while (false)
 #else
     #define SkPMColorAssert(c)
 #endif
 
+static inline bool SkPMColorValid(SkPMColor c) {
+    auto a = SkGetPackedA32(c);
+    bool valid = a <= SK_A32_MASK
+              && SkGetPackedR32(c) <= a
+              && SkGetPackedG32(c) <= a
+              && SkGetPackedB32(c) <= a;
+    if (valid) {
+        SkPMColorAssert(c);  // Make sure we're consistent when it counts.
+    }
+    return valid;
+}
+
 /**
  *  Pack the components into a SkPMColor, checking (in the debug version) that
  *  the components are 0..255, and are already premultiplied (i.e. alpha >= color)
@@ -787,7 +818,7 @@ static inline SkPMColor16 SkPackARGB4444(unsigned a, unsigned r,
                          (g << SK_G4444_SHIFT) | (b << SK_B4444_SHIFT));
 }
 
-static inline U16CPU SkAlphaMulQ4(U16CPU c, unsigned scale) {
+static inline SkPMColor16 SkAlphaMulQ4(SkPMColor16 c, int scale) {
     SkASSERT(scale <= 16);
 
     const unsigned mask = 0xF0F;    //gMask_0F0F;
@@ -797,14 +828,14 @@ static inline U16CPU SkAlphaMulQ4(U16CPU c, unsigned scale) {
     unsigned ag = ((c >> 4) & mask) * scale;
     return (rb & mask) | (ag & ~mask);
 #else
-    c = (c & mask) | ((c & (mask << 4)) << 12);
-    c = c * scale >> 4;
-    return (c & mask) | ((c >> 12) & (mask << 4));
+    unsigned expanded_c = (c & mask) | ((c & (mask << 4)) << 12);
+    unsigned scaled_c = (expanded_c * scale) >> 4;
+    return (scaled_c & mask) | ((scaled_c >> 12) & (mask << 4));
 #endif
 }
 
 /** Expand the SkPMColor16 color into a 32bit value that can be scaled all at
-    once by a value up to 16. Used in conjunction with SkCompact_4444.
+    once by a value up to 16.
 */
 static inline uint32_t SkExpand_4444(U16CPU c) {
     SkASSERT(c == (uint16_t)c);
@@ -813,18 +844,6 @@ static inline uint32_t SkExpand_4444(U16CPU c) {
     return (c & mask) | ((c & ~mask) << 12);
 }
 
-/** Compress an expanded value (from SkExpand_4444) back down to a SkPMColor16.
-    NOTE: this explicitly does not clean the top 16 bits (which may be garbage).
-    It does this for speed, since if it is being written directly to 16bits of
-    memory, the top 16bits will be ignored. Casting the result to uint16_t here
-    would add 2 more instructions, slow us down. It is up to the caller to
-    perform the cast if needed.
-*/
-static inline U16CPU SkCompact_4444(uint32_t c) {
-    const unsigned mask = 0xF0F;    //gMask_0F0F;
-    return (c & mask) | ((c >> 12) & ~mask);
-}
-
 static inline uint16_t SkSrcOver4444To16(SkPMColor16 s, uint16_t d) {
     unsigned sa = SkGetPackedA4444(s);
     unsigned sr = SkR4444ToR565(SkGetPackedR4444(s));
@@ -856,22 +875,6 @@ static inline uint16_t SkBlend4444To16(SkPMColor16 src, uint16_t dst, int scale1
     return SkSrcOver4444To16(SkAlphaMulQ4(src, scale16), dst);
 }
 
-static inline uint16_t SkBlend4444(SkPMColor16 src, SkPMColor16 dst, int scale16) {
-    SkASSERT((unsigned)scale16 <= 16);
-
-    uint32_t src32 = SkExpand_4444(src) * scale16;
-    // the scaled srcAlpha is the bottom byte
-#ifdef SK_DEBUG
-    {
-        unsigned srcA = SkGetPackedA4444(src) * scale16;
-        SkASSERT(srcA == (src32 & 0xFF));
-    }
-#endif
-    unsigned dstScale = SkAlpha255To256(255 - (src32 & 0xFF)) >> 4;
-    uint32_t dst32 = SkExpand_4444(dst) * dstScale;
-    return SkCompact_4444((src32 + dst32) >> 4);
-}
-
 static inline SkPMColor SkPixel4444ToPixel32(U16CPU c) {
     uint32_t d = (SkGetPackedA4444(c) << SK_A32_SHIFT) |
                  (SkGetPackedR4444(c) << SK_R32_SHIFT) |
diff --git a/gfx/skia/skia/include/core/SkColorTable.h b/gfx/skia/skia/include/core/SkColorTable.h
index e4c8c86c13dd..ccea7ed550bf 100644
--- a/gfx/skia/skia/include/core/SkColorTable.h
+++ b/gfx/skia/skia/include/core/SkColorTable.h
@@ -10,6 +10,7 @@
 #ifndef SkColorTable_DEFINED
 #define SkColorTable_DEFINED
 
+#include "../private/SkOncePtr.h"
 #include "SkColor.h"
 #include "SkFlattenable.h"
 #include "SkImageInfo.h"
@@ -18,75 +19,64 @@
 
     SkColorTable holds an array SkPMColors (premultiplied 32-bit colors) used by
     8-bit bitmaps, where the bitmap bytes are interpreted as indices into the colortable.
-*/
-class SkColorTable : public SkRefCnt {
-public:
-    SK_DECLARE_INST_COUNT(SkColorTable)
 
-    /** Makes a deep copy of colors.
+    SkColorTable is thread-safe.
+*/
+class SK_API SkColorTable : public SkRefCnt {
+public:
+    /** Copy up to 256 colors into a new SkColorTable.
      */
-    SkColorTable(const SkColorTable& src);
-    SkColorTable(const SkPMColor colors[], int count,
-                 SkAlphaType alphaType = kPremul_SkAlphaType);
+    SkColorTable(const SkPMColor colors[], int count);
     virtual ~SkColorTable();
 
-    SkAlphaType alphaType() const { return (SkAlphaType)fAlphaType; }
-
-    bool isOpaque() const {
-        return SkAlphaTypeIsOpaque(this->alphaType());
-    }
-
     /** Returns the number of colors in the table.
-    */
+     */
     int count() const { return fCount; }
 
     /** Returns the specified color from the table. In the debug build, this asserts that
-        the index is in range (0 <= index < count).
-    */
+     *  the index is in range (0 <= index < count).
+     */
     SkPMColor operator[](int index) const {
-        SkASSERT(fColors != NULL && (unsigned)index < fCount);
+        SkASSERT(fColors != NULL && (unsigned)index < (unsigned)fCount);
         return fColors[index];
     }
 
-    /**
-     *  Return the array of colors for reading. This must be balanced by a call
-     *  to unlockColors().
+    /** Return the array of colors for reading.
      */
-    const SkPMColor* lockColors() {
-        SkDEBUGCODE(sk_atomic_inc(&fColorLockCount);)
-        return fColors;
-    }
+    const SkPMColor* readColors() const { return fColors; }
 
-    /**
-     *  Balancing call to lockColors().
+    /** read16BitCache() returns the array of RGB16 colors that mirror the 32bit colors.
      */
-    void unlockColors();
+    const uint16_t* read16BitCache() const;
 
-    /** Similar to lockColors(), lock16BitCache() returns the array of
-        RGB16 colors that mirror the 32bit colors. However, this function
-        will return null if kColorsAreOpaque_Flag is not set.
-        Also, unlike lockColors(), the returned array here cannot be modified.
-    */
-    const uint16_t* lock16BitCache();
-    /** Balancing call to lock16BitCache().
-    */
-    void unlock16BitCache() {
-        SkASSERT(f16BitCacheLockCount > 0);
-        SkDEBUGCODE(f16BitCacheLockCount -= 1);
-    }
-
-    explicit SkColorTable(SkReadBuffer&);
     void writeToBuffer(SkWriteBuffer&) const;
 
-private:
-    SkPMColor*  fColors;
-    uint16_t*   f16BitCache;
-    uint16_t    fCount;
-    uint8_t     fAlphaType;
-    SkDEBUGCODE(int fColorLockCount;)
-    SkDEBUGCODE(int f16BitCacheLockCount;)
+    // may return null
+    static SkColorTable* Create(SkReadBuffer&);
 
-    void inval16BitCache();
+private:
+    enum AllocatedWithMalloc {
+        kAllocatedWithMalloc
+    };
+    // assumes ownership of colors (assumes it was allocated w/ malloc)
+    SkColorTable(SkPMColor* colors, int count, AllocatedWithMalloc);
+
+    SkPMColor*            fColors;
+    SkOncePtr<uint16_t[]> f16BitCache;
+    int                   fCount;
+
+    void init(const SkPMColor* colors, int count);
+
+    friend class SkImageGenerator;
+    // Only call if no other thread or cache has seen this table.
+    void dangerous_overwriteColors(const SkPMColor newColors[], int count) {
+        if (count < 0 || count > fCount) {
+            sk_throw();
+        }
+        // assumes that f16BitCache nas NOT been initialized yet, so we don't try to update it
+        memcpy(fColors, newColors, count * sizeof(SkPMColor));
+        fCount = count; // update fCount, in case count is smaller
+    }
 
     typedef SkRefCnt INHERITED;
 };
diff --git a/gfx/skia/skia/include/core/SkComposeShader.h b/gfx/skia/skia/include/core/SkComposeShader.h
index 3a28e1e03d8d..bc9d932ee5f2 100644
--- a/gfx/skia/skia/include/core/SkComposeShader.h
+++ b/gfx/skia/skia/include/core/SkComposeShader.h
@@ -34,7 +34,14 @@ public:
     SkComposeShader(SkShader* sA, SkShader* sB, SkXfermode* mode = NULL);
     virtual ~SkComposeShader();
 
-    virtual size_t contextSize() const SK_OVERRIDE;
+    size_t contextSize() const override;
+
+#if SK_SUPPORT_GPU
+    const GrFragmentProcessor*  asFragmentProcessor(GrContext*,
+                                                    const SkMatrix& viewM,
+                                                    const SkMatrix* localMatrix,
+                                                    SkFilterQuality) const override;
+#endif
 
     class ComposeShaderContext : public SkShader::Context {
     public:
@@ -48,7 +55,7 @@ public:
 
         virtual ~ComposeShaderContext();
 
-        virtual void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE;
+        void shadeSpan(int x, int y, SkPMColor[], int count) override;
 
     private:
         SkShader::Context* fShaderContextA;
@@ -62,15 +69,15 @@ public:
     SkShader* getShaderB() { return fShaderB; }
 #endif
 
-    virtual bool asACompose(ComposeRec* rec) const SK_OVERRIDE;
+    bool asACompose(ComposeRec* rec) const override;
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeShader)
 
 protected:
     SkComposeShader(SkReadBuffer& );
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
-    virtual Context* onCreateContext(const ContextRec&, void*) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
+    Context* onCreateContext(const ContextRec&, void*) const override;
 
 private:
     SkShader*   fShaderA;
diff --git a/gfx/skia/skia/include/core/SkData.h b/gfx/skia/skia/include/core/SkData.h
index fba2846c7045..60a98e00f004 100644
--- a/gfx/skia/skia/include/core/SkData.h
+++ b/gfx/skia/skia/include/core/SkData.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
@@ -6,14 +5,14 @@
  * found in the LICENSE file.
  */
 
-
-
 #ifndef SkData_DEFINED
 #define SkData_DEFINED
 
+#include <stdio.h>
+
 #include "SkRefCnt.h"
 
-struct SkFILE;
+class SkStream;
 
 /**
  *  SkData holds an immutable data buffer. Not only is the data immutable,
@@ -22,8 +21,6 @@ struct SkFILE;
  */
 class SK_API SkData : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkData)
-
     /**
      *  Returns the number of bytes stored.
      */
@@ -44,6 +41,19 @@ public:
         return reinterpret_cast<const uint8_t*>(fPtr);
     }
 
+    /**
+     *  USE WITH CAUTION.
+     *  This call will assert that the refcnt is 1, as a precaution against modifying the
+     *  contents when another client/thread has access to the data.
+     */
+    void* writable_data() {
+        if (fSize) {
+            // only assert we're unique if we're not empty
+            SkASSERT(this->unique());
+        }
+        return fPtr;
+    }
+
     /**
      *  Helper to copy a range of the data into a caller-provided buffer.
      *  Returns the actual number of bytes copied, after clamping offset and
@@ -60,15 +70,21 @@ public:
 
     /**
      *  Function that, if provided, will be called when the SkData goes out
-     *  of scope, allowing for custom allocation/freeing of the data.
+     *  of scope, allowing for custom allocation/freeing of the data's contents.
      */
-    typedef void (*ReleaseProc)(const void* ptr, size_t length, void* context);
+    typedef void (*ReleaseProc)(const void* ptr, void* context);
 
     /**
      *  Create a new dataref by copying the specified data
      */
     static SkData* NewWithCopy(const void* data, size_t length);
 
+    /**
+     *  Create a new data with uninitialized contents. The caller should call writable_data()
+     *  to write into the buffer, but this must be done before another ref() is made.
+     */
+    static SkData* NewUninitialized(size_t length);
+
     /**
      *  Create a new dataref by copying the specified c-string
      *  (a null-terminated array of bytes). The returned SkData will have size()
@@ -78,11 +94,18 @@ public:
     static SkData* NewWithCString(const char cstr[]);
 
     /**
-     *  Create a new dataref, taking the data ptr as is, and using the
+     *  Create a new dataref, taking the ptr as is, and using the
      *  releaseproc to free it. The proc may be NULL.
      */
-    static SkData* NewWithProc(const void* data, size_t length,
-                               ReleaseProc proc, void* context);
+    static SkData* NewWithProc(const void* ptr, size_t length, ReleaseProc proc, void* context);
+
+    /**
+     *  Call this when the data parameter is already const and will outlive the lifetime of the
+     *  SkData. Suitable for with const globals.
+     */
+    static SkData* NewWithoutCopy(const void* data, size_t length) {
+        return NewWithProc(data, length, DummyReleaseProc, NULL);
+    }
 
     /**
      *  Create a new dataref from a pointer allocated by malloc. The Data object
@@ -97,13 +120,13 @@ public:
     static SkData* NewFromFileName(const char path[]);
 
     /**
-     *  Create a new dataref from a SkFILE.
-     *  This does not take ownership of the SkFILE, nor close it.
-     *  The caller is free to close the SkFILE at its convenience.
-     *  The SkFILE must be open for reading only.
+     *  Create a new dataref from a stdio FILE.
+     *  This does not take ownership of the FILE, nor close it.
+     *  The caller is free to close the FILE at its convenience.
+     *  The FILE must be open for reading only.
      *  Returns NULL on failure.
      */
-    static SkData* NewFromFILE(SkFILE* f);
+    static SkData* NewFromFILE(FILE* f);
 
     /**
      *  Create a new dataref from a file descriptor.
@@ -114,6 +137,13 @@ public:
      */
     static SkData* NewFromFD(int fd);
 
+    /**
+     *  Attempt to read size bytes into a SkData. If the read succeeds, return the data,
+     *  else return NULL. Either way the stream's cursor may have been changed as a result
+     *  of calling read().
+     */
+    static SkData* NewFromStream(SkStream*, size_t size);
+
     /**
      *  Create a new dataref using a subset of the data in the specified
      *  src dataref.
@@ -129,16 +159,29 @@ public:
 private:
     ReleaseProc fReleaseProc;
     void*       fReleaseProcContext;
-
-    const void* fPtr;
+    void*       fPtr;
     size_t      fSize;
 
     SkData(const void* ptr, size_t size, ReleaseProc, void* context);
+    explicit SkData(size_t size);   // inplace new/delete
     virtual ~SkData();
 
+
+    // Objects of this type are sometimes created in a custom fashion using sk_malloc_throw and
+    // therefore must be sk_freed. We overload new to also call sk_malloc_throw so that memory
+    // can be unconditionally released using sk_free in an overloaded delete. Overloading regular
+    // new means we must also overload placement new.
+    void* operator new(size_t size) { return sk_malloc_throw(size); }
+    void* operator new(size_t, void* p) { return p; }
+    void operator delete(void* p) { sk_free(p); }
+
     // Called the first time someone calls NewEmpty to initialize the singleton.
-    static SkData* NewEmptyImpl();
-    static void DeleteEmpty(SkData*);
+    friend SkData* sk_new_empty_data();
+
+    // shared internal factory
+    static SkData* PrivateNewWithCopy(const void* srcOrNull, size_t length);
+
+    static void DummyReleaseProc(const void*, void*) {}
 
     typedef SkRefCnt INHERITED;
 };
diff --git a/gfx/skia/skia/include/core/SkDataTable.h b/gfx/skia/skia/include/core/SkDataTable.h
index 9440000e00b4..798ca9c0c4ac 100644
--- a/gfx/skia/skia/include/core/SkDataTable.h
+++ b/gfx/skia/skia/include/core/SkDataTable.h
@@ -20,8 +20,6 @@
  */
 class SK_API SkDataTable : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkDataTable)
-
     /**
      *  Returns true if the table is empty (i.e. has no entries).
      */
diff --git a/gfx/skia/skia/include/core/SkDevice.h b/gfx/skia/skia/include/core/SkDevice.h
index 4a9edee0ec45..c52c579424a2 100644
--- a/gfx/skia/skia/include/core/SkDevice.h
+++ b/gfx/skia/skia/include/core/SkDevice.h
@@ -9,47 +9,31 @@
 #define SkDevice_DEFINED
 
 #include "SkRefCnt.h"
-#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
-#include "SkDeviceProperties.h"
 #include "SkImageFilter.h"
+#include "SkSurfaceProps.h"
 
+class SkBitmap;
 class SkClipStack;
 class SkDraw;
+class SkDrawFilter;
 struct SkIRect;
 class SkMatrix;
 class SkMetaData;
 class SkRegion;
-
 class GrRenderTarget;
 
 class SK_API SkBaseDevice : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkBaseDevice)
-
     /**
      *  Construct a new device.
     */
-    SkBaseDevice();
-
-    /**
-     *  Construct a new device.
-    */
-    SkBaseDevice(const SkDeviceProperties& deviceProperties);
-
+    explicit SkBaseDevice(const SkSurfaceProps&);
     virtual ~SkBaseDevice();
 
-    SkBaseDevice* createCompatibleDevice(const SkImageInfo&);
-
     SkMetaData& getMetaData();
 
-    /** Return the image properties of the device. */
-    virtual const SkDeviceProperties& getDeviceProperties() const {
-        //Currently, all the properties are leaky.
-        return fLeakyProperties;
-    }
-
     /**
      *  Return ImageInfo for this device. If the canvas is not backed by pixels
      *  (cpu or gpu), then the info's ColorType will be kUnknown_SkColorType.
@@ -67,6 +51,12 @@ public:
         bounds->setXYWH(origin.x(), origin.y(), this->width(), this->height());
     }
 
+    SkIRect getGlobalBounds() const {
+        SkIRect bounds;
+        this->getGlobalBounds(&bounds);
+        return bounds;
+    }
+
     int width() const {
         return this->imageInfo().width();
     }
@@ -89,7 +79,22 @@ public:
 
     bool writePixels(const SkImageInfo&, const void*, size_t rowBytes, int x, int y);
 
-    void* accessPixels(SkImageInfo* info, size_t* rowBytes);
+    /**
+     *  Try to get write-access to the pixels behind the device. If successful, this returns true
+     *  and fills-out the pixmap parameter. On success it also bumps the genID of the underlying
+     *  bitmap.
+     *
+     *  On failure, returns false and ignores the pixmap parameter.
+     */
+    bool accessPixels(SkPixmap* pmap);
+
+    /**
+     *  Try to get read-only-access to the pixels behind the device. If successful, this returns
+     *  true and fills-out the pixmap parameter.
+     *
+     *  On failure, returns false and ignores the pixmap parameter.
+     */
+    bool peekPixels(SkPixmap*);
 
     /**
      * Return the device's associated gpu render target, or NULL.
@@ -111,7 +116,6 @@ public:
      */
     virtual void onAttachToCanvas(SkCanvas*) {
         SkASSERT(!fAttachedToCanvas);
-        this->lockPixels();
 #ifdef SK_DEBUG
         fAttachedToCanvas = true;
 #endif
@@ -125,30 +129,28 @@ public:
      */
     virtual void onDetachFromCanvas() {
         SkASSERT(fAttachedToCanvas);
-        this->unlockPixels();
 #ifdef SK_DEBUG
         fAttachedToCanvas = false;
 #endif
     };
 
 protected:
-    enum Usage {
-       kGeneral_Usage,
-       kSaveLayer_Usage  // <! internal use only
+    enum TileUsage {
+        kPossible_TileUsage,    //!< the created device may be drawn tiled
+        kNever_TileUsage,       //!< the created device will never be drawn tiled
     };
 
     struct TextFlags {
-        uint32_t            fFlags;     // SkPaint::getFlags()
-        SkPaint::Hinting    fHinting;
+        uint32_t    fFlags;     // SkPaint::getFlags()
     };
 
     /**
-     *  Device may filter the text flags for drawing text here. If it wants to
-     *  make a change to the specified values, it should write them into the
-     *  textflags parameter (output) and return true. If the paint is fine as
-     *  is, then ignore the textflags parameter and return false.
+     * Returns the text-related flags, possibly modified based on the state of the
+     * device (e.g. support for LCD).
      */
-    virtual bool filterTextFlags(const SkPaint& paint, TextFlags*) { return false; }
+    uint32_t filterTextFlags(const SkPaint&) const;
+
+    virtual bool onShouldDisableLCD(const SkPaint&) const { return false; }
 
     /**
      *
@@ -169,14 +171,6 @@ protected:
      virtual void setMatrixClip(const SkMatrix&, const SkRegion&,
                                 const SkClipStack&) {};
 
-    /** Clears the entire device to the specified color (including alpha).
-     *  Ignores the clip.
-     */
-    virtual void clear(SkColor color) = 0;
-
-    SK_ATTR_DEPRECATED("use clear() instead")
-    void eraseColor(SkColor eraseColor) { this->clear(eraseColor); }
-
     /** These are called inside the per-device-layer loop for each draw call.
      When these are called, we have already applied any saveLayer operations,
      and are handling any looping from the paint, and any effects from the
@@ -223,7 +217,15 @@ protected:
     virtual void drawBitmapRect(const SkDraw&, const SkBitmap&,
                                 const SkRect* srcOrNull, const SkRect& dst,
                                 const SkPaint& paint,
-                                SkCanvas::DrawBitmapRectFlags flags) = 0;
+                                SkCanvas::SrcRectConstraint) = 0;
+    virtual void drawBitmapNine(const SkDraw&, const SkBitmap&, const SkIRect& center,
+                               const SkRect& dst, const SkPaint&);
+
+    virtual void drawImage(const SkDraw&, const SkImage*, SkScalar x, SkScalar y, const SkPaint&);
+    virtual void drawImageRect(const SkDraw&, const SkImage*, const SkRect* src, const SkRect& dst,
+                               const SkPaint&, SkCanvas::SrcRectConstraint);
+    virtual void drawImageNine(const SkDraw&, const SkImage*, const SkIRect& center,
+                               const SkRect& dst, const SkPaint&);
 
     /**
      *  Does not handle text decoration.
@@ -232,22 +234,33 @@ protected:
     virtual void drawText(const SkDraw&, const void* text, size_t len,
                           SkScalar x, SkScalar y, const SkPaint& paint) = 0;
     virtual void drawPosText(const SkDraw&, const void* text, size_t len,
-                             const SkScalar pos[], SkScalar constY,
-                             int scalarsPerPos, const SkPaint& paint) = 0;
-    virtual void drawTextOnPath(const SkDraw&, const void* text, size_t len,
-                                const SkPath& path, const SkMatrix* matrix,
-                                const SkPaint& paint) = 0;
+                             const SkScalar pos[], int scalarsPerPos,
+                             const SkPoint& offset, const SkPaint& paint) = 0;
     virtual void drawVertices(const SkDraw&, SkCanvas::VertexMode, int vertexCount,
                               const SkPoint verts[], const SkPoint texs[],
                               const SkColor colors[], SkXfermode* xmode,
                               const uint16_t indices[], int indexCount,
                               const SkPaint& paint) = 0;
+    // default implementation unrolls the blob runs.
+    virtual void drawTextBlob(const SkDraw&, const SkTextBlob*, SkScalar x, SkScalar y,
+                              const SkPaint& paint, SkDrawFilter* drawFilter);
+    // default implementation calls drawVertices
+    virtual void drawPatch(const SkDraw&, const SkPoint cubics[12], const SkColor colors[4],
+                           const SkPoint texCoords[4], SkXfermode* xmode, const SkPaint& paint);
+
+    // default implementation calls drawPath
+    virtual void drawAtlas(const SkDraw&, const SkImage* atlas, const SkRSXform[], const SkRect[],
+                           const SkColor[], int count, SkXfermode::Mode, const SkPaint&);
+
     /** The SkDevice passed will be an SkDevice which was returned by a call to
-        onCreateDevice on this device with kSaveLayer_Usage.
+        onCreateDevice on this device with kNeverTile_TileExpectation.
      */
     virtual void drawDevice(const SkDraw&, SkBaseDevice*, int x, int y,
                             const SkPaint&) = 0;
 
+    virtual void drawTextOnPath(const SkDraw&, const void* text, size_t len, const SkPath&,
+                                const SkMatrix*, const SkPaint&);
+
     bool readPixels(const SkImageInfo&, void* dst, size_t rowBytes, int x, int y);
 
     ///////////////////////////////////////////////////////////////////////////
@@ -258,20 +271,6 @@ protected:
     */
     virtual const SkBitmap& onAccessBitmap() = 0;
 
-    /** Called when this device is installed into a Canvas. Balanced by a call
-        to unlockPixels() when the device is removed from a Canvas.
-    */
-    virtual void lockPixels() {}
-    virtual void unlockPixels() {}
-
-    /**
-     *  Returns true if the device allows processing of this imagefilter. If
-     *  false is returned, then the filter is ignored. This may happen for
-     *  some subclasses that do not support pixel manipulations after drawing
-     *  has occurred (e.g. printing). The default implementation returns true.
-     */
-    virtual bool allowImageFilter(const SkImageFilter*) { return true; }
-
     /**
      *  Override and return true for filters that the device can handle
      *  intrinsically. Doing so means that SkCanvas will pass-through this
@@ -289,17 +288,14 @@ protected:
      *  it just returns false and leaves result and offset unchanged.
      */
     virtual bool filterImage(const SkImageFilter*, const SkBitmap&,
-                             const SkImageFilter::Context& ctx,
-                             SkBitmap* result, SkIPoint* offset) {
+                             const SkImageFilter::Context&,
+                             SkBitmap* /*result*/, SkIPoint* /*offset*/) {
         return false;
     }
 
 protected:
-    // default impl returns NULL
-    virtual SkSurface* newSurface(const SkImageInfo&);
-
-    // default impl returns NULL
-    virtual const void* peekPixels(SkImageInfo*, size_t* rowBytes);
+    virtual SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&) { return NULL; }
+    virtual bool onPeekPixels(SkPixmap*) { return false; }
 
     /**
      *  The caller is responsible for "pre-clipping" the dst. The impl can assume that the dst
@@ -317,24 +313,11 @@ protected:
      */
     virtual bool onWritePixels(const SkImageInfo&, const void*, size_t, int x, int y);
 
-    /**
-     *  Default impl returns NULL.
-     */
-    virtual void* onAccessPixels(SkImageInfo* info, size_t* rowBytes);
+    virtual bool onAccessPixels(SkPixmap*) { return false; }
 
-    /**
-     *  Leaky properties are those which the device should be applying but it isn't.
-     *  These properties will be applied by the draw, when and as it can.
-     *  If the device does handle a property, that property should be set to the identity value
-     *  for that property, effectively making it non-leaky.
-     */
-    SkDeviceProperties fLeakyProperties;
-
-    /**
-     *  PRIVATE / EXPERIMENTAL -- do not call
-     *  Construct an acceleration object and attach it to 'picture'
-     */
-    virtual void EXPERIMENTAL_optimize(const SkPicture* picture);
+    const SkSurfaceProps& surfaceProps() const {
+        return fSurfaceProps;
+    }
 
     /**
      *  PRIVATE / EXPERIMENTAL -- do not call
@@ -346,7 +329,42 @@ protected:
      *  to perform some device-specific warm up tasks and then let SkCanvas
      *  perform the main rendering loop (by return false from here).
      */
-    virtual bool EXPERIMENTAL_drawPicture(SkCanvas* canvas, const SkPicture* picture);
+    virtual bool EXPERIMENTAL_drawPicture(SkCanvas*, const SkPicture*, const SkMatrix*,
+                                          const SkPaint*);
+
+    struct CreateInfo {
+        static SkPixelGeometry AdjustGeometry(const SkImageInfo&, TileUsage, SkPixelGeometry);
+
+        // The constructor may change the pixel geometry based on other parameters.
+        CreateInfo(const SkImageInfo& info,
+                   TileUsage tileUsage,
+                   SkPixelGeometry geo,
+                   bool forImageFilter = false)
+            : fInfo(info)
+            , fTileUsage(tileUsage)
+            , fPixelGeometry(AdjustGeometry(info, tileUsage, geo))
+            , fForImageFilter(forImageFilter) {}
+
+        const SkImageInfo       fInfo;
+        const TileUsage         fTileUsage;
+        const SkPixelGeometry   fPixelGeometry;
+        const bool              fForImageFilter;
+    };
+
+    /**
+     *  Create a new device based on CreateInfo. If the paint is not null, then it represents a
+     *  preview of how the new device will be composed with its creator device (this).
+     *
+     *  The subclass may be handed this device in drawDevice(), so it must always return
+     *  a device that it knows how to draw, and that it knows how to identify if it is not of the
+     *  same subclass (since drawDevice is passed a SkBaseDevice*). If the subclass cannot fulfill
+     *  that contract (e.g. PDF cannot support some settings on the paint) it should return NULL,
+     *  and the caller may then decide to explicitly create a bitmapdevice, knowing that later
+     *  it could not call drawDevice with it (but it could call drawSprite or drawBitmap).
+     */
+    virtual SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) {
+        return NULL;
+    }
 
 private:
     friend class SkCanvas;
@@ -354,8 +372,8 @@ private:
     friend class SkDraw;
     friend class SkDrawIter;
     friend class SkDeviceFilteredPaint;
-    friend class SkDeviceImageFilterProxy;
-    friend class SkDeferredDevice;    // for newSurface
+    friend class SkImageFilter::DeviceProxy;
+    friend class SkNoPixelsBitmapDevice;
 
     friend class SkSurface_Raster;
 
@@ -365,21 +383,20 @@ private:
     // TODO: move to SkBitmapDevice
     virtual void replaceBitmapBackendForRasterSurface(const SkBitmap&) {}
 
+    virtual bool forceConservativeRasterClip() const { return false; }
+
     // just called by SkCanvas when built as a layer
     void setOrigin(int x, int y) { fOrigin.set(x, y); }
-    // just called by SkCanvas for saveLayer
-    SkBaseDevice* createCompatibleDeviceForSaveLayer(const SkImageInfo&);
-
-    virtual SkBaseDevice* onCreateDevice(const SkImageInfo&, Usage) {
-        return NULL;
-    }
 
     /** Causes any deferred drawing to the device to be completed.
      */
     virtual void flush() {}
 
+    virtual SkImageFilter::Cache* getImageFilterCache() { return NULL; }
+
     SkIPoint    fOrigin;
     SkMetaData* fMetaData;
+    SkSurfaceProps fSurfaceProps;
 
 #ifdef SK_DEBUG
     bool        fAttachedToCanvas;
diff --git a/gfx/skia/skia/include/core/SkDeviceProperties.h b/gfx/skia/skia/include/core/SkDeviceProperties.h
deleted file mode 100644
index 80e0177650ba..000000000000
--- a/gfx/skia/skia/include/core/SkDeviceProperties.h
+++ /dev/null
@@ -1,103 +0,0 @@
-#ifndef SkDeviceProperties_DEFINED
-#define SkDeviceProperties_DEFINED
-
-//TODO: get everyone to stop using SkFontLCDConfig::SetSubpixel* and remove this import.
-#include "SkFontLCDConfig.h"
-
-struct SkDeviceProperties {
-    struct Geometry {
-        /** The orientation of the pixel specifies the interpretation of the
-        *  layout. If the orientation is horizontal, the layout is interpreted as
-        *  left to right. It the orientation is vertical, the layout is
-        *  interpreted top to bottom (rotated 90deg cw from horizontal).
-        */
-        enum Orientation {
-            kUnknown_Orientation      = 0x0,
-            kKnown_Orientation        = 0x2,
-
-            kHorizontal_Orientation   = 0x2,  //!< this is the default
-            kVertical_Orientation     = 0x3,
-
-            kOrientationMask          = 0x3,
-        };
-
-        /** The layout of the pixel specifies its subpixel geometry.
-        *
-        *  kUnknown_Layout means that the subpixel elements are not spatially
-        *  separated in any known or usable fashion.
-        */
-        enum Layout {
-            kUnknown_Layout   = 0x0,
-            kKnown_Layout     = 0x8,
-
-            kRGB_Layout       = 0x8,  //!< this is the default
-            kBGR_Layout       = 0xC,
-
-            kLayoutMask       = 0xC,
-        };
-
-        Orientation getOrientation() {
-            return static_cast<Orientation>(fGeometry & kOrientationMask);
-        }
-        Layout getLayout() {
-            return static_cast<Layout>(fGeometry & kLayoutMask);
-        }
-
-        bool isOrientationKnown() {
-            return SkToBool(fGeometry & kKnown_Orientation);
-        }
-        bool isLayoutKnown() {
-            return SkToBool(fGeometry & kKnown_Layout);
-        }
-
-    private:
-        //TODO: get everyone to stop using SkFontLCDConfig::SetSubpixel* and replace these calls with constants.
-        static Orientation fromOldOrientation(SkFontLCDConfig::LCDOrientation orientation) {
-            switch (orientation) {
-            case SkFontLCDConfig::kHorizontal_LCDOrientation: return kHorizontal_Orientation;
-            case SkFontLCDConfig::kVertical_LCDOrientation: return kVertical_Orientation;
-            default: return kUnknown_Orientation;
-            }
-        }
-        static Layout fromOldLayout(SkFontLCDConfig::LCDOrder order) {
-            switch (order) {
-            case SkFontLCDConfig::kRGB_LCDOrder: return kRGB_Layout;
-            case SkFontLCDConfig::kBGR_LCDOrder: return kBGR_Layout;
-            default: return kUnknown_Layout;
-            }
-        }
-    public:
-        static Geometry MakeDefault() {
-            Orientation orientation = fromOldOrientation(SkFontLCDConfig::GetSubpixelOrientation()); //kHorizontal_Orientation
-            Layout layout = fromOldLayout(SkFontLCDConfig::GetSubpixelOrder()); //kRGB_Layout
-            Geometry ret = { SkToU8(orientation | layout) };
-            return ret;
-        }
-
-        static Geometry Make(Orientation orientation, Layout layout) {
-            Geometry ret = { SkToU8(orientation | layout) };
-            return ret;
-        }
-
-        uint8_t fGeometry;
-    };
-
-    static SkDeviceProperties MakeDefault() {
-        SkDeviceProperties ret = { Geometry::MakeDefault(), SK_GAMMA_EXPONENT };
-        return ret;
-    }
-
-    static SkDeviceProperties Make(Geometry geometry, SkScalar gamma) {
-        SkDeviceProperties ret = { geometry, gamma };
-        return ret;
-    }
-
-    /** Each pixel of an image will have some number of channels.
-     *  Can the layout of those channels be exploited? */
-    Geometry fGeometry;
-
-    /** Represents the color space of the image. This is a woefully inadequate beginning. */
-    SkScalar fGamma;
-};
-
-#endif
diff --git a/gfx/skia/skia/include/core/SkDocument.h b/gfx/skia/skia/include/core/SkDocument.h
index dbf4bc5957e7..316d15a25342 100644
--- a/gfx/skia/skia/include/core/SkDocument.h
+++ b/gfx/skia/skia/include/core/SkDocument.h
@@ -12,6 +12,8 @@
 #include "SkPicture.h"
 #include "SkRect.h"
 #include "SkRefCnt.h"
+#include "SkString.h"
+#include "SkTime.h"
 
 class SkCanvas;
 class SkWStream;
@@ -30,56 +32,50 @@ class SkWStream;
  *      c. doc->endPage();
  *  3. Close the document with doc->close().
  */
-class SkDocument : public SkRefCnt {
+class SK_API SkDocument : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkDocument)
+    /**
+     *  Create a PDF-backed document, writing the results into a SkWStream.
+     *
+     *  PDF pages are sized in point units. 1 pt == 1/72 inch == 127/360 mm.
+     *
+     *  @param SkWStream* A PDF document will be written to this
+     *         stream.  The document may write to the stream at
+     *         anytime during its lifetime, until either close() is
+     *         called or the document is deleted.
+     *  @param dpi The DPI (pixels-per-inch) at which features without
+     *         native PDF support will be rasterized (e.g. draw image
+     *         with perspective, draw text with perspective, ...)  A
+     *         larger DPI would create a PDF that reflects the
+     *         original intent with better fidelity, but it can make
+     *         for larger PDF files too, which would use more memory
+     *         while rendering, and it would be slower to be processed
+     *         or sent online or to printer.
+     *  @returns NULL if there is an error, otherwise a newly created
+     *           PDF-backed SkDocument.
+     */
+    static SkDocument* CreatePDF(SkWStream*,
+                                 SkScalar dpi = SK_ScalarDefaultRasterDPI);
 
     /**
      *  Create a PDF-backed document, writing the results into a file.
-     *  If there is an error trying to create the doc, returns NULL.
-     *  encoder sets the DCTEncoder for images, to encode a bitmap
-     *    as JPEG (DCT).
-     *  rasterDpi - the DPI at which features without native PDF support
-     *              will be rasterized (e.g. draw image with perspective,
-     *              draw text with perspective, ...)
-     *              A larger DPI would create a PDF that reflects the original
-     *              intent with better fidelity, but it can make for larger
-     *              PDF files too, which would use more memory while rendering,
-     *              and it would be slower to be processed or sent online or
-     *              to printer.
      */
-    static SkDocument* CreatePDF(
-            const char filename[],
-            SkPicture::EncodeBitmap encoder = NULL,
-            SkScalar rasterDpi = SK_ScalarDefaultRasterDPI);
+    static SkDocument* CreatePDF(const char outputFilePath[],
+                                 SkScalar dpi = SK_ScalarDefaultRasterDPI);
 
     /**
-     *  Create a PDF-backed document, writing the results into a stream.
-     *  If there is an error trying to create the doc, returns NULL.
-     *
-     *  The document may write to the stream at anytime during its lifetime,
-     *  until either close() is called or the document is deleted. Once close()
-     *  has been called, and all of the data has been written to the stream,
-     *  if there is a Done proc provided, it will be called with the stream.
-     *  The proc can delete the stream, or whatever it needs to do.
-     *  encoder sets the DCTEncoder for images, to encode a bitmap
-     *    as JPEG (DCT).
-     *  Done - clean up method intended to allow deletion of the stream.
-     *         Its aborted parameter is true if the cleanup is due to an abort
-     *         call. It is false otherwise.
-     *  rasterDpi - the DPI at which features without native PDF support
-     *              will be rasterized (e.g. draw image with perspective,
-     *              draw text with perspective, ...)
-     *              A larger DPI would create a PDF that reflects the original
-     *              intent with better fidelity, but it can make for larger
-     *              PDF files too, which would use more memory while rendering,
-     *              and it would be slower to be processed or sent online or
-     *              to printer.     */
-    static SkDocument* CreatePDF(
-            SkWStream*, void (*Done)(SkWStream*,bool aborted) = NULL,
-            SkPicture::EncodeBitmap encoder = NULL,
-            SkScalar rasterDpi = SK_ScalarDefaultRasterDPI);
+     *  Create a XPS-backed document, writing the results into the stream.
+     *  Returns NULL if XPS is not supported.
+     */
+    static SkDocument* CreateXPS(SkWStream* stream,
+                                 SkScalar dpi = SK_ScalarDefaultRasterDPI);
 
+    /**
+     *  Create a XPS-backed document, writing the results into a file.
+     *  Returns NULL if XPS is not supported.
+     */
+    static SkDocument* CreateXPS(const char path[],
+                                 SkScalar dpi = SK_ScalarDefaultRasterDPI);
     /**
      *  Begin a new page for the document, returning the canvas that will draw
      *  into the page. The document owns this canvas, and it will go out of
@@ -110,8 +106,36 @@ public:
      */
     void abort();
 
+    /**
+     *  Set the document's metadata, if supported by the document
+     *  type.  The creationDate and modifiedDate parameters can be
+     *  nullptr.  For example:
+     *
+     *  SkDocument* make_doc(SkWStream* output) {
+     *      SkTArray<SkDocument::Attribute> info;
+     *      info.emplace_back(SkString("Title"), SkString("..."));
+     *      info.emplace_back(SkString("Author"), SkString("..."));
+     *      info.emplace_back(SkString("Subject"), SkString("..."));
+     *      info.emplace_back(SkString("Keywords"), SkString("..."));
+     *      info.emplace_back(SkString("Creator"), SkString("..."));
+     *      SkTime::DateTime now;
+     *      SkTime::GetDateTime(&now);
+     *      SkDocument* doc = SkDocument::CreatePDF(output);
+     *      doc->setMetadata(info, &now, &now);
+     *      return doc;
+     *  }
+     */
+    struct Attribute {
+        SkString fKey, fValue;
+        Attribute(const SkString& k, const SkString& v) : fKey(k), fValue(v) {}
+    };
+    virtual void setMetadata(const SkTArray<SkDocument::Attribute>&,
+                             const SkTime::DateTime* /* creationDate */,
+                             const SkTime::DateTime* /* modifiedDate */) {}
+
 protected:
     SkDocument(SkWStream*, void (*)(SkWStream*, bool aborted));
+
     // note: subclasses must call close() in their destructor, as the base class
     // cannot do this for them.
     virtual ~SkDocument();
@@ -122,6 +146,9 @@ protected:
     virtual bool onClose(SkWStream*) = 0;
     virtual void onAbort() = 0;
 
+    // Allows subclasses to write to the stream as pages are written.
+    SkWStream* getStream() { return fStream; }
+
     enum State {
         kBetweenPages_State,
         kInPage_State,
diff --git a/gfx/skia/skia/include/core/SkDraw.h b/gfx/skia/skia/include/core/SkDraw.h
index 918f2335ea0e..b8cf8027dda5 100644
--- a/gfx/skia/skia/include/core/SkDraw.h
+++ b/gfx/skia/skia/include/core/SkDraw.h
@@ -17,6 +17,7 @@
 class SkBitmap;
 class SkClipStack;
 class SkBaseDevice;
+class SkBlitter;
 class SkMatrix;
 class SkPath;
 class SkRegion;
@@ -33,7 +34,11 @@ public:
     void    drawPaint(const SkPaint&) const;
     void    drawPoints(SkCanvas::PointMode, size_t count, const SkPoint[],
                        const SkPaint&, bool forceUseDevice = false) const;
-    void    drawRect(const SkRect&, const SkPaint&) const;
+    void    drawRect(const SkRect& prePaintRect, const SkPaint&, const SkMatrix* paintMatrix,
+                     const SkRect* postPaintRect) const;
+    void    drawRect(const SkRect& rect, const SkPaint& paint) const {
+        this->drawRect(rect, paint, NULL, NULL);
+    }
     void    drawRRect(const SkRRect&, const SkPaint&) const;
     /**
      *  To save on mallocs, we allow a flag that tells us that srcPath is
@@ -49,19 +54,20 @@ public:
         this->drawPath(path, paint, prePathMatrix, pathIsMutable, false);
     }
 
-    void drawPath(const SkPath& path, const SkPaint& paint) const {
-        this->drawPath(path, paint, NULL, false, false);
+    void drawPath(const SkPath& path, const SkPaint& paint,
+                  SkBlitter* customBlitter = NULL) const {
+        this->drawPath(path, paint, NULL, false, false, customBlitter);
     }
 
-    void    drawBitmap(const SkBitmap&, const SkMatrix&, const SkPaint&) const;
+    /* If dstOrNull is null, computes a dst by mapping the bitmap's bounds through the matrix. */
+    void    drawBitmap(const SkBitmap&, const SkMatrix&, const SkRect* dstOrNull,
+                       const SkPaint&) const;
     void    drawSprite(const SkBitmap&, int x, int y, const SkPaint&) const;
     void    drawText(const char text[], size_t byteLength, SkScalar x,
                      SkScalar y, const SkPaint& paint) const;
     void    drawPosText(const char text[], size_t byteLength,
-                        const SkScalar pos[], SkScalar constY,
-                        int scalarsPerPosition, const SkPaint& paint) const;
-    void    drawTextOnPath(const char text[], size_t byteLength,
-                        const SkPath&, const SkMatrix*, const SkPaint&) const;
+                        const SkScalar pos[], int scalarsPerPosition,
+                        const SkPoint& offset, const SkPaint& paint) const;
     void    drawVertices(SkCanvas::VertexMode mode, int count,
                          const SkPoint vertices[], const SkPoint textures[],
                          const SkColor colors[], SkXfermode* xmode,
@@ -74,8 +80,9 @@ public:
      *
      *  Only device A8 is supported right now.
      */
-    void drawPathCoverage(const SkPath& src, const SkPaint& paint) const {
-        this->drawPath(src, paint, NULL, false, true);
+    void drawPathCoverage(const SkPath& src, const SkPaint& paint,
+                          SkBlitter* customBlitter = NULL) const {
+        this->drawPath(src, paint, NULL, false, true, customBlitter);
     }
 
     /** Helper function that creates a mask from a path and an optional maskfilter.
@@ -110,15 +117,16 @@ public:
     void        drawText_asPaths(const char text[], size_t byteLength,
                                  SkScalar x, SkScalar y, const SkPaint&) const;
     void        drawPosText_asPaths(const char text[], size_t byteLength,
-                                    const SkScalar pos[], SkScalar constY,
-                                    int scalarsPerPosition, const SkPaint&) const;
+                                    const SkScalar pos[], int scalarsPerPosition,
+                                    const SkPoint& offset, const SkPaint&) const;
 
 private:
     void    drawDevMask(const SkMask& mask, const SkPaint&) const;
     void    drawBitmapAsMask(const SkBitmap&, const SkPaint&) const;
 
     void    drawPath(const SkPath&, const SkPaint&, const SkMatrix* preMatrix,
-                     bool pathIsMutable, bool drawCoverage) const;
+                     bool pathIsMutable, bool drawCoverage,
+                     SkBlitter* customBlitter = NULL) const;
 
     /**
      *  Return the current clip bounds, in local coordinates, with slop to account
@@ -132,14 +140,13 @@ private:
     computeConservativeLocalClipBounds(SkRect* bounds) const;
 
 public:
-    const SkBitmap* fBitmap;        // required
+    SkPixmap        fDst;
     const SkMatrix* fMatrix;        // required
     const SkRegion* fClip;          // DEPRECATED
     const SkRasterClip* fRC;        // required
 
     const SkClipStack* fClipStack;  // optional
     SkBaseDevice*   fDevice;        // optional
-    SkDrawProcs*    fProcs;         // optional
 
 #ifdef SK_DEBUG
     void validate() const;
diff --git a/gfx/skia/skia/include/core/SkDrawFilter.h b/gfx/skia/skia/include/core/SkDrawFilter.h
index 52cbba9d20f1..865df5f1e180 100644
--- a/gfx/skia/skia/include/core/SkDrawFilter.h
+++ b/gfx/skia/skia/include/core/SkDrawFilter.h
@@ -23,8 +23,6 @@ class SkPaint;
  */
 class SK_API SkDrawFilter : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkDrawFilter)
-
     enum Type {
         kPaint_Type,
         kPoint_Type,
diff --git a/gfx/skia/skia/include/core/SkDrawLooper.h b/gfx/skia/skia/include/core/SkDrawLooper.h
index b92baccc0838..28d7d8beef27 100644
--- a/gfx/skia/skia/include/core/SkDrawLooper.h
+++ b/gfx/skia/skia/include/core/SkDrawLooper.h
@@ -30,8 +30,6 @@ class SkString;
 */
 class SK_API SkDrawLooper : public SkFlattenable {
 public:
-    SK_DECLARE_INST_COUNT(SkDrawLooper)
-
     /**
      *  Holds state during a draw. Users call next() until it returns false.
      *
@@ -87,9 +85,8 @@ public:
      * storage rect, where the storage rect is with the union of the src rect
      * and the looper's bounding rect.
      */
-    virtual bool canComputeFastBounds(const SkPaint& paint) const;
-    virtual void computeFastBounds(const SkPaint& paint,
-                                   const SkRect& src, SkRect* dst) const;
+    bool canComputeFastBounds(const SkPaint& paint) const;
+    void computeFastBounds(const SkPaint& paint, const SkRect& src, SkRect* dst) const;
 
     struct BlurShadowRec {
         SkScalar        fSigma;
@@ -114,7 +111,6 @@ public:
 
 protected:
     SkDrawLooper() {}
-    SkDrawLooper(SkReadBuffer& buffer) : INHERITED(buffer) {}
 
 private:
     typedef SkFlattenable INHERITED;
diff --git a/gfx/skia/skia/include/core/SkDrawPictureCallback.h b/gfx/skia/skia/include/core/SkDrawPictureCallback.h
deleted file mode 100644
index e86a227e6265..000000000000
--- a/gfx/skia/skia/include/core/SkDrawPictureCallback.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkDrawPictureCallback_DEFINED
-#define SkDrawPictureCallback_DEFINED
-
-/**
- *  Subclasses of this can be passed to canvas.drawPicture(). During the drawing
- *  of the picture, this callback will periodically be invoked. If its
- *  abortDrawing() returns true, then picture playback will be interrupted.
- *
- *  The resulting drawing is undefined, as there is no guarantee how often the
- *  callback will be invoked. If the abort happens inside some level of nested
- *  calls to save(), restore will automatically be called to return the state
- *  to the same level it was before the drawPicture call was made.
- */
-class SK_API SkDrawPictureCallback {
-public:
-    SkDrawPictureCallback() {}
-    virtual ~SkDrawPictureCallback() {}
-
-    virtual bool abortDrawing() = 0;
-};
-
-#endif//SkDrawPictureCallback_DEFINED
diff --git a/gfx/skia/skia/include/core/SkDrawable.h b/gfx/skia/skia/include/core/SkDrawable.h
new file mode 100644
index 000000000000..2f0a62d8b5eb
--- /dev/null
+++ b/gfx/skia/skia/include/core/SkDrawable.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkDrawable_DEFINED
+#define SkDrawable_DEFINED
+
+#include "SkRefCnt.h"
+
+class SkCanvas;
+class SkPicture;
+struct SkRect;
+
+/**
+ *  Base-class for objects that draw into SkCanvas.
+ *
+ *  The object has a generation ID, which is guaranteed to be unique across all drawables. To
+ *  allow for clients of the drawable that may want to cache the results, the drawable must
+ *  change its generation ID whenever its internal state changes such that it will draw differently.
+ */
+class SkDrawable : public SkRefCnt {
+public:
+    SkDrawable();
+
+    /**
+     *  Draws into the specified content. The drawing sequence will be balanced upon return
+     *  (i.e. the saveLevel() on the canvas will match what it was when draw() was called,
+     *  and the current matrix and clip settings will not be changed.
+     */
+    void draw(SkCanvas*, const SkMatrix* = NULL);
+    void draw(SkCanvas*, SkScalar x, SkScalar y);
+
+    SkPicture* newPictureSnapshot();
+
+    /**
+     *  Return a unique value for this instance. If two calls to this return the same value,
+     *  it is presumed that calling the draw() method will render the same thing as well.
+     *
+     *  Subclasses that change their state should call notifyDrawingChanged() to ensure that
+     *  a new value will be returned the next time it is called.
+     */
+    uint32_t getGenerationID();
+
+    /**
+     *  Return the (conservative) bounds of what the drawable will draw. If the drawable can
+     *  change what it draws (e.g. animation or in response to some external change), then this
+     *  must return a bounds that is always valid for all possible states.
+     */
+    SkRect getBounds();
+
+    /**
+     *  Calling this invalidates the previous generation ID, and causes a new one to be computed
+     *  the next time getGenerationID() is called. Typically this is called by the object itself,
+     *  in response to its internal state changing.
+     */
+    void notifyDrawingChanged();
+
+protected:
+    virtual SkRect onGetBounds() = 0;
+    virtual void onDraw(SkCanvas*) = 0;
+    
+    /**
+     *  Default implementation calls onDraw() with a canvas that records into a picture. Subclasses
+     *  may override if they have a more efficient way to return a picture for the current state
+     *  of their drawable. Note: this picture must draw the same as what would be drawn from
+     *  onDraw().
+     */
+    virtual SkPicture* onNewPictureSnapshot();
+
+private:
+    int32_t fGenerationID;
+};
+
+#endif
diff --git a/gfx/skia/skia/include/core/SkDynamicAnnotations.h b/gfx/skia/skia/include/core/SkDynamicAnnotations.h
deleted file mode 100644
index 422d98db43d2..000000000000
--- a/gfx/skia/skia/include/core/SkDynamicAnnotations.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkDynamicAnnotations_DEFINED
-#define SkDynamicAnnotations_DEFINED
-
-// This file contains macros used to send out-of-band signals to dynamic instrumentation systems,
-// namely thread sanitizer.  This is a cut-down version of the full dynamic_annotations library with
-// only the features used by Skia.
-
-#if SK_DYNAMIC_ANNOTATIONS_ENABLED
-
-extern "C" {
-// TSAN provides these hooks.
-void AnnotateIgnoreReadsBegin(const char* file, int line);
-void AnnotateIgnoreReadsEnd(const char* file, int line);
-void AnnotateIgnoreWritesBegin(const char* file, int line);
-void AnnotateIgnoreWritesEnd(const char* file, int line);
-void AnnotateBenignRaceSized(const char* file, int line,
-                             const volatile void* addr, long size, const char* desc);
-}  // extern "C"
-
-// SK_ANNOTATE_UNPROTECTED_READ can wrap any variable read to tell TSAN to ignore that it appears to
-// be a racy read.  This should be used only when we can make an external guarantee that though this
-// particular read is racy, it is being used as part of a mechanism which is thread safe.  Examples:
-//   - the first check in double-checked locking;
-//   - checking if a ref count is equal to 1.
-// Note that in both these cases, we must still add terrifyingly subtle memory barriers to provide
-// that overall thread safety guarantee.  Using this macro to shut TSAN up without providing such an
-// external guarantee is pretty much never correct.
-template <typename T>
-inline T SK_ANNOTATE_UNPROTECTED_READ(const volatile T& x) {
-    AnnotateIgnoreReadsBegin(__FILE__, __LINE__);
-    T read = x;
-    AnnotateIgnoreReadsEnd(__FILE__, __LINE__);
-    return read;
-}
-
-// Like SK_ANNOTATE_UNPROTECTED_READ, but for writes.
-template <typename T>
-inline void SK_ANNOTATE_UNPROTECTED_WRITE(T* ptr, const volatile T& val) {
-    AnnotateIgnoreWritesBegin(__FILE__, __LINE__);
-    *ptr = val;
-    AnnotateIgnoreWritesEnd(__FILE__, __LINE__);
-}
-
-// Ignore racy reads and racy writes to this pointer, indefinitely.
-// If at all possible, use the more precise SK_ANNOTATE_UNPROTECTED_READ.
-template <typename T>
-void SK_ANNOTATE_BENIGN_RACE(T* ptr) {
-    AnnotateBenignRaceSized(__FILE__, __LINE__, ptr, sizeof(*ptr), "SK_ANNOTATE_BENIGN_RACE");
-}
-
-#else  // !SK_DYNAMIC_ANNOTATIONS_ENABLED
-
-#define SK_ANNOTATE_UNPROTECTED_READ(x) (x)
-#define SK_ANNOTATE_UNPROTECTED_WRITE(ptr, val) *(ptr) = (val)
-#define SK_ANNOTATE_BENIGN_RACE(ptr)
-
-#endif
-
-// Can be used to wrap values that are intentionally racy, usually small mutable cached values, e.g.
-//   - SkMatrix type mask
-//   - SkPixelRef genIDs
-template <typename T>
-class SkTRacy {
-public:
-    operator const T() const {
-        return SK_ANNOTATE_UNPROTECTED_READ(fVal);
-    }
-
-    SkTRacy& operator=(const T& val) {
-        SK_ANNOTATE_UNPROTECTED_WRITE(&fVal, val);
-        return *this;
-    }
-
-private:
-    T fVal;
-};
-
-// This is like SkTRacy, but allows you to return the value by reference.
-// TSAN is better at suppressing SkTRacy than SkTRacyReffable, so use SkTRacy when possible.
-//
-// We use this for SkPathRef bounds, which is an SkRect we pass around by reference publically.
-template <typename T>
-class SkTRacyReffable {
-public:
-    SkTRacyReffable() { SK_ANNOTATE_BENIGN_RACE(&fVal); }
-
-    operator const T&() const {
-        return fVal;
-    }
-
-    SkTRacyReffable& operator=(const T& val) {
-        fVal = val;
-        return *this;
-    }
-
-    const T* get() const { return &fVal; }
-          T* get()       { return &fVal; }
-
-    const T* operator->() const { return &fVal; }
-          T* operator->()       { return &fVal; }
-
-private:
-    T fVal;
-};
-
-#endif//SkDynamicAnnotations_DEFINED
diff --git a/gfx/skia/skia/include/core/SkFilterQuality.h b/gfx/skia/skia/include/core/SkFilterQuality.h
new file mode 100644
index 000000000000..db0597e697dd
--- /dev/null
+++ b/gfx/skia/skia/include/core/SkFilterQuality.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkFilterQuality_DEFINED
+#define SkFilterQuality_DEFINED
+
+#include "SkTypes.h"
+
+/**
+ *  Controls how much filtering to be done when scaling/transforming complex colors
+ *  e.g. images
+ */
+enum SkFilterQuality {
+    kNone_SkFilterQuality,      //!< fastest but lowest quality, typically nearest-neighbor
+    kLow_SkFilterQuality,       //!< typically bilerp
+    kMedium_SkFilterQuality,    //!< typically bilerp + mipmaps for down-scaling
+    kHigh_SkFilterQuality       //!< slowest but highest quality, typically bicubic or better
+};
+
+#endif
diff --git a/gfx/skia/skia/include/core/SkFixed.h b/gfx/skia/skia/include/core/SkFixed.h
index 6f168c8edd9e..fefa718d0fe7 100644
--- a/gfx/skia/skia/include/core/SkFixed.h
+++ b/gfx/skia/skia/include/core/SkFixed.h
@@ -28,7 +28,7 @@ typedef int32_t             SkFixed;
 #define SK_FixedTanPIOver8  (0x6A0A)
 #define SK_FixedRoot2Over2  (0xB505)
 
-#define SkFixedToFloat(x)   ((x) * 1.5258789e-5f)
+#define SkFixedToFloat(x)   ((x) * 1.52587890625e-5f)
 #if 1
     #define SkFloatToFixed(x)   ((SkFixed)((x) * SK_Fixed1))
 #else
@@ -50,7 +50,7 @@ typedef int32_t             SkFixed;
     #define SkFloatToFixed_Check(x) SkFloatToFixed(x)
 #endif
 
-#define SkFixedToDouble(x)  ((x) * 1.5258789e-5)
+#define SkFixedToDouble(x)  ((x) * 1.52587890625e-5)
 #define SkDoubleToFixed(x)  ((SkFixed)((x) * SK_Fixed1))
 
 /** Converts an integer to a SkFixed, asserting that the result does not overflow
@@ -60,11 +60,15 @@ typedef int32_t             SkFixed;
     inline SkFixed SkIntToFixed(int n)
     {
         SkASSERT(n >= -32768 && n <= 32767);
-        return n << 16;
+        // Left shifting a negative value has undefined behavior in C, so we cast to unsigned before
+        // shifting.
+        return (unsigned)n << 16;
     }
 #else
-    //  force the cast to SkFixed to ensure that the answer is signed (like the debug version)
-    #define SkIntToFixed(n)     (SkFixed)((n) << 16)
+    // Left shifting a negative value has undefined behavior in C, so we cast to unsigned before
+    // shifting. Then we force the cast to SkFixed to ensure that the answer is signed (like the
+    // debug version).
+    #define SkIntToFixed(n)     (SkFixed)((unsigned)(n) << 16)
 #endif
 
 #define SkFixedRoundToInt(x)    (((x) + SK_FixedHalf) >> 16)
@@ -78,32 +82,23 @@ typedef int32_t             SkFixed;
 #define SkFixedAbs(x)       SkAbs32(x)
 #define SkFixedAve(a, b)    (((a) + (b)) >> 1)
 
-SkFixed SkFixedMul_portable(SkFixed, SkFixed);
-
-#define SkFixedDiv(numer, denom)    SkDivBits(numer, denom, 16)
-
-///////////////////////////////////////////////////////////////////////////////
-// TODO: move fixed sin/cos into SkCosineMapper, as that is the only caller
-//       or rewrite SkCosineMapper to not use it at all
-
-SkFixed SkFixedSinCos(SkFixed radians, SkFixed* cosValueOrNull);
-#define SkFixedSin(radians)         SkFixedSinCos(radians, NULL)
-static inline SkFixed SkFixedCos(SkFixed radians) {
-    SkFixed cosValue;
-    (void)SkFixedSinCos(radians, &cosValue);
-    return cosValue;
-}
+// Blink layout tests are baselined to Clang optimizing through undefined behavior in SkDivBits.
+#if defined(SK_SUPPORT_LEGACY_DIVBITS_UB)
+    #define SkFixedDiv(numer, denom) SkDivBits(numer, denom, 16)
+#else
+    // TODO(reed): this clamp shouldn't be needed.  Use SkToS32().
+    #define SkFixedDiv(numer, denom) \
+        SkTPin<int32_t>(((int64_t)numer << 16) / denom, SK_MinS32, SK_MaxS32)
+#endif
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 // Now look for ASM overrides for our portable versions (should consider putting this in its own file)
 
-#ifdef SkLONGLONG
-    inline SkFixed SkFixedMul_longlong(SkFixed a, SkFixed b)
-    {
-        return (SkFixed)((int64_t)a * b >> 16);
-    }
-    #define SkFixedMul(a,b)     SkFixedMul_longlong(a,b)
-#endif
+inline SkFixed SkFixedMul_longlong(SkFixed a, SkFixed b) {
+    return (SkFixed)((int64_t)a * b >> 16);
+}
+#define SkFixedMul(a,b)     SkFixedMul_longlong(a,b)
+
 
 #if defined(SK_CPU_ARM32)
     /* This guy does not handle NaN or other obscurities, but is faster than
@@ -146,20 +141,31 @@ static inline SkFixed SkFixedCos(SkFixed radians) {
     #define SkFloatToFixed(x)  SkFloatToFixed_arm(x)
 #endif
 
-#ifndef SkFixedMul
-    #define SkFixedMul(x, y)    SkFixedMul_portable(x, y)
-#endif
+///////////////////////////////////////////////////////////////////////////////
+
+typedef int64_t SkFixed3232;   // 32.32
+
+#define SkIntToFixed3232(x)       ((SkFixed3232)(x) << 32)
+#define SkFixed3232ToInt(x)       ((int)((x) >> 32))
+#define SkFixedToFixed3232(x)     ((SkFixed3232)(x) << 16)
+#define SkFixed3232ToFixed(x)     ((SkFixed)((x) >> 16))
+#define SkFloatToFixed3232(x)     ((SkFixed3232)((x) * (65536.0f * 65536.0f)))
+
+#define SkScalarToFixed3232(x)    SkFloatToFixed3232(x)
 
 ///////////////////////////////////////////////////////////////////////////////
 
-typedef int64_t SkFixed48;
+// 64bits wide, with a 16bit bias. Useful when accumulating lots of 16.16 so
+// we don't overflow along the way
+typedef int64_t Sk48Dot16;
 
-#define SkIntToFixed48(x)       ((SkFixed48)(x) << 48)
-#define SkFixed48ToInt(x)       ((int)((x) >> 48))
-#define SkFixedToFixed48(x)     ((SkFixed48)(x) << 32)
-#define SkFixed48ToFixed(x)     ((SkFixed)((x) >> 32))
-#define SkFloatToFixed48(x)     ((SkFixed48)((x) * (65536.0f * 65536.0f * 65536.0f)))
+#define Sk48Dot16FloorToInt(x)    static_cast<int>((x) >> 16)
 
-#define SkScalarToFixed48(x)    SkFloatToFixed48(x)
+static inline float Sk48Dot16ToScalar(Sk48Dot16 x) {
+    return static_cast<float>(x * 1.5258789e-5);  // x * (1.0f / (1 << 16))
+}
+#define SkFloatTo48Dot16(x)       (static_cast<Sk48Dot16>((x) * (1 << 16)))
+
+#define SkScalarTo48Dot16(x)      SkFloatTo48Dot16(x)
 
 #endif
diff --git a/gfx/skia/skia/include/core/SkFlattenable.h b/gfx/skia/skia/include/core/SkFlattenable.h
index f6d377a9d743..bccabc18fa86 100644
--- a/gfx/skia/skia/include/core/SkFlattenable.h
+++ b/gfx/skia/skia/include/core/SkFlattenable.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkFlattenable_DEFINED
 #define SkFlattenable_DEFINED
 
@@ -15,9 +13,26 @@
 class SkReadBuffer;
 class SkWriteBuffer;
 
-#define SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(flattenable) \
-        SkFlattenable::Registrar(#flattenable, flattenable::CreateProc, \
-                                 flattenable::GetFlattenableType());
+class SkPrivateEffectInitializer;
+
+/*
+ *  Flattening is straight-forward:
+ *      1. call getFactory() so we have a function-ptr to recreate the subclass
+ *      2. call flatten(buffer) to write out enough data for the factory to read
+ *
+ *  Unflattening is easy for the caller: new_instance = factory(buffer)
+ *
+ *  The complexity of supporting this is as follows.
+ *
+ *  If your subclass wants to control unflattening, use this macro in your declaration:
+ *      SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS
+ *  This will provide a getFactory(), and require that the subclass implements CreateProc.
+ *
+ *  For older buffers (before the DEEPFLATTENING change, the macros below declare
+ *  a thin factory DeepCreateProc. It checks the version of the buffer, and if it is pre-deep,
+ *  then it calls through to a (usually protected) constructor, passing the buffer.
+ *  If the buffer is newer, then it directly calls the "real" factory: CreateProc.
+ */
 
 #define SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP() static void InitializeFlattenables();
 
@@ -27,14 +42,16 @@ class SkWriteBuffer;
 #define SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END \
     }
 
-#define SK_DECLARE_UNFLATTENABLE_OBJECT() \
-    virtual Factory getFactory() const SK_OVERRIDE { return NULL; }
+#define SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(flattenable) \
+    SkFlattenable::Register(#flattenable, flattenable::CreateProc, \
+                            flattenable::GetFlattenableType());
 
-#define SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(flattenable) \
-    virtual Factory getFactory() const SK_OVERRIDE { return CreateProc; } \
-    static SkFlattenable* CreateProc(SkReadBuffer& buffer) { \
-        return SkNEW_ARGS(flattenable, (buffer)); \
-    }
+#define SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(flattenable)    \
+    private:                                                                \
+    static SkFlattenable* CreateProc(SkReadBuffer&);                        \
+    friend class ::SkPrivateEffectInitializer;                              \
+    public:                                                                 \
+    Factory getFactory() const override { return CreateProc; }
 
 /** For SkFlattenable derived objects with a valid type
     This macro should only be used in base class objects in core
@@ -65,8 +82,6 @@ public:
         kSkXfermode_Type,
     };
 
-    SK_DECLARE_INST_COUNT(SkFlattenable)
-
     typedef SkFlattenable* (*Factory)(SkReadBuffer&);
 
     SkFlattenable() {}
@@ -87,21 +102,11 @@ public:
 
     static void Register(const char name[], Factory, Type);
 
-    class Registrar {
-    public:
-        Registrar(const char name[], Factory factory, Type type) {
-            SkFlattenable::Register(name, factory, type);
-        }
-    };
-
-    /** Override this to write data specific to your subclass into the buffer,
-     being sure to call your super-class' version first. This data will later
-     be passed to your Factory function, returned by getFactory().
+    /**
+     *  Override this if your subclass needs to record data that it will need to recreate itself
+     *  from its CreateProc (returned by getFactory()).
      */
-    virtual void flatten(SkWriteBuffer&) const;
-
-protected:
-    SkFlattenable(SkReadBuffer&) {}
+    virtual void flatten(SkWriteBuffer&) const {}
 
 private:
     static void InitializeFlattenablesIfNeeded();
diff --git a/gfx/skia/skia/include/core/SkFlattenableBuffers.h b/gfx/skia/skia/include/core/SkFlattenableBuffers.h
deleted file mode 100644
index 3e5d5b94ee2c..000000000000
--- a/gfx/skia/skia/include/core/SkFlattenableBuffers.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// Temporary shim to keep a couple dependencies working in Chromium.
-#ifndef SkFlattenableBuffers_DEFINED
-#define SkFlattenableBuffers_DEFINED
-
-#include "SkReadBuffer.h"
-#include "SkWriteBuffer.h"
-
-typedef SkReadBuffer SkFlattenableReadBuffer;
-
-#endif//SkFlattenableBuffers_DEFINED
diff --git a/gfx/skia/skia/include/core/SkFont.h b/gfx/skia/skia/include/core/SkFont.h
index 9bdecd6eb94e..e4ebebb244af 100644
--- a/gfx/skia/skia/include/core/SkFont.h
+++ b/gfx/skia/skia/include/core/SkFont.h
@@ -75,8 +75,8 @@ public:
     enum Flags {
         /**
          *  Use the system's automatic hinting mechanism to hint the typeface.
-         *  If both bytecode and auto hints are specified, attempt to use the bytecodes first.
-         *  If that fails (e.g. there are no codes), then attempt to autohint.
+         *  This is a last resort hinting method applied only if other hinting methods do not apply.
+         *  TODO: where to put auto-normal vs auto-light?
          */
         kEnableAutoHints_Flag       = 1 << 0,
 
@@ -87,6 +87,13 @@ public:
          */
         kEnableByteCodeHints_Flag   = 1 << 1,
 
+        /**
+         *  If the typeface contains explicit bitmaps for hinting, use them.
+         *  If both bytecode and auto hints are also specified, attempt to use the bitmaps first;
+         *  if that fails (e.g. there are no bitmaps), then attempt to bytecode or autohint.
+         */
+        kEmbeddedBitmaps_Flag       = 1 << 2,
+
         /**
          *  Use rounded metric values (e.g. advance).
          *  If either auto or bytecode hinting was used, apply those results to the metrics of the
@@ -96,10 +103,9 @@ public:
          *  This applies to calls that return metrics (e.g. measureText) and to drawing the glyphs
          *  (see SkCanvas drawText and drawPosText).
          */
-        kUseNonlinearMetrics_Flag   = 1 << 2,
+        kUseNonlinearMetrics_Flag   = 1 << 3,
 
-        kVertical_Flag              = 1 << 3,
-        kEmbeddedBitmaps_Flag       = 1 << 4,
+        kVertical_Flag              = 1 << 4,
         kGenA8FromLCD_Flag          = 1 << 5,
         kEmbolden_Flag              = 1 << 6,
         kDevKern_Flag               = 1 << 7,   // ifdef ANDROID ?
diff --git a/gfx/skia/skia/include/core/SkFontHost.h b/gfx/skia/skia/include/core/SkFontHost.h
index 4c5013fe4a04..a2cc04bc7097 100644
--- a/gfx/skia/skia/include/core/SkFontHost.h
+++ b/gfx/skia/skia/include/core/SkFontHost.h
@@ -90,42 +90,6 @@ public:
     static void SetSubpixelOrder(LCDOrder order);
     /** @deprecated get from Device. */
     static LCDOrder GetSubpixelOrder();
-
-private:
-    /** Return a new, closest matching typeface given either an existing family
-        (specified by a typeface in that family) or by a familyName and a
-        requested style.
-        1) If familyFace is null, use familyName.
-        2) If familyName is null, use data (UTF-16 to cover).
-        3) If all are null, return the default font that best matches style
-     */
-    static SkTypeface* CreateTypeface(const SkTypeface* familyFace,
-                                      const char familyName[],
-                                      SkTypeface::Style style);
-
-    /** Return a new typeface given the data buffer. If the data does not
-        represent a valid font, returns null.
-
-        If a typeface instance is returned, the caller is responsible for
-        calling unref() on the typeface when they are finished with it.
-
-        The returned typeface may or may not have called ref() on the stream
-        parameter. If the typeface has not called ref(), then it may have made
-        a copy of the releveant data. In either case, the caller is still
-        responsible for its refcnt ownership of the stream.
-     */
-    static SkTypeface* CreateTypefaceFromStream(SkStream*);
-
-    /** Return a new typeface from the specified file path. If the file does not
-        represent a valid font, this returns null. If a typeface is returned,
-        the caller is responsible for calling unref() when it is no longer used.
-     */
-    static SkTypeface* CreateTypefaceFromFile(const char path[]);
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    friend class SkScalerContext;
-    friend class SkTypeface;
 };
 
 #endif
diff --git a/gfx/skia/skia/include/ports/SkFontStyle.h b/gfx/skia/skia/include/core/SkFontStyle.h
similarity index 93%
rename from gfx/skia/skia/include/ports/SkFontStyle.h
rename to gfx/skia/skia/include/core/SkFontStyle.h
index 9d9a912d7d74..f42d7dd47018 100644
--- a/gfx/skia/skia/include/ports/SkFontStyle.h
+++ b/gfx/skia/skia/include/core/SkFontStyle.h
@@ -43,6 +43,8 @@ public:
 
     SkFontStyle();
     SkFontStyle(int weight, int width, Slant);
+    /** oldStyle means the style-bits in SkTypeface::Style: bold=1, italic=2 */
+    explicit SkFontStyle(unsigned oldStyle);
 
     bool operator==(const SkFontStyle& rhs) const {
         return fUnion.fU32 == rhs.fUnion.fU32;
diff --git a/gfx/skia/skia/include/core/SkGraphics.h b/gfx/skia/skia/include/core/SkGraphics.h
index e7865ca5afb4..5aecc7acd00f 100644
--- a/gfx/skia/skia/include/core/SkGraphics.h
+++ b/gfx/skia/skia/include/core/SkGraphics.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,25 +5,26 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkGraphics_DEFINED
 #define SkGraphics_DEFINED
 
 #include "SkTypes.h"
 
+class SkData;
+class SkImageGenerator;
+class SkTraceMemoryDump;
+
 class SK_API SkGraphics {
 public:
     /**
      *  Call this at process initialization time if your environment does not
-     *  permit static global initializers that execute code. Note that
-     *  Init() is not thread-safe.
+     *  permit static global initializers that execute code.
+     *  Init() is thread-safe and idempotent.
      */
     static void Init();
 
-    /**
-     *  Call this to release any memory held privately, such as the font cache.
-     */
-    static void Term();
+    // We're in the middle of cleaning this up.
+    static void Term() {}
 
     /**
      *  Return the version numbers for the library. If the parameter is not
@@ -80,46 +80,44 @@ public:
     static void PurgeFontCache();
 
     /**
-     *  Scaling bitmaps with the SkPaint::kHigh_FilterLevel setting is
+     *  Scaling bitmaps with the kHigh_SkFilterQuality setting is
      *  expensive, so the result is saved in the global Scaled Image
      *  Cache.
      *
      *  This function returns the memory usage of the Scaled Image Cache.
      */
-    static size_t GetImageCacheTotalBytesUsed();
-    /**
-     *  These functions get/set the memory usage limit for the Scaled
-     *  Image Cache.  Bitmaps are purged from the cache when the
-     *  memory useage exceeds this limit.
-     */
-    static size_t GetImageCacheTotalByteLimit();
-    static size_t SetImageCacheTotalByteLimit(size_t newLimit);
-
-    // DEPRECATED
-    static size_t GetImageCacheBytesUsed() {
-        return GetImageCacheTotalBytesUsed();
-    }
-    // DEPRECATED
-    static size_t GetImageCacheByteLimit() {
-        return GetImageCacheTotalByteLimit();
-    }
-    // DEPRECATED
-    static size_t SetImageCacheByteLimit(size_t newLimit) {
-        return SetImageCacheTotalByteLimit(newLimit);
-    }
+    static size_t GetResourceCacheTotalBytesUsed();
 
     /**
-     *  Scaling bitmaps with the SkPaint::kHigh_FilterLevel setting is
-     *  expensive, so the result is saved in the global Scaled Image
-     *  Cache.  When the resulting bitmap is too large, this can
-     *  overload the cache.  If the ImageCacheSingleAllocationByteLimit
-     *  is set to a non-zero number, and the resulting bitmap would be
-     *  larger than that value, the bitmap scaling algorithm falls
-     *  back onto a cheaper algorithm and does not cache the result.
-     *  Zero is the default value.
+     *  These functions get/set the memory usage limit for the resource cache, used for temporary
+     *  bitmaps and other resources. Entries are purged from the cache when the memory useage
+     *  exceeds this limit.
      */
-    static size_t GetImageCacheSingleAllocationByteLimit();
-    static size_t SetImageCacheSingleAllocationByteLimit(size_t newLimit);
+    static size_t GetResourceCacheTotalByteLimit();
+    static size_t SetResourceCacheTotalByteLimit(size_t newLimit);
+
+    /**
+     *  For debugging purposes, this will attempt to purge the resource cache. It
+     *  does not change the limit.
+     */
+    static void PurgeResourceCache();
+
+    /**
+     *  When the cachable entry is very lage (e.g. a large scaled bitmap), adding it to the cache
+     *  can cause most/all of the existing entries to be purged. To avoid the, the client can set
+     *  a limit for a single allocation. If a cacheable entry would have been cached, but its size
+     *  exceeds this limit, then we do not attempt to cache it at all.
+     *
+     *  Zero is the default value, meaning we always attempt to cache entries.
+     */
+    static size_t GetResourceCacheSingleAllocationByteLimit();
+    static size_t SetResourceCacheSingleAllocationByteLimit(size_t newLimit);
+
+    /**
+     *  Dumps memory usage of caches using the SkTraceMemoryDump interface. See SkTraceMemoryDump
+     *  for usage of this method.
+     */
+    static void DumpMemoryStatistics(SkTraceMemoryDump* dump);
 
     /**
      *  Applications with command line options may pass optional state, such
@@ -151,12 +149,17 @@ public:
      */
     static void SetTLSFontCacheLimit(size_t bytes);
 
-private:
-    /** This is automatically called by SkGraphics::Init(), and must be
-        implemented by the host OS. This allows the host OS to register a callback
-        with the C++ runtime to call SkGraphics::FreeCaches()
-    */
-    static void InstallNewHandler();
+    typedef SkImageGenerator* (*ImageGeneratorFromEncodedFactory)(SkData*);
+
+    /**
+     *  To instantiate images from encoded data, first looks at this runtime function-ptr. If it
+     *  exists, it is called to create an SkImageGenerator from SkData. If there is no function-ptr
+     *  or there is, but it returns NULL, then skia will call its internal default implementation.
+     *
+     *  Returns the previous factory (which could be NULL).
+     */
+    static ImageGeneratorFromEncodedFactory
+           SetImageGeneratorFromEncodedFactory(ImageGeneratorFromEncodedFactory);
 };
 
 class SkAutoGraphics {
@@ -164,9 +167,6 @@ public:
     SkAutoGraphics() {
         SkGraphics::Init();
     }
-    ~SkAutoGraphics() {
-        SkGraphics::Term();
-    }
 };
 
 #endif
diff --git a/gfx/skia/skia/include/core/SkImage.h b/gfx/skia/skia/include/core/SkImage.h
index 04e184370f73..d6b10a8e186b 100644
--- a/gfx/skia/skia/include/core/SkImage.h
+++ b/gfx/skia/skia/include/core/SkImage.h
@@ -8,6 +8,7 @@
 #ifndef SkImage_DEFINED
 #define SkImage_DEFINED
 
+#include "SkFilterQuality.h"
 #include "SkImageInfo.h"
 #include "SkImageEncoder.h"
 #include "SkRefCnt.h"
@@ -16,7 +17,13 @@
 
 class SkData;
 class SkCanvas;
+class SkColorTable;
+class SkImageGenerator;
 class SkPaint;
+class SkPicture;
+class SkPixelSerializer;
+class SkString;
+class SkSurface;
 class GrContext;
 class GrTexture;
 
@@ -29,50 +36,128 @@ class GrTexture;
  *  The content of SkImage is always immutable, though the actual storage may
  *  change, if for example that image can be re-created via encoded data or
  *  other means.
+ *
+ *  SkImage always has a non-zero dimensions. If there is a request to create a new image, either
+ *  directly or via SkSurface, and either of the requested dimensions are zero, then NULL will be
+ *  returned.
  */
 class SK_API SkImage : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkImage)
-
     typedef SkImageInfo Info;
+    typedef void* ReleaseContext;
 
-    static SkImage* NewRasterCopy(const Info&, const void* pixels, size_t rowBytes);
+    static SkImage* NewRasterCopy(const Info&, const void* pixels, size_t rowBytes,
+                                  SkColorTable* ctable = NULL);
     static SkImage* NewRasterData(const Info&, SkData* pixels, size_t rowBytes);
-    static SkImage* NewEncodedData(SkData*);
+
+    typedef void (*RasterReleaseProc)(const void* pixels, ReleaseContext);
 
     /**
-     * GrTexture is a more logical parameter for this factory, but its
-     * interactions with scratch cache still has issues, so for now we take
-     * SkBitmap instead. This will be changed in the future. skbug.com/1449
+     *  Return a new Image referencing the specified pixels. These must remain valid and unchanged
+     *  until the specified release-proc is called, indicating that Skia no longer has a reference
+     *  to the pixels.
+     *
+     *  Returns NULL if the requested Info is unsupported.
      */
-    static SkImage* NewTexture(const SkBitmap&);
+    static SkImage* NewFromRaster(const Info&, const void* pixels, size_t rowBytes,
+                                  RasterReleaseProc, ReleaseContext);
+
+    /**
+     *  Construct a new image from the specified bitmap. If the bitmap is marked immutable, and
+     *  its pixel memory is shareable, it may be shared instead of copied.
+     */
+    static SkImage* NewFromBitmap(const SkBitmap&);
+    
+    /**
+     *  Construct a new SkImage based on the given ImageGenerator.
+     *  This function will always take ownership of the passed
+     *  ImageGenerator.  Returns NULL on error.
+     *
+     *  If a subset is specified, it must be contained within the generator's bounds.
+     */
+    static SkImage* NewFromGenerator(SkImageGenerator*, const SkIRect* subset = NULL);
+
+    /**
+     *  Construct a new SkImage based on the specified encoded data. Returns NULL on failure,
+     *  which can mean that the format of the encoded data was not recognized/supported.
+     *
+     *  If a subset is specified, it must be contained within the encoded data's bounds.
+     *
+     *  Regardless of success or failure, the caller is responsible for managing their ownership
+     *  of the data.
+     */
+    static SkImage* NewFromEncoded(SkData* encoded, const SkIRect* subset = NULL);
+
+    /**
+     *  Create a new image from the specified descriptor. Note - the caller is responsible for
+     *  managing the lifetime of the underlying platform texture.
+     *
+     *  Will return NULL if the specified descriptor is unsupported.
+     */
+    static SkImage* NewFromTexture(GrContext* ctx, const GrBackendTextureDesc& desc) {
+        return NewFromTexture(ctx, desc, kPremul_SkAlphaType, NULL, NULL);
+    }
+
+    static SkImage* NewFromTexture(GrContext* ctx, const GrBackendTextureDesc& de, SkAlphaType at) {
+        return NewFromTexture(ctx, de, at, NULL, NULL);
+    }
+
+    typedef void (*TextureReleaseProc)(ReleaseContext);
+
+    /**
+     *  Create a new image from the specified descriptor. The underlying platform texture must stay
+     *  valid and unaltered until the specified release-proc is invoked, indicating that Skia
+     *  no longer is holding a reference to it.
+     *
+     *  Will return NULL if the specified descriptor is unsupported.
+     */
+    static SkImage* NewFromTexture(GrContext*, const GrBackendTextureDesc&, SkAlphaType,
+                                   TextureReleaseProc, ReleaseContext);
+
+    /**
+     *  Create a new image from the specified descriptor. Note - Skia will delete or recycle the
+     *  texture when the image is released.
+     *
+     *  Will return NULL if the specified descriptor is unsupported.
+     */
+    static SkImage* NewFromAdoptedTexture(GrContext*, const GrBackendTextureDesc&,
+                                          SkAlphaType = kPremul_SkAlphaType);
+
+    /**
+     *  Create a new image by copying the pixels from the specified descriptor. No reference is
+     *  kept to the original platform texture.
+     *
+     *  Will return NULL if the specified descriptor is unsupported.
+     */
+    static SkImage* NewFromTextureCopy(GrContext*, const GrBackendTextureDesc&,
+                                       SkAlphaType = kPremul_SkAlphaType);
+
+    /**
+     *  Create a new image by copying the pixels from the specified y, u, v textures. The data
+     *  from the textures is immediately ingested into the image and the textures can be modified or
+     *  deleted after the function returns. The image will have the dimensions of the y texture.
+     */
+    static SkImage* NewFromYUVTexturesCopy(GrContext*, SkYUVColorSpace,
+                                           const GrBackendObject yuvTextureHandles[3],
+                                           const SkISize yuvSizes[3],
+                                           GrSurfaceOrigin);
+
+    static SkImage* NewFromPicture(const SkPicture*, const SkISize& dimensions,
+                                   const SkMatrix*, const SkPaint*);
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////
 
     int width() const { return fWidth; }
     int height() const { return fHeight; }
+    SkISize dimensions() const { return SkISize::Make(fWidth, fHeight); }
+    SkIRect bounds() const { return SkIRect::MakeWH(fWidth, fHeight); }
     uint32_t uniqueID() const { return fUniqueID; }
-
-    /**
-     * Return the GrTexture that stores the image pixels. Calling getTexture
-     * does not affect the reference count of the GrTexture object.
-     * Will return NULL if the image does not use a texture.
-     */
-    GrTexture* getTexture();
+    virtual bool isOpaque() const { return false; }
 
     virtual SkShader* newShader(SkShader::TileMode,
                                 SkShader::TileMode,
                                 const SkMatrix* localMatrix = NULL) const;
 
-    void draw(SkCanvas*, SkScalar x, SkScalar y, const SkPaint*);
-
-    /**
-     *  Draw the image, cropped to the src rect, to the dst rect of a canvas.
-     *  If src is larger than the bounds of the image, the rest of the image is
-     *  filled with transparent black pixels.
-     *
-     *  See SkCanvas::drawBitmapRectToRect for similar behavior.
-     */
-    void draw(SkCanvas*, const SkRect* src, const SkRect& dst, const SkPaint*);
-
     /**
      *  If the image has direct access to its pixels (i.e. they are in local
      *  RAM) return the (const) address of those pixels, and if not null, return
@@ -84,57 +169,192 @@ public:
      */
     const void* peekPixels(SkImageInfo* info, size_t* rowBytes) const;
 
+    /**
+     *  If the image has direct access to its pixels (i.e. they are in local
+     *  RAM) return the (const) address of those pixels, and if not null, return
+     *  true, and if pixmap is not NULL, set it to point into the image.
+     *
+     *  On failure, return false and ignore the pixmap parameter.
+     */
+    bool peekPixels(SkPixmap* pixmap) const;
+
+    /**
+     *  Some images have to perform preliminary work in preparation for drawing. This can be
+     *  decoding, uploading to a GPU, or other tasks. These happen automatically when an image
+     *  is drawn, and often they are cached so that the cost is only paid the first time.
+     *
+     *  Preroll() can be called before drawing to try to perform this prepatory work ahead of time.
+     *  For images that have no such work, this returns instantly. Others may do some thing to
+     *  prepare their cache and then return.
+     *
+     *  If the image will drawn to a GPU-backed canvas or surface, pass the associated GrContext.
+     *  If the image will be drawn to any other type of canvas or surface, pass null.
+     */
+    void preroll(GrContext* = nullptr) const;
+
+    // DEPRECATED
+    GrTexture* getTexture() const;
+
+    /**
+     *  Returns true if the image is texture backed.
+     */
+    bool isTextureBacked() const;
+
+    /**
+     *  Retrieves the backend API handle of the texture. If flushPendingGrContextIO then the
+     *  GrContext will issue to the backend API any deferred IO operations on the texture before
+     *  returning.
+     */
+    GrBackendObject getTextureHandle(bool flushPendingGrContextIO) const;
+
+    /**
+     *  Hints to image calls where the system might cache computed intermediates (e.g. the results
+     *  of decoding or a read-back from the GPU. Passing kAllow signals that the system's default
+     *  behavior is fine. Passing kDisallow signals that caching should be avoided.
+     */
+     enum CachingHint {
+        kAllow_CachingHint,
+        kDisallow_CachingHint,
+    };
+
+    /**
+     *  Copy the pixels from the image into the specified buffer (pixels + rowBytes),
+     *  converting them into the requested format (dstInfo). The image pixels are read
+     *  starting at the specified (srcX,srcY) location.
+     *
+     *  The specified ImageInfo and (srcX,srcY) offset specifies a source rectangle
+     *
+     *      srcR.setXYWH(srcX, srcY, dstInfo.width(), dstInfo.height());
+     *
+     *  srcR is intersected with the bounds of the image. If this intersection is not empty,
+     *  then we have two sets of pixels (of equal size). Replace the dst pixels with the
+     *  corresponding src pixels, performing any colortype/alphatype transformations needed
+     *  (in the case where the src and dst have different colortypes or alphatypes).
+     *
+     *  This call can fail, returning false, for several reasons:
+     *  - If srcR does not intersect the image bounds.
+     *  - If the requested colortype/alphatype cannot be converted from the image's types.
+     */
+    bool readPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes,
+                    int srcX, int srcY, CachingHint = kAllow_CachingHint) const;
+
+    bool readPixels(const SkPixmap& dst, int srcX, int srcY,
+                    CachingHint = kAllow_CachingHint) const;
+
+    /**
+     *  Copy the pixels from this image into the dst pixmap, converting as needed into dst's
+     *  colortype/alphatype. If the conversion cannot be performed, false is returned.
+     *
+     *  If dst's dimensions differ from the src dimension, the image will be scaled, applying the
+     *  specified filter-quality.
+     */
+    bool scalePixels(const SkPixmap& dst, SkFilterQuality, CachingHint = kAllow_CachingHint) const;
+
     /**
      *  Encode the image's pixels and return the result as a new SkData, which
      *  the caller must manage (i.e. call unref() when they are done).
      *
      *  If the image type cannot be encoded, or the requested encoder type is
      *  not supported, this will return NULL.
+     *
+     *  Note: this will attempt to encode the image's pixels in the specified format,
+     *  even if the image returns a data from refEncoded(). That data will be ignored.
      */
-    SkData* encode(SkImageEncoder::Type t = SkImageEncoder::kPNG_Type,
-                   int quality = 80) const;
+    SkData* encode(SkImageEncoder::Type, int quality) const;
+
+    /**
+     *  Encode the image and return the result as a caller-managed SkData.  This will
+     *  attempt to reuse existing encoded data (as returned by refEncoded).
+     *
+     *  We defer to the SkPixelSerializer both for vetting existing encoded data
+     *  (useEncodedData) and for encoding the image (encodePixels) when no such data is
+     *  present or is rejected by the serializer.
+     *
+     *  If not specified, we use a default serializer which 1) always accepts existing data
+     *  (in any format) and 2) encodes to PNG.
+     *
+     *  If no compatible encoded data exists and encoding fails, this method will also
+     *  fail (return NULL).
+     */
+    SkData* encode(SkPixelSerializer* = nullptr) const;
+
+    /**
+     *  If the image already has its contents in encoded form (e.g. PNG or JPEG), return a ref
+     *  to that data (which the caller must call unref() on). The caller is responsible for calling
+     *  unref on the data when they are done.
+     *
+     *  If the image does not already has its contents in encoded form, return NULL.
+     *
+     *  Note: to force the image to return its contents as encoded data, try calling encode(...).
+     */
+    SkData* refEncoded() const;
+
+    const char* toString(SkString*) const;
+
+    /**
+     *  Return a new image that is a subset of this image. The underlying implementation may
+     *  share the pixels, or it may make a copy.
+     *
+     *  If subset does not intersect the bounds of this image, or the copy/share cannot be made,
+     *  NULL will be returned.
+     */
+    SkImage* newSubset(const SkIRect& subset) const;
+
+    // Helper functions to convert to SkBitmap
+
+    enum LegacyBitmapMode {
+        kRO_LegacyBitmapMode,
+        kRW_LegacyBitmapMode,
+    };
+
+    /**
+     *  Attempt to create a bitmap with the same pixels as the image. The result will always be
+     *  a raster-backed bitmap (texture-backed bitmaps are DEPRECATED, and not supported here).
+     *
+     *  If the mode is kRO (read-only), the resulting bitmap will be marked as immutable.
+     *
+     *  On succcess, returns true. On failure, returns false and the bitmap parameter will be reset
+     *  to empty.
+     */
+    bool asLegacyBitmap(SkBitmap*, LegacyBitmapMode) const;
+    
+    /**
+     *  Returns true if the image is backed by an image-generator or other src that creates
+     *  (and caches) its pixels / texture on-demand.
+     */
+    bool isLazyGenerated() const;
+
+    /**
+     *  Apply the specified filter to this image, and return the result as a new image.
+     *
+     *  if forceResultToOriginalSize is true, then the resulting image will be the same size as the
+     *  src, regardless of the normal output of the filter.
+     *
+     *  If offset is non-null, it is set to the relative offset needed to draw the resulting image
+     *  in the same logical place as the original.
+     *
+     *  e.g.
+     *      If the filter makes the result larger by a margin of 4 the output would be:
+     *          result->width()  == this->width + 8
+     *          result->height() == this->height + 8
+     *          offset.x()       == -4
+     *          offset.y()       == -4
+     *
+     *  If the filter fails to create a resulting image, null is returned, and the offset parameter
+     *  (if specified) will be undefined.
+     */
+    SkImage* applyFilter(SkImageFilter* filter, SkIPoint* offset,
+                         bool forceResultToOriginalSize) const;
 
 protected:
-    SkImage(int width, int height) :
-        fWidth(width),
-        fHeight(height),
-        fUniqueID(NextUniqueID()) {
-
-        SkASSERT(width >= 0);
-        SkASSERT(height >= 0);
-    }
+    SkImage(int width, int height, uint32_t uniqueID);
 
 private:
     const int       fWidth;
     const int       fHeight;
     const uint32_t  fUniqueID;
 
-    static uint32_t NextUniqueID();
-
     typedef SkRefCnt INHERITED;
-
-    /**
-     *  Return a copy of the image's pixels, limiting them to the subset
-     *  rectangle's intersection wit the image bounds. If subset is NULL, then
-     *  the entire image will be considered.
-     *
-     *  If the bitmap's pixels have already been allocated, then readPixels()
-     *  will succeed only if it can support converting the image's pixels into
-     *  the bitmap's ColorType/AlphaType. Any pixels in the bitmap that do not
-     *  intersect with the image's bounds and the subset (if not null) will be
-     *  left untouched.
-     *
-     *  If the bitmap is initially empty/unallocated, then it will be allocated
-     *  using the default allocator, and the ColorType/AlphaType will be chosen
-     *  to most closely fit the image's configuration.
-     *
-     *  On failure, false will be returned, and bitmap will unmodified.
-     */
-    // On ice for now:
-    // - should it respect the particular colortype/alphatype of the src
-    // - should it have separate entrypoints for preallocated and not bitmaps?
-    // - isn't it enough to allow the caller to draw() the image into a canvas?
-    bool readPixels(SkBitmap* bitmap, const SkIRect* subset = NULL) const;
 };
 
 #endif
diff --git a/gfx/skia/skia/include/core/SkImageDecoder.h b/gfx/skia/skia/include/core/SkImageDecoder.h
index b258afedce18..30323b59ee56 100644
--- a/gfx/skia/skia/include/core/SkImageDecoder.h
+++ b/gfx/skia/skia/include/core/SkImageDecoder.h
@@ -10,11 +10,14 @@
 
 #include "SkBitmap.h"
 #include "SkImage.h"
+#include "SkPngChunkReader.h"
 #include "SkRect.h"
 #include "SkRefCnt.h"
 #include "SkTRegistry.h"
 #include "SkTypes.h"
 
+//#define SK_LEGACY_PEEKER
+
 class SkStream;
 class SkStreamRewindable;
 
@@ -26,6 +29,7 @@ class SkImageDecoder : SkNoncopyable {
 public:
     virtual ~SkImageDecoder();
 
+    // TODO (scroggo): Merge with SkEncodedFormat
     enum Format {
         kUnknown_Format,
         kBMP_Format,
@@ -37,6 +41,7 @@ public:
         kWEBP_Format,
         kPKM_Format,
         kKTX_Format,
+        kASTC_Format,
 
         kLastKnownFormat = kKTX_Format,
     };
@@ -46,6 +51,15 @@ public:
     */
     virtual Format getFormat() const;
 
+    /** If planes or rowBytes is NULL, decodes the header and computes componentSizes
+        for memory allocation.
+        Otherwise, decodes the YUV planes into the provided image planes and
+        updates componentSizes to the final image size.
+        Returns whether the decoding was successful.
+    */
+    bool decodeYUV8Planes(SkStream* stream, SkISize componentSizes[3], void* planes[3],
+                          size_t rowBytes[3], SkYUVColorSpace*);
+
     /** Return the format of the SkStreamRewindable or kUnknown_Format if it cannot be determined.
         Rewinds the stream before returning.
     */
@@ -115,95 +129,20 @@ public:
     */
     bool getRequireUnpremultipliedColors() const { return fRequireUnpremultipliedColors; }
 
-    /** \class Peeker
-
-        Base class for optional callbacks to retrieve meta/chunk data out of
-        an image as it is being decoded.
-    */
-    class Peeker : public SkRefCnt {
+#ifdef SK_LEGACY_PEEKER
+    // Android subclasses SkImageDecoder::Peeker, which has been changed into SkPngChunkReader.
+    // Temporarily use this class until Android can be updated to directly inherit from
+    // SkPngChunkReader.
+    class Peeker : public SkPngChunkReader {
     public:
-        SK_DECLARE_INST_COUNT(Peeker)
-
-        /** Return true to continue decoding, or false to indicate an error, which
-            will cause the decoder to not return the image.
-        */
+        bool readChunk(const char tag[], const void* data, size_t length) final {
+            return this->peek(tag, data, length);
+        }
         virtual bool peek(const char tag[], const void* data, size_t length) = 0;
-    private:
-        typedef SkRefCnt INHERITED;
     };
-
-    Peeker* getPeeker() const { return fPeeker; }
-    Peeker* setPeeker(Peeker*);
-
-#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER
-    /** \class Chooser
-
-        Base class for optional callbacks to choose an image from a format that
-        contains multiple images.
-    */
-    class Chooser : public SkRefCnt {
-    public:
-        SK_DECLARE_INST_COUNT(Chooser)
-
-        virtual void begin(int count) {}
-        virtual void inspect(int index, SkBitmap::Config config, int width, int height) {}
-        /** Return the index of the subimage you want, or -1 to choose none of them.
-        */
-        virtual int choose() = 0;
-
-    private:
-        typedef SkRefCnt INHERITED;
-    };
-
-    Chooser* getChooser() const { return fChooser; }
-    Chooser* setChooser(Chooser*);
-#endif
-
-#ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG
-    /**
-     *  Optional table describing the caller's preferred config based on
-     *  information about the src data. Each field should be set to the
-     *  preferred config for a src described in the name of the field. The
-     *  src attributes are described in terms of depth (8-index,
-     *  8bit-grayscale, or 8-bits/component) and whether there is per-pixel
-     *  alpha (does not apply to grayscale). If the caller has no preference
-     *  for a particular src type, its slot should be set to kNo_Config.
-     *
-     *  NOTE ABOUT PREFERRED CONFIGS:
-     *  If a config is preferred, either using a pref table or as a parameter
-     *  to some flavor of decode, it is still at the discretion of the codec
-     *  as to what output config is actually returned, as it may not be able
-     *  to support the caller's preference.
-     *
-     *  If a bitmap is decoded into SkBitmap::A8_Config, the resulting bitmap
-     *  will either be a conversion of the grayscale in the case of a
-     *  grayscale source or the alpha channel in the case of a source with
-     *  an alpha channel.
-     */
-    struct PrefConfigTable {
-        SkBitmap::Config fPrefFor_8Index_NoAlpha_src;
-        SkBitmap::Config fPrefFor_8Index_YesAlpha_src;
-        SkBitmap::Config fPrefFor_8Gray_src;
-        SkBitmap::Config fPrefFor_8bpc_NoAlpha_src;
-        SkBitmap::Config fPrefFor_8bpc_YesAlpha_src;
-    };
-
-    /**
-     *  Set an optional table for specifying the caller's preferred config
-     *  based on information about the src data.
-     *
-     *  The default is no preference, which will assume the config set by
-     *  decode is preferred.
-     */
-    void setPrefConfigTable(const PrefConfigTable&);
-
-    /**
-     *  Do not use a PrefConfigTable to determine the output config. This
-     *  is the default, so there is no need to call unless a PrefConfigTable
-     *  was previously set.
-     */
-    void resetPrefConfigTable() { fUsePrefTable = false; }
 #endif
+    SkPngChunkReader* getPeeker() const { return fPeeker; }
+    SkPngChunkReader* setPeeker(SkPngChunkReader*);
 
     /**
      *  By default, the codec will try to comply with the "pref" colortype
@@ -261,13 +200,26 @@ public:
         kDecodePixels_Mode  //!< return entire bitmap (including pixels)
     };
 
+    /** Result of a decode. If read as a boolean, a partial success is
+        considered a success (true).
+    */
+    enum Result {
+        kFailure        = 0,    //!< Image failed to decode. bitmap will be
+                                //   unchanged.
+        kPartialSuccess = 1,    //!< Part of the image decoded. The rest is
+                                //   filled in automatically
+        kSuccess        = 2     //!< The entire image was decoded, if Mode is
+                                //   kDecodePixels_Mode, or the bounds were
+                                //   decoded, in kDecodeBounds_Mode.
+    };
+
     /** Given a stream, decode it into the specified bitmap.
         If the decoder can decompress the image, it calls bitmap.setInfo(),
         and then if the Mode is kDecodePixels_Mode, call allocPixelRef(),
         which will allocated a pixelRef. To access the pixel memory, the codec
         needs to call lockPixels/unlockPixels on the
         bitmap. It can then set the pixels with the decompressed image.
-    *   If the image cannot be decompressed, return false. After the
+    *   If the image cannot be decompressed, return kFailure. After the
     *   decoding, the function converts the decoded colortype in bitmap
     *   to pref if possible. Whether a conversion is feasible is
     *   tested by Bitmap::canCopyTo(pref).
@@ -277,32 +229,14 @@ public:
         to allocate the memory from a cache, volatile memory, or even from
         an existing bitmap's memory.
 
-        If a Peeker is installed via setPeeker, it may be used to peek into
-        meta data during the decode.
+        If an SkPngChunkReader is installed via setPeeker, it may be used to
+        peek into meta data during the decode.
     */
-    bool decode(SkStream*, SkBitmap* bitmap, SkColorType pref, Mode);
-    bool decode(SkStream* stream, SkBitmap* bitmap, Mode mode) {
+    Result decode(SkStream*, SkBitmap* bitmap, SkColorType pref, Mode);
+    Result decode(SkStream* stream, SkBitmap* bitmap, Mode mode) {
         return this->decode(stream, bitmap, kUnknown_SkColorType, mode);
     }
 
-    /**
-     * Given a stream, build an index for doing tile-based decode.
-     * The built index will be saved in the decoder, and the image size will
-     * be returned in width and height.
-     *
-     * Return true for success or false on failure.
-     */
-    bool buildTileIndex(SkStreamRewindable*, int *width, int *height);
-
-    /**
-     * Decode a rectangle subset in the image.
-     * The method can only be called after buildTileIndex().
-     *
-     * Return true for success.
-     * Return false if the index is never built or failing in decoding.
-     */
-    bool decodeSubset(SkBitmap* bm, const SkIRect& subset, SkColorType pref);
-
     /** Given a stream, this will try to find an appropriate decoder object.
         If none is found, the method returns NULL.
     */
@@ -311,8 +245,7 @@ public:
     /** Decode the image stored in the specified file, and store the result
         in bitmap. Return true for success or false on failure.
 
-        @param pref If the PrefConfigTable is not set, prefer this colortype.
-                          See NOTE ABOUT PREFERRED CONFIGS.
+        @param pref Prefer this colortype.
 
         @param format On success, if format is non-null, it is set to the format
                       of the decoded file. On failure it is ignored.
@@ -326,8 +259,7 @@ public:
     /** Decode the image stored in the specified memory buffer, and store the
         result in bitmap. Return true for success or false on failure.
 
-        @param pref If the PrefConfigTable is not set, prefer this colortype.
-                          See NOTE ABOUT PREFERRED CONFIGS.
+        @param pref Prefer this colortype.
 
         @param format On success, if format is non-null, it is set to the format
                        of the decoded buffer. On failure it is ignored.
@@ -338,26 +270,10 @@ public:
         return DecodeMemory(buffer, size, bitmap, kUnknown_SkColorType, kDecodePixels_Mode, NULL);
     }
 
-    /**
-     *  Struct containing information about a pixel destination.
-     */
-    struct Target {
-        /**
-         *  Pre-allocated memory.
-         */
-        void*  fAddr;
-
-        /**
-         *  Rowbytes of the allocated memory.
-         */
-        size_t fRowBytes;
-    };
-
     /** Decode the image stored in the specified SkStreamRewindable, and store the result
         in bitmap. Return true for success or false on failure.
 
-        @param pref If the PrefConfigTable is not set, prefer this colortype.
-                          See NOTE ABOUT PREFERRED CONFIGS.
+        @param pref Prefer this colortype.
 
         @param format On success, if format is non-null, it is set to the format
                       of the decoded stream. On failure it is ignored.
@@ -370,39 +286,20 @@ public:
 
 protected:
     // must be overridden in subclasses. This guy is called by decode(...)
-    virtual bool onDecode(SkStream*, SkBitmap* bitmap, Mode) = 0;
+    virtual Result onDecode(SkStream*, SkBitmap* bitmap, Mode) = 0;
 
-    // If the decoder wants to support tiled based decoding,
-    // this method must be overridden. This guy is called by buildTileIndex(...)
-    virtual bool onBuildTileIndex(SkStreamRewindable*, int *width, int *height) {
+    /** If planes or rowBytes is NULL, decodes the header and computes componentSizes
+        for memory allocation.
+        Otherwise, decodes the YUV planes into the provided image planes and
+        updates componentSizes to the final image size.
+        Returns whether the decoding was successful.
+    */
+    virtual bool onDecodeYUV8Planes(SkStream*, SkISize[3] /*componentSizes*/,
+                                    void*[3] /*planes*/, size_t[3] /*rowBytes*/,
+                                    SkYUVColorSpace*) {
         return false;
     }
 
-    // If the decoder wants to support tiled based decoding,
-    // this method must be overridden. This guy is called by decodeRegion(...)
-    virtual bool onDecodeSubset(SkBitmap* bitmap, const SkIRect& rect) {
-        return false;
-    }
-
-    /*
-     * Crop a rectangle from the src Bitmap to the dest Bitmap. src and dst are
-     * both sampled by sampleSize from an original Bitmap.
-     *
-     * @param dst the destination bitmap.
-     * @param src the source bitmap that is sampled by sampleSize from the
-     *            original bitmap.
-     * @param sampleSize the sample size that src is sampled from the original bitmap.
-     * @param (dstX, dstY) the upper-left point of the dest bitmap in terms of
-     *                     the coordinate in the original bitmap.
-     * @param (width, height) the width and height of the unsampled dst.
-     * @param (srcX, srcY) the upper-left point of the src bitmap in terms of
-     *                     the coordinate in the original bitmap.
-     * @return bool Whether or not it succeeded.
-     */
-    bool cropBitmap(SkBitmap *dst, SkBitmap *src, int sampleSize,
-                    int dstX, int dstY, int width, int height,
-                    int srcX, int srcY);
-
     /**
      *  Copy all fields on this decoder to the other decoder. Used by subclasses
      *  to decode a subimage using a different decoder, but with the same settings.
@@ -428,12 +325,6 @@ protected:
      *  Return the default preference being used by the current or latest call to decode.
      */
     SkColorType getDefaultPref() { return fDefaultPref; }
-    
-#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER
-    // helper function for decoders to handle the (common) case where there is only
-    // once choice available in the image file.
-    bool chooseFromOneChoice(SkColorType, int width, int height) const;
-#endif
 
     /*  Helper for subclasses. Call this to allocate the pixel memory given the bitmap's info.
         Returns true on success. This method handles checking for an optional Allocator.
@@ -459,17 +350,10 @@ protected:
     SkColorType getPrefColorType(SrcDepth, bool hasAlpha) const;
 
 private:
-    Peeker*                 fPeeker;
-#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER
-    Chooser*                fChooser;
-#endif
+    SkPngChunkReader*       fPeeker;
     SkBitmap::Allocator*    fAllocator;
     int                     fSampleSize;
     SkColorType             fDefaultPref;   // use if fUsePrefTable is false
-#ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG
-    PrefConfigTable         fPrefTable;     // use if fUsePrefTable is true
-    bool                    fUsePrefTable;
-#endif
     bool                    fPreserveSrcDepth;
     bool                    fDitherImage;
     bool                    fSkipWritingZeroes;
@@ -486,7 +370,7 @@ private:
  */
 class SkImageDecoderFactory : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkImageDecoderFactory)
+    
 
     virtual SkImageDecoder* newDecoder(SkStreamRewindable*) = 0;
 
@@ -509,10 +393,8 @@ public:
 
 // This macro defines the global creation entry point for each decoder. Each
 // decoder implementation that registers with the decoder factory must call it.
-#define DEFINE_DECODER_CREATOR(codec)           \
-    SkImageDecoder *Create ## codec () {        \
-        return SkNEW( Sk ## codec );            \
-    }
+#define DEFINE_DECODER_CREATOR(codec) \
+    SkImageDecoder* Create##codec() { return new Sk##codec; }
 
 // All the decoders known by Skia. Note that, depending on the compiler settings,
 // not all of these will be available
@@ -525,6 +407,7 @@ DECLARE_DECODER_CREATOR(WBMPImageDecoder);
 DECLARE_DECODER_CREATOR(WEBPImageDecoder);
 DECLARE_DECODER_CREATOR(PKMImageDecoder);
 DECLARE_DECODER_CREATOR(KTXImageDecoder);
+DECLARE_DECODER_CREATOR(ASTCImageDecoder);
 
 // Typedefs to make registering decoder and formatter callbacks easier.
 // These have to be defined outside SkImageDecoder. :(
diff --git a/gfx/skia/skia/include/core/SkImageEncoder.h b/gfx/skia/skia/include/core/SkImageEncoder.h
index 4d4d2a83c0f1..fc999dcc189d 100644
--- a/gfx/skia/skia/include/core/SkImageEncoder.h
+++ b/gfx/skia/skia/include/core/SkImageEncoder.h
@@ -1,14 +1,14 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 #ifndef SkImageEncoder_DEFINED
 #define SkImageEncoder_DEFINED
 
-#include "SkTypes.h"
+#include "SkImageInfo.h"
 #include "SkTRegistry.h"
 
 class SkBitmap;
@@ -17,6 +17,7 @@ class SkWStream;
 
 class SkImageEncoder {
 public:
+    // TODO (scroggo): Merge with SkEncodedFormat.
     enum Type {
         kUnknown_Type,
         kBMP_Type,
@@ -59,7 +60,10 @@ public:
      */
     bool encodeStream(SkWStream* stream, const SkBitmap& bm, int quality);
 
+    static SkData* EncodeData(const SkImageInfo&, const void* pixels, size_t rowBytes,
+                              Type, int quality);
     static SkData* EncodeData(const SkBitmap&, Type, int quality);
+
     static bool EncodeFile(const char file[], const SkBitmap&, Type,
                            int quality);
     static bool EncodeStream(SkWStream*, const SkBitmap&, Type,
@@ -83,10 +87,8 @@ protected:
 
 // This macro defines the global creation entry point for each encoder. Each
 // encoder implementation that registers with the encoder factory must call it.
-#define DEFINE_ENCODER_CREATOR(codec)           \
-    SkImageEncoder *Create ## codec () {        \
-        return SkNEW( Sk ## codec );            \
-    }
+#define DEFINE_ENCODER_CREATOR(codec) \
+    SkImageEncoder* Create##codec() { return new Sk##codec; }
 
 // All the encoders known by Skia. Note that, depending on the compiler settings,
 // not all of these will be available
diff --git a/gfx/skia/skia/include/core/SkImageFilter.h b/gfx/skia/skia/include/core/SkImageFilter.h
index cd34ba3f91bd..d90df29c8bfe 100644
--- a/gfx/skia/skia/include/core/SkImageFilter.h
+++ b/gfx/skia/skia/include/core/SkImageFilter.h
@@ -8,17 +8,19 @@
 #ifndef SkImageFilter_DEFINED
 #define SkImageFilter_DEFINED
 
+#include "../private/SkTemplates.h"
+#include "SkFilterQuality.h"
 #include "SkFlattenable.h"
 #include "SkMatrix.h"
 #include "SkRect.h"
-#include "SkTemplates.h"
+#include "SkSurfaceProps.h"
 
+class GrFragmentProcessor;
+class GrTexture;
+class SkBaseDevice;
 class SkBitmap;
 class SkColorFilter;
-class SkBaseDevice;
 struct SkIPoint;
-class GrEffect;
-class GrTexture;
 
 /**
  *  Base class for image filters. If one is installed in the paint, then
@@ -29,66 +31,109 @@ class GrTexture;
  */
 class SK_API SkImageFilter : public SkFlattenable {
 public:
-    SK_DECLARE_INST_COUNT(SkImageFilter)
+    // This cache maps from (filter's unique ID + CTM + clipBounds + src bitmap generation ID) to
+    // (result, offset).
+    class Cache : public SkRefCnt {
+    public:
+        struct Key;
+        virtual ~Cache() {}
+        static Cache* Create(size_t maxBytes);
+        static Cache* Get();
+        virtual bool get(const Key& key, SkBitmap* result, SkIPoint* offset) const = 0;
+        virtual void set(const Key& key, const SkBitmap& result, const SkIPoint& offset) = 0;
+        virtual void purge() {}
+    };
+
+    enum SizeConstraint {
+        kExact_SizeConstraint,
+        kApprox_SizeConstraint,
+    };
+
+    class Context {
+    public:
+        Context(const SkMatrix& ctm, const SkIRect& clipBounds, Cache* cache,
+                SizeConstraint constraint)
+            : fCTM(ctm)
+            , fClipBounds(clipBounds)
+            , fCache(cache)
+            , fSizeConstraint(constraint)
+        {}
+
+        const SkMatrix& ctm() const { return fCTM; }
+        const SkIRect& clipBounds() const { return fClipBounds; }
+        Cache* cache() const { return fCache; }
+        SizeConstraint sizeConstraint() const { return fSizeConstraint; }
+
+    private:
+        SkMatrix        fCTM;
+        SkIRect         fClipBounds;
+        Cache*          fCache;
+        SizeConstraint  fSizeConstraint;
+    };
 
     class CropRect {
     public:
         enum CropEdge {
             kHasLeft_CropEdge   = 0x01,
             kHasTop_CropEdge    = 0x02,
-            kHasRight_CropEdge  = 0x04,
-            kHasBottom_CropEdge = 0x08,
+            kHasWidth_CropEdge  = 0x04,
+            kHasHeight_CropEdge = 0x08,
             kHasAll_CropEdge    = 0x0F,
         };
         CropRect() {}
-        explicit CropRect(const SkRect& rect, uint32_t flags = kHasAll_CropEdge) : fRect(rect), fFlags(flags) {}
+        explicit CropRect(const SkRect& rect, uint32_t flags = kHasAll_CropEdge)
+            : fRect(rect), fFlags(flags) {}
         uint32_t flags() const { return fFlags; }
         const SkRect& rect() const { return fRect; }
+#ifndef SK_IGNORE_TO_STRING
+        void toString(SkString* str) const;
+#endif
+
+        /**
+         *  Apply this cropRect to the imageBounds. If a given edge of the cropRect is not
+         *  set, then the corresponding edge from imageBounds will be used.
+         *
+         *  Note: imageBounds is in "device" space, as the output cropped rectangle will be,
+         *  so the context's CTM is ignore for those. It is only applied the croprect's bounds.
+         *
+         *  The resulting rect will be intersected with the context's clip. If that intersection is
+         *  empty, then this returns false and cropped is unmodified.
+         */
+        bool applyTo(const SkIRect& imageBounds, const Context&, SkIRect* cropped) const;
+
     private:
         SkRect fRect;
         uint32_t fFlags;
     };
 
-    class SK_API Cache : public SkRefCnt {
-    public:
-        // By default, we cache only image filters with 2 or more children.
-        // Values less than 2 mean always cache; values greater than 2 are not supported.
-        static Cache* Create(int minChildren = 2);
-        virtual ~Cache() {}
-        virtual bool get(const SkImageFilter* key, SkBitmap* result, SkIPoint* offset) = 0;
-        virtual void set(const SkImageFilter* key,
-                         const SkBitmap& result, const SkIPoint& offset) = 0;
-        virtual void remove(const SkImageFilter* key) = 0;
-    };
-
-    class Context {
-    public:
-        Context(const SkMatrix& ctm, const SkIRect& clipBounds, Cache* cache) :
-            fCTM(ctm), fClipBounds(clipBounds), fCache(cache) {
-        }
-        const SkMatrix& ctm() const { return fCTM; }
-        const SkIRect& clipBounds() const { return fClipBounds; }
-        Cache* cache() const { return fCache; }
-    private:
-        SkMatrix fCTM;
-        SkIRect  fClipBounds;
-        Cache*   fCache;
-    };
-
     class Proxy {
     public:
-        virtual ~Proxy() {};
+        virtual ~Proxy() {}
 
         virtual SkBaseDevice* createDevice(int width, int height) = 0;
-        // returns true if the proxy can handle this filter natively
-        virtual bool canHandleImageFilter(const SkImageFilter*) = 0;
-        // returns true if the proxy handled the filter itself. if this returns
+
+        // Returns true if the proxy handled the filter itself. If this returns
         // false then the filter's code will be called.
         virtual bool filterImage(const SkImageFilter*, const SkBitmap& src,
-                                 const Context&,
+                                 const SkImageFilter::Context&,
                                  SkBitmap* result, SkIPoint* offset) = 0;
     };
 
+    class DeviceProxy : public Proxy {
+    public:
+        DeviceProxy(SkBaseDevice* device) : fDevice(device) {}
+
+        SkBaseDevice* createDevice(int width, int height) override;
+
+        // Returns true if the proxy handled the filter itself. If this returns
+        // false then the filter's code will be called.
+        bool filterImage(const SkImageFilter*, const SkBitmap& src, const SkImageFilter::Context&,
+                         SkBitmap* result, SkIPoint* offset) override;
+
+    private:
+        SkBaseDevice* fDevice;
+    };
+
     /**
      *  Request a new (result) image to be created from the src image.
      *  If the src has no pixels (isNull()) then the request just wants to
@@ -114,8 +159,8 @@ public:
     /**
      *  Returns true if the filter can be processed on the GPU.  This is most
      *  often used for multi-pass effects, where intermediate results must be
-     *  rendered to textures.  For single-pass effects, use asNewEffect().
-     *  The default implementation returns asNewEffect(NULL, NULL, SkMatrix::I(),
+     *  rendered to textures.  For single-pass effects, use asFragmentProcessor().
+     *  The default implementation returns asFragmentProcessor(NULL, NULL, SkMatrix::I(),
      *  SkIRect()).
      */
     virtual bool canFilterImageGPU() const;
@@ -123,12 +168,12 @@ public:
     /**
      *  Process this image filter on the GPU.  This is most often used for
      *  multi-pass effects, where intermediate results must be rendered to
-     *  textures.  For single-pass effects, use asNewEffect().  src is the
+     *  textures.  For single-pass effects, use asFragmentProcessor().  src is the
      *  source image for processing, as a texture-backed bitmap.  result is
      *  the destination bitmap, which should contain a texture-backed pixelref
      *  on success.  offset is the amount to translate the resulting image
      *  relative to the src when it is drawn. The default implementation does
-     *  single-pass processing using asNewEffect().
+     *  single-pass processing using asFragmentProcessor().
      */
     virtual bool filterImageGPU(Proxy*, const SkBitmap& src, const Context&,
                                 SkBitmap* result, SkIPoint* offset) const;
@@ -140,7 +185,26 @@ public:
      *  If this returns true, then if filterPtr is not null, it must be set to a ref'd colorfitler
      *  (i.e. it may not be set to NULL).
      */
-    virtual bool asColorFilter(SkColorFilter** filterPtr) const;
+    bool isColorFilterNode(SkColorFilter** filterPtr) const {
+        return this->onIsColorFilterNode(filterPtr);
+    }
+
+    // DEPRECATED : use isColorFilterNode() instead
+    bool asColorFilter(SkColorFilter** filterPtr) const {
+        return this->isColorFilterNode(filterPtr);
+    }
+
+    /**
+     *  Returns true (and optionally returns a ref'd filter) if this imagefilter can be completely
+     *  replaced by the returned colorfilter. i.e. the two effects will affect drawing in the
+     *  same way.
+     */
+    bool asAColorFilter(SkColorFilter** filterPtr) const {
+        return this->countInputs() > 0 &&
+               NULL == this->getInput(0) &&
+               !this->affectsTransparentBlack() &&
+               this->isColorFilterNode(filterPtr);
+    }
 
     /**
      *  Returns the number of inputs this filter will accept (some inputs can
@@ -160,7 +224,8 @@ public:
     /**
      *  Returns whether any edges of the crop rect have been set. The crop
      *  rect is set at construction time, and determines which pixels from the
-     *  input image will be processed. The size of the crop rect should be
+     *  input image will be processed, and which pixels in the output image will be allowed.
+     *  The size of the crop rect should be
      *  used as the size of the destination image. The origin of this rect
      *  should be used to offset access to the input images, and should also
      *  be added to the "offset" parameter in onFilterImage and
@@ -169,34 +234,44 @@ public:
      */
     bool cropRectIsSet() const { return fCropRect.flags() != 0x0; }
 
+    CropRect getCropRect() const { return fCropRect; }
+
     // Default impl returns union of all input bounds.
     virtual void computeFastBounds(const SkRect&, SkRect*) const;
 
-#ifdef SK_SUPPORT_GPU
+    // Can this filter DAG compute the resulting bounds of an object-space rectangle?
+    bool canComputeFastBounds() const;
+
+    /**
+     *  If this filter can be represented by another filter + a localMatrix, return that filter,
+     *  else return null.
+     */
+    SkImageFilter* newWithLocalMatrix(const SkMatrix& matrix) const;
+
+    /**
+     * Create an SkMatrixImageFilter, which transforms its input by the given matrix.
+     */
+    static SkImageFilter* CreateMatrixFilter(const SkMatrix& matrix,
+                                             SkFilterQuality,
+                                             SkImageFilter* input = NULL);
+
+#if SK_SUPPORT_GPU
     /**
      * Wrap the given texture in a texture-backed SkBitmap.
      */
     static void WrapTexture(GrTexture* texture, int width, int height, SkBitmap* result);
 
-    /**
-     * Recursively evaluate this filter on the GPU. If the filter has no GPU
-     * implementation, it will be processed in software and uploaded to the GPU.
-     */
-    bool getInputResultGPU(SkImageFilter::Proxy* proxy, const SkBitmap& src, const Context&,
-                           SkBitmap* result, SkIPoint* offset) const;
+    // Helper function which invokes GPU filter processing on the
+    // input at the specified "index". If the input is null, it leaves
+    // "result" and "offset" untouched, and returns true. If the input
+    // has a GPU implementation, it will be invoked directly.
+    // Otherwise, the filter will be processed in software and
+    // uploaded to the GPU.
+    bool filterInputGPU(int index, SkImageFilter::Proxy* proxy, const SkBitmap& src, const Context&,
+                        SkBitmap* result, SkIPoint* offset, bool relaxSizeConstraint = true) const;
 #endif
 
-    /**
-     *  Set an external cache to be used for all image filter processing. This
-     *  will replace the default intra-frame cache.
-     */
-    static void SetExternalCache(Cache* cache);
-
-    /**
-     *  Returns the currently-set external cache, or NULL if none is set.
-     */
-    static Cache* GetExternalCache();
-
+    SK_TO_STRING_PUREVIRT()
     SK_DEFINE_FLATTENABLE_TYPE(SkImageFilter)
 
 protected:
@@ -205,12 +280,22 @@ protected:
         Common() {}
         ~Common();
 
-        bool unflatten(SkReadBuffer&, int expectedInputs = -1);
+        /**
+         *  Attempt to unflatten the cropRect and the expected number of input filters.
+         *  If any number of input filters is valid, pass -1.
+         *  If this fails (i.e. corrupt buffer or contents) then return false and common will
+         *  be left uninitialized.
+         *  If this returns true, then inputCount() is the number of found input filters, each
+         *  of which may be NULL or a valid imagefilter.
+         */
+        bool unflatten(SkReadBuffer&, int expectedInputs);
 
-        CropRect        cropRect() const { return fCropRect; }
+        const CropRect& cropRect() const { return fCropRect; }
         int             inputCount() const { return fInputs.count(); }
         SkImageFilter** inputs() const { return fInputs.get(); }
 
+        SkImageFilter*  getInput(int index) const { return fInputs[index]; }
+
         // If the caller wants a copy of the inputs, call this and it will transfer ownership
         // of the unflattened input filters to the caller. This is just a short-cut for copying
         // the inputs, calling ref() on each, and then waiting for Common's destructor to call
@@ -238,7 +323,7 @@ protected:
      */
     explicit SkImageFilter(int inputCount, SkReadBuffer& rb);
 
-    virtual void flatten(SkWriteBuffer& wb) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
 
     /**
      *  This is the virtual which should be overridden by the derived class
@@ -267,14 +352,34 @@ protected:
     // no inputs.
     virtual bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const;
 
-    /** Computes source bounds as the src bitmap bounds offset by srcOffset.
-     *  Apply the transformed crop rect to the bounds if any of the
-     *  corresponding edge flags are set. Intersects the result against the
-     *  context's clipBounds, and returns the result in "bounds". If there is
-     *  no intersection, returns false and leaves "bounds" unchanged.
+    // Helper function which invokes filter processing on the input at the
+    // specified "index". If the input is null, it leaves "result" and
+    // "offset" untouched, and returns true. If the input is non-null, it
+    // calls filterImage() on that input, and returns true on success.
+    // i.e., return !getInput(index) || getInput(index)->filterImage(...);
+    bool filterInput(int index, Proxy*, const SkBitmap& src, const Context&,
+                     SkBitmap* result, SkIPoint* offset, bool relaxSizeConstraint = true) const;
+
+    /**
+     *  Return true (and return a ref'd colorfilter) if this node in the DAG is just a
+     *  colorfilter w/o CropRect constraints.
+     */
+    virtual bool onIsColorFilterNode(SkColorFilter** /*filterPtr*/) const {
+        return false;
+    }
+
+    /** Given a "src" bitmap and its "srcOffset", computes source and
+     *  destination bounds for this filter. Initial bounds are the
+     *  "src" bitmap bounds offset by "srcOffset". "dstBounds" are
+     *  computed by transforming the crop rect by the context's CTM,
+     *  applying it to the initial bounds, and intersecting the result
+     *  with the context's clip bounds.  "srcBounds" (if non-null) are
+     *  computed by intersecting the initial bounds with "dstBounds", to
+     *  ensure that we never sample outside of the crop rect (this restriction
+     *  may be relaxed in the future).
      */
     bool applyCropRect(const Context&, const SkBitmap& src, const SkIPoint& srcOffset,
-                       SkIRect* bounds) const;
+                       SkIRect* dstBounds, SkIRect* srcBounds = nullptr) const;
 
     /** Same as the above call, except that if the resulting crop rect is not
      *  entirely contained by the source bitmap's bounds, it creates a new
@@ -289,10 +394,10 @@ protected:
 
     /**
      *  Returns true if the filter can be expressed a single-pass
-     *  GrEffect, used to process this filter on the GPU, or false if
+     *  GrProcessor, used to process this filter on the GPU, or false if
      *  not.
      *
-     *  If effect is non-NULL, a new GrEffect instance is stored
+     *  If effect is non-NULL, a new GrProcessor instance is stored
      *  in it.  The caller assumes ownership of the stage, and it is up to the
      *  caller to unref it.
      *
@@ -302,16 +407,40 @@ protected:
      *  will be called with (NULL, NULL, SkMatrix::I()) to query for support,
      *  so returning "true" indicates support for all possible matrices.
      */
-    virtual bool asNewEffect(GrEffect** effect,
-                             GrTexture*,
-                             const SkMatrix& matrix,
-                             const SkIRect& bounds) const;
+    virtual bool asFragmentProcessor(GrFragmentProcessor**, GrTexture*, const SkMatrix&,
+                                     const SkIRect& bounds) const;
+
+    /**
+     * Returns true if this filter can cause transparent black pixels to become
+     * visible (ie., alpha > 0). The default implementation returns false. This
+     * function is non-recursive, i.e., only queries this filter and not its
+     * inputs.
+     */
+    virtual bool affectsTransparentBlack() const;
 
 private:
+    friend class SkGraphics;
+    static void PurgeCache();
+
+    bool usesSrcInput() const { return fUsesSrcInput; }
+
     typedef SkFlattenable INHERITED;
     int fInputCount;
     SkImageFilter** fInputs;
+    bool fUsesSrcInput;
     CropRect fCropRect;
+    uint32_t fUniqueID; // Globally unique
 };
 
+/**
+ *  Helper to unflatten the common data, and return NULL if we fail.
+ */
+#define SK_IMAGEFILTER_UNFLATTEN_COMMON(localVar, expectedCount)    \
+    Common localVar;                                                \
+    do {                                                            \
+        if (!localVar.unflatten(buffer, expectedCount)) {           \
+            return NULL;                                            \
+        }                                                           \
+    } while (0)
+
 #endif
diff --git a/gfx/skia/skia/include/core/SkImageGenerator.h b/gfx/skia/skia/include/core/SkImageGenerator.h
index 17477e37b397..66db5e488427 100644
--- a/gfx/skia/skia/include/core/SkImageGenerator.h
+++ b/gfx/skia/skia/include/core/SkImageGenerator.h
@@ -8,12 +8,19 @@
 #ifndef SkImageGenerator_DEFINED
 #define SkImageGenerator_DEFINED
 
-#include "SkImageInfo.h"
+#include "SkBitmap.h"
 #include "SkColor.h"
+#include "SkImageInfo.h"
 
+class GrContext;
+class GrTexture;
+class GrTextureParams;
 class SkBitmap;
 class SkData;
 class SkImageGenerator;
+class SkMatrix;
+class SkPaint;
+class SkPicture;
 
 /**
  *  Takes ownership of SkImageGenerator.  If this method fails for
@@ -24,29 +31,28 @@ class SkImageGenerator;
  *  If generator is NULL, will safely return false.
  *
  *  If this fails or when the SkDiscardablePixelRef that is
- *  installed into destination is destroyed, it will call
- *  SkDELETE() on the generator.  Therefore, generator should be
- *  allocated with SkNEW() or SkNEW_ARGS().
+ *  installed into destination is destroyed, it will
+ *  delete the generator.  Therefore, generator should be
+ *  allocated with new.
  *
  *  @param destination Upon success, this bitmap will be
  *  configured and have a pixelref installed.
  *
  *  @return true iff successful.
  */
-SK_API bool SkInstallDiscardablePixelRef(SkImageGenerator*, SkBitmap* destination);
+SK_API bool SkDEPRECATED_InstallDiscardablePixelRef(SkImageGenerator*, SkBitmap* destination);
 
 /**
- *  Purges all unlocked discardable memory in Skia's global
- *  discardable memory pool.
+ *  On success, installs a discardable pixelref into destination, based on encoded data.
+ *  Regardless of success or failure, the caller must still balance their ownership of encoded.
  */
-SK_API void SkPurgeGlobalDiscardableMemoryPool();
-
+SK_API bool SkDEPRECATED_InstallDiscardablePixelRef(SkData* encoded, SkBitmap* destination);
 
 /**
  *  An interface that allows a purgeable PixelRef (such as a
  *  SkDiscardablePixelRef) to decode and re-decode an image as needed.
  */
-class SK_API SkImageGenerator {
+class SK_API SkImageGenerator : public SkNoncopyable {
 public:
     /**
      *  The PixelRef which takes ownership of this SkImageGenerator
@@ -54,13 +60,8 @@ public:
      */
     virtual ~SkImageGenerator() { }
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEGENERATORAPI
-    virtual SkData* refEncodedData() { return this->onRefEncodedData(); }
-    virtual bool getInfo(SkImageInfo* info) { return this->onGetInfo(info); }
-    virtual bool getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes) {
-        return this->onGetPixels(info, pixels, rowBytes, NULL, NULL);
-    }
-#else
+    uint32_t uniqueID() const { return fUniqueID; }
+
     /**
      *  Return a ref to the encoded (i.e. compressed) representation,
      *  of this data.
@@ -71,15 +72,9 @@ public:
     SkData* refEncodedData() { return this->onRefEncodedData(); }
 
     /**
-     *  Return some information about the image, allowing the owner of
-     *  this object to allocate pixels.
-     *
-     *  Repeated calls to this function should give the same results,
-     *  allowing the PixelRef to be immutable.
-     *
-     *  @return false if anything goes wrong.
+     *  Return the ImageInfo associated with this generator.
      */
-    bool getInfo(SkImageInfo* info);
+    const SkImageInfo& getInfo() const { return fInfo; }
 
     /**
      *  Decode into the given pixels, a block of memory of size at
@@ -97,6 +92,10 @@ public:
      *         different output-configs, which the implementation can
      *         decide to support or not.
      *
+     *         A size that does not match getInfo() implies a request
+     *         to scale. If the generator cannot perform this scale,
+     *         it will return kInvalidScale.
+     *
      *  If info is kIndex8_SkColorType, then the caller must provide storage for up to 256
      *  SkPMColor values in ctable. On success the generator must copy N colors into that storage,
      *  (where N is the logical number of table entries) and set ctableCount to N.
@@ -104,17 +103,16 @@ public:
      *  If info is not kIndex8_SkColorType, then the last two parameters may be NULL. If ctableCount
      *  is not null, it will be set to 0.
      *
-     *  @return false if anything goes wrong or if the image info is
-     *          unsupported.
+     *  @return true on success.
      */
     bool getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
                    SkPMColor ctable[], int* ctableCount);
 
     /**
-     *  Simplified version of getPixels() that asserts that info is NOT kIndex8_SkColorType.
+     *  Simplified version of getPixels() that asserts that info is NOT kIndex8_SkColorType and
+     *  uses the default Options.
      */
     bool getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes);
-#endif
 
     /**
      *  If planes or rowBytes is NULL or if any entry in planes is NULL or if any entry in rowBytes
@@ -127,15 +125,140 @@ public:
      *  associated YUV data into those planes of memory supplied by the caller. It should validate
      *  that the sizes match what it expected. If the sizes do not match, it should return false.
      */
-    bool getYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3]);
+    bool getYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3],
+                       SkYUVColorSpace* colorSpace);
+
+    /**
+     *  If the generator can natively/efficiently return its pixels as a GPU image (backed by a
+     *  texture) this will return that image. If not, this will return NULL.
+     *
+     *  Regarding the GrContext parameter:
+     *
+     *  The caller may pass NULL for the context. In that case the generator may assume that its
+     *  internal context is current. If it has no internal context, then it should just return
+     *  null.
+     *
+     *  If the caller passes a non-null context, then the generator should only succeed if:
+     *  - it has no intrinsic context, and will use the caller's
+     *  - its internal context is the same
+     *  - it can somehow convert its texture into one that is valid for the provided context.
+     *
+     *  Regarding the GrTextureParams parameter:
+     *
+     *  If the context (the provided one or the generator's intrinsic one) determines that to
+     *  support the specified usage, it must return a different sized texture it may,
+     *  so the caller must inspect the texture's width/height and compare them to the generator's
+     *  getInfo() width/height. For readback usage use GrTextureParams::ClampNoFilter()
+     */
+    GrTexture* generateTexture(GrContext*, const SkIRect* subset = nullptr);
+
+    struct SupportedSizes {
+        SkISize fSizes[2];
+    };
+
+    /**
+     *  Some generators can efficiently scale their contents. If this is supported, the generator
+     *  may only support certain scaled dimensions. Call this with the desired scale factor,
+     *  and it will return true if scaling is supported, and in supportedSizes[] it will return
+     *  the nearest supported dimensions.
+     *
+     *  If no native scaling is supported, or scale is invalid (e.g. scale <= 0 || scale > 1)
+     *  this will return false, and the supportedsizes will be undefined.
+     */
+    bool computeScaledDimensions(SkScalar scale, SupportedSizes*);
+
+    /**
+     *  Scale the generator's pixels to fit into scaledSize.
+     *  This routine also support retrieving only a subset of the pixels. That subset is specified
+     *  by the following rectangle (in the scaled space):
+     *
+     *      subset = SkIRect::MakeXYWH(subsetOrigin.x(), subsetOrigin.y(),
+     *                                 subsetPixels.width(), subsetPixels.height())
+     *
+     *  If subset is not contained inside the scaledSize, this returns false.
+     *
+     *      whole = SkIRect::MakeWH(scaledSize.width(), scaledSize.height())
+     *      if (!whole.contains(subset)) {
+     *          return false;
+     *      }
+     *
+     *  If the requested colortype/alphatype in pixels is not supported,
+     *  or the requested scaledSize is not supported, or the generator encounters an error,
+     *  this returns false.
+     */
+    bool generateScaledPixels(const SkISize& scaledSize, const SkIPoint& subsetOrigin,
+                              const SkPixmap& subsetPixels);
+
+    bool generateScaledPixels(const SkPixmap& scaledPixels) {
+        return this->generateScaledPixels(SkISize::Make(scaledPixels.width(),
+                                                        scaledPixels.height()),
+                                          SkIPoint::Make(0, 0), scaledPixels);
+    }
+
+    /**
+     *  If the default image decoder system can interpret the specified (encoded) data, then
+     *  this returns a new ImageGenerator for it. Otherwise this returns NULL. Either way
+     *  the caller is still responsible for managing their ownership of the data.
+     */
+    static SkImageGenerator* NewFromEncoded(SkData*);
+
+    /** Return a new image generator backed by the specified picture.  If the size is empty or
+     *  the picture is NULL, this returns NULL.
+     *  The optional matrix and paint arguments are passed to drawPicture() at rasterization
+     *  time.
+     */
+    static SkImageGenerator* NewFromPicture(const SkISize&, const SkPicture*, const SkMatrix*,
+                                            const SkPaint*);
+
+    bool tryGenerateBitmap(SkBitmap* bm) {
+        return this->tryGenerateBitmap(bm, nullptr, nullptr);
+    }
+    bool tryGenerateBitmap(SkBitmap* bm, const SkImageInfo& info, SkBitmap::Allocator* allocator) {
+        return this->tryGenerateBitmap(bm, &info, allocator);
+    }
+    void generateBitmap(SkBitmap* bm) {
+        if (!this->tryGenerateBitmap(bm, nullptr, nullptr)) {
+            sk_throw();
+        }
+    }
+    void generateBitmap(SkBitmap* bm, const SkImageInfo& info) {
+        if (!this->tryGenerateBitmap(bm, &info, nullptr)) {
+            sk_throw();
+        }
+    }
 
 protected:
+    SkImageGenerator(const SkImageInfo& info);
+
     virtual SkData* onRefEncodedData();
-    virtual bool onGetInfo(SkImageInfo* info);
-    virtual bool onGetPixels(const SkImageInfo& info,
-                             void* pixels, size_t rowBytes,
+
+    virtual bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
                              SkPMColor ctable[], int* ctableCount);
     virtual bool onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3]);
+    virtual bool onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3],
+                                 SkYUVColorSpace* colorSpace);
+
+    virtual GrTexture* onGenerateTexture(GrContext*, const SkIRect*) {
+        return nullptr;
+    }
+
+    virtual bool onComputeScaledDimensions(SkScalar, SupportedSizes*) {
+        return false;
+    }
+    virtual bool onGenerateScaledPixels(const SkISize&, const SkIPoint&, const SkPixmap&) {
+        return false;
+    }
+
+    bool tryGenerateBitmap(SkBitmap* bm, const SkImageInfo* optionalInfo, SkBitmap::Allocator*);
+
+private:
+    const SkImageInfo fInfo;
+    const uint32_t fUniqueID;
+
+    // This is our default impl, which may be different on different platforms.
+    // It is called from NewFromEncoded() after it has checked for any runtime factory.
+    // The SkData will never be NULL, as that will have been checked by NewFromEncoded.
+    static SkImageGenerator* NewFromEncodedImpl(SkData*);
 };
 
 #endif  // SkImageGenerator_DEFINED
diff --git a/gfx/skia/skia/include/core/SkImageInfo.h b/gfx/skia/skia/include/core/SkImageInfo.h
index 3d82dc805c79..4b82ae6e2fb3 100644
--- a/gfx/skia/skia/include/core/SkImageInfo.h
+++ b/gfx/skia/skia/include/core/SkImageInfo.h
@@ -9,21 +9,17 @@
 #define SkImageInfo_DEFINED
 
 #include "SkMath.h"
+#include "SkRect.h"
 #include "SkSize.h"
 
-class SkWriteBuffer;
 class SkReadBuffer;
+class SkWriteBuffer;
 
 /**
- *  Describes how to interpret the alpha compoent of a pixel.
+ *  Describes how to interpret the alpha component of a pixel.
  */
 enum SkAlphaType {
-    /**
-     *  All pixels should be treated as opaque, regardless of the value stored
-     *  in their alpha field. Used for legacy images that wrote 0 or garbarge
-     *  in their alpha field, but intended the RGB to be treated as opaque.
-     */
-    kIgnore_SkAlphaType,
+    kUnknown_SkAlphaType,
 
     /**
      *  All pixels are stored as opaque. This differs slightly from kIgnore in
@@ -52,11 +48,7 @@ enum SkAlphaType {
 };
 
 static inline bool SkAlphaTypeIsOpaque(SkAlphaType at) {
-    SK_COMPILE_ASSERT(kIgnore_SkAlphaType < kOpaque_SkAlphaType, bad_alphatype_order);
-    SK_COMPILE_ASSERT(kPremul_SkAlphaType > kOpaque_SkAlphaType, bad_alphatype_order);
-    SK_COMPILE_ASSERT(kUnpremul_SkAlphaType > kOpaque_SkAlphaType, bad_alphatype_order);
-
-    return (unsigned)at <= kOpaque_SkAlphaType;
+    return kOpaque_SkAlphaType == at;
 }
 
 static inline bool SkAlphaTypeIsValid(unsigned value) {
@@ -80,19 +72,16 @@ enum SkColorType {
     kRGBA_8888_SkColorType,
     kBGRA_8888_SkColorType,
     kIndex_8_SkColorType,
+    kGray_8_SkColorType,
 
-    kLastEnum_SkColorType = kIndex_8_SkColorType,
+    kLastEnum_SkColorType = kGray_8_SkColorType,
 
 #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
     kN32_SkColorType = kBGRA_8888_SkColorType,
 #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
     kN32_SkColorType = kRGBA_8888_SkColorType,
 #else
-#error "SK_*32_SHFIT values must correspond to BGRA or RGBA byte order"
-#endif
-
-#ifdef SK_SUPPORT_LEGACY_N32_NAME
-    kPMColor_SkColorType = kN32_SkColorType
+    #error "SK_*32_SHFIT values must correspond to BGRA or RGBA byte order"
 #endif
 };
 
@@ -105,9 +94,10 @@ static int SkColorTypeBytesPerPixel(SkColorType ct) {
         4,  // RGBA_8888
         4,  // BGRA_8888
         1,  // kIndex_8
+        1,  // kGray_8
     };
-    SK_COMPILE_ASSERT(SK_ARRAY_COUNT(gSize) == (size_t)(kLastEnum_SkColorType + 1),
-                      size_mismatch_with_SkColorType_enum);
+    static_assert(SK_ARRAY_COUNT(gSize) == (size_t)(kLastEnum_SkColorType + 1),
+                  "size_mismatch_with_SkColorType_enum");
 
     SkASSERT((size_t)ct < SK_ARRAY_COUNT(gSize));
     return gSize[ct];
@@ -121,6 +111,17 @@ static inline bool SkColorTypeIsValid(unsigned value) {
     return value <= kLastEnum_SkColorType;
 }
 
+static inline size_t SkColorTypeComputeOffset(SkColorType ct, int x, int y, size_t rowBytes) {
+    int shift = 0;
+    switch (SkColorTypeBytesPerPixel(ct)) {
+        case 4: shift = 2; break;
+        case 2: shift = 1; break;
+        case 1: shift = 0; break;
+        default: return 0;
+    }
+    return y * rowBytes + (x << shift);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -133,73 +134,92 @@ bool SkColorTypeValidateAlphaType(SkColorType colorType, SkAlphaType alphaType,
 ///////////////////////////////////////////////////////////////////////////////
 
 /**
- *  Describe an image's dimensions and pixel type.
+ *  Describes the color space a YUV pixel.
  */
-struct SkImageInfo {
-    int         fWidth;
-    int         fHeight;
-    SkColorType fColorType;
-    SkAlphaType fAlphaType;
+enum SkYUVColorSpace {
+    /** Standard JPEG color space. */
+    kJPEG_SkYUVColorSpace,
+    /** SDTV standard Rec. 601 color space. Uses "studio swing" [16, 235] color
+       range. See http://en.wikipedia.org/wiki/Rec._601 for details. */
+    kRec601_SkYUVColorSpace,
+    /** HDTV standard Rec. 709 color space. Uses "studio swing" [16, 235] color
+       range. See http://en.wikipedia.org/wiki/Rec._709 for details. */
+    kRec709_SkYUVColorSpace,
 
-    static SkImageInfo Make(int width, int height, SkColorType ct, SkAlphaType at) {
-        SkImageInfo info = {
-            width, height, ct, at
-        };
-        return info;
+    kLastEnum_SkYUVColorSpace = kRec709_SkYUVColorSpace
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+enum SkColorProfileType {
+    kLinear_SkColorProfileType,
+    kSRGB_SkColorProfileType,
+
+    kLastEnum_SkColorProfileType = kSRGB_SkColorProfileType
+};
+
+/**
+ *  Describe an image's dimensions and pixel type.
+ *  Used for both src images and render-targets (surfaces).
+ */
+struct SK_API SkImageInfo {
+public:
+    SkImageInfo()
+        : fWidth(0)
+        , fHeight(0)
+        , fColorType(kUnknown_SkColorType)
+        , fAlphaType(kUnknown_SkAlphaType)
+        , fProfileType(kLinear_SkColorProfileType)
+    {}
+
+    static SkImageInfo Make(int width, int height, SkColorType ct, SkAlphaType at,
+                            SkColorProfileType pt = kLinear_SkColorProfileType) {
+        return SkImageInfo(width, height, ct, at, pt);
     }
 
     /**
      *  Sets colortype to the native ARGB32 type.
      */
-    static SkImageInfo MakeN32(int width, int height, SkAlphaType at) {
-        SkImageInfo info = {
-            width, height, kN32_SkColorType, at
-        };
-        return info;
+    static SkImageInfo MakeN32(int width, int height, SkAlphaType at,
+                               SkColorProfileType pt = kLinear_SkColorProfileType) {
+        return SkImageInfo(width, height, kN32_SkColorType, at, pt);
     }
 
     /**
      *  Sets colortype to the native ARGB32 type, and the alphatype to premul.
      */
-    static SkImageInfo MakeN32Premul(int width, int height) {
-        SkImageInfo info = {
-            width, height, kN32_SkColorType, kPremul_SkAlphaType
-        };
-        return info;
+    static SkImageInfo MakeN32Premul(int width, int height,
+                                     SkColorProfileType pt = kLinear_SkColorProfileType) {
+        return SkImageInfo(width, height, kN32_SkColorType, kPremul_SkAlphaType, pt);
     }
 
     /**
      *  Sets colortype to the native ARGB32 type, and the alphatype to premul.
      */
-    static SkImageInfo MakeN32Premul(const SkISize& size) {
-        return MakeN32Premul(size.width(), size.height());
+    static SkImageInfo MakeN32Premul(const SkISize& size,
+                                     SkColorProfileType pt = kLinear_SkColorProfileType) {
+        return MakeN32Premul(size.width(), size.height(), pt);
     }
 
     static SkImageInfo MakeA8(int width, int height) {
-        SkImageInfo info = {
-            width, height, kAlpha_8_SkColorType, kPremul_SkAlphaType
-        };
-        return info;
+        return SkImageInfo(width, height, kAlpha_8_SkColorType, kPremul_SkAlphaType,
+                           kLinear_SkColorProfileType);
     }
 
     static SkImageInfo MakeUnknown(int width, int height) {
-        SkImageInfo info = {
-            width, height, kUnknown_SkColorType, kIgnore_SkAlphaType
-        };
-        return info;
+        return SkImageInfo(width, height, kUnknown_SkColorType, kUnknown_SkAlphaType,
+                           kLinear_SkColorProfileType);
     }
 
     static SkImageInfo MakeUnknown() {
-        SkImageInfo info = {
-            0, 0, kUnknown_SkColorType, kIgnore_SkAlphaType
-        };
-        return info;
+        return SkImageInfo();
     }
 
     int width() const { return fWidth; }
     int height() const { return fHeight; }
     SkColorType colorType() const { return fColorType; }
     SkAlphaType alphaType() const { return fAlphaType; }
+    SkColorProfileType profileType() const { return fProfileType; }
 
     bool isEmpty() const { return fWidth <= 0 || fHeight <= 0; }
 
@@ -207,14 +227,26 @@ struct SkImageInfo {
         return SkAlphaTypeIsOpaque(fAlphaType);
     }
 
+    bool isLinear() const { return kLinear_SkColorProfileType == fProfileType; }
+    bool isSRGB() const { return kSRGB_SkColorProfileType == fProfileType; }
+
     SkISize dimensions() const { return SkISize::Make(fWidth, fHeight); }
+    SkIRect bounds() const { return SkIRect::MakeWH(fWidth, fHeight); }
 
     /**
      *  Return a new ImageInfo with the same colortype and alphatype as this info,
      *  but with the specified width and height.
      */
     SkImageInfo makeWH(int newWidth, int newHeight) const {
-        return SkImageInfo::Make(newWidth, newHeight, fColorType, fAlphaType);
+        return SkImageInfo::Make(newWidth, newHeight, fColorType, fAlphaType, fProfileType);
+    }
+
+    SkImageInfo makeAlphaType(SkAlphaType newAlphaType) const {
+        return SkImageInfo::Make(fWidth, fHeight, fColorType, newAlphaType, fProfileType);
+    }
+    
+    SkImageInfo makeColorType(SkColorType newColorType) const {
+        return SkImageInfo::Make(fWidth, fHeight, newColorType, fAlphaType, fProfileType);
     }
 
     int bytesPerPixel() const {
@@ -229,6 +261,12 @@ struct SkImageInfo {
         return (size_t)this->minRowBytes64();
     }
 
+    size_t computeOffset(int x, int y, size_t rowBytes) const {
+        SkASSERT((unsigned)x < (unsigned)fWidth);
+        SkASSERT((unsigned)y < (unsigned)fHeight);
+        return SkColorTypeComputeOffset(fColorType, x, y, rowBytes);
+    }
+
     bool operator==(const SkImageInfo& other) const {
         return 0 == memcmp(this, &other, sizeof(other));
     }
@@ -247,7 +285,11 @@ struct SkImageInfo {
     }
 
     size_t getSafeSize(size_t rowBytes) const {
-        return (size_t)this->getSafeSize64(rowBytes);
+        int64_t size = this->getSafeSize64(rowBytes);
+        if (!sk_64_isS32(size)) {
+            return 0;
+        }
+        return sk_64_asS32(size);
     }
 
     bool validRowBytes(size_t rowBytes) const {
@@ -256,6 +298,21 @@ struct SkImageInfo {
     }
 
     SkDEBUGCODE(void validate() const;)
+
+private:
+    int                 fWidth;
+    int                 fHeight;
+    SkColorType         fColorType;
+    SkAlphaType         fAlphaType;
+    SkColorProfileType  fProfileType;
+
+    SkImageInfo(int width, int height, SkColorType ct, SkAlphaType at, SkColorProfileType pt)
+        : fWidth(width)
+        , fHeight(height)
+        , fColorType(ct)
+        , fAlphaType(at)
+        , fProfileType(pt)
+    {}
 };
 
 #endif
diff --git a/gfx/skia/skia/include/core/SkInstCnt.h b/gfx/skia/skia/include/core/SkInstCnt.h
deleted file mode 100644
index e4b43d130b94..000000000000
--- a/gfx/skia/skia/include/core/SkInstCnt.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#ifndef SkInstCnt_DEFINED
-#define SkInstCnt_DEFINED
-
-/*
- * The instance counting system consists of three macros that create the
- * instance counting machinery. A class is added to the system by adding:
- *   SK_DECLARE_INST_COUNT at the top of its declaration for derived classes
- *   SK_DECLARE_INST_COUNT_ROOT at the top of its declaration for a root class
- * At the end of an application a call to all the "root" objects'
- * CheckInstanceCount methods should be made
- */
-#include "SkTypes.h"
-
-#if SK_ENABLE_INST_COUNT
-// Static variables inside member functions below may be defined multiple times
-// if Skia is being used as a dynamic library. Instance counting should be on
-// only for static builds. See bug skia:2058.
-#if defined(SKIA_DLL)
-#error Instance counting works only when Skia is built as a static library.
-#endif
-
-#include "SkOnce.h"
-#include "SkTArray.h"
-#include "SkThread.h"
-extern bool gPrintInstCount;
-
-// The non-root classes just register themselves with their parent
-#define SK_DECLARE_INST_COUNT(className)                                    \
-    SK_DECLARE_INST_COUNT_INTERNAL(className,                               \
-                                   INHERITED::AddInstChild(CheckInstanceCount);)
-
-// The root classes registers a function to print out the memory stats when
-// the app ends
-#define SK_DECLARE_INST_COUNT_ROOT(className)                               \
-    SK_DECLARE_INST_COUNT_INTERNAL(className, atexit(exitPrint);)
-
-#define SK_DECLARE_INST_COUNT_INTERNAL(className, initStep)                 \
-    class SkInstanceCountHelper {                                           \
-    public:                                                                 \
-        SkInstanceCountHelper() {                                           \
-            SK_DECLARE_STATIC_ONCE(once);                                   \
-            SkOnce(&once, init);                                            \
-            sk_atomic_inc(GetInstanceCountPtr());                           \
-        }                                                                   \
-                                                                            \
-        static void init() {                                                \
-            initStep                                                        \
-        }                                                                   \
-                                                                            \
-        SkInstanceCountHelper(const SkInstanceCountHelper&) {               \
-            sk_atomic_inc(GetInstanceCountPtr());                           \
-        }                                                                   \
-                                                                            \
-        ~SkInstanceCountHelper() {                                          \
-            sk_atomic_dec(GetInstanceCountPtr());                           \
-        }                                                                   \
-                                                                            \
-        static int32_t* GetInstanceCountPtr() {                             \
-            static int32_t gInstanceCount;                                  \
-            return &gInstanceCount;                                         \
-        }                                                                   \
-                                                                            \
-        static SkTArray<int (*)(int, bool)>*& GetChildren() {               \
-            static SkTArray<int (*)(int, bool)>* gChildren;                 \
-            return gChildren;                                               \
-        }                                                                   \
-                                                                            \
-        static void create_mutex(SkMutex** mutex) {                         \
-            *mutex = SkNEW(SkMutex);                                        \
-        }                                                                   \
-        static SkBaseMutex& GetChildrenMutex() {                            \
-            static SkMutex* childrenMutex;                                  \
-            SK_DECLARE_STATIC_ONCE(once);                                   \
-            SkOnce(&once, className::SkInstanceCountHelper::create_mutex, &childrenMutex);\
-            return *childrenMutex;                                          \
-        }                                                                   \
-                                                                            \
-    } fInstanceCountHelper;                                                 \
-                                                                            \
-    static int32_t GetInstanceCount() {                                     \
-        return *SkInstanceCountHelper::GetInstanceCountPtr();               \
-    }                                                                       \
-                                                                            \
-    static void exitPrint() {                                               \
-        CheckInstanceCount(0, true);                                        \
-    }                                                                       \
-                                                                            \
-    static int CheckInstanceCount(int level = 0, bool cleanUp = false) {    \
-        if (gPrintInstCount && 0 != GetInstanceCount()) {                   \
-            SkDebugf("%*c Leaked %s: %d\n",                                 \
-                     4*level, ' ', #className,                              \
-                     GetInstanceCount());                                   \
-        }                                                                   \
-        if (NULL == SkInstanceCountHelper::GetChildren()) {                 \
-            return GetInstanceCount();                                      \
-        }                                                                   \
-        SkTArray<int (*)(int, bool)>* children = \
-            SkInstanceCountHelper::GetChildren();                           \
-        int childCount = children->count();                                 \
-        int count = GetInstanceCount();                                     \
-        for (int i = 0; i < childCount; ++i) {                              \
-            count -= (*(*children)[i])(level+1, cleanUp);                   \
-        }                                                                   \
-        SkASSERT(count >= 0);                                               \
-        if (gPrintInstCount && childCount > 0 && count > 0) {               \
-            SkDebugf("%*c Leaked ???: %d\n", 4*(level + 1), ' ', count);    \
-        }                                                                   \
-        if (cleanUp) {                                                      \
-            delete children;                                                \
-            SkInstanceCountHelper::GetChildren() = NULL;                    \
-        }                                                                   \
-        return GetInstanceCount();                                          \
-    }                                                                       \
-                                                                            \
-    static void AddInstChild(int (*childCheckInstCnt)(int, bool)) {         \
-        if (CheckInstanceCount != childCheckInstCnt) {                      \
-            SkAutoMutexAcquire ama(SkInstanceCountHelper::GetChildrenMutex()); \
-            if (NULL == SkInstanceCountHelper::GetChildren()) {             \
-                SkInstanceCountHelper::GetChildren() =                      \
-                    new SkTArray<int (*)(int, bool)>;                       \
-            }                                                               \
-            SkInstanceCountHelper::GetChildren()->push_back(childCheckInstCnt); \
-        }                                                                   \
-    }
-
-#else
-// Typically SK_ENABLE_INST_COUNT=0. Make sure the class declares public typedef INHERITED by
-// causing a compile-time error if the typedef is missing. This way SK_ENABLE_INST_COUNT=1 stays
-// compiling.
-#define SK_DECLARE_INST_COUNT(className) static void AddInstChild() { INHERITED::AddInstChild(); }
-#define SK_DECLARE_INST_COUNT_ROOT(className) static void AddInstChild() { }
-#endif
-
-// Following are deprecated. They are defined only for backwards API compatibility.
-#define SK_DECLARE_INST_COUNT_TEMPLATE(className) SK_DECLARE_INST_COUNT(className)
-#define SK_DEFINE_INST_COUNT(className)
-#define SK_DEFINE_INST_COUNT_TEMPLATE(templateInfo, className)
-
-#endif // SkInstCnt_DEFINED
diff --git a/gfx/skia/skia/include/core/SkMallocPixelRef.h b/gfx/skia/skia/include/core/SkMallocPixelRef.h
index 63ed19ae3cea..ab337b9241ec 100644
--- a/gfx/skia/skia/include/core/SkMallocPixelRef.h
+++ b/gfx/skia/skia/include/core/SkMallocPixelRef.h
@@ -16,7 +16,6 @@
 */
 class SK_API SkMallocPixelRef : public SkPixelRef {
 public:
-    SK_DECLARE_INST_COUNT(SkMallocPixelRef)
     /**
      *  Return a new SkMallocPixelRef with the provided pixel storage, rowBytes,
      *  and optional colortable. The caller is responsible for managing the
@@ -43,6 +42,12 @@ public:
     static SkMallocPixelRef* NewAllocate(const SkImageInfo& info,
                                          size_t rowBytes, SkColorTable*);
 
+    /**
+     *  Identical to NewAllocate, except all pixel bytes are zeroed.
+     */
+    static SkMallocPixelRef* NewZeroed(const SkImageInfo& info,
+                                       size_t rowBytes, SkColorTable*);
+
     /**
      *  Return a new SkMallocPixelRef with the provided pixel storage,
      *  rowBytes, and optional colortable. On destruction, ReleaseProc
@@ -50,6 +55,11 @@ public:
      *
      *  This pixelref will ref() the specified colortable (if not NULL).
      *
+     *  If ReleaseProc is NULL, the pixels will never be released. This
+     *  can be useful if the pixels were stack allocated. However, such an
+     *  SkMallocPixelRef must not live beyond its pixels (e.g. by copying
+     *  an SkBitmap pointing to it, or drawing to an SkPicture).
+     *
      *  Returns NULL on failure.
      */
     typedef void (*ReleaseProc)(void* addr, void* context);
@@ -77,9 +87,12 @@ public:
 
     class PRFactory : public SkPixelRefFactory {
     public:
-        virtual SkPixelRef* create(const SkImageInfo&,
-                                   size_t rowBytes,
-                                   SkColorTable*) SK_OVERRIDE;
+        SkPixelRef* create(const SkImageInfo&, size_t rowBytes, SkColorTable*) override;
+    };
+
+    class ZeroedPRFactory : public SkPixelRefFactory {
+    public:
+        SkPixelRef* create(const SkImageInfo&, size_t rowBytes, SkColorTable*) override;
     };
 
 protected:
@@ -88,11 +101,17 @@ protected:
                      bool ownPixels);
     virtual ~SkMallocPixelRef();
 
-    virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE;
-    virtual void onUnlockPixels() SK_OVERRIDE;
-    virtual size_t getAllocatedSizeInBytes() const SK_OVERRIDE;
+    bool onNewLockPixels(LockRec*) override;
+    void onUnlockPixels() override;
+    size_t getAllocatedSizeInBytes() const override;
 
 private:
+    // Uses alloc to implement NewAllocate or NewZeroed.
+    static SkMallocPixelRef* NewUsing(void*(*alloc)(size_t),
+                                      const SkImageInfo&,
+                                      size_t rowBytes,
+                                      SkColorTable*);
+
     void*           fStorage;
     SkColorTable*   fCTable;
     size_t          fRB;
diff --git a/gfx/skia/skia/include/core/SkMask.h b/gfx/skia/skia/include/core/SkMask.h
index 5cfef970c502..7be6aff614ce 100644
--- a/gfx/skia/skia/include/core/SkMask.h
+++ b/gfx/skia/skia/include/core/SkMask.h
@@ -23,11 +23,10 @@ struct SkMask {
         k3D_Format, //!< 3 8bit per pixl planes: alpha, mul, add
         kARGB32_Format,         //!< SkPMColor
         kLCD16_Format,          //!< 565 alpha for r/g/b
-        kLCD32_Format           //!< 888 alpha for r/g/b
     };
 
     enum {
-        kCountMaskFormats = kLCD32_Format + 1
+        kCountMaskFormats = kLCD16_Format + 1
     };
 
     uint8_t*    fImage;
@@ -86,26 +85,13 @@ struct SkMask {
         return row + (x - fBounds.fLeft);
     }
 
-    /**
-     *  Return the address of the specified 32bit mask. In the debug build,
-     *  this asserts that the mask's format is kLCD32_Format, and that (x,y)
-     *  are contained in the mask's fBounds.
-     */
-    uint32_t* getAddrLCD32(int x, int y) const {
-        SkASSERT(kLCD32_Format == fFormat);
-        SkASSERT(fBounds.contains(x, y));
-        SkASSERT(fImage != NULL);
-        uint32_t* row = (uint32_t*)(fImage + (y - fBounds.fTop) * fRowBytes);
-        return row + (x - fBounds.fLeft);
-    }
-
     /**
      *  Return the address of the specified 32bit mask. In the debug build,
      *  this asserts that the mask's format is 32bits, and that (x,y)
      *  are contained in the mask's fBounds.
      */
     uint32_t* getAddr32(int x, int y) const {
-        SkASSERT(kLCD32_Format == fFormat || kARGB32_Format == fFormat);
+        SkASSERT(kARGB32_Format == fFormat);
         SkASSERT(fBounds.contains(x, y));
         SkASSERT(fImage != NULL);
         uint32_t* row = (uint32_t*)(fImage + (y - fBounds.fTop) * fRowBytes);
@@ -116,7 +102,7 @@ struct SkMask {
      *  Returns the address of the specified pixel, computing the pixel-size
      *  at runtime based on the mask format. This will be slightly slower than
      *  using one of the routines where the format is implied by the name
-     *  e.g. getAddr8 or getAddrLCD32.
+     *  e.g. getAddr8 or getAddr32.
      *
      *  x,y must be contained by the mask's bounds (this is asserted in the
      *  debug build, but not checked in the release build.)
diff --git a/gfx/skia/skia/include/core/SkMaskFilter.h b/gfx/skia/skia/include/core/SkMaskFilter.h
index 39925129a76d..1fe1d9adafc2 100644
--- a/gfx/skia/skia/include/core/SkMaskFilter.h
+++ b/gfx/skia/skia/include/core/SkMaskFilter.h
@@ -15,10 +15,14 @@
 #include "SkMask.h"
 #include "SkPaint.h"
 
-class GrContext;
+class GrClip;
+class GrDrawContext;
 class GrPaint;
+class GrRenderTarget;
+class GrTextureProvider;
 class SkBitmap;
 class SkBlitter;
+class SkCachedData;
 class SkMatrix;
 class SkPath;
 class SkRasterClip;
@@ -38,8 +42,6 @@ class SkStrokeRec;
 */
 class SK_API SkMaskFilter : public SkFlattenable {
 public:
-    SK_DECLARE_INST_COUNT(SkMaskFilter)
-
     /** Returns the format of the resulting mask that this subclass will return
         when its filterMask() method is called.
     */
@@ -63,32 +65,44 @@ public:
 
 #if SK_SUPPORT_GPU
     /**
-     *  Returns true if the filter can be expressed a single-pass GrEffect without requiring an
+     *  Returns true if the filter can be expressed a single-pass GrProcessor without requiring an
      *  explicit input mask. Per-pixel, the effect receives the incoming mask's coverage as
      *  the input color and outputs the filtered covereage value. This means that each pixel's
      *  filtered coverage must only depend on the unfiltered mask value for that pixel and not on
      *  surrounding values.
      *
-     * If effect is non-NULL, a new GrEffect instance is stored in it. The caller assumes ownership
-     * of the effect and must unref it.
+     * If effect is non-NULL, a new GrProcessor instance is stored in it. The caller assumes
+     * ownership of the effect and must unref it.
      */
-    virtual bool asNewEffect(GrEffect** effect,
-                             GrTexture*,
-                             const SkMatrix& ctm) const;
+    virtual bool asFragmentProcessor(GrFragmentProcessor**, GrTexture*, const SkMatrix& ctm) const;
 
     /**
-     *  If asNewEffect() fails the filter may be implemented on the GPU by a subclass overriding
-     *  filterMaskGPU (declared below). That code path requires constructing a src mask as input.
-     *  Since that is a potentially expensive operation, the subclass must also override this
-     *  function to indicate whether filterTextureMaskGPU would succeeed if the mask were to be
-     *  created.
+     *  If asFragmentProcessor() fails the filter may be implemented on the GPU by a subclass
+     *  overriding filterMaskGPU (declared below). That code path requires constructing a
+     *  src mask as input. Since that is a potentially expensive operation, the subclass must also
+     *  override this function to indicate whether filterTextureMaskGPU would succeeed if the mask
+     *  were to be created.
      *
      *  'maskRect' returns the device space portion of the mask that the filter needs. The mask
-     *  passed into 'filterMaskGPU' should have the same extent as 'maskRect' but be translated
-     *  to the upper-left corner of the mask (i.e., (maskRect.fLeft, maskRect.fTop) appears at
-     *  (0, 0) in the mask).
+     *  passed into 'filterMaskGPU' should have the same extent as 'maskRect' but be
+     *  translated to the upper-left corner of the mask (i.e., (maskRect.fLeft, maskRect.fTop)
+     *  appears at (0, 0) in the mask).
+     *
+     * Logically, how this works is:
+     *    canFilterMaskGPU is called
+     *    if (it returns true)
+     *        the returned mask rect is used for quick rejecting
+     *        either directFilterMaskGPU or directFilterRRectMaskGPU is then called
+     *        if (neither of them handle the blur)
+     *            the mask rect is used to generate the mask
+     *            filterMaskGPU is called to filter the mask
+     *
+     * TODO: this should work as:
+     *    if (canFilterMaskGPU(devShape, ...)) // rect, rrect, drrect, path
+     *        filterMaskGPU(devShape, ...)
+     * this would hide the RRect special case and the mask generation
      */
-    virtual bool canFilterMaskGPU(const SkRect& devBounds,
+    virtual bool canFilterMaskGPU(const SkRRect& devRRect,
                                   const SkIRect& clipBounds,
                                   const SkMatrix& ctm,
                                   SkRect* maskRect) const;
@@ -97,16 +111,22 @@ public:
      *  Try to directly render the mask filter into the target.  Returns
      *  true if drawing was successful.
      */
-    virtual bool directFilterMaskGPU(GrContext* context,
+    virtual bool directFilterMaskGPU(GrTextureProvider* texProvider,
+                                     GrDrawContext* drawContext,
                                      GrPaint* grp,
+                                     const GrClip&,
+                                     const SkMatrix& viewMatrix,
                                      const SkStrokeRec& strokeRec,
                                      const SkPath& path) const;
     /**
      *  Try to directly render a rounded rect mask filter into the target.  Returns
      *  true if drawing was successful.
      */
-    virtual bool directFilterRRectMaskGPU(GrContext* context,
+    virtual bool directFilterRRectMaskGPU(GrTextureProvider* texProvider,
+                                          GrDrawContext* drawContext,
                                           GrPaint* grp,
+                                          const GrClip&,
+                                          const SkMatrix& viewMatrix,
                                           const SkStrokeRec& strokeRec,
                                           const SkRRect& rrect) const;
 
@@ -155,8 +175,6 @@ public:
 
 protected:
     SkMaskFilter() {}
-    // empty for now, but lets get our subclass to remember to init us for the future
-    SkMaskFilter(SkReadBuffer& buffer) : INHERITED(buffer) {}
 
     enum FilterReturn {
         kFalse_FilterReturn,
@@ -164,10 +182,17 @@ protected:
         kUnimplemented_FilterReturn
     };
 
-    struct NinePatch {
+    class NinePatch : ::SkNoncopyable {
+    public:
+        NinePatch() : fCache(NULL) {
+            fMask.fImage = NULL;
+        }
+        ~NinePatch();
+
         SkMask      fMask;      // fBounds must have [0,0] in its top-left
         SkIRect     fOuterRect; // width/height must be >= fMask.fBounds'
         SkIPoint    fCenter;    // identifies center row/col for stretching
+        SkCachedData* fCache;
     };
 
     /**
diff --git a/gfx/skia/skia/include/core/SkMath.h b/gfx/skia/skia/include/core/SkMath.h
index 014f014debb7..e5069592d003 100644
--- a/gfx/skia/skia/include/core/SkMath.h
+++ b/gfx/skia/skia/include/core/SkMath.h
@@ -79,6 +79,9 @@ int SkCLZ_portable(uint32_t);
             if (mask) {
                 DWORD index;
                 _BitScanReverse(&index, mask);
+                // Suppress this bogus /analyze warning. The check for non-zero
+                // guarantees that _BitScanReverse will succeed.
+#pragma warning(suppress : 6102) // Using 'index' from failed function call
                 return index ^ 0x1F;
             } else {
                 return 32;
@@ -147,40 +150,12 @@ static inline int SkNextLog2(uint32_t value) {
  *  Returns true if value is a power of 2. Does not explicitly check for
  *  value <= 0.
  */
-static inline bool SkIsPow2(int value) {
+template <typename T> inline bool SkIsPow2(T value) {
     return (value & (value - 1)) == 0;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-/**
- *  SkMulS16(a, b) multiplies a * b, but requires that a and b are both int16_t.
- *  With this requirement, we can generate faster instructions on some
- *  architectures.
- */
-#ifdef SK_ARM_HAS_EDSP
-    static inline int32_t SkMulS16(S16CPU x, S16CPU y) {
-        SkASSERT((int16_t)x == x);
-        SkASSERT((int16_t)y == y);
-        int32_t product;
-        asm("smulbb %0, %1, %2 \n"
-            : "=r"(product)
-            : "r"(x), "r"(y)
-            );
-        return product;
-    }
-#else
-    #ifdef SK_DEBUG
-        static inline int32_t SkMulS16(S16CPU x, S16CPU y) {
-            SkASSERT((int16_t)x == x);
-            SkASSERT((int16_t)y == y);
-            return x * y;
-        }
-    #else
-        #define SkMulS16(x, y)  ((x) * (y))
-    #endif
-#endif
-
 /**
  *  Return a*b/((1 << shift) - 1), rounding any fractional bits.
  *  Only valid if a and b are unsigned and <= 32767 and shift is > 0 and <= 8
@@ -189,7 +164,7 @@ static inline unsigned SkMul16ShiftRound(U16CPU a, U16CPU b, int shift) {
     SkASSERT(a <= 32767);
     SkASSERT(b <= 32767);
     SkASSERT(shift > 0 && shift <= 8);
-    unsigned prod = SkMulS16(a, b) + (1 << (shift - 1));
+    unsigned prod = a*b + (1 << (shift - 1));
     return (prod + (prod >> shift)) >> shift;
 }
 
@@ -200,7 +175,7 @@ static inline unsigned SkMul16ShiftRound(U16CPU a, U16CPU b, int shift) {
 static inline U8CPU SkMulDiv255Round(U16CPU a, U16CPU b) {
     SkASSERT(a <= 32767);
     SkASSERT(b <= 32767);
-    unsigned prod = SkMulS16(a, b) + 128;
+    unsigned prod = a*b + 128;
     return (prod + (prod >> 8)) >> 8;
 }
 
diff --git a/gfx/skia/skia/include/core/SkMatrix.h b/gfx/skia/skia/include/core/SkMatrix.h
index bfa03de7c5dd..97a53505ef37 100644
--- a/gfx/skia/skia/include/core/SkMatrix.h
+++ b/gfx/skia/skia/include/core/SkMatrix.h
@@ -10,16 +10,11 @@
 #ifndef SkMatrix_DEFINED
 #define SkMatrix_DEFINED
 
-#include "SkDynamicAnnotations.h"
 #include "SkRect.h"
 
+struct SkRSXform;
 class SkString;
 
-// TODO: can we remove these 3 (need to check chrome/android)
-typedef SkScalar SkPersp;
-#define SkScalarToPersp(x) (x)
-#define SkPerspToScalar(x) (x)
-
 /** \class SkMatrix
 
     The SkMatrix class holds a 3x3 matrix for transforming coordinates.
@@ -27,8 +22,27 @@ typedef SkScalar SkPersp;
     using either reset() - to construct an identity matrix, or one of the set
     functions (e.g. setTranslate, setRotate, etc.).
 */
+SK_BEGIN_REQUIRE_DENSE
 class SK_API SkMatrix {
 public:
+    static SkMatrix SK_WARN_UNUSED_RESULT MakeScale(SkScalar sx, SkScalar sy) {
+        SkMatrix m;
+        m.setScale(sx, sy);
+        return m;
+    }
+
+    static SkMatrix SK_WARN_UNUSED_RESULT MakeScale(SkScalar scale) {
+        SkMatrix m;
+        m.setScale(scale, scale);
+        return m;
+    }
+
+    static SkMatrix SK_WARN_UNUSED_RESULT MakeTrans(SkScalar dx, SkScalar dy) {
+        SkMatrix m;
+        m.setTranslate(dx, dy);
+        return m;
+    }
+
     /** Enum of bit fields for the mask return by getType().
         Use this to identify the complexity of the matrix.
     */
@@ -60,6 +74,10 @@ public:
         return this->getType() == 0;
     }
 
+    bool isScaleTranslate() const {
+        return !(this->getType() & ~(kScale_Mask | kTranslate_Mask));
+    }
+
     /** Returns true if will map a rectangle to another rectangle. This can be
         true if the matrix is identity, scale-only, or rotates a multiple of
         90 degrees.
@@ -81,12 +99,12 @@ public:
                         kPerspective_Mask);
     }
 
-    /** Returns true if the matrix contains only translation, rotation or uniform scale
+    /** Returns true if the matrix contains only translation, rotation/reflection or uniform scale
         Returns false if other transformation types are included or is degenerate
      */
     bool isSimilarity(SkScalar tol = SK_ScalarNearlyZero) const;
 
-    /** Returns true if the matrix contains only translation, rotation or scale
+    /** Returns true if the matrix contains only translation, rotation/reflection or scale
         (non-uniform scale is allowed).
         Returns false if other transformation types are included or is degenerate
      */
@@ -132,8 +150,8 @@ public:
     SkScalar getSkewX() const { return fMat[kMSkewX]; }
     SkScalar getTranslateX() const { return fMat[kMTransX]; }
     SkScalar getTranslateY() const { return fMat[kMTransY]; }
-    SkPersp getPerspX() const { return fMat[kMPersp0]; }
-    SkPersp getPerspY() const { return fMat[kMPersp1]; }
+    SkScalar getPerspX() const { return fMat[kMPersp0]; }
+    SkScalar getPerspY() const { return fMat[kMPersp1]; }
 
     SkScalar& operator[](int index) {
         SkASSERT((unsigned)index < 9);
@@ -153,12 +171,12 @@ public:
     void setSkewX(SkScalar v) { this->set(kMSkewX, v); }
     void setTranslateX(SkScalar v) { this->set(kMTransX, v); }
     void setTranslateY(SkScalar v) { this->set(kMTransY, v); }
-    void setPerspX(SkPersp v) { this->set(kMPersp0, v); }
-    void setPerspY(SkPersp v) { this->set(kMPersp1, v); }
+    void setPerspX(SkScalar v) { this->set(kMPersp0, v); }
+    void setPerspY(SkScalar v) { this->set(kMPersp1, v); }
 
-    void setAll(SkScalar scaleX, SkScalar skewX, SkScalar transX,
-                SkScalar skewY, SkScalar scaleY, SkScalar transY,
-                SkPersp persp0, SkPersp persp1, SkPersp persp2) {
+    void setAll(SkScalar scaleX, SkScalar skewX,  SkScalar transX,
+                SkScalar skewY,  SkScalar scaleY, SkScalar transY,
+                SkScalar persp0, SkScalar persp1, SkScalar persp2) {
         fMat[kMScaleX] = scaleX;
         fMat[kMSkewX]  = skewX;
         fMat[kMTransX] = transX;
@@ -171,6 +189,23 @@ public:
         this->setTypeMask(kUnknown_Mask);
     }
 
+    /**
+     *  Copy the 9 scalars for this matrix into buffer, in the same order as the kMScaleX
+     *  enum... scalex, skewx, transx, skewy, scaley, transy, persp0, persp1, persp2
+     */
+    void get9(SkScalar buffer[9]) const {
+        memcpy(buffer, fMat, 9 * sizeof(SkScalar));
+    }
+
+    /**
+     *  Set this matrix to the 9 scalars from the buffer, in the same order as the kMScaleX
+     *  enum... scalex, skewx, transx, skewy, scaley, transy, persp0, persp1, persp2
+     *
+     *  Note: calling set9 followed by get9 may not return the exact same values. Since the matrix
+     *  is used to map non-homogeneous coordinates, it is free to rescale the 9 values as needed.
+     */
+    void set9(const SkScalar buffer[9]);
+
     /** Set the matrix to identity
     */
     void reset();
@@ -211,6 +246,9 @@ public:
     /** Set the matrix to rotate by the specified sine and cosine values.
     */
     void setSinCos(SkScalar sinValue, SkScalar cosValue);
+
+    SkMatrix& setRSXform(const SkRSXform&);
+
     /** Set the matrix to skew by sx and sy, with a pivot point at (px, py).
         The pivot point is the coordinate that should remain unchanged by the
         specified transformation.
@@ -332,6 +370,11 @@ public:
         @return true if the matrix can be represented by the rectangle mapping.
     */
     bool setRectToRect(const SkRect& src, const SkRect& dst, ScaleToFit stf);
+    static SkMatrix MakeRectToRect(const SkRect& src, const SkRect& dst, ScaleToFit stf) {
+        SkMatrix m;
+        m.setRectToRect(src, dst, stf);
+        return m;
+    }
 
     /** Set the matrix such that the specified src points would map to the
         specified dst points. count must be within [0..4].
@@ -349,7 +392,7 @@ public:
     bool SK_WARN_UNUSED_RESULT invert(SkMatrix* inverse) const {
         // Allow the trivial case to be inlined.
         if (this->isIdentity()) {
-            if (NULL != inverse) {
+            if (inverse) {
                 inverse->reset();
             }
             return true;
@@ -369,7 +412,12 @@ public:
         and does not change the passed array.
         @param affine  The array to fill with affine values. Ignored if NULL.
     */
-    bool asAffine(SkScalar affine[6]) const;
+    bool SK_WARN_UNUSED_RESULT asAffine(SkScalar affine[6]) const;
+
+    /** Set the matrix to the specified affine values.
+     *  Note: these are passed in column major order.
+     */
+    void setAffine(const SkScalar affine[6]);
 
     /** Apply this matrix to the array of points specified by src, and write
         the transformed points into the array of points specified by dst.
@@ -381,7 +429,12 @@ public:
         @param count The number of points in src to read, and then transform
                      into dst.
     */
-    void mapPoints(SkPoint dst[], const SkPoint src[], int count) const;
+    void mapPoints(SkPoint dst[], const SkPoint src[], int count) const {
+        SkASSERT((dst && src && count > 0) || 0 == count);
+        // no partial overlap
+        SkASSERT(src == dst || &dst[count] <= &src[0] || &src[count] <= &dst[0]);
+        this->getMapPtsProc()(*this, dst, src, count);
+    }
 
     /** Apply this matrix to the array of points, overwriting it with the
         transformed values.
@@ -437,6 +490,12 @@ public:
         this->getMapXYProc()(*this, x, y, result);
     }
 
+    SkPoint mapXY(SkScalar x, SkScalar y) const {
+        SkPoint result;
+        this->getMapXYProc()(*this, x, y, &result);
+        return result;
+    }
+
     /** Apply this matrix to the array of vectors specified by src, and write
         the transformed vectors into the array of vectors specified by dst.
         This is similar to mapPoints, but ignores any translation in the matrix.
@@ -460,6 +519,17 @@ public:
         this->mapVectors(vecs, vecs, count);
     }
 
+    void mapVector(SkScalar dx, SkScalar dy, SkVector* result) const {
+        SkVector vec = { dx, dy };
+        this->mapVectors(result, &vec, 1);
+    }
+
+    SkVector mapVector(SkScalar dx, SkScalar dy) const {
+        SkVector vec = { dx, dy };
+        this->mapVectors(&vec, &vec, 1);
+        return vec;
+    }
+
     /** Apply this matrix to the src rectangle, and write the transformed
         rectangle into dst. This is accomplished by transforming the 4 corners
         of src, and then setting dst to the bounds of those points.
@@ -539,8 +609,8 @@ public:
         return 0 == memcmp(fMat, m.fMat, sizeof(fMat));
     }
 
-    friend bool operator==(const SkMatrix& a, const SkMatrix& b);
-    friend bool operator!=(const SkMatrix& a, const SkMatrix& b) {
+    friend SK_API bool operator==(const SkMatrix& a, const SkMatrix& b);
+    friend SK_API bool operator!=(const SkMatrix& a, const SkMatrix& b) {
         return !(a == b);
     }
 
@@ -560,8 +630,8 @@ public:
      */
     size_t readFromMemory(const void* buffer, size_t length);
 
-    SkDEVCODE(void dump() const;)
-    SK_TO_STRING_NONVIRT()
+    void dump() const;
+    void toString(SkString*) const;
 
     /**
      * Calculates the minimum scaling factor of the matrix as computed from the SVD of the upper
@@ -586,6 +656,19 @@ public:
      */
     bool getMinMaxScales(SkScalar scaleFactors[2]) const;
 
+    /**
+     *  Attempt to decompose this matrix into a scale-only component and whatever remains, where
+     *  the scale component is to be applied first.
+     *
+     *  M -> Remaining * Scale
+     *
+     *  On success, return true and assign the scale and remaining components (assuming their
+     *  respective parameters are not null). On failure return false and ignore the parameters.
+     *
+     *  Possible reasons to fail: perspective, one or more scale factors are zero.
+     */
+    bool decomposeScale(SkSize* scale, SkMatrix* remaining = NULL) const;
+
     /**
      *  Return a reference to a const identity matrix
      */
@@ -644,7 +727,36 @@ private:
     };
 
     SkScalar         fMat[9];
-    mutable SkTRacy<uint32_t> fTypeMask;
+    mutable uint32_t fTypeMask;
+
+    /** Are all elements of the matrix finite?
+     */
+    bool isFinite() const { return SkScalarsAreFinite(fMat, 9); }
+
+    static void ComputeInv(SkScalar dst[9], const SkScalar src[9], double invDet, bool isPersp);
+
+    void setScaleTranslate(SkScalar sx, SkScalar sy, SkScalar tx, SkScalar ty) {
+        fMat[kMScaleX] = sx;
+        fMat[kMSkewX]  = 0;
+        fMat[kMTransX] = tx;
+
+        fMat[kMSkewY]  = 0;
+        fMat[kMScaleY] = sy;
+        fMat[kMTransY] = ty;
+
+        fMat[kMPersp0] = 0;
+        fMat[kMPersp1] = 0;
+        fMat[kMPersp2] = 1;
+
+        unsigned mask = 0;
+        if (sx != 1 || sy != 1) {
+            mask |= kScale_Mask;
+        }
+        if (tx || ty) {
+            mask |= kTranslate_Mask;
+        }
+        this->setTypeMask(mask | kRectStaysRect_Mask);
+    }
 
     uint8_t computeTypeMask() const;
     uint8_t computePerspectiveTypeMask() const;
@@ -707,14 +819,14 @@ private:
     static void Scale_pts(const SkMatrix&, SkPoint dst[], const SkPoint[], int);
     static void ScaleTrans_pts(const SkMatrix&, SkPoint dst[], const SkPoint[],
                                int count);
-    static void Rot_pts(const SkMatrix&, SkPoint dst[], const SkPoint[], int);
-    static void RotTrans_pts(const SkMatrix&, SkPoint dst[], const SkPoint[],
-                             int count);
     static void Persp_pts(const SkMatrix&, SkPoint dst[], const SkPoint[], int);
 
+    static void Affine_vpts(const SkMatrix&, SkPoint dst[], const SkPoint[], int);
+
     static const MapPtsProc gMapPtsProcs[];
 
     friend class SkPerspIter;
 };
+SK_END_REQUIRE_DENSE
 
 #endif
diff --git a/gfx/skia/skia/include/core/SkMetaData.h b/gfx/skia/skia/include/core/SkMetaData.h
index 5db437c980e1..c8ca7f141993 100644
--- a/gfx/skia/skia/include/core/SkMetaData.h
+++ b/gfx/skia/skia/include/core/SkMetaData.h
@@ -81,7 +81,7 @@ public:
     bool hasData(const char name[], const void* data, size_t byteCount) const {
         size_t len;
         const void* ptr = this->findData(name, &len);
-        return NULL != ptr && len == byteCount && !memcmp(ptr, data, len);
+        return ptr && len == byteCount && !memcmp(ptr, data, len);
     }
 
     void setS32(const char name[], int32_t value);
diff --git a/gfx/skia/skia/include/core/SkMultiPictureDraw.h b/gfx/skia/skia/include/core/SkMultiPictureDraw.h
new file mode 100644
index 000000000000..8d24e615e82c
--- /dev/null
+++ b/gfx/skia/skia/include/core/SkMultiPictureDraw.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkMultiPictureDraw_DEFINED
+#define SkMultiPictureDraw_DEFINED
+
+#include "SkMatrix.h"
+#include "SkTDArray.h"
+
+class SkCanvas;
+class SkPaint;
+class SkPicture;
+
+/** \class SkMultiPictureDraw
+
+    The MultiPictureDraw object accepts several picture/canvas pairs and
+    then attempts to optimally draw the pictures into the canvases, sharing
+    as many resources as possible.
+*/
+class SK_API SkMultiPictureDraw {
+public:
+    /**
+     *  Create an object to optimize the drawing of multiple pictures.
+     *  @param reserve Hint for the number of add calls expected to be issued
+     */
+    SkMultiPictureDraw(int reserve = 0);
+    ~SkMultiPictureDraw() { this->reset(); }
+
+    /**
+     *  Add a canvas/picture pair for later rendering.
+     *  @param canvas   the canvas in which to draw picture
+     *  @param picture  the picture to draw into canvas
+     *  @param matrix   if non-NULL, applied to the CTM when drawing
+     *  @param paint    if non-NULL, draw picture to a temporary buffer
+     *                  and then apply the paint when the result is drawn
+     */
+    void add(SkCanvas* canvas,
+             const SkPicture* picture,
+             const SkMatrix* matrix = NULL,
+             const SkPaint* paint = NULL);
+
+    /**
+     *  Perform all the previously added draws. This will reset the state
+     *  of this object. If flush is true, all canvases are flushed after
+     *  draw.
+     */
+    void draw(bool flush = false);
+
+    /**
+     *  Abandon all buffered draws and reset to the initial state.
+     */
+    void reset();
+
+private:
+    struct DrawData {
+        SkCanvas*        fCanvas;  // reffed
+        const SkPicture* fPicture; // reffed
+        SkMatrix         fMatrix;
+        SkPaint*         fPaint;   // owned
+
+        void init(SkCanvas*, const SkPicture*, const SkMatrix*, const SkPaint*);
+        void draw();
+
+        static void Reset(SkTDArray<DrawData>&);
+    };
+
+    SkTDArray<DrawData> fThreadSafeDrawData;
+    SkTDArray<DrawData> fGPUDrawData;
+};
+
+#endif
diff --git a/gfx/skia/skia/include/core/SkOSFile.h b/gfx/skia/skia/include/core/SkOSFile.h
index 1ca11ee932ad..39a16464583b 100644
--- a/gfx/skia/skia/include/core/SkOSFile.h
+++ b/gfx/skia/skia/include/core/SkOSFile.h
@@ -12,16 +12,10 @@
 #ifndef SkOSFile_DEFINED
 #define SkOSFile_DEFINED
 
+#include <stdio.h>
+
 #include "SkString.h"
 
-#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_IOS)
-    #include <dirent.h>
-#endif
-
-#include <stddef.h> // ptrdiff_t
-
-struct SkFILE;
-
 enum SkFILE_Flags {
     kRead_SkFILE_Flag   = 0x01,
     kWrite_SkFILE_Flag  = 0x02
@@ -33,30 +27,30 @@ const static char SkPATH_SEPARATOR = '\\';
 const static char SkPATH_SEPARATOR = '/';
 #endif
 
-SkFILE* sk_fopen(const char path[], SkFILE_Flags);
-void    sk_fclose(SkFILE*);
+FILE* sk_fopen(const char path[], SkFILE_Flags);
+void    sk_fclose(FILE*);
 
-size_t  sk_fgetsize(SkFILE*);
+size_t  sk_fgetsize(FILE*);
 /** Return true if the file could seek back to the beginning
 */
-bool    sk_frewind(SkFILE*);
+bool    sk_frewind(FILE*);
 
-size_t  sk_fread(void* buffer, size_t byteCount, SkFILE*);
-size_t  sk_fwrite(const void* buffer, size_t byteCount, SkFILE*);
+size_t  sk_fread(void* buffer, size_t byteCount, FILE*);
+size_t  sk_fwrite(const void* buffer, size_t byteCount, FILE*);
 
-char*   sk_fgets(char* str, int size, SkFILE* f);
+char*   sk_fgets(char* str, int size, FILE* f);
 
-void    sk_fflush(SkFILE*);
+void    sk_fflush(FILE*);
 
-bool    sk_fseek(SkFILE*, size_t);
-bool    sk_fmove(SkFILE*, long);
-size_t  sk_ftell(SkFILE*);
+bool    sk_fseek(FILE*, size_t);
+bool    sk_fmove(FILE*, long);
+size_t  sk_ftell(FILE*);
 
 /** Maps a file into memory. Returns the address and length on success, NULL otherwise.
  *  The mapping is read only.
  *  When finished with the mapping, free the returned pointer with sk_fmunmap.
  */
-void*   sk_fmmap(SkFILE* f, size_t* length);
+void*   sk_fmmap(FILE* f, size_t* length);
 
 /** Maps a file descriptor into memory. Returns the address and length on success, NULL otherwise.
  *  The mapping is read only.
@@ -70,12 +64,12 @@ void*   sk_fdmmap(int fd, size_t* length);
 void    sk_fmunmap(const void* addr, size_t length);
 
 /** Returns true if the two point at the exact same filesystem object. */
-bool    sk_fidentical(SkFILE* a, SkFILE* b);
+bool    sk_fidentical(FILE* a, FILE* b);
 
 /** Returns the underlying file descriptor for the given file.
  *  The return value will be < 0 on failure.
  */
-int     sk_fileno(SkFILE* f);
+int     sk_fileno(FILE* f);
 
 /** Returns true if something (file, directory, ???) exists at this path,
  *  and has the specified access flags.
@@ -86,7 +80,7 @@ bool    sk_exists(const char *path, SkFILE_Flags = (SkFILE_Flags)0);
 bool    sk_isdir(const char *path);
 
 // Have we reached the end of the file?
-int sk_feof(SkFILE *);
+int sk_feof(FILE *);
 
 
 // Create a new directory at this path; returns true if successful.
@@ -109,21 +103,16 @@ public:
         */
         bool next(SkString* name, bool getDir = false);
 
+        static const size_t kStorageSize = 40;
     private:
-#ifdef SK_BUILD_FOR_WIN
-        HANDLE      fHandle;
-        uint16_t*   fPath16;
-#elif defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_IOS)
-        DIR*        fDIR;
-        SkString    fPath, fSuffix;
-#endif
+        SkAlignedSStorage<kStorageSize> fSelf;
     };
 };
 
 /**
  *  Functions for modifying SkStrings which represent paths on the filesystem.
  */
-class SkOSPath {
+class SkOSPath   {
 public:
     /**
      * Assembles rootPath and relativePath into a single path, like this:
@@ -133,7 +122,7 @@ public:
      *
      * Uses SkPATH_SEPARATOR, to work on all platforms.
      */
-    static SkString SkPathJoin(const char *rootPath, const char *relativePath);
+    static SkString Join(const char* rootPath, const char* relativePath);
 
     /**
      *  Return the name of the file, ignoring the directory structure.
@@ -143,6 +132,17 @@ public:
      *  @return SkString The basename of the file - anything beyond the
      *      final slash, or the full name if there is no slash.
      */
-    static SkString SkBasename(const char* fullPath);
+    static SkString Basename(const char* fullPath);
+
+    /**
+     *  Given a qualified file name returns the directory.
+     *  Behaves like python's os.path.dirname. If the fullPath is
+     *  /dir/subdir/ the return will be /dir/subdir/
+     *  @param fullPath Full path to the file.
+     *  @return SkString The dir containing the file - anything preceding the
+     *      final slash, or the full name if ending in a slash.
+     */
+    static SkString Dirname(const char* fullPath);
 };
+
 #endif
diff --git a/gfx/skia/skia/include/core/SkPackBits.h b/gfx/skia/skia/include/core/SkPackBits.h
index f0614a084344..1e32ee087550 100644
--- a/gfx/skia/skia/include/core/SkPackBits.h
+++ b/gfx/skia/skia/include/core/SkPackBits.h
@@ -14,66 +14,33 @@
 
 class SkPackBits {
 public:
-    /** Given the number of 16bit values that will be passed to Pack16,
-        returns the worst-case size needed for the dst[] buffer.
-    */
-    static size_t ComputeMaxSize16(int count);
-
     /** Given the number of 8bit values that will be passed to Pack8,
         returns the worst-case size needed for the dst[] buffer.
     */
     static size_t ComputeMaxSize8(int count);
 
-    /** Write the src array into a packed format. The packing process may end
-        up writing more bytes than it read, so dst[] must be large enough.
-        @param src      Input array of 16bit values
-        @param count    Number of entries in src[]
-        @param dst      Buffer (allocated by caller) to write the packed data
-                        into
-        @return the number of bytes written to dst[]
-    */
-    static size_t Pack16(const uint16_t src[], int count, uint8_t dst[]);
-
     /** Write the src array into a packed format. The packing process may end
         up writing more bytes than it read, so dst[] must be large enough.
         @param src      Input array of 8bit values
-        @param count    Number of entries in src[]
+        @param srcSize  Number of entries in src[]
         @param dst      Buffer (allocated by caller) to write the packed data
                         into
+        @param dstSize  Number of bytes in the output buffer.
         @return the number of bytes written to dst[]
     */
-    static size_t Pack8(const uint8_t src[], int count, uint8_t dst[]);
-
-    /** Unpack the data in src[], and expand it into dst[]. The src[] data was
-        written by a previous call to Pack16.
-        @param src  Input data to unpack, previously created by Pack16.
-        @param srcSize  Number of bytes of src to unpack
-        @param dst  Buffer (allocated by caller) to expand the src[] into.
-        @return the number of dst elements (not bytes) written into dst.
-    */
-    static int Unpack16(const uint8_t src[], size_t srcSize, uint16_t dst[]);
+    static size_t Pack8(const uint8_t src[], size_t srcSize, uint8_t dst[],
+                        size_t dstSize);
 
     /** Unpack the data in src[], and expand it into dst[]. The src[] data was
         written by a previous call to Pack8.
         @param src      Input data to unpack, previously created by Pack8.
         @param srcSize  Number of bytes of src to unpack
         @param dst      Buffer (allocated by caller) to expand the src[] into.
+        @param dstSize  Number of bytes in the output buffer.
         @return the number of bytes written into dst.
     */
-    static int Unpack8(const uint8_t src[], size_t srcSize, uint8_t dst[]);
-
-    /** Unpack the data from src[], skip the first dstSkip bytes, then write
-        dstWrite bytes into dst[]. The src[] data was written by a previous
-        call to Pack8. Return the number of bytes actually writtten into dst[]
-        @param src      Input data to unpack, previously created by Pack8.
-        @param dst      Buffer (allocated by caller) to expand the src[] into.
-        @param dstSkip  Number of bytes of unpacked src to skip before writing
-                        into dst
-        @param dstWrite Number of bytes of unpacked src to write into dst (after
-                        skipping dstSkip bytes)
-    */
-    static void Unpack8(uint8_t dst[], size_t dstSkip, size_t dstWrite,
-                        const uint8_t src[]);
+    static int Unpack8(const uint8_t src[], size_t srcSize, uint8_t dst[],
+                       size_t dstSize);
 };
 
 #endif
diff --git a/gfx/skia/skia/include/core/SkPaint.h b/gfx/skia/skia/include/core/SkPaint.h
index 3874d98869c4..2090ed23377c 100644
--- a/gfx/skia/skia/include/core/SkPaint.h
+++ b/gfx/skia/skia/include/core/SkPaint.h
@@ -1,5 +1,3 @@
-
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -7,26 +5,24 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkPaint_DEFINED
 #define SkPaint_DEFINED
 
 #include "SkColor.h"
-#include "SkDrawLooper.h"
+#include "SkFilterQuality.h"
 #include "SkMatrix.h"
 #include "SkXfermode.h"
-#ifdef SK_BUILD_FOR_ANDROID
-#include "SkPaintOptionsAndroid.h"
-#endif
 
 class SkAnnotation;
+class SkAutoDescriptor;
 class SkAutoGlyphCache;
 class SkColorFilter;
+class SkData;
 class SkDescriptor;
-struct SkDeviceProperties;
+class SkDrawLooper;
 class SkReadBuffer;
 class SkWriteBuffer;
-struct SkGlyph;
+class SkGlyph;
 struct SkRect;
 class SkGlyphCache;
 class SkImageFilter;
@@ -36,6 +32,7 @@ class SkPathEffect;
 struct SkPoint;
 class SkRasterizer;
 class SkShader;
+class SkSurfaceProps;
 class SkTypeface;
 
 typedef const SkGlyph& (*SkDrawCacheProc)(SkGlyphCache*, const char**,
@@ -59,11 +56,20 @@ public:
 
     SkPaint& operator=(const SkPaint&);
 
+    /** operator== may give false negatives: two paints that draw equivalently
+        may return false.  It will never give false positives: two paints that
+        are not equivalent always return false.
+    */
     SK_API friend bool operator==(const SkPaint& a, const SkPaint& b);
     friend bool operator!=(const SkPaint& a, const SkPaint& b) {
         return !(a == b);
     }
 
+    /** getHash() is a shallow hash, with the same limitations as operator==.
+     *  If operator== returns true for two paints, getHash() returns the same value for each.
+     */
+    uint32_t getHash() const;
+
     void flatten(SkWriteBuffer&) const;
     void unflatten(SkReadBuffer&);
 
@@ -110,8 +116,6 @@ public:
         kAutoHinting_Flag     = 0x800,  //!< mask to force Freetype's autohinter
         kVerticalText_Flag    = 0x1000,
         kGenA8FromLCD_Flag    = 0x2000, // hack for GDI -- do not use if you can help it
-        kDistanceFieldTextTEMP_Flag = 0x4000, //!< TEMPORARY mask to enable distance fields
-                                              // currently overrides LCD and subpixel rendering
         // when adding extra flags, note that the fFlags member is specified
         // with a bit-width and you'll have to expand it.
 
@@ -278,56 +282,19 @@ public:
     */
     void setDevKernText(bool devKernText);
 
-    /** Helper for getFlags(), returns true if kDistanceFieldTextTEMP_Flag bit is set
-     @return true if the distanceFieldText bit is set in the paint's flags.
-     */
-    bool isDistanceFieldTextTEMP() const {
-        return SkToBool(this->getFlags() & kDistanceFieldTextTEMP_Flag);
-    }
-
-    /** Helper for setFlags(), setting or clearing the kDistanceFieldTextTEMP_Flag bit
-     @param distanceFieldText true to set the kDistanceFieldTextTEMP_Flag bit in the paint's
-     flags, false to clear it.
-     */
-    void setDistanceFieldTextTEMP(bool distanceFieldText);
-
-    enum FilterLevel {
-        kNone_FilterLevel,
-        kLow_FilterLevel,
-        kMedium_FilterLevel,
-        kHigh_FilterLevel
-    };
-
     /**
      *  Return the filter level. This affects the quality (and performance) of
      *  drawing scaled images.
      */
-    FilterLevel getFilterLevel() const {
-      return (FilterLevel)fBitfields.fFilterLevel;
+    SkFilterQuality getFilterQuality() const {
+        return (SkFilterQuality)fBitfields.fFilterQuality;
     }
 
     /**
-     *  Set the filter level. This affects the quality (and performance) of
+     *  Set the filter quality. This affects the quality (and performance) of
      *  drawing scaled images.
      */
-    void setFilterLevel(FilterLevel);
-
-    /**
-     *  If the predicate is true, set the filterLevel to Low, else set it to
-     *  None.
-     */
-    SK_ATTR_DEPRECATED("use setFilterLevel")
-    void setFilterBitmap(bool doFilter) {
-        this->setFilterLevel(doFilter ? kLow_FilterLevel : kNone_FilterLevel);
-    }
-
-    /**
-     *  Returns true if getFilterLevel() returns anything other than None.
-     */
-    SK_ATTR_DEPRECATED("use getFilterLevel")
-    bool isFilterBitmap() const {
-        return kNone_FilterLevel != this->getFilterLevel();
-    }
+    void setFilterQuality(SkFilterQuality quality);
 
     /** Styles apply to rect, oval, path, and text.
         Bitmaps are always drawn in "fill", and lines are always drawn in
@@ -431,6 +398,15 @@ public:
     /** Cap enum specifies the settings for the paint's strokecap. This is the
         treatment that is applied to the beginning and end of each non-closed
         contour (e.g. lines).
+
+        If the cap is round or square, the caps are drawn when the contour has
+        a zero length. Zero length contours can be created by following moveTo
+        with a lineTo at the same point, or a moveTo followed by a close.
+
+        A dash with an on interval of zero also creates a zero length contour.
+
+        The zero length contour draws the square cap without rotation, since
+        the no direction can be inferred.
     */
     enum Cap {
         kButt_Cap,      //!< begin/end contours with no extension
@@ -487,11 +463,17 @@ public:
      *  @param src  input path
      *  @param dst  output path (may be the same as src)
      *  @param cullRect If not null, the dst path may be culled to this rect.
+     *  @param resScale If > 1, increase precision, else if (0 < res < 1) reduce precision
+     *              in favor of speed/size.
      *  @return     true if the path should be filled, or false if it should be
      *              drawn with a hairline (width == 0)
      */
-    bool getFillPath(const SkPath& src, SkPath* dst,
-                     const SkRect* cullRect = NULL) const;
+    bool getFillPath(const SkPath& src, SkPath* dst, const SkRect* cullRect,
+                     SkScalar resScale = 1) const;
+
+    bool getFillPath(const SkPath& src, SkPath* dst) const {
+        return this->getFillPath(src, dst, NULL, 1);
+    }
 
     /** Get the paint's shader object.
         <p />
@@ -841,8 +823,7 @@ public:
         to zero. Note: this does not look at the text-encoding setting in the
         paint, only at the typeface.
     */
-    void glyphsToUnichars(const uint16_t glyphs[], int count,
-                          SkUnichar text[]) const;
+    void glyphsToUnichars(const uint16_t glyphs[], int count, SkUnichar text[]) const;
 
     /** Return the number of drawable units in the specified text buffer.
         This looks at the current TextEncoding field of the paint. If you also
@@ -861,12 +842,9 @@ public:
      *  @param length       Number of bytes of text to measure
      *  @param bounds       If not NULL, returns the bounds of the text,
      *                      relative to (0, 0).
-     *  @param scale        If not 0, return width as if the canvas were scaled
-     *                      by this value
      *  @return             The advance width of the text
      */
-    SkScalar measureText(const void* text, size_t length,
-                         SkRect* bounds, SkScalar scale = 0) const;
+    SkScalar measureText(const void* text, size_t length, SkRect* bounds) const;
 
     /** Return the width of the text. This will return the vertical measure
      *  if isVerticalText() is true, in which case the returned value should
@@ -877,22 +855,9 @@ public:
      *  @return         The advance width of the text
      */
     SkScalar measureText(const void* text, size_t length) const {
-        return this->measureText(text, length, NULL, 0);
+        return this->measureText(text, length, NULL);
     }
 
-    /** Specify the direction the text buffer should be processed in breakText()
-    */
-    enum TextBufferDirection {
-        /** When measuring text for breakText(), begin at the start of the text
-            buffer and proceed forward through the data. This is the default.
-        */
-        kForward_TextBufferDirection,
-        /** When measuring text for breakText(), begin at the end of the text
-            buffer and proceed backwards through the data.
-        */
-        kBackward_TextBufferDirection
-    };
-
     /** Return the number of bytes of text that were measured. If
      *  isVerticalText() is true, then the vertical advances are used for
      *  the measurement.
@@ -903,15 +868,11 @@ public:
      *                  widths are <= maxWidth are measured.
      *  @param measuredWidth Optional. If non-null, this returns the actual
      *                  width of the measured text.
-     *  @param tbd      Optional. The direction the text buffer should be
-     *                  traversed during measuring.
      *  @return         The number of bytes of text that were measured. Will be
      *                  <= length.
      */
     size_t  breakText(const void* text, size_t length, SkScalar maxWidth,
-                      SkScalar* measuredWidth = NULL,
-                      TextBufferDirection tbd = kForward_TextBufferDirection)
-                      const;
+                      SkScalar* measuredWidth = NULL) const;
 
     /** Return the advances for the text. These will be vertical advances if
      *  isVerticalText() returns true.
@@ -938,19 +899,13 @@ public:
     void getPosTextPath(const void* text, size_t length,
                         const SkPoint pos[], SkPath* path) const;
 
-#ifdef SK_BUILD_FOR_ANDROID
-    uint32_t getGenerationID() const;
-    void setGenerationID(uint32_t generationID);
-
-    /** Returns the base glyph count for the strike associated with this paint
-    */
-    unsigned getBaseGlyphCount(SkUnichar text) const;
-
-    const SkPaintOptionsAndroid& getPaintOptionsAndroid() const {
-        return fPaintOptionsAndroid;
-    }
-    void setPaintOptionsAndroid(const SkPaintOptionsAndroid& options);
-#endif
+    /**
+     *  Return a rectangle that represents the union of the bounds of all
+     *  of the glyphs, but each one positioned at (0,0). This may be conservatively large, and
+     *  will not take into account any hinting, but will respect any text-scale-x or text-skew-x
+     *  on this paint.
+     */
+    SkRect getFontBounds() const;
 
     // returns true if the paint's settings (e.g. xfermode + alpha) resolve to
     // mean that we need not draw at all (e.g. SrcOver + 0-alpha)
@@ -963,12 +918,7 @@ public:
      bounds (i.e. there is nothing complex like a patheffect that would make
      the bounds computation expensive.
      */
-    bool canComputeFastBounds() const {
-        if (this->getLooper()) {
-            return this->getLooper()->canComputeFastBounds(*this);
-        }
-        return !this->getRasterizer();
-    }
+    bool canComputeFastBounds() const;
 
     /** Only call this if canComputeFastBounds() returned true. This takes a
      raw rectangle (the raw bounds of a shape), and adjusts it for stylistic
@@ -1035,11 +985,6 @@ public:
 
     SK_TO_STRING_NONVIRT()
 
-    struct FlatteningTraits {
-        static void Flatten(SkWriteBuffer& buffer, const SkPaint& paint);
-        static void Unflatten(SkReadBuffer& buffer, SkPaint* paint);
-    };
-
 private:
     SkTypeface*     fTypeface;
     SkPathEffect*   fPathEffect;
@@ -1068,28 +1013,38 @@ private:
             unsigned        fStyle : 2;
             unsigned        fTextEncoding : 2;  // 3 values
             unsigned        fHinting : 2;
-            unsigned        fFilterLevel : 2;
+            unsigned        fFilterQuality : 2;
             //unsigned      fFreeBits : 2;
         } fBitfields;
         uint32_t fBitfieldsUInt;
     };
-    uint32_t fDirtyBits;
 
     SkDrawCacheProc    getDrawCacheProc() const;
-    SkMeasureCacheProc getMeasureCacheProc(TextBufferDirection dir,
-                                           bool needFullMetrics) const;
+    SkMeasureCacheProc getMeasureCacheProc(bool needFullMetrics) const;
 
     SkScalar measure_text(SkGlyphCache*, const char* text, size_t length,
                           int* count, SkRect* bounds) const;
 
-    SkGlyphCache* detachCache(const SkDeviceProperties* deviceProperties, const SkMatrix*,
+    /*
+     * Allocs an SkDescriptor on the heap and return it to the caller as a refcnted
+     * SkData.  Caller is responsible for managing the lifetime of this object.
+     */
+    void getScalerContextDescriptor(SkAutoDescriptor*, const SkSurfaceProps& surfaceProps,
+                                    const SkMatrix*, bool ignoreGamma) const;
+
+    SkGlyphCache* detachCache(const SkSurfaceProps* surfaceProps, const SkMatrix*,
                               bool ignoreGamma) const;
 
-    void descriptorProc(const SkDeviceProperties* deviceProperties, const SkMatrix* deviceMatrix,
+    void descriptorProc(const SkSurfaceProps* surfaceProps, const SkMatrix* deviceMatrix,
                         void (*proc)(SkTypeface*, const SkDescriptor*, void*),
-                        void* context, bool ignoreGamma = false) const;
+                        void* context, bool ignoreGamma) const;
 
-    static void Term();
+    /*
+     * The luminance color is used to determine which Gamma Canonical color to map to.  This is
+     * really only used by backends which want to cache glyph masks, and need some way to know if
+     * they need to generate new masks based off a given color.
+     */
+    SkColor computeLuminanceColor() const;
 
     enum {
         /*  This is the size we use when we ask for a glyph's path. We then
@@ -1133,21 +1088,17 @@ private:
     friend class SkAutoGlyphCacheNoGamma;
     friend class SkCanvas;
     friend class SkDraw;
-    friend class SkGraphics; // So Term() can be called.
     friend class SkPDFDevice;
     friend class GrBitmapTextContext;
+    friend class GrAtlasTextContext;
     friend class GrDistanceFieldTextContext;
     friend class GrStencilAndCoverTextContext;
+    friend class GrPathRendering;
+    friend class GrTextContext;
+    friend class GrGLPathRendering;
+    friend class SkScalerContext;
     friend class SkTextToPathIter;
     friend class SkCanonicalizePaint;
-
-#ifdef SK_BUILD_FOR_ANDROID
-    SkPaintOptionsAndroid fPaintOptionsAndroid;
-
-    // In order for the == operator to work properly this must be the last field
-    // in the struct so that we can do a memcmp to this field's offset.
-    uint32_t        fGenerationID;
-#endif
 };
 
 #endif
diff --git a/gfx/skia/skia/include/core/SkPaintOptionsAndroid.h b/gfx/skia/skia/include/core/SkPaintOptionsAndroid.h
deleted file mode 100644
index ab84ec050e35..000000000000
--- a/gfx/skia/skia/include/core/SkPaintOptionsAndroid.h
+++ /dev/null
@@ -1,130 +0,0 @@
-
-/*
- * Copyright 2012 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#ifndef SkPaintOptionsAndroid_DEFINED
-#define SkPaintOptionsAndroid_DEFINED
-
-#include "SkTypes.h"
-#include "SkString.h"
-
-class SkReadBuffer;
-class SkWriteBuffer;
-
-/** \class SkLanguage
-
-    The SkLanguage class represents a human written language, and is used by
-    text draw operations to determine which glyph to draw when drawing
-    characters with variants (ie Han-derived characters).
-*/
-class SkLanguage {
-public:
-    SkLanguage() { }
-    SkLanguage(const SkString& tag) : fTag(tag) { }
-    SkLanguage(const char* tag) : fTag(tag) { }
-    SkLanguage(const char* tag, size_t len) : fTag(tag, len) { }
-    SkLanguage(const SkLanguage& b) : fTag(b.fTag) { }
-
-    /** Gets a BCP 47 language identifier for this SkLanguage.
-        @return a BCP 47 language identifier representing this language
-    */
-    const SkString& getTag() const { return fTag; }
-
-    /** Performs BCP 47 fallback to return an SkLanguage one step more general.
-        @return an SkLanguage one step more general
-    */
-    SkLanguage getParent() const;
-
-    bool operator==(const SkLanguage& b) const {
-        return fTag == b.fTag;
-    }
-    bool operator!=(const SkLanguage& b) const {
-        return fTag != b.fTag;
-    }
-    SkLanguage& operator=(const SkLanguage& b) {
-        fTag = b.fTag;
-        return *this;
-    }
-
-private:
-    //! BCP 47 language identifier
-    SkString fTag;
-};
-
-class SkPaintOptionsAndroid {
-public:
-    SkPaintOptionsAndroid() {
-        fFontVariant = kDefault_Variant;
-        fUseFontFallbacks = false;
-    }
-
-    SkPaintOptionsAndroid& operator=(const SkPaintOptionsAndroid& b) {
-        fLanguage = b.fLanguage;
-        fFontVariant = b.fFontVariant;
-        fUseFontFallbacks = b.fUseFontFallbacks;
-        return *this;
-    }
-
-    bool operator==(const SkPaintOptionsAndroid& b) const {
-        return !(*this != b);
-    }
-
-    bool operator!=(const SkPaintOptionsAndroid& b) const {
-        return fLanguage != b.fLanguage ||
-               fFontVariant != b.fFontVariant ||
-               fUseFontFallbacks != b.fUseFontFallbacks;
-    }
-
-    void flatten(SkWriteBuffer&) const;
-    void unflatten(SkReadBuffer&);
-
-    /** Return the paint's language value used for drawing text.
-        @return the paint's language value used for drawing text.
-    */
-    const SkLanguage& getLanguage() const { return fLanguage; }
-
-    /** Set the paint's language value used for drawing text.
-        @param language set the paint's language value for drawing text.
-    */
-    void setLanguage(const SkLanguage& language) { fLanguage = language; }
-    void setLanguage(const char* languageTag) { fLanguage = SkLanguage(languageTag); }
-
-
-    enum FontVariant {
-       kDefault_Variant = 0x01,
-       kCompact_Variant = 0x02,
-       kElegant_Variant = 0x04,
-       kLast_Variant = kElegant_Variant,
-    };
-
-    /** Return the font variant
-        @return the font variant used by this paint object
-    */
-    FontVariant getFontVariant() const { return fFontVariant; }
-
-    /** Set the font variant
-      @param fontVariant set the paint's font variant for choosing fonts
-    */
-    void setFontVariant(FontVariant fontVariant) {
-        SkASSERT((unsigned)fontVariant <= kLast_Variant);
-        fFontVariant = fontVariant;
-    }
-
-    bool isUsingFontFallbacks() const { return fUseFontFallbacks; }
-
-    void setUseFontFallbacks(bool useFontFallbacks) {
-        fUseFontFallbacks = useFontFallbacks;
-    }
-
-private:
-    SkLanguage fLanguage;
-    FontVariant fFontVariant;
-    bool fUseFontFallbacks;
-};
-
-#endif // #ifndef SkPaintOptionsAndroid_DEFINED
diff --git a/gfx/skia/skia/include/core/SkPatch.h b/gfx/skia/skia/include/core/SkPatch.h
deleted file mode 100644
index 2354423aba21..000000000000
--- a/gfx/skia/skia/include/core/SkPatch.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkPatch_DEFINED
-#define SkPatch_DEFINED
-
-#include "SkColor.h"
-#include "SkPreConfig.h"
-#include "SkPoint.h"
-
-/**
- * Class that represents a coons patch.
- */
-class SK_API SkPatch {
-
-public:
-    /**
-     * Structure that holds the vertex data related to the tessellation of a SkPatch. It is passed 
-     * as a parameter to the function getVertexData which sets the points, colors and texture 
-     * coordinates of the vertices and the indices for them to be drawn as triangles.
-     */
-    struct VertexData {
-        int fVertexCount, fIndexCount;
-        SkPoint* fPoints;
-        SkPoint* fTexCoords;
-        uint32_t* fColors;
-        uint16_t* fIndices;
-        
-        VertexData()
-        : fVertexCount(0)
-        , fIndexCount(0)
-        , fPoints(NULL)
-        , fTexCoords(NULL)
-        , fColors(NULL)
-        , fIndices(NULL) { }
-        
-        ~VertexData() {
-            SkDELETE_ARRAY(fPoints);
-            SkDELETE_ARRAY(fTexCoords);
-            SkDELETE_ARRAY(fColors);
-            SkDELETE_ARRAY(fIndices);
-        }
-    };
-    
-    enum CubicCtrlPts {
-        kTopP0_CubicCtrlPts = 0,
-        kTopP1_CubicCtrlPts = 1,
-        kTopP2_CubicCtrlPts = 2,
-        kTopP3_CubicCtrlPts = 3,
-        
-        kRightP0_CubicCtrlPts = 3,
-        kRightP1_CubicCtrlPts = 4,
-        kRightP2_CubicCtrlPts = 5,
-        kRightP3_CubicCtrlPts = 6,
-        
-        kBottomP0_CubicCtrlPts = 9,
-        kBottomP1_CubicCtrlPts = 8,
-        kBottomP2_CubicCtrlPts = 7,
-        kBottomP3_CubicCtrlPts = 6,
-        
-        kLeftP0_CubicCtrlPts = 0,
-        kLeftP1_CubicCtrlPts = 11,
-        kLeftP2_CubicCtrlPts = 10,
-        kLeftP3_CubicCtrlPts = 9,
-    };
-    
-    /**
-     * Points are in the following order:
-     *              (top curve)
-     *                0 1 2 3
-     * (left curve)  11     4   (right curve)
-     *               10     5
-     *                9 8 7 6
-     *              (bottom curve)
-     * Used pointer to an array to guarantee that this method receives an array of 4 SkColors
-     */
-    SkPatch(SkPoint points[12], SkColor colors[4]);
-
-    /**
-     * Function that evaluates the coons patch interpolation.
-     * data refers to the pointer of the PatchData struct in which the tessellation data is set.
-     * divisions defines the number of steps in which the SkPatch is going to be subdivided per
-     * axis.
-     */
-    bool getVertexData(SkPatch::VertexData* data, int divisions);
-
-    void getTopPoints(SkPoint points[4]) {
-        points[0] = fCtrlPoints[kTopP0_CubicCtrlPts];
-        points[1] = fCtrlPoints[kTopP1_CubicCtrlPts];
-        points[2] = fCtrlPoints[kTopP2_CubicCtrlPts];
-        points[3] = fCtrlPoints[kTopP3_CubicCtrlPts];
-    }
-    
-    void getBottomPoints(SkPoint points[4]) {
-        points[0] = fCtrlPoints[kBottomP0_CubicCtrlPts];
-        points[1] = fCtrlPoints[kBottomP1_CubicCtrlPts];
-        points[2] = fCtrlPoints[kBottomP2_CubicCtrlPts];
-        points[3] = fCtrlPoints[kBottomP3_CubicCtrlPts];
-    }
-
-    void getLeftPoints(SkPoint points[4]) {
-        points[0] = fCtrlPoints[kLeftP0_CubicCtrlPts];
-        points[1] = fCtrlPoints[kLeftP1_CubicCtrlPts];
-        points[2] = fCtrlPoints[kLeftP2_CubicCtrlPts];
-        points[3] = fCtrlPoints[kLeftP3_CubicCtrlPts];
-    }
-
-    void getRightPoints(SkPoint points[4]) {
-        points[0] = fCtrlPoints[kRightP0_CubicCtrlPts];
-        points[1] = fCtrlPoints[kRightP1_CubicCtrlPts];
-        points[2] = fCtrlPoints[kRightP2_CubicCtrlPts];
-        points[3] = fCtrlPoints[kRightP3_CubicCtrlPts];
-    }
-    
-private:
-    SkPoint fCtrlPoints[12];
-    SkPMColor fCornerColors[4];
-};
-
-#endif
diff --git a/gfx/skia/skia/include/core/SkPath.h b/gfx/skia/skia/include/core/SkPath.h
index bccc8d52c992..33db8ac24962 100644
--- a/gfx/skia/skia/include/core/SkPath.h
+++ b/gfx/skia/skia/include/core/SkPath.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,11 +5,9 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkPath_DEFINED
 #define SkPath_DEFINED
 
-#include "SkInstCnt.h"
 #include "SkMatrix.h"
 #include "SkPathRef.h"
 #include "SkTDArray.h"
@@ -30,8 +27,6 @@ class SkWStream;
 */
 class SK_API SkPath {
 public:
-    SK_DECLARE_INST_COUNT_ROOT(SkPath);
-
     SkPath();
     SkPath(const SkPath&);
     ~SkPath();
@@ -42,6 +37,11 @@ public:
         return !(a == b);
     }
 
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+    /** Returns true if the caller is the only owner of the underlying path data */
+    bool unique() const { return fPathRef->unique(); }
+#endif
+
     enum FillType {
         /** Specifies that "inside" is computed by a non-zero sum of signed
             edge crossings
@@ -154,6 +154,17 @@ public:
      */
     bool isOval(SkRect* rect) const { return fPathRef->isOval(rect); }
 
+    /** Returns true if the path is a round rect.
+     *
+     * @param rrect  Returns the bounding rect and radii of this round rect.
+     *
+     * @return true if this path is a round rect.
+     *              Tracking whether a path is a round rect is considered an
+     *              optimization for performance and so some paths that are in
+     *              fact round rects can report false.
+     */
+    bool isRRect(SkRRect* rrect) const { return fPathRef->isRRect(rrect); }
+
     /** Clear any lines and curves from the path, making it empty. This frees up
         internal storage associated with those segments.
         On Android, does not change fSourcePath.
@@ -185,12 +196,29 @@ public:
         return fPathRef->isFinite();
     }
 
+    /** Returns true if the path is volatile (i.e. should not be cached by devices.)
+     */
+    bool isVolatile() const {
+        return SkToBool(fIsVolatile);
+    }
+
+    /** Specify whether this path is volatile. Paths are not volatile by
+     default. Temporary paths that are discarded or modified after use should be
+     marked as volatile. This provides a hint to the device that the path
+     should not be cached. Providing this hint when appropriate can
+     improve performance by avoiding unnecessary overhead and resource
+     consumption on the device.
+     */
+    void setIsVolatile(bool isVolatile) {
+        fIsVolatile = isVolatile;
+    }
+
     /** Test a line for zero length
 
         @return true if the line is of zero length; otherwise false.
     */
-    static bool IsLineDegenerate(const SkPoint& p1, const SkPoint& p2) {
-        return p1.equalsWithinTolerance(p2);
+    static bool IsLineDegenerate(const SkPoint& p1, const SkPoint& p2, bool exact) {
+        return exact ? p1 == p2 : p1.equalsWithinTolerance(p2);
     }
 
     /** Test a quad for zero length
@@ -198,8 +226,8 @@ public:
         @return true if the quad is of zero length; otherwise false.
     */
     static bool IsQuadDegenerate(const SkPoint& p1, const SkPoint& p2,
-                                 const SkPoint& p3) {
-        return p1.equalsWithinTolerance(p2) &&
+                                 const SkPoint& p3, bool exact) {
+        return exact ? p1 == p2 && p2 == p3 : p1.equalsWithinTolerance(p2) &&
                p2.equalsWithinTolerance(p3);
     }
 
@@ -208,8 +236,8 @@ public:
         @return true if the cubic is of zero length; otherwise false.
     */
     static bool IsCubicDegenerate(const SkPoint& p1, const SkPoint& p2,
-                                  const SkPoint& p3, const SkPoint& p4) {
-        return p1.equalsWithinTolerance(p2) &&
+                                  const SkPoint& p3, const SkPoint& p4, bool exact) {
+        return exact ? p1 == p2 && p2 == p3 && p3 == p4 : p1.equalsWithinTolerance(p2) &&
                p2.equalsWithinTolerance(p3) &&
                p3.equalsWithinTolerance(p4);
     }
@@ -222,16 +250,6 @@ public:
      */
     bool isLine(SkPoint line[2]) const;
 
-    /** Returns true if the path specifies a rectangle. If so, and if rect is
-        not null, set rect to the bounds of the path. If the path does not
-        specify a rectangle, return false and ignore rect.
-
-        @param rect If not null, returns the bounds of the path if it specifies
-                    a rectangle
-        @return true if the path specifies a rectangle
-    */
-    bool isRect(SkRect* rect) const;
-
     /** Return the number of points in the path
      */
     int countPoints() const;
@@ -266,10 +284,12 @@ public:
     //! Swap contents of this and other. Guaranteed not to throw
     void swap(SkPath& other);
 
-    /** Returns the bounds of the path's points. If the path contains 0 or 1
-        points, the bounds is set to (0,0,0,0), and isEmpty() will return true.
-        Note: this bounds may be larger than the actual shape, since curves
-        do not extend as far as their control points.
+    /**
+     *  Returns the bounds of the path's points. If the path contains zero points/verbs, this
+     *  will return the "empty" rect [0, 0, 0, 0].
+     *  Note: this bounds may be larger than the actual shape, since curves
+     *  do not extend as far as their control points. Additionally this bound encompases all points,
+     *  even isolated moveTos either preceeding or following the last non-degenerate contour.
     */
     const SkRect& getBounds() const {
         return fPathRef->getBounds();
@@ -450,26 +470,23 @@ public:
     void rCubicTo(SkScalar x1, SkScalar y1, SkScalar x2, SkScalar y2,
                   SkScalar x3, SkScalar y3);
 
-    /** Append the specified arc to the path as a new contour. If the start of
-        the path is different from the path's current last point, then an
-        automatic lineTo() is added to connect the current contour to the start
-        of the arc. However, if the path is empty, then we call moveTo() with
-        the first point of the arc. The sweep angle is treated mod 360.
+    /**
+     *  Append the specified arc to the path. If the start of the arc is different from the path's
+     *  current last point, then an automatic lineTo() is added to connect the current contour
+     *  to the start of the arc. However, if the path is empty, then we call moveTo() with
+     *  the first point of the arc. The sweep angle is treated mod 360.
+     *
+     *  @param oval The bounding oval defining the shape and size of the arc
+     *  @param startAngle Starting angle (in degrees) where the arc begins
+     *  @param sweepAngle Sweep angle (in degrees) measured clockwise. This is treated mod 360.
+     *  @param forceMoveTo If true, always begin a new contour with the arc
+     */
+    void arcTo(const SkRect& oval, SkScalar startAngle, SkScalar sweepAngle, bool forceMoveTo);
 
-        @param oval The bounding oval defining the shape and size of the arc
-        @param startAngle Starting angle (in degrees) where the arc begins
-        @param sweepAngle Sweep angle (in degrees) measured clockwise. This is
-                          treated mod 360.
-        @param forceMoveTo If true, always begin a new contour with the arc
-    */
-    void arcTo(const SkRect& oval, SkScalar startAngle, SkScalar sweepAngle,
-               bool forceMoveTo);
-
-    /** Append a line and arc to the current path. This is the same as the
-        PostScript call "arct".
-    */
-    void arcTo(SkScalar x1, SkScalar y1, SkScalar x2, SkScalar y2,
-               SkScalar radius);
+    /**
+     *  Append a line and arc to the current path. This is the same as the PostScript call "arct".
+     */
+    void arcTo(SkScalar x1, SkScalar y1, SkScalar x2, SkScalar y2, SkScalar radius);
 
     /** Append a line and arc to the current path. This is the same as the
         PostScript call "arct".
@@ -484,25 +501,12 @@ public:
     void close();
 
     enum Direction {
-        /** Direction either has not been or could not be computed */
-        kUnknown_Direction,
         /** clockwise direction for adding closed contours */
         kCW_Direction,
         /** counter-clockwise direction for adding closed contours */
         kCCW_Direction,
     };
 
-    /**
-     *  Return the opposite of the specified direction. kUnknown is its own
-     *  opposite.
-     */
-    static Direction OppositeDirection(Direction dir) {
-        static const Direction gOppositeDir[] = {
-            kUnknown_Direction, kCCW_Direction, kCW_Direction
-        };
-        return gOppositeDir[dir];
-    }
-
     /**
      *  Returns whether or not a fill type is inverted
      *
@@ -512,10 +516,10 @@ public:
      *  kInverseEvenOdd_FillType -> true
      */
     static bool IsInverseFillType(FillType fill) {
-        SK_COMPILE_ASSERT(0 == kWinding_FillType, fill_type_mismatch);
-        SK_COMPILE_ASSERT(1 == kEvenOdd_FillType, fill_type_mismatch);
-        SK_COMPILE_ASSERT(2 == kInverseWinding_FillType, fill_type_mismatch);
-        SK_COMPILE_ASSERT(3 == kInverseEvenOdd_FillType, fill_type_mismatch);
+        static_assert(0 == kWinding_FillType, "fill_type_mismatch");
+        static_assert(1 == kEvenOdd_FillType, "fill_type_mismatch");
+        static_assert(2 == kInverseWinding_FillType, "fill_type_mismatch");
+        static_assert(3 == kInverseEvenOdd_FillType, "fill_type_mismatch");
         return (fill & 2) != 0;
     }
 
@@ -528,65 +532,39 @@ public:
      *  kInverseEvenOdd_FillType -> kEvenOdd_FillType
      */
     static FillType ConvertToNonInverseFillType(FillType fill) {
-        SK_COMPILE_ASSERT(0 == kWinding_FillType, fill_type_mismatch);
-        SK_COMPILE_ASSERT(1 == kEvenOdd_FillType, fill_type_mismatch);
-        SK_COMPILE_ASSERT(2 == kInverseWinding_FillType, fill_type_mismatch);
-        SK_COMPILE_ASSERT(3 == kInverseEvenOdd_FillType, fill_type_mismatch);
+        static_assert(0 == kWinding_FillType, "fill_type_mismatch");
+        static_assert(1 == kEvenOdd_FillType, "fill_type_mismatch");
+        static_assert(2 == kInverseWinding_FillType, "fill_type_mismatch");
+        static_assert(3 == kInverseEvenOdd_FillType, "fill_type_mismatch");
         return (FillType)(fill & 1);
     }
 
     /**
-     *  Tries to quickly compute the direction of the first non-degenerate
-     *  contour. If it can be computed, return true and set dir to that
-     *  direction. If it cannot be (quickly) determined, return false and ignore
-     *  the dir parameter. If the direction was determined, it is cached to make
-     *  subsequent calls return quickly.
+     *  Chop a conic into N quads, stored continguously in pts[], where
+     *  N = 1 << pow2. The amount of storage needed is (1 + 2 * N)
      */
-    bool cheapComputeDirection(Direction* dir) const;
+    static int ConvertConicToQuads(const SkPoint& p0, const SkPoint& p1, const SkPoint& p2,
+                                   SkScalar w, SkPoint pts[], int pow2);
 
     /**
-     *  Returns true if the path's direction can be computed via
-     *  cheapComputDirection() and if that computed direction matches the
-     *  specified direction. If dir is kUnknown, returns true if the direction
-     *  cannot be computed.
+     *  Returns true if the path specifies a rectangle.
+     *
+     *  If this returns false, then all output parameters are ignored, and left
+     *  unchanged. If this returns true, then each of the output parameters
+     *  are checked for NULL. If they are not, they return their value.
+     *
+     *  @param rect If not null, set to the bounds of the rectangle.
+     *              Note : this bounds may be smaller than the path's bounds, since it is just
+     *              the bounds of the "drawable" parts of the path. e.g. a trailing MoveTo would
+     *              be ignored in this rect, but not by the path's bounds
+     *  @param isClosed If not null, set to true if the path is closed
+     *  @param direction If not null, set to the rectangle's direction
+     *  @return true if the path specifies a rectangle
      */
-    bool cheapIsDirection(Direction dir) const {
-        Direction computedDir = kUnknown_Direction;
-        (void)this->cheapComputeDirection(&computedDir);
-        return computedDir == dir;
-    }
+    bool isRect(SkRect* rect, bool* isClosed = NULL, Direction* direction = NULL) const;
 
-    enum PathAsRect {
-        /** The path can not draw the same as its bounds. */
-        kNone_PathAsRect,
-        /** The path draws the same as its bounds when filled. */
-        kFill_PathAsRect,
-        /** The path draws the same as its bounds when stroked or filled. */
-        kStroke_PathAsRect,
-    };
-
-    /** Returns kFill_PathAsRect or kStroke_PathAsRect if drawing the path (either filled or
-        stroked) will be equivalent to filling/stroking the path's bounding rect. If
-        either is true, and direction is not null, sets the direction of the contour. If the
-        path is not drawn equivalent to a rect, returns kNone_PathAsRect and ignores direction.
-
-        @param direction If not null, set to the contour's direction when it is drawn as a rect
-        @return the path's PathAsRect type
-     */
-    PathAsRect asRect(Direction* direction = NULL) const;
-
-    /** Returns true if the path specifies a rectangle. If so, and if isClosed is
-        not null, set isClosed to true if the path is closed. Also, if returning true
-        and direction is not null, return the rect direction. If the path does not
-        specify a rectangle, return false and ignore isClosed and direction.
-
-        @param isClosed If not null, set to true if the path is closed
-        @param direction If not null, set to the rectangle's direction
-        @return true if the path specifies a rectangle
-    */
-    bool isRect(bool* isClosed, Direction* direction) const;
-
-    /** Returns true if the path specifies a pair of nested rectangles. If so, and if
+    /** Returns true if the path specifies a pair of nested rectangles, or would draw a
+        pair of nested rectangles when filled. If so, and if
         rect is not null, set rect[0] to the outer rectangle and rect[1] to the inner
         rectangle. If so, and dirs is not null, set dirs[0] to the direction of
         the outer rectangle and dirs[1] to the direction of the inner rectangle. If
@@ -597,16 +575,32 @@ public:
         @param dirs If not null, returns the direction of the rects
         @return true if the path describes a pair of nested rectangles
     */
-    bool isNestedRects(SkRect rect[2], Direction dirs[2] = NULL) const;
+    bool isNestedFillRects(SkRect rect[2], Direction dirs[2] = NULL) const;
 
     /**
      *  Add a closed rectangle contour to the path
      *  @param rect The rectangle to add as a closed contour to the path
-     *  @param dir  The direction to wind the rectangle's contour. Cannot be
-     *              kUnknown_Direction.
+     *  @param dir  The direction to wind the rectangle's contour.
+     *
+     *  Note: the contour initial point index is 0 (as defined below).
      */
     void addRect(const SkRect& rect, Direction dir = kCW_Direction);
 
+    /**
+     *  Add a closed rectangle contour to the path
+     *  @param rect  The rectangle to add as a closed contour to the path
+     *  @param dir   The direction to wind the rectangle's contour.
+     *  @param start Initial point of the contour (initial moveTo), expressed as
+     *               a corner index, starting in the upper-left position, clock-wise:
+     *
+     *  0         1
+     *   *-------*
+     *   |       |
+     *   *-------*
+     *  3         2
+     */
+    void addRect(const SkRect& rect, Direction dir, unsigned start);
+
     /**
      *  Add a closed rectangle contour to the path
      *
@@ -618,8 +612,9 @@ public:
      *                  to the path
      *  @param bottom   The bottom of a rectangle to add as a closed contour to
      *                  the path
-     *  @param dir  The direction to wind the rectangle's contour. Cannot be
-     *              kUnknown_Direction.
+     *  @param dir  The direction to wind the rectangle's contour.
+     *
+     *  Note: the contour initial point index is 0 (as defined above).
      */
     void addRect(SkScalar left, SkScalar top, SkScalar right, SkScalar bottom,
                  Direction dir = kCW_Direction);
@@ -628,11 +623,31 @@ public:
      *  Add a closed oval contour to the path
      *
      *  @param oval The bounding oval to add as a closed contour to the path
-     *  @param dir  The direction to wind the oval's contour. Cannot be
-     *              kUnknown_Direction.
+     *  @param dir  The direction to wind the oval's contour.
+     *
+     *  Note: the contour initial point index is 1 (as defined below).
      */
     void addOval(const SkRect& oval, Direction dir = kCW_Direction);
 
+    /**
+     *  Add a closed oval contour to the path
+     *
+     *  @param oval  The bounding oval to add as a closed contour to the path
+     *  @param dir   The direction to wind the oval's contour.
+     *  @param start Initial point of the contour (initial moveTo), expressed
+     *               as an ellipse vertex index, starting at the top, clock-wise
+     *               (90/0/270/180deg order):
+     *
+     *        0
+     *       -*-
+     *     |     |
+     *   3 *     * 1
+     *     |     |
+     *       -*-
+     *        2
+     */
+    void addOval(const SkRect& oval, Direction dir, unsigned start);
+
     /**
      *  Add a closed circle contour to the path
      *
@@ -642,8 +657,7 @@ public:
      *                  closed contour to the path
      *  @param radius   The radius of a circle to add as a closed contour to the
      *                  path
-     *  @param dir  The direction to wind the circle's contour. Cannot be
-     *              kUnknown_Direction.
+     *  @param dir  The direction to wind the circle's contour.
      */
     void addCircle(SkScalar x, SkScalar y, SkScalar radius,
                    Direction dir = kCW_Direction);
@@ -661,8 +675,7 @@ public:
      *  @param rect The bounds of a round-rectangle to add as a closed contour
      *  @param rx   The x-radius of the rounded corners on the round-rectangle
      *  @param ry   The y-radius of the rounded corners on the round-rectangle
-     *  @param dir  The direction to wind the rectangle's contour. Cannot be
-     *              kUnknown_Direction.
+     *  @param dir  The direction to wind the rectangle's contour.
      */
     void addRoundRect(const SkRect& rect, SkScalar rx, SkScalar ry,
                       Direction dir = kCW_Direction);
@@ -673,8 +686,7 @@ public:
      *  bottom-right, bottom-left.
      *  @param rect The bounds of a round-rectangle to add as a closed contour
      *  @param radii Array of 8 scalars, 4 [X,Y] pairs for each corner
-     *  @param dir  The direction to wind the rectangle's contour. Cannot be
-     *              kUnknown_Direction.
+     *  @param dir  The direction to wind the rectangle's contour.
      * Note: The radii here now go through the same constraint handling as the
      *       SkRRect radii (i.e., either radii at a corner being 0 implies a
      *       sqaure corner and oversized radii are proportionally scaled down).
@@ -685,11 +697,31 @@ public:
     /**
      *  Add an SkRRect contour to the path
      *  @param rrect The rounded rect to add as a closed contour
-     *  @param dir   The winding direction for the new contour. Cannot be
-     *               kUnknown_Direction.
+     *  @param dir   The winding direction for the new contour.
+     *
+     *  Note: the contour initial point index is either 6 (for dir == kCW_Direction)
+     *        or 7 (for dir == kCCW_Direction), as defined below.
+     *
      */
     void addRRect(const SkRRect& rrect, Direction dir = kCW_Direction);
 
+    /**
+     *  Add an SkRRect contour to the path
+     *  @param rrect The rounded rect to add as a closed contour
+     *  @param dir   The winding direction for the new contour.
+     *  @param start Initial point of the contour (initial moveTo), expressed as
+     *               an index of the radii minor/major points, ordered clock-wise:
+     *
+     *      0    1
+     *      *----*
+     *   7 *      * 2
+     *     |      |
+     *   6 *      * 3
+     *      *----*
+     *      5    4
+     */
+    void addRRect(const SkRRect& rrect, Direction dir, unsigned start);
+
     /**
      *  Add a new contour made of just lines. This is just a fast version of
      *  the following:
@@ -848,11 +880,15 @@ public:
             @param  pts The points representing the current verb and/or segment
             @param doConsumeDegerates If true, first scan for segments that are
                    deemed degenerate (too short) and skip those.
+            @param exact if doConsumeDegenerates is true and exact is true, skip only
+                   degenerate elements with lengths exactly equal to zero. If exact
+                   is false, skip degenerate elements with lengths close to zero. If
+                   doConsumeDegenerates is false, exact has no effect.
             @return The verb for the current segment
         */
-        Verb next(SkPoint pts[4], bool doConsumeDegerates = true) {
+        Verb next(SkPoint pts[4], bool doConsumeDegerates = true, bool exact = false) {
             if (doConsumeDegerates) {
-                this->consumeDegenerateSegments();
+                this->consumeDegenerateSegments(exact);
             }
             return this->doNext(pts);
         }
@@ -892,7 +928,7 @@ public:
 
         inline const SkPoint& cons_moveTo();
         Verb autoClose(SkPoint pts[2]);
-        void consumeDegenerateSegments();
+        void consumeDegenerateSegments(bool exact);
         Verb doNext(SkPoint pts[4]);
     };
 
@@ -900,10 +936,14 @@ public:
     */
     class SK_API RawIter {
     public:
-        RawIter();
-        RawIter(const SkPath&);
+        RawIter() {}
+        RawIter(const SkPath& path) {
+            setPath(path);
+        }
 
-        void setPath(const SkPath&);
+        void setPath(const SkPath& path) {
+            fRawIter.setPathRef(*path.fPathRef.get());
+        }
 
         /** Return the next verb in this iteration of the path. When all
             segments have been visited, return kDone_Verb.
@@ -912,17 +952,17 @@ public:
                         This must not be NULL.
             @return The verb for the current segment
         */
-        Verb next(SkPoint pts[4]);
+        Verb next(SkPoint pts[4]) {
+            return (Verb) fRawIter.next(pts);
+        }
 
-        SkScalar conicWeight() const { return *fConicWeights; }
+        SkScalar conicWeight() const {
+            return fRawIter.conicWeight();
+        }
 
     private:
-        const SkPoint*  fPts;
-        const uint8_t*  fVerbs;
-        const uint8_t*  fVerbStop;
-        const SkScalar* fConicWeights;
-        SkPoint         fMoveTo;
-        SkPoint         fLastPt;
+        SkPathRef::Iter fRawIter;
+        friend class SkPath;
     };
 
     /**
@@ -931,8 +971,9 @@ public:
      */
     bool contains(SkScalar x, SkScalar y) const;
 
-    void dump(SkWStream* , bool forceClose) const;
+    void dump(SkWStream* , bool forceClose, bool dumpAsHex) const;
     void dump() const;
+    void dumpHex() const;
 
     /**
      *  Write the path to the buffer, and return the number of bytes written.
@@ -955,37 +996,39 @@ public:
     */
     uint32_t getGenerationID() const;
 
-#ifdef SK_BUILD_FOR_ANDROID
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
     static const int kPathRefGenIDBitCnt = 30; // leave room for the fill type (skbug.com/1762)
-    const SkPath* getSourcePath() const;
-    void setSourcePath(const SkPath* path);
 #else
     static const int kPathRefGenIDBitCnt = 32;
 #endif
 
     SkDEBUGCODE(void validate() const;)
+    SkDEBUGCODE(void experimentalValidateRef() const { fPathRef->validate(); } )
 
 private:
     enum SerializationOffsets {
         // 1 free bit at 29
         kUnused1_SerializationShift = 28,    // 1 free bit
         kDirection_SerializationShift = 26, // requires 2 bits
-        kUnused2_SerializationShift = 25,    // 1 free bit
+        kIsVolatile_SerializationShift = 25, // requires 1 bit
         // 1 free bit at 24
         kConvexity_SerializationShift = 16, // requires 8 bits
         kFillType_SerializationShift = 8,   // requires 8 bits
-        // 8 free bits at 0
+        // low-8-bits are version
     };
 
-    SkAutoTUnref<SkPathRef> fPathRef;
+    enum SerializationVersions {
+        kPathPrivFirstDirection_Version = 1,
 
-    int                 fLastMoveToIndex;
-    uint8_t             fFillType;
-    mutable uint8_t     fConvexity;
-    mutable uint8_t     fDirection;
-#ifdef SK_BUILD_FOR_ANDROID
-    const SkPath*       fSourcePath;
-#endif
+        kCurrent_Version = 1
+    };
+
+    SkAutoTUnref<SkPathRef>                            fPathRef;
+    int                                                fLastMoveToIndex;
+    uint8_t                                            fFillType;
+    mutable uint8_t                                    fConvexity;
+    mutable SkAtomic<uint8_t, sk_memory_order_relaxed> fFirstDirection;// SkPathPriv::FirstDirection
+    mutable SkBool8                                    fIsVolatile;
 
     /** Resets all fields other than fPathRef to their initial 'empty' values.
      *  Assumes the caller has already emptied fPathRef.
@@ -1000,7 +1043,7 @@ private:
     void copyFields(const SkPath& that);
 
     friend class Iter;
-
+    friend class SkPathPriv;
     friend class SkPathStroker;
 
     /*  Append, in reverse order, the first contour of path, ignoring path's
@@ -1040,11 +1083,14 @@ private:
         ed.setBounds(rect);
     }
 
+    void setPt(int index, SkScalar x, SkScalar y);
+
     friend class SkAutoPathBoundsUpdate;
     friend class SkAutoDisableOvalCheck;
     friend class SkAutoDisableDirectionCheck;
     friend class SkBench_AddPathTest; // perf test reversePathTo
     friend class PathTest_Private; // unit test reversePathTo
+    friend class ForceIsRRect_Private; // unit test isRRect
 };
 
 #endif
diff --git a/gfx/skia/skia/include/core/SkPathEffect.h b/gfx/skia/skia/include/core/SkPathEffect.h
index 562025351e85..36e67e1de064 100644
--- a/gfx/skia/skia/include/core/SkPathEffect.h
+++ b/gfx/skia/skia/include/core/SkPathEffect.h
@@ -14,10 +14,10 @@
 #include "SkPath.h"
 #include "SkPoint.h"
 #include "SkRect.h"
-#include "SkStrokeRec.h"
 #include "SkTDArray.h"
 
 class SkPath;
+class SkStrokeRec;
 
 /** \class SkPathEffect
 
@@ -29,8 +29,6 @@ class SkPath;
 */
 class SK_API SkPathEffect : public SkFlattenable {
 public:
-    SK_DECLARE_INST_COUNT(SkPathEffect)
-
     /**
      *  Given a src path (input) and a stroke-rec (input and output), apply
      *  this effect to the src path, returning the new path in dst, and return
@@ -131,11 +129,16 @@ public:
 
     virtual DashType asADash(DashInfo* info) const;
 
+    SK_TO_STRING_PUREVIRT()
     SK_DEFINE_FLATTENABLE_TYPE(SkPathEffect)
 
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+    /// Override for subclasses as appropriate.
+    virtual bool exposedInAndroidJavaAPI() const { return false; }
+#endif
+
 protected:
     SkPathEffect() {}
-    SkPathEffect(SkReadBuffer& buffer) : INHERITED(buffer) {}
 
 private:
     // illegal
@@ -157,12 +160,14 @@ public:
 
 protected:
     SkPairPathEffect(SkPathEffect* pe0, SkPathEffect* pe1);
-    SkPairPathEffect(SkReadBuffer&);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+
+    void flatten(SkWriteBuffer&) const override;
 
     // these are visible to our subclasses
     SkPathEffect* fPE0, *fPE1;
 
+    SK_TO_STRING_OVERRIDE()
+
 private:
     typedef SkPathEffect INHERITED;
 };
@@ -180,18 +185,21 @@ public:
         and decremented in the destructor.
     */
     static SkComposePathEffect* Create(SkPathEffect* outer, SkPathEffect* inner) {
-        return SkNEW_ARGS(SkComposePathEffect, (outer, inner));
+        return new SkComposePathEffect(outer, inner);
     }
 
     virtual bool filterPath(SkPath* dst, const SkPath& src,
-                            SkStrokeRec*, const SkRect*) const SK_OVERRIDE;
+                            SkStrokeRec*, const SkRect*) const override;
 
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposePathEffect)
 
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+    bool exposedInAndroidJavaAPI() const override { return true; }
+#endif
+
 protected:
-    SkComposePathEffect(SkPathEffect* outer, SkPathEffect* inner)
-        : INHERITED(outer, inner) {}
-    explicit SkComposePathEffect(SkReadBuffer& buffer) : INHERITED(buffer) {}
+    SkComposePathEffect(SkPathEffect* outer, SkPathEffect* inner) : INHERITED(outer, inner) {}
 
 private:
     // illegal
@@ -214,18 +222,21 @@ public:
         and decremented in the destructor.
     */
     static SkSumPathEffect* Create(SkPathEffect* first, SkPathEffect* second) {
-        return SkNEW_ARGS(SkSumPathEffect, (first, second));
+        return new SkSumPathEffect(first, second);
     }
 
     virtual bool filterPath(SkPath* dst, const SkPath& src,
-                            SkStrokeRec*, const SkRect*) const SK_OVERRIDE;
+                            SkStrokeRec*, const SkRect*) const override;
 
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSumPathEffect)
 
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+    bool exposedInAndroidJavaAPI() const override { return true; }
+#endif
+
 protected:
-    SkSumPathEffect(SkPathEffect* first, SkPathEffect* second)
-        : INHERITED(first, second) {}
-    explicit SkSumPathEffect(SkReadBuffer& buffer) : INHERITED(buffer) {}
+    SkSumPathEffect(SkPathEffect* first, SkPathEffect* second) : INHERITED(first, second) {}
 
 private:
     // illegal
diff --git a/gfx/skia/skia/include/core/SkPathMeasure.h b/gfx/skia/skia/include/core/SkPathMeasure.h
index bc46b4a38b19..f6e606f0c06d 100644
--- a/gfx/skia/skia/include/core/SkPathMeasure.h
+++ b/gfx/skia/skia/include/core/SkPathMeasure.h
@@ -11,6 +11,8 @@
 #include "SkPath.h"
 #include "SkTDArray.h"
 
+struct SkConic;
+
 class SK_API SkPathMeasure : SkNoncopyable {
 public:
     SkPathMeasure();
@@ -101,6 +103,7 @@ private:
     void     buildSegments();
     SkScalar compute_quad_segs(const SkPoint pts[3], SkScalar distance,
                                 int mint, int maxt, int ptIndex);
+    SkScalar compute_conic_segs(const SkConic&, SkScalar distance, int mint, int maxt, int ptIndex);
     SkScalar compute_cubic_segs(const SkPoint pts[3], SkScalar distance,
                                 int mint, int maxt, int ptIndex);
     const Segment* distanceToSegment(SkScalar distance, SkScalar* t);
diff --git a/gfx/skia/skia/include/core/SkPathRef.h b/gfx/skia/skia/include/core/SkPathRef.h
index ba68fcba3c60..86f55c9bcae2 100644
--- a/gfx/skia/skia/include/core/SkPathRef.h
+++ b/gfx/skia/skia/include/core/SkPathRef.h
@@ -9,9 +9,9 @@
 #ifndef SkPathRef_DEFINED
 #define SkPathRef_DEFINED
 
-#include "SkDynamicAnnotations.h"
 #include "SkMatrix.h"
 #include "SkPoint.h"
+#include "SkRRect.h"
 #include "SkRect.h"
 #include "SkRefCnt.h"
 #include "SkTDArray.h"
@@ -37,8 +37,6 @@ class SkWBuffer;
 
 class SK_API SkPathRef : public ::SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkPathRef);
-
     class Editor {
     public:
         Editor(SkAutoTUnref<SkPathRef>* pathRef,
@@ -103,12 +101,39 @@ public:
 
         void setIsOval(bool isOval) { fPathRef->setIsOval(isOval); }
 
+        void setIsRRect(bool isRRect) { fPathRef->setIsRRect(isRRect); }
+
         void setBounds(const SkRect& rect) { fPathRef->setBounds(rect); }
 
     private:
         SkPathRef* fPathRef;
     };
 
+    class SK_API Iter {
+    public:
+        Iter();
+        Iter(const SkPathRef&);
+
+        void setPathRef(const SkPathRef&);
+
+        /** Return the next verb in this iteration of the path. When all
+            segments have been visited, return kDone_Verb.
+
+            @param  pts The points representing the current verb and/or segment
+                        This must not be NULL.
+            @return The verb for the current segment
+        */
+        uint8_t next(SkPoint pts[4]);
+
+        SkScalar conicWeight() const { return *fConicWeights; }
+
+    private:
+        const SkPoint*  fPts;
+        const uint8_t*  fVerbs;
+        const uint8_t*  fVerbStop;
+        const SkScalar* fConicWeights;
+    };
+
 public:
     /**
      * Gets a path ref with no verbs or points.
@@ -144,13 +169,21 @@ public:
      *              fact ovals can report false.
      */
     bool isOval(SkRect* rect) const {
-        if (fIsOval && NULL != rect) {
-            *rect = getBounds();
+        if (fIsOval && rect) {
+            *rect = this->getBounds();
         }
 
         return SkToBool(fIsOval);
     }
 
+    bool isRRect(SkRRect* rrect) const {
+        if (fIsRRect && rrect) {
+            *rrect = this->getRRect();
+        }
+        return SkToBool(fIsRRect);
+    }
+
+
     bool hasComputedBounds() const {
         return !fBoundsIsDirty;
     }
@@ -167,6 +200,8 @@ public:
         return fBounds;
     }
 
+    SkRRect getRRect() const;
+
     /**
      * Transforms a path ref by a matrix, allocating a new one only if necessary.
      */
@@ -183,19 +218,7 @@ public:
      */
     static void Rewind(SkAutoTUnref<SkPathRef>* pathRef);
 
-    virtual ~SkPathRef() {
-        SkDEBUGCODE(this->validate();)
-        sk_free(fPoints);
-
-        SkDEBUGCODE(fPoints = NULL;)
-        SkDEBUGCODE(fVerbs = NULL;)
-        SkDEBUGCODE(fVerbCnt = 0x9999999;)
-        SkDEBUGCODE(fPointCnt = 0xAAAAAAA;)
-        SkDEBUGCODE(fPointCnt = 0xBBBBBBB;)
-        SkDEBUGCODE(fGenerationID = 0xEEEEEEEE;)
-        SkDEBUGCODE(fEditorsAttached = 0x7777777;)
-    }
-
+    virtual ~SkPathRef();
     int countPoints() const { SkDEBUGCODE(this->validate();) return fPointCnt; }
     int countVerbs() const { SkDEBUGCODE(this->validate();) return fVerbCnt; }
     int countWeights() const { SkDEBUGCODE(this->validate();) return fConicWeights.count(); }
@@ -254,8 +277,18 @@ public:
      */
     uint32_t genID() const;
 
+    struct GenIDChangeListener {
+        virtual ~GenIDChangeListener() {}
+        virtual void onChange() = 0;
+    };
+
+    void addGenIDChangeListener(GenIDChangeListener* listener);
+
+    SkDEBUGCODE(void validate() const;)
+
 private:
     enum SerializationOffsets {
+        kIsRRect_SerializationShift = 26,   // requires 1 bit
         kIsFinite_SerializationShift = 25,  // requires 1 bit
         kIsOval_SerializationShift = 24,    // requires 1 bit
         kSegmentMask_SerializationShift = 0 // requires 4 bits
@@ -271,6 +304,7 @@ private:
         fGenerationID = kEmptyGenID;
         fSegmentMask = 0;
         fIsOval = false;
+        fIsRRect = false;
         SkDEBUGCODE(fEditorsAttached = 0;)
         SkDEBUGCODE(this->validate();)
     }
@@ -279,13 +313,7 @@ private:
 
     // Return true if the computed bounds are finite.
     static bool ComputePtBounds(SkRect* bounds, const SkPathRef& ref) {
-        int count = ref.countPoints();
-        if (count <= 1) {  // we ignore just 1 point (moveto)
-            bounds->setEmpty();
-            return count ? ref.points()->isFinite() : true;
-        } else {
-            return bounds->setBoundsCheck(ref.points(), count);
-        }
+        return bounds->setBoundsCheck(ref.points(), ref.countPoints());
     }
 
     // called, if dirty, by getBounds()
@@ -293,9 +321,9 @@ private:
         SkDEBUGCODE(this->validate();)
         // TODO(mtklein): remove fBoundsIsDirty and fIsFinite,
         // using an inverted rect instead of fBoundsIsDirty and always recalculating fIsFinite.
-        //SkASSERT(fBoundsIsDirty);
+        SkASSERT(fBoundsIsDirty);
 
-        fIsFinite = ComputePtBounds(fBounds.get(), *this);
+        fIsFinite = ComputePtBounds(&fBounds, *this);
         fBoundsIsDirty = false;
     }
 
@@ -303,7 +331,7 @@ private:
         SkASSERT(rect.fLeft <= rect.fRight && rect.fTop <= rect.fBottom);
         fBounds = rect;
         fBoundsIsDirty = false;
-        fIsFinite = fBounds->isFinite();
+        fIsFinite = fBounds.isFinite();
     }
 
     /** Makes additional room but does not change the counts or change the genID */
@@ -324,6 +352,7 @@ private:
 
         fSegmentMask = 0;
         fIsOval = false;
+        fIsRRect = false;
 
         size_t newSize = sizeof(uint8_t) * verbCount + sizeof(SkPoint) * pointCount;
         size_t newReserve = sizeof(uint8_t) * reserveVerbs + sizeof(SkPoint) * reservePoints;
@@ -416,31 +445,35 @@ private:
         return reinterpret_cast<intptr_t>(fVerbs) - reinterpret_cast<intptr_t>(fPoints);
     }
 
-    SkDEBUGCODE(void validate() const;)
-
     /**
      * Called the first time someone calls CreateEmpty to actually create the singleton.
      */
-    static SkPathRef* CreateEmptyImpl();
+    friend SkPathRef* sk_create_empty_pathref();
 
     void setIsOval(bool isOval) { fIsOval = isOval; }
 
+    void setIsRRect(bool isRRect) { fIsRRect = isRRect; }
+
+    // called only by the editor. Note that this is not a const function.
     SkPoint* getPoints() {
         SkDEBUGCODE(this->validate();)
         fIsOval = false;
+        fIsRRect = false;
         return fPoints;
     }
 
+    const SkPoint* getPoints() const {
+        SkDEBUGCODE(this->validate();)
+        return fPoints;
+    }
+
+    void callGenIDChangeListeners();
+
     enum {
         kMinSize = 256,
     };
 
-    mutable SkTRacyReffable<SkRect> fBounds;
-    mutable SkTRacy<uint8_t>        fBoundsIsDirty;
-    mutable SkTRacy<SkBool8>        fIsFinite;    // only meaningful if bounds are valid
-
-    SkBool8  fIsOval;
-    uint8_t  fSegmentMask;
+    mutable SkRect   fBounds;
 
     SkPoint*            fPoints; // points to begining of the allocation
     uint8_t*            fVerbs; // points just past the end of the allocation (verbs grow backwards)
@@ -455,7 +488,17 @@ private:
     mutable uint32_t    fGenerationID;
     SkDEBUGCODE(int32_t fEditorsAttached;) // assert that only one editor in use at any time.
 
+    SkTDArray<GenIDChangeListener*> fGenIDChangeListeners;  // pointers are owned
+
+    mutable uint8_t  fBoundsIsDirty;
+    mutable SkBool8  fIsFinite;    // only meaningful if bounds are valid
+
+    SkBool8  fIsOval;
+    SkBool8  fIsRRect;
+    uint8_t  fSegmentMask;
+
     friend class PathRefTest_Private;
+    friend class ForceIsRRect_Private; // unit test isRRect
     typedef SkRefCnt INHERITED;
 };
 
diff --git a/gfx/skia/skia/include/core/SkPicture.h b/gfx/skia/skia/include/core/SkPicture.h
index 21ebef32cd66..720747e9a323 100644
--- a/gfx/skia/skia/include/core/SkPicture.h
+++ b/gfx/skia/skia/include/core/SkPicture.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2007 The Android Open Source Project
  *
@@ -6,72 +5,33 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkPicture_DEFINED
 #define SkPicture_DEFINED
 
-#include "SkBitmap.h"
-#include "SkDrawPictureCallback.h"
 #include "SkImageDecoder.h"
 #include "SkRefCnt.h"
-#include "SkTDArray.h"
+#include "SkTypes.h"
 
-#if SK_SUPPORT_GPU
 class GrContext;
-#endif
-
-class SkBBHFactory;
-class SkBBoxHierarchy;
+class SkBigPicture;
+class SkBitmap;
 class SkCanvas;
-class SkData;
 class SkPictureData;
-class SkPictureRecord;
+class SkPixelSerializer;
+class SkRefCntSet;
 class SkStream;
+class SkTypefacePlayback;
 class SkWStream;
-
 struct SkPictInfo;
 
-class SkRecord;
-
 /** \class SkPicture
 
-    The SkPicture class records the drawing commands made to a canvas, to
-    be played back at a later time.
+    An SkPicture records drawing commands made to a canvas to be played back at a later time.
+    This base class handles serialization and a few other miscellany.
 */
 class SK_API SkPicture : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkPicture)
-
-    // AccelData provides a base class for device-specific acceleration
-    // data. It is added to the picture via a call to a device's optimize
-    // method.
-    class AccelData : public SkRefCnt {
-    public:
-        typedef uint8_t Domain;
-        typedef uint32_t Key;
-
-        AccelData(Key key) : fKey(key) { }
-
-        const Key& getKey() const { return fKey; }
-
-        // This entry point allows user's to get a unique domain prefix
-        // for their keys
-        static Domain GenerateDomain();
-    private:
-        Key fKey;
-
-        typedef SkRefCnt INHERITED;
-    };
-
-#ifdef SK_SUPPORT_LEGACY_DEFAULT_PICTURE_CTOR
-    SkPicture();
-#endif
-
-    /**  PRIVATE / EXPERIMENTAL -- do not call */
-    void EXPERIMENTAL_addAccelData(const AccelData*) const;
-
-    /**  PRIVATE / EXPERIMENTAL -- do not call */
-    const AccelData* EXPERIMENTAL_getAccelData(AccelData::Key) const;
+    virtual ~SkPicture();
 
     /**
      *  Function signature defining a function that sets up an SkBitmap from encoded data. On
@@ -88,7 +48,7 @@ public:
 
     /**
      *  Recreate a picture that was serialized into a stream.
-     *  @param SkStream Serialized picture data.
+     *  @param SkStream Serialized picture data. Ownership is unchanged by this call.
      *  @param proc Function pointer for installing pixelrefs on SkBitmaps representing the
      *              encoded bitmap data from the stream.
      *  @return A new SkPicture representing the serialized data, or NULL if the stream is
@@ -107,59 +67,45 @@ public:
      */
     static SkPicture* CreateFromBuffer(SkReadBuffer&);
 
-    virtual ~SkPicture();
-
-#ifdef SK_SUPPORT_LEGACY_PICTURE_CLONE
     /**
-     *  Creates a thread-safe clone of the picture that is ready for playback.
-     */
-    SkPicture* clone() const;
-#endif
+    *  Subclasses of this can be passed to playback(). During the playback
+    *  of the picture, this callback will periodically be invoked. If its
+    *  abort() returns true, then picture playback will be interrupted.
+    *
+    *  The resulting drawing is undefined, as there is no guarantee how often the
+    *  callback will be invoked. If the abort happens inside some level of nested
+    *  calls to save(), restore will automatically be called to return the state
+    *  to the same level it was before the playback call was made.
+    */
+    class SK_API AbortCallback {
+    public:
+        AbortCallback() {}
+        virtual ~AbortCallback() {}
+        virtual bool abort() = 0;
+    };
 
-    /** Replays the drawing commands on the specified canvas.
+    /** Replays the drawing commands on the specified canvas. Note that
+        this has the effect of unfurling this picture into the destination
+        canvas. Using the SkCanvas::drawPicture entry point gives the destination
+        canvas the option of just taking a ref.
         @param canvas the canvas receiving the drawing commands.
+        @param callback a callback that allows interruption of playback
     */
-    void draw(SkCanvas* canvas, SkDrawPictureCallback* = NULL) const;
+    virtual void playback(SkCanvas*, AbortCallback* = NULL) const = 0;
 
-    /** Return the width of the picture's recording canvas. This
-        value reflects what was passed to setSize(), and does not necessarily
-        reflect the bounds of what has been recorded into the picture.
-        @return the width of the picture's recording canvas
-    */
-    int width() const { return fWidth; }
+    /** Return a cull rect for this picture.
+        Ops recorded into this picture that attempt to draw outside the cull might not be drawn.
+     */
+    virtual SkRect cullRect() const = 0;
 
-    /** Return the height of the picture's recording canvas. This
-        value reflects what was passed to setSize(), and does not necessarily
-        reflect the bounds of what has been recorded into the picture.
-        @return the height of the picture's recording canvas
-    */
-    int height() const { return fHeight; }
-
-    /** Return a non-zero, unique value representing the picture. This call is
-        only valid when not recording. Between a beginRecording/endRecording
-        pair it will just return 0 (the invalid ID). Each beginRecording/
-        endRecording pair will cause a different generation ID to be returned.
-    */
+    /** Returns a non-zero value unique among all pictures. */
     uint32_t uniqueID() const;
 
     /**
-     *  Function to encode an SkBitmap to an SkData. A function with this
-     *  signature can be passed to serialize() and SkWriteBuffer.
-     *  Returning NULL will tell the SkWriteBuffer to use
-     *  SkBitmap::flatten() to store the bitmap.
-     *
-     *  @param pixelRefOffset DEPRECATED -- caller assumes it will return 0.
-     *  @return SkData If non-NULL, holds encoded data representing the passed
-     *      in bitmap. The caller is responsible for calling unref().
+     *  Serialize to a stream. If non NULL, serializer will be used to serialize
+     *  bitmaps and images in the picture.
      */
-    typedef SkData* (*EncodeBitmap)(size_t* pixelRefOffset, const SkBitmap& bm);
-
-    /**
-     *  Serialize to a stream. If non NULL, encoder will be used to encode
-     *  any bitmaps in the picture.
-     *  encoder will never be called with a NULL pixelRefOffset.
-     */
-    void serialize(SkWStream*, EncodeBitmap encoder = NULL) const;
+    void serialize(SkWStream*, SkPixelSerializer* = NULL) const;
 
     /**
      *  Serialize to a buffer.
@@ -170,7 +116,21 @@ public:
      * Returns true if any bitmaps may be produced when this SkPicture
      * is replayed.
      */
-    bool willPlayBackBitmaps() const;
+    virtual bool willPlayBackBitmaps() const = 0;
+
+    /** Return the approximate number of operations in this picture.  This
+     *  number may be greater or less than the number of SkCanvas calls
+     *  recorded: some calls may be recorded as more than one operation, or some
+     *  calls may be optimized away.
+     */
+    virtual int approximateOpCount() const = 0;
+
+    /** Return true if this picture contains text.
+     */
+    virtual bool hasText() const = 0;
+
+    /** Returns the approximate byte size of this picture, not including large ref'd objects. */
+    virtual size_t approximateBytesUsed() const = 0;
 
     /** Return true if the SkStream/Buffer represents a serialized picture, and
         fills out SkPictInfo. After this function returns, the data source is not
@@ -181,116 +141,67 @@ public:
         If false is returned, SkPictInfo is unmodified.
     */
     static bool InternalOnly_StreamIsSKP(SkStream*, SkPictInfo*);
-    static bool InternalOnly_BufferIsSKP(SkReadBuffer&, SkPictInfo*);
+    static bool InternalOnly_BufferIsSKP(SkReadBuffer*, SkPictInfo*);
 
-    /** Return true if the picture is suitable for rendering on the GPU.
-     */
+    /** Return true if the picture is suitable for rendering on the GPU.  */
+    bool suitableForGpuRasterization(GrContext*, const char** whyNot = NULL) const;
 
-#if SK_SUPPORT_GPU
-    bool suitableForGpuRasterization(GrContext*, const char ** = NULL) const;
-#endif
+    // Sent via SkMessageBus from destructor.
+    struct DeletionMessage { int32_t fUniqueID; };  // TODO: -> uint32_t?
 
-    class DeletionListener : public SkRefCnt {
-    public:
-        virtual void onDeletion(uint32_t pictureID) = 0;
-    };
+    // Returns NULL if this is not an SkBigPicture.
+    virtual const SkBigPicture* asSkBigPicture() const { return NULL; }
 
-    // Takes ref on listener.
-    void addDeletionListener(DeletionListener* listener) const;
+    // Global setting to enable or disable security precautions for serialization.
+    static void SetPictureIOSecurityPrecautionsEnabled_Dangerous(bool set);
+    static bool PictureIOSecurityPrecautionsEnabled();
 
 private:
-    // V2 : adds SkPixelRef's generation ID.
-    // V3 : PictInfo tag at beginning, and EOF tag at the end
-    // V4 : move SkPictInfo to be the header
-    // V5 : don't read/write FunctionPtr on cross-process (we can detect that)
-    // V6 : added serialization of SkPath's bounds (and packed its flags tighter)
-    // V7 : changed drawBitmapRect(IRect) to drawBitmapRectToRect(Rect)
-    // V8 : Add an option for encoding bitmaps
-    // V9 : Allow the reader and writer of an SKP disagree on whether to support
-    //      SK_SUPPORT_HINTING_SCALE_FACTOR
-    // V10: add drawRRect, drawOval, clipRRect
-    // V11: modify how readBitmap and writeBitmap store their info.
-    // V12: add conics to SkPath, use new SkPathRef flattening
-    // V13: add flag to drawBitmapRectToRect
-    //      parameterize blurs by sigma rather than radius
-    // V14: Add flags word to PathRef serialization
-    // V15: Remove A1 bitmap config (and renumber remaining configs)
-    // V16: Move SkPath's isOval flag to SkPathRef
-    // V17: SkPixelRef now writes SkImageInfo
-    // V18: SkBitmap now records x,y for its pixelref origin, instead of offset.
-    // V19: encode matrices and regions into the ops stream
-    // V20: added bool to SkPictureImageFilter's serialization (to allow SkPicture serialization)
-    // V21: add pushCull, popCull
-    // V22: SK_PICT_FACTORY_TAG's size is now the chunk size in bytes
-    // V23: SkPaint::FilterLevel became a real enum
-    // V24: SkTwoPointConicalGradient now has fFlipped flag for gradient flipping
-    // V25: SkDashPathEffect now only writes phase and interval array when flattening
-    // V26: Removed boolean from SkColorShader for inheriting color from SkPaint.
-    // V27: Remove SkUnitMapper from gradients (and skia).
-    // V28: No longer call bitmap::flatten inside SkWriteBuffer::writeBitmap.
-    // V29: Removed SaveFlags parameter from save().
-    // V30: Remove redundant SkMatrix from SkLocalMatrixShader.
+    // Subclass whitelist.
+    SkPicture();
+    friend class SkBigPicture;
+    friend class SkEmptyPicture;
+    template <typename> friend class SkMiniPicture;
 
-    // Note: If the picture version needs to be increased then please follow the
-    // steps to generate new SKPs in (only accessible to Googlers): http://goo.gl/qATVcw
+    void serialize(SkWStream*, SkPixelSerializer*, SkRefCntSet* typefaces) const;
+    static SkPicture* CreateFromStream(SkStream*,
+                                       InstallPixelRefProc proc,
+                                       SkTypefacePlayback*);
+    friend class SkPictureData;
+
+    virtual int numSlowPaths() const = 0;
+    friend struct SkPathCounter;
+
+    // V35: Store SkRect (rather then width & height) in header
+    // V36: Remove (obsolete) alphatype from SkColorTable
+    // V37: Added shadow only option to SkDropShadowImageFilter (last version to record CLEAR)
+    // V38: Added PictureResolution option to SkPictureImageFilter
+    // V39: Added FilterLevel option to SkPictureImageFilter
+    // V40: Remove UniqueID serialization from SkImageFilter.
+    // V41: Added serialization of SkBitmapSource's filterQuality parameter
+    // V42: Added a bool to SkPictureShader serialization to indicate did-we-serialize-a-picture?
+    // V43: Added DRAW_IMAGE and DRAW_IMAGE_RECT opt codes to serialized data
 
     // Only SKPs within the min/current picture version range (inclusive) can be read.
-    static const uint32_t MIN_PICTURE_VERSION = 19;
-    static const uint32_t CURRENT_PICTURE_VERSION = 30;
+    static const uint32_t     MIN_PICTURE_VERSION = 35;     // Produced by Chrome M39.
+    static const uint32_t CURRENT_PICTURE_VERSION = 43;
 
-    mutable uint32_t      fUniqueID;
+    static_assert(MIN_PICTURE_VERSION <= 41,
+                  "Remove kFontFileName and related code from SkFontDescriptor.cpp.");
 
-    // TODO: make SkPictureData const when clone method goes away
-    SkAutoTDelete<SkPictureData> fData;
-    int                   fWidth, fHeight;
-    mutable SkAutoTUnref<const AccelData> fAccelData;
+    static_assert(MIN_PICTURE_VERSION <= 42,
+                  "Remove COMMENT API handlers from SkPicturePlayback.cpp");
 
-    mutable SkTDArray<DeletionListener*> fDeletionListeners;  // pointers are refed
+    static_assert(MIN_PICTURE_VERSION <= 43,
+                  "Remove SkBitmapSourceDeserializer.");
 
-    void needsNewGenID() { fUniqueID = SK_InvalidGenID; }
-    void callDeletionListeners();
-
-    // Create a new SkPicture from an existing SkPictureData. The new picture
-    // takes ownership of 'data'.
-    SkPicture(SkPictureData* data, int width, int height);
-
-    SkPicture(int width, int height, const SkPictureRecord& record, bool deepCopyOps);
-
-    // An OperationList encapsulates a set of operation offsets into the picture byte
-    // stream along with the CTMs needed for those operation.
-    class OperationList : ::SkNoncopyable {
-    public:
-        // The following three entry points should only be accessed if
-        // 'valid' returns true.
-        int numOps() const { return fOps.count(); }
-        // The offset in the picture of the operation to execute.
-        uint32_t offset(int index) const;
-        // The CTM that must be installed for the operation to behave correctly
-        const SkMatrix& matrix(int index) const;
-
-        SkTDArray<void*> fOps;
-    };
-
-    /** PRIVATE / EXPERIMENTAL -- do not call
-        Return the operations required to render the content inside 'queryRect'.
-    */
-    const OperationList* EXPERIMENTAL_getActiveOps(const SkIRect& queryRect) const;
-
-    void createHeader(SkPictInfo* info) const;
     static bool IsValidPictInfo(const SkPictInfo& info);
+    static SkPicture* Forwardport(const SkPictInfo&, const SkPictureData*);
 
-    friend class SkPictureData;                // to access OperationList
-    friend class SkPictureRecorder;            // just for SkPicture-based constructor
-    friend class SkGpuDevice;                  // for EXPERIMENTAL_getActiveOps/OperationList
-    friend class GrGatherCanvas;               // needs to know if old or new picture
-    friend class SkPicturePlayback;            // to get fData & OperationList
-    friend class SkPictureReplacementPlayback; // to access OperationList
+    SkPictInfo createHeader() const;
+    SkPictureData* backport() const;
 
-    typedef SkRefCnt INHERITED;
-
-    SkPicture(int width, int height, SkRecord*);  // Takes ownership.
-    SkAutoTDelete<SkRecord> fRecord;
-    bool fRecordWillPlayBackBitmaps; // TODO: const
+    mutable uint32_t fUniqueID;
 };
 
 #endif
diff --git a/gfx/skia/skia/include/core/SkPictureRecorder.h b/gfx/skia/skia/include/core/SkPictureRecorder.h
index bd22d5560647..6f95860b70af 100644
--- a/gfx/skia/skia/include/core/SkPictureRecorder.h
+++ b/gfx/skia/skia/include/core/SkPictureRecorder.h
@@ -8,6 +8,7 @@
 #ifndef SkPictureRecorder_DEFINED
 #define SkPictureRecorder_DEFINED
 
+#include "../private/SkMiniRecorder.h"
 #include "SkBBHFactory.h"
 #include "SkPicture.h"
 #include "SkRefCnt.h"
@@ -19,6 +20,7 @@ namespace android {
 #endif
 
 class SkCanvas;
+class SkDrawable;
 class SkPictureRecord;
 class SkRecord;
 class SkRecorder;
@@ -28,42 +30,75 @@ public:
     SkPictureRecorder();
     ~SkPictureRecorder();
 
+    enum RecordFlags {
+        // This flag indicates that, if some BHH is being computed, saveLayer
+        // information should also be extracted at the same time.
+        kComputeSaveLayerInfo_RecordFlag = 0x01,
+
+        // If you call drawPicture() or drawDrawable() on the recording canvas, this flag forces
+        // that object to playback its contents immediately rather than reffing the object.
+        kPlaybackDrawPicture_RecordFlag  = 0x02,
+    };
+
     /** Returns the canvas that records the drawing commands.
-        @param width the base width for the picture, as if the recording
-                     canvas' bitmap had this width.
-        @param height the base width for the picture, as if the recording
-                     canvas' bitmap had this height.
+        @param bounds the cull rect used when recording this picture. Any drawing the falls outside
+                      of this rect is undefined, and may be drawn or it may not.
         @param bbhFactory factory to create desired acceleration structure
         @param recordFlags optional flags that control recording.
         @return the canvas.
     */
-    SkCanvas* beginRecording(int width, int height,
+    SkCanvas* beginRecording(const SkRect& bounds,
                              SkBBHFactory* bbhFactory = NULL,
                              uint32_t recordFlags = 0);
 
-    /** Same as beginRecording(), using a new faster backend. */
-    SkCanvas* EXPERIMENTAL_beginRecording(int width, int height,
-                                          SkBBHFactory* bbhFactory = NULL);
+    SkCanvas* beginRecording(SkScalar width, SkScalar height,
+                             SkBBHFactory* bbhFactory = NULL,
+                             uint32_t recordFlags = 0) {
+        return this->beginRecording(SkRect::MakeWH(width, height), bbhFactory, recordFlags);
+    }
 
     /** Returns the recording canvas if one is active, or NULL if recording is
         not active. This does not alter the refcnt on the canvas (if present).
     */
     SkCanvas* getRecordingCanvas();
 
-    /** Signal that the caller is done recording. This invalidates the canvas
-        returned by beginRecording/getRecordingCanvas, and returns the
-        created SkPicture. Note that the returned picture has its creation
-        ref which the caller must take ownership of.
-    */
-    SkPicture* endRecording();
+    /**
+     *  Signal that the caller is done recording. This invalidates the canvas returned by
+     *  beginRecording/getRecordingCanvas. Ownership of the object is passed to the caller, who
+     *  must call unref() when they are done using it.
+     *
+     *  The returned picture is immutable. If during recording drawables were added to the canvas,
+     *  these will have been "drawn" into a recording canvas, so that this resulting picture will
+     *  reflect their current state, but will not contain a live reference to the drawables
+     *  themselves.
+     */
+    SkPicture* SK_WARN_UNUSED_RESULT endRecordingAsPicture();
 
-    /** Enable/disable all the picture recording optimizations (i.e.,
-        those in SkPictureRecord). It is mainly intended for testing the
-        existing optimizations (i.e., to actually have the pattern
-        appear in an .skp we have to disable the optimization). Call right
-        after 'beginRecording'.
-    */
-    void internalOnly_EnableOpts(bool enableOpts);
+    /**
+     *  Signal that the caller is done recording, and update the cull rect to use for bounding
+     *  box hierarchy (BBH) generation. The behavior is the same as calling
+     *  endRecordingAsPicture(), except that this method updates the cull rect initially passed
+     *  into beginRecording.
+     *  @param cullRect the new culling rectangle to use as the overall bound for BBH generation
+     *                  and subsequent culling operations.
+     *  @return the picture containing the recorded content.
+     */
+    SkPicture* SK_WARN_UNUSED_RESULT endRecordingAsPicture(const SkRect& cullRect);
+
+    /**
+     *  Signal that the caller is done recording. This invalidates the canvas returned by
+     *  beginRecording/getRecordingCanvas. Ownership of the object is passed to the caller, who
+     *  must call unref() when they are done using it.
+     *
+     *  Unlike endRecordingAsPicture(), which returns an immutable picture, the returned drawable
+     *  may contain live references to other drawables (if they were added to the recording canvas)
+     *  and therefore this drawable will reflect the current state of those nested drawables anytime
+     *  it is drawn or a new picture is snapped from it (by calling drawable->newPictureSnapshot()).
+     */
+    SkDrawable* SK_WARN_UNUSED_RESULT endRecordingAsDrawable();
+
+    // Legacy API -- use endRecordingAsPicture instead.
+    SkPicture* SK_WARN_UNUSED_RESULT endRecording() { return this->endRecordingAsPicture(); }
 
 private:
     void reset();
@@ -77,15 +112,13 @@ private:
     friend class SkPictureRecorderReplayTester; // for unit testing
     void partialReplay(SkCanvas* canvas) const;
 
-    int fWidth;
-    int fHeight;
-
-    // One of these two canvases will be non-NULL.
-    SkAutoTUnref<SkPictureRecord> fPictureRecord;  // beginRecording()
-    SkAutoTUnref<SkRecorder>      fRecorder;       // EXPERIMENTAL_beginRecording()
-
-    // Used by EXPERIMENTAL_beginRecording().
-    SkAutoTDelete<SkRecord> fRecord;
+    bool                          fActivelyRecording;
+    uint32_t                      fFlags;
+    SkRect                        fCullRect;
+    SkAutoTUnref<SkBBoxHierarchy> fBBH;
+    SkAutoTUnref<SkRecorder>      fRecorder;
+    SkAutoTUnref<SkRecord>        fRecord;
+    SkMiniRecorder                fMiniRecorder;
 
     typedef SkNoncopyable INHERITED;
 };
diff --git a/gfx/skia/skia/include/core/SkPixelRef.h b/gfx/skia/skia/include/core/SkPixelRef.h
index afab7fad9e04..4591ed82bffb 100644
--- a/gfx/skia/skia/include/core/SkPixelRef.h
+++ b/gfx/skia/skia/include/core/SkPixelRef.h
@@ -8,36 +8,23 @@
 #ifndef SkPixelRef_DEFINED
 #define SkPixelRef_DEFINED
 
+#include "../private/SkAtomics.h"
 #include "SkBitmap.h"
-#include "SkDynamicAnnotations.h"
-#include "SkRefCnt.h"
-#include "SkString.h"
+#include "SkFilterQuality.h"
 #include "SkImageInfo.h"
+#include "../private/SkMutex.h"
+#include "SkPixmap.h"
+#include "SkRefCnt.h"
 #include "SkSize.h"
+#include "SkString.h"
 #include "SkTDArray.h"
 
-//#define xed
-
-#ifdef SK_DEBUG
-    /**
-     *  Defining SK_IGNORE_PIXELREF_SETPRELOCKED will force all pixelref
-     *  subclasses to correctly handle lock/unlock pixels. For performance
-     *  reasons, simple malloc-based subclasses call setPreLocked() to skip
-     *  the overhead of implementing these calls.
-     *
-     *  This build-flag disables that optimization, to add in debugging our
-     *  call-sites, to ensure that they correctly balance their calls of
-     *  lock and unlock.
-     */
-//    #define SK_IGNORE_PIXELREF_SETPRELOCKED
-#endif
-
 class SkColorTable;
 class SkData;
 struct SkIRect;
-class SkMutex;
 
 class GrTexture;
+class SkDiscardableMemory;
 
 /** \class SkPixelRef
 
@@ -49,10 +36,7 @@ class GrTexture;
 */
 class SK_API SkPixelRef : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkPixelRef)
-
     explicit SkPixelRef(const SkImageInfo&);
-    SkPixelRef(const SkImageInfo&, SkBaseMutex* mutex);
     virtual ~SkPixelRef();
 
     const SkImageInfo& info() const {
@@ -75,6 +59,8 @@ public:
      *  Calling lockPixels returns a LockRec struct (on success).
      */
     struct LockRec {
+        LockRec() : fPixels(NULL), fColorTable(NULL) {}
+
         void*           fPixels;
         SkColorTable*   fColorTable;
         size_t          fRowBytes;
@@ -86,11 +72,7 @@ public:
         }
     };
 
-    /**
-     *  Returns true if the lockcount > 0
-     */
-    bool isLocked() const { return fLockCount > 0; }
-
+    SkDEBUGCODE(bool isLocked() const { return fLockCount > 0; })
     SkDEBUGCODE(int getLockCount() const { return fLockCount; })
 
     /**
@@ -127,6 +109,18 @@ public:
     */
     uint32_t getGenerationID() const;
 
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+    /** Returns a non-zero, unique value corresponding to this SkPixelRef.
+        Unlike the generation ID, this ID remains the same even when the pixels
+        are changed. IDs are not reused (until uint32_t wraps), so it is safe
+        to consider this ID unique even after this SkPixelRef is deleted.
+
+        Can be used as a key which uniquely identifies this SkPixelRef
+        regardless of changes to its pixels or deletion of this object.
+     */
+    uint32_t getStableID() const { return fStableID; }
+#endif
+
     /**
      *  Call this if you have changed the contents of the pixels. This will in-
      *  turn cause a different generation ID value to be returned from
@@ -144,7 +138,7 @@ public:
     /** Returns true if this pixelref is marked as immutable, meaning that the
         contents of its pixels will not change for the lifetime of the pixelref.
     */
-    bool isImmutable() const { return fIsImmutable; }
+    bool isImmutable() const { return fMutability != kMutable; }
 
     /** Marks this pixelref is immutable, meaning that the contents of its
         pixels will not change for the lifetime of the pixelref. This state can
@@ -185,36 +179,31 @@ public:
         return this->onRefEncodedData();
     }
 
-    /**
-     *  Experimental -- tells the caller if it is worth it to call decodeInto().
-     *  Just an optimization at this point, to avoid checking the cache first.
-     *  We may remove/change this call in the future.
-     */
-    bool implementsDecodeInto() {
-        return this->onImplementsDecodeInto();
-    }
+    struct LockRequest {
+        SkISize         fSize;
+        SkFilterQuality fQuality;
+    };
 
-    /**
-     *  Return a decoded instance of this pixelRef in bitmap. If this cannot be
-     *  done, return false and the bitmap parameter is ignored/unchanged.
-     *
-     *  pow2 is the requeste power-of-two downscale that the caller needs. This
-     *  can be ignored, and the "original" size can be returned, but if the
-     *  underlying codec can efficiently return a smaller size, that should be
-     *  done. Some examples:
-     *
-     *  To request the "base" version (original scale), pass 0 for pow2
-     *  To request 1/2 scale version (1/2 width, 1/2 height), pass 1 for pow2
-     *  To request 1/4 scale version (1/4 width, 1/4 height), pass 2 for pow2
-     *  ...
-     *
-     *  If this returns true, then bitmap must be "locked" such that
-     *  bitmap->getPixels() will return the correct address.
-     */
-    bool decodeInto(int pow2, SkBitmap* bitmap) {
-        SkASSERT(pow2 >= 0);
-        return this->onDecodeInto(pow2, bitmap);
-    }
+    struct LockResult {
+        LockResult() : fPixels(NULL), fCTable(NULL) {}
+
+        void        (*fUnlockProc)(void* ctx);
+        void*       fUnlockContext;
+
+        const void* fPixels;
+        SkColorTable* fCTable;  // should be NULL unless colortype is kIndex8
+        size_t      fRowBytes;
+        SkISize     fSize;
+
+        void unlock() {
+            if (fUnlockProc) {
+                fUnlockProc(fUnlockContext);
+                fUnlockProc = NULL; // can't unlock twice!
+            }
+        }
+    };
+
+    bool requestLock(const LockRequest&, LockResult*);
 
     /** Are we really wrapping a texture instead of a bitmap?
      */
@@ -227,9 +216,13 @@ public:
      *  If all planes and rowBytes are not NULL, then it should copy the associated Y,U,V data
      *  into those planes of memory supplied by the caller. It should validate that the sizes
      *  match what it expected. If the sizes do not match, it should return false.
+     *
+     *  If colorSpace is not NULL, the YUV color space of the data should be stored in the address
+     *  it points at.
      */
-    bool getYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3]) {
-        return this->onGetYUV8Planes(sizes, planes, rowBytes);
+    bool getYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3],
+                       SkYUVColorSpace* colorSpace) {
+        return this->onGetYUV8Planes(sizes, planes, rowBytes, colorSpace);
     }
 
     bool readPixels(SkBitmap* dst, const SkIRect* subset = NULL);
@@ -237,32 +230,17 @@ public:
     /**
      *  Makes a deep copy of this PixelRef, respecting the requested config.
      *  @param colorType Desired colortype.
+     *  @param profileType Desired colorprofiletype.
      *  @param subset Subset of this PixelRef to copy. Must be fully contained within the bounds of
      *         of this PixelRef.
      *  @return A new SkPixelRef, or NULL if either there is an error (e.g. the destination could
      *          not be created with the given config), or this PixelRef does not support deep
      *          copies.
      */
-    virtual SkPixelRef* deepCopy(SkColorType colortype, const SkIRect* subset) {
+    virtual SkPixelRef* deepCopy(SkColorType, SkColorProfileType, const SkIRect* /*subset*/) {
         return NULL;
     }
 
-#ifdef SK_BUILD_FOR_ANDROID
-    /**
-     *  Acquire a "global" ref on this object.
-     *  The default implementation just calls ref(), but subclasses can override
-     *  this method to implement additional behavior.
-     */
-    virtual void globalRef(void* data=NULL);
-
-    /**
-     *  Release a "global" ref on this object.
-     *  The default implementation just calls unref(), but subclasses can override
-     *  this method to implement additional behavior.
-     */
-    virtual void globalUnref();
-#endif
-
     // Register a listener that may be called the next time our generation ID changes.
     //
     // We'll only call the listener if we're confident that we are the only SkPixelRef with this
@@ -279,6 +257,19 @@ public:
     // Takes ownership of listener.
     void addGenIDChangeListener(GenIDChangeListener* listener);
 
+    // Call when this pixelref is part of the key to a resourcecache entry. This allows the cache
+    // to know automatically those entries can be purged when this pixelref is changed or deleted.
+    void notifyAddedToCache() {
+        fAddedToCache.store(true);
+    }
+
+    virtual SkDiscardableMemory* diagnostic_only_getDiscardable() const { return NULL; }
+
+    /**
+     *  Returns true if the pixels are generated on-the-fly (when required).
+     */
+    bool isLazyGenerated() const { return this->onIsLazyGenerated(); }
+
 protected:
     /**
      *  On success, returns true and fills out the LockRec for the pixels. On
@@ -302,11 +293,6 @@ protected:
     /** Default impl returns true */
     virtual bool onLockPixelsAreWritable() const;
 
-    // returns false;
-    virtual bool onImplementsDecodeInto();
-    // returns false;
-    virtual bool onDecodeInto(int pow2, SkBitmap* bitmap);
-
     /**
      *  For pixelrefs that don't have access to their raw pixels, they may be
      *  able to make a copy of them (e.g. if the pixels are on the GPU).
@@ -318,8 +304,12 @@ protected:
     // default impl returns NULL.
     virtual SkData* onRefEncodedData();
 
+    // default impl does nothing.
+    virtual void onNotifyPixelsChanged();
+
     // default impl returns false.
-    virtual bool onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3]);
+    virtual bool onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3],
+                                 SkYUVColorSpace* colorSpace);
 
     /**
      *  Returns the size (in bytes) of the internally allocated memory.
@@ -331,10 +321,14 @@ protected:
      */
     virtual size_t getAllocatedSizeInBytes() const;
 
+    virtual bool onRequestLock(const LockRequest&, LockResult*);
+
+    virtual bool onIsLazyGenerated() const { return false; }
+
     /** Return the mutex associated with this pixelref. This value is assigned
         in the constructor, and cannot change during the lifetime of the object.
     */
-    SkBaseMutex* mutex() const { return fMutex; }
+    SkBaseMutex* mutex() const { return &fMutex; }
 
     // only call from constructor. Flags this to always be locked, removing
     // the need to grab the mutex and call onLockPixels/onUnlockPixels.
@@ -342,7 +336,7 @@ protected:
     void setPreLocked(void*, size_t rowBytes, SkColorTable*);
 
 private:
-    SkBaseMutex*    fMutex; // must remain in scope for the life of this object
+    mutable SkMutex fMutex;
 
     // mostly const. fInfo.fAlpahType can be changed at runtime.
     const SkImageInfo fInfo;
@@ -351,28 +345,51 @@ private:
     LockRec         fRec;
     int             fLockCount;
 
-    mutable SkTRacy<uint32_t> fGenerationID;
-    mutable SkTRacy<bool>     fUniqueGenerationID;
+    bool lockPixelsInsideMutex();
+
+    // Bottom bit indicates the Gen ID is unique.
+    bool genIDIsUnique() const { return SkToBool(fTaggedGenID.load() & 1); }
+    mutable SkAtomic<uint32_t> fTaggedGenID;
+
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+    const uint32_t fStableID;
+#endif
 
     SkTDArray<GenIDChangeListener*> fGenIDChangeListeners;  // pointers are owned
 
     SkString    fURI;
 
-    // can go from false to true, but never from true to false
-    bool    fIsImmutable;
+    // Set true by caches when they cache content that's derived from the current pixels.
+    SkAtomic<bool> fAddedToCache;
+
+    enum {
+        kMutable,               // PixelRefs begin mutable.
+        kTemporarilyImmutable,  // Considered immutable, but can revert to mutable.
+        kImmutable,             // Once set to this state, it never leaves.
+    } fMutability : 8;          // easily fits inside a byte
+
     // only ever set in constructor, const after that
-    bool    fPreLocked;
+    bool fPreLocked;
 
     void needsNewGenID();
     void callGenIDChangeListeners();
 
-    void setMutex(SkBaseMutex* mutex);
+    void setTemporarilyImmutable();
+    void restoreMutability();
+    friend class SkSurface_Raster;   // For the two methods above.
+
+    bool isPreLocked() const { return fPreLocked; }
+    friend class SkImage_Raster;
 
     // When copying a bitmap to another with the same shape and config, we can safely
     // clone the pixelref generation ID too, which makes them equivalent under caching.
     friend class SkBitmap;  // only for cloneGenID
     void cloneGenID(const SkPixelRef&);
 
+    void setImmutableWithID(uint32_t genID);
+    friend class SkImage_Gpu;
+    friend class SkImageCacherator;
+
     typedef SkRefCnt INHERITED;
 };
 
diff --git a/gfx/skia/skia/include/core/SkPixelSerializer.h b/gfx/skia/skia/include/core/SkPixelSerializer.h
new file mode 100644
index 000000000000..d08920990981
--- /dev/null
+++ b/gfx/skia/skia/include/core/SkPixelSerializer.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPixelSerializer_DEFINED
+#define SkPixelSerializer_DEFINED
+
+#include "SkRefCnt.h"
+
+class SkData;
+struct SkImageInfo;
+
+/**
+ *  Interface for serializing pixels, e.g. SkBitmaps in an SkPicture.
+ */
+class SkPixelSerializer : public SkRefCnt {
+public:
+    virtual ~SkPixelSerializer() {}
+
+    /**
+     *  Call to determine if the client wants to serialize the encoded data. If
+     *  false, serialize another version (e.g. the result of encodePixels).
+     */
+    bool useEncodedData(const void* data, size_t len) {
+        return this->onUseEncodedData(data, len);
+    }
+
+    /**
+     *  Call to get the client's version of encoding these pixels. If it
+     *  returns NULL, serialize the raw pixels.
+     */
+    SkData* encodePixels(const SkImageInfo& info, const void* pixels, size_t rowBytes) {
+        return this->onEncodePixels(info, pixels, rowBytes);
+    }
+
+protected:
+    /**
+     *  Return true if you want to serialize the encoded data, false if you want
+     *  another version serialized (e.g. the result of encodePixels).
+     */
+    virtual bool onUseEncodedData(const void* data, size_t len) = 0;
+
+    /**
+     *  If you want to encode these pixels, return the encoded data as an SkData
+     *  Return null if you want to serialize the raw pixels.
+     */
+    virtual SkData* onEncodePixels(const SkImageInfo&, const void* pixels, size_t rowBytes) = 0;
+};
+#endif // SkPixelSerializer_DEFINED
diff --git a/gfx/skia/skia/include/core/SkPixmap.h b/gfx/skia/skia/include/core/SkPixmap.h
new file mode 100644
index 000000000000..da97025cab03
--- /dev/null
+++ b/gfx/skia/skia/include/core/SkPixmap.h
@@ -0,0 +1,265 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPixmap_DEFINED
+#define SkPixmap_DEFINED
+
+#include "SkColor.h"
+#include "SkFilterQuality.h"
+#include "SkImageInfo.h"
+
+class SkColorTable;
+struct SkMask;
+
+/**
+ *  Pairs SkImageInfo with actual pixels and rowbytes. This class does not try to manage the
+ *  lifetime of the pixel memory (nor the colortable if provided).
+ */
+class SK_API SkPixmap {
+public:
+    SkPixmap()
+        : fPixels(NULL), fCTable(NULL), fRowBytes(0), fInfo(SkImageInfo::MakeUnknown(0, 0))
+    {}
+
+    SkPixmap(const SkImageInfo& info, const void* addr, size_t rowBytes,
+             SkColorTable* ctable = NULL)
+        : fPixels(addr), fCTable(ctable), fRowBytes(rowBytes), fInfo(info)
+    {
+        if (kIndex_8_SkColorType == info.colorType()) {
+            SkASSERT(ctable);
+        } else {
+            SkASSERT(NULL == ctable);
+        }
+    }
+
+    void reset();
+    void reset(const SkImageInfo& info, const void* addr, size_t rowBytes,
+               SkColorTable* ctable = NULL);
+    void reset(const SkImageInfo& info) {
+        this->reset(info, NULL, 0, NULL);
+    }
+
+    /**
+     *  If supported, set this pixmap to point to the pixels in the specified mask and return true.
+     *  On failure, return false and set this pixmap to empty.
+     */
+    bool SK_WARN_UNUSED_RESULT reset(const SkMask&);
+
+    /**
+     *  Computes the intersection of area and this pixmap. If that intersection is non-empty,
+     *  set subset to that intersection and return true.
+     *
+     *  On failure, return false and ignore the subset parameter.
+     */
+    bool SK_WARN_UNUSED_RESULT extractSubset(SkPixmap* subset, const SkIRect& area) const;
+
+    const SkImageInfo& info() const { return fInfo; }
+    size_t rowBytes() const { return fRowBytes; }
+    const void* addr() const { return fPixels; }
+    SkColorTable* ctable() const { return fCTable; }
+
+    int width() const { return fInfo.width(); }
+    int height() const { return fInfo.height(); }
+    SkColorType colorType() const { return fInfo.colorType(); }
+    SkAlphaType alphaType() const { return fInfo.alphaType(); }
+    bool isOpaque() const { return fInfo.isOpaque(); }
+
+    SkIRect bounds() const { return SkIRect::MakeWH(this->width(), this->height()); }
+
+    uint64_t getSize64() const { return sk_64_mul(fInfo.height(), fRowBytes); }
+    uint64_t getSafeSize64() const { return fInfo.getSafeSize64(fRowBytes); }
+    size_t getSafeSize() const { return fInfo.getSafeSize(fRowBytes); }
+
+    const uint32_t* addr32() const {
+        SkASSERT(4 == SkColorTypeBytesPerPixel(fInfo.colorType()));
+        return reinterpret_cast<const uint32_t*>(fPixels);
+    }
+
+    const uint16_t* addr16() const {
+        SkASSERT(2 == SkColorTypeBytesPerPixel(fInfo.colorType()));
+        return reinterpret_cast<const uint16_t*>(fPixels);
+    }
+
+    const uint8_t* addr8() const {
+        SkASSERT(1 == SkColorTypeBytesPerPixel(fInfo.colorType()));
+        return reinterpret_cast<const uint8_t*>(fPixels);
+    }
+
+    const uint32_t* addr32(int x, int y) const {
+        SkASSERT((unsigned)x < (unsigned)fInfo.width());
+        SkASSERT((unsigned)y < (unsigned)fInfo.height());
+        return (const uint32_t*)((const char*)this->addr32() + y * fRowBytes + (x << 2));
+    }
+    const uint16_t* addr16(int x, int y) const {
+        SkASSERT((unsigned)x < (unsigned)fInfo.width());
+        SkASSERT((unsigned)y < (unsigned)fInfo.height());
+        return (const uint16_t*)((const char*)this->addr16() + y * fRowBytes + (x << 1));
+    }
+    const uint8_t* addr8(int x, int y) const {
+        SkASSERT((unsigned)x < (unsigned)fInfo.width());
+        SkASSERT((unsigned)y < (unsigned)fInfo.height());
+        return (const uint8_t*)((const char*)this->addr8() + y * fRowBytes + (x << 0));
+    }
+    const void* addr(int x, int y) const {
+        return (const char*)fPixels + fInfo.computeOffset(x, y, fRowBytes);
+    }
+
+    // Writable versions
+
+    void* writable_addr() const { return const_cast<void*>(fPixels); }
+    uint32_t* writable_addr32(int x, int y) const {
+        return const_cast<uint32_t*>(this->addr32(x, y));
+    }
+    uint16_t* writable_addr16(int x, int y) const {
+        return const_cast<uint16_t*>(this->addr16(x, y));
+    }
+    uint8_t* writable_addr8(int x, int y) const {
+        return const_cast<uint8_t*>(this->addr8(x, y));
+    }
+
+    // copy methods
+
+    bool readPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes,
+                    int srcX, int srcY) const;
+    bool readPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes) const {
+        return this->readPixels(dstInfo, dstPixels, dstRowBytes, 0, 0);
+    }
+    bool readPixels(const SkPixmap& dst, int srcX, int srcY) const {
+        return this->readPixels(dst.info(), dst.writable_addr(), dst.rowBytes(), srcX, srcY);
+    }
+    bool readPixels(const SkPixmap& dst) const {
+        return this->readPixels(dst.info(), dst.writable_addr(), dst.rowBytes(), 0, 0);
+    }
+
+    /**
+     *  Copy the pixels from this pixmap into the dst pixmap, converting as needed into dst's
+     *  colortype/alphatype. If the conversion cannot be performed, false is returned.
+     *
+     *  If dst's dimensions differ from the src dimension, the image will be scaled, applying the
+     *  specified filter-quality.
+     */
+    bool scalePixels(const SkPixmap& dst, SkFilterQuality) const;
+
+    /**
+     *  Returns true if pixels were written to (e.g. if colorType is kUnknown_SkColorType, this
+     *  will return false). If subset does not intersect the bounds of this pixmap, returns false.
+     */
+    bool erase(SkColor, const SkIRect& subset) const;
+
+    bool erase(SkColor color) const { return this->erase(color, this->bounds()); }
+
+private:
+    const void*     fPixels;
+    SkColorTable*   fCTable;
+    size_t          fRowBytes;
+    SkImageInfo     fInfo;
+};
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+
+class SK_API SkAutoPixmapStorage : public SkPixmap {
+public:
+    SkAutoPixmapStorage();
+    ~SkAutoPixmapStorage();
+
+    /**
+     *  Try to allocate memory for the pixels needed to match the specified Info. On success
+     *  return true and fill out the pixmap to point to that memory. The storage will be freed
+     *  when this object is destroyed, or if another call to tryAlloc() or alloc() is made.
+     *
+     *  On failure, return false and reset() the pixmap to empty.
+     */
+    bool tryAlloc(const SkImageInfo&);
+
+    /**
+     *  Allocate memory for the pixels needed to match the specified Info and fill out the pixmap
+     *  to point to that memory. The storage will be freed when this object is destroyed,
+     *  or if another call to tryAlloc() or alloc() is made.
+     *
+     *  If the memory cannot be allocated, calls sk_throw().
+     */
+    void alloc(const SkImageInfo&);
+
+    // We wrap these so we can clear our internal storage
+
+    void reset() {
+        this->freeStorage();
+        this->INHERITED::reset();
+    }
+    void reset(const SkImageInfo& info, const void* addr, size_t rb, SkColorTable* ctable = NULL) {
+        this->freeStorage();
+        this->INHERITED::reset(info, addr, rb, ctable);
+    }
+    void reset(const SkImageInfo& info) {
+        this->freeStorage();
+        this->INHERITED::reset(info);
+    }
+    bool SK_WARN_UNUSED_RESULT reset(const SkMask& mask) {
+        this->freeStorage();
+        return this->INHERITED::reset(mask);
+    }
+
+private:
+    void*   fStorage;
+
+    void freeStorage() {
+        sk_free(fStorage);
+        fStorage = NULL;
+    }
+
+    typedef SkPixmap INHERITED;
+};
+
+/////////////////////////////////////////////////////////////////////////////////////////////
+
+class SK_API SkAutoPixmapUnlock : ::SkNoncopyable {
+public:
+    SkAutoPixmapUnlock() : fUnlockProc(NULL), fIsLocked(false) {}
+    SkAutoPixmapUnlock(const SkPixmap& pm, void (*unlock)(void*), void* ctx)
+        : fUnlockProc(unlock), fUnlockContext(ctx), fPixmap(pm), fIsLocked(true)
+    {}
+    ~SkAutoPixmapUnlock() { this->unlock(); }
+
+    /**
+     *  Return the currently locked pixmap. Undefined if it has been unlocked.
+     */
+    const SkPixmap& pixmap() const {
+        SkASSERT(this->isLocked());
+        return fPixmap;
+    }
+
+    bool isLocked() const { return fIsLocked; }
+
+    /**
+     *  Unlocks the pixmap. Can safely be called more than once as it will only call the underlying
+     *  unlock-proc once.
+     */
+    void unlock() {
+        if (fUnlockProc) {
+            SkASSERT(fIsLocked);
+            fUnlockProc(fUnlockContext);
+            fUnlockProc = NULL;
+            fIsLocked = false;
+        }
+    }
+
+    /**
+     *  If there is a currently locked pixmap, unlock it, then copy the specified pixmap
+     *  and (optional) unlock proc/context.
+     */
+    void reset(const SkPixmap& pm, void (*unlock)(void*), void* ctx);
+
+private:
+    void        (*fUnlockProc)(void*);
+    void*       fUnlockContext;
+    SkPixmap    fPixmap;
+    bool        fIsLocked;
+
+    friend class SkBitmap;
+};
+
+#endif
diff --git a/gfx/skia/skia/include/core/SkPngChunkReader.h b/gfx/skia/skia/include/core/SkPngChunkReader.h
new file mode 100644
index 000000000000..f424dd8cfc2b
--- /dev/null
+++ b/gfx/skia/skia/include/core/SkPngChunkReader.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPngChunkReader_DEFINED
+#define SkPngChunkReader_DEFINED
+
+#include "SkTypes.h"
+#include "SkRefCnt.h"
+
+/**
+ *  SkPngChunkReader
+ *
+ *  Base class for optional callbacks to retrieve meta/chunk data out of a PNG
+ *  encoded image as it is being decoded.
+ *  Used by SkImageDecoder and SkCodec.
+ */
+class SkPngChunkReader : public SkRefCnt {
+public:
+    /**
+     *  This will be called by the decoder when it sees an unknown chunk.
+     *
+     *  Use by SkCodec:
+     *  Depending on the location of the unknown chunks, this callback may be
+     *  called by
+     *      - the factory (NewFromStream/NewFromData)
+     *      - getPixels
+     *      - startScanlineDecode
+     *      - the first call to getScanlines/skipScanlines
+     *  The callback may be called from a different thread (e.g. if the SkCodec
+     *  is passed to another thread), and it may be called multiple times, if
+     *  the SkCodec is used multiple times.
+     *
+     *  @param tag Name for this type of chunk.
+     *  @param data Data to be interpreted by the subclass.
+     *  @param length Number of bytes of data in the chunk.
+     *  @return true to continue decoding, or false to indicate an error, which
+     *      will cause the decoder to not return the image.
+     */
+    virtual bool readChunk(const char tag[], const void* data, size_t length) = 0;
+};
+#endif // SkPngChunkReader_DEFINED
diff --git a/gfx/skia/skia/include/core/SkPoint.h b/gfx/skia/skia/include/core/SkPoint.h
index 8a0480ae7304..52d01ae88ce5 100644
--- a/gfx/skia/skia/include/core/SkPoint.h
+++ b/gfx/skia/skia/include/core/SkPoint.h
@@ -212,7 +212,16 @@ struct SK_API SkPoint {
         v[2].set(r, b);
         v[3].set(r, t);
     }
-    void setRectFan(SkScalar l, SkScalar t, SkScalar r, SkScalar b, size_t stride);
+
+    void setRectFan(SkScalar l, SkScalar t, SkScalar r, SkScalar b, size_t stride) {
+        SkASSERT(stride >= sizeof(SkPoint));
+        
+        ((SkPoint*)((intptr_t)this + 0 * stride))->set(l, t);
+        ((SkPoint*)((intptr_t)this + 1 * stride))->set(l, b);
+        ((SkPoint*)((intptr_t)this + 2 * stride))->set(r, b);
+        ((SkPoint*)((intptr_t)this + 3 * stride))->set(r, t);
+    }
+    
 
     static void Offset(SkPoint points[], int count, const SkPoint& offset) {
         Offset(points, count, offset.fX, offset.fY);
@@ -249,25 +258,25 @@ struct SK_API SkPoint {
 
     /** Set the point (vector) to be unit-length in the same direction as it
         already points.  If the point has a degenerate length (i.e. nearly 0)
-        then return false and do nothing; otherwise return true.
+        then set it to (0,0) and return false; otherwise return true.
     */
     bool normalize();
 
     /** Set the point (vector) to be unit-length in the same direction as the
         x,y params. If the vector (x,y) has a degenerate length (i.e. nearly 0)
-        then return false and do nothing, otherwise return true.
+        then set it to (0,0) and return false, otherwise return true.
     */
     bool setNormalize(SkScalar x, SkScalar y);
 
     /** Scale the point (vector) to have the specified length, and return that
         length. If the original length is degenerately small (nearly zero),
-        do nothing and return false, otherwise return true.
+        set it to (0,0) and return false, otherwise return true.
     */
     bool setLength(SkScalar length);
 
     /** Set the point (vector) to have the specified length in the same
      direction as (x,y). If the vector (x,y) has a degenerate length
-     (i.e. nearly 0) then return false and do nothing, otherwise return true.
+     (i.e. nearly 0) then set it to (0,0) and return false, otherwise return true.
     */
     bool setLength(SkScalar x, SkScalar y, SkScalar length);
 
@@ -339,6 +348,16 @@ struct SK_API SkPoint {
         fY -= v.fY;
     }
 
+    SkPoint operator*(SkScalar scale) const {
+        return Make(fX * scale, fY * scale);
+    }
+    
+    SkPoint& operator*=(SkScalar scale) {
+        fX *= scale;
+        fY *= scale;
+        return *this;
+    }
+    
     /**
      *  Returns true if both X and Y are finite (not infinity or NaN)
      */
@@ -414,7 +433,7 @@ struct SK_API SkPoint {
     static SkScalar Length(SkScalar x, SkScalar y);
 
     /** Normalize pt, returning its previous length. If the prev length is too
-        small (degenerate), return 0 and leave pt unchanged. This uses the same
+        small (degenerate), set pt to (0,0) and return 0. This uses the same
         tolerance as CanNormalize.
 
         Note that this method may be significantly more expensive than
diff --git a/gfx/skia/skia/include/core/SkPoint3.h b/gfx/skia/skia/include/core/SkPoint3.h
new file mode 100644
index 000000000000..af24a8df58ea
--- /dev/null
+++ b/gfx/skia/skia/include/core/SkPoint3.h
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPoint3_DEFINED
+#define SkPoint3_DEFINED
+
+#include "SkScalar.h"
+
+struct SK_API SkPoint3 {
+    SkScalar fX, fY, fZ;
+
+    static SkPoint3 Make(SkScalar x, SkScalar y, SkScalar z) {
+        SkPoint3 pt;
+        pt.set(x, y, z);
+        return pt;
+    }
+
+    SkScalar x() const { return fX; }
+    SkScalar y() const { return fY; }
+    SkScalar z() const { return fZ; }
+
+    void set(SkScalar x, SkScalar y, SkScalar z) { fX = x; fY = y; fZ = z; }
+
+    friend bool operator==(const SkPoint3& a, const SkPoint3& b) {
+        return a.fX == b.fX && a.fY == b.fY && a.fZ == b.fZ;
+    }
+
+    friend bool operator!=(const SkPoint3& a, const SkPoint3& b) {
+        return !(a == b);
+    }
+
+    /** Returns the Euclidian distance from (0,0,0) to (x,y,z)
+    */
+    static SkScalar Length(SkScalar x, SkScalar y, SkScalar z);
+
+    /** Return the Euclidian distance from (0,0,0) to the point
+    */
+    SkScalar length() const { return SkPoint3::Length(fX, fY, fZ); }
+
+    /** Set the point (vector) to be unit-length in the same direction as it
+        already points.  If the point has a degenerate length (i.e., nearly 0)
+        then set it to (0,0,0) and return false; otherwise return true.
+    */
+    bool normalize();
+
+    /** Return a new point whose X, Y and Z coordinates are scaled.
+    */
+    SkPoint3 makeScale(SkScalar scale) const {
+        SkPoint3 p;
+        p.set(scale * fX, scale * fY, scale * fZ);
+        return p;
+    }
+
+    /** Scale the point's coordinates by scale.
+    */
+    void scale(SkScalar value) { 
+        fX *= value;
+        fY *= value;
+        fZ *= value;
+    }
+
+    /** Return a new point whose X, Y and Z coordinates are the negative of the
+        original point's
+    */
+    SkPoint3 operator-() const {
+        SkPoint3 neg;
+        neg.fX = -fX;
+        neg.fY = -fY;
+        neg.fZ = -fZ;
+        return neg;
+    }
+
+    /** Returns a new point whose coordinates are the difference between
+        a and b (i.e., a - b)
+    */
+    friend SkPoint3 operator-(const SkPoint3& a, const SkPoint3& b) {
+        SkPoint3 v;
+        v.set(a.fX - b.fX, a.fY - b.fY, a.fZ - b.fZ);
+        return v;
+    }
+
+    /** Returns a new point whose coordinates are the sum of a and b (a + b)
+    */
+    friend SkPoint3 operator+(const SkPoint3& a, const SkPoint3& b) {
+        SkPoint3 v;
+        v.set(a.fX + b.fX, a.fY + b.fY, a.fZ + b.fZ);
+        return v;
+    }
+
+    /** Add v's coordinates to the point's
+    */
+    void operator+=(const SkPoint3& v) {
+        fX += v.fX;
+        fY += v.fY;
+        fZ += v.fZ;
+    }
+
+    /** Subtract v's coordinates from the point's
+    */
+    void operator-=(const SkPoint3& v) {
+        fX -= v.fX;
+        fY -= v.fY;
+        fZ -= v.fZ;
+    }
+
+    /** Returns the dot product of a and b, treating them as 3D vectors
+    */
+    static SkScalar DotProduct(const SkPoint3& a, const SkPoint3& b) {
+        return a.fX * b.fX + a.fY * b.fY + a.fZ * b.fZ;
+    }
+
+    SkScalar dot(const SkPoint3& vec) const {
+        return DotProduct(*this, vec);
+    }
+};
+
+typedef SkPoint3 SkVector3;
+typedef SkPoint3 SkColor3f;
+
+#endif
diff --git a/gfx/skia/skia/include/core/SkPostConfig.h b/gfx/skia/skia/include/core/SkPostConfig.h
index d513d20633a9..d23eddf2e624 100644
--- a/gfx/skia/skia/include/core/SkPostConfig.h
+++ b/gfx/skia/skia/include/core/SkPostConfig.h
@@ -5,10 +5,12 @@
  * found in the LICENSE file.
  */
 
+// IWYU pragma: private, include "SkTypes.h"
+
 #ifndef SkPostConfig_DEFINED
 #define SkPostConfig_DEFINED
 
-#if defined(SK_BUILD_FOR_WIN32) || defined(SK_BUILD_FOR_WINCE)
+#if defined(SK_BUILD_FOR_WIN32)
 #  define SK_BUILD_FOR_WIN
 #endif
 
@@ -24,13 +26,12 @@
 
 /**
  * Matrix calculations may be float or double.
- * The default is double, as that is faster given our impl uses doubles
- * for intermediate calculations.
+ * The default is float, as that's what Chromium's using.
  */
 #if defined(SK_MSCALAR_IS_DOUBLE) && defined(SK_MSCALAR_IS_FLOAT)
 #  error "cannot define both SK_MSCALAR_IS_DOUBLE and SK_MSCALAR_IS_FLOAT"
 #elif !defined(SK_MSCALAR_IS_DOUBLE) && !defined(SK_MSCALAR_IS_FLOAT)
-#  define SK_MSCALAR_IS_DOUBLE
+#  define SK_MSCALAR_IS_FLOAT
 #endif
 
 #if defined(SK_CPU_LENDIAN) && defined(SK_CPU_BENDIAN)
@@ -68,6 +69,15 @@
 #  endif
 #endif
 
+// As usual, there are two ways to increase alignment... the MSVC way and the everyone-else way.
+#ifndef SK_STRUCT_ALIGN
+    #ifdef _MSC_VER
+        #define SK_STRUCT_ALIGN(N) __declspec(align(N))
+    #else
+        #define SK_STRUCT_ALIGN(N) __attribute__((aligned(N)))
+    #endif
+#endif
+
 #if !defined(SK_SUPPORT_GPU)
 #  define SK_SUPPORT_GPU 1
 #endif
@@ -88,23 +98,10 @@
 #  endif
 #endif
 
-#if defined(SK_ZLIB_INCLUDE) && defined(SK_SYSTEM_ZLIB)
-#  error "cannot define both SK_ZLIB_INCLUDE and SK_SYSTEM_ZLIB"
-#elif defined(SK_ZLIB_INCLUDE) || defined(SK_SYSTEM_ZLIB)
-#  define SK_HAS_ZLIB
-#endif
-
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef SkNEW
-#  define SkNEW(type_name)                           (new type_name)
-#  define SkNEW_ARGS(type_name, args)                (new type_name args)
-#  define SkNEW_ARRAY(type_name, count)              (new type_name[(count)])
-#  define SkNEW_PLACEMENT(buf, type_name)            (new (buf) type_name)
-#  define SkNEW_PLACEMENT_ARGS(buf, type_name, args) (new (buf) type_name args)
-#  define SkDELETE(obj)                              (delete (obj))
-#  define SkDELETE_ARRAY(array)                      (delete[] (array))
-#endif
+// TODO(mdempsky): Move elsewhere as appropriate.
+#include <new>
 
 #ifndef SK_CRASH
 #  ifdef SK_BUILD_FOR_WIN
@@ -120,23 +117,6 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-/**
- * SK_ENABLE_INST_COUNT controlls printing how many reference counted objects
- * are still held on exit.
- * Defaults to 1 in DEBUG and 0 in RELEASE.
- */
-#ifndef SK_ENABLE_INST_COUNT
-#  ifdef SK_DEBUG
-// Only enabled for static builds, because instance counting relies on static
-// variables in functions defined in header files.
-#    define SK_ENABLE_INST_COUNT !defined(SKIA_DLL)
-#  else
-#    define SK_ENABLE_INST_COUNT 0
-#  endif
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-
 #ifdef SK_BUILD_FOR_WIN
 #  ifndef WIN32_LEAN_AND_MEAN
 #    define WIN32_LEAN_AND_MEAN
@@ -167,8 +147,23 @@
 #
 #endif
 
+#if defined(GOOGLE3)
+    // Used as argument to DumpStackTrace in SK_ALWAYSBREAK.
+    void SkDebugfForDumpStackTrace(const char* data, void* unused);
+#endif
+
 #ifndef SK_ALWAYSBREAK
-#  ifdef SK_DEBUG
+#  if defined(GOOGLE3)
+     void DumpStackTrace(int skip_count, void w(const char*, void*),
+                         void* arg);
+#    define SK_ALWAYSBREAK(cond) do { \
+              if (cond) break; \
+              SkNO_RETURN_HINT(); \
+              SkDebugf("%s:%d: failed assertion \"%s\"\n", __FILE__, __LINE__, #cond); \
+              DumpStackTrace(0, SkDebugfForDumpStackTrace, nullptr); \
+              SK_CRASH(); \
+        } while (false)
+#  elif defined(SK_DEBUG)
 #    define SK_ALWAYSBREAK(cond) do { \
               if (cond) break; \
               SkNO_RETURN_HINT(); \
@@ -229,26 +224,7 @@
          SK_ ## C3 ## 32_SHIFT == 24)
 #endif
 
-//////////////////////////////////////////////////////////////////////
-
-// TODO: rebaseline as needed so we can remove this flag entirely.
-//  - all platforms have int64_t now
-//  - we have slightly different fixed math results because of this check
-//    since we don't define this for linux/android
-#if defined(SK_BUILD_FOR_WIN32) || defined(SK_BUILD_FOR_MAC)
-#  ifndef SkLONGLONG
-#    define SkLONGLONG int64_t
-#  endif
-#endif
-
 //////////////////////////////////////////////////////////////////////////////////////////////
-#ifndef SK_BUILD_FOR_WINCE
-#  include <string.h>
-#  include <stdlib.h>
-#else
-#  define _CMNINTRIN_DECLARE_ONLY
-#  include "cmnintrin.h"
-#endif
 
 #if defined SK_DEBUG && defined SK_BUILD_FOR_WIN32
 #  ifdef free
@@ -293,29 +269,6 @@
 
 //////////////////////////////////////////////////////////////////////
 
-#ifndef SK_OVERRIDE
-#  if defined(_MSC_VER)
-#    define SK_OVERRIDE override
-#  elif defined(__clang__)
-     // Using __attribute__((override)) on clang does not appear to always work.
-     // Clang defaults to C++03 and warns about using override. Squelch that. Intentionally no
-     // push/pop here so all users of SK_OVERRIDE ignore the warning too. This is like passing
-     // -Wno-c++11-extensions, except that GCC won't die (because it won't see this pragma).
-#    pragma clang diagnostic ignored "-Wc++11-extensions"
-#
-#    if __has_feature(cxx_override_control)
-#      define SK_OVERRIDE override
-#    elif defined(__has_extension) && __has_extension(cxx_override_control)
-#      define SK_OVERRIDE override
-#    endif
-#  endif
-#  ifndef SK_OVERRIDE
-#    define SK_OVERRIDE
-#  endif
-#endif
-
-//////////////////////////////////////////////////////////////////////
-
 #if !defined(SK_UNUSED)
 #  define SK_UNUSED SK_ATTRIBUTE(unused)
 #endif
@@ -347,14 +300,25 @@
 #  endif
 #endif
 
+#if defined(SK_BUILD_FOR_WIN) && SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
+    #define SK_VECTORCALL __vectorcall
+#elif defined(SK_CPU_ARM32)
+    #define SK_VECTORCALL __attribute__((pcs("aapcs-vfp")))
+#else
+    #define SK_VECTORCALL
+#endif
+
 //////////////////////////////////////////////////////////////////////
 
-#if defined(__clang__) || defined(__GNUC__)
-#  define SK_PREFETCH(ptr) __builtin_prefetch(ptr)
-#  define SK_WRITE_PREFETCH(ptr) __builtin_prefetch(ptr, 1)
+#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1
+    #define SK_PREFETCH(ptr)       _mm_prefetch(reinterpret_cast<const char*>(ptr), _MM_HINT_T0)
+    #define SK_WRITE_PREFETCH(ptr) _mm_prefetch(reinterpret_cast<const char*>(ptr), _MM_HINT_T0)
+#elif defined(__GNUC__)
+    #define SK_PREFETCH(ptr)       __builtin_prefetch(ptr)
+    #define SK_WRITE_PREFETCH(ptr) __builtin_prefetch(ptr, 1)
 #else
-#  define SK_PREFETCH(ptr)
-#  define SK_WRITE_PREFETCH(ptr)
+    #define SK_PREFETCH(ptr)
+    #define SK_WRITE_PREFETCH(ptr)
 #endif
 
 //////////////////////////////////////////////////////////////////////
@@ -385,33 +349,14 @@
 
 //////////////////////////////////////////////////////////////////////
 
-#ifndef SK_ATOMICS_PLATFORM_H
-#  if defined(_MSC_VER)
-#    define SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_win.h"
+#ifndef SK_EGL
+#  if defined(SK_BUILD_FOR_ANDROID)
+#    define SK_EGL 1
 #  else
-#    define SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_sync.h"
+#    define SK_EGL 0
 #  endif
 #endif
 
-#ifndef SK_MUTEX_PLATFORM_H
-#  if defined(SK_BUILD_FOR_WIN)
-#    define SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_win.h"
-#  else
-#    define SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"
-#  endif
-#endif
-
-#ifndef SK_BARRIERS_PLATFORM_H
-#  if SK_HAS_COMPILER_FEATURE(thread_sanitizer)
-#    define SK_BARRIERS_PLATFORM_H "../../src/ports/SkBarriers_tsan.h"
-#  elif defined(SK_CPU_ARM32) || defined(SK_CPU_ARM64)
-#    define SK_BARRIERS_PLATFORM_H "../../src/ports/SkBarriers_arm.h"
-#  else
-#    define SK_BARRIERS_PLATFORM_H "../../src/ports/SkBarriers_x86.h"
-#  endif
-#endif
-
-
 //////////////////////////////////////////////////////////////////////
 
 #if defined(SK_GAMMA_EXPONENT) && defined(SK_GAMMA_SRGB)
@@ -422,4 +367,10 @@
 #  define SK_GAMMA_EXPONENT (2.2f)
 #endif
 
+//////////////////////////////////////////////////////////////////////
+
+#ifndef GR_TEST_UTILS
+#  define GR_TEST_UTILS 1
+#endif
+
 #endif // SkPostConfig_DEFINED
diff --git a/gfx/skia/skia/include/core/SkPreConfig.h b/gfx/skia/skia/include/core/SkPreConfig.h
index c7331113dc5f..a1a3037b9485 100644
--- a/gfx/skia/skia/include/core/SkPreConfig.h
+++ b/gfx/skia/skia/include/core/SkPreConfig.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,42 +5,32 @@
  * found in the LICENSE file.
  */
 
+// IWYU pragma: private, include "SkTypes.h"
 
 #ifndef SkPreConfig_DEFINED
 #define SkPreConfig_DEFINED
 
-#ifdef WEBKIT_VERSION_MIN_REQUIRED
-    #include "config.h"
-#endif
-
 // Allows embedders that want to disable macros that take arguments to just
 // define that symbol to be one of these
-//
 #define SK_NOTHING_ARG1(arg1)
 #define SK_NOTHING_ARG2(arg1, arg2)
 #define SK_NOTHING_ARG3(arg1, arg2, arg3)
 
 //////////////////////////////////////////////////////////////////////
 
-#if !defined(SK_BUILD_FOR_ANDROID) && !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_PALM) && !defined(SK_BUILD_FOR_WINCE) && !defined(SK_BUILD_FOR_WIN32) && !defined(SK_BUILD_FOR_UNIX) && !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_SDL) && !defined(SK_BUILD_FOR_BREW) && !defined(SK_BUILD_FOR_NACL)
+#if !defined(SK_BUILD_FOR_ANDROID) && !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_WIN32) && !defined(SK_BUILD_FOR_UNIX) && !defined(SK_BUILD_FOR_MAC)
 
     #ifdef __APPLE__
         #include "TargetConditionals.h"
     #endif
 
-    #if defined(PALMOS_SDK_VERSION)
-        #define SK_BUILD_FOR_PALM
-    #elif defined(UNDER_CE)
-        #define SK_BUILD_FOR_WINCE
-    #elif defined(WIN32)
-        #define SK_BUILD_FOR_WIN32
-    #elif defined(__SYMBIAN32__)
+    #if defined(WIN32) || defined(__SYMBIAN32__)
         #define SK_BUILD_FOR_WIN32
     #elif defined(ANDROID)
         #define SK_BUILD_FOR_ANDROID
-    #elif defined(linux) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
-          defined(__sun) || defined(__NetBSD__) || defined(__DragonFly__) || \
-          defined(__GLIBC__) || defined(__GNU__)
+    #elif defined(linux) || defined(__linux) || defined(__FreeBSD__) || \
+          defined(__OpenBSD__) || defined(__sun) || defined(__NetBSD__) || \
+          defined(__DragonFly__) || defined(__GLIBC__) || defined(__GNU__)
         #define SK_BUILD_FOR_UNIX
     #elif TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
         #define SK_BUILD_FOR_IOS
@@ -125,12 +114,18 @@
 #define SK_CPU_SSE_LEVEL_SSSE3    31
 #define SK_CPU_SSE_LEVEL_SSE41    41
 #define SK_CPU_SSE_LEVEL_SSE42    42
+#define SK_CPU_SSE_LEVEL_AVX      51
+#define SK_CPU_SSE_LEVEL_AVX2     52
 
 // Are we in GCC?
 #ifndef SK_CPU_SSE_LEVEL
     // These checks must be done in descending order to ensure we set the highest
     // available SSE level.
-    #if defined(__SSE4_2__)
+    #if defined(__AVX2__)
+        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_AVX2
+    #elif defined(__AVX__)
+        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_AVX
+    #elif defined(__SSE4_2__)
         #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE42
     #elif defined(__SSE4_1__)
         #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE41
@@ -147,9 +142,13 @@
 #ifndef SK_CPU_SSE_LEVEL
     // These checks must be done in descending order to ensure we set the highest
     // available SSE level. 64-bit intel guarantees at least SSE2 support.
-    #if defined(_M_X64) || defined(_M_AMD64)
-        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE2
-    #elif defined (_M_IX86_FP)
+    #if defined(__AVX2__)
+        #define SK_CPU_SSE_LEVEL        SK_CPU_SSE_LEVEL_AVX2
+    #elif defined(__AVX__)
+        #define SK_CPU_SSE_LEVEL        SK_CPU_SSE_LEVEL_AVX
+    #elif defined(_M_X64) || defined(_M_AMD64)
+        #define SK_CPU_SSE_LEVEL        SK_CPU_SSE_LEVEL_SSE2
+    #elif defined(_M_IX86_FP)
         #if _M_IX86_FP >= 2
             #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE2
         #elif _M_IX86_FP == 1
@@ -183,12 +182,6 @@
         #else
             #define SK_ARM_ARCH 3
         #endif
-
-        #if defined(__thumb2__) && (SK_ARM_ARCH >= 6) \
-                || !defined(__thumb__) && ((SK_ARM_ARCH > 5) || defined(__ARM_ARCH_5E__) \
-                || defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5TEJ__))
-            #define SK_ARM_HAS_EDSP
-        #endif
     #endif
 #endif
 
@@ -197,6 +190,12 @@
     #define SK_CPU_ARM64
 #endif
 
+// All 64-bit ARM chips have NEON.  Many 32-bit ARM chips do too.
+// TODO: Why don't we want NEON on iOS?
+#if !defined(SK_ARM_HAS_NEON) && !defined(SK_BUILD_FOR_IOS) && defined(__ARM_NEON)
+    #define SK_ARM_HAS_NEON
+#endif
+
 //////////////////////////////////////////////////////////////////////
 
 #if !defined(SKIA_IMPLEMENTATION)
diff --git a/gfx/skia/skia/include/core/SkRRect.h b/gfx/skia/skia/include/core/SkRRect.h
index d3f48cd48474..8d8cdbf02c79 100644
--- a/gfx/skia/skia/include/core/SkRRect.h
+++ b/gfx/skia/skia/include/core/SkRRect.h
@@ -52,9 +52,6 @@ public:
      * by type(). The subtypes become progressively less restrictive.
      */
     enum Type {
-        // !< Internal indicator that the sub type must be computed.
-        kUnknown_Type = -1,
-
         // !< The RR is empty
         kEmpty_Type,
 
@@ -90,12 +87,7 @@ public:
      */
     Type getType() const {
         SkDEBUGCODE(this->validate();)
-
-        if (kUnknown_Type == fType) {
-            this->computeType();
-        }
-        SkASSERT(kUnknown_Type != fType);
-        return fType;
+        return static_cast<Type>(fType);
     }
 
     Type type() const { return this->getType(); }
@@ -104,8 +96,13 @@ public:
     inline bool isRect() const { return kRect_Type == this->getType(); }
     inline bool isOval() const { return kOval_Type == this->getType(); }
     inline bool isSimple() const { return kSimple_Type == this->getType(); }
+    // TODO: should isSimpleCircular & isCircle take a tolerance? This could help
+    // instances where the mapping to device space is noisy.
     inline bool isSimpleCircular() const {
-        return this->isSimple() && fRadii[0].fX == fRadii[0].fY;
+        return this->isSimple() && SkScalarNearlyEqual(fRadii[0].fX, fRadii[0].fY);
+    }
+    inline bool isCircle() const {
+        return this->isOval() && SkScalarNearlyEqual(fRadii[0].fX, fRadii[0].fY);
     }
     inline bool isNinePatch() const { return kNinePatch_Type == this->getType(); }
     inline bool isComplex() const { return kComplex_Type == this->getType(); }
@@ -130,32 +127,48 @@ public:
      * Set this RR to match the supplied rect. All radii will be 0.
      */
     void setRect(const SkRect& rect) {
-        if (rect.isEmpty()) {
+        fRect = rect;
+        fRect.sort();
+
+        if (fRect.isEmpty()) {
             this->setEmpty();
             return;
         }
 
-        fRect = rect;
         memset(fRadii, 0, sizeof(fRadii));
         fType = kRect_Type;
 
         SkDEBUGCODE(this->validate();)
     }
 
+    static SkRRect MakeRect(const SkRect& r) {
+        SkRRect rr;
+        rr.setRect(r);
+        return rr;
+    }
+    
+    static SkRRect MakeOval(const SkRect& oval) {
+        SkRRect rr;
+        rr.setOval(oval);
+        return rr;
+    }
+
     /**
      * Set this RR to match the supplied oval. All x radii will equal half the
      * width and all y radii will equal half the height.
      */
     void setOval(const SkRect& oval) {
-        if (oval.isEmpty()) {
+        fRect = oval;
+        fRect.sort();
+
+        if (fRect.isEmpty()) {
             this->setEmpty();
             return;
         }
 
-        SkScalar xRad = SkScalarHalf(oval.width());
-        SkScalar yRad = SkScalarHalf(oval.height());
+        SkScalar xRad = SkScalarHalf(fRect.width());
+        SkScalar yRad = SkScalarHalf(fRect.height());
 
-        fRect = oval;
         for (int i = 0; i < 4; ++i) {
             fRadii[i].set(xRad, yRad);
         }
@@ -292,23 +305,20 @@ public:
      */
     bool transform(const SkMatrix& matrix, SkRRect* dst) const;
 
-#ifdef SK_DEVELOPER
-    /**
-     * Prints the rrect using SkDebugf. This is intended for Skia development debugging. Don't
-     * rely on the existence of this function or the formatting of its output.
-     */
-    void dump() const;
-#endif
+    void dump(bool asHex) const;
+    void dump() const { this->dump(false); }
+    void dumpHex() const { this->dump(true); }
 
 private:
     SkRect fRect;
     // Radii order is UL, UR, LR, LL. Use Corner enum to index into fRadii[]
     SkVector fRadii[4];
-    mutable Type fType;
+    // use an explicitly sized type so we're sure the class is dense (no uninitialized bytes)
+    int32_t fType;
     // TODO: add padding so we can use memcpy for flattening and not copy
     // uninitialized data
 
-    void computeType() const;
+    void computeType();
     bool checkCornerContainment(SkScalar x, SkScalar y) const;
 
     // to access fRadii directly
diff --git a/gfx/skia/skia/include/core/SkRSXform.h b/gfx/skia/skia/include/core/SkRSXform.h
new file mode 100644
index 000000000000..7af6e67c128d
--- /dev/null
+++ b/gfx/skia/skia/include/core/SkRSXform.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkRSXform_DEFINED
+#define SkRSXform_DEFINED
+
+#include "SkScalar.h"
+
+/**
+ *  A compressed form of a rotation+scale matrix.
+ *
+ *  [ fSCos     -fSSin    fTx ]
+ *  [ fSSin      fSCos    fTy ]
+ *  [     0          0      1 ]
+ */
+struct SkRSXform {
+    static SkRSXform Make(SkScalar scos, SkScalar ssin, SkScalar tx, SkScalar ty) {
+        SkRSXform xform = { scos, ssin, tx, ty };
+        return xform;
+    }
+
+    /*
+     *  Initialize a new xform based on the scale, rotation (in radians), final tx,ty location
+     *  and anchor-point ax,ay within the src quad.
+     *
+     *  Note: the anchor point is not normalized (e.g. 0...1) but is in pixels of the src image.
+     */
+    static SkRSXform MakeFromRadians(SkScalar scale, SkScalar radians, SkScalar tx, SkScalar ty,
+                                     SkScalar ax, SkScalar ay) {
+        const SkScalar s = SkScalarSin(radians) * scale;
+        const SkScalar c = SkScalarCos(radians) * scale;
+        return Make(c, s, tx + -c * ax + s * ay, ty + -s * ax - c * ay);
+    }
+
+    SkScalar fSCos;
+    SkScalar fSSin;
+    SkScalar fTx;
+    SkScalar fTy;
+
+    bool rectStaysRect() const {
+        return 0 == fSCos || 0 == fSSin;
+    }
+    
+    void setIdentity() {
+        fSCos = 1;
+        fSSin = fTx = fTy = 0;
+    }
+
+    void set(SkScalar scos, SkScalar ssin, SkScalar tx, SkScalar ty) {
+        fSCos = scos;
+        fSSin = ssin;
+        fTx = tx;
+        fTy = ty;
+    }
+
+    void toQuad(SkScalar width, SkScalar height, SkPoint quad[4]) const;
+    void toQuad(const SkSize& size, SkPoint quad[4]) const {
+        this->toQuad(size.width(), size.height(), quad);
+    }
+};
+
+#endif
+
diff --git a/gfx/skia/skia/include/core/SkRasterizer.h b/gfx/skia/skia/include/core/SkRasterizer.h
index d6e514c26321..1881ccef2455 100644
--- a/gfx/skia/skia/include/core/SkRasterizer.h
+++ b/gfx/skia/skia/include/core/SkRasterizer.h
@@ -20,8 +20,6 @@ struct SkIRect;
 
 class SK_API SkRasterizer : public SkFlattenable {
 public:
-    SK_DECLARE_INST_COUNT(SkRasterizer)
-
     /** Turn the path into a mask, respecting the specified local->device matrix.
     */
     bool rasterize(const SkPath& path, const SkMatrix& matrix,
@@ -32,8 +30,6 @@ public:
 
 protected:
     SkRasterizer() {}
-    SkRasterizer(SkReadBuffer& buffer) : INHERITED(buffer) {}
-
     virtual bool onRasterize(const SkPath& path, const SkMatrix& matrix,
                              const SkIRect* clipBounds,
                              SkMask* mask, SkMask::CreateMode mode) const;
diff --git a/gfx/skia/skia/include/core/SkRect.h b/gfx/skia/skia/include/core/SkRect.h
index d699156ebf2e..fe276e6710b0 100644
--- a/gfx/skia/skia/include/core/SkRect.h
+++ b/gfx/skia/skia/include/core/SkRect.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,13 +5,14 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkRect_DEFINED
 #define SkRect_DEFINED
 
 #include "SkPoint.h"
 #include "SkSize.h"
 
+struct SkRect;
+
 /** \struct SkIRect
 
     SkIRect holds four 32 bit integer coordinates for a rectangle
@@ -77,6 +77,8 @@ struct SK_API SkIRect {
      */
     int height() const { return fBottom - fTop; }
 
+    SkISize size() const { return SkISize::Make(this->width(), this->height()); }
+
     /**
      *  Since the center of an integer rect may fall on a factional value, this
      *  method is defined to return (right + left) >> 1.
@@ -160,17 +162,24 @@ struct SK_API SkIRect {
     /**
      *  Return a new IRect, built as an offset of this rect.
      */
-    SkIRect makeOffset(int dx, int dy) const {
+    SkIRect makeOffset(int32_t dx, int32_t dy) const {
         return MakeLTRB(fLeft + dx, fTop + dy, fRight + dx, fBottom + dy);
     }
 
     /**
      *  Return a new IRect, built as an inset of this rect.
      */
-    SkIRect makeInset(int dx, int dy) const {
+    SkIRect makeInset(int32_t dx, int32_t dy) const {
         return MakeLTRB(fLeft + dx, fTop + dy, fRight - dx, fBottom - dy);
     }
 
+    /**
+     *  Return a new Rect, built as an outset of this rect.
+     */
+    SkIRect makeOutset(int32_t dx, int32_t dy) const {
+        return MakeLTRB(fLeft - dx, fTop - dy, fRight + dx, fBottom + dy);
+    }
+
     /** Offset set the rectangle by adding dx to its left and right,
         and adding dy to its top and bottom.
     */
@@ -244,6 +253,10 @@ struct SK_API SkIRect {
                 fRight >= r.fRight && fBottom >= r.fBottom;
     }
 
+    /** Returns true if the specified rectangle r is inside or equal to this rectangle.
+    */
+    bool contains(const SkRect& r) const;
+
     /** Return true if this rectangle contains the specified rectangle.
         For speed, this method does not check if either this or the specified
         rectangles are empty, and if either is, its return value is undefined.
@@ -267,8 +280,7 @@ struct SK_API SkIRect {
         intersection, otherwise return false and do not change this rectangle.
         If either rectangle is empty, do nothing and return false.
     */
-    bool intersect(const SkIRect& r) {
-        SkASSERT(&r);
+    bool SK_WARN_UNUSED_RESULT intersect(const SkIRect& r) {
         return this->intersect(r.fLeft, r.fTop, r.fRight, r.fBottom);
     }
 
@@ -276,7 +288,7 @@ struct SK_API SkIRect {
         that intersection, otherwise return false and do not change this
         rectangle. If either rectangle is empty, do nothing and return false.
     */
-    bool intersect(const SkIRect& a, const SkIRect& b) {
+    bool SK_WARN_UNUSED_RESULT intersect(const SkIRect& a, const SkIRect& b) {
 
         if (!a.isEmpty() && !b.isEmpty() &&
                 a.fLeft < b.fRight && b.fLeft < a.fRight &&
@@ -296,7 +308,7 @@ struct SK_API SkIRect {
         If either is, then the return result is undefined. In the debug build,
         we assert that both rectangles are non-empty.
     */
-    bool intersectNoEmptyCheck(const SkIRect& a, const SkIRect& b) {
+    bool SK_WARN_UNUSED_RESULT intersectNoEmptyCheck(const SkIRect& a, const SkIRect& b) {
         SkASSERT(!a.isEmpty() && !b.isEmpty());
 
         if (a.fLeft < b.fRight && b.fLeft < a.fRight &&
@@ -315,7 +327,8 @@ struct SK_API SkIRect {
         otherwise return false and do not change this rectangle.
         If either rectangle is empty, do nothing and return false.
     */
-    bool intersect(int32_t left, int32_t top, int32_t right, int32_t bottom) {
+    bool SK_WARN_UNUSED_RESULT intersect(int32_t left, int32_t top, 
+                                         int32_t right, int32_t bottom) {
         if (left < right && top < bottom && !this->isEmpty() &&
                 fLeft < right && left < fRight && fTop < bottom && top < fBottom) {
             if (fLeft < left) fLeft = left;
@@ -331,8 +344,8 @@ struct SK_API SkIRect {
      */
     static bool Intersects(const SkIRect& a, const SkIRect& b) {
         return  !a.isEmpty() && !b.isEmpty() &&              // check for empties
-        a.fLeft < b.fRight && b.fLeft < a.fRight &&
-        a.fTop < b.fBottom && b.fTop < a.fBottom;
+                a.fLeft < b.fRight && b.fLeft < a.fRight &&
+                a.fTop < b.fBottom && b.fTop < a.fBottom;
     }
 
     /**
@@ -395,6 +408,12 @@ struct SK_API SkRect {
         return r;
     }
 
+    static SkRect SK_WARN_UNUSED_RESULT MakeIWH(int w, int h) {
+        SkRect r;
+        r.set(0, 0, SkIntToScalar(w), SkIntToScalar(h));
+        return r;
+    }
+
     static SkRect SK_WARN_UNUSED_RESULT MakeSize(const SkSize& size) {
         SkRect r;
         r.set(0, 0, size.width(), size.height());
@@ -595,7 +614,7 @@ struct SK_API SkRect {
     SkRect makeOffset(SkScalar dx, SkScalar dy) const {
         return MakeLTRB(fLeft + dx, fTop + dy, fRight + dx, fBottom + dy);
     }
-
+    
     /**
      *  Return a new Rect, built as an inset of this rect.
      */
@@ -603,6 +622,13 @@ struct SK_API SkRect {
         return MakeLTRB(fLeft + dx, fTop + dy, fRight - dx, fBottom - dy);
     }
 
+    /**
+     *  Return a new Rect, built as an outset of this rect.
+     */
+    SkRect makeOutset(SkScalar dx, SkScalar dy) const {
+        return MakeLTRB(fLeft - dx, fTop - dy, fRight + dx, fBottom + dy);
+    }
+
     /** Offset set the rectangle by adding dx to its left and right,
         and adding dy to its top and bottom.
     */
@@ -650,42 +676,54 @@ struct SK_API SkRect {
         intersection, otherwise return false and do not change this rectangle.
         If either rectangle is empty, do nothing and return false.
     */
-    bool intersect(const SkRect& r);
-    bool intersect2(const SkRect& r);
+    bool SK_WARN_UNUSED_RESULT intersect(const SkRect& r);
 
     /** If this rectangle intersects the rectangle specified by left, top, right, bottom,
         return true and set this rectangle to that intersection, otherwise return false
         and do not change this rectangle.
         If either rectangle is empty, do nothing and return false.
     */
-    bool intersect(SkScalar left, SkScalar top, SkScalar right, SkScalar bottom);
+    bool SK_WARN_UNUSED_RESULT intersect(SkScalar left, SkScalar top, 
+                                         SkScalar right, SkScalar bottom);
 
+    /**
+     *  If rectangles a and b intersect, return true and set this rectangle to
+     *  that intersection, otherwise return false and do not change this
+     *  rectangle. If either rectangle is empty, do nothing and return false.
+     */
+    bool SK_WARN_UNUSED_RESULT intersect(const SkRect& a, const SkRect& b);
+
+
+private:
+    static bool Intersects(SkScalar al, SkScalar at, SkScalar ar, SkScalar ab,
+                           SkScalar bl, SkScalar bt, SkScalar br, SkScalar bb) {
+        SkScalar L = SkMaxScalar(al, bl);
+        SkScalar R = SkMinScalar(ar, br);
+        SkScalar T = SkMaxScalar(at, bt);
+        SkScalar B = SkMinScalar(ab, bb);
+        return L < R && T < B;
+    }
+
+public:
     /**
      *  Return true if this rectangle is not empty, and the specified sides of
      *  a rectangle are not empty, and they intersect.
      */
     bool intersects(SkScalar left, SkScalar top, SkScalar right, SkScalar bottom) const {
-        return // first check that both are not empty
-               left < right && top < bottom &&
-               fLeft < fRight && fTop < fBottom &&
-               // now check for intersection
-               fLeft < right && left < fRight &&
-               fTop < bottom && top < fBottom;
+        return Intersects(fLeft, fTop, fRight, fBottom, left, top, right, bottom);
     }
 
-    /** If rectangles a and b intersect, return true and set this rectangle to
-     *  that intersection, otherwise return false and do not change this
-     *  rectangle. If either rectangle is empty, do nothing and return false.
-     */
-    bool intersect(const SkRect& a, const SkRect& b);
+    bool intersects(const SkRect& r) const {
+        return Intersects(fLeft, fTop, fRight, fBottom,
+                          r.fLeft, r.fTop, r.fRight, r.fBottom);
+    }
 
     /**
      *  Return true if rectangles a and b are not empty and intersect.
      */
     static bool Intersects(const SkRect& a, const SkRect& b) {
-        return  !a.isEmpty() && !b.isEmpty() &&
-                a.fLeft < b.fRight && b.fLeft < a.fRight &&
-                a.fTop < b.fBottom && b.fTop < a.fBottom;
+        return Intersects(a.fLeft, a.fTop, a.fRight, a.fBottom,
+                          b.fLeft, b.fTop, b.fRight, b.fBottom);
     }
 
     /**
@@ -702,8 +740,27 @@ struct SK_API SkRect {
     void join(const SkRect& r) {
         this->join(r.fLeft, r.fTop, r.fRight, r.fBottom);
     }
-    // alias for join()
-    void growToInclude(const SkRect& r) { this->join(r); }
+
+    void joinNonEmptyArg(const SkRect& r) {
+        SkASSERT(!r.isEmpty());
+        // if we are empty, just assign
+        if (fLeft >= fRight || fTop >= fBottom) {
+            *this = r;
+        } else {
+            this->joinPossiblyEmptyRect(r);
+        }
+    }
+
+    /**
+     * Joins the rectangle with another without checking if either are empty (may produce unexpected
+     * results if either rect is inverted).
+     */
+    void joinPossiblyEmptyRect(const SkRect& r) {
+        fLeft   = SkMinScalar(fLeft, r.left());
+        fTop    = SkMinScalar(fTop, r.top());
+        fRight  = SkMaxScalar(fRight, r.right());
+        fBottom = SkMaxScalar(fBottom, r.bottom());
+    }
 
     /**
      *  Grow the rect to include the specified (x,y). After this call, the
@@ -747,6 +804,16 @@ struct SK_API SkRect {
                 fRight >= r.fRight && fBottom >= r.fBottom;
     }
 
+    /**
+     * Returns true if the specified rectangle r is inside or equal to this rectangle.
+     */
+    bool contains(const SkIRect& r) const {
+        // todo: can we eliminate the this->isEmpty check?
+        return  !r.isEmpty() && !this->isEmpty() &&
+                fLeft <= SkIntToScalar(r.fLeft) && fTop <= SkIntToScalar(r.fTop) &&
+                fRight >= SkIntToScalar(r.fRight) && fBottom >= SkIntToScalar(r.fBottom);
+    }
+
     /**
      *  Set the dst rectangle by rounding this rectangle's coordinates to their
      *  nearest integer values using SkScalarRoundToInt.
@@ -786,15 +853,16 @@ struct SK_API SkRect {
     }
 
     /**
-     *  Expand this rectangle by rounding its coordinates "out", choosing the
-     *  floor of top and left, and the ceil of right and bottom. If this rect
-     *  is already on integer coordinates, then it will be unchanged.
+     *  Set the dst rectangle by rounding "out" this rectangle, choosing the
+     *  SkScalarFloorToScalar of top and left, and the SkScalarCeilToScalar of right and bottom.
+     *
+     *  It is safe for this == dst
      */
-    void roundOut() {
-        this->set(SkScalarFloorToScalar(fLeft),
-                  SkScalarFloorToScalar(fTop),
-                  SkScalarCeilToScalar(fRight),
-                  SkScalarCeilToScalar(fBottom));
+    void roundOut(SkRect* dst) const {
+        dst->set(SkScalarFloorToScalar(fLeft),
+                 SkScalarFloorToScalar(fTop),
+                 SkScalarCeilToScalar(fRight),
+                 SkScalarCeilToScalar(fBottom));
     }
 
     /**
@@ -809,39 +877,50 @@ struct SK_API SkRect {
                  SkScalarFloorToInt(fRight), SkScalarFloorToInt(fBottom));
     }
 
-    /**
-     *  Return a new SkIRect which is contains the rounded coordinates of this
-     *  rect using SkScalarRoundToInt.
-     */
+    //! Returns the result of calling round(&dst)
     SkIRect round() const {
         SkIRect ir;
         this->round(&ir);
         return ir;
     }
-
+    
+    //! Returns the result of calling roundOut(&dst)
+    SkIRect roundOut() const {
+        SkIRect ir;
+        this->roundOut(&ir);
+        return ir;
+    }
+    
     /**
      *  Swap top/bottom or left/right if there are flipped (i.e. if width()
      *  or height() would have returned a negative value.) This should be called
      *  if the edges are computed separately, and may have crossed over each
      *  other. When this returns, left <= right && top <= bottom
      */
-    void sort();
+    void sort() {
+        if (fLeft > fRight) {
+            SkTSwap<SkScalar>(fLeft, fRight);
+        }
+
+        if (fTop > fBottom) {
+            SkTSwap<SkScalar>(fTop, fBottom);
+        }
+    }
 
     /**
      *  cast-safe way to treat the rect as an array of (4) SkScalars.
      */
     const SkScalar* asScalars() const { return &fLeft; }
 
-#ifdef SK_DEVELOPER
-    /**
-     * Dumps the rect using SkDebugf. This is intended for Skia development debugging. Don't
-     * rely on the existence of this function or the formatting of its output.
-     */
-    void dump() const {
-        SkDebugf("{ l: %f, t: %f, r: %f, b: %f }", fLeft, fTop, fRight, fBottom);
-    }
-#endif
-
+    void dump(bool asHex) const;
+    void dump() const { this->dump(false); }
+    void dumpHex() const { this->dump(true); }
 };
 
+inline bool SkIRect::contains(const SkRect& r) const {
+    return  !r.isEmpty() && !this->isEmpty() &&     // check for empties
+            (SkScalar)fLeft <= r.fLeft && (SkScalar)fTop <= r.fTop &&
+            (SkScalar)fRight >= r.fRight && (SkScalar)fBottom >= r.fBottom;
+}
+
 #endif
diff --git a/gfx/skia/skia/include/core/SkRefCnt.h b/gfx/skia/skia/include/core/SkRefCnt.h
index ce38c67bd56a..6c608ac93936 100644
--- a/gfx/skia/skia/include/core/SkRefCnt.h
+++ b/gfx/skia/skia/include/core/SkRefCnt.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,14 +5,12 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkRefCnt_DEFINED
 #define SkRefCnt_DEFINED
 
-#include "SkDynamicAnnotations.h"
-#include "SkThread.h"
-#include "SkInstCnt.h"
-#include "SkTemplates.h"
+#include "../private/SkAtomics.h"
+#include "../private/SkUniquePtr.h"
+#include "SkTypes.h"
 
 /** \class SkRefCntBase
 
@@ -27,8 +24,6 @@
 */
 class SK_API SkRefCntBase : SkNoncopyable {
 public:
-    SK_DECLARE_INST_COUNT_ROOT(SkRefCntBase)
-
     /** Default construct, initializing the reference count to 1.
     */
     SkRefCntBase() : fRefCnt(1) {}
@@ -49,22 +44,28 @@ public:
      *  Ensures that all previous owner's actions are complete.
      */
     bool unique() const {
-        // We believe we're reading fRefCnt in a safe way here, so we stifle the TSAN warning about
-        // an unproctected read.  Generally, don't read fRefCnt, and don't stifle this warning.
-        bool const unique = (1 == SK_ANNOTATE_UNPROTECTED_READ(fRefCnt));
-        if (unique) {
-            // Acquire barrier (L/SL), if not provided by load of fRefCnt.
-            // Prevents user's 'unique' code from happening before decrements.
-            //TODO: issue the barrier.
+        if (1 == sk_atomic_load(&fRefCnt, sk_memory_order_acquire)) {
+            // The acquire barrier is only really needed if we return true.  It
+            // prevents code conditioned on the result of unique() from running
+            // until previous owners are all totally done calling unref().
+            return true;
         }
-        return unique;
+        return false;
     }
 
     /** Increment the reference count. Must be balanced by a call to unref().
     */
     void ref() const {
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+        // Android employs some special subclasses that enable the fRefCnt to
+        // go to zero, but not below, prior to reusing the object.  This breaks
+        // the use of unique() on such objects and as such should be removed
+        // once the Android code is fixed.
+        SkASSERT(fRefCnt >= 0);
+#else
         SkASSERT(fRefCnt > 0);
-        sk_atomic_inc(&fRefCnt);  // No barrier required.
+#endif
+        (void)sk_atomic_fetch_add(&fRefCnt, +1, sk_memory_order_relaxed);  // No barrier required.
     }
 
     /** Decrement the reference count. If the reference count is 1 before the
@@ -73,12 +74,11 @@ public:
     */
     void unref() const {
         SkASSERT(fRefCnt > 0);
-        // Release barrier (SL/S), if not provided below.
-        if (sk_atomic_dec(&fRefCnt) == 1) {
-            // Acquire barrier (L/SL), if not provided above.
-            // Prevents code in dispose from happening before the decrement.
-            sk_membar_acquire__after_atomic_dec();
-            internal_dispose();
+        // A release here acts in place of all releases we "should" have been doing in ref().
+        if (1 == sk_atomic_fetch_add(&fRefCnt, -1, sk_memory_order_acq_rel)) {
+            // Like unique(), the acquire is only needed on success, to make sure
+            // code in internal_dispose() doesn't happen before the decrement.
+            this->internal_dispose();
         }
     }
 
@@ -108,7 +108,7 @@ private:
      */
     virtual void internal_dispose() const {
         this->internal_dispose_restore_refcnt_to_1();
-        SkDELETE(this);
+        delete this;
     }
 
     // The following friends are those which override internal_dispose()
@@ -142,7 +142,7 @@ class SK_API SkRefCnt : public SkRefCntBase { };
     } while (0)
 
 
-/** Call obj->ref() and return obj. The obj must not be NULL.
+/** Call obj->ref() and return obj. The obj must not be nullptr.
  */
 template <typename T> static inline T* SkRef(T* obj) {
     SkASSERT(obj);
@@ -168,76 +168,27 @@ template <typename T> static inline void SkSafeUnref(T* obj) {
 }
 
 template<typename T> static inline void SkSafeSetNull(T*& obj) {
-    if (NULL != obj) {
+    if (obj) {
         obj->unref();
-        obj = NULL;
+        obj = nullptr;
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
+template <typename T> struct SkTUnref {
+    void operator()(T* t) { t->unref(); }
+};
+
 /**
  *  Utility class that simply unref's its argument in the destructor.
  */
-template <typename T> class SkAutoTUnref : SkNoncopyable {
+template <typename T> class SkAutoTUnref : public skstd::unique_ptr<T, SkTUnref<T>> {
 public:
-    explicit SkAutoTUnref(T* obj = NULL) : fObj(obj) {}
-    ~SkAutoTUnref() { SkSafeUnref(fObj); }
+    explicit SkAutoTUnref(T* obj = nullptr) : skstd::unique_ptr<T, SkTUnref<T>>(obj) {}
 
-    T* get() const { return fObj; }
-
-    T* reset(T* obj) {
-        SkSafeUnref(fObj);
-        fObj = obj;
-        return obj;
-    }
-
-    void swap(SkAutoTUnref* other) {
-        T* tmp = fObj;
-        fObj = other->fObj;
-        other->fObj = tmp;
-    }
-
-    /**
-     *  Return the hosted object (which may be null), transferring ownership.
-     *  The reference count is not modified, and the internal ptr is set to NULL
-     *  so unref() will not be called in our destructor. A subsequent call to
-     *  detach() will do nothing and return null.
-     */
-    T* detach() {
-        T* obj = fObj;
-        fObj = NULL;
-        return obj;
-    }
-
-    /**
-     *  BlockRef<B> is a type which inherits from B, cannot be created,
-     *  cannot be deleted, and makes ref and unref private.
-     */
-    template<typename B> class BlockRef : public B {
-    private:
-        BlockRef();
-        ~BlockRef();
-        void ref() const;
-        void unref() const;
-    };
-
-    /** If T is const, the type returned from operator-> will also be const. */
-    typedef typename SkTConstType<BlockRef<T>, SkTIsConst<T>::value>::type BlockRefType;
-
-    /**
-     *  SkAutoTUnref assumes ownership of the ref. As a result, it is an error
-     *  for the user to ref or unref through SkAutoTUnref. Therefore
-     *  SkAutoTUnref::operator-> returns BlockRef<T>*. This prevents use of
-     *  skAutoTUnrefInstance->ref() and skAutoTUnrefInstance->unref().
-     */
-    BlockRefType *operator->() const {
-        return static_cast<BlockRefType*>(fObj);
-    }
-    operator T*() { return fObj; }
-
-private:
-    T*  fObj;
+    T* detach() { return this->release(); }
+    operator T*() const { return this->get(); }
 };
 // Can't use the #define trick below to guard a bare SkAutoTUnref(...) because it's templated. :(
 
@@ -247,4 +198,31 @@ public:
 };
 #define SkAutoUnref(...) SK_REQUIRE_LOCAL_VAR(SkAutoUnref)
 
+// This is a variant of SkRefCnt that's Not Virtual, so weighs 4 bytes instead of 8 or 16.
+// There's only benefit to using this if the deriving class does not otherwise need a vtable.
+template <typename Derived>
+class SkNVRefCnt : SkNoncopyable {
+public:
+    SkNVRefCnt() : fRefCnt(1) {}
+    ~SkNVRefCnt() { SkASSERTF(1 == fRefCnt, "NVRefCnt was %d", fRefCnt); }
+
+    // Implementation is pretty much the same as SkRefCntBase. All required barriers are the same:
+    //   - unique() needs acquire when it returns true, and no barrier if it returns false;
+    //   - ref() doesn't need any barrier;
+    //   - unref() needs a release barrier, and an acquire if it's going to call delete.
+
+    bool unique() const { return 1 == sk_atomic_load(&fRefCnt, sk_memory_order_acquire); }
+    void    ref() const { (void)sk_atomic_fetch_add(&fRefCnt, +1, sk_memory_order_relaxed); }
+    void  unref() const {
+        if (1 == sk_atomic_fetch_add(&fRefCnt, -1, sk_memory_order_acq_rel)) {
+            SkDEBUGCODE(fRefCnt = 1;)  // restore the 1 for our destructor's assert
+                    delete (const Derived*)this;
+        }
+    }
+    void  deref() const { this->unref(); }
+
+private:
+    mutable int32_t fRefCnt;
+};
+
 #endif
diff --git a/gfx/skia/skia/include/core/SkRegion.h b/gfx/skia/skia/include/core/SkRegion.h
index 20366bc63822..eb0f1367aba4 100644
--- a/gfx/skia/skia/include/core/SkRegion.h
+++ b/gfx/skia/skia/include/core/SkRegion.h
@@ -59,7 +59,6 @@ public:
      *  resulting region is non-empty.
      */
     bool set(const SkRegion& src) {
-        SkASSERT(&src);
         *this = src;
         return !this->isEmpty();
     }
diff --git a/gfx/skia/skia/include/core/SkScalar.h b/gfx/skia/skia/include/core/SkScalar.h
index 3056b7297e13..4efa8417afd4 100644
--- a/gfx/skia/skia/include/core/SkScalar.h
+++ b/gfx/skia/skia/include/core/SkScalar.h
@@ -9,70 +9,31 @@
 #define SkScalar_DEFINED
 
 #include "SkFixed.h"
-#include "SkFloatingPoint.h"
+#include "../private/SkFloatingPoint.h"
 
-//#define SK_SUPPORT_DEPRECATED_SCALARROUND
+// TODO: move this sort of check into SkPostConfig.h
+#define SK_SCALAR_IS_DOUBLE 0
+#undef SK_SCALAR_IS_FLOAT
+#define SK_SCALAR_IS_FLOAT  1
 
-typedef float   SkScalar;
 
-/** SK_Scalar1 is defined to be 1.0 represented as an SkScalar
-*/
-#define SK_Scalar1              (1.0f)
-/** SK_Scalar1 is defined to be 1/2 represented as an SkScalar
-*/
-#define SK_ScalarHalf           (0.5f)
-/** SK_ScalarInfinity is defined to be infinity as an SkScalar
-*/
-#define SK_ScalarInfinity       SK_FloatInfinity
-/** SK_ScalarNegativeInfinity is defined to be negative infinity as an SkScalar
-*/
-#define SK_ScalarNegativeInfinity       SK_FloatNegativeInfinity
-/** SK_ScalarMax is defined to be the largest value representable as an SkScalar
-*/
-#define SK_ScalarMax            (3.402823466e+38f)
-/** SK_ScalarMin is defined to be the smallest value representable as an SkScalar
-*/
-#define SK_ScalarMin            (-SK_ScalarMax)
-/** SK_ScalarNaN is defined to be 'Not a Number' as an SkScalar
-*/
-#define SK_ScalarNaN            SK_FloatNaN
-/** SkScalarIsNaN(n) returns true if argument is not a number
-*/
-static inline bool SkScalarIsNaN(float x) { return x != x; }
+#if SK_SCALAR_IS_FLOAT
 
-/** Returns true if x is not NaN and not infinite */
-static inline bool SkScalarIsFinite(float x) {
-    // We rely on the following behavior of infinities and nans
-    // 0 * finite --> 0
-    // 0 * infinity --> NaN
-    // 0 * NaN --> NaN
-    float prod = x * 0;
-    // At this point, prod will either be NaN or 0
-    // Therefore we can return (prod == prod) or (0 == prod).
-    return !SkScalarIsNaN(prod);
-}
+typedef float SkScalar;
 
-/** SkIntToScalar(n) returns its integer argument as an SkScalar
-*/
-#define SkIntToScalar(n)        ((float)(n))
-/** SkFixedToScalar(n) returns its SkFixed argument as an SkScalar
-*/
-#define SkFixedToScalar(x)      SkFixedToFloat(x)
-/** SkScalarToFixed(n) returns its SkScalar argument as an SkFixed
-*/
-#define SkScalarToFixed(x)      SkFloatToFixed(x)
+#define SK_Scalar1                  1.0f
+#define SK_ScalarHalf               0.5f
+#define SK_ScalarSqrt2              1.41421356f
+#define SK_ScalarPI                 3.14159265f
+#define SK_ScalarTanPIOver8         0.414213562f
+#define SK_ScalarRoot2Over2         0.707106781f
+#define SK_ScalarMax                3.402823466e+38f
+#define SK_ScalarInfinity           SK_FloatInfinity
+#define SK_ScalarNegativeInfinity   SK_FloatNegativeInfinity
+#define SK_ScalarNaN                SK_FloatNaN
 
-#define SkScalarToFloat(n)      (n)
-#ifndef SK_SCALAR_TO_FLOAT_EXCLUDED
-#define SkFloatToScalar(n)      (n)
-#endif
-
-#define SkScalarToDouble(n)      (double)(n)
-#define SkDoubleToScalar(n)      (float)(n)
-
-/** SkScalarFraction(x) returns the signed fractional part of the argument
-*/
-#define SkScalarFraction(x)     sk_float_mod(x, 1.0f)
+#define SkFixedToScalar(x)          SkFixedToFloat(x)
+#define SkScalarToFixed(x)          SkFloatToFixed(x)
 
 #define SkScalarFloorToScalar(x)    sk_float_floor(x)
 #define SkScalarCeilToScalar(x)     sk_float_ceil(x)
@@ -81,7 +42,111 @@ static inline bool SkScalarIsFinite(float x) {
 #define SkScalarFloorToInt(x)       sk_float_floor2int(x)
 #define SkScalarCeilToInt(x)        sk_float_ceil2int(x)
 #define SkScalarRoundToInt(x)       sk_float_round2int(x)
-#define SkScalarTruncToInt(x)       static_cast<int>(x)
+
+#define SkScalarAbs(x)              sk_float_abs(x)
+#define SkScalarCopySign(x, y)      sk_float_copysign(x, y)
+#define SkScalarMod(x, y)           sk_float_mod(x,y)
+#define SkScalarFraction(x)         sk_float_mod(x, 1.0f)
+#define SkScalarSqrt(x)             sk_float_sqrt(x)
+#define SkScalarPow(b, e)           sk_float_pow(b, e)
+
+#define SkScalarSin(radians)        (float)sk_float_sin(radians)
+#define SkScalarCos(radians)        (float)sk_float_cos(radians)
+#define SkScalarTan(radians)        (float)sk_float_tan(radians)
+#define SkScalarASin(val)           (float)sk_float_asin(val)
+#define SkScalarACos(val)           (float)sk_float_acos(val)
+#define SkScalarATan2(y, x)         (float)sk_float_atan2(y,x)
+#define SkScalarExp(x)              (float)sk_float_exp(x)
+#define SkScalarLog(x)              (float)sk_float_log(x)
+#define SkScalarLog2(x)             (float)sk_float_log2(x)
+
+#else   // SK_SCALAR_IS_DOUBLE
+
+typedef double SkScalar;
+
+#define SK_Scalar1                  1.0
+#define SK_ScalarHalf               0.5
+#define SK_ScalarSqrt2              1.414213562373095
+#define SK_ScalarPI                 3.141592653589793
+#define SK_ScalarTanPIOver8         0.4142135623731
+#define SK_ScalarRoot2Over2         0.70710678118655
+#define SK_ScalarMax                1.7976931348623157+308
+#define SK_ScalarInfinity           SK_DoubleInfinity
+#define SK_ScalarNegativeInfinity   SK_DoubleNegativeInfinity
+#define SK_ScalarNaN                SK_DoubleNaN
+
+#define SkFixedToScalar(x)          SkFixedToDouble(x)
+#define SkScalarToFixed(x)          SkDoubleToFixed(x)
+
+#define SkScalarFloorToScalar(x)    floor(x)
+#define SkScalarCeilToScalar(x)     ceil(x)
+#define SkScalarRoundToScalar(x)    floor((x) + 0.5)
+
+#define SkScalarFloorToInt(x)       (int)floor(x)
+#define SkScalarCeilToInt(x)        (int)ceil(x)
+#define SkScalarRoundToInt(x)       (int)floor((x) + 0.5)
+
+#define SkScalarAbs(x)              abs(x)
+#define SkScalarCopySign(x, y)      copysign(x, y)
+#define SkScalarMod(x, y)           fmod(x,y)
+#define SkScalarFraction(x)         fmod(x, 1.0)
+#define SkScalarSqrt(x)             sqrt(x)
+#define SkScalarPow(b, e)           pow(b, e)
+
+#define SkScalarSin(radians)        sin(radians)
+#define SkScalarCos(radians)        cos(radians)
+#define SkScalarTan(radians)        tan(radians)
+#define SkScalarASin(val)           asin(val)
+#define SkScalarACos(val)           acos(val)
+#define SkScalarATan2(y, x)         atan2(y,x)
+#define SkScalarExp(x)              exp(x)
+#define SkScalarLog(x)              log(x)
+#define SkScalarLog2(x)             log2(x)
+
+#endif
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+
+#define SkIntToScalar(x)        static_cast<SkScalar>(x)
+#define SkScalarTruncToInt(x)   static_cast<int>(x)
+
+#define SkScalarToFloat(x)      static_cast<float>(x)
+#define SkFloatToScalar(x)      static_cast<SkScalar>(x)
+#define SkScalarToDouble(x)     static_cast<double>(x)
+#define SkDoubleToScalar(x)     static_cast<SkScalar>(x)
+
+#define SK_ScalarMin            (-SK_ScalarMax)
+
+static inline bool SkScalarIsNaN(SkScalar x) { return x != x; }
+
+/** Returns true if x is not NaN and not infinite
+ */
+static inline bool SkScalarIsFinite(SkScalar x) {
+    // We rely on the following behavior of infinities and nans
+    // 0 * finite --> 0
+    // 0 * infinity --> NaN
+    // 0 * NaN --> NaN
+    SkScalar prod = x * 0;
+    // At this point, prod will either be NaN or 0
+    return !SkScalarIsNaN(prod);
+}
+
+static inline bool SkScalarsAreFinite(SkScalar a, SkScalar b) {
+    SkScalar prod = 0;
+    prod *= a;
+    prod *= b;
+    // At this point, prod will either be NaN or 0
+    return !SkScalarIsNaN(prod);
+}
+
+static inline bool SkScalarsAreFinite(const SkScalar array[], int count) {
+    SkScalar prod = 0;
+    for (int i = 0; i < count; ++i) {
+        prod *= array[i];
+    }
+    // At this point, prod will either be NaN or 0
+    return !SkScalarIsNaN(prod);
+}
 
 /**
  *  Variant of SkScalarRoundToInt, that performs the rounding step (adding 0.5) explicitly using
@@ -103,88 +168,38 @@ static inline int SkDScalarRoundToInt(SkScalar x) {
     return (int)floor(xx);
 }
 
-/** Returns the absolute value of the specified SkScalar
-*/
-#define SkScalarAbs(x)          sk_float_abs(x)
-/** Return x with the sign of y
- */
-#define SkScalarCopySign(x, y)  sk_float_copysign(x, y)
-/** Returns the value pinned between 0 and max inclusive
-*/
-inline SkScalar SkScalarClampMax(SkScalar x, SkScalar max) {
-    return x < 0 ? 0 : x > max ? max : x;
+static inline SkScalar SkScalarClampMax(SkScalar x, SkScalar max) {
+    x = SkTMin(x, max);
+    x = SkTMax<SkScalar>(x, 0);
+    return x;
 }
-/** Returns the value pinned between min and max inclusive
-*/
-inline SkScalar SkScalarPin(SkScalar x, SkScalar min, SkScalar max) {
-    return x < min ? min : x > max ? max : x;
+
+static inline SkScalar SkScalarPin(SkScalar x, SkScalar min, SkScalar max) {
+    return SkTPin(x, min, max);
 }
-/** Returns the specified SkScalar squared (x*x)
-*/
-inline SkScalar SkScalarSquare(SkScalar x) { return x * x; }
-/** Returns the product of two SkScalars
-*/
-#define SkScalarMul(a, b)       ((float)(a) * (b))
-/** Returns the product of two SkScalars plus a third SkScalar
-*/
-#define SkScalarMulAdd(a, b, c) ((float)(a) * (b) + (c))
-/** Returns the quotient of two SkScalars (a/b)
-*/
-#define SkScalarDiv(a, b)       ((float)(a) / (b))
-/** Returns the mod of two SkScalars (a mod b)
-*/
-#define SkScalarMod(x,y)        sk_float_mod(x,y)
-/** Returns the product of the first two arguments, divided by the third argument
-*/
-#define SkScalarMulDiv(a, b, c) ((float)(a) * (b) / (c))
-/** Returns the multiplicative inverse of the SkScalar (1/x)
-*/
+
+SkScalar SkScalarSinCos(SkScalar radians, SkScalar* cosValue);
+
+static inline SkScalar SkScalarSquare(SkScalar x) { return x * x; }
+
+#define SkScalarMul(a, b)       ((SkScalar)(a) * (b))
+#define SkScalarMulAdd(a, b, c) ((SkScalar)(a) * (b) + (c))
+#define SkScalarMulDiv(a, b, c) ((SkScalar)(a) * (b) / (c))
 #define SkScalarInvert(x)       (SK_Scalar1 / (x))
 #define SkScalarFastInvert(x)   (SK_Scalar1 / (x))
-/** Returns the square root of the SkScalar
-*/
-#define SkScalarSqrt(x)         sk_float_sqrt(x)
-/** Returns b to the e
-*/
-#define SkScalarPow(b, e)       sk_float_pow(b, e)
-/** Returns the average of two SkScalars (a+b)/2
-*/
-#define SkScalarAve(a, b)       (((a) + (b)) * 0.5f)
-/** Returns one half of the specified SkScalar
-*/
-#define SkScalarHalf(a)         ((a) * 0.5f)
-
-#define SK_ScalarSqrt2          1.41421356f
-#define SK_ScalarPI             3.14159265f
-#define SK_ScalarTanPIOver8     0.414213562f
-#define SK_ScalarRoot2Over2     0.707106781f
+#define SkScalarAve(a, b)       (((a) + (b)) * SK_ScalarHalf)
+#define SkScalarHalf(a)         ((a) * SK_ScalarHalf)
 
 #define SkDegreesToRadians(degrees) ((degrees) * (SK_ScalarPI / 180))
 #define SkRadiansToDegrees(radians) ((radians) * (180 / SK_ScalarPI))
-float SkScalarSinCos(SkScalar radians, SkScalar* cosValue);
-#define SkScalarSin(radians)    (float)sk_float_sin(radians)
-#define SkScalarCos(radians)    (float)sk_float_cos(radians)
-#define SkScalarTan(radians)    (float)sk_float_tan(radians)
-#define SkScalarASin(val)   (float)sk_float_asin(val)
-#define SkScalarACos(val)   (float)sk_float_acos(val)
-#define SkScalarATan2(y, x) (float)sk_float_atan2(y,x)
-#define SkScalarExp(x)  (float)sk_float_exp(x)
-#define SkScalarLog(x)  (float)sk_float_log(x)
 
-inline SkScalar SkMaxScalar(SkScalar a, SkScalar b) { return a > b ? a : b; }
-inline SkScalar SkMinScalar(SkScalar a, SkScalar b) { return a < b ? a : b; }
+static inline SkScalar SkMaxScalar(SkScalar a, SkScalar b) { return a > b ? a : b; }
+static inline SkScalar SkMinScalar(SkScalar a, SkScalar b) { return a < b ? a : b; }
 
 static inline bool SkScalarIsInt(SkScalar x) {
-    return x == (float)(int)x;
+    return x == (SkScalar)(int)x;
 }
 
-// DEPRECATED : use ToInt or ToScalar variant
-#ifdef SK_SUPPORT_DEPRECATED_SCALARROUND
-#   define SkScalarFloor(x)    SkScalarFloorToInt(x)
-#   define SkScalarCeil(x)     SkScalarCeilToInt(x)
-#   define SkScalarRound(x)    SkScalarRoundToInt(x)
-#endif
-
 /**
  *  Returns -1 || 0 || 1 depending on the sign of value:
  *  -1 if x < 0
@@ -209,7 +224,7 @@ static inline bool SkScalarNearlyZero(SkScalar x,
 }
 
 static inline bool SkScalarNearlyEqual(SkScalar x, SkScalar y,
-                                     SkScalar tolerance = SK_ScalarNearlyZero) {
+                                       SkScalar tolerance = SK_ScalarNearlyZero) {
     SkASSERT(tolerance >= 0);
     return SkScalarAbs(x-y) <= tolerance;
 }
diff --git a/gfx/skia/skia/include/core/SkShader.h b/gfx/skia/skia/include/core/SkShader.h
index e5af40dd7a18..34cb648022ca 100644
--- a/gfx/skia/skia/include/core/SkShader.h
+++ b/gfx/skia/skia/include/core/SkShader.h
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkShader_DEFINED
 #define SkShader_DEFINED
 
@@ -20,7 +19,7 @@ class SkPath;
 class SkPicture;
 class SkXfermode;
 class GrContext;
-class GrEffect;
+class GrFragmentProcessor;
 
 /** \class SkShader
  *
@@ -34,8 +33,6 @@ class GrEffect;
  */
 class SK_API SkShader : public SkFlattenable {
 public:
-    SK_DECLARE_INST_COUNT(SkShader)
-
     SkShader(const SkMatrix* localMatrix = NULL);
     virtual ~SkShader();
 
@@ -47,14 +44,6 @@ public:
      */
     const SkMatrix& getLocalMatrix() const { return fLocalMatrix; }
 
-    /**
-     *  Returns true if the local matrix is not an identity matrix.
-     *
-     *  FIXME: This can be incorrect for a Shader with its own local matrix
-     *  that is also wrapped via CreateLocalMatrixShader.
-     */
-    bool hasLocalMatrix() const { return !fLocalMatrix.isIdentity(); }
-
     enum TileMode {
         /** replicate the edge color if the shader draws outside of its
          *  original bounds
@@ -73,8 +62,10 @@ public:
         /** only draw within the original domain, return 0 everywhere else */
         kDecal_TileMode,
 #endif
+    };
 
-        kTileModeCount
+    enum {
+        kTileModeCount = kMirror_TileMode + 1
     };
 
     // override these in your subclass
@@ -120,14 +111,11 @@ public:
      *  ContextRec acts as a parameter bundle for creating Contexts.
      */
     struct ContextRec {
-        ContextRec() : fDevice(NULL), fPaint(NULL), fMatrix(NULL), fLocalMatrix(NULL) {}
-        ContextRec(const SkBitmap& device, const SkPaint& paint, const SkMatrix& matrix)
-            : fDevice(&device)
-            , fPaint(&paint)
+        ContextRec(const SkPaint& paint, const SkMatrix& matrix, const SkMatrix* localM)
+            : fPaint(&paint)
             , fMatrix(&matrix)
-            , fLocalMatrix(NULL) {}
+            , fLocalMatrix(localM) {}
 
-        const SkBitmap* fDevice;        // the bitmap we are drawing into
         const SkPaint*  fPaint;         // the current paint associated with the draw
         const SkMatrix* fMatrix;        // the current matrix in the canvas
         const SkMatrix* fLocalMatrix;   // optional local matrix
@@ -185,6 +173,9 @@ public:
             return SkShader::CanCallShadeSpan16(this->getFlags());
         }
 
+        // Notification from blitter::blitMask in case we need to see the non-alpha channels
+        virtual void set3DMask(const SkMask*) {}
+
     protected:
         // Reference to shader, so we don't have to dupe information.
         const SkShader& fShader;
@@ -232,68 +223,17 @@ public:
     }
 
     /**
-     Gives method bitmap should be read to implement a shader.
-     Also determines number and interpretation of "extra" parameters returned
-     by asABitmap
+     *  Returns true if this shader is just a bitmap, and if not null, returns the bitmap,
+     *  localMatrix, and tilemodes. If this is not a bitmap, returns false and ignores the
+     *  out-parameters.
      */
-    enum BitmapType {
-        kNone_BitmapType,   //<! Shader is not represented as a bitmap
-        kDefault_BitmapType,//<! Access bitmap using local coords transformed
-                            //   by matrix. No extras
-        kRadial_BitmapType, //<! Access bitmap by transforming local coordinates
-                            //   by the matrix and taking the distance of result
-                            //   from  (0,0) as bitmap column. Bitmap is 1 pixel
-                            //   tall. No extras
-        kSweep_BitmapType,  //<! Access bitmap by transforming local coordinates
-                            //   by the matrix and taking the angle of result
-                            //   to (0,0) as bitmap x coord, where angle = 0 is
-                            //   bitmap left edge of bitmap = 2pi is the
-                            //   right edge. Bitmap is 1 pixel tall. No extras
-        kTwoPointRadial_BitmapType,
-                            //<! Matrix transforms to space where (0,0) is
-                            //   the center of the starting circle.  The second
-                            //   circle will be centered (x, 0) where x  may be
-                            //   0. The post-matrix space is normalized such
-                            //   that 1 is the second radius - first radius.
-                            //   Three extra parameters are returned:
-                            //      0: x-offset of second circle center
-                            //         to first.
-                            //      1: radius of first circle in post-matrix
-                            //         space
-                            //      2: the second radius minus the first radius
-                            //         in pre-transformed space.
-        kTwoPointConical_BitmapType,
-                            //<! Matrix transforms to space where (0,0) is
-                            //   the center of the starting circle.  The second
-                            //   circle will be centered (x, 0) where x  may be
-                            //   0.
-                            //   Three extra parameters are returned:
-                            //      0: x-offset of second circle center
-                            //         to first.
-                            //      1: radius of first circle
-                            //      2: the second radius minus the first radius
-        kLinear_BitmapType, //<! Access bitmap using local coords transformed
-                            //   by matrix. No extras
+    bool isABitmap(SkBitmap* outTexture, SkMatrix* outMatrix, TileMode xy[2]) const {
+        return this->onIsABitmap(outTexture, outMatrix, xy);
+    }
 
-       kLast_BitmapType = kLinear_BitmapType
-    };
-    /** Optional methods for shaders that can pretend to be a bitmap/texture
-        to play along with opengl. Default just returns kNone_BitmapType and
-        ignores the out parameters.
-
-        @param outTexture if non-NULL will be the bitmap representing the shader
-                          after return.
-        @param outMatrix  if non-NULL will be the matrix to apply to vertices
-                          to access the bitmap after return.
-        @param xy         if non-NULL will be the tile modes that should be
-                          used to access the bitmap after return.
-        @param twoPointRadialParams Two extra return values needed for two point
-                                    radial bitmaps. The first is the x-offset of
-                                    the second point and the second is the radius
-                                    about the first point.
-    */
-    virtual BitmapType asABitmap(SkBitmap* outTexture, SkMatrix* outMatrix,
-                         TileMode xy[2]) const;
+    bool isABitmap() const {
+        return this->isABitmap(nullptr, nullptr, nullptr);
+    }
 
     /**
      *  If the shader subclass can be represented as a gradient, asAGradient
@@ -317,7 +257,7 @@ public:
      *      fPoint[0] and fPoint[1] are the end-points of the gradient
      *  Radial:
      *      fPoint[0] and fRadius[0] are the center and radius
-     *  Radial2:
+     *  Conical:
      *      fPoint[0] and fRadius[0] are the center and radius of the 1st circle
      *      fPoint[1] and fRadius[1] are the center and radius of the 2nd circle
      *  Sweep:
@@ -329,7 +269,6 @@ public:
         kColor_GradientType,
         kLinear_GradientType,
         kRadial_GradientType,
-        kRadial2_GradientType,
         kSweep_GradientType,
         kConical_GradientType,
         kLast_GradientType = kConical_GradientType
@@ -363,35 +302,43 @@ public:
         const SkXfermode*   fMode;
     };
 
-    virtual bool asACompose(ComposeRec* rec) const { return false; }
+    virtual bool asACompose(ComposeRec*) const { return false; }
 
 
     /**
-     *  Returns true if the shader subclass succeeds in creating an effect or if none is required.
-     *  False is returned if it fails or if there is not an implementation of this method in the
-     *  shader subclass.
+     *  Returns a GrFragmentProcessor that implements the shader for the GPU backend. NULL is
+     *  returned if there is no GPU implementation.
      *
-     *  On success an implementation of this method must inspect the SkPaint and set paintColor to
-     *  the color the effect expects as its input color. If the SkShader wishes to emit a solid
-     *  color then it should set paintColor to that color and not create an effect. Note that
-     *  GrColor is always premul. The common patterns are to convert paint's SkColor to GrColor or
-     *  to extract paint's alpha and replicate it to all channels in paintColor. Upon failure
-     *  paintColor should not be modified. It is not recommended to specialize the effect to
-     *  the paint's color as then many GPU shaders may be generated.
+     *  The GPU device does not call SkShader::createContext(), instead we pass the view matrix,
+     *  local matrix, and filter quality directly.
      *
-     *  The GrContext may be used by the effect to create textures. The GPU device does not
-     *  call createContext. Instead we pass the SkPaint here in case the shader needs paint info.
+     *  The GrContext may be used by the to create textures that are required by the returned
+     *  processor.
+     *
+     *  The returned GrFragmentProcessor should expect an unpremultiplied input color and
+     *  produce a premultiplied output.
      */
-    virtual bool asNewEffect(GrContext* context, const SkPaint& paint,
-                             const SkMatrix* localMatrixOrNull, GrColor* paintColor,
-                             GrEffect** effect) const;
+    virtual const GrFragmentProcessor* asFragmentProcessor(GrContext*,
+                                                           const SkMatrix& viewMatrix,
+                                                           const SkMatrix* localMatrix,
+                                                           SkFilterQuality) const;
+
+    /**
+     *  If the shader can represent its "average" luminance in a single color, return true and
+     *  if color is not NULL, return that color. If it cannot, return false and ignore the color
+     *  parameter.
+     *
+     *  Note: if this returns true, the returned color will always be opaque, as only the RGB
+     *  components are used to compute luminance.
+     */
+    bool asLuminanceColor(SkColor*) const;
 
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
     /**
      *  If the shader is a custom shader which has data the caller might want, call this function
      *  to get that data.
      */
-    virtual bool asACustomShader(void** customData) const { return false; }
+    virtual bool asACustomShader(void** /* customData */) const { return false; }
 #endif
 
     //////////////////////////////////////////////////////////////////////////
@@ -402,6 +349,12 @@ public:
      */
     static SkShader* CreateEmptyShader();
 
+    /**
+     *  Call this to create a new shader that just draws the specified color. This should always
+     *  draw the same as a paint with this color (and no shader).
+     */
+    static SkShader* CreateColorShader(SkColor);
+
     /** Call this to create a new shader that will draw with the specified bitmap.
      *
      *  If the bitmap cannot be used (e.g. has no pixels, or its dimensions
@@ -420,18 +373,26 @@ public:
                                         TileMode tmx, TileMode tmy,
                                         const SkMatrix* localMatrix = NULL);
 
+    // NOTE: You can create an SkImage Shader with SkImage::newShader().
+
     /** Call this to create a new shader that will draw with the specified picture.
      *
      *  @param src  The picture to use inside the shader (if not NULL, its ref count
      *              is incremented). The SkPicture must not be changed after
      *              successfully creating a picture shader.
-     *              FIXME: src cannot be const due to SkCanvas::drawPicture
      *  @param tmx  The tiling mode to use when sampling the bitmap in the x-direction.
      *  @param tmy  The tiling mode to use when sampling the bitmap in the y-direction.
+     *  @param tile The tile rectangle in picture coordinates: this represents the subset
+     *              (or superset) of the picture used when building a tile. It is not
+     *              affected by localMatrix and does not imply scaling (only translation
+     *              and cropping). If null, the tile rect is considered equal to the picture
+     *              bounds.
      *  @return     Returns a new shader object. Note: this function never returns null.
     */
-    static SkShader* CreatePictureShader(SkPicture* src, TileMode tmx, TileMode tmy,
-                                         const SkMatrix* localMatrix = NULL);
+    static SkShader* CreatePictureShader(const SkPicture* src,
+                                         TileMode tmx, TileMode tmy,
+                                         const SkMatrix* localMatrix,
+                                         const SkRect* tile);
 
     /**
      *  Return a shader that will apply the specified localMatrix to the proxy shader.
@@ -454,8 +415,7 @@ public:
     SK_DEFINE_FLATTENABLE_TYPE(SkShader)
 
 protected:
-    SkShader(SkReadBuffer& );
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
 
     bool computeTotalInverse(const ContextRec&, SkMatrix* totalInverse) const;
 
@@ -465,6 +425,14 @@ protected:
      */
     virtual Context* onCreateContext(const ContextRec&, void* storage) const;
 
+    virtual bool onAsLuminanceColor(SkColor*) const {
+        return false;
+    }
+
+    virtual bool onIsABitmap(SkBitmap*, SkMatrix*, TileMode[2]) const {
+        return false;
+    }
+
 private:
     // This is essentially const, but not officially so it can be modified in
     // constructors.
@@ -472,6 +440,7 @@ private:
 
     // So the SkLocalMatrixShader can whack fLocalMatrix in its SkReadBuffer constructor.
     friend class SkLocalMatrixShader;
+    friend class SkBitmapProcShader;    // for computeTotalInverse()
 
     typedef SkFlattenable INHERITED;
 };
diff --git a/gfx/skia/skia/include/core/SkStream.h b/gfx/skia/skia/include/core/SkStream.h
index 516b036a55e6..2279f9ff10ec 100644
--- a/gfx/skia/skia/include/core/SkStream.h
+++ b/gfx/skia/skia/include/core/SkStream.h
@@ -36,17 +36,17 @@ class SkStreamMemory;
  *  no more data (at EOF or hit an error). The caller should *not* call again
  *  in hopes of fulfilling more of the request.
  */
-class SK_API SkStream : public SkRefCnt { //TODO: remove SkRefCnt
+class SK_API SkStream : public SkNoncopyable {
 public:
+    virtual ~SkStream() {}
+
     /**
      *  Attempts to open the specified file, and return a stream to it (using
-     *  mmap if available). On success, the caller must call unref() on the
-     *  returned object. On failure, returns NULL.
+     *  mmap if available). On success, the caller is responsible for deleting.
+     *  On failure, returns NULL.
      */
     static SkStreamAsset* NewFromFile(const char path[]);
 
-    SK_DECLARE_INST_COUNT(SkStream)
-
     /** Reads or skips size number of bytes.
      *  If buffer == NULL, skip size bytes, return how many were skipped.
      *  If buffer != NULL, copy size bytes into buffer, return how many were copied.
@@ -63,6 +63,20 @@ public:
         return this->read(NULL, size);
     }
 
+    /**
+     *  Attempt to peek at size bytes.
+     *  If this stream supports peeking, and it can peek size bytes, copy size
+     *  bytes into buffer, and return true.
+     *  If the stream does not support peeking, or cannot peek size bytes,
+     *  return false and leave buffer unchanged.
+     *  The stream is guaranteed to be in the same visible state after this
+     *  call, regardless of success or failure.
+     *  @param buffer Must not be NULL. Destination to copy bytes.
+     *  @param size Number of bytes to copy.
+     *  @return Whether the peek was performed.
+     */
+    virtual bool peek(void* /* buffer */, size_t /* size */) const { return false; }
+
     /** Returns true when all the bytes in the stream have been read.
      *  This may return true early (when there are no more bytes to be read)
      *  or late (after the first unsuccessful read).
@@ -81,12 +95,6 @@ public:
     SkScalar readScalar();
     size_t   readPackedUInt();
 
-    /**
-     *  Reconstitute an SkData object that was written to the stream
-     *  using SkWStream::writeData().
-     */
-    SkData* readData();
-
 //SkStreamRewindable
     /** Rewinds to the beginning of the stream. Returns true if the stream is known
      *  to be at the beginning after this call returns.
@@ -108,13 +116,13 @@ public:
      *  If an attempt is made to seek past the end of the stream, the position will be set
      *  to the end of the stream.
      */
-    virtual bool seek(size_t position) { return false; }
+    virtual bool seek(size_t /*position*/) { return false; }
 
     /** Seeks to an relative offset in the stream. If this cannot be done, returns false.
      *  If an attempt is made to move to a position outside the stream, the position will be set
      *  to the closest point within the stream (beginning or end).
      */
-    virtual bool move(long offset) { return false; }
+    virtual bool move(long /*offset*/) { return false; }
 
     /** Duplicates this stream. If this cannot be done, returns NULL.
      *  The returned stream will be positioned the same as this stream.
@@ -131,53 +139,48 @@ public:
     /** Returns the starting address for the data. If this cannot be done, returns NULL. */
     //TODO: replace with virtual const SkData* getData()
     virtual const void* getMemoryBase() { return NULL; }
-
-private:
-    typedef SkRefCnt INHERITED;
 };
 
 /** SkStreamRewindable is a SkStream for which rewind and duplicate are required. */
 class SK_API SkStreamRewindable : public SkStream {
 public:
-    virtual bool rewind() SK_OVERRIDE = 0;
-    virtual SkStreamRewindable* duplicate() const SK_OVERRIDE = 0;
+    bool rewind() override = 0;
+    SkStreamRewindable* duplicate() const override = 0;
 };
 
 /** SkStreamSeekable is a SkStreamRewindable for which position, seek, move, and fork are required. */
 class SK_API SkStreamSeekable : public SkStreamRewindable {
 public:
-    virtual SkStreamSeekable* duplicate() const SK_OVERRIDE = 0;
+    SkStreamSeekable* duplicate() const override = 0;
 
-    virtual bool hasPosition() const SK_OVERRIDE { return true; }
-    virtual size_t getPosition() const SK_OVERRIDE = 0;
-    virtual bool seek(size_t position) SK_OVERRIDE = 0;
-    virtual bool move(long offset) SK_OVERRIDE = 0;
-    virtual SkStreamSeekable* fork() const SK_OVERRIDE = 0;
+    bool hasPosition() const override { return true; }
+    size_t getPosition() const override = 0;
+    bool seek(size_t position) override = 0;
+    bool move(long offset) override = 0;
+    SkStreamSeekable* fork() const override = 0;
 };
 
 /** SkStreamAsset is a SkStreamSeekable for which getLength is required. */
 class SK_API SkStreamAsset : public SkStreamSeekable {
 public:
-    virtual SkStreamAsset* duplicate() const SK_OVERRIDE = 0;
-    virtual SkStreamAsset* fork() const SK_OVERRIDE = 0;
+    SkStreamAsset* duplicate() const override = 0;
+    SkStreamAsset* fork() const override = 0;
 
-    virtual bool hasLength() const SK_OVERRIDE { return true; }
-    virtual size_t getLength() const SK_OVERRIDE = 0;
+    bool hasLength() const override { return true; }
+    size_t getLength() const override = 0;
 };
 
 /** SkStreamMemory is a SkStreamAsset for which getMemoryBase is required. */
 class SK_API SkStreamMemory : public SkStreamAsset {
 public:
-    virtual SkStreamMemory* duplicate() const SK_OVERRIDE = 0;
-    virtual SkStreamMemory* fork() const SK_OVERRIDE = 0;
+    SkStreamMemory* duplicate() const override = 0;
+    SkStreamMemory* fork() const override = 0;
 
-    virtual const void* getMemoryBase() SK_OVERRIDE = 0;
+    const void* getMemoryBase() override = 0;
 };
 
 class SK_API SkWStream : SkNoncopyable {
 public:
-    SK_DECLARE_INST_COUNT_ROOT(SkWStream)
-
     virtual ~SkWStream();
 
     /** Called to write bytes to a SkWStream. Returns true on success
@@ -209,16 +212,6 @@ public:
 
     bool    writeStream(SkStream* input, size_t length);
 
-    /**
-     * Append an SkData object to the stream, such that it can be read
-     * out of the stream using SkStream::readData().
-     *
-     * Note that the encoding method used to write the SkData object
-     * to the stream may change over time.  This method DOES NOT
-     * just write the raw content of the SkData object to the stream.
-     */
-    bool writeData(const SkData*);
-
     /**
      * This returns the number of bytes in the stream required to store
      * 'value'.
@@ -231,13 +224,9 @@ public:
 #include "SkString.h"
 #include <stdio.h>
 
-struct SkFILE;
-
 /** A stream that wraps a C FILE* file stream. */
 class SK_API SkFILEStream : public SkStreamAsset {
 public:
-    SK_DECLARE_INST_COUNT(SkFILEStream)
-
     /** Initialize the stream by calling sk_fopen on the specified path.
      *  This internal stream will be closed in the destructor.
      */
@@ -264,23 +253,23 @@ public:
      */
     void setPath(const char path[]);
 
-    virtual size_t read(void* buffer, size_t size) SK_OVERRIDE;
-    virtual bool isAtEnd() const SK_OVERRIDE;
+    size_t read(void* buffer, size_t size) override;
+    bool isAtEnd() const override;
 
-    virtual bool rewind() SK_OVERRIDE;
-    virtual SkStreamAsset* duplicate() const SK_OVERRIDE;
+    bool rewind() override;
+    SkStreamAsset* duplicate() const override;
 
-    virtual size_t getPosition() const SK_OVERRIDE;
-    virtual bool seek(size_t position) SK_OVERRIDE;
-    virtual bool move(long offset) SK_OVERRIDE;
-    virtual SkStreamAsset* fork() const SK_OVERRIDE;
+    size_t getPosition() const override;
+    bool seek(size_t position) override;
+    bool move(long offset) override;
+    SkStreamAsset* fork() const override;
 
-    virtual size_t getLength() const SK_OVERRIDE;
+    size_t getLength() const override;
 
-    virtual const void* getMemoryBase() SK_OVERRIDE;
+    const void* getMemoryBase() override;
 
 private:
-    SkFILE*     fFILE;
+    FILE*     fFILE;
     SkString    fName;
     Ownership   fOwnership;
     // fData is lazilly initialized when needed.
@@ -291,8 +280,6 @@ private:
 
 class SK_API SkMemoryStream : public SkStreamMemory {
 public:
-    SK_DECLARE_INST_COUNT(SkMemoryStream)
-
     SkMemoryStream();
 
     /** We allocate (and free) the memory. Write to it via getMemoryBase() */
@@ -334,22 +321,23 @@ public:
 
     void skipToAlign4();
     const void* getAtPos();
-    size_t peek() const { return fOffset; }
 
-    virtual size_t read(void* buffer, size_t size) SK_OVERRIDE;
-    virtual bool isAtEnd() const SK_OVERRIDE;
+    size_t read(void* buffer, size_t size) override;
+    bool isAtEnd() const override;
 
-    virtual bool rewind() SK_OVERRIDE;
-    virtual SkMemoryStream* duplicate() const SK_OVERRIDE;
+    bool peek(void* buffer, size_t size) const override;
 
-    virtual size_t getPosition() const SK_OVERRIDE;
-    virtual bool seek(size_t position) SK_OVERRIDE;
-    virtual bool move(long offset) SK_OVERRIDE;
-    virtual SkMemoryStream* fork() const SK_OVERRIDE;
+    bool rewind() override;
+    SkMemoryStream* duplicate() const override;
 
-    virtual size_t getLength() const SK_OVERRIDE;
+    size_t getPosition() const override;
+    bool seek(size_t position) override;
+    bool move(long offset) override;
+    SkMemoryStream* fork() const override;
 
-    virtual const void* getMemoryBase() SK_OVERRIDE;
+    size_t getLength() const override;
+
+    const void* getMemoryBase() override;
 
 private:
     SkData* fData;
@@ -362,8 +350,6 @@ private:
 
 class SK_API SkFILEWStream : public SkWStream {
 public:
-    SK_DECLARE_INST_COUNT(SkFILEWStream)
-
     SkFILEWStream(const char path[]);
     virtual ~SkFILEWStream();
 
@@ -371,23 +357,21 @@ public:
     */
     bool isValid() const { return fFILE != NULL; }
 
-    virtual bool write(const void* buffer, size_t size) SK_OVERRIDE;
-    virtual void flush() SK_OVERRIDE;
-    virtual size_t bytesWritten() const SK_OVERRIDE;
+    bool write(const void* buffer, size_t size) override;
+    void flush() override;
+    size_t bytesWritten() const override;
 
 private:
-    SkFILE* fFILE;
+    FILE* fFILE;
 
     typedef SkWStream INHERITED;
 };
 
 class SkMemoryWStream : public SkWStream {
 public:
-    SK_DECLARE_INST_COUNT(SkMemoryWStream)
-
     SkMemoryWStream(void* buffer, size_t size);
-    virtual bool write(const void* buffer, size_t size) SK_OVERRIDE;
-    virtual size_t bytesWritten() const SK_OVERRIDE { return fBytesWritten; }
+    bool write(const void* buffer, size_t size) override;
+    size_t bytesWritten() const override { return fBytesWritten; }
 
 private:
     char*   fBuffer;
@@ -399,13 +383,11 @@ private:
 
 class SK_API SkDynamicMemoryWStream : public SkWStream {
 public:
-    SK_DECLARE_INST_COUNT(SkDynamicMemoryWStream)
-
     SkDynamicMemoryWStream();
     virtual ~SkDynamicMemoryWStream();
 
-    virtual bool write(const void* buffer, size_t size) SK_OVERRIDE;
-    virtual size_t bytesWritten() const SK_OVERRIDE { return fBytesWritten; }
+    bool write(const void* buffer, size_t size) override;
+    size_t bytesWritten() const override { return fBytesWritten; }
     // random access write
     // modifies stream and returns true if offset + size is less than or equal to getOffset()
     bool write(const void* buffer, size_t offset, size_t size);
@@ -414,6 +396,7 @@ public:
 
     // copy what has been written to the stream into dst
     void copyTo(void* dst) const;
+    void writeToStream(SkWStream* dst) const;
 
     /**
      *  Return a copy of the data written so far. This call is responsible for
@@ -447,12 +430,11 @@ private:
 class SK_API SkDebugWStream : public SkWStream {
 public:
     SkDebugWStream() : fBytesWritten(0) {}
-    SK_DECLARE_INST_COUNT(SkDebugWStream)
 
     // overrides
-    virtual bool write(const void* buffer, size_t size) SK_OVERRIDE;
-    virtual void newline() SK_OVERRIDE;
-    virtual size_t bytesWritten() const SK_OVERRIDE { return fBytesWritten; }
+    bool write(const void* buffer, size_t size) override;
+    void newline() override;
+    size_t bytesWritten() const override { return fBytesWritten; }
 
 private:
     size_t fBytesWritten;
diff --git a/gfx/skia/skia/include/core/SkString.h b/gfx/skia/skia/include/core/SkString.h
index bc06cb0aba63..9229d808a63d 100644
--- a/gfx/skia/skia/include/core/SkString.h
+++ b/gfx/skia/skia/include/core/SkString.h
@@ -39,6 +39,12 @@ static int SkStrFind(const char string[], const char substring[]) {
     return SkToS32(first - &string[0]);
 }
 
+static int SkStrFindLastOf(const char string[], const char subchar) {
+    const char* last = strrchr(string, subchar);
+    if (NULL == last) return -1;
+    return SkToS32(last - &string[0]);
+}
+
 static bool SkStrContains(const char string[], const char substring[]) {
     SkASSERT(string);
     SkASSERT(substring);
@@ -58,7 +64,23 @@ static inline char *SkStrDup(const char string[]) {
     return ret;
 }
 
-
+/*
+ *  The SkStrAppend... methods will write into the provided buffer, assuming it is large enough.
+ *  Each method has an associated const (e.g. SkStrAppendU32_MaxSize) which will be the largest
+ *  value needed for that method's buffer.
+ *
+ *  char storage[SkStrAppendU32_MaxSize];
+ *  SkStrAppendU32(storage, value);
+ *
+ *  Note : none of the SkStrAppend... methods write a terminating 0 to their buffers. Instead,
+ *  the methods return the ptr to the end of the written part of the buffer. This can be used
+ *  to compute the length, and/or know where to write a 0 if that is desired.
+ *
+ *  char storage[SkStrAppendU32_MaxSize + 1];
+ *  char* stop = SkStrAppendU32(storage, value);
+ *  size_t len = stop - storage;
+ *  *stop = 0;   // valid, since storage was 1 byte larger than the max.
+ */
 
 #define SkStrAppendU32_MaxSize  10
 char*   SkStrAppendU32(char buffer[], uint32_t);
@@ -136,6 +158,9 @@ public:
     int find(const char substring[]) const {
         return SkStrFind(fRec->data(), substring);
     }
+    int findLastOf(const char subchar) const {
+        return SkStrFindLastOf(fRec->data(), subchar);
+    }
 
     friend bool operator==(const SkString& a, const SkString& b) {
         return a.equals(b);
@@ -153,6 +178,7 @@ public:
     char& operator[](size_t n) { return this->writable_str()[n]; }
 
     void reset();
+    /** Destructive resize, does not preserve contents. */
     void resize(size_t len) { this->set(NULL, len); }
     void set(const SkString& src) { *this = src; }
     void set(const char text[]);
@@ -195,6 +221,7 @@ public:
     void appendf(const char format[], ...) SK_PRINTF_LIKE(2, 3);
     void appendVAList(const char format[], va_list);
     void prependf(const char format[], ...) SK_PRINTF_LIKE(2, 3);
+    void prependVAList(const char format[], va_list);
 
     void remove(size_t offset, size_t length);
 
@@ -221,7 +248,6 @@ private:
     Rec* fRec;
 
 #ifdef SK_DEBUG
-    const char* fStr;
     void validate() const;
 #else
     void validate() const {}
diff --git a/gfx/skia/skia/include/core/SkStrokeRec.h b/gfx/skia/skia/include/core/SkStrokeRec.h
index 0c5892f62584..32e54405632f 100644
--- a/gfx/skia/skia/include/core/SkStrokeRec.h
+++ b/gfx/skia/skia/include/core/SkStrokeRec.h
@@ -12,6 +12,7 @@
 
 class SkPath;
 
+SK_BEGIN_REQUIRE_DENSE
 class SkStrokeRec {
 public:
     enum InitStyle {
@@ -19,10 +20,8 @@ public:
         kFill_InitStyle
     };
     SkStrokeRec(InitStyle style);
-
-    SkStrokeRec(const SkStrokeRec&);
-    SkStrokeRec(const SkPaint&, SkPaint::Style);
-    explicit SkStrokeRec(const SkPaint&);
+    SkStrokeRec(const SkPaint&, SkPaint::Style, SkScalar resScale = 1);
+    explicit SkStrokeRec(const SkPaint&, SkScalar resScale = 1);
 
     enum Style {
         kHairline_Style,
@@ -37,8 +36,8 @@ public:
     Style getStyle() const;
     SkScalar getWidth() const { return fWidth; }
     SkScalar getMiter() const { return fMiterLimit; }
-    SkPaint::Cap getCap() const { return fCap; }
-    SkPaint::Join getJoin() const { return fJoin; }
+    SkPaint::Cap getCap() const { return (SkPaint::Cap)fCap; }
+    SkPaint::Join getJoin() const { return (SkPaint::Join)fJoin; }
 
     bool isHairlineStyle() const {
         return kHairline_Style == this->getStyle();
@@ -64,6 +63,11 @@ public:
         fMiterLimit = miterLimit;
     }
 
+    void setResScale(SkScalar rs) {
+        SkASSERT(rs > 0 && SkScalarIsFinite(rs));
+        fResScale = rs;
+    }
+
     /**
      *  Returns true if this specifes any thick stroking, i.e. applyToPath()
      *  will return true.
@@ -85,23 +89,43 @@ public:
      */
     bool applyToPath(SkPath* dst, const SkPath& src) const;
 
-    bool operator==(const SkStrokeRec& other) const {
-            return fWidth == other.fWidth &&
-                   fMiterLimit == other.fMiterLimit &&
-                   fCap == other.fCap &&
-                   fJoin == other.fJoin &&
-                   fStrokeAndFill == other.fStrokeAndFill;
+    /**
+     *  Apply these stroke parameters to a paint.
+     */
+    void applyToPaint(SkPaint* paint) const;
+
+    /**
+     * Compare if two SkStrokeRecs have an equal effect on a path.
+     * Equal SkStrokeRecs produce equal paths. Equality of produced
+     * paths does not take the ResScale parameter into account.
+     */
+    bool hasEqualEffect(const SkStrokeRec& other) const {
+        if (!this->needToApply()) {
+            return this->getStyle() == other.getStyle();
+        }
+        return fWidth == other.fWidth &&
+               fMiterLimit == other.fMiterLimit &&
+               fCap == other.fCap &&
+               fJoin == other.fJoin &&
+               fStrokeAndFill == other.fStrokeAndFill;
     }
 
 private:
-    void init(const SkPaint& paint, SkPaint::Style style);
-
+    void init(const SkPaint&, SkPaint::Style, SkScalar resScale);
 
+    SkScalar        fResScale;
     SkScalar        fWidth;
     SkScalar        fMiterLimit;
-    SkPaint::Cap    fCap;
-    SkPaint::Join   fJoin;
-    bool            fStrokeAndFill;
+    // The following three members are packed together into a single u32.
+    // This is to avoid unnecessary padding and ensure binary equality for
+    // hashing (because the padded areas might contain garbage values).
+    //
+    // fCap and fJoin are larger than needed to avoid having to initialize
+    // any pad values
+    uint32_t        fCap : 16;             // SkPaint::Cap
+    uint32_t        fJoin : 15;            // SkPaint::Join
+    uint32_t        fStrokeAndFill : 1;    // bool
 };
+SK_END_REQUIRE_DENSE
 
 #endif
diff --git a/gfx/skia/skia/include/core/SkSurface.h b/gfx/skia/skia/include/core/SkSurface.h
index cb5133ae003e..57527ed33afa 100644
--- a/gfx/skia/skia/include/core/SkSurface.h
+++ b/gfx/skia/skia/include/core/SkSurface.h
@@ -10,6 +10,7 @@
 
 #include "SkRefCnt.h"
 #include "SkImage.h"
+#include "SkSurfaceProps.h"
 
 class SkCanvas;
 class SkPaint;
@@ -23,10 +24,23 @@ class GrRenderTarget;
  *
  *  To draw into a canvas, first create the appropriate type of Surface, and
  *  then request the canvas from the surface.
+ *
+ *  SkSurface always has non-zero dimensions. If there is a request for a new surface, and either
+ *  of the requested dimensions are zero, then NULL will be returned.
  */
 class SK_API SkSurface : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkSurface)
+    /**
+     *  Indicates whether a new surface or image should count against a cache budget. Currently this
+     *  is only used by the GPU backend (sw-raster surfaces and images are never counted against the
+     *  resource cache budget.)
+     */
+    enum Budgeted {
+        /** The surface or image does not count against the cache budget. */
+        kNo_Budgeted,
+        /** The surface or image counts against the cache budget. */
+        kYes_Budgeted
+    };
 
     /**
      *  Create a new surface, using the specified pixels/rowbytes as its
@@ -35,7 +49,8 @@ public:
      *  If the requested surface cannot be created, or the request is not a
      *  supported configuration, NULL will be returned.
      */
-    static SkSurface* NewRasterDirect(const SkImageInfo&, void* pixels, size_t rowBytes);
+    static SkSurface* NewRasterDirect(const SkImageInfo&, void* pixels, size_t rowBytes,
+                                      const SkSurfaceProps* = NULL);
 
     /**
      *  The same as NewRasterDirect, but also accepts a call-back routine, which is invoked
@@ -43,7 +58,7 @@ public:
      */
     static SkSurface* NewRasterDirectReleaseProc(const SkImageInfo&, void* pixels, size_t rowBytes,
                                                  void (*releaseProc)(void* pixels, void* context),
-                                                 void* context);
+                                                 void* context, const SkSurfaceProps* = NULL);
 
     /**
      *  Return a new surface, with the memory for the pixels automatically
@@ -52,70 +67,59 @@ public:
      *  If the requested surface cannot be created, or the request is not a
      *  supported configuration, NULL will be returned.
      */
-    static SkSurface* NewRaster(const SkImageInfo&);
+    static SkSurface* NewRaster(const SkImageInfo&, const SkSurfaceProps* = NULL);
 
     /**
      *  Helper version of NewRaster. It creates a SkImageInfo with the
      *  specified width and height, and populates the rest of info to match
      *  pixels in SkPMColor format.
      */
-    static SkSurface* NewRasterPMColor(int width, int height) {
-        return NewRaster(SkImageInfo::MakeN32Premul(width, height));
+    static SkSurface* NewRasterN32Premul(int width, int height, const SkSurfaceProps* props = NULL) {
+        return NewRaster(SkImageInfo::MakeN32Premul(width, height), props);
     }
 
-    /**
-     *  Text rendering modes that can be passed to NewRenderTarget*
-     */
-    enum TextRenderMode {
-        /**
-         *  This will use the standard text rendering method
-         */
-        kStandard_TextRenderMode,
-        /**
-         *  This will use signed distance fields for text rendering when possible
-         */
-        kDistanceField_TextRenderMode,
-    };
-
-    enum RenderTargetFlags {
-        kNone_RenderTargetFlag      = 0x0,
-        /*
-         * By default a RenderTarget-based surface will be cleared on creation.
-         * Pass in this flag to prevent the clear from happening.
-         */
-        kDontClear_RenderTargetFlag = 0x01,
-    };
-
     /**
      *  Return a new surface using the specified render target.
      */
-    static SkSurface* NewRenderTargetDirect(GrRenderTarget*,
-                                            TextRenderMode trm = kStandard_TextRenderMode,
-                                            RenderTargetFlags flags = kNone_RenderTargetFlag);
+    static SkSurface* NewRenderTargetDirect(GrRenderTarget*, const SkSurfaceProps*);
+
+    static SkSurface* NewRenderTargetDirect(GrRenderTarget* target) {
+        return NewRenderTargetDirect(target, NULL);
+    }
+
+    /**
+     *  Used to wrap a pre-existing backend 3D API texture as a SkSurface. The kRenderTarget flag
+     *  must be set on GrBackendTextureDesc for this to succeed. Skia will not assume ownership
+     *  of the texture and the client must ensure the texture is valid for the lifetime of the
+     *  SkSurface.
+     */
+    static SkSurface* NewFromBackendTexture(GrContext*, const GrBackendTextureDesc&,
+                                            const SkSurfaceProps*);
+    // Legacy alias
+    static SkSurface* NewWrappedRenderTarget(GrContext* ctx, const GrBackendTextureDesc& desc,
+                                             const SkSurfaceProps* props) {
+        return NewFromBackendTexture(ctx, desc, props);
+    }
+
+
+    /**
+     *  Used to wrap a pre-existing 3D API rendering target as a SkSurface. Skia will not assume
+     *  ownership of the render target and the client must ensure the render target is valid for the
+     *  lifetime of the SkSurface.
+     */
+    static SkSurface* NewFromBackendRenderTarget(GrContext*, const GrBackendRenderTargetDesc&,
+                                                 const SkSurfaceProps*);
 
     /**
      *  Return a new surface whose contents will be drawn to an offscreen
      *  render target, allocated by the surface.
      */
-    static SkSurface* NewRenderTarget(GrContext*, const SkImageInfo&, int sampleCount = 0,
-                                      TextRenderMode trm = kStandard_TextRenderMode,
-                                      RenderTargetFlags flags = kNone_RenderTargetFlag);
+    static SkSurface* NewRenderTarget(GrContext*, Budgeted, const SkImageInfo&, int sampleCount,
+                                      const SkSurfaceProps* = NULL);
 
-    /**
-     *  Return a new surface whose contents will be drawn to an offscreen
-     *  render target, allocated by the surface from the scratch texture pool
-     *  managed by the GrContext. The scratch texture pool serves the purpose
-     *  of retaining textures after they are no longer in use in order to
-     *  re-use them later without having to re-allocate.  Scratch textures
-     *  should be used in cases where high turnover is expected. This allows,
-     *  for example, the copy on write to recycle a texture from a recently
-     *  released SkImage snapshot of the surface.
-     *  Note: Scratch textures count against the GrContext's cached resource
-     *  budget.
-     */
-    static SkSurface* NewScratchRenderTarget(GrContext*, const SkImageInfo&, int sampleCount = 0,
-                                             TextRenderMode trm = kStandard_TextRenderMode,
-                                             RenderTargetFlags flags = kNone_RenderTargetFlag);
+    static SkSurface* NewRenderTarget(GrContext* gr, Budgeted b, const SkImageInfo& info) {
+        return NewRenderTarget(gr, b, info, 0, NULL);
+    }
 
     int width() const { return fWidth; }
     int height() const { return fHeight; }
@@ -150,9 +154,45 @@ public:
     /**
      *  Call this if the contents are about to change. This will (lazily) force a new
      *  value to be returned from generationID() when it is called next.
+     *
+     *  CAN WE DEPRECATE THIS?
      */
     void notifyContentWillChange(ContentChangeMode mode);
 
+    enum BackendHandleAccess {
+        kFlushRead_BackendHandleAccess,     //!< caller may read from the backend object
+        kFlushWrite_BackendHandleAccess,    //!< caller may write to the backend object
+        kDiscardWrite_BackendHandleAccess,  //!< caller must over-write the entire backend object
+    };
+
+    /*
+     * These are legacy aliases which will be removed soon
+     */
+    static const BackendHandleAccess kFlushRead_TextureHandleAccess =
+            kFlushRead_BackendHandleAccess;
+    static const BackendHandleAccess kFlushWrite_TextureHandleAccess =
+            kFlushWrite_BackendHandleAccess;
+    static const BackendHandleAccess kDiscardWrite_TextureHandleAccess =
+            kDiscardWrite_BackendHandleAccess;
+
+
+    /**
+     *  Retrieves the backend API handle of the texture used by this surface, or 0 if the surface
+     *  is not backed by a GPU texture.
+     *
+     *  The returned texture-handle is only valid until the next draw-call into the surface,
+     *  or the surface is deleted.
+     */
+    GrBackendObject getTextureHandle(BackendHandleAccess);
+
+    /**
+     *  Retrieves the backend API handle of the RenderTarget backing this surface.  Callers must
+     *  ensure this function returns 'true' or else the GrBackendObject will be invalid
+     *
+     *  In OpenGL this will return the FramebufferObject ID.
+     */
+    bool getRenderTargetHandle(GrBackendObject*, BackendHandleAccess);
+
     /**
      *  Return a canvas that will draw into this surface. This will always
      *  return the same canvas for a given surface, and is manged/owned by the
@@ -179,12 +219,14 @@ public:
     /**
      *  Returns an image of the current state of the surface pixels up to this
      *  point. Subsequent changes to the surface (by drawing into its canvas)
-     *  will not be reflected in this image.
+     *  will not be reflected in this image. If a copy must be made the Budgeted
+     *  parameter controls whether it counts against the resource budget
+     *  (currently for the gpu backend only).
      */
-    SkImage* newImageSnapshot();
+    SkImage* newImageSnapshot(Budgeted = kYes_Budgeted);
 
     /**
-     *  Thought the caller could get a snapshot image explicitly, and draw that,
+     *  Though the caller could get a snapshot image explicitly, and draw that,
      *  it seems that directly drawing a surface into another canvas might be
      *  a common pattern, and that we could possibly be more efficient, since
      *  we'd know that the "snapshot" need only live until we've handed it off
@@ -204,9 +246,32 @@ public:
      */
     const void* peekPixels(SkImageInfo* info, size_t* rowBytes);
 
+    /**
+     *  Copy the pixels from the surface into the specified buffer (pixels + rowBytes),
+     *  converting them into the requested format (dstInfo). The surface pixels are read
+     *  starting at the specified (srcX,srcY) location.
+     *
+     *  The specified ImageInfo and (srcX,srcY) offset specifies a source rectangle
+     *
+     *      srcR.setXYWH(srcX, srcY, dstInfo.width(), dstInfo.height());
+     *
+     *  srcR is intersected with the bounds of the base-layer. If this intersection is not empty,
+     *  then we have two sets of pixels (of equal size). Replace the dst pixels with the
+     *  corresponding src pixels, performing any colortype/alphatype transformations needed
+     *  (in the case where the src and dst have different colortypes or alphatypes).
+     *
+     *  This call can fail, returning false, for several reasons:
+     *  - If srcR does not intersect the surface bounds.
+     *  - If the requested colortype/alphatype cannot be converted from the surface's types.
+     */
+    bool readPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes,
+                    int srcX, int srcY);
+
+    const SkSurfaceProps& props() const { return fProps; }
+
 protected:
-    SkSurface(int width, int height);
-    SkSurface(const SkImageInfo&);
+    SkSurface(int width, int height, const SkSurfaceProps*);
+    SkSurface(const SkImageInfo&, const SkSurfaceProps*);
 
     // called by subclass if their contents have changed
     void dirtyGenerationID() {
@@ -214,9 +279,10 @@ protected:
     }
 
 private:
-    const int   fWidth;
-    const int   fHeight;
-    uint32_t    fGenerationID;
+    const SkSurfaceProps fProps;
+    const int            fWidth;
+    const int            fHeight;
+    uint32_t             fGenerationID;
 
     typedef SkRefCnt INHERITED;
 };
diff --git a/gfx/skia/skia/include/core/SkSurfaceProps.h b/gfx/skia/skia/include/core/SkSurfaceProps.h
new file mode 100644
index 000000000000..735561f1dc91
--- /dev/null
+++ b/gfx/skia/skia/include/core/SkSurfaceProps.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkSurfaceProps_DEFINED
+#define SkSurfaceProps_DEFINED
+
+#include "SkTypes.h"
+
+/**
+ *  Description of how the LCD strips are arranged for each pixel. If this is unknown, or the
+ *  pixels are meant to be "portable" and/or transformed before showing (e.g. rotated, scaled)
+ *  then use kUnknown_SkPixelGeometry.
+ */
+enum SkPixelGeometry {
+    kUnknown_SkPixelGeometry,
+    kRGB_H_SkPixelGeometry,
+    kBGR_H_SkPixelGeometry,
+    kRGB_V_SkPixelGeometry,
+    kBGR_V_SkPixelGeometry,
+};
+
+// Returns true iff geo is a known geometry and is RGB.
+static inline bool SkPixelGeometryIsRGB(SkPixelGeometry geo) {
+    return kRGB_H_SkPixelGeometry == geo || kRGB_V_SkPixelGeometry == geo;
+}
+
+// Returns true iff geo is a known geometry and is BGR.
+static inline bool SkPixelGeometryIsBGR(SkPixelGeometry geo) {
+    return kBGR_H_SkPixelGeometry == geo || kBGR_V_SkPixelGeometry == geo;
+}
+
+// Returns true iff geo is a known geometry and is horizontal.
+static inline bool SkPixelGeometryIsH(SkPixelGeometry geo) {
+    return kRGB_H_SkPixelGeometry == geo || kBGR_H_SkPixelGeometry == geo;
+}
+
+// Returns true iff geo is a known geometry and is vertical.
+static inline bool SkPixelGeometryIsV(SkPixelGeometry geo) {
+    return kRGB_V_SkPixelGeometry == geo || kBGR_V_SkPixelGeometry == geo;
+}
+
+/**
+ *  Describes properties and constraints of a given SkSurface. The rendering engine can parse these
+ *  during drawing, and can sometimes optimize its performance (e.g. disabling an expensive
+ *  feature).
+ */
+class SK_API SkSurfaceProps {
+public:
+    enum Flags {
+        kDisallowAntiAlias_Flag         = 1 << 0,
+        kDisallowDither_Flag            = 1 << 1,
+        kUseDeviceIndependentFonts_Flag = 1 << 2,
+    };
+    /** Deprecated alias used by Chromium. Will be removed. */
+    static const Flags kUseDistanceFieldFonts_Flag = kUseDeviceIndependentFonts_Flag;
+
+    SkSurfaceProps(uint32_t flags, SkPixelGeometry);
+
+    enum InitType {
+        kLegacyFontHost_InitType
+    };
+    SkSurfaceProps(InitType);
+    SkSurfaceProps(uint32_t flags, InitType);
+    SkSurfaceProps(const SkSurfaceProps& other);
+
+    uint32_t flags() const { return fFlags; }
+    SkPixelGeometry pixelGeometry() const { return fPixelGeometry; }
+
+    bool isDisallowAA() const { return SkToBool(fFlags & kDisallowAntiAlias_Flag); }
+    bool isDisallowDither() const { return SkToBool(fFlags & kDisallowDither_Flag); }
+    bool isUseDeviceIndependentFonts() const {
+        return SkToBool(fFlags & kUseDeviceIndependentFonts_Flag);
+    }
+
+private:
+    SkSurfaceProps();
+
+    uint32_t        fFlags;
+    SkPixelGeometry fPixelGeometry;
+};
+
+#endif
diff --git a/gfx/skia/skia/include/core/SkTArray.h b/gfx/skia/skia/include/core/SkTArray.h
index 6c76c78094bf..401f7084d6e5 100644
--- a/gfx/skia/skia/include/core/SkTArray.h
+++ b/gfx/skia/skia/include/core/SkTArray.h
@@ -8,9 +8,10 @@
 #ifndef SkTArray_DEFINED
 #define SkTArray_DEFINED
 
-#include <new>
+#include "../private/SkTemplates.h"
 #include "SkTypes.h"
-#include "SkTemplates.h"
+
+#include <new>
 
 template <typename T, bool MEM_COPY = false> class SkTArray;
 
@@ -31,18 +32,18 @@ inline void copyAndDelete(SkTArray<T, true>* self, char* newMemArray) {
 
 template<typename T>
 inline void copy(SkTArray<T, false>* self, int dst, int src) {
-    SkNEW_PLACEMENT_ARGS(&self->fItemArray[dst], T, (self->fItemArray[src]));
+    new (&self->fItemArray[dst]) T(self->fItemArray[src]);
 }
 template<typename T>
 inline void copy(SkTArray<T, false>* self, const T* array) {
     for (int i = 0; i < self->fCount; ++i) {
-        SkNEW_PLACEMENT_ARGS(self->fItemArray + i, T, (array[i]));
+        new (self->fItemArray + i) T(array[i]);
     }
 }
 template<typename T>
 inline void copyAndDelete(SkTArray<T, false>* self, char* newMemArray) {
     for (int i = 0; i < self->fCount; ++i) {
-        SkNEW_PLACEMENT_ARGS(newMemArray + sizeof(T) * i, T, (self->fItemArray[i]));
+        new (newMemArray + sizeof(T) * i) T(self->fItemArray[i]);
         self->fItemArray[i].~T();
     }
 }
@@ -107,7 +108,7 @@ public:
         return *this;
     }
 
-    virtual ~SkTArray() {
+    ~SkTArray() {
         for (int i = 0; i < fCount; ++i) {
             fItemArray[i].~T();
         }
@@ -134,7 +135,7 @@ public:
         this->checkRealloc(n);
         fCount = n;
         for (int i = 0; i < fCount; ++i) {
-            SkNEW_PLACEMENT(fItemArray + i, T);
+            new (fItemArray + i) T;
         }
     }
 
@@ -179,7 +180,7 @@ public:
      */
     T& push_back() {
         T* newT = reinterpret_cast<T*>(this->push_back_raw(1));
-        SkNEW_PLACEMENT(newT, T);
+        new (newT) T;
         return *newT;
     }
 
@@ -188,10 +189,18 @@ public:
      */
     T& push_back(const T& t) {
         T* newT = reinterpret_cast<T*>(this->push_back_raw(1));
-        SkNEW_PLACEMENT_ARGS(newT, T, (t));
+        new (newT) T(t);
         return *newT;
     }
 
+    /**
+     *  Construct a new T at the back of this array.
+     */
+    template<class... Args> T& emplace_back(Args&&... args) {
+        T* newT = reinterpret_cast<T*>(this->push_back_raw(1));
+        return *new (newT) T(skstd::forward<Args>(args)...);
+    }
+
     /**
      * Allocates n more default-initialized T values, and returns the address of
      * the start of that new range. Note: this address is only valid until the
@@ -201,7 +210,7 @@ public:
         SkASSERT(n >= 0);
         T* newTs = reinterpret_cast<T*>(this->push_back_raw(n));
         for (int i = 0; i < n; ++i) {
-            SkNEW_PLACEMENT(newTs + i, T);
+            new (newTs + i) T;
         }
         return newTs;
     }
@@ -214,7 +223,7 @@ public:
         SkASSERT(n >= 0);
         T* newTs = reinterpret_cast<T*>(this->push_back_raw(n));
         for (int i = 0; i < n; ++i) {
-            SkNEW_PLACEMENT_ARGS(newTs[i], T, (t));
+            new (newTs[i]) T(t);
         }
         return newTs;
     }
@@ -227,7 +236,7 @@ public:
         SkASSERT(n >= 0);
         this->checkRealloc(n);
         for (int i = 0; i < n; ++i) {
-            SkNEW_PLACEMENT_ARGS(fItemArray + fCount + i, T, (t[i]));
+            new (fItemArray + fCount + i) T(t[i]);
         }
         fCount += n;
         return fItemArray + fCount - n;
@@ -270,6 +279,26 @@ public:
         }
     }
 
+    /** Swaps the contents of this array with that array. Does a pointer swap if possible,
+        otherwise copies the T values. */
+    void swap(SkTArray* that) {
+        if (this == that) {
+            return;
+        }
+        if (this->fPreAllocMemArray != this->fItemArray &&
+            that->fPreAllocMemArray != that->fItemArray) {
+            // If neither is using a preallocated array then just swap.
+            SkTSwap(fItemArray, that->fItemArray);
+            SkTSwap(fCount, that->fCount);
+            SkTSwap(fAllocCount, that->fAllocCount);
+        } else {
+            // This could be more optimal...
+            SkTArray copy(*that);
+            *that = *this;
+            *this = copy;
+        }
+    }
+
     T* begin() {
         return fItemArray;
     }
@@ -280,7 +309,7 @@ public:
         return fItemArray ? fItemArray + fCount : NULL;
     }
     const T* end() const {
-        return fItemArray ? fItemArray + fCount : NULL;;
+        return fItemArray ? fItemArray + fCount : NULL;
     }
 
    /**
@@ -375,7 +404,7 @@ protected:
     }
 
     void init(const T* array, int count,
-               void* preAllocStorage, int preAllocOrReserveCount) {
+              void* preAllocStorage, int preAllocOrReserveCount) {
         SkASSERT(count >= 0);
         SkASSERT(preAllocOrReserveCount >= 0);
         fCount              = count;
@@ -384,7 +413,7 @@ protected:
                                     gMIN_ALLOC_COUNT;
         fPreAllocMemArray   = preAllocStorage;
         if (fReserveCount >= fCount &&
-            NULL != preAllocStorage) {
+            preAllocStorage) {
             fAllocCount = fReserveCount;
             fMemArray = preAllocStorage;
         } else {
@@ -427,7 +456,7 @@ private:
             fAllocCount = newAllocCount;
             char* newMemArray;
 
-            if (fAllocCount == fReserveCount && NULL != fPreAllocMemArray) {
+            if (fAllocCount == fReserveCount && fPreAllocMemArray) {
                 newMemArray = (char*) fPreAllocMemArray;
             } else {
                 newMemArray = (char*) sk_malloc_throw(fAllocCount*sizeof(T));
@@ -452,10 +481,10 @@ private:
     template<typename X> friend void SkTArrayExt::copy(SkTArray<X, false>* that, const X*);
     template<typename X> friend void SkTArrayExt::copyAndDelete(SkTArray<X, false>* that, char*);
 
-    int fReserveCount;
-    int fCount;
-    int fAllocCount;
-    void*    fPreAllocMemArray;
+    int     fReserveCount;
+    int     fCount;
+    int     fAllocCount;
+    void*   fPreAllocMemArray;
     union {
         T*       fItemArray;
         void*    fMemArray;
@@ -464,7 +493,7 @@ private:
 
 // Use the below macro (SkNEW_APPEND_TO_TARRAY) rather than calling this directly
 template <typename T, bool MEM_COPY>
-void* operator new(size_t, SkTArray<T, MEM_COPY>* array, int atIndex) {
+void* operator new(size_t, SkTArray<T, MEM_COPY>* array, int SkDEBUGCODE(atIndex)) {
     // Currently, we only support adding to the end of the array. When the array class itself
     // supports random insertion then this should be updated.
     // SkASSERT(atIndex >= 0 && atIndex <= array->count());
@@ -476,7 +505,7 @@ void* operator new(size_t, SkTArray<T, MEM_COPY>* array, int atIndex) {
 // to match the op new silences warnings about missing op delete when a constructor throws an
 // exception.
 template <typename T, bool MEM_COPY>
-void operator delete(void*, SkTArray<T, MEM_COPY>* array, int atIndex) {
+void operator delete(void*, SkTArray<T, MEM_COPY>* /*array*/, int /*atIndex*/) {
     SK_CRASH();
 }
 
diff --git a/gfx/skia/skia/include/core/SkTDArray.h b/gfx/skia/skia/include/core/SkTDArray.h
index 4c90460b947f..26c6c7f8956b 100644
--- a/gfx/skia/skia/include/core/SkTDArray.h
+++ b/gfx/skia/skia/include/core/SkTDArray.h
@@ -17,23 +17,14 @@ public:
     SkTDArray() {
         fReserve = fCount = 0;
         fArray = NULL;
-#ifdef SK_DEBUG
-        fData = NULL;
-#endif
     }
     SkTDArray(const T src[], int count) {
         SkASSERT(src || count == 0);
 
         fReserve = fCount = 0;
         fArray = NULL;
-#ifdef SK_DEBUG
-        fData = NULL;
-#endif
         if (count) {
             fArray = (T*)sk_malloc_throw(count * sizeof(T));
-#ifdef SK_DEBUG
-            fData = (ArrayT*)fArray;
-#endif
             memcpy(fArray, src, sizeof(T) * count);
             fReserve = fCount = count;
         }
@@ -41,9 +32,6 @@ public:
     SkTDArray(const SkTDArray<T>& src) {
         fReserve = fCount = 0;
         fArray = NULL;
-#ifdef SK_DEBUG
-        fData = NULL;
-#endif
         SkTDArray<T> tmp(src.fArray, src.fCount);
         this->swap(tmp);
     }
@@ -75,9 +63,6 @@ public:
 
     void swap(SkTDArray<T>& other) {
         SkTSwap(fArray, other.fArray);
-#ifdef SK_DEBUG
-        SkTSwap(fData, other.fData);
-#endif
         SkTSwap(fReserve, other.fReserve);
         SkTSwap(fCount, other.fCount);
     }
@@ -89,7 +74,6 @@ public:
         T* array = fArray;
         fArray = NULL;
         fReserve = fCount = 0;
-        SkDEBUGCODE(fData = NULL;)
         return array;
     }
 
@@ -137,9 +121,6 @@ public:
         if (fArray) {
             sk_free(fArray);
             fArray = NULL;
-#ifdef SK_DEBUG
-            fData = NULL;
-#endif
             fReserve = fCount = 0;
         } else {
             SkASSERT(fReserve == 0 && fCount == 0);
@@ -155,7 +136,7 @@ public:
      *  Sets the number of elements in the array.
      *  If the array does not have space for count elements, it will increase
      *  the storage allocated to some amount greater than that required.
-     *  It will never shrink the shrink the storage.
+     *  It will never shrink the storage.
      */
     void setCount(int count) {
         SkASSERT(count >= 0);
@@ -237,7 +218,7 @@ public:
 
         for (; iter < stop; iter++) {
             if (*iter == elem) {
-                return (int) (iter - fArray);
+                return SkToInt(iter - fArray);
             }
         }
         return -1;
@@ -282,18 +263,18 @@ public:
     }
 
     // routines to treat the array like a stack
-    T*          push() { return this->append(); }
-    void        push(const T& elem) { *this->append() = elem; }
-    const T&    top() const { return (*this)[fCount - 1]; }
-    T&          top() { return (*this)[fCount - 1]; }
-    void        pop(T* elem) { if (elem) *elem = (*this)[fCount - 1]; --fCount; }
-    void        pop() { --fCount; }
+    T*       push() { return this->append(); }
+    void     push(const T& elem) { *this->append() = elem; }
+    const T& top() const { return (*this)[fCount - 1]; }
+    T&       top() { return (*this)[fCount - 1]; }
+    void     pop(T* elem) { SkASSERT(fCount > 0); if (elem) *elem = (*this)[fCount - 1]; --fCount; }
+    void     pop() { SkASSERT(fCount > 0); --fCount; }
 
     void deleteAll() {
         T*  iter = fArray;
         T*  stop = fArray + fCount;
         while (iter < stop) {
-            SkDELETE (*iter);
+            delete *iter;
             iter += 1;
         }
         this->reset();
@@ -343,18 +324,15 @@ public:
         SkASSERT((fReserve == 0 && fArray == NULL) ||
                  (fReserve > 0 && fArray != NULL));
         SkASSERT(fCount <= fReserve);
-        SkASSERT(fData == (ArrayT*)fArray);
     }
 #endif
 
+    void shrinkToFit() {
+        fReserve = fCount;
+        fArray = (T*)sk_realloc_throw(fArray, fReserve * sizeof(T));
+    }
+
 private:
-#ifdef SK_DEBUG
-    enum {
-        kDebugArraySize = 16
-    };
-    typedef T ArrayT[kDebugArraySize];
-    ArrayT* fData;
-#endif
     T*      fArray;
     int     fReserve;
     int     fCount;
@@ -380,9 +358,6 @@ private:
         fReserve = count + 4;
         fReserve += fReserve / 4;
         fArray = (T*)sk_realloc_throw(fArray, fReserve * sizeof(T));
-#ifdef SK_DEBUG
-        fData = (ArrayT*)fArray;
-#endif
     }
 };
 
diff --git a/gfx/skia/skia/include/core/SkTInternalLList.h b/gfx/skia/skia/include/core/SkTInternalLList.h
index 1c82a71cda67..1aa1a1220988 100644
--- a/gfx/skia/skia/include/core/SkTInternalLList.h
+++ b/gfx/skia/skia/include/core/SkTInternalLList.h
@@ -46,18 +46,18 @@ public:
     }
 
     void remove(T* entry) {
-        SkASSERT(NULL != fHead && NULL != fTail);
+        SkASSERT(fHead && fTail);
         SkASSERT(this->isInList(entry));
 
         T* prev = entry->fPrev;
         T* next = entry->fNext;
 
-        if (NULL != prev) {
+        if (prev) {
             prev->fNext = next;
         } else {
             fHead = next;
         }
-        if (NULL != next) {
+        if (next) {
             next->fPrev = prev;
         } else {
             fTail = prev;
@@ -77,7 +77,7 @@ public:
 
         entry->fPrev = NULL;
         entry->fNext = fHead;
-        if (NULL != fHead) {
+        if (fHead) {
             fHead->fPrev = entry;
         }
         fHead = entry;
@@ -96,7 +96,7 @@ public:
 
         entry->fPrev = fTail;
         entry->fNext = NULL;
-        if (NULL != fTail) {
+        if (fTail) {
             fTail->fNext = entry;
         }
         fTail = entry;
@@ -115,7 +115,7 @@ public:
      * at the tail.
      */
     void addBefore(T* newEntry, T* existingEntry) {
-        SkASSERT(NULL != newEntry);
+        SkASSERT(newEntry);
 
         if (NULL == existingEntry) {
             this->addToTail(newEntry);
@@ -144,7 +144,7 @@ public:
      * at the head.
      */
     void addAfter(T* newEntry, T* existingEntry) {
-        SkASSERT(NULL != newEntry);
+        SkASSERT(newEntry);
 
         if (NULL == existingEntry) {
             this->addToHead(newEntry);
@@ -227,7 +227,7 @@ public:
     void validate() const {
         SkASSERT(!fHead == !fTail);
         Iter iter;
-        for (T* item = iter.init(*this, Iter::kHead_IterStart); NULL != item; item = iter.next()) {
+        for (T* item = iter.init(*this, Iter::kHead_IterStart); item; item = iter.next()) {
             SkASSERT(this->isInList(item));
             if (NULL == item->fPrev) {
                 SkASSERT(fHead == item);
@@ -255,7 +255,7 @@ public:
      */
     int countEntries() const {
         int count = 0;
-        for (T* entry = fHead; NULL != entry; entry = entry->fNext) {
+        for (T* entry = fHead; entry; entry = entry->fNext) {
             ++count;
         }
         return count;
diff --git a/gfx/skia/skia/include/core/SkTLazy.h b/gfx/skia/skia/include/core/SkTLazy.h
index a291e22a1376..60d816147f75 100644
--- a/gfx/skia/skia/include/core/SkTLazy.h
+++ b/gfx/skia/skia/include/core/SkTLazy.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
@@ -6,17 +5,13 @@
  * found in the LICENSE file.
  */
 
-
-
 #ifndef SkTLazy_DEFINED
 #define SkTLazy_DEFINED
 
+#include "../private/SkTemplates.h"
 #include "SkTypes.h"
 #include <new>
 
-template <typename T> class SkTLazy;
-template <typename T> void* operator new(size_t, SkTLazy<T>* lazy);
-
 /**
  *  Efficient way to defer allocating/initializing a class until it is needed
  *  (if ever).
@@ -27,13 +22,13 @@ public:
 
     explicit SkTLazy(const T* src) : fPtr(NULL) {
         if (src) {
-            fPtr = new (fStorage) T(*src);
+            fPtr = new (fStorage.get()) T(*src);
         }
     }
 
     SkTLazy(const SkTLazy<T>& src) : fPtr(NULL) {
         if (src.isValid()) {
-            fPtr = new (fStorage) T(*src->get());
+            fPtr = new (fStorage.get()) T(*src->get());
         } else {
             fPtr = NULL;
         }
@@ -46,16 +41,16 @@ public:
     }
 
     /**
-     *  Return a pointer to a default-initialized instance of the class. If a
-     *  previous instance had been initialized (either from init() or set()) it
-     *  will first be destroyed, so that a freshly initialized instance is
-     *  always returned.
+     *  Return a pointer to an instance of the class initialized with 'args'.
+     *  If a previous instance had been initialized (either from init() or
+     *  set()) it will first be destroyed, so that a freshly initialized
+     *  instance is always returned.
      */
-    T* init() {
+    template <typename... Args> T* init(Args&&... args) {
         if (this->isValid()) {
             fPtr->~T();
         }
-        fPtr = new (SkTCast<T*>(fStorage)) T;
+        fPtr = new (SkTCast<T*>(fStorage.get())) T(skstd::forward<Args>(args)...);
         return fPtr;
     }
 
@@ -69,7 +64,7 @@ public:
         if (this->isValid()) {
             *fPtr = src;
         } else {
-            fPtr = new (SkTCast<T*>(fStorage)) T(src);
+            fPtr = new (SkTCast<T*>(fStorage.get())) T(src);
         }
         return fPtr;
     }
@@ -88,7 +83,7 @@ public:
      *  Returns true if a valid object has been initialized in the SkTLazy,
      *  false otherwise.
      */
-    bool isValid() const { return NULL != fPtr; }
+    bool isValid() const { return SkToBool(fPtr); }
 
     /**
      * Returns the object. This version should only be called when the caller
@@ -103,27 +98,10 @@ public:
     T* getMaybeNull() const { return fPtr; }
 
 private:
-    friend void* operator new<T>(size_t, SkTLazy* lazy);
-
-    T*   fPtr; // NULL or fStorage
-    char fStorage[sizeof(T)];
+    T* fPtr; // NULL or fStorage
+    SkAlignedSTStorage<1, T> fStorage;
 };
 
-// Use the below macro (SkNEW_IN_TLAZY) rather than calling this directly
-template <typename T> void* operator new(size_t, SkTLazy<T>* lazy) {
-    SkASSERT(!lazy->isValid());
-    lazy->fPtr = reinterpret_cast<T*>(lazy->fStorage);
-    return lazy->fPtr;
-}
-
-// Skia doesn't use C++ exceptions but it may be compiled with them enabled. Having an op delete
-// to match the op new silences warnings about missing op delete when a constructor throws an
-// exception.
-template <typename T> void operator delete(void*, SkTLazy<T>*) { SK_CRASH(); }
-
-// Use this to construct a T inside an SkTLazy using a non-default constructor.
-#define SkNEW_IN_TLAZY(tlazy_ptr, type_name, args) (new (tlazy_ptr) type_name args)
-
 /**
  * A helper built on top of SkTLazy to do copy-on-first-write. The object is initialized
  * with a const pointer but provides a non-const pointer accessor. The first time the
@@ -166,7 +144,7 @@ public:
      * Returns a writable T*. The first time this is called the initial object is cloned.
      */
     T* writable() {
-        SkASSERT(NULL != fObj);
+        SkASSERT(fObj);
         if (!fLazy.isValid()) {
             fLazy.set(*fObj);
             fObj = fLazy.get();
diff --git a/gfx/skia/skia/include/core/SkTSearch.h b/gfx/skia/skia/include/core/SkTSearch.h
index a4e4994ef378..549bcfd7c844 100644
--- a/gfx/skia/skia/include/core/SkTSearch.h
+++ b/gfx/skia/skia/include/core/SkTSearch.h
@@ -49,7 +49,7 @@ int SkTSearch(const T base[], int count, const K& key, size_t elemSize, LESS& le
     int hi = count - 1;
 
     while (lo < hi) {
-        int mid = (hi + lo) >> 1;
+        int mid = lo + ((hi - lo) >> 1);
         const T* elem = (const T*)((const char*)base + mid * elemSize);
 
         if (less(*elem, key))
diff --git a/gfx/skia/skia/include/core/SkTextBlob.h b/gfx/skia/skia/include/core/SkTextBlob.h
new file mode 100644
index 000000000000..b0ab8929e60f
--- /dev/null
+++ b/gfx/skia/skia/include/core/SkTextBlob.h
@@ -0,0 +1,184 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkTextBlob_DEFINED
+#define SkTextBlob_DEFINED
+
+#include "SkPaint.h"
+#include "SkRefCnt.h"
+#include "SkTArray.h"
+#include "SkTDArray.h"
+
+class SkReadBuffer;
+class SkWriteBuffer;
+
+/** \class SkTextBlob
+
+    SkTextBlob combines multiple text runs into an immutable, ref-counted structure.
+*/
+class SK_API SkTextBlob : public SkRefCnt {
+public:
+    /**
+     *  Returns a conservative blob bounding box.
+     */
+    const SkRect& bounds() const { return fBounds; }
+
+    /**
+     *  Return a non-zero, unique value representing the text blob.
+     */
+    uint32_t uniqueID() const { return fUniqueID; }
+
+    /**
+     *  Serialize to a buffer.
+     */
+    void flatten(SkWriteBuffer&) const;
+
+    /**
+     *  Recreate an SkTextBlob that was serialized into a buffer.
+     *
+     *  @param  SkReadBuffer Serialized blob data.
+     *  @return A new SkTextBlob representing the serialized data, or NULL if the buffer is
+     *          invalid.
+     */
+    static const SkTextBlob* CreateFromBuffer(SkReadBuffer&);
+
+    enum GlyphPositioning {
+        kDefault_Positioning      = 0, // Default glyph advances -- zero scalars per glyph.
+        kHorizontal_Positioning   = 1, // Horizontal positioning -- one scalar per glyph.
+        kFull_Positioning         = 2  // Point positioning -- two scalars per glyph.
+    };
+
+private:
+    class RunRecord;
+
+    SkTextBlob(int runCount, const SkRect& bounds);
+
+    virtual ~SkTextBlob();
+
+    // Memory for objects of this class is created with sk_malloc rather than operator new and must
+    // be freed with sk_free.
+    void operator delete(void* p) { sk_free(p); }
+    void* operator new(size_t) {
+        SkFAIL("All blobs are created by placement new.");
+        return sk_malloc_throw(0);
+    }
+    void* operator new(size_t, void* p) { return p; }
+
+    static unsigned ScalarsPerGlyph(GlyphPositioning pos);
+
+    friend class SkTextBlobBuilder;
+    friend class SkTextBlobRunIterator;
+
+    const int        fRunCount;
+    const SkRect     fBounds;
+    const uint32_t fUniqueID;
+
+    SkDEBUGCODE(size_t fStorageSize;)
+
+    // The actual payload resides in externally-managed storage, following the object.
+    // (see the .cpp for more details)
+
+    typedef SkRefCnt INHERITED;
+};
+
+/** \class SkTextBlobBuilder
+
+    Helper class for constructing SkTextBlobs.
+ */
+class SK_API SkTextBlobBuilder {
+public:
+    SkTextBlobBuilder();
+
+    ~SkTextBlobBuilder();
+
+    /**
+     *  Returns an immutable SkTextBlob for the current runs/glyphs. The builder is reset and
+     *  can be reused.
+     */
+    const SkTextBlob* build();
+
+    /**
+     *  Glyph and position buffers associated with a run.
+     *
+     *  A run is a sequence of glyphs sharing the same font metrics and positioning mode.
+     */
+    struct RunBuffer {
+        uint16_t* glyphs;
+        SkScalar* pos;
+    };
+
+    /**
+     *  Allocates a new default-positioned run and returns its writable glyph buffer
+     *  for direct manipulation.
+     *
+     *  @param font    The font to be used for this run.
+     *  @param count   Number of glyphs.
+     *  @param x,y     Position within the blob.
+     *  @param bounds  Optional run bounding box. If known in advance (!= NULL), it will
+     *                 be used when computing the blob bounds, to avoid re-measuring.
+     *
+     *  @return        A writable glyph buffer, valid until the next allocRun() or
+     *                 build() call. The buffer is guaranteed to hold @count@ glyphs.
+     */
+    const RunBuffer& allocRun(const SkPaint& font, int count, SkScalar x, SkScalar y,
+                              const SkRect* bounds = NULL);
+
+    /**
+     *  Allocates a new horizontally-positioned run and returns its writable glyph and position
+     *  buffers for direct manipulation.
+     *
+     *  @param font    The font to be used for this run.
+     *  @param count   Number of glyphs.
+     *  @param y       Vertical offset within the blob.
+     *  @param bounds  Optional run bounding box. If known in advance (!= NULL), it will
+     *                 be used when computing the blob bounds, to avoid re-measuring.
+     *
+     *  @return        Writable glyph and position buffers, valid until the next allocRun()
+     *                 or build() call. The buffers are guaranteed to hold @count@ elements.
+     */
+    const RunBuffer& allocRunPosH(const SkPaint& font, int count, SkScalar y,
+                                  const SkRect* bounds = NULL);
+
+    /**
+     *  Allocates a new fully-positioned run and returns its writable glyph and position
+     *  buffers for direct manipulation.
+     *
+     *  @param font   The font to be used for this run.
+     *  @param count  Number of glyphs.
+     *  @param bounds Optional run bounding box. If known in advance (!= NULL), it will
+     *                be used when computing the blob bounds, to avoid re-measuring.
+     *
+     *  @return       Writable glyph and position buffers, valid until the next allocRun()
+     *                or build() call. The glyph buffer and position buffer are
+     *                guaranteed to hold @count@ and 2 * @count@ elements, respectively.
+     */
+    const RunBuffer& allocRunPos(const SkPaint& font, int count, const SkRect* bounds = NULL);
+
+private:
+    void reserve(size_t size);
+    void allocInternal(const SkPaint& font, SkTextBlob::GlyphPositioning positioning,
+                       int count, SkPoint offset, const SkRect* bounds);
+    bool mergeRun(const SkPaint& font, SkTextBlob::GlyphPositioning positioning,
+                  int count, SkPoint offset);
+    void updateDeferredBounds();
+
+    static SkRect ConservativeRunBounds(const SkTextBlob::RunRecord&);
+    static SkRect TightRunBounds(const SkTextBlob::RunRecord&);
+
+    SkAutoTMalloc<uint8_t> fStorage;
+    size_t                 fStorageSize;
+    size_t                 fStorageUsed;
+
+    SkRect                 fBounds;
+    int                    fRunCount;
+    bool                   fDeferredBounds;
+    size_t                 fLastRun; // index into fStorage
+
+    RunBuffer              fCurrentRunBuffer;
+};
+
+#endif // SkTextBlob_DEFINED
diff --git a/gfx/skia/skia/include/core/SkThread.h b/gfx/skia/skia/include/core/SkThread.h
deleted file mode 100644
index bcbc43754f69..000000000000
--- a/gfx/skia/skia/include/core/SkThread.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkThread_DEFINED
-#define SkThread_DEFINED
-
-#include "SkTypes.h"
-
-// SK_ATOMICS_PLATFORM_H must provide inline implementations for the following declarations.
-
-/** Atomically adds one to the int referenced by addr and returns the previous value.
- *  No additional memory barrier is required; this must act as a compiler barrier.
- */
-static int32_t sk_atomic_inc(int32_t* addr);
-static int64_t sk_atomic_inc(int64_t* addr);
-
-/** Atomically adds inc to the int referenced by addr and returns the previous value.
- *  No additional memory barrier is required; this must act as a compiler barrier.
- */
-static int32_t sk_atomic_add(int32_t* addr, int32_t inc);
-
-/** Atomically subtracts one from the int referenced by addr and returns the previous value.
- *  This must act as a release (SL/S) memory barrier and as a compiler barrier.
- */
-static int32_t sk_atomic_dec(int32_t* addr);
-
-/** Atomic compare and set.
- *  If *addr == before, set *addr to after and return true, otherwise return false.
- *  This must act as a release (SL/S) memory barrier and as a compiler barrier.
- */
-static bool sk_atomic_cas(int32_t* addr, int32_t before, int32_t after);
-
-/** If sk_atomic_dec does not act as an acquire (L/SL) barrier,
- *  this must act as an acquire (L/SL) memory barrier and as a compiler barrier.
- */
-static void sk_membar_acquire__after_atomic_dec();
-
-/** If sk_atomic_conditional_inc does not act as an acquire (L/SL) barrier,
- *  this must act as an acquire (L/SL) memory barrier and as a compiler barrier.
- */
-static void sk_membar_acquire__after_atomic_conditional_inc();
-
-#include SK_ATOMICS_PLATFORM_H
-
-/** Atomically adds one to the int referenced by addr iff the referenced int was not 0
- *  and returns the previous value.
- *  No additional memory barrier is required; this must act as a compiler barrier.
- */
-template<typename INT_TYPE> static inline INT_TYPE sk_atomic_conditional_inc(INT_TYPE* addr) {
-    INT_TYPE prev;
-    do {
-        prev = *addr;
-        if (0 == prev) {
-            break;
-        }
-    } while (!sk_atomic_cas(addr, prev, prev+1));
-    return prev;
-}
-
-// SK_BARRIERS_PLATFORM_H must provide implementations for the following declarations:
-
-/** Prevent the compiler from reordering across this barrier. */
-static void sk_compiler_barrier();
-
-/** Read T*, with at least an acquire barrier.
- *
- *  Only needs to be implemented for T which can be atomically read.
- */
-template <typename T> T sk_acquire_load(T*);
-
-/** Write T*, with at least a release barrier.
- *
- *  Only needs to be implemented for T which can be atomically written.
- */
-template <typename T> void sk_release_store(T*, T);
-
-#include SK_BARRIERS_PLATFORM_H
-
-/** SK_MUTEX_PLATFORM_H must provide the following (or equivalent) declarations.
-
-class SkBaseMutex {
-public:
-    void acquire();     // Block until this thread owns the mutex.
-    void release();     // Assuming this thread owns the mutex, release it.
-    void assertHeld();  // If SK_DEBUG, assert this thread owns the mutex.
-};
-
-class SkMutex : SkBaseMutex {
-public:
-    SkMutex();
-    ~SkMutex();
-};
-
-#define SK_DECLARE_STATIC_MUTEX(name) static SkBaseMutex name = ...
-*/
-
-#include SK_MUTEX_PLATFORM_H
-
-
-class SkAutoMutexAcquire : SkNoncopyable {
-public:
-    explicit SkAutoMutexAcquire(SkBaseMutex& mutex) : fMutex(&mutex) {
-        SkASSERT(fMutex != NULL);
-        mutex.acquire();
-    }
-
-    explicit SkAutoMutexAcquire(SkBaseMutex* mutex) : fMutex(mutex) {
-        if (mutex) {
-            mutex->acquire();
-        }
-    }
-
-    /** If the mutex has not been released, release it now. */
-    ~SkAutoMutexAcquire() {
-        if (fMutex) {
-            fMutex->release();
-        }
-    }
-
-    /** If the mutex has not been released, release it now. */
-    void release() {
-        if (fMutex) {
-            fMutex->release();
-            fMutex = NULL;
-        }
-    }
-
-    /** Assert that we're holding the mutex. */
-    void assertHeld() {
-        SkASSERT(fMutex);
-        fMutex->assertHeld();
-    }
-
-private:
-    SkBaseMutex* fMutex;
-};
-#define SkAutoMutexAcquire(...) SK_REQUIRE_LOCAL_VAR(SkAutoMutexAcquire)
-
-#endif
diff --git a/gfx/skia/skia/include/core/SkTime.h b/gfx/skia/skia/include/core/SkTime.h
index 51616d41c741..2cfe3efcb45c 100644
--- a/gfx/skia/skia/include/core/SkTime.h
+++ b/gfx/skia/skia/include/core/SkTime.h
@@ -12,12 +12,16 @@
 
 #include "SkTypes.h"
 
+class SkString;
+
 /** \class SkTime
     Platform-implemented utilities to return time of day, and millisecond counter.
 */
 class SkTime {
 public:
     struct DateTime {
+        int16_t  fTimeZoneMinutes;  // The number of minutes that GetDateTime()
+                                    // is ahead of or behind UTC.
         uint16_t fYear;          //!< e.g. 2005
         uint8_t  fMonth;         //!< 1..12
         uint8_t  fDayOfWeek;     //!< 0..6, 0==Sunday
@@ -25,10 +29,13 @@ public:
         uint8_t  fHour;          //!< 0..23
         uint8_t  fMinute;        //!< 0..59
         uint8_t  fSecond;        //!< 0..59
+
+        void toISO8601(SkString* dst) const;
     };
     static void GetDateTime(DateTime*);
 
-    static SkMSec GetMSecs();
+    static SkMSec GetMSecs() { return (SkMSec)(GetNSecs() * 1e-6); }
+    static double GetNSecs();
 };
 
 #if defined(SK_DEBUG) && defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/include/core/SkTraceMemoryDump.h b/gfx/skia/skia/include/core/SkTraceMemoryDump.h
new file mode 100644
index 000000000000..8383190ccccc
--- /dev/null
+++ b/gfx/skia/skia/include/core/SkTraceMemoryDump.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkTraceMemoryDump_DEFINED
+#define SkTraceMemoryDump_DEFINED
+
+#include "SkTypes.h"
+
+class SkDiscardableMemory;
+
+/**
+ * Interface for memory tracing.
+ * This interface is meant to be passed as argument to the memory dump methods of Skia objects.
+ * The implementation of this interface is provided by the embedder.
+ */
+class SK_API SkTraceMemoryDump {
+public:
+    /**
+     * Enum to specify the level of the requested details for the dump from the Skia objects.
+     */
+    enum LevelOfDetail {
+        // Dump only the minimal details to get the total memory usage (Usually just the totals).
+        kLight_LevelOfDetail,
+
+        // Dump the detailed breakdown of the objects in the caches.
+        kObjectsBreakdowns_LevelOfDetail
+    };
+
+    /**
+     *  Appends a new memory dump (i.e. a row) to the trace memory infrastructure.
+     *  If dumpName does not exist yet, a new one is created. Otherwise, a new column is appended to
+     *  the previously created dump.
+     *  Arguments:
+     *    dumpName: an absolute, slash-separated, name for the item being dumped
+     *        e.g., "skia/CacheX/EntryY".
+     *    valueName: a string indicating the name of the column.
+     *        e.g., "size", "active_size", "number_of_objects".
+     *        This string is supposed to be long lived and is NOT copied.
+     *    units: a string indicating the units for the value.
+     *        e.g., "bytes", "objects".
+     *        This string is supposed to be long lived and is NOT copied.
+     *    value: the actual value being dumped.
+     */
+    virtual void dumpNumericValue(const char* dumpName,
+                                  const char* valueName,
+                                  const char* units,
+                                  uint64_t value) = 0;
+
+    /**
+     * Sets the memory backing for an existing dump.
+     * backingType and backingObjectId are used by the embedder to associate the memory dumped via
+     * dumpNumericValue with the corresponding dump that backs the memory.
+     */
+    virtual void setMemoryBacking(const char* dumpName,
+                                  const char* backingType,
+                                  const char* backingObjectId) = 0;
+
+    /**
+     * Specialization for memory backed by discardable memory.
+     */
+    virtual void setDiscardableMemoryBacking(
+        const char* dumpName,
+        const SkDiscardableMemory& discardableMemoryObject) = 0;
+
+    /**
+     * Returns the type of details requested in the dump. The granularity of the dump is supposed to
+     * match the LevelOfDetail argument. The level of detail must not affect the total size
+     * reported, but only granularity of the child entries.
+     */
+    virtual LevelOfDetail getRequestedDetails() const = 0;
+
+protected:
+    virtual ~SkTraceMemoryDump() { }
+};
+
+#endif
diff --git a/gfx/skia/skia/include/core/SkTypeface.h b/gfx/skia/skia/include/core/SkTypeface.h
index 0b1c1f24ac73..0b1ca6a4bdaf 100644
--- a/gfx/skia/skia/include/core/SkTypeface.h
+++ b/gfx/skia/skia/include/core/SkTypeface.h
@@ -10,14 +10,19 @@
 #ifndef SkTypeface_DEFINED
 #define SkTypeface_DEFINED
 
-#include "SkAdvancedTypefaceMetrics.h"
-#include "SkWeakRefCnt.h"
+#include "../private/SkOncePtr.h"
+#include "../private/SkWeakRefCnt.h"
+#include "SkFontStyle.h"
+#include "SkRect.h"
+#include "SkString.h"
 
 class SkDescriptor;
+class SkFontData;
 class SkFontDescriptor;
 class SkScalerContext;
 struct SkScalerContextRec;
 class SkStream;
+class SkStreamAsset;
 class SkAdvancedTypefaceMetrics;
 class SkWStream;
 
@@ -36,8 +41,6 @@ typedef uint32_t SkFontTableTag;
 */
 class SK_API SkTypeface : public SkWeakRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkTypeface)
-
     /** Style specifies the intrinsic style attributes of a given typeface
     */
     enum Style {
@@ -49,17 +52,25 @@ public:
         kBoldItalic = 0x03
     };
 
-    /** Returns the typeface's intrinsic style attributes
-    */
-    Style style() const { return fStyle; }
+    /** Returns the typeface's intrinsic style attributes. */
+    SkFontStyle fontStyle() const {
+        return fStyle;
+    }
 
-    /** Returns true if getStyle() has the kBold bit set.
-    */
-    bool isBold() const { return (fStyle & kBold) != 0; }
+    /** Returns the typeface's intrinsic style attributes.
+     *  @deprecated use fontStyle() instead.
+     */
+    Style style() const {
+        return static_cast<Style>(
+            (fStyle.weight() >= SkFontStyle::kSemiBold_Weight ? kBold : kNormal) |
+            (fStyle.slant()  != SkFontStyle::kUpright_Slant ? kItalic : kNormal));
+    }
 
-    /** Returns true if getStyle() has the kItalic bit set.
-    */
-    bool isItalic() const { return (fStyle & kItalic) != 0; }
+    /** Returns true if style() has the kBold bit set. */
+    bool isBold() const { return fStyle.weight() >= SkFontStyle::kSemiBold_Weight; }
+
+    /** Returns true if style() has the kItalic bit set. */
+    bool isItalic() const { return fStyle.slant() != SkFontStyle::kUpright_Slant; }
 
     /** Returns true if the typeface claims to be fixed-pitch.
      *  This is a style bit, advance widths may vary even if this returns true.
@@ -114,13 +125,19 @@ public:
     /** Return a new typeface given a file. If the file does not exist, or is
         not a valid font file, returns null.
     */
-    static SkTypeface* CreateFromFile(const char path[]);
+    static SkTypeface* CreateFromFile(const char path[], int index = 0);
 
     /** Return a new typeface given a stream. If the stream is
         not a valid font file, returns null. Ownership of the stream is
         transferred, so the caller must not reference it again.
     */
-    static SkTypeface* CreateFromStream(SkStream* stream);
+    static SkTypeface* CreateFromStream(SkStreamAsset* stream, int index = 0);
+
+    /** Return a new typeface given font data and configuration. If the data
+        is not valid font data, returns null. Ownership of the font data is
+        transferred, so the caller must not reference it again.
+    */
+    static SkTypeface* CreateFromFontData(SkFontData*);
 
     /** Write a unique signature to a stream, sufficient to reconstruct a
         typeface referencing the same font when Deserialize is called.
@@ -131,6 +148,7 @@ public:
         to a typeface referring to the same font. If that font is not available,
         return null. If an instance is returned, the caller is responsible for
         calling unref() when they are done with it.
+        Does not affect ownership of SkStream.
      */
     static SkTypeface* Deserialize(SkStream*);
 
@@ -241,7 +259,7 @@ public:
     public:
         virtual ~LocalizedStrings() { }
         virtual bool next(LocalizedString* localizedString) = 0;
-        void unref() { SkDELETE(this); }
+        void unref() { delete this; }
     };
     /**
      *  Returns an iterator which will attempt to enumerate all of the
@@ -262,8 +280,15 @@ public:
      *  If ttcIndex is not null, it is set to the TrueTypeCollection index
      *  of this typeface within the stream, or 0 if the stream is not a
      *  collection.
+     *  The caller is responsible for deleting the stream.
      */
-    SkStream* openStream(int* ttcIndex) const;
+    SkStreamAsset* openStream(int* ttcIndex) const;
+
+    /**
+     *  Return the font data, or NULL on failure.
+     *  The caller is responsible for deleting the font data.
+     */
+    SkFontData* createFontData() const;
 
     /**
      *  Return a scalercontext for the given descriptor. If this fails, then
@@ -273,6 +298,13 @@ public:
     SkScalerContext* createScalerContext(const SkDescriptor*,
                                          bool allowFailure = false) const;
 
+    /**
+     *  Return a rectangle (scaled to 1-pt) that represents the union of the bounds of all
+     *  of the glyphs, but each one positioned at (0,). This may be conservatively large, and
+     *  will not take into account any hinting or other size-specific adjustments.
+     */
+    SkRect getBounds() const;
+
     // PRIVATE / EXPERIMENTAL -- do not call
     void filterRec(SkScalerContextRec* rec) const {
         this->onFilterRec(rec);
@@ -283,9 +315,19 @@ public:
     }
 
 protected:
+    // The type of advance data wanted.
+    enum PerGlyphInfo {
+        kNo_PerGlyphInfo         = 0x0, // Don't populate any per glyph info.
+        kHAdvance_PerGlyphInfo   = 0x1, // Populate horizontal advance data.
+        kVAdvance_PerGlyphInfo   = 0x2, // Populate vertical advance data.
+        kGlyphNames_PerGlyphInfo = 0x4, // Populate glyph names (Type 1 only).
+        kToUnicode_PerGlyphInfo  = 0x8  // Populate ToUnicode table, ignored
+        // for Type 1 fonts
+    };
+
     /** uniqueID must be unique and non-zero
     */
-    SkTypeface(Style style, SkFontID uniqueID, bool isFixedPitch = false);
+    SkTypeface(const SkFontStyle& style, SkFontID uniqueID, bool isFixedPitch = false);
     virtual ~SkTypeface();
 
     /** Sets the fixedPitch bit. If used, must be called in the constructor. */
@@ -297,11 +339,14 @@ protected:
     virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const = 0;
     virtual void onFilterRec(SkScalerContextRec*) const = 0;
     virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
-                        SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo,
+                        PerGlyphInfo,
                         const uint32_t* glyphIDs,
                         uint32_t glyphIDsCount) const = 0;
 
-    virtual SkStream* onOpenStream(int* ttcIndex) const = 0;
+    virtual SkStreamAsset* onOpenStream(int* ttcIndex) const = 0;
+    // TODO: make pure virtual.
+    virtual SkFontData* onCreateFontData() const;
+
     virtual void onGetFontDescriptor(SkFontDescriptor*, bool* isLocal) const = 0;
 
     virtual int onCharsToGlyphs(const void* chars, Encoding, uint16_t glyphs[],
@@ -312,16 +357,27 @@ protected:
     virtual bool onGetKerningPairAdjustments(const uint16_t glyphs[], int count,
                                              int32_t adjustments[]) const;
 
+    /** Returns the family name of the typeface as known by its font manager.
+     *  This name may or may not be produced by the family name iterator.
+     */
+    virtual void onGetFamilyName(SkString* familyName) const = 0;
+
+    /** Returns an iterator over the family names in the font. */
     virtual LocalizedStrings* onCreateFamilyNameIterator() const = 0;
 
     virtual int onGetTableTags(SkFontTableTag tags[]) const = 0;
     virtual size_t onGetTableData(SkFontTableTag, size_t offset,
                                   size_t length, void* data) const = 0;
 
+    virtual bool onComputeBounds(SkRect*) const;
+
 private:
     friend class SkGTypeface;
+    friend class SkRandomTypeface;
     friend class SkPDFFont;
     friend class SkPDFCIDFont;
+    friend class GrPathRendering;
+    friend class GrGLPathRendering;
 
     /** Retrieve detailed typeface metrics.  Used by the PDF backend.
      @param perGlyphInfo Indicate what glyph specific information (advances,
@@ -334,7 +390,7 @@ private:
      @return The returned object has already been referenced.
      */
     SkAdvancedTypefaceMetrics* getAdvancedTypefaceMetrics(
-                          SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo,
+                          PerGlyphInfo,
                           const uint32_t* glyphIDs = NULL,
                           uint32_t glyphIDsCount = 0) const;
 
@@ -342,14 +398,13 @@ private:
     static SkTypeface* CreateDefault(int style);  // SkLazyPtr requires an int, not a Style.
     static void        DeleteDefault(SkTypeface*);
 
-    SkFontID    fUniqueID;
-    Style       fStyle;
-    bool        fIsFixedPitch;
+    SkOncePtr<SkRect>   fLazyBounds;
+    SkFontID            fUniqueID;
+    SkFontStyle         fStyle;
+    bool                fIsFixedPitch;
 
     friend class SkPaint;
     friend class SkGlyphCache;  // GetDefaultTypeface
-    // just so deprecated fonthost can call protected methods
-    friend class SkFontHost;
 
     typedef SkWeakRefCnt INHERITED;
 };
diff --git a/gfx/skia/skia/include/core/SkTypes.h b/gfx/skia/skia/include/core/SkTypes.h
index 4d590c24de0e..5720c30970e5 100644
--- a/gfx/skia/skia/include/core/SkTypes.h
+++ b/gfx/skia/skia/include/core/SkTypes.h
@@ -8,11 +8,22 @@
 #ifndef SkTypes_DEFINED
 #define SkTypes_DEFINED
 
+// IWYU pragma: begin_exports
 #include "SkPreConfig.h"
 #include "SkUserConfig.h"
 #include "SkPostConfig.h"
+#include <stddef.h>
 #include <stdint.h>
 
+#if defined(SK_ARM_HAS_NEON)
+    #include <arm_neon.h>
+#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
+    #include <immintrin.h>
+#endif
+// IWYU pragma: end_exports
+
+#include <string.h>
+
 /** \file SkTypes.h
 */
 
@@ -72,7 +83,7 @@ static inline void sk_bzero(void* buffer, size_t size) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef SK_OVERRIDE_GLOBAL_NEW
+#ifdef override_GLOBAL_NEW
 #include <new>
 
 inline void* operator new(size_t size) {
@@ -95,6 +106,7 @@ inline void operator delete(void* p) {
 #ifdef SK_DEBUG
     #define SkASSERT(cond)              SK_ALWAYSBREAK(cond)
     #define SkDEBUGFAIL(message)        SkASSERT(false && message)
+    #define SkDEBUGFAILF(fmt, ...)      SkASSERTF(false, fmt, ##__VA_ARGS__)
     #define SkDEBUGCODE(code)           code
     #define SkDECLAREPARAM(type, var)   , type var
     #define SkPARAM(var)                , var
@@ -132,28 +144,15 @@ inline void operator delete(void* p) {
     #define SK_TO_STRING_PUREVIRT()
     #define SK_TO_STRING_OVERRIDE()
 #else
+    class SkString;
     // the 'toString' helper functions convert Sk* objects to human-readable
     // form in developer mode
     #define SK_TO_STRING_NONVIRT() void toString(SkString* str) const;
     #define SK_TO_STRING_VIRT() virtual void toString(SkString* str) const;
     #define SK_TO_STRING_PUREVIRT() virtual void toString(SkString* str) const = 0;
-    #define SK_TO_STRING_OVERRIDE() virtual void toString(SkString* str) const SK_OVERRIDE;
+    #define SK_TO_STRING_OVERRIDE() void toString(SkString* str) const override;
 #endif
 
-template <bool>
-struct SkCompileAssert {
-};
-
-// Uses static_cast<bool>(expr) instead of bool(expr) due to
-// https://connect.microsoft.com/VisualStudio/feedback/details/832915
-
-// The extra parentheses in SkCompileAssert<(...)> are a work around for
-// http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57771
-// which was fixed in gcc 4.8.2.
-#define SK_COMPILE_ASSERT(expr, msg) \
-    typedef SkCompileAssert<(static_cast<bool>(expr))> \
-            msg[static_cast<bool>(expr) ? 1 : -1] SK_UNUSED
-
 /*
  *  Usage:  SK_MACRO_CONCAT(a, b)   to construct the symbol ab
  *
@@ -195,7 +194,7 @@ struct SkCompileAssert {
  * Take a look at SkAutoFree and SkAutoMalloc in this file for examples.
  */
 #define SK_REQUIRE_LOCAL_VAR(classname) \
-    SK_COMPILE_ASSERT(false, missing_name_for_##classname)
+    static_assert(false, "missing name for " #classname)
 
 ///////////////////////////////////////////////////////////////////////
 
@@ -283,13 +282,20 @@ static inline bool SkIsU16(long x) {
 }
 
 //////////////////////////////////////////////////////////////////////////////
-#ifndef SK_OFFSETOF
-    #define SK_OFFSETOF(type, field)    (size_t)((char*)&(((type*)1)->field) - (char*)1)
-#endif
 
-/** Returns the number of entries in an array (not a pointer)
-*/
-#define SK_ARRAY_COUNT(array)       (sizeof(array) / sizeof(array[0]))
+/** Returns the number of entries in an array (not a pointer) */
+template <typename T, size_t N> char (&SkArrayCountHelper(T (&array)[N]))[N];
+#define SK_ARRAY_COUNT(array) (sizeof(SkArrayCountHelper(array)))
+
+// Can be used to bracket data types that must be dense, e.g. hash keys.
+#if defined(__clang__)  // This should work on GCC too, but GCC diagnostic pop didn't seem to work!
+    #define SK_BEGIN_REQUIRE_DENSE _Pragma("GCC diagnostic push") \
+                                   _Pragma("GCC diagnostic error \"-Wpadded\"")
+    #define SK_END_REQUIRE_DENSE   _Pragma("GCC diagnostic pop")
+#else
+    #define SK_BEGIN_REQUIRE_DENSE
+    #define SK_END_REQUIRE_DENSE
+#endif
 
 #define SkAlign2(x)     (((x) + 1) >> 1 << 1)
 #define SkIsAlign2(x)   (0 == ((x) & 1))
@@ -300,6 +306,9 @@ static inline bool SkIsU16(long x) {
 #define SkAlign8(x)     (((x) + 7) >> 3 << 3)
 #define SkIsAlign8(x)   (0 == ((x) & 7))
 
+#define SkAlignPtr(x)   (sizeof(void*) == 8 ?   SkAlign8(x) :   SkAlign4(x))
+#define SkIsAlignPtr(x) (sizeof(void*) == 8 ? SkIsAlign8(x) : SkIsAlign4(x))
+
 typedef uint32_t SkFourByteTag;
 #define SkSetFourByteTag(a, b, c, d)    (((a) << 24) | ((b) << 16) | ((c) << 8) | (d))
 
@@ -349,6 +358,7 @@ template <typename T> inline void SkTSwap(T& a, T& b) {
 }
 
 static inline int32_t SkAbs32(int32_t value) {
+    SkASSERT(value != SK_NaN32);  // The most negative int32_t can't be negated.
     if (value < 0) {
         value = -value;
     }
@@ -393,16 +403,9 @@ static inline int32_t SkFastMin32(int32_t value, int32_t max) {
     return value;
 }
 
-/** Returns signed 32 bit value pinned between min and max, inclusively
-*/
-static inline int32_t SkPin32(int32_t value, int32_t min, int32_t max) {
-    if (value < min) {
-        value = min;
-    }
-    if (value > max) {
-        value = max;
-    }
-    return value;
+/** Returns value pinned between min and max, inclusively. */
+template <typename T> static inline const T& SkTPin(const T& value, const T& min, const T& max) {
+    return SkTMax(SkTMin(value, max), min);
 }
 
 static inline uint32_t SkSetClearShift(uint32_t bits, bool cond,
@@ -441,7 +444,7 @@ template <typename Dst> Dst SkTCast(const void* ptr) {
 
 /** \class SkNoncopyable
 
-SkNoncopyable is the base class for objects that may do not want to
+SkNoncopyable is the base class for objects that do not want to
 be copied. It hides its copy-constructor and its assignment-operator.
 */
 class SK_API SkNoncopyable {
@@ -536,7 +539,7 @@ public:
      */
     void* reset(size_t size, OnShrink shrink = kAlloc_OnShrink,  bool* didChangeAlloc = NULL) {
         if (size == fSize || (kReuse_OnShrink == shrink && size < fSize)) {
-            if (NULL != didChangeAlloc) {
+            if (didChangeAlloc) {
                 *didChangeAlloc = false;
             }
             return fPtr;
@@ -545,7 +548,7 @@ public:
         sk_free(fPtr);
         fPtr = size ? sk_malloc_throw(size) : NULL;
         fSize = size;
-        if (NULL != didChangeAlloc) {
+        if (didChangeAlloc) {
             *didChangeAlloc = true;
         }
 
@@ -640,7 +643,7 @@ public:
                 bool* didChangeAlloc = NULL) {
         size = (size < kSize) ? kSize : size;
         bool alloc = size != fSize && (SkAutoMalloc::kAlloc_OnShrink == shrink || size > fSize);
-        if (NULL != didChangeAlloc) {
+        if (didChangeAlloc) {
             *didChangeAlloc = alloc;
         }
         if (alloc) {
diff --git a/gfx/skia/skia/include/core/SkUtils.h b/gfx/skia/skia/include/core/SkUtils.h
index d522ae0dea13..2b390f04e527 100644
--- a/gfx/skia/skia/include/core/SkUtils.h
+++ b/gfx/skia/skia/include/core/SkUtils.h
@@ -10,34 +10,57 @@
 
 #include "SkTypes.h"
 
+namespace SkOpts {
+    extern void (*memset16)(uint16_t[], uint16_t, int);
+    extern void (*memset32)(uint32_t[], uint32_t, int);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
+// Inlining heuristics were determined by using perf.skia.org and bench/MemsetBench.cpp.
+// When using MSVC, inline is better >= 1K and worse <= 100.  The Nexus Player was the opposite.
+// Otherwise, when NEON or SSE is available to GCC or Clang, they can handle it best.
+// See https://code.google.com/p/chromium/issues/detail?id=516426#c15 for more details.
+// See also skia:4316; it might be a good idea to use rep stosw/stosd here.
+#define INLINE_IF(cond) if (cond) { while (count --> 0) { *buffer++ = value; } return; }
+
 /** Similar to memset(), but it assigns a 16bit value into the buffer.
     @param buffer   The memory to have value copied into it
     @param value    The 16bit value to be copied into buffer
     @param count    The number of times value should be copied into the buffer.
 */
-void sk_memset16(uint16_t dst[], uint16_t value, int count);
-typedef void (*SkMemset16Proc)(uint16_t dst[], uint16_t value, int count);
-SkMemset16Proc SkMemset16GetPlatformProc();
+static inline void sk_memset16(uint16_t buffer[], uint16_t value, int count) {
+#if defined(_MSC_VER)
+    INLINE_IF(count > 300)
+#elif defined(SK_BUILD_FOR_ANDROID) && defined(SK_CPU_X86)
+    INLINE_IF(count < 300)
+#elif defined(SK_ARM_HAS_NEON) || SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
+    INLINE_IF(true)
+#else
+    INLINE_IF(count <= 10)
+#endif
+    SkOpts::memset16(buffer, value, count);
+}
 
 /** Similar to memset(), but it assigns a 32bit value into the buffer.
     @param buffer   The memory to have value copied into it
     @param value    The 32bit value to be copied into buffer
     @param count    The number of times value should be copied into the buffer.
 */
-void sk_memset32(uint32_t dst[], uint32_t value, int count);
-typedef void (*SkMemset32Proc)(uint32_t dst[], uint32_t value, int count);
-SkMemset32Proc SkMemset32GetPlatformProc();
+static inline void sk_memset32(uint32_t buffer[], uint32_t value, int count) {
+#if defined(_MSC_VER)
+    INLINE_IF(count > 300)
+#elif defined(SK_BUILD_FOR_ANDROID) && defined(SK_CPU_X86)
+    INLINE_IF(count < 300)
+#elif defined(SK_ARM_HAS_NEON) || SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
+    INLINE_IF(true)
+#else
+    INLINE_IF(count <= 10)
+#endif
+    SkOpts::memset32(buffer, value, count);
+}
 
-/** Similar to memcpy(), but it copies count 32bit values from src to dst.
-    @param dst      The memory to have value copied into it
-    @param src      The memory to have value copied from it
-    @param count    The number of values should be copied.
-*/
-void sk_memcpy32(uint32_t dst[], const uint32_t src[], int count);
-typedef void (*SkMemcpy32Proc)(uint32_t dst[], const uint32_t src[], int count);
-SkMemcpy32Proc SkMemcpy32GetPlatformProc();
+#undef INLINE_IF
 
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/gfx/skia/skia/include/core/SkWriteBuffer.h b/gfx/skia/skia/include/core/SkWriteBuffer.h
index 04acbf10cbbd..8e4607887db3 100644
--- a/gfx/skia/skia/include/core/SkWriteBuffer.h
+++ b/gfx/skia/skia/include/core/SkWriteBuffer.h
@@ -9,14 +9,15 @@
 #ifndef SkWriteBuffer_DEFINED
 #define SkWriteBuffer_DEFINED
 
-#include "SkBitmapHeap.h"
 #include "SkData.h"
 #include "SkPath.h"
 #include "SkPicture.h"
+#include "SkPixelSerializer.h"
 #include "SkRefCnt.h"
 #include "SkWriter32.h"
 
 class SkBitmap;
+class SkBitmapHeap;
 class SkFactorySet;
 class SkFlattenable;
 class SkNamedFactorySet;
@@ -72,6 +73,7 @@ public:
     void writePath(const SkPath& path);
     size_t writeStream(SkStream* stream, size_t length);
     void writeBitmap(const SkBitmap& bitmap);
+    void writeImage(const SkImage*);
     void writeTypeface(SkTypeface* typeface);
     void writePaint(const SkPaint& paint) { paint.flatten(*this); }
 
@@ -87,21 +89,25 @@ public:
     /**
      * Set an SkBitmapHeap to store bitmaps rather than flattening.
      *
-     * Incompatible with an EncodeBitmap function. If an EncodeBitmap function is set, setting an
-     * SkBitmapHeap will set the function to NULL in release mode and crash in debug.
+     * Incompatible with an SkPixelSerializer. If an SkPixelSerializer is set,
+     * setting an SkBitmapHeap will set the SkPixelSerializer to NULL in release
+     * and crash in debug.
      */
     void setBitmapHeap(SkBitmapHeap*);
 
     /**
-     * Provide a function to encode an SkBitmap to an SkData. writeBitmap will attempt to use
-     * bitmapEncoder to store the SkBitmap. If the reader does not provide a function to decode, it
-     * will not be able to restore SkBitmaps, but will still be able to read the rest of the stream.
-     * bitmapEncoder will never be called with a NULL pixelRefOffset.
+     * Set an SkPixelSerializer to store an encoded representation of pixels,
+     * e.g. SkBitmaps.
      *
-     * Incompatible with the SkBitmapHeap. If an encoder is set fBitmapHeap will be set to NULL in
-     * release and crash in debug.
+     * Calls ref() on the serializer.
+     *
+     * TODO: Encode SkImage pixels as well.
+     *
+     * Incompatible with the SkBitmapHeap. If an encoder is set fBitmapHeap will
+     * be set to NULL in release and crash in debug.
      */
-    void setBitmapEncoder(SkPicture::EncodeBitmap bitmapEncoder);
+    void setPixelSerializer(SkPixelSerializer*);
+    SkPixelSerializer* getPixelSerializer() const { return fPixelSerializer; }
 
 private:
     bool isValidating() const { return SkToBool(fFlags & kValidation_Flag); }
@@ -114,7 +120,7 @@ private:
     SkBitmapHeap* fBitmapHeap;
     SkRefCntSet* fTFSet;
 
-    SkPicture::EncodeBitmap fBitmapEncoder;
+    SkAutoTUnref<SkPixelSerializer> fPixelSerializer;
 };
 
 #endif // SkWriteBuffer_DEFINED
diff --git a/gfx/skia/skia/include/core/SkWriter32.h b/gfx/skia/skia/include/core/SkWriter32.h
index fd24ba9ddf98..86c27a58dcc7 100644
--- a/gfx/skia/skia/include/core/SkWriter32.h
+++ b/gfx/skia/skia/include/core/SkWriter32.h
@@ -10,6 +10,7 @@
 #ifndef SkWriter32_DEFINED
 #define SkWriter32_DEFINED
 
+#include "../private/SkTemplates.h"
 #include "SkData.h"
 #include "SkMatrix.h"
 #include "SkPath.h"
@@ -19,7 +20,6 @@
 #include "SkRegion.h"
 #include "SkScalar.h"
 #include "SkStream.h"
-#include "SkTemplates.h"
 #include "SkTypes.h"
 
 class SK_API SkWriter32 : SkNoncopyable {
@@ -45,7 +45,6 @@ public:
         SkASSERT(SkIsAlign4((uintptr_t)external));
         SkASSERT(SkIsAlign4(externalBytes));
 
-        fSnapshot.reset(NULL);
         fData = (uint8_t*)external;
         fCapacity = externalBytes;
         fUsed = 0;
@@ -89,7 +88,6 @@ public:
     void overwriteTAt(size_t offset, const T& value) {
         SkASSERT(SkAlign4(offset) == offset);
         SkASSERT(offset < fUsed);
-        SkASSERT(fSnapshot.get() == NULL);
         *(T*)(fData + offset) = value;
     }
 
@@ -235,14 +233,6 @@ public:
 
     /**
      *  Captures a snapshot of the data as it is right now, and return it.
-     *  Multiple calls without intervening writes may return the same SkData,
-     *  but this is not guaranteed.
-     *  Future appends will not affect the returned buffer.
-     *  It is illegal to call overwriteTAt after this without an intervening
-     *  append. It may cause the snapshot buffer to be corrupted.
-     *  Callers must unref the returned SkData.
-     *  This is not thread safe, it should only be called on the writing thread,
-     *  the result however can be shared across threads.
      */
     SkData* snapshotAsData() const;
 private:
@@ -253,7 +243,6 @@ private:
     size_t fUsed;                      // Number of bytes written.
     void* fExternal;                   // Unmanaged memory block.
     SkAutoTMalloc<uint8_t> fInternal;  // Managed memory block.
-    SkAutoTUnref<SkData> fSnapshot;    // Holds the result of last asData.
 };
 
 /**
diff --git a/gfx/skia/skia/include/core/SkXfermode.h b/gfx/skia/skia/include/core/SkXfermode.h
index 74fd9f85f7c3..91268ab5f127 100644
--- a/gfx/skia/skia/include/core/SkXfermode.h
+++ b/gfx/skia/skia/include/core/SkXfermode.h
@@ -13,8 +13,9 @@
 #include "SkFlattenable.h"
 #include "SkColor.h"
 
-class GrEffect;
+class GrFragmentProcessor;
 class GrTexture;
+class GrXPFactory;
 class SkString;
 
 /** \class SkXfermode
@@ -30,8 +31,6 @@ class SkString;
  */
 class SK_API SkXfermode : public SkFlattenable {
 public:
-    SK_DECLARE_INST_COUNT(SkXfermode)
-
     virtual void xfer32(SkPMColor dst[], const SkPMColor src[], int count,
                         const SkAlpha aa[]) const;
     virtual void xfer16(uint16_t dst[], const SkPMColor src[], int count,
@@ -56,29 +55,6 @@ public:
         kCoeffCount
     };
 
-    /** If the xfermode can be expressed as an equation using the coefficients
-        in Coeff, then asCoeff() returns true, and sets (if not null) src and
-        dst accordingly.
-
-            result = src_coeff * src_color + dst_coeff * dst_color;
-
-        As examples, here are some of the porterduff coefficients
-
-        MODE        SRC_COEFF       DST_COEFF
-        clear       zero            zero
-        src         one             zero
-        dst         zero            one
-        srcover     one             isa
-        dstover     ida             one
-     */
-    virtual bool asCoeff(Coeff* src, Coeff* dst) const;
-
-    /**
-     *  The same as calling xfermode->asCoeff(..), except that this also checks
-     *  if the xfermode is NULL, and if so, treats it as kSrcOver_Mode.
-     */
-    static bool AsCoeff(const SkXfermode*, Coeff* src, Coeff* dst);
-
     /** List of predefined xfermodes.
         The algebra for the modes uses the following symbols:
         Sa, Sc  - source alpha and color
@@ -94,15 +70,15 @@ public:
         kClear_Mode,    //!< [0, 0]
         kSrc_Mode,      //!< [Sa, Sc]
         kDst_Mode,      //!< [Da, Dc]
-        kSrcOver_Mode,  //!< [Sa + Da - Sa*Da, Rc = Sc + (1 - Sa)*Dc]
-        kDstOver_Mode,  //!< [Sa + Da - Sa*Da, Rc = Dc + (1 - Da)*Sc]
+        kSrcOver_Mode,  //!< [Sa + Da * (1 - Sa), Sc + Dc * (1 - Sa)]
+        kDstOver_Mode,  //!< [Da + Sa * (1 - Da), Dc + Sc * (1 - Da)]
         kSrcIn_Mode,    //!< [Sa * Da, Sc * Da]
-        kDstIn_Mode,    //!< [Sa * Da, Sa * Dc]
+        kDstIn_Mode,    //!< [Da * Sa, Dc * Sa]
         kSrcOut_Mode,   //!< [Sa * (1 - Da), Sc * (1 - Da)]
         kDstOut_Mode,   //!< [Da * (1 - Sa), Dc * (1 - Sa)]
-        kSrcATop_Mode,  //!< [Da, Sc * Da + (1 - Sa) * Dc]
-        kDstATop_Mode,  //!< [Sa, Sa * Dc + Sc * (1 - Da)]
-        kXor_Mode,      //!< [Sa + Da - 2 * Sa * Da, Sc * (1 - Da) + (1 - Sa) * Dc]
+        kSrcATop_Mode,  //!< [Da, Sc * Da + Dc * (1 - Sa)]
+        kDstATop_Mode,  //!< [Sa, Dc * Sa + Sc * (1 - Da)]
+        kXor_Mode,      //!< [Sa + Da - 2 * Sa * Da, Sc * (1 - Da) + Dc * (1 - Sa)]
         kPlus_Mode,     //!< [Sa + Da, Sc + Dc]
         kModulate_Mode, // multiplies all components (= alpha and color)
 
@@ -169,13 +145,6 @@ public:
      */
     static SkXfermodeProc GetProc(Mode mode);
 
-    /** Return a function pointer to a routine that applies the specified
-        porter-duff transfer mode and srcColor to a 16bit device color. Note,
-        if the mode+srcColor might return a non-opaque color, then there is not
-        16bit proc, and this will return NULL.
-      */
-    static SkXfermodeProc16 GetProc16(Mode mode, SkColor srcColor);
-
     /**
      *  If the specified mode can be represented by a pair of Coeff, then return
      *  true and set (if not NULL) the corresponding coeffs. If the mode is
@@ -189,27 +158,72 @@ public:
         return AsMode(xfer, mode);
     }
 
-    /** A subclass may implement this factory function to work with the GPU backend. It is legal
-        to call this with all params NULL to simply test the return value. If effect is non-NULL
-        then the xfermode may optionally allocate an effect to return and the caller as *effect.
-        The caller will install it and own a ref to it. Since the xfermode may or may not assign
-        *effect, the caller should set *effect to NULL beforehand. background specifies the
-        texture to use as the background for compositing, and should be accessed in the effect's
-        fragment shader. If NULL, the effect should request access to destination color
-        (setWillReadDstColor()), and use that in the fragment shader (builder->dstColor()).
+    /**
+     * Returns whether or not the xfer mode can support treating coverage as alpha
      */
-    virtual bool asNewEffect(GrEffect** effect, GrTexture* background = NULL) const;
+    virtual bool supportsCoverageAsAlpha() const;
 
-    /** Returns true if the xfermode can be expressed as coeffs (src, dst), or as an effect
-        (effect). This helper calls the asCoeff() and asNewEffect() virtuals. If the xfermode is
-        NULL, it is treated as kSrcOver_Mode. It is legal to call this with all params NULL to
-        simply test the return value.  effect, src, and dst must all be NULL or all non-NULL.
+    /**
+     *  The same as calling xfermode->supportsCoverageAsAlpha(), except that this also checks if
+     *  the xfermode is NULL, and if so, treats it as kSrcOver_Mode.
      */
-    static bool AsNewEffectOrCoeff(SkXfermode*,
-                                   GrEffect** effect,
-                                   Coeff* src,
-                                   Coeff* dst,
-                                   GrTexture* background = NULL);
+    static bool SupportsCoverageAsAlpha(const SkXfermode* xfer);
+
+    enum SrcColorOpacity {
+        // The src color is known to be opaque (alpha == 255)
+        kOpaque_SrcColorOpacity = 0,
+        // The src color is known to be fully transparent (color == 0)
+        kTransparentBlack_SrcColorOpacity = 1,
+        // The src alpha is known to be fully transparent (alpha == 0)
+        kTransparentAlpha_SrcColorOpacity = 2,
+        // The src color opacity is unknown
+        kUnknown_SrcColorOpacity = 3
+    };
+
+    /**
+     * Returns whether or not the result of the draw with the xfer mode will be opaque or not. The
+     * input to this call is an enum describing known information about the opacity of the src color
+     * that will be given to the xfer mode.
+     */
+    virtual bool isOpaque(SrcColorOpacity opacityType) const;
+
+    /**
+     *  The same as calling xfermode->isOpaque(...), except that this also checks if
+     *  the xfermode is NULL, and if so, treats it as kSrcOver_Mode.
+     */
+    static bool IsOpaque(const SkXfermode* xfer, SrcColorOpacity opacityType);
+
+    /** Used to do in-shader blending between two colors computed in the shader via a
+        GrFragmentProcessor. The input to the returned FP is the src color. The dst color is
+        provided by the dst param which becomes a child FP of the returned FP. If the params are
+        null then this is just a query of whether the SkXfermode could support this functionality.
+        It is legal for the function to succeed but return a null output. This indicates that
+        the output of the blend is simply the src color.
+     */
+    virtual bool asFragmentProcessor(const GrFragmentProcessor** output,
+                                     const GrFragmentProcessor* dst) const;
+
+    /** A subclass may implement this factory function to work with the GPU backend. It is legal
+      to call this with xpf NULL to simply test the return value. If xpf is non-NULL then the
+      xfermode may optionally allocate a factory to return to the caller as *xpf. The caller
+      will install it and own a ref to it. Since the xfermode may or may not assign *xpf, the
+      caller should set *xpf to NULL beforehand. XferProcessors cannot use a background texture.
+      */
+    virtual bool asXPFactory(GrXPFactory** xpf) const;
+
+    /** Returns true if the xfermode can be expressed as an xfer processor factory (xpFactory).
+      This helper calls the asXPFactory() virtual. If the xfermode is NULL, it is treated as
+      kSrcOver_Mode. It is legal to call this with xpf param NULL to simply test the return value.
+      */
+    static inline bool AsXPFactory(SkXfermode* xfermode, GrXPFactory** xpf) {
+        if (nullptr == xfermode) {
+            if (xpf) {
+                *xpf = nullptr;
+            }
+            return true;
+        }
+        return xfermode->asXPFactory(xpf);
+    }
 
     SK_TO_STRING_PUREVIRT()
     SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP()
@@ -217,11 +231,9 @@ public:
 
 protected:
     SkXfermode() {}
-    explicit SkXfermode(SkReadBuffer& rb) : SkFlattenable(rb) {}
-
     /** The default implementation of xfer32/xfer16/xferA8 in turn call this
         method, 1 color at a time (upscaled to a SkPMColor). The default
-        implmentation of this method just returns dst. If performance is
+        implementation of this method just returns dst. If performance is
         important, your subclass should override xfer32/xfer16/xferA8 directly.
 
         This method will not be called directly by the client, so it need not
diff --git a/gfx/skia/skia/include/device/xps/SkXPSDevice.h b/gfx/skia/skia/include/device/xps/SkXPSDevice.h
index 5170957a596c..57f314851e5c 100644
--- a/gfx/skia/skia/include/device/xps/SkXPSDevice.h
+++ b/gfx/skia/skia/include/device/xps/SkXPSDevice.h
@@ -9,6 +9,9 @@
 #define SkXPSDevice_DEFINED
 
 #include "SkTypes.h"
+
+#ifdef SK_BUILD_FOR_WIN
+
 #include <ObjBase.h>
 #include <XpsObjectModel.h>
 
@@ -26,6 +29,8 @@
 #include "SkTScopedComPtr.h"
 #include "SkTypeface.h"
 
+//#define SK_XPS_USE_DETERMINISTIC_IDS
+
 /** \class SkXPSDevice
 
     The drawing context for the XPS backend.
@@ -68,63 +73,54 @@ public:
     virtual bool endPortfolio();
 
 protected:
-    virtual void clear(SkColor color) SK_OVERRIDE;
-
-    virtual void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE;
+    void drawPaint(const SkDraw&, const SkPaint& paint) override;
 
     virtual void drawPoints(
         const SkDraw&,
         SkCanvas::PointMode mode,
         size_t count, const SkPoint[],
-        const SkPaint& paint) SK_OVERRIDE;
+        const SkPaint& paint) override;
 
     virtual void drawRect(
         const SkDraw&,
         const SkRect& r,
-        const SkPaint& paint) SK_OVERRIDE;
+        const SkPaint& paint) override;
 
     virtual void drawRRect(
         const SkDraw&,
         const SkRRect&,
-        const SkPaint& paint) SK_OVERRIDE;
+        const SkPaint& paint) override;
 
     virtual void drawPath(
         const SkDraw&,
         const SkPath& platonicPath,
         const SkPaint& paint,
         const SkMatrix* prePathMatrix,
-        bool pathIsMutable) SK_OVERRIDE;
+        bool pathIsMutable) override;
 
     virtual void drawBitmap(
         const SkDraw&,
         const SkBitmap& bitmap,
         const SkMatrix& matrix,
-        const SkPaint& paint) SK_OVERRIDE;
+        const SkPaint& paint) override;
 
     virtual void drawSprite(
         const SkDraw&,
         const SkBitmap& bitmap,
         int x, int y,
-        const SkPaint& paint) SK_OVERRIDE;
+        const SkPaint& paint) override;
 
     virtual void drawText(
         const SkDraw&,
         const void* text, size_t len,
         SkScalar x, SkScalar y,
-        const SkPaint& paint) SK_OVERRIDE;
+        const SkPaint& paint) override;
 
     virtual void drawPosText(
         const SkDraw&,
         const void* text, size_t len,
-        const SkScalar pos[], SkScalar constY, int scalarsPerPos,
-        const SkPaint& paint) SK_OVERRIDE;
-
-    virtual void drawTextOnPath(
-        const SkDraw&,
-        const void* text, size_t len,
-        const SkPath& path,
-        const SkMatrix* matrix,
-        const SkPaint& paint) SK_OVERRIDE;
+        const SkScalar pos[], int scalarsPerPos,
+        const SkPoint& offset, const SkPaint& paint) override;
 
     virtual void drawVertices(
         const SkDraw&,
@@ -133,15 +129,13 @@ protected:
         const SkPoint texs[], const SkColor colors[],
         SkXfermode* xmode,
         const uint16_t indices[], int indexCount,
-        const SkPaint& paint) SK_OVERRIDE;
+        const SkPaint& paint) override;
 
     virtual void drawDevice(
         const SkDraw&,
         SkBaseDevice* device,
         int x, int y,
-        const SkPaint& paint) SK_OVERRIDE;
-
-    virtual bool allowImageFilter(const SkImageFilter*) SK_OVERRIDE;
+        const SkPaint& paint) override;
 
 private:
     class TypefaceUse : ::SkNoncopyable {
@@ -172,6 +166,18 @@ private:
 
     SkTArray<TypefaceUse, true> fTypefaces;
 
+    /** Creates a GUID based id and places it into buffer.
+        buffer should have space for at least GUID_ID_LEN wide characters.
+        The string will always be wchar null terminated.
+        XXXXXXXXsXXXXsXXXXsXXXXsXXXXXXXXXXXX0
+        The string may begin with a digit,
+        and so may not be suitable as a bare resource key.
+     */
+    HRESULT createId(wchar_t* buffer, size_t bufferSize, wchar_t sep = '-');
+#ifdef SK_XPS_USE_DETERMINISTIC_IDS
+    decltype(GUID::Data1) fNextId = 0;
+#endif
+
     HRESULT initXpsDocumentWriter(IXpsOMImageResource* image);
 
     HRESULT createXpsPage(
@@ -305,7 +311,7 @@ private:
         const SkVector& ppuScale,
         IXpsOMPath* shadedPath);
 
-    virtual SkBaseDevice* onCreateDevice(const SkImageInfo&, Usage) SK_OVERRIDE;
+    SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) override;
 
     // Disable the default copy and assign implementation.
     SkXPSDevice(const SkXPSDevice&);
@@ -314,4 +320,5 @@ private:
     typedef SkBitmapDevice INHERITED;
 };
 
-#endif
+#endif  // SK_BUILD_FOR_WIN
+#endif  // SkXPSDevice_DEFINED
diff --git a/gfx/skia/skia/include/effects/Sk1DPathEffect.h b/gfx/skia/skia/include/effects/Sk1DPathEffect.h
index 85f8ea2ac69c..6a7804f1119a 100644
--- a/gfx/skia/skia/include/effects/Sk1DPathEffect.h
+++ b/gfx/skia/skia/include/effects/Sk1DPathEffect.h
@@ -17,7 +17,7 @@ class SkPathMeasure;
 class SK_API Sk1DPathEffect : public SkPathEffect {
 public:
     virtual bool filterPath(SkPath* dst, const SkPath& src,
-                            SkStrokeRec*, const SkRect*) const SK_OVERRIDE;
+                            SkStrokeRec*, const SkRect*) const override;
 
 protected:
     /** Called at the start of each contour, returns the initial offset
@@ -31,6 +31,10 @@ protected:
     */
     virtual SkScalar next(SkPath* dst, SkScalar dist, SkPathMeasure&) const = 0;
 
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+    bool exposedInAndroidJavaAPI() const override { return true; }
+#endif
+
 private:
     typedef SkPathEffect INHERITED;
 };
@@ -54,22 +58,22 @@ public:
     */
     static SkPath1DPathEffect* Create(const SkPath& path, SkScalar advance, SkScalar phase,
                                       Style style) {
-        return SkNEW_ARGS(SkPath1DPathEffect, (path, advance, phase, style));
+        return new SkPath1DPathEffect(path, advance, phase, style);
     }
 
     virtual bool filterPath(SkPath*, const SkPath&,
-                            SkStrokeRec*, const SkRect*) const SK_OVERRIDE;
+                            SkStrokeRec*, const SkRect*) const override;
 
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPath1DPathEffect)
 
 protected:
     SkPath1DPathEffect(const SkPath& path, SkScalar advance, SkScalar phase, Style);
-    explicit SkPath1DPathEffect(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
 
     // overrides from Sk1DPathEffect
-    virtual SkScalar begin(SkScalar contourLength) const SK_OVERRIDE;
-    virtual SkScalar next(SkPath*, SkScalar, SkPathMeasure&) const SK_OVERRIDE;
+    SkScalar begin(SkScalar contourLength) const override;
+    SkScalar next(SkPath*, SkScalar, SkPathMeasure&) const override;
 
 private:
     SkPath      fPath;          // copied from constructor
diff --git a/gfx/skia/skia/include/effects/Sk2DPathEffect.h b/gfx/skia/skia/include/effects/Sk2DPathEffect.h
index d9eec720e95c..fa12dcf0954b 100644
--- a/gfx/skia/skia/include/effects/Sk2DPathEffect.h
+++ b/gfx/skia/skia/include/effects/Sk2DPathEffect.h
@@ -14,9 +14,7 @@
 
 class SK_API Sk2DPathEffect : public SkPathEffect {
 public:
-    virtual bool filterPath(SkPath*, const SkPath&, SkStrokeRec*, const SkRect*) const SK_OVERRIDE;
-
-    SK_DECLARE_UNFLATTENABLE_OBJECT()
+    bool filterPath(SkPath*, const SkPath&, SkStrokeRec*, const SkRect*) const override;
 
 protected:
     /** New virtual, to be overridden by subclasses.
@@ -39,8 +37,9 @@ protected:
 
     // protected so that subclasses can call this during unflattening
     explicit Sk2DPathEffect(const SkMatrix& mat);
-    explicit Sk2DPathEffect(SkReadBuffer&);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
+
+    SK_TO_STRING_OVERRIDE()
 
 private:
     SkMatrix    fMatrix, fInverse;
@@ -57,22 +56,21 @@ private:
 class SK_API SkLine2DPathEffect : public Sk2DPathEffect {
 public:
     static SkLine2DPathEffect* Create(SkScalar width, const SkMatrix& matrix) {
-        return SkNEW_ARGS(SkLine2DPathEffect, (width, matrix));
+        return new SkLine2DPathEffect(width, matrix);
     }
 
     virtual bool filterPath(SkPath* dst, const SkPath& src,
-                            SkStrokeRec*, const SkRect*) const SK_OVERRIDE;
+                            SkStrokeRec*, const SkRect*) const override;
 
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLine2DPathEffect)
 
 protected:
     SkLine2DPathEffect(SkScalar width, const SkMatrix& matrix)
         : Sk2DPathEffect(matrix), fWidth(width) {}
-    explicit SkLine2DPathEffect(SkReadBuffer&);
+    void flatten(SkWriteBuffer&) const override;
 
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
-
-    virtual void nextSpan(int u, int v, int ucount, SkPath*) const SK_OVERRIDE;
+    void nextSpan(int u, int v, int ucount, SkPath*) const override;
 
 private:
     SkScalar fWidth;
@@ -87,17 +85,17 @@ public:
      *  the latice.
      */
     static SkPath2DPathEffect* Create(const SkMatrix& matrix, const SkPath& path) {
-        return SkNEW_ARGS(SkPath2DPathEffect, (matrix, path));
+        return new SkPath2DPathEffect(matrix, path);
     }
 
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPath2DPathEffect)
 
 protected:
     SkPath2DPathEffect(const SkMatrix&, const SkPath&);
-    explicit SkPath2DPathEffect(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
 
-    virtual void next(const SkPoint&, int u, int v, SkPath*) const SK_OVERRIDE;
+    void next(const SkPoint&, int u, int v, SkPath*) const override;
 
 private:
     SkPath  fPath;
diff --git a/gfx/skia/skia/include/effects/SkArcToPathEffect.h b/gfx/skia/skia/include/effects/SkArcToPathEffect.h
new file mode 100644
index 000000000000..4716ea125d5a
--- /dev/null
+++ b/gfx/skia/skia/include/effects/SkArcToPathEffect.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkArcToPathEffect_DEFINED
+#define SkArcToPathEffect_DEFINED
+
+#include "SkPathEffect.h"
+
+class SK_API SkArcToPathEffect : public SkPathEffect {
+public:
+    /** radius must be > 0 to have an effect. It specifies the distance from each corner
+        that should be "rounded".
+    */
+    static SkPathEffect* Create(SkScalar radius) {
+        if (radius <= 0) {
+            return NULL;
+        }
+        return new SkArcToPathEffect(radius);
+    }
+
+    bool filterPath(SkPath* dst, const SkPath& src, SkStrokeRec*, const SkRect*) const override;
+
+    SK_TO_STRING_OVERRIDE()
+    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkArcToPathEffect)
+
+protected:
+    explicit SkArcToPathEffect(SkScalar radius);
+    void flatten(SkWriteBuffer&) const override;
+
+private:
+    SkScalar fRadius;
+
+    typedef SkPathEffect INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/include/effects/SkAvoidXfermode.h b/gfx/skia/skia/include/effects/SkAvoidXfermode.h
deleted file mode 100644
index a2599a8130a8..000000000000
--- a/gfx/skia/skia/include/effects/SkAvoidXfermode.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkAvoidXfermode_DEFINED
-#define SkAvoidXfermode_DEFINED
-
-#include "SkXfermode.h"
-
-/** \class SkAvoidXfermode
-
-    This xfermode will draw the src everywhere except on top of the specified
-    color.
-*/
-class SK_API SkAvoidXfermode : public SkXfermode {
-public:
-    enum Mode {
-        kAvoidColor_Mode,   //!< draw everywhere except on the opColor
-        kTargetColor_Mode   //!< draw only on top of the opColor
-    };
-
-    /** This xfermode draws, or doesn't draw, based on the destination's
-        distance from an op-color.
-
-        There are two modes, and each mode interprets a tolerance value.
-
-        Avoid: In this mode, drawing is allowed only on destination pixels that
-               are different from the op-color.
-               Tolerance near 0: avoid any colors even remotely similar to the op-color
-               Tolerance near 255: avoid only colors nearly identical to the op-color
-
-        Target: In this mode, drawing only occurs on destination pixels that
-                are similar to the op-color
-                Tolerance near 0: draw only on colors that are nearly identical to the op-color
-                Tolerance near 255: draw on any colors even remotely similar to the op-color
-     */
-    static SkAvoidXfermode* Create(SkColor opColor, U8CPU tolerance, Mode mode) {
-        return SkNEW_ARGS(SkAvoidXfermode, (opColor, tolerance, mode));
-    }
-
-    // overrides from SkXfermode
-    virtual void xfer32(SkPMColor dst[], const SkPMColor src[], int count,
-                        const SkAlpha aa[]) const SK_OVERRIDE;
-    virtual void xfer16(uint16_t dst[], const SkPMColor src[], int count,
-                        const SkAlpha aa[]) const SK_OVERRIDE;
-    virtual void xferA8(SkAlpha dst[], const SkPMColor src[], int count,
-                        const SkAlpha aa[]) const SK_OVERRIDE;
-
-    SK_TO_STRING_OVERRIDE()
-    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkAvoidXfermode)
-
-protected:
-    SkAvoidXfermode(SkColor opColor, U8CPU tolerance, Mode mode);
-    explicit SkAvoidXfermode(SkReadBuffer&);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
-
-private:
-    SkColor     fOpColor;
-    uint32_t    fDistMul;   // x.14
-    Mode        fMode;
-
-    typedef SkXfermode INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/include/effects/SkBitmapSource.h b/gfx/skia/skia/include/effects/SkBitmapSource.h
deleted file mode 100644
index 2aa8fe96fabc..000000000000
--- a/gfx/skia/skia/include/effects/SkBitmapSource.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2012 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkBitmapSource_DEFINED
-#define SkBitmapSource_DEFINED
-
-#include "SkImageFilter.h"
-#include "SkBitmap.h"
-
-class SK_API SkBitmapSource : public SkImageFilter {
-public:
-    static SkBitmapSource* Create(const SkBitmap& bitmap) {
-        return SkNEW_ARGS(SkBitmapSource, (bitmap));
-    }
-    static SkBitmapSource* Create(const SkBitmap& bitmap, const SkRect& srcRect,
-                                  const SkRect& dstRect) {
-        return SkNEW_ARGS(SkBitmapSource, (bitmap, srcRect, dstRect));
-    }
-    virtual void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE;
-
-    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBitmapSource)
-
-protected:
-    explicit SkBitmapSource(const SkBitmap& bitmap);
-    SkBitmapSource(const SkBitmap& bitmap, const SkRect& srcRect, const SkRect& dstRect);
-    explicit SkBitmapSource(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
-
-    virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                               SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
-    virtual bool onFilterBounds(const SkIRect& src, const SkMatrix& ctm, SkIRect* dst) const SK_OVERRIDE;
-
-private:
-    SkBitmap fBitmap;
-    SkRect   fSrcRect, fDstRect;
-    typedef SkImageFilter INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/include/effects/SkBlurDrawLooper.h b/gfx/skia/skia/include/effects/SkBlurDrawLooper.h
index 507ec8b0ad76..808557b9da7f 100644
--- a/gfx/skia/skia/include/effects/SkBlurDrawLooper.h
+++ b/gfx/skia/skia/include/effects/SkBlurDrawLooper.h
@@ -37,14 +37,14 @@ public:
 
     static SkBlurDrawLooper* Create(SkColor color, SkScalar sigma, SkScalar dx, SkScalar dy,
                                     uint32_t flags = kNone_BlurFlag) {
-        return SkNEW_ARGS(SkBlurDrawLooper, (color, sigma, dx, dy, flags));
+        return new SkBlurDrawLooper(color, sigma, dx, dy, flags);
     }
 
     virtual ~SkBlurDrawLooper();
 
-    virtual SkDrawLooper::Context* createContext(SkCanvas*, void* storage) const SK_OVERRIDE;
+    SkDrawLooper::Context* createContext(SkCanvas*, void* storage) const override;
 
-    virtual size_t contextSize() const SK_OVERRIDE { return sizeof(BlurDrawLooperContext); }
+    size_t contextSize() const override { return sizeof(BlurDrawLooperContext); }
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBlurDrawLooper)
@@ -53,10 +53,9 @@ protected:
     SkBlurDrawLooper(SkColor color, SkScalar sigma, SkScalar dx, SkScalar dy,
                      uint32_t flags);
 
-    SkBlurDrawLooper(SkReadBuffer&);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
 
-    virtual bool asABlurShadow(BlurShadowRec*) const SK_OVERRIDE;
+    bool asABlurShadow(BlurShadowRec*) const override;
 
 private:
     SkMaskFilter*   fBlur;
@@ -75,7 +74,7 @@ private:
     public:
         explicit BlurDrawLooperContext(const SkBlurDrawLooper* looper);
 
-        virtual bool next(SkCanvas* canvas, SkPaint* paint) SK_OVERRIDE;
+        bool next(SkCanvas* canvas, SkPaint* paint) override;
 
     private:
         const SkBlurDrawLooper* fLooper;
diff --git a/gfx/skia/skia/include/effects/SkBlurImageFilter.h b/gfx/skia/skia/include/effects/SkBlurImageFilter.h
index 732af8f8a99a..c7193a435f09 100644
--- a/gfx/skia/skia/include/effects/SkBlurImageFilter.h
+++ b/gfx/skia/skia/include/effects/SkBlurImageFilter.h
@@ -13,35 +13,31 @@
 
 class SK_API SkBlurImageFilter : public SkImageFilter {
 public:
-    static SkBlurImageFilter* Create(SkScalar sigmaX,
-                                     SkScalar sigmaY,
-                                     SkImageFilter* input = NULL,
-                                     const CropRect* cropRect = NULL) {
-        return SkNEW_ARGS(SkBlurImageFilter, (sigmaX, sigmaY, input, cropRect));
+    static SkImageFilter* Create(SkScalar sigmaX, SkScalar sigmaY, SkImageFilter* input = NULL,
+                                 const CropRect* cropRect = NULL) {
+        return new SkBlurImageFilter(sigmaX, sigmaY, input, cropRect);
     }
 
-    virtual void computeFastBounds(const SkRect&, SkRect*) const SK_OVERRIDE;
+    void computeFastBounds(const SkRect&, SkRect*) const override;
 
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBlurImageFilter)
 
 protected:
+    void flatten(SkWriteBuffer&) const override;
+    bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result,
+                       SkIPoint* offset) const override;
+    bool onFilterBounds(const SkIRect& src, const SkMatrix&, SkIRect* dst) const override;
+    bool canFilterImageGPU() const override { return true; }
+    bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx, SkBitmap* result,
+                        SkIPoint* offset) const override;
+
+private:
     SkBlurImageFilter(SkScalar sigmaX,
                       SkScalar sigmaY,
                       SkImageFilter* input,
                       const CropRect* cropRect);
-    explicit SkBlurImageFilter(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
 
-    virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                               SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
-    virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&,
-                                SkIRect* dst) const SK_OVERRIDE;
-
-    bool canFilterImageGPU() const SK_OVERRIDE { return true; }
-    virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx,
-                                SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
-
-private:
     SkSize   fSigma;
     typedef SkImageFilter INHERITED;
 };
diff --git a/gfx/skia/skia/include/effects/SkColorCubeFilter.h b/gfx/skia/skia/include/effects/SkColorCubeFilter.h
new file mode 100644
index 000000000000..f4a0c9009d09
--- /dev/null
+++ b/gfx/skia/skia/include/effects/SkColorCubeFilter.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkColorCubeFilter_DEFINED
+#define SkColorCubeFilter_DEFINED
+
+#include "SkColorFilter.h"
+#include "SkData.h"
+#include "../private/SkMutex.h"
+
+class SK_API SkColorCubeFilter : public SkColorFilter {
+public:
+    /** cubeData must containt a 3D data in the form of cube of the size:
+     *  cubeDimension * cubeDimension * cubeDimension * sizeof(SkColor)
+     *  This cube contains a transform where (x,y,z) maps to the (r,g,b).
+     *  The alpha components of the colors must be 0xFF.
+     */
+    static SkColorFilter* Create(SkData* cubeData, int cubeDimension);
+
+    void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const override;
+    uint32_t getFlags() const override;
+
+#if SK_SUPPORT_GPU
+    const GrFragmentProcessor* asFragmentProcessor(GrContext*) const override;
+#endif
+
+    SK_TO_STRING_OVERRIDE()
+    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorCubeFilter)
+
+protected:
+    SkColorCubeFilter(SkData* cubeData, int cubeDimension);
+    void flatten(SkWriteBuffer&) const override;
+
+private:
+    /** The cache is initialized on-demand when getProcessingLuts is called.
+     */
+    class ColorCubeProcesingCache {
+    public:
+        ColorCubeProcesingCache(int cubeDimension);
+
+        void getProcessingLuts(const int* (*colorToIndex)[2],
+                               const SkScalar* (*colorToFactors)[2],
+                               const SkScalar** colorToScalar);
+
+        int cubeDimension() const { return fCubeDimension; }
+
+    private:
+        // Working pointers. If any of these is NULL,
+        // we need to recompute the corresponding cache values.
+        int* fColorToIndex[2];
+        SkScalar* fColorToFactors[2];
+        SkScalar* fColorToScalar;
+
+        SkAutoMalloc fLutStorage;
+
+        const int fCubeDimension;
+
+        // Make sure we only initialize the caches once.
+        SkMutex fLutsMutex;
+        bool fLutsInited;
+
+        static void initProcessingLuts(ColorCubeProcesingCache* cache);
+    };
+
+    SkAutoDataUnref fCubeData;
+    int32_t fUniqueID;
+
+    mutable ColorCubeProcesingCache fCache;
+
+    typedef SkColorFilter INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/include/effects/SkColorFilterImageFilter.h b/gfx/skia/skia/include/effects/SkColorFilterImageFilter.h
index b915e8835786..200ec8650015 100644
--- a/gfx/skia/skia/include/effects/SkColorFilterImageFilter.h
+++ b/gfx/skia/skia/include/effects/SkColorFilterImageFilter.h
@@ -14,26 +14,25 @@ class SkColorFilter;
 
 class SK_API SkColorFilterImageFilter : public SkImageFilter {
 public:
-    static SkColorFilterImageFilter* Create(SkColorFilter* cf,
-                                            SkImageFilter* input = NULL,
-                                            const CropRect* cropRect = NULL);
-    virtual ~SkColorFilterImageFilter();
+    static SkImageFilter* Create(SkColorFilter* cf, SkImageFilter* input = NULL,
+                                 const CropRect* cropRect = NULL);
 
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorFilterImageFilter)
 
 protected:
-    SkColorFilterImageFilter(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
-
-    virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                               SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE;
-
-    virtual bool asColorFilter(SkColorFilter**) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
+    bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result,
+                       SkIPoint* loc) const override;
+    bool onIsColorFilterNode(SkColorFilter**) const override;
+    bool affectsTransparentBlack() const override;
 
 private:
     SkColorFilterImageFilter(SkColorFilter* cf,
                              SkImageFilter* input,
                              const CropRect* cropRect);
+    virtual ~SkColorFilterImageFilter();
+
     SkColorFilter*  fColorFilter;
 
     typedef SkImageFilter INHERITED;
diff --git a/gfx/skia/skia/include/effects/SkColorMatrix.h b/gfx/skia/skia/include/effects/SkColorMatrix.h
index c598a1210e5a..a38585c12365 100644
--- a/gfx/skia/skia/include/effects/SkColorMatrix.h
+++ b/gfx/skia/skia/include/effects/SkColorMatrix.h
@@ -12,7 +12,10 @@
 
 class SK_API SkColorMatrix {
 public:
-    SkScalar    fMat[20];
+    enum {
+        kCount = 20
+    };
+    SkScalar    fMat[kCount];
 
     enum Elem {
         kR_Scale    = 0,
@@ -59,6 +62,9 @@ public:
     }
 
     bool operator!=(const SkColorMatrix& other) const { return !((*this) == other); }
+
+    static bool NeedsClamping(const SkScalar[20]);
+    static void SetConcat(SkScalar result[20], const SkScalar outer[20], const SkScalar inner[20]);
 };
 
 #endif
diff --git a/gfx/skia/skia/include/effects/SkColorMatrixFilter.h b/gfx/skia/skia/include/effects/SkColorMatrixFilter.h
index edbe07dd7749..bd2b939a434f 100644
--- a/gfx/skia/skia/include/effects/SkColorMatrixFilter.h
+++ b/gfx/skia/skia/include/effects/SkColorMatrixFilter.h
@@ -14,19 +14,19 @@
 class SK_API SkColorMatrixFilter : public SkColorFilter {
 public:
     static SkColorMatrixFilter* Create(const SkColorMatrix& cm) {
-        return SkNEW_ARGS(SkColorMatrixFilter, (cm));
+        return new SkColorMatrixFilter(cm);
     }
     static SkColorMatrixFilter* Create(const SkScalar array[20]) {
-        return SkNEW_ARGS(SkColorMatrixFilter, (array));
+        return new SkColorMatrixFilter(array);
     }
 
-    // overrides from SkColorFilter
-    virtual void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const SK_OVERRIDE;
-    virtual void filterSpan16(const uint16_t src[], int count, uint16_t[]) const SK_OVERRIDE;
-    virtual uint32_t getFlags() const SK_OVERRIDE;
-    virtual bool asColorMatrix(SkScalar matrix[20]) const SK_OVERRIDE;
+    void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const override;
+    uint32_t getFlags() const override;
+    bool asColorMatrix(SkScalar matrix[20]) const override;
+    SkColorFilter* newComposed(const SkColorFilter*) const override;
+
 #if SK_SUPPORT_GPU
-    virtual GrEffect* asNewEffect(GrContext*) const SK_OVERRIDE;
+    const GrFragmentProcessor* asFragmentProcessor(GrContext*) const override;
 #endif
 
     struct State {
@@ -41,11 +41,11 @@ public:
 protected:
     explicit SkColorMatrixFilter(const SkColorMatrix&);
     explicit SkColorMatrixFilter(const SkScalar array[20]);
-    explicit SkColorMatrixFilter(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
 
 private:
-    SkColorMatrix fMatrix;
+    SkColorMatrix   fMatrix;
+    float           fTranspose[SkColorMatrix::kCount]; // for Sk4s
 
     typedef void (*Proc)(const State&, unsigned r, unsigned g, unsigned b,
                          unsigned a, int32_t result[4]);
diff --git a/gfx/skia/skia/include/effects/SkComposeImageFilter.h b/gfx/skia/skia/include/effects/SkComposeImageFilter.h
index 068bcab7b86e..4946fa13d028 100644
--- a/gfx/skia/skia/include/effects/SkComposeImageFilter.h
+++ b/gfx/skia/skia/include/effects/SkComposeImageFilter.h
@@ -14,20 +14,29 @@ class SK_API SkComposeImageFilter : public SkImageFilter {
 public:
     virtual ~SkComposeImageFilter();
 
-    static SkComposeImageFilter* Create(SkImageFilter* outer, SkImageFilter* inner) {
+    static SkImageFilter* Create(SkImageFilter* outer, SkImageFilter* inner) {
+        if (NULL == outer) {
+            return SkSafeRef(inner);
+        }
+        if (NULL == inner) {
+            return SkRef(outer);
+        }
         SkImageFilter* inputs[2] = { outer, inner };
-        return SkNEW_ARGS(SkComposeImageFilter, (inputs));
+        return new SkComposeImageFilter(inputs);
     }
+    void computeFastBounds(const SkRect& src, SkRect* dst) const override;
 
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeImageFilter)
 
 protected:
-    explicit SkComposeImageFilter(SkImageFilter* inputs[2]) : INHERITED(2, inputs) {}
-    explicit SkComposeImageFilter(SkReadBuffer& buffer);
-
+    explicit SkComposeImageFilter(SkImageFilter* inputs[2]) : INHERITED(2, inputs) {
+        SkASSERT(inputs[0]);
+        SkASSERT(inputs[1]);
+    }
     virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                               SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE;
-    virtual bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const SK_OVERRIDE;
+                               SkBitmap* result, SkIPoint* loc) const override;
+    bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const override;
 
 private:
     typedef SkImageFilter INHERITED;
diff --git a/gfx/skia/skia/include/effects/SkCornerPathEffect.h b/gfx/skia/skia/include/effects/SkCornerPathEffect.h
index 8bb7a5069514..4c8908575db2 100644
--- a/gfx/skia/skia/include/effects/SkCornerPathEffect.h
+++ b/gfx/skia/skia/include/effects/SkCornerPathEffect.h
@@ -20,20 +20,22 @@ public:
     /** radius must be > 0 to have an effect. It specifies the distance from each corner
         that should be "rounded".
     */
-    static SkCornerPathEffect* Create(SkScalar radius) {
-        return SkNEW_ARGS(SkCornerPathEffect, (radius));
-    }
+    static SkCornerPathEffect* Create(SkScalar radius) { return new SkCornerPathEffect(radius); }
     virtual ~SkCornerPathEffect();
 
     virtual bool filterPath(SkPath* dst, const SkPath& src,
-                            SkStrokeRec*, const SkRect*) const SK_OVERRIDE;
+                            SkStrokeRec*, const SkRect*) const override;
 
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkCornerPathEffect)
 
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+    bool exposedInAndroidJavaAPI() const override { return true; }
+#endif
+
 protected:
     explicit SkCornerPathEffect(SkScalar radius);
-    explicit SkCornerPathEffect(SkReadBuffer&);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
 
 private:
     SkScalar    fRadius;
diff --git a/gfx/skia/skia/include/effects/SkDashPathEffect.h b/gfx/skia/skia/include/effects/SkDashPathEffect.h
index 6fab96226117..d3adeed99a6d 100644
--- a/gfx/skia/skia/include/effects/SkDashPathEffect.h
+++ b/gfx/skia/skia/include/effects/SkDashPathEffect.h
@@ -38,27 +38,29 @@ public:
     */
     static SkDashPathEffect* Create(const SkScalar intervals[], int count,
                                     SkScalar phase) {
-        return SkNEW_ARGS(SkDashPathEffect, (intervals, count, phase));
+        return new SkDashPathEffect(intervals, count, phase);
     }
     virtual ~SkDashPathEffect();
 
     virtual bool filterPath(SkPath* dst, const SkPath& src,
-                            SkStrokeRec*, const SkRect*) const SK_OVERRIDE;
+                            SkStrokeRec*, const SkRect*) const override;
 
     virtual bool asPoints(PointData* results, const SkPath& src,
                           const SkStrokeRec&, const SkMatrix&,
-                          const SkRect*) const SK_OVERRIDE;
+                          const SkRect*) const override;
 
-    virtual DashType asADash(DashInfo* info) const SK_OVERRIDE;
+    DashType asADash(DashInfo* info) const override;
 
-    virtual Factory getFactory() const SK_OVERRIDE;
+    SK_TO_STRING_OVERRIDE()
+    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDashPathEffect)
 
-    static SkFlattenable* CreateProc(SkReadBuffer&);
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+    bool exposedInAndroidJavaAPI() const override { return true; }
+#endif
 
 protected:
     SkDashPathEffect(const SkScalar intervals[], int count, SkScalar phase);
-    explicit SkDashPathEffect(SkReadBuffer&);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
 
 private:
     SkScalar*   fIntervals;
diff --git a/gfx/skia/skia/include/effects/SkDiscretePathEffect.h b/gfx/skia/skia/include/effects/SkDiscretePathEffect.h
index cbee20f0251f..b55dca864440 100644
--- a/gfx/skia/skia/include/effects/SkDiscretePathEffect.h
+++ b/gfx/skia/skia/include/effects/SkDiscretePathEffect.h
@@ -32,21 +32,24 @@ public:
     static SkDiscretePathEffect* Create(SkScalar segLength,
                                         SkScalar deviation,
                                         uint32_t seedAssist=0) {
-        return SkNEW_ARGS(SkDiscretePathEffect,
-                          (segLength, deviation, seedAssist));
+        return new SkDiscretePathEffect(segLength, deviation, seedAssist);
     }
 
     virtual bool filterPath(SkPath* dst, const SkPath& src,
-                            SkStrokeRec*, const SkRect*) const SK_OVERRIDE;
+                            SkStrokeRec*, const SkRect*) const override;
 
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDiscretePathEffect)
 
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+    bool exposedInAndroidJavaAPI() const override { return true; }
+#endif
+
 protected:
     SkDiscretePathEffect(SkScalar segLength,
                          SkScalar deviation,
                          uint32_t seedAssist);
-    explicit SkDiscretePathEffect(SkReadBuffer&);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
 
 private:
     SkScalar fSegLength, fPerterb;
diff --git a/gfx/skia/skia/include/effects/SkDisplacementMapEffect.h b/gfx/skia/skia/include/effects/SkDisplacementMapEffect.h
index 07f8ee9e85ef..9513a54f15c9 100644
--- a/gfx/skia/skia/include/effects/SkDisplacementMapEffect.h
+++ b/gfx/skia/skia/include/effects/SkDisplacementMapEffect.h
@@ -27,11 +27,7 @@ public:
                                            ChannelSelectorType yChannelSelector,
                                            SkScalar scale, SkImageFilter* displacement,
                                            SkImageFilter* color = NULL,
-                                           const CropRect* cropRect = NULL) {
-        SkImageFilter* inputs[2] = { displacement, color };
-        return SkNEW_ARGS(SkDisplacementMapEffect, (xChannelSelector, yChannelSelector, scale,
-                                                    inputs, cropRect));
-    }
+                                           const CropRect* cropRect = NULL);
 
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDisplacementMapEffect)
 
@@ -39,25 +35,26 @@ public:
                                const SkBitmap& src,
                                const Context& ctx,
                                SkBitmap* dst,
-                               SkIPoint* offset) const SK_OVERRIDE;
-    virtual void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE;
+                               SkIPoint* offset) const override;
+    void computeFastBounds(const SkRect& src, SkRect* dst) const override;
 
     virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&,
-                                SkIRect* dst) const SK_OVERRIDE;
+                                SkIRect* dst) const override;
 
 #if SK_SUPPORT_GPU
-    virtual bool canFilterImageGPU() const SK_OVERRIDE { return true; }
+    bool canFilterImageGPU() const override { return true; }
     virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx,
-                                SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
+                                SkBitmap* result, SkIPoint* offset) const override;
 #endif
 
+    SK_TO_STRING_OVERRIDE()
+
 protected:
     SkDisplacementMapEffect(ChannelSelectorType xChannelSelector,
                             ChannelSelectorType yChannelSelector,
                             SkScalar scale, SkImageFilter* inputs[2],
                             const CropRect* cropRect);
-    explicit SkDisplacementMapEffect(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
 
 private:
     ChannelSelectorType fXChannelSelector;
diff --git a/gfx/skia/skia/include/effects/SkDropShadowImageFilter.h b/gfx/skia/skia/include/effects/SkDropShadowImageFilter.h
index efd9032e487b..bf4425e925f3 100644
--- a/gfx/skia/skia/include/effects/SkDropShadowImageFilter.h
+++ b/gfx/skia/skia/include/effects/SkDropShadowImageFilter.h
@@ -11,27 +11,39 @@
 
 class SK_API SkDropShadowImageFilter : public SkImageFilter {
 public:
-    static SkDropShadowImageFilter* Create(SkScalar dx, SkScalar dy,
-                                           SkScalar sigmaX, SkScalar sigmaY, SkColor color,
-                                           SkImageFilter* input = NULL,
-                                           const CropRect* cropRect = NULL) {
-        return SkNEW_ARGS(SkDropShadowImageFilter, (dx, dy, sigmaX, sigmaY,
-                                                    color, input, cropRect));
+    enum ShadowMode {
+        kDrawShadowAndForeground_ShadowMode,
+        kDrawShadowOnly_ShadowMode,
+
+        kLast_ShadowMode = kDrawShadowOnly_ShadowMode
+    };
+
+    static const int kShadowModeCount = kLast_ShadowMode+1;
+
+    static SkImageFilter* Create(SkScalar dx, SkScalar dy, SkScalar sigmaX, SkScalar sigmaY,
+                                 SkColor color, ShadowMode shadowMode, SkImageFilter* input = NULL,
+                                 const CropRect* cropRect = NULL) {
+        return new SkDropShadowImageFilter(dx, dy, sigmaX, sigmaY, color, shadowMode, input,
+                                           cropRect);
     }
-    virtual void computeFastBounds(const SkRect&, SkRect*) const SK_OVERRIDE;
+
+    void computeFastBounds(const SkRect&, SkRect*) const override;
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDropShadowImageFilter)
 
 protected:
-    SkDropShadowImageFilter(SkScalar dx, SkScalar dy, SkScalar sigmaX, SkScalar sigmaY, SkColor,
-                            SkImageFilter* input, const CropRect* cropRect);
-    explicit SkDropShadowImageFilter(SkReadBuffer&);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
-    virtual bool onFilterImage(Proxy*, const SkBitmap& source, const Context&, SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE;
-    virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&,
-                                SkIRect* dst) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
+    bool onFilterImage(Proxy*, const SkBitmap& source, const Context&, SkBitmap* result,
+                       SkIPoint* loc) const override;
+    bool onFilterBounds(const SkIRect& src, const SkMatrix&, SkIRect* dst) const override;
 
 private:
+    SkDropShadowImageFilter(SkScalar dx, SkScalar dy, SkScalar sigmaX, SkScalar sigmaY, SkColor,
+                            ShadowMode shadowMode, SkImageFilter* input, const CropRect* cropRect);
+
     SkScalar fDx, fDy, fSigmaX, fSigmaY;
     SkColor fColor;
+    ShadowMode fShadowMode;
+
     typedef SkImageFilter INHERITED;
 };
diff --git a/gfx/skia/skia/include/effects/SkEmbossMaskFilter.h b/gfx/skia/skia/include/effects/SkEmbossMaskFilter.h
index a1e2af46ce09..41dfa2a66c43 100644
--- a/gfx/skia/skia/include/effects/SkEmbossMaskFilter.h
+++ b/gfx/skia/skia/include/effects/SkEmbossMaskFilter.h
@@ -27,18 +27,17 @@ public:
 
     // overrides from SkMaskFilter
     //  This method is not exported to java.
-    virtual SkMask::Format getFormat() const SK_OVERRIDE;
+    SkMask::Format getFormat() const override;
     //  This method is not exported to java.
     virtual bool filterMask(SkMask* dst, const SkMask& src, const SkMatrix&,
-                            SkIPoint* margin) const SK_OVERRIDE;
+                            SkIPoint* margin) const override;
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkEmbossMaskFilter)
 
 protected:
     SkEmbossMaskFilter(SkScalar blurSigma, const Light& light);
-    explicit SkEmbossMaskFilter(SkReadBuffer&);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
 
 private:
     Light       fLight;
diff --git a/gfx/skia/skia/include/effects/SkGradientShader.h b/gfx/skia/skia/include/effects/SkGradientShader.h
index 8d1a93107d31..ae11e2dafd1f 100644
--- a/gfx/skia/skia/include/effects/SkGradientShader.h
+++ b/gfx/skia/skia/include/effects/SkGradientShader.h
@@ -10,8 +10,6 @@
 
 #include "SkShader.h"
 
-#define SK_SUPPORT_LEGACY_GRADIENT_FACTORIES
-
 /** \class SkGradientShader
 
     SkGradientShader hosts factories for creating subclasses of SkShader that
@@ -55,15 +53,6 @@ public:
         return CreateLinear(pts, colors, pos, count, mode, 0, NULL);
     }
 
-#ifdef SK_SUPPORT_LEGACY_GRADIENT_FACTORIES
-    static SkShader* CreateLinear(const SkPoint pts[2],
-                                  const SkColor colors[], const SkScalar pos[], int count,
-                                  SkShader::TileMode mode, void* ignored,
-                                  uint32_t flags, const SkMatrix* localMatrix) {
-        return CreateLinear(pts, colors, pos, count, mode, flags, localMatrix);
-    }
-#endif
-
     /** Returns a shader that generates a radial gradient given the center and radius.
         <p />
         CreateRadial returns a shader with a reference count of 1.
@@ -91,59 +80,6 @@ public:
         return CreateRadial(center, radius, colors, pos, count, mode, 0, NULL);
     }
 
-#ifdef SK_SUPPORT_LEGACY_GRADIENT_FACTORIES
-    static SkShader* CreateRadial(const SkPoint& center, SkScalar radius,
-                                  const SkColor colors[], const SkScalar pos[], int count,
-                                  SkShader::TileMode mode, void* ignored,
-                                  uint32_t flags, const SkMatrix* localMatrix) {
-        return CreateRadial(center, radius, colors, pos, count, mode, flags, localMatrix);
-    }
-#endif
-
-    /** Returns a shader that generates a radial gradient given the start position, start radius, end position and end radius.
-        <p />
-        CreateTwoPointRadial returns a shader with a reference count of 1.
-        The caller should decrement the shader's reference count when done with the shader.
-        It is an error for colorCount to be < 2, for startRadius or endRadius to be < 0, or for
-        startRadius to be equal to endRadius.
-        @param  start   The center of the start circle for this gradient
-        @param  startRadius  Must be positive.  The radius of the start circle for this gradient.
-        @param  end     The center of the end circle for this gradient
-        @param  endRadius  Must be positive. The radius of the end circle for this gradient.
-        @param  colors  The array[count] of colors, to be distributed between the center and edge of the circle
-        @param  pos     May be NULL. The array[count] of SkScalars, or NULL, of the relative position of
-                        each corresponding color in the colors array. If this is NULL,
-                        the the colors are distributed evenly between the center and edge of the circle.
-                        If this is not null, the values must begin with 0, end with 1.0, and
-                        intermediate values must be strictly increasing.
-        @param  count   Must be >= 2. The number of colors (and pos if not NULL) entries
-        @param  mode    The tiling mode
-    */
-    static SkShader* CreateTwoPointRadial(const SkPoint& start, SkScalar startRadius,
-                                          const SkPoint& end, SkScalar endRadius,
-                                          const SkColor colors[], const SkScalar pos[], int count,
-                                          SkShader::TileMode mode,
-                                          uint32_t flags, const SkMatrix* localMatrix);
-
-    static SkShader* CreateTwoPointRadial(const SkPoint& start, SkScalar startRadius,
-                                          const SkPoint& end, SkScalar endRadius,
-                                          const SkColor colors[], const SkScalar pos[], int count,
-                                          SkShader::TileMode mode) {
-        return CreateTwoPointRadial(start, startRadius, end, endRadius, colors, pos, count, mode,
-                                    0, NULL);
-    }
-
-#ifdef SK_SUPPORT_LEGACY_GRADIENT_FACTORIES
-    static SkShader* CreateTwoPointRadial(const SkPoint& start, SkScalar startRadius,
-                                          const SkPoint& end, SkScalar endRadius,
-                                          const SkColor colors[], const SkScalar pos[], int count,
-                                          SkShader::TileMode mode, void* ignored,
-                                          uint32_t flags, const SkMatrix* localMatrix) {
-        return CreateTwoPointRadial(start, startRadius, end, endRadius, colors, pos, count, mode,
-                                    flags, localMatrix);
-    }
-#endif
-
     /**
      *  Returns a shader that generates a conical gradient given two circles, or
      *  returns NULL if the inputs are invalid. The gradient interprets the
@@ -164,17 +100,6 @@ public:
                                      0, NULL);
     }
 
-#ifdef SK_SUPPORT_LEGACY_GRADIENT_FACTORIES
-    static SkShader* CreateTwoPointConical(const SkPoint& start, SkScalar startRadius,
-                                           const SkPoint& end, SkScalar endRadius,
-                                           const SkColor colors[], const SkScalar pos[], int count,
-                                           SkShader::TileMode mode, void* ignored,
-                                           uint32_t flags, const SkMatrix* localMatrix) {
-        return CreateTwoPointConical(start, startRadius, end, endRadius, colors, pos, count, mode,
-                                    flags, localMatrix);
-    }
-#endif
-
     /** Returns a shader that generates a sweep gradient given a center.
         <p />
         CreateSweep returns a shader with a reference count of 1.
@@ -199,15 +124,6 @@ public:
         return CreateSweep(cx, cy, colors, pos, count, 0, NULL);
     }
 
-#ifdef SK_SUPPORT_LEGACY_GRADIENT_FACTORIES
-    static SkShader* CreateSweep(SkScalar cx, SkScalar cy,
-                                 const SkColor colors[], const SkScalar pos[], int count,
-                                 void* ignored,
-                                 uint32_t flags, const SkMatrix* localMatrix) {
-        return CreateSweep(cx, cy, colors, pos, count, flags, localMatrix);
-    }
-#endif
-
     SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP()
 };
 
diff --git a/gfx/skia/skia/include/effects/SkImageSource.h b/gfx/skia/skia/include/effects/SkImageSource.h
new file mode 100644
index 000000000000..56c6a6e96a36
--- /dev/null
+++ b/gfx/skia/skia/include/effects/SkImageSource.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkImageSource_DEFINED
+#define SkImageSource_DEFINED
+
+#include "SkImageFilter.h"
+
+class SkImage;
+
+class SK_API SkImageSource : public SkImageFilter {
+public:
+    static SkImageFilter* Create(const SkImage*);
+    static SkImageFilter* Create(const SkImage*,
+                                 const SkRect& srcRect,
+                                 const SkRect& dstRect,
+                                 SkFilterQuality);
+
+    void computeFastBounds(const SkRect& src, SkRect* dst) const override;
+
+    SK_TO_STRING_OVERRIDE()
+    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkImageSource)
+
+protected:
+    void flatten(SkWriteBuffer&) const override;
+
+    bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
+                       SkBitmap* result, SkIPoint* offset) const override;
+
+private:
+    explicit SkImageSource(const SkImage*);
+    SkImageSource(const SkImage*,
+                  const SkRect& srcRect,
+                  const SkRect& dstRect,
+                  SkFilterQuality);
+
+    SkAutoTUnref<const SkImage> fImage;
+    SkRect                      fSrcRect, fDstRect;
+    SkFilterQuality             fFilterQuality;
+
+    typedef SkImageFilter INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/include/effects/SkLayerDrawLooper.h b/gfx/skia/skia/include/effects/SkLayerDrawLooper.h
index ac56e288dc6e..76172dfd4b1d 100644
--- a/gfx/skia/skia/include/effects/SkLayerDrawLooper.h
+++ b/gfx/skia/skia/include/effects/SkLayerDrawLooper.h
@@ -15,8 +15,6 @@
 
 class SK_API SkLayerDrawLooper : public SkDrawLooper {
 public:
-    SK_DECLARE_INST_COUNT(SkLayerDrawLooper)
-
     virtual ~SkLayerDrawLooper();
 
     /**
@@ -73,22 +71,21 @@ public:
         LayerInfo();
     };
 
-    virtual SkDrawLooper::Context* createContext(SkCanvas*, void* storage) const SK_OVERRIDE;
+    SkDrawLooper::Context* createContext(SkCanvas*, void* storage) const override;
 
-    virtual size_t contextSize() const SK_OVERRIDE { return sizeof(LayerDrawLooperContext); }
+    size_t contextSize() const override { return sizeof(LayerDrawLooperContext); }
 
-    virtual bool asABlurShadow(BlurShadowRec* rec) const SK_OVERRIDE;
+    bool asABlurShadow(BlurShadowRec* rec) const override;
 
     SK_TO_STRING_OVERRIDE()
 
-    /// Implements Flattenable.
-    virtual Factory getFactory() const SK_OVERRIDE { return CreateProc; }
+    Factory getFactory() const override { return CreateProc; }
     static SkFlattenable* CreateProc(SkReadBuffer& buffer);
 
 protected:
     SkLayerDrawLooper();
 
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
 
 private:
     struct Rec {
@@ -97,7 +94,6 @@ private:
         LayerInfo fInfo;
     };
     Rec*    fRecs;
-    Rec*    fTopRec;
     int     fCount;
 
     // state-machine during the init/next cycle
@@ -106,7 +102,7 @@ private:
         explicit LayerDrawLooperContext(const SkLayerDrawLooper* looper);
 
     protected:
-        virtual bool next(SkCanvas*, SkPaint* paint) SK_OVERRIDE;
+        bool next(SkCanvas*, SkPaint* paint) override;
 
     private:
         Rec* fCurrRec;
@@ -114,11 +110,6 @@ private:
         static void ApplyInfo(SkPaint* dst, const SkPaint& src, const LayerInfo&);
     };
 
-    class MyRegistrar : public SkFlattenable::Registrar {
-    public:
-        MyRegistrar();
-    };
-
     typedef SkDrawLooper INHERITED;
 
 public:
diff --git a/gfx/skia/skia/include/effects/SkLayerRasterizer.h b/gfx/skia/skia/include/effects/SkLayerRasterizer.h
index a98f1df613c7..c6ac1de36309 100644
--- a/gfx/skia/skia/include/effects/SkLayerRasterizer.h
+++ b/gfx/skia/skia/include/effects/SkLayerRasterizer.h
@@ -69,13 +69,12 @@ public:
 protected:
     SkLayerRasterizer();
     SkLayerRasterizer(SkDeque* layers);
-    SkLayerRasterizer(SkReadBuffer&);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
 
     // override from SkRasterizer
     virtual bool onRasterize(const SkPath& path, const SkMatrix& matrix,
                              const SkIRect* clipBounds,
-                             SkMask* mask, SkMask::CreateMode mode) const SK_OVERRIDE;
+                             SkMask* mask, SkMask::CreateMode mode) const override;
 
 private:
     const SkDeque* const fLayers;
diff --git a/gfx/skia/skia/include/effects/SkLerpXfermode.h b/gfx/skia/skia/include/effects/SkLerpXfermode.h
index d9186d904c56..8ba42302bf5a 100644
--- a/gfx/skia/skia/include/effects/SkLerpXfermode.h
+++ b/gfx/skia/skia/include/effects/SkLerpXfermode.h
@@ -22,18 +22,17 @@ public:
 
     // overrides from SkXfermode
     virtual void xfer32(SkPMColor dst[], const SkPMColor src[], int count,
-                        const SkAlpha aa[]) const SK_OVERRIDE;
+                        const SkAlpha aa[]) const override;
     virtual void xfer16(uint16_t dst[], const SkPMColor src[], int count,
-                        const SkAlpha aa[]) const SK_OVERRIDE;
+                        const SkAlpha aa[]) const override;
     virtual void xferA8(SkAlpha dst[], const SkPMColor src[], int count,
-                        const SkAlpha aa[]) const SK_OVERRIDE;
+                        const SkAlpha aa[]) const override;
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLerpXfermode)
 
 protected:
-    SkLerpXfermode(SkReadBuffer&);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
 
 private:
     SkLerpXfermode(unsigned scale256);
diff --git a/gfx/skia/skia/include/effects/SkLightingImageFilter.h b/gfx/skia/skia/include/effects/SkLightingImageFilter.h
index 81e8f43f11e5..fb356c52e434 100644
--- a/gfx/skia/skia/include/effects/SkLightingImageFilter.h
+++ b/gfx/skia/skia/include/effects/SkLightingImageFilter.h
@@ -11,37 +11,9 @@
 #include "SkImageFilter.h"
 #include "SkColor.h"
 
-class SK_API SkPoint3 {
-public:
-    SkPoint3() {}
-    SkPoint3(SkScalar x, SkScalar y, SkScalar z)
-      : fX(x), fY(y), fZ(z) {}
-    SkScalar dot(const SkPoint3& other) const {
-        return fX * other.fX + fY * other.fY + fZ * other.fZ;
-    }
-    SkScalar maxComponent() const {
-        return fX > fY ? (fX > fZ ? fX : fZ) : (fY > fZ ? fY : fZ);
-    }
-    void normalize() {
-        // Small epsilon is added to prevent division by 0.
-        SkScalar scale = SkScalarInvert(SkScalarSqrt(dot(*this)) + SK_ScalarNearlyZero);
-        fX = fX * scale;
-        fY = fY * scale;
-        fZ = fZ * scale;
-    }
-    SkPoint3 operator*(SkScalar scalar) const {
-        return SkPoint3(fX * scalar, fY * scalar, fZ * scalar);
-    }
-    SkPoint3 operator-(const SkPoint3& other) const {
-        return SkPoint3(fX - other.fX, fY - other.fY, fZ - other.fZ);
-    }
-    bool operator==(const SkPoint3& other) const {
-        return fX == other.fX && fY == other.fY && fZ == other.fZ;
-    }
-    SkScalar fX, fY, fZ;
-};
 
-class SkLight;
+class SkImageFilterLight;
+struct SkPoint3;
 
 class SK_API SkLightingImageFilter : public SkImageFilter {
 public:
@@ -70,18 +42,18 @@ public:
     SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP()
 
 protected:
-    SkLightingImageFilter(SkLight* light,
+    SkLightingImageFilter(SkImageFilterLight* light,
                           SkScalar surfaceScale,
                           SkImageFilter* input,
                           const CropRect* cropRect);
-    explicit SkLightingImageFilter(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
-    const SkLight* light() const { return fLight; }
+    void flatten(SkWriteBuffer&) const override;
+    const SkImageFilterLight* light() const { return fLight.get(); }
     SkScalar surfaceScale() const { return fSurfaceScale; }
+    bool affectsTransparentBlack() const override { return true; }
 
 private:
     typedef SkImageFilter INHERITED;
-    SkLight* fLight;
+    SkAutoTUnref<SkImageFilterLight> fLight;
     SkScalar fSurfaceScale;
 };
 
diff --git a/gfx/skia/skia/include/effects/SkLumaColorFilter.h b/gfx/skia/skia/include/effects/SkLumaColorFilter.h
index 06eb01a1ffd6..8dd519af4a77 100644
--- a/gfx/skia/skia/include/effects/SkLumaColorFilter.h
+++ b/gfx/skia/skia/include/effects/SkLumaColorFilter.h
@@ -25,18 +25,17 @@ class SK_API SkLumaColorFilter : public SkColorFilter {
 public:
     static SkColorFilter* Create();
 
-    virtual void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const SK_OVERRIDE;
+    void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const override;
 
 #if SK_SUPPORT_GPU
-    virtual GrEffect* asNewEffect(GrContext*) const SK_OVERRIDE;
+    const GrFragmentProcessor* asFragmentProcessor(GrContext*) const override;
 #endif
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLumaColorFilter)
 
 protected:
-    SkLumaColorFilter(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
 
 private:
     SkLumaColorFilter();
diff --git a/gfx/skia/skia/include/effects/SkMagnifierImageFilter.h b/gfx/skia/skia/include/effects/SkMagnifierImageFilter.h
index 3f799d6555f4..af142e9eff84 100644
--- a/gfx/skia/skia/include/effects/SkMagnifierImageFilter.h
+++ b/gfx/skia/skia/include/effects/SkMagnifierImageFilter.h
@@ -14,23 +14,20 @@
 
 class SK_API SkMagnifierImageFilter : public SkImageFilter {
 public:
-    static SkMagnifierImageFilter* Create(const SkRect& srcRect, SkScalar inset,
-                                          SkImageFilter* input = NULL) {
-        return SkNEW_ARGS(SkMagnifierImageFilter, (srcRect, inset, input));
-    }
+    static SkImageFilter* Create(const SkRect& src, SkScalar inset, SkImageFilter* input = NULL);
 
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMagnifierImageFilter)
 
 protected:
     SkMagnifierImageFilter(const SkRect& srcRect, SkScalar inset, SkImageFilter* input);
-    explicit SkMagnifierImageFilter(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
 
-    virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                               SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
+    bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
+                       SkBitmap* result, SkIPoint* offset) const override;
 #if SK_SUPPORT_GPU
-    virtual bool asNewEffect(GrEffect** effect, GrTexture* texture, const SkMatrix& matrix,
-                             const SkIRect& bounds) const SK_OVERRIDE;
+    bool asFragmentProcessor(GrFragmentProcessor**, GrTexture*, const SkMatrix&,
+                             const SkIRect& bounds) const override;
 #endif
 
 private:
diff --git a/gfx/skia/skia/include/effects/SkMatrixConvolutionImageFilter.h b/gfx/skia/skia/include/effects/SkMatrixConvolutionImageFilter.h
index 0cb848b63196..76349f430c1b 100644
--- a/gfx/skia/skia/include/effects/SkMatrixConvolutionImageFilter.h
+++ b/gfx/skia/skia/include/effects/SkMatrixConvolutionImageFilter.h
@@ -60,12 +60,9 @@ public:
                                                   TileMode tileMode,
                                                   bool convolveAlpha,
                                                   SkImageFilter* input = NULL,
-                                                  const CropRect* cropRect = NULL) {
-        return SkNEW_ARGS(SkMatrixConvolutionImageFilter, (kernelSize, kernel, gain, bias,
-                                                           kernelOffset, tileMode, convolveAlpha,
-                                                           input, cropRect));
-    }
+                                                  const CropRect* cropRect = NULL);
 
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMatrixConvolutionImageFilter)
 
 protected:
@@ -78,19 +75,16 @@ protected:
                                    bool convolveAlpha,
                                    SkImageFilter* input,
                                    const CropRect* cropRect);
-    explicit SkMatrixConvolutionImageFilter(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
 
-    virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                               SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE;
-    virtual bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const SK_OVERRIDE;
+    bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
+                       SkBitmap* result, SkIPoint* loc) const override;
+    bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const override;
 
 
 #if SK_SUPPORT_GPU
-    virtual bool asNewEffect(GrEffect** effect,
-                             GrTexture*,
-                             const SkMatrix& ctm,
-                             const SkIRect& bounds) const SK_OVERRIDE;
+    bool asFragmentProcessor(GrFragmentProcessor**, GrTexture*, const SkMatrix&,
+                             const SkIRect& bounds) const override;
 #endif
 
 private:
diff --git a/gfx/skia/skia/include/effects/SkMergeImageFilter.h b/gfx/skia/skia/include/effects/SkMergeImageFilter.h
index ed316d78538e..10c29131ed42 100644
--- a/gfx/skia/skia/include/effects/SkMergeImageFilter.h
+++ b/gfx/skia/skia/include/effects/SkMergeImageFilter.h
@@ -16,33 +16,33 @@ class SK_API SkMergeImageFilter : public SkImageFilter {
 public:
     virtual ~SkMergeImageFilter();
 
-    static SkMergeImageFilter* Create(SkImageFilter* first, SkImageFilter* second,
-                                      SkXfermode::Mode mode = SkXfermode::kSrcOver_Mode,
-                                      const CropRect* cropRect = NULL) {
+    static SkImageFilter* Create(SkImageFilter* first, SkImageFilter* second,
+                                 SkXfermode::Mode mode = SkXfermode::kSrcOver_Mode,
+                                 const CropRect* cropRect = NULL) {
         SkImageFilter* inputs[2] = { first, second };
         SkXfermode::Mode modes[2] = { mode, mode };
-        return SkNEW_ARGS(SkMergeImageFilter, (inputs, 2, modes, cropRect));
-    }
-    static SkMergeImageFilter* Create(SkImageFilter* filters[], int count,
-                                      const SkXfermode::Mode modes[] = NULL,
-                                      const CropRect* cropRect = NULL) {
-        return SkNEW_ARGS(SkMergeImageFilter, (filters, count, modes, cropRect));
+        return new SkMergeImageFilter(inputs, 2, modes, cropRect);
     }
 
+    static SkImageFilter* Create(SkImageFilter* filters[], int count,
+                                 const SkXfermode::Mode modes[] = NULL,
+                                const CropRect* cropRect = NULL) {
+        return new SkMergeImageFilter(filters, count, modes, cropRect);
+    }
+
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMergeImageFilter)
 
 protected:
-    SkMergeImageFilter(SkImageFilter* filters[], int count,
-                       const SkXfermode::Mode modes[],
-                       const CropRect* cropRect);
-    explicit SkMergeImageFilter(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
-
-    virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                               SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
+    bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result,
+                       SkIPoint* loc) const override;
 
 private:
-    uint8_t*            fModes; // SkXfermode::Mode
+    SkMergeImageFilter(SkImageFilter* filters[], int count, const SkXfermode::Mode modes[],
+                       const CropRect* cropRect);
+
+    uint8_t*    fModes; // SkXfermode::Mode
 
     // private storage, to avoid dynamically allocating storage for our copy
     // of the modes (unless the count is so large we can't fit).
diff --git a/gfx/skia/skia/include/effects/SkModeColorFilter.h b/gfx/skia/skia/include/effects/SkModeColorFilter.h
new file mode 100644
index 000000000000..06eec43572bd
--- /dev/null
+++ b/gfx/skia/skia/include/effects/SkModeColorFilter.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkModeColorFilter_DEFINED
+#define SkModeColorFilter_DEFINED
+
+#include "SkColorFilter.h"
+#include "SkColorPriv.h"
+#include "SkString.h"
+#include "SkXfermode.h"
+
+class SkModeColorFilter : public SkColorFilter {
+public:
+    static SkColorFilter* Create(SkColor color, SkXfermode::Mode mode) {
+        return new SkModeColorFilter(color, mode);
+    }
+
+    SkColor getColor() const { return fColor; }
+    SkXfermode::Mode getMode() const { return fMode; }
+    SkPMColor getPMColor() const { return fPMColor; }
+
+    bool asColorMode(SkColor*, SkXfermode::Mode*) const override;
+    uint32_t getFlags() const override;
+    void filterSpan(const SkPMColor shader[], int count, SkPMColor result[]) const override;
+
+#ifndef SK_IGNORE_TO_STRING
+    void toString(SkString* str) const override {
+        str->append("SkModeColorFilter: color: 0x");
+        str->appendHex(fColor);
+        str->append(" mode: ");
+        str->append(SkXfermode::ModeName(fMode));
+    }
+#endif
+
+#if SK_SUPPORT_GPU
+    const GrFragmentProcessor* asFragmentProcessor(GrContext*) const override;
+#endif
+    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkModeColorFilter)
+
+protected:
+    SkModeColorFilter(SkColor color, SkXfermode::Mode mode) {
+        fColor = color;
+        fMode = mode;
+        this->updateCache();
+    };
+
+    void flatten(SkWriteBuffer&) const override;
+
+private:
+    SkColor             fColor;
+    SkXfermode::Mode    fMode;
+    // cache
+    SkPMColor           fPMColor;
+    SkXfermodeProc      fProc;
+
+    void updateCache();
+
+    typedef SkColorFilter INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/include/effects/SkMorphologyImageFilter.h b/gfx/skia/skia/include/effects/SkMorphologyImageFilter.h
index 75551b6d8a5b..29728fd9f7c4 100644
--- a/gfx/skia/skia/include/effects/SkMorphologyImageFilter.h
+++ b/gfx/skia/skia/include/effects/SkMorphologyImageFilter.h
@@ -15,8 +15,8 @@
 
 class SK_API SkMorphologyImageFilter : public SkImageFilter {
 public:
-    virtual void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE;
-    virtual bool onFilterBounds(const SkIRect& src, const SkMatrix& ctm, SkIRect* dst) const SK_OVERRIDE;
+    void computeFastBounds(const SkRect& src, SkRect* dst) const override;
+    bool onFilterBounds(const SkIRect& src, const SkMatrix& ctm, SkIRect* dst) const override;
 
     /**
      * All morphology procs have the same signature: src is the source buffer, dst the
@@ -34,10 +34,9 @@ protected:
     bool filterImageGeneric(Proc procX, Proc procY,
                             Proxy*, const SkBitmap& src, const Context&,
                             SkBitmap* result, SkIPoint* offset) const;
-    SkMorphologyImageFilter(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
 #if SK_SUPPORT_GPU
-    virtual bool canFilterImageGPU() const SK_OVERRIDE { return true; }
+    bool canFilterImageGPU() const override { return true; }
     bool filterImageGPUGeneric(bool dilate, Proxy* proxy, const SkBitmap& src,
                                const Context& ctm, SkBitmap* result,
                                SkIPoint* offset) const;
@@ -52,53 +51,58 @@ private:
 
 class SK_API SkDilateImageFilter : public SkMorphologyImageFilter {
 public:
-    static SkDilateImageFilter* Create(int radiusX, int radiusY,
-                                       SkImageFilter* input = NULL,
-                                       const CropRect* cropRect = NULL) {
-        return SkNEW_ARGS(SkDilateImageFilter, (radiusX, radiusY, input, cropRect));
+    static SkImageFilter* Create(int radiusX, int radiusY, SkImageFilter* input = NULL,
+                                 const CropRect* cropRect = NULL) {
+        if (radiusX < 0 || radiusY < 0) {
+            return NULL;
+        }
+        return new SkDilateImageFilter(radiusX, radiusY, input, cropRect);
     }
 
-    virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                               SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
+    bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
+                       SkBitmap* result, SkIPoint* offset) const override;
+
 #if SK_SUPPORT_GPU
-    virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context&,
-                                SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
+    bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context&,
+                        SkBitmap* result, SkIPoint* offset) const override;
 #endif
 
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDilateImageFilter)
 
-protected:
+private:
     SkDilateImageFilter(int radiusX, int radiusY, SkImageFilter* input, const CropRect* cropRect)
         : INHERITED(radiusX, radiusY, input, cropRect) {}
-    explicit SkDilateImageFilter(SkReadBuffer& buffer) : INHERITED(buffer) {}
 
-private:
     typedef SkMorphologyImageFilter INHERITED;
 };
 
 class SK_API SkErodeImageFilter : public SkMorphologyImageFilter {
 public:
-    static SkErodeImageFilter* Create(int radiusX, int radiusY,
+    static SkImageFilter* Create(int radiusX, int radiusY,
                                       SkImageFilter* input = NULL,
                                       const CropRect* cropRect = NULL) {
-        return SkNEW_ARGS(SkErodeImageFilter, (radiusX, radiusY, input, cropRect));
+        if (radiusX < 0 || radiusY < 0) {
+            return NULL;
+        }
+        return new SkErodeImageFilter(radiusX, radiusY, input, cropRect);
     }
 
-    virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                               SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
+    bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
+                       SkBitmap* result, SkIPoint* offset) const override;
+
 #if SK_SUPPORT_GPU
-    virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context&,
-                                SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
+    bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context&,
+                        SkBitmap* result, SkIPoint* offset) const override;
 #endif
 
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkErodeImageFilter)
 
-protected:
+private:
     SkErodeImageFilter(int radiusX, int radiusY, SkImageFilter* input, const CropRect* cropRect)
         : INHERITED(radiusX, radiusY, input, cropRect) {}
-    explicit SkErodeImageFilter(SkReadBuffer& buffer) : INHERITED(buffer) {}
 
-private:
     typedef SkMorphologyImageFilter INHERITED;
 };
 
diff --git a/gfx/skia/skia/include/effects/SkOffsetImageFilter.h b/gfx/skia/skia/include/effects/SkOffsetImageFilter.h
index 7f17e851cb6e..40f2ce337470 100644
--- a/gfx/skia/skia/include/effects/SkOffsetImageFilter.h
+++ b/gfx/skia/skia/include/effects/SkOffsetImageFilter.h
@@ -12,27 +12,32 @@
 #include "SkPoint.h"
 
 class SK_API SkOffsetImageFilter : public SkImageFilter {
-    typedef SkImageFilter INHERITED;
-
 public:
-    static SkOffsetImageFilter* Create(SkScalar dx, SkScalar dy, SkImageFilter* input = NULL,
-                                       const CropRect* cropRect = NULL) {
-        return SkNEW_ARGS(SkOffsetImageFilter, (dx, dy, input, cropRect));
+    static SkImageFilter* Create(SkScalar dx, SkScalar dy, SkImageFilter* input = NULL,
+                                 const CropRect* cropRect = NULL) {
+        if (!SkScalarIsFinite(dx) || !SkScalarIsFinite(dy)) {
+            return NULL;
+        }
+        return new SkOffsetImageFilter(dx, dy, input, cropRect);
     }
-    virtual void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE;
+
+    void computeFastBounds(const SkRect& src, SkRect* dst) const override;
+
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkOffsetImageFilter)
 
 protected:
-    SkOffsetImageFilter(SkScalar dx, SkScalar dy, SkImageFilter* input, const CropRect* cropRect);
-    explicit SkOffsetImageFilter(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
-
-    virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                               SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE;
-    virtual bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
+    bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result,
+                       SkIPoint* loc) const override;
+    bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const override;
 
 private:
+    SkOffsetImageFilter(SkScalar dx, SkScalar dy, SkImageFilter* input, const CropRect*);
+
     SkVector fOffset;
+
+    typedef SkImageFilter INHERITED;
 };
 
 #endif
diff --git a/gfx/skia/skia/include/effects/SkPaintFlagsDrawFilter.h b/gfx/skia/skia/include/effects/SkPaintFlagsDrawFilter.h
index cb2a8b7e95fa..10dd3c4d6944 100644
--- a/gfx/skia/skia/include/effects/SkPaintFlagsDrawFilter.h
+++ b/gfx/skia/skia/include/effects/SkPaintFlagsDrawFilter.h
@@ -14,7 +14,7 @@ class SK_API SkPaintFlagsDrawFilter : public SkDrawFilter {
 public:
     SkPaintFlagsDrawFilter(uint32_t clearFlags, uint32_t setFlags);
 
-    virtual bool filter(SkPaint*, Type) SK_OVERRIDE;
+    bool filter(SkPaint*, Type) override;
 
 private:
     uint16_t    fClearFlags;    // user specified
diff --git a/gfx/skia/skia/include/effects/SkPerlinNoiseShader.h b/gfx/skia/skia/include/effects/SkPerlinNoiseShader.h
index 33559256e17c..0cb1b47a9f4b 100644
--- a/gfx/skia/skia/include/effects/SkPerlinNoiseShader.h
+++ b/gfx/skia/skia/include/effects/SkPerlinNoiseShader.h
@@ -72,15 +72,15 @@ public:
     }
 
 
-    virtual size_t contextSize() const SK_OVERRIDE;
+    size_t contextSize() const override;
 
     class PerlinNoiseShaderContext : public SkShader::Context {
     public:
         PerlinNoiseShaderContext(const SkPerlinNoiseShader& shader, const ContextRec&);
         virtual ~PerlinNoiseShaderContext();
 
-        virtual void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE;
-        virtual void shadeSpan16(int x, int y, uint16_t[], int count) SK_OVERRIDE;
+        void shadeSpan(int x, int y, SkPMColor[], int count) override;
+        void shadeSpan16(int x, int y, uint16_t[], int count) override;
 
     private:
         SkPMColor shade(const SkPoint& point, StitchData& stitchData) const;
@@ -96,16 +96,17 @@ public:
         typedef SkShader::Context INHERITED;
     };
 
-    virtual bool asNewEffect(GrContext* context, const SkPaint&, const SkMatrix*, GrColor*,
-                             GrEffect**) const SK_OVERRIDE;
+#if SK_SUPPORT_GPU
+    const GrFragmentProcessor* asFragmentProcessor(GrContext* context, const SkMatrix& viewM,
+                                                   const SkMatrix*, SkFilterQuality) const override;
+#endif
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPerlinNoiseShader)
 
 protected:
-    SkPerlinNoiseShader(SkReadBuffer&);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
-    virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
+    Context* onCreateContext(const ContextRec&, void* storage) const override;
 
 private:
     SkPerlinNoiseShader(SkPerlinNoiseShader::Type type, SkScalar baseFrequencyX,
@@ -113,16 +114,13 @@ private:
                         const SkISize* tileSize);
     virtual ~SkPerlinNoiseShader();
 
-    // TODO (scroggo): Once all SkShaders are created from a factory, and we have removed the
-    // constructor that creates SkPerlinNoiseShader from an SkReadBuffer, several fields can
-    // be made constant.
-    /*const*/ SkPerlinNoiseShader::Type fType;
-    /*const*/ SkScalar                  fBaseFrequencyX;
-    /*const*/ SkScalar                  fBaseFrequencyY;
-    /*const*/ int                       fNumOctaves;
-    /*const*/ SkScalar                  fSeed;
-    /*const*/ SkISize                   fTileSize;
-    /*const*/ bool                      fStitchTiles;
+    const SkPerlinNoiseShader::Type fType;
+    const SkScalar                  fBaseFrequencyX;
+    const SkScalar                  fBaseFrequencyY;
+    const int                       fNumOctaves;
+    const SkScalar                  fSeed;
+    const SkISize                   fTileSize;
+    const bool                      fStitchTiles;
 
     typedef SkShader INHERITED;
 };
diff --git a/gfx/skia/skia/include/effects/SkPictureImageFilter.h b/gfx/skia/skia/include/effects/SkPictureImageFilter.h
index 84d0c10016d0..934d1324c021 100644
--- a/gfx/skia/skia/include/effects/SkPictureImageFilter.h
+++ b/gfx/skia/skia/include/effects/SkPictureImageFilter.h
@@ -16,40 +16,69 @@ public:
     /**
      *  Refs the passed-in picture.
      */
-    static SkPictureImageFilter* Create(const SkPicture* picture) {
-        return SkNEW_ARGS(SkPictureImageFilter, (picture));
+    static SkImageFilter* Create(const SkPicture* picture) {
+        return new SkPictureImageFilter(picture);
     }
 
     /**
      *  Refs the passed-in picture. cropRect can be used to crop or expand the destination rect when
      *  the picture is drawn. (No scaling is implied by the dest rect; only the CTM is applied.)
      */
-    static SkPictureImageFilter* Create(const SkPicture* picture, const SkRect& cropRect) {
-        return SkNEW_ARGS(SkPictureImageFilter, (picture, cropRect));
+    static SkImageFilter* Create(const SkPicture* picture, const SkRect& cropRect) {
+        return new SkPictureImageFilter(picture, cropRect, kDeviceSpace_PictureResolution,
+                                        kLow_SkFilterQuality);
     }
 
+    /**
+     *  Refs the passed-in picture. The picture is rasterized at a resolution that matches the
+     *  local coordinate space. If the picture needs to be resampled for drawing it into the
+     *  destination canvas, bilinear filtering will be used. cropRect can be used to crop or
+     *  expand the destination rect when the picture is drawn. (No scaling is implied by the
+     *  dest rect; only the CTM is applied.)
+     */
+    static SkImageFilter* CreateForLocalSpace(const SkPicture* picture,
+                                                     const SkRect& cropRect,
+                                                     SkFilterQuality filterQuality) {
+        return new SkPictureImageFilter(picture, cropRect, kLocalSpace_PictureResolution,
+                                        filterQuality);
+    }
+
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPictureImageFilter)
 
 protected:
-    explicit SkPictureImageFilter(const SkPicture* picture);
-    SkPictureImageFilter(const SkPicture* picture, const SkRect& cropRect);
+    enum PictureResolution {
+        kDeviceSpace_PictureResolution,
+        kLocalSpace_PictureResolution
+    };
+
     virtual ~SkPictureImageFilter();
+
     /*  Constructs an SkPictureImageFilter object from an SkReadBuffer.
      *  Note: If the SkPictureImageFilter object construction requires bitmap
      *  decoding, the decoder must be set on the SkReadBuffer parameter by calling
      *  SkReadBuffer::setBitmapDecoder() before calling this constructor.
      *  @param SkReadBuffer Serialized picture data.
      */
-    explicit SkPictureImageFilter(SkReadBuffer&);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
-    virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                               SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
-    virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&,
-                                SkIRect* dst) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
+    bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result,
+                       SkIPoint* offset) const override;
 
 private:
-    const SkPicture* fPicture;
-    SkRect           fCropRect;
+    explicit SkPictureImageFilter(const SkPicture* picture);
+    SkPictureImageFilter(const SkPicture* picture, const SkRect& cropRect,
+                         PictureResolution, SkFilterQuality);
+
+    void drawPictureAtDeviceResolution(SkBaseDevice*, const SkIRect& deviceBounds,
+                                       const Context&) const;
+    void drawPictureAtLocalResolution(Proxy*, SkBaseDevice*, const SkIRect& deviceBounds,
+                                      const Context&) const;
+
+    const SkPicture*      fPicture;
+    SkRect                fCropRect;
+    PictureResolution     fPictureResolution;
+    SkFilterQuality       fFilterQuality;
+
     typedef SkImageFilter INHERITED;
 };
 
diff --git a/gfx/skia/skia/include/effects/SkPixelXorXfermode.h b/gfx/skia/skia/include/effects/SkPixelXorXfermode.h
index 64648457f8f6..f2fe47156cc1 100644
--- a/gfx/skia/skia/include/effects/SkPixelXorXfermode.h
+++ b/gfx/skia/skia/include/effects/SkPixelXorXfermode.h
@@ -17,22 +17,18 @@
 */
 class SK_API SkPixelXorXfermode : public SkXfermode {
 public:
-    static SkPixelXorXfermode* Create(SkColor opColor) {
-        return SkNEW_ARGS(SkPixelXorXfermode, (opColor));
-    }
+    static SkXfermode* Create(SkColor opColor) { return new SkPixelXorXfermode(opColor); }
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPixelXorXfermode)
 
 protected:
-    explicit SkPixelXorXfermode(SkColor opColor) : fOpColor(opColor) {}
-    explicit SkPixelXorXfermode(SkReadBuffer& rb);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
-
-    // override from SkXfermode
-    virtual SkPMColor xferColor(SkPMColor src, SkPMColor dst) const;
+    void flatten(SkWriteBuffer&) const override;
+    SkPMColor xferColor(SkPMColor src, SkPMColor dst) const override;
 
 private:
+    explicit SkPixelXorXfermode(SkColor opColor) : fOpColor(opColor) {}
+
     SkColor fOpColor;
 
     typedef SkXfermode INHERITED;
diff --git a/gfx/skia/skia/include/effects/SkPorterDuff.h b/gfx/skia/skia/include/effects/SkPorterDuff.h
deleted file mode 100644
index e984e8e9b427..000000000000
--- a/gfx/skia/skia/include/effects/SkPorterDuff.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkPorterDuff_DEFINED
-#define SkPorterDuff_DEFINED
-
-#include "SkColor.h"
-#include "SkXfermode.h"
-
-class SkXfermode;
-
-class SK_API SkPorterDuff {
-public:
-    /** List of predefined xfermodes. In general, the algebra for the modes
-        uses the following symbols:
-        Sa, Sc  - source alpha and color
-        Da, Dc - destination alpha and color (before compositing)
-        [a, c] - Resulting (alpha, color) values
-        For these equations, the colors are in premultiplied state.
-        If no xfermode is specified, kSrcOver is assumed.
-    */
-    enum Mode {
-        kClear_Mode,    //!< [0, 0]
-        kSrc_Mode,      //!< [Sa, Sc]
-        kDst_Mode,      //!< [Da, Dc]
-        kSrcOver_Mode,  //!< [Sa + Da - Sa*Da, Rc = Sc + (1 - Sa)*Dc]
-        kDstOver_Mode,  //!< [Sa + Da - Sa*Da, Rc = Dc + (1 - Da)*Sc]
-        kSrcIn_Mode,    //!< [Sa * Da, Sc * Da]
-        kDstIn_Mode,    //!< [Sa * Da, Sa * Dc]
-        kSrcOut_Mode,   //!< [Sa * (1 - Da), Sc * (1 - Da)]
-        kDstOut_Mode,   //!< [Da * (1 - Sa), Dc * (1 - Sa)]
-        kSrcATop_Mode,  //!< [Da, Sc * Da + (1 - Sa) * Dc]
-        kDstATop_Mode,  //!< [Sa, Sa * Dc + Sc * (1 - Da)]
-        kXor_Mode,      //!< [Sa + Da - 2 * Sa * Da, Sc * (1 - Da) + (1 - Sa) * Dc]
-        kDarken_Mode,   //!< [Sa + Da - Sa*Da, Sc*(1 - Da) + Dc*(1 - Sa) + min(Sc, Dc)]
-        kLighten_Mode,  //!< [Sa + Da - Sa*Da, Sc*(1 - Da) + Dc*(1 - Sa) + max(Sc, Dc)]
-        kModulate_Mode, //!< [Sa * Da, Sc * Dc] multiplies all components
-        kScreen_Mode,   //!< [Sa + Da - Sa * Da, Sc + Dc - Sc * Dc]
-        kAdd_Mode,      //!< Saturate(S + D)
-#ifdef SK_BUILD_FOR_ANDROID
-        kOverlay_Mode,
-#endif
-
-        kModeCount
-    };
-
-    /** Return an SkXfermode object for the specified mode.
-    */
-    static SkXfermode* CreateXfermode(Mode mode);
-
-    /** Return a function pointer to a routine that applies the specified
-        porter-duff transfer mode.
-    */
-    static SkXfermodeProc GetXfermodeProc(Mode mode);
-
-    /** Return a function pointer to a routine that applies the specified
-        porter-duff transfer mode and srcColor to a 16bit device color. Note,
-        if the mode+srcColor might return a non-opaque color, then there is not
-        16bit proc, and this will return NULL.
-    */
-    static SkXfermodeProc16 GetXfermodeProc16(Mode mode, SkColor srcColor);
-
-    /** If the specified xfermode advertises itself as one of the porterduff
-        modes (via SkXfermode::Coeff), return true and if not null, set mode
-        to the corresponding porterduff mode. If it is not recognized as a one,
-        return false and ignore the mode parameter.
-    */
-    static bool IsMode(SkXfermode*, Mode* mode);
-
-    /** Return the corersponding SkXfermode::Mode
-     */
-    static SkXfermode::Mode ToXfermodeMode(Mode);
-} SK_ATTR_DEPRECATED("use SkXfermode::Mode");
-
-#endif
diff --git a/gfx/skia/skia/include/effects/SkRectShaderImageFilter.h b/gfx/skia/skia/include/effects/SkRectShaderImageFilter.h
index 817c44e95f2d..9798af2d647f 100644
--- a/gfx/skia/skia/include/effects/SkRectShaderImageFilter.h
+++ b/gfx/skia/skia/include/effects/SkRectShaderImageFilter.h
@@ -26,22 +26,24 @@ public:
      *               primitive's bounds are used instead.
      */
     SK_ATTR_DEPRECATED("use Create(SkShader*, const CropRect*)")
-    static SkRectShaderImageFilter* Create(SkShader* s, const SkRect& rect);
+    static SkImageFilter* Create(SkShader* s, const SkRect& rect);
+    static SkImageFilter* Create(SkShader* s, const CropRect* rect = NULL);
 
-    static SkRectShaderImageFilter* Create(SkShader* s, const CropRect* rect = NULL);
-    virtual ~SkRectShaderImageFilter();
+    bool affectsTransparentBlack() const override;
 
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkRectShaderImageFilter)
 
 protected:
-    SkRectShaderImageFilter(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    virtual ~SkRectShaderImageFilter();
 
-    virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                               SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
+    bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result,
+                       SkIPoint* loc) const override;
 
 private:
     SkRectShaderImageFilter(SkShader* s, const CropRect* rect);
+
     SkShader*  fShader;
 
     typedef SkImageFilter INHERITED;
diff --git a/gfx/skia/skia/include/effects/SkStippleMaskFilter.h b/gfx/skia/skia/include/effects/SkStippleMaskFilter.h
deleted file mode 100644
index 30263a368948..000000000000
--- a/gfx/skia/skia/include/effects/SkStippleMaskFilter.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkStippleMaskFilter_DEFINED
-#define SkStippleMaskFilter_DEFINED
-
-#include "SkMaskFilter.h"
-
-/**
- * Simple MaskFilter that creates a screen door stipple pattern.
- */
-class SK_API SkStippleMaskFilter : public SkMaskFilter {
-public:
-    static SkStippleMaskFilter* Create() {
-        return SkNEW(SkStippleMaskFilter);
-    }
-
-    virtual bool filterMask(SkMask* dst, const SkMask& src,
-                            const SkMatrix& matrix,
-                            SkIPoint* margin) const SK_OVERRIDE;
-
-    // getFormat is from SkMaskFilter
-    virtual SkMask::Format getFormat() const SK_OVERRIDE {
-        return SkMask::kA8_Format;
-    }
-
-    SK_TO_STRING_OVERRIDE()
-    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkStippleMaskFilter);
-
-protected:
-    SkStippleMaskFilter() : INHERITED() {
-    }
-    explicit SkStippleMaskFilter(SkReadBuffer& buffer)
-        : SkMaskFilter(buffer) {
-    }
-
-private:
-    typedef SkMaskFilter INHERITED;
-};
-
-#endif // SkStippleMaskFilter_DEFINED
diff --git a/gfx/skia/skia/include/effects/SkTableColorFilter.h b/gfx/skia/skia/include/effects/SkTableColorFilter.h
index 5714d072f268..e4d42dc00cc4 100644
--- a/gfx/skia/skia/include/effects/SkTableColorFilter.h
+++ b/gfx/skia/skia/include/effects/SkTableColorFilter.h
@@ -1,3 +1,9 @@
+/*
+* Copyright 2015 Google Inc.
+*
+* Use of this source code is governed by a BSD-style license that can be
+* found in the LICENSE file.
+*/
 
 #ifndef SkTableColorFilter_DEFINED
 #define SkTableColorFilter_DEFINED
diff --git a/gfx/skia/skia/include/effects/SkTableMaskFilter.h b/gfx/skia/skia/include/effects/SkTableMaskFilter.h
index eda1a1ea5e42..757ddf208489 100644
--- a/gfx/skia/skia/include/effects/SkTableMaskFilter.h
+++ b/gfx/skia/skia/include/effects/SkTableMaskFilter.h
@@ -18,8 +18,6 @@
  */
 class SK_API SkTableMaskFilter : public SkMaskFilter {
 public:
-    virtual ~SkTableMaskFilter();
-
     /** Utility that sets the gamma table
      */
     static void MakeGammaTable(uint8_t table[256], SkScalar gamma);
@@ -29,36 +27,37 @@ public:
      */
     static void MakeClipTable(uint8_t table[256], uint8_t min, uint8_t max);
 
-    static SkTableMaskFilter* Create(const uint8_t table[256]) {
-        return SkNEW_ARGS(SkTableMaskFilter, (table));
+    static SkMaskFilter* Create(const uint8_t table[256]) {
+        return new SkTableMaskFilter(table);
     }
 
-    static SkTableMaskFilter* CreateGamma(SkScalar gamma) {
+    static SkMaskFilter* CreateGamma(SkScalar gamma) {
         uint8_t table[256];
         MakeGammaTable(table, gamma);
-        return SkNEW_ARGS(SkTableMaskFilter, (table));
+        return new SkTableMaskFilter(table);
     }
 
-    static SkTableMaskFilter* CreateClip(uint8_t min, uint8_t max) {
+    static SkMaskFilter* CreateClip(uint8_t min, uint8_t max) {
         uint8_t table[256];
         MakeClipTable(table, min, max);
-        return SkNEW_ARGS(SkTableMaskFilter, (table));
+        return new SkTableMaskFilter(table);
     }
 
-    virtual SkMask::Format getFormat() const SK_OVERRIDE;
-    virtual bool filterMask(SkMask*, const SkMask&, const SkMatrix&,
-                            SkIPoint*) const SK_OVERRIDE;
+    SkMask::Format getFormat() const override;
+    bool filterMask(SkMask*, const SkMask&, const SkMatrix&, SkIPoint*) const override;
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTableMaskFilter)
 
 protected:
-    SkTableMaskFilter();
-    explicit SkTableMaskFilter(const uint8_t table[256]);
-    explicit SkTableMaskFilter(SkReadBuffer& rb);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    virtual ~SkTableMaskFilter();
+
+    void flatten(SkWriteBuffer&) const override;
 
 private:
+    SkTableMaskFilter();
+    explicit SkTableMaskFilter(const uint8_t table[256]);
+
     uint8_t fTable[256];
 
     typedef SkMaskFilter INHERITED;
diff --git a/gfx/skia/skia/include/effects/SkTestImageFilters.h b/gfx/skia/skia/include/effects/SkTestImageFilters.h
index 28360403715a..06a3ff31a14e 100644
--- a/gfx/skia/skia/include/effects/SkTestImageFilters.h
+++ b/gfx/skia/skia/include/effects/SkTestImageFilters.h
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #ifndef _SkTestImageFilters_h
 #define _SkTestImageFilters_h
 
@@ -7,22 +14,29 @@
 // Fun mode that scales down (only) and then scales back up to look pixelated
 class SK_API SkDownSampleImageFilter : public SkImageFilter {
 public:
-    static SkDownSampleImageFilter* Create(SkScalar scale, SkImageFilter* input = NULL) {
-        return SkNEW_ARGS(SkDownSampleImageFilter, (scale, input));
+    static SkImageFilter* Create(SkScalar scale, SkImageFilter* input = NULL) {
+        if (!SkScalarIsFinite(scale)) {
+            return NULL;
+        }
+        // we don't support scale in this range
+        if (scale > SK_Scalar1 || scale <= 0) {
+            return NULL;
+        }
+        return new SkDownSampleImageFilter(scale, input);
     }
 
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDownSampleImageFilter)
 
 protected:
-    SkDownSampleImageFilter(SkScalar scale, SkImageFilter* input)
-      : INHERITED(1, &input), fScale(scale) {}
-    SkDownSampleImageFilter(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
-
-    virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                               SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
+    bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result,
+                       SkIPoint* loc) const override;
 
 private:
+    SkDownSampleImageFilter(SkScalar scale, SkImageFilter* input)
+        : INHERITED(1, &input), fScale(scale) {}
+
     SkScalar fScale;
 
     typedef SkImageFilter INHERITED;
diff --git a/gfx/skia/skia/include/effects/SkTileImageFilter.h b/gfx/skia/skia/include/effects/SkTileImageFilter.h
index 29e3ca571ff6..a2a1bb0fe132 100644
--- a/gfx/skia/skia/include/effects/SkTileImageFilter.h
+++ b/gfx/skia/skia/include/effects/SkTileImageFilter.h
@@ -15,30 +15,28 @@ class SK_API SkTileImageFilter : public SkImageFilter {
 
 public:
     /** Create a tile image filter
-        @param srcRect  Defines the pixels to tile
-        @param dstRect  Defines the pixels where tiles are drawn
+        @param src  Defines the pixels to tile
+        @param dst  Defines the pixels where tiles are drawn
         @param input    Input from which the subregion defined by srcRect will be tiled
     */
-    static SkTileImageFilter* Create(const SkRect& srcRect, const SkRect& dstRect,
-                                     SkImageFilter* input) {
-        return SkNEW_ARGS(SkTileImageFilter, (srcRect, dstRect, input));
-    }
+    static SkImageFilter* Create(const SkRect& src, const SkRect& dst, SkImageFilter* input);
 
-    virtual bool onFilterImage(Proxy* proxy, const SkBitmap& src, const Context& ctx,
-                               SkBitmap* dst, SkIPoint* offset) const SK_OVERRIDE;
-    virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&,
-                                SkIRect* dst) const SK_OVERRIDE;
+    bool onFilterImage(Proxy* proxy, const SkBitmap& src, const Context& ctx,
+                       SkBitmap* dst, SkIPoint* offset) const override;
+    bool onFilterBounds(const SkIRect& src, const SkMatrix&,
+                        SkIRect* dst) const override;
+    void computeFastBounds(const SkRect& src, SkRect* dst) const override;
 
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTileImageFilter)
 
 protected:
-    SkTileImageFilter(const SkRect& srcRect, const SkRect& dstRect, SkImageFilter* input)
-        : INHERITED(1, &input), fSrcRect(srcRect), fDstRect(dstRect) {}
-    explicit SkTileImageFilter(SkReadBuffer& buffer);
-
-    virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer& buffer) const override;
 
 private:
+    SkTileImageFilter(const SkRect& srcRect, const SkRect& dstRect, SkImageFilter* input)
+        : INHERITED(1, &input, NULL), fSrcRect(srcRect), fDstRect(dstRect) {}
+
     SkRect fSrcRect;
     SkRect fDstRect;
 };
diff --git a/gfx/skia/skia/include/effects/SkTransparentShader.h b/gfx/skia/skia/include/effects/SkTransparentShader.h
deleted file mode 100644
index d9a3e5d7a197..000000000000
--- a/gfx/skia/skia/include/effects/SkTransparentShader.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkTransparentShader_DEFINED
-#define SkTransparentShader_DEFINED
-
-#include "SkShader.h"
-
-class SK_API SkTransparentShader : public SkShader {
-public:
-    SkTransparentShader() {}
-
-    virtual size_t contextSize() const SK_OVERRIDE;
-
-    class TransparentShaderContext : public SkShader::Context {
-    public:
-        TransparentShaderContext(const SkTransparentShader& shader, const ContextRec&);
-        virtual ~TransparentShaderContext();
-
-        virtual uint32_t getFlags() const SK_OVERRIDE;
-        virtual void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE;
-        virtual void shadeSpan16(int x, int y, uint16_t span[], int count) SK_OVERRIDE;
-
-    private:
-        const SkBitmap* fDevice;
-
-        typedef SkShader::Context INHERITED;
-    };
-
-    SK_TO_STRING_OVERRIDE()
-    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTransparentShader)
-
-protected:
-    virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
-
-private:
-    SkTransparentShader(SkReadBuffer& buffer) : INHERITED(buffer) {}
-
-    typedef SkShader INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/include/effects/SkXfermodeImageFilter.h b/gfx/skia/skia/include/effects/SkXfermodeImageFilter.h
index 05f96c491127..57fd288f24f7 100644
--- a/gfx/skia/skia/include/effects/SkXfermodeImageFilter.h
+++ b/gfx/skia/skia/include/effects/SkXfermodeImageFilter.h
@@ -27,27 +27,27 @@ public:
                                          SkImageFilter* foreground = NULL,
                                          const CropRect* cropRect = NULL) {
         SkImageFilter* inputs[2] = { background, foreground };
-        return SkNEW_ARGS(SkXfermodeImageFilter, (mode, inputs, cropRect));
+        return new SkXfermodeImageFilter(mode, inputs, cropRect);
     }
 
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkXfermodeImageFilter)
 
-    virtual bool onFilterImage(Proxy* proxy,
-                               const SkBitmap& src,
-                               const Context& ctx,
-                               SkBitmap* dst,
-                               SkIPoint* offset) const SK_OVERRIDE;
+    bool onFilterImage(Proxy* proxy,
+                       const SkBitmap& src,
+                       const Context& ctx,
+                       SkBitmap* dst,
+                       SkIPoint* offset) const override;
 #if SK_SUPPORT_GPU
-    virtual bool canFilterImageGPU() const SK_OVERRIDE;
-    virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx,
-                                SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
+    bool canFilterImageGPU() const override;
+    bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx,
+                        SkBitmap* result, SkIPoint* offset) const override;
 #endif
 
 protected:
     SkXfermodeImageFilter(SkXfermode* mode, SkImageFilter* inputs[2],
                           const CropRect* cropRect);
-    explicit SkXfermodeImageFilter(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
 
 private:
     SkXfermode* fMode;
diff --git a/gfx/skia/skia/include/gpu/GrBackendEffectFactory.h b/gfx/skia/skia/include/gpu/GrBackendEffectFactory.h
deleted file mode 100644
index e6362520fc2b..000000000000
--- a/gfx/skia/skia/include/gpu/GrBackendEffectFactory.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrBackendEffectFactory_DEFINED
-#define GrBackendEffectFactory_DEFINED
-
-#include "GrTypes.h"
-#include "SkTemplates.h"
-#include "SkThread.h"
-#include "SkTypes.h"
-#include "SkTArray.h"
-
-class GrGLEffect;
-class GrGLCaps;
-class GrDrawEffect;
-
-/**
- * Used by effects to build their keys. It incorporates each per-effect key into a larger shader key.
- */
-class GrEffectKeyBuilder {
-public:
-    GrEffectKeyBuilder(SkTArray<unsigned char, true>* data) : fData(data), fCount(0) {
-        SkASSERT(0 == fData->count() % sizeof(uint32_t));
-    }
-
-    void add32(uint32_t v) {
-        ++fCount;
-        fData->push_back_n(4, reinterpret_cast<uint8_t*>(&v));
-    }
-
-    /** Inserts count uint32_ts into the key. The returned pointer is only valid until the next
-        add*() call. */
-    uint32_t* SK_WARN_UNUSED_RESULT add32n(int count) {
-        SkASSERT(count > 0);
-        fCount += count;
-        return reinterpret_cast<uint32_t*>(fData->push_back_n(4 * count));
-    }
-
-    size_t size() const { return sizeof(uint32_t) * fCount; }
-
-private:
-    SkTArray<uint8_t, true>* fData; // unowned ptr to the larger key.
-    int fCount;                     // number of uint32_ts added to fData by the effect.
-};
-
-/**
- * This class is used to pass the key that was created for a GrGLEffect back to it
- * when it emits code. It may allow the emit step to skip calculations that were
- * performed when computing the key.
- */
-class GrEffectKey {
-public:
-    GrEffectKey(const uint32_t* key, int count) : fKey(key), fCount(count) {
-        SkASSERT(0 == reinterpret_cast<intptr_t>(key) % sizeof(uint32_t));
-    }
-
-    /** Gets the uint32_t values that the effect inserted into the key. */
-    uint32_t get32(int index) const {
-        SkASSERT(index >=0 && index < fCount);
-        return fKey[index];
-    }
-
-    /** Gets the number of uint32_t values that the effect inserted into the key. */
-    int count32() const { return fCount; }
-
-private:
-    const uint32_t* fKey;           // unowned ptr into the larger key.
-    int             fCount;         // number of uint32_ts inserted by the effect into its key.
-};
-
-/**
- * Given a GrEffect of a particular type, creates the corresponding graphics-backend-specific
- * effect object. It also tracks equivalence of shaders generated via a key. The factory for an
- * effect is accessed via GrEffect::getFactory(). Each factory instance is assigned an ID at
- * construction. The ID of GrEffect::getFactory() is used as a type identifier. Thus, a GrEffect
- * subclass must always return the same object from getFactory() and that factory object must be
- * unique to the GrEffect subclass (and unique from any further derived subclasses).
- *
- * Rather than subclassing this class themselves, it is recommended that GrEffect authors use 
- * the templated subclass GrTBackendEffectFactory by writing their getFactory() method as:
- *
- * const GrBackendEffectFactory& MyEffect::getFactory() const {
- *     return GrTBackendEffectFactory<MyEffect>::getInstance();
- * }
- *
- * Using GrTBackendEffectFactory places a few constraints on the effect. See that class's comments.
- */
-class GrBackendEffectFactory : SkNoncopyable {
-public:
-    /** 
-     * Generates an effect's key. The key is based on the aspects of the GrEffect object's
-     * configuration that affect GLSL code generation. Two GrEffect instances that would cause
-     * this->createGLInstance()->emitCode() to produce different code must produce different keys.
-     */
-    virtual void getGLEffectKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*) const = 0;
-
-    /**
-     * Creates a GrGLEffect instance that is used both to generate code for the GrEffect in a GLSL
-     * program and to manage updating uniforms for the program when it is used.
-     */
-    virtual GrGLEffect* createGLInstance(const GrDrawEffect&) const = 0;
-
-    /**
-     * Produces a human-reable name for the effect.
-     */
-    virtual const char* name() const = 0;
-
-    /**
-     * A unique value for every instance of this factory. It is automatically incorporated into the
-     * effect's key. This allows keys generated by getGLEffectKey() to only be unique within a
-     * GrEffect subclass and not necessarily across subclasses.
-     */
-    uint32_t effectClassID() const { return fEffectClassID; }
-
-protected:
-    GrBackendEffectFactory() : fEffectClassID(GenID()) {}
-    virtual ~GrBackendEffectFactory() {}
-
-private:
-    enum {
-        kIllegalEffectClassID = 0,
-    };
-
-    static uint32_t GenID() {
-        // fCurrEffectClassID has been initialized to kIllegalEffectClassID. The
-        // atomic inc returns the old value not the incremented value. So we add
-        // 1 to the returned value.
-        uint32_t id = static_cast<uint32_t>(sk_atomic_inc(&fCurrEffectClassID)) + 1;
-        if (!id) {
-            SkFAIL("This should never wrap as it should only be called once for each GrEffect "
-                   "subclass.");
-        }
-        return id;
-    }
-
-    const uint32_t fEffectClassID;
-    static int32_t fCurrEffectClassID;
-};
-
-#endif
diff --git a/gfx/skia/skia/include/gpu/GrBlend.h b/gfx/skia/skia/include/gpu/GrBlend.h
new file mode 100644
index 000000000000..5100bb05396b
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/GrBlend.h
@@ -0,0 +1,228 @@
+
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrBlend_DEFINED
+#define GrBlend_DEFINED
+
+#include "GrColor.h"
+#include "../private/SkTLogic.h"
+
+/**
+ * Equations for alpha-blending.
+ */
+enum GrBlendEquation {
+    // Basic blend equations.
+    kAdd_GrBlendEquation,             //<! Cs*S + Cd*D
+    kSubtract_GrBlendEquation,        //<! Cs*S - Cd*D
+    kReverseSubtract_GrBlendEquation, //<! Cd*D - Cs*S
+
+    // Advanced blend equations. These are described in the SVG and PDF specs.
+    kScreen_GrBlendEquation,
+    kOverlay_GrBlendEquation,
+    kDarken_GrBlendEquation,
+    kLighten_GrBlendEquation,
+    kColorDodge_GrBlendEquation,
+    kColorBurn_GrBlendEquation,
+    kHardLight_GrBlendEquation,
+    kSoftLight_GrBlendEquation,
+    kDifference_GrBlendEquation,
+    kExclusion_GrBlendEquation,
+    kMultiply_GrBlendEquation,
+    kHSLHue_GrBlendEquation,
+    kHSLSaturation_GrBlendEquation,
+    kHSLColor_GrBlendEquation,
+    kHSLLuminosity_GrBlendEquation,
+
+    kFirstAdvancedGrBlendEquation = kScreen_GrBlendEquation,
+    kLast_GrBlendEquation = kHSLLuminosity_GrBlendEquation
+};
+
+static const int kGrBlendEquationCnt = kLast_GrBlendEquation + 1;
+
+
+/**
+ * Coefficients for alpha-blending.
+ */
+enum GrBlendCoeff {
+    kZero_GrBlendCoeff,    //<! 0
+    kOne_GrBlendCoeff,     //<! 1
+    kSC_GrBlendCoeff,      //<! src color
+    kISC_GrBlendCoeff,     //<! one minus src color
+    kDC_GrBlendCoeff,      //<! dst color
+    kIDC_GrBlendCoeff,     //<! one minus dst color
+    kSA_GrBlendCoeff,      //<! src alpha
+    kISA_GrBlendCoeff,     //<! one minus src alpha
+    kDA_GrBlendCoeff,      //<! dst alpha
+    kIDA_GrBlendCoeff,     //<! one minus dst alpha
+    kConstC_GrBlendCoeff,  //<! constant color
+    kIConstC_GrBlendCoeff, //<! one minus constant color
+    kConstA_GrBlendCoeff,  //<! constant color alpha
+    kIConstA_GrBlendCoeff, //<! one minus constant color alpha
+    kS2C_GrBlendCoeff,
+    kIS2C_GrBlendCoeff,
+    kS2A_GrBlendCoeff,
+    kIS2A_GrBlendCoeff,
+
+    kLast_GrBlendCoeff = kIS2A_GrBlendCoeff
+};
+
+static const int kGrBlendCoeffCnt = kLast_GrBlendCoeff + 1;
+
+/**
+ * Given a known blend equation in the form of srcCoeff * srcColor + dstCoeff * dstColor where
+ * there may be partial knowledge of the srcColor and dstColor component values, determine what
+ * components of the blended output color are known. Coeffs must not refer to the constant or
+ * secondary src color.
+ */
+void GrGetCoeffBlendKnownComponents(GrBlendCoeff srcCoeff, GrBlendCoeff dstCoeff,
+                                    GrColor srcColor,
+                                    GrColorComponentFlags srcColorFlags,
+                                    GrColor dstColor,
+                                    GrColorComponentFlags dstColorFlags,
+                                    GrColor* outColor,
+                                    GrColorComponentFlags* outFlags);
+
+template<GrBlendCoeff Coeff>
+struct GrTBlendCoeffRefsSrc : skstd::bool_constant<kSC_GrBlendCoeff == Coeff ||
+                                                   kISC_GrBlendCoeff == Coeff ||
+                                                   kSA_GrBlendCoeff == Coeff ||
+                                                   kISA_GrBlendCoeff == Coeff> {};
+
+#define GR_BLEND_COEFF_REFS_SRC(COEFF) \
+    GrTBlendCoeffRefsSrc<COEFF>::value
+
+inline bool GrBlendCoeffRefsSrc(GrBlendCoeff coeff) {
+    switch (coeff) {
+        case kSC_GrBlendCoeff:
+        case kISC_GrBlendCoeff:
+        case kSA_GrBlendCoeff:
+        case kISA_GrBlendCoeff:
+            return true;
+        default:
+            return false;
+    }
+}
+
+template<GrBlendCoeff Coeff>
+struct GrTBlendCoeffRefsDst : skstd::bool_constant<kDC_GrBlendCoeff == Coeff ||
+                                                   kIDC_GrBlendCoeff == Coeff ||
+                                                   kDA_GrBlendCoeff == Coeff ||
+                                                   kIDA_GrBlendCoeff == Coeff> {};
+
+#define GR_BLEND_COEFF_REFS_DST(COEFF) \
+    GrTBlendCoeffRefsDst<COEFF>::value
+
+inline bool GrBlendCoeffRefsDst(GrBlendCoeff coeff) {
+    switch (coeff) {
+        case kDC_GrBlendCoeff:
+        case kIDC_GrBlendCoeff:
+        case kDA_GrBlendCoeff:
+        case kIDA_GrBlendCoeff:
+            return true;
+        default:
+            return false;
+    }
+}
+
+
+template<GrBlendCoeff Coeff>
+struct GrTBlendCoeffRefsSrc2 : skstd::bool_constant<kS2C_GrBlendCoeff == Coeff ||
+                                                    kIS2C_GrBlendCoeff == Coeff ||
+                                                    kS2A_GrBlendCoeff == Coeff ||
+                                                    kIS2A_GrBlendCoeff == Coeff> {};
+
+#define GR_BLEND_COEFF_REFS_SRC2(COEFF) \
+    GrTBlendCoeffRefsSrc2<COEFF>::value
+
+inline bool GrBlendCoeffRefsSrc2(GrBlendCoeff coeff) {
+    switch (coeff) {
+        case kS2C_GrBlendCoeff:
+        case kIS2C_GrBlendCoeff:
+        case kS2A_GrBlendCoeff:
+        case kIS2A_GrBlendCoeff:
+            return true;
+        default:
+            return false;
+    }
+}
+
+
+template<GrBlendCoeff SrcCoeff, GrBlendCoeff DstCoeff>
+struct GrTBlendCoeffsUseSrcColor : skstd::bool_constant<kZero_GrBlendCoeff != SrcCoeff ||
+                                                        GR_BLEND_COEFF_REFS_SRC(DstCoeff)> {};
+
+#define GR_BLEND_COEFFS_USE_SRC_COLOR(SRC_COEFF, DST_COEFF) \
+    GrTBlendCoeffsUseSrcColor<SRC_COEFF, DST_COEFF>::value
+
+
+template<GrBlendCoeff SrcCoeff, GrBlendCoeff DstCoeff>
+struct GrTBlendCoeffsUseDstColor : skstd::bool_constant<GR_BLEND_COEFF_REFS_DST(SrcCoeff) ||
+                                                        kZero_GrBlendCoeff != DstCoeff> {};
+
+#define GR_BLEND_COEFFS_USE_DST_COLOR(SRC_COEFF, DST_COEFF) \
+    GrTBlendCoeffsUseDstColor<SRC_COEFF, DST_COEFF>::value
+
+
+template<GrBlendEquation Equation>
+struct GrTBlendEquationIsAdvanced : skstd::bool_constant<Equation >= kFirstAdvancedGrBlendEquation> {};
+
+#define GR_BLEND_EQUATION_IS_ADVANCED(EQUATION) \
+    GrTBlendEquationIsAdvanced<EQUATION>::value
+
+inline bool GrBlendEquationIsAdvanced(GrBlendEquation equation) {
+    return equation >= kFirstAdvancedGrBlendEquation;
+}
+
+
+template<GrBlendEquation BlendEquation, GrBlendCoeff SrcCoeff, GrBlendCoeff DstCoeff>
+struct GrTBlendModifiesDst : skstd::bool_constant<
+    (kAdd_GrBlendEquation != BlendEquation && kReverseSubtract_GrBlendEquation != BlendEquation) ||
+     kZero_GrBlendCoeff != SrcCoeff ||
+     kOne_GrBlendCoeff != DstCoeff> {};
+
+#define GR_BLEND_MODIFIES_DST(EQUATION, SRC_COEFF, DST_COEFF) \
+    GrTBlendModifiesDst<EQUATION, SRC_COEFF, DST_COEFF>::value
+
+
+/**
+ * Advanced blend equations can always tweak alpha for coverage. (See GrCustomXfermode.cpp)
+ *
+ * For "add" and "reverse subtract" the blend equation with f=coverage is:
+ *
+ *   D' = f * (S * srcCoeff + D * dstCoeff) + (1-f) * D
+ *      = f * S * srcCoeff + D * (f * dstCoeff + (1 - f))
+ *
+ * (Let srcCoeff be negative for reverse subtract.) We can tweak alpha for coverage when the
+ * following relationship holds:
+ *
+ *   (f*S) * srcCoeff' + D * dstCoeff' == f * S * srcCoeff + D * (f * dstCoeff + (1 - f))
+ *
+ * (Where srcCoeff' and dstCoeff' have any reference to S pre-multiplied by f.)
+ *
+ * It's easy to see this works for the src term as long as srcCoeff' == srcCoeff (meaning srcCoeff
+ * does not reference S). For the dst term, this will work as long as the following is true:
+ *|
+ *   dstCoeff' == f * dstCoeff + (1 - f)
+ *   dstCoeff' == 1 - f * (1 - dstCoeff)
+ *
+ * By inspection we can see this will work as long as dstCoeff has a 1, and any other term in
+ * dstCoeff references S.
+ */
+template<GrBlendEquation Equation, GrBlendCoeff SrcCoeff, GrBlendCoeff DstCoeff>
+struct GrTBlendCanTweakAlphaForCoverage : skstd::bool_constant<
+    GR_BLEND_EQUATION_IS_ADVANCED(Equation) ||
+    ((kAdd_GrBlendEquation == Equation || kReverseSubtract_GrBlendEquation == Equation) &&
+      !GR_BLEND_COEFF_REFS_SRC(SrcCoeff) &&
+      (kOne_GrBlendCoeff == DstCoeff ||
+       kISC_GrBlendCoeff == DstCoeff ||
+       kISA_GrBlendCoeff == DstCoeff))> {};
+
+#define GR_BLEND_CAN_TWEAK_ALPHA_FOR_COVERAGE(EQUATION, SRC_COEFF, DST_COEFF) \
+    GrTBlendCanTweakAlphaForCoverage<EQUATION, SRC_COEFF, DST_COEFF>::value
+
+#endif
diff --git a/gfx/skia/skia/include/gpu/GrCaps.h b/gfx/skia/skia/include/gpu/GrCaps.h
new file mode 100644
index 000000000000..6d3b66af210a
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/GrCaps.h
@@ -0,0 +1,287 @@
+
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef GrCaps_DEFINED
+#define GrCaps_DEFINED
+
+#include "GrTypes.h"
+#include "GrTypesPriv.h"
+#include "GrBlend.h"
+#include "GrShaderVar.h"
+#include "SkRefCnt.h"
+#include "SkString.h"
+
+struct GrContextOptions;
+
+class GrShaderCaps : public SkRefCnt {
+public:
+    /** Info about shader variable precision within a given shader stage. That is, this info
+        is relevant to a float (or vecNf) variable declared with a GrSLPrecision
+        in a given GrShaderType. The info here is hoisted from the OpenGL spec. */
+    struct PrecisionInfo {
+        PrecisionInfo() {
+            fLogRangeLow = 0;
+            fLogRangeHigh = 0;
+            fBits = 0;
+        }
+
+        /** Is this precision level allowed in the shader stage? */
+        bool supported() const { return 0 != fBits; }
+
+        bool operator==(const PrecisionInfo& that) const {
+            return fLogRangeLow == that.fLogRangeLow && fLogRangeHigh == that.fLogRangeHigh &&
+                   fBits == that.fBits;
+        }
+        bool operator!=(const PrecisionInfo& that) const { return !(*this == that); }
+
+        /** floor(log2(|min_value|)) */
+        int fLogRangeLow;
+        /** floor(log2(|max_value|)) */
+        int fLogRangeHigh;
+        /** Number of bits of precision. As defined in OpenGL (with names modified to reflect this
+            struct) :
+            """
+            If the smallest representable value greater than 1 is 1 + e, then fBits will
+            contain floor(log2(e)), and every value in the range [2^fLogRangeLow,
+            2^fLogRangeHigh] can be represented to at least one part in 2^fBits.
+            """
+          */
+        int fBits;
+    };
+
+    GrShaderCaps();
+
+    virtual SkString dump() const;
+
+    bool shaderDerivativeSupport() const { return fShaderDerivativeSupport; }
+    bool geometryShaderSupport() const { return fGeometryShaderSupport; }
+    bool pathRenderingSupport() const { return fPathRenderingSupport; }
+    bool dstReadInShaderSupport() const { return fDstReadInShaderSupport; }
+    bool dualSourceBlendingSupport() const { return fDualSourceBlendingSupport; }
+
+    /**
+    * Get the precision info for a variable of type kFloat_GrSLType, kVec2f_GrSLType, etc in a
+    * given shader type. If the shader type is not supported or the precision level is not
+    * supported in that shader type then the returned struct will report false when supported() is
+    * called.
+    */
+    const PrecisionInfo& getFloatShaderPrecisionInfo(GrShaderType shaderType,
+        GrSLPrecision precision) const {
+        return fFloatPrecisions[shaderType][precision];
+    };
+
+    /**
+    * Is there any difference between the float shader variable precision types? If this is true
+    * then unless the shader type is not supported, any call to getFloatShaderPrecisionInfo() would
+    * report the same info for all precisions in all shader types.
+    */
+    bool floatPrecisionVaries() const { return fShaderPrecisionVaries; }
+
+protected:
+    /** Subclasses must call this after initialization in order to apply caps overrides requested by
+        the client. Note that overrides will only reduce the caps never expand them. */
+    void applyOptionsOverrides(const GrContextOptions& options);
+
+    bool fShaderDerivativeSupport : 1;
+    bool fGeometryShaderSupport : 1;
+    bool fPathRenderingSupport : 1;
+    bool fDstReadInShaderSupport : 1;
+    bool fDualSourceBlendingSupport : 1;
+
+    bool fShaderPrecisionVaries;
+    PrecisionInfo fFloatPrecisions[kGrShaderTypeCount][kGrSLPrecisionCount];
+
+private:
+    virtual void onApplyOptionsOverrides(const GrContextOptions&) {};
+    typedef SkRefCnt INHERITED;
+};
+
+/**
+ * Represents the capabilities of a GrContext.
+ */
+class GrCaps : public SkRefCnt {
+public:
+    GrCaps(const GrContextOptions&);
+
+    virtual SkString dump() const;
+
+    GrShaderCaps* shaderCaps() const { return fShaderCaps; }
+
+    bool npotTextureTileSupport() const { return fNPOTTextureTileSupport; }
+    /** To avoid as-yet-unnecessary complexity we don't allow any partial support of MIP Maps (e.g.
+        only for POT textures) */
+    bool mipMapSupport() const { return fMipMapSupport; }
+    bool twoSidedStencilSupport() const { return fTwoSidedStencilSupport; }
+    bool stencilWrapOpsSupport() const { return  fStencilWrapOpsSupport; }
+    bool discardRenderTargetSupport() const { return fDiscardRenderTargetSupport; }
+#if GR_FORCE_GPU_TRACE_DEBUGGING
+    bool gpuTracingSupport() const { return true; }
+#else
+    bool gpuTracingSupport() const { return fGpuTracingSupport; }
+#endif
+    bool compressedTexSubImageSupport() const { return fCompressedTexSubImageSupport; }
+    bool oversizedStencilSupport() const { return fOversizedStencilSupport; }
+    bool textureBarrierSupport() const { return fTextureBarrierSupport; }
+    bool mixedSamplesSupport() const { return fMixedSamplesSupport; }
+
+    bool useDrawInsteadOfClear() const { return fUseDrawInsteadOfClear; }
+    bool useDrawInsteadOfPartialRenderTargetWrite() const {
+        return fUseDrawInsteadOfPartialRenderTargetWrite;
+    }
+
+    bool preferVRAMUseOverFlushes() const { return fPreferVRAMUseOverFlushes; }
+
+    /**
+     * Indicates the capabilities of the fixed function blend unit.
+     */
+    enum BlendEquationSupport {
+        kBasic_BlendEquationSupport,             //<! Support to select the operator that
+                                                 //   combines src and dst terms.
+        kAdvanced_BlendEquationSupport,          //<! Additional fixed function support for specific
+                                                 //   SVG/PDF blend modes. Requires blend barriers.
+        kAdvancedCoherent_BlendEquationSupport,  //<! Advanced blend equation support that does not
+                                                 //   require blend barriers, and permits overlap.
+
+        kLast_BlendEquationSupport = kAdvancedCoherent_BlendEquationSupport
+    };
+
+    BlendEquationSupport blendEquationSupport() const { return fBlendEquationSupport; }
+
+    bool advancedBlendEquationSupport() const {
+        return fBlendEquationSupport >= kAdvanced_BlendEquationSupport;
+    }
+
+    bool advancedCoherentBlendEquationSupport() const {
+        return kAdvancedCoherent_BlendEquationSupport == fBlendEquationSupport;
+    }
+
+    bool canUseAdvancedBlendEquation(GrBlendEquation equation) const {
+        SkASSERT(GrBlendEquationIsAdvanced(equation));
+        return SkToBool(fAdvBlendEqBlacklist & (1 << equation));
+    }
+
+    /**
+     * Indicates whether GPU->CPU memory mapping for GPU resources such as vertex buffers and
+     * textures allows partial mappings or full mappings.
+     */
+    enum MapFlags {
+        kNone_MapFlags   = 0x0,       //<! Cannot map the resource.
+
+        kCanMap_MapFlag  = 0x1,       //<! The resource can be mapped. Must be set for any of
+                                      //   the other flags to have meaning.k
+        kSubset_MapFlag  = 0x2,       //<! The resource can be partially mapped.
+    };
+
+    uint32_t mapBufferFlags() const { return fMapBufferFlags; }
+
+    // Scratch textures not being reused means that those scratch textures
+    // that we upload to (i.e., don't have a render target) will not be
+    // recycled in the texture cache. This is to prevent ghosting by drivers
+    // (in particular for deferred architectures).
+    bool reuseScratchTextures() const { return fReuseScratchTextures; }
+    bool reuseScratchBuffers() const { return fReuseScratchBuffers; }
+
+    int maxRenderTargetSize() const { return fMaxRenderTargetSize; }
+    int maxTextureSize() const { return fMaxTextureSize; }
+    /** This is the maximum tile size to use by GPU devices for rendering sw-backed images/bitmaps.
+        It is usually the max texture size, unless we're overriding it for testing. */
+    int maxTileSize() const { SkASSERT(fMaxTileSize <= fMaxTextureSize); return fMaxTileSize; }
+
+    // Will be 0 if MSAA is not supported
+    int maxSampleCount() const { return fMaxSampleCount; }
+
+    bool isConfigRenderable(GrPixelConfig config, bool withMSAA) const {
+        SkASSERT(kGrPixelConfigCnt > config);
+        return fConfigRenderSupport[config][withMSAA];
+    }
+
+    bool isConfigTexturable(GrPixelConfig config) const {
+        SkASSERT(kGrPixelConfigCnt > config);
+        return fConfigTextureSupport[config];
+    }
+
+    bool suppressPrints() const { return fSuppressPrints; }
+
+    bool immediateFlush() const { return fImmediateFlush; }
+
+    bool drawPathMasksToCompressedTexturesSupport() const {
+        return fDrawPathMasksToCompressedTextureSupport;
+    }
+
+    size_t geometryBufferMapThreshold() const {
+        SkASSERT(fGeometryBufferMapThreshold >= 0);
+        return fGeometryBufferMapThreshold;
+    }
+
+    bool supportsInstancedDraws() const {
+        return fSupportsInstancedDraws;
+    }
+
+    bool fullClearIsFree() const { return fFullClearIsFree; }
+
+    /** True in environments that will issue errors if memory uploaded to buffers 
+        is not initialized (even if not read by draw calls). */
+    bool mustClearUploadedBufferData() const { return fMustClearUploadedBufferData; }
+
+protected:
+    /** Subclasses must call this at the end of their constructors in order to apply caps
+        overrides requested by the client. Note that overrides will only reduce the caps never
+        expand them. */
+    void applyOptionsOverrides(const GrContextOptions& options);
+
+    SkAutoTUnref<GrShaderCaps>    fShaderCaps;
+
+    bool fNPOTTextureTileSupport                     : 1;
+    bool fMipMapSupport                              : 1;
+    bool fTwoSidedStencilSupport                     : 1;
+    bool fStencilWrapOpsSupport                      : 1;
+    bool fDiscardRenderTargetSupport                 : 1;
+    bool fReuseScratchTextures                       : 1;
+    bool fReuseScratchBuffers                        : 1;
+    bool fGpuTracingSupport                          : 1;
+    bool fCompressedTexSubImageSupport               : 1;
+    bool fOversizedStencilSupport                    : 1;
+    bool fTextureBarrierSupport                      : 1;
+    bool fMixedSamplesSupport                        : 1;
+    bool fSupportsInstancedDraws                     : 1;
+    bool fFullClearIsFree                            : 1;
+    bool fMustClearUploadedBufferData                : 1;
+
+    // Driver workaround
+    bool fUseDrawInsteadOfClear                      : 1;
+    bool fUseDrawInsteadOfPartialRenderTargetWrite   : 1;
+
+    // ANGLE workaround
+    bool fPreferVRAMUseOverFlushes                   : 1;
+
+    BlendEquationSupport fBlendEquationSupport;
+    uint32_t fAdvBlendEqBlacklist;
+    GR_STATIC_ASSERT(kLast_GrBlendEquation < 32);
+
+    uint32_t fMapBufferFlags;
+    int fGeometryBufferMapThreshold;
+
+    int fMaxRenderTargetSize;
+    int fMaxTextureSize;
+    int fMaxTileSize;
+    int fMaxSampleCount;
+
+    // The first entry for each config is without msaa and the second is with.
+    bool fConfigRenderSupport[kGrPixelConfigCnt][2];
+    bool fConfigTextureSupport[kGrPixelConfigCnt];
+
+private:
+    virtual void onApplyOptionsOverrides(const GrContextOptions&) {};
+
+    bool fSuppressPrints : 1;
+    bool fImmediateFlush: 1;
+    bool fDrawPathMasksToCompressedTextureSupport : 1;
+
+    typedef SkRefCnt INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/include/gpu/GrClip.h b/gfx/skia/skia/include/gpu/GrClip.h
new file mode 100644
index 000000000000..201969219438
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/GrClip.h
@@ -0,0 +1,185 @@
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrClip_DEFINED
+#define GrClip_DEFINED
+
+#include "SkClipStack.h"
+
+struct SkIRect;
+
+/**
+ * GrClip encapsulates the information required to construct the clip
+ * masks. 'A GrClip is either wide open, just an IRect, just a Rect, or a full clipstack.
+ * If the clip is a clipstack than the origin is used to translate the stack with
+ * respect to device coordinates. This allows us to use a clip stack that is
+ * specified for a root device with a layer device that is restricted to a subset
+ * of the original canvas. For other clip types the origin will always be (0,0).
+ *
+ * NOTE: GrClip *must* point to a const clipstack
+ */
+class GrClip : SkNoncopyable {
+public:
+    GrClip() : fClipType(kWideOpen_ClipType) {
+        fOrigin.setZero();
+    }
+
+    GrClip(const SkIRect& rect) : fClipType(kIRect_ClipType) {
+        fOrigin.setZero();
+        fClip.fIRect = rect;
+    }
+
+    GrClip(const SkRect& rect) : fClipType(kIRect_ClipType) {
+        fOrigin.setZero();
+        fClip.fIRect.fLeft   = SkScalarRoundToInt(rect.fLeft);
+        fClip.fIRect.fTop    = SkScalarRoundToInt(rect.fTop);
+        fClip.fIRect.fRight  = SkScalarRoundToInt(rect.fRight);
+        fClip.fIRect.fBottom = SkScalarRoundToInt(rect.fBottom);
+    }
+
+    ~GrClip() { this->reset(); }
+
+    const GrClip& operator=(const GrClip& other) {
+        this->reset();
+        fClipType = other.fClipType;
+        switch (other.fClipType) {
+            case kWideOpen_ClipType:
+                fOrigin.setZero();
+                break;
+            case kClipStack_ClipType:
+                fClip.fStack = SkRef(other.clipStack());
+                fOrigin = other.origin();
+                break;
+            case kIRect_ClipType:
+                fClip.fIRect = other.irect();
+                fOrigin.setZero();
+                break;
+        }
+        return *this;
+    }
+
+    bool operator==(const GrClip& other) const {
+        if (this->clipType() != other.clipType()) {
+            return false;
+        }
+
+        switch (fClipType) {
+            case kWideOpen_ClipType:
+                return true;
+            case kClipStack_ClipType:
+                if (this->origin() != other.origin()) {
+                    return false;
+                }
+
+                if (this->clipStack() && other.clipStack()) {
+                    return *this->clipStack() == *other.clipStack();
+                } else {
+                    return this->clipStack() == other.clipStack();
+                }
+                break;
+            case kIRect_ClipType:
+                return this->irect() == other.irect();
+                break;
+        }
+
+        return false;
+    }
+
+    bool operator!=(const GrClip& other) const {
+        return !(*this == other);
+    }
+
+    const SkClipStack* clipStack() const {
+        SkASSERT(kClipStack_ClipType == fClipType);
+        return fClip.fStack;
+    }
+
+    void setClipStack(const SkClipStack* clipStack, const SkIPoint* origin = NULL) {
+        this->reset();
+        if (clipStack->isWideOpen()) {
+            fClipType = kWideOpen_ClipType;
+            fOrigin.setZero();
+        } else {
+            fClipType = kClipStack_ClipType;
+            fClip.fStack = SkRef(clipStack);
+            if (origin) {
+                fOrigin = *origin;
+            } else {
+                fOrigin.setZero();
+            }
+        }
+    }
+
+    const SkIRect& irect() const {
+        SkASSERT(kIRect_ClipType == fClipType);
+        return fClip.fIRect;
+    }
+
+    void reset() {
+        if (kClipStack_ClipType == fClipType) {
+            fClip.fStack->unref();
+            fClip.fStack = NULL;
+        }
+        fClipType = kWideOpen_ClipType;
+        fOrigin.setZero();
+    }
+
+    // We support this for all cliptypes to simplify the logic a bit in clip mask manager.
+    // non clipstack clip types MUST have a (0,0) origin
+    const SkIPoint& origin() const {
+        SkASSERT(fClipType == kClipStack_ClipType || (fOrigin.fX == 0 && fOrigin.fY == 0));
+        return fOrigin;
+    }
+
+    bool isWideOpen(const SkRect& rect) const {
+        return (kWideOpen_ClipType == fClipType) ||
+               (kClipStack_ClipType == fClipType && this->clipStack()->isWideOpen()) ||
+               (kIRect_ClipType == fClipType && this->irect().contains(rect));
+    }
+
+    bool isWideOpen(const SkIRect& rect) const {
+        return (kWideOpen_ClipType == fClipType) ||
+               (kClipStack_ClipType == fClipType && this->clipStack()->isWideOpen()) ||
+               (kIRect_ClipType == fClipType && this->irect().contains(rect));
+    }
+
+    bool isWideOpen() const {
+        return (kWideOpen_ClipType == fClipType) ||
+               (kClipStack_ClipType == fClipType && this->clipStack()->isWideOpen());
+    }
+
+    bool quickContains(const SkRect& rect) const {
+        return (kWideOpen_ClipType == fClipType) ||
+               (kClipStack_ClipType == fClipType && this->clipStack()->quickContains(rect)) ||
+               (kIRect_ClipType == fClipType && this->irect().contains(rect));
+    }
+
+    void getConservativeBounds(int width, int height,
+                               SkIRect* devResult,
+                               bool* isIntersectionOfRects = NULL) const;
+
+    static const GrClip& WideOpen();
+
+    enum ClipType {
+        kClipStack_ClipType,
+        kWideOpen_ClipType,
+        kIRect_ClipType,
+    };
+
+    ClipType clipType() const { return fClipType; }
+
+private:
+    union Clip {
+        const SkClipStack* fStack;
+        SkIRect fIRect;
+    } fClip;
+
+    SkIPoint fOrigin;
+    ClipType fClipType;
+};
+
+#endif
diff --git a/gfx/skia/skia/include/gpu/GrClipData.h b/gfx/skia/skia/include/gpu/GrClipData.h
deleted file mode 100644
index 1dc4b0d5f8ca..000000000000
--- a/gfx/skia/skia/include/gpu/GrClipData.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrClip_DEFINED
-#define GrClip_DEFINED
-
-#include "SkClipStack.h"
-#include "GrSurface.h"
-
-struct SkIRect;
-
-/**
- * GrClipData encapsulates the information required to construct the clip
- * masks. 'fOrigin' is only non-zero when saveLayer has been called
- * with an offset bounding box. The clips in 'fClipStack' are in
- * device coordinates (i.e., they have been translated by -fOrigin w.r.t.
- * the canvas' device coordinates).
- */
-class GrClipData : SkNoncopyable {
-public:
-    const SkClipStack*  fClipStack;
-    SkIPoint            fOrigin;
-
-    GrClipData()
-        : fClipStack(NULL) {
-        fOrigin.setZero();
-    }
-
-    bool operator==(const GrClipData& other) const {
-        if (fOrigin != other.fOrigin) {
-            return false;
-        }
-
-        if (NULL != fClipStack && NULL != other.fClipStack) {
-            return *fClipStack == *other.fClipStack;
-        }
-
-        return fClipStack == other.fClipStack;
-    }
-
-    bool operator!=(const GrClipData& other) const {
-        return !(*this == other);
-    }
-
-    void getConservativeBounds(const GrSurface* surface,
-                               SkIRect* devResult,
-                               bool* isIntersectionOfRects = NULL) const {
-        this->getConservativeBounds(surface->width(), surface->height(),
-                                    devResult, isIntersectionOfRects);
-    }
-
-    void getConservativeBounds(int width, int height,
-                               SkIRect* devResult,
-                               bool* isIntersectionOfRects = NULL) const;
-};
-
-#endif
diff --git a/gfx/skia/skia/include/gpu/GrColor.h b/gfx/skia/skia/include/gpu/GrColor.h
index c53e4b219d3b..6b83237626ae 100644
--- a/gfx/skia/skia/include/gpu/GrColor.h
+++ b/gfx/skia/skia/include/gpu/GrColor.h
@@ -12,10 +12,13 @@
 #define GrColor_DEFINED
 
 #include "GrTypes.h"
+#include "SkColor.h"
+#include "SkColorPriv.h"
+#include "SkUnPreMultiply.h"
 
 /**
- * GrColor is 4 bytes for R, G, B, A, in a specific order defined below. The components are stored
- * premultiplied.
+ * GrColor is 4 bytes for R, G, B, A, in a specific order defined below. Whether the color is
+ * premultiplied or not depends on the context in which it is being used.
  */
 typedef uint32_t GrColor;
 
@@ -38,8 +41,7 @@ typedef uint32_t GrColor;
 /**
  *  Pack 4 components (RGBA) into a GrColor int
  */
-static inline GrColor GrColorPackRGBA(unsigned r, unsigned g,
-                                      unsigned b, unsigned a) {
+static inline GrColor GrColorPackRGBA(unsigned r, unsigned g, unsigned b, unsigned a) {
     SkASSERT((uint8_t)r == r);
     SkASSERT((uint8_t)g == g);
     SkASSERT((uint8_t)b == b);
@@ -50,6 +52,17 @@ static inline GrColor GrColorPackRGBA(unsigned r, unsigned g,
             (a << GrColor_SHIFT_A);
 }
 
+/**
+ *  Packs a color with an alpha channel replicated across all four channels.
+ */
+static inline GrColor GrColorPackA4(unsigned a) {
+    SkASSERT((uint8_t)a == a);
+    return  (a << GrColor_SHIFT_R) |
+            (a << GrColor_SHIFT_G) |
+            (a << GrColor_SHIFT_B) |
+            (a << GrColor_SHIFT_A);
+}
+
 // extract a component (byte) from a GrColor int
 
 #define GrColorUnpackR(color)   (((color) >> GrColor_SHIFT_R) & 0xFF)
@@ -63,10 +76,13 @@ static inline GrColor GrColorPackRGBA(unsigned r, unsigned g,
  */
 #define GrColor_ILLEGAL     (~(0xFF << GrColor_SHIFT_A))
 
+#define GrColor_WHITE 0xFFFFFFFF
+#define GrColor_TRANSPARENT_BLACK 0x0
+
 /**
  * Assert in debug builds that a GrColor is premultiplied.
  */
-static inline void GrColorIsPMAssert(GrColor c) {
+static inline void GrColorIsPMAssert(GrColor SkDEBUGCODE(c)) {
 #ifdef SK_DEBUG
     unsigned a = GrColorUnpackA(c);
     unsigned r = GrColorUnpackR(c);
@@ -79,6 +95,31 @@ static inline void GrColorIsPMAssert(GrColor c) {
 #endif
 }
 
+/** Inverts each color channel. */
+static inline GrColor GrInvertColor(GrColor c) {
+    U8CPU a = GrColorUnpackA(c);
+    U8CPU r = GrColorUnpackR(c);
+    U8CPU g = GrColorUnpackG(c);
+    U8CPU b = GrColorUnpackB(c);
+    return GrColorPackRGBA(0xff - r, 0xff - g, 0xff - b, 0xff - a);
+}
+
+static inline GrColor GrColorMul(GrColor c0, GrColor c1) {
+    U8CPU r = SkMulDiv255Round(GrColorUnpackR(c0), GrColorUnpackR(c1));
+    U8CPU g = SkMulDiv255Round(GrColorUnpackG(c0), GrColorUnpackG(c1));
+    U8CPU b = SkMulDiv255Round(GrColorUnpackB(c0), GrColorUnpackB(c1));
+    U8CPU a = SkMulDiv255Round(GrColorUnpackA(c0), GrColorUnpackA(c1));
+    return GrColorPackRGBA(r, g, b, a);
+}
+
+static inline GrColor GrColorSatAdd(GrColor c0, GrColor c1) {
+    unsigned r = SkTMin<unsigned>(GrColorUnpackR(c0) + GrColorUnpackR(c1), 0xff);
+    unsigned g = SkTMin<unsigned>(GrColorUnpackG(c0) + GrColorUnpackG(c1), 0xff);
+    unsigned b = SkTMin<unsigned>(GrColorUnpackB(c0) + GrColorUnpackB(c1), 0xff);
+    unsigned a = SkTMin<unsigned>(GrColorUnpackA(c0) + GrColorUnpackA(c1), 0xff);
+    return GrColorPackRGBA(r, g, b, a);
+}
+
 /** Converts a GrColor to an rgba array of GrGLfloat */
 static inline void GrColorToRGBAFloat(GrColor color, float rgba[4]) {
     static const float ONE_OVER_255 = 1.f / 255.f;
@@ -88,6 +129,46 @@ static inline void GrColorToRGBAFloat(GrColor color, float rgba[4]) {
     rgba[3] = GrColorUnpackA(color) * ONE_OVER_255;
 }
 
+/** Normalizes and coverts an uint8_t to a float. [0, 255] -> [0.0, 1.0] */
+static inline float GrNormalizeByteToFloat(uint8_t value) {
+    static const float ONE_OVER_255 = 1.f / 255.f;
+    return value * ONE_OVER_255;
+}
+
+/** Determines whether the color is opaque or not. */
+static inline bool GrColorIsOpaque(GrColor color) {
+    return (color & (0xFFU << GrColor_SHIFT_A)) == (0xFFU << GrColor_SHIFT_A);
+}
+
+static inline GrColor GrPremulColor(GrColor color) {
+    unsigned r = GrColorUnpackR(color);
+    unsigned g = GrColorUnpackG(color);
+    unsigned b = GrColorUnpackB(color);
+    unsigned a = GrColorUnpackA(color);
+    return GrColorPackRGBA(SkMulDiv255Round(r, a),
+                           SkMulDiv255Round(g, a),
+                           SkMulDiv255Round(b, a),
+                           a);
+}
+
+/** Returns an unpremuled version of the GrColor. */
+static inline GrColor GrUnpremulColor(GrColor color) {
+    GrColorIsPMAssert(color);
+    unsigned r = GrColorUnpackR(color);
+    unsigned g = GrColorUnpackG(color); 
+    unsigned b = GrColorUnpackB(color);
+    unsigned a = GrColorUnpackA(color);
+    SkPMColor colorPM = SkPackARGB32(a, r, g, b);
+    SkColor colorUPM = SkUnPreMultiply::PMColorToColor(colorPM);
+
+    r = SkColorGetR(colorUPM);
+    g = SkColorGetG(colorUPM);
+    b = SkColorGetB(colorUPM);
+    a = SkColorGetA(colorUPM);
+
+    return GrColorPackRGBA(r, g, b, a);
+}
+
 /**
  * Flags used for bitfields of color components. They are defined so that the bit order reflects the
  * GrColor shift order.
@@ -98,6 +179,8 @@ enum GrColorComponentFlags {
     kB_GrColorComponentFlag = 1 << (GrColor_SHIFT_B / 8),
     kA_GrColorComponentFlag = 1 << (GrColor_SHIFT_A / 8),
 
+    kNone_GrColorComponentFlags = 0,
+
     kRGB_GrColorComponentFlags = (kR_GrColorComponentFlag | kG_GrColorComponentFlag |
                                   kB_GrColorComponentFlag),
 
@@ -105,6 +188,8 @@ enum GrColorComponentFlags {
                                    kB_GrColorComponentFlag | kA_GrColorComponentFlag)
 };
 
+GR_MAKE_BITFIELD_OPS(GrColorComponentFlags)
+
 static inline char GrColorComponentFlagToChar(GrColorComponentFlags component) {
     SkASSERT(SkIsPow2(component));
     switch (component) {
@@ -132,11 +217,14 @@ static inline uint32_t GrPixelConfigComponentMask(GrPixelConfig config) {
         kRGBA_GrColorComponentFlags,    // kRGBA_4444_GrPixelConfig
         kRGBA_GrColorComponentFlags,    // kRGBA_8888_GrPixelConfig
         kRGBA_GrColorComponentFlags,    // kBGRA_8888_GrPixelConfig
+        kRGBA_GrColorComponentFlags,    // kSRGBA_8888_GrPixelConfig
         kRGB_GrColorComponentFlags,     // kETC1_GrPixelConfig
         kA_GrColorComponentFlag,        // kLATC_GrPixelConfig
         kA_GrColorComponentFlag,        // kR11_EAC_GrPixelConfig
         kRGBA_GrColorComponentFlags,    // kASTC_12x12_GrPixelConfig
         kRGBA_GrColorComponentFlags,    // kRGBA_float_GrPixelConfig
+        kA_GrColorComponentFlag,        // kAlpha_16_GrPixelConfig
+        kRGBA_GrColorComponentFlags,    // kRGBA_half_GrPixelConfig
     };
     return kFlags[config];
 
@@ -147,11 +235,14 @@ static inline uint32_t GrPixelConfigComponentMask(GrPixelConfig config) {
     GR_STATIC_ASSERT(4  == kRGBA_4444_GrPixelConfig);
     GR_STATIC_ASSERT(5  == kRGBA_8888_GrPixelConfig);
     GR_STATIC_ASSERT(6  == kBGRA_8888_GrPixelConfig);
-    GR_STATIC_ASSERT(7  == kETC1_GrPixelConfig);
-    GR_STATIC_ASSERT(8  == kLATC_GrPixelConfig);
-    GR_STATIC_ASSERT(9  == kR11_EAC_GrPixelConfig);
-    GR_STATIC_ASSERT(10 == kASTC_12x12_GrPixelConfig);
-    GR_STATIC_ASSERT(11 == kRGBA_float_GrPixelConfig);
+    GR_STATIC_ASSERT(7  == kSRGBA_8888_GrPixelConfig);
+    GR_STATIC_ASSERT(8  == kETC1_GrPixelConfig);
+    GR_STATIC_ASSERT(9  == kLATC_GrPixelConfig);
+    GR_STATIC_ASSERT(10  == kR11_EAC_GrPixelConfig);
+    GR_STATIC_ASSERT(11 == kASTC_12x12_GrPixelConfig);
+    GR_STATIC_ASSERT(12 == kRGBA_float_GrPixelConfig);
+    GR_STATIC_ASSERT(13 == kAlpha_half_GrPixelConfig);
+    GR_STATIC_ASSERT(14 == kRGBA_half_GrPixelConfig);
     GR_STATIC_ASSERT(SK_ARRAY_COUNT(kFlags) == kGrPixelConfigCnt);
 }
 
diff --git a/gfx/skia/skia/include/gpu/GrConfig.h b/gfx/skia/skia/include/gpu/GrConfig.h
index 80897a07bd17..ffacb9391158 100644
--- a/gfx/skia/skia/include/gpu/GrConfig.h
+++ b/gfx/skia/skia/include/gpu/GrConfig.h
@@ -33,7 +33,19 @@
  */
 
 #if !defined(GR_CACHE_STATS)
-    #define GR_CACHE_STATS      0
+  #if defined(SK_DEVELOPER) || defined(SK_DUMP_STATS)
+      #define GR_CACHE_STATS  1
+  #else
+      #define GR_CACHE_STATS  0
+  #endif
+#endif
+
+#if !defined(GR_GPU_STATS)
+  #if defined(SK_DEVELOPER) || defined(SK_DUMP_STATS)
+      #define GR_GPU_STATS    1
+  #else
+      #define GR_GPU_STATS    0
+  #endif
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -64,34 +76,11 @@ typedef unsigned __int64 uint64_t;
 #include <stdint.h>
 #endif
 
-/*
- *  The "user config" file can be empty, and everything should work. It is
- *  meant to store a given platform/client's overrides of our guess-work.
- *
- *  A alternate user config file can be specified by defining
- *  GR_USER_CONFIG_FILE. It should be defined relative to GrConfig.h
- *
- *  e.g. it can change the BUILD target or supply its own defines for anything
- *  else (e.g. GR_DEFAULT_RESOURCE_CACHE_MB_LIMIT)
- */
-#if !defined(GR_USER_CONFIG_FILE)
-    #include "GrUserConfig.h"
-#else
-    #include GR_USER_CONFIG_FILE
-#endif
-
-
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 // postconfig section:
 //
 
-// By now we must have a GR_..._BUILD symbol set to 1, and a decision about
-// debug -vs- release
-//
-
-#define GrPrintf SkDebugf
-
 /**
  *  GR_STRING makes a string of X where X is expanded before conversion to a string
  *  if X itself contains macros.
@@ -155,7 +144,7 @@ typedef unsigned __int64 uint64_t;
     #define GR_ALWAYSASSERT(COND)                                        \
         do {                                                             \
             if (!(COND)) {                                               \
-                GrPrintf("%s %s failed\n", GR_FILE_AND_LINE_STR, #COND); \
+                SkDebugf("%s %s failed\n", GR_FILE_AND_LINE_STR, #COND); \
                 GR_ALWAYSBREAK;                                          \
             }                                                            \
         } while (false)
@@ -197,51 +186,11 @@ typedef unsigned __int64 uint64_t;
 #endif
 
 /**
- * GR_GEOM_BUFFER_MAP_THRESHOLD gives a threshold (in bytes) for when Gr should
- * map a GrGeometryBuffer to update its contents. It will use map() if the
- * size of the updated region is greater than the threshold. Otherwise it will
- * use updateData().
+ * GR_FORCE_GPU_TRACE_DEBUGGING will force gpu tracing/debug markers to be turned on. The trace
+ * markers will be printed out instead of making the backend calls to push and pop them.
  */
-#if !defined(GR_GEOM_BUFFER_MAP_THRESHOLD)
-    #define GR_GEOM_BUFFER_MAP_THRESHOLD (1 << 15)
-#endif
-
-/**
- * GR_DEFAULT_RESOURCE_CACHE_MB_LIMIT gives a threshold (in megabytes) for the
- * maximum size of the texture cache in vram. The value is only a default and
- * can be overridden at runtime.
- */
-#if !defined(GR_DEFAULT_RESOURCE_CACHE_MB_LIMIT)
-    #define GR_DEFAULT_RESOURCE_CACHE_MB_LIMIT 96
-#endif
-
-/**
- * GR_DEFAULT_RESOURCE_CACHE_COUNT_LIMIT specifies the maximum number of
- * textures the texture cache can hold in vram. The value is only a default and
- * can be overridden at runtime.
- */
-#if !defined(GR_DEFAULT_RESOURCE_CACHE_COUNT_LIMIT)
-    #define GR_DEFAULT_RESOURCE_CACHE_COUNT_LIMIT 2048
-#endif
-
-/**
- * GR_STROKE_PATH_RENDERING controls whether or not the GrStrokePathRenderer can be selected
- * as a path renderer. GrStrokePathRenderer is currently an experimental path renderer.
- */
-#if !defined(GR_STROKE_PATH_RENDERING)
-    #define GR_STROKE_PATH_RENDERING                 0
-#endif
-
-/**
- * GR_ALWAYS_ALLOCATE_ON_HEAP determines whether various temporary buffers created
- * in the GPU backend are always allocated on the heap or are allowed to be
- * allocated on the stack for smaller memory requests.
- *
- * This is only used for memory buffers that are created and then passed through to the
- * 3D API (e.g. as texture or geometry data)
- */
-#if !defined(GR_ALWAYS_ALLOCATE_ON_HEAP)
-    #define GR_ALWAYS_ALLOCATE_ON_HEAP 0
+#if !defined(GR_FORCE_GPU_TRACE_DEBUGGING)
+    #define GR_FORCE_GPU_TRACE_DEBUGGING 0
 #endif
 
 #endif
diff --git a/gfx/skia/skia/include/gpu/GrContext.h b/gfx/skia/skia/include/gpu/GrContext.h
index f533851ac3f3..70e7b9f2441c 100644
--- a/gfx/skia/skia/include/gpu/GrContext.h
+++ b/gfx/skia/skia/include/gpu/GrContext.h
@@ -8,52 +8,54 @@
 #ifndef GrContext_DEFINED
 #define GrContext_DEFINED
 
-#include "GrClipData.h"
+#include "GrCaps.h"
+#include "GrClip.h"
 #include "GrColor.h"
 #include "GrPaint.h"
-#include "GrPathRendererChain.h"
 #include "GrRenderTarget.h"
-#include "GrTexture.h"
+#include "GrTextureProvider.h"
 #include "SkMatrix.h"
+#include "../private/SkMutex.h"
 #include "SkPathEffect.h"
 #include "SkTypes.h"
 
-class GrAARectRenderer;
-class GrAutoScratchTexture;
-class GrDrawState;
+struct GrBatchAtlasConfig;
+class GrBatchFontCache;
+struct GrContextOptions;
+class GrDrawingManager;
+class GrDrawContext;
 class GrDrawTarget;
-class GrEffect;
-class GrFontCache;
+class GrFragmentProcessor;
 class GrGpu;
-class GrGpuTraceMarker;
 class GrIndexBuffer;
-class GrIndexBufferAllocPool;
-class GrInOrderDrawBuffer;
 class GrLayerCache;
 class GrOvalRenderer;
 class GrPath;
-class GrPathRenderer;
+class GrPipelineBuilder;
 class GrResourceEntry;
 class GrResourceCache;
-class GrStencilBuffer;
+class GrResourceProvider;
 class GrTestTarget;
+class GrTextBlobCache;
 class GrTextContext;
 class GrTextureParams;
 class GrVertexBuffer;
-class GrVertexBufferAllocPool;
 class GrStrokeInfo;
-class GrSoftwarePathRenderer;
-class SkStrokeRec;
+class SkTraceMemoryDump;
 
 class SK_API GrContext : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(GrContext)
-
     /**
      * Creates a GrContext for a backend context.
      */
+    static GrContext* Create(GrBackend, GrBackendContext, const GrContextOptions& options);
     static GrContext* Create(GrBackend, GrBackendContext);
 
+    /**
+     * Only defined in test apps.
+     */
+    static GrContext* CreateMockContext();
+
     virtual ~GrContext();
 
     /**
@@ -85,24 +87,20 @@ public:
     }
 
     /**
-     * Abandons all GPU resources, assumes 3D API state is unknown. Call this
-     * if you have lost the associated GPU context, and thus internal texture,
-     * buffer, etc. references/IDs are now invalid. Should be called even when
-     * GrContext is no longer going to be used for two reasons:
+     * Abandons all GPU resources and assumes the underlying backend 3D API
+     * context is not longer usable. Call this if you have lost the associated
+     * GPU context, and thus internal texture, buffer, etc. references/IDs are
+     * now invalid. Should be called even when GrContext is no longer going to
+     * be used for two reasons:
      *  1) ~GrContext will not try to free the objects in the 3D API.
-     *  2) If you've created GrGpuResources that outlive the GrContext they
-     *     will be marked as invalid (GrGpuResource::isValid()) and won't
-     *     attempt to free their underlying resource in the 3D API.
-     * Content drawn since the last GrContext::flush() may be lost.
+     *  2) Any GrGpuResources created by this GrContext that outlive
+     *     will be marked as invalid (GrGpuResource::wasDestroyed()) and
+     *     when they're destroyed no 3D API calls will be made.
+     * Content drawn since the last GrContext::flush() may be lost. After this
+     * function is called the only valid action on the GrContext or
+     * GrGpuResources it created is to destroy them.
      */
-    void contextLost();
-
-    /**
-     * Similar to contextLost, but makes no attempt to reset state.
-     * Use this method when GrContext destruction is pending, but
-     * the graphics context is destroyed first.
-     */
-    void contextDestroyed();
+    void abandonContext();
 
     ///////////////////////////////////////////////////////////////////////////
     // Resource Cache
@@ -116,10 +114,6 @@ public:
      *                          video memory that can be held in the cache.
      */
     void getResourceCacheLimits(int* maxResources, size_t* maxResourceBytes) const;
-    SK_ATTR_DEPRECATED("This function has been renamed to getResourceCacheLimits().")
-    void getTextureCacheLimits(int* maxTextures, size_t* maxTextureBytes) const {
-        this->getResourceCacheLimits(maxTextures, maxTextureBytes);
-    }
 
     /**
      *  Gets the current GPU resource cache usage.
@@ -131,20 +125,6 @@ public:
      */
     void getResourceCacheUsage(int* resourceCount, size_t* resourceBytes) const;
 
-    SK_ATTR_DEPRECATED("Use getResourceCacheUsage().")
-    size_t getGpuTextureCacheBytes() const {
-        size_t bytes;
-        this->getResourceCacheUsage(NULL, &bytes);
-        return bytes;
-    }
-
-    SK_ATTR_DEPRECATED("Use getResourceCacheUsage().")
-    int getGpuTextureCacheResourceCount() const {
-        int count;
-        this->getResourceCacheUsage(&count, NULL);
-        return count;
-    }
-
     /**
      *  Specify the GPU resource cache limits. If the current cache exceeds either
      *  of these, it will be purged (LRU) to keep the cache within these limits.
@@ -155,10 +135,9 @@ public:
      *                          that can be held in the cache.
      */
     void setResourceCacheLimits(int maxResources, size_t maxResourceBytes);
-    SK_ATTR_DEPRECATED("This function has been renamed to setResourceCacheLimits().")
-    void setTextureCacheLimits(int maxTextures, size_t maxTextureBytes) {
-        this->setResourceCacheLimits(maxTextures, maxTextureBytes);
-    }
+
+    GrTextureProvider* textureProvider() { return fTextureProvider; }
+    const GrTextureProvider* textureProvider() const { return fTextureProvider; }
 
     /**
      * Frees GPU created by the context. Can be called to reduce GPU memory
@@ -166,15 +145,6 @@ public:
      */
     void freeGpuResources();
 
-    /**
-     * This method should be called whenever a GrResource is unreffed or
-     * switched from exclusive to non-exclusive. This
-     * gives the resource cache a chance to discard unneeded resources.
-     * Note: this entry point will be removed once totally ref-driven
-     * cache maintenance is implemented.
-     */
-    void purgeCache();
-
     /**
      * Purge all the unlocked resources from the cache.
      * This entry point is mainly meant for timing texture uploads
@@ -182,183 +152,8 @@ public:
      */
     void purgeAllUnlockedResources();
 
-    /**
-     * Stores a custom resource in the cache, based on the specified key.
-     */
-    void addResourceToCache(const GrResourceKey&, GrGpuResource*);
-
-    /**
-     * Finds a resource in the cache, based on the specified key. This is intended for use in
-     * conjunction with addResourceToCache(). The return value will be NULL if not found. The
-     * caller must balance with a call to unref().
-     */
-    GrGpuResource* findAndRefCachedResource(const GrResourceKey&);
-
-    /**
-     * Creates a new text rendering context that is optimal for the
-     * render target and the context. Caller assumes the ownership
-     * of the returned object. The returned object must be deleted
-     * before the context is destroyed.
-     */
-    GrTextContext* createTextContext(GrRenderTarget*,
-                                     const SkDeviceProperties&,
-                                     bool enableDistanceFieldFonts);
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Textures
-
-    /**
-     * Creates a new entry, based on the specified key and texture and returns it. The caller owns a
-     * ref on the returned texture which must be balanced by a call to unref.
-     *
-     * @param params    The texture params used to draw a texture may help determine
-     *                  the cache entry used. (e.g. different versions may exist
-     *                  for different wrap modes on GPUs with limited NPOT
-     *                  texture support). NULL implies clamp wrap modes.
-     * @param desc      Description of the texture properties.
-     * @param cacheID   Cache-specific properties (e.g., texture gen ID)
-     * @param srcData   Pointer to the pixel values.
-     * @param rowBytes  The number of bytes between rows of the texture. Zero
-     *                  implies tightly packed rows. For compressed pixel configs, this
-     *                  field is ignored.
-     * @param cacheKey  (optional) If non-NULL, we'll write the cache key we used to cacheKey.
-     */
-    GrTexture* createTexture(const GrTextureParams* params,
-                             const GrTextureDesc& desc,
-                             const GrCacheID& cacheID,
-                             const void* srcData,
-                             size_t rowBytes,
-                             GrResourceKey* cacheKey = NULL);
-    /**
-     * Search for an entry based on key and dimensions. If found, ref it and return it. The return
-     * value will be NULL if not found. The caller must balance with a call to unref.
-     *
-     *  @param desc     Description of the texture properties.
-     *  @param cacheID Cache-specific properties (e.g., texture gen ID)
-     *  @param params   The texture params used to draw a texture may help determine
-     *                  the cache entry used. (e.g. different versions may exist
-     *                  for different wrap modes on GPUs with limited NPOT
-     *                  texture support). NULL implies clamp wrap modes.
-     */
-    GrTexture* findAndRefTexture(const GrTextureDesc& desc,
-                                 const GrCacheID& cacheID,
-                                 const GrTextureParams* params);
-    /**
-     * Determines whether a texture is in the cache. If the texture is found it
-     * will not be locked or returned. This call does not affect the priority of
-     * the texture for deletion.
-     */
-    bool isTextureInCache(const GrTextureDesc& desc,
-                          const GrCacheID& cacheID,
-                          const GrTextureParams* params) const;
-
-    /**
-     * Enum that determines how closely a returned scratch texture must match
-     * a provided GrTextureDesc.
-     */
-    enum ScratchTexMatch {
-        /**
-         * Finds a texture that exactly matches the descriptor.
-         */
-        kExact_ScratchTexMatch,
-        /**
-         * Finds a texture that approximately matches the descriptor. Will be
-         * at least as large in width and height as desc specifies. If desc
-         * specifies that texture is a render target then result will be a
-         * render target. If desc specifies a render target and doesn't set the
-         * no stencil flag then result will have a stencil. Format and aa level
-         * will always match.
-         */
-        kApprox_ScratchTexMatch
-    };
-
-    /**
-     * Returns a texture matching the desc. It's contents are unknown. Subsequent
-     * requests with the same descriptor are not guaranteed to return the same
-     * texture. The same texture is guaranteed not be returned again until it is
-     * unlocked. Call must be balanced with an unlockTexture() call. The caller
-     * owns a ref on the returned texture and must balance with a call to unref.
-     *
-     * Textures created by createAndLockTexture() hide the complications of
-     * tiling non-power-of-two textures on APIs that don't support this (e.g.
-     * unextended GLES2). Tiling a NPOT texture created by lockScratchTexture on
-     * such an API will create gaps in the tiling pattern. This includes clamp
-     * mode. (This may be addressed in a future update.)
-     */
-    GrTexture* lockAndRefScratchTexture(const GrTextureDesc&, ScratchTexMatch match);
-
-    /**
-     *  When done with an entry, call unlockScratchTexture(entry) on it, which returns
-     *  it to the cache, where it may be purged. This does not unref the texture.
-     */
-    void unlockScratchTexture(GrTexture* texture);
-
-    /**
-     * Creates a texture that is outside the cache. Does not count against
-     * cache's budget.
-     */
-    GrTexture* createUncachedTexture(const GrTextureDesc& desc,
-                                     void* srcData,
-                                     size_t rowBytes);
-
-    /**
-     * Returns true if the specified use of an indexed texture is supported.
-     * Support may depend upon whether the texture params indicate that the
-     * texture will be tiled. Passing NULL for the texture params indicates
-     * clamp mode.
-     */
-    bool supportsIndex8PixelConfig(const GrTextureParams*,
-                                   int width,
-                                   int height) const;
-
-    /**
-     *  Return the max width or height of a texture supported by the current GPU.
-     */
-    int getMaxTextureSize() const;
-
-    /**
-     *  Temporarily override the true max texture size. Note: an override
-     *  larger then the true max texture size will have no effect.
-     *  This entry point is mainly meant for testing texture size dependent
-     *  features and is only available if defined outside of Skia (see
-     *  bleed GM.
-     */
-    void setMaxTextureSizeOverride(int maxTextureSizeOverride);
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Render targets
-
-    /**
-     * Sets the render target.
-     * @param target    the render target to set.
-     */
-    void setRenderTarget(GrRenderTarget* target) {
-        fRenderTarget.reset(SkSafeRef(target));
-    }
-
-    /**
-     * Gets the current render target.
-     * @return the currently bound render target.
-     */
-    const GrRenderTarget* getRenderTarget() const { return fRenderTarget.get(); }
-    GrRenderTarget* getRenderTarget() { return fRenderTarget.get(); }
-
-    /**
-     * Can the provided configuration act as a color render target?
-     */
-    bool isConfigRenderable(GrPixelConfig config, bool withMSAA) const;
-
-    /**
-     * Return the max width or height of a render target supported by the
-     * current GPU.
-     */
-    int getMaxRenderTargetSize() const;
-
-    /**
-     * Returns the max sample count for a render target. It will be 0 if MSAA
-     * is not supported.
-     */
-    int getMaxSampleCount() const;
+    /** Access the context capabilities */
+    const GrCaps* caps() const { return fCaps; }
 
     /**
      * Returns the recommended sample count for a render target when using this
@@ -373,201 +168,17 @@ public:
      */
     int getRecommendedSampleCount(GrPixelConfig config, SkScalar dpi) const;
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Backend Surfaces
-
     /**
-     * Wraps an existing texture with a GrTexture object.
+     * Returns a helper object to orchestrate draws.
+     * Callers assume the creation ref of the drawContext
+     * NULL will be returned if the context has been abandoned.
      *
-     * OpenGL: if the object is a texture Gr may change its GL texture params
-     *         when it is drawn.
+     * @param  rt           the render target receiving the draws
+     * @param  surfaceProps the surface properties (mainly defines text drawing)
      *
-     * @param  desc     description of the object to create.
-     *
-     * @return GrTexture object or NULL on failure.
+     * @return a draw context
      */
-    GrTexture* wrapBackendTexture(const GrBackendTextureDesc& desc);
-
-    /**
-     * Wraps an existing render target with a GrRenderTarget object. It is
-     * similar to wrapBackendTexture but can be used to draw into surfaces
-     * that are not also textures (e.g. FBO 0 in OpenGL, or an MSAA buffer that
-     * the client will resolve to a texture).
-     *
-     * @param  desc     description of the object to create.
-     *
-     * @return GrTexture object or NULL on failure.
-     */
-     GrRenderTarget* wrapBackendRenderTarget(const GrBackendRenderTargetDesc& desc);
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Matrix state
-
-    /**
-     * Gets the current transformation matrix.
-     * @return the current matrix.
-     */
-    const SkMatrix& getMatrix() const { return fViewMatrix; }
-
-    /**
-     * Sets the transformation matrix.
-     * @param m the matrix to set.
-     */
-    void setMatrix(const SkMatrix& m) { fViewMatrix = m; }
-
-    /**
-     * Sets the current transformation matrix to identity.
-     */
-    void setIdentityMatrix() { fViewMatrix.reset(); }
-
-    /**
-     * Concats the current matrix. The passed matrix is applied before the
-     * current matrix.
-     * @param m the matrix to concat.
-     */
-    void concatMatrix(const SkMatrix& m) { fViewMatrix.preConcat(m); }
-
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Clip state
-    /**
-     * Gets the current clip.
-     * @return the current clip.
-     */
-    const GrClipData* getClip() const { return fClip; }
-
-    /**
-     * Sets the clip.
-     * @param clipData  the clip to set.
-     */
-    void setClip(const GrClipData* clipData) { fClip = clipData; }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Draws
-
-    /**
-     * Clear the entire or rect of the render target, ignoring any clips.
-     * @param rect  the rect to clear or the whole thing if rect is NULL.
-     * @param color the color to clear to.
-     * @param canIgnoreRect allows partial clears to be converted to whole
-     *                      clears on platforms for which that is cheap
-     * @param target if non-NULL, the render target to clear otherwise clear
-     *               the current render target
-     */
-    void clear(const SkIRect* rect, GrColor color, bool canIgnoreRect,
-               GrRenderTarget* target = NULL);
-
-    /**
-     *  Draw everywhere (respecting the clip) with the paint.
-     */
-    void drawPaint(const GrPaint& paint);
-
-    /**
-     *  Draw the rect using a paint.
-     *  @param paint        describes how to color pixels.
-     *  @param strokeInfo   the stroke information (width, join, cap), and.
-     *                      the dash information (intervals, count, phase).
-     *                      If strokeInfo == NULL, then the rect is filled.
-     *                      Otherwise, if stroke width == 0, then the stroke
-     *                      is always a single pixel thick, else the rect is
-     *                      mitered/beveled stroked based on stroke width.
-     *                      If the stroke is dashed the rect is sent to drawPath.
-     *  @param matrix       Optional matrix applied to the rect. Applied before
-     *                      context's matrix or the paint's matrix.
-     *  The rects coords are used to access the paint (through texture matrix)
-     */
-    void drawRect(const GrPaint& paint,
-                  const SkRect&,
-                  const GrStrokeInfo* strokeInfo = NULL,
-                  const SkMatrix* matrix = NULL);
-
-    /**
-     * Maps a rect of local coordinates onto the a rect of destination
-     * coordinates. Each rect can optionally be transformed. The localRect
-     * is stretched over the dstRect. The dstRect is transformed by the
-     * context's matrix. Additional optional matrices for both rects can be
-     * provided by parameters.
-     *
-     * @param paint         describes how to color pixels.
-     * @param dstRect       the destination rect to draw.
-     * @param localRect     rect of local coordinates to be mapped onto dstRect
-     * @param dstMatrix     Optional matrix to transform dstRect. Applied before context's matrix.
-     * @param localMatrix   Optional matrix to transform localRect.
-     */
-    void drawRectToRect(const GrPaint& paint,
-                        const SkRect& dstRect,
-                        const SkRect& localRect,
-                        const SkMatrix* dstMatrix = NULL,
-                        const SkMatrix* localMatrix = NULL);
-
-    /**
-     *  Draw a roundrect using a paint.
-     *
-     *  @param paint        describes how to color pixels.
-     *  @param rrect        the roundrect to draw
-     *  @param strokeInfo   the stroke information (width, join, cap) and
-     *                      the dash information (intervals, count, phase).
-     */
-    void drawRRect(const GrPaint& paint, const SkRRect& rrect, const GrStrokeInfo& strokeInfo);
-
-    /**
-     *  Shortcut for drawing an SkPath consisting of nested rrects using a paint.
-     *  Does not support stroking. The result is undefined if outer does not contain
-     *  inner.
-     *
-     *  @param paint        describes how to color pixels.
-     *  @param outer        the outer roundrect
-     *  @param inner        the inner roundrect
-     */
-    void drawDRRect(const GrPaint& paint, const SkRRect& outer, const SkRRect& inner);
-
-
-    /**
-     * Draws a path.
-     *
-     * @param paint         describes how to color pixels.
-     * @param path          the path to draw
-     * @param strokeInfo    the stroke information (width, join, cap) and
-     *                      the dash information (intervals, count, phase).
-     */
-    void drawPath(const GrPaint& paint, const SkPath& path, const GrStrokeInfo& strokeInfo);
-
-    /**
-     * Draws vertices with a paint.
-     *
-     * @param   paint           describes how to color pixels.
-     * @param   primitiveType   primitives type to draw.
-     * @param   vertexCount     number of vertices.
-     * @param   positions       array of vertex positions, required.
-     * @param   texCoords       optional array of texture coordinates used
-     *                          to access the paint.
-     * @param   colors          optional array of per-vertex colors, supercedes
-     *                          the paint's color field.
-     * @param   indices         optional array of indices. If NULL vertices
-     *                          are drawn non-indexed.
-     * @param   indexCount      if indices is non-null then this is the
-     *                          number of indices.
-     */
-    void drawVertices(const GrPaint& paint,
-                      GrPrimitiveType primitiveType,
-                      int vertexCount,
-                      const SkPoint positions[],
-                      const SkPoint texs[],
-                      const GrColor colors[],
-                      const uint16_t indices[],
-                      int indexCount);
-
-    /**
-     * Draws an oval.
-     *
-     * @param paint         describes how to color pixels.
-     * @param oval          the bounding rect of the oval.
-     * @param strokeInfo    the stroke information (width, join, cap) and
-     *                      the dash information (intervals, count, phase).
-     */
-    void drawOval(const GrPaint& paint,
-                  const SkRect& oval,
-                  const GrStrokeInfo& strokeInfo);
+    GrDrawContext* drawContext(GrRenderTarget* rt, const SkSurfaceProps* surfaceProps = NULL);
 
     ///////////////////////////////////////////////////////////////////////////
     // Misc.
@@ -593,21 +204,30 @@ public:
      */
     void flush(int flagsBitfield = 0);
 
+    void flushIfNecessary() {
+        if (fFlushToReduceCacheSize || this->caps()->immediateFlush()) {
+            this->flush();
+        }
+    }
+
    /**
     * These flags can be used with the read/write pixels functions below.
     */
     enum PixelOpsFlags {
-        /** The GrContext will not be flushed. This means that the read or write may occur before
-            previous draws have executed. */
+        /** The GrContext will not be flushed before the surface read or write. This means that
+            the read or write may occur before previous draws have executed. */
         kDontFlush_PixelOpsFlag = 0x1,
+        /** Any surface writes should be flushed to the backend 3D API after the surface operation
+            is complete */
+        kFlushWrites_PixelOp = 0x2,
         /** The src for write or dst read is unpremultiplied. This is only respected if both the
             config src and dst configs are an RGBA/BGRA 8888 format. */
-        kUnpremul_PixelOpsFlag  = 0x2,
+        kUnpremul_PixelOpsFlag  = 0x4,
     };
 
     /**
-     * Reads a rectangle of pixels from a render target.
-     * @param target        the render target to read from. NULL means the current render target.
+     * Reads a rectangle of pixels from a surface.
+     * @param surface       the surface to read from.
      * @param left          left edge of the rectangle to read (inclusive)
      * @param top           top edge of the rectangle to read (inclusive)
      * @param width         width of rectangle to read in pixels.
@@ -619,63 +239,17 @@ public:
      * @param pixelOpsFlags see PixelOpsFlags enum above.
      *
      * @return true if the read succeeded, false if not. The read can fail because of an unsupported
-     *         pixel config or because no render target is currently set and NULL was passed for
-     *         target.
+     *         pixel configs
      */
-    bool readRenderTargetPixels(GrRenderTarget* target,
-                                int left, int top, int width, int height,
-                                GrPixelConfig config, void* buffer,
-                                size_t rowBytes = 0,
-                                uint32_t pixelOpsFlags = 0);
-
-    /**
-     * Copy the src pixels [buffer, row bytes, pixel config] into a render target at the specified
-     * rectangle.
-     * @param target        the render target to write into. NULL means the current render target.
-     * @param left          left edge of the rectangle to write (inclusive)
-     * @param top           top edge of the rectangle to write (inclusive)
-     * @param width         width of rectangle to write in pixels.
-     * @param height        height of rectangle to write in pixels.
-     * @param config        the pixel config of the source buffer
-     * @param buffer        memory to read the rectangle from.
-     * @param rowBytes      number of bytes between consecutive rows. Zero means rows are tightly
-     *                      packed.
-     * @param pixelOpsFlags see PixelOpsFlags enum above.
-     *
-     * @return true if the write succeeded, false if not. The write can fail because of an
-     *         unsupported combination of target and pixel configs.
-     */
-    bool writeRenderTargetPixels(GrRenderTarget* target,
-                                 int left, int top, int width, int height,
-                                 GrPixelConfig config, const void* buffer,
-                                 size_t rowBytes = 0,
-                                 uint32_t pixelOpsFlags = 0);
-
-    /**
-     * Reads a rectangle of pixels from a texture.
-     * @param texture       the texture to read from.
-     * @param left          left edge of the rectangle to read (inclusive)
-     * @param top           top edge of the rectangle to read (inclusive)
-     * @param width         width of rectangle to read in pixels.
-     * @param height        height of rectangle to read in pixels.
-     * @param config        the pixel config of the destination buffer
-     * @param buffer        memory to read the rectangle into.
-     * @param rowBytes      number of bytes between consecutive rows. Zero means rows are tightly
-     *                      packed.
-     * @param pixelOpsFlags see PixelOpsFlags enum above.
-     *
-     * @return true if the read succeeded, false if not. The read can fail because of an unsupported
-     *         pixel config.
-     */
-    bool readTexturePixels(GrTexture* texture,
+    bool readSurfacePixels(GrSurface* surface,
                            int left, int top, int width, int height,
                            GrPixelConfig config, void* buffer,
                            size_t rowBytes = 0,
                            uint32_t pixelOpsFlags = 0);
 
     /**
-     * Writes a rectangle of pixels to a texture.
-     * @param texture       the render target to read from.
+     * Writes a rectangle of pixels to a surface.
+     * @param surface       the surface to write to.
      * @param left          left edge of the rectangle to write (inclusive)
      * @param top           top edge of the rectangle to write (inclusive)
      * @param width         width of rectangle to write in pixels.
@@ -686,312 +260,136 @@ public:
      *                      means rows are tightly packed.
      * @param pixelOpsFlags see PixelOpsFlags enum above.
      * @return true if the write succeeded, false if not. The write can fail because of an
-     *         unsupported combination of texture and pixel configs.
+     *         unsupported combination of surface and src configs.
      */
-    bool writeTexturePixels(GrTexture* texture,
+    bool writeSurfacePixels(GrSurface* surface,
                             int left, int top, int width, int height,
                             GrPixelConfig config, const void* buffer,
                             size_t rowBytes,
                             uint32_t pixelOpsFlags = 0);
 
     /**
-     * Copies a rectangle of texels from src to dst. The size of dst is the size of the rectangle
-     * copied and topLeft is the position of the rect in src. The rectangle is clipped to src's
+     * Copies a rectangle of texels from src to dst.
      * bounds.
-     * @param src           the texture to copy from.
-     * @param dst           the render target to copy to.
-     * @param topLeft       the point in src that will be copied to the top-left of dst. If NULL,
-     *                      (0, 0) will be used.
+     * @param dst           the surface to copy to.
+     * @param src           the surface to copy from.
+     * @param srcRect       the rectangle of the src that should be copied.
+     * @param dstPoint      the translation applied when writing the srcRect's pixels to the dst.
+     * @param pixelOpsFlags see PixelOpsFlags enum above. (kUnpremul_PixelOpsFlag is not allowed).
      */
-    void copyTexture(GrTexture* src, GrRenderTarget* dst, const SkIPoint* topLeft = NULL);
+    void copySurface(GrSurface* dst,
+                     GrSurface* src,
+                     const SkIRect& srcRect,
+                     const SkIPoint& dstPoint,
+                     uint32_t pixelOpsFlags = 0);
+
+    /** Helper that copies the whole surface but fails when the two surfaces are not identically
+        sized. */
+    bool copySurface(GrSurface* dst, GrSurface* src) {
+        if (NULL == dst || NULL == src || dst->width() != src->width() ||
+            dst->height() != src->height()) {
+            return false;
+        }
+        this->copySurface(dst, src, SkIRect::MakeWH(dst->width(), dst->height()),
+                          SkIPoint::Make(0,0));
+        return true;
+    }
 
     /**
-     * Resolves a render target that has MSAA. The intermediate MSAA buffer is
-     * down-sampled to the associated GrTexture (accessible via
-     * GrRenderTarget::asTexture()). Any pending draws to the render target will
-     * be executed before the resolve.
-     *
-     * This is only necessary when a client wants to access the object directly
-     * using the backend API directly. GrContext will detect when it must
-     * perform a resolve to a GrTexture used as the source of a draw or before
-     * reading pixels back from a GrTexture or GrRenderTarget.
+     * After this returns any pending writes to the surface will have been issued to the backend 3D API.
      */
-    void resolveRenderTarget(GrRenderTarget*);
+    void flushSurfaceWrites(GrSurface* surface);
 
     /**
-     * Provides a perfomance hint that the render target's contents are allowed
-     * to become undefined.
+     * Finalizes all pending reads and writes to the surface and also performs an MSAA resolve
+     * if necessary.
+     *
+     * It is not necessary to call this before reading the render target via Skia/GrContext.
+     * GrContext will detect when it must perform a resolve before reading pixels back from the
+     * surface or using it as a texture.
      */
-    void discardRenderTarget(GrRenderTarget*);
-
-#ifdef SK_DEVELOPER
-    void dumpFontCache() const;
-#endif
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Helpers
-
-    class AutoRenderTarget : public ::SkNoncopyable {
-    public:
-        AutoRenderTarget(GrContext* context, GrRenderTarget* target) {
-            fPrevTarget = context->getRenderTarget();
-            SkSafeRef(fPrevTarget);
-            context->setRenderTarget(target);
-            fContext = context;
-        }
-        AutoRenderTarget(GrContext* context) {
-            fPrevTarget = context->getRenderTarget();
-            SkSafeRef(fPrevTarget);
-            fContext = context;
-        }
-        ~AutoRenderTarget() {
-            if (NULL != fContext) {
-                fContext->setRenderTarget(fPrevTarget);
-            }
-            SkSafeUnref(fPrevTarget);
-        }
-    private:
-        GrContext*      fContext;
-        GrRenderTarget* fPrevTarget;
-    };
+    void prepareSurfaceForExternalIO(GrSurface*);
 
     /**
-     * Save/restore the view-matrix in the context. It can optionally adjust a paint to account
-     * for a coordinate system change. Here is an example of how the paint param can be used:
-     *
-     * A GrPaint is setup with GrEffects. The stages will have access to the pre-matrix source
-     * geometry positions when the draw is executed. Later on a decision is made to transform the
-     * geometry to device space on the CPU. The effects now need to know that the space in which
-     * the geometry will be specified has changed.
-     *
-     * Note that when restore is called (or in the destructor) the context's matrix will be
-     * restored. However, the paint will not be restored. The caller must make a copy of the
-     * paint if necessary. Hint: use SkTCopyOnFirstWrite if the AutoMatrix is conditionally
-     * initialized.
+     * An ID associated with this context, guaranteed to be unique.
      */
-    class AutoMatrix : public ::SkNoncopyable {
-    public:
-        AutoMatrix() : fContext(NULL) {}
-
-        ~AutoMatrix() { this->restore(); }
-
-        /**
-         * Initializes by pre-concat'ing the context's current matrix with the preConcat param.
-         */
-        void setPreConcat(GrContext* context, const SkMatrix& preConcat, GrPaint* paint = NULL) {
-            SkASSERT(NULL != context);
-
-            this->restore();
-
-            fContext = context;
-            fMatrix = context->getMatrix();
-            this->preConcat(preConcat, paint);
-        }
-
-        /**
-         * Sets the context's matrix to identity. Returns false if the inverse matrix is required to
-         * update a paint but the matrix cannot be inverted.
-         */
-        bool setIdentity(GrContext* context, GrPaint* paint = NULL) {
-            SkASSERT(NULL != context);
-
-            this->restore();
-
-            if (NULL != paint) {
-                if (!paint->localCoordChangeInverse(context->getMatrix())) {
-                    return false;
-                }
-            }
-            fMatrix = context->getMatrix();
-            fContext = context;
-            context->setIdentityMatrix();
-            return true;
-        }
-
-        /**
-         * Replaces the context's matrix with a new matrix. Returns false if the inverse matrix is
-         * required to update a paint but the matrix cannot be inverted.
-         */
-        bool set(GrContext* context, const SkMatrix& newMatrix, GrPaint* paint = NULL) {
-            if (NULL != paint) {
-                if (!this->setIdentity(context, paint)) {
-                    return false;
-                }
-                this->preConcat(newMatrix, paint);
-            } else {
-                this->restore();
-                fContext = context;
-                fMatrix = context->getMatrix();
-                context->setMatrix(newMatrix);
-            }
-            return true;
-        }
-
-        /**
-         * If this has been initialized then the context's matrix will be further updated by
-         * pre-concat'ing the preConcat param. The matrix that will be restored remains unchanged.
-         * The paint is assumed to be relative to the context's matrix at the time this call is
-         * made, not the matrix at the time AutoMatrix was first initialized. In other words, this
-         * performs an incremental update of the paint.
-         */
-        void preConcat(const SkMatrix& preConcat, GrPaint* paint = NULL) {
-            if (NULL != paint) {
-                paint->localCoordChange(preConcat);
-            }
-            fContext->concatMatrix(preConcat);
-        }
-
-        /**
-         * Returns false if never initialized or the inverse matrix was required to update a paint
-         * but the matrix could not be inverted.
-         */
-        bool succeeded() const { return NULL != fContext; }
-
-        /**
-         * If this has been initialized then the context's original matrix is restored.
-         */
-        void restore() {
-            if (NULL != fContext) {
-                fContext->setMatrix(fMatrix);
-                fContext = NULL;
-            }
-        }
-
-    private:
-        GrContext*  fContext;
-        SkMatrix    fMatrix;
-    };
-
-    class AutoClip : public ::SkNoncopyable {
-    public:
-        // This enum exists to require a caller of the constructor to acknowledge that the clip will
-        // initially be wide open. It also could be extended if there are other desirable initial
-        // clip states.
-        enum InitialClip {
-            kWideOpen_InitialClip,
-        };
-
-        AutoClip(GrContext* context, InitialClip initialState)
-        : fContext(context) {
-            SkASSERT(kWideOpen_InitialClip == initialState);
-            fNewClipData.fClipStack = &fNewClipStack;
-
-            fOldClip = context->getClip();
-            context->setClip(&fNewClipData);
-        }
-
-        AutoClip(GrContext* context, const SkRect& newClipRect)
-        : fContext(context)
-        , fNewClipStack(newClipRect) {
-            fNewClipData.fClipStack = &fNewClipStack;
-
-            fOldClip = fContext->getClip();
-            fContext->setClip(&fNewClipData);
-        }
-
-        ~AutoClip() {
-            if (NULL != fContext) {
-                fContext->setClip(fOldClip);
-            }
-        }
-    private:
-        GrContext*        fContext;
-        const GrClipData* fOldClip;
-
-        SkClipStack       fNewClipStack;
-        GrClipData        fNewClipData;
-    };
-
-    class AutoWideOpenIdentityDraw {
-    public:
-        AutoWideOpenIdentityDraw(GrContext* ctx, GrRenderTarget* rt)
-            : fAutoClip(ctx, AutoClip::kWideOpen_InitialClip)
-            , fAutoRT(ctx, rt) {
-            fAutoMatrix.setIdentity(ctx);
-            // should never fail with no paint param.
-            SkASSERT(fAutoMatrix.succeeded());
-        }
-
-    private:
-        AutoClip fAutoClip;
-        AutoRenderTarget fAutoRT;
-        AutoMatrix fAutoMatrix;
-    };
+    uint32_t uniqueID() { return fUniqueID; }
 
     ///////////////////////////////////////////////////////////////////////////
     // Functions intended for internal use only.
     GrGpu* getGpu() { return fGpu; }
     const GrGpu* getGpu() const { return fGpu; }
-    GrFontCache* getFontCache() { return fFontCache; }
+    GrBatchFontCache* getBatchFontCache() { return fBatchFontCache; }
     GrLayerCache* getLayerCache() { return fLayerCache.get(); }
-    GrDrawTarget* getTextTarget();
-    const GrIndexBuffer* getQuadIndexBuffer() const;
-    GrAARectRenderer* getAARectRenderer() { return fAARectRenderer; }
+    GrTextBlobCache* getTextBlobCache() { return fTextBlobCache; }
+    bool abandoned() const;
+    GrResourceProvider* resourceProvider() { return fResourceProvider; }
+    const GrResourceProvider* resourceProvider() const { return fResourceProvider; }
+    GrResourceCache* getResourceCache() { return fResourceCache; }
 
     // Called by tests that draw directly to the context via GrDrawTarget
-    void getTestTarget(GrTestTarget*);
+    void getTestTarget(GrTestTarget*, GrRenderTarget* rt);
 
-    // Functions for managing gpu trace markers
-    bool isGpuTracingEnabled() const { return fGpuTracingEnabled; }
-    void enableGpuTracing() { fGpuTracingEnabled = true; }
-    void disableGpuTracing() { fGpuTracingEnabled = false; }
+    /** Reset GPU stats */
+    void resetGpuStats() const ;
 
-    void addGpuTraceMarker(const GrGpuTraceMarker* marker);
-    void removeGpuTraceMarker(const GrGpuTraceMarker* marker);
-
-    /**
-     * Stencil buffers add themselves to the cache using addStencilBuffer. findStencilBuffer is
-     * called to check the cache for a SB that matches an RT's criteria.
-     */
-    void addStencilBuffer(GrStencilBuffer* sb);
-    GrStencilBuffer* findStencilBuffer(int width, int height, int sampleCnt);
-
-    GrPathRenderer* getPathRenderer(
-                    const SkPath& path,
-                    const SkStrokeRec& stroke,
-                    const GrDrawTarget* target,
-                    bool allowSW,
-                    GrPathRendererChain::DrawType drawType = GrPathRendererChain::kColor_DrawType,
-                    GrPathRendererChain::StencilSupport* stencilSupport = NULL);
-
-#if GR_CACHE_STATS
+    /** Prints cache stats to the string if GR_CACHE_STATS == 1. */
+    void dumpCacheStats(SkString*) const;
+    void dumpCacheStatsKeyValuePairs(SkTArray<SkString>* keys, SkTArray<double>* values) const;
     void printCacheStats() const;
-#endif
+
+    /** Prints GPU stats to the string if GR_GPU_STATS == 1. */
+    void dumpGpuStats(SkString*) const;
+    void dumpGpuStatsKeyValuePairs(SkTArray<SkString>* keys, SkTArray<double>* values) const;
+    void printGpuStats() const;
+
+    /** Specify the TextBlob cache limit. If the current cache exceeds this limit it will purge.
+        this is for testing only */
+    void setTextBlobCacheLimit_ForTesting(size_t bytes);
+
+    /** Specify the sizes of the GrAtlasTextContext atlases.  The configs pointer below should be
+        to an array of 3 entries */
+    void setTextContextAtlasSizes_ForTesting(const GrBatchAtlasConfig* configs);
+
+    /** Enumerates all cached GPU resources and dumps their memory to traceMemoryDump. */
+    void dumpMemoryStatistics(SkTraceMemoryDump* traceMemoryDump) const;
+
+    /** Draw font cache texture to render target */
+    void drawFontCache(const SkRect& rect, GrMaskFormat format, const SkPaint& paint,
+                       GrRenderTarget* target);
 
 private:
-    // Used to indicate whether a draw should be performed immediately or queued in fDrawBuffer.
-    enum BufferedDraw {
-        kYes_BufferedDraw,
-        kNo_BufferedDraw,
-    };
-    BufferedDraw fLastDrawWasBuffered;
-
     GrGpu*                          fGpu;
-    SkMatrix                        fViewMatrix;
-    SkAutoTUnref<GrRenderTarget>    fRenderTarget;
-    const GrClipData*               fClip;  // TODO: make this ref counted
-    GrDrawState*                    fDrawState;
-
+    const GrCaps*                   fCaps;
     GrResourceCache*                fResourceCache;
-    GrFontCache*                    fFontCache;
+    // this union exists because the inheritance of GrTextureProvider->GrResourceProvider
+    // is in a private header.
+    union {
+        GrResourceProvider*         fResourceProvider;
+        GrTextureProvider*          fTextureProvider;
+    };
+
+    GrBatchFontCache*               fBatchFontCache;
     SkAutoTDelete<GrLayerCache>     fLayerCache;
-
-    GrPathRendererChain*            fPathRendererChain;
-    GrSoftwarePathRenderer*         fSoftwarePathRenderer;
-
-    GrVertexBufferAllocPool*        fDrawBufferVBAllocPool;
-    GrIndexBufferAllocPool*         fDrawBufferIBAllocPool;
-    GrInOrderDrawBuffer*            fDrawBuffer;
+    SkAutoTDelete<GrTextBlobCache>  fTextBlobCache;
 
     // Set by OverbudgetCB() to request that GrContext flush before exiting a draw.
     bool                            fFlushToReduceCacheSize;
-
-    GrAARectRenderer*               fAARectRenderer;
-    GrOvalRenderer*                 fOvalRenderer;
-
     bool                            fDidTestPMConversions;
     int                             fPMToUPMConversion;
     int                             fUPMToPMConversion;
+    // The sw backend may call GrContext::readSurfacePixels on multiple threads
+    // We may transfer the responsibilty for using a mutex to the sw backend
+    // when there are fewer code paths that lead to a readSurfacePixels call
+    // from the sw backend. readSurfacePixels is reentrant in one case - when performing
+    // the PM conversions test. To handle this we do the PM conversions test outside
+    // of fReadPixelsMutex and use a separate mutex to guard it. When it re-enters
+    // readSurfacePixels it will grab fReadPixelsMutex and release it before the outer
+    // readSurfacePixels proceeds to grab it.
+    // TODO: Stop pretending to make GrContext thread-safe for sw rasterization and provide
+    // a mechanism to make a SkPicture safe for multithreaded sw rasterization.
+    SkMutex                         fReadPixelsMutex;
+    SkMutex                         fTestPMConversionsMutex;
 
     struct CleanUpData {
         PFCleanUpFunc fFunc;
@@ -1000,154 +398,51 @@ private:
 
     SkTDArray<CleanUpData>          fCleanUpData;
 
-    int                             fMaxTextureSizeOverride;
+    const uint32_t                  fUniqueID;
 
-    bool                            fGpuTracingEnabled;
+    SkAutoTDelete<GrDrawingManager> fDrawingManager;
+
+    // TODO: have the CMM use drawContexts and rm this friending
+    friend class GrClipMaskManager; // the CMM is friended just so it can call 'drawingManager'
+    friend class GrDrawingManager;  // for access to drawingManager for ProgramUnitTest
+    GrDrawingManager* drawingManager() { return fDrawingManager; }
 
     GrContext(); // init must be called after the constructor.
-    bool init(GrBackend, GrBackendContext);
+    bool init(GrBackend, GrBackendContext, const GrContextOptions& options);
 
-    void setupDrawBuffer();
-
-    class AutoRestoreEffects;
-    class AutoCheckFlush;
-    /// Sets the paint and returns the target to draw into. The paint can be NULL in which case the
-    /// draw state is left unmodified.
-    GrDrawTarget* prepareToDraw(const GrPaint*, BufferedDraw, AutoRestoreEffects*, AutoCheckFlush*);
-
-    void internalDrawPath(GrDrawTarget* target, bool useAA, const SkPath& path,
-                          const GrStrokeInfo& stroke);
-
-    GrTexture* createResizedTexture(const GrTextureDesc& desc,
-                                    const GrCacheID& cacheID,
-                                    const void* srcData,
-                                    size_t rowBytes,
-                                    bool filter);
-
-    // Needed so GrTexture's returnToCache helper function can call
-    // addExistingTextureToCache
-    friend class GrTexture;
-    friend class GrStencilAndCoverPathRenderer;
-    friend class GrStencilAndCoverTextContext;
-
-    // Add an existing texture to the texture cache. This is intended solely
-    // for use with textures released from an GrAutoScratchTexture.
-    void addExistingTextureToCache(GrTexture* texture);
+    void initMockContext();
+    void initCommon(const GrContextOptions&);
 
     /**
      * These functions create premul <-> unpremul effects if it is possible to generate a pair
      * of effects that make a readToUPM->writeToPM->readToUPM cycle invariant. Otherwise, they
      * return NULL.
      */
-    const GrEffect* createPMToUPMEffect(GrTexture* texture,
-                                        bool swapRAndB,
-                                        const SkMatrix& matrix);
-    const GrEffect* createUPMToPMEffect(GrTexture* texture,
-                                        bool swapRAndB,
-                                        const SkMatrix& matrix);
+    const GrFragmentProcessor* createPMToUPMEffect(GrTexture*, bool swapRAndB,
+                                                   const SkMatrix&) const;
+    const GrFragmentProcessor* createUPMToPMEffect(GrTexture*, bool swapRAndB,
+                                                   const SkMatrix&) const;
+    /** Called before either of the above two functions to determine the appropriate fragment
+        processors for conversions. This must be called by readSurfacePixels before a mutex is
+        taken, since testingvPM conversions itself will call readSurfacePixels */
+    void testPMConversionsIfNecessary(uint32_t flags);
+    /** Returns true if we've already determined that createPMtoUPMEffect and createUPMToPMEffect
+        will fail. In such cases fall back to SW conversion. */
+    bool didFailPMUPMConversionTest() const;
 
     /**
      *  This callback allows the resource cache to callback into the GrContext
-     *  when the cache is still overbudget after a purge.
+     *  when the cache is still over budget after a purge.
      */
-    static bool OverbudgetCB(void* data);
+    static void OverBudgetCB(void* data);
 
-    /** Creates a new gpu path, based on the specified path and stroke and returns it.
-     * The caller owns a ref on the returned path which must be balanced by a call to unref.
-     *
-     * @param skPath the path geometry.
-     * @param stroke the path stroke.
-     * @return a new path or NULL if the operation is not supported by the backend.
+    /**
+     * A callback similar to the above for use by the TextBlobCache
+     * TODO move textblob draw calls below context so we can use the call above.
      */
-    GrPath* createPath(const SkPath& skPath, const SkStrokeRec& stroke);
+    static void TextBlobCacheOverBudgetCB(void* data);
 
     typedef SkRefCnt INHERITED;
 };
 
-/**
- * Gets and locks a scratch texture from a descriptor using either exact or approximate criteria.
- * Unlocks texture in the destructor.
- */
-class GrAutoScratchTexture : public ::SkNoncopyable {
-public:
-    GrAutoScratchTexture()
-        : fContext(NULL)
-        , fTexture(NULL) {
-    }
-
-    GrAutoScratchTexture(GrContext* context,
-                         const GrTextureDesc& desc,
-                         GrContext::ScratchTexMatch match = GrContext::kApprox_ScratchTexMatch)
-      : fContext(NULL)
-      , fTexture(NULL) {
-      this->set(context, desc, match);
-    }
-
-    ~GrAutoScratchTexture() {
-        this->reset();
-    }
-
-    void reset() {
-        if (NULL != fContext && NULL != fTexture) {
-            fContext->unlockScratchTexture(fTexture);
-            fTexture->unref();
-            fTexture = NULL;
-        }
-    }
-
-    /*
-     * When detaching a texture we do not unlock it in the texture cache but
-     * we do set the returnToCache flag. In this way the texture remains
-     * "locked" in the texture cache until it is freed and recycled in
-     * GrTexture::internal_dispose. In reality, the texture has been removed
-     * from the cache (because this is in AutoScratchTexture) and by not
-     * calling unlockScratchTexture we simply don't re-add it. It will be
-     * reattached in GrTexture::internal_dispose.
-     *
-     * Note that the caller is assumed to accept and manage the ref to the
-     * returned texture.
-     */
-    GrTexture* detach() {
-        if (NULL == fTexture) {
-            return NULL;
-        }
-        GrTexture* texture = fTexture;
-        fTexture = NULL;
-
-        // This GrAutoScratchTexture has a ref from lockAndRefScratchTexture, which we give up now.
-        // The cache also has a ref which we are lending to the caller of detach(). When the caller
-        // lets go of the ref and the ref count goes to 0 internal_dispose will see this flag is
-        // set and re-ref the texture, thereby restoring the cache's ref.
-        SkASSERT(!texture->unique());
-        texture->impl()->setFlag((GrTextureFlags) GrTextureImpl::kReturnToCache_FlagBit);
-        texture->unref();
-        SkASSERT(NULL != texture->getCacheEntry());
-
-        return texture;
-    }
-
-    GrTexture* set(GrContext* context,
-                   const GrTextureDesc& desc,
-                   GrContext::ScratchTexMatch match = GrContext::kApprox_ScratchTexMatch) {
-        this->reset();
-
-        fContext = context;
-        if (NULL != fContext) {
-            fTexture = fContext->lockAndRefScratchTexture(desc, match);
-            if (NULL == fTexture) {
-                fContext = NULL;
-            }
-            return fTexture;
-        } else {
-            return NULL;
-        }
-    }
-
-    GrTexture* texture() { return fTexture; }
-
-private:
-    GrContext*                    fContext;
-    GrTexture*                    fTexture;
-};
-
 #endif
diff --git a/gfx/skia/skia/include/gpu/GrContextFactory.h b/gfx/skia/skia/include/gpu/GrContextFactory.h
deleted file mode 100644
index 1f1f89df14d1..000000000000
--- a/gfx/skia/skia/include/gpu/GrContextFactory.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrContextFactory_DEFINED
-#define GrContextFactory_DEFINED
-
-#if SK_ANGLE
-    #include "gl/SkANGLEGLContext.h"
-#endif
-#include "gl/SkDebugGLContext.h"
-#if SK_MESA
-    #include "gl/SkMesaGLContext.h"
-#endif
-#include "gl/SkNativeGLContext.h"
-#include "gl/SkNullGLContext.h"
-
-#include "GrContext.h"
-#include "SkTArray.h"
-
-/**
- * This is a simple class that is useful in test apps that use different
- * GrContexts backed by different types of GL contexts. It manages creating the
- * GL context and a GrContext that uses it. The GL/Gr contexts persist until the
- * factory is destroyed (though the caller can always grab a ref on the returned
- * Gr and GL contexts to make them outlive the factory).
- */
-class GrContextFactory : SkNoncopyable {
-public:
-    /**
-     * Types of GL contexts supported. For historical and testing reasons the native GrContext will
-     * not use "GL_NV_path_rendering" even when the driver supports it. There is a separate context
-     * type that does not remove NVPR support and which will fail when the driver does not support
-     * the extension.
-     */
-    enum GLContextType {
-      kNative_GLContextType,
-#if SK_ANGLE
-      kANGLE_GLContextType,
-#endif
-#if SK_MESA
-      kMESA_GLContextType,
-#endif
-      /** Similar to kNative but does not filter NVPR. It will fail if the GL driver does not
-          support NVPR */
-      kNVPR_GLContextType,
-      kNull_GLContextType,
-      kDebug_GLContextType,
-
-      kLastGLContextType = kDebug_GLContextType
-    };
-
-    static const int kGLContextTypeCnt = kLastGLContextType + 1;
-
-    static bool IsRenderingGLContext(GLContextType type) {
-        switch (type) {
-            case kNull_GLContextType:
-            case kDebug_GLContextType:
-                return false;
-            default:
-                return true;
-        }
-    }
-
-    static const char* GLContextTypeName(GLContextType type) {
-        switch (type) {
-            case kNative_GLContextType:
-                return "native";
-            case kNull_GLContextType:
-                return "null";
-#if SK_ANGLE
-            case kANGLE_GLContextType:
-                return "angle";
-#endif
-#if SK_MESA
-            case kMESA_GLContextType:
-                return "mesa";
-#endif
-            case kNVPR_GLContextType:
-                return "nvpr";
-            case kDebug_GLContextType:
-                return "debug";
-            default:
-                SkFAIL("Unknown GL Context type.");
-        }
-    }
-
-    GrContextFactory() { }
-
-    ~GrContextFactory() { this->destroyContexts(); }
-
-    void destroyContexts() {
-        for (int i = 0; i < fContexts.count(); ++i) {
-            fContexts[i].fGLContext->makeCurrent();
-            fContexts[i].fGrContext->unref();
-            fContexts[i].fGLContext->unref();
-        }
-        fContexts.reset();
-    }
-
-    /**
-     * Get a GrContext initialized with a type of GL context. It also makes the GL context current.
-     */
-    GrContext* get(GLContextType type, GrGLStandard forcedGpuAPI = kNone_GrGLStandard) {
-        for (int i = 0; i < fContexts.count(); ++i) {
-            if (forcedGpuAPI != kNone_GrGLStandard &&
-                forcedGpuAPI != fContexts[i].fGLContext->gl()->fStandard)
-                continue;
-
-            if (fContexts[i].fType == type) {
-                fContexts[i].fGLContext->makeCurrent();
-                return fContexts[i].fGrContext;
-            }
-        }
-        SkAutoTUnref<SkGLContextHelper> glCtx;
-        SkAutoTUnref<GrContext> grCtx;
-        switch (type) {
-            case kNVPR_GLContextType: // fallthru
-            case kNative_GLContextType:
-                glCtx.reset(SkNEW(SkNativeGLContext));
-                break;
-#ifdef SK_ANGLE
-            case kANGLE_GLContextType:
-                glCtx.reset(SkNEW(SkANGLEGLContext));
-                break;
-#endif
-#ifdef SK_MESA
-            case kMESA_GLContextType:
-                glCtx.reset(SkNEW(SkMesaGLContext));
-                break;
-#endif
-            case kNull_GLContextType:
-                glCtx.reset(SkNEW(SkNullGLContext));
-                break;
-            case kDebug_GLContextType:
-                glCtx.reset(SkNEW(SkDebugGLContext));
-                break;
-        }
-        static const int kBogusSize = 1;
-        if (!glCtx.get()) {
-            return NULL;
-        }
-        if (!glCtx.get()->init(forcedGpuAPI, kBogusSize, kBogusSize)) {
-            return NULL;
-        }
-
-        // Ensure NVPR is available for the NVPR type and block it from other types.
-        SkAutoTUnref<const GrGLInterface> glInterface(SkRef(glCtx.get()->gl()));
-        if (kNVPR_GLContextType == type) {
-            if (!glInterface->hasExtension("GL_NV_path_rendering")) {
-                return NULL;
-            }
-        } else {
-            glInterface.reset(GrGLInterfaceRemoveNVPR(glInterface));
-            if (!glInterface) {
-                return NULL;
-            }
-        }
-
-        glCtx->makeCurrent();
-        GrBackendContext p3dctx = reinterpret_cast<GrBackendContext>(glInterface.get());
-        grCtx.reset(GrContext::Create(kOpenGL_GrBackend, p3dctx));
-        if (!grCtx.get()) {
-            return NULL;
-        }
-        GPUContext& ctx = fContexts.push_back();
-        ctx.fGLContext = glCtx.get();
-        ctx.fGLContext->ref();
-        ctx.fGrContext = grCtx.get();
-        ctx.fGrContext->ref();
-        ctx.fType = type;
-        return ctx.fGrContext;
-    }
-
-    // Returns the GLContext of the given type. If it has not been created yet,
-    // NULL is returned instead.
-    SkGLContextHelper* getGLContext(GLContextType type) {
-        for (int i = 0; i < fContexts.count(); ++i) {
-            if (fContexts[i].fType == type) {
-                return fContexts[i].fGLContext;
-            }
-        }
-
-        return NULL;
-    }
-
-private:
-    struct GPUContext {
-        GLContextType             fType;
-        SkGLContextHelper*        fGLContext;
-        GrContext*                fGrContext;
-    };
-    SkTArray<GPUContext, true> fContexts;
-};
-
-#endif
diff --git a/gfx/skia/skia/include/gpu/GrContextOptions.h b/gfx/skia/skia/include/gpu/GrContextOptions.h
new file mode 100644
index 000000000000..52173eb7a0a0
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/GrContextOptions.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrContextOptions_DEFINED
+#define GrContextOptions_DEFINED
+
+#include "SkTypes.h"
+
+struct GrContextOptions {
+    GrContextOptions()
+        : fDrawPathToCompressedTexture(false)
+        , fSuppressPrints(false)
+        , fMaxTextureSizeOverride(SK_MaxS32)
+        , fMaxTileSizeOverride(0)
+        , fSuppressDualSourceBlending(false)
+        , fGeometryBufferMapThreshold(-1)
+        , fUseDrawInsteadOfPartialRenderTargetWrite(false)
+        , fImmediateMode(false)
+        , fClipBatchToBounds(false)
+        , fUseShaderSwizzling(false) {}
+
+    // EXPERIMENTAL
+    // May be removed in the future, or may become standard depending
+    // on the outcomes of a variety of internal tests.
+    bool fDrawPathToCompressedTexture;
+
+    // Suppress prints for the GrContext.
+    bool fSuppressPrints;
+
+    /** Overrides: These options override feature detection using backend API queries. These
+        overrides can only reduce the feature set or limits, never increase them beyond the
+        detected values. */
+
+    int  fMaxTextureSizeOverride;
+    /** If non-zero, overrides the maximum size of a tile for sw-backed images and bitmaps rendered
+        by SkGpuDevice. */
+    int  fMaxTileSizeOverride;
+    bool fSuppressDualSourceBlending;
+
+    /** the threshold in bytes above which we will use a buffer mapping API to map vertex and index
+        buffers to CPU memory in order to update them.  A value of -1 means the GrContext should
+        deduce the optimal value for this platform. */
+    int  fGeometryBufferMapThreshold;
+
+    /** some gpus have problems with partial writes of the rendertarget */
+    bool fUseDrawInsteadOfPartialRenderTargetWrite;
+
+    /** The GrContext operates in immediate mode. It will issue all draws to the backend API
+        immediately. Intended to ease debugging. */
+    bool fImmediateMode;
+
+    /** For debugging purposes turn each GrBatch's bounds into a clip rect. This is used to
+        verify that the clip bounds are conservative. */
+    bool fClipBatchToBounds;
+
+    /** Force us to do all swizzling manually in the shader and don't rely on extensions to do
+        swizzling. */
+    bool fUseShaderSwizzling;
+};
+
+#endif
diff --git a/gfx/skia/skia/include/gpu/GrCoordTransform.h b/gfx/skia/skia/include/gpu/GrCoordTransform.h
index f266577ec62b..4d96cd9c979f 100644
--- a/gfx/skia/skia/include/gpu/GrCoordTransform.h
+++ b/gfx/skia/skia/include/gpu/GrCoordTransform.h
@@ -8,77 +8,92 @@
 #ifndef GrCoordTransform_DEFINED
 #define GrCoordTransform_DEFINED
 
-#include "GrEffect.h"
+#include "GrProcessor.h"
 #include "SkMatrix.h"
 #include "GrTexture.h"
 #include "GrTypes.h"
+#include "GrShaderVar.h"
 
 /**
- * Coordinates available to GrEffect subclasses for requesting transformations. Transformed
+ * Coordinates available to GrProcessor subclasses for requesting transformations. Transformed
  * coordinates are made available in the the portion of fragment shader emitted by the effect.
+ *
+ * The precision of the shader var that interpolates the transformed coordinates can be specified.
  */
 enum GrCoordSet {
     /**
-     * The user-space coordinates that map to the fragment being rendered. These coords account for
-     * any change of coordinate system done on the CPU by GrContext before rendering, and also are
-     * correct for draws that take explicit local coords rather than inferring them from the
-     * primitive's positions (e.g. drawVertices). These are usually the coords a GrEffect wants.
+     * The user-space coordinates that map to the fragment being rendered. This is the space in
+     * which SkShader operates. It is usually the space in which geometry passed to SkCanvas is
+     * specified (before the view matrix is applied). However, some draw calls take explicit local
+     * coords that map onto the geometry (e.g. drawVertices, drawBitmapRectToRect).
      */
     kLocal_GrCoordSet,
 
     /**
-     * The actual vertex position. Note that GrContext may not draw using the original view matrix
-     * specified by the caller, as it may have transformed vertices into another space. These are
-     * usually not the coordinates a GrEffect wants.
+     * The device space position of the fragment being shaded.
      */
-    kPosition_GrCoordSet
+    kDevice_GrCoordSet,
 };
 
 /**
  * A class representing a linear transformation from one of the built-in coordinate sets (local or
- * position). GrEffects just define these transformations, and the framework does the rest of the
+ * position). GrProcessors just define these transformations, and the framework does the rest of the
  * work to make the transformed coordinates available in their fragment shader.
  */
 class GrCoordTransform : SkNoncopyable {
 public:
-    GrCoordTransform() { SkDEBUGCODE(fInEffect = false); }
+    GrCoordTransform() : fSourceCoords(kLocal_GrCoordSet) { SkDEBUGCODE(fInProcessor = false); }
 
     /**
-     * Create a transformation that maps [0, 1] to a texture's boundaries.
+     * Create a transformation that maps [0, 1] to a texture's boundaries. The precision is inferred
+     * from the texture size and filter. The texture origin also implies whether a y-reversal should
+     * be performed.
      */
-    GrCoordTransform(GrCoordSet sourceCoords, const GrTexture* texture) {
-        SkDEBUGCODE(fInEffect = false);
-        this->reset(sourceCoords, texture);
+    GrCoordTransform(GrCoordSet sourceCoords,
+                     const GrTexture* texture,
+                     GrTextureParams::FilterMode filter) {
+        SkASSERT(texture);
+        SkDEBUGCODE(fInProcessor = false);
+        this->reset(sourceCoords, texture, filter);
     }
 
     /**
-     * Create a transformation from a matrix. The optional texture parameter is used to infer if the
-     * framework should internally do a y reversal to account for it being upside down by Skia's
-     * coord convention.
+     * Create a transformation from a matrix. The precision is inferred from the texture size and
+     * filter. The texture origin also implies whether a y-reversal should be performed.
      */
-    GrCoordTransform(GrCoordSet sourceCoords, const SkMatrix& m, const GrTexture* texture = NULL) {
-        SkDEBUGCODE(fInEffect = false);
-        this->reset(sourceCoords, m, texture);
+    GrCoordTransform(GrCoordSet sourceCoords, const SkMatrix& m,
+                     const GrTexture* texture, GrTextureParams::FilterMode filter) {
+        SkDEBUGCODE(fInProcessor = false);
+        SkASSERT(texture);
+        this->reset(sourceCoords, m, texture, filter);
     }
 
-    void reset(GrCoordSet sourceCoords, const GrTexture* texture) {
-        SkASSERT(!fInEffect);
-        SkASSERT(NULL != texture);
-        this->reset(sourceCoords, GrEffect::MakeDivByTextureWHMatrix(texture), texture);
+    /**
+     * Create a transformation that applies the matrix to a coord set.
+     */
+    GrCoordTransform(GrCoordSet sourceCoords, const SkMatrix& m,
+                     GrSLPrecision precision = kDefault_GrSLPrecision) {
+        SkDEBUGCODE(fInProcessor = false);
+        this->reset(sourceCoords, m, precision);
     }
 
-    void reset(GrCoordSet sourceCoords, const SkMatrix& m, const GrTexture* texture = NULL) {
-        SkASSERT(!fInEffect);
-        fSourceCoords = sourceCoords;
-        fMatrix = m;
-        fReverseY = NULL != texture && kBottomLeft_GrSurfaceOrigin == texture->origin();
+    void reset(GrCoordSet sourceCoords, const GrTexture* texture,
+               GrTextureParams::FilterMode filter) {
+        SkASSERT(!fInProcessor);
+        SkASSERT(texture);
+        this->reset(sourceCoords, MakeDivByTextureWHMatrix(texture), texture, filter);
     }
 
-    GrCoordTransform& operator= (const GrCoordTransform& other) {
-        SkASSERT(!fInEffect);
-        fSourceCoords = other.fSourceCoords;
-        fMatrix = other.fMatrix;
-        fReverseY = other.fReverseY;
+    void reset(GrCoordSet, const SkMatrix&, const GrTexture*, GrTextureParams::FilterMode filter);
+    void reset(GrCoordSet sourceCoords, const SkMatrix& m,
+               GrSLPrecision precision = kDefault_GrSLPrecision);
+
+    GrCoordTransform& operator= (const GrCoordTransform& that) {
+        SkASSERT(!fInProcessor);
+        fSourceCoords = that.fSourceCoords;
+        fMatrix = that.fMatrix;
+        fReverseY = that.fReverseY;
+        fPrecision = that.fPrecision;
         return *this;
     }
 
@@ -87,32 +102,45 @@ public:
      * effect, since effects are immutable.
      */
     SkMatrix* accessMatrix() {
-        SkASSERT(!fInEffect);
+        SkASSERT(!fInProcessor);
         return &fMatrix;
     }
 
-    bool operator== (const GrCoordTransform& other) const {
-        return fSourceCoords == other.fSourceCoords &&
-               fMatrix.cheapEqualTo(other.fMatrix) &&
-               fReverseY == other.fReverseY;
+    bool operator==(const GrCoordTransform& that) const {
+        return fSourceCoords == that.fSourceCoords &&
+               fMatrix.cheapEqualTo(that.fMatrix) &&
+               fReverseY == that.fReverseY &&
+               fPrecision == that.fPrecision;
     }
 
+    bool operator!=(const GrCoordTransform& that) const { return !(*this == that); }
+
     GrCoordSet sourceCoords() const { return fSourceCoords; }
     const SkMatrix& getMatrix() const { return fMatrix; }
     bool reverseY() const { return fReverseY; }
+    GrSLPrecision precision() const { return fPrecision; }
+
+    /** Useful for effects that want to insert a texture matrix that is implied by the texture
+        dimensions */
+    static inline SkMatrix MakeDivByTextureWHMatrix(const GrTexture* texture) {
+        SkASSERT(texture);
+        SkMatrix mat;
+        (void)mat.setIDiv(texture->width(), texture->height());
+        return mat;
+    }
 
 private:
-    GrCoordSet fSourceCoords;
-    SkMatrix   fMatrix;
-    bool       fReverseY;
-
+    GrCoordSet              fSourceCoords;
+    SkMatrix                fMatrix;
+    bool                    fReverseY;
+    GrSLPrecision           fPrecision;
     typedef SkNoncopyable INHERITED;
 
 #ifdef SK_DEBUG
 public:
-    void setInEffect() const { fInEffect = true; }
+    void setInProcessor() const { fInProcessor = true; }
 private:
-    mutable bool fInEffect;
+    mutable bool fInProcessor;
 #endif
 };
 
diff --git a/gfx/skia/skia/include/gpu/GrDrawContext.h b/gfx/skia/skia/include/gpu/GrDrawContext.h
new file mode 100644
index 000000000000..82cf362d5799
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/GrDrawContext.h
@@ -0,0 +1,313 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrDrawContext_DEFINED
+#define GrDrawContext_DEFINED
+
+#include "GrColor.h"
+#include "GrRenderTarget.h"
+#include "SkRefCnt.h"
+#include "SkSurfaceProps.h"
+
+class GrClip;
+class GrContext;
+class GrDrawBatch;
+class GrDrawingManager;
+class GrDrawTarget;
+class GrPaint;
+class GrPathProcessor;
+class GrPathRange;
+class GrPathRangeDraw;
+class GrPipelineBuilder;
+class GrRenderTarget;
+class GrStrokeInfo;
+class GrSurface;
+class GrTextContext;
+class SkDrawFilter;
+struct SkIPoint;
+struct SkIRect;
+class SkMatrix;
+class SkPaint;
+class SkPath;
+struct SkPoint;
+struct SkRect;
+class SkRRect;
+struct SkRSXform;
+class SkTextBlob;
+
+/*
+ * A helper object to orchestrate draws
+ */
+class SK_API GrDrawContext : public SkRefCnt {
+public:
+    ~GrDrawContext() override;
+
+    void copySurface(GrSurface* src, const SkIRect& srcRect, const SkIPoint& dstPoint);
+
+    // TODO: it is odd that we need both the SkPaint in the following 3 methods.
+    // We should extract the text parameters from SkPaint and pass them separately
+    // akin to GrStrokeInfo (GrTextInfo?)
+    void drawText(const GrClip&,  const GrPaint&, const SkPaint&,
+                  const SkMatrix& viewMatrix, const char text[], size_t byteLength,
+                  SkScalar x, SkScalar y, const SkIRect& clipBounds);
+    void drawPosText(const GrClip&, const GrPaint&, const SkPaint&,
+                     const SkMatrix& viewMatrix, const char text[], size_t byteLength,
+                     const SkScalar pos[], int scalarsPerPosition,
+                     const SkPoint& offset, const SkIRect& clipBounds);
+    void drawTextBlob(const GrClip&, const SkPaint&,
+                      const SkMatrix& viewMatrix, const SkTextBlob*,
+                      SkScalar x, SkScalar y,
+                      SkDrawFilter*, const SkIRect& clipBounds);
+
+    // drawPathsFromRange is thanks to GrStencilAndCoverTextContext
+    // TODO: remove once path batches can be created external to GrDrawTarget.
+    void drawPathsFromRange(const GrPipelineBuilder*,
+                            const SkMatrix& viewMatrix,
+                            const SkMatrix& localMatrix,
+                            GrColor color,
+                            GrPathRange* range,
+                            GrPathRangeDraw* draw,
+                            int /*GrPathRendering::FillType*/ fill,
+                            const SkRect& bounds);
+
+    /**
+     * Provides a perfomance hint that the render target's contents are allowed
+     * to become undefined.
+     */
+    void discard();
+
+    /**
+     * Clear the entire or rect of the render target, ignoring any clips.
+     * @param rect  the rect to clear or the whole thing if rect is NULL.
+     * @param color the color to clear to.
+     * @param canIgnoreRect allows partial clears to be converted to whole
+     *                      clears on platforms for which that is cheap
+     */
+    void clear(const SkIRect* rect, GrColor color, bool canIgnoreRect);
+
+    /**
+     *  Draw everywhere (respecting the clip) with the paint.
+     */
+    void drawPaint(const GrClip&, const GrPaint&, const SkMatrix& viewMatrix);
+
+    /**
+     *  Draw the rect using a paint.
+     *  @param paint        describes how to color pixels.
+     *  @param viewMatrix   transformation matrix
+     *  @param strokeInfo   the stroke information (width, join, cap), and.
+     *                      the dash information (intervals, count, phase).
+     *                      If strokeInfo == NULL, then the rect is filled.
+     *                      Otherwise, if stroke width == 0, then the stroke
+     *                      is always a single pixel thick, else the rect is
+     *                      mitered/beveled stroked based on stroke width.
+     *  The rects coords are used to access the paint (through texture matrix)
+     */
+    void drawRect(const GrClip&,
+                  const GrPaint& paint,
+                  const SkMatrix& viewMatrix,
+                  const SkRect&,
+                  const GrStrokeInfo* strokeInfo = NULL);
+
+    /**
+     * Maps a rectangle of shader coordinates to a rectangle and fills that rectangle.
+     *
+     * @param paint         describes how to color pixels.
+     * @param viewMatrix    transformation matrix which applies to rectToDraw
+     * @param rectToDraw    the rectangle to draw
+     * @param localRect     the rectangle of shader coordinates applied to rectToDraw
+     */
+    void fillRectToRect(const GrClip&,
+                        const GrPaint& paint,
+                        const SkMatrix& viewMatrix,
+                        const SkRect& rectToDraw,
+                        const SkRect& localRect);
+
+    /**
+     * Fills a rect with a paint and a localMatrix.
+     */
+    void fillRectWithLocalMatrix(const GrClip& clip,
+                                 const GrPaint& paint,
+                                 const SkMatrix& viewMatrix,
+                                 const SkRect& rect,
+                                 const SkMatrix& localMatrix);
+
+    /**
+     *  Draw a roundrect using a paint.
+     *
+     *  @param paint        describes how to color pixels.
+     *  @param viewMatrix   transformation matrix
+     *  @param rrect        the roundrect to draw
+     *  @param strokeInfo   the stroke information (width, join, cap) and
+     *                      the dash information (intervals, count, phase).
+     */
+    void drawRRect(const GrClip&,
+                   const GrPaint&,
+                   const SkMatrix& viewMatrix,
+                   const SkRRect& rrect,
+                   const GrStrokeInfo&);
+
+    /**
+     *  Shortcut for drawing an SkPath consisting of nested rrects using a paint.
+     *  Does not support stroking. The result is undefined if outer does not contain
+     *  inner.
+     *
+     *  @param paint        describes how to color pixels.
+     *  @param viewMatrix   transformation matrix
+     *  @param outer        the outer roundrect
+     *  @param inner        the inner roundrect
+     */
+    void drawDRRect(const GrClip&,
+                    const GrPaint&,
+                    const SkMatrix& viewMatrix,
+                    const SkRRect& outer,
+                    const SkRRect& inner);
+
+
+    /**
+     * Draws a path.
+     *
+     * @param paint         describes how to color pixels.
+     * @param viewMatrix    transformation matrix
+     * @param path          the path to draw
+     * @param strokeInfo    the stroke information (width, join, cap) and
+     *                      the dash information (intervals, count, phase).
+     */
+    void drawPath(const GrClip&,
+                  const GrPaint&,
+                  const SkMatrix& viewMatrix,
+                  const SkPath&,
+                  const GrStrokeInfo&);
+
+    /**
+     * Draws vertices with a paint.
+     *
+     * @param   paint           describes how to color pixels.
+     * @param   viewMatrix      transformation matrix
+     * @param   primitiveType   primitives type to draw.
+     * @param   vertexCount     number of vertices.
+     * @param   positions       array of vertex positions, required.
+     * @param   texCoords       optional array of texture coordinates used
+     *                          to access the paint.
+     * @param   colors          optional array of per-vertex colors, supercedes
+     *                          the paint's color field.
+     * @param   indices         optional array of indices. If NULL vertices
+     *                          are drawn non-indexed.
+     * @param   indexCount      if indices is non-null then this is the
+     *                          number of indices.
+     */
+    void drawVertices(const GrClip&,
+                      const GrPaint& paint,
+                      const SkMatrix& viewMatrix,
+                      GrPrimitiveType primitiveType,
+                      int vertexCount,
+                      const SkPoint positions[],
+                      const SkPoint texs[],
+                      const GrColor colors[],
+                      const uint16_t indices[],
+                      int indexCount);
+
+    /**
+     * Draws textured sprites from an atlas with a paint.
+     *
+     * @param   paint           describes how to color pixels.
+     * @param   viewMatrix      transformation matrix
+     * @param   spriteCount     number of sprites.
+     * @param   xform           array of compressed transformation data, required.
+     * @param   texRect         array of texture rectangles used to access the paint.
+     * @param   colors          optional array of per-sprite colors, supercedes
+     *                          the paint's color field.
+     */
+    void drawAtlas(const GrClip&,
+                   const GrPaint& paint,
+                   const SkMatrix& viewMatrix,
+                   int spriteCount,
+                   const SkRSXform xform[],
+                   const SkRect texRect[],
+                   const SkColor colors[]);
+    
+    /**
+     * Draws an oval.
+     *
+     * @param paint         describes how to color pixels.
+     * @param viewMatrix    transformation matrix
+     * @param oval          the bounding rect of the oval.
+     * @param strokeInfo    the stroke information (width, join, cap) and
+     *                      the dash information (intervals, count, phase).
+     */
+    void drawOval(const GrClip&,
+                  const GrPaint& paint,
+                  const SkMatrix& viewMatrix,
+                  const SkRect& oval,
+                  const GrStrokeInfo& strokeInfo);
+
+    /**
+     *  Draw the image stretched differentially to fit into dst.
+     *  center is a rect within the image, and logically divides the image
+     *  into 9 sections (3x3). For example, if the middle pixel of a [5x5]
+     *  image is the "center", then the center-rect should be [2, 2, 3, 3].
+     *
+     *  If the dst is >= the image size, then...
+     *  - The 4 corners are not stretched at all.
+     *  - The sides are stretched in only one axis.
+     *  - The center is stretched in both axes.
+     * Else, for each axis where dst < image,
+     *  - The corners shrink proportionally
+     *  - The sides (along the shrink axis) and center are not drawn
+     */
+    void drawImageNine(const GrClip&,
+                       const GrPaint& paint,
+                       const SkMatrix& viewMatrix,
+                       int imageWidth,
+                       int imageHeight,
+                       const SkIRect& center,
+                       const SkRect& dst);
+
+    /**
+     * Draws a batch
+     *
+     * @param paint    describes how to color pixels.
+     * @param batch    the batch to draw
+     */
+    void drawBatch(const GrClip&, const GrPaint&, GrDrawBatch*);
+
+    int width() const { return fRenderTarget->width(); }
+    int height() const { return fRenderTarget->height(); }
+    int numColorSamples() const { return fRenderTarget->numColorSamples(); }
+
+private:
+    friend class GrAtlasTextContext; // for access to drawBatch
+    friend class GrDrawingManager; // for ctor
+
+    SkDEBUGCODE(void validate() const;)
+
+    GrDrawContext(GrDrawingManager*, GrRenderTarget*, const SkSurfaceProps* surfaceProps);
+
+    void internalDrawPath(GrPipelineBuilder*,
+                          const SkMatrix& viewMatrix,
+                          GrColor,
+                          bool useAA,
+                          const SkPath&,
+                          const GrStrokeInfo&);
+
+    // This entry point allows the GrTextContext-derived classes to add their batches to
+    // the drawTarget.
+    void drawBatch(GrPipelineBuilder* pipelineBuilder, GrDrawBatch* batch);
+
+    GrDrawTarget* getDrawTarget();
+
+    GrDrawingManager* fDrawingManager;
+    GrRenderTarget*   fRenderTarget;
+
+    // In MDB-mode the drawTarget can be closed by some other drawContext that has picked
+    // it up. For this reason, the drawTarget should only ever be accessed via 'getDrawTarget'.
+    GrDrawTarget*     fDrawTarget;
+    GrTextContext*    fTextContext; // lazily gotten from GrContext::DrawingManager
+
+    SkSurfaceProps    fSurfaceProps;
+};
+
+#endif
diff --git a/gfx/skia/skia/include/gpu/GrDrawEffect.h b/gfx/skia/skia/include/gpu/GrDrawEffect.h
deleted file mode 100644
index 6aff82ef507d..000000000000
--- a/gfx/skia/skia/include/gpu/GrDrawEffect.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-#ifndef GrDrawEffect_DEFINED
-#define GrDrawEffect_DEFINED
-
-#include "GrEffectStage.h"
-
-/**
- * This class is used to communicate the particular GrEffect used in a draw to the backend-specific
- * effect subclass (e.g. GrGLEffect). It is used to by the backend-specific class to generate a
- * cache key for the effect, generate code on a program cache miss, and to upload uniform values to
- * the program.
- * In addition to the effect, it also communicates any changes between the relationship between
- * the view matrix and local coordinate system since the effect was installed in its GrDrawState.
- * The typical use case is that sometime after an effect was installed a decision was made to draw
- * in device coordinates (i.e. use an identity view-matrix). In such a case the GrDrawEffect's
- * coord-change-matrix would be the inverse of the view matrix that was set when the effect was
- * installed.
- */
-class GrDrawEffect {
-public:
-    GrDrawEffect(const GrEffectStage& stage, bool explicitLocalCoords)
-        : fEffectStage(&stage)
-        , fExplicitLocalCoords(explicitLocalCoords) {
-        SkASSERT(NULL != fEffectStage);
-        SkASSERT(NULL != fEffectStage->getEffect());
-    }
-    const GrEffect* effect() const { return fEffectStage->getEffect(); }
-
-    template <typename T>
-    const T& castEffect() const { return *static_cast<const T*>(this->effect()); }
-
-    const SkMatrix& getCoordChangeMatrix() const {
-        if (fExplicitLocalCoords) {
-            return SkMatrix::I();
-        } else {
-            return fEffectStage->getCoordChangeMatrix();
-        }
-    }
-
-    bool programHasExplicitLocalCoords() const { return fExplicitLocalCoords; }
-
-    const int* getVertexAttribIndices() const { return fEffectStage->getVertexAttribIndices(); }
-    int getVertexAttribIndexCount() const { return fEffectStage->getVertexAttribIndexCount(); }
-
-private:
-    const GrEffectStage*    fEffectStage;
-    bool                    fExplicitLocalCoords;
-};
-
-#endif
diff --git a/gfx/skia/skia/include/gpu/GrEffect.h b/gfx/skia/skia/include/gpu/GrEffect.h
deleted file mode 100644
index 8cb870ee153d..000000000000
--- a/gfx/skia/skia/include/gpu/GrEffect.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrEffect_DEFINED
-#define GrEffect_DEFINED
-
-#include "GrColor.h"
-#include "GrEffectUnitTest.h"
-#include "GrTexture.h"
-#include "GrTextureAccess.h"
-#include "GrTypesPriv.h"
-
-class GrBackendEffectFactory;
-class GrContext;
-class GrCoordTransform;
-class GrEffect;
-class GrVertexEffect;
-class SkString;
-
-/** Provides custom vertex shader, fragment shader, uniform data for a particular stage of the
-    Ganesh shading pipeline.
-    Subclasses must have a function that produces a human-readable name:
-        static const char* Name();
-    GrEffect objects *must* be immutable: after being constructed, their fields may not change.
-
-    Dynamically allocated GrEffects are managed by a per-thread memory pool. The ref count of an
-    effect must reach 0 before the thread terminates and the pool is destroyed. To create a static
-    effect use the macro GR_CREATE_STATIC_EFFECT declared below.
-  */
-class GrEffect : public SkRefCnt {
-public:
-    SK_DECLARE_INST_COUNT(GrEffect)
-
-    virtual ~GrEffect();
-
-    /**
-     * This function is used to perform optimizations. When called the color and validFlags params
-     * indicate whether the input components to this effect in the FS will have known values.
-     * validFlags is a bitfield of GrColorComponentFlags. The function updates both params to
-     * indicate known values of its output. A component of the color param only has meaning if the
-     * corresponding bit in validFlags is set.
-     */
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const = 0;
-
-    /** Will this effect read the source color value? */
-    bool willUseInputColor() const { return fWillUseInputColor; }
-
-    /** This object, besides creating back-end-specific helper objects, is used for run-time-type-
-        identification. The factory should be an instance of templated class,
-        GrTBackendEffectFactory. It is templated on the subclass of GrEffect. The subclass must have
-        a nested type (or typedef) named GLEffect which will be the subclass of GrGLEffect created
-        by the factory.
-
-        Example:
-        class MyCustomEffect : public GrEffect {
-        ...
-            virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE {
-                return GrTBackendEffectFactory<MyCustomEffect>::getInstance();
-            }
-        ...
-        };
-     */
-    virtual const GrBackendEffectFactory& getFactory() const = 0;
-
-    /** Returns true if this and other effect conservatively draw identically. It can only return
-        true when the two effects are of the same subclass (i.e. they return the same object from
-        from getFactory()).
-
-        A return value of true from isEqual() should not be used to test whether the effects would
-        generate the same shader code. To test for identical code generation use the effects' keys
-        computed by the GrBackendEffectFactory.
-     */
-    bool isEqual(const GrEffect& other) const {
-        if (&this->getFactory() != &other.getFactory()) {
-            return false;
-        }
-        bool result = this->onIsEqual(other);
-#ifdef SK_DEBUG
-        if (result) {
-            this->assertEquality(other);
-        }
-#endif
-        return result;
-    }
-
-    /** Human-meaningful string to identify this effect; may be embedded
-        in generated shader code. */
-    const char* name() const;
-
-    int numTransforms() const { return fCoordTransforms.count(); }
-
-    /** Returns the coordinate transformation at index. index must be valid according to
-        numTransforms(). */
-    const GrCoordTransform& coordTransform(int index) const { return *fCoordTransforms[index]; }
-
-    int numTextures() const { return fTextureAccesses.count(); }
-
-    /** Returns the access pattern for the texture at index. index must be valid according to
-        numTextures(). */
-    const GrTextureAccess& textureAccess(int index) const { return *fTextureAccesses[index]; }
-
-    /** Shortcut for textureAccess(index).texture(); */
-    GrTexture* texture(int index) const { return this->textureAccess(index).getTexture(); }
-
-    /** Will this effect read the destination pixel value? */
-    bool willReadDstColor() const { return fWillReadDstColor; }
-
-    /** Will this effect read the fragment position? */
-    bool willReadFragmentPosition() const { return fWillReadFragmentPosition; }
-
-    /** Will this effect emit custom vertex shader code?
-        (To set this value the effect must inherit from GrVertexEffect.) */
-    bool hasVertexCode() const { return fHasVertexCode; }
-
-    int numVertexAttribs() const {
-        SkASSERT(0 == fVertexAttribTypes.count() || fHasVertexCode);
-        return fVertexAttribTypes.count();
-    }
-
-    GrSLType vertexAttribType(int index) const { return fVertexAttribTypes[index]; }
-
-    static const int kMaxVertexAttribs = 2;
-
-    /** Useful for effects that want to insert a texture matrix that is implied by the texture
-        dimensions */
-    static inline SkMatrix MakeDivByTextureWHMatrix(const GrTexture* texture) {
-        SkASSERT(NULL != texture);
-        SkMatrix mat;
-        mat.setIDiv(texture->width(), texture->height());
-        return mat;
-    }
-
-    void* operator new(size_t size);
-    void operator delete(void* target);
-
-    void* operator new(size_t size, void* placement) {
-        return ::operator new(size, placement);
-    }
-    void operator delete(void* target, void* placement) {
-        ::operator delete(target, placement);
-    }
-
-protected:
-    /**
-     * Subclasses call this from their constructor to register coordinate transformations. The
-     * effect subclass manages the lifetime of the transformations (this function only stores a
-     * pointer). The GrCoordTransform is typically a member field of the GrEffect subclass. When the
-     * matrix has perspective, the transformed coordinates will have 3 components. Otherwise they'll
-     * have 2. This must only be called from the constructor because GrEffects are immutable.
-     */
-    void addCoordTransform(const GrCoordTransform* coordTransform);
-
-    /**
-     * Subclasses call this from their constructor to register GrTextureAccesses. The effect
-     * subclass manages the lifetime of the accesses (this function only stores a pointer). The
-     * GrTextureAccess is typically a member field of the GrEffect subclass. This must only be
-     * called from the constructor because GrEffects are immutable.
-     */
-    void addTextureAccess(const GrTextureAccess* textureAccess);
-
-    GrEffect()
-        : fWillReadDstColor(false)
-        , fWillReadFragmentPosition(false)
-        , fWillUseInputColor(true)
-        , fHasVertexCode(false) {}
-
-    /**
-      * Helper for down-casting to a GrEffect subclass
-      */
-    template <typename T> static const T& CastEffect(const GrEffect& effect) {
-        return *static_cast<const T*>(&effect);
-    }
-
-    /**
-     * If the effect subclass will read the destination pixel value then it must call this function
-     * from its constructor. Otherwise, when its generated backend-specific effect class attempts
-     * to generate code that reads the destination pixel it will fail.
-     */
-    void setWillReadDstColor() { fWillReadDstColor = true; }
-
-    /**
-     * If the effect will generate a backend-specific effect that will read the fragment position
-     * in the FS then it must call this method from its constructor. Otherwise, the request to
-     * access the fragment position will be denied.
-     */
-    void setWillReadFragmentPosition() { fWillReadFragmentPosition = true; }
-
-    /**
-     * If the effect will generate a result that does not depend on the input color value then it must
-     * call this function from its constructor. Otherwise, when its generated backend-specific code
-     * might fail during variable binding due to unused variables.
-     */
-    void setWillNotUseInputColor() { fWillUseInputColor = false; }
-
-private:
-    SkDEBUGCODE(void assertEquality(const GrEffect& other) const;)
-
-    /** Subclass implements this to support isEqual(). It will only be called if it is known that
-        the two effects are of the same subclass (i.e. they return the same object from
-        getFactory()).*/
-    virtual bool onIsEqual(const GrEffect& other) const = 0;
-
-    friend class GrVertexEffect; // to set fHasVertexCode and build fVertexAttribTypes.
-
-    SkSTArray<4, const GrCoordTransform*, true>  fCoordTransforms;
-    SkSTArray<4, const GrTextureAccess*, true>   fTextureAccesses;
-    SkSTArray<kMaxVertexAttribs, GrSLType, true> fVertexAttribTypes;
-    bool                                         fWillReadDstColor;
-    bool                                         fWillReadFragmentPosition;
-    bool                                         fWillUseInputColor;
-    bool                                         fHasVertexCode;
-
-    typedef SkRefCnt INHERITED;
-};
-
-/**
- * This creates an effect outside of the effect memory pool. The effect's destructor will be called
- * at global destruction time. NAME will be the name of the created GrEffect.
- */
-#define GR_CREATE_STATIC_EFFECT(NAME, EFFECT_CLASS, ARGS)                                         \
-static SkAlignedSStorage<sizeof(EFFECT_CLASS)> g_##NAME##_Storage;                                \
-static GrEffect* NAME SkNEW_PLACEMENT_ARGS(g_##NAME##_Storage.get(), EFFECT_CLASS, ARGS);         \
-static SkAutoTDestroy<GrEffect> NAME##_ad(NAME);
-
-
-#endif
diff --git a/gfx/skia/skia/include/gpu/GrEffectStage.h b/gfx/skia/skia/include/gpu/GrEffectStage.h
deleted file mode 100644
index fb0620d6e6df..000000000000
--- a/gfx/skia/skia/include/gpu/GrEffectStage.h
+++ /dev/null
@@ -1,141 +0,0 @@
-
-/*
- * Copyright 2010 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-
-#ifndef GrEffectStage_DEFINED
-#define GrEffectStage_DEFINED
-
-#include "GrBackendEffectFactory.h"
-#include "GrEffect.h"
-#include "SkMatrix.h"
-#include "GrTypes.h"
-
-#include "SkShader.h"
-
-class GrEffectStage {
-public:
-    explicit GrEffectStage(const GrEffect* effect, int attrIndex0 = -1, int attrIndex1 = -1)
-    : fEffect(SkRef(effect)) {
-        fCoordChangeMatrixSet = false;
-        fVertexAttribIndices[0] = attrIndex0;
-        fVertexAttribIndices[1] = attrIndex1;
-    }
-
-    GrEffectStage(const GrEffectStage& other) {
-        *this = other;
-    }
-
-    GrEffectStage& operator= (const GrEffectStage& other) {
-        fCoordChangeMatrixSet = other.fCoordChangeMatrixSet;
-        if (other.fCoordChangeMatrixSet) {
-            fCoordChangeMatrix = other.fCoordChangeMatrix;
-        }
-        fEffect.reset(SkRef(other.fEffect.get()));
-        memcpy(fVertexAttribIndices, other.fVertexAttribIndices, sizeof(fVertexAttribIndices));
-        return *this;
-    }
-
-    bool operator== (const GrEffectStage& other) const {
-        SkASSERT(NULL != fEffect.get());
-        SkASSERT(NULL != other.fEffect.get());
-
-        if (!this->getEffect()->isEqual(*other.getEffect())) {
-            return false;
-        }
-
-        if (fCoordChangeMatrixSet != other.fCoordChangeMatrixSet) {
-            return false;
-        }
-
-        if (!fCoordChangeMatrixSet) {
-            return true;
-        }
-
-        return fCoordChangeMatrix == other.fCoordChangeMatrix;
-    }
-
-    bool operator!= (const GrEffectStage& s) const { return !(*this == s); }
-
-    /**
-     * This is called when the coordinate system in which the geometry is specified will change.
-     *
-     * @param matrix    The transformation from the old coord system in which geometry is specified
-     *                  to the new one from which it will actually be drawn.
-     */
-    void localCoordChange(const SkMatrix& matrix) {
-        if (fCoordChangeMatrixSet) {
-            fCoordChangeMatrix.preConcat(matrix);
-        } else {
-            fCoordChangeMatrixSet = true;
-            fCoordChangeMatrix = matrix;
-        }
-    }
-
-    class SavedCoordChange {
-    private:
-        bool fCoordChangeMatrixSet;
-        SkMatrix fCoordChangeMatrix;
-        SkDEBUGCODE(mutable SkAutoTUnref<const GrEffect> fEffect;)
-
-        friend class GrEffectStage;
-    };
-
-    /**
-     * This gets the current coordinate system change. It is the accumulation of
-     * localCoordChange calls since the effect was installed. It is used when then caller
-     * wants to temporarily change the source geometry coord system, draw something, and then
-     * restore the previous coord system (e.g. temporarily draw in device coords).
-     */
-    void saveCoordChange(SavedCoordChange* savedCoordChange) const {
-        savedCoordChange->fCoordChangeMatrixSet = fCoordChangeMatrixSet;
-        if (fCoordChangeMatrixSet) {
-            savedCoordChange->fCoordChangeMatrix = fCoordChangeMatrix;
-        }
-        SkASSERT(NULL == savedCoordChange->fEffect.get());
-        SkDEBUGCODE(SkRef(fEffect.get());)
-        SkDEBUGCODE(savedCoordChange->fEffect.reset(fEffect.get());)
-    }
-
-    /**
-     * This balances the saveCoordChange call.
-     */
-    void restoreCoordChange(const SavedCoordChange& savedCoordChange) {
-        fCoordChangeMatrixSet = savedCoordChange.fCoordChangeMatrixSet;
-        if (fCoordChangeMatrixSet) {
-            fCoordChangeMatrix = savedCoordChange.fCoordChangeMatrix;
-        }
-        SkASSERT(savedCoordChange.fEffect.get() == fEffect);
-        SkDEBUGCODE(savedCoordChange.fEffect.reset(NULL);)
-    }
-
-    /**
-     * Gets the matrix representing all changes of coordinate system since the GrEffect was
-     * installed in the stage.
-     */
-    const SkMatrix& getCoordChangeMatrix() const {
-        if (fCoordChangeMatrixSet) {
-            return fCoordChangeMatrix;
-        } else {
-            return SkMatrix::I();
-        }
-    }
-
-    const GrEffect* getEffect() const { return fEffect.get(); }
-
-    const int* getVertexAttribIndices() const { return fVertexAttribIndices; }
-    int getVertexAttribIndexCount() const { return fEffect->numVertexAttribs(); }
-
-private:
-    bool                                fCoordChangeMatrixSet;
-    SkMatrix                            fCoordChangeMatrix;
-    SkAutoTUnref<const GrEffect>        fEffect;
-    int                                 fVertexAttribIndices[2];
-};
-
-#endif
diff --git a/gfx/skia/skia/include/gpu/GrEffectUnitTest.h b/gfx/skia/skia/include/gpu/GrEffectUnitTest.h
deleted file mode 100644
index ffc64f2b8268..000000000000
--- a/gfx/skia/skia/include/gpu/GrEffectUnitTest.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrEffectUnitTest_DEFINED
-#define GrEffectUnitTest_DEFINED
-
-#include "SkRandom.h"
-#include "SkTArray.h"
-#include "SkTypes.h"
-
-class SkMatrix;
-class GrDrawTargetCaps;
-
-namespace GrEffectUnitTest {
-// Used to access the dummy textures in TestCreate procs.
-enum {
-    kSkiaPMTextureIdx = 0,
-    kAlphaTextureIdx = 1,
-};
-
-/**
- * A helper for use in GrEffect::TestCreate functions.
- */
-const SkMatrix& TestMatrix(SkRandom*);
-
-}
-
-#if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
-
-class GrContext;
-class GrEffect;
-class GrTexture;
-
-class GrEffectTestFactory : SkNoncopyable {
-public:
-
-    typedef GrEffect* (*CreateProc)(SkRandom*,
-                                    GrContext*,
-                                    const GrDrawTargetCaps& caps,
-                                    GrTexture* dummyTextures[]);
-
-    GrEffectTestFactory(CreateProc createProc) {
-        fCreateProc = createProc;
-        GetFactories()->push_back(this);
-    }
-
-    static GrEffect* CreateStage(SkRandom* random,
-                                 GrContext* context,
-                                 const GrDrawTargetCaps& caps,
-                                 GrTexture* dummyTextures[]) {
-        uint32_t idx = random->nextRangeU(0, GetFactories()->count() - 1);
-        GrEffectTestFactory* factory = (*GetFactories())[idx];
-        return factory->fCreateProc(random, context, caps, dummyTextures);
-    }
-
-private:
-    CreateProc fCreateProc;
-    static SkTArray<GrEffectTestFactory*, true>* GetFactories();
-};
-
-/** GrEffect subclasses should insert this macro in their declaration to be included in the
- *  program generation unit test.
- */
-#define GR_DECLARE_EFFECT_TEST                                                      \
-    static GrEffectTestFactory gTestFactory;                                        \
-    static GrEffect* TestCreate(SkRandom*,                                          \
-                                GrContext*,                                         \
-                                const GrDrawTargetCaps&,                            \
-                                GrTexture* dummyTextures[2])
-
-/** GrEffect subclasses should insert this macro in their implementation file. They must then
- *  also implement this static function:
- *      GrEffect* TestCreate(SkRandom*,
- *                           GrContext*,
- *                           const GrDrawTargetCaps&,
- *                           GrTexture* dummyTextures[2]);
- * dummyTextures[] are valid textures that can optionally be used to construct GrTextureAccesses.
- * The first texture has config kSkia8888_GrPixelConfig and the second has
- * kAlpha_8_GrPixelConfig. TestCreate functions are also free to create additional textures using
- * the GrContext.
- */
-#define GR_DEFINE_EFFECT_TEST(Effect)                                               \
-    GrEffectTestFactory Effect :: gTestFactory(Effect :: TestCreate)
-
-#else // !SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
-
-// The unit test relies on static initializers. Just declare the TestCreate function so that
-// its definitions will compile.
-#define GR_DECLARE_EFFECT_TEST                                                      \
-    static GrEffect* TestCreate(SkRandom*,                                          \
-                                GrContext*,                                         \
-                                const GrDrawTargetCaps&,                            \
-                                GrTexture* dummyTextures[2])
-#define GR_DEFINE_EFFECT_TEST(X)
-
-#endif // !SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
-#endif
diff --git a/gfx/skia/skia/include/gpu/GrFontScaler.h b/gfx/skia/skia/include/gpu/GrFontScaler.h
deleted file mode 100644
index 037603813561..000000000000
--- a/gfx/skia/skia/include/gpu/GrFontScaler.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrFontScaler_DEFINED
-#define GrFontScaler_DEFINED
-
-#include "GrGlyph.h"
-#include "GrTypes.h"
-
-#include "SkDescriptor.h"
-
-class SkPath;
-
-/*
- *  Wrapper class to turn a font cache descriptor into a key 
- *  for GrFontScaler-related lookups
- */
-class GrFontDescKey : public SkRefCnt {
-public:
-    SK_DECLARE_INST_COUNT(GrFontDescKey)
-    
-    typedef uint32_t Hash;
-    
-    explicit GrFontDescKey(const SkDescriptor& desc);
-    virtual ~GrFontDescKey();
-    
-    Hash getHash() const { return fHash; }
-    
-    bool operator<(const GrFontDescKey& rh) const {
-        return fHash < rh.fHash || (fHash == rh.fHash && this->lt(rh));
-    }
-    bool operator==(const GrFontDescKey& rh) const {
-        return fHash == rh.fHash && this->eq(rh);
-    }
-    
-private:
-    // helper functions for comparisons
-    bool lt(const GrFontDescKey& rh) const;
-    bool eq(const GrFontDescKey& rh) const;
-    
-    SkDescriptor* fDesc;
-    enum {
-        kMaxStorageInts = 16
-    };
-    uint32_t fStorage[kMaxStorageInts];
-    const Hash fHash;
-    
-    typedef SkRefCnt INHERITED;
-};
-
-/*
- *  This is Gr's interface to the host platform's font scaler.
- *
- *  The client is responsible for instantiating this. The instance is created 
- *  for a specific font+size+matrix.
- */
-class GrFontScaler : public SkRefCnt {
-public:
-    SK_DECLARE_INST_COUNT(GrFontScaler)
-
-    explicit GrFontScaler(SkGlyphCache* strike);
-    virtual ~GrFontScaler();
-    
-    const GrFontDescKey* getKey();
-    GrMaskFormat getMaskFormat();
-    bool getPackedGlyphBounds(GrGlyph::PackedID, SkIRect* bounds);
-    bool getPackedGlyphImage(GrGlyph::PackedID, int width, int height,
-                                     int rowBytes, void* image);
-    bool getPackedGlyphDFBounds(GrGlyph::PackedID, SkIRect* bounds);
-    bool getPackedGlyphDFImage(GrGlyph::PackedID, int width, int height,
-                                       void* image);
-    bool getGlyphPath(uint16_t glyphID, SkPath*);
-    
-private:
-    SkGlyphCache*  fStrike;
-    GrFontDescKey* fKey;
-    
-    typedef SkRefCnt INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/include/gpu/GrFragmentProcessor.h b/gfx/skia/skia/include/gpu/GrFragmentProcessor.h
new file mode 100644
index 000000000000..55b2f905d9c5
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/GrFragmentProcessor.h
@@ -0,0 +1,219 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrFragmentProcessor_DEFINED
+#define GrFragmentProcessor_DEFINED
+
+#include "GrProcessor.h"
+
+class GrCoordTransform;
+class GrGLSLCaps;
+class GrGLSLFragmentProcessor;
+class GrInvariantOutput;
+class GrProcessorKeyBuilder;
+
+/** Provides custom fragment shader code. Fragment processors receive an input color (vec4f) and
+    produce an output color. They may reference textures and uniforms. They may use
+    GrCoordTransforms to receive a transformation of the local coordinates that map from local space
+    to the fragment being processed.
+ */
+class GrFragmentProcessor : public GrProcessor {
+public:
+    /**
+    *  In many instances (e.g. SkShader::asFragmentProcessor() implementations) it is desirable to
+    *  only consider the input color's alpha. However, there is a competing desire to have reusable
+    *  GrFragmentProcessor subclasses that can be used in other scenarios where the entire input
+    *  color is considered. This function exists to filter the input color and pass it to a FP. It
+    *  does so by returning a parent FP that multiplies the passed in FPs output by the parent's
+    *  input alpha. The passed in FP will not receive an input color.
+    */
+    static const GrFragmentProcessor* MulOutputByInputAlpha(const GrFragmentProcessor*);
+
+    /**
+     *  Similar to the above but it modulates the output r,g,b of the child processor by the input
+     *  rgb and then multiplies all the components by the input alpha. This effectively modulates
+     *  the child processor's premul color by a unpremul'ed input and produces a premul output
+     */
+    static const GrFragmentProcessor* MulOutputByInputUnpremulColor(const GrFragmentProcessor*);
+
+    /**
+     *  Returns a parent fragment processor that adopts the passed fragment processor as a child.
+     *  The parent will ignore its input color and instead feed the passed in color as input to the
+     *  child.
+     */
+    static const GrFragmentProcessor* OverrideInput(const GrFragmentProcessor*, GrColor);
+
+    /**
+     * Returns a fragment processor that runs the passed in array of fragment processors in a
+     * series. The original input is passed to the first, the first's output is passed to the
+     * second, etc. The output of the returned processor is the output of the last processor of the
+     * series.
+     */
+    static const GrFragmentProcessor* RunInSeries(const GrFragmentProcessor*[], int cnt);
+
+    GrFragmentProcessor()
+        : INHERITED()
+        , fUsesLocalCoords(false)
+        , fNumTexturesExclChildren(0)
+        , fNumTransformsExclChildren(0) {}
+
+    ~GrFragmentProcessor() override;
+
+    GrGLSLFragmentProcessor* createGLSLInstance() const;
+
+    void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const {
+        this->onGetGLSLProcessorKey(caps, b);
+        for (int i = 0; i < fChildProcessors.count(); ++i) {
+            fChildProcessors[i]->getGLSLProcessorKey(caps, b);
+        }
+    }
+
+    int numTexturesExclChildren() const { return fNumTexturesExclChildren; }
+
+    int numTransformsExclChildren() const { return fNumTransformsExclChildren; }
+
+    int numTransforms() const { return fCoordTransforms.count(); }
+
+    /** Returns the coordinate transformation at index. index must be valid according to
+        numTransforms(). */
+    const GrCoordTransform& coordTransform(int index) const { return *fCoordTransforms[index]; }
+
+    const SkTArray<const GrCoordTransform*, true>& coordTransforms() const {
+        return fCoordTransforms;
+    }
+
+    void gatherCoordTransforms(SkTArray<const GrCoordTransform*, true>* outTransforms) const {
+        if (!fCoordTransforms.empty()) {
+            outTransforms->push_back_n(fCoordTransforms.count(), fCoordTransforms.begin());
+        }
+    }
+
+    int numChildProcessors() const { return fChildProcessors.count(); }
+
+    const GrFragmentProcessor& childProcessor(int index) const { return *fChildProcessors[index]; }
+
+    /** Do any of the coordtransforms for this processor require local coords? */
+    bool usesLocalCoords() const { return fUsesLocalCoords; }
+
+    /** Returns true if this and other processor conservatively draw identically. It can only return
+        true when the two processor are of the same subclass (i.e. they return the same object from
+        from getFactory()).
+
+        A return value of true from isEqual() should not be used to test whether the processor would
+        generate the same shader code. To test for identical code generation use getGLSLProcessorKey
+     */
+    bool isEqual(const GrFragmentProcessor& that, bool ignoreCoordTransforms) const;
+
+    /**
+     * This function is used to perform optimizations. When called the invarientOuput param
+     * indicate whether the input components to this processor in the FS will have known values.
+     * In inout the validFlags member is a bitfield of GrColorComponentFlags. The isSingleComponent
+     * member indicates whether the input will be 1 or 4 bytes. The function updates the members of
+     * inout to indicate known values of its output. A component of the color member only has
+     * meaning if the corresponding bit in validFlags is set.
+     */
+    void computeInvariantOutput(GrInvariantOutput* inout) const {
+        this->onComputeInvariantOutput(inout);
+    }
+
+protected:
+    void addTextureAccess(const GrTextureAccess* textureAccess) override;
+
+    /**
+     * Fragment Processor subclasses call this from their constructor to register coordinate
+     * transformations. Coord transforms provide a mechanism for a processor to receive coordinates
+     * in their FS code. The matrix expresses a transformation from local space. For a given
+     * fragment the matrix will be applied to the local coordinate that maps to the fragment.
+     *
+     * When the transformation has perspective, the transformed coordinates will have
+     * 3 components. Otherwise they'll have 2.
+     *
+     * This must only be called from the constructor because GrProcessors are immutable. The
+     * processor subclass manages the lifetime of the transformations (this function only stores a
+     * pointer). The GrCoordTransform is typically a member field of the GrProcessor subclass.
+     *
+     * A processor subclass that has multiple methods of construction should always add its coord
+     * transforms in a consistent order. The non-virtual implementation of isEqual() automatically
+     * compares transforms and will assume they line up across the two processor instances.
+     */
+    void addCoordTransform(const GrCoordTransform*);
+
+    /**
+     * FragmentProcessor subclasses call this from their constructor to register any child
+     * FragmentProcessors they have. This must be called AFTER all texture accesses and coord
+     * transforms have been added.
+     * This is for processors whose shader code will be composed of nested processors whose output
+     * colors will be combined somehow to produce its output color.  Registering these child
+     * processors will allow the ProgramBuilder to automatically handle their transformed coords and
+     * texture accesses and mangle their uniform and output color names.
+     */
+    int registerChildProcessor(const GrFragmentProcessor* child);
+
+    /**
+     * Subclass implements this to support getConstantColorComponents(...).
+     *
+     * Note: it's up to the subclass implementation to do any recursive call to compute the child
+     * procs' output invariants; computeInvariantOutput will not be recursive.
+     */
+    virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const = 0;
+
+private:
+    void notifyRefCntIsZero() const final;
+
+    /** Returns a new instance of the appropriate *GL* implementation class
+        for the given GrFragmentProcessor; caller is responsible for deleting
+        the object. */
+    virtual GrGLSLFragmentProcessor* onCreateGLSLInstance() const = 0;
+
+    /** Implemented using GLFragmentProcessor::GenKey as described in this class's comment. */
+    virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                       GrProcessorKeyBuilder* b) const = 0;
+
+    /**
+     * Subclass implements this to support isEqual(). It will only be called if it is known that
+     * the two processors are of the same subclass (i.e. they return the same object from
+     * getFactory()). The processor subclass should not compare its coord transforms as that will
+     * be performed automatically in the non-virtual isEqual().
+     */
+    virtual bool onIsEqual(const GrFragmentProcessor&) const = 0;
+
+    bool hasSameTransforms(const GrFragmentProcessor&) const;
+
+    bool                                            fUsesLocalCoords;
+
+    /**
+     * fCoordTransforms stores the transforms of this proc, followed by all the transforms of this
+     * proc's children. In other words, each proc stores all the transforms of its subtree as if
+     * they were collected using preorder traversal.
+     *
+     * Example:
+     * Suppose we have frag proc A, who has two children B and D. B has a child C, and D has
+     * two children E and F. Suppose procs A, B, C, D, E, F have 1, 2, 1, 1, 3, 2 transforms
+     * respectively. The following shows what the fCoordTransforms array of each proc would contain:
+     *
+     *                                   (A)
+     *                        [a1,b1,b2,c1,d1,e1,e2,e3,f1,f2]
+     *                                  /    \
+     *                                /        \
+     *                            (B)           (D)
+     *                        [b1,b2,c1]   [d1,e1,e2,e3,f1,f2]
+     *                          /             /    \
+     *                        /             /        \
+     *                      (C)          (E)          (F)
+     *                     [c1]      [e1,e2,e3]      [f1,f2]
+     *
+     * The same goes for fTextureAccesses with textures.
+     */
+    SkSTArray<4, const GrCoordTransform*, true>     fCoordTransforms;
+    int                                             fNumTexturesExclChildren;
+    int                                             fNumTransformsExclChildren;
+    SkSTArray<1, const GrFragmentProcessor*, true>  fChildProcessors;
+
+    typedef GrProcessor INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/include/gpu/GrGpuResource.h b/gfx/skia/skia/include/gpu/GrGpuResource.h
index 127f64b90302..8103959984b1 100644
--- a/gfx/skia/skia/include/gpu/GrGpuResource.h
+++ b/gfx/skia/skia/include/gpu/GrGpuResource.h
@@ -8,45 +8,165 @@
 #ifndef GrGpuResource_DEFINED
 #define GrGpuResource_DEFINED
 
-#include "SkInstCnt.h"
-#include "SkTInternalLList.h"
+#include "GrResourceKey.h"
+#include "GrTypesPriv.h"
+#include "SkData.h"
 
-class GrResourceCacheEntry;
-class GrGpu;
 class GrContext;
+class GrGpu;
+class GrResourceCache;
+class SkTraceMemoryDump;
+
+/**
+ * Base class for GrGpuResource. Handles the various types of refs we need. Separated out as a base
+ * class to isolate the ref-cnting behavior and provide friendship without exposing all of
+ * GrGpuResource.
+ *
+ * Gpu resources can have three types of refs:
+ *   1) Normal ref (+ by ref(), - by unref()): These are used by code that is issuing draw calls
+ *      that read and write the resource via GrDrawTarget and by any object that must own a
+ *      GrGpuResource and is itself owned (directly or indirectly) by Skia-client code.
+ *   2) Pending read (+ by addPendingRead(), - by completedRead()): GrContext has scheduled a read
+ *      of the resource by the GPU as a result of a skia API call but hasn't executed it yet.
+ *   3) Pending write (+ by addPendingWrite(), - by completedWrite()): GrContext has scheduled a
+ *      write to the resource by the GPU as a result of a skia API call but hasn't executed it yet.
+ *
+ * The latter two ref types are private and intended only for Gr core code.
+ *
+ * When all the ref/io counts reach zero DERIVED::notifyAllCntsAreZero() will be called (static poly
+ * morphism using CRTP). Similarly when the ref (but not necessarily pending read/write) count
+ * reaches 0 DERIVED::notifyRefCountIsZero() will be called. In the case when an unref() causes both
+ * the ref cnt to reach zero and the other counts are zero, notifyRefCountIsZero() will be called
+ * before notifyIsPurgeable(). Moreover, if notifyRefCountIsZero() returns false then
+ * notifyAllRefCntsAreZero() won't be called at all. notifyRefCountIsZero() must return false if the
+ * object may be deleted after notifyRefCntIsZero() returns.
+ *
+ * GrIORef and GrGpuResource are separate classes for organizational reasons and to be
+ * able to give access via friendship to only the functions related to pending IO operations.
+ */
+template <typename DERIVED> class GrIORef : public SkNoncopyable {
+public:
+    // Some of the signatures are written to mirror SkRefCnt so that GrGpuResource can work with
+    // templated helper classes (e.g. SkAutoTUnref). However, we have different categories of
+    // refs (e.g. pending reads). We also don't require thread safety as GrCacheable objects are
+    // not intended to cross thread boundaries.
+    void ref() const {
+        this->validate();
+        ++fRefCnt;
+    }
+
+    void unref() const {
+        this->validate();
+
+        if (!(--fRefCnt)) {
+            if (!static_cast<const DERIVED*>(this)->notifyRefCountIsZero()) {
+                return;
+            }
+        }
+
+        this->didRemoveRefOrPendingIO(kRef_CntType);
+    }
+
+    void validate() const {
+#ifdef SK_DEBUG
+        SkASSERT(fRefCnt >= 0);
+        SkASSERT(fPendingReads >= 0);
+        SkASSERT(fPendingWrites >= 0);
+        SkASSERT(fRefCnt + fPendingReads + fPendingWrites >= 0);
+#endif
+    }
+
+protected:
+    GrIORef() : fRefCnt(1), fPendingReads(0), fPendingWrites(0) { }
+
+    enum CntType {
+        kRef_CntType,
+        kPendingRead_CntType,
+        kPendingWrite_CntType,
+    };
+
+    bool isPurgeable() const { return !this->internalHasRef() && !this->internalHasPendingIO(); }
+
+    bool internalHasPendingRead() const { return SkToBool(fPendingReads); }
+    bool internalHasPendingWrite() const { return SkToBool(fPendingWrites); }
+    bool internalHasPendingIO() const { return SkToBool(fPendingWrites | fPendingReads); }
+
+    bool internalHasRef() const { return SkToBool(fRefCnt); }
+
+private:
+    void addPendingRead() const {
+        this->validate();
+        ++fPendingReads;
+    }
+
+    void completedRead() const {
+        this->validate();
+        --fPendingReads;
+        this->didRemoveRefOrPendingIO(kPendingRead_CntType);
+    }
+
+    void addPendingWrite() const {
+        this->validate();
+        ++fPendingWrites;
+    }
+
+    void completedWrite() const {
+        this->validate();
+        --fPendingWrites;
+        this->didRemoveRefOrPendingIO(kPendingWrite_CntType);
+    }
+
+private:
+    void didRemoveRefOrPendingIO(CntType cntTypeRemoved) const {
+        if (0 == fPendingReads && 0 == fPendingWrites && 0 == fRefCnt) {
+            static_cast<const DERIVED*>(this)->notifyAllCntsAreZero(cntTypeRemoved);
+        }
+    }
+
+    mutable int32_t fRefCnt;
+    mutable int32_t fPendingReads;
+    mutable int32_t fPendingWrites;
+
+    // This class is used to manage conversion of refs to pending reads/writes.
+    friend class GrGpuResourceRef;
+    friend class GrResourceCache; // to check IO ref counts.
+
+    template <typename, GrIOType> friend class GrPendingIOResource;
+};
 
 /**
  * Base class for objects that can be kept in the GrResourceCache.
  */
-class GrGpuResource : public SkNoncopyable {
+class SK_API GrGpuResource : public GrIORef<GrGpuResource> {
 public:
-    SK_DECLARE_INST_COUNT_ROOT(GrGpuResource)
 
-    // These method signatures are written to mirror SkRefCnt. However, we don't require
-    // thread safety as GrCacheable objects are not intended to cross thread boundaries.
-    // internal_dispose() exists because of GrTexture's reliance on it. It will be removed
-    // soon.
-    void ref() const { ++fRefCnt; }
-    void unref() const { --fRefCnt; if (0 == fRefCnt) { this->internal_dispose(); } }
-    virtual void internal_dispose() const { SkDELETE(this); }
-    bool unique() const { return 1 == fRefCnt; }
-#ifdef SK_DEBUG
-    void validate() const {
-        SkASSERT(fRefCnt > 0);
-    }
-#endif
 
-    /**
-     * Frees the object in the underlying 3D API. It must be safe to call this
-     * when the object has been previously abandoned.
-     */
-    void release();
+    enum LifeCycle {
+        /**
+         * The resource is cached and owned by Skia. Resources with this status may be kept alive
+         * by the cache as either scratch or unique resources even when there are no refs to them.
+         * The cache may release them whenever there are no refs.
+         */
+        kCached_LifeCycle,
 
-    /**
-     * Removes references to objects in the underlying 3D API without freeing
-     * them. Used when the API context has been torn down before the GrContext.
-     */
-    void abandon();
+        /**
+         * The resource is uncached. As soon as there are no more refs to it, it is released. Under
+         * the hood the cache may opaquely recycle it as a cached resource.
+         */
+        kUncached_LifeCycle,
+
+        /**
+         * Similar to uncached, but Skia does not manage the lifetime of the underlying backend
+         * 3D API object(s). The client is responsible for freeing those. Used to inject client-
+         * created GPU resources into Skia (e.g. to render to a client-created texture).
+         */
+        kBorrowed_LifeCycle,
+
+        /**
+         * An external resource with ownership transfered into Skia. Skia will free the resource.
+         */
+        kAdopted_LifeCycle,
+    };
 
     /**
      * Tests whether a object has been abandoned or released. All objects will
@@ -76,70 +196,158 @@ public:
      *
      * @return the amount of GPU memory used in bytes
      */
-    virtual size_t gpuMemorySize() const = 0;
-
-    void setCacheEntry(GrResourceCacheEntry* cacheEntry) { fCacheEntry = cacheEntry; }
-    GrResourceCacheEntry* getCacheEntry() { return fCacheEntry; }
+    size_t gpuMemorySize() const {
+        if (kInvalidGpuMemorySize == fGpuMemorySize) {
+            fGpuMemorySize = this->onGpuMemorySize();
+            SkASSERT(kInvalidGpuMemorySize != fGpuMemorySize);
+        }
+        return fGpuMemorySize;
+    }
 
     /**
-     * Gets an id that is unique for this GrCacheable object. It is static in that it does
-     * not change when the content of the GrCacheable object changes. This will never return
+     * Gets an id that is unique for this GrGpuResource object. It is static in that it does
+     * not change when the content of the GrGpuResource object changes. This will never return
      * 0.
      */
     uint32_t getUniqueID() const { return fUniqueID; }
 
-protected:
-    GrGpuResource(GrGpu*, bool isWrapped);
-    virtual ~GrGpuResource();
+    /** Returns the current unique key for the resource. It will be invalid if the resource has no
+        associated unique key. */
+    const GrUniqueKey& getUniqueKey() const { return fUniqueKey; }
 
-    bool isInCache() const { return NULL != fCacheEntry; }
+    /**
+     * Attach a custom data object to this resource. The data will remain attached
+     * for the lifetime of this resource (until it is abandoned or released).
+     * Takes a ref on data. Previously attached data, if any, is unrefed.
+     * Returns the data argument, for convenience.
+     */
+    const SkData* setCustomData(const SkData* data);
+
+    /**
+     * Returns the custom data object that was attached to this resource by
+     * calling setCustomData.
+     */
+    const SkData* getCustomData() const { return fData.get(); }
+
+    /**
+     * Internal-only helper class used for manipulations of the resource by the cache.
+     */
+    class CacheAccess;
+    inline CacheAccess cacheAccess();
+    inline const CacheAccess cacheAccess() const;
+
+    /**
+     * Internal-only helper class used for manipulations of the resource by internal code.
+     */
+    class ResourcePriv;
+    inline ResourcePriv resourcePriv();
+    inline const ResourcePriv resourcePriv() const;
+
+    /**
+     * Removes references to objects in the underlying 3D API without freeing them.
+     * Called by CacheAccess.
+     * In general this method should not be called outside of skia. It was
+     * made by public for a special case where it needs to be called in Blink
+     * when a texture becomes unsafe to use after having been shared through
+     * a texture mailbox.
+     */
+    void abandon();
+
+    /**
+     * Dumps memory usage information for this GrGpuResource to traceMemoryDump.
+     * Typically, subclasses should not need to override this, and should only
+     * need to override setMemoryBacking.
+     **/
+    virtual void dumpMemoryStatistics(SkTraceMemoryDump* traceMemoryDump) const;
+
+protected:
+    // This must be called by every GrGpuObject. It should be called once the object is fully
+    // initialized (i.e. not in a base class constructor).
+    void registerWithCache();
+
+    GrGpuResource(GrGpu*, LifeCycle);
+    virtual ~GrGpuResource();
 
     GrGpu* getGpu() const { return fGpu; }
 
-    // Derived classes should always call their parent class' onRelease
-    // and onAbandon methods in their overrides.
-    virtual void onRelease() {};
-    virtual void onAbandon() {};
+    /** Overridden to free GPU resources in the backend API. */
+    virtual void onRelease() { }
+    /** Overridden to abandon any internal handles, ptrs, etc to backend API resources.
+        This may be called when the underlying 3D context is no longer valid and so no
+        backend API calls should be made. */
+    virtual void onAbandon() { }
 
-    bool isWrapped() const { return kWrapped_FlagBit & fFlags; }
+    bool shouldFreeResources() const { return fLifeCycle != kBorrowed_LifeCycle; }
+
+    bool isExternal() const {
+        return GrGpuResource::kAdopted_LifeCycle == fLifeCycle ||
+               GrGpuResource::kBorrowed_LifeCycle == fLifeCycle;
+    }
 
     /**
-     * This entry point should be called whenever gpuMemorySize() begins
-     * reporting a different size. If the object is in the cache, it will call
-     * gpuMemorySize() immediately and pass the new size on to the resource
-     * cache.
+     * This entry point should be called whenever gpuMemorySize() should report a different size.
+     * The cache will call gpuMemorySize() to update the current size of the resource.
      */
     void didChangeGpuMemorySize() const;
 
+    /**
+     * Optionally called by the GrGpuResource subclass if the resource can be used as scratch.
+     * By default resources are not usable as scratch. This should only be called once.
+     **/
+    void setScratchKey(const GrScratchKey& scratchKey);
+
+    /**
+     * Allows subclasses to add additional backing information to the SkTraceMemoryDump. Called by
+     * onMemoryDump. The default implementation adds no backing information.
+     **/
+    virtual void setMemoryBacking(SkTraceMemoryDump*, const SkString&) const {}
+
 private:
+    /**
+     * Frees the object in the underlying 3D API. Called by CacheAccess.
+     */
+    void release();
+
+    virtual size_t onGpuMemorySize() const = 0;
+
+    // See comments in CacheAccess and ResourcePriv.
+    void setUniqueKey(const GrUniqueKey&);
+    void removeUniqueKey();
+    void notifyAllCntsAreZero(CntType) const;
+    bool notifyRefCountIsZero() const;
+    void removeScratchKey();
+    void makeBudgeted();
+    void makeUnbudgeted();
+
 #ifdef SK_DEBUG
     friend class GrGpu; // for assert in GrGpu to access getGpu
 #endif
 
     static uint32_t CreateUniqueID();
 
-    // We're in an internal doubly linked list
-    SK_DECLARE_INTERNAL_LLIST_INTERFACE(GrGpuResource);
+    // An index into a heap when this resource is purgeable or an array when not. This is maintained
+    // by the cache.
+    int                         fCacheArrayIndex;
+    // This value reflects how recently this resource was accessed in the cache. This is maintained
+    // by the cache.
+    uint32_t                    fTimestamp;
 
-    GrGpu*              fGpu;               // not reffed. The GrGpu can be deleted while there
-                                            // are still live GrGpuResources. It will call
-                                            // release() on all such objects in its destructor.
-    enum Flags {
-        /**
-         * This object wraps a GPU object given to us by the user.
-         * Lifetime management is left up to the user (i.e., we will not
-         * free it).
-         */
-        kWrapped_FlagBit         = 0x1,
-    };
+    static const size_t kInvalidGpuMemorySize = ~static_cast<size_t>(0);
+    GrScratchKey                fScratchKey;
+    GrUniqueKey                 fUniqueKey;
 
-    uint32_t                fFlags;
+    // This is not ref'ed but abandon() or release() will be called before the GrGpu object
+    // is destroyed. Those calls set will this to NULL.
+    GrGpu*                      fGpu;
+    mutable size_t              fGpuMemorySize;
 
-    mutable int32_t         fRefCnt;
-    GrResourceCacheEntry*   fCacheEntry;  // NULL if not in cache
-    const uint32_t          fUniqueID;
+    LifeCycle                   fLifeCycle;
+    const uint32_t              fUniqueID;
 
-    typedef SkNoncopyable INHERITED;
+    SkAutoTUnref<const SkData>  fData;
+
+    typedef GrIORef<GrGpuResource> INHERITED;
+    friend class GrIORef<GrGpuResource>; // to access notifyAllCntsAreZero and notifyRefCntIsZero.
 };
 
 #endif
diff --git a/gfx/skia/skia/include/gpu/GrGpuResourceRef.h b/gfx/skia/skia/include/gpu/GrGpuResourceRef.h
new file mode 100644
index 000000000000..4511adce6823
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/GrGpuResourceRef.h
@@ -0,0 +1,213 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGpuResourceRef_DEFINED
+#define GrGpuResourceRef_DEFINED
+
+#include "GrGpuResource.h"
+#include "GrRenderTarget.h"
+#include "GrTexture.h"
+#include "SkRefCnt.h"
+
+/**
+ * This class is intended only for internal use in core Gr code.
+ *
+ * Class that wraps a resource referenced by a GrProgramElement or GrDrawState. It manages
+ * converting refs to pending IO operations. It allows a resource ownership to be in three
+ * states:
+ *          1. Owns a single ref
+ *          2. Owns a single ref and a pending IO operation (read, write, or read-write)
+ *          3. Owns a single pending IO operation.
+ *
+ * It is legal to destroy the GrGpuResourceRef in any of these states. It starts in state
+ * 1. Calling markPendingIO() converts it from state 1 to state 2. Calling removeRef() goes from
+ * state 2 to state 3. Calling pendingIOComplete() moves from state 2 to state 1. There is no
+ * valid way of going from state 3 back to 2 or 1.
+ *
+ * Like SkAutoTUnref, its constructor and setter adopt a ref from their caller.
+ *
+ * TODO: Once GrDODrawState no longer exists and therefore GrDrawState and GrOptDrawState no
+ * longer share an instance of this class, attempt to make the resource owned by GrGpuResourceRef
+ * only settable via the constructor.
+ */
+class GrGpuResourceRef : SkNoncopyable {
+public:
+    ~GrGpuResourceRef();
+
+    GrGpuResource* getResource() const { return fResource; }
+
+    /** Does this object own a pending read or write on the resource it is wrapping. */
+    bool ownsPendingIO() const { return fPendingIO; }
+
+    /** Shortcut for calling setResource() with NULL. It cannot be called after markingPendingIO
+        is called. */
+    void reset();
+
+protected:
+    GrGpuResourceRef();
+
+    /** Adopts a ref from the caller. ioType expresses what type of IO operations will be marked as
+        pending on the resource when markPendingIO is called. */
+    GrGpuResourceRef(GrGpuResource*, GrIOType);
+
+    /** Adopts a ref from the caller. ioType expresses what type of IO operations will be marked as
+        pending on the resource when markPendingIO is called. */
+    void setResource(GrGpuResource*, GrIOType);
+
+private:
+    /** Called by owning GrProgramElement when the program element is first scheduled for
+        execution. It can only be called once. */
+    void markPendingIO() const;
+
+    /** Called when the program element/draw state is no longer owned by GrDrawTarget-client code.
+        This lets the cache know that the drawing code will no longer schedule additional reads or
+        writes to the resource using the program element or draw state. It can only be called once.
+      */
+    void removeRef() const;
+
+    /** Called to indicate that the previous pending IO is complete. Useful when the owning object
+        still has refs, so it is not about to destroy this GrGpuResourceRef, but its previously
+        pending executions have been complete. Can only be called if removeRef() was not previously
+        called. */
+    void pendingIOComplete() const;
+
+    friend class GrProgramElement;
+
+    GrGpuResource*  fResource;
+    mutable bool    fOwnRef;
+    mutable bool    fPendingIO;
+    GrIOType        fIOType;
+
+    typedef SkNoncopyable INHERITED;
+};
+
+/**
+ * Templated version of GrGpuResourceRef to enforce type safety.
+ */
+template <typename T> class GrTGpuResourceRef : public GrGpuResourceRef {
+public:
+    GrTGpuResourceRef() {}
+
+    /** Adopts a ref from the caller. ioType expresses what type of IO operations will be marked as
+        pending on the resource when markPendingIO is called. */
+    GrTGpuResourceRef(T* resource, GrIOType ioType) : INHERITED(resource, ioType) { }
+
+    T* get() const { return static_cast<T*>(this->getResource()); }
+
+    /** Adopts a ref from the caller. ioType expresses what type of IO operations will be marked as
+        pending on the resource when markPendingIO is called. */
+    void set(T* resource, GrIOType ioType) { this->setResource(resource, ioType); }
+
+private:
+    typedef GrGpuResourceRef INHERITED;
+};
+
+// Specializations for GrTexture and GrRenderTarget because they use virtual inheritance.
+template<> class GrTGpuResourceRef<GrTexture> : public GrGpuResourceRef {
+public:
+    GrTGpuResourceRef() {}
+
+    GrTGpuResourceRef(GrTexture* texture, GrIOType ioType) : INHERITED(texture, ioType) { }
+
+    GrTexture* get() const {
+        GrSurface* surface = static_cast<GrSurface*>(this->getResource());
+        if (surface) {
+            return surface->asTexture();
+        } else {
+            return NULL;
+        }
+    }
+
+    void set(GrTexture* texture, GrIOType ioType) { this->setResource(texture, ioType); }
+
+private:
+    typedef GrGpuResourceRef INHERITED;
+};
+
+template<> class GrTGpuResourceRef<GrRenderTarget> : public GrGpuResourceRef {
+public:
+    GrTGpuResourceRef() {}
+
+    GrTGpuResourceRef(GrRenderTarget* rt, GrIOType ioType) : INHERITED(rt, ioType) { }
+
+    GrRenderTarget* get() const {
+        GrSurface* surface = static_cast<GrSurface*>(this->getResource());
+        if (surface) {
+            return surface->asRenderTarget();
+        } else {
+            return NULL;
+        }
+    }
+
+    void set(GrRenderTarget* rt, GrIOType ioType) { this->setResource(rt, ioType); }
+
+private:
+    typedef GrGpuResourceRef INHERITED;
+};
+
+/**
+ * This is similar to GrTGpuResourceRef but can only be in the pending IO state. It never owns a
+ * ref.
+ */
+template <typename T, GrIOType IO_TYPE> class GrPendingIOResource : SkNoncopyable {
+public:
+    GrPendingIOResource(T* resource = NULL) : fResource(NULL) {
+        this->reset(resource);
+    }
+
+    void reset(T* resource) {
+        if (resource) {
+            switch (IO_TYPE) {
+                case kRead_GrIOType:
+                    resource->addPendingRead();
+                    break;
+                case kWrite_GrIOType:
+                    resource->addPendingWrite();
+                    break;
+                case kRW_GrIOType:
+                    resource->addPendingRead();
+                    resource->addPendingWrite();
+                    break;
+            }
+        }
+        this->release();
+        fResource = resource;
+    }
+
+    ~GrPendingIOResource() {
+        this->release();
+    }
+
+    explicit operator bool() const { return SkToBool(fResource); }
+
+    bool operator==(const GrPendingIOResource& other) const {
+        return fResource == other.fResource;
+    }
+
+    T* get() const { return fResource; }
+
+private:
+    void release() {
+        if (fResource) {
+            switch (IO_TYPE) {
+                case kRead_GrIOType:
+                    fResource->completedRead();
+                    break;
+                case kWrite_GrIOType:
+                    fResource->completedWrite();
+                    break;
+                case kRW_GrIOType:
+                    fResource->completedRead();
+                    fResource->completedWrite();
+                    break;
+            }
+        }
+    }
+
+    T* fResource;
+};
+#endif
diff --git a/gfx/skia/skia/include/gpu/GrInvariantOutput.h b/gfx/skia/skia/include/gpu/GrInvariantOutput.h
new file mode 100644
index 000000000000..8cf4bf59c324
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/GrInvariantOutput.h
@@ -0,0 +1,330 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrInvariantOutput_DEFINED
+#define GrInvariantOutput_DEFINED
+
+#include "GrColor.h"
+
+struct GrInitInvariantOutput {
+    GrInitInvariantOutput()
+        : fValidFlags(kNone_GrColorComponentFlags)
+        , fColor(0)
+        , fIsSingleComponent(false)
+        , fIsLCDCoverage(false) {}
+
+    void setKnownFourComponents(GrColor color) {
+        fColor = color;
+        fValidFlags = kRGBA_GrColorComponentFlags;
+        fIsSingleComponent = false;
+    }
+
+    void setUnknownFourComponents() {
+        fValidFlags = kNone_GrColorComponentFlags;
+        fIsSingleComponent = false;
+    }
+
+    void setUnknownOpaqueFourComponents() {
+        fColor = 0xffU << GrColor_SHIFT_A;
+        fValidFlags = kA_GrColorComponentFlag;
+        fIsSingleComponent = false;
+    }
+
+    void setKnownSingleComponent(uint8_t alpha) {
+        fColor = GrColorPackRGBA(alpha, alpha, alpha, alpha);
+        fValidFlags = kRGBA_GrColorComponentFlags;
+        fIsSingleComponent = true;
+    }
+
+    void setUnknownSingleComponent() {
+        fValidFlags = kNone_GrColorComponentFlags;
+        fIsSingleComponent = true;
+    }
+
+    void setUsingLCDCoverage() { fIsLCDCoverage = true; }
+
+    GrColorComponentFlags   fValidFlags;
+    GrColor                 fColor;
+    bool                    fIsSingleComponent;
+    bool                    fIsLCDCoverage; // Temorary data member until texture pixel configs are
+                                            // updated
+};
+
+class GrInvariantOutput {
+public:
+    GrInvariantOutput(GrColor color, GrColorComponentFlags flags, bool isSingleComponent)
+        : fColor(color)
+        , fValidFlags(flags)
+        , fIsSingleComponent(isSingleComponent)
+        , fNonMulStageFound(false)
+        , fWillUseInputColor(true)
+        , fIsLCDCoverage(false) {}
+
+    GrInvariantOutput(const GrInitInvariantOutput& io)
+        : fColor(io.fColor)
+        , fValidFlags(io.fValidFlags)
+        , fIsSingleComponent(io.fIsSingleComponent)
+        , fNonMulStageFound(false)
+        , fWillUseInputColor(false)
+        , fIsLCDCoverage(io.fIsLCDCoverage) {}
+
+    virtual ~GrInvariantOutput() {}
+
+    enum ReadInput {
+        kWill_ReadInput,
+        kWillNot_ReadInput,
+    };
+
+    void mulByUnknownOpaqueFourComponents() {
+        SkDEBUGCODE(this->validate());
+        if (this->isOpaque()) {
+            fValidFlags = kA_GrColorComponentFlag;
+            fIsSingleComponent = false;
+        } else {
+            // Since the current state is not opaque we no longer care if the color being
+            // multiplied is opaque.
+            this->mulByUnknownFourComponents();
+        }
+        SkDEBUGCODE(this->validate());
+    }
+
+    void mulByUnknownFourComponents() {
+        SkDEBUGCODE(this->validate());
+        if (this->hasZeroAlpha()) {
+            this->internalSetToTransparentBlack();
+        } else {
+            this->internalSetToUnknown();
+        }
+        SkDEBUGCODE(this->validate());
+    }
+
+    void mulByUnknownSingleComponent() {
+        SkDEBUGCODE(this->validate());
+        if (this->hasZeroAlpha()) {
+            this->internalSetToTransparentBlack();
+        } else {
+            // We don't need to change fIsSingleComponent in this case
+            fValidFlags = kNone_GrColorComponentFlags;
+        }
+        SkDEBUGCODE(this->validate());
+    }
+
+    void mulByKnownSingleComponent(uint8_t alpha) {
+        SkDEBUGCODE(this->validate());
+        if (this->hasZeroAlpha() || 0 == alpha) {
+            this->internalSetToTransparentBlack();
+        } else {
+            if (alpha != 255) {
+                // Multiply color by alpha
+                fColor = GrColorPackRGBA(SkMulDiv255Round(GrColorUnpackR(fColor), alpha),
+                                         SkMulDiv255Round(GrColorUnpackG(fColor), alpha),
+                                         SkMulDiv255Round(GrColorUnpackB(fColor), alpha),
+                                         SkMulDiv255Round(GrColorUnpackA(fColor), alpha));
+                // We don't need to change fIsSingleComponent in this case
+            }
+        }
+        SkDEBUGCODE(this->validate());
+    }
+
+    void mulByKnownFourComponents(GrColor color) {
+        SkDEBUGCODE(this->validate());
+        uint32_t a;
+        if (GetAlphaAndCheckSingleChannel(color, &a)) {
+            this->mulByKnownSingleComponent(a);
+        } else {
+            if (color != 0xffffffff) {
+                fColor = GrColorPackRGBA(
+                    SkMulDiv255Round(GrColorUnpackR(fColor), GrColorUnpackR(color)),
+                    SkMulDiv255Round(GrColorUnpackG(fColor), GrColorUnpackG(color)),
+                    SkMulDiv255Round(GrColorUnpackB(fColor), GrColorUnpackB(color)),
+                    SkMulDiv255Round(GrColorUnpackA(fColor), a));
+                if (kRGBA_GrColorComponentFlags == fValidFlags) {
+                    fIsSingleComponent = GetAlphaAndCheckSingleChannel(fColor, &a);
+                }
+            }
+        }
+        SkDEBUGCODE(this->validate());
+    }
+
+    // Ignores the incoming color's RGB and muls its alpha by color.
+    void mulAlphaByKnownFourComponents(GrColor color) {
+        SkDEBUGCODE(this->validate());
+        uint32_t a;
+        if (GetAlphaAndCheckSingleChannel(color, &a)) {
+            this->mulAlphaByKnownSingleComponent(a);
+        } else if (fValidFlags & kA_GrColorComponentFlag) {
+            GrColor preAlpha = GrColorUnpackA(fColor);
+            if (0 == preAlpha) {
+                this->internalSetToTransparentBlack();
+            } else {
+                // We know that color has different component values
+                fIsSingleComponent = false;
+                fColor = GrColorPackRGBA(
+                    SkMulDiv255Round(preAlpha, GrColorUnpackR(color)),
+                    SkMulDiv255Round(preAlpha, GrColorUnpackG(color)),
+                    SkMulDiv255Round(preAlpha, GrColorUnpackB(color)),
+                    SkMulDiv255Round(preAlpha, a));
+                fValidFlags = kRGBA_GrColorComponentFlags;
+            }
+        } else {
+            fIsSingleComponent = false;
+            fValidFlags = kNone_GrColorComponentFlags;
+        }
+        SkDEBUGCODE(this->validate());
+    }
+
+    // Ignores the incoming color's RGB and muls its alpha by the alpha param and sets all channels
+    // equal to that value.
+    void mulAlphaByKnownSingleComponent(uint8_t alpha) {
+        SkDEBUGCODE(this->validate());
+        if (0 == alpha || this->hasZeroAlpha()) {
+            this->internalSetToTransparentBlack();
+        } else {
+            if (fValidFlags & kA_GrColorComponentFlag) {
+                GrColor a = GrColorUnpackA(fColor);
+                a = SkMulDiv255Round(alpha, a);
+                fColor = GrColorPackRGBA(a, a, a, a);
+                fValidFlags = kRGBA_GrColorComponentFlags;
+            } else {
+                fValidFlags = kNone_GrColorComponentFlags;
+            }
+            fIsSingleComponent = true;
+        }
+        SkDEBUGCODE(this->validate());
+    }
+
+    void invalidateComponents(GrColorComponentFlags invalidateFlags, ReadInput readsInput) {
+        SkDEBUGCODE(this->validate());
+        fValidFlags = (fValidFlags & ~invalidateFlags);
+        fIsSingleComponent = false;
+        fNonMulStageFound = true;
+        if (kWillNot_ReadInput == readsInput) {
+            fWillUseInputColor = false;
+        }
+        SkDEBUGCODE(this->validate());
+    }
+
+    void setToOther(GrColorComponentFlags validFlags, GrColor color, ReadInput readsInput) {
+        SkDEBUGCODE(this->validate());
+        fValidFlags = validFlags;
+        fColor = color;
+        fIsSingleComponent = false;
+        fNonMulStageFound = true;
+        if (kWillNot_ReadInput == readsInput) {
+            fWillUseInputColor = false;
+        }
+        if (kRGBA_GrColorComponentFlags == fValidFlags) {
+            uint32_t a;
+            if (GetAlphaAndCheckSingleChannel(color, &a)) {
+                fIsSingleComponent = true;
+            }
+        }
+        SkDEBUGCODE(this->validate());
+    }
+
+    void setToUnknown(ReadInput readsInput) {
+        SkDEBUGCODE(this->validate());
+        this->internalSetToUnknown();
+        fNonMulStageFound= true;
+        if (kWillNot_ReadInput == readsInput) {
+            fWillUseInputColor = false;
+        }
+        SkDEBUGCODE(this->validate());
+    }
+
+    // Temporary setter to handle LCD text correctly until we improve texture pixel config queries
+    // and thus can rely solely on number of coverage components for RGA vs single channel coverage.
+    void setUsingLCDCoverage() {
+        fIsLCDCoverage = true;
+    }
+
+    GrColor color() const { return fColor; }
+    GrColorComponentFlags validFlags() const { return fValidFlags; }
+    bool willUseInputColor() const { return fWillUseInputColor; }
+
+    /**
+     * If isSingleComponent is true, then the flag values for r, g, b, and a must all be the
+     * same. If the flags are all set then all color components must be equal.
+     */
+    SkDEBUGCODE(void validate() const;)
+
+private:
+    friend class GrProcOptInfo;
+
+    /** Extracts the alpha channel and returns true if r,g,b == a. */
+    static bool GetAlphaAndCheckSingleChannel(GrColor color, uint32_t* alpha) {
+        *alpha = GrColorUnpackA(color);
+        return *alpha == GrColorUnpackR(color) && *alpha == GrColorUnpackG(color) &&
+               *alpha == GrColorUnpackB(color);
+    }
+
+    void reset(GrColor color, GrColorComponentFlags flags, bool isSingleComponent) {
+        fColor = color;
+        fValidFlags = flags;
+        fIsSingleComponent = isSingleComponent;
+        fNonMulStageFound = false;
+        fWillUseInputColor = true;
+    }
+
+    void reset(const GrInitInvariantOutput& io) {
+        fColor = io.fColor;
+        fValidFlags = io.fValidFlags;
+        fIsSingleComponent = io.fIsSingleComponent;
+        fNonMulStageFound = false;
+        fWillUseInputColor = true;
+        fIsLCDCoverage = io.fIsLCDCoverage;
+    }
+
+    void internalSetToTransparentBlack() {
+        fValidFlags = kRGBA_GrColorComponentFlags;
+        fColor = 0;
+        fIsSingleComponent = true;
+    }
+
+    void internalSetToUnknown() {
+        fValidFlags = kNone_GrColorComponentFlags;
+        fIsSingleComponent = false;
+    }
+
+    bool hasZeroAlpha() const {
+        return ((fValidFlags & kA_GrColorComponentFlag) && 0 == GrColorUnpackA(fColor));
+    }
+
+    bool isOpaque() const {
+        return ((fValidFlags & kA_GrColorComponentFlag) && 0xFF == GrColorUnpackA(fColor));
+    }
+
+    bool isSolidWhite() const {
+        return (fValidFlags == kRGBA_GrColorComponentFlags && 0xFFFFFFFF == fColor);
+    }
+
+    bool isSingleComponent() const { return fIsSingleComponent; }
+
+    void resetWillUseInputColor() { fWillUseInputColor = true; }
+
+    bool allStagesMulInput() const { return !fNonMulStageFound; }
+    void resetNonMulStageFound() { fNonMulStageFound = false; }
+
+    bool isLCDCoverage() const { return fIsLCDCoverage; }
+
+    SkDEBUGCODE(bool colorComponentsAllEqual() const;)
+    /**
+     * If alpha is valid, check that any valid R,G,B values are <= A
+     */
+    SkDEBUGCODE(bool validPreMulColor() const;)
+
+    GrColor fColor;
+    GrColorComponentFlags fValidFlags;
+    bool fIsSingleComponent;
+    bool fNonMulStageFound;
+    bool fWillUseInputColor;
+    bool fIsLCDCoverage; // Temorary data member until texture pixel configs are updated
+
+};
+
+#endif
+
diff --git a/gfx/skia/skia/include/gpu/GrPaint.h b/gfx/skia/skia/include/gpu/GrPaint.h
index 20dec35b5bed..152cb51d7e71 100644
--- a/gfx/skia/skia/include/gpu/GrPaint.h
+++ b/gfx/skia/skia/include/gpu/GrPaint.h
@@ -11,8 +11,11 @@
 #define GrPaint_DEFINED
 
 #include "GrColor.h"
-#include "GrEffectStage.h"
+#include "GrXferProcessor.h"
+#include "effects/GrPorterDuffXferProcessor.h"
+#include "GrFragmentProcessor.h"
 
+#include "SkRegion.h"
 #include "SkXfermode.h"
 
 /**
@@ -20,45 +23,26 @@
  * functions and the how color is blended with the destination pixel.
  *
  * The paint allows installation of custom color and coverage stages. New types of stages are
- * created by subclassing GrEffect.
+ * created by subclassing GrProcessor.
  *
  * The primitive color computation starts with the color specified by setColor(). This color is the
- * input to the first color stage. Each color stage feeds its output to the next color stage. The
- * final color stage's output color is input to the color filter specified by
- * setXfermodeColorFilter which produces the final source color, S.
+ * input to the first color stage. Each color stage feeds its output to the next color stage.
  *
  * Fractional pixel coverage follows a similar flow. The coverage is initially the value specified
  * by setCoverage(). This is input to the first coverage stage. Coverage stages are chained
  * together in the same manner as color stages. The output of the last stage is modulated by any
  * fractional coverage produced by anti-aliasing. This last step produces the final coverage, C.
  *
- * setBlendFunc() specifies blending coefficients for S (described above) and D, the initial value
- * of the destination pixel, labeled Bs and Bd respectively. The final value of the destination
- * pixel is then D' = (1-C)*D + C*(Bd*D + Bs*S).
- *
- * Note that the coverage is applied after the blend. This is why they are computed as distinct
- * values.
- *
- * TODO: Encapsulate setXfermodeColorFilter in a GrEffect and remove from GrPaint.
+ * setXPFactory is used to control blending between the output color and dest. It also implements
+ * the application of fractional coverage from the coverage pipeline.
  */
 class GrPaint {
 public:
-    GrPaint() { this->reset(); }
+    GrPaint();
 
     GrPaint(const GrPaint& paint) { *this = paint; }
 
-    ~GrPaint() {}
-
-    /**
-     * Sets the blending coefficients to use to blend the final primitive color with the
-     * destination color. Defaults to kOne for src and kZero for dst (i.e. src mode).
-     */
-    void setBlendFunc(GrBlendCoeff srcCoeff, GrBlendCoeff dstCoeff) {
-        fSrcBlendCoeff = srcCoeff;
-        fDstBlendCoeff = dstCoeff;
-    }
-    GrBlendCoeff getSrcBlendCoeff() const { return fSrcBlendCoeff; }
-    GrBlendCoeff getDstBlendCoeff() const { return fDstBlendCoeff; }
+    ~GrPaint() { this->resetFragmentProcessors();  }
 
     /**
      * The initial color of the drawn primitive. Defaults to solid white.
@@ -66,189 +50,112 @@ public:
     void setColor(GrColor color) { fColor = color; }
     GrColor getColor() const { return fColor; }
 
-    /**
-     * Applies fractional coverage to the entire drawn primitive. Defaults to 0xff.
-     */
-    void setCoverage(uint8_t coverage) { fCoverage = coverage; }
-    uint8_t getCoverage() const { return fCoverage; }
-
     /**
      * Should primitives be anti-aliased or not. Defaults to false.
      */
     void setAntiAlias(bool aa) { fAntiAlias = aa; }
     bool isAntiAlias() const { return fAntiAlias; }
 
-    /**
-     * Should dithering be applied. Defaults to false.
-     */
-    void setDither(bool dither) { fDither = dither; }
-    bool isDither() const { return fDither; }
+    const GrXPFactory* setXPFactory(const GrXPFactory* xpFactory) {
+        fXPFactory.reset(SkSafeRef(xpFactory));
+        return xpFactory;
+    }
+
+    void setPorterDuffXPFactory(SkXfermode::Mode mode) {
+        fXPFactory.reset(GrPorterDuffXPFactory::Create(mode));
+    }
+
+    void setCoverageSetOpXPFactory(SkRegion::Op regionOp, bool invertCoverage = false); 
 
     /**
-     * Appends an additional color effect to the color computation.
+     * Appends an additional color processor to the color computation.
      */
-    const GrEffect* addColorEffect(const GrEffect* effect, int attr0 = -1, int attr1 = -1) {
-        SkASSERT(NULL != effect);
-        if (!effect->willUseInputColor()) {
-            fColorStages.reset();
-        }
-        SkNEW_APPEND_TO_TARRAY(&fColorStages, GrEffectStage, (effect, attr0, attr1));
-        return effect;
+    const GrFragmentProcessor* addColorFragmentProcessor(const GrFragmentProcessor* fp) {
+        SkASSERT(fp);
+        fColorFragmentProcessors.push_back(SkRef(fp));
+        return fp;
     }
 
     /**
-     * Appends an additional coverage effect to the coverage computation.
+     * Appends an additional coverage processor to the coverage computation.
      */
-    const GrEffect* addCoverageEffect(const GrEffect* effect, int attr0 = -1, int attr1 = -1) {
-        SkASSERT(NULL != effect);
-        if (!effect->willUseInputColor()) {
-            fCoverageStages.reset();
-        }
-        SkNEW_APPEND_TO_TARRAY(&fCoverageStages, GrEffectStage, (effect, attr0, attr1));
-        return effect;
+    const GrFragmentProcessor* addCoverageFragmentProcessor(const GrFragmentProcessor* fp) {
+        SkASSERT(fp);
+        fCoverageFragmentProcessors.push_back(SkRef(fp));
+        return fp;
     }
 
     /**
      * Helpers for adding color or coverage effects that sample a texture. The matrix is applied
      * to the src space position to compute texture coordinates.
      */
-    void addColorTextureEffect(GrTexture* texture, const SkMatrix& matrix);
-    void addCoverageTextureEffect(GrTexture* texture, const SkMatrix& matrix);
+    void addColorTextureProcessor(GrTexture*, const SkMatrix&);
+    void addCoverageTextureProcessor(GrTexture*, const SkMatrix&);
+    void addColorTextureProcessor(GrTexture*, const SkMatrix&, const GrTextureParams&);
+    void addCoverageTextureProcessor(GrTexture*, const SkMatrix&, const GrTextureParams&);
 
-    void addColorTextureEffect(GrTexture* texture,
-                               const SkMatrix& matrix,
-                               const GrTextureParams& params);
-    void addCoverageTextureEffect(GrTexture* texture,
-                                  const SkMatrix& matrix,
-                                  const GrTextureParams& params);
+    int numColorFragmentProcessors() const { return fColorFragmentProcessors.count(); }
+    int numCoverageFragmentProcessors() const { return fCoverageFragmentProcessors.count(); }
+    int numTotalFragmentProcessors() const { return this->numColorFragmentProcessors() +
+                                              this->numCoverageFragmentProcessors(); }
 
-    int numColorStages() const { return fColorStages.count(); }
-    int numCoverageStages() const { return fCoverageStages.count(); }
-    int numTotalStages() const { return this->numColorStages() + this->numCoverageStages(); }
+    const GrXPFactory* getXPFactory() const {
+        return fXPFactory;
+    }
 
-    const GrEffectStage& getColorStage(int s) const { return fColorStages[s]; }
-    const GrEffectStage& getCoverageStage(int s) const { return fCoverageStages[s]; }
+    const GrFragmentProcessor* getColorFragmentProcessor(int i) const {
+        return fColorFragmentProcessors[i];
+    }
+    const GrFragmentProcessor* getCoverageFragmentProcessor(int i) const {
+        return fCoverageFragmentProcessors[i];
+    }
 
     GrPaint& operator=(const GrPaint& paint) {
-        fSrcBlendCoeff = paint.fSrcBlendCoeff;
-        fDstBlendCoeff = paint.fDstBlendCoeff;
         fAntiAlias = paint.fAntiAlias;
-        fDither = paint.fDither;
 
         fColor = paint.fColor;
-        fCoverage = paint.fCoverage;
+        this->resetFragmentProcessors();
+        fColorFragmentProcessors = paint.fColorFragmentProcessors;
+        fCoverageFragmentProcessors = paint.fCoverageFragmentProcessors;
+        for (int i = 0; i < fColorFragmentProcessors.count(); ++i) {
+            fColorFragmentProcessors[i]->ref();
+        }
+        for (int i = 0; i < fCoverageFragmentProcessors.count(); ++i) {
+            fCoverageFragmentProcessors[i]->ref();
+        }
 
-        fColorStages = paint.fColorStages;
-        fCoverageStages = paint.fCoverageStages;
+        fXPFactory.reset(SkSafeRef(paint.getXPFactory()));
 
         return *this;
     }
 
     /**
-     * Resets the paint to the defaults.
+     * Returns true if the paint's output color will be constant after blending. If the result is
+     * true, constantColor will be updated to contain the constant color. Note that we can conflate
+     * coverage and color, so the actual values written to pixels with partial coverage may still
+     * not seem constant, even if this function returns true.
      */
-    void reset() {
-        this->resetBlend();
-        this->resetOptions();
-        this->resetColor();
-        this->resetCoverage();
-        this->resetStages();
-    }
-
-    /**
-     * Determines whether the drawing with this paint is opaque with respect to both color blending
-     * and fractional coverage. It does not consider whether AA has been enabled on the paint or
-     * not. Depending upon whether multisampling or coverage-based AA is in use, AA may make the
-     * result only apply to the interior of primitives.
-     *
-     */
-    bool isOpaque() const;
-
-    /**
-     * Returns true if isOpaque would return true and the paint represents a solid constant color
-     * draw. If the result is true, constantColor will be updated to contain the constant color.
-     */
-    bool isOpaqueAndConstantColor(GrColor* constantColor) const;
+    bool isConstantBlendedColor(GrColor* constantColor) const;
 
 private:
-
-    /**
-     * Helper for isOpaque and isOpaqueAndConstantColor.
-     */
-    bool getOpaqueAndKnownColor(GrColor* solidColor, uint32_t* solidColorKnownComponents) const;
-
-    /**
-     * Called when the source coord system from which geometry is rendered changes. It ensures that
-     * the local coordinates seen by effects remains unchanged. oldToNew gives the transformation
-     * from the previous coord system to the new coord system.
-     */
-    void localCoordChange(const SkMatrix& oldToNew) {
-        for (int i = 0; i < fColorStages.count(); ++i) {
-            fColorStages[i].localCoordChange(oldToNew);
+    void resetFragmentProcessors() {
+        for (int i = 0; i < fColorFragmentProcessors.count(); ++i) {
+            fColorFragmentProcessors[i]->unref();
         }
-        for (int i = 0; i < fCoverageStages.count(); ++i) {
-            fCoverageStages[i].localCoordChange(oldToNew);
+        for (int i = 0; i < fCoverageFragmentProcessors.count(); ++i) {
+            fCoverageFragmentProcessors[i]->unref();
         }
+        fColorFragmentProcessors.reset();
+        fCoverageFragmentProcessors.reset();
     }
 
-    bool localCoordChangeInverse(const SkMatrix& newToOld) {
-        SkMatrix oldToNew;
-        bool computed = false;
-        for (int i = 0; i < fColorStages.count(); ++i) {
-            if (!computed && !newToOld.invert(&oldToNew)) {
-                return false;
-            } else {
-                computed = true;
-            }
-            fColorStages[i].localCoordChange(oldToNew);
-        }
-        for (int i = 0; i < fCoverageStages.count(); ++i) {
-            if (!computed && !newToOld.invert(&oldToNew)) {
-                return false;
-            } else {
-                computed = true;
-            }
-            fCoverageStages[i].localCoordChange(oldToNew);
-        }
-        return true;
-    }
+    mutable SkAutoTUnref<const GrXPFactory>         fXPFactory;
+    SkSTArray<4, const GrFragmentProcessor*, true>  fColorFragmentProcessors;
+    SkSTArray<2, const GrFragmentProcessor*, true>  fCoverageFragmentProcessors;
 
-    friend class GrContext; // To access above two functions
-    friend class GrStencilAndCoverTextContext;  // To access above two functions
+    bool                                            fAntiAlias;
 
-    SkSTArray<4, GrEffectStage> fColorStages;
-    SkSTArray<2, GrEffectStage> fCoverageStages;
-
-    GrBlendCoeff                fSrcBlendCoeff;
-    GrBlendCoeff                fDstBlendCoeff;
-    bool                        fAntiAlias;
-    bool                        fDither;
-
-    GrColor                     fColor;
-    uint8_t                     fCoverage;
-
-    void resetBlend() {
-        fSrcBlendCoeff = kOne_GrBlendCoeff;
-        fDstBlendCoeff = kZero_GrBlendCoeff;
-    }
-
-    void resetOptions() {
-        fAntiAlias = false;
-        fDither = false;
-    }
-
-    void resetColor() {
-        fColor = GrColorPackRGBA(0xff, 0xff, 0xff, 0xff);
-    }
-
-    void resetCoverage() {
-        fCoverage = 0xff;
-    }
-
-    void resetStages() {
-        fColorStages.reset();
-        fCoverageStages.reset();
-    }
+    GrColor                                         fColor;
 };
 
 #endif
diff --git a/gfx/skia/skia/include/gpu/GrProcessor.h b/gfx/skia/skia/include/gpu/GrProcessor.h
new file mode 100644
index 000000000000..9b5db5e03391
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/GrProcessor.h
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrProcessor_DEFINED
+#define GrProcessor_DEFINED
+
+#include "GrColor.h"
+#include "GrProcessorUnitTest.h"
+#include "GrProgramElement.h"
+#include "GrTextureAccess.h"
+#include "SkMath.h"
+#include "SkString.h"
+
+class GrContext;
+class GrCoordTransform;
+class GrInvariantOutput;
+
+/**
+ * Used by processors to build their keys. It incorporates each per-processor key into a larger
+ * shader key.
+ */
+class GrProcessorKeyBuilder {
+public:
+    GrProcessorKeyBuilder(SkTArray<unsigned char, true>* data) : fData(data), fCount(0) {
+        SkASSERT(0 == fData->count() % sizeof(uint32_t));
+    }
+
+    void add32(uint32_t v) {
+        ++fCount;
+        fData->push_back_n(4, reinterpret_cast<uint8_t*>(&v));
+    }
+
+    /** Inserts count uint32_ts into the key. The returned pointer is only valid until the next
+        add*() call. */
+    uint32_t* SK_WARN_UNUSED_RESULT add32n(int count) {
+        SkASSERT(count > 0);
+        fCount += count;
+        return reinterpret_cast<uint32_t*>(fData->push_back_n(4 * count));
+    }
+
+    size_t size() const { return sizeof(uint32_t) * fCount; }
+
+private:
+    SkTArray<uint8_t, true>* fData; // unowned ptr to the larger key.
+    int fCount;                     // number of uint32_ts added to fData by the processor.
+};
+
+/** Provides custom shader code to the Ganesh shading pipeline. GrProcessor objects *must* be
+    immutable: after being constructed, their fields may not change.
+
+    Dynamically allocated GrProcessors are managed by a per-thread memory pool. The ref count of an
+    processor must reach 0 before the thread terminates and the pool is destroyed.
+ */
+class GrProcessor : public GrProgramElement {
+public:
+    virtual ~GrProcessor();
+
+    /** Human-meaningful string to identify this prcoessor; may be embedded
+        in generated shader code. */
+    virtual const char* name() const = 0;
+
+    // Human-readable dump of all information 
+    virtual SkString dumpInfo() const {
+        SkString str;
+        str.appendf("Missing data");
+        return str;
+    }
+
+    int numTextures() const { return fTextureAccesses.count(); }
+
+    /** Returns the access pattern for the texture at index. index must be valid according to
+        numTextures(). */
+    const GrTextureAccess& textureAccess(int index) const { return *fTextureAccesses[index]; }
+
+    /** Shortcut for textureAccess(index).texture(); */
+    GrTexture* texture(int index) const { return this->textureAccess(index).getTexture(); }
+
+    /** Will this processor read the fragment position? */
+    bool willReadFragmentPosition() const { return fWillReadFragmentPosition; }
+
+    void* operator new(size_t size);
+    void operator delete(void* target);
+
+    void* operator new(size_t size, void* placement) {
+        return ::operator new(size, placement);
+    }
+    void operator delete(void* target, void* placement) {
+        ::operator delete(target, placement);
+    }
+
+    /**
+      * Helper for down-casting to a GrProcessor subclass
+      */
+    template <typename T> const T& cast() const { return *static_cast<const T*>(this); }
+
+    uint32_t classID() const { SkASSERT(kIllegalProcessorClassID != fClassID); return fClassID; }
+
+protected:
+    GrProcessor() : fClassID(kIllegalProcessorClassID), fWillReadFragmentPosition(false) {}
+
+    /**
+     * Subclasses call this from their constructor to register GrTextureAccesses. The processor
+     * subclass manages the lifetime of the accesses (this function only stores a pointer). The
+     * GrTextureAccess is typically a member field of the GrProcessor subclass. This must only be
+     * called from the constructor because GrProcessors are immutable.
+     */
+    virtual void addTextureAccess(const GrTextureAccess* textureAccess);
+
+    bool hasSameTextureAccesses(const GrProcessor&) const;
+
+    /**
+     * If the prcoessor will generate a backend-specific processor that will read the fragment
+     * position in the FS then it must call this method from its constructor. Otherwise, the
+     * request to access the fragment position will be denied.
+     */
+    void setWillReadFragmentPosition() { fWillReadFragmentPosition = true; }
+
+    template <typename PROC_SUBCLASS> void initClassID() {
+         static uint32_t kClassID = GenClassID();
+         fClassID = kClassID;
+    }
+
+    uint32_t fClassID;
+    SkSTArray<4, const GrTextureAccess*, true>   fTextureAccesses;
+
+private:
+    static uint32_t GenClassID() {
+        // fCurrProcessorClassID has been initialized to kIllegalProcessorClassID. The
+        // atomic inc returns the old value not the incremented value. So we add
+        // 1 to the returned value.
+        uint32_t id = static_cast<uint32_t>(sk_atomic_inc(&gCurrProcessorClassID)) + 1;
+        if (!id) {
+            SkFAIL("This should never wrap as it should only be called once for each GrProcessor "
+                   "subclass.");
+        }
+        return id;
+    }
+
+    enum {
+        kIllegalProcessorClassID = 0,
+    };
+    static int32_t gCurrProcessorClassID;
+
+    bool                                         fWillReadFragmentPosition;
+
+    typedef GrProgramElement INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/include/gpu/GrProcessorUnitTest.h b/gfx/skia/skia/include/gpu/GrProcessorUnitTest.h
new file mode 100644
index 000000000000..bb16d69fd519
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/GrProcessorUnitTest.h
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrProcessorUnitTest_DEFINED
+#define GrProcessorUnitTest_DEFINED
+
+#include "GrTestUtils.h"
+#include "SkTArray.h"
+#include "SkTypes.h"
+
+class SkMatrix;
+class GrCaps;
+class GrContext;
+class GrRenderTarget;
+struct GrProcessorTestData;
+
+namespace GrProcessorUnitTest {
+
+// Used to access the dummy textures in TestCreate procs.
+enum {
+    kSkiaPMTextureIdx = 0,
+    kAlphaTextureIdx = 1,
+};
+
+/** This allows parent FPs to implement a test create with known leaf children in order to avoid
+creating an unbounded FP tree which may overflow various shader limits. */
+const GrFragmentProcessor* CreateChildFP(GrProcessorTestData*);
+
+}
+
+/*
+ * GrProcessorTestData is an argument struct to TestCreate functions
+ * fTextures are valid textures that can optionally be used to construct
+ * GrTextureAccesses. The first texture has config kSkia8888_GrPixelConfig and the second has
+ * kAlpha_8_GrPixelConfig. TestCreate functions are also free to create additional textures using
+ * the GrContext.
+ */
+struct GrProcessorTestData {
+    GrProcessorTestData(SkRandom* random,
+                        GrContext* context,
+                        const GrCaps* caps,
+                        const GrRenderTarget* rt,
+                        GrTexture* textures[2])
+        : fRandom(random)
+        , fContext(context)
+        , fCaps(caps)
+        , fRenderTarget(rt) {
+        fTextures[0] = textures[0];
+        fTextures[1] = textures[1];
+    }
+    SkRandom* fRandom;
+    GrContext* fContext;
+    const GrCaps* fCaps;
+    const GrRenderTarget* fRenderTarget;
+    GrTexture* fTextures[2];
+};
+
+#if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
+
+class GrProcessor;
+class GrTexture;
+
+template <class Processor> class GrProcessorTestFactory : SkNoncopyable {
+public:
+    typedef const Processor* (*CreateProc)(GrProcessorTestData*);
+
+    GrProcessorTestFactory(CreateProc createProc) {
+        fCreateProc = createProc;
+        GetFactories()->push_back(this);
+    }
+
+    /** Pick a random factory function and create a processor.  */
+    static const Processor* Create(GrProcessorTestData* data) {
+        VerifyFactoryCount();
+        SkASSERT(GetFactories()->count());
+        uint32_t idx = data->fRandom->nextRangeU(0, GetFactories()->count() - 1);
+        return CreateIdx(idx, data);
+    }
+
+    /** Number of registered factory functions */
+    static int Count() { return GetFactories()->count(); }
+
+    /** Use factory function at Index idx to create a processor. */
+    static const Processor* CreateIdx(int idx, GrProcessorTestData* data) {
+        GrProcessorTestFactory<Processor>* factory = (*GetFactories())[idx];
+        return factory->fCreateProc(data);
+    }
+
+    /*
+     * A test function which verifies the count of factories.
+     */
+    static void VerifyFactoryCount();
+
+private:
+    CreateProc fCreateProc;
+
+    static SkTArray<GrProcessorTestFactory<Processor>*, true>* GetFactories();
+};
+
+/** GrProcessor subclasses should insert this macro in their declaration to be included in the
+ *  program generation unit test.
+ */
+#define GR_DECLARE_GEOMETRY_PROCESSOR_TEST                                                         \
+    static GrProcessorTestFactory<GrGeometryProcessor> gTestFactory SK_UNUSED;                     \
+    static const GrGeometryProcessor* TestCreate(GrProcessorTestData*)
+
+#define GR_DECLARE_FRAGMENT_PROCESSOR_TEST                                                         \
+    static GrProcessorTestFactory<GrFragmentProcessor> gTestFactory SK_UNUSED;                     \
+    static const GrFragmentProcessor* TestCreate(GrProcessorTestData*)
+
+#define GR_DECLARE_XP_FACTORY_TEST                                                                 \
+    static GrProcessorTestFactory<GrXPFactory> gTestFactory SK_UNUSED;                             \
+    static const GrXPFactory* TestCreate(GrProcessorTestData*)
+
+/** GrProcessor subclasses should insert this macro in their implementation file. They must then
+ *  also implement this static function:
+ *      GrProcessor* TestCreate(GrProcessorTestData*);
+ */
+#define GR_DEFINE_FRAGMENT_PROCESSOR_TEST(Effect)                                                  \
+    GrProcessorTestFactory<GrFragmentProcessor> Effect :: gTestFactory(Effect :: TestCreate)
+
+#define GR_DEFINE_XP_FACTORY_TEST(Factory)                                                         \
+    GrProcessorTestFactory<GrXPFactory> Factory :: gTestFactory(Factory :: TestCreate)
+
+#define GR_DEFINE_GEOMETRY_PROCESSOR_TEST(Effect)                                                  \
+    GrProcessorTestFactory<GrGeometryProcessor> Effect :: gTestFactory(Effect :: TestCreate)
+
+#else // !SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
+
+// The unit test relies on static initializers. Just declare the TestCreate function so that
+// its definitions will compile.
+#define GR_DECLARE_FRAGMENT_PROCESSOR_TEST                                                         \
+    static const GrFragmentProcessor* TestCreate(GrProcessorTestData*)
+#define GR_DEFINE_FRAGMENT_PROCESSOR_TEST(X)
+
+// The unit test relies on static initializers. Just declare the TestCreate function so that
+// its definitions will compile.
+#define GR_DECLARE_XP_FACTORY_TEST                                                                 \
+    static const GrXPFactory* TestCreate(GrProcessorTestData*)
+#define GR_DEFINE_XP_FACTORY_TEST(X)
+
+// The unit test relies on static initializers. Just declare the TestCreate function so that
+// its definitions will compile.
+#define GR_DECLARE_GEOMETRY_PROCESSOR_TEST                                                         \
+    static const GrGeometryProcessor* TestCreate(GrProcessorTestData*)
+#define GR_DEFINE_GEOMETRY_PROCESSOR_TEST(X)
+
+#endif // !SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
+#endif
diff --git a/gfx/skia/skia/include/gpu/GrProgramElement.h b/gfx/skia/skia/include/gpu/GrProgramElement.h
new file mode 100644
index 000000000000..8305c5027b0f
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/GrProgramElement.h
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrProgramElement_DEFINED
+#define GrProgramElement_DEFINED
+
+#include "SkRefCnt.h"
+#include "SkTArray.h"
+
+class GrGpuResourceRef;
+
+/**
+ * Base class for GrProcessor. This exists to manage transitioning a GrProcessor from being owned by
+ * a client to being scheduled for execution. While a GrProcessor is ref'ed by drawing code its
+ * GrGpu resources must also be ref'ed to prevent incorrectly recycling them through the cache.
+ * However, once the GrProcessor is baked into a GrPipeline and the drawing code has stopped ref'ing
+ * it, it's internal resources can be recycled in some cases.
+ *
+ * We track this using two types of refs on GrProgramElement. A regular ref is owned by any client
+ * that may continue to issue draws that use the GrProgramElement. The GrPipeline owns "pending
+ * executions" instead of refs. A pending execution is cleared by ~GrPipeline().
+ *
+ * While a GrProgramElement is ref'ed any resources it owns are also ref'ed. However, once it gets
+ * into the state where it has pending executions AND no refs then it converts its ownership of
+ * its GrGpuResources from refs to pending IOs. The pending IOs allow the cache to track when it is
+ * safe to recycle a resource even though we still have buffered GrBatches that read or write to the
+ * the resource.
+ *
+ * To make this work all GrGpuResource objects owned by a GrProgramElement or derived classes
+ * (either directly or indirectly) must be wrapped in a GrGpuResourceRef and registered with the
+ * GrProgramElement using addGpuResource(). This allows the regular refs to be converted to pending
+ * IO events when the program element is scheduled for deferred execution.
+ *
+ * Moreover, a GrProgramElement that in turn owns other GrProgramElements must convert its ownership
+ * of its children to pending executions when its ref count reaches zero so that the GrGpuResources
+ * owned by the children GrProgramElements are correctly converted from ownership by ref to
+ * ownership by pending IO. Any GrProgramElement hierarchy is managed by subclasses which must
+ * implement notifyRefCntIsZero() in order to convert refs of children to pending executions.
+ */
+class GrProgramElement : public SkNoncopyable {
+public:
+    virtual ~GrProgramElement() {
+        // fRefCnt can be one when an effect is created statically using GR_CREATE_STATIC_EFFECT
+        SkASSERT((0 == fRefCnt || 1 == fRefCnt) && 0 == fPendingExecutions);
+        // Set to invalid values.
+        SkDEBUGCODE(fRefCnt = fPendingExecutions = -10;)
+    }
+
+    void ref() const {
+        this->validate();
+        // Once the ref cnt reaches zero it should never be ref'ed again.
+        SkASSERT(fRefCnt > 0);
+        ++fRefCnt;
+        this->validate();
+    }
+
+    void unref() const {
+        this->validate();
+        --fRefCnt;
+        if (0 == fRefCnt) {
+            this->notifyRefCntIsZero();
+            if (0 == fPendingExecutions) {
+                delete this;
+                return;
+            } else {
+                this->removeRefs();
+            }
+        }
+        this->validate();
+    }
+
+    /**
+     * Gets an id that is unique for this GrProgramElement object. This will never return 0.
+     */
+    uint32_t getUniqueID() const { return fUniqueID; }
+
+    void validate() const {
+#ifdef SK_DEBUG
+        SkASSERT(fRefCnt >= 0);
+        SkASSERT(fPendingExecutions >= 0);
+        SkASSERT(fRefCnt + fPendingExecutions > 0);
+#endif
+    }
+
+protected:
+    GrProgramElement() : fRefCnt(1), fPendingExecutions(0), fUniqueID(CreateUniqueID()) {}
+
+    /** Subclasses registers their resources using this function. It is assumed the GrProgramResouce
+        is and will remain owned by the subclass and this function will retain a raw ptr. Once a
+        GrGpuResourceRef is registered its setResource must not be called.
+     */
+    void addGpuResource(const GrGpuResourceRef* res) {
+        fGpuResources.push_back(res);
+    }
+
+    void addPendingExecution() const {
+        this->validate();
+        SkASSERT(fRefCnt > 0);
+        if (0 == fPendingExecutions) {
+            this->addPendingIOs();
+        }
+        ++fPendingExecutions;
+        this->validate();
+    }
+
+    void completedExecution() const {
+        this->validate();
+        --fPendingExecutions;
+        if (0 == fPendingExecutions) {
+            if (0 == fRefCnt) {
+                delete this;
+                return;
+            } else {
+                this->pendingIOComplete();
+            }
+        }
+        this->validate();
+    }
+
+private:
+    /** This will be called when the ref cnt is zero. The object may or may not have pending
+        executions. */
+    virtual void notifyRefCntIsZero() const = 0;
+
+    static uint32_t CreateUniqueID();
+
+    void removeRefs() const;
+    void addPendingIOs() const;
+    void pendingIOComplete() const;
+
+    mutable int32_t fRefCnt;
+    // Count of deferred executions not yet issued to the 3D API.
+    mutable int32_t fPendingExecutions;
+    uint32_t        fUniqueID;
+
+    SkSTArray<4, const GrGpuResourceRef*, true> fGpuResources;
+
+    // Only this class can access addPendingExecution() and completedExecution().
+    template <typename T> friend class GrPendingProgramElement;
+
+    typedef SkNoncopyable INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/include/gpu/GrRenderTarget.h b/gfx/skia/skia/include/gpu/GrRenderTarget.h
index 6a3f26fe702a..d39d284bd825 100644
--- a/gfx/skia/skia/include/gpu/GrRenderTarget.h
+++ b/gfx/skia/skia/include/gpu/GrRenderTarget.h
@@ -11,74 +11,84 @@
 #include "GrSurface.h"
 #include "SkRect.h"
 
-class GrStencilBuffer;
-class GrTexture;
+class GrDrawTarget;
+class GrStencilAttachment;
+class GrRenderTargetPriv;
 
 /**
  * GrRenderTarget represents a 2D buffer of pixels that can be rendered to.
  * A context's render target is set by setRenderTarget(). Render targets are
- * created by a createTexture with the kRenderTarget_TextureFlag flag.
+ * created by a createTexture with the kRenderTarget_SurfaceFlag flag.
  * Additionally, GrContext provides methods for creating GrRenderTargets
  * that wrap externally created render targets.
  */
-class GrRenderTarget : public GrSurface {
+class GrRenderTarget : virtual public GrSurface {
 public:
-    SK_DECLARE_INST_COUNT(GrRenderTarget)
-
-    // GrResource overrides
-    virtual size_t gpuMemorySize() const SK_OVERRIDE;
-
     // GrSurface overrides
-    /**
-     * @return the texture associated with the render target, may be NULL.
-     */
-    virtual GrTexture* asTexture() SK_OVERRIDE { return fTexture; }
-    virtual const GrTexture* asTexture() const SK_OVERRIDE { return fTexture; }
-
-    /**
-     * @return this render target.
-     */
-    virtual GrRenderTarget* asRenderTarget() SK_OVERRIDE { return this; }
-    virtual const GrRenderTarget* asRenderTarget() const  SK_OVERRIDE {
-        return this;
-    }
-
-    virtual bool readPixels(int left, int top, int width, int height,
-                            GrPixelConfig config,
-                            void* buffer,
-                            size_t rowBytes = 0,
-                            uint32_t pixelOpsFlags = 0) SK_OVERRIDE;
-
-    virtual void writePixels(int left, int top, int width, int height,
-                             GrPixelConfig config,
-                             const void* buffer,
-                             size_t rowBytes = 0,
-                             uint32_t pixelOpsFlags = 0) SK_OVERRIDE;
+    GrRenderTarget* asRenderTarget() override { return this; }
+    const GrRenderTarget* asRenderTarget() const  override { return this; }
 
     // GrRenderTarget
     /**
-     * If this RT is multisampled, this is the multisample buffer
-     * @return the 3D API's handle to this object (e.g. FBO ID in OpenGL)
-     */
-    virtual GrBackendObject getRenderTargetHandle() const = 0;
+     * On some hardware it is possible for a render target to have multisampling
+     * only in certain buffers.
+     * Enforce only two legal sample configs.
+     * kUnified_SampleConfig signifies multisampling in both color and stencil
+     * buffers and is available across all hardware.
+     * kStencil_SampleConfig means multisampling is present in stencil buffer
+     * only; this config requires hardware support of
+     * NV_framebuffer_mixed_samples.
+    */
+    enum SampleConfig {
+        kUnified_SampleConfig = 0,
+        kStencil_SampleConfig = 1
+    };
 
     /**
-     * If this RT is multisampled, this is the buffer it is resolved to.
-     * Otherwise, same as getRenderTargetHandle().
-     * (In GL a separate FBO ID is used for the MSAA and resolved buffers)
-     * @return the 3D API's handle to this object (e.g. FBO ID in OpenGL)
+     * @return true if the surface is multisampled in all buffers,
+     *         false otherwise
      */
-    virtual GrBackendObject getRenderTargetResolvedHandle() const = 0;
+    bool isUnifiedMultisampled() const {
+        if (fSampleConfig != kUnified_SampleConfig) {
+            return false;
+        }
+        return 0 != fDesc.fSampleCnt;
+    }
 
     /**
-     * @return true if the surface is multisampled, false otherwise
+     * @return true if the surface is multisampled in the stencil buffer,
+     *         false otherwise
      */
-    bool isMultisampled() const { return 0 != fDesc.fSampleCnt; }
+    bool isStencilBufferMultisampled() const {
+        return 0 != fDesc.fSampleCnt;
+    }
 
     /**
-     * @return the number of samples-per-pixel or zero if non-MSAA.
+     * @return the number of color samples-per-pixel, or zero if non-MSAA or
+     *         multisampled in the stencil buffer only.
      */
-    int numSamples() const { return fDesc.fSampleCnt; }
+    int numColorSamples() const {
+        if (fSampleConfig == kUnified_SampleConfig) {
+            return fDesc.fSampleCnt;
+        }
+        return 0;
+    }
+
+    /**
+     * @return the number of stencil samples-per-pixel, or zero if non-MSAA.
+     */
+    int numStencilSamples() const {
+        return fDesc.fSampleCnt;
+    }
+
+    /**
+     * @return true if the surface is mixed sampled, false otherwise.
+     */
+    bool hasMixedSamples() const {
+        SkASSERT(kStencil_SampleConfig != fSampleConfig ||
+                 this->isStencilBufferMultisampled());
+        return kStencil_SampleConfig == fSampleConfig;
+    }
 
     /**
      * Call to indicate the multisample contents were modified such that the
@@ -113,14 +123,6 @@ public:
      */
     const SkIRect& getResolveRect() const { return fResolveRect; }
 
-    /**
-     * If the render target is multisampled this will perform a multisample
-     * resolve. Any pending draws to the target are first flushed. This only
-     * applies to render targets that are associated with GrTextures. After the
-     * function returns the GrTexture will contain the resolved pixels.
-     */
-    void resolve();
-
     /**
      * Provide a performance hint that the render target's contents are allowed
      * to become undefined.
@@ -138,40 +140,61 @@ public:
     virtual ResolveType getResolveType() const = 0;
 
     /**
-     * GrStencilBuffer is not part of the public API.
+     *  Return the native ID or handle to the rendertarget, depending on the
+     *  platform. e.g. on OpenGL, return the FBO ID.
      */
-    GrStencilBuffer* getStencilBuffer() const { return fStencilBuffer; }
-    void setStencilBuffer(GrStencilBuffer* stencilBuffer);
+    virtual GrBackendObject getRenderTargetHandle() const = 0;
+
+    // Checked when this object is asked to attach a stencil buffer.
+    virtual bool canAttemptStencilAttachment() const = 0;
+
+    // Provides access to functions that aren't part of the public API.
+    GrRenderTargetPriv renderTargetPriv();
+    const GrRenderTargetPriv renderTargetPriv() const;
+
+    void setLastDrawTarget(GrDrawTarget* dt);
+    GrDrawTarget* getLastDrawTarget() { return fLastDrawTarget; }
 
 protected:
-    GrRenderTarget(GrGpu* gpu,
-                   bool isWrapped,
-                   GrTexture* texture,
-                   const GrTextureDesc& desc)
-        : INHERITED(gpu, isWrapped, desc)
-        , fStencilBuffer(NULL)
-        , fTexture(texture) {
+    GrRenderTarget(GrGpu* gpu, LifeCycle lifeCycle, const GrSurfaceDesc& desc,
+                   SampleConfig sampleConfig, GrStencilAttachment* stencil = nullptr)
+        : INHERITED(gpu, lifeCycle, desc)
+        , fStencilAttachment(stencil)
+        , fSampleConfig(sampleConfig)
+        , fLastDrawTarget(nullptr) {
         fResolveRect.setLargestInverted();
     }
 
+    ~GrRenderTarget() override;
+
     // override of GrResource
-    virtual void onAbandon() SK_OVERRIDE;
-    virtual void onRelease() SK_OVERRIDE;
+    void onAbandon() override;
+    void onRelease() override;
 
 private:
-    friend class GrTexture;
-    // called by ~GrTexture to remove the non-ref'ed back ptr.
-    void owningTextureDestroyed() {
-        SkASSERT(NULL != fTexture);
-        fTexture = NULL;
-    }
+    // Allows the backends to perform any additional work that is required for attaching a
+    // GrStencilAttachment. When this is called, the GrStencilAttachment has already been put onto
+    // the GrRenderTarget. This function must return false if any failures occur when completing the
+    // stencil attachment.
+    virtual bool completeStencilAttachment() = 0;
 
-    GrStencilBuffer*  fStencilBuffer;
-    GrTexture*        fTexture; // not ref'ed
+    friend class GrRenderTargetPriv;
 
-    SkIRect           fResolveRect;
+    GrStencilAttachment*  fStencilAttachment;
+    SampleConfig          fSampleConfig;
+
+    SkIRect               fResolveRect;
+
+    // The last drawTarget that wrote to or is currently going to write to this renderTarget
+    // The drawTarget can be closed (e.g., no draw context is currently bound
+    // to this renderTarget).
+    // This back-pointer is required so that we can add a dependancy between
+    // the drawTarget used to create the current contents of this renderTarget
+    // and the drawTarget of a destination renderTarget to which this one is being drawn.
+    GrDrawTarget* fLastDrawTarget;
 
     typedef GrSurface INHERITED;
 };
 
+
 #endif
diff --git a/gfx/skia/skia/include/gpu/GrResourceKey.h b/gfx/skia/skia/include/gpu/GrResourceKey.h
new file mode 100644
index 000000000000..9958cfc87236
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/GrResourceKey.h
@@ -0,0 +1,321 @@
+
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrResourceKey_DEFINED
+#define GrResourceKey_DEFINED
+
+#include "../private/SkTemplates.h"
+#include "GrTypes.h"
+#include "SkData.h"
+#include "../private/SkOnce.h"
+
+uint32_t GrResourceKeyHash(const uint32_t* data, size_t size);
+
+/**
+ * Base class for all GrGpuResource cache keys. There are two types of cache keys. Refer to the
+ * comments for each key type below.
+ */
+class GrResourceKey {
+public:
+    uint32_t hash() const {
+        this->validate();
+        return fKey[kHash_MetaDataIdx];
+    }
+
+    size_t size() const {
+        this->validate();
+        SkASSERT(this->isValid());
+        return this->internalSize();
+    }
+
+protected:
+    static const uint32_t kInvalidDomain = 0;
+
+    GrResourceKey() { this->reset(); }
+
+    /** Reset to an invalid key. */
+    void reset() {
+        GR_STATIC_ASSERT((uint16_t)kInvalidDomain == kInvalidDomain);
+        fKey.reset(kMetaDataCnt);
+        fKey[kHash_MetaDataIdx] = 0;
+        fKey[kDomainAndSize_MetaDataIdx] = kInvalidDomain;
+    }
+
+    bool operator==(const GrResourceKey& that) const {
+        return this->hash() == that.hash() &&
+                0 == memcmp(&fKey[kHash_MetaDataIdx + 1],
+                            &that.fKey[kHash_MetaDataIdx + 1],
+                            this->internalSize() - sizeof(uint32_t));
+    }
+
+    GrResourceKey& operator=(const GrResourceKey& that) {
+        SkASSERT(that.isValid());
+        if (this != &that) {
+            size_t bytes = that.size();
+            SkASSERT(SkIsAlign4(bytes));
+            fKey.reset(SkToInt(bytes / sizeof(uint32_t)));
+            memcpy(fKey.get(), that.fKey.get(), bytes);
+            this->validate();
+        }
+        return *this;
+    }
+
+    bool isValid() const { return kInvalidDomain != this->domain(); }
+
+    uint32_t domain() const { return fKey[kDomainAndSize_MetaDataIdx] & 0xffff; }
+
+    /** size of the key data, excluding meta-data (hash, domain, etc).  */
+    size_t dataSize() const { return this->size() - 4 * kMetaDataCnt; }
+ 
+    /** ptr to the key data, excluding meta-data (hash, domain, etc).  */
+    const uint32_t* data() const {
+        this->validate();
+        return &fKey[kMetaDataCnt];
+    }
+
+    /** Used to initialize a key. */
+    class Builder {
+    public:
+        Builder(GrResourceKey* key, uint32_t domain, int data32Count) : fKey(key) {
+            SkASSERT(data32Count >= 0);
+            SkASSERT(domain != kInvalidDomain);
+            key->fKey.reset(kMetaDataCnt + data32Count);
+            int size = (data32Count + kMetaDataCnt) * sizeof(uint32_t);
+            SkASSERT(SkToU16(size) == size);
+            SkASSERT(SkToU16(domain) == domain);
+            key->fKey[kDomainAndSize_MetaDataIdx] = domain | (size << 16);
+        }
+
+        ~Builder() { this->finish(); }
+
+        void finish() {
+            if (NULL == fKey) {
+                return;
+            }
+            GR_STATIC_ASSERT(0 == kHash_MetaDataIdx);
+            uint32_t* hash = &fKey->fKey[kHash_MetaDataIdx];
+            *hash = GrResourceKeyHash(hash + 1, fKey->internalSize() - sizeof(uint32_t));
+            fKey->validate();
+            fKey = NULL;
+        }
+
+        uint32_t& operator[](int dataIdx) {
+            SkASSERT(fKey);
+            SkDEBUGCODE(size_t dataCount = fKey->internalSize() / sizeof(uint32_t) - kMetaDataCnt;)
+            SkASSERT(SkToU32(dataIdx) < dataCount);
+            return fKey->fKey[kMetaDataCnt + dataIdx];
+        }
+
+    private:
+        GrResourceKey* fKey;
+    };
+
+private:
+    enum MetaDataIdx {
+        kHash_MetaDataIdx,
+        // The key domain and size are packed into a single uint32_t.
+        kDomainAndSize_MetaDataIdx,
+
+        kLastMetaDataIdx = kDomainAndSize_MetaDataIdx
+    };
+    static const uint32_t kMetaDataCnt = kLastMetaDataIdx + 1;
+
+    size_t internalSize() const {
+        return fKey[kDomainAndSize_MetaDataIdx] >> 16;
+    }
+
+    void validate() const {
+        SkASSERT(fKey[kHash_MetaDataIdx] ==
+                 GrResourceKeyHash(&fKey[kHash_MetaDataIdx] + 1,
+                                   this->internalSize() - sizeof(uint32_t)));
+        SkASSERT(SkIsAlign4(this->internalSize()));
+    }
+
+    friend class TestResource; // For unit test to access kMetaDataCnt.
+
+    // bmp textures require 5 uint32_t values.
+    SkAutoSTMalloc<kMetaDataCnt + 5, uint32_t> fKey;
+};
+
+/**
+ * A key used for scratch resources. There are three important rules about scratch keys:
+ *        * Multiple resources can share the same scratch key. Therefore resources assigned the same
+ *          scratch key should be interchangeable with respect to the code that uses them.
+ *        * A resource can have at most one scratch key and it is set at resource creation by the
+ *          resource itself.
+ *        * When a scratch resource is ref'ed it will not be returned from the
+ *          cache for a subsequent cache request until all refs are released. This facilitates using
+ *          a scratch key for multiple render-to-texture scenarios. An example is a separable blur:
+ *
+ *  GrTexture* texture[2];
+ *  texture[0] = get_scratch_texture(scratchKey);
+ *  texture[1] = get_scratch_texture(scratchKey); // texture[0] is already owned so we will get a
+ *                                                // different one for texture[1]
+ *  draw_mask(texture[0], path);        // draws path mask to texture[0]
+ *  blur_x(texture[0], texture[1]);     // blurs texture[0] in y and stores result in texture[1]
+ *  blur_y(texture[1], texture[0]);     // blurs texture[1] in y and stores result in texture[0]
+ *  texture[1]->unref();  // texture 1 can now be recycled for the next request with scratchKey
+ *  consume_blur(texture[0]);
+ *  texture[0]->unref();  // texture 0 can now be recycled for the next request with scratchKey
+ */
+class GrScratchKey : public GrResourceKey {
+private:
+    typedef GrResourceKey INHERITED;
+
+public:
+    /** Uniquely identifies the type of resource that is cached as scratch. */
+    typedef uint32_t ResourceType;
+
+    /** Generate a unique ResourceType. */
+    static ResourceType GenerateResourceType();
+
+    /** Creates an invalid scratch key. It must be initialized using a Builder object before use. */
+    GrScratchKey() {}
+
+    GrScratchKey(const GrScratchKey& that) { *this = that; }
+
+    /** reset() returns the key to the invalid state. */
+    using INHERITED::reset;
+
+    using INHERITED::isValid;
+
+    ResourceType resourceType() const { return this->domain(); }
+
+    GrScratchKey& operator=(const GrScratchKey& that) {
+        this->INHERITED::operator=(that);
+        return *this;
+    }
+
+    bool operator==(const GrScratchKey& that) const {
+        return this->INHERITED::operator==(that);
+    }
+    bool operator!=(const GrScratchKey& that) const { return !(*this == that); }
+
+    class Builder : public INHERITED::Builder {
+    public:
+        Builder(GrScratchKey* key, ResourceType type, int data32Count)
+            : INHERITED::Builder(key, type, data32Count) {}
+    };
+};
+
+/**
+ * A key that allows for exclusive use of a resource for a use case (AKA "domain"). There are three
+ * rules governing the use of unique keys:
+ *        * Only one resource can have a given unique key at a time. Hence, "unique".
+ *        * A resource can have at most one unique key at a time.
+ *        * Unlike scratch keys, multiple requests for a unique key will return the same
+ *          resource even if the resource already has refs.
+ * This key type allows a code path to create cached resources for which it is the exclusive user.
+ * The code path creates a domain which it sets on its keys. This guarantees that there are no
+ * cross-domain collisions.
+ *
+ * Unique keys preempt scratch keys. While a resource has a unique key it is inaccessible via its
+ * scratch key. It can become scratch again if the unique key is removed.
+ */
+class GrUniqueKey : public GrResourceKey {
+private:
+    typedef GrResourceKey INHERITED;
+
+public:
+    typedef uint32_t Domain;
+    /** Generate a Domain for unique keys. */
+    static Domain GenerateDomain();
+
+    /** Creates an invalid unique key. It must be initialized using a Builder object before use. */
+    GrUniqueKey() {}
+
+    GrUniqueKey(const GrUniqueKey& that) { *this = that; }
+
+    /** reset() returns the key to the invalid state. */
+    using INHERITED::reset;
+
+    using INHERITED::isValid;
+
+    GrUniqueKey& operator=(const GrUniqueKey& that) {
+        this->INHERITED::operator=(that);
+        this->setCustomData(that.getCustomData());
+        return *this;
+    }
+
+    bool operator==(const GrUniqueKey& that) const {
+        return this->INHERITED::operator==(that);
+    }
+    bool operator!=(const GrUniqueKey& that) const { return !(*this == that); }
+
+    void setCustomData(const SkData* data) {
+        SkSafeRef(data);
+        fData.reset(data);
+    }
+    const SkData* getCustomData() const {
+        return fData.get();
+    }
+
+    class Builder : public INHERITED::Builder {
+    public:
+        Builder(GrUniqueKey* key, Domain domain, int data32Count)
+            : INHERITED::Builder(key, domain, data32Count) {}
+
+        /** Used to build a key that wraps another key and adds additional data. */
+        Builder(GrUniqueKey* key, const GrUniqueKey& innerKey, Domain domain,
+                int extraData32Cnt)
+            : INHERITED::Builder(key, domain, Data32CntForInnerKey(innerKey) + extraData32Cnt) {
+            SkASSERT(&innerKey != key);
+            // add the inner key to the end of the key so that op[] can be indexed normally.
+            uint32_t* innerKeyData = &this->operator[](extraData32Cnt);
+            const uint32_t* srcData = innerKey.data();
+            (*innerKeyData++) = innerKey.domain();
+            memcpy(innerKeyData, srcData, innerKey.dataSize());
+        }
+
+    private:
+        static int Data32CntForInnerKey(const GrUniqueKey& innerKey) {
+            // key data + domain
+            return SkToInt((innerKey.dataSize() >> 2) + 1);
+        }
+    };
+
+private:
+    SkAutoTUnref<const SkData> fData;
+};
+
+/**
+ * It is common to need a frequently reused GrUniqueKey where the only requirement is that the key
+ * is unique. These macros create such a key in a thread safe manner so the key can be truly global
+ * and only constructed once.
+ */
+
+/** Place outside of function/class definitions. */
+#define GR_DECLARE_STATIC_UNIQUE_KEY(name) SK_DECLARE_STATIC_ONCE(name##_once)
+
+/** Place inside function where the key is used. */
+#define GR_DEFINE_STATIC_UNIQUE_KEY(name)                           \
+    static GrUniqueKey name;                                        \
+    SkOnce(&name##_once, gr_init_static_unique_key_once, &name)
+
+static inline void gr_init_static_unique_key_once(GrUniqueKey* key) {
+    GrUniqueKey::Builder builder(key, GrUniqueKey::GenerateDomain(), 0);
+}
+
+// The cache listens for these messages to purge junk resources proactively.
+class GrUniqueKeyInvalidatedMessage {
+public:
+    explicit GrUniqueKeyInvalidatedMessage(const GrUniqueKey& key) : fKey(key) {}
+
+    GrUniqueKeyInvalidatedMessage(const GrUniqueKeyInvalidatedMessage& that) : fKey(that.fKey) {}
+
+    GrUniqueKeyInvalidatedMessage& operator=(const GrUniqueKeyInvalidatedMessage& that) {
+        fKey = that.fKey;
+        return *this;
+    }
+
+    const GrUniqueKey& key() const { return fKey; }
+
+private:
+    GrUniqueKey fKey;
+};
+#endif
diff --git a/gfx/skia/skia/include/gpu/GrShaderVar.h b/gfx/skia/skia/include/gpu/GrShaderVar.h
new file mode 100644
index 000000000000..68ce34b8ef8d
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/GrShaderVar.h
@@ -0,0 +1,191 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrShaderVar_DEFINED
+#define GrShaderVar_DEFINED
+
+#include "GrTypesPriv.h"
+#include "SkString.h"
+
+class GrShaderVar {
+public:
+    /**
+     * Early versions of GLSL have Varying and Attribute; those are later
+     * deprecated, but we still need to know whether a Varying variable
+     * should be treated as In or Out.
+     *
+     * TODO This really shouldn't live here, but until we have c++11, there is really no good way
+     * to write extensible enums.  In reality, only none, out, in, inout, and uniform really
+     * make sense on this base class
+     */
+    enum TypeModifier {
+        kNone_TypeModifier,
+        kOut_TypeModifier,
+        kIn_TypeModifier,
+        kInOut_TypeModifier,
+        kUniform_TypeModifier,
+        // GL Specific types below
+        kAttribute_TypeModifier,
+        kVaryingIn_TypeModifier,
+        kVaryingOut_TypeModifier
+    };
+
+    /**
+     * Defaults to a float with no precision specifier
+     */
+    GrShaderVar()
+        : fType(kFloat_GrSLType)
+        , fTypeModifier(kNone_TypeModifier)
+        , fCount(kNonArray)
+        , fPrecision(kDefault_GrSLPrecision) {
+    }
+
+    GrShaderVar(const SkString& name, GrSLType type, int arrayCount = kNonArray,
+                GrSLPrecision precision = kDefault_GrSLPrecision)
+        : fType(type)
+        , fTypeModifier(kNone_TypeModifier)
+        , fName(name)
+        , fCount(arrayCount)
+        , fPrecision(precision) {
+        SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsFloatType(type));
+        SkASSERT(kVoid_GrSLType != type);
+    }
+
+    GrShaderVar(const char* name, GrSLType type, int arrayCount = kNonArray,
+                GrSLPrecision precision = kDefault_GrSLPrecision)
+        : fType(type)
+        , fTypeModifier(kNone_TypeModifier)
+        , fName(name)
+        , fCount(arrayCount)
+        , fPrecision(precision) {
+        SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsFloatType(type));
+        SkASSERT(kVoid_GrSLType != type);
+    }
+
+    GrShaderVar(const char* name, GrSLType type, TypeModifier typeModifier,
+                int arrayCount = kNonArray, GrSLPrecision precision = kDefault_GrSLPrecision)
+        : fType(type)
+        , fTypeModifier(typeModifier)
+        , fName(name)
+        , fCount(arrayCount)
+        , fPrecision(precision) {
+        SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsFloatType(type));
+        SkASSERT(kVoid_GrSLType != type);
+    }
+
+    /**
+     * Values for array count that have special meaning. We allow 1-sized arrays.
+     */
+    enum {
+        kNonArray     =  0, // not an array
+        kUnsizedArray = -1, // an unsized array (declared with [])
+    };
+
+    void set(GrSLType type,
+             const SkString& name,
+             TypeModifier typeModifier = kNone_TypeModifier,
+             GrSLPrecision precision = kDefault_GrSLPrecision,
+             int count = kNonArray) {
+        SkASSERT(kVoid_GrSLType != type);
+        SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsFloatType(type));
+        fType = type;
+        fTypeModifier = typeModifier;
+        fName = name;
+        fCount = count;
+        fPrecision = precision;
+    }
+
+    void set(GrSLType type,
+             const char* name,
+             TypeModifier typeModifier = kNone_TypeModifier,
+             GrSLPrecision precision = kDefault_GrSLPrecision,
+             int count = kNonArray) {
+        SkASSERT(kVoid_GrSLType != type);
+        SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsFloatType(type));
+        fType = type;
+        fTypeModifier = typeModifier;
+        fName = name;
+        fCount = count;
+        fPrecision = precision;
+    }
+
+    /**
+     * Is the var an array.
+     */
+    bool isArray() const { return kNonArray != fCount; }
+    /**
+     * Is this an unsized array, (i.e. declared with []).
+     */
+    bool isUnsizedArray() const { return kUnsizedArray == fCount; }
+    /**
+     * Get the array length of the var.
+     */
+    int getArrayCount() const { return fCount; }
+    /**
+     * Set the array length of the var
+     */
+    void setArrayCount(int count) { fCount = count; }
+    /**
+     * Set to be a non-array.
+     */
+    void setNonArray() { fCount = kNonArray; }
+    /**
+     * Set to be an unsized array.
+     */
+    void setUnsizedArray() { fCount = kUnsizedArray; }
+
+    /**
+     * Access the var name as a writable string
+     */
+    SkString* accessName() { return &fName; }
+    /**
+     * Set the var name
+     */
+    void setName(const SkString& n) { fName = n; }
+    void setName(const char* n) { fName = n; }
+
+    /**
+     * Get the var name.
+     */
+    const SkString& getName() const { return fName; }
+
+    /**
+     * Shortcut for this->getName().c_str();
+     */
+    const char* c_str() const { return this->getName().c_str(); }
+
+    /**
+     * Get the type of the var
+     */
+    GrSLType getType() const { return fType; }
+    /**
+     * Set the type of the var
+     */
+    void setType(GrSLType type) { fType = type; }
+
+    TypeModifier getTypeModifier() const { return fTypeModifier; }
+    void setTypeModifier(TypeModifier type) { fTypeModifier = type; }
+
+    /**
+     * Get the precision of the var
+     */
+    GrSLPrecision getPrecision() const { return fPrecision; }
+
+    /**
+     * Set the precision of the var
+     */
+    void setPrecision(GrSLPrecision p) { fPrecision = p; }
+
+protected:
+    GrSLType        fType;
+    TypeModifier    fTypeModifier;
+    SkString        fName;
+    int             fCount;
+    GrSLPrecision   fPrecision;
+};
+
+#endif
diff --git a/gfx/skia/skia/include/gpu/GrSurface.h b/gfx/skia/skia/include/gpu/GrSurface.h
index 6087ef44b3e2..28935009ce8c 100644
--- a/gfx/skia/skia/include/gpu/GrSurface.h
+++ b/gfx/skia/skia/include/gpu/GrSurface.h
@@ -11,27 +11,22 @@
 
 #include "GrTypes.h"
 #include "GrGpuResource.h"
+#include "SkImageInfo.h"
 #include "SkRect.h"
 
-class GrTexture;
 class GrRenderTarget;
-struct SkImageInfo;
+class GrSurfacePriv;
+class GrTexture;
 
-class GrSurface : public GrGpuResource {
+class SK_API GrSurface : public GrGpuResource {
 public:
-    SK_DECLARE_INST_COUNT(GrSurface);
-
     /**
      * Retrieves the width of the surface.
-     *
-     * @return the width in texels
      */
     int width() const { return fDesc.fWidth; }
 
     /**
      * Retrieves the height of the surface.
-     *
-     * @return the height in texels
      */
     int height() const { return fDesc.fHeight; }
 
@@ -57,37 +52,19 @@ public:
     /**
      * Return the descriptor describing the surface
      */
-    const GrTextureDesc& desc() const { return fDesc; }
-
-    SkImageInfo info() const;
+    const GrSurfaceDesc& desc() const { return fDesc; }
 
     /**
      * @return the texture associated with the surface, may be NULL.
      */
-    virtual GrTexture* asTexture() = 0;
-    virtual const GrTexture* asTexture() const = 0;
+    virtual GrTexture* asTexture() { return NULL; }
+    virtual const GrTexture* asTexture() const { return NULL; }
 
     /**
      * @return the render target underlying this surface, may be NULL.
      */
-    virtual GrRenderTarget* asRenderTarget() = 0;
-    virtual const GrRenderTarget* asRenderTarget() const = 0;
-
-    /**
-     * Checks whether this GrSurface refers to the same GPU object as other. This
-     * catches the case where a GrTexture and GrRenderTarget refer to the same
-     * GPU memory.
-     */
-    bool isSameAs(const GrSurface* other) const {
-        const GrRenderTarget* thisRT = this->asRenderTarget();
-        if (NULL != thisRT) {
-            return thisRT == other->asRenderTarget();
-        } else {
-            const GrTexture* thisTex = this->asTexture();
-            SkASSERT(NULL != thisTex); // We must be one or the other
-            return thisTex == other->asTexture();
-        }
-    }
+    virtual GrRenderTarget* asRenderTarget() { return NULL; }
+    virtual const GrRenderTarget* asRenderTarget() const { return NULL; }
 
     /**
      * Reads a rectangle of pixels from the surface.
@@ -104,11 +81,11 @@ public:
      * @return true if the read succeeded, false if not. The read can fail because of an unsupported
      *              pixel config.
      */
-    virtual bool readPixels(int left, int top, int width, int height,
-                            GrPixelConfig config,
-                            void* buffer,
-                            size_t rowBytes = 0,
-                            uint32_t pixelOpsFlags = 0) = 0;
+    bool readPixels(int left, int top, int width, int height,
+                    GrPixelConfig config,
+                    void* buffer,
+                    size_t rowBytes = 0,
+                    uint32_t pixelOpsFlags = 0);
 
     /**
      * Copy the src pixels [buffer, rowbytes, pixelconfig] into the surface at the specified
@@ -122,29 +99,82 @@ public:
      * @param rowBytes      number of bytes between consecutive rows. Zero means rows are tightly
      *                      packed.
      * @param pixelOpsFlags See the GrContext::PixelOpsFlags enum.
+     *
+     * @return true if the read succeeded, false if not. The read can fail because of an unsupported
+     *              pixel config.
      */
-    virtual void writePixels(int left, int top, int width, int height,
-                             GrPixelConfig config,
-                             const void* buffer,
-                             size_t rowBytes = 0,
-                             uint32_t pixelOpsFlags = 0) = 0;
+    bool writePixels(int left, int top, int width, int height,
+                     GrPixelConfig config,
+                     const void* buffer,
+                     size_t rowBytes = 0,
+                     uint32_t pixelOpsFlags = 0);
 
     /**
-     * Write the contents of the surface to a PNG. Returns true if successful.
-     * @param filename      Full path to desired file
+     * After this returns any pending writes to the surface will be issued to the backend 3D API.
      */
-    bool savePixels(const char* filename);
+    void flushWrites();
 
-protected:
-    GrSurface(GrGpu* gpu, bool isWrapped, const GrTextureDesc& desc)
-    : INHERITED(gpu, isWrapped)
-    , fDesc(desc) {
+
+    /**
+     * After this returns any pending surface IO will be issued to the backend 3D API and
+     * if the surface has MSAA it will be resolved.
+     */
+    void prepareForExternalIO();
+
+    /** Access methods that are only to be used within Skia code. */
+    inline GrSurfacePriv surfacePriv();
+    inline const GrSurfacePriv surfacePriv() const;
+
+    typedef void* ReleaseCtx;
+    typedef void (*ReleaseProc)(ReleaseCtx);
+
+    void setRelease(ReleaseProc proc, ReleaseCtx ctx) {
+        fReleaseProc = proc;
+        fReleaseCtx = ctx;
     }
 
-    GrTextureDesc fDesc;
+    static size_t WorseCaseSize(const GrSurfaceDesc& desc);
+
+protected:
+    // Methods made available via GrSurfacePriv
+    SkImageInfo info(SkAlphaType) const;
+    bool savePixels(const char* filename);
+    bool hasPendingRead() const;
+    bool hasPendingWrite() const;
+    bool hasPendingIO() const;
+
+    // Provides access to methods that should be public within Skia code.
+    friend class GrSurfacePriv;
+
+    GrSurface(GrGpu* gpu, LifeCycle lifeCycle, const GrSurfaceDesc& desc)
+        : INHERITED(gpu, lifeCycle)
+        , fDesc(desc)
+        , fReleaseProc(NULL)
+        , fReleaseCtx(NULL)
+    {}
+
+    ~GrSurface() override {
+        // check that invokeReleaseProc has been called (if needed)
+        SkASSERT(NULL == fReleaseProc);
+    }
+
+    GrSurfaceDesc fDesc;
+
+    void onRelease() override;
+    void onAbandon() override;
 
 private:
+    void invokeReleaseProc() {
+        if (fReleaseProc) {
+            fReleaseProc(fReleaseCtx);
+            fReleaseProc = NULL;
+        }
+    }
+
+    ReleaseProc fReleaseProc;
+    ReleaseCtx  fReleaseCtx;
+
     typedef GrGpuResource INHERITED;
 };
 
-#endif // GrSurface_DEFINED
+#endif
diff --git a/gfx/skia/skia/include/gpu/GrTBackendEffectFactory.h b/gfx/skia/skia/include/gpu/GrTBackendEffectFactory.h
deleted file mode 100644
index 450eb68ee563..000000000000
--- a/gfx/skia/skia/include/gpu/GrTBackendEffectFactory.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrTBackendEffectFactory_DEFINED
-#define GrTBackendEffectFactory_DEFINED
-
-#include "GrBackendEffectFactory.h"
-#include "GrDrawEffect.h"
-#include "gl/GrGLProgramEffects.h"
-
-/**
- * Implements GrBackendEffectFactory for a GrEffect subclass as a singleton. This can be used by
- * most GrEffect subclasses to implement the GrEffect::getFactory() method:
- *
- * const GrBackendEffectFactory& MyEffect::getFactory() const {
- *     return GrTBackendEffectFactory<MyEffect>::getInstance();
- * }
- *
- * Using this class requires that the GrEffect subclass always produces the same GrGLEffect
- * subclass. Additionally, It adds the following requirements to the GrEffect and GrGLEffect
- * subclasses:
- *
- * 1. The GrGLEffect used by GrEffect subclass MyEffect must be named or typedef'ed to
- *    MyEffect::GLEffect.
- * 2. MyEffect::GLEffect must have a static function:
- *      EffectKey GenKey(const GrDrawEffect, const GrGLCaps&)
- *    which generates a key that maps 1 to 1 with code variations emitted by
- *    MyEffect::GLEffect::emitCode().
- * 3. MyEffect must have a static function:
- *      const char* Name()
- *    which returns a human-readable name for the effect.
- */
-template <typename EffectClass>
-class GrTBackendEffectFactory : public GrBackendEffectFactory {
-
-public:
-    typedef typename EffectClass::GLEffect GLEffect;
-
-    /** Returns a human-readable name for the effect. Implemented using GLEffect::Name as described
-     *  in this class's comment. */
-    virtual const char* name() const SK_OVERRIDE { return EffectClass::Name(); }
-
-
-    /** Implemented using GLEffect::GenKey as described in this class's comment. */
-    virtual void getGLEffectKey(const GrDrawEffect& drawEffect,
-                                const GrGLCaps& caps,
-                                GrEffectKeyBuilder* b) const SK_OVERRIDE {
-        GLEffect::GenKey(drawEffect, caps, b);
-    }
-
-    /** Returns a new instance of the appropriate *GL* implementation class
-        for the given GrEffect; caller is responsible for deleting
-        the object. */
-    virtual GrGLEffect* createGLInstance(const GrDrawEffect& drawEffect) const SK_OVERRIDE {
-        return SkNEW_ARGS(GLEffect, (*this, drawEffect));
-    }
-
-    /** This class is a singleton. This function returns the single instance. */
-    static const GrBackendEffectFactory& getInstance() {
-        static SkAlignedSTStorage<1, GrTBackendEffectFactory> gInstanceMem;
-        static const GrTBackendEffectFactory* gInstance;
-        if (!gInstance) {
-            gInstance = SkNEW_PLACEMENT(gInstanceMem.get(),
-                                        GrTBackendEffectFactory);
-        }
-        return *gInstance;
-    }
-
-protected:
-    GrTBackendEffectFactory() {}
-};
-
-#endif
diff --git a/gfx/skia/skia/include/gpu/GrTestUtils.h b/gfx/skia/skia/include/gpu/GrTestUtils.h
new file mode 100644
index 000000000000..91f36ea2d9c0
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/GrTestUtils.h
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrTestUtils_DEFINED
+#define GrTestUtils_DEFINED
+
+#include "SkTypes.h"
+
+#ifdef GR_TEST_UTILS
+
+#include "GrColor.h"
+#include "SkRandom.h"
+#include "SkStrokeRec.h"
+
+class GrStrokeInfo;
+class SkMatrix;
+class SkPath;
+class SkRRect;
+struct SkRect;
+
+namespace GrTest {
+/**
+ * A helper for use in Test functions.
+ */
+const SkMatrix& TestMatrix(SkRandom*);
+const SkMatrix& TestMatrixPreservesRightAngles(SkRandom*);
+const SkMatrix& TestMatrixRectStaysRect(SkRandom*);
+const SkMatrix& TestMatrixInvertible(SkRandom*);
+const SkRect& TestRect(SkRandom*);
+const SkRect& TestSquare(SkRandom*);
+const SkRRect& TestRRectSimple(SkRandom*);
+const SkPath& TestPath(SkRandom*);
+const SkPath& TestPathConvex(SkRandom*);
+SkStrokeRec TestStrokeRec(SkRandom*);
+GrStrokeInfo TestStrokeInfo(SkRandom*);
+
+}
+
+static inline GrColor GrRandomColor(SkRandom* random) {
+    // There are only a few cases of random colors which interest us
+    enum ColorMode {
+        kAllOnes_ColorMode,
+        kAllZeros_ColorMode,
+        kAlphaOne_ColorMode,
+        kRandom_ColorMode,
+        kLast_ColorMode = kRandom_ColorMode
+    };
+
+    ColorMode colorMode = ColorMode(random->nextULessThan(kLast_ColorMode + 1));
+    GrColor color;
+    switch (colorMode) {
+        case kAllOnes_ColorMode:
+            color = GrColorPackRGBA(0xFF, 0xFF, 0xFF, 0xFF);
+            break;
+        case kAllZeros_ColorMode:
+            color = GrColorPackRGBA(0, 0, 0, 0);
+            break;
+        case kAlphaOne_ColorMode:
+            color = GrColorPackRGBA(random->nextULessThan(256),
+                                    random->nextULessThan(256),
+                                    random->nextULessThan(256),
+                                    0xFF);
+            break;
+        case kRandom_ColorMode: {
+                uint8_t alpha = random->nextULessThan(256);
+                color = GrColorPackRGBA(random->nextRangeU(0, alpha),
+                                        random->nextRangeU(0, alpha),
+                                        random->nextRangeU(0, alpha),
+                                        alpha);
+            break;
+        }
+    }
+    GrColorIsPMAssert(color);
+    return color;
+}
+
+static inline uint8_t GrRandomCoverage(SkRandom* random) {
+    enum CoverageMode {
+        kZero_CoverageMode,
+        kAllOnes_CoverageMode,
+        kRandom_CoverageMode,
+        kLast_CoverageMode = kRandom_CoverageMode
+    };
+
+    CoverageMode colorMode = CoverageMode(random->nextULessThan(kLast_CoverageMode + 1));
+    uint8_t coverage;
+    switch (colorMode) {
+        case kZero_CoverageMode:
+            coverage = 0;
+        case kAllOnes_CoverageMode:
+            coverage = 0xff;
+            break;
+        case kRandom_CoverageMode:
+            coverage = random->nextULessThan(256);
+            break;
+    }
+    return coverage;
+}
+
+#endif
+#endif
diff --git a/gfx/skia/skia/include/gpu/GrTexture.h b/gfx/skia/skia/include/gpu/GrTexture.h
index d76a8cfb946b..ddba94065be2 100644
--- a/gfx/skia/skia/include/gpu/GrTexture.h
+++ b/gfx/skia/skia/include/gpu/GrTexture.h
@@ -10,51 +10,16 @@
 #define GrTexture_DEFINED
 
 #include "GrSurface.h"
-#include "GrRenderTarget.h"
 #include "SkPoint.h"
 #include "SkRefCnt.h"
 
-class GrResourceKey;
 class GrTextureParams;
-class GrTextureImpl;
+class GrTexturePriv;
 
-class GrTexture : public GrSurface {
+class GrTexture : virtual public GrSurface {
 public:
-    /**
-     *  Approximate number of bytes used by the texture
-     */
-    virtual size_t gpuMemorySize() const SK_OVERRIDE;
-
-    // GrSurface overrides
-    virtual bool readPixels(int left, int top, int width, int height,
-                            GrPixelConfig config,
-                            void* buffer,
-                            size_t rowBytes = 0,
-                            uint32_t pixelOpsFlags = 0) SK_OVERRIDE;
-
-    virtual void writePixels(int left, int top, int width, int height,
-                             GrPixelConfig config,
-                             const void* buffer,
-                             size_t rowBytes = 0,
-                             uint32_t pixelOpsFlags = 0) SK_OVERRIDE;
-
-    virtual GrTexture* asTexture() SK_OVERRIDE { return this; }
-    virtual const GrTexture* asTexture() const SK_OVERRIDE { return this; }
-    virtual GrRenderTarget* asRenderTarget() SK_OVERRIDE { return fRenderTarget.get(); }
-    virtual const GrRenderTarget* asRenderTarget() const SK_OVERRIDE { return fRenderTarget.get(); }
-
-    /**
-     * Convert from texels to normalized texture coords for POT textures only. Please don't add
-     * new callsites for these functions. They are slated for removal.
-     */
-    SkFixed normalizeFixedX(SkFixed x) const {
-        SkASSERT(SkIsPow2(fDesc.fWidth));
-        return x >> fShiftFixedX;
-    }
-    SkFixed normalizeFixedY(SkFixed y) const {
-        SkASSERT(SkIsPow2(fDesc.fHeight));
-        return y >> fShiftFixedY;
-    }
+    GrTexture* asTexture() override { return this; }
+    const GrTexture* asTexture() const override { return this; }
 
     /**
      *  Return the native ID or handle to the texture, depending on the
@@ -67,25 +32,6 @@ public:
      * changed externally to Skia.
      */
     virtual void textureParamsModified() = 0;
-    SK_ATTR_DEPRECATED("Renamed to textureParamsModified.")
-    void invalidateCachedState() { this->textureParamsModified(); }
-
-    /**
-     * Informational texture flags. This will be moved to the private GrTextureImpl class soon.
-     */
-    enum FlagBits {
-        kFirstBit = (kLastPublic_GrTextureFlagBit << 1),
-
-        /**
-         * This texture should be returned to the texture cache when
-         * it is no longer reffed
-         */
-        kReturnToCache_FlagBit        = kFirstBit,
-    };
-
-    void resetFlag(GrTextureFlags flags) {
-        fDesc.fFlags = fDesc.fFlags & ~flags;
-    }
 
 #ifdef SK_DEBUG
     void validate() const {
@@ -94,128 +40,34 @@ public:
     }
 #endif
 
-    GrTextureImpl* impl() { return reinterpret_cast<GrTextureImpl*>(this); }
-    const GrTextureImpl* impl() const { return reinterpret_cast<const GrTextureImpl*>(this); }
+    /** Access methods that are only to be used within Skia code. */
+    inline GrTexturePriv texturePriv();
+    inline const GrTexturePriv texturePriv() const;
 
 protected:
-    // A texture refs its rt representation but not vice-versa. It is up to
-    // the subclass constructor to initialize this pointer.
-    SkAutoTUnref<GrRenderTarget> fRenderTarget;
-
-    GrTexture(GrGpu* gpu, bool isWrapped, const GrTextureDesc& desc)
-    : INHERITED(gpu, isWrapped, desc)
-    , fRenderTarget(NULL) {
-        // only make sense if alloc size is pow2
-        fShiftFixedX = 31 - SkCLZ(fDesc.fWidth);
-        fShiftFixedY = 31 - SkCLZ(fDesc.fHeight);
-    }
-
-    virtual ~GrTexture();
-
-    // GrResource overrides
-    virtual void onRelease() SK_OVERRIDE;
-    virtual void onAbandon() SK_OVERRIDE;
+    GrTexture(GrGpu*, LifeCycle, const GrSurfaceDesc&);
 
     void validateDesc() const;
 
 private:
-    virtual void internal_dispose() const SK_OVERRIDE;
-
-    // these two shift a fixed-point value into normalized coordinates
-    // for this texture if the texture is power of two sized.
-    int                 fShiftFixedX;
-    int                 fShiftFixedY;
-
-    typedef GrSurface INHERITED;
-};
-
-class GrTextureImpl : public GrTexture {
-public:
-    SK_DECLARE_INST_COUNT(GrTextureImpl)
-
-    void setFlag(GrTextureFlags flags) {
-        fDesc.fFlags = fDesc.fFlags | flags;
-    }
-    void resetFlag(GrTextureFlags flags) {
-        fDesc.fFlags = fDesc.fFlags & ~flags;
-    }
-    bool isSetFlag(GrTextureFlags flags) const {
-        return 0 != (fDesc.fFlags & flags);
-    }
-
+    size_t onGpuMemorySize() const override;
     void dirtyMipMaps(bool mipMapsDirty);
 
-    bool mipMapsAreDirty() const {
-        return kValid_MipMapsStatus != fMipMapsStatus;
-    }
-
-    bool hasMipMaps() const {
-        return kNotAllocated_MipMapsStatus != fMipMapsStatus;
-    }
-
-    static GrResourceKey ComputeKey(const GrGpu* gpu,
-                                    const GrTextureParams* params,
-                                    const GrTextureDesc& desc,
-                                    const GrCacheID& cacheID);
-    static GrResourceKey ComputeScratchKey(const GrTextureDesc& desc);
-    static bool NeedsResizing(const GrResourceKey& key);
-    static bool NeedsBilerp(const GrResourceKey& key);
-
-protected:
-    GrTextureImpl(GrGpu* gpu, bool isWrapped, const GrTextureDesc& desc)
-    : INHERITED(gpu, isWrapped, desc)
-    , fMipMapsStatus(kNotAllocated_MipMapsStatus) {
-    }
-
-private:
     enum MipMapsStatus {
         kNotAllocated_MipMapsStatus,
         kAllocated_MipMapsStatus,
         kValid_MipMapsStatus
     };
 
-    MipMapsStatus       fMipMapsStatus;
+    MipMapsStatus   fMipMapsStatus;
+    // These two shift a fixed-point value into normalized coordinates	
+    // for this texture if the texture is power of two sized.
+    int             fShiftFixedX;
+    int             fShiftFixedY;
 
-    typedef GrTexture INHERITED;
-};
+    friend class GrTexturePriv;
 
-/**
- * Represents a texture that is intended to be accessed in device coords with an offset.
- */
-class GrDeviceCoordTexture {
-public:
-    GrDeviceCoordTexture() { fOffset.set(0, 0); }
-
-    GrDeviceCoordTexture(const GrDeviceCoordTexture& other) {
-        *this = other;
-    }
-
-    GrDeviceCoordTexture(GrTexture* texture, const SkIPoint& offset)
-        : fTexture(SkSafeRef(texture))
-        , fOffset(offset) {
-    }
-
-    GrDeviceCoordTexture& operator=(const GrDeviceCoordTexture& other) {
-        fTexture.reset(SkSafeRef(other.fTexture.get()));
-        fOffset = other.fOffset;
-        return *this;
-    }
-
-    const SkIPoint& offset() const { return fOffset; }
-
-    void setOffset(const SkIPoint& offset) { fOffset = offset; }
-    void setOffset(int ox, int oy) { fOffset.set(ox, oy); }
-
-    GrTexture* texture() const { return fTexture.get(); }
-
-    GrTexture* setTexture(GrTexture* texture) {
-        fTexture.reset(SkSafeRef(texture));
-        return texture;
-    }
-
-private:
-    SkAutoTUnref<GrTexture> fTexture;
-    SkIPoint                fOffset;
+    typedef GrSurface INHERITED;
 };
 
 #endif
diff --git a/gfx/skia/skia/include/gpu/GrTextureAccess.h b/gfx/skia/skia/include/gpu/GrTextureAccess.h
index 9f56171c60a2..e3ded34ff8c5 100644
--- a/gfx/skia/skia/include/gpu/GrTextureAccess.h
+++ b/gfx/skia/skia/include/gpu/GrTextureAccess.h
@@ -8,115 +8,23 @@
 #ifndef GrTextureAccess_DEFINED
 #define GrTextureAccess_DEFINED
 
+#include "GrGpuResourceRef.h"
+#include "GrTexture.h"
+#include "GrTextureParams.h"
 #include "SkRefCnt.h"
 #include "SkShader.h"
-#include "SkTypes.h"
-
-class GrTexture;
-
-/**
- * Represents the filtering and tile modes used to access a texture. It is mostly used with
- * GrTextureAccess (defined below). Also, some of the texture cache methods require knowledge about
- * filtering and tiling to perform a cache lookup. If it wasn't for this latter usage this would
- * be folded into GrTextureAccess. The default is clamp tile modes and no filtering.
- */
-class GrTextureParams {
-public:
-    GrTextureParams() {
-        this->reset();
-    }
-
-    enum FilterMode {
-        kNone_FilterMode,
-        kBilerp_FilterMode,
-        kMipMap_FilterMode
-    };
-
-    GrTextureParams(SkShader::TileMode tileXAndY, FilterMode filterMode) {
-        this->reset(tileXAndY, filterMode);
-    }
-
-    GrTextureParams(const SkShader::TileMode tileModes[2], FilterMode filterMode) {
-        this->reset(tileModes, filterMode);
-    }
-
-    GrTextureParams(const GrTextureParams& params) {
-        *this = params;
-    }
-
-    GrTextureParams& operator= (const GrTextureParams& params) {
-        fTileModes[0] = params.fTileModes[0];
-        fTileModes[1] = params.fTileModes[1];
-        fFilterMode = params.fFilterMode;
-        return *this;
-    }
-
-    void reset() {
-        this->reset(SkShader::kClamp_TileMode, kNone_FilterMode);
-    }
-
-    void reset(SkShader::TileMode tileXAndY, FilterMode filterMode) {
-        fTileModes[0] = fTileModes[1] = tileXAndY;
-        fFilterMode = filterMode;
-    }
-
-    void reset(const SkShader::TileMode tileModes[2], FilterMode filterMode) {
-        fTileModes[0] = tileModes[0];
-        fTileModes[1] = tileModes[1];
-        fFilterMode = filterMode;
-    }
-
-    void setClampNoFilter() {
-        fTileModes[0] = fTileModes[1] = SkShader::kClamp_TileMode;
-        fFilterMode = kNone_FilterMode;
-    }
-
-    void setClamp() {
-        fTileModes[0] = fTileModes[1] = SkShader::kClamp_TileMode;
-    }
-
-    void setFilterMode(FilterMode filterMode) { fFilterMode = filterMode; }
-
-    void setTileModeX(const SkShader::TileMode tm) { fTileModes[0] = tm; }
-    void setTileModeY(const SkShader::TileMode tm) { fTileModes[1] = tm; }
-    void setTileModeXAndY(const SkShader::TileMode tm) { fTileModes[0] = fTileModes[1] = tm; }
-
-    SkShader::TileMode getTileModeX() const { return fTileModes[0]; }
-
-    SkShader::TileMode getTileModeY() const { return fTileModes[1]; }
-
-    bool isTiled() const {
-        return SkShader::kClamp_TileMode != fTileModes[0] ||
-               SkShader::kClamp_TileMode != fTileModes[1];
-    }
-
-    FilterMode filterMode() const { return fFilterMode; }
-
-    bool operator== (const GrTextureParams& other) const {
-        return fTileModes[0] == other.fTileModes[0] &&
-               fTileModes[1] == other.fTileModes[1] &&
-               fFilterMode == other.fFilterMode;
-    }
-
-    bool operator!= (const GrTextureParams& other) const { return !(*this == other); }
-
-private:
-
-    SkShader::TileMode fTileModes[2];
-    FilterMode         fFilterMode;
-};
 
 /** A class representing the swizzle access pattern for a texture. Note that if the texture is
  *  an alpha-only texture then the alpha channel is substituted for other components. Any mangling
  *  to handle the r,g,b->a conversions for alpha textures is automatically included in the stage
- *  key. However, if a GrEffect uses different swizzles based on its input then it must
+ *  key. However, if a GrProcessor uses different swizzles based on its input then it must
  *  consider that variation in its key-generation.
  */
-class GrTextureAccess : SkNoncopyable {
+class GrTextureAccess : public SkNoncopyable {
 public:
     /**
-     * A default GrTextureAccess must have reset() called on it in a GrEffect subclass's
-     * constructor if it will be accessible via GrEffect::textureAccess().
+     * A default GrTextureAccess must have reset() called on it in a GrProcessor subclass's
+     * constructor if it will be accessible via GrProcessor::textureAccess().
      */
     GrTextureAccess();
 
@@ -155,7 +63,7 @@ public:
                  strcmp(fSwizzle, other.fSwizzle));
 #endif
         return fParams == other.fParams &&
-               (fTexture.get() == other.fTexture.get()) &&
+               (this->getTexture() == other.getTexture()) &&
                (0 == memcmp(fSwizzle, other.fSwizzle, sizeof(fSwizzle)-1));
     }
 
@@ -163,6 +71,11 @@ public:
 
     GrTexture* getTexture() const { return fTexture.get(); }
 
+    /**
+     * For internal use by GrProcessor.
+     */
+    const GrGpuResourceRef* getProgramTexture() const { return &fTexture; }
+
     /**
      * Returns a string representing the swizzle. The string is is null-terminated.
      */
@@ -177,10 +90,12 @@ public:
 private:
     void setSwizzle(const char*);
 
-    GrTextureParams         fParams;
-    SkAutoTUnref<GrTexture> fTexture;
-    uint32_t                fSwizzleMask;
-    char                    fSwizzle[5];
+    typedef GrTGpuResourceRef<GrTexture> ProgramTexture;
+
+    ProgramTexture                  fTexture;
+    GrTextureParams                 fParams;
+    uint32_t                        fSwizzleMask;
+    char                            fSwizzle[5];
 
     typedef SkNoncopyable INHERITED;
 };
diff --git a/gfx/skia/skia/include/gpu/GrTextureParams.h b/gfx/skia/skia/include/gpu/GrTextureParams.h
new file mode 100644
index 000000000000..3186b1b02718
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/GrTextureParams.h
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrTextureParams_DEFINED
+#define GrTextureParams_DEFINED
+
+#include "GrTypes.h"
+#include "SkShader.h"
+
+/**
+ * Represents the filtering and tile modes used to access a texture.
+ */
+class GrTextureParams {
+public:
+    static const GrTextureParams& ClampNoFilter() {
+        static const GrTextureParams gParams;
+        return gParams;
+    }
+    static const GrTextureParams& ClampBilerp() {
+        static const GrTextureParams gParams(SkShader::kClamp_TileMode, kBilerp_FilterMode);
+        return gParams;
+    }
+
+    GrTextureParams() {
+        this->reset();
+    }
+
+    enum FilterMode {
+        kNone_FilterMode,
+        kBilerp_FilterMode,
+        kMipMap_FilterMode
+    };
+
+    GrTextureParams(SkShader::TileMode tileXAndY, FilterMode filterMode) {
+        this->reset(tileXAndY, filterMode);
+    }
+
+    GrTextureParams(const SkShader::TileMode tileModes[2], FilterMode filterMode) {
+        this->reset(tileModes, filterMode);
+    }
+
+    GrTextureParams(const GrTextureParams& params) {
+        *this = params;
+    }
+
+    GrTextureParams& operator= (const GrTextureParams& params) {
+        fTileModes[0] = params.fTileModes[0];
+        fTileModes[1] = params.fTileModes[1];
+        fFilterMode = params.fFilterMode;
+        return *this;
+    }
+
+    void reset() {
+        this->reset(SkShader::kClamp_TileMode, kNone_FilterMode);
+    }
+
+    void reset(SkShader::TileMode tileXAndY, FilterMode filterMode) {
+        fTileModes[0] = fTileModes[1] = tileXAndY;
+        fFilterMode = filterMode;
+    }
+
+    void reset(const SkShader::TileMode tileModes[2], FilterMode filterMode) {
+        fTileModes[0] = tileModes[0];
+        fTileModes[1] = tileModes[1];
+        fFilterMode = filterMode;
+    }
+
+    void setClampNoFilter() {
+        fTileModes[0] = fTileModes[1] = SkShader::kClamp_TileMode;
+        fFilterMode = kNone_FilterMode;
+    }
+
+    void setClamp() {
+        fTileModes[0] = fTileModes[1] = SkShader::kClamp_TileMode;
+    }
+
+    void setFilterMode(FilterMode filterMode) { fFilterMode = filterMode; }
+
+    void setTileModeX(const SkShader::TileMode tm) { fTileModes[0] = tm; }
+    void setTileModeY(const SkShader::TileMode tm) { fTileModes[1] = tm; }
+    void setTileModeXAndY(const SkShader::TileMode tm) { fTileModes[0] = fTileModes[1] = tm; }
+
+    SkShader::TileMode getTileModeX() const { return fTileModes[0]; }
+
+    SkShader::TileMode getTileModeY() const { return fTileModes[1]; }
+
+    bool isTiled() const {
+        return SkShader::kClamp_TileMode != fTileModes[0] ||
+               SkShader::kClamp_TileMode != fTileModes[1];
+    }
+
+    FilterMode filterMode() const { return fFilterMode; }
+
+    bool operator== (const GrTextureParams& other) const {
+        return fTileModes[0] == other.fTileModes[0] &&
+               fTileModes[1] == other.fTileModes[1] &&
+               fFilterMode == other.fFilterMode;
+    }
+
+    bool operator!= (const GrTextureParams& other) const { return !(*this == other); }
+
+private:
+    SkShader::TileMode fTileModes[2];
+    FilterMode         fFilterMode;
+};
+#endif
diff --git a/gfx/skia/skia/include/gpu/GrTextureProvider.h b/gfx/skia/skia/include/gpu/GrTextureProvider.h
new file mode 100644
index 000000000000..5635583d80fe
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/GrTextureProvider.h
@@ -0,0 +1,191 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrTextureProvider_DEFINED
+#define GrTextureProvider_DEFINED
+
+#include "GrTexture.h"
+#include "SkImageFilter.h"
+
+class SK_API GrTextureProvider {
+public:
+    ///////////////////////////////////////////////////////////////////////////
+    // Textures
+
+    /**
+     * Creates a new texture in the resource cache and returns it. The caller owns a
+     * ref on the returned texture which must be balanced by a call to unref.
+     *
+     * @param desc      Description of the texture properties.
+     * @param budgeted  Does the texture count against the resource cache budget?
+     * @param srcData   Pointer to the pixel values (optional).
+     * @param rowBytes  The number of bytes between rows of the texture. Zero
+     *                  implies tightly packed rows. For compressed pixel configs, this
+     *                  field is ignored.
+     */
+    GrTexture* createTexture(const GrSurfaceDesc& desc, bool budgeted, const void* srcData,
+                             size_t rowBytes);
+
+    /** Shortcut for creating a texture with no initial data to upload. */
+    GrTexture* createTexture(const GrSurfaceDesc& desc, bool budgeted) {
+        return this->createTexture(desc, budgeted, NULL, 0);
+    }
+
+    /** Assigns a unique key to the texture. The texture will be findable via this key using
+        findTextureByUniqueKey(). If an existing texture has this key, it's key will be removed. */
+    void assignUniqueKeyToTexture(const GrUniqueKey& key, GrTexture* texture) {
+        this->assignUniqueKeyToResource(key, texture);
+    }
+
+    /** Finds a texture by unique key. If the texture is found it is ref'ed and returned. */
+    GrTexture* findAndRefTextureByUniqueKey(const GrUniqueKey& key) {
+        GrGpuResource* resource = this->findAndRefResourceByUniqueKey(key);
+        if (resource) {
+            GrTexture* texture = static_cast<GrSurface*>(resource)->asTexture();
+            SkASSERT(texture);
+            return texture;
+        }
+        return NULL;
+    }
+
+    /**
+     * Determines whether a texture is associated with the unique key. If the texture is found it
+     * will not be locked or returned. This call does not affect the priority of the resource for
+     * deletion.
+     */
+    bool existsTextureWithUniqueKey(const GrUniqueKey& key) const {
+        return this->existsResourceWithUniqueKey(key);
+    }
+
+    /**
+     * Finds a texture that approximately matches the descriptor. Will be at least as large in width
+     * and height as desc specifies. If desc specifies that the texture should be a render target
+     * then result will be a render target. Format and sample count will always match the request.
+     * The contents of the texture are undefined. The caller owns a ref on the returned texture and
+     * must balance with a call to unref.
+     */
+    GrTexture* createApproxTexture(const GrSurfaceDesc&);
+
+    enum SizeConstraint {
+        kExact_SizeConstraint,
+        kApprox_SizeConstraint,
+    };
+
+    GrTexture* createTexture(const GrSurfaceDesc& desc, SizeConstraint constraint) {
+        switch (constraint) {
+            case kExact_SizeConstraint:
+                return this->createTexture(desc, true);
+            case kApprox_SizeConstraint:
+                return this->createApproxTexture(desc);
+        }
+        sk_throw();
+        return nullptr;
+    }
+
+    static SizeConstraint FromImageFilter(SkImageFilter::SizeConstraint constraint) {
+        if (SkImageFilter::kExact_SizeConstraint == constraint) {
+            return kExact_SizeConstraint;
+        } else {
+            SkASSERT(SkImageFilter::kApprox_SizeConstraint == constraint);
+            return kApprox_SizeConstraint;
+        }
+    }
+
+    /** Legacy function that no longer should be used. */
+    enum ScratchTexMatch {
+        kExact_ScratchTexMatch,
+        kApprox_ScratchTexMatch
+    };
+    GrTexture* refScratchTexture(const GrSurfaceDesc& desc, ScratchTexMatch match) {
+        if (kApprox_ScratchTexMatch == match) {
+            return this->createApproxTexture(desc);
+        } else {
+            return this->createTexture(desc, true);
+        }
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Wrapped Backend Surfaces
+
+    /**
+     * Wraps an existing texture with a GrTexture object.
+     *
+     * OpenGL: if the object is a texture Gr may change its GL texture params
+     *         when it is drawn.
+     *
+     * @return GrTexture object or NULL on failure.
+     */
+    GrTexture* wrapBackendTexture(const GrBackendTextureDesc& desc,
+                                  GrWrapOwnership = kBorrow_GrWrapOwnership);
+
+    /**
+     * Wraps an existing render target with a GrRenderTarget object. It is
+     * similar to wrapBackendTexture but can be used to draw into surfaces
+     * that are not also textures (e.g. FBO 0 in OpenGL, or an MSAA buffer that
+     * the client will resolve to a texture). Currently wrapped render targets
+     * always use the kBorrow_GrWrapOwnership semantics.
+     *
+     * @return GrTexture object or NULL on failure.
+     */
+     GrRenderTarget* wrapBackendRenderTarget(const GrBackendRenderTargetDesc& desc);
+
+protected:
+    GrTextureProvider(GrGpu* gpu, GrResourceCache* cache) : fCache(cache), fGpu(gpu) {}
+
+    /**
+     * Assigns a unique key to a resource. If the key is associated with another resource that
+     * association is removed and replaced by this resource.
+     */
+    void assignUniqueKeyToResource(const GrUniqueKey&, GrGpuResource*);
+
+    /**
+     * Finds a resource in the cache, based on the specified key. This is intended for use in
+     * conjunction with addResourceToCache(). The return value will be NULL if not found. The
+     * caller must balance with a call to unref().
+     */
+    GrGpuResource* findAndRefResourceByUniqueKey(const GrUniqueKey&);
+
+    /**
+     * Determines whether a resource is in the cache. If the resource is found it
+     * will not be locked or returned. This call does not affect the priority of
+     * the resource for deletion.
+     */
+    bool existsResourceWithUniqueKey(const GrUniqueKey& key) const;
+
+    enum ScratchTextureFlags {
+        kExact_ScratchTextureFlag           = 0x1,
+        kNoPendingIO_ScratchTextureFlag     = 0x2, // (http://skbug.com/4156)
+        kNoCreate_ScratchTextureFlag        = 0x4,
+    };
+
+    /** A common impl for GrTextureProvider and GrResourceProvider variants. */
+    GrTexture* internalCreateApproxTexture(const GrSurfaceDesc& desc, uint32_t scratchTextureFlags);
+
+    GrTexture* refScratchTexture(const GrSurfaceDesc&, uint32_t scratchTextureFlags);
+
+    void abandon() {
+        fCache = NULL;
+        fGpu = NULL;
+    }
+
+    GrResourceCache* cache() { return fCache; }
+    const GrResourceCache* cache() const { return fCache; }
+
+    GrGpu* gpu() { return fGpu; }
+    const GrGpu* gpu() const { return fGpu; }
+
+    bool isAbandoned() const {
+        SkASSERT(SkToBool(fGpu) == SkToBool(fCache));
+        return !SkToBool(fCache);
+    }
+
+private:
+    GrResourceCache* fCache;
+    GrGpu* fGpu;
+};
+
+#endif
diff --git a/gfx/skia/skia/include/gpu/GrTypes.h b/gfx/skia/skia/include/gpu/GrTypes.h
index c658f334f626..cf3773c89eea 100644
--- a/gfx/skia/skia/include/gpu/GrTypes.h
+++ b/gfx/skia/skia/include/gpu/GrTypes.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2010 Google Inc.
  *
@@ -6,8 +5,6 @@
  * found in the LICENSE file.
  */
 
-
-
 #ifndef GrTypes_DEFINED
 #define GrTypes_DEFINED
 
@@ -15,8 +12,6 @@
 #include "GrConfig.h"
 #include "SkMath.h"
 
-//#define SK_SUPPORT_LEGACY_GRTYPES
-
 ////////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -27,6 +22,9 @@
     inline X operator | (X a, X b) { \
         return (X) (+a | +b); \
     } \
+    inline X& operator |= (X& a, X b) { \
+        return (a = a | b); \
+    } \
     \
     inline X operator & (X a, X b) { \
         return (X) (+a & +b); \
@@ -42,6 +40,7 @@
 
 #define GR_DECL_BITFIELD_OPS_FRIENDS(X) \
     friend X operator | (X a, X b); \
+    friend X& operator |= (X& a, X b); \
     \
     friend X operator & (X a, X b); \
     \
@@ -52,48 +51,6 @@
     friend X operator & (X a, T b); \
 ////////////////////////////////////////////////////////////////////////////////
 
-#ifdef SK_SUPPORT_LEGACY_GRTYPES
-
-/**
- *  Macro to round n up to the next multiple of 4, or return it unchanged if
- *  n is already a multiple of 4
- */
-#define GrALIGN4(n)     SkAlign4(n)
-#define GrIsALIGN4(n)   SkIsAlign4(n)
-
-template <typename T> const T& GrMin(const T& a, const T& b) {
-    return (a < b) ? a : b;
-}
-
-template <typename T> const T& GrMax(const T& a, const T& b) {
-    return (b < a) ? a : b;
-}
-
-/**
- *  Count elements in an array
- */
-#define GR_ARRAY_COUNT(array)  SK_ARRAY_COUNT(array)
-
-/**
- *  16.16 fixed point type
- */
-typedef int32_t GrFixed;
-
-#ifdef SK_DEBUG
-
-static inline int16_t GrToS16(intptr_t x) {
-    SkASSERT((int16_t)x == x);
-    return (int16_t)x;
-}
-
-#else
-
-#define GrToS16(x)  x
-
-#endif
-
-#endif
-
 // compile time versions of min/max
 #define GR_CT_MAX(a, b) (((b) < (a)) ? (a) : (b))
 #define GR_CT_MIN(a, b) (((b) < (a)) ? (b) : (a))
@@ -169,7 +126,11 @@ static inline int GrNextPow2(int n) {
  */
 enum GrBackend {
     kOpenGL_GrBackend,
+    kVulkan_GrBackend,
+
+    kLast_GrBackend = kVulkan_GrBackend
 };
+const int kBackendCount = kLast_GrBackend + 1;
 
 /**
  * Backend-specific 3D context handle
@@ -188,7 +149,8 @@ enum GrPrimitiveType {
     kTriangleFan_GrPrimitiveType,
     kPoints_GrPrimitiveType,
     kLines_GrPrimitiveType,     // 1 pix wide only
-    kLineStrip_GrPrimitiveType  // 1 pix wide only
+    kLineStrip_GrPrimitiveType, // 1 pix wide only
+    kLast_GrPrimitiveType = kLineStrip_GrPrimitiveType
 };
 
 static inline bool GrIsPrimTypeLines(GrPrimitiveType type) {
@@ -201,38 +163,13 @@ static inline bool GrIsPrimTypeTris(GrPrimitiveType type) {
            kTriangleFan_GrPrimitiveType == type;
 }
 
-/**
- * Coeffecients for alpha-blending.
- */
-enum GrBlendCoeff {
-    kInvalid_GrBlendCoeff = -1,
-
-    kZero_GrBlendCoeff,    //<! 0
-    kOne_GrBlendCoeff,     //<! 1
-    kSC_GrBlendCoeff,      //<! src color
-    kISC_GrBlendCoeff,     //<! one minus src color
-    kDC_GrBlendCoeff,      //<! dst color
-    kIDC_GrBlendCoeff,     //<! one minus dst color
-    kSA_GrBlendCoeff,      //<! src alpha
-    kISA_GrBlendCoeff,     //<! one minus src alpha
-    kDA_GrBlendCoeff,      //<! dst alpha
-    kIDA_GrBlendCoeff,     //<! one minus dst alpha
-    kConstC_GrBlendCoeff,  //<! constant color
-    kIConstC_GrBlendCoeff, //<! one minus constant color
-    kConstA_GrBlendCoeff,  //<! constant color alpha
-    kIConstA_GrBlendCoeff, //<! one minus constant color alpha
-
-    kPublicGrBlendCoeffCount
-};
-
 /**
  *  Formats for masks, used by the font cache.
  *  Important that these are 0-based.
  */
 enum GrMaskFormat {
     kA8_GrMaskFormat,    //!< 1-byte per pixel
-    kA565_GrMaskFormat,  //!< 2-bytes per pixel
-    kA888_GrMaskFormat,  //!< 4-bytes per pixel
+    kA565_GrMaskFormat,  //!< 2-bytes per pixel, RGB represent 3-channel LCD coverage
     kARGB_GrMaskFormat,  //!< 4-bytes per pixel, color format
 
     kLast_GrMaskFormat = kARGB_GrMaskFormat
@@ -243,13 +180,15 @@ static const int kMaskFormatCount = kLast_GrMaskFormat + 1;
  *  Return the number of bytes-per-pixel for the specified mask format.
  */
 static inline int GrMaskFormatBytesPerPixel(GrMaskFormat format) {
-    SkASSERT((unsigned)format <= 3);
+    SkASSERT(format < kMaskFormatCount);
     // kA8   (0) -> 1
     // kA565 (1) -> 2
-    // kA888 (2) -> 4
-    // kARGB (3) -> 4
-    static const int sBytesPerPixel[] = { 1, 2, 4, 4 };
-    SK_COMPILE_ASSERT(SK_ARRAY_COUNT(sBytesPerPixel) == kMaskFormatCount, array_size_mismatch);
+    // kARGB (2) -> 4
+    static const int sBytesPerPixel[] = { 1, 2, 4 };
+    static_assert(SK_ARRAY_COUNT(sBytesPerPixel) == kMaskFormatCount, "array_size_mismatch");
+    static_assert(kA8_GrMaskFormat == 0, "enum_order_dependency");
+    static_assert(kA565_GrMaskFormat == 1, "enum_order_dependency");
+    static_assert(kARGB_GrMaskFormat == 2, "enum_order_dependency");
 
     return sBytesPerPixel[(int) format];
 }
@@ -274,6 +213,10 @@ enum GrPixelConfig {
      * Premultiplied. Byte order is b,g,r,a.
      */
     kBGRA_8888_GrPixelConfig,
+    /**
+     * Premultiplied and sRGB. Byte order is r,g,b,a.
+     */
+    kSRGBA_8888_GrPixelConfig,
     /**
      * ETC1 Compressed Data
      */
@@ -304,7 +247,18 @@ enum GrPixelConfig {
      * Byte order is r, g, b, a.  This color format is 32 bits per channel
      */
     kRGBA_float_GrPixelConfig,
-    kLast_GrPixelConfig = kRGBA_float_GrPixelConfig
+
+    /**
+     * This color format is a single 16 bit float channel
+     */
+    kAlpha_half_GrPixelConfig,
+
+    /**
+    * Byte order is r, g, b, a.  This color format is 16 bits per channel
+    */
+    kRGBA_half_GrPixelConfig,
+
+    kLast_GrPixelConfig = kRGBA_half_GrPixelConfig
 };
 static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1;
 
@@ -324,6 +278,7 @@ static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1;
 // representation.
 static inline bool GrPixelConfigIsCompressed(GrPixelConfig config) {
     switch (config) {
+        case kIndex_8_GrPixelConfig:
         case kETC1_GrPixelConfig:
         case kLATC_GrPixelConfig:
         case kR11_EAC_GrPixelConfig:
@@ -334,11 +289,39 @@ static inline bool GrPixelConfigIsCompressed(GrPixelConfig config) {
     }
 }
 
+/** If the pixel config is compressed, return an equivalent uncompressed format. */
+static inline GrPixelConfig GrMakePixelConfigUncompressed(GrPixelConfig config) {
+    switch (config) {
+        case kIndex_8_GrPixelConfig:
+        case kETC1_GrPixelConfig:
+        case kASTC_12x12_GrPixelConfig:
+            return kRGBA_8888_GrPixelConfig;
+        case kLATC_GrPixelConfig:
+        case kR11_EAC_GrPixelConfig:
+            return kAlpha_8_GrPixelConfig;
+        default:
+            SkASSERT(!GrPixelConfigIsCompressed(config));
+            return config;
+    }
+}
+
 // Returns true if the pixel config is 32 bits per pixel
 static inline bool GrPixelConfigIs8888(GrPixelConfig config) {
     switch (config) {
         case kRGBA_8888_GrPixelConfig:
         case kBGRA_8888_GrPixelConfig:
+        case kSRGBA_8888_GrPixelConfig:
+            return true;
+        default:
+            return false;
+    }
+}
+
+// Returns true if the color (non-alpha) components represent sRGB values. It does NOT indicate that
+// all three color components are present in the config or anything about their order.
+static inline bool GrPixelConfigIsSRGB(GrPixelConfig config) {
+    switch (config) {
+        case kSRGBA_8888_GrPixelConfig:
             return true;
         default:
             return false;
@@ -359,16 +342,20 @@ static inline GrPixelConfig GrPixelConfigSwapRAndB(GrPixelConfig config) {
 }
 
 static inline size_t GrBytesPerPixel(GrPixelConfig config) {
+    SkASSERT(!GrPixelConfigIsCompressed(config));
     switch (config) {
         case kAlpha_8_GrPixelConfig:
-        case kIndex_8_GrPixelConfig:
             return 1;
         case kRGB_565_GrPixelConfig:
         case kRGBA_4444_GrPixelConfig:
+        case kAlpha_half_GrPixelConfig:
             return 2;
         case kRGBA_8888_GrPixelConfig:
         case kBGRA_8888_GrPixelConfig:
+        case kSRGBA_8888_GrPixelConfig:
             return 4;
+        case kRGBA_half_GrPixelConfig:
+            return 8;
         case kRGBA_float_GrPixelConfig:
             return 16;
         default:
@@ -377,15 +364,18 @@ static inline size_t GrBytesPerPixel(GrPixelConfig config) {
 }
 
 static inline size_t GrUnpackAlignment(GrPixelConfig config) {
+    SkASSERT(!GrPixelConfigIsCompressed(config));
     switch (config) {
         case kAlpha_8_GrPixelConfig:
-        case kIndex_8_GrPixelConfig:
             return 1;
         case kRGB_565_GrPixelConfig:
         case kRGBA_4444_GrPixelConfig:
+        case kAlpha_half_GrPixelConfig:
+        case kRGBA_half_GrPixelConfig:
             return 2;
         case kRGBA_8888_GrPixelConfig:
         case kBGRA_8888_GrPixelConfig:
+        case kSRGBA_8888_GrPixelConfig:
         case kRGBA_float_GrPixelConfig:
             return 4;
         default:
@@ -409,6 +399,7 @@ static inline bool GrPixelConfigIsAlphaOnly(GrPixelConfig config) {
         case kLATC_GrPixelConfig:
         case kASTC_12x12_GrPixelConfig:
         case kAlpha_8_GrPixelConfig:
+        case kAlpha_half_GrPixelConfig:
             return true;
         default:
             return false;
@@ -416,44 +407,27 @@ static inline bool GrPixelConfigIsAlphaOnly(GrPixelConfig config) {
 }
 
 /**
- * Optional bitfield flags that can be passed to createTexture.
+ * Optional bitfield flags that can be set on GrSurfaceDesc (below).
  */
-enum GrTextureFlags {
-    kNone_GrTextureFlags            = 0x0,
+enum GrSurfaceFlags {
+    kNone_GrSurfaceFlags            = 0x0,
     /**
      * Creates a texture that can be rendered to as a GrRenderTarget. Use
      * GrTexture::asRenderTarget() to access.
      */
-    kRenderTarget_GrTextureFlagBit  = 0x1,
+    kRenderTarget_GrSurfaceFlag     = 0x1,
     /**
-     * By default all render targets have an associated stencil buffer that
-     * may be required for path filling. This flag overrides stencil buffer
-     * creation.
-     * MAKE THIS PRIVATE?
+     * Placeholder for managing zero-copy textures
      */
-    kNoStencil_GrTextureFlagBit     = 0x2,
-    /**
-     * Hint that the CPU may modify this texture after creation.
-     */
-    kDynamicUpdate_GrTextureFlagBit = 0x4,
+    kZeroCopy_GrSurfaceFlag         = 0x2,
     /**
      * Indicates that all allocations (color buffer, FBO completeness, etc)
      * should be verified.
      */
-    kCheckAllocation_GrTextureFlagBit  = 0x8,
-
-    kDummy_GrTextureFlagBit,
-    kLastPublic_GrTextureFlagBit = kDummy_GrTextureFlagBit-1,
+    kCheckAllocation_GrSurfaceFlag  = 0x4,
 };
 
-GR_MAKE_BITFIELD_OPS(GrTextureFlags)
-
-enum {
-   /**
-    *  For Index8 pixel config, the colortable must be 256 entries
-    */
-    kGrColorTableSize = 256 * 4 //sizeof(GrColor)
-};
+GR_MAKE_BITFIELD_OPS(GrSurfaceFlags)
 
 /**
  * Some textures will be stored such that the upper and left edges of the content meet at the
@@ -469,11 +443,11 @@ enum GrSurfaceOrigin {
 };
 
 /**
- * Describes a texture to be created.
+ * Describes a surface to be created.
  */
-struct GrTextureDesc {
-    GrTextureDesc()
-    : fFlags(kNone_GrTextureFlags)
+struct GrSurfaceDesc {
+    GrSurfaceDesc()
+    : fFlags(kNone_GrSurfaceFlags)
     , fOrigin(kDefault_GrSurfaceOrigin)
     , fWidth(0)
     , fHeight(0)
@@ -481,7 +455,7 @@ struct GrTextureDesc {
     , fSampleCnt(0) {
     }
 
-    GrTextureFlags         fFlags;  //!< bitfield of TextureFlags
+    GrSurfaceFlags         fFlags;  //!< bitfield of TextureFlags
     GrSurfaceOrigin        fOrigin; //!< origin of the texture
     int                    fWidth;  //!< Width of the texture
     int                    fHeight; //!< Height of the texture
@@ -494,7 +468,7 @@ struct GrTextureDesc {
 
     /**
      * The number of samples per pixel or 0 to disable full scene AA. This only
-     * applies if the kRenderTarget_GrTextureFlagBit is set. The actual number
+     * applies if the kRenderTarget_GrSurfaceFlag is set. The actual number
      * of samples may not exactly match the request. The request will be rounded
      * up to the next supported sample count, or down if it is larger than the
      * max supported count.
@@ -502,57 +476,8 @@ struct GrTextureDesc {
     int                    fSampleCnt;
 };
 
-/**
- * GrCacheID is used create and find cached GrResources (e.g. GrTextures). The ID has two parts:
- * the domain and the key. Domains simply allow multiple clients to use 0-based indices as their
- * cache key without colliding. The key uniquely identifies a GrResource within the domain.
- * Users of the cache must obtain a domain via GenerateDomain().
- */
-struct GrCacheID {
-public:
-    typedef uint8_t  Domain;
-
-    struct Key {
-        union {
-            uint8_t  fData8[16];
-            uint32_t fData32[4];
-            uint64_t fData64[2];
-        };
-    };
-
-    /**
-     * A default cache ID is invalid; a set method must be called before the object is used.
-     */
-    GrCacheID() { fDomain = kInvalid_Domain; }
-
-    /**
-     * Initialize the cache ID to a domain and key.
-     */
-    GrCacheID(Domain domain, const Key& key) {
-        SkASSERT(kInvalid_Domain != domain);
-        this->reset(domain, key);
-    }
-
-    void reset(Domain domain, const Key& key) {
-        fDomain = domain;
-        memcpy(&fKey, &key, sizeof(Key));
-    }
-
-    /** Has this been initialized to a valid domain */
-    bool isValid() const { return kInvalid_Domain != fDomain; }
-
-    const Key& getKey() const { SkASSERT(this->isValid()); return fKey; }
-    Domain getDomain() const { SkASSERT(this->isValid()); return fDomain; }
-
-    /** Creates a new unique ID domain. */
-    static Domain GenerateDomain();
-
-private:
-    Key             fKey;
-    Domain          fDomain;
-
-    static const Domain kInvalid_Domain = 0;
-};
+// Legacy alias
+typedef GrSurfaceDesc GrTextureDesc;
 
 /**
  * Clips are composed from these objects.
@@ -567,6 +492,16 @@ enum GrClipType {
 // opaque type for 3D API object handles
 typedef intptr_t GrBackendObject;
 
+
+/** Ownership rules for external GPU resources imported into Skia. */
+enum GrWrapOwnership {
+    /** Skia will assume the client will keep the resource alive and Skia will not free it. */
+    kBorrow_GrWrapOwnership,
+
+    /** Skia will assume ownership of the resource and free it. */
+    kAdopt_GrWrapOwnership,
+};
+
 /**
  * Gr can wrap an existing texture created by the client with a GrTexture
  * object. The client is responsible for ensuring that the texture lives at
@@ -592,15 +527,12 @@ enum GrBackendTextureFlags {
     /**
      * No flags enabled
      */
-    kNone_GrBackendTextureFlag             = kNone_GrTextureFlags,
+    kNone_GrBackendTextureFlag             = 0,
     /**
      * Indicates that the texture is also a render target, and thus should have
      * a GrRenderTarget object.
-     *
-     * D3D (future): client must have created the texture with flags that allow
-     * it to be used as a render target.
      */
-    kRenderTarget_GrBackendTextureFlag     = kRenderTarget_GrTextureFlagBit,
+    kRenderTarget_GrBackendTextureFlag     = kRenderTarget_GrSurfaceFlag,
 };
 GR_MAKE_BITFIELD_OPS(GrBackendTextureFlags)
 
@@ -667,7 +599,7 @@ enum GrGLBackendState {
     // View state stands for scissor and viewport
     kView_GrGLBackendState             = 1 << 2,
     kBlend_GrGLBackendState            = 1 << 3,
-    kAA_GrGLBackendState               = 1 << 4,
+    kMSAAEnable_GrGLBackendState       = 1 << 4,
     kVertex_GrGLBackendState           = 1 << 5,
     kStencil_GrGLBackendState          = 1 << 6,
     kPixelStore_GrGLBackendState       = 1 << 7,
@@ -684,8 +616,11 @@ enum GrGLBackendState {
 static inline size_t GrCompressedFormatDataSize(GrPixelConfig config,
                                                 int width, int height) {
     SkASSERT(GrPixelConfigIsCompressed(config));
+    static const int kGrIndex8TableSize = 256 * 4; // 4 == sizeof(GrColor)
 
     switch (config) {
+        case kIndex_8_GrPixelConfig:
+            return width * height + kGrIndex8TableSize;
         case kR11_EAC_GrPixelConfig:
         case kLATC_GrPixelConfig:
         case kETC1_GrPixelConfig:
@@ -709,22 +644,4 @@ static inline size_t GrCompressedFormatDataSize(GrPixelConfig config,
  */
 static const uint32_t kAll_GrBackendState = 0xffffffff;
 
-///////////////////////////////////////////////////////////////////////////////
-
-#if GR_ALWAYS_ALLOCATE_ON_HEAP
-    #define GrAutoMallocBaseType SkAutoMalloc
-#else
-    #define GrAutoMallocBaseType SkAutoSMalloc<S>
-#endif
-
-template <size_t S> class GrAutoMalloc : public GrAutoMallocBaseType {
-public:
-    GrAutoMalloc() : INHERITED() {}
-    explicit GrAutoMalloc(size_t size) : INHERITED(size) {}
-    virtual ~GrAutoMalloc() {}
-private:
-    typedef GrAutoMallocBaseType INHERITED;
-};
-
-#undef GrAutoMallocBaseType
 #endif
diff --git a/gfx/skia/skia/include/gpu/GrTypesPriv.h b/gfx/skia/skia/include/gpu/GrTypesPriv.h
index dfe415345a46..6135c14c1219 100644
--- a/gfx/skia/skia/include/gpu/GrTypesPriv.h
+++ b/gfx/skia/skia/include/gpu/GrTypesPriv.h
@@ -10,6 +10,7 @@
 
 #include "GrTypes.h"
 #include "SkTArray.h"
+#include "SkRect.h"
 
 /**
  * Types of shader-language-specific boxed variables we can create. (Currently only GrGLShaderVars,
@@ -24,17 +25,46 @@ enum GrSLType {
     kMat33f_GrSLType,
     kMat44f_GrSLType,
     kSampler2D_GrSLType,
+    kSamplerExternal_GrSLType,
 
-    kLast_GrSLType = kSampler2D_GrSLType
+    kLast_GrSLType = kSamplerExternal_GrSLType
 };
 static const int kGrSLTypeCount = kLast_GrSLType + 1;
 
+enum GrShaderType {
+    kVertex_GrShaderType,
+    kGeometry_GrShaderType,
+    kFragment_GrShaderType,
+
+    kLastkFragment_GrShaderType = kFragment_GrShaderType
+};
+static const int kGrShaderTypeCount = kLastkFragment_GrShaderType + 1;
+
+/**
+ * Precisions of shader language variables. Not all shading languages support precisions or actually
+ * vary the internal precision based on the qualifiers. These currently only apply to float types (
+ * including float vectors and matrices).
+ */
+enum GrSLPrecision {
+    kLow_GrSLPrecision,
+    kMedium_GrSLPrecision,
+    kHigh_GrSLPrecision,
+
+    // Default precision is medium. This is because on OpenGL ES 2 highp support is not
+    // guaranteed. On (non-ES) OpenGL the specifiers have no effect on precision.
+    kDefault_GrSLPrecision = kMedium_GrSLPrecision,
+
+    kLast_GrSLPrecision = kHigh_GrSLPrecision
+};
+
+static const int kGrSLPrecisionCount = kLast_GrSLPrecision + 1;
+
 /**
  * Gets the vector size of the SLType. Returns -1 for void, matrices, and samplers.
  */
 static inline int GrSLTypeVectorCount(GrSLType type) {
     SkASSERT(type >= 0 && type < static_cast<GrSLType>(kGrSLTypeCount));
-    static const int kCounts[] = { -1, 1, 2, 3, 4, -1, -1, -1 };
+    static const int kCounts[] = { -1, 1, 2, 3, 4, -1, -1, -1, -1 };
     return kCounts[type];
 
     GR_STATIC_ASSERT(0 == kVoid_GrSLType);
@@ -45,6 +75,7 @@ static inline int GrSLTypeVectorCount(GrSLType type) {
     GR_STATIC_ASSERT(5 == kMat33f_GrSLType);
     GR_STATIC_ASSERT(6 == kMat44f_GrSLType);
     GR_STATIC_ASSERT(7 == kSampler2D_GrSLType);
+    GR_STATIC_ASSERT(8 == kSamplerExternal_GrSLType);
     GR_STATIC_ASSERT(SK_ARRAY_COUNT(kCounts) == kGrSLTypeCount);
 }
 
@@ -60,6 +91,22 @@ static inline GrSLType GrSLFloatVectorType(int count) {
     GR_STATIC_ASSERT(kVec4f_GrSLType == 4);
 }
 
+/** Is the shading language type floating point (or vector/matrix of fp)? */
+static inline bool GrSLTypeIsFloatType(GrSLType type) {
+    SkASSERT(type >= 0 && type < static_cast<GrSLType>(kGrSLTypeCount));
+    return type >= 1 && type <= 6;
+
+    GR_STATIC_ASSERT(0 == kVoid_GrSLType);
+    GR_STATIC_ASSERT(1 == kFloat_GrSLType);
+    GR_STATIC_ASSERT(2 == kVec2f_GrSLType);
+    GR_STATIC_ASSERT(3 == kVec3f_GrSLType);
+    GR_STATIC_ASSERT(4 == kVec4f_GrSLType);
+    GR_STATIC_ASSERT(5 == kMat33f_GrSLType);
+    GR_STATIC_ASSERT(6 == kMat44f_GrSLType);
+    GR_STATIC_ASSERT(7 == kSampler2D_GrSLType);
+    GR_STATIC_ASSERT(8 == kSamplerExternal_GrSLType);
+    GR_STATIC_ASSERT(9 == kGrSLTypeCount);
+}
 //////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -70,9 +117,13 @@ enum GrVertexAttribType {
     kVec2f_GrVertexAttribType,
     kVec3f_GrVertexAttribType,
     kVec4f_GrVertexAttribType,
-    kVec4ub_GrVertexAttribType,   // vector of 4 unsigned bytes, e.g. colors
 
-    kLast_GrVertexAttribType = kVec4ub_GrVertexAttribType
+    kUByte_GrVertexAttribType,   // unsigned byte, e.g. coverage
+    kVec4ub_GrVertexAttribType,  // vector of 4 unsigned bytes, e.g. colors
+
+    kVec2s_GrVertexAttribType,   // vector of 2 shorts, e.g. texture coordinates
+    
+    kLast_GrVertexAttribType = kVec2s_GrVertexAttribType
 };
 static const int kGrVertexAttribTypeCount = kLast_GrVertexAttribType + 1;
 
@@ -81,14 +132,16 @@ static const int kGrVertexAttribTypeCount = kLast_GrVertexAttribType + 1;
  */
 static inline int GrVertexAttribTypeVectorCount(GrVertexAttribType type) {
     SkASSERT(type >= 0 && type < kGrVertexAttribTypeCount);
-    static const int kCounts[] = { 1, 2, 3, 4, 4 };
+    static const int kCounts[] = { 1, 2, 3, 4, 1, 4, 2 };
     return kCounts[type];
 
     GR_STATIC_ASSERT(0 == kFloat_GrVertexAttribType);
     GR_STATIC_ASSERT(1 == kVec2f_GrVertexAttribType);
     GR_STATIC_ASSERT(2 == kVec3f_GrVertexAttribType);
     GR_STATIC_ASSERT(3 == kVec4f_GrVertexAttribType);
-    GR_STATIC_ASSERT(4 == kVec4ub_GrVertexAttribType);
+    GR_STATIC_ASSERT(4 == kUByte_GrVertexAttribType);
+    GR_STATIC_ASSERT(5 == kVec4ub_GrVertexAttribType);
+    GR_STATIC_ASSERT(6 == kVec2s_GrVertexAttribType);
     GR_STATIC_ASSERT(SK_ARRAY_COUNT(kCounts) == kGrVertexAttribTypeCount);
 }
 
@@ -102,7 +155,9 @@ static inline size_t GrVertexAttribTypeSize(GrVertexAttribType type) {
         2*sizeof(float),        // kVec2f_GrVertexAttribType
         3*sizeof(float),        // kVec3f_GrVertexAttribType
         4*sizeof(float),        // kVec4f_GrVertexAttribType
-        4*sizeof(char)          // kVec4ub_GrVertexAttribType
+        1*sizeof(char),         // kUByte_GrVertexAttribType
+        4*sizeof(char),         // kVec4ub_GrVertexAttribType
+        2*sizeof(int16_t)       // kVec2s_GrVertexAttribType
     };
     return kSizes[type];
 
@@ -110,111 +165,116 @@ static inline size_t GrVertexAttribTypeSize(GrVertexAttribType type) {
     GR_STATIC_ASSERT(1 == kVec2f_GrVertexAttribType);
     GR_STATIC_ASSERT(2 == kVec3f_GrVertexAttribType);
     GR_STATIC_ASSERT(3 == kVec4f_GrVertexAttribType);
-    GR_STATIC_ASSERT(4 == kVec4ub_GrVertexAttribType);
+    GR_STATIC_ASSERT(4 == kUByte_GrVertexAttribType);
+    GR_STATIC_ASSERT(5 == kVec4ub_GrVertexAttribType);
+    GR_STATIC_ASSERT(6 == kVec2s_GrVertexAttribType);
     GR_STATIC_ASSERT(SK_ARRAY_COUNT(kSizes) == kGrVertexAttribTypeCount);
 }
 
 /**
- * Semantic bindings for vertex attributes. kEffect means that the attribute is input to a GrEffect.
- * Each binding other than kEffect may not appear more than once in the current set of attributes.
- * kPosition must be appear for exactly one attribute.
+ * converts a GrVertexAttribType to a GrSLType
  */
-enum GrVertexAttribBinding {
-    kPosition_GrVertexAttribBinding,    // required, must have vector count of 2
-    kLocalCoord_GrVertexAttribBinding,  // must have vector count of 2
-    kColor_GrVertexAttribBinding,       // must have vector count of 4
-    kCoverage_GrVertexAttribBinding,    // must have vector count of 4
-
-    kLastFixedFunction_GrVertexAttribBinding = kCoverage_GrVertexAttribBinding,
-
-    kEffect_GrVertexAttribBinding,      // vector length must agree with
-                                        // GrEffect::vertexAttribType() for each effect input to
-                                        // which the attribute is mapped by GrDrawState::setEffect()
-    kLast_GrVertexAttribBinding = kEffect_GrVertexAttribBinding
-};
-
-static const int kGrVertexAttribBindingCnt = kLast_GrVertexAttribBinding + 1;
-static const int kGrFixedFunctionVertexAttribBindingCnt =
-    kLastFixedFunction_GrVertexAttribBinding + 1;
-
-static inline int GrFixedFunctionVertexAttribVectorCount(GrVertexAttribBinding binding) {
-    SkASSERT(binding >= 0 && binding < kGrFixedFunctionVertexAttribBindingCnt);
-    static const int kVecCounts[] = { 2, 2, 4, 4 };
-
-    return kVecCounts[binding];
-
-    GR_STATIC_ASSERT(0 == kPosition_GrVertexAttribBinding);
-    GR_STATIC_ASSERT(1 == kLocalCoord_GrVertexAttribBinding);
-    GR_STATIC_ASSERT(2 == kColor_GrVertexAttribBinding);
-    GR_STATIC_ASSERT(3 == kCoverage_GrVertexAttribBinding);
-    GR_STATIC_ASSERT(kGrFixedFunctionVertexAttribBindingCnt == SK_ARRAY_COUNT(kVecCounts));
-}
-
-struct GrVertexAttrib {
-    inline void set(GrVertexAttribType type, size_t offset, GrVertexAttribBinding binding) {
-        fType = type;
-        fOffset = offset;
-        fBinding = binding;
+static inline GrSLType GrVertexAttribTypeToSLType(GrVertexAttribType type) {
+    switch (type) {
+        default:
+            SkFAIL("Unsupported type conversion");
+        case kUByte_GrVertexAttribType:
+        case kFloat_GrVertexAttribType:
+            return kFloat_GrSLType;
+        case kVec2s_GrVertexAttribType:
+        case kVec2f_GrVertexAttribType:
+            return kVec2f_GrSLType;
+        case kVec3f_GrVertexAttribType:
+            return kVec3f_GrSLType;
+        case kVec4ub_GrVertexAttribType:
+        case kVec4f_GrVertexAttribType:
+            return kVec4f_GrSLType;
     }
-    bool operator==(const GrVertexAttrib& other) const {
-        return fType == other.fType && fOffset == other.fOffset && fBinding == other.fBinding;
-    };
-    bool operator!=(const GrVertexAttrib& other) const { return !(*this == other); }
-
-    GrVertexAttribType      fType;
-    size_t                  fOffset;
-    GrVertexAttribBinding   fBinding;
-};
-
-template <int N> class GrVertexAttribArray : public SkSTArray<N, GrVertexAttrib, true> {};
+}
 
 //////////////////////////////////////////////////////////////////////////////
 
 /**
 * We have coverage effects that clip rendering to the edge of some geometric primitive.
 * This enum specifies how that clipping is performed. Not all factories that take a
-* GrEffectEdgeType will succeed with all values and it is up to the caller to check for
+* GrProcessorEdgeType will succeed with all values and it is up to the caller to check for
 * a NULL return.
 */
-enum GrEffectEdgeType {
-    kFillBW_GrEffectEdgeType,
-    kFillAA_GrEffectEdgeType,
-    kInverseFillBW_GrEffectEdgeType,
-    kInverseFillAA_GrEffectEdgeType,
-    kHairlineAA_GrEffectEdgeType,
+enum GrPrimitiveEdgeType {
+    kFillBW_GrProcessorEdgeType,
+    kFillAA_GrProcessorEdgeType,
+    kInverseFillBW_GrProcessorEdgeType,
+    kInverseFillAA_GrProcessorEdgeType,
+    kHairlineAA_GrProcessorEdgeType,
 
-    kLast_GrEffectEdgeType = kHairlineAA_GrEffectEdgeType
+    kLast_GrProcessorEdgeType = kHairlineAA_GrProcessorEdgeType
 };
 
-static const int kGrEffectEdgeTypeCnt = kLast_GrEffectEdgeType + 1;
+static const int kGrProcessorEdgeTypeCnt = kLast_GrProcessorEdgeType + 1;
 
-static inline bool GrEffectEdgeTypeIsFill(const GrEffectEdgeType edgeType) {
-    return (kFillAA_GrEffectEdgeType == edgeType || kFillBW_GrEffectEdgeType == edgeType);
+static inline bool GrProcessorEdgeTypeIsFill(const GrPrimitiveEdgeType edgeType) {
+    return (kFillAA_GrProcessorEdgeType == edgeType || kFillBW_GrProcessorEdgeType == edgeType);
 }
 
-static inline bool GrEffectEdgeTypeIsInverseFill(const GrEffectEdgeType edgeType) {
-    return (kInverseFillAA_GrEffectEdgeType == edgeType ||
-            kInverseFillBW_GrEffectEdgeType == edgeType);
+static inline bool GrProcessorEdgeTypeIsInverseFill(const GrPrimitiveEdgeType edgeType) {
+    return (kInverseFillAA_GrProcessorEdgeType == edgeType ||
+            kInverseFillBW_GrProcessorEdgeType == edgeType);
 }
 
-static inline bool GrEffectEdgeTypeIsAA(const GrEffectEdgeType edgeType) {
-    return (kFillBW_GrEffectEdgeType != edgeType && kInverseFillBW_GrEffectEdgeType != edgeType);
+static inline bool GrProcessorEdgeTypeIsAA(const GrPrimitiveEdgeType edgeType) {
+    return (kFillBW_GrProcessorEdgeType != edgeType && kInverseFillBW_GrProcessorEdgeType != edgeType);
 }
 
-static inline GrEffectEdgeType GrInvertEffectEdgeType(const GrEffectEdgeType edgeType) {
+static inline GrPrimitiveEdgeType GrInvertProcessorEdgeType(const GrPrimitiveEdgeType edgeType) {
     switch (edgeType) {
-        case kFillBW_GrEffectEdgeType:
-            return kInverseFillBW_GrEffectEdgeType;
-        case kFillAA_GrEffectEdgeType:
-            return kInverseFillAA_GrEffectEdgeType;
-        case kInverseFillBW_GrEffectEdgeType:
-            return kFillBW_GrEffectEdgeType;
-        case kInverseFillAA_GrEffectEdgeType:
-            return kFillAA_GrEffectEdgeType;
-        case kHairlineAA_GrEffectEdgeType:
+        case kFillBW_GrProcessorEdgeType:
+            return kInverseFillBW_GrProcessorEdgeType;
+        case kFillAA_GrProcessorEdgeType:
+            return kInverseFillAA_GrProcessorEdgeType;
+        case kInverseFillBW_GrProcessorEdgeType:
+            return kFillBW_GrProcessorEdgeType;
+        case kInverseFillAA_GrProcessorEdgeType:
+            return kFillAA_GrProcessorEdgeType;
+        case kHairlineAA_GrProcessorEdgeType:
             SkFAIL("Hairline fill isn't invertible.");
     }
-    return kFillAA_GrEffectEdgeType; // suppress warning.
+    return kFillAA_GrProcessorEdgeType; // suppress warning.
 }
 
+/**
+ * Indicates the type of pending IO operations that can be recorded for gpu resources.
+ */
+enum GrIOType {
+    kRead_GrIOType,
+    kWrite_GrIOType,
+    kRW_GrIOType
+};
+
+struct GrScissorState {
+    GrScissorState() : fEnabled(false) {}
+    void set(const SkIRect& rect) { fRect = rect; fEnabled = true; }
+    bool operator==(const GrScissorState& other) const {
+        return fEnabled == other.fEnabled &&
+                (false == fEnabled || fRect == other.fRect);
+    }
+    bool operator!=(const GrScissorState& other) const { return !(*this == other); }
+
+    bool enabled() const { return fEnabled; }
+    const SkIRect& rect() const { return fRect; }
+
+private:
+    bool    fEnabled;
+    SkIRect fRect;
+};
+
+#ifdef SK_DEBUG
+// Takes a pointer to a GrCaps, and will suppress prints if required
+#define GrCapsDebugf(caps, ...)         \
+    if (!caps->suppressPrints()) {      \
+        SkDebugf(__VA_ARGS__);          \
+    }
+#else
+#define GrCapsDebugf(caps, ...)
+#endif
+
 #endif
diff --git a/gfx/skia/skia/include/gpu/GrUserConfig.h b/gfx/skia/skia/include/gpu/GrUserConfig.h
deleted file mode 100644
index e90352478c1b..000000000000
--- a/gfx/skia/skia/include/gpu/GrUserConfig.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrUserConfig_DEFINED
-#define GrUserConfig_DEFINED
-
-#if defined(GR_USER_CONFIG_FILE)
-    #error "default user config pulled in but GR_USER_CONFIG_FILE is defined."
-#endif
-
-/**
- * This gives a threshold in bytes of when to lock a GrGeometryBuffer vs using
- * updateData. (Note the depending on the underlying 3D API the update functions
- * may always be implemented using a lock)
- */
-//#define GR_GEOM_BUFFER_LOCK_THRESHOLD (1<<15)
-
-/**
- * This gives a threshold in megabytes for the maximum size of the texture cache
- * in vram. The value is only a default and can be overridden at runtime.
- */
-//#define GR_DEFAULT_RESOURCE_CACHE_MB_LIMIT 96
-
-/**
- * This specifies the maximum number of textures the texture cache can hold
- * in vram. The value is only a default and can be overridden at runtime.
- */
-//#define GR_DEFAULT_RESOURCE_CACHE_COUNT_LIMIT 2048
-
-/*
- * This allows us to set a callback to be called before each GL call to ensure
- * that our context is set correctly
- */
-#define GR_GL_PER_GL_FUNC_CALLBACK  1
-#define GR_ALWAYS_ALLOCATE_ON_HEAP  1
-#endif
diff --git a/gfx/skia/skia/include/gpu/GrXferProcessor.h b/gfx/skia/skia/include/gpu/GrXferProcessor.h
new file mode 100644
index 000000000000..ce26709d9ac1
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/GrXferProcessor.h
@@ -0,0 +1,389 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrXferProcessor_DEFINED
+#define GrXferProcessor_DEFINED
+
+#include "GrBlend.h"
+#include "GrColor.h"
+#include "GrProcessor.h"
+#include "GrTexture.h"
+#include "GrTypes.h"
+#include "SkXfermode.h"
+
+class GrShaderCaps;
+class GrGLSLCaps;
+class GrGLSLXferProcessor;
+class GrProcOptInfo;
+struct GrPipelineOptimizations;
+
+/**
+ * Barriers for blending. When a shader reads the dst directly, an Xfer barrier is sometimes
+ * required after a pixel has been written, before it can be safely read again.
+ */
+enum GrXferBarrierType {
+    kNone_GrXferBarrierType = 0, //<! No barrier is required
+    kTexture_GrXferBarrierType,  //<! Required when a shader reads and renders to the same texture.
+    kBlend_GrXferBarrierType,    //<! Required by certain blend extensions.
+};
+/** Should be able to treat kNone as false in boolean expressions */
+GR_STATIC_ASSERT(SkToBool(kNone_GrXferBarrierType) == false);
+
+/**
+ * GrXferProcessor is responsible for implementing the xfer mode that blends the src color and dst
+ * color, and for applying any coverage. It does this by emitting fragment shader code and
+ * controlling the fixed-function blend state. When dual-source blending is available, it may also
+ * write a seconday fragment shader output color. GrXferProcessor has two modes of operation:
+ *
+ * Dst read: When allowed by the backend API, or when supplied a texture of the destination, the
+ * GrXferProcessor may read the destination color. While operating in this mode, the subclass only
+ * provides shader code that blends the src and dst colors, and the base class applies coverage.
+ *
+ * No dst read: When not performing a dst read, the subclass is given full control of the fixed-
+ * function blend state and/or secondary output, and is responsible to apply coverage on its own.
+ *
+ * A GrXferProcessor is never installed directly into our draw state, but instead is created from a
+ * GrXPFactory once we have finalized the state of our draw.
+ */
+class GrXferProcessor : public GrProcessor {
+public:
+    /**
+     * A texture that contains the dst pixel values and an integer coord offset from device space
+     * to the space of the texture. Depending on GPU capabilities a DstTexture may be used by a
+     * GrXferProcessor for blending in the fragment shader.
+     */
+    class DstTexture {
+    public:
+        DstTexture() { fOffset.set(0, 0); }
+
+        DstTexture(const DstTexture& other) {
+            *this = other;
+        }
+
+        DstTexture(GrTexture* texture, const SkIPoint& offset)
+            : fTexture(SkSafeRef(texture))
+            , fOffset(offset) {
+        }
+
+        DstTexture& operator=(const DstTexture& other) {
+            fTexture.reset(SkSafeRef(other.fTexture.get()));
+            fOffset = other.fOffset;
+            return *this;
+        }
+
+        const SkIPoint& offset() const { return fOffset; }
+
+        void setOffset(const SkIPoint& offset) { fOffset = offset; }
+        void setOffset(int ox, int oy) { fOffset.set(ox, oy); }
+
+        GrTexture* texture() const { return fTexture.get(); }
+
+        GrTexture* setTexture(GrTexture* texture) {
+            fTexture.reset(SkSafeRef(texture));
+            return texture;
+        }
+
+    private:
+        SkAutoTUnref<GrTexture> fTexture;
+        SkIPoint                fOffset;
+    };
+
+    /**
+     * Sets a unique key on the GrProcessorKeyBuilder calls onGetGLSLProcessorKey(...) to get the
+     * specific subclass's key.
+     */ 
+    void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const;
+
+    /** Returns a new instance of the appropriate *GL* implementation class
+        for the given GrXferProcessor; caller is responsible for deleting
+        the object. */
+    virtual GrGLSLXferProcessor* createGLSLInstance() const = 0;
+
+    /**
+     * Optimizations for blending / coverage that an OptDrawState should apply to itself.
+     */
+    enum OptFlags {
+        /**
+         * The draw can be skipped completely.
+         */
+        kSkipDraw_OptFlag                 = 0x1,
+        /**
+         * GrXferProcessor will ignore color, thus no need to provide
+         */
+        kIgnoreColor_OptFlag              = 0x2,
+        /**
+         * GrXferProcessor will ignore coverage, thus no need to provide
+         */
+        kIgnoreCoverage_OptFlag           = 0x4,
+        /**
+         * Clear color stages and override input color to that returned by getOptimizations
+         */
+        kOverrideColor_OptFlag            = 0x8,
+        /**
+         * Can tweak alpha for coverage. Currently this flag should only be used by a batch
+         */
+        kCanTweakAlphaForCoverage_OptFlag = 0x20,
+    };
+
+    static const OptFlags kNone_OptFlags = (OptFlags)0;
+
+    GR_DECL_BITFIELD_OPS_FRIENDS(OptFlags);
+
+    /**
+     * Determines which optimizations (as described by the ptFlags above) can be performed by
+     * the draw with this xfer processor. If this function is called, the xfer processor may change
+     * its state to reflected the given blend optimizations. If the XP needs to see a specific input
+     * color to blend correctly, it will set the OverrideColor flag and the output parameter
+     * overrideColor will be the required value that should be passed into the XP. 
+     * A caller who calls this function on a XP is required to honor the returned OptFlags
+     * and color values for its draw.
+     */
+    OptFlags getOptimizations(const GrPipelineOptimizations& optimizations,
+                              bool doesStencilWrite,
+                              GrColor* overrideColor,
+                              const GrCaps& caps) const;
+
+    /**
+     * Returns whether this XP will require an Xfer barrier on the given rt. If true, outBarrierType
+     * is updated to contain the type of barrier needed.
+     */
+    GrXferBarrierType xferBarrierType(const GrRenderTarget* rt, const GrCaps& caps) const;
+
+    struct BlendInfo {
+        void reset() {
+            fEquation = kAdd_GrBlendEquation;
+            fSrcBlend = kOne_GrBlendCoeff;
+            fDstBlend = kZero_GrBlendCoeff;
+            fBlendConstant = 0;
+            fWriteColor = true;
+        }
+
+        SkDEBUGCODE(SkString dump() const;)
+
+        GrBlendEquation fEquation;
+        GrBlendCoeff    fSrcBlend;
+        GrBlendCoeff    fDstBlend;
+        GrColor         fBlendConstant;
+        bool            fWriteColor;
+    };
+
+    void getBlendInfo(BlendInfo* blendInfo) const;
+
+    bool willReadDstColor() const { return fWillReadDstColor; }
+
+    /**
+     * Returns the texture to be used as the destination when reading the dst in the fragment
+     * shader. If the returned texture is NULL then the XP is either not reading the dst or we have
+     * extentions that support framebuffer fetching and thus don't need a copy of the dst texture.
+     */
+    const GrTexture* getDstTexture() const { return fDstTexture.getTexture(); }
+
+    /**
+     * Returns the offset in device coords to use when accessing the dst texture to get the dst
+     * pixel color in the shader. This value is only valid if getDstTexture() != NULL.
+     */
+    const SkIPoint& dstTextureOffset() const {
+        SkASSERT(this->getDstTexture());
+        return fDstTextureOffset;
+    }
+
+    /**
+     * If we are performing a dst read, returns whether the base class will use mixed samples to
+     * antialias the shader's final output. If not doing a dst read, the subclass is responsible
+     * for antialiasing and this returns false.
+     */
+    bool dstReadUsesMixedSamples() const { return fDstReadUsesMixedSamples; }
+
+    /**
+     * Returns whether or not this xferProcossor will set a secondary output to be used with dual
+     * source blending.
+     */
+    bool hasSecondaryOutput() const;
+
+    /** Returns true if this and other processor conservatively draw identically. It can only return
+        true when the two processor are of the same subclass (i.e. they return the same object from
+        from getFactory()).
+
+        A return value of true from isEqual() should not be used to test whether the processor would
+        generate the same shader code. To test for identical code generation use getGLSLProcessorKey
+      */
+    
+    bool isEqual(const GrXferProcessor& that) const {
+        if (this->classID() != that.classID()) {
+            return false;
+        }
+        if (this->fWillReadDstColor != that.fWillReadDstColor) {
+            return false;
+        }
+        if (this->fDstTexture.getTexture() != that.fDstTexture.getTexture()) {
+            return false;
+        }
+        if (this->fDstTextureOffset != that.fDstTextureOffset) {
+            return false;
+        }
+        if (this->fDstReadUsesMixedSamples != that.fDstReadUsesMixedSamples) {
+            return false;
+        }
+        return this->onIsEqual(that);
+    }
+   
+protected:
+    GrXferProcessor();
+    GrXferProcessor(const DstTexture*, bool willReadDstColor, bool hasMixedSamples);
+
+private:
+    void notifyRefCntIsZero() const final {}
+
+    virtual OptFlags onGetOptimizations(const GrPipelineOptimizations& optimizations,
+                                        bool doesStencilWrite,
+                                        GrColor* overrideColor,
+                                        const GrCaps& caps) const = 0;
+
+    /**
+     * Sets a unique key on the GrProcessorKeyBuilder that is directly associated with this xfer
+     * processor's GL backend implementation.
+     */
+    virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                       GrProcessorKeyBuilder* b) const = 0;
+
+    /**
+     * Determines the type of barrier (if any) required by the subclass. Note that the possibility
+     * that a kTexture type barrier is required is handled by the base class and need not be
+     * considered by subclass overrides of this function.
+     */
+    virtual GrXferBarrierType onXferBarrier(const GrRenderTarget*, const GrCaps&) const {
+        return kNone_GrXferBarrierType;
+    }
+
+    /**
+     * If we are not performing a dst read, returns whether the subclass will set a secondary
+     * output. When using dst reads, the base class controls the secondary output and this method
+     * will not be called.
+     */
+    virtual bool onHasSecondaryOutput() const { return false; }
+
+    /**
+     * If we are not performing a dst read, retrieves the fixed-function blend state required by the
+     * subclass. When using dst reads, the base class controls the fixed-function blend state and
+     * this method will not be called. The BlendInfo struct comes initialized to "no blending".
+     */
+    virtual void onGetBlendInfo(BlendInfo*) const {}
+
+    virtual bool onIsEqual(const GrXferProcessor&) const = 0;
+
+    bool                    fWillReadDstColor;
+    bool                    fDstReadUsesMixedSamples;
+    SkIPoint                fDstTextureOffset;
+    GrTextureAccess         fDstTexture;
+
+    typedef GrFragmentProcessor INHERITED;
+};
+
+GR_MAKE_BITFIELD_OPS(GrXferProcessor::OptFlags);
+
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * We install a GrXPFactory (XPF) early on in the pipeline before all the final draw information is
+ * known (e.g. whether there is fractional pixel coverage, will coverage be 1 or 4 channel, is the
+ * draw opaque, etc.). Once the state of the draw is finalized, we use the XPF along with all the
+ * draw information to create a GrXferProcessor (XP) which can implement the desired blending for
+ * the draw.
+ *
+ * Before the XP is created, the XPF is able to answer queries about what functionality the XPs it
+ * creates will have. For example, can it create an XP that supports RGB coverage or will the XP
+ * blend with the destination color.
+ */
+class GrXPFactory : public SkRefCnt {
+public:
+    typedef GrXferProcessor::DstTexture DstTexture;
+    GrXferProcessor* createXferProcessor(const GrPipelineOptimizations& optimizations,
+                                         bool hasMixedSamples,
+                                         const DstTexture*,
+                                         const GrCaps& caps) const;
+    /**
+     * Known color information after blending, but before accounting for any coverage.
+     */
+    struct InvariantBlendedColor {
+        bool                     fWillBlendWithDst;
+        GrColor                  fKnownColor;
+        GrColorComponentFlags    fKnownColorFlags;
+    };
+
+    /** 
+     * Returns information about the output color, produced by XPs from this factory, that will be
+     * known after blending. Note that we can conflate coverage and color, so the actual values
+     * written to pixels with partial coverage may not always seem consistent with the invariant
+     * information returned by this function.
+     */
+    virtual void getInvariantBlendedColor(const GrProcOptInfo& colorPOI,
+                                          InvariantBlendedColor*) const = 0;
+
+    bool willNeedDstTexture(const GrCaps& caps, const GrPipelineOptimizations& optimizations, 
+                            bool hasMixedSamples) const;
+
+    bool isEqual(const GrXPFactory& that) const {
+        if (this->classID() != that.classID()) {
+            return false;
+        }
+        return this->onIsEqual(that);
+    }
+
+    /**
+      * Helper for down-casting to a GrXPFactory subclass
+      */
+    template <typename T> const T& cast() const { return *static_cast<const T*>(this); }
+
+    uint32_t classID() const { SkASSERT(kIllegalXPFClassID != fClassID); return fClassID; }
+
+protected:
+    GrXPFactory() : fClassID(kIllegalXPFClassID) {}
+
+    template <typename XPF_SUBCLASS> void initClassID() {
+         static uint32_t kClassID = GenClassID();
+         fClassID = kClassID;
+    }
+
+    uint32_t fClassID;
+
+private:
+    virtual GrXferProcessor* onCreateXferProcessor(const GrCaps& caps,
+                                                   const GrPipelineOptimizations& optimizations,
+                                                   bool hasMixedSamples,
+                                                   const DstTexture*) const = 0;
+    /**
+     *  Returns true if the XP generated by this factory will explicitly read dst in the fragment
+     *  shader.
+     */
+    virtual bool willReadDstColor(const GrCaps& caps,
+                                  const GrPipelineOptimizations& optimizations,
+                                  bool hasMixedSamples) const = 0;
+
+    virtual bool onIsEqual(const GrXPFactory&) const = 0;
+
+    static uint32_t GenClassID() {
+        // fCurrXPFactoryID has been initialized to kIllegalXPFactoryID. The
+        // atomic inc returns the old value not the incremented value. So we add
+        // 1 to the returned value.
+        uint32_t id = static_cast<uint32_t>(sk_atomic_inc(&gCurrXPFClassID)) + 1;
+        if (!id) {
+            SkFAIL("This should never wrap as it should only be called once for each GrXPFactory "
+                   "subclass.");
+        }
+        return id;
+    }
+
+    enum {
+        kIllegalXPFClassID = 0,
+    };
+    static int32_t gCurrXPFClassID;
+
+    typedef GrProgramElement INHERITED;
+};
+
+#endif
+
diff --git a/gfx/skia/skia/include/gpu/SkGpuDevice.h b/gfx/skia/skia/include/gpu/SkGpuDevice.h
deleted file mode 100644
index 6e972871f8b7..000000000000
--- a/gfx/skia/skia/include/gpu/SkGpuDevice.h
+++ /dev/null
@@ -1,221 +0,0 @@
-
-/*
- * Copyright 2010 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-
-#ifndef SkGpuDevice_DEFINED
-#define SkGpuDevice_DEFINED
-
-#include "SkGr.h"
-#include "SkBitmap.h"
-#include "SkDevice.h"
-#include "SkPicture.h"
-#include "SkRegion.h"
-#include "GrContext.h"
-
-struct SkDrawProcs;
-struct GrSkDrawProcs;
-
-class GrTextContext;
-
-/**
- *  Subclass of SkBaseDevice, which directs all drawing to the GrGpu owned by the
- *  canvas.
- */
-class SK_API SkGpuDevice : public SkBaseDevice {
-public:
-    enum Flags {
-        kNeedClear_Flag = 1 << 0,  //!< Surface requires an initial clear
-        kCached_Flag    = 1 << 1,  //!< Surface is cached and needs to be unlocked when released
-        kDFFonts_Flag   = 1 << 2,  //!< Surface should render fonts using signed distance fields
-    };
-
-    /**
-     * Creates an SkGpuDevice from a GrSurface. This will fail if the surface is not a render
-     * target. The caller owns a ref on the returned device. If the surface is cached,
-     * the kCached_Flag should be specified to make the device responsible for unlocking
-     * the surface when it is released.
-     */
-    static SkGpuDevice* Create(GrSurface* surface, unsigned flags = 0);
-
-    /**
-     *  New device that will create an offscreen renderTarget based on the
-     *  ImageInfo and sampleCount. The device's storage will not
-     *  count against the GrContext's texture cache budget. The device's pixels
-     *  will be uninitialized. On failure, returns NULL.
-     */
-    static SkGpuDevice* Create(GrContext*, const SkImageInfo&, int sampleCount);
-
-    /**
-     *  DEPRECATED -- need to make this private, call Create(surface)
-     *  New device that will render to the specified renderTarget.
-     */
-    SkGpuDevice(GrContext*, GrRenderTarget*, unsigned flags = 0);
-
-    /**
-     *  DEPRECATED -- need to make this private, call Create(surface)
-     *  New device that will render to the texture (as a rendertarget).
-     *  The GrTexture's asRenderTarget() must be non-NULL or device will not
-     *  function.
-     */
-    SkGpuDevice(GrContext*, GrTexture*, unsigned flags = 0);
-
-    virtual ~SkGpuDevice();
-
-    GrContext* context() const { return fContext; }
-
-    virtual GrRenderTarget* accessRenderTarget() SK_OVERRIDE;
-
-    virtual SkImageInfo imageInfo() const SK_OVERRIDE {
-        return fRenderTarget ? fRenderTarget->info() : SkImageInfo::MakeUnknown();
-    }
-
-    virtual void clear(SkColor color) SK_OVERRIDE;
-    virtual void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode, size_t count,
-                            const SkPoint[], const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawRect(const SkDraw&, const SkRect& r,
-                          const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawRRect(const SkDraw&, const SkRRect& r,
-                           const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawDRRect(const SkDraw& draw, const SkRRect& outer,
-                            const SkRRect& inner, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawOval(const SkDraw&, const SkRect& oval,
-                          const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawPath(const SkDraw&, const SkPath& path,
-                          const SkPaint& paint, const SkMatrix* prePathMatrix,
-                          bool pathIsMutable) SK_OVERRIDE;
-    virtual void drawBitmap(const SkDraw&, const SkBitmap& bitmap,
-                            const SkMatrix&, const SkPaint&) SK_OVERRIDE;
-    virtual void drawBitmapRect(const SkDraw&, const SkBitmap&,
-                                const SkRect* srcOrNull, const SkRect& dst,
-                                const SkPaint& paint,
-                                SkCanvas::DrawBitmapRectFlags flags) SK_OVERRIDE;
-    virtual void drawSprite(const SkDraw&, const SkBitmap& bitmap,
-                            int x, int y, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawText(const SkDraw&, const void* text, size_t len,
-                          SkScalar x, SkScalar y, const SkPaint&) SK_OVERRIDE;
-    virtual void drawPosText(const SkDraw&, const void* text, size_t len,
-                             const SkScalar pos[], SkScalar constY,
-                             int scalarsPerPos, const SkPaint&) SK_OVERRIDE;
-    virtual void drawTextOnPath(const SkDraw&, const void* text, size_t len,
-                                const SkPath& path, const SkMatrix* matrix,
-                                const SkPaint&) SK_OVERRIDE;
-    virtual void drawVertices(const SkDraw&, SkCanvas::VertexMode, int vertexCount,
-                              const SkPoint verts[], const SkPoint texs[],
-                              const SkColor colors[], SkXfermode* xmode,
-                              const uint16_t indices[], int indexCount,
-                              const SkPaint&) SK_OVERRIDE;
-    virtual void drawDevice(const SkDraw&, SkBaseDevice*, int x, int y,
-                            const SkPaint&) SK_OVERRIDE;
-    virtual bool filterTextFlags(const SkPaint&, TextFlags*) SK_OVERRIDE;
-
-    virtual void flush() SK_OVERRIDE;
-
-    virtual void onAttachToCanvas(SkCanvas* canvas) SK_OVERRIDE;
-    virtual void onDetachFromCanvas() SK_OVERRIDE;
-
-    virtual const SkBitmap& onAccessBitmap() SK_OVERRIDE;
-
-    /**
-     * Make's this device's rendertarget current in the underlying 3D API.
-     * Also implicitly flushes.
-     */
-    virtual void makeRenderTargetCurrent();
-
-    virtual bool canHandleImageFilter(const SkImageFilter*) SK_OVERRIDE;
-    virtual bool filterImage(const SkImageFilter*, const SkBitmap&,
-                             const SkImageFilter::Context&,
-                             SkBitmap*, SkIPoint*) SK_OVERRIDE;
-
-    class SkAutoCachedTexture; // used internally
-
-
-protected:
-    virtual bool onReadPixels(const SkImageInfo&, void*, size_t, int, int) SK_OVERRIDE;
-    virtual bool onWritePixels(const SkImageInfo&, const void*, size_t, int, int) SK_OVERRIDE;
-
-    /**  PRIVATE / EXPERIMENTAL -- do not call */
-    virtual void EXPERIMENTAL_optimize(const SkPicture* picture) SK_OVERRIDE;
-    /**  PRIVATE / EXPERIMENTAL -- do not call */
-    virtual bool EXPERIMENTAL_drawPicture(SkCanvas* canvas, const SkPicture* picture) SK_OVERRIDE;
-
-private:
-    GrContext*      fContext;
-
-    GrSkDrawProcs*  fDrawProcs;
-
-    GrClipData      fClipData;
-
-    GrTextContext*  fMainTextContext;
-    GrTextContext*  fFallbackTextContext;
-
-    // state for our render-target
-    GrRenderTarget*     fRenderTarget;
-    bool                fNeedClear;
-
-    // remove when our clients don't rely on accessBitmap()
-    SkBitmap fLegacyBitmap;
-
-    // called from rt and tex cons
-    void initFromRenderTarget(GrContext*, GrRenderTarget*, unsigned flags);
-
-    virtual SkBaseDevice* onCreateDevice(const SkImageInfo&, Usage) SK_OVERRIDE;
-
-    virtual SkSurface* newSurface(const SkImageInfo&) SK_OVERRIDE;
-
-    // sets the render target, clip, and matrix on GrContext. Use forceIdenity to override
-    // SkDraw's matrix and draw in device coords.
-    void prepareDraw(const SkDraw&, bool forceIdentity);
-
-    /**
-     * Implementation for both drawBitmap and drawBitmapRect.
-     */
-    void drawBitmapCommon(const SkDraw&,
-                          const SkBitmap& bitmap,
-                          const SkRect* srcRectPtr,
-                          const SkSize* dstSizePtr,      // ignored iff srcRectPtr == NULL
-                          const SkPaint&,
-                          SkCanvas::DrawBitmapRectFlags flags);
-
-    /**
-     * Helper functions called by drawBitmapCommon. By the time these are called the SkDraw's
-     * matrix, clip, and the device's render target has already been set on GrContext.
-     */
-
-    // The tileSize and clippedSrcRect will be valid only if true is returned.
-    bool shouldTileBitmap(const SkBitmap& bitmap,
-                          const GrTextureParams& sampler,
-                          const SkRect* srcRectPtr,
-                          int maxTileSize,
-                          int* tileSize,
-                          SkIRect* clippedSrcRect) const;
-    void internalDrawBitmap(const SkBitmap&,
-                            const SkRect&,
-                            const GrTextureParams& params,
-                            const SkPaint& paint,
-                            SkCanvas::DrawBitmapRectFlags flags,
-                            bool bicubic,
-                            bool needsTextureDomain);
-    void drawTiledBitmap(const SkBitmap& bitmap,
-                         const SkRect& srcRect,
-                         const SkIRect& clippedSrcRect,
-                         const GrTextureParams& params,
-                         const SkPaint& paint,
-                         SkCanvas::DrawBitmapRectFlags flags,
-                         int tileSize,
-                         bool bicubic);
-
-    bool drawDashLine(const SkPoint pts[2], const SkPaint& paint);
-
-    static SkPicture::AccelData::Key ComputeAccelDataKey();
-
-    typedef SkBaseDevice INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/include/gpu/SkGr.h b/gfx/skia/skia/include/gpu/SkGr.h
index 2f8867950323..17625c4e4eb4 100644
--- a/gfx/skia/skia/include/gpu/SkGr.h
+++ b/gfx/skia/skia/include/gpu/SkGr.h
@@ -6,60 +6,25 @@
  * found in the LICENSE file.
  */
 
-
-
 #ifndef SkGr_DEFINED
 #define SkGr_DEFINED
 
-#include <stddef.h>
+#include "GrColor.h"
+#include "GrTextureAccess.h"
+#include "SkColor.h"
+#include "SkColorPriv.h"
+#include "SkFilterQuality.h"
+#include "SkImageInfo.h"
 
-// Gr headers
-#include "GrTypes.h"
-#include "GrContext.h"
-
-// skia headers
-#include "SkBitmap.h"
-#include "SkPath.h"
-#include "SkPoint.h"
-#include "SkRegion.h"
-#include "SkClipStack.h"
+class GrContext;
+class GrTexture;
+class GrTextureParams;
+class SkBitmap;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Sk to Gr Type conversions
 
-GR_STATIC_ASSERT((int)kZero_GrBlendCoeff == (int)SkXfermode::kZero_Coeff);
-GR_STATIC_ASSERT((int)kOne_GrBlendCoeff  == (int)SkXfermode::kOne_Coeff);
-GR_STATIC_ASSERT((int)kSC_GrBlendCoeff   == (int)SkXfermode::kSC_Coeff);
-GR_STATIC_ASSERT((int)kISC_GrBlendCoeff  == (int)SkXfermode::kISC_Coeff);
-GR_STATIC_ASSERT((int)kDC_GrBlendCoeff   == (int)SkXfermode::kDC_Coeff);
-GR_STATIC_ASSERT((int)kIDC_GrBlendCoeff  == (int)SkXfermode::kIDC_Coeff);
-GR_STATIC_ASSERT((int)kSA_GrBlendCoeff   == (int)SkXfermode::kSA_Coeff);
-GR_STATIC_ASSERT((int)kISA_GrBlendCoeff  == (int)SkXfermode::kISA_Coeff);
-GR_STATIC_ASSERT((int)kDA_GrBlendCoeff   == (int)SkXfermode::kDA_Coeff);
-GR_STATIC_ASSERT((int)kIDA_GrBlendCoeff  == (int)SkXfermode::kIDA_Coeff);
-
-#define sk_blend_to_grblend(X) ((GrBlendCoeff)(X))
-
-///////////////////////////////////////////////////////////////////////////////
-
-#include "SkColorPriv.h"
-
-#ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG
-/**
- *  Convert the SkBitmap::Config to the corresponding PixelConfig, or
- *  kUnknown_PixelConfig if the conversion cannot be done.
- */
-GrPixelConfig SkBitmapConfig2GrPixelConfig(SkBitmap::Config);
-#endif
-GrPixelConfig SkImageInfo2GrPixelConfig(SkColorType, SkAlphaType);
-
-static inline GrPixelConfig SkImageInfo2GrPixelConfig(const SkImageInfo& info) {
-    return SkImageInfo2GrPixelConfig(info.colorType(), info.alphaType());
-}
-
-bool GrPixelConfig2ColorType(GrPixelConfig, SkColorType*);
-
-static inline GrColor SkColor2GrColor(SkColor c) {
+static inline GrColor SkColorToPremulGrColor(SkColor c) {
     SkPMColor pm = SkPreMultiplyColor(c);
     unsigned r = SkGetPackedR32(pm);
     unsigned g = SkGetPackedG32(pm);
@@ -68,41 +33,61 @@ static inline GrColor SkColor2GrColor(SkColor c) {
     return GrColorPackRGBA(r, g, b, a);
 }
 
-static inline GrColor SkColor2GrColorJustAlpha(SkColor c) {
+static inline GrColor SkColorToUnpremulGrColor(SkColor c) {
+    unsigned r = SkColorGetR(c);
+    unsigned g = SkColorGetG(c);
+    unsigned b = SkColorGetB(c);
+    unsigned a = SkColorGetA(c);
+    return GrColorPackRGBA(r, g, b, a);
+}
+
+static inline GrColor SkColorToOpaqueGrColor(SkColor c) {
+    unsigned r = SkColorGetR(c);
+    unsigned g = SkColorGetG(c);
+    unsigned b = SkColorGetB(c);
+    return GrColorPackRGBA(r, g, b, 0xFF);
+}
+
+/** Replicates the SkColor's alpha to all four channels of the GrColor. */
+static inline GrColor SkColorAlphaToGrColor(SkColor c) {
     U8CPU a = SkColorGetA(c);
     return GrColorPackRGBA(a, a, a, a);
 }
 
+static inline SkPMColor GrColorToSkPMColor(GrColor c) {
+    GrColorIsPMAssert(c);
+    return SkPackARGB32(GrColorUnpackA(c), GrColorUnpackR(c), GrColorUnpackG(c), GrColorUnpackB(c));
+}
+
+static inline GrColor SkPMColorToGrColor(SkPMColor c) {
+    return GrColorPackRGBA(SkGetPackedR32(c), SkGetPackedG32(c), SkGetPackedB32(c),
+                           SkGetPackedA32(c));
+}
+
 ////////////////////////////////////////////////////////////////////////////////
+/** Returns a texture representing the bitmap that is compatible with the GrTextureParams. The
+    texture is inserted into the cache (unless the bitmap is marked volatile) and can be
+    retrieved again via this function. */
+GrTexture* GrRefCachedBitmapTexture(GrContext*, const SkBitmap&, const GrTextureParams&);
 
-bool GrIsBitmapInCache(const GrContext*, const SkBitmap&, const GrTextureParams*);
+// TODO: Move SkImageInfo2GrPixelConfig to SkGrPriv.h (requires cleanup to SkWindow its subclasses).
+GrPixelConfig SkImageInfo2GrPixelConfig(SkColorType, SkAlphaType, SkColorProfileType);
 
-GrTexture* GrLockAndRefCachedBitmapTexture(GrContext*, const SkBitmap&, const GrTextureParams*);
+static inline GrPixelConfig SkImageInfo2GrPixelConfig(const SkImageInfo& info) {
+    return SkImageInfo2GrPixelConfig(info.colorType(), info.alphaType(), info.profileType());
+}
 
-void GrUnlockAndUnrefCachedBitmapTexture(GrTexture*);
+GrTextureParams::FilterMode GrSkFilterQualityToGrFilterMode(SkFilterQuality paintFilterQuality,
+                                                            const SkMatrix& viewM,
+                                                            const SkMatrix& localM,
+                                                            bool* doBicubic);
 
 ////////////////////////////////////////////////////////////////////////////////
 
-// Converts a SkPaint to a GrPaint, ignoring the SkPaint's shader.
-// Sets the color of GrPaint to the value of the parameter paintColor
-// Callers may subsequently modify the GrPaint. Setting constantColor indicates
-// that the final paint will draw the same color at every pixel. This allows
-// an optimization where the the color filter can be applied to the SkPaint's
-// color once while converting to GrPaint and then ignored.
-void SkPaint2GrPaintNoShader(GrContext* context, const SkPaint& skPaint, GrColor paintColor,
-                             bool constantColor, GrPaint* grPaint);
+SkImageInfo GrMakeInfoFromTexture(GrTexture* tex, int w, int h, bool isOpaque);
 
-// This function is similar to skPaint2GrPaintNoShader but also converts
-// skPaint's shader to a GrTexture/GrEffectStage if possible.
-// constantColor has the same meaning as in skPaint2GrPaintNoShader.
-void SkPaint2GrPaintShader(GrContext* context, const SkPaint& skPaint,
-                           bool constantColor, GrPaint* grPaint);
-
-////////////////////////////////////////////////////////////////////////////////
-// Classes
-
-class SkGlyphCache;
-
-////////////////////////////////////////////////////////////////////////////////
+// Using the dreaded SkGrPixelRef ...
+SK_API void GrWrapTextureInBitmap(GrTexture* src, int w, int h, bool isOpaque,
+                                  SkBitmap* dst);
 
 #endif
diff --git a/gfx/skia/skia/include/gpu/SkGrPixelRef.h b/gfx/skia/skia/include/gpu/SkGrPixelRef.h
index 7e6a9d02ed36..c06154db10d1 100644
--- a/gfx/skia/skia/include/gpu/SkGrPixelRef.h
+++ b/gfx/skia/skia/include/gpu/SkGrPixelRef.h
@@ -20,14 +20,13 @@
  */
 class SK_API SkROLockPixelsPixelRef : public SkPixelRef {
 public:
-    SK_DECLARE_INST_COUNT(SkROLockPixelsPixelRef)
     SkROLockPixelsPixelRef(const SkImageInfo&);
     virtual ~SkROLockPixelsPixelRef();
 
 protected:
-    virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE;
-    virtual void onUnlockPixels() SK_OVERRIDE;
-    virtual bool onLockPixelsAreWritable() const SK_OVERRIDE;   // return false;
+    bool onNewLockPixels(LockRec*) override;
+    void onUnlockPixels() override;
+    bool onLockPixelsAreWritable() const override;   // return false;
 
 private:
     SkBitmap    fBitmap;
@@ -39,27 +38,24 @@ private:
  */
 class SK_API SkGrPixelRef : public SkROLockPixelsPixelRef {
 public:
-    SK_DECLARE_INST_COUNT(SkGrPixelRef)
     /**
-     * Constructs a pixel ref around a GrSurface. If the caller has locked the GrSurface in the
-     * cache and would like the pixel ref to unlock it in its destructor then transferCacheLock
-     * should be set to true.
+     * Constructs a pixel ref around a GrSurface.
      */
-    SkGrPixelRef(const SkImageInfo&, GrSurface*, bool transferCacheLock = false);
+    SkGrPixelRef(const SkImageInfo&, GrSurface*);
     virtual ~SkGrPixelRef();
 
     // override from SkPixelRef
-    virtual GrTexture* getTexture() SK_OVERRIDE;
+    GrTexture* getTexture() override;
 
 protected:
     // overrides from SkPixelRef
-    virtual bool onReadPixels(SkBitmap* dst, const SkIRect* subset) SK_OVERRIDE;
-    virtual SkPixelRef* deepCopy(SkColorType, const SkIRect* subset) SK_OVERRIDE;
+    bool onReadPixels(SkBitmap* dst, const SkIRect* subset) override;
+    SkPixelRef* deepCopy(SkColorType, SkColorProfileType,
+                         const SkIRect* subset) override;
+    void onNotifyPixelsChanged() override;
 
 private:
     GrSurface*  fSurface;
-    bool        fUnlock;   // if true the pixel ref owns a texture cache lock on fSurface
-
     typedef SkROLockPixelsPixelRef INHERITED;
 };
 
diff --git a/gfx/skia/skia/include/gpu/effects/GrConstColorProcessor.h b/gfx/skia/skia/include/gpu/effects/GrConstColorProcessor.h
new file mode 100644
index 000000000000..679533eac597
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/effects/GrConstColorProcessor.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrColorProcessor_DEFINED
+#define GrColorProcessor_DEFINED
+
+#include "GrFragmentProcessor.h"
+
+/**
+ * This is a simple GrFragmentProcessor that outputs a constant color. It may do one of the
+ * following with its input color: ignore it, or multiply it by the constant color, multiply its
+ * alpha by the constant color and ignore the input color's r, g, and b.
+ */
+class GrConstColorProcessor : public GrFragmentProcessor {
+public:
+    enum InputMode {
+        kIgnore_InputMode,
+        kModulateRGBA_InputMode,
+        kModulateA_InputMode,
+
+        kLastInputMode = kModulateA_InputMode
+    };
+    static const int kInputModeCnt = kLastInputMode + 1;
+
+    static GrFragmentProcessor* Create(GrColor color, InputMode mode) {
+        return new GrConstColorProcessor(color, mode);
+    }
+
+    const char* name() const override { return "Color"; }
+
+    SkString dumpInfo() const override {
+        SkString str;
+        str.appendf("Color: 0x%08x", fColor);
+        return str;
+    }
+
+    GrColor color() const { return fColor; }
+
+    InputMode inputMode() const { return fMode; }
+
+private:
+    GrConstColorProcessor(GrColor color, InputMode mode) : fColor(color), fMode(mode) {
+        this->initClassID<GrConstColorProcessor>();
+    }
+
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
+
+    bool onIsEqual(const GrFragmentProcessor&) const override;
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
+
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+
+    GrColor     fColor;
+    InputMode   fMode;
+
+    typedef GrFragmentProcessor INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/include/gpu/effects/GrCoverageSetOpXP.h b/gfx/skia/skia/include/gpu/effects/GrCoverageSetOpXP.h
new file mode 100644
index 000000000000..097a890d569c
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/effects/GrCoverageSetOpXP.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrCoverageSetOpXP_DEFINED
+#define GrCoverageSetOpXP_DEFINED
+
+#include "GrTypes.h"
+#include "GrXferProcessor.h"
+#include "SkRegion.h"
+
+class GrProcOptInfo;
+
+/**
+ * This xfer processor directly blends the the src coverage with the dst using a set operator. It is
+ * useful for rendering coverage masks using CSG. It can optionally invert the src coverage before
+ * applying the set operator.
+ */
+class GrCoverageSetOpXPFactory : public GrXPFactory {
+public:
+    static GrXPFactory* Create(SkRegion::Op regionOp, bool invertCoverage = false);
+
+    void getInvariantBlendedColor(const GrProcOptInfo& colorPOI,
+                                  GrXPFactory::InvariantBlendedColor*) const override;
+
+private:
+    GrCoverageSetOpXPFactory(SkRegion::Op regionOp, bool invertCoverage);
+
+    GrXferProcessor* onCreateXferProcessor(const GrCaps& caps,
+                                           const GrPipelineOptimizations& optimizations,
+                                           bool hasMixedSamples,
+                                           const DstTexture*) const override;
+
+    bool willReadDstColor(const GrCaps& /*caps*/,
+                          const GrPipelineOptimizations& /*optimizations*/,
+                          bool /*hasMixedSamples*/) const override {
+        return false;
+    }
+
+    bool onIsEqual(const GrXPFactory& xpfBase) const override {
+        const GrCoverageSetOpXPFactory& xpf = xpfBase.cast<GrCoverageSetOpXPFactory>();
+        return fRegionOp == xpf.fRegionOp;
+    }
+
+    GR_DECLARE_XP_FACTORY_TEST;
+
+    SkRegion::Op fRegionOp;
+    bool         fInvertCoverage;
+
+    typedef GrXPFactory INHERITED;
+};
+#endif
+
diff --git a/gfx/skia/skia/include/gpu/effects/GrCustomXfermode.h b/gfx/skia/skia/include/gpu/effects/GrCustomXfermode.h
new file mode 100644
index 000000000000..bcbd5833ca87
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/effects/GrCustomXfermode.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrCustomXfermode_DEFINED
+#define GrCustomXfermode_DEFINED
+
+#include "SkXfermode.h"
+
+class GrTexture;
+
+/**
+ * Custom Xfer modes are used for blending when the blend mode cannot be represented using blend
+ * coefficients.
+ */
+namespace GrCustomXfermode {
+    bool IsSupportedMode(SkXfermode::Mode mode);
+    GrXPFactory* CreateXPFactory(SkXfermode::Mode mode);
+};
+
+#endif
diff --git a/gfx/skia/skia/include/gpu/effects/GrPorterDuffXferProcessor.h b/gfx/skia/skia/include/gpu/effects/GrPorterDuffXferProcessor.h
new file mode 100644
index 000000000000..be014a6b0482
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/effects/GrPorterDuffXferProcessor.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrPorterDuffXferProcessor_DEFINED
+#define GrPorterDuffXferProcessor_DEFINED
+
+#include "GrTypes.h"
+#include "GrXferProcessor.h"
+#include "SkXfermode.h"
+
+class GrProcOptInfo;
+
+class GrPorterDuffXPFactory : public GrXPFactory {
+public:
+    static GrXPFactory* Create(SkXfermode::Mode mode); 
+
+    void getInvariantBlendedColor(const GrProcOptInfo& colorPOI,
+                                  GrXPFactory::InvariantBlendedColor*) const override;
+
+    static GrXferProcessor* CreateSrcOverXferProcessor(const GrCaps& caps,
+                                                       const GrPipelineOptimizations& optimizations,
+                                                       bool hasMixedSamples,
+                                                       const GrXferProcessor::DstTexture*);
+
+    static inline void SrcOverInvariantBlendedColor(
+                                                GrColor inputColor,
+                                                GrColorComponentFlags validColorFlags,
+                                                bool isOpaque,
+                                                GrXPFactory::InvariantBlendedColor* blendedColor) {
+        if (!isOpaque) {
+            blendedColor->fWillBlendWithDst = true;
+            blendedColor->fKnownColorFlags = kNone_GrColorComponentFlags;
+            return;
+        }
+        blendedColor->fWillBlendWithDst = false;
+
+        blendedColor->fKnownColor = inputColor;
+        blendedColor->fKnownColorFlags = validColorFlags;
+    }
+
+    static bool SrcOverWillNeedDstTexture(const GrCaps& caps,
+                                          const GrPipelineOptimizations& optimizations,
+                                          bool hasMixedSamples);
+
+private:
+    GrPorterDuffXPFactory(SkXfermode::Mode);
+
+    GrXferProcessor* onCreateXferProcessor(const GrCaps& caps,
+                                           const GrPipelineOptimizations& optimizations,
+                                           bool hasMixedSamples,
+                                           const DstTexture*) const override;
+
+    bool willReadDstColor(const GrCaps& caps,
+                          const GrPipelineOptimizations& optimizations,
+                          bool hasMixedSamples) const override;
+
+    bool onIsEqual(const GrXPFactory& xpfBase) const override {
+        const GrPorterDuffXPFactory& xpf = xpfBase.cast<GrPorterDuffXPFactory>();
+        return fXfermode == xpf.fXfermode;
+    }
+
+    GR_DECLARE_XP_FACTORY_TEST;
+    static void TestGetXPOutputTypes(const GrXferProcessor*, int* outPrimary, int* outSecondary);
+
+    SkXfermode::Mode fXfermode;
+
+    friend class GrPorterDuffTest; // for TestGetXPOutputTypes()
+    typedef GrXPFactory INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/include/gpu/effects/GrXfermodeFragmentProcessor.h b/gfx/skia/skia/include/gpu/effects/GrXfermodeFragmentProcessor.h
new file mode 100644
index 000000000000..fb07d003cd65
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/effects/GrXfermodeFragmentProcessor.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrXfermodeFragmentProcessor_DEFINED
+#define GrXfermodeFragmentProcessor_DEFINED
+
+#include "SkXfermode.h"
+
+class GrFragmentProcessor;
+
+namespace GrXfermodeFragmentProcessor {
+    /** The color input to the returned processor is treated as the src and the passed in processor
+        is the dst. */
+    const GrFragmentProcessor* CreateFromDstProcessor(const GrFragmentProcessor* dst,
+                                                      SkXfermode::Mode mode);
+
+    /** The color input to the returned processor is treated as the dst and the passed in processor
+        is the src. */
+    const GrFragmentProcessor* CreateFromSrcProcessor(const GrFragmentProcessor* src,
+                                                      SkXfermode::Mode mode);
+
+    /** Takes the input color, which is assumed to be unpremultiplied, passes it as an opaque color
+        to both src and dst. The outputs of a src and dst are blended using mode and the original
+        input's alpha is applied to the blended color to produce a premul output. */
+    const GrFragmentProcessor* CreateFromTwoProcessors(const GrFragmentProcessor* src,
+                                                       const GrFragmentProcessor* dst,
+                                                       SkXfermode::Mode mode);
+};
+
+#endif
diff --git a/gfx/skia/skia/include/gpu/gl/GrGLConfig.h b/gfx/skia/skia/include/gpu/gl/GrGLConfig.h
index 444be00f158d..c91537cc380a 100644
--- a/gfx/skia/skia/include/gpu/gl/GrGLConfig.h
+++ b/gfx/skia/skia/include/gpu/gl/GrGLConfig.h
@@ -30,7 +30,7 @@
  * file (if one is in use). If a GR_GL_CUSTOM_SETUP_HEADER is used they can
  * also be placed there.
  *
- * GR_GL_LOG_CALLS: if 1 Gr can print every GL call using GrPrintf. Defaults to
+ * GR_GL_LOG_CALLS: if 1 Gr can print every GL call using SkDebugf. Defaults to
  * 0. Logging can be enabled and disabled at runtime using a debugger via to
  * global gLogCallsGL. The initial value of gLogCallsGL is controlled by
  * GR_GL_LOG_CALLS_START.
@@ -46,12 +46,6 @@
  * GR_GL_CHECK_ERROR_START: controls the initial value of gCheckErrorGL
  * when GR_GL_CHECK_ERROR is 1.  Defaults to 1.
  *
- * GR_GL_NO_CONSTANT_ATTRIBUTES: if this evaluates to true then the GL backend
- * will use uniforms instead of attributes in all cases when there is not
- * per-vertex data. This is important when the underlying GL implementation
- * doesn't actually support immediate style attribute values (e.g. when
- * the GL stream is converted to DX as in ANGLE on Chrome). Defaults to 0.
- *
  * GR_GL_USE_BUFFER_DATA_NULL_HINT: When specifing new data for a vertex/index
  * buffer that replaces old data Ganesh can give a hint to the driver that the
  * previous data will not be used in future draws like this:
@@ -71,15 +65,6 @@
  * The GrGLInterface field fCallback specifies the function ptr and there is an
  * additional field fCallbackData of type intptr_t for client data.
  *
- * GR_GL_RGBA_8888_PIXEL_OPS_SLOW: Set this to 1 if it is known that performing
- * glReadPixels / glTex(Sub)Image with format=GL_RGBA, type=GL_UNISIGNED_BYTE is
- * significantly slower than format=GL_BGRA, type=GL_UNISIGNED_BYTE.
- *
- * GR_GL_FULL_READPIXELS_FASTER_THAN_PARTIAL: Set this to 1 if calling
- * glReadPixels to read the entire framebuffer is faster than calling it with
- * the same sized rectangle but with a framebuffer bound that is larger than
- * the rectangle read.
- *
  * GR_GL_CHECK_ALLOC_WITH_GET_ERROR: If set to 1 this will then glTexImage,
  * glBufferData, glRenderbufferStorage, etc will be checked for errors. This
  * amounts to ensuring the error is GL_NO_ERROR, calling the allocating
@@ -126,10 +111,6 @@
     #define GR_GL_CHECK_ERROR_START                     1
 #endif
 
-#if !defined(GR_GL_NO_CONSTANT_ATTRIBUTES)
-    #define GR_GL_NO_CONSTANT_ATTRIBUTES                0
-#endif
-
 #if !defined(GR_GL_USE_BUFFER_DATA_NULL_HINT)
     #define GR_GL_USE_BUFFER_DATA_NULL_HINT             1
 #endif
@@ -138,14 +119,6 @@
     #define GR_GL_PER_GL_FUNC_CALLBACK                  0
 #endif
 
-#if !defined(GR_GL_RGBA_8888_PIXEL_OPS_SLOW)
-    #define GR_GL_RGBA_8888_PIXEL_OPS_SLOW              0
-#endif
-
-#if !defined(GR_GL_FULL_READPIXELS_FASTER_THAN_PARTIAL)
-    #define GR_GL_FULL_READPIXELS_FASTER_THAN_PARTIAL   0
-#endif
-
 #if !defined(GR_GL_CHECK_ALLOC_WITH_GET_ERROR)
     #define GR_GL_CHECK_ALLOC_WITH_GET_ERROR            1
 #endif
@@ -162,33 +135,4 @@
     #define GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE       0
 #endif
 
-/**
- * There is a strange bug that occurs on Macs with NVIDIA GPUs. We don't
- * fully understand it. When (element) array buffers are continually
- * respecified using glBufferData performance can fall off of a cliff. The
- * driver winds up performing many DMA mapping / unmappings and chews up ~50% of
- * the core. However, it has been observed that occaisonally respecifiying the
- * buffer using glBufferData and then writing data using glBufferSubData
- * prevents the bad behavior.
- *
- * There is a lot of uncertainty around this issue. In Chrome backgrounding
- * the tab somehow initiates this behavior and we don't know what the connection
- * is. Another observation is that Chrome's cmd buffer server will actually
- * create a buffer full of zeros when it sees a NULL data param (for security
- * reasons). If this is disabled and NULL is actually passed all the way to the
- * driver then the workaround doesn't help.
- *
- * The issue is tracked at:
- * http://code.google.com/p/chromium/issues/detail?id=114865
- *
- * When the workaround is enabled we will use the glBufferData / glBufferSubData
- * trick every 128 array buffer uploads.
- *
- * Hopefully we will understand this better and have a cleaner fix or get a
- * OS/driver level fix.
- */
-#define GR_GL_MAC_BUFFER_OBJECT_PERFOMANCE_WORKAROUND   \
-    (defined(SK_BUILD_FOR_MAC) &&                       \
-     !GR_GL_USE_BUFFER_DATA_NULL_HINT)
-
 #endif
diff --git a/gfx/skia/skia/include/gpu/gl/GrGLConfig_chrome.h b/gfx/skia/skia/include/gpu/gl/GrGLConfig_chrome.h
index acad90450c11..041a46d8c405 100644
--- a/gfx/skia/skia/include/gpu/gl/GrGLConfig_chrome.h
+++ b/gfx/skia/skia/include/gpu/gl/GrGLConfig_chrome.h
@@ -11,21 +11,6 @@
 // glGetError() forces a sync with gpu process on chrome
 #define GR_GL_CHECK_ERROR_START                     0
 
-#if defined(SK_BUILD_FOR_WIN32)
-// ANGLE creates a temp VB for vertex attributes not specified per-vertex.
-#define GR_GL_NO_CONSTANT_ATTRIBUTES                1
-
-// For RGBA teximage/readpixels ANGLE will sw-convert to/from BGRA.
-#define GR_GL_RGBA_8888_PIXEL_OPS_SLOW              1
-
-// ANGLE can go faster if the entire fbo is read rather than a subrect
-#define GR_GL_FULL_READPIXELS_FASTER_THAN_PARTIAL   1
-#else
-#define GR_GL_NO_CONSTANT_ATTRIBUTES                0
-#define GR_GL_RGBA_8888_PIXEL_OPS_SLOW              0
-#define GR_GL_FULL_READPIXELS_FASTER_THAN_PARTIAL   0
-#endif
-
 // cmd buffer allocates memory and memsets it to zero when it sees glBufferData
 // with NULL.
 #define GR_GL_USE_BUFFER_DATA_NULL_HINT             0
diff --git a/gfx/skia/skia/include/gpu/gl/GrGLExtensions.h b/gfx/skia/skia/include/gpu/gl/GrGLExtensions.h
index 89adadfc48ec..d64a268a46be 100644
--- a/gfx/skia/skia/include/gpu/gl/GrGLExtensions.h
+++ b/gfx/skia/skia/include/gpu/gl/GrGLExtensions.h
@@ -17,18 +17,19 @@ struct GrGLInterface;
 /**
  * This helper queries the current GL context for its extensions, remembers them, and can be
  * queried. It supports both glGetString- and glGetStringi-style extension string APIs and will
- * use the latter if it is available.
+ * use the latter if it is available. It also will query for EGL extensions if a eglQueryString
+ * implementation is provided.
  */
 class SK_API GrGLExtensions {
 public:
-    GrGLExtensions() : fInitialized(false), fStrings(SkNEW(SkTArray<SkString>)) {}
+    GrGLExtensions() : fInitialized(false), fStrings(new SkTArray<SkString>) {}
 
     GrGLExtensions(const GrGLExtensions&);
 
     GrGLExtensions& operator=(const GrGLExtensions&);
 
     void swap(GrGLExtensions* that) {
-        fStrings.swap(&that->fStrings);
+        fStrings.swap(that->fStrings);
         SkTSwap(fInitialized, that->fInitialized);
     }
 
@@ -40,7 +41,9 @@ public:
     bool init(GrGLStandard standard,
               GrGLGetStringProc getString,
               GrGLGetStringiProc getStringi,
-              GrGLGetIntegervProc getIntegerv);
+              GrGLGetIntegervProc getIntegerv,
+              GrEGLQueryStringProc queryString = nullptr,
+              GrEGLDisplay eglDisplay = nullptr);
 
     bool isInitialized() const { return fInitialized; }
 
diff --git a/gfx/skia/skia/include/gpu/gl/GrGLFunctions.h b/gfx/skia/skia/include/gpu/gl/GrGLFunctions.h
index 093c7d108783..1086186df851 100644
--- a/gfx/skia/skia/include/gpu/gl/GrGLFunctions.h
+++ b/gfx/skia/skia/include/gpu/gl/GrGLFunctions.h
@@ -9,244 +9,352 @@
 #ifndef GrGLFunctions_DEFINED
 #define GrGLFunctions_DEFINED
 
-#include "GrGLConfig.h"
-
-////////////////////////////////////////////////////////////////////////////////
-
-/**
- * Classifies GL contexts by which standard they implement (currently as Desktop
- * vs. ES).
- */
-enum GrGLStandard {
-    kNone_GrGLStandard,
-    kGL_GrGLStandard,
-    kGLES_GrGLStandard,
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
-/**
- * Declares typedefs for all the GL functions used in GrGLInterface
- */
-
-typedef unsigned int GrGLenum;
-typedef unsigned char GrGLboolean;
-typedef unsigned int GrGLbitfield;
-typedef signed char GrGLbyte;
-typedef char GrGLchar;
-typedef short GrGLshort;
-typedef int GrGLint;
-typedef int GrGLsizei;
-typedef int64_t GrGLint64;
-typedef unsigned char GrGLubyte;
-typedef unsigned short GrGLushort;
-typedef unsigned int GrGLuint;
-typedef uint64_t GrGLuint64;
-typedef float GrGLfloat;
-typedef float GrGLclampf;
-typedef double GrGLdouble;
-typedef double GrGLclampd;
-typedef void GrGLvoid;
-#ifndef SK_IGNORE_64BIT_OPENGL_CHANGES
-#ifdef _WIN64
-typedef signed long long int GrGLintptr;
-typedef signed long long int GrGLsizeiptr;
-#else
-typedef signed long int GrGLintptr;
-typedef signed long int GrGLsizeiptr;
-#endif
-#else
-typedef signed long int GrGLintptr;
-typedef signed long int GrGLsizeiptr;
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
+#include "GrGLTypes.h"
 
 extern "C" {
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLActiveTextureProc)(GrGLenum texture);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLAttachShaderProc)(GrGLuint program, GrGLuint shader);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBeginQueryProc)(GrGLenum target, GrGLuint id);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBindAttribLocationProc)(GrGLuint program, GrGLuint index, const char* name);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBindBufferProc)(GrGLenum target, GrGLuint buffer);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBindFramebufferProc)(GrGLenum target, GrGLuint framebuffer);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBindRenderbufferProc)(GrGLenum target, GrGLuint renderbuffer);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBindTextureProc)(GrGLenum target, GrGLuint texture);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBlendColorProc)(GrGLclampf red, GrGLclampf green, GrGLclampf blue, GrGLclampf alpha);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBindFragDataLocationProc)(GrGLuint program, GrGLuint colorNumber, const GrGLchar* name);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBindFragDataLocationIndexedProc)(GrGLuint program, GrGLuint colorNumber, GrGLuint index, const GrGLchar * name);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBindVertexArrayProc)(GrGLuint array);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBlendFuncProc)(GrGLenum sfactor, GrGLenum dfactor);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBlitFramebufferProc)(GrGLint srcX0, GrGLint srcY0, GrGLint srcX1, GrGLint srcY1, GrGLint dstX0, GrGLint dstY0, GrGLint dstX1, GrGLint dstY1, GrGLbitfield mask, GrGLenum filter);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBufferDataProc)(GrGLenum target, GrGLsizeiptr size, const GrGLvoid* data, GrGLenum usage);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBufferSubDataProc)(GrGLenum target, GrGLintptr offset, GrGLsizeiptr size, const GrGLvoid* data);
-    typedef GrGLenum (GR_GL_FUNCTION_TYPE* GrGLCheckFramebufferStatusProc)(GrGLenum target);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLClearProc)(GrGLbitfield mask);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLClearColorProc)(GrGLclampf red, GrGLclampf green, GrGLclampf blue, GrGLclampf alpha);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLClearStencilProc)(GrGLint s);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLClientActiveTextureProc)(GrGLenum texture);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLColorMaskProc)(GrGLboolean red, GrGLboolean green, GrGLboolean blue, GrGLboolean alpha);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCompileShaderProc)(GrGLuint shader);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCompressedTexImage2DProc)(GrGLenum target, GrGLint level, GrGLenum internalformat, GrGLsizei width, GrGLsizei height, GrGLint border, GrGLsizei imageSize, const GrGLvoid* data);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCompressedTexSubImage2DProc)(GrGLenum target, GrGLint level, GrGLint xoffset, GrGLint yoffset, GrGLsizei width, GrGLsizei height, GrGLenum format, GrGLsizei imageSize, const GrGLvoid* data);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCopyTexSubImage2DProc)(GrGLenum target, GrGLint level, GrGLint xoffset, GrGLint yoffset, GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height);
-    typedef GrGLuint (GR_GL_FUNCTION_TYPE* GrGLCreateProgramProc)(void);
-    typedef GrGLuint (GR_GL_FUNCTION_TYPE* GrGLCreateShaderProc)(GrGLenum type);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCullFaceProc)(GrGLenum mode);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDeleteBuffersProc)(GrGLsizei n, const GrGLuint* buffers);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDeleteFramebuffersProc)(GrGLsizei n, const GrGLuint *framebuffers);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDeleteProgramProc)(GrGLuint program);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDeleteQueriesProc)(GrGLsizei n, const GrGLuint *ids);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDeleteRenderbuffersProc)(GrGLsizei n, const GrGLuint *renderbuffers);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDeleteShaderProc)(GrGLuint shader);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDeleteTexturesProc)(GrGLsizei n, const GrGLuint* textures);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDeleteVertexArraysProc)(GrGLsizei n, const GrGLuint *arrays);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDepthMaskProc)(GrGLboolean flag);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDisableProc)(GrGLenum cap);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDisableVertexAttribArrayProc)(GrGLuint index);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDrawArraysProc)(GrGLenum mode, GrGLint first, GrGLsizei count);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDrawBufferProc)(GrGLenum mode);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDrawBuffersProc)(GrGLsizei n, const GrGLenum* bufs);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDrawElementsProc)(GrGLenum mode, GrGLsizei count, GrGLenum type, const GrGLvoid* indices);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLEnableProc)(GrGLenum cap);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLEnableVertexAttribArrayProc)(GrGLuint index);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLEndQueryProc)(GrGLenum target);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLFinishProc)();
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLFlushProc)();
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLFlushMappedBufferRangeProc)(GrGLenum target, GrGLintptr offset, GrGLsizeiptr length);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLFramebufferRenderbufferProc)(GrGLenum target, GrGLenum attachment, GrGLenum renderbuffertarget, GrGLuint renderbuffer);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLFramebufferTexture2DProc)(GrGLenum target, GrGLenum attachment, GrGLenum textarget, GrGLuint texture, GrGLint level);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLFramebufferTexture2DMultisampleProc)(GrGLenum target, GrGLenum attachment, GrGLenum textarget, GrGLuint texture, GrGLint level, GrGLsizei samples);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLFrontFaceProc)(GrGLenum mode);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGenBuffersProc)(GrGLsizei n, GrGLuint* buffers);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGenFramebuffersProc)(GrGLsizei n, GrGLuint *framebuffers);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGenerateMipmapProc)(GrGLenum target);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGenQueriesProc)(GrGLsizei n, GrGLuint *ids);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGenRenderbuffersProc)(GrGLsizei n, GrGLuint *renderbuffers);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGenTexturesProc)(GrGLsizei n, GrGLuint* textures);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGenVertexArraysProc)(GrGLsizei n, GrGLuint *arrays);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetBufferParameterivProc)(GrGLenum target, GrGLenum pname, GrGLint* params);
-    typedef GrGLenum (GR_GL_FUNCTION_TYPE* GrGLGetErrorProc)();
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetFramebufferAttachmentParameterivProc)(GrGLenum target, GrGLenum attachment, GrGLenum pname, GrGLint* params);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetIntegervProc)(GrGLenum pname, GrGLint* params);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetProgramInfoLogProc)(GrGLuint program, GrGLsizei bufsize, GrGLsizei* length, char* infolog);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetProgramivProc)(GrGLuint program, GrGLenum pname, GrGLint* params);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetQueryivProc)(GrGLenum GLtarget, GrGLenum pname, GrGLint *params);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetQueryObjecti64vProc)(GrGLuint id, GrGLenum pname, GrGLint64 *params);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetQueryObjectivProc)(GrGLuint id, GrGLenum pname, GrGLint *params);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetQueryObjectui64vProc)(GrGLuint id, GrGLenum pname, GrGLuint64 *params);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetQueryObjectuivProc)(GrGLuint id, GrGLenum pname, GrGLuint *params);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetRenderbufferParameterivProc)(GrGLenum target, GrGLenum pname, GrGLint* params);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetShaderInfoLogProc)(GrGLuint shader, GrGLsizei bufsize, GrGLsizei* length, char* infolog);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetShaderivProc)(GrGLuint shader, GrGLenum pname, GrGLint* params);
-    typedef const GrGLubyte* (GR_GL_FUNCTION_TYPE* GrGLGetStringProc)(GrGLenum name);
-    typedef const GrGLubyte* (GR_GL_FUNCTION_TYPE* GrGLGetStringiProc)(GrGLenum name, GrGLuint index);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetTexLevelParameterivProc)(GrGLenum target, GrGLint level, GrGLenum pname, GrGLint* params);
-    typedef GrGLint (GR_GL_FUNCTION_TYPE* GrGLGetUniformLocationProc)(GrGLuint program, const char* name);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLInsertEventMarkerProc)(GrGLsizei length, const char* marker);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLInvalidateBufferDataProc)(GrGLuint buffer);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLInvalidateBufferSubDataProc)(GrGLuint buffer, GrGLintptr offset, GrGLsizeiptr length);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLInvalidateFramebufferProc)(GrGLenum target, GrGLsizei numAttachments,  const GrGLenum *attachments);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLInvalidateSubFramebufferProc)(GrGLenum target, GrGLsizei numAttachments, const GrGLenum *attachments, GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLInvalidateTexImageProc)(GrGLuint texture, GrGLint level);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLInvalidateTexSubImageProc)(GrGLuint texture, GrGLint level, GrGLint xoffset, GrGLint yoffset, GrGLint zoffset, GrGLsizei width, GrGLsizei height, GrGLsizei depth);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLLineWidthProc)(GrGLfloat width);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLLinkProgramProc)(GrGLuint program);
-    typedef GrGLvoid* (GR_GL_FUNCTION_TYPE* GrGLMapBufferProc)(GrGLenum target, GrGLenum access);
-    typedef GrGLvoid* (GR_GL_FUNCTION_TYPE* GrGLMapBufferRangeProc)(GrGLenum target, GrGLintptr offset, GrGLsizeiptr length, GrGLbitfield access);
-    typedef GrGLvoid* (GR_GL_FUNCTION_TYPE* GrGLMapBufferSubDataProc)(GrGLuint target, GrGLintptr offset, GrGLsizeiptr size, GrGLenum access);
-    typedef GrGLvoid* (GR_GL_FUNCTION_TYPE* GrGLMapTexSubImage2DProc)(GrGLenum target, GrGLint level, GrGLint xoffset, GrGLint yoffset, GrGLsizei width, GrGLsizei height, GrGLenum format, GrGLenum type, GrGLenum access);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPixelStoreiProc)(GrGLenum pname, GrGLint param);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPopGroupMarkerProc)();
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPushGroupMarkerProc)(GrGLsizei length, const char* marker);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLQueryCounterProc)(GrGLuint id, GrGLenum target);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLReadBufferProc)(GrGLenum src);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLReadPixelsProc)(GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height, GrGLenum format, GrGLenum type, GrGLvoid* pixels);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLRenderbufferStorageProc)(GrGLenum target, GrGLenum internalformat, GrGLsizei width, GrGLsizei height);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLRenderbufferStorageMultisampleProc)(GrGLenum target, GrGLsizei samples, GrGLenum internalformat, GrGLsizei width, GrGLsizei height);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLResolveMultisampleFramebufferProc)();
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLScissorProc)(GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBindUniformLocation)(GrGLuint program, GrGLint location, const char* name);
+
+typedef void (GR_GL_FUNCTION_TYPE* GRGLDEBUGPROC)(GrGLenum source,
+                                                  GrGLenum type,
+                                                  GrGLuint id,
+                                                  GrGLenum severity,
+                                                  GrGLsizei length,
+                                                  const GrGLchar* message,
+                                                  const void* userParam);
+
+///////////////////////////////////////////////////////////////////////////////
+
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLActiveTextureProc)(GrGLenum texture);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLAttachShaderProc)(GrGLuint program, GrGLuint shader);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBeginQueryProc)(GrGLenum target, GrGLuint id);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBindAttribLocationProc)(GrGLuint program, GrGLuint index, const char* name);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBindBufferProc)(GrGLenum target, GrGLuint buffer);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBindFramebufferProc)(GrGLenum target, GrGLuint framebuffer);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBindRenderbufferProc)(GrGLenum target, GrGLuint renderbuffer);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBindTextureProc)(GrGLenum target, GrGLuint texture);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBindFragDataLocationProc)(GrGLuint program, GrGLuint colorNumber, const GrGLchar* name);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBindFragDataLocationIndexedProc)(GrGLuint program, GrGLuint colorNumber, GrGLuint index, const GrGLchar * name);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBindVertexArrayProc)(GrGLuint array);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBlendBarrierProc)();
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBlendColorProc)(GrGLclampf red, GrGLclampf green, GrGLclampf blue, GrGLclampf alpha);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBlendEquationProc)(GrGLenum mode);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBlendFuncProc)(GrGLenum sfactor, GrGLenum dfactor);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBlitFramebufferProc)(GrGLint srcX0, GrGLint srcY0, GrGLint srcX1, GrGLint srcY1, GrGLint dstX0, GrGLint dstY0, GrGLint dstX1, GrGLint dstY1, GrGLbitfield mask, GrGLenum filter);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBufferDataProc)(GrGLenum target, GrGLsizeiptr size, const GrGLvoid* data, GrGLenum usage);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBufferSubDataProc)(GrGLenum target, GrGLintptr offset, GrGLsizeiptr size, const GrGLvoid* data);
+typedef GrGLenum (GR_GL_FUNCTION_TYPE* GrGLCheckFramebufferStatusProc)(GrGLenum target);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLClearProc)(GrGLbitfield mask);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLClearColorProc)(GrGLclampf red, GrGLclampf green, GrGLclampf blue, GrGLclampf alpha);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLClearStencilProc)(GrGLint s);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLClientActiveTextureProc)(GrGLenum texture);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLColorMaskProc)(GrGLboolean red, GrGLboolean green, GrGLboolean blue, GrGLboolean alpha);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCompileShaderProc)(GrGLuint shader);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCompressedTexImage2DProc)(GrGLenum target, GrGLint level, GrGLenum internalformat, GrGLsizei width, GrGLsizei height, GrGLint border, GrGLsizei imageSize, const GrGLvoid* data);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCompressedTexSubImage2DProc)(GrGLenum target, GrGLint level, GrGLint xoffset, GrGLint yoffset, GrGLsizei width, GrGLsizei height, GrGLenum format, GrGLsizei imageSize, const GrGLvoid* data);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCopyTexSubImage2DProc)(GrGLenum target, GrGLint level, GrGLint xoffset, GrGLint yoffset, GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height);
+typedef GrGLuint (GR_GL_FUNCTION_TYPE* GrGLCreateProgramProc)(void);
+typedef GrGLuint (GR_GL_FUNCTION_TYPE* GrGLCreateShaderProc)(GrGLenum type);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCullFaceProc)(GrGLenum mode);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDeleteBuffersProc)(GrGLsizei n, const GrGLuint* buffers);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDeleteFramebuffersProc)(GrGLsizei n, const GrGLuint *framebuffers);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDeleteProgramProc)(GrGLuint program);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDeleteQueriesProc)(GrGLsizei n, const GrGLuint *ids);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDeleteRenderbuffersProc)(GrGLsizei n, const GrGLuint *renderbuffers);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDeleteShaderProc)(GrGLuint shader);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDeleteTexturesProc)(GrGLsizei n, const GrGLuint* textures);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDeleteVertexArraysProc)(GrGLsizei n, const GrGLuint *arrays);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDepthMaskProc)(GrGLboolean flag);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDisableProc)(GrGLenum cap);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDisableVertexAttribArrayProc)(GrGLuint index);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDrawArraysProc)(GrGLenum mode, GrGLint first, GrGLsizei count);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDrawBufferProc)(GrGLenum mode);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDrawBuffersProc)(GrGLsizei n, const GrGLenum* bufs);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDrawElementsProc)(GrGLenum mode, GrGLsizei count, GrGLenum type, const GrGLvoid* indices);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLEGLImageTargetTexture2DProc)(GrGLenum target, GrGLeglImage image);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLEnableProc)(GrGLenum cap);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLEnableVertexAttribArrayProc)(GrGLuint index);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLEndQueryProc)(GrGLenum target);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLFinishProc)();
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLFlushProc)();
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLFlushMappedBufferRangeProc)(GrGLenum target, GrGLintptr offset, GrGLsizeiptr length);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLFramebufferRenderbufferProc)(GrGLenum target, GrGLenum attachment, GrGLenum renderbuffertarget, GrGLuint renderbuffer);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLFramebufferTexture2DProc)(GrGLenum target, GrGLenum attachment, GrGLenum textarget, GrGLuint texture, GrGLint level);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLFramebufferTexture2DMultisampleProc)(GrGLenum target, GrGLenum attachment, GrGLenum textarget, GrGLuint texture, GrGLint level, GrGLsizei samples);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLFrontFaceProc)(GrGLenum mode);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGenBuffersProc)(GrGLsizei n, GrGLuint* buffers);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGenFramebuffersProc)(GrGLsizei n, GrGLuint *framebuffers);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGenerateMipmapProc)(GrGLenum target);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGenQueriesProc)(GrGLsizei n, GrGLuint *ids);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGenRenderbuffersProc)(GrGLsizei n, GrGLuint *renderbuffers);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGenTexturesProc)(GrGLsizei n, GrGLuint* textures);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGenVertexArraysProc)(GrGLsizei n, GrGLuint *arrays);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetBufferParameterivProc)(GrGLenum target, GrGLenum pname, GrGLint* params);
+typedef GrGLenum (GR_GL_FUNCTION_TYPE* GrGLGetErrorProc)();
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetFramebufferAttachmentParameterivProc)(GrGLenum target, GrGLenum attachment, GrGLenum pname, GrGLint* params);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetIntegervProc)(GrGLenum pname, GrGLint* params);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetProgramInfoLogProc)(GrGLuint program, GrGLsizei bufsize, GrGLsizei* length, char* infolog);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetProgramivProc)(GrGLuint program, GrGLenum pname, GrGLint* params);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetQueryivProc)(GrGLenum GLtarget, GrGLenum pname, GrGLint *params);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetQueryObjecti64vProc)(GrGLuint id, GrGLenum pname, GrGLint64 *params);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetQueryObjectivProc)(GrGLuint id, GrGLenum pname, GrGLint *params);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetQueryObjectui64vProc)(GrGLuint id, GrGLenum pname, GrGLuint64 *params);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetQueryObjectuivProc)(GrGLuint id, GrGLenum pname, GrGLuint *params);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetRenderbufferParameterivProc)(GrGLenum target, GrGLenum pname, GrGLint* params);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetShaderInfoLogProc)(GrGLuint shader, GrGLsizei bufsize, GrGLsizei* length, char* infolog);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetShaderivProc)(GrGLuint shader, GrGLenum pname, GrGLint* params);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetShaderPrecisionFormatProc)(GrGLenum shadertype, GrGLenum precisiontype, GrGLint *range, GrGLint *precision);
+typedef const GrGLubyte* (GR_GL_FUNCTION_TYPE* GrGLGetStringProc)(GrGLenum name);
+typedef const GrGLubyte* (GR_GL_FUNCTION_TYPE* GrGLGetStringiProc)(GrGLenum name, GrGLuint index);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetTexLevelParameterivProc)(GrGLenum target, GrGLint level, GrGLenum pname, GrGLint* params);
+typedef GrGLint (GR_GL_FUNCTION_TYPE* GrGLGetUniformLocationProc)(GrGLuint program, const char* name);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLInsertEventMarkerProc)(GrGLsizei length, const char* marker);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLInvalidateBufferDataProc)(GrGLuint buffer);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLInvalidateBufferSubDataProc)(GrGLuint buffer, GrGLintptr offset, GrGLsizeiptr length);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLInvalidateFramebufferProc)(GrGLenum target, GrGLsizei numAttachments,  const GrGLenum *attachments);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLInvalidateSubFramebufferProc)(GrGLenum target, GrGLsizei numAttachments, const GrGLenum *attachments, GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLInvalidateTexImageProc)(GrGLuint texture, GrGLint level);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLInvalidateTexSubImageProc)(GrGLuint texture, GrGLint level, GrGLint xoffset, GrGLint yoffset, GrGLint zoffset, GrGLsizei width, GrGLsizei height, GrGLsizei depth);
+typedef GrGLboolean (GR_GL_FUNCTION_TYPE* GrGLIsTextureProc)(GrGLuint texture);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLLineWidthProc)(GrGLfloat width);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLLinkProgramProc)(GrGLuint program);
+typedef GrGLvoid* (GR_GL_FUNCTION_TYPE* GrGLMapBufferProc)(GrGLenum target, GrGLenum access);
+typedef GrGLvoid* (GR_GL_FUNCTION_TYPE* GrGLMapBufferRangeProc)(GrGLenum target, GrGLintptr offset, GrGLsizeiptr length, GrGLbitfield access);
+typedef GrGLvoid* (GR_GL_FUNCTION_TYPE* GrGLMapBufferSubDataProc)(GrGLuint target, GrGLintptr offset, GrGLsizeiptr size, GrGLenum access);
+typedef GrGLvoid* (GR_GL_FUNCTION_TYPE* GrGLMapTexSubImage2DProc)(GrGLenum target, GrGLint level, GrGLint xoffset, GrGLint yoffset, GrGLsizei width, GrGLsizei height, GrGLenum format, GrGLenum type, GrGLenum access);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPixelStoreiProc)(GrGLenum pname, GrGLint param);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPopGroupMarkerProc)();
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPushGroupMarkerProc)(GrGLsizei length, const char* marker);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLQueryCounterProc)(GrGLuint id, GrGLenum target);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLRasterSamplesProc)(GrGLuint samples, GrGLboolean fixedsamplelocations);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLReadBufferProc)(GrGLenum src);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLReadPixelsProc)(GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height, GrGLenum format, GrGLenum type, GrGLvoid* pixels);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLRenderbufferStorageProc)(GrGLenum target, GrGLenum internalformat, GrGLsizei width, GrGLsizei height);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLRenderbufferStorageMultisampleProc)(GrGLenum target, GrGLsizei samples, GrGLenum internalformat, GrGLsizei width, GrGLsizei height);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLResolveMultisampleFramebufferProc)();
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLScissorProc)(GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height);
+// GL_CHROMIUM_bind_uniform_location
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBindUniformLocationProc)(GrGLuint program, GrGLint location, const char* name);
 
 #if GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLShaderSourceProc)(GrGLuint shader, GrGLsizei count, const char* const * str, const GrGLint* length);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLShaderSourceProc)(GrGLuint shader, GrGLsizei count, const char* const * str, const GrGLint* length);
 #else
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLShaderSourceProc)(GrGLuint shader, GrGLsizei count, const char** str, const GrGLint* length);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLShaderSourceProc)(GrGLuint shader, GrGLsizei count, const char** str, const GrGLint* length);
 #endif
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilFuncProc)(GrGLenum func, GrGLint ref, GrGLuint mask);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilFuncSeparateProc)(GrGLenum face, GrGLenum func, GrGLint ref, GrGLuint mask);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilMaskProc)(GrGLuint mask);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilMaskSeparateProc)(GrGLenum face, GrGLuint mask);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilOpProc)(GrGLenum fail, GrGLenum zfail, GrGLenum zpass);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilOpSeparateProc)(GrGLenum face, GrGLenum fail, GrGLenum zfail, GrGLenum zpass);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTexImage2DProc)(GrGLenum target, GrGLint level, GrGLint internalformat, GrGLsizei width, GrGLsizei height, GrGLint border, GrGLenum format, GrGLenum type, const GrGLvoid* pixels);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTexParameteriProc)(GrGLenum target, GrGLenum pname, GrGLint param);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTexParameterivProc)(GrGLenum target, GrGLenum pname, const GrGLint* params);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTexStorage2DProc)(GrGLenum target, GrGLsizei levels, GrGLenum internalformat, GrGLsizei width, GrGLsizei height);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDiscardFramebufferProc)(GrGLenum target, GrGLsizei numAttachments, const GrGLenum* attachments);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTexSubImage2DProc)(GrGLenum target, GrGLint level, GrGLint xoffset, GrGLint yoffset, GrGLsizei width, GrGLsizei height, GrGLenum format, GrGLenum type, const GrGLvoid* pixels);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform1fProc)(GrGLint location, GrGLfloat v0);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform1iProc)(GrGLint location, GrGLint v0);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform1fvProc)(GrGLint location, GrGLsizei count, const GrGLfloat* v);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform1ivProc)(GrGLint location, GrGLsizei count, const GrGLint* v);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform2fProc)(GrGLint location, GrGLfloat v0, GrGLfloat v1);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform2iProc)(GrGLint location, GrGLint v0, GrGLint v1);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform2fvProc)(GrGLint location, GrGLsizei count, const GrGLfloat* v);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform2ivProc)(GrGLint location, GrGLsizei count, const GrGLint* v);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform3fProc)(GrGLint location, GrGLfloat v0, GrGLfloat v1, GrGLfloat v2);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform3iProc)(GrGLint location, GrGLint v0, GrGLint v1, GrGLint v2);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform3fvProc)(GrGLint location, GrGLsizei count, const GrGLfloat* v);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform3ivProc)(GrGLint location, GrGLsizei count, const GrGLint* v);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform4fProc)(GrGLint location, GrGLfloat v0, GrGLfloat v1, GrGLfloat v2, GrGLfloat v3);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform4iProc)(GrGLint location, GrGLint v0, GrGLint v1, GrGLint v2, GrGLint v3);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform4fvProc)(GrGLint location, GrGLsizei count, const GrGLfloat* v);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform4ivProc)(GrGLint location, GrGLsizei count, const GrGLint* v);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniformMatrix2fvProc)(GrGLint location, GrGLsizei count, GrGLboolean transpose, const GrGLfloat* value);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniformMatrix3fvProc)(GrGLint location, GrGLsizei count, GrGLboolean transpose, const GrGLfloat* value);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniformMatrix4fvProc)(GrGLint location, GrGLsizei count, GrGLboolean transpose, const GrGLfloat* value);
-    typedef GrGLboolean (GR_GL_FUNCTION_TYPE* GrGLUnmapBufferProc)(GrGLenum target);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUnmapBufferSubDataProc)(const GrGLvoid* mem);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUnmapTexSubImage2DProc)(const GrGLvoid* mem);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUseProgramProc)(GrGLuint program);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLVertexAttrib4fvProc)(GrGLuint indx, const GrGLfloat* values);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLVertexAttribPointerProc)(GrGLuint indx, GrGLint size, GrGLenum type, GrGLboolean normalized, GrGLsizei stride, const GrGLvoid* ptr);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLViewportProc)(GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilFuncProc)(GrGLenum func, GrGLint ref, GrGLuint mask);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilFuncSeparateProc)(GrGLenum face, GrGLenum func, GrGLint ref, GrGLuint mask);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilMaskProc)(GrGLuint mask);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilMaskSeparateProc)(GrGLenum face, GrGLuint mask);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilOpProc)(GrGLenum fail, GrGLenum zfail, GrGLenum zpass);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilOpSeparateProc)(GrGLenum face, GrGLenum fail, GrGLenum zfail, GrGLenum zpass);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTexImage2DProc)(GrGLenum target, GrGLint level, GrGLint internalformat, GrGLsizei width, GrGLsizei height, GrGLint border, GrGLenum format, GrGLenum type, const GrGLvoid* pixels);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTexParameteriProc)(GrGLenum target, GrGLenum pname, GrGLint param);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTexParameterivProc)(GrGLenum target, GrGLenum pname, const GrGLint* params);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTexStorage2DProc)(GrGLenum target, GrGLsizei levels, GrGLenum internalformat, GrGLsizei width, GrGLsizei height);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDiscardFramebufferProc)(GrGLenum target, GrGLsizei numAttachments, const GrGLenum* attachments);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTexSubImage2DProc)(GrGLenum target, GrGLint level, GrGLint xoffset, GrGLint yoffset, GrGLsizei width, GrGLsizei height, GrGLenum format, GrGLenum type, const GrGLvoid* pixels);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTextureBarrierProc)();
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform1fProc)(GrGLint location, GrGLfloat v0);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform1iProc)(GrGLint location, GrGLint v0);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform1fvProc)(GrGLint location, GrGLsizei count, const GrGLfloat* v);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform1ivProc)(GrGLint location, GrGLsizei count, const GrGLint* v);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform2fProc)(GrGLint location, GrGLfloat v0, GrGLfloat v1);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform2iProc)(GrGLint location, GrGLint v0, GrGLint v1);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform2fvProc)(GrGLint location, GrGLsizei count, const GrGLfloat* v);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform2ivProc)(GrGLint location, GrGLsizei count, const GrGLint* v);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform3fProc)(GrGLint location, GrGLfloat v0, GrGLfloat v1, GrGLfloat v2);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform3iProc)(GrGLint location, GrGLint v0, GrGLint v1, GrGLint v2);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform3fvProc)(GrGLint location, GrGLsizei count, const GrGLfloat* v);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform3ivProc)(GrGLint location, GrGLsizei count, const GrGLint* v);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform4fProc)(GrGLint location, GrGLfloat v0, GrGLfloat v1, GrGLfloat v2, GrGLfloat v3);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform4iProc)(GrGLint location, GrGLint v0, GrGLint v1, GrGLint v2, GrGLint v3);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform4fvProc)(GrGLint location, GrGLsizei count, const GrGLfloat* v);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniform4ivProc)(GrGLint location, GrGLsizei count, const GrGLint* v);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniformMatrix2fvProc)(GrGLint location, GrGLsizei count, GrGLboolean transpose, const GrGLfloat* value);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniformMatrix3fvProc)(GrGLint location, GrGLsizei count, GrGLboolean transpose, const GrGLfloat* value);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniformMatrix4fvProc)(GrGLint location, GrGLsizei count, GrGLboolean transpose, const GrGLfloat* value);
+typedef GrGLboolean (GR_GL_FUNCTION_TYPE* GrGLUnmapBufferProc)(GrGLenum target);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUnmapBufferSubDataProc)(const GrGLvoid* mem);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUnmapTexSubImage2DProc)(const GrGLvoid* mem);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUseProgramProc)(GrGLuint program);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLVertexAttrib1fProc)(GrGLuint indx, const GrGLfloat value);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLVertexAttrib2fvProc)(GrGLuint indx, const GrGLfloat* values);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLVertexAttrib3fvProc)(GrGLuint indx, const GrGLfloat* values);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLVertexAttrib4fvProc)(GrGLuint indx, const GrGLfloat* values);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLVertexAttribPointerProc)(GrGLuint indx, GrGLint size, GrGLenum type, GrGLboolean normalized, GrGLsizei stride, const GrGLvoid* ptr);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLViewportProc)(GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height);
 
-    // Experimental: Functions for GL_NV_path_rendering. These will be
-    // alphabetized with the above functions once this is fully supported
-    // (and functions we are unlikely to use will possibly be omitted).
-    // EXT_direct_state_access
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLMatrixLoadfProc)(GrGLenum matrixMode, const GrGLfloat* m);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLMatrixLoadIdentityProc)(GrGLenum);
-    // ARB_program_interface_query
-    typedef GrGLint (GR_GL_FUNCTION_TYPE* GrGLGetProgramResourceLocationProc)(GrGLuint program, GrGLenum programInterface, const GrGLchar *name);
-    // NV_path_rendering
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPathCommandsProc)(GrGLuint path, GrGLsizei numCommands, const GrGLubyte *commands, GrGLsizei numCoords, GrGLenum coordType, const GrGLvoid *coords);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPathCoordsProc)(GrGLuint path, GrGLsizei numCoords, GrGLenum coordType, const GrGLvoid *coords);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPathSubCoordsProc)(GrGLuint path, GrGLsizei coordStart, GrGLsizei numCoords, GrGLenum coordType, const GrGLvoid *coords);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPathStringProc)(GrGLuint path, GrGLenum format, GrGLsizei length, const GrGLvoid *pathString);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPathGlyphsProc)(GrGLuint firstPathName, GrGLenum fontTarget, const GrGLvoid *fontName, GrGLbitfield fontStyle, GrGLsizei numGlyphs, GrGLenum type, const GrGLvoid *charcodes, GrGLenum handleMissingGlyphs, GrGLuint pathParameterTemplate, GrGLfloat emScale);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPathGlyphRangeProc)(GrGLuint firstPathName, GrGLenum fontTarget, const GrGLvoid *fontName, GrGLbitfield fontStyle, GrGLuint firstGlyph, GrGLsizei numGlyphs, GrGLenum handleMissingGlyphs, GrGLuint pathParameterTemplate, GrGLfloat emScale);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLWeightPathsProc)(GrGLuint resultPath, GrGLsizei numPaths, const GrGLuint paths[], const GrGLfloat weights[]);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCopyPathProc)(GrGLuint resultPath, GrGLuint srcPath);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLInterpolatePathsProc)(GrGLuint resultPath, GrGLuint pathA, GrGLuint pathB, GrGLfloat weight);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTransformPathProc)(GrGLuint resultPath, GrGLuint srcPath, GrGLenum transformType, const GrGLfloat *transformValues);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPathParameteriProc)(GrGLuint path, GrGLenum pname, GrGLint value);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPathParameterfProc)(GrGLuint path, GrGLenum pname, GrGLfloat value);
-    typedef GrGLuint (GR_GL_FUNCTION_TYPE* GrGLGenPathsProc)(GrGLsizei range);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDeletePathsProc)(GrGLuint path, GrGLsizei range);
-    typedef GrGLboolean (GR_GL_FUNCTION_TYPE* GrGLIsPathProc)(GrGLuint path);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPathStencilFuncProc)(GrGLenum func, GrGLint ref, GrGLuint mask);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilFillPathProc)(GrGLuint path, GrGLenum fillMode, GrGLuint mask);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilStrokePathProc)(GrGLuint path, GrGLint reference, GrGLuint mask);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilFillPathInstancedProc)(GrGLsizei numPaths, GrGLenum pathNameType, const GrGLvoid *paths, GrGLuint pathBase, GrGLenum fillMode, GrGLuint mask, GrGLenum transformType, const GrGLfloat *transformValues);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilStrokePathInstancedProc)(GrGLsizei numPaths, GrGLenum pathNameType, const GrGLvoid *paths, GrGLuint pathBase, GrGLint reference, GrGLuint mask, GrGLenum transformType, const GrGLfloat *transformValues);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPathTexGenProc)(GrGLenum texCoordSet, GrGLenum genMode, GrGLint components, const GrGLfloat *coeffs);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCoverFillPathProc)(GrGLuint path, GrGLenum coverMode);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCoverStrokePathProc)(GrGLuint name, GrGLenum coverMode);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCoverFillPathInstancedProc)(GrGLsizei numPaths, GrGLenum pathNameType, const GrGLvoid *paths, GrGLuint pathBase, GrGLenum coverMode, GrGLenum transformType, const GrGLfloat *transformValues);
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCoverStrokePathInstancedProc)(GrGLsizei numPaths, GrGLenum pathNameType, const GrGLvoid *paths, GrGLuint pathBase, GrGLenum coverMode, GrGLenum transformType, const GrGLfloat* transformValues);
+/* GL_NV_path_rendering */
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLMatrixLoadfProc)(GrGLenum matrixMode, const GrGLfloat* m);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLMatrixLoadIdentityProc)(GrGLenum);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPathCommandsProc)(GrGLuint path, GrGLsizei numCommands, const GrGLubyte *commands, GrGLsizei numCoords, GrGLenum coordType, const GrGLvoid *coords);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPathParameteriProc)(GrGLuint path, GrGLenum pname, GrGLint value);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPathParameterfProc)(GrGLuint path, GrGLenum pname, GrGLfloat value);
+typedef GrGLuint (GR_GL_FUNCTION_TYPE* GrGLGenPathsProc)(GrGLsizei range);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDeletePathsProc)(GrGLuint path, GrGLsizei range);
+typedef GrGLboolean (GR_GL_FUNCTION_TYPE* GrGLIsPathProc)(GrGLuint path);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPathStencilFuncProc)(GrGLenum func, GrGLint ref, GrGLuint mask);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilFillPathProc)(GrGLuint path, GrGLenum fillMode, GrGLuint mask);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilStrokePathProc)(GrGLuint path, GrGLint reference, GrGLuint mask);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilFillPathInstancedProc)(GrGLsizei numPaths, GrGLenum pathNameType, const GrGLvoid *paths, GrGLuint pathBase, GrGLenum fillMode, GrGLuint mask, GrGLenum transformType, const GrGLfloat *transformValues);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilStrokePathInstancedProc)(GrGLsizei numPaths, GrGLenum pathNameType, const GrGLvoid *paths, GrGLuint pathBase, GrGLint reference, GrGLuint mask, GrGLenum transformType, const GrGLfloat *transformValues);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCoverFillPathProc)(GrGLuint path, GrGLenum coverMode);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCoverStrokePathProc)(GrGLuint name, GrGLenum coverMode);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCoverFillPathInstancedProc)(GrGLsizei numPaths, GrGLenum pathNameType, const GrGLvoid *paths, GrGLuint pathBase, GrGLenum coverMode, GrGLenum transformType, const GrGLfloat *transformValues);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCoverStrokePathInstancedProc)(GrGLsizei numPaths, GrGLenum pathNameType, const GrGLvoid *paths, GrGLuint pathBase, GrGLenum coverMode, GrGLenum transformType, const GrGLfloat* transformValues);
+// NV_path_rendering v1.2
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilThenCoverFillPathProc)(GrGLuint path, GrGLenum fillMode, GrGLuint mask, GrGLenum coverMode);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilThenCoverStrokePathProc)(GrGLuint path, GrGLint reference, GrGLuint mask, GrGLenum coverMode);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilThenCoverFillPathInstancedProc)(GrGLsizei numPaths, GrGLenum pathNameType, const GrGLvoid *paths, GrGLuint pathBase, GrGLenum fillMode, GrGLuint mask, GrGLenum coverMode, GrGLenum transformType, const GrGLfloat *transformValues);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLStencilThenCoverStrokePathInstancedProc)(GrGLsizei numPaths, GrGLenum pathNameType, const GrGLvoid *paths, GrGLuint pathBase, GrGLint reference, GrGLuint mask, GrGLenum coverMode, GrGLenum transformType, const GrGLfloat *transformValues);
+// NV_path_rendering v1.3
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramPathFragmentInputGenProc)(GrGLuint program, GrGLint location, GrGLenum genMode, GrGLint components,const GrGLfloat *coeffs);
+// CHROMIUM_path_rendering
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBindFragmentInputLocationProc)(GrGLuint program, GrGLint location, const GrGLchar* name);
 
-    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramPathFragmentInputGenProc)(GrGLuint program, GrGLint location, GrGLenum genMode, GrGLint components,const GrGLfloat *coeffs);
+/* ARB_program_interface_query */
+typedef GrGLint (GR_GL_FUNCTION_TYPE* GrGLGetProgramResourceLocationProc)(GrGLuint program, GrGLenum programInterface, const GrGLchar *name);
+
+/* GL_NV_framebuffer_mixed_samples */
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCoverageModulationProc)(GrGLenum components);
+
+/* ARB_draw_instanced */
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDrawArraysInstancedProc)(GrGLenum mode, GrGLint first, GrGLsizei count, GrGLsizei primcount);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDrawElementsInstancedProc)(GrGLenum mode, GrGLsizei count, GrGLenum type, const GrGLvoid *indices, GrGLsizei primcount);
+
+/* ARB_instanced_arrays */
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLVertexAttribDivisorProc)(GrGLuint index, GrGLuint divisor);
+
+/* NV_bindless_texture */
+typedef GrGLuint64 (GR_GL_FUNCTION_TYPE* GrGLGetTextureHandleProc)(GrGLuint texture);
+typedef GrGLuint64 (GR_GL_FUNCTION_TYPE* GrGLGetTextureSamplerHandleProc)(GrGLuint texture, GrGLuint sampler);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLMakeTextureHandleResidentProc)(GrGLuint64 handle);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLMakeTextureHandleNonResidentProc)(GrGLuint64 handle);
+typedef GrGLuint64 (GR_GL_FUNCTION_TYPE* GrGLGetImageHandleProc)(GrGLuint texture, GrGLint level, GrGLboolean layered, GrGLint layer, GrGLint format);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLMakeImageHandleResidentProc)(GrGLuint64 handle, GrGLenum access);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLMakeImageHandleNonResidentProc)(GrGLuint64 handle);
+typedef GrGLboolean (GR_GL_FUNCTION_TYPE* GrGLIsTextureHandleResidentProc)(GrGLuint64 handle);
+typedef GrGLboolean (GR_GL_FUNCTION_TYPE* GrGLIsImageHandleResidentProc)(GrGLuint64 handle);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniformHandleui64Proc)(GrGLint location, GrGLuint64 v0);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLUniformHandleui64vProc)(GrGLint location, GrGLsizei count, const GrGLuint64 *value);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniformHandleui64Proc)(GrGLuint program, GrGLint location, GrGLuint64 v0);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniformHandleui64vProc)(GrGLuint program, GrGLint location, GrGLsizei count, const GrGLuint64 *value);
+
+/* EXT_direct_state_access */
+// (In the future some of these methods may be omitted)
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTextureParameteriProc)(GrGLuint texture, GrGLenum target, GrGLenum pname, GrGLint param);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTextureParameterivProc)(GrGLuint texture, GrGLenum target, GrGLenum pname, const GrGLint *param);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTextureParameterfProc)(GrGLuint texture, GrGLenum target, GrGLenum pname, float param);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTextureParameterfvProc)(GrGLuint texture, GrGLenum target, GrGLenum pname, const float *param);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTextureImage1DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLint GrGLinternalformat, GrGLsizei width, GrGLint border, GrGLenum format, GrGLenum type, const GrGLvoid *pixels);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTextureImage2DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLint GrGLinternalformat, GrGLsizei width, GrGLsizei height, GrGLint border, GrGLenum format, GrGLenum type, const GrGLvoid *pixels);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTextureSubImage1DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLint xoffset, GrGLsizei width, GrGLenum format, GrGLenum type, const GrGLvoid *pixels);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTextureSubImage2DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLint xoffset, GrGLint yoffset, GrGLsizei width, GrGLsizei height, GrGLenum format, GrGLenum type, const GrGLvoid *pixels);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCopyTextureImage1DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLenum GrGLinternalformat, GrGLint x, GrGLint y, GrGLsizei width, GrGLint border);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCopyTextureImage2DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLenum GrGLinternalformat, GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height, GrGLint border);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCopyTextureSubImage1DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLint xoffset, GrGLint x, GrGLint y, GrGLsizei width);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCopyTextureSubImage2DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLint xoffset, GrGLint yoffset, GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetTextureImageProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLenum format, GrGLenum type, GrGLvoid *pixels);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetTextureParameterfvProc)(GrGLuint texture, GrGLenum target, GrGLenum pname, float *params);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetTextureParameterivProc)(GrGLuint texture, GrGLenum target, GrGLenum pname, GrGLint *params);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetTextureLevelParameterfvProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLenum pname, float *params);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetTextureLevelParameterivProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLenum pname, GrGLint *params);
+// OpenGL 1.2
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTextureImage3DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLint GrGLinternalformat, GrGLsizei width, GrGLsizei height, GrGLsizei depth, GrGLint border, GrGLenum format, GrGLenum type, const GrGLvoid *pixels);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLTextureSubImage3DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLint xoffset, GrGLint yoffset, GrGLint zoffset, GrGLsizei width, GrGLsizei height, GrGLsizei depth, GrGLenum format, GrGLenum type, const GrGLvoid *pixels);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCopyTextureSubImage3DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLint xoffset, GrGLint yoffset, GrGLint zoffset, GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCompressedTextureImage3DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLenum GrGLinternalformat, GrGLsizei width, GrGLsizei height, GrGLsizei depth, GrGLint border, GrGLsizei imageSize, const GrGLvoid *data);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCompressedTextureImage2DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLenum GrGLinternalformat, GrGLsizei width, GrGLsizei height, GrGLint border, GrGLsizei imageSize, const GrGLvoid *data);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCompressedTextureImage1DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLenum GrGLinternalformat, GrGLsizei width, GrGLint border, GrGLsizei imageSize, const GrGLvoid *data);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCompressedTextureSubImage3DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLint xoffset, GrGLint yoffset, GrGLint zoffset, GrGLsizei width, GrGLsizei height, GrGLsizei depth, GrGLenum format, GrGLsizei imageSize, const GrGLvoid *data);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCompressedTextureSubImage2DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLint xoffset, GrGLint yoffset, GrGLsizei width, GrGLsizei height, GrGLenum format, GrGLsizei imageSize, const GrGLvoid *data);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLCompressedTextureSubImage1DProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLint xoffset, GrGLsizei width, GrGLenum format, GrGLsizei imageSize, const GrGLvoid *data);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetCompressedTextureImageProc)(GrGLuint texture, GrGLenum target, GrGLint level, GrGLvoid *img);
+// OpenGL 1.5
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLNamedBufferDataProc)(GrGLuint buffer, GrGLsizeiptr size, const GrGLvoid *data, GrGLenum usage);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLNamedBufferSubDataProc)(GrGLuint buffer, GrGLintptr offset, GrGLsizeiptr size, const GrGLvoid *data);
+typedef GrGLvoid* (GR_GL_FUNCTION_TYPE* GrGLMapNamedBufferProc)(GrGLuint buffer, GrGLenum access);
+typedef GrGLboolean (GR_GL_FUNCTION_TYPE* GrGLUnmapNamedBufferProc)(GrGLuint buffer);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetNamedBufferParameterivProc)(GrGLuint buffer, GrGLenum pname, GrGLint *params);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetNamedBufferPointervProc)(GrGLuint buffer, GrGLenum pname, GrGLvoid* *params);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetNamedBufferSubDataProc)(GrGLuint buffer, GrGLintptr offset, GrGLsizeiptr size, GrGLvoid *data);
+// OpenGL 2.0
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniform1fProc)(GrGLuint program, GrGLint location, float v0);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniform2fProc)(GrGLuint program, GrGLint location, float v0, float v1);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniform3fProc)(GrGLuint program, GrGLint location, float v0, float v1, float v2);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniform4fProc)(GrGLuint program, GrGLint location, float v0, float v1, float v2, float v3);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniform1iProc)(GrGLuint program, GrGLint location, GrGLint v0);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniform2iProc)(GrGLuint program, GrGLint location, GrGLint v0, GrGLint v1);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniform3iProc)(GrGLuint program, GrGLint location, GrGLint v0, GrGLint v1, GrGLint v2);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniform4iProc)(GrGLuint program, GrGLint location, GrGLint v0, GrGLint v1, GrGLint v2, GrGLint v3);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniform1fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, const float *value);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniform2fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, const float *value);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniform3fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, const float *value);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniform4fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, const float *value);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniform1ivProc)(GrGLuint program, GrGLint location, GrGLsizei count, const GrGLint *value);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniform2ivProc)(GrGLuint program, GrGLint location, GrGLsizei count, const GrGLint *value);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniform3ivProc)(GrGLuint program, GrGLint location, GrGLsizei count, const GrGLint *value);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniform4ivProc)(GrGLuint program, GrGLint location, GrGLsizei count, const GrGLint *value);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniformMatrix2fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, GrGLboolean transpose, const float *value);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniformMatrix3fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, GrGLboolean transpose, const float *value);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniformMatrix4fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, GrGLboolean transpose, const float *value);
+// OpenGL 2.1
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniformMatrix2x3fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, GrGLboolean transpose, const float *value);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniformMatrix3x2fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, GrGLboolean transpose, const float *value);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniformMatrix2x4fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, GrGLboolean transpose, const float *value);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniformMatrix4x2fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, GrGLboolean transpose, const float *value);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniformMatrix3x4fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, GrGLboolean transpose, const float *value);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLProgramUniformMatrix4x3fvProc)(GrGLuint program, GrGLint location, GrGLsizei count, GrGLboolean transpose, const float *value);
+// OpenGL 3.0
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLNamedRenderbufferStorageProc)(GrGLuint renderbuffer, GrGLenum GrGLinternalformat, GrGLsizei width, GrGLsizei height);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetNamedRenderbufferParameterivProc)(GrGLuint renderbuffer, GrGLenum pname, GrGLint *params);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLNamedRenderbufferStorageMultisampleProc)(GrGLuint renderbuffer, GrGLsizei samples, GrGLenum GrGLinternalformat, GrGLsizei width, GrGLsizei height);
+typedef GrGLenum (GR_GL_FUNCTION_TYPE* GrGLCheckNamedFramebufferStatusProc)(GrGLuint framebuffer, GrGLenum target);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLNamedFramebufferTexture1DProc)(GrGLuint framebuffer, GrGLenum attachment, GrGLenum textarget, GrGLuint texture, GrGLint level);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLNamedFramebufferTexture2DProc)(GrGLuint framebuffer, GrGLenum attachment, GrGLenum textarget, GrGLuint texture, GrGLint level);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLNamedFramebufferTexture3DProc)(GrGLuint framebuffer, GrGLenum attachment, GrGLenum textarget, GrGLuint texture, GrGLint level, GrGLint zoffset);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLNamedFramebufferRenderbufferProc)(GrGLuint framebuffer, GrGLenum attachment, GrGLenum renderbuffertarget, GrGLuint renderbuffer);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetNamedFramebufferAttachmentParameterivProc)(GrGLuint framebuffer, GrGLenum attachment, GrGLenum pname, GrGLint *params);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGenerateTextureMipmapProc)(GrGLuint texture, GrGLenum target);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLFramebufferDrawBufferProc)(GrGLuint framebuffer, GrGLenum mode);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLFramebufferDrawBuffersProc)(GrGLuint framebuffer, GrGLsizei n, const GrGLenum *bufs);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLFramebufferReadBufferProc)(GrGLuint framebuffer, GrGLenum mode);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetFramebufferParameterivProc)(GrGLuint framebuffer, GrGLenum pname, GrGLint *param);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLNamedCopyBufferSubDataProc)(GrGLuint readBuffer, GrGLuint writeBuffer, GrGLintptr readOffset, GrGLintptr writeOffset, GrGLsizeiptr size);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLVertexArrayVertexOffsetProc)(GrGLuint vaobj, GrGLuint buffer, GrGLint size, GrGLenum type, GrGLsizei stride, GrGLintptr offset);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLVertexArrayColorOffsetProc)(GrGLuint vaobj, GrGLuint buffer, GrGLint size, GrGLenum type, GrGLsizei stride, GrGLintptr offset);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLVertexArrayEdgeFlagOffsetProc)(GrGLuint vaobj, GrGLuint buffer, GrGLsizei stride, GrGLintptr offset);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLVertexArrayIndexOffsetProc)(GrGLuint vaobj, GrGLuint buffer, GrGLenum type, GrGLsizei stride, GrGLintptr offset);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLVertexArrayNormalOffsetProc)(GrGLuint vaobj, GrGLuint buffer, GrGLenum type, GrGLsizei stride, GrGLintptr offset);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLVertexArrayTexCoordOffsetProc)(GrGLuint vaobj, GrGLuint buffer, GrGLint size, GrGLenum type, GrGLsizei stride, GrGLintptr offset);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLVertexArrayMultiTexCoordOffsetProc)(GrGLuint vaobj, GrGLuint buffer, GrGLenum texunit, GrGLint size, GrGLenum type, GrGLsizei stride, GrGLintptr offset);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLVertexArrayFogCoordOffsetProc)(GrGLuint vaobj, GrGLuint buffer, GrGLenum type, GrGLsizei stride, GrGLintptr offset);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLVertexArraySecondaryColorOffsetProc)(GrGLuint vaobj, GrGLuint buffer, GrGLint size, GrGLenum type, GrGLsizei stride, GrGLintptr offset);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLVertexArrayVertexAttribOffsetProc)(GrGLuint vaobj, GrGLuint buffer, GrGLuint index, GrGLint size, GrGLenum type, GrGLboolean normalized, GrGLsizei stride, GrGLintptr offset);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLVertexArrayVertexAttribIOffsetProc)(GrGLuint vaobj, GrGLuint buffer, GrGLuint index, GrGLint size, GrGLenum type, GrGLsizei stride, GrGLintptr offset);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLEnableVertexArrayProc)(GrGLuint vaobj, GrGLenum array);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDisableVertexArrayProc)(GrGLuint vaobj, GrGLenum array);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLEnableVertexArrayAttribProc)(GrGLuint vaobj, GrGLuint index);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDisableVertexArrayAttribProc)(GrGLuint vaobj, GrGLuint index);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetVertexArrayIntegervProc)(GrGLuint vaobj, GrGLenum pname, GrGLint *param);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetVertexArrayPointervProc)(GrGLuint vaobj, GrGLenum pname, GrGLvoid **param);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetVertexArrayIntegeri_vProc)(GrGLuint vaobj, GrGLuint index, GrGLenum pname, GrGLint *param);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetVertexArrayPointeri_vProc)(GrGLuint vaobj, GrGLuint index, GrGLenum pname, GrGLvoid **param);
+typedef GrGLvoid* (GR_GL_FUNCTION_TYPE* GrGLMapNamedBufferRangeProc)(GrGLuint buffer, GrGLintptr offset, GrGLsizeiptr length, GrGLbitfield access);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLFlushMappedNamedBufferRangeProc)(GrGLuint buffer, GrGLintptr offset, GrGLsizeiptr length);
+
+/* KHR_debug */
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDebugMessageControlProc)(GrGLenum source, GrGLenum type, GrGLenum severity, GrGLsizei count, const GrGLuint* ids, GrGLboolean enabled);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDebugMessageInsertProc)(GrGLenum source, GrGLenum type, GrGLuint id, GrGLenum severity, GrGLsizei length,  const GrGLchar* buf);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLDebugMessageCallbackProc)(GRGLDEBUGPROC callback, const GrGLvoid* userParam);
+typedef GrGLuint (GR_GL_FUNCTION_TYPE* GrGLGetDebugMessageLogProc)(GrGLuint count, GrGLsizei bufSize, GrGLenum* sources, GrGLenum* types, GrGLuint* ids, GrGLenum* severities, GrGLsizei* lengths,  GrGLchar* messageLog);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPushDebugGroupProc)(GrGLenum source, GrGLuint id, GrGLsizei length,  const GrGLchar * message);
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPopDebugGroupProc)();
+typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLObjectLabelProc)(GrGLenum identifier, GrGLuint name, GrGLsizei length, const GrGLchar *label);
+
+/** EGL functions */
+typedef const char* (GR_GL_FUNCTION_TYPE* GrEGLQueryStringProc)(GrEGLDisplay dpy, GrEGLint name);
+typedef GrEGLDisplay (GR_GL_FUNCTION_TYPE* GrEGLGetCurrentDisplayProc)();
+typedef GrEGLImage (GR_GL_FUNCTION_TYPE* GrEGLCreateImageProc)(GrEGLDisplay dpy, GrEGLContext ctx, GrEGLenum target, GrEGLClientBuffer buffer, const GrEGLint *attrib_list);
+typedef GrEGLBoolean (GR_GL_FUNCTION_TYPE* GrEGLDestroyImageProc)(GrEGLDisplay dpy, GrEGLImage image);
 }  // extern "C"
 
 #endif
diff --git a/gfx/skia/skia/include/gpu/gl/GrGLInterface.h b/gfx/skia/skia/include/gpu/gl/GrGLInterface.h
index 7bf382c05dd3..31429a8ebc98 100644
--- a/gfx/skia/skia/include/gpu/gl/GrGLInterface.h
+++ b/gfx/skia/skia/include/gpu/gl/GrGLInterface.h
@@ -30,6 +30,8 @@
  * comments in GrGLConfig.h
  */
 
+typedef void(*GrGLFuncPtr)();
+
 struct GrGLInterface;
 
 const GrGLInterface* GrGLDefaultInterface();
@@ -39,20 +41,27 @@ const GrGLInterface* GrGLDefaultInterface();
  * GLX on linux, AGL on Mac). The interface is only valid for the GL context
  * that is current when the interface is created.
  */
-const GrGLInterface* GrGLCreateNativeInterface();
+SK_API const GrGLInterface* GrGLCreateNativeInterface();
 
 #if SK_MESA
 /**
  * Creates a GrGLInterface for an OSMesa context.
  */
-const GrGLInterface* GrGLCreateMesaInterface();
+SK_API const GrGLInterface* GrGLCreateMesaInterface();
 #endif
 
 #if SK_ANGLE
 /**
  * Creates a GrGLInterface for an ANGLE context.
  */
-const GrGLInterface* GrGLCreateANGLEInterface();
+SK_API const GrGLInterface* GrGLCreateANGLEInterface();
+#endif
+
+#if SK_COMMAND_BUFFER
+/**
+ * Creates a GrGLInterface for a Command Buffer context.
+ */
+SK_API const GrGLInterface* GrGLCreateCommandBufferInterface();
 #endif
 
 /**
@@ -119,8 +128,6 @@ private:
     typedef SkRefCnt INHERITED;
 
 public:
-    SK_DECLARE_INST_COUNT(GrGLInterface)
-
     GrGLInterface();
 
     static GrGLInterface* NewClone(const GrGLInterface*);
@@ -156,7 +163,9 @@ public:
         GLPtr<GrGLBindRenderbufferProc> fBindRenderbuffer;
         GLPtr<GrGLBindTextureProc> fBindTexture;
         GLPtr<GrGLBindVertexArrayProc> fBindVertexArray;
+        GLPtr<GrGLBlendBarrierProc> fBlendBarrier;
         GLPtr<GrGLBlendColorProc> fBlendColor;
+        GLPtr<GrGLBlendEquationProc> fBlendEquation;
         GLPtr<GrGLBlendFuncProc> fBlendFunc;
         GLPtr<GrGLBlitFramebufferProc> fBlitFramebuffer;
         GLPtr<GrGLBufferDataProc> fBufferData;
@@ -219,6 +228,7 @@ public:
         GLPtr<GrGLGetRenderbufferParameterivProc> fGetRenderbufferParameteriv;
         GLPtr<GrGLGetShaderInfoLogProc> fGetShaderInfoLog;
         GLPtr<GrGLGetShaderivProc> fGetShaderiv;
+        GLPtr<GrGLGetShaderPrecisionFormatProc> fGetShaderPrecisionFormat;
         GLPtr<GrGLGetStringProc> fGetString;
         GLPtr<GrGLGetStringiProc> fGetStringi;
         GLPtr<GrGLGetTexLevelParameterivProc> fGetTexLevelParameteriv;
@@ -230,18 +240,18 @@ public:
         GLPtr<GrGLInvalidateSubFramebufferProc> fInvalidateSubFramebuffer;
         GLPtr<GrGLInvalidateTexImageProc> fInvalidateTexImage;
         GLPtr<GrGLInvalidateTexSubImageProc> fInvalidateTexSubImage;
+        GLPtr<GrGLIsTextureProc> fIsTexture;
         GLPtr<GrGLLineWidthProc> fLineWidth;
         GLPtr<GrGLLinkProgramProc> fLinkProgram;
         GLPtr<GrGLMapBufferProc> fMapBuffer;
         GLPtr<GrGLMapBufferRangeProc> fMapBufferRange;
         GLPtr<GrGLMapBufferSubDataProc> fMapBufferSubData;
         GLPtr<GrGLMapTexSubImage2DProc> fMapTexSubImage2D;
-        GLPtr<GrGLMatrixLoadfProc> fMatrixLoadf;
-        GLPtr<GrGLMatrixLoadIdentityProc> fMatrixLoadIdentity;
         GLPtr<GrGLPixelStoreiProc> fPixelStorei;
         GLPtr<GrGLPopGroupMarkerProc> fPopGroupMarker;
         GLPtr<GrGLPushGroupMarkerProc> fPushGroupMarker;
         GLPtr<GrGLQueryCounterProc> fQueryCounter;
+        GLPtr<GrGLRasterSamplesProc> fRasterSamples;
         GLPtr<GrGLReadBufferProc> fReadBuffer;
         GLPtr<GrGLReadPixelsProc> fReadPixels;
         GLPtr<GrGLRenderbufferStorageProc> fRenderbufferStorage;
@@ -270,7 +280,7 @@ public:
         GLPtr<GrGLRenderbufferStorageMultisampleProc> fRenderbufferStorageMultisample;
 
         // Pointer to BindUniformLocationCHROMIUM from the GL_CHROMIUM_bind_uniform_location extension.
-        GLPtr<GrGLBindUniformLocation> fBindUniformLocation;
+        GLPtr<GrGLBindUniformLocationProc> fBindUniformLocation;
 
         GLPtr<GrGLResolveMultisampleFramebufferProc> fResolveMultisampleFramebuffer;
         GLPtr<GrGLScissorProc> fScissor;
@@ -286,6 +296,7 @@ public:
         GLPtr<GrGLTexParameterivProc> fTexParameteriv;
         GLPtr<GrGLTexSubImage2DProc> fTexSubImage2D;
         GLPtr<GrGLTexStorage2DProc> fTexStorage2D;
+        GLPtr<GrGLTextureBarrierProc> fTextureBarrier;
         GLPtr<GrGLDiscardFramebufferProc> fDiscardFramebuffer;
         GLPtr<GrGLUniform1fProc> fUniform1f;
         GLPtr<GrGLUniform1iProc> fUniform1i;
@@ -310,16 +321,18 @@ public:
         GLPtr<GrGLUnmapBufferSubDataProc> fUnmapBufferSubData;
         GLPtr<GrGLUnmapTexSubImage2DProc> fUnmapTexSubImage2D;
         GLPtr<GrGLUseProgramProc> fUseProgram;
+        GLPtr<GrGLVertexAttrib1fProc> fVertexAttrib1f;
+        GLPtr<GrGLVertexAttrib2fvProc> fVertexAttrib2fv;
+        GLPtr<GrGLVertexAttrib3fvProc> fVertexAttrib3fv;
         GLPtr<GrGLVertexAttrib4fvProc> fVertexAttrib4fv;
         GLPtr<GrGLVertexAttribPointerProc> fVertexAttribPointer;
         GLPtr<GrGLViewportProc> fViewport;
 
-        // Experimental: Functions for GL_NV_path_rendering. These will be
-        // alphabetized with the above functions once this is fully supported
-        // (and functions we are unlikely to use will possibly be omitted).
+        /* GL_NV_path_rendering */
+        GLPtr<GrGLMatrixLoadfProc> fMatrixLoadf;
+        GLPtr<GrGLMatrixLoadIdentityProc> fMatrixLoadIdentity;
         GLPtr<GrGLGetProgramResourceLocationProc> fGetProgramResourceLocation;
         GLPtr<GrGLPathCommandsProc> fPathCommands;
-        GLPtr<GrGLPathCoordsProc> fPathCoords;
         GLPtr<GrGLPathParameteriProc> fPathParameteri;
         GLPtr<GrGLPathParameterfProc> fPathParameterf;
         GLPtr<GrGLGenPathsProc> fGenPaths;
@@ -330,12 +343,163 @@ public:
         GLPtr<GrGLStencilStrokePathProc> fStencilStrokePath;
         GLPtr<GrGLStencilFillPathInstancedProc> fStencilFillPathInstanced;
         GLPtr<GrGLStencilStrokePathInstancedProc> fStencilStrokePathInstanced;
-        GLPtr<GrGLPathTexGenProc> fPathTexGen;
         GLPtr<GrGLCoverFillPathProc> fCoverFillPath;
         GLPtr<GrGLCoverStrokePathProc> fCoverStrokePath;
         GLPtr<GrGLCoverFillPathInstancedProc> fCoverFillPathInstanced;
         GLPtr<GrGLCoverStrokePathInstancedProc> fCoverStrokePathInstanced;
+        // NV_path_rendering v1.2
+        GLPtr<GrGLStencilThenCoverFillPathProc> fStencilThenCoverFillPath;
+        GLPtr<GrGLStencilThenCoverStrokePathProc> fStencilThenCoverStrokePath;
+        GLPtr<GrGLStencilThenCoverFillPathInstancedProc> fStencilThenCoverFillPathInstanced;
+        GLPtr<GrGLStencilThenCoverStrokePathInstancedProc> fStencilThenCoverStrokePathInstanced;
+        // NV_path_rendering v1.3
         GLPtr<GrGLProgramPathFragmentInputGenProc> fProgramPathFragmentInputGen;
+        // CHROMIUM_path_rendering
+        GLPtr<GrGLBindFragmentInputLocationProc> fBindFragmentInputLocation;
+
+        /* NV_framebuffer_mixed_samples */
+        GLPtr<GrGLCoverageModulationProc> fCoverageModulation;
+
+        /* ARB_draw_instanced */
+        GLPtr<GrGLDrawArraysInstancedProc> fDrawArraysInstanced;
+        GLPtr<GrGLDrawElementsInstancedProc> fDrawElementsInstanced;
+
+        /* ARB_instanced_arrays */
+        GLPtr<GrGLVertexAttribDivisorProc> fVertexAttribDivisor;
+
+        /* NV_bindless_texture */
+        // We use the NVIDIA verson for now because it does not require dynamically uniform handles.
+        // We may switch the the ARB version and/or omit methods in the future.
+        GLPtr<GrGLGetTextureHandleProc> fGetTextureHandle;
+        GLPtr<GrGLGetTextureSamplerHandleProc> fGetTextureSamplerHandle;
+        GLPtr<GrGLMakeTextureHandleResidentProc> fMakeTextureHandleResident;
+        GLPtr<GrGLMakeTextureHandleNonResidentProc> fMakeTextureHandleNonResident;
+        GLPtr<GrGLGetImageHandleProc> fGetImageHandle;
+        GLPtr<GrGLMakeImageHandleResidentProc> fMakeImageHandleResident;
+        GLPtr<GrGLMakeImageHandleNonResidentProc> fMakeImageHandleNonResident;
+        GLPtr<GrGLIsTextureHandleResidentProc> fIsTextureHandleResident;
+        GLPtr<GrGLIsImageHandleResidentProc> fIsImageHandleResident;
+        GLPtr<GrGLUniformHandleui64Proc> fUniformHandleui64;
+        GLPtr<GrGLUniformHandleui64vProc> fUniformHandleui64v;
+        GLPtr<GrGLProgramUniformHandleui64Proc> fProgramUniformHandleui64;
+        GLPtr<GrGLProgramUniformHandleui64vProc> fProgramUniformHandleui64v;
+
+        /* EXT_direct_state_access */
+        // We use the EXT verson because it is more expansive and interacts with more extensions
+        // than the ARB or core (4.5) versions. We may switch and/or omit methods in the future.
+        GLPtr<GrGLTextureParameteriProc> fTextureParameteri;
+        GLPtr<GrGLTextureParameterivProc> fTextureParameteriv;
+        GLPtr<GrGLTextureParameterfProc> fTextureParameterf;
+        GLPtr<GrGLTextureParameterfvProc> fTextureParameterfv;
+        GLPtr<GrGLTextureImage1DProc> fTextureImage1D;
+        GLPtr<GrGLTextureImage2DProc> fTextureImage2D;
+        GLPtr<GrGLTextureSubImage1DProc> fTextureSubImage1D;
+        GLPtr<GrGLTextureSubImage2DProc> fTextureSubImage2D;
+        GLPtr<GrGLCopyTextureImage1DProc> fCopyTextureImage1D;
+        GLPtr<GrGLCopyTextureImage2DProc> fCopyTextureImage2D;
+        GLPtr<GrGLCopyTextureSubImage1DProc> fCopyTextureSubImage1D;
+        GLPtr<GrGLCopyTextureSubImage2DProc> fCopyTextureSubImage2D;
+        GLPtr<GrGLGetTextureImageProc> fGetTextureImage;
+        GLPtr<GrGLGetTextureParameterfvProc> fGetTextureParameterfv;
+        GLPtr<GrGLGetTextureParameterivProc> fGetTextureParameteriv;
+        GLPtr<GrGLGetTextureLevelParameterfvProc> fGetTextureLevelParameterfv;
+        GLPtr<GrGLGetTextureLevelParameterivProc> fGetTextureLevelParameteriv;
+        // OpenGL 1.2
+        GLPtr<GrGLTextureImage3DProc> fTextureImage3D;
+        GLPtr<GrGLTextureSubImage3DProc> fTextureSubImage3D;
+        GLPtr<GrGLCopyTextureSubImage3DProc> fCopyTextureSubImage3D;
+        GLPtr<GrGLCompressedTextureImage3DProc> fCompressedTextureImage3D;
+        GLPtr<GrGLCompressedTextureImage2DProc> fCompressedTextureImage2D;
+        GLPtr<GrGLCompressedTextureImage1DProc> fCompressedTextureImage1D;
+        GLPtr<GrGLCompressedTextureSubImage3DProc> fCompressedTextureSubImage3D;
+        GLPtr<GrGLCompressedTextureSubImage2DProc> fCompressedTextureSubImage2D;
+        GLPtr<GrGLCompressedTextureSubImage1DProc> fCompressedTextureSubImage1D;
+        GLPtr<GrGLGetCompressedTextureImageProc> fGetCompressedTextureImage;
+        // OpenGL 1.5
+        GLPtr<GrGLNamedBufferDataProc> fNamedBufferData;
+        GLPtr<GrGLNamedBufferSubDataProc> fNamedBufferSubData;
+        GLPtr<GrGLMapNamedBufferProc> fMapNamedBuffer;
+        GLPtr<GrGLUnmapNamedBufferProc> fUnmapNamedBuffer;
+        GLPtr<GrGLGetNamedBufferParameterivProc> fGetNamedBufferParameteriv;
+        GLPtr<GrGLGetNamedBufferPointervProc> fGetNamedBufferPointerv;
+        GLPtr<GrGLGetNamedBufferSubDataProc> fGetNamedBufferSubData;
+        // OpenGL 2.0
+        GLPtr<GrGLProgramUniform1fProc> fProgramUniform1f;
+        GLPtr<GrGLProgramUniform2fProc> fProgramUniform2f;
+        GLPtr<GrGLProgramUniform3fProc> fProgramUniform3f;
+        GLPtr<GrGLProgramUniform4fProc> fProgramUniform4f;
+        GLPtr<GrGLProgramUniform1iProc> fProgramUniform1i;
+        GLPtr<GrGLProgramUniform2iProc> fProgramUniform2i;
+        GLPtr<GrGLProgramUniform3iProc> fProgramUniform3i;
+        GLPtr<GrGLProgramUniform4iProc> fProgramUniform4i;
+        GLPtr<GrGLProgramUniform1fvProc> fProgramUniform1fv;
+        GLPtr<GrGLProgramUniform2fvProc> fProgramUniform2fv;
+        GLPtr<GrGLProgramUniform3fvProc> fProgramUniform3fv;
+        GLPtr<GrGLProgramUniform4fvProc> fProgramUniform4fv;
+        GLPtr<GrGLProgramUniform1ivProc> fProgramUniform1iv;
+        GLPtr<GrGLProgramUniform2ivProc> fProgramUniform2iv;
+        GLPtr<GrGLProgramUniform3ivProc> fProgramUniform3iv;
+        GLPtr<GrGLProgramUniform4ivProc> fProgramUniform4iv;
+        GLPtr<GrGLProgramUniformMatrix2fvProc> fProgramUniformMatrix2fv;
+        GLPtr<GrGLProgramUniformMatrix3fvProc> fProgramUniformMatrix3fv;
+        GLPtr<GrGLProgramUniformMatrix4fvProc> fProgramUniformMatrix4fv;
+        // OpenGL 2.1
+        GLPtr<GrGLProgramUniformMatrix2x3fvProc> fProgramUniformMatrix2x3fv;
+        GLPtr<GrGLProgramUniformMatrix3x2fvProc> fProgramUniformMatrix3x2fv;
+        GLPtr<GrGLProgramUniformMatrix2x4fvProc> fProgramUniformMatrix2x4fv;
+        GLPtr<GrGLProgramUniformMatrix4x2fvProc> fProgramUniformMatrix4x2fv;
+        GLPtr<GrGLProgramUniformMatrix3x4fvProc> fProgramUniformMatrix3x4fv;
+        GLPtr<GrGLProgramUniformMatrix4x3fvProc> fProgramUniformMatrix4x3fv;
+        // OpenGL 3.0
+        GLPtr<GrGLNamedRenderbufferStorageProc> fNamedRenderbufferStorage;
+        GLPtr<GrGLGetNamedRenderbufferParameterivProc> fGetNamedRenderbufferParameteriv;
+        GLPtr<GrGLNamedRenderbufferStorageMultisampleProc> fNamedRenderbufferStorageMultisample;
+        GLPtr<GrGLCheckNamedFramebufferStatusProc> fCheckNamedFramebufferStatus;
+        GLPtr<GrGLNamedFramebufferTexture1DProc> fNamedFramebufferTexture1D;
+        GLPtr<GrGLNamedFramebufferTexture2DProc> fNamedFramebufferTexture2D;
+        GLPtr<GrGLNamedFramebufferTexture3DProc> fNamedFramebufferTexture3D;
+        GLPtr<GrGLNamedFramebufferRenderbufferProc> fNamedFramebufferRenderbuffer;
+        GLPtr<GrGLGetNamedFramebufferAttachmentParameterivProc> fGetNamedFramebufferAttachmentParameteriv;
+        GLPtr<GrGLGenerateTextureMipmapProc> fGenerateTextureMipmap;
+        GLPtr<GrGLFramebufferDrawBufferProc> fFramebufferDrawBuffer;
+        GLPtr<GrGLFramebufferDrawBuffersProc> fFramebufferDrawBuffers;
+        GLPtr<GrGLFramebufferReadBufferProc> fFramebufferReadBuffer;
+        GLPtr<GrGLGetFramebufferParameterivProc> fGetFramebufferParameteriv;
+        GLPtr<GrGLNamedCopyBufferSubDataProc> fNamedCopyBufferSubData;
+        GLPtr<GrGLVertexArrayVertexOffsetProc> fVertexArrayVertexOffset;
+        GLPtr<GrGLVertexArrayColorOffsetProc> fVertexArrayColorOffset;
+        GLPtr<GrGLVertexArrayEdgeFlagOffsetProc> fVertexArrayEdgeFlagOffset;
+        GLPtr<GrGLVertexArrayIndexOffsetProc> fVertexArrayIndexOffset;
+        GLPtr<GrGLVertexArrayNormalOffsetProc> fVertexArrayNormalOffset;
+        GLPtr<GrGLVertexArrayTexCoordOffsetProc> fVertexArrayTexCoordOffset;
+        GLPtr<GrGLVertexArrayMultiTexCoordOffsetProc> fVertexArrayMultiTexCoordOffset;
+        GLPtr<GrGLVertexArrayFogCoordOffsetProc> fVertexArrayFogCoordOffset;
+        GLPtr<GrGLVertexArraySecondaryColorOffsetProc> fVertexArraySecondaryColorOffset;
+        GLPtr<GrGLVertexArrayVertexAttribOffsetProc> fVertexArrayVertexAttribOffset;
+        GLPtr<GrGLVertexArrayVertexAttribIOffsetProc> fVertexArrayVertexAttribIOffset;
+        GLPtr<GrGLEnableVertexArrayProc> fEnableVertexArray;
+        GLPtr<GrGLDisableVertexArrayProc> fDisableVertexArray;
+        GLPtr<GrGLEnableVertexArrayAttribProc> fEnableVertexArrayAttrib;
+        GLPtr<GrGLDisableVertexArrayAttribProc> fDisableVertexArrayAttrib;
+        GLPtr<GrGLGetVertexArrayIntegervProc> fGetVertexArrayIntegerv;
+        GLPtr<GrGLGetVertexArrayPointervProc> fGetVertexArrayPointerv;
+        GLPtr<GrGLGetVertexArrayIntegeri_vProc> fGetVertexArrayIntegeri_v;
+        GLPtr<GrGLGetVertexArrayPointeri_vProc> fGetVertexArrayPointeri_v;
+        GLPtr<GrGLMapNamedBufferRangeProc> fMapNamedBufferRange;
+        GLPtr<GrGLFlushMappedNamedBufferRangeProc> fFlushMappedNamedBufferRange;
+
+        /* KHR_debug */
+        GLPtr<GrGLDebugMessageControlProc> fDebugMessageControl;
+        GLPtr<GrGLDebugMessageInsertProc> fDebugMessageInsert;
+        GLPtr<GrGLDebugMessageCallbackProc> fDebugMessageCallback;
+        GLPtr<GrGLGetDebugMessageLogProc> fGetDebugMessageLog;
+        GLPtr<GrGLPushDebugGroupProc> fPushDebugGroup;
+        GLPtr<GrGLPopDebugGroupProc> fPopDebugGroup;
+        GLPtr<GrGLObjectLabelProc> fObjectLabel;
+
+        /* EGL functions */
+        GLPtr<GrEGLCreateImageProc> fEGLCreateImage;
+        GLPtr<GrEGLDestroyImageProc> fEGLDestroyImage;
     } fFunctions;
 
     // Per-GL func callback
@@ -343,6 +507,9 @@ public:
     GrGLInterfaceCallbackProc fCallback;
     GrGLInterfaceCallbackData fCallbackData;
 #endif
+
+    // This exists for internal testing.
+    virtual void abandon() const {}
 };
 
 #endif
diff --git a/gfx/skia/skia/include/gpu/gl/GrGLSLPrettyPrint.h b/gfx/skia/skia/include/gpu/gl/GrGLSLPrettyPrint.h
new file mode 100644
index 000000000000..52fb74557d9a
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/gl/GrGLSLPrettyPrint.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef GrGLSLPrettyPrint_DEFINED
+#define GrGLSLPrettyPrint_DEFINED
+
+#include "SkString.h"
+
+namespace GrGLSLPrettyPrint {
+    SkString PrettyPrintGLSL(const char** strings,
+                             int* lengths,
+                             int count,
+                             bool countlines);
+};
+
+#endif /* GRGLPRETTYPRINTSL_H_ */
diff --git a/gfx/skia/skia/include/gpu/gl/GrGLTypes.h b/gfx/skia/skia/include/gpu/gl/GrGLTypes.h
new file mode 100644
index 000000000000..248ce8886d4c
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/gl/GrGLTypes.h
@@ -0,0 +1,86 @@
+
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGLTypes_DEFINED
+#define GrGLTypes_DEFINED
+
+#include "GrGLConfig.h"
+
+/**
+ * Classifies GL contexts by which standard they implement (currently as OpenGL vs. OpenGL ES).
+ */
+enum GrGLStandard {
+    kNone_GrGLStandard,
+    kGL_GrGLStandard,
+    kGLES_GrGLStandard,
+};
+static const int kGrGLStandardCnt = 3;
+
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Declares typedefs for all the GL functions used in GrGLInterface
+ */
+
+typedef unsigned int GrGLenum;
+typedef unsigned char GrGLboolean;
+typedef unsigned int GrGLbitfield;
+typedef signed char GrGLbyte;
+typedef char GrGLchar;
+typedef short GrGLshort;
+typedef int GrGLint;
+typedef int GrGLsizei;
+typedef int64_t GrGLint64;
+typedef unsigned char GrGLubyte;
+typedef unsigned short GrGLushort;
+typedef unsigned int GrGLuint;
+typedef uint64_t GrGLuint64;
+typedef float GrGLfloat;
+typedef float GrGLclampf;
+typedef double GrGLdouble;
+typedef double GrGLclampd;
+typedef void GrGLvoid;
+#ifndef SK_IGNORE_64BIT_OPENGL_CHANGES
+#ifdef _WIN64
+typedef signed long long int GrGLintptr;
+typedef signed long long int GrGLsizeiptr;
+#else
+typedef signed long int GrGLintptr;
+typedef signed long int GrGLsizeiptr;
+#endif
+#else
+typedef signed long int GrGLintptr;
+typedef signed long int GrGLsizeiptr;
+#endif
+typedef void* GrGLeglImage;
+/**
+ * EGL types.
+ */
+
+typedef void* GrEGLImage;
+typedef void* GrEGLDisplay;
+typedef void* GrEGLContext;
+typedef void* GrEGLClientBuffer;
+typedef unsigned int GrEGLenum;
+typedef int32_t GrEGLint;
+typedef unsigned int GrEGLBoolean;
+
+///////////////////////////////////////////////////////////////////////////////
+/**
+ * Types for interacting with GL resources created externally to Skia. GrBackendObjects for GL
+ * textures are really const GrGLTexture*
+ */
+
+struct GrGLTextureInfo {
+    GrGLenum fTarget;
+    GrGLuint fID;
+};
+
+GR_STATIC_ASSERT(sizeof(GrBackendObject) >= sizeof(const GrGLTextureInfo*));
+
+#endif
diff --git a/gfx/skia/skia/include/gpu/gl/SkANGLEGLContext.h b/gfx/skia/skia/include/gpu/gl/SkANGLEGLContext.h
deleted file mode 100644
index c5f62ff3ce85..000000000000
--- a/gfx/skia/skia/include/gpu/gl/SkANGLEGLContext.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#ifndef SkANGLEGLContext_DEFINED
-#define SkANGLEGLContext_DEFINED
-
-#if SK_ANGLE
-
-#include "SkGLContextHelper.h"
-
-#include <GLES2/gl2.h>
-#include <EGL/egl.h>
-
-class SkANGLEGLContext : public SkGLContextHelper {
-public:
-    SkANGLEGLContext();
-
-    virtual ~SkANGLEGLContext();
-
-    virtual void makeCurrent() const SK_OVERRIDE;
-    virtual void swapBuffers() const SK_OVERRIDE;
-
-    class AutoContextRestore {
-    public:
-        AutoContextRestore();
-        ~AutoContextRestore();
-
-    private:
-        EGLContext fOldEGLContext;
-        EGLDisplay fOldDisplay;
-        EGLSurface fOldSurface;
-    };
-
-protected:
-    virtual const GrGLInterface* createGLContext(
-        GrGLStandard forcedGpuAPI) SK_OVERRIDE;
-    virtual void destroyGLContext() SK_OVERRIDE;
-
-private:
-    EGLContext fContext;
-    EGLDisplay fDisplay;
-    EGLSurface fSurface;
-};
-
-#endif
-
-#endif
diff --git a/gfx/skia/skia/include/gpu/gl/SkDebugGLContext.h b/gfx/skia/skia/include/gpu/gl/SkDebugGLContext.h
deleted file mode 100644
index 9318cb455f63..000000000000
--- a/gfx/skia/skia/include/gpu/gl/SkDebugGLContext.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#ifndef SkDebugGLContext_DEFINED
-#define SkDebugGLContext_DEFINED
-
-#include "SkGLContextHelper.h"
-
-class SkDebugGLContext : public SkGLContextHelper {
-
-public:
-    SkDebugGLContext() {};
-
-    virtual void makeCurrent() const SK_OVERRIDE {};
-    virtual void swapBuffers() const SK_OVERRIDE {};
-
-protected:
-    virtual const GrGLInterface* createGLContext(GrGLStandard forcedGpuAPI) SK_OVERRIDE;
-
-    virtual void destroyGLContext() SK_OVERRIDE {};
-};
-
-#endif
diff --git a/gfx/skia/skia/include/gpu/gl/SkGLContext.h b/gfx/skia/skia/include/gpu/gl/SkGLContext.h
new file mode 100644
index 000000000000..3420a4797322
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/gl/SkGLContext.h
@@ -0,0 +1,133 @@
+
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef SkGLContext_DEFINED
+#define SkGLContext_DEFINED
+
+#include "GrGLInterface.h"
+#include "../private/SkGpuFenceSync.h"
+
+/**
+ * Create an offscreen opengl context with an RGBA8 / 8bit stencil FBO.
+ * Provides a GrGLInterface struct of function pointers for the context.
+ * This class is intended for Skia's testing needs and not for general
+ * use.
+ */
+class SK_API SkGLContext : public SkRefCnt {
+public:
+    ~SkGLContext() override;
+
+    bool isValid() const { return NULL != gl(); }
+
+    const GrGLInterface* gl() const { return fGL.get(); }
+
+    bool fenceSyncSupport() const { return SkToBool(fFenceSync); }
+
+    bool getMaxGpuFrameLag(int* maxFrameLag) const {
+        if (!fFenceSync) {
+            return false;
+        }
+        *maxFrameLag = kMaxFrameLag;
+        return true;
+    }
+
+    void makeCurrent() const;
+
+    /** Used for testing EGLImage integration. Take a GL_TEXTURE_2D and wraps it in an EGL Image */
+    virtual GrEGLImage texture2DToEGLImage(GrGLuint /*texID*/) const { return 0; }
+    virtual void destroyEGLImage(GrEGLImage) const {}
+
+    /**
+     * Used for testing EGLImage integration. Takes a EGLImage and wraps it in a
+     * GL_TEXTURE_EXTERNAL_OES.
+     */
+    virtual GrGLuint eglImageToExternalTexture(GrEGLImage) const { return 0; }
+
+    /**
+     * The only purpose of this function it to provide a means of scheduling
+     * work on the GPU (since all of the subclasses create primary buffers for
+     * testing that are small and not meant to be rendered to the screen).
+     *
+     * If the platform supports fence sync (OpenGL 3.2+ or EGL_KHR_fence_sync),
+     * this will not swap any buffers, but rather emulate triple buffer
+     * synchronization using fences.
+     *
+     * Otherwise it will call the platform SwapBuffers method. This may or may
+     * not perform some sort of synchronization, depending on whether the
+     * drawing surface provided by the platform is double buffered.
+     */
+    void swapBuffers();
+
+    /**
+     * This notifies the context that we are deliberately testing abandoning
+     * the context. It is useful for debugging contexts that would otherwise
+     * test that GPU resources are properly deleted. It also allows a debugging
+     * context to test that further GL calls are not made by Skia GPU code.
+     */
+    void testAbandon();
+
+    /**
+     * Creates a new GL context of the same type and makes the returned context current
+     * (if not null).
+     */
+    virtual SkGLContext* createNew() const { return nullptr; }
+
+    class GLFenceSync;  // SkGpuFenceSync implementation that uses the OpenGL functionality.
+
+protected:
+    SkGLContext();
+
+    /*
+     * Methods that sublcasses must call from their constructors and destructors.
+     */
+    void init(const GrGLInterface*, SkGpuFenceSync* = NULL);
+    void teardown();
+
+    /*
+     * Operations that have a platform-dependent implementation.
+     */
+    virtual void onPlatformMakeCurrent() const = 0;
+    virtual void onPlatformSwapBuffers() const = 0;
+    virtual GrGLFuncPtr onPlatformGetProcAddress(const char*) const = 0;
+
+private:
+    enum { kMaxFrameLag = 3 };
+
+    SkAutoTDelete<SkGpuFenceSync> fFenceSync;
+    SkPlatformGpuFence            fFrameFences[kMaxFrameLag - 1];
+    int                           fCurrentFenceIdx;
+
+    /** Subclass provides the gl interface object if construction was
+     *  successful. */
+    SkAutoTUnref<const GrGLInterface> fGL;
+
+    friend class GLFenceSync;  // For onPlatformGetProcAddress.
+
+    typedef SkRefCnt INHERITED;
+};
+
+/** Creates platform-dependent GL context object
+ * Returns a valid gl context object or NULL if such can not be created.
+ * Note: If Skia embedder needs a custom GL context that sets up the GL
+ * interface, this function should be implemented by the embedder.
+ * Otherwise, the default implementation for the platform should be compiled in
+ * the library.
+ */
+SK_API SkGLContext* SkCreatePlatformGLContext(GrGLStandard forcedGpuAPI);
+
+/**
+ * Helper macros for using the GL context through the GrGLInterface. Example:
+ * SK_GL(glCtx, GenTextures(1, &texID));
+ */
+#define SK_GL(ctx, X) (ctx).gl()->fFunctions.f ## X;    \
+                      SkASSERT(0 == (ctx).gl()->fFunctions.fGetError())
+#define SK_GL_RET(ctx, RET, X) (RET) = (ctx).gl()->fFunctions.f ## X;    \
+                  SkASSERT(0 == (ctx).gl()->fFunctions.fGetError())
+#define SK_GL_NOERRCHECK(ctx, X) (ctx).gl()->fFunctions.f ## X
+#define SK_GL_RET_NOERRCHECK(ctx, RET, X) (RET) = (ctx).gl()->fFunctions.f ## X
+
+#endif
diff --git a/gfx/skia/skia/include/gpu/gl/SkGLContextHelper.h b/gfx/skia/skia/include/gpu/gl/SkGLContextHelper.h
deleted file mode 100644
index a06c6e1f9b0a..000000000000
--- a/gfx/skia/skia/include/gpu/gl/SkGLContextHelper.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#ifndef SkGLContextHelper_DEFINED
-#define SkGLContextHelper_DEFINED
-
-#include "GrGLInterface.h"
-
-/**
- * Create an offscreen opengl context with an RGBA8 / 8bit stencil FBO.
- * Provides a GrGLInterface struct of function pointers for the context.
- */
-
-class SK_API SkGLContextHelper : public SkRefCnt {
-public:
-    SK_DECLARE_INST_COUNT(SkGLContextHelper)
-
-    SkGLContextHelper();
-    virtual ~SkGLContextHelper();
-
-    /**
-     * Initializes the context and makes it current.
-     */
-    bool init(GrGLStandard forcedGpuAPI, const int width, const int height);
-
-    int getFBOID() const { return fFBO; }
-
-    const GrGLInterface* gl() const { return fGL; }
-
-    virtual void makeCurrent() const = 0;
-
-    /**
-     * The primary purpose of this function it to provide a means of scheduling
-     * work on the GPU (since all of the subclasses create primary buffers for
-     * testing that are small and not meant to be rendered to the screen).
-     *
-     * If the drawing surface provided by the platform is double buffered this
-     * call will cause the platform to swap which buffer is currently being
-     * targeted.  If the current surface does not include a back buffer, this
-     * call has no effect.
-     */
-    virtual void swapBuffers() const = 0;
-
-    bool hasExtension(const char* extensionName) const {
-        SkASSERT(NULL != fGL);
-        return fGL->hasExtension(extensionName);
-    }
-
-protected:
-    /**
-     * Subclass implements this to make a GL context. The returned GrGLInterface
-     * should be populated with functions compatible with the context. The
-     * format and size of backbuffers does not matter since an FBO will be
-     * created.
-     */
-    virtual const GrGLInterface* createGLContext(GrGLStandard forcedGpuAPI) = 0;
-
-    /**
-     * Subclass should destroy the underlying GL context.
-     */
-    virtual void destroyGLContext() = 0;
-
-private:
-    GrGLuint fFBO;
-    GrGLuint fColorBufferID;
-    GrGLuint fDepthStencilBufferID;
-    const GrGLInterface* fGL;
-
-    typedef SkRefCnt INHERITED;
-};
-
-/**
- * Helper macros for using the GL context through the GrGLInterface. Example:
- * SK_GL(glCtx, GenTextures(1, &texID));
- */
-#define SK_GL(ctx, X) (ctx).gl()->fFunctions.f ## X;    \
-                      SkASSERT(0 == (ctx).gl()->fFunctions.fGetError())
-#define SK_GL_RET(ctx, RET, X) (RET) = (ctx).gl()->fFunctions.f ## X;    \
-                  SkASSERT(0 == (ctx).gl()->fFunctions.fGetError())
-#define SK_GL_NOERRCHECK(ctx, X) (ctx).gl()->fFunctions.f ## X
-#define SK_GL_RET_NOERRCHECK(ctx, RET, X) (RET) = (ctx).gl()->fFunctions.f ## X
-
-#endif
diff --git a/gfx/skia/skia/include/gpu/gl/SkMesaGLContext.h b/gfx/skia/skia/include/gpu/gl/SkMesaGLContext.h
deleted file mode 100644
index 28349ddd8880..000000000000
--- a/gfx/skia/skia/include/gpu/gl/SkMesaGLContext.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#ifndef SkMesaGLContext_DEFINED
-#define SkMesaGLContext_DEFINED
-
-#include "SkGLContextHelper.h"
-
-#if SK_MESA
-
-class SkMesaGLContext : public SkGLContextHelper {
-private:
-    typedef intptr_t Context;
-
-public:
-    SkMesaGLContext();
-
-    virtual ~SkMesaGLContext();
-
-    virtual void makeCurrent() const SK_OVERRIDE;
-    virtual void swapBuffers() const SK_OVERRIDE;
-
-    class AutoContextRestore {
-    public:
-        AutoContextRestore();
-        ~AutoContextRestore();
-
-    private:
-        Context fOldContext;
-        GrGLint fOldWidth;
-        GrGLint fOldHeight;
-        GrGLint fOldFormat;
-        void*   fOldImage;
-    };
-
-protected:
-    virtual const GrGLInterface* createGLContext(GrGLStandard forcedGpuAPI) SK_OVERRIDE;
-    virtual void destroyGLContext() SK_OVERRIDE;
-
-private:
-    Context fContext;
-    GrGLubyte *fImage;
-};
-
-#endif
-
-#endif
diff --git a/gfx/skia/skia/include/gpu/gl/SkNativeGLContext.h b/gfx/skia/skia/include/gpu/gl/SkNativeGLContext.h
deleted file mode 100644
index 01b73094fb4c..000000000000
--- a/gfx/skia/skia/include/gpu/gl/SkNativeGLContext.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#ifndef SkNativeGLContext_DEFINED
-#define SkNativeGLContext_DEFINED
-
-#include "SkGLContextHelper.h"
-
-#if defined(SK_BUILD_FOR_MAC)
-    #include <OpenGL/OpenGL.h>
-#elif defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_NACL)
-    #include <GLES2/gl2.h>
-    #include <EGL/egl.h>
-#elif defined(SK_BUILD_FOR_UNIX)
-    #include <X11/Xlib.h>
-    #include <GL/glx.h>
-#elif defined(SK_BUILD_FOR_WIN32)
-    #include <windows.h>
-    #include <GL/GL.h>
-    #include "SkWGL.h"
-#endif
-
-class SkNativeGLContext : public SkGLContextHelper {
-public:
-    SkNativeGLContext();
-
-    virtual ~SkNativeGLContext();
-
-    virtual void makeCurrent() const SK_OVERRIDE;
-    virtual void swapBuffers() const SK_OVERRIDE;
-
-    class AutoContextRestore {
-    public:
-        AutoContextRestore();
-        ~AutoContextRestore();
-
-    private:
-    #if defined(SK_BUILD_FOR_MAC)
-        CGLContextObj fOldCGLContext;
-    #elif defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_NACL)
-        EGLContext fOldEGLContext;
-        EGLDisplay fOldDisplay;
-        EGLSurface fOldSurface;
-    #elif defined(SK_BUILD_FOR_UNIX)
-        GLXContext fOldGLXContext;
-        Display* fOldDisplay;
-        GLXDrawable fOldDrawable;
-    #elif defined(SK_BUILD_FOR_WIN32)
-        HDC fOldHDC;
-        HGLRC fOldHGLRC;
-
-    #elif defined(SK_BUILD_FOR_IOS)
-        void* fEAGLContext;
-    #endif
-    };
-
-protected:
-    virtual const GrGLInterface* createGLContext(GrGLStandard forcedGpuAPI) SK_OVERRIDE;
-    virtual void destroyGLContext() SK_OVERRIDE;
-
-private:
-#if defined(SK_BUILD_FOR_MAC)
-    CGLContextObj fContext;
-#elif defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_NACL)
-    EGLContext fContext;
-    EGLDisplay fDisplay;
-    EGLSurface fSurface;
-#elif defined(SK_BUILD_FOR_UNIX)
-    GLXContext fContext;
-    Display* fDisplay;
-    Pixmap fPixmap;
-    GLXPixmap fGlxPixmap;
-#elif defined(SK_BUILD_FOR_WIN32)
-    HWND fWindow;
-    HDC fDeviceContext;
-    HGLRC fGlRenderContext;
-    static ATOM gWC;
-    SkWGLPbufferContext* fPbufferContext;
-#elif defined(SK_BUILD_FOR_IOS)
-    void* fEAGLContext;
-#endif
-};
-
-#endif
diff --git a/gfx/skia/skia/include/gpu/gl/SkNullGLContext.h b/gfx/skia/skia/include/gpu/gl/SkNullGLContext.h
index 6c2a1d7e5913..1f634382641e 100644
--- a/gfx/skia/skia/include/gpu/gl/SkNullGLContext.h
+++ b/gfx/skia/skia/include/gpu/gl/SkNullGLContext.h
@@ -8,21 +8,24 @@
 #ifndef SkNullGLContext_DEFINED
 #define SkNullGLContext_DEFINED
 
-#include "SkGLContextHelper.h"
-
-class SK_API SkNullGLContext : public SkGLContextHelper {
+#include "gl/SkGLContext.h"
 
+class SK_API SkNullGLContext : public SkGLContext {
 public:
-    SkNullGLContext() {};
+    ~SkNullGLContext() override;
 
-    virtual void makeCurrent() const SK_OVERRIDE {};
+    static SkNullGLContext* Create(GrGLStandard);
 
-    virtual void swapBuffers() const SK_OVERRIDE {};
+    class ContextState;
 
-protected:
-    virtual const GrGLInterface* createGLContext(GrGLStandard forcedGpuAPI) SK_OVERRIDE;
+private:
+    SkNullGLContext();
 
-    virtual void destroyGLContext() SK_OVERRIDE {};
+    void onPlatformMakeCurrent() const override;
+    void onPlatformSwapBuffers() const override {}
+    GrGLFuncPtr onPlatformGetProcAddress(const char*) const override { return NULL; }
+
+    ContextState* fState;
 };
 
 #endif
diff --git a/gfx/skia/skia/include/gpu/gl/angle/SkANGLEGLContext.h b/gfx/skia/skia/include/gpu/gl/angle/SkANGLEGLContext.h
new file mode 100644
index 000000000000..7858fff9649d
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/gl/angle/SkANGLEGLContext.h
@@ -0,0 +1,54 @@
+
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef SkANGLEGLContext_DEFINED
+#define SkANGLEGLContext_DEFINED
+
+#if SK_ANGLE
+
+#include "gl/SkGLContext.h"
+
+class SkANGLEGLContext : public SkGLContext {
+public:
+    ~SkANGLEGLContext() override;
+
+    static SkANGLEGLContext* Create(GrGLStandard forcedGpuAPI, bool useGLBackend) {
+        if (kGL_GrGLStandard == forcedGpuAPI) {
+            return NULL;
+        }
+        SkANGLEGLContext* ctx = new SkANGLEGLContext(useGLBackend);
+        if (!ctx->isValid()) {
+            delete ctx;
+            return NULL;
+        }
+        return ctx;
+    }
+    GrEGLImage texture2DToEGLImage(GrGLuint texID) const override;
+    void destroyEGLImage(GrEGLImage) const override;
+    GrGLuint eglImageToExternalTexture(GrEGLImage) const override;
+    SkGLContext* createNew() const override;
+
+    // The param is an EGLNativeDisplayType and the return is an EGLDispay.
+    static void* GetD3DEGLDisplay(void* nativeDisplay, bool useGLBackend);
+
+private:
+    SkANGLEGLContext(bool preferGLBackend);
+    void destroyGLContext();
+
+    void onPlatformMakeCurrent() const override;
+    void onPlatformSwapBuffers() const override;
+    GrGLFuncPtr onPlatformGetProcAddress(const char* name) const override;
+
+    void* fContext;
+    void* fDisplay;
+    void* fSurface;
+    bool  fIsGLBackend;
+};
+
+#endif
+
+#endif
diff --git a/gfx/skia/skia/include/gpu/gl/command_buffer/SkCommandBufferGLContext.h b/gfx/skia/skia/include/gpu/gl/command_buffer/SkCommandBufferGLContext.h
new file mode 100644
index 000000000000..7fece3c83c1a
--- /dev/null
+++ b/gfx/skia/skia/include/gpu/gl/command_buffer/SkCommandBufferGLContext.h
@@ -0,0 +1,66 @@
+
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef SKCOMMANDBUFFERGLCONTEXT_DEFINED
+#define SKCOMMANDBUFFERGLCONTEXT_DEFINED
+
+#if SK_COMMAND_BUFFER
+
+#include "gl/SkGLContext.h"
+
+class SkCommandBufferGLContext : public SkGLContext {
+public:
+    ~SkCommandBufferGLContext() override;
+
+    static SkCommandBufferGLContext* Create(GrGLStandard forcedGpuAPI) {
+        if (kGL_GrGLStandard == forcedGpuAPI) {
+            return nullptr;
+        }
+        SkCommandBufferGLContext* ctx = new SkCommandBufferGLContext;
+        if (!ctx->isValid()) {
+            delete ctx;
+            return nullptr;
+        }
+        return ctx;
+    }
+
+    static SkCommandBufferGLContext* Create(void* nativeWindow, int msaaSampleCount) {
+        SkCommandBufferGLContext* ctx = new SkCommandBufferGLContext(nativeWindow,
+                                                                     msaaSampleCount);
+        if (!ctx->isValid()) {
+            delete ctx;
+            return nullptr;
+        }
+        return ctx;
+    }
+
+    void presentCommandBuffer();
+
+    bool makeCurrent();
+    int getStencilBits();
+    int getSampleCount();
+
+private:
+    SkCommandBufferGLContext();
+    SkCommandBufferGLContext(void* nativeWindow, int msaaSampleCount);
+    void initializeGLContext(void* nativeWindow, const int* configAttribs,
+                             const int* surfaceAttribs);
+    void destroyGLContext();
+
+    void onPlatformMakeCurrent() const override;
+    void onPlatformSwapBuffers() const override;
+    GrGLFuncPtr onPlatformGetProcAddress(const char* name) const override;
+
+    void* fContext;
+    void* fDisplay;
+    void* fSurface;
+    void* fConfig;
+};
+
+#endif // SK_COMMAND_BUFFER
+
+#endif
diff --git a/gfx/skia/skia/include/images/SkDecodingImageGenerator.h b/gfx/skia/skia/include/images/SkDecodingImageGenerator.h
index 6cb39be8d84a..0a5ec56fe8e2 100644
--- a/gfx/skia/skia/include/images/SkDecodingImageGenerator.h
+++ b/gfx/skia/skia/include/images/SkDecodingImageGenerator.h
@@ -85,20 +85,8 @@ namespace SkDecodingImageGenerator {
      *  The SkData version of this function is preferred.  If the stream
      *  has an underlying SkData (such as a SkMemoryStream) pass that in.
      *
-     *  This object will unref the stream when done or on failure.  Since
-     *  streams have internal state (position), the caller should not pass
-     *  a shared stream in.  Pass either a new duplicated stream in or
-     *  transfer ownership of the stream.  This factory asserts
-     *  stream->unique().
-     *
-     *  For example:
-     *    SkStreamRewindable* stream;
-     *    ...
-     *    SkImageGenerator* gen
-     *        = SkDecodingImageGenerator::Create(
-     *            stream->duplicate(), SkDecodingImageGenerator::Options());
-     *    ...
-     *    SkDELETE(gen);
+     *  This object, if non-NULL, takes ownership of stream and deletes stream
+     *  upon deletion. If NULL is returned, stream is deleted immediately.
      *
      *  @param Options (see above)
      *
diff --git a/gfx/skia/skia/include/images/SkForceLinking.h b/gfx/skia/skia/include/images/SkForceLinking.h
index 39901f612ed2..13ada542e1df 100644
--- a/gfx/skia/skia/include/images/SkForceLinking.h
+++ b/gfx/skia/skia/include/images/SkForceLinking.h
@@ -17,4 +17,4 @@
 int SkForceLinking(bool doNotPassTrue);
 
 #define __SK_FORCE_IMAGE_DECODER_LINKING       \
-static int linking_forced = SkForceLinking(false)
+SK_UNUSED static int linking_forced = SkForceLinking(false)
diff --git a/gfx/skia/skia/include/images/SkMovie.h b/gfx/skia/skia/include/images/SkMovie.h
index e52a3a8f4040..00dad6788554 100644
--- a/gfx/skia/skia/include/images/SkMovie.h
+++ b/gfx/skia/skia/include/images/SkMovie.h
@@ -17,7 +17,7 @@ class SkStreamRewindable;
 
 class SkMovie : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkMovie)
+    
 
     /** Try to create a movie from the stream. If the stream format is not
         supported, return NULL.
diff --git a/gfx/skia/skia/include/pathops/SkPathOps.h b/gfx/skia/skia/include/pathops/SkPathOps.h
index ba18f4ba72f5..047588b635ac 100644
--- a/gfx/skia/skia/include/pathops/SkPathOps.h
+++ b/gfx/skia/skia/include/pathops/SkPathOps.h
@@ -8,20 +8,23 @@
 #define SkPathOps_DEFINED
 
 #include "SkPreConfig.h"
+#include "SkTArray.h"
+#include "SkTDArray.h"
 
 class SkPath;
 struct SkRect;
 
+
 // FIXME: move everything below into the SkPath class
 /**
   *  The logical operations that can be performed when combining two paths.
   */
 enum SkPathOp {
-    kDifference_PathOp,         //!< subtract the op path from the first path
-    kIntersect_PathOp,          //!< intersect the two paths
-    kUnion_PathOp,              //!< union (inclusive-or) the two paths
-    kXOR_PathOp,                //!< exclusive-or the two paths
-    kReverseDifference_PathOp,  //!< subtract the first path from the op path
+    kDifference_SkPathOp,         //!< subtract the op path from the first path
+    kIntersect_SkPathOp,          //!< intersect the two paths
+    kUnion_SkPathOp,              //!< union (inclusive-or) the two paths
+    kXOR_SkPathOp,                //!< exclusive-or the two paths
+    kReverseDifference_SkPathOp,  //!< subtract the first path from the op path
 };
 
 /** Set this path to the result of applying the Op to this path and the
@@ -35,9 +38,10 @@ enum SkPathOp {
 
     @param one The first operand (for difference, the minuend)
     @param two The second operand (for difference, the subtrahend)
+    @param op The operator to apply.
     @param result The product of the operands. The result may be one of the
                   inputs.
-    @return True if operation succeeded.
+    @return True if the operation succeeded.
   */
 bool SK_API Op(const SkPath& one, const SkPath& two, SkPathOp op, SkPath* result);
 
@@ -63,4 +67,31 @@ bool SK_API Simplify(const SkPath& path, SkPath* result);
   */
 bool SK_API TightBounds(const SkPath& path, SkRect* result);
 
+/** Perform a series of path operations, optimized for unioning many paths together.
+  */
+class SK_API SkOpBuilder {
+public:
+    /** Add one or more paths and their operand. The builder is empty before the first
+        path is added, so the result of a single add is (emptyPath OP path).
+
+        @param path The second operand.
+        @param _operator The operator to apply to the existing and supplied paths.
+     */ 
+    void add(const SkPath& path, SkPathOp _operator);
+
+    /** Computes the sum of all paths and operands, and resets the builder to its
+        initial state.
+ 
+        @param result The product of the operands.
+        @return True if the operation succeeded.
+      */
+    bool resolve(SkPath* result);
+
+private:
+    SkTArray<SkPath> fPathRefs;
+    SkTDArray<SkPathOp> fOps;
+
+    void reset();
+};
+
 #endif
diff --git a/gfx/skia/skia/include/pdf/SkPDFDevice.h b/gfx/skia/skia/include/pdf/SkPDFDevice.h
deleted file mode 100644
index bcdcfb24e4a7..000000000000
--- a/gfx/skia/skia/include/pdf/SkPDFDevice.h
+++ /dev/null
@@ -1,345 +0,0 @@
-
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#ifndef SkPDFDevice_DEFINED
-#define SkPDFDevice_DEFINED
-
-#include "SkDevice.h"
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkPaint.h"
-#include "SkPath.h"
-#include "SkPicture.h"
-#include "SkRect.h"
-#include "SkRefCnt.h"
-#include "SkStream.h"
-#include "SkTDArray.h"
-#include "SkTemplates.h"
-
-class SkPDFArray;
-class SkPDFDevice;
-class SkPDFDict;
-class SkPDFFont;
-class SkPDFFormXObject;
-class SkPDFGlyphSetMap;
-class SkPDFGraphicState;
-class SkPDFObject;
-class SkPDFResourceDict;
-class SkPDFShader;
-class SkPDFStream;
-class SkRRect;
-template <typename T> class SkTSet;
-
-// Private classes.
-struct ContentEntry;
-struct GraphicStateEntry;
-struct NamedDestination;
-
-/** \class SkPDFDevice
-
-    The drawing context for the PDF backend.
-*/
-class SkPDFDevice : public SkBaseDevice {
-public:
-    /** Create a PDF drawing context with the given width and height.
-     *  72 points/in means letter paper is 612x792.
-     *  @param pageSize Page size in points.
-     *  @param contentSize The content size of the page in points. This will be
-     *         combined with the initial transform to determine the drawing area
-     *         (as reported by the width and height methods). Anything outside
-     *         of the drawing area will be clipped.
-     *  @param initialTransform The initial transform to apply to the page.
-     *         This may be useful to, for example, move the origin in and
-     *         over a bit to account for a margin, scale the canvas,
-     *         or apply a rotation.  Note1: the SkPDFDevice also applies
-     *         a scale+translate transform to move the origin from the
-     *         bottom left (PDF default) to the top left.  Note2: drawDevice
-     *         (used by layer restore) draws the device after this initial
-     *         transform is applied, so the PDF device does an
-     *         inverse scale+translate to accommodate the one that SkPDFDevice
-     *         always does.
-     */
-    // Deprecated, please use SkDocument::CreatePdf() instead.
-    SK_API SkPDFDevice(const SkISize& pageSize, const SkISize& contentSize,
-                       const SkMatrix& initialTransform);
-    SK_API virtual ~SkPDFDevice();
-
-    virtual void clear(SkColor color) SK_OVERRIDE;
-
-    /** These are called inside the per-device-layer loop for each draw call.
-     When these are called, we have already applied any saveLayer operations,
-     and are handling any looping from the paint, and any effects from the
-     DrawFilter.
-     */
-    virtual void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode,
-                            size_t count, const SkPoint[],
-                            const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawRect(const SkDraw&, const SkRect& r, const SkPaint& paint);
-    virtual void drawOval(const SkDraw&, const SkRect& oval, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawRRect(const SkDraw&, const SkRRect& rr, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawPath(const SkDraw&, const SkPath& origpath,
-                          const SkPaint& paint, const SkMatrix* prePathMatrix,
-                          bool pathIsMutable) SK_OVERRIDE;
-    virtual void drawBitmapRect(const SkDraw& draw, const SkBitmap& bitmap,
-                                const SkRect* src, const SkRect& dst,
-                                const SkPaint& paint,
-                                SkCanvas::DrawBitmapRectFlags flags) SK_OVERRIDE;
-    virtual void drawBitmap(const SkDraw&, const SkBitmap& bitmap,
-                            const SkMatrix& matrix, const SkPaint&) SK_OVERRIDE;
-    virtual void drawSprite(const SkDraw&, const SkBitmap& bitmap, int x, int y,
-                            const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawText(const SkDraw&, const void* text, size_t len,
-                          SkScalar x, SkScalar y, const SkPaint&) SK_OVERRIDE;
-    virtual void drawPosText(const SkDraw&, const void* text, size_t len,
-                             const SkScalar pos[], SkScalar constY,
-                             int scalarsPerPos, const SkPaint&) SK_OVERRIDE;
-    virtual void drawTextOnPath(const SkDraw&, const void* text, size_t len,
-                                const SkPath& path, const SkMatrix* matrix,
-                                const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawVertices(const SkDraw&, SkCanvas::VertexMode,
-                              int vertexCount, const SkPoint verts[],
-                              const SkPoint texs[], const SkColor colors[],
-                              SkXfermode* xmode, const uint16_t indices[],
-                              int indexCount, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawDevice(const SkDraw&, SkBaseDevice*, int x, int y,
-                            const SkPaint&) SK_OVERRIDE;
-
-    virtual void onAttachToCanvas(SkCanvas* canvas) SK_OVERRIDE;
-    virtual void onDetachFromCanvas() SK_OVERRIDE;
-    virtual SkImageInfo imageInfo() const SK_OVERRIDE;    
-
-    enum DrawingArea {
-        kContent_DrawingArea,  // Drawing area for the page content.
-        kMargin_DrawingArea,   // Drawing area for the margin content.
-    };
-
-    /** Sets the drawing area for the device. Subsequent draw calls are directed
-     *  to the specific drawing area (margin or content). The default drawing
-     *  area is the content drawing area.
-     *
-     *  Currently if margin content is drawn and then a complex (for PDF) xfer
-     *  mode is used, like SrcIn, Clear, etc, the margin content will get
-     *  clipped. A simple way to avoid the bug is to always draw the margin
-     *  content last.
-     */
-    SK_API void setDrawingArea(DrawingArea drawingArea);
-
-    /** Sets the DCTEncoder for images.
-     *  @param encoder The encoder to encode a bitmap as JPEG (DCT).
-     *         Result of encodings are cached, if the encoder changes the
-     *         behaivor dynamically and an image is added to a second catalog,
-     *         we will likely use the result of the first encoding call.
-     *         By returning false from the encoder function, the encoder result
-     *         is not used.
-     *         Callers might not want to encode small images, as the time spent
-     *         encoding and decoding might not be worth the space savings,
-     *         if any at all.
-     */
-    void setDCTEncoder(SkPicture::EncodeBitmap encoder) {
-        fEncoder = encoder;
-    }
-
-    // PDF specific methods.
-
-    /** Returns the resource dictionary for this device.
-     */
-    SK_API SkPDFResourceDict* getResourceDict();
-
-    /** Get the fonts used on this device.
-     */
-    SK_API const SkTDArray<SkPDFFont*>& getFontResources() const;
-
-    /** Add our named destinations to the supplied dictionary.
-     *  @param dict  Dictionary to add destinations to.
-     *  @param page  The PDF object representing the page for this device.
-     */
-    void appendDestinations(SkPDFDict* dict, SkPDFObject* page);
-
-    /** Returns a copy of the media box for this device. The caller is required
-     *  to unref() this when it is finished.
-     */
-    SK_API SkPDFArray* copyMediaBox() const;
-
-    /** Get the annotations from this page, or NULL if there are none.
-     */
-    SK_API SkPDFArray* getAnnotations() const { return fAnnotations; }
-
-    /** Returns a SkStream with the page contents.  The caller is responsible
-        for a reference to the returned value.
-        DEPRECATED: use copyContentToData()
-     */
-    SK_API SkStream* content() const;
-
-    /** Returns a SkStream with the page contents.  The caller is responsible
-     *  for calling data->unref() when it is finished.
-     */
-    SK_API SkData* copyContentToData() const;
-
-    SK_API const SkMatrix& initialTransform() const {
-        return fInitialTransform;
-    }
-
-    /** Returns a SkPDFGlyphSetMap which represents glyph usage of every font
-     *  that shows on this device.
-     */
-    const SkPDFGlyphSetMap& getFontGlyphUsage() const {
-        return *(fFontGlyphUsage.get());
-    }
-
-
-    /**
-     *  rasterDpi - the DPI at which features without native PDF support
-     *              will be rasterized (e.g. draw image with perspective,
-     *              draw text with perspective, ...)
-     *              A larger DPI would create a PDF that reflects the original
-     *              intent with better fidelity, but it can make for larger
-     *              PDF files too, which would use more memory while rendering,
-     *              and it would be slower to be processed or sent online or
-     *              to printer.
-     */
-    void setRasterDpi(SkScalar rasterDpi) {
-        fRasterDpi = rasterDpi;
-    }
-
-protected:
-    virtual const SkBitmap& onAccessBitmap() SK_OVERRIDE {
-        return fLegacyBitmap;
-    }
-
-    virtual bool allowImageFilter(const SkImageFilter*) SK_OVERRIDE {
-        return false;
-    }
-
-    virtual SkSurface* newSurface(const SkImageInfo&) SK_OVERRIDE;
-
-private:
-    // TODO(vandebo): push most of SkPDFDevice's state into a core object in
-    // order to get the right access levels without using friend.
-    friend class ScopedContentEntry;
-
-    SkISize fPageSize;
-    SkISize fContentSize;
-    SkMatrix fInitialTransform;
-    SkClipStack fExistingClipStack;
-    SkRegion fExistingClipRegion;
-    SkPDFArray* fAnnotations;
-    SkPDFResourceDict* fResourceDict;
-    SkTDArray<NamedDestination*> fNamedDestinations;
-
-    SkTDArray<SkPDFGraphicState*> fGraphicStateResources;
-    SkTDArray<SkPDFObject*> fXObjectResources;
-    SkTDArray<SkPDFFont*> fFontResources;
-    SkTDArray<SkPDFObject*> fShaderResources;
-
-    SkAutoTDelete<ContentEntry> fContentEntries;
-    ContentEntry* fLastContentEntry;
-    SkAutoTDelete<ContentEntry> fMarginContentEntries;
-    ContentEntry* fLastMarginContentEntry;
-    DrawingArea fDrawingArea;
-
-    const SkClipStack* fClipStack;
-
-    // Accessor and setter functions based on the current DrawingArea.
-    SkAutoTDelete<ContentEntry>* getContentEntries();
-    ContentEntry* getLastContentEntry();
-    void setLastContentEntry(ContentEntry* contentEntry);
-
-    // Glyph ids used for each font on this device.
-    SkAutoTDelete<SkPDFGlyphSetMap> fFontGlyphUsage;
-
-    SkPicture::EncodeBitmap fEncoder;
-    SkScalar fRasterDpi;
-
-    SkBitmap fLegacyBitmap;
-
-    SkPDFDevice(const SkISize& layerSize, const SkClipStack& existingClipStack,
-                const SkRegion& existingClipRegion);
-
-    // override from SkBaseDevice
-    virtual SkBaseDevice* onCreateDevice(const SkImageInfo&, Usage) SK_OVERRIDE;
-
-    void init();
-    void cleanUp(bool clearFontUsage);
-    SkPDFFormXObject* createFormXObjectFromDevice();
-
-    void drawFormXObjectWithMask(int xObjectIndex,
-                                 SkPDFFormXObject* mask,
-                                 const SkClipStack* clipStack,
-                                 const SkRegion& clipRegion,
-                                 SkXfermode::Mode mode,
-                                 bool invertClip);
-
-    // If the paint or clip is such that we shouldn't draw anything, this
-    // returns NULL and does not create a content entry.
-    // setUpContentEntry and finishContentEntry can be used directly, but
-    // the preferred method is to use the ScopedContentEntry helper class.
-    ContentEntry* setUpContentEntry(const SkClipStack* clipStack,
-                                    const SkRegion& clipRegion,
-                                    const SkMatrix& matrix,
-                                    const SkPaint& paint,
-                                    bool hasText,
-                                    SkPDFFormXObject** dst);
-    void finishContentEntry(SkXfermode::Mode xfermode,
-                            SkPDFFormXObject* dst,
-                            SkPath* shape);
-    bool isContentEmpty();
-
-    void populateGraphicStateEntryFromPaint(const SkMatrix& matrix,
-                                            const SkClipStack& clipStack,
-                                            const SkRegion& clipRegion,
-                                            const SkPaint& paint,
-                                            bool hasText,
-                                            GraphicStateEntry* entry);
-    int addGraphicStateResource(SkPDFGraphicState* gs);
-    int addXObjectResource(SkPDFObject* xObject);
-
-    void updateFont(const SkPaint& paint, uint16_t glyphID,
-                    ContentEntry* contentEntry);
-    int getFontResourceIndex(SkTypeface* typeface, uint16_t glyphID);
-
-    void internalDrawPaint(const SkPaint& paint, ContentEntry* contentEntry);
-    void internalDrawBitmap(const SkMatrix& matrix,
-                            const SkClipStack* clipStack,
-                            const SkRegion& clipRegion,
-                            const SkBitmap& bitmap,
-                            const SkIRect* srcRect,
-                            const SkPaint& paint);
-
-    /** Helper method for copyContentToData. It is responsible for copying the
-     *  list of content entries |entry| to |data|.
-     */
-    void copyContentEntriesToData(ContentEntry* entry, SkWStream* data) const;
-
-#ifdef SK_PDF_USE_PATHOPS
-    bool handleInversePath(const SkDraw& d, const SkPath& origPath,
-                           const SkPaint& paint, bool pathIsMutable,
-                           const SkMatrix* prePathMatrix = NULL);
-#endif
-    bool handleRectAnnotation(const SkRect& r, const SkMatrix& matrix,
-                              const SkPaint& paint);
-    bool handlePointAnnotation(const SkPoint* points, size_t count,
-                               const SkMatrix& matrix, const SkPaint& paint);
-    SkPDFDict* createLinkAnnotation(const SkRect& r, const SkMatrix& matrix);
-    void handleLinkToURL(SkData* urlData, const SkRect& r,
-                         const SkMatrix& matrix);
-    void handleLinkToNamedDest(SkData* nameData, const SkRect& r,
-                               const SkMatrix& matrix);
-    void defineNamedDestination(SkData* nameData, const SkPoint& point,
-                                const SkMatrix& matrix);
-
-    typedef SkBaseDevice INHERITED;
-
-    // TODO(edisonn): Only SkDocument_PDF and SkPDFImageShader should be able to create
-    // an SkPDFDevice
-    //friend class SkDocument_PDF;
-    //friend class SkPDFImageShader;
-};
-
-#endif
diff --git a/gfx/skia/skia/include/pdf/SkPDFDocument.h b/gfx/skia/skia/include/pdf/SkPDFDocument.h
deleted file mode 100644
index 07738a210bfa..000000000000
--- a/gfx/skia/skia/include/pdf/SkPDFDocument.h
+++ /dev/null
@@ -1,113 +0,0 @@
-
-/*
- * Copyright 2010 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#ifndef SkPDFDocument_DEFINED
-#define SkPDFDocument_DEFINED
-
-#include "SkAdvancedTypefaceMetrics.h"
-#include "SkRefCnt.h"
-#include "SkTDArray.h"
-#include "SkTemplates.h"
-
-class SkPDFCatalog;
-class SkPDFDevice;
-class SkPDFDict;
-class SkPDFPage;
-class SkPDFObject;
-class SkWStream;
-template <typename T> class SkTSet;
-
-/** \class SkPDFDocument
-
-    A SkPDFDocument assembles pages together and generates the final PDF file.
-*/
-class SkPDFDocument {
-public:
-    enum Flags {
-        kNoCompression_Flags = 0x01,  //!< DEPRECATED.
-        kFavorSpeedOverSize_Flags = 0x01,  //!< Don't compress the stream, but
-                                           // if it is already compressed return
-                                           // the compressed stream.
-        kNoLinks_Flags       = 0x02,  //!< do not honor link annotations.
-
-        kDraftMode_Flags     = 0x01,
-    };
-    /** Create a PDF document.
-     */
-    explicit SK_API SkPDFDocument(Flags flags = (Flags)0);
-    SK_API ~SkPDFDocument();
-
-    /** Output the PDF to the passed stream.  It is an error to call this (it
-     *  will return false and not modify stream) if no pages have been added
-     *  or there are pages missing (i.e. page 1 and 3 have been added, but not
-     *  page 2).
-     *
-     *  @param stream    The writable output stream to send the PDF to.
-     */
-    SK_API bool emitPDF(SkWStream* stream);
-
-    /** Sets the specific page to the passed PDF device. If the specified
-     *  page is already set, this overrides it. Returns true if successful.
-     *  Will fail if the document has already been emitted.
-     *
-     *  @param pageNumber The position to add the passed device (1 based).
-     *  @param pdfDevice  The page to add to this document.
-     */
-    SK_API bool setPage(int pageNumber, SkPDFDevice* pdfDevice);
-
-    /** Append the passed pdf device to the document as a new page.  Returns
-     *  true if successful.  Will fail if the document has already been emitted.
-     *
-     *  @param pdfDevice The page to add to this document.
-     */
-    SK_API bool appendPage(SkPDFDevice* pdfDevice);
-
-    /** Get the count of unique font types used in the document.
-     * DEPRECATED.
-     */
-    SK_API void getCountOfFontTypes(
-        int counts[SkAdvancedTypefaceMetrics::kOther_Font + 2]) const;
-
-    /** Get the count of unique font types used in the document.
-     */
-    SK_API void getCountOfFontTypes(
-        int counts[SkAdvancedTypefaceMetrics::kOther_Font + 1],
-        int* notSubsettableCount,
-        int* notEmbedddableCount) const;
-
-private:
-    SkAutoTDelete<SkPDFCatalog> fCatalog;
-    int64_t fXRefFileOffset;
-
-    SkTDArray<SkPDFPage*> fPages;
-    SkTDArray<SkPDFDict*> fPageTree;
-    SkPDFDict* fDocCatalog;
-    SkTSet<SkPDFObject*>* fFirstPageResources;
-    SkTSet<SkPDFObject*>* fOtherPageResources;
-    SkTDArray<SkPDFObject*> fSubstitutes;
-
-    SkPDFDict* fTrailerDict;
-
-    /** Output the PDF header to the passed stream.
-     *  @param stream    The writable output stream to send the header to.
-     */
-    void emitHeader(SkWStream* stream);
-
-    /** Get the size of the header.
-     */
-    size_t headerSize();
-
-    /** Output the PDF footer to the passed stream.
-     *  @param stream    The writable output stream to send the footer to.
-     *  @param objCount  The number of objects in the PDF.
-     */
-    void emitFooter(SkWStream* stream, int64_t objCount);
-};
-
-#endif
diff --git a/gfx/skia/skia/include/pipe/SkGPipe.h b/gfx/skia/skia/include/pipe/SkGPipe.h
index 879ab043ff51..9446b8159f05 100644
--- a/gfx/skia/skia/include/pipe/SkGPipe.h
+++ b/gfx/skia/skia/include/pipe/SkGPipe.h
@@ -87,6 +87,12 @@ public:
     virtual void notifyWritten(size_t bytes) = 0;
     virtual int numberOfReaders() const { return 1; }
 
+    /**
+     *  Release resource references that are held in internal caches.
+     *  This must only be called after the pipe has been completely flushed.
+     */
+    void purgeCaches();
+
 private:
     friend class SkGPipeWriter;
     void setCanvas(SkGPipeCanvas*);
@@ -99,7 +105,7 @@ public:
     SkGPipeWriter();
     ~SkGPipeWriter();
 
-    bool isRecording() const { return NULL != fCanvas; }
+    bool isRecording() const { return SkToBool(fCanvas); }
 
     enum Flags {
         /**
diff --git a/gfx/skia/skia/include/ports/SkAtomics_atomic.h b/gfx/skia/skia/include/ports/SkAtomics_atomic.h
new file mode 100644
index 000000000000..64ee823f90d2
--- /dev/null
+++ b/gfx/skia/skia/include/ports/SkAtomics_atomic.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkAtomics_atomic_DEFINED
+#define SkAtomics_atomic_DEFINED
+
+template <typename T>
+T sk_atomic_load(const T* ptr, sk_memory_order mo) {
+    SkASSERT(mo == sk_memory_order_relaxed ||
+             mo == sk_memory_order_seq_cst ||
+             mo == sk_memory_order_acquire ||
+             mo == sk_memory_order_consume);
+    return __atomic_load_n(ptr, mo);
+}
+
+template <typename T>
+void sk_atomic_store(T* ptr, T val, sk_memory_order mo) {
+    SkASSERT(mo == sk_memory_order_relaxed ||
+             mo == sk_memory_order_seq_cst ||
+             mo == sk_memory_order_release);
+    __atomic_store_n(ptr, val, mo);
+}
+
+template <typename T>
+T sk_atomic_fetch_add(T* ptr, T val, sk_memory_order mo) {
+    // All values of mo are valid.
+    return __atomic_fetch_add(ptr, val, mo);
+}
+
+template <typename T>
+T sk_atomic_fetch_sub(T* ptr, T val, sk_memory_order mo) {
+    // All values of mo are valid.
+    return __atomic_fetch_sub(ptr, val, mo);
+}
+
+template <typename T>
+bool sk_atomic_compare_exchange(T* ptr, T* expected, T desired,
+                                sk_memory_order success,
+                                sk_memory_order failure) {
+    // All values of success are valid.
+    SkASSERT(failure == sk_memory_order_relaxed ||
+             failure == sk_memory_order_seq_cst ||
+             failure == sk_memory_order_acquire ||
+             failure == sk_memory_order_consume);
+    SkASSERT(failure <= success);
+    return __atomic_compare_exchange_n(ptr, expected, desired, false/*weak?*/, success, failure);
+}
+
+template <typename T>
+T sk_atomic_exchange(T* ptr, T val, sk_memory_order mo) {
+    // All values of mo are valid.
+    return __atomic_exchange_n(ptr, val, mo);
+}
+
+#endif//SkAtomics_atomic_DEFINED
diff --git a/gfx/skia/skia/include/ports/SkAtomics_std.h b/gfx/skia/skia/include/ports/SkAtomics_std.h
new file mode 100644
index 000000000000..163efb78c0c1
--- /dev/null
+++ b/gfx/skia/skia/include/ports/SkAtomics_std.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkAtomics_std_DEFINED
+#define SkAtomics_std_DEFINED
+
+// We try not to depend on the C++ standard library,
+// but these uses of <atomic> should all inline, so we don't feel to bad here.
+#include <atomic>
+
+template <typename T>
+T sk_atomic_load(const T* ptr, sk_memory_order mo) {
+    SkASSERT(mo == sk_memory_order_relaxed ||
+             mo == sk_memory_order_seq_cst ||
+             mo == sk_memory_order_acquire ||
+             mo == sk_memory_order_consume);
+    const std::atomic<T>* ap = reinterpret_cast<const std::atomic<T>*>(ptr);
+    return std::atomic_load_explicit(ap, (std::memory_order)mo);
+}
+
+template <typename T>
+void sk_atomic_store(T* ptr, T val, sk_memory_order mo) {
+    SkASSERT(mo == sk_memory_order_relaxed ||
+             mo == sk_memory_order_seq_cst ||
+             mo == sk_memory_order_release);
+    std::atomic<T>* ap = reinterpret_cast<std::atomic<T>*>(ptr);
+    return std::atomic_store_explicit(ap, val, (std::memory_order)mo);
+}
+
+template <typename T>
+T sk_atomic_fetch_add(T* ptr, T val, sk_memory_order mo) {
+    // All values of mo are valid.
+    std::atomic<T>* ap = reinterpret_cast<std::atomic<T>*>(ptr);
+    return std::atomic_fetch_add_explicit(ap, val, (std::memory_order)mo);
+}
+
+template <typename T>
+T sk_atomic_fetch_sub(T* ptr, T val, sk_memory_order mo) {
+    // All values of mo are valid.
+    std::atomic<T>* ap = reinterpret_cast<std::atomic<T>*>(ptr);
+    return std::atomic_fetch_sub_explicit(ap, val, (std::memory_order)mo);
+}
+
+template <typename T>
+bool sk_atomic_compare_exchange(T* ptr, T* expected, T desired,
+                                sk_memory_order success,
+                                sk_memory_order failure) {
+    // All values of success are valid.
+    SkASSERT(failure == sk_memory_order_relaxed ||
+             failure == sk_memory_order_seq_cst ||
+             failure == sk_memory_order_acquire ||
+             failure == sk_memory_order_consume);
+    SkASSERT(failure <= success);
+    std::atomic<T>* ap = reinterpret_cast<std::atomic<T>*>(ptr);
+    return std::atomic_compare_exchange_strong_explicit(ap, expected, desired,
+                                                        (std::memory_order)success,
+                                                        (std::memory_order)failure);
+}
+
+template <typename T>
+T sk_atomic_exchange(T* ptr, T val, sk_memory_order mo) {
+    // All values of mo are valid.
+    std::atomic<T>* ap = reinterpret_cast<std::atomic<T>*>(ptr);
+    return std::atomic_exchange_explicit(ap, val, (std::memory_order)mo);
+}
+
+#endif//SkAtomics_std_DEFINED
diff --git a/gfx/skia/skia/include/ports/SkAtomics_sync.h b/gfx/skia/skia/include/ports/SkAtomics_sync.h
new file mode 100644
index 000000000000..02b1e580725d
--- /dev/null
+++ b/gfx/skia/skia/include/ports/SkAtomics_sync.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkAtomics_sync_DEFINED
+#define SkAtomics_sync_DEFINED
+
+// This file is mostly a shim.  We'd like to delete it.  Please don't put much
+// effort into maintaining it, and if you find bugs in it, the right fix is to
+// delete this file and upgrade your compiler to something that supports
+// __atomic builtins or std::atomic.
+
+static inline void barrier(sk_memory_order mo) {
+    asm volatile("" : : : "memory");  // Prevents the compiler from reordering code.
+    #if SK_CPU_X86
+        // On x86, we generally don't need an extra memory barrier for loads or stores.
+        if (sk_memory_order_seq_cst == mo) { __sync_synchronize(); }
+    #else
+        // On other platforms (e.g. ARM) we do unless the memory order is relaxed.
+        if (sk_memory_order_relaxed != mo) { __sync_synchronize(); }
+    #endif
+}
+
+// These barriers only support our majority use cases: acquire and relaxed loads, release stores.
+// For anything more complicated, please consider deleting this file and upgrading your compiler.
+
+template <typename T>
+T sk_atomic_load(const T* ptr, sk_memory_order mo) {
+    T val = *ptr;
+    barrier(mo);
+    return val;
+}
+
+template <typename T>
+void sk_atomic_store(T* ptr, T val, sk_memory_order mo) {
+    barrier(mo);
+    *ptr = val;
+}
+
+template <typename T>
+T sk_atomic_fetch_add(T* ptr, T val, sk_memory_order) {
+    return __sync_fetch_and_add(ptr, val);
+}
+
+template <typename T>
+T sk_atomic_fetch_sub(T* ptr, T val, sk_memory_order) {
+    return __sync_fetch_and_sub(ptr, val);
+}
+
+template <typename T>
+bool sk_atomic_compare_exchange(T* ptr, T* expected, T desired, sk_memory_order, sk_memory_order) {
+    T prev = __sync_val_compare_and_swap(ptr, *expected, desired);
+    if (prev == *expected) {
+        return true;
+    }
+    *expected = prev;
+    return false;
+}
+
+template <typename T>
+T sk_atomic_exchange(T* ptr, T val, sk_memory_order) {
+    // There is no __sync exchange.  Emulate it with a CAS loop.
+    T prev;
+    do {
+        prev = sk_atomic_load(ptr);
+    } while(!sk_atomic_compare_exchange(ptr, &prev, val));
+    return prev;
+}
+
+#endif//SkAtomics_sync_DEFINED
diff --git a/gfx/skia/skia/include/ports/SkFontConfigInterface.h b/gfx/skia/skia/include/ports/SkFontConfigInterface.h
index c596267db415..304961fd7862 100644
--- a/gfx/skia/skia/include/ports/SkFontConfigInterface.h
+++ b/gfx/skia/skia/include/ports/SkFontConfigInterface.h
@@ -19,12 +19,12 @@ struct SkBaseMutex;
 /**
  *  \class SkFontConfigInterface
  *
- *  Provides SkFontHost clients with access to fontconfig services. They will
- *  access the global instance found in RefGlobal().
+ *  A simple interface for remotable font management.
+ *  The global instance can be found with RefGlobal().
  */
 class SK_API SkFontConfigInterface : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkFontConfigInterface)
+    
 
     /**
      *  Returns the global SkFontConfigInterface instance, and if it is not
@@ -90,23 +90,34 @@ public:
     /**
      *  Given a FontRef, open a stream to access its data, or return null
      *  if the FontRef's data is not available. The caller is responsible for
-     *  calling stream->unref() when it is done accessing the data.
+     *  deleting the stream when it is done accessing the data.
      */
-    virtual SkStream* openStream(const FontIdentity&) = 0;
+    virtual SkStreamAsset* openStream(const FontIdentity&) = 0;
+
+    /**
+     *  Return an SkTypeface for the given FontIdentity.
+     *
+     *  The default implementation simply returns a new typeface built using data obtained from
+     *  openStream(), but derived classes may implement more complex caching schemes.
+     *
+     *  Callers are responsible for unref-ing the result.
+     */
+    virtual SkTypeface* createTypeface(const FontIdentity& identity) {
+        return SkTypeface::CreateFromStream(this->openStream(identity), identity.fTTCIndex);
+    }
 
     /**
      *  Return a singleton instance of a direct subclass that calls into
      *  libfontconfig. This does not affect the refcnt of the returned instance.
      *  The mutex may be used to guarantee the singleton is only constructed once.
      */
-    static SkFontConfigInterface* GetSingletonDirectInterface
-        (SkBaseMutex* mutex = NULL);
+    static SkFontConfigInterface* GetSingletonDirectInterface(SkBaseMutex* mutex = NULL);
 
     // New APIS, which have default impls for now (which do nothing)
 
     virtual SkDataTable* getFamilyNames() { return SkDataTable::NewEmpty(); }
-    virtual bool matchFamilySet(const char inFamilyName[],
-                                SkString* outFamilyName,
+    virtual bool matchFamilySet(const char[] /*inFamilyName*/,
+                                SkString* /*outFamilyName*/,
                                 SkTArray<FontIdentity>*) {
         return false;
     }
diff --git a/gfx/skia/skia/include/ports/SkFontMgr.h b/gfx/skia/skia/include/ports/SkFontMgr.h
index bb8c7b7d988b..8d57986a1323 100644
--- a/gfx/skia/skia/include/ports/SkFontMgr.h
+++ b/gfx/skia/skia/include/ports/SkFontMgr.h
@@ -12,14 +12,13 @@
 #include "SkFontStyle.h"
 
 class SkData;
-class SkStream;
+class SkFontData;
+class SkStreamAsset;
 class SkString;
 class SkTypeface;
 
 class SK_API SkFontStyleSet : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkFontStyleSet)
-
     virtual int count() = 0;
     virtual void getStyle(int index, SkFontStyle*, SkString* style) = 0;
     virtual SkTypeface* createTypeface(int index) = 0;
@@ -27,16 +26,15 @@ public:
 
     static SkFontStyleSet* CreateEmpty();
 
+protected:
+    SkTypeface* matchStyleCSS3(const SkFontStyle& pattern);
+
 private:
     typedef SkRefCnt INHERITED;
 };
 
-class SkTypeface;
-
 class SK_API SkFontMgr : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkFontMgr)
-
     int countFamilies() const;
     void getFamilyName(int index, SkString* familyName) const;
     SkFontStyleSet* createStyleSet(int index) const;
@@ -64,14 +62,19 @@ public:
 
     /**
      *  Use the system fallback to find a typeface for the given character.
-     *  Note that bpc47 is a combination of ISO 639, 15924, and 3166-1 codes,
+     *  Note that bcp47 is a combination of ISO 639, 15924, and 3166-1 codes,
      *  so it is fine to just pass a ISO 639 here.
      *
      *  Will return NULL if no family can be found for the character
      *  in the system fallback.
+     *
+     *  bcp47[0] is the least significant fallback, bcp47[bcp47Count-1] is the
+     *  most significant. If no specified bcp47 codes match, any font with the
+     *  requested character will be matched.
      */
     SkTypeface* matchFamilyStyleCharacter(const char familyName[], const SkFontStyle&,
-                                          const char bpc47[], uint32_t character) const;
+                                          const char* bcp47[], int bcp47Count,
+                                          SkUnichar character) const;
 
     SkTypeface* matchFaceStyle(const SkTypeface*, const SkFontStyle&) const;
 
@@ -87,7 +90,15 @@ public:
      *  (pass 0 for none) or NULL if the stream is not recognized. The caller
      *  must call unref() on the returned object if it is not null.
      */
-    SkTypeface* createFromStream(SkStream*, int ttcIndex = 0) const;
+    SkTypeface* createFromStream(SkStreamAsset*, int ttcIndex = 0) const;
+
+    /**
+     *  Create a typeface from the specified font data.
+     *  Takes ownership of the font data, so the caller should not reference it again.
+     *  Will return NULL if the typeface could not be created.
+     *  The caller must call unref() on the returned object if it is not null.
+     */
+    SkTypeface* createFromFontData(SkFontData*) const;
 
     /**
      *  Create a typeface for the specified fileName and TTC index
@@ -116,22 +127,23 @@ protected:
 
     virtual SkTypeface* onMatchFamilyStyle(const char familyName[],
                                            const SkFontStyle&) const = 0;
-    // TODO: pure virtual, implement on all impls.
     virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[], const SkFontStyle&,
-                                                    const char bpc47[], uint32_t character) const
-    { return NULL; }
+                                                    const char* bcp47[], int bcp47Count,
+                                                    SkUnichar character) const = 0;
     virtual SkTypeface* onMatchFaceStyle(const SkTypeface*,
                                          const SkFontStyle&) const = 0;
 
     virtual SkTypeface* onCreateFromData(SkData*, int ttcIndex) const = 0;
-    virtual SkTypeface* onCreateFromStream(SkStream*, int ttcIndex) const = 0;
+    virtual SkTypeface* onCreateFromStream(SkStreamAsset*, int ttcIndex) const = 0;
+    // TODO: make pure virtual.
+    virtual SkTypeface* onCreateFromFontData(SkFontData*) const;
     virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const = 0;
 
     virtual SkTypeface* onLegacyCreateTypeface(const char familyName[],
                                                unsigned styleBits) const = 0;
 private:
     static SkFontMgr* Factory();    // implemented by porting layer
-    static SkFontMgr* CreateDefault();
+    friend SkFontMgr* sk_fontmgr_create_default();
 
     typedef SkRefCnt INHERITED;
 };
diff --git a/gfx/skia/skia/include/ports/SkFontMgr_android.h b/gfx/skia/skia/include/ports/SkFontMgr_android.h
new file mode 100644
index 000000000000..e489b161b2a6
--- /dev/null
+++ b/gfx/skia/skia/include/ports/SkFontMgr_android.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkFontMgr_android_DEFINED
+#define SkFontMgr_android_DEFINED
+
+#include "SkTypes.h"
+
+class SkFontMgr;
+
+/**
+ *  For test only -- this only affects the default factory.
+ *  Load font config from given xml files, instead of those from Android system.
+ */
+SK_API void SkUseTestFontConfigFile(const char* mainconf, const char* fallbackconf,
+                                    const char* fontsdir);
+
+struct SkFontMgr_Android_CustomFonts {
+    /** When specifying custom fonts, indicates how to use system fonts. */
+    enum SystemFontUse {
+        kOnlyCustom, /** Use only custom fonts. NDK compliant. */
+        kPreferCustom, /** Use custom fonts before system fonts. */
+        kPreferSystem /** Use system fonts before custom fonts. */
+    };
+    /** Whether or not to use system fonts. */
+    SystemFontUse fSystemFontUse;
+
+    /** Base path to resolve relative font file names. If a directory, should end with '/'. */
+    const char* fBasePath;
+
+    /** Optional custom configuration file to use. */
+    const char* fFontsXml;
+
+    /** Optional custom configuration file for fonts which provide fallback.
+     *  In the new style (version > 21) fontsXml format is used, this should be NULL.
+     */
+    const char* fFallbackFontsXml;
+};
+
+/** Create a font manager for Android. If 'custom' is NULL, use only system fonts. */
+SK_API SkFontMgr* SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* custom);
+
+#endif // SkFontMgr_android_DEFINED
diff --git a/gfx/skia/skia/include/ports/SkFontMgr_custom.h b/gfx/skia/skia/include/ports/SkFontMgr_custom.h
new file mode 100644
index 000000000000..ad37686ebb79
--- /dev/null
+++ b/gfx/skia/skia/include/ports/SkFontMgr_custom.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkFontMgr_custom_DEFINED
+#define SkFontMgr_custom_DEFINED
+
+#include "SkTypes.h"
+
+class SkFontMgr;
+
+/** Create a custom font manager which scans a given directory for font files. */
+SK_API SkFontMgr* SkFontMgr_New_Custom_Directory(const char* dir);
+
+#endif // SkFontMgr_custom_DEFINED
diff --git a/gfx/skia/skia/include/ports/SkFontMgr_fontconfig.h b/gfx/skia/skia/include/ports/SkFontMgr_fontconfig.h
new file mode 100644
index 000000000000..7a59ff0c469e
--- /dev/null
+++ b/gfx/skia/skia/include/ports/SkFontMgr_fontconfig.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkFontMgr_fontconfig_DEFINED
+#define SkFontMgr_fontconfig_DEFINED
+
+#include "SkTypes.h"
+#include <fontconfig/fontconfig.h>
+
+class SkFontMgr;
+
+/** Create a font manager around a FontConfig instance.
+ *  If 'fc' is NULL, will use a new default config.
+ *  Takes ownership of 'fc' and will call FcConfigDestroy on it.
+ */
+SK_API SkFontMgr* SkFontMgr_New_FontConfig(FcConfig* fc);
+
+#endif // #ifndef SkFontMgr_fontconfig_DEFINED
diff --git a/gfx/skia/skia/include/ports/SkFontMgr_indirect.h b/gfx/skia/skia/include/ports/SkFontMgr_indirect.h
index b9ce344a73f2..81cd7739a9b3 100644
--- a/gfx/skia/skia/include/ports/SkFontMgr_indirect.h
+++ b/gfx/skia/skia/include/ports/SkFontMgr_indirect.h
@@ -10,15 +10,17 @@
 
 #include "SkDataTable.h"
 #include "SkFontMgr.h"
-#include "SkFontStyle.h"
+#include "../private/SkMutex.h"
+#include "SkRefCnt.h"
 #include "SkRemotableFontMgr.h"
 #include "SkTArray.h"
 #include "SkTypeface.h"
+#include "SkTypes.h"
 
 class SkData;
-class SkStream;
+class SkFontStyle;
+class SkStreamAsset;
 class SkString;
-class SkTypeface;
 
 class SK_API SkFontMgr_Indirect : public SkFontMgr {
 public:
@@ -30,29 +32,30 @@ public:
     { }
 
 protected:
-    virtual int onCountFamilies() const SK_OVERRIDE;
-    virtual void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE;
-    virtual SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE;
+    int onCountFamilies() const override;
+    void onGetFamilyName(int index, SkString* familyName) const override;
+    SkFontStyleSet* onCreateStyleSet(int index) const override;
 
-    virtual SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE;
+    SkFontStyleSet* onMatchFamily(const char familyName[]) const override;
 
     virtual SkTypeface* onMatchFamilyStyle(const char familyName[],
-                                           const SkFontStyle& fontStyle) const SK_OVERRIDE;
+                                           const SkFontStyle& fontStyle) const override;
 
     virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[],
                                                     const SkFontStyle&,
-                                                    const char bpc47[],
-                                                    uint32_t character) const SK_OVERRIDE;
+                                                    const char* bcp47[],
+                                                    int bcp47Count,
+                                                    SkUnichar character) const override;
 
     virtual SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember,
-                                         const SkFontStyle& fontStyle) const SK_OVERRIDE;
+                                         const SkFontStyle& fontStyle) const override;
 
-    virtual SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE;
-    virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE;
-    virtual SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE;
+    SkTypeface* onCreateFromStream(SkStreamAsset* stream, int ttcIndex) const override;
+    SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const override;
+    SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const override;
 
     virtual SkTypeface* onLegacyCreateTypeface(const char familyName[],
-                                               unsigned styleBits) const SK_OVERRIDE;
+                                               unsigned styleBits) const override;
 
 private:
     SkTypeface* createTypefaceFromFontId(const SkFontIdentity& fontId) const;
diff --git a/gfx/skia/skia/include/ports/SkRemotableFontMgr.h b/gfx/skia/skia/include/ports/SkRemotableFontMgr.h
index bd99497cda27..ddc8e50a12e2 100644
--- a/gfx/skia/skia/include/ports/SkRemotableFontMgr.h
+++ b/gfx/skia/skia/include/ports/SkRemotableFontMgr.h
@@ -8,13 +8,13 @@
 #ifndef SkRemotableFontMgr_DEFINED
 #define SkRemotableFontMgr_DEFINED
 
+#include "../private/SkTemplates.h"
 #include "SkFontStyle.h"
 #include "SkRefCnt.h"
-#include "SkTemplates.h"
+#include "SkTypes.h"
 
 class SkDataTable;
 class SkStreamAsset;
-class SkString;
 
 struct SK_API SkFontIdentity {
     static const uint32_t kInvalidDataId = 0xFFFFFFFF;
@@ -35,8 +35,6 @@ struct SK_API SkFontIdentity {
 
 class SK_API SkRemotableFontIdentitySet : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkRemotableFontIdentitySet)
-
     SkRemotableFontIdentitySet(int count, SkFontIdentity** data);
 
     int count() const { return fCount; }
@@ -46,7 +44,8 @@ public:
 
 private:
     SkRemotableFontIdentitySet() : fCount(0), fData() { }
-    static SkRemotableFontIdentitySet* NewEmptyImpl();
+
+    friend SkRemotableFontIdentitySet* sk_remotable_font_identity_set_new();
 
     int fCount;
     SkAutoTMalloc<SkFontIdentity> fData;
@@ -56,8 +55,6 @@ private:
 
 class SK_API SkRemotableFontMgr : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkRemotableFontMgr)
-
     /**
      *  Returns the names of the known fonts on the system.
      *  Will not return NULL, will return an empty table if no families exist.
@@ -134,7 +131,8 @@ public:
      *  so it is fine to just pass a ISO 639 here.
      */
     virtual SkFontIdentity matchNameStyleCharacter(const char familyName[], const SkFontStyle&,
-                                                   const char bpc47[], SkUnichar character) const=0;
+                                                   const char* bcp47[], int bcp47Count,
+                                                   SkUnichar character) const=0;
 
     /**
      *  Returns the data for the given data id.
diff --git a/gfx/skia/skia/include/ports/SkTypeface_android.h b/gfx/skia/skia/include/ports/SkTypeface_android.h
deleted file mode 100644
index e46c8f8ac3ec..000000000000
--- a/gfx/skia/skia/include/ports/SkTypeface_android.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#ifndef SkTypeface_android_DEFINED
-#define SkTypeface_android_DEFINED
-
-#include "SkTypeface.h"
-
-#ifdef SK_BUILD_FOR_ANDROID
-
-class SkPaintOptionsAndroid;
-
-/**
- *  Get the family name of the font in the fallback font list containing
- *  the specified character taking into account the provided language. This
- *  function also assumes the only families with the elegant or default variants
- *  will be returned.
- *
- *  @param uni  The unicode character to use for the lookup.
- *  @param lang The null terminated string representing the BCP 47 language
- *              identifier for the preferred language. If there is no unique
- *              fallback chain for that language the system's default language
- *              will be used.
- *  @param name The family name of the font file containing the unicode character
- *              in the preferred language
- *  @return     true if a font is found and false otherwise
- */
-SK_API bool SkGetFallbackFamilyNameForChar(SkUnichar uni, const char* lang, SkString* name);
-
-/**
- *  For test only.
- *  Load font config from given xml files, instead of those from Android system.
- */
-SK_API void SkUseTestFontConfigFile(const char* mainconf, const char* fallbackconf,
-                                    const char* fontsdir);
-
-/**
- *  Given a "current" fontID, return a ref to the next logical typeface
- *  when searching fonts for a given unicode value. Typically the caller
- *  will query a given font, and if a unicode value is not supported, they
- *  will call this, and if 0 is not returned, will search that font, and so
- *  on. This process must be finite, and when the fonthost sees a
- *  font with no logical successor, it must return NULL.
- *
- *  The original fontID is also provided. This is the initial font that was
- *  stored in the typeface of the caller. It is provided as an aid to choose
- *  the best next logical font. e.g. If the original font was bold or serif,
- *  but the 2nd in the logical chain was plain, then a subsequent call to
- *  get the 3rd can still inspect the original, and try to match its
- *  stylistic attributes.
- */
-SkTypeface* SkAndroidNextLogicalTypeface(SkFontID currFontID, SkFontID origFontID,
-                                         const SkPaintOptionsAndroid& options);
-
-/**
- * Given a glyphID (built using fallback font chaining) and its origin typeface
- * return the actual typeface within the fallback chain that this glyphID
- * resolves to. If no suitable typeface is found then NULL is returned. However,
- * if returned typeface is not NULL it is assumed to be globally cached so the
- * caller need not ref it.
- *
- * Optionally, if lower/upper bound params are provided and the returned
- * typeface is not NULL, then these params are populated with the range of
- * glyphIDs that this typeface is capable of resolving. The lower bound is
- * inclusive while the upper bound is exclusive.
- */
-SkTypeface* SkGetTypefaceForGlyphID(uint16_t glyphID, const SkTypeface* origTypeface,
-                                    const SkPaintOptionsAndroid& options,
-                                    int* lowerBounds = NULL, int* upperBounds = NULL);
-
-#endif // #ifdef SK_BUILD_FOR_ANDROID
-#endif // #ifndef SkTypeface_android_DEFINED
diff --git a/gfx/skia/skia/include/ports/SkTypeface_cairo.h b/gfx/skia/skia/include/ports/SkTypeface_cairo.h
index 7e44f04c4776..060c0ed54035 100644
--- a/gfx/skia/skia/include/ports/SkTypeface_cairo.h
+++ b/gfx/skia/skia/include/ports/SkTypeface_cairo.h
@@ -5,7 +5,7 @@
 
 #include "SkTypeface.h"
 
-SK_API extern SkTypeface* SkCreateTypefaceFromCairoFont(cairo_font_face_t* fontFace, SkTypeface::Style style, bool isFixedWidth);
+SK_API extern SkTypeface* SkCreateTypefaceFromCairoFont(cairo_font_face_t* fontFace, const SkFontStyle& style, bool isFixedWidth);
 
 #endif
 
diff --git a/gfx/skia/skia/include/ports/SkTypeface_mac.h b/gfx/skia/skia/include/ports/SkTypeface_mac.h
index 0166ee57eaca..14440b53833b 100644
--- a/gfx/skia/skia/include/ports/SkTypeface_mac.h
+++ b/gfx/skia/skia/include/ports/SkTypeface_mac.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
@@ -6,12 +5,15 @@
  * found in the LICENSE file.
  */
 
-
-
 #ifndef SkTypeface_mac_DEFINED
 #define SkTypeface_mac_DEFINED
 
 #include "SkTypeface.h"
+
+#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
+
+#include <CoreFoundation/CoreFoundation.h>
+
 #ifdef SK_BUILD_FOR_MAC
 #import <ApplicationServices/ApplicationServices.h>
 #endif
@@ -19,11 +21,29 @@
 #ifdef SK_BUILD_FOR_IOS
 #include <CoreText/CoreText.h>
 #endif
+
 /**
  *  Like the other Typeface create methods, this returns a new reference to the
  *  corresponding typeface for the specified CTFontRef. The caller must call
  *  unref() when it is finished.
+ *
+ *  The CFTypeRef parameter, if provided, will be kept referenced for the
+ *  lifetime of the SkTypeface. This was introduced as a means to work around
+ *  https://crbug.com/413332 .
  */
-SK_API extern SkTypeface* SkCreateTypefaceFromCTFont(CTFontRef);
+SK_API extern SkTypeface* SkCreateTypefaceFromCTFont(CTFontRef, CFTypeRef = NULL);
 
-#endif
+/**
+ *  Returns the platform-specific CTFontRef handle for a
+ *  given SkTypeface. Note that the returned CTFontRef gets
+ *  released when the source SkTypeface is destroyed.
+ *
+ *  This method is deprecated. It may only be used by Blink Mac
+ *  legacy code in special cases related to text-shaping
+ *  with AAT fonts, clipboard handling and font fallback.
+ *  See https://code.google.com/p/skia/issues/detail?id=3408
+ */
+SK_API extern CTFontRef SkTypeface_GetCTFontRef(const SkTypeface* face);
+
+#endif  // defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
+#endif  // SkTypeface_mac_DEFINED
diff --git a/gfx/skia/skia/include/ports/SkTypeface_win.h b/gfx/skia/skia/include/ports/SkTypeface_win.h
index 07752d82f9b6..b7373986c939 100644
--- a/gfx/skia/skia/include/ports/SkTypeface_win.h
+++ b/gfx/skia/skia/include/ports/SkTypeface_win.h
@@ -10,6 +10,8 @@
 
 #include "SkTypeface.h"
 
+#ifdef SK_BUILD_FOR_WIN
+
 /**
  *  Like the other Typeface create methods, this returns a new reference to the
  *  corresponding typeface for the specified logfont. The caller is responsible
@@ -58,4 +60,5 @@ SK_API SkFontMgr* SkFontMgr_New_DirectWriteRenderer(SkRemotableFontMgr*);
  */
 SK_API SkRemotableFontMgr* SkRemotableFontMgr_New_DirectWrite();
 
-#endif
+#endif  // SK_BUILD_FOR_WIN
+#endif  // SkTypeface_win_DEFINED
diff --git a/gfx/skia/skia/include/private/SkAtomics.h b/gfx/skia/skia/include/private/SkAtomics.h
new file mode 100644
index 000000000000..0ec3ce415cf0
--- /dev/null
+++ b/gfx/skia/skia/include/private/SkAtomics.h
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkAtomics_DEFINED
+#define SkAtomics_DEFINED
+
+// This file is not part of the public Skia API.
+#include "SkTypes.h"
+
+enum sk_memory_order {
+    sk_memory_order_relaxed,
+    sk_memory_order_consume,
+    sk_memory_order_acquire,
+    sk_memory_order_release,
+    sk_memory_order_acq_rel,
+    sk_memory_order_seq_cst,
+};
+
+template <typename T>
+T sk_atomic_load(const T*, sk_memory_order = sk_memory_order_seq_cst);
+
+template <typename T>
+void sk_atomic_store(T*, T, sk_memory_order = sk_memory_order_seq_cst);
+
+template <typename T>
+T sk_atomic_fetch_add(T*, T, sk_memory_order = sk_memory_order_seq_cst);
+
+template <typename T>
+T sk_atomic_fetch_sub(T*, T, sk_memory_order = sk_memory_order_seq_cst);
+
+template <typename T>
+bool sk_atomic_compare_exchange(T*, T* expected, T desired,
+                                sk_memory_order success = sk_memory_order_seq_cst,
+                                sk_memory_order failure = sk_memory_order_seq_cst);
+
+template <typename T>
+T sk_atomic_exchange(T*, T, sk_memory_order = sk_memory_order_seq_cst);
+
+// A little wrapper class for small T (think, builtins: int, float, void*) to
+// ensure they're always used atomically.  This is our stand-in for std::atomic<T>.
+// !!! Please _really_ know what you're doing if you change default_memory_order. !!!
+template <typename T, sk_memory_order default_memory_order = sk_memory_order_seq_cst>
+class SkAtomic : SkNoncopyable {
+public:
+    SkAtomic() {}
+    explicit SkAtomic(const T& val) : fVal(val) {}
+
+    // It is essential we return by value rather than by const&.  fVal may change at any time.
+    T load(sk_memory_order mo = default_memory_order) const {
+        return sk_atomic_load(&fVal, mo);
+    }
+
+    void store(const T& val, sk_memory_order mo = default_memory_order) {
+        sk_atomic_store(&fVal, val, mo);
+    }
+
+    // Alias for .load(default_memory_order).
+    MOZ_IMPLICIT operator T() const {
+        return this->load();
+    }
+
+    // Alias for .store(v, default_memory_order).
+    T operator=(const T& v) {
+        this->store(v);
+        return v;
+    }
+
+    T fetch_add(const T& val, sk_memory_order mo = default_memory_order) {
+        return sk_atomic_fetch_add(&fVal, val, mo);
+    }
+
+    T fetch_sub(const T& val, sk_memory_order mo = default_memory_order) {
+        return sk_atomic_fetch_sub(&fVal, val, mo);
+    }
+
+    bool compare_exchange(T* expected, const T& desired,
+                          sk_memory_order success = default_memory_order,
+                          sk_memory_order failure = default_memory_order) {
+        return sk_atomic_compare_exchange(&fVal, expected, desired, success, failure);
+    }
+private:
+    T fVal;
+};
+
+// IWYU pragma: begin_exports
+#if defined(_MSC_VER)
+    #include "../ports/SkAtomics_std.h"
+#elif !defined(SK_BUILD_FOR_IOS) && defined(__ATOMIC_RELAXED)
+    #include "../ports/SkAtomics_atomic.h"
+#else
+    #include "../ports/SkAtomics_sync.h"
+#endif
+// IWYU pragma: end_exports
+
+// From here down we have shims for our old atomics API, to be weaned off of.
+// We use the default sequentially-consistent memory order to make things simple
+// and to match the practical reality of our old _sync and _win implementations.
+
+inline int32_t sk_atomic_inc(int32_t* ptr)            { return sk_atomic_fetch_add(ptr, +1); }
+inline int32_t sk_atomic_dec(int32_t* ptr)            { return sk_atomic_fetch_add(ptr, -1); }
+inline int32_t sk_atomic_add(int32_t* ptr, int32_t v) { return sk_atomic_fetch_add(ptr,  v); }
+
+inline int64_t sk_atomic_inc(int64_t* ptr) { return sk_atomic_fetch_add<int64_t>(ptr, +1); }
+
+inline bool sk_atomic_cas(int32_t* ptr, int32_t expected, int32_t desired) {
+    return sk_atomic_compare_exchange(ptr, &expected, desired);
+}
+
+inline void* sk_atomic_cas(void** ptr, void* expected, void* desired) {
+    (void)sk_atomic_compare_exchange(ptr, &expected, desired);
+    return expected;
+}
+
+inline int32_t sk_atomic_conditional_inc(int32_t* ptr) {
+    int32_t prev = sk_atomic_load(ptr);
+    do {
+        if (0 == prev) {
+            break;
+        }
+    } while(!sk_atomic_compare_exchange(ptr, &prev, prev+1));
+    return prev;
+}
+
+template <typename T>
+T sk_acquire_load(T* ptr) { return sk_atomic_load(ptr, sk_memory_order_acquire); }
+
+template <typename T>
+void sk_release_store(T* ptr, T val) { sk_atomic_store(ptr, val, sk_memory_order_release); }
+
+inline void sk_membar_acquire__after_atomic_dec() {}
+inline void sk_membar_acquire__after_atomic_conditional_inc() {}
+
+#endif//SkAtomics_DEFINED
diff --git a/gfx/skia/skia/include/private/SkChecksum.h b/gfx/skia/skia/include/private/SkChecksum.h
new file mode 100644
index 000000000000..6289a444ae78
--- /dev/null
+++ b/gfx/skia/skia/include/private/SkChecksum.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkChecksum_DEFINED
+#define SkChecksum_DEFINED
+
+#include "SkString.h"
+#include "SkTLogic.h"
+#include "SkTypes.h"
+
+class SkChecksum : SkNoncopyable {
+public:
+    /**
+     * uint32_t -> uint32_t hash, useful for when you're about to trucate this hash but you
+     * suspect its low bits aren't well mixed.
+     *
+     * This is the Murmur3 finalizer.
+     */
+    static uint32_t Mix(uint32_t hash) {
+        hash ^= hash >> 16;
+        hash *= 0x85ebca6b;
+        hash ^= hash >> 13;
+        hash *= 0xc2b2ae35;
+        hash ^= hash >> 16;
+        return hash;
+    }
+
+    /**
+     * uint32_t -> uint32_t hash, useful for when you're about to trucate this hash but you
+     * suspect its low bits aren't well mixed.
+     *
+     *  This version is 2-lines cheaper than Mix, but seems to be sufficient for the font cache.
+     */
+    static uint32_t CheapMix(uint32_t hash) {
+        hash ^= hash >> 16;
+        hash *= 0x85ebca6b;
+        hash ^= hash >> 16;
+        return hash;
+    }
+
+    /**
+     * Calculate 32-bit Murmur hash (murmur3).
+     * See en.wikipedia.org/wiki/MurmurHash.
+     *
+     *  @param data Memory address of the data block to be processed.
+     *  @param size Size of the data block in bytes.
+     *  @param seed Initial hash seed. (optional)
+     *  @return hash result
+     */
+    static uint32_t Murmur3(const void* data, size_t bytes, uint32_t seed=0);
+};
+
+// SkGoodHash should usually be your first choice in hashing data.
+// It should be both reasonably fast and high quality.
+struct SkGoodHash {
+    template <typename K>
+    SK_WHEN(sizeof(K) == 4, uint32_t) operator()(const K& k) const {
+        return SkChecksum::Mix(*(const uint32_t*)&k);
+    }
+
+    template <typename K>
+    SK_WHEN(sizeof(K) != 4, uint32_t) operator()(const K& k) const {
+        return SkChecksum::Murmur3(&k, sizeof(K));
+    }
+
+    uint32_t operator()(const SkString& k) const {
+        return SkChecksum::Murmur3(k.c_str(), k.size());
+    }
+};
+
+#endif
diff --git a/gfx/skia/skia/include/core/SkFloatBits.h b/gfx/skia/skia/include/private/SkFloatBits.h
similarity index 98%
rename from gfx/skia/skia/include/core/SkFloatBits.h
rename to gfx/skia/skia/include/private/SkFloatBits.h
index 552e712f53e5..3ddb9ef564cf 100644
--- a/gfx/skia/skia/include/core/SkFloatBits.h
+++ b/gfx/skia/skia/include/private/SkFloatBits.h
@@ -95,7 +95,6 @@ static inline float Sk2sComplimentAsFloat(int32_t x) {
 /** Return x cast to a float (i.e. (float)x)
 */
 float SkIntToFloatCast(int x);
-float SkIntToFloatCast_NoOverflowCheck(int x);
 
 /** Return the float cast to an int.
     If the value is out of range, or NaN, return +/- SK_MaxS32
diff --git a/gfx/skia/skia/include/core/SkFloatingPoint.h b/gfx/skia/skia/include/private/SkFloatingPoint.h
similarity index 60%
rename from gfx/skia/skia/include/core/SkFloatingPoint.h
rename to gfx/skia/skia/include/private/SkFloatingPoint.h
index 6c480c3b076a..f7ee816b1200 100644
--- a/gfx/skia/skia/include/core/SkFloatingPoint.h
+++ b/gfx/skia/skia/include/private/SkFloatingPoint.h
@@ -31,8 +31,14 @@ static inline float sk_float_pow(float base, float exp) {
 
 static inline float sk_float_copysign(float x, float y) {
 // c++11 contains a 'float copysign(float, float)' function in <cmath>.
-#if (!defined(_MSC_VER) && __cplusplus >= 201103L) || (defined(_MSC_VER) && _MSC_VER >= 1800)
-    return copysign(x, y);
+// clang-cl reports __cplusplus for clang, not the __cplusplus vc++ version _MSC_VER would report.
+#if (defined(_MSC_VER) && defined(__clang__))
+#    define SK_BUILD_WITH_CLANG_CL 1
+#else
+#    define SK_BUILD_WITH_CLANG_CL 0
+#endif
+#if (!SK_BUILD_WITH_CLANG_CL && __cplusplus >= 201103L) || (_MSC_VER >= 1800)
+    return copysignf(x, y);
 
 // Posix has demanded 'float copysignf(float, float)' (from C99) since Issue 6.
 #elif defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L
@@ -50,39 +56,35 @@ static inline float sk_float_copysign(float x, float y) {
 #endif
 }
 
-#ifdef SK_BUILD_FOR_WINCE
-    #define sk_float_sqrt(x)        (float)::sqrt(x)
-    #define sk_float_sin(x)         (float)::sin(x)
-    #define sk_float_cos(x)         (float)::cos(x)
-    #define sk_float_tan(x)         (float)::tan(x)
-    #define sk_float_acos(x)        (float)::acos(x)
-    #define sk_float_asin(x)        (float)::asin(x)
-    #define sk_float_atan2(y,x)     (float)::atan2(y,x)
-    #define sk_float_abs(x)         (float)::fabs(x)
-    #define sk_float_mod(x,y)       (float)::fmod(x,y)
-    #define sk_float_exp(x)         (float)::exp(x)
-    #define sk_float_log(x)         (float)::log(x)
-    #define sk_float_floor(x)       (float)::floor(x)
-    #define sk_float_ceil(x)        (float)::ceil(x)
-#else
-    #define sk_float_sqrt(x)        sqrtf(x)
-    #define sk_float_sin(x)         sinf(x)
-    #define sk_float_cos(x)         cosf(x)
-    #define sk_float_tan(x)         tanf(x)
-    #define sk_float_floor(x)       floorf(x)
-    #define sk_float_ceil(x)        ceilf(x)
+#define sk_float_sqrt(x)        sqrtf(x)
+#define sk_float_sin(x)         sinf(x)
+#define sk_float_cos(x)         cosf(x)
+#define sk_float_tan(x)         tanf(x)
+#define sk_float_floor(x)       floorf(x)
+#define sk_float_ceil(x)        ceilf(x)
 #ifdef SK_BUILD_FOR_MAC
-    #define sk_float_acos(x)        static_cast<float>(acos(x))
-    #define sk_float_asin(x)        static_cast<float>(asin(x))
+#    define sk_float_acos(x)    static_cast<float>(acos(x))
+#    define sk_float_asin(x)    static_cast<float>(asin(x))
 #else
-    #define sk_float_acos(x)        acosf(x)
-    #define sk_float_asin(x)        asinf(x)
+#    define sk_float_acos(x)    acosf(x)
+#    define sk_float_asin(x)    asinf(x)
 #endif
-    #define sk_float_atan2(y,x)     atan2f(y,x)
-    #define sk_float_abs(x)         fabsf(x)
-    #define sk_float_mod(x,y)       fmodf(x,y)
-    #define sk_float_exp(x)         expf(x)
-    #define sk_float_log(x)         logf(x)
+#define sk_float_atan2(y,x)     atan2f(y,x)
+#define sk_float_abs(x)         fabsf(x)
+#define sk_float_mod(x,y)       fmodf(x,y)
+#define sk_float_exp(x)         expf(x)
+#define sk_float_log(x)         logf(x)
+
+#define sk_float_round(x) sk_float_floor((x) + 0.5f)
+
+// can't find log2f on android, but maybe that just a tool bug?
+#ifdef SK_BUILD_FOR_ANDROID
+    static inline float sk_float_log2(float x) {
+        const double inv_ln_2 = 1.44269504088896;
+        return (float)(log(x) * inv_ln_2);
+    }
+#else
+    #define sk_float_log2(x)        log2f(x)
 #endif
 
 #ifdef SK_BUILD_FOR_WIN
@@ -110,6 +112,13 @@ static inline float sk_float_copysign(float x, float y) {
     #define sk_float_ceil2int(x)    (int)sk_float_ceil(x)
 #endif
 
+#define sk_double_floor(x)          floor(x)
+#define sk_double_round(x)          floor((x) + 0.5)
+#define sk_double_ceil(x)           ceil(x)
+#define sk_double_floor2int(x)      (int)floor(x)
+#define sk_double_round2int(x)      (int)floor((x) + 0.5f)
+#define sk_double_ceil2int(x)       (int)ceil(x)
+
 extern const uint32_t gIEEENotANumber;
 extern const uint32_t gIEEEInfinity;
 extern const uint32_t gIEEENegativeInfinity;
@@ -118,11 +127,9 @@ extern const uint32_t gIEEENegativeInfinity;
 #define SK_FloatInfinity            (*SkTCast<const float*>(&gIEEEInfinity))
 #define SK_FloatNegativeInfinity    (*SkTCast<const float*>(&gIEEENegativeInfinity))
 
-#if defined(__SSE__)
-#include <xmmintrin.h>
-#elif defined(__ARM_NEON__)
-#include <arm_neon.h>
-#endif
+// We forward declare this to break an #include cycle.
+// (SkScalar -> SkFloatingPoint -> SkOpts.h -> SkXfermode -> SkColor -> SkScalar)
+namespace SkOpts { extern float (*rsqrt)(float); }
 
 // Fast, approximate inverse square root.
 // Compare to name-brand "1.0f / sk_float_sqrt(x)".  Should be around 10x faster on SSE, 2x on NEON.
@@ -132,11 +139,11 @@ static inline float sk_float_rsqrt(const float x) {
 //
 // We do one step of Newton's method to refine the estimates in the NEON and null paths.  No
 // refinement is faster, but very innacurate.  Two steps is more accurate, but slower than 1/sqrt.
-#if defined(__SSE__)
-    float result;
-    _mm_store_ss(&result, _mm_rsqrt_ss(_mm_set_ss(x)));
-    return result;
-#elif defined(__ARM_NEON__)
+//
+// Optimized constants in the null path courtesy of http://rrrola.wz.cz/inv_sqrt.html
+#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1
+    return _mm_cvtss_f32(_mm_rsqrt_ss(_mm_set_ss(x)));
+#elif defined(SK_ARM_HAS_NEON)
     // Get initial estimate.
     const float32x2_t xx = vdup_n_f32(x);  // Clever readers will note we're doing everything 2x.
     float32x2_t estimate = vrsqrte_f32(xx);
@@ -146,16 +153,18 @@ static inline float sk_float_rsqrt(const float x) {
     estimate = vmul_f32(estimate, vrsqrts_f32(xx, estimate_sq));
     return vget_lane_f32(estimate, 0);  // 1 will work fine too; the answer's in both places.
 #else
-    // Get initial estimate.
-    int i = *SkTCast<int*>(&x);
-    i = 0x5f3759df - (i>>1);
-    float estimate = *SkTCast<float*>(&i);
-
-    // One step of Newton's method to refine.
-    const float estimate_sq = estimate*estimate;
-    estimate *= (1.5f-0.5f*x*estimate_sq);
-    return estimate;
+    // Perhaps runtime-detected NEON, or a portable fallback.
+    return SkOpts::rsqrt(x);
 #endif
 }
 
+// This is the number of significant digits we can print in a string such that when we read that
+// string back we get the floating point number we expect.  The minimum value C requires is 6, but
+// most compilers support 9
+#ifdef FLT_DECIMAL_DIG
+#define SK_FLT_DECIMAL_DIG FLT_DECIMAL_DIG
+#else
+#define SK_FLT_DECIMAL_DIG 9
+#endif
+
 #endif
diff --git a/gfx/skia/skia/include/private/SkGpuFenceSync.h b/gfx/skia/skia/include/private/SkGpuFenceSync.h
new file mode 100644
index 000000000000..b78398fed857
--- /dev/null
+++ b/gfx/skia/skia/include/private/SkGpuFenceSync.h
@@ -0,0 +1,29 @@
+
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef SkGpuFenceSync_DEFINED
+#define SkGpuFenceSync_DEFINED
+
+#include "SkTypes.h"
+
+typedef void* SkPlatformGpuFence;
+
+/*
+ * This class provides an interface to interact with fence syncs. A fence sync is an object that the
+ * client can insert into the GPU command stream, and then at any future time, wait until all
+ * commands that were issued before the fence have completed.
+ */
+class SkGpuFenceSync {
+public:
+    virtual SkPlatformGpuFence SK_WARN_UNUSED_RESULT insertFence() const = 0;
+    virtual bool flushAndWaitFence(SkPlatformGpuFence) const = 0;
+    virtual void deleteFence(SkPlatformGpuFence) const = 0;
+
+    virtual ~SkGpuFenceSync() {}
+};
+
+#endif
diff --git a/gfx/skia/skia/include/private/SkMiniRecorder.h b/gfx/skia/skia/include/private/SkMiniRecorder.h
new file mode 100644
index 000000000000..5b68fc22f843
--- /dev/null
+++ b/gfx/skia/skia/include/private/SkMiniRecorder.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkMiniRecorder_DEFINED
+#define SkMiniRecorder_DEFINED
+
+#include "SkRecords.h"
+#include "SkScalar.h"
+#include "SkTypes.h"
+class SkCanvas;
+
+// Records small pictures, but only a limited subset of the canvas API, and may fail.
+class SkMiniRecorder : SkNoncopyable {
+public:
+    SkMiniRecorder();
+    ~SkMiniRecorder();
+
+    // Try to record an op.  Returns false on failure.
+    bool drawBitmapRect(const SkBitmap&, const SkRect* src, const SkRect& dst,
+                        const SkPaint*, SkCanvas::SrcRectConstraint);
+    bool drawPath(const SkPath&, const SkPaint&);
+    bool drawRect(const SkRect&, const SkPaint&);
+    bool drawTextBlob(const SkTextBlob*, SkScalar x, SkScalar y, const SkPaint&);
+
+    // Detach anything we've recorded as a picture, resetting this SkMiniRecorder.
+    SkPicture* detachAsPicture(const SkRect& cull);
+
+    // Flush anything we've recorded to the canvas, resetting this SkMiniRecorder.
+    // This is logically the same as but rather more efficient than:
+    //    SkAutoTUnref<SkPicture> pic(this->detachAsPicture(SkRect::MakeEmpty()));
+    //    pic->playback(canvas);
+    void flushAndReset(SkCanvas*);
+
+private:
+    enum class State {
+        kEmpty,
+        kDrawBitmapRectFixedSize,
+        kDrawPath,
+        kDrawRect,
+        kDrawTextBlob,
+    };
+
+    State fState;
+
+    template <size_t A, size_t B>
+    struct Max { static const size_t val = A > B ? A : B; };
+
+    static const size_t kInlineStorage =
+        Max<sizeof(SkRecords::DrawBitmapRectFixedSize),
+        Max<sizeof(SkRecords::DrawPath),
+        Max<sizeof(SkRecords::DrawRect),
+            sizeof(SkRecords::DrawTextBlob)>::val>::val>::val;
+    SkAlignedSStorage<kInlineStorage> fBuffer;
+};
+
+#endif//SkMiniRecorder_DEFINED
diff --git a/gfx/skia/skia/include/private/SkMutex.h b/gfx/skia/skia/include/private/SkMutex.h
new file mode 100644
index 000000000000..8c78e1205c87
--- /dev/null
+++ b/gfx/skia/skia/include/private/SkMutex.h
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkMutex_DEFINED
+#define SkMutex_DEFINED
+
+// This file is not part of the public Skia API.
+#include "../private/SkSemaphore.h"
+#include "SkTypes.h"
+
+#ifdef SK_DEBUG
+    #include "../private/SkThreadID.h"
+#endif
+
+#define SK_MUTEX_SEMAPHORE_INIT {1, {0}}
+
+#ifdef SK_DEBUG
+    #define SK_BASE_MUTEX_INIT {SK_MUTEX_SEMAPHORE_INIT, 0}
+#else
+    #define SK_BASE_MUTEX_INIT {SK_MUTEX_SEMAPHORE_INIT}
+#endif
+
+// Using POD-style initialization prevents the generation of a static initializer.
+//
+// Without magic statics there are no thread safety guarantees on initialization
+// of local statics (even POD). As a result, it is illegal to use
+// SK_DECLARE_STATIC_MUTEX in a function.
+//
+// Because SkBaseMutex is not a primitive, a static SkBaseMutex cannot be
+// initialized in a class with this macro.
+#define SK_DECLARE_STATIC_MUTEX(name) namespace {} static SkBaseMutex name = SK_BASE_MUTEX_INIT;
+
+struct SkBaseMutex {
+    void acquire() {
+        fSemaphore.wait();
+        SkDEBUGCODE(fOwner = SkGetThreadID();)
+    }
+
+    void release() {
+        this->assertHeld();
+        SkDEBUGCODE(fOwner = kIllegalThreadID;)
+        fSemaphore.signal();
+    }
+
+    void assertHeld() {
+        SkASSERT(fOwner == SkGetThreadID());
+    }
+
+    SkBaseSemaphore fSemaphore;
+    SkDEBUGCODE(SkThreadID fOwner;)
+};
+
+// This needs to use subclassing instead of encapsulation to make SkAutoMutexAcquire to work.
+class SkMutex : public SkBaseMutex {
+public:
+    SkMutex () {
+        fSemaphore = SK_MUTEX_SEMAPHORE_INIT;
+        SkDEBUGCODE(fOwner = kIllegalThreadID);
+    }
+    ~SkMutex () { fSemaphore.deleteSemaphore(); }
+    SkMutex(const SkMutex&) = delete;
+    SkMutex& operator=(const SkMutex&) = delete;
+};
+
+template <typename Lock>
+class SkAutoTAcquire : SkNoncopyable {
+public:
+    explicit SkAutoTAcquire(Lock& mutex) : fMutex(&mutex) {
+        SkASSERT(fMutex != nullptr);
+        mutex.acquire();
+    }
+
+    explicit SkAutoTAcquire(Lock* mutex) : fMutex(mutex) {
+        if (mutex) {
+            mutex->acquire();
+        }
+    }
+
+    /** If the mutex has not been released, release it now. */
+    ~SkAutoTAcquire() {
+        if (fMutex) {
+            fMutex->release();
+        }
+    }
+
+    /** If the mutex has not been released, release it now. */
+    void release() {
+        if (fMutex) {
+            fMutex->release();
+            fMutex = nullptr;
+        }
+    }
+
+    /** Assert that we're holding the mutex. */
+    void assertHeld() {
+        SkASSERT(fMutex);
+        fMutex->assertHeld();
+    }
+
+private:
+    Lock* fMutex;
+};
+
+// SkAutoTExclusive is a lighter weight version of SkAutoTAcquire. It assumes that there is a valid
+// mutex, thus removing the check for the null pointer.
+template <typename Lock>
+class SkAutoTExclusive {
+public:
+    SkAutoTExclusive(Lock& lock) : fLock(lock) { lock.acquire(); }
+    ~SkAutoTExclusive() { fLock.release(); }
+private:
+    Lock &fLock;
+};
+
+typedef SkAutoTAcquire<SkBaseMutex> SkAutoMutexAcquire;
+#define SkAutoMutexAcquire(...) SK_REQUIRE_LOCAL_VAR(SkAutoMutexAcquire)
+
+typedef SkAutoTExclusive<SkBaseMutex> SkAutoMutexExclusive;
+#define SkAutoMutexExclusive(...) SK_REQUIRE_LOCAL_VAR(SkAutoMutexExclusive)
+
+#endif//SkMutex_DEFINED
diff --git a/gfx/skia/skia/include/core/SkOnce.h b/gfx/skia/skia/include/private/SkOnce.h
similarity index 70%
rename from gfx/skia/skia/include/core/SkOnce.h
rename to gfx/skia/skia/include/private/SkOnce.h
index 87bb277800e7..a3ef4d6713ca 100644
--- a/gfx/skia/skia/include/core/SkOnce.h
+++ b/gfx/skia/skia/include/private/SkOnce.h
@@ -27,12 +27,11 @@
 // No matter how many times you call EnsureRegistered(), register_my_stuff will be called just once.
 // OnceTest.cpp also should serve as a few other simple examples.
 
-#include "SkDynamicAnnotations.h"
-#include "SkThread.h"
-#include "SkTypes.h"
+#include "../private/SkAtomics.h"
+#include "../private/SkSpinlock.h"
 
-// This must be used in a global or function scope, not as a class member.
-#define SK_DECLARE_STATIC_ONCE(name) static SkOnceFlag name
+// This must be used in a global scope, not in function scope or as a class member.
+#define SK_DECLARE_STATIC_ONCE(name) namespace {} static SkOnceFlag name
 
 class SkOnceFlag;
 
@@ -55,24 +54,12 @@ class SkOnceFlag {
 public:
     bool* mutableDone() { return &fDone; }
 
-    void acquire() {
-        // To act as a mutex, this needs an acquire barrier on success.
-        // sk_atomic_cas doesn't guarantee this ...
-        while (!sk_atomic_cas(&fSpinlock, 0, 1)) {
-            // spin
-        }
-        // ... so make sure to issue one of our own.
-        SkAssertResult(sk_acquire_load(&fSpinlock));
-    }
-
-    void release() {
-        // To act as a mutex, this needs a release barrier.  sk_atomic_cas guarantees this.
-        SkAssertResult(sk_atomic_cas(&fSpinlock, 1, 0));
-    }
+    void acquire() { fSpinlock.acquire(); }
+    void release() { fSpinlock.release(); }
 
 private:
     bool fDone;
-    int32_t fSpinlock;
+    SkPODSpinlock fSpinlock;
 };
 
 // We've pulled a pretty standard double-checked locking implementation apart
@@ -85,7 +72,7 @@ private:
 template <typename Lock, typename Arg>
 static void sk_once_slow(bool* done, Lock* lock, void (*f)(Arg), Arg arg) {
     lock->acquire();
-    if (!*done) {
+    if (!sk_atomic_load(done, sk_memory_order_relaxed)) {
         f(arg);
         // Also known as a store-store/load-store barrier, this makes sure that the writes
         // done before here---in particular, those done by calling f(arg)---are observable
@@ -104,20 +91,28 @@ static void sk_once_slow(bool* done, Lock* lock, void (*f)(Arg), Arg arg) {
 // This is our fast path, called all the time.  We do really want it to be inlined.
 template <typename Lock, typename Arg>
 inline void SkOnce(bool* done, Lock* lock, void (*f)(Arg), Arg arg) {
-    if (!SK_ANNOTATE_UNPROTECTED_READ(*done)) {
+    // When *done == true:
+    //   Also known as a load-load/load-store barrier, this acquire barrier makes
+    //   sure that anything we read from memory---in particular, memory written by
+    //   calling f(arg)---is at least as current as the value we read from done.
+    //
+    //   In version control terms, this is a lot like saying "sync up to the
+    //   commit where we wrote done = true".
+    //
+    //   The release barrier in sk_once_slow guaranteed that done = true
+    //   happens after f(arg), so by syncing to done = true here we're
+    //   forcing ourselves to also wait until the effects of f(arg) are readble.
+    //
+    // When *done == false:
+    //   We'll try to call f(arg) in sk_once_slow.
+    //   If we get the lock, great, we call f(arg), release true into done, and drop the lock.
+    //   If we race and don't get the lock first, we'll wait for the first guy to finish.
+    //   Then lock acquire() will give us at least an acquire memory barrier to get the same
+    //   effect as the acquire load in the *done == true fast case.  We'll see *done is true,
+    //   then just drop the lock and return.
+    if (!sk_atomic_load(done, sk_memory_order_acquire)) {
         sk_once_slow(done, lock, f, arg);
     }
-    // Also known as a load-load/load-store barrier, this acquire barrier makes
-    // sure that anything we read from memory---in particular, memory written by
-    // calling f(arg)---is at least as current as the value we read from done.
-    //
-    // In version control terms, this is a lot like saying "sync up to the
-    // commit where we wrote done = true".
-    //
-    // The release barrier in sk_once_slow guaranteed that done = true
-    // happens after f(arg), so by syncing to done = true here we're
-    // forcing ourselves to also wait until the effects of f(arg) are readble.
-    SkAssertResult(sk_acquire_load(done));
 }
 
 template <typename Arg>
diff --git a/gfx/skia/skia/include/private/SkOncePtr.h b/gfx/skia/skia/include/private/SkOncePtr.h
new file mode 100644
index 000000000000..261f9a7ef4a9
--- /dev/null
+++ b/gfx/skia/skia/include/private/SkOncePtr.h
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkOncePtr_DEFINED
+#define SkOncePtr_DEFINED
+
+#include "../private/SkAtomics.h"
+#include "SkUniquePtr.h"
+
+template <typename T> class SkBaseOncePtr;
+
+// Use this to create a global static pointer that's intialized exactly once when you call get().
+#define SK_DECLARE_STATIC_ONCE_PTR(type, name) namespace {} static SkBaseOncePtr<type> name;
+
+// Use this for a local or member pointer that's initialized exactly once when you call get().
+template <typename T, typename Delete = skstd::default_delete<T>>
+class SkOncePtr : SkNoncopyable {
+public:
+    SkOncePtr() { sk_bzero(this, sizeof(*this)); }
+    ~SkOncePtr() {
+        if (T* ptr = (T*)*this) {
+            Delete()(ptr);
+        }
+    }
+
+    template <typename F>
+    T* get(const F& f) const {
+        return fOnce.get(f);
+    }
+
+    operator T*() const {
+        return (T*)fOnce;
+    }
+
+private:
+    SkBaseOncePtr<T> fOnce;
+};
+
+// If you ask for SkOncePtr<T[]>, we'll clean up with delete[] by default.
+template <typename T>
+class SkOncePtr<T[]> : public SkOncePtr<T, skstd::default_delete<T[]>> {};
+
+/* TODO(mtklein): in next CL
+typedef SkBaseOncePtr<void> SkOnceFlag;
+#define SK_DECLARE_STATIC_ONCE(name) namespace {} static SkOnceFlag name
+
+template <typename F>
+inline void SkOnce(SkOnceFlag* once, const F& f) {
+    once->get([&]{ f(); return (void*)2; });
+}
+*/
+
+// Implementation details below here!  No peeking!
+
+template <typename T>
+class SkBaseOncePtr {
+public:
+    template <typename F>
+    T* get(const F& f) const {
+        uintptr_t state = sk_atomic_load(&fState, sk_memory_order_acquire);
+        if (state < 2) {
+            if (state == 0) {
+                // It looks like no one has tried to create our pointer yet.
+                // We try to claim that task by atomically swapping our state from '0' to '1'.
+                if (sk_atomic_compare_exchange(
+                    &fState, &state, (uintptr_t)1, sk_memory_order_relaxed, sk_memory_order_relaxed)) {
+                    // We've claimed it.  Create our pointer and store it into fState.
+                    state = (uintptr_t)f();
+                    SkASSERT(state > 1);
+                    sk_atomic_store(&fState, state, sk_memory_order_release);
+                } else {
+                    // Someone else claimed it.
+                    // We fall through to the spin loop just below to wait for them to finish.
+                }
+            }
+
+            while (state == 1) {
+                // State '1' is our busy-but-not-done state.
+                // Some other thread has claimed the job of creating our pointer.
+                // We just need to wait for it to finish.
+                state = sk_atomic_load(&fState, sk_memory_order_acquire);
+            }
+
+            // We shouldn't be able to get here without having created our pointer.
+            SkASSERT(state > 1);
+        }
+        return (T*)state;
+    }
+
+    operator T*() const {
+        auto state = sk_atomic_load(&fState, sk_memory_order_acquire);
+        return state < 2 ? nullptr : (T*)state;
+        // TODO: If state == 1 spin until it's not?
+    }
+
+    // fState == 0 --> we have not created our ptr yet
+    // fState == 1 --> someone is in the middle of creating our ptr
+    // else        --> (T*)fState is our ptr
+    mutable uintptr_t fState;
+};
+
+#endif//SkOncePtr_DEFINED
diff --git a/gfx/skia/skia/include/private/SkRecords.h b/gfx/skia/skia/include/private/SkRecords.h
new file mode 100644
index 000000000000..b856647aeed5
--- /dev/null
+++ b/gfx/skia/skia/include/private/SkRecords.h
@@ -0,0 +1,370 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkRecords_DEFINED
+#define SkRecords_DEFINED
+
+#include "SkCanvas.h"
+#include "SkDrawable.h"
+#include "SkMatrix.h"
+#include "SkPath.h"
+#include "SkPicture.h"
+#include "SkRect.h"
+#include "SkRRect.h"
+#include "SkRSXform.h"
+#include "SkTextBlob.h"
+
+namespace SkRecords {
+
+// A list of all the types of canvas calls we can record.
+// Each of these is reified into a struct below.
+//
+// (We're using the macro-of-macro trick here to do several different things with the same list.)
+//
+// We leave this SK_RECORD_TYPES macro defined for use by code that wants to operate on SkRecords
+// types polymorphically.  (See SkRecord::Record::{visit,mutate} for an example.)
+//
+// Order doesn't technically matter here, but the compiler can generally generate better code if
+// you keep them semantically grouped, especially the Draws.  It's also nice to leave NoOp at 0.
+#define SK_RECORD_TYPES(M)                                          \
+    M(NoOp)                                                         \
+    M(Restore)                                                      \
+    M(Save)                                                         \
+    M(SaveLayer)                                                    \
+    M(SetMatrix)                                                    \
+    M(Concat)                                                       \
+    M(ClipPath)                                                     \
+    M(ClipRRect)                                                    \
+    M(ClipRect)                                                     \
+    M(ClipRegion)                                                   \
+    M(DrawBitmap)                                                   \
+    M(DrawBitmapNine)                                               \
+    M(DrawBitmapRect)                                               \
+    M(DrawBitmapRectFast)                                           \
+    M(DrawBitmapRectFixedSize)                                      \
+    M(DrawDrawable)                                                 \
+    M(DrawImage)                                                    \
+    M(DrawImageRect)                                                \
+    M(DrawImageNine)                                                \
+    M(DrawDRRect)                                                   \
+    M(DrawOval)                                                     \
+    M(DrawPaint)                                                    \
+    M(DrawPath)                                                     \
+    M(DrawPatch)                                                    \
+    M(DrawPicture)                                                  \
+    M(DrawPoints)                                                   \
+    M(DrawPosText)                                                  \
+    M(DrawPosTextH)                                                 \
+    M(DrawText)                                                     \
+    M(DrawTextOnPath)                                               \
+    M(DrawRRect)                                                    \
+    M(DrawRect)                                                     \
+    M(DrawSprite)                                                   \
+    M(DrawTextBlob)                                                 \
+    M(DrawAtlas)                                                    \
+    M(DrawVertices)
+
+// Defines SkRecords::Type, an enum of all record types.
+#define ENUM(T) T##_Type,
+enum Type { SK_RECORD_TYPES(ENUM) };
+#undef ENUM
+
+#define ACT_AS_PTR(ptr)                 \
+    operator T*() const { return ptr; } \
+    T* operator->() const { return ptr; }
+
+template <typename T>
+class RefBox : SkNoncopyable {
+public:
+    RefBox() {}
+    RefBox(T* obj) : fObj(SkSafeRef(obj)) {}
+    RefBox(RefBox&& o) : fObj(o.fObj) {
+        o.fObj = nullptr;
+    }
+    ~RefBox() { SkSafeUnref(fObj); }
+
+    ACT_AS_PTR(fObj);
+
+private:
+    T* fObj;
+};
+
+// An Optional doesn't own the pointer's memory, but may need to destroy non-POD data.
+template <typename T>
+class Optional : SkNoncopyable {
+public:
+    Optional() : fPtr(nullptr) {}
+    Optional(T* ptr) : fPtr(ptr) {}
+    Optional(Optional&& o) : fPtr(o.fPtr) {
+        o.fPtr = nullptr;
+    }
+    ~Optional() { if (fPtr) fPtr->~T(); }
+
+    ACT_AS_PTR(fPtr);
+private:
+    T* fPtr;
+};
+
+// Like Optional, but ptr must not be NULL.
+template <typename T>
+class Adopted : SkNoncopyable {
+public:
+    Adopted(T* ptr) : fPtr(ptr) { SkASSERT(fPtr); }
+    Adopted(Adopted* source) {
+        // Transfer ownership from source to this.
+        fPtr = source->fPtr;
+        source->fPtr = NULL;
+    }
+    ~Adopted() { if (fPtr) fPtr->~T(); }
+
+    ACT_AS_PTR(fPtr);
+private:
+    T* fPtr;
+};
+
+// PODArray doesn't own the pointer's memory, and we assume the data is POD.
+template <typename T>
+class PODArray {
+public:
+    PODArray() {}
+    PODArray(T* ptr) : fPtr(ptr) {}
+    // Default copy and assign.
+
+    ACT_AS_PTR(fPtr);
+private:
+    T* fPtr;
+};
+
+#undef ACT_AS_PTR
+
+// Like SkBitmap, but deep copies pixels if they're not immutable.
+// Using this, we guarantee the immutability of all bitmaps we record.
+class ImmutableBitmap : SkNoncopyable {
+public:
+    ImmutableBitmap() {}
+    ImmutableBitmap(const SkBitmap& bitmap);
+    ImmutableBitmap(ImmutableBitmap&& o) {
+        fBitmap.swap(o.fBitmap);
+    }
+
+    int width()  const { return fBitmap.width();  }
+    int height() const { return fBitmap.height(); }
+
+    // While the pixels are immutable, SkBitmap itself is not thread-safe, so return a copy.
+    SkBitmap shallowCopy() const { return fBitmap; }
+private:
+    SkBitmap fBitmap;
+};
+
+// SkPath::getBounds() isn't thread safe unless we precache the bounds in a singlethreaded context.
+// SkPath::cheapComputeDirection() is similar.
+// Recording is a convenient time to cache these, or we can delay it to between record and playback.
+struct PreCachedPath : public SkPath {
+    PreCachedPath() {}
+    PreCachedPath(const SkPath& path);
+};
+
+// Like SkPath::getBounds(), SkMatrix::getType() isn't thread safe unless we precache it.
+// This may not cover all SkMatrices used by the picture (e.g. some could be hiding in a shader).
+struct TypedMatrix : public SkMatrix {
+    TypedMatrix() {}
+    TypedMatrix(const SkMatrix& matrix);
+};
+
+enum Tags {
+    kDraw_Tag      = 1,   // May draw something (usually named DrawFoo).
+    kHasImage_Tag  = 2,   // Contains an SkImage or SkBitmap.
+    kHasText_Tag   = 4,   // Contains text.
+};
+
+// A macro to make it a little easier to define a struct that can be stored in SkRecord.
+#define RECORD(T, tags, ...)            \
+struct T {                              \
+    static const Type kType = T##_Type; \
+    static const int kTags = tags;      \
+    __VA_ARGS__;                        \
+};
+
+RECORD(NoOp, 0);
+RECORD(Restore, 0,
+        SkIRect devBounds;
+        TypedMatrix matrix);
+RECORD(Save, 0);
+
+RECORD(SaveLayer, 0,
+       Optional<SkRect> bounds;
+       Optional<SkPaint> paint;
+       SkCanvas::SaveFlags flags);
+
+RECORD(SetMatrix, 0,
+        TypedMatrix matrix);
+RECORD(Concat, 0,
+        TypedMatrix matrix);
+
+struct RegionOpAndAA {
+    RegionOpAndAA() {}
+    RegionOpAndAA(SkRegion::Op op, bool aa) : op(op), aa(aa) {}
+    SkRegion::Op op : 31;  // This really only needs to be 3, but there's no win today to do so.
+    unsigned     aa :  1;  // MSVC won't pack an enum with an bool, so we call this an unsigned.
+};
+static_assert(sizeof(RegionOpAndAA) == 4, "RegionOpAndAASize");
+
+RECORD(ClipPath, 0,
+        SkIRect devBounds;
+        PreCachedPath path;
+        RegionOpAndAA opAA);
+RECORD(ClipRRect, 0,
+        SkIRect devBounds;
+        SkRRect rrect;
+        RegionOpAndAA opAA);
+RECORD(ClipRect, 0,
+        SkIRect devBounds;
+        SkRect rect;
+        RegionOpAndAA opAA);
+RECORD(ClipRegion, 0,
+        SkIRect devBounds;
+        SkRegion region;
+        SkRegion::Op op);
+
+// While not strictly required, if you have an SkPaint, it's fastest to put it first.
+RECORD(DrawBitmap, kDraw_Tag|kHasImage_Tag,
+        Optional<SkPaint> paint;
+        ImmutableBitmap bitmap;
+        SkScalar left;
+        SkScalar top);
+RECORD(DrawBitmapNine, kDraw_Tag|kHasImage_Tag,
+        Optional<SkPaint> paint;
+        ImmutableBitmap bitmap;
+        SkIRect center;
+        SkRect dst);
+RECORD(DrawBitmapRect, kDraw_Tag|kHasImage_Tag,
+        Optional<SkPaint> paint;
+        ImmutableBitmap bitmap;
+        Optional<SkRect> src;
+        SkRect dst);
+RECORD(DrawBitmapRectFast, kDraw_Tag|kHasImage_Tag,
+        Optional<SkPaint> paint;
+        ImmutableBitmap bitmap;
+        Optional<SkRect> src;
+        SkRect dst);
+RECORD(DrawBitmapRectFixedSize, kDraw_Tag|kHasImage_Tag,
+        SkPaint paint;
+        ImmutableBitmap bitmap;
+        SkRect src;
+        SkRect dst;
+        SkCanvas::SrcRectConstraint constraint);
+RECORD(DrawDRRect, kDraw_Tag,
+        SkPaint paint;
+        SkRRect outer;
+        SkRRect inner);
+RECORD(DrawDrawable, kDraw_Tag,
+        Optional<SkMatrix> matrix;
+        SkRect worstCaseBounds;
+        int32_t index);
+RECORD(DrawImage, kDraw_Tag|kHasImage_Tag,
+        Optional<SkPaint> paint;
+        RefBox<const SkImage> image;
+        SkScalar left;
+        SkScalar top);
+RECORD(DrawImageRect, kDraw_Tag|kHasImage_Tag,
+        Optional<SkPaint> paint;
+        RefBox<const SkImage> image;
+        Optional<SkRect> src;
+        SkRect dst;
+        SkCanvas::SrcRectConstraint constraint);
+RECORD(DrawImageNine, kDraw_Tag|kHasImage_Tag,
+        Optional<SkPaint> paint;
+        RefBox<const SkImage> image;
+        SkIRect center;
+        SkRect dst);
+RECORD(DrawOval, kDraw_Tag,
+        SkPaint paint;
+        SkRect oval);
+RECORD(DrawPaint, kDraw_Tag,
+        SkPaint paint);
+RECORD(DrawPath, kDraw_Tag,
+        SkPaint paint;
+        PreCachedPath path);
+RECORD(DrawPicture, kDraw_Tag,
+        Optional<SkPaint> paint;
+        RefBox<const SkPicture> picture;
+        TypedMatrix matrix);
+RECORD(DrawPoints, kDraw_Tag,
+        SkPaint paint;
+        SkCanvas::PointMode mode;
+        unsigned count;
+        SkPoint* pts);
+RECORD(DrawPosText, kDraw_Tag|kHasText_Tag,
+        SkPaint paint;
+        PODArray<char> text;
+        size_t byteLength;
+        PODArray<SkPoint> pos);
+RECORD(DrawPosTextH, kDraw_Tag|kHasText_Tag,
+        SkPaint paint;
+        PODArray<char> text;
+        unsigned byteLength;
+        SkScalar y;
+        PODArray<SkScalar> xpos);
+RECORD(DrawRRect, kDraw_Tag,
+        SkPaint paint;
+        SkRRect rrect);
+RECORD(DrawRect, kDraw_Tag,
+        SkPaint paint;
+        SkRect rect);
+RECORD(DrawSprite, kDraw_Tag|kHasImage_Tag,
+        Optional<SkPaint> paint;
+        ImmutableBitmap bitmap;
+        int left;
+        int top);
+RECORD(DrawText, kDraw_Tag|kHasText_Tag,
+        SkPaint paint;
+        PODArray<char> text;
+        size_t byteLength;
+        SkScalar x;
+        SkScalar y);
+RECORD(DrawTextBlob, kDraw_Tag|kHasText_Tag,
+        SkPaint paint;
+        RefBox<const SkTextBlob> blob;
+        SkScalar x;
+        SkScalar y);
+RECORD(DrawTextOnPath, kDraw_Tag|kHasText_Tag,
+        SkPaint paint;
+        PODArray<char> text;
+        size_t byteLength;
+        PreCachedPath path;
+        TypedMatrix matrix);
+RECORD(DrawPatch, kDraw_Tag,
+        SkPaint paint;
+        PODArray<SkPoint> cubics;
+        PODArray<SkColor> colors;
+        PODArray<SkPoint> texCoords;
+        RefBox<SkXfermode> xmode);
+RECORD(DrawAtlas, kDraw_Tag|kHasImage_Tag,
+        Optional<SkPaint> paint;
+        RefBox<const SkImage> atlas;
+        PODArray<SkRSXform> xforms;
+        PODArray<SkRect> texs;
+        PODArray<SkColor> colors;
+        int count;
+        SkXfermode::Mode mode;
+        Optional<SkRect> cull);
+RECORD(DrawVertices, kDraw_Tag,
+        SkPaint paint;
+        SkCanvas::VertexMode vmode;
+        int vertexCount;
+        PODArray<SkPoint> vertices;
+        PODArray<SkPoint> texs;
+        PODArray<SkColor> colors;
+        RefBox<SkXfermode> xmode;
+        PODArray<uint16_t> indices;
+        int indexCount);
+
+#undef RECORD
+
+}  // namespace SkRecords
+
+#endif//SkRecords_DEFINED
diff --git a/gfx/skia/skia/include/private/SkSemaphore.h b/gfx/skia/skia/include/private/SkSemaphore.h
new file mode 100644
index 000000000000..cb2f58da4a27
--- /dev/null
+++ b/gfx/skia/skia/include/private/SkSemaphore.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkSemaphore_DEFINED
+#define SkSemaphore_DEFINED
+
+#include "SkTypes.h"
+#include "../private/SkAtomics.h"
+#include "../private/SkOncePtr.h"
+
+struct SkBaseSemaphore {
+
+    // Increment the counter by 1.
+    // This is a specialization for supporting SkMutex.
+    void signal() {
+        // Since this fetches the value before the add, 0 indicates that this thread is running and
+        // no threads are waiting, -1 and below means that threads are waiting, but only signal 1
+        // thread to run.
+        if (sk_atomic_fetch_add(&fCount, 1, sk_memory_order_release) < 0) {
+           this->osSignal(1);
+        }
+    }
+
+    // Increment the counter N times.
+    // Generally it's better to call signal(N) instead of signal() N times.
+    void signal(int N);
+
+    // Decrement the counter by 1,
+    // then if the counter is <= 0, sleep this thread until the counter is > 0.
+    void wait() {
+        // Since this fetches the value before the subtract, zero and below means that there are no
+        // resources left, so the thread needs to wait.
+        if (sk_atomic_fetch_sub(&fCount, 1, sk_memory_order_acquire) <= 0) {
+            this->osWait();
+        }
+    }
+
+    struct OSSemaphore;
+
+    void osSignal(int n);
+    void osWait();
+    void deleteSemaphore();
+
+    // This implementation follows the general strategy of
+    //     'A Lightweight Semaphore with Partial Spinning'
+    // found here
+    //     http://preshing.com/20150316/semaphores-are-surprisingly-versatile/
+    // That article (and entire blog) are very much worth reading.
+    //
+    // We wrap an OS-provided semaphore with a user-space atomic counter that
+    // lets us avoid interacting with the OS semaphore unless strictly required:
+    // moving the count from >0 to <=0 or vice-versa, i.e. sleeping or waking threads.
+    int                        fCount;
+    SkBaseOncePtr<OSSemaphore> fOSSemaphore;
+};
+
+/**
+ * SkSemaphore is a fast mostly-user-space semaphore.
+ *
+ * A semaphore is logically an atomic integer with a few special properties:
+ *   - The integer always starts at 0.
+ *   - You can only increment or decrement it, never read or write it.
+ *   - Increment is spelled 'signal()'; decrement is spelled 'wait()'.
+ *   - If a call to wait() decrements the counter to <= 0,
+ *     the calling thread sleeps until another thread signal()s it back above 0.
+ */
+class SkSemaphore : SkNoncopyable {
+public:
+    // Initializes the counter to 0.
+    // (Though all current implementations could start from an arbitrary value.)
+    SkSemaphore();
+    ~SkSemaphore();
+
+    void wait();
+
+    void signal(int n = 1);
+
+private:
+    SkBaseSemaphore fBaseSemaphore;
+};
+
+#endif//SkSemaphore_DEFINED
diff --git a/gfx/skia/skia/include/private/SkSpinlock.h b/gfx/skia/skia/include/private/SkSpinlock.h
new file mode 100644
index 000000000000..ef52ab013a0d
--- /dev/null
+++ b/gfx/skia/skia/include/private/SkSpinlock.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+// This file is not part of the public Skia API.
+
+#ifndef SkSpinlock_DEFINED
+#define SkSpinlock_DEFINED
+
+#include "../private/SkAtomics.h"
+
+#define SK_DECLARE_STATIC_SPINLOCK(name) namespace {} static SkPODSpinlock name
+
+// This class has no constructor and must be zero-initialized (the macro above does this).
+class SK_API SkPODSpinlock {
+public:
+    void acquire() {
+        // To act as a mutex, we need an acquire barrier if we take the lock.
+        if (sk_atomic_exchange(&fLocked, true, sk_memory_order_acquire)) {
+            // Lock was contended.  Fall back to an out-of-line spin loop.
+            this->contendedAcquire();
+        }
+    }
+
+    void release() {
+        // To act as a mutex, we need a release barrier.
+        sk_atomic_store(&fLocked, false, sk_memory_order_release);
+    }
+
+private:
+    void contendedAcquire();
+    bool fLocked;
+};
+
+// For non-global-static use cases, this is normally what you want.
+class SkSpinlock : public SkPODSpinlock {
+public:
+    SkSpinlock() { this->release(); }
+};
+
+#endif//SkSpinlock_DEFINED
diff --git a/gfx/skia/skia/include/private/SkTHash.h b/gfx/skia/skia/include/private/SkTHash.h
new file mode 100644
index 000000000000..8a644e3b0197
--- /dev/null
+++ b/gfx/skia/skia/include/private/SkTHash.h
@@ -0,0 +1,301 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkTHash_DEFINED
+#define SkTHash_DEFINED
+
+#include "SkChecksum.h"
+#include "SkTypes.h"
+#include "SkTemplates.h"
+
+// Before trying to use SkTHashTable, look below to see if SkTHashMap or SkTHashSet works for you.
+// They're easier to use, usually perform the same, and have fewer sharp edges.
+
+// T and K are treated as ordinary copyable C++ types.
+// Traits must have:
+//   - static K GetKey(T)
+//   - static uint32_t Hash(K)
+// If the key is large and stored inside T, you may want to make K a const&.
+// Similarly, if T is large you might want it to be a pointer.
+template <typename T, typename K, typename Traits = T>
+class SkTHashTable : SkNoncopyable {
+public:
+    SkTHashTable() : fCount(0), fRemoved(0), fCapacity(0) {}
+
+    // Clear the table.
+    void reset() {
+        this->~SkTHashTable();
+        new (this) SkTHashTable;
+    }
+
+    // How many entries are in the table?
+    int count() const { return fCount; }
+
+    // Approximately how many bytes of memory do we use beyond sizeof(*this)?
+    size_t approxBytesUsed() const { return fCapacity * sizeof(Slot); }
+
+    // !!!!!!!!!!!!!!!!!                 CAUTION                   !!!!!!!!!!!!!!!!!
+    // set(), find() and foreach() all allow mutable access to table entries.
+    // If you change an entry so that it no longer has the same key, all hell
+    // will break loose.  Do not do that!
+    //
+    // Please prefer to use SkTHashMap or SkTHashSet, which do not have this danger.
+
+    // The pointers returned by set() and find() are valid only until the next call to set().
+    // The pointers you receive in foreach() are only valid for its duration.
+
+    // Copy val into the hash table, returning a pointer to the copy now in the table.
+    // If there already is an entry in the table with the same key, we overwrite it.
+    T* set(const T& val) {
+        if (4 * (fCount+fRemoved) >= 3 * fCapacity) {
+            this->resize(fCapacity > 0 ? fCapacity * 2 : 4);
+        }
+        return this->uncheckedSet(val);
+    }
+
+    // If there is an entry in the table with this key, return a pointer to it.  If not, NULL.
+    T* find(const K& key) const {
+        uint32_t hash = Hash(key);
+        int index = hash & (fCapacity-1);
+        for (int n = 0; n < fCapacity; n++) {
+            Slot& s = fSlots[index];
+            if (s.empty()) {
+                return NULL;
+            }
+            if (!s.removed() && hash == s.hash && key == Traits::GetKey(s.val)) {
+                return &s.val;
+            }
+            index = this->next(index, n);
+        }
+        SkASSERT(fCapacity == 0);
+        return NULL;
+    }
+
+    // Remove the value with this key from the hash table.
+    void remove(const K& key) {
+        SkASSERT(this->find(key));
+
+        uint32_t hash = Hash(key);
+        int index = hash & (fCapacity-1);
+        for (int n = 0; n < fCapacity; n++) {
+            Slot& s = fSlots[index];
+            SkASSERT(!s.empty());
+            if (!s.removed() && hash == s.hash && key == Traits::GetKey(s.val)) {
+                fRemoved++;
+                fCount--;
+                s.markRemoved();
+                return;
+            }
+            index = this->next(index, n);
+        }
+        SkASSERT(fCapacity == 0);
+    }
+
+    // Call fn on every entry in the table.  You may mutate the entries, but be very careful.
+    template <typename Fn>  // f(T*)
+    void foreach(Fn&& fn) {
+        for (int i = 0; i < fCapacity; i++) {
+            if (!fSlots[i].empty() && !fSlots[i].removed()) {
+                fn(&fSlots[i].val);
+            }
+        }
+    }
+
+    // Call fn on every entry in the table.  You may not mutate anything.
+    template <typename Fn>  // f(T) or f(const T&)
+    void foreach(Fn&& fn) const {
+        for (int i = 0; i < fCapacity; i++) {
+            if (!fSlots[i].empty() && !fSlots[i].removed()) {
+                fn(fSlots[i].val);
+            }
+        }
+    }
+
+private:
+    T* uncheckedSet(const T& val) {
+        const K& key = Traits::GetKey(val);
+        uint32_t hash = Hash(key);
+        int index = hash & (fCapacity-1);
+        for (int n = 0; n < fCapacity; n++) {
+            Slot& s = fSlots[index];
+            if (s.empty() || s.removed()) {
+                // New entry.
+                if (s.removed()) {
+                    fRemoved--;
+                }
+                s.val  = val;
+                s.hash = hash;
+                fCount++;
+                return &s.val;
+            }
+            if (hash == s.hash && key == Traits::GetKey(s.val)) {
+                // Overwrite previous entry.
+                // Note: this triggers extra copies when adding the same value repeatedly.
+                s.val = val;
+                return &s.val;
+            }
+            index = this->next(index, n);
+        }
+        SkASSERT(false);
+        return NULL;
+    }
+
+    void resize(int capacity) {
+        int oldCapacity = fCapacity;
+        SkDEBUGCODE(int oldCount = fCount);
+
+        fCount = fRemoved = 0;
+        fCapacity = capacity;
+        SkAutoTArray<Slot> oldSlots(capacity);
+        oldSlots.swap(fSlots);
+
+        for (int i = 0; i < oldCapacity; i++) {
+            const Slot& s = oldSlots[i];
+            if (!s.empty() && !s.removed()) {
+                this->uncheckedSet(s.val);
+            }
+        }
+        SkASSERT(fCount == oldCount);
+    }
+
+    int next(int index, int n) const {
+        // A valid strategy explores all slots in [0, fCapacity) as n walks from 0 to fCapacity-1.
+        // Both of these strategies are valid:
+        //return (index + 0 + 1) & (fCapacity-1);      // Linear probing.
+        return (index + n + 1) & (fCapacity-1);        // Quadratic probing.
+    }
+
+    static uint32_t Hash(const K& key) {
+        uint32_t hash = Traits::Hash(key);
+        return hash < 2 ? hash+2 : hash;  // We reserve hash 0 and 1 to mark empty or removed slots.
+    }
+
+    struct Slot {
+        Slot() : hash(0) {}
+        bool   empty() const { return this->hash == 0; }
+        bool removed() const { return this->hash == 1; }
+
+        void markRemoved() { this->hash = 1; }
+
+        T val;
+        uint32_t hash;
+    };
+
+    int fCount, fRemoved, fCapacity;
+    SkAutoTArray<Slot> fSlots;
+};
+
+// Maps K->V.  A more user-friendly wrapper around SkTHashTable, suitable for most use cases.
+// K and V are treated as ordinary copyable C++ types, with no assumed relationship between the two.
+template <typename K, typename V, typename HashK = SkGoodHash>
+class SkTHashMap : SkNoncopyable {
+public:
+    SkTHashMap() {}
+
+    // Clear the map.
+    void reset() { fTable.reset(); }
+
+    // How many key/value pairs are in the table?
+    int count() const { return fTable.count(); }
+
+    // Approximately how many bytes of memory do we use beyond sizeof(*this)?
+    size_t approxBytesUsed() const { return fTable.approxBytesUsed(); }
+
+    // N.B. The pointers returned by set() and find() are valid only until the next call to set().
+
+    // Set key to val in the table, replacing any previous value with the same key.
+    // We copy both key and val, and return a pointer to the value copy now in the table.
+    V* set(const K& key, const V& val) {
+        Pair in = { key, val };
+        Pair* out = fTable.set(in);
+        return &out->val;
+    }
+
+    // If there is key/value entry in the table with this key, return a pointer to the value.
+    // If not, return NULL.
+    V* find(const K& key) const {
+        if (Pair* p = fTable.find(key)) {
+            return &p->val;
+        }
+        return NULL;
+    }
+
+    // Remove the key/value entry in the table with this key.
+    void remove(const K& key) {
+        SkASSERT(this->find(key));
+        fTable.remove(key);
+    }
+
+    // Call fn on every key/value pair in the table.  You may mutate the value but not the key.
+    template <typename Fn>  // f(K, V*) or f(const K&, V*)
+    void foreach(Fn&& fn) {
+        fTable.foreach([&fn](Pair* p){ fn(p->key, &p->val); });
+    }
+
+    // Call fn on every key/value pair in the table.  You may not mutate anything.
+    template <typename Fn>  // f(K, V), f(const K&, V), f(K, const V&) or f(const K&, const V&).
+    void foreach(Fn&& fn) const {
+        fTable.foreach([&fn](const Pair& p){ fn(p.key, p.val); });
+    }
+
+private:
+    struct Pair {
+        K key;
+        V val;
+        static const K& GetKey(const Pair& p) { return p.key; }
+        static uint32_t Hash(const K& key) { return HashK()(key); }
+    };
+
+    SkTHashTable<Pair, K> fTable;
+};
+
+// A set of T.  T is treated as an ordiary copyable C++ type.
+template <typename T, typename HashT = SkGoodHash>
+class SkTHashSet : SkNoncopyable {
+public:
+    SkTHashSet() {}
+
+    // Clear the set.
+    void reset() { fTable.reset(); }
+
+    // How many items are in the set?
+    int count() const { return fTable.count(); }
+
+    // Approximately how many bytes of memory do we use beyond sizeof(*this)?
+    size_t approxBytesUsed() const { return fTable.approxBytesUsed(); }
+
+    // Copy an item into the set.
+    void add(const T& item) { fTable.set(item); }
+
+    // Is this item in the set?
+    bool contains(const T& item) const { return SkToBool(this->find(item)); }
+
+    // If an item equal to this is in the set, return a pointer to it, otherwise null.
+    // This pointer remains valid until the next call to add().
+    const T* find(const T& item) const { return fTable.find(item); }
+
+    // Remove the item in the set equal to this.
+    void remove(const T& item) {
+        SkASSERT(this->contains(item));
+        fTable.remove(item);
+    }
+
+    // Call fn on every item in the set.  You may not mutate anything.
+    template <typename Fn>  // f(T), f(const T&)
+    void foreach (Fn&& fn) const {
+        fTable.foreach(fn);
+    }
+
+private:
+    struct Traits {
+        static const T& GetKey(const T& item) { return item; }
+        static uint32_t Hash(const T& item) { return HashT()(item); }
+    };
+    SkTHashTable<T, T, Traits> fTable;
+};
+
+#endif//SkTHash_DEFINED
diff --git a/gfx/skia/skia/include/private/SkTLogic.h b/gfx/skia/skia/include/private/SkTLogic.h
new file mode 100644
index 000000000000..9c21db675687
--- /dev/null
+++ b/gfx/skia/skia/include/private/SkTLogic.h
@@ -0,0 +1,228 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ *
+ *
+ * This header provides some of the helpers (std::integral_constant) and
+ * type transformations (std::conditional) which will become available with
+ * C++11 in the type_traits header.
+ */
+
+#ifndef SkTLogic_DEFINED
+#define SkTLogic_DEFINED
+
+#include "SkTypes.h"
+
+#include <stddef.h>
+#include <stdint.h>
+
+namespace skstd {
+
+using nullptr_t = decltype(nullptr);
+
+template <typename T, T v> struct integral_constant {
+    static const/*expr*/ T value = v;
+    using value_type = T;
+    using type = integral_constant<T, v>;
+    //constexpr operator value_type() const noexcept { return value; }
+    //constexpr value_type operator()() const noexcept { return value; }
+};
+
+template <bool B> using bool_constant = integral_constant<bool, B>;
+
+using true_type = bool_constant<true>;
+using false_type = bool_constant<false>;
+
+template <bool B, typename T, typename F> struct conditional { using type = T; };
+template <typename T, typename F> struct conditional<false, T, F> { using type = F; };
+template <bool B, typename T, typename F> using conditional_t = typename conditional<B, T, F>::type;
+
+template <bool B, typename T = void> struct enable_if { using type = T; };
+template <typename T> struct enable_if<false, T> {};
+template <bool B, typename T = void> using enable_if_t = typename enable_if<B, T>::type;
+
+template <typename T> struct remove_const { using type = T; };
+template <typename T> struct remove_const<const T> { using type = T; };
+template <typename T> using remove_const_t = typename remove_const<T>::type;
+
+template <typename T> struct remove_volatile { using type = T; };
+template <typename T> struct remove_volatile<volatile T> { using type = T; };
+template <typename T> using remove_volatile_t = typename remove_volatile<T>::type;
+
+template <typename T> struct remove_cv { using type = remove_volatile_t<remove_const_t<T>>; };
+template <typename T> using remove_cv_t = typename remove_cv<T>::type;
+
+template <typename T> struct remove_reference { using type = T; };
+template <typename T> struct remove_reference<T&> { using type = T; };
+template <typename T> struct remove_reference<T&&> { using type = T; };
+template <typename T> using remove_reference_t = typename remove_reference<T>::type;
+
+template <typename T> struct remove_extent { using type = T; };
+template <typename T> struct remove_extent<T[]> { using type = T; };
+template <typename T, size_t N> struct remove_extent<T[N]> { using type = T;};
+template <typename T> using remove_extent_t = typename remove_extent<T>::type;
+
+template <typename T, typename U> struct is_same : false_type {};
+template <typename T> struct is_same<T, T> : true_type {};
+
+template <typename T> struct is_void : is_same<void, remove_cv_t<T>> {};
+
+template <typename T> struct is_const : false_type {};
+template <typename T> struct is_const<const T> : true_type {};
+
+template <typename T> struct is_volatile : false_type {};
+template <typename T> struct is_volatile<volatile T> : true_type {};
+
+template <typename T> struct is_pointer_detector : false_type {};
+template <typename T> struct is_pointer_detector<T*> : true_type {};
+template <typename T> struct is_pointer : is_pointer_detector<remove_cv_t<T>> {};
+
+template <typename T> struct is_reference : false_type {};
+template <typename T> struct is_reference<T&> : true_type {};
+template <typename T> struct is_reference<T&&> : true_type {};
+
+template <typename T> struct is_lvalue_reference : false_type {};
+template <typename T> struct is_lvalue_reference<T&> : true_type {};
+
+template <typename T> struct is_rvalue_reference : false_type {};
+template <typename T> struct is_rvalue_reference<T&&> : true_type {};
+
+template <typename T> struct is_class_detector {
+    using yes_type = uint8_t;
+    using no_type = uint16_t;
+    template <typename U> static yes_type clazz(int U::*);
+    template <typename U> static no_type clazz(...);
+    static const/*expr*/ bool value = sizeof(clazz<T>(0)) == sizeof(yes_type) /*&& !is_union<T>::value*/;
+};
+template <typename T> struct is_class : bool_constant<is_class_detector<T>::value> {};
+
+template <typename T, bool = is_class<T>::value> struct is_empty_detector {
+    struct Derived : public T { char unused; };
+    static const/*expr*/ bool value = sizeof(Derived) == sizeof(char);
+};
+template <typename T> struct is_empty_detector<T, false> {
+    static const/*expr*/ bool value = false;
+};
+template <typename T> struct is_empty : bool_constant<is_empty_detector<T>::value> {};
+
+template <typename T> struct is_array : false_type {};
+template <typename T> struct is_array<T[]> : true_type {};
+template <typename T, size_t N> struct is_array<T[N]> : true_type {};
+
+// template<typename R, typename... Args> struct is_function<
+//     R [calling-convention] (Args...[, ...]) [const] [volatile] [&|&&]> : true_type {};
+// The cv and ref-qualified versions are strange types we're currently avoiding, so not supported.
+// On all platforms, variadic functions only exist in the c calling convention.
+template <typename> struct is_function : false_type { };
+#if !defined(SK_BUILD_FOR_WIN)
+template <typename R, typename... Args> struct is_function<R(Args...)> : true_type {};
+#else
+#if defined(_M_IX86)
+template <typename R, typename... Args> struct is_function<R __cdecl (Args...)> : true_type {};
+template <typename R, typename... Args> struct is_function<R __stdcall (Args...)> : true_type {};
+template <typename R, typename... Args> struct is_function<R __fastcall (Args...)> : true_type {};
+#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
+template <typename R, typename... Args> struct is_function<R __vectorcall (Args...)> : true_type {};
+#endif
+#else
+template <typename R, typename... Args> struct is_function<R __cdecl (Args...)> : true_type {};
+template <typename R, typename... Args> struct is_function<R __vectorcall (Args...)> : true_type {};
+#endif
+#endif
+template <typename R, typename... Args> struct is_function<R(Args..., ...)> : true_type {};
+
+template <typename T> struct add_const { using type = const T; };
+template <typename T> using add_const_t = typename add_const<T>::type;
+
+template <typename T> struct add_volatile { using type = volatile T; };
+template <typename T> using add_volatile_t = typename add_volatile<T>::type;
+
+template <typename T> struct add_cv { using type = add_volatile_t<add_const_t<T>>; };
+template <typename T> using add_cv_t = typename add_cv<T>::type;
+
+template <typename T> struct add_pointer { using type = remove_reference_t<T>*; };
+template <typename T> using add_pointer_t = typename add_pointer<T>::type;
+
+template <typename T, bool=is_void<T>::value> struct add_lvalue_reference_init { using type = T; };
+template <typename T> struct add_lvalue_reference_init<T, false> { using type = T&; };
+template <typename T> struct add_lvalue_reference : add_lvalue_reference_init<T> { };
+template <typename T> using add_lvalue_reference_t = typename add_lvalue_reference<T>::type;
+
+template <typename T, bool=is_void<T>::value> struct add_rvalue_reference_init { using type = T; };
+template <typename T> struct add_rvalue_reference_init<T, false> { using type = T&&; };
+template <typename T> struct add_rvalue_reference : add_rvalue_reference_init<T> {};
+template <typename T> using add_rvalue_reference_t = typename add_rvalue_reference<T>::type;
+
+/* This is 'just' a forward declaration. */
+template <typename T> add_rvalue_reference_t<T> declval() /*noexcept*/;
+
+template <typename S, typename D, bool=is_void<S>::value||is_function<D>::value||is_array<D>::value>
+struct is_convertible_detector {
+    static const/*expr*/ bool value = is_void<D>::value;
+};
+template <typename S, typename D> struct is_convertible_detector<S, D, false> {
+    using yes_type = uint8_t;
+    using no_type = uint16_t;
+
+    template <typename To> static void param_convertable_to(To);
+
+    template <typename From, typename To>
+    static decltype(param_convertable_to<To>(declval<From>()), yes_type()) convertible(int);
+
+    template <typename, typename> static no_type convertible(...);
+
+    static const/*expr*/ bool value = sizeof(convertible<S, D>(0)) == sizeof(yes_type);
+};
+template<typename S, typename D> struct is_convertible
+    : bool_constant<is_convertible_detector<S, D>::value> { };
+
+template <typename T> struct decay {
+    using U = remove_reference_t<T>;
+    using type = conditional_t<is_array<U>::value,
+        remove_extent_t<U>*,
+        conditional_t<is_function<U>::value, add_pointer_t<U>, remove_cv_t<U>>>;
+};
+template <typename T> using decay_t = typename decay<T>::type;
+
+}  // namespace skstd
+
+// The sknonstd namespace contains things we would like to be proposed and feel std-ish.
+namespace sknonstd {
+
+// The name 'copy' here is fraught with peril. In this case it means 'append', not 'overwrite'.
+// Alternate proposed names are 'propagate', 'augment', or 'append' (and 'add', but already taken).
+// std::experimental::propagate_const already exists for other purposes in TSv2.
+// These also follow the <dest, source> pattern used by boost.
+template <typename D, typename S> struct copy_const {
+    using type = skstd::conditional_t<skstd::is_const<S>::value, skstd::add_const_t<D>, D>;
+};
+template <typename D, typename S> using copy_const_t = typename copy_const<D, S>::type;
+
+template <typename D, typename S> struct copy_volatile {
+    using type = skstd::conditional_t<skstd::is_volatile<S>::value, skstd::add_volatile_t<D>, D>;
+};
+template <typename D, typename S> using copy_volatile_t = typename copy_volatile<D, S>::type;
+
+template <typename D, typename S> struct copy_cv {
+    using type = copy_volatile_t<copy_const_t<D, S>, S>;
+};
+template <typename D, typename S> using copy_cv_t = typename copy_cv<D, S>::type;
+
+// The name 'same' here means 'overwrite'.
+// Alternate proposed names are 'replace', 'transfer', or 'qualify_from'.
+// same_xxx<D, S> can be written as copy_xxx<remove_xxx_t<D>, S>
+template <typename D, typename S> using same_const = copy_const<skstd::remove_const_t<D>, S>;
+template <typename D, typename S> using same_const_t = typename same_const<D, S>::type;
+template <typename D, typename S> using same_volatile =copy_volatile<skstd::remove_volatile_t<D>,S>;
+template <typename D, typename S> using same_volatile_t = typename same_volatile<D, S>::type;
+template <typename D, typename S> using same_cv = copy_cv<skstd::remove_cv_t<D>, S>;
+template <typename D, typename S> using same_cv_t = typename same_cv<D, S>::type;
+
+}  // namespace sknonstd
+
+// Just a pithier wrapper for enable_if_t.
+#define SK_WHEN(condition, T) skstd::enable_if_t<!!(condition), T>
+
+#endif
diff --git a/gfx/skia/skia/include/core/SkTemplates.h b/gfx/skia/skia/include/private/SkTemplates.h
similarity index 69%
rename from gfx/skia/skia/include/core/SkTemplates.h
rename to gfx/skia/skia/include/private/SkTemplates.h
index 5d3fa2d10cd2..533cb264d163 100644
--- a/gfx/skia/skia/include/core/SkTemplates.h
+++ b/gfx/skia/skia/include/private/SkTemplates.h
@@ -10,7 +10,11 @@
 #ifndef SkTemplates_DEFINED
 #define SkTemplates_DEFINED
 
+#include "SkMath.h"
+#include "SkTLogic.h"
 #include "SkTypes.h"
+#include "SkUniquePtr.h"
+#include "SkUtility.h"
 #include <limits.h>
 #include <new>
 
@@ -26,27 +30,6 @@
  */
 template<typename T> inline void sk_ignore_unused_variable(const T&) { }
 
-/**
- *  SkTIsConst<T>::value is true if the type T is const.
- *  The type T is constrained not to be an array or reference type.
- */
-template <typename T> struct SkTIsConst {
-    static T* t;
-    static uint16_t test(const volatile void*);
-    static uint32_t test(volatile void *);
-    static const bool value = (sizeof(uint16_t) == sizeof(test(t)));
-};
-
-///@{
-/** SkTConstType<T, CONST>::type will be 'const T' if CONST is true, 'T' otherwise. */
-template <typename T, bool CONST> struct SkTConstType {
-    typedef T type;
-};
-template <typename T> struct SkTConstType<T, true> {
-    typedef const T type;
-};
-///@}
-
 /**
  *  Returns a pointer to a D which comes immediately after S[count].
  */
@@ -58,13 +41,15 @@ template <typename D, typename S> static D* SkTAfter(S* ptr, size_t count = 1) {
  *  Returns a pointer to a D which comes byteOffset bytes after S.
  */
 template <typename D, typename S> static D* SkTAddOffset(S* ptr, size_t byteOffset) {
-    // The intermediate char* has the same const-ness as D as this produces better error messages.
+    // The intermediate char* has the same cv-ness as D as this produces better error messages.
     // This relies on the fact that reinterpret_cast can add constness, but cannot remove it.
-    return reinterpret_cast<D*>(
-        reinterpret_cast<typename SkTConstType<char, SkTIsConst<D>::value>::type*>(ptr) + byteOffset
-    );
+    return reinterpret_cast<D*>(reinterpret_cast<sknonstd::same_cv_t<char, D>*>(ptr) + byteOffset);
 }
 
+template <typename R, typename T, R (*P)(T*)> struct SkFunctionWrapper {
+    R operator()(T* t) { return P(t); }
+};
+
 /** \class SkAutoTCallVProc
 
     Call a function when this goes out of scope. The template uses two
@@ -73,13 +58,13 @@ template <typename D, typename S> static D* SkTAddOffset(S* ptr, size_t byteOffs
     reference is null when the destructor is called, we do not call the
     function.
 */
-template <typename T, void (*P)(T*)> class SkAutoTCallVProc : SkNoncopyable {
+template <typename T, void (*P)(T*)> class SkAutoTCallVProc
+    : public skstd::unique_ptr<T, SkFunctionWrapper<void, T, P>> {
 public:
-    SkAutoTCallVProc(T* obj): fObj(obj) {}
-    ~SkAutoTCallVProc() { if (fObj) P(fObj); }
-    T* detach() { T* obj = fObj; fObj = NULL; return obj; }
-private:
-    T* fObj;
+    SkAutoTCallVProc(T* obj): skstd::unique_ptr<T, SkFunctionWrapper<void, T, P>>(obj) {}
+
+    operator T*() const { return this->get(); }
+    T* detach() { return this->release(); }
 };
 
 /** \class SkAutoTCallIProc
@@ -90,13 +75,13 @@ If detach() is called, the object reference is set to null. If the object
 reference is null when the destructor is called, we do not call the
 function.
 */
-template <typename T, int (*P)(T*)> class SkAutoTCallIProc : SkNoncopyable {
+template <typename T, int (*P)(T*)> class SkAutoTCallIProc
+    : public skstd::unique_ptr<T, SkFunctionWrapper<int, T, P>> {
 public:
-    SkAutoTCallIProc(T* obj): fObj(obj) {}
-    ~SkAutoTCallIProc() { if (fObj) P(fObj); }
-    T* detach() { T* obj = fObj; fObj = NULL; return obj; }
-private:
-    T* fObj;
+    SkAutoTCallIProc(T* obj): skstd::unique_ptr<T, SkFunctionWrapper<int, T, P>>(obj) {}
+
+    operator T*() const { return this->get(); }
+    T* detach() { return this->release(); }
 };
 
 /** \class SkAutoTDelete
@@ -109,85 +94,21 @@ private:
 
   The size of a SkAutoTDelete is small: sizeof(SkAutoTDelete<T>) == sizeof(T*)
 */
-template <typename T> class SkAutoTDelete : SkNoncopyable {
+template <typename T> class SkAutoTDelete : public skstd::unique_ptr<T> {
 public:
-    SkAutoTDelete(T* obj = NULL) : fObj(obj) {}
-    ~SkAutoTDelete() { SkDELETE(fObj); }
+    SkAutoTDelete(T* obj = NULL) : skstd::unique_ptr<T>(obj) {}
 
-    T* get() const { return fObj; }
-    T& operator*() const { SkASSERT(fObj); return *fObj; }
-    T* operator->() const { SkASSERT(fObj); return fObj; }
-
-    void reset(T* obj) {
-        if (fObj != obj) {
-            SkDELETE(fObj);
-            fObj = obj;
-        }
-    }
-
-    /**
-     *  Delete the owned object, setting the internal pointer to NULL.
-     */
-    void free() {
-        SkDELETE(fObj);
-        fObj = NULL;
-    }
-
-    /**
-     *  Transfer ownership of the object to the caller, setting the internal
-     *  pointer to NULL. Note that this differs from get(), which also returns
-     *  the pointer, but it does not transfer ownership.
-     */
-    T* detach() {
-        T* obj = fObj;
-        fObj = NULL;
-        return obj;
-    }
-
-    void swap(SkAutoTDelete* that) {
-        SkTSwap(fObj, that->fObj);
-    }
-
-private:
-    T*  fObj;
+    operator T*() const { return this->get(); }
+    void free() { this->reset(nullptr); }
+    T* detach() { return this->release(); }
 };
 
-// Calls ~T() in the destructor.
-template <typename T> class SkAutoTDestroy : SkNoncopyable {
+template <typename T> class SkAutoTDeleteArray : public skstd::unique_ptr<T[]> {
 public:
-    SkAutoTDestroy(T* obj = NULL) : fObj(obj) {}
-    ~SkAutoTDestroy() {
-        if (NULL != fObj) {
-            fObj->~T();
-        }
-    }
+    SkAutoTDeleteArray(T array[]) : skstd::unique_ptr<T[]>(array) {}
 
-    T* get() const { return fObj; }
-    T& operator*() const { SkASSERT(fObj); return *fObj; }
-    T* operator->() const { SkASSERT(fObj); return fObj; }
-
-private:
-    T*  fObj;
-};
-
-template <typename T> class SkAutoTDeleteArray : SkNoncopyable {
-public:
-    SkAutoTDeleteArray(T array[]) : fArray(array) {}
-    ~SkAutoTDeleteArray() { SkDELETE_ARRAY(fArray); }
-
-    T*      get() const { return fArray; }
-    void    free() { SkDELETE_ARRAY(fArray); fArray = NULL; }
-    T*      detach() { T* array = fArray; fArray = NULL; return array; }
-
-    void reset(T array[]) {
-        if (fArray != array) {
-            SkDELETE_ARRAY(fArray);
-            fArray = array;
-        }
-    }
-
-private:
-    T*  fArray;
+    void free() { this->reset(nullptr); }
+    T* detach() { return this->release(); }
 };
 
 /** Allocate an array of T elements, and free the array in the destructor
@@ -204,7 +125,7 @@ public:
         SkASSERT(count >= 0);
         fArray = NULL;
         if (count) {
-            fArray = SkNEW_ARRAY(T, count);
+            fArray = new T[count];
         }
         SkDEBUGCODE(fCount = count;)
     }
@@ -212,18 +133,16 @@ public:
     /** Reallocates given a new count. Reallocation occurs even if new count equals old count.
      */
     void reset(int count) {
-        SkDELETE_ARRAY(fArray);
+        delete[] fArray;
         SkASSERT(count >= 0);
         fArray = NULL;
         if (count) {
-            fArray = SkNEW_ARRAY(T, count);
+            fArray = new T[count];
         }
         SkDEBUGCODE(fCount = count;)
     }
 
-    ~SkAutoTArray() {
-        SkDELETE_ARRAY(fArray);
-    }
+    ~SkAutoTArray() { delete[] fArray; }
 
     /** Return the array of T elements. Will be NULL if count == 0
      */
@@ -236,6 +155,11 @@ public:
         return fArray[index];
     }
 
+    void swap(SkAutoTArray& other) {
+        SkTSwap(fArray, other.fArray);
+        SkDEBUGCODE(SkTSwap(fCount, other.fCount));
+    }
+
 private:
     T*  fArray;
     SkDEBUGCODE(int fCount;)
@@ -279,7 +203,12 @@ public:
             }
 
             if (count > N) {
-                fArray = (T*) sk_malloc_throw(count * sizeof(T));
+                const uint64_t size64 = sk_64_mul(count, sizeof(T));
+                const size_t size = static_cast<size_t>(size64);
+                if (size != size64) {
+                    sk_out_of_memory();
+                }
+                fArray = (T*) sk_malloc_throw(size);
             } else if (count > 0) {
                 fArray = (T*) fStorage;
             } else {
@@ -292,7 +221,7 @@ public:
         iter = fArray;
         T* stop = fArray + count;
         while (iter < stop) {
-            SkNEW_PLACEMENT(iter++, T);
+            new (iter++) T;
         }
     }
 
@@ -383,17 +312,13 @@ private:
 
 template <size_t N, typename T> class SkAutoSTMalloc : SkNoncopyable {
 public:
-    SkAutoSTMalloc() {
-        fPtr = NULL;
-    }
+    SkAutoSTMalloc() : fPtr(fTStorage) {}
 
     SkAutoSTMalloc(size_t count) {
         if (count > N) {
             fPtr = (T*)sk_malloc_flags(count * sizeof(T), SK_MALLOC_THROW | SK_MALLOC_TEMP);
-        } else if (count) {
-            fPtr = fTStorage;
         } else {
-            fPtr = NULL;
+            fPtr = fTStorage;
         }
     }
 
@@ -409,11 +334,9 @@ public:
             sk_free(fPtr);
         }
         if (count > N) {
-            fPtr = (T*)sk_malloc_flags(count * sizeof(T), SK_MALLOC_THROW | SK_MALLOC_TEMP);
-        } else if (count) {
-            fPtr = fTStorage;
+            fPtr = (T*)sk_malloc_throw(count * sizeof(T));
         } else {
-            fPtr = NULL;
+            fPtr = fTStorage;
         }
         return fPtr;
     }
@@ -436,6 +359,20 @@ public:
         return fPtr[index];
     }
 
+    // Reallocs the array, can be used to shrink the allocation.  Makes no attempt to be intelligent
+    void realloc(size_t count) {
+        if (count > N) {
+            if (fPtr == fTStorage) {
+                fPtr = (T*)sk_malloc_throw(count * sizeof(T));
+                memcpy(fPtr, fTStorage, N * sizeof(T));
+            } else {
+                fPtr = (T*)sk_realloc_throw(fPtr, count * sizeof(T));
+            }
+        } else if (fPtr != fTStorage) {
+            fPtr = (T*)sk_realloc_throw(fPtr, count * sizeof(T));
+        }
+    }
+
 private:
     T*          fPtr;
     union {
@@ -444,13 +381,47 @@ private:
     };
 };
 
+//////////////////////////////////////////////////////////////////////////////////////////////////
+
+/**
+ *  Pass the object and the storage that was offered during SkInPlaceNewCheck, and this will
+ *  safely destroy (and free if it was dynamically allocated) the object.
+ */
+template <typename T> void SkInPlaceDeleteCheck(T* obj, void* storage) {
+    if (storage == obj) {
+        obj->~T();
+    } else {
+        delete obj;
+    }
+}
+
+/**
+ *  Allocates T, using storage if it is large enough, and allocating on the heap (via new) if
+ *  storage is not large enough.
+ *
+ *      obj = SkInPlaceNewCheck<Type>(storage, size);
+ *      ...
+ *      SkInPlaceDeleteCheck(obj, storage);
+ */
+template <typename T> T* SkInPlaceNewCheck(void* storage, size_t size) {
+    return (sizeof(T) <= size) ? new (storage) T : new T;
+}
+
+template <typename T, typename A1, typename A2, typename A3>
+T* SkInPlaceNewCheck(void* storage, size_t size, const A1& a1, const A2& a2, const A3& a3) {
+    return (sizeof(T) <= size) ? new (storage) T(a1, a2, a3) : new T(a1, a2, a3);
+}
+
 /**
  * Reserves memory that is aligned on double and pointer boundaries.
  * Hopefully this is sufficient for all practical purposes.
  */
 template <size_t N> class SkAlignedSStorage : SkNoncopyable {
 public:
+    size_t size() const { return N; }
     void* get() { return fData; }
+    const void* get() const { return fData; }
+
 private:
     union {
         void*   fPtr;
@@ -472,6 +443,7 @@ public:
      * memory. Use placement new for types that require a cons.
      */
     void* get() { return fStorage.get(); }
+    const void* get() const { return fStorage.get(); }
 private:
     SkAlignedSStorage<sizeof(T)*N> fStorage;
 };
diff --git a/gfx/skia/skia/include/private/SkThreadID.h b/gfx/skia/skia/include/private/SkThreadID.h
new file mode 100644
index 000000000000..a210a929f3a9
--- /dev/null
+++ b/gfx/skia/skia/include/private/SkThreadID.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkThreadID_DEFINED
+#define SkThreadID_DEFINED
+
+#include "SkTypes.h"
+
+typedef int64_t SkThreadID;
+
+SkThreadID SkGetThreadID();
+
+const SkThreadID kIllegalThreadID = 0;
+
+#endif  // SkThreadID_DEFINED
diff --git a/gfx/skia/skia/include/private/SkUniquePtr.h b/gfx/skia/skia/include/private/SkUniquePtr.h
new file mode 100644
index 000000000000..289dc7d3448e
--- /dev/null
+++ b/gfx/skia/skia/include/private/SkUniquePtr.h
@@ -0,0 +1,400 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkUniquePtr_DEFINED
+#define SkUniquePtr_DEFINED
+
+#include "SkTLogic.h"
+#include "SkUtility.h"
+
+namespace skstd {
+
+template <typename T> struct default_delete {
+    /*constexpr*/ default_delete() /*noexcept*/ = default;
+
+    template <typename U, typename = enable_if_t<is_convertible<U*, T*>::value>>
+    default_delete(const default_delete<U>&) /*noexcept*/ {}
+
+    void operator()(T* obj) const {
+        static_assert(sizeof(T) > 0, "Deleting pointer to incomplete type!");
+        delete obj;
+    }
+};
+template <typename T> struct default_delete<T[]> {
+    /*constexpr*/ default_delete() /*noexcept*/ = default;
+
+    void operator()(T* obj) const {
+        static_assert(sizeof(T) > 0, "Deleting pointer to incomplete type!");
+        delete [] obj;
+    }
+};
+
+template <typename T, typename D = default_delete<T>> class unique_ptr {
+    // remove_reference_t<D>::pointer if that type exists, otherwise T*.
+    struct pointer_type_detector {
+        template <typename U> static typename U::pointer detector(typename U::pointer*);
+        template <typename U> static T* detector(...);
+        using type = decltype(detector<remove_reference_t<D>>(0));
+    };
+
+public:
+    using pointer = typename pointer_type_detector::type;
+    using element_type = T;
+    using deleter_type = D;
+
+private:
+    template <typename B, bool>
+    struct compressed_base : private B {
+        /*constexpr*/ compressed_base() : B() {}
+        /*constexpr*/ compressed_base(const B& b) : B(b) {}
+        /*constexpr*/ compressed_base(const B&& b) : B(move(b)) {}
+        /*constexpr*/ B& get() /*noexcept*/ { return *this; }
+        /*constexpr*/ B const& get() const /*noexcept*/ { return *this; }
+        void swap(compressed_base&) /*noexcept*/ { }
+    };
+
+    template <typename B> struct compressed_base<B, false> {
+        B fb;
+        /*constexpr*/ compressed_base() : B() {}
+        /*constexpr*/ compressed_base(const B& b) : fb(b) {}
+        /*constexpr*/ compressed_base(const B&& b) : fb(move(b)) {}
+        /*constexpr*/ B& get() /*noexcept*/ { return fb; }
+        /*constexpr*/ B const& get() const /*noexcept*/ { return fb; }
+        void swap(compressed_base& that) /*noexcept*/ { SkTSwap(fb, that.fB); }
+    };
+
+    using compressed_deleter_type = compressed_base<deleter_type, is_empty<deleter_type>::value>;
+
+    struct compressed_data : private compressed_deleter_type {
+        pointer fPtr;
+        /*constexpr*/ compressed_data() : compressed_deleter_type(), fPtr() {}
+        /*constexpr*/ compressed_data(const pointer& ptr, const deleter_type& d)
+            : compressed_deleter_type(d), fPtr(ptr) {}
+        template <typename U1, typename U2, typename = enable_if_t<
+            is_convertible<U1, pointer>::value && is_convertible<U2, deleter_type>::value
+        >> /*constexpr*/ compressed_data(U1&& ptr, U2&& d)
+            : compressed_deleter_type(skstd::forward<U2>(d)), fPtr(skstd::forward<U1>(ptr)) {}
+        /*constexpr*/ pointer& getPointer() /*noexcept*/ { return fPtr; }
+        /*constexpr*/ pointer const& getPointer() const /*noexcept*/ { return fPtr; }
+        /*constexpr*/ deleter_type& getDeleter() /*noexcept*/ {
+            return compressed_deleter_type::get();
+        }
+        /*constexpr*/ deleter_type const& getDeleter() const /*noexcept*/ {
+            return compressed_deleter_type::get();
+        }
+        void swap(compressed_data& that) /*noexcept*/ {
+            compressed_deleter_type::swap(static_cast<compressed_deleter_type>(that));
+            SkTSwap(fPtr, that.fPtr);
+        }
+    };
+    compressed_data data;
+
+public:
+    /*constexpr*/ unique_ptr() /*noexcept*/ : data() {
+        static_assert(!is_pointer<deleter_type>::value, "Deleter is nullptr function pointer!");
+    }
+
+    /*constexpr*/ unique_ptr(skstd::nullptr_t) /*noexcept*/ : unique_ptr() { }
+
+    explicit unique_ptr(pointer ptr) /*noexcept*/ : data(ptr, deleter_type()) {
+        static_assert(!is_pointer<deleter_type>::value, "Deleter is nullptr function pointer!");
+    }
+
+    unique_ptr(pointer ptr,
+               conditional_t<is_reference<deleter_type>::value, deleter_type,const deleter_type&> d)
+    /*noexcept*/ : data(ptr, d)
+    {}
+
+    unique_ptr(pointer ptr, remove_reference_t<deleter_type>&& d) /*noexcept*/
+        : data(move(ptr), move(d))
+    {
+        static_assert(!is_reference<deleter_type>::value,
+            "Binding an rvalue reference deleter as an lvalue reference deleter is not allowed.");
+    }
+
+
+    unique_ptr(unique_ptr&& that) /*noexcept*/
+        : data(that.release(), forward<deleter_type>(that.get_deleter()))
+    {}
+
+    template <typename U, typename ThatD, typename = enable_if_t<
+        is_convertible<typename unique_ptr<U, ThatD>::pointer, pointer>::value &&
+        !is_array<U>::value &&
+        conditional_t<is_reference<D>::value, is_same<ThatD, D>, is_convertible<ThatD, D>>::value>>
+    unique_ptr(unique_ptr<U, ThatD>&& that) /*noexcept*/
+        : data(that.release(), forward<ThatD>(that.get_deleter()))
+    {}
+
+    ~unique_ptr() /*noexcept*/ {
+        pointer& ptr = data.getPointer();
+        if (ptr != nullptr) {
+            get_deleter()(ptr);
+        }
+        ptr = pointer();
+    }
+
+    unique_ptr& operator=(unique_ptr&& that) /*noexcept*/ {
+        reset(that.release());
+        get_deleter() = forward<deleter_type>(that.get_deleter());
+        return *this;
+    }
+
+    template <typename U, typename ThatD> enable_if_t<
+        is_convertible<typename unique_ptr<U, ThatD>::pointer, pointer>::value &&
+        !is_array<U>::value,
+    unique_ptr&> operator=(unique_ptr<U, ThatD>&& that) /*noexcept*/ {
+        reset(that.release());
+        get_deleter() = forward<ThatD>(that.get_deleter());
+        return *this;
+    }
+
+    unique_ptr& operator=(skstd::nullptr_t) /*noexcept*/ {
+        reset();
+        return *this;
+    }
+
+    add_lvalue_reference_t<element_type> operator*() const {
+        SkASSERT(get() != pointer());
+        return *get();
+    }
+
+    pointer operator->() const /*noexcept*/ {
+        SkASSERT(get() != pointer());
+        return get();
+    }
+
+    pointer get() const /*noexcept*/ {
+        return data.getPointer();
+    }
+
+    deleter_type& get_deleter() /*noexcept*/ {
+        return data.getDeleter();
+    }
+
+    const deleter_type& get_deleter() const /*noexcept*/ {
+        return data.getDeleter();
+    }
+
+    //explicit operator bool() const noexcept {
+    bool is_attached() const /*noexcept*/ {
+        return get() == pointer() ? false : true;
+    }
+
+    pointer release() /*noexcept*/ {
+        pointer ptr = get();
+        data.getPointer() = pointer();
+        return ptr;
+    }
+
+    void reset(pointer ptr = pointer()) /*noexcept*/ {
+        SkTSwap(data.getPointer(), ptr);
+        if (ptr != pointer()) {
+            get_deleter()(ptr);
+        }
+    }
+
+    void swap(unique_ptr& that) /*noexcept*/ {
+        SkTSwap(data, that.data);
+    }
+
+    unique_ptr(const unique_ptr&) = delete;
+    unique_ptr& operator=(const unique_ptr&) = delete;
+};
+
+template <typename T, typename D> class unique_ptr<T[], D> {
+    // remove_reference_t<D>::pointer if that type exists, otherwise T*.
+    struct pointer_type_detector {
+        template <typename U> static typename U::pointer detector(typename U::pointer*);
+        template <typename U> static T* detector(...);
+        using type = decltype(detector<remove_reference_t<D>>(0));
+    };
+
+public:
+    using pointer = typename pointer_type_detector::type;
+    using element_type = T;
+    using deleter_type = D;
+
+private:
+    template <typename B, bool>
+    struct compressed_base : private B {
+        /*constexpr*/ compressed_base() : B() {}
+        /*constexpr*/ compressed_base(const B& b) : B(b) {}
+        /*constexpr*/ compressed_base(const B&& b) : B(move(b)) {}
+        /*constexpr*/ B& get() /*noexcept*/ { return *this; }
+        /*constexpr*/ B const& get() const /*noexcept*/ { return *this; }
+        void swap(compressed_base&) /*noexcept*/ { }
+    };
+
+    template <typename B> struct compressed_base<B, false> {
+        B fb;
+        /*constexpr*/ compressed_base() : B() {}
+        /*constexpr*/ compressed_base(const B& b) : fb(b) {}
+        /*constexpr*/ compressed_base(const B&& b) : fb(move(b)) {}
+        /*constexpr*/ B& get() /*noexcept*/ { return fb; }
+        /*constexpr*/ B const& get() const /*noexcept*/ { return fb; }
+        void swap(compressed_base& that) /*noexcept*/ { SkTSwap(fb, that.fB); }
+    };
+
+    using compressed_deleter_type = compressed_base<deleter_type, is_empty<deleter_type>::value>;
+
+    struct compressed_data : private compressed_deleter_type {
+        pointer fPtr;
+        /*constexpr*/ compressed_data() : compressed_deleter_type(), fPtr() {}
+        /*constexpr*/ compressed_data(const pointer& ptr, const deleter_type& d)
+            : compressed_deleter_type(d), fPtr(ptr) {}
+        template <typename U1, typename U2, typename = enable_if_t<
+            is_convertible<U1, pointer>::value && is_convertible<U2, deleter_type>::value
+        >> /*constexpr*/ compressed_data(U1&& ptr, U2&& d)
+            : compressed_deleter_type(skstd::forward<U2>(d)), fPtr(skstd::forward<U1>(ptr)) {}
+        /*constexpr*/ pointer& getPointer() /*noexcept*/ { return fPtr; }
+        /*constexpr*/ pointer const& getPointer() const /*noexcept*/ { return fPtr; }
+        /*constexpr*/ deleter_type& getDeleter() /*noexcept*/ {
+            return compressed_deleter_type::get();
+        }
+        /*constexpr*/ deleter_type const& getDeleter() const /*noexcept*/ {
+            return compressed_deleter_type::get();
+        }
+        void swap(compressed_data& that) /*noexcept*/ {
+            compressed_deleter_type::swap(static_cast<compressed_deleter_type>(that));
+            SkTSwap(fPtr, that.fPtr);
+        }
+    };
+    compressed_data data;
+
+public:
+    /*constexpr*/ unique_ptr() /*noexcept*/ : data() {
+        static_assert(!is_pointer<deleter_type>::value, "Deleter is nullptr function pointer!");
+    }
+
+    /*constexpr*/ unique_ptr(skstd::nullptr_t) /*noexcept*/ : unique_ptr() { }
+
+    explicit unique_ptr(pointer ptr) /*noexcept*/ : data(ptr, deleter_type()) {
+        static_assert(!is_pointer<deleter_type>::value, "Deleter is nullptr function pointer!");
+    }
+
+    unique_ptr(pointer ptr,
+               conditional_t<is_reference<deleter_type>::value, deleter_type,const deleter_type&> d)
+    /*noexcept*/ : data(ptr, d)
+    {}
+
+    unique_ptr(pointer ptr, remove_reference_t<deleter_type>&& d) /*noexcept*/
+        : data(move(ptr), move(d))
+    {
+        static_assert(!is_reference<deleter_type>::value,
+            "Binding an rvalue reference deleter as an lvalue reference deleter is not allowed.");
+    }
+
+    unique_ptr(unique_ptr&& that) /*noexcept*/
+        : data(that.release(), forward<deleter_type>(that.get_deleter()))
+    {}
+
+    ~unique_ptr() {
+        pointer& ptr = data.getPointer();
+        if (ptr != nullptr) {
+          get_deleter()(ptr);
+        }
+        ptr = pointer();
+    }
+
+    unique_ptr& operator=(unique_ptr&& that) /*noexcept*/ {
+        reset(that.release());
+        get_deleter() = forward<deleter_type>(that.get_deleter());
+        return *this;
+    }
+
+    unique_ptr& operator=(skstd::nullptr_t) /*noexcept*/ {
+        reset();
+        return *this;
+    }
+
+    add_lvalue_reference_t<element_type> operator[](size_t i) const {
+        SkASSERT(get() != pointer());
+        return get()[i];
+    }
+
+    pointer get() const /*noexcept*/ {
+        return data.getPointer();
+    }
+
+    deleter_type& get_deleter() /*noexcept*/ {
+        return data.getDeleter();
+    }
+
+    const deleter_type& get_deleter() const /*noexcept*/ {
+        return data.getDeleter();
+    }
+
+    //explicit operator bool() const noexcept {
+    bool is_attached() const /*noexcept*/ {
+        return get() == pointer() ? false : true;
+    }
+
+    pointer release() /*noexcept*/ {
+        pointer ptr = get();
+        data.getPointer() = pointer();
+        return ptr;
+    }
+
+    void reset(pointer ptr = pointer()) /*noexcept*/ {
+        SkTSwap(data.getPointer(), ptr);
+        if (ptr != pointer()) {
+            get_deleter()(ptr);
+        }
+    }
+
+    template <typename U> void reset(U*) = delete;
+
+    void swap(unique_ptr& that) /*noexcept*/ {
+        data.swap(that.data);
+    }
+
+    unique_ptr(const unique_ptr&) = delete;
+    unique_ptr& operator=(const unique_ptr&) = delete;
+};
+
+template <typename T, typename D>
+inline void swap(unique_ptr<T, D>& a, unique_ptr<T, D>& b) /*noexcept*/ {
+    a.swap(b);
+}
+
+template <typename T, typename D, typename U, typename ThatD>
+inline bool operator==(const unique_ptr<T, D>& a, const unique_ptr<U, ThatD>& b) {
+    return a.get() == b.get();
+}
+
+template <typename T, typename D>
+inline bool operator==(const unique_ptr<T, D>& a, skstd::nullptr_t) /*noexcept*/ {
+    //return !a;
+    return !a.is_attached();
+}
+
+template <typename T, typename D>
+inline bool operator==(skstd::nullptr_t, const unique_ptr<T, D>& b) /*noexcept*/ {
+    //return !b;
+    return !b.is_attached();
+}
+
+template <typename T, typename D, typename U, typename ThatD>
+inline bool operator!=(const unique_ptr<T, D>& a, const unique_ptr<U, ThatD>& b) {
+    return a.get() != b.get();
+}
+
+template <typename T, typename D>
+inline bool operator!=(const unique_ptr<T, D>& a, skstd::nullptr_t) /*noexcept*/ {
+    //return (bool)a;
+    return a.is_attached();
+}
+
+template <typename T, typename D>
+inline bool operator!=(skstd::nullptr_t, const unique_ptr<T, D>& b) /*noexcept*/ {
+    //return (bool)b;
+    return b.is_attached();
+}
+
+}  // namespace skstd
+
+#endif
diff --git a/gfx/skia/skia/include/private/SkUtility.h b/gfx/skia/skia/include/private/SkUtility.h
new file mode 100644
index 000000000000..a96e8fe29268
--- /dev/null
+++ b/gfx/skia/skia/include/private/SkUtility.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkUtility_DEFINED
+#define SkUtility_DEFINED
+
+#include "SkTLogic.h"
+
+namespace skstd {
+
+template <typename T> inline remove_reference_t<T>&& move(T&& t) {
+  return static_cast<remove_reference_t<T>&&>(t);
+}
+
+template <typename T> inline T&& forward(remove_reference_t<T>& t) /*noexcept*/ {
+    return static_cast<T&&>(t);
+}
+template <typename T> inline T&& forward(remove_reference_t<T>&& t) /*noexcept*/ {
+    static_assert(!is_lvalue_reference<T>::value,
+                  "Forwarding an rvalue reference as an lvalue reference is not allowed.");
+    return static_cast<T&&>(t);
+}
+
+template <typename T> add_rvalue_reference_t<T> declval();
+
+}  // namespace skstd
+
+#endif
diff --git a/gfx/skia/skia/include/core/SkWeakRefCnt.h b/gfx/skia/skia/include/private/SkWeakRefCnt.h
similarity index 97%
rename from gfx/skia/skia/include/core/SkWeakRefCnt.h
rename to gfx/skia/skia/include/private/SkWeakRefCnt.h
index 210dcc9f1c7b..1a78ba509231 100644
--- a/gfx/skia/skia/include/core/SkWeakRefCnt.h
+++ b/gfx/skia/skia/include/private/SkWeakRefCnt.h
@@ -9,7 +9,7 @@
 #define SkWeakRefCnt_DEFINED
 
 #include "SkRefCnt.h"
-#include "SkThread.h"
+#include "../private/SkAtomics.h"
 
 /** \class SkWeakRefCnt
 
@@ -51,8 +51,6 @@
 */
 class SK_API SkWeakRefCnt : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkWeakRefCnt)
-
     /** Default construct, initializing the reference counts to 1.
         The strong references collectively hold one weak reference. When the
         strong reference count goes to zero, the collectively held weak
@@ -147,7 +145,7 @@ private:
         on the object and releases the implicit weak reference held
         collectively by the strong references.
     */
-    virtual void internal_dispose() const SK_OVERRIDE {
+    void internal_dispose() const override {
         weak_dispose();
         weak_unref();
     }
diff --git a/gfx/skia/skia/include/record/SkRecording.h b/gfx/skia/skia/include/record/SkRecording.h
deleted file mode 100644
index a4e8809c3a3f..000000000000
--- a/gfx/skia/skia/include/record/SkRecording.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkRecording_DEFINED
-#define SkRecording_DEFINED
-
-#include "SkCanvas.h"     // SkCanvas
-#include "SkRefCnt.h"     // SkAutoTUnref
-#include "SkTemplates.h"  // SkAutoTDelete
-#include "SkTypes.h"      // SkNoncopyable
-
-// These are intentionally left opaque.
-class SkRecord;
-class SkRecorder;
-
-namespace EXPERIMENTAL {
-
-/** Easy mode interface to SkRecord-based SkCanvas recording.
- *
- *  scoped_ptr<SkRecording> recording(new SkRecording(1920, 1080));
- *  skia::RefPtr<SkCanvas> canvas(skia::SharePtr(recording->canvas()));
- *
- *  canvas->drawThis();
- *  canvas->clipThat();
- *  ...
- *
- *  canvas.clear();  // You must deref the canvas before you may call releasePlayback().
- *  scoped_ptr<const SkPlayback> playback(recording->releasePlayback());
- *  playback->draw(&someCanvas);
- *  playback->draw(&someOtherCanvas);
- *
- *  SkPlayback is thread safe; SkRecording is not.
- */
-
-class SK_API SkPlayback : SkNoncopyable {
-public:
-    // Remember, if you've got an SkPlayback*, you probably own it.  Don't forget to delete it!
-    ~SkPlayback();
-
-    // Draw recorded commands into a canvas.
-    void draw(SkCanvas*) const;
-
-private:
-    explicit SkPlayback(const SkRecord*);
-
-    SkAutoTDelete<const SkRecord> fRecord;
-
-    friend class SkRecording;
-};
-
-class SK_API SkRecording : SkNoncopyable {
-public:
-    SkRecording(int width, int height);
-    ~SkRecording();
-
-    // Draws issued to this canvas will be replayed by SkPlayback::draw().
-    // Any refs held on canvas() must be dropped before you may call releasePlayback().
-    SkCanvas* canvas();
-
-    // Release exclusive ownership of an SkPlayback to the caller.
-    // Any refs held on canvas() must be dropped before you may call releasePlayback().
-    SkPlayback* releasePlayback();
-
-private:
-    SkAutoTDelete<SkRecord> fRecord;
-    SkAutoTUnref<SkRecorder> fRecorder;
-};
-
-}  // namespace EXPERIMENTAL
-
-#endif//SkRecording_DEFINED
diff --git a/gfx/skia/skia/include/svg/SkSVGCanvas.h b/gfx/skia/skia/include/svg/SkSVGCanvas.h
new file mode 100644
index 000000000000..e285faa45960
--- /dev/null
+++ b/gfx/skia/skia/include/svg/SkSVGCanvas.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkSVGCanvas_DEFINED
+#define SkSVGCanvas_DEFINED
+
+#include "SkCanvas.h"
+
+class SkXMLWriter;
+
+class SK_API SkSVGCanvas {
+public:
+    /**
+     *  Returns a new canvas that will generate SVG commands from its draw calls, and send
+     *  them to the provided xmlwriter. Ownership of the xmlwriter is not transfered to the canvas,
+     *  but it must stay valid during the lifetime of the returned canvas.
+     *
+     *  The canvas may buffer some drawing calls, so the output is not guaranteed to be valid
+     *  or complete until the canvas instance is deleted.
+     *
+     *  The 'bounds' parameter defines an initial SVG viewport (viewBox attribute on the root
+     *  SVG element).
+     */
+    static SkCanvas* Create(const SkRect& bounds, SkXMLWriter*);
+};
+
+#endif
diff --git a/gfx/skia/skia/include/svg/SkSVGAttribute.h b/gfx/skia/skia/include/svg/parser/SkSVGAttribute.h
similarity index 86%
rename from gfx/skia/skia/include/svg/SkSVGAttribute.h
rename to gfx/skia/skia/include/svg/parser/SkSVGAttribute.h
index 940ca5a95143..5ba2916b7426 100644
--- a/gfx/skia/skia/include/svg/SkSVGAttribute.h
+++ b/gfx/skia/skia/include/svg/parser/SkSVGAttribute.h
@@ -20,7 +20,8 @@ struct SkSVGAttribute {
 };
 
 #ifndef SK_OFFSETOF
-#define SK_OFFSETOF(a, b) (((size_t) (&(((a*) 1)->b)))-1)
+    // This is offsetof for types which are not standard layout.
+    #define SK_OFFSETOF(type, field) (size_t)((char*)&(((type*)1024)->field) - (char*)1024)
 #endif
 
 #ifdef SK_DEBUG
diff --git a/gfx/skia/skia/include/svg/SkSVGBase.h b/gfx/skia/skia/include/svg/parser/SkSVGBase.h
similarity index 100%
rename from gfx/skia/skia/include/svg/SkSVGBase.h
rename to gfx/skia/skia/include/svg/parser/SkSVGBase.h
diff --git a/gfx/skia/skia/include/svg/SkSVGPaintState.h b/gfx/skia/skia/include/svg/parser/SkSVGPaintState.h
similarity index 100%
rename from gfx/skia/skia/include/svg/SkSVGPaintState.h
rename to gfx/skia/skia/include/svg/parser/SkSVGPaintState.h
diff --git a/gfx/skia/skia/include/svg/SkSVGParser.h b/gfx/skia/skia/include/svg/parser/SkSVGParser.h
similarity index 99%
rename from gfx/skia/skia/include/svg/SkSVGParser.h
rename to gfx/skia/skia/include/svg/parser/SkSVGParser.h
index c2f9112e641b..bb3ab9051787 100644
--- a/gfx/skia/skia/include/svg/SkSVGParser.h
+++ b/gfx/skia/skia/include/svg/parser/SkSVGParser.h
@@ -12,7 +12,6 @@
 
 #include "SkMatrix.h"
 #include "SkTDict.h"
-#include "SkTDStack.h"
 #include "SkSVGPaintState.h"
 #include "SkSVGTypes.h"
 #include "SkStream.h"
diff --git a/gfx/skia/skia/include/svg/SkSVGTypes.h b/gfx/skia/skia/include/svg/parser/SkSVGTypes.h
similarity index 100%
rename from gfx/skia/skia/include/svg/SkSVGTypes.h
rename to gfx/skia/skia/include/svg/parser/SkSVGTypes.h
diff --git a/gfx/skia/skia/include/utils/SkBoundaryPatch.h b/gfx/skia/skia/include/utils/SkBoundaryPatch.h
index cf001d5ba831..f8edd594b951 100644
--- a/gfx/skia/skia/include/utils/SkBoundaryPatch.h
+++ b/gfx/skia/skia/include/utils/SkBoundaryPatch.h
@@ -13,7 +13,7 @@
 
 class SkBoundary : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkBoundary)
+    
 
     // These must be 0, 1, 2, 3 for efficiency in the subclass implementations
     enum Edge {
diff --git a/gfx/skia/skia/include/utils/SkCamera.h b/gfx/skia/skia/include/utils/SkCamera.h
index b515be9c6cfe..4b77ec685d38 100644
--- a/gfx/skia/skia/include/utils/SkCamera.h
+++ b/gfx/skia/skia/include/utils/SkCamera.h
@@ -84,8 +84,8 @@ public:
     }
 
     // deprecated, but still here for animator (for now)
-    void rotate(SkScalar x, SkScalar y, SkScalar z) {}
-    void rotateDegrees(SkScalar x, SkScalar y, SkScalar z) {}
+    void rotate(SkScalar /*x*/, SkScalar /*y*/, SkScalar /*z*/) {}
+    void rotateDegrees(SkScalar /*x*/, SkScalar /*y*/, SkScalar /*z*/) {}
 
 private:
 public: // make public for SkDraw3D for now
diff --git a/gfx/skia/skia/include/utils/SkCanvasStateUtils.h b/gfx/skia/skia/include/utils/SkCanvasStateUtils.h
index 6ea7b1030743..3071c7547ce7 100644
--- a/gfx/skia/skia/include/utils/SkCanvasStateUtils.h
+++ b/gfx/skia/skia/include/utils/SkCanvasStateUtils.h
@@ -27,7 +27,8 @@ class SkCanvasState;
  * ReleaseCanvasState(...)      |||
  *
  */
-namespace SkCanvasStateUtils {
+class SK_API SkCanvasStateUtils {
+public:
     /**
      * Captures the current state of the canvas into an opaque ptr that is safe
      * to pass to a different instance of Skia (which may be the same version,
@@ -47,7 +48,7 @@ namespace SkCanvasStateUtils {
      *         to reconstruct the canvas. The caller is responsible for calling
      *         ReleaseCanvasState to free the memory associated with this state.
      */
-    SK_API SkCanvasState* CaptureCanvasState(SkCanvas* canvas);
+    static SkCanvasState* CaptureCanvasState(SkCanvas* canvas);
 
     /**
      * Create a new SkCanvas from the captured state of another SkCanvas. The
@@ -61,7 +62,7 @@ namespace SkCanvasStateUtils {
      *         identical to the captured canvas. The caller is responsible for
      *         calling unref on the SkCanvas.
      */
-    SK_API SkCanvas* CreateFromCanvasState(const SkCanvasState* state);
+    static SkCanvas* CreateFromCanvasState(const SkCanvasState* state);
 
     /**
      * Free the memory associated with the captured canvas state.  The state
@@ -71,7 +72,7 @@ namespace SkCanvasStateUtils {
      *
      * @param state The captured state you wish to dispose of.
      */
-    SK_API void ReleaseCanvasState(SkCanvasState* state);
+    static void ReleaseCanvasState(SkCanvasState* state);
 };
 
 #endif
diff --git a/gfx/skia/skia/include/utils/SkCondVar.h b/gfx/skia/skia/include/utils/SkCondVar.h
deleted file mode 100644
index 6f18e1a651df..000000000000
--- a/gfx/skia/skia/include/utils/SkCondVar.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkCondVar_DEFINED
-#define SkCondVar_DEFINED
-
-/**
- * Import any thread model setting from configuration files.
- */
-#include "SkTypes.h"
-
-#ifdef SK_USE_POSIX_THREADS
-#include <pthread.h>
-#elif defined(SK_BUILD_FOR_WIN32)
-#include <windows.h>
-#else
-/**
- * Warn if the implementation of this class is empty, i.e. thread safety is not working.
- */
-#warning "Thread safety class SkCondVar has no implementation!"
-#endif
-
-/**
- * Condition variable for blocking access to shared data from other threads and
- * controlling which threads are awake.
- *
- * Currently only supported on platforms with posix threads and Windows Vista and
- * above.
- */
-class SkCondVar {
-public:
-    SkCondVar();
-    ~SkCondVar();
-
-    /**
-     * Lock a mutex. Must be done before calling the other functions on this object.
-     */
-    void lock();
-
-    /**
-     * Unlock the mutex.
-     */
-    void unlock();
-
-    /**
-     * Pause the calling thread. Will be awoken when signal() or broadcast() is called.
-     * Must be called while lock() is held (but gives it up while waiting). Once awoken,
-     * the calling thread will hold the lock once again.
-     */
-    void wait();
-
-    /**
-     * Wake one thread waiting on this condition. Must be called while lock()
-     * is held.
-     */
-    void signal();
-
-    /**
-     * Wake all threads waiting on this condition. Must be called while lock()
-     * is held.
-     */
-    void broadcast();
-
-private:
-#ifdef SK_USE_POSIX_THREADS
-    pthread_mutex_t  fMutex;
-    pthread_cond_t   fCond;
-#elif defined(SK_BUILD_FOR_WIN32)
-    CRITICAL_SECTION   fCriticalSection;
-    CONDITION_VARIABLE fCondition;
-#endif
-};
-
-#endif
diff --git a/gfx/skia/skia/include/utils/SkDebugUtils.h b/gfx/skia/skia/include/utils/SkDebugUtils.h
index 2fa6d4131399..00ed41fecd12 100644
--- a/gfx/skia/skia/include/utils/SkDebugUtils.h
+++ b/gfx/skia/skia/include/utils/SkDebugUtils.h
@@ -23,7 +23,7 @@ inline void SkDebugDumpMathematica( const T val ) {
 
 template<class T>
 inline void SkDebugDumpMathematica(const char *name, const T *array, int size) {
-    SkDebugf(name);
+    SkDebugf("%s", name);
     SkDebugf(" = {");
     for (int i=0 ; i < size ; i++) {
         SkDebugDumpMathematica<T>(array[i]);
@@ -34,7 +34,7 @@ inline void SkDebugDumpMathematica(const char *name, const T *array, int size) {
 
 template<class T>
 inline void SkDebugDumpMathematica(const char *name, const T *array, int width, int height) {
-    SkDebugf(name);
+    SkDebugf("%s", name);
     SkDebugf(" = {\n");
     for (int i=0 ; i < height ; i++) {
         SkDebugf("  {");
@@ -54,7 +54,7 @@ inline void SkDebugDumpMathematica(const char *name, const T *array, int width,
 
 template<class T>
 inline void SkDebugDumpMathematica( const char *name, const T val ) {
-    SkDebugf(name);
+    SkDebugf("%s", name);
     SkDebugf(" = ");
     SkDebugDumpMathematica<T>(val);
     SkDebugf(";\n");
@@ -81,7 +81,7 @@ inline void SkDebugDumpMathematica<size_t>( const size_t val ) {
 }
 
 template<>
-void SkDebugDumpMathematica<const char *>( const char * val ) {
+inline void SkDebugDumpMathematica<const char *>( const char * val ) {
     SkDebugf("%s", val);
 }
 
diff --git a/gfx/skia/skia/include/utils/SkDeferredCanvas.h b/gfx/skia/skia/include/utils/SkDeferredCanvas.h
deleted file mode 100644
index 0e2ed45c5ab3..000000000000
--- a/gfx/skia/skia/include/utils/SkDeferredCanvas.h
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkDeferredCanvas_DEFINED
-#define SkDeferredCanvas_DEFINED
-
-#include "SkCanvas.h"
-#include "SkPixelRef.h"
-
-class SkDeferredDevice;
-class SkImage;
-class SkSurface;
-
-/** \class SkDeferredCanvas
-    Subclass of SkCanvas that encapsulates an SkPicture or SkGPipe for deferred
-    drawing. The main difference between this class and SkPictureRecord (the
-    canvas provided by SkPicture) is that this is a full drop-in replacement
-    for SkCanvas, while SkPictureRecord only supports draw operations.
-    SkDeferredCanvas will transparently trigger the flushing of deferred
-    draw operations when an attempt is made to access the pixel data.
-*/
-class SK_API SkDeferredCanvas : public SkCanvas {
-public:
-    class SK_API NotificationClient;
-
-    /** Construct a canvas with the specified surface to draw into.
-        This factory must be used for newImageSnapshot to work.
-        @param surface Specifies a surface for the canvas to draw into.
-     */
-    static SkDeferredCanvas* Create(SkSurface* surface);
-
-//    static SkDeferredCanvas* Create(SkBaseDevice* device);
-
-    virtual ~SkDeferredCanvas();
-
-    /**
-     *  Specify the surface to be used by this canvas. Calling setSurface will
-     *  release the previously set surface or device. Takes a reference on the
-     *  surface.
-     *
-     *  @param surface The surface that the canvas will raw into
-     *  @return The surface argument, for convenience.
-     */
-    SkSurface* setSurface(SkSurface* surface);
-
-    /**
-     *  Specify a NotificationClient to be used by this canvas. Calling
-     *  setNotificationClient will release the previously set
-     *  NotificationClient, if any. SkDeferredCanvas does not take ownership
-     *  of the notification client.  Therefore user code is resposible
-     *  for its destruction.  The notification client must be unregistered
-     *  by calling setNotificationClient(NULL) if it is destroyed before
-     *  this canvas.
-     *  Note: Must be called after the device is set with setDevice.
-     *
-     *  @param notificationClient interface for dispatching notifications
-     *  @return The notificationClient argument, for convenience.
-     */
-    NotificationClient* setNotificationClient(NotificationClient* notificationClient);
-
-    /**
-     *  Enable or disable deferred drawing. When deferral is disabled,
-     *  pending draw operations are immediately flushed and from then on,
-     *  the SkDeferredCanvas behaves just like a regular SkCanvas.
-     *  This method must not be called while the save/restore stack is in use.
-     *  @param deferred true/false
-     */
-    void setDeferredDrawing(bool deferred);
-
-    /**
-     *  Returns true if deferred drawing is currenlty enabled.
-     */
-    bool isDeferredDrawing() const;
-
-    /**
-     *  Returns true if the canvas contains a fresh frame.  A frame is
-     *  considered fresh when its content do not depend on the contents
-     *  of the previous frame. For example, if a canvas is cleared before
-     *  drawing each frame, the frames will all be considered fresh.
-     *  A frame is defined as the graphics image produced by as a result
-     *  of all the canvas draws operation executed between two successive
-     *  calls to isFreshFrame.  The result of isFreshFrame is computed
-     *  conservatively, so it may report false negatives.
-     */
-    bool isFreshFrame() const;
-
-    /**
-     *  Returns true if the canvas has recorded draw commands that have
-     *  not yet been played back.
-     */
-    bool hasPendingCommands() const;
-
-    /**
-     *  Flushes pending draw commands, if any, and returns an image of the
-     *  current state of the surface pixels up to this point. Subsequent
-     *  changes to the surface (by drawing into its canvas) will not be
-     *  reflected in this image.  Will return NULL if the deferred canvas
-     *  was not constructed from an SkSurface.
-     */
-    SkImage* newImageSnapshot();
-
-    /**
-     *  Specify the maximum number of bytes to be allocated for the purpose
-     *  of recording draw commands to this canvas.  The default limit, is
-     *  64MB.
-     *  @param maxStorage The maximum number of bytes to be allocated.
-     */
-    void setMaxRecordingStorage(size_t maxStorage);
-
-    /**
-     *  Returns the number of bytes currently allocated for the purpose of
-     *  recording draw commands.
-     */
-    size_t storageAllocatedForRecording() const;
-
-    /**
-     * Attempt to reduce the storage allocated for recording by evicting
-     * cache resources.
-     * @param bytesToFree minimum number of bytes that should be attempted to
-     *   be freed.
-     * @return number of bytes actually freed.
-     */
-    size_t freeMemoryIfPossible(size_t bytesToFree);
-
-    /**
-     * Specifies the maximum size (in bytes) allowed for a given image to be
-     * rendered using the deferred canvas.
-     */
-    void setBitmapSizeThreshold(size_t sizeThreshold);
-    size_t getBitmapSizeThreshold() const { return fBitmapSizeThreshold; }
-
-    /**
-     * Executes all pending commands without drawing
-     */
-    void silentFlush();
-
-    // Overrides of the SkCanvas interface
-    virtual bool isDrawingToLayer() const SK_OVERRIDE;
-    virtual void clear(SkColor) SK_OVERRIDE;
-    virtual void drawPaint(const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawPoints(PointMode mode, size_t count, const SkPoint pts[],
-                            const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawOval(const SkRect&, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawRect(const SkRect& rect, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawRRect(const SkRRect&, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawPath(const SkPath& path, const SkPaint& paint)
-                          SK_OVERRIDE;
-    virtual void drawBitmap(const SkBitmap& bitmap, SkScalar left,
-                            SkScalar top, const SkPaint* paint)
-                            SK_OVERRIDE;
-    virtual void drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src,
-                                      const SkRect& dst, const SkPaint* paint,
-                                      DrawBitmapRectFlags flags) SK_OVERRIDE;
-
-    virtual void drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m,
-                                  const SkPaint* paint) SK_OVERRIDE;
-    virtual void drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
-                                const SkRect& dst, const SkPaint* paint)
-                                SK_OVERRIDE;
-    virtual void drawSprite(const SkBitmap& bitmap, int left, int top,
-                            const SkPaint* paint) SK_OVERRIDE;
-    virtual void drawVertices(VertexMode vmode, int vertexCount,
-                              const SkPoint vertices[], const SkPoint texs[],
-                              const SkColor colors[], SkXfermode* xmode,
-                              const uint16_t indices[], int indexCount,
-                              const SkPaint& paint) SK_OVERRIDE;
-    virtual SkDrawFilter* setDrawFilter(SkDrawFilter* filter) SK_OVERRIDE;
-
-protected:
-    virtual void willSave() SK_OVERRIDE;
-    virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE;
-    virtual void willRestore() SK_OVERRIDE;
-
-    virtual void didConcat(const SkMatrix&) SK_OVERRIDE;
-    virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE;
-
-    virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE;
-    virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
-                            const SkPaint&) SK_OVERRIDE;
-    virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
-                               const SkPaint&) SK_OVERRIDE;
-    virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
-                                SkScalar constY, const SkPaint&) SK_OVERRIDE;
-    virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
-                                  const SkMatrix* matrix, const SkPaint&) SK_OVERRIDE;
-
-    virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE;
-
-    virtual void onDrawPicture(const SkPicture* picture) SK_OVERRIDE;
-
-public:
-    class NotificationClient {
-    public:
-        virtual ~NotificationClient() {}
-
-        /**
-         *  Called before executing one or several draw commands, which means
-         *  once per flush when deferred rendering is enabled.
-         */
-        virtual void prepareForDraw() {}
-
-        /**
-         *  Called after a recording a draw command if additional memory
-         *  had to be allocated for recording.
-         *  @param newAllocatedStorage same value as would be returned by
-         *      storageAllocatedForRecording(), for convenience.
-         */
-        virtual void storageAllocatedForRecordingChanged(
-            size_t newAllocatedStorage) {}
-
-        /**
-         *  Called after pending draw commands have been flushed
-         */
-        virtual void flushedDrawCommands() {}
-
-        /**
-         *  Called after pending draw commands have been skipped, meaning
-         *  that they were optimized-out because the canvas is cleared
-         *  or completely overwritten by the command currently being recorded.
-         */
-        virtual void skippedPendingDrawCommands() {}
-    };
-
-protected:
-    virtual SkCanvas* canvasForDrawIter();
-    SkDeferredDevice* getDeferredDevice() const;
-
-private:
-    SkDeferredCanvas(SkDeferredDevice*);
-
-    void recordedDrawCommand();
-    SkCanvas* drawingCanvas() const;
-    SkCanvas* immediateCanvas() const;
-    bool isFullFrame(const SkRect*, const SkPaint*) const;
-    void validate() const;
-    void init();
-
-    size_t fBitmapSizeThreshold;
-    bool   fDeferredDrawing;
-
-    friend class SkDeferredCanvasTester; // for unit testing
-    typedef SkCanvas INHERITED;
-};
-
-
-#endif
diff --git a/gfx/skia/skia/include/utils/SkDumpCanvas.h b/gfx/skia/skia/include/utils/SkDumpCanvas.h
index 91d698fa3838..b853ba686b0f 100644
--- a/gfx/skia/skia/include/utils/SkDumpCanvas.h
+++ b/gfx/skia/skia/include/utils/SkDumpCanvas.h
@@ -46,11 +46,8 @@ public:
         kDrawText_Verb,
         kDrawPicture_Verb,
         kDrawVertices_Verb,
-        kDrawData_Verb,
-
-        kBeginCommentGroup_Verb,
-        kAddComment_Verb,
-        kEndCommentGroup_Verb,
+        kDrawPatch_Verb,
+        kDrawData_Verb, // obsolete
 
         kCull_Verb
     };
@@ -60,7 +57,7 @@ public:
      */
     class Dumper : public SkRefCnt {
     public:
-        SK_DECLARE_INST_COUNT(Dumper)
+        
 
         virtual void dump(SkDumpCanvas*, SkDumpCanvas::Verb, const char str[],
                           const SkPaint*) = 0;
@@ -74,58 +71,56 @@ public:
 
     int getNestLevel() const { return fNestLevel; }
 
-    virtual void drawPaint(const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawPoints(PointMode mode, size_t count, const SkPoint pts[],
-                            const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawOval(const SkRect&, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawRect(const SkRect&, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawRRect(const SkRRect&, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawPath(const SkPath& path, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top,
-                            const SkPaint* paint) SK_OVERRIDE;
-    virtual void drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src,
-                                      const SkRect& dst, const SkPaint* paint,
-                                      DrawBitmapRectFlags flags) SK_OVERRIDE;
-    virtual void drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m,
-                                  const SkPaint* paint) SK_OVERRIDE;
-    virtual void drawSprite(const SkBitmap& bitmap, int left, int top,
-                            const SkPaint* paint) SK_OVERRIDE;
-    virtual void drawVertices(VertexMode vmode, int vertexCount,
-                              const SkPoint vertices[], const SkPoint texs[],
-                              const SkColor colors[], SkXfermode* xmode,
-                              const uint16_t indices[], int indexCount,
-                              const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawData(const void*, size_t) SK_OVERRIDE;
-    virtual void beginCommentGroup(const char* description) SK_OVERRIDE;
-    virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE;
-    virtual void endCommentGroup() SK_OVERRIDE;
-
 protected:
-    virtual void willSave() SK_OVERRIDE;
-    virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE;
-    virtual void willRestore() SK_OVERRIDE;
+    void willSave() override;
+    SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) override;
+    void willRestore() override;
 
-    virtual void didConcat(const SkMatrix&) SK_OVERRIDE;
-    virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE;
+    void didConcat(const SkMatrix&) override;
+    void didSetMatrix(const SkMatrix&) override;
 
-    virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE;
+    void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override;
     virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
-                            const SkPaint&) SK_OVERRIDE;
+                            const SkPaint&) override;
     virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
-                               const SkPaint&) SK_OVERRIDE;
+                               const SkPaint&) override;
     virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
-                                SkScalar constY, const SkPaint&) SK_OVERRIDE;
+                                SkScalar constY, const SkPaint&) override;
     virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
-                                  const SkMatrix* matrix, const SkPaint&) SK_OVERRIDE;
-    virtual void onPushCull(const SkRect& cullRect) SK_OVERRIDE;
-    virtual void onPopCull() SK_OVERRIDE;
+                                  const SkMatrix* matrix, const SkPaint&) override;
+    virtual void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
+                                const SkPaint& paint) override;
+    virtual void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
+                             const SkPoint texCoords[4], SkXfermode* xmode,
+                             const SkPaint& paint) override;
 
-    virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE;
+    void onDrawPaint(const SkPaint&) override;
+    void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override;
+    void onDrawRect(const SkRect&, const SkPaint&) override;
+    void onDrawOval(const SkRect&, const SkPaint&) override;
+    void onDrawRRect(const SkRRect&, const SkPaint&) override;
+    void onDrawPath(const SkPath&, const SkPaint&) override;
+    void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) override;
+    void onDrawBitmapRect(const SkBitmap&, const SkRect* src, const SkRect& dst, const SkPaint*,
+                          SrcRectConstraint) override;
+    void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) override;
+    void onDrawImageRect(const SkImage*, const SkRect* src, const SkRect& dst,
+                         const SkPaint*, SrcRectConstraint) override;
+    void onDrawBitmapNine(const SkBitmap&, const SkIRect& center, const SkRect& dst,
+                          const SkPaint*) override;
+    void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) override;
+    void onDrawVertices(VertexMode vmode, int vertexCount,
+                        const SkPoint vertices[], const SkPoint texs[],
+                        const SkColor colors[], SkXfermode* xmode,
+                        const uint16_t indices[], int indexCount,
+                        const SkPaint&) override;
 
-    virtual void onDrawPicture(const SkPicture*) SK_OVERRIDE;
+    void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) override;
+    void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) override;
+    void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) override;
+    void onClipRegion(const SkRegion&, SkRegion::Op) override;
+
+    void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
 
     static const char* EdgeStyleToAAString(ClipEdgeStyle edgeStyle);
 
@@ -148,7 +143,7 @@ public:
     // override from baseclass that does the formatting, and in turn calls
     // the function pointer that was passed to the constructor
     virtual void dump(SkDumpCanvas*, SkDumpCanvas::Verb, const char str[],
-                      const SkPaint*) SK_OVERRIDE;
+                      const SkPaint*) override;
 
 private:
     void (*fProc)(const char*, void*);
diff --git a/gfx/skia/skia/include/utils/SkEventTracer.h b/gfx/skia/skia/include/utils/SkEventTracer.h
index 8d9fd11f6479..f4f8676a748e 100644
--- a/gfx/skia/skia/include/utils/SkEventTracer.h
+++ b/gfx/skia/skia/include/utils/SkEventTracer.h
@@ -29,10 +29,7 @@ public:
 
     static SkEventTracer* GetInstance();
 
-    static void SetInstance(SkEventTracer* tracer) {
-        SkDELETE(SkEventTracer::gInstance);
-        SkEventTracer::gInstance = tracer;
-    }
+    static void SetInstance(SkEventTracer*);
 
     virtual ~SkEventTracer() { }
 
@@ -68,8 +65,6 @@ public:
         updateTraceEventDuration(const uint8_t* categoryEnabledFlag,
                                  const char* name,
                                  SkEventTracer::Handle handle) = 0;
-private:
-    static SkEventTracer *gInstance;
 };
 
 #endif // SkEventTracer_DEFINED
diff --git a/gfx/skia/skia/include/utils/SkFrontBufferedStream.h b/gfx/skia/skia/include/utils/SkFrontBufferedStream.h
index 68d9861557f6..bfc2728ef0d9 100644
--- a/gfx/skia/skia/include/utils/SkFrontBufferedStream.h
+++ b/gfx/skia/skia/include/utils/SkFrontBufferedStream.h
@@ -26,10 +26,12 @@ public:
      *  @param stream SkStream to buffer. If stream is NULL, NULL is
      *      returned. When this call succeeds (i.e. returns non NULL),
      *      SkFrontBufferedStream is expected to be the only owner of
-     *      stream, so it should be unreffed and no longer used directly.
+     *      stream, so it should no be longer used directly.
+     *      SkFrontBufferedStream will delete stream upon deletion.
      *  @param minBufferSize Minimum size of buffer required.
      *  @return An SkStream that can buffer at least minBufferSize, or
-     *      NULL on failure.
+     *      NULL on failure. The caller is required to delete when finished with
+     *      this object.
      */
     static SkStreamRewindable* Create(SkStream* stream, size_t minBufferSize);
 };
diff --git a/gfx/skia/skia/include/utils/SkJSONCPP.h b/gfx/skia/skia/include/utils/SkJSONCPP.h
index de827687e0f6..6baf223610d6 100644
--- a/gfx/skia/skia/include/utils/SkJSONCPP.h
+++ b/gfx/skia/skia/include/utils/SkJSONCPP.h
@@ -10,18 +10,24 @@
 #ifndef SkJSONCPP_DEFINED
 #define SkJSONCPP_DEFINED
 
-#ifdef SK_BUILD_FOR_WIN
-    // json includes xlocale which generates warning 4530 because we're
-    // compiling without exceptions;
-    // see https://code.google.com/p/skia/issues/detail?id=1067
-    #pragma warning(push)
-    #pragma warning(disable : 4530)
-#endif
-#include "json/reader.h"
-#include "json/value.h"
-#include "json/writer.h"
-#ifdef SK_BUILD_FOR_WIN
-    #pragma warning(pop)
+#ifdef GOOGLE3
+    #include "third_party/jsoncpp/reader.h"
+    #include "third_party/jsoncpp/value.h"
+    #include "third_party/jsoncpp/writer.h"
+#else
+    #ifdef SK_BUILD_FOR_WIN
+        // json includes xlocale which generates warning 4530 because we're
+        // compiling without exceptions;
+        // see https://code.google.com/p/skia/issues/detail?id=1067
+        #pragma warning(push)
+        #pragma warning(disable : 4530)
+    #endif
+    #include "json/reader.h"
+    #include "json/value.h"
+    #include "json/writer.h"
+    #ifdef SK_BUILD_FOR_WIN
+        #pragma warning(pop)
+    #endif
 #endif
 
 #endif // SkJSONCPP_DEFINED
diff --git a/gfx/skia/skia/include/utils/SkLayer.h b/gfx/skia/skia/include/utils/SkLayer.h
index 70fa01bfe7bc..7fdc6b2208fa 100644
--- a/gfx/skia/skia/include/utils/SkLayer.h
+++ b/gfx/skia/skia/include/utils/SkLayer.h
@@ -23,7 +23,7 @@ class SkCanvas;
 class SkLayer : public SkRefCnt {
 
 public:
-    SK_DECLARE_INST_COUNT(SkLayer)
+    
 
     SkLayer();
     SkLayer(const SkLayer&);
diff --git a/gfx/skia/skia/include/utils/SkLua.h b/gfx/skia/skia/include/utils/SkLua.h
index a7fceaaa8137..ad6f996ac3fe 100644
--- a/gfx/skia/skia/include/utils/SkLua.h
+++ b/gfx/skia/skia/include/utils/SkLua.h
@@ -22,6 +22,7 @@ class SkPaint;
 class SkPath;
 struct SkRect;
 class SkRRect;
+class SkTextBlob;
 
 #define SkScalarToLua(x)    SkScalarToDouble(x)
 #define SkLuaToScalar(x)    SkDoubleToScalar(x)
@@ -60,6 +61,7 @@ public:
     void pushCanvas(SkCanvas*, const char tableKey[] = NULL);
     void pushClipStack(const SkClipStack&, const char tableKey[] = NULL);
     void pushClipStackElement(const SkClipStack::Element& element, const char tableKey[] = NULL);
+    void pushTextBlob(const SkTextBlob*, const char tableKey[] = NULL);
 
     // This SkCanvas lua methods is declared here to benefit from SkLua's friendship with SkCanvas.
     static int lcanvas_getReducedClipStack(lua_State* L);
diff --git a/gfx/skia/skia/include/utils/SkLuaCanvas.h b/gfx/skia/skia/include/utils/SkLuaCanvas.h
index 5d8a9734581b..f07af0695bf9 100644
--- a/gfx/skia/skia/include/utils/SkLuaCanvas.h
+++ b/gfx/skia/skia/include/utils/SkLuaCanvas.h
@@ -20,53 +20,53 @@ public:
     SkLuaCanvas(int width, int height, lua_State*, const char function[]);
     virtual ~SkLuaCanvas();
 
-    virtual void drawPaint(const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawPoints(PointMode mode, size_t count, const SkPoint pts[],
-                            const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawOval(const SkRect&, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawRect(const SkRect&, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawRRect(const SkRRect&, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawPath(const SkPath& path, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top,
-                            const SkPaint* paint) SK_OVERRIDE;
-    virtual void drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src,
-                                      const SkRect& dst, const SkPaint* paint,
-                                      DrawBitmapRectFlags flags) SK_OVERRIDE;
-    virtual void drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m,
-                                  const SkPaint* paint) SK_OVERRIDE;
-    virtual void drawSprite(const SkBitmap& bitmap, int left, int top,
-                            const SkPaint* paint) SK_OVERRIDE;
-    virtual void drawVertices(VertexMode vmode, int vertexCount,
-                              const SkPoint vertices[], const SkPoint texs[],
-                              const SkColor colors[], SkXfermode* xmode,
-                              const uint16_t indices[], int indexCount,
-                              const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawData(const void* data, size_t length) SK_OVERRIDE;
-
 protected:
-    virtual void willSave() SK_OVERRIDE;
-    virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE;
-    virtual void willRestore() SK_OVERRIDE;
+    void willSave() override;
+    SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) override;
+    void willRestore() override;
 
-    virtual void didConcat(const SkMatrix&) SK_OVERRIDE;
-    virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE;
+    void didConcat(const SkMatrix&) override;
+    void didSetMatrix(const SkMatrix&) override;
 
-    virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE;
+    void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override;
     virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
-                            const SkPaint&) SK_OVERRIDE;
+                            const SkPaint&) override;
     virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
-                               const SkPaint&) SK_OVERRIDE;
+                               const SkPaint&) override;
     virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
-                                SkScalar constY, const SkPaint&) SK_OVERRIDE;
+                                SkScalar constY, const SkPaint&) override;
     virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
-                                  const SkMatrix* matrix, const SkPaint&) SK_OVERRIDE;
+                                  const SkMatrix* matrix, const SkPaint&) override;
+    virtual void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
+                                const SkPaint& paint) override;
 
-    virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE;
+    void onDrawPaint(const SkPaint&) override;
+    void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override;
+    void onDrawRect(const SkRect&, const SkPaint&) override;
+    void onDrawOval(const SkRect&, const SkPaint&) override;
+    void onDrawRRect(const SkRRect&, const SkPaint&) override;
+    void onDrawPath(const SkPath&, const SkPaint&) override;
+    void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) override;
+    void onDrawBitmapRect(const SkBitmap&, const SkRect* src, const SkRect& dst, const SkPaint*,
+                          SrcRectConstraint) override;
+    void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) override;
+    void onDrawImageRect(const SkImage*, const SkRect* src, const SkRect& dst,
+                         const SkPaint*, SrcRectConstraint) override;
+    void onDrawBitmapNine(const SkBitmap&, const SkIRect& center, const SkRect& dst,
+                          const SkPaint*) override;
+    void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) override;
+    void onDrawVertices(VertexMode vmode, int vertexCount,
+                        const SkPoint vertices[], const SkPoint texs[],
+                        const SkColor colors[], SkXfermode* xmode,
+                        const uint16_t indices[], int indexCount,
+                        const SkPaint&) override;
 
-    virtual void onDrawPicture(const SkPicture*) SK_OVERRIDE;
+    void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) override;
+    void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) override;
+    void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) override;
+    void onClipRegion(const SkRegion&, SkRegion::Op) override;
+
+    void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
 
 private:
     lua_State*  fL;
diff --git a/gfx/skia/skia/include/utils/SkMatrix44.h b/gfx/skia/skia/include/utils/SkMatrix44.h
index 26247a01e99c..2a698f52a23f 100644
--- a/gfx/skia/skia/include/utils/SkMatrix44.h
+++ b/gfx/skia/skia/include/utils/SkMatrix44.h
@@ -29,7 +29,20 @@
     static inline double SkMScalarToDouble(double x) {
         return x;
     }
+    static inline double SkMScalarAbs(double x) {
+        return fabs(x);
+    }
     static const SkMScalar SK_MScalarPI = 3.141592653589793;
+
+    #define SkMScalarFloor(x)           sk_double_floor(x)
+    #define SkMScalarCeil(x)            sk_double_ceil(x)
+    #define SkMScalarRound(x)           sk_double_round(x)
+
+    #define SkMScalarFloorToInt(x)      sk_double_floor2int(x)
+    #define SkMScalarCeilToInt(x)       sk_double_ceil2int(x)
+    #define SkMScalarRoundToInt(x)      sk_double_round2int(x)
+
+
 #elif defined SK_MSCALAR_IS_FLOAT
 #ifdef SK_MSCALAR_IS_DOUBLE
     #error "can't define MSCALAR both as DOUBLE and FLOAT"
@@ -48,11 +61,25 @@
     static inline double SkMScalarToDouble(float x) {
         return static_cast<double>(x);
     }
+    static inline float SkMScalarAbs(float x) {
+        return sk_float_abs(x);
+    }
     static const SkMScalar SK_MScalarPI = 3.14159265f;
+
+    #define SkMScalarFloor(x)           sk_float_floor(x)
+    #define SkMScalarCeil(x)            sk_float_ceil(x)
+    #define SkMScalarRound(x)           sk_float_round(x)
+
+    #define SkMScalarFloorToInt(x)      sk_float_floor2int(x)
+    #define SkMScalarCeilToInt(x)       sk_float_ceil2int(x)
+    #define SkMScalarRoundToInt(x)      sk_float_round2int(x)
+
 #endif
 
-#define SkMScalarToScalar SkMScalarToFloat
-#define SkScalarToMScalar SkFloatToMScalar
+#define SkIntToMScalar(n)       static_cast<SkMScalar>(n)
+
+#define SkMScalarToScalar(x)    SkMScalarToFloat(x)
+#define SkScalarToMScalar(x)    SkFloatToMScalar(x)
 
 static const SkMScalar SK_MScalar1 = 1;
 
@@ -198,6 +225,17 @@ public:
         return !(this->getType() & ~(kScale_Mask | kTranslate_Mask));
     }
 
+    /**
+     *  Returns true if the matrix only contains scale or is identity.
+     */
+    inline bool isScale() const {
+            return !(this->getType() & ~kScale_Mask);
+    }
+
+    inline bool hasPerspective() const {
+        return SkToBool(this->getType() & kPerspective_Mask);
+    }
+
     void setIdentity();
     inline void reset() { this->setIdentity();}
 
@@ -320,7 +358,8 @@ public:
     }
 
     /** If this is invertible, return that in inverse and return true. If it is
-        not invertible, return false and ignore the inverse parameter.
+        not invertible, return false and leave the inverse parameter in an
+        unspecified state.
      */
     bool invert(SkMatrix44* inverse) const;
 
@@ -373,6 +412,18 @@ public:
     void map2(const float src2[], int count, float dst4[]) const;
     void map2(const double src2[], int count, double dst4[]) const;
 
+    /** Returns true if transformating an axis-aligned square in 2d by this matrix
+        will produce another 2d axis-aligned square; typically means the matrix
+        is a scale with perhaps a 90-degree rotation. A 3d rotation through 90
+        degrees into a perpendicular plane collapses a square to a line, but
+        is still considered to be axis-aligned.
+
+        By default, tolerates very slight error due to float imprecisions;
+        a 90-degree rotation can still end up with 10^-17 of
+        "non-axis-aligned" result.
+     */
+    bool preserves2dAxisAlignment(SkMScalar epsilon = SK_ScalarNearlyZero) const;
+
     void dump() const;
 
     double determinant() const;
diff --git a/gfx/skia/skia/include/utils/SkNWayCanvas.h b/gfx/skia/skia/include/utils/SkNWayCanvas.h
index aabf27436c30..a60836be5743 100644
--- a/gfx/skia/skia/include/utils/SkNWayCanvas.h
+++ b/gfx/skia/skia/include/utils/SkNWayCanvas.h
@@ -10,6 +10,7 @@
 #define SkNWayCanvas_DEFINED
 
 #include "SkCanvas.h"
+#include "SkTDArray.h"
 
 class SK_API SkNWayCanvas : public SkCanvas {
 public:
@@ -23,65 +24,60 @@ public:
     ///////////////////////////////////////////////////////////////////////////
     // These are forwarded to the N canvases we're referencing
 
-    virtual void clear(SkColor) SK_OVERRIDE;
-    virtual void drawPaint(const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawPoints(PointMode mode, size_t count, const SkPoint pts[],
-                            const SkPaint&) SK_OVERRIDE;
-    virtual void drawRect(const SkRect&, const SkPaint&) SK_OVERRIDE;
-    virtual void drawOval(const SkRect&, const SkPaint&) SK_OVERRIDE;
-    virtual void drawRRect(const SkRRect&, const SkPaint&) SK_OVERRIDE;
-    virtual void drawPath(const SkPath& path, const SkPaint&) SK_OVERRIDE;
-    virtual void drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top,
-                            const SkPaint*) SK_OVERRIDE;
-    virtual void drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src,
-                                      const SkRect& dst, const SkPaint* paint,
-                                      DrawBitmapRectFlags flags) SK_OVERRIDE;
-    virtual void drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m,
-                                  const SkPaint*) SK_OVERRIDE;
-    virtual void drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
-                                const SkRect& dst,
-                                const SkPaint* paint = NULL) SK_OVERRIDE;
-    virtual void drawSprite(const SkBitmap& bitmap, int left, int top,
-                            const SkPaint*) SK_OVERRIDE;
-    virtual void drawVertices(VertexMode vmode, int vertexCount,
-                              const SkPoint vertices[], const SkPoint texs[],
-                              const SkColor colors[], SkXfermode* xmode,
-                              const uint16_t indices[], int indexCount,
-                              const SkPaint&) SK_OVERRIDE;
-    virtual void drawData(const void* data, size_t length) SK_OVERRIDE;
-
-    virtual SkDrawFilter* setDrawFilter(SkDrawFilter*) SK_OVERRIDE;
-
-    virtual void beginCommentGroup(const char* description) SK_OVERRIDE;
-    virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE;
-    virtual void endCommentGroup() SK_OVERRIDE;
+    SkDrawFilter* setDrawFilter(SkDrawFilter*) override;
 
 protected:
     SkTDArray<SkCanvas*> fList;
 
-    virtual void willSave() SK_OVERRIDE;
-    virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE;
-    virtual void willRestore() SK_OVERRIDE;
+    void willSave() override;
+    SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) override;
+    void willRestore() override;
 
-    virtual void didConcat(const SkMatrix&) SK_OVERRIDE;
-    virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE;
+    void didConcat(const SkMatrix&) override;
+    void didSetMatrix(const SkMatrix&) override;
 
-    virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE;
+    void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override;
     virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
-                            const SkPaint&) SK_OVERRIDE;
+                            const SkPaint&) override;
     virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
-                               const SkPaint&) SK_OVERRIDE;
+                               const SkPaint&) override;
     virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
-                                SkScalar constY, const SkPaint&) SK_OVERRIDE;
+                                SkScalar constY, const SkPaint&) override;
     virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
-                                  const SkMatrix* matrix, const SkPaint&) SK_OVERRIDE;
+                                  const SkMatrix* matrix, const SkPaint&) override;
+    virtual void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
+                                const SkPaint& paint) override;
+    virtual void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
+                             const SkPoint texCoords[4], SkXfermode* xmode,
+                             const SkPaint& paint) override;
 
-    virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE;
+    void onDrawPaint(const SkPaint&) override;
+    void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override;
+    void onDrawRect(const SkRect&, const SkPaint&) override;
+    void onDrawOval(const SkRect&, const SkPaint&) override;
+    void onDrawRRect(const SkRRect&, const SkPaint&) override;
+    void onDrawPath(const SkPath&, const SkPaint&) override;
+    void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) override;
+    void onDrawBitmapRect(const SkBitmap&, const SkRect* src, const SkRect& dst, const SkPaint*,
+                          SrcRectConstraint) override;
+    void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) override;
+    void onDrawImageRect(const SkImage*, const SkRect* src, const SkRect& dst,
+                         const SkPaint*, SrcRectConstraint) override;
+    void onDrawBitmapNine(const SkBitmap&, const SkIRect& center, const SkRect& dst,
+                          const SkPaint*) override;
+    void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) override;
+    void onDrawVertices(VertexMode vmode, int vertexCount,
+                              const SkPoint vertices[], const SkPoint texs[],
+                              const SkColor colors[], SkXfermode* xmode,
+                              const uint16_t indices[], int indexCount,
+                              const SkPaint&) override;
 
-    virtual void onDrawPicture(const SkPicture*) SK_OVERRIDE;
+    void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) override;
+    void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) override;
+    void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) override;
+    void onClipRegion(const SkRegion&, SkRegion::Op) override;
+
+    void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
 
     class Iter;
 
diff --git a/gfx/skia/skia/include/utils/SkNoSaveLayerCanvas.h b/gfx/skia/skia/include/utils/SkNoSaveLayerCanvas.h
index 686f179901d6..0cebefff18b8 100644
--- a/gfx/skia/skia/include/utils/SkNoSaveLayerCanvas.h
+++ b/gfx/skia/skia/include/utils/SkNoSaveLayerCanvas.h
@@ -16,30 +16,17 @@
 // It also simplifies the clipping calls to only use rectangles.
 class SK_API SkNoSaveLayerCanvas : public SkCanvas {
 public:
-    SkNoSaveLayerCanvas(SkBaseDevice* device) : INHERITED(device) {}
+    SkNoSaveLayerCanvas(SkBaseDevice* device)
+        : INHERITED(device, kConservativeRasterClip_InitFlag)
+    {}
 
 protected:
     virtual SaveLayerStrategy willSaveLayer(const SkRect* bounds, const SkPaint* paint,
-                                            SaveFlags flags) SK_OVERRIDE {
+                                            SaveFlags flags) override {
         this->INHERITED::willSaveLayer(bounds, paint, flags);
         return kNoLayer_SaveLayerStrategy;
     }
 
-    // disable aa for speed
-    virtual void onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle) SK_OVERRIDE {
-        this->INHERITED::onClipRect(rect, op, kHard_ClipEdgeStyle);
-    }
-
-    // for speed, just respect the bounds, and disable AA. May give us a few
-    // false positives and negatives.
-    virtual void onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle) SK_OVERRIDE {
-        this->updateClipConservativelyUsingBounds(path.getBounds(), op,
-                                                  path.isInverseFillType());
-    }
-    virtual void onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle) SK_OVERRIDE {
-        this->updateClipConservativelyUsingBounds(rrect.getBounds(), op, false);
-    }
-
 private:
     typedef SkCanvas INHERITED;
 };
diff --git a/gfx/skia/skia/include/utils/SkPaintFilterCanvas.h b/gfx/skia/skia/include/utils/SkPaintFilterCanvas.h
new file mode 100644
index 000000000000..d693758797ce
--- /dev/null
+++ b/gfx/skia/skia/include/utils/SkPaintFilterCanvas.h
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPaintFilterCanvas_DEFINED
+#define SkPaintFilterCanvas_DEFINED
+
+#include "SkNWayCanvas.h"
+
+/** \class SkPaintFilterCanvas
+
+    A utility proxy base class for implementing paint filters.
+*/
+class SK_API SkPaintFilterCanvas : public SkNWayCanvas {
+public:
+    /**
+     * DEPRECATED: use the variant below.
+     */
+    SkPaintFilterCanvas(int width, int height);
+
+    /**
+     * The new SkPaintFilterCanvas is configured for forwarding to the
+     * specified canvas.  Also copies the target canvas matrix and clip bounds.
+     */
+    SkPaintFilterCanvas(SkCanvas* canvas);
+
+    enum Type {
+        kPaint_Type,
+        kPoint_Type,
+        kBitmap_Type,
+        kRect_Type,
+        kRRect_Type,
+        kDRRect_Type,
+        kOval_Type,
+        kPath_Type,
+        kPicture_Type,
+        kText_Type,
+        kTextBlob_Type,
+        kVertices_Type,
+        kPatch_Type,
+
+        kTypeCount
+    };
+
+protected:
+    /**
+     *  Called with the paint that will be used to draw the specified type.
+     *  The implementation may modify the paint as they wish.
+     *
+     *  Note: The base implementation calls onFilterPaint() for top-level/explicit paints only.
+     *        To also filter encapsulated paints (e.g. SkPicture, SkTextBlob), clients may need to
+     *        override the relevant methods (i.e. drawPicture, drawTextBlob).
+     */
+    virtual void onFilterPaint(SkPaint* paint, Type type) const = 0;
+
+    void onDrawPaint(const SkPaint&) override;
+    void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override;
+    void onDrawRect(const SkRect&, const SkPaint&) override;
+    void onDrawRRect(const SkRRect&, const SkPaint&) override;
+    void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override;
+    void onDrawOval(const SkRect&, const SkPaint&) override;
+    void onDrawPath(const SkPath&, const SkPaint&) override;
+    void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) override;
+    void onDrawBitmapRect(const SkBitmap&, const SkRect* src, const SkRect& dst, const SkPaint*,
+                          SrcRectConstraint) override;
+    void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) override;
+    void onDrawImageRect(const SkImage*, const SkRect* src, const SkRect& dst,
+                         const SkPaint*, SrcRectConstraint) override;
+    void onDrawBitmapNine(const SkBitmap&, const SkIRect& center, const SkRect& dst,
+                          const SkPaint*) override;
+    void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) override;
+    void onDrawVertices(VertexMode vmode, int vertexCount,
+                              const SkPoint vertices[], const SkPoint texs[],
+                              const SkColor colors[], SkXfermode* xmode,
+                              const uint16_t indices[], int indexCount,
+                              const SkPaint&) override;
+    void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
+                             const SkPoint texCoords[4], SkXfermode* xmode,
+                             const SkPaint& paint) override;
+    void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
+
+    void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
+                    const SkPaint&) override;
+    void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
+                       const SkPaint&) override;
+    void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
+                        SkScalar constY, const SkPaint&) override;
+    void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
+                          const SkMatrix* matrix, const SkPaint&) override;
+    void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
+                        const SkPaint& paint) override;
+
+private:
+    class AutoPaintFilter;
+
+    typedef SkNWayCanvas INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/include/utils/SkParse.h b/gfx/skia/skia/include/utils/SkParse.h
index c5aac7d04caa..411605f7a9ae 100644
--- a/gfx/skia/skia/include/utils/SkParse.h
+++ b/gfx/skia/skia/include/utils/SkParse.h
@@ -12,7 +12,7 @@
 
 #include "SkColor.h"
 
-class SkParse {
+class SK_API SkParse {
 public:
     static int Count(const char str[]); // number of scalars or int values
     static int Count(const char str[], char separator);
diff --git a/gfx/skia/skia/include/utils/SkPathUtils.h b/gfx/skia/skia/include/utils/SkPathUtils.h
deleted file mode 100644
index a27cbb8f0f3e..000000000000
--- a/gfx/skia/skia/include/utils/SkPathUtils.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *  CAUTION: EXPERIMENTAL CODE
- *
- *  This code is not to be used and will not be supported
- *  if it fails on you. DO NOT USE!
- *
- */
-
-#ifndef SkPathUtils_DEFINED
-#define SkPathUtils_DEFINED
-
-#include "SkPath.h"
-
-/*
- * The following methods return the boundary path given a 1-bit bitmap, specified
- * by width/height and stride. The bits are interpreted as 1 being "in" the path,
- * and 0 being "out". The bits are interpreted as MSB on the left, and LSB on the right.
- */
-
-class SK_API SkPathUtils {
-public:
-    /**
-       This variation iterates the binary data sequentially (as in scanline fashion)
-       and will add each run of 1's to the path as a rectangular path. Upon parsing
-       all binary data the path is simplified using the PathOps::Simplify() method.
-    */
-    static void BitsToPath_Path(SkPath* path, const char* bitmap,
-                            int w, int h, int rowBytes);
-
-    /**
-       This variation utilizes the SkRegion class to generate paths, adding
-       each run of 1's to the SkRegion as an SkIRect. Upon parsing the entirety
-       of the binary the SkRegion is converted to a Path via getBoundaryPath().
-    */
-    static void BitsToPath_Region(SkPath* path, const char* bitmap,
-                                   int w, int h, int rowBytes);
-
-};
-
-#endif
diff --git a/gfx/skia/skia/include/utils/SkPictureUtils.h b/gfx/skia/skia/include/utils/SkPictureUtils.h
index c35e1c740909..b65a64d57924 100644
--- a/gfx/skia/skia/include/utils/SkPictureUtils.h
+++ b/gfx/skia/skia/include/utils/SkPictureUtils.h
@@ -9,75 +9,20 @@
 #define SkPictureUtils_DEFINED
 
 #include "SkPicture.h"
-#include "SkTDArray.h"
 
-class SkData;
-struct SkRect;
+// TODO: remove this file?
 
 class SK_API SkPictureUtils {
 public:
     /**
-     *  Given a rectangular visible "window" into the picture, return an array
-     *  of SkPixelRefs that might intersect that area. To keep the call fast,
-     *  the returned list is not guaranteed to be exact, so it may miss some,
-     *  and it may return false positives.
-     *
-     *  The pixelrefs returned in the SkData are already owned by the picture,
-     *  so the returned pointers are only valid while the picture is in scope
-     *  and remains unchanged.
+     *  How many bytes are allocated to hold the SkPicture.
+     *  Includes operations, parameters, bounding data, deletion listeners;
+     *  includes nested SkPictures, but does not include large objects that
+     *  SkRecord holds a reference to (e.g. paths, or pixels backing bitmaps).
      */
-    static SkData* GatherPixelRefs(const SkPicture* pict, const SkRect& area);
-
-    /**
-     * SkPixelRefContainer provides a base class for more elaborate pixel ref
-     * query structures (e.g., rtrees, quad-trees, etc.)
-     */
-    class SkPixelRefContainer : public SkRefCnt {
-    public:
-        virtual void add(SkPixelRef* pr, const SkRect& rect) = 0;
-
-        // The returned array may contain duplicates
-        virtual void query(const SkRect& queryRect, SkTDArray<SkPixelRef*> *result) = 0;
-
-    private:
-        typedef SkRefCnt INHERITED;
-    };
-
-    // Simple query structure that just stores a linked list of pixel refs
-    // and rects.
-    class SkPixelRefsAndRectsList : public SkPixelRefContainer {
-    public:
-        virtual void add(SkPixelRef* pr, const SkRect& rect) SK_OVERRIDE {
-            PixelRefAndRect *dst = fArray.append();
-
-            dst->fPixelRef = pr;
-            dst->fRect = rect;
-        }
-
-        virtual void query(const SkRect& queryRect, SkTDArray<SkPixelRef*> *result) SK_OVERRIDE {
-            for (int i = 0; i < fArray.count(); ++i) {
-                if (SkRect::Intersects(fArray[i].fRect, queryRect)) {
-                    *result->append() = fArray[i].fPixelRef;
-                }
-            }
-        }
-
-    private:
-        struct PixelRefAndRect {
-            SkPixelRef* fPixelRef;
-            SkRect      fRect;
-        };
-
-        SkTDArray<PixelRefAndRect> fArray;
-
-        typedef SkPixelRefContainer INHERITED;
-    };
-
-    /**
-     *  Fill the provided pixel ref container with the picture's pixel ref
-     *  and rect information.
-     */
-    static void GatherPixelRefsAndRects(SkPicture* pict, SkPixelRefContainer* prCont);
+    static size_t ApproximateBytesUsed(const SkPicture* pict) {
+        return pict->approximateBytesUsed();
+    }
 };
 
 #endif
diff --git a/gfx/skia/skia/include/utils/SkProxyCanvas.h b/gfx/skia/skia/include/utils/SkProxyCanvas.h
deleted file mode 100644
index 6055db9bedeb..000000000000
--- a/gfx/skia/skia/include/utils/SkProxyCanvas.h
+++ /dev/null
@@ -1,89 +0,0 @@
-
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#ifndef SkProxyCanvas_DEFINED
-#define SkProxyCanvas_DEFINED
-
-#include "SkCanvas.h"
-
-/** This class overrides all virtual methods on SkCanvas, and redirects them
-    to a "proxy", another SkCanvas instance. It can be the basis for
-    intercepting (and possibly modifying) calls to a canvas.
-
-    There must be a proxy installed before the proxycanvas can be used (i.e.
-    before its virtual methods can be called).
- */
-class SK_API SkProxyCanvas : public SkCanvas {
-public:
-    SkProxyCanvas() : fProxy(NULL) {}
-    SkProxyCanvas(SkCanvas* proxy);
-    virtual ~SkProxyCanvas();
-
-    SkCanvas*   getProxy() const { return fProxy; }
-    void        setProxy(SkCanvas* proxy);
-
-    virtual void drawPaint(const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawPoints(PointMode mode, size_t count, const SkPoint pts[],
-                            const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawOval(const SkRect&, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawRect(const SkRect&, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawRRect(const SkRRect&, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawPath(const SkPath& path, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top,
-                            const SkPaint* paint = NULL) SK_OVERRIDE;
-    virtual void drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src,
-                                      const SkRect& dst, const SkPaint* paint,
-                                      DrawBitmapRectFlags flags) SK_OVERRIDE;
-    virtual void drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m,
-                                  const SkPaint* paint = NULL) SK_OVERRIDE;
-    virtual void drawSprite(const SkBitmap& bitmap, int left, int top,
-                            const SkPaint* paint = NULL) SK_OVERRIDE;
-    virtual void drawVertices(VertexMode vmode, int vertexCount,
-                              const SkPoint vertices[], const SkPoint texs[],
-                              const SkColor colors[], SkXfermode* xmode,
-                              const uint16_t indices[], int indexCount,
-                              const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawData(const void* data, size_t length) SK_OVERRIDE;
-
-    virtual void beginCommentGroup(const char* description) SK_OVERRIDE;
-    virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE;
-    virtual void endCommentGroup() SK_OVERRIDE;
-
-    virtual SkDrawFilter* setDrawFilter(SkDrawFilter* filter) SK_OVERRIDE;
-
-protected:
-    virtual void willSave() SK_OVERRIDE;
-    virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE;
-    virtual void willRestore() SK_OVERRIDE;
-
-    virtual void didConcat(const SkMatrix&) SK_OVERRIDE;
-    virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE;
-
-    virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE;
-    virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
-                            const SkPaint&) SK_OVERRIDE;
-    virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
-                               const SkPaint&) SK_OVERRIDE;
-    virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
-                                SkScalar constY, const SkPaint&) SK_OVERRIDE;
-    virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
-                                  const SkMatrix* matrix, const SkPaint&) SK_OVERRIDE;
-
-    virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE;
-
-    virtual void onDrawPicture(const SkPicture*) SK_OVERRIDE;
-
-private:
-    SkCanvas*   fProxy;
-
-    typedef SkCanvas INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/include/utils/SkRTConf.h b/gfx/skia/skia/include/utils/SkRTConf.h
index 4ba607011dd6..dc95cdbadbb0 100644
--- a/gfx/skia/skia/include/utils/SkRTConf.h
+++ b/gfx/skia/skia/include/utils/SkRTConf.h
@@ -84,21 +84,20 @@ public:
     template <typename T> void set(const char *confname,
                                    T value,
                                    bool warnIfNotFound = true);
-#ifdef SK_SUPPORT_UNITTEST
-    static void UnitTest();
-#endif
+
 private:
     template<typename T> friend class SkRTConf;
 
     void registerConf(SkRTConfBase *conf);
+
     template <typename T> bool parse(const char *name, T* value);
 
     SkTDArray<SkString *> fConfigFileKeys, fConfigFileValues;
     typedef SkTDict< SkTDArray<SkRTConfBase *> * > ConfMap;
     ConfMap fConfs;
-#ifdef SK_SUPPORT_UNITTEST
-    SkRTConfRegistry(bool);
-#endif
+
+    template <typename T>
+    friend bool test_rt_conf_parse(SkRTConfRegistry*, const char* name, T* value);
 };
 
 // our singleton registry
diff --git a/gfx/skia/skia/include/utils/SkRandom.h b/gfx/skia/skia/include/utils/SkRandom.h
index d083fc6b2f35..aee2d7a0aaef 100644
--- a/gfx/skia/skia/include/utils/SkRandom.h
+++ b/gfx/skia/skia/include/utils/SkRandom.h
@@ -10,145 +10,6 @@
 
 #include "SkScalar.h"
 
-/** \class SkLCGRandom
-
-    Utility class that implements pseudo random 32bit numbers using a fast
-    linear equation. Unlike rand(), this class holds its own seed (initially
-    set to 0), so that multiple instances can be used with no side-effects.
-*/
-class SkLCGRandom {
-public:
-    SkLCGRandom() : fSeed(0) {}
-    SkLCGRandom(uint32_t seed) : fSeed(seed) {}
-
-    /** Return the next pseudo random number as an unsigned 32bit value.
-    */
-    uint32_t nextU() { uint32_t r = fSeed * kMul + kAdd; fSeed = r; return r; }
-
-    /** Return the next pseudo random number as a signed 32bit value.
-    */
-    int32_t nextS() { return (int32_t)this->nextU(); }
-
-    /** Return the next pseudo random number as an unsigned 16bit value.
-    */
-    U16CPU nextU16() { return this->nextU() >> 16; }
-
-    /** Return the next pseudo random number as a signed 16bit value.
-    */
-    S16CPU nextS16() { return this->nextS() >> 16; }
-
-    /**
-     *  Returns value [0...1) as a float
-     */
-    float nextF() {
-        // const is 1 / (2^32 - 1)
-        return (float)(this->nextU() * 2.32830644e-10);
-    }
-
-    /**
-     *  Returns value [min...max) as a float
-     */
-    float nextRangeF(float min, float max) {
-        return min + this->nextF() * (max - min);
-    }
-
-    /** Return the next pseudo random number, as an unsigned value of
-        at most bitCount bits.
-        @param bitCount The maximum number of bits to be returned
-    */
-    uint32_t nextBits(unsigned bitCount) {
-        SkASSERT(bitCount > 0 && bitCount <= 32);
-        return this->nextU() >> (32 - bitCount);
-    }
-
-    /** Return the next pseudo random unsigned number, mapped to lie within
-        [min, max] inclusive.
-    */
-    uint32_t nextRangeU(uint32_t min, uint32_t max) {
-        SkASSERT(min <= max);
-        uint32_t range = max - min + 1;
-        if (0 == range) {
-            return this->nextU();
-        } else {
-            return min + this->nextU() % range;
-        }
-    }
-
-    /** Return the next pseudo random unsigned number, mapped to lie within
-        [0, count).
-     */
-    uint32_t nextULessThan(uint32_t count) {
-        SkASSERT(count > 0);
-        return this->nextRangeU(0, count - 1);
-    }
-
-    /** Return the next pseudo random number expressed as an unsigned SkFixed
-        in the range [0..SK_Fixed1).
-    */
-    SkFixed nextUFixed1() { return this->nextU() >> 16; }
-
-    /** Return the next pseudo random number expressed as a signed SkFixed
-        in the range (-SK_Fixed1..SK_Fixed1).
-    */
-    SkFixed nextSFixed1() { return this->nextS() >> 15; }
-
-    /** Return the next pseudo random number expressed as a SkScalar
-        in the range [0..SK_Scalar1).
-    */
-    SkScalar nextUScalar1() { return SkFixedToScalar(this->nextUFixed1()); }
-
-    /** Return the next pseudo random number expressed as a SkScalar
-        in the range [min..max).
-    */
-    SkScalar nextRangeScalar(SkScalar min, SkScalar max) {
-        return this->nextUScalar1() * (max - min) + min;
-    }
-
-    /** Return the next pseudo random number expressed as a SkScalar
-        in the range (-SK_Scalar1..SK_Scalar1).
-    */
-    SkScalar nextSScalar1() { return SkFixedToScalar(this->nextSFixed1()); }
-
-    /** Return the next pseudo random number as a bool.
-    */
-    bool nextBool() { return this->nextU() >= 0x80000000; }
-
-    /** A biased version of nextBool().
-     */
-    bool nextBiasedBool(SkScalar fractionTrue) {
-        SkASSERT(fractionTrue >= 0 && fractionTrue <= SK_Scalar1);
-        return this->nextUScalar1() <= fractionTrue;
-    }
-
-    /**
-     *  Return the next pseudo random number as a signed 64bit value.
-     */
-    int64_t next64() {
-        int64_t hi = this->nextS();
-        return (hi << 32) | this->nextU();
-    }
-
-    /**
-     *  Return the current seed. This allows the caller to later reset to the
-     *  same seed (using setSeed) so it can generate the same sequence.
-     */
-    int32_t getSeed() const { return fSeed; }
-
-    /** Set the seed of the random object. The seed is initialized to 0 when the
-        object is first created, and is updated each time the next pseudo random
-        number is requested.
-    */
-    void setSeed(int32_t seed) { fSeed = (uint32_t)seed; }
-
-private:
-    //  See "Numerical Recipes in C", 1992 page 284 for these constants
-    enum {
-        kMul = 1664525,
-        kAdd = 1013904223
-    };
-    uint32_t fSeed;
-};
-
 /** \class SkRandom
 
  Utility class that implements pseudo random 32bit numbers using Marsaglia's
diff --git a/gfx/skia/skia/include/utils/SkRunnable.h b/gfx/skia/skia/include/utils/SkRunnable.h
deleted file mode 100644
index 5acf4dbc61a4..000000000000
--- a/gfx/skia/skia/include/utils/SkRunnable.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkRunnable_DEFINED
-#define SkRunnable_DEFINED
-
-template <typename T>
-struct SkTRunnable {
-    virtual ~SkTRunnable() {};
-    virtual void run(T&) = 0;
-};
-
-template <>
-struct SkTRunnable<void> {
-    virtual ~SkTRunnable() {};
-    virtual void run() = 0;
-};
-
-typedef SkTRunnable<void> SkRunnable;
-
-#endif
diff --git a/gfx/skia/skia/include/views/SkTextBox.h b/gfx/skia/skia/include/utils/SkTextBox.h
similarity index 86%
rename from gfx/skia/skia/include/views/SkTextBox.h
rename to gfx/skia/skia/include/utils/SkTextBox.h
index e217076fed4a..d4372d1b6ab8 100644
--- a/gfx/skia/skia/include/views/SkTextBox.h
+++ b/gfx/skia/skia/include/utils/SkTextBox.h
@@ -60,6 +60,14 @@ public:
     int     countLines() const;
     SkScalar getTextHeight() const;
 
+    SkTextBlob* snapshotTextBlob(SkScalar* computedBottom) const;
+
+    class Visitor {
+    public:
+        virtual ~Visitor() {}
+        virtual void operator()(const char*, size_t, SkScalar x, SkScalar y, const SkPaint&) = 0;
+    };
+    
 private:
     SkRect      fBox;
     SkScalar    fSpacingMul, fSpacingAdd;
@@ -67,6 +75,8 @@ private:
     const char* fText;
     size_t      fLen;
     const SkPaint* fPaint;
+
+    SkScalar visit(Visitor&, const char text[], size_t len, const SkPaint&) const;
 };
 
 class SkTextLineBreaker {
diff --git a/gfx/skia/skia/include/utils/SkThreadPool.h b/gfx/skia/skia/include/utils/SkThreadPool.h
deleted file mode 100644
index c99c5c4188a5..000000000000
--- a/gfx/skia/skia/include/utils/SkThreadPool.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkThreadPool_DEFINED
-#define SkThreadPool_DEFINED
-
-#include "SkCondVar.h"
-#include "SkRunnable.h"
-#include "SkTDArray.h"
-#include "SkTInternalLList.h"
-#include "SkThreadUtils.h"
-#include "SkTypes.h"
-
-#if defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_ANDROID)
-#    include <unistd.h>
-#endif
-
-// Returns the number of cores on this machine.
-static inline int num_cores() {
-#if defined(SK_BUILD_FOR_WIN32)
-    SYSTEM_INFO sysinfo;
-    GetSystemInfo(&sysinfo);
-    return sysinfo.dwNumberOfProcessors;
-#elif defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_ANDROID)
-    return (int) sysconf(_SC_NPROCESSORS_ONLN);
-#else
-    return 1;
-#endif
-}
-
-template <typename T>
-class SkTThreadPool {
-public:
-    /**
-     * Create a threadpool with count threads, or one thread per core if kThreadPerCore.
-     */
-    static const int kThreadPerCore = -1;
-    explicit SkTThreadPool(int count);
-    ~SkTThreadPool();
-
-    /**
-     * Queues up an SkRunnable to run when a thread is available, or synchronously if count is 0.
-     * Does not take ownership. NULL is a safe no-op.  If T is not void, the runnable will be passed
-     * a reference to a T on the thread's local stack.
-     */
-    void add(SkTRunnable<T>*);
-
-    /**
-     * Same as add, but adds the runnable as the very next to run rather than enqueueing it.
-     */
-    void addNext(SkTRunnable<T>*);
-
-    /**
-     * Block until all added SkRunnables have completed.  Once called, calling add() is undefined.
-     */
-    void wait();
-
- private:
-    struct LinkedRunnable {
-        SkTRunnable<T>* fRunnable;  // Unowned.
-        SK_DECLARE_INTERNAL_LLIST_INTERFACE(LinkedRunnable);
-    };
-
-    enum State {
-        kRunning_State,  // Normal case.  We've been constructed and no one has called wait().
-        kWaiting_State,  // wait has been called, but there still might be work to do or being done.
-        kHalting_State,  // There's no work to do and no thread is busy.  All threads can shut down.
-    };
-
-    void addSomewhere(SkTRunnable<T>* r,
-                      void (SkTInternalLList<LinkedRunnable>::*)(LinkedRunnable*));
-
-    SkTInternalLList<LinkedRunnable> fQueue;
-    SkCondVar                        fReady;
-    SkTDArray<SkThread*>             fThreads;
-    State                            fState;
-    int                              fBusyThreads;
-
-    static void Loop(void*);  // Static because we pass in this.
-};
-
-template <typename T>
-SkTThreadPool<T>::SkTThreadPool(int count) : fState(kRunning_State), fBusyThreads(0) {
-    if (count < 0) {
-        count = num_cores();
-    }
-    // Create count threads, all running SkTThreadPool::Loop.
-    for (int i = 0; i < count; i++) {
-        SkThread* thread = SkNEW_ARGS(SkThread, (&SkTThreadPool::Loop, this));
-        *fThreads.append() = thread;
-        thread->start();
-    }
-}
-
-template <typename T>
-SkTThreadPool<T>::~SkTThreadPool() {
-    if (kRunning_State == fState) {
-        this->wait();
-    }
-}
-
-namespace SkThreadPoolPrivate {
-
-template <typename T>
-struct ThreadLocal {
-    void run(SkTRunnable<T>* r) { r->run(data); }
-    T data;
-};
-
-template <>
-struct ThreadLocal<void> {
-    void run(SkTRunnable<void>* r) { r->run(); }
-};
-
-}  // namespace SkThreadPoolPrivate
-
-template <typename T>
-void SkTThreadPool<T>::addSomewhere(SkTRunnable<T>* r,
-                                    void (SkTInternalLList<LinkedRunnable>::* f)(LinkedRunnable*)) {
-    if (r == NULL) {
-        return;
-    }
-
-    if (fThreads.isEmpty()) {
-        SkThreadPoolPrivate::ThreadLocal<T> threadLocal;
-        threadLocal.run(r);
-        return;
-    }
-
-    LinkedRunnable* linkedRunnable = SkNEW(LinkedRunnable);
-    linkedRunnable->fRunnable = r;
-    fReady.lock();
-    SkASSERT(fState != kHalting_State);  // Shouldn't be able to add work when we're halting.
-    (fQueue.*f)(linkedRunnable);
-    fReady.signal();
-    fReady.unlock();
-}
-
-template <typename T>
-void SkTThreadPool<T>::add(SkTRunnable<T>* r) {
-    this->addSomewhere(r, &SkTInternalLList<LinkedRunnable>::addToTail);
-}
-
-template <typename T>
-void SkTThreadPool<T>::addNext(SkTRunnable<T>* r) {
-    this->addSomewhere(r, &SkTInternalLList<LinkedRunnable>::addToHead);
-}
-
-
-template <typename T>
-void SkTThreadPool<T>::wait() {
-    fReady.lock();
-    fState = kWaiting_State;
-    fReady.broadcast();
-    fReady.unlock();
-
-    // Wait for all threads to stop.
-    for (int i = 0; i < fThreads.count(); i++) {
-        fThreads[i]->join();
-        SkDELETE(fThreads[i]);
-    }
-    SkASSERT(fQueue.isEmpty());
-}
-
-template <typename T>
-/*static*/ void SkTThreadPool<T>::Loop(void* arg) {
-    // The SkTThreadPool passes itself as arg to each thread as they're created.
-    SkTThreadPool<T>* pool = static_cast<SkTThreadPool<T>*>(arg);
-    SkThreadPoolPrivate::ThreadLocal<T> threadLocal;
-
-    while (true) {
-        // We have to be holding the lock to read the queue and to call wait.
-        pool->fReady.lock();
-        while(pool->fQueue.isEmpty()) {
-            // Does the client want to stop and are all the threads ready to stop?
-            // If so, we move into the halting state, and whack all the threads so they notice.
-            if (kWaiting_State == pool->fState && pool->fBusyThreads == 0) {
-                pool->fState = kHalting_State;
-                pool->fReady.broadcast();
-            }
-            // Any time we find ourselves in the halting state, it's quitting time.
-            if (kHalting_State == pool->fState) {
-                pool->fReady.unlock();
-                return;
-            }
-            // wait yields the lock while waiting, but will have it again when awoken.
-            pool->fReady.wait();
-        }
-        // We've got the lock back here, no matter if we ran wait or not.
-
-        // The queue is not empty, so we have something to run.  Claim it.
-        LinkedRunnable* r = pool->fQueue.head();
-
-        pool->fQueue.remove(r);
-
-        // Having claimed our SkRunnable, we now give up the lock while we run it.
-        // Otherwise, we'd only ever do work on one thread at a time, which rather
-        // defeats the point of this code.
-        pool->fBusyThreads++;
-        pool->fReady.unlock();
-
-        // OK, now really do the work.
-        threadLocal.run(r->fRunnable);
-        SkDELETE(r);
-
-        // Let everyone know we're not busy.
-        pool->fReady.lock();
-        pool->fBusyThreads--;
-        pool->fReady.unlock();
-    }
-
-    SkASSERT(false); // Unreachable.  The only exit happens when pool->fState is kHalting_State.
-}
-
-typedef SkTThreadPool<void> SkThreadPool;
-
-#endif
diff --git a/gfx/skia/skia/include/utils/ios/SkStream_NSData.h b/gfx/skia/skia/include/utils/ios/SkStream_NSData.h
deleted file mode 100644
index 8e6f06452df8..000000000000
--- a/gfx/skia/skia/include/utils/ios/SkStream_NSData.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#ifndef SkStream_NSData_DEFINED
-#define SkStream_NSData_DEFINED
-
-#import <UIKit/UIKit.h>
-#include "SkStream.h"
-
-/** Returns an NSData with a copy of the stream's data. The caller must call
-    retain if it intends to keep the data object beyond the current stack-frame
-    (i.e. internally we're calling [NSData dataWithBytes...]
- */
-NSData* NSData_dataWithStream(SkStream* stream);
-
-/** Returns an NSData from the named resource (from main bundle).
-    The caller must call retain if it intends to keep the data object beyond
-    the current stack-frame
-    (i.e. internally we're calling [NSData dataWithContentsOfMappedFile...]
- */
-NSData* NSData_dataFromResource(const char name[], const char suffix[]);
-
-/** Wrap a stream around NSData.
- */
-class SkStream_NSData : public SkMemoryStream {
-public:
-            SkStream_NSData(NSData* data);
-    virtual ~SkStream_NSData();
-
-    static SkStream_NSData* CreateFromResource(const char name[],
-                                               const char suffix[]);
-
-private:
-    NSData* fNSData;
-};
-
-#endif
diff --git a/gfx/skia/skia/include/utils/mac/SkCGUtils.h b/gfx/skia/skia/include/utils/mac/SkCGUtils.h
index a0fe666d2c29..3d9aff44515f 100644
--- a/gfx/skia/skia/include/utils/mac/SkCGUtils.h
+++ b/gfx/skia/skia/include/utils/mac/SkCGUtils.h
@@ -11,6 +11,8 @@
 #include "SkSize.h"
 #include "SkImageInfo.h"
 
+#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
+
 #ifdef SK_BUILD_FOR_MAC
 #include <ApplicationServices/ApplicationServices.h>
 #endif
@@ -62,23 +64,21 @@ static inline CGImageRef SkCreateCGImageRef(const SkBitmap& bm) {
  */
 void SkCGDrawBitmap(CGContextRef, const SkBitmap&, float x, float y);
 
+/**
+ *  Create an SkBitmap drawing of the encoded PDF document, returning true on
+ *  success. Deletes the stream when finished.
+ */
 bool SkPDFDocumentToBitmap(SkStream* stream, SkBitmap* output);
 
 /**
- *  Return a provider that wraps the specified stream. It will become an
- *  owner of the stream, so the caller must still manage its ownership.
+ *  Return a provider that wraps the specified stream. It will become the only
+ *  owner of the stream, so the caller must stop referring to the stream.
  *
- *  To hand-off ownership of the stream to the provider, the caller must do
- *  something like the following:
- *
- *  SkStream* stream = new ...;
- *  CGDataProviderRef provider = SkStreamToDataProvider(stream);
- *  stream->unref();
- *
- *  Now when the provider is finally deleted, it will delete the stream.
+ *  When the provider is finally deleted, it will delete the stream.
  */
 CGDataProviderRef SkCreateDataProviderFromStream(SkStream*);
 
 CGDataProviderRef SkCreateDataProviderFromData(SkData*);
 
-#endif
+#endif  // defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
+#endif  // SkCGUtils_DEFINED
diff --git a/gfx/skia/skia/include/utils/win/SkAutoCoInitialize.h b/gfx/skia/skia/include/utils/win/SkAutoCoInitialize.h
index f671e682051e..35fcce5b1335 100644
--- a/gfx/skia/skia/include/utils/win/SkAutoCoInitialize.h
+++ b/gfx/skia/skia/include/utils/win/SkAutoCoInitialize.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
@@ -6,13 +5,12 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkAutoCo_DEFINED
 #define SkAutoCo_DEFINED
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include "SkTemplates.h"
+#include "SkTypes.h"
+
+#ifdef SK_BUILD_FOR_WIN
 
 /**
  * An instance of this class initializes COM on creation
@@ -27,4 +25,5 @@ public:
     bool succeeded();
 };
 
-#endif
+#endif  // SK_BUILD_FOR_WIN
+#endif  // SkAutoCo_DEFINED
diff --git a/gfx/skia/skia/include/utils/win/SkHRESULT.h b/gfx/skia/skia/include/utils/win/SkHRESULT.h
index 4f9d1bec796e..a6cc1d21b9db 100644
--- a/gfx/skia/skia/include/utils/win/SkHRESULT.h
+++ b/gfx/skia/skia/include/utils/win/SkHRESULT.h
@@ -9,6 +9,7 @@
 #define SkHRESULT_DEFINED
 
 #include "SkTypes.h"
+#ifdef SK_BUILD_FOR_WIN
 
 void SkTraceHR(const char* file, unsigned long line,
                HRESULT hr, const char* msg);
@@ -55,4 +56,5 @@ The HRZ variants will return 0 when FAILED.
 #define HRZ(ex) HR_GENERAL(ex, NULL, 0)
 #define HRZM(ex, msg) HR_GENERAL(ex, msg, 0)
 //@}
-#endif
+#endif  // SK_BUILD_FOR_WIN
+#endif  // SkHRESULT_DEFINED
diff --git a/gfx/skia/skia/include/utils/win/SkIStream.h b/gfx/skia/skia/include/utils/win/SkIStream.h
index deb3f3b0047e..4a72f5b72901 100644
--- a/gfx/skia/skia/include/utils/win/SkIStream.h
+++ b/gfx/skia/skia/include/utils/win/SkIStream.h
@@ -10,6 +10,10 @@
 #ifndef SkIStream_DEFINED
 #define SkIStream_DEFINED
 
+#include "SkTypes.h"
+
+#ifdef SK_BUILD_FOR_WIN
+
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <ole2.h>
@@ -75,20 +79,20 @@ public:
 };
 
 /**
- * A minimal read-only IStream implementation which wraps an SkIStream.
+ * A minimal read-only IStream implementation which wraps an SkStream.
  */
 class SkIStream : public SkBaseIStream {
 private:
     SkStream *fSkStream;
-    bool fUnrefOnRelease;
+    const bool fDeleteOnRelease;
     ULARGE_INTEGER fLocation;
 
-    SkIStream(SkStream* stream, bool unrefOnRelease);
+    SkIStream(SkStream* stream, bool fDeleteOnRelease);
     virtual ~SkIStream();
 
 public:
     HRESULT static CreateFromSkStream(SkStream* stream
-                                    , bool unrefOnRelease
+                                    , bool fDeleteOnRelease
                                     , IStream ** ppStream);
 
     virtual HRESULT STDMETHODCALLTYPE Read(void* pv, ULONG cb, ULONG* pcbRead);
@@ -128,4 +132,5 @@ public:
                                          , DWORD grfStatFlag);
 };
 
-#endif
+#endif  // SK_BUILD_FOR_WIN
+#endif  // SkIStream_DEFINED
diff --git a/gfx/skia/skia/include/utils/win/SkTScopedComPtr.h b/gfx/skia/skia/include/utils/win/SkTScopedComPtr.h
index 8f18a42481be..d2d925c56fdc 100644
--- a/gfx/skia/skia/include/utils/win/SkTScopedComPtr.h
+++ b/gfx/skia/skia/include/utils/win/SkTScopedComPtr.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
@@ -10,7 +9,8 @@
 #define SkTScopedComPtr_DEFINED
 
 #include "SkTypes.h"
-#include "SkTemplates.h"
+
+#ifdef SK_BUILD_FOR_WIN
 
 template<typename T>
 class SkBlockComRef : public T {
@@ -54,7 +54,7 @@ public:
     T **operator&() { SkASSERT(fPtr == NULL); return &fPtr; }
     T *get() const { return fPtr; }
     void reset() {
-        if (NULL != this->fPtr) {
+        if (this->fPtr) {
             this->fPtr->Release();
             this->fPtr = NULL;
         }
@@ -73,4 +73,5 @@ public:
     }
 };
 
-#endif
+#endif  // SK_BUILD_FOR_WIN
+#endif  // SkTScopedComPtr_DEFINED
diff --git a/gfx/skia/skia/include/views/SkEvent.h b/gfx/skia/skia/include/views/SkEvent.h
index f4df4482bf7b..0af76fe686cb 100644
--- a/gfx/skia/skia/include/views/SkEvent.h
+++ b/gfx/skia/skia/include/views/SkEvent.h
@@ -223,7 +223,7 @@ public:
     */
     static void Init();
     /** Global cleanup function for the SkEvent system. Should be called exactly once after
-        all event methods have been called, and should be called before calling SkGraphics::Term().
+        all event methods have been called.
     */
     static void Term();
 
diff --git a/gfx/skia/skia/include/views/SkEventSink.h b/gfx/skia/skia/include/views/SkEventSink.h
index 01d4f7a252f6..9714532f9733 100644
--- a/gfx/skia/skia/include/views/SkEventSink.h
+++ b/gfx/skia/skia/include/views/SkEventSink.h
@@ -21,7 +21,7 @@ struct SkTagList;
 */
 class SkEventSink : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkEventSink)
+    
 
              SkEventSink();
     virtual ~SkEventSink();
diff --git a/gfx/skia/skia/include/views/SkOSWindow_Android.h b/gfx/skia/skia/include/views/SkOSWindow_Android.h
index ae4e88003937..09163fc1cb98 100644
--- a/gfx/skia/skia/include/views/SkOSWindow_Android.h
+++ b/gfx/skia/skia/include/views/SkOSWindow_Android.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2011 Skia
  *
@@ -6,35 +5,38 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkOSWindow_Android_DEFINED
 #define SkOSWindow_Android_DEFINED
 
 #include "SkWindow.h"
 
-class SkIRect;
+#include <EGL/egl.h>
+
+struct SkAndroidWindow {
+    EGLDisplay fDisplay;
+    EGLSurface fSurface;
+    EGLContext fContext;
+};
 
 class SkOSWindow : public SkWindow {
 public:
-    SkOSWindow(void*) {}
-    ~SkOSWindow() {}
+    SkOSWindow(void*);
+    ~SkOSWindow();
 
     enum SkBackEndTypes {
         kNone_BackEndType,
         kNativeGL_BackEndType,
     };
 
-    struct AttachmentInfo {
-        int fSampleCount;
-        int fStencilBits;
-    };
-
     bool attach(SkBackEndTypes attachType, int msaaSampleCount, AttachmentInfo* info);
-    void detach() {}
-    void present() {}
+    void detach();
+    void present();
+    bool makeFullscreen() { return true; }
+    void closeWindow();
+    void setVsync(bool);
+    bool destroyRequested() { return fDestroyRequested; }
 
-    virtual void onPDFSaved(const char title[], const char desc[],
-        const char path[]);
+    virtual void onPDFSaved(const char title[], const char desc[], const char path[]);
 
 protected:
     // overrides from SkWindow
@@ -42,6 +44,10 @@ protected:
     virtual void onSetTitle(const char title[]);
 
 private:
+    SkAndroidWindow fWindow;
+    ANativeWindow* fNativeWindow;
+    bool fDestroyRequested;
+
     typedef SkWindow INHERITED;
 };
 
diff --git a/gfx/skia/skia/include/views/SkOSWindow_Mac.h b/gfx/skia/skia/include/views/SkOSWindow_Mac.h
index 5dea2fc12e9a..6ce898321fd7 100644
--- a/gfx/skia/skia/include/views/SkOSWindow_Mac.h
+++ b/gfx/skia/skia/include/views/SkOSWindow_Mac.h
@@ -24,17 +24,21 @@ public:
 #if SK_SUPPORT_GPU
         kNativeGL_BackEndType,
 #endif
-    };
-
-    struct AttachmentInfo {
-        int fSampleCount;
-        int fStencilBits;
+#if SK_ANGLE
+        kANGLE_BackEndType,
+#endif // SK_ANGLE
+#if SK_COMMAND_BUFFER
+        kCommandBuffer_BackEndType,
+#endif // SK_COMMAND_BUFFER
     };
 
     void    detach();
     bool    attach(SkBackEndTypes attachType, int msaaSampleCount, AttachmentInfo*);
     void    present();
 
+    bool    makeFullscreen();
+    void    closeWindow();
+    void    setVsync(bool);
 protected:
     // overrides from SkEventSink
     virtual bool onEvent(const SkEvent& evt);
diff --git a/gfx/skia/skia/include/views/SkOSWindow_NaCl.h b/gfx/skia/skia/include/views/SkOSWindow_NaCl.h
deleted file mode 100644
index 22960236d32e..000000000000
--- a/gfx/skia/skia/include/views/SkOSWindow_NaCl.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-/*
- * Copyright 2012 Skia
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#ifndef SkOSWindow_NaCl_DEFINED
-#define SkOSWindow_NaCl_DEFINED
-
-#include "SkWindow.h"
-
-class SkIRect;
-
-class SkOSWindow : public SkWindow {
-public:
-    SkOSWindow(void*) {}
-    ~SkOSWindow() {}
-
-    enum SkBackEndTypes {
-        kNone_BackEndType,
-        kNativeGL_BackEndType,
-    };
-
-    struct AttachmentInfo {
-        int fSampleCount;
-        int fStencilBits;
-    };
-
-    bool attach(SkBackEndTypes /* attachType */, int /* msaaSampleCount */, AttachmentInfo* info) {
-        info->fSampleCount = 0;
-        info->fStencilBits = 0;
-        return true;
-    }
-    void detach() {}
-    void present() {}
-
-    virtual void onPDFSaved(const char title[], const char desc[],
-        const char path[]);
-
-protected:
-    // overrides from SkWindow
-    virtual void onHandleInval(const SkIRect&);
-    virtual void onSetTitle(const char title[]);
-
-private:
-    typedef SkWindow INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/include/views/SkOSWindow_SDL.h b/gfx/skia/skia/include/views/SkOSWindow_SDL.h
index e6b59e6511f9..c40ec2e301fe 100644
--- a/gfx/skia/skia/include/views/SkOSWindow_SDL.h
+++ b/gfx/skia/skia/include/views/SkOSWindow_SDL.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,37 +5,58 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkOSWindow_SDL_DEFINED
 #define SkOSWindow_SDL_DEFINED
 
 #include "SDL.h"
+#include "SDL_opengl.h"
 #include "SkWindow.h"
 
-class SkGLCanvas;
-
 class SkOSWindow : public SkWindow {
 public:
     SkOSWindow(void* screen);
     virtual ~SkOSWindow();
 
-    static bool PostEvent(SkEvent* evt, SkEventSinkID, SkMSec delay);
+    static bool PostEvent(SkEvent* evt, SkEventSinkID, SkMSec delay) {
+        SkFAIL("not implemented\n");
+        return false;
+    }
 
-    void handleSDLEvent(const SDL_Event& event);
+    enum SkBackEndTypes {
+        kNone_BackEndType,
+        kNativeGL_BackEndType,
+#if SK_ANGLE
+        kANGLE_BackEndType,
+#endif // SK_ANGLE
+#if SK_COMMAND_BUFFER
+        kCommandBuffer_BackEndType,
+#endif // SK_COMMAND_BUFFER
+    };
+
+    void detach();
+    bool attach(SkBackEndTypes attachType, int msaaSampleCount, AttachmentInfo*);
+    void present();
+    bool makeFullscreen();
+    void setVsync(bool);
+    void closeWindow();
+    void loop() {
+        while (!fQuit) {
+            this->handleEvents();
+            this->update(nullptr);
+        }
+    }
 
 protected:
-    // overrides from SkWindow
-    virtual void onHandleInval(const SkIRect&);
-    // overrides from SkView
-    virtual void onAddMenu(const SkOSMenu*);
-    virtual void onSetTitle(const char[]);
+    void onSetTitle(const char title[]) override;
+    void onHandleInval(const SkIRect&) override;
+    void onPDFSaved(const char title[], const char desc[], const char path[]) override;
 
 private:
-    SDL_Surface* fScreen;
-    SDL_Surface* fSurface;
-    SkGLCanvas* fGLCanvas;
-
-    void doDraw();
+    void handleEvents();
+    bool fQuit;
+    uint32_t fWindowFlags;
+    SDL_Window* fWindow;
+    SDL_GLContext fGLContext;
 
     typedef SkWindow INHERITED;
 };
diff --git a/gfx/skia/skia/include/views/SkOSWindow_Unix.h b/gfx/skia/skia/include/views/SkOSWindow_Unix.h
index 8a55ef455ef1..ecd0a145212d 100644
--- a/gfx/skia/skia/include/views/SkOSWindow_Unix.h
+++ b/gfx/skia/skia/include/views/SkOSWindow_Unix.h
@@ -36,11 +36,12 @@ public:
     enum SkBackEndTypes {
         kNone_BackEndType,
         kNativeGL_BackEndType,
-    };
-
-    struct AttachmentInfo {
-        int fSampleCount;
-        int fStencilBits;
+#if SK_ANGLE
+        kANGLE_BackEndType,
+#endif // SK_ANGLE
+#if SK_COMMAND_BUFFER
+        kCommandBuffer_BackEndType,
+#endif // SK_COMMAND_BUFFER
     };
 
     bool attach(SkBackEndTypes attachType, int msaaSampleCount, AttachmentInfo*);
@@ -51,9 +52,13 @@ public:
 
     //static bool PostEvent(SkEvent* evt, SkEventSinkID, SkMSec delay);
 
+    bool makeFullscreen();
+    void setVsync(bool);
+    void closeWindow();
+
 protected:
     // Overridden from from SkWindow:
-    virtual void onSetTitle(const char title[]) SK_OVERRIDE;
+    void onSetTitle(const char title[]) override;
 
 private:
     enum NextXEventResult {
@@ -66,7 +71,9 @@ private:
     void doPaint();
     void mapWindowAndWait();
 
-    void closeWindow();
+    // Forcefully closes the window.  If a graceful shutdown is desired then call the public
+    // closeWindow method
+    void internalCloseWindow();
     void initWindow(int newMSAASampleCount, AttachmentInfo* info);
 
     SkUnixWindow fUnixWindow;
diff --git a/gfx/skia/skia/include/views/SkOSWindow_Win.h b/gfx/skia/skia/include/views/SkOSWindow_Win.h
index 6b5977ce3f17..c1a68c621e4d 100644
--- a/gfx/skia/skia/include/views/SkOSWindow_Win.h
+++ b/gfx/skia/skia/include/views/SkOSWindow_Win.h
@@ -10,20 +10,27 @@
 #ifndef SkOSWindow_Win_DEFINED
 #define SkOSWindow_Win_DEFINED
 
+#include "../private/SkTHash.h"
 #include "SkWindow.h"
+#include <functional>
 
 #if SK_ANGLE
 #include "EGL/egl.h"
 #endif
 
+#if SK_COMMAND_BUFFER
+class SkCommandBufferGLContext;
+#endif
+
 class SkOSWindow : public SkWindow {
 public:
-    SkOSWindow(void* hwnd);
-    virtual ~SkOSWindow();
+    struct WindowInit {
+        const TCHAR*    fClass;
+        HINSTANCE       fInstance;
+    };
 
-    void*   getHWND() const { return fHWND; }
-    void    setSize(int width, int height);
-    void    updateSize();
+    SkOSWindow(const void* winInit);
+    virtual ~SkOSWindow();
 
     static bool PostEvent(SkEvent* evt, SkEventSinkID, SkMSec delay);
 
@@ -34,14 +41,12 @@ public:
 #if SK_ANGLE
         kANGLE_BackEndType,
 #endif // SK_ANGLE
+#if SK_COMMAND_BUFFER
+        kCommandBuffer_BackEndType,
+#endif // SK_COMMAND_BUFFER
 #endif // SK_SUPPORT_GPU
     };
 
-    struct AttachmentInfo {
-        int fSampleCount;
-        int fStencilBits;
-    };
-
     bool attach(SkBackEndTypes attachType, int msaaSampleCount, AttachmentInfo*);
     void detach();
     void present();
@@ -54,6 +59,24 @@ public:
         SK_WM_SkTimerID = 0xFFFF    // just need a non-zero value
     };
 
+    bool makeFullscreen();
+    void setVsync(bool);
+    void closeWindow();
+
+    static SkOSWindow* GetOSWindowForHWND(void* hwnd) {
+        SkOSWindow** win = gHwndToOSWindowMap.find(hwnd);
+        if (!win) {
+            return NULL;
+        }
+        return *win;
+    }
+
+    // Iterates f over all the SkOSWindows and their corresponding HWNDs.
+    // The void* argument to f is a HWND.
+    static void ForAllWindows(const std::function<void(void*, SkOSWindow**)>& f) {
+        gHwndToOSWindowMap.foreach(f);
+    }
+
 protected:
     virtual bool quitOnDeactivate() { return true; }
 
@@ -65,6 +88,9 @@ protected:
     virtual void onSetTitle(const char title[]);
 
 private:
+    static SkTHashMap<void*, SkOSWindow*> gHwndToOSWindowMap;
+
+    WindowInit          fWinInit;
     void*               fHWND;
 
     void                doPaint(void* ctx);
@@ -77,12 +103,28 @@ private:
     EGLSurface          fSurface;
     EGLConfig           fConfig;
 #endif // SK_ANGLE
+#if SK_COMMAND_BUFFER
+    SkCommandBufferGLContext* fCommandBuffer;
+#endif // SK_COMMAND_BUFFER
 #endif // SK_SUPPORT_GPU
 
+    bool                fFullscreen;
+    struct SavedWindowState {
+        bool fZoomed;
+        LONG fStyle;
+        LONG fExStyle;
+        RECT fRect;
+        LONG fScreenWidth;
+        LONG fScreenHeight;
+        LONG fScreenBits;
+        void* fHWND;
+    } fSavedWindowState;
+
     HMENU               fMBar;
 
     SkBackEndTypes      fAttached;
 
+    void updateSize();
 #if SK_SUPPORT_GPU
     bool attachGL(int msaaSampleCount, AttachmentInfo* info);
     void detachGL();
@@ -93,6 +135,12 @@ private:
     void detachANGLE();
     void presentANGLE();
 #endif // SK_ANGLE
+
+#if SK_COMMAND_BUFFER
+    bool attachCommandBuffer(int msaaSampleCount, AttachmentInfo* info);
+    void detachCommandBuffer();
+    void presentCommandBuffer();
+#endif // SK_COMMAND_BUFFER
 #endif // SK_SUPPORT_GPU
 
     typedef SkWindow INHERITED;
diff --git a/gfx/skia/skia/include/views/SkOSWindow_iOS.h b/gfx/skia/skia/include/views/SkOSWindow_iOS.h
index 1984900ded72..071d6db18cf6 100644
--- a/gfx/skia/skia/include/views/SkOSWindow_iOS.h
+++ b/gfx/skia/skia/include/views/SkOSWindow_iOS.h
@@ -21,15 +21,14 @@ public:
         kNativeGL_BackEndType,
     };
 
-    struct AttachmentInfo {
-        int fSampleCount;
-        int fStencilBits;
-    };
-
     void    detach();
     bool    attach(SkBackEndTypes attachType, int msaaSampleCount, AttachmentInfo*);
     void    present();
 
+    bool makeFullscreen() { return true; }
+    void closeWindow() { /* Not impl yet */ }
+    void setVsync(bool) { /* Can't turn off vsync? */ }
+
 protected:
     // overrides from SkEventSink
     virtual bool onEvent(const SkEvent& evt);
diff --git a/gfx/skia/skia/include/views/SkView.h b/gfx/skia/skia/include/views/SkView.h
index d03c7415ebb2..e099e0d405ad 100644
--- a/gfx/skia/skia/include/views/SkView.h
+++ b/gfx/skia/skia/include/views/SkView.h
@@ -210,7 +210,7 @@ public:
      *  Return true on success; false on failure
      */
     bool        globalToLocal(SkPoint* pt) const {
-        if (NULL != pt) {
+        if (pt) {
             return this->globalToLocal(pt->fX, pt->fY, pt);
         }
         return true;  // nothing to do so return true
@@ -258,7 +258,7 @@ public:
     */
     class Artist : public SkRefCnt {
     public:
-        SK_DECLARE_INST_COUNT(Artist)
+        
 
         void draw(SkView*, SkCanvas*);
         void inflate(const SkDOM&, const SkDOM::Node*);
@@ -286,7 +286,7 @@ public:
     */
     class Layout : public SkRefCnt {
     public:
-        SK_DECLARE_INST_COUNT(Layout)
+        
 
         void layoutChildren(SkView* parent);
         void inflate(const SkDOM&, const SkDOM::Node*);
@@ -337,12 +337,12 @@ protected:
     //! called once before all of the children are drawn (or clipped/translated)
     virtual SkCanvas* beforeChildren(SkCanvas* c) { return c; }
     //! called once after all of the children are drawn (or clipped/translated)
-    virtual void afterChildren(SkCanvas* orig) {}
+    virtual void afterChildren(SkCanvas*) {}
 
     //! called right before this child's onDraw is called
-    virtual void beforeChild(SkView* child, SkCanvas* canvas) {}
+    virtual void beforeChild(SkView* /*child*/, SkCanvas*) {}
     //! called right after this child's onDraw is called
-    virtual void afterChild(SkView* child, SkCanvas* canvas) {}
+    virtual void afterChild(SkView* /*child*/, SkCanvas*) {}
 
     /** Override this if you might handle the click
     */
diff --git a/gfx/skia/skia/include/views/SkWidget.h b/gfx/skia/skia/include/views/SkWidget.h
index 115e9a4cf2bb..3c9363440b50 100644
--- a/gfx/skia/skia/include/views/SkWidget.h
+++ b/gfx/skia/skia/include/views/SkWidget.h
@@ -101,10 +101,10 @@ public:
     SkPushButtonWidget(uint32_t flags = 0) : SkButtonWidget(flags) {}
 
 protected:
-    virtual bool onEvent(const SkEvent&);
-    virtual void onDraw(SkCanvas*);
-    virtual Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE;
-    virtual bool onClick(Click* click);
+    bool onEvent(const SkEvent&) override;
+    void onDraw(SkCanvas*) override;
+    Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) override;
+    bool onClick(Click* click) override;
 
 private:
     typedef SkButtonWidget INHERITED;
diff --git a/gfx/skia/skia/include/views/SkWindow.h b/gfx/skia/skia/include/views/SkWindow.h
index 2a9315dc8c77..f56c27c02230 100644
--- a/gfx/skia/skia/include/views/SkWindow.h
+++ b/gfx/skia/skia/include/views/SkWindow.h
@@ -14,22 +14,33 @@
 #include "SkRegion.h"
 #include "SkEvent.h"
 #include "SkKey.h"
+#include "SkSurfaceProps.h"
 #include "SkTDArray.h"
 
-#ifdef SK_BUILD_FOR_WINCEx
-    #define SHOW_FPS
-#endif
-//#define USE_GX_SCREEN
-
-class SkCanvas;
-
+class SkSurface;
 class SkOSMenu;
 
+#if SK_SUPPORT_GPU
+struct GrGLInterface;
+class GrContext;
+class GrRenderTarget;
+#endif
+
 class SkWindow : public SkView {
 public:
             SkWindow();
     virtual ~SkWindow();
 
+    struct AttachmentInfo {
+        int fSampleCount;
+        int fStencilBits;
+    };
+
+    SkSurfaceProps getSurfaceProps() const { return fSurfaceProps; }
+    void setSurfaceProps(const SkSurfaceProps& props) {
+        fSurfaceProps = props;
+    }
+
     const SkBitmap& getBitmap() const { return fBitmap; }
 
     void    setColorType(SkColorType);
@@ -59,10 +70,11 @@ public:
     void    preConcat(const SkMatrix&);
     void    postConcat(const SkMatrix&);
 
-    virtual SkCanvas* createCanvas();
+    virtual SkSurface* createSurface();
 
     virtual void onPDFSaved(const char title[], const char desc[],
         const char path[]) {}
+
 protected:
     virtual bool onEvent(const SkEvent&);
     virtual bool onDispatchClick(int x, int y, Click::State, void* owner, unsigned modi);
@@ -80,7 +92,13 @@ protected:
     virtual bool onGetFocusView(SkView** focus) const;
     virtual bool onSetFocusView(SkView* focus);
 
+#if SK_SUPPORT_GPU
+    GrRenderTarget* renderTarget(const AttachmentInfo& attachmentInfo,
+                                 const GrGLInterface* , GrContext* grContext);
+#endif
+
 private:
+    SkSurfaceProps  fSurfaceProps;
     SkColorType fColorType;
     SkBitmap    fBitmap;
     SkRegion    fDirtyRgn;
@@ -100,8 +118,8 @@ private:
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#if defined(SK_BUILD_FOR_NACL)
-    #include "SkOSWindow_NaCl.h"
+#if defined(SK_USE_SDL)
+    #include "SkOSWindow_SDL.h"
 #elif defined(SK_BUILD_FOR_MAC)
     #include "SkOSWindow_Mac.h"
 #elif defined(SK_BUILD_FOR_WIN)
@@ -109,9 +127,7 @@ private:
 #elif defined(SK_BUILD_FOR_ANDROID)
     #include "SkOSWindow_Android.h"
 #elif defined(SK_BUILD_FOR_UNIX)
-  #include "SkOSWindow_Unix.h"
-#elif defined(SK_BUILD_FOR_SDL)
-    #include "SkOSWindow_SDL.h"
+    #include "SkOSWindow_Unix.h"
 #elif defined(SK_BUILD_FOR_IOS)
     #include "SkOSWindow_iOS.h"
 #endif
diff --git a/gfx/skia/skia/include/views/android/AndroidKeyToSkKey.h b/gfx/skia/skia/include/views/android/AndroidKeyToSkKey.h
deleted file mode 100644
index 6bcb148b46cf..000000000000
--- a/gfx/skia/skia/include/views/android/AndroidKeyToSkKey.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-/*
- * Copyright 2011 Skia
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#ifndef _ANDROID_TO_SKIA_KEYCODES_H
-#define _ANDROID_TO_SKIA_KEYCODES_H
-
-#include "android/keycodes.h"
-#include "SkKey.h"
-
-// Convert an Android keycode to an SkKey.  This is an incomplete list, only
-// including keys used by the sample app.
-SkKey AndroidKeycodeToSkKey(int keycode) {
-    switch (keycode) {
-        case AKEYCODE_DPAD_LEFT:
-            return kLeft_SkKey;
-        case AKEYCODE_DPAD_RIGHT:
-            return kRight_SkKey;
-        case AKEYCODE_DPAD_UP:
-            return kUp_SkKey;
-        case AKEYCODE_DPAD_DOWN:
-            return kDown_SkKey;
-        case AKEYCODE_BACK:
-            return kBack_SkKey;
-        default:
-            return kNONE_SkKey;
-    }
-}
-
-#endif
diff --git a/gfx/skia/skia/include/views/animated/SkWidgetViews.h b/gfx/skia/skia/include/views/animated/SkWidgetViews.h
index 40346600c342..728eec287624 100644
--- a/gfx/skia/skia/include/views/animated/SkWidgetViews.h
+++ b/gfx/skia/skia/include/views/animated/SkWidgetViews.h
@@ -289,7 +289,7 @@ private:
 
 class SkListSource : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkListSource)
+    
 
     virtual int countFields();
     virtual void getFieldName(int index, SkString* field);
diff --git a/gfx/skia/skia/include/xml/SkBML_WXMLParser.h b/gfx/skia/skia/include/xml/SkBML_WXMLParser.h
index 74f164cbfa47..20239c2b6dfa 100644
--- a/gfx/skia/skia/include/xml/SkBML_WXMLParser.h
+++ b/gfx/skia/skia/include/xml/SkBML_WXMLParser.h
@@ -40,7 +40,7 @@ private:
     char*       fAttrValues[256];
 
     // important that these are U8, so we get automatic wrap-around
-    U8  fNextElem, fNextAttrName, fNextAttrValue;
+    uint8_t  fNextElem, fNextAttrName, fNextAttrValue;
 };
 
 #endif // SkBML_WXMLParser_DEFINED
diff --git a/gfx/skia/skia/include/xml/SkDOM.h b/gfx/skia/skia/include/xml/SkDOM.h
index e0bb744d6d13..14d79cf8af30 100644
--- a/gfx/skia/skia/include/xml/SkDOM.h
+++ b/gfx/skia/skia/include/xml/SkDOM.h
@@ -10,13 +10,16 @@
 #ifndef SkDOM_DEFINED
 #define SkDOM_DEFINED
 
+#include "../private/SkTemplates.h"
 #include "SkChunkAlloc.h"
 #include "SkScalar.h"
-#include "SkTemplates.h"
 
 struct SkDOMNode;
 struct SkDOMAttr;
 
+class SkDOMParser;
+class SkXMLParser;
+
 class SkDOM {
 public:
     SkDOM();
@@ -32,6 +35,9 @@ public:
 
     const Node* getRootNode() const;
 
+    SkXMLParser* beginParsing();
+    const Node* finishParsing();
+
     enum Type {
         kElement_Type,
         kText_Type
@@ -82,8 +88,10 @@ public:
     SkDEBUGCODE(static void UnitTest();)
 
 private:
-    SkChunkAlloc    fAlloc;
-    Node*           fRoot;
+    SkChunkAlloc               fAlloc;
+    Node*                      fRoot;
+    SkAutoTDelete<SkDOMParser> fParser;
+
     friend class AttrIter;
     friend class SkDOMParser;
 };
diff --git a/gfx/skia/skia/include/xml/SkJS.h b/gfx/skia/skia/include/xml/SkJS.h
deleted file mode 100644
index 8a110979627c..000000000000
--- a/gfx/skia/skia/include/xml/SkJS.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#include "SkTypes.h"
-#include "SkWindow.h"
-
-extern "C" {
-    typedef long JSWord;
-    typedef JSWord jsword;
-    typedef jsword  jsval;
-    typedef struct JSRuntime JSRuntime;
-    typedef struct JSContext JSContext;
-    typedef struct JSObject JSObject;
-}
-
-class SkString;
-
-class SkJS : public SkOSWindow {
-public:
-    SkJS(void* hwnd);
-    ~SkJS();
-    SkBool EvaluateScript(const char* script, jsval* rVal);
-    SkBool ValueToString(jsval value, SkString* string);
-#ifdef SK_DEBUG
-    static void Test(void* hwnd);
-#endif
-protected:
-    void InitializeDisplayables(const SkBitmap& , JSContext *, JSObject *, JSObject *);
-    void DisposeDisplayables();
-    JSRuntime *fRuntime;
-    JSContext *fContext;
-    JSObject *fGlobal;
-};
diff --git a/gfx/skia/skia/include/xml/SkXMLWriter.h b/gfx/skia/skia/include/xml/SkXMLWriter.h
index 214fefe86238..4c0935fc219f 100644
--- a/gfx/skia/skia/include/xml/SkXMLWriter.h
+++ b/gfx/skia/skia/include/xml/SkXMLWriter.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkXMLWriter_DEFINED
 #define SkXMLWriter_DEFINED
 
@@ -27,6 +25,7 @@ public:
     void    addAttributeLen(const char name[], const char value[], size_t length);
     void    addHexAttribute(const char name[], uint32_t value, int minDigits = 0);
     void    addScalarAttribute(const char name[], SkScalar value);
+    void    addText(const char text[], size_t length);
     void    endElement() { this->onEndElement(); }
     void    startElement(const char elem[]);
     void    startElementLen(const char elem[], size_t length);
@@ -37,11 +36,18 @@ public:
 protected:
     virtual void onStartElementLen(const char elem[], size_t length) = 0;
     virtual void onAddAttributeLen(const char name[], const char value[], size_t length) = 0;
+    virtual void onAddText(const char text[], size_t length) = 0;
     virtual void onEndElement() = 0;
 
     struct Elem {
+        Elem(const char name[], size_t len)
+            : fName(name, len)
+            , fHasChildren(false)
+            , fHasText(false) {}
+
         SkString    fName;
         bool        fHasChildren;
+        bool        fHasText;
     };
     void doEnd(Elem* elem);
     bool doStart(const char name[], size_t length);
@@ -59,12 +65,15 @@ class SkXMLStreamWriter : public SkXMLWriter {
 public:
     SkXMLStreamWriter(SkWStream*);
     virtual ~SkXMLStreamWriter();
-    virtual void    writeHeader();
+    void writeHeader() override;
     SkDEBUGCODE(static void UnitTest();)
+
 protected:
-    virtual void onStartElementLen(const char elem[], size_t length);
-    virtual void onEndElement();
-    virtual void onAddAttributeLen(const char name[], const char value[], size_t length);
+    void onStartElementLen(const char elem[], size_t length) override;
+    void onEndElement() override;
+    void onAddAttributeLen(const char name[], const char value[], size_t length) override;
+    void onAddText(const char text[], size_t length) override;
+
 private:
     SkWStream&      fStream;
 };
@@ -74,9 +83,10 @@ public:
     SkXMLParserWriter(SkXMLParser*);
     virtual ~SkXMLParserWriter();
 protected:
-    virtual void onStartElementLen(const char elem[], size_t length);
-    virtual void onEndElement();
-    virtual void onAddAttributeLen(const char name[], const char value[], size_t length);
+    void onStartElementLen(const char elem[], size_t length) override;
+    void onEndElement() override;
+    void onAddAttributeLen(const char name[], const char value[], size_t length) override;
+    void onAddText(const char text[], size_t length) override;
 private:
     SkXMLParser&        fParser;
 };
diff --git a/gfx/skia/skia/src/android/SkBitmapRegionCanvas.cpp b/gfx/skia/skia/src/android/SkBitmapRegionCanvas.cpp
new file mode 100644
index 000000000000..bac5dc1ffc79
--- /dev/null
+++ b/gfx/skia/skia/src/android/SkBitmapRegionCanvas.cpp
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkBitmapRegionCanvas.h"
+#include "SkBitmapRegionDecoderPriv.h"
+#include "SkCanvas.h"
+#include "SkCodecPriv.h"
+
+SkBitmapRegionCanvas::SkBitmapRegionCanvas(SkCodec* decoder)
+    : INHERITED(decoder->getInfo().width(), decoder->getInfo().height())
+    , fDecoder(decoder)
+{}
+
+bool SkBitmapRegionCanvas::decodeRegion(SkBitmap* bitmap, SkBRDAllocator* allocator,
+        const SkIRect& desiredSubset, int sampleSize, SkColorType dstColorType,
+        bool requireUnpremul) {
+    // Reject color types not supported by this method
+    if (kIndex_8_SkColorType == dstColorType || kGray_8_SkColorType == dstColorType) {
+        SkCodecPrintf("Error: Color type not supported.\n");
+        return false;
+    }
+
+    // Reject requests for unpremultiplied alpha
+    if (requireUnpremul) {
+        SkCodecPrintf("Error: Alpha type not supported.\n");
+        return false;
+    }
+    SkAlphaType dstAlphaType = fDecoder->getInfo().alphaType();
+    if (kUnpremul_SkAlphaType == dstAlphaType) {
+        dstAlphaType = kPremul_SkAlphaType;
+    }
+
+    // FIXME: Can we add checks and support kIndex8 or unpremultiplied alpha in special cases?
+
+    // Fix the input sampleSize if necessary.
+    if (sampleSize < 1) {
+        sampleSize = 1;
+    }
+
+    // The size of the output bitmap is determined by the size of the
+    // requested subset, not by the size of the intersection of the subset
+    // and the image dimensions.
+    // If inputX is negative, we will need to place decoded pixels into the
+    // output bitmap starting at a left offset.  Call this outX.
+    // If outX is non-zero, subsetX must be zero.
+    // If inputY is negative, we will need to place decoded pixels into the
+    // output bitmap starting at a top offset.  Call this outY.
+    // If outY is non-zero, subsetY must be zero.
+    int outX;
+    int outY;
+    SkIRect subset = desiredSubset;
+    SubsetType type = adjust_subset_rect(fDecoder->getInfo().dimensions(), &subset, &outX, &outY);
+    if (SubsetType::kOutside_SubsetType == type) {
+        return false;
+    }
+
+    // Create the image info for the decode
+    SkImageInfo decodeInfo = SkImageInfo::Make(this->width(), this->height(),
+            dstColorType, dstAlphaType);
+
+    // Start the scanline decoder
+    SkCodec::Result r = fDecoder->startScanlineDecode(decodeInfo);
+    if (SkCodec::kSuccess != r) {
+        SkCodecPrintf("Error: Could not start scanline decoder.\n");
+        return false;
+    }
+
+    // Allocate a bitmap for the unscaled decode
+    SkBitmap tmp;
+    SkImageInfo tmpInfo = decodeInfo.makeWH(this->width(), subset.height());
+    if (!tmp.tryAllocPixels(tmpInfo)) {
+        SkCodecPrintf("Error: Could not allocate pixels.\n");
+        return false;
+    }
+
+    // Skip the unneeded rows
+    if (!fDecoder->skipScanlines(subset.y())) {
+        SkCodecPrintf("Error: Failed to skip scanlines.\n");
+        return false;
+    }
+
+    // Decode the necessary rows
+    fDecoder->getScanlines(tmp.getAddr(0, 0), subset.height(), tmp.rowBytes());
+
+    // Calculate the size of the output
+    const int outWidth = get_scaled_dimension(desiredSubset.width(), sampleSize);
+    const int outHeight = get_scaled_dimension(desiredSubset.height(), sampleSize);
+
+    // Initialize the destination bitmap
+    SkImageInfo dstInfo = decodeInfo.makeWH(outWidth, outHeight);
+    bitmap->setInfo(dstInfo, dstInfo.minRowBytes());
+    if (!bitmap->tryAllocPixels(allocator, nullptr)) {
+        SkCodecPrintf("Error: Could not allocate pixels.\n");
+        return false;
+    }
+
+    // Zero the bitmap if the region is not completely within the image.
+    // TODO (msarett): Can we make this faster by implementing it to only
+    //                 zero parts of the image that we won't overwrite with
+    //                 pixels?
+    if (SubsetType::kPartiallyInside_SubsetType == type) {
+        SkCodec::ZeroInitialized zeroInit = allocator ? allocator->zeroInit() :
+                    SkCodec::kNo_ZeroInitialized;
+        if (SkCodec::kNo_ZeroInitialized == zeroInit) {
+            bitmap->eraseColor(0);
+        }
+    }
+
+    // Use a canvas to crop and scale to the destination bitmap
+    SkCanvas canvas(*bitmap);
+    // TODO (msarett): Maybe we can take advantage of the fact that SkRect uses floats?
+    SkRect src = SkRect::MakeXYWH((SkScalar) subset.x(), (SkScalar) 0,
+            (SkScalar) subset.width(), (SkScalar) subset.height());
+    SkRect dst = SkRect::MakeXYWH((SkScalar) (outX / sampleSize), (SkScalar) (outY / sampleSize),
+            (SkScalar) get_scaled_dimension(subset.width(), sampleSize),
+            (SkScalar) get_scaled_dimension(subset.height(), sampleSize));
+    SkPaint paint;
+    // Overwrite the dst with the src pixels
+    paint.setXfermodeMode(SkXfermode::kSrc_Mode);
+    // TODO (msarett): Test multiple filter qualities.  kNone is the default.
+    canvas.drawBitmapRect(tmp, src, dst, &paint);
+
+    return true;
+}
+
+bool SkBitmapRegionCanvas::conversionSupported(SkColorType colorType) {
+    // SkCanvas does not draw to these color types.
+    if (kIndex_8_SkColorType == colorType || kGray_8_SkColorType == colorType) {
+        return false;
+    }
+
+    // FIXME: Call virtual function when it lands.
+    SkImageInfo info = SkImageInfo::Make(0, 0, colorType, fDecoder->getInfo().alphaType(),
+            fDecoder->getInfo().profileType());
+    return conversion_possible(info, fDecoder->getInfo());
+}
diff --git a/gfx/skia/skia/src/android/SkBitmapRegionCanvas.h b/gfx/skia/skia/src/android/SkBitmapRegionCanvas.h
new file mode 100644
index 000000000000..2edbf1ff3bdd
--- /dev/null
+++ b/gfx/skia/skia/src/android/SkBitmapRegionCanvas.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkBitmap.h"
+#include "SkBitmapRegionDecoder.h"
+#include "SkCodec.h"
+
+/*
+ * This class implements SkBitmapRegionDecoder using an SkCodec and
+ * an SkCanvas.  It uses the scanline decoder to subset the height.  It then
+ * will subset the width and scale by drawing to an SkCanvas.
+ */
+// FIXME (msarett): This implementation does not support WEBP, because WEBP
+// does not have a scanline decoder.
+class SkBitmapRegionCanvas : public SkBitmapRegionDecoder {
+public:
+
+    /*
+     * Takes ownership of pointer to decoder
+     */
+    SkBitmapRegionCanvas(SkCodec* decoder);
+
+    bool decodeRegion(SkBitmap* bitmap, SkBRDAllocator* allocator,
+                      const SkIRect& desiredSubset, int sampleSize,
+                      SkColorType colorType, bool requireUnpremul) override;
+
+    bool conversionSupported(SkColorType colorType) override;
+
+    SkEncodedFormat getEncodedFormat() override { return fDecoder->getEncodedFormat(); }
+
+private:
+
+    SkAutoTDelete<SkCodec> fDecoder;
+
+    typedef SkBitmapRegionDecoder INHERITED;
+
+};
diff --git a/gfx/skia/skia/src/android/SkBitmapRegionCodec.cpp b/gfx/skia/skia/src/android/SkBitmapRegionCodec.cpp
new file mode 100644
index 000000000000..415b60c5ab35
--- /dev/null
+++ b/gfx/skia/skia/src/android/SkBitmapRegionCodec.cpp
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkAndroidCodec.h"
+#include "SkBitmapRegionCodec.h"
+#include "SkBitmapRegionDecoderPriv.h"
+#include "SkCodecPriv.h"
+#include "SkPixelRef.h"
+
+SkBitmapRegionCodec::SkBitmapRegionCodec(SkAndroidCodec* codec)
+    : INHERITED(codec->getInfo().width(), codec->getInfo().height())
+    , fCodec(codec)
+{}
+
+bool SkBitmapRegionCodec::decodeRegion(SkBitmap* bitmap, SkBRDAllocator* allocator,
+        const SkIRect& desiredSubset, int sampleSize, SkColorType dstColorType,
+        bool requireUnpremul) {
+
+    // Fix the input sampleSize if necessary.
+    if (sampleSize < 1) {
+        sampleSize = 1;
+    }
+
+    // The size of the output bitmap is determined by the size of the
+    // requested subset, not by the size of the intersection of the subset
+    // and the image dimensions.
+    // If inputX is negative, we will need to place decoded pixels into the
+    // output bitmap starting at a left offset.  Call this outX.
+    // If outX is non-zero, subsetX must be zero.
+    // If inputY is negative, we will need to place decoded pixels into the
+    // output bitmap starting at a top offset.  Call this outY.
+    // If outY is non-zero, subsetY must be zero.
+    int outX;
+    int outY;
+    SkIRect subset = desiredSubset;
+    SubsetType type = adjust_subset_rect(fCodec->getInfo().dimensions(), &subset, &outX, &outY);
+    if (SubsetType::kOutside_SubsetType == type) {
+        return false;
+    }
+
+    // Ask the codec for a scaled subset
+    if (!fCodec->getSupportedSubset(&subset)) {
+        SkCodecPrintf("Error: Could not get subset.\n");
+        return false;
+    }
+    SkISize scaledSize = fCodec->getSampledSubsetDimensions(sampleSize, subset);
+
+    // Create the image info for the decode
+    SkAlphaType dstAlphaType = fCodec->getInfo().alphaType();
+    if (kOpaque_SkAlphaType != dstAlphaType) {
+        dstAlphaType = requireUnpremul ? kUnpremul_SkAlphaType : kPremul_SkAlphaType;
+    }
+    SkImageInfo decodeInfo = SkImageInfo::Make(scaledSize.width(), scaledSize.height(),
+            dstColorType, dstAlphaType);
+
+    // Construct a color table for the decode if necessary
+    SkAutoTUnref<SkColorTable> colorTable(nullptr);
+    SkPMColor* colorPtr = nullptr;
+    int* colorCountPtr = nullptr;
+    int maxColors = 256;
+    SkPMColor colors[256];
+    if (kIndex_8_SkColorType == dstColorType) {
+        // TODO (msarett): This performs a copy that is unnecessary since
+        //                 we have not yet initialized the color table.
+        //                 And then we need to use a const cast to get
+        //                 a pointer to the color table that we can
+        //                 modify during the decode.  We could alternatively
+        //                 perform the decode before creating the bitmap and
+        //                 the color table.  We still would need to copy the
+        //                 colors into the color table after the decode.
+        colorTable.reset(new SkColorTable(colors, maxColors));
+        colorPtr = const_cast<SkPMColor*>(colorTable->readColors());
+        colorCountPtr = &maxColors;
+    }
+
+    // Initialize the destination bitmap
+    int scaledOutX = 0;
+    int scaledOutY = 0;
+    int scaledOutWidth = scaledSize.width();
+    int scaledOutHeight = scaledSize.height();
+    if (SubsetType::kPartiallyInside_SubsetType == type) {
+        scaledOutX = outX / sampleSize;
+        scaledOutY = outY / sampleSize;
+        // We need to be safe here because getSupportedSubset() may have modified the subset.
+        const int extraX = SkTMax(0, desiredSubset.width() - outX - subset.width());
+        const int extraY = SkTMax(0, desiredSubset.height() - outY - subset.height());
+        const int scaledExtraX = extraX / sampleSize;
+        const int scaledExtraY = extraY / sampleSize;
+        scaledOutWidth += scaledOutX + scaledExtraX;
+        scaledOutHeight += scaledOutY + scaledExtraY;
+    }
+    SkImageInfo outInfo = decodeInfo.makeWH(scaledOutWidth, scaledOutHeight);
+    bitmap->setInfo(outInfo);
+    if (!bitmap->tryAllocPixels(allocator, colorTable.get())) {
+        SkCodecPrintf("Error: Could not allocate pixels.\n");
+        return false;
+    }
+
+    // Zero the bitmap if the region is not completely within the image.
+    // TODO (msarett): Can we make this faster by implementing it to only
+    //                 zero parts of the image that we won't overwrite with
+    //                 pixels?
+    SkCodec::ZeroInitialized zeroInit = allocator ? allocator->zeroInit() :
+            SkCodec::kNo_ZeroInitialized;
+    if (SubsetType::kPartiallyInside_SubsetType == type &&
+            SkCodec::kNo_ZeroInitialized == zeroInit) {
+        void* pixels = bitmap->getPixels();
+        size_t bytes = outInfo.getSafeSize(bitmap->rowBytes());
+        memset(pixels, 0, bytes);
+    }
+
+    // Decode into the destination bitmap
+    SkAndroidCodec::AndroidOptions options;
+    options.fSampleSize = sampleSize;
+    options.fSubset = &subset;
+    options.fColorPtr = colorPtr;
+    options.fColorCount = colorCountPtr;
+    options.fZeroInitialized = zeroInit;
+    void* dst = bitmap->getAddr(scaledOutX, scaledOutY);
+
+    // FIXME: skbug.com/4538
+    // It is important that we use the rowBytes on the pixelRef.  They may not be
+    // set properly on the bitmap.
+    SkPixelRef* pr = SkRef(bitmap->pixelRef());
+    size_t rowBytes = pr->rowBytes();
+    bitmap->setInfo(outInfo, rowBytes);
+    bitmap->setPixelRef(pr)->unref();
+    bitmap->lockPixels();
+    SkCodec::Result result = fCodec->getAndroidPixels(decodeInfo, dst, rowBytes, &options);
+    if (SkCodec::kSuccess != result && SkCodec::kIncompleteInput != result) {
+        SkCodecPrintf("Error: Could not get pixels.\n");
+        return false;
+    }
+
+    return true;
+}
+
+bool SkBitmapRegionCodec::conversionSupported(SkColorType colorType) {
+    // FIXME: Call virtual function when it lands.
+    SkImageInfo info = SkImageInfo::Make(0, 0, colorType, fCodec->getInfo().alphaType(),
+            fCodec->getInfo().profileType());
+    return conversion_possible(info, fCodec->getInfo());
+}
diff --git a/gfx/skia/skia/src/android/SkBitmapRegionCodec.h b/gfx/skia/skia/src/android/SkBitmapRegionCodec.h
new file mode 100644
index 000000000000..79774173b0e3
--- /dev/null
+++ b/gfx/skia/skia/src/android/SkBitmapRegionCodec.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkBitmap.h"
+#include "SkBitmapRegionDecoder.h"
+#include "SkAndroidCodec.h"
+
+/*
+ * This class implements SkBitmapRegionDecoder using an SkAndroidCodec.
+ */
+class SkBitmapRegionCodec : public SkBitmapRegionDecoder {
+public:
+
+    /*
+     * Takes ownership of pointer to codec
+     */
+    SkBitmapRegionCodec(SkAndroidCodec* codec);
+
+    bool decodeRegion(SkBitmap* bitmap, SkBRDAllocator* allocator,
+                      const SkIRect& desiredSubset, int sampleSize,
+                      SkColorType colorType, bool requireUnpremul) override;
+
+    bool conversionSupported(SkColorType colorType) override;
+
+    SkEncodedFormat getEncodedFormat() override { return fCodec->getEncodedFormat(); }
+
+private:
+
+    SkAutoTDelete<SkAndroidCodec> fCodec;
+
+    typedef SkBitmapRegionDecoder INHERITED;
+
+};
diff --git a/gfx/skia/skia/src/android/SkBitmapRegionDecoder.cpp b/gfx/skia/skia/src/android/SkBitmapRegionDecoder.cpp
new file mode 100644
index 000000000000..a153282b0943
--- /dev/null
+++ b/gfx/skia/skia/src/android/SkBitmapRegionDecoder.cpp
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkBitmapRegionCanvas.h"
+#include "SkBitmapRegionCodec.h"
+#include "SkBitmapRegionDecoder.h"
+#include "SkAndroidCodec.h"
+#include "SkCodec.h"
+#include "SkCodecPriv.h"
+#include "SkImageDecoder.h"
+
+SkBitmapRegionDecoder* SkBitmapRegionDecoder::Create(
+        SkData* data, Strategy strategy) {
+    return SkBitmapRegionDecoder::Create(new SkMemoryStream(data),
+            strategy);
+}
+
+SkBitmapRegionDecoder* SkBitmapRegionDecoder::Create(
+        SkStreamRewindable* stream, Strategy strategy) {
+    SkAutoTDelete<SkStreamRewindable> streamDeleter(stream);
+    switch (strategy) {
+        case kCanvas_Strategy: {
+            SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(streamDeleter.detach()));
+            if (nullptr == codec) {
+                SkCodecPrintf("Error: Failed to create decoder.\n");
+                return nullptr;
+            }
+
+            SkEncodedFormat format = codec->getEncodedFormat();
+            switch (format) {
+                case SkEncodedFormat::kJPEG_SkEncodedFormat:
+                case SkEncodedFormat::kPNG_SkEncodedFormat:
+                    break;
+                default:
+                    // FIXME: Support webp using a special case.  Webp does not support
+                    //        scanline decoding.
+                    return nullptr;
+            }
+
+            // If the image is a jpeg or a png, the scanline ordering should always be
+            // kTopDown or kNone.  It is relevant to check because this implementation
+            // only supports these two scanline orderings.
+            SkASSERT(SkCodec::kTopDown_SkScanlineOrder == codec->getScanlineOrder() ||
+                    SkCodec::kNone_SkScanlineOrder == codec->getScanlineOrder());
+
+            return new SkBitmapRegionCanvas(codec.detach());
+        }
+        case kAndroidCodec_Strategy: {
+            SkAutoTDelete<SkAndroidCodec> codec =
+                    SkAndroidCodec::NewFromStream(streamDeleter.detach());
+            if (nullptr == codec) {
+                SkCodecPrintf("Error: Failed to create codec.\n");
+                return NULL;
+            }
+
+            SkEncodedFormat format = codec->getEncodedFormat();
+            switch (format) {
+                case SkEncodedFormat::kJPEG_SkEncodedFormat:
+                case SkEncodedFormat::kPNG_SkEncodedFormat:
+                case SkEncodedFormat::kWEBP_SkEncodedFormat:
+                    break;
+                default:
+                    return nullptr;
+            }
+
+            return new SkBitmapRegionCodec(codec.detach());
+        }
+        default:
+            SkASSERT(false);
+            return nullptr;
+    }
+}
diff --git a/gfx/skia/skia/src/android/SkBitmapRegionDecoderPriv.h b/gfx/skia/skia/src/android/SkBitmapRegionDecoderPriv.h
new file mode 100644
index 000000000000..baa891e9c313
--- /dev/null
+++ b/gfx/skia/skia/src/android/SkBitmapRegionDecoderPriv.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkBitmapRegionDecoderPriv_DEFINED
+#define SkBitmapRegionDecoderPriv_DEFINED
+
+enum SubsetType {
+    kFullyInside_SubsetType,
+    kPartiallyInside_SubsetType,
+    kOutside_SubsetType,
+};
+
+/*
+ * Corrects image subset offsets and dimensions in order to perform a valid decode.
+ * Also indicates if the image subset should be placed at an offset within the
+ * output bitmap.
+ *
+ * Values of output variables are undefined if the SubsetType is kInvalid.
+ *
+ * @param imageDims Original image dimensions.
+ * @param subset    As input, the subset that the client requested.
+ *                  As output, the image subset that we will decode.
+ * @param outX      The left offset of the image subset within the output bitmap.
+ * @param outY      The top offset of the image subset within the output bitmap.
+ *
+ * @return An indication of how the subset is contained in the image.
+ *         If the return value is kInvalid, values of output variables are undefined.
+ */
+inline SubsetType adjust_subset_rect(const SkISize& imageDims, SkIRect* subset, int* outX,
+        int* outY) {
+    // These must be at least zero, we can't start decoding the image at a negative coordinate.
+    int left = SkTMax(0, subset->fLeft);
+    int top = SkTMax(0, subset->fTop);
+
+    // If input offsets are less than zero, we decode to an offset location in the output bitmap.
+    *outX = left - subset->fLeft;
+    *outY = top - subset->fTop;
+
+    // Make sure we don't decode pixels past the edge of the image or past the edge of the subset.
+    int width = SkTMin(imageDims.width() - left, subset->width() - *outX);
+    int height = SkTMin(imageDims.height() - top, subset->height() - *outY);
+    if (width <= 0 || height <= 0) {
+        return SubsetType::kOutside_SubsetType;
+    }
+
+    subset->setXYWH(left, top, width, height);
+    if ((*outX != 0) || (*outY != 0) || (width != subset->width()) ||
+            (height != subset->height())) {
+        return SubsetType::kPartiallyInside_SubsetType;
+    }
+
+    return SubsetType::kFullyInside_SubsetType;
+}
+
+#endif // SkBitmapRegionDecoderPriv_DEFINED
diff --git a/gfx/skia/skia/src/animator/SkDrawable.cpp b/gfx/skia/skia/src/animator/SkADrawable.cpp
similarity index 51%
rename from gfx/skia/skia/src/animator/SkDrawable.cpp
rename to gfx/skia/skia/src/animator/SkADrawable.cpp
index 610c39761b30..9ac4095e12b5 100644
--- a/gfx/skia/skia/src/animator/SkDrawable.cpp
+++ b/gfx/skia/skia/src/animator/SkADrawable.cpp
@@ -7,18 +7,18 @@
  */
 
 
-#include "SkDrawable.h"
+#include "SkADrawable.h"
 
-bool SkDrawable::doEvent(SkDisplayEvent::Kind , SkEventState* ) {
+bool SkADrawable::doEvent(SkDisplayEvent::Kind , SkEventState* ) {
     return false;
 }
 
-bool SkDrawable::isDrawable() const {
+bool SkADrawable::isDrawable() const {
     return true;
 }
 
-void SkDrawable::initialize() {
+void SkADrawable::initialize() {
 }
 
-void SkDrawable::setSteps(int steps) {
+void SkADrawable::setSteps(int steps) {
 }
diff --git a/gfx/skia/skia/src/animator/SkDrawable.h b/gfx/skia/skia/src/animator/SkADrawable.h
similarity index 79%
rename from gfx/skia/skia/src/animator/SkDrawable.h
rename to gfx/skia/skia/src/animator/SkADrawable.h
index 6bb960854131..26be50d3e964 100644
--- a/gfx/skia/skia/src/animator/SkDrawable.h
+++ b/gfx/skia/skia/src/animator/SkADrawable.h
@@ -7,8 +7,8 @@
  */
 
 
-#ifndef SkDrawable_DEFINED
-#define SkDrawable_DEFINED
+#ifndef SkADrawable_DEFINED
+#define SkADrawable_DEFINED
 
 #include "SkDisplayable.h"
 #include "SkDisplayEvent.h"
@@ -16,7 +16,7 @@
 
 struct SkEventState;
 
-class SkDrawable :  public SkDisplayable {
+class SkADrawable :  public SkDisplayable {
 public:
     virtual bool doEvent(SkDisplayEvent::Kind , SkEventState* state );
     virtual bool draw(SkAnimateMaker& ) = 0;
@@ -25,4 +25,4 @@ public:
     virtual void setSteps(int steps);
 };
 
-#endif // SkDrawable_DEFINED
+#endif // SkADrawable_DEFINED
diff --git a/gfx/skia/skia/src/animator/SkAnimate.h b/gfx/skia/skia/src/animator/SkAnimate.h
index 1bbecf90cfe4..ee391fcd93fb 100644
--- a/gfx/skia/skia/src/animator/SkAnimate.h
+++ b/gfx/skia/skia/src/animator/SkAnimate.h
@@ -19,11 +19,11 @@ class SkAnimate : public SkAnimateBase {
     DECLARE_MEMBER_INFO(Animate);
     SkAnimate();
     virtual ~SkAnimate();
-    virtual int components();
+    int components() override;
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
+    void dump(SkAnimateMaker* ) override;
 #endif
-    virtual void onEndElement(SkAnimateMaker& maker);
+    void onEndElement(SkAnimateMaker& maker) override;
 protected:
     bool resolveCommon(SkAnimateMaker& );
     int fComponents;
diff --git a/gfx/skia/skia/src/animator/SkAnimateActive.cpp b/gfx/skia/skia/src/animator/SkAnimateActive.cpp
index 46b849b51979..0dbe9c9f0f18 100644
--- a/gfx/skia/skia/src/animator/SkAnimateActive.cpp
+++ b/gfx/skia/skia/src/animator/SkAnimateActive.cpp
@@ -31,7 +31,7 @@ void SkActive::init()
     fState.setCount(animators);
     int index;
     for (index = 0; index < animators; index++)
-        fInterpolators[index] = SkNEW(SkOperandInterpolator);
+        fInterpolators[index] = new SkOperandInterpolator;
     initState(&fApply, 0);
 //  for (index = 0; index < animators; index++)
 //      fState[index].bumpSave();
@@ -65,7 +65,7 @@ void SkActive::append(SkApply* apply) {
     fInterpolators.setCount(total);
     memset(&fInterpolators.begin()[oldCount], 0, newCount * sizeof(SkOperandInterpolator*));
     for (index = oldCount; index < total; index++)
-        fInterpolators[index] = SkNEW(SkOperandInterpolator);
+        fInterpolators[index] = new SkOperandInterpolator;
     fAnimators.setCount(total);
     memcpy(&fAnimators[oldCount], animates.begin(), sizeof(fAnimators[0]) *
         newCount);
@@ -152,7 +152,7 @@ void SkActive::calcDurations(int index)
 //      SkScriptValue value;
 //      value.fOperand = animate->getValues()[entries - 1];
 //      value.fType = animate->getValuesType();
-//      bool result = SkScriptEngine::ConvertTo(NULL, SkType_Int, &value);
+//      bool result = SkScriptEngine::ConvertTo(nullptr, SkType_Int, &value);
 //      SkASSERT(result);
 //      duration = value.fOperand.fS32 * SK_MSec1;
 //      break;
@@ -164,7 +164,7 @@ void SkActive::calcDurations(int index)
         fMaxTime = maxTime;
 }
 
-void SkActive::create(SkDrawable* drawable, SkMSec time) {
+void SkActive::create(SkADrawable* drawable, SkMSec time) {
     fApply.fLastTime = time;
     fApply.refresh(fMaker);
     for (int index = 0; index < fAnimators.count(); index++) {
@@ -174,7 +174,7 @@ void SkActive::create(SkDrawable* drawable, SkMSec time) {
         if (animate->formula.size() > 0) {
             SkTDOperandArray values;
             values.setCount(count);
-            SkDEBUGCODE(bool success = ) animate->fFieldInfo->setValue(fMaker, &values, 0, 0, NULL,
+            SkDEBUGCODE(bool success = ) animate->fFieldInfo->setValue(fMaker, &values, 0, 0, nullptr,
                 animate->getValuesType(), animate->formula);
             SkASSERT(success);
             fApply.applyValues(index, values.begin(), count, animate->getValuesType(), time);
@@ -191,7 +191,7 @@ void SkActive::create(SkDrawable* drawable, SkMSec time) {
 bool SkActive::immediate(bool enable) {
     SkMSec time = 0;
     bool result = false;
-    SkDrawable* drawable = fApply.scope;
+    SkADrawable* drawable = fApply.scope;
     SkMSec final = fMaxTime;
     do {
         bool applied = fAnimators.count() == 0;
@@ -212,7 +212,7 @@ bool SkActive::immediate(bool enable) {
             if (animate->formula.size() > 0) {
                 SkTDOperandArray values;
                 values.setCount(count);
-                SkDEBUGCODE(bool success = ) animate->fFieldInfo->setValue(fMaker, &values, 0, 0, NULL,
+                SkDEBUGCODE(bool success = ) animate->fFieldInfo->setValue(fMaker, &values, 0, 0, nullptr,
                     animate->getValuesType(), animate->formula);
                 SkASSERT(success);
                 fApply.applyValues(index, values.begin(), count, animate->getValuesType(), time);
@@ -368,7 +368,7 @@ void SkActive::saveInterpolatorValues(int index) {
 }
 
 void SkActive::setInterpolator(int index, SkOperand* from) {
-    if (from == NULL) // legitimate for set string
+    if (from == nullptr) // legitimate for set string
         return;
     SkAnimateBase* animate = fAnimators[index];
     int entries = animate->entries();
diff --git a/gfx/skia/skia/src/animator/SkAnimateActive.h b/gfx/skia/skia/src/animator/SkAnimateActive.h
index 33d0164cea5e..2bc458bae0b3 100644
--- a/gfx/skia/skia/src/animator/SkAnimateActive.h
+++ b/gfx/skia/skia/src/animator/SkAnimateActive.h
@@ -23,7 +23,7 @@ public:
     void advance();
     void append(SkApply* );
     void calcDurations(int index);
-    void create(SkDrawable* scope, SkMSec time);
+    void create(SkADrawable* scope, SkMSec time);
     bool draw() { return immediate(false); }
     bool enable() { return immediate(true); }
     void init( );
diff --git a/gfx/skia/skia/src/animator/SkAnimateBase.cpp b/gfx/skia/skia/src/animator/SkAnimateBase.cpp
index 8467ce6f3582..a4b2c64d1eb8 100644
--- a/gfx/skia/skia/src/animator/SkAnimateBase.cpp
+++ b/gfx/skia/skia/src/animator/SkAnimateBase.cpp
@@ -12,7 +12,7 @@
 #include "SkAnimateProperties.h"
 #include "SkAnimatorScript.h"
 #include "SkDisplayApply.h"
-#include "SkDrawable.h"
+#include "SkADrawable.h"
 
 #if SK_USE_CONDENSED_INFO == 0
 
@@ -39,7 +39,7 @@ const SkMemberInfo SkAnimateBase::fInfo[] = {
 DEFINE_GET_MEMBER(SkAnimateBase);
 
 SkAnimateBase::SkAnimateBase() : begin(0), dur(1), repeat(SK_Scalar1),
-        fApply(NULL), fFieldInfo(NULL), fFieldOffset(0), fStart((SkMSec) -1), fTarget(NULL),
+        fApply(nullptr), fFieldInfo(nullptr), fFieldOffset(0), fStart((SkMSec) -1), fTarget(nullptr),
         fChanged(0), fDelayed(0), fDynamic(0), fHasEndEvent(0), fHasValues(0),
         fMirror(0), fReset(0), fResetPending(0), fTargetIsScope(0) {
     blend.setCount(1);
@@ -91,7 +91,7 @@ void SkAnimateBase::dump(SkAnimateMaker* maker) {
         SkDebugf("to=\"%s\" ", to.c_str());
     }
     if (begin != 0) {
-        SkDebugf("begin=\"%g\" ", SkScalarToFloat(SkScalarDiv(begin,1000)));
+        SkDebugf("begin=\"%g\" ", begin * 0.001);
     }
 }
 #endif
@@ -116,7 +116,7 @@ returnBool:
             value->fType = SkType_Boolean;
             break;
         case SK_PROPERTY(step):
-            if (fApply == NULL)
+            if (fApply == nullptr)
                 return false;    // !!! notify there's an error?
             fApply->getStep(value);
             break;
@@ -148,7 +148,7 @@ void SkAnimateBase::onEndElement(SkAnimateMaker& maker) {
         // lval must be of the form x[y]
         const char* lvalStr = lval.c_str();
         const char* arrayEnd = strchr(lvalStr, '[');
-        if (arrayEnd == NULL)
+        if (arrayEnd == nullptr)
             return; //should this return an error?
         size_t arrayNameLen = arrayEnd - lvalStr;
         SkString arrayStr(lvalStr, arrayNameLen);
diff --git a/gfx/skia/skia/src/animator/SkAnimateBase.h b/gfx/skia/skia/src/animator/SkAnimateBase.h
index df8d38ac1800..0da4af1173c3 100644
--- a/gfx/skia/skia/src/animator/SkAnimateBase.h
+++ b/gfx/skia/skia/src/animator/SkAnimateBase.h
@@ -16,7 +16,7 @@
 #include "SkTypedArray.h"
 
 class SkApply;
-class SkDrawable;
+class SkADrawable;
 
 class SkAnimateBase : public SkDisplayable {
 public:
@@ -24,26 +24,26 @@ public:
     SkAnimateBase();
     virtual ~SkAnimateBase();
     virtual int components();
-    virtual SkDisplayable* deepCopy(SkAnimateMaker* );
-    virtual void dirty();
+    SkDisplayable* deepCopy(SkAnimateMaker* ) override;
+    void dirty() override;
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
+    void dump(SkAnimateMaker* ) override;
 #endif
     int entries() { return fValues.count() / components(); }
     virtual bool hasExecute() const;
     bool isDynamic() const { return SkToBool(fDynamic); }
-    virtual SkDisplayable* getParent() const;
-    virtual bool getProperty(int index, SkScriptValue* value) const;
+    SkDisplayable* getParent() const override;
+    bool getProperty(int index, SkScriptValue* value) const override;
     SkMSec getStart() const { return fStart; }
     SkOperand* getValues() { return fValues.begin(); }
     SkDisplayTypes getValuesType() { return fValues.getType(); }
-    virtual void onEndElement(SkAnimateMaker& );
+    void onEndElement(SkAnimateMaker& ) override;
     void packARGB(SkScalar [], int count, SkTDOperandArray* );
     virtual void refresh(SkAnimateMaker& );
     void setChanged(bool changed) { fChanged = changed; }
     void setHasEndEvent() { fHasEndEvent = true; }
-    virtual bool setParent(SkDisplayable* );
-    virtual bool setProperty(int index, SkScriptValue& value);
+    bool setParent(SkDisplayable* ) override;
+    bool setProperty(int index, SkScriptValue& value) override;
     void setTarget(SkAnimateMaker& );
     virtual bool targetNeedsInitialization() const;
 protected:
@@ -62,7 +62,7 @@ protected:
     const SkMemberInfo* fFieldInfo;
     int fFieldOffset;
     SkMSec fStart;  // corrected time when this apply was enabled
-    SkDrawable* fTarget;
+    SkADrawable* fTarget;
     SkTypedArray fValues;
     unsigned fChanged : 1; // true when value referenced by script has changed
     unsigned fDelayed : 1;  // enabled, but undrawn pending delay
diff --git a/gfx/skia/skia/src/animator/SkAnimateField.cpp b/gfx/skia/skia/src/animator/SkAnimateField.cpp
index 0f92989dccfd..00113823eec3 100644
--- a/gfx/skia/skia/src/animator/SkAnimateField.cpp
+++ b/gfx/skia/skia/src/animator/SkAnimateField.cpp
@@ -9,7 +9,7 @@
 
 #include "SkAnimate.h"
 #include "SkAnimateMaker.h"
-#include "SkDrawable.h"
+#include "SkADrawable.h"
 #include "SkParse.h"
 
 #if SK_USE_CONDENSED_INFO == 0
@@ -41,7 +41,7 @@ void SkAnimate::dump(SkAnimateMaker* maker) {
             SkDebugf("mirror=\"true\" ");
         if (fReset)
             SkDebugf("reset=\"true\" ");
-        SkDebugf("dur=\"%g\" ", SkScalarToFloat(SkScalarDiv(dur,1000)));
+        SkDebugf("dur=\"%g\" ", dur * 0.001);
         if (repeat != SK_Scalar1)
             SkDebugf("repeat=\"%g\" ", SkScalarToFloat(repeat));
         //if (fHasValues)
@@ -63,7 +63,7 @@ void SkAnimate::dump(SkAnimateMaker* maker) {
 #endif
 
 bool SkAnimate::resolveCommon(SkAnimateMaker& maker) {
-    if (fTarget == NULL) // if NULL, recall onEndElement after apply closes and sets target to scope
+    if (fTarget == nullptr) // if nullptr, recall onEndElement after apply closes and sets target to scope
         return false;
     INHERITED::onEndElement(maker);
     return maker.hasError() == false;
@@ -71,16 +71,16 @@ bool SkAnimate::resolveCommon(SkAnimateMaker& maker) {
 
 void SkAnimate::onEndElement(SkAnimateMaker& maker) {
     bool resolved = resolveCommon(maker);
-    if (resolved && fFieldInfo == NULL) {
+    if (resolved && fFieldInfo == nullptr) {
         maker.setErrorNoun(field);
         maker.setErrorCode(SkDisplayXMLParserError::kFieldNotInTarget);
     }
-    if (resolved == false || fFieldInfo == NULL)
+    if (resolved == false || fFieldInfo == nullptr)
         return;
     SkDisplayTypes outType = fFieldInfo->getType();
     if (fHasValues) {
         SkASSERT(to.size() > 0);
-        fFieldInfo->setValue(maker, &fValues, 0, 0, NULL, outType, to);
+        fFieldInfo->setValue(maker, &fValues, 0, 0, nullptr, outType, to);
         SkASSERT(0);
         // !!! this needs to set fComponents
         return;
diff --git a/gfx/skia/skia/src/animator/SkAnimateMaker.cpp b/gfx/skia/skia/src/animator/SkAnimateMaker.cpp
index a3ebb642fe7c..0c28c7bd57c9 100644
--- a/gfx/skia/skia/src/animator/SkAnimateMaker.cpp
+++ b/gfx/skia/skia/src/animator/SkAnimateMaker.cpp
@@ -28,8 +28,8 @@ class DefaultTimeline : public SkAnimator::Timeline {
 } gDefaultTimeline;
 
 SkAnimateMaker::SkAnimateMaker(SkAnimator* animator, SkCanvas* canvas, SkPaint* paint)
-    : fActiveEvent(NULL), fAdjustedStart(0), fCanvas(canvas), fEnableTime(0),
-        fHostEventSinkID(0), fMinimumInterval((SkMSec) -1), fPaint(paint), fParentMaker(NULL),
+    : fActiveEvent(nullptr), fAdjustedStart(0), fCanvas(canvas), fEnableTime(0),
+        fHostEventSinkID(0), fMinimumInterval((SkMSec) -1), fPaint(paint), fParentMaker(nullptr),
         fTimeline(&gDefaultTimeline), fInInclude(false), fInMovie(false),
         fFirstScriptError(false), fLoaded(false), fIDs(256), fAnimator(animator)
 {
@@ -66,8 +66,8 @@ void SkAnimateMaker::clearExtraPropertyCallBack(SkDisplayTypes type) {
     for (SkExtras** extraPtr = fExtras.begin(); extraPtr < end; extraPtr++) {
         SkExtras* extra = *extraPtr;
         if (extra->definesType(type)) {
-            extra->fExtraCallBack = NULL;
-            extra->fExtraStorage = NULL;
+            extra->fExtraCallBack = nullptr;
+            extra->fExtraStorage = nullptr;
             break;
         }
     }
@@ -84,7 +84,7 @@ SkDisplayable* SkAnimateMaker::createInstance(const char name[], size_t len) {
     SkDisplayTypes type = SkDisplayType::GetType(this, name, len );
     if ((int)type >= 0)
         return SkDisplayType::CreateInstance(this, type);
-    return NULL;
+    return nullptr;
 }
 
 // differs from SkAnimator::decodeStream in that it does not reset error state
@@ -99,7 +99,7 @@ bool SkAnimateMaker::decodeURI(const char uri[]) {
 //  SkDebugf("animator decode %s\n", uri);
 
 //    SkStream* stream = SkStream::GetURIStream(fPrefix.c_str(), uri);
-    SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(uri));
+    SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(uri));
     if (stream.get()) {
         bool success = decodeStream(stream);
         if (hasError() && fError.hasNoun() == false)
@@ -181,7 +181,7 @@ void SkAnimateMaker::dump(const char* match) {
         SkTDict<SkDisplayable*>::Iter iter(fIDs);
         const char* name;
         SkDisplayable* result;
-        while ((name = iter.next(&result)) != NULL) {
+        while ((name = iter.next(&result)) != nullptr) {
             if (strcmp(match,name) == 0)
                 result->dump(this);
         }
@@ -213,7 +213,7 @@ SkAnimator* SkAnimateMaker::getRoot()
     SkAnimateMaker* maker = this;
     while (maker->fParentMaker)
         maker = maker->fParentMaker;
-    return maker == this ? NULL : maker->fAnimator;
+    return maker == this ? nullptr : maker->fAnimator;
 }
 #endif
 
@@ -235,8 +235,8 @@ void SkAnimateMaker::loadMovies() {
         SkASSERT(displayable->getType() == SkType_Movie);
         SkDisplayMovie* movie = (SkDisplayMovie*) displayable;
         SkAnimateMaker* movieMaker = movie->fMovie.fMaker;
-        movieMaker->fEvents.doEvent(*movieMaker, SkDisplayEvent::kOnload, NULL);
-        movieMaker->fEvents.removeEvent(SkDisplayEvent::kOnload, NULL);
+        movieMaker->fEvents.doEvent(*movieMaker, SkDisplayEvent::kOnload, nullptr);
+        movieMaker->fEvents.removeEvent(SkDisplayEvent::kOnload, nullptr);
         movieMaker->loadMovies();
     }
 }
@@ -271,14 +271,14 @@ void SkAnimateMaker::reset() {
 }
 
 void SkAnimateMaker::removeActive(SkActive* active) {
-    if (active == NULL)
+    if (active == nullptr)
         return;
     fDisplayList.remove(active);
 }
 
 bool SkAnimateMaker::resolveID(SkDisplayable* displayable, SkDisplayable* original) {
     SkString newID;
-    bool success = computeID(original, NULL, &newID);
+    bool success = computeID(original, nullptr, &newID);
     if (success)
         setID(displayable, newID);
     return success;
diff --git a/gfx/skia/skia/src/animator/SkAnimateMaker.h b/gfx/skia/skia/src/animator/SkAnimateMaker.h
index a5abff735588..035affa56117 100644
--- a/gfx/skia/skia/src/animator/SkAnimateMaker.h
+++ b/gfx/skia/skia/src/animator/SkAnimateMaker.h
@@ -30,7 +30,7 @@ class SkActive;
 class SkAnimate;
 class SkCanvas;
 class SkDisplayable;
-class SkDrawable;
+class SkADrawable;
 class SkDump;
 class SkEvent;
 class SkEventSink;
diff --git a/gfx/skia/skia/src/animator/SkAnimateSet.cpp b/gfx/skia/skia/src/animator/SkAnimateSet.cpp
index d146118e89bc..c05e0299d83c 100644
--- a/gfx/skia/skia/src/animator/SkAnimateSet.cpp
+++ b/gfx/skia/skia/src/animator/SkAnimateSet.cpp
@@ -39,7 +39,7 @@ SkSet::SkSet() {
 void SkSet::dump(SkAnimateMaker* maker) {
     INHERITED::dump(maker);
     if (dur != 1) {
-        SkDebugf("dur=\"%g\" ", SkScalarToFloat(SkScalarDiv(dur,1000)));
+        SkDebugf("dur=\"%g\" ", dur * 0.001);
     }
     //don't want double />\n's
     SkDebugf("/>\n");
@@ -48,14 +48,14 @@ void SkSet::dump(SkAnimateMaker* maker) {
 #endif
 
 void SkSet::refresh(SkAnimateMaker& maker) {
-    fFieldInfo->setValue(maker, &fValues, 0, fFieldInfo->fCount, NULL,
+    fFieldInfo->setValue(maker, &fValues, 0, fFieldInfo->fCount, nullptr,
         fFieldInfo->getType(), to);
 }
 
 void SkSet::onEndElement(SkAnimateMaker& maker) {
     if (resolveCommon(maker) == false)
         return;
-    if (fFieldInfo == NULL) {
+    if (fFieldInfo == nullptr) {
         maker.setErrorCode(SkDisplayXMLParserError::kFieldNotInTarget);
         return;
     }
@@ -67,7 +67,7 @@ void SkSet::onEndElement(SkAnimateMaker& maker) {
         fValues.setType(outType);
         fValues.setCount(comps);
         if (outType == SkType_String || outType == SkType_DynamicString)
-            fValues[0].fString = SkNEW(SkString);
+            fValues[0].fString = new SkString;
         else
             memset(fValues.begin(), 0, fValues.count() * sizeof(fValues.begin()[0]));
     } else {
diff --git a/gfx/skia/skia/src/animator/SkAnimateSet.h b/gfx/skia/skia/src/animator/SkAnimateSet.h
index b8f7bf54f6b4..32a91979e7ac 100644
--- a/gfx/skia/skia/src/animator/SkAnimateSet.h
+++ b/gfx/skia/skia/src/animator/SkAnimateSet.h
@@ -16,10 +16,10 @@ class SkSet : public SkAnimate {
     DECLARE_MEMBER_INFO(Set);
     SkSet();
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
+    void dump(SkAnimateMaker* ) override;
 #endif
-    virtual void onEndElement(SkAnimateMaker& );
-    virtual void refresh(SkAnimateMaker& );
+    void onEndElement(SkAnimateMaker& ) override;
+    void refresh(SkAnimateMaker& ) override;
 private:
     typedef SkAnimate INHERITED;
 };
diff --git a/gfx/skia/skia/src/animator/SkAnimator.cpp b/gfx/skia/skia/src/animator/SkAnimator.cpp
index 1c53e30a95bf..ee75ab14affa 100644
--- a/gfx/skia/skia/src/animator/SkAnimator.cpp
+++ b/gfx/skia/skia/src/animator/SkAnimator.cpp
@@ -42,13 +42,11 @@ _static const char gMathPrimerText[] =
 
 #define gMathPrimer gMathPrimerText
 
-SkAnimator::SkAnimator() : fMaker(NULL) {
+SkAnimator::SkAnimator() : fMaker(nullptr) {
     initialize();
 }
 
-SkAnimator::~SkAnimator() {
-    SkDELETE(fMaker);
-}
+SkAnimator::~SkAnimator() { delete fMaker; }
 
 void SkAnimator::addExtras(SkExtras* extras) {
     *fMaker->fExtras.append() = extras;
@@ -84,7 +82,7 @@ bool SkAnimator::decodeURI(const char uri[]) {
 //  SkDebugf("animator decode %s\n", uri);
 
 //    SkStream* stream = SkStream::GetURIStream(fMaker->fPrefix.c_str(), uri);
-    SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(uri));
+    SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(uri));
     if (stream.get()) {
         this->setURIBase(uri);
         return decodeStream(stream);
@@ -146,7 +144,7 @@ bool SkAnimator::doUserEvent(const SkEvent& evt) {
 }
 
 SkAnimator::DifferenceType SkAnimator::draw(SkCanvas* canvas, SkPaint* paint, SkMSec time) {
-    if (paint == NULL)
+    if (paint == nullptr)
         return draw(canvas, time);
     fMaker->fScreenplay.time = time;
     fMaker->fCanvas = canvas;
@@ -181,7 +179,7 @@ bool SkAnimator::findClickEvent(SkScalar x, SkScalar y) {
 
 const SkAnimator* SkAnimator::getAnimator(const SkDisplayable* displayable) const {
     if (displayable->getType() != SkType_Movie)
-        return NULL;
+        return nullptr;
     const SkDisplayMovie* movie = (const SkDisplayMovie*) displayable;
     return movie->getAnimator();
 }
@@ -189,13 +187,13 @@ const SkAnimator* SkAnimator::getAnimator(const SkDisplayable* displayable) cons
 const SkDisplayable* SkAnimator::getElement(const char* id) {
     SkDisplayable* element;
     if (fMaker->find(id, &element) == false)
-        return NULL;
+        return nullptr;
     return (const SkDisplayable*) element;
 }
 
 SkElementType SkAnimator::getElementType(const SkDisplayable* ae) {
     SkDisplayable* element = (SkDisplayable*) ae;
-    const SkMemberInfo* info = SkDisplayType::GetMembers(fMaker, element->getType(), NULL);
+    const SkMemberInfo* info = SkDisplayType::GetMembers(fMaker, element->getType(), nullptr);
     return (SkElementType) SkDisplayType::Find(fMaker, info);
 }
 
@@ -242,10 +240,10 @@ int32_t SkAnimator::getArrayInt(const SkDisplayable* ae,
 
 int32_t SkAnimator::getArrayInt(const char* id, const char* fieldID, int index) {
     const SkDisplayable* element = getElement(id);
-    if (element == NULL)
+    if (element == nullptr)
         return SK_NaN32;
     const SkMemberInfo* field = getField(element, fieldID);
-    if (field == NULL)
+    if (field == nullptr)
         return SK_NaN32;
     return getArrayInt(element, field, index);
 }
@@ -259,10 +257,10 @@ SkScalar SkAnimator::getArrayScalar(const SkDisplayable* ae,
 
 SkScalar SkAnimator::getArrayScalar(const char* id, const char* fieldID, int index) {
     const SkDisplayable* element = getElement(id);
-    if (element == NULL)
+    if (element == nullptr)
         return SK_ScalarNaN;
     const SkMemberInfo* field = getField(element, fieldID);
-    if (field == NULL)
+    if (field == nullptr)
         return SK_ScalarNaN;
     return getArrayScalar(element, field, index);
 }
@@ -271,16 +269,16 @@ const char* SkAnimator::getArrayString(const SkDisplayable* ae,
         const SkMemberInfo* ai, int index) {
     SkOperand operand;
     bool result = getArrayCommon(ae, ai, index, &operand);
-    return result ? operand.fString->c_str() : NULL;
+    return result ? operand.fString->c_str() : nullptr;
 }
 
 const char* SkAnimator::getArrayString(const char* id, const char* fieldID, int index) {
     const SkDisplayable* element = getElement(id);
-    if (element == NULL)
-        return NULL;
+    if (element == nullptr)
+        return nullptr;
     const SkMemberInfo* field = getField(element, fieldID);
-    if (field == NULL)
-        return NULL;
+    if (field == nullptr)
+        return nullptr;
     return getArrayString(element, field, index);
 }
 
@@ -328,10 +326,10 @@ int32_t SkAnimator::getInt(const SkDisplayable* element, const SkMemberInfo* inf
 
 int32_t SkAnimator::getInt(const char* id, const char* fieldID) {
     const SkDisplayable* element = getElement(id);
-    if (element == NULL)
+    if (element == nullptr)
         return SK_NaN32;
     const SkMemberInfo* field = getField(element, fieldID);
-    if (field == NULL)
+    if (field == nullptr)
         return SK_NaN32;
     return getInt(element, field);
 }
@@ -354,10 +352,10 @@ SkScalar SkAnimator::getScalar(const SkDisplayable* element, const SkMemberInfo*
 
 SkScalar SkAnimator::getScalar(const char* id, const char* fieldID) {
     const SkDisplayable* element = getElement(id);
-    if (element == NULL)
+    if (element == nullptr)
         return SK_ScalarNaN;
     const SkMemberInfo* field = getField(element, fieldID);
-    if (field == NULL)
+    if (field == nullptr)
         return SK_ScalarNaN;
     return getScalar(element, field);
 }
@@ -373,11 +371,11 @@ const char* SkAnimator::getString(const SkDisplayable* ae,
 
 const char* SkAnimator::getString(const char* id, const char* fieldID) {
     const SkDisplayable* element = getElement(id);
-    if (element == NULL)
-        return NULL;
+    if (element == nullptr)
+        return nullptr;
     const SkMemberInfo* field = getField(element, fieldID);
-    if (field == NULL)
-        return NULL;
+    if (field == nullptr)
+        return nullptr;
     return getString(element, field);
 }
 
@@ -386,8 +384,8 @@ const char* SkAnimator::getURIBase() {
 }
 
 void SkAnimator::initialize() {
-    SkDELETE(fMaker);
-    fMaker = SkNEW_ARGS(SkAnimateMaker, (this, NULL, NULL));
+    delete fMaker;
+    fMaker = new SkAnimateMaker(this, nullptr, nullptr);
     decodeMemory(gMathPrimer, sizeof(gMathPrimer)-1);
 #ifdef SK_BUILD_FOR_ANDROID
     InitializeSkExtraPathEffects(this);
@@ -404,7 +402,7 @@ bool SkAnimator::isTrackingEvents() {
 bool SkAnimator::onEvent(const SkEvent& evt) {
 #ifdef SK_DEBUG
     SkAnimator* root = fMaker->getRoot();
-    if (root == NULL)
+    if (root == nullptr)
         root = this;
     if (root->isTrackingEvents())
         root->eventDone(evt);
@@ -426,7 +424,7 @@ bool SkAnimator::onEvent(const SkEvent& evt) {
     }
     {
         const char* id = evt.findString("id");
-        if (id == NULL)
+        if (id == nullptr)
             return false;
         SkDisplayable** firstMovie = fMaker->fMovies.begin();
         SkDisplayable** endMovie = fMaker->fMovies.end();
@@ -557,11 +555,11 @@ bool SkAnimator::setArray(SkDisplayable* element, const SkMemberInfo* info, SkTy
 
 bool SkAnimator::setArray(const char* id, const char* fieldID, SkTypedArray array) {
     SkDisplayable* element = (SkDisplayable*) getElement(id);
-    //should I go ahead and change all 'NULL's to 'NULL'?
-    if (element == NULL)
+    //should I go ahead and change all 'nullptr's to 'nullptr'?
+    if (element == nullptr)
         return false;
     const SkMemberInfo* field = getField(element, fieldID);
-    if (field == NULL)
+    if (field == nullptr)
         return false;
     return setArray(element, field, array);
 }
@@ -583,10 +581,10 @@ bool SkAnimator::setInt(SkDisplayable* element, const SkMemberInfo* info, int32_
 
 bool SkAnimator::setInt(const char* id, const char* fieldID, int32_t s32) {
     SkDisplayable* element = (SkDisplayable*) getElement(id);
-    if (element == NULL)
+    if (element == nullptr)
         return false;
     const SkMemberInfo* field = getField(element, fieldID);
-    if (field == NULL)
+    if (field == nullptr)
         return false;
     return setInt(element, field, s32);
 }
@@ -608,10 +606,10 @@ bool SkAnimator::setScalar(SkDisplayable* element, const SkMemberInfo* info, SkS
 
 bool SkAnimator::setScalar(const char* id, const char* fieldID, SkScalar scalar) {
     SkDisplayable* element = (SkDisplayable*) getElement(id);
-    if (element == NULL)
+    if (element == nullptr)
         return false;
     const SkMemberInfo* field = getField(element, fieldID);
-    if (field == NULL)
+    if (field == nullptr)
         return false;
     return setScalar(element, field, scalar);
 }
@@ -619,16 +617,16 @@ bool SkAnimator::setScalar(const char* id, const char* fieldID, SkScalar scalar)
 bool SkAnimator::setString(SkDisplayable* element,
         const SkMemberInfo* info, const char* str) {
     // !!! until this is fixed, can't call script with global references from here
-    info->setValue(*fMaker, NULL, 0, info->fCount, element, info->getType(), str, strlen(str));
+    info->setValue(*fMaker, nullptr, 0, info->fCount, element, info->getType(), str, strlen(str));
     return true;
 }
 
 bool SkAnimator::setString(const char* id, const char* fieldID, const char* str) {
     SkDisplayable* element = (SkDisplayable*) getElement(id);
-    if (element == NULL)
+    if (element == nullptr)
         return false;
     const SkMemberInfo* field = getField(element, fieldID);
-    if (field == NULL)
+    if (field == nullptr)
         return false;
     return setString(element, field, str);
 }
diff --git a/gfx/skia/skia/src/animator/SkAnimatorScript.cpp b/gfx/skia/skia/src/animator/SkAnimatorScript.cpp
index df2e5637a23d..cbe1d04b1ed1 100644
--- a/gfx/skia/skia/src/animator/SkAnimatorScript.cpp
+++ b/gfx/skia/skia/src/animator/SkAnimatorScript.cpp
@@ -45,7 +45,7 @@ static const SkDisplayEnumMap gEnumMaps[] = {
 static int gEnumMapCount = SK_ARRAY_COUNT(gEnumMaps);
 
 SkAnimatorScript::SkAnimatorScript(SkAnimateMaker& maker, SkDisplayable* working, SkDisplayTypes type)
-    : SkScriptEngine(SkScriptEngine::ToOpType(type)), fMaker(maker), fParent(NULL), fWorking(working)
+    : SkScriptEngine(SkScriptEngine::ToOpType(type)), fMaker(maker), fParent(nullptr), fWorking(working)
 {
     memberCallBack(EvalMember, (void*) this);
     memberFunctionCallBack(EvalMemberFunction, (void*) this);
@@ -165,7 +165,7 @@ bool SkAnimatorScript::EvalID(const char* token, size_t len, void* user, SkScrip
         displayable = engine->fWorking;
         if (SK_LITERAL_STR_EQUAL("parent", token, len)) {
             SkDisplayable* parent = displayable->getParent();
-            if (parent == NULL)
+            if (parent == nullptr)
                 parent = engine->fParent;
             if (parent) {
                 value->fOperand.fDisplayable = parent;
@@ -175,7 +175,7 @@ bool SkAnimatorScript::EvalID(const char* token, size_t len, void* user, SkScrip
         }
         if (displayable && EvalMember(token, len, displayable, engine, value))
             return true;
-        value->fOperand.fString = NULL;
+        value->fOperand.fString = nullptr;
         value->fType = SkType_String;
     } else {
         SkDisplayable* working = engine->fWorking;
@@ -194,7 +194,7 @@ bool SkAnimatorScript::EvalID(const char* token, size_t len, void* user, SkScrip
 
 bool SkAnimatorScript::EvalNamedColor(const char* token, size_t len, void* callback, SkScriptValue* value) {
         value->fType = SkType_Int;
-    if (SkParse::FindNamedColor(token, len, (SkColor*) &value->fOperand.fS32) != NULL)
+    if (SkParse::FindNamedColor(token, len, (SkColor*) &value->fOperand.fS32) != nullptr)
         return true;
     return false;
 }
@@ -235,7 +235,7 @@ bool SkAnimatorScript::EvalMemberCommon(SkScriptEngine* engine, const SkMemberIn
             if (info->fType != SkType_MemberProperty && info->fType != SkType_MemberFunction)
                 value->fOperand.fS32 = *(int32_t*) info->memberData(displayable);   // OK for SkScalar too
             if (type == SkType_MSec) {
-                value->fOperand.fScalar = SkScalarDiv((SkScalar) value->fOperand.fS32, 1000); // dividing two ints is the same as dividing two scalars
+                value->fOperand.fScalar = value->fOperand.fS32 * 0.001f;
                 type = SkType_Float;
             }
             break;
@@ -281,7 +281,7 @@ bool SkAnimatorScript::EvalMember(const char* member, size_t len, void* object,
         return true;
     }
     const SkMemberInfo* info = displayable->getMember(name.c_str());
-    if (info == NULL)
+    if (info == nullptr)
         return false;
     if (info->fType == SkType_MemberProperty) {
         if (displayable->getProperty(info->propertyIndex(), value) == false) {
@@ -298,7 +298,7 @@ bool SkAnimatorScript::EvalMemberFunction(const char* member, size_t len, void*
     SkDisplayable* displayable = (SkDisplayable*) object;
     SkString name(member, len);
     const SkMemberInfo* info = displayable->getMember(name.c_str());
-    SkASSERT(info != NULL); /* !!! error handling unimplemented */
+    SkASSERT(info != nullptr); /* !!! error handling unimplemented */
     if (info->fType != SkType_MemberFunction) {
         SkASSERT(0);
         return false;
@@ -401,7 +401,7 @@ bool SkAnimatorScript::MapEnums(const char* ptr, const char* match, size_t len,
     bool more = true;
     do {
         const char* last = strchr(ptr, '|');
-        if (last == NULL) {
+        if (last == nullptr) {
             last = &ptr[strlen(ptr)];
             more = false;
         }
@@ -462,13 +462,13 @@ bool SkAnimatorScript::Unbox(void* m, SkScriptValue* scriptValue) {
             } break;
         case SkType_String: {
             SkDisplayString* boxedValue = (SkDisplayString*) displayable;
-            scriptValue->fOperand.fString = SkNEW_ARGS(SkString, (boxedValue->value));
+            scriptValue->fOperand.fString = new SkString(boxedValue->value);
             } break;
         default: {
-            const char* id = NULL;
+            const char* id = nullptr;
             SkDEBUGCODE(bool success = ) maker->findKey(displayable, &id);
             SkASSERT(success);
-            scriptValue->fOperand.fString = SkNEW_ARGS(SkString, (id));
+            scriptValue->fOperand.fString = new SkString(id);
             type = SkType_String;
         }
     }
@@ -562,7 +562,7 @@ void SkAnimatorScript::UnitTest() {
     animator.doUserEvent(evt);
     // set up animator with memory script above, then run value tests
     for (unsigned index = 0; index < SkScriptNAnswer_testCount; index++) {
-        SkAnimatorScript engine(*animator.fMaker, NULL, scriptTests[index].fType);
+        SkAnimatorScript engine(*animator.fMaker, nullptr, scriptTests[index].fType);
         SkScriptValue value;
         const char* script = scriptTests[index].fScript;
         bool success = engine.evaluateScript(&script, &value);
diff --git a/gfx/skia/skia/src/animator/SkAnimatorScript2.cpp b/gfx/skia/skia/src/animator/SkAnimatorScript2.cpp
index 80ae0c6aa84c..d246130fbe3f 100644
--- a/gfx/skia/skia/src/animator/SkAnimatorScript2.cpp
+++ b/gfx/skia/skia/src/animator/SkAnimatorScript2.cpp
@@ -205,7 +205,7 @@ public:
             return true;
         }
         const SkMemberInfo* info = displayable->getMember(name.c_str());
-        if (info == NULL)
+        if (info == nullptr)
             return false;    // !!! add additional error info?
         ref->fType = SkAnimatorScript2::ToOpType(info->getType());
         ref->fOperand.fObject = (void*) info;
@@ -235,7 +235,7 @@ public:
         SkDisplayable* displayable = (SkDisplayable*) object;
         SkString name(member, len);
         const SkMemberInfo* info = displayable->getMember(name.c_str());
-        if (info == NULL || info->fType != SkType_MemberFunction)
+        if (info == nullptr || info->fType != SkType_MemberFunction)
             return false;    // !!! add additional error info?
         ref->fType = SkAnimatorScript2::ToOpType(info->getType());
         ref->fOperand.fObject = (void*) info;
@@ -264,7 +264,7 @@ public:
 class SkAnimatorScript_NamedColor : public SkScriptCallBackProperty {
 public:
     virtual bool getConstValue(const char* name, int len, SkOperand2* value) {
-        return SkParse::FindNamedColor(name, len, (SkColor*) &value->fS32) != NULL;
+        return SkParse::FindNamedColor(name, len, (SkColor*) &value->fS32) != nullptr;
     }
 };
 
@@ -329,13 +329,13 @@ public:
                 } break;
             case SkType_String: {
                 SkDisplayString* boxedValue = (SkDisplayString*) displayable;
-                operand->fString = SkNEW_ARGS(SkString, (boxedValue->value));
+                operand->fString = new SkString(boxedValue->value);
                 } break;
             default: {
                 const char* id;
                 bool success = fEngine->getMaker().findKey(displayable, &id);
                 SkASSERT(success);
-                operand->fString = SkNEW_ARGS(SkString, (id));
+                operand->fString = new SkString(id);
             }
         }
         return true;
@@ -412,7 +412,7 @@ bool SkAnimatorScript2::evalMemberCommon(const SkMemberInfo* info,
             if (info->fType != SkType_MemberProperty && info->fType != SkType_MemberFunction)
                 value->fS32 = *(int32_t*) info->memberData(displayable);    // OK for SkScalar too
             if (type == SkType_MSec) {
-                value->fScalar = SkScalarDiv((SkScalar) value->fS32, 1000); // dividing two ints is the same as dividing two scalars
+                value->fScalar = value->fS32 * 0.001f;
                 type = SkType_Float;
             }
             break;
@@ -474,9 +474,9 @@ SkDisplayTypes SkAnimatorScript2::ToDisplayType(SkOperand2::OpType type) {
 }
 
 SkOperand2::OpType SkAnimatorScript2::ToOpType(SkDisplayTypes type) {
-    if (SkDisplayType::IsDisplayable(NULL /* fMaker */, type))
+    if (SkDisplayType::IsDisplayable(nullptr /* fMaker */, type))
         return SkOperand2::kObject;
-    if (SkDisplayType::IsEnum(NULL /* fMaker */, type))
+    if (SkDisplayType::IsEnum(nullptr /* fMaker */, type))
         return SkOperand2::kS32;
     switch (type) {
         case SkType_ARGB:
@@ -506,7 +506,7 @@ bool SkAnimatorScript2::MapEnums(const char* ptr, const char* match, size_t len,
     bool more = true;
     do {
         const char* last = strchr(ptr, '|');
-        if (last == NULL) {
+        if (last == nullptr) {
             last = &ptr[strlen(ptr)];
             more = false;
         }
@@ -591,7 +591,7 @@ void SkAnimatorScript2::UnitTest() {
     animator.doUserEvent(evt);
     // set up animator with memory script above, then run value tests
     for (int index = 0; index < SkScriptNAnswer_testCount; index++) {
-        SkAnimatorScript2 engine(*animator.fMaker, NULL, scriptTests[index].fType);
+        SkAnimatorScript2 engine(*animator.fMaker, nullptr, scriptTests[index].fType);
         SkScriptValue2 value;
         const char* script = scriptTests[index].fScript;
         bool success = engine.evaluateScript(&script, &value);
diff --git a/gfx/skia/skia/src/animator/SkBoundable.cpp b/gfx/skia/skia/src/animator/SkBoundable.cpp
index abc4f40d6eed..e784e9f6d0e1 100644
--- a/gfx/skia/skia/src/animator/SkBoundable.cpp
+++ b/gfx/skia/skia/src/animator/SkBoundable.cpp
@@ -50,6 +50,6 @@ SkBoundableAuto::SkBoundableAuto(SkBoundable* boundable,
 SkBoundableAuto::~SkBoundableAuto() {
     if (fBoundable->hasBounds() == false)
         return;
-//    fMaker.fCanvas->setBounder(NULL);
+//    fMaker.fCanvas->setBounder(nullptr);
     fBoundable->setBounds(fMaker.fDisplayList.fBounds);
 }
diff --git a/gfx/skia/skia/src/animator/SkBoundable.h b/gfx/skia/skia/src/animator/SkBoundable.h
index daeda23c7a7c..48d1306235bf 100644
--- a/gfx/skia/skia/src/animator/SkBoundable.h
+++ b/gfx/skia/skia/src/animator/SkBoundable.h
@@ -10,10 +10,10 @@
 #ifndef SkBoundable_DEFINED
 #define SkBoundable_DEFINED
 
-#include "SkDrawable.h"
+#include "SkADrawable.h"
 #include "SkRect.h"
 
-class SkBoundable : public SkDrawable {
+class SkBoundable : public SkADrawable {
 public:
     SkBoundable();
     virtual void clearBounder();
@@ -25,7 +25,7 @@ protected:
     void clearBounds() { fBounds.fLeft = (int16_t) SkToU16(0x8000); }; // mark bounds as unset
     SkIRect fBounds;
 private:
-    typedef SkDrawable INHERITED;
+    typedef SkADrawable INHERITED;
 };
 
 class SkBoundableAuto {
diff --git a/gfx/skia/skia/src/animator/SkBuildCondensedInfo.cpp b/gfx/skia/skia/src/animator/SkBuildCondensedInfo.cpp
index 411be904fec1..1ee1917d3c15 100644
--- a/gfx/skia/skia/src/animator/SkBuildCondensedInfo.cpp
+++ b/gfx/skia/skia/src/animator/SkBuildCondensedInfo.cpp
@@ -27,7 +27,7 @@ SkTDMemberInfoArray gUnknowns;
 SkTDIntArray gUnknownsCounts;
 
 static void AddInfo(SkDisplayTypes type, const SkMemberInfo* info, int infoCount) {
-    SkASSERT(gInfos[type] == NULL);
+    SkASSERT(gInfos[type] == nullptr);
     gInfos[type] = info;
     gInfosCounts[type] = infoCount;
     *gInfosTypeIDs.append() = type;
@@ -111,7 +111,7 @@ void SkDisplayType::BuildCondensedInfo(SkAnimateMaker* maker) {
     int index, infoCount;
     for (index = 0; index < kTypeNamesSize; index++) {
         const SkMemberInfo* info = GetMembers(maker, gTypeNames[index].fType, &infoCount);
-        if (info == NULL)
+        if (info == nullptr)
             continue;
         AddInfo(gTypeNames[index].fType, info, infoCount);
     }
@@ -131,7 +131,7 @@ void SkDisplayType::BuildCondensedInfo(SkAnimateMaker* maker) {
                 int typeIndex = 0;
                 for (; typeIndex < kNumberOfTypes; typeIndex++) {
                     const SkMemberInfo* temp = SkDisplayType::GetMembers(
-                        maker, (SkDisplayTypes) typeIndex, NULL);
+                        maker, (SkDisplayTypes) typeIndex, nullptr);
                     if (temp == info)
                         break;
                 }
@@ -160,7 +160,7 @@ void SkDisplayType::BuildCondensedInfo(SkAnimateMaker* maker) {
     int unknown = 1;
     for (index = 0; index < gInfos.count(); index++) {
         const SkMemberInfo* info = gInfos[index];
-        if (info == NULL)
+        if (info == nullptr)
             continue;
         char scratch[64];
         bool drawPrefix, displayPrefix;
@@ -183,7 +183,7 @@ void SkDisplayType::BuildCondensedInfo(SkAnimateMaker* maker) {
     unknown = 1;
     for (index = 0; index < gInfos.count(); index++) {
         const SkMemberInfo* info = gInfos[index];
-        if (info == NULL)
+        if (info == nullptr)
             continue;
         char scratch[64];
         bool drawPrefix, displayPrefix;
@@ -229,7 +229,7 @@ void SkDisplayType::BuildCondensedInfo(SkAnimateMaker* maker) {
     unknown = 1;
     for (index = 0; index < gInfosCounts.count(); index++) {
         const SkMemberInfo* info = gInfos[index];
-        if (info == NULL)
+        if (info == nullptr)
             continue;
         typeIDCount++;
         char scratch[64];
@@ -251,7 +251,7 @@ void SkDisplayType::BuildCondensedInfo(SkAnimateMaker* maker) {
     written = 0;
     for (index = 0; index < gInfosCounts.count(); index++) {
         const SkMemberInfo* info = gInfos[index];
-        if (info == NULL)
+        if (info == nullptr)
             continue;
         if (written > 0)
                 putc(',', condensed);
diff --git a/gfx/skia/skia/src/animator/SkDisplayAdd.cpp b/gfx/skia/skia/src/animator/SkDisplayAdd.cpp
index 2cb5e9794848..f5788a3869a0 100644
--- a/gfx/skia/skia/src/animator/SkDisplayAdd.cpp
+++ b/gfx/skia/skia/src/animator/SkDisplayAdd.cpp
@@ -11,7 +11,7 @@
 #include "SkAnimateMaker.h"
 #include "SkDisplayApply.h"
 #include "SkDisplayList.h"
-#include "SkDrawable.h"
+#include "SkADrawable.h"
 #include "SkDrawGroup.h"
 
 #if SK_USE_CONDENSED_INFO == 0
@@ -34,14 +34,14 @@ const SkMemberInfo SkAdd::fInfo[] = {
 DEFINE_GET_MEMBER(SkAdd);
 
 SkAdd::SkAdd() : mode(kMode_indirect),
-    offset(SK_MaxS32), use(NULL), where(NULL) {
+    offset(SK_MaxS32), use(nullptr), where(nullptr) {
 }
 
 SkDisplayable* SkAdd::deepCopy(SkAnimateMaker* maker) {
-    SkDrawable* saveUse = use;
-    SkDrawable* saveWhere = where;
-    use = NULL;
-    where = NULL;
+    SkADrawable* saveUse = use;
+    SkADrawable* saveWhere = where;
+    use = nullptr;
+    where = nullptr;
     SkAdd* copy = (SkAdd*) INHERITED::deepCopy(maker);
     copy->use = use = saveUse;
     copy->where = where = saveWhere;
@@ -80,20 +80,20 @@ bool SkAdd::enable(SkAnimateMaker& maker ) {
     SkDisplayList& displayList = maker.fDisplayList;
     SkTDDrawableArray* parentList = displayList.getDrawList();
     if (type == SkType_Add) {
-        if (use == NULL) // not set in apply yet
+        if (use == nullptr) // not set in apply yet
             return true;
     }
     bool skipAddToParent = true;
     SkASSERT(type != SkType_Replace || where);
     SkTDDrawableArray* grandList SK_INIT_TO_AVOID_WARNING;
-    SkGroup* parentGroup = NULL;
-    SkGroup* thisGroup = NULL;
+    SkGroup* parentGroup = nullptr;
+    SkGroup* thisGroup = nullptr;
     int index = where ? displayList.findGroup(where, &parentList, &parentGroup,
         &thisGroup, &grandList) : 0;
     if (index < 0)
         return true;
     int max = parentList->count();
-    if (where == NULL && type == SkType_Move)
+    if (where == nullptr && type == SkType_Move)
         index = max;
     if (offset != SK_MaxS32) {
         index += offset;
@@ -102,15 +102,15 @@ bool SkAdd::enable(SkAnimateMaker& maker ) {
             return true;    // caller should not add
         }
     }
-    if (offset < 0 && where == NULL)
+    if (offset < 0 && where == nullptr)
         index += max + 1;
     switch (type) {
         case SkType_Add:
-            if (offset == SK_MaxS32 && where == NULL) {
+            if (offset == SK_MaxS32 && where == nullptr) {
                 if (use->isDrawable()) {
                     skipAddToParent = mode == kMode_immediate;
                     if (skipAddToParent) {
-                        if (where == NULL) {
+                        if (where == nullptr) {
                             SkTDDrawableArray* useParentList;
                             index = displayList.findGroup(this, &useParentList, &parentGroup,
                                 &thisGroup, &grandList);
@@ -194,7 +194,7 @@ void SkAdd::initialize() {
 
 bool SkAdd::isDrawable() const {
     return getType() == SkType_Add && mode == kMode_indirect && offset == SK_MaxS32 &&
-        where == NULL && use != NULL && use->isDrawable();
+        where == nullptr && use != nullptr && use->isDrawable();
 }
 
 //SkDisplayable* SkAdd::resolveTarget(SkAnimateMaker& maker) {
diff --git a/gfx/skia/skia/src/animator/SkDisplayAdd.h b/gfx/skia/skia/src/animator/SkDisplayAdd.h
index d16492b06336..eb4610b39f5d 100644
--- a/gfx/skia/skia/src/animator/SkDisplayAdd.h
+++ b/gfx/skia/skia/src/animator/SkDisplayAdd.h
@@ -10,10 +10,10 @@
 #ifndef SkDisplayAdd_DEFINED
 #define SkDisplayAdd_DEFINED
 
-#include "SkDrawable.h"
+#include "SkADrawable.h"
 #include "SkMemberInfo.h"
 
-class SkAdd : public SkDrawable {
+class SkAdd : public SkADrawable {
     DECLARE_MEMBER_INFO(Add);
     SkAdd();
 
@@ -22,24 +22,24 @@ class SkAdd : public SkDrawable {
         kMode_immediate
     };
 
-    virtual SkDisplayable* deepCopy(SkAnimateMaker* );
-    virtual bool draw(SkAnimateMaker& );
+    SkDisplayable* deepCopy(SkAnimateMaker* ) override;
+    bool draw(SkAnimateMaker& ) override;
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
+    void dump(SkAnimateMaker* ) override;
 #endif
-    virtual bool enable(SkAnimateMaker& );
-    virtual bool hasEnable() const;
-    virtual void initialize();
-    virtual bool isDrawable() const;
+    bool enable(SkAnimateMaker& ) override;
+    bool hasEnable() const override;
+    void initialize() override;
+    bool isDrawable() const override;
 protected:
 //  struct _A {
         Mode mode;
         int32_t offset;
-        SkDrawable* use;
-        SkDrawable* where;  // if NULL, offset becomes index
+        SkADrawable* use;
+        SkADrawable* where;  // if nullptr, offset becomes index
 //  } A;
 private:
-    typedef SkDrawable INHERITED;
+    typedef SkADrawable INHERITED;
 };
 
 class SkClear : public SkDisplayable {
diff --git a/gfx/skia/skia/src/animator/SkDisplayApply.cpp b/gfx/skia/skia/src/animator/SkDisplayApply.cpp
index 7f0ec1c8f4f0..0d5f09d342f6 100644
--- a/gfx/skia/skia/src/animator/SkDisplayApply.cpp
+++ b/gfx/skia/skia/src/animator/SkDisplayApply.cpp
@@ -56,13 +56,13 @@ const SkMemberInfo SkApply::fInfo[] = {
 DEFINE_GET_MEMBER(SkApply);
 
 SkApply::SkApply() : begin(0), dontDraw(false), interval((SkMSec) -1), mode((Mode) -1), /*pickup(false), */
-    restore(false), scope(NULL), steps(-1), transition((Transition) -1), fActive(NULL), /*fCurrentScope(NULL),*/
+    restore(false), scope(nullptr), steps(-1), transition((Transition) -1), fActive(nullptr), /*fCurrentScope(nullptr),*/
     fLastTime(0), fAppended(false), fContainsScope(false), fDeleteScope(false), fEmbedded(false),
     fEnabled(false), fEnabling(false) {
 }
 
 SkApply::~SkApply() {
-    for (SkDrawable** curPtr = fScopes.begin(); curPtr < fScopes.end(); curPtr++)
+    for (SkADrawable** curPtr = fScopes.begin(); curPtr < fScopes.end(); curPtr++)
         delete *curPtr;
     if (fDeleteScope)
         delete scope;
@@ -71,7 +71,7 @@ SkApply::~SkApply() {
 }
 
 void SkApply::activate(SkAnimateMaker& maker) {
-    if (fActive != NULL) {
+    if (fActive != nullptr) {
         if (fActive->fDrawIndex == 0 && fActive->fDrawMax == 0)
             return; // if only one use, nothing more to do
         if (restore == false)
@@ -92,7 +92,7 @@ void SkApply::activate(SkAnimateMaker& maker) {
 }
 
 void SkApply::append(SkApply* apply) {
-    if (fActive == NULL)
+    if (fActive == nullptr)
         return;
     int oldCount = fActive->fAnimators.count();
     fActive->append(apply);
@@ -110,7 +110,7 @@ void SkApply::applyValues(int animatorIndex, SkOperand* values, int count,
     SkAnimateBase* animator = fActive->fAnimators[animatorIndex];
     const SkMemberInfo * info = animator->fFieldInfo;
     SkASSERT(animator);
-    SkASSERT(info != NULL);
+    SkASSERT(info != nullptr);
     SkDisplayTypes type = (SkDisplayTypes) info->fType;
     SkDisplayable* target = getTarget(animator);
     if (animator->hasExecute() || type == SkType_MemberFunction || type == SkType_MemberProperty) {
@@ -123,7 +123,7 @@ void SkApply::applyValues(int animatorIndex, SkOperand* values, int count,
                 temp.fOperand = values[index];
                 *typedValues.append() = temp;
             }
-            executor->executeFunction(target, info->functionIndex(), typedValues, info->getType(), NULL);
+            executor->executeFunction(target, info->functionIndex(), typedValues, info->getType(), nullptr);
         } else {
             SkScriptValue scriptValue;
             scriptValue.fOperand = values[0];
@@ -153,7 +153,7 @@ void SkApply::applyValues(int animatorIndex, SkOperand* values, int count,
 }
 
 bool SkApply::contains(SkDisplayable* child) {
-    for (SkDrawable** curPtr = fScopes.begin(); curPtr < fScopes.end(); curPtr++) {
+    for (SkADrawable** curPtr = fScopes.begin(); curPtr < fScopes.end(); curPtr++) {
         if (*curPtr == child || (*curPtr)->contains(child))
             return true;
     }
@@ -161,8 +161,8 @@ bool SkApply::contains(SkDisplayable* child) {
 }
 
 SkDisplayable* SkApply::deepCopy(SkAnimateMaker* maker) {
-    SkDrawable* saveScope = scope;
-    scope = NULL;
+    SkADrawable* saveScope = scope;
+    scope = nullptr;
     SkApply* result = (SkApply*) INHERITED::deepCopy(maker);
     result->scope = scope = saveScope;
     SkAnimateBase** end = fAnimators.end();
@@ -184,7 +184,7 @@ void SkApply::disable() {
 }
 
 bool SkApply::draw(SkAnimateMaker& maker) {
-    if (scope ==NULL)
+    if (scope ==nullptr)
         return false;
     if (scope->isApply() || scope->isDrawable() == false)
         return false;
@@ -262,7 +262,7 @@ void SkApply::dump(SkAnimateMaker* maker) {
 
 bool SkApply::enable(SkAnimateMaker& maker) {
     fEnabled = true;
-    bool initialized = fActive != NULL;
+    bool initialized = fActive != nullptr;
     if (dynamicScope.size() > 0)
         enableDynamic(maker);
     if (maker.fError.hasError())
@@ -284,14 +284,14 @@ bool SkApply::enable(SkAnimateMaker& maker) {
         }
         return true;
     }*/
-    if ((mode == kMode_immediate || mode == kMode_create) && scope == NULL)
+    if ((mode == kMode_immediate || mode == kMode_create) && scope == nullptr)
         return false;   // !!! error?
     bool enableMe = scope && (scope->hasEnable() || scope->isApply() || scope->isDrawable() == false);
     if ((mode == kMode_immediate && enableMe) || mode == kMode_create)
         activate(maker);    // for non-drawables like post, prime them here
     if (mode == kMode_immediate && enableMe)
         fActive->enable();
-    if (mode == kMode_create && scope != NULL) {
+    if (mode == kMode_create && scope != nullptr) {
         enableCreate(maker);
         return true;
     }
@@ -300,7 +300,7 @@ bool SkApply::enable(SkAnimateMaker& maker) {
     }
     refresh(maker);
     SkDisplayList& displayList = maker.fDisplayList;
-    SkDrawable* drawable;
+    SkADrawable* drawable;
 #if defined SK_DEBUG && defined SK_DEBUG_ANIMATION_TIMING
     SkString debugOut;
     SkMSec time = maker.getAppTime();
@@ -311,7 +311,7 @@ bool SkApply::enable(SkAnimateMaker& maker) {
     debugOut.appendS32(maker.fEnableTime - maker.fDebugTimeBase);
     SkDebugf("%s\n", debugOut.c_str());
 #endif
-    if (scope == NULL || scope->isApply() || scope->getType() == SkType_Movie || scope->isDrawable() == false) {
+    if (scope == nullptr || scope->isApply() || scope->getType() == SkType_Movie || scope->isDrawable() == false) {
         activate(maker);    // for non-drawables like post, prime them here
         if (initialized) {
             append(this);
@@ -319,7 +319,7 @@ bool SkApply::enable(SkAnimateMaker& maker) {
         fEnabling = true;
         interpolate(maker, maker.fEnableTime);
         fEnabling = false;
-        if (scope != NULL && dontDraw == false)
+        if (scope != nullptr && dontDraw == false)
             scope->enable(maker);
         return true;
     } else if (initialized && restore == false)
@@ -340,7 +340,7 @@ bool SkApply::enable(SkAnimateMaker& maker) {
     if (fEmbedded) {
         return false;   // already added to display list by embedder
     }
-    drawable = (SkDrawable*) scope;
+    drawable = (SkADrawable*) scope;
     SkTDDrawableArray* parentList;
     SkTDDrawableArray* grandList;
     SkGroup* parentGroup;
@@ -365,19 +365,19 @@ append:
         SkASSERT(old < parentList->count());
         if ((*parentList)[old]->isApply()) {
             SkApply* apply = (SkApply*) (*parentList)[old];
-            if (apply != this && apply->fActive == NULL)
+            if (apply != this && apply->fActive == nullptr)
                 apply->activate(maker);
             apply->append(this);
-            parentGroup = NULL;
+            parentGroup = nullptr;
         } else {
             if (parentGroup)
                 parentGroup->markCopySize(old);
-            SkDrawable** newApplyLocation = &(*parentList)[old];
+            SkADrawable** newApplyLocation = &(*parentList)[old];
             SkGroup* pGroup;
             int oldApply = displayList.findGroup(this, &parentList, &pGroup, &thisGroup, &grandList);
             if (oldApply >= 0) {
-                (*parentList)[oldApply] = (SkDrawable*) SkDisplayType::CreateInstance(&maker, SkType_Apply);
-                parentGroup = NULL;
+                (*parentList)[oldApply] = (SkADrawable*) SkDisplayType::CreateInstance(&maker, SkType_Apply);
+                parentGroup = nullptr;
                 fDeleteScope = true;
             }
             *newApplyLocation = this;
@@ -397,12 +397,12 @@ void SkApply::enableCreate(SkAnimateMaker& maker) {
         bool success = maker.computeID(scope, this, &newID);
         if (success == false)
             return;
-        if (maker.find(newID.c_str(), NULL))
+        if (maker.find(newID.c_str(), nullptr))
             continue;
         SkApply* copy = (SkApply*) deepCopy(&maker); // work on copy of animator state
         if (mode == kMode_create)
             copy->mode = (Mode) -1;
-        SkDrawable* copyScope = copy->scope = (SkDrawable*) scope->deepCopy(&maker);
+        SkADrawable* copyScope = copy->scope = (SkADrawable*) scope->deepCopy(&maker);
         *fScopes.append() = copyScope;
         if (copyScope->resolveIDs(maker, scope, this)) {
             step = steps; // quit
@@ -429,11 +429,11 @@ void SkApply::enableDynamic(SkAnimateMaker& maker) {
         &newScope);
     if (success && scope != newScope) {
         SkTDDrawableArray* pList, * gList;
-        SkGroup* pGroup = NULL, * found = NULL;
+        SkGroup* pGroup = nullptr, * found = nullptr;
         int old = maker.fDisplayList.findGroup(scope, &pList, &pGroup, &found, &gList);
         if (pList && old >= 0 && (*pList)[old]->isApply() && (*pList)[old] != this) {
             if (fAppended == false) {
-                if (found != NULL) {
+                if (found != nullptr) {
                     SkDisplayable* oldChild = (*pList)[old];
                     if (oldChild->isApply() && found->copySet(old)) {
                         found->markCopyClear(old);
@@ -444,12 +444,12 @@ void SkApply::enableDynamic(SkAnimateMaker& maker) {
             } else
                 pList->remove(old);
         }
-        scope = (SkDrawable*) newScope;
+        scope = (SkADrawable*) newScope;
         onEndElement(maker);
     }
     maker.removeActive(fActive);
     delete fActive;
-    fActive = NULL;
+    fActive = nullptr;
 }
 
 void SkApply::endSave(int index) {
@@ -507,7 +507,7 @@ void SkApply::getStep(SkScriptValue* value) {
     getProperty(SK_PROPERTY(step), value);
 }
 
-SkDrawable* SkApply::getTarget(SkAnimateBase* animate) {
+SkADrawable* SkApply::getTarget(SkAnimateBase* animate) {
     if (animate->fTargetIsScope == false || mode != kMode_create)
         return animate->fTarget;
     return scope;
@@ -528,11 +528,11 @@ bool SkApply::hasEnable() const {
 }
 
 bool SkApply::inactivate(SkAnimateMaker& maker) {
-    if (fActive == NULL)
+    if (fActive == nullptr)
         return false;
     maker.removeActive(fActive);
     delete fActive;
-    fActive = NULL;
+    fActive = nullptr;
     return true;
 }
 
@@ -541,14 +541,14 @@ SkMSec lastTime = (SkMSec) -1;
 #endif
 
 bool SkApply::interpolate(SkAnimateMaker& maker, SkMSec rawTime) {
-    if (fActive == NULL)
+    if (fActive == nullptr)
         return false;
     bool result = false;
 #if defined SK_DEBUG && defined SK_DEBUG_ANIMATION_TIMING
     SkMSec time = maker.getAppTime();
     if (lastTime == (SkMSec) -1)
         lastTime = rawTime - 1;
-    if (fActive != NULL &&
+    if (fActive != nullptr &&
         strcmp(id, "a3") == 0 && rawTime > lastTime) {
         lastTime += 1000;
         SkString debugOut;
@@ -629,7 +629,7 @@ bool SkApply::interpolate(SkAnimateMaker& maker, SkMSec rawTime) {
                 fLastTime = animate->dur;
             SkTypedArray formulaValues;
             formulaValues.setCount(count);
-            SkDEBUGCODE(bool success = ) animate->fFieldInfo->setValue(maker, &formulaValues, 0, 0, NULL,
+            SkDEBUGCODE(bool success = ) animate->fFieldInfo->setValue(maker, &formulaValues, 0, 0, nullptr,
                 animate->getValuesType(), animate->formula);
             SkASSERT(success);
             if (restore)
@@ -645,7 +645,7 @@ bool SkApply::interpolate(SkAnimateMaker& maker, SkMSec rawTime) {
 }
 
 void SkApply::initialize() {
-    if (scope == NULL)
+    if (scope == nullptr)
         return;
     if (scope->isApply() || scope->isDrawable() == false)
         return;
@@ -654,7 +654,7 @@ void SkApply::initialize() {
 
 void SkApply::onEndElement(SkAnimateMaker& maker)
 {
-    SkDrawable* scopePtr = scope;
+    SkADrawable* scopePtr = scope;
     while (scopePtr && scopePtr->isApply()) {
         SkApply* scopedApply = (SkApply*) scopePtr;
         if (scopedApply->scope == this) {
@@ -665,12 +665,12 @@ void SkApply::onEndElement(SkAnimateMaker& maker)
     }
     if (mode == kMode_create)
         return;
-    if (scope != NULL && steps >= 0 && scope->isApply() == false && scope->isDrawable())
+    if (scope != nullptr && steps >= 0 && scope->isApply() == false && scope->isDrawable())
         scope->setSteps(steps);
     for (SkAnimateBase** animPtr = fAnimators.begin(); animPtr < fAnimators.end(); animPtr++) {
         SkAnimateBase* anim = *animPtr;
         //for reusing apply statements with dynamic scope
-        if (anim->fTarget == NULL || anim->fTargetIsScope) {
+        if (anim->fTarget == nullptr || anim->fTargetIsScope) {
             anim->fTargetIsScope = true;
             if (scope)
                 anim->fTarget = scope;
@@ -678,7 +678,7 @@ void SkApply::onEndElement(SkAnimateMaker& maker)
                 anim->setTarget(maker);
             anim->onEndElement(maker);  // allows animate->fFieldInfo to be set
         }
-        if (scope != NULL && steps >= 0 && anim->fTarget != scope && anim->fTarget->isDrawable())
+        if (scope != nullptr && steps >= 0 && anim->fTarget != scope && anim->fTarget->isDrawable())
             anim->fTarget->setSteps(steps);
     }
 }
@@ -748,7 +748,7 @@ void SkApply::save(int index) {
 // !!! this all may be unneeded, at least in the dynamic case ??
     int activeIndex = fActive->fDrawIndex + index;
     SkTDOperandArray last;
-    if (fActive->fSaveRestore[activeIndex] == NULL) {
+    if (fActive->fSaveRestore[activeIndex] == nullptr) {
         fActive->fSaveRestore[activeIndex] = new SkOperand[count];
         useLast = false;
     } else {
diff --git a/gfx/skia/skia/src/animator/SkDisplayApply.h b/gfx/skia/skia/src/animator/SkDisplayApply.h
index e128c2929d4d..12cf6cee7a96 100644
--- a/gfx/skia/skia/src/animator/SkDisplayApply.h
+++ b/gfx/skia/skia/src/animator/SkDisplayApply.h
@@ -11,12 +11,12 @@
 #define SkDisplayApply_DEFINED
 
 #include "SkAnimateBase.h"
-#include "SkDrawable.h"
+#include "SkADrawable.h"
 #include "SkIntArray.h"
 
 class SkActive;
 
-class SkApply : public SkDrawable {
+class SkApply : public SkADrawable {
     DECLARE_MEMBER_INFO(Apply);
 public:
 
@@ -38,41 +38,41 @@ public:
     void appendActive(SkActive* );
     void applyValues(int animatorIndex, SkOperand* values, int count,
         SkDisplayTypes , SkMSec time);
-    virtual bool contains(SkDisplayable*);
+    bool contains(SkDisplayable*) override;
 //  void createActive(SkAnimateMaker& );
-    virtual SkDisplayable* deepCopy(SkAnimateMaker* );
+    SkDisplayable* deepCopy(SkAnimateMaker* ) override;
     void disable();
-    virtual bool draw(SkAnimateMaker& );
+    bool draw(SkAnimateMaker& ) override;
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
+    void dump(SkAnimateMaker* ) override;
 #endif
-    virtual bool enable(SkAnimateMaker& );
+    bool enable(SkAnimateMaker& ) override;
     void enableCreate(SkAnimateMaker& );
     void enableDynamic(SkAnimateMaker& );
     void endSave(int index);
     Mode getMode() { return mode; }
-    virtual bool getProperty(int index, SkScriptValue* value) const;
-    SkDrawable* getScope() { return scope; }
+    bool getProperty(int index, SkScriptValue* value) const override;
+    SkADrawable* getScope() { return scope; }
     void getStep(SkScriptValue* );
-    SkDrawable* getTarget(SkAnimateBase* );
+    SkADrawable* getTarget(SkAnimateBase* );
     bool hasDelayedAnimator() const;
-    virtual bool hasEnable() const;
+    bool hasEnable() const override;
     bool inactivate(SkAnimateMaker& maker);
-    virtual void initialize();
+    void initialize() override;
     bool interpolate(SkAnimateMaker& , SkMSec time);
-    virtual void onEndElement(SkAnimateMaker& );
-    virtual const SkMemberInfo* preferredChild(SkDisplayTypes type);
+    void onEndElement(SkAnimateMaker& ) override;
+    const SkMemberInfo* preferredChild(SkDisplayTypes type) override;
     void refresh(SkAnimateMaker& );
     void reset();
-    virtual bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* );
+    bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* ) override;
     bool resolveField(SkAnimateMaker& , SkDisplayable* parent, SkString* str);
     void save(int index);
     void setEmbedded() { fEmbedded = true; }
-    virtual bool setProperty(int index, SkScriptValue& );
-    virtual void setSteps(int _steps);
+    bool setProperty(int index, SkScriptValue& ) override;
+    void setSteps(int _steps) override;
 //  virtual void setTime(SkMSec time);
 #ifdef SK_DEBUG
-    virtual void validate();
+    void validate() override;
 #endif
 private:
     SkMSec begin;
@@ -84,12 +84,12 @@ private:
     SkBool pickup;
 #endif
     SkBool restore;
-    SkDrawable* scope;
+    SkADrawable* scope;
     int32_t steps;
     Transition transition;
     SkActive* fActive;
     SkTDAnimateArray fAnimators;
-//  SkDrawable* fCurrentScope;
+//  SkADrawable* fCurrentScope;
     SkMSec fLastTime;   // used only to return script property time
     SkTDDrawableArray fScopes;
     SkBool fAppended : 1;
@@ -100,7 +100,7 @@ private:
     SkBool fEnabling : 1; // set if calling interpolate from enable
     friend class SkActive;
     friend class SkDisplayList;
-    typedef SkDrawable INHERITED;
+    typedef SkADrawable INHERITED;
 };
 
 #endif // SkDisplayApply_DEFINED
diff --git a/gfx/skia/skia/src/animator/SkDisplayBounds.h b/gfx/skia/skia/src/animator/SkDisplayBounds.h
index 0511ed743985..547a29e810de 100644
--- a/gfx/skia/skia/src/animator/SkDisplayBounds.h
+++ b/gfx/skia/skia/src/animator/SkDisplayBounds.h
@@ -15,7 +15,7 @@
 class SkDisplayBounds : public SkDrawRect {
     DECLARE_DISPLAY_MEMBER_INFO(Bounds);
     SkDisplayBounds();
-    virtual bool draw(SkAnimateMaker& );
+    bool draw(SkAnimateMaker& ) override;
 private:
     SkBool inval;
     typedef SkDrawRect INHERITED;
diff --git a/gfx/skia/skia/src/animator/SkDisplayEvent.cpp b/gfx/skia/skia/src/animator/SkDisplayEvent.cpp
index a0cfcb107356..746780df1c30 100644
--- a/gfx/skia/skia/src/animator/SkDisplayEvent.cpp
+++ b/gfx/skia/skia/src/animator/SkDisplayEvent.cpp
@@ -45,7 +45,7 @@ const SkMemberInfo SkDisplayEvent::fInfo[] = {
 DEFINE_GET_MEMBER(SkDisplayEvent);
 
 SkDisplayEvent::SkDisplayEvent() : code((SkKey) -1), disable(false),
-    kind(kUser), x(0), y(0), fLastCode((SkKey) -1), fMax((SkKey) -1), fTarget(NULL) {
+    kind(kUser), x(0), y(0), fLastCode((SkKey) -1), fMax((SkKey) -1), fTarget(nullptr) {
 }
 
 SkDisplayEvent::~SkDisplayEvent() {
@@ -71,7 +71,7 @@ SkDisplayable* SkDisplayEvent::contains(const SkString& match) {
         if (child->contains(match))
             return child;
     }
-    return NULL;
+    return nullptr;
 }
 
 void SkDisplayEvent::deleteMembers() {
@@ -100,7 +100,7 @@ void SkDisplayEvent::dumpEvent(SkAnimateMaker* maker) {
         else
             SkDebugf("key=\"%c\" ", code);
     }
-    if (fTarget != NULL) {
+    if (fTarget != nullptr) {
         SkDebugf("target=\"%s\" ", fTarget->id);
     }
     if (kind >= SkDisplayEvent::kMouseDown && kind <= SkDisplayEvent::kMouseUp) {
@@ -130,7 +130,7 @@ bool SkDisplayEvent::enableEvent(SkAnimateMaker& maker)
         SkDisplayable* displayable = fChildren[index];
         if (displayable->isGroup()) {
             SkTDDrawableArray* parentList = displayList.getDrawList();
-            *parentList->append() = (SkDrawable*) displayable;  // make it findable before children are enabled
+            *parentList->append() = (SkADrawable*) displayable;  // make it findable before children are enabled
         }
         if (displayable->enable(maker))
             continue;
@@ -138,7 +138,7 @@ bool SkDisplayEvent::enableEvent(SkAnimateMaker& maker)
             return true;
         if (displayable->isDrawable() == false)
             return true;    // error
-        SkDrawable* drawable = (SkDrawable*) displayable;
+        SkADrawable* drawable = (SkADrawable*) displayable;
         SkTDDrawableArray* parentList = displayList.getDrawList();
         *parentList->append() = drawable;
     }
@@ -188,7 +188,7 @@ void SkDisplayEvent::populateInput(SkAnimateMaker& maker, const SkEvent& fEvent)
     SkMetaData::Type    type;
     int number;
     const char* name;
-    while ((name = iter.next(&type, &number)) != NULL) {
+    while ((name = iter.next(&type, &number)) != nullptr) {
         if (name[0] == '\0')
             continue;
         SkDisplayable* displayable;
diff --git a/gfx/skia/skia/src/animator/SkDisplayEvent.h b/gfx/skia/skia/src/animator/SkDisplayEvent.h
index 952faeac6349..d223771a7d60 100644
--- a/gfx/skia/skia/src/animator/SkDisplayEvent.h
+++ b/gfx/skia/skia/src/animator/SkDisplayEvent.h
@@ -34,17 +34,17 @@ class SkDisplayEvent : public SkDisplayable {
     };
     SkDisplayEvent();
     virtual ~SkDisplayEvent();
-    virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
-    virtual bool contains(SkDisplayable*);
-    virtual SkDisplayable* contains(const SkString& );
+    bool addChild(SkAnimateMaker& , SkDisplayable* child) override;
+    bool contains(SkDisplayable*) override;
+    SkDisplayable* contains(const SkString& ) override;
 #ifdef SK_DEBUG
     void dumpEvent(SkAnimateMaker* );
 #endif
     bool enableEvent(SkAnimateMaker& );
-    virtual bool getProperty(int index, SkScriptValue* ) const;
-    virtual void onEndElement(SkAnimateMaker& maker);
+    bool getProperty(int index, SkScriptValue* ) const override;
+    void onEndElement(SkAnimateMaker& maker) override;
     void populateInput(SkAnimateMaker& , const SkEvent& fEvent);
-    virtual bool setProperty(int index, SkScriptValue& );
+    bool setProperty(int index, SkScriptValue& ) override;
 protected:
     SkKey code;
     SkBool disable;
diff --git a/gfx/skia/skia/src/animator/SkDisplayEvents.cpp b/gfx/skia/skia/src/animator/SkDisplayEvents.cpp
index c42fbdf31209..d367cf11c30e 100644
--- a/gfx/skia/skia/src/animator/SkDisplayEvents.cpp
+++ b/gfx/skia/skia/src/animator/SkDisplayEvents.cpp
@@ -12,7 +12,7 @@
 #include "SkAnimator.h"
 #include "SkDisplayEvent.h"
 #include "SkDisplayMovie.h"
-#include "SkDrawable.h"
+#include "SkADrawable.h"
 #ifdef SK_DEBUG
 #include "SkDump.h"
 #endif
@@ -47,7 +47,7 @@ bool SkEvents::doEvent(SkAnimateMaker& maker, SkDisplayEvent::Kind kind, SkEvent
         if (kind != SkDisplayEvent::kOnload)
             movie->doEvent(kind, state);
     }
-    SkDisplayable* displayable = state ? state->fDisplayable : NULL;
+    SkDisplayable* displayable = state ? state->fDisplayable : nullptr;
     int keyCode = state ? state->fCode : 0;
     int count = fEvents.count();
     for (int index = 0; index < count; index++) {
@@ -61,9 +61,9 @@ bool SkEvents::doEvent(SkAnimateMaker& maker, SkDisplayEvent::Kind kind, SkEvent
                 continue;
             evt->fLastCode = (SkKey) keyCode;
         }
-        if (evt->fTarget != NULL && evt->fTarget != displayable)
+        if (evt->fTarget != nullptr && evt->fTarget != displayable)
             continue;
-        if (state == NULL || state->fDisable == 0) {
+        if (state == nullptr || state->fDisable == 0) {
             if (kind >= SkDisplayEvent::kMouseDown && kind <= SkDisplayEvent::kMouseUp) {
                 evt->x = state->fX;
                 evt->y = state->fY;
@@ -82,7 +82,7 @@ void SkEvents::dump(SkAnimateMaker& maker) {
     SkTDDrawableArray& drawArray = maker.fDisplayList.fDrawList;
     int count = drawArray.count();
     for (index = 0; index < count; index++) {
-        SkDrawable* drawable = drawArray[index];
+        SkADrawable* drawable = drawArray[index];
         drawable->dumpEvents();
     }
     count = fEvents.count();
@@ -96,7 +96,7 @@ void SkEvents::dump(SkAnimateMaker& maker) {
 // currently this only removes onLoad events
 void SkEvents::removeEvent(SkDisplayEvent::Kind kind, SkEventState* state) {
     int keyCode = state ? state->fCode : 0;
-    SkDisplayable* displayable = state ? state->fDisplayable : NULL;
+    SkDisplayable* displayable = state ? state->fDisplayable : nullptr;
     for (SkDisplayEvent** evtPtr = fEvents.begin(); evtPtr < fEvents.end(); evtPtr++) {
         SkDisplayEvent* evt = *evtPtr;
         if (evt->kind != kind)
@@ -105,7 +105,7 @@ void SkEvents::removeEvent(SkDisplayEvent::Kind kind, SkEventState* state) {
             if ((int) evt->code > keyCode || (int) (evt->fMax != (SkKey) -1 ? evt->fMax : evt->code) < keyCode)
                 continue;
         }
-        if (evt->fTarget != NULL && evt->fTarget != displayable)
+        if (evt->fTarget != nullptr && evt->fTarget != displayable)
             continue;
         int index = fEvents.find(evt);
         fEvents.remove(index);
diff --git a/gfx/skia/skia/src/animator/SkDisplayInclude.cpp b/gfx/skia/skia/src/animator/SkDisplayInclude.cpp
index 860264eb6f47..023b3913a5c9 100644
--- a/gfx/skia/skia/src/animator/SkDisplayInclude.cpp
+++ b/gfx/skia/skia/src/animator/SkDisplayInclude.cpp
@@ -11,13 +11,6 @@
 #include "SkAnimateMaker.h"
 #include "SkAnimator.h"
 
-#if 0
-#undef SK_MEMBER
-#define SK_MEMBER(_member, _type) \
-    { #_member, SK_OFFSETOF(BASE_CLASS::_A, _member), SkType_##_type, \
-    sizeof(((BASE_CLASS::_A*) 0)->_member) / sizeof(SkScalar) }
-#endif
-
 #if SK_USE_CONDENSED_INFO == 0
 
 const SkMemberInfo SkInclude::fInfo[] = {
diff --git a/gfx/skia/skia/src/animator/SkDisplayInclude.h b/gfx/skia/skia/src/animator/SkDisplayInclude.h
index 41b5d297401e..cc87dfa7cf67 100644
--- a/gfx/skia/skia/src/animator/SkDisplayInclude.h
+++ b/gfx/skia/skia/src/animator/SkDisplayInclude.h
@@ -15,9 +15,9 @@
 
 class SkInclude : public SkDisplayable {
     DECLARE_MEMBER_INFO(Include);
-    virtual void onEndElement(SkAnimateMaker & );
-    virtual bool enable(SkAnimateMaker & );
-    virtual bool hasEnable() const;
+    void onEndElement(SkAnimateMaker & ) override;
+    bool enable(SkAnimateMaker & ) override;
+    bool hasEnable() const override;
 protected:
     SkString src;
 };
diff --git a/gfx/skia/skia/src/animator/SkDisplayInput.cpp b/gfx/skia/skia/src/animator/SkDisplayInput.cpp
index 7061aa8ea9be..facc7039767a 100644
--- a/gfx/skia/skia/src/animator/SkDisplayInput.cpp
+++ b/gfx/skia/skia/src/animator/SkDisplayInput.cpp
@@ -30,7 +30,7 @@ DEFINE_GET_MEMBER(SkInput);
 SkInput::SkInput() : fInt((int) SK_NaN32), fFloat(SK_ScalarNaN) {}
 
 SkDisplayable* SkInput::contains(const SkString& string) {
-    return string.equals(name) ? this : NULL;
+    return string.equals(name) ? this : nullptr;
 }
 
 bool SkInput::enable(SkAnimateMaker & ) {
diff --git a/gfx/skia/skia/src/animator/SkDisplayInput.h b/gfx/skia/skia/src/animator/SkDisplayInput.h
index d9871e211ed5..b9a1bac91baf 100644
--- a/gfx/skia/skia/src/animator/SkDisplayInput.h
+++ b/gfx/skia/skia/src/animator/SkDisplayInput.h
@@ -16,10 +16,10 @@
 class SkInput : public SkDisplayable {
     DECLARE_MEMBER_INFO(Input);
     SkInput();
-    virtual SkDisplayable* contains(const SkString& );
-    virtual bool getProperty(int index, SkScriptValue* value) const;
-    virtual bool enable(SkAnimateMaker & );
-    virtual bool hasEnable() const;
+    SkDisplayable* contains(const SkString& ) override;
+    bool getProperty(int index, SkScriptValue* value) const override;
+    bool enable(SkAnimateMaker & ) override;
+    bool hasEnable() const override;
 protected:
     SkString name;
     int32_t  fInt;
diff --git a/gfx/skia/skia/src/animator/SkDisplayList.cpp b/gfx/skia/skia/src/animator/SkDisplayList.cpp
index 6434601f585a..fbba83f4f051 100644
--- a/gfx/skia/skia/src/animator/SkDisplayList.cpp
+++ b/gfx/skia/skia/src/animator/SkDisplayList.cpp
@@ -12,7 +12,7 @@
 #include "SkAnimateBase.h"
 #include "SkAnimateMaker.h"
 #include "SkDisplayApply.h"
-#include "SkDrawable.h"
+#include "SkADrawable.h"
 #include "SkDrawGroup.h"
 #include "SkDrawMatrix.h"
 #include "SkInterpolator.h"
@@ -39,7 +39,7 @@ bool SkDisplayList::draw(SkAnimateMaker& maker, SkMSec inTime) {
             active->reset();
         }
         for (int index = 0; index < fDrawList.count(); index++) {
-            SkDrawable* draw = fDrawList[index];
+            SkADrawable* draw = fDrawList[index];
             draw->initialize(); // allow matrices to reset themselves
             SkASSERT(draw->isDrawable());
             validate();
@@ -50,9 +50,9 @@ bool SkDisplayList::draw(SkAnimateMaker& maker, SkMSec inTime) {
     return result;
 }
 
-int SkDisplayList::findGroup(SkDrawable* match, SkTDDrawableArray** list,
+int SkDisplayList::findGroup(SkADrawable* match, SkTDDrawableArray** list,
         SkGroup** parent, SkGroup** found, SkTDDrawableArray**grandList) {
-    *parent = NULL;
+    *parent = nullptr;
     *list = &fDrawList;
     *grandList = &fDrawList;
     return SearchForMatch(match, list, parent, found, grandList);
@@ -68,11 +68,11 @@ bool SkDisplayList::onIRect(const SkIRect& r) {
     return fDrawBounds;
 }
 
-int SkDisplayList::SearchForMatch(SkDrawable* match, SkTDDrawableArray** list,
+int SkDisplayList::SearchForMatch(SkADrawable* match, SkTDDrawableArray** list,
         SkGroup** parent, SkGroup** found, SkTDDrawableArray**grandList) {
-    *found = NULL;
+    *found = nullptr;
     for (int index = 0; index < (*list)->count(); index++) {
-        SkDrawable* draw = (**list)[index];
+        SkADrawable* draw = (**list)[index];
         if (draw == match)
             return index;
         if (draw->isApply()) {
@@ -82,8 +82,8 @@ int SkDisplayList::SearchForMatch(SkDrawable* match, SkTDDrawableArray** list,
             if (apply->scope->isGroup() && SearchGroupForMatch(apply->scope, match, list, parent, found, grandList, index))
                 return index;
             if (apply->mode == SkApply::kMode_create) {
-                for (SkDrawable** ptr = apply->fScopes.begin(); ptr < apply->fScopes.end(); ptr++) {
-                    SkDrawable* scope = *ptr;
+                for (SkADrawable** ptr = apply->fScopes.begin(); ptr < apply->fScopes.end(); ptr++) {
+                    SkADrawable* scope = *ptr;
                     if (scope == match)
                         return index;
                     //perhaps should call SearchGroupForMatch here as well (on scope)
@@ -97,7 +97,7 @@ int SkDisplayList::SearchForMatch(SkDrawable* match, SkTDDrawableArray** list,
     return -1;
 }
 
-bool SkDisplayList::SearchGroupForMatch(SkDrawable* draw, SkDrawable* match, SkTDDrawableArray** list,
+bool SkDisplayList::SearchGroupForMatch(SkADrawable* draw, SkADrawable* match, SkTDDrawableArray** list,
         SkGroup** parent, SkGroup** found, SkTDDrawableArray** grandList, int &index) {
             SkGroup* group = (SkGroup*) draw;
             if (group->getOriginal() == match)
@@ -115,7 +115,7 @@ bool SkDisplayList::SearchGroupForMatch(SkDrawable* draw, SkDrawable* match, SkT
 
 void SkDisplayList::reset() {
     for (int index = 0; index < fDrawList.count(); index++) {
-        SkDrawable* draw = fDrawList[index];
+        SkADrawable* draw = fDrawList[index];
         if (draw->isApply() == false)
             continue;
         SkApply* apply = (SkApply*) draw;
@@ -151,7 +151,7 @@ void SkDisplayList::dumpInner(SkAnimateMaker* maker) {
 #ifdef SK_DEBUG
 void SkDisplayList::validate() {
     for (int index = 0; index < fDrawList.count(); index++) {
-        SkDrawable* draw = fDrawList[index];
+        SkADrawable* draw = fDrawList[index];
         draw->validate();
     }
 }
diff --git a/gfx/skia/skia/src/animator/SkDisplayList.h b/gfx/skia/skia/src/animator/SkDisplayList.h
index a856413def34..2beba3e1df4a 100644
--- a/gfx/skia/skia/src/animator/SkDisplayList.h
+++ b/gfx/skia/skia/src/animator/SkDisplayList.h
@@ -16,7 +16,7 @@
 class SkAnimateMaker;
 class SkActive;
 class SkApply;
-class SkDrawable;
+class SkADrawable;
 class SkGroup;
 
 class SkDisplayList : public SkRefCnt {
@@ -33,9 +33,9 @@ public:
     static int fIndent;
     static int fDumpIndex;
 #endif
-    int findGroup(SkDrawable* match, SkTDDrawableArray** list,
+    int findGroup(SkADrawable* match, SkTDDrawableArray** list,
         SkGroup** parent, SkGroup** found, SkTDDrawableArray** grandList);
-    SkDrawable* get(int index) { return fDrawList[index]; }
+    SkADrawable* get(int index) { return fDrawList[index]; }
     SkMSec getTime() { return fInTime; }
     SkTDDrawableArray* getDrawList() { return &fDrawList; }
     void hardReset();
@@ -47,9 +47,9 @@ public:
 #else
     void validate() {}
 #endif
-    static int SearchForMatch(SkDrawable* match, SkTDDrawableArray** list,
+    static int SearchForMatch(SkADrawable* match, SkTDDrawableArray** list,
         SkGroup** parent, SkGroup** found, SkTDDrawableArray**grandList);
-    static bool SearchGroupForMatch(SkDrawable* draw, SkDrawable* match,
+    static bool SearchGroupForMatch(SkADrawable* draw, SkADrawable* match,
         SkTDDrawableArray** list, SkGroup** parent, SkGroup** found, SkTDDrawableArray** grandList,
         int &index);
 public:
diff --git a/gfx/skia/skia/src/animator/SkDisplayMath.cpp b/gfx/skia/skia/src/animator/SkDisplayMath.cpp
index 7f406c1f655e..f52cf19371c6 100644
--- a/gfx/skia/skia/src/animator/SkDisplayMath.cpp
+++ b/gfx/skia/skia/src/animator/SkDisplayMath.cpp
@@ -131,7 +131,7 @@ DEFINE_GET_MEMBER(SkDisplayMath);
 void SkDisplayMath::executeFunction(SkDisplayable* target, int index,
         SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type,
         SkScriptValue* scriptValue) {
-    if (scriptValue == NULL)
+    if (scriptValue == nullptr)
         return;
     SkASSERT(target == this);
     SkScriptValue* array = parameters.begin();
diff --git a/gfx/skia/skia/src/animator/SkDisplayMath.h b/gfx/skia/skia/src/animator/SkDisplayMath.h
index 91537953be14..0311a7c1411e 100644
--- a/gfx/skia/skia/src/animator/SkDisplayMath.h
+++ b/gfx/skia/skia/src/animator/SkDisplayMath.h
@@ -16,11 +16,11 @@
 
 class SkDisplayMath : public SkDisplayable {
     DECLARE_DISPLAY_MEMBER_INFO(Math);
-    virtual void executeFunction(SkDisplayable* , int index,
+    void executeFunction(SkDisplayable* , int index,
         SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type,
-        SkScriptValue* );
-    virtual const SkFunctionParamType* getFunctionsParameters();
-    virtual bool getProperty(int index, SkScriptValue* value) const;
+        SkScriptValue* ) override;
+    const SkFunctionParamType* getFunctionsParameters() override;
+    bool getProperty(int index, SkScriptValue* value) const override;
 private:
     mutable SkRandom fRandom;
     static const SkScalar gConstants[];
diff --git a/gfx/skia/skia/src/animator/SkDisplayMovie.cpp b/gfx/skia/skia/src/animator/SkDisplayMovie.cpp
index ea832dcb4c7d..797d853be684 100644
--- a/gfx/skia/skia/src/animator/SkDisplayMovie.cpp
+++ b/gfx/skia/skia/src/animator/SkDisplayMovie.cpp
@@ -34,7 +34,7 @@ void SkDisplayMovie::buildMovie() {
         return;
     SkAnimateMaker* movieMaker = fMovie.fMaker;
     SkAnimateMaker* parentMaker = movieMaker->fParentMaker;
-    if (src.size() == 0 || parentMaker == NULL)
+    if (src.size() == 0 || parentMaker == nullptr)
         return;
     movieMaker->fPrefix.set(parentMaker->fPrefix);
     fDecodedSuccessfully = fMovie.fMaker->decodeURI(src.c_str());
@@ -105,8 +105,8 @@ bool SkDisplayMovie::enable(SkAnimateMaker&) {
     if (fDecodedSuccessfully == false)
         return false;
     SkAnimateMaker* movieMaker = fMovie.fMaker;
-    movieMaker->fEvents.doEvent(*movieMaker, SkDisplayEvent::kOnload, NULL);
-    movieMaker->fEvents.removeEvent(SkDisplayEvent::kOnload, NULL);
+    movieMaker->fEvents.doEvent(*movieMaker, SkDisplayEvent::kOnload, nullptr);
+    movieMaker->fEvents.removeEvent(SkDisplayEvent::kOnload, nullptr);
     fLoaded = true;
     movieMaker->fLoaded = true;
     return false;
diff --git a/gfx/skia/skia/src/animator/SkDisplayMovie.h b/gfx/skia/skia/src/animator/SkDisplayMovie.h
index 6210602a1feb..76e2d9ccc7c8 100644
--- a/gfx/skia/skia/src/animator/SkDisplayMovie.h
+++ b/gfx/skia/skia/src/animator/SkDisplayMovie.h
@@ -11,31 +11,31 @@
 #define SkDisplayMovie_DEFINED
 
 #include "SkAnimator.h"
-#include "SkDrawable.h"
+#include "SkADrawable.h"
 #include "SkMemberInfo.h"
 
 struct SkEventState;
 
-class SkDisplayMovie : public SkDrawable {
+class SkDisplayMovie : public SkADrawable {
     DECLARE_DISPLAY_MEMBER_INFO(Movie);
     SkDisplayMovie();
     virtual ~SkDisplayMovie();
     void buildMovie();
-    virtual SkDisplayable* deepCopy(SkAnimateMaker* );
-    virtual void dirty();
+    SkDisplayable* deepCopy(SkAnimateMaker* ) override;
+    void dirty() override;
     bool doEvent(const SkEvent& evt) {
         return fLoaded && fMovie.doEvent(evt);
     }
-    virtual bool doEvent(SkDisplayEvent::Kind , SkEventState* state );
-    virtual bool draw(SkAnimateMaker& );
+    bool doEvent(SkDisplayEvent::Kind , SkEventState* state ) override;
+    bool draw(SkAnimateMaker& ) override;
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
-    virtual void dumpEvents();
+    void dump(SkAnimateMaker* ) override;
+    void dumpEvents() override;
 #endif
-    virtual bool enable(SkAnimateMaker& );
+    bool enable(SkAnimateMaker& ) override;
     const SkAnimator* getAnimator() const { return &fMovie; }
-    virtual bool hasEnable() const;
-    virtual void onEndElement(SkAnimateMaker& );
+    bool hasEnable() const override;
+    void onEndElement(SkAnimateMaker& ) override;
 protected:
     SkString src;
     SkAnimator fMovie;
@@ -45,7 +45,7 @@ protected:
     friend class SkAnimateMaker;
     friend class SkPost;
 private:
-    typedef SkDrawable INHERITED;
+    typedef SkADrawable INHERITED;
 };
 
 #endif // SkDisplayMovie_DEFINED
diff --git a/gfx/skia/skia/src/animator/SkDisplayNumber.h b/gfx/skia/skia/src/animator/SkDisplayNumber.h
index 16c6f4fde418..b92c31143932 100644
--- a/gfx/skia/skia/src/animator/SkDisplayNumber.h
+++ b/gfx/skia/skia/src/animator/SkDisplayNumber.h
@@ -15,7 +15,7 @@
 
 class SkDisplayNumber : public SkDisplayable {
     DECLARE_DISPLAY_MEMBER_INFO(Number);
-    virtual bool getProperty(int index, SkScriptValue* value) const;
+    bool getProperty(int index, SkScriptValue* value) const override;
 private:
 };
 
diff --git a/gfx/skia/skia/src/animator/SkDisplayPost.cpp b/gfx/skia/skia/src/animator/SkDisplayPost.cpp
index cc45b216ba5d..a30fd4442f0a 100644
--- a/gfx/skia/skia/src/animator/SkDisplayPost.cpp
+++ b/gfx/skia/skia/src/animator/SkDisplayPost.cpp
@@ -38,8 +38,8 @@ const SkMemberInfo SkPost::fInfo[] = {
 
 DEFINE_GET_MEMBER(SkPost);
 
-SkPost::SkPost() : delay(0), /*initialized(SkBool(-1)), */ mode(kImmediate), fMaker(NULL),
-    fSinkID(0), fTargetMaker(NULL), fChildHasID(false), fDirty(false) {
+SkPost::SkPost() : delay(0), /*initialized(SkBool(-1)), */ mode(kImmediate), fMaker(nullptr),
+    fSinkID(0), fTargetMaker(nullptr), fChildHasID(false), fDirty(false) {
 }
 
 SkPost::~SkPost() {
@@ -76,7 +76,7 @@ void SkPost::dump(SkAnimateMaker* maker) {
     delete eventType;
 
     if (delay > 0) {
-        SkDebugf("delay=\"%g\" ", SkScalarToFloat(SkScalarDiv(delay, 1000)));
+        SkDebugf("delay=\"%g\" ", delay * 0.001);
     }
 //  if (initialized == false)
 //      SkDebugf("(uninitialized) ");
@@ -104,7 +104,7 @@ void SkPost::dump(SkAnimateMaker* maker) {
     //SkDataInput** ptr = fParts.end();
     //SkDataInput* data;
     //const char* ID;
-    while ((name = iter.next(&type, &number)) != NULL) {
+    while ((name = iter.next(&type, &number)) != nullptr) {
         //ptr--;
         if (strcmp(name, "id") == 0)
             continue;
@@ -210,7 +210,7 @@ bool SkPost::enable(SkAnimateMaker& maker ) {
     bool isAnimatorEvent = true;
     SkAnimator* anim = maker.getAnimator();
     if (targetID == 0) {
-        isAnimatorEvent = fEvent.findString("id") != NULL;
+        isAnimatorEvent = fEvent.findString("id") != nullptr;
         if (isAnimatorEvent)
             targetID = anim->getSinkID();
         else if (maker.fHostEventSinkID)
@@ -236,7 +236,7 @@ void SkPost::findSinkID() {
     do {
         const char* end = strchr(ch, '.');
         size_t len = end ? (size_t) (end - ch) : strlen(ch);
-        SkDisplayable* displayable = NULL;
+        SkDisplayable* displayable = nullptr;
         if (SK_LITERAL_STR_EQUAL("parent", ch, len)) {
             if (fTargetMaker->fParentMaker)
                 fTargetMaker = fTargetMaker->fParentMaker;
@@ -246,14 +246,14 @@ void SkPost::findSinkID() {
             }
         } else {
             fTargetMaker->find(ch, len, &displayable);
-            if (displayable == NULL || displayable->getType() != SkType_Movie) {
+            if (displayable == nullptr || displayable->getType() != SkType_Movie) {
                 fTargetMaker->setErrorCode(SkDisplayXMLParserError::kExpectedMovie);
                 return;
             }
             SkDisplayMovie* movie = (SkDisplayMovie*) displayable;
             fTargetMaker = movie->fMovie.fMaker;
         }
-        if (end == NULL)
+        if (end == nullptr)
             break;
         ch = ++end;
     } while (true);
diff --git a/gfx/skia/skia/src/animator/SkDisplayPost.h b/gfx/skia/skia/src/animator/SkDisplayPost.h
index cd22306840ca..80fdcfcdd830 100644
--- a/gfx/skia/skia/src/animator/SkDisplayPost.h
+++ b/gfx/skia/skia/src/animator/SkDisplayPost.h
@@ -27,17 +27,17 @@ class SkPost : public SkDisplayable {
     };
     SkPost();
     virtual ~SkPost();
-    virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
-    virtual bool childrenNeedDisposing() const;
-    virtual void dirty();
+    bool addChild(SkAnimateMaker& , SkDisplayable* child) override;
+    bool childrenNeedDisposing() const override;
+    void dirty() override;
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
+    void dump(SkAnimateMaker* ) override;
 #endif
-    virtual bool enable(SkAnimateMaker& );
-    virtual bool hasEnable() const;
-    virtual void onEndElement(SkAnimateMaker& );
-    virtual void setChildHasID();
-    virtual bool setProperty(int index, SkScriptValue& );
+    bool enable(SkAnimateMaker& ) override;
+    bool hasEnable() const override;
+    void onEndElement(SkAnimateMaker& ) override;
+    void setChildHasID() override;
+    bool setProperty(int index, SkScriptValue& ) override;
 protected:
     SkMSec delay;
     SkString sink;
diff --git a/gfx/skia/skia/src/animator/SkDisplayRandom.h b/gfx/skia/skia/src/animator/SkDisplayRandom.h
index 1c3865333ffc..2999156268fc 100644
--- a/gfx/skia/skia/src/animator/SkDisplayRandom.h
+++ b/gfx/skia/skia/src/animator/SkDisplayRandom.h
@@ -26,10 +26,10 @@ class SkDisplayRandom : public SkDisplayable {
     DECLARE_DISPLAY_MEMBER_INFO(Random);
     SkDisplayRandom();
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
+    void dump(SkAnimateMaker* ) override;
 #endif
-    virtual bool getProperty(int index, SkScriptValue* value) const;
-    virtual bool setProperty(int index, SkScriptValue& );
+    bool getProperty(int index, SkScriptValue* value) const override;
+    bool setProperty(int index, SkScriptValue& ) override;
 private:
     SkScalar blend;
     SkScalar min;
diff --git a/gfx/skia/skia/src/animator/SkDisplayType.cpp b/gfx/skia/skia/src/animator/SkDisplayType.cpp
index 4461a4b77b01..7ee8dab5a410 100644
--- a/gfx/skia/skia/src/animator/SkDisplayType.cpp
+++ b/gfx/skia/skia/src/animator/SkDisplayType.cpp
@@ -42,7 +42,6 @@
 #include "SkDrawText.h"
 #include "SkDrawTextBox.h"
 #include "SkDrawTo.h"
-#include "SkDrawTransparentShader.h"
 #include "SkDump.h"
 #include "SkExtras.h"
 #include "SkHitClear.h"
@@ -63,7 +62,7 @@
     case SkType_##_class: result = new SkDisplay##_class(); break
 #ifdef SK_DEBUG
     #define CASE_DEBUG_RETURN_NIL(_class) \
-        case SkType_##_class: return NULL
+        case SkType_##_class: return nullptr
 #else
     #define CASE_DEBUG_RETURN_NIL(_class)
 #endif
@@ -72,7 +71,7 @@
 SkDisplayTypes SkDisplayType::gNewTypes = kNumberOfTypes;
 
 SkDisplayable* SkDisplayType::CreateInstance(SkAnimateMaker* maker, SkDisplayTypes type) {
-    SkDisplayable* result = NULL;
+    SkDisplayable* result = nullptr;
     switch (type) {
         // unknown
         CASE_DISPLAY_NEW(Math);
@@ -196,13 +195,12 @@ SkDisplayable* SkDisplayType::CreateInstance(SkAnimateMaker* maker, SkDisplayTyp
         CASE_NEW(TextToPath);
         CASE_DEBUG_RETURN_NIL(TileMode);
         CASE_NEW(Translate);
-        CASE_DRAW_NEW(TransparentShader);
         CASE_DRAW_NEW(Typeface);
         CASE_DEBUG_RETURN_NIL(Xfermode);
         default:
             SkExtras** end = maker->fExtras.end();
             for (SkExtras** extraPtr = maker->fExtras.begin(); extraPtr < end; extraPtr++) {
-                if ((result = (*extraPtr)->createInstance(type)) != NULL)
+                if ((result = (*extraPtr)->createInstance(type)) != nullptr)
                     return result;
             }
             SkASSERT(0);
@@ -226,7 +224,7 @@ SkDisplayable* SkDisplayType::CreateInstance(SkAnimateMaker* maker, SkDisplayTyp
 
 const SkMemberInfo* SkDisplayType::GetMembers(SkAnimateMaker* maker,
         SkDisplayTypes type, int* infoCountPtr) {
-    const SkMemberInfo* info = NULL;
+    const SkMemberInfo* info = nullptr;
     int infoCount = 0;
     switch (type) {
         // unknown
@@ -351,7 +349,6 @@ const SkMemberInfo* SkDisplayType::GetMembers(SkAnimateMaker* maker,
         CASE_GET_INFO(TextToPath);
         // tilemode
         CASE_GET_INFO(Translate);
-        // transparentshader
         CASE_GET_DRAW_INFO(Typeface);
         // xfermode
         // knumberoftypes
@@ -359,11 +356,11 @@ const SkMemberInfo* SkDisplayType::GetMembers(SkAnimateMaker* maker,
             if (maker) {
                 SkExtras** end = maker->fExtras.end();
                 for (SkExtras** extraPtr = maker->fExtras.begin(); extraPtr < end; extraPtr++) {
-                    if ((info = (*extraPtr)->getMembers(type, infoCountPtr)) != NULL)
+                    if ((info = (*extraPtr)->getMembers(type, infoCountPtr)) != nullptr)
                         return info;
                 }
             }
-            return NULL;
+            return nullptr;
     }
     if (infoCountPtr)
         *infoCountPtr = infoCount;
@@ -518,7 +515,6 @@ const TypeNames gTypeNames[] = {
     { "textToPath", SkType_TextToPath           INIT_BOOL_FIELDS },
     // tilemode
     { "translate", SkType_Translate             INIT_BOOL_FIELDS },
-    DRAW_NAME("transparentShader", SkType_TransparentShader),
     { "typeface", SkType_Typeface               INIT_BOOL_FIELDS }
     // xfermode
     // knumberoftypes
@@ -529,7 +525,7 @@ const int kTypeNamesSize = SK_ARRAY_COUNT(gTypeNames);
 SkDisplayTypes SkDisplayType::Find(SkAnimateMaker* maker, const SkMemberInfo* match) {
     for (int index = 0; index < kTypeNamesSize; index++) {
         SkDisplayTypes type = gTypeNames[index].fType;
-        const SkMemberInfo* info = SkDisplayType::GetMembers(maker, type, NULL);
+        const SkMemberInfo* info = SkDisplayType::GetMembers(maker, type, nullptr);
         if (info == match)
             return type;
     }
@@ -542,7 +538,7 @@ SkDisplayTypes SkDisplayType::GetParent(SkAnimateMaker* maker, SkDisplayTypes ba
         return SkType_Displayable;
     if (base == SkType_Set)
         return SkType_Animate;  // another cheat until we have a lookup table
-    const SkMemberInfo* info = GetMembers(maker, base, NULL); // get info for this type
+    const SkMemberInfo* info = GetMembers(maker, base, nullptr); // get info for this type
     SkASSERT(info);
     if (info->fType != SkType_BaseClassInfo)
         return SkType_Unknown; // if no base, done
@@ -551,7 +547,7 @@ SkDisplayTypes SkDisplayType::GetParent(SkAnimateMaker* maker, SkDisplayTypes ba
     const SkMemberInfo* inherited = info->getInherited();
     SkDisplayTypes result = (SkDisplayTypes) (SkType_Unknown + 1);
     for (; result <= SkType_Xfermode; result = (SkDisplayTypes) (result + 1)) {
-        const SkMemberInfo* match = GetMembers(maker, result, NULL);
+        const SkMemberInfo* match = GetMembers(maker, result, nullptr);
         if (match == inherited)
             break;
     }
@@ -679,7 +675,6 @@ bool SkDisplayType::IsDisplayable(SkAnimateMaker* , SkDisplayTypes type) {
         case SkType_TextOnPath:
         case SkType_TextToPath:
         case SkType_Translate:
-        case SkType_TransparentShader:
             return true;
         default:    // to avoid warnings
             break;
@@ -715,10 +710,10 @@ const char* SkDisplayType::GetName(SkAnimateMaker* maker, SkDisplayTypes type) {
     SkExtras** end = maker->fExtras.end();
     for (SkExtras** extraPtr = maker->fExtras.begin(); extraPtr < end; extraPtr++) {
         const char* result = (*extraPtr)->getName(type);
-        if (result != NULL)
+        if (result != nullptr)
             return result;
     }
-    return NULL;
+    return nullptr;
 }
 #endif
 
@@ -733,7 +728,7 @@ void SkDisplayType::UnitTest() {
     }
     for (index = 0; index < kTypeNamesSize; index++) {
         SkDisplayable* test = CreateInstance(maker, gTypeNames[index].fType);
-        if (test == NULL)
+        if (test == nullptr)
             continue;
 #if defined _WIN32 && _MSC_VER >= 1300  && defined _INC_CRTDBG // only on windows, only if using "crtdbg.h"
     // we know that crtdbg puts 0xfdfdfdfd at the end of the block
@@ -749,7 +744,7 @@ void SkDisplayType::UnitTest() {
     for (index = 0; index < kTypeNamesSize; index++) {
         int infoCount;
         const SkMemberInfo* info = GetMembers(maker, gTypeNames[index].fType, &infoCount);
-        if (info == NULL)
+        if (info == nullptr)
             continue;
 #if SK_USE_CONDENSED_INFO == 0
         for (int inner = 0; inner < infoCount - 1; inner++) {
diff --git a/gfx/skia/skia/src/animator/SkDisplayTypes.cpp b/gfx/skia/skia/src/animator/SkDisplayTypes.cpp
index 287ca6e4d4f5..d3d8c68146f7 100644
--- a/gfx/skia/skia/src/animator/SkDisplayTypes.cpp
+++ b/gfx/skia/skia/src/animator/SkDisplayTypes.cpp
@@ -121,7 +121,7 @@ SkDisplayString::SkDisplayString(SkString& copyFrom) : value(copyFrom) {
 void SkDisplayString::executeFunction(SkDisplayable* target, int index,
         SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type,
         SkScriptValue* scriptValue) {
-    if (scriptValue == NULL)
+    if (scriptValue == nullptr)
         return;
     SkASSERT(target == this);
     switch (index) {
diff --git a/gfx/skia/skia/src/animator/SkDisplayTypes.h b/gfx/skia/skia/src/animator/SkDisplayTypes.h
index 1a3d0e5aa73c..07e8448a4c81 100644
--- a/gfx/skia/skia/src/animator/SkDisplayTypes.h
+++ b/gfx/skia/skia/src/animator/SkDisplayTypes.h
@@ -34,7 +34,7 @@ class SkDisplayBoolean : public SkDisplayDepend {
     DECLARE_DISPLAY_MEMBER_INFO(Boolean);
     SkDisplayBoolean();
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
+    void dump(SkAnimateMaker* ) override;
 #endif
     SkBool value;
     friend class SkAnimatorScript;
@@ -47,7 +47,7 @@ class SkDisplayInt : public SkDisplayDepend {
     DECLARE_DISPLAY_MEMBER_INFO(Int);
     SkDisplayInt();
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
+    void dump(SkAnimateMaker* ) override;
 #endif
 private:
     int32_t value;
@@ -61,7 +61,7 @@ class SkDisplayFloat : public SkDisplayDepend {
     DECLARE_DISPLAY_MEMBER_INFO(Float);
     SkDisplayFloat();
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
+    void dump(SkAnimateMaker* ) override;
 #endif
 private:
     SkScalar value;
@@ -75,11 +75,11 @@ class SkDisplayString : public SkDisplayDepend {
     DECLARE_DISPLAY_MEMBER_INFO(String);
     SkDisplayString();
     SkDisplayString(SkString& );
-    virtual void executeFunction(SkDisplayable* , int index,
+    void executeFunction(SkDisplayable* , int index,
         SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type,
-        SkScriptValue* );
-    virtual const SkFunctionParamType* getFunctionsParameters();
-    virtual bool getProperty(int index, SkScriptValue* ) const;
+        SkScriptValue* ) override;
+    const SkFunctionParamType* getFunctionsParameters() override;
+    bool getProperty(int index, SkScriptValue* ) const override;
     SkString value;
 private:
     static const SkFunctionParamType fFunctionParameters[];
@@ -91,7 +91,7 @@ class SkDisplayArray : public SkDisplayDepend {
     SkDisplayArray(SkTypedArray& );
     SkDisplayArray(SkOpArray& ); // compiled script experiment
     virtual ~SkDisplayArray();
-    virtual bool getProperty(int index, SkScriptValue* ) const;
+    bool getProperty(int index, SkScriptValue* ) const override;
 private:
     SkTypedArray values;
     friend class SkAnimator;
diff --git a/gfx/skia/skia/src/animator/SkDisplayXMLParser.cpp b/gfx/skia/skia/src/animator/SkDisplayXMLParser.cpp
index 3ebf9dc4fe5c..1c8b67b6af10 100644
--- a/gfx/skia/skia/src/animator/SkDisplayXMLParser.cpp
+++ b/gfx/skia/skia/src/animator/SkDisplayXMLParser.cpp
@@ -71,7 +71,7 @@ void SkDisplayXMLParserError::setInnerError(SkAnimateMaker* parent, const SkStri
 
 SkDisplayXMLParser::SkDisplayXMLParser(SkAnimateMaker& maker)
     : INHERITED(&maker.fError), fMaker(maker), fInInclude(maker.fInInclude),
-        fInSkia(maker.fInInclude), fCurrDisplayable(NULL)
+        fInSkia(maker.fInInclude), fCurrDisplayable(nullptr)
 {
 }
 
@@ -97,13 +97,13 @@ bool SkDisplayXMLParser::onAddAttribute(const char name[], const char value[]) {
 bool SkDisplayXMLParser::onAddAttributeLen(const char attrName[], const char attrValue[],
                                         size_t attrValueLen)
 {
-    if (fCurrDisplayable == NULL)    // this signals we should ignore attributes for this element
+    if (fCurrDisplayable == nullptr)    // this signals we should ignore attributes for this element
         return strncmp(attrName, "xmlns", sizeof("xmlns") - 1) != 0;
     SkDisplayable*  displayable = fCurrDisplayable;
     SkDisplayTypes  type = fCurrType;
 
     if (strcmp(attrName, "id") == 0) {
-        if (fMaker.find(attrValue, attrValueLen, NULL)) {
+        if (fMaker.find(attrValue, attrValueLen, nullptr)) {
             fError->setNoun(attrValue, attrValueLen);
             fError->setCode(SkXMLParserError::kDuplicateIDs);
             return true;
@@ -122,22 +122,22 @@ bool SkDisplayXMLParser::onAddAttributeLen(const char attrName[], const char att
     }
     const char* name = attrName;
     const SkMemberInfo* info = SkDisplayType::GetMember(&fMaker, type, &name);
-    if (info == NULL) {
+    if (info == nullptr) {
         fError->setNoun(name);
         fError->setCode(SkXMLParserError::kUnknownAttributeName);
         return true;
     }
-    if (info->setValue(fMaker, NULL, 0, info->getCount(), displayable, info->getType(), attrValue,
+    if (info->setValue(fMaker, nullptr, 0, info->getCount(), displayable, info->getType(), attrValue,
             attrValueLen))
         return false;
     if (fMaker.fError.hasError()) {
         fError->setNoun(attrValue, attrValueLen);
         return true;
     }
-    SkDisplayable* ref = NULL;
+    SkDisplayable* ref = nullptr;
     if (fMaker.find(attrValue, attrValueLen, &ref) == false) {
         ref = fMaker.createInstance(attrValue, attrValueLen);
-        if (ref == NULL) {
+        if (ref == nullptr) {
             fError->setNoun(attrValue, attrValueLen);
             fError->setCode(SkXMLParserError::kErrorInAttributeValue);
             return true;
@@ -184,7 +184,7 @@ bool SkDisplayXMLParser::onEndElement(const char elem[])
                 const SkMemberInfo* info =
                     SkDisplayType::GetMembers(&fMaker, fParents[parentIndex - 1].fType, &infoCount);
                 const SkMemberInfo* foundInfo;
-                if ((foundInfo = searchContainer(info, infoCount)) != NULL) {
+                if ((foundInfo = searchContainer(info, infoCount)) != nullptr) {
                     parent->setReference(foundInfo, displayable);
         //          if (displayable->isHelper() == false)
                         fMaker.helperAdd(displayable);
@@ -198,7 +198,7 @@ bool SkDisplayXMLParser::onEndElement(const char elem[])
         }
         fParents.remove(parentIndex);
     }
-    fCurrDisplayable = NULL;
+    fCurrDisplayable = nullptr;
     if (fInInclude == false && SK_strcasecmp(elem, "screenplay") == 0) {
         if (fMaker.fInMovie == false) {
             fMaker.fEnableTime = fMaker.getAppTime();
@@ -212,10 +212,10 @@ bool SkDisplayXMLParser::onEndElement(const char elem[])
             debugOut.appendS32(fMaker.fEnableTime - fMaker.fDebugTimeBase);
             SkDebugf("%s\n", debugOut.c_str());
 #endif
-            fMaker.fEvents.doEvent(fMaker, SkDisplayEvent::kOnload, NULL);
+            fMaker.fEvents.doEvent(fMaker, SkDisplayEvent::kOnload, nullptr);
             if (fMaker.fError.hasError())
                 return true;
-            fMaker.fEvents.removeEvent(SkDisplayEvent::kOnload, NULL);
+            fMaker.fEvents.removeEvent(SkDisplayEvent::kOnload, nullptr);
 
         }
         fInSkia = false;
@@ -229,7 +229,7 @@ bool SkDisplayXMLParser::onStartElement(const char name[])
 }
 
 bool SkDisplayXMLParser::onStartElementLen(const char name[], size_t len) {
-    fCurrDisplayable = NULL; // init so we'll ignore attributes if we exit early
+    fCurrDisplayable = nullptr; // init so we'll ignore attributes if we exit early
 
     if (SK_strncasecmp(name, "screenplay", len) == 0) {
         fInSkia = true;
@@ -241,7 +241,7 @@ bool SkDisplayXMLParser::onStartElementLen(const char name[], size_t len) {
         return false;
 
     SkDisplayable* displayable = fMaker.createInstance(name, len);
-    if (displayable == NULL) {
+    if (displayable == nullptr) {
         fError->setNoun(name, len);
         fError->setCode(SkXMLParserError::kUnknownElement);
         return true;
@@ -268,14 +268,14 @@ bool SkDisplayXMLParser::onStartElementLen(const char name[], size_t len) {
 
 const SkMemberInfo* SkDisplayXMLParser::searchContainer(const SkMemberInfo* infoBase,
                                                          int infoCount) {
-    const SkMemberInfo* bestDisplayable = NULL;
-    const SkMemberInfo* lastResort = NULL;
+    const SkMemberInfo* bestDisplayable = nullptr;
+    const SkMemberInfo* lastResort = nullptr;
     for (int index = 0; index < infoCount; index++) {
         const SkMemberInfo* info = &infoBase[index];
         if (info->fType == SkType_BaseClassInfo) {
             const SkMemberInfo* inherited = info->getInherited();
             const SkMemberInfo* result = searchContainer(inherited, info->fCount);
-            if (result != NULL)
+            if (result != nullptr)
                 return result;
             continue;
         }
@@ -312,5 +312,5 @@ rectNext:
         return bestDisplayable;
     if (lastResort)
         return lastResort;
-    return NULL;
+    return nullptr;
 }
diff --git a/gfx/skia/skia/src/animator/SkDisplayable.cpp b/gfx/skia/skia/src/animator/SkDisplayable.cpp
index aff3aaefc62e..dc3cecfdbae2 100644
--- a/gfx/skia/skia/src/animator/SkDisplayable.cpp
+++ b/gfx/skia/skia/src/animator/SkDisplayable.cpp
@@ -64,14 +64,14 @@ bool SkDisplayable::contains(SkDisplayable* ) {
 }
 
 SkDisplayable* SkDisplayable::contains(const SkString& ) {
-    return NULL;
+    return nullptr;
 }
 
 SkDisplayable* SkDisplayable::deepCopy(SkAnimateMaker* maker) {
     SkDisplayTypes type = getType();
     if (type == SkType_Unknown) {
         SkASSERT(0);
-        return NULL;
+        return nullptr;
     }
     SkDisplayable* copy = SkDisplayType::CreateInstance(maker, type);
     int index = -1;
@@ -79,7 +79,7 @@ SkDisplayable* SkDisplayable::deepCopy(SkAnimateMaker* maker) {
     const SkMemberInfo* info;
     do {
         info = copy->getMember(++index);
-        if (info == NULL)
+        if (info == nullptr)
             break;
         if (info->fType == SkType_MemberProperty) {
             SkScriptValue value;
@@ -93,7 +93,7 @@ SkDisplayable* SkDisplayable::deepCopy(SkAnimateMaker* maker) {
         if (info->fType == SkType_Array) {
             SkTDOperandArray* array = (SkTDOperandArray*) info->memberData(this);
             int arrayCount;
-            if (array == NULL || (arrayCount = array->count()) == 0)
+            if (array == nullptr || (arrayCount = array->count()) == 0)
                 continue;
             SkTDOperandArray* copyArray = (SkTDOperandArray*) info->memberData(copy);
             copyArray->setCount(arrayCount);
@@ -110,7 +110,7 @@ SkDisplayable* SkDisplayable::deepCopy(SkAnimateMaker* maker) {
         }
         if (SkDisplayType::IsDisplayable(maker, info->fType)) {
             SkDisplayable** displayable = (SkDisplayable**) info->memberData(this);
-            if (*displayable == NULL || *displayable == (SkDisplayable*) -1)
+            if (*displayable == nullptr || *displayable == (SkDisplayable*) -1)
                 continue;
             SkDisplayable* deeper = (*displayable)->deepCopy(maker);
             info->setMemberData(copy, deeper, sizeof(deeper));
@@ -160,7 +160,7 @@ void SkDisplayable::dumpAttrs(SkAnimateMaker* maker) {
     SkOperand blankValues[2];
     do {
         info = this->getMember(++index);
-        if (NULL == info) {
+        if (nullptr == info) {
             //SkDebugf("\n");
             break;
         }
@@ -185,7 +185,7 @@ void SkDisplayable::dumpAttrs(SkAnimateMaker* maker) {
         if (info->fType == SkType_Array) {
             SkTDOperandArray* array = (SkTDOperandArray*) info->memberData(this);
             int arrayCount;
-            if (array == NULL || (arrayCount = array->count()) == 0)
+            if (array == nullptr || (arrayCount = array->count()) == 0)
                 continue;
             SkDisplayTypes elementType;
             if (type == SkType_Array) {
@@ -259,12 +259,12 @@ void SkDisplayable::dumpChildren(SkAnimateMaker* maker, bool closedAngle) {
     SkDisplayList::fIndent += 4;
     do {
         info = this->getMember(++index);
-        if (NULL == info) {
+        if (nullptr == info) {
             break;
         }
         if (SkDisplayType::IsDisplayable(maker, info->fType)) {
             SkDisplayable** displayable = (SkDisplayable**) info->memberData(this);
-            if (*displayable == NULL || *displayable == (SkDisplayable*) -1)
+            if (*displayable == nullptr || *displayable == (SkDisplayable*) -1)
                 continue;
             if (closedAngle == false) {
                 SkDebugf(">\n");
@@ -377,7 +377,7 @@ void SkDisplayable::dumpValues(const SkMemberInfo* info, SkDisplayTypes type, Sk
         break;
     case SkType_MSec:
         if (op.fS32 != blankOp.fS32) {
-            SkDebugf(" %s=\"%g\"  ", info->fName, SkScalarToFloat(SkScalarDiv(op.fS32, 1000)));
+            SkDebugf(" %s=\"%g\"  ", info->fName, op.fS32 * 0.001);
         }
     default:
         SkDebugf("");
@@ -422,21 +422,21 @@ void SkDisplayable::getBounds(SkRect* rect) {
 }
 
 const SkFunctionParamType* SkDisplayable::getFunctionsParameters() {
-    return NULL;
+    return nullptr;
 }
 
 const SkMemberInfo* SkDisplayable::getMember(int index) {
-    return NULL;
+    return nullptr;
 }
 
 const SkMemberInfo* SkDisplayable::getMember(const char name[]) {
-    return NULL;
+    return nullptr;
 }
 
 const SkFunctionParamType* SkDisplayable::getParameters(const SkMemberInfo* info,
         int* paramCount) {
     const SkFunctionParamType* params = getFunctionsParameters();
-    SkASSERT(params != NULL);
+    SkASSERT(params != nullptr);
     int funcIndex = info->functionIndex();
     // !!! eventually break traversing params into an external function (maybe this whole function)
     int index = funcIndex;
@@ -456,7 +456,7 @@ const SkFunctionParamType* SkDisplayable::getParameters(const SkMemberInfo* info
 }
 
 SkDisplayable* SkDisplayable::getParent() const {
-    return NULL;
+    return nullptr;
 }
 
 bool SkDisplayable::getProperty(int index, SkScriptValue* ) const {
@@ -484,7 +484,7 @@ bool SkDisplayable::isDrawable() const {
 void SkDisplayable::onEndElement(SkAnimateMaker& ) {}
 
 const SkMemberInfo* SkDisplayable::preferredChild(SkDisplayTypes type) {
-    return NULL;
+    return nullptr;
 }
 
 bool SkDisplayable::resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* apply) {
diff --git a/gfx/skia/skia/src/animator/SkDraw3D.cpp b/gfx/skia/skia/src/animator/SkDraw3D.cpp
index 9e1c2cc0a60a..e7e92df3e30c 100644
--- a/gfx/skia/skia/src/animator/SkDraw3D.cpp
+++ b/gfx/skia/skia/src/animator/SkDraw3D.cpp
@@ -44,7 +44,7 @@ const SkMemberInfo Sk3D_Camera::fInfo[] = {
 
 DEFINE_GET_MEMBER(Sk3D_Camera);
 
-Sk3D_Camera::Sk3D_Camera() : hackWidth(0), hackHeight(0), patch(NULL) {
+Sk3D_Camera::Sk3D_Camera() : hackWidth(0), hackHeight(0), patch(nullptr) {
 }
 
 Sk3D_Camera::~Sk3D_Camera() {
diff --git a/gfx/skia/skia/src/animator/SkDraw3D.h b/gfx/skia/skia/src/animator/SkDraw3D.h
index a204044bee56..8c79b5e7b30f 100644
--- a/gfx/skia/skia/src/animator/SkDraw3D.h
+++ b/gfx/skia/skia/src/animator/SkDraw3D.h
@@ -11,7 +11,7 @@
 #define SkDraw3D_DEFINED
 
 #include "SkCamera.h"
-#include "SkDrawable.h"
+#include "SkADrawable.h"
 #include "SkMemberInfo.h"
 
 class Sk3D_Patch;
@@ -23,11 +23,11 @@ private:
     SkPoint3D fPoint;
 };
 
-class Sk3D_Camera : public SkDrawable {
+class Sk3D_Camera : public SkADrawable {
     DECLARE_MEMBER_INFO(3D_Camera);
     Sk3D_Camera();
     virtual ~Sk3D_Camera();
-    virtual bool draw(SkAnimateMaker& );
+    bool draw(SkAnimateMaker& ) override;
 private:
     SkScalar hackWidth;
     SkScalar hackHeight;
@@ -38,10 +38,10 @@ private:
 class Sk3D_Patch : public SkDisplayable {
     DECLARE_MEMBER_INFO(3D_Patch);
 private:
-    virtual void executeFunction(SkDisplayable* , int index,
+    void executeFunction(SkDisplayable* , int index,
         SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type,
-        SkScriptValue* );
-    virtual const SkFunctionParamType* getFunctionsParameters();
+        SkScriptValue* ) override;
+    const SkFunctionParamType* getFunctionsParameters() override;
     SkPatch3D  fPatch;
     static const SkFunctionParamType fFunctionParameters[];
     friend class Sk3D_Camera;
diff --git a/gfx/skia/skia/src/animator/SkDrawBitmap.cpp b/gfx/skia/skia/src/animator/SkDrawBitmap.cpp
index 53497749a42a..ce7464d702bd 100644
--- a/gfx/skia/skia/src/animator/SkDrawBitmap.cpp
+++ b/gfx/skia/skia/src/animator/SkDrawBitmap.cpp
@@ -130,8 +130,8 @@ const SkMemberInfo SkImageBaseBitmap::fInfo[] = {
 
 DEFINE_GET_MEMBER(SkImageBaseBitmap);
 
-SkImageBaseBitmap::SkImageBaseBitmap() : fDirty(true), fUriBase(NULL) {
-    base64.fData = NULL;
+SkImageBaseBitmap::SkImageBaseBitmap() : fDirty(true), fUriBase(nullptr) {
+    base64.fData = nullptr;
     base64.fLength = 0;
 }
 
@@ -189,7 +189,7 @@ void SkImageBaseBitmap::resolve() {
         fBitmap.reset();
 
         //SkStream* stream = SkStream::GetURIStream(fUriBase, src.c_str());
-        SkAutoTUnref<SkStreamAsset> stream(SkStream::NewFromFile(src.c_str()));
+        SkAutoTDelete<SkStreamAsset> stream(SkStream::NewFromFile(src.c_str()));
         if (stream.get()) {
             SkImageDecoder::DecodeStream(stream, &fBitmap);
         }
diff --git a/gfx/skia/skia/src/animator/SkDrawBitmap.h b/gfx/skia/skia/src/animator/SkDrawBitmap.h
index f9a92126b5e0..270545d0ee98 100644
--- a/gfx/skia/skia/src/animator/SkDrawBitmap.h
+++ b/gfx/skia/skia/src/animator/SkDrawBitmap.h
@@ -20,7 +20,7 @@ class SkBaseBitmap : public SkBoundable {
     DECLARE_MEMBER_INFO(BaseBitmap);
     SkBaseBitmap();
     virtual ~SkBaseBitmap();
-    virtual bool draw(SkAnimateMaker& );
+    bool draw(SkAnimateMaker& ) override;
 protected:
     SkBitmap fBitmap;
     SkScalar x;
@@ -36,10 +36,10 @@ class SkDrawBitmap : public SkBaseBitmap {
     SkDrawBitmap();
     virtual ~SkDrawBitmap();
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
+    void dump(SkAnimateMaker* ) override;
 #endif
-    virtual void onEndElement(SkAnimateMaker& );
-    virtual bool setProperty(int index, SkScriptValue& value);
+    void onEndElement(SkAnimateMaker& ) override;
+    bool setProperty(int index, SkScriptValue& value) override;
 protected:
     int /*SkBitmap::Config*/ format;
     int32_t height;
@@ -54,11 +54,11 @@ class SkImageBaseBitmap : public SkBaseBitmap {
     DECLARE_MEMBER_INFO(ImageBaseBitmap);
     SkImageBaseBitmap();
     virtual ~SkImageBaseBitmap();
-    virtual SkDisplayable* deepCopy(SkAnimateMaker* );
-    virtual void dirty();
-    virtual bool draw(SkAnimateMaker& );
-    virtual bool getProperty(int index, SkScriptValue* value) const;
-    virtual void onEndElement(SkAnimateMaker& maker);
+    SkDisplayable* deepCopy(SkAnimateMaker* ) override;
+    void dirty() override;
+    bool draw(SkAnimateMaker& ) override;
+    bool getProperty(int index, SkScriptValue* value) const override;
+    void onEndElement(SkAnimateMaker& maker) override;
 private:
     void resolve() const { (const_cast<SkImageBaseBitmap*>(this))->resolve(); }
     void resolve();
diff --git a/gfx/skia/skia/src/animator/SkDrawBlur.cpp b/gfx/skia/skia/src/animator/SkDrawBlur.cpp
index 36d645286fda..14f34acf9b26 100644
--- a/gfx/skia/skia/src/animator/SkDrawBlur.cpp
+++ b/gfx/skia/skia/src/animator/SkDrawBlur.cpp
@@ -27,7 +27,7 @@ SkDrawBlur::SkDrawBlur()
 
 SkMaskFilter* SkDrawBlur::getMaskFilter() {
     if (fSigma <= 0) {
-        return NULL;
+        return nullptr;
     }
     return SkBlurMaskFilter::Create((SkBlurStyle)fBlurStyle, fSigma);
 }
diff --git a/gfx/skia/skia/src/animator/SkDrawBlur.h b/gfx/skia/skia/src/animator/SkDrawBlur.h
index 75075922dc75..d3a528c22fa9 100644
--- a/gfx/skia/skia/src/animator/SkDrawBlur.h
+++ b/gfx/skia/skia/src/animator/SkDrawBlur.h
@@ -14,7 +14,7 @@
 class SkDrawBlur : public SkDrawMaskFilter {
     DECLARE_DRAW_MEMBER_INFO(Blur);
     SkDrawBlur();
-    virtual SkMaskFilter* getMaskFilter() SK_OVERRIDE;
+    SkMaskFilter* getMaskFilter() override;
 protected:
     SkScalar fSigma;
     int /*SkBlurStyle*/ fBlurStyle;
diff --git a/gfx/skia/skia/src/animator/SkDrawClip.cpp b/gfx/skia/skia/src/animator/SkDrawClip.cpp
index e26a1bf41008..bca816f6371b 100644
--- a/gfx/skia/skia/src/animator/SkDrawClip.cpp
+++ b/gfx/skia/skia/src/animator/SkDrawClip.cpp
@@ -25,14 +25,14 @@ const SkMemberInfo SkDrawClip::fInfo[] = {
 
 DEFINE_GET_MEMBER(SkDrawClip);
 
-SkDrawClip::SkDrawClip() : rect(NULL), path(NULL) {
+SkDrawClip::SkDrawClip() : rect(nullptr), path(nullptr) {
 }
 
 bool SkDrawClip::draw(SkAnimateMaker& maker ) {
-    if (rect != NULL)
+    if (rect != nullptr)
         maker.fCanvas->clipRect(rect->fRect);
     else {
-        SkASSERT(path != NULL);
+        SkASSERT(path != nullptr);
         maker.fCanvas->clipPath(path->fPath);
     }
     return false;
diff --git a/gfx/skia/skia/src/animator/SkDrawClip.h b/gfx/skia/skia/src/animator/SkDrawClip.h
index 6265775249f2..6c64f93f22a2 100644
--- a/gfx/skia/skia/src/animator/SkDrawClip.h
+++ b/gfx/skia/skia/src/animator/SkDrawClip.h
@@ -10,17 +10,17 @@
 #ifndef SkDrawClip_DEFINED
 #define SkDrawClip_DEFINED
 
-#include "SkDrawable.h"
+#include "SkADrawable.h"
 #include "SkMemberInfo.h"
 #include "SkRegion.h"
 
 class SkDrawPath;
 class SkDrawRect;
 
-class SkDrawClip : public SkDrawable {
+class SkDrawClip : public SkADrawable {
     DECLARE_DRAW_MEMBER_INFO(Clip);
     SkDrawClip();
-    virtual bool draw(SkAnimateMaker& );
+    bool draw(SkAnimateMaker& ) override;
 private:
     SkDrawRect* rect;
     SkDrawPath* path;
diff --git a/gfx/skia/skia/src/animator/SkDrawColor.cpp b/gfx/skia/skia/src/animator/SkDrawColor.cpp
index eb57d9dad49e..c2d0dae8fe6f 100644
--- a/gfx/skia/skia/src/animator/SkDrawColor.cpp
+++ b/gfx/skia/skia/src/animator/SkDrawColor.cpp
@@ -30,14 +30,14 @@ static SkScalar RGB_to_HSV(SkColor color, HSV_Choice choice) {
     if (choice == kGetValue)
         return value/255;
     SkScalar delta = value - min;
-    SkScalar saturation = value == 0 ? 0 : SkScalarDiv(delta, value);
+    SkScalar saturation = value == 0 ? 0 : delta / value;
     if (choice == kGetSaturation)
         return saturation;
     SkScalar hue;
     if (saturation == 0)
         hue = 0;
     else {
-        SkScalar part60 = SkScalarDiv(60 * SK_Scalar1, delta);
+        SkScalar part60 = 60 / delta;
         if (red == value) {
             hue = SkScalarMul(green - blue, part60);
             if (hue < 0)
@@ -126,7 +126,7 @@ SkDrawColor::SkDrawColor() : fDirty(false) {
 }
 
 bool SkDrawColor::add() {
-    if (fPaint->color != NULL)
+    if (fPaint->color != nullptr)
         return true; // error (probably color in paint as attribute as well)
     fPaint->color = this;
     fPaint->fOwnsColor = true;
@@ -211,7 +211,7 @@ void SkDrawColor::onEndElement(SkAnimateMaker&) {
 }
 
 bool SkDrawColor::setParent(SkDisplayable* parent) {
-    SkASSERT(parent != NULL);
+    SkASSERT(parent != nullptr);
     if (parent->getType() == SkType_DrawLinearGradient || parent->getType() == SkType_DrawRadialGradient)
         return false;
     if (parent->isPaint() == false)
diff --git a/gfx/skia/skia/src/animator/SkDrawColor.h b/gfx/skia/skia/src/animator/SkDrawColor.h
index 17d1eef319db..14788e45baa6 100644
--- a/gfx/skia/skia/src/animator/SkDrawColor.h
+++ b/gfx/skia/skia/src/animator/SkDrawColor.h
@@ -14,18 +14,18 @@
 class SkDrawColor : public SkPaintPart {
     DECLARE_DRAW_MEMBER_INFO(Color);
     SkDrawColor();
-    virtual bool add();
-    virtual void dirty();
+    bool add() override;
+    void dirty() override;
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
+    void dump(SkAnimateMaker* ) override;
 #endif
     SkColor getColor();
-    virtual SkDisplayable* deepCopy(SkAnimateMaker* );
-    virtual SkDisplayable* getParent() const;
-    virtual bool getProperty(int index, SkScriptValue* value) const;
-    virtual void onEndElement(SkAnimateMaker& );
-    virtual bool setParent(SkDisplayable* parent);
-    virtual bool setProperty(int index, SkScriptValue&);
+    SkDisplayable* deepCopy(SkAnimateMaker* ) override;
+    SkDisplayable* getParent() const override;
+    bool getProperty(int index, SkScriptValue* value) const override;
+    void onEndElement(SkAnimateMaker& ) override;
+    bool setParent(SkDisplayable* parent) override;
+    bool setProperty(int index, SkScriptValue&) override;
 protected:
     SkColor color;
     SkScalar fHue;
diff --git a/gfx/skia/skia/src/animator/SkDrawDash.cpp b/gfx/skia/skia/src/animator/SkDrawDash.cpp
index cfef30335b90..d47db416fbd4 100644
--- a/gfx/skia/skia/src/animator/SkDrawDash.cpp
+++ b/gfx/skia/skia/src/animator/SkDrawDash.cpp
@@ -30,6 +30,6 @@ SkDash::~SkDash() {
 SkPathEffect* SkDash::getPathEffect() {
     int count = intervals.count();
     if (count == 0)
-        return NULL;
+        return nullptr;
     return SkDashPathEffect::Create(intervals.begin(), count, phase);
 }
diff --git a/gfx/skia/skia/src/animator/SkDrawDash.h b/gfx/skia/skia/src/animator/SkDrawDash.h
index fafc4b07e274..3083fe8124d2 100644
--- a/gfx/skia/skia/src/animator/SkDrawDash.h
+++ b/gfx/skia/skia/src/animator/SkDrawDash.h
@@ -15,7 +15,7 @@ class SkDash : public SkDrawPathEffect {
     DECLARE_MEMBER_INFO(Dash);
     SkDash();
     virtual ~SkDash();
-    virtual SkPathEffect* getPathEffect();
+    SkPathEffect* getPathEffect() override;
 private:
     SkTDScalarArray intervals;
     SkScalar phase;
diff --git a/gfx/skia/skia/src/animator/SkDrawDiscrete.cpp b/gfx/skia/skia/src/animator/SkDrawDiscrete.cpp
index 9376435950d7..14917839b22e 100644
--- a/gfx/skia/skia/src/animator/SkDrawDiscrete.cpp
+++ b/gfx/skia/skia/src/animator/SkDrawDiscrete.cpp
@@ -28,7 +28,7 @@ SkDiscrete::SkDiscrete() : deviation(0), segLength(0) {
 
 SkPathEffect* SkDiscrete::getPathEffect() {
     if (deviation <= 0 || segLength <= 0)
-        return NULL;
+        return nullptr;
     else
         return SkDiscretePathEffect::Create(segLength, deviation);
 }
diff --git a/gfx/skia/skia/src/animator/SkDrawDiscrete.h b/gfx/skia/skia/src/animator/SkDrawDiscrete.h
index d0f9239c4c60..fe13f268b28e 100644
--- a/gfx/skia/skia/src/animator/SkDrawDiscrete.h
+++ b/gfx/skia/skia/src/animator/SkDrawDiscrete.h
@@ -13,7 +13,7 @@
 class SkDiscrete : public SkDrawPathEffect {
     DECLARE_MEMBER_INFO(Discrete);
     SkDiscrete();
-    virtual SkPathEffect* getPathEffect();
+    SkPathEffect* getPathEffect() override;
 private:
     SkScalar deviation;
     SkScalar segLength;
diff --git a/gfx/skia/skia/src/animator/SkDrawEmboss.cpp b/gfx/skia/skia/src/animator/SkDrawEmboss.cpp
index 70a2826d3eb3..a1cd4dcd162c 100644
--- a/gfx/skia/skia/src/animator/SkDrawEmboss.cpp
+++ b/gfx/skia/skia/src/animator/SkDrawEmboss.cpp
@@ -28,7 +28,7 @@ SkDrawEmboss::SkDrawEmboss() : fSigma(-1) {
 
 SkMaskFilter* SkDrawEmboss::getMaskFilter() {
     if (fSigma < 0 || fDirection.count() !=3)
-        return NULL;
+        return nullptr;
     return SkBlurMaskFilter::CreateEmboss(fSigma, fDirection.begin(),
                                           fAmbient, fSpecular);
 }
diff --git a/gfx/skia/skia/src/animator/SkDrawEmboss.h b/gfx/skia/skia/src/animator/SkDrawEmboss.h
index 7ffd3ef8419d..941be61e20b3 100644
--- a/gfx/skia/skia/src/animator/SkDrawEmboss.h
+++ b/gfx/skia/skia/src/animator/SkDrawEmboss.h
@@ -15,7 +15,7 @@
 class SkDrawEmboss : public SkDrawMaskFilter {
     DECLARE_DRAW_MEMBER_INFO(Emboss);
     SkDrawEmboss();
-    virtual SkMaskFilter* getMaskFilter() SK_OVERRIDE;
+    SkMaskFilter* getMaskFilter() override;
 protected:
     SkTDScalarArray fDirection;
     SkScalar        fSigma;
diff --git a/gfx/skia/skia/src/animator/SkDrawExtraPathEffect.cpp b/gfx/skia/skia/src/animator/SkDrawExtraPathEffect.cpp
index 007fb5263bd5..4fa76c65c9a1 100644
--- a/gfx/skia/skia/src/animator/SkDrawExtraPathEffect.cpp
+++ b/gfx/skia/skia/src/animator/SkDrawExtraPathEffect.cpp
@@ -20,11 +20,11 @@ class SkDrawShapePathEffect : public SkDrawPathEffect {
     DECLARE_PRIVATE_MEMBER_INFO(DrawShapePathEffect);
     SkDrawShapePathEffect();
     virtual ~SkDrawShapePathEffect();
-    virtual bool addChild(SkAnimateMaker& , SkDisplayable* ) SK_OVERRIDE;
-    virtual SkPathEffect* getPathEffect();
+    bool addChild(SkAnimateMaker& , SkDisplayable* ) override;
+    SkPathEffect* getPathEffect() override;
 protected:
-    SkDrawable* addPath;
-    SkDrawable* addMatrix;
+    SkADrawable* addPath;
+    SkADrawable* addMatrix;
     SkDrawPath* path;
     SkPathEffect* fPathEffect;
     friend class SkShape1DPathEffect;
@@ -35,7 +35,7 @@ class SkDrawShape1DPathEffect : public SkDrawShapePathEffect {
     DECLARE_EXTRAS_MEMBER_INFO(SkDrawShape1DPathEffect);
     SkDrawShape1DPathEffect(SkDisplayTypes );
     virtual ~SkDrawShape1DPathEffect();
-    virtual void onEndElement(SkAnimateMaker& );
+    void onEndElement(SkAnimateMaker& ) override;
 private:
     SkString phase;
     SkString spacing;
@@ -47,7 +47,7 @@ class SkDrawShape2DPathEffect : public SkDrawShapePathEffect {
     DECLARE_EXTRAS_MEMBER_INFO(SkDrawShape2DPathEffect);
     SkDrawShape2DPathEffect(SkDisplayTypes );
     virtual ~SkDrawShape2DPathEffect();
-    virtual void onEndElement(SkAnimateMaker& );
+    void onEndElement(SkAnimateMaker& ) override;
 private:
     SkDrawMatrix* matrix;
     friend class SkShape2DPathEffect;
@@ -58,9 +58,9 @@ class SkDrawComposePathEffect : public SkDrawPathEffect {
     DECLARE_EXTRAS_MEMBER_INFO(SkDrawComposePathEffect);
     SkDrawComposePathEffect(SkDisplayTypes );
     virtual ~SkDrawComposePathEffect();
-    virtual bool addChild(SkAnimateMaker& , SkDisplayable* ) SK_OVERRIDE;
-    virtual SkPathEffect* getPathEffect();
-    virtual bool isPaint() const;
+    bool addChild(SkAnimateMaker& , SkDisplayable* ) override;
+    SkPathEffect* getPathEffect() override;
+    bool isPaint() const override;
 private:
     SkDrawPathEffect* effect1;
     SkDrawPathEffect* effect2;
@@ -70,7 +70,7 @@ class SkDrawCornerPathEffect : public SkDrawPathEffect {
     DECLARE_EXTRAS_MEMBER_INFO(SkDrawCornerPathEffect);
     SkDrawCornerPathEffect(SkDisplayTypes );
     virtual ~SkDrawCornerPathEffect();
-    virtual SkPathEffect* getPathEffect();
+    SkPathEffect* getPathEffect() override;
 private:
     SkScalar radius;
 };
@@ -89,21 +89,22 @@ public:
         fDraw(draw), fMaker(maker) {
     }
 
-    SK_DECLARE_UNFLATTENABLE_OBJECT()
+    // For serialization.  This will never be called.
+    Factory getFactory() const override { sk_throw(); return nullptr; }
 
 protected:
-    virtual SkScalar begin(SkScalar contourLength) const {
+    SkScalar begin(SkScalar contourLength) const override {
         SkScriptValue value;
-        SkAnimatorScript engine(*fMaker, NULL, SkType_Float);
+        SkAnimatorScript engine(*fMaker, nullptr, SkType_Float);
         engine.propertyCallBack(GetContourLength, &contourLength);
         value.fOperand.fScalar = 0;
         engine.evaluate(fDraw->phase.c_str(), &value, SkType_Float);
         return value.fOperand.fScalar;
     }
 
-    virtual SkScalar next(SkPath* dst, SkScalar distance, SkPathMeasure&) const {
+    SkScalar next(SkPath* dst, SkScalar distance, SkPathMeasure&) const override {
         fMaker->setExtraPropertyCallBack(fDraw->fType, GetDistance, &distance);
-        SkDrawPath* drawPath = NULL;
+        SkDrawPath* drawPath = nullptr;
         if (fDraw->addPath->isPath()) {
             drawPath = (SkDrawPath*) fDraw->addPath;
         } else {
@@ -131,13 +132,21 @@ protected:
             }
         }
         SkScalar result = 0;
-        SkAnimatorScript::EvaluateFloat(*fMaker, NULL, fDraw->spacing.c_str(), &result);
+        SkAnimatorScript::EvaluateFloat(*fMaker, nullptr, fDraw->spacing.c_str(), &result);
         if (drawPath)
             dst->addPath(drawPath->getPath(), m);
         fMaker->clearExtraPropertyCallBack(fDraw->fType);
         return result;
     }
 
+#ifndef SK_IGNORE_TO_STRING
+    void toString(SkString* str) const override {
+        str->appendf("SkShape1DPathEffect: (");
+        // TODO: fill in
+        str->appendf(")");
+    }
+#endif
+
 private:
     static bool GetContourLength(const char* token, size_t len, void* clen, SkScriptValue* value) {
         if (SK_LITERAL_STR_EQUAL("contourLength", token, len)) {
@@ -176,7 +185,7 @@ const SkMemberInfo SkDrawShapePathEffect::fInfo[] = {
 DEFINE_GET_MEMBER(SkDrawShapePathEffect);
 
 SkDrawShapePathEffect::SkDrawShapePathEffect() :
-    addPath(NULL), addMatrix(NULL), path(NULL), fPathEffect(NULL) {
+    addPath(nullptr), addMatrix(nullptr), path(nullptr), fPathEffect(nullptr) {
 }
 
 SkDrawShapePathEffect::~SkDrawShapePathEffect() {
@@ -214,7 +223,7 @@ SkDrawShape1DPathEffect::~SkDrawShape1DPathEffect() {
 }
 
 void SkDrawShape1DPathEffect::onEndElement(SkAnimateMaker& maker) {
-    if (addPath == NULL || (addPath->isPath() == false && addPath->isApply() == false))
+    if (addPath == nullptr || (addPath->isPath() == false && addPath->isApply() == false))
         maker.setErrorCode(SkDisplayXMLParserError::kUnknownError); // !!! add error
     else
         fPathEffect = new SkShape1DPathEffect(this, &maker);
@@ -228,12 +237,15 @@ public:
         const SkMatrix& matrix) : Sk2DPathEffect(matrix), fDraw(draw), fMaker(maker) {
     }
 
+    // For serialization.  This will never be called.
+    Factory getFactory() const override { sk_throw(); return nullptr; }
+
 protected:
-    virtual void begin(const SkIRect& uvBounds, SkPath*) const SK_OVERRIDE {
+    void begin(const SkIRect& uvBounds, SkPath*) const override {
         const_cast<SkShape2DPathEffect*>(this)->setUVBounds(uvBounds);
     }
 
-    virtual void next(const SkPoint& loc, int u, int v, SkPath* dst) const SK_OVERRIDE {
+    void next(const SkPoint& loc, int u, int v, SkPath* dst) const override {
         const_cast<SkShape2DPathEffect*>(this)->addPath(loc, u, v, dst);
     }
 
@@ -258,7 +270,7 @@ private:
             apply->interpolate(*fMaker, v);
             drawPath = (SkDrawPath*) apply->getScope();
         }
-        if (drawPath == NULL)
+        if (drawPath == nullptr)
             goto clearCallBack;
         if (fDraw->matrix) {
             SkDrawMatrix* matrix;
@@ -329,8 +341,8 @@ SkDrawShape2DPathEffect::~SkDrawShape2DPathEffect() {
 }
 
 void SkDrawShape2DPathEffect::onEndElement(SkAnimateMaker& maker) {
-    if (addPath == NULL || (addPath->isPath() == false && addPath->isApply() == false) ||
-            matrix == NULL)
+    if (addPath == nullptr || (addPath->isPath() == false && addPath->isApply() == false) ||
+            matrix == nullptr)
         maker.setErrorCode(SkDisplayXMLParserError::kUnknownError); // !!! add error
     else
         fPathEffect = new SkShape2DPathEffect(this, &maker, matrix->getMatrix());
@@ -350,7 +362,7 @@ const SkMemberInfo SkDrawComposePathEffect::fInfo[] = {
 DEFINE_GET_MEMBER(SkDrawComposePathEffect);
 
 SkDrawComposePathEffect::SkDrawComposePathEffect(SkDisplayTypes type) : fType(type),
-    effect1(NULL), effect2(NULL) {
+    effect1(nullptr), effect2(nullptr) {
 }
 
 SkDrawComposePathEffect::~SkDrawComposePathEffect() {
@@ -359,7 +371,7 @@ SkDrawComposePathEffect::~SkDrawComposePathEffect() {
 }
 
 bool SkDrawComposePathEffect::addChild(SkAnimateMaker& , SkDisplayable* child) {
-    if (effect1 == NULL)
+    if (effect1 == nullptr)
         effect1 = (SkDrawPathEffect*) child;
     else
         effect2 = (SkDrawPathEffect*) child;
@@ -421,7 +433,7 @@ public:
     }
 
     virtual SkDisplayable* createInstance(SkDisplayTypes type) {
-        SkDisplayable* result = NULL;
+        SkDisplayable* result = nullptr;
         if (skDrawShape1DPathEffectType == type)
             result = new SkDrawShape1DPathEffect(type);
         else if (skDrawShape2DPathEffectType == type)
@@ -442,7 +454,7 @@ public:
 
 #if SK_USE_CONDENSED_INFO == 0
     virtual const SkMemberInfo* getMembers(SkDisplayTypes type, int* infoCountPtr) {
-        const SkMemberInfo* info = NULL;
+        const SkMemberInfo* info = nullptr;
         int infoCount = 0;
         if (skDrawShape1DPathEffectType == type) {
             info = SkDrawShape1DPathEffect::fInfo;
@@ -473,12 +485,12 @@ public:
             return kDrawComposePathEffectName;
         else if (skDrawCornerPathEffectType == type)
             return kDrawCornerPathEffectName;
-        return NULL;
+        return nullptr;
     }
 #endif
 
     virtual SkDisplayTypes getType(const char name[], size_t len ) {
-        SkDisplayTypes* type = NULL;
+        SkDisplayTypes* type = nullptr;
         if (SK_LITERAL_STR_EQUAL(kDrawShape1DPathEffectName, name, len))
             type = &skDrawShape1DPathEffectType;
         else if (SK_LITERAL_STR_EQUAL(kDrawShape2DPathEffectName, name, len))
@@ -509,5 +521,5 @@ void InitializeSkExtraPathEffects(SkAnimator* animator) {
 ////////////////
 
 
-SkExtras::SkExtras() : fExtraCallBack(NULL), fExtraStorage(NULL) {
+SkExtras::SkExtras() : fExtraCallBack(nullptr), fExtraStorage(nullptr) {
 }
diff --git a/gfx/skia/skia/src/animator/SkDrawFull.h b/gfx/skia/skia/src/animator/SkDrawFull.h
index a2dcf4979060..8a79c4dbae23 100644
--- a/gfx/skia/skia/src/animator/SkDrawFull.h
+++ b/gfx/skia/skia/src/animator/SkDrawFull.h
@@ -14,7 +14,7 @@
 
 class SkFull : public SkBoundable {
     DECLARE_EMPTY_MEMBER_INFO(Full);
-    virtual bool draw(SkAnimateMaker& );
+    bool draw(SkAnimateMaker& ) override;
 private:
     typedef SkBoundable INHERITED;
 };
diff --git a/gfx/skia/skia/src/animator/SkDrawGradient.cpp b/gfx/skia/skia/src/animator/SkDrawGradient.cpp
index 70e5e4493e0e..4aecbc3936d8 100644
--- a/gfx/skia/skia/src/animator/SkDrawGradient.cpp
+++ b/gfx/skia/skia/src/animator/SkDrawGradient.cpp
@@ -127,7 +127,7 @@ void SkDrawLinearGradient::dump(SkAnimateMaker* maker) {
 
 SkShader* SkDrawLinearGradient::getShader() {
     if (addPrelude() == 0 || points.count() != 4)
-        return NULL;
+        return nullptr;
     SkShader* shader = SkGradientShader::CreateLinear((SkPoint*)points.begin(),
         fColors.begin(), offsets.begin(), fColors.count(), (SkShader::TileMode) tileMode,
         0, getMatrix());
@@ -162,7 +162,7 @@ void SkDrawRadialGradient::dump(SkAnimateMaker* maker) {
 
 SkShader* SkDrawRadialGradient::getShader() {
     if (addPrelude() == 0)
-        return NULL;
+        return nullptr;
     SkShader* shader = SkGradientShader::CreateRadial(center,
         radius, fColors.begin(), offsets.begin(), fColors.count(), (SkShader::TileMode) tileMode,
         0, getMatrix());
diff --git a/gfx/skia/skia/src/animator/SkDrawGradient.h b/gfx/skia/skia/src/animator/SkDrawGradient.h
index fa46a9e62988..87df37624c83 100644
--- a/gfx/skia/skia/src/animator/SkDrawGradient.h
+++ b/gfx/skia/skia/src/animator/SkDrawGradient.h
@@ -18,11 +18,11 @@ class SkDrawGradient : public SkDrawShader {
     DECLARE_PRIVATE_MEMBER_INFO(DrawGradient);
     SkDrawGradient();
     virtual ~SkDrawGradient();
-    virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
+    bool addChild(SkAnimateMaker& , SkDisplayable* child) override;
 #ifdef SK_DUMP_ENABLED
     virtual void dumpRest(SkAnimateMaker*);
 #endif
-    virtual void onEndElement(SkAnimateMaker& );
+    void onEndElement(SkAnimateMaker& ) override;
 protected:
     SkTDScalarArray offsets;
     SkString unitMapper;
@@ -36,11 +36,11 @@ private:
 class SkDrawLinearGradient : public SkDrawGradient {
     DECLARE_MEMBER_INFO(DrawLinearGradient);
     SkDrawLinearGradient();
-    virtual void onEndElement(SkAnimateMaker& );
+    void onEndElement(SkAnimateMaker& ) override;
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker*);
+    void dump(SkAnimateMaker*) override;
 #endif
-    virtual SkShader* getShader();
+    SkShader* getShader() override;
 protected:
     SkTDScalarArray points;
 private:
@@ -51,9 +51,9 @@ class SkDrawRadialGradient : public SkDrawGradient {
     DECLARE_MEMBER_INFO(DrawRadialGradient);
     SkDrawRadialGradient();
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker*);
+    void dump(SkAnimateMaker*) override;
 #endif
-    virtual SkShader* getShader();
+    SkShader* getShader() override;
 protected:
     SkPoint center;
     SkScalar radius;
diff --git a/gfx/skia/skia/src/animator/SkDrawGroup.cpp b/gfx/skia/skia/src/animator/SkDrawGroup.cpp
index f4bc3c630893..76807bf5913a 100644
--- a/gfx/skia/skia/src/animator/SkDrawGroup.cpp
+++ b/gfx/skia/skia/src/animator/SkDrawGroup.cpp
@@ -28,7 +28,7 @@ const SkMemberInfo SkGroup::fInfo[] = {
 
 DEFINE_GET_MEMBER(SkGroup);
 
-SkGroup::SkGroup() : fParentList(NULL), fOriginal(NULL) {
+SkGroup::SkGroup() : fParentList(nullptr), fOriginal(nullptr) {
 }
 
 SkGroup::~SkGroup() {
@@ -36,7 +36,7 @@ SkGroup::~SkGroup() {
         return;
     int index = 0;
     int max = fCopies.count() << 5;
-    for (SkDrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
+    for (SkADrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
         if (index >= max || markedForDelete(index))
             delete *ptr;
 //      else {
@@ -52,18 +52,18 @@ SkGroup::~SkGroup() {
 bool SkGroup::addChild(SkAnimateMaker& , SkDisplayable* child) {
     SkASSERT(child);
 //  SkASSERT(child->isDrawable());
-    *fChildren.append() = (SkDrawable*) child;
+    *fChildren.append() = (SkADrawable*) child;
     if (child->isGroup()) {
         SkGroup* groupie = (SkGroup*) child;
-        SkASSERT(groupie->fParentList == NULL);
+        SkASSERT(groupie->fParentList == nullptr);
         groupie->fParentList = &fChildren;
     }
     return true;
 }
 
 bool SkGroup::contains(SkDisplayable* match) {
-    for (SkDrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
-        SkDrawable* drawable = *ptr;
+    for (SkADrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
+        SkADrawable* drawable = *ptr;
         if (drawable == match || drawable->contains(match))
             return true;
     }
@@ -83,7 +83,7 @@ SkBool SkGroup::copySet(int index) {
 
 SkDisplayable* SkGroup::deepCopy(SkAnimateMaker* maker) {
     SkDisplayable* copy = INHERITED::deepCopy(maker);
-    for (SkDrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
+    for (SkADrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
         SkDisplayable* displayable = (SkDisplayable*)*ptr;
         SkDisplayable* deeperCopy = displayable->deepCopy(maker);
         ((SkGroup*)copy)->addChild(*maker, deeperCopy);
@@ -93,8 +93,8 @@ SkDisplayable* SkGroup::deepCopy(SkAnimateMaker* maker) {
 
 bool SkGroup::doEvent(SkDisplayEvent::Kind kind, SkEventState* state) {
     bool handled = false;
-    for (SkDrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
-        SkDrawable* drawable = *ptr;
+    for (SkADrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
+        SkADrawable* drawable = *ptr;
         if (drawable->isDrawable() == false)
             continue;
         handled |= drawable->doEvent(kind, state);
@@ -105,8 +105,8 @@ bool SkGroup::doEvent(SkDisplayEvent::Kind kind, SkEventState* state) {
 bool SkGroup::draw(SkAnimateMaker& maker) {
     bool conditionTrue = ifCondition(maker, this, condition);
     bool result = false;
-    for (SkDrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
-        SkDrawable* drawable = *ptr;
+    for (SkADrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
+        SkADrawable* drawable = *ptr;
         if (drawable->isDrawable() == false)
             continue;
         if (conditionTrue == false) {
@@ -136,12 +136,12 @@ void SkGroup::dumpDrawables(SkAnimateMaker* maker) {
     int save = SkDisplayList::fDumpIndex;
     SkDisplayList::fDumpIndex = 0;
     bool closedYet = false;
-    for (SkDrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
+    for (SkADrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
         if (closedYet == false) {
             closedYet = true;
             SkDebugf(">\n");
         }
-        SkDrawable* drawable = *ptr;
+        SkADrawable* drawable = *ptr;
         drawable->dump(maker);
         SkDisplayList::fDumpIndex++;
     }
@@ -154,8 +154,8 @@ void SkGroup::dumpDrawables(SkAnimateMaker* maker) {
 }
 
 void SkGroup::dumpEvents() {
-    for (SkDrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
-        SkDrawable* drawable = *ptr;
+    for (SkADrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
+        SkADrawable* drawable = *ptr;
         drawable->dumpEvents();
     }
 }
@@ -163,8 +163,8 @@ void SkGroup::dumpEvents() {
 
 bool SkGroup::enable(SkAnimateMaker& maker ) {
     reset();
-    for (SkDrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
-        SkDrawable* drawable = *ptr;
+    for (SkADrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
+        SkADrawable* drawable = *ptr;
         if (ifCondition(maker, drawable, enableCondition) == false)
             continue;
         drawable->enable(maker);
@@ -172,11 +172,11 @@ bool SkGroup::enable(SkAnimateMaker& maker ) {
     return true;    // skip add; already added so that scope is findable by children
 }
 
-int SkGroup::findGroup(SkDrawable* match,  SkTDDrawableArray** list,
+int SkGroup::findGroup(SkADrawable* match,  SkTDDrawableArray** list,
                  SkGroup** parent, SkGroup** found, SkTDDrawableArray** grandList) {
     *list = &fChildren;
-    for (SkDrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
-        SkDrawable* drawable = *ptr;
+    for (SkADrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
+        SkADrawable* drawable = *ptr;
         if (drawable->isGroup()) {
             SkGroup* childGroup = (SkGroup*) drawable;
             if (childGroup->fOriginal == match)
@@ -196,7 +196,7 @@ bool SkGroup::hasEnable() const {
     return true;
 }
 
-bool SkGroup::ifCondition(SkAnimateMaker& maker, SkDrawable*,
+bool SkGroup::ifCondition(SkAnimateMaker& maker, SkADrawable*,
         SkString& conditionString) {
     if (conditionString.size() == 0)
         return true;
@@ -217,8 +217,8 @@ bool SkGroup::ifCondition(SkAnimateMaker& maker, SkDrawable*,
 }
 
 void SkGroup::initialize() {
-    for (SkDrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
-        SkDrawable* drawable = *ptr;
+    for (SkADrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
+        SkADrawable* drawable = *ptr;
         if (drawable->isDrawable() == false)
             continue;
         drawable->initialize();
@@ -253,7 +253,7 @@ void SkGroup::reset() {
         return;
     int index = 0;
     int max = fCopies.count() << 5;
-    for (SkDrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
+    for (SkADrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
         if (index >= max || copySet(index) == false)
             continue;
         SkApply* apply = (SkApply*) *ptr;
@@ -268,12 +268,12 @@ void SkGroup::reset() {
 bool SkGroup::resolveIDs(SkAnimateMaker& maker, SkDisplayable* orig, SkApply* apply) {
     SkGroup* original = (SkGroup*) orig;
     SkTDDrawableArray& originalChildren = original->fChildren;
-    SkDrawable** originalPtr = originalChildren.begin();
-    SkDrawable** ptr = fChildren.begin();
-    SkDrawable** end = fChildren.end();
-    SkDrawable** origChild = ((SkGroup*) orig)->fChildren.begin();
+    SkADrawable** originalPtr = originalChildren.begin();
+    SkADrawable** ptr = fChildren.begin();
+    SkADrawable** end = fChildren.end();
+    SkADrawable** origChild = ((SkGroup*) orig)->fChildren.begin();
     while (ptr < end) {
-        SkDrawable* drawable = *ptr++;
+        SkADrawable* drawable = *ptr++;
         maker.resolveID(drawable, *origChild++);
         if (drawable->resolveIDs(maker, *originalPtr++, apply) == true)
             return true; // failed
@@ -282,8 +282,8 @@ bool SkGroup::resolveIDs(SkAnimateMaker& maker, SkDisplayable* orig, SkApply* ap
 }
 
 void SkGroup::setSteps(int steps) {
-    for (SkDrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
-        SkDrawable* drawable = *ptr;
+    for (SkADrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
+        SkADrawable* drawable = *ptr;
         if (drawable->isDrawable() == false)
             continue;
         drawable->setSteps(steps);
@@ -292,8 +292,8 @@ void SkGroup::setSteps(int steps) {
 
 #ifdef SK_DEBUG
 void SkGroup::validate() {
-    for (SkDrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
-        SkDrawable* drawable = *ptr;
+    for (SkADrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
+        SkADrawable* drawable = *ptr;
         drawable->validate();
     }
 }
diff --git a/gfx/skia/skia/src/animator/SkDrawGroup.h b/gfx/skia/skia/src/animator/SkDrawGroup.h
index 336040c115a9..f1b7bb6e28c4 100644
--- a/gfx/skia/skia/src/animator/SkDrawGroup.h
+++ b/gfx/skia/skia/src/animator/SkDrawGroup.h
@@ -10,47 +10,47 @@
 #ifndef SkDrawGroup_DEFINED
 #define SkDrawGroup_DEFINED
 
-#include "SkDrawable.h"
+#include "SkADrawable.h"
 #include "SkIntArray.h"
 #include "SkMemberInfo.h"
 
-class SkGroup : public SkDrawable { //interface for schema element <g>
+class SkGroup : public SkADrawable { //interface for schema element <g>
 public:
     DECLARE_MEMBER_INFO(Group);
     SkGroup();
     virtual ~SkGroup();
-    virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
-    virtual bool contains(SkDisplayable* );
+    bool addChild(SkAnimateMaker& , SkDisplayable* child) override;
+    bool contains(SkDisplayable* ) override;
     SkGroup* copy();
     SkBool copySet(int index);
-    virtual SkDisplayable* deepCopy(SkAnimateMaker* );
-    virtual bool doEvent(SkDisplayEvent::Kind , SkEventState* state );
-    virtual bool draw(SkAnimateMaker& );
+    SkDisplayable* deepCopy(SkAnimateMaker* ) override;
+    bool doEvent(SkDisplayEvent::Kind , SkEventState* state ) override;
+    bool draw(SkAnimateMaker& ) override;
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
+    void dump(SkAnimateMaker* ) override;
     virtual void dumpDrawables(SkAnimateMaker* );
-    virtual void dumpEvents();
+    void dumpEvents() override;
 #endif
-    int findGroup(SkDrawable* drawable,  SkTDDrawableArray** list,
+    int findGroup(SkADrawable* drawable,  SkTDDrawableArray** list,
         SkGroup** parent, SkGroup** found, SkTDDrawableArray** grandList);
-    virtual bool enable(SkAnimateMaker& );
+    bool enable(SkAnimateMaker& ) override;
     SkTDDrawableArray* getChildren() { return &fChildren; }
     SkGroup* getOriginal() { return fOriginal; }
-    virtual bool hasEnable() const;
-    virtual void initialize();
-    SkBool isACopy() { return fOriginal != NULL; }
+    bool hasEnable() const override;
+    void initialize() override;
+    SkBool isACopy() { return fOriginal != nullptr; }
     void markCopyClear(int index);
     void markCopySet(int index);
     void markCopySize(int index);
     bool markedForDelete(int index) const { return (fCopies[index >> 5] & 1 << (index & 0x1f)) == 0; }
     void reset();
-    bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* );
-    virtual void setSteps(int steps);
+    bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* ) override;
+    void setSteps(int steps) override;
 #ifdef SK_DEBUG
-    virtual void validate();
+    void validate() override;
 #endif
 protected:
-    bool ifCondition(SkAnimateMaker& maker, SkDrawable* drawable,
+    bool ifCondition(SkAnimateMaker& maker, SkADrawable* drawable,
         SkString& conditionString);
     SkString condition;
     SkString enableCondition;
@@ -59,12 +59,12 @@ protected:
     SkTDIntArray fCopies;
     SkGroup* fOriginal;
 private:
-    typedef SkDrawable INHERITED;
+    typedef SkADrawable INHERITED;
 };
 
 class SkSave: public SkGroup {
     DECLARE_MEMBER_INFO(Save);
-    virtual bool draw(SkAnimateMaker& );
+    bool draw(SkAnimateMaker& ) override;
 private:
     typedef SkGroup INHERITED;
 };
diff --git a/gfx/skia/skia/src/animator/SkDrawLine.h b/gfx/skia/skia/src/animator/SkDrawLine.h
index b287802e2518..996964a89a4f 100644
--- a/gfx/skia/skia/src/animator/SkDrawLine.h
+++ b/gfx/skia/skia/src/animator/SkDrawLine.h
@@ -16,7 +16,7 @@
 class SkLine : public SkBoundable {
     DECLARE_MEMBER_INFO(Line);
     SkLine();
-    virtual bool draw(SkAnimateMaker& );
+    bool draw(SkAnimateMaker& ) override;
 private:
     SkScalar x1;
     SkScalar x2;
diff --git a/gfx/skia/skia/src/animator/SkDrawMatrix.cpp b/gfx/skia/skia/src/animator/SkDrawMatrix.cpp
index 80b04c1bcd50..890a3296a3b4 100644
--- a/gfx/skia/skia/src/animator/SkDrawMatrix.cpp
+++ b/gfx/skia/skia/src/animator/SkDrawMatrix.cpp
@@ -119,10 +119,10 @@ void SkDrawMatrix::dump(SkAnimateMaker* maker) {
     result = fMatrix.getTranslateY();
     if (result)
         SkDebugf("ty=\"%g\" ", SkScalarToFloat(result));
-    result = SkPerspToScalar(fMatrix.getPerspX());
+    result = fMatrix.getPerspX();
     if (result)
         SkDebugf("perspect-x=\"%g\" ", SkScalarToFloat(result));
-    result = SkPerspToScalar(fMatrix.getPerspY());
+    result = fMatrix.getPerspY();
     if (result)
         SkDebugf("perspect-y=\"%g\" ", SkScalarToFloat(result));
     SkDebugf("/>\n");
@@ -190,9 +190,9 @@ void SkDrawMatrix::onEndElement(SkAnimateMaker& ) {
         fMatrix.setSkewY(vals[3]);
         fMatrix.setScaleY(vals[4]);
         fMatrix.setTranslateY(vals[5]);
-        fMatrix.setPerspX(SkScalarToPersp(vals[6]));
-        fMatrix.setPerspY(SkScalarToPersp(vals[7]));
-//      fMatrix.setPerspW(SkScalarToPersp(vals[8]));
+        fMatrix.setPerspX(vals[6]);
+        fMatrix.setPerspY(vals[7]);
+//      fMatrix.setPerspW(vals[8]);
         goto setConcat;
     }
     if (fChildHasID == false) {
@@ -224,10 +224,10 @@ bool SkDrawMatrix::setProperty(int index, SkScriptValue& scriptValue) {
             fMatrix.setTranslateY((*scriptValue.fOperand.fArray)[1].fScalar);
             return true;
         case SK_PROPERTY(perspectX):
-            fMatrix.setPerspX(SkScalarToPersp((number)));
+            fMatrix.setPerspX(number);
             break;
         case SK_PROPERTY(perspectY):
-            fMatrix.setPerspY(SkScalarToPersp((number)));
+            fMatrix.setPerspY(number);
             break;
         case SK_PROPERTY(rotate): {
             SkMatrix temp;
diff --git a/gfx/skia/skia/src/animator/SkDrawMatrix.h b/gfx/skia/skia/src/animator/SkDrawMatrix.h
index e3c389a2cf91..df17a9b75714 100644
--- a/gfx/skia/skia/src/animator/SkDrawMatrix.h
+++ b/gfx/skia/skia/src/animator/SkDrawMatrix.h
@@ -10,36 +10,36 @@
 #ifndef SkDrawMatrix_DEFINED
 #define SkDrawMatrix_DEFINED
 
-#include "SkDrawable.h"
+#include "SkADrawable.h"
 #include "SkMatrix.h"
 #include "SkMemberInfo.h"
 #include "SkIntArray.h"
 
 class SkMatrixPart;
 
-class SkDrawMatrix : public SkDrawable {
+class SkDrawMatrix : public SkADrawable {
     DECLARE_DRAW_MEMBER_INFO(Matrix);
     SkDrawMatrix();
     virtual ~SkDrawMatrix();
-    virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
-    virtual bool childrenNeedDisposing() const;
-    virtual void dirty();
-    virtual bool draw(SkAnimateMaker& );
+    bool addChild(SkAnimateMaker& , SkDisplayable* child) override;
+    bool childrenNeedDisposing() const override;
+    void dirty() override;
+    bool draw(SkAnimateMaker& ) override;
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
+    void dump(SkAnimateMaker* ) override;
 #endif
     SkMatrix& getMatrix();
-    virtual bool getProperty(int index, SkScriptValue* value) const;
-    virtual void initialize();
-    virtual void onEndElement(SkAnimateMaker& );
-    virtual void setChildHasID();
-    virtual bool setProperty(int index, SkScriptValue& );
+    bool getProperty(int index, SkScriptValue* value) const override;
+    void initialize() override;
+    void onEndElement(SkAnimateMaker& ) override;
+    void setChildHasID() override;
+    bool setProperty(int index, SkScriptValue& ) override;
 
     void concat(SkMatrix& inMatrix) {
         fConcat.preConcat(inMatrix);
     }
 
-    virtual SkDisplayable* deepCopy(SkAnimateMaker* );
+    SkDisplayable* deepCopy(SkAnimateMaker* ) override;
 
 
     void rotate(SkScalar degrees, SkPoint& center) {
@@ -68,7 +68,7 @@ private:
     SkTDMatrixPartArray fParts;
     SkBool8 fChildHasID;
     SkBool8 fDirty;
-    typedef SkDrawable INHERITED;
+    typedef SkADrawable INHERITED;
 };
 
 #endif // SkDrawMatrix_DEFINED
diff --git a/gfx/skia/skia/src/animator/SkDrawOval.h b/gfx/skia/skia/src/animator/SkDrawOval.h
index 3c09e0fa068f..e4d47122230c 100644
--- a/gfx/skia/skia/src/animator/SkDrawOval.h
+++ b/gfx/skia/skia/src/animator/SkDrawOval.h
@@ -14,7 +14,7 @@
 
 class SkOval : public SkDrawRect {
     DECLARE_MEMBER_INFO(Oval);
-    virtual bool draw(SkAnimateMaker& );
+    bool draw(SkAnimateMaker& ) override;
 private:
     typedef SkDrawRect INHERITED;
 };
diff --git a/gfx/skia/skia/src/animator/SkDrawPaint.cpp b/gfx/skia/skia/src/animator/SkDrawPaint.cpp
index c882427585f9..d1af4f42ffc9 100644
--- a/gfx/skia/skia/src/animator/SkDrawPaint.cpp
+++ b/gfx/skia/skia/src/animator/SkDrawPaint.cpp
@@ -64,7 +64,7 @@ const SkMemberInfo SkDrawPaint::fInfo[] = {
 
 DEFINE_GET_MEMBER(SkDrawPaint);
 
-SkDrawPaint::SkDrawPaint() : antiAlias(-1), color(NULL), fakeBold(-1), filterBitmap(-1),
+SkDrawPaint::SkDrawPaint() : antiAlias(-1), color(nullptr), fakeBold(-1), filterBitmap(-1),
     linearText(-1), maskFilter((SkDrawMaskFilter*) -1), pathEffect((SkDrawPathEffect*) -1),
     shader((SkDrawShader*) -1), strikeThru(-1), stroke(-1),
     strokeCap((SkPaint::Cap) -1), strokeJoin((SkPaint::Join) -1), strokeMiter(SK_ScalarNaN),
@@ -98,7 +98,7 @@ bool SkDrawPaint::add(SkAnimateMaker* maker, SkDisplayable* child) {
 
 SkDisplayable* SkDrawPaint::deepCopy(SkAnimateMaker* maker) {
     SkDrawColor* tempColor = color;
-    color = NULL;
+    color = nullptr;
     SkDrawPaint* copy = (SkDrawPaint*) INHERITED::deepCopy(maker);
     color = tempColor;
     tempColor = (SkDrawColor*) color->deepCopy(maker);
@@ -148,7 +148,7 @@ void SkDrawPaint::dump(SkAnimateMaker* maker) {
 void SkDrawPaint::executeFunction(SkDisplayable* target, int index,
         SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type,
         SkScriptValue* scriptValue) {
-        if (scriptValue == NULL)
+        if (scriptValue == nullptr)
             return;
     SkASSERT(target == this);
     switch (index) {
@@ -213,12 +213,12 @@ bool SkDrawPaint::resolveIDs(SkAnimateMaker& maker, SkDisplayable* origDisp, SkA
 void SkDrawPaint::setupPaint(SkPaint* paint) const {
     if (antiAlias != -1)
         paint->setAntiAlias(SkToBool(antiAlias));
-    if (color != NULL)
+    if (color != nullptr)
         paint->setColor(color->getColor());
     if (fakeBold != -1)
         paint->setFakeBoldText(SkToBool(fakeBold));
     if (filterBitmap != -1)
-        paint->setFilterLevel(filterBitmap ? SkPaint::kLow_FilterLevel : SkPaint::kNone_FilterLevel);
+        paint->setFilterQuality(filterBitmap ? kLow_SkFilterQuality : kNone_SkFilterQuality);
     //  stroke is legacy; style setting if present overrides stroke
     if (stroke != -1)
         paint->setStyle(SkToBool(stroke) ? SkPaint::kStroke_Style : SkPaint::kFill_Style);
@@ -226,16 +226,16 @@ void SkDrawPaint::setupPaint(SkPaint* paint) const {
         paint->setStyle((SkPaint::Style) style);
     if (linearText != -1)
         paint->setLinearText(SkToBool(linearText));
-    if (maskFilter == NULL)
-        paint->setMaskFilter(NULL);
+    if (maskFilter == nullptr)
+        paint->setMaskFilter(nullptr);
     else if (maskFilter != (SkDrawMaskFilter*) -1)
         SkSafeUnref(paint->setMaskFilter(maskFilter->getMaskFilter()));
-    if (pathEffect == NULL)
-        paint->setPathEffect(NULL);
+    if (pathEffect == nullptr)
+        paint->setPathEffect(nullptr);
     else if (pathEffect != (SkDrawPathEffect*) -1)
         SkSafeUnref(paint->setPathEffect(pathEffect->getPathEffect()));
-    if (shader == NULL)
-        paint->setShader(NULL);
+    if (shader == nullptr)
+        paint->setShader(nullptr);
     else if (shader != (SkDrawShader*) -1)
         SkSafeUnref(paint->setShader(shader->getShader()));
     if (strikeThru != -1)
@@ -256,8 +256,8 @@ void SkDrawPaint::setupPaint(SkPaint* paint) const {
         paint->setTextSize(textSize);
     if (SkScalarIsNaN(textSkewX) == false)
         paint->setTextSkewX(textSkewX);
-    if (typeface == NULL)
-        paint->setTypeface(NULL);
+    if (typeface == nullptr)
+        paint->setTypeface(nullptr);
     else if (typeface != (SkDrawTypeface*) -1)
         SkSafeUnref(paint->setTypeface(typeface->getTypeface()));
     if (underline != -1)
diff --git a/gfx/skia/skia/src/animator/SkDrawPaint.h b/gfx/skia/skia/src/animator/SkDrawPaint.h
index 3caf6b6e49c6..bef52527b1d0 100644
--- a/gfx/skia/skia/src/animator/SkDrawPaint.h
+++ b/gfx/skia/skia/src/animator/SkDrawPaint.h
@@ -10,7 +10,7 @@
 #ifndef SkDrawPaint_DEFINED
 #define SkDrawPaint_DEFINED
 
-#include "SkDrawable.h"
+#include "SkADrawable.h"
 #include "SkIntArray.h"
 #include "SkMemberInfo.h"
 #include "SkPaint.h"
@@ -22,22 +22,22 @@ class SkDrawShader;
 class SkTransferMode;
 class SkDrawTypeface;
 
-class SkDrawPaint : public SkDrawable {
+class SkDrawPaint : public SkADrawable {
     DECLARE_DRAW_MEMBER_INFO(Paint);
     SkDrawPaint();
     virtual ~SkDrawPaint();
     virtual bool add(SkAnimateMaker* , SkDisplayable* child);
-    virtual SkDisplayable* deepCopy(SkAnimateMaker* );
-    virtual bool draw(SkAnimateMaker& );
+    SkDisplayable* deepCopy(SkAnimateMaker* ) override;
+    bool draw(SkAnimateMaker& ) override;
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
+    void dump(SkAnimateMaker* ) override;
 #endif
-    virtual void executeFunction(SkDisplayable* target, int index,
+    void executeFunction(SkDisplayable* target, int index,
         SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type,
-        SkScriptValue* );
-    virtual const SkFunctionParamType* getFunctionsParameters();
-    virtual bool getProperty(int index, SkScriptValue* value) const;
-    virtual bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* apply);
+        SkScriptValue* ) override;
+    const SkFunctionParamType* getFunctionsParameters() override;
+    bool getProperty(int index, SkScriptValue* value) const override;
+    bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* apply) override;
 protected:
     static const SkFunctionParamType fFunctionParameters[];
     void setupPaint(SkPaint* paint) const;
@@ -71,7 +71,7 @@ public:
     SkBool8 fOwnsTransferMode;
     SkBool8 fOwnsTypeface;
 private:
-    typedef SkDrawable INHERITED;
+    typedef SkADrawable INHERITED;
     friend class SkTextToPath;
     friend class SkSaveLayer;
 };
diff --git a/gfx/skia/skia/src/animator/SkDrawPath.cpp b/gfx/skia/skia/src/animator/SkDrawPath.cpp
index f62f7c04dd86..c4c6f5caf59b 100644
--- a/gfx/skia/skia/src/animator/SkDrawPath.cpp
+++ b/gfx/skia/skia/src/animator/SkDrawPath.cpp
@@ -34,7 +34,7 @@ DEFINE_GET_MEMBER(SkDrawPath);
 
 SkDrawPath::SkDrawPath()
 {
-    fParent = NULL;
+    fParent = nullptr;
     fLength = SK_ScalarNaN;
     fChildHasID = false;
     fDirty = false;
diff --git a/gfx/skia/skia/src/animator/SkDrawPath.h b/gfx/skia/skia/src/animator/SkDrawPath.h
index 9c4d3059d061..81978fb7d001 100644
--- a/gfx/skia/skia/src/animator/SkDrawPath.h
+++ b/gfx/skia/skia/src/animator/SkDrawPath.h
@@ -19,22 +19,22 @@ class SkDrawPath : public SkBoundable {
     DECLARE_DRAW_MEMBER_INFO(Path);
     SkDrawPath();
     virtual ~SkDrawPath();
-    virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
+    bool addChild(SkAnimateMaker& , SkDisplayable* child) override;
     bool childHasID() { return SkToBool(fChildHasID); }
-    virtual bool childrenNeedDisposing() const;
-    virtual void dirty();
-    virtual bool draw(SkAnimateMaker& );
-    virtual SkDisplayable* getParent() const;
+    bool childrenNeedDisposing() const override;
+    void dirty() override;
+    bool draw(SkAnimateMaker& ) override;
+    SkDisplayable* getParent() const override;
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
+    void dump(SkAnimateMaker* ) override;
 #endif
     SkPath& getPath();
-    virtual bool getProperty(int index, SkScriptValue* value) const;
-    virtual bool setProperty(int index, SkScriptValue& value);
-    virtual void onEndElement(SkAnimateMaker& );
-    virtual void setChildHasID();
-    virtual bool setParent(SkDisplayable* parent);
-    virtual bool isPath() const { return true; }
+    bool getProperty(int index, SkScriptValue* value) const override;
+    bool setProperty(int index, SkScriptValue& value) override;
+    void onEndElement(SkAnimateMaker& ) override;
+    void setChildHasID() override;
+    bool setParent(SkDisplayable* parent) override;
+    bool isPath() const override { return true; }
 public:
     SkPath fPath;
 protected:
@@ -51,8 +51,8 @@ private:
 
 class SkPolyline : public SkDrawPath {
     DECLARE_MEMBER_INFO(Polyline);
-    virtual bool addChild(SkAnimateMaker& , SkDisplayable*) SK_OVERRIDE;
-    virtual void onEndElement(SkAnimateMaker& );
+    bool addChild(SkAnimateMaker& , SkDisplayable*) override;
+    void onEndElement(SkAnimateMaker& ) override;
 protected:
     SkTDScalarArray points;
 private:
@@ -61,7 +61,7 @@ private:
 
 class SkPolygon : public SkPolyline {
     DECLARE_MEMBER_INFO(Polygon);
-    virtual void onEndElement(SkAnimateMaker& );
+    void onEndElement(SkAnimateMaker& ) override;
 private:
     typedef SkPolyline INHERITED;
 };
diff --git a/gfx/skia/skia/src/animator/SkDrawPoint.h b/gfx/skia/skia/src/animator/SkDrawPoint.h
index 0ecf4471b676..03c8521bdf80 100644
--- a/gfx/skia/skia/src/animator/SkDrawPoint.h
+++ b/gfx/skia/skia/src/animator/SkDrawPoint.h
@@ -24,7 +24,7 @@ private:
 class SkDrawPoint : public SkDisplayable {
     DECLARE_MEMBER_INFO(DrawPoint);
     SkDrawPoint();
-    virtual void getBounds(SkRect*  );
+    void getBounds(SkRect* ) override;
 private:
     SkPoint fPoint;
     typedef SkDisplayable INHERITED;
diff --git a/gfx/skia/skia/src/animator/SkDrawRectangle.cpp b/gfx/skia/skia/src/animator/SkDrawRectangle.cpp
index c3fb7ff7053d..a89b67cfdf44 100644
--- a/gfx/skia/skia/src/animator/SkDrawRectangle.cpp
+++ b/gfx/skia/skia/src/animator/SkDrawRectangle.cpp
@@ -36,7 +36,7 @@ const SkMemberInfo SkDrawRect::fInfo[] = {
 
 DEFINE_GET_MEMBER(SkDrawRect);
 
-SkDrawRect::SkDrawRect() : fParent(NULL) {
+SkDrawRect::SkDrawRect() : fParent(nullptr) {
     fRect.setEmpty();
 }
 
diff --git a/gfx/skia/skia/src/animator/SkDrawRectangle.h b/gfx/skia/skia/src/animator/SkDrawRectangle.h
index 42af02b1e719..036d52ed6286 100644
--- a/gfx/skia/skia/src/animator/SkDrawRectangle.h
+++ b/gfx/skia/skia/src/animator/SkDrawRectangle.h
@@ -19,15 +19,15 @@ class SkRectToRect;
 class SkDrawRect : public SkBoundable {
     DECLARE_DRAW_MEMBER_INFO(Rect);
     SkDrawRect();
-    virtual void dirty();
-    virtual bool draw(SkAnimateMaker& );
+    void dirty() override;
+    bool draw(SkAnimateMaker& ) override;
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
+    void dump(SkAnimateMaker* ) override;
 #endif
-    virtual SkDisplayable* getParent() const;
-    virtual bool getProperty(int index, SkScriptValue* value) const;
-    virtual bool setParent(SkDisplayable* parent);
-    virtual bool setProperty(int index, SkScriptValue& );
+    SkDisplayable* getParent() const override;
+    bool getProperty(int index, SkScriptValue* value) const override;
+    bool setParent(SkDisplayable* parent) override;
+    bool setProperty(int index, SkScriptValue& ) override;
 protected:
     SkRect fRect;
     SkDisplayable* fParent;
@@ -41,9 +41,9 @@ private:
 class SkRoundRect : public SkDrawRect {
     DECLARE_MEMBER_INFO(RoundRect);
     SkRoundRect();
-    virtual bool draw(SkAnimateMaker& );
+    bool draw(SkAnimateMaker& ) override;
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
+    void dump(SkAnimateMaker* ) override;
 #endif
 protected:
     SkScalar rx;
diff --git a/gfx/skia/skia/src/animator/SkDrawSaveLayer.cpp b/gfx/skia/skia/src/animator/SkDrawSaveLayer.cpp
index 9623c905c9b3..c9a4d9feadf0 100644
--- a/gfx/skia/skia/src/animator/SkDrawSaveLayer.cpp
+++ b/gfx/skia/skia/src/animator/SkDrawSaveLayer.cpp
@@ -24,7 +24,7 @@ const SkMemberInfo SkSaveLayer::fInfo[] = {
 
 DEFINE_GET_MEMBER(SkSaveLayer);
 
-SkSaveLayer::SkSaveLayer() : paint(NULL), bounds(NULL) {
+SkSaveLayer::SkSaveLayer() : paint(nullptr), bounds(nullptr) {
 }
 
 SkSaveLayer::~SkSaveLayer(){
diff --git a/gfx/skia/skia/src/animator/SkDrawSaveLayer.h b/gfx/skia/skia/src/animator/SkDrawSaveLayer.h
index 5c3e068e9da4..cb9c9a908e7d 100644
--- a/gfx/skia/skia/src/animator/SkDrawSaveLayer.h
+++ b/gfx/skia/skia/src/animator/SkDrawSaveLayer.h
@@ -20,11 +20,11 @@ class SkSaveLayer : public SkGroup {
     DECLARE_MEMBER_INFO(SaveLayer);
     SkSaveLayer();
     virtual ~SkSaveLayer();
-    virtual bool draw(SkAnimateMaker& );
+    bool draw(SkAnimateMaker& ) override;
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
+    void dump(SkAnimateMaker* ) override;
 #endif
-    virtual void onEndElement(SkAnimateMaker& );
+    void onEndElement(SkAnimateMaker& ) override;
 protected:
     SkDrawPaint* paint;
     SkDrawRect* bounds;
diff --git a/gfx/skia/skia/src/animator/SkDrawShader.cpp b/gfx/skia/skia/src/animator/SkDrawShader.cpp
index f9f379bf73b5..9e3becc48b94 100644
--- a/gfx/skia/skia/src/animator/SkDrawShader.cpp
+++ b/gfx/skia/skia/src/animator/SkDrawShader.cpp
@@ -11,7 +11,6 @@
 #include "SkDrawBitmap.h"
 #include "SkDrawMatrix.h"
 #include "SkDrawPaint.h"
-#include "SkTemplates.h"
 
 #if SK_USE_CONDENSED_INFO == 0
 
@@ -24,7 +23,7 @@ const SkMemberInfo SkDrawShader::fInfo[] = {
 
 DEFINE_GET_MEMBER(SkDrawShader);
 
-SkDrawShader::SkDrawShader() : matrix(NULL),
+SkDrawShader::SkDrawShader() : matrix(nullptr),
     tileMode(SkShader::kClamp_TileMode) {
 }
 
@@ -37,7 +36,7 @@ bool SkDrawShader::add() {
 }
 
 SkMatrix* SkDrawShader::getMatrix() {
-    return matrix ? &matrix->getMatrix() : NULL;
+    return matrix ? &matrix->getMatrix() : nullptr;
 }
 
 #if SK_USE_CONDENSED_INFO == 0
@@ -52,7 +51,7 @@ const SkMemberInfo SkDrawBitmapShader::fInfo[] = {
 
 DEFINE_GET_MEMBER(SkDrawBitmapShader);
 
-SkDrawBitmapShader::SkDrawBitmapShader() : filterBitmap(-1), image(NULL) {}
+SkDrawBitmapShader::SkDrawBitmapShader() : filterBitmap(-1), image(nullptr) {}
 
 bool SkDrawBitmapShader::add() {
     if (fPaint->shader != (SkDrawShader*) -1)
@@ -63,8 +62,8 @@ bool SkDrawBitmapShader::add() {
 }
 
 SkShader* SkDrawBitmapShader::getShader() {
-    if (image == NULL)
-        return NULL;
+    if (image == nullptr)
+        return nullptr;
 
     // note: bitmap shader now supports independent tile modes for X and Y
     // we pass the same to both, but later we should extend this flexibility
@@ -72,11 +71,8 @@ SkShader* SkDrawBitmapShader::getShader() {
     //
     // oops, bitmapshader no longer takes filterBitmap, but deduces it at
     // draw-time from the paint
-    SkShader* shader  = SkShader::CreateBitmapShader(image->fBitmap,
-                                                    (SkShader::TileMode) tileMode,
-                                                    (SkShader::TileMode) tileMode,
-                                                    getMatrix());
-    SkAutoTDelete<SkShader> autoDel(shader);
-    (void)autoDel.detach();
-    return shader;
+    return SkShader::CreateBitmapShader(image->fBitmap,
+                                        (SkShader::TileMode) tileMode,
+                                        (SkShader::TileMode) tileMode,
+                                        getMatrix());
 }
diff --git a/gfx/skia/skia/src/animator/SkDrawShader.h b/gfx/skia/skia/src/animator/SkDrawShader.h
index 2c46e0778815..f7ef29d7d350 100644
--- a/gfx/skia/skia/src/animator/SkDrawShader.h
+++ b/gfx/skia/skia/src/animator/SkDrawShader.h
@@ -16,8 +16,8 @@ class SkBaseBitmap;
 class SkDrawBitmapShader : public SkDrawShader {
     DECLARE_DRAW_MEMBER_INFO(BitmapShader);
     SkDrawBitmapShader();
-    virtual bool add();
-    virtual SkShader* getShader();
+    bool add() override;
+    SkShader* getShader() override;
 protected:
     SkBool filterBitmap;
     SkBaseBitmap* image;
diff --git a/gfx/skia/skia/src/animator/SkDrawText.h b/gfx/skia/skia/src/animator/SkDrawText.h
index 3ac2479138df..e7632d0cefdb 100644
--- a/gfx/skia/skia/src/animator/SkDrawText.h
+++ b/gfx/skia/skia/src/animator/SkDrawText.h
@@ -17,11 +17,11 @@ class SkText : public SkBoundable {
     DECLARE_MEMBER_INFO(Text);
     SkText();
     virtual ~SkText();
-    virtual bool draw(SkAnimateMaker& );
+    bool draw(SkAnimateMaker& ) override;
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
+    void dump(SkAnimateMaker* ) override;
 #endif
-    virtual bool getProperty(int index, SkScriptValue* value) const ;
+    bool getProperty(int index, SkScriptValue* value) const override;
     const char* getText() { return text.c_str(); }
     size_t getSize() { return text.size(); }
 protected:
diff --git a/gfx/skia/skia/src/animator/SkDrawTextBox.h b/gfx/skia/skia/src/animator/SkDrawTextBox.h
index 6155befb299a..8f99c73d13b5 100644
--- a/gfx/skia/skia/src/animator/SkDrawTextBox.h
+++ b/gfx/skia/skia/src/animator/SkDrawTextBox.h
@@ -18,12 +18,12 @@ class SkDrawTextBox : public SkDrawRect {
     SkDrawTextBox();
 
     // overrides
-    virtual bool draw(SkAnimateMaker& );
+    bool draw(SkAnimateMaker& ) override;
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
+    void dump(SkAnimateMaker* ) override;
 #endif
-    virtual bool getProperty(int index, SkScriptValue* value) const;
-    virtual bool setProperty(int index, SkScriptValue& );
+    bool getProperty(int index, SkScriptValue* value) const override;
+    bool setProperty(int index, SkScriptValue& ) override;
 
 private:
     SkString fText;
diff --git a/gfx/skia/skia/src/animator/SkDrawTo.cpp b/gfx/skia/skia/src/animator/SkDrawTo.cpp
index ef084d12d009..7ae9ca58d479 100644
--- a/gfx/skia/skia/src/animator/SkDrawTo.cpp
+++ b/gfx/skia/skia/src/animator/SkDrawTo.cpp
@@ -23,7 +23,7 @@ const SkMemberInfo SkDrawTo::fInfo[] = {
 
 DEFINE_GET_MEMBER(SkDrawTo);
 
-SkDrawTo::SkDrawTo() : drawOnce(false), use(NULL), fDrawnOnce(false) {
+SkDrawTo::SkDrawTo() : drawOnce(false), use(nullptr), fDrawnOnce(false) {
 }
 
 #if 0
diff --git a/gfx/skia/skia/src/animator/SkDrawTo.h b/gfx/skia/skia/src/animator/SkDrawTo.h
index b6365afa4a1a..29f6b6303d22 100644
--- a/gfx/skia/skia/src/animator/SkDrawTo.h
+++ b/gfx/skia/skia/src/animator/SkDrawTo.h
@@ -19,9 +19,9 @@ class SkDrawTo : public SkGroup {
     DECLARE_MEMBER_INFO(DrawTo);
     SkDrawTo();
 //  virtual ~SkDrawTo();
-    virtual bool draw(SkAnimateMaker& );
+    bool draw(SkAnimateMaker& ) override;
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
+    void dump(SkAnimateMaker* ) override;
 #endif
 protected:
     SkBool drawOnce;
diff --git a/gfx/skia/skia/src/animator/SkDrawTransparentShader.cpp b/gfx/skia/skia/src/animator/SkDrawTransparentShader.cpp
deleted file mode 100644
index 2f286f4bea57..000000000000
--- a/gfx/skia/skia/src/animator/SkDrawTransparentShader.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#include "SkDrawTransparentShader.h"
-#include "SkTransparentShader.h"
-
-SkShader* SkDrawTransparentShader::getShader() {
-    return new SkTransparentShader();
-}
diff --git a/gfx/skia/skia/src/animator/SkDrawTransparentShader.h b/gfx/skia/skia/src/animator/SkDrawTransparentShader.h
deleted file mode 100644
index e0f61edf933c..000000000000
--- a/gfx/skia/skia/src/animator/SkDrawTransparentShader.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkDrawTransparentShader_DEFINED
-#define SkDrawTransparentShader_DEFINED
-
-#include "SkPaintPart.h"
-
-class SkDrawTransparentShader : public SkDrawShader {
-    DECLARE_EMPTY_MEMBER_INFO(TransparentShader);
-    virtual SkShader* getShader();
-};
-
-#endif // SkDrawTransparentShader_DEFINED
diff --git a/gfx/skia/skia/src/animator/SkDump.cpp b/gfx/skia/skia/src/animator/SkDump.cpp
index 9f297e9d5881..346b30daf7e1 100644
--- a/gfx/skia/skia/src/animator/SkDump.cpp
+++ b/gfx/skia/skia/src/animator/SkDump.cpp
@@ -56,7 +56,7 @@ bool SkDump::enable(SkAnimateMaker& maker ) {
 }
 
 bool SkDump::evaluate(SkAnimateMaker &maker) {
-    SkAnimatorScript scriptEngine(maker, NULL, SkType_Int);
+    SkAnimatorScript scriptEngine(maker, nullptr, SkType_Int);
     SkScriptValue value;
     const char* cScript = script.c_str();
     bool success = scriptEngine.evaluateScript(&cScript, &value);
@@ -91,7 +91,7 @@ void SkDump::GetEnumString(SkDisplayTypes type, int index, SkString* result) {
     const char* str  = map.fValues;
     while (--index >= 0) {
         str = strchr(str, '|');
-        if (str == NULL) {
+        if (str == nullptr) {
             result->reset();
             result->appendS32(badEnum);
             return;
@@ -99,7 +99,7 @@ void SkDump::GetEnumString(SkDisplayTypes type, int index, SkString* result) {
         str += 1;
     }
     const char* end = strchr(str, '|');
-    if (end == NULL)
+    if (end == nullptr)
         end = str + strlen(str);
     result->set(str, end - str);
 }
diff --git a/gfx/skia/skia/src/animator/SkDump.h b/gfx/skia/skia/src/animator/SkDump.h
index 0a31b1c0491a..bcf19fd9af4a 100644
--- a/gfx/skia/skia/src/animator/SkDump.h
+++ b/gfx/skia/skia/src/animator/SkDump.h
@@ -20,9 +20,9 @@ class SkDump : public SkDisplayable {
     DECLARE_MEMBER_INFO(Dump);
 #ifdef SK_DUMP_ENABLED
     SkDump();
-    virtual bool enable(SkAnimateMaker & );
+    bool enable(SkAnimateMaker & ) override;
     bool evaluate(SkAnimateMaker &);
-    virtual bool hasEnable() const;
+    bool hasEnable() const override;
     static void GetEnumString(SkDisplayTypes , int index, SkString* result);
     SkBool displayList;
     SkBool eventList;
@@ -32,9 +32,9 @@ class SkDump : public SkDisplayable {
     SkBool posts;
     SkString script;
 #else
-    virtual bool enable(SkAnimateMaker & );
-    virtual bool hasEnable() const;
-    virtual bool setProperty(int index, SkScriptValue& );
+    bool enable(SkAnimateMaker & ) override;
+    bool hasEnable() const override;
+    bool setProperty(int index, SkScriptValue& ) override;
 #endif
 };
 
diff --git a/gfx/skia/skia/src/animator/SkGetCondensedInfo.cpp b/gfx/skia/skia/src/animator/SkGetCondensedInfo.cpp
index f2471bbed98e..de6fa184b572 100644
--- a/gfx/skia/skia/src/animator/SkGetCondensedInfo.cpp
+++ b/gfx/skia/skia/src/animator/SkGetCondensedInfo.cpp
@@ -53,7 +53,7 @@ static int _searchByType(SkDisplayTypes type) {
 const SkMemberInfo* SkDisplayType::GetMembers(SkAnimateMaker* , SkDisplayTypes type, int* infoCountPtr) {
     int lookup = _searchByType(type);
     if (lookup < 0)
-        return NULL;
+        return nullptr;
     if (infoCountPtr)
         *infoCountPtr = gInfoCounts[lookup];
     return gInfoTables[lookup];
@@ -72,10 +72,10 @@ static const SkMemberInfo* _lookup(int lookup, const char** matchPtr) {
     if (info->fType == SkType_BaseClassInfo) {
         int baseTypeLookup = info->fOffset;
         const SkMemberInfo* result = _lookup(baseTypeLookup, matchPtr);
-        if (result != NULL)
+        if (result != nullptr)
             return result;
         if (--count == 0)
-            return NULL;
+            return nullptr;
         info++;
     }
     SkASSERT(info->fType != SkType_BaseClassInfo);
@@ -83,7 +83,7 @@ static const SkMemberInfo* _lookup(int lookup, const char** matchPtr) {
     const char* strings = gInfoNames[lookup];
     int index = _searchByName(&info->fName, count, strings, match);
     if (index < 0)
-        return NULL;
+        return nullptr;
     return &info[index];
 }
 
@@ -93,16 +93,16 @@ const SkMemberInfo* SkMemberInfo::Find(SkDisplayTypes type, int* index) {
     if (info->fType == SkType_BaseClassInfo) {
         int baseTypeLookup = info->fOffset;
         const SkMemberInfo* result = Find(baseTypeLookup, index);
-        if (result != NULL)
+        if (result != nullptr)
             return result;
         if (--count == 0)
-            return NULL;
+            return nullptr;
         info++;
     }
     SkASSERT(info->fType != SkType_BaseClassInfo);
     if (*index >= count) {
         *index -= count;
-        return NULL;
+        return nullptr;
     }
     return &info[index];
 }
diff --git a/gfx/skia/skia/src/animator/SkHitClear.h b/gfx/skia/skia/src/animator/SkHitClear.h
index 9c4020903f11..042c181adc2a 100644
--- a/gfx/skia/skia/src/animator/SkHitClear.h
+++ b/gfx/skia/skia/src/animator/SkHitClear.h
@@ -16,8 +16,8 @@
 
 class SkHitClear : public SkDisplayable {
     DECLARE_MEMBER_INFO(HitClear);
-    virtual bool enable(SkAnimateMaker& );
-    virtual bool hasEnable() const;
+    bool enable(SkAnimateMaker& ) override;
+    bool hasEnable() const override;
 private:
     SkTDDisplayableArray targets;
 };
diff --git a/gfx/skia/skia/src/animator/SkHitTest.h b/gfx/skia/skia/src/animator/SkHitTest.h
index 68d5cc5e352f..bd1cbe221f5b 100644
--- a/gfx/skia/skia/src/animator/SkHitTest.h
+++ b/gfx/skia/skia/src/animator/SkHitTest.h
@@ -10,16 +10,16 @@
 #ifndef SkHitTest_DEFINED
 #define SkHitTest_DEFINED
 
-#include "SkDrawable.h"
+#include "SkADrawable.h"
 #include "SkTypedArray.h"
 
-class SkHitTest : public SkDrawable {
+class SkHitTest : public SkADrawable {
     DECLARE_MEMBER_INFO(HitTest);
     SkHitTest();
-    virtual bool draw(SkAnimateMaker& );
-    virtual bool enable(SkAnimateMaker& );
-    virtual bool hasEnable() const;
-    virtual const SkMemberInfo* preferredChild(SkDisplayTypes type);
+    bool draw(SkAnimateMaker& ) override;
+    bool enable(SkAnimateMaker& ) override;
+    bool hasEnable() const override;
+    const SkMemberInfo* preferredChild(SkDisplayTypes type) override;
 private:
     SkTDDisplayableArray bullets;
     SkTDIntArray hits;
diff --git a/gfx/skia/skia/src/animator/SkIntArray.h b/gfx/skia/skia/src/animator/SkIntArray.h
index 401e51b8d40b..ae8e36b94fb1 100644
--- a/gfx/skia/skia/src/animator/SkIntArray.h
+++ b/gfx/skia/skia/src/animator/SkIntArray.h
@@ -20,7 +20,7 @@ class SkAnimateBase;
 class SkDataInput;
 class SkDisplayable;
 class SkDisplayEvent;
-class SkDrawable;
+class SkADrawable;
 class SkDrawColor;
 class SkMatrixPart;
 struct SkMemberInfo;
@@ -41,7 +41,7 @@ typedef SkLongArray(SkAnimateBase*) SkTDAnimateArray;
 typedef SkLongArray(SkDataInput*) SkTDDataArray;
 typedef SkLongArray(SkDisplayable*) SkTDDisplayableArray;
 typedef SkLongArray(SkDisplayEvent*) SkTDDisplayEventArray;
-typedef SkLongArray(SkDrawable*) SkTDDrawableArray;
+typedef SkLongArray(SkADrawable*) SkTDDrawableArray;
 typedef SkLongArray(SkDrawColor*) SkTDDrawColorArray;
 typedef SkLongArray(SkMatrixPart*) SkTDMatrixPartArray;
 typedef SkLongArray(const SkMemberInfo*) SkTDMemberInfoArray;
diff --git a/gfx/skia/skia/src/animator/SkMatrixParts.cpp b/gfx/skia/skia/src/animator/SkMatrixParts.cpp
index a2f3a9a524c4..c607f2523f03 100644
--- a/gfx/skia/skia/src/animator/SkMatrixParts.cpp
+++ b/gfx/skia/skia/src/animator/SkMatrixParts.cpp
@@ -13,7 +13,7 @@
 #include "SkDrawRectangle.h"
 #include "SkDrawPath.h"
 
-SkMatrixPart::SkMatrixPart() : fMatrix(NULL) {
+SkMatrixPart::SkMatrixPart() : fMatrix(nullptr) {
 }
 
 void SkMatrixPart::dirty() {
@@ -25,7 +25,7 @@ SkDisplayable* SkMatrixPart::getParent() const {
 }
 
 bool SkMatrixPart::setParent(SkDisplayable* parent) {
-    SkASSERT(parent != NULL);
+    SkASSERT(parent != nullptr);
     if (parent->isMatrix() == false)
         return true;
     fMatrix = (SkDrawMatrix*) parent;
@@ -131,14 +131,14 @@ const SkMemberInfo SkFromPath::fInfo[] = {
 DEFINE_GET_MEMBER(SkFromPath);
 
 SkFromPath::SkFromPath() :
-    mode(0), offset(0), path(NULL) {
+    mode(0), offset(0), path(nullptr) {
 }
 
 SkFromPath::~SkFromPath() {
 }
 
 bool SkFromPath::add() {
-    if (path == NULL)
+    if (path == nullptr)
         return true;
     static const uint8_t gFlags[] = {
         SkPathMeasure::kGetPosAndTan_MatrixFlag,    // normal
@@ -167,14 +167,14 @@ const SkMemberInfo SkRectToRect::fInfo[] = {
 DEFINE_GET_MEMBER(SkRectToRect);
 
 SkRectToRect::SkRectToRect() :
-    source(NULL), destination(NULL) {
+    source(nullptr), destination(nullptr) {
 }
 
 SkRectToRect::~SkRectToRect() {
 }
 
 bool SkRectToRect::add() {
-    if (source == NULL || destination == NULL)
+    if (source == nullptr || destination == nullptr)
         return true;
     SkMatrix temp;
     temp.setRectToRect(source->fRect, destination->fRect,
@@ -208,10 +208,10 @@ void SkRectToRect::dump(SkAnimateMaker* maker) {
 #endif
 
 const SkMemberInfo* SkRectToRect::preferredChild(SkDisplayTypes ) {
-    if (source == NULL)
+    if (source == nullptr)
         return getMember("source"); // !!! cwap! need to refer to member through enum like kScope instead
     else {
-        SkASSERT(destination == NULL);
+        SkASSERT(destination == nullptr);
         return getMember("destination");
     }
 }
@@ -228,7 +228,7 @@ const SkMemberInfo SkPolyToPoly::fInfo[] = {
 
 DEFINE_GET_MEMBER(SkPolyToPoly);
 
-SkPolyToPoly::SkPolyToPoly() : source(NULL), destination(NULL) {
+SkPolyToPoly::SkPolyToPoly() : source(nullptr), destination(nullptr) {
 }
 
 SkPolyToPoly::~SkPolyToPoly() {
@@ -283,10 +283,10 @@ void SkPolyToPoly::onEndElement(SkAnimateMaker& ) {
 }
 
 const SkMemberInfo* SkPolyToPoly::preferredChild(SkDisplayTypes ) {
-    if (source == NULL)
+    if (source == nullptr)
         return getMember("source"); // !!! cwap! need to refer to member through enum like kScope instead
     else {
-        SkASSERT(destination == NULL);
+        SkASSERT(destination == nullptr);
         return getMember("destination");
     }
 }
diff --git a/gfx/skia/skia/src/animator/SkMatrixParts.h b/gfx/skia/skia/src/animator/SkMatrixParts.h
index 51c95599b763..3276d023d4e6 100644
--- a/gfx/skia/skia/src/animator/SkMatrixParts.h
+++ b/gfx/skia/skia/src/animator/SkMatrixParts.h
@@ -39,7 +39,7 @@ class SkRotate : public SkMatrixPart {
     DECLARE_MEMBER_INFO(Rotate);
     SkRotate();
 protected:
-    virtual bool add();
+    bool add() override;
     SkScalar degrees;
     SkPoint center;
 };
@@ -48,7 +48,7 @@ class SkScale : public SkMatrixPart {
     DECLARE_MEMBER_INFO(Scale);
     SkScale();
 protected:
-    virtual bool add();
+    bool add() override;
     SkScalar x;
     SkScalar y;
     SkPoint center;
@@ -58,7 +58,7 @@ class SkSkew : public SkMatrixPart {
     DECLARE_MEMBER_INFO(Skew);
     SkSkew();
 protected:
-    virtual bool add();
+    bool add() override;
     SkScalar x;
     SkScalar y;
     SkPoint center;
@@ -68,7 +68,7 @@ class SkTranslate : public SkMatrixPart {
     DECLARE_MEMBER_INFO(Translate);
     SkTranslate();
 protected:
-    virtual bool add();
+    bool add() override;
     SkScalar x;
     SkScalar y;
 };
@@ -78,7 +78,7 @@ class SkFromPath : public SkMatrixPart {
     SkFromPath();
     virtual ~SkFromPath();
 protected:
-    virtual bool add();
+    bool add() override;
     int32_t mode;
     SkScalar offset;
     SkDrawPath* path;
@@ -90,11 +90,11 @@ class SkRectToRect : public SkMatrixPart {
     SkRectToRect();
     virtual ~SkRectToRect();
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
+    void dump(SkAnimateMaker* ) override;
 #endif
-    virtual const SkMemberInfo* preferredChild(SkDisplayTypes type);
+    const SkMemberInfo* preferredChild(SkDisplayTypes type) override;
 protected:
-    virtual bool add();
+    bool add() override;
     SkDrawRect* source;
     SkDrawRect* destination;
 };
@@ -104,12 +104,12 @@ class SkPolyToPoly : public SkMatrixPart {
     SkPolyToPoly();
     virtual ~SkPolyToPoly();
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker* );
+    void dump(SkAnimateMaker* ) override;
 #endif
-    virtual void onEndElement(SkAnimateMaker& );
-    virtual const SkMemberInfo* preferredChild(SkDisplayTypes type);
+    void onEndElement(SkAnimateMaker& ) override;
+    const SkMemberInfo* preferredChild(SkDisplayTypes type) override;
 protected:
-    virtual bool add();
+    bool add() override;
     SkPolygon* source;
     SkPolygon* destination;
 };
diff --git a/gfx/skia/skia/src/animator/SkMemberInfo.cpp b/gfx/skia/skia/src/animator/SkMemberInfo.cpp
index 5cdc8d0de665..ea4c257b1021 100644
--- a/gfx/skia/skia/src/animator/SkMemberInfo.cpp
+++ b/gfx/skia/skia/src/animator/SkMemberInfo.cpp
@@ -105,7 +105,7 @@ size_t SkMemberInfo::getSize(const SkDisplayable* displayable) const {
             break;
         case SkType_Array: {
             SkDisplayTypes type;
-            if (displayable == NULL)
+            if (displayable == nullptr)
                 return sizeof(int);
             if (displayable->getType() == SkType_Array) {
                 SkDisplayArray* dispArray = (SkDisplayArray*) displayable;
@@ -191,9 +191,9 @@ bool SkMemberInfo::setValue(SkAnimateMaker& maker, SkTDOperandArray* arrayStorag
     SkDisplayTypes type = getType();
     SkAnimatorScript engine(maker, displayable, type);
     if (arrayStorage)
-        displayable = NULL;
+        displayable = nullptr;
     bool success = true;
-    void* untypedStorage = NULL;
+    void* untypedStorage = nullptr;
     if (displayable && fType != SkType_MemberProperty && fType != SkType_MemberFunction)
         untypedStorage = (SkTDOperandArray*) memberData(displayable);
 
@@ -201,7 +201,7 @@ bool SkMemberInfo::setValue(SkAnimateMaker& maker, SkTDOperandArray* arrayStorag
         // for both SpiderMonkey and SkiaScript, substitute any #xyz or #xxyyzz first
             // it's enough to expand the colors into 0xFFxxyyzz
         const char* poundPos;
-        while ((poundPos = strchr(valueStr.c_str(), '#')) != NULL) {
+        while ((poundPos = strchr(valueStr.c_str(), '#')) != nullptr) {
             size_t offset = poundPos - valueStr.c_str();
             if (valueStr.size() - offset < 4)
                 break;
@@ -258,7 +258,7 @@ scriptCommon: {
             SkASSERT(success);
             if (scriptValue.fType == SkType_Displayable) {
                 if (type == SkType_String) {
-                    const char* charPtr = NULL;
+                    const char* charPtr = nullptr;
                     maker.findKey(scriptValue.fOperand.fDisplayable, &charPtr);
                     scriptValue.fOperand.fString = new SkString(charPtr);
                     scriptValue.fType = SkType_String;
@@ -358,7 +358,7 @@ bool SkMemberInfo::writeValue(SkDisplayable* displayable, SkTDOperandArray* arra
     SkScriptValue& scriptValue) const
 {
     SkOperand* storage = untypedStorage ? (SkOperand*) untypedStorage : arrayStorage ?
-        arrayStorage->begin() : NULL;
+        arrayStorage->begin() : nullptr;
     if (storage)
         storage += storageOffset;
     SkDisplayTypes type = getType();
@@ -386,7 +386,7 @@ bool SkMemberInfo::writeValue(SkDisplayable* displayable, SkTDOperandArray* arra
     } else if (fType == SkType_MemberFunction) {
         SkASSERT(scriptValue.fType == SkType_Array);
         if (displayable)
-            displayable->executeFunction(displayable, this, scriptValue.fOperand.fArray, NULL);
+            displayable->executeFunction(displayable, this, scriptValue.fOperand.fArray, nullptr);
         else {
             int count = scriptValue.fOperand.fArray->count();
     //      SkASSERT(maxStorage == 0 || count == maxStorage);
@@ -426,7 +426,7 @@ bool SkMemberInfo::writeValue(SkDisplayable* displayable, SkTDOperandArray* arra
         SkTypedArray* array = scriptValue.fOperand.fArray;
         SkASSERT(scriptValue.fType == SkType_Int || scriptValue.fType == SkType_ARGB ||
             scriptValue.fType == SkType_Array);
-        SkASSERT(scriptValue.fType != SkType_Array || (array != NULL &&
+        SkASSERT(scriptValue.fType != SkType_Array || (array != nullptr &&
             array->getType() == SkType_Int));
         int numberOfColors = scriptValue.fType == SkType_Array ? array->count() : 1;
         int numberOfComponents = numberOfColors * 4;
@@ -442,7 +442,7 @@ bool SkMemberInfo::writeValue(SkDisplayable* displayable, SkTDOperandArray* arra
             storage[3].fScalar = SkIntToScalar(SkColorGetB(color));
             storage += 4;
         }
-    } else if (SkDisplayType::IsStruct(NULL /* !!! maker*/, type)) {
+    } else if (SkDisplayType::IsStruct(nullptr /* !!! maker*/, type)) {
         if (scriptValue.fType != SkType_Array)
             return true;    // error
         SkASSERT(sizeof(SkScalar) == sizeof(SkOperand)); // !!! no 64 bit pointer support yet
@@ -486,17 +486,17 @@ const SkMemberInfo* SkMemberInfo::Find(const SkMemberInfo info[], int count, int
     if (info->fType == SkType_BaseClassInfo) {
         const SkMemberInfo* inherited = (SkMemberInfo*) info->fName;
         const SkMemberInfo* result = SkMemberInfo::Find(inherited, info->fCount, index);
-        if (result != NULL)
+        if (result != nullptr)
             return result;
         if (--count == 0)
-            return NULL;
+            return nullptr;
         info++;
     }
     SkASSERT(info->fName);
     SkASSERT(info->fType != SkType_BaseClassInfo);
     if (*index >= count) {
         *index -= count;
-        return NULL;
+        return nullptr;
     }
     return &info[*index];
 }
@@ -507,17 +507,17 @@ const SkMemberInfo* SkMemberInfo::Find(const SkMemberInfo info[], int count, con
     if (info->fType == SkType_BaseClassInfo) {
         const SkMemberInfo* inherited = (SkMemberInfo*) info->fName;
         const SkMemberInfo* result = SkMemberInfo::Find(inherited, info->fCount, matchPtr);
-        if (result != NULL)
+        if (result != nullptr)
             return result;
         if (--count == 0)
-            return NULL;
+            return nullptr;
         info++;
     }
     SkASSERT(info->fName);
     SkASSERT(info->fType != SkType_BaseClassInfo);
     int index = SkStrSearch(&info->fName, count, match, sizeof(*info));
     if (index < 0 || index >= count)
-        return NULL;
+        return nullptr;
     return &info[index];
 }
 
diff --git a/gfx/skia/skia/src/animator/SkMemberInfo.h b/gfx/skia/skia/src/animator/SkMemberInfo.h
index a1b194118a4d..b62de663d49b 100644
--- a/gfx/skia/skia/src/animator/SkMemberInfo.h
+++ b/gfx/skia/skia/src/animator/SkMemberInfo.h
@@ -32,7 +32,7 @@ struct SkMemberInfo {
     // if fCount == 0, record is member property
     // then fType can be type, so caller doesn't have to check
 #if SK_USE_CONDENSED_INFO == 0
-    const char* fName;  // may be NULL for anonymous functions
+    const char* fName;  // may be nullptr for anonymous functions
     size_t fOffset; // if negative, is index into member pointer table (for properties and functions)
     SkDisplayTypes fType;
     int fCount;         // for properties, actual type (count is always assumed to be 1)
@@ -104,13 +104,18 @@ struct SkMemberInfo {
 //  static bool SetValue(void* value, const char* name, SkDisplayTypes , int count);
 };
 
+#ifndef SK_OFFSETOF
+    // This is offsetof for types which are not standard layout.
+    #define SK_OFFSETOF(type, field) (size_t)((char*)&(((type*)1024)->field) - (char*)1024)
+#endif
+
 #define SK_MEMBER(_member, _type) \
     { #_member, SK_OFFSETOF(BASE_CLASS, _member), SkType_##_type, \
-    sizeof(((BASE_CLASS*) 1)->_member) / sizeof(SkScalar) }
+    sizeof(skstd::declval<BASE_CLASS>()._member) / sizeof(SkScalar) }
 
 #define SK_MEMBER_ALIAS(_member, _alias, _type) \
     { #_member, SK_OFFSETOF(BASE_CLASS, _alias), SkType_##_type, \
-    sizeof(((BASE_CLASS*) 1)->_alias) / sizeof(SkScalar) }
+    sizeof(skstd::declval<BASE_CLASS>()._alias) / sizeof(SkScalar) }
 
 #define SK_MEMBER_ARRAY(_member, _type) \
     { #_member, SK_OFFSETOF(BASE_CLASS, _member), SkType_Array, \
@@ -150,49 +155,49 @@ struct SkMemberInfo {
 public: \
     static const SkMemberInfo fInfo[]; \
     static const int fInfoCount; \
-    virtual const SkMemberInfo* getMember(int index); \
-    virtual const SkMemberInfo* getMember(const char name[]); \
+    const SkMemberInfo* getMember(int index) override; \
+    const SkMemberInfo* getMember(const char name[]) override; \
     typedef Sk##_type BASE_CLASS
 
 #define DECLARE_MEMBER_INFO(_type) \
 public: \
     static const SkMemberInfo fInfo[]; \
     static const int fInfoCount; \
-    virtual const SkMemberInfo* getMember(int index); \
-    virtual const SkMemberInfo* getMember(const char name[]); \
-    virtual SkDisplayTypes getType() const { return SkType_##_type; } \
+    const SkMemberInfo* getMember(int index) override; \
+    const SkMemberInfo* getMember(const char name[]) override; \
+    SkDisplayTypes getType() const override { return SkType_##_type; } \
     typedef Sk##_type BASE_CLASS
 
 #define DECLARE_DRAW_MEMBER_INFO(_type) \
 public: \
     static const SkMemberInfo fInfo[]; \
     static const int fInfoCount; \
-    virtual const SkMemberInfo* getMember(int index); \
-    virtual const SkMemberInfo* getMember(const char name[]); \
-    virtual SkDisplayTypes getType() const { return SkType_##_type; } \
+    const SkMemberInfo* getMember(int index) override; \
+    const SkMemberInfo* getMember(const char name[]) override; \
+    SkDisplayTypes getType() const override { return SkType_##_type; } \
     typedef SkDraw##_type BASE_CLASS
 
 #define DECLARE_DISPLAY_MEMBER_INFO(_type) \
 public: \
     static const SkMemberInfo fInfo[]; \
     static const int fInfoCount; \
-    virtual const SkMemberInfo* getMember(int index); \
-    virtual const SkMemberInfo* getMember(const char name[]); \
-    virtual SkDisplayTypes getType() const { return SkType_##_type; } \
+    const SkMemberInfo* getMember(int index) override; \
+    const SkMemberInfo* getMember(const char name[]) override; \
+    SkDisplayTypes getType() const override { return SkType_##_type; } \
     typedef SkDisplay##_type BASE_CLASS
 
 #define DECLARE_EMPTY_MEMBER_INFO(_type) \
 public: \
-    virtual SkDisplayTypes getType() const { return SkType_##_type; }
+    SkDisplayTypes getType() const override { return SkType_##_type; }
 
 #define DECLARE_EXTRAS_MEMBER_INFO(_type) \
 public: \
     static const SkMemberInfo fInfo[]; \
     static const int fInfoCount; \
-    virtual const SkMemberInfo* getMember(int index); \
-    virtual const SkMemberInfo* getMember(const char name[]); \
+    const SkMemberInfo* getMember(int index) override; \
+    const SkMemberInfo* getMember(const char name[]) override; \
     SkDisplayTypes fType; \
-    virtual SkDisplayTypes getType() const { return fType; } \
+    SkDisplayTypes getType() const override { return fType; } \
     typedef _type BASE_CLASS
 
 #define DECLARE_NO_VIRTUALS_MEMBER_INFO(_type) \
@@ -224,36 +229,36 @@ public: \
 #define DECLARE_MEMBER_INFO(_type) \
 public: \
     virtual const SkMemberInfo* getMember(int index) { \
-        return SkDisplayType::GetMember(NULL, SkType_##_type, &index); } \
+        return SkDisplayType::GetMember(nullptr, SkType_##_type, &index); } \
     virtual const SkMemberInfo* getMember(const char name[]) { \
-        return SkDisplayType::GetMember(NULL, SkType_##_type, &name); } \
+        return SkDisplayType::GetMember(nullptr, SkType_##_type, &name); } \
     virtual SkDisplayTypes getType() const { return SkType_##_type; } \
     typedef Sk##_type BASE_CLASS
 
 #define DECLARE_DRAW_MEMBER_INFO(_type) \
 public: \
     virtual const SkMemberInfo* getMember(int index) { \
-        return SkDisplayType::GetMember(NULL, SkType_##_type, &index); } \
+        return SkDisplayType::GetMember(nullptr, SkType_##_type, &index); } \
     virtual const SkMemberInfo* getMember(const char name[]) { \
-        return SkDisplayType::GetMember(NULL, SkType_##_type, &name); } \
+        return SkDisplayType::GetMember(nullptr, SkType_##_type, &name); } \
     virtual SkDisplayTypes getType() const { return SkType_##_type; } \
     typedef SkDraw##_type BASE_CLASS
 
 #define DECLARE_DISPLAY_MEMBER_INFO(_type) \
 public: \
     virtual const SkMemberInfo* getMember(int index) { \
-        return SkDisplayType::GetMember(NULL, SkType_##_type, &index); } \
+        return SkDisplayType::GetMember(nullptr, SkType_##_type, &index); } \
     virtual const SkMemberInfo* getMember(const char name[]) { \
-        return SkDisplayType::GetMember(NULL, SkType_##_type, &name); } \
+        return SkDisplayType::GetMember(nullptr, SkType_##_type, &name); } \
     virtual SkDisplayTypes getType() const { return SkType_##_type; } \
     typedef SkDisplay##_type BASE_CLASS
 
 #define DECLARE_EXTRAS_MEMBER_INFO(_type) \
 public: \
     virtual const SkMemberInfo* getMember(int index) { \
-        return SkDisplayType::GetMember(NULL, SkType_##_type, &index); } \
+        return SkDisplayType::GetMember(nullptr, SkType_##_type, &index); } \
     virtual const SkMemberInfo* getMember(const char name[]) { \
-        return SkDisplayType::GetMember(NULL, fType, &name); } \
+        return SkDisplayType::GetMember(nullptr, fType, &name); } \
     SkDisplayTypes fType; \
     virtual SkDisplayTypes getType() const { return fType; } \
     typedef _type BASE_CLASS
diff --git a/gfx/skia/skia/src/animator/SkOperand.h b/gfx/skia/skia/src/animator/SkOperand.h
index 0bd1fa3403d9..14126fccbfda 100644
--- a/gfx/skia/skia/src/animator/SkOperand.h
+++ b/gfx/skia/skia/src/animator/SkOperand.h
@@ -14,7 +14,7 @@
 
 class SkTypedArray;
 class SkDisplayable;
-class SkDrawable;
+class SkADrawable;
 class SkString;
 
 union SkOperand {
@@ -22,7 +22,7 @@ union SkOperand {
 //  SkOperand(SkScalar scalar) : fScalar(scalar) {}
     SkTypedArray* fArray;
     SkDisplayable* fDisplayable;
-    SkDrawable* fDrawable;
+    SkADrawable* fDrawable;
     void* fObject;
     int32_t fS32;
     SkMSec fMSec;
@@ -35,7 +35,7 @@ struct SkScriptValue {
     SkDisplayTypes fType;
     SkTypedArray* getArray() { SkASSERT(fType == SkType_Array); return fOperand.fArray; }
     SkDisplayable* getDisplayable() { SkASSERT(fType == SkType_Displayable); return fOperand.fDisplayable; }
-    SkDrawable* getDrawable() { SkASSERT(fType == SkType_Drawable); return fOperand.fDrawable; }
+    SkADrawable* getDrawable() { SkASSERT(fType == SkType_Drawable); return fOperand.fDrawable; }
     int32_t getS32(SkAnimateMaker* maker) { SkASSERT(fType == SkType_Int || fType == SkType_Boolean ||
         SkDisplayType::IsEnum(maker, fType)); return fOperand.fS32; }
     SkMSec getMSec() { SkASSERT(fType == SkType_MSec); return fOperand.fMSec; }
diff --git a/gfx/skia/skia/src/animator/SkOperandIterpolator.cpp b/gfx/skia/skia/src/animator/SkOperandIterpolator.cpp
index 84b32823e1d0..e6973e29f78f 100644
--- a/gfx/skia/skia/src/animator/SkOperandIterpolator.cpp
+++ b/gfx/skia/skia/src/animator/SkOperandIterpolator.cpp
@@ -38,7 +38,7 @@ void SkOperandInterpolator::reset(int elemCount, int frameCount, SkDisplayTypes
 
 bool SkOperandInterpolator::setKeyFrame(int index, SkMSec time, const SkOperand values[], SkScalar blend)
 {
-    SkASSERT(values != NULL);
+    SkASSERT(values != nullptr);
     blend = SkScalarPin(blend, 0, SK_Scalar1);
 
     bool success = ~index == SkTSearch<SkMSec>(&fTimes->fTime, index, time, sizeof(SkTimeCode));
diff --git a/gfx/skia/skia/src/animator/SkPaintPart.cpp b/gfx/skia/skia/src/animator/SkPaintPart.cpp
index 285b564c9332..842dbc97526b 100644
--- a/gfx/skia/skia/src/animator/SkPaintPart.cpp
+++ b/gfx/skia/skia/src/animator/SkPaintPart.cpp
@@ -12,7 +12,7 @@
 #include "SkDump.h"
 #endif
 
-SkPaintPart::SkPaintPart() : fPaint(NULL) {
+SkPaintPart::SkPaintPart() : fPaint(nullptr) {
 }
 
 SkDisplayable* SkPaintPart::getParent() const {
@@ -20,7 +20,7 @@ SkDisplayable* SkPaintPart::getParent() const {
 }
 
 bool SkPaintPart::setParent(SkDisplayable* parent) {
-    SkASSERT(parent != NULL);
+    SkASSERT(parent != nullptr);
     if (parent->isPaint() == false)
         return true;
     fPaint = (SkDrawPaint*) parent;
@@ -38,7 +38,7 @@ bool SkDrawMaskFilter::add() {
 }
 
 SkMaskFilter* SkDrawMaskFilter::getMaskFilter() {
-    return NULL;
+    return nullptr;
 }
 
 
@@ -51,18 +51,18 @@ bool SkDrawPathEffect::add() {
         fPaint->fOwnsPathEffect = true;
         return false;
     }
-    fPaint->add(NULL, this);
+    fPaint->add(nullptr, this);
     return false;
 }
 
 SkPathEffect* SkDrawPathEffect::getPathEffect() {
-    return NULL;
+    return nullptr;
 }
 
 
 // SkDrawShader
 SkShader* SkDrawShader::getShader() {
-    return NULL;
+    return nullptr;
 }
 
 
diff --git a/gfx/skia/skia/src/animator/SkPaintPart.h b/gfx/skia/skia/src/animator/SkPaintPart.h
index 6f33cb4c39ca..a7e28ed3e27c 100644
--- a/gfx/skia/skia/src/animator/SkPaintPart.h
+++ b/gfx/skia/skia/src/animator/SkPaintPart.h
@@ -35,14 +35,14 @@ class SkDrawMaskFilter : public SkPaintPart {
     DECLARE_EMPTY_MEMBER_INFO(MaskFilter);
     virtual SkMaskFilter* getMaskFilter();
 protected:
-    virtual bool add();
+    bool add() override;
 };
 
 class SkDrawPathEffect : public SkPaintPart {
     DECLARE_EMPTY_MEMBER_INFO(PathEffect);
     virtual SkPathEffect* getPathEffect();
 protected:
-    virtual bool add();
+    bool add() override;
 };
 
 class SkDrawShader : public SkPaintPart {
@@ -50,8 +50,8 @@ class SkDrawShader : public SkPaintPart {
     SkDrawShader();
     virtual SkShader* getShader();
 protected:
-    virtual bool add();
-    SkMatrix* getMatrix(); // returns NULL if matrix is NULL
+    bool add() override;
+    SkMatrix* getMatrix(); // returns nullptr if matrix is nullptr
     SkDrawMatrix* matrix;
     int /*SkShader::TileMode*/ tileMode;
 };
@@ -60,12 +60,12 @@ class SkDrawTypeface  : public SkPaintPart {
     DECLARE_DRAW_MEMBER_INFO(Typeface);
     SkDrawTypeface();
 #ifdef SK_DUMP_ENABLED
-    virtual void dump(SkAnimateMaker *);
+    void dump(SkAnimateMaker *) override;
 #endif
     SkTypeface* getTypeface() {
         return SkTypeface::CreateFromName(fontName.c_str(), style); }
 protected:
-    virtual bool add();
+    bool add() override;
     SkString fontName;
     SkTypeface::Style style;
 };
diff --git a/gfx/skia/skia/src/animator/SkParseSVGPath.cpp b/gfx/skia/skia/src/animator/SkParseSVGPath.cpp
index 4b548e28be56..7050f7c1e048 100644
--- a/gfx/skia/skia/src/animator/SkParseSVGPath.cpp
+++ b/gfx/skia/skia/src/animator/SkParseSVGPath.cpp
@@ -218,7 +218,7 @@ void SkDrawPath::parseSVG() {
                 break;
             case '~': {
                 SkPoint args[2];
-                data = find_points(data, args, 2, false, NULL);
+                data = find_points(data, args, 2, false, nullptr);
                 fPath.moveTo(args[0].fX, args[0].fY);
                 fPath.lineTo(args[1].fX, args[1].fY);
             }
diff --git a/gfx/skia/skia/src/animator/SkPathParts.cpp b/gfx/skia/skia/src/animator/SkPathParts.cpp
index efc7c3355d11..b5407ceeb59d 100644
--- a/gfx/skia/skia/src/animator/SkPathParts.cpp
+++ b/gfx/skia/skia/src/animator/SkPathParts.cpp
@@ -13,7 +13,7 @@
 #include "SkDrawRectangle.h"
 #include "SkDrawPath.h"
 
-SkPathPart::SkPathPart() : fPath(NULL) {
+SkPathPart::SkPathPart() : fPath(nullptr) {
 }
 
 void SkPathPart::dirty() {
@@ -25,7 +25,7 @@ SkDisplayable* SkPathPart::getParent() const {
 }
 
 bool SkPathPart::setParent(SkDisplayable* parent) {
-    SkASSERT(parent != NULL);
+    SkASSERT(parent != nullptr);
     if (parent->isPath() == false)
         return true;
     fPath = (SkDrawPath*) parent;
@@ -305,11 +305,11 @@ const SkMemberInfo SkAddPath::fInfo[] = {
 
 DEFINE_GET_MEMBER(SkAddPath);
 
-SkAddPath::SkAddPath() : matrix(NULL), path(NULL) {
+SkAddPath::SkAddPath() : matrix(nullptr), path(nullptr) {
 }
 
 bool SkAddPath::add() {
-    SkASSERT (path != NULL);
+    SkASSERT (path != nullptr);
     if (matrix)
         fPath->fPath.addPath(path->fPath, matrix->getMatrix());
     else
diff --git a/gfx/skia/skia/src/animator/SkPathParts.h b/gfx/skia/skia/src/animator/SkPathParts.h
index f82aa74531ad..afa7b662d7c7 100644
--- a/gfx/skia/skia/src/animator/SkPathParts.h
+++ b/gfx/skia/skia/src/animator/SkPathParts.h
@@ -34,7 +34,7 @@ protected:
 class SkMoveTo : public SkPathPart {
     DECLARE_MEMBER_INFO(MoveTo);
     SkMoveTo();
-    virtual bool add();
+    bool add() override;
 protected:
     SkScalar x;
     SkScalar y;
@@ -42,7 +42,7 @@ protected:
 
 class SkRMoveTo : public SkMoveTo {
     DECLARE_MEMBER_INFO(RMoveTo);
-    virtual bool add();
+    bool add() override;
 private:
     typedef SkMoveTo INHERITED;
 };
@@ -50,7 +50,7 @@ private:
 class SkLineTo : public SkPathPart {
     DECLARE_MEMBER_INFO(LineTo);
     SkLineTo();
-    virtual bool add();
+    bool add() override;
 protected:
     SkScalar x;
     SkScalar y;
@@ -58,7 +58,7 @@ protected:
 
 class SkRLineTo : public SkLineTo {
     DECLARE_MEMBER_INFO(RLineTo);
-    virtual bool add();
+    bool add() override;
 private:
     typedef SkLineTo INHERITED;
 };
@@ -66,7 +66,7 @@ private:
 class SkQuadTo : public SkPathPart {
     DECLARE_MEMBER_INFO(QuadTo);
     SkQuadTo();
-    virtual bool add();
+    bool add() override;
 protected:
     SkScalar x1;
     SkScalar y1;
@@ -76,7 +76,7 @@ protected:
 
 class SkRQuadTo : public SkQuadTo {
     DECLARE_MEMBER_INFO(RQuadTo);
-    virtual bool add();
+    bool add() override;
 private:
     typedef SkQuadTo INHERITED;
 };
@@ -84,7 +84,7 @@ private:
 class SkCubicTo : public SkPathPart {
     DECLARE_MEMBER_INFO(CubicTo);
     SkCubicTo();
-    virtual bool add();
+    bool add() override;
 protected:
     SkScalar x1;
     SkScalar y1;
@@ -96,14 +96,14 @@ protected:
 
 class SkRCubicTo : public SkCubicTo {
     DECLARE_MEMBER_INFO(RCubicTo);
-    virtual bool add();
+    bool add() override;
 private:
     typedef SkCubicTo INHERITED;
 };
 
 class SkClose : public SkPathPart {
     DECLARE_EMPTY_MEMBER_INFO(Close);
-    virtual bool add();
+    bool add() override;
 };
 
 class SkAddGeom : public SkPathPart {
@@ -116,7 +116,7 @@ protected:
 class SkAddRect : public SkAddGeom {
     DECLARE_MEMBER_INFO(AddRect);
     SkAddRect();
-    virtual bool add();
+    bool add() override;
 protected:
     SkRect fRect;
 private:
@@ -125,7 +125,7 @@ private:
 
 class SkAddOval : public SkAddRect {
     DECLARE_MEMBER_INFO(AddOval);
-    virtual bool add();
+    bool add() override;
 private:
     typedef SkAddRect INHERITED;
 };
@@ -133,7 +133,7 @@ private:
 class SkAddCircle : public SkAddGeom {
     DECLARE_MEMBER_INFO(AddCircle);
     SkAddCircle();
-    virtual bool add();
+    bool add() override;
 private:
     SkScalar radius;
     SkScalar x;
@@ -144,7 +144,7 @@ private:
 class SkAddRoundRect : public SkAddRect {
     DECLARE_MEMBER_INFO(AddRoundRect);
     SkAddRoundRect();
-    virtual bool add();
+    bool add() override;
 private:
     SkScalar rx;
     SkScalar ry;
@@ -154,7 +154,7 @@ private:
 class SkAddPath : public SkPathPart {
     DECLARE_MEMBER_INFO(AddPath);
     SkAddPath();
-    virtual bool add();
+    bool add() override;
 private:
     typedef SkPathPart INHERITED;
     SkDrawMatrix* matrix;
diff --git a/gfx/skia/skia/src/animator/SkPostParts.cpp b/gfx/skia/skia/src/animator/SkPostParts.cpp
index 7c0931eaa078..bfd5385532a5 100644
--- a/gfx/skia/skia/src/animator/SkPostParts.cpp
+++ b/gfx/skia/skia/src/animator/SkPostParts.cpp
@@ -20,7 +20,7 @@ const SkMemberInfo SkDataInput::fInfo[] = {
 
 DEFINE_GET_MEMBER(SkDataInput);
 
-SkDataInput::SkDataInput() : fParent(NULL) {}
+SkDataInput::SkDataInput() : fParent(nullptr) {}
 
 bool SkDataInput::add() {
     SkASSERT(name.size() > 0);
diff --git a/gfx/skia/skia/src/animator/SkPostParts.h b/gfx/skia/skia/src/animator/SkPostParts.h
index 4101b2b2eee6..fb2845be6e94 100644
--- a/gfx/skia/skia/src/animator/SkPostParts.h
+++ b/gfx/skia/skia/src/animator/SkPostParts.h
@@ -18,10 +18,10 @@ class SkDataInput: public SkInput {
     DECLARE_MEMBER_INFO(DataInput);
     SkDataInput();
     bool add();
-    virtual void dirty();
-    virtual SkDisplayable* getParent() const;
-    virtual void onEndElement(SkAnimateMaker& );
-    virtual bool setParent(SkDisplayable* );
+    void dirty() override;
+    SkDisplayable* getParent() const override;
+    void onEndElement(SkAnimateMaker& ) override;
+    bool setParent(SkDisplayable* ) override;
 protected:
     SkPost* fParent;
     typedef SkInput INHERITED;
diff --git a/gfx/skia/skia/src/animator/SkScript.cpp b/gfx/skia/skia/src/animator/SkScript.cpp
index 1d04d1b27630..cd864146f769 100644
--- a/gfx/skia/skia/src/animator/SkScript.cpp
+++ b/gfx/skia/skia/src/animator/SkScript.cpp
@@ -386,7 +386,7 @@ bool SkScriptEngine::evaluateDotParam(const char*& script, bool suppressed,
         const char* field, size_t fieldLength) {
     void* object;
     if (suppressed)
-        object = NULL;
+        object = nullptr;
     else {
         if (fTypeStack.top() != kObject) {
             fError = kDotOperatorExpectsObject;
@@ -492,7 +492,7 @@ bool SkScriptEngine::functionParams(const char** scriptPtr, SkTDArray<SkScriptVa
     SkBool suppressed = fSuppressStack.top().fSuppress;
     do {
         SkScriptValue value;
-        bool success = innerScript(scriptPtr, suppressed ? NULL : &value);
+        bool success = innerScript(scriptPtr, suppressed ? nullptr : &value);
         if (success == false) {
             fError = kErrorInFunctionParameters;
             return false;
@@ -559,7 +559,7 @@ bool SkScriptEngine::innerScript(const char** scriptPtr, SkScriptValue* value) {
                             if (convertTo(tokenInfo->getType(), &tokenValue) == false)
                                 return false;
                         }
-                        tokenInfo->writeValue(fDisplayable, NULL, 0, 0,
+                        tokenInfo->writeValue(fDisplayable, nullptr, 0, 0,
                             (void*) ((char*) fInfo->memberData(fDisplayable) + tokenInfo->fOffset + fArrayOffset),
                             tokenInfo->getType(), tokenValue);
                     }
@@ -635,7 +635,7 @@ bool SkScriptEngine::innerScript(const char** scriptPtr, SkScriptValue* value) {
             }
             script += 2;
             script = SkParse::FindHex(script, (uint32_t*)&operand.fS32);
-            if (script == NULL) {
+            if (script == nullptr) {
                 fError = kExpectedHex;
                 return false;
             }
@@ -711,7 +711,7 @@ scalarCommon:
         if (ch ==  '.') {
             if (fTokenLength == 0) {
                 SkScriptValue scriptValue;
-                SkDEBUGCODE(scriptValue.fOperand.fObject = NULL);
+                SkDEBUGCODE(scriptValue.fOperand.fObject = nullptr);
                 int tokenLength = token_length(++script);
                 const char* token = script;
                 script += tokenLength;
@@ -880,7 +880,7 @@ bool SkScriptEngine::handleArrayIndexer(const char** scriptPtr, bool suppressed)
     *fBraceStack.push() = kArrayBrace;
     SkOpType saveType = fReturnType;
     fReturnType = kInt;
-    bool success = innerScript(scriptPtr, suppressed == false ? &scriptValue : NULL);
+    bool success = innerScript(scriptPtr, suppressed == false ? &scriptValue : nullptr);
     if (success == false)
         return false;
     fReturnType = saveType;
@@ -1037,7 +1037,7 @@ bool SkScriptEngine::handleProperty(bool suppressed) {
             success = (*callBack->fPropertyCallBack)(fToken, fTokenLength,
                 callBack->fUserStorage, &callbackResult);
             if (success) {
-                if (callbackResult.fType == SkType_String && callbackResult.fOperand.fString == NULL) {
+                if (callbackResult.fType == SkType_String && callbackResult.fOperand.fString == nullptr) {
                     callbackResult.fOperand.fString = new SkString(fToken, fTokenLength);
                     track(callbackResult.fOperand.fString);
                 }
@@ -1317,7 +1317,7 @@ bool SkScriptEngine::processOp() {
         if ((type1 & attributes->fLeftType) == 0 || type1 != type2) {
             if (type1 == kString) {
                 const char* result = SkParse::FindScalar(operand1.fString->c_str(), &operand1.fScalar);
-                if (result == NULL) {
+                if (result == nullptr) {
                     fError = kExpectedNumber;
                     return false;
                 }
@@ -1332,7 +1332,7 @@ bool SkScriptEngine::processOp() {
     if ((type2 & attributes->fRightType) == 0 || type1 != type2) {
         if (type2 == kString) {
             const char* result = SkParse::FindScalar(operand2.fString->c_str(), &operand2.fScalar);
-            if (result == NULL) {
+            if (result == nullptr) {
                 fError = kExpectedNumber;
                 return false;
             }
@@ -1356,7 +1356,7 @@ bool SkScriptEngine::processOp() {
             break;
         case kAddString:
             if (fTrackString.find(operand1.fString) < 0) {
-                operand1.fString = SkNEW_ARGS(SkString, (*operand1.fString));
+                operand1.fString = new SkString(*operand1.fString);
                 track(operand1.fString);
             }
             operand1.fString->append(*operand2.fString);
@@ -1387,7 +1387,7 @@ bool SkScriptEngine::processOp() {
             if (operand2.fScalar == 0)
                 operand2.fScalar = operand1.fScalar == 0 ? SK_ScalarNaN : operand1.fScalar > 0 ? SK_ScalarMax : -SK_ScalarMax;
             else
-                operand2.fScalar = SkScalarDiv(operand1.fScalar, operand2.fScalar);
+                operand2.fScalar = operand1.fScalar / operand2.fScalar;
             break;
         case kEqualInt:
             operand2.fS32 = operand1.fS32 == operand2.fS32;
@@ -1487,7 +1487,7 @@ void SkScriptEngine::unboxCallBack(_unboxCallBack func, void* userStorage) {
 
 bool SkScriptEngine::ConvertTo(SkScriptEngine* engine, SkDisplayTypes toType, SkScriptValue* value ) {
     SkASSERT(value);
-    if (SkDisplayType::IsEnum(NULL /* fMaker */, toType))
+    if (SkDisplayType::IsEnum(nullptr /* fMaker */, toType))
         toType = SkType_Int;
     if (toType == SkType_Point || toType == SkType_3D_Point)
         toType = SkType_Float;
@@ -1509,7 +1509,7 @@ bool SkScriptEngine::ConvertTo(SkScriptEngine* engine, SkDisplayTypes toType, Sk
                     success = false;
                     break; // error
                 }
-                success = SkParse::FindS32(operand.fString->c_str(), &operand.fS32) != NULL;
+                success = SkParse::FindS32(operand.fString->c_str(), &operand.fS32) != nullptr;
             }
             break;
         case SkType_Float:
@@ -1525,7 +1525,7 @@ bool SkScriptEngine::ConvertTo(SkScriptEngine* engine, SkDisplayTypes toType, Sk
                     success = false;
                     break; // error
                 }
-                success = SkParse::FindScalar(operand.fString->c_str(), &operand.fScalar) != NULL;
+                success = SkParse::FindScalar(operand.fString->c_str(), &operand.fScalar) != nullptr;
             }
             break;
         case SkType_String: {
@@ -1595,9 +1595,9 @@ SkDisplayTypes SkScriptEngine::ToDisplayType(SkOpType type) {
 }
 
 SkScriptEngine::SkOpType SkScriptEngine::ToOpType(SkDisplayTypes type) {
-    if (SkDisplayType::IsDisplayable(NULL /* fMaker */, type))
+    if (SkDisplayType::IsDisplayable(nullptr /* fMaker */, type))
         return (SkOpType) kObject;
-    if (SkDisplayType::IsEnum(NULL /* fMaker */, type))
+    if (SkDisplayType::IsEnum(nullptr /* fMaker */, type))
         return kInt;
     switch (type) {
         case SkType_ARGB:
@@ -1647,7 +1647,7 @@ bool SkScriptEngine::ValueToString(SkScriptValue value, SkString* string) {
 #include "SkFloatingPoint.h"
 
 #define DEF_SCALAR_ANSWER   0
-#define DEF_STRING_ANSWER   NULL
+#define DEF_STRING_ANSWER   nullptr
 
 #define testInt(expression) { #expression, SkType_Int, expression, DEF_SCALAR_ANSWER, DEF_STRING_ANSWER }
     #define testScalar(expression) { #expression, SkType_Float, 0, (float) expression, DEF_STRING_ANSWER }
diff --git a/gfx/skia/skia/src/animator/SkScriptRuntime.cpp b/gfx/skia/skia/src/animator/SkScriptRuntime.cpp
index 78d9d5c2081b..7cb35a69db2c 100644
--- a/gfx/skia/skia/src/animator/SkScriptRuntime.cpp
+++ b/gfx/skia/skia/src/animator/SkScriptRuntime.cpp
@@ -200,13 +200,13 @@ bool SkScriptRuntime::executeTokens(unsigned char* opCode) {
             operand[0].fScalar = SkScriptEngine2::IntToScalar(operand[op - SkScriptEngine2::kIntToScalar].fS32);
             break;
         case SkScriptEngine2::kStringToInt:
-            if (SkParse::FindS32(operand[0].fString->c_str(), &operand[0].fS32) == NULL)
+            if (SkParse::FindS32(operand[0].fString->c_str(), &operand[0].fS32) == nullptr)
                 return false;
             break;
         case SkScriptEngine2::kStringToScalar:
         case SkScriptEngine2::kStringToScalar2:
             if (SkParse::FindScalar(operand[0].fString->c_str(),
-                    &operand[op - SkScriptEngine2::kStringToScalar].fScalar) == NULL)
+                    &operand[op - SkScriptEngine2::kStringToScalar].fScalar) == nullptr)
                 return false;
             break;
         case SkScriptEngine2::kScalarToInt:
@@ -221,9 +221,9 @@ bool SkScriptRuntime::executeTokens(unsigned char* opCode) {
             break;
         case SkScriptEngine2::kAddString:
 //            if (fTrackString.find(operand[1].fString) < 0) {
-//                operand[1].fString = SkNEW_ARGS(SkString, (*operand[1].fString));
-//                track(operand[1].fString);
-//            }
+            //                operand[1].fString = new SkString  (*operand[1].fString);
+            //                track(operand[1].fString);
+            //            }
             operand[0].fString->append(*operand[1].fString);
             break;
         case SkScriptEngine2::kBitAndInt:
@@ -249,7 +249,7 @@ bool SkScriptRuntime::executeTokens(unsigned char* opCode) {
                 operand[0].fScalar = operand[0].fScalar == 0 ? SK_ScalarNaN :
                     operand[0].fScalar > 0 ? SK_ScalarMax : -SK_ScalarMax;
             else
-                operand[0].fScalar = SkScalarDiv(operand[0].fScalar, operand[1].fScalar);
+                operand[0].fScalar = operand[0].fScalar / operand[1].fScalar;
             break;
         case SkScriptEngine2::kEqualInt:
             operand[0].fS32 = operand[0].fS32 == operand[1].fS32;
@@ -341,11 +341,11 @@ void SkScriptRuntime::track(SkString* string) {
 void SkScriptRuntime::untrack(SkOpArray* array) {
     int index = fTrackArray.find(array);
     SkASSERT(index >= 0);
-    fTrackArray.begin()[index] = NULL;
+    fTrackArray.begin()[index] = nullptr;
 }
 
 void SkScriptRuntime::untrack(SkString* string) {
     int index = fTrackString.find(string);
     SkASSERT(index >= 0);
-    fTrackString.begin()[index] = NULL;
+    fTrackString.begin()[index] = nullptr;
 }
diff --git a/gfx/skia/skia/src/animator/SkScriptTokenizer.cpp b/gfx/skia/skia/src/animator/SkScriptTokenizer.cpp
index 03ffaa4a721b..4ab7584f7a89 100644
--- a/gfx/skia/skia/src/animator/SkScriptTokenizer.cpp
+++ b/gfx/skia/skia/src/animator/SkScriptTokenizer.cpp
@@ -815,7 +815,7 @@ bool SkScriptEngine2::handleFunction(const char** scriptPtr) {
             SkScriptValue2 callbackResult;
             success = (*callBack)->getReference(functionName, functionNameLen, &callbackResult);
             if (success) {
-                callbackResult.fType = (*callBack)->getReturnType(callbackResult.fOperand.fReference, NULL);
+                callbackResult.fType = (*callBack)->getReturnType(callbackResult.fOperand.fReference, nullptr);
                 callbackResult.fIsConstant = SkScriptValue2::kVariable;
                 fValueStack.push(callbackResult);
                 goto done;
@@ -877,7 +877,7 @@ bool SkScriptEngine2::handleProperty() {
         SkScriptValue2 callbackResult;
         success = (*callBack)->getReference(fToken, fTokenLength, &callbackResult);
         if (success) {
-            if (callbackResult.fType == SkOperand2::kString && callbackResult.fOperand.fString == NULL) {
+            if (callbackResult.fType == SkOperand2::kString && callbackResult.fOperand.fString == nullptr) {
                 callbackResult.fOperand.fString = new SkString(fToken, fTokenLength);
                 track(callbackResult.fOperand.fString);
             }
@@ -1203,7 +1203,7 @@ bool SkScriptEngine2::ConvertTo(SkScriptEngine2* engine, SkOperand2::OpType toTy
                 operand.fS32 = SkScalarFloorToInt(operand.fScalar);
             else {
                 SkASSERT(type == SkOperand2::kString);
-                success = SkParse::FindS32(operand.fString->c_str(), &operand.fS32) != NULL;
+                success = SkParse::FindS32(operand.fString->c_str(), &operand.fS32) != nullptr;
             }
                 break;
         case SkOperand2::kScalar:
@@ -1211,7 +1211,7 @@ bool SkScriptEngine2::ConvertTo(SkScriptEngine2* engine, SkOperand2::OpType toTy
                 operand.fScalar = IntToScalar(operand.fS32);
             else {
                 SkASSERT(type == SkOperand2::kString);
-                success = SkParse::FindScalar(operand.fString->c_str(), &operand.fScalar) != NULL;
+                success = SkParse::FindScalar(operand.fString->c_str(), &operand.fScalar) != nullptr;
             }
                 break;
         case SkOperand2::kString: {
@@ -1273,11 +1273,11 @@ bool SkScriptEngine2::ValueToString(const SkScriptValue2& value, SkString* strin
 #ifdef SK_DEBUG
 #if defined(SK_SUPPORT_UNITTEST)
 
-#define testInt(expression) { #expression, SkOperand2::kS32, expression, 0, NULL }
-#define testScalar(expression) { #expression, SkOperand2::kScalar, 0, (float) (expression), NULL }
-#define testRemainder(exp1, exp2) { #exp1 "%" #exp2, SkOperand2::kScalar, 0, fmodf((float) exp1, (float) exp2), NULL }
-#define testTrue(expression) { #expression, SkOperand2::kS32, 1, 0, NULL }
-#define testFalse(expression) { #expression, SkOperand2::kS32, 0, 0, NULL }
+#define testInt(expression) { #expression, SkOperand2::kS32, expression, 0, nullptr }
+#define testScalar(expression) { #expression, SkOperand2::kScalar, 0, (float) (expression), nullptr }
+#define testRemainder(exp1, exp2) { #exp1 "%" #exp2, SkOperand2::kScalar, 0, fmodf((float) exp1, (float) exp2), nullptr }
+#define testTrue(expression) { #expression, SkOperand2::kS32, 1, 0, nullptr }
+#define testFalse(expression) { #expression, SkOperand2::kS32, 0, 0, nullptr }
 
 static const SkScriptNAnswer2 scriptTests[]  = {
     testInt(1||(0&&3)),
@@ -1308,12 +1308,12 @@ static const SkScriptNAnswer2 scriptTests[]  = {
     {    "'123'+\"456\"", SkOperand2::kString, 0, 0, "123456" },
     {    "123+\"456\"", SkOperand2::kString, 0, 0, "123456" },
     {    "'123'+456", SkOperand2::kString, 0, 0, "123456" },
-    {    "'123'|\"456\"", SkOperand2::kS32, 123|456, 0, NULL },
-    {    "123|\"456\"", SkOperand2::kS32, 123|456, 0, NULL },
-    {    "'123'|456", SkOperand2::kS32, 123|456, 0, NULL },
-    {    "'2'<11", SkOperand2::kS32, 1, 0, NULL },
-    {    "2<'11'", SkOperand2::kS32, 1, 0, NULL },
-    {    "'2'<'11'", SkOperand2::kS32, 0, 0, NULL },
+    {    "'123'|\"456\"", SkOperand2::kS32, 123|456, 0, nullptr },
+    {    "123|\"456\"", SkOperand2::kS32, 123|456, 0, nullptr },
+    {    "'123'|456", SkOperand2::kS32, 123|456, 0, nullptr },
+    {    "'2'<11", SkOperand2::kS32, 1, 0, nullptr },
+    {    "2<'11'", SkOperand2::kS32, 1, 0, nullptr },
+    {    "'2'<'11'", SkOperand2::kS32, 0, 0, nullptr },
     testInt(123),
     testInt(-345),
     testInt(+678),
@@ -1465,7 +1465,7 @@ static const SkScriptNAnswer2 scriptTests[]  = {
     testInt(0||(0&&3)),
     testInt(0||(1&&3)),
     testInt(0&&1?2:3)
-    , {    "123.5", SkOperand2::kScalar, 0, SkIntToScalar(123) + SK_Scalar1/2, NULL }
+    , {    "123.5", SkOperand2::kScalar, 0, SkIntToScalar(123) + SK_Scalar1/2, nullptr }
 };
 
 #define SkScriptNAnswer_testCount    SK_ARRAY_COUNT(scriptTests)
diff --git a/gfx/skia/skia/src/animator/SkSnapshot.h b/gfx/skia/skia/src/animator/SkSnapshot.h
index 5ae6917ae7f1..a4eb175777d8 100644
--- a/gfx/skia/skia/src/animator/SkSnapshot.h
+++ b/gfx/skia/skia/src/animator/SkSnapshot.h
@@ -10,15 +10,15 @@
 #ifndef SkSnapShot_DEFINED
 #define SkSnapShot_DEFINED
 
-#include "SkDrawable.h"
+#include "SkADrawable.h"
 #include "SkImageDecoder.h"
 #include "SkMemberInfo.h"
 #include "SkString.h"
 
-class SkSnapshot: public SkDrawable {
+class SkSnapshot: public SkADrawable {
     DECLARE_MEMBER_INFO(Snapshot);
     SkSnapshot();
-    virtual bool draw(SkAnimateMaker& );
+    bool draw(SkAnimateMaker& ) override;
     private:
     SkString filename;
     SkScalar quality;
diff --git a/gfx/skia/skia/src/animator/SkTDArray_Experimental.h b/gfx/skia/skia/src/animator/SkTDArray_Experimental.h
index 4b3970fde07c..ff693ac39b5f 100644
--- a/gfx/skia/skia/src/animator/SkTDArray_Experimental.h
+++ b/gfx/skia/skia/src/animator/SkTDArray_Experimental.h
@@ -35,8 +35,8 @@ protected:
     SkDS32Array(const int32_t src[], U16CPU count);
     SkDS32Array& operator=(const SkDS32Array& src);
     friend int operator==(const SkDS32Array& a, const SkDS32Array& b);
-    int32_t* append() { return this->append(1, NULL); }
-    int32_t* append(U16CPU count, const int32_t* src = NULL);
+    int32_t* append() { return this->append(1, nullptr); }
+    int32_t* append(U16CPU count, const int32_t* src = nullptr);
 
     int32_t* appendClear()
     {
@@ -65,9 +65,9 @@ public:
         if (fArray)
         {
             sk_free(fArray);
-            fArray = NULL;
+            fArray = nullptr;
 #ifdef SK_DEBUG
-            fData = NULL;
+            fData = nullptr;
 #endif
             fReserve = fCount = 0;
         }
@@ -104,7 +104,7 @@ protected:
 
 template <typename T> class SkTDS32Array : public SkDS32Array {
 public:
-    SkTDS32Array() { SkDEBUGCODE(fTData=NULL); SkASSERT(sizeof(T) == sizeof(int32_t)); }
+    SkTDS32Array() { SkDEBUGCODE(fTData=nullptr); SkASSERT(sizeof(T) == sizeof(int32_t)); }
     SkTDS32Array(const SkTDS32Array<T>& src) : SkDS32Array(src) {}
     ~SkTDS32Array() { sk_free(fArray); }
     T&  operator[](int index) const { SYNC(); SkASSERT((unsigned)index < fCount); return ((T*) fArray)[index]; }
@@ -114,12 +114,12 @@ public:
         return operator==((const SkDS32Array&) a, (const SkDS32Array&) b); }
     T* append() { return (T*) SkDS32Array::append(); }
     T* appendClear() { return (T*) SkDS32Array::appendClear(); }
-    T* append(U16CPU count, const T* src = NULL) { return (T*) SkDS32Array::append(count, (const int32_t*) src); }
+    T* append(U16CPU count, const T* src = nullptr) { return (T*) SkDS32Array::append(count, (const int32_t*) src); }
     T*  begin() const { SYNC(); return (T*) fArray; }
-    T*  end() const { return (T*) (fArray ? fArray + fCount : NULL); }
+    T*  end() const { return (T*) (fArray ? fArray + fCount : nullptr); }
     int find(const T& elem) const { return SkDS32Array::find((const int32_t&) elem); }
-    T* insert(U16CPU index) { return this->insert(index, 1, NULL); }
-    T* insert(U16CPU index, U16CPU count, const T* src = NULL) {
+    T* insert(U16CPU index) { return this->insert(index, 1, nullptr); }
+    T* insert(U16CPU index, U16CPU count, const T* src = nullptr) {
         return (T*) SkDS32Array::insert(index, count, (const int32_t*) src); }
     int rfind(const T& elem) const { return SkDS32Array::rfind((const int32_t&) elem); }
     T*          push() { return this->append(); }
diff --git a/gfx/skia/skia/src/animator/SkTextOnPath.cpp b/gfx/skia/skia/src/animator/SkTextOnPath.cpp
index 7bdb7fd977f4..864741619bb5 100644
--- a/gfx/skia/skia/src/animator/SkTextOnPath.cpp
+++ b/gfx/skia/skia/src/animator/SkTextOnPath.cpp
@@ -26,7 +26,7 @@ const SkMemberInfo SkTextOnPath::fInfo[] = {
 
 DEFINE_GET_MEMBER(SkTextOnPath);
 
-SkTextOnPath::SkTextOnPath() : offset(0), path(NULL), text(NULL) {
+SkTextOnPath::SkTextOnPath() : offset(0), path(nullptr), text(nullptr) {
 }
 
 bool SkTextOnPath::draw(SkAnimateMaker& maker) {
diff --git a/gfx/skia/skia/src/animator/SkTextOnPath.h b/gfx/skia/skia/src/animator/SkTextOnPath.h
index b0ce234df120..36adfd5221ac 100644
--- a/gfx/skia/skia/src/animator/SkTextOnPath.h
+++ b/gfx/skia/skia/src/animator/SkTextOnPath.h
@@ -19,7 +19,7 @@ class SkText;
 class SkTextOnPath : public SkBoundable {
     DECLARE_MEMBER_INFO(TextOnPath);
     SkTextOnPath();
-    virtual bool draw(SkAnimateMaker& );
+    bool draw(SkAnimateMaker& ) override;
 private:
     SkScalar offset;
     SkDrawPath* path;
diff --git a/gfx/skia/skia/src/animator/SkTextToPath.cpp b/gfx/skia/skia/src/animator/SkTextToPath.cpp
index 0c1b0e42e405..d4b525b9afc8 100644
--- a/gfx/skia/skia/src/animator/SkTextToPath.cpp
+++ b/gfx/skia/skia/src/animator/SkTextToPath.cpp
@@ -26,7 +26,7 @@ const SkMemberInfo SkTextToPath::fInfo[] = {
 
 DEFINE_GET_MEMBER(SkTextToPath);
 
-SkTextToPath::SkTextToPath() : paint(NULL), path(NULL), text(NULL) {
+SkTextToPath::SkTextToPath() : paint(nullptr), path(nullptr), text(nullptr) {
 }
 
 bool SkTextToPath::draw(SkAnimateMaker& maker) {
@@ -35,7 +35,7 @@ bool SkTextToPath::draw(SkAnimateMaker& maker) {
 }
 
 void SkTextToPath::onEndElement(SkAnimateMaker& maker) {
-    if (paint == NULL || path == NULL || text == NULL) {
+    if (paint == nullptr || path == nullptr || text == nullptr) {
         // !!! add error message here
         maker.setErrorCode(SkDisplayXMLParserError::kErrorInAttributeValue);
         return;
diff --git a/gfx/skia/skia/src/animator/SkTextToPath.h b/gfx/skia/skia/src/animator/SkTextToPath.h
index ac44ad7028d6..23b6bfe8b403 100644
--- a/gfx/skia/skia/src/animator/SkTextToPath.h
+++ b/gfx/skia/skia/src/animator/SkTextToPath.h
@@ -17,11 +17,11 @@ class SkDrawPaint;
 class SkDrawPath;
 class SkText;
 
-class SkTextToPath : public SkDrawable {
+class SkTextToPath : public SkADrawable {
     DECLARE_MEMBER_INFO(TextToPath);
     SkTextToPath();
-    virtual bool draw(SkAnimateMaker& );
-    virtual void onEndElement(SkAnimateMaker& );
+    bool draw(SkAnimateMaker& ) override;
+    void onEndElement(SkAnimateMaker& ) override;
 private:
     SkDrawPaint* paint;
     SkDrawPath* path;
diff --git a/gfx/skia/skia/src/animator/SkTime.cpp b/gfx/skia/skia/src/animator/SkTime.cpp
index a4e035bd1e2e..560ccd2fc868 100644
--- a/gfx/skia/skia/src/animator/SkTime.cpp
+++ b/gfx/skia/skia/src/animator/SkTime.cpp
@@ -28,15 +28,6 @@ void SkTime::GetDateTime(DateTime* t) {
     }
 }
 
-SkMSec SkTime::GetMSecs() {
-#ifdef SK_DEBUG
-    if (gForceTickCount != (SkMSec) -1) {
-        return gForceTickCount;
-    }
-#endif
-    return ::GetTickCount();
-}
-
 #elif defined(xSK_BUILD_FOR_MAC)
 
 #include <time.h>
@@ -58,13 +49,4 @@ void SkTime::GetDateTime(DateTime* t) {
     }
 }
 
-SkMSec SkTime::GetMSecs() {
-    UnsignedWide    wide;
-    ::Microseconds(&wide);
-
-    int64_t s = ((int64_t)wide.hi << 32) | wide.lo;
-    s = (s + 500) / 1000;   // rounded divide
-    return (SkMSec)s;
-}
-
 #endif
diff --git a/gfx/skia/skia/src/animator/SkTypedArray.cpp b/gfx/skia/skia/src/animator/SkTypedArray.cpp
index e94e57dca7ef..d9e2bc7f7300 100644
--- a/gfx/skia/skia/src/animator/SkTypedArray.cpp
+++ b/gfx/skia/skia/src/animator/SkTypedArray.cpp
@@ -29,18 +29,18 @@ bool SkTypedArray::getIndex(int index, SkOperand* operand) {
 SkDS32Array::SkDS32Array()
 {
     fReserve = fCount = 0;
-    fArray = NULL;
+    fArray = nullptr;
 #ifdef SK_DEBUG
-    fData = NULL;
+    fData = nullptr;
 #endif
 }
 
 SkDS32Array::SkDS32Array(const SkDS32Array& src)
 {
     fReserve = fCount = 0;
-    fArray = NULL;
+    fArray = nullptr;
 #ifdef SK_DEBUG
-    fData = NULL;
+    fData = nullptr;
 #endif
     SkDS32Array tmp(src.fArray, src.fCount);
     this->swap(tmp);
@@ -51,9 +51,9 @@ SkDS32Array::SkDS32Array(const int32_t src[], U16CPU count)
     SkASSERT(src || count == 0);
 
     fReserve = fCount = 0;
-    fArray = NULL;
+    fArray = nullptr;
 #ifdef SK_DEBUG
-    fData = NULL;
+    fData = nullptr;
 #endif
     if (count)
     {
@@ -105,7 +105,7 @@ int32_t* SkDS32Array::append(U16CPU count, const int32_t* src)
     unsigned oldCount = fCount;
     if (count)
     {
-        SkASSERT(src == NULL || fArray == NULL ||
+        SkASSERT(src == nullptr || fArray == nullptr ||
                 src + count <= fArray || fArray + count <= src);
 
         this->growBy(count);
diff --git a/gfx/skia/skia/src/animator/SkXMLAnimatorWriter.cpp b/gfx/skia/skia/src/animator/SkXMLAnimatorWriter.cpp
index 58f20f136b23..25b10a903d43 100644
--- a/gfx/skia/skia/src/animator/SkXMLAnimatorWriter.cpp
+++ b/gfx/skia/skia/src/animator/SkXMLAnimatorWriter.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-
 #include "SkXMLAnimatorWriter.h"
 #include "SkAnimator.h"
 #include "SkAnimateMaker.h"
@@ -26,6 +24,10 @@ void SkXMLAnimatorWriter::onAddAttributeLen(const char name[], const char value[
     fParser->onAddAttributeLen(name, value, length);
 }
 
+void SkXMLAnimatorWriter::onAddText(const char text[], size_t length) {
+    SkDebugf("not implemented: SkXMLAnimatorWriter::onAddText()\n");
+}
+
 void SkXMLAnimatorWriter::onEndElement()
 {
     Elem* elem = getEnd();
diff --git a/gfx/skia/skia/src/animator/SkXMLAnimatorWriter.h b/gfx/skia/skia/src/animator/SkXMLAnimatorWriter.h
index 1b17f6ffd63c..87cf21841f8b 100644
--- a/gfx/skia/skia/src/animator/SkXMLAnimatorWriter.h
+++ b/gfx/skia/skia/src/animator/SkXMLAnimatorWriter.h
@@ -19,12 +19,15 @@ class SkXMLAnimatorWriter : public SkXMLWriter {
 public:
     SkXMLAnimatorWriter(SkAnimator*);
     virtual ~SkXMLAnimatorWriter();
-    virtual void    writeHeader();
+    void writeHeader() override;
     SkDEBUGCODE(static void UnitTest(class SkCanvas* canvas);)
+
 protected:
-    virtual void onAddAttributeLen(const char name[], const char value[], size_t length);
-    virtual void onEndElement();
-    virtual void onStartElementLen(const char elem[], size_t length);
+    void onAddAttributeLen(const char name[], const char value[], size_t length) override;
+    void onEndElement() override;
+    void onStartElementLen(const char elem[], size_t length) override;
+    void onAddText(const char text[], size_t length) override;
+
 private:
     SkAnimator* fAnimator;
     SkDisplayXMLParser* fParser;
diff --git a/gfx/skia/skia/src/c/sk_c_from_to.h b/gfx/skia/skia/src/c/sk_c_from_to.h
new file mode 100644
index 000000000000..19fda37a2616
--- /dev/null
+++ b/gfx/skia/skia/src/c/sk_c_from_to.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+static bool find_sk(CType from, SKType* to) {
+    for (size_t i = 0; i < SK_ARRAY_COUNT(CTypeSkTypeMap); ++i) {
+        if (CTypeSkTypeMap[i].fC == from) {
+            if (to) {
+                *to = CTypeSkTypeMap[i].fSK;
+            }
+            return true;
+        }
+    }
+    return false;
+}
+
+static bool find_c(SKType from, CType* to) {
+    for (size_t i = 0; i < SK_ARRAY_COUNT(CTypeSkTypeMap); ++i) {
+        if (CTypeSkTypeMap[i].fSK == from) {
+            if (to) {
+                *to = CTypeSkTypeMap[i].fC;
+            }
+            return true;
+        }
+    }
+    return false;
+}
+
+#undef CType
+#undef SKType
+#undef CTypeSkTypeMap
diff --git a/gfx/skia/skia/src/c/sk_paint.cpp b/gfx/skia/skia/src/c/sk_paint.cpp
new file mode 100644
index 000000000000..dd0733f02ed2
--- /dev/null
+++ b/gfx/skia/skia/src/c/sk_paint.cpp
@@ -0,0 +1,170 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkPaint.h"
+
+#include "sk_paint.h"
+#include "sk_types_priv.h"
+
+#define MAKE_FROM_TO_NAME(FROM)     g_ ## FROM ## _map
+
+const struct {
+    sk_stroke_cap_t fC;
+    SkPaint::Cap    fSK;
+} MAKE_FROM_TO_NAME(sk_stroke_cap_t)[] = {
+    { BUTT_SK_STROKE_CAP,   SkPaint::kButt_Cap   },
+    { ROUND_SK_STROKE_CAP,  SkPaint::kRound_Cap  },
+    { SQUARE_SK_STROKE_CAP, SkPaint::kSquare_Cap },
+};
+
+const struct {
+    sk_stroke_join_t fC;
+    SkPaint::Join    fSK;
+} MAKE_FROM_TO_NAME(sk_stroke_join_t)[] = {
+    { MITER_SK_STROKE_JOIN, SkPaint::kMiter_Join },
+    { ROUND_SK_STROKE_JOIN, SkPaint::kRound_Join },
+    { BEVEL_SK_STROKE_JOIN, SkPaint::kBevel_Join },
+};
+
+#define CType           sk_stroke_cap_t
+#define SKType          SkPaint::Cap
+#define CTypeSkTypeMap  MAKE_FROM_TO_NAME(sk_stroke_cap_t)
+#include "sk_c_from_to.h"
+
+#define CType           sk_stroke_join_t
+#define SKType          SkPaint::Join
+#define CTypeSkTypeMap  MAKE_FROM_TO_NAME(sk_stroke_join_t)
+#include "sk_c_from_to.h"
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+
+sk_paint_t* sk_paint_new() { return (sk_paint_t*)new SkPaint; }
+
+void sk_paint_delete(sk_paint_t* cpaint) { delete AsPaint(cpaint); }
+
+bool sk_paint_is_antialias(const sk_paint_t* cpaint) {
+    return AsPaint(*cpaint).isAntiAlias();
+}
+
+void sk_paint_set_antialias(sk_paint_t* cpaint, bool aa) {
+    AsPaint(cpaint)->setAntiAlias(aa);
+}
+
+sk_color_t sk_paint_get_color(const sk_paint_t* cpaint) {
+    return AsPaint(*cpaint).getColor();
+}
+
+void sk_paint_set_color(sk_paint_t* cpaint, sk_color_t c) {
+    AsPaint(cpaint)->setColor(c);
+}
+
+void sk_paint_set_shader(sk_paint_t* cpaint, sk_shader_t* cshader) {
+    AsPaint(cpaint)->setShader(AsShader(cshader));
+}
+
+void sk_paint_set_maskfilter(sk_paint_t* cpaint, sk_maskfilter_t* cfilter) {
+    AsPaint(cpaint)->setMaskFilter(AsMaskFilter(cfilter));
+}
+
+bool sk_paint_is_stroke(const sk_paint_t* cpaint) {
+    return AsPaint(*cpaint).getStyle() != SkPaint::kFill_Style;
+}
+
+void sk_paint_set_stroke(sk_paint_t* cpaint, bool doStroke) {
+    AsPaint(cpaint)->setStyle(doStroke ? SkPaint::kStroke_Style : SkPaint::kFill_Style);
+}
+
+float sk_paint_get_stroke_width(const sk_paint_t* cpaint) {
+    return AsPaint(*cpaint).getStrokeWidth();
+}
+
+void sk_paint_set_stroke_width(sk_paint_t* cpaint, float width) {
+    AsPaint(cpaint)->setStrokeWidth(width);
+}
+
+float sk_paint_get_stroke_miter(const sk_paint_t* cpaint) {
+    return AsPaint(*cpaint).getStrokeMiter();
+}
+
+void sk_paint_set_stroke_miter(sk_paint_t* cpaint, float miter) {
+    AsPaint(cpaint)->setStrokeMiter(miter);
+}
+
+sk_stroke_cap_t sk_paint_get_stroke_cap(const sk_paint_t* cpaint) {
+    sk_stroke_cap_t ccap;
+    if (find_c(AsPaint(*cpaint).getStrokeCap(), &ccap)) {
+        ccap = BUTT_SK_STROKE_CAP;
+    }
+    return ccap;
+}
+
+void sk_paint_set_stroke_cap(sk_paint_t* cpaint, sk_stroke_cap_t ccap) {
+    SkPaint::Cap skcap;
+    if (find_sk(ccap, &skcap)) {
+        AsPaint(cpaint)->setStrokeCap(skcap);
+    } else {
+        // unknown ccap
+    }
+}
+
+sk_stroke_join_t sk_paint_get_stroke_join(const sk_paint_t* cpaint) {
+    sk_stroke_join_t cjoin;
+    if (find_c(AsPaint(*cpaint).getStrokeJoin(), &cjoin)) {
+        cjoin = MITER_SK_STROKE_JOIN;
+    }
+    return cjoin;
+}
+
+void sk_paint_set_stroke_join(sk_paint_t* cpaint, sk_stroke_join_t cjoin) {
+    SkPaint::Join skjoin;
+    if (find_sk(cjoin, &skjoin)) {
+        AsPaint(cpaint)->setStrokeJoin(skjoin);
+    } else {
+        // unknown cjoin
+    }
+}
+
+void sk_paint_set_xfermode_mode(sk_paint_t* paint, sk_xfermode_mode_t mode) {
+    SkASSERT(paint);
+    SkXfermode::Mode skmode;
+    switch (mode) {
+        #define MAP(X, Y) case (X): skmode = (Y); break
+        MAP( CLEAR_SK_XFERMODE_MODE,      SkXfermode::kClear_Mode      );
+        MAP( SRC_SK_XFERMODE_MODE,        SkXfermode::kSrc_Mode        );
+        MAP( DST_SK_XFERMODE_MODE,        SkXfermode::kDst_Mode        );
+        MAP( SRCOVER_SK_XFERMODE_MODE,    SkXfermode::kSrcOver_Mode    );
+        MAP( DSTOVER_SK_XFERMODE_MODE,    SkXfermode::kDstOver_Mode    );
+        MAP( SRCIN_SK_XFERMODE_MODE,      SkXfermode::kSrcIn_Mode      );
+        MAP( DSTIN_SK_XFERMODE_MODE,      SkXfermode::kDstIn_Mode      );
+        MAP( SRCOUT_SK_XFERMODE_MODE,     SkXfermode::kSrcOut_Mode     );
+        MAP( DSTOUT_SK_XFERMODE_MODE,     SkXfermode::kDstOut_Mode     );
+        MAP( SRCATOP_SK_XFERMODE_MODE,    SkXfermode::kSrcATop_Mode    );
+        MAP( DSTATOP_SK_XFERMODE_MODE,    SkXfermode::kDstATop_Mode    );
+        MAP( XOR_SK_XFERMODE_MODE,        SkXfermode::kXor_Mode        );
+        MAP( PLUS_SK_XFERMODE_MODE,       SkXfermode::kPlus_Mode       );
+        MAP( MODULATE_SK_XFERMODE_MODE,   SkXfermode::kModulate_Mode   );
+        MAP( SCREEN_SK_XFERMODE_MODE,     SkXfermode::kScreen_Mode     );
+        MAP( OVERLAY_SK_XFERMODE_MODE,    SkXfermode::kOverlay_Mode    );
+        MAP( DARKEN_SK_XFERMODE_MODE,     SkXfermode::kDarken_Mode     );
+        MAP( LIGHTEN_SK_XFERMODE_MODE,    SkXfermode::kLighten_Mode    );
+        MAP( COLORDODGE_SK_XFERMODE_MODE, SkXfermode::kColorDodge_Mode );
+        MAP( COLORBURN_SK_XFERMODE_MODE,  SkXfermode::kColorBurn_Mode  );
+        MAP( HARDLIGHT_SK_XFERMODE_MODE,  SkXfermode::kHardLight_Mode  );
+        MAP( SOFTLIGHT_SK_XFERMODE_MODE,  SkXfermode::kSoftLight_Mode  );
+        MAP( DIFFERENCE_SK_XFERMODE_MODE, SkXfermode::kDifference_Mode );
+        MAP( EXCLUSION_SK_XFERMODE_MODE,  SkXfermode::kExclusion_Mode  );
+        MAP( MULTIPLY_SK_XFERMODE_MODE,   SkXfermode::kMultiply_Mode   );
+        MAP( HUE_SK_XFERMODE_MODE,        SkXfermode::kHue_Mode        );
+        MAP( SATURATION_SK_XFERMODE_MODE, SkXfermode::kSaturation_Mode );
+        MAP( COLOR_SK_XFERMODE_MODE,      SkXfermode::kColor_Mode      );
+        MAP( LUMINOSITY_SK_XFERMODE_MODE, SkXfermode::kLuminosity_Mode );
+        #undef MAP
+        default:
+            return;
+    }
+    AsPaint(paint)->setXfermodeMode(skmode);
+}
diff --git a/gfx/skia/skia/src/c/sk_surface.cpp b/gfx/skia/skia/src/c/sk_surface.cpp
new file mode 100644
index 000000000000..b8fbc63f63f4
--- /dev/null
+++ b/gfx/skia/skia/src/c/sk_surface.cpp
@@ -0,0 +1,708 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkCanvas.h"
+#include "SkData.h"
+#include "SkImage.h"
+#include "SkMaskFilter.h"
+#include "SkMatrix.h"
+#include "SkPaint.h"
+#include "SkPath.h"
+#include "SkPictureRecorder.h"
+#include "SkSurface.h"
+
+#include "sk_canvas.h"
+#include "sk_data.h"
+#include "sk_image.h"
+#include "sk_paint.h"
+#include "sk_path.h"
+#include "sk_surface.h"
+#include "sk_types_priv.h"
+
+const struct {
+    sk_colortype_t  fC;
+    SkColorType     fSK;
+} gColorTypeMap[] = {
+    { UNKNOWN_SK_COLORTYPE,     kUnknown_SkColorType    },
+    { RGBA_8888_SK_COLORTYPE,   kRGBA_8888_SkColorType  },
+    { BGRA_8888_SK_COLORTYPE,   kBGRA_8888_SkColorType  },
+    { ALPHA_8_SK_COLORTYPE,     kAlpha_8_SkColorType    },
+};
+
+const struct {
+    sk_alphatype_t  fC;
+    SkAlphaType     fSK;
+} gAlphaTypeMap[] = {
+    { OPAQUE_SK_ALPHATYPE,      kOpaque_SkAlphaType     },
+    { PREMUL_SK_ALPHATYPE,      kPremul_SkAlphaType     },
+    { UNPREMUL_SK_ALPHATYPE,    kUnpremul_SkAlphaType   },
+};
+
+static bool from_c_colortype(sk_colortype_t cCT, SkColorType* skCT) {
+    for (size_t i = 0; i < SK_ARRAY_COUNT(gColorTypeMap); ++i) {
+        if (gColorTypeMap[i].fC == cCT) {
+            if (skCT) {
+                *skCT = gColorTypeMap[i].fSK;
+            }
+            return true;
+        }
+    }
+    return false;
+}
+
+static bool to_c_colortype(SkColorType skCT, sk_colortype_t* cCT) {
+    for (size_t i = 0; i < SK_ARRAY_COUNT(gColorTypeMap); ++i) {
+        if (gColorTypeMap[i].fSK == skCT) {
+            if (cCT) {
+                *cCT = gColorTypeMap[i].fC;
+            }
+            return true;
+        }
+    }
+    return false;
+}
+
+static bool from_c_alphatype(sk_alphatype_t cAT, SkAlphaType* skAT) {
+    for (size_t i = 0; i < SK_ARRAY_COUNT(gAlphaTypeMap); ++i) {
+        if (gAlphaTypeMap[i].fC == cAT) {
+            if (skAT) {
+                *skAT = gAlphaTypeMap[i].fSK;
+            }
+            return true;
+        }
+    }
+    return false;
+}
+
+static bool from_c_info(const sk_imageinfo_t& cinfo, SkImageInfo* info) {
+    SkColorType ct;
+    SkAlphaType at;
+
+    if (!from_c_colortype(cinfo.colorType, &ct)) {
+        // optionally report error to client?
+        return false;
+    }
+    if (!from_c_alphatype(cinfo.alphaType, &at)) {
+        // optionally report error to client?
+        return false;
+    }
+    if (info) {
+        *info = SkImageInfo::Make(cinfo.width, cinfo.height, ct, at);
+    }
+    return true;
+}
+
+const struct {
+    sk_pixelgeometry_t fC;
+    SkPixelGeometry    fSK;
+} gPixelGeometryMap[] = {
+    { UNKNOWN_SK_PIXELGEOMETRY, kUnknown_SkPixelGeometry },
+    { RGB_H_SK_PIXELGEOMETRY,   kRGB_H_SkPixelGeometry   },
+    { BGR_H_SK_PIXELGEOMETRY,   kBGR_H_SkPixelGeometry   },
+    { RGB_V_SK_PIXELGEOMETRY,   kRGB_V_SkPixelGeometry   },
+    { BGR_V_SK_PIXELGEOMETRY,   kBGR_V_SkPixelGeometry   },
+};
+
+
+static bool from_c_pixelgeometry(sk_pixelgeometry_t cGeom, SkPixelGeometry* skGeom) {
+    for (size_t i = 0; i < SK_ARRAY_COUNT(gPixelGeometryMap); ++i) {
+        if (gPixelGeometryMap[i].fC == cGeom) {
+            if (skGeom) {
+                *skGeom = gPixelGeometryMap[i].fSK;
+            }
+            return true;
+        }
+    }
+    return false;
+}
+
+static void from_c_matrix(const sk_matrix_t* cmatrix, SkMatrix* matrix) {
+    matrix->setAll(cmatrix->mat[0], cmatrix->mat[1], cmatrix->mat[2],
+                   cmatrix->mat[3], cmatrix->mat[4], cmatrix->mat[5],
+                   cmatrix->mat[6], cmatrix->mat[7], cmatrix->mat[8]);
+}
+
+const struct {
+    sk_path_direction_t fC;
+    SkPath::Direction   fSk;
+} gPathDirMap[] = {
+    { CW_SK_PATH_DIRECTION,  SkPath::kCW_Direction },
+    { CCW_SK_PATH_DIRECTION, SkPath::kCCW_Direction },
+};
+
+static bool from_c_path_direction(sk_path_direction_t cdir, SkPath::Direction* dir) {
+    for (size_t i = 0; i < SK_ARRAY_COUNT(gPathDirMap); ++i) {
+        if (gPathDirMap[i].fC == cdir) {
+            if (dir) {
+                *dir = gPathDirMap[i].fSk;
+            }
+            return true;
+        }
+    }
+    return false;
+}
+
+static SkData* AsData(const sk_data_t* cdata) {
+    return reinterpret_cast<SkData*>(const_cast<sk_data_t*>(cdata));
+}
+
+static sk_data_t* ToData(SkData* data) {
+    return reinterpret_cast<sk_data_t*>(data);
+}
+
+static sk_rect_t ToRect(const SkRect& rect) {
+    return reinterpret_cast<const sk_rect_t&>(rect);
+}
+
+static const SkRect& AsRect(const sk_rect_t& crect) {
+    return reinterpret_cast<const SkRect&>(crect);
+}
+
+static const SkPath& AsPath(const sk_path_t& cpath) {
+    return reinterpret_cast<const SkPath&>(cpath);
+}
+
+static SkPath* as_path(sk_path_t* cpath) {
+    return reinterpret_cast<SkPath*>(cpath);
+}
+
+static const SkImage* AsImage(const sk_image_t* cimage) {
+    return reinterpret_cast<const SkImage*>(cimage);
+}
+
+static sk_image_t* ToImage(SkImage* cimage) {
+    return reinterpret_cast<sk_image_t*>(cimage);
+}
+
+static sk_canvas_t* ToCanvas(SkCanvas* canvas) {
+    return reinterpret_cast<sk_canvas_t*>(canvas);
+}
+
+static SkCanvas* AsCanvas(sk_canvas_t* ccanvas) {
+    return reinterpret_cast<SkCanvas*>(ccanvas);
+}
+
+static SkPictureRecorder* AsPictureRecorder(sk_picture_recorder_t* crec) {
+    return reinterpret_cast<SkPictureRecorder*>(crec);
+}
+
+static sk_picture_recorder_t* ToPictureRecorder(SkPictureRecorder* rec) {
+    return reinterpret_cast<sk_picture_recorder_t*>(rec);
+}
+
+static const SkPicture* AsPicture(const sk_picture_t* cpic) {
+    return reinterpret_cast<const SkPicture*>(cpic);
+}
+
+static SkPicture* AsPicture(sk_picture_t* cpic) {
+    return reinterpret_cast<SkPicture*>(cpic);
+}
+
+static sk_picture_t* ToPicture(SkPicture* pic) {
+    return reinterpret_cast<sk_picture_t*>(pic);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+sk_colortype_t sk_colortype_get_default_8888() {
+    sk_colortype_t ct;
+    if (!to_c_colortype(kN32_SkColorType, &ct)) {
+        ct = UNKNOWN_SK_COLORTYPE;
+    }
+    return ct;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+sk_image_t* sk_image_new_raster_copy(const sk_imageinfo_t* cinfo, const void* pixels,
+                                     size_t rowBytes) {
+    SkImageInfo info;
+    if (!from_c_info(*cinfo, &info)) {
+        return NULL;
+    }
+    return (sk_image_t*)SkImage::NewRasterCopy(info, pixels, rowBytes);
+}
+
+sk_image_t* sk_image_new_from_encoded(const sk_data_t* cdata, const sk_irect_t* subset) {
+    return ToImage(SkImage::NewFromEncoded(AsData(cdata),
+                                           reinterpret_cast<const SkIRect*>(subset)));
+}
+
+sk_data_t* sk_image_encode(const sk_image_t* cimage) {
+    return ToData(AsImage(cimage)->encode());
+}
+
+void sk_image_ref(const sk_image_t* cimage) {
+    AsImage(cimage)->ref();
+}
+
+void sk_image_unref(const sk_image_t* cimage) {
+    AsImage(cimage)->unref();
+}
+
+int sk_image_get_width(const sk_image_t* cimage) {
+    return AsImage(cimage)->width();
+}
+
+int sk_image_get_height(const sk_image_t* cimage) {
+    return AsImage(cimage)->height();
+}
+
+uint32_t sk_image_get_unique_id(const sk_image_t* cimage) {
+    return AsImage(cimage)->uniqueID();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+sk_path_t* sk_path_new() { return (sk_path_t*)new SkPath; }
+
+void sk_path_delete(sk_path_t* cpath) { delete as_path(cpath); }
+
+void sk_path_move_to(sk_path_t* cpath, float x, float y) {
+    as_path(cpath)->moveTo(x, y);
+}
+
+void sk_path_line_to(sk_path_t* cpath, float x, float y) {
+    as_path(cpath)->lineTo(x, y);
+}
+
+void sk_path_quad_to(sk_path_t* cpath, float x0, float y0, float x1, float y1) {
+    as_path(cpath)->quadTo(x0, y0, x1, y1);
+}
+
+void sk_path_conic_to(sk_path_t* cpath, float x0, float y0, float x1, float y1, float w) {
+    as_path(cpath)->conicTo(x0, y0, x1, y1, w);
+}
+
+void sk_path_cubic_to(sk_path_t* cpath, float x0, float y0, float x1, float y1, float x2, float y2) {
+    as_path(cpath)->cubicTo(x0, y0, x1, y1, x2, y2);
+}
+
+void sk_path_close(sk_path_t* cpath) {
+    as_path(cpath)->close();
+}
+
+void sk_path_add_rect(sk_path_t* cpath, const sk_rect_t* crect, sk_path_direction_t cdir) {
+    SkPath::Direction dir;
+    if (!from_c_path_direction(cdir, &dir)) {
+        return;
+    }
+    as_path(cpath)->addRect(AsRect(*crect), dir);
+}
+
+void sk_path_add_oval(sk_path_t* cpath, const sk_rect_t* crect, sk_path_direction_t cdir) {
+    SkPath::Direction dir;
+    if (!from_c_path_direction(cdir, &dir)) {
+        return;
+    }
+    as_path(cpath)->addOval(AsRect(*crect), dir);
+}
+
+bool sk_path_get_bounds(const sk_path_t* cpath, sk_rect_t* crect) {
+    const SkPath& path = AsPath(*cpath);
+
+    if (path.isEmpty()) {
+        if (crect) {
+            *crect = ToRect(SkRect::MakeEmpty());
+        }
+        return false;
+    }
+
+    if (crect) {
+        *crect = ToRect(path.getBounds());
+    }
+    return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+void sk_canvas_save(sk_canvas_t* ccanvas) {
+    AsCanvas(ccanvas)->save();
+}
+
+void sk_canvas_save_layer(sk_canvas_t* ccanvas, const sk_rect_t* crect, const sk_paint_t* cpaint) {
+    AsCanvas(ccanvas)->drawRect(AsRect(*crect), AsPaint(*cpaint));
+}
+
+void sk_canvas_restore(sk_canvas_t* ccanvas) {
+    AsCanvas(ccanvas)->restore();
+}
+
+void sk_canvas_translate(sk_canvas_t* ccanvas, float dx, float dy) {
+    AsCanvas(ccanvas)->translate(dx, dy);
+}
+
+void sk_canvas_scale(sk_canvas_t* ccanvas, float sx, float sy) {
+    AsCanvas(ccanvas)->scale(sx, sy);
+}
+
+void sk_canvas_rotate_degress(sk_canvas_t* ccanvas, float degrees) {
+    AsCanvas(ccanvas)->rotate(degrees);
+}
+
+void sk_canvas_rotate_radians(sk_canvas_t* ccanvas, float radians) {
+    AsCanvas(ccanvas)->rotate(SkRadiansToDegrees(radians));
+}
+
+void sk_canvas_skew(sk_canvas_t* ccanvas, float sx, float sy) {
+    AsCanvas(ccanvas)->skew(sx, sy);
+}
+
+void sk_canvas_concat(sk_canvas_t* ccanvas, const sk_matrix_t* cmatrix) {
+    SkASSERT(cmatrix);
+    SkMatrix matrix;
+    from_c_matrix(cmatrix, &matrix);
+    AsCanvas(ccanvas)->concat(matrix);
+}
+
+void sk_canvas_clip_rect(sk_canvas_t* ccanvas, const sk_rect_t* crect) {
+    AsCanvas(ccanvas)->clipRect(AsRect(*crect));
+}
+
+void sk_canvas_clip_path(sk_canvas_t* ccanvas, const sk_path_t* cpath) {
+    AsCanvas(ccanvas)->clipPath(AsPath(*cpath));
+}
+
+void sk_canvas_draw_paint(sk_canvas_t* ccanvas, const sk_paint_t* cpaint) {
+    AsCanvas(ccanvas)->drawPaint(AsPaint(*cpaint));
+}
+
+void sk_canvas_draw_rect(sk_canvas_t* ccanvas, const sk_rect_t* crect, const sk_paint_t* cpaint) {
+    AsCanvas(ccanvas)->drawRect(AsRect(*crect), AsPaint(*cpaint));
+}
+
+void sk_canvas_draw_oval(sk_canvas_t* ccanvas, const sk_rect_t* crect, const sk_paint_t* cpaint) {
+    AsCanvas(ccanvas)->drawOval(AsRect(*crect), AsPaint(*cpaint));
+}
+
+void sk_canvas_draw_path(sk_canvas_t* ccanvas, const sk_path_t* cpath, const sk_paint_t* cpaint) {
+    AsCanvas(ccanvas)->drawPath(AsPath(*cpath), AsPaint(*cpaint));
+}
+
+void sk_canvas_draw_image(sk_canvas_t* ccanvas, const sk_image_t* cimage, float x, float y,
+                          const sk_paint_t* cpaint) {
+    AsCanvas(ccanvas)->drawImage(AsImage(cimage), x, y, AsPaint(cpaint));
+}
+
+void sk_canvas_draw_image_rect(sk_canvas_t* ccanvas, const sk_image_t* cimage,
+                               const sk_rect_t* csrcR, const sk_rect_t* cdstR,
+                               const sk_paint_t* cpaint) {
+    SkCanvas* canvas = AsCanvas(ccanvas);
+    const SkImage* image = AsImage(cimage);
+    const SkRect& dst = AsRect(*cdstR);
+    const SkPaint* paint = AsPaint(cpaint);
+
+    if (csrcR) {
+        canvas->drawImageRect(image, AsRect(*csrcR), dst, paint);
+    } else {
+        canvas->drawImageRect(image, dst, paint);
+    }
+}
+
+void sk_canvas_draw_picture(sk_canvas_t* ccanvas, const sk_picture_t* cpicture,
+                            const sk_matrix_t* cmatrix, const sk_paint_t* cpaint) {
+    const SkMatrix* matrixPtr = NULL;
+    SkMatrix matrix;
+    if (cmatrix) {
+        from_c_matrix(cmatrix, &matrix);
+        matrixPtr = &matrix;
+    }
+    AsCanvas(ccanvas)->drawPicture(AsPicture(cpicture), matrixPtr, AsPaint(cpaint));
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+sk_surface_t* sk_surface_new_raster(const sk_imageinfo_t* cinfo,
+                                    const sk_surfaceprops_t* props) {
+    SkImageInfo info;
+    if (!from_c_info(*cinfo, &info)) {
+        return NULL;
+    }
+    SkPixelGeometry geo = kUnknown_SkPixelGeometry;
+    if (props && !from_c_pixelgeometry(props->pixelGeometry, &geo)) {
+        return NULL;
+    }
+
+    SkSurfaceProps surfProps(0, geo);
+    return (sk_surface_t*)SkSurface::NewRaster(info, &surfProps);
+}
+
+sk_surface_t* sk_surface_new_raster_direct(const sk_imageinfo_t* cinfo, void* pixels,
+                                           size_t rowBytes,
+                                           const sk_surfaceprops_t* props) {
+    SkImageInfo info;
+    if (!from_c_info(*cinfo, &info)) {
+        return NULL;
+    }
+    SkPixelGeometry geo = kUnknown_SkPixelGeometry;
+    if (props && !from_c_pixelgeometry(props->pixelGeometry, &geo)) {
+        return NULL;
+    }
+
+    SkSurfaceProps surfProps(0, geo);
+    return (sk_surface_t*)SkSurface::NewRasterDirect(info, pixels, rowBytes, &surfProps);
+}
+
+void sk_surface_unref(sk_surface_t* csurf) {
+    SkSafeUnref((SkSurface*)csurf);
+}
+
+sk_canvas_t* sk_surface_get_canvas(sk_surface_t* csurf) {
+    SkSurface* surf = (SkSurface*)csurf;
+    return (sk_canvas_t*)surf->getCanvas();
+}
+
+sk_image_t* sk_surface_new_image_snapshot(sk_surface_t* csurf) {
+    SkSurface* surf = (SkSurface*)csurf;
+    return (sk_image_t*)surf->newImageSnapshot();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+sk_picture_recorder_t* sk_picture_recorder_new() {
+    return ToPictureRecorder(new SkPictureRecorder);
+}
+
+void sk_picture_recorder_delete(sk_picture_recorder_t* crec) {
+    delete AsPictureRecorder(crec);
+}
+
+sk_canvas_t* sk_picture_recorder_begin_recording(sk_picture_recorder_t* crec,
+                                                 const sk_rect_t* cbounds) {
+    return ToCanvas(AsPictureRecorder(crec)->beginRecording(AsRect(*cbounds)));
+}
+
+sk_picture_t* sk_picture_recorder_end_recording(sk_picture_recorder_t* crec) {
+    return ToPicture(AsPictureRecorder(crec)->endRecording());
+}
+
+void sk_picture_ref(sk_picture_t* cpic) {
+    SkSafeRef(AsPicture(cpic));
+}
+
+void sk_picture_unref(sk_picture_t* cpic) {
+    SkSafeUnref(AsPicture(cpic));
+}
+
+uint32_t sk_picture_get_unique_id(sk_picture_t* cpic) {
+    return AsPicture(cpic)->uniqueID();
+}
+
+sk_rect_t sk_picture_get_bounds(sk_picture_t* cpic) {
+    return ToRect(AsPicture(cpic)->cullRect());
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include "../../include/effects/SkGradientShader.h"
+#include "sk_shader.h"
+
+const struct {
+    sk_shader_tilemode_t    fC;
+    SkShader::TileMode      fSK;
+} gTileModeMap[] = {
+    { CLAMP_SK_SHADER_TILEMODE,     SkShader::kClamp_TileMode },
+    { REPEAT_SK_SHADER_TILEMODE,    SkShader::kRepeat_TileMode },
+    { MIRROR_SK_SHADER_TILEMODE,    SkShader::kMirror_TileMode  },
+};
+
+static bool from_c_tilemode(sk_shader_tilemode_t cMode, SkShader::TileMode* skMode) {
+    for (size_t i = 0; i < SK_ARRAY_COUNT(gTileModeMap); ++i) {
+        if (cMode == gTileModeMap[i].fC) {
+            if (skMode) {
+                *skMode = gTileModeMap[i].fSK;
+            }
+            return true;
+        }
+    }
+    return false;
+}
+
+void sk_shader_ref(sk_shader_t* cshader) {
+    SkSafeRef(AsShader(cshader));
+}
+
+void sk_shader_unref(sk_shader_t* cshader) {
+    SkSafeUnref(AsShader(cshader));
+}
+
+sk_shader_t* sk_shader_new_linear_gradient(const sk_point_t pts[2],
+                                           const sk_color_t colors[],
+                                           const float colorPos[],
+                                           int colorCount,
+                                           sk_shader_tilemode_t cmode,
+                                           const sk_matrix_t* cmatrix) {
+    SkShader::TileMode mode;
+    if (!from_c_tilemode(cmode, &mode)) {
+        return NULL;
+    }
+    SkMatrix matrix;
+    if (cmatrix) {
+        from_c_matrix(cmatrix, &matrix);
+    } else {
+        matrix.setIdentity();
+    }
+    SkShader* s = SkGradientShader::CreateLinear(reinterpret_cast<const SkPoint*>(pts),
+                                                 reinterpret_cast<const SkColor*>(colors),
+                                                 colorPos, colorCount, mode, 0, &matrix);
+    return (sk_shader_t*)s;
+}
+
+static const SkPoint& to_skpoint(const sk_point_t& p) {
+    return reinterpret_cast<const SkPoint&>(p);
+}
+
+sk_shader_t* sk_shader_new_radial_gradient(const sk_point_t* ccenter,
+                                           float radius,
+                                           const sk_color_t colors[],
+                                           const float colorPos[],
+                                           int colorCount,
+                                           sk_shader_tilemode_t cmode,
+                                           const sk_matrix_t* cmatrix) {
+    SkShader::TileMode mode;
+    if (!from_c_tilemode(cmode, &mode)) {
+        return NULL;
+    }
+    SkMatrix matrix;
+    if (cmatrix) {
+        from_c_matrix(cmatrix, &matrix);
+    } else {
+        matrix.setIdentity();
+    }
+    SkPoint center = to_skpoint(*ccenter);
+    SkShader* s = SkGradientShader::CreateRadial(
+            center, (SkScalar)radius,
+            reinterpret_cast<const SkColor*>(colors),
+            reinterpret_cast<const SkScalar*>(colorPos),
+            colorCount, mode, 0, &matrix);
+    return (sk_shader_t*)s;
+}
+
+sk_shader_t* sk_shader_new_sweep_gradient(const sk_point_t* ccenter,
+                                          const sk_color_t colors[],
+                                          const float colorPos[],
+                                          int colorCount,
+                                          const sk_matrix_t* cmatrix) {
+    SkMatrix matrix;
+    if (cmatrix) {
+        from_c_matrix(cmatrix, &matrix);
+    } else {
+        matrix.setIdentity();
+    }
+    SkShader* s = SkGradientShader::CreateSweep(
+            (SkScalar)(ccenter->x),
+            (SkScalar)(ccenter->y),
+            reinterpret_cast<const SkColor*>(colors),
+            reinterpret_cast<const SkScalar*>(colorPos),
+            colorCount, 0, &matrix);
+    return (sk_shader_t*)s;
+}
+
+sk_shader_t* sk_shader_new_two_point_conical_gradient(const sk_point_t* start,
+                                                      float startRadius,
+                                                      const sk_point_t* end,
+                                                      float endRadius,
+                                                      const sk_color_t colors[],
+                                                      const float colorPos[],
+                                                      int colorCount,
+                                                      sk_shader_tilemode_t cmode,
+                                                      const sk_matrix_t* cmatrix) {
+    SkShader::TileMode mode;
+    if (!from_c_tilemode(cmode, &mode)) {
+        return NULL;
+    }
+    SkMatrix matrix;
+    if (cmatrix) {
+        from_c_matrix(cmatrix, &matrix);
+    } else {
+        matrix.setIdentity();
+    }
+    SkPoint skstart = to_skpoint(*start);
+    SkPoint skend = to_skpoint(*end);
+    SkShader* s = SkGradientShader::CreateTwoPointConical(
+            skstart, (SkScalar)startRadius,
+            skend, (SkScalar)endRadius,
+            reinterpret_cast<const SkColor*>(colors),
+            reinterpret_cast<const SkScalar*>(colorPos),
+            colorCount, mode, 0, &matrix);
+    return (sk_shader_t*)s;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include "../../include/effects/SkBlurMaskFilter.h"
+#include "sk_maskfilter.h"
+
+const struct {
+    sk_blurstyle_t  fC;
+    SkBlurStyle     fSk;
+} gBlurStylePairs[] = {
+    { NORMAL_SK_BLUR_STYLE, kNormal_SkBlurStyle },
+    { SOLID_SK_BLUR_STYLE,  kSolid_SkBlurStyle },
+    { OUTER_SK_BLUR_STYLE,  kOuter_SkBlurStyle },
+    { INNER_SK_BLUR_STYLE,  kInner_SkBlurStyle },
+};
+
+static bool find_blurstyle(sk_blurstyle_t csrc, SkBlurStyle* dst) {
+    for (size_t i = 0; i < SK_ARRAY_COUNT(gBlurStylePairs); ++i) {
+        if (gBlurStylePairs[i].fC == csrc) {
+            if (dst) {
+                *dst = gBlurStylePairs[i].fSk;
+            }
+            return true;
+        }
+    }
+    return false;
+}
+
+void sk_maskfilter_ref(sk_maskfilter_t* cfilter) {
+    SkSafeRef(AsMaskFilter(cfilter));
+}
+
+void sk_maskfilter_unref(sk_maskfilter_t* cfilter) {
+    SkSafeUnref(AsMaskFilter(cfilter));
+}
+
+sk_maskfilter_t* sk_maskfilter_new_blur(sk_blurstyle_t cstyle, float sigma) {
+    SkBlurStyle style;
+    if (!find_blurstyle(cstyle, &style)) {
+        return NULL;
+    }
+    return ToMaskFilter(SkBlurMaskFilter::Create(style, sigma));
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+sk_data_t* sk_data_new_with_copy(const void* src, size_t length) {
+    return ToData(SkData::NewWithCopy(src, length));
+}
+
+sk_data_t* sk_data_new_from_malloc(const void* memory, size_t length) {
+    return ToData(SkData::NewFromMalloc(memory, length));
+}
+
+sk_data_t* sk_data_new_subset(const sk_data_t* csrc, size_t offset, size_t length) {
+    return ToData(SkData::NewSubset(AsData(csrc), offset, length));
+}
+
+void sk_data_ref(const sk_data_t* cdata) {
+    SkSafeRef(AsData(cdata));
+}
+
+void sk_data_unref(const sk_data_t* cdata) {
+    SkSafeUnref(AsData(cdata));
+}
+
+size_t sk_data_get_size(const sk_data_t* cdata) {
+    return AsData(cdata)->size();
+}
+
+const void* sk_data_get_data(const sk_data_t* cdata) {
+    return AsData(cdata)->data();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/gfx/skia/skia/src/c/sk_types_priv.h b/gfx/skia/skia/src/c/sk_types_priv.h
new file mode 100644
index 000000000000..92089d726630
--- /dev/null
+++ b/gfx/skia/skia/src/c/sk_types_priv.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef sk_types_priv_DEFINED
+#define sk_types_priv_DEFINED
+
+#include "sk_types.h"
+
+class SkMaskFilter;
+class SkPaint;
+class SkShader;
+
+static inline const SkPaint& AsPaint(const sk_paint_t& cpaint) {
+    return reinterpret_cast<const SkPaint&>(cpaint);
+}
+
+static inline const SkPaint* AsPaint(const sk_paint_t* cpaint) {
+    return reinterpret_cast<const SkPaint*>(cpaint);
+}
+
+static inline SkPaint* AsPaint(sk_paint_t* cpaint) {
+    return reinterpret_cast<SkPaint*>(cpaint);
+}
+
+static inline SkMaskFilter* AsMaskFilter(sk_maskfilter_t* cfilter) {
+    return reinterpret_cast<SkMaskFilter*>(cfilter);
+}
+
+static inline sk_maskfilter_t* ToMaskFilter(SkMaskFilter* filter) {
+    return reinterpret_cast<sk_maskfilter_t*>(filter);
+}
+
+static inline SkShader* AsShader(sk_shader_t* cshader) {
+    return reinterpret_cast<SkShader*>(cshader);
+}
+
+#endif
diff --git a/gfx/skia/skia/src/codec/SkAndroidCodec.cpp b/gfx/skia/skia/src/codec/SkAndroidCodec.cpp
new file mode 100644
index 000000000000..cf6e253d97eb
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkAndroidCodec.cpp
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkAndroidCodec.h"
+#include "SkCodec.h"
+#include "SkCodecPriv.h"
+#include "SkSampledCodec.h"
+#include "SkWebpAdapterCodec.h"
+
+static bool is_valid_sample_size(int sampleSize) {
+    // FIXME: As Leon has mentioned elsewhere, surely there is also a maximum sampleSize?
+    return sampleSize > 0;
+}
+
+SkAndroidCodec::SkAndroidCodec(const SkImageInfo& info)
+    : fInfo(info)
+{}
+
+SkAndroidCodec* SkAndroidCodec::NewFromStream(SkStream* stream, SkPngChunkReader* chunkReader) {
+    SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(stream, chunkReader));
+    if (nullptr == codec) {
+        return nullptr;
+    }
+
+    switch (codec->getEncodedFormat()) {
+        case kWEBP_SkEncodedFormat:
+            return new SkWebpAdapterCodec((SkWebpCodec*) codec.detach());
+        case kPNG_SkEncodedFormat:
+        case kJPEG_SkEncodedFormat:
+        case kWBMP_SkEncodedFormat:
+        case kBMP_SkEncodedFormat:
+        case kGIF_SkEncodedFormat:
+            return new SkSampledCodec(codec.detach());
+        default:
+            // FIXME: SkSampledCodec is temporarily disabled for other formats
+            // while focusing on the formats that are supported by
+            // BitmapRegionDecoder.
+            return nullptr;
+    }
+}
+
+SkAndroidCodec* SkAndroidCodec::NewFromData(SkData* data, SkPngChunkReader* chunkReader) {
+    if (!data) {
+        return nullptr;
+    }
+
+    return NewFromStream(new SkMemoryStream(data), chunkReader);
+}
+
+SkISize SkAndroidCodec::getSampledDimensions(int sampleSize) const {
+    if (!is_valid_sample_size(sampleSize)) {
+        return SkISize::Make(0, 0);
+    }
+
+    // Fast path for when we are not scaling.
+    if (1 == sampleSize) {
+        return fInfo.dimensions();
+    }
+
+    return this->onGetSampledDimensions(sampleSize);
+}
+
+bool SkAndroidCodec::getSupportedSubset(SkIRect* desiredSubset) const {
+    if (!desiredSubset || !is_valid_subset(*desiredSubset, fInfo.dimensions())) {
+        return false;
+    }
+
+    return this->onGetSupportedSubset(desiredSubset);
+}
+
+SkISize SkAndroidCodec::getSampledSubsetDimensions(int sampleSize, const SkIRect& subset) const {
+    if (!is_valid_sample_size(sampleSize)) {
+        return SkISize::Make(0, 0);
+    }
+
+    // We require that the input subset is a subset that is supported by SkAndroidCodec.
+    // We test this by calling getSupportedSubset() and verifying that no modifications
+    // are made to the subset.
+    SkIRect copySubset = subset;
+    if (!this->getSupportedSubset(&copySubset) || copySubset != subset) {
+        return SkISize::Make(0, 0);
+    }
+
+    // If the subset is the entire image, for consistency, use getSampledDimensions().
+    if (fInfo.dimensions() == subset.size()) {
+        return this->getSampledDimensions(sampleSize);
+    }
+
+    // This should perhaps call a virtual function, but currently both of our subclasses
+    // want the same implementation.
+    return SkISize::Make(get_scaled_dimension(subset.width(), sampleSize),
+                get_scaled_dimension(subset.height(), sampleSize));
+}
+
+SkCodec::Result SkAndroidCodec::getAndroidPixels(const SkImageInfo& info, void* pixels,
+        size_t rowBytes, const AndroidOptions* options) {
+    if (!pixels) {
+        return SkCodec::kInvalidParameters;
+    }
+    if (rowBytes < info.minRowBytes()) {
+        return SkCodec::kInvalidParameters;
+    }
+
+    AndroidOptions defaultOptions;
+    if (!options) {
+        options = &defaultOptions;
+    } else if (options->fSubset) {
+        if (!is_valid_subset(*options->fSubset, fInfo.dimensions())) {
+            return SkCodec::kInvalidParameters;
+        }
+
+        if (SkIRect::MakeSize(fInfo.dimensions()) == *options->fSubset) {
+            // The caller wants the whole thing, rather than a subset. Modify
+            // the AndroidOptions passed to onGetAndroidPixels to not specify
+            // a subset.
+            defaultOptions = *options;
+            defaultOptions.fSubset = nullptr;
+            options = &defaultOptions;
+        }
+    }
+
+    return this->onGetAndroidPixels(info, pixels, rowBytes, *options);
+}
+
+SkCodec::Result SkAndroidCodec::getAndroidPixels(const SkImageInfo& info, void* pixels,
+        size_t rowBytes) {
+    return this->getAndroidPixels(info, pixels, rowBytes, nullptr);
+}
diff --git a/gfx/skia/skia/src/codec/SkBmpCodec.cpp b/gfx/skia/skia/src/codec/SkBmpCodec.cpp
new file mode 100644
index 000000000000..191c2ad8009c
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkBmpCodec.cpp
@@ -0,0 +1,580 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkBmpCodec.h"
+#include "SkBmpMaskCodec.h"
+#include "SkBmpRLECodec.h"
+#include "SkBmpStandardCodec.h"
+#include "SkCodecPriv.h"
+#include "SkColorPriv.h"
+#include "SkStream.h"
+
+/*
+ * Defines the version and type of the second bitmap header
+ */
+enum BmpHeaderType {
+    kInfoV1_BmpHeaderType,
+    kInfoV2_BmpHeaderType,
+    kInfoV3_BmpHeaderType,
+    kInfoV4_BmpHeaderType,
+    kInfoV5_BmpHeaderType,
+    kOS2V1_BmpHeaderType,
+    kOS2VX_BmpHeaderType,
+    kUnknown_BmpHeaderType
+};
+
+/*
+ * Possible bitmap compression types
+ */
+enum BmpCompressionMethod {
+    kNone_BmpCompressionMethod =          0,
+    k8BitRLE_BmpCompressionMethod =       1,
+    k4BitRLE_BmpCompressionMethod =       2,
+    kBitMasks_BmpCompressionMethod =      3,
+    kJpeg_BmpCompressionMethod =          4,
+    kPng_BmpCompressionMethod =           5,
+    kAlphaBitMasks_BmpCompressionMethod = 6,
+    kCMYK_BmpCompressionMethod =          11,
+    kCMYK8BitRLE_BmpCompressionMethod =   12,
+    kCMYK4BitRLE_BmpCompressionMethod =   13
+};
+
+/*
+ * Used to define the input format of the bmp
+ */
+enum BmpInputFormat {
+    kStandard_BmpInputFormat,
+    kRLE_BmpInputFormat,
+    kBitMask_BmpInputFormat,
+    kUnknown_BmpInputFormat
+};
+
+/*
+ * Checks the start of the stream to see if the image is a bitmap
+ */
+bool SkBmpCodec::IsBmp(SkStream* stream) {
+    // TODO: Support "IC", "PT", "CI", "CP", "BA"
+    const char bmpSig[] = { 'B', 'M' };
+    char buffer[sizeof(bmpSig)];
+    return stream->read(buffer, sizeof(bmpSig)) == sizeof(bmpSig) &&
+            !memcmp(buffer, bmpSig, sizeof(bmpSig));
+}
+
+/*
+ * Assumes IsBmp was called and returned true
+ * Creates a bmp decoder
+ * Reads enough of the stream to determine the image format
+ */
+SkCodec* SkBmpCodec::NewFromStream(SkStream* stream) {
+    return SkBmpCodec::NewFromStream(stream, false);
+}
+
+/*
+ * Creates a bmp decoder for a bmp embedded in ico
+ * Reads enough of the stream to determine the image format
+ */
+SkCodec* SkBmpCodec::NewFromIco(SkStream* stream) {
+    return SkBmpCodec::NewFromStream(stream, true);
+}
+
+/*
+ * Read enough of the stream to initialize the SkBmpCodec. Returns a bool
+ * representing success or failure. If it returned true, and codecOut was
+ * not nullptr, it will be set to a new SkBmpCodec.
+ * Does *not* take ownership of the passed in SkStream.
+ */
+bool SkBmpCodec::ReadHeader(SkStream* stream, bool inIco, SkCodec** codecOut) {
+    // Header size constants
+    static const uint32_t kBmpHeaderBytes = 14;
+    static const uint32_t kBmpHeaderBytesPlusFour = kBmpHeaderBytes + 4;
+    static const uint32_t kBmpOS2V1Bytes = 12;
+    static const uint32_t kBmpOS2V2Bytes = 64;
+    static const uint32_t kBmpInfoBaseBytes = 16;
+    static const uint32_t kBmpInfoV1Bytes = 40;
+    static const uint32_t kBmpInfoV2Bytes = 52;
+    static const uint32_t kBmpInfoV3Bytes = 56;
+    static const uint32_t kBmpInfoV4Bytes = 108;
+    static const uint32_t kBmpInfoV5Bytes = 124;
+    static const uint32_t kBmpMaskBytes = 12;
+
+    // The total bytes in the bmp file
+    // We only need to use this value for RLE decoding, so we will only
+    // check that it is valid in the RLE case.
+    uint32_t totalBytes;
+    // The offset from the start of the file where the pixel data begins
+    uint32_t offset;
+    // The size of the second (info) header in bytes
+    uint32_t infoBytes;
+
+    // Bmps embedded in Icos skip the first Bmp header
+    if (!inIco) {
+        // Read the first header and the size of the second header
+        SkAutoTDeleteArray<uint8_t> hBuffer(new uint8_t[kBmpHeaderBytesPlusFour]);
+        if (stream->read(hBuffer.get(), kBmpHeaderBytesPlusFour) !=
+                kBmpHeaderBytesPlusFour) {
+            SkCodecPrintf("Error: unable to read first bitmap header.\n");
+            return false;
+        }
+
+        totalBytes = get_int(hBuffer.get(), 2);
+        offset = get_int(hBuffer.get(), 10);
+        if (offset < kBmpHeaderBytes + kBmpOS2V1Bytes) {
+            SkCodecPrintf("Error: invalid starting location for pixel data\n");
+            return false;
+        }
+
+        // The size of the second (info) header in bytes
+        // The size is the first field of the second header, so we have already
+        // read the first four infoBytes.
+        infoBytes = get_int(hBuffer.get(), 14);
+        if (infoBytes < kBmpOS2V1Bytes) {
+            SkCodecPrintf("Error: invalid second header size.\n");
+            return false;
+        }
+    } else {
+        // This value is only used by RLE compression.  Bmp in Ico files do not
+        // use RLE.  If the compression field is incorrectly signaled as RLE,
+        // we will catch this and signal an error below.
+        totalBytes = 0;
+
+        // Bmps in Ico cannot specify an offset.  We will always assume that
+        // pixel data begins immediately after the color table.  This value
+        // will be corrected below.
+        offset = 0;
+
+        // Read the size of the second header
+        SkAutoTDeleteArray<uint8_t> hBuffer(new uint8_t[4]);
+        if (stream->read(hBuffer.get(), 4) != 4) {
+            SkCodecPrintf("Error: unable to read size of second bitmap header.\n");
+            return false;
+        }
+        infoBytes = get_int(hBuffer.get(), 0);
+        if (infoBytes < kBmpOS2V1Bytes) {
+            SkCodecPrintf("Error: invalid second header size.\n");
+            return false;
+        }
+    }
+
+    // We already read the first four bytes of the info header to get the size
+    const uint32_t infoBytesRemaining = infoBytes - 4;
+
+    // Read the second header
+    SkAutoTDeleteArray<uint8_t> iBuffer(new uint8_t[infoBytesRemaining]);
+    if (stream->read(iBuffer.get(), infoBytesRemaining) != infoBytesRemaining) {
+        SkCodecPrintf("Error: unable to read second bitmap header.\n");
+        return false;
+    }
+
+    // The number of bits used per pixel in the pixel data
+    uint16_t bitsPerPixel;
+
+    // The compression method for the pixel data
+    uint32_t compression = kNone_BmpCompressionMethod;
+
+    // Number of colors in the color table, defaults to 0 or max (see below)
+    uint32_t numColors = 0;
+
+    // Bytes per color in the color table, early versions use 3, most use 4
+    uint32_t bytesPerColor;
+
+    // The image width and height
+    int width, height;
+
+    // Determine image information depending on second header format
+    BmpHeaderType headerType;
+    if (infoBytes >= kBmpInfoBaseBytes) {
+        // Check the version of the header
+        switch (infoBytes) {
+            case kBmpInfoV1Bytes:
+                headerType = kInfoV1_BmpHeaderType;
+                break;
+            case kBmpInfoV2Bytes:
+                headerType = kInfoV2_BmpHeaderType;
+                break;
+            case kBmpInfoV3Bytes:
+                headerType = kInfoV3_BmpHeaderType;
+                break;
+            case kBmpInfoV4Bytes:
+                headerType = kInfoV4_BmpHeaderType;
+                break;
+            case kBmpInfoV5Bytes:
+                headerType = kInfoV5_BmpHeaderType;
+                break;
+            case 16:
+            case 20:
+            case 24:
+            case 28:
+            case 32:
+            case 36:
+            case 42:
+            case 46:
+            case 48:
+            case 60:
+            case kBmpOS2V2Bytes:
+                headerType = kOS2VX_BmpHeaderType;
+                break;
+            default:
+                // We do not signal an error here because there is the
+                // possibility of new or undocumented bmp header types.  Most
+                // of the newer versions of bmp headers are similar to and
+                // build off of the older versions, so we may still be able to
+                // decode the bmp.
+                SkCodecPrintf("Warning: unknown bmp header format.\n");
+                headerType = kUnknown_BmpHeaderType;
+                break;
+        }
+        // We check the size of the header before entering the if statement.
+        // We should not reach this point unless the size is large enough for
+        // these required fields.
+        SkASSERT(infoBytesRemaining >= 12);
+        width = get_int(iBuffer.get(), 0);
+        height = get_int(iBuffer.get(), 4);
+        bitsPerPixel = get_short(iBuffer.get(), 10);
+
+        // Some versions do not have these fields, so we check before
+        // overwriting the default value.
+        if (infoBytesRemaining >= 16) {
+            compression = get_int(iBuffer.get(), 12);
+            if (infoBytesRemaining >= 32) {
+                numColors = get_int(iBuffer.get(), 28);
+            }
+        }
+
+        // All of the headers that reach this point, store color table entries
+        // using 4 bytes per pixel.
+        bytesPerColor = 4;
+    } else if (infoBytes >= kBmpOS2V1Bytes) {
+        // The OS2V1 is treated separately because it has a unique format
+        headerType = kOS2V1_BmpHeaderType;
+        width = (int) get_short(iBuffer.get(), 0);
+        height = (int) get_short(iBuffer.get(), 2);
+        bitsPerPixel = get_short(iBuffer.get(), 6);
+        bytesPerColor = 3;
+    } else {
+        // There are no valid bmp headers
+        SkCodecPrintf("Error: second bitmap header size is invalid.\n");
+        return false;
+    }
+
+    // Check for valid dimensions from header
+    SkCodec::SkScanlineOrder rowOrder = SkCodec::kBottomUp_SkScanlineOrder;
+    if (height < 0) {
+        height = -height;
+        rowOrder = SkCodec::kTopDown_SkScanlineOrder;
+    }
+    // The height field for bmp in ico is double the actual height because they
+    // contain an XOR mask followed by an AND mask
+    if (inIco) {
+        height /= 2;
+    }
+    if (width <= 0 || height <= 0) {
+        // TODO: Decide if we want to disable really large bmps as well.
+        // https://code.google.com/p/skia/issues/detail?id=3617
+        SkCodecPrintf("Error: invalid bitmap dimensions.\n");
+        return false;
+    }
+
+    // Create mask struct
+    SkMasks::InputMasks inputMasks;
+    memset(&inputMasks, 0, sizeof(SkMasks::InputMasks));
+
+    // Determine the input compression format and set bit masks if necessary
+    uint32_t maskBytes = 0;
+    BmpInputFormat inputFormat = kUnknown_BmpInputFormat;
+    switch (compression) {
+        case kNone_BmpCompressionMethod:
+            inputFormat = kStandard_BmpInputFormat;
+            break;
+        case k8BitRLE_BmpCompressionMethod:
+            if (bitsPerPixel != 8) {
+                SkCodecPrintf("Warning: correcting invalid bitmap format.\n");
+                bitsPerPixel = 8;
+            }
+            inputFormat = kRLE_BmpInputFormat;
+            break;
+        case k4BitRLE_BmpCompressionMethod:
+            if (bitsPerPixel != 4) {
+                SkCodecPrintf("Warning: correcting invalid bitmap format.\n");
+                bitsPerPixel = 4;
+            }
+            inputFormat = kRLE_BmpInputFormat;
+            break;
+        case kAlphaBitMasks_BmpCompressionMethod:
+        case kBitMasks_BmpCompressionMethod:
+            // Load the masks
+            inputFormat = kBitMask_BmpInputFormat;
+            switch (headerType) {
+                case kInfoV1_BmpHeaderType: {
+                    // The V1 header stores the bit masks after the header
+                    SkAutoTDeleteArray<uint8_t> mBuffer(new uint8_t[kBmpMaskBytes]);
+                    if (stream->read(mBuffer.get(), kBmpMaskBytes) !=
+                            kBmpMaskBytes) {
+                        SkCodecPrintf("Error: unable to read bit inputMasks.\n");
+                        return false;
+                    }
+                    maskBytes = kBmpMaskBytes;
+                    inputMasks.red = get_int(mBuffer.get(), 0);
+                    inputMasks.green = get_int(mBuffer.get(), 4);
+                    inputMasks.blue = get_int(mBuffer.get(), 8);
+                    break;
+                }
+                case kInfoV2_BmpHeaderType:
+                case kInfoV3_BmpHeaderType:
+                case kInfoV4_BmpHeaderType:
+                case kInfoV5_BmpHeaderType:
+                    // Header types are matched based on size.  If the header
+                    // is V2+, we are guaranteed to be able to read at least
+                    // this size.
+                    SkASSERT(infoBytesRemaining >= 48);
+                    inputMasks.red = get_int(iBuffer.get(), 36);
+                    inputMasks.green = get_int(iBuffer.get(), 40);
+                    inputMasks.blue = get_int(iBuffer.get(), 44);
+                    break;
+                case kOS2VX_BmpHeaderType:
+                    // TODO: Decide if we intend to support this.
+                    //       It is unsupported in the previous version and
+                    //       in chromium.  I have not come across a test case
+                    //       that uses this format.
+                    SkCodecPrintf("Error: huffman format unsupported.\n");
+                    return false;
+                default:
+                   SkCodecPrintf("Error: invalid bmp bit masks header.\n");
+                   return false;
+            }
+            break;
+        case kJpeg_BmpCompressionMethod:
+            if (24 == bitsPerPixel) {
+                inputFormat = kRLE_BmpInputFormat;
+                break;
+            }
+            // Fall through
+        case kPng_BmpCompressionMethod:
+            // TODO: Decide if we intend to support this.
+            //       It is unsupported in the previous version and
+            //       in chromium.  I think it is used mostly for printers.
+            SkCodecPrintf("Error: compression format not supported.\n");
+            return false;
+        case kCMYK_BmpCompressionMethod:
+        case kCMYK8BitRLE_BmpCompressionMethod:
+        case kCMYK4BitRLE_BmpCompressionMethod:
+            // TODO: Same as above.
+            SkCodecPrintf("Error: CMYK not supported for bitmap decoding.\n");
+            return false;
+        default:
+            SkCodecPrintf("Error: invalid format for bitmap decoding.\n");
+            return false;
+    }
+
+    // Most versions of bmps should be rendered as opaque.  Either they do
+    // not have an alpha channel, or they expect the alpha channel to be
+    // ignored.  V3+ bmp files introduce an alpha mask and allow the creator
+    // of the image to use the alpha channels.  However, many of these images
+    // leave the alpha channel blank and expect to be rendered as opaque.  This
+    // is the case for almost all V3 images, so we render these as opaque.  For
+    // V4+, we will use the alpha channel, and fix the image later if it turns
+    // out to be fully transparent.
+    // As an exception, V3 bmp-in-ico may use an alpha mask.
+    SkAlphaType alphaType = kOpaque_SkAlphaType;
+    if ((kInfoV3_BmpHeaderType == headerType && inIco) ||
+            kInfoV4_BmpHeaderType == headerType ||
+            kInfoV5_BmpHeaderType == headerType) {
+        // Header types are matched based on size.  If the header is
+        // V3+, we are guaranteed to be able to read at least this size.
+        SkASSERT(infoBytesRemaining > 52);
+        inputMasks.alpha = get_int(iBuffer.get(), 48);
+        if (inputMasks.alpha != 0) {
+            alphaType = kUnpremul_SkAlphaType;
+        }
+    }
+    iBuffer.free();
+
+    // Additionally, 32 bit bmp-in-icos use the alpha channel.
+    // FIXME (msarett): Don't all bmp-in-icos use the alpha channel?
+    // And, RLE inputs may skip pixels, leaving them as transparent.  This
+    // is uncommon, but we cannot be certain that an RLE bmp will be opaque.
+    if ((inIco && 32 == bitsPerPixel) || (kRLE_BmpInputFormat == inputFormat)) {
+        alphaType = kUnpremul_SkAlphaType;
+    }
+
+    // Check for valid bits per pixel.
+    // At the same time, use this information to choose a suggested color type
+    // and to set default masks.
+    SkColorType colorType = kN32_SkColorType;
+    switch (bitsPerPixel) {
+        // In addition to more standard pixel compression formats, bmp supports
+        // the use of bit masks to determine pixel components.  The standard
+        // format for representing 16-bit colors is 555 (XRRRRRGGGGGBBBBB),
+        // which does not map well to any Skia color formats.  For this reason,
+        // we will always enable mask mode with 16 bits per pixel.
+        case 16:
+            if (kBitMask_BmpInputFormat != inputFormat) {
+                inputMasks.red = 0x7C00;
+                inputMasks.green = 0x03E0;
+                inputMasks.blue = 0x001F;
+                inputFormat = kBitMask_BmpInputFormat;
+            }
+            break;
+        // We want to decode to kIndex_8 for input formats that are already
+        // designed in index format.
+        case 1:
+        case 2:
+        case 4:
+        case 8:
+            // However, we cannot in RLE format since we may need to leave some
+            // pixels as transparent.  Similarly, we also cannot for ICO images
+            // since we may need to apply a transparent mask.
+            if (kRLE_BmpInputFormat != inputFormat && !inIco) {
+                colorType = kIndex_8_SkColorType;
+            }
+        case 24:
+        case 32:
+            break;
+        default:
+            SkCodecPrintf("Error: invalid input value for bits per pixel.\n");
+            return false;
+    }
+
+    // Check that input bit masks are valid and create the masks object
+    SkAutoTDelete<SkMasks>
+            masks(SkMasks::CreateMasks(inputMasks, bitsPerPixel));
+    if (nullptr == masks) {
+        SkCodecPrintf("Error: invalid input masks.\n");
+        return false;
+    }
+
+    // Check for a valid number of total bytes when in RLE mode
+    if (totalBytes <= offset && kRLE_BmpInputFormat == inputFormat) {
+        SkCodecPrintf("Error: RLE requires valid input size.\n");
+        return false;
+    }
+    const size_t RLEBytes = totalBytes - offset;
+
+    // Calculate the number of bytes read so far
+    const uint32_t bytesRead = kBmpHeaderBytes + infoBytes + maskBytes;
+    if (!inIco && offset < bytesRead) {
+        // TODO (msarett): Do we really want to fail if the offset in the header is invalid?
+        //                 Seems like we can just assume that the offset is zero and try to decode?
+        //                 Maybe we don't want to try to decode corrupt images?
+        SkCodecPrintf("Error: pixel data offset less than header size.\n");
+        return false;
+    }
+
+    // Skip to the start of the pixel array.
+    // We can do this here because there is no color table to read
+    // in bit mask mode.
+    if (!inIco && kBitMask_BmpInputFormat == inputFormat) {
+        if (stream->skip(offset - bytesRead) != offset - bytesRead) {
+            SkCodecPrintf("Error: unable to skip to image data.\n");
+            return false;
+        }
+    }
+
+    if (codecOut) {
+        // Set the image info
+        const SkImageInfo& imageInfo = SkImageInfo::Make(width, height,
+                colorType, alphaType);
+
+        // Return the codec
+        switch (inputFormat) {
+            case kStandard_BmpInputFormat:
+                *codecOut = new SkBmpStandardCodec(imageInfo, stream, bitsPerPixel, numColors,
+                        bytesPerColor, offset - bytesRead, rowOrder, inIco);
+                return true;
+            case kBitMask_BmpInputFormat:
+                // Bmp-in-Ico must be standard mode
+                if (inIco) {
+                    SkCodecPrintf("Error: Icos may not use bit mask format.\n");
+                    return false;
+                }
+
+                *codecOut = new SkBmpMaskCodec(imageInfo, stream, bitsPerPixel, masks.detach(),
+                        rowOrder);
+                return true;
+            case kRLE_BmpInputFormat:
+                // Bmp-in-Ico must be standard mode
+                // When inIco is true, this line cannot be reached, since we
+                // require that RLE Bmps have a valid number of totalBytes, and
+                // Icos skip the header that contains totalBytes.
+                SkASSERT(!inIco);
+                *codecOut = new SkBmpRLECodec(imageInfo, stream, bitsPerPixel, numColors,
+                        bytesPerColor, offset - bytesRead, rowOrder, RLEBytes);
+                return true;
+            default:
+                SkASSERT(false);
+                return false;
+        }
+    }
+
+    return true;
+}
+
+/*
+ * Creates a bmp decoder
+ * Reads enough of the stream to determine the image format
+ */
+SkCodec* SkBmpCodec::NewFromStream(SkStream* stream, bool inIco) {
+    SkAutoTDelete<SkStream> streamDeleter(stream);
+    SkCodec* codec = nullptr;
+    if (ReadHeader(stream, inIco, &codec)) {
+        // codec has taken ownership of stream, so we do not need to
+        // delete it.
+        SkASSERT(codec);
+        streamDeleter.detach();
+        return codec;
+    }
+    return nullptr;
+}
+
+SkBmpCodec::SkBmpCodec(const SkImageInfo& info, SkStream* stream,
+        uint16_t bitsPerPixel, SkCodec::SkScanlineOrder rowOrder)
+    : INHERITED(info, stream)
+    , fBitsPerPixel(bitsPerPixel)
+    , fRowOrder(rowOrder)
+{}
+
+bool SkBmpCodec::onRewind() {
+    return SkBmpCodec::ReadHeader(this->stream(), this->inIco(), nullptr);
+}
+
+int32_t SkBmpCodec::getDstRow(int32_t y, int32_t height) const {
+    if (SkCodec::kTopDown_SkScanlineOrder == fRowOrder) {
+        return y;
+    }
+    SkASSERT(SkCodec::kBottomUp_SkScanlineOrder == fRowOrder);
+    return height - y - 1;
+}
+
+/*
+ * Compute the number of colors in the color table
+ */
+uint32_t SkBmpCodec::computeNumColors(uint32_t numColors) {
+    // Zero is a default for maxColors
+    // Also set numColors to maxColors when it is too large
+    uint32_t maxColors = 1 << fBitsPerPixel;
+    if (numColors == 0 || numColors >= maxColors) {
+        return maxColors;
+    }
+    return numColors;
+}
+
+SkCodec::Result SkBmpCodec::onStartScanlineDecode(const SkImageInfo& dstInfo,
+        const SkCodec::Options& options, SkPMColor inputColorPtr[], int* inputColorCount) {
+    if (!conversion_possible(dstInfo, this->getInfo())) {
+        SkCodecPrintf("Error: cannot convert input type to output type.\n");
+        return kInvalidConversion;
+    }
+
+    return prepareToDecode(dstInfo, options, inputColorPtr, inputColorCount);
+}
+
+int SkBmpCodec::onGetScanlines(void* dst, int count, size_t rowBytes) {
+    // Create a new image info representing the portion of the image to decode
+    SkImageInfo rowInfo = this->dstInfo().makeWH(this->dstInfo().width(), count);
+
+    // Decode the requested rows
+    return this->decodeRows(rowInfo, dst, rowBytes, this->options());
+}
diff --git a/gfx/skia/skia/src/codec/SkBmpCodec.h b/gfx/skia/skia/src/codec/SkBmpCodec.h
new file mode 100644
index 000000000000..65662ff1f869
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkBmpCodec.h
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef SkBmpCodec_DEFINED
+#define SkBmpCodec_DEFINED
+
+#include "SkCodec.h"
+#include "SkColorTable.h"
+#include "SkImageInfo.h"
+#include "SkStream.h"
+#include "SkSwizzler.h"
+#include "SkTypes.h"
+
+/*
+ * This class enables code sharing between its bmp codec subclasses.  The
+ * subclasses actually do the work.
+ */
+class SkBmpCodec : public SkCodec {
+public:
+
+    /*
+     * Checks the start of the stream to see if the image is a bmp
+     */
+    static bool IsBmp(SkStream*);
+
+    /*
+     * Assumes IsBmp was called and returned true
+     * Creates a bmp decoder
+     * Reads enough of the stream to determine the image format
+     */
+    static SkCodec* NewFromStream(SkStream*);
+
+    /*
+     * Creates a bmp decoder for a bmp embedded in ico
+     * Reads enough of the stream to determine the image format
+     */
+    static SkCodec* NewFromIco(SkStream*);
+
+protected:
+
+    SkBmpCodec(const SkImageInfo& info, SkStream* stream, uint16_t bitsPerPixel,
+            SkCodec::SkScanlineOrder rowOrder);
+
+    SkEncodedFormat onGetEncodedFormat() const override { return kBMP_SkEncodedFormat; }
+
+    /*
+     * Read enough of the stream to initialize the SkBmpCodec. Returns a bool
+     * representing success or failure. If it returned true, and codecOut was
+     * not nullptr, it will be set to a new SkBmpCodec.
+     * Does *not* take ownership of the passed in SkStream.
+     */
+    static bool ReadHeader(SkStream*, bool inIco, SkCodec** codecOut);
+
+    bool onRewind() override;
+
+    /*
+     * Returns whether this BMP is part of an ICO image.
+     */
+    bool inIco() const {
+        return this->onInIco();
+    }
+
+    virtual bool onInIco() const {
+        return false;
+    }
+
+    /*
+     * Get the destination row number corresponding to the encoded row number.
+     * For kTopDown, we simply return y, but for kBottomUp, the rows will be
+     * decoded in reverse order.
+     *
+     * @param y      Iterates from 0 to height, indicating the current row.
+     * @param height The height of the current subset of the image that we are
+     *               decoding.  This is generally equal to the full height
+     *               when we want to decode the full or one when we are
+     *               sampling.
+     */
+    int32_t getDstRow(int32_t y, int32_t height) const;
+
+    /*
+     * Compute the number of colors in the color table
+     */
+    uint32_t computeNumColors(uint32_t numColors);
+
+    /*
+     * Accessors used by subclasses
+     */
+    uint16_t bitsPerPixel() const { return fBitsPerPixel; }
+    SkScanlineOrder onGetScanlineOrder() const override { return fRowOrder; }
+
+    /*
+     * To be overriden by bmp subclasses, which provide unique implementations.
+     * Performs subclass specific setup.
+     *
+     * @param dstInfo         Contains output information.  Height specifies
+     *                        the total number of rows that will be decoded.
+     * @param options         Additonal options to pass to the decoder.
+     * @param inputColorPtr   Client-provided memory for a color table.  Must
+     *                        be enough for 256 colors.  This will be
+     *                        populated with colors if the encoded image uses
+     *                        a color table.
+     * @param inputColorCount If the encoded image uses a color table, this
+     *                        will be set to the number of colors in the
+     *                        color table.
+     */
+    virtual SkCodec::Result prepareToDecode(const SkImageInfo& dstInfo,
+            const SkCodec::Options& options, SkPMColor inputColorPtr[],
+            int* inputColorCount) = 0;
+
+private:
+
+    /*
+     * Creates a bmp decoder
+     * Reads enough of the stream to determine the image format
+     */
+    static SkCodec* NewFromStream(SkStream*, bool inIco);
+
+    /*
+     * Decodes the next dstInfo.height() lines.
+     *
+     * onGetPixels() uses this for full image decodes.
+     * SkScaledCodec::onGetPixels() uses the scanline decoder to call this with
+     * dstInfo.height() = 1, in order to implement sampling.
+     * A potential future use is to allow the caller to decode a subset of the
+     * lines in the image.
+     *
+     * @param dstInfo     Contains output information.  Height specifies the
+     *                    number of rows to decode at this time.
+     * @param dst         Memory location to store output pixels
+     * @param dstRowBytes Bytes in a row of the destination
+     * @return            Number of rows successfully decoded
+     */
+    virtual int decodeRows(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes,
+            const Options& opts) = 0;
+
+    Result onStartScanlineDecode(const SkImageInfo& dstInfo, const SkCodec::Options&,
+            SkPMColor inputColorPtr[], int* inputColorCount) override;
+
+    int onGetScanlines(void* dst, int count, size_t rowBytes) override;
+
+    // TODO(msarett): Override default skipping with something more clever.
+
+    const uint16_t          fBitsPerPixel;
+    const SkScanlineOrder   fRowOrder;
+
+    typedef SkCodec INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/codec/SkBmpMaskCodec.cpp b/gfx/skia/skia/src/codec/SkBmpMaskCodec.cpp
new file mode 100644
index 000000000000..b173317c10a5
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkBmpMaskCodec.cpp
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkBmpMaskCodec.h"
+#include "SkCodecPriv.h"
+#include "SkColorPriv.h"
+
+/*
+ * Creates an instance of the decoder
+ */
+SkBmpMaskCodec::SkBmpMaskCodec(const SkImageInfo& info, SkStream* stream,
+                               uint16_t bitsPerPixel, SkMasks* masks,
+                               SkCodec::SkScanlineOrder rowOrder)
+    : INHERITED(info, stream, bitsPerPixel, rowOrder)
+    , fMasks(masks)
+    , fMaskSwizzler(nullptr)
+    , fSrcRowBytes(SkAlign4(compute_row_bytes(this->getInfo().width(), this->bitsPerPixel())))
+    , fSrcBuffer(new uint8_t [fSrcRowBytes])
+{}
+
+/*
+ * Initiates the bitmap decode
+ */
+SkCodec::Result SkBmpMaskCodec::onGetPixels(const SkImageInfo& dstInfo,
+                                            void* dst, size_t dstRowBytes,
+                                            const Options& opts,
+                                            SkPMColor* inputColorPtr,
+                                            int* inputColorCount,
+                                            int* rowsDecoded) {
+    if (opts.fSubset) {
+        // Subsets are not supported.
+        return kUnimplemented;
+    }
+    if (dstInfo.dimensions() != this->getInfo().dimensions()) {
+        SkCodecPrintf("Error: scaling not supported.\n");
+        return kInvalidScale;
+    }
+
+    if (!conversion_possible(dstInfo, this->getInfo())) {
+        SkCodecPrintf("Error: cannot convert input type to output type.\n");
+        return kInvalidConversion;
+    }
+
+    Result result = this->prepareToDecode(dstInfo, opts, inputColorPtr, inputColorCount);
+    if (kSuccess != result) {
+        return result;
+    }
+
+    int rows = this->decodeRows(dstInfo, dst, dstRowBytes, opts);
+    if (rows != dstInfo.height()) {
+        *rowsDecoded = rows;
+        return kIncompleteInput;
+    }
+    return kSuccess;
+}
+
+bool SkBmpMaskCodec::initializeSwizzler(const SkImageInfo& dstInfo, const Options& options) {
+    // Create the swizzler
+    fMaskSwizzler.reset(SkMaskSwizzler::CreateMaskSwizzler(dstInfo, this->getInfo(), fMasks,
+            this->bitsPerPixel(), options));
+
+    if (nullptr == fMaskSwizzler.get()) {
+        return false;
+    }
+
+    return true;
+}
+
+SkCodec::Result SkBmpMaskCodec::prepareToDecode(const SkImageInfo& dstInfo,
+        const SkCodec::Options& options, SkPMColor inputColorPtr[], int* inputColorCount) {
+    // Initialize a the mask swizzler
+    if (!this->initializeSwizzler(dstInfo, options)) {
+        SkCodecPrintf("Error: cannot initialize swizzler.\n");
+        return SkCodec::kInvalidConversion;
+    }
+
+    return SkCodec::kSuccess;
+}
+
+/*
+ * Performs the decoding
+ */
+int SkBmpMaskCodec::decodeRows(const SkImageInfo& dstInfo,
+                                           void* dst, size_t dstRowBytes,
+                                           const Options& opts) {
+    // Iterate over rows of the image
+    uint8_t* srcRow = fSrcBuffer.get();
+    const int height = dstInfo.height();
+    for (int y = 0; y < height; y++) {
+        // Read a row of the input
+        if (this->stream()->read(srcRow, fSrcRowBytes) != fSrcRowBytes) {
+            SkCodecPrintf("Warning: incomplete input stream.\n");
+            return y;
+        }
+
+        // Decode the row in destination format
+        uint32_t row = this->getDstRow(y, height);
+        void* dstRow = SkTAddOffset<void>(dst, row * dstRowBytes);
+        fMaskSwizzler->swizzle(dstRow, srcRow);
+    }
+
+    // Finished decoding the entire image
+    return height;
+}
diff --git a/gfx/skia/skia/src/codec/SkBmpMaskCodec.h b/gfx/skia/skia/src/codec/SkBmpMaskCodec.h
new file mode 100644
index 000000000000..4ec868db0e9c
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkBmpMaskCodec.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkBmpCodec.h"
+#include "SkImageInfo.h"
+#include "SkMaskSwizzler.h"
+#include "SkTypes.h"
+
+/*
+ * This class implements the decoding for bmp images using bit masks
+ */
+class SkBmpMaskCodec : public SkBmpCodec {
+public:
+
+    /*
+     * Creates an instance of the decoder
+     *
+     * Called only by SkBmpCodec::NewFromStream
+     * There should be no other callers despite this being public
+     *
+     * @param srcInfo contains the source width and height
+     * @param stream the stream of encoded image data
+     * @param bitsPerPixel the number of bits used to store each pixel
+     * @param masks color masks for certain bmp formats
+     * @param rowOrder indicates whether rows are ordered top-down or bottom-up
+     */
+    SkBmpMaskCodec(const SkImageInfo& srcInfo, SkStream* stream,
+            uint16_t bitsPerPixel, SkMasks* masks,
+            SkCodec::SkScanlineOrder rowOrder);
+
+protected:
+
+    Result onGetPixels(const SkImageInfo& dstInfo, void* dst,
+                       size_t dstRowBytes, const Options&, SkPMColor*,
+                       int*, int*) override;
+
+    SkCodec::Result prepareToDecode(const SkImageInfo& dstInfo,
+            const SkCodec::Options& options, SkPMColor inputColorPtr[],
+            int* inputColorCount) override;
+
+private:
+
+    bool initializeSwizzler(const SkImageInfo& dstInfo, const Options& options);
+    SkSampler* getSampler(bool createIfNecessary) override {
+        SkASSERT(fMaskSwizzler);
+        return fMaskSwizzler;
+    }
+
+    int decodeRows(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes,
+            const Options& opts) override;
+
+    SkAutoTDelete<SkMasks>              fMasks;        // owned
+    SkAutoTDelete<SkMaskSwizzler>       fMaskSwizzler;
+    const size_t                        fSrcRowBytes;
+    SkAutoTDeleteArray<uint8_t>         fSrcBuffer;
+
+    typedef SkBmpCodec INHERITED;
+};
diff --git a/gfx/skia/skia/src/codec/SkBmpRLECodec.cpp b/gfx/skia/skia/src/codec/SkBmpRLECodec.cpp
new file mode 100644
index 000000000000..4cee274ffecc
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkBmpRLECodec.cpp
@@ -0,0 +1,514 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkBmpRLECodec.h"
+#include "SkCodecPriv.h"
+#include "SkColorPriv.h"
+#include "SkStream.h"
+
+/*
+ * Creates an instance of the decoder
+ * Called only by NewFromStream
+ */
+SkBmpRLECodec::SkBmpRLECodec(const SkImageInfo& info, SkStream* stream,
+                             uint16_t bitsPerPixel, uint32_t numColors,
+                             uint32_t bytesPerColor, uint32_t offset,
+                             SkCodec::SkScanlineOrder rowOrder,
+                             size_t RLEBytes)
+    : INHERITED(info, stream, bitsPerPixel, rowOrder)
+    , fColorTable(nullptr)
+    , fNumColors(this->computeNumColors(numColors))
+    , fBytesPerColor(bytesPerColor)
+    , fOffset(offset)
+    , fStreamBuffer(new uint8_t[RLEBytes])
+    , fRLEBytes(RLEBytes)
+    , fCurrRLEByte(0)
+    , fSampleX(1)
+{}
+
+/*
+ * Initiates the bitmap decode
+ */
+SkCodec::Result SkBmpRLECodec::onGetPixels(const SkImageInfo& dstInfo,
+                                           void* dst, size_t dstRowBytes,
+                                           const Options& opts,
+                                           SkPMColor* inputColorPtr,
+                                           int* inputColorCount,
+                                           int* rowsDecoded) {
+    if (opts.fSubset) {
+        // Subsets are not supported.
+        return kUnimplemented;
+    }
+    if (!conversion_possible(dstInfo, this->getInfo())) {
+        SkCodecPrintf("Error: cannot convert input type to output type.\n");
+        return kInvalidConversion;
+    }
+
+    Result result = this->prepareToDecode(dstInfo, opts, inputColorPtr, inputColorCount);
+    if (kSuccess != result) {
+        return result;
+    }
+
+    // Perform the decode
+    int rows = this->decodeRows(dstInfo, dst, dstRowBytes, opts);
+    if (rows != dstInfo.height()) {
+        // We set rowsDecoded equal to the height because the background has already
+        // been filled.  RLE encodings sometimes skip pixels, so we always start by
+        // filling the background.
+        *rowsDecoded = dstInfo.height();
+        return kIncompleteInput;
+    }
+
+    return kSuccess;
+}
+
+/*
+ * Process the color table for the bmp input
+ */
+ bool SkBmpRLECodec::createColorTable(int* numColors) {
+    // Allocate memory for color table
+    uint32_t colorBytes = 0;
+    SkPMColor colorTable[256];
+    if (this->bitsPerPixel() <= 8) {
+        // Inform the caller of the number of colors
+        uint32_t maxColors = 1 << this->bitsPerPixel();
+        if (nullptr != numColors) {
+            // We set the number of colors to maxColors in order to ensure
+            // safe memory accesses.  Otherwise, an invalid pixel could
+            // access memory outside of our color table array.
+            *numColors = maxColors;
+        }
+
+        // Read the color table from the stream
+        colorBytes = fNumColors * fBytesPerColor;
+        SkAutoTDeleteArray<uint8_t> cBuffer(new uint8_t[colorBytes]);
+        if (stream()->read(cBuffer.get(), colorBytes) != colorBytes) {
+            SkCodecPrintf("Error: unable to read color table.\n");
+            return false;
+        }
+
+        // Fill in the color table
+        uint32_t i = 0;
+        for (; i < fNumColors; i++) {
+            uint8_t blue = get_byte(cBuffer.get(), i*fBytesPerColor);
+            uint8_t green = get_byte(cBuffer.get(), i*fBytesPerColor + 1);
+            uint8_t red = get_byte(cBuffer.get(), i*fBytesPerColor + 2);
+            colorTable[i] = SkPackARGB32NoCheck(0xFF, red, green, blue);
+        }
+
+        // To avoid segmentation faults on bad pixel data, fill the end of the
+        // color table with black.  This is the same the behavior as the
+        // chromium decoder.
+        for (; i < maxColors; i++) {
+            colorTable[i] = SkPackARGB32NoCheck(0xFF, 0, 0, 0);
+        }
+
+        // Set the color table
+        fColorTable.reset(new SkColorTable(colorTable, maxColors));
+    }
+
+    // Check that we have not read past the pixel array offset
+    if(fOffset < colorBytes) {
+        // This may occur on OS 2.1 and other old versions where the color
+        // table defaults to max size, and the bmp tries to use a smaller
+        // color table.  This is invalid, and our decision is to indicate
+        // an error, rather than try to guess the intended size of the
+        // color table.
+        SkCodecPrintf("Error: pixel data offset less than color table size.\n");
+        return false;
+    }
+
+    // After reading the color table, skip to the start of the pixel array
+    if (stream()->skip(fOffset - colorBytes) != fOffset - colorBytes) {
+        SkCodecPrintf("Error: unable to skip to image data.\n");
+        return false;
+    }
+
+    // Return true on success
+    return true;
+}
+
+bool SkBmpRLECodec::initializeStreamBuffer() {
+    // Setup a buffer to contain the full input stream
+    // TODO (msarett): I'm not sure it is smart or optimal to trust fRLEBytes (read from header)
+    //                 as the size of our buffer.  First of all, the decode fails if fRLEBytes is
+    //                 corrupt (negative, zero, or small) when we might be able to decode
+    //                 successfully with a fixed size buffer.  Additionally, we would save memory
+    //                 using a fixed size buffer if the RLE encoding is large.  On the other hand,
+    //                 we may also waste memory with a fixed size buffer.  And determining a
+    //                 minimum size for our buffer would depend on the image width (so it's not
+    //                 really "fixed" size), and we may end up allocating a buffer that is
+    //                 generally larger than the average encoded size anyway.
+    size_t totalBytes = this->stream()->read(fStreamBuffer.get(), fRLEBytes);
+    if (totalBytes < fRLEBytes) {
+        fRLEBytes = totalBytes;
+        SkCodecPrintf("Warning: incomplete RLE file.\n");
+    }
+    if (fRLEBytes == 0) {
+        SkCodecPrintf("Error: could not read RLE image data.\n");
+        return false;
+    }
+    fCurrRLEByte = 0;
+    return true;
+}
+
+/*
+ * Before signalling kIncompleteInput, we should attempt to load the
+ * stream buffer with additional data.
+ *
+ * @return the number of bytes remaining in the stream buffer after
+ *         attempting to read more bytes from the stream
+ */
+size_t SkBmpRLECodec::checkForMoreData() {
+    const size_t remainingBytes = fRLEBytes - fCurrRLEByte;
+    uint8_t* buffer = fStreamBuffer.get();
+
+    // We will be reusing the same buffer, starting over from the beginning.
+    // Move any remaining bytes to the start of the buffer.
+    // We use memmove() instead of memcpy() because there is risk that the dst
+    // and src memory will overlap in corrupt images.
+    memmove(buffer, SkTAddOffset<uint8_t>(buffer, fCurrRLEByte), remainingBytes);
+
+    // Adjust the buffer ptr to the start of the unfilled data.
+    buffer += remainingBytes;
+
+    // Try to read additional bytes from the stream.  There are fCurrRLEByte
+    // bytes of additional space remaining in the buffer, assuming that we
+    // have already copied remainingBytes to the start of the buffer.
+    size_t additionalBytes = this->stream()->read(buffer, fCurrRLEByte);
+
+    // Update counters and return the number of bytes we currently have
+    // available.  We are at the start of the buffer again.
+    fCurrRLEByte = 0;
+    // If we were unable to fill the buffer, fRLEBytes is no longer equal to
+    // the size of the buffer.  There will be unused space at the end.  This
+    // should be fine, given that there are no more bytes in the stream.
+    fRLEBytes = remainingBytes + additionalBytes;
+    return fRLEBytes;
+}
+
+/*
+ * Set an RLE pixel using the color table
+ */
+void SkBmpRLECodec::setPixel(void* dst, size_t dstRowBytes,
+                             const SkImageInfo& dstInfo, uint32_t x, uint32_t y,
+                             uint8_t index) {
+    if (is_coord_necessary(x, fSampleX, dstInfo.width())) {
+        // Set the row
+        uint32_t row = this->getDstRow(y, dstInfo.height());
+
+        // Set the pixel based on destination color type
+        const int dstX = get_dst_coord(x, fSampleX);
+        switch (dstInfo.colorType()) {
+            case kN32_SkColorType: {
+                SkPMColor* dstRow = SkTAddOffset<SkPMColor>(dst, row * (int) dstRowBytes);
+                dstRow[dstX] = fColorTable->operator[](index);
+                break;
+            }
+            case kRGB_565_SkColorType: {
+                uint16_t* dstRow = SkTAddOffset<uint16_t>(dst, row * (int) dstRowBytes);
+                dstRow[dstX] = SkPixel32ToPixel16(fColorTable->operator[](index));
+                break;
+            }
+            default:
+                // This case should not be reached.  We should catch an invalid
+                // color type when we check that the conversion is possible.
+                SkASSERT(false);
+                break;
+        }
+    }
+}
+
+/*
+ * Set an RLE pixel from R, G, B values
+ */
+void SkBmpRLECodec::setRGBPixel(void* dst, size_t dstRowBytes,
+                                const SkImageInfo& dstInfo, uint32_t x,
+                                uint32_t y, uint8_t red, uint8_t green,
+                                uint8_t blue) {
+    if (is_coord_necessary(x, fSampleX, dstInfo.width())) {
+        // Set the row
+        uint32_t row = this->getDstRow(y, dstInfo.height());
+
+        // Set the pixel based on destination color type
+        const int dstX = get_dst_coord(x, fSampleX);
+        switch (dstInfo.colorType()) {
+            case kN32_SkColorType: {
+                SkPMColor* dstRow = SkTAddOffset<SkPMColor>(dst, row * (int) dstRowBytes);
+                dstRow[dstX] = SkPackARGB32NoCheck(0xFF, red, green, blue);
+                break;
+            }
+            case kRGB_565_SkColorType: {
+                uint16_t* dstRow = SkTAddOffset<uint16_t>(dst, row * (int) dstRowBytes);
+                dstRow[dstX] = SkPack888ToRGB16(red, green, blue);
+                break;
+            }
+            default:
+                // This case should not be reached.  We should catch an invalid
+                // color type when we check that the conversion is possible.
+                SkASSERT(false);
+                break;
+        }
+    }
+}
+
+SkCodec::Result SkBmpRLECodec::prepareToDecode(const SkImageInfo& dstInfo,
+        const SkCodec::Options& options, SkPMColor inputColorPtr[], int* inputColorCount) {
+    // FIXME: Support subsets for scanline decodes.
+    if (options.fSubset) {
+        // Subsets are not supported.
+        return kUnimplemented;
+    }
+
+    // Reset fSampleX. If it needs to be a value other than 1, it will get modified by
+    // the sampler.
+    fSampleX = 1;
+    // Create the color table if necessary and prepare the stream for decode
+    // Note that if it is non-NULL, inputColorCount will be modified
+    if (!this->createColorTable(inputColorCount)) {
+        SkCodecPrintf("Error: could not create color table.\n");
+        return SkCodec::kInvalidInput;
+    }
+
+    // Copy the color table to the client if necessary
+    copy_color_table(dstInfo, this->fColorTable, inputColorPtr, inputColorCount);
+
+    // Initialize a buffer for encoded RLE data
+    if (!this->initializeStreamBuffer()) {
+        SkCodecPrintf("Error: cannot initialize stream buffer.\n");
+        return SkCodec::kInvalidConversion;
+    }
+
+    return SkCodec::kSuccess;
+}
+
+/*
+ * Performs the bitmap decoding for RLE input format
+ * RLE decoding is performed all at once, rather than a one row at a time
+ */
+int SkBmpRLECodec::decodeRows(const SkImageInfo& info, void* dst, size_t dstRowBytes,
+        const Options& opts) {
+    // Set RLE flags
+    static const uint8_t RLE_ESCAPE = 0;
+    static const uint8_t RLE_EOL = 0;
+    static const uint8_t RLE_EOF = 1;
+    static const uint8_t RLE_DELTA = 2;
+
+    // Set constant values
+    const int width = this->getInfo().width();
+    const int height = info.height();
+
+    // Account for sampling.
+    SkImageInfo dstInfo = info.makeWH(get_scaled_dimension(width, fSampleX), height);
+
+    // Destination parameters
+    int x = 0;
+    int y = 0;
+
+    // Set the background as transparent.  Then, if the RLE code skips pixels,
+    // the skipped pixels will be transparent.
+    // Because of the need for transparent pixels, kN32 is the only color
+    // type that makes sense for the destination format.
+    SkASSERT(kN32_SkColorType == dstInfo.colorType());
+    SkSampler::Fill(dstInfo, dst, dstRowBytes, SK_ColorTRANSPARENT, opts.fZeroInitialized);
+
+    while (true) {
+        // If we have reached a row that is beyond the requested height, we have
+        // succeeded.
+        if (y >= height) {
+            // It would be better to check for the EOF marker before indicating
+            // success, but we may be performing a scanline decode, which
+            // would require us to stop before decoding the full height.
+            return height;
+        }
+
+        // Every entry takes at least two bytes
+        if ((int) fRLEBytes - fCurrRLEByte < 2) {
+            SkCodecPrintf("Warning: might be incomplete RLE input.\n");
+            if (this->checkForMoreData() < 2) {
+                return y;
+            }
+        }
+
+        // Read the next two bytes.  These bytes have different meanings
+        // depending on their values.  In the first interpretation, the first
+        // byte is an escape flag and the second byte indicates what special
+        // task to perform.
+        const uint8_t flag = fStreamBuffer.get()[fCurrRLEByte++];
+        const uint8_t task = fStreamBuffer.get()[fCurrRLEByte++];
+
+        // Perform decoding
+        if (RLE_ESCAPE == flag) {
+            switch (task) {
+                case RLE_EOL:
+                    x = 0;
+                    y++;
+                    break;
+                case RLE_EOF:
+                    return height;
+                case RLE_DELTA: {
+                    // Two bytes are needed to specify delta
+                    if ((int) fRLEBytes - fCurrRLEByte < 2) {
+                        SkCodecPrintf("Warning: might be incomplete RLE input.\n");
+                        if (this->checkForMoreData() < 2) {
+                            return y;
+                        }
+                    }
+                    // Modify x and y
+                    const uint8_t dx = fStreamBuffer.get()[fCurrRLEByte++];
+                    const uint8_t dy = fStreamBuffer.get()[fCurrRLEByte++];
+                    x += dx;
+                    y += dy;
+                    if (x > width || y > height) {
+                        SkCodecPrintf("Warning: invalid RLE input.\n");
+                        return y - dy;
+                    }
+                    break;
+                }
+                default: {
+                    // If task does not match any of the above signals, it
+                    // indicates that we have a sequence of non-RLE pixels.
+                    // Furthermore, the value of task is equal to the number
+                    // of pixels to interpret.
+                    uint8_t numPixels = task;
+                    const size_t rowBytes = compute_row_bytes(numPixels,
+                            this->bitsPerPixel());
+                    // Abort if setting numPixels moves us off the edge of the
+                    // image.
+                    if (x + numPixels > width) {
+                        SkCodecPrintf("Warning: invalid RLE input.\n");
+                        return y;
+                    }
+                    // Also abort if there are not enough bytes
+                    // remaining in the stream to set numPixels.
+                    if ((int) fRLEBytes - fCurrRLEByte < SkAlign2(rowBytes)) {
+                        SkCodecPrintf("Warning: might be incomplete RLE input.\n");
+                        if (this->checkForMoreData() < SkAlign2(rowBytes)) {
+                            return y;
+                        }
+                    }
+                    // Set numPixels number of pixels
+                    while (numPixels > 0) {
+                        switch(this->bitsPerPixel()) {
+                            case 4: {
+                                SkASSERT(fCurrRLEByte < fRLEBytes);
+                                uint8_t val = fStreamBuffer.get()[fCurrRLEByte++];
+                                setPixel(dst, dstRowBytes, dstInfo, x++,
+                                        y, val >> 4);
+                                numPixels--;
+                                if (numPixels != 0) {
+                                    setPixel(dst, dstRowBytes, dstInfo,
+                                            x++, y, val & 0xF);
+                                    numPixels--;
+                                }
+                                break;
+                            }
+                            case 8:
+                                SkASSERT(fCurrRLEByte < fRLEBytes);
+                                setPixel(dst, dstRowBytes, dstInfo, x++,
+                                        y, fStreamBuffer.get()[fCurrRLEByte++]);
+                                numPixels--;
+                                break;
+                            case 24: {
+                                SkASSERT(fCurrRLEByte + 2 < fRLEBytes);
+                                uint8_t blue = fStreamBuffer.get()[fCurrRLEByte++];
+                                uint8_t green = fStreamBuffer.get()[fCurrRLEByte++];
+                                uint8_t red = fStreamBuffer.get()[fCurrRLEByte++];
+                                setRGBPixel(dst, dstRowBytes, dstInfo,
+                                            x++, y, red, green, blue);
+                                numPixels--;
+                            }
+                            default:
+                                SkASSERT(false);
+                                return y;
+                        }
+                    }
+                    // Skip a byte if necessary to maintain alignment
+                    if (!SkIsAlign2(rowBytes)) {
+                        fCurrRLEByte++;
+                    }
+                    break;
+                }
+            }
+        } else {
+            // If the first byte read is not a flag, it indicates the number of
+            // pixels to set in RLE mode.
+            const uint8_t numPixels = flag;
+            const int endX = SkTMin<int>(x + numPixels, width);
+
+            if (24 == this->bitsPerPixel()) {
+                // In RLE24, the second byte read is part of the pixel color.
+                // There are two more required bytes to finish encoding the
+                // color.
+                if ((int) fRLEBytes - fCurrRLEByte < 2) {
+                    SkCodecPrintf("Warning: might be incomplete RLE input.\n");
+                    if (this->checkForMoreData() < 2) {
+                        return y;
+                    }
+                }
+
+                // Fill the pixels up to endX with the specified color
+                uint8_t blue = task;
+                uint8_t green = fStreamBuffer.get()[fCurrRLEByte++];
+                uint8_t red = fStreamBuffer.get()[fCurrRLEByte++];
+                while (x < endX) {
+                    setRGBPixel(dst, dstRowBytes, dstInfo, x++, y, red, green, blue);
+                }
+            } else {
+                // In RLE8 or RLE4, the second byte read gives the index in the
+                // color table to look up the pixel color.
+                // RLE8 has one color index that gets repeated
+                // RLE4 has two color indexes in the upper and lower 4 bits of
+                // the bytes, which are alternated
+                uint8_t indices[2] = { task, task };
+                if (4 == this->bitsPerPixel()) {
+                    indices[0] >>= 4;
+                    indices[1] &= 0xf;
+                }
+
+                // Set the indicated number of pixels
+                for (int which = 0; x < endX; x++) {
+                    setPixel(dst, dstRowBytes, dstInfo, x, y, indices[which]);
+                    which = !which;
+                }
+            }
+        }
+    }
+}
+
+// FIXME: Make SkBmpRLECodec have no knowledge of sampling.
+//        Or it should do all sampling natively.
+//        It currently is a hybrid that needs to know what SkScaledCodec is doing.
+class SkBmpRLESampler : public SkSampler {
+public:
+    SkBmpRLESampler(SkBmpRLECodec* codec)
+        : fCodec(codec)
+    {
+        SkASSERT(fCodec);
+    }
+
+private:
+    int onSetSampleX(int sampleX) override {
+        return fCodec->setSampleX(sampleX);
+    }
+
+    // Unowned pointer. fCodec will delete this class in its destructor.
+    SkBmpRLECodec* fCodec;
+};
+
+SkSampler* SkBmpRLECodec::getSampler(bool createIfNecessary) {
+    if (!fSampler && createIfNecessary) {
+        fSampler.reset(new SkBmpRLESampler(this));
+    }
+
+    return fSampler;
+}
+
+int SkBmpRLECodec::setSampleX(int sampleX){
+    fSampleX = sampleX;
+    return get_scaled_dimension(this->getInfo().width(), sampleX);
+}
diff --git a/gfx/skia/skia/src/codec/SkBmpRLECodec.h b/gfx/skia/skia/src/codec/SkBmpRLECodec.h
new file mode 100644
index 000000000000..fcf910d8e5e7
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkBmpRLECodec.h
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkBmpCodec.h"
+#include "SkColorTable.h"
+#include "SkImageInfo.h"
+#include "SkSampler.h"
+#include "SkTypes.h"
+
+/*
+ * This class implements the decoding for bmp images that use an RLE encoding
+ */
+class SkBmpRLECodec : public SkBmpCodec {
+public:
+
+    /*
+     * Creates an instance of the decoder
+     *
+     * Called only by SkBmpCodec::NewFromStream
+     * There should be no other callers despite this being public
+     *
+     * @param srcInfo contains the source width and height
+     * @param stream the stream of encoded image data
+     * @param bitsPerPixel the number of bits used to store each pixel
+     * @param numColors the number of colors in the color table
+     * @param bytesPerColor the number of bytes in the stream used to represent
+                            each color in the color table
+     * @param offset the offset of the image pixel data from the end of the
+     *               headers
+     * @param rowOrder indicates whether rows are ordered top-down or bottom-up
+     * @param RLEBytes indicates the amount of data left in the stream
+     *                 after decoding the headers
+     */
+    SkBmpRLECodec(const SkImageInfo& srcInfo, SkStream* stream,
+            uint16_t bitsPerPixel, uint32_t numColors, uint32_t bytesPerColor,
+            uint32_t offset, SkCodec::SkScanlineOrder rowOrder,
+            size_t RLEBytes);
+
+    int setSampleX(int);
+
+protected:
+
+    Result onGetPixels(const SkImageInfo& dstInfo, void* dst,
+                       size_t dstRowBytes, const Options&, SkPMColor*,
+                       int*, int*) override;
+
+    SkCodec::Result prepareToDecode(const SkImageInfo& dstInfo,
+            const SkCodec::Options& options, SkPMColor inputColorPtr[],
+            int* inputColorCount) override;
+
+private:
+
+    /*
+     * Creates the color table
+     * Sets colorCount to the new color count if it is non-nullptr
+     */
+    bool createColorTable(int* colorCount);
+
+    bool initializeStreamBuffer();
+
+    /*
+     * Before signalling kIncompleteInput, we should attempt to load the
+     * stream buffer with additional data.
+     *
+     * @return the number of bytes remaining in the stream buffer after
+     *         attempting to read more bytes from the stream
+     */
+    size_t checkForMoreData();
+
+    /*
+     * Set an RLE pixel using the color table
+     */
+    void setPixel(void* dst, size_t dstRowBytes,
+                  const SkImageInfo& dstInfo, uint32_t x, uint32_t y,
+                  uint8_t index);
+    /*
+     * Set an RLE24 pixel from R, G, B values
+     */
+    void setRGBPixel(void* dst, size_t dstRowBytes,
+                     const SkImageInfo& dstInfo, uint32_t x, uint32_t y,
+                     uint8_t red, uint8_t green, uint8_t blue);
+
+    int decodeRows(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes,
+            const Options& opts) override;
+
+    SkSampler* getSampler(bool createIfNecessary) override;
+
+    SkAutoTUnref<SkColorTable>          fColorTable;    // owned
+    const uint32_t                      fNumColors;
+    const uint32_t                      fBytesPerColor;
+    const uint32_t                      fOffset;
+    SkAutoTDeleteArray<uint8_t>         fStreamBuffer;
+    size_t                              fRLEBytes;
+    uint32_t                            fCurrRLEByte;
+    int                                 fSampleX;
+    SkAutoTDelete<SkSampler>            fSampler;
+
+    typedef SkBmpCodec INHERITED;
+};
diff --git a/gfx/skia/skia/src/codec/SkBmpStandardCodec.cpp b/gfx/skia/skia/src/codec/SkBmpStandardCodec.cpp
new file mode 100644
index 000000000000..fd4d6d18bc2d
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkBmpStandardCodec.cpp
@@ -0,0 +1,298 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkBmpStandardCodec.h"
+#include "SkCodecPriv.h"
+#include "SkColorPriv.h"
+#include "SkStream.h"
+
+/*
+ * Creates an instance of the decoder
+ * Called only by NewFromStream
+ */
+SkBmpStandardCodec::SkBmpStandardCodec(const SkImageInfo& info, SkStream* stream,
+                                       uint16_t bitsPerPixel, uint32_t numColors,
+                                       uint32_t bytesPerColor, uint32_t offset,
+                                       SkCodec::SkScanlineOrder rowOrder, bool inIco)
+    : INHERITED(info, stream, bitsPerPixel, rowOrder)
+    , fColorTable(nullptr)
+    , fNumColors(this->computeNumColors(numColors))
+    , fBytesPerColor(bytesPerColor)
+    , fOffset(offset)
+    , fSwizzler(nullptr)
+    , fSrcRowBytes(SkAlign4(compute_row_bytes(this->getInfo().width(), this->bitsPerPixel())))
+    , fSrcBuffer(new uint8_t [fSrcRowBytes])
+    , fInIco(inIco)
+{}
+
+/*
+ * Initiates the bitmap decode
+ */
+SkCodec::Result SkBmpStandardCodec::onGetPixels(const SkImageInfo& dstInfo,
+                                        void* dst, size_t dstRowBytes,
+                                        const Options& opts,
+                                        SkPMColor* inputColorPtr,
+                                        int* inputColorCount,
+                                        int* rowsDecoded) {
+    if (opts.fSubset) {
+        // Subsets are not supported.
+        return kUnimplemented;
+    }
+    if (dstInfo.dimensions() != this->getInfo().dimensions()) {
+        SkCodecPrintf("Error: scaling not supported.\n");
+        return kInvalidScale;
+    }
+    if (!conversion_possible(dstInfo, this->getInfo())) {
+        SkCodecPrintf("Error: cannot convert input type to output type.\n");
+        return kInvalidConversion;
+    }
+
+    Result result = this->prepareToDecode(dstInfo, opts, inputColorPtr, inputColorCount);
+    if (kSuccess != result) {
+        return result;
+    }
+    int rows = this->decodeRows(dstInfo, dst, dstRowBytes, opts);
+    if (rows != dstInfo.height()) {
+        *rowsDecoded = rows;
+        return kIncompleteInput;
+    }
+    if (fInIco) {
+        return this->decodeIcoMask(dstInfo, dst, dstRowBytes);
+    }
+    return kSuccess;
+}
+
+/*
+ * Process the color table for the bmp input
+ */
+ bool SkBmpStandardCodec::createColorTable(SkAlphaType alphaType, int* numColors) {
+    // Allocate memory for color table
+    uint32_t colorBytes = 0;
+    SkPMColor colorTable[256];
+    if (this->bitsPerPixel() <= 8) {
+        // Inform the caller of the number of colors
+        uint32_t maxColors = 1 << this->bitsPerPixel();
+        if (nullptr != numColors) {
+            // We set the number of colors to maxColors in order to ensure
+            // safe memory accesses.  Otherwise, an invalid pixel could
+            // access memory outside of our color table array.
+            *numColors = maxColors;
+        }
+
+        // Read the color table from the stream
+        colorBytes = fNumColors * fBytesPerColor;
+        SkAutoTDeleteArray<uint8_t> cBuffer(new uint8_t[colorBytes]);
+        if (stream()->read(cBuffer.get(), colorBytes) != colorBytes) {
+            SkCodecPrintf("Error: unable to read color table.\n");
+            return false;
+        }
+
+        // Choose the proper packing function
+        SkPMColor (*packARGB) (uint32_t, uint32_t, uint32_t, uint32_t);
+        switch (alphaType) {
+            case kOpaque_SkAlphaType:
+            case kUnpremul_SkAlphaType:
+                packARGB = &SkPackARGB32NoCheck;
+                break;
+            case kPremul_SkAlphaType:
+                packARGB = &SkPreMultiplyARGB;
+                break;
+            default:
+                // This should not be reached because conversion possible
+                // should fail if the alpha type is not one of the above
+                // values.
+                SkASSERT(false);
+                packARGB = nullptr;
+                break;
+        }
+
+        // Fill in the color table
+        uint32_t i = 0;
+        for (; i < fNumColors; i++) {
+            uint8_t blue = get_byte(cBuffer.get(), i*fBytesPerColor);
+            uint8_t green = get_byte(cBuffer.get(), i*fBytesPerColor + 1);
+            uint8_t red = get_byte(cBuffer.get(), i*fBytesPerColor + 2);
+            uint8_t alpha;
+            if (kOpaque_SkAlphaType == alphaType) {
+                alpha = 0xFF;
+            } else {
+                alpha = get_byte(cBuffer.get(), i*fBytesPerColor + 3);
+            }
+            colorTable[i] = packARGB(alpha, red, green, blue);
+        }
+
+        // To avoid segmentation faults on bad pixel data, fill the end of the
+        // color table with black.  This is the same the behavior as the
+        // chromium decoder.
+        for (; i < maxColors; i++) {
+            colorTable[i] = SkPackARGB32NoCheck(0xFF, 0, 0, 0);
+        }
+
+        // Set the color table
+        fColorTable.reset(new SkColorTable(colorTable, maxColors));
+    }
+
+    // Bmp-in-Ico files do not use an offset to indicate where the pixel data
+    // begins.  Pixel data always begins immediately after the color table.
+    if (!fInIco) {
+        // Check that we have not read past the pixel array offset
+        if(fOffset < colorBytes) {
+            // This may occur on OS 2.1 and other old versions where the color
+            // table defaults to max size, and the bmp tries to use a smaller
+            // color table.  This is invalid, and our decision is to indicate
+            // an error, rather than try to guess the intended size of the
+            // color table.
+            SkCodecPrintf("Error: pixel data offset less than color table size.\n");
+            return false;
+        }
+
+        // After reading the color table, skip to the start of the pixel array
+        if (stream()->skip(fOffset - colorBytes) != fOffset - colorBytes) {
+            SkCodecPrintf("Error: unable to skip to image data.\n");
+            return false;
+        }
+    }
+
+    // Return true on success
+    return true;
+}
+
+bool SkBmpStandardCodec::initializeSwizzler(const SkImageInfo& dstInfo, const Options& opts) {
+    // Get swizzler configuration
+    SkSwizzler::SrcConfig config;
+    switch (this->bitsPerPixel()) {
+        case 1:
+            config = SkSwizzler::kIndex1;
+            break;
+        case 2:
+            config = SkSwizzler::kIndex2;
+            break;
+        case 4:
+            config = SkSwizzler::kIndex4;
+            break;
+        case 8:
+            config = SkSwizzler::kIndex;
+            break;
+        case 24:
+            config = SkSwizzler::kBGR;
+            break;
+        case 32:
+            if (kOpaque_SkAlphaType == dstInfo.alphaType()) {
+                config = SkSwizzler::kBGRX;
+            } else {
+                config = SkSwizzler::kBGRA;
+            }
+            break;
+        default:
+            SkASSERT(false);
+            return false;
+    }
+
+    // Get a pointer to the color table if it exists
+    const SkPMColor* colorPtr = get_color_ptr(fColorTable.get());
+
+    // Create swizzler
+    fSwizzler.reset(SkSwizzler::CreateSwizzler(config, colorPtr, dstInfo, opts));
+
+    if (nullptr == fSwizzler.get()) {
+        return false;
+    }
+    return true;
+}
+
+SkCodec::Result SkBmpStandardCodec::prepareToDecode(const SkImageInfo& dstInfo,
+        const SkCodec::Options& options, SkPMColor inputColorPtr[], int* inputColorCount) {
+    // Create the color table if necessary and prepare the stream for decode
+    // Note that if it is non-NULL, inputColorCount will be modified
+    if (!this->createColorTable(dstInfo.alphaType(), inputColorCount)) {
+        SkCodecPrintf("Error: could not create color table.\n");
+        return SkCodec::kInvalidInput;
+    }
+
+    // Copy the color table to the client if necessary
+    copy_color_table(dstInfo, this->fColorTable, inputColorPtr, inputColorCount);
+
+    // Initialize a swizzler if necessary
+    if (!this->initializeSwizzler(dstInfo, options)) {
+        SkCodecPrintf("Error: cannot initialize swizzler.\n");
+        return SkCodec::kInvalidConversion;
+    }
+    return SkCodec::kSuccess;
+}
+
+/*
+ * Performs the bitmap decoding for standard input format
+ */
+int SkBmpStandardCodec::decodeRows(const SkImageInfo& dstInfo,
+                                               void* dst, size_t dstRowBytes,
+                                               const Options& opts) {
+    // Iterate over rows of the image
+    const int height = dstInfo.height();
+    for (int y = 0; y < height; y++) {
+        // Read a row of the input
+        if (this->stream()->read(fSrcBuffer.get(), fSrcRowBytes) != fSrcRowBytes) {
+            SkCodecPrintf("Warning: incomplete input stream.\n");
+            return y;
+        }
+
+        // Decode the row in destination format
+        uint32_t row = this->getDstRow(y, dstInfo.height());
+
+        void* dstRow = SkTAddOffset<void>(dst, row * dstRowBytes);
+        fSwizzler->swizzle(dstRow, fSrcBuffer.get());
+    }
+
+    // Finished decoding the entire image
+    return height;
+}
+
+// TODO (msarett): This function will need to be modified in order to perform row by row decodes
+//                 when the Ico scanline decoder is implemented.
+SkCodec::Result SkBmpStandardCodec::decodeIcoMask(const SkImageInfo& dstInfo,
+        void* dst, size_t dstRowBytes) {
+    // BMP in ICO have transparency, so this cannot be 565, and this mask
+    // prevents us from using kIndex8. The below code depends on the output
+    // being an SkPMColor.
+    SkASSERT(dstInfo.colorType() == kN32_SkColorType);
+
+    // The AND mask is always 1 bit per pixel
+    const int width = this->getInfo().width();
+    const size_t rowBytes = SkAlign4(compute_row_bytes(width, 1));
+
+    SkPMColor* dstPtr = (SkPMColor*) dst;
+    for (int y = 0; y < dstInfo.height(); y++) {
+        // The srcBuffer will at least be large enough
+        if (stream()->read(fSrcBuffer.get(), rowBytes) != rowBytes) {
+            SkCodecPrintf("Warning: incomplete AND mask for bmp-in-ico.\n");
+            return kIncompleteInput;
+        }
+
+        int row = this->getDstRow(y, dstInfo.height());
+
+        SkPMColor* dstRow =
+                SkTAddOffset<SkPMColor>(dstPtr, row * dstRowBytes);
+
+        for (int x = 0; x < width; x++) {
+            int quotient;
+            int modulus;
+            SkTDivMod(x, 8, &quotient, &modulus);
+            uint32_t shift = 7 - modulus;
+            uint32_t alphaBit =
+                    (fSrcBuffer.get()[quotient] >> shift) & 0x1;
+            dstRow[x] &= alphaBit - 1;
+        }
+    }
+    return kSuccess;
+}
+
+uint32_t SkBmpStandardCodec::onGetFillValue(SkColorType colorType, SkAlphaType alphaType) const {
+    const SkPMColor* colorPtr = get_color_ptr(fColorTable.get());
+    if (colorPtr) {
+        return get_color_table_fill_value(colorType, colorPtr, 0);
+    }
+    return INHERITED::onGetFillValue(colorType, alphaType);
+}
diff --git a/gfx/skia/skia/src/codec/SkBmpStandardCodec.h b/gfx/skia/skia/src/codec/SkBmpStandardCodec.h
new file mode 100644
index 000000000000..d687eaad287a
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkBmpStandardCodec.h
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkBmpCodec.h"
+#include "SkColorTable.h"
+#include "SkImageInfo.h"
+#include "SkSwizzler.h"
+#include "SkTypes.h"
+
+/*
+ * This class implements the decoding for bmp images that use "standard" modes,
+ * which essentially means they do not contain bit masks or RLE codes.
+ */
+class SkBmpStandardCodec : public SkBmpCodec {
+public:
+
+    /*
+     * Creates an instance of the decoder
+     *
+     * Called only by SkBmpCodec::NewFromStream
+     * There should be no other callers despite this being public
+     *
+     * @param srcInfo contains the source width and height
+     * @param stream the stream of encoded image data
+     * @param bitsPerPixel the number of bits used to store each pixel
+     * @param format the format of the bmp file
+     * @param numColors the number of colors in the color table
+     * @param bytesPerColor the number of bytes in the stream used to represent
+                            each color in the color table
+     * @param offset the offset of the image pixel data from the end of the
+     *               headers
+     * @param rowOrder indicates whether rows are ordered top-down or bottom-up
+     */
+    SkBmpStandardCodec(const SkImageInfo& srcInfo, SkStream* stream,
+            uint16_t bitsPerPixel, uint32_t numColors, uint32_t bytesPerColor,
+            uint32_t offset, SkCodec::SkScanlineOrder rowOrder,
+            bool isIco);
+
+protected:
+
+    Result onGetPixels(const SkImageInfo& dstInfo, void* dst,
+                       size_t dstRowBytes, const Options&, SkPMColor*,
+                       int*, int*) override;
+
+    bool onInIco() const override {
+        return fInIco;
+    }
+
+    SkCodec::Result prepareToDecode(const SkImageInfo& dstInfo,
+            const SkCodec::Options& options, SkPMColor inputColorPtr[],
+            int* inputColorCount) override;
+
+
+    uint32_t onGetFillValue(SkColorType colorType, SkAlphaType alphaType) const override;
+
+    SkSampler* getSampler(bool createIfNecessary) override {
+        SkASSERT(fSwizzler);
+        return fSwizzler;
+    }
+
+private:
+
+    /*
+     * Creates the color table
+     * Sets colorCount to the new color count if it is non-nullptr
+     */
+    bool createColorTable(SkAlphaType alphaType, int* colorCount);
+
+    bool initializeSwizzler(const SkImageInfo& dstInfo, const Options& opts);
+
+    int decodeRows(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes,
+            const Options& opts) override;
+
+    Result decodeIcoMask(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes);
+
+    SkAutoTUnref<SkColorTable>          fColorTable;     // owned
+    const uint32_t                      fNumColors;
+    const uint32_t                      fBytesPerColor;
+    const uint32_t                      fOffset;
+    SkAutoTDelete<SkSwizzler>           fSwizzler;
+    const size_t                        fSrcRowBytes;
+    SkAutoTDeleteArray<uint8_t>         fSrcBuffer;
+    const bool                          fInIco;
+
+    typedef SkBmpCodec INHERITED;
+};
diff --git a/gfx/skia/skia/src/codec/SkCodec.cpp b/gfx/skia/skia/src/codec/SkCodec.cpp
new file mode 100644
index 000000000000..11eb1f984794
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkCodec.cpp
@@ -0,0 +1,361 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkBmpCodec.h"
+#include "SkCodec.h"
+#include "SkData.h"
+#include "SkCodec_libgif.h"
+#include "SkCodec_libico.h"
+#include "SkCodec_libpng.h"
+#include "SkCodec_wbmp.h"
+#include "SkCodecPriv.h"
+#if !defined(GOOGLE3)
+#include "SkJpegCodec.h"
+#endif
+#include "SkStream.h"
+#include "SkWebpCodec.h"
+
+struct DecoderProc {
+    bool (*IsFormat)(SkStream*);
+    SkCodec* (*NewFromStream)(SkStream*);
+};
+
+static const DecoderProc gDecoderProcs[] = {
+#if !defined(GOOGLE3)
+    { SkJpegCodec::IsJpeg, SkJpegCodec::NewFromStream },
+#endif
+    { SkWebpCodec::IsWebp, SkWebpCodec::NewFromStream },
+    { SkGifCodec::IsGif, SkGifCodec::NewFromStream },
+    { SkIcoCodec::IsIco, SkIcoCodec::NewFromStream },
+    { SkBmpCodec::IsBmp, SkBmpCodec::NewFromStream },
+    { SkWbmpCodec::IsWbmp, SkWbmpCodec::NewFromStream }
+};
+
+SkCodec* SkCodec::NewFromStream(SkStream* stream,
+                                SkPngChunkReader* chunkReader) {
+    if (!stream) {
+        return nullptr;
+    }
+
+    SkAutoTDelete<SkStream> streamDeleter(stream);
+    
+    SkAutoTDelete<SkCodec> codec(nullptr);
+    // PNG is special, since we want to be able to supply an SkPngChunkReader.
+    // But this code follows the same pattern as the loop.
+    const bool isPng = SkPngCodec::IsPng(stream);
+    if (!stream->rewind()) {
+        return NULL;
+    }
+    if (isPng) {
+        codec.reset(SkPngCodec::NewFromStream(streamDeleter.detach(), chunkReader));
+    } else {
+        for (DecoderProc proc : gDecoderProcs) {
+            const bool correctFormat = proc.IsFormat(stream);
+            if (!stream->rewind()) {
+                return nullptr;
+            }
+            if (correctFormat) {
+                codec.reset(proc.NewFromStream(streamDeleter.detach()));
+                break;
+            }
+        }
+    }
+
+    // Set the max size at 128 megapixels (512 MB for kN32).
+    // This is about 4x smaller than a test image that takes a few minutes for
+    // dm to decode and draw.
+    const int32_t maxSize = 1 << 27;
+    if (codec && codec->getInfo().width() * codec->getInfo().height() > maxSize) {
+        SkCodecPrintf("Error: Image size too large, cannot decode.\n");
+        return nullptr;
+    } else {
+        return codec.detach();
+    }
+}
+
+SkCodec* SkCodec::NewFromData(SkData* data, SkPngChunkReader* reader) {
+    if (!data) {
+        return nullptr;
+    }
+    return NewFromStream(new SkMemoryStream(data), reader);
+}
+
+SkCodec::SkCodec(const SkImageInfo& info, SkStream* stream)
+    : fSrcInfo(info)
+    , fStream(stream)
+    , fNeedsRewind(false)
+    , fDstInfo()
+    , fOptions()
+    , fCurrScanline(-1)
+{}
+
+SkCodec::~SkCodec() {}
+
+bool SkCodec::rewindIfNeeded() {
+    if (!fStream) {
+        // Some codecs do not have a stream, but they hold others that do. They
+        // must handle rewinding themselves.
+        return true;
+    }
+
+    // Store the value of fNeedsRewind so we can update it. Next read will
+    // require a rewind.
+    const bool needsRewind = fNeedsRewind;
+    fNeedsRewind = true;
+    if (!needsRewind) {
+        return true;
+    }
+
+    // startScanlineDecode will need to be called before decoding scanlines.
+    fCurrScanline = -1;
+
+    if (!fStream->rewind()) {
+        return false;
+    }
+
+    return this->onRewind();
+}
+
+SkCodec::Result SkCodec::getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
+                                   const Options* options, SkPMColor ctable[], int* ctableCount) {
+    if (kUnknown_SkColorType == info.colorType()) {
+        return kInvalidConversion;
+    }
+    if (nullptr == pixels) {
+        return kInvalidParameters;
+    }
+    if (rowBytes < info.minRowBytes()) {
+        return kInvalidParameters;
+    }
+
+    if (kIndex_8_SkColorType == info.colorType()) {
+        if (nullptr == ctable || nullptr == ctableCount) {
+            return kInvalidParameters;
+        }
+    } else {
+        if (ctableCount) {
+            *ctableCount = 0;
+        }
+        ctableCount = nullptr;
+        ctable = nullptr;
+    }
+
+    {
+        SkAlphaType canonical;
+        if (!SkColorTypeValidateAlphaType(info.colorType(), info.alphaType(), &canonical)
+            || canonical != info.alphaType())
+        {
+            return kInvalidConversion;
+        }
+    }
+
+    if (!this->rewindIfNeeded()) {
+        return kCouldNotRewind;
+    }
+
+    // Default options.
+    Options optsStorage;
+    if (nullptr == options) {
+        options = &optsStorage;
+    } else if (options->fSubset) {
+        SkIRect subset(*options->fSubset);
+        if (!this->onGetValidSubset(&subset) || subset != *options->fSubset) {
+            // FIXME: How to differentiate between not supporting subset at all
+            // and not supporting this particular subset?
+            return kUnimplemented;
+        }
+    }
+
+    // FIXME: Support subsets somehow? Note that this works for SkWebpCodec
+    // because it supports arbitrary scaling/subset combinations.
+    if (!this->dimensionsSupported(info.dimensions())) {
+        return kInvalidScale;
+    }
+
+    // On an incomplete decode, the subclass will specify the number of scanlines that it decoded
+    // successfully.
+    int rowsDecoded = 0;
+    const Result result = this->onGetPixels(info, pixels, rowBytes, *options, ctable, ctableCount,
+            &rowsDecoded);
+
+    if ((kIncompleteInput == result || kSuccess == result) && ctableCount) {
+        SkASSERT(*ctableCount >= 0 && *ctableCount <= 256);
+    }
+
+    // A return value of kIncompleteInput indicates a truncated image stream.
+    // In this case, we will fill any uninitialized memory with a default value.
+    // Some subclasses will take care of filling any uninitialized memory on
+    // their own.  They indicate that all of the memory has been filled by
+    // setting rowsDecoded equal to the height.
+    if (kIncompleteInput == result && rowsDecoded != info.height()) {
+        this->fillIncompleteImage(info, pixels, rowBytes, options->fZeroInitialized, info.height(),
+                rowsDecoded);
+    }
+
+    return result;
+}
+
+SkCodec::Result SkCodec::getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes) {
+    return this->getPixels(info, pixels, rowBytes, nullptr, nullptr, nullptr);
+}
+
+SkCodec::Result SkCodec::startScanlineDecode(const SkImageInfo& dstInfo,
+        const SkCodec::Options* options, SkPMColor ctable[], int* ctableCount) {
+    // Reset fCurrScanline in case of failure.
+    fCurrScanline = -1;
+    // Ensure that valid color ptrs are passed in for kIndex8 color type
+    if (kIndex_8_SkColorType == dstInfo.colorType()) {
+        if (nullptr == ctable || nullptr == ctableCount) {
+            return SkCodec::kInvalidParameters;
+        }
+    } else {
+        if (ctableCount) {
+            *ctableCount = 0;
+        }
+        ctableCount = nullptr;
+        ctable = nullptr;
+    }
+
+    if (!this->rewindIfNeeded()) {
+        return kCouldNotRewind;
+    }
+
+    // Set options.
+    Options optsStorage;
+    if (nullptr == options) {
+        options = &optsStorage;
+    } else if (options->fSubset) {
+        SkIRect size = SkIRect::MakeSize(dstInfo.dimensions());
+        if (!size.contains(*options->fSubset)) {
+            return kInvalidInput;
+        }
+
+        // We only support subsetting in the x-dimension for scanline decoder.
+        // Subsetting in the y-dimension can be accomplished using skipScanlines().
+        if (options->fSubset->top() != 0 || options->fSubset->height() != dstInfo.height()) {
+            return kInvalidInput;
+        }
+    }
+
+    // FIXME: Support subsets somehow?
+    if (!this->dimensionsSupported(dstInfo.dimensions())) {
+        return kInvalidScale;
+    }
+
+    const Result result = this->onStartScanlineDecode(dstInfo, *options, ctable, ctableCount);
+    if (result != SkCodec::kSuccess) {
+        return result;
+    }
+
+    fCurrScanline = 0;
+    fDstInfo = dstInfo;
+    fOptions = *options;
+    return kSuccess;
+}
+
+SkCodec::Result SkCodec::startScanlineDecode(const SkImageInfo& dstInfo) {
+    return this->startScanlineDecode(dstInfo, nullptr, nullptr, nullptr);
+}
+
+int SkCodec::getScanlines(void* dst, int countLines, size_t rowBytes) {
+    if (fCurrScanline < 0) {
+        return 0;
+    }
+
+    SkASSERT(!fDstInfo.isEmpty());
+    if (countLines <= 0 || fCurrScanline + countLines > fDstInfo.height()) {
+        return 0;
+    }
+
+    const int linesDecoded = this->onGetScanlines(dst, countLines, rowBytes);
+    if (linesDecoded < countLines) {
+        this->fillIncompleteImage(this->dstInfo(), dst, rowBytes, this->options().fZeroInitialized,
+                countLines, linesDecoded);
+    }
+    fCurrScanline += countLines;
+    return linesDecoded;
+}
+
+bool SkCodec::skipScanlines(int countLines) {
+    if (fCurrScanline < 0) {
+        return false;
+    }
+
+    SkASSERT(!fDstInfo.isEmpty());
+    if (countLines < 0 || fCurrScanline + countLines > fDstInfo.height()) {
+        // Arguably, we could just skip the scanlines which are remaining,
+        // and return true. We choose to return false so the client
+        // can catch their bug.
+        return false;
+    }
+
+    bool result = this->onSkipScanlines(countLines);
+    fCurrScanline += countLines;
+    return result;
+}
+
+int SkCodec::outputScanline(int inputScanline) const {
+    SkASSERT(0 <= inputScanline && inputScanline < this->getInfo().height());
+    return this->onOutputScanline(inputScanline);
+}
+
+int SkCodec::onOutputScanline(int inputScanline) const {
+    switch (this->getScanlineOrder()) {
+        case kTopDown_SkScanlineOrder:
+        case kNone_SkScanlineOrder:
+            return inputScanline;
+        case kBottomUp_SkScanlineOrder:
+            return this->getInfo().height() - inputScanline - 1;
+        default:
+            // This case indicates an interlaced gif and is implemented by SkGifCodec.
+            SkASSERT(false);
+            return 0;
+    }
+}
+
+static void fill_proc(const SkImageInfo& info, void* dst, size_t rowBytes,
+        uint32_t colorOrIndex, SkCodec::ZeroInitialized zeroInit, SkSampler* sampler) {
+    if (sampler) {
+        sampler->fill(info, dst, rowBytes, colorOrIndex, zeroInit);
+    } else {
+        SkSampler::Fill(info, dst, rowBytes, colorOrIndex, zeroInit);
+    }
+}
+
+void SkCodec::fillIncompleteImage(const SkImageInfo& info, void* dst, size_t rowBytes,
+        ZeroInitialized zeroInit, int linesRequested, int linesDecoded) {
+
+    void* fillDst;
+    const uint32_t fillValue = this->getFillValue(info.colorType(), info.alphaType());
+    const int linesRemaining = linesRequested - linesDecoded;
+    SkSampler* sampler = this->getSampler(false);
+
+    switch (this->getScanlineOrder()) {
+        case kTopDown_SkScanlineOrder:
+        case kNone_SkScanlineOrder: {
+            const SkImageInfo fillInfo = info.makeWH(info.width(), linesRemaining);
+            fillDst = SkTAddOffset<void>(dst, linesDecoded * rowBytes);
+            fill_proc(fillInfo, fillDst, rowBytes, fillValue, zeroInit, sampler);
+            break;
+        }
+        case kBottomUp_SkScanlineOrder: {
+            fillDst = dst;
+            const SkImageInfo fillInfo = info.makeWH(info.width(), linesRemaining);
+            fill_proc(fillInfo, fillDst, rowBytes, fillValue, zeroInit, sampler);
+            break;
+        }
+        case kOutOfOrder_SkScanlineOrder: {
+            SkASSERT(1 == linesRequested || this->getInfo().height() == linesRequested);
+            const SkImageInfo fillInfo = info.makeWH(info.width(), 1);
+            for (int srcY = linesDecoded; srcY < linesRequested; srcY++) {
+                fillDst = SkTAddOffset<void>(dst, this->outputScanline(srcY) * rowBytes);
+                fill_proc(fillInfo, fillDst, rowBytes, fillValue, zeroInit, sampler);
+            }
+            break;
+        }
+    }
+}
diff --git a/gfx/skia/skia/src/codec/SkCodecPriv.h b/gfx/skia/skia/src/codec/SkCodecPriv.h
new file mode 100644
index 000000000000..1b6723fd4afc
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkCodecPriv.h
@@ -0,0 +1,256 @@
+/*
+ * Copyright 2015 The Android Open Source Project
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkCodecPriv_DEFINED
+#define SkCodecPriv_DEFINED
+
+#include "SkColorPriv.h"
+#include "SkColorTable.h"
+#include "SkImageInfo.h"
+#include "SkSwizzler.h"
+#include "SkTypes.h"
+#include "SkUtils.h"
+
+/*
+ *
+ * Helper routine for alpha result codes
+ *
+ */
+#define INIT_RESULT_ALPHA                       \
+    uint8_t zeroAlpha = 0;                      \
+    uint8_t maxAlpha = 0xFF;
+
+#define UPDATE_RESULT_ALPHA(alpha)              \
+    zeroAlpha |= (alpha);                       \
+    maxAlpha  &= (alpha);
+
+#define COMPUTE_RESULT_ALPHA                    \
+    SkSwizzler::GetResult(zeroAlpha, maxAlpha);
+
+// FIXME: Consider sharing with dm, nanbench, and tools.
+inline float get_scale_from_sample_size(int sampleSize) {
+    return 1.0f / ((float) sampleSize);
+}
+
+inline bool is_valid_subset(const SkIRect& subset, const SkISize& imageDims) {
+    return SkIRect::MakeSize(imageDims).contains(subset);
+}
+
+/*
+ * returns a scaled dimension based on the original dimension and the sampleSize
+ * NOTE: we round down here for scaled dimension to match the behavior of SkImageDecoder
+ * FIXME: I think we should call this get_sampled_dimension().
+ */
+inline int get_scaled_dimension(int srcDimension, int sampleSize) {
+    if (sampleSize > srcDimension) {
+        return 1;
+    }
+    return srcDimension / sampleSize;
+}
+
+/*
+ * Returns the first coordinate that we will keep during a scaled decode.
+ * The output can be interpreted as an x-coordinate or a y-coordinate.
+ *
+ * This does not need to be called and is not called when sampleFactor == 1.
+ */
+inline int get_start_coord(int sampleFactor) { return sampleFactor / 2; };
+
+/*
+ * Given a coordinate in the original image, this returns the corresponding
+ * coordinate in the scaled image.  This function is meaningless if
+ * IsCoordNecessary returns false.
+ * The output can be interpreted as an x-coordinate or a y-coordinate.
+ *
+ * This does not need to be called and is not called when sampleFactor == 1.
+ */
+inline int get_dst_coord(int srcCoord, int sampleFactor) { return srcCoord / sampleFactor; };
+
+/*
+ * When scaling, we will discard certain y-coordinates (rows) and
+ * x-coordinates (columns).  This function returns true if we should keep the
+ * coordinate and false otherwise.
+ * The inputs may be x-coordinates or y-coordinates.
+ *
+ * This does not need to be called and is not called when sampleFactor == 1.
+ */
+inline bool is_coord_necessary(int srcCoord, int sampleFactor, int scaledDim) {
+    // Get the first coordinate that we want to keep
+    int startCoord = get_start_coord(sampleFactor);
+
+    // Return false on edge cases
+    if (srcCoord < startCoord || get_dst_coord(srcCoord, sampleFactor) >= scaledDim) {
+        return false;
+    }
+
+    // Every sampleFactor rows are necessary
+    return ((srcCoord - startCoord) % sampleFactor) == 0;
+}
+
+inline bool valid_alpha(SkAlphaType dstAlpha, SkAlphaType srcAlpha) {
+    // Check for supported alpha types
+    if (srcAlpha != dstAlpha) {
+        if (kOpaque_SkAlphaType == srcAlpha) {
+            // If the source is opaque, we must decode to opaque
+            return false;
+        }
+
+        // The source is not opaque
+        switch (dstAlpha) {
+            case kPremul_SkAlphaType:
+            case kUnpremul_SkAlphaType:
+                // The source is not opaque, so either of these is okay
+                break;
+            default:
+                // We cannot decode a non-opaque image to opaque (or unknown)
+                return false;
+        }
+    }
+    return true;
+}
+
+/*
+ * Most of our codecs support the same conversions:
+ * - profileType must be the same
+ * - opaque only to opaque (and 565 only if opaque)
+ * - premul to unpremul and vice versa
+ * - always support N32
+ * - otherwise match the src color type
+ */
+inline bool conversion_possible(const SkImageInfo& dst, const SkImageInfo& src) {
+    if (dst.profileType() != src.profileType()) {
+        return false;
+    }
+
+    // Ensure the alpha type is valid
+    if (!valid_alpha(dst.alphaType(), src.alphaType())) {
+        return false;
+    }
+
+    // Check for supported color types
+    switch (dst.colorType()) {
+        case kN32_SkColorType:
+            return true;
+        case kRGB_565_SkColorType:
+            return src.alphaType() == kOpaque_SkAlphaType;
+        default:
+            return dst.colorType() == src.colorType();
+    }
+}
+
+/*
+ * If there is a color table, get a pointer to the colors, otherwise return nullptr
+ */
+inline const SkPMColor* get_color_ptr(SkColorTable* colorTable) {
+     return nullptr != colorTable ? colorTable->readColors() : nullptr;
+}
+
+/*
+ * Given that the encoded image uses a color table, return the fill value
+ */
+inline uint32_t get_color_table_fill_value(SkColorType colorType, const SkPMColor* colorPtr,
+        uint8_t fillIndex) {
+    SkASSERT(nullptr != colorPtr);
+    switch (colorType) {
+        case kN32_SkColorType:
+            return colorPtr[fillIndex];
+        case kRGB_565_SkColorType:
+            return SkPixel32ToPixel16(colorPtr[fillIndex]);
+        case kIndex_8_SkColorType:
+            return fillIndex;
+        default:
+            SkASSERT(false);
+            return 0;
+    }
+}
+
+/*
+ *
+ * Copy the codec color table back to the client when kIndex8 color type is requested
+ */
+inline void copy_color_table(const SkImageInfo& dstInfo, SkColorTable* colorTable,
+        SkPMColor* inputColorPtr, int* inputColorCount) {
+    if (kIndex_8_SkColorType == dstInfo.colorType()) {
+        SkASSERT(nullptr != inputColorPtr);
+        SkASSERT(nullptr != inputColorCount);
+        SkASSERT(nullptr != colorTable);
+        memcpy(inputColorPtr, colorTable->readColors(), *inputColorCount * sizeof(SkPMColor));
+    }
+}
+
+/*
+ * Compute row bytes for an image using pixels per byte
+ */
+inline size_t compute_row_bytes_ppb(int width, uint32_t pixelsPerByte) {
+    return (width + pixelsPerByte - 1) / pixelsPerByte;
+}
+
+/*
+ * Compute row bytes for an image using bytes per pixel
+ */
+inline size_t compute_row_bytes_bpp(int width, uint32_t bytesPerPixel) {
+    return width * bytesPerPixel;
+}
+
+/*
+ * Compute row bytes for an image
+ */
+inline size_t compute_row_bytes(int width, uint32_t bitsPerPixel) {
+    if (bitsPerPixel < 16) {
+        SkASSERT(0 == 8 % bitsPerPixel);
+        const uint32_t pixelsPerByte = 8 / bitsPerPixel;
+        return compute_row_bytes_ppb(width, pixelsPerByte);
+    } else {
+        SkASSERT(0 == bitsPerPixel % 8);
+        const uint32_t bytesPerPixel = bitsPerPixel / 8;
+        return compute_row_bytes_bpp(width, bytesPerPixel);
+    }
+}
+
+/*
+ * Get a byte from a buffer
+ * This method is unsafe, the caller is responsible for performing a check
+ */
+inline uint8_t get_byte(uint8_t* buffer, uint32_t i) {
+    return buffer[i];
+}
+
+/*
+ * Get a short from a buffer
+ * This method is unsafe, the caller is responsible for performing a check
+ */
+inline uint16_t get_short(uint8_t* buffer, uint32_t i) {
+    uint16_t result;
+    memcpy(&result, &(buffer[i]), 2);
+#ifdef SK_CPU_BENDIAN
+    return SkEndianSwap16(result);
+#else
+    return result;
+#endif
+}
+
+/*
+ * Get an int from a buffer
+ * This method is unsafe, the caller is responsible for performing a check
+ */
+inline uint32_t get_int(uint8_t* buffer, uint32_t i) {
+    uint32_t result;
+    memcpy(&result, &(buffer[i]), 4);
+#ifdef SK_CPU_BENDIAN
+    return SkEndianSwap32(result);
+#else
+    return result;
+#endif
+}
+
+#ifdef SK_PRINT_CODEC_MESSAGES
+    #define SkCodecPrintf SkDebugf
+#else
+    #define SkCodecPrintf(...)
+#endif
+
+#endif // SkCodecPriv_DEFINED
diff --git a/gfx/skia/skia/src/codec/SkCodec_libgif.cpp b/gfx/skia/skia/src/codec/SkCodec_libgif.cpp
new file mode 100644
index 000000000000..8021af95a2e0
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkCodec_libgif.cpp
@@ -0,0 +1,591 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkCodec_libgif.h"
+#include "SkCodecPriv.h"
+#include "SkColorPriv.h"
+#include "SkColorTable.h"
+#include "SkStream.h"
+#include "SkSwizzler.h"
+#include "SkUtils.h"
+
+/*
+ * Checks the start of the stream to see if the image is a gif
+ */
+bool SkGifCodec::IsGif(SkStream* stream) {
+    char buf[GIF_STAMP_LEN];
+    if (stream->read(buf, GIF_STAMP_LEN) == GIF_STAMP_LEN) {
+        if (memcmp(GIF_STAMP,   buf, GIF_STAMP_LEN) == 0 ||
+            memcmp(GIF87_STAMP, buf, GIF_STAMP_LEN) == 0 ||
+            memcmp(GIF89_STAMP, buf, GIF_STAMP_LEN) == 0)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+/*
+ * Error function
+ */
+static SkCodec::Result gif_error(const char* msg, SkCodec::Result result = SkCodec::kInvalidInput) {
+    SkCodecPrintf("Gif Error: %s\n", msg);
+    return result;
+}
+
+
+/*
+ * Read function that will be passed to gif_lib
+ */
+static int32_t read_bytes_callback(GifFileType* fileType, GifByteType* out, int32_t size) {
+    SkStream* stream = (SkStream*) fileType->UserData;
+    return (int32_t) stream->read(out, size);
+}
+
+/*
+ * Open the gif file
+ */
+static GifFileType* open_gif(SkStream* stream) {
+    return DGifOpen(stream, read_bytes_callback, nullptr);
+}
+
+/*
+ * Check if a there is an index of the color table for a transparent pixel
+ */
+static uint32_t find_trans_index(const SavedImage& image) {
+    // If there is a transparent index specified, it will be contained in an
+    // extension block.  We will loop through extension blocks in reverse order
+    // to check the most recent extension blocks first.
+    for (int32_t i = image.ExtensionBlockCount - 1; i >= 0; i--) {
+        // Get an extension block
+        const ExtensionBlock& extBlock = image.ExtensionBlocks[i];
+
+        // Specifically, we need to check for a graphics control extension,
+        // which may contain transparency information.  Also, note that a valid
+        // graphics control extension is always four bytes.  The fourth byte
+        // is the transparent index (if it exists), so we need at least four
+        // bytes.
+        if (GRAPHICS_EXT_FUNC_CODE == extBlock.Function && extBlock.ByteCount >= 4) {
+            // Check the transparent color flag which indicates whether a
+            // transparent index exists.  It is the least significant bit of
+            // the first byte of the extension block.
+            if (1 == (extBlock.Bytes[0] & 1)) {
+                // Use uint32_t to prevent sign extending
+                return extBlock.Bytes[3];
+            }
+
+            // There should only be one graphics control extension for the image frame
+            break;
+        }
+    }
+
+    // Use maximum unsigned int (surely an invalid index) to indicate that a valid
+    // index was not found.
+    return SK_MaxU32;
+}
+
+inline uint32_t ceil_div(uint32_t a, uint32_t b) {
+    return (a + b - 1) / b;
+}
+
+/*
+ * Gets the output row corresponding to the encoded row for interlaced gifs
+ */
+inline uint32_t get_output_row_interlaced(uint32_t encodedRow, uint32_t height) {
+    SkASSERT(encodedRow < height);
+    // First pass
+    if (encodedRow * 8 < height) {
+        return encodedRow * 8;
+    }
+    // Second pass
+    if (encodedRow * 4 < height) {
+        return 4 + 8 * (encodedRow - ceil_div(height, 8));
+    }
+    // Third pass
+    if (encodedRow * 2 < height) {
+        return 2 + 4 * (encodedRow - ceil_div(height, 4));
+    }
+    // Fourth pass
+    return 1 + 2 * (encodedRow - ceil_div(height, 2));
+}
+
+/*
+ * This function cleans up the gif object after the decode completes
+ * It is used in a SkAutoTCallIProc template
+ */
+void SkGifCodec::CloseGif(GifFileType* gif) {
+    DGifCloseFile(gif, NULL);
+}
+
+/*
+ * This function free extension data that has been saved to assist the image
+ * decoder
+ */
+void SkGifCodec::FreeExtension(SavedImage* image) {
+    if (NULL != image->ExtensionBlocks) {
+        GifFreeExtensions(&image->ExtensionBlockCount, &image->ExtensionBlocks);
+    }
+}
+
+/*
+ * Read enough of the stream to initialize the SkGifCodec.
+ * Returns a bool representing success or failure.
+ *
+ * @param codecOut
+ * If it returned true, and codecOut was not nullptr,
+ * codecOut will be set to a new SkGifCodec.
+ *
+ * @param gifOut
+ * If it returned true, and codecOut was nullptr,
+ * gifOut must be non-nullptr and gifOut will be set to a new
+ * GifFileType pointer.
+ *
+ * @param stream
+ * Deleted on failure.
+ * codecOut will take ownership of it in the case where we created a codec.
+ * Ownership is unchanged when we returned a gifOut.
+ *
+ */
+bool SkGifCodec::ReadHeader(SkStream* stream, SkCodec** codecOut, GifFileType** gifOut) {
+    SkAutoTDelete<SkStream> streamDeleter(stream);
+
+    // Read gif header, logical screen descriptor, and global color table
+    SkAutoTCallVProc<GifFileType, CloseGif> gif(open_gif(stream));
+
+    if (nullptr == gif) {
+        gif_error("DGifOpen failed.\n");
+        return false;
+    }
+
+    // Read through gif extensions to get to the image data.  Set the
+    // transparent index based on the extension data.
+    uint32_t transIndex;
+    SkCodec::Result result = ReadUpToFirstImage(gif, &transIndex);
+    if (kSuccess != result){
+        return false;
+    }
+
+    // Read the image descriptor
+    if (GIF_ERROR == DGifGetImageDesc(gif)) {
+        return false;
+    }
+    // If reading the image descriptor is successful, the image count will be
+    // incremented.
+    SkASSERT(gif->ImageCount >= 1);
+
+    if (nullptr != codecOut) {
+        SkISize size;
+        SkIRect frameRect;
+        if (!GetDimensions(gif, &size, &frameRect)) {
+            gif_error("Invalid gif size.\n");
+            return false;
+        }
+        bool frameIsSubset = (size != frameRect.size());
+
+        // Determine the recommended alpha type.  The transIndex might be valid if it less
+        // than 256.  We are not certain that the index is valid until we process the color
+        // table, since some gifs have color tables with less than 256 colors.  If
+        // there might be a valid transparent index, we must indicate that the image has
+        // alpha.
+        // In the case where we must support alpha, we have the option to set the
+        // suggested alpha type to kPremul or kUnpremul.  Both are valid since the alpha
+        // component will always be 0xFF or the entire 32-bit pixel will be set to zero.
+        // We prefer kPremul because we support kPremul, and it is more efficient to use
+        // kPremul directly even when kUnpremul is supported.
+        SkAlphaType alphaType = (transIndex < 256) ? kPremul_SkAlphaType : kOpaque_SkAlphaType;
+
+        // Return the codec
+        // kIndex is the most natural color type for gifs, so we set this as
+        // the default.
+        SkImageInfo imageInfo = SkImageInfo::Make(size.width(), size.height(), kIndex_8_SkColorType,
+                alphaType);
+        *codecOut = new SkGifCodec(imageInfo, streamDeleter.detach(), gif.detach(), transIndex,
+                frameRect, frameIsSubset);
+    } else {
+        SkASSERT(nullptr != gifOut);
+        streamDeleter.detach();
+        *gifOut = gif.detach();
+    }
+    return true;
+}
+
+/*
+ * Assumes IsGif was called and returned true
+ * Creates a gif decoder
+ * Reads enough of the stream to determine the image format
+ */
+SkCodec* SkGifCodec::NewFromStream(SkStream* stream) {
+    SkCodec* codec = nullptr;
+    if (ReadHeader(stream, &codec, nullptr)) {
+        return codec;
+    }
+    return nullptr;
+}
+
+SkGifCodec::SkGifCodec(const SkImageInfo& srcInfo, SkStream* stream, GifFileType* gif,
+        uint32_t transIndex, const SkIRect& frameRect, bool frameIsSubset)
+    : INHERITED(srcInfo, stream)
+    , fGif(gif)
+    , fSrcBuffer(new uint8_t[this->getInfo().width()])
+    , fFrameRect(frameRect)
+    // If it is valid, fTransIndex will be used to set fFillIndex.  We don't know if
+    // fTransIndex is valid until we process the color table, since fTransIndex may
+    // be greater than the size of the color table.
+    , fTransIndex(transIndex)
+    // Default fFillIndex is 0.  We will overwrite this if fTransIndex is valid, or if
+    // there is a valid background color.
+    , fFillIndex(0)
+    , fFrameIsSubset(frameIsSubset)
+    , fSwizzler(NULL)
+    , fColorTable(NULL)
+{}
+
+bool SkGifCodec::onRewind() {
+    GifFileType* gifOut = nullptr;
+    if (!ReadHeader(this->stream(), nullptr, &gifOut)) {
+        return false;
+    }
+
+    SkASSERT(nullptr != gifOut);
+    fGif.reset(gifOut);
+    return true;
+}
+
+SkCodec::Result SkGifCodec::ReadUpToFirstImage(GifFileType* gif, uint32_t* transIndex) {
+    // Use this as a container to hold information about any gif extension
+    // blocks.  This generally stores transparency and animation instructions.
+    SavedImage saveExt;
+    SkAutoTCallVProc<SavedImage, FreeExtension> autoFreeExt(&saveExt);
+    saveExt.ExtensionBlocks = nullptr;
+    saveExt.ExtensionBlockCount = 0;
+    GifByteType* extData;
+    int32_t extFunction;
+
+    // We will loop over components of gif images until we find an image.  Once
+    // we find an image, we will decode and return it.  While many gif files
+    // contain more than one image, we will simply decode the first image.
+    GifRecordType recordType;
+    do {
+        // Get the current record type
+        if (GIF_ERROR == DGifGetRecordType(gif, &recordType)) {
+            return gif_error("DGifGetRecordType failed.\n", kInvalidInput);
+        }
+        switch (recordType) {
+            case IMAGE_DESC_RECORD_TYPE: {
+                *transIndex = find_trans_index(saveExt);
+
+                // FIXME: Gif files may have multiple images stored in a single
+                //        file.  This is most commonly used to enable
+                //        animations.  Since we are leaving animated gifs as a
+                //        TODO, we will return kSuccess after decoding the
+                //        first image in the file.  This is the same behavior
+                //        as SkImageDecoder_libgif.
+                //
+                //        Most times this works pretty well, but sometimes it
+                //        doesn't.  For example, I have an animated test image
+                //        where the first image in the file is 1x1, but the
+                //        subsequent images are meaningful.  This currently
+                //        displays the 1x1 image, which is not ideal.  Right
+                //        now I am leaving this as an issue that will be
+                //        addressed when we implement animated gifs.
+                //
+                //        It is also possible (not explicitly disallowed in the
+                //        specification) that gif files provide multiple
+                //        images in a single file that are all meant to be
+                //        displayed in the same frame together.  I will
+                //        currently leave this unimplemented until I find a
+                //        test case that expects this behavior.
+                return kSuccess;
+            }
+            // Extensions are used to specify special properties of the image
+            // such as transparency or animation.
+            case EXTENSION_RECORD_TYPE:
+                // Read extension data
+                if (GIF_ERROR == DGifGetExtension(gif, &extFunction, &extData)) {
+                    return gif_error("Could not get extension.\n", kIncompleteInput);
+                }
+
+                // Create an extension block with our data
+                while (nullptr != extData) {
+                    // Add a single block
+                    if (GIF_ERROR == GifAddExtensionBlock(&saveExt.ExtensionBlockCount,
+                                                          &saveExt.ExtensionBlocks,
+                                                          extFunction, extData[0], &extData[1]))
+                    {
+                        return gif_error("Could not add extension block.\n", kIncompleteInput);
+                    }
+                    // Move to the next block
+                    if (GIF_ERROR == DGifGetExtensionNext(gif, &extData)) {
+                        return gif_error("Could not get next extension.\n", kIncompleteInput);
+                    }
+                }
+                break;
+
+            // Signals the end of the gif file
+            case TERMINATE_RECORD_TYPE:
+                break;
+
+            default:
+                // DGifGetRecordType returns an error if the record type does
+                // not match one of the above cases.  This should not be
+                // reached.
+                SkASSERT(false);
+                break;
+        }
+    } while (TERMINATE_RECORD_TYPE != recordType);
+
+    return gif_error("Could not find any images to decode in gif file.\n", kInvalidInput);
+}
+
+bool SkGifCodec::GetDimensions(GifFileType* gif, SkISize* size, SkIRect* frameRect) {
+    // Get the encoded dimension values
+    SavedImage* image = &gif->SavedImages[gif->ImageCount - 1];
+    const GifImageDesc& desc = image->ImageDesc;
+    int frameLeft = desc.Left;
+    int frameTop = desc.Top;
+    int frameWidth = desc.Width;
+    int frameHeight = desc.Height;
+    int width = gif->SWidth;
+    int height = gif->SHeight;
+
+    // Ensure that the decode dimensions are large enough to contain the frame
+    width = SkTMax(width, frameWidth + frameLeft);
+    height = SkTMax(height, frameHeight + frameTop);
+
+    // All of these dimensions should be positive, as they are encoded as unsigned 16-bit integers.
+    // It is unclear why giflib casts them to ints.  We will go ahead and check that they are
+    // in fact positive.
+    if (frameLeft < 0 || frameTop < 0 || frameWidth < 0 || frameHeight < 0 || width <= 0 ||
+            height <= 0) {
+        return false;
+    }
+
+    frameRect->setXYWH(frameLeft, frameTop, frameWidth, frameHeight);
+    size->set(width, height);
+    return true;
+}
+
+void SkGifCodec::initializeColorTable(const SkImageInfo& dstInfo, SkPMColor* inputColorPtr,
+        int* inputColorCount) {
+    // Set up our own color table
+    const uint32_t maxColors = 256;
+    SkPMColor colorPtr[256];
+    if (NULL != inputColorCount) {
+        // We set the number of colors to maxColors in order to ensure
+        // safe memory accesses.  Otherwise, an invalid pixel could
+        // access memory outside of our color table array.
+        *inputColorCount = maxColors;
+    }
+
+    // Get local color table
+    ColorMapObject* colorMap = fGif->Image.ColorMap;
+    // If there is no local color table, use the global color table
+    if (NULL == colorMap) {
+        colorMap = fGif->SColorMap;
+    }
+
+    uint32_t colorCount = 0;
+    if (NULL != colorMap) {
+        colorCount = colorMap->ColorCount;
+        // giflib guarantees these properties
+        SkASSERT(colorCount == (unsigned) (1 << (colorMap->BitsPerPixel)));
+        SkASSERT(colorCount <= 256);
+        for (uint32_t i = 0; i < colorCount; i++) {
+            colorPtr[i] = SkPackARGB32(0xFF, colorMap->Colors[i].Red,
+                    colorMap->Colors[i].Green, colorMap->Colors[i].Blue);
+        }
+    }
+
+    // Gifs have the option to specify the color at a single index of the color
+    // table as transparent.  If the transparent index is greater than the
+    // colorCount, we know that there is no valid transparent color in the color
+    // table.  If there is not valid transparent index, we will try to use the
+    // backgroundIndex as the fill index.  If the backgroundIndex is also not
+    // valid, we will let fFillIndex default to 0 (it is set to zero in the
+    // constructor).  This behavior is not specified but matches
+    // SkImageDecoder_libgif.
+    uint32_t backgroundIndex = fGif->SBackGroundColor;
+    if (fTransIndex < colorCount) {
+        colorPtr[fTransIndex] = SK_ColorTRANSPARENT;
+        fFillIndex = fTransIndex;
+    } else if (backgroundIndex < colorCount) {
+        fFillIndex = backgroundIndex;
+    }
+
+    // Fill in the color table for indices greater than color count.
+    // This allows for predictable, safe behavior.
+    for (uint32_t i = colorCount; i < maxColors; i++) {
+        colorPtr[i] = colorPtr[fFillIndex];
+    }
+
+    fColorTable.reset(new SkColorTable(colorPtr, maxColors));
+    copy_color_table(dstInfo, this->fColorTable, inputColorPtr, inputColorCount);
+}
+
+SkCodec::Result SkGifCodec::prepareToDecode(const SkImageInfo& dstInfo, SkPMColor* inputColorPtr,
+        int* inputColorCount, const Options& opts) {
+    // Check for valid input parameters
+    if (!conversion_possible(dstInfo, this->getInfo())) {
+        return gif_error("Cannot convert input type to output type.\n",
+                kInvalidConversion);
+    }
+
+    // Initialize color table and copy to the client if necessary
+    this->initializeColorTable(dstInfo, inputColorPtr, inputColorCount);
+
+    return this->initializeSwizzler(dstInfo, opts);
+}
+
+SkCodec::Result SkGifCodec::initializeSwizzler(const SkImageInfo& dstInfo, const Options& opts) {
+    const SkPMColor* colorPtr = get_color_ptr(fColorTable.get());
+    const SkIRect* frameRect = fFrameIsSubset ? &fFrameRect : nullptr;
+    fSwizzler.reset(SkSwizzler::CreateSwizzler(SkSwizzler::kIndex, colorPtr, dstInfo, opts,
+            frameRect));
+
+    if (nullptr != fSwizzler.get()) {
+        return kSuccess;
+    }
+    return kUnimplemented;
+}
+
+bool SkGifCodec::readRow() {
+    return GIF_ERROR != DGifGetLine(fGif, fSrcBuffer.get(), fFrameRect.width());
+}
+
+/*
+ * Initiates the gif decode
+ */
+SkCodec::Result SkGifCodec::onGetPixels(const SkImageInfo& dstInfo,
+                                        void* dst, size_t dstRowBytes,
+                                        const Options& opts,
+                                        SkPMColor* inputColorPtr,
+                                        int* inputColorCount,
+                                        int* rowsDecoded) {
+    Result result = this->prepareToDecode(dstInfo, inputColorPtr, inputColorCount, opts);
+    if (kSuccess != result) {
+        return result;
+    }
+
+    if (dstInfo.dimensions() != this->getInfo().dimensions()) {
+        return gif_error("Scaling not supported.\n", kInvalidScale);
+    }
+
+    // Initialize the swizzler
+    if (fFrameIsSubset) {
+        // Fill the background
+        SkSampler::Fill(dstInfo, dst, dstRowBytes,
+                this->getFillValue(dstInfo.colorType(), dstInfo.alphaType()),
+                opts.fZeroInitialized);
+    }
+
+    // Iterate over rows of the input
+    for (int y = fFrameRect.top(); y < fFrameRect.bottom(); y++) {
+        if (!this->readRow()) {
+            *rowsDecoded = y;
+            return gif_error("Could not decode line.\n", kIncompleteInput);
+        }
+        void* dstRow = SkTAddOffset<void>(dst, dstRowBytes * this->outputScanline(y));
+        fSwizzler->swizzle(dstRow, fSrcBuffer.get());
+    }
+    return kSuccess;
+}
+
+// FIXME: This is similar to the implementation for bmp and png.  Can we share more code or
+//        possibly make this non-virtual?
+uint32_t SkGifCodec::onGetFillValue(SkColorType colorType, SkAlphaType alphaType) const {
+    const SkPMColor* colorPtr = get_color_ptr(fColorTable.get());
+    return get_color_table_fill_value(colorType, colorPtr, fFillIndex);
+}
+
+SkCodec::Result SkGifCodec::onStartScanlineDecode(const SkImageInfo& dstInfo,
+        const SkCodec::Options& opts, SkPMColor inputColorPtr[], int* inputColorCount) {
+    return this->prepareToDecode(dstInfo, inputColorPtr, inputColorCount, this->options());
+}
+
+void SkGifCodec::handleScanlineFrame(int count, int* rowsBeforeFrame, int* rowsInFrame) {
+    if (fFrameIsSubset) {
+        const int currRow = this->INHERITED::nextScanline();
+
+        // The number of rows that remain to be skipped before reaching rows that we
+        // actually must decode into.
+        // This must be at least zero.  We also make sure that it is less than or
+        // equal to count, since we will skip at most count rows.
+        *rowsBeforeFrame = SkTMin(count, SkTMax(0, fFrameRect.top() - currRow));
+
+        // Rows left to decode once we reach the start of the frame.
+        const int rowsLeft = count - *rowsBeforeFrame;
+
+        // Count the number of that extend beyond the bottom of the frame.  We do not
+        // need to decode into these rows.
+        const int rowsAfterFrame = SkTMax(0, currRow + rowsLeft - fFrameRect.bottom());
+
+        // Set the actual number of source rows that we need to decode.
+        *rowsInFrame = rowsLeft - rowsAfterFrame;
+    } else {
+        *rowsBeforeFrame = 0;
+        *rowsInFrame = count;
+    }
+}
+
+int SkGifCodec::onGetScanlines(void* dst, int count, size_t rowBytes) {
+    int rowsBeforeFrame;
+    int rowsInFrame;
+    this->handleScanlineFrame(count, &rowsBeforeFrame, &rowsInFrame);
+
+    if (fFrameIsSubset) {
+        // Fill the requested rows
+        SkImageInfo fillInfo = this->dstInfo().makeWH(this->dstInfo().width(), count);
+        uint32_t fillValue = this->onGetFillValue(this->dstInfo().colorType(),
+                this->dstInfo().alphaType());
+        fSwizzler->fill(fillInfo, dst, rowBytes, fillValue, this->options().fZeroInitialized);
+
+        // Start to write pixels at the start of the image frame
+        dst = SkTAddOffset<void>(dst, rowBytes * rowsBeforeFrame);
+    }
+
+    for (int i = 0; i < rowsInFrame; i++) {
+        if (!this->readRow()) {
+            return i + rowsBeforeFrame;
+        }
+        fSwizzler->swizzle(dst, fSrcBuffer.get());
+        dst = SkTAddOffset<void>(dst, rowBytes);
+    }
+
+    return count;
+}
+
+bool SkGifCodec::onSkipScanlines(int count) {
+    int rowsBeforeFrame;
+    int rowsInFrame;
+    this->handleScanlineFrame(count, &rowsBeforeFrame, &rowsInFrame);
+
+    for (int i = 0; i < rowsInFrame; i++) {
+        if (!this->readRow()) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+SkCodec::SkScanlineOrder SkGifCodec::onGetScanlineOrder() const {
+    if (fGif->Image.Interlace) {
+        return kOutOfOrder_SkScanlineOrder;
+    }
+    return kTopDown_SkScanlineOrder;
+}
+
+int SkGifCodec::onOutputScanline(int inputScanline) const {
+    if (fGif->Image.Interlace) {
+        if (inputScanline < fFrameRect.top() || inputScanline >= fFrameRect.bottom()) {
+            return inputScanline;
+        }
+        return get_output_row_interlaced(inputScanline - fFrameRect.top(), fFrameRect.height()) +
+                fFrameRect.top();
+    }
+    return inputScanline;
+}
diff --git a/gfx/skia/skia/src/codec/SkCodec_libgif.h b/gfx/skia/skia/src/codec/SkCodec_libgif.h
new file mode 100644
index 000000000000..200f176e3292
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkCodec_libgif.h
@@ -0,0 +1,207 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkCodec.h"
+#include "SkColorTable.h"
+#include "SkImageInfo.h"
+#include "SkSwizzler.h"
+
+#include "gif_lib.h"
+
+/*
+ *
+ * This class implements the decoding for gif images
+ *
+ */
+class SkGifCodec : public SkCodec {
+public:
+
+    /*
+     * Checks the start of the stream to see if the image is a gif
+     */
+    static bool IsGif(SkStream*);
+
+    /*
+     * Assumes IsGif was called and returned true
+     * Creates a gif decoder
+     * Reads enough of the stream to determine the image format
+     */
+    static SkCodec* NewFromStream(SkStream*);
+
+protected:
+
+    /*
+     * Read enough of the stream to initialize the SkGifCodec.
+     * Returns a bool representing success or failure.
+     *
+     * @param codecOut
+     * If it returned true, and codecOut was not nullptr,
+     * codecOut will be set to a new SkGifCodec.
+     *
+     * @param gifOut
+     * If it returned true, and codecOut was nullptr,
+     * gifOut must be non-nullptr and gifOut will be set to a new
+     * GifFileType pointer.
+     *
+     * @param stream
+     * Deleted on failure.
+     * codecOut will take ownership of it in the case where we created a codec.
+     * Ownership is unchanged when we returned a gifOut.
+     *
+     */
+    static bool ReadHeader(SkStream* stream, SkCodec** codecOut,
+            GifFileType** gifOut);
+
+    /*
+     * Performs the full gif decode
+     */
+    Result onGetPixels(const SkImageInfo&, void*, size_t, const Options&,
+            SkPMColor*, int*, int*) override;
+
+    SkEncodedFormat onGetEncodedFormat() const override {
+        return kGIF_SkEncodedFormat;
+    }
+
+    bool onRewind() override;
+
+    uint32_t onGetFillValue(SkColorType colorType, SkAlphaType alphaType) const override;
+
+    int onOutputScanline(int inputScanline) const override;
+
+private:
+
+    /*
+     * A gif can contain multiple image frames.  We will only decode the first
+     * frame.  This function reads up to the first image frame, processing
+     * transparency and/or animation information that comes before the image
+     * data.
+     *
+     * @param gif        Pointer to the library type that manages the gif decode
+     * @param transIndex This call will set the transparent index based on the
+     *                   extension data.
+     */
+     static Result ReadUpToFirstImage(GifFileType* gif, uint32_t* transIndex);
+
+     /*
+      * A gif may contain many image frames, all of different sizes.
+      * This function checks if the gif dimensions are valid, based on the frame
+      * dimensions, and corrects the gif dimensions if necessary.
+      *
+      * @param gif       Pointer to the library type that manages the gif decode
+      * @param size      Size of the image that we will decode.
+      *                  Will be set by this function if the return value is true.
+      * @param frameRect Contains the dimenions and offset of the first image frame.
+      *                  Will be set by this function if the return value is true.
+      *
+      * @return true on success, false otherwise
+      */
+     static bool GetDimensions(GifFileType* gif, SkISize* size, SkIRect* frameRect);
+
+    /*
+     * Initializes the color table that we will use for decoding.
+     *
+     * @param dstInfo         Contains the requested dst color type.
+     * @param inputColorPtr   Copies the encoded color table to the client's
+     *                        input color table if the client requests kIndex8.
+     * @param inputColorCount If the client requests kIndex8, sets
+     *                        inputColorCount to 256.  Since gifs always
+     *                        contain 8-bit indices, we need a 256 entry color
+     *                        table to ensure that indexing is always in
+     *                        bounds.
+     */
+    void initializeColorTable(const SkImageInfo& dstInfo, SkPMColor* colorPtr,
+            int* inputColorCount);
+
+   /*
+    * Checks for invalid inputs and calls setFrameDimensions(), and
+    * initializeColorTable() in the proper sequence.
+    */
+    Result prepareToDecode(const SkImageInfo& dstInfo, SkPMColor* inputColorPtr,
+            int* inputColorCount, const Options& opts);
+
+    /*
+     * Initializes the swizzler.
+     *
+     * @param dstInfo  Output image information.  Dimensions may have been
+     *                 adjusted if the image frame size does not match the size
+     *                 indicated in the header.
+     * @param options  Informs the swizzler if destination memory is zero initialized.
+     *                 Contains subset information.
+     */
+    Result initializeSwizzler(const SkImageInfo& dstInfo,
+            const Options& options);
+
+    SkSampler* getSampler(bool createIfNecessary) override {
+        SkASSERT(fSwizzler);
+        return fSwizzler;
+    }
+
+    /*
+     * @return true if the read is successful and false if the read fails.
+     */
+    bool readRow();
+
+    Result onStartScanlineDecode(const SkImageInfo& dstInfo, const Options& opts,
+                   SkPMColor inputColorPtr[], int* inputColorCount) override;
+
+    int onGetScanlines(void* dst, int count, size_t rowBytes) override;
+
+    bool onSkipScanlines(int count) override;
+
+    /*
+     * For a scanline decode of "count" lines, this function indicates how
+     * many of the "count" lines should be skipped until we reach the top of
+     * the image frame and how many of the "count" lines are actually inside
+     * the image frame.
+     *
+     * @param count           The number of scanlines requested.
+     * @param rowsBeforeFrame Output variable.  The number of lines before
+     *                        we reach the top of the image frame.
+     * @param rowsInFrame     Output variable.  The number of lines to decode
+     *                        inside the image frame.
+     */
+    void handleScanlineFrame(int count, int* rowsBeforeFrame, int* rowsInFrame);
+
+    SkScanlineOrder onGetScanlineOrder() const override;
+
+    /*
+     * This function cleans up the gif object after the decode completes
+     * It is used in a SkAutoTCallIProc template
+     */
+    static void CloseGif(GifFileType* gif);
+
+    /*
+     * Frees any extension data used in the decode
+     * Used in a SkAutoTCallVProc
+     */
+    static void FreeExtension(SavedImage* image);
+
+    /*
+     * Creates an instance of the decoder
+     * Called only by NewFromStream
+     *
+     * @param srcInfo contains the source width and height
+     * @param stream the stream of image data
+     * @param gif pointer to library type that manages gif decode
+     *            takes ownership
+     * @param transIndex  The transparent index.  An invalid value
+     *            indicates that there is no transparent index.
+     */
+    SkGifCodec(const SkImageInfo& srcInfo, SkStream* stream, GifFileType* gif, uint32_t transIndex,
+            const SkIRect& frameRect, bool frameIsSubset);
+
+    SkAutoTCallVProc<GifFileType, CloseGif> fGif; // owned
+    SkAutoTDeleteArray<uint8_t>             fSrcBuffer;
+    const SkIRect                           fFrameRect;
+    const uint32_t                          fTransIndex;
+    uint32_t                                fFillIndex;
+    const bool                              fFrameIsSubset;
+    SkAutoTDelete<SkSwizzler>               fSwizzler;
+    SkAutoTUnref<SkColorTable>              fColorTable;
+
+    typedef SkCodec INHERITED;
+};
diff --git a/gfx/skia/skia/src/codec/SkCodec_libico.cpp b/gfx/skia/skia/src/codec/SkCodec_libico.cpp
new file mode 100644
index 000000000000..8c5a1b341209
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkCodec_libico.cpp
@@ -0,0 +1,302 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkBmpCodec.h"
+#include "SkCodec_libico.h"
+#include "SkCodec_libpng.h"
+#include "SkCodecPriv.h"
+#include "SkColorPriv.h"
+#include "SkData.h"
+#include "SkStream.h"
+#include "SkTDArray.h"
+#include "SkTSort.h"
+
+/*
+ * Checks the start of the stream to see if the image is an Ico or Cur
+ */
+bool SkIcoCodec::IsIco(SkStream* stream) {
+    const char icoSig[] = { '\x00', '\x00', '\x01', '\x00' };
+    const char curSig[] = { '\x00', '\x00', '\x02', '\x00' };
+    char buffer[sizeof(icoSig)];
+    return stream->read(buffer, sizeof(icoSig)) == sizeof(icoSig) &&
+            (!memcmp(buffer, icoSig, sizeof(icoSig)) ||
+            !memcmp(buffer, curSig, sizeof(curSig)));
+}
+
+/*
+ * Assumes IsIco was called and returned true
+ * Creates an Ico decoder
+ * Reads enough of the stream to determine the image format
+ */
+SkCodec* SkIcoCodec::NewFromStream(SkStream* stream) {
+    // Ensure that we do not leak the input stream
+    SkAutoTDelete<SkStream> inputStream(stream);
+
+    // Header size constants
+    static const uint32_t kIcoDirectoryBytes = 6;
+    static const uint32_t kIcoDirEntryBytes = 16;
+
+    // Read the directory header
+    SkAutoTDeleteArray<uint8_t> dirBuffer(new uint8_t[kIcoDirectoryBytes]);
+    if (inputStream.get()->read(dirBuffer.get(), kIcoDirectoryBytes) !=
+            kIcoDirectoryBytes) {
+        SkCodecPrintf("Error: unable to read ico directory header.\n");
+        return nullptr;
+    }
+
+    // Process the directory header
+    const uint16_t numImages = get_short(dirBuffer.get(), 4);
+    if (0 == numImages) {
+        SkCodecPrintf("Error: No images embedded in ico.\n");
+        return nullptr;
+    }
+
+    // Ensure that we can read all of indicated directory entries
+    SkAutoTDeleteArray<uint8_t> entryBuffer(new uint8_t[numImages * kIcoDirEntryBytes]);
+    if (inputStream.get()->read(entryBuffer.get(), numImages*kIcoDirEntryBytes) !=
+            numImages*kIcoDirEntryBytes) {
+        SkCodecPrintf("Error: unable to read ico directory entries.\n");
+        return nullptr;
+    }
+
+    // This structure is used to represent the vital information about entries
+    // in the directory header.  We will obtain this information for each
+    // directory entry.
+    struct Entry {
+        uint32_t offset;
+        uint32_t size;
+    };
+    SkAutoTDeleteArray<Entry> directoryEntries(new Entry[numImages]);
+
+    // Iterate over directory entries
+    for (uint32_t i = 0; i < numImages; i++) {
+        // The directory entry contains information such as width, height,
+        // bits per pixel, and number of colors in the color palette.  We will
+        // ignore these fields since they are repeated in the header of the
+        // embedded image.  In the event of an inconsistency, we would always
+        // defer to the value in the embedded header anyway.
+
+        // Specifies the size of the embedded image, including the header
+        uint32_t size = get_int(entryBuffer.get(), 8 + i*kIcoDirEntryBytes);
+
+        // Specifies the offset of the embedded image from the start of file.
+        // It does not indicate the start of the pixel data, but rather the
+        // start of the embedded image header.
+        uint32_t offset = get_int(entryBuffer.get(), 12 + i*kIcoDirEntryBytes);
+
+        // Save the vital fields
+        directoryEntries.get()[i].offset = offset;
+        directoryEntries.get()[i].size = size;
+    }
+
+    // It is "customary" that the embedded images will be stored in order of
+    // increasing offset.  However, the specification does not indicate that
+    // they must be stored in this order, so we will not trust that this is the
+    // case.  Here we sort the embedded images by increasing offset.
+    struct EntryLessThan {
+        bool operator() (Entry a, Entry b) const {
+            return a.offset < b.offset;
+        }
+    };
+    EntryLessThan lessThan;
+    SkTQSort(directoryEntries.get(), directoryEntries.get() + numImages - 1,
+            lessThan);
+
+    // Now will construct a candidate codec for each of the embedded images
+    uint32_t bytesRead = kIcoDirectoryBytes + numImages * kIcoDirEntryBytes;
+    SkAutoTDelete<SkTArray<SkAutoTDelete<SkCodec>, true>> codecs(
+            new (SkTArray<SkAutoTDelete<SkCodec>, true>)(numImages));
+    for (uint32_t i = 0; i < numImages; i++) {
+        uint32_t offset = directoryEntries.get()[i].offset;
+        uint32_t size = directoryEntries.get()[i].size;
+
+        // Ensure that the offset is valid
+        if (offset < bytesRead) {
+            SkCodecPrintf("Warning: invalid ico offset.\n");
+            continue;
+        }
+
+        // If we cannot skip, assume we have reached the end of the stream and
+        // stop trying to make codecs
+        if (inputStream.get()->skip(offset - bytesRead) != offset - bytesRead) {
+            SkCodecPrintf("Warning: could not skip to ico offset.\n");
+            break;
+        }
+        bytesRead = offset;
+
+        // Create a new stream for the embedded codec
+        SkAutoTUnref<SkData> data(
+                SkData::NewFromStream(inputStream.get(), size));
+        if (nullptr == data.get()) {
+            SkCodecPrintf("Warning: could not create embedded stream.\n");
+            break;
+        }
+        SkAutoTDelete<SkMemoryStream> embeddedStream(new SkMemoryStream(data.get()));
+        bytesRead += size;
+
+        // Check if the embedded codec is bmp or png and create the codec
+        const bool isPng = SkPngCodec::IsPng(embeddedStream);
+        SkAssertResult(embeddedStream->rewind());
+        SkCodec* codec = nullptr;
+        if (isPng) {
+            codec = SkPngCodec::NewFromStream(embeddedStream.detach());
+        } else {
+            codec = SkBmpCodec::NewFromIco(embeddedStream.detach());
+        }
+
+        // Save a valid codec
+        if (nullptr != codec) {
+            codecs->push_back().reset(codec);
+        }
+    }
+
+    // Recognize if there are no valid codecs
+    if (0 == codecs->count()) {
+        SkCodecPrintf("Error: could not find any valid embedded ico codecs.\n");
+        return nullptr;
+    }
+
+    // Use the largest codec as a "suggestion" for image info
+    uint32_t maxSize = 0;
+    uint32_t maxIndex = 0;
+    for (int32_t i = 0; i < codecs->count(); i++) {
+        SkImageInfo info = codecs->operator[](i)->getInfo();
+        uint32_t size = info.width() * info.height();
+        if (size > maxSize) {
+            maxSize = size;
+            maxIndex = i;
+        }
+    }
+    SkImageInfo info = codecs->operator[](maxIndex)->getInfo();
+
+    // ICOs contain an alpha mask after the image which means we cannot
+    // guarantee that an image is opaque, even if the sub-codec thinks it
+    // is.
+    // FIXME (msarett): The BMP decoder depends on the alpha type in order
+    // to decode correctly, otherwise it could report kUnpremul and we would
+    // not have to correct it here. Is there a better way?
+    // FIXME (msarett): This is only true for BMP in ICO - could a PNG in ICO
+    // be opaque? Is it okay that we missed out on the opportunity to mark
+    // such an image as opaque?
+    info = info.makeAlphaType(kUnpremul_SkAlphaType);
+
+    // Note that stream is owned by the embedded codec, the ico does not need
+    // direct access to the stream.
+    return new SkIcoCodec(info, codecs.detach());
+}
+
+/*
+ * Creates an instance of the decoder
+ * Called only by NewFromStream
+ */
+SkIcoCodec::SkIcoCodec(const SkImageInfo& info,
+                       SkTArray<SkAutoTDelete<SkCodec>, true>* codecs)
+    : INHERITED(info, nullptr)
+    , fEmbeddedCodecs(codecs)
+{}
+
+/*
+ * Chooses the best dimensions given the desired scale
+ */
+SkISize SkIcoCodec::onGetScaledDimensions(float desiredScale) const { 
+    // We set the dimensions to the largest candidate image by default.
+    // Regardless of the scale request, this is the largest image that we
+    // will decode.
+    int origWidth = this->getInfo().width();
+    int origHeight = this->getInfo().height();
+    float desiredSize = desiredScale * origWidth * origHeight;
+    // At least one image will have smaller error than this initial value
+    float minError = ((float) (origWidth * origHeight)) - desiredSize + 1.0f;
+    int32_t minIndex = -1;
+    for (int32_t i = 0; i < fEmbeddedCodecs->count(); i++) {
+        int width = fEmbeddedCodecs->operator[](i)->getInfo().width();
+        int height = fEmbeddedCodecs->operator[](i)->getInfo().height();
+        float error = SkTAbs(((float) (width * height)) - desiredSize);
+        if (error < minError) {
+            minError = error;
+            minIndex = i;
+        }
+    }
+    SkASSERT(minIndex >= 0);
+
+    return fEmbeddedCodecs->operator[](minIndex)->getInfo().dimensions();
+}
+
+bool SkIcoCodec::onDimensionsSupported(const SkISize& dim) {
+    // FIXME: Cache the index from onGetScaledDimensions?
+    for (int32_t i = 0; i < fEmbeddedCodecs->count(); i++) {
+        if (fEmbeddedCodecs->operator[](i)->getInfo().dimensions() == dim) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+/*
+ * Initiates the Ico decode
+ */
+SkCodec::Result SkIcoCodec::onGetPixels(const SkImageInfo& dstInfo,
+                                        void* dst, size_t dstRowBytes,
+                                        const Options& opts, SkPMColor* colorTable,
+                                        int* colorCount, int* rowsDecoded) {
+    if (opts.fSubset) {
+        // Subsets are not supported.
+        return kUnimplemented;
+    }
+
+    if (!valid_alpha(dstInfo.alphaType(), this->getInfo().alphaType())) {
+        return kInvalidConversion;
+    }
+
+    // We return invalid scale if there is no candidate image with matching
+    // dimensions.
+    Result result = kInvalidScale;
+    for (int32_t i = 0; i < fEmbeddedCodecs->count(); i++) {
+        SkCodec* embeddedCodec = fEmbeddedCodecs->operator[](i);
+        // If the dimensions match, try to decode
+        if (dstInfo.dimensions() == embeddedCodec->getInfo().dimensions()) {
+
+            // Perform the decode
+            // FIXME (msarett): ICO is considered non-opaque, even if the embedded BMP
+            // incorrectly claims it has no alpha.
+            SkAlphaType embeddedAlpha = embeddedCodec->getInfo().alphaType();
+            switch (embeddedAlpha) {
+                case kPremul_SkAlphaType:
+                case kUnpremul_SkAlphaType:
+                    // Use the requested alpha type if the embedded codec supports alpha.
+                    embeddedAlpha = dstInfo.alphaType();
+                    break;
+                case kOpaque_SkAlphaType:
+                    // If the embedded codec claims it is opaque, decode as if it is opaque.
+                    break;
+                default:
+                    SkASSERT(false);
+                    break;
+            }
+            SkImageInfo info = dstInfo.makeAlphaType(embeddedAlpha);
+            result = embeddedCodec->getPixels(info, dst, dstRowBytes, &opts, colorTable,
+                    colorCount);
+            // The embedded codec will handle filling incomplete images, so we will indicate
+            // that all of the rows are initialized.
+            *rowsDecoded = info.height();
+
+            // On a fatal error, keep trying to find an image to decode
+            if (kInvalidConversion == result || kInvalidInput == result ||
+                    kInvalidScale == result) {
+                SkCodecPrintf("Warning: Attempt to decode candidate ico failed.\n");
+                continue;
+            }
+
+            // On success or partial success, return the result
+            return result;
+        }
+    }
+
+    SkCodecPrintf("Error: No matching candidate image in ico.\n");
+    return result;
+}
diff --git a/gfx/skia/skia/src/codec/SkCodec_libico.h b/gfx/skia/skia/src/codec/SkCodec_libico.h
new file mode 100644
index 000000000000..92675f4d740e
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkCodec_libico.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkCodec.h"
+#include "SkImageInfo.h"
+#include "SkStream.h"
+#include "SkTypes.h"
+
+/*
+ * This class implements the decoding for bmp images
+ */
+class SkIcoCodec : public SkCodec {
+public:
+
+    /*
+     * Checks the start of the stream to see if the image is a Ico or Cur
+     */
+    static bool IsIco(SkStream*);
+
+    /*
+     * Assumes IsIco was called and returned true
+     * Creates an Ico decoder
+     * Reads enough of the stream to determine the image format
+     */
+    static SkCodec* NewFromStream(SkStream*);
+
+protected:
+
+    /*
+     * Chooses the best dimensions given the desired scale
+     */
+    SkISize onGetScaledDimensions(float desiredScale) const override;
+
+    bool onDimensionsSupported(const SkISize&) override;
+
+    /*
+     * Initiates the Ico decode
+     */
+    Result onGetPixels(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes, const Options&,
+            SkPMColor*, int*, int*) override;
+
+    SkEncodedFormat onGetEncodedFormat() const override {
+        return kICO_SkEncodedFormat;
+    }
+
+private:
+
+    /*
+     * Constructor called by NewFromStream
+     * @param embeddedCodecs codecs for the embedded images, takes ownership
+     */
+    SkIcoCodec(const SkImageInfo& srcInfo,
+               SkTArray<SkAutoTDelete<SkCodec>, true>* embeddedCodecs);
+
+    SkAutoTDelete<SkTArray<SkAutoTDelete<SkCodec>, true>>
+            fEmbeddedCodecs; // owned
+
+    typedef SkCodec INHERITED;
+};
diff --git a/gfx/skia/skia/src/codec/SkCodec_libpng.cpp b/gfx/skia/skia/src/codec/SkCodec_libpng.cpp
new file mode 100644
index 000000000000..355d493309f6
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkCodec_libpng.cpp
@@ -0,0 +1,875 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkCodec_libpng.h"
+#include "SkCodecPriv.h"
+#include "SkColorPriv.h"
+#include "SkColorTable.h"
+#include "SkBitmap.h"
+#include "SkMath.h"
+#include "SkSize.h"
+#include "SkStream.h"
+#include "SkSwizzler.h"
+
+///////////////////////////////////////////////////////////////////////////////
+// Helper macros
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef png_jmpbuf
+#  define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf)
+#endif
+
+/* These were dropped in libpng >= 1.4 */
+#ifndef png_infopp_NULL
+    #define png_infopp_NULL nullptr
+#endif
+
+#ifndef png_bytepp_NULL
+    #define png_bytepp_NULL nullptr
+#endif
+
+#ifndef int_p_NULL
+    #define int_p_NULL nullptr
+#endif
+
+#ifndef png_flush_ptr_NULL
+    #define png_flush_ptr_NULL nullptr
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+// Callback functions
+///////////////////////////////////////////////////////////////////////////////
+
+static void sk_error_fn(png_structp png_ptr, png_const_charp msg) {
+    SkCodecPrintf("------ png error %s\n", msg);
+    longjmp(png_jmpbuf(png_ptr), 1);
+}
+
+void sk_warning_fn(png_structp, png_const_charp msg) {
+    SkCodecPrintf("----- png warning %s\n", msg);
+}
+
+static void sk_read_fn(png_structp png_ptr, png_bytep data,
+                       png_size_t length) {
+    SkStream* stream = static_cast<SkStream*>(png_get_io_ptr(png_ptr));
+    const size_t bytes = stream->read(data, length);
+    if (bytes != length) {
+        // FIXME: We want to report the fact that the stream was truncated.
+        // One way to do that might be to pass a enum to longjmp so setjmp can
+        // specify the failure.
+        png_error(png_ptr, "Read Error!");
+    }
+}
+
+#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
+static int sk_read_user_chunk(png_structp png_ptr, png_unknown_chunkp chunk) {
+    SkPngChunkReader* chunkReader = (SkPngChunkReader*)png_get_user_chunk_ptr(png_ptr);
+    // readChunk() returning true means continue decoding
+    return chunkReader->readChunk((const char*)chunk->name, chunk->data, chunk->size) ? 1 : -1;
+}
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+// Helpers
+///////////////////////////////////////////////////////////////////////////////
+
+class AutoCleanPng : public SkNoncopyable {
+public:
+    AutoCleanPng(png_structp png_ptr)
+        : fPng_ptr(png_ptr)
+        , fInfo_ptr(nullptr) {}
+
+    ~AutoCleanPng() {
+        // fInfo_ptr will never be non-nullptr unless fPng_ptr is.
+        if (fPng_ptr) {
+            png_infopp info_pp = fInfo_ptr ? &fInfo_ptr : nullptr;
+            png_destroy_read_struct(&fPng_ptr, info_pp, png_infopp_NULL);
+        }
+    }
+
+    void setInfoPtr(png_infop info_ptr) {
+        SkASSERT(nullptr == fInfo_ptr);
+        fInfo_ptr = info_ptr;
+    }
+
+    void detach() {
+        fPng_ptr = nullptr;
+        fInfo_ptr = nullptr;
+    }
+
+private:
+    png_structp     fPng_ptr;
+    png_infop       fInfo_ptr;
+};
+#define AutoCleanPng(...) SK_REQUIRE_LOCAL_VAR(AutoCleanPng)
+
+//checks if there is transparency info in the tRNS chunk
+//image types which could have data in the tRNS chunk include: Index8, Gray8, RGB
+static bool has_transparency_in_tRNS(png_structp png_ptr,
+                                        png_infop info_ptr) {
+    if (!png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
+        return false;
+    }
+
+    png_bytep trans;
+    int num_trans;
+    png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, nullptr);
+    return num_trans > 0;
+}
+
+// Method for coverting to either an SkPMColor or a similarly packed
+// unpremultiplied color.
+typedef uint32_t (*PackColorProc)(U8CPU a, U8CPU r, U8CPU g, U8CPU b);
+
+// Note: SkColorTable claims to store SkPMColors, which is not necessarily
+// the case here.
+bool SkPngCodec::decodePalette(bool premultiply, int* ctableCount) {
+    int numPalette;
+    png_colorp palette;
+    png_bytep trans;
+
+    if (!png_get_PLTE(fPng_ptr, fInfo_ptr, &palette, &numPalette)) {
+        return false;
+    }
+
+    // Note: These are not necessarily SkPMColors
+    SkPMColor colorStorage[256];    // worst-case storage
+    SkPMColor* colorPtr = colorStorage;
+
+    int numTrans;
+    if (png_get_valid(fPng_ptr, fInfo_ptr, PNG_INFO_tRNS)) {
+        png_get_tRNS(fPng_ptr, fInfo_ptr, &trans, &numTrans, nullptr);
+    } else {
+        numTrans = 0;
+    }
+
+    // check for bad images that might make us crash
+    if (numTrans > numPalette) {
+        numTrans = numPalette;
+    }
+
+    int index = 0;
+    int transLessThanFF = 0;
+
+    // Choose which function to use to create the color table. If the final destination's
+    // colortype is unpremultiplied, the color table will store unpremultiplied colors.
+    PackColorProc proc;
+    if (premultiply) {
+        proc = &SkPreMultiplyARGB;
+    } else {
+        proc = &SkPackARGB32NoCheck;
+    }
+    for (; index < numTrans; index++) {
+        transLessThanFF |= (int)*trans - 0xFF;
+        *colorPtr++ = proc(*trans++, palette->red, palette->green, palette->blue);
+        palette++;
+    }
+
+    if (transLessThanFF >= 0) {
+        // No transparent colors were found.
+        fAlphaState = kOpaque_AlphaState;
+    }
+
+    for (; index < numPalette; index++) {
+        *colorPtr++ = SkPackARGB32(0xFF, palette->red, palette->green, palette->blue);
+        palette++;
+    }
+
+    /*  BUGGY IMAGE WORKAROUND
+        Invalid images could contain pixel values that are greater than the number of palette
+        entries. Since we use pixel values as indices into the palette this could result in reading
+        beyond the end of the palette which could leak the contents of uninitialized memory. To
+        ensure this doesn't happen, we grow the colortable to the maximum size that can be
+        addressed by the bitdepth of the image and fill it with the last palette color or black if
+        the palette is empty (really broken image).
+    */
+    int colorCount = SkTMax(numPalette, 1 << SkTMin(fBitDepth, 8));
+    SkPMColor lastColor = index > 0 ? colorPtr[-1] : SkPackARGB32(0xFF, 0, 0, 0);
+    for (; index < colorCount; index++) {
+        *colorPtr++ = lastColor;
+    }
+
+    // Set the new color count
+    if (ctableCount != nullptr) {
+        *ctableCount = colorCount;
+    }
+
+    fColorTable.reset(new SkColorTable(colorStorage, colorCount));
+    return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Creation
+///////////////////////////////////////////////////////////////////////////////
+
+#define PNG_BYTES_TO_CHECK 4
+
+bool SkPngCodec::IsPng(SkStream* stream) {
+    char buf[PNG_BYTES_TO_CHECK];
+    if (stream->read(buf, PNG_BYTES_TO_CHECK) != PNG_BYTES_TO_CHECK) {
+        return false;
+    }
+    if (png_sig_cmp((png_bytep) buf, (png_size_t)0, PNG_BYTES_TO_CHECK)) {
+        return false;
+    }
+    return true;
+}
+
+// Reads the header and initializes the output fields, if not NULL.
+//
+// @param stream Input data. Will be read to get enough information to properly
+//      setup the codec.
+// @param chunkReader SkPngChunkReader, for reading unknown chunks. May be NULL.
+//      If not NULL, png_ptr will hold an *unowned* pointer to it. The caller is
+//      expected to continue to own it for the lifetime of the png_ptr.
+// @param png_ptrp Optional output variable. If non-NULL, will be set to a new
+//      png_structp on success.
+// @param info_ptrp Optional output variable. If non-NULL, will be set to a new
+//      png_infop on success;
+// @param imageInfo Optional output variable. If non-NULL, will be set to
+//      reflect the properties of the encoded image on success.
+// @param bitDepthPtr Optional output variable. If non-NULL, will be set to the
+//      bit depth of the encoded image on success.
+// @param numberPassesPtr Optional output variable. If non-NULL, will be set to
+//      the number_passes of the encoded image on success.
+// @return true on success, in which case the caller is responsible for calling
+//      png_destroy_read_struct(png_ptrp, info_ptrp).
+//      If it returns false, the passed in fields (except stream) are unchanged.
+static bool read_header(SkStream* stream, SkPngChunkReader* chunkReader,
+                        png_structp* png_ptrp, png_infop* info_ptrp,
+                        SkImageInfo* imageInfo, int* bitDepthPtr, int* numberPassesPtr) {
+    // The image is known to be a PNG. Decode enough to know the SkImageInfo.
+    png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr,
+                                                 sk_error_fn, sk_warning_fn);
+    if (!png_ptr) {
+        return false;
+    }
+
+    AutoCleanPng autoClean(png_ptr);
+
+    png_infop info_ptr = png_create_info_struct(png_ptr);
+    if (info_ptr == nullptr) {
+        return false;
+    }
+
+    autoClean.setInfoPtr(info_ptr);
+
+    // FIXME: Could we use the return value of setjmp to specify the type of
+    // error?
+    if (setjmp(png_jmpbuf(png_ptr))) {
+        return false;
+    }
+
+    png_set_read_fn(png_ptr, static_cast<void*>(stream), sk_read_fn);
+
+#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
+    // FIXME: Does this need to be installed so early?
+    // hookup our chunkReader so we can see any user-chunks the caller may be interested in
+    if (chunkReader) {
+        png_set_keep_unknown_chunks(png_ptr, PNG_HANDLE_CHUNK_ALWAYS, (png_byte*)"", 0);
+        png_set_read_user_chunk_fn(png_ptr, (png_voidp) chunkReader, sk_read_user_chunk);
+    }
+#endif
+
+    // The call to png_read_info() gives us all of the information from the
+    // PNG file before the first IDAT (image data chunk).
+    png_read_info(png_ptr, info_ptr);
+    png_uint_32 origWidth, origHeight;
+    int bitDepth, colorType;
+    png_get_IHDR(png_ptr, info_ptr, &origWidth, &origHeight, &bitDepth,
+                 &colorType, int_p_NULL, int_p_NULL, int_p_NULL);
+
+    if (bitDepthPtr) {
+        *bitDepthPtr = bitDepth;
+    }
+
+    // sanity check for size
+    {
+        int64_t size = sk_64_mul(origWidth, origHeight);
+        // now check that if we are 4-bytes per pixel, we also don't overflow
+        if (size < 0 || size > (0x7FFFFFFF >> 2)) {
+            return false;
+        }
+    }
+
+    // Tell libpng to strip 16 bit/color files down to 8 bits/color
+    if (bitDepth == 16) {
+        png_set_strip_16(png_ptr);
+    }
+#ifdef PNG_READ_PACK_SUPPORTED
+    // Extract multiple pixels with bit depths of 1, 2, and 4 from a single
+    // byte into separate bytes (useful for paletted and grayscale images).
+    if (bitDepth < 8) {
+        png_set_packing(png_ptr);
+    }
+#endif
+    // Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel.
+    if (colorType == PNG_COLOR_TYPE_GRAY && bitDepth < 8) {
+        png_set_expand_gray_1_2_4_to_8(png_ptr);
+    }
+
+    // Now determine the default SkColorType and SkAlphaType and set required transforms
+    SkColorType skColorType = kUnknown_SkColorType;
+    SkAlphaType skAlphaType = kUnknown_SkAlphaType;
+    switch (colorType) {
+        case PNG_COLOR_TYPE_PALETTE:
+            skColorType = kIndex_8_SkColorType;
+            skAlphaType = has_transparency_in_tRNS(png_ptr, info_ptr) ?
+                    kUnpremul_SkAlphaType : kOpaque_SkAlphaType;
+            break;
+        case PNG_COLOR_TYPE_RGB:
+            if (has_transparency_in_tRNS(png_ptr, info_ptr)) {
+                //convert to RGBA with tranparency information in tRNS chunk if it exists
+                png_set_tRNS_to_alpha(png_ptr);
+                skAlphaType = kUnpremul_SkAlphaType;
+            } else {
+                //convert to RGBA with Opaque Alpha 
+                png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER);
+                skAlphaType = kOpaque_SkAlphaType;
+            }
+            skColorType = kN32_SkColorType;
+            break;
+        case PNG_COLOR_TYPE_GRAY:
+            if (has_transparency_in_tRNS(png_ptr, info_ptr)) {
+                //FIXME: support gray with alpha as a color type
+                //convert to RGBA if there is transparentcy info in the tRNS chunk
+                png_set_tRNS_to_alpha(png_ptr);
+                png_set_gray_to_rgb(png_ptr);
+                skColorType = kN32_SkColorType;
+                skAlphaType = kUnpremul_SkAlphaType;
+            } else {
+                skColorType = kGray_8_SkColorType;
+                skAlphaType = kOpaque_SkAlphaType;
+            }
+            break;
+        case PNG_COLOR_TYPE_GRAY_ALPHA:
+            //FIXME: support gray with alpha as a color type 
+            //convert to RGBA 
+            png_set_gray_to_rgb(png_ptr);
+            skColorType = kN32_SkColorType;
+            skAlphaType = kUnpremul_SkAlphaType;
+            break;
+        case PNG_COLOR_TYPE_RGBA:
+            skColorType = kN32_SkColorType;
+            skAlphaType = kUnpremul_SkAlphaType;
+            break;
+        default:
+            //all the color types have been covered above
+            SkASSERT(false);
+    }
+
+    int numberPasses = png_set_interlace_handling(png_ptr);
+    if (numberPassesPtr) {
+        *numberPassesPtr = numberPasses;
+    }
+
+    // FIXME: Also need to check for sRGB ( https://bug.skia.org/3471 ).
+
+    if (imageInfo) {
+        *imageInfo = SkImageInfo::Make(origWidth, origHeight, skColorType, skAlphaType);
+    }
+    autoClean.detach();
+    if (png_ptrp) {
+        *png_ptrp = png_ptr;
+    }
+    if (info_ptrp) {
+        *info_ptrp = info_ptr;
+    }
+
+    return true;
+}
+
+SkPngCodec::SkPngCodec(const SkImageInfo& info, SkStream* stream, SkPngChunkReader* chunkReader,
+                       png_structp png_ptr, png_infop info_ptr, int bitDepth, int numberPasses)
+    : INHERITED(info, stream)
+    , fPngChunkReader(SkSafeRef(chunkReader))
+    , fPng_ptr(png_ptr)
+    , fInfo_ptr(info_ptr)
+    , fSrcConfig(SkSwizzler::kUnknown)
+    , fNumberPasses(numberPasses)
+    , fBitDepth(bitDepth)
+{
+    if (info.alphaType() == kOpaque_SkAlphaType) {
+        fAlphaState = kOpaque_AlphaState;
+    } else {
+        fAlphaState = kUnknown_AlphaState;
+    }
+}
+
+SkPngCodec::~SkPngCodec() {
+    this->destroyReadStruct();
+}
+
+void SkPngCodec::destroyReadStruct() {
+    if (fPng_ptr) {
+        // We will never have a nullptr fInfo_ptr with a non-nullptr fPng_ptr
+        SkASSERT(fInfo_ptr);
+        png_destroy_read_struct(&fPng_ptr, &fInfo_ptr, png_infopp_NULL);
+        fPng_ptr = nullptr;
+        fInfo_ptr = nullptr;
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Getting the pixels
+///////////////////////////////////////////////////////////////////////////////
+
+SkCodec::Result SkPngCodec::initializeSwizzler(const SkImageInfo& requestedInfo,
+                                               const Options& options,
+                                               SkPMColor ctable[],
+                                               int* ctableCount) {
+    // FIXME: Could we use the return value of setjmp to specify the type of
+    // error?
+    if (setjmp(png_jmpbuf(fPng_ptr))) {
+        SkCodecPrintf("setjmp long jump!\n");
+        return kInvalidInput;
+    }
+    png_read_update_info(fPng_ptr, fInfo_ptr);  
+
+    //srcColorType was determined in read_header() which determined png color type
+    const SkColorType srcColorType = this->getInfo().colorType();
+
+    switch (srcColorType) {
+        case kIndex_8_SkColorType:
+            //decode palette to Skia format
+            fSrcConfig = SkSwizzler::kIndex;
+            if (!this->decodePalette(kPremul_SkAlphaType == requestedInfo.alphaType(),
+                    ctableCount)) {
+                return kInvalidInput;
+            }
+            break;
+        case kGray_8_SkColorType:
+            fSrcConfig = SkSwizzler::kGray;
+            break; 
+        case kN32_SkColorType:
+            if (this->getInfo().alphaType() == kOpaque_SkAlphaType) {
+                    fSrcConfig = SkSwizzler::kRGBX;
+                } else {
+                    fSrcConfig = SkSwizzler::kRGBA;
+            }
+            break;
+        default:
+            //would have exited before now if the colorType was supported by png
+            SkASSERT(false);
+    }  
+
+    // Copy the color table to the client if they request kIndex8 mode
+    copy_color_table(requestedInfo, fColorTable, ctable, ctableCount);
+
+    // Create the swizzler.  SkPngCodec retains ownership of the color table.
+    const SkPMColor* colors = get_color_ptr(fColorTable.get());
+    fSwizzler.reset(SkSwizzler::CreateSwizzler(fSrcConfig, colors, requestedInfo, options));
+    if (!fSwizzler) {
+        // FIXME: CreateSwizzler could fail for another reason.
+        return kUnimplemented;
+    }
+    return kSuccess;
+}
+
+
+bool SkPngCodec::onRewind() {
+    // This sets fPng_ptr and fInfo_ptr to nullptr. If read_header
+    // succeeds, they will be repopulated, and if it fails, they will
+    // remain nullptr. Any future accesses to fPng_ptr and fInfo_ptr will
+    // come through this function which will rewind and again attempt
+    // to reinitialize them.
+    this->destroyReadStruct();
+
+    png_structp png_ptr;
+    png_infop info_ptr;
+    if (!read_header(this->stream(), fPngChunkReader.get(), &png_ptr, &info_ptr,
+                     nullptr, nullptr, nullptr)) {
+        return false;
+    }
+
+    fPng_ptr = png_ptr;
+    fInfo_ptr = info_ptr;
+    return true;
+}
+
+SkCodec::Result SkPngCodec::onGetPixels(const SkImageInfo& requestedInfo, void* dst,
+                                        size_t dstRowBytes, const Options& options,
+                                        SkPMColor ctable[], int* ctableCount,
+                                        int* rowsDecoded) {
+    if (!conversion_possible(requestedInfo, this->getInfo())) {
+        return kInvalidConversion;
+    }
+    if (options.fSubset) {
+        // Subsets are not supported.
+        return kUnimplemented;
+    }
+
+    // Note that ctable and ctableCount may be modified if there is a color table
+    const Result result = this->initializeSwizzler(requestedInfo, options, ctable, ctableCount);
+    if (result != kSuccess) {
+        return result;
+    }
+    // FIXME: Could we use the return value of setjmp to specify the type of
+    // error?
+    int row = 0;
+    // This must be declared above the call to setjmp to avoid memory leaks on incomplete images.
+    SkAutoMalloc storage;
+    if (setjmp(png_jmpbuf(fPng_ptr))) {
+        // Assume that any error that occurs while reading rows is caused by an incomplete input.
+        if (fNumberPasses > 1) {
+            // FIXME (msarett): Handle incomplete interlaced pngs.
+            return kInvalidInput;
+        }
+        // FIXME: We do a poor job on incomplete pngs compared to other decoders (ex: Chromium,
+        // Ubuntu Image Viewer).  This is because we use the default buffer size in libpng (8192
+        // bytes), and if we can't fill the buffer, we immediately fail.
+        // For example, if we try to read 8192 bytes, and the image (incorrectly) only contains
+        // half that, which may have been enough to contain a non-zero number of lines, we fail
+        // when we could have decoded a few more lines and then failed.
+        // The read function that we provide for libpng has no way of indicating that we have
+        // made a partial read.
+        // Making our buffer size smaller improves our incomplete decodes, but what impact does
+        // it have on regular decode performance?  Should we investigate using a different API
+        // instead of png_read_row(s)?  Chromium uses png_process_data.
+        *rowsDecoded = row;
+        return kIncompleteInput;
+    }
+
+    bool hasAlpha = false;
+    // FIXME: We could split these out based on subclass.
+    void* dstRow = dst;
+    if (fNumberPasses > 1) {
+        const int width = requestedInfo.width();
+        const int height = requestedInfo.height();
+        const int bpp = SkSwizzler::BytesPerPixel(fSrcConfig);
+        const size_t srcRowBytes = width * bpp;
+
+        storage.reset(width * height * bpp);
+        uint8_t* const base = static_cast<uint8_t*>(storage.get());
+
+        for (int i = 0; i < fNumberPasses; i++) {
+            uint8_t* srcRow = base;
+            for (int y = 0; y < height; y++) {
+                uint8_t* bmRow = srcRow;
+                png_read_rows(fPng_ptr, &bmRow, png_bytepp_NULL, 1);
+                srcRow += srcRowBytes;
+            }
+        }
+
+        // Now swizzle it.
+        uint8_t* srcRow = base;
+        for (int y = 0; y < height; y++) {
+            hasAlpha |= !SkSwizzler::IsOpaque(fSwizzler->swizzle(dstRow, srcRow));
+            dstRow = SkTAddOffset<void>(dstRow, dstRowBytes);
+            srcRow += srcRowBytes;
+        }
+    } else {
+        storage.reset(requestedInfo.width() * SkSwizzler::BytesPerPixel(fSrcConfig));
+        uint8_t* srcRow = static_cast<uint8_t*>(storage.get());
+        for (; row < requestedInfo.height(); row++) {
+            png_read_rows(fPng_ptr, &srcRow, png_bytepp_NULL, 1);
+            // FIXME: Only call IsOpaque once, outside the loop. Same for onGetScanlines.
+            hasAlpha |= !SkSwizzler::IsOpaque(fSwizzler->swizzle(dstRow, srcRow));
+            dstRow = SkTAddOffset<void>(dstRow, dstRowBytes);
+        }
+    }
+
+    if (hasAlpha) {
+        fAlphaState = kHasAlpha_AlphaState;
+    } else {
+        fAlphaState = kOpaque_AlphaState;
+    }
+
+    // FIXME: do we need substituteTranspColor? Note that we cannot do it for
+    // scanline decoding, but we could do it here. Alternatively, we could do
+    // it as we go, instead of in post-processing like SkPNGImageDecoder.
+
+    if (setjmp(png_jmpbuf(fPng_ptr))) {
+        // We've already read all the scanlines. This is a success.
+        return kSuccess;
+    }
+
+    // read rest of file, and get additional comment and time chunks in info_ptr
+    png_read_end(fPng_ptr, fInfo_ptr);
+
+    return kSuccess;
+}
+
+uint32_t SkPngCodec::onGetFillValue(SkColorType colorType, SkAlphaType alphaType) const {
+    const SkPMColor* colorPtr = get_color_ptr(fColorTable.get());
+    if (colorPtr) {
+        return get_color_table_fill_value(colorType, colorPtr, 0);
+    }
+    return INHERITED::onGetFillValue(colorType, alphaType);
+}
+
+bool SkPngCodec::onReallyHasAlpha() const {
+    switch (fAlphaState) {
+        case kOpaque_AlphaState:
+            return false;
+        case kUnknown_AlphaState:
+            // Maybe the subclass knows?
+            return this->alphaInScanlineDecode() == kHasAlpha_AlphaState;
+        case kHasAlpha_AlphaState:
+            switch (this->alphaInScanlineDecode()) {
+                case kUnknown_AlphaState:
+                    // Scanline decoder must not have been used. Return our knowledge.
+                    return true;
+                case kOpaque_AlphaState:
+                    // Scanline decoder was used, and did not find alpha in its subset.
+                    return false;
+                case kHasAlpha_AlphaState:
+                    return true;
+            }
+    }
+
+    // All valid AlphaStates have been covered, so this should not be reached.
+    SkASSERT(false);
+    return true;
+}
+
+// Subclass of SkPngCodec which supports scanline decoding
+class SkPngScanlineDecoder : public SkPngCodec {
+public:
+    SkPngScanlineDecoder(const SkImageInfo& srcInfo, SkStream* stream,
+            SkPngChunkReader* chunkReader, png_structp png_ptr, png_infop info_ptr, int bitDepth)
+        : INHERITED(srcInfo, stream, chunkReader, png_ptr, info_ptr, bitDepth, 1)
+        , fAlphaState(kUnknown_AlphaState)
+        , fSrcRow(nullptr)
+    {}
+
+    Result onStartScanlineDecode(const SkImageInfo& dstInfo, const Options& options,
+            SkPMColor ctable[], int* ctableCount) override {
+        if (!conversion_possible(dstInfo, this->getInfo())) {
+            return kInvalidConversion;
+        }
+
+        const Result result = this->initializeSwizzler(dstInfo, options, ctable,
+                                                       ctableCount);
+        if (result != kSuccess) {
+            return result;
+        }
+
+        fAlphaState = kUnknown_AlphaState;
+        fStorage.reset(this->getInfo().width() * SkSwizzler::BytesPerPixel(this->srcConfig()));
+        fSrcRow = static_cast<uint8_t*>(fStorage.get());
+
+        return kSuccess;
+    }
+
+    int onGetScanlines(void* dst, int count, size_t rowBytes) override {
+        // Assume that an error in libpng indicates an incomplete input.
+        int row = 0;
+        if (setjmp(png_jmpbuf(this->png_ptr()))) {
+            SkCodecPrintf("setjmp long jump!\n");
+            return row;
+        }
+
+        void* dstRow = dst;
+        bool hasAlpha = false;
+        for (; row < count; row++) {
+            png_read_rows(this->png_ptr(), &fSrcRow, png_bytepp_NULL, 1);
+            hasAlpha |= !SkSwizzler::IsOpaque(this->swizzler()->swizzle(dstRow, fSrcRow));
+            dstRow = SkTAddOffset<void>(dstRow, rowBytes);
+        }
+
+        if (hasAlpha) {
+            fAlphaState = kHasAlpha_AlphaState;
+        } else {
+            if (kUnknown_AlphaState == fAlphaState) {
+                fAlphaState = kOpaque_AlphaState;
+            }
+            // Otherwise, the AlphaState is unchanged.
+        }
+
+        return row;
+    }
+
+    bool onSkipScanlines(int count) override {
+        // Assume that an error in libpng indicates an incomplete input.
+        if (setjmp(png_jmpbuf(this->png_ptr()))) {
+            SkCodecPrintf("setjmp long jump!\n");
+            return false;
+        }
+        //there is a potential tradeoff of memory vs speed created by putting this in a loop. 
+        //calling png_read_rows in a loop is insignificantly slower than calling it once with count 
+        //as png_read_rows has it's own loop which calls png_read_row count times.
+        for (int row = 0; row < count; row++) {
+            png_read_rows(this->png_ptr(), &fSrcRow, png_bytepp_NULL, 1);
+        }
+        return true;
+    }
+
+    AlphaState alphaInScanlineDecode() const override {
+        return fAlphaState;
+    }
+
+private:
+    AlphaState                  fAlphaState;
+    SkAutoMalloc                fStorage;
+    uint8_t*                    fSrcRow;
+
+    typedef SkPngCodec INHERITED;
+};
+
+
+class SkPngInterlacedScanlineDecoder : public SkPngCodec {
+public:
+    SkPngInterlacedScanlineDecoder(const SkImageInfo& srcInfo, SkStream* stream,
+            SkPngChunkReader* chunkReader, png_structp png_ptr, png_infop info_ptr,
+            int bitDepth, int numberPasses)
+        : INHERITED(srcInfo, stream, chunkReader, png_ptr, info_ptr, bitDepth, numberPasses)
+        , fAlphaState(kUnknown_AlphaState)
+        , fHeight(-1)
+        , fCanSkipRewind(false)
+    {
+        SkASSERT(numberPasses != 1);
+    }
+
+    Result onStartScanlineDecode(const SkImageInfo& dstInfo, const Options& options,
+            SkPMColor ctable[], int* ctableCount) override {
+        if (!conversion_possible(dstInfo, this->getInfo())) {
+            return kInvalidConversion;    
+        }
+
+        const Result result = this->initializeSwizzler(dstInfo, options, ctable,
+                                                       ctableCount);
+        if (result != kSuccess) {
+            return result;
+        }
+
+        fAlphaState = kUnknown_AlphaState;
+        fHeight = dstInfo.height();
+        // FIXME: This need not be called on a second call to onStartScanlineDecode.
+        fSrcRowBytes = this->getInfo().width() * SkSwizzler::BytesPerPixel(this->srcConfig());
+        fGarbageRow.reset(fSrcRowBytes);
+        fGarbageRowPtr = static_cast<uint8_t*>(fGarbageRow.get());
+        fCanSkipRewind = true;
+
+        return SkCodec::kSuccess;
+    }
+
+    int onGetScanlines(void* dst, int count, size_t dstRowBytes) override {
+        // rewind stream if have previously called onGetScanlines,
+        // since we need entire progressive image to get scanlines
+        if (fCanSkipRewind) {
+            // We already rewound in onStartScanlineDecode, so there is no reason to rewind.
+            // Next time onGetScanlines is called, we will need to rewind.
+            fCanSkipRewind = false;
+        } else {
+            // rewindIfNeeded resets fCurrScanline, since it assumes that start
+            // needs to be called again before scanline decoding. PNG scanline
+            // decoding is the exception, since it needs to rewind between
+            // calls to getScanlines. Keep track of fCurrScanline, to undo the
+            // reset.
+            const int currScanline = this->nextScanline();
+            // This method would never be called if currScanline is -1
+            SkASSERT(currScanline != -1);
+
+            if (!this->rewindIfNeeded()) {
+                return kCouldNotRewind;
+            }
+            this->updateNextScanline(currScanline);
+        }
+
+        if (setjmp(png_jmpbuf(this->png_ptr()))) {
+            SkCodecPrintf("setjmp long jump!\n");
+            // FIXME (msarett): Returning 0 is pessimistic.  If we can complete a single pass,
+            // we may be able to report that all of the memory has been initialized.  Even if we
+            // fail on the first pass, we can still report than some scanlines are initialized.
+            return 0;
+        }
+        SkAutoMalloc storage(count * fSrcRowBytes);
+        uint8_t* storagePtr = static_cast<uint8_t*>(storage.get());
+        uint8_t* srcRow;
+        const int startRow = this->nextScanline();
+        for (int i = 0; i < this->numberPasses(); i++) {
+            // read rows we planned to skip into garbage row
+            for (int y = 0; y < startRow; y++){
+                png_read_rows(this->png_ptr(), &fGarbageRowPtr, png_bytepp_NULL, 1);
+            }
+            // read rows we care about into buffer
+            srcRow = storagePtr;
+            for (int y = 0; y < count; y++) {
+                png_read_rows(this->png_ptr(), &srcRow, png_bytepp_NULL, 1);
+                srcRow += fSrcRowBytes;
+            }
+            // read rows we don't want into garbage buffer
+            for (int y = 0; y < fHeight - startRow - count; y++) {
+                png_read_rows(this->png_ptr(), &fGarbageRowPtr, png_bytepp_NULL, 1);
+            }
+        }
+        //swizzle the rows we care about
+        srcRow = storagePtr;
+        void* dstRow = dst;
+        bool hasAlpha = false;
+        for (int y = 0; y < count; y++) {
+            hasAlpha |= !SkSwizzler::IsOpaque(this->swizzler()->swizzle(dstRow, srcRow));
+            dstRow = SkTAddOffset<void>(dstRow, dstRowBytes);
+            srcRow += fSrcRowBytes;
+        }
+
+        if (hasAlpha) {
+            fAlphaState = kHasAlpha_AlphaState;
+        } else {
+            if (kUnknown_AlphaState == fAlphaState) {
+                fAlphaState = kOpaque_AlphaState;
+            }
+            // Otherwise, the AlphaState is unchanged.
+        }
+
+        return count;
+    }
+
+    bool onSkipScanlines(int count) override {
+        // The non-virtual version will update fCurrScanline.
+        return true;
+    }
+
+    AlphaState alphaInScanlineDecode() const override {
+        return fAlphaState;
+    }
+
+    SkScanlineOrder onGetScanlineOrder() const override {
+        return kNone_SkScanlineOrder;
+    }
+
+private:
+    AlphaState                  fAlphaState;
+    int                         fHeight;
+    size_t                      fSrcRowBytes;
+    SkAutoMalloc                fGarbageRow;
+    uint8_t*                    fGarbageRowPtr;
+    // FIXME: This imitates behavior in SkCodec::rewindIfNeeded. That function
+    // is called whenever some action is taken that reads the stream and
+    // therefore the next call will require a rewind. So it modifies a boolean
+    // to note that the *next* time it is called a rewind is needed.
+    // SkPngInterlacedScanlineDecoder has an extra wrinkle - calling
+    // onStartScanlineDecode followed by onGetScanlines does *not* require a
+    // rewind. Since rewindIfNeeded does not have this flexibility, we need to
+    // add another layer.
+    bool                        fCanSkipRewind;
+
+    typedef SkPngCodec INHERITED;
+};
+
+SkCodec* SkPngCodec::NewFromStream(SkStream* stream, SkPngChunkReader* chunkReader) {
+    SkAutoTDelete<SkStream> streamDeleter(stream);
+    png_structp png_ptr;
+    png_infop info_ptr;
+    SkImageInfo imageInfo;
+    int bitDepth;
+    int numberPasses;
+
+    if (!read_header(stream, chunkReader, &png_ptr, &info_ptr, &imageInfo, &bitDepth,
+                     &numberPasses)) {
+        return nullptr;
+    }
+
+    if (1 == numberPasses) {
+        return new SkPngScanlineDecoder(imageInfo, streamDeleter.detach(), chunkReader,
+                                        png_ptr, info_ptr, bitDepth);
+    }
+
+    return new SkPngInterlacedScanlineDecoder(imageInfo, streamDeleter.detach(), chunkReader,
+                                              png_ptr, info_ptr, bitDepth, numberPasses);
+}
diff --git a/gfx/skia/skia/src/codec/SkCodec_libpng.h b/gfx/skia/skia/src/codec/SkCodec_libpng.h
new file mode 100644
index 000000000000..c2a5f4a7075d
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkCodec_libpng.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkCodec.h"
+#include "SkColorTable.h"
+#include "SkPngChunkReader.h"
+#include "SkEncodedFormat.h"
+#include "SkImageInfo.h"
+#include "SkRefCnt.h"
+#include "SkSwizzler.h"
+
+#include "png.h"
+
+class SkStream;
+
+class SkPngCodec : public SkCodec {
+public:
+    static bool IsPng(SkStream*);
+
+    // Assume IsPng was called and returned true.
+    static SkCodec* NewFromStream(SkStream*, SkPngChunkReader* = NULL);
+
+    virtual ~SkPngCodec();
+
+protected:
+    Result onGetPixels(const SkImageInfo&, void*, size_t, const Options&, SkPMColor*, int*, int*)
+            override;
+    SkEncodedFormat onGetEncodedFormat() const override { return kPNG_SkEncodedFormat; }
+    bool onRewind() override;
+    uint32_t onGetFillValue(SkColorType colorType, SkAlphaType alphaType) const override;
+    bool onReallyHasAlpha() const final;
+
+    // Helper to set up swizzler and color table. Also calls png_read_update_info.
+    Result initializeSwizzler(const SkImageInfo& requestedInfo, const Options&,
+                              SkPMColor*, int* ctableCount);
+    SkSampler* getSampler(bool createIfNecessary) override {
+        SkASSERT(fSwizzler);
+        return fSwizzler;
+    }
+
+    SkPngCodec(const SkImageInfo&, SkStream*, SkPngChunkReader*, png_structp, png_infop, int, int);
+
+    png_structp png_ptr() { return fPng_ptr; }
+    SkSwizzler* swizzler() { return fSwizzler; }
+    SkSwizzler::SrcConfig srcConfig() const { return fSrcConfig; }
+    int numberPasses() const { return fNumberPasses; }
+
+    enum AlphaState {
+        // This class has done no decoding, or threw away its knowledge (in
+        // scanline decodes).
+        kUnknown_AlphaState,
+        // This class found the image (possibly partial, in the case of a
+        // scanline decode) to be opaque.
+        kOpaque_AlphaState,
+        // Ths class found the image to have alpha.
+        kHasAlpha_AlphaState,
+    };
+
+    virtual AlphaState alphaInScanlineDecode() const = 0;
+
+private:
+    SkAutoTUnref<SkPngChunkReader>  fPngChunkReader;
+    png_structp                     fPng_ptr;
+    png_infop                       fInfo_ptr;
+
+    // These are stored here so they can be used both by normal decoding and scanline decoding.
+    SkAutoTUnref<SkColorTable>      fColorTable;    // May be unpremul.
+    SkAutoTDelete<SkSwizzler>       fSwizzler;
+
+    SkSwizzler::SrcConfig           fSrcConfig;
+    const int                       fNumberPasses;
+    int                             fBitDepth;
+    AlphaState                      fAlphaState;
+
+    bool decodePalette(bool premultiply, int* ctableCount);
+    void destroyReadStruct();
+
+    typedef SkCodec INHERITED;
+};
diff --git a/gfx/skia/skia/src/codec/SkCodec_wbmp.cpp b/gfx/skia/skia/src/codec/SkCodec_wbmp.cpp
new file mode 100644
index 000000000000..8f8763fb90e0
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkCodec_wbmp.cpp
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkCodec.h"
+#include "SkCodecPriv.h"
+#include "SkColorPriv.h"
+#include "SkColorTable.h"
+#include "SkStream.h"
+#include "SkCodec_wbmp.h"
+
+// Each bit represents a pixel, so width is actually a number of bits.
+// A row will always be stored in bytes, so we round width up to the
+// nearest multiple of 8 to get the number of bits actually in the row.
+// We then divide by 8 to convert to bytes.
+static inline size_t get_src_row_bytes(int width) {
+    return SkAlign8(width) >> 3;
+}
+
+static inline void setup_color_table(SkColorType colorType,
+        SkPMColor* colorPtr, int* colorCount) {
+    if (kIndex_8_SkColorType == colorType) {
+        colorPtr[0] = SK_ColorBLACK;
+        colorPtr[1] = SK_ColorWHITE;
+        *colorCount = 2;
+    }
+}
+
+static bool read_byte(SkStream* stream, uint8_t* data)
+{
+    return stream->read(data, 1) == 1;
+}
+
+// http://en.wikipedia.org/wiki/Variable-length_quantity
+static bool read_mbf(SkStream* stream, uint64_t* value) {
+    uint64_t n = 0;
+    uint8_t data;
+    const uint64_t kLimit = 0xFE00000000000000;
+    SkASSERT(kLimit == ~((~static_cast<uint64_t>(0)) >> 7));
+    do {
+        if (n & kLimit) { // Will overflow on shift by 7.
+            return false;
+        }
+        if (stream->read(&data, 1) != 1) {
+            return false;
+        }
+        n = (n << 7) | (data & 0x7F);
+    } while (data & 0x80);
+    *value = n;
+    return true;
+}
+
+static bool read_header(SkStream* stream, SkISize* size) {
+    {
+        uint8_t data;
+        if (!read_byte(stream, &data) || data != 0) { // unknown type
+            return false;
+        }
+        if (!read_byte(stream, &data) || (data & 0x9F)) { // skip fixed header
+            return false;
+        }
+    }
+
+    uint64_t width, height;
+    if (!read_mbf(stream, &width) || width > 0xFFFF || !width) {
+        return false;
+    }
+    if (!read_mbf(stream, &height) || height > 0xFFFF || !height) {
+        return false;
+    }
+    if (size) {
+        *size = SkISize::Make(SkToS32(width), SkToS32(height));
+    }
+    return true;
+}
+
+bool SkWbmpCodec::onRewind() {
+    return read_header(this->stream(), nullptr);
+}
+
+SkSwizzler* SkWbmpCodec::initializeSwizzler(const SkImageInfo& info, const SkPMColor* ctable,
+        const Options& opts) {
+    // Create the swizzler based on the desired color type
+    switch (info.colorType()) {
+        case kIndex_8_SkColorType:
+        case kN32_SkColorType:
+        case kRGB_565_SkColorType:
+        case kGray_8_SkColorType:
+            break;
+        default:
+            return nullptr;
+    }
+    return SkSwizzler::CreateSwizzler(SkSwizzler::kBit, ctable, info, opts);
+}
+
+bool SkWbmpCodec::readRow(uint8_t* row) {
+    return this->stream()->read(row, fSrcRowBytes) == fSrcRowBytes;
+}
+
+SkWbmpCodec::SkWbmpCodec(const SkImageInfo& info, SkStream* stream)
+    : INHERITED(info, stream)
+    , fSrcRowBytes(get_src_row_bytes(this->getInfo().width()))
+    , fSwizzler(nullptr)
+    , fColorTable(nullptr)
+{}
+
+SkEncodedFormat SkWbmpCodec::onGetEncodedFormat() const {
+    return kWBMP_SkEncodedFormat;
+}
+
+SkCodec::Result SkWbmpCodec::onGetPixels(const SkImageInfo& info,
+                                         void* dst,
+                                         size_t rowBytes,
+                                         const Options& options,
+                                         SkPMColor ctable[],
+                                         int* ctableCount,
+                                         int* rowsDecoded) {
+    if (options.fSubset) {
+        // Subsets are not supported.
+        return kUnimplemented;
+    }
+
+    if (!valid_alpha(info.alphaType(), this->getInfo().alphaType())) {
+        return kInvalidConversion;
+    }
+
+    // Prepare a color table if necessary
+    setup_color_table(info.colorType(), ctable, ctableCount);
+
+    // Initialize the swizzler
+    SkAutoTDelete<SkSwizzler> swizzler(this->initializeSwizzler(info, ctable, options));
+    if (nullptr == swizzler.get()) {
+        return kInvalidConversion;
+    }
+
+    // Perform the decode
+    SkISize size = info.dimensions();
+    SkAutoTMalloc<uint8_t> src(fSrcRowBytes);
+    void* dstRow = dst;
+    for (int y = 0; y < size.height(); ++y) {
+        if (!this->readRow(src.get())) {
+            *rowsDecoded = y;
+            return kIncompleteInput;
+        }
+        swizzler->swizzle(dstRow, src.get());
+        dstRow = SkTAddOffset<void>(dstRow, rowBytes);
+    }
+    return kSuccess;
+}
+
+bool SkWbmpCodec::IsWbmp(SkStream* stream) {
+    return read_header(stream, nullptr);
+}
+
+SkCodec* SkWbmpCodec::NewFromStream(SkStream* stream) {
+    SkAutoTDelete<SkStream> streamDeleter(stream);
+    SkISize size;
+    if (!read_header(stream, &size)) {
+        return nullptr;
+    }
+    SkImageInfo info = SkImageInfo::Make(size.width(), size.height(),
+            kGray_8_SkColorType, kOpaque_SkAlphaType);
+    return new SkWbmpCodec(info, streamDeleter.detach());
+}
+
+int SkWbmpCodec::onGetScanlines(void* dst, int count, size_t dstRowBytes) {
+    void* dstRow = dst;
+    for (int y = 0; y < count; ++y) {
+        if (!this->readRow(fSrcBuffer.get())) {
+            return y;
+        }
+        fSwizzler->swizzle(dstRow, fSrcBuffer.get());
+        dstRow = SkTAddOffset<void>(dstRow, dstRowBytes);
+    }
+    return count;
+}
+
+SkCodec::Result SkWbmpCodec::onStartScanlineDecode(const SkImageInfo& dstInfo,
+        const Options& options, SkPMColor inputColorTable[], int* inputColorCount) {
+    if (options.fSubset) {
+        // Subsets are not supported.
+        return kUnimplemented;
+    }
+
+    if (!valid_alpha(dstInfo.alphaType(), this->getInfo().alphaType())) {
+        return kInvalidConversion;
+    }
+
+    // Fill in the color table
+    setup_color_table(dstInfo.colorType(), inputColorTable, inputColorCount);
+
+    // Copy the color table to a pointer that can be owned by the scanline decoder
+    if (kIndex_8_SkColorType == dstInfo.colorType()) {
+        fColorTable.reset(new SkColorTable(inputColorTable, 2));
+    }
+
+    // Initialize the swizzler
+    fSwizzler.reset(this->initializeSwizzler(dstInfo, get_color_ptr(fColorTable.get()), options));
+    if (nullptr == fSwizzler.get()) {
+        return kInvalidConversion;
+    }
+
+    fSrcBuffer.reset(fSrcRowBytes);
+
+    return kSuccess;
+}
diff --git a/gfx/skia/skia/src/codec/SkCodec_wbmp.h b/gfx/skia/skia/src/codec/SkCodec_wbmp.h
new file mode 100644
index 000000000000..f54dd0f1662a
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkCodec_wbmp.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkCodec_wbmp_DEFINED
+#define SkCodec_wbmp_DEFINED
+
+#include "SkCodec.h"
+#include "SkSwizzler.h"
+
+class SkWbmpCodec final : public SkCodec {
+public:
+    static bool IsWbmp(SkStream*);
+
+    /*
+     * Assumes IsWbmp was called and returned true
+     * Creates a wbmp codec
+     * Takes ownership of the stream
+     */
+    static SkCodec* NewFromStream(SkStream*);
+
+protected:
+    SkEncodedFormat onGetEncodedFormat() const override;
+    Result onGetPixels(const SkImageInfo&, void*, size_t,
+                       const Options&, SkPMColor[], int*, int*) override;
+    bool onRewind() override;
+private:
+    /*
+     * Returns a swizzler on success, nullptr on failure
+     */
+    SkSwizzler* initializeSwizzler(const SkImageInfo& info, const SkPMColor* ctable,
+                                   const Options& opts);
+    SkSampler* getSampler(bool createIfNecessary) override {
+        SkASSERT(fSwizzler || !createIfNecessary);
+        return fSwizzler;
+    }
+
+    /*
+     * Read a src row from the encoded stream
+     */
+    bool readRow(uint8_t* row);
+
+    SkWbmpCodec(const SkImageInfo&, SkStream*);
+
+    const size_t                 fSrcRowBytes;
+
+    // Used for scanline decodes:
+    SkAutoTDelete<SkSwizzler>    fSwizzler;
+    SkAutoTUnref<SkColorTable>   fColorTable;
+    SkAutoTMalloc<uint8_t>       fSrcBuffer;
+
+    // FIXME: Override onSkipScanlines to avoid swizzling.
+    int onGetScanlines(void* dst, int count, size_t dstRowBytes) override;
+    Result onStartScanlineDecode(const SkImageInfo& dstInfo, const Options& options,
+            SkPMColor inputColorTable[], int* inputColorCount) override;
+
+    typedef SkCodec INHERITED;
+};
+
+#endif  // SkCodec_wbmp_DEFINED
diff --git a/gfx/skia/skia/src/codec/SkJpegCodec.cpp b/gfx/skia/skia/src/codec/SkJpegCodec.cpp
new file mode 100644
index 000000000000..6e2fc84ec8b5
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkJpegCodec.cpp
@@ -0,0 +1,456 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkCodec.h"
+#include "SkJpegCodec.h"
+#include "SkJpegDecoderMgr.h"
+#include "SkJpegUtility_codec.h"
+#include "SkCodecPriv.h"
+#include "SkColorPriv.h"
+#include "SkStream.h"
+#include "SkTemplates.h"
+#include "SkTypes.h"
+
+// stdio is needed for libjpeg-turbo
+#include <stdio.h>
+
+extern "C" {
+    #include "jerror.h"
+    #include "jpeglib.h"
+}
+
+bool SkJpegCodec::IsJpeg(SkStream* stream) {
+    static const uint8_t jpegSig[] = { 0xFF, 0xD8, 0xFF };
+    char buffer[sizeof(jpegSig)];
+    return stream->read(buffer, sizeof(jpegSig)) == sizeof(jpegSig) &&
+            !memcmp(buffer, jpegSig, sizeof(jpegSig));
+}
+
+bool SkJpegCodec::ReadHeader(SkStream* stream, SkCodec** codecOut,
+        JpegDecoderMgr** decoderMgrOut) {
+
+    // Create a JpegDecoderMgr to own all of the decompress information
+    SkAutoTDelete<JpegDecoderMgr> decoderMgr(new JpegDecoderMgr(stream));
+
+    // libjpeg errors will be caught and reported here
+    if (setjmp(decoderMgr->getJmpBuf())) {
+        return decoderMgr->returnFalse("setjmp");
+    }
+
+    // Initialize the decompress info and the source manager
+    decoderMgr->init();
+
+    // Read the jpeg header
+    if (JPEG_HEADER_OK != jpeg_read_header(decoderMgr->dinfo(), true)) {
+        return decoderMgr->returnFalse("read_header");
+    }
+
+    if (nullptr != codecOut) {
+        // Recommend the color type to decode to
+        const SkColorType colorType = decoderMgr->getColorType();
+
+        // Create image info object and the codec
+        const SkImageInfo& imageInfo = SkImageInfo::Make(decoderMgr->dinfo()->image_width,
+                decoderMgr->dinfo()->image_height, colorType, kOpaque_SkAlphaType);
+        *codecOut = new SkJpegCodec(imageInfo, stream, decoderMgr.detach());
+    } else {
+        SkASSERT(nullptr != decoderMgrOut);
+        *decoderMgrOut = decoderMgr.detach();
+    }
+    return true;
+}
+
+SkCodec* SkJpegCodec::NewFromStream(SkStream* stream) {
+    SkAutoTDelete<SkStream> streamDeleter(stream);
+    SkCodec* codec = nullptr;
+    if (ReadHeader(stream,  &codec, nullptr)) {
+        // Codec has taken ownership of the stream, we do not need to delete it
+        SkASSERT(codec);
+        streamDeleter.detach();
+        return codec;
+    }
+    return nullptr;
+}
+
+SkJpegCodec::SkJpegCodec(const SkImageInfo& srcInfo, SkStream* stream,
+        JpegDecoderMgr* decoderMgr)
+    : INHERITED(srcInfo, stream)
+    , fDecoderMgr(decoderMgr)
+    , fReadyState(decoderMgr->dinfo()->global_state)
+{}
+
+/*
+ * Return the row bytes of a particular image type and width
+ */
+static int get_row_bytes(const j_decompress_ptr dinfo) {
+    int colorBytes = (dinfo->out_color_space == JCS_RGB565) ? 2 : dinfo->out_color_components;
+    return dinfo->output_width * colorBytes;
+
+}
+
+/*
+ *  Calculate output dimensions based on the provided factors.
+ *
+ *  Not to be used on the actual jpeg_decompress_struct used for decoding, since it will
+ *  incorrectly modify num_components.
+ */
+void calc_output_dimensions(jpeg_decompress_struct* dinfo, unsigned int num, unsigned int denom) {
+    dinfo->num_components = 0;
+    dinfo->scale_num = num;
+    dinfo->scale_denom = denom;
+    jpeg_calc_output_dimensions(dinfo);
+}
+
+/*
+ * Return a valid set of output dimensions for this decoder, given an input scale
+ */
+SkISize SkJpegCodec::onGetScaledDimensions(float desiredScale) const {
+    // libjpeg-turbo supports scaling by 1/8, 1/4, 3/8, 1/2, 5/8, 3/4, 7/8, and 1/1, so we will
+    // support these as well
+    unsigned int num;
+    unsigned int denom = 8;
+    if (desiredScale >= 0.9375) {
+        num = 8;
+    } else if (desiredScale >= 0.8125) {
+        num = 7;
+    } else if (desiredScale >= 0.6875f) {
+        num = 6;
+    } else if (desiredScale >= 0.5625f) {
+        num = 5;
+    } else if (desiredScale >= 0.4375f) {
+        num = 4;
+    } else if (desiredScale >= 0.3125f) {
+        num = 3;
+    } else if (desiredScale >= 0.1875f) {
+        num = 2;
+    } else {
+        num = 1;
+    }
+
+    // Set up a fake decompress struct in order to use libjpeg to calculate output dimensions
+    jpeg_decompress_struct dinfo;
+    sk_bzero(&dinfo, sizeof(dinfo));
+    dinfo.image_width = this->getInfo().width();
+    dinfo.image_height = this->getInfo().height();
+    dinfo.global_state = fReadyState;
+    calc_output_dimensions(&dinfo, num, denom);
+
+    // Return the calculated output dimensions for the given scale
+    return SkISize::Make(dinfo.output_width, dinfo.output_height);
+}
+
+bool SkJpegCodec::onRewind() {
+    JpegDecoderMgr* decoderMgr = nullptr;
+    if (!ReadHeader(this->stream(), nullptr, &decoderMgr)) {
+        return fDecoderMgr->returnFalse("could not rewind");
+    }
+    SkASSERT(nullptr != decoderMgr);
+    fDecoderMgr.reset(decoderMgr);
+    return true;
+}
+
+/*
+ * Checks if the conversion between the input image and the requested output
+ * image has been implemented
+ * Sets the output color space
+ */
+bool SkJpegCodec::setOutputColorSpace(const SkImageInfo& dst) {
+    const SkImageInfo& src = this->getInfo();
+
+    // Ensure that the profile type is unchanged
+    if (dst.profileType() != src.profileType()) {
+        return false;
+    }
+
+    // Ensure that the alpha type is opaque
+    if (kOpaque_SkAlphaType != dst.alphaType()) {
+        return false;
+    }
+
+    // Check if we will decode to CMYK because a conversion to RGBA is not supported
+    J_COLOR_SPACE colorSpace = fDecoderMgr->dinfo()->jpeg_color_space;
+    bool isCMYK = JCS_CMYK == colorSpace || JCS_YCCK == colorSpace;
+
+    // Check for valid color types and set the output color space
+    switch (dst.colorType()) {
+        case kN32_SkColorType:
+            if (isCMYK) {
+                fDecoderMgr->dinfo()->out_color_space = JCS_CMYK;
+            } else {
+                // Check the byte ordering of the RGBA color space for the
+                // current platform
+#if defined(SK_PMCOLOR_IS_RGBA)
+                fDecoderMgr->dinfo()->out_color_space = JCS_EXT_RGBA;
+#else
+                fDecoderMgr->dinfo()->out_color_space = JCS_EXT_BGRA;
+#endif
+            }
+            return true;
+        case kRGB_565_SkColorType:
+            if (isCMYK) {
+                fDecoderMgr->dinfo()->out_color_space = JCS_CMYK;
+            } else {
+                fDecoderMgr->dinfo()->dither_mode = JDITHER_NONE;
+                fDecoderMgr->dinfo()->out_color_space = JCS_RGB565;
+            }
+            return true;
+        case kGray_8_SkColorType:
+            if (isCMYK) {
+                return false;
+            } else {
+                // We will enable decodes to gray even if the image is color because this is
+                // much faster than decoding to color and then converting
+                fDecoderMgr->dinfo()->out_color_space = JCS_GRAYSCALE;
+            }
+            return true;
+        default:
+            return false;
+    }
+}
+
+/*
+ * Checks if we can natively scale to the requested dimensions and natively scales the 
+ * dimensions if possible
+ */
+bool SkJpegCodec::onDimensionsSupported(const SkISize& size) {
+    if (setjmp(fDecoderMgr->getJmpBuf())) {
+        return fDecoderMgr->returnFalse("onDimensionsSupported/setjmp");
+    }
+
+    const unsigned int dstWidth = size.width();
+    const unsigned int dstHeight = size.height();
+
+    // Set up a fake decompress struct in order to use libjpeg to calculate output dimensions
+    // FIXME: Why is this necessary?
+    jpeg_decompress_struct dinfo;
+    sk_bzero(&dinfo, sizeof(dinfo));
+    dinfo.image_width = this->getInfo().width();
+    dinfo.image_height = this->getInfo().height();
+    dinfo.global_state = fReadyState;
+
+    // libjpeg-turbo can scale to 1/8, 1/4, 3/8, 1/2, 5/8, 3/4, 7/8, and 1/1
+    unsigned int num = 8;
+    const unsigned int denom = 8;
+    calc_output_dimensions(&dinfo, num, denom);
+    while (dinfo.output_width != dstWidth || dinfo.output_height != dstHeight) {
+
+        // Return a failure if we have tried all of the possible scales
+        if (1 == num || dstWidth > dinfo.output_width || dstHeight > dinfo.output_height) {
+            return false;
+        }
+
+        // Try the next scale
+        num -= 1;
+        calc_output_dimensions(&dinfo, num, denom);
+    }
+
+    fDecoderMgr->dinfo()->scale_num = num;
+    fDecoderMgr->dinfo()->scale_denom = denom;
+    return true;
+}
+
+/*
+ * Performs the jpeg decode
+ */
+SkCodec::Result SkJpegCodec::onGetPixels(const SkImageInfo& dstInfo,
+                                         void* dst, size_t dstRowBytes,
+                                         const Options& options, SkPMColor*, int*,
+                                         int* rowsDecoded) {
+    if (options.fSubset) {
+        // Subsets are not supported.
+        return kUnimplemented;
+    }
+
+    // Get a pointer to the decompress info since we will use it quite frequently
+    jpeg_decompress_struct* dinfo = fDecoderMgr->dinfo();
+
+    // Set the jump location for libjpeg errors
+    if (setjmp(fDecoderMgr->getJmpBuf())) {
+        return fDecoderMgr->returnFailure("setjmp", kInvalidInput);
+    }
+
+    // Check if we can decode to the requested destination and set the output color space
+    if (!this->setOutputColorSpace(dstInfo)) {
+        return fDecoderMgr->returnFailure("conversion_possible", kInvalidConversion);
+    }
+
+    // Now, given valid output dimensions, we can start the decompress
+    if (!jpeg_start_decompress(dinfo)) {
+        return fDecoderMgr->returnFailure("startDecompress", kInvalidInput);
+    }
+
+    // The recommended output buffer height should always be 1 in high quality modes.
+    // If it's not, we want to know because it means our strategy is not optimal.
+    SkASSERT(1 == dinfo->rec_outbuf_height);
+
+    if (JCS_CMYK == dinfo->out_color_space) {
+        this->initializeSwizzler(dstInfo, options);
+    }
+
+    // Perform the decode a single row at a time
+    uint32_t dstHeight = dstInfo.height();
+
+    JSAMPLE* dstRow;
+    if (fSwizzler) {
+        // write data to storage row, then sample using swizzler
+        dstRow = fSrcRow;
+    } else {
+        // write data directly to dst
+        dstRow = (JSAMPLE*) dst;
+    }
+
+    for (uint32_t y = 0; y < dstHeight; y++) {
+        // Read rows of the image
+        uint32_t lines = jpeg_read_scanlines(dinfo, &dstRow, 1);
+
+        // If we cannot read enough rows, assume the input is incomplete
+        if (lines != 1) {
+            *rowsDecoded = y;
+
+            return fDecoderMgr->returnFailure("Incomplete image data", kIncompleteInput);
+        }
+
+        if (fSwizzler) {
+            // use swizzler to sample row
+            fSwizzler->swizzle(dst, dstRow);
+            dst = SkTAddOffset<JSAMPLE>(dst, dstRowBytes);
+        } else {
+            dstRow = SkTAddOffset<JSAMPLE>(dstRow, dstRowBytes);
+        }
+    }
+
+    return kSuccess;
+}
+
+void SkJpegCodec::initializeSwizzler(const SkImageInfo& dstInfo, const Options& options) {
+    SkSwizzler::SrcConfig srcConfig = SkSwizzler::kUnknown;
+    if (JCS_CMYK == fDecoderMgr->dinfo()->out_color_space) {
+        srcConfig = SkSwizzler::kCMYK;
+    } else {
+        switch (dstInfo.colorType()) {
+            case kGray_8_SkColorType:
+                srcConfig = SkSwizzler::kGray;
+                break;
+            case kRGBA_8888_SkColorType:
+                srcConfig = SkSwizzler::kRGBX;
+                break;
+            case kBGRA_8888_SkColorType:
+                srcConfig = SkSwizzler::kBGRX;
+                break;
+            case kRGB_565_SkColorType:
+                srcConfig = SkSwizzler::kRGB_565;
+                break;
+            default:
+                // This function should only be called if the colorType is supported by jpeg
+                SkASSERT(false);
+        }
+    }
+
+    fSwizzler.reset(SkSwizzler::CreateSwizzler(srcConfig, nullptr, dstInfo, options));
+    fStorage.reset(get_row_bytes(fDecoderMgr->dinfo()));
+    fSrcRow = static_cast<uint8_t*>(fStorage.get());
+}
+
+SkSampler* SkJpegCodec::getSampler(bool createIfNecessary) {
+    if (!createIfNecessary || fSwizzler) {
+        SkASSERT(!fSwizzler || (fSrcRow && static_cast<uint8_t*>(fStorage.get()) == fSrcRow));
+        return fSwizzler;
+    }
+
+    this->initializeSwizzler(this->dstInfo(), this->options());
+    return fSwizzler;
+}
+
+SkCodec::Result SkJpegCodec::onStartScanlineDecode(const SkImageInfo& dstInfo,
+        const Options& options, SkPMColor ctable[], int* ctableCount) {
+    // Set the jump location for libjpeg errors
+    if (setjmp(fDecoderMgr->getJmpBuf())) {
+        SkCodecPrintf("setjmp: Error from libjpeg\n");
+        return kInvalidInput;
+    }
+
+    // Check if we can decode to the requested destination and set the output color space
+    if (!this->setOutputColorSpace(dstInfo)) {
+        return kInvalidConversion;
+    }
+
+    // Remove objects used for sampling.
+    fSwizzler.reset(nullptr);
+    fSrcRow = nullptr;
+    fStorage.free();
+
+    // Now, given valid output dimensions, we can start the decompress
+    if (!jpeg_start_decompress(fDecoderMgr->dinfo())) {
+        SkCodecPrintf("start decompress failed\n");
+        return kInvalidInput;
+    }
+
+    // We will need a swizzler if we are performing a subset decode or
+    // converting from CMYK.
+    if (options.fSubset || JCS_CMYK == fDecoderMgr->dinfo()->out_color_space) {
+        this->initializeSwizzler(dstInfo, options);
+    }
+
+    return kSuccess;
+}
+
+int SkJpegCodec::onGetScanlines(void* dst, int count, size_t rowBytes) {
+    // Set the jump location for libjpeg errors
+    if (setjmp(fDecoderMgr->getJmpBuf())) {
+        return fDecoderMgr->returnFailure("setjmp", kInvalidInput);
+    }
+    // Read rows one at a time
+    JSAMPLE* dstRow;
+    if (fSwizzler) {
+        // write data to storage row, then sample using swizzler
+        dstRow = fSrcRow;
+    } else {
+        // write data directly to dst
+        dstRow = (JSAMPLE*) dst;
+    }
+
+    for (int y = 0; y < count; y++) {
+        // Read row of the image
+        uint32_t rowsDecoded = jpeg_read_scanlines(fDecoderMgr->dinfo(), &dstRow, 1);
+        if (rowsDecoded != 1) {
+            fDecoderMgr->dinfo()->output_scanline = this->dstInfo().height();
+            return y;
+        }
+
+        if (fSwizzler) {
+            // use swizzler to sample row
+            fSwizzler->swizzle(dst, dstRow);
+            dst = SkTAddOffset<JSAMPLE>(dst, rowBytes);
+        } else {
+            dstRow = SkTAddOffset<JSAMPLE>(dstRow, rowBytes);
+        }
+    }
+    return count;
+}
+
+#ifndef TURBO_HAS_SKIP
+// TODO (msarett): Avoid reallocating the memory buffer on each call to skip.
+static uint32_t jpeg_skip_scanlines(jpeg_decompress_struct* dinfo, int count) {
+    SkAutoMalloc storage(get_row_bytes(dinfo));
+    uint8_t* storagePtr = static_cast<uint8_t*>(storage.get());
+    for (int y = 0; y < count; y++) {
+        if (1 != jpeg_read_scanlines(dinfo, &storagePtr, 1)) {
+            return y;
+        }
+    }
+    return count;
+}
+#endif
+
+bool SkJpegCodec::onSkipScanlines(int count) {
+    // Set the jump location for libjpeg errors
+    if (setjmp(fDecoderMgr->getJmpBuf())) {
+        return fDecoderMgr->returnFalse("setjmp");
+    }
+
+    return (uint32_t) count == jpeg_skip_scanlines(fDecoderMgr->dinfo(), count);
+}
diff --git a/gfx/skia/skia/src/codec/SkJpegCodec.h b/gfx/skia/skia/src/codec/SkJpegCodec.h
new file mode 100644
index 000000000000..687cf4b4b8a4
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkJpegCodec.h
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkJpegCodec_DEFINED
+#define SkJpegCodec_DEFINED
+
+#include "SkCodec.h"
+#include "SkImageInfo.h"
+#include "SkJpegDecoderMgr.h"
+#include "SkJpegUtility_codec.h"
+#include "SkStream.h"
+
+extern "C" {
+    #include "jpeglib.h"
+}
+
+/*
+ *
+ * This class implements the decoding for jpeg images
+ *
+ */
+class SkJpegCodec : public SkCodec {
+public:
+
+    /*
+     * Checks the start of the stream to see if the image is a jpeg
+     * Does not take ownership of the stream
+     */
+    static bool IsJpeg(SkStream*);
+
+    /*
+     * Assumes IsJpeg was called and returned true
+     * Creates a jpeg decoder
+     * Takes ownership of the stream
+     */
+    static SkCodec* NewFromStream(SkStream*);
+
+protected:
+
+    /*
+     * Recommend a set of destination dimensions given a requested scale
+     */
+    SkISize onGetScaledDimensions(float desiredScale) const override;
+
+    /*
+     * Initiates the jpeg decode
+     */
+    Result onGetPixels(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes, const Options&,
+            SkPMColor*, int*, int*) override;
+
+    SkEncodedFormat onGetEncodedFormat() const override {
+        return kJPEG_SkEncodedFormat;
+    }
+
+    bool onRewind() override;
+
+    bool onDimensionsSupported(const SkISize&) override;
+
+private:
+
+    /*
+     * Read enough of the stream to initialize the SkJpegCodec.
+     * Returns a bool representing success or failure.
+     *
+     * @param codecOut
+     * If this returns true, and codecOut was not nullptr,
+     * codecOut will be set to a new SkJpegCodec.
+     *
+     * @param decoderMgrOut
+     * If this returns true, and codecOut was nullptr,
+     * decoderMgrOut must be non-nullptr and decoderMgrOut will be set to a new
+     * JpegDecoderMgr pointer.
+     *
+     * @param stream
+     * Deleted on failure.
+     * codecOut will take ownership of it in the case where we created a codec.
+     * Ownership is unchanged when we set decoderMgrOut.
+     *
+     */
+    static bool ReadHeader(SkStream* stream, SkCodec** codecOut,
+            JpegDecoderMgr** decoderMgrOut);
+
+    /*
+     * Creates an instance of the decoder
+     * Called only by NewFromStream
+     *
+     * @param srcInfo contains the source width and height
+     * @param stream the encoded image data
+     * @param decoderMgr holds decompress struct, src manager, and error manager
+     *                   takes ownership
+     */
+    SkJpegCodec(const SkImageInfo& srcInfo, SkStream* stream, JpegDecoderMgr* decoderMgr);
+
+    /*
+     * Checks if the conversion between the input image and the requested output
+     * image has been implemented
+     * Sets the output color space
+     */
+    bool setOutputColorSpace(const SkImageInfo& dst);
+
+    // scanline decoding
+    void initializeSwizzler(const SkImageInfo& dstInfo, const Options& options);
+    SkSampler* getSampler(bool createIfNecessary) override;
+    Result onStartScanlineDecode(const SkImageInfo& dstInfo, const Options& options,
+            SkPMColor ctable[], int* ctableCount) override;
+    int onGetScanlines(void* dst, int count, size_t rowBytes) override;
+    bool onSkipScanlines(int count) override;
+
+    SkAutoTDelete<JpegDecoderMgr> fDecoderMgr;
+    // We will save the state of the decompress struct after reading the header.
+    // This allows us to safely call onGetScaledDimensions() at any time.
+    const int                     fReadyState;
+
+    // scanline decoding
+    SkAutoMalloc               fStorage;    // Only used if sampling is needed
+    uint8_t*                   fSrcRow;     // Only used if sampling is needed
+    SkAutoTDelete<SkSwizzler>  fSwizzler;
+    
+    typedef SkCodec INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/codec/SkJpegDecoderMgr.cpp b/gfx/skia/skia/src/codec/SkJpegDecoderMgr.cpp
new file mode 100644
index 000000000000..cc44f3c42117
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkJpegDecoderMgr.cpp
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkJpegDecoderMgr.h"
+#include "SkJpegUtility_codec.h"
+
+/*
+ * Print information, warning, and error messages
+ */
+static void print_message(const j_common_ptr info, const char caller[]) {
+    char buffer[JMSG_LENGTH_MAX];
+    info->err->format_message(info, buffer);
+    SkCodecPrintf("libjpeg error %d <%s> from %s\n", info->err->msg_code, buffer, caller);
+}
+
+/*
+ * Reporting function for error and warning messages.
+ */
+static void output_message(j_common_ptr info) {
+    print_message(info, "output_message");
+}
+
+bool JpegDecoderMgr::returnFalse(const char caller[]) {
+    print_message((j_common_ptr) &fDInfo, caller);
+    return false;
+}
+
+SkCodec::Result JpegDecoderMgr::returnFailure(const char caller[], SkCodec::Result result) {
+    print_message((j_common_ptr) &fDInfo, caller);
+    return result;
+}
+
+SkColorType JpegDecoderMgr::getColorType() {
+    switch (fDInfo.jpeg_color_space) {
+        case JCS_GRAYSCALE:
+            return kGray_8_SkColorType;
+        default:
+            return kN32_SkColorType;
+    }
+}
+
+JpegDecoderMgr::JpegDecoderMgr(SkStream* stream)
+    : fSrcMgr(stream)
+    , fInit(false)
+{
+    // Error manager must be set before any calls to libjeg in order to handle failures
+    fDInfo.err = jpeg_std_error(&fErrorMgr);
+    fErrorMgr.error_exit = skjpeg_err_exit;
+}
+
+void JpegDecoderMgr::init() {
+    jpeg_create_decompress(&fDInfo);
+    fInit = true;
+    fDInfo.src = &fSrcMgr;
+    fDInfo.err->output_message = &output_message;
+}
+
+JpegDecoderMgr::~JpegDecoderMgr() {
+    if (fInit) {
+        jpeg_destroy_decompress(&fDInfo);
+    }
+}
+
+jmp_buf& JpegDecoderMgr::getJmpBuf() {
+    return fErrorMgr.fJmpBuf;
+}
+
+jpeg_decompress_struct* JpegDecoderMgr::dinfo() {
+    return &fDInfo;
+}
diff --git a/gfx/skia/skia/src/codec/SkJpegDecoderMgr.h b/gfx/skia/skia/src/codec/SkJpegDecoderMgr.h
new file mode 100644
index 000000000000..8e938ad53549
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkJpegDecoderMgr.h
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkJpegDecoderMgr_DEFINED
+#define SkJpegDecoderMgr_DEFINED
+
+#include "SkCodec.h"
+#include "SkCodecPriv.h"
+#include "SkJpegUtility_codec.h"
+#include "SkSwizzler.h"
+
+// stdio is needed for jpeglib
+#include <stdio.h>
+
+extern "C" {
+    #include "jpeglib.h"
+}
+
+class JpegDecoderMgr : SkNoncopyable {
+public:
+
+    /*
+     * Print a useful error message and return false
+     */
+    bool returnFalse(const char caller[]);
+
+    /*
+     * Print a useful error message and return a decode failure
+     */
+    SkCodec::Result returnFailure(const char caller[], SkCodec::Result result);
+
+    /*
+     * Create the decode manager
+     * Does not take ownership of stream
+     */
+    JpegDecoderMgr(SkStream* stream);
+
+    /*
+     * Initialize decompress struct
+     * Initialize the source manager
+     */
+    void  init();
+
+    /*
+     * Recommend a color type based on the encoded format
+     */
+    SkColorType getColorType();
+
+    /*
+     * Free memory used by the decode manager
+     */
+    ~JpegDecoderMgr();
+
+    /*
+     * Get the jump buffer in order to set an error return point
+     */
+    jmp_buf& getJmpBuf();
+
+    /*
+     * Get function for the decompress info struct
+     */
+    jpeg_decompress_struct* dinfo();
+
+private:
+
+    jpeg_decompress_struct fDInfo;
+    skjpeg_source_mgr      fSrcMgr;
+    skjpeg_error_mgr       fErrorMgr;
+    bool                   fInit;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/codec/SkJpegUtility_codec.cpp b/gfx/skia/skia/src/codec/SkJpegUtility_codec.cpp
new file mode 100644
index 000000000000..19ece5e6adf9
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkJpegUtility_codec.cpp
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkCodecPriv.h"
+#include "SkJpegUtility_codec.h"
+
+/*
+ * Initialize the source manager
+ */
+static void sk_init_source(j_decompress_ptr dinfo) {
+    skjpeg_source_mgr* src = (skjpeg_source_mgr*) dinfo->src;
+    src->next_input_byte = (const JOCTET*) src->fBuffer;
+    src->bytes_in_buffer = 0;
+}
+
+/*
+ * Fill the input buffer from the stream
+ */
+static boolean sk_fill_input_buffer(j_decompress_ptr dinfo) {
+    skjpeg_source_mgr* src = (skjpeg_source_mgr*) dinfo->src;
+    size_t bytes = src->fStream->read(src->fBuffer, skjpeg_source_mgr::kBufferSize);
+
+    // libjpeg is still happy with a less than full read, as long as the result is non-zero
+    if (bytes == 0) {
+        return false;
+    }
+
+    src->next_input_byte = (const JOCTET*) src->fBuffer;
+    src->bytes_in_buffer = bytes;
+    return true;
+}
+
+/*
+ * Skip a certain number of bytes in the stream
+ */
+static void sk_skip_input_data(j_decompress_ptr dinfo, long numBytes) {
+    skjpeg_source_mgr* src = (skjpeg_source_mgr*) dinfo->src;
+    size_t bytes = (size_t) numBytes;
+
+    if (bytes > src->bytes_in_buffer) {
+        size_t bytesToSkip = bytes - src->bytes_in_buffer;
+        if (bytesToSkip != src->fStream->skip(bytesToSkip)) {
+            SkCodecPrintf("Failure to skip.\n");
+            dinfo->err->error_exit((j_common_ptr) dinfo);
+            return;
+        }
+
+        src->next_input_byte = (const JOCTET*) src->fBuffer;
+        src->bytes_in_buffer = 0;
+    } else {
+        src->next_input_byte += numBytes;
+        src->bytes_in_buffer -= numBytes;
+    }
+}
+
+/*
+ * We do not need to do anything to terminate our stream
+ */
+static void sk_term_source(j_decompress_ptr dinfo)
+{
+    // The current implementation of SkJpegCodec does not call
+    // jpeg_finish_decompress(), so this function is never called.
+    // If we want to modify this function to do something, we also
+    // need to modify SkJpegCodec to call jpeg_finish_decompress().
+}
+
+/*
+ * Constructor for the source manager that we provide to libjpeg
+ * We provide skia implementations of all of the stream processing functions required by libjpeg
+ */
+skjpeg_source_mgr::skjpeg_source_mgr(SkStream* stream)
+    : fStream(stream)
+{
+    init_source = sk_init_source;
+    fill_input_buffer = sk_fill_input_buffer;
+    skip_input_data = sk_skip_input_data;
+    resync_to_restart = jpeg_resync_to_restart;
+    term_source = sk_term_source;
+}
+
+/*
+ * Call longjmp to continue execution on an error
+ */
+void skjpeg_err_exit(j_common_ptr dinfo) {
+    // Simply return to Skia client code
+    // JpegDecoderMgr will take care of freeing memory
+    skjpeg_error_mgr* error = (skjpeg_error_mgr*) dinfo->err;
+    (*error->output_message) (dinfo);
+    longjmp(error->fJmpBuf, 1);
+}
diff --git a/gfx/skia/skia/src/codec/SkJpegUtility_codec.h b/gfx/skia/skia/src/codec/SkJpegUtility_codec.h
new file mode 100644
index 000000000000..43391017b53c
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkJpegUtility_codec.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+
+#ifndef SkJpegUtility_codec_DEFINED
+#define SkJpegUtility_codec_DEFINED
+
+#include "SkStream.h"
+
+#include <setjmp.h>
+// stdio is needed for jpeglib
+#include <stdio.h>
+
+extern "C" {
+    #include "jpeglib.h"
+    #include "jerror.h"
+}
+
+/*
+ * Error handling struct
+ */
+struct skjpeg_error_mgr : jpeg_error_mgr {
+    jmp_buf fJmpBuf;
+};
+
+/*
+ * Error handling function
+ */
+void skjpeg_err_exit(j_common_ptr cinfo);
+
+/*
+ * Source handling struct for that allows libjpeg to use our stream object
+ */
+struct skjpeg_source_mgr : jpeg_source_mgr {
+    skjpeg_source_mgr(SkStream* stream);
+
+    SkStream* fStream; // unowned
+    enum {
+        // TODO (msarett): Experiment with different buffer sizes.
+        // This size was chosen because it matches SkImageDecoder.
+        kBufferSize = 1024
+    };
+    uint8_t fBuffer[kBufferSize];
+};
+
+#endif
diff --git a/gfx/skia/skia/src/codec/SkMaskSwizzler.cpp b/gfx/skia/skia/src/codec/SkMaskSwizzler.cpp
new file mode 100644
index 000000000000..e5facc1f0c7a
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkMaskSwizzler.cpp
@@ -0,0 +1,400 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkCodecPriv.h"
+#include "SkColorPriv.h"
+#include "SkMaskSwizzler.h"
+
+static SkSwizzler::ResultAlpha swizzle_mask16_to_n32_opaque(
+        void* dstRow, const uint8_t* srcRow, int width, SkMasks* masks,
+        uint32_t startX, uint32_t sampleX) {
+
+    // Use the masks to decode to the destination
+    uint16_t* srcPtr = ((uint16_t*) srcRow) + startX;
+    SkPMColor* dstPtr = (SkPMColor*) dstRow;
+    for (int i = 0; i < width; i++) {
+        uint16_t p = srcPtr[0];
+        uint8_t red = masks->getRed(p);
+        uint8_t green = masks->getGreen(p);
+        uint8_t blue = masks->getBlue(p);
+        dstPtr[i] = SkPackARGB32NoCheck(0xFF, red, green, blue);
+        srcPtr += sampleX;
+    }
+    return SkSwizzler::kOpaque_ResultAlpha;
+}
+
+static SkSwizzler::ResultAlpha swizzle_mask16_to_n32_unpremul(
+        void* dstRow, const uint8_t* srcRow, int width, SkMasks* masks,
+        uint32_t startX, uint32_t sampleX) {
+
+    // Use the masks to decode to the destination
+    uint16_t* srcPtr = ((uint16_t*) srcRow) + startX;
+    SkPMColor* dstPtr = (SkPMColor*) dstRow;
+    INIT_RESULT_ALPHA;
+    for (int i = 0; i < width; i++) {
+        uint16_t p = srcPtr[0];
+        uint8_t red = masks->getRed(p);
+        uint8_t green = masks->getGreen(p);
+        uint8_t blue = masks->getBlue(p);
+        uint8_t alpha = masks->getAlpha(p);
+        UPDATE_RESULT_ALPHA(alpha);
+        dstPtr[i] = SkPackARGB32NoCheck(alpha, red, green, blue);
+        srcPtr += sampleX;
+    }
+    return COMPUTE_RESULT_ALPHA;
+}
+
+static SkSwizzler::ResultAlpha swizzle_mask16_to_n32_premul(
+        void* dstRow, const uint8_t* srcRow, int width, SkMasks* masks,
+        uint32_t startX, uint32_t sampleX) {
+
+    // Use the masks to decode to the destination
+    uint16_t* srcPtr = ((uint16_t*) srcRow) + startX;
+    SkPMColor* dstPtr = (SkPMColor*) dstRow;
+    INIT_RESULT_ALPHA;
+    for (int i = 0; i < width; i++) {
+        uint16_t p = srcPtr[0];
+        uint8_t red = masks->getRed(p);
+        uint8_t green = masks->getGreen(p);
+        uint8_t blue = masks->getBlue(p);
+        uint8_t alpha = masks->getAlpha(p);
+        UPDATE_RESULT_ALPHA(alpha);
+        dstPtr[i] = SkPreMultiplyARGB(alpha, red, green, blue);
+        srcPtr += sampleX;
+    }
+    return COMPUTE_RESULT_ALPHA;
+}
+
+// TODO (msarett): We have promoted a two byte per pixel image to 8888, only to
+// convert it back to 565. Instead, we should swizzle to 565 directly.
+static SkSwizzler::ResultAlpha swizzle_mask16_to_565(
+        void* dstRow, const uint8_t* srcRow, int width, SkMasks* masks,
+        uint32_t startX, uint32_t sampleX) {
+
+    // Use the masks to decode to the destination
+    uint16_t* srcPtr = ((uint16_t*) srcRow) + startX;
+    uint16_t* dstPtr = (uint16_t*) dstRow;
+    for (int i = 0; i < width; i++) {
+        uint16_t p = srcPtr[0];
+        uint8_t red = masks->getRed(p);
+        uint8_t green = masks->getGreen(p);
+        uint8_t blue = masks->getBlue(p);
+        dstPtr[i] = SkPack888ToRGB16(red, green, blue);
+        srcPtr += sampleX;
+    }
+    return SkSwizzler::kOpaque_ResultAlpha;
+}
+
+static SkSwizzler::ResultAlpha swizzle_mask24_to_n32_opaque(
+        void* dstRow, const uint8_t* srcRow, int width, SkMasks* masks,
+        uint32_t startX, uint32_t sampleX) {
+
+    // Use the masks to decode to the destination
+    srcRow += 3 * startX;
+    SkPMColor* dstPtr = (SkPMColor*) dstRow;
+    for (int i = 0; i < width; i++) {
+        uint32_t p = srcRow[0] | (srcRow[1] << 8) | srcRow[2] << 16;
+        uint8_t red = masks->getRed(p);
+        uint8_t green = masks->getGreen(p);
+        uint8_t blue = masks->getBlue(p);
+        dstPtr[i] = SkPackARGB32NoCheck(0xFF, red, green, blue);
+        srcRow += 3 * sampleX;
+    }
+    return SkSwizzler::kOpaque_ResultAlpha;
+}
+
+static SkSwizzler::ResultAlpha swizzle_mask24_to_n32_unpremul(
+        void* dstRow, const uint8_t* srcRow, int width, SkMasks* masks,
+        uint32_t startX, uint32_t sampleX) {
+
+    // Use the masks to decode to the destination
+    srcRow += 3 * startX;
+    SkPMColor* dstPtr = (SkPMColor*) dstRow;
+    INIT_RESULT_ALPHA;
+    for (int i = 0; i < width; i++) {
+        uint32_t p = srcRow[0] | (srcRow[1] << 8) | srcRow[2] << 16;
+        uint8_t red = masks->getRed(p);
+        uint8_t green = masks->getGreen(p);
+        uint8_t blue = masks->getBlue(p);
+        uint8_t alpha = masks->getAlpha(p);
+        UPDATE_RESULT_ALPHA(alpha);
+        dstPtr[i] = SkPackARGB32NoCheck(alpha, red, green, blue);
+        srcRow += 3 * sampleX;
+    }
+    return COMPUTE_RESULT_ALPHA;
+}
+
+static SkSwizzler::ResultAlpha swizzle_mask24_to_n32_premul(
+        void* dstRow, const uint8_t* srcRow, int width, SkMasks* masks,
+        uint32_t startX, uint32_t sampleX) {
+
+    // Use the masks to decode to the destination
+    srcRow += 3 * startX;
+    SkPMColor* dstPtr = (SkPMColor*) dstRow;
+    INIT_RESULT_ALPHA;
+    for (int i = 0; i < width; i++) {
+        uint32_t p = srcRow[0] | (srcRow[1] << 8) | srcRow[2] << 16;
+        uint8_t red = masks->getRed(p);
+        uint8_t green = masks->getGreen(p);
+        uint8_t blue = masks->getBlue(p);
+        uint8_t alpha = masks->getAlpha(p);
+        UPDATE_RESULT_ALPHA(alpha);
+        dstPtr[i] = SkPreMultiplyARGB(alpha, red, green, blue);
+        srcRow += 3 * sampleX;
+    }
+    return COMPUTE_RESULT_ALPHA;
+}
+
+static SkSwizzler::ResultAlpha swizzle_mask24_to_565(
+        void* dstRow, const uint8_t* srcRow, int width, SkMasks* masks,
+        uint32_t startX, uint32_t sampleX) {
+
+    // Use the masks to decode to the destination
+    srcRow += 3 * startX;
+    uint16_t* dstPtr = (uint16_t*) dstRow;
+    for (int i = 0; i < width; i++) {
+        uint32_t p = srcRow[0] | (srcRow[1] << 8) | srcRow[2] << 16;
+        uint8_t red = masks->getRed(p);
+        uint8_t green = masks->getGreen(p);
+        uint8_t blue = masks->getBlue(p);
+        dstPtr[i] = SkPack888ToRGB16(red, green, blue);
+        srcRow += 3 * sampleX;
+    }
+    return SkSwizzler::kOpaque_ResultAlpha;
+}
+
+static SkSwizzler::ResultAlpha swizzle_mask32_to_n32_opaque(
+        void* dstRow, const uint8_t* srcRow, int width, SkMasks* masks,
+        uint32_t startX, uint32_t sampleX) {
+
+    // Use the masks to decode to the destination
+    uint32_t* srcPtr = ((uint32_t*) srcRow) + startX;
+    SkPMColor* dstPtr = (SkPMColor*) dstRow;
+    for (int i = 0; i < width; i++) {
+        uint32_t p = srcPtr[0];
+        uint8_t red = masks->getRed(p);
+        uint8_t green = masks->getGreen(p);
+        uint8_t blue = masks->getBlue(p);
+        dstPtr[i] = SkPackARGB32NoCheck(0xFF, red, green, blue);
+        srcPtr += sampleX;
+    }
+    return SkSwizzler::kOpaque_ResultAlpha;
+}
+
+static SkSwizzler::ResultAlpha swizzle_mask32_to_n32_unpremul(
+        void* dstRow, const uint8_t* srcRow, int width, SkMasks* masks,
+        uint32_t startX, uint32_t sampleX) {
+
+    // Use the masks to decode to the destination
+    uint32_t* srcPtr = ((uint32_t*) srcRow) + startX;
+    SkPMColor* dstPtr = (SkPMColor*) dstRow;
+    INIT_RESULT_ALPHA;
+    for (int i = 0; i < width; i++) {
+        uint32_t p = srcPtr[0];
+        uint8_t red = masks->getRed(p);
+        uint8_t green = masks->getGreen(p);
+        uint8_t blue = masks->getBlue(p);
+        uint8_t alpha = masks->getAlpha(p);
+        UPDATE_RESULT_ALPHA(alpha);
+        dstPtr[i] = SkPackARGB32NoCheck(alpha, red, green, blue);
+        srcPtr += sampleX;
+    }
+    return COMPUTE_RESULT_ALPHA;
+}
+
+static SkSwizzler::ResultAlpha swizzle_mask32_to_n32_premul(
+        void* dstRow, const uint8_t* srcRow, int width, SkMasks* masks,
+        uint32_t startX, uint32_t sampleX) {
+
+    // Use the masks to decode to the destination
+    uint32_t* srcPtr = ((uint32_t*) srcRow) + startX;
+    SkPMColor* dstPtr = (SkPMColor*) dstRow;
+    INIT_RESULT_ALPHA;
+    for (int i = 0; i < width; i++) {
+        uint32_t p = srcPtr[0];
+        uint8_t red = masks->getRed(p);
+        uint8_t green = masks->getGreen(p);
+        uint8_t blue = masks->getBlue(p);
+        uint8_t alpha = masks->getAlpha(p);
+        UPDATE_RESULT_ALPHA(alpha);
+        dstPtr[i] = SkPreMultiplyARGB(alpha, red, green, blue);
+        srcPtr += sampleX;
+    }
+    return COMPUTE_RESULT_ALPHA;
+}
+
+static SkSwizzler::ResultAlpha swizzle_mask32_to_565(
+        void* dstRow, const uint8_t* srcRow, int width, SkMasks* masks,
+        uint32_t startX, uint32_t sampleX) {
+    // Use the masks to decode to the destination
+    uint32_t* srcPtr = ((uint32_t*) srcRow) + startX;
+    uint16_t* dstPtr = (uint16_t*) dstRow;
+    for (int i = 0; i < width; i++) {
+        uint32_t p = srcPtr[0];
+        uint8_t red = masks->getRed(p);
+        uint8_t green = masks->getGreen(p);
+        uint8_t blue = masks->getBlue(p);
+        dstPtr[i] = SkPack888ToRGB16(red, green, blue);
+        srcPtr += sampleX;
+    }
+    return SkSwizzler::kOpaque_ResultAlpha;
+}
+
+/*
+ *
+ * Create a new mask swizzler
+ *
+ */
+SkMaskSwizzler* SkMaskSwizzler::CreateMaskSwizzler(const SkImageInfo& dstInfo,
+        const SkImageInfo& srcInfo, SkMasks* masks, uint32_t bitsPerPixel,
+        const SkCodec::Options& options) {
+
+    // Choose the appropriate row procedure
+    RowProc proc = nullptr;
+    switch (bitsPerPixel) {
+        case 16:
+            switch (dstInfo.colorType()) {
+                case kN32_SkColorType:
+                    switch (dstInfo.alphaType()) {
+                        case kUnpremul_SkAlphaType:
+                            proc = &swizzle_mask16_to_n32_unpremul;
+                            break;
+                        case kPremul_SkAlphaType:
+                            proc = &swizzle_mask16_to_n32_premul;
+                            break;
+                        case kOpaque_SkAlphaType:
+                            proc = &swizzle_mask16_to_n32_opaque;
+                            break;
+                        default:
+                            break;
+                    }
+                    break;
+                case kRGB_565_SkColorType:
+                    switch (dstInfo.alphaType()) {
+                        case kOpaque_SkAlphaType:
+                            proc = &swizzle_mask16_to_565;
+                            break;
+                        default:
+                            break;
+                    }
+                    break;
+                default:
+                    break;
+            }
+            break;
+        case 24:
+            switch (dstInfo.colorType()) {
+                case kN32_SkColorType:
+                    switch (dstInfo.alphaType()) {
+                        case kUnpremul_SkAlphaType:
+                            proc = &swizzle_mask24_to_n32_unpremul;
+                            break;
+                        case kPremul_SkAlphaType:
+                            proc = &swizzle_mask24_to_n32_premul;
+                            break;
+                        case kOpaque_SkAlphaType:
+                            proc = &swizzle_mask24_to_n32_opaque;
+                            break;
+                        default:
+                            break;
+                    }
+                    break;
+                case kRGB_565_SkColorType:
+                    switch (dstInfo.alphaType()) {
+                        case kOpaque_SkAlphaType:
+                            proc = &swizzle_mask24_to_565;
+                            break;
+                        default:
+                            break;
+                    }
+                    break;
+                default:
+                    break;
+            }
+            break;
+        case 32:
+            switch (dstInfo.colorType()) {
+                case kN32_SkColorType:
+                    switch (dstInfo.alphaType()) {
+                        case kUnpremul_SkAlphaType:
+                            proc = &swizzle_mask32_to_n32_unpremul;
+                            break;
+                        case kPremul_SkAlphaType:
+                            proc = &swizzle_mask32_to_n32_premul;
+                            break;
+                        case kOpaque_SkAlphaType:
+                            proc = &swizzle_mask32_to_n32_opaque;
+                            break;
+                        default:
+                            break;
+                    }
+                    break;
+                case kRGB_565_SkColorType:
+                    switch (dstInfo.alphaType()) {
+                        case kOpaque_SkAlphaType:
+                            proc = &swizzle_mask32_to_565;
+                            break;
+                        default:
+                            break;
+                    }
+                    break;
+                default:
+                    break;
+            }
+            break;
+        default:
+            SkASSERT(false);
+            return nullptr;
+    }
+
+    int srcOffset = 0;
+    int srcWidth = dstInfo.width();
+    if (options.fSubset) {
+        srcOffset = options.fSubset->left();
+        srcWidth = options.fSubset->width();
+    }
+
+    return new SkMaskSwizzler(masks, proc, srcOffset, srcWidth);
+}
+
+/*
+ *
+ * Constructor for mask swizzler
+ *
+ */
+SkMaskSwizzler::SkMaskSwizzler(SkMasks* masks, RowProc proc, int srcOffset, int subsetWidth)
+    : fMasks(masks)
+    , fRowProc(proc)
+    , fSubsetWidth(subsetWidth)
+    , fDstWidth(subsetWidth)
+    , fSampleX(1)
+    , fSrcOffset(srcOffset)
+    , fX0(srcOffset)
+{}
+
+int SkMaskSwizzler::onSetSampleX(int sampleX) {
+    // FIXME: Share this function with SkSwizzler?
+    SkASSERT(sampleX > 0); // Surely there is an upper limit? Should there be
+                           // way to report failure?
+    fSampleX = sampleX;
+    fX0 = get_start_coord(sampleX) + fSrcOffset;
+    fDstWidth = get_scaled_dimension(fSubsetWidth, sampleX);
+
+    // check that fX0 is valid
+    SkASSERT(fX0 >= 0);
+    return fDstWidth;
+}
+
+/*
+ *
+ * Swizzle the specified row
+ *
+ */
+SkSwizzler::ResultAlpha SkMaskSwizzler::swizzle(void* dst, const uint8_t* SK_RESTRICT src) {
+    SkASSERT(nullptr != dst && nullptr != src);
+    return fRowProc(dst, src, fDstWidth, fMasks, fX0, fSampleX);
+}
diff --git a/gfx/skia/skia/src/codec/SkMaskSwizzler.h b/gfx/skia/skia/src/codec/SkMaskSwizzler.h
new file mode 100644
index 000000000000..e5da723ca5f1
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkMaskSwizzler.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef SkMaskSwizzler_DEFINED
+#define SkMaskSwizzler_DEFINED
+
+#include "SkMasks.h"
+#include "SkSampler.h"
+#include "SkSwizzler.h"
+#include "SkTypes.h"
+
+/*
+ *
+ * Used to swizzle images whose pixel components are extracted by bit masks
+ * Currently only used by bmp
+ *
+ */
+class SkMaskSwizzler : public SkSampler {
+public:
+
+    /*
+     * Create a new swizzler
+     * @param masks Unowned pointer to helper class
+     */
+    static SkMaskSwizzler* CreateMaskSwizzler(const SkImageInfo& dstInfo,
+                                              const SkImageInfo& srcInfo,
+                                              SkMasks* masks,
+                                              uint32_t bitsPerPixel,
+                                              const SkCodec::Options& options);
+
+    /*
+     * Swizzle a row
+     */
+    SkSwizzler::ResultAlpha swizzle(void* dst, const uint8_t* SK_RESTRICT src);
+
+    /**
+     * Implement fill using a custom width.
+     */
+    void fill(const SkImageInfo& info, void* dst, size_t rowBytes, uint32_t colorOrIndex,
+            SkCodec::ZeroInitialized zeroInit) override {
+        const SkImageInfo fillInfo = info.makeWH(fDstWidth, info.height());
+        SkSampler::Fill(fillInfo, dst, rowBytes, colorOrIndex, zeroInit);
+    }
+
+private:
+
+    /*
+     * Row procedure used for swizzle
+     */
+    typedef SkSwizzler::ResultAlpha (*RowProc)(void* dstRow, const uint8_t* srcRow, int width,
+            SkMasks* masks, uint32_t startX, uint32_t sampleX);
+
+    SkMaskSwizzler(SkMasks* masks, RowProc proc, int subsetWidth, int srcOffset);
+
+    int onSetSampleX(int) override;
+
+    SkMasks*        fMasks;           // unowned
+    const RowProc   fRowProc;
+
+    // FIXME: Can this class share more with SkSwizzler? These variables are all the same.
+    const int       fSubsetWidth;     // Width of the subset of source before any sampling.
+    int             fDstWidth;        // Width of dst, which may differ with sampling.
+    int             fSampleX;
+    int             fSrcOffset;
+    int             fX0;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/codec/SkMasks.cpp b/gfx/skia/skia/src/codec/SkMasks.cpp
new file mode 100644
index 000000000000..3126672f22c8
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkMasks.cpp
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkCodecPriv.h"
+#include "SkMasks.h"
+#include "SkTypes.h"
+
+/*
+ *
+ * Used to convert 1-7 bit color components into 8-bit color components
+ *
+ */
+const static uint8_t n_bit_to_8_bit_lookup_table[] = {
+    // 1 bit
+    0, 255,
+    // 2 bits
+    0, 85, 170, 255,
+    // 3 bits
+    0, 36, 73, 109, 146, 182, 219, 255,
+    // 4 bits
+    0, 17, 34, 51, 68, 85, 102, 119, 136, 153, 170, 187, 204, 221, 238, 255,
+    // 5 bits
+    0, 8, 16, 25, 33, 41, 49, 58, 66, 74, 82, 90, 99, 107, 115, 123, 132, 140,
+    148, 156, 165, 173, 181, 189, 197, 206, 214, 222, 230, 239, 247, 255,
+    // 6 bits
+    0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 45, 49, 53, 57, 61, 65, 69, 73,
+    77, 81, 85, 89, 93, 97, 101, 105, 109, 113, 117, 121, 125, 130, 134, 138,
+    142, 146, 150, 154, 158, 162, 166, 170, 174, 178, 182, 186, 190, 194, 198,
+    202, 206, 210, 215, 219, 223, 227, 231, 235, 239, 243, 247, 251, 255,
+    // 7 bits
+    0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38,
+    40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76,
+    78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 102, 104, 106, 108, 110,
+    112, 114, 116, 118, 120, 122, 124, 126, 129, 131, 133, 135, 137, 139, 141,
+    143, 145, 147, 149, 151, 153, 155, 157, 159, 161, 163, 165, 167, 169, 171,
+    173, 175, 177, 179, 181, 183, 185, 187, 189, 191, 193, 195, 197, 199, 201,
+    203, 205, 207, 209, 211, 213, 215, 217, 219, 221, 223, 225, 227, 229, 231,
+    233, 235, 237, 239, 241, 243, 245, 247, 249, 251, 253, 255
+};
+
+/*
+ *
+ * Convert an n bit component to an 8-bit component
+ *
+ */
+static uint8_t convert_to_8(uint32_t component, uint32_t n) {
+    if (0 == n) {
+        return 0;
+    } else if (8 > n) {
+        return n_bit_to_8_bit_lookup_table[(1 << n) - 2 + component];
+    } else {
+        SkASSERT(8 == n);
+        return component;
+    }
+}
+
+static uint8_t get_comp(uint32_t pixel, uint32_t mask, uint32_t shift,
+                        uint32_t size) {
+    return convert_to_8((pixel & mask) >> shift, size);
+}
+
+/*
+ *
+ * Get a color component
+ *
+ */
+uint8_t SkMasks::getRed(uint32_t pixel) const {
+    return get_comp(pixel, fRed.mask, fRed.shift, fRed.size);
+}
+uint8_t SkMasks::getGreen(uint32_t pixel) const {
+    return get_comp(pixel, fGreen.mask, fGreen.shift, fGreen.size);
+}
+uint8_t SkMasks::getBlue(uint32_t pixel) const {
+    return get_comp(pixel, fBlue.mask, fBlue.shift, fBlue.size);
+}
+uint8_t SkMasks::getAlpha(uint32_t pixel) const {
+    return get_comp(pixel, fAlpha.mask, fAlpha.shift, fAlpha.size);
+}
+
+/*
+ *
+ * Process an input mask to obtain the necessary information
+ *
+ */
+const SkMasks::MaskInfo process_mask(uint32_t mask, uint32_t bpp) {
+    // Trim the masks to the allowed number of bits
+    if (bpp < 32) {
+        mask &= (1 << bpp) - 1;
+    }
+
+    // Determine properties of the mask
+    uint32_t tempMask = mask;
+    uint32_t shift = 0;
+    uint32_t size = 0;
+    if (tempMask != 0) {
+        // Count trailing zeros on masks
+        for (; (tempMask & 1) == 0; tempMask >>= 1) {
+            shift++;
+        }
+        // Count the size of the mask
+        for (; tempMask & 1; tempMask >>= 1) {
+            size++;
+        }
+        // Check that the mask is continuous
+        if (tempMask != 0) {
+            SkCodecPrintf("Warning: Bit masks is not continuous.\n");
+        }
+        // Truncate masks greater than 8 bits
+        if (size > 8) {
+            shift += size - 8;
+            size = 8;
+        }
+    }
+
+    // Save the calculated values
+    const SkMasks::MaskInfo info = { mask, shift, size };
+    return info;
+}
+
+/*
+ *
+ * Create the masks object
+ *
+ */
+SkMasks* SkMasks::CreateMasks(InputMasks masks, uint32_t bitsPerPixel) {
+    // Trim the input masks according to bitsPerPixel
+    if (bitsPerPixel < 32) {
+        masks.red &= (1 << bitsPerPixel) - 1;
+        masks.green &= (1 << bitsPerPixel) - 1;
+        masks.blue &= (1 << bitsPerPixel) - 1;
+        masks.alpha &= (1 << bitsPerPixel) - 1;
+    }
+
+    // Check that masks do not overlap
+    if (((masks.red & masks.green) | (masks.red & masks.blue) |
+            (masks.red & masks.alpha) | (masks.green & masks.blue) |
+            (masks.green & masks.alpha) | (masks.blue & masks.alpha)) != 0) {
+        return nullptr;
+    }
+
+    // Collect information about the masks
+    const MaskInfo red = process_mask(masks.red, bitsPerPixel);
+    const MaskInfo green = process_mask(masks.green, bitsPerPixel);
+    const MaskInfo blue = process_mask(masks.blue, bitsPerPixel);
+    const MaskInfo alpha = process_mask(masks.alpha, bitsPerPixel);
+
+    return new SkMasks(red, green, blue, alpha);
+}
+
+
+SkMasks::SkMasks(const MaskInfo& red, const MaskInfo& green,
+                 const MaskInfo& blue, const MaskInfo& alpha)
+    : fRed(red)
+    , fGreen(green)
+    , fBlue(blue)
+    , fAlpha(alpha)
+{}
diff --git a/gfx/skia/skia/src/codec/SkMasks.h b/gfx/skia/skia/src/codec/SkMasks.h
new file mode 100644
index 000000000000..9606cbfbeb97
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkMasks.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef SkMasks_DEFINED
+#define SkMasks_DEFINED
+
+#include "SkTypes.h"
+
+/*
+ *
+ * Contains useful mask routines for SkMaskSwizzler
+ *
+ */
+class SkMasks {
+public:
+
+    /*
+     *
+     * Input bit masks format
+     *
+     */
+    struct InputMasks {
+        uint32_t red;
+        uint32_t green;
+        uint32_t blue;
+        uint32_t alpha;
+    };
+
+    /*
+     *
+     * Contains all of the information for a single mask
+     *
+     */
+     struct MaskInfo {
+        uint32_t mask;
+        uint32_t shift;
+        uint32_t size;
+     };
+
+    /*
+     *
+     * Create the masks object
+     *
+     */
+    static SkMasks* CreateMasks(InputMasks masks, uint32_t bpp);
+
+    /*
+     *
+     * Get a color component
+     *
+     */
+    uint8_t getRed(uint32_t pixel) const;
+    uint8_t getGreen(uint32_t pixel) const;
+    uint8_t getBlue(uint32_t pixel) const;
+    uint8_t getAlpha(uint32_t pixel) const;
+
+    /*
+     *
+     * Getter for the alpha mask
+     * The alpha mask may be used in other decoding modes
+     *
+     */
+     uint32_t getAlphaMask() const {
+        return fAlpha.mask;
+     }
+
+private:
+
+    /*
+     *
+     * Constructor
+     *
+     */
+    SkMasks(const MaskInfo& red, const MaskInfo& green, const MaskInfo& blue,
+            const MaskInfo& alpha);
+
+    const MaskInfo fRed;
+    const MaskInfo fGreen;
+    const MaskInfo fBlue;
+    const MaskInfo fAlpha;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/codec/SkSampledCodec.cpp b/gfx/skia/skia/src/codec/SkSampledCodec.cpp
new file mode 100644
index 000000000000..52e5648742ec
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkSampledCodec.cpp
@@ -0,0 +1,296 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkCodec.h"
+#include "SkCodecPriv.h"
+#include "SkMath.h"
+#include "SkSampledCodec.h"
+
+SkSampledCodec::SkSampledCodec(SkCodec* codec)
+    : INHERITED(codec->getInfo())
+    , fCodec(codec)
+{}
+
+SkISize SkSampledCodec::accountForNativeScaling(int* sampleSizePtr, int* nativeSampleSize) const {
+    SkISize preSampledSize = fCodec->getInfo().dimensions();
+    int sampleSize = *sampleSizePtr;
+    SkASSERT(sampleSize > 1);
+
+    if (nativeSampleSize) {
+        *nativeSampleSize = 1;
+    }
+
+    // Only JPEG supports native downsampling.
+    if (fCodec->getEncodedFormat() == kJPEG_SkEncodedFormat) {
+        // See if libjpeg supports this scale directly
+        switch (sampleSize) {
+            case 2:
+            case 4:
+            case 8:
+                // This class does not need to do any sampling.
+                *sampleSizePtr = 1;
+                return fCodec->getScaledDimensions(get_scale_from_sample_size(sampleSize));
+            default:
+                break;
+        }
+
+        // Check if sampleSize is a multiple of something libjpeg can support.
+        int remainder;
+        const int sampleSizes[] = { 8, 4, 2 };
+        for (int supportedSampleSize : sampleSizes) {
+            int actualSampleSize;
+            SkTDivMod(sampleSize, supportedSampleSize, &actualSampleSize, &remainder);
+            if (0 == remainder) {
+                float scale = get_scale_from_sample_size(supportedSampleSize);
+
+                // fCodec will scale to this size.
+                preSampledSize = fCodec->getScaledDimensions(scale);
+
+                // And then this class will sample it.
+                *sampleSizePtr = actualSampleSize;
+                if (nativeSampleSize) {
+                    *nativeSampleSize = supportedSampleSize;
+                }
+                break;
+            }
+        }
+    }
+
+    return preSampledSize;
+}
+
+SkISize SkSampledCodec::onGetSampledDimensions(int sampleSize) const {
+    const SkISize size = this->accountForNativeScaling(&sampleSize);
+    return SkISize::Make(get_scaled_dimension(size.width(), sampleSize),
+                         get_scaled_dimension(size.height(), sampleSize));
+}
+
+SkCodec::Result SkSampledCodec::onGetAndroidPixels(const SkImageInfo& info, void* pixels,
+        size_t rowBytes, const AndroidOptions& options) {
+    // Create an Options struct for the codec.
+    SkCodec::Options codecOptions;
+    codecOptions.fZeroInitialized = options.fZeroInitialized;
+
+    SkIRect* subset = options.fSubset;
+    if (!subset || subset->size() == fCodec->getInfo().dimensions()) {
+        if (fCodec->dimensionsSupported(info.dimensions())) {
+            return fCodec->getPixels(info, pixels, rowBytes, &codecOptions, options.fColorPtr,
+                    options.fColorCount);
+        }
+
+        // If the native codec does not support the requested scale, scale by sampling.
+        return this->sampledDecode(info, pixels, rowBytes, options);
+    }
+
+    // We are performing a subset decode.
+    int sampleSize = options.fSampleSize;
+    SkISize scaledSize = this->getSampledDimensions(sampleSize);
+    if (!fCodec->dimensionsSupported(scaledSize)) {
+        // If the native codec does not support the requested scale, scale by sampling.
+        return this->sampledDecode(info, pixels, rowBytes, options);
+    }
+
+    // Calculate the scaled subset bounds.
+    int scaledSubsetX = subset->x() / sampleSize;
+    int scaledSubsetY = subset->y() / sampleSize;
+    int scaledSubsetWidth = info.width();
+    int scaledSubsetHeight = info.height();
+
+    // Start the scanline decode.
+    SkIRect scanlineSubset = SkIRect::MakeXYWH(scaledSubsetX, 0, scaledSubsetWidth,
+            scaledSize.height());
+    codecOptions.fSubset = &scanlineSubset;
+    SkCodec::Result result = fCodec->startScanlineDecode(info.makeWH(scaledSize.width(),
+            scaledSize.height()), &codecOptions, options.fColorPtr, options.fColorCount);
+    if (SkCodec::kSuccess != result) {
+        return result;
+    }
+
+    // At this point, we are only concerned with subsetting.  Either no scale was
+    // requested, or the fCodec is handling the scale.
+    switch (fCodec->getScanlineOrder()) {
+        case SkCodec::kTopDown_SkScanlineOrder:
+        case SkCodec::kNone_SkScanlineOrder: {
+            if (!fCodec->skipScanlines(scaledSubsetY)) {
+                fCodec->fillIncompleteImage(info, pixels, rowBytes, options.fZeroInitialized,
+                        scaledSubsetHeight, 0);
+                return SkCodec::kIncompleteInput;
+            }
+
+            int decodedLines = fCodec->getScanlines(pixels, scaledSubsetHeight, rowBytes);
+            if (decodedLines != scaledSubsetHeight) {
+                return SkCodec::kIncompleteInput;
+            }
+            return SkCodec::kSuccess;
+        }
+        default:
+            SkASSERT(false);
+            return SkCodec::kUnimplemented;
+    }
+}
+
+
+SkCodec::Result SkSampledCodec::sampledDecode(const SkImageInfo& info, void* pixels,
+        size_t rowBytes, const AndroidOptions& options) {
+    // We should only call this function when sampling.
+    SkASSERT(options.fSampleSize > 1);
+
+    // Create options struct for the codec.
+    SkCodec::Options sampledOptions;
+    sampledOptions.fZeroInitialized = options.fZeroInitialized;
+
+    // FIXME: This was already called by onGetAndroidPixels. Can we reduce that?
+    int sampleSize = options.fSampleSize;
+    int nativeSampleSize;
+    SkISize nativeSize = this->accountForNativeScaling(&sampleSize, &nativeSampleSize);
+
+    // Check if there is a subset.
+    SkIRect subset;
+    int subsetY = 0;
+    int subsetWidth = nativeSize.width();
+    int subsetHeight = nativeSize.height();
+    if (options.fSubset) {
+        // We will need to know about subsetting in the y-dimension in order to use the
+        // scanline decoder.
+        // Update the subset to account for scaling done by fCodec.
+        SkIRect* subsetPtr = options.fSubset;
+
+        // Do the divide ourselves, instead of calling get_scaled_dimension. If
+        // X and Y are 0, they should remain 0, rather than being upgraded to 1
+        // due to being smaller than the sampleSize.
+        const int subsetX = subsetPtr->x() / nativeSampleSize;
+        subsetY = subsetPtr->y() / nativeSampleSize;
+
+        subsetWidth = get_scaled_dimension(subsetPtr->width(), nativeSampleSize);
+        subsetHeight = get_scaled_dimension(subsetPtr->height(), nativeSampleSize);
+
+        // The scanline decoder only needs to be aware of subsetting in the x-dimension.
+        subset.setXYWH(subsetX, 0, subsetWidth, nativeSize.height());
+        sampledOptions.fSubset = &subset;
+    }
+
+    // Start the scanline decode.
+    SkCodec::Result result = fCodec->startScanlineDecode(
+            info.makeWH(nativeSize.width(), nativeSize.height()), &sampledOptions,
+            options.fColorPtr, options.fColorCount);
+    if (SkCodec::kSuccess != result) {
+        return result;
+    }
+
+    SkSampler* sampler = fCodec->getSampler(true);
+    if (!sampler) {
+        return SkCodec::kUnimplemented;
+    }
+
+    // Since we guarantee that output dimensions are always at least one (even if the sampleSize
+    // is greater than a given dimension), the input sampleSize is not always the sampleSize that
+    // we use in practice.
+    const int sampleX = subsetWidth / info.width();
+    const int sampleY = subsetHeight / info.height();
+    if (sampler->setSampleX(sampleX) != info.width()) {
+        return SkCodec::kInvalidScale;
+    }
+    if (get_scaled_dimension(subsetHeight, sampleY) != info.height()) {
+        return SkCodec::kInvalidScale;
+    }
+
+    const int samplingOffsetY = get_start_coord(sampleY);
+    const int startY = samplingOffsetY + subsetY;
+    int dstHeight = info.height();
+    switch(fCodec->getScanlineOrder()) {
+        case SkCodec::kTopDown_SkScanlineOrder: {
+            if (!fCodec->skipScanlines(startY)) {
+                fCodec->fillIncompleteImage(info, pixels, rowBytes, options.fZeroInitialized,
+                        dstHeight, 0);
+                return SkCodec::kIncompleteInput;
+            }
+            void* pixelPtr = pixels;
+            for (int y = 0; y < dstHeight; y++) {
+                if (1 != fCodec->getScanlines(pixelPtr, 1, rowBytes)) {
+                    fCodec->fillIncompleteImage(info, pixels, rowBytes, options.fZeroInitialized,
+                            dstHeight, y + 1);
+                    return SkCodec::kIncompleteInput;
+                }
+                if (y < dstHeight - 1) {
+                    if (!fCodec->skipScanlines(sampleY - 1)) {
+                        fCodec->fillIncompleteImage(info, pixels, rowBytes,
+                                options.fZeroInitialized, dstHeight, y + 1);
+                        return SkCodec::kIncompleteInput;
+                    }
+                }
+                pixelPtr = SkTAddOffset<void>(pixelPtr, rowBytes);
+            }
+            return SkCodec::kSuccess;
+        }
+        case SkCodec::kOutOfOrder_SkScanlineOrder:
+        case SkCodec::kBottomUp_SkScanlineOrder: {
+            // Note that these modes do not support subsetting.
+            SkASSERT(0 == subsetY && nativeSize.height() == subsetHeight);
+            int y;
+            for (y = 0; y < nativeSize.height(); y++) {
+                int srcY = fCodec->nextScanline();
+                if (is_coord_necessary(srcY, sampleY, dstHeight)) {
+                    void* pixelPtr = SkTAddOffset<void>(pixels,
+                            rowBytes * get_dst_coord(srcY, sampleY));
+                    if (1 != fCodec->getScanlines(pixelPtr, 1, rowBytes)) {
+                        break;
+                    }
+                } else {
+                    if (!fCodec->skipScanlines(1)) {
+                        break;
+                    }
+                }
+            }
+
+            if (nativeSize.height() == y) {
+                return SkCodec::kSuccess;
+            }
+
+            // We handle filling uninitialized memory here instead of using fCodec.
+            // fCodec does not know that we are sampling.
+            const uint32_t fillValue = fCodec->getFillValue(info.colorType(), info.alphaType());
+            const SkImageInfo fillInfo = info.makeWH(info.width(), 1);
+            for (; y < nativeSize.height(); y++) {
+                int srcY = fCodec->outputScanline(y);
+                if (!is_coord_necessary(srcY, sampleY, dstHeight)) {
+                    continue;
+                }
+
+                void* rowPtr = SkTAddOffset<void>(pixels, rowBytes * get_dst_coord(srcY, sampleY));
+                SkSampler::Fill(fillInfo, rowPtr, rowBytes, fillValue, options.fZeroInitialized);
+            }
+            return SkCodec::kIncompleteInput;
+        }
+        case SkCodec::kNone_SkScanlineOrder: {
+            const int linesNeeded = subsetHeight - samplingOffsetY;
+            SkAutoMalloc storage(linesNeeded * rowBytes);
+            uint8_t* storagePtr = static_cast<uint8_t*>(storage.get());
+
+            if (!fCodec->skipScanlines(startY)) {
+                fCodec->fillIncompleteImage(info, pixels, rowBytes, options.fZeroInitialized,
+                        dstHeight, 0);
+                return SkCodec::kIncompleteInput;
+            }
+            int scanlines = fCodec->getScanlines(storagePtr, linesNeeded, rowBytes);
+
+            for (int y = 0; y < dstHeight; y++) {
+                memcpy(pixels, storagePtr, info.minRowBytes());
+                storagePtr += sampleY * rowBytes;
+                pixels = SkTAddOffset<void>(pixels, rowBytes);
+            }
+
+            if (scanlines < dstHeight) {
+                // fCodec has already handled filling uninitialized memory.
+                return SkCodec::kIncompleteInput;
+            }
+            return SkCodec::kSuccess;
+        }
+        default:
+            SkASSERT(false);
+            return SkCodec::kUnimplemented;
+    }
+}
diff --git a/gfx/skia/skia/src/codec/SkSampledCodec.h b/gfx/skia/skia/src/codec/SkSampledCodec.h
new file mode 100644
index 000000000000..b3a59126d26c
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkSampledCodec.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef SkSampledCodec_DEFINED
+#define SkSampledCodec_DEFINED
+
+#include "SkAndroidCodec.h"
+#include "SkCodec.h"
+
+/**
+ *  This class implements the functionality of SkAndroidCodec.  Scaling will
+ *  be provided by sampling if it cannot be provided by fCodec.
+ */
+class SkSampledCodec : public SkAndroidCodec {
+public:
+
+    explicit SkSampledCodec(SkCodec*);
+
+    virtual ~SkSampledCodec() {}
+
+protected:
+
+    SkEncodedFormat onGetEncodedFormat() const override { return fCodec->getEncodedFormat(); };
+
+    SkISize onGetSampledDimensions(int sampleSize) const override;
+
+    bool onGetSupportedSubset(SkIRect* desiredSubset) const override { return true; }
+
+    SkCodec::Result onGetAndroidPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
+            const AndroidOptions& options) override;
+
+private:
+    /**
+     *  Find the best way to account for native scaling.
+     *
+     *  Return a size that fCodec can scale to, and adjust sampleSize to finish scaling.
+     *
+     *  @param sampleSize As an input, the requested sample size.
+     *                    As an output, sampling needed after letting fCodec
+     *                    scale to the returned dimensions.
+     *  @param nativeSampleSize Optional output parameter. Will be set to the
+     *                          effective sample size done by fCodec.
+     *  @return SkISize The size that fCodec should scale to.
+     */
+    SkISize accountForNativeScaling(int* sampleSize, int* nativeSampleSize = nullptr) const;
+
+    /**
+     *  This fulfills the same contract as onGetAndroidPixels().
+     *
+     *  We call this function from onGetAndroidPixels() if we have determined
+     *  that fCodec does not support the requested scale, and we need to
+     *  provide the scale by sampling.
+     */
+    SkCodec::Result sampledDecode(const SkImageInfo& info, void* pixels, size_t rowBytes,
+            const AndroidOptions& options);
+
+    SkAutoTDelete<SkCodec> fCodec;
+
+    typedef SkAndroidCodec INHERITED;
+};
+#endif // SkSampledCodec_DEFINED
diff --git a/gfx/skia/skia/src/codec/SkSampler.cpp b/gfx/skia/skia/src/codec/SkSampler.cpp
new file mode 100644
index 000000000000..c69d003c0f58
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkSampler.cpp
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkCodec.h"
+#include "SkCodecPriv.h"
+#include "SkSampler.h"
+#include "SkUtils.h"
+
+void SkSampler::Fill(const SkImageInfo& info, void* dst, size_t rowBytes,
+        uint32_t colorOrIndex, SkCodec::ZeroInitialized zeroInit) {
+    SkASSERT(dst != nullptr);
+
+    // Calculate bytes to fill.  We use getSafeSize since the last row may not be padded.
+    const size_t bytesToFill = info.getSafeSize(rowBytes);
+    const int width = info.width();
+    const int numRows = info.height();
+
+    // Use the proper memset routine to fill the remaining bytes
+    switch (info.colorType()) {
+        case kN32_SkColorType: {
+            // If memory is zero initialized, we may not need to fill
+            uint32_t color = colorOrIndex;
+            if (SkCodec::kYes_ZeroInitialized == zeroInit && 0 == color) {
+                return;
+            }
+
+            // We must fill row by row in the case of unaligned row bytes
+            if (SkIsAlign4((size_t) dst) && SkIsAlign4(rowBytes)) {
+                sk_memset32((uint32_t*) dst, color,
+                        (uint32_t) bytesToFill / sizeof(SkPMColor));
+            } else {
+                // We must fill row by row in the case of unaligned row bytes.  This is an
+                // unlikely, slow case.
+                SkCodecPrintf("Warning: Strange number of row bytes, fill will be slow.\n");
+                uint32_t* dstRow = (uint32_t*) dst;
+                for (int row = 0; row < numRows; row++) {
+                    for (int col = 0; col < width; col++) {
+                        dstRow[col] = color;
+                    }
+                    dstRow = SkTAddOffset<uint32_t>(dstRow, rowBytes);
+                }
+            }
+            break;
+        }
+        case kRGB_565_SkColorType: {
+            // If the destination is k565, the caller passes in a 16-bit color.
+            // We will not assert that the high bits of colorOrIndex must be zeroed.
+            // This allows us to take advantage of the fact that the low 16 bits of an
+            // SKPMColor may be a valid a 565 color.  For example, the low 16
+            // bits of SK_ColorBLACK are identical to the 565 representation
+            // for black.
+
+            // If memory is zero initialized, we may not need to fill
+            uint16_t color = (uint16_t) colorOrIndex;
+            if (SkCodec::kYes_ZeroInitialized == zeroInit && 0 == color) {
+                return;
+            }
+
+            if (SkIsAlign2((size_t) dst) && SkIsAlign2(rowBytes)) {
+                sk_memset16((uint16_t*) dst, color, (uint32_t) bytesToFill / sizeof(uint16_t));
+            } else {
+                // We must fill row by row in the case of unaligned row bytes.  This is an
+                // unlikely, slow case.
+                SkCodecPrintf("Warning: Strange number of row bytes, fill will be slow.\n");
+                uint16_t* dstRow = (uint16_t*) dst;
+                for (int row = 0; row < numRows; row++) {
+                    for (int col = 0; col < width; col++) {
+                        dstRow[col] = color;
+                    }
+                    dstRow = SkTAddOffset<uint16_t>(dstRow, rowBytes);
+                }
+            }
+            break;
+        }
+        case kIndex_8_SkColorType:
+            // On an index destination color type, always assume the input is an index.
+            // Fall through
+        case kGray_8_SkColorType:
+            // If the destination is kGray, the caller passes in an 8-bit color.
+            // We will not assert that the high bits of colorOrIndex must be zeroed.
+            // This allows us to take advantage of the fact that the low 8 bits of an
+            // SKPMColor may be a valid a grayscale color.  For example, the low 8
+            // bits of SK_ColorBLACK are identical to the grayscale representation
+            // for black.
+
+            // If memory is zero initialized, we may not need to fill
+            if (SkCodec::kYes_ZeroInitialized == zeroInit && 0 == (uint8_t) colorOrIndex) {
+                return;
+            }
+
+            memset(dst, (uint8_t) colorOrIndex, bytesToFill);
+            break;
+        default:
+            SkCodecPrintf("Error: Unsupported dst color type for fill().  Doing nothing.\n");
+            SkASSERT(false);
+            break;
+    }
+}
diff --git a/gfx/skia/skia/src/codec/SkSampler.h b/gfx/skia/skia/src/codec/SkSampler.h
new file mode 100644
index 000000000000..afabc1f9eb48
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkSampler.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef SkSampler_DEFINED
+#define SkSampler_DEFINED
+
+#include "SkTypes.h"
+
+class SkSampler : public SkNoncopyable {
+public:
+    /**
+     *  Update the sampler to sample every sampleX'th pixel. Returns the
+     *  width after sampling.
+     */
+    int setSampleX(int sampleX) {
+        return this->onSetSampleX(sampleX);
+    }
+
+    /**
+     * Fill the remainder of the destination with a single color
+     *
+     * @param info
+     * Contains the color type of the rows to fill.
+     * Contains the width of the destination rows to fill
+     * Contains the number of rows that we need to fill.
+     *
+     * @param dst
+     * The destination row to fill from.
+     *
+     * @param rowBytes
+     * Stride in bytes of the destination.
+     *
+     * @param colorOrIndex
+     * If colorType is kN32, colorOrIndex is treated as a 32-bit color.
+     * If colorType is k565, colorOrIndex is treated as a 16-bit color.
+     * If colorType is kGray, colorOrIndex is treated as an 8-bit color.
+     * If colorType is kIndex, colorOrIndex is treated as an 8-bit index.
+     * Other SkColorTypes are not supported.
+     *
+     * @param zeroInit
+     * Indicates whether memory is already zero initialized.
+     *
+     */
+    static void Fill(const SkImageInfo& info, void* dst, size_t rowBytes,
+            uint32_t colorOrIndex, SkCodec::ZeroInitialized zeroInit);
+
+    /**
+     * Allow subclasses to implement unique versions of fill().
+     */
+    virtual void fill(const SkImageInfo& info, void* dst, size_t rowBytes,
+            uint32_t colorOrIndex, SkCodec::ZeroInitialized zeroInit) {}
+
+    virtual ~SkSampler() {}
+private:
+
+    virtual int onSetSampleX(int) = 0;
+};
+
+#endif // SkSampler_DEFINED
diff --git a/gfx/skia/skia/src/codec/SkSwizzler.cpp b/gfx/skia/skia/src/codec/SkSwizzler.cpp
new file mode 100644
index 000000000000..d783380294ab
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkSwizzler.cpp
@@ -0,0 +1,835 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkCodecPriv.h"
+#include "SkColorPriv.h"
+#include "SkSwizzler.h"
+#include "SkTemplates.h"
+
+SkSwizzler::ResultAlpha SkSwizzler::GetResult(uint8_t zeroAlpha,
+                                              uint8_t maxAlpha) {
+    // In the transparent case, this returns 0x0000
+    // In the opaque case, this returns 0xFFFF
+    // If the row is neither transparent nor opaque, returns something else
+    return (((uint16_t) maxAlpha) << 8) | zeroAlpha;
+}
+
+// samples the row. Does not do anything else but sampling
+static SkSwizzler::ResultAlpha sample565(void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src,
+        int width, int bpp, int deltaSrc, int offset, const SkPMColor ctable[]){
+
+    src += offset;
+    uint16_t* SK_RESTRICT dst = (uint16_t*) dstRow;
+    for (int x = 0; x < width; x++) {
+        dst[x] = src[1] << 8 | src[0];
+        src += deltaSrc;
+    }
+    // 565 is always opaque
+    return SkSwizzler::kOpaque_ResultAlpha;
+}
+
+// TODO (msarett): Investigate SIMD optimizations for swizzle routines.
+
+// kBit
+// These routines exclusively choose between white and black
+
+#define GRAYSCALE_BLACK 0
+#define GRAYSCALE_WHITE 0xFF
+
+
+// same as swizzle_bit_to_index and swizzle_bit_to_n32 except for value assigned to dst[x]
+static SkSwizzler::ResultAlpha swizzle_bit_to_grayscale(
+        void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth,
+        int bpp, int deltaSrc, int offset, const SkPMColor* /*ctable*/) {
+
+    uint8_t* SK_RESTRICT dst = (uint8_t*) dstRow;
+
+    // increment src by byte offset and bitIndex by bit offset
+    src += offset / 8;
+    int bitIndex = offset % 8;
+    uint8_t currByte = *src;
+
+    dst[0] = ((currByte >> (7-bitIndex)) & 1) ? GRAYSCALE_WHITE : GRAYSCALE_BLACK;
+
+    for (int x = 1; x < dstWidth; x++) {
+        int bitOffset = bitIndex + deltaSrc;
+        bitIndex = bitOffset % 8;
+        currByte = *(src += bitOffset / 8);
+        dst[x] = ((currByte >> (7-bitIndex)) & 1) ? GRAYSCALE_WHITE : GRAYSCALE_BLACK;
+    }
+
+    return SkSwizzler::kOpaque_ResultAlpha;
+}
+
+#undef GRAYSCALE_BLACK
+#undef GRAYSCALE_WHITE
+
+// same as swizzle_bit_to_grayscale and swizzle_bit_to_n32 except for value assigned to dst[x]
+static SkSwizzler::ResultAlpha swizzle_bit_to_index(
+        void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth,
+        int bpp, int deltaSrc, int offset, const SkPMColor* /*ctable*/) {
+    uint8_t* SK_RESTRICT dst = (uint8_t*) dstRow;
+
+    // increment src by byte offset and bitIndex by bit offset
+    src += offset / 8;
+    int bitIndex = offset % 8;
+    uint8_t currByte = *src;
+
+    dst[0] = ((currByte >> (7-bitIndex)) & 1);
+
+    for (int x = 1; x < dstWidth; x++) {
+        int bitOffset = bitIndex + deltaSrc;
+        bitIndex = bitOffset % 8;
+        currByte = *(src += bitOffset / 8);
+        dst[x] = ((currByte >> (7-bitIndex)) & 1);
+    }
+
+    return SkSwizzler::kOpaque_ResultAlpha;
+}
+
+// same as swizzle_bit_to_grayscale and swizzle_bit_to_index except for value assigned to dst[x]
+static SkSwizzler::ResultAlpha swizzle_bit_to_n32(
+        void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth,
+        int bpp, int deltaSrc, int offset, const SkPMColor* /*ctable*/) {
+    SkPMColor* SK_RESTRICT dst = (SkPMColor*) dstRow;
+
+    // increment src by byte offset and bitIndex by bit offset
+    src += offset / 8;
+    int bitIndex = offset % 8;
+    uint8_t currByte = *src;
+
+    dst[0] = ((currByte >> (7 - bitIndex)) & 1) ? SK_ColorWHITE : SK_ColorBLACK;
+
+    for (int x = 1; x < dstWidth; x++) {
+        int bitOffset = bitIndex + deltaSrc;
+        bitIndex = bitOffset % 8;
+        currByte = *(src += bitOffset / 8);
+        dst[x] = ((currByte >> (7 - bitIndex)) & 1) ? SK_ColorWHITE : SK_ColorBLACK;
+    }
+
+    return SkSwizzler::kOpaque_ResultAlpha;
+}
+
+#define RGB565_BLACK 0
+#define RGB565_WHITE 0xFFFF
+
+static SkSwizzler::ResultAlpha swizzle_bit_to_565(
+        void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth,
+        int bpp, int deltaSrc, int offset, const SkPMColor* /*ctable*/) {
+    uint16_t* SK_RESTRICT dst = (uint16_t*) dstRow;
+
+    // increment src by byte offset and bitIndex by bit offset
+    src += offset / 8;
+    int bitIndex = offset % 8;
+    uint8_t currByte = *src;
+
+    dst[0] = ((currByte >> (7 - bitIndex)) & 1) ? RGB565_WHITE : RGB565_BLACK;
+
+    for (int x = 1; x < dstWidth; x++) {
+        int bitOffset = bitIndex + deltaSrc;
+        bitIndex = bitOffset % 8;
+        currByte = *(src += bitOffset / 8);
+        dst[x] = ((currByte >> (7 - bitIndex)) & 1) ? RGB565_WHITE : RGB565_BLACK;
+    }
+
+    return SkSwizzler::kOpaque_ResultAlpha;
+}
+
+#undef RGB565_BLACK
+#undef RGB565_WHITE
+
+// kIndex1, kIndex2, kIndex4
+
+static SkSwizzler::ResultAlpha swizzle_small_index_to_index(
+        void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth,
+        int bpp, int deltaSrc, int offset, const SkPMColor ctable[]) {
+
+    uint8_t* dst = (uint8_t*) dstRow;
+    INIT_RESULT_ALPHA;
+    src += offset / 8;
+    int bitIndex = offset % 8;
+    uint8_t currByte = *src;
+    const uint8_t mask = (1 << bpp) - 1;
+    uint8_t index = (currByte >> (8 - bpp - bitIndex)) & mask;
+    dst[0] = index;
+    UPDATE_RESULT_ALPHA(ctable[index] >> SK_A32_SHIFT);
+
+    for (int x = 1; x < dstWidth; x++) {
+        int bitOffset = bitIndex + deltaSrc;
+        bitIndex = bitOffset % 8;
+        currByte = *(src += bitOffset / 8);
+        index = (currByte >> (8 - bpp - bitIndex)) & mask;
+        dst[x] = index;
+        UPDATE_RESULT_ALPHA(ctable[index] >> SK_A32_SHIFT);
+    }
+    return COMPUTE_RESULT_ALPHA;
+}
+
+static SkSwizzler::ResultAlpha swizzle_small_index_to_565(
+        void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth,
+        int bpp, int deltaSrc, int offset, const SkPMColor ctable[]) {
+
+    uint16_t* dst = (uint16_t*) dstRow;
+    src += offset / 8;
+    int bitIndex = offset % 8;
+    uint8_t currByte = *src;
+    const uint8_t mask = (1 << bpp) - 1;
+    uint8_t index = (currByte >> (8 - bpp - bitIndex)) & mask;
+    dst[0] = SkPixel32ToPixel16(ctable[index]);
+
+    for (int x = 1; x < dstWidth; x++) {
+        int bitOffset = bitIndex + deltaSrc;
+        bitIndex = bitOffset % 8;
+        currByte = *(src += bitOffset / 8);
+        index = (currByte >> (8 - bpp - bitIndex)) & mask;
+        dst[x] = SkPixel32ToPixel16(ctable[index]);
+    }
+    return SkAlphaType::kOpaque_SkAlphaType;
+}
+
+static SkSwizzler::ResultAlpha swizzle_small_index_to_n32(
+        void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth,
+        int bpp, int deltaSrc, int offset, const SkPMColor ctable[]) {
+
+    SkPMColor* dst = (SkPMColor*) dstRow;
+    INIT_RESULT_ALPHA;
+    src += offset / 8;
+    int bitIndex = offset % 8;
+    uint8_t currByte = *src;
+    const uint8_t mask = (1 << bpp) - 1;
+    uint8_t index = (currByte >> (8 - bpp - bitIndex)) & mask;
+    dst[0] = ctable[index];
+    UPDATE_RESULT_ALPHA(ctable[index] >> SK_A32_SHIFT);
+
+    for (int x = 1; x < dstWidth; x++) {
+        int bitOffset = bitIndex + deltaSrc;
+        bitIndex = bitOffset % 8;
+        currByte = *(src += bitOffset / 8);
+        index = (currByte >> (8 - bpp - bitIndex)) & mask;
+        dst[x] = ctable[index];
+        UPDATE_RESULT_ALPHA(ctable[index] >> SK_A32_SHIFT);
+    }
+    return COMPUTE_RESULT_ALPHA;
+}
+
+// kIndex
+
+static SkSwizzler::ResultAlpha swizzle_index_to_index(
+        void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth,
+        int bpp, int deltaSrc, int offset, const SkPMColor ctable[]) {
+
+    src += offset;
+    uint8_t* SK_RESTRICT dst = (uint8_t*) dstRow;
+    INIT_RESULT_ALPHA;
+    // TODO (msarett): Should we skip the loop here and guess that the row is opaque/not opaque?
+    //                 SkScaledBitmap sampler just guesses that it is opaque.  This is dangerous
+    //                 and probably wrong since gif and bmp (rarely) may have alpha.
+    if (1 == deltaSrc) {
+        memcpy(dst, src, dstWidth);
+        for (int x = 0; x < dstWidth; x++) {
+            UPDATE_RESULT_ALPHA(ctable[src[x]] >> SK_A32_SHIFT);
+        }
+    } else {
+        for (int x = 0; x < dstWidth; x++) {
+            dst[x] = *src;
+            UPDATE_RESULT_ALPHA(ctable[*src] >> SK_A32_SHIFT);
+            src += deltaSrc;
+        }
+    }
+    return COMPUTE_RESULT_ALPHA;
+}
+
+static SkSwizzler::ResultAlpha swizzle_index_to_n32(
+        void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth,
+        int bpp, int deltaSrc, int offset, const SkPMColor ctable[]) {
+
+    src += offset;
+    SkPMColor* SK_RESTRICT dst = (SkPMColor*)dstRow;
+    INIT_RESULT_ALPHA;
+    for (int x = 0; x < dstWidth; x++) {
+        SkPMColor c = ctable[*src];
+        UPDATE_RESULT_ALPHA(c >> SK_A32_SHIFT);
+        dst[x] = c;
+        src += deltaSrc;
+    }
+    return COMPUTE_RESULT_ALPHA;
+}
+
+static SkSwizzler::ResultAlpha swizzle_index_to_n32_skipZ(
+        void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth,
+        int bpp, int deltaSrc, int offset, const SkPMColor ctable[]) {
+
+    src += offset;
+    SkPMColor* SK_RESTRICT dst = (SkPMColor*)dstRow;
+    INIT_RESULT_ALPHA;
+    for (int x = 0; x < dstWidth; x++) {
+        SkPMColor c = ctable[*src];
+        UPDATE_RESULT_ALPHA(c >> SK_A32_SHIFT);
+        if (c != 0) {
+            dst[x] = c;
+        }
+        src += deltaSrc;
+    }
+    return COMPUTE_RESULT_ALPHA;
+}
+
+static SkSwizzler::ResultAlpha swizzle_index_to_565(
+      void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth,
+      int bytesPerPixel, int deltaSrc, int offset, const SkPMColor ctable[]) {
+    // FIXME: Support dithering? Requires knowing y, which I think is a bigger
+    // change.
+    src += offset;
+    uint16_t* SK_RESTRICT dst = (uint16_t*)dstRow;
+    for (int x = 0; x < dstWidth; x++) {
+        dst[x] = SkPixel32ToPixel16(ctable[*src]);
+        src += deltaSrc;
+    }
+    return SkSwizzler::kOpaque_ResultAlpha;
+}
+
+
+#undef A32_MASK_IN_PLACE
+
+// kGray
+
+static SkSwizzler::ResultAlpha swizzle_gray_to_n32(
+        void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth,
+        int bpp, int deltaSrc, int offset, const SkPMColor ctable[]) {
+
+    src += offset;
+    SkPMColor* SK_RESTRICT dst = (SkPMColor*)dstRow;
+    for (int x = 0; x < dstWidth; x++) {
+        dst[x] = SkPackARGB32NoCheck(0xFF, *src, *src, *src);
+        src += deltaSrc;
+    }
+    return SkSwizzler::kOpaque_ResultAlpha;
+}
+
+static SkSwizzler::ResultAlpha swizzle_gray_to_gray(
+        void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth,
+        int bpp, int deltaSrc, int offset, const SkPMColor ctable[]) {
+
+    src += offset;
+    uint8_t* SK_RESTRICT dst = (uint8_t*) dstRow;
+    if (1 == deltaSrc) {
+        memcpy(dstRow, src, dstWidth);
+    } else {
+        for (int x = 0; x < dstWidth; x++) {
+            dst[x] = src[0];
+            src += deltaSrc;
+        }
+    }
+    return SkSwizzler::kOpaque_ResultAlpha;
+}
+
+static SkSwizzler::ResultAlpha swizzle_gray_to_565(
+        void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth,
+        int bytesPerPixel, int deltaSrc, int offset, const SkPMColor ctable[]) {
+    // FIXME: Support dithering?
+    src += offset;
+    uint16_t* SK_RESTRICT dst = (uint16_t*)dstRow;
+    for (int x = 0; x < dstWidth; x++) {
+        dst[x] = SkPack888ToRGB16(src[0], src[0], src[0]);
+        src += deltaSrc;
+    }
+    return SkSwizzler::kOpaque_ResultAlpha;
+}
+
+// kBGRX
+
+static SkSwizzler::ResultAlpha swizzle_bgrx_to_n32(
+        void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth,
+        int bpp, int deltaSrc, int offset, const SkPMColor ctable[]) {
+
+    src += offset;
+    SkPMColor* SK_RESTRICT dst = (SkPMColor*)dstRow;
+    for (int x = 0; x < dstWidth; x++) {
+        dst[x] = SkPackARGB32NoCheck(0xFF, src[2], src[1], src[0]);
+        src += deltaSrc;
+    }
+    return SkSwizzler::kOpaque_ResultAlpha;
+}
+
+static SkSwizzler::ResultAlpha swizzle_bgrx_to_565(
+        void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth,
+        int bpp, int deltaSrc, int offset, const SkPMColor ctable[]) {
+    // FIXME: Support dithering?
+    src += offset;
+    uint16_t* SK_RESTRICT dst = (uint16_t*)dstRow;
+    for (int x = 0; x < dstWidth; x++) {
+        dst[x] = SkPack888ToRGB16(src[2], src[1], src[0]);
+        src += deltaSrc;
+    }
+    return SkSwizzler::kOpaque_ResultAlpha;
+}
+
+// kBGRA
+
+static SkSwizzler::ResultAlpha swizzle_bgra_to_n32_unpremul(
+        void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth,
+        int bpp, int deltaSrc, int offset, const SkPMColor ctable[]) {
+
+    src += offset;
+    SkPMColor* SK_RESTRICT dst = (SkPMColor*)dstRow;
+    INIT_RESULT_ALPHA;
+    for (int x = 0; x < dstWidth; x++) {
+        uint8_t alpha = src[3];
+        UPDATE_RESULT_ALPHA(alpha);
+        dst[x] = SkPackARGB32NoCheck(alpha, src[2], src[1], src[0]);
+        src += deltaSrc;
+    }
+    return COMPUTE_RESULT_ALPHA;
+}
+
+static SkSwizzler::ResultAlpha swizzle_bgra_to_n32_premul(
+        void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth,
+        int bpp, int deltaSrc, int offset, const SkPMColor ctable[]) {
+
+    src += offset;
+    SkPMColor* SK_RESTRICT dst = (SkPMColor*)dstRow;
+    INIT_RESULT_ALPHA;
+    for (int x = 0; x < dstWidth; x++) {
+        uint8_t alpha = src[3];
+        UPDATE_RESULT_ALPHA(alpha);
+        dst[x] = SkPreMultiplyARGB(alpha, src[2], src[1], src[0]);
+        src += deltaSrc;
+    }
+    return COMPUTE_RESULT_ALPHA;
+}
+
+// kRGBX
+static SkSwizzler::ResultAlpha swizzle_rgbx_to_n32(
+        void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth,
+        int bpp, int deltaSrc, int offset, const SkPMColor ctable[]) {
+
+    src += offset;
+    SkPMColor* SK_RESTRICT dst = (SkPMColor*)dstRow;
+    for (int x = 0; x < dstWidth; x++) {
+        dst[x] = SkPackARGB32(0xFF, src[0], src[1], src[2]);
+        src += deltaSrc;
+    }
+    return SkSwizzler::kOpaque_ResultAlpha;
+}
+
+static SkSwizzler::ResultAlpha swizzle_rgbx_to_565(
+       void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth,
+       int bytesPerPixel, int deltaSrc, int offset, const SkPMColor ctable[]) {
+    // FIXME: Support dithering?
+    src += offset;
+    uint16_t* SK_RESTRICT dst = (uint16_t*)dstRow;
+    for (int x = 0; x < dstWidth; x++) {
+        dst[x] = SkPack888ToRGB16(src[0], src[1], src[2]);
+        src += deltaSrc;
+    }
+    return SkSwizzler::kOpaque_ResultAlpha;
+}
+
+
+// kRGBA
+static SkSwizzler::ResultAlpha swizzle_rgba_to_n32_premul(
+        void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth,
+        int bpp, int deltaSrc, int offset, const SkPMColor ctable[]) {
+
+    src += offset;
+    SkPMColor* SK_RESTRICT dst = (SkPMColor*)dstRow;
+    INIT_RESULT_ALPHA;
+    for (int x = 0; x < dstWidth; x++) {
+        unsigned alpha = src[3];
+        UPDATE_RESULT_ALPHA(alpha);
+        dst[x] = SkPreMultiplyARGB(alpha, src[0], src[1], src[2]);
+        src += deltaSrc;
+    }
+    return COMPUTE_RESULT_ALPHA;
+}
+
+static SkSwizzler::ResultAlpha swizzle_rgba_to_n32_unpremul(
+        void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth,
+        int bpp, int deltaSrc, int offset, const SkPMColor ctable[]) {
+
+    src += offset;
+    uint32_t* SK_RESTRICT dst = reinterpret_cast<uint32_t*>(dstRow);
+    INIT_RESULT_ALPHA;
+    for (int x = 0; x < dstWidth; x++) {
+        unsigned alpha = src[3];
+        UPDATE_RESULT_ALPHA(alpha);
+        dst[x] = SkPackARGB32NoCheck(alpha, src[0], src[1], src[2]);
+        src += deltaSrc;
+    }
+    return COMPUTE_RESULT_ALPHA;
+}
+
+static SkSwizzler::ResultAlpha swizzle_rgba_to_n32_premul_skipZ(
+        void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth,
+        int bpp, int deltaSrc, int offset, const SkPMColor ctable[]) {
+
+    src += offset;
+    SkPMColor* SK_RESTRICT dst = (SkPMColor*)dstRow;
+    INIT_RESULT_ALPHA;
+    for (int x = 0; x < dstWidth; x++) {
+        unsigned alpha = src[3];
+        UPDATE_RESULT_ALPHA(alpha);
+        if (0 != alpha) {
+            dst[x] = SkPreMultiplyARGB(alpha, src[0], src[1], src[2]);
+        }
+        src += deltaSrc;
+    }
+    return COMPUTE_RESULT_ALPHA;
+}
+
+// kCMYK
+//
+// CMYK is stored as four bytes per pixel.
+//
+// We will implement a crude conversion from CMYK -> RGB using formulas
+// from easyrgb.com.
+//
+// CMYK -> CMY
+// C = C * (1 - K) + K
+// M = M * (1 - K) + K
+// Y = Y * (1 - K) + K
+//
+// libjpeg actually gives us inverted CMYK, so we must subtract the
+// original terms from 1.
+// CMYK -> CMY
+// C = (1 - C) * (1 - (1 - K)) + (1 - K)
+// M = (1 - M) * (1 - (1 - K)) + (1 - K)
+// Y = (1 - Y) * (1 - (1 - K)) + (1 - K)
+//
+// Simplifying the above expression.
+// CMYK -> CMY
+// C = 1 - CK
+// M = 1 - MK
+// Y = 1 - YK
+//
+// CMY -> RGB
+// R = (1 - C) * 255
+// G = (1 - M) * 255
+// B = (1 - Y) * 255
+//
+// Therefore the full conversion is below.  This can be verified at
+// www.rapidtables.com (assuming inverted CMYK).
+// CMYK -> RGB
+// R = C * K * 255
+// G = M * K * 255
+// B = Y * K * 255
+//
+// As a final note, we have treated the CMYK values as if they were on
+// a scale from 0-1, when in fact they are 8-bit ints scaling from 0-255.
+// We must divide each CMYK component by 255 to obtain the true conversion
+// we should perform.
+// CMYK -> RGB
+// R = C * K / 255
+// G = M * K / 255
+// B = Y * K / 255
+static SkSwizzler::ResultAlpha swizzle_cmyk_to_n32(
+        void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth,
+        int bpp, int deltaSrc, int offset, const SkPMColor ctable[]) {
+
+    src += offset;
+    SkPMColor* SK_RESTRICT dst = (SkPMColor*)dstRow;
+    for (int x = 0; x < dstWidth; x++) {
+        const uint8_t r = SkMulDiv255Round(src[0], src[3]);
+        const uint8_t g = SkMulDiv255Round(src[1], src[3]);
+        const uint8_t b = SkMulDiv255Round(src[2], src[3]);
+
+        dst[x] = SkPackARGB32NoCheck(0xFF, r, g, b);
+        src += deltaSrc;
+    }
+
+    // CMYK is always opaque
+    return SkSwizzler::kOpaque_ResultAlpha;
+}
+
+static SkSwizzler::ResultAlpha swizzle_cmyk_to_565(
+        void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int dstWidth,
+        int bpp, int deltaSrc, int offset, const SkPMColor ctable[]) {
+
+    src += offset;
+    uint16_t* SK_RESTRICT dst = (uint16_t*)dstRow;
+    for (int x = 0; x < dstWidth; x++) {
+        const uint8_t r = SkMulDiv255Round(src[0], src[3]);
+        const uint8_t g = SkMulDiv255Round(src[1], src[3]);
+        const uint8_t b = SkMulDiv255Round(src[2], src[3]);
+
+        dst[x] = SkPack888ToRGB16(r, g, b);
+        src += deltaSrc;
+    }
+
+    // CMYK is always opaque
+    return SkSwizzler::kOpaque_ResultAlpha;
+}
+
+/**
+    FIXME: This was my idea to cheat in order to continue taking advantage of skipping zeroes.
+    This would be fine for drawing normally, but not for drawing with transfer modes. Being
+    honest means we can draw correctly with transfer modes, with the cost of not being able
+    to take advantage of Android's free unwritten pages. Something to keep in mind when we
+    decide whether to switch to unpremul default.
+static bool swizzle_rgba_to_n32_unpremul_skipZ(void* SK_RESTRICT dstRow,
+                                               const uint8_t* SK_RESTRICT src,
+                                               int dstWidth, int bitsPerPixel, int offset,
+                                               const SkPMColor[]) {
+    src += offset;
+    SkPMColor* SK_RESTRICT dst = (SkPMColor*)dstRow;
+    unsigned alphaMask = 0xFF;
+    for (int x = 0; x < dstWidth; x++) {
+        unsigned alpha = src[3];
+        // NOTE: We cheat here. The caller requested unpremul and skip zeroes. It's possible
+        // the color components are not zero, but we skip them anyway, meaning they'll remain
+        // zero (implied by the request to skip zeroes).
+        if (0 != alpha) {
+            dst[x] = SkPackARGB32NoCheck(alpha, src[0], src[1], src[2]);
+        }
+        src += deltaSrc;
+        alphaMask &= alpha;
+    }
+    return alphaMask != 0xFF;
+}
+*/
+
+SkSwizzler* SkSwizzler::CreateSwizzler(SkSwizzler::SrcConfig sc,
+                                       const SkPMColor* ctable,
+                                       const SkImageInfo& dstInfo,
+                                       const SkCodec::Options& options,
+                                       const SkIRect* frame) {
+    if (dstInfo.colorType() == kUnknown_SkColorType || kUnknown == sc) {
+        return nullptr;
+    }
+    if ((kIndex == sc || kIndex4 == sc || kIndex2 == sc || kIndex1 == sc)
+            && nullptr == ctable) {
+        return nullptr;
+    }
+    RowProc proc = nullptr;
+    SkCodec::ZeroInitialized zeroInit = options.fZeroInitialized;
+    switch (sc) {
+        case kBit:
+            switch (dstInfo.colorType()) {
+                case kN32_SkColorType:
+                    proc = &swizzle_bit_to_n32;
+                    break;
+                case kIndex_8_SkColorType:
+                    proc = &swizzle_bit_to_index;
+                    break;
+                case kRGB_565_SkColorType:
+                    proc = &swizzle_bit_to_565;
+                    break;
+                case kGray_8_SkColorType:
+                    proc = &swizzle_bit_to_grayscale;
+                    break;
+                default:
+                    break;
+            }
+            break;
+        case kIndex1:
+        case kIndex2:
+        case kIndex4:
+            switch (dstInfo.colorType()) {
+                case kN32_SkColorType:
+                    proc = &swizzle_small_index_to_n32;
+                    break;
+                case kRGB_565_SkColorType:
+                    proc = &swizzle_small_index_to_565;
+                    break;
+                case kIndex_8_SkColorType:
+                    proc = &swizzle_small_index_to_index;
+                    break;
+                default:
+                    break;
+            }
+            break;
+        case kIndex:
+            switch (dstInfo.colorType()) {
+                case kN32_SkColorType:
+                    // We assume the color premultiplied ctable (or not) as desired.
+                    if (SkCodec::kYes_ZeroInitialized == zeroInit) {
+                        proc = &swizzle_index_to_n32_skipZ;
+                        break;
+                    } else {
+                        proc = &swizzle_index_to_n32;
+                        break;
+                    }
+                    break;
+                case kRGB_565_SkColorType:
+                    proc = &swizzle_index_to_565;
+                    break;
+                case kIndex_8_SkColorType:
+                    proc = &swizzle_index_to_index;
+                    break;
+                default:
+                    break;
+            }
+            break;
+        case kGray:
+            switch (dstInfo.colorType()) {
+                case kN32_SkColorType:
+                    proc = &swizzle_gray_to_n32;
+                    break;
+                case kGray_8_SkColorType:
+                    proc = &swizzle_gray_to_gray;
+                    break;
+                case kRGB_565_SkColorType:
+                    proc = &swizzle_gray_to_565;
+                    break;
+                default:
+                    break;
+            }
+            break;
+        case kBGR:
+        case kBGRX:
+            switch (dstInfo.colorType()) {
+                case kN32_SkColorType:
+                    proc = &swizzle_bgrx_to_n32;
+                    break;
+                case kRGB_565_SkColorType:
+                    proc = &swizzle_bgrx_to_565;
+                    break;
+                default:
+                    break;
+            }
+            break;
+        case kBGRA:
+            switch (dstInfo.colorType()) {
+                case kN32_SkColorType:
+                    switch (dstInfo.alphaType()) {
+                        case kUnpremul_SkAlphaType:
+                            proc = &swizzle_bgra_to_n32_unpremul;
+                            break;
+                        case kPremul_SkAlphaType:
+                            proc = &swizzle_bgra_to_n32_premul;
+                            break;
+                        default:
+                            break;
+                    }
+                    break;
+                default:
+                    break;
+            }
+            break;
+        case kRGBX:
+            // TODO: Support other swizzles.
+            switch (dstInfo.colorType()) {
+                case kN32_SkColorType:
+                    proc = &swizzle_rgbx_to_n32;
+                    break;
+                case kRGB_565_SkColorType:
+                    proc = &swizzle_rgbx_to_565;
+                default:
+                    break;
+            }
+            break;
+        case kRGBA:
+            switch (dstInfo.colorType()) {
+                case kN32_SkColorType:
+                    if (dstInfo.alphaType() == kUnpremul_SkAlphaType) {
+                        // Respect zeroInit?
+                        proc = &swizzle_rgba_to_n32_unpremul;
+                    } else {
+                        if (SkCodec::kYes_ZeroInitialized == zeroInit) {
+                            proc = &swizzle_rgba_to_n32_premul_skipZ;
+                        } else {
+                            proc = &swizzle_rgba_to_n32_premul;
+                        }
+                    }
+                    break;
+                default:
+                    break;
+            }
+            break;
+        case kRGB:
+            switch (dstInfo.colorType()) {
+                case kN32_SkColorType:
+                    proc = &swizzle_rgbx_to_n32;
+                    break;
+                default:
+                    break;
+            }
+            break;
+        case kRGB_565:
+            switch (dstInfo.colorType()) {
+                case kRGB_565_SkColorType:
+                    proc = &sample565;
+                    break;
+                default:
+                    break;
+            }
+            break;
+        case kCMYK:
+            switch (dstInfo.colorType()) {
+                case kN32_SkColorType:
+                    proc = &swizzle_cmyk_to_n32;
+                    break;
+                case kRGB_565_SkColorType:
+                    proc = &swizzle_cmyk_to_565;
+                    break;
+                default:
+                    break;
+            }
+            break;
+        default:
+            break;
+    }
+    if (nullptr == proc) {
+        return nullptr;
+    }
+
+    // Store bpp in bytes if it is an even multiple, otherwise use bits
+    int srcBPP = SkIsAlign8(BitsPerPixel(sc)) ? BytesPerPixel(sc) : BitsPerPixel(sc);
+    int dstBPP = SkColorTypeBytesPerPixel(dstInfo.colorType());
+    
+    int srcOffset = 0;
+    int srcWidth = dstInfo.width();
+    int dstOffset = 0;
+    int dstWidth = srcWidth;
+    if (options.fSubset) {
+        // We do not currently support subset decodes for image types that may have
+        // frames (gif).
+        SkASSERT(!frame);
+        srcOffset = options.fSubset->left();
+        srcWidth = options.fSubset->width();
+        dstWidth = srcWidth;
+    } else if (frame) {
+        dstOffset = frame->left();
+        srcWidth = frame->width();
+    }
+
+    return new SkSwizzler(proc, ctable, srcOffset, srcWidth, dstOffset, dstWidth, srcBPP, dstBPP);
+}
+
+SkSwizzler::SkSwizzler(RowProc proc, const SkPMColor* ctable, int srcOffset, int srcWidth,
+        int dstOffset, int dstWidth, int srcBPP, int dstBPP)
+    : fRowProc(proc)
+    , fColorTable(ctable)
+    , fSrcOffset(srcOffset)
+    , fDstOffset(dstOffset)
+    , fSrcOffsetUnits(srcOffset * srcBPP)
+    , fDstOffsetBytes(dstOffset * dstBPP)
+    , fSrcWidth(srcWidth)
+    , fDstWidth(dstWidth)
+    , fSwizzleWidth(srcWidth)
+    , fAllocatedWidth(dstWidth)
+    , fSampleX(1)
+    , fSrcBPP(srcBPP)
+    , fDstBPP(dstBPP)
+{}
+
+int SkSwizzler::onSetSampleX(int sampleX) {
+    SkASSERT(sampleX > 0); // Surely there is an upper limit? Should there be
+                           // way to report failure?
+    fSampleX = sampleX;
+    fSrcOffsetUnits = (get_start_coord(sampleX) + fSrcOffset) * fSrcBPP;
+    fDstOffsetBytes = (fDstOffset / sampleX) * fDstBPP;
+    fSwizzleWidth = get_scaled_dimension(fSrcWidth, sampleX);
+    fAllocatedWidth = get_scaled_dimension(fDstWidth, sampleX);
+
+    return fAllocatedWidth;
+}
+
+SkSwizzler::ResultAlpha SkSwizzler::swizzle(void* dst, const uint8_t* SK_RESTRICT src) {
+    SkASSERT(nullptr != dst && nullptr != src);
+    return fRowProc(SkTAddOffset<void>(dst, fDstOffsetBytes), src, fSwizzleWidth, fSrcBPP,
+            fSampleX * fSrcBPP, fSrcOffsetUnits, fColorTable);
+}
diff --git a/gfx/skia/skia/src/codec/SkSwizzler.h b/gfx/skia/skia/src/codec/SkSwizzler.h
new file mode 100644
index 000000000000..7f5bbc6209b4
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkSwizzler.h
@@ -0,0 +1,278 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkSwizzler_DEFINED
+#define SkSwizzler_DEFINED
+
+#include "SkCodec.h"
+#include "SkColor.h"
+#include "SkImageInfo.h"
+#include "SkSampler.h"
+
+class SkSwizzler : public SkSampler {
+public:
+    /**
+     *  Enum describing the config of the source data.
+     */
+    enum SrcConfig {
+        kUnknown,  // Invalid type.
+        kBit,      // A single bit to distinguish between white and black
+        kGray,
+        kIndex1,
+        kIndex2,
+        kIndex4,
+        kIndex,
+        kRGB,
+        kBGR,
+        kRGBX,
+        kBGRX,
+        kRGBA,
+        kBGRA,
+        kRGB_565,
+        kCMYK,
+    };
+
+    /*
+     *
+     * Result code for the alpha components of a row.
+     *
+     */
+    typedef uint16_t ResultAlpha;
+    static const ResultAlpha kOpaque_ResultAlpha = 0xFFFF;
+    static const ResultAlpha kTransparent_ResultAlpha = 0x0000;
+
+    /*
+     *
+     * Checks if the result of decoding a row indicates that the row was
+     * transparent.
+     *
+     */
+    static bool IsTransparent(ResultAlpha r) {
+        return kTransparent_ResultAlpha == r;
+    }
+
+    /*
+     *
+     * Checks if the result of decoding a row indicates that the row was
+     * opaque.
+     *
+     */
+    static bool IsOpaque(ResultAlpha r) {
+        return kOpaque_ResultAlpha == r;
+    }
+
+    /*
+     *
+     * Constructs the proper result code based on accumulated alpha masks
+     *
+     */
+    static ResultAlpha GetResult(uint8_t zeroAlpha, uint8_t maxAlpha);
+
+    /*
+     *
+     * Returns bits per pixel for source config
+     *
+     */
+    static int BitsPerPixel(SrcConfig sc) {
+        switch (sc) {
+            case kBit:
+            case kIndex1:
+                return 1;
+            case kIndex2:
+                return 2;
+            case kIndex4:
+                return 4;
+            case kGray:
+            case kIndex:
+                return 8;
+            case kRGB_565:
+                return 16;
+            case kRGB:
+            case kBGR:
+                return 24;
+            case kRGBX:
+            case kRGBA:
+            case kBGRX:
+            case kBGRA:
+            case kCMYK:
+                return 32;
+            default:
+                SkASSERT(false);
+                return 0;
+        }
+    }
+
+    /*
+     *
+     * Returns bytes per pixel for source config
+     * Raises an error if each pixel is not stored in an even number of bytes
+     *
+     */
+    static int BytesPerPixel(SrcConfig sc) {
+        SkASSERT(SkIsAlign8(BitsPerPixel(sc)));
+        return BitsPerPixel(sc) >> 3;
+    }
+
+    /**
+     *  Create a new SkSwizzler.
+     *  @param SrcConfig Description of the format of the source.
+     *  @param ctable Unowned pointer to an array of up to 256 colors for an
+     *                index source.
+     *  @param dstInfo Describes the destination.
+     *  @param options Indicates if dst is zero-initialized. The
+     *                         implementation may choose to skip writing zeroes
+     *                         if set to kYes_ZeroInitialized.
+     *                 Contains partial scanline information.
+     *  @param frame   Is non-NULL if the source pixels are part of an image
+     *                 frame that is a subset of the full image.
+     *
+     *  Note that a deeper discussion of partial scanline subsets and image frame
+     *  subsets is below.  Currently, we do not support both simultaneously.  If
+     *  options->fSubset is non-NULL, frame must be NULL.
+     *
+     *  @return A new SkSwizzler or nullptr on failure.
+     */
+    static SkSwizzler* CreateSwizzler(SrcConfig, const SkPMColor* ctable,
+                                      const SkImageInfo& dstInfo, const SkCodec::Options&,
+                                      const SkIRect* frame = nullptr);
+
+    /**
+     *  Swizzle a line. Generally this will be called height times, once
+     *  for each row of source.
+     *  By allowing the caller to pass in the dst pointer, we give the caller
+     *  flexibility to use the swizzler even when the encoded data does not
+     *  store the rows in order.  This also improves usability for scaled and
+     *  subset decodes.
+     *  @param dst Where we write the output.
+     *  @param src The next row of the source data.
+     *  @return A result code describing if the row was fully opaque, fully
+     *          transparent, or neither
+     */
+    ResultAlpha swizzle(void* dst, const uint8_t* SK_RESTRICT src);
+
+    /**
+     * Implement fill using a custom width.
+     */
+    void fill(const SkImageInfo& info, void* dst, size_t rowBytes, uint32_t colorOrIndex,
+            SkCodec::ZeroInitialized zeroInit) override {
+        const SkImageInfo fillInfo = info.makeWH(fAllocatedWidth, info.height());
+        SkSampler::Fill(fillInfo, dst, rowBytes, colorOrIndex, zeroInit);
+    }
+
+private:
+
+    /**
+     *  Method for converting raw data to Skia pixels.
+     *  @param dstRow Row in which to write the resulting pixels.
+     *  @param src Row of src data, in format specified by SrcConfig
+     *  @param dstWidth Width in pixels of the destination
+     *  @param bpp if bitsPerPixel % 8 == 0, deltaSrc is bytesPerPixel
+     *             else, deltaSrc is bitsPerPixel
+     *  @param deltaSrc bpp * sampleX
+     *  @param ctable Colors (used for kIndex source).
+     *  @param offset The offset before the first pixel to sample.
+                        Is in bytes or bits based on what deltaSrc is in.
+     */
+    typedef ResultAlpha (*RowProc)(void* SK_RESTRICT dstRow,
+                                   const uint8_t* SK_RESTRICT src,
+                                   int dstWidth, int bpp, int deltaSrc, int offset,
+                                   const SkPMColor ctable[]);
+
+    const RowProc       fRowProc;
+    const SkPMColor*    fColorTable;      // Unowned pointer
+
+    // Subset Swizzles
+    // There are two types of subset swizzles that we support.  We do not
+    // support both at the same time.
+    // TODO: If we want to support partial scanlines for gifs (which may
+    //       use frame subsets), we will need to support both subsetting
+    //       modes at the same time.
+    // (1) Partial Scanlines
+    //         The client only wants to write a subset of the source pixels
+    //         to the destination.  This subset is specified to CreateSwizzler
+    //         using options->fSubset.  We will store subset information in
+    //         the following fields.
+    //
+    //         fSrcOffset:      The starting pixel of the source.
+    //         fSrcOffsetUnits: Derived from fSrcOffset with two key
+    //                          differences:
+    //                          (1) This takes the size of source pixels into
+    //                          account by multiplying by fSrcBPP.  This may
+    //                          be measured in bits or bytes depending on
+    //                          which is natural for the SrcConfig.
+    //                          (2) If we are sampling, this will be larger
+    //                          than fSrcOffset * fSrcBPP, since sampling
+    //                          implies that we will skip some pixels.
+    //         fDstOffset:      Will be zero.  There is no destination offset
+    //                          for this type of subset.
+    //         fDstOffsetBytes: Will be zero.
+    //         fSrcWidth:       The width of the desired subset of source
+    //                          pixels, before any sampling is performed.
+    //         fDstWidth:       Will be equal to fSrcWidth, since this is also
+    //                          calculated before any sampling is performed.
+    //                          For this type of subset, the destination width
+    //                          matches the desired subset of the source.
+    //         fSwizzleWidth:   The actual number of pixels that will be
+    //                          written by the RowProc.  This is a scaled
+    //                          version of fSrcWidth/fDstWidth.
+    //         fAllocatedWidth: Will be equal to fSwizzleWidth.  For this type
+    //                          of subset, the number of pixels written is the
+    //                          same as the actual width of the destination.
+    // (2) Frame Subset
+    //         The client will decode the entire width of the source into a
+    //         subset of destination memory.  This subset is specified to
+    //         CreateSwizzler in the "frame" parameter.  We store subset
+    //         information in the following fields.
+    //
+    //         fSrcOffset:      Will be zero.  The starting pixel of the source.
+    //         fSrcOffsetUnits: Will only be non-zero if we are sampling,
+    //                          since sampling implies that we will skip some
+    //                          pixels.  Note that this is measured in bits
+    //                          or bytes depending on which is natural for
+    //                          SrcConfig.
+    //         fDstOffset:      First pixel to write in destination.
+    //         fDstOffsetBytes: fDstOffset * fDstBPP.
+    //         fSrcWidth:       The entire width of the source pixels, before
+    //                          any sampling is performed.
+    //         fDstWidth:       The entire width of the destination memory,
+    //                          before any sampling is performed.
+    //         fSwizzleWidth:   The actual number of pixels that will be
+    //                          written by the RowProc.  This is a scaled
+    //                          version of fSrcWidth.
+    //         fAllocatedWidth: The actual number of pixels in destination
+    //                          memory.  This is a scaled version of
+    //                          fDstWidth.
+    //
+    // If we are not subsetting, these fields are more straightforward.
+    //         fSrcOffset = fDstOffet = fDstOffsetBytes = 0
+    //         fSrcOffsetUnits may be non-zero (we will skip the first few pixels when sampling)
+    //         fSrcWidth = fDstWidth = Full original width
+    //         fSwizzleWidth = fAllcoatedWidth = Scaled width (if we are sampling)
+    const int           fSrcOffset;
+    const int           fDstOffset;
+    int                 fSrcOffsetUnits;
+    int                 fDstOffsetBytes;
+    const int           fSrcWidth;
+    const int           fDstWidth;
+    int                 fSwizzleWidth;
+    int                 fAllocatedWidth;
+
+    int                 fSampleX;         // Step between X samples
+    const int           fSrcBPP;          // Bits/bytes per pixel for the SrcConfig
+                                          // if bitsPerPixel % 8 == 0
+                                          //     fBPP is bytesPerPixel
+                                          // else
+                                          //     fBPP is bitsPerPixel
+    const int           fDstBPP;          // Bytes per pixel for the destination color type
+
+    SkSwizzler(RowProc proc, const SkPMColor* ctable, int srcOffset, int srcWidth, int dstOffset,
+            int dstWidth, int srcBPP, int dstBPP);
+
+    int onSetSampleX(int) override;
+
+};
+#endif // SkSwizzler_DEFINED
diff --git a/gfx/skia/skia/src/codec/SkWebpAdapterCodec.cpp b/gfx/skia/skia/src/codec/SkWebpAdapterCodec.cpp
new file mode 100644
index 000000000000..fb1eacee77ae
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkWebpAdapterCodec.cpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkCodec.h"
+#include "SkCodecPriv.h"
+#include "SkWebpAdapterCodec.h"
+
+SkWebpAdapterCodec::SkWebpAdapterCodec(SkWebpCodec* codec)
+    : INHERITED(codec->getInfo())
+    , fCodec(codec)
+{}
+
+SkISize SkWebpAdapterCodec::onGetSampledDimensions(int sampleSize) const {
+    float scale = get_scale_from_sample_size(sampleSize);
+    return fCodec->getScaledDimensions(scale);
+}
+
+bool SkWebpAdapterCodec::onGetSupportedSubset(SkIRect* desiredSubset) const {
+    return fCodec->getValidSubset(desiredSubset);
+}
+
+SkCodec::Result SkWebpAdapterCodec::onGetAndroidPixels(const SkImageInfo& info, void* pixels,
+        size_t rowBytes, const AndroidOptions& options) {
+    // SkWebpCodec will support pretty much any dimensions that we provide, but we want
+    // to be stricter about the type of scaling that we allow, so we will add an extra
+    // check here.
+    SkISize supportedSize;
+    if (!options.fSubset) {
+        supportedSize = this->onGetSampledDimensions(options.fSampleSize);
+    } else {
+        supportedSize = this->getSampledSubsetDimensions(options.fSampleSize, *options.fSubset);
+    }
+    if (supportedSize != info.dimensions()) {
+        return SkCodec::kInvalidParameters;
+    }
+
+    SkCodec::Options codecOptions;
+    codecOptions.fZeroInitialized = options.fZeroInitialized;
+    codecOptions.fSubset = options.fSubset;
+    return fCodec->getPixels(info, pixels, rowBytes, &codecOptions, options.fColorPtr,
+            options.fColorCount);
+}
diff --git a/gfx/skia/skia/src/codec/SkWebpAdapterCodec.h b/gfx/skia/skia/src/codec/SkWebpAdapterCodec.h
new file mode 100644
index 000000000000..ed0292a02e84
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkWebpAdapterCodec.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef SkWebpAdapterCodec_DEFINED
+#define SkWebpAdapterCodec_DEFINED
+
+#include "SkAndroidCodec.h"
+#include "SkWebpCodec.h"
+
+/**
+ *  This class implements the functionality of SkAndroidCodec.  It uses an
+ *  SkWebpCodec.
+ */
+class SkWebpAdapterCodec : public SkAndroidCodec {
+public:
+
+    explicit SkWebpAdapterCodec(SkWebpCodec*);
+
+    virtual ~SkWebpAdapterCodec() {}
+
+protected:
+
+    SkEncodedFormat onGetEncodedFormat() const override { return kWEBP_SkEncodedFormat; };
+
+    SkISize onGetSampledDimensions(int sampleSize) const override;
+
+    bool onGetSupportedSubset(SkIRect* desiredSubset) const override;
+
+    SkCodec::Result onGetAndroidPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
+            const AndroidOptions& options) override;
+
+private:
+
+    SkAutoTDelete<SkWebpCodec> fCodec;
+
+    typedef SkAndroidCodec INHERITED;
+};
+#endif // SkWebpAdapterCodec_DEFINED
diff --git a/gfx/skia/skia/src/codec/SkWebpCodec.cpp b/gfx/skia/skia/src/codec/SkWebpCodec.cpp
new file mode 100644
index 000000000000..3c61b9376220
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkWebpCodec.cpp
@@ -0,0 +1,255 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkCodecPriv.h"
+#include "SkWebpCodec.h"
+#include "SkTemplates.h"
+
+// A WebP decoder on top of (subset of) libwebp
+// For more information on WebP image format, and libwebp library, see:
+//   https://code.google.com/speed/webp/
+//   http://www.webmproject.org/code/#libwebp-webp-image-library
+//   https://chromium.googlesource.com/webm/libwebp
+
+// If moving libwebp out of skia source tree, path for webp headers must be
+// updated accordingly. Here, we enforce using local copy in webp sub-directory.
+#include "webp/decode.h"
+#include "webp/encode.h"
+
+bool SkWebpCodec::IsWebp(SkStream* stream) {
+    // WEBP starts with the following:
+    // RIFFXXXXWEBPVP
+    // Where XXXX is unspecified.
+    const char LENGTH = 14;
+    char bytes[LENGTH];
+    if (stream->read(&bytes, LENGTH) != LENGTH) {
+        return false;
+    }
+    return !memcmp(bytes, "RIFF", 4) && !memcmp(&bytes[8], "WEBPVP", 6);
+}
+
+static const size_t WEBP_VP8_HEADER_SIZE = 30;
+
+// Parse headers of RIFF container, and check for valid Webp (VP8) content.
+// NOTE: This calls peek instead of read, since onGetPixels will need these
+// bytes again.
+static bool webp_parse_header(SkStream* stream, SkImageInfo* info) {
+    unsigned char buffer[WEBP_VP8_HEADER_SIZE];
+    if (!stream->peek(buffer, WEBP_VP8_HEADER_SIZE)) {
+        return false;
+    }
+
+    WebPBitstreamFeatures features;
+    VP8StatusCode status = WebPGetFeatures(buffer, WEBP_VP8_HEADER_SIZE, &features);
+    if (VP8_STATUS_OK != status) {
+        return false; // Invalid WebP file.
+    }
+
+    // sanity check for image size that's about to be decoded.
+    {
+        const int64_t size = sk_64_mul(features.width, features.height);
+        if (!sk_64_isS32(size)) {
+            return false;
+        }
+        // now check that if we are 4-bytes per pixel, we also don't overflow
+        if (sk_64_asS32(size) > (0x7FFFFFFF >> 2)) {
+            return false;
+        }
+    }
+
+    if (info) {
+        // FIXME: Is N32 the right type?
+        // Is unpremul the right type? Clients of SkCodec may assume it's the
+        // best type, when Skia currently cannot draw unpremul (and raster is faster
+        // with premul).
+        *info = SkImageInfo::Make(features.width, features.height, kN32_SkColorType,
+                                  SkToBool(features.has_alpha) ? kUnpremul_SkAlphaType
+                                                              : kOpaque_SkAlphaType);
+    }
+    return true;
+}
+
+SkCodec* SkWebpCodec::NewFromStream(SkStream* stream) {
+    SkAutoTDelete<SkStream> streamDeleter(stream);
+    SkImageInfo info;
+    if (webp_parse_header(stream, &info)) {
+        return new SkWebpCodec(info, streamDeleter.detach());
+    }
+    return nullptr;
+}
+
+// This version is slightly different from SkCodecPriv's version of conversion_possible. It
+// supports both byte orders for 8888.
+static bool webp_conversion_possible(const SkImageInfo& dst, const SkImageInfo& src) {
+    if (dst.profileType() != src.profileType()) {
+        return false;
+    }
+
+    if (!valid_alpha(dst.alphaType(), src.alphaType())) {
+        return false;
+    }
+
+    switch (dst.colorType()) {
+        // Both byte orders are supported.
+        case kBGRA_8888_SkColorType:
+        case kRGBA_8888_SkColorType:
+            return true;
+        case kRGB_565_SkColorType:
+            return src.alphaType() == kOpaque_SkAlphaType;
+        default:
+            return false;
+    }
+}
+
+SkISize SkWebpCodec::onGetScaledDimensions(float desiredScale) const {
+    SkISize dim = this->getInfo().dimensions();
+    // SkCodec treats zero dimensional images as errors, so the minimum size
+    // that we will recommend is 1x1.
+    dim.fWidth = SkTMax(1, SkScalarRoundToInt(desiredScale * dim.fWidth));
+    dim.fHeight = SkTMax(1, SkScalarRoundToInt(desiredScale * dim.fHeight));
+    return dim;
+}
+
+bool SkWebpCodec::onDimensionsSupported(const SkISize& dim) {
+    const SkImageInfo& info = this->getInfo();
+    return dim.width() >= 1 && dim.width() <= info.width()
+            && dim.height() >= 1 && dim.height() <= info.height();
+}
+
+
+static WEBP_CSP_MODE webp_decode_mode(SkColorType ct, bool premultiply) {
+    switch (ct) {
+        case kBGRA_8888_SkColorType:
+            return premultiply ? MODE_bgrA : MODE_BGRA;
+        case kRGBA_8888_SkColorType:
+            return premultiply ? MODE_rgbA : MODE_RGBA;
+        case kRGB_565_SkColorType:
+            return MODE_RGB_565;
+        default:
+            return MODE_LAST;
+    }
+}
+
+// The WebP decoding API allows us to incrementally pass chunks of bytes as we receive them to the
+// decoder with WebPIAppend. In order to do so, we need to read chunks from the SkStream. This size
+// is arbitrary.
+static const size_t BUFFER_SIZE = 4096;
+
+bool SkWebpCodec::onGetValidSubset(SkIRect* desiredSubset) const {
+    if (!desiredSubset) {
+        return false;
+    }
+
+    SkIRect dimensions  = SkIRect::MakeSize(this->getInfo().dimensions());
+    if (!dimensions.contains(*desiredSubset)) {
+        return false;
+    }
+
+    // As stated below, libwebp snaps to even left and top. Make sure top and left are even, so we
+    // decode this exact subset.
+    // Leave right and bottom unmodified, so we suggest a slightly larger subset than requested.
+    desiredSubset->fLeft = (desiredSubset->fLeft >> 1) << 1;
+    desiredSubset->fTop = (desiredSubset->fTop >> 1) << 1;
+    return true;
+}
+
+SkCodec::Result SkWebpCodec::onGetPixels(const SkImageInfo& dstInfo, void* dst, size_t rowBytes,
+                                         const Options& options, SkPMColor*, int*,
+                                         int* rowsDecoded) {
+    if (!webp_conversion_possible(dstInfo, this->getInfo())) {
+        return kInvalidConversion;
+    }
+
+    WebPDecoderConfig config;
+    if (0 == WebPInitDecoderConfig(&config)) {
+        // ABI mismatch.
+        // FIXME: New enum for this?
+        return kInvalidInput;
+    }
+
+    // Free any memory associated with the buffer. Must be called last, so we declare it first.
+    SkAutoTCallVProc<WebPDecBuffer, WebPFreeDecBuffer> autoFree(&(config.output));
+
+    SkIRect bounds = SkIRect::MakeSize(this->getInfo().dimensions());
+    if (options.fSubset) {
+        // Caller is requesting a subset.
+        if (!bounds.contains(*options.fSubset)) {
+            // The subset is out of bounds.
+            return kInvalidParameters;
+        }
+
+        bounds = *options.fSubset;
+
+        // This is tricky. libwebp snaps the top and left to even values. We could let libwebp
+        // do the snap, and return a subset which is a different one than requested. The problem
+        // with that approach is that the caller may try to stitch subsets together, and if we
+        // returned different subsets than requested, there would be artifacts at the boundaries.
+        // Instead, we report that we cannot support odd values for top and left..
+        if (!SkIsAlign2(bounds.fLeft) || !SkIsAlign2(bounds.fTop)) {
+            return kInvalidParameters;
+        }
+
+#ifdef SK_DEBUG
+        {
+            // Make a copy, since getValidSubset can change its input.
+            SkIRect subset(bounds);
+            // That said, getValidSubset should *not* change its input, in this case; otherwise
+            // getValidSubset does not match the actual subsets we can do.
+            SkASSERT(this->getValidSubset(&subset) && subset == bounds);
+        }
+#endif
+
+        config.options.use_cropping = 1;
+        config.options.crop_left = bounds.fLeft;
+        config.options.crop_top = bounds.fTop;
+        config.options.crop_width = bounds.width();
+        config.options.crop_height = bounds.height();
+    }
+
+    SkISize dstDimensions = dstInfo.dimensions();
+    if (bounds.size() != dstDimensions) {
+        // Caller is requesting scaling.
+        config.options.use_scaling = 1;
+        config.options.scaled_width = dstDimensions.width();
+        config.options.scaled_height = dstDimensions.height();
+    }
+
+    config.output.colorspace = webp_decode_mode(dstInfo.colorType(),
+            dstInfo.alphaType() == kPremul_SkAlphaType);
+    config.output.u.RGBA.rgba = (uint8_t*) dst;
+    config.output.u.RGBA.stride = (int) rowBytes;
+    config.output.u.RGBA.size = dstInfo.getSafeSize(rowBytes);
+    config.output.is_external_memory = 1;
+
+    SkAutoTCallVProc<WebPIDecoder, WebPIDelete> idec(WebPIDecode(nullptr, 0, &config));
+    if (!idec) {
+        return kInvalidInput;
+    }
+
+    SkAutoMalloc storage(BUFFER_SIZE);
+    uint8_t* buffer = static_cast<uint8_t*>(storage.get());
+    while (true) {
+        const size_t bytesRead = stream()->read(buffer, BUFFER_SIZE);
+        if (0 == bytesRead) {
+            WebPIDecGetRGB(idec, rowsDecoded, NULL, NULL, NULL);
+            return kIncompleteInput;
+        }
+
+        switch (WebPIAppend(idec, buffer, bytesRead)) {
+            case VP8_STATUS_OK:
+                return kSuccess;
+            case VP8_STATUS_SUSPENDED:
+                // Break out of the switch statement. Continue the loop.
+                break;
+            default:
+                return kInvalidInput;
+        }
+    }
+}
+
+SkWebpCodec::SkWebpCodec(const SkImageInfo& info, SkStream* stream)
+    : INHERITED(info, stream) {}
diff --git a/gfx/skia/skia/src/codec/SkWebpCodec.h b/gfx/skia/skia/src/codec/SkWebpCodec.h
new file mode 100644
index 000000000000..97b3920ce9a4
--- /dev/null
+++ b/gfx/skia/skia/src/codec/SkWebpCodec.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkWebpCodec_DEFINED
+#define SkWebpCodec_DEFINED
+
+#include "SkCodec.h"
+#include "SkEncodedFormat.h"
+#include "SkImageInfo.h"
+#include "SkTypes.h"
+
+class SkStream;
+
+class SkWebpCodec final : public SkCodec {
+public:
+    // Assumes IsWebp was called and returned true.
+    static SkCodec* NewFromStream(SkStream*);
+    static bool IsWebp(SkStream*);
+protected:
+    Result onGetPixels(const SkImageInfo&, void*, size_t, const Options&, SkPMColor*, int*, int*)
+            override;
+    SkEncodedFormat onGetEncodedFormat() const override { return kWEBP_SkEncodedFormat; }
+
+    bool onReallyHasAlpha() const override {
+        return this->getInfo().alphaType() != kOpaque_SkAlphaType;
+    }
+
+    SkISize onGetScaledDimensions(float desiredScale) const override;
+
+    bool onDimensionsSupported(const SkISize&) override;
+
+    bool onGetValidSubset(SkIRect* /* desiredSubset */) const override;
+private:
+    SkWebpCodec(const SkImageInfo&, SkStream*);
+
+    typedef SkCodec INHERITED;
+};
+#endif // SkWebpCodec_DEFINED
diff --git a/gfx/skia/skia/src/core/Sk4px.h b/gfx/skia/skia/src/core/Sk4px.h
new file mode 100644
index 000000000000..3755488a4a21
--- /dev/null
+++ b/gfx/skia/skia/src/core/Sk4px.h
@@ -0,0 +1,249 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef Sk4px_DEFINED
+#define Sk4px_DEFINED
+
+#include "SkNx.h"
+#include "SkColor.h"
+#include "SkColorPriv.h"
+
+// This file may be included multiple times by .cpp files with different flags, leading
+// to different definitions.  Usually that doesn't matter because it's all inlined, but
+// in Debug modes the compilers may not inline everything.  So wrap everything in an
+// anonymous namespace to give each includer their own silo of this code (or the linker
+// will probably pick one randomly for us, which is rarely correct).
+namespace {
+
+// 1, 2 or 4 SkPMColors, generally vectorized.
+class Sk4px : public Sk16b {
+public:
+    static Sk4px DupAlpha(SkAlpha a) { return Sk16b(a); }  //    a -> aaaa aaaa aaaa aaaa
+    static Sk4px DupPMColor(SkPMColor c);                  // argb -> argb argb argb argb
+
+    Sk4px(const Sk16b& v) : INHERITED(v) {}
+
+    Sk4px alphas() const;  // ARGB argb XYZW xyzw -> AAAA aaaa XXXX xxxx
+
+    // Mask away color or alpha lanes.
+    Sk4px zeroColors() const;  // ARGB argb XYZW xyzw -> A000 a000 X000 x000
+    Sk4px zeroAlphas() const;  // ARGB argb XYZW xyzw -> 0RGB 0rgb 0YZW 0yzw
+
+    Sk4px inv() const { return Sk16b(255) - *this; }
+
+    // When loading or storing fewer than 4 SkPMColors, we use the low lanes.
+    static Sk4px Load4(const SkPMColor[4]);  // PMColor[4] -> ARGB argb XYZW xyzw
+    static Sk4px Load2(const SkPMColor[2]);  // PMColor[2] -> ARGB argb ???? ????
+    static Sk4px Load1(const SkPMColor[1]);  // PMColor[1] -> ARGB ???? ???? ????
+
+    // Ditto for Alphas... Load2Alphas fills the low two lanes of Sk4px.
+    static Sk4px Load4Alphas(const SkAlpha[4]);  // AaXx -> AAAA aaaa XXXX xxxx
+    static Sk4px Load2Alphas(const SkAlpha[2]);  // Aa   -> AAAA aaaa ???? ????
+
+    void store4(SkPMColor[4]) const;
+    void store2(SkPMColor[2]) const;
+    void store1(SkPMColor[1]) const;
+
+    // Same as above for 565.
+    static Sk4px Load4(const SkPMColor16 src[4]);
+    static Sk4px Load2(const SkPMColor16 src[2]);
+    static Sk4px Load1(const SkPMColor16 src[1]);
+    void store4(SkPMColor16 dst[4]) const;
+    void store2(SkPMColor16 dst[2]) const;
+    void store1(SkPMColor16 dst[1]) const;
+
+    // 1, 2, or 4 SkPMColors with 16-bit components.
+    // This is most useful as the result of a multiply, e.g. from mulWiden().
+    class Wide : public Sk16h {
+    public:
+        Wide(const Sk16h& v) : Sk16h(v) {}
+
+        // Pack the top byte of each component back down into 4 SkPMColors.
+        Sk4px addNarrowHi(const Sk16h&) const;
+
+        // Rounds, i.e. (x+127) / 255.
+        Sk4px div255() const;
+
+        // These just keep the types as Wide so the user doesn't have to keep casting.
+        Wide operator * (const Wide& o) const { return INHERITED::operator*(o); }
+        Wide operator + (const Wide& o) const { return INHERITED::operator+(o); }
+        Wide operator - (const Wide& o) const { return INHERITED::operator-(o); }
+        Wide operator >> (int bits) const { return INHERITED::operator>>(bits); }
+        Wide operator << (int bits) const { return INHERITED::operator<<(bits); }
+        static Wide Min(const Wide& a, const Wide& b) { return INHERITED::Min(a,b); }
+        Wide thenElse(const Wide& t, const Wide& e) const { return INHERITED::thenElse(t,e); }
+
+    private:
+        typedef Sk16h INHERITED;
+    };
+
+    Wide widenLo() const;               // ARGB -> 0A 0R 0G 0B
+    Wide widenHi() const;               // ARGB -> A0 R0 G0 B0
+    Wide widenLoHi() const;             // ARGB -> AA RR GG BB
+    Wide mulWiden(const Sk16b&) const;  // 8-bit x 8-bit -> 16-bit components.
+
+    // The only 8-bit multiply we use is 8-bit x 8-bit -> 16-bit.  Might as well make it pithy.
+    Wide operator * (const Sk4px& o) const { return this->mulWiden(o); }
+
+    // These just keep the types as Sk4px so the user doesn't have to keep casting.
+    Sk4px operator + (const Sk4px& o) const { return INHERITED::operator+(o); }
+    Sk4px operator - (const Sk4px& o) const { return INHERITED::operator-(o); }
+    Sk4px operator < (const Sk4px& o) const { return INHERITED::operator<(o); }
+    Sk4px thenElse(const Sk4px& t, const Sk4px& e) const { return INHERITED::thenElse(t,e); }
+
+    // Generally faster than (*this * o).div255().
+    // May be incorrect by +-1, but is always exactly correct when *this or o is 0 or 255.
+    Sk4px approxMulDiv255(const Sk16b& o) const {
+        // (x*y + x) / 256 meets these criteria.  (As of course does (x*y + y) / 256 by symmetry.)
+        // FYI: (x*y + 255) / 256 also meets these criteria.  In my brief testing, it was slower.
+        return this->widenLo().addNarrowHi(*this * o);
+    }
+
+    // A generic driver that maps fn over a src array into a dst array.
+    // fn should take an Sk4px (4 src pixels) and return an Sk4px (4 dst pixels).
+    template <typename Fn, typename Dst>
+    static void MapSrc(int n, Dst* dst, const SkPMColor* src, const Fn& fn) {
+        SkASSERT(dst);
+        SkASSERT(src);
+        // This looks a bit odd, but it helps loop-invariant hoisting across different calls to fn.
+        // Basically, we need to make sure we keep things inside a single loop.
+        while (n > 0) {
+            if (n >= 8) {
+                Sk4px dst0 = fn(Load4(src+0)),
+                      dst4 = fn(Load4(src+4));
+                dst0.store4(dst+0);
+                dst4.store4(dst+4);
+                dst += 8; src += 8; n -= 8;
+                continue;  // Keep our stride at 8 pixels as long as possible.
+            }
+            SkASSERT(n <= 7);
+            if (n >= 4) {
+                fn(Load4(src)).store4(dst);
+                dst += 4; src += 4; n -= 4;
+            }
+            if (n >= 2) {
+                fn(Load2(src)).store2(dst);
+                dst += 2; src += 2; n -= 2;
+            }
+            if (n >= 1) {
+                fn(Load1(src)).store1(dst);
+            }
+            break;
+        }
+    }
+
+    // As above, but with dst4' = fn(dst4, src4).
+    template <typename Fn, typename Dst>
+    static void MapDstSrc(int n, Dst* dst, const SkPMColor* src, const Fn& fn) {
+        SkASSERT(dst);
+        SkASSERT(src);
+        while (n > 0) {
+            if (n >= 8) {
+                Sk4px dst0 = fn(Load4(dst+0), Load4(src+0)),
+                      dst4 = fn(Load4(dst+4), Load4(src+4));
+                dst0.store4(dst+0);
+                dst4.store4(dst+4);
+                dst += 8; src += 8; n -= 8;
+                continue;  // Keep our stride at 8 pixels as long as possible.
+            }
+            SkASSERT(n <= 7);
+            if (n >= 4) {
+                fn(Load4(dst), Load4(src)).store4(dst);
+                dst += 4; src += 4; n -= 4;
+            }
+            if (n >= 2) {
+                fn(Load2(dst), Load2(src)).store2(dst);
+                dst += 2; src += 2; n -= 2;
+            }
+            if (n >= 1) {
+                fn(Load1(dst), Load1(src)).store1(dst);
+            }
+            break;
+        }
+    }
+
+    // As above, but with dst4' = fn(dst4, alpha4).
+    template <typename Fn, typename Dst>
+    static void MapDstAlpha(int n, Dst* dst, const SkAlpha* a, const Fn& fn) {
+        SkASSERT(dst);
+        SkASSERT(a);
+        while (n > 0) {
+            if (n >= 8) {
+                Sk4px dst0 = fn(Load4(dst+0), Load4Alphas(a+0)),
+                      dst4 = fn(Load4(dst+4), Load4Alphas(a+4));
+                dst0.store4(dst+0);
+                dst4.store4(dst+4);
+                dst += 8; a += 8; n -= 8;
+                continue;  // Keep our stride at 8 pixels as long as possible.
+            }
+            SkASSERT(n <= 7);
+            if (n >= 4) {
+                fn(Load4(dst), Load4Alphas(a)).store4(dst);
+                dst += 4; a += 4; n -= 4;
+            }
+            if (n >= 2) {
+                fn(Load2(dst), Load2Alphas(a)).store2(dst);
+                dst += 2; a += 2; n -= 2;
+            }
+            if (n >= 1) {
+                fn(Load1(dst), DupAlpha(*a)).store1(dst);
+            }
+            break;
+        }
+    }
+
+    // As above, but with dst4' = fn(dst4, src4, alpha4).
+    template <typename Fn, typename Dst>
+    static void MapDstSrcAlpha(int n, Dst* dst, const SkPMColor* src, const SkAlpha* a,
+                               const Fn& fn) {
+        SkASSERT(dst);
+        SkASSERT(src);
+        SkASSERT(a);
+        while (n > 0) {
+            if (n >= 8) {
+                Sk4px dst0 = fn(Load4(dst+0), Load4(src+0), Load4Alphas(a+0)),
+                      dst4 = fn(Load4(dst+4), Load4(src+4), Load4Alphas(a+4));
+                dst0.store4(dst+0);
+                dst4.store4(dst+4);
+                dst += 8; src += 8; a += 8; n -= 8;
+                continue;  // Keep our stride at 8 pixels as long as possible.
+            }
+            SkASSERT(n <= 7);
+            if (n >= 4) {
+                fn(Load4(dst), Load4(src), Load4Alphas(a)).store4(dst);
+                dst += 4; src += 4; a += 4; n -= 4;
+            }
+            if (n >= 2) {
+                fn(Load2(dst), Load2(src), Load2Alphas(a)).store2(dst);
+                dst += 2; src += 2; a += 2; n -= 2;
+            }
+            if (n >= 1) {
+                fn(Load1(dst), Load1(src), DupAlpha(*a)).store1(dst);
+            }
+            break;
+        }
+    }
+
+private:
+    typedef Sk16b INHERITED;
+};
+
+}  // namespace
+
+#ifdef SKNX_NO_SIMD
+    #include "../opts/Sk4px_none.h"
+#else
+    #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
+        #include "../opts/Sk4px_SSE2.h"
+    #elif defined(SK_ARM_HAS_NEON)
+        #include "../opts/Sk4px_NEON.h"
+    #else
+        #include "../opts/Sk4px_none.h"
+    #endif
+#endif
+
+#endif//Sk4px_DEFINED
diff --git a/gfx/skia/skia/src/core/SkAAClip.cpp b/gfx/skia/skia/src/core/SkAAClip.cpp
index 14152f8317ef..bbd1f555f08d 100644
--- a/gfx/skia/skia/src/core/SkAAClip.cpp
+++ b/gfx/skia/skia/src/core/SkAAClip.cpp
@@ -7,11 +7,11 @@
  */
 
 #include "SkAAClip.h"
+#include "SkAtomics.h"
 #include "SkBlitter.h"
 #include "SkColorPriv.h"
 #include "SkPath.h"
 #include "SkScan.h"
-#include "SkThread.h"
 #include "SkUtils.h"
 
 class AutoAAClipValidate {
@@ -136,9 +136,9 @@ SkAAClip::Iter::Iter(const SkAAClip& clip) {
     if (clip.isEmpty()) {
         fDone = true;
         fTop = fBottom = clip.fBounds.fBottom;
-        fData = NULL;
-        fCurrYOff = NULL;
-        fStopYOff = NULL;
+        fData = nullptr;
+        fCurrYOff = nullptr;
+        fStopYOff = nullptr;
         return;
     }
 
@@ -163,7 +163,7 @@ void SkAAClip::Iter::next() {
         if (curr >= fStopYOff) {
             fDone = true;
             fBottom = kMaxInt32;
-            fData = NULL;
+            fData = nullptr;
         } else {
             fBottom += curr->fY - prev->fY;
             fData += curr->fOffset - prev->fOffset;
@@ -188,7 +188,7 @@ static size_t compute_row_length(const uint8_t row[], int width) {
 }
 
 void SkAAClip::validate() const {
-    if (NULL == fRunHead) {
+    if (nullptr == fRunHead) {
         SkASSERT(fBounds.isEmpty());
         return;
     }
@@ -219,6 +219,46 @@ void SkAAClip::validate() const {
     --yoff;
     SkASSERT(yoff->fY == lastY);
 }
+
+static void dump_one_row(const uint8_t* SK_RESTRICT row,
+                         int width, int leading_num) {
+    if (leading_num) {
+        SkDebugf( "%03d ", leading_num );
+    }
+    while (width > 0) {
+        int n = row[0];
+        int val = row[1];
+        char out = '.';
+        if (val == 0xff) {
+            out = '*';
+        } else if (val > 0) {
+            out = '+';
+        }
+        for (int i = 0 ; i < n ; i++) {
+            SkDebugf( "%c", out );
+        }
+        row += 2;
+        width -= n;
+    }
+    SkDebugf( "\n" );
+}
+
+void SkAAClip::debug(bool compress_y) const {
+    Iter iter(*this);
+    const int width = fBounds.width();
+
+    int y = fBounds.fTop;
+    while (!iter.done()) {
+        if (compress_y) {
+            dump_one_row(iter.data(), width, iter.bottom() - iter.top() + 1);
+        } else {
+            do {
+                dump_one_row(iter.data(), width, 0);
+            } while (++y < iter.bottom());
+        }
+        iter.next();
+    }
+}
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -585,12 +625,12 @@ void SkAAClip::freeRuns() {
 
 SkAAClip::SkAAClip() {
     fBounds.setEmpty();
-    fRunHead = NULL;
+    fRunHead = nullptr;
 }
 
 SkAAClip::SkAAClip(const SkAAClip& src) {
     SkDEBUGCODE(fBounds.setEmpty();)    // need this for validate
-    fRunHead = NULL;
+    fRunHead = nullptr;
     *this = src;
 }
 
@@ -658,7 +698,7 @@ bool SkAAClip::set(const SkAAClip& src) {
 bool SkAAClip::setEmpty() {
     this->freeRuns();
     fBounds.setEmpty();
-    fRunHead = NULL;
+    fRunHead = nullptr;
     return false;
 }
 
@@ -684,6 +724,34 @@ bool SkAAClip::setRect(const SkIRect& bounds) {
 #endif
 }
 
+bool SkAAClip::isRect() const {
+    if (this->isEmpty()) {
+        return false;
+    }
+
+    const RunHead* head = fRunHead;
+    if (head->fRowCount != 1) {
+        return false;
+    }
+    const YOffset* yoff = head->yoffsets();
+    if (yoff->fY != fBounds.fBottom - 1) {
+        return false;
+    }
+
+    const uint8_t* row = head->data() + yoff->fOffset;
+    int width = fBounds.width();
+    do {
+        if (row[1] != 0xFF) {
+            return false;
+        }
+        int n = row[0];
+        SkASSERT(n <= width);
+        width -= n;
+        row += 2;
+    } while (width > 0);
+    return true;
+}
+
 bool SkAAClip::setRect(const SkRect& r, bool doAA) {
     if (r.isEmpty()) {
         return this->setEmpty();
@@ -695,7 +763,7 @@ bool SkAAClip::setRect(const SkRect& r, bool doAA) {
 
     SkPath path;
     path.addRect(r);
-    return this->setPath(path, NULL, doAA);
+    return this->setPath(path, nullptr, doAA);
 }
 
 static void append_run(SkTDArray<uint8_t>& array, uint8_t value, int count) {
@@ -742,7 +810,7 @@ bool SkAAClip::setRegion(const SkRegion& rgn) {
     SkRegion::Iterator iter(rgn);
     int prevRight = 0;
     int prevBot = 0;
-    YOffset* currY = NULL;
+    YOffset* currY = nullptr;
 
     for (; !iter.done(); iter.next()) {
         const SkIRect& r = iter.rect();
@@ -801,7 +869,7 @@ const uint8_t* SkAAClip::findRow(int y, int* lastYForRow) const {
     SkASSERT(fRunHead);
 
     if (!y_in_rect(y, fBounds)) {
-        return NULL;
+        return nullptr;
     }
     y -= fBounds.y();  // our yoffs values are relative to the top
 
@@ -892,7 +960,7 @@ public:
     Builder(const SkIRect& bounds) : fBounds(bounds) {
         fPrevY = -1;
         fWidth = bounds.width();
-        fCurrRow = NULL;
+        fCurrRow = nullptr;
         fMinY = bounds.fTop;
     }
 
@@ -1113,7 +1181,7 @@ private:
     }
 
     Row* flushRow(bool readyForAnother) {
-        Row* next = NULL;
+        Row* next = nullptr;
         int count = fRows.count();
         if (count > 0) {
             this->flushRowH(&fRows[count - 1]);
@@ -1205,13 +1273,13 @@ public:
        Instead we'll rely on the runtime asserts to guarantee Y monotonicity;
        any failure cases that misses may have minor artifacts.
     */
-    virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE {
+    void blitV(int x, int y, int height, SkAlpha alpha) override {
         this->recordMinY(y);
         fBuilder->addColumn(x, y, alpha, height);
         fLastY = y + height - 1;
     }
 
-    virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE {
+    void blitRect(int x, int y, int width, int height) override {
         this->recordMinY(y);
         this->checkForYGap(y);
         fBuilder->addRectRun(x, y, width, height);
@@ -1219,28 +1287,28 @@ public:
     }
 
     virtual void blitAntiRect(int x, int y, int width, int height,
-                     SkAlpha leftAlpha, SkAlpha rightAlpha) SK_OVERRIDE {
+                     SkAlpha leftAlpha, SkAlpha rightAlpha) override {
         this->recordMinY(y);
         this->checkForYGap(y);
         fBuilder->addAntiRectRun(x, y, width, height, leftAlpha, rightAlpha);
         fLastY = y + height - 1;
     }
 
-    virtual void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE
+    void blitMask(const SkMask&, const SkIRect& clip) override
         { unexpected(); }
 
-    virtual const SkBitmap* justAnOpaqueColor(uint32_t*) SK_OVERRIDE {
-        return NULL;
+    const SkPixmap* justAnOpaqueColor(uint32_t*) override {
+        return nullptr;
     }
 
-    virtual void blitH(int x, int y, int width) SK_OVERRIDE {
+    void blitH(int x, int y, int width) override {
         this->recordMinY(y);
         this->checkForYGap(y);
         fBuilder->addRun(x, y, 0xFF, width);
     }
 
     virtual void blitAntiH(int x, int y, const SkAlpha alpha[],
-                           const int16_t runs[]) SK_OVERRIDE {
+                           const int16_t runs[]) override {
         this->recordMinY(y);
         this->checkForYGap(y);
         for (;;) {
@@ -1313,7 +1381,7 @@ bool SkAAClip::setPath(const SkPath& path, const SkRegion* clip, bool doAA) {
     path.getBounds().roundOut(&ibounds);
 
     SkRegion tmpClip;
-    if (NULL == clip) {
+    if (nullptr == clip) {
         tmpClip.setRect(ibounds);
         clip = &tmpClip;
     }
@@ -1540,8 +1608,8 @@ static void operateY(SkAAClip::Builder& builder, const SkAAClip& A,
     int botB = iterB.bottom();
 
     do {
-        const uint8_t* rowA = NULL;
-        const uint8_t* rowB = NULL;
+        const uint8_t* rowA = nullptr;
+        const uint8_t* rowB = nullptr;
         int top, bot;
 
         if (topA < topB) {
@@ -1735,7 +1803,7 @@ bool SkAAClip::op(const SkAAClip& clip, SkRegion::Op op) {
 ///////////////////////////////////////////////////////////////////////////////
 
 bool SkAAClip::translate(int dx, int dy, SkAAClip* dst) const {
-    if (NULL == dst) {
+    if (nullptr == dst) {
         return !this->isEmpty();
     }
 
@@ -1771,7 +1839,7 @@ void SkAAClip::copyToMask(SkMask* mask) const {
     mask->fFormat = SkMask::kA8_Format;
     if (this->isEmpty()) {
         mask->fBounds.setEmpty();
-        mask->fImage = NULL;
+        mask->fImage = nullptr;
         mask->fRowBytes = 0;
         return;
     }
@@ -1830,7 +1898,7 @@ SkAAClipBlitter::~SkAAClipBlitter() {
 }
 
 void SkAAClipBlitter::ensureRunsAndAA() {
-    if (NULL == fScanlineScratch) {
+    if (nullptr == fScanlineScratch) {
         // add 1 so we can store the terminating run count of 0
         int count = fAAClipBounds.width() + 1;
         // we use this either for fRuns + fAA, or a scaline of a mask
@@ -1978,6 +2046,7 @@ static void small_bzero(void* dst, size_t n) {
 static inline uint8_t mergeOne(uint8_t value, unsigned alpha) {
     return SkMulDiv255Round(value, alpha);
 }
+
 static inline uint16_t mergeOne(uint16_t value, unsigned alpha) {
     unsigned r = SkGetPackedR16(value);
     unsigned g = SkGetPackedG16(value);
@@ -1986,16 +2055,6 @@ static inline uint16_t mergeOne(uint16_t value, unsigned alpha) {
                        SkMulDiv255Round(g, alpha),
                        SkMulDiv255Round(b, alpha));
 }
-static inline SkPMColor mergeOne(SkPMColor value, unsigned alpha) {
-    unsigned a = SkGetPackedA32(value);
-    unsigned r = SkGetPackedR32(value);
-    unsigned g = SkGetPackedG32(value);
-    unsigned b = SkGetPackedB32(value);
-    return SkPackARGB32(SkMulDiv255Round(a, alpha),
-                        SkMulDiv255Round(r, alpha),
-                        SkMulDiv255Round(g, alpha),
-                        SkMulDiv255Round(b, alpha));
-}
 
 template <typename T> void mergeT(const T* SK_RESTRICT src, int srcN,
                                  const uint8_t* SK_RESTRICT row, int rowN,
@@ -2033,7 +2092,7 @@ static MergeAAProc find_merge_aa_proc(SkMask::Format format) {
     switch (format) {
         case SkMask::kBW_Format:
             SkDEBUGFAIL("unsupported");
-            return NULL;
+            return nullptr;
         case SkMask::kA8_Format:
         case SkMask::k3D_Format: {
             void (*proc8)(const uint8_t*, int, const uint8_t*, int, uint8_t*) = mergeT;
@@ -2043,13 +2102,9 @@ static MergeAAProc find_merge_aa_proc(SkMask::Format format) {
             void (*proc16)(const uint16_t*, int, const uint8_t*, int, uint16_t*) = mergeT;
             return (MergeAAProc)proc16;
         }
-        case SkMask::kLCD32_Format: {
-            void (*proc32)(const SkPMColor*, int, const uint8_t*, int, SkPMColor*) = mergeT;
-            return (MergeAAProc)proc32;
-        }
         default:
             SkDEBUGFAIL("unsupported");
-            return NULL;
+            return nullptr;
     }
 }
 
@@ -2113,7 +2168,7 @@ void SkAAClipBlitter::blitMask(const SkMask& origMask, const SkIRect& clip) {
 
     // if we're BW, we need to upscale to A8 (ugh)
     SkMask  grayMask;
-    grayMask.fImage = NULL;
+    grayMask.fImage = nullptr;
     if (SkMask::kBW_Format == origMask.fFormat) {
         grayMask.fFormat = SkMask::kA8_Format;
         grayMask.fBounds = origMask.fBounds;
@@ -2164,6 +2219,6 @@ void SkAAClipBlitter::blitMask(const SkMask& origMask, const SkIRect& clip) {
     } while (y < stopY);
 }
 
-const SkBitmap* SkAAClipBlitter::justAnOpaqueColor(uint32_t* value) {
-    return NULL;
+const SkPixmap* SkAAClipBlitter::justAnOpaqueColor(uint32_t* value) {
+    return nullptr;
 }
diff --git a/gfx/skia/skia/src/core/SkAAClip.h b/gfx/skia/skia/src/core/SkAAClip.h
index f2cde62dbc8d..02072333867d 100644
--- a/gfx/skia/skia/src/core/SkAAClip.h
+++ b/gfx/skia/skia/src/core/SkAAClip.h
@@ -26,13 +26,17 @@ public:
 
     void swap(SkAAClip&);
 
-    bool isEmpty() const { return NULL == fRunHead; }
+    bool isEmpty() const { return nullptr == fRunHead; }
     const SkIRect& getBounds() const { return fBounds; }
 
+    // Returns true iff the clip is not empty, and is just a hard-edged rect (no partial alpha).
+    // If true, getBounds() can be used in place of this clip.
+    bool isRect() const;
+
     bool setEmpty();
     bool setRect(const SkIRect&);
     bool setRect(const SkRect&, bool doAA = true);
-    bool setPath(const SkPath&, const SkRegion* clip = NULL, bool doAA = true);
+    bool setPath(const SkPath&, const SkRegion* clip = nullptr, bool doAA = true);
     bool setRegion(const SkRegion&);
     bool set(const SkAAClip&);
 
@@ -61,8 +65,8 @@ public:
         return this->quickContains(r.fLeft, r.fTop, r.fRight, r.fBottom);
     }
 
-    const uint8_t* findRow(int y, int* lastYForRow = NULL) const;
-    const uint8_t* findX(const uint8_t data[], int x, int* initialCount = NULL) const;
+    const uint8_t* findRow(int y, int* lastYForRow = nullptr) const;
+    const uint8_t* findX(const uint8_t data[], int x, int* initialCount = nullptr) const;
 
     class Iter;
     struct RunHead;
@@ -71,8 +75,10 @@ public:
 
 #ifdef SK_DEBUG
     void validate() const;
+    void debug(bool compress_y=false) const;
 #else
     void validate() const {}
+    void debug(bool compress_y=false) const {}
 #endif
 
 private:
@@ -93,7 +99,7 @@ private:
 
 class SkAAClipBlitter : public SkBlitter {
 public:
-    SkAAClipBlitter() : fScanlineScratch(NULL) {}
+    SkAAClipBlitter() : fScanlineScratch(nullptr) {}
     virtual ~SkAAClipBlitter();
 
     void init(SkBlitter* blitter, const SkAAClip* aaclip) {
@@ -103,13 +109,12 @@ public:
         fAAClipBounds = aaclip->getBounds();
     }
 
-    virtual void blitH(int x, int y, int width) SK_OVERRIDE;
-    virtual void blitAntiH(int x, int y, const SkAlpha[],
-                           const int16_t runs[]) SK_OVERRIDE;
-    virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE;
-    virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE;
-    virtual void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE;
-    virtual const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE;
+    void blitH(int x, int y, int width) override;
+    void blitAntiH(int x, int y, const SkAlpha[], const int16_t runs[]) override;
+    void blitV(int x, int y, int height, SkAlpha alpha) override;
+    void blitRect(int x, int y, int width, int height) override;
+    void blitMask(const SkMask&, const SkIRect& clip) override;
+    const SkPixmap* justAnOpaqueColor(uint32_t* value) override;
 
 private:
     SkBlitter*      fBlitter;
diff --git a/gfx/skia/skia/src/core/SkAdvancedTypefaceMetrics.cpp b/gfx/skia/skia/src/core/SkAdvancedTypefaceMetrics.cpp
index f9b25dc96aac..56a557c343f5 100644
--- a/gfx/skia/skia/src/core/SkAdvancedTypefaceMetrics.cpp
+++ b/gfx/skia/skia/src/core/SkAdvancedTypefaceMetrics.cpp
@@ -16,7 +16,7 @@
 
 #if defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID)
 // forward declare structs needed for getAdvanceData() template for freetype
-struct FT_FaceRec;
+struct FT_FaceRec_;
 typedef struct FT_FaceRec_* FT_Face;
 #endif
 
@@ -148,7 +148,7 @@ SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* getAdvanceData(
 
     SkAutoTDelete<SkAdvancedTypefaceMetrics::AdvanceMetric<Data> > result;
     SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* curRange;
-    SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* prevRange = NULL;
+    SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* prevRange = nullptr;
     Data lastAdvance = kInvalidAdvance;
     int repeatedAdvances = 0;
     int wildCardsInRun = 0;
@@ -168,7 +168,7 @@ SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* getAdvanceData(
     for (int gId = firstIndex; gId <= lastIndex; gId++) {
         Data advance = kInvalidAdvance;
         if (gId < lastIndex) {
-            // Get glyph id only when subset is NULL, or the id is in subset.
+            // Get glyph id only when subset is nullptr, or the id is in subset.
             SkASSERT(!subsetGlyphIDs || (subsetIndex < subsetGlyphIDsLength &&
                     static_cast<uint32_t>(gId) <= subsetGlyphIDs[subsetIndex]));
             if (!subsetGlyphIDs ||
diff --git a/gfx/skia/skia/include/core/SkAdvancedTypefaceMetrics.h b/gfx/skia/skia/src/core/SkAdvancedTypefaceMetrics.h
similarity index 86%
rename from gfx/skia/skia/include/core/SkAdvancedTypefaceMetrics.h
rename to gfx/skia/skia/src/core/SkAdvancedTypefaceMetrics.h
index 11926888f57b..b2c9ac3142d0 100644
--- a/gfx/skia/skia/include/core/SkAdvancedTypefaceMetrics.h
+++ b/gfx/skia/skia/src/core/SkAdvancedTypefaceMetrics.h
@@ -19,13 +19,25 @@
 /** \class SkAdvancedTypefaceMetrics
 
     The SkAdvancedTypefaceMetrics class is used by the PDF backend to correctly
-    embed typefaces.  This class is filled in with information about a given
-    typeface by the SkFontHost class.
+    embed typefaces. This class is created and filled in with information by
+    SkTypeface::getAdvancedTypefaceMetrics.
 */
 
 class SkAdvancedTypefaceMetrics : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkAdvancedTypefaceMetrics)
+
+    SkAdvancedTypefaceMetrics()
+        : fType(SkAdvancedTypefaceMetrics::kOther_Font)
+        , fFlags(SkAdvancedTypefaceMetrics::kEmpty_FontFlag)
+        , fLastGlyphID(0)
+        , fEmSize(0)
+        , fStyle(0)
+        , fItalicAngle(0)
+        , fAscent(0)
+        , fDescent(0)
+        , fStemV(0)
+        , fCapHeight(0)
+        , fBBox(SkIRect::MakeEmpty()) {}
 
     SkString fFontName;
 
@@ -43,7 +55,7 @@ public:
 
     enum FontFlags {
         kEmpty_FontFlag          = 0x0,  //!<No flags set
-        kMultiMaster_FontFlag    = 0x1,  //!<May be true for Type1 or CFF fonts.
+        kMultiMaster_FontFlag    = 0x1,  //!<May be true for Type1, CFF, or TrueType fonts.
         kNotEmbeddable_FontFlag  = 0x2,  //!<May not be embedded.
         kNotSubsettable_FontFlag = 0x4,  //!<May not be subset.
     };
@@ -74,16 +86,6 @@ public:
 
     SkIRect fBBox;  // The bounding box of all glyphs (in font units).
 
-    // The type of advance data wanted.
-    enum PerGlyphInfo {
-      kNo_PerGlyphInfo         = 0x0, // Don't populate any per glyph info.
-      kHAdvance_PerGlyphInfo   = 0x1, // Populate horizontal advance data.
-      kVAdvance_PerGlyphInfo   = 0x2, // Populate vertical advance data.
-      kGlyphNames_PerGlyphInfo = 0x4, // Populate glyph names (Type 1 only).
-      kToUnicode_PerGlyphInfo  = 0x8  // Populate ToUnicode table, ignored
-                                      // for Type 1 fonts
-    };
-
     template <typename Data>
     struct AdvanceMetric {
         enum MetricType {
@@ -145,9 +147,9 @@ void finishRange(
     @param num_glyphs    Total number of glyphs in the given font.
     @param glyphIDs      For per-glyph info, specify subset of the font by
                          giving glyph ids.  Each integer represents a glyph
-                         id.  Passing NULL means all glyphs in the font.
+                         id.  Passing nullptr means all glyphs in the font.
     @param glyphIDsCount Number of elements in subsetGlyphIds. Ignored if
-                         glyphIDs is NULL.
+                         glyphIDs is nullptr.
 */
 template <typename Data, typename FontHandle>
 SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* getAdvanceData(
diff --git a/gfx/skia/skia/src/core/SkAnnotation.cpp b/gfx/skia/skia/src/core/SkAnnotation.cpp
index bddff64db84c..84d41fc66933 100644
--- a/gfx/skia/skia/src/core/SkAnnotation.cpp
+++ b/gfx/skia/skia/src/core/SkAnnotation.cpp
@@ -7,13 +7,13 @@
 
 #include "SkAnnotation.h"
 #include "SkData.h"
+#include "SkPaint.h"
+#include "SkPoint.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
-#include "SkPoint.h"
-#include "SkStream.h"
 
 SkAnnotation::SkAnnotation(const char key[], SkData* value) : fKey(key) {
-    if (NULL == value) {
+    if (nullptr == value) {
         value = SkData::NewEmpty();
     } else {
         value->ref();
@@ -26,7 +26,7 @@ SkAnnotation::~SkAnnotation() {
 }
 
 SkData* SkAnnotation::find(const char key[]) const {
-    return fKey.equals(key) ? fData : NULL;
+    return fKey.equals(key) ? fData : nullptr;
 }
 
 SkAnnotation::SkAnnotation(SkReadBuffer& buffer) {
@@ -60,7 +60,7 @@ static void annotate_paint(SkPaint& paint, const char* key, SkData* value) {
 }
 
 void SkAnnotateRectWithURL(SkCanvas* canvas, const SkRect& rect, SkData* value) {
-    if (NULL == value) {
+    if (nullptr == value) {
         return;
     }
     SkPaint paint;
@@ -69,7 +69,7 @@ void SkAnnotateRectWithURL(SkCanvas* canvas, const SkRect& rect, SkData* value)
 }
 
 void SkAnnotateNamedDestination(SkCanvas* canvas, const SkPoint& point, SkData* name) {
-    if (NULL == name) {
+    if (nullptr == name) {
         return;
     }
     SkPaint paint;
@@ -78,7 +78,7 @@ void SkAnnotateNamedDestination(SkCanvas* canvas, const SkPoint& point, SkData*
 }
 
 void SkAnnotateLinkToDestination(SkCanvas* canvas, const SkRect& rect, SkData* name) {
-    if (NULL == name) {
+    if (nullptr == name) {
         return;
     }
     SkPaint paint;
diff --git a/gfx/skia/skia/src/core/SkBBHFactory.cpp b/gfx/skia/skia/src/core/SkBBHFactory.cpp
index 7411eb34dab5..e8534cacb33c 100644
--- a/gfx/skia/skia/src/core/SkBBHFactory.cpp
+++ b/gfx/skia/skia/src/core/SkBBHFactory.cpp
@@ -6,39 +6,11 @@
  */
 
 #include "SkBBHFactory.h"
-#include "SkPictureStateTree.h"
-#include "SkQuadTree.h"
+#include "SkRect.h"
 #include "SkRTree.h"
-#include "SkTileGrid.h"
+#include "SkScalar.h"
 
-
-SkBBoxHierarchy* SkQuadTreeFactory::operator()(int width, int height) const {
-    return SkNEW_ARGS(SkQuadTree, (SkIRect::MakeWH(width, height)));
-}
-
-SkBBoxHierarchy* SkRTreeFactory::operator()(int width, int height) const {
-    // These values were empirically determined to produce reasonable
-    // performance in most cases.
-    static const int kRTreeMinChildren = 6;
-    static const int kRTreeMaxChildren = 11;
-
-    SkScalar aspectRatio = SkScalarDiv(SkIntToScalar(width),
-                                       SkIntToScalar(height));
-    bool sortDraws = false;  // Do not sort draw calls when bulk loading.
-
-    return SkRTree::Create(kRTreeMinChildren, kRTreeMaxChildren,
-                           aspectRatio, sortDraws);
-}
-
-SkBBoxHierarchy* SkTileGridFactory::operator()(int width, int height) const {
-    SkASSERT(fInfo.fMargin.width() >= 0);
-    SkASSERT(fInfo.fMargin.height() >= 0);
-    // Note: SkIRects are non-inclusive of the right() column and bottom() row.
-    // For example, an SkIRect at 0,0 with a size of (1,1) will only have
-    // content at pixel (0,0) and will report left=0 and right=1, hence the
-    // "-1"s below.
-    int xTileCount = (width + fInfo.fTileInterval.width() - 1) / fInfo.fTileInterval.width();
-    int yTileCount = (height + fInfo.fTileInterval.height() - 1) / fInfo.fTileInterval.height();
-    return SkNEW_ARGS(SkTileGrid, (xTileCount, yTileCount, fInfo,
-                                    SkTileGridNextDatum<SkPictureStateTree::Draw>));
+SkBBoxHierarchy* SkRTreeFactory::operator()(const SkRect& bounds) const {
+    SkScalar aspectRatio = bounds.width() / bounds.height();
+    return new SkRTree(aspectRatio);
 }
diff --git a/gfx/skia/skia/src/core/SkBBoxHierarchy.h b/gfx/skia/skia/src/core/SkBBoxHierarchy.h
index 36047b9706ca..63e62c2a4bd5 100644
--- a/gfx/skia/skia/src/core/SkBBoxHierarchy.h
+++ b/gfx/skia/skia/src/core/SkBBoxHierarchy.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2012 Google Inc.
  *
@@ -10,86 +9,32 @@
 #define SkBBoxHierarchy_DEFINED
 
 #include "SkRect.h"
-#include "SkTDArray.h"
 #include "SkRefCnt.h"
+#include "SkTDArray.h"
 
 /**
- * Interface for a client class that implements utility methods needed
- * by SkBBoxHierarchy that require intrinsic knowledge of the data
- * object type that is stored in the bounding box hierarchy.
- */
-class SkBBoxHierarchyClient {
-public:
-    virtual ~SkBBoxHierarchyClient() {}
-
-    /**
-     * Implements a rewind stop condition used by rewindInserts
-     * Must returns true if 'data' points to an object that should be re-wound
-     * by rewinfInserts.
-     */
-    virtual bool shouldRewind(void* data) = 0;
-};
-
-/**
- * Interface for a spatial data structure that associates user data pointers with axis-aligned
- * bounding boxes, and allows efficient retrieval of intersections with query rectangles.
+ * Interface for a spatial data structure that stores axis-aligned bounding
+ * boxes and allows efficient retrieval of intersections with query rectangles.
  */
 class SkBBoxHierarchy : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkBBoxHierarchy)
-
-    SkBBoxHierarchy() : fClient(NULL) {}
+    SkBBoxHierarchy() {}
+    virtual ~SkBBoxHierarchy() {}
 
     /**
-     * Insert a data pointer and corresponding bounding box
-     * @param data The data pointer, may be NULL
-     * @param bounds The bounding box, should not be empty
-     * @param defer Whether or not it is acceptable to delay insertion of this element (building up
-     *        an entire spatial data structure at once is often faster and produces better
-     *        structures than repeated inserts) until flushDeferredInserts is called or the first
-     *        search.
+     * Insert N bounding boxes into the hierarchy.
      */
-    virtual void insert(void* data, const SkIRect& bounds, bool defer = false) = 0;
+    virtual void insert(const SkRect[], int N) = 0;
 
     /**
-     * If any insertions have been deferred, this forces them to be inserted
+     * Populate results with the indices of bounding boxes interesecting that query.
      */
-    virtual void flushDeferredInserts() = 0;
+    virtual void search(const SkRect& query, SkTDArray<int>* results) const = 0;
 
-    /**
-     * Populate 'results' with data pointers corresponding to bounding boxes that intersect 'query'
-     */
-    virtual void search(const SkIRect& query, SkTDArray<void*>* results) = 0;
+    virtual size_t bytesUsed() const = 0;
 
-    virtual void clear() = 0;
-
-    /**
-     * Gets the number of insertions actually made (does not include deferred insertions)
-     */
-    virtual int getCount() const = 0;
-
-    /**
-     * Returns the depth of the currently allocated tree. The root node counts for 1 level,
-     * so it should be 1 or more if there's a root node. This information provides details
-     * about the underlying structure, which is useful mainly for testing purposes.
-     *
-     * Returns 0 if there are currently no nodes in the tree.
-     * Returns -1 if the structure isn't a tree.
-     */
-    virtual int getDepth() const = 0;
-
-    /**
-     * Rewinds all the most recently inserted data elements until an element
-     * is encountered for which client->shouldRewind(data) returns false. May
-     * not rewind elements that were inserted prior to the last call to
-     * flushDeferredInserts.
-     */
-    virtual void rewindInserts() = 0;
-
-    void setClient(SkBBoxHierarchyClient* client) { fClient = client; }
-
-protected:
-    SkBBoxHierarchyClient* fClient;
+    // Get the root bound.
+    virtual SkRect getRootBound() const = 0;
 
 private:
     typedef SkRefCnt INHERITED;
diff --git a/gfx/skia/skia/src/core/SkBBoxHierarchyRecord.cpp b/gfx/skia/skia/src/core/SkBBoxHierarchyRecord.cpp
deleted file mode 100644
index 1868e65325e9..000000000000
--- a/gfx/skia/skia/src/core/SkBBoxHierarchyRecord.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkBBoxHierarchyRecord.h"
-#include "SkPictureStateTree.h"
-
-SkBBoxHierarchyRecord::SkBBoxHierarchyRecord(const SkISize& size,
-                                             uint32_t recordFlags,
-                                             SkBBoxHierarchy* h)
-    : INHERITED(size, recordFlags) {
-    fStateTree = SkNEW(SkPictureStateTree);
-    fBoundingHierarchy = h;
-    fBoundingHierarchy->ref();
-    fBoundingHierarchy->setClient(this);
-}
-
-void SkBBoxHierarchyRecord::handleBBox(const SkRect& bounds) {
-    SkIRect r;
-    bounds.roundOut(&r);
-    SkPictureStateTree::Draw* draw = fStateTree->appendDraw(this->writeStream().bytesWritten());
-    fBoundingHierarchy->insert(draw, r, true);
-}
-
-void SkBBoxHierarchyRecord::willSave() {
-    fStateTree->appendSave();
-    this->INHERITED::willSave();
-}
-
-SkCanvas::SaveLayerStrategy SkBBoxHierarchyRecord::willSaveLayer(const SkRect* bounds,
-                                                                 const SkPaint* paint,
-                                                                 SaveFlags flags) {
-    // For now, assume all filters affect transparent black.
-    // FIXME: This could be made less conservative as an optimization.
-    bool paintAffectsTransparentBlack = NULL != paint &&
-        ((NULL != paint->getImageFilter()) ||
-         (NULL != paint->getColorFilter()));
-    SkRect drawBounds;
-    if (paintAffectsTransparentBlack) {
-        if (bounds) {
-            drawBounds = *bounds;
-            this->getTotalMatrix().mapRect(&drawBounds);
-        } else {
-            SkIRect deviceBounds;
-            this->getClipDeviceBounds(&deviceBounds);
-            drawBounds.set(deviceBounds);
-        }
-    }
-    fStateTree->appendSaveLayer(this->writeStream().bytesWritten());
-    SkCanvas::SaveLayerStrategy strategy = this->INHERITED::willSaveLayer(bounds, paint, flags);
-    if (paintAffectsTransparentBlack) {
-        this->handleBBox(drawBounds);
-        this->addNoOp();
-    }
-    return strategy;
-}
-
-void SkBBoxHierarchyRecord::willRestore() {
-    fStateTree->appendRestore();
-    this->INHERITED::willRestore();
-}
-
-void SkBBoxHierarchyRecord::didConcat(const SkMatrix& matrix) {
-    fStateTree->appendTransform(getTotalMatrix());
-    INHERITED::didConcat(matrix);
-}
-
-void SkBBoxHierarchyRecord::didSetMatrix(const SkMatrix& matrix) {
-    fStateTree->appendTransform(getTotalMatrix());
-    INHERITED::didSetMatrix(matrix);
-}
-
-void SkBBoxHierarchyRecord::onClipRect(const SkRect& rect,
-                                       SkRegion::Op op,
-                                       ClipEdgeStyle edgeStyle) {
-    fStateTree->appendClip(this->writeStream().bytesWritten());
-    this->INHERITED::onClipRect(rect, op, edgeStyle);
-}
-
-void SkBBoxHierarchyRecord::onClipRegion(const SkRegion& region,
-                                         SkRegion::Op op) {
-    fStateTree->appendClip(this->writeStream().bytesWritten());
-    this->INHERITED::onClipRegion(region, op);
-}
-
-void SkBBoxHierarchyRecord::onClipPath(const SkPath& path,
-                                       SkRegion::Op op,
-                                       ClipEdgeStyle edgeStyle) {
-    fStateTree->appendClip(this->writeStream().bytesWritten());
-    this->INHERITED::onClipPath(path, op, edgeStyle);
-}
-
-void SkBBoxHierarchyRecord::onClipRRect(const SkRRect& rrect,
-                                        SkRegion::Op op,
-                                        ClipEdgeStyle edgeStyle) {
-    fStateTree->appendClip(this->writeStream().bytesWritten());
-    this->INHERITED::onClipRRect(rrect, op, edgeStyle);
-}
-
-bool SkBBoxHierarchyRecord::shouldRewind(void* data) {
-    // SkBBoxHierarchy::rewindInserts is called by SkPicture after the
-    // SkPicture has rewound its command stream.  To match that rewind in the
-    // BBH, we rewind all draws that reference commands that were recorded
-    // past the point to which the SkPicture has rewound, which is given by
-    // writeStream().bytesWritten().
-    SkPictureStateTree::Draw* draw = static_cast<SkPictureStateTree::Draw*>(data);
-    return draw->fOffset >= writeStream().bytesWritten();
-}
diff --git a/gfx/skia/skia/src/core/SkBBoxHierarchyRecord.h b/gfx/skia/skia/src/core/SkBBoxHierarchyRecord.h
deleted file mode 100644
index 7db82d8369ae..000000000000
--- a/gfx/skia/skia/src/core/SkBBoxHierarchyRecord.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkRTreeCanvas_DEFINED
-#define SkRTreeCanvas_DEFINED
-
-#include "SkBBoxHierarchy.h"
-#include "SkBBoxRecord.h"
-
-/**
- * This records bounding box information into an SkBBoxHierarchy, and clip/transform information
- * into an SkPictureStateTree to allow for efficient culling and correct playback of draws.
- */
-class SkBBoxHierarchyRecord : public SkBBoxRecord, public SkBBoxHierarchyClient {
-public:
-    /** This will take a ref of h */
-    SkBBoxHierarchyRecord(const SkISize& size, uint32_t recordFlags, SkBBoxHierarchy* h);
-    virtual ~SkBBoxHierarchyRecord() { };
-
-    virtual void handleBBox(const SkRect& bounds) SK_OVERRIDE;
-
-    // Implementation of the SkBBoxHierarchyClient interface
-    virtual bool shouldRewind(void* data) SK_OVERRIDE;
-
-protected:
-    virtual void willSave() SK_OVERRIDE;
-    virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE;
-    virtual void willRestore() SK_OVERRIDE;
-
-    virtual void didConcat(const SkMatrix&) SK_OVERRIDE;
-    virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE;
-
-    virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE;
-
-private:
-    typedef SkBBoxRecord INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/core/SkBBoxRecord.cpp b/gfx/skia/skia/src/core/SkBBoxRecord.cpp
deleted file mode 100644
index 448e8f65f48a..000000000000
--- a/gfx/skia/skia/src/core/SkBBoxRecord.cpp
+++ /dev/null
@@ -1,347 +0,0 @@
-
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkBBoxRecord.h"
-
-SkBBoxRecord::~SkBBoxRecord() {
-    fSaveStack.deleteAll();
-}
-
-void SkBBoxRecord::drawOval(const SkRect& rect, const SkPaint& paint) {
-    if (this->transformBounds(rect, &paint)) {
-        INHERITED::drawOval(rect, paint);
-    }
-}
-
-void SkBBoxRecord::drawRRect(const SkRRect& rrect, const SkPaint& paint) {
-    if (this->transformBounds(rrect.rect(), &paint)) {
-        INHERITED::drawRRect(rrect, paint);
-    }
-}
-
-void SkBBoxRecord::drawRect(const SkRect& rect, const SkPaint& paint) {
-    if (this->transformBounds(rect, &paint)) {
-        INHERITED::drawRect(rect, paint);
-    }
-}
-
-void SkBBoxRecord::onDrawDRRect(const SkRRect& outer, const SkRRect& inner,
-                                const SkPaint& paint) {
-    if (this->transformBounds(outer.rect(), &paint)) {
-        this->INHERITED::onDrawDRRect(outer, inner, paint);
-    }
-}
-
-void SkBBoxRecord::drawPath(const SkPath& path, const SkPaint& paint) {
-    if (path.isInverseFillType()) {
-        // If path is inverse filled, use the current clip bounds as the
-        // path's device-space bounding box.
-        SkIRect clipBounds;
-        if (this->getClipDeviceBounds(&clipBounds)) {
-            this->handleBBox(SkRect::Make(clipBounds));
-            INHERITED::drawPath(path, paint);
-        }
-    } else if (this->transformBounds(path.getBounds(), &paint)) {
-        INHERITED::drawPath(path, paint);
-    }
-}
-
-void SkBBoxRecord::drawPoints(PointMode mode, size_t count, const SkPoint pts[],
-                              const SkPaint& paint) {
-    SkRect bbox;
-    bbox.set(pts, SkToInt(count));
-    // Small min width value, just to ensure hairline point bounding boxes aren't empty.
-    // Even though we know hairline primitives are drawn one pixel wide, we do not use a
-    // minimum of 1 because the playback scale factor is unknown at record time. Later
-    // outsets will take care of adding additional padding for antialiasing and rounding out
-    // to integer device coordinates, guaranteeing that the rasterized pixels will be included
-    // in the computed bounds.
-    // Note: The device coordinate outset in SkBBoxHierarchyRecord::handleBBox is currently
-    // done in the recording coordinate space, which is wrong.
-    // http://code.google.com/p/skia/issues/detail?id=1021
-    static const SkScalar kMinWidth = 0.01f;
-    SkScalar halfStrokeWidth = SkMaxScalar(paint.getStrokeWidth(), kMinWidth) / 2;
-    bbox.outset(halfStrokeWidth, halfStrokeWidth);
-    if (this->transformBounds(bbox, &paint)) {
-        INHERITED::drawPoints(mode, count, pts, paint);
-    }
-}
-
-void SkBBoxRecord::drawPaint(const SkPaint& paint) {
-    SkRect bbox;
-    if (this->getClipBounds(&bbox)) {
-        if (this->transformBounds(bbox, &paint)) {
-            INHERITED::drawPaint(paint);
-        }
-    }
-}
-
-void SkBBoxRecord::clear(SkColor color) {
-    SkISize size = this->getDeviceSize();
-    SkRect bbox = {0, 0, SkIntToScalar(size.width()), SkIntToScalar(size.height())};
-    this->handleBBox(bbox);
-    INHERITED::clear(color);
-}
-
-void SkBBoxRecord::onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
-                              const SkPaint& paint) {
-    SkRect bbox;
-    paint.measureText(text, byteLength, &bbox);
-    SkPaint::FontMetrics metrics;
-    paint.getFontMetrics(&metrics);
-
-    // Vertical and aligned text need to be offset
-    if (paint.isVerticalText()) {
-        SkScalar h = bbox.fBottom - bbox.fTop;
-        if (paint.getTextAlign() == SkPaint::kCenter_Align) {
-            bbox.fTop    -= h / 2;
-            bbox.fBottom -= h / 2;
-        }
-        // Pad top and bottom with max extents from FontMetrics
-        bbox.fBottom += metrics.fBottom;
-        bbox.fTop += metrics.fTop;
-    } else {
-        SkScalar w = bbox.fRight - bbox.fLeft;
-        if (paint.getTextAlign() == SkPaint::kCenter_Align) {
-            bbox.fLeft  -= w / 2;
-            bbox.fRight -= w / 2;
-        } else if (paint.getTextAlign() == SkPaint::kRight_Align) {
-            bbox.fLeft  -= w;
-            bbox.fRight -= w;
-        }
-        // Set vertical bounds to max extents from font metrics
-        bbox.fTop = metrics.fTop;
-        bbox.fBottom = metrics.fBottom;
-    }
-
-    // Pad horizontal bounds on each side by half of max vertical extents (this is sort of
-    // arbitrary, but seems to produce reasonable results, if there were a way of getting max
-    // glyph X-extents to pad by, that may be better here, but FontMetrics fXMin and fXMax seem
-    // incorrect on most platforms (too small in Linux, never even set in Windows).
-    SkScalar pad = (metrics.fBottom - metrics.fTop) / 2;
-    bbox.fLeft  -= pad;
-    bbox.fRight += pad;
-
-    bbox.fLeft += x;
-    bbox.fRight += x;
-    bbox.fTop += y;
-    bbox.fBottom += y;
-    if (this->transformBounds(bbox, &paint)) {
-        INHERITED::onDrawText(text, byteLength, x, y, paint);
-    }
-}
-
-void SkBBoxRecord::drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top,
-                              const SkPaint* paint) {
-    SkRect bbox = {left, top, left + bitmap.width(), top + bitmap.height()};
-    if (this->transformBounds(bbox, paint)) {
-        INHERITED::drawBitmap(bitmap, left, top, paint);
-    }
-}
-
-void SkBBoxRecord::drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src,
-                                        const SkRect& dst, const SkPaint* paint,
-                                        DrawBitmapRectFlags flags) {
-    if (this->transformBounds(dst, paint)) {
-        INHERITED::drawBitmapRectToRect(bitmap, src, dst, paint, flags);
-    }
-}
-
-void SkBBoxRecord::drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& mat,
-                                    const SkPaint* paint) {
-    SkMatrix m = mat;
-    SkRect bbox = {0, 0, SkIntToScalar(bitmap.width()), SkIntToScalar(bitmap.height())};
-    m.mapRect(&bbox);
-    if (this->transformBounds(bbox, paint)) {
-        INHERITED::drawBitmapMatrix(bitmap, mat, paint);
-    }
-}
-
-void SkBBoxRecord::drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
-                                  const SkRect& dst, const SkPaint* paint) {
-    if (this->transformBounds(dst, paint)) {
-        INHERITED::drawBitmapNine(bitmap, center, dst, paint);
-    }
-}
-
-// Hack to work-around https://code.google.com/p/chromium/issues/detail?id=373785
-// This logic assums that 'pad' is enough to add to the left and right to account for
-// big glyphs. For the font in question (a logo font) the glyphs is much wider than just
-// the pointsize (approx 3x wider).
-// As a temp work-around, we scale-up pad.
-// A more correct fix might be to add fontmetrics.fMaxX, but we don't have that value in hand
-// at the moment, and (possibly) the value in the font may not be accurate (but who knows).
-//
-static SkScalar hack_373785_amend_pad(SkScalar pad) {
-    return pad * 4;
-}
-
-void SkBBoxRecord::onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
-                                 const SkPaint& paint) {
-    SkRect bbox;
-    bbox.set(pos, paint.countText(text, byteLength));
-    SkPaint::FontMetrics metrics;
-    paint.getFontMetrics(&metrics);
-    bbox.fTop += metrics.fTop;
-    bbox.fBottom += metrics.fBottom;
-
-    // pad on left and right by half of max vertical glyph extents
-    SkScalar pad = (metrics.fTop - metrics.fBottom) / 2;
-    pad = hack_373785_amend_pad(pad);
-    bbox.fLeft += pad;
-    bbox.fRight -= pad;
-
-    if (this->transformBounds(bbox, &paint)) {
-        INHERITED::onDrawPosText(text, byteLength, pos, paint);
-    }
-}
-
-void SkBBoxRecord::onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
-                                  SkScalar constY, const SkPaint& paint) {
-    size_t numChars = paint.countText(text, byteLength);
-    if (numChars == 0) {
-        return;
-    }
-
-    const SkFlatData* flatPaintData = this->getFlatPaintData(paint);
-    WriteTopBot(paint, *flatPaintData);
-
-    SkScalar top = flatPaintData->topBot()[0];
-    SkScalar bottom = flatPaintData->topBot()[1];
-    SkScalar pad = top - bottom;
-
-    SkRect bbox;
-    bbox.fLeft = SK_ScalarMax;
-    bbox.fRight = SK_ScalarMin;
-
-    for (size_t i = 0; i < numChars; ++i) {
-        if (xpos[i] < bbox.fLeft) {
-            bbox.fLeft = xpos[i];
-        }
-        if (xpos[i] > bbox.fRight) {
-            bbox.fRight = xpos[i];
-        }
-    }
-
-    // pad horizontally by max glyph height
-    pad = hack_373785_amend_pad(pad);
-    bbox.fLeft  += pad;
-    bbox.fRight -= pad;
-
-    bbox.fTop    = top + constY;
-    bbox.fBottom = bottom + constY;
-
-    if (!this->transformBounds(bbox, &paint)) {
-        return;
-    }
-    // This is the equivalent of calling:
-    //  INHERITED::drawPosTextH(text, byteLength, xpos, constY, paint);
-    // but we filled our flat paint beforehand so that we could get font metrics.
-    drawPosTextHImpl(text, byteLength, xpos, constY, paint, flatPaintData);
-}
-
-void SkBBoxRecord::drawSprite(const SkBitmap& bitmap, int left, int top,
-                              const SkPaint* paint) {
-    SkRect bbox;
-    bbox.set(SkIRect::MakeXYWH(left, top, bitmap.width(), bitmap.height()));
-    this->handleBBox(bbox); // directly call handleBBox, matrix is ignored
-    INHERITED::drawSprite(bitmap, left, top, paint);
-}
-
-void SkBBoxRecord::onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
-                                    const SkMatrix* matrix, const SkPaint& paint) {
-    SkRect bbox = path.getBounds();
-    SkPaint::FontMetrics metrics;
-    paint.getFontMetrics(&metrics);
-
-    // pad out all sides by the max glyph height above baseline
-    SkScalar pad = metrics.fTop;
-    bbox.fLeft += pad;
-    bbox.fRight -= pad;
-    bbox.fTop += pad;
-    bbox.fBottom -= pad;
-
-    if (this->transformBounds(bbox, &paint)) {
-        INHERITED::onDrawTextOnPath(text, byteLength, path, matrix, paint);
-    }
-}
-
-void SkBBoxRecord::drawVertices(VertexMode mode, int vertexCount,
-                                const SkPoint vertices[], const SkPoint texs[],
-                                const SkColor colors[], SkXfermode* xfer,
-                                const uint16_t indices[], int indexCount,
-                                const SkPaint& paint) {
-    SkRect bbox;
-    bbox.set(vertices, vertexCount);
-    if (this->transformBounds(bbox, &paint)) {
-        INHERITED::drawVertices(mode, vertexCount, vertices, texs,
-                                colors, xfer, indices, indexCount, paint);
-    }
-}
-
-void SkBBoxRecord::onDrawPicture(const SkPicture* picture) {
-    if (picture->width() > 0 && picture->height() > 0 &&
-        this->transformBounds(SkRect::MakeWH(picture->width(), picture->height()), NULL)) {
-        this->INHERITED::onDrawPicture(picture);
-    }
-}
-
-void SkBBoxRecord::willSave() {
-    fSaveStack.push(NULL);
-    this->INHERITED::willSave();
-}
-
-SkCanvas::SaveLayerStrategy SkBBoxRecord::willSaveLayer(const SkRect* bounds,
-                                                        const SkPaint* paint,
-                                                        SaveFlags flags) {
-    // Image filters can affect the effective bounds of primitives drawn inside saveLayer().
-    // Copy the paint so we can compute the modified bounds in transformBounds().
-    fSaveStack.push(paint && paint->getImageFilter() ? new SkPaint(*paint) : NULL);
-    return this->INHERITED::willSaveLayer(bounds, paint, flags);
-}
-
-void SkBBoxRecord::willRestore() {
-    delete fSaveStack.top();
-    fSaveStack.pop();
-    this->INHERITED::willRestore();
-}
-
-bool SkBBoxRecord::transformBounds(const SkRect& bounds, const SkPaint* paint) {
-    SkRect outBounds = bounds;
-    outBounds.sort();
-
-    if (paint) {
-        // account for stroking, path effects, shadows, etc
-        if (paint->canComputeFastBounds()) {
-            SkRect temp;
-            outBounds = paint->computeFastBounds(outBounds, &temp);
-        } else {
-            // set bounds to current clip
-            if (!this->getClipBounds(&outBounds)) {
-                // current clip is empty
-                return false;
-            }
-        }
-    }
-
-    for (int i = fSaveStack.count() - 1; i >= 0; --i) {
-        const SkPaint* paint = fSaveStack.getAt(i);
-        if (paint && paint->canComputeFastBounds()) {
-            SkRect temp;
-            outBounds = paint->computeFastBounds(outBounds, &temp);
-        }
-    }
-
-    if (!outBounds.isEmpty() && !this->quickReject(outBounds)) {
-        this->getTotalMatrix().mapRect(&outBounds);
-        this->handleBBox(outBounds);
-        return true;
-    }
-
-    return false;
-}
diff --git a/gfx/skia/skia/src/core/SkBBoxRecord.h b/gfx/skia/skia/src/core/SkBBoxRecord.h
deleted file mode 100644
index a6edc98f13db..000000000000
--- a/gfx/skia/skia/src/core/SkBBoxRecord.h
+++ /dev/null
@@ -1,91 +0,0 @@
-
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkBBoxRecord_DEFINED
-#define SkBBoxRecord_DEFINED
-
-#include "SkPictureRecord.h"
-#include "SkTDArray.h"
-
-/**
-  * This is an abstract SkPictureRecord subclass that intercepts draw calls and computes an
-  * axis-aligned bounding box for each draw that it sees, subclasses implement handleBBox()
-  * which will be called every time we get a new bounding box.
-  */
-class SkBBoxRecord : public SkPictureRecord {
-public:
-
-    SkBBoxRecord(const SkISize& size, uint32_t recordFlags)
-        : INHERITED(size, recordFlags) {
-    }
-    virtual ~SkBBoxRecord();
-
-    /**
-     * This is called each time we get a bounding box, it will be axis-aligned,
-     * in device coordinates, and expanded to include stroking, shadows, etc.
-     */
-    virtual void handleBBox(const SkRect& bbox) = 0;
-
-    virtual void drawOval(const SkRect& rect, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawRRect(const SkRRect& rrect, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawRect(const SkRect& rect, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawPath(const SkPath& path, const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawPoints(PointMode mode, size_t count, const SkPoint pts[],
-                            const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawPaint(const SkPaint& paint) SK_OVERRIDE;
-    virtual void clear(SkColor) SK_OVERRIDE;
-    virtual void drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top,
-                            const SkPaint* paint = NULL) SK_OVERRIDE;
-    virtual void drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src,
-                                      const SkRect& dst, const SkPaint* paint,
-                                      DrawBitmapRectFlags flags) SK_OVERRIDE;
-    virtual void drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& mat,
-                                  const SkPaint* paint) SK_OVERRIDE;
-    virtual void drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
-                                const SkRect& dst, const SkPaint* paint) SK_OVERRIDE;
-    virtual void drawSprite(const SkBitmap& bitmap, int left, int top,
-                            const SkPaint* paint) SK_OVERRIDE;
-    virtual void drawVertices(VertexMode mode, int vertexCount,
-                              const SkPoint vertices[], const SkPoint texs[],
-                              const SkColor colors[], SkXfermode* xfer,
-                              const uint16_t indices[], int indexCount,
-                              const SkPaint& paint) SK_OVERRIDE;
-
-protected:
-    virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE;
-    virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
-                            const SkPaint&) SK_OVERRIDE;
-    virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
-                               const SkPaint&) SK_OVERRIDE;
-    virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
-                                SkScalar constY, const SkPaint&) SK_OVERRIDE;
-    virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
-                                  const SkMatrix* matrix, const SkPaint&) SK_OVERRIDE;
-    virtual void onDrawPicture(const SkPicture* picture) SK_OVERRIDE;
-    virtual void willSave() SK_OVERRIDE;
-    virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE;
-    virtual void willRestore() SK_OVERRIDE;
-
-private:
-    /**
-     * Takes a bounding box in current canvas view space, accounts for stroking and effects, and
-     * computes an axis-aligned bounding box in device coordinates, then passes it to handleBBox()
-     * returns false if the draw is completely clipped out, and may safely be ignored.
-     **/
-    bool transformBounds(const SkRect& bounds, const SkPaint* paint);
-
-    /**
-     * Paints from currently-active saveLayers that need to be applied to bounding boxes of all
-     * primitives drawn inside them. We own these pointers.
-     **/
-    SkTDArray<const SkPaint*> fSaveStack;
-
-    typedef SkPictureRecord INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/core/SkBigPicture.cpp b/gfx/skia/skia/src/core/SkBigPicture.cpp
new file mode 100644
index 000000000000..61f3a0ef1c34
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkBigPicture.cpp
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkBBoxHierarchy.h"
+#include "SkBigPicture.h"
+#include "SkPictureCommon.h"
+#include "SkRecord.h"
+#include "SkRecordDraw.h"
+#include "SkTraceEvent.h"
+
+SkBigPicture::SkBigPicture(const SkRect& cull,
+                           SkRecord* record,
+                           SnapshotArray* drawablePicts,
+                           SkBBoxHierarchy* bbh,
+                           AccelData* accelData,
+                           size_t approxBytesUsedBySubPictures)
+    : fCullRect(cull)
+    , fApproxBytesUsedBySubPictures(approxBytesUsedBySubPictures)
+    , fRecord(record)               // Take ownership of caller's ref.
+    , fDrawablePicts(drawablePicts) // Take ownership.
+    , fBBH(bbh)                     // Take ownership of caller's ref.
+    , fAccelData(accelData)         // Take ownership of caller's ref.
+{}
+
+void SkBigPicture::playback(SkCanvas* canvas, AbortCallback* callback) const {
+    SkASSERT(canvas);
+
+    // If the query contains the whole picture, don't bother with the BBH.
+    SkRect clipBounds = { 0, 0, 0, 0 };
+    (void)canvas->getClipBounds(&clipBounds);
+    const bool useBBH = !clipBounds.contains(this->cullRect());
+
+    SkRecordDraw(*fRecord,
+                 canvas,
+                 this->drawablePicts(),
+                 nullptr,
+                 this->drawableCount(),
+                 useBBH ? fBBH.get() : nullptr,
+                 callback);
+}
+
+void SkBigPicture::partialPlayback(SkCanvas* canvas,
+                                   int start,
+                                   int stop,
+                                   const SkMatrix& initialCTM) const {
+    SkASSERT(canvas);
+    SkRecordPartialDraw(*fRecord,
+                        canvas,
+                        this->drawablePicts(),
+                        this->drawableCount(),
+                        start,
+                        stop,
+                        initialCTM);
+}
+
+const SkBigPicture::Analysis& SkBigPicture::analysis() const {
+    return *fAnalysis.get([&]{ return new Analysis(*fRecord); });
+}
+
+SkRect SkBigPicture::cullRect()            const { return fCullRect; }
+bool   SkBigPicture::hasText()             const { return this->analysis().fHasText; }
+bool   SkBigPicture::willPlayBackBitmaps() const { return this->analysis().fWillPlaybackBitmaps; }
+int    SkBigPicture::numSlowPaths() const { return this->analysis().fNumSlowPathsAndDashEffects; }
+int    SkBigPicture::approximateOpCount()   const { return fRecord->count(); }
+size_t SkBigPicture::approximateBytesUsed() const {
+    size_t bytes = sizeof(*this) + fRecord->bytesUsed() + fApproxBytesUsedBySubPictures;
+    if (fBBH) { bytes += fBBH->bytesUsed(); }
+    return bytes;
+}
+
+int SkBigPicture::drawableCount() const {
+    return fDrawablePicts ? fDrawablePicts->count() : 0;
+}
+
+SkPicture const* const* SkBigPicture::drawablePicts() const {
+    return fDrawablePicts ? fDrawablePicts->begin() : nullptr;
+}
+
+SkBigPicture::Analysis::Analysis(const SkRecord& record) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkBigPicture::Analysis::Analysis()");
+    SkTextHunter   text;
+    SkBitmapHunter bitmap;
+    SkPathCounter  path;
+
+    bool hasText = false, hasBitmap = false;
+    for (int i = 0; i < record.count(); i++) {
+        hasText   = hasText   || record.visit<bool>(i,   text);
+        hasBitmap = hasBitmap || record.visit<bool>(i, bitmap);
+        record.visit<void>(i, path);
+    }
+
+    fHasText                    = hasText;
+    fWillPlaybackBitmaps        = hasBitmap;
+    fNumSlowPathsAndDashEffects = SkTMin<int>(path.fNumSlowPathsAndDashEffects, 255);
+}
diff --git a/gfx/skia/skia/src/core/SkBigPicture.h b/gfx/skia/skia/src/core/SkBigPicture.h
new file mode 100644
index 000000000000..2e42213539f2
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkBigPicture.h
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkBigPicture_DEFINED
+#define SkBigPicture_DEFINED
+
+#include "SkOncePtr.h"
+#include "SkPicture.h"
+#include "SkTemplates.h"
+
+class SkBBoxHierarchy;
+class SkRecord;
+
+// An implementation of SkPicture supporting an arbitrary number of drawing commands.
+class SkBigPicture final : public SkPicture {
+public:
+    // AccelData provides a base class for device-specific acceleration data.
+    class AccelData : public SkRefCnt { };
+
+    // An array of refcounted const SkPicture pointers.
+    class SnapshotArray : ::SkNoncopyable {
+    public:
+        SnapshotArray(const SkPicture* pics[], int count) : fPics(pics), fCount(count) {}
+        ~SnapshotArray() { for (int i = 0; i < fCount; i++) { fPics[i]->unref(); } }
+
+        const SkPicture* const* begin() const { return fPics; }
+        int count() const { return fCount; }
+    private:
+        SkAutoTMalloc<const SkPicture*> fPics;
+        int fCount;
+    };
+
+    SkBigPicture(const SkRect& cull,
+                 SkRecord*,            // We take ownership of the caller's ref.
+                 SnapshotArray*,       // We take exclusive ownership.
+                 SkBBoxHierarchy*,     // We take ownership of the caller's ref.
+                 AccelData*,           // We take ownership of the caller's ref.
+                 size_t approxBytesUsedBySubPictures);
+
+
+// SkPicture overrides
+    void playback(SkCanvas*, AbortCallback*) const override;
+    SkRect cullRect() const override;
+    bool hasText() const override;
+    bool willPlayBackBitmaps() const override;
+    int approximateOpCount() const override;
+    size_t approximateBytesUsed() const override;
+    const SkBigPicture* asSkBigPicture() const override { return this; }
+
+// Used by GrLayerHoister
+    void partialPlayback(SkCanvas*,
+                         int start,
+                         int stop,
+                         const SkMatrix& initialCTM) const;
+// Used by GrRecordReplaceDraw
+    const SkBBoxHierarchy* bbh() const { return fBBH; }
+    const SkRecord*     record() const { return fRecord; }
+    const AccelData* accelData() const { return fAccelData; }
+
+private:
+    struct Analysis {
+        explicit Analysis(const SkRecord&);
+
+        bool suitableForGpuRasterization(const char** reason) const;
+
+        uint8_t fNumSlowPathsAndDashEffects;
+        bool    fWillPlaybackBitmaps : 1;
+        bool    fHasText             : 1;
+    };
+
+    int numSlowPaths() const override;
+    const Analysis& analysis() const;
+    int drawableCount() const;
+    SkPicture const* const* drawablePicts() const;
+
+    const SkRect                          fCullRect;
+    const size_t                          fApproxBytesUsedBySubPictures;
+    SkOncePtr<const Analysis>             fAnalysis;
+    SkAutoTUnref<const SkRecord>          fRecord;
+    SkAutoTDelete<const SnapshotArray>    fDrawablePicts;
+    SkAutoTUnref<const SkBBoxHierarchy>   fBBH;
+    SkAutoTUnref<const AccelData>         fAccelData;
+};
+
+#endif//SkBigPicture_DEFINED
diff --git a/gfx/skia/skia/src/core/SkBitmap.cpp b/gfx/skia/skia/src/core/SkBitmap.cpp
index e675db280040..6fd97dc24110 100644
--- a/gfx/skia/skia/src/core/SkBitmap.cpp
+++ b/gfx/skia/skia/src/core/SkBitmap.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2008 The Android Open Source Project
  *
@@ -6,23 +5,22 @@
  * found in the LICENSE file.
  */
 
-
+#include "SkAtomics.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
-#include "SkDither.h"
-#include "SkFlattenable.h"
-#include "SkImagePriv.h"
+#include "SkData.h"
+#include "SkFilterQuality.h"
 #include "SkMallocPixelRef.h"
 #include "SkMask.h"
-#include "SkReadBuffer.h"
-#include "SkWriteBuffer.h"
+#include "SkMath.h"
 #include "SkPixelRef.h"
-#include "SkThread.h"
+#include "SkReadBuffer.h"
+#include "SkRect.h"
+#include "SkScalar.h"
 #include "SkUnPreMultiply.h"
-#include "SkUtils.h"
-#include "SkValidationUtils.h"
-#include "SkPackBits.h"
-#include <new>
+#include "SkWriteBuffer.h"
+
+#include <string.h>
 
 static bool reset_return_false(SkBitmap* bm) {
     bm->reset();
@@ -58,8 +56,8 @@ SkBitmap& SkBitmap::operator=(const SkBitmap& src) {
 
         if (fPixelRef) {
             // ignore the values from the memcpy
-            fPixels = NULL;
-            fColorTable = NULL;
+            fPixels = nullptr;
+            fColorTable = nullptr;
             // Note that what to for genID is somewhat arbitrary. We have no
             // way to track changes to raw pixels across multiple SkBitmaps.
             // Would benefit from an SkRawPixelRef type created by
@@ -91,32 +89,25 @@ void SkBitmap::reset() {
     sk_bzero(this, sizeof(*this));
 }
 
-#ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG
-SkBitmap::Config SkBitmap::config() const {
-    return SkColorTypeToBitmapConfig(fInfo.colorType());
-}
-#endif
-
 void SkBitmap::getBounds(SkRect* bounds) const {
     SkASSERT(bounds);
     bounds->set(0, 0,
-                SkIntToScalar(fInfo.fWidth), SkIntToScalar(fInfo.fHeight));
+                SkIntToScalar(fInfo.width()), SkIntToScalar(fInfo.height()));
 }
 
 void SkBitmap::getBounds(SkIRect* bounds) const {
     SkASSERT(bounds);
-    bounds->set(0, 0, fInfo.fWidth, fInfo.fHeight);
+    bounds->set(0, 0, fInfo.width(), fInfo.height());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-bool SkBitmap::setInfo(const SkImageInfo& origInfo, size_t rowBytes) {
-    SkImageInfo info = origInfo;
-
-    if (!SkColorTypeValidateAlphaType(info.fColorType, info.fAlphaType,
-                                      &info.fAlphaType)) {
+bool SkBitmap::setInfo(const SkImageInfo& info, size_t rowBytes) {
+    SkAlphaType newAT = info.alphaType();
+    if (!SkColorTypeValidateAlphaType(info.colorType(), info.alphaType(), &newAT)) {
         return reset_return_false(this);
     }
+    // don't look at info.alphaType(), since newAT is the real value...
 
     // require that rowBytes fit in 31bits
     int64_t mrb = info.minRowBytes64();
@@ -141,31 +132,31 @@ bool SkBitmap::setInfo(const SkImageInfo& origInfo, size_t rowBytes) {
 
     this->freePixels();
 
-    fInfo = info;
+    fInfo = info.makeAlphaType(newAT);
     fRowBytes = SkToU32(rowBytes);
     return true;
 }
 
-bool SkBitmap::setAlphaType(SkAlphaType alphaType) {
-    if (!SkColorTypeValidateAlphaType(fInfo.fColorType, alphaType, &alphaType)) {
+bool SkBitmap::setAlphaType(SkAlphaType newAlphaType) {
+    if (!SkColorTypeValidateAlphaType(fInfo.colorType(), newAlphaType, &newAlphaType)) {
         return false;
     }
-    if (fInfo.fAlphaType != alphaType) {
-        fInfo.fAlphaType = alphaType;
+    if (fInfo.alphaType() != newAlphaType) {
+        fInfo = fInfo.makeAlphaType(newAlphaType);
         if (fPixelRef) {
-            fPixelRef->changeAlphaType(alphaType);
+            fPixelRef->changeAlphaType(newAlphaType);
         }
     }
     return true;
 }
 
 void SkBitmap::updatePixelsFromRef() const {
-    if (NULL != fPixelRef) {
+    if (fPixelRef) {
         if (fPixelLockCount > 0) {
             SkASSERT(fPixelRef->isLocked());
 
             void* p = fPixelRef->pixels();
-            if (NULL != p) {
+            if (p) {
                 p = (char*)p
                     + fPixelRefOrigin.fY * fRowBytes
                     + fPixelRefOrigin.fX * fInfo.bytesPerPixel();
@@ -174,8 +165,8 @@ void SkBitmap::updatePixelsFromRef() const {
             fColorTable = fPixelRef->colorTable();
         } else {
             SkASSERT(0 == fPixelLockCount);
-            fPixels = NULL;
-            fColorTable = NULL;
+            fPixels = nullptr;
+            fColorTable = nullptr;
         }
     }
 }
@@ -185,21 +176,21 @@ SkPixelRef* SkBitmap::setPixelRef(SkPixelRef* pr, int dx, int dy) {
     if (pr) {
         if (kUnknown_SkColorType != fInfo.colorType()) {
             const SkImageInfo& prInfo = pr->info();
-            SkASSERT(fInfo.fWidth <= prInfo.fWidth);
-            SkASSERT(fInfo.fHeight <= prInfo.fHeight);
-            SkASSERT(fInfo.fColorType == prInfo.fColorType);
-            switch (prInfo.fAlphaType) {
-                case kIgnore_SkAlphaType:
-                    SkASSERT(fInfo.fAlphaType == kIgnore_SkAlphaType);
+            SkASSERT(fInfo.width() <= prInfo.width());
+            SkASSERT(fInfo.height() <= prInfo.height());
+            SkASSERT(fInfo.colorType() == prInfo.colorType());
+            switch (prInfo.alphaType()) {
+                case kUnknown_SkAlphaType:
+                    SkASSERT(fInfo.alphaType() == kUnknown_SkAlphaType);
                     break;
                 case kOpaque_SkAlphaType:
                 case kPremul_SkAlphaType:
-                    SkASSERT(fInfo.fAlphaType == kOpaque_SkAlphaType ||
-                             fInfo.fAlphaType == kPremul_SkAlphaType);
+                    SkASSERT(fInfo.alphaType() == kOpaque_SkAlphaType ||
+                             fInfo.alphaType() == kPremul_SkAlphaType);
                     break;
                 case kUnpremul_SkAlphaType:
-                    SkASSERT(fInfo.fAlphaType == kOpaque_SkAlphaType ||
-                             fInfo.fAlphaType == kUnpremul_SkAlphaType);
+                    SkASSERT(fInfo.alphaType() == kOpaque_SkAlphaType ||
+                             fInfo.alphaType() == kUnpremul_SkAlphaType);
                     break;
             }
         }
@@ -208,8 +199,7 @@ SkPixelRef* SkBitmap::setPixelRef(SkPixelRef* pr, int dx, int dy) {
 
     if (pr) {
         const SkImageInfo& info = pr->info();
-        fPixelRefOrigin.set(SkPin32(dx, 0, info.fWidth),
-                            SkPin32(dy, 0, info.fHeight));
+        fPixelRefOrigin.set(SkTPin(dx, 0, info.width()), SkTPin(dy, 0, info.height()));
     } else {
         // ignore dx,dy if there is no pixelref
         fPixelRefOrigin.setZero();
@@ -217,7 +207,7 @@ SkPixelRef* SkBitmap::setPixelRef(SkPixelRef* pr, int dx, int dy) {
 
     if (fPixelRef != pr) {
         this->freePixels();
-        SkASSERT(NULL == fPixelRef);
+        SkASSERT(nullptr == fPixelRef);
 
         SkSafeRef(pr);
         fPixelRef = pr;
@@ -229,7 +219,7 @@ SkPixelRef* SkBitmap::setPixelRef(SkPixelRef* pr, int dx, int dy) {
 }
 
 void SkBitmap::lockPixels() const {
-    if (NULL != fPixelRef && 0 == sk_atomic_inc(&fPixelLockCount)) {
+    if (fPixelRef && 0 == sk_atomic_inc(&fPixelLockCount)) {
         fPixelRef->lockPixels();
         this->updatePixelsFromRef();
     }
@@ -237,9 +227,9 @@ void SkBitmap::lockPixels() const {
 }
 
 void SkBitmap::unlockPixels() const {
-    SkASSERT(NULL == fPixelRef || fPixelLockCount > 0);
+    SkASSERT(nullptr == fPixelRef || fPixelLockCount > 0);
 
-    if (NULL != fPixelRef && 1 == sk_atomic_dec(&fPixelLockCount)) {
+    if (fPixelRef && 1 == sk_atomic_dec(&fPixelLockCount)) {
         fPixelRef->unlockPixels();
         this->updatePixelsFromRef();
     }
@@ -251,19 +241,19 @@ bool SkBitmap::lockPixelsAreWritable() const {
 }
 
 void SkBitmap::setPixels(void* p, SkColorTable* ctable) {
-    if (NULL == p) {
-        this->setPixelRef(NULL);
+    if (nullptr == p) {
+        this->setPixelRef(nullptr);
         return;
     }
 
     if (kUnknown_SkColorType == fInfo.colorType()) {
-        this->setPixelRef(NULL);
+        this->setPixelRef(nullptr);
         return;
     }
 
     SkPixelRef* pr = SkMallocPixelRef::NewDirect(fInfo, p, fRowBytes, ctable);
-    if (NULL == pr) {
-        this->setPixelRef(NULL);
+    if (nullptr == pr) {
+        this->setPixelRef(nullptr);
         return;
     }
 
@@ -274,10 +264,10 @@ void SkBitmap::setPixels(void* p, SkColorTable* ctable) {
     SkDEBUGCODE(this->validate();)
 }
 
-bool SkBitmap::allocPixels(Allocator* allocator, SkColorTable* ctable) {
+bool SkBitmap::tryAllocPixels(Allocator* allocator, SkColorTable* ctable) {
     HeapAllocator stdalloc;
 
-    if (NULL == allocator) {
+    if (nullptr == allocator) {
         allocator = &stdalloc;
     }
     return allocator->allocPixelRef(this, ctable);
@@ -285,38 +275,38 @@ bool SkBitmap::allocPixels(Allocator* allocator, SkColorTable* ctable) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-bool SkBitmap::allocPixels(const SkImageInfo& requestedInfo, size_t rowBytes) {
+bool SkBitmap::tryAllocPixels(const SkImageInfo& requestedInfo, size_t rowBytes) {
     if (kIndex_8_SkColorType == requestedInfo.colorType()) {
         return reset_return_false(this);
     }
     if (!this->setInfo(requestedInfo, rowBytes)) {
         return reset_return_false(this);
     }
-    
+
     // setInfo may have corrected info (e.g. 565 is always opaque).
     const SkImageInfo& correctedInfo = this->info();
     // setInfo may have computed a valid rowbytes if 0 were passed in
     rowBytes = this->rowBytes();
 
     SkMallocPixelRef::PRFactory defaultFactory;
-    
-    SkPixelRef* pr = defaultFactory.create(correctedInfo, rowBytes, NULL);
-    if (NULL == pr) {
+
+    SkPixelRef* pr = defaultFactory.create(correctedInfo, rowBytes, nullptr);
+    if (nullptr == pr) {
         return reset_return_false(this);
     }
     this->setPixelRef(pr)->unref();
-    
-    // TODO: lockPixels could/should return bool or void*/NULL
+
+    // TODO: lockPixels could/should return bool or void*/nullptr
     this->lockPixels();
-    if (NULL == this->getPixels()) {
+    if (nullptr == this->getPixels()) {
         return reset_return_false(this);
     }
     return true;
 }
 
-bool SkBitmap::allocPixels(const SkImageInfo& requestedInfo, SkPixelRefFactory* factory,
-                           SkColorTable* ctable) {
-    if (kIndex_8_SkColorType == requestedInfo.fColorType && NULL == ctable) {
+bool SkBitmap::tryAllocPixels(const SkImageInfo& requestedInfo, SkPixelRefFactory* factory,
+                                SkColorTable* ctable) {
+    if (kIndex_8_SkColorType == requestedInfo.colorType() && nullptr == ctable) {
         return reset_return_false(this);
     }
     if (!this->setInfo(requestedInfo)) {
@@ -327,31 +317,42 @@ bool SkBitmap::allocPixels(const SkImageInfo& requestedInfo, SkPixelRefFactory*
     const SkImageInfo& correctedInfo = this->info();
 
     SkMallocPixelRef::PRFactory defaultFactory;
-    if (NULL == factory) {
+    if (nullptr == factory) {
         factory = &defaultFactory;
     }
 
     SkPixelRef* pr = factory->create(correctedInfo, correctedInfo.minRowBytes(), ctable);
-    if (NULL == pr) {
+    if (nullptr == pr) {
         return reset_return_false(this);
     }
     this->setPixelRef(pr)->unref();
 
-    // TODO: lockPixels could/should return bool or void*/NULL
+    // TODO: lockPixels could/should return bool or void*/nullptr
     this->lockPixels();
-    if (NULL == this->getPixels()) {
+    if (nullptr == this->getPixels()) {
         return reset_return_false(this);
     }
     return true;
 }
 
+static void invoke_release_proc(void (*proc)(void* pixels, void* ctx), void* pixels, void* ctx) {
+    if (proc) {
+        proc(pixels, ctx);
+    }
+}
+
 bool SkBitmap::installPixels(const SkImageInfo& requestedInfo, void* pixels, size_t rb,
                              SkColorTable* ct, void (*releaseProc)(void* addr, void* context),
                              void* context) {
     if (!this->setInfo(requestedInfo, rb)) {
+        invoke_release_proc(releaseProc, pixels, context);
         this->reset();
         return false;
     }
+    if (nullptr == pixels) {
+        invoke_release_proc(releaseProc, pixels, context);
+        return true;    // we behaved as if they called setInfo()
+    }
 
     // setInfo may have corrected info (e.g. 565 is always opaque).
     const SkImageInfo& correctedInfo = this->info();
@@ -384,17 +385,17 @@ bool SkBitmap::installMaskPixels(const SkMask& mask) {
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkBitmap::freePixels() {
-    if (NULL != fPixelRef) {
+    if (fPixelRef) {
         if (fPixelLockCount > 0) {
             fPixelRef->unlockPixels();
         }
         fPixelRef->unref();
-        fPixelRef = NULL;
+        fPixelRef = nullptr;
         fPixelRefOrigin.setZero();
     }
     fPixelLockCount = 0;
-    fPixels = NULL;
-    fColorTable = NULL;
+    fPixels = nullptr;
+    fColorTable = nullptr;
 }
 
 uint32_t SkBitmap::getGenerationID() const {
@@ -409,7 +410,7 @@ void SkBitmap::notifyPixelsChanged() const {
 }
 
 GrTexture* SkBitmap::getTexture() const {
-    return fPixelRef ? fPixelRef->getTexture() : NULL;
+    return fPixelRef ? fPixelRef->getTexture() : nullptr;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -426,7 +427,7 @@ bool SkBitmap::HeapAllocator::allocPixelRef(SkBitmap* dst,
     }
 
     SkPixelRef* pr = SkMallocPixelRef::NewAllocate(info, dst->rowBytes(), ctable);
-    if (NULL == pr) {
+    if (nullptr == pr) {
         return false;
     }
 
@@ -438,44 +439,41 @@ bool SkBitmap::HeapAllocator::allocPixelRef(SkBitmap* dst,
 
 ///////////////////////////////////////////////////////////////////////////////
 
-bool SkBitmap::copyPixelsTo(void* const dst, size_t dstSize,
-                            size_t dstRowBytes, bool preserveDstPad) const {
+static bool copy_pixels_to(const SkPixmap& src, void* const dst, size_t dstSize,
+                           size_t dstRowBytes, bool preserveDstPad) {
+    const SkImageInfo& info = src.info();
 
     if (0 == dstRowBytes) {
-        dstRowBytes = fRowBytes;
+        dstRowBytes = src.rowBytes();
     }
-
-    if (dstRowBytes < fInfo.minRowBytes() ||
-        dst == NULL || (getPixels() == NULL && pixelRef() == NULL)) {
+    if (dstRowBytes < info.minRowBytes()) {
         return false;
     }
 
-    if (!preserveDstPad && static_cast<uint32_t>(dstRowBytes) == fRowBytes) {
-        size_t safeSize = this->getSafeSize();
+    if (!preserveDstPad && static_cast<uint32_t>(dstRowBytes) == src.rowBytes()) {
+        size_t safeSize = src.getSafeSize();
         if (safeSize > dstSize || safeSize == 0)
             return false;
         else {
-            SkAutoLockPixels lock(*this);
             // This implementation will write bytes beyond the end of each row,
             // excluding the last row, if the bitmap's stride is greater than
             // strictly required by the current config.
-            memcpy(dst, getPixels(), safeSize);
-
+            memcpy(dst, src.addr(), safeSize);
             return true;
         }
     } else {
         // If destination has different stride than us, then copy line by line.
-        if (fInfo.getSafeSize(dstRowBytes) > dstSize) {
+        if (info.getSafeSize(dstRowBytes) > dstSize) {
             return false;
         } else {
             // Just copy what we need on each line.
-            size_t rowBytes = fInfo.minRowBytes();
-            SkAutoLockPixels lock(*this);
-            const uint8_t* srcP = reinterpret_cast<const uint8_t*>(getPixels());
+            size_t rowBytes = info.minRowBytes();
+            const uint8_t* srcP = reinterpret_cast<const uint8_t*>(src.addr());
             uint8_t* dstP = reinterpret_cast<uint8_t*>(dst);
-            for (int row = 0; row < fInfo.fHeight;
-                 row++, srcP += fRowBytes, dstP += dstRowBytes) {
+            for (int row = 0; row < info.height(); ++row) {
                 memcpy(dstP, srcP, rowBytes);
+                srcP += src.rowBytes();
+                dstP += dstRowBytes;
             }
 
             return true;
@@ -483,6 +481,17 @@ bool SkBitmap::copyPixelsTo(void* const dst, size_t dstSize,
     }
 }
 
+bool SkBitmap::copyPixelsTo(void* dst, size_t dstSize, size_t dstRB, bool preserveDstPad) const {
+    if (nullptr == dst) {
+        return false;
+    }
+    SkAutoPixmapUnlock result;
+    if (!this->requestLock(&result)) {
+        return false;
+    }
+    return copy_pixels_to(result.pixmap(), dst, dstSize, dstRB, preserveDstPad);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 bool SkBitmap::isImmutable() const {
@@ -525,11 +534,12 @@ void* SkBitmap::getAddr(int x, int y) const {
                 break;
             case kAlpha_8_SkColorType:
             case kIndex_8_SkColorType:
+            case kGray_8_SkColorType:
                 base += x;
                 break;
             default:
                 SkDEBUGFAIL("Can't return addr for config");
-                base = NULL;
+                base = nullptr;
                 break;
         }
     }
@@ -541,6 +551,10 @@ SkColor SkBitmap::getColor(int x, int y) const {
     SkASSERT((unsigned)y < (unsigned)this->height());
 
     switch (this->colorType()) {
+        case kGray_8_SkColorType: {
+            uint8_t* addr = this->getAddr8(x, y);
+            return SkColorSetRGB(*addr, *addr, *addr);
+        }
         case kAlpha_8_SkColorType: {
             uint8_t* addr = this->getAddr8(x, y);
             return SkColorSetA(0, addr[0]);
@@ -571,20 +585,15 @@ SkColor SkBitmap::getColor(int x, int y) const {
     return 0;
 }
 
-bool SkBitmap::ComputeIsOpaque(const SkBitmap& bm) {
-    SkAutoLockPixels alp(bm);
-    if (!bm.getPixels()) {
-        return false;
-    }
+static bool compute_is_opaque(const SkPixmap& pmap) {
+    const int height = pmap.height();
+    const int width = pmap.width();
 
-    const int height = bm.height();
-    const int width = bm.width();
-
-    switch (bm.colorType()) {
+    switch (pmap.colorType()) {
         case kAlpha_8_SkColorType: {
             unsigned a = 0xFF;
             for (int y = 0; y < height; ++y) {
-                const uint8_t* row = bm.getAddr8(0, y);
+                const uint8_t* row = pmap.addr8(0, y);
                 for (int x = 0; x < width; ++x) {
                     a &= row[x];
                 }
@@ -595,24 +604,25 @@ bool SkBitmap::ComputeIsOpaque(const SkBitmap& bm) {
             return true;
         } break;
         case kIndex_8_SkColorType: {
-            SkAutoLockColors alc(bm);
-            const SkPMColor* table = alc.colors();
-            if (!table) {
+            const SkColorTable* ctable = pmap.ctable();
+            if (nullptr == ctable) {
                 return false;
             }
+            const SkPMColor* table = ctable->readColors();
             SkPMColor c = (SkPMColor)~0;
-            for (int i = bm.getColorTable()->count() - 1; i >= 0; --i) {
+            for (int i = ctable->count() - 1; i >= 0; --i) {
                 c &= table[i];
             }
             return 0xFF == SkGetPackedA32(c);
         } break;
         case kRGB_565_SkColorType:
+        case kGray_8_SkColorType:
             return true;
             break;
         case kARGB_4444_SkColorType: {
             unsigned c = 0xFFFF;
             for (int y = 0; y < height; ++y) {
-                const SkPMColor16* row = bm.getAddr16(0, y);
+                const SkPMColor16* row = pmap.addr16(0, y);
                 for (int x = 0; x < width; ++x) {
                     c &= row[x];
                 }
@@ -626,7 +636,7 @@ bool SkBitmap::ComputeIsOpaque(const SkBitmap& bm) {
         case kRGBA_8888_SkColorType: {
             SkPMColor c = (SkPMColor)~0;
             for (int y = 0; y < height; ++y) {
-                const SkPMColor* row = bm.getAddr32(0, y);
+                const SkPMColor* row = pmap.addr32(0, y);
                 for (int x = 0; x < width; ++x) {
                     c &= row[x];
                 }
@@ -642,119 +652,42 @@ bool SkBitmap::ComputeIsOpaque(const SkBitmap& bm) {
     return false;
 }
 
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-static uint16_t pack_8888_to_4444(unsigned a, unsigned r, unsigned g, unsigned b) {
-    unsigned pixel = (SkA32To4444(a) << SK_A4444_SHIFT) |
-                     (SkR32To4444(r) << SK_R4444_SHIFT) |
-                     (SkG32To4444(g) << SK_G4444_SHIFT) |
-                     (SkB32To4444(b) << SK_B4444_SHIFT);
-    return SkToU16(pixel);
+bool SkBitmap::ComputeIsOpaque(const SkBitmap& bm) {
+    SkAutoPixmapUnlock result;
+    if (!bm.requestLock(&result)) {
+        return false;
+    }
+    return compute_is_opaque(result.pixmap());
 }
 
-void SkBitmap::internalErase(const SkIRect& area,
-                             U8CPU a, U8CPU r, U8CPU g, U8CPU b) const {
-#ifdef SK_DEBUG
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+
+void SkBitmap::erase(SkColor c, const SkIRect& area) const {
     SkDEBUGCODE(this->validate();)
-    SkASSERT(!area.isEmpty());
-    {
-        SkIRect total = { 0, 0, this->width(), this->height() };
-        SkASSERT(total.contains(area));
-    }
-#endif
 
     switch (fInfo.colorType()) {
         case kUnknown_SkColorType:
         case kIndex_8_SkColorType:
+            // TODO: can we ASSERT that we never get here?
             return; // can't erase. Should we bzero so the memory is not uninitialized?
         default:
             break;
     }
 
-    SkAutoLockPixels alp(*this);
-    // perform this check after the lock call
-    if (!this->readyToDraw()) {
+    SkAutoPixmapUnlock result;
+    if (!this->requestLock(&result)) {
         return;
     }
 
-    int height = area.height();
-    const int width = area.width();
-    const int rowBytes = fRowBytes;
-
-    switch (this->colorType()) {
-        case kAlpha_8_SkColorType: {
-            uint8_t* p = this->getAddr8(area.fLeft, area.fTop);
-            while (--height >= 0) {
-                memset(p, a, width);
-                p += rowBytes;
-            }
-            break;
-        }
-        case kARGB_4444_SkColorType:
-        case kRGB_565_SkColorType: {
-            uint16_t* p = this->getAddr16(area.fLeft, area.fTop);;
-            uint16_t v;
-
-            // make rgb premultiplied
-            if (255 != a) {
-                r = SkAlphaMul(r, a);
-                g = SkAlphaMul(g, a);
-                b = SkAlphaMul(b, a);
-            }
-
-            if (kARGB_4444_SkColorType == this->colorType()) {
-                v = pack_8888_to_4444(a, r, g, b);
-            } else {
-                v = SkPackRGB16(r >> (8 - SK_R16_BITS),
-                                g >> (8 - SK_G16_BITS),
-                                b >> (8 - SK_B16_BITS));
-            }
-            while (--height >= 0) {
-                sk_memset16(p, v, width);
-                p = (uint16_t*)((char*)p + rowBytes);
-            }
-            break;
-        }
-        case kBGRA_8888_SkColorType:
-        case kRGBA_8888_SkColorType: {
-            uint32_t* p = this->getAddr32(area.fLeft, area.fTop);
-
-            if (255 != a && kPremul_SkAlphaType == this->alphaType()) {
-                r = SkAlphaMul(r, a);
-                g = SkAlphaMul(g, a);
-                b = SkAlphaMul(b, a);
-            }
-            uint32_t v = kRGBA_8888_SkColorType == this->colorType() ?
-                         SkPackARGB_as_RGBA(a, r, g, b) : SkPackARGB_as_BGRA(a, r, g, b);
-
-            while (--height >= 0) {
-                sk_memset32(p, v, width);
-                p = (uint32_t*)((char*)p + rowBytes);
-            }
-            break;
-        }
-        default:
-            return; // no change, so don't call notifyPixelsChanged()
-    }
-
-    this->notifyPixelsChanged();
-}
-
-void SkBitmap::eraseARGB(U8CPU a, U8CPU r, U8CPU g, U8CPU b) const {
-    SkIRect area = { 0, 0, this->width(), this->height() };
-    if (!area.isEmpty()) {
-        this->internalErase(area, a, r, g, b);
+    if (result.pixmap().erase(c, area)) {
+        this->notifyPixelsChanged();
     }
 }
 
-void SkBitmap::eraseArea(const SkIRect& rect, SkColor c) const {
-    SkIRect area = { 0, 0, this->width(), this->height() };
-    if (area.intersect(rect)) {
-        this->internalErase(area, SkColorGetA(c), SkColorGetR(c),
-                            SkColorGetG(c), SkColorGetB(c));
-    }
+void SkBitmap::eraseColor(SkColor c) const {
+    this->erase(c, SkIRect::MakeWH(this->width(), this->height()));
 }
 
 //////////////////////////////////////////////////////////////////////////////////////
@@ -763,7 +696,7 @@ void SkBitmap::eraseArea(const SkIRect& rect, SkColor c) const {
 bool SkBitmap::extractSubset(SkBitmap* result, const SkIRect& subset) const {
     SkDEBUGCODE(this->validate();)
 
-    if (NULL == result || NULL == fPixelRef) {
+    if (nullptr == result || nullptr == fPixelRef) {
         return false;   // no src pixels
     }
 
@@ -773,10 +706,10 @@ bool SkBitmap::extractSubset(SkBitmap* result, const SkIRect& subset) const {
         return false;   // r is empty (i.e. no intersection)
     }
 
-    if (fPixelRef->getTexture() != NULL) {
+    if (fPixelRef->getTexture() != nullptr) {
         // Do a deep copy
-        SkPixelRef* pixelRef = fPixelRef->deepCopy(this->colorType(), &subset);
-        if (pixelRef != NULL) {
+        SkPixelRef* pixelRef = fPixelRef->deepCopy(this->colorType(), this->profileType(), &subset);
+        if (pixelRef != nullptr) {
             SkBitmap dst;
             dst.setInfo(SkImageInfo::Make(subset.width(), subset.height(),
                                           this->colorType(), this->alphaType()));
@@ -814,9 +747,6 @@ bool SkBitmap::extractSubset(SkBitmap* result, const SkIRect& subset) const {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "SkCanvas.h"
-#include "SkPaint.h"
-
 bool SkBitmap::canCopyTo(SkColorType dstColorType) const {
     const SkColorType srcCT = this->colorType();
 
@@ -838,62 +768,29 @@ bool SkBitmap::canCopyTo(SkColorType dstColorType) const {
             break;
         case kARGB_4444_SkColorType:
             return sameConfigs || kN32_SkColorType == srcCT || kIndex_8_SkColorType == srcCT;
+        case kGray_8_SkColorType:
+            switch (srcCT) {
+                case kGray_8_SkColorType:
+                case kRGBA_8888_SkColorType:
+                case kBGRA_8888_SkColorType:
+                    return true;
+                default:
+                    break;
+            }
+            return false;
         default:
             return false;
     }
     return true;
 }
 
-#include "SkConfig8888.h"
-
 bool SkBitmap::readPixels(const SkImageInfo& requestedDstInfo, void* dstPixels, size_t dstRB,
                           int x, int y) const {
-    if (kUnknown_SkColorType == requestedDstInfo.colorType()) {
+    SkAutoPixmapUnlock src;
+    if (!this->requestLock(&src)) {
         return false;
     }
-    if (NULL == dstPixels || dstRB < requestedDstInfo.minRowBytes()) {
-        return false;
-    }
-    if (0 == requestedDstInfo.width() || 0 == requestedDstInfo.height()) {
-        return false;
-    }
-    
-    SkIRect srcR = SkIRect::MakeXYWH(x, y, requestedDstInfo.width(), requestedDstInfo.height());
-    if (!srcR.intersect(0, 0, this->width(), this->height())) {
-        return false;
-    }
-    
-    SkImageInfo dstInfo = requestedDstInfo;
-    // the intersect may have shrunk info's logical size
-    dstInfo.fWidth = srcR.width();
-    dstInfo.fHeight = srcR.height();
-    
-    // if x or y are negative, then we have to adjust pixels
-    if (x > 0) {
-        x = 0;
-    }
-    if (y > 0) {
-        y = 0;
-    }
-    // here x,y are either 0 or negative
-    dstPixels = ((char*)dstPixels - y * dstRB - x * dstInfo.bytesPerPixel());
-
-    //////////////
-    
-    SkAutoLockPixels alp(*this);
-    
-    // since we don't stop creating un-pixeled devices yet, check for no pixels here
-    if (NULL == this->getPixels()) {
-        return false;
-    }
-    
-    SkImageInfo srcInfo = this->info();
-    srcInfo.fWidth = dstInfo.width();
-    srcInfo.fHeight = dstInfo.height();
-    
-    const void* srcPixels = this->getAddr(srcR.x(), srcR.y());
-    return SkPixelInfo::CopyPixels(dstInfo, dstPixels, dstRB, srcInfo, srcPixels, this->rowBytes(),
-                                   this->getColorTable());
+    return src.pixmap().readPixels(requestedDstInfo, dstPixels, dstRB, x, y);
 }
 
 bool SkBitmap::copyTo(SkBitmap* dst, SkColorType dstColorType, Allocator* alloc) const {
@@ -919,7 +816,7 @@ bool SkBitmap::copyTo(SkBitmap* dst, SkColorType dstColorType, Allocator* alloc)
             SkASSERT(tmpSrc.height() == this->height());
 
             // did we get lucky and we can just return tmpSrc?
-            if (tmpSrc.colorType() == dstColorType && NULL == alloc) {
+            if (tmpSrc.colorType() == dstColorType && nullptr == alloc) {
                 dst->swap(tmpSrc);
                 // If the result is an exact copy, clone the gen ID.
                 if (dst->pixelRef() && dst->pixelRef()->info() == fPixelRef->info()) {
@@ -933,18 +830,13 @@ bool SkBitmap::copyTo(SkBitmap* dst, SkColorType dstColorType, Allocator* alloc)
         }
     }
 
-    // we lock this now, since we may need its colortable
-    SkAutoLockPixels srclock(*src);
-    if (!src->readyToDraw()) {
+    SkAutoPixmapUnlock srcUnlocker;
+    if (!src->requestLock(&srcUnlocker)) {
         return false;
     }
+    const SkPixmap& srcPM = srcUnlocker.pixmap();
 
-    // The only way to be readyToDraw is if fPixelRef is non NULL.
-    SkASSERT(fPixelRef != NULL);
-
-    SkImageInfo dstInfo = src->info();
-    dstInfo.fColorType = dstColorType;
-
+    const SkImageInfo dstInfo = srcPM.info().makeColorType(dstColorType);
     SkBitmap tmpDst;
     if (!tmpDst.setInfo(dstInfo)) {
         return false;
@@ -953,23 +845,18 @@ bool SkBitmap::copyTo(SkBitmap* dst, SkColorType dstColorType, Allocator* alloc)
     // allocate colortable if srcConfig == kIndex8_Config
     SkAutoTUnref<SkColorTable> ctable;
     if (dstColorType == kIndex_8_SkColorType) {
-        // TODO: can we just ref() the src colortable? Is it reentrant-safe?
-        ctable.reset(SkNEW_ARGS(SkColorTable, (*src->getColorTable())));
+        ctable.reset(SkRef(srcPM.ctable()));
     }
-    if (!tmpDst.allocPixels(alloc, ctable)) {
+    if (!tmpDst.tryAllocPixels(alloc, ctable)) {
         return false;
     }
 
-    if (!tmpDst.readyToDraw()) {
-        // allocator/lock failed
+    SkAutoPixmapUnlock dstUnlocker;
+    if (!tmpDst.requestLock(&dstUnlocker)) {
         return false;
     }
 
-    // pixelRef must be non NULL or tmpDst.readyToDraw() would have
-    // returned false.
-    SkASSERT(tmpDst.pixelRef() != NULL);
-
-    if (!src->readPixels(tmpDst.info(), tmpDst.getPixels(), tmpDst.rowBytes(), 0, 0)) {
+    if (!srcPM.readPixels(dstUnlocker.pixmap())) {
         return false;
     }
 
@@ -979,7 +866,7 @@ bool SkBitmap::copyTo(SkBitmap* dst, SkColorType dstColorType, Allocator* alloc)
     //  TODO: should we ignore rowbytes (i.e. getSize)? Then it could just be
     //      if (src_pixelref->info == dst_pixelref->info)
     //
-    if (src->colorType() == dstColorType && tmpDst.getSize() == src->getSize()) {
+    if (srcPM.colorType() == dstColorType && tmpDst.getSize() == srcPM.getSize64()) {
         SkPixelRef* dstPixelRef = tmpDst.pixelRef();
         if (dstPixelRef->info() == fPixelRef->info()) {
             dstPixelRef->cloneGenID(*fPixelRef);
@@ -992,6 +879,7 @@ bool SkBitmap::copyTo(SkBitmap* dst, SkColorType dstColorType, Allocator* alloc)
 
 bool SkBitmap::deepCopyTo(SkBitmap* dst) const {
     const SkColorType dstCT = this->colorType();
+    const SkColorProfileType dstPT = this->profileType();
 
     if (!this->canCopyTo(dstCT)) {
         return false;
@@ -1000,10 +888,10 @@ bool SkBitmap::deepCopyTo(SkBitmap* dst) const {
     // If we have a PixelRef, and it supports deep copy, use it.
     // Currently supported only by texture-backed bitmaps.
     if (fPixelRef) {
-        SkPixelRef* pixelRef = fPixelRef->deepCopy(dstCT, NULL);
+        SkPixelRef* pixelRef = fPixelRef->deepCopy(dstCT, dstPT, nullptr);
         if (pixelRef) {
             uint32_t rowBytes;
-            if (this->colorType() == dstCT) {
+            if (this->colorType() == dstCT && this->profileType() == dstPT) {
                 // Since there is no subset to pass to deepCopy, and deepCopy
                 // succeeded, the new pixel ref must be identical.
                 SkASSERT(fPixelRef->info() == pixelRef->info());
@@ -1015,8 +903,7 @@ bool SkBitmap::deepCopyTo(SkBitmap* dst) const {
                 rowBytes = 0;
             }
 
-            SkImageInfo info = fInfo;
-            info.fColorType = dstCT;
+            const SkImageInfo info = fInfo.makeColorType(dstCT);
             if (!dst->setInfo(info, rowBytes)) {
                 return false;
             }
@@ -1028,41 +915,34 @@ bool SkBitmap::deepCopyTo(SkBitmap* dst) const {
     if (this->getTexture()) {
         return false;
     } else {
-        return this->copyTo(dst, dstCT, NULL);
+        return this->copyTo(dst, dstCT, nullptr);
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static bool GetBitmapAlpha(const SkBitmap& src, uint8_t* SK_RESTRICT alpha,
-                           int alphaRowBytes) {
-    SkASSERT(alpha != NULL);
-    SkASSERT(alphaRowBytes >= src.width());
-
-    SkColorType colorType = src.colorType();
-    int         w = src.width();
-    int         h = src.height();
-    size_t      rb = src.rowBytes();
-
-    SkAutoLockPixels alp(src);
-    if (!src.readyToDraw()) {
-        // zero out the alpha buffer and return
-        while (--h >= 0) {
-            memset(alpha, 0, w);
-            alpha += alphaRowBytes;
-        }
-        return false;
+static void rect_memset(uint8_t* array, U8CPU value, SkISize size, size_t rowBytes) {
+    for (int y = 0; y < size.height(); ++y) {
+        memset(array, value, size.width());
+        array += rowBytes;
     }
+}
 
-    if (kAlpha_8_SkColorType == colorType && !src.isOpaque()) {
-        const uint8_t* s = src.getAddr8(0, 0);
+static void get_bitmap_alpha(const SkPixmap& pmap, uint8_t* SK_RESTRICT alpha, int alphaRowBytes) {
+    SkColorType colorType = pmap.colorType();
+    int         w = pmap.width();
+    int         h = pmap.height();
+    size_t      rb = pmap.rowBytes();
+
+    if (kAlpha_8_SkColorType == colorType && !pmap.isOpaque()) {
+        const uint8_t* s = pmap.addr8(0, 0);
         while (--h >= 0) {
             memcpy(alpha, s, w);
             s += rb;
             alpha += alphaRowBytes;
         }
-    } else if (kN32_SkColorType == colorType && !src.isOpaque()) {
-        const SkPMColor* SK_RESTRICT s = src.getAddr32(0, 0);
+    } else if (kN32_SkColorType == colorType && !pmap.isOpaque()) {
+        const SkPMColor* SK_RESTRICT s = pmap.addr32(0, 0);
         while (--h >= 0) {
             for (int x = 0; x < w; x++) {
                 alpha[x] = SkGetPackedA32(s[x]);
@@ -1070,8 +950,8 @@ static bool GetBitmapAlpha(const SkBitmap& src, uint8_t* SK_RESTRICT alpha,
             s = (const SkPMColor*)((const char*)s + rb);
             alpha += alphaRowBytes;
         }
-    } else if (kARGB_4444_SkColorType == colorType && !src.isOpaque()) {
-        const SkPMColor16* SK_RESTRICT s = src.getAddr16(0, 0);
+    } else if (kARGB_4444_SkColorType == colorType && !pmap.isOpaque()) {
+        const SkPMColor16* SK_RESTRICT s = pmap.addr16(0, 0);
         while (--h >= 0) {
             for (int x = 0; x < w; x++) {
                 alpha[x] = SkPacked4444ToA32(s[x]);
@@ -1079,11 +959,11 @@ static bool GetBitmapAlpha(const SkBitmap& src, uint8_t* SK_RESTRICT alpha,
             s = (const SkPMColor16*)((const char*)s + rb);
             alpha += alphaRowBytes;
         }
-    } else if (kIndex_8_SkColorType == colorType && !src.isOpaque()) {
-        SkColorTable* ct = src.getColorTable();
+    } else if (kIndex_8_SkColorType == colorType && !pmap.isOpaque()) {
+        const SkColorTable* ct = pmap.ctable();
         if (ct) {
-            const SkPMColor* SK_RESTRICT table = ct->lockColors();
-            const uint8_t* SK_RESTRICT s = src.getAddr8(0, 0);
+            const SkPMColor* SK_RESTRICT table = ct->readColors();
+            const uint8_t* SK_RESTRICT s = pmap.addr8(0, 0);
             while (--h >= 0) {
                 for (int x = 0; x < w; x++) {
                     alpha[x] = SkGetPackedA32(table[s[x]]);
@@ -1091,11 +971,22 @@ static bool GetBitmapAlpha(const SkBitmap& src, uint8_t* SK_RESTRICT alpha,
                 s += rb;
                 alpha += alphaRowBytes;
             }
-            ct->unlockColors();
         }
     } else {    // src is opaque, so just fill alpha[] with 0xFF
-        memset(alpha, 0xFF, h * alphaRowBytes);
+        rect_memset(alpha, 0xFF, pmap.info().dimensions(), alphaRowBytes);
     }
+}
+
+static bool GetBitmapAlpha(const SkBitmap& src, uint8_t* SK_RESTRICT alpha, int alphaRowBytes) {
+    SkASSERT(alpha != nullptr);
+    SkASSERT(alphaRowBytes >= src.width());
+
+    SkAutoPixmapUnlock apl;
+    if (!src.requestLock(&apl)) {
+        rect_memset(alpha, 0, src.info().dimensions(), alphaRowBytes);
+        return false;
+    }
+    get_bitmap_alpha(apl.pixmap(), alpha, alphaRowBytes);
     return true;
 }
 
@@ -1115,20 +1006,20 @@ bool SkBitmap::extractAlpha(SkBitmap* dst, const SkPaint* paint,
     srcM.fRowBytes = SkAlign4(this->width());
     srcM.fFormat = SkMask::kA8_Format;
 
-    SkMaskFilter* filter = paint ? paint->getMaskFilter() : NULL;
+    SkMaskFilter* filter = paint ? paint->getMaskFilter() : nullptr;
 
     // compute our (larger?) dst bounds if we have a filter
-    if (NULL != filter) {
+    if (filter) {
         identity.reset();
-        srcM.fImage = NULL;
-        if (!filter->filterMask(&dstM, srcM, identity, NULL)) {
+        srcM.fImage = nullptr;
+        if (!filter->filterMask(&dstM, srcM, identity, nullptr)) {
             goto NO_FILTER_CASE;
         }
         dstM.fRowBytes = SkAlign4(dstM.fBounds.width());
     } else {
     NO_FILTER_CASE:
         tmpBitmap.setInfo(SkImageInfo::MakeA8(this->width(), this->height()), srcM.fRowBytes);
-        if (!tmpBitmap.allocPixels(allocator, NULL)) {
+        if (!tmpBitmap.tryAllocPixels(allocator, nullptr)) {
             // Allocation of pixels for alpha bitmap failed.
             SkDebugf("extractAlpha failed to allocate (%d,%d) alpha bitmap\n",
                     tmpBitmap.width(), tmpBitmap.height());
@@ -1145,14 +1036,14 @@ bool SkBitmap::extractAlpha(SkBitmap* dst, const SkPaint* paint,
     SkAutoMaskFreeImage srcCleanup(srcM.fImage);
 
     GetBitmapAlpha(*this, srcM.fImage, srcM.fRowBytes);
-    if (!filter->filterMask(&dstM, srcM, identity, NULL)) {
+    if (!filter->filterMask(&dstM, srcM, identity, nullptr)) {
         goto NO_FILTER_CASE;
     }
     SkAutoMaskFreeImage dstCleanup(dstM.fImage);
 
     tmpBitmap.setInfo(SkImageInfo::MakeA8(dstM.fBounds.width(), dstM.fBounds.height()),
                       dstM.fRowBytes);
-    if (!tmpBitmap.allocPixels(allocator, NULL)) {
+    if (!tmpBitmap.tryAllocPixels(allocator, nullptr)) {
         // Allocation of pixels for alpha bitmap failed.
         SkDebugf("extractAlpha failed to allocate (%d,%d) alpha bitmap\n",
                 tmpBitmap.width(), tmpBitmap.height());
@@ -1170,17 +1061,11 @@ bool SkBitmap::extractAlpha(SkBitmap* dst, const SkPaint* paint,
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void SkBitmap::WriteRawPixels(SkWriteBuffer* buffer, const SkBitmap& bitmap) {
-    const SkImageInfo info = bitmap.info();
-    SkAutoLockPixels alp(bitmap);
-    if (0 == info.width() || 0 == info.height() || NULL == bitmap.getPixels()) {
-        buffer->writeUInt(0); // instead of snugRB, signaling no pixels
-        return;
-    }
-
+static void write_raw_pixels(SkWriteBuffer* buffer, const SkPixmap& pmap) {
+    const SkImageInfo& info = pmap.info();
     const size_t snugRB = info.width() * info.bytesPerPixel();
-    const char* src = (const char*)bitmap.getPixels();
-    const size_t ramRB = bitmap.rowBytes();
+    const char* src = (const char*)pmap.addr();
+    const size_t ramRB = pmap.rowBytes();
 
     buffer->write32(SkToU32(snugRB));
     info.flatten(*buffer);
@@ -1195,7 +1080,7 @@ void SkBitmap::WriteRawPixels(SkWriteBuffer* buffer, const SkBitmap& bitmap) {
     }
     buffer->writeByteArray(storage.get(), size);
 
-    SkColorTable* ct = bitmap.getColorTable();
+    const SkColorTable* ct = pmap.ctable();
     if (kIndex_8_SkColorType == info.colorType() && ct) {
         buffer->writeBool(true);
         ct->writeToBuffer(*buffer);
@@ -1204,6 +1089,22 @@ void SkBitmap::WriteRawPixels(SkWriteBuffer* buffer, const SkBitmap& bitmap) {
     }
 }
 
+void SkBitmap::WriteRawPixels(SkWriteBuffer* buffer, const SkBitmap& bitmap) {
+    const SkImageInfo info = bitmap.info();
+    if (0 == info.width() || 0 == info.height() || nullptr == bitmap.pixelRef()) {
+        buffer->writeUInt(0); // instead of snugRB, signaling no pixels
+        return;
+    }
+
+    SkAutoPixmapUnlock result;
+    if (!bitmap.requestLock(&result)) {
+        buffer->writeUInt(0); // instead of snugRB, signaling no pixels
+        return;
+    }
+
+    write_raw_pixels(buffer, result.pixmap());
+}
+
 bool SkBitmap::ReadRawPixels(SkReadBuffer* buffer, SkBitmap* bitmap) {
     const size_t snugRB = buffer->readUInt();
     if (0 == snugRB) {  // no pixels
@@ -1219,20 +1120,21 @@ bool SkBitmap::ReadRawPixels(SkReadBuffer* buffer, SkBitmap* bitmap) {
     }
 
     const size_t ramRB = info.minRowBytes();
-    const int height = info.height();
-    const size_t snugSize = snugRB * height;
-    const size_t ramSize = ramRB * height;
-    if (!buffer->validate(snugSize <= ramSize)) {
+    const int height = SkMax32(info.height(), 0);
+    const uint64_t snugSize = sk_64_mul(snugRB, height);
+    const uint64_t ramSize = sk_64_mul(ramRB, height);
+    static const uint64_t max_size_t = (size_t)(-1);
+    if (!buffer->validate((snugSize <= ramSize) && (ramSize <= max_size_t))) {
         return false;
     }
 
-    char* dst = (char*)sk_malloc_throw(ramSize);
-    buffer->readByteArray(dst, snugSize);
-    SkAutoDataUnref data(SkData::NewFromMalloc(dst, ramSize));
+    SkAutoDataUnref data(SkData::NewUninitialized(SkToSizeT(ramSize)));
+    unsigned char* dst = (unsigned char*)data->writable_data();
+    buffer->readByteArray(dst, SkToSizeT(snugSize));
 
     if (snugSize != ramSize) {
-        const char* srcRow = dst + snugRB * (height - 1);
-        char* dstRow = dst + ramRB * (height - 1);
+        const unsigned char* srcRow = dst + snugRB * (height - 1);
+        unsigned char* dstRow = dst + ramRB * (height - 1);
         for (int y = height - 1; y >= 1; --y) {
             memmove(dstRow, srcRow, snugRB);
             srcRow -= snugRB;
@@ -1243,11 +1145,35 @@ bool SkBitmap::ReadRawPixels(SkReadBuffer* buffer, SkBitmap* bitmap) {
 
     SkAutoTUnref<SkColorTable> ctable;
     if (buffer->readBool()) {
-        ctable.reset(SkNEW_ARGS(SkColorTable, (*buffer)));
+        ctable.reset(SkColorTable::Create(*buffer));
+        if (!ctable) {
+            return false;
+        }
+
+        if (info.isEmpty()) {
+            // require an empty ctable
+            if (ctable->count() != 0) {
+                buffer->validate(false);
+                return false;
+            }
+        } else {
+            // require a non-empty ctable
+            if (ctable->count() == 0) {
+                buffer->validate(false);
+                return false;
+            }
+            unsigned char maxIndex = ctable->count() - 1;
+            for (uint64_t i = 0; i < ramSize; ++i) {
+                dst[i] = SkTMin(dst[i], maxIndex);
+            }
+        }
     }
 
     SkAutoTUnref<SkPixelRef> pr(SkMallocPixelRef::NewWithData(info, info.minRowBytes(),
                                                               ctable.get(), data.get()));
+    if (!pr.get()) {
+        return false;
+    }
     bitmap->setInfo(pr->info());
     bitmap->setPixelRef(pr, 0, 0);
     return true;
@@ -1258,53 +1184,6 @@ enum {
     SERIALIZE_PIXELTYPE_REF_DATA
 };
 
-void SkBitmap::legacyUnflatten(SkReadBuffer& buffer) {
-#ifdef SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE
-    this->reset();
-
-    SkImageInfo info;
-    info.unflatten(buffer);
-    size_t rowBytes = buffer.readInt();
-    if (!buffer.validate((info.width() >= 0) && (info.height() >= 0) &&
-                         SkColorTypeIsValid(info.fColorType) &&
-                         SkAlphaTypeIsValid(info.fAlphaType) &&
-                         SkColorTypeValidateAlphaType(info.fColorType, info.fAlphaType) &&
-                         info.validRowBytes(rowBytes))) {
-        return;
-    }
-
-    bool configIsValid = this->setInfo(info, rowBytes);
-    buffer.validate(configIsValid);
-
-    int reftype = buffer.readInt();
-    if (buffer.validate((SERIALIZE_PIXELTYPE_REF_DATA == reftype) ||
-                        (SERIALIZE_PIXELTYPE_NONE == reftype))) {
-        switch (reftype) {
-            case SERIALIZE_PIXELTYPE_REF_DATA: {
-                SkIPoint origin;
-                origin.fX = buffer.readInt();
-                origin.fY = buffer.readInt();
-                size_t offset = origin.fY * rowBytes + origin.fX * info.bytesPerPixel();
-                SkPixelRef* pr = buffer.readFlattenable<SkPixelRef>();
-                if (!buffer.validate((NULL == pr) ||
-                       (pr->getAllocatedSizeInBytes() >= (offset + this->getSafeSize())))) {
-                    origin.setZero();
-                }
-                SkSafeUnref(this->setPixelRef(pr, origin));
-                break;
-            }
-            case SERIALIZE_PIXELTYPE_NONE:
-                break;
-            default:
-                SkDEBUGFAIL("unrecognized pixeltype in serialized data");
-                sk_throw();
-        }
-    }
-#else
-    sk_throw();
-#endif
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
 SkBitmap::RLEPixels::RLEPixels(int width, int height) {
@@ -1344,15 +1223,16 @@ void SkBitmap::validate() const {
         SkASSERT(fPixelRefOrigin.fX >= 0);
         SkASSERT(fPixelRefOrigin.fY >= 0);
         SkASSERT(fPixelRef->info().width() >= (int)this->width() + fPixelRefOrigin.fX);
-        SkASSERT(fPixelRef->info().fHeight >= (int)this->height() + fPixelRefOrigin.fY);
+        SkASSERT(fPixelRef->info().height() >= (int)this->height() + fPixelRefOrigin.fY);
         SkASSERT(fPixelRef->rowBytes() >= fInfo.minRowBytes());
     } else {
-        SkASSERT(NULL == fColorTable);
+        SkASSERT(nullptr == fColorTable);
     }
 }
 #endif
 
 #ifndef SK_IGNORE_TO_STRING
+#include "SkString.h"
 void SkBitmap::toString(SkString* str) const {
 
     static const char* gColorTypeNames[kLastEnum_SkColorType + 1] = {
@@ -1376,12 +1256,12 @@ void SkBitmap::toString(SkString* str) const {
     str->append(")");
 
     SkPixelRef* pr = this->pixelRef();
-    if (NULL == pr) {
+    if (nullptr == pr) {
         // show null or the explicit pixel address (rare)
         str->appendf(" pixels:%p", this->getPixels());
     } else {
         const char* uri = pr->getURI();
-        if (NULL != uri) {
+        if (uri) {
             str->appendf(" uri:\"%s\"", uri);
         } else {
             str->appendf(" pixelref:%p", pr);
@@ -1394,6 +1274,47 @@ void SkBitmap::toString(SkString* str) const {
 
 ///////////////////////////////////////////////////////////////////////////////
 
+bool SkBitmap::requestLock(SkAutoPixmapUnlock* result) const {
+    SkASSERT(result);
+
+    SkPixelRef* pr = fPixelRef;
+    if (nullptr == pr) {
+        return false;
+    }
+
+    // We have to lock the whole thing (using the pixelref's dimensions) until the api supports
+    // a partial lock (with offset/origin). Hence we can't use our fInfo.
+    SkPixelRef::LockRequest req = { pr->info().dimensions(), kNone_SkFilterQuality };
+    SkPixelRef::LockResult res;
+    if (pr->requestLock(req, &res)) {
+        SkASSERT(res.fPixels);
+        // The bitmap may be a subset of the pixelref's dimensions
+        SkASSERT(fPixelRefOrigin.x() + fInfo.width()  <= res.fSize.width());
+        SkASSERT(fPixelRefOrigin.y() + fInfo.height() <= res.fSize.height());
+        const void* addr = (const char*)res.fPixels + SkColorTypeComputeOffset(fInfo.colorType(),
+                                                                               fPixelRefOrigin.x(),
+                                                                               fPixelRefOrigin.y(),
+                                                                               res.fRowBytes);
+
+        result->reset(SkPixmap(this->info(), addr, res.fRowBytes, res.fCTable),
+                      res.fUnlockProc, res.fUnlockContext);
+        return true;
+    }
+    return false;
+}
+
+bool SkBitmap::peekPixels(SkPixmap* pmap) const {
+    if (fPixels) {
+        if (pmap) {
+            pmap->reset(fInfo, fPixels, fRowBytes, fColorTable);
+        }
+        return true;
+    }
+    return false;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
 #ifdef SK_DEBUG
 void SkImageInfo::validate() const {
     SkASSERT(fWidth >= 0);
diff --git a/gfx/skia/skia/src/core/SkBitmapCache.cpp b/gfx/skia/skia/src/core/SkBitmapCache.cpp
new file mode 100644
index 000000000000..83eec1b666b7
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkBitmapCache.cpp
@@ -0,0 +1,306 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkBitmapCache.h"
+#include "SkImage.h"
+#include "SkResourceCache.h"
+#include "SkMipMap.h"
+#include "SkPixelRef.h"
+#include "SkRect.h"
+
+/**
+ *  Use this for bitmapcache and mipmapcache entries.
+ */
+uint64_t SkMakeResourceCacheSharedIDForBitmap(uint32_t bitmapGenID) {
+    uint64_t sharedID = SkSetFourByteTag('b', 'm', 'a', 'p');
+    return (sharedID << 32) | bitmapGenID;
+}
+
+void SkNotifyBitmapGenIDIsStale(uint32_t bitmapGenID) {
+    SkResourceCache::PostPurgeSharedID(SkMakeResourceCacheSharedIDForBitmap(bitmapGenID));
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+SkBitmap::Allocator* SkBitmapCache::GetAllocator() {
+    return SkResourceCache::GetAllocator();
+}
+
+/**
+ This function finds the bounds of the bitmap *within its pixelRef*.
+ If the bitmap lacks a pixelRef, it will return an empty rect, since
+ that doesn't make sense.  This may be a useful enough function that
+ it should be somewhere else (in SkBitmap?).
+ */
+static SkIRect get_bounds_from_bitmap(const SkBitmap& bm) {
+    if (!(bm.pixelRef())) {
+        return SkIRect::MakeEmpty();
+    }
+    SkIPoint origin = bm.pixelRefOrigin();
+    return SkIRect::MakeXYWH(origin.fX, origin.fY, bm.width(), bm.height());
+}
+
+/**
+ *  This function finds the bounds of the image. Today this is just the entire bounds,
+ *  but in the future we may support subsets within an image, in which case this should
+ *  return that subset (see get_bounds_from_bitmap).
+ */
+static SkIRect get_bounds_from_image(const SkImage* image) {
+    return SkIRect::MakeWH(image->width(), image->height());
+}
+
+SkBitmapCacheDesc SkBitmapCacheDesc::Make(const SkBitmap& bm, int width, int height) {
+    SkBitmapCacheDesc desc;
+    desc.fImageID = bm.getGenerationID();
+    desc.fWidth = width;
+    desc.fHeight = height;
+    desc.fBounds = get_bounds_from_bitmap(bm);
+    return desc;
+}
+
+SkBitmapCacheDesc SkBitmapCacheDesc::Make(const SkBitmap& bm) {
+    return Make(bm, bm.width(), bm.height());
+}
+
+SkBitmapCacheDesc SkBitmapCacheDesc::Make(const SkImage* image, int width, int height) {
+    SkBitmapCacheDesc desc;
+    desc.fImageID = image->uniqueID();
+    desc.fWidth = width;
+    desc.fHeight = height;
+    desc.fBounds = get_bounds_from_image(image);
+    return desc;
+}
+
+SkBitmapCacheDesc SkBitmapCacheDesc::Make(const SkImage* image) {
+    return Make(image, image->width(), image->height());
+}
+
+namespace {
+static unsigned gBitmapKeyNamespaceLabel;
+
+struct BitmapKey : public SkResourceCache::Key {
+public:
+    BitmapKey(uint32_t genID, int width, int height, const SkIRect& bounds)
+        : fGenID(genID)
+        , fWidth(width)
+        , fHeight(height)
+        , fBounds(bounds)
+    {
+        this->init(&gBitmapKeyNamespaceLabel, SkMakeResourceCacheSharedIDForBitmap(fGenID),
+                   sizeof(fGenID) + sizeof(fWidth) + sizeof(fHeight) + sizeof(fBounds));
+    }
+
+    BitmapKey(const SkBitmapCacheDesc& desc)
+        : fGenID(desc.fImageID)
+        , fWidth(desc.fWidth)
+        , fHeight(desc.fHeight)
+        , fBounds(desc.fBounds)
+    {
+        this->init(&gBitmapKeyNamespaceLabel, SkMakeResourceCacheSharedIDForBitmap(fGenID),
+                   sizeof(fGenID) + sizeof(fWidth) + sizeof(fHeight) + sizeof(fBounds));
+    }
+
+    void dump() const {
+        SkDebugf("-- add [%d %d] %d [%d %d %d %d]\n", fWidth, fHeight, fGenID,
+                 fBounds.x(), fBounds.y(), fBounds.width(), fBounds.height());
+    }
+
+    const uint32_t  fGenID;
+    const int       fWidth;
+    const int       fHeight;
+    const SkIRect   fBounds;
+};
+
+struct BitmapRec : public SkResourceCache::Rec {
+    BitmapRec(uint32_t genID, int width, int height, const SkIRect& bounds,
+              const SkBitmap& result)
+        : fKey(genID, width, height, bounds)
+        , fBitmap(result)
+    {
+#ifdef TRACE_NEW_BITMAP_CACHE_RECS
+        fKey.dump();
+#endif
+    }
+
+    BitmapRec(const SkBitmapCacheDesc& desc, const SkBitmap& result)
+        : fKey(desc)
+        , fBitmap(result)
+    {
+#ifdef TRACE_NEW_BITMAP_CACHE_RECS
+        fKey.dump();
+#endif
+    }
+
+    const Key& getKey() const override { return fKey; }
+    size_t bytesUsed() const override { return sizeof(fKey) + fBitmap.getSize(); }
+
+    const char* getCategory() const override { return "bitmap"; }
+    SkDiscardableMemory* diagnostic_only_getDiscardable() const override {
+        return fBitmap.pixelRef()->diagnostic_only_getDiscardable();
+    }
+
+    static bool Finder(const SkResourceCache::Rec& baseRec, void* contextBitmap) {
+        const BitmapRec& rec = static_cast<const BitmapRec&>(baseRec);
+        SkBitmap* result = (SkBitmap*)contextBitmap;
+
+        *result = rec.fBitmap;
+        result->lockPixels();
+        return SkToBool(result->getPixels());
+    }
+
+private:
+    BitmapKey   fKey;
+    SkBitmap    fBitmap;
+};
+} // namespace
+
+#define CHECK_LOCAL(localCache, localName, globalName, ...) \
+    ((localCache) ? localCache->localName(__VA_ARGS__) : SkResourceCache::globalName(__VA_ARGS__))
+
+bool SkBitmapCache::FindWH(const SkBitmapCacheDesc& desc, SkBitmap* result,
+                           SkResourceCache* localCache) {
+    if (0 == desc.fWidth || 0 == desc.fHeight) {
+        // degenerate
+        return false;
+    }
+    return CHECK_LOCAL(localCache, find, Find, BitmapKey(desc), BitmapRec::Finder, result);
+}
+
+bool SkBitmapCache::AddWH(const SkBitmapCacheDesc& desc, const SkBitmap& result,
+                          SkResourceCache* localCache) {
+    if (0 == desc.fWidth || 0 == desc.fHeight) {
+        // degenerate, and the key we use for mipmaps
+        return false;
+    }
+    SkASSERT(result.isImmutable());
+    BitmapRec* rec = new BitmapRec(desc, result);
+    CHECK_LOCAL(localCache, add, Add, rec);
+    return true;
+}
+
+bool SkBitmapCache::Find(uint32_t genID, const SkIRect& subset, SkBitmap* result,
+                         SkResourceCache* localCache) {
+    BitmapKey key(genID, SK_Scalar1, SK_Scalar1, subset);
+
+    return CHECK_LOCAL(localCache, find, Find, key, BitmapRec::Finder, result);
+}
+
+bool SkBitmapCache::Add(SkPixelRef* pr, const SkIRect& subset, const SkBitmap& result,
+                        SkResourceCache* localCache) {
+    SkASSERT(result.isImmutable());
+
+    if (subset.isEmpty()
+        || subset.top() < 0
+        || subset.left() < 0
+        || result.width() != subset.width()
+        || result.height() != subset.height()) {
+        return false;
+    } else {
+        BitmapRec* rec = new BitmapRec(pr->getGenerationID(), 1, 1, subset, result);
+
+        CHECK_LOCAL(localCache, add, Add, rec);
+        pr->notifyAddedToCache();
+        return true;
+    }
+}
+
+bool SkBitmapCache::Find(uint32_t genID, SkBitmap* result, SkResourceCache* localCache) {
+    BitmapKey key(genID, SK_Scalar1, SK_Scalar1, SkIRect::MakeEmpty());
+
+    return CHECK_LOCAL(localCache, find, Find, key, BitmapRec::Finder, result);
+}
+
+void SkBitmapCache::Add(uint32_t genID, const SkBitmap& result, SkResourceCache* localCache) {
+    SkASSERT(result.isImmutable());
+
+    BitmapRec* rec = new BitmapRec(genID, 1, 1, SkIRect::MakeEmpty(), result);
+
+    CHECK_LOCAL(localCache, add, Add, rec);
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////////////////
+
+namespace {
+static unsigned gMipMapKeyNamespaceLabel;
+
+struct MipMapKey : public SkResourceCache::Key {
+public:
+    MipMapKey(uint32_t genID, const SkIRect& bounds) : fGenID(genID), fBounds(bounds) {
+        this->init(&gMipMapKeyNamespaceLabel, SkMakeResourceCacheSharedIDForBitmap(genID),
+                   sizeof(fGenID) + sizeof(fBounds));
+    }
+
+    uint32_t    fGenID;
+    SkIRect     fBounds;
+};
+
+struct MipMapRec : public SkResourceCache::Rec {
+    MipMapRec(const SkBitmap& src, const SkMipMap* result)
+        : fKey(src.getGenerationID(), get_bounds_from_bitmap(src))
+        , fMipMap(result)
+    {
+        fMipMap->attachToCacheAndRef();
+    }
+
+    virtual ~MipMapRec() {
+        fMipMap->detachFromCacheAndUnref();
+    }
+
+    const Key& getKey() const override { return fKey; }
+    size_t bytesUsed() const override { return sizeof(fKey) + fMipMap->size(); }
+    const char* getCategory() const override { return "mipmap"; }
+    SkDiscardableMemory* diagnostic_only_getDiscardable() const override {
+        return fMipMap->diagnostic_only_getDiscardable();
+    }
+
+    static bool Finder(const SkResourceCache::Rec& baseRec, void* contextMip) {
+        const MipMapRec& rec = static_cast<const MipMapRec&>(baseRec);
+        const SkMipMap* mm = SkRef(rec.fMipMap);
+        // the call to ref() above triggers a "lock" in the case of discardable memory,
+        // which means we can now check for null (in case the lock failed).
+        if (nullptr == mm->data()) {
+            mm->unref();    // balance our call to ref()
+            return false;
+        }
+        // the call must call unref() when they are done.
+        *(const SkMipMap**)contextMip = mm;
+        return true;
+    }
+
+private:
+    MipMapKey       fKey;
+    const SkMipMap* fMipMap;
+};
+}
+
+const SkMipMap* SkMipMapCache::FindAndRef(const SkBitmapCacheDesc& desc,
+                                          SkResourceCache* localCache) {
+    // Note: we ignore width/height from desc, just need id and bounds
+    MipMapKey key(desc.fImageID, desc.fBounds);
+    const SkMipMap* result;
+
+    if (!CHECK_LOCAL(localCache, find, Find, key, MipMapRec::Finder, &result)) {
+        result = nullptr;
+    }
+    return result;
+}
+
+static SkResourceCache::DiscardableFactory get_fact(SkResourceCache* localCache) {
+    return localCache ? localCache->GetDiscardableFactory()
+                      : SkResourceCache::GetDiscardableFactory();
+}
+
+const SkMipMap* SkMipMapCache::AddAndRef(const SkBitmap& src, SkResourceCache* localCache) {
+    SkMipMap* mipmap = SkMipMap::Build(src, get_fact(localCache));
+    if (mipmap) {
+        MipMapRec* rec = new MipMapRec(src, mipmap);
+        CHECK_LOCAL(localCache, add, Add, rec);
+        src.pixelRef()->notifyAddedToCache();
+    }
+    return mipmap;
+}
diff --git a/gfx/skia/skia/src/core/SkBitmapCache.h b/gfx/skia/skia/src/core/SkBitmapCache.h
new file mode 100644
index 000000000000..9371e77ca99f
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkBitmapCache.h
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkBitmapCache_DEFINED
+#define SkBitmapCache_DEFINED
+
+#include "SkScalar.h"
+#include "SkBitmap.h"
+
+class SkImage;
+class SkResourceCache;
+class SkMipMap;
+
+uint64_t SkMakeResourceCacheSharedIDForBitmap(uint32_t bitmapGenID);
+
+void SkNotifyBitmapGenIDIsStale(uint32_t bitmapGenID);
+
+struct SkBitmapCacheDesc {
+    uint32_t    fImageID;
+    int32_t     fWidth;
+    int32_t     fHeight;
+    SkIRect     fBounds;
+
+    static SkBitmapCacheDesc Make(const SkBitmap&, int width, int height);
+    static SkBitmapCacheDesc Make(const SkBitmap&);
+    static SkBitmapCacheDesc Make(const SkImage*, int width, int height);
+    static SkBitmapCacheDesc Make(const SkImage*);
+};
+
+class SkBitmapCache {
+public:
+    /**
+     * Use this allocator for bitmaps, so they can use ashmem when available.
+     * Returns nullptr if the ResourceCache has not been initialized with a DiscardableFactory.
+     */
+    static SkBitmap::Allocator* GetAllocator();
+
+    /**
+     *  Search based on the desc. If found, returns true and
+     *  result will be set to the matching bitmap with its pixels already locked.
+     */
+    static bool FindWH(const SkBitmapCacheDesc&, SkBitmap* result,
+                       SkResourceCache* localCache = nullptr);
+
+    /*
+     *  result must be marked isImmutable()
+     */
+    static bool AddWH(const SkBitmapCacheDesc&, const SkBitmap& result,
+                      SkResourceCache* localCache = nullptr);
+
+    /**
+     *  Search based on the bitmap's genID and subset. If found, returns true and
+     *  result will be set to the matching bitmap with its pixels already locked.
+     */
+    static bool Find(uint32_t genID, const SkIRect& subset, SkBitmap* result,
+                     SkResourceCache* localCache = nullptr);
+
+    /**
+     * The width and the height of the provided subset must be the same as the result bitmap ones.
+     * result must be marked isImmutable()
+     */
+    static bool Add(SkPixelRef*, const SkIRect& subset, const SkBitmap& result,
+                    SkResourceCache* localCache = nullptr);
+
+    static bool Find(uint32_t genID, SkBitmap* result, SkResourceCache* localCache = nullptr);
+    // todo: eliminate the need to specify ID, since it should == the bitmap's
+    static void Add(uint32_t genID, const SkBitmap&, SkResourceCache* localCache = nullptr);
+};
+
+class SkMipMapCache {
+public:
+    static const SkMipMap* FindAndRef(const SkBitmapCacheDesc&,
+                                      SkResourceCache* localCache = nullptr);
+    static const SkMipMap* AddAndRef(const SkBitmap& src, SkResourceCache* localCache = nullptr);
+};
+
+#endif
diff --git a/gfx/skia/skia/src/core/SkBitmapController.cpp b/gfx/skia/skia/src/core/SkBitmapController.cpp
new file mode 100644
index 000000000000..233e81146f0e
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkBitmapController.cpp
@@ -0,0 +1,221 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkBitmap.h"
+#include "SkBitmapController.h"
+#include "SkBitmapProvider.h"
+#include "SkMatrix.h"
+#include "SkPixelRef.h"
+#include "SkTemplates.h"
+
+// RESIZE_LANCZOS3 is another good option, but chrome prefers mitchell at the moment
+#define kHQ_RESIZE_METHOD   SkBitmapScaler::RESIZE_MITCHELL
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+SkBitmapController::State* SkBitmapController::requestBitmap(const SkBitmapProvider& provider,
+                                                             const SkMatrix& inv,
+                                                             SkFilterQuality quality,
+                                                             void* storage, size_t storageSize) {
+    if (!provider.validForDrawing()) {
+        return nullptr;
+    }
+
+    State* state = this->onRequestBitmap(provider, inv, quality, storage, storageSize);
+    if (state) {
+        if (nullptr == state->fPixmap.addr()) {
+            SkInPlaceDeleteCheck(state, storage);
+            state = nullptr;
+        }
+    }
+    return state;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#include "SkBitmapCache.h"
+#include "SkBitmapScaler.h"
+#include "SkMipMap.h"
+#include "SkResourceCache.h"
+
+class SkDefaultBitmapControllerState : public SkBitmapController::State {
+public:
+    SkDefaultBitmapControllerState(const SkBitmapProvider&, const SkMatrix& inv, SkFilterQuality);
+
+private:
+    SkBitmap                     fResultBitmap;
+    SkAutoTUnref<const SkMipMap> fCurrMip;
+    
+    bool processHQRequest(const SkBitmapProvider&);
+    bool processMediumRequest(const SkBitmapProvider&);
+};
+
+// Check to see that the size of the bitmap that would be produced by
+// scaling by the given inverted matrix is less than the maximum allowed.
+static inline bool cache_size_okay(const SkBitmapProvider& provider, const SkMatrix& invMat) {
+    size_t maximumAllocation = SkResourceCache::GetEffectiveSingleAllocationByteLimit();
+    if (0 == maximumAllocation) {
+        return true;
+    }
+    // float matrixScaleFactor = 1.0 / (invMat.scaleX * invMat.scaleY);
+    // return ((origBitmapSize * matrixScaleFactor) < maximumAllocationSize);
+    // Skip the division step:
+    const size_t size = provider.info().getSafeSize(provider.info().minRowBytes());
+    return size < (maximumAllocation * invMat.getScaleX() * invMat.getScaleY());
+}
+
+/*
+ *  High quality is implemented by performing up-right scale-only filtering and then
+ *  using bilerp for any remaining transformations.
+ */
+bool SkDefaultBitmapControllerState::processHQRequest(const SkBitmapProvider& provider) {
+    if (fQuality != kHigh_SkFilterQuality) {
+        return false;
+    }
+    
+    // Our default return state is to downgrade the request to Medium, w/ or w/o setting fBitmap
+    // to a valid bitmap. If we succeed, we will set this to Low instead.
+    fQuality = kMedium_SkFilterQuality;
+    
+    if (kN32_SkColorType != provider.info().colorType() || !cache_size_okay(provider, fInvMatrix) ||
+        fInvMatrix.hasPerspective())
+    {
+        return false; // can't handle the reqeust
+    }
+    
+    SkScalar invScaleX = fInvMatrix.getScaleX();
+    SkScalar invScaleY = fInvMatrix.getScaleY();
+    if (fInvMatrix.getType() & SkMatrix::kAffine_Mask) {
+        SkSize scale;
+        if (!fInvMatrix.decomposeScale(&scale)) {
+            return false;
+        }
+        invScaleX = scale.width();
+        invScaleY = scale.height();
+    }
+    if (SkScalarNearlyEqual(invScaleX, 1) && SkScalarNearlyEqual(invScaleY, 1)) {
+        return false; // no need for HQ
+    }
+    
+    const int dstW = SkScalarRoundToScalar(provider.width() / invScaleX);
+    const int dstH = SkScalarRoundToScalar(provider.height() / invScaleY);
+    const SkBitmapCacheDesc desc = provider.makeCacheDesc(dstW, dstH);
+
+    if (!SkBitmapCache::FindWH(desc, &fResultBitmap)) {
+        SkBitmap orig;
+        if (!provider.asBitmap(&orig)) {
+            return false;
+        }
+        SkAutoPixmapUnlock src;
+        if (!orig.requestLock(&src)) {
+            return false;
+        }
+        if (!SkBitmapScaler::Resize(&fResultBitmap, src.pixmap(), kHQ_RESIZE_METHOD,
+                                    dstW, dstH, SkResourceCache::GetAllocator())) {
+            return false; // we failed to create fScaledBitmap
+        }
+        
+        SkASSERT(fResultBitmap.getPixels());
+        fResultBitmap.setImmutable();
+        if (!provider.isVolatile()) {
+            if (SkBitmapCache::AddWH(desc, fResultBitmap)) {
+                provider.notifyAddedToCache();
+            }
+        }
+    }
+    
+    SkASSERT(fResultBitmap.getPixels());
+    
+    fInvMatrix.postScale(SkIntToScalar(dstW) / provider.width(),
+                         SkIntToScalar(dstH) / provider.height());
+    fQuality = kLow_SkFilterQuality;
+    return true;
+}
+
+/*
+ *  Modulo internal errors, this should always succeed *if* the matrix is downscaling
+ *  (in this case, we have the inverse, so it succeeds if fInvMatrix is upscaling)
+ */
+bool SkDefaultBitmapControllerState::processMediumRequest(const SkBitmapProvider& provider) {
+    SkASSERT(fQuality <= kMedium_SkFilterQuality);
+    if (fQuality != kMedium_SkFilterQuality) {
+        return false;
+    }
+    
+    // Our default return state is to downgrade the request to Low, w/ or w/o setting fBitmap
+    // to a valid bitmap.
+    fQuality = kLow_SkFilterQuality;
+    
+    SkSize invScaleSize;
+    if (!fInvMatrix.decomposeScale(&invScaleSize, nullptr)) {
+        return false;
+    }
+    SkScalar invScale = SkScalarSqrt(invScaleSize.width() * invScaleSize.height());
+    
+    if (invScale > SK_Scalar1) {
+        fCurrMip.reset(SkMipMapCache::FindAndRef(provider.makeCacheDesc()));
+        if (nullptr == fCurrMip.get()) {
+            SkBitmap orig;
+            if (!provider.asBitmap(&orig)) {
+                return false;
+            }
+            fCurrMip.reset(SkMipMapCache::AddAndRef(orig));
+            if (nullptr == fCurrMip.get()) {
+                return false;
+            }
+        }
+        // diagnostic for a crasher...
+        if (nullptr == fCurrMip->data()) {
+            sk_throw();
+        }
+        
+        SkScalar levelScale = SkScalarInvert(invScale);
+        SkMipMap::Level level;
+        if (fCurrMip->extractLevel(levelScale, &level)) {
+            SkScalar invScaleFixup = level.fScale;
+            fInvMatrix.postScale(invScaleFixup, invScaleFixup);
+            
+            const SkImageInfo info = provider.info().makeWH(level.fWidth, level.fHeight);
+            // todo: if we could wrap the fCurrMip in a pixelref, then we could just install
+            //       that here, and not need to explicitly track it ourselves.
+            return fResultBitmap.installPixels(info, level.fPixels, level.fRowBytes);
+        } else {
+            // failed to extract, so release the mipmap
+            fCurrMip.reset(nullptr);
+        }
+    }
+    return false;
+}
+
+SkDefaultBitmapControllerState::SkDefaultBitmapControllerState(const SkBitmapProvider& provider,
+                                                               const SkMatrix& inv,
+                                                               SkFilterQuality qual) {
+    fInvMatrix = inv;
+    fQuality = qual;
+
+    if (this->processHQRequest(provider) || this->processMediumRequest(provider)) {
+        SkASSERT(fResultBitmap.getPixels());
+    } else {
+        (void)provider.asBitmap(&fResultBitmap);
+        fResultBitmap.lockPixels();
+        // lock may fail to give us pixels
+    }
+    SkASSERT(fQuality <= kLow_SkFilterQuality);
+
+    // fResultBitmap.getPixels() may be null, but our caller knows to check fPixmap.addr()
+    // and will destroy us if it is nullptr.
+    fPixmap.reset(fResultBitmap.info(), fResultBitmap.getPixels(), fResultBitmap.rowBytes(),
+                  fResultBitmap.getColorTable());
+}
+
+SkBitmapController::State* SkDefaultBitmapController::onRequestBitmap(const SkBitmapProvider& bm,
+                                                                      const SkMatrix& inverse,
+                                                                      SkFilterQuality quality,
+                                                                      void* storage, size_t size) {
+    return SkInPlaceNewCheck<SkDefaultBitmapControllerState>(storage, size, bm, inverse, quality);
+}
+
diff --git a/gfx/skia/skia/src/core/SkBitmapController.h b/gfx/skia/skia/src/core/SkBitmapController.h
new file mode 100644
index 000000000000..32e73e813d33
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkBitmapController.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkBitmapController_DEFINED
+#define SkBitmapController_DEFINED
+
+#include "SkBitmap.h"
+#include "SkBitmapCache.h"
+#include "SkFilterQuality.h"
+#include "SkMatrix.h"
+
+class SkBitmapProvider;
+
+/**
+ *  Handles request to scale, filter, and lock a bitmap to be rasterized.
+ */
+class SkBitmapController : ::SkNoncopyable {
+public:
+    class State : ::SkNoncopyable {
+    public:
+        virtual ~State() {}
+
+        const SkPixmap& pixmap() const { return fPixmap; }
+        const SkMatrix& invMatrix() const { return fInvMatrix; }
+        SkFilterQuality quality() const { return fQuality; }
+    
+    protected:
+        SkPixmap        fPixmap;
+        SkMatrix        fInvMatrix;
+        SkFilterQuality fQuality;
+    
+    private:
+        friend class SkBitmapController;
+    };
+
+    virtual ~SkBitmapController() {}
+
+    State* requestBitmap(const SkBitmapProvider&, const SkMatrix& inverse, SkFilterQuality,
+                         void* storage, size_t storageSize);
+
+    State* requestBitmap(const SkBitmapProvider& bp, const SkMatrix& inv, SkFilterQuality quality) {
+        return this->requestBitmap(bp, inv, quality, nullptr, 0);
+    }
+
+protected:
+    virtual State* onRequestBitmap(const SkBitmapProvider&, const SkMatrix& inv, SkFilterQuality,
+                                   void* storage, size_t storageSize) = 0;
+};
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+class SkDefaultBitmapController : public SkBitmapController {
+public:
+    SkDefaultBitmapController() {}
+    
+protected:
+    State* onRequestBitmap(const SkBitmapProvider&, const SkMatrix& inverse, SkFilterQuality,
+                           void* storage, size_t storageSize) override;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/core/SkBitmapDevice.cpp b/gfx/skia/skia/src/core/SkBitmapDevice.cpp
index 09b3b605f85a..ac3b9df0827e 100644
--- a/gfx/skia/skia/src/core/SkBitmapDevice.cpp
+++ b/gfx/skia/skia/src/core/SkBitmapDevice.cpp
@@ -8,9 +8,17 @@
 #include "SkBitmapDevice.h"
 #include "SkConfig8888.h"
 #include "SkDraw.h"
-#include "SkRasterClip.h"
+#include "SkMallocPixelRef.h"
+#include "SkMatrix.h"
+#include "SkPaint.h"
+#include "SkPath.h"
+#include "SkPixelRef.h"
+#include "SkPixmap.h"
 #include "SkShader.h"
 #include "SkSurface.h"
+#include "SkXfermode.h"
+
+class SkColorTable;
 
 #define CHECK_FOR_ANNOTATION(paint) \
     do { if (paint.getAnnotation()) { return; } } while (0)
@@ -24,7 +32,7 @@ static bool valid_for_bitmap_device(const SkImageInfo& info,
     // TODO: can we stop supporting kUnknown in SkBitmkapDevice?
     if (kUnknown_SkColorType == info.colorType()) {
         if (newAlphaType) {
-            *newAlphaType = kIgnore_SkAlphaType;
+            *newAlphaType = kUnknown_SkAlphaType;
         }
         return true;
     }
@@ -57,50 +65,63 @@ static bool valid_for_bitmap_device(const SkImageInfo& info,
     return true;
 }
 
-SkBitmapDevice::SkBitmapDevice(const SkBitmap& bitmap) : fBitmap(bitmap) {
-    SkASSERT(valid_for_bitmap_device(bitmap.info(), NULL));
+SkBitmapDevice::SkBitmapDevice(const SkBitmap& bitmap)
+    : INHERITED(SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType))
+    , fBitmap(bitmap) {
+    SkASSERT(valid_for_bitmap_device(bitmap.info(), nullptr));
 }
 
-SkBitmapDevice::SkBitmapDevice(const SkBitmap& bitmap, const SkDeviceProperties& deviceProperties)
-    : SkBaseDevice(deviceProperties)
-    , fBitmap(bitmap)
-{
-    SkASSERT(valid_for_bitmap_device(bitmap.info(), NULL));
+SkBitmapDevice* SkBitmapDevice::Create(const SkImageInfo& info) {
+    return Create(info, SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType));
+}
+
+SkBitmapDevice::SkBitmapDevice(const SkBitmap& bitmap, const SkSurfaceProps& surfaceProps)
+    : INHERITED(surfaceProps)
+    , fBitmap(bitmap) {
+    SkASSERT(valid_for_bitmap_device(bitmap.info(), nullptr));
 }
 
 SkBitmapDevice* SkBitmapDevice::Create(const SkImageInfo& origInfo,
-                                       const SkDeviceProperties* props) {
-    SkImageInfo info = origInfo;
-    if (!valid_for_bitmap_device(info, &info.fAlphaType)) {
-        return NULL;
+                                       const SkSurfaceProps& surfaceProps) {
+    SkAlphaType newAT = origInfo.alphaType();
+    if (!valid_for_bitmap_device(origInfo, &newAT)) {
+        return nullptr;
     }
 
+    const SkImageInfo info = origInfo.makeAlphaType(newAT);
     SkBitmap bitmap;
 
     if (kUnknown_SkColorType == info.colorType()) {
         if (!bitmap.setInfo(info)) {
-            return NULL;
+            return nullptr;
+        }
+    } else if (bitmap.info().isOpaque()) {
+        // If this bitmap is opaque, we don't have any sensible default color,
+        // so we just return uninitialized pixels.
+        if (!bitmap.tryAllocPixels(info)) {
+            return nullptr;
         }
     } else {
-        if (!bitmap.allocPixels(info)) {
-            return NULL;
-        }
-        if (!bitmap.info().isOpaque()) {
-            bitmap.eraseColor(SK_ColorTRANSPARENT);
+        // This bitmap has transparency, so we'll zero the pixels (to transparent).
+        // We use a ZeroedPRFactory as a faster alloc-then-eraseColor(SK_ColorTRANSPARENT).
+        SkMallocPixelRef::ZeroedPRFactory factory;
+        if (!bitmap.tryAllocPixels(info, &factory, nullptr/*color table*/)) {
+            return nullptr;
         }
     }
 
-    if (props) {
-        return SkNEW_ARGS(SkBitmapDevice, (bitmap, *props));
-    } else {
-        return SkNEW_ARGS(SkBitmapDevice, (bitmap));
-    }
+    return new SkBitmapDevice(bitmap, surfaceProps);
 }
 
 SkImageInfo SkBitmapDevice::imageInfo() const {
     return fBitmap.info();
 }
 
+void SkBitmapDevice::setNewSize(const SkISize& size) {
+    SkASSERT(!fBitmap.pixelRef());
+    fBitmap.setInfo(fBitmap.info().makeWH(size.fWidth, size.fHeight));
+}
+
 void SkBitmapDevice::replaceBitmapBackendForRasterSurface(const SkBitmap& bm) {
     SkASSERT(bm.width() == fBitmap.width());
     SkASSERT(bm.height() == fBitmap.height());
@@ -108,51 +129,41 @@ void SkBitmapDevice::replaceBitmapBackendForRasterSurface(const SkBitmap& bm) {
     fBitmap.lockPixels();
 }
 
-SkBaseDevice* SkBitmapDevice::onCreateDevice(const SkImageInfo& info, Usage usage) {
-    return SkBitmapDevice::Create(info, &this->getDeviceProperties());
-}
-
-void SkBitmapDevice::lockPixels() {
-    if (fBitmap.lockPixelsAreWritable()) {
-        fBitmap.lockPixels();
-    }
-}
-
-void SkBitmapDevice::unlockPixels() {
-    if (fBitmap.lockPixelsAreWritable()) {
-        fBitmap.unlockPixels();
-    }
-}
-
-void SkBitmapDevice::clear(SkColor color) {
-    fBitmap.eraseColor(color);
+SkBaseDevice* SkBitmapDevice::onCreateDevice(const CreateInfo& cinfo, const SkPaint*) {
+    const SkSurfaceProps surfaceProps(this->surfaceProps().flags(), cinfo.fPixelGeometry);
+    return SkBitmapDevice::Create(cinfo.fInfo, surfaceProps);
 }
 
 const SkBitmap& SkBitmapDevice::onAccessBitmap() {
     return fBitmap;
 }
 
-void* SkBitmapDevice::onAccessPixels(SkImageInfo* info, size_t* rowBytes) {
-    if (fBitmap.getPixels()) {
-        *info = fBitmap.info();
-        *rowBytes = fBitmap.rowBytes();
-        return fBitmap.getPixels();
+bool SkBitmapDevice::onAccessPixels(SkPixmap* pmap) {
+    if (fBitmap.lockPixelsAreWritable() && this->onPeekPixels(pmap)) {
+        fBitmap.notifyPixelsChanged();
+        return true;
     }
-    return NULL;
+    return false;
 }
 
-#include "SkConfig8888.h"
+bool SkBitmapDevice::onPeekPixels(SkPixmap* pmap) {
+    const SkImageInfo info = fBitmap.info();
+    if (fBitmap.getPixels() && (kUnknown_SkColorType != info.colorType())) {
+        SkColorTable* ctable = nullptr;
+        pmap->reset(fBitmap.info(), fBitmap.getPixels(), fBitmap.rowBytes(), ctable);
+        return true;
+    }
+    return false;
+}
 
 bool SkBitmapDevice::onWritePixels(const SkImageInfo& srcInfo, const void* srcPixels,
                                    size_t srcRowBytes, int x, int y) {
     // since we don't stop creating un-pixeled devices yet, check for no pixels here
-    if (NULL == fBitmap.getPixels()) {
+    if (nullptr == fBitmap.getPixels()) {
         return false;
     }
 
-    SkImageInfo dstInfo = fBitmap.info();
-    dstInfo.fWidth = srcInfo.width();
-    dstInfo.fHeight = srcInfo.height();
+    const SkImageInfo dstInfo = fBitmap.info().makeWH(srcInfo.width(), srcInfo.height());
 
     void* dstPixels = fBitmap.getAddr(x, y);
     size_t dstRowBytes = fBitmap.rowBytes();
@@ -169,6 +180,20 @@ bool SkBitmapDevice::onReadPixels(const SkImageInfo& dstInfo, void* dstPixels, s
     return fBitmap.readPixels(dstInfo, dstPixels, dstRowBytes, x, y);
 }
 
+void SkBitmapDevice::onAttachToCanvas(SkCanvas* canvas) {
+    INHERITED::onAttachToCanvas(canvas);
+    if (fBitmap.lockPixelsAreWritable()) {
+        fBitmap.lockPixels();
+    }
+}
+
+void SkBitmapDevice::onDetachFromCanvas() {
+    INHERITED::onDetachFromCanvas();
+    if (fBitmap.lockPixelsAreWritable()) {
+        fBitmap.unlockPixels();
+    }
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkBitmapDevice::drawPaint(const SkDraw& draw, const SkPaint& paint) {
@@ -193,7 +218,7 @@ void SkBitmapDevice::drawOval(const SkDraw& draw, const SkRect& oval, const SkPa
     path.addOval(oval);
     // call the VIRTUAL version, so any subclasses who do handle drawPath aren't
     // required to override drawOval.
-    this->drawPath(draw, path, paint, NULL, true);
+    this->drawPath(draw, path, paint, nullptr, true);
 }
 
 void SkBitmapDevice::drawRRect(const SkDraw& draw, const SkRRect& rrect, const SkPaint& paint) {
@@ -205,7 +230,7 @@ void SkBitmapDevice::drawRRect(const SkDraw& draw, const SkRRect& rrect, const S
     path.addRRect(rrect);
     // call the VIRTUAL version, so any subclasses who do handle drawPath aren't
     // required to override drawRRect.
-    this->drawPath(draw, path, paint, NULL, true);
+    this->drawPath(draw, path, paint, nullptr, true);
 #else
     draw.drawRRect(rrect, paint);
 #endif
@@ -220,13 +245,12 @@ void SkBitmapDevice::drawPath(const SkDraw& draw, const SkPath& path,
 
 void SkBitmapDevice::drawBitmap(const SkDraw& draw, const SkBitmap& bitmap,
                                 const SkMatrix& matrix, const SkPaint& paint) {
-    draw.drawBitmap(bitmap, matrix, paint);
+    draw.drawBitmap(bitmap, matrix, nullptr, paint);
 }
 
 void SkBitmapDevice::drawBitmapRect(const SkDraw& draw, const SkBitmap& bitmap,
                                     const SkRect* src, const SkRect& dst,
-                                    const SkPaint& paint,
-                                    SkCanvas::DrawBitmapRectFlags flags) {
+                                    const SkPaint& paint, SkCanvas::SrcRectConstraint constraint) {
     SkMatrix    matrix;
     SkRect      bitmapBounds, tmpSrc, tmpDst;
     SkBitmap    tmpBitmap;
@@ -258,10 +282,15 @@ void SkBitmapDevice::drawBitmapRect(const SkDraw& draw, const SkBitmap& bitmap,
 
         // since we may need to clamp to the borders of the src rect within
         // the bitmap, we extract a subset.
-        SkIRect srcIR;
-        tmpSrc.roundOut(&srcIR);
-        if (!bitmap.extractSubset(&tmpBitmap, srcIR)) {
-            return;
+        const SkIRect srcIR = tmpSrc.roundOut();
+        if(bitmap.pixelRef()->getTexture()) {
+            // Accelerated source canvas, don't use extractSubset but readPixels to get the subset.
+            // This way, the pixels are copied in CPU memory instead of GPU memory.
+            bitmap.pixelRef()->readPixels(&tmpBitmap, &srcIR);
+        } else {
+            if (!bitmap.extractSubset(&tmpBitmap, srcIR)) {
+                return;
+            }
         }
         bitmapPtr = &tmpBitmap;
 
@@ -288,7 +317,7 @@ void SkBitmapDevice::drawBitmapRect(const SkDraw& draw, const SkBitmap& bitmap,
         // We can go faster by just calling drawBitmap, which will concat the
         // matrix with the CTM, and try to call drawSprite if it can. If not,
         // it will make a shader and call drawRect, as we do below.
-        this->drawBitmap(draw, *bitmapPtr, matrix, paint);
+        draw.drawBitmap(*bitmapPtr, matrix, dstPtr, paint);
         return;
     }
 
@@ -297,7 +326,7 @@ void SkBitmapDevice::drawBitmapRect(const SkDraw& draw, const SkBitmap& bitmap,
                                                SkShader::kClamp_TileMode,
                                                SkShader::kClamp_TileMode,
                                                &matrix);
-    if (NULL == s) {
+    if (nullptr == s) {
         return;
     }
 
@@ -321,16 +350,9 @@ void SkBitmapDevice::drawText(const SkDraw& draw, const void* text, size_t len,
 }
 
 void SkBitmapDevice::drawPosText(const SkDraw& draw, const void* text, size_t len,
-                                 const SkScalar xpos[], SkScalar y,
-                                 int scalarsPerPos, const SkPaint& paint) {
-    draw.drawPosText((const char*)text, len, xpos, y, scalarsPerPos, paint);
-}
-
-void SkBitmapDevice::drawTextOnPath(const SkDraw& draw, const void* text,
-                                    size_t len, const SkPath& path,
-                                    const SkMatrix* matrix,
-                                    const SkPaint& paint) {
-    draw.drawTextOnPath((const char*)text, len, path, matrix, paint);
+                                 const SkScalar xpos[], int scalarsPerPos,
+                                 const SkPoint& offset, const SkPaint& paint) {
+    draw.drawPosText((const char*)text, len, xpos, scalarsPerPos, offset, paint);
 }
 
 void SkBitmapDevice::drawVertices(const SkDraw& draw, SkCanvas::VertexMode vmode,
@@ -345,47 +367,30 @@ void SkBitmapDevice::drawVertices(const SkDraw& draw, SkCanvas::VertexMode vmode
 
 void SkBitmapDevice::drawDevice(const SkDraw& draw, SkBaseDevice* device,
                                 int x, int y, const SkPaint& paint) {
-    const SkBitmap& src = device->accessBitmap(false);
-    draw.drawSprite(src, x, y, paint);
+    draw.drawSprite(static_cast<SkBitmapDevice*>(device)->fBitmap, x, y, paint);
 }
 
-SkSurface* SkBitmapDevice::newSurface(const SkImageInfo& info) {
-    return SkSurface::NewRaster(info);
+SkSurface* SkBitmapDevice::newSurface(const SkImageInfo& info, const SkSurfaceProps& props) {
+    return SkSurface::NewRaster(info, &props);
 }
 
-const void* SkBitmapDevice::peekPixels(SkImageInfo* info, size_t* rowBytes) {
-    const SkImageInfo bmInfo = fBitmap.info();
-    if (fBitmap.getPixels() && (kUnknown_SkColorType != bmInfo.colorType())) {
-        if (info) {
-            *info = bmInfo;
-        }
-        if (rowBytes) {
-            *rowBytes = fBitmap.rowBytes();
-        }
-        return fBitmap.getPixels();
-    }
-    return NULL;
+SkImageFilter::Cache* SkBitmapDevice::getImageFilterCache() {
+    SkImageFilter::Cache* cache = SkImageFilter::Cache::Get();
+    cache->ref();
+    return cache;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-bool SkBitmapDevice::filterTextFlags(const SkPaint& paint, TextFlags* flags) {
-    if (!paint.isLCDRenderText() || !paint.isAntiAlias()) {
-        // we're cool with the paint as is
-        return false;
-    }
-
+bool SkBitmapDevice::onShouldDisableLCD(const SkPaint& paint) const {
     if (kN32_SkColorType != fBitmap.colorType() ||
         paint.getRasterizer() ||
         paint.getPathEffect() ||
         paint.isFakeBoldText() ||
         paint.getStyle() != SkPaint::kFill_Style ||
-        !SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode)) {
-        // turn off lcd
-        flags->fFlags = paint.getFlags() & ~SkPaint::kLCDRenderText_Flag;
-        flags->fHinting = paint.getHinting();
+        !SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode))
+    {
         return true;
     }
-    // we're cool with the paint as is
     return false;
 }
diff --git a/gfx/skia/skia/src/core/SkBitmapFilter.cpp b/gfx/skia/skia/src/core/SkBitmapFilter.cpp
index a9c3223fbc73..55a7092ba784 100644
--- a/gfx/skia/skia/src/core/SkBitmapFilter.cpp
+++ b/gfx/skia/skia/src/core/SkBitmapFilter.cpp
@@ -5,144 +5,36 @@
  * found in the LICENSE file.
  */
 
-#include "SkErrorInternals.h"
-#include "SkConvolver.h"
-#include "SkBitmapProcState.h"
-#include "SkBitmap.h"
-#include "SkColor.h"
-#include "SkColorPriv.h"
-#include "SkConvolver.h"
-#include "SkUnPreMultiply.h"
-#include "SkShader.h"
+#include "SkBitmapFilter.h"
 #include "SkRTConf.h"
-#include "SkMath.h"
+#include "SkTypes.h"
+
+#include <string.h>
 
 // These are the per-scanline callbacks that are used when we must resort to
 // resampling an image as it is blitted.  Typically these are used only when
 // the image is rotated or has some other complex transformation applied.
 // Scaled images will usually be rescaled directly before rasterization.
 
-namespace {
-
-template <typename Color, typename ColorPacker>
-void highQualityFilter(ColorPacker pack, const SkBitmapProcState& s, int x, int y, Color* SK_RESTRICT colors, int count) {
-    const int maxX = s.fBitmap->width();
-    const int maxY = s.fBitmap->height();
-
-    while (count-- > 0) {
-        SkPoint srcPt;
-        s.fInvProc(s.fInvMatrix, x + 0.5f,
-                    y + 0.5f, &srcPt);
-        srcPt.fX -= SK_ScalarHalf;
-        srcPt.fY -= SK_ScalarHalf;
-
-        SkScalar weight = 0;
-        SkScalar fr = 0, fg = 0, fb = 0, fa = 0;
-
-        int y0 = SkClampMax(SkScalarCeilToInt(srcPt.fY-s.getBitmapFilter()->width()), maxY);
-        int y1 = SkClampMax(SkScalarFloorToInt(srcPt.fY+s.getBitmapFilter()->width()+1), maxY);
-        int x0 = SkClampMax(SkScalarCeilToInt(srcPt.fX-s.getBitmapFilter()->width()), maxX);
-        int x1 = SkClampMax(SkScalarFloorToInt(srcPt.fX+s.getBitmapFilter()->width())+1, maxX);
-
-        for (int srcY = y0; srcY < y1; srcY++) {
-            SkScalar yWeight = s.getBitmapFilter()->lookupScalar((srcPt.fY - srcY));
-
-            for (int srcX = x0; srcX < x1 ; srcX++) {
-                SkScalar xWeight = s.getBitmapFilter()->lookupScalar((srcPt.fX - srcX));
-
-                SkScalar combined_weight = SkScalarMul(xWeight, yWeight);
-
-                SkPMColor c = *s.fBitmap->getAddr32(srcX, srcY);
-                fr += combined_weight * SkGetPackedR32(c);
-                fg += combined_weight * SkGetPackedG32(c);
-                fb += combined_weight * SkGetPackedB32(c);
-                fa += combined_weight * SkGetPackedA32(c);
-                weight += combined_weight;
-            }
-        }
-
-        fr = SkScalarDiv(fr, weight);
-        fg = SkScalarDiv(fg, weight);
-        fb = SkScalarDiv(fb, weight);
-        fa = SkScalarDiv(fa, weight);
-
-        int a = SkClampMax(SkScalarRoundToInt(fa), 255);
-        int r = SkClampMax(SkScalarRoundToInt(fr), a);
-        int g = SkClampMax(SkScalarRoundToInt(fg), a);
-        int b = SkClampMax(SkScalarRoundToInt(fb), a);
-
-        *colors++ = pack(a, r, g, b);
-
-        x++;
-    }
-}
-
-uint16_t PackTo565(int /*a*/, int r, int g, int b) {
-    return SkPack888ToRGB16(r, g, b);
-}
-
-}  // namespace
-
-void highQualityFilter32(const SkBitmapProcState& s, int x, int y, SkPMColor* SK_RESTRICT colors, int count) {
-    highQualityFilter(&SkPackARGB32, s, x, y, colors, count);
-}
-
-void highQualityFilter16(const SkBitmapProcState& s, int x, int y, uint16_t* SK_RESTRICT colors, int count) {
-    highQualityFilter(&PackTo565, s, x, y, colors, count);
-}
-
-
 SK_CONF_DECLARE(const char *, c_bitmapFilter, "bitmap.filter", "mitchell", "Which scanline bitmap filter to use [mitchell, lanczos, hamming, gaussian, triangle, box]");
 
 SkBitmapFilter *SkBitmapFilter::Allocate() {
     if (!strcmp(c_bitmapFilter, "mitchell")) {
-        return SkNEW_ARGS(SkMitchellFilter,(1.f/3.f,1.f/3.f));
+        return new SkMitchellFilter(1.f / 3.f, 1.f / 3.f);
     } else if (!strcmp(c_bitmapFilter, "lanczos")) {
-        return SkNEW(SkLanczosFilter);
+        return new SkLanczosFilter;
     } else if (!strcmp(c_bitmapFilter, "hamming")) {
-        return SkNEW(SkHammingFilter);
+        return new SkHammingFilter;
     } else if (!strcmp(c_bitmapFilter, "gaussian")) {
-        return SkNEW_ARGS(SkGaussianFilter,(2));
+        return new SkGaussianFilter(2);
     } else if (!strcmp(c_bitmapFilter, "triangle")) {
-        return SkNEW(SkTriangleFilter);
+        return new SkTriangleFilter;
     } else if (!strcmp(c_bitmapFilter, "box")) {
-        return SkNEW(SkBoxFilter);
+        return new SkBoxFilter;
     } else {
         SkDEBUGFAIL("Unknown filter type");
     }
 
-    return NULL;
+    return nullptr;
 }
 
-bool SkBitmapProcState::setBitmapFilterProcs() {
-    if (fFilterLevel != SkPaint::kHigh_FilterLevel) {
-        return false;
-    }
-
-    if (fAlphaScale != 256) {
-        return false;
-    }
-
-    // TODO: consider supporting other colortypes (e.g. 565, A8)
-    if (fBitmap->colorType() != kN32_SkColorType) {
-        return false;
-    }
-
-    // TODO: consider supporting repeat and mirror
-    if (SkShader::kClamp_TileMode != fTileModeX || SkShader::kClamp_TileMode != fTileModeY) {
-        return false;
-    }
-
-    // TODO: is this right?  do we want fBitmapFilter allocated even if we can't set shader procs?
-    if (fInvType & (SkMatrix::kAffine_Mask | SkMatrix::kScale_Mask)) {
-        fBitmapFilter = SkBitmapFilter::Allocate();
-    }
-
-    if (fInvType & SkMatrix::kScale_Mask) {
-        fShaderProc32 = highQualityFilter32;
-        fShaderProc16 = highQualityFilter16;
-        return true;
-    } else {
-        return false;
-    }
-}
diff --git a/gfx/skia/skia/src/core/SkBitmapFilter.h b/gfx/skia/skia/src/core/SkBitmapFilter.h
index 8ef0f6e1ded9..eb327d716c70 100644
--- a/gfx/skia/skia/src/core/SkBitmapFilter.h
+++ b/gfx/skia/skia/src/core/SkBitmapFilter.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2013 Google Inc.
  *
@@ -6,11 +5,12 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkBitmapFilter_DEFINED
 #define SkBitmapFilter_DEFINED
 
+#include "SkFixed.h"
 #include "SkMath.h"
+#include "SkScalar.h"
 
 // size of the precomputed bitmap filter tables for high quality filtering.
 // Used to precompute the shape of the filter kernel.
@@ -79,7 +79,7 @@ class SkMitchellFilter: public SkBitmapFilter {
       : SkBitmapFilter(width), B(b), C(c) {
       }
 
-      virtual float evaluate(float x) const SK_OVERRIDE {
+      float evaluate(float x) const override {
           x = fabsf(x);
           if (x > 2.f) {
               return 0;
@@ -102,7 +102,7 @@ class SkGaussianFilter: public SkBitmapFilter {
       : SkBitmapFilter(width), alpha(a), expWidth(expf(-alpha * width * width)) {
       }
 
-      virtual float evaluate(float x) const SK_OVERRIDE {
+      float evaluate(float x) const override {
           return SkTMax(0.f, float(expf(-alpha*x*x) - expWidth));
       }
   protected:
@@ -115,7 +115,7 @@ class SkTriangleFilter: public SkBitmapFilter {
       : SkBitmapFilter(width) {
       }
 
-      virtual float evaluate(float x) const SK_OVERRIDE {
+      float evaluate(float x) const override {
           return SkTMax(0.f, fWidth - fabsf(x));
       }
   protected:
@@ -127,7 +127,7 @@ class SkBoxFilter: public SkBitmapFilter {
       : SkBitmapFilter(width) {
       }
 
-      virtual float evaluate(float x) const SK_OVERRIDE {
+      float evaluate(float x) const override {
           return (x >= -fWidth && x < fWidth) ? 1.0f : 0.0f;
       }
   protected:
@@ -138,7 +138,7 @@ public:
     SkHammingFilter(float width=1.f)
     : SkBitmapFilter(width) {
     }
-    virtual float evaluate(float x) const SK_OVERRIDE {
+    float evaluate(float x) const override {
         if (x <= -fWidth || x >= fWidth) {
             return 0.0f;  // Outside of the window.
         }
@@ -158,7 +158,7 @@ class SkLanczosFilter: public SkBitmapFilter {
       : SkBitmapFilter(width) {
       }
 
-      virtual float evaluate(float x) const SK_OVERRIDE {
+      float evaluate(float x) const override {
           if (x <= -fWidth || x >= fWidth) {
               return 0.0f;  // Outside of the window.
           }
diff --git a/gfx/skia/skia/src/core/SkBitmapHeap.cpp b/gfx/skia/skia/src/core/SkBitmapHeap.cpp
index efaa23fc64ac..c65a704b5ae7 100644
--- a/gfx/skia/skia/src/core/SkBitmapHeap.cpp
+++ b/gfx/skia/skia/src/core/SkBitmapHeap.cpp
@@ -7,10 +7,7 @@
  */
 
 #include "SkBitmapHeap.h"
-
 #include "SkBitmap.h"
-#include "SkReadBuffer.h"
-#include "SkWriteBuffer.h"
 #include "SkTSearch.h"
 
 SkBitmapHeapEntry::SkBitmapHeapEntry()
@@ -68,9 +65,9 @@ bool SkBitmapHeap::LookupEntry::Less(const SkBitmapHeap::LookupEntry& a,
 
 SkBitmapHeap::SkBitmapHeap(int32_t preferredSize, int32_t ownerCount)
     : INHERITED()
-    , fExternalStorage(NULL)
-    , fMostRecentlyUsed(NULL)
-    , fLeastRecentlyUsed(NULL)
+    , fExternalStorage(nullptr)
+    , fMostRecentlyUsed(nullptr)
+    , fLeastRecentlyUsed(nullptr)
     , fPreferredCount(preferredSize)
     , fOwnerCount(ownerCount)
     , fBytesAllocated(0)
@@ -80,8 +77,8 @@ SkBitmapHeap::SkBitmapHeap(int32_t preferredSize, int32_t ownerCount)
 SkBitmapHeap::SkBitmapHeap(ExternalStorage* storage, int32_t preferredSize)
     : INHERITED()
     , fExternalStorage(storage)
-    , fMostRecentlyUsed(NULL)
-    , fLeastRecentlyUsed(NULL)
+    , fMostRecentlyUsed(nullptr)
+    , fLeastRecentlyUsed(nullptr)
     , fPreferredCount(preferredSize)
     , fOwnerCount(IGNORE_OWNERS)
     , fBytesAllocated(0)
@@ -111,55 +108,42 @@ SkBitmapHeap::~SkBitmapHeap() {
     fLookupTable.deleteAll();
 }
 
-SkTRefArray<SkBitmap>* SkBitmapHeap::extractBitmaps() const {
-    const int size = fStorage.count();
-    SkTRefArray<SkBitmap>* array = NULL;
-    if (size > 0) {
-        array = SkTRefArray<SkBitmap>::Create(size);
-        for (int i = 0; i < size; i++) {
-            // make a shallow copy of the bitmap
-            array->writableAt(i) = fStorage[i]->fBitmap;
-        }
-    }
-    return array;
-}
-
 void SkBitmapHeap::removeFromLRU(SkBitmapHeap::LookupEntry* entry) {
     if (fMostRecentlyUsed == entry) {
         fMostRecentlyUsed = entry->fLessRecentlyUsed;
-        if (NULL == fMostRecentlyUsed) {
+        if (nullptr == fMostRecentlyUsed) {
             SkASSERT(fLeastRecentlyUsed == entry);
-            fLeastRecentlyUsed = NULL;
+            fLeastRecentlyUsed = nullptr;
         } else {
-            fMostRecentlyUsed->fMoreRecentlyUsed = NULL;
+            fMostRecentlyUsed->fMoreRecentlyUsed = nullptr;
         }
     } else {
         // Remove entry from its prior place, and make sure to cover the hole.
         if (fLeastRecentlyUsed == entry) {
-            SkASSERT(entry->fMoreRecentlyUsed != NULL);
+            SkASSERT(entry->fMoreRecentlyUsed != nullptr);
             fLeastRecentlyUsed = entry->fMoreRecentlyUsed;
         }
         // Since we have already considered the case where entry is the most recently used, it must
         // have a more recently used at this point.
-        SkASSERT(entry->fMoreRecentlyUsed != NULL);
+        SkASSERT(entry->fMoreRecentlyUsed != nullptr);
         entry->fMoreRecentlyUsed->fLessRecentlyUsed = entry->fLessRecentlyUsed;
 
-        if (entry->fLessRecentlyUsed != NULL) {
+        if (entry->fLessRecentlyUsed != nullptr) {
             SkASSERT(fLeastRecentlyUsed != entry);
             entry->fLessRecentlyUsed->fMoreRecentlyUsed = entry->fMoreRecentlyUsed;
         }
     }
-    entry->fMoreRecentlyUsed = NULL;
+    entry->fMoreRecentlyUsed = nullptr;
 }
 
 void SkBitmapHeap::appendToLRU(SkBitmapHeap::LookupEntry* entry) {
-    if (fMostRecentlyUsed != NULL) {
-        SkASSERT(NULL == fMostRecentlyUsed->fMoreRecentlyUsed);
+    if (fMostRecentlyUsed != nullptr) {
+        SkASSERT(nullptr == fMostRecentlyUsed->fMoreRecentlyUsed);
         fMostRecentlyUsed->fMoreRecentlyUsed = entry;
         entry->fLessRecentlyUsed = fMostRecentlyUsed;
     }
     fMostRecentlyUsed = entry;
-    if (NULL == fLeastRecentlyUsed) {
+    if (nullptr == fLeastRecentlyUsed) {
         fLeastRecentlyUsed = entry;
     }
 }
@@ -170,13 +154,13 @@ SkBitmapHeap::LookupEntry* SkBitmapHeap::findEntryToReplace(const SkBitmap& repl
     SkASSERT(fStorage.count() >= fPreferredCount);
 
     SkBitmapHeap::LookupEntry* iter = fLeastRecentlyUsed;
-    while (iter != NULL) {
+    while (iter != nullptr) {
         SkBitmapHeapEntry* heapEntry = fStorage[iter->fStorageSlot];
         if (heapEntry->fRefCount > 0) {
             // If the least recently used bitmap has not been unreferenced
             // by its owner, then according to our LRU specifications a more
             // recently used one can not have used all its references yet either.
-            return NULL;
+            return nullptr;
         }
         if (replacement.getGenerationID() == iter->fGenerationId) {
             // Do not replace a bitmap with a new one using the same
@@ -187,7 +171,7 @@ SkBitmapHeap::LookupEntry* SkBitmapHeap::findEntryToReplace(const SkBitmap& repl
             return iter;
         }
     }
-    return NULL;
+    return nullptr;
 }
 
 size_t SkBitmapHeap::freeMemoryIfPossible(size_t bytesToFree) {
@@ -198,7 +182,7 @@ size_t SkBitmapHeap::freeMemoryIfPossible(size_t bytesToFree) {
     size_t origBytesAllocated = fBytesAllocated;
     // Purge starting from LRU until a non-evictable bitmap is found or until
     // everything is evicted.
-    while (iter != NULL) {
+    while (iter != nullptr) {
         SkBitmapHeapEntry* heapEntry = fStorage[iter->fStorageSlot];
         if (heapEntry->fRefCount > 0) {
             break;
@@ -219,15 +203,15 @@ size_t SkBitmapHeap::freeMemoryIfPossible(size_t bytesToFree) {
     if (fLeastRecentlyUsed != iter) {
         // There was at least one eviction.
         fLeastRecentlyUsed = iter;
-        if (NULL == fLeastRecentlyUsed) {
+        if (nullptr == fLeastRecentlyUsed) {
             // Everything was evicted
-            fMostRecentlyUsed = NULL;
+            fMostRecentlyUsed = nullptr;
             fBytesAllocated -= (fStorage.count() * sizeof(SkBitmapHeapEntry));
             fStorage.deleteAll();
             fUnusedSlots.reset();
             SkASSERT(0 == fBytesAllocated);
         } else {
-            fLeastRecentlyUsed->fLessRecentlyUsed = NULL;
+            fLeastRecentlyUsed->fLessRecentlyUsed = nullptr;
         }
     }
 
@@ -243,8 +227,8 @@ int SkBitmapHeap::findInLookupTable(const LookupEntry& indexEntry, SkBitmapHeapE
     if (index < 0) {
         // insert ourselves into the bitmapIndex
         index = ~index;
-        *fLookupTable.insert(index) = SkNEW_ARGS(LookupEntry, (indexEntry));
-    } else if (entry != NULL) {
+        *fLookupTable.insert(index) = new LookupEntry(indexEntry);
+    } else if (entry != nullptr) {
         // populate the entry if needed
         *entry = fStorage[fLookupTable[index]->fStorageSlot];
     }
@@ -260,7 +244,7 @@ bool SkBitmapHeap::copyBitmap(const SkBitmap& originalBitmap, SkBitmap& copiedBi
     if (originalBitmap.isImmutable()) {
         copiedBitmap = originalBitmap;
 // TODO if we have the pixel ref in the heap we could pass it here to avoid a potential deep copy
-//    else if (sharedPixelRef != NULL) {
+//    else if (sharedPixelRef != nullptr) {
 //        copiedBitmap = orig;
 //        copiedBitmap.setPixelRef(sharedPixelRef, originalBitmap.pixelRefOffset());
     } else if (originalBitmap.empty()) {
@@ -275,18 +259,18 @@ bool SkBitmapHeap::copyBitmap(const SkBitmap& originalBitmap, SkBitmap& copiedBi
 int SkBitmapHeap::removeEntryFromLookupTable(LookupEntry* entry) {
     // remove the bitmap index for the deleted entry
     SkDEBUGCODE(int count = fLookupTable.count();)
-    int index = this->findInLookupTable(*entry, NULL);
+    int index = this->findInLookupTable(*entry, nullptr);
     // Verify that findInLookupTable found an existing entry rather than adding
     // a new entry to the lookup table.
     SkASSERT(count == fLookupTable.count());
     fBytesAllocated -= fStorage[entry->fStorageSlot]->fBytesAllocated;
-    SkDELETE(fLookupTable[index]);
+    delete fLookupTable[index];
     fLookupTable.remove(index);
     return index;
 }
 
 int32_t SkBitmapHeap::insert(const SkBitmap& originalBitmap) {
-    SkBitmapHeapEntry* entry = NULL;
+    SkBitmapHeapEntry* entry = nullptr;
     int searchIndex = this->findInLookupTable(LookupEntry(originalBitmap), &entry);
 
     if (entry) {
@@ -312,7 +296,7 @@ int32_t SkBitmapHeap::insert(const SkBitmap& originalBitmap) {
     if (fPreferredCount != UNLIMITED_SIZE && fStorage.count() >= fPreferredCount) {
         // iterate through our LRU cache and try to find an entry to evict
         LookupEntry* lookupEntry = this->findEntryToReplace(originalBitmap);
-        if (lookupEntry != NULL) {
+        if (lookupEntry != nullptr) {
             // we found an entry to evict
             entry = fStorage[lookupEntry->fStorageSlot];
             // Remove it from the LRU. The new entry will be added to the LRU later.
@@ -333,7 +317,7 @@ int32_t SkBitmapHeap::insert(const SkBitmap& originalBitmap) {
             fUnusedSlots.pop(&slot);
             entry = fStorage[slot];
         } else {
-            entry = SkNEW(SkBitmapHeapEntry);
+            entry = new SkBitmapHeapEntry;
             fStorage.append(1, &entry);
             entry->fSlot = fStorage.count() - 1;
             fBytesAllocated += sizeof(SkBitmapHeapEntry);
@@ -351,14 +335,14 @@ int32_t SkBitmapHeap::insert(const SkBitmap& originalBitmap) {
     // if the copy failed then we must abort
     if (!copySucceeded) {
         // delete the index
-        SkDELETE(fLookupTable[searchIndex]);
+        delete fLookupTable[searchIndex];
         fLookupTable.remove(searchIndex);
         // If entry is the last slot in storage, it is safe to delete it.
         if (fStorage.count() - 1 == entry->fSlot) {
             // free the slot
             fStorage.remove(entry->fSlot);
             fBytesAllocated -= sizeof(SkBitmapHeapEntry);
-            SkDELETE(entry);
+            delete entry;
         } else {
             fUnusedSlots.push(entry->fSlot);
         }
@@ -399,7 +383,7 @@ void SkBitmapHeap::endAddingOwnersDeferral(bool add) {
         for (int i = 0; i < fDeferredEntries.count(); i++) {
             SkASSERT(fOwnerCount != IGNORE_OWNERS);
             SkBitmapHeapEntry* heapEntry = this->getEntry(fDeferredEntries[i]);
-            SkASSERT(heapEntry != NULL);
+            SkASSERT(heapEntry != nullptr);
             heapEntry->addReferences(fOwnerCount);
         }
     }
diff --git a/gfx/skia/skia/src/core/SkBitmapHeap.h b/gfx/skia/skia/src/core/SkBitmapHeap.h
index 56ed3584e81c..22c31a0b0b18 100644
--- a/gfx/skia/skia/src/core/SkBitmapHeap.h
+++ b/gfx/skia/skia/src/core/SkBitmapHeap.h
@@ -1,19 +1,19 @@
-
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 #ifndef SkBitmapHeap_DEFINED
 #define SkBitmapHeap_DEFINED
 
+#include "SkAtomics.h"
 #include "SkBitmap.h"
-#include "SkFlattenable.h"
+#include "SkPoint.h"
 #include "SkRefCnt.h"
 #include "SkTDArray.h"
-#include "SkThread.h"
-#include "SkTRefArray.h"
+#include "SkTypes.h"
 
 /**
  * SkBitmapHeapEntry provides users of SkBitmapHeap (using internal storage) with a means to...
@@ -53,7 +53,7 @@ private:
 
 class SkBitmapHeapReader : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkBitmapHeapReader)
+
 
     SkBitmapHeapReader() : INHERITED() {}
     virtual SkBitmap* getBitmap(int32_t slot) const = 0;
@@ -70,7 +70,7 @@ class SkBitmapHeap : public SkBitmapHeapReader {
 public:
     class ExternalStorage : public SkRefCnt {
      public:
-        SK_DECLARE_INST_COUNT(ExternalStorage)
+
 
         virtual bool insert(const SkBitmap& bitmap, int32_t slot) = 0;
 
@@ -113,35 +113,27 @@ public:
 
     virtual ~SkBitmapHeap();
 
-    /**
-     * Makes a shallow copy of all bitmaps currently in the heap and returns them as an array. The
-     * array indices match their position in the heap.
-     *
-     * @return  a ptr to an array of bitmaps or NULL if external storage is being used.
-     */
-    SkTRefArray<SkBitmap>* extractBitmaps() const;
-
     /**
      * Retrieves the bitmap from the specified slot in the heap
      *
-     * @return  The bitmap located at that slot or NULL if external storage is being used.
+     * @return  The bitmap located at that slot or nullptr if external storage is being used.
      */
-    virtual SkBitmap* getBitmap(int32_t slot) const SK_OVERRIDE {
-        SkASSERT(fExternalStorage == NULL);
+    SkBitmap* getBitmap(int32_t slot) const override {
+        SkASSERT(fExternalStorage == nullptr);
         SkBitmapHeapEntry* entry = getEntry(slot);
         if (entry) {
             return &entry->fBitmap;
         }
-        return NULL;
+        return nullptr;
     }
 
     /**
      * Retrieves the bitmap from the specified slot in the heap
      *
-     * @return  The bitmap located at that slot or NULL if external storage is being used.
+     * @return  The bitmap located at that slot or nullptr if external storage is being used.
      */
-    virtual void releaseRef(int32_t slot) SK_OVERRIDE {
-        SkASSERT(fExternalStorage == NULL);
+    void releaseRef(int32_t slot) override {
+        SkASSERT(fExternalStorage == nullptr);
         if (fOwnerCount != IGNORE_OWNERS) {
             SkBitmapHeapEntry* entry = getEntry(slot);
             if (entry) {
@@ -166,12 +158,12 @@ public:
      * Retrieves an entry from the heap at a given slot.
      *
      * @param slot  the slot in the heap where a bitmap was stored.
-     * @return  a SkBitmapHeapEntry that wraps the bitmap or NULL if external storage is used.
+     * @return  a SkBitmapHeapEntry that wraps the bitmap or nullptr if external storage is used.
      */
     SkBitmapHeapEntry* getEntry(int32_t slot) const {
         SkASSERT(slot <= fStorage.count());
-        if (fExternalStorage != NULL) {
-            return NULL;
+        if (fExternalStorage != nullptr) {
+            return nullptr;
         }
         return fStorage[slot];
     }
@@ -180,7 +172,7 @@ public:
      * Returns a count of the number of items currently in the heap
      */
     int count() const {
-        SkASSERT(fExternalStorage != NULL ||
+        SkASSERT(fExternalStorage != nullptr ||
                  fStorage.count() - fUnusedSlots.count() == fLookupTable.count());
         return fLookupTable.count();
     }
@@ -223,8 +215,8 @@ private:
         , fPixelOrigin(bm.pixelRefOrigin())
         , fWidth(bm.width())
         , fHeight(bm.height())
-        , fMoreRecentlyUsed(NULL)
-        , fLessRecentlyUsed(NULL){}
+        , fMoreRecentlyUsed(nullptr)
+        , fLessRecentlyUsed(nullptr){}
 
         const uint32_t fGenerationId; // SkPixelRef GenerationID.
         const SkIPoint fPixelOrigin;
@@ -268,7 +260,7 @@ private:
     /**
      * Remove a LookupEntry from the LRU, in preparation for either deleting or appending as most
      * recent. Points the LookupEntry's old neighbors at each other, and sets fLeastRecentlyUsed
-     * (if there is still an entry left). Sets LookupEntry's fMoreRecentlyUsed to NULL and leaves
+     * (if there is still an entry left). Sets LookupEntry's fMoreRecentlyUsed to nullptr and leaves
      * its fLessRecentlyUsed unmodified.
      */
     void removeFromLRU(LookupEntry* entry);
diff --git a/gfx/skia/skia/src/core/SkBitmapProcShader.cpp b/gfx/skia/skia/src/core/SkBitmapProcShader.cpp
index e7cc035c7439..dd97380bbdb8 100644
--- a/gfx/skia/skia/src/core/SkBitmapProcShader.cpp
+++ b/gfx/skia/skia/src/core/SkBitmapProcShader.cpp
@@ -1,34 +1,29 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
+#include "SkBitmapProcShader.h"
+#include "SkBitmapProcState.h"
+#include "SkBitmapProvider.h"
 #include "SkColorPriv.h"
+#include "SkErrorInternals.h"
+#include "SkPixelRef.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
-#include "SkPixelRef.h"
-#include "SkErrorInternals.h"
-#include "SkBitmapProcShader.h"
 
 #if SK_SUPPORT_GPU
-#include "effects/GrSimpleTextureEffect.h"
+#include "SkGrPriv.h"
 #include "effects/GrBicubicEffect.h"
+#include "effects/GrSimpleTextureEffect.h"
 #endif
 
-bool SkBitmapProcShader::CanDo(const SkBitmap& bm, TileMode tx, TileMode ty) {
-    switch (bm.colorType()) {
-        case kAlpha_8_SkColorType:
-        case kRGB_565_SkColorType:
-        case kIndex_8_SkColorType:
-        case kN32_SkColorType:
-    //        if (tx == ty && (kClamp_TileMode == tx || kRepeat_TileMode == tx))
-                return true;
-        default:
-            break;
-    }
-    return false;
+size_t SkBitmapProcShader::ContextSize() {
+    // The SkBitmapProcState is stored outside of the context object, with the context holding
+    // a pointer to it.
+    return sizeof(BitmapProcShaderContext) + sizeof(SkBitmapProcState);
 }
 
 SkBitmapProcShader::SkBitmapProcShader(const SkBitmap& src, TileMode tmx, TileMode tmy,
@@ -39,17 +34,7 @@ SkBitmapProcShader::SkBitmapProcShader(const SkBitmap& src, TileMode tmx, TileMo
     fTileModeY = (uint8_t)tmy;
 }
 
-SkBitmapProcShader::SkBitmapProcShader(SkReadBuffer& buffer)
-        : INHERITED(buffer) {
-    buffer.readBitmap(&fRawBitmap);
-    fRawBitmap.setImmutable();
-    fTileModeX = buffer.readUInt();
-    fTileModeY = buffer.readUInt();
-}
-
-SkShader::BitmapType SkBitmapProcShader::asABitmap(SkBitmap* texture,
-                                                   SkMatrix* texM,
-                                                   TileMode xy[]) const {
+bool SkBitmapProcShader::onIsABitmap(SkBitmap* texture, SkMatrix* texM, TileMode xy[]) const {
     if (texture) {
         *texture = fRawBitmap;
     }
@@ -60,12 +45,24 @@ SkShader::BitmapType SkBitmapProcShader::asABitmap(SkBitmap* texture,
         xy[0] = (TileMode)fTileModeX;
         xy[1] = (TileMode)fTileModeY;
     }
-    return kDefault_BitmapType;
+    return true;
+}
+
+SkFlattenable* SkBitmapProcShader::CreateProc(SkReadBuffer& buffer) {
+    SkMatrix lm;
+    buffer.readMatrix(&lm);
+    SkBitmap bm;
+    if (!buffer.readBitmap(&bm)) {
+        return nullptr;
+    }
+    bm.setImmutable();
+    TileMode mx = (TileMode)buffer.readUInt();
+    TileMode my = (TileMode)buffer.readUInt();
+    return SkShader::CreateBitmapShader(bm, mx, my, &lm);
 }
 
 void SkBitmapProcShader::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
-
+    buffer.writeMatrix(this->getLocalMatrix());
     buffer.writeBitmap(fRawBitmap);
     buffer.writeUInt(fTileModeX);
     buffer.writeUInt(fTileModeY);
@@ -80,76 +77,55 @@ bool SkBitmapProcShader::isOpaque() const {
     return fRawBitmap.isOpaque();
 }
 
-static bool valid_for_drawing(const SkBitmap& bm) {
-    if (0 == bm.width() || 0 == bm.height()) {
-        return false;   // nothing to draw
-    }
-    if (NULL == bm.pixelRef()) {
-        return false;   // no pixels to read
-    }
-    if (kIndex_8_SkColorType == bm.colorType()) {
-        // ugh, I have to lock-pixels to inspect the colortable
-        SkAutoLockPixels alp(bm);
-        if (!bm.getColorTable()) {
-            return false;
-        }
-    }
-    return true;
-}
-
-SkShader::Context* SkBitmapProcShader::onCreateContext(const ContextRec& rec, void* storage) const {
-    if (!fRawBitmap.getTexture() && !valid_for_drawing(fRawBitmap)) {
-        return NULL;
-    }
-
+SkShader::Context* SkBitmapProcShader::MakeContext(const SkShader& shader,
+                                                   TileMode tmx, TileMode tmy,
+                                                   const SkBitmapProvider& provider,
+                                                   const ContextRec& rec, void* storage) {
     SkMatrix totalInverse;
     // Do this first, so we know the matrix can be inverted.
-    if (!this->computeTotalInverse(rec, &totalInverse)) {
-        return NULL;
+    if (!shader.computeTotalInverse(rec, &totalInverse)) {
+        return nullptr;
     }
 
     void* stateStorage = (char*)storage + sizeof(BitmapProcShaderContext);
-    SkBitmapProcState* state = SkNEW_PLACEMENT(stateStorage, SkBitmapProcState);
+    SkBitmapProcState* state = new (stateStorage) SkBitmapProcState(provider, tmx, tmy);
 
     SkASSERT(state);
-    state->fTileModeX = fTileModeX;
-    state->fTileModeY = fTileModeY;
-    state->fOrigBitmap = fRawBitmap;
     if (!state->chooseProcs(totalInverse, *rec.fPaint)) {
         state->~SkBitmapProcState();
-        return NULL;
+        return nullptr;
     }
 
-    return SkNEW_PLACEMENT_ARGS(storage, BitmapProcShaderContext, (*this, rec, state));
+    return new (storage) BitmapProcShaderContext(shader, rec, state);
 }
 
-size_t SkBitmapProcShader::contextSize() const {
-    // The SkBitmapProcState is stored outside of the context object, with the context holding
-    // a pointer to it.
-    return sizeof(BitmapProcShaderContext) + sizeof(SkBitmapProcState);
+SkShader::Context* SkBitmapProcShader::onCreateContext(const ContextRec& rec, void* storage) const {
+    return MakeContext(*this, (TileMode)fTileModeX, (TileMode)fTileModeY,
+                       SkBitmapProvider(fRawBitmap), rec, storage);
 }
 
-SkBitmapProcShader::BitmapProcShaderContext::BitmapProcShaderContext(
-        const SkBitmapProcShader& shader, const ContextRec& rec, SkBitmapProcState* state)
+SkBitmapProcShader::BitmapProcShaderContext::BitmapProcShaderContext(const SkShader& shader,
+                                                                     const ContextRec& rec,
+                                                                     SkBitmapProcState* state)
     : INHERITED(shader, rec)
     , fState(state)
 {
-    const SkBitmap& bitmap = *fState->fBitmap;
-    bool bitmapIsOpaque = bitmap.isOpaque();
+    const SkPixmap& pixmap = fState->fPixmap;
+    bool isOpaque = pixmap.isOpaque();
 
     // update fFlags
     uint32_t flags = 0;
-    if (bitmapIsOpaque && (255 == this->getPaintAlpha())) {
+    if (isOpaque && (255 == this->getPaintAlpha())) {
         flags |= kOpaqueAlpha_Flag;
     }
 
-    switch (bitmap.colorType()) {
+    switch (pixmap.colorType()) {
         case kRGB_565_SkColorType:
             flags |= (kHasSpan16_Flag | kIntrinsicly16_Flag);
             break;
         case kIndex_8_SkColorType:
         case kN32_SkColorType:
-            if (bitmapIsOpaque) {
+            if (isOpaque) {
                 flags |= kHasSpan16_Flag;
             }
             break;
@@ -159,14 +135,14 @@ SkBitmapProcShader::BitmapProcShaderContext::BitmapProcShaderContext(
             break;
     }
 
-    if (rec.fPaint->isDither() && bitmap.colorType() != kRGB_565_SkColorType) {
+    if (rec.fPaint->isDither() && pixmap.colorType() != kRGB_565_SkColorType) {
         // gradients can auto-dither in their 16bit sampler, but we don't so
         // we clear the flag here.
         flags &= ~kHasSpan16_Flag;
     }
 
     // if we're only 1-pixel high, and we don't rotate, then we can claim this
-    if (1 == bitmap.height() &&
+    if (1 == pixmap.height() &&
             only_scale_and_translate(this->getTotalInverse())) {
         flags |= kConstInY32_Flag;
         if (flags & kHasSpan16_Flag) {
@@ -207,9 +183,7 @@ void SkBitmapProcShader::BitmapProcShaderContext::shadeSpan(int x, int y, SkPMCo
     SkBitmapProcState::SampleProc32 sproc = state.getSampleProc32();
     int max = state.maxCountForBufferSize(sizeof(buffer[0]) * BUF_MAX);
 
-    SkASSERT(state.fBitmap->getPixels());
-    SkASSERT(state.fBitmap->pixelRef() == NULL ||
-             state.fBitmap->pixelRef()->isLocked());
+    SkASSERT(state.fPixmap.addr());
 
     for (;;) {
         int n = count;
@@ -244,7 +218,7 @@ SkShader::Context::ShadeProc SkBitmapProcShader::BitmapProcShaderContext::asASha
         *ctx = fState;
         return (ShadeProc)fState->getShaderProc32();
     }
-    return NULL;
+    return nullptr;
 }
 
 void SkBitmapProcShader::BitmapProcShaderContext::shadeSpan16(int x, int y, uint16_t dstC[],
@@ -260,9 +234,7 @@ void SkBitmapProcShader::BitmapProcShaderContext::shadeSpan16(int x, int y, uint
     SkBitmapProcState::SampleProc16 sproc = state.getSampleProc16();
     int max = state.maxCountForBufferSize(sizeof(buffer));
 
-    SkASSERT(state.fBitmap->getPixels());
-    SkASSERT(state.fBitmap->pixelRef() == NULL ||
-             state.fBitmap->pixelRef()->isLocked());
+    SkASSERT(state.fPixmap.addr());
 
     for (;;) {
         int n = count;
@@ -288,7 +260,12 @@ void SkBitmapProcShader::BitmapProcShaderContext::shadeSpan16(int x, int y, uint
 
 // returns true and set color if the bitmap can be drawn as a single color
 // (for efficiency)
-static bool canUseColorShader(const SkBitmap& bm, SkColor* color) {
+static bool can_use_color_shader(const SkBitmap& bm, SkColor* color) {
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+    // HWUI does not support color shaders (see b/22390304)
+    return false;
+#endif
+
     if (1 != bm.width() || 1 != bm.height()) {
         return false;
     }
@@ -314,36 +291,36 @@ static bool canUseColorShader(const SkBitmap& bm, SkColor* color) {
     return false;
 }
 
-static bool bitmapIsTooBig(const SkBitmap& bm) {
+static bool bitmap_is_too_big(const SkBitmap& bm) {
     // SkBitmapProcShader stores bitmap coordinates in a 16bit buffer, as it
     // communicates between its matrix-proc and its sampler-proc. Until we can
     // widen that, we have to reject bitmaps that are larger.
     //
-    const int maxSize = 65535;
+    static const int kMaxSize = 65535;
 
-    return bm.width() > maxSize || bm.height() > maxSize;
+    return bm.width() > kMaxSize || bm.height() > kMaxSize;
 }
 
-SkShader* CreateBitmapShader(const SkBitmap& src, SkShader::TileMode tmx,
-        SkShader::TileMode tmy, const SkMatrix* localMatrix, SkTBlitterAllocator* allocator) {
+SkShader* SkCreateBitmapShader(const SkBitmap& src, SkShader::TileMode tmx,
+                               SkShader::TileMode tmy, const SkMatrix* localMatrix,
+                               SkTBlitterAllocator* allocator) {
     SkShader* shader;
     SkColor color;
-    if (src.isNull() || bitmapIsTooBig(src)) {
-        if (NULL == allocator) {
-            shader = SkNEW(SkEmptyShader);
+    if (src.isNull() || bitmap_is_too_big(src)) {
+        if (nullptr == allocator) {
+            shader = new SkEmptyShader;
         } else {
             shader = allocator->createT<SkEmptyShader>();
         }
-    }
-    else if (canUseColorShader(src, &color)) {
-        if (NULL == allocator) {
-            shader = SkNEW_ARGS(SkColorShader, (color));
+    } else if (can_use_color_shader(src, &color)) {
+        if (nullptr == allocator) {
+            shader = new SkColorShader(color);
         } else {
             shader = allocator->createT<SkColorShader>(color);
         }
     } else {
-        if (NULL == allocator) {
-            shader = SkNEW_ARGS(SkBitmapProcShader, (src, tmx, tmy, localMatrix));
+        if (nullptr == allocator) {
+            shader = new SkBitmapProcShader(src, tmx, tmy, localMatrix);
         } else {
             shader = allocator->createT<SkBitmapProcShader>(src, tmx, tmy, localMatrix);
         }
@@ -379,23 +356,23 @@ void SkBitmapProcShader::toString(SkString* str) const {
 #if SK_SUPPORT_GPU
 
 #include "GrTextureAccess.h"
-#include "effects/GrSimpleTextureEffect.h"
 #include "SkGr.h"
+#include "effects/GrSimpleTextureEffect.h"
 
-bool SkBitmapProcShader::asNewEffect(GrContext* context, const SkPaint& paint,
-                                     const SkMatrix* localMatrix, GrColor* paintColor,
-                                     GrEffect** effect) const {
+const GrFragmentProcessor* SkBitmapProcShader::asFragmentProcessor(GrContext* context,
+                                             const SkMatrix& viewM, const SkMatrix* localMatrix,
+                                             SkFilterQuality filterQuality) const {
     SkMatrix matrix;
     matrix.setIDiv(fRawBitmap.width(), fRawBitmap.height());
 
     SkMatrix lmInverse;
     if (!this->getLocalMatrix().invert(&lmInverse)) {
-        return false;
+        return nullptr;
     }
     if (localMatrix) {
         SkMatrix inv;
         if (!localMatrix->invert(&inv)) {
-            return false;
+            return nullptr;
         }
         lmInverse.postConcat(inv);
     }
@@ -410,71 +387,30 @@ bool SkBitmapProcShader::asNewEffect(GrContext* context, const SkPaint& paint,
     // we check the matrix scale factors to determine how to interpret the filter quality setting.
     // This completely ignores the complexity of the drawVertices case where explicit local coords
     // are provided by the caller.
-    bool useBicubic = false;
-    GrTextureParams::FilterMode textureFilterMode;
-    switch(paint.getFilterLevel()) {
-        case SkPaint::kNone_FilterLevel:
-            textureFilterMode = GrTextureParams::kNone_FilterMode;
-            break;
-        case SkPaint::kLow_FilterLevel:
-            textureFilterMode = GrTextureParams::kBilerp_FilterMode;
-            break;
-        case SkPaint::kMedium_FilterLevel: {
-            SkMatrix matrix;
-            matrix.setConcat(context->getMatrix(), this->getLocalMatrix());
-            if (matrix.getMinScale() < SK_Scalar1) {
-                textureFilterMode = GrTextureParams::kMipMap_FilterMode;
-            } else {
-                // Don't trigger MIP level generation unnecessarily.
-                textureFilterMode = GrTextureParams::kBilerp_FilterMode;
-            }
-            break;
-        }
-        case SkPaint::kHigh_FilterLevel: {
-            SkMatrix matrix;
-            matrix.setConcat(context->getMatrix(), this->getLocalMatrix());
-            useBicubic = GrBicubicEffect::ShouldUseBicubic(matrix, &textureFilterMode);
-            break;
-        }
-        default:
-            SkErrorInternals::SetError( kInvalidPaint_SkError,
-                                        "Sorry, I don't understand the filtering "
-                                        "mode you asked for.  Falling back to "
-                                        "MIPMaps.");
-            textureFilterMode = GrTextureParams::kMipMap_FilterMode;
-            break;
-
-    }
+    bool doBicubic;
+    GrTextureParams::FilterMode textureFilterMode =
+            GrSkFilterQualityToGrFilterMode(filterQuality, viewM, this->getLocalMatrix(),
+                                            &doBicubic);
     GrTextureParams params(tm, textureFilterMode);
-    GrTexture* texture = GrLockAndRefCachedBitmapTexture(context, fRawBitmap, &params);
+    SkAutoTUnref<GrTexture> texture(GrRefCachedBitmapTexture(context, fRawBitmap, params));
 
-    if (NULL == texture) {
+    if (!texture) {
         SkErrorInternals::SetError( kInternalError_SkError,
                                     "Couldn't convert bitmap to texture.");
-        return false;
+        return nullptr;
     }
-    
-    *paintColor = (kAlpha_8_SkColorType == fRawBitmap.colorType()) ?
-                                                SkColor2GrColor(paint.getColor()) :
-                                                SkColor2GrColorJustAlpha(paint.getColor());
 
-    if (useBicubic) {
-        *effect = GrBicubicEffect::Create(texture, matrix, tm);
+    SkAutoTUnref<const GrFragmentProcessor> inner;
+    if (doBicubic) {
+        inner.reset(GrBicubicEffect::Create(texture, matrix, tm));
     } else {
-        *effect = GrSimpleTextureEffect::Create(texture, matrix, params);
+        inner.reset(GrSimpleTextureEffect::Create(texture, matrix, params));
     }
-    GrUnlockAndUnrefCachedBitmapTexture(texture);
 
-    return true;
-}
-
-#else 
-
-bool SkBitmapProcShader::asNewEffect(GrContext* context, const SkPaint& paint,
-                                     const SkMatrix* localMatrix, GrColor* paintColor,
-                                     GrEffect** effect) const {
-    SkDEBUGFAIL("Should not call in GPU-less build");
-    return false;
+    if (kAlpha_8_SkColorType == fRawBitmap.colorType()) {
+        return GrFragmentProcessor::MulOutputByInputUnpremulColor(inner);
+    }
+    return GrFragmentProcessor::MulOutputByInputAlpha(inner);
 }
 
 #endif
diff --git a/gfx/skia/skia/src/core/SkBitmapProcShader.h b/gfx/skia/skia/src/core/SkBitmapProcShader.h
index 550d1d257a7f..b69b02861679 100644
--- a/gfx/skia/skia/src/core/SkBitmapProcShader.h
+++ b/gfx/skia/skia/src/core/SkBitmapProcShader.h
@@ -11,41 +11,41 @@
 #define SkBitmapProcShader_DEFINED
 
 #include "SkShader.h"
-#include "SkBitmapProcState.h"
 #include "SkSmallAllocator.h"
 
+struct SkBitmapProcState;
+class SkBitmapProvider;
+
 class SkBitmapProcShader : public SkShader {
 public:
     SkBitmapProcShader(const SkBitmap& src, TileMode tx, TileMode ty,
-                       const SkMatrix* localMatrix = NULL);
+                       const SkMatrix* localMatrix = nullptr);
 
-    // overrides from SkShader
-    virtual bool isOpaque() const SK_OVERRIDE;
-    virtual BitmapType asABitmap(SkBitmap*, SkMatrix*, TileMode*) const SK_OVERRIDE;
+    bool isOpaque() const override;
 
-    virtual size_t contextSize() const SK_OVERRIDE;
-
-    static bool CanDo(const SkBitmap&, TileMode tx, TileMode ty);
+    size_t contextSize() const override { return ContextSize(); }
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBitmapProcShader)
 
+#if SK_SUPPORT_GPU
+    const GrFragmentProcessor* asFragmentProcessor(GrContext*, const SkMatrix& viewM,
+                                                   const SkMatrix*, SkFilterQuality) const override;
+#endif
 
-    bool asNewEffect(GrContext*, const SkPaint&, const SkMatrix*, GrColor*, GrEffect**)
-            const SK_OVERRIDE;
-
+protected:
     class BitmapProcShaderContext : public SkShader::Context {
     public:
         // The context takes ownership of the state. It will call its destructor
         // but will NOT free the memory.
-        BitmapProcShaderContext(const SkBitmapProcShader&, const ContextRec&, SkBitmapProcState*);
-        virtual ~BitmapProcShaderContext();
+        BitmapProcShaderContext(const SkShader&, const ContextRec&, SkBitmapProcState*);
+        ~BitmapProcShaderContext() override;
 
-        virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE;
-        virtual ShadeProc asAShadeProc(void** ctx) SK_OVERRIDE;
-        virtual void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE;
+        void shadeSpan(int x, int y, SkPMColor dstC[], int count) override;
+        ShadeProc asAShadeProc(void** ctx) override;
+        void shadeSpan16(int x, int y, uint16_t dstC[], int count) override;
 
-        virtual uint32_t getFlags() const SK_OVERRIDE { return fFlags; }
+        uint32_t getFlags() const override { return fFlags; }
 
     private:
         SkBitmapProcState*  fState;
@@ -53,16 +53,21 @@ public:
 
         typedef SkShader::Context INHERITED;
     };
-
-protected:
-    SkBitmapProcShader(SkReadBuffer& );
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
-    virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
+    
+    void flatten(SkWriteBuffer&) const override;
+    Context* onCreateContext(const ContextRec&, void* storage) const override;
+    bool onIsABitmap(SkBitmap*, SkMatrix*, TileMode*) const override;
 
     SkBitmap    fRawBitmap;   // experimental for RLE encoding
     uint8_t     fTileModeX, fTileModeY;
 
 private:
+    friend class SkImageShader;
+
+    static size_t ContextSize();
+    static Context* MakeContext(const SkShader&, TileMode tmx, TileMode tmy,
+                                const SkBitmapProvider&, const ContextRec&, void* storage);
+
     typedef SkShader INHERITED;
 };
 
@@ -71,11 +76,11 @@ private:
 // an Sk3DBlitter in SkDraw.cpp
 // Note that some contexts may contain other contexts (e.g. for compose shaders), but we've not
 // yet found a situation where the size below isn't big enough.
-typedef SkSmallAllocator<3, 768> SkTBlitterAllocator;
+typedef SkSmallAllocator<3, 1160> SkTBlitterAllocator;
 
-// If alloc is non-NULL, it will be used to allocate the returned SkShader, and MUST outlive
+// If alloc is non-nullptr, it will be used to allocate the returned SkShader, and MUST outlive
 // the SkShader.
-SkShader* CreateBitmapShader(const SkBitmap& src, SkShader::TileMode, SkShader::TileMode,
-                             const SkMatrix* localMatrix, SkTBlitterAllocator* alloc);
+SkShader* SkCreateBitmapShader(const SkBitmap& src, SkShader::TileMode, SkShader::TileMode,
+                               const SkMatrix* localMatrix, SkTBlitterAllocator* alloc);
 
 #endif
diff --git a/gfx/skia/skia/src/core/SkBitmapProcState.cpp b/gfx/skia/skia/src/core/SkBitmapProcState.cpp
index d48679e8c993..5ec6721436ec 100644
--- a/gfx/skia/skia/src/core/SkBitmapProcState.cpp
+++ b/gfx/skia/skia/src/core/SkBitmapProcState.cpp
@@ -1,10 +1,12 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
+#include "SkBitmapCache.h"
+#include "SkBitmapController.h"
 #include "SkBitmapProcState.h"
 #include "SkColorPriv.h"
 #include "SkFilterProc.h"
@@ -14,8 +16,8 @@
 #include "SkBitmapScaler.h"
 #include "SkMipMap.h"
 #include "SkPixelRef.h"
-#include "SkScaledImageCache.h"
 #include "SkImageEncoder.h"
+#include "SkResourceCache.h"
 
 #if !SK_ARM_NEON_IS_NONE
 // These are defined in src/opts/SkBitmapProcState_arm_neon.cpp
@@ -29,10 +31,34 @@ extern void  SI8_opaque_D32_filter_DX_shaderproc_neon(const SkBitmapProcState&,
 extern void  Clamp_SI8_opaque_D32_filter_DX_shaderproc_neon(const SkBitmapProcState&, int, int, uint32_t*, int);
 #endif
 
+extern void Clamp_S32_opaque_D32_nofilter_DX_shaderproc(const SkBitmapProcState&, int, int, uint32_t*, int);
+
 #define   NAME_WRAP(x)  x
 #include "SkBitmapProcState_filter.h"
 #include "SkBitmapProcState_procs.h"
 
+SkBitmapProcState::SkBitmapProcState(const SkBitmapProvider& provider,
+                                     SkShader::TileMode tmx, SkShader::TileMode tmy)
+    : fProvider(provider)
+    , fBMState(nullptr)
+{
+    fTileModeX = tmx;
+    fTileModeY = tmy;
+}
+
+SkBitmapProcState::SkBitmapProcState(const SkBitmap& bm,
+                                     SkShader::TileMode tmx, SkShader::TileMode tmy)
+    : fProvider(SkBitmapProvider(bm))
+    , fBMState(nullptr)
+{
+    fTileModeX = tmx;
+    fTileModeY = tmy;
+}
+
+SkBitmapProcState::~SkBitmapProcState() {
+    SkInPlaceDeleteCheck(fBMState, fBMStateStorage.get());
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 // true iff the matrix contains, at most, scale and translate elements
@@ -44,12 +70,12 @@ static bool matrix_only_scale_translate(const SkMatrix& m) {
  *  For the purposes of drawing bitmaps, if a matrix is "almost" translate
  *  go ahead and treat it as if it were, so that subsequent code can go fast.
  */
-static bool just_trans_clamp(const SkMatrix& matrix, const SkBitmap& bitmap) {
+static bool just_trans_clamp(const SkMatrix& matrix, const SkPixmap& pixmap) {
     SkASSERT(matrix_only_scale_translate(matrix));
 
     if (matrix.getType() & SkMatrix::kScale_Mask) {
-        SkRect src, dst;
-        bitmap.getBounds(&src);
+        SkRect dst;
+        SkRect src = SkRect::Make(pixmap.bounds());
 
         // Can't call mapRect(), since that will fix up inverted rectangles,
         // e.g. when scale is negative, and we don't want to return true for
@@ -64,7 +90,7 @@ static bool just_trans_clamp(const SkMatrix& matrix, const SkBitmap& bitmap) {
         // phase (in pixel space) that any translate in the matrix might impart.
         SkIRect idst;
         dst.round(&idst);
-        return idst.width() == bitmap.width() && idst.height() == bitmap.height();
+        return idst.width() == pixmap.width() && idst.height() == pixmap.height();
     }
     // if we got here, we're either kTranslate_Mask or identity
     return true;
@@ -87,336 +113,52 @@ static bool just_trans_general(const SkMatrix& matrix) {
     return true;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-
 static bool valid_for_filtering(unsigned dimension) {
     // for filtering, width and height must fit in 14bits, since we use steal
     // 2 bits from each to store our 4bit subpixel data
     return (dimension & ~0x3FFF) == 0;
 }
 
-static SkScalar effective_matrix_scale_sqrd(const SkMatrix& mat) {
-    SkPoint v1, v2;
-
-    v1.fX = mat.getScaleX();
-    v1.fY = mat.getSkewY();
-
-    v2.fX = mat.getSkewX();
-    v2.fY = mat.getScaleY();
-
-    return SkMaxScalar(v1.lengthSqd(), v2.lengthSqd());
-}
-
-class AutoScaledCacheUnlocker {
-public:
-    AutoScaledCacheUnlocker(SkScaledImageCache::ID** idPtr) : fIDPtr(idPtr) {}
-    ~AutoScaledCacheUnlocker() {
-        if (fIDPtr && *fIDPtr) {
-            SkScaledImageCache::Unlock(*fIDPtr);
-            *fIDPtr = NULL;
-        }
-    }
-
-    // forgets the ID, so it won't call Unlock
-    void release() {
-        fIDPtr = NULL;
-    }
-
-private:
-    SkScaledImageCache::ID** fIDPtr;
-};
-#define AutoScaledCacheUnlocker(...) SK_REQUIRE_LOCAL_VAR(AutoScaledCacheUnlocker)
-
-// Check to see that the size of the bitmap that would be produced by
-// scaling by the given inverted matrix is less than the maximum allowed.
-static inline bool cache_size_okay(const SkBitmap& bm, const SkMatrix& invMat) {
-    size_t maximumAllocation
-        = SkScaledImageCache::GetSingleAllocationByteLimit();
-    if (0 == maximumAllocation) {
-        return true;
-    }
-    // float matrixScaleFactor = 1.0 / (invMat.scaleX * invMat.scaleY);
-    // return ((origBitmapSize * matrixScaleFactor) < maximumAllocationSize);
-    // Skip the division step:
-    return bm.info().getSafeSize(bm.info().minRowBytes())
-        < (maximumAllocation * invMat.getScaleX() * invMat.getScaleY());
-}
-
-// TODO -- we may want to pass the clip into this function so we only scale
-// the portion of the image that we're going to need.  This will complicate
-// the interface to the cache, but might be well worth it.
-
-bool SkBitmapProcState::possiblyScaleImage() {
-    AutoScaledCacheUnlocker unlocker(&fScaledCacheID);
-
-    SkASSERT(NULL == fBitmap);
-    SkASSERT(NULL == fScaledCacheID);
-
-    if (fFilterLevel <= SkPaint::kLow_FilterLevel) {
-        return false;
-    }
-    // Check to see if the transformation matrix is simple, and if we're
-    // doing high quality scaling.  If so, do the bitmap scale here and
-    // remove the scaling component from the matrix.
-
-    if (SkPaint::kHigh_FilterLevel == fFilterLevel &&
-        fInvMatrix.getType() <= (SkMatrix::kScale_Mask | SkMatrix::kTranslate_Mask) &&
-        kN32_SkColorType == fOrigBitmap.colorType() &&
-        cache_size_okay(fOrigBitmap, fInvMatrix)) {
-
-        SkScalar invScaleX = fInvMatrix.getScaleX();
-        SkScalar invScaleY = fInvMatrix.getScaleY();
-
-        fScaledCacheID = SkScaledImageCache::FindAndLock(fOrigBitmap,
-                                                         invScaleX, invScaleY,
-                                                         &fScaledBitmap);
-        if (fScaledCacheID) {
-            fScaledBitmap.lockPixels();
-            if (!fScaledBitmap.getPixels()) {
-                fScaledBitmap.unlockPixels();
-                // found a purged entry (discardablememory?), release it
-                SkScaledImageCache::Unlock(fScaledCacheID);
-                fScaledCacheID = NULL;
-                // fall through to rebuild
-            }
-        }
-
-        if (NULL == fScaledCacheID) {
-            float dest_width  = fOrigBitmap.width() / invScaleX;
-            float dest_height = fOrigBitmap.height() / invScaleY;
-
-            // All the criteria are met; let's make a new bitmap.
-
-            if (!SkBitmapScaler::Resize(&fScaledBitmap,
-                                        fOrigBitmap,
-                                        SkBitmapScaler::RESIZE_BEST,
-                                        dest_width,
-                                        dest_height,
-                                        SkScaledImageCache::GetAllocator())) {
-                // we failed to create fScaledBitmap, so just return and let
-                // the scanline proc handle it.
-                return false;
-
-            }
-
-            SkASSERT(NULL != fScaledBitmap.getPixels());
-            fScaledCacheID = SkScaledImageCache::AddAndLock(fOrigBitmap,
-                                                            invScaleX,
-                                                            invScaleY,
-                                                            fScaledBitmap);
-            if (!fScaledCacheID) {
-                fScaledBitmap.reset();
-                return false;
-            }
-            SkASSERT(NULL != fScaledBitmap.getPixels());
-        }
-
-        SkASSERT(NULL != fScaledBitmap.getPixels());
-        fBitmap = &fScaledBitmap;
-
-        // set the inv matrix type to translate-only;
-        fInvMatrix.setTranslate(fInvMatrix.getTranslateX() / fInvMatrix.getScaleX(),
-                                fInvMatrix.getTranslateY() / fInvMatrix.getScaleY());
-
-        // no need for any further filtering; we just did it!
-        fFilterLevel = SkPaint::kNone_FilterLevel;
-        unlocker.release();
-        return true;
-    }
-
-    /*
-     *  If High, then our special-case for scale-only did not take, and so we
-     *  have to make a choice:
-     *      1. fall back on mipmaps + bilerp
-     *      2. fall back on scanline bicubic filter
-     *  For now, we compute the "scale" value from the matrix, and have a
-     *  threshold to decide when bicubic is better, and when mips are better.
-     *  No doubt a fancier decision tree could be used uere.
-     *
-     *  If Medium, then we just try to build a mipmap and select a level,
-     *  setting the filter-level to kLow to signal that we just need bilerp
-     *  to process the selected level.
-     */
-
-    SkScalar scaleSqd = effective_matrix_scale_sqrd(fInvMatrix);
-
-    if (SkPaint::kHigh_FilterLevel == fFilterLevel) {
-        // Set the limit at 0.25 for the CTM... if the CTM is scaling smaller
-        // than this, then the mipmaps quality may be greater (certainly faster)
-        // so we only keep High quality if the scale is greater than this.
-        //
-        // Since we're dealing with the inverse, we compare against its inverse.
-        const SkScalar bicubicLimit = 4.0f;
-        const SkScalar bicubicLimitSqd = bicubicLimit * bicubicLimit;
-        if (scaleSqd < bicubicLimitSqd) {  // use bicubic scanline
-            return false;
-        }
-
-        // else set the filter-level to Medium, since we're scaling down and
-        // want to reqeust mipmaps
-        fFilterLevel = SkPaint::kMedium_FilterLevel;
-    }
-
-    SkASSERT(SkPaint::kMedium_FilterLevel == fFilterLevel);
-
-    /**
-     *  Medium quality means use a mipmap for down-scaling, and just bilper
-     *  for upscaling. Since we're examining the inverse matrix, we look for
-     *  a scale > 1 to indicate down scaling by the CTM.
-     */
-    if (scaleSqd > SK_Scalar1) {
-        const SkMipMap* mip = NULL;
-
-        SkASSERT(NULL == fScaledCacheID);
-        fScaledCacheID = SkScaledImageCache::FindAndLockMip(fOrigBitmap, &mip);
-        if (!fScaledCacheID) {
-            SkASSERT(NULL == mip);
-            mip = SkMipMap::Build(fOrigBitmap);
-            if (mip) {
-                fScaledCacheID = SkScaledImageCache::AddAndLockMip(fOrigBitmap,
-                                                                   mip);
-                SkASSERT(mip->getRefCnt() > 1);
-                mip->unref();   // the cache took a ref
-                SkASSERT(fScaledCacheID);
-            }
-        } else {
-            SkASSERT(mip);
-        }
-
-        if (mip) {
-            SkScalar levelScale = SkScalarInvert(SkScalarSqrt(scaleSqd));
-            SkMipMap::Level level;
-            if (mip->extractLevel(levelScale, &level)) {
-                SkScalar invScaleFixup = level.fScale;
-                fInvMatrix.postScale(invScaleFixup, invScaleFixup);
-
-                SkImageInfo info = fOrigBitmap.info();
-                info.fWidth = level.fWidth;
-                info.fHeight = level.fHeight;
-                fScaledBitmap.installPixels(info, level.fPixels, level.fRowBytes);
-                fBitmap = &fScaledBitmap;
-                fFilterLevel = SkPaint::kLow_FilterLevel;
-                unlocker.release();
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-static bool get_locked_pixels(const SkBitmap& src, int pow2, SkBitmap* dst) {
-    SkPixelRef* pr = src.pixelRef();
-    if (pr && pr->decodeInto(pow2, dst)) {
-        return true;
-    }
-
-    /*
-     *  If decodeInto() fails, it is possibe that we have an old subclass that
-     *  does not, or cannot, implement that. In that case we fall back to the
-     *  older protocol of having the pixelRef handle the caching for us.
-     */
-    *dst = src;
-    dst->lockPixels();
-    return SkToBool(dst->getPixels());
-}
-
-bool SkBitmapProcState::lockBaseBitmap() {
-    AutoScaledCacheUnlocker unlocker(&fScaledCacheID);
-
-    SkPixelRef* pr = fOrigBitmap.pixelRef();
-
-    SkASSERT(NULL == fScaledCacheID);
-
-    if (pr->isLocked() || !pr->implementsDecodeInto()) {
-        // fast-case, no need to look in our cache
-        fScaledBitmap = fOrigBitmap;
-        fScaledBitmap.lockPixels();
-        if (NULL == fScaledBitmap.getPixels()) {
-            return false;
-        }
-    } else {
-        fScaledCacheID = SkScaledImageCache::FindAndLock(fOrigBitmap,
-                                                         SK_Scalar1, SK_Scalar1,
-                                                         &fScaledBitmap);
-        if (fScaledCacheID) {
-            fScaledBitmap.lockPixels();
-            if (!fScaledBitmap.getPixels()) {
-                fScaledBitmap.unlockPixels();
-                // found a purged entry (discardablememory?), release it
-                SkScaledImageCache::Unlock(fScaledCacheID);
-                fScaledCacheID = NULL;
-                // fall through to rebuild
-            }
-        }
-
-        if (NULL == fScaledCacheID) {
-            if (!get_locked_pixels(fOrigBitmap, 0, &fScaledBitmap)) {
-                return false;
-            }
-
-            // TODO: if fScaled comes back at a different width/height than fOrig,
-            // we need to update the matrix we are using to sample from this guy.
-
-            fScaledCacheID = SkScaledImageCache::AddAndLock(fOrigBitmap,
-                                                            SK_Scalar1, SK_Scalar1,
-                                                            fScaledBitmap);
-            if (!fScaledCacheID) {
-                fScaledBitmap.reset();
-                return false;
-            }
-        }
-    }
-    fBitmap = &fScaledBitmap;
-    unlocker.release();
-    return true;
-}
-
-SkBitmapProcState::~SkBitmapProcState() {
-    if (fScaledCacheID) {
-        SkScaledImageCache::Unlock(fScaledCacheID);
-    }
-    SkDELETE(fBitmapFilter);
-}
-
+/*
+ *  Analyze filter-quality and matrix, and decide how to implement that.
+ *
+ *  In general, we cascade down the request level [ High ... None ]
+ *  - for a given level, if we can fulfill it, fine, else
+ *    - else we downgrade to the next lower level and try again.
+ *  We can always fulfill requests for Low and None
+ *  - sometimes we will "ignore" Low and give None, but this is likely a legacy perf hack
+ *    and may be removed.
+ */
 bool SkBitmapProcState::chooseProcs(const SkMatrix& inv, const SkPaint& paint) {
-    SkASSERT(fOrigBitmap.width() && fOrigBitmap.height());
-
-    fBitmap = NULL;
+    fPixmap.reset();
     fInvMatrix = inv;
-    fFilterLevel = paint.getFilterLevel();
+    fFilterLevel = paint.getFilterQuality();
 
-    SkASSERT(NULL == fScaledCacheID);
-
-    // possiblyScaleImage will look to see if it can rescale the image as a
-    // preprocess; either by scaling up to the target size, or by selecting
-    // a nearby mipmap level.  If it does, it will adjust the working
-    // matrix as well as the working bitmap.  It may also adjust the filter
-    // quality to avoid re-filtering an already perfectly scaled image.
-    if (!this->possiblyScaleImage()) {
-        if (!this->lockBaseBitmap()) {
-            return false;
-        }
-    }
-    // The above logic should have always assigned fBitmap, but in case it
-    // didn't, we check for that now...
-    // TODO(dominikg): Ask humper@ if we can just use an SkASSERT(fBitmap)?
-    if (NULL == fBitmap) {
+    SkDefaultBitmapController controller;
+    fBMState = controller.requestBitmap(fProvider, inv, paint.getFilterQuality(),
+                                        fBMStateStorage.get(), fBMStateStorage.size());
+    // Note : we allow the controller to return an empty (zero-dimension) result. Should we?
+    if (nullptr == fBMState || fBMState->pixmap().info().isEmpty()) {
         return false;
     }
-
-    // If we are "still" kMedium_FilterLevel, then the request was not fulfilled by possiblyScale,
-    // so we downgrade to kLow (so the rest of the sniffing code can assume that)
-    if (SkPaint::kMedium_FilterLevel == fFilterLevel) {
-        fFilterLevel = SkPaint::kLow_FilterLevel;
-    }
-
+    fPixmap = fBMState->pixmap();
+    fInvMatrix = fBMState->invMatrix();
+    fFilterLevel = fBMState->quality();
+    SkASSERT(fPixmap.addr());
+    
     bool trivialMatrix = (fInvMatrix.getType() & ~SkMatrix::kTranslate_Mask) == 0;
     bool clampClamp = SkShader::kClamp_TileMode == fTileModeX &&
                       SkShader::kClamp_TileMode == fTileModeY;
 
+    // Most of the scanline procs deal with "unit" texture coordinates, as this
+    // makes it easy to perform tiling modes (repeat = (x & 0xFFFF)). To generate
+    // those, we divide the matrix by its dimensions here.
+    //
+    // We don't do this if we're either trivial (can ignore the matrix) or clamping
+    // in both X and Y since clamping to width,height is just as easy as to 0xFFFF.
+
     if (!(clampClamp || trivialMatrix)) {
-        fInvMatrix.postIDiv(fOrigBitmap.width(), fOrigBitmap.height());
+        fInvMatrix.postIDiv(fPixmap.width(), fPixmap.height());
     }
 
     // Now that all possible changes to the matrix have taken place, check
@@ -430,8 +172,8 @@ bool SkBitmapProcState::chooseProcs(const SkMatrix& inv, const SkPaint& paint) {
     if (matrix_only_scale_translate(fInvMatrix)) {
         SkMatrix forward;
         if (fInvMatrix.invert(&forward)) {
-            if (clampClamp ? just_trans_clamp(forward, *fBitmap)
-                            : just_trans_general(forward)) {
+            if (clampClamp ? just_trans_clamp(forward, fPixmap)
+                           : just_trans_general(forward)) {
                 SkScalar tx = -SkScalarRoundToScalar(forward.getTranslateX());
                 SkScalar ty = -SkScalarRoundToScalar(forward.getTranslateY());
                 fInvMatrix.setTranslate(tx, ty);
@@ -448,61 +190,47 @@ bool SkBitmapProcState::chooseProcs(const SkMatrix& inv, const SkPaint& paint) {
 
     fAlphaScale = SkAlpha255To256(paint.getAlpha());
 
-    fShaderProc32 = NULL;
-    fShaderProc16 = NULL;
-    fSampleProc32 = NULL;
-    fSampleProc16 = NULL;
+    fShaderProc32 = nullptr;
+    fShaderProc16 = nullptr;
+    fSampleProc32 = nullptr;
+    fSampleProc16 = nullptr;
 
     // recompute the triviality of the matrix here because we may have
     // changed it!
 
     trivialMatrix = (fInvMatrix.getType() & ~SkMatrix::kTranslate_Mask) == 0;
 
-    if (SkPaint::kHigh_FilterLevel == fFilterLevel) {
-        // If this is still set, that means we wanted HQ sampling
-        // but couldn't do it as a preprocess.  Let's try to install
-        // the scanline version of the HQ sampler.  If that process fails,
-        // downgrade to bilerp.
-
-        // NOTE: Might need to be careful here in the future when we want
-        // to have the platform proc have a shot at this; it's possible that
-        // the chooseBitmapFilterProc will fail to install a shader but a
-        // platform-specific one might succeed, so it might be premature here
-        // to fall back to bilerp.  This needs thought.
-
-        if (!this->setBitmapFilterProcs()) {
-            fFilterLevel = SkPaint::kLow_FilterLevel;
-        }
-    }
-
-    if (SkPaint::kLow_FilterLevel == fFilterLevel) {
+    if (kLow_SkFilterQuality == fFilterLevel) {
         // Only try bilerp if the matrix is "interesting" and
         // the image has a suitable size.
 
         if (fInvType <= SkMatrix::kTranslate_Mask ||
-                !valid_for_filtering(fBitmap->width() | fBitmap->height())) {
-            fFilterLevel = SkPaint::kNone_FilterLevel;
+            !valid_for_filtering(fPixmap.width() | fPixmap.height()))
+        {
+            fFilterLevel = kNone_SkFilterQuality;
         }
     }
 
-    // At this point, we know exactly what kind of sampling the per-scanline
-    // shader will perform.
+    return this->chooseScanlineProcs(trivialMatrix, clampClamp, paint);
+}
 
+bool SkBitmapProcState::chooseScanlineProcs(bool trivialMatrix, bool clampClamp,
+                                            const SkPaint& paint) {
     fMatrixProc = this->chooseMatrixProc(trivialMatrix);
-    // TODO(dominikg): SkASSERT(fMatrixProc) instead? chooseMatrixProc never returns NULL.
-    if (NULL == fMatrixProc) {
+    // TODO(dominikg): SkASSERT(fMatrixProc) instead? chooseMatrixProc never returns nullptr.
+    if (nullptr == fMatrixProc) {
         return false;
     }
 
     ///////////////////////////////////////////////////////////////////////
 
-    const SkAlphaType at = fBitmap->alphaType();
+    const SkAlphaType at = fPixmap.alphaType();
 
     // No need to do this if we're doing HQ sampling; if filter quality is
     // still set to HQ by the time we get here, then we must have installed
     // the shader procs above and can skip all this.
 
-    if (fFilterLevel < SkPaint::kHigh_FilterLevel) {
+    if (fFilterLevel < kHigh_SkFilterQuality) {
 
         int index = 0;
         if (fAlphaScale < 256) {  // note: this distinction is not used for D16
@@ -511,11 +239,11 @@ bool SkBitmapProcState::chooseProcs(const SkMatrix& inv, const SkPaint& paint) {
         if (fInvType <= (SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask)) {
             index |= 2;
         }
-        if (fFilterLevel > SkPaint::kNone_FilterLevel) {
+        if (fFilterLevel > kNone_SkFilterQuality) {
             index |= 4;
         }
         // bits 3,4,5 encoding the source bitmap format
-        switch (fBitmap->colorType()) {
+        switch (fPixmap.colorType()) {
             case kN32_SkColorType:
                 if (kPremul_SkAlphaType != at && kOpaque_SkAlphaType != at) {
                     return false;
@@ -541,12 +269,16 @@ bool SkBitmapProcState::chooseProcs(const SkMatrix& inv, const SkPaint& paint) {
                 index |= 32;
                 fPaintPMColor = SkPreMultiplyColor(paint.getColor());
                 break;
+            case kGray_8_SkColorType:
+                index |= 40;
+                fPaintPMColor = SkPreMultiplyColor(paint.getColor());
+                break;
             default:
                 // TODO(dominikg): Should we ever get here? SkASSERT(false) instead?
                 return false;
         }
 
-    #if !SK_ARM_NEON_IS_ALWAYS
+#if !SK_ARM_NEON_IS_ALWAYS
         static const SampleProc32 gSkBitmapProcStateSample32[] = {
             S32_opaque_D32_nofilter_DXDY,
             S32_alpha_D32_nofilter_DXDY,
@@ -583,7 +315,7 @@ bool SkBitmapProcState::chooseProcs(const SkMatrix& inv, const SkPaint& paint) {
             S4444_alpha_D32_filter_DXDY,
             S4444_opaque_D32_filter_DX,
             S4444_alpha_D32_filter_DX,
-
+            
             // A8 treats alpha/opaque the same (equally efficient)
             SA8_alpha_D32_nofilter_DXDY,
             SA8_alpha_D32_nofilter_DXDY,
@@ -592,7 +324,17 @@ bool SkBitmapProcState::chooseProcs(const SkMatrix& inv, const SkPaint& paint) {
             SA8_alpha_D32_filter_DXDY,
             SA8_alpha_D32_filter_DXDY,
             SA8_alpha_D32_filter_DX,
-            SA8_alpha_D32_filter_DX
+            SA8_alpha_D32_filter_DX,
+            
+            // todo: possibly specialize on opaqueness
+            SG8_alpha_D32_nofilter_DXDY,
+            SG8_alpha_D32_nofilter_DXDY,
+            SG8_alpha_D32_nofilter_DX,
+            SG8_alpha_D32_nofilter_DX,
+            SG8_alpha_D32_filter_DXDY,
+            SG8_alpha_D32_filter_DXDY,
+            SG8_alpha_D32_filter_DX,
+            SG8_alpha_D32_filter_DX
         };
 
         static const SampleProc16 gSkBitmapProcStateSample16[] = {
@@ -612,11 +354,13 @@ bool SkBitmapProcState::chooseProcs(const SkMatrix& inv, const SkPaint& paint) {
             SI8_D16_filter_DX,
 
             // Don't support 4444 -> 565
-            NULL, NULL, NULL, NULL,
+            nullptr, nullptr, nullptr, nullptr,
             // Don't support A8 -> 565
-            NULL, NULL, NULL, NULL
+            nullptr, nullptr, nullptr, nullptr,
+            // Don't support G8 -> 565 (but we could)
+            nullptr, nullptr, nullptr, nullptr
         };
-    #endif
+#endif
 
         fSampleProc32 = SK_ARM_NEON_WRAP(gSkBitmapProcStateSample32)[index];
         index >>= 1;    // shift away any opaque/alpha distinction
@@ -632,9 +376,11 @@ bool SkBitmapProcState::chooseProcs(const SkMatrix& inv, const SkPaint& paint) {
             }
         } else if (SK_ARM_NEON_WRAP(SI8_opaque_D32_filter_DX) == fSampleProc32 && clampClamp) {
             fShaderProc32 = SK_ARM_NEON_WRAP(Clamp_SI8_opaque_D32_filter_DX_shaderproc);
+        } else if (S32_opaque_D32_nofilter_DX == fSampleProc32 && clampClamp) {
+            fShaderProc32 = Clamp_S32_opaque_D32_nofilter_DX_shaderproc;
         }
 
-        if (NULL == fShaderProc32) {
+        if (nullptr == fShaderProc32) {
             fShaderProc32 = this->chooseShaderProc32();
         }
     }
@@ -651,11 +397,11 @@ static void Clamp_S32_D32_nofilter_trans_shaderproc(const SkBitmapProcState& s,
                                                     int count) {
     SkASSERT(((s.fInvType & ~SkMatrix::kTranslate_Mask)) == 0);
     SkASSERT(s.fInvKy == 0);
-    SkASSERT(count > 0 && colors != NULL);
-    SkASSERT(SkPaint::kNone_FilterLevel == s.fFilterLevel);
+    SkASSERT(count > 0 && colors != nullptr);
+    SkASSERT(kNone_SkFilterQuality == s.fFilterLevel);
 
-    const int maxX = s.fBitmap->width() - 1;
-    const int maxY = s.fBitmap->height() - 1;
+    const int maxX = s.fPixmap.width() - 1;
+    const int maxY = s.fPixmap.height() - 1;
     int ix = s.fFilterOneX + x;
     int iy = SkClampMax(s.fFilterOneY + y, maxY);
 #ifdef SK_DEBUG
@@ -670,7 +416,7 @@ static void Clamp_S32_D32_nofilter_trans_shaderproc(const SkBitmapProcState& s,
         SkASSERT(ix == ix2);
     }
 #endif
-    const SkPMColor* row = s.fBitmap->getAddr32(0, iy);
+    const SkPMColor* row = s.fPixmap.addr32(0, iy);
 
     // clamp to the left
     if (ix < 0) {
@@ -725,11 +471,11 @@ static void Repeat_S32_D32_nofilter_trans_shaderproc(const SkBitmapProcState& s,
                                                      int count) {
     SkASSERT(((s.fInvType & ~SkMatrix::kTranslate_Mask)) == 0);
     SkASSERT(s.fInvKy == 0);
-    SkASSERT(count > 0 && colors != NULL);
-    SkASSERT(SkPaint::kNone_FilterLevel == s.fFilterLevel);
+    SkASSERT(count > 0 && colors != nullptr);
+    SkASSERT(kNone_SkFilterQuality == s.fFilterLevel);
 
-    const int stopX = s.fBitmap->width();
-    const int stopY = s.fBitmap->height();
+    const int stopX = s.fPixmap.width();
+    const int stopY = s.fPixmap.height();
     int ix = s.fFilterOneX + x;
     int iy = sk_int_mod(s.fFilterOneY + y, stopY);
 #ifdef SK_DEBUG
@@ -744,7 +490,7 @@ static void Repeat_S32_D32_nofilter_trans_shaderproc(const SkBitmapProcState& s,
         SkASSERT(ix == ix2);
     }
 #endif
-    const SkPMColor* row = s.fBitmap->getAddr32(0, iy);
+    const SkPMColor* row = s.fPixmap.addr32(0, iy);
 
     ix = sk_int_mod(ix, stopX);
     for (;;) {
@@ -765,14 +511,14 @@ static void S32_D32_constX_shaderproc(const SkBitmapProcState& s,
                                       int count) {
     SkASSERT((s.fInvType & ~(SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask)) == 0);
     SkASSERT(s.fInvKy == 0);
-    SkASSERT(count > 0 && colors != NULL);
-    SkASSERT(1 == s.fBitmap->width());
+    SkASSERT(count > 0 && colors != nullptr);
+    SkASSERT(1 == s.fPixmap.width());
 
     int iY0;
     int iY1   SK_INIT_TO_AVOID_WARNING;
     int iSubY SK_INIT_TO_AVOID_WARNING;
 
-    if (SkPaint::kNone_FilterLevel != s.fFilterLevel) {
+    if (kNone_SkFilterQuality != s.fFilterLevel) {
         SkBitmapProcState::MatrixProc mproc = s.getMatrixProc();
         uint32_t xy[2];
 
@@ -796,7 +542,7 @@ static void S32_D32_constX_shaderproc(const SkBitmapProcState& s,
             // its own tiling and sampling we need to undo that here.
             if (SkShader::kClamp_TileMode != s.fTileModeX ||
                 SkShader::kClamp_TileMode != s.fTileModeY) {
-                yTemp = SkScalarFloorToInt(pt.fY * s.fBitmap->height());
+                yTemp = SkScalarFloorToInt(pt.fY * s.fPixmap.height());
             } else {
                 yTemp = SkScalarFloorToInt(pt.fY);
             }
@@ -804,7 +550,7 @@ static void S32_D32_constX_shaderproc(const SkBitmapProcState& s,
             yTemp = s.fFilterOneY + y;
         }
 
-        const int stopY = s.fBitmap->height();
+        const int stopY = s.fPixmap.height();
         switch (s.fTileModeY) {
             case SkShader::kClamp_TileMode:
                 iY0 = SkClampMax(yTemp, stopY-1);
@@ -828,7 +574,7 @@ static void S32_D32_constX_shaderproc(const SkBitmapProcState& s,
             if (s.fInvType > SkMatrix::kTranslate_Mask &&
                 (SkShader::kClamp_TileMode != s.fTileModeX ||
                  SkShader::kClamp_TileMode != s.fTileModeY)) {
-                pt.fY *= s.fBitmap->height();
+                pt.fY *= s.fPixmap.height();
             }
             int iY2;
 
@@ -850,11 +596,11 @@ static void S32_D32_constX_shaderproc(const SkBitmapProcState& s,
 #endif
     }
 
-    const SkPMColor* row0 = s.fBitmap->getAddr32(0, iY0);
+    const SkPMColor* row0 = s.fPixmap.addr32(0, iY0);
     SkPMColor color;
 
-    if (SkPaint::kNone_FilterLevel != s.fFilterLevel) {
-        const SkPMColor* row1 = s.fBitmap->getAddr32(0, iY1);
+    if (kNone_SkFilterQuality != s.fFilterLevel) {
+        const SkPMColor* row1 = s.fPixmap.addr32(0, iY1);
 
         if (s.fAlphaScale < 256) {
             Filter_32_alpha(iSubY, *row0, *row1, &color, s.fAlphaScale);
@@ -902,14 +648,14 @@ bool SkBitmapProcState::setupForTranslate() {
 
 SkBitmapProcState::ShaderProc32 SkBitmapProcState::chooseShaderProc32() {
 
-    if (kN32_SkColorType != fBitmap->colorType()) {
-        return NULL;
+    if (kN32_SkColorType != fPixmap.colorType()) {
+        return nullptr;
     }
 
     static const unsigned kMask = SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask;
 
-    if (1 == fBitmap->width() && 0 == (fInvType & ~kMask)) {
-        if (SkPaint::kNone_FilterLevel == fFilterLevel &&
+    if (1 == fPixmap.width() && 0 == (fInvType & ~kMask)) {
+        if (kNone_SkFilterQuality == fFilterLevel &&
             fInvType <= SkMatrix::kTranslate_Mask &&
             !this->setupForTranslate()) {
             return DoNothing_shaderproc;
@@ -918,13 +664,13 @@ SkBitmapProcState::ShaderProc32 SkBitmapProcState::chooseShaderProc32() {
     }
 
     if (fAlphaScale < 256) {
-        return NULL;
+        return nullptr;
     }
     if (fInvType > SkMatrix::kTranslate_Mask) {
-        return NULL;
+        return nullptr;
     }
-    if (SkPaint::kNone_FilterLevel != fFilterLevel) {
-        return NULL;
+    if (kNone_SkFilterQuality != fFilterLevel) {
+        return nullptr;
     }
 
     SkShader::TileMode tx = (SkShader::TileMode)fTileModeX;
@@ -942,7 +688,7 @@ SkBitmapProcState::ShaderProc32 SkBitmapProcState::chooseShaderProc32() {
         }
         return DoNothing_shaderproc;
     }
-    return NULL;
+    return nullptr;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1019,11 +765,11 @@ void SkBitmapProcState::DebugMatrixProc(const SkBitmapProcState& state,
     //  scale -vs- affine
     //  filter -vs- nofilter
     if (state.fInvType <= (SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask)) {
-        proc = state.fFilterLevel != SkPaint::kNone_FilterLevel ? check_scale_filter : check_scale_nofilter;
+        proc = state.fFilterLevel != kNone_SkFilterQuality ? check_scale_filter : check_scale_nofilter;
     } else {
-        proc = state.fFilterLevel != SkPaint::kNone_FilterLevel ? check_affine_filter : check_affine_nofilter;
+        proc = state.fFilterLevel != kNone_SkFilterQuality ? check_affine_filter : check_affine_nofilter;
     }
-    proc(bitmapXY, count, state.fBitmap->width(), state.fBitmap->height());
+    proc(bitmapXY, count, state.fPixmap.width(), state.fPixmap.height());
 }
 
 SkBitmapProcState::MatrixProc SkBitmapProcState::getMatrixProc() const {
@@ -1056,9 +802,64 @@ int SkBitmapProcState::maxCountForBufferSize(size_t bufferSize) const {
         size >>= 2;
     }
 
-    if (fFilterLevel != SkPaint::kNone_FilterLevel) {
+    if (fFilterLevel != kNone_SkFilterQuality) {
         size >>= 1;
     }
 
     return size;
 }
+
+///////////////////////
+
+void  Clamp_S32_opaque_D32_nofilter_DX_shaderproc(const SkBitmapProcState& s, int x, int y,
+                                                  SkPMColor* SK_RESTRICT dst, int count) {
+    SkASSERT((s.fInvType & ~(SkMatrix::kTranslate_Mask |
+                             SkMatrix::kScale_Mask)) == 0);
+
+    const unsigned maxX = s.fPixmap.width() - 1;
+    SkFractionalInt fx;
+    int dstY;
+    {
+        SkPoint pt;
+        s.fInvProc(s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf, SkIntToScalar(y) + SK_ScalarHalf,
+                   &pt);
+        fx = SkScalarToFractionalInt(pt.fY);
+        const unsigned maxY = s.fPixmap.height() - 1;
+        dstY = SkClampMax(SkFractionalIntToInt(fx), maxY);
+        fx = SkScalarToFractionalInt(pt.fX);
+    }
+
+    const SkPMColor* SK_RESTRICT src = s.fPixmap.addr32(0, dstY);
+    const SkFractionalInt dx = s.fInvSxFractionalInt;
+
+    // Check if we're safely inside [0...maxX] so no need to clamp each computed index.
+    //
+    if ((uint64_t)SkFractionalIntToInt(fx) <= maxX &&
+        (uint64_t)SkFractionalIntToInt(fx + dx * (count - 1)) <= maxX)
+    {
+        int count4 = count >> 2;
+        for (int i = 0; i < count4; ++i) {
+            SkPMColor src0 = src[SkFractionalIntToInt(fx)]; fx += dx;
+            SkPMColor src1 = src[SkFractionalIntToInt(fx)]; fx += dx;
+            SkPMColor src2 = src[SkFractionalIntToInt(fx)]; fx += dx;
+            SkPMColor src3 = src[SkFractionalIntToInt(fx)]; fx += dx;
+            dst[0] = src0;
+            dst[1] = src1;
+            dst[2] = src2;
+            dst[3] = src3;
+            dst += 4;
+        }
+        for (int i = (count4 << 2); i < count; ++i) {
+            unsigned index = SkFractionalIntToInt(fx);
+            SkASSERT(index <= maxX);
+            *dst++ = src[index];
+            fx += dx;
+        }
+    } else {
+        for (int i = 0; i < count; ++i) {
+            dst[i] = src[SkClampMax(SkFractionalIntToInt(fx), maxX)];
+            fx += dx;
+        }
+    }
+}
+
diff --git a/gfx/skia/skia/src/core/SkBitmapProcState.h b/gfx/skia/skia/src/core/SkBitmapProcState.h
index 73d7e904b30b..2ce76bc83ec7 100644
--- a/gfx/skia/skia/src/core/SkBitmapProcState.h
+++ b/gfx/skia/skia/src/core/SkBitmapProcState.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2007 The Android Open Source Project
  *
@@ -6,37 +5,30 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkBitmapProcState_DEFINED
 #define SkBitmapProcState_DEFINED
 
 #include "SkBitmap.h"
+#include "SkBitmapController.h"
 #include "SkBitmapFilter.h"
+#include "SkBitmapProvider.h"
 #include "SkMatrix.h"
+#include "SkMipMap.h"
 #include "SkPaint.h"
-#include "SkScaledImageCache.h"
+#include "SkShader.h"
+#include "SkTemplates.h"
 
-#define FractionalInt_IS_64BIT
-
-#ifdef FractionalInt_IS_64BIT
-    typedef SkFixed48    SkFractionalInt;
-    #define SkScalarToFractionalInt(x)  SkScalarToFixed48(x)
-    #define SkFractionalIntToFixed(x)   SkFixed48ToFixed(x)
-    #define SkFixedToFractionalInt(x)   SkFixedToFixed48(x)
-    #define SkFractionalIntToInt(x)     SkFixed48ToInt(x)
-#else
-    typedef SkFixed    SkFractionalInt;
-    #define SkScalarToFractionalInt(x)  SkScalarToFixed(x)
-    #define SkFractionalIntToFixed(x)   (x)
-    #define SkFixedToFractionalInt(x)   (x)
-    #define SkFractionalIntToInt(x)     ((x) >> 16)
-#endif
+typedef SkFixed3232    SkFractionalInt;
+#define SkScalarToFractionalInt(x)  SkScalarToFixed3232(x)
+#define SkFractionalIntToFixed(x)   SkFixed3232ToFixed(x)
+#define SkFixedToFractionalInt(x)   SkFixedToFixed3232(x)
+#define SkFractionalIntToInt(x)     SkFixed3232ToInt(x)
 
 class SkPaint;
 
 struct SkBitmapProcState {
-
-    SkBitmapProcState(): fScaledCacheID(NULL), fBitmapFilter(NULL) {}
+    SkBitmapProcState(const SkBitmapProvider&, SkShader::TileMode tmx, SkShader::TileMode tmy);
+    SkBitmapProcState(const SkBitmap&, SkShader::TileMode tmx, SkShader::TileMode tmy);
     ~SkBitmapProcState();
 
     typedef void (*ShaderProc32)(const SkBitmapProcState&, int x, int y,
@@ -64,8 +56,9 @@ struct SkBitmapProcState {
     typedef U16CPU (*FixedTileLowBitsProc)(SkFixed, int);   // returns 0..0xF
     typedef U16CPU (*IntTileProc)(int value, int count);   // returns 0..count-1
 
-    const SkBitmap*     fBitmap;            // chooseProcs - orig or scaled
-    SkMatrix            fInvMatrix;         // chooseProcs
+    SkPixmap            fPixmap;
+    SkMatrix            fInvMatrix;         // copy of what is in fBMState, can we remove the dup?
+
     SkMatrix::MapXYProc fInvProc;           // chooseProcs
 
     SkFractionalInt     fInvSxFractionalInt;
@@ -119,8 +112,6 @@ struct SkBitmapProcState {
     ShaderProc32 getShaderProc32() const { return fShaderProc32; }
     ShaderProc16 getShaderProc16() const { return fShaderProc16; }
 
-    SkBitmapFilter* getBitmapFilter() const { return fBitmapFilter; }
-
 #ifdef SK_DEBUG
     MatrixProc getMatrixProc() const;
 #else
@@ -131,37 +122,28 @@ struct SkBitmapProcState {
 
 private:
     friend class SkBitmapProcShader;
+    friend class SkLightingShaderImpl;
 
     ShaderProc32        fShaderProc32;      // chooseProcs
     ShaderProc16        fShaderProc16;      // chooseProcs
-    // These are used if the shaderproc is NULL
+    // These are used if the shaderproc is nullptr
     MatrixProc          fMatrixProc;        // chooseProcs
     SampleProc32        fSampleProc32;      // chooseProcs
     SampleProc16        fSampleProc16;      // chooseProcs
 
-    SkBitmap            fOrigBitmap;        // CONSTRUCTOR
-    SkBitmap            fScaledBitmap;      // chooseProcs
+    const SkBitmapProvider fProvider;
 
-    SkScaledImageCache::ID* fScaledCacheID;
+    enum {
+        kBMStateSize = 136  // found by inspection. if too small, we will call new/delete
+    };
+    SkAlignedSStorage<kBMStateSize> fBMStateStorage;
+    SkBitmapController::State* fBMState;
 
     MatrixProc chooseMatrixProc(bool trivial_matrix);
     bool chooseProcs(const SkMatrix& inv, const SkPaint&);
+    bool chooseScanlineProcs(bool trivialMatrix, bool clampClamp, const SkPaint& paint);
     ShaderProc32 chooseShaderProc32();
 
-    // returns false if we did not try to scale the image. In that case, we
-    // will need to "lock" its pixels some other way.
-    bool possiblyScaleImage();
-
-    // returns false if we failed to "lock" the pixels at all. Typically this
-    // means we have to abort the shader.
-    bool lockBaseBitmap();
-
-    SkBitmapFilter* fBitmapFilter;
-
-    // If supported, sets fShaderProc32 and fShaderProc16 and returns true,
-    // otherwise returns false.
-    bool setBitmapFilterProcs();
-
     // Return false if we failed to setup for fast translate (e.g. overflow)
     bool setupForTranslate();
 
@@ -215,11 +197,7 @@ void ClampX_ClampY_nofilter_affine(const SkBitmapProcState& s,
                                    uint32_t xy[], int count, int x, int y);
 void S32_D16_filter_DX(const SkBitmapProcState& s,
                        const uint32_t* xy, int count, uint16_t* colors);
-
-void highQualityFilter32(const SkBitmapProcState &s, int x, int y,
-                         SkPMColor *SK_RESTRICT colors, int count);
-void highQualityFilter16(const SkBitmapProcState &s, int x, int y,
-                         uint16_t *SK_RESTRICT colors, int count);
-
+void S32_D16_filter_DXDY(const SkBitmapProcState& s,
+                         const uint32_t* xy, int count, uint16_t* colors);
 
 #endif
diff --git a/gfx/skia/skia/src/core/SkBitmapProcState_matrix.h b/gfx/skia/skia/src/core/SkBitmapProcState_matrix.h
index b71c3c3b75d7..bdab846496c8 100644
--- a/gfx/skia/skia/src/core/SkBitmapProcState_matrix.h
+++ b/gfx/skia/skia/src/core/SkBitmapProcState_matrix.h
@@ -55,7 +55,7 @@ void SCALE_FILTER_NAME(const SkBitmapProcState& s,
 
     PREAMBLE(s);
 
-    const unsigned maxX = s.fBitmap->width() - 1;
+    const unsigned maxX = s.fPixmap.width() - 1;
     const SkFixed one = s.fFilterOneX;
     const SkFractionalInt dx = s.fInvSxFractionalInt;
     SkFractionalInt fx;
@@ -65,7 +65,7 @@ void SCALE_FILTER_NAME(const SkBitmapProcState& s,
         s.fInvProc(s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf,
                                   SkIntToScalar(y) + SK_ScalarHalf, &pt);
         const SkFixed fy = SkScalarToFixed(pt.fY) - (s.fFilterOneY >> 1);
-        const unsigned maxY = s.fBitmap->height() - 1;
+        const unsigned maxY = s.fPixmap.height() - 1;
         // compute our two Y values up front
         *xy++ = PACK_FILTER_Y_NAME(fy, maxY, s.fFilterOneY PREAMBLE_ARG_Y);
         // now initialize fx
@@ -106,8 +106,8 @@ void AFFINE_FILTER_NAME(const SkBitmapProcState& s,
     SkFixed fy = SkScalarToFixed(srcPt.fY) - (oneY >> 1);
     SkFixed dx = s.fInvSx;
     SkFixed dy = s.fInvKy;
-    unsigned maxX = s.fBitmap->width() - 1;
-    unsigned maxY = s.fBitmap->height() - 1;
+    unsigned maxX = s.fPixmap.width() - 1;
+    unsigned maxY = s.fPixmap.height() - 1;
 
     do {
         *xy++ = PACK_FILTER_Y_NAME(fy, maxY, oneY PREAMBLE_ARG_Y);
@@ -123,8 +123,8 @@ void PERSP_FILTER_NAME(const SkBitmapProcState& s,
     SkASSERT(s.fInvType & SkMatrix::kPerspective_Mask);
 
     PREAMBLE(s);
-    unsigned maxX = s.fBitmap->width() - 1;
-    unsigned maxY = s.fBitmap->height() - 1;
+    unsigned maxX = s.fPixmap.width() - 1;
+    unsigned maxY = s.fPixmap.height() - 1;
     SkFixed oneX = s.fFilterOneX;
     SkFixed oneY = s.fFilterOneY;
 
diff --git a/gfx/skia/skia/src/core/SkBitmapProcState_matrixProcs.cpp b/gfx/skia/skia/src/core/SkBitmapProcState_matrixProcs.cpp
index 02204b676b2f..1870a0e50e90 100644
--- a/gfx/skia/skia/src/core/SkBitmapProcState_matrixProcs.cpp
+++ b/gfx/skia/skia/src/core/SkBitmapProcState_matrixProcs.cpp
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+// The copyright below was added in 2009, but I see no record of moto contributions...?
+
 /* NEON optimized code (C) COPYRIGHT 2009 Motorola
  *
  * Use of this source code is governed by a BSD-style license that can be
@@ -321,7 +330,7 @@ static int nofilter_trans_preamble(const SkBitmapProcState& s, uint32_t** xy,
     s.fInvProc(s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf,
                SkIntToScalar(y) + SK_ScalarHalf, &pt);
     **xy = s.fIntTileProcY(SkScalarToFixed(pt.fY) >> 16,
-                           s.fBitmap->height());
+                           s.fPixmap.height());
     *xy += 1;   // bump the ptr
     // return our starting X position
     return SkScalarToFixed(pt.fX) >> 16;
@@ -332,7 +341,7 @@ static void clampx_nofilter_trans(const SkBitmapProcState& s,
     SkASSERT((s.fInvType & ~SkMatrix::kTranslate_Mask) == 0);
 
     int xpos = nofilter_trans_preamble(s, &xy, x, y);
-    const int width = s.fBitmap->width();
+    const int width = s.fPixmap.width();
     if (1 == width) {
         // all of the following X values must be 0
         memset(xy, 0, count * sizeof(uint16_t));
@@ -380,7 +389,7 @@ static void repeatx_nofilter_trans(const SkBitmapProcState& s,
     SkASSERT((s.fInvType & ~SkMatrix::kTranslate_Mask) == 0);
 
     int xpos = nofilter_trans_preamble(s, &xy, x, y);
-    const int width = s.fBitmap->width();
+    const int width = s.fPixmap.width();
     if (1 == width) {
         // all of the following X values must be 0
         memset(xy, 0, count * sizeof(uint16_t));
@@ -420,7 +429,7 @@ static void mirrorx_nofilter_trans(const SkBitmapProcState& s,
     SkASSERT((s.fInvType & ~SkMatrix::kTranslate_Mask) == 0);
 
     int xpos = nofilter_trans_preamble(s, &xy, x, y);
-    const int width = s.fBitmap->width();
+    const int width = s.fPixmap.width();
     if (1 == width) {
         // all of the following X values must be 0
         memset(xy, 0, count * sizeof(uint16_t));
@@ -477,8 +486,7 @@ static void mirrorx_nofilter_trans(const SkBitmapProcState& s,
 SkBitmapProcState::MatrixProc SkBitmapProcState::chooseMatrixProc(bool trivial_matrix) {
 //    test_int_tileprocs();
     // check for our special case when there is no scale/affine/perspective
-    if (trivial_matrix) {
-        SkASSERT(SkPaint::kNone_FilterLevel == fFilterLevel);
+    if (trivial_matrix && kNone_SkFilterQuality == fFilterLevel) {
         fIntTileProcY = choose_int_tile_proc(fTileModeY);
         switch (fTileModeX) {
             case SkShader::kClamp_TileMode:
@@ -491,7 +499,7 @@ SkBitmapProcState::MatrixProc SkBitmapProcState::chooseMatrixProc(bool trivial_m
     }
 
     int index = 0;
-    if (fFilterLevel != SkPaint::kNone_FilterLevel) {
+    if (fFilterLevel != kNone_SkFilterQuality) {
         index = 1;
     }
     if (fInvType & SkMatrix::kPerspective_Mask) {
@@ -508,8 +516,8 @@ SkBitmapProcState::MatrixProc SkBitmapProcState::chooseMatrixProc(bool trivial_m
     }
 
     // all remaining procs use this form for filterOne
-    fFilterOneX = SK_Fixed1 / fBitmap->width();
-    fFilterOneY = SK_Fixed1 / fBitmap->height();
+    fFilterOneX = SK_Fixed1 / fPixmap.width();
+    fFilterOneY = SK_Fixed1 / fPixmap.height();
 
     if (SkShader::kRepeat_TileMode == fTileModeX && SkShader::kRepeat_TileMode == fTileModeY) {
         return SK_ARM_NEON_WRAP(RepeatX_RepeatY_Procs)[index];
diff --git a/gfx/skia/skia/src/core/SkBitmapProcState_matrix_template.h b/gfx/skia/skia/src/core/SkBitmapProcState_matrix_template.h
index 4b0044b46add..468013c30da9 100644
--- a/gfx/skia/skia/src/core/SkBitmapProcState_matrix_template.h
+++ b/gfx/skia/skia/src/core/SkBitmapProcState_matrix_template.h
@@ -19,14 +19,14 @@ void NoFilterProc_Scale(const SkBitmapProcState& s, uint32_t xy[],
 
     // we store y, x, x, x, x, x
 
-    const unsigned maxX = s.fBitmap->width() - 1;
+    const unsigned maxX = s.fPixmap.width() - 1;
     SkFractionalInt fx;
     {
         SkPoint pt;
         s.fInvProc(s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf,
                                   SkIntToScalar(y) + SK_ScalarHalf, &pt);
         fx = SkScalarToFractionalInt(pt.fY);
-        const unsigned maxY = s.fBitmap->height() - 1;
+        const unsigned maxY = s.fPixmap.height() - 1;
         *xy++ = TileProc::Y(s, SkFractionalIntToFixed(fx), maxY);
         fx = SkScalarToFractionalInt(pt.fX);
     }
@@ -89,8 +89,8 @@ void NoFilterProc_Affine(const SkBitmapProcState& s, uint32_t xy[],
     SkFractionalInt fy = SkScalarToFractionalInt(srcPt.fY);
     SkFractionalInt dx = s.fInvSxFractionalInt;
     SkFractionalInt dy = s.fInvKyFractionalInt;
-    int maxX = s.fBitmap->width() - 1;
-    int maxY = s.fBitmap->height() - 1;
+    int maxX = s.fPixmap.width() - 1;
+    int maxY = s.fPixmap.height() - 1;
 
     for (int i = count; i > 0; --i) {
         *xy++ = (TileProc::Y(s, SkFractionalIntToFixed(fy), maxY) << 16) |
@@ -104,8 +104,8 @@ void NoFilterProc_Persp(const SkBitmapProcState& s, uint32_t* SK_RESTRICT xy,
                         int count, int x, int y) {
     SkASSERT(s.fInvType & SkMatrix::kPerspective_Mask);
 
-    int maxX = s.fBitmap->width() - 1;
-    int maxY = s.fBitmap->height() - 1;
+    int maxX = s.fPixmap.width() - 1;
+    int maxY = s.fPixmap.height() - 1;
 
     SkPerspIter   iter(s.fInvMatrix,
                        SkIntToScalar(x) + SK_ScalarHalf,
diff --git a/gfx/skia/skia/src/core/SkBitmapProcState_procs.h b/gfx/skia/skia/src/core/SkBitmapProcState_procs.h
index 0d3b723e6766..03e192719c57 100644
--- a/gfx/skia/skia/src/core/SkBitmapProcState_procs.h
+++ b/gfx/skia/skia/src/core/SkBitmapProcState_procs.h
@@ -90,7 +90,7 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,
 #define MAKENAME(suffix)        NAME_WRAP(S32_opaque_D32 ## suffix)
 #define DSTSIZE                 32
 #define SRCTYPE                 SkPMColor
-#define CHECKSTATE(state)       SkASSERT(4 == state.fBitmap->bytesPerPixel()); \
+#define CHECKSTATE(state)       SkASSERT(4 == state.fPixmap.info().bytesPerPixel()); \
                                 SkASSERT(state.fAlphaScale == 256)
 #define RETURNDST(src)          src
 #define SRC_TO_FILTER(src)      src
@@ -102,7 +102,7 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,
 #define MAKENAME(suffix)        NAME_WRAP(S32_alpha_D32 ## suffix)
 #define DSTSIZE                 32
 #define SRCTYPE                 SkPMColor
-#define CHECKSTATE(state)       SkASSERT(4 == state.fBitmap->bytesPerPixel()); \
+#define CHECKSTATE(state)       SkASSERT(4 == state.fPixmap.info().bytesPerPixel()); \
                                 SkASSERT(state.fAlphaScale < 256)
 #define PREAMBLE(state)         unsigned alphaScale = state.fAlphaScale
 #define RETURNDST(src)          SkAlphaMulQ(src, alphaScale)
@@ -121,7 +121,7 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,
 #define MAKENAME(suffix)        NAME_WRAP(S16_opaque_D32 ## suffix)
 #define DSTSIZE                 32
 #define SRCTYPE                 uint16_t
-#define CHECKSTATE(state)       SkASSERT(kRGB_565_SkColorType == state.fBitmap->colorType()); \
+#define CHECKSTATE(state)       SkASSERT(kRGB_565_SkColorType == state.fPixmap.colorType()); \
                                 SkASSERT(state.fAlphaScale == 256)
 #define RETURNDST(src)          SkPixel16ToPixel32(src)
 #define SRC_TO_FILTER(src)      src
@@ -137,7 +137,7 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,
 #define MAKENAME(suffix)        NAME_WRAP(S16_alpha_D32 ## suffix)
 #define DSTSIZE                 32
 #define SRCTYPE                 uint16_t
-#define CHECKSTATE(state)       SkASSERT(kRGB_565_SkColorType == state.fBitmap->colorType()); \
+#define CHECKSTATE(state)       SkASSERT(kRGB_565_SkColorType == state.fPixmap.colorType()); \
                                 SkASSERT(state.fAlphaScale < 256)
 #define PREAMBLE(state)         unsigned alphaScale = state.fAlphaScale
 #define RETURNDST(src)          SkAlphaMulQ(SkPixel16ToPixel32(src), alphaScale)
@@ -152,12 +152,12 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,
 #define MAKENAME(suffix)        NAME_WRAP(SI8_opaque_D32 ## suffix)
 #define DSTSIZE                 32
 #define SRCTYPE                 uint8_t
-#define CHECKSTATE(state)       SkASSERT(kIndex_8_SkColorType == state.fBitmap->colorType()); \
+#define CHECKSTATE(state)       SkASSERT(kIndex_8_SkColorType == state.fPixmap.colorType()); \
                                 SkASSERT(state.fAlphaScale == 256)
-#define PREAMBLE(state)         const SkPMColor* SK_RESTRICT table = state.fBitmap->getColorTable()->lockColors()
+#define PREAMBLE(state)         const SkPMColor* SK_RESTRICT table = state.fPixmap.ctable()->readColors()
 #define RETURNDST(src)          table[src]
 #define SRC_TO_FILTER(src)      table[src]
-#define POSTAMBLE(state)        state.fBitmap->getColorTable()->unlockColors()
+#define POSTAMBLE(state)
 #include "SkBitmapProcState_sample.h"
 
 #undef FILTER_PROC
@@ -166,13 +166,13 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,
 #define MAKENAME(suffix)        NAME_WRAP(SI8_alpha_D32 ## suffix)
 #define DSTSIZE                 32
 #define SRCTYPE                 uint8_t
-#define CHECKSTATE(state)       SkASSERT(kIndex_8_SkColorType == state.fBitmap->colorType()); \
+#define CHECKSTATE(state)       SkASSERT(kIndex_8_SkColorType == state.fPixmap.colorType()); \
                                 SkASSERT(state.fAlphaScale < 256)
 #define PREAMBLE(state)         unsigned alphaScale = state.fAlphaScale; \
-                                const SkPMColor* SK_RESTRICT table = state.fBitmap->getColorTable()->lockColors()
+                                const SkPMColor* SK_RESTRICT table = state.fPixmap.ctable()->readColors()
 #define RETURNDST(src)          SkAlphaMulQ(table[src], alphaScale)
 #define SRC_TO_FILTER(src)      table[src]
-#define POSTAMBLE(state)        state.fBitmap->getColorTable()->unlockColors()
+#define POSTAMBLE(state)
 #include "SkBitmapProcState_sample.h"
 
 // SRC == 4444
@@ -183,7 +183,7 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,
 #define MAKENAME(suffix)        NAME_WRAP(S4444_opaque_D32 ## suffix)
 #define DSTSIZE                 32
 #define SRCTYPE                 SkPMColor16
-#define CHECKSTATE(state)       SkASSERT(kARGB_4444_SkColorType == state.fBitmap->colorType()); \
+#define CHECKSTATE(state)       SkASSERT(kARGB_4444_SkColorType == state.fPixmap.colorType()); \
                                 SkASSERT(state.fAlphaScale == 256)
 #define RETURNDST(src)          SkPixel4444ToPixel32(src)
 #define SRC_TO_FILTER(src)      src
@@ -199,7 +199,7 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,
 #define MAKENAME(suffix)        NAME_WRAP(S4444_alpha_D32 ## suffix)
 #define DSTSIZE                 32
 #define SRCTYPE                 SkPMColor16
-#define CHECKSTATE(state)       SkASSERT(kARGB_4444_SkColorType == state.fBitmap->colorType()); \
+#define CHECKSTATE(state)       SkASSERT(kARGB_4444_SkColorType == state.fPixmap.colorType()); \
                                 SkASSERT(state.fAlphaScale < 256)
 #define PREAMBLE(state)         unsigned alphaScale = state.fAlphaScale
 #define RETURNDST(src)          SkAlphaMulQ(SkPixel4444ToPixel32(src), alphaScale)
@@ -218,12 +218,31 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,
 #define MAKENAME(suffix)        NAME_WRAP(SA8_alpha_D32 ## suffix)
 #define DSTSIZE                 32
 #define SRCTYPE                 uint8_t
-#define CHECKSTATE(state)       SkASSERT(kAlpha_8_SkColorType == state.fBitmap->colorType());
+#define CHECKSTATE(state)       SkASSERT(kAlpha_8_SkColorType == state.fPixmap.colorType());
 #define PREAMBLE(state)         const SkPMColor pmColor = state.fPaintPMColor;
 #define RETURNDST(src)          SkAlphaMulQ(pmColor, SkAlpha255To256(src))
 #define SRC_TO_FILTER(src)      src
 #include "SkBitmapProcState_sample.h"
 
+// SRC == Gray8
+
+#undef FILTER_PROC
+#define FILTER_PROC(x, y, a, b, c, d, dst) \
+    do {                                                        \
+        unsigned tmp = Filter_8(x, y, a, b, c, d);              \
+        SkPMColor color = SkPackARGB32(0xFF, tmp, tmp, tmp);    \
+        *(dst) = SkAlphaMulQ(color, alphaScale);                \
+    } while (0)
+
+#define MAKENAME(suffix)        NAME_WRAP(SG8_alpha_D32 ## suffix)
+#define DSTSIZE                 32
+#define SRCTYPE                 uint8_t
+#define CHECKSTATE(state)       SkASSERT(kGray_8_SkColorType == state.fPixmap.colorType());
+#define PREAMBLE(state)         unsigned alphaScale = state.fAlphaScale
+#define RETURNDST(src)          SkAlphaMulQ(SkPackARGB32(0xFF, src, src, src), alphaScale)
+#define SRC_TO_FILTER(src)      src
+#include "SkBitmapProcState_sample.h"
+
 /*****************************************************************************
  *
  *  D16 functions
@@ -243,8 +262,8 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,
 #define MAKENAME(suffix)        NAME_WRAP(S32_D16 ## suffix)
 #define DSTSIZE                 16
 #define SRCTYPE                 SkPMColor
-#define CHECKSTATE(state)       SkASSERT(4 == state.fBitmap->bytesPerPixel()); \
-                                SkASSERT(state.fBitmap->isOpaque())
+#define CHECKSTATE(state)       SkASSERT(4 == state.fPixmap.info().bytesPerPixel()); \
+                                SkASSERT(state.fPixmap.isOpaque())
 #define RETURNDST(src)          SkPixel32ToPixel16(src)
 #define SRC_TO_FILTER(src)      src
 #include "SkBitmapProcState_sample.h"
@@ -261,7 +280,7 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,
 #define MAKENAME(suffix)        NAME_WRAP(S16_D16 ## suffix)
 #define DSTSIZE                 16
 #define SRCTYPE                 uint16_t
-#define CHECKSTATE(state)       SkASSERT(kRGB_565_SkColorType == state.fBitmap->colorType())
+#define CHECKSTATE(state)       SkASSERT(kRGB_565_SkColorType == state.fPixmap.colorType())
 #define RETURNDST(src)          src
 #define SRC_TO_FILTER(src)      src
 #include "SkBitmapProcState_sample.h"
@@ -278,12 +297,12 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,
 #define MAKENAME(suffix)        NAME_WRAP(SI8_D16 ## suffix)
 #define DSTSIZE                 16
 #define SRCTYPE                 uint8_t
-#define CHECKSTATE(state)       SkASSERT(kIndex_8_SkColorType == state.fBitmap->colorType()); \
-                                SkASSERT(state.fBitmap->isOpaque())
-#define PREAMBLE(state)         const uint16_t* SK_RESTRICT table = state.fBitmap->getColorTable()->lock16BitCache()
+#define CHECKSTATE(state)       SkASSERT(kIndex_8_SkColorType == state.fPixmap.colorType()); \
+                                SkASSERT(state.fPixmap.isOpaque())
+#define PREAMBLE(state)         const uint16_t* SK_RESTRICT table = state.fPixmap.ctable()->read16BitCache()
 #define RETURNDST(src)          table[src]
 #define SRC_TO_FILTER(src)      table[src]
-#define POSTAMBLE(state)        state.fBitmap->getColorTable()->unlock16BitCache()
+#define POSTAMBLE(state)
 #include "SkBitmapProcState_sample.h"
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -306,7 +325,7 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,
 #define MAKENAME(suffix)        NAME_WRAP(Clamp_S16_D16 ## suffix)
 #define SRCTYPE                 uint16_t
 #define DSTTYPE                 uint16_t
-#define CHECKSTATE(state)       SkASSERT(kRGB_565_SkColorType == state.fBitmap->colorType())
+#define CHECKSTATE(state)       SkASSERT(kRGB_565_SkColorType == state.fPixmap.colorType())
 #define SRC_TO_FILTER(src)      src
 #include "SkBitmapProcState_shaderproc.h"
 
@@ -319,7 +338,7 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,
 #define MAKENAME(suffix)        NAME_WRAP(Repeat_S16_D16 ## suffix)
 #define SRCTYPE                 uint16_t
 #define DSTTYPE                 uint16_t
-#define CHECKSTATE(state)       SkASSERT(kRGB_565_SkColorType == state.fBitmap->colorType())
+#define CHECKSTATE(state)       SkASSERT(kRGB_565_SkColorType == state.fPixmap.colorType())
 #define SRC_TO_FILTER(src)      src
 #include "SkBitmapProcState_shaderproc.h"
 
@@ -334,10 +353,10 @@ static inline U8CPU Filter_8(unsigned x, unsigned y,
 #define MAKENAME(suffix)        NAME_WRAP(Clamp_SI8_opaque_D32 ## suffix)
 #define SRCTYPE                 uint8_t
 #define DSTTYPE                 uint32_t
-#define CHECKSTATE(state)       SkASSERT(kIndex_8_SkColorType == state.fBitmap->colorType())
-#define PREAMBLE(state)         const SkPMColor* SK_RESTRICT table = state.fBitmap->getColorTable()->lockColors()
+#define CHECKSTATE(state)       SkASSERT(kIndex_8_SkColorType == state.fPixmap.colorType())
+#define PREAMBLE(state)         const SkPMColor* SK_RESTRICT table = state.fPixmap.ctable()->readColors()
 #define SRC_TO_FILTER(src)      table[src]
-#define POSTAMBLE(state)        state.fBitmap->getColorTable()->unlockColors()
+#define POSTAMBLE(state)
 #include "SkBitmapProcState_shaderproc.h"
 
 #undef NAME_WRAP
diff --git a/gfx/skia/skia/src/core/SkBitmapProcState_sample.h b/gfx/skia/skia/src/core/SkBitmapProcState_sample.h
index 5c5f199f25cf..f70b758ac231 100644
--- a/gfx/skia/skia/src/core/SkBitmapProcState_sample.h
+++ b/gfx/skia/skia/src/core/SkBitmapProcState_sample.h
@@ -1,10 +1,10 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 #include "SkUtils.h"
 
 #if DSTSIZE==32
@@ -41,36 +41,36 @@ void MAKENAME(_filter_DXDY)(const SkBitmapProcState& s,
 void MAKENAME(_nofilter_DXDY)(const SkBitmapProcState& s,
                               const uint32_t* SK_RESTRICT xy,
                               int count, DSTTYPE* SK_RESTRICT colors) {
-    SkASSERT(count > 0 && colors != NULL);
-    SkASSERT(SkPaint::kNone_FilterLevel == s.fFilterLevel);
+    SkASSERT(count > 0 && colors != nullptr);
+    SkASSERT(kNone_SkFilterQuality == s.fFilterLevel);
     SkDEBUGCODE(CHECKSTATE(s);)
 
 #ifdef PREAMBLE
     PREAMBLE(s);
 #endif
-    const char* SK_RESTRICT srcAddr = (const char*)s.fBitmap->getPixels();
-    size_t rb = s.fBitmap->rowBytes();
+    const char* SK_RESTRICT srcAddr = (const char*)s.fPixmap.addr();
+    size_t rb = s.fPixmap.rowBytes();
 
     uint32_t XY;
     SRCTYPE src;
 
     for (int i = (count >> 1); i > 0; --i) {
         XY = *xy++;
-        SkASSERT((XY >> 16) < (unsigned)s.fBitmap->height() &&
-                 (XY & 0xFFFF) < (unsigned)s.fBitmap->width());
+        SkASSERT((XY >> 16) < (unsigned)s.fPixmap.height() &&
+                 (XY & 0xFFFF) < (unsigned)s.fPixmap.width());
         src = ((const SRCTYPE*)(srcAddr + (XY >> 16) * rb))[XY & 0xFFFF];
         *colors++ = RETURNDST(src);
 
         XY = *xy++;
-        SkASSERT((XY >> 16) < (unsigned)s.fBitmap->height() &&
-                 (XY & 0xFFFF) < (unsigned)s.fBitmap->width());
+        SkASSERT((XY >> 16) < (unsigned)s.fPixmap.height() &&
+                 (XY & 0xFFFF) < (unsigned)s.fPixmap.width());
         src = ((const SRCTYPE*)(srcAddr + (XY >> 16) * rb))[XY & 0xFFFF];
         *colors++ = RETURNDST(src);
     }
     if (count & 1) {
         XY = *xy++;
-        SkASSERT((XY >> 16) < (unsigned)s.fBitmap->height() &&
-                 (XY & 0xFFFF) < (unsigned)s.fBitmap->width());
+        SkASSERT((XY >> 16) < (unsigned)s.fPixmap.height() &&
+                 (XY & 0xFFFF) < (unsigned)s.fPixmap.width());
         src = ((const SRCTYPE*)(srcAddr + (XY >> 16) * rb))[XY & 0xFFFF];
         *colors++ = RETURNDST(src);
     }
@@ -83,26 +83,26 @@ void MAKENAME(_nofilter_DXDY)(const SkBitmapProcState& s,
 void MAKENAME(_nofilter_DX)(const SkBitmapProcState& s,
                             const uint32_t* SK_RESTRICT xy,
                             int count, DSTTYPE* SK_RESTRICT colors) {
-    SkASSERT(count > 0 && colors != NULL);
+    SkASSERT(count > 0 && colors != nullptr);
     SkASSERT(s.fInvType <= (SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask));
-    SkASSERT(SkPaint::kNone_FilterLevel == s.fFilterLevel);
+    SkASSERT(kNone_SkFilterQuality == s.fFilterLevel);
     SkDEBUGCODE(CHECKSTATE(s);)
 
 #ifdef PREAMBLE
     PREAMBLE(s);
 #endif
-    const SRCTYPE* SK_RESTRICT srcAddr = (const SRCTYPE*)s.fBitmap->getPixels();
+    const SRCTYPE* SK_RESTRICT srcAddr = (const SRCTYPE*)s.fPixmap.addr();
 
     // buffer is y32, x16, x16, x16, x16, x16
     // bump srcAddr to the proper row, since we're told Y never changes
-    SkASSERT((unsigned)xy[0] < (unsigned)s.fBitmap->height());
+    SkASSERT((unsigned)xy[0] < (unsigned)s.fPixmap.height());
     srcAddr = (const SRCTYPE*)((const char*)srcAddr +
-                                                xy[0] * s.fBitmap->rowBytes());
+                                                xy[0] * s.fPixmap.rowBytes());
     xy += 1;
 
     SRCTYPE src;
 
-    if (1 == s.fBitmap->width()) {
+    if (1 == s.fPixmap.width()) {
         src = srcAddr[0];
         DSTTYPE dstValue = RETURNDST(src);
         BITMAPPROC_MEMSET(colors, dstValue, count);
@@ -123,7 +123,7 @@ void MAKENAME(_nofilter_DX)(const SkBitmapProcState& s,
         }
         const uint16_t* SK_RESTRICT xx = (const uint16_t*)(xy);
         for (i = (count & 3); i > 0; --i) {
-            SkASSERT(*xx < (unsigned)s.fBitmap->width());
+            SkASSERT(*xx < (unsigned)s.fPixmap.width());
             src = srcAddr[*xx++]; *colors++ = RETURNDST(src);
         }
     }
@@ -138,15 +138,15 @@ void MAKENAME(_nofilter_DX)(const SkBitmapProcState& s,
 void MAKENAME(_filter_DX)(const SkBitmapProcState& s,
                           const uint32_t* SK_RESTRICT xy,
                            int count, DSTTYPE* SK_RESTRICT colors) {
-    SkASSERT(count > 0 && colors != NULL);
-    SkASSERT(s.fFilterLevel != SkPaint::kNone_FilterLevel);
+    SkASSERT(count > 0 && colors != nullptr);
+    SkASSERT(s.fFilterLevel != kNone_SkFilterQuality);
     SkDEBUGCODE(CHECKSTATE(s);)
 
 #ifdef PREAMBLE
     PREAMBLE(s);
 #endif
-    const char* SK_RESTRICT srcAddr = (const char*)s.fBitmap->getPixels();
-    size_t rb = s.fBitmap->rowBytes();
+    const char* SK_RESTRICT srcAddr = (const char*)s.fPixmap.addr();
+    size_t rb = s.fPixmap.rowBytes();
     unsigned subY;
     const SRCTYPE* SK_RESTRICT row0;
     const SRCTYPE* SK_RESTRICT row1;
@@ -184,15 +184,15 @@ void MAKENAME(_filter_DX)(const SkBitmapProcState& s,
 void MAKENAME(_filter_DXDY)(const SkBitmapProcState& s,
                             const uint32_t* SK_RESTRICT xy,
                             int count, DSTTYPE* SK_RESTRICT colors) {
-    SkASSERT(count > 0 && colors != NULL);
-    SkASSERT(s.fFilterLevel != SkPaint::kNone_FilterLevel);
+    SkASSERT(count > 0 && colors != nullptr);
+    SkASSERT(s.fFilterLevel != kNone_SkFilterQuality);
     SkDEBUGCODE(CHECKSTATE(s);)
 
 #ifdef PREAMBLE
         PREAMBLE(s);
 #endif
-    const char* SK_RESTRICT srcAddr = (const char*)s.fBitmap->getPixels();
-    size_t rb = s.fBitmap->rowBytes();
+    const char* SK_RESTRICT srcAddr = (const char*)s.fPixmap.addr();
+    size_t rb = s.fPixmap.rowBytes();
 
     do {
         uint32_t data = *xy++;
diff --git a/gfx/skia/skia/src/core/SkBitmapProcState_shaderproc.h b/gfx/skia/skia/src/core/SkBitmapProcState_shaderproc.h
index 0014b4a526f5..94b2d3b48c26 100644
--- a/gfx/skia/skia/src/core/SkBitmapProcState_shaderproc.h
+++ b/gfx/skia/skia/src/core/SkBitmapProcState_shaderproc.h
@@ -20,11 +20,11 @@ void SCALE_FILTER_NAME(const SkBitmapProcState& s, int x, int y,
     SkASSERT((s.fInvType & ~(SkMatrix::kTranslate_Mask |
                              SkMatrix::kScale_Mask)) == 0);
     SkASSERT(s.fInvKy == 0);
-    SkASSERT(count > 0 && colors != NULL);
-    SkASSERT(s.fFilterLevel != SkPaint::kNone_FilterLevel);
+    SkASSERT(count > 0 && colors != nullptr);
+    SkASSERT(s.fFilterLevel != kNone_SkFilterQuality);
     SkDEBUGCODE(CHECKSTATE(s);)
 
-    const unsigned maxX = s.fBitmap->width() - 1;
+    const unsigned maxX = s.fPixmap.width() - 1;
     const SkFixed oneX = s.fFilterOneX;
     const SkFixed dx = s.fInvSx;
     SkFixed fx;
@@ -37,14 +37,14 @@ void SCALE_FILTER_NAME(const SkBitmapProcState& s, int x, int y,
         s.fInvProc(s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf,
                    SkIntToScalar(y) + SK_ScalarHalf, &pt);
         SkFixed fy = SkScalarToFixed(pt.fY) - (s.fFilterOneY >> 1);
-        const unsigned maxY = s.fBitmap->height() - 1;
+        const unsigned maxY = s.fPixmap.height() - 1;
         // compute our two Y values up front
         subY = TILEY_LOW_BITS(fy, maxY);
         int y0 = TILEY_PROCF(fy, maxY);
         int y1 = TILEY_PROCF((fy + s.fFilterOneY), maxY);
 
-        const char* SK_RESTRICT srcAddr = (const char*)s.fBitmap->getPixels();
-        size_t rb = s.fBitmap->rowBytes();
+        const char* SK_RESTRICT srcAddr = (const char*)s.fPixmap.addr();
+        size_t rb = s.fPixmap.rowBytes();
         row0 = (const SRCTYPE*)(srcAddr + y0 * rb);
         row1 = (const SRCTYPE*)(srcAddr + y1 * rb);
         // now initialize fx
diff --git a/gfx/skia/skia/src/core/SkBitmapProvider.cpp b/gfx/skia/skia/src/core/SkBitmapProvider.cpp
new file mode 100644
index 000000000000..9cf2e9ae6be3
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkBitmapProvider.cpp
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkBitmapProvider.h"
+#include "SkImage_Base.h"
+#include "SkPixelRef.h"
+
+int SkBitmapProvider::width() const {
+    return fImage ? fImage->width() : fBitmap.width();
+}
+
+int SkBitmapProvider::height() const {
+    return fImage ? fImage->height() : fBitmap.height();
+}
+
+uint32_t SkBitmapProvider::getID() const {
+    return fImage ? fImage->uniqueID() : fBitmap.getGenerationID();
+}
+
+bool SkBitmapProvider::validForDrawing() const {
+    if (!fImage) {
+        if (0 == fBitmap.width() || 0 == fBitmap.height()) {
+            return false;
+        }
+        if (nullptr == fBitmap.pixelRef()) {
+            return false;   // no pixels to read
+        }
+        if (fBitmap.getTexture()) {
+            // we can handle texture (ugh) since lockPixels will perform a read-back
+            return true;
+        }
+        if (kIndex_8_SkColorType == fBitmap.colorType()) {
+            SkAutoLockPixels alp(fBitmap); // but we need to call it before getColorTable() is safe.
+            if (!fBitmap.getColorTable()) {
+                return false;
+            }
+        }
+    }
+    return true;
+}
+
+SkImageInfo SkBitmapProvider::info() const {
+    if (fImage) {
+        SkAlphaType at = fImage->isOpaque() ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
+        return SkImageInfo::MakeN32(fImage->width(), fImage->height(), at);
+    } else {
+        return fBitmap.info();
+    }
+}
+
+bool SkBitmapProvider::isVolatile() const {
+    if (fImage) {
+        return false;   // add flag to images?
+    } else {
+        return fBitmap.isVolatile();
+    }
+}
+
+SkBitmapCacheDesc SkBitmapProvider::makeCacheDesc(int w, int h) const {
+    return fImage ? SkBitmapCacheDesc::Make(fImage, w, h) : SkBitmapCacheDesc::Make(fBitmap, w, h);
+}
+
+SkBitmapCacheDesc SkBitmapProvider::makeCacheDesc() const {
+    return fImage ? SkBitmapCacheDesc::Make(fImage) : SkBitmapCacheDesc::Make(fBitmap);
+}
+
+void SkBitmapProvider::notifyAddedToCache() const {
+    if (fImage) {
+        as_IB(fImage)->notifyAddedToCache();
+    } else {
+        fBitmap.pixelRef()->notifyAddedToCache();
+    }
+}
+
+bool SkBitmapProvider::asBitmap(SkBitmap* bm) const {
+    if (fImage) {
+        return as_IB(fImage)->getROPixels(bm, SkImage::kAllow_CachingHint);
+    } else {
+        *bm = fBitmap;
+        return true;
+    }
+}
+
diff --git a/gfx/skia/skia/src/core/SkBitmapProvider.h b/gfx/skia/skia/src/core/SkBitmapProvider.h
new file mode 100644
index 000000000000..9901c0fc1a05
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkBitmapProvider.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkBitmapProvider_DEFINED
+#define SkBitmapProvider_DEFINED
+
+#include "SkBitmap.h"
+#include "SkImage.h"
+#include "SkBitmapCache.h"
+
+class SkBitmapProvider {
+public:
+    explicit SkBitmapProvider(const SkBitmap& bm) : fBitmap(bm) {}
+    explicit SkBitmapProvider(const SkImage* img) : fImage(SkSafeRef(img)) {}
+    SkBitmapProvider(const SkBitmapProvider& other)
+        : fBitmap(other.fBitmap)
+        , fImage(SkSafeRef(other.fImage.get()))
+    {}
+
+    int width() const;
+    int height() const;
+    uint32_t getID() const;
+
+    bool validForDrawing() const;
+    SkImageInfo info() const;
+    bool isVolatile() const;
+
+    SkBitmapCacheDesc makeCacheDesc(int w, int h) const;
+    SkBitmapCacheDesc makeCacheDesc() const;
+    void notifyAddedToCache() const;
+
+    // Only call this if you're sure you need the bits, since it maybe expensive
+    // ... cause a decode and cache, or gpu-readback
+    bool asBitmap(SkBitmap*) const;
+
+private:
+    SkBitmap fBitmap;
+    SkAutoTUnref<const SkImage> fImage;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/core/SkBitmapScaler.cpp b/gfx/skia/skia/src/core/SkBitmapScaler.cpp
index aaee600c8f86..965955a2dcbf 100644
--- a/gfx/skia/skia/src/core/SkBitmapScaler.cpp
+++ b/gfx/skia/skia/src/core/SkBitmapScaler.cpp
@@ -1,9 +1,18 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkBitmapScaler.h"
 #include "SkBitmapFilter.h"
-#include "SkRect.h"
-#include "SkTArray.h"
-#include "SkErrorInternals.h"
 #include "SkConvolver.h"
+#include "SkImageInfo.h"
+#include "SkPixmap.h"
+#include "SkRect.h"
+#include "SkScalar.h"
+#include "SkTArray.h"
 
 // SkResizeFilter ----------------------------------------------------------------
 
@@ -16,9 +25,7 @@ public:
                    float destWidth, float destHeight,
                    const SkRect& destSubset,
                    const SkConvolutionProcs& convolveProcs);
-    ~SkResizeFilter() {
-        SkDELETE( fBitmapFilter );
-    }
+    ~SkResizeFilter() { delete fBitmapFilter; }
 
     // Returns the filled filter values.
     const SkConvolutionFilter1D& xFilter() { return fXFilter; }
@@ -55,29 +62,25 @@ SkResizeFilter::SkResizeFilter(SkBitmapScaler::ResizeMethod method,
                                const SkRect& destSubset,
                                const SkConvolutionProcs& convolveProcs) {
 
-    // method will only ever refer to an "algorithm method".
-    SkASSERT((SkBitmapScaler::RESIZE_FIRST_ALGORITHM_METHOD <= method) &&
-             (method <= SkBitmapScaler::RESIZE_LAST_ALGORITHM_METHOD));
+    SkASSERT(method >= SkBitmapScaler::RESIZE_FirstMethod &&
+             method <= SkBitmapScaler::RESIZE_LastMethod);
 
+    fBitmapFilter = nullptr;
     switch(method) {
         case SkBitmapScaler::RESIZE_BOX:
-            fBitmapFilter = SkNEW(SkBoxFilter);
+            fBitmapFilter = new SkBoxFilter;
             break;
         case SkBitmapScaler::RESIZE_TRIANGLE:
-            fBitmapFilter = SkNEW(SkTriangleFilter);
+            fBitmapFilter = new SkTriangleFilter;
             break;
         case SkBitmapScaler::RESIZE_MITCHELL:
-            fBitmapFilter = SkNEW_ARGS(SkMitchellFilter, (1.f/3.f, 1.f/3.f));
+            fBitmapFilter = new SkMitchellFilter(1.f / 3.f, 1.f / 3.f);
             break;
         case SkBitmapScaler::RESIZE_HAMMING:
-            fBitmapFilter = SkNEW(SkHammingFilter);
+            fBitmapFilter = new SkHammingFilter;
             break;
         case SkBitmapScaler::RESIZE_LANCZOS3:
-            fBitmapFilter = SkNEW(SkLanczosFilter);
-            break;
-        default:
-            // NOTREACHED:
-            fBitmapFilter = SkNEW_ARGS(SkMitchellFilter, (1.f/3.f, 1.f/3.f));
+            fBitmapFilter = new SkLanczosFilter;
             break;
     }
 
@@ -207,126 +210,52 @@ void SkResizeFilter::computeFilters(int srcSize,
   }
 }
 
-static SkBitmapScaler::ResizeMethod ResizeMethodToAlgorithmMethod(
-                                    SkBitmapScaler::ResizeMethod method) {
-    // Convert any "Quality Method" into an "Algorithm Method"
-    if (method >= SkBitmapScaler::RESIZE_FIRST_ALGORITHM_METHOD &&
-    method <= SkBitmapScaler::RESIZE_LAST_ALGORITHM_METHOD) {
-        return method;
-    }
-    // The call to SkBitmapScalerGtv::Resize() above took care of
-    // GPU-acceleration in the cases where it is possible. So now we just
-    // pick the appropriate software method for each resize quality.
-    switch (method) {
-        // Users of RESIZE_GOOD are willing to trade a lot of quality to
-        // get speed, allowing the use of linear resampling to get hardware
-        // acceleration (SRB). Hence any of our "good" software filters
-        // will be acceptable, so we use a triangle.
-        case SkBitmapScaler::RESIZE_GOOD:
-            return SkBitmapScaler::RESIZE_TRIANGLE;
-        // Users of RESIZE_BETTER are willing to trade some quality in order
-        // to improve performance, but are guaranteed not to devolve to a linear
-        // resampling. In visual tests we see that Hamming-1 is not as good as
-        // Lanczos-2, however it is about 40% faster and Lanczos-2 itself is
-        // about 30% faster than Lanczos-3. The use of Hamming-1 has been deemed
-        // an acceptable trade-off between quality and speed.
-        case SkBitmapScaler::RESIZE_BETTER:
-            return SkBitmapScaler::RESIZE_HAMMING;
-        default:
-#ifdef SK_HIGH_QUALITY_IS_LANCZOS
-            return SkBitmapScaler::RESIZE_LANCZOS3;
-#else
-            return SkBitmapScaler::RESIZE_MITCHELL;
-#endif
-    }
-}
-
-// static
-bool SkBitmapScaler::Resize(SkBitmap* resultPtr,
-                            const SkBitmap& source,
-                            ResizeMethod method,
-                            float destWidth, float destHeight,
-                            SkBitmap::Allocator* allocator) {
-
-  SkConvolutionProcs convolveProcs= { 0, NULL, NULL, NULL, NULL };
-  PlatformConvolutionProcs(&convolveProcs);
-
-  SkRect destSubset = { 0, 0, destWidth, destHeight };
-
-  // Ensure that the ResizeMethod enumeration is sound.
-    SkASSERT(((RESIZE_FIRST_QUALITY_METHOD <= method) &&
-        (method <= RESIZE_LAST_QUALITY_METHOD)) ||
-        ((RESIZE_FIRST_ALGORITHM_METHOD <= method) &&
-        (method <= RESIZE_LAST_ALGORITHM_METHOD)));
-
-    SkRect dest = { 0, 0, destWidth, destHeight };
-    if (!dest.contains(destSubset)) {
-        SkErrorInternals::SetError( kInvalidArgument_SkError,
-                                    "Sorry, the destination bitmap scale subset "
-                                    "falls outside the full destination bitmap." );
-    }
-
-    // If the size of source or destination is 0, i.e. 0x0, 0xN or Nx0, just
-    // return empty.
-    if (source.width() < 1 || source.height() < 1 ||
-        destWidth < 1 || destHeight < 1) {
-        // todo: seems like we could handle negative dstWidth/Height, since that
-        // is just a negative scale (flip)
+bool SkBitmapScaler::Resize(SkBitmap* resultPtr, const SkPixmap& source, ResizeMethod method,
+                            int destWidth, int destHeight, SkBitmap::Allocator* allocator) {
+    if (nullptr == source.addr() || source.colorType() != kN32_SkColorType ||
+        source.width() < 1 || source.height() < 1)
+    {
         return false;
     }
 
-    method = ResizeMethodToAlgorithmMethod(method);
-
-    // Check that we deal with an "algorithm methods" from this point onward.
-    SkASSERT((SkBitmapScaler::RESIZE_FIRST_ALGORITHM_METHOD <= method) &&
-        (method <= SkBitmapScaler::RESIZE_LAST_ALGORITHM_METHOD));
-
-    SkAutoLockPixels locker(source);
-    if (!source.readyToDraw() ||
-        source.colorType() != kN32_SkColorType) {
+    if (destWidth < 1 || destHeight < 1) {
         return false;
     }
 
+    SkConvolutionProcs convolveProcs= { 0, nullptr, nullptr, nullptr, nullptr };
+    PlatformConvolutionProcs(&convolveProcs);
+
+    SkRect destSubset = SkRect::MakeIWH(destWidth, destHeight);
+
     SkResizeFilter filter(method, source.width(), source.height(),
-                          destWidth, destHeight, destSubset, convolveProcs);
+                        destWidth, destHeight, destSubset, convolveProcs);
 
-    // Get a source bitmap encompassing this touched area. We construct the
+    // Get a subset encompassing this touched area. We construct the
     // offsets and row strides such that it looks like a new bitmap, while
     // referring to the old data.
-    const unsigned char* sourceSubset =
-        reinterpret_cast<const unsigned char*>(source.getPixels());
+    const uint8_t* sourceSubset = reinterpret_cast<const uint8_t*>(source.addr());
 
     // Convolve into the result.
     SkBitmap result;
     result.setInfo(SkImageInfo::MakeN32(SkScalarCeilToInt(destSubset.width()),
-                                        SkScalarCeilToInt(destSubset.height()),
-                                        source.alphaType()));
-    result.allocPixels(allocator, NULL);
+                                      SkScalarCeilToInt(destSubset.height()),
+                                      source.alphaType()));
+    result.allocPixels(allocator, nullptr);
     if (!result.readyToDraw()) {
+      return false;
+    }
+
+    if (!BGRAConvolve2D(sourceSubset, static_cast<int>(source.rowBytes()),
+                        !source.isOpaque(), filter.xFilter(), filter.yFilter(),
+                        static_cast<int>(result.rowBytes()),
+                        static_cast<unsigned char*>(result.getPixels()),
+                        convolveProcs, true)) {
         return false;
     }
 
-    BGRAConvolve2D(sourceSubset, static_cast<int>(source.rowBytes()),
-        !source.isOpaque(), filter.xFilter(), filter.yFilter(),
-        static_cast<int>(result.rowBytes()),
-        static_cast<unsigned char*>(result.getPixels()),
-        convolveProcs, true);
-
     *resultPtr = result;
     resultPtr->lockPixels();
-    SkASSERT(NULL != resultPtr->getPixels());
+    SkASSERT(resultPtr->getPixels());
     return true;
 }
 
-// static -- simpler interface to the resizer; returns a default bitmap if scaling
-// fails for any reason.  This is the interface that Chrome expects.
-SkBitmap SkBitmapScaler::Resize(const SkBitmap& source,
-                                ResizeMethod method,
-                                float destWidth, float destHeight,
-                                SkBitmap::Allocator* allocator) {
-  SkBitmap result;
-  if (!Resize(&result, source, method, destWidth, destHeight, allocator)) {
-    return SkBitmap();
-  }
-  return result;
-}
diff --git a/gfx/skia/skia/src/core/SkBitmapScaler.h b/gfx/skia/skia/src/core/SkBitmapScaler.h
index ec4c8170bc57..03feec3e127c 100644
--- a/gfx/skia/skia/src/core/SkBitmapScaler.h
+++ b/gfx/skia/skia/src/core/SkBitmapScaler.h
@@ -19,76 +19,18 @@
 class SK_API SkBitmapScaler {
 public:
     enum ResizeMethod {
-        // Quality Methods
-        //
-        // Those enumeration values express a desired quality/speed tradeoff.
-        // They are translated into an algorithm-specific method that depends
-        // on the capabilities (CPU, GPU) of the underlying platform.
-        // It is possible for all three methods to be mapped to the same
-        // algorithm on a given platform.
-
-        // Good quality resizing. Fastest resizing with acceptable visual quality.
-        // This is typically intended for use during interactive layouts
-        // where slower platforms may want to trade image quality for large
-        // increase in resizing performance.
-        //
-        // For example the resizing implementation may devolve to linear
-        // filtering if this enables GPU acceleration to be used.
-        //
-        // Note that the underlying resizing method may be determined
-        // on the fly based on the parameters for a given resize call.
-        // For example an implementation using a GPU-based linear filter
-        // in the common case may still use a higher-quality software-based
-        // filter in cases where using the GPU would actually be slower - due
-        // to too much latency - or impossible - due to image format or size
-        // constraints.
-        RESIZE_GOOD,
-
-        // Medium quality resizing. Close to high quality resizing (better
-        // than linear interpolation) with potentially some quality being
-        // traded-off for additional speed compared to RESIZE_BEST.
-        //
-        // This is intended, for example, for generation of large thumbnails
-        // (hundreds of pixels in each dimension) from large sources, where
-        // a linear filter would produce too many artifacts but where
-        // a RESIZE_HIGH might be too costly time-wise.
-        RESIZE_BETTER,
-
-        // High quality resizing. The algorithm is picked to favor image quality.
-        RESIZE_BEST,
-
-        //
-        // Algorithm-specific enumerations
-        //
-
-        // Box filter. This is a weighted average of all of the pixels touching
-        // the destination pixel. For enlargement, this is nearest neighbor.
-        //
-        // You probably don't want this, it is here for testing since it is easy to
-        // compute. Use RESIZE_LANCZOS3 instead.
         RESIZE_BOX,
         RESIZE_TRIANGLE,
         RESIZE_LANCZOS3,
         RESIZE_HAMMING,
         RESIZE_MITCHELL,
 
-        // enum aliases for first and last methods by algorithm or by quality.
-        RESIZE_FIRST_QUALITY_METHOD = RESIZE_GOOD,
-        RESIZE_LAST_QUALITY_METHOD = RESIZE_BEST,
-        RESIZE_FIRST_ALGORITHM_METHOD = RESIZE_BOX,
-        RESIZE_LAST_ALGORITHM_METHOD = RESIZE_MITCHELL,
+        RESIZE_FirstMethod = RESIZE_BOX,
+        RESIZE_LastMethod = RESIZE_MITCHELL,
     };
 
-    static bool Resize(SkBitmap* result,
-                       const SkBitmap& source,
-                       ResizeMethod method,
-                       float dest_width, float dest_height,
-                       SkBitmap::Allocator* allocator = NULL);
-
-    static SkBitmap Resize(const SkBitmap& source,
-                           ResizeMethod method,
-                           float dest_width, float dest_height,
-                           SkBitmap::Allocator* allocator = NULL);
+    static bool Resize(SkBitmap* result, const SkPixmap& src, ResizeMethod method,
+                       int dest_width, int dest_height, SkBitmap::Allocator* = nullptr);
 
      /** Platforms can also optionally overwrite the convolution functions
         if we have SIMD versions of them.
diff --git a/gfx/skia/skia/src/core/SkBitmap_scroll.cpp b/gfx/skia/skia/src/core/SkBitmap_scroll.cpp
deleted file mode 100644
index 00a72aa1cab9..000000000000
--- a/gfx/skia/skia/src/core/SkBitmap_scroll.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#include "SkBitmap.h"
-#include "SkRegion.h"
-
-bool SkBitmap::scrollRect(const SkIRect* subset, int dx, int dy,
-                          SkRegion* inval) const
-{
-    if (this->isImmutable() || kUnknown_SkColorType == this->colorType()) {
-        return false;
-    }
-
-    if (NULL != subset) {
-        SkBitmap tmp;
-
-        return  this->extractSubset(&tmp, *subset) &&
-                // now call again with no rectangle
-                tmp.scrollRect(NULL, dx, dy, inval);
-    }
-
-    int shift = this->bytesPerPixel() >> 1;
-    int width = this->width();
-    int height = this->height();
-
-    // check if there's nothing to do
-    if ((dx | dy) == 0 || width <= 0 || height <= 0) {
-        if (NULL != inval) {
-            inval->setEmpty();
-        }
-        return true;
-    }
-
-    // compute the inval region now, before we see if there are any pixels
-    if (NULL != inval) {
-        SkIRect r;
-
-        r.set(0, 0, width, height);
-        // initial the region with the entire bounds
-        inval->setRect(r);
-        // do the "scroll"
-        r.offset(dx, dy);
-
-        // check if we scrolled completely away
-        if (!SkIRect::Intersects(r, inval->getBounds())) {
-            // inval has already been updated...
-            return true;
-        }
-
-        // compute the dirty area
-        inval->op(r, SkRegion::kDifference_Op);
-    }
-
-    SkAutoLockPixels    alp(*this);
-    // if we have no pixels, just return (inval is already updated)
-    // don't call readyToDraw(), since we don't require a colortable per se
-    if (this->getPixels() == NULL) {
-        return true;
-    }
-
-    char*       dst = (char*)this->getPixels();
-    const char* src = dst;
-    int         rowBytes = (int)this->rowBytes();    // need rowBytes to be signed
-
-    if (dy <= 0) {
-        src -= dy * rowBytes;
-        height += dy;
-    } else {
-        dst += dy * rowBytes;
-        height -= dy;
-        // now jump src/dst to the last scanline
-        src += (height - 1) * rowBytes;
-        dst += (height - 1) * rowBytes;
-        // now invert rowbytes so we copy backwards in the loop
-        rowBytes = -rowBytes;
-    }
-
-    if (dx <= 0) {
-        src -= dx << shift;
-        width += dx;
-    } else {
-        dst += dx << shift;
-        width -= dx;
-    }
-
-    // If the X-translation would push it completely beyond the region,
-    // then there's nothing to draw.
-    if (width <= 0) {
-        return true;
-    }
-
-    width <<= shift;    // now width is the number of bytes to move per line
-    while (--height >= 0) {
-        memmove(dst, src, width);
-        dst += rowBytes;
-        src += rowBytes;
-    }
-
-    this->notifyPixelsChanged();
-    return true;
-}
diff --git a/gfx/skia/skia/src/core/SkBlitBWMaskTemplate.h b/gfx/skia/skia/src/core/SkBlitBWMaskTemplate.h
index 798e44aaa49e..accf498abaa3 100644
--- a/gfx/skia/skia/src/core/SkBlitBWMaskTemplate.h
+++ b/gfx/skia/skia/src/core/SkBlitBWMaskTemplate.h
@@ -19,19 +19,19 @@
     SK_BLITBWMASK_NAME          name of function(const SkBitmap& bitmap, const SkMask& mask, const SkIRect& clip, SK_BLITBWMASK_ARGS)
     SK_BLITBWMASK_ARGS          list of additional arguments to SK_BLITBWMASK_NAME, beginning with a comma
     SK_BLITBWMASK_BLIT8         name of function(U8CPU byteMask, SK_BLITBWMASK_DEVTYPE* dst, int x, int y)
-    SK_BLITBWMASK_GETADDR       either getAddr32 or getAddr16 or getAddr8
+    SK_BLITBWMASK_GETADDR       either writable_addr[8,16,32]
     SK_BLITBWMASK_DEVTYPE       either U32 or U16 or U8
 */
 
-static void SK_BLITBWMASK_NAME(const SkBitmap& bitmap, const SkMask& srcMask, const SkIRect& clip SK_BLITBWMASK_ARGS)
-{
+static void SK_BLITBWMASK_NAME(const SkPixmap& dst, const SkMask& srcMask,
+                               const SkIRect& clip SK_BLITBWMASK_ARGS) {
     SkASSERT(clip.fRight <= srcMask.fBounds.fRight);
 
     int cx = clip.fLeft;
     int cy = clip.fTop;
     int maskLeft = srcMask.fBounds.fLeft;
     unsigned mask_rowBytes = srcMask.fRowBytes;
-    size_t bitmap_rowBytes = bitmap.rowBytes();
+    size_t bitmap_rowBytes = dst.rowBytes();
     unsigned height = clip.height();
 
     SkASSERT(mask_rowBytes != 0);
@@ -39,7 +39,7 @@ static void SK_BLITBWMASK_NAME(const SkBitmap& bitmap, const SkMask& srcMask, co
     SkASSERT(height != 0);
 
     const uint8_t* bits = srcMask.getAddr1(cx, cy);
-    SK_BLITBWMASK_DEVTYPE* device = bitmap.SK_BLITBWMASK_GETADDR(cx, cy);
+    SK_BLITBWMASK_DEVTYPE* device = dst.SK_BLITBWMASK_GETADDR(cx, cy);
 
     if (cx == maskLeft && clip.fRight == srcMask.fBounds.fRight)
     {
diff --git a/gfx/skia/skia/src/core/SkBlitMask.h b/gfx/skia/skia/src/core/SkBlitMask.h
index 32db43c3d8cc..f36f9f3d829a 100644
--- a/gfx/skia/skia/src/core/SkBlitMask.h
+++ b/gfx/skia/skia/src/core/SkBlitMask.h
@@ -8,9 +8,9 @@
 #ifndef SkBlitMask_DEFINED
 #define SkBlitMask_DEFINED
 
-#include "SkBitmap.h"
 #include "SkColor.h"
 #include "SkMask.h"
+#include "SkPixmap.h"
 
 class SkBlitMask {
 public:
@@ -18,7 +18,7 @@ public:
      *  Returns true if the device config and mask format were supported.
      *  else return false (nothing was drawn)
      */
-    static bool BlitColor(const SkBitmap& device, const SkMask& mask,
+    static bool BlitColor(const SkPixmap& device, const SkMask& mask,
                           const SkIRect& clip, SkColor color);
 
     /**
@@ -47,18 +47,6 @@ public:
     typedef void (*RowProc)(void* dst, const void* mask,
                             const SkPMColor* src, int width);
 
-    /**
-     *  Public entry-point to return a blitmask ColorProc.
-     *  May return NULL if config or format are not supported.
-     */
-    static ColorProc ColorFactory(SkColorType, SkMask::Format, SkColor);
-
-    /**
-     *  Return either platform specific optimized blitmask ColorProc,
-     *  or NULL if no optimized routine is available.
-     */
-    static ColorProc PlatformColorProcs(SkColorType, SkMask::Format, SkColor);
-
     /**
      *  Public entry-point to return a blitcolor BlitLCD16RowProc.
      */
@@ -66,7 +54,7 @@ public:
 
     /**
      *  Return either platform specific optimized blitcolor BlitLCD16RowProc,
-     *  or NULL if no optimized routine is available.
+     *  or nullptr if no optimized routine is available.
      */
     static BlitLCD16RowProc PlatformBlitRowProcs16(bool isOpaque);
 
@@ -76,13 +64,13 @@ public:
 
     /**
      *  Public entry-point to return a blitmask RowProc.
-     *  May return NULL if config or format are not supported.
+     *  May return nullptr if config or format are not supported.
      */
     static RowProc RowFactory(SkColorType, SkMask::Format, RowFlags);
 
     /**
      *  Return either platform specific optimized blitmask RowProc,
-     *  or NULL if no optimized routine is available.
+     *  or nullptr if no optimized routine is available.
      */
     static RowProc PlatformRowProcs(SkColorType, SkMask::Format, RowFlags);
 };
diff --git a/gfx/skia/skia/src/core/SkBlitMask_D32.cpp b/gfx/skia/skia/src/core/SkBlitMask_D32.cpp
index ef4d84bfcf88..3cc791af4ed6 100644
--- a/gfx/skia/skia/src/core/SkBlitMask_D32.cpp
+++ b/gfx/skia/skia/src/core/SkBlitMask_D32.cpp
@@ -8,68 +8,7 @@
 #include "SkBlitMask.h"
 #include "SkColor.h"
 #include "SkColorPriv.h"
-
-static void D32_A8_Color(void* SK_RESTRICT dst, size_t dstRB,
-                         const void* SK_RESTRICT maskPtr, size_t maskRB,
-                         SkColor color, int width, int height) {
-    SkPMColor pmc = SkPreMultiplyColor(color);
-    size_t dstOffset = dstRB - (width << 2);
-    size_t maskOffset = maskRB - width;
-    SkPMColor* SK_RESTRICT device = (SkPMColor *)dst;
-    const uint8_t* SK_RESTRICT mask = (const uint8_t*)maskPtr;
-
-    do {
-        int w = width;
-        do {
-            unsigned aa = *mask++;
-            *device = SkBlendARGB32(pmc, *device, aa);
-            device += 1;
-        } while (--w != 0);
-        device = (uint32_t*)((char*)device + dstOffset);
-        mask += maskOffset;
-    } while (--height != 0);
-}
-
-static void D32_A8_Opaque(void* SK_RESTRICT dst, size_t dstRB,
-                          const void* SK_RESTRICT maskPtr, size_t maskRB,
-                          SkColor color, int width, int height) {
-    SkPMColor pmc = SkPreMultiplyColor(color);
-    SkPMColor* SK_RESTRICT device = (SkPMColor*)dst;
-    const uint8_t* SK_RESTRICT mask = (const uint8_t*)maskPtr;
-
-    maskRB -= width;
-    dstRB -= (width << 2);
-    do {
-        int w = width;
-        do {
-            unsigned aa = *mask++;
-            *device = SkAlphaMulQ(pmc, SkAlpha255To256(aa)) + SkAlphaMulQ(*device, SkAlpha255To256(255 - aa));
-            device += 1;
-        } while (--w != 0);
-        device = (uint32_t*)((char*)device + dstRB);
-        mask += maskRB;
-    } while (--height != 0);
-}
-
-static void D32_A8_Black(void* SK_RESTRICT dst, size_t dstRB,
-                         const void* SK_RESTRICT maskPtr, size_t maskRB,
-                         SkColor, int width, int height) {
-    SkPMColor* SK_RESTRICT device = (SkPMColor*)dst;
-    const uint8_t* SK_RESTRICT mask = (const uint8_t*)maskPtr;
-
-    maskRB -= width;
-    dstRB -= (width << 2);
-    do {
-        int w = width;
-        do {
-            unsigned aa = *mask++;
-            *device = (aa << SK_A32_SHIFT) + SkAlphaMulQ(*device, SkAlpha255To256(255 - aa));
-            device += 1;
-        } while (--w != 0);
-        device = (uint32_t*)((char*)device + dstRB);
-        mask += maskRB;
-    } while (--height != 0);
-}
+#include "SkOpts.h"
 
 SkBlitMask::BlitLCD16RowProc SkBlitMask::BlitLCD16RowFactory(bool isOpaque) {
     BlitLCD16RowProc proc = PlatformBlitRowProcs16(isOpaque);
@@ -92,10 +31,10 @@ static void D32_LCD16_Proc(void* SK_RESTRICT dst, size_t dstRB,
     const uint16_t* srcRow = (const uint16_t*)mask;
     SkPMColor       opaqueDst;
 
-    SkBlitMask::BlitLCD16RowProc proc = NULL;
+    SkBlitMask::BlitLCD16RowProc proc = nullptr;
     bool isOpaque = (0xFF == SkColorGetA(color));
     proc = SkBlitMask::BlitLCD16RowFactory(isOpaque);
-    SkASSERT(proc != NULL);
+    SkASSERT(proc != nullptr);
 
     if (isOpaque) {
         opaqueDst = SkPreMultiplyColor(color);
@@ -112,168 +51,25 @@ static void D32_LCD16_Proc(void* SK_RESTRICT dst, size_t dstRB,
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static void blit_lcd32_opaque_row(SkPMColor* SK_RESTRICT dst,
-                                  const SkPMColor* SK_RESTRICT src,
-                                  SkColor color, int width) {
-    int srcR = SkColorGetR(color);
-    int srcG = SkColorGetG(color);
-    int srcB = SkColorGetB(color);
-
-    for (int i = 0; i < width; i++) {
-        SkPMColor mask = src[i];
-        if (0 == mask) {
-            continue;
-        }
-
-        SkPMColor d = dst[i];
-
-        int maskR = SkGetPackedR32(mask);
-        int maskG = SkGetPackedG32(mask);
-        int maskB = SkGetPackedB32(mask);
-
-        // Now upscale them to 0..256, so we can use SkAlphaBlend
-        maskR = SkAlpha255To256(maskR);
-        maskG = SkAlpha255To256(maskG);
-        maskB = SkAlpha255To256(maskB);
-
-        int dstR = SkGetPackedR32(d);
-        int dstG = SkGetPackedG32(d);
-        int dstB = SkGetPackedB32(d);
-
-        // LCD blitting is only supported if the dst is known/required
-        // to be opaque
-        dst[i] = SkPackARGB32(0xFF,
-                              SkAlphaBlend(srcR, dstR, maskR),
-                              SkAlphaBlend(srcG, dstG, maskG),
-                              SkAlphaBlend(srcB, dstB, maskB));
-    }
-}
-
-static void blit_lcd32_row(SkPMColor* SK_RESTRICT dst,
-                           const SkPMColor* SK_RESTRICT src,
-                           SkColor color, int width) {
-    int srcA = SkColorGetA(color);
-    int srcR = SkColorGetR(color);
-    int srcG = SkColorGetG(color);
-    int srcB = SkColorGetB(color);
-
-    srcA = SkAlpha255To256(srcA);
-
-    for (int i = 0; i < width; i++) {
-        SkPMColor mask = src[i];
-        if (0 == mask) {
-            continue;
-        }
-
-        SkPMColor d = dst[i];
-
-        int maskR = SkGetPackedR32(mask);
-        int maskG = SkGetPackedG32(mask);
-        int maskB = SkGetPackedB32(mask);
-
-        // Now upscale them to 0..256, so we can use SkAlphaBlend
-        maskR = SkAlpha255To256(maskR);
-        maskG = SkAlpha255To256(maskG);
-        maskB = SkAlpha255To256(maskB);
-
-        maskR = maskR * srcA >> 8;
-        maskG = maskG * srcA >> 8;
-        maskB = maskB * srcA >> 8;
-
-        int dstR = SkGetPackedR32(d);
-        int dstG = SkGetPackedG32(d);
-        int dstB = SkGetPackedB32(d);
-
-        // LCD blitting is only supported if the dst is known/required
-        // to be opaque
-        dst[i] = SkPackARGB32(0xFF,
-                              SkAlphaBlend(srcR, dstR, maskR),
-                              SkAlphaBlend(srcG, dstG, maskG),
-                              SkAlphaBlend(srcB, dstB, maskB));
-    }
-}
-
-static void D32_LCD32_Blend(void* SK_RESTRICT dst, size_t dstRB,
-                            const void* SK_RESTRICT mask, size_t maskRB,
-                            SkColor color, int width, int height) {
-    SkASSERT(height > 0);
-    SkPMColor* SK_RESTRICT dstRow = (SkPMColor*)dst;
-    const SkPMColor* SK_RESTRICT srcRow = (const SkPMColor*)mask;
-
-    do {
-        blit_lcd32_row(dstRow, srcRow, color, width);
-        dstRow = (SkPMColor*)((char*)dstRow + dstRB);
-        srcRow = (const SkPMColor*)((const char*)srcRow + maskRB);
-    } while (--height != 0);
-}
-
-static void D32_LCD32_Opaque(void* SK_RESTRICT dst, size_t dstRB,
-                             const void* SK_RESTRICT mask, size_t maskRB,
-                             SkColor color, int width, int height) {
-    SkASSERT(height > 0);
-    SkPMColor* SK_RESTRICT dstRow = (SkPMColor*)dst;
-    const SkPMColor* SK_RESTRICT srcRow = (const SkPMColor*)mask;
-
-    do {
-        blit_lcd32_opaque_row(dstRow, srcRow, color, width);
-        dstRow = (SkPMColor*)((char*)dstRow + dstRB);
-        srcRow = (const SkPMColor*)((const char*)srcRow + maskRB);
-    } while (--height != 0);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-static SkBlitMask::ColorProc D32_A8_Factory(SkColor color) {
-    if (SK_ColorBLACK == color) {
-        return D32_A8_Black;
-    } else if (0xFF == SkColorGetA(color)) {
-        return D32_A8_Opaque;
-    } else {
-        return D32_A8_Color;
-    }
-}
-
-static SkBlitMask::ColorProc D32_LCD32_Factory(SkColor color) {
-    return (0xFF == SkColorGetA(color)) ? D32_LCD32_Opaque : D32_LCD32_Blend;
-}
-
-SkBlitMask::ColorProc SkBlitMask::ColorFactory(SkColorType ct,
-                                               SkMask::Format format,
-                                               SkColor color) {
-    ColorProc proc = PlatformColorProcs(ct, format, color);
-    if (proc) {
-        return proc;
-    }
-
-    switch (ct) {
-        case kN32_SkColorType:
-            switch (format) {
-                case SkMask::kA8_Format:
-                    return D32_A8_Factory(color);
-                case SkMask::kLCD16_Format:
-                    return D32_LCD16_Proc;
-                case SkMask::kLCD32_Format:
-                    return D32_LCD32_Factory(color);
-                default:
-                    break;
-            }
-            break;
-        default:
-            break;
-    }
-    return NULL;
-}
-
-bool SkBlitMask::BlitColor(const SkBitmap& device, const SkMask& mask,
+bool SkBlitMask::BlitColor(const SkPixmap& device, const SkMask& mask,
                            const SkIRect& clip, SkColor color) {
-    ColorProc proc = ColorFactory(device.colorType(), mask.fFormat, color);
-    if (proc) {
-        int x = clip.fLeft;
-        int y = clip.fTop;
-        proc(device.getAddr32(x, y), device.rowBytes(), mask.getAddr(x, y),
-             mask.fRowBytes, color, clip.width(), clip.height());
+    int x = clip.fLeft, y = clip.fTop;
+
+    if (device.colorType() == kN32_SkColorType && mask.fFormat == SkMask::kA8_Format) {
+        SkOpts::blit_mask_d32_a8(device.writable_addr32(x,y), device.rowBytes(),
+                                 (const SkAlpha*)mask.getAddr(x,y), mask.fRowBytes,
+                                 color, clip.width(), clip.height());
         return true;
     }
+
+    if (device.colorType() == kN32_SkColorType && mask.fFormat == SkMask::kLCD16_Format) {
+        // TODO: Is this reachable code?  Seems like no.
+        D32_LCD16_Proc(device.writable_addr32(x,y), device.rowBytes(),
+                       mask.getAddr(x,y), mask.fRowBytes,
+                       color, clip.width(), clip.height());
+        return true;
+    }
+
     return false;
 }
 
@@ -476,85 +272,6 @@ static void LCD16_RowProc_Opaque(SkPMColor* SK_RESTRICT dst,
     }
 }
 
-static void LCD32_RowProc_Blend(SkPMColor* SK_RESTRICT dst,
-                                const SkPMColor* SK_RESTRICT mask,
-                                const SkPMColor* SK_RESTRICT src, int count) {
-    for (int i = 0; i < count; ++i) {
-        SkPMColor m = mask[i];
-        if (0 == m) {
-            continue;
-        }
-
-        SkPMColor s = src[i];
-        int srcA = SkGetPackedA32(s);
-        int srcR = SkGetPackedR32(s);
-        int srcG = SkGetPackedG32(s);
-        int srcB = SkGetPackedB32(s);
-
-        srcA = SkAlpha255To256(srcA);
-
-        SkPMColor d = dst[i];
-
-        int maskR = SkGetPackedR32(m);
-        int maskG = SkGetPackedG32(m);
-        int maskB = SkGetPackedB32(m);
-
-        // Now upscale them to 0..256
-        maskR = SkAlpha255To256(maskR);
-        maskG = SkAlpha255To256(maskG);
-        maskB = SkAlpha255To256(maskB);
-
-        int dstR = SkGetPackedR32(d);
-        int dstG = SkGetPackedG32(d);
-        int dstB = SkGetPackedB32(d);
-
-        // LCD blitting is only supported if the dst is known/required
-        // to be opaque
-        dst[i] = SkPackARGB32(0xFF,
-                              src_alpha_blend(srcR, dstR, srcA, maskR),
-                              src_alpha_blend(srcG, dstG, srcA, maskG),
-                              src_alpha_blend(srcB, dstB, srcA, maskB));
-    }
-}
-
-static void LCD32_RowProc_Opaque(SkPMColor* SK_RESTRICT dst,
-                                 const SkPMColor* SK_RESTRICT mask,
-                                 const SkPMColor* SK_RESTRICT src, int count) {
-    for (int i = 0; i < count; ++i) {
-        SkPMColor m = mask[i];
-        if (0 == m) {
-            continue;
-        }
-
-        SkPMColor s = src[i];
-        SkPMColor d = dst[i];
-
-        int maskR = SkGetPackedR32(m);
-        int maskG = SkGetPackedG32(m);
-        int maskB = SkGetPackedB32(m);
-
-        int srcR = SkGetPackedR32(s);
-        int srcG = SkGetPackedG32(s);
-        int srcB = SkGetPackedB32(s);
-
-        int dstR = SkGetPackedR32(d);
-        int dstG = SkGetPackedG32(d);
-        int dstB = SkGetPackedB32(d);
-
-        // Now upscale them to 0..256, so we can use SkAlphaBlend
-        maskR = SkAlpha255To256(maskR);
-        maskG = SkAlpha255To256(maskG);
-        maskB = SkAlpha255To256(maskB);
-
-        // LCD blitting is only supported if the dst is known/required
-        // to be opaque
-        dst[i] = SkPackARGB32(0xFF,
-                              SkAlphaBlend(srcR, dstR, maskR),
-                              SkAlphaBlend(srcG, dstG, maskG),
-                              SkAlphaBlend(srcB, dstB, maskB));
-    }
-}
-
 SkBlitMask::RowProc SkBlitMask::RowFactory(SkColorType ct,
                                            SkMask::Format format,
                                            RowFlags flags) {
@@ -566,11 +283,10 @@ SkBlitMask::RowProc SkBlitMask::RowFactory(SkColorType ct,
 
     static const RowProc gProcs[] = {
         // need X coordinate to handle BW
-        false ? (RowProc)BW_RowProc_Blend : NULL, // suppress unused warning
-        false ? (RowProc)BW_RowProc_Opaque : NULL, // suppress unused warning
+        false ? (RowProc)BW_RowProc_Blend : nullptr, // suppress unused warning
+        false ? (RowProc)BW_RowProc_Opaque : nullptr, // suppress unused warning
         (RowProc)A8_RowProc_Blend,      (RowProc)A8_RowProc_Opaque,
         (RowProc)LCD16_RowProc_Blend,   (RowProc)LCD16_RowProc_Opaque,
-        (RowProc)LCD32_RowProc_Blend,   (RowProc)LCD32_RowProc_Opaque,
     };
 
     int index;
@@ -580,9 +296,8 @@ SkBlitMask::RowProc SkBlitMask::RowFactory(SkColorType ct,
                 case SkMask::kBW_Format:    index = 0; break;
                 case SkMask::kA8_Format:    index = 2; break;
                 case SkMask::kLCD16_Format: index = 4; break;
-                case SkMask::kLCD32_Format: index = 6; break;
                 default:
-                    return NULL;
+                    return nullptr;
             }
             if (flags & kSrcIsOpaque_RowFlag) {
                 index |= 1;
@@ -592,5 +307,5 @@ SkBlitMask::RowProc SkBlitMask::RowFactory(SkColorType ct,
         default:
             break;
     }
-    return NULL;
+    return nullptr;
 }
diff --git a/gfx/skia/skia/src/core/SkBlitRow_D16.cpp b/gfx/skia/skia/src/core/SkBlitRow_D16.cpp
index 1b2be06d1259..9ac84c672df1 100644
--- a/gfx/skia/skia/src/core/SkBlitRow_D16.cpp
+++ b/gfx/skia/skia/src/core/SkBlitRow_D16.cpp
@@ -74,11 +74,8 @@ static void S32A_D565_Blend(uint16_t* SK_RESTRICT dst,
             SkPMColorAssert(sc);
             if (sc) {
                 uint16_t dc = *dst;
-                unsigned dst_scale = 255 - SkMulDiv255Round(SkGetPackedA32(sc), alpha);
-                unsigned dr = SkMulS16(SkPacked32ToR16(sc), alpha) + SkMulS16(SkGetPackedR16(dc), dst_scale);
-                unsigned dg = SkMulS16(SkPacked32ToG16(sc), alpha) + SkMulS16(SkGetPackedG16(dc), dst_scale);
-                unsigned db = SkMulS16(SkPacked32ToB16(sc), alpha) + SkMulS16(SkGetPackedB16(dc), dst_scale);
-                *dst = SkPackRGB16(SkDiv255Round(dr), SkDiv255Round(dg), SkDiv255Round(db));
+                SkPMColor res = SkBlendARGB32(sc, SkPixel16ToPixel32(dc), alpha);
+                *dst = SkPixel32ToPixel16(res);
             }
             dst += 1;
         } while (--count != 0);
@@ -205,10 +202,29 @@ static void S32A_D565_Blend_Dither(uint16_t* SK_RESTRICT dst,
     }
 }
 
+///////////////////////////////////////////////////////////////////////////////
+
+static uint32_t pmcolor_to_expand16(SkPMColor c) {
+    unsigned r = SkGetPackedR32(c);
+    unsigned g = SkGetPackedG32(c);
+    unsigned b = SkGetPackedB32(c);
+    return (g << 24) | (r << 13) | (b << 2);
+}
+
+static void Color32A_D565(uint16_t dst[], SkPMColor src, int count, int x, int y) {
+    SkASSERT(count > 0);
+    uint32_t src_expand = pmcolor_to_expand16(src);
+    unsigned scale = SkAlpha255To256(0xFF - SkGetPackedA32(src)) >> 3;
+    do {
+        *dst = SkBlend32_RGB16(src_expand, *dst, scale);
+        dst += 1;
+    } while (--count != 0);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
-static const SkBlitRow::Proc gDefault_565_Procs[] = {
+static const SkBlitRow::Proc16 gDefault_565_Procs[] = {
     // no dither
     S32_D565_Opaque,
     S32_D565_Blend,
@@ -224,22 +240,42 @@ static const SkBlitRow::Proc gDefault_565_Procs[] = {
     S32A_D565_Blend_Dither
 };
 
-SkBlitRow::Proc SkBlitRow::Factory(unsigned flags, SkColorType ct) {
+SkBlitRow::Proc16 SkBlitRow::Factory16(unsigned flags) {
     SkASSERT(flags < SK_ARRAY_COUNT(gDefault_565_Procs));
     // just so we don't crash
     flags &= kFlags16_Mask;
 
-    SkBlitRow::Proc proc = NULL;
-
-    switch (ct) {
-        case kRGB_565_SkColorType:
-            proc = PlatformProcs565(flags);
-            if (NULL == proc) {
-                proc = gDefault_565_Procs[flags];
-            }
-            break;
-        default:
-            break;
+    SkBlitRow::Proc16 proc = PlatformFactory565(flags);
+    if (nullptr == proc) {
+        proc = gDefault_565_Procs[flags];
+    }
+    return proc;
+}
+
+static const SkBlitRow::ColorProc16 gDefault_565_ColorProcs[] = {
+#if 0
+    Color32A_D565,
+    Color32A_D565_Dither
+#else
+    // TODO: stop cheating and fill dither from the above specializations!
+    Color32A_D565,
+    Color32A_D565,
+#endif
+};
+
+SkBlitRow::ColorProc16 SkBlitRow::ColorFactory16(unsigned flags) {
+    SkASSERT((flags & ~kFlags16_Mask) == 0);
+    // just so we don't crash
+    flags &= kFlags16_Mask;
+    // we ignore both kGlobalAlpha_Flag and kSrcPixelAlpha_Flag, so shift down
+    // no need for the additional code specializing on opaque alpha at this time
+    flags >>= 2;
+
+    SkASSERT(flags < SK_ARRAY_COUNT(gDefault_565_ColorProcs));
+
+    SkBlitRow::ColorProc16 proc = PlatformColorFactory565(flags);
+    if (nullptr == proc) {
+        proc = gDefault_565_ColorProcs[flags];
     }
     return proc;
 }
diff --git a/gfx/skia/skia/src/core/SkBlitRow_D32.cpp b/gfx/skia/skia/src/core/SkBlitRow_D32.cpp
index f8cf9a34a9c3..75330ae33761 100644
--- a/gfx/skia/skia/src/core/SkBlitRow_D32.cpp
+++ b/gfx/skia/skia/src/core/SkBlitRow_D32.cpp
@@ -8,17 +8,16 @@
 #include "SkBlitRow.h"
 #include "SkBlitMask.h"
 #include "SkColorPriv.h"
+#include "SkOpts.h"
 #include "SkUtils.h"
 
 #define UNROLL
 
-SkBlitRow::ColorRectProc PlatformColorRectProcFactory();
-
 static void S32_Opaque_BlitRow32(SkPMColor* SK_RESTRICT dst,
                                  const SkPMColor* SK_RESTRICT src,
                                  int count, U8CPU alpha) {
     SkASSERT(255 == alpha);
-    sk_memcpy32(dst, src, count);
+    memcpy(dst, src, count * 4);
 }
 
 static void S32_Blend_BlitRow32(SkPMColor* SK_RESTRICT dst,
@@ -126,124 +125,17 @@ SkBlitRow::Proc32 SkBlitRow::Factory32(unsigned flags) {
     flags &= kFlags32_Mask;
 
     SkBlitRow::Proc32 proc = PlatformProcs32(flags);
-    if (NULL == proc) {
+    if (nullptr == proc) {
         proc = gDefault_Procs32[flags];
     }
     SkASSERT(proc);
     return proc;
 }
 
-SkBlitRow::Proc32 SkBlitRow::ColorProcFactory() {
-    SkBlitRow::ColorProc proc = PlatformColorProc();
-    if (NULL == proc) {
-        proc = Color32;
+void SkBlitRow::Color32(SkPMColor dst[], const SkPMColor src[], int count, SkPMColor color) {
+    switch (SkGetPackedA32(color)) {
+        case   0: memmove(dst, src, count * sizeof(SkPMColor)); return;
+        case 255: sk_memset32(dst, color, count);               return;
     }
-    SkASSERT(proc);
-    return proc;
-}
-
-void SkBlitRow::Color32(SkPMColor* SK_RESTRICT dst,
-                        const SkPMColor* SK_RESTRICT src,
-                        int count, SkPMColor color) {
-    if (count > 0) {
-        if (0 == color) {
-            if (src != dst) {
-                memcpy(dst, src, count * sizeof(SkPMColor));
-            }
-            return;
-        }
-        unsigned colorA = SkGetPackedA32(color);
-        if (255 == colorA) {
-            sk_memset32(dst, color, count);
-        } else {
-            unsigned scale = 256 - SkAlpha255To256(colorA);
-            do {
-                *dst = color + SkAlphaMulQ(*src, scale);
-                src += 1;
-                dst += 1;
-            } while (--count);
-        }
-    }
-}
-
-template <size_t N> void assignLoop(SkPMColor* dst, SkPMColor color) {
-    for (size_t i = 0; i < N; ++i) {
-        *dst++ = color;
-    }
-}
-
-static inline void assignLoop(SkPMColor dst[], SkPMColor color, int count) {
-    while (count >= 4) {
-        *dst++ = color;
-        *dst++ = color;
-        *dst++ = color;
-        *dst++ = color;
-        count -= 4;
-    }
-    if (count >= 2) {
-        *dst++ = color;
-        *dst++ = color;
-        count -= 2;
-    }
-    if (count > 0) {
-        *dst++ = color;
-    }
-}
-
-void SkBlitRow::ColorRect32(SkPMColor* dst, int width, int height,
-                            size_t rowBytes, SkPMColor color) {
-    if (width <= 0 || height <= 0 || 0 == color) {
-        return;
-    }
-
-    // Just made up this value, since I saw it once in a SSE2 file.
-    // We should consider writing some tests to find the optimimal break-point
-    // (or query the Platform proc?)
-    static const int MIN_WIDTH_FOR_SCANLINE_PROC = 32;
-
-    bool isOpaque = (0xFF == SkGetPackedA32(color));
-
-    if (!isOpaque || width >= MIN_WIDTH_FOR_SCANLINE_PROC) {
-        SkBlitRow::ColorProc proc = SkBlitRow::ColorProcFactory();
-        while (--height >= 0) {
-            (*proc)(dst, dst, width, color);
-            dst = (SkPMColor*) ((char*)dst + rowBytes);
-        }
-    } else {
-        switch (width) {
-            case 1:
-                while (--height >= 0) {
-                    assignLoop<1>(dst, color);
-                    dst = (SkPMColor*) ((char*)dst + rowBytes);
-                }
-                break;
-            case 2:
-                while (--height >= 0) {
-                    assignLoop<2>(dst, color);
-                    dst = (SkPMColor*) ((char*)dst + rowBytes);
-                }
-                break;
-            case 3:
-                while (--height >= 0) {
-                    assignLoop<3>(dst, color);
-                    dst = (SkPMColor*) ((char*)dst + rowBytes);
-                }
-                break;
-            default:
-                while (--height >= 0) {
-                    assignLoop(dst, color, width);
-                    dst = (SkPMColor*) ((char*)dst + rowBytes);
-                }
-                break;
-        }
-    }
-}
-
-SkBlitRow::ColorRectProc SkBlitRow::ColorRectProcFactory() {
-    SkBlitRow::ColorRectProc proc = PlatformColorRectProcFactory();
-    if (NULL == proc) {
-        proc = ColorRect32;
-    }
-    SkASSERT(proc);
-    return proc;
+    return SkOpts::blit_row_color32(dst, src, count, color);
 }
diff --git a/gfx/skia/skia/src/core/SkBlitter.cpp b/gfx/skia/skia/src/core/SkBlitter.cpp
index cb84ec7d9db0..064dc16eda4f 100644
--- a/gfx/skia/skia/src/core/SkBlitter.cpp
+++ b/gfx/skia/skia/src/core/SkBlitter.cpp
@@ -9,7 +9,6 @@
 #include "SkAntiRun.h"
 #include "SkColor.h"
 #include "SkColorFilter.h"
-#include "SkCoreBlitters.h"
 #include "SkFilterShader.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
@@ -19,6 +18,7 @@
 #include "SkTLazy.h"
 #include "SkUtils.h"
 #include "SkXfermode.h"
+#include "SkXfermodeInterpretation.h"
 
 SkBlitter::~SkBlitter() {}
 
@@ -29,11 +29,11 @@ bool SkBlitter::resetShaderContext(const SkShader::ContextRec&) {
 }
 
 SkShader::Context* SkBlitter::getShaderContext() const {
-    return NULL;
+    return nullptr;
 }
 
-const SkBitmap* SkBlitter::justAnOpaqueColor(uint32_t* value) {
-    return NULL;
+const SkPixmap* SkBlitter::justAnOpaqueColor(uint32_t* value) {
+    return nullptr;
 }
 
 void SkBlitter::blitH(int x, int y, int width) {
@@ -83,18 +83,18 @@ void SkBlitter::blitAntiRect(int x, int y, int width, int height,
 
 static inline void bits_to_runs(SkBlitter* blitter, int x, int y,
                                 const uint8_t bits[],
-                                U8CPU left_mask, int rowBytes,
-                                U8CPU right_mask) {
+                                uint8_t left_mask, ptrdiff_t rowBytes,
+                                uint8_t right_mask) {
     int inFill = 0;
     int pos = 0;
 
     while (--rowBytes >= 0) {
-        unsigned b = *bits++ & left_mask;
+        uint8_t b = *bits++ & left_mask;
         if (rowBytes == 0) {
             b &= right_mask;
         }
 
-        for (unsigned test = 0x80; test != 0; test >>= 1) {
+        for (uint8_t test = 0x80U; test != 0; test >>= 1) {
             if (b & test) {
                 if (!inFill) {
                     pos = x;
@@ -108,7 +108,7 @@ static inline void bits_to_runs(SkBlitter* blitter, int x, int y,
             }
             x += 1;
         }
-        left_mask = 0xFF;
+        left_mask = 0xFFU;
     }
 
     // final cleanup
@@ -117,6 +117,11 @@ static inline void bits_to_runs(SkBlitter* blitter, int x, int y,
     }
 }
 
+// maskBitCount is the number of 1's to place in the mask. It must be in the range between 1 and 8.
+static uint8_t generate_right_mask(int maskBitCount) {
+    return static_cast<uint8_t>(0xFF00U >> maskBitCount);
+}
+
 void SkBlitter::blitMask(const SkMask& mask, const SkIRect& clip) {
     SkASSERT(mask.fBounds.contains(clip));
 
@@ -124,54 +129,55 @@ void SkBlitter::blitMask(const SkMask& mask, const SkIRect& clip) {
         int cx = clip.fLeft;
         int cy = clip.fTop;
         int maskLeft = mask.fBounds.fLeft;
-        int mask_rowBytes = mask.fRowBytes;
+        int maskRowBytes = mask.fRowBytes;
         int height = clip.height();
 
         const uint8_t* bits = mask.getAddr1(cx, cy);
 
+        SkDEBUGCODE(const uint8_t* endOfImage =
+            mask.fImage + (mask.fBounds.height() - 1) * maskRowBytes
+            + ((mask.fBounds.width() + 7) >> 3));
+
         if (cx == maskLeft && clip.fRight == mask.fBounds.fRight) {
             while (--height >= 0) {
-                bits_to_runs(this, cx, cy, bits, 0xFF, mask_rowBytes, 0xFF);
-                bits += mask_rowBytes;
+                int affectedRightBit = mask.fBounds.width() - 1;
+                ptrdiff_t rowBytes = (affectedRightBit >> 3) + 1;
+                SkASSERT(bits + rowBytes <= endOfImage);
+                U8CPU rightMask = generate_right_mask((affectedRightBit & 7) + 1);
+                bits_to_runs(this, cx, cy, bits, 0xFF, rowBytes, rightMask);
+                bits += maskRowBytes;
                 cy += 1;
             }
         } else {
-            int left_edge = cx - maskLeft;
-            SkASSERT(left_edge >= 0);
-            int rite_edge = clip.fRight - maskLeft;
-            SkASSERT(rite_edge > left_edge);
+            // Bits is calculated as the offset into the mask at the point {cx, cy} therfore, all
+            // addressing into the bit mask is relative to that point. Since this is an address
+            // calculated from a arbitrary bit in that byte, calculate the left most bit.
+            int bitsLeft = cx - ((cx - maskLeft) & 7);
 
-            int left_mask = 0xFF >> (left_edge & 7);
-            int rite_mask = 0xFF << (8 - (rite_edge & 7));
-            int full_runs = (rite_edge >> 3) - ((left_edge + 7) >> 3);
+            // Everything is relative to the bitsLeft.
+            int leftEdge = cx - bitsLeft;
+            SkASSERT(leftEdge >= 0);
+            int rightEdge = clip.fRight - bitsLeft;
+            SkASSERT(rightEdge > leftEdge);
 
-            // check for empty right mask, so we don't read off the end (or go slower than we need to)
-            if (rite_mask == 0) {
-                SkASSERT(full_runs >= 0);
-                full_runs -= 1;
-                rite_mask = 0xFF;
-            }
-            if (left_mask == 0xFF) {
-                full_runs -= 1;
-            }
+            // Calculate left byte and mask
+            const uint8_t* leftByte = bits;
+            U8CPU leftMask = 0xFFU >> (leftEdge & 7);
 
-            // back up manually so we can keep in sync with our byte-aligned src
-            // have cx reflect our actual starting x-coord
-            cx -= left_edge & 7;
+            // Calculate right byte and mask
+            int affectedRightBit = rightEdge - 1;
+            const uint8_t* rightByte = bits + (affectedRightBit >> 3);
+            U8CPU rightMask = generate_right_mask((affectedRightBit & 7) + 1);
 
-            if (full_runs < 0) {
-                SkASSERT((left_mask & rite_mask) != 0);
-                while (--height >= 0) {
-                    bits_to_runs(this, cx, cy, bits, left_mask, 1, rite_mask);
-                    bits += mask_rowBytes;
-                    cy += 1;
-                }
-            } else {
-                while (--height >= 0) {
-                    bits_to_runs(this, cx, cy, bits, left_mask, full_runs + 2, rite_mask);
-                    bits += mask_rowBytes;
-                    cy += 1;
-                }
+            // leftByte and rightByte are byte locations therefore, to get a count of bytes the
+            // code must add one.
+            ptrdiff_t rowBytes = rightByte - leftByte + 1;
+
+            while (--height >= 0) {
+                SkASSERT(bits + rowBytes <= endOfImage);
+                bits_to_runs(this, bitsLeft, cy, bits, leftMask, rowBytes, rightMask);
+                bits += maskRowBytes;
+                cy += 1;
             }
         }
     } else {
@@ -242,8 +248,8 @@ void SkNullBlitter::blitRect(int x, int y, int width, int height) {}
 
 void SkNullBlitter::blitMask(const SkMask& mask, const SkIRect& clip) {}
 
-const SkBitmap* SkNullBlitter::justAnOpaqueColor(uint32_t* value) {
-    return NULL;
+const SkPixmap* SkNullBlitter::justAnOpaqueColor(uint32_t* value) {
+    return nullptr;
 }
 
 bool SkNullBlitter::isNullBlitter() const { return true; }
@@ -403,7 +409,7 @@ void SkRectClipBlitter::blitMask(const SkMask& mask, const SkIRect& clip) {
     }
 }
 
-const SkBitmap* SkRectClipBlitter::justAnOpaqueColor(uint32_t* value) {
+const SkPixmap* SkRectClipBlitter::justAnOpaqueColor(uint32_t* value) {
     return fBlitter->justAnOpaqueColor(value);
 }
 
@@ -539,7 +545,7 @@ void SkRgnClipBlitter::blitMask(const SkMask& mask, const SkIRect& clip) {
     }
 }
 
-const SkBitmap* SkRgnClipBlitter::justAnOpaqueColor(uint32_t* value) {
+const SkPixmap* SkRgnClipBlitter::justAnOpaqueColor(uint32_t* value) {
     return fBlitter->justAnOpaqueColor(value);
 }
 
@@ -553,7 +559,7 @@ SkBlitter* SkBlitterClipper::apply(SkBlitter* blitter, const SkRegion* clip,
         if (clip->isEmpty() || (ir && !SkIRect::Intersects(clipR, *ir))) {
             blitter = &fNullBlitter;
         } else if (clip->isRect()) {
-            if (ir == NULL || !clipR.contains(*ir)) {
+            if (ir == nullptr || !clipR.contains(*ir)) {
                 fRectBlitter.init(blitter, clipR);
                 blitter = &fRectBlitter;
             }
@@ -580,7 +586,7 @@ public:
         SkSafeUnref(fProxy);
     }
 
-    virtual size_t contextSize() const SK_OVERRIDE {
+    size_t contextSize() const override {
         size_t size = sizeof(Sk3DShaderContext);
         if (fProxy) {
             size += fProxy->contextSize();
@@ -588,16 +594,16 @@ public:
         return size;
     }
 
-    virtual Context* onCreateContext(const ContextRec& rec, void* storage) const SK_OVERRIDE {
-        SkShader::Context* proxyContext = NULL;
+    Context* onCreateContext(const ContextRec& rec, void* storage) const override {
+        SkShader::Context* proxyContext = nullptr;
         if (fProxy) {
             char* proxyContextStorage = (char*) storage + sizeof(Sk3DShaderContext);
             proxyContext = fProxy->createContext(rec, proxyContextStorage);
             if (!proxyContext) {
-                return NULL;
+                return nullptr;
             }
         }
-        return SkNEW_PLACEMENT_ARGS(storage, Sk3DShaderContext, (*this, rec, proxyContext));
+        return new (storage) Sk3DShaderContext(*this, rec, proxyContext);
     }
 
     class Sk3DShaderContext : public SkShader::Context {
@@ -606,7 +612,7 @@ public:
         Sk3DShaderContext(const Sk3DShader& shader, const ContextRec& rec,
                           SkShader::Context* proxyContext)
             : INHERITED(shader, rec)
-            , fMask(NULL)
+            , fMask(nullptr)
             , fProxyContext(proxyContext)
         {
             if (!fProxyContext) {
@@ -620,15 +626,15 @@ public:
             }
         }
 
-        void setMask(const SkMask* mask) { fMask = mask; }
+        void set3DMask(const SkMask* mask) override { fMask = mask; }
 
-        virtual void shadeSpan(int x, int y, SkPMColor span[], int count) SK_OVERRIDE {
+        void shadeSpan(int x, int y, SkPMColor span[], int count) override {
             if (fProxyContext) {
                 fProxyContext->shadeSpan(x, y, span, count);
             }
 
-            if (fMask == NULL) {
-                if (fProxyContext == NULL) {
+            if (fMask == nullptr) {
+                if (fProxyContext == nullptr) {
                     sk_memset32(span, fPMColor, count);
                 }
                 return;
@@ -697,10 +703,10 @@ public:
     };
 
 #ifndef SK_IGNORE_TO_STRING
-    virtual void toString(SkString* str) const SK_OVERRIDE {
+    void toString(SkString* str) const override {
         str->append("Sk3DShader: (");
 
-        if (NULL != fProxy) {
+        if (fProxy) {
             str->append("Proxy: ");
             fProxy->toString(str);
         }
@@ -714,19 +720,8 @@ public:
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(Sk3DShader)
 
 protected:
-    Sk3DShader(SkReadBuffer& buffer) : INHERITED(buffer) {
-        fProxy = buffer.readShader();
-        // Leaving this here until we bump the picture version, though this
-        // shader should never be recorded.
-        buffer.readColor();
-    }
-
-    virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE {
-        this->INHERITED::flatten(buffer);
+    void flatten(SkWriteBuffer& buffer) const override {
         buffer.writeFlattenable(fProxy);
-        // Leaving this here until we bump the picture version, though this
-        // shader should never be recorded.
-        buffer.writeColor(SkColor());
     }
 
 private:
@@ -735,39 +730,44 @@ private:
     typedef SkShader INHERITED;
 };
 
+SkFlattenable* Sk3DShader::CreateProc(SkReadBuffer& buffer) {
+    SkAutoTUnref<SkShader> shader(buffer.readShader());
+    return new Sk3DShader(shader);
+}
+
 class Sk3DBlitter : public SkBlitter {
 public:
-    Sk3DBlitter(SkBlitter* proxy, Sk3DShader::Sk3DShaderContext* shaderContext)
+    Sk3DBlitter(SkBlitter* proxy, SkShader::Context* shaderContext)
         : fProxy(proxy)
-        , f3DShaderContext(shaderContext)
+        , fShaderContext(shaderContext)
     {}
 
-    virtual void blitH(int x, int y, int width) {
+    void blitH(int x, int y, int width) override {
         fProxy->blitH(x, y, width);
     }
 
     virtual void blitAntiH(int x, int y, const SkAlpha antialias[],
-                           const int16_t runs[]) {
+                           const int16_t runs[]) override {
         fProxy->blitAntiH(x, y, antialias, runs);
     }
 
-    virtual void blitV(int x, int y, int height, SkAlpha alpha) {
+    void blitV(int x, int y, int height, SkAlpha alpha) override {
         fProxy->blitV(x, y, height, alpha);
     }
 
-    virtual void blitRect(int x, int y, int width, int height) {
+    void blitRect(int x, int y, int width, int height) override {
         fProxy->blitRect(x, y, width, height);
     }
 
-    virtual void blitMask(const SkMask& mask, const SkIRect& clip) {
+    void blitMask(const SkMask& mask, const SkIRect& clip) override {
         if (mask.fFormat == SkMask::k3D_Format) {
-            f3DShaderContext->setMask(&mask);
+            fShaderContext->set3DMask(&mask);
 
             ((SkMask*)&mask)->fFormat = SkMask::kA8_Format;
             fProxy->blitMask(mask, clip);
             ((SkMask*)&mask)->fFormat = SkMask::k3D_Format;
 
-            f3DShaderContext->setMask(NULL);
+            fShaderContext->set3DMask(nullptr);
         } else {
             fProxy->blitMask(mask, clip);
         }
@@ -775,112 +775,52 @@ public:
 
 private:
     // Both pointers are unowned. They will be deleted by SkSmallAllocator.
-    SkBlitter*                     fProxy;
-    Sk3DShader::Sk3DShaderContext* f3DShaderContext;
+    SkBlitter*          fProxy;
+    SkShader::Context*  fShaderContext;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "SkCoreBlitters.h"
 
-static bool just_solid_color(const SkPaint& paint) {
-    if (paint.getAlpha() == 0xFF && paint.getColorFilter() == NULL) {
-        SkShader* shader = paint.getShader();
-        if (NULL == shader) {
-            return true;
-        }
-    }
-    return false;
-}
-
-/** By analyzing the paint (with an xfermode), we may decide we can take
-    special action. This enum lists our possible actions
- */
-enum XferInterp {
-    kNormal_XferInterp,         // no special interpretation, draw normally
-    kSrcOver_XferInterp,        // draw as if in srcover mode
-    kSkipDrawing_XferInterp     // draw nothing
-};
-
-static XferInterp interpret_xfermode(const SkPaint& paint, SkXfermode* xfer,
-                                     SkColorType deviceCT) {
-    SkXfermode::Mode  mode;
-
-    if (SkXfermode::AsMode(xfer, &mode)) {
-        switch (mode) {
-            case SkXfermode::kSrc_Mode:
-                if (just_solid_color(paint)) {
-                    return kSrcOver_XferInterp;
-                }
-                break;
-            case SkXfermode::kDst_Mode:
-                return kSkipDrawing_XferInterp;
-            case SkXfermode::kSrcOver_Mode:
-                return kSrcOver_XferInterp;
-            case SkXfermode::kDstOver_Mode:
-                if (kRGB_565_SkColorType == deviceCT) {
-                    return kSkipDrawing_XferInterp;
-                }
-                break;
-            case SkXfermode::kSrcIn_Mode:
-                if (kRGB_565_SkColorType == deviceCT &&
-                    just_solid_color(paint)) {
-                    return kSrcOver_XferInterp;
-                }
-                break;
-            case SkXfermode::kDstIn_Mode:
-                if (just_solid_color(paint)) {
-                    return kSkipDrawing_XferInterp;
-                }
-                break;
-            default:
-                break;
-        }
-    }
-    return kNormal_XferInterp;
-}
-
-SkBlitter* SkBlitter::Choose(const SkBitmap& device,
+SkBlitter* SkBlitter::Choose(const SkPixmap& device,
                              const SkMatrix& matrix,
                              const SkPaint& origPaint,
                              SkTBlitterAllocator* allocator,
                              bool drawCoverage) {
-    SkASSERT(allocator != NULL);
-
-    SkBlitter*  blitter = NULL;
+    SkASSERT(allocator != nullptr);
 
     // which check, in case we're being called by a client with a dummy device
     // (e.g. they have a bounder that always aborts the draw)
     if (kUnknown_SkColorType == device.colorType() ||
             (drawCoverage && (kAlpha_8_SkColorType != device.colorType()))) {
-        blitter = allocator->createT<SkNullBlitter>();
-        return blitter;
+        return allocator->createT<SkNullBlitter>();
     }
 
     SkShader* shader = origPaint.getShader();
     SkColorFilter* cf = origPaint.getColorFilter();
     SkXfermode* mode = origPaint.getXfermode();
-    Sk3DShader* shader3D = NULL;
+    Sk3DShader* shader3D = nullptr;
 
     SkTCopyOnFirstWrite<SkPaint> paint(origPaint);
 
-    if (origPaint.getMaskFilter() != NULL &&
+    if (origPaint.getMaskFilter() != nullptr &&
             origPaint.getMaskFilter()->getFormat() == SkMask::k3D_Format) {
-        shader3D = SkNEW_ARGS(Sk3DShader, (shader));
+        shader3D = new Sk3DShader(shader);
         // we know we haven't initialized lazyPaint yet, so just do it
         paint.writable()->setShader(shader3D)->unref();
         shader = shader3D;
     }
 
-    if (NULL != mode) {
-        switch (interpret_xfermode(*paint, mode, device.colorType())) {
-            case kSrcOver_XferInterp:
-                mode = NULL;
-                paint.writable()->setXfermode(NULL);
+    if (mode) {
+        bool deviceIsOpaque = kRGB_565_SkColorType == device.colorType();
+        switch (SkInterpretXfermode(*paint, deviceIsOpaque)) {
+            case kSrcOver_SkXfermodeInterpretation:
+                mode = nullptr;
+                paint.writable()->setXfermode(nullptr);
                 break;
-            case kSkipDrawing_XferInterp:{
-                blitter = allocator->createT<SkNullBlitter>();
-                return blitter;
+            case kSkipDrawing_SkXfermodeInterpretation:{
+                return allocator->createT<SkNullBlitter>();
             }
             default:
                 break;
@@ -894,16 +834,16 @@ SkBlitter* SkBlitter::Choose(const SkBitmap& device,
      */
     if (SkXfermode::IsMode(mode, SkXfermode::kClear_Mode)) {
         SkPaint* p = paint.writable();
-        shader = p->setShader(NULL);
-        cf = p->setColorFilter(NULL);
+        shader = p->setShader(nullptr);
+        cf = p->setColorFilter(nullptr);
         mode = p->setXfermodeMode(SkXfermode::kSrc_Mode);
         p->setColor(0);
     }
 
-    if (NULL == shader) {
+    if (nullptr == shader) {
         if (mode) {
             // xfermodes (and filters) require shaders for our current blitters
-            shader = SkNEW_ARGS(SkColorShader, (paint->getColor()));
+            shader = new SkColorShader(paint->getColor());
             paint.writable()->setShader(shader)->unref();
             paint.writable()->setAlpha(0xFF);
         } else if (cf) {
@@ -911,14 +851,14 @@ SkBlitter* SkBlitter::Choose(const SkBitmap& device,
             // our color and move on.
             SkPaint* writablePaint = paint.writable();
             writablePaint->setColor(cf->filterColor(paint->getColor()));
-            writablePaint->setColorFilter(NULL);
-            cf = NULL;
+            writablePaint->setColorFilter(nullptr);
+            cf = nullptr;
         }
     }
 
     if (cf) {
         SkASSERT(shader);
-        shader = SkNEW_ARGS(SkFilterShader, (shader, cf));
+        shader = new SkFilterShader(shader, cf);
         paint.writable()->setShader(shader)->unref();
         // blitters should ignore the presence/absence of a filter, since
         // if there is one, the shader will take care of it.
@@ -927,29 +867,31 @@ SkBlitter* SkBlitter::Choose(const SkBitmap& device,
     /*
      *  We create a SkShader::Context object, and store it on the blitter.
      */
-    SkShader::Context* shaderContext;
+    SkShader::Context* shaderContext = nullptr;
     if (shader) {
-        SkShader::ContextRec rec(device, *paint, matrix);
-        // Try to create the ShaderContext
-        void* storage = allocator->reserveT<SkShader::Context>(shader->contextSize());
-        shaderContext = shader->createContext(rec, storage);
-        if (!shaderContext) {
-            allocator->freeLast();
-            blitter = allocator->createT<SkNullBlitter>();
-            return blitter;
+        SkShader::ContextRec rec(*paint, matrix, nullptr);
+        size_t contextSize = shader->contextSize();
+        if (contextSize) {
+            // Try to create the ShaderContext
+            void* storage = allocator->reserveT<SkShader::Context>(contextSize);
+            shaderContext = shader->createContext(rec, storage);
+            if (!shaderContext) {
+                allocator->freeLast();
+                return allocator->createT<SkNullBlitter>();
+            }
+            SkASSERT(shaderContext);
+            SkASSERT((void*) shaderContext == storage);
+        } else {
+            return allocator->createT<SkNullBlitter>();
         }
-        SkASSERT(shaderContext);
-        SkASSERT((void*) shaderContext == storage);
-    } else {
-        shaderContext = NULL;
     }
 
-
+    SkBlitter*  blitter = nullptr;
     switch (device.colorType()) {
         case kAlpha_8_SkColorType:
             if (drawCoverage) {
-                SkASSERT(NULL == shader);
-                SkASSERT(NULL == paint->getXfermode());
+                SkASSERT(nullptr == shader);
+                SkASSERT(nullptr == paint->getXfermode());
                 blitter = allocator->createT<SkA8_Coverage_Blitter>(device, *paint);
             } else if (shader) {
                 blitter = allocator->createT<SkA8_Shader_Blitter>(device, *paint, shaderContext);
@@ -984,22 +926,22 @@ SkBlitter* SkBlitter::Choose(const SkBitmap& device,
     if (shader3D) {
         SkBlitter* innerBlitter = blitter;
         // innerBlitter was allocated by allocator, which will delete it.
-        // We know shaderContext is of type Sk3DShaderContext because it belongs to shader3D.
-        blitter = allocator->createT<Sk3DBlitter>(innerBlitter,
-                static_cast<Sk3DShader::Sk3DShaderContext*>(shaderContext));
+        // We know shaderContext or its proxies is of type Sk3DShaderContext, so we need to
+        // wrapper the blitter to notify it when we see an emboss mask.
+        blitter = allocator->createT<Sk3DBlitter>(innerBlitter, shaderContext);
     }
     return blitter;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-class SkTransparentShaderContext : public SkShader::Context {
+class SkZeroShaderContext : public SkShader::Context {
 public:
-    SkTransparentShaderContext(const SkShader& shader, const SkShader::ContextRec& rec)
+    SkZeroShaderContext(const SkShader& shader, const SkShader::ContextRec& rec)
         // Override rec with the identity matrix, so it is guaranteed to be invertible.
-        : INHERITED(shader, SkShader::ContextRec(*rec.fDevice, *rec.fPaint, SkMatrix::I())) {}
+        : INHERITED(shader, SkShader::ContextRec(*rec.fPaint, SkMatrix::I(), nullptr)) {}
 
-    virtual void shadeSpan(int x, int y, SkPMColor colors[], int count) SK_OVERRIDE {
+    void shadeSpan(int x, int y, SkPMColor colors[], int count) override {
         sk_bzero(colors, count * sizeof(SkPMColor));
     }
 
@@ -1007,7 +949,7 @@ private:
     typedef SkShader::Context INHERITED;
 };
 
-SkShaderBlitter::SkShaderBlitter(const SkBitmap& device, const SkPaint& paint,
+SkShaderBlitter::SkShaderBlitter(const SkPixmap& device, const SkPaint& paint,
                                  SkShader::Context* shaderContext)
         : INHERITED(device)
         , fShader(paint.getShader())
@@ -1031,10 +973,10 @@ bool SkShaderBlitter::resetShaderContext(const SkShader::ContextRec& rec) {
     // shader to create it. It is therefore safe to re-use the storage.
     fShaderContext->~Context();
     SkShader::Context* ctx = fShader->createContext(rec, (void*)fShaderContext);
-    if (NULL == ctx) {
+    if (nullptr == ctx) {
         // Need a valid context in fShaderContext's storage, so we can later (or our caller) call
         // the in-place destructor.
-        SkNEW_PLACEMENT_ARGS(fShaderContext, SkTransparentShaderContext, (*fShader, rec));
+        new (fShaderContext) SkZeroShaderContext(*fShader, rec);
         return false;
     }
     return true;
diff --git a/gfx/skia/skia/src/core/SkBlitter.h b/gfx/skia/skia/src/core/SkBlitter.h
index 992eb86fa043..5740a5eaedf2 100644
--- a/gfx/skia/skia/src/core/SkBlitter.h
+++ b/gfx/skia/skia/src/core/SkBlitter.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,19 +5,20 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkBlitter_DEFINED
 #define SkBlitter_DEFINED
 
-#include "SkBitmap.h"
 #include "SkBitmapProcShader.h"
-#include "SkMask.h"
-#include "SkMatrix.h"
-#include "SkPaint.h"
-#include "SkRefCnt.h"
+#include "SkColor.h"
+#include "SkRect.h"
 #include "SkRegion.h"
 #include "SkShader.h"
-#include "SkSmallAllocator.h"
+#include "SkTypes.h"
+
+class SkMatrix;
+class SkPaint;
+class SkPixmap;
+struct SkMask;
 
 /** SkBlitter and its subclasses are responsible for actually writing pixels
     into memory. Besides efficiency, they handle clipping and antialiasing.
@@ -50,11 +50,40 @@ public:
     virtual void blitMask(const SkMask&, const SkIRect& clip);
 
     /** If the blitter just sets a single value for each pixel, return the
-        bitmap it draws into, and assign value. If not, return NULL and ignore
+        bitmap it draws into, and assign value. If not, return nullptr and ignore
         the value parameter.
     */
-    virtual const SkBitmap* justAnOpaqueColor(uint32_t* value);
+    virtual const SkPixmap* justAnOpaqueColor(uint32_t* value);
 
+    // (x, y), (x + 1, y)
+    virtual void blitAntiH2(int x, int y, U8CPU a0, U8CPU a1) {
+        int16_t runs[3];
+        uint8_t aa[2];
+        
+        runs[0] = 1;
+        runs[1] = 1;
+        runs[2] = 0;
+        aa[0] = SkToU8(a0);
+        aa[1] = SkToU8(a1);
+        this->blitAntiH(x, y, aa, runs);
+    }
+
+    // (x, y), (x, y + 1)
+    virtual void blitAntiV2(int x, int y, U8CPU a0, U8CPU a1) {
+        int16_t runs[2];
+        uint8_t aa[1];
+        
+        runs[0] = 1;
+        runs[1] = 0;
+        aa[0] = SkToU8(a0);
+        this->blitAntiH(x, y, aa, runs);
+        // reset in case the clipping blitter modified runs
+        runs[0] = 1;
+        runs[1] = 0;
+        aa[0] = SkToU8(a1);
+        this->blitAntiH(x, y + 1, aa, runs);
+    }
+    
     /**
      *  Special method just to identify the null blitter, which is returned
      *  from Choose() if the request cannot be fulfilled. Default impl
@@ -80,7 +109,7 @@ public:
      * This function allocates memory for the blitter that the blitter then owns.
      * The memory can be used by the calling function at will, but it will be
      * released when the blitter's destructor is called. This function returns
-     * NULL if no persistent memory is needed by the blitter.
+     * nullptr if no persistent memory is needed by the blitter.
      */
     virtual void* allocBlitMemory(size_t sz) {
         return fBlitMemory.reset(sz, SkAutoMalloc::kReuse_OnShrink);
@@ -95,38 +124,34 @@ public:
     /** @name Factories
         Return the correct blitter to use given the specified context.
      */
-    static SkBlitter* Choose(const SkBitmap& device,
+    static SkBlitter* Choose(const SkPixmap& dst,
                              const SkMatrix& matrix,
                              const SkPaint& paint,
                              SkTBlitterAllocator*,
                              bool drawCoverage = false);
 
-    static SkBlitter* ChooseSprite(const SkBitmap& device,
+    static SkBlitter* ChooseSprite(const SkPixmap& dst,
                                    const SkPaint&,
-                                   const SkBitmap& src,
+                                   const SkPixmap& src,
                                    int left, int top,
                                    SkTBlitterAllocator*);
     ///@}
 
 protected:
-
     SkAutoMalloc fBlitMemory;
-    
-private:
 };
 
 /** This blitter silently never draws anything.
 */
 class SkNullBlitter : public SkBlitter {
 public:
-    virtual void blitH(int x, int y, int width) SK_OVERRIDE;
-    virtual void blitAntiH(int x, int y, const SkAlpha[],
-                           const int16_t runs[]) SK_OVERRIDE;
-    virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE;
-    virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE;
-    virtual void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE;
-    virtual const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE;
-    virtual bool isNullBlitter() const SK_OVERRIDE;
+    void blitH(int x, int y, int width) override;
+    void blitAntiH(int x, int y, const SkAlpha[], const int16_t runs[]) override;
+    void blitV(int x, int y, int height, SkAlpha alpha) override;
+    void blitRect(int x, int y, int width, int height) override;
+    void blitMask(const SkMask&, const SkIRect& clip) override;
+    const SkPixmap* justAnOpaqueColor(uint32_t* value) override;
+    bool isNullBlitter() const override;
 };
 
 /** Wraps another (real) blitter, and ensures that the real blitter is only
@@ -141,17 +166,20 @@ public:
         fClipRect = clipRect;
     }
 
-    virtual void blitH(int x, int y, int width) SK_OVERRIDE;
-    virtual void blitAntiH(int x, int y, const SkAlpha[],
-                           const int16_t runs[]) SK_OVERRIDE;
-    virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE;
-    virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE;
+    void blitH(int x, int y, int width) override;
+    void blitAntiH(int x, int y, const SkAlpha[], const int16_t runs[]) override;
+    void blitV(int x, int y, int height, SkAlpha alpha) override;
+    void blitRect(int x, int y, int width, int height) override;
     virtual void blitAntiRect(int x, int y, int width, int height,
-                     SkAlpha leftAlpha, SkAlpha rightAlpha) SK_OVERRIDE;
-    virtual void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE;
-    virtual const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE;
+                     SkAlpha leftAlpha, SkAlpha rightAlpha) override;
+    void blitMask(const SkMask&, const SkIRect& clip) override;
+    const SkPixmap* justAnOpaqueColor(uint32_t* value) override;
 
-    virtual void* allocBlitMemory(size_t sz) SK_OVERRIDE {
+    int requestRowsPreserved() const override {
+        return fBlitter->requestRowsPreserved();
+    }
+
+    void* allocBlitMemory(size_t sz) override {
         return fBlitter->allocBlitMemory(sz);
     }
 
@@ -172,17 +200,20 @@ public:
         fRgn = clipRgn;
     }
 
-    virtual void blitH(int x, int y, int width) SK_OVERRIDE;
-    virtual void blitAntiH(int x, int y, const SkAlpha[],
-                           const int16_t runs[]) SK_OVERRIDE;
-    virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE;
-    virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE;
-    virtual void blitAntiRect(int x, int y, int width, int height,
-                     SkAlpha leftAlpha, SkAlpha rightAlpha) SK_OVERRIDE;
-    virtual void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE;
-    virtual const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE;
+    void blitH(int x, int y, int width) override;
+    void blitAntiH(int x, int y, const SkAlpha[], const int16_t runs[]) override;
+    void blitV(int x, int y, int height, SkAlpha alpha) override;
+    void blitRect(int x, int y, int width, int height) override;
+    void blitAntiRect(int x, int y, int width, int height,
+                      SkAlpha leftAlpha, SkAlpha rightAlpha) override;
+    void blitMask(const SkMask&, const SkIRect& clip) override;
+    const SkPixmap* justAnOpaqueColor(uint32_t* value) override;
 
-    virtual void* allocBlitMemory(size_t sz) SK_OVERRIDE {
+    int requestRowsPreserved() const override {
+        return fBlitter->requestRowsPreserved();
+    }
+
+    void* allocBlitMemory(size_t sz) override {
         return fBlitter->allocBlitMemory(sz);
     }
 
@@ -198,7 +229,7 @@ private:
 class SkBlitterClipper {
 public:
     SkBlitter*  apply(SkBlitter* blitter, const SkRegion* clip,
-                      const SkIRect* bounds = NULL);
+                      const SkIRect* bounds = nullptr);
 
 private:
     SkNullBlitter       fNullBlitter;
diff --git a/gfx/skia/skia/src/core/SkBlitter_A8.cpp b/gfx/skia/skia/src/core/SkBlitter_A8.cpp
index 11f425903b99..51748b00e957 100644
--- a/gfx/skia/skia/src/core/SkBlitter_A8.cpp
+++ b/gfx/skia/skia/src/core/SkBlitter_A8.cpp
@@ -12,17 +12,16 @@
 #include "SkShader.h"
 #include "SkXfermode.h"
 
-SkA8_Blitter::SkA8_Blitter(const SkBitmap& device, const SkPaint& paint)
-        : INHERITED(device) {
+SkA8_Blitter::SkA8_Blitter(const SkPixmap& device, const SkPaint& paint) : INHERITED(device) {
     fSrcA = paint.getAlpha();
 }
 
-const SkBitmap* SkA8_Blitter::justAnOpaqueColor(uint32_t* value) {
+const SkPixmap* SkA8_Blitter::justAnOpaqueColor(uint32_t* value) {
     if (255 == fSrcA) {
         *value = 255;
         return &fDevice;
     }
-    return NULL;
+    return nullptr;
 }
 
 void SkA8_Blitter::blitH(int x, int y, int width) {
@@ -33,7 +32,7 @@ void SkA8_Blitter::blitH(int x, int y, int width) {
         return;
     }
 
-    uint8_t* device = fDevice.getAddr8(x, y);
+    uint8_t* device = fDevice.writable_addr8(x, y);
 
     if (fSrcA == 255) {
         memset(device, 0xFF, width);
@@ -53,7 +52,7 @@ void SkA8_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[],
         return;
     }
 
-    uint8_t*    device = fDevice.getAddr8(x, y);
+    uint8_t*    device = fDevice.writable_addr8(x, y);
     unsigned    srcA = fSrcA;
 
     for (;;) {
@@ -97,7 +96,7 @@ void SkA8_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[],
 #define SK_BLITBWMASK_NAME                  SkA8_BlitBW
 #define SK_BLITBWMASK_ARGS
 #define SK_BLITBWMASK_BLIT8(mask, dst)      solid_8_pixels(mask, dst)
-#define SK_BLITBWMASK_GETADDR               getAddr8
+#define SK_BLITBWMASK_GETADDR               writable_addr8
 #define SK_BLITBWMASK_DEVTYPE               uint8_t
 #include "SkBlitBWMaskTemplate.h"
 
@@ -116,7 +115,7 @@ static inline void blend_8_pixels(U8CPU bw, uint8_t dst[], U8CPU sa,
 #define SK_BLITBWMASK_NAME                  SkA8_BlendBW
 #define SK_BLITBWMASK_ARGS                  , U8CPU sa, unsigned dst_scale
 #define SK_BLITBWMASK_BLIT8(mask, dst)      blend_8_pixels(mask, dst, sa, dst_scale)
-#define SK_BLITBWMASK_GETADDR               getAddr8
+#define SK_BLITBWMASK_GETADDR               writable_addr8
 #define SK_BLITBWMASK_DEVTYPE               uint8_t
 #include "SkBlitBWMaskTemplate.h"
 
@@ -139,7 +138,7 @@ void SkA8_Blitter::blitMask(const SkMask& mask, const SkIRect& clip) {
     int y = clip.fTop;
     int width = clip.width();
     int height = clip.height();
-    uint8_t* device = fDevice.getAddr8(x, y);
+    uint8_t* device = fDevice.writable_addr8(x, y);
     const uint8_t* alpha = mask.getAddr8(x, y);
     unsigned    srcA = fSrcA;
 
@@ -179,7 +178,7 @@ void SkA8_Blitter::blitV(int x, int y, int height, SkAlpha alpha) {
     }
 
     unsigned sa = SkAlphaMul(fSrcA, SkAlpha255To256(alpha));
-    uint8_t* device = fDevice.getAddr8(x, y);
+    uint8_t* device = fDevice.writable_addr8(x, y);
     size_t   rowBytes = fDevice.rowBytes();
 
     if (sa == 0xFF) {
@@ -206,7 +205,7 @@ void SkA8_Blitter::blitRect(int x, int y, int width, int height) {
         return;
     }
 
-    uint8_t*    device = fDevice.getAddr8(x, y);
+    uint8_t*    device = fDevice.writable_addr8(x, y);
     unsigned    srcA = fSrcA;
 
     if (srcA == 255) {
@@ -228,10 +227,11 @@ void SkA8_Blitter::blitRect(int x, int y, int width, int height) {
 
 ///////////////////////////////////////////////////////////////////////
 
-SkA8_Shader_Blitter::SkA8_Shader_Blitter(const SkBitmap& device, const SkPaint& paint,
+SkA8_Shader_Blitter::SkA8_Shader_Blitter(const SkPixmap& device, const SkPaint& paint,
                                          SkShader::Context* shaderContext)
-    : INHERITED(device, paint, shaderContext) {
-    if ((fXfermode = paint.getXfermode()) != NULL) {
+    : INHERITED(device, paint, shaderContext)
+{
+    if ((fXfermode = paint.getXfermode()) != nullptr) {
         fXfermode->ref();
         SkASSERT(fShaderContext);
     }
@@ -250,7 +250,7 @@ void SkA8_Shader_Blitter::blitH(int x, int y, int width) {
     SkASSERT(x >= 0 && y >= 0 &&
              (unsigned)(x + width) <= (unsigned)fDevice.width());
 
-    uint8_t* device = fDevice.getAddr8(x, y);
+    uint8_t* device = fDevice.writable_addr8(x, y);
     SkShader::Context* shaderContext = fShaderContext;
 
     if ((shaderContext->getFlags() & SkShader::kOpaqueAlpha_Flag) && !fXfermode) {
@@ -260,7 +260,7 @@ void SkA8_Shader_Blitter::blitH(int x, int y, int width) {
 
         shaderContext->shadeSpan(x, y, span, width);
         if (fXfermode) {
-            fXfermode->xferA8(device, span, width, NULL);
+            fXfermode->xferA8(device, span, width, nullptr);
         } else {
             for (int i = width - 1; i >= 0; --i) {
                 unsigned    srcA = SkGetPackedA32(span[i]);
@@ -288,7 +288,7 @@ void SkA8_Shader_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[],
     SkXfermode*        mode = fXfermode;
     uint8_t*           aaExpand = fAAExpand;
     SkPMColor*         span = fBuffer;
-    uint8_t*           device = fDevice.getAddr8(x, y);
+    uint8_t*           device = fDevice.writable_addr8(x, y);
     int                opaque = shaderContext->getFlags() & SkShader::kOpaqueAlpha_Flag;
 
     for (;;) {
@@ -298,7 +298,7 @@ void SkA8_Shader_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[],
         }
         int aa = *antialias;
         if (aa) {
-            if (opaque && aa == 255 && mode == NULL) {
+            if (opaque && aa == 255 && mode == nullptr) {
                 memset(device, 0xFF, count);
             } else {
                 shaderContext->shadeSpan(x, y, span, count);
@@ -329,7 +329,7 @@ void SkA8_Shader_Blitter::blitMask(const SkMask& mask, const SkIRect& clip) {
     int y = clip.fTop;
     int width = clip.width();
     int height = clip.height();
-    uint8_t* device = fDevice.getAddr8(x, y);
+    uint8_t* device = fDevice.writable_addr8(x, y);
     const uint8_t* alpha = mask.getAddr8(x, y);
     SkShader::Context* shaderContext = fShaderContext;
 
@@ -353,16 +353,16 @@ void SkA8_Shader_Blitter::blitMask(const SkMask& mask, const SkIRect& clip) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkA8_Coverage_Blitter::SkA8_Coverage_Blitter(const SkBitmap& device,
+SkA8_Coverage_Blitter::SkA8_Coverage_Blitter(const SkPixmap& device,
                              const SkPaint& paint) : SkRasterBlitter(device) {
-    SkASSERT(NULL == paint.getShader());
-    SkASSERT(NULL == paint.getXfermode());
-    SkASSERT(NULL == paint.getColorFilter());
+    SkASSERT(nullptr == paint.getShader());
+    SkASSERT(nullptr == paint.getXfermode());
+    SkASSERT(nullptr == paint.getColorFilter());
 }
 
 void SkA8_Coverage_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[],
                                       const int16_t runs[]) {
-    uint8_t* device = fDevice.getAddr8(x, y);
+    uint8_t* device = fDevice.writable_addr8(x, y);
     SkDEBUGCODE(int totalCount = 0;)
 
     for (;;) {
@@ -384,7 +384,7 @@ void SkA8_Coverage_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[],
 }
 
 void SkA8_Coverage_Blitter::blitH(int x, int y, int width) {
-    memset(fDevice.getAddr8(x, y), 0xFF, width);
+    memset(fDevice.writable_addr8(x, y), 0xFF, width);
 }
 
 void SkA8_Coverage_Blitter::blitV(int x, int y, int height, SkAlpha alpha) {
@@ -392,7 +392,7 @@ void SkA8_Coverage_Blitter::blitV(int x, int y, int height, SkAlpha alpha) {
         return;
     }
 
-    uint8_t* dst = fDevice.getAddr8(x, y);
+    uint8_t* dst = fDevice.writable_addr8(x, y);
     const size_t dstRB = fDevice.rowBytes();
     while (--height >= 0) {
         *dst = alpha;
@@ -401,7 +401,7 @@ void SkA8_Coverage_Blitter::blitV(int x, int y, int height, SkAlpha alpha) {
 }
 
 void SkA8_Coverage_Blitter::blitRect(int x, int y, int width, int height) {
-    uint8_t* dst = fDevice.getAddr8(x, y);
+    uint8_t* dst = fDevice.writable_addr8(x, y);
     const size_t dstRB = fDevice.rowBytes();
     while (--height >= 0) {
         memset(dst, 0xFF, width);
@@ -417,7 +417,7 @@ void SkA8_Coverage_Blitter::blitMask(const SkMask& mask, const SkIRect& clip) {
     int width = clip.width();
     int height = clip.height();
 
-    uint8_t* dst = fDevice.getAddr8(x, y);
+    uint8_t* dst = fDevice.writable_addr8(x, y);
     const uint8_t* src = mask.getAddr8(x, y);
     const size_t srcRB = mask.fRowBytes;
     const size_t dstRB = fDevice.rowBytes();
@@ -429,6 +429,6 @@ void SkA8_Coverage_Blitter::blitMask(const SkMask& mask, const SkIRect& clip) {
     }
 }
 
-const SkBitmap* SkA8_Coverage_Blitter::justAnOpaqueColor(uint32_t*) {
-    return NULL;
+const SkPixmap* SkA8_Coverage_Blitter::justAnOpaqueColor(uint32_t*) {
+    return nullptr;
 }
diff --git a/gfx/skia/skia/src/core/SkBlitter_ARGB32.cpp b/gfx/skia/skia/src/core/SkBlitter_ARGB32.cpp
index f86bc47074b5..e44ad02da57a 100644
--- a/gfx/skia/skia/src/core/SkBlitter_ARGB32.cpp
+++ b/gfx/skia/skia/src/core/SkBlitter_ARGB32.cpp
@@ -14,7 +14,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static void SkARGB32_Blit32(const SkBitmap& device, const SkMask& mask,
+static void SkARGB32_Blit32(const SkPixmap& device, const SkMask& mask,
                             const SkIRect& clip, SkPMColor srcColor) {
     U8CPU alpha = SkGetPackedA32(srcColor);
     unsigned flags = SkBlitRow::kSrcPixelAlpha_Flag32;
@@ -28,7 +28,7 @@ static void SkARGB32_Blit32(const SkBitmap& device, const SkMask& mask,
     int width = clip.width();
     int height = clip.height();
 
-    SkPMColor*         dstRow = device.getAddr32(x, y);
+    SkPMColor* dstRow = device.writable_addr32(x, y);
     const SkPMColor* srcRow = reinterpret_cast<const SkPMColor*>(mask.getAddr8(x, y));
 
     do {
@@ -40,7 +40,7 @@ static void SkARGB32_Blit32(const SkBitmap& device, const SkMask& mask,
 
 //////////////////////////////////////////////////////////////////////////////////////
 
-SkARGB32_Blitter::SkARGB32_Blitter(const SkBitmap& device, const SkPaint& paint)
+SkARGB32_Blitter::SkARGB32_Blitter(const SkPixmap& device, const SkPaint& paint)
         : INHERITED(device) {
     SkColor color = paint.getColor();
     fColor = color;
@@ -52,16 +52,14 @@ SkARGB32_Blitter::SkARGB32_Blitter(const SkBitmap& device, const SkPaint& paint)
     fSrcB = SkAlphaMul(SkColorGetB(color), scale);
 
     fPMColor = SkPackARGB32(fSrcA, fSrcR, fSrcG, fSrcB);
-    fColor32Proc = SkBlitRow::ColorProcFactory();
-    fColorRect32Proc = SkBlitRow::ColorRectProcFactory();
 }
 
-const SkBitmap* SkARGB32_Blitter::justAnOpaqueColor(uint32_t* value) {
+const SkPixmap* SkARGB32_Blitter::justAnOpaqueColor(uint32_t* value) {
     if (255 == fSrcA) {
         *value = fPMColor;
         return &fDevice;
     }
-    return NULL;
+    return nullptr;
 }
 
 #if defined _WIN32 && _MSC_VER >= 1300  // disable warning : local variable used without having been initialized
@@ -72,8 +70,8 @@ const SkBitmap* SkARGB32_Blitter::justAnOpaqueColor(uint32_t* value) {
 void SkARGB32_Blitter::blitH(int x, int y, int width) {
     SkASSERT(x >= 0 && y >= 0 && x + width <= fDevice.width());
 
-    uint32_t*   device = fDevice.getAddr32(x, y);
-    fColor32Proc(device, device, width, fPMColor);
+    uint32_t* device = fDevice.writable_addr32(x, y);
+    SkBlitRow::Color32(device, device, width, fPMColor);
 }
 
 void SkARGB32_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[],
@@ -83,7 +81,7 @@ void SkARGB32_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[],
     }
 
     uint32_t    color = fPMColor;
-    uint32_t*   device = fDevice.getAddr32(x, y);
+    uint32_t*   device = fDevice.writable_addr32(x, y);
     unsigned    opaqueMask = fSrcA; // if fSrcA is 0xFF, then we will catch the fast opaque case
 
     for (;;) {
@@ -98,7 +96,7 @@ void SkARGB32_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[],
                 sk_memset32(device, color, count);
             } else {
                 uint32_t sc = SkAlphaMulQ(color, SkAlpha255To256(aa));
-                fColor32Proc(device, device, count, sc);
+                SkBlitRow::Color32(device, device, count, sc);
             }
         }
         runs += count;
@@ -107,6 +105,23 @@ void SkARGB32_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[],
     }
 }
 
+void SkARGB32_Blitter::blitAntiH2(int x, int y, U8CPU a0, U8CPU a1) {
+    uint32_t* device = fDevice.writable_addr32(x, y);
+    SkDEBUGCODE((void)fDevice.writable_addr32(x + 1, y);)
+
+    device[0] = SkBlendARGB32(fPMColor, device[0], a0);
+    device[1] = SkBlendARGB32(fPMColor, device[1], a1);
+}
+
+void SkARGB32_Blitter::blitAntiV2(int x, int y, U8CPU a0, U8CPU a1) {
+    uint32_t* device = fDevice.writable_addr32(x, y);
+    SkDEBUGCODE((void)fDevice.writable_addr32(x, y + 1);)
+
+    device[0] = SkBlendARGB32(fPMColor, device[0], a0);
+    device = (uint32_t*)((char*)device + fDevice.rowBytes());
+    device[0] = SkBlendARGB32(fPMColor, device[0], a1);
+}
+
 //////////////////////////////////////////////////////////////////////////////////////
 
 #define solid_8_pixels(mask, dst, color)    \
@@ -124,7 +139,7 @@ void SkARGB32_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[],
 #define SK_BLITBWMASK_NAME                  SkARGB32_BlitBW
 #define SK_BLITBWMASK_ARGS                  , SkPMColor color
 #define SK_BLITBWMASK_BLIT8(mask, dst)      solid_8_pixels(mask, dst, color)
-#define SK_BLITBWMASK_GETADDR               getAddr32
+#define SK_BLITBWMASK_GETADDR               writable_addr32
 #define SK_BLITBWMASK_DEVTYPE               uint32_t
 #include "SkBlitBWMaskTemplate.h"
 
@@ -143,7 +158,7 @@ void SkARGB32_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[],
 #define SK_BLITBWMASK_NAME                  SkARGB32_BlendBW
 #define SK_BLITBWMASK_ARGS                  , uint32_t sc, unsigned dst_scale
 #define SK_BLITBWMASK_BLIT8(mask, dst)      blend_8_pixels(mask, dst, sc, dst_scale)
-#define SK_BLITBWMASK_GETADDR               getAddr32
+#define SK_BLITBWMASK_GETADDR               writable_addr32
 #define SK_BLITBWMASK_DEVTYPE               uint32_t
 #include "SkBlitBWMaskTemplate.h"
 
@@ -181,6 +196,23 @@ void SkARGB32_Opaque_Blitter::blitMask(const SkMask& mask,
     }
 }
 
+void SkARGB32_Opaque_Blitter::blitAntiH2(int x, int y, U8CPU a0, U8CPU a1) {
+    uint32_t* device = fDevice.writable_addr32(x, y);
+    SkDEBUGCODE((void)fDevice.writable_addr32(x + 1, y);)
+
+    device[0] = SkFastFourByteInterp(fPMColor, device[0], a0);
+    device[1] = SkFastFourByteInterp(fPMColor, device[1], a1);
+}
+
+void SkARGB32_Opaque_Blitter::blitAntiV2(int x, int y, U8CPU a0, U8CPU a1) {
+    uint32_t* device = fDevice.writable_addr32(x, y);
+    SkDEBUGCODE((void)fDevice.writable_addr32(x, y + 1);)
+
+    device[0] = SkFastFourByteInterp(fPMColor, device[0], a0);
+    device = (uint32_t*)((char*)device + fDevice.rowBytes());
+    device[0] = SkFastFourByteInterp(fPMColor, device[0], a1);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkARGB32_Blitter::blitV(int x, int y, int height, SkAlpha alpha) {
@@ -188,7 +220,7 @@ void SkARGB32_Blitter::blitV(int x, int y, int height, SkAlpha alpha) {
         return;
     }
 
-    uint32_t* device = fDevice.getAddr32(x, y);
+    uint32_t* device = fDevice.writable_addr32(x, y);
     uint32_t  color = fPMColor;
 
     if (alpha != 255) {
@@ -210,17 +242,13 @@ void SkARGB32_Blitter::blitRect(int x, int y, int width, int height) {
         return;
     }
 
-    uint32_t*   device = fDevice.getAddr32(x, y);
+    uint32_t*   device = fDevice.writable_addr32(x, y);
     uint32_t    color = fPMColor;
     size_t      rowBytes = fDevice.rowBytes();
 
-    if (255 == SkGetPackedA32(color)) {
-        fColorRect32Proc(device, width, height, rowBytes, color);
-    } else {
-        while (--height >= 0) {
-            fColor32Proc(device, device, width, color);
-            device = (uint32_t*)((char*)device + rowBytes);
-        }
+    while (--height >= 0) {
+        SkBlitRow::Color32(device, device, width, color);
+        device = (uint32_t*)((char*)device + rowBytes);
     }
 }
 
@@ -232,7 +260,7 @@ void SkARGB32_Blitter::blitRect(int x, int y, int width, int height) {
 
 void SkARGB32_Black_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[],
                                        const int16_t runs[]) {
-    uint32_t*   device = fDevice.getAddr32(x, y);
+    uint32_t*   device = fDevice.writable_addr32(x, y);
     SkPMColor   black = (SkPMColor)(SK_A32_MASK << SK_A32_SHIFT);
 
     for (;;) {
@@ -261,6 +289,23 @@ void SkARGB32_Black_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[],
     }
 }
 
+void SkARGB32_Black_Blitter::blitAntiH2(int x, int y, U8CPU a0, U8CPU a1) {
+    uint32_t* device = fDevice.writable_addr32(x, y);
+    SkDEBUGCODE((void)fDevice.writable_addr32(x + 1, y);)
+
+    device[0] = (a0 << SK_A32_SHIFT) + SkAlphaMulQ(device[0], 256 - a0);
+    device[1] = (a1 << SK_A32_SHIFT) + SkAlphaMulQ(device[1], 256 - a1);
+}
+
+void SkARGB32_Black_Blitter::blitAntiV2(int x, int y, U8CPU a0, U8CPU a1) {
+    uint32_t* device = fDevice.writable_addr32(x, y);
+    SkDEBUGCODE((void)fDevice.writable_addr32(x, y + 1);)
+
+    device[0] = (a0 << SK_A32_SHIFT) + SkAlphaMulQ(device[0], 256 - a0);
+    device = (uint32_t*)((char*)device + fDevice.rowBytes());
+    device[0] = (a1 << SK_A32_SHIFT) + SkAlphaMulQ(device[0], 256 - a1);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 // Special version of SkBlitRow::Factory32 that knows we're in kSrc_Mode,
@@ -274,7 +319,7 @@ static void blend_srcmode(SkPMColor* SK_RESTRICT device,
     }
 }
 
-SkARGB32_Shader_Blitter::SkARGB32_Shader_Blitter(const SkBitmap& device,
+SkARGB32_Shader_Blitter::SkARGB32_Shader_Blitter(const SkPixmap& device,
         const SkPaint& paint, SkShader::Context* shaderContext)
     : INHERITED(device, paint, shaderContext)
 {
@@ -293,7 +338,7 @@ SkARGB32_Shader_Blitter::SkARGB32_Shader_Blitter(const SkBitmap& device,
     fProc32Blend = SkBlitRow::Factory32(flags | SkBlitRow::kGlobalAlpha_Flag32);
 
     fShadeDirectlyIntoDevice = false;
-    if (fXfermode == NULL) {
+    if (fXfermode == nullptr) {
         if (shaderContext->getFlags() & SkShader::kOpaqueAlpha_Flag) {
             fShadeDirectlyIntoDevice = true;
         }
@@ -318,7 +363,7 @@ SkARGB32_Shader_Blitter::~SkARGB32_Shader_Blitter() {
 void SkARGB32_Shader_Blitter::blitH(int x, int y, int width) {
     SkASSERT(x >= 0 && y >= 0 && x + width <= fDevice.width());
 
-    uint32_t*   device = fDevice.getAddr32(x, y);
+    uint32_t* device = fDevice.writable_addr32(x, y);
 
     if (fShadeDirectlyIntoDevice) {
         fShaderContext->shadeSpan(x, y, device, width);
@@ -326,7 +371,7 @@ void SkARGB32_Shader_Blitter::blitH(int x, int y, int width) {
         SkPMColor*  span = fBuffer;
         fShaderContext->shadeSpan(x, y, span, width);
         if (fXfermode) {
-            fXfermode->xfer32(device, span, width, NULL);
+            fXfermode->xfer32(device, span, width, nullptr);
         } else {
             fProc32(device, span, width, 255);
         }
@@ -337,7 +382,7 @@ void SkARGB32_Shader_Blitter::blitRect(int x, int y, int width, int height) {
     SkASSERT(x >= 0 && y >= 0 &&
              x + width <= fDevice.width() && y + height <= fDevice.height());
 
-    uint32_t*          device = fDevice.getAddr32(x, y);
+    uint32_t*          device = fDevice.writable_addr32(x, y);
     size_t             deviceRB = fDevice.rowBytes();
     SkShader::Context* shaderContext = fShaderContext;
     SkPMColor*         span = fBuffer;
@@ -356,7 +401,7 @@ void SkARGB32_Shader_Blitter::blitRect(int x, int y, int width, int height) {
             SkXfermode* xfer = fXfermode;
             if (xfer) {
                 do {
-                    xfer->xfer32(device, span, width, NULL);
+                    xfer->xfer32(device, span, width, nullptr);
                     y += 1;
                     device = (uint32_t*)((char*)device + deviceRB);
                 } while (--height > 0);
@@ -393,7 +438,7 @@ void SkARGB32_Shader_Blitter::blitRect(int x, int y, int width, int height) {
         if (xfer) {
             do {
                 shaderContext->shadeSpan(x, y, span, width);
-                xfer->xfer32(device, span, width, NULL);
+                xfer->xfer32(device, span, width, nullptr);
                 y += 1;
                 device = (uint32_t*)((char*)device + deviceRB);
             } while (--height > 0);
@@ -412,7 +457,7 @@ void SkARGB32_Shader_Blitter::blitRect(int x, int y, int width, int height) {
 void SkARGB32_Shader_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[],
                                         const int16_t runs[]) {
     SkPMColor*         span = fBuffer;
-    uint32_t*          device = fDevice.getAddr32(x, y);
+    uint32_t*          device = fDevice.writable_addr32(x, y);
     SkShader::Context* shaderContext = fShaderContext;
 
     if (fXfermode && !fShadeDirectlyIntoDevice) {
@@ -426,7 +471,7 @@ void SkARGB32_Shader_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[],
             if (aa) {
                 shaderContext->shadeSpan(x, y, span, count);
                 if (aa == 255) {
-                    xfer->xfer32(device, span, count, NULL);
+                    xfer->xfer32(device, span, count, nullptr);
                 } else {
                     // count is almost always 1
                     for (int i = count - 1; i >= 0; --i) {
@@ -494,7 +539,7 @@ void SkARGB32_Shader_Blitter::blitMask(const SkMask& mask, const SkIRect& clip)
     SkASSERT(mask.fBounds.contains(clip));
 
     SkShader::Context*  shaderContext = fShaderContext;
-    SkBlitMask::RowProc proc = NULL;
+    SkBlitMask::RowProc proc = nullptr;
     if (!fXfermode) {
         unsigned flags = 0;
         if (shaderContext->getFlags() & SkShader::kOpaqueAlpha_Flag) {
@@ -502,7 +547,7 @@ void SkARGB32_Shader_Blitter::blitMask(const SkMask& mask, const SkIRect& clip)
         }
         proc = SkBlitMask::RowFactory(kN32_SkColorType, mask.fFormat,
                                       (SkBlitMask::RowFlags)flags);
-        if (NULL == proc) {
+        if (nullptr == proc) {
             this->INHERITED::blitMask(mask, clip);
             return;
         }
@@ -513,7 +558,7 @@ void SkARGB32_Shader_Blitter::blitMask(const SkMask& mask, const SkIRect& clip)
     int y = clip.fTop;
     int height = clip.height();
 
-    char* dstRow = (char*)fDevice.getAddr32(x, y);
+    char* dstRow = (char*)fDevice.writable_addr32(x, y);
     const size_t dstRB = fDevice.rowBytes();
     const uint8_t* maskRow = (const uint8_t*)mask.getAddr(x, y);
     const size_t maskRB = mask.fRowBytes;
@@ -544,7 +589,7 @@ void SkARGB32_Shader_Blitter::blitMask(const SkMask& mask, const SkIRect& clip)
 void SkARGB32_Shader_Blitter::blitV(int x, int y, int height, SkAlpha alpha) {
     SkASSERT(x >= 0 && y >= 0 && y + height <= fDevice.height());
 
-    uint32_t*          device = fDevice.getAddr32(x, y);
+    uint32_t*          device = fDevice.writable_addr32(x, y);
     size_t             deviceRB = fDevice.rowBytes();
     SkShader::Context* shaderContext = fShaderContext;
 
diff --git a/gfx/skia/skia/src/core/SkBlitter_RGB16.cpp b/gfx/skia/skia/src/core/SkBlitter_RGB16.cpp
index a91c0df0dee8..06dfeea1c183 100644
--- a/gfx/skia/skia/src/core/SkBlitter_RGB16.cpp
+++ b/gfx/skia/skia/src/core/SkBlitter_RGB16.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-
 #include "SkBlitRow.h"
 #include "SkCoreBlitters.h"
 #include "SkColorPriv.h"
@@ -16,7 +14,7 @@
 #include "SkUtilsArm.h"
 #include "SkXfermode.h"
 
-#if SK_MIPS_HAS_DSP
+#if defined(__mips_dsp)
 extern void blitmask_d565_opaque_mips(int width, int height, uint16_t* device,
                                       unsigned deviceRB, const uint8_t* alpha,
                                       uint32_t expanded32, unsigned maskRB);
@@ -24,6 +22,11 @@ extern void blitmask_d565_opaque_mips(int width, int height, uint16_t* device,
 
 #if SK_ARM_NEON_IS_ALWAYS && defined(SK_CPU_LENDIAN)
     #include <arm_neon.h>
+extern void SkRGB16BlitterBlitV_neon(uint16_t* device,
+                                     int height,
+                                     size_t deviceRB,
+                                     unsigned scale,
+                                     uint32_t src32);
 #else
     // if we don't have neon, then our black blitter is worth the extra code
     #define USE_BLACK_BLITTER
@@ -58,15 +61,14 @@ void sk_dither_memset16(uint16_t dst[], uint16_t value, uint16_t other,
 
 class SkRGB16_Blitter : public SkRasterBlitter {
 public:
-    SkRGB16_Blitter(const SkBitmap& device, const SkPaint& paint);
-    virtual void blitH(int x, int y, int width);
+    SkRGB16_Blitter(const SkPixmap& device, const SkPaint& paint);
+    void blitH(int x, int y, int width) override;
     virtual void blitAntiH(int x, int y, const SkAlpha* antialias,
-                           const int16_t* runs);
-    virtual void blitV(int x, int y, int height, SkAlpha alpha);
-    virtual void blitRect(int x, int y, int width, int height);
-    virtual void blitMask(const SkMask&,
-                          const SkIRect&);
-    virtual const SkBitmap* justAnOpaqueColor(uint32_t*);
+                           const int16_t* runs) override;
+    void blitV(int x, int y, int height, SkAlpha alpha) override;
+    void blitRect(int x, int y, int width, int height) override;
+    void blitMask(const SkMask&, const SkIRect&) override;
+    const SkPixmap* justAnOpaqueColor(uint32_t*) override;
 
 protected:
     SkPMColor   fSrcColor32;
@@ -77,6 +79,8 @@ protected:
     uint16_t    fRawDither16;   // unscaled
     SkBool8     fDoDither;
 
+    SkBlitRow::ColorProc16 fColorProc16;
+
     // illegal
     SkRGB16_Blitter& operator=(const SkRGB16_Blitter&);
 
@@ -85,14 +89,12 @@ protected:
 
 class SkRGB16_Opaque_Blitter : public SkRGB16_Blitter {
 public:
-    SkRGB16_Opaque_Blitter(const SkBitmap& device, const SkPaint& paint);
-    virtual void blitH(int x, int y, int width);
-    virtual void blitAntiH(int x, int y, const SkAlpha* antialias,
-                           const int16_t* runs);
-    virtual void blitV(int x, int y, int height, SkAlpha alpha);
-    virtual void blitRect(int x, int y, int width, int height);
-    virtual void blitMask(const SkMask&,
-                          const SkIRect&);
+    SkRGB16_Opaque_Blitter(const SkPixmap& device, const SkPaint& paint);
+    void blitH(int x, int y, int width) override;
+    void blitAntiH(int x, int y, const SkAlpha* antialias, const int16_t* runs) override;
+    void blitV(int x, int y, int height, SkAlpha alpha) override;
+    void blitRect(int x, int y, int width, int height) override;
+    void blitMask(const SkMask&, const SkIRect&) override;
 
 private:
     typedef SkRGB16_Blitter INHERITED;
@@ -101,10 +103,9 @@ private:
 #ifdef USE_BLACK_BLITTER
 class SkRGB16_Black_Blitter : public SkRGB16_Opaque_Blitter {
 public:
-    SkRGB16_Black_Blitter(const SkBitmap& device, const SkPaint& paint);
-    virtual void blitMask(const SkMask&, const SkIRect&);
-    virtual void blitAntiH(int x, int y, const SkAlpha* antialias,
-                           const int16_t* runs);
+    SkRGB16_Black_Blitter(const SkPixmap& device, const SkPaint& paint);
+    void blitMask(const SkMask&, const SkIRect&) override;
+    void blitAntiH(int x, int y, const SkAlpha* antialias, const int16_t* runs) override;
 
 private:
     typedef SkRGB16_Opaque_Blitter INHERITED;
@@ -113,18 +114,18 @@ private:
 
 class SkRGB16_Shader_Blitter : public SkShaderBlitter {
 public:
-    SkRGB16_Shader_Blitter(const SkBitmap& device, const SkPaint& paint,
+    SkRGB16_Shader_Blitter(const SkPixmap& device, const SkPaint& paint,
                            SkShader::Context* shaderContext);
     virtual ~SkRGB16_Shader_Blitter();
-    virtual void blitH(int x, int y, int width);
+    void blitH(int x, int y, int width) override;
     virtual void blitAntiH(int x, int y, const SkAlpha* antialias,
-                           const int16_t* runs);
-    virtual void blitRect(int x, int y, int width, int height);
+                           const int16_t* runs) override;
+    void blitRect(int x, int y, int width, int height) override;
 
 protected:
-    SkPMColor*      fBuffer;
-    SkBlitRow::Proc fOpaqueProc;
-    SkBlitRow::Proc fAlphaProc;
+    SkPMColor*          fBuffer;
+    SkBlitRow::Proc16   fOpaqueProc;
+    SkBlitRow::Proc16   fAlphaProc;
 
 private:
     // illegal
@@ -136,12 +137,12 @@ private:
 // used only if the shader can perform shadSpan16
 class SkRGB16_Shader16_Blitter : public SkRGB16_Shader_Blitter {
 public:
-    SkRGB16_Shader16_Blitter(const SkBitmap& device, const SkPaint& paint,
+    SkRGB16_Shader16_Blitter(const SkPixmap& device, const SkPaint& paint,
                              SkShader::Context* shaderContext);
-    virtual void blitH(int x, int y, int width);
+    void blitH(int x, int y, int width) override;
     virtual void blitAntiH(int x, int y, const SkAlpha* antialias,
-                           const int16_t* runs);
-    virtual void blitRect(int x, int y, int width, int height);
+                           const int16_t* runs) override;
+    void blitRect(int x, int y, int width, int height) override;
 
 private:
     typedef SkRGB16_Shader_Blitter INHERITED;
@@ -149,12 +150,12 @@ private:
 
 class SkRGB16_Shader_Xfermode_Blitter : public SkShaderBlitter {
 public:
-    SkRGB16_Shader_Xfermode_Blitter(const SkBitmap& device, const SkPaint& paint,
+    SkRGB16_Shader_Xfermode_Blitter(const SkPixmap& device, const SkPaint& paint,
                                     SkShader::Context* shaderContext);
     virtual ~SkRGB16_Shader_Xfermode_Blitter();
-    virtual void blitH(int x, int y, int width);
+    void blitH(int x, int y, int width) override;
     virtual void blitAntiH(int x, int y, const SkAlpha* antialias,
-                           const int16_t* runs);
+                           const int16_t* runs) override;
 
 private:
     SkXfermode* fXfermode;
@@ -169,11 +170,11 @@ private:
 
 ///////////////////////////////////////////////////////////////////////////////
 #ifdef USE_BLACK_BLITTER
-SkRGB16_Black_Blitter::SkRGB16_Black_Blitter(const SkBitmap& device, const SkPaint& paint)
+SkRGB16_Black_Blitter::SkRGB16_Black_Blitter(const SkPixmap& device, const SkPaint& paint)
     : INHERITED(device, paint) {
-    SkASSERT(paint.getShader() == NULL);
-    SkASSERT(paint.getColorFilter() == NULL);
-    SkASSERT(paint.getXfermode() == NULL);
+    SkASSERT(paint.getShader() == nullptr);
+    SkASSERT(paint.getColorFilter() == nullptr);
+    SkASSERT(paint.getXfermode() == nullptr);
     SkASSERT(paint.getColor() == SK_ColorBLACK);
 }
 
@@ -206,7 +207,7 @@ static inline black_8_pixels(U8CPU mask, uint16_t dst[])
 #define SK_BLITBWMASK_NAME                  SkRGB16_Black_BlitBW
 #define SK_BLITBWMASK_ARGS
 #define SK_BLITBWMASK_BLIT8(mask, dst)      black_8_pixels(mask, dst)
-#define SK_BLITBWMASK_GETADDR               getAddr16
+#define SK_BLITBWMASK_GETADDR               writable_addr16
 #define SK_BLITBWMASK_DEVTYPE               uint16_t
 #include "SkBlitBWMaskTemplate.h"
 
@@ -215,7 +216,7 @@ void SkRGB16_Black_Blitter::blitMask(const SkMask& mask,
     if (mask.fFormat == SkMask::kBW_Format) {
         SkRGB16_Black_BlitBW(fDevice, mask, clip);
     } else {
-        uint16_t* SK_RESTRICT device = fDevice.getAddr16(clip.fLeft, clip.fTop);
+        uint16_t* SK_RESTRICT device = fDevice.writable_addr16(clip.fLeft, clip.fTop);
         const uint8_t* SK_RESTRICT alpha = mask.getAddr8(clip.fLeft, clip.fTop);
         unsigned width = clip.width();
         unsigned height = clip.height();
@@ -243,7 +244,7 @@ void SkRGB16_Black_Blitter::blitMask(const SkMask& mask,
 void SkRGB16_Black_Blitter::blitAntiH(int x, int y,
                                       const SkAlpha* SK_RESTRICT antialias,
                                       const int16_t* SK_RESTRICT runs) {
-    uint16_t* SK_RESTRICT device = fDevice.getAddr16(x, y);
+    uint16_t* SK_RESTRICT device = fDevice.writable_addr16(x, y);
 
     for (;;) {
         int count = runs[0];
@@ -275,14 +276,13 @@ void SkRGB16_Black_Blitter::blitAntiH(int x, int y,
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
-SkRGB16_Opaque_Blitter::SkRGB16_Opaque_Blitter(const SkBitmap& device,
-                                               const SkPaint& paint)
-: INHERITED(device, paint) {}
+SkRGB16_Opaque_Blitter::SkRGB16_Opaque_Blitter(const SkPixmap& device, const SkPaint& paint)
+    : INHERITED(device, paint) {}
 
 void SkRGB16_Opaque_Blitter::blitH(int x, int y, int width) {
     SkASSERT(width > 0);
     SkASSERT(x + width <= fDevice.width());
-    uint16_t* SK_RESTRICT device = fDevice.getAddr16(x, y);
+    uint16_t* SK_RESTRICT device = fDevice.writable_addr16(x, y);
     uint16_t srcColor = fColor16;
 
     SkASSERT(fRawColor16 == srcColor);
@@ -305,7 +305,7 @@ static inline int Bool2Int(int value) {
 void SkRGB16_Opaque_Blitter::blitAntiH(int x, int y,
                                        const SkAlpha* SK_RESTRICT antialias,
                                        const int16_t* SK_RESTRICT runs) {
-    uint16_t* SK_RESTRICT device = fDevice.getAddr16(x, y);
+    uint16_t* SK_RESTRICT device = fDevice.writable_addr16(x, y);
     uint16_t    srcColor = fRawColor16;
     uint32_t    srcExpanded = fExpandedRaw16;
     int         ditherInt = Bool2Int(fDoDither);
@@ -370,11 +370,11 @@ void SkRGB16_Opaque_Blitter::blitAntiH(int x, int y,
 #define SK_BLITBWMASK_NAME                  SkRGB16_BlitBW
 #define SK_BLITBWMASK_ARGS                  , uint16_t color
 #define SK_BLITBWMASK_BLIT8(mask, dst)      solid_8_pixels(mask, dst, color)
-#define SK_BLITBWMASK_GETADDR               getAddr16
+#define SK_BLITBWMASK_GETADDR               writable_addr16
 #define SK_BLITBWMASK_DEVTYPE               uint16_t
 #include "SkBlitBWMaskTemplate.h"
 
-#if !defined(SK_MIPS_HAS_DSP)
+#if !defined(__mips_dsp)
 static U16CPU blend_compact(uint32_t src32, uint32_t dst32, unsigned scale5) {
     return SkCompact_rgb_16(dst32 + ((src32 - dst32) * scale5 >> 5));
 }
@@ -387,7 +387,7 @@ void SkRGB16_Opaque_Blitter::blitMask(const SkMask& mask,
         return;
     }
 
-    uint16_t* SK_RESTRICT device = fDevice.getAddr16(clip.fLeft, clip.fTop);
+    uint16_t* SK_RESTRICT device = fDevice.writable_addr16(clip.fLeft, clip.fTop);
     const uint8_t* SK_RESTRICT alpha = mask.getAddr8(clip.fLeft, clip.fTop);
     int width = clip.width();
     int height = clip.height();
@@ -465,7 +465,7 @@ void SkRGB16_Opaque_Blitter::blitMask(const SkMask& mask,
         alpha += maskRB;
     } while (--height != 0);
 #undef    UNROLL
-#elif SK_MIPS_HAS_DSP
+#elif defined(__mips_dsp)
     blitmask_d565_opaque_mips(width, height, device, deviceRB, alpha, expanded32, maskRB);
 #else   // non-neon code
     do {
@@ -482,23 +482,27 @@ void SkRGB16_Opaque_Blitter::blitMask(const SkMask& mask,
 }
 
 void SkRGB16_Opaque_Blitter::blitV(int x, int y, int height, SkAlpha alpha) {
-    uint16_t* SK_RESTRICT device = fDevice.getAddr16(x, y);
+    uint16_t* SK_RESTRICT device = fDevice.writable_addr16(x, y);
     size_t    deviceRB = fDevice.rowBytes();
 
     // TODO: respect fDoDither
     unsigned scale5 = SkAlpha255To256(alpha) >> 3;
     uint32_t src32 =  fExpandedRaw16 * scale5;
     scale5 = 32 - scale5;
+#if SK_ARM_NEON_IS_ALWAYS && defined(SK_CPU_LENDIAN)
+    SkRGB16BlitterBlitV_neon(device, height, deviceRB, scale5, src32);
+#else
     do {
         uint32_t dst32 = SkExpand_rgb_16(*device) * scale5;
         *device = SkCompact_rgb_16((src32 + dst32) >> 5);
         device = (uint16_t*)((char*)device + deviceRB);
     } while (--height != 0);
+#endif
 }
 
 void SkRGB16_Opaque_Blitter::blitRect(int x, int y, int width, int height) {
     SkASSERT(x + width <= fDevice.width() && y + height <= fDevice.height());
-    uint16_t* SK_RESTRICT device = fDevice.getAddr16(x, y);
+    uint16_t* SK_RESTRICT device = fDevice.writable_addr16(x, y);
     size_t      deviceRB = fDevice.rowBytes();
     uint16_t    color16 = fColor16;
 
@@ -522,7 +526,7 @@ void SkRGB16_Opaque_Blitter::blitRect(int x, int y, int width, int height) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkRGB16_Blitter::SkRGB16_Blitter(const SkBitmap& device, const SkPaint& paint)
+SkRGB16_Blitter::SkRGB16_Blitter(const SkPixmap& device, const SkPaint& paint)
     : INHERITED(device) {
     SkColor color = paint.getColor();
 
@@ -544,47 +548,41 @@ SkRGB16_Blitter::SkRGB16_Blitter(const SkBitmap& device, const SkPaint& paint)
     fColor16 = SkPackRGB16( SkAlphaMul(r, fScale) >> (8 - SK_R16_BITS),
                             SkAlphaMul(g, fScale) >> (8 - SK_G16_BITS),
                             SkAlphaMul(b, fScale) >> (8 - SK_B16_BITS));
+
+    // compute SkBlitRow::Procs
+    unsigned flags = 0;
+
+    if (SkGetPackedA32(fSrcColor32) < 0xFF) {
+        flags |= SkBlitRow::kSrcPixelAlpha_Flag;
+    }
+
+    if (fDoDither) {
+        flags |= SkBlitRow::kDither_Flag;
+    }
+
+    fColorProc16 = SkBlitRow::ColorFactory16(flags);
 }
 
-const SkBitmap* SkRGB16_Blitter::justAnOpaqueColor(uint32_t* value) {
+const SkPixmap* SkRGB16_Blitter::justAnOpaqueColor(uint32_t* value) {
     if (!fDoDither && 256 == fScale) {
         *value = fRawColor16;
         return &fDevice;
     }
-    return NULL;
-}
-
-static uint32_t pmcolor_to_expand16(SkPMColor c) {
-    unsigned r = SkGetPackedR32(c);
-    unsigned g = SkGetPackedG32(c);
-    unsigned b = SkGetPackedB32(c);
-    return (g << 24) | (r << 13) | (b << 2);
-}
-
-static inline void blend32_16_row(SkPMColor src, uint16_t dst[], int count) {
-    SkASSERT(count > 0);
-    uint32_t src_expand = pmcolor_to_expand16(src);
-    unsigned scale = SkAlpha255To256(0xFF - SkGetPackedA32(src)) >> 3;
-    do {
-        uint32_t dst_expand = SkExpand_rgb_16(*dst) * scale;
-        *dst = SkCompact_rgb_16((src_expand + dst_expand) >> 5);
-        dst += 1;
-    } while (--count != 0);
+    return nullptr;
 }
 
 void SkRGB16_Blitter::blitH(int x, int y, int width) {
     SkASSERT(width > 0);
     SkASSERT(x + width <= fDevice.width());
-    uint16_t* SK_RESTRICT device = fDevice.getAddr16(x, y);
+    uint16_t* SK_RESTRICT device = fDevice.writable_addr16(x, y);
 
-    // TODO: respect fDoDither
-    blend32_16_row(fSrcColor32, device, width);
+    fColorProc16(device, fSrcColor32, width, x, y);
 }
 
 void SkRGB16_Blitter::blitAntiH(int x, int y,
                                 const SkAlpha* SK_RESTRICT antialias,
                                 const int16_t* SK_RESTRICT runs) {
-    uint16_t* SK_RESTRICT device = fDevice.getAddr16(x, y);
+    uint16_t* SK_RESTRICT device = fDevice.writable_addr16(x, y);
     uint32_t    srcExpanded = fExpandedRaw16;
     unsigned    scale = fScale;
 
@@ -628,7 +626,7 @@ static inline void blend_8_pixels(U8CPU bw, uint16_t dst[], unsigned dst_scale,
 #define SK_BLITBWMASK_NAME                  SkRGB16_BlendBW
 #define SK_BLITBWMASK_ARGS                  , unsigned dst_scale, U16CPU src_color
 #define SK_BLITBWMASK_BLIT8(mask, dst)      blend_8_pixels(mask, dst, dst_scale, src_color)
-#define SK_BLITBWMASK_GETADDR               getAddr16
+#define SK_BLITBWMASK_GETADDR               writable_addr16
 #define SK_BLITBWMASK_DEVTYPE               uint16_t
 #include "SkBlitBWMaskTemplate.h"
 
@@ -639,7 +637,7 @@ void SkRGB16_Blitter::blitMask(const SkMask& mask,
         return;
     }
 
-    uint16_t* SK_RESTRICT device = fDevice.getAddr16(clip.fLeft, clip.fTop);
+    uint16_t* SK_RESTRICT device = fDevice.writable_addr16(clip.fLeft, clip.fTop);
     const uint8_t* SK_RESTRICT alpha = mask.getAddr8(clip.fLeft, clip.fTop);
     int width = clip.width();
     int height = clip.height();
@@ -663,45 +661,49 @@ void SkRGB16_Blitter::blitMask(const SkMask& mask,
 }
 
 void SkRGB16_Blitter::blitV(int x, int y, int height, SkAlpha alpha) {
-    uint16_t* SK_RESTRICT device = fDevice.getAddr16(x, y);
+    uint16_t* SK_RESTRICT device = fDevice.writable_addr16(x, y);
     size_t    deviceRB = fDevice.rowBytes();
 
     // TODO: respect fDoDither
     unsigned scale5 = SkAlpha255To256(alpha) * fScale >> (8 + 3);
     uint32_t src32 =  fExpandedRaw16 * scale5;
     scale5 = 32 - scale5;
+#if SK_ARM_NEON_IS_ALWAYS && defined(SK_CPU_LENDIAN)
+    SkRGB16BlitterBlitV_neon(device, height, deviceRB, scale5, src32);
+#else
     do {
         uint32_t dst32 = SkExpand_rgb_16(*device) * scale5;
         *device = SkCompact_rgb_16((src32 + dst32) >> 5);
         device = (uint16_t*)((char*)device + deviceRB);
     } while (--height != 0);
+#endif
 }
 
 void SkRGB16_Blitter::blitRect(int x, int y, int width, int height) {
     SkASSERT(x + width <= fDevice.width() && y + height <= fDevice.height());
-    uint16_t* SK_RESTRICT device = fDevice.getAddr16(x, y);
+    uint16_t* SK_RESTRICT device = fDevice.writable_addr16(x, y);
     size_t    deviceRB = fDevice.rowBytes();
-    SkPMColor src32 = fSrcColor32;
 
     while (--height >= 0) {
-        blend32_16_row(src32, device, width);
+        fColorProc16(device, fSrcColor32, width, x, y);
         device = (uint16_t*)((char*)device + deviceRB);
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkRGB16_Shader16_Blitter::SkRGB16_Shader16_Blitter(const SkBitmap& device,
+SkRGB16_Shader16_Blitter::SkRGB16_Shader16_Blitter(const SkPixmap& device,
                                                    const SkPaint& paint,
                                                    SkShader::Context* shaderContext)
-    : SkRGB16_Shader_Blitter(device, paint, shaderContext) {
+    : SkRGB16_Shader_Blitter(device, paint, shaderContext)
+{
     SkASSERT(SkShader::CanCallShadeSpan16(fShaderFlags));
 }
 
 void SkRGB16_Shader16_Blitter::blitH(int x, int y, int width) {
     SkASSERT(x + width <= fDevice.width());
 
-    uint16_t* SK_RESTRICT device = fDevice.getAddr16(x, y);
+    uint16_t* SK_RESTRICT device = fDevice.writable_addr16(x, y);
     SkShader::Context*    shaderContext = fShaderContext;
 
     int alpha = shaderContext->getSpan16Alpha();
@@ -716,7 +718,7 @@ void SkRGB16_Shader16_Blitter::blitH(int x, int y, int width) {
 
 void SkRGB16_Shader16_Blitter::blitRect(int x, int y, int width, int height) {
     SkShader::Context* shaderContext = fShaderContext;
-    uint16_t*          dst = fDevice.getAddr16(x, y);
+    uint16_t*          dst = fDevice.writable_addr16(x, y);
     size_t             dstRB = fDevice.rowBytes();
     int                alpha = shaderContext->getSpan16Alpha();
 
@@ -764,7 +766,7 @@ void SkRGB16_Shader16_Blitter::blitAntiH(int x, int y,
                                          const int16_t* SK_RESTRICT runs) {
     SkShader::Context*     shaderContext = fShaderContext;
     SkPMColor* SK_RESTRICT span = fBuffer;
-    uint16_t* SK_RESTRICT  device = fDevice.getAddr16(x, y);
+    uint16_t* SK_RESTRICT  device = fDevice.writable_addr16(x, y);
 
     int alpha = shaderContext->getSpan16Alpha();
     uint16_t* span16 = (uint16_t*)span;
@@ -815,11 +817,12 @@ void SkRGB16_Shader16_Blitter::blitAntiH(int x, int y,
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkRGB16_Shader_Blitter::SkRGB16_Shader_Blitter(const SkBitmap& device,
+SkRGB16_Shader_Blitter::SkRGB16_Shader_Blitter(const SkPixmap& device,
                                                const SkPaint& paint,
                                                SkShader::Context* shaderContext)
-: INHERITED(device, paint, shaderContext) {
-    SkASSERT(paint.getXfermode() == NULL);
+    : INHERITED(device, paint, shaderContext)
+{
+    SkASSERT(paint.getXfermode() == nullptr);
 
     fBuffer = (SkPMColor*)sk_malloc_throw(device.width() * sizeof(SkPMColor));
 
@@ -836,10 +839,9 @@ SkRGB16_Shader_Blitter::SkRGB16_Shader_Blitter(const SkBitmap& device,
         flags |= SkBlitRow::kDither_Flag;
     }
     // used when we know our global alpha is 0xFF
-    fOpaqueProc = SkBlitRow::Factory(flags, kRGB_565_SkColorType);
+    fOpaqueProc = SkBlitRow::Factory16(flags);
     // used when we know our global alpha is < 0xFF
-    fAlphaProc  = SkBlitRow::Factory(flags | SkBlitRow::kGlobalAlpha_Flag,
-                                     kRGB_565_SkColorType);
+    fAlphaProc  = SkBlitRow::Factory16(flags | SkBlitRow::kGlobalAlpha_Flag);
 }
 
 SkRGB16_Shader_Blitter::~SkRGB16_Shader_Blitter() {
@@ -851,14 +853,14 @@ void SkRGB16_Shader_Blitter::blitH(int x, int y, int width) {
 
     fShaderContext->shadeSpan(x, y, fBuffer, width);
     // shaders take care of global alpha, so we pass 0xFF (should be ignored)
-    fOpaqueProc(fDevice.getAddr16(x, y), fBuffer, width, 0xFF, x, y);
+    fOpaqueProc(fDevice.writable_addr16(x, y), fBuffer, width, 0xFF, x, y);
 }
 
 void SkRGB16_Shader_Blitter::blitRect(int x, int y, int width, int height) {
     SkShader::Context* shaderContext = fShaderContext;
-    SkBlitRow::Proc    proc = fOpaqueProc;
+    SkBlitRow::Proc16  proc = fOpaqueProc;
     SkPMColor*         buffer = fBuffer;
-    uint16_t*          dst = fDevice.getAddr16(x, y);
+    uint16_t*          dst = fDevice.writable_addr16(x, y);
     size_t             dstRB = fDevice.rowBytes();
 
     if (fShaderFlags & SkShader::kConstInY32_Flag) {
@@ -897,7 +899,7 @@ void SkRGB16_Shader_Blitter::blitAntiH(int x, int y,
                                        const int16_t* SK_RESTRICT runs) {
     SkShader::Context*     shaderContext = fShaderContext;
     SkPMColor* SK_RESTRICT span = fBuffer;
-    uint16_t* SK_RESTRICT  device = fDevice.getAddr16(x, y);
+    uint16_t* SK_RESTRICT  device = fDevice.writable_addr16(x, y);
 
     for (;;) {
         int count = *runs;
@@ -920,7 +922,7 @@ void SkRGB16_Shader_Blitter::blitAntiH(int x, int y,
 
         SkPMColor* localSpan = span;
         for (;;) {
-            SkBlitRow::Proc proc = (aa == 0xFF) ? fOpaqueProc : fAlphaProc;
+            SkBlitRow::Proc16 proc = (aa == 0xFF) ? fOpaqueProc : fAlphaProc;
             proc(device, localSpan, count, aa, x, y);
 
             x += count;
@@ -943,9 +945,10 @@ void SkRGB16_Shader_Blitter::blitAntiH(int x, int y,
 ///////////////////////////////////////////////////////////////////////
 
 SkRGB16_Shader_Xfermode_Blitter::SkRGB16_Shader_Xfermode_Blitter(
-                                const SkBitmap& device, const SkPaint& paint,
+                                const SkPixmap& device, const SkPaint& paint,
                                 SkShader::Context* shaderContext)
-: INHERITED(device, paint, shaderContext) {
+    : INHERITED(device, paint, shaderContext)
+{
     fXfermode = paint.getXfermode();
     SkASSERT(fXfermode);
     fXfermode->ref();
@@ -963,11 +966,11 @@ SkRGB16_Shader_Xfermode_Blitter::~SkRGB16_Shader_Xfermode_Blitter() {
 void SkRGB16_Shader_Xfermode_Blitter::blitH(int x, int y, int width) {
     SkASSERT(x + width <= fDevice.width());
 
-    uint16_t*   device = fDevice.getAddr16(x, y);
+    uint16_t*   device = fDevice.writable_addr16(x, y);
     SkPMColor*  span = fBuffer;
 
     fShaderContext->shadeSpan(x, y, span, width);
-    fXfermode->xfer16(device, span, width, NULL);
+    fXfermode->xfer16(device, span, width, nullptr);
 }
 
 void SkRGB16_Shader_Xfermode_Blitter::blitAntiH(int x, int y,
@@ -977,7 +980,7 @@ void SkRGB16_Shader_Xfermode_Blitter::blitAntiH(int x, int y,
     SkXfermode*            mode = fXfermode;
     SkPMColor* SK_RESTRICT span = fBuffer;
     uint8_t* SK_RESTRICT   aaExpand = fAAExpand;
-    uint16_t* SK_RESTRICT  device = fDevice.getAddr16(x, y);
+    uint16_t* SK_RESTRICT  device = fDevice.writable_addr16(x, y);
 
     for (;;) {
         int count = *runs;
@@ -1003,7 +1006,7 @@ void SkRGB16_Shader_Xfermode_Blitter::blitAntiH(int x, int y,
         SkPMColor* localSpan = span;
         for (;;) {
             if (aa == 0xFF) {
-                mode->xfer16(device, localSpan, count, NULL);
+                mode->xfer16(device, localSpan, count, nullptr);
             } else {
                 SkASSERT(aa);
                 memset(aaExpand, aa, count);
@@ -1027,20 +1030,20 @@ void SkRGB16_Shader_Xfermode_Blitter::blitAntiH(int x, int y,
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkBlitter* SkBlitter_ChooseD565(const SkBitmap& device, const SkPaint& paint,
+SkBlitter* SkBlitter_ChooseD565(const SkPixmap& device, const SkPaint& paint,
         SkShader::Context* shaderContext,
         SkTBlitterAllocator* allocator) {
-    SkASSERT(allocator != NULL);
+    SkASSERT(allocator != nullptr);
 
     SkBlitter* blitter;
     SkShader* shader = paint.getShader();
     SkXfermode* mode = paint.getXfermode();
 
     // we require a shader if there is an xfermode, handled by our caller
-    SkASSERT(NULL == mode || NULL != shader);
+    SkASSERT(nullptr == mode || shader);
 
     if (shader) {
-        SkASSERT(shaderContext != NULL);
+        SkASSERT(shaderContext != nullptr);
         if (mode) {
             blitter = allocator->createT<SkRGB16_Shader_Xfermode_Blitter>(device, paint,
                                                                           shaderContext);
diff --git a/gfx/skia/skia/src/core/SkBlitter_Sprite.cpp b/gfx/skia/skia/src/core/SkBlitter_Sprite.cpp
index 91a3cd1fee1c..605fa43bf696 100644
--- a/gfx/skia/skia/src/core/SkBlitter_Sprite.cpp
+++ b/gfx/skia/skia/src/core/SkBlitter_Sprite.cpp
@@ -8,18 +8,10 @@
 #include "SkSmallAllocator.h"
 #include "SkSpriteBlitter.h"
 
-SkSpriteBlitter::SkSpriteBlitter(const SkBitmap& source)
-        : fSource(&source) {
-    fSource->lockPixels();
-}
+SkSpriteBlitter::SkSpriteBlitter(const SkPixmap& source) : fSource(source) {}
 
-SkSpriteBlitter::~SkSpriteBlitter() {
-    fSource->unlockPixels();
-}
-
-void SkSpriteBlitter::setup(const SkBitmap& device, int left, int top,
-                            const SkPaint& paint) {
-    fDevice = &device;
+void SkSpriteBlitter::setup(const SkPixmap& dst, int left, int top, const SkPaint& paint) {
+    fDst = dst;
     fLeft = left;
     fTop = top;
     fPaint = &paint;
@@ -48,8 +40,8 @@ void SkSpriteBlitter::blitMask(const SkMask&, const SkIRect& clip) {
 
 // returning null means the caller will call SkBlitter::Choose() and
 // have wrapped the source bitmap inside a shader
-SkBlitter* SkBlitter::ChooseSprite(const SkBitmap& device, const SkPaint& paint,
-        const SkBitmap& source, int left, int top, SkTBlitterAllocator* allocator) {
+SkBlitter* SkBlitter::ChooseSprite(const SkPixmap& dst, const SkPaint& paint,
+        const SkPixmap& source, int left, int top, SkTBlitterAllocator* allocator) {
     /*  We currently ignore antialiasing and filtertype, meaning we will take our
         special blitters regardless of these settings. Ignoring filtertype seems fine
         since by definition there is no scale in the matrix. Ignoring antialiasing is
@@ -59,11 +51,11 @@ SkBlitter* SkBlitter::ChooseSprite(const SkBitmap& device, const SkPaint& paint,
         paint and return null if it is set, forcing the client to take the slow shader case
         (which does respect soft edges).
     */
-    SkASSERT(allocator != NULL);
+    SkASSERT(allocator != nullptr);
 
     SkSpriteBlitter* blitter;
 
-    switch (device.colorType()) {
+    switch (dst.colorType()) {
         case kRGB_565_SkColorType:
             blitter = SkSpriteBlitter::ChooseD16(source, paint, allocator);
             break;
@@ -71,12 +63,12 @@ SkBlitter* SkBlitter::ChooseSprite(const SkBitmap& device, const SkPaint& paint,
             blitter = SkSpriteBlitter::ChooseD32(source, paint, allocator);
             break;
         default:
-            blitter = NULL;
+            blitter = nullptr;
             break;
     }
 
     if (blitter) {
-        blitter->setup(device, left, top, paint);
+        blitter->setup(dst, left, top, paint);
     }
     return blitter;
 }
diff --git a/gfx/skia/skia/src/core/SkBuffer.cpp b/gfx/skia/skia/src/core/SkBuffer.cpp
index 590b05b85982..86c3bed3f14a 100644
--- a/gfx/skia/skia/src/core/SkBuffer.cpp
+++ b/gfx/skia/skia/src/core/SkBuffer.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,9 +5,10 @@
  * found in the LICENSE file.
  */
 
-
 #include "SkBuffer.h"
 
+#include <string.h>
+
 ////////////////////////////////////////////////////////////////////////////////////////
 
 void SkRBuffer::readNoSizeCheck(void* buffer, size_t size)
@@ -22,7 +22,7 @@ void SkRBuffer::readNoSizeCheck(void* buffer, size_t size)
 const void* SkRBuffer::skip(size_t size)
 {
     const void* result = fPos;
-    readNoSizeCheck(NULL, size);
+    readNoSizeCheck(nullptr, size);
     return result;
 }
 
@@ -45,8 +45,8 @@ bool SkRBufferWithSizeCheck::read(void* buffer, size_t size) {
 void* SkWBuffer::skip(size_t size)
 {
     void* result = fPos;
-    writeNoSizeCheck(NULL, size);
-    return fData == NULL ? NULL : result;
+    writeNoSizeCheck(nullptr, size);
+    return fData == nullptr ? nullptr : result;
 }
 
 void SkWBuffer::writeNoSizeCheck(const void* buffer, size_t size)
diff --git a/gfx/skia/skia/src/core/SkBuffer.h b/gfx/skia/skia/src/core/SkBuffer.h
index 9791cf55a14a..92ed7059dbf9 100644
--- a/gfx/skia/skia/src/core/SkBuffer.h
+++ b/gfx/skia/skia/src/core/SkBuffer.h
@@ -11,6 +11,7 @@
 #define SkBuffer_DEFINED
 
 #include "SkScalar.h"
+#include "SkTypes.h"
 
 /** \class SkRBuffer
 
@@ -105,7 +106,7 @@ public:
         null and the number of bytes to read does not overflow this object's data,
         copy those bytes into buffer.
     */
-    virtual bool read(void* buffer, size_t size) SK_OVERRIDE;
+    bool read(void* buffer, size_t size) override;
 
     /** Returns whether or not a read operation attempted to read past the end of the data.
     */
diff --git a/gfx/skia/skia/src/core/SkCachedData.cpp b/gfx/skia/skia/src/core/SkCachedData.cpp
new file mode 100644
index 000000000000..cfa4c6165f69
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkCachedData.cpp
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkCachedData.h"
+#include "SkDiscardableMemory.h"
+
+//#define TRACK_CACHEDDATA_LIFETIME
+
+#ifdef TRACK_CACHEDDATA_LIFETIME
+static int32_t gCachedDataCounter;
+
+static void inc() {
+    int32_t oldCount = sk_atomic_inc(&gCachedDataCounter);
+    SkDebugf("SkCachedData inc %d\n", oldCount + 1);
+}
+
+static void dec() {
+    int32_t oldCount = sk_atomic_dec(&gCachedDataCounter);
+    SkDebugf("SkCachedData dec %d\n", oldCount - 1);
+}
+#else
+static void inc() {}
+static void dec() {}
+#endif
+
+SkCachedData::SkCachedData(void* data, size_t size)
+    : fData(data)
+    , fSize(size)
+    , fRefCnt(1)
+    , fStorageType(kMalloc_StorageType)
+    , fInCache(false)
+    , fIsLocked(true)
+{
+    fStorage.fMalloc = data;
+    inc();
+}
+
+SkCachedData::SkCachedData(size_t size, SkDiscardableMemory* dm)
+    : fData(dm->data())
+    , fSize(size)
+    , fRefCnt(1)
+    , fStorageType(kDiscardableMemory_StorageType)
+    , fInCache(false)
+    , fIsLocked(true)
+{
+    fStorage.fDM = dm;
+    inc();
+}
+
+SkCachedData::~SkCachedData() {
+    switch (fStorageType) {
+        case kMalloc_StorageType:
+            sk_free(fStorage.fMalloc);
+            break;
+        case kDiscardableMemory_StorageType:
+            delete fStorage.fDM;
+            break;
+    }
+    dec();
+}
+
+class SkCachedData::AutoMutexWritable {
+public:
+    AutoMutexWritable(const SkCachedData* cd) : fCD(const_cast<SkCachedData*>(cd)) {
+        fCD->fMutex.acquire();
+        fCD->validate();
+    }
+    ~AutoMutexWritable() {
+        fCD->validate();
+        fCD->fMutex.release();
+    }
+
+    SkCachedData* get() { return fCD; }
+    SkCachedData* operator->() { return fCD; }
+
+private:
+    SkCachedData* fCD;
+};
+
+void SkCachedData::internalRef(bool fromCache) const {
+    AutoMutexWritable(this)->inMutexRef(fromCache);
+}
+
+void SkCachedData::internalUnref(bool fromCache) const {
+    if (AutoMutexWritable(this)->inMutexUnref(fromCache)) {
+        // can't delete inside doInternalUnref, since it is locking a mutex (which we own)
+        delete this;
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+void SkCachedData::inMutexRef(bool fromCache) {
+    if ((1 == fRefCnt) && fInCache) {
+        this->inMutexLock();
+    }
+    
+    fRefCnt += 1;
+    if (fromCache) {
+        SkASSERT(!fInCache);
+        fInCache = true;
+    }
+}
+
+bool SkCachedData::inMutexUnref(bool fromCache) {
+    switch (--fRefCnt) {
+        case 0:
+            // we're going to be deleted, so we need to be unlocked (for DiscardableMemory)
+            if (fIsLocked) {
+                this->inMutexUnlock();
+            }
+            break;
+        case 1:
+            if (fInCache && !fromCache) {
+                // If we're down to 1 owner, and that owner is the cache, this it is safe
+                // to unlock (and mutate fData) even if the cache is in a different thread,
+                // as the cache is NOT allowed to inspect or use fData.
+                this->inMutexUnlock();
+            }
+            break;
+        default:
+            break;
+    }
+    
+    if (fromCache) {
+        SkASSERT(fInCache);
+        fInCache = false;
+    }
+    
+    // return true when we need to be deleted
+    return 0 == fRefCnt;
+}
+
+void SkCachedData::inMutexLock() {
+    fMutex.assertHeld();
+    
+    SkASSERT(!fIsLocked);
+    fIsLocked = true;
+    
+    switch (fStorageType) {
+        case kMalloc_StorageType:
+            this->setData(fStorage.fMalloc);
+            break;
+        case kDiscardableMemory_StorageType:
+            if (fStorage.fDM->lock()) {
+                void* ptr = fStorage.fDM->data();
+                SkASSERT(ptr);
+                this->setData(ptr);
+            } else {
+                this->setData(nullptr);   // signal failure to lock, contents are gone
+            }
+            break;
+    }
+}
+
+void SkCachedData::inMutexUnlock() {
+    fMutex.assertHeld();
+    
+    SkASSERT(fIsLocked);
+    fIsLocked = false;
+    
+    switch (fStorageType) {
+        case kMalloc_StorageType:
+            // nothing to do/check
+            break;
+        case kDiscardableMemory_StorageType:
+            if (fData) {    // did the previous lock succeed?
+                fStorage.fDM->unlock();
+            }
+            break;
+    }
+    this->setData(nullptr);   // signal that we're in an unlocked state
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef SK_DEBUG
+void SkCachedData::validate() const {
+    if (fIsLocked) {
+        SkASSERT((fInCache && fRefCnt > 1) || !fInCache);
+        switch (fStorageType) {
+            case kMalloc_StorageType:
+                SkASSERT(fData == fStorage.fMalloc);
+                break;
+            case kDiscardableMemory_StorageType:
+                // fData can be null or the actual value, depending if DM's lock succeeded
+                break;
+        }
+    } else {
+        SkASSERT((fInCache && 1 == fRefCnt) || (0 == fRefCnt));
+        SkASSERT(nullptr == fData);
+    }
+}
+#endif
diff --git a/gfx/skia/skia/src/core/SkCachedData.h b/gfx/skia/skia/src/core/SkCachedData.h
new file mode 100644
index 000000000000..739be7218229
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkCachedData.h
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkCachedData_DEFINED
+#define SkCachedData_DEFINED
+
+#include "SkMutex.h"
+#include "SkTypes.h"
+
+class SkDiscardableMemory;
+
+class SkCachedData : ::SkNoncopyable {
+public:
+    SkCachedData(void* mallocData, size_t size);
+    SkCachedData(size_t size, SkDiscardableMemory*);
+    virtual ~SkCachedData();
+
+    size_t size() const { return fSize; }
+    const void* data() const { return fData; }
+
+    void* writable_data() { return fData; }
+
+    void ref() const { this->internalRef(false); }
+    void unref() const { this->internalUnref(false); }
+
+    int testing_only_getRefCnt() const { return fRefCnt; }
+    bool testing_only_isLocked() const { return fIsLocked; }
+    bool testing_only_isInCache() const { return fInCache; }
+
+    SkDiscardableMemory* diagnostic_only_getDiscardable() const {
+        return kDiscardableMemory_StorageType == fStorageType ? fStorage.fDM : nullptr;
+    }
+
+protected:
+    // called when fData changes. could be nullptr.
+    virtual void onDataChange(void* oldData, void* newData) {}
+
+private:
+    SkMutex fMutex;     // could use a pool of these...
+
+    enum StorageType {
+        kDiscardableMemory_StorageType,
+        kMalloc_StorageType
+    };
+
+    union {
+        SkDiscardableMemory*    fDM;
+        void*                   fMalloc;
+    } fStorage;
+    void*       fData;
+    size_t      fSize;
+    int         fRefCnt;    // low-bit means we're owned by the cache
+    StorageType fStorageType;
+    bool        fInCache;
+    bool        fIsLocked;
+
+    void internalRef(bool fromCache) const;
+    void internalUnref(bool fromCache) const;
+
+    void inMutexRef(bool fromCache);
+    bool inMutexUnref(bool fromCache);  // returns true if we should delete "this"
+    void inMutexLock();
+    void inMutexUnlock();
+
+    // called whenever our fData might change (lock or unlock)
+    void setData(void* newData) {
+        if (newData != fData) {
+            // notify our subclasses of the change
+            this->onDataChange(fData, newData);
+            fData = newData;
+        }
+    }
+
+    class AutoMutexWritable;
+
+public:
+#ifdef SK_DEBUG
+    void validate() const;
+#else
+    void validate() const {}
+#endif
+
+   /*
+     *  Attaching a data to to a SkResourceCache (only one at a time) enables the data to be
+     *  unlocked when the cache is the only owner, thus freeing it to be purged (assuming the
+     *  data is backed by a SkDiscardableMemory).
+     *
+     *  When attached, it also automatically attempts to "lock" the data when the first client
+     *  ref's the data (typically from a find(key, visitor) call).
+     *
+     *  Thus the data will always be "locked" when a non-cache has a ref on it (whether or not
+     *  the lock succeeded to recover the memory -- check data() to see if it is nullptr).
+     */
+
+    /*
+     *  Call when adding this instance to a SkResourceCache::Rec subclass
+     *  (typically in the Rec's constructor).
+     */
+    void attachToCacheAndRef() const { this->internalRef(true); }
+
+    /*
+     *  Call when removing this instance from a SkResourceCache::Rec subclass
+     *  (typically in the Rec's destructor).
+     */
+    void detachFromCacheAndUnref() const { this->internalUnref(true); }
+};
+
+#endif
diff --git a/gfx/skia/skia/src/core/SkCanvas.cpp b/gfx/skia/skia/src/core/SkCanvas.cpp
index 504c9908abbb..1e49fe272df0 100644
--- a/gfx/skia/skia/src/core/SkCanvas.cpp
+++ b/gfx/skia/skia/src/core/SkCanvas.cpp
@@ -5,29 +5,111 @@
  * found in the LICENSE file.
  */
 
-
-#include "SkCanvas.h"
 #include "SkBitmapDevice.h"
-#include "SkDeviceImageFilterProxy.h"
+#include "SkCanvas.h"
+#include "SkCanvasPriv.h"
+#include "SkClipStack.h"
+#include "SkColorFilter.h"
+#include "SkDevice.h"
 #include "SkDraw.h"
+#include "SkDrawable.h"
 #include "SkDrawFilter.h"
 #include "SkDrawLooper.h"
+#include "SkErrorInternals.h"
+#include "SkImage.h"
 #include "SkMetaData.h"
-#include "SkPathOps.h"
+#include "SkNinePatchIter.h"
+#include "SkPaintPriv.h"
+#include "SkPatchUtils.h"
 #include "SkPicture.h"
 #include "SkRasterClip.h"
+#include "SkReadPixelsRec.h"
 #include "SkRRect.h"
 #include "SkSmallAllocator.h"
 #include "SkSurface_Base.h"
-#include "SkTemplates.h"
+#include "SkTextBlob.h"
 #include "SkTextFormatParams.h"
 #include "SkTLazy.h"
-#include "SkUtils.h"
+#include "SkTraceEvent.h"
+
+#include <new>
 
 #if SK_SUPPORT_GPU
 #include "GrRenderTarget.h"
 #endif
 
+#define SK_SUPPORT_SRC_BOUNDS_BLOAT_FOR_IMAGEFILTERS
+
+/*
+ *  Return true if the drawing this rect would hit every pixels in the canvas.
+ *
+ *  Returns false if
+ *  - rect does not contain the canvas' bounds
+ *  - paint is not fill
+ *  - paint would blur or otherwise change the coverage of the rect
+ */
+bool SkCanvas::wouldOverwriteEntireSurface(const SkRect* rect, const SkPaint* paint,
+                                           ShaderOverrideOpacity overrideOpacity) const {
+    static_assert((int)SkPaintPriv::kNone_ShaderOverrideOpacity ==
+                  (int)kNone_ShaderOverrideOpacity,
+                  "need_matching_enums0");
+    static_assert((int)SkPaintPriv::kOpaque_ShaderOverrideOpacity ==
+                  (int)kOpaque_ShaderOverrideOpacity,
+                  "need_matching_enums1");
+    static_assert((int)SkPaintPriv::kNotOpaque_ShaderOverrideOpacity ==
+                  (int)kNotOpaque_ShaderOverrideOpacity,
+                  "need_matching_enums2");
+
+    const SkISize size = this->getBaseLayerSize();
+    const SkRect bounds = SkRect::MakeIWH(size.width(), size.height());
+    if (!this->getClipStack()->quickContains(bounds)) {
+        return false;
+    }
+
+    if (rect) {
+        if (!this->getTotalMatrix().rectStaysRect()) {
+            return false; // conservative
+        }
+
+        SkRect devRect;
+        this->getTotalMatrix().mapRect(&devRect, *rect);
+        if (!devRect.contains(bounds)) {
+            return false;
+        }
+    }
+
+    if (paint) {
+        SkPaint::Style paintStyle = paint->getStyle();
+        if (!(paintStyle == SkPaint::kFill_Style ||
+              paintStyle == SkPaint::kStrokeAndFill_Style)) {
+            return false;
+        }
+        if (paint->getMaskFilter() || paint->getLooper()
+            || paint->getPathEffect() || paint->getImageFilter()) {
+            return false; // conservative
+        }
+    }
+    return SkPaintPriv::Overwrites(paint, (SkPaintPriv::ShaderOverrideOpacity)overrideOpacity);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+static bool gIgnoreSaveLayerBounds;
+void SkCanvas::Internal_Private_SetIgnoreSaveLayerBounds(bool ignore) {
+    gIgnoreSaveLayerBounds = ignore;
+}
+bool SkCanvas::Internal_Private_GetIgnoreSaveLayerBounds() {
+    return gIgnoreSaveLayerBounds;
+}
+
+static bool gTreatSpriteAsBitmap;
+void SkCanvas::Internal_Private_SetTreatSpriteAsBitmap(bool spriteAsBitmap) {
+    gTreatSpriteAsBitmap = spriteAsBitmap;
+}
+bool SkCanvas::Internal_Private_GetTreatSpriteAsBitmap() {
+    return gTreatSpriteAsBitmap;
+}
+
 // experimental for faster tiled drawing...
 //#define SK_ENABLE_CLIP_QUICKREJECT
 
@@ -56,12 +138,44 @@
 
 typedef SkTLazy<SkPaint> SkLazyPaint;
 
-void SkCanvas::predrawNotify() {
+void SkCanvas::predrawNotify(bool willOverwritesEntireSurface) {
     if (fSurfaceBase) {
-        fSurfaceBase->aboutToDraw(SkSurface::kRetain_ContentChangeMode);
+        fSurfaceBase->aboutToDraw(willOverwritesEntireSurface
+                                  ? SkSurface::kDiscard_ContentChangeMode
+                                  : SkSurface::kRetain_ContentChangeMode);
     }
 }
 
+void SkCanvas::predrawNotify(const SkRect* rect, const SkPaint* paint,
+                             ShaderOverrideOpacity overrideOpacity) {
+    if (fSurfaceBase) {
+        SkSurface::ContentChangeMode mode = SkSurface::kRetain_ContentChangeMode;
+        // Since willOverwriteAllPixels() may not be complete free to call, we only do so if
+        // there is an outstanding snapshot, since w/o that, there will be no copy-on-write
+        // and therefore we don't care which mode we're in.
+        //
+        if (fSurfaceBase->outstandingImageSnapshot()) {
+            if (this->wouldOverwriteEntireSurface(rect, paint, overrideOpacity)) {
+                mode = SkSurface::kDiscard_ContentChangeMode;
+            }
+        }
+        fSurfaceBase->aboutToDraw(mode);
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+static uint32_t filter_paint_flags(const SkSurfaceProps& props, uint32_t flags) {
+    const uint32_t propFlags = props.flags();
+    if (propFlags & SkSurfaceProps::kDisallowDither_Flag) {
+        flags &= ~SkPaint::kDither_Flag;
+    }
+    if (propFlags & SkSurfaceProps::kDisallowAntiAlias_Flag) {
+        flags &= ~SkPaint::kAntiAlias_Flag;
+    }
+    return flags;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 /*  This is the record we keep for each SkBaseDevice that the user installs.
@@ -75,25 +189,38 @@ struct DeviceCM {
     DeviceCM*           fNext;
     SkBaseDevice*       fDevice;
     SkRasterClip        fClip;
-    const SkMatrix*     fMatrix;
     SkPaint*            fPaint; // may be null (in the future)
+    const SkMatrix*     fMatrix;
+    SkMatrix            fMatrixStorage;
+    const bool          fDeviceIsBitmapDevice;
 
-    DeviceCM(SkBaseDevice* device, int x, int y, const SkPaint* paint, SkCanvas* canvas)
-            : fNext(NULL) {
-        if (NULL != device) {
+    DeviceCM(SkBaseDevice* device, const SkPaint* paint, SkCanvas* canvas,
+             bool conservativeRasterClip, bool deviceIsBitmapDevice)
+        : fNext(nullptr)
+        , fClip(conservativeRasterClip)
+        , fDeviceIsBitmapDevice(deviceIsBitmapDevice)
+    {
+        if (nullptr != device) {
             device->ref();
             device->onAttachToCanvas(canvas);
         }
         fDevice = device;
-        fPaint = paint ? SkNEW_ARGS(SkPaint, (*paint)) : NULL;
+        fPaint = paint ? new SkPaint(*paint) : nullptr;
     }
 
     ~DeviceCM() {
-        if (NULL != fDevice) {
+        if (fDevice) {
             fDevice->onDetachFromCanvas();
             fDevice->unref();
         }
-        SkDELETE(fPaint);
+        delete fPaint;
+    }
+
+    void reset(const SkIRect& bounds) {
+        SkASSERT(!fPaint);
+        SkASSERT(!fNext);
+        SkASSERT(fDevice);
+        fClip.setRect(bounds);
     }
 
     void updateMC(const SkMatrix& totalMatrix, const SkRasterClip& totalClip,
@@ -134,9 +261,6 @@ struct DeviceCM {
         }
 #endif
     }
-
-private:
-    SkMatrix    fMatrixStorage;
 };
 
 /*  This is the record we keep for each save/restore level in the stack.
@@ -148,43 +272,52 @@ private:
 */
 class SkCanvas::MCRec {
 public:
-    SkMatrix        fMatrix;
-    SkRasterClip    fRasterClip;
     SkDrawFilter*   fFilter;    // the current filter (or null)
-
-    DeviceCM*   fLayer;
+    DeviceCM*       fLayer;
     /*  If there are any layers in the stack, this points to the top-most
         one that is at or below this level in the stack (so we know what
         bitmap/device to draw into from this level. This value is NOT
         reference counted, since the real owner is either our fLayer field,
         or a previous one in a lower level.)
     */
-    DeviceCM*   fTopLayer;
+    DeviceCM*       fTopLayer;
+    SkRasterClip    fRasterClip;
+    SkMatrix        fMatrix;
+    int             fDeferredSaveCount;
 
-    MCRec(const MCRec* prev) {
-        if (NULL != prev) {
-            fMatrix = prev->fMatrix;
-            fRasterClip = prev->fRasterClip;
+    MCRec(bool conservativeRasterClip) : fRasterClip(conservativeRasterClip) {
+        fFilter     = nullptr;
+        fLayer      = nullptr;
+        fTopLayer   = nullptr;
+        fMatrix.reset();
+        fDeferredSaveCount = 0;
 
-            fFilter = prev->fFilter;
-            SkSafeRef(fFilter);
-
-            fTopLayer = prev->fTopLayer;
-        } else {   // no prev
-            fMatrix.reset();
-            fFilter     = NULL;
-            fTopLayer   = NULL;
-        }
-        fLayer = NULL;
+        // don't bother initializing fNext
+        inc_rec();
+    }
+    MCRec(const MCRec& prev) : fRasterClip(prev.fRasterClip), fMatrix(prev.fMatrix) {
+        fFilter = SkSafeRef(prev.fFilter);
+        fLayer = nullptr;
+        fTopLayer = prev.fTopLayer;
+        fDeferredSaveCount = 0;
 
         // don't bother initializing fNext
         inc_rec();
     }
     ~MCRec() {
         SkSafeUnref(fFilter);
-        SkDELETE(fLayer);
+        delete fLayer;
         dec_rec();
     }
+
+    void reset(const SkIRect& bounds) {
+        SkASSERT(fLayer);
+        SkASSERT(fDeferredSaveCount == 0);
+
+        fMatrix.reset();
+        fRasterClip.setRect(bounds);
+        fLayer->reset(bounds);
+    }
 };
 
 class SkDrawIter : public SkDraw {
@@ -194,7 +327,7 @@ public:
         fCanvas = canvas;
         canvas->updateDeviceCMCache();
 
-        fClipStack = &canvas->fClipStack;
+        fClipStack = canvas->fClipStack;
         fCurrLayer = canvas->fMCRec->fTopLayer;
         fSkipEmptyClips = skipEmptyClips;
     }
@@ -214,12 +347,14 @@ public:
             fClip   = &((SkRasterClip*)&rec->fClip)->forceGetBW();
             fRC     = &rec->fClip;
             fDevice = rec->fDevice;
-            fBitmap = &fDevice->accessBitmap(true);
+            if (!fDevice->accessPixels(&fDst)) {
+                fDst.reset(fDevice->imageInfo(), nullptr, 0);
+            }
             fPaint  = rec->fPaint;
             SkDEBUGCODE(this->validate();)
 
             fCurrLayer = rec->fNext;
-            // fCurrLayer may be NULL now
+            // fCurrLayer may be nullptr now
 
             return true;
         }
@@ -244,26 +379,110 @@ private:
 
 /////////////////////////////////////////////////////////////////////////////
 
+static SkPaint* set_if_needed(SkLazyPaint* lazy, const SkPaint& orig) {
+    return lazy->isValid() ? lazy->get() : lazy->set(orig);
+}
+
+/**
+ *  If the paint has an imagefilter, but it can be simplified to just a colorfilter, return that
+ *  colorfilter, else return nullptr.
+ */
+static SkColorFilter* image_to_color_filter(const SkPaint& paint) {
+    SkImageFilter* imgf = paint.getImageFilter();
+    if (!imgf) {
+        return nullptr;
+    }
+
+    SkColorFilter* imgCF;
+    if (!imgf->asAColorFilter(&imgCF)) {
+        return nullptr;
+    }
+
+    SkColorFilter* paintCF = paint.getColorFilter();
+    if (nullptr == paintCF) {
+        // there is no existing paint colorfilter, so we can just return the imagefilter's
+        return imgCF;
+    }
+
+    // The paint has both a colorfilter(paintCF) and an imagefilter-which-is-a-colorfilter(imgCF)
+    // and we need to combine them into a single colorfilter.
+    SkAutoTUnref<SkColorFilter> autoImgCF(imgCF);
+    return SkColorFilter::CreateComposeFilter(imgCF, paintCF);
+}
+
+/**
+ * There are many bounds in skia. A circle's bounds is just its center extended by its radius.
+ * However, if we stroke a circle, then the "bounds" of that is larger, since it will now draw
+ * outside of its raw-bounds by 1/2 the stroke width.  SkPaint has lots of optional
+ * effects/attributes that can modify the effective bounds of a given primitive -- maskfilters,
+ * patheffects, stroking, etc.  This function takes a raw bounds and a paint, and returns the
+ * conservative "effective" bounds based on the settings in the paint... with one exception. This
+ * function does *not* look at the imagefilter, which can also modify the effective bounds. It is
+ * deliberately ignored.
+ */
+static const SkRect& apply_paint_to_bounds_sans_imagefilter(const SkPaint& paint,
+                                                            const SkRect& rawBounds,
+                                                            SkRect* storage) {
+    SkPaint tmpUnfiltered(paint);
+    tmpUnfiltered.setImageFilter(nullptr);
+    if (tmpUnfiltered.canComputeFastBounds()) {
+        return tmpUnfiltered.computeFastBounds(rawBounds, storage);
+    } else {
+        return rawBounds;
+    }
+}
+
 class AutoDrawLooper {
 public:
-    AutoDrawLooper(SkCanvas* canvas, const SkPaint& paint,
+    // "rawBounds" is the original bounds of the primitive about to be drawn, unmodified by the
+    // paint. It's used to determine the size of the offscreen layer for filters.
+    // If null, the clip will be used instead.
+    AutoDrawLooper(SkCanvas* canvas, const SkSurfaceProps& props, const SkPaint& paint,
                    bool skipLayerForImageFilter = false,
-                   const SkRect* bounds = NULL) : fOrigPaint(paint) {
+                   const SkRect* rawBounds = nullptr) : fOrigPaint(paint) {
         fCanvas = canvas;
         fFilter = canvas->getDrawFilter();
-        fPaint = NULL;
+        fPaint = &fOrigPaint;
         fSaveCount = canvas->getSaveCount();
-        fDoClearImageFilter = false;
+        fTempLayerForImageFilter = false;
         fDone = false;
 
-        if (!skipLayerForImageFilter && fOrigPaint.getImageFilter()) {
+        SkColorFilter* simplifiedCF = image_to_color_filter(fOrigPaint);
+        if (simplifiedCF) {
+            SkPaint* paint = set_if_needed(&fLazyPaintInit, fOrigPaint);
+            paint->setColorFilter(simplifiedCF)->unref();
+            paint->setImageFilter(nullptr);
+            fPaint = paint;
+        }
+
+        if (!skipLayerForImageFilter && fPaint->getImageFilter()) {
+            /**
+             *  We implement ImageFilters for a given draw by creating a layer, then applying the
+             *  imagefilter to the pixels of that layer (its backing surface/image), and then
+             *  we call restore() to xfer that layer to the main canvas.
+             *
+             *  1. SaveLayer (with a paint containing the current imagefilter and xfermode)
+             *  2. Generate the src pixels:
+             *      Remove the imagefilter and the xfermode from the paint that we (AutoDrawLooper)
+             *      return (fPaint). We then draw the primitive (using srcover) into a cleared
+             *      buffer/surface.
+             *  3. Restore the layer created in #1
+             *      The imagefilter is passed the buffer/surface from the layer (now filled with the
+             *      src pixels of the primitive). It returns a new "filtered" buffer, which we
+             *      draw onto the previous layer using the xfermode from the original paint.
+             */
             SkPaint tmp;
-            tmp.setImageFilter(fOrigPaint.getImageFilter());
-            (void)canvas->internalSaveLayer(bounds, &tmp, SkCanvas::kARGB_ClipLayer_SaveFlag,
-                                            true, SkCanvas::kFullLayer_SaveLayerStrategy);
-            // we'll clear the imageFilter for the actual draws in next(), so
-            // it will only be applied during the restore().
-            fDoClearImageFilter = true;
+            tmp.setImageFilter(fPaint->getImageFilter());
+            tmp.setXfermode(fPaint->getXfermode());
+            SkRect storage;
+            if (rawBounds) {
+                // Make rawBounds include all paint outsets except for those due to image filters.
+                rawBounds = &apply_paint_to_bounds_sans_imagefilter(*fPaint, *rawBounds, &storage);
+            }
+            (void)canvas->internalSaveLayer(rawBounds, &tmp, SkCanvas::kARGB_ClipLayer_SaveFlag,
+                                            SkCanvas::kFullLayer_SaveLayerStrategy);
+            fTempLayerForImageFilter = true;
+            // we remove the imagefilter/xfermode inside doNext()
         }
 
         if (SkDrawLooper* looper = paint.getLooper()) {
@@ -272,14 +491,23 @@ public:
             fLooperContext = looper->createContext(canvas, buffer);
             fIsSimple = false;
         } else {
-            fLooperContext = NULL;
+            fLooperContext = nullptr;
             // can we be marked as simple?
-            fIsSimple = !fFilter && !fDoClearImageFilter;
+            fIsSimple = !fFilter && !fTempLayerForImageFilter;
+        }
+
+        uint32_t oldFlags = paint.getFlags();
+        fNewPaintFlags = filter_paint_flags(props, oldFlags);
+        if (fIsSimple && (fNewPaintFlags != oldFlags)) {
+            SkPaint* paint = set_if_needed(&fLazyPaintInit, fOrigPaint);
+            paint->setFlags(fNewPaintFlags);
+            fPaint = paint;
+            // if we're not simple, doNext() will take care of calling setFlags()
         }
     }
 
     ~AutoDrawLooper() {
-        if (fDoClearImageFilter) {
+        if (fTempLayerForImageFilter) {
             fCanvas->internalRestore();
         }
         SkASSERT(fCanvas->getSaveCount() == fSaveCount);
@@ -295,7 +523,6 @@ public:
             return false;
         } else if (fIsSimple) {
             fDone = true;
-            fPaint = &fOrigPaint;
             return !fPaint->nothingToDraw();
         } else {
             return this->doNext(drawType);
@@ -303,13 +530,15 @@ public:
     }
 
 private:
-    SkLazyPaint     fLazyPaint;
+    SkLazyPaint     fLazyPaintInit; // base paint storage in case we need to modify it
+    SkLazyPaint     fLazyPaintPerLooper;  // per-draw-looper storage, so the looper can modify it
     SkCanvas*       fCanvas;
     const SkPaint&  fOrigPaint;
     SkDrawFilter*   fFilter;
     const SkPaint*  fPaint;
     int             fSaveCount;
-    bool            fDoClearImageFilter;
+    uint32_t        fNewPaintFlags;
+    bool            fTempLayerForImageFilter;
     bool            fDone;
     bool            fIsSimple;
     SkDrawLooper::Context* fLooperContext;
@@ -319,14 +548,17 @@ private:
 };
 
 bool AutoDrawLooper::doNext(SkDrawFilter::Type drawType) {
-    fPaint = NULL;
+    fPaint = nullptr;
     SkASSERT(!fIsSimple);
-    SkASSERT(fLooperContext || fFilter || fDoClearImageFilter);
+    SkASSERT(fLooperContext || fFilter || fTempLayerForImageFilter);
 
-    SkPaint* paint = fLazyPaint.set(fOrigPaint);
+    SkPaint* paint = fLazyPaintPerLooper.set(fLazyPaintInit.isValid() ?
+                                             *fLazyPaintInit.get() : fOrigPaint);
+    paint->setFlags(fNewPaintFlags);
 
-    if (fDoClearImageFilter) {
-        paint->setImageFilter(NULL);
+    if (fTempLayerForImageFilter) {
+        paint->setImageFilter(nullptr);
+        paint->setXfermode(nullptr);
     }
 
     if (fLooperContext && !fLooperContext->next(fCanvas, paint)) {
@@ -338,7 +570,7 @@ bool AutoDrawLooper::doNext(SkDrawFilter::Type drawType) {
             fDone = true;
             return false;
         }
-        if (NULL == fLooperContext) {
+        if (nullptr == fLooperContext) {
             // no looper means we only draw once
             fDone = true;
         }
@@ -352,25 +584,29 @@ bool AutoDrawLooper::doNext(SkDrawFilter::Type drawType) {
 
     // call this after any possible paint modifiers
     if (fPaint->nothingToDraw()) {
-        fPaint = NULL;
+        fPaint = nullptr;
         return false;
     }
     return true;
 }
 
-#include "SkColorPriv.h"
-
 ////////// macros to place around the internal draw calls //////////////////
 
 #define LOOPER_BEGIN_DRAWDEVICE(paint, type)                        \
     this->predrawNotify();                                          \
-    AutoDrawLooper  looper(this, paint, true);                      \
+    AutoDrawLooper  looper(this, fProps, paint, true);              \
     while (looper.next(type)) {                                     \
         SkDrawIter          iter(this);
 
 #define LOOPER_BEGIN(paint, type, bounds)                           \
     this->predrawNotify();                                          \
-    AutoDrawLooper  looper(this, paint, false, bounds);             \
+    AutoDrawLooper  looper(this, fProps, paint, false, bounds);     \
+    while (looper.next(type)) {                                     \
+        SkDrawIter          iter(this);
+
+#define LOOPER_BEGIN_CHECK_COMPLETE_OVERWRITE(paint, type, bounds, auxOpaque)  \
+    this->predrawNotify(bounds, &paint, auxOpaque);                 \
+    AutoDrawLooper  looper(this, fProps, paint, false, bounds);     \
     while (looper.next(type)) {                                     \
         SkDrawIter          iter(this);
 
@@ -378,69 +614,156 @@ bool AutoDrawLooper::doNext(SkDrawFilter::Type drawType) {
 
 ////////////////////////////////////////////////////////////////////////////
 
-SkBaseDevice* SkCanvas::init(SkBaseDevice* device) {
+void SkCanvas::resetForNextPicture(const SkIRect& bounds) {
+    this->restoreToCount(1);
+    fCachedLocalClipBounds.setEmpty();
+    fCachedLocalClipBoundsDirty = true;
+    fClipStack->reset();
+    fMCRec->reset(bounds);
+
+    // We're peering through a lot of structs here.  Only at this scope do we
+    // know that the device is an SkBitmapDevice (really an SkNoPixelsBitmapDevice).
+    static_cast<SkBitmapDevice*>(fMCRec->fLayer->fDevice)->setNewSize(bounds.size());
+}
+
+SkBaseDevice* SkCanvas::init(SkBaseDevice* device, InitFlags flags) {
+    if (device && device->forceConservativeRasterClip()) {
+        flags = InitFlags(flags | kConservativeRasterClip_InitFlag);
+    }
+    // Since init() is only called once by our constructors, it is safe to perform this
+    // const-cast.
+    *const_cast<bool*>(&fConservativeRasterClip) = SkToBool(flags & kConservativeRasterClip_InitFlag);
+
     fCachedLocalClipBounds.setEmpty();
     fCachedLocalClipBoundsDirty = true;
     fAllowSoftClip = true;
     fAllowSimplifyClip = false;
-    fDeviceCMDirty = false;
-    fSaveLayerCount = 0;
-    fCullCount = 0;
-    fMetaData = NULL;
+    fDeviceCMDirty = true;
+    fSaveCount = 1;
+    fMetaData = nullptr;
+
+    fClipStack.reset(new SkClipStack);
 
     fMCRec = (MCRec*)fMCStack.push_back();
-    new (fMCRec) MCRec(NULL);
+    new (fMCRec) MCRec(fConservativeRasterClip);
+
+    SkASSERT(sizeof(DeviceCM) <= sizeof(fDeviceCMStorage));
+    fMCRec->fLayer = (DeviceCM*)fDeviceCMStorage;
+    new (fDeviceCMStorage) DeviceCM(nullptr, nullptr, nullptr, fConservativeRasterClip, false);
 
-    fMCRec->fLayer = SkNEW_ARGS(DeviceCM, (NULL, 0, 0, NULL, NULL));
     fMCRec->fTopLayer = fMCRec->fLayer;
 
-    fSurfaceBase = NULL;
+    fSurfaceBase = nullptr;
 
-    return this->setRootDevice(device);
+    if (device) {
+        // The root device and the canvas should always have the same pixel geometry
+        SkASSERT(fProps.pixelGeometry() == device->surfaceProps().pixelGeometry());
+        device->onAttachToCanvas(this);
+        fMCRec->fLayer->fDevice = SkRef(device);
+        fMCRec->fRasterClip.setRect(device->getGlobalBounds());
+    }
+    return device;
 }
 
 SkCanvas::SkCanvas()
     : fMCStack(sizeof(MCRec), fMCRecStorage, sizeof(fMCRecStorage))
+    , fProps(SkSurfaceProps::kLegacyFontHost_InitType)
+    , fConservativeRasterClip(false)
 {
     inc_canvas();
 
-    this->init(NULL);
+    this->init(nullptr, kDefault_InitFlags);
 }
 
-SkCanvas::SkCanvas(int width, int height)
+static SkBitmap make_nopixels(int width, int height) {
+    SkBitmap bitmap;
+    bitmap.setInfo(SkImageInfo::MakeUnknown(width, height));
+    return bitmap;
+}
+
+class SkNoPixelsBitmapDevice : public SkBitmapDevice {
+public:
+    SkNoPixelsBitmapDevice(const SkIRect& bounds, const SkSurfaceProps& surfaceProps)
+        : INHERITED(make_nopixels(bounds.width(), bounds.height()), surfaceProps)
+    {
+        this->setOrigin(bounds.x(), bounds.y());
+    }
+
+private:
+
+    typedef SkBitmapDevice INHERITED;
+};
+
+SkCanvas::SkCanvas(int width, int height, const SkSurfaceProps* props)
     : fMCStack(sizeof(MCRec), fMCRecStorage, sizeof(fMCRecStorage))
+    , fProps(SkSurfacePropsCopyOrDefault(props))
+    , fConservativeRasterClip(false)
 {
     inc_canvas();
 
-    SkBitmap bitmap;
-    bitmap.setInfo(SkImageInfo::MakeUnknown(width, height));
-    this->init(SkNEW_ARGS(SkBitmapDevice, (bitmap)))->unref();
+    this->init(new SkNoPixelsBitmapDevice(SkIRect::MakeWH(width, height), fProps),
+               kDefault_InitFlags)->unref();
+}
+
+SkCanvas::SkCanvas(const SkIRect& bounds, InitFlags flags)
+    : fMCStack(sizeof(MCRec), fMCRecStorage, sizeof(fMCRecStorage))
+    , fProps(SkSurfaceProps::kLegacyFontHost_InitType)
+    , fConservativeRasterClip(false)
+{
+    inc_canvas();
+
+    this->init(new SkNoPixelsBitmapDevice(bounds, fProps), flags)->unref();
 }
 
 SkCanvas::SkCanvas(SkBaseDevice* device)
     : fMCStack(sizeof(MCRec), fMCRecStorage, sizeof(fMCRecStorage))
+    , fProps(device->surfaceProps())
+    , fConservativeRasterClip(false)
 {
     inc_canvas();
 
-    this->init(device);
+    this->init(device, kDefault_InitFlags);
+}
+
+SkCanvas::SkCanvas(SkBaseDevice* device, InitFlags flags)
+    : fMCStack(sizeof(MCRec), fMCRecStorage, sizeof(fMCRecStorage))
+    , fProps(device->surfaceProps())
+    , fConservativeRasterClip(false)
+{
+    inc_canvas();
+
+    this->init(device, flags);
+}
+
+SkCanvas::SkCanvas(const SkBitmap& bitmap, const SkSurfaceProps& props)
+    : fMCStack(sizeof(MCRec), fMCRecStorage, sizeof(fMCRecStorage))
+    , fProps(props)
+    , fConservativeRasterClip(false)
+{
+    inc_canvas();
+
+    SkAutoTUnref<SkBaseDevice> device(new SkBitmapDevice(bitmap, fProps));
+    this->init(device, kDefault_InitFlags);
 }
 
 SkCanvas::SkCanvas(const SkBitmap& bitmap)
     : fMCStack(sizeof(MCRec), fMCRecStorage, sizeof(fMCRecStorage))
+    , fProps(SkSurfaceProps::kLegacyFontHost_InitType)
+    , fConservativeRasterClip(false)
 {
     inc_canvas();
 
-    this->init(SkNEW_ARGS(SkBitmapDevice, (bitmap)))->unref();
+    SkAutoTUnref<SkBaseDevice> device(new SkBitmapDevice(bitmap, fProps));
+    this->init(device, kDefault_InitFlags);
 }
 
 SkCanvas::~SkCanvas() {
     // free up the contents of our deque
     this->restoreToCount(1);    // restore everything but the last
-    SkASSERT(0 == fSaveLayerCount);
 
     this->internalRestore();    // restore the last, since we're going away
 
-    SkDELETE(fMetaData);
+    delete fMetaData;
 
     dec_canvas();
 }
@@ -450,6 +773,7 @@ SkDrawFilter* SkCanvas::getDrawFilter() const {
 }
 
 SkDrawFilter* SkCanvas::setDrawFilter(SkDrawFilter* filter) {
+    this->checkForDeferredSave();
     SkRefCnt_SafeAssign(fMCRec->fFilter, filter);
     return filter;
 }
@@ -457,7 +781,7 @@ SkDrawFilter* SkCanvas::setDrawFilter(SkDrawFilter* filter) {
 SkMetaData& SkCanvas::getMetaData() {
     // metadata users are rare, so we lazily allocate it. If that changes we
     // can decide to just make it a field in the device (rather than a ptr)
-    if (NULL == fMetaData) {
+    if (nullptr == fMetaData) {
         fMetaData = new SkMetaData;
     }
     return *fMetaData;
@@ -501,79 +825,29 @@ SkBaseDevice* SkCanvas::getTopDevice(bool updateMatrixClip) const {
     return fMCRec->fTopLayer->fDevice;
 }
 
-SkBaseDevice* SkCanvas::setRootDevice(SkBaseDevice* device) {
-    // return root device
-    SkDeque::F2BIter iter(fMCStack);
-    MCRec*           rec = (MCRec*)iter.next();
-    SkASSERT(rec && rec->fLayer);
-    SkBaseDevice*    rootDevice = rec->fLayer->fDevice;
-
-    if (rootDevice == device) {
-        return device;
-    }
-
-    if (device) {
-        device->onAttachToCanvas(this);
-    }
-    if (rootDevice) {
-        rootDevice->onDetachFromCanvas();
-    }
-
-    SkRefCnt_SafeAssign(rec->fLayer->fDevice, device);
-    rootDevice = device;
-
-    fDeviceCMDirty = true;
-
-    /*  Now we update our initial region to have the bounds of the new device,
-        and then intersect all of the clips in our stack with these bounds,
-        to ensure that we can't draw outside of the device's bounds (and trash
-                                                                     memory).
-
-    NOTE: this is only a partial-fix, since if the new device is larger than
-        the previous one, we don't know how to "enlarge" the clips in our stack,
-        so drawing may be artificially restricted. Without keeping a history of
-        all calls to canvas->clipRect() and canvas->clipPath(), we can't exactly
-        reconstruct the correct clips, so this approximation will have to do.
-        The caller really needs to restore() back to the base if they want to
-        accurately take advantage of the new device bounds.
-    */
-
-    SkIRect bounds;
-    if (device) {
-        bounds.set(0, 0, device->width(), device->height());
-    } else {
-        bounds.setEmpty();
-    }
-    // now jam our 1st clip to be bounds, and intersect the rest with that
-    rec->fRasterClip.setRect(bounds);
-    while ((rec = (MCRec*)iter.next()) != NULL) {
-        (void)rec->fRasterClip.op(bounds, SkRegion::kIntersect_Op);
-    }
-
-    return device;
-}
-
 bool SkCanvas::readPixels(SkBitmap* bitmap, int x, int y) {
     if (kUnknown_SkColorType == bitmap->colorType() || bitmap->getTexture()) {
         return false;
     }
 
     bool weAllocated = false;
-    if (NULL == bitmap->pixelRef()) {
-        if (!bitmap->allocPixels()) {
+    if (nullptr == bitmap->pixelRef()) {
+        if (!bitmap->tryAllocPixels()) {
             return false;
         }
         weAllocated = true;
     }
 
-    SkBitmap bm(*bitmap);
-    bm.lockPixels();
-    if (bm.getPixels() && this->readPixels(bm.info(), bm.getPixels(), bm.rowBytes(), x, y)) {
-        return true;
+    SkAutoPixmapUnlock unlocker;
+    if (bitmap->requestLock(&unlocker)) {
+        const SkPixmap& pm = unlocker.pixmap();
+        if (this->readPixels(pm.info(), pm.writable_addr(), pm.rowBytes(), x, y)) {
+            return true;
+        }
     }
 
     if (weAllocated) {
-        bitmap->setPixelRef(NULL);
+        bitmap->setPixelRef(nullptr);
     }
     return false;
 }
@@ -586,7 +860,7 @@ bool SkCanvas::readPixels(const SkIRect& srcRect, SkBitmap* bitmap) {
         return false;
     }
 
-    if (!bitmap->allocN32Pixels(r.width(), r.height())) {
+    if (!bitmap->tryAllocN32Pixels(r.width(), r.height())) {
         // bitmap will already be reset.
         return false;
     }
@@ -597,59 +871,31 @@ bool SkCanvas::readPixels(const SkIRect& srcRect, SkBitmap* bitmap) {
     return true;
 }
 
-bool SkCanvas::readPixels(const SkImageInfo& origInfo, void* dstP, size_t rowBytes, int x, int y) {
-    switch (origInfo.colorType()) {
-        case kUnknown_SkColorType:
-        case kIndex_8_SkColorType:
-            return false;
-        default:
-            break;
-    }
-    if (NULL == dstP || rowBytes < origInfo.minRowBytes()) {
-        return false;
-    }
-    if (0 == origInfo.width() || 0 == origInfo.height()) {
-        return false;
-    }
-
+bool SkCanvas::readPixels(const SkImageInfo& dstInfo, void* dstP, size_t rowBytes, int x, int y) {
     SkBaseDevice* device = this->getDevice();
     if (!device) {
         return false;
     }
-
     const SkISize size = this->getBaseLayerSize();
-    SkIRect srcR = SkIRect::MakeXYWH(x, y, origInfo.width(), origInfo.height());
-    if (!srcR.intersect(0, 0, size.width(), size.height())) {
+
+    SkReadPixelsRec rec(dstInfo, dstP, rowBytes, x, y);
+    if (!rec.trim(size.width(), size.height())) {
         return false;
     }
 
-    SkImageInfo info = origInfo;
-    // the intersect may have shrunk info's logical size
-    info.fWidth = srcR.width();
-    info.fHeight = srcR.height();
-
-    // if x or y are negative, then we have to adjust pixels
-    if (x > 0) {
-        x = 0;
-    }
-    if (y > 0) {
-        y = 0;
-    }
-    // here x,y are either 0 or negative
-    dstP = ((char*)dstP - y * rowBytes - x * info.bytesPerPixel());
-
     // The device can assert that the requested area is always contained in its bounds
-    return device->readPixels(info, dstP, rowBytes, srcR.x(), srcR.y());
+    return device->readPixels(rec.fInfo, rec.fPixels, rec.fRowBytes, rec.fX, rec.fY);
 }
 
 bool SkCanvas::writePixels(const SkBitmap& bitmap, int x, int y) {
     if (bitmap.getTexture()) {
         return false;
     }
-    SkBitmap bm(bitmap);
-    bm.lockPixels();
-    if (bm.getPixels()) {
-        return this->writePixels(bm.info(), bm.getPixels(), bm.rowBytes(), x, y);
+
+    SkAutoPixmapUnlock unlocker;
+    if (bitmap.requestLock(&unlocker)) {
+        const SkPixmap& pm = unlocker.pixmap();
+        return this->writePixels(pm.info(), pm.addr(), pm.rowBytes(), x, y);
     }
     return false;
 }
@@ -663,7 +909,7 @@ bool SkCanvas::writePixels(const SkImageInfo& origInfo, const void* pixels, size
         default:
             break;
     }
-    if (NULL == pixels || rowBytes < origInfo.minRowBytes()) {
+    if (nullptr == pixels || rowBytes < origInfo.minRowBytes()) {
         return false;
     }
 
@@ -678,10 +924,8 @@ bool SkCanvas::writePixels(const SkImageInfo& origInfo, const void* pixels, size
         return false;
     }
 
-    SkImageInfo info = origInfo;
     // the intersect may have shrunk info's logical size
-    info.fWidth = target.width();
-    info.fHeight = target.height();
+    const SkImageInfo info = origInfo.makeWH(target.width(), target.height());
 
     // if x or y are negative, then we have to adjust pixels
     if (x > 0) {
@@ -694,7 +938,8 @@ bool SkCanvas::writePixels(const SkImageInfo& origInfo, const void* pixels, size
     pixels = ((const char*)pixels - y * rowBytes - x * info.bytesPerPixel());
 
     // Tell our owning surface to bump its generation ID
-    this->predrawNotify();
+    const bool completeOverwrite = info.dimensions() == size;
+    this->predrawNotify(completeOverwrite);
 
     // The device can assert that the requested area is always contained in its bounds
     return device->writePixels(info, pixels, rowBytes, target.x(), target.y());
@@ -712,13 +957,13 @@ void SkCanvas::updateDeviceCMCache() {
         const SkRasterClip& totalClip = fMCRec->fRasterClip;
         DeviceCM*       layer = fMCRec->fTopLayer;
 
-        if (NULL == layer->fNext) {   // only one layer
-            layer->updateMC(totalMatrix, totalClip, fClipStack, NULL);
+        if (nullptr == layer->fNext) {   // only one layer
+            layer->updateMC(totalMatrix, totalClip, *fClipStack, nullptr);
         } else {
             SkRasterClip clip(totalClip);
             do {
-                layer->updateMC(totalMatrix, clip, fClipStack, &clip);
-            } while ((layer = layer->fNext) != NULL);
+                layer->updateMC(totalMatrix, clip, *fClipStack, &clip);
+            } while ((layer = layer->fNext) != nullptr);
         }
         fDeviceCMDirty = false;
     }
@@ -726,215 +971,57 @@ void SkCanvas::updateDeviceCMCache() {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-int SkCanvas::internalSave() {
-    int saveCount = this->getSaveCount(); // record this before the actual save
-
-    MCRec* newTop = (MCRec*)fMCStack.push_back();
-    new (newTop) MCRec(fMCRec);    // balanced in restore()
-    fMCRec = newTop;
-
-    fClipStack.save();
-
-    return saveCount;
-}
-
-int SkCanvas::save() {
-    this->willSave();
-    return this->internalSave();
-}
-
-static bool bounds_affects_clip(SkCanvas::SaveFlags flags) {
-#ifdef SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG
-    return (flags & SkCanvas::kClipToLayer_SaveFlag) != 0;
-#else
-    return true;
-#endif
-}
-
-bool SkCanvas::clipRectBounds(const SkRect* bounds, SaveFlags flags,
-                               SkIRect* intersection, const SkImageFilter* imageFilter) {
-    SkIRect clipBounds;
-    SkRegion::Op op = SkRegion::kIntersect_Op;
-    if (!this->getClipDeviceBounds(&clipBounds)) {
-        return false;
-    }
-
-    if (imageFilter) {
-        imageFilter->filterBounds(clipBounds, fMCRec->fMatrix, &clipBounds);
-        // Filters may grow the bounds beyond the device bounds.
-        op = SkRegion::kReplace_Op;
-    }
-    SkIRect ir;
-    if (NULL != bounds) {
-        SkRect r;
-
-        this->getTotalMatrix().mapRect(&r, *bounds);
-        r.roundOut(&ir);
-        // early exit if the layer's bounds are clipped out
-        if (!ir.intersect(clipBounds)) {
-            if (bounds_affects_clip(flags)) {
-                fMCRec->fRasterClip.setEmpty();
-            }
-            return false;
-        }
-    } else {    // no user bounds, so just use the clip
-        ir = clipBounds;
-    }
-
-    if (bounds_affects_clip(flags)) {
-        fClipStack.clipDevRect(ir, op);
-        // early exit if the clip is now empty
-        if (!fMCRec->fRasterClip.op(ir, op)) {
-            return false;
-        }
-    }
-
-    if (intersection) {
-        *intersection = ir;
-    }
-    return true;
-}
-
-int SkCanvas::saveLayer(const SkRect* bounds, const SkPaint* paint) {
-    SaveLayerStrategy strategy = this->willSaveLayer(bounds, paint, kARGB_ClipLayer_SaveFlag);
-    return this->internalSaveLayer(bounds, paint, kARGB_ClipLayer_SaveFlag, false, strategy);
-}
-
-int SkCanvas::saveLayer(const SkRect* bounds, const SkPaint* paint,
-                        SaveFlags flags) {
-    SaveLayerStrategy strategy = this->willSaveLayer(bounds, paint, flags);
-    return this->internalSaveLayer(bounds, paint, flags, false, strategy);
-}
-
-int SkCanvas::internalSaveLayer(const SkRect* bounds, const SkPaint* paint, SaveFlags flags,
-                                bool justForImageFilter, SaveLayerStrategy strategy) {
-#ifndef SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG
-    flags |= kClipToLayer_SaveFlag;
-#endif
-
-    // do this before we create the layer. We don't call the public save() since
-    // that would invoke a possibly overridden virtual
-    int count = this->internalSave();
-
-    fDeviceCMDirty = true;
-
-    SkIRect ir;
-    if (!this->clipRectBounds(bounds, flags, &ir, paint ? paint->getImageFilter() : NULL)) {
-        return count;
-    }
-
-    // FIXME: do willSaveLayer() overriders returning kNoLayer_SaveLayerStrategy really care about
-    // the clipRectBounds() call above?
-    if (kNoLayer_SaveLayerStrategy == strategy) {
-        return count;
-    }
-
-    // Kill the imagefilter if our device doesn't allow it
-    SkLazyPaint lazyP;
-    if (paint && paint->getImageFilter()) {
-        if (!this->getTopDevice()->allowImageFilter(paint->getImageFilter())) {
-            if (justForImageFilter) {
-                // early exit if the layer was just for the imageFilter
-                return count;
-            }
-            SkPaint* p = lazyP.set(*paint);
-            p->setImageFilter(NULL);
-            paint = p;
-        }
-    }
-
-    bool isOpaque = !SkToBool(flags & kHasAlphaLayer_SaveFlag);
-    SkImageInfo info = SkImageInfo::MakeN32(ir.width(), ir.height(),
-                        isOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType);
-
-    SkBaseDevice* device;
-    if (paint && paint->getImageFilter()) {
-        device = this->getDevice();
-        if (device) {
-            device = device->createCompatibleDevice(info);
-        }
-    } else {
-        device = this->createLayerDevice(info);
-    }
-    if (NULL == device) {
-        SkDebugf("Unable to create device for layer.");
-        return count;
-    }
-
-    device->setOrigin(ir.fLeft, ir.fTop);
-    DeviceCM* layer = SkNEW_ARGS(DeviceCM, (device, ir.fLeft, ir.fTop, paint, this));
-    device->unref();
-
-    layer->fNext = fMCRec->fTopLayer;
-    fMCRec->fLayer = layer;
-    fMCRec->fTopLayer = layer;    // this field is NOT an owner of layer
-
-    fSaveLayerCount += 1;
-    return count;
-}
-
-int SkCanvas::saveLayerAlpha(const SkRect* bounds, U8CPU alpha) {
-    return this->saveLayerAlpha(bounds, alpha, kARGB_ClipLayer_SaveFlag);
-}
-
-int SkCanvas::saveLayerAlpha(const SkRect* bounds, U8CPU alpha,
-                             SaveFlags flags) {
-    if (0xFF == alpha) {
-        return this->saveLayer(bounds, NULL, flags);
-    } else {
-        SkPaint tmpPaint;
-        tmpPaint.setAlpha(alpha);
-        return this->saveLayer(bounds, &tmpPaint, flags);
-    }
-}
-
-void SkCanvas::restore() {
-    // check for underflow
-    if (fMCStack.count() > 1) {
-        this->willRestore();
-        this->internalRestore();
-    }
-}
-
-void SkCanvas::internalRestore() {
-    SkASSERT(fMCStack.count() != 0);
-
-    fDeviceCMDirty = true;
-    fCachedLocalClipBoundsDirty = true;
-
-    fClipStack.restore();
-
-    // reserve our layer (if any)
-    DeviceCM* layer = fMCRec->fLayer;   // may be null
-    // now detach it from fMCRec so we can pop(). Gets freed after its drawn
-    fMCRec->fLayer = NULL;
-
-    // now do the normal restore()
-    fMCRec->~MCRec();       // balanced in save()
-    fMCStack.pop_back();
-    fMCRec = (MCRec*)fMCStack.back();
-
-    /*  Time to draw the layer's offscreen. We can't call the public drawSprite,
-        since if we're being recorded, we don't want to record this (the
-        recorder will have already recorded the restore).
-    */
-    if (NULL != layer) {
-        if (layer->fNext) {
-            const SkIPoint& origin = layer->fDevice->getOrigin();
-            this->internalDrawDevice(layer->fDevice, origin.x(), origin.y(),
-                                     layer->fPaint);
-            // reset this, since internalDrawDevice will have set it to true
-            fDeviceCMDirty = true;
-
-            SkASSERT(fSaveLayerCount > 0);
-            fSaveLayerCount -= 1;
-        }
-        SkDELETE(layer);
+void SkCanvas::checkForDeferredSave() {
+    if (fMCRec->fDeferredSaveCount > 0) {
+        this->doSave();
     }
 }
 
 int SkCanvas::getSaveCount() const {
-    return fMCStack.count();
+#ifdef SK_DEBUG
+    int count = 0;
+    SkDeque::Iter iter(fMCStack, SkDeque::Iter::kFront_IterStart);
+    for (;;) {
+        const MCRec* rec = (const MCRec*)iter.next();
+        if (!rec) {
+            break;
+        }
+        count += 1 + rec->fDeferredSaveCount;
+    }
+    SkASSERT(count == fSaveCount);
+#endif
+    return fSaveCount;
+}
+
+int SkCanvas::save() {
+    fSaveCount += 1;
+    fMCRec->fDeferredSaveCount += 1;
+    return this->getSaveCount() - 1;  // return our prev value
+}
+
+void SkCanvas::doSave() {
+    this->willSave();
+
+    SkASSERT(fMCRec->fDeferredSaveCount > 0);
+    fMCRec->fDeferredSaveCount -= 1;
+    this->internalSave();
+}
+
+void SkCanvas::restore() {
+    if (fMCRec->fDeferredSaveCount > 0) {
+        SkASSERT(fSaveCount > 1);
+        fSaveCount -= 1;
+        fMCRec->fDeferredSaveCount -= 1;
+    } else {
+        // check for underflow
+        if (fMCStack.count() > 1) {
+            this->willRestore();
+            SkASSERT(fSaveCount > 1);
+            fSaveCount -= 1;
+            this->internalRestore();
+            this->didRestore();
+        }
+    }
 }
 
 void SkCanvas::restoreToCount(int count) {
@@ -949,17 +1036,232 @@ void SkCanvas::restoreToCount(int count) {
     }
 }
 
-bool SkCanvas::isDrawingToLayer() const {
-    return fSaveLayerCount > 0;
+void SkCanvas::internalSave() {
+    MCRec* newTop = (MCRec*)fMCStack.push_back();
+    new (newTop) MCRec(*fMCRec);    // balanced in restore()
+    fMCRec = newTop;
+
+    fClipStack->save();
 }
 
-SkSurface* SkCanvas::newSurface(const SkImageInfo& info) {
-    return this->onNewSurface(info);
+static bool bounds_affects_clip(SkCanvas::SaveFlags flags) {
+#ifdef SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG
+    return (flags & SkCanvas::kClipToLayer_SaveFlag) != 0;
+#else
+    return true;
+#endif
 }
 
-SkSurface* SkCanvas::onNewSurface(const SkImageInfo& info) {
+bool SkCanvas::clipRectBounds(const SkRect* bounds, SaveFlags flags,
+                              SkIRect* intersection, const SkImageFilter* imageFilter) {
+    SkIRect clipBounds;
+    if (!this->getClipDeviceBounds(&clipBounds)) {
+        return false;
+    }
+
+    const SkMatrix& ctm = fMCRec->fMatrix;  // this->getTotalMatrix()
+
+// This is a temporary hack, until individual filters can do their own
+// bloating, when this will be removed.
+#ifdef SK_SUPPORT_SRC_BOUNDS_BLOAT_FOR_IMAGEFILTERS
+    SkRect storage;
+#endif
+    if (imageFilter) {
+        imageFilter->filterBounds(clipBounds, ctm, &clipBounds);
+#ifdef SK_SUPPORT_SRC_BOUNDS_BLOAT_FOR_IMAGEFILTERS
+        if (bounds && imageFilter->canComputeFastBounds()) {
+            imageFilter->computeFastBounds(*bounds, &storage);
+            bounds = &storage;
+        } else {
+            bounds = nullptr;
+        }
+#endif
+    }
+    SkIRect ir;
+    if (bounds) {
+        SkRect r;
+
+        ctm.mapRect(&r, *bounds);
+        r.roundOut(&ir);
+        // early exit if the layer's bounds are clipped out
+        if (!ir.intersect(clipBounds)) {
+            if (bounds_affects_clip(flags)) {
+                fCachedLocalClipBoundsDirty = true;
+                fMCRec->fRasterClip.setEmpty();
+            }
+            return false;
+        }
+    } else {    // no user bounds, so just use the clip
+        ir = clipBounds;
+    }
+    SkASSERT(!ir.isEmpty());
+
+    if (bounds_affects_clip(flags)) {
+        // Simplify the current clips since they will be applied properly during restore()
+        fCachedLocalClipBoundsDirty = true;
+        fClipStack->clipDevRect(ir, SkRegion::kReplace_Op);
+        fMCRec->fRasterClip.setRect(ir);
+    }
+
+    if (intersection) {
+        *intersection = ir;
+    }
+    return true;
+}
+
+int SkCanvas::saveLayer(const SkRect* bounds, const SkPaint* paint) {
+    if (gIgnoreSaveLayerBounds) {
+        bounds = nullptr;
+    }
+    SaveLayerStrategy strategy = this->willSaveLayer(bounds, paint, kARGB_ClipLayer_SaveFlag);
+    fSaveCount += 1;
+    this->internalSaveLayer(bounds, paint, kARGB_ClipLayer_SaveFlag, strategy);
+    return this->getSaveCount() - 1;
+}
+
+int SkCanvas::saveLayer(const SkRect* bounds, const SkPaint* paint, SaveFlags flags) {
+    if (gIgnoreSaveLayerBounds) {
+        bounds = nullptr;
+    }
+    SaveLayerStrategy strategy = this->willSaveLayer(bounds, paint, flags);
+    fSaveCount += 1;
+    this->internalSaveLayer(bounds, paint, flags, strategy);
+    return this->getSaveCount() - 1;
+}
+
+void SkCanvas::internalSaveLayer(const SkRect* bounds, const SkPaint* paint, SaveFlags flags,
+                                 SaveLayerStrategy strategy) {
+#ifndef SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG
+    flags |= kClipToLayer_SaveFlag;
+#endif
+
+    // do this before we create the layer. We don't call the public save() since
+    // that would invoke a possibly overridden virtual
+    this->internalSave();
+
+    fDeviceCMDirty = true;
+
+    SkIRect ir;
+    if (!this->clipRectBounds(bounds, flags, &ir, paint ? paint->getImageFilter() : nullptr)) {
+        return;
+    }
+
+    // FIXME: do willSaveLayer() overriders returning kNoLayer_SaveLayerStrategy really care about
+    // the clipRectBounds() call above?
+    if (kNoLayer_SaveLayerStrategy == strategy) {
+        return;
+    }
+
+    bool isOpaque = !SkToBool(flags & kHasAlphaLayer_SaveFlag);
+    SkPixelGeometry geo = fProps.pixelGeometry();
+    if (paint) {
+        // TODO: perhaps add a query to filters so we might preserve opaqueness...
+        if (paint->getImageFilter() || paint->getColorFilter()) {
+            isOpaque = false;
+            geo = kUnknown_SkPixelGeometry;
+        }
+    }
+    SkImageInfo info = SkImageInfo::MakeN32(ir.width(), ir.height(),
+                        isOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType);
+
+    SkBaseDevice* device = this->getTopDevice();
+    if (nullptr == device) {
+        SkDebugf("Unable to find device for layer.");
+        return;
+    }
+
+    bool forceSpriteOnRestore = false;
+    {
+        const SkBaseDevice::TileUsage usage = SkBaseDevice::kNever_TileUsage;
+        const SkBaseDevice::CreateInfo createInfo = SkBaseDevice::CreateInfo(info, usage, geo);
+        SkBaseDevice* newDev = device->onCreateDevice(createInfo, paint);
+        if (nullptr == newDev) {
+            // If onCreateDevice didn't succeed, try raster (e.g. PDF couldn't handle the paint)
+            const SkSurfaceProps surfaceProps(fProps.flags(), createInfo.fPixelGeometry);
+            newDev = SkBitmapDevice::Create(createInfo.fInfo, surfaceProps);
+            if (nullptr == newDev) {
+                SkErrorInternals::SetError(kInternalError_SkError,
+                                           "Unable to create device for layer.");
+                return;
+            }
+            forceSpriteOnRestore = true;
+        }
+        device = newDev;
+    }
+
+    device->setOrigin(ir.fLeft, ir.fTop);
+    DeviceCM* layer =
+            new DeviceCM(device, paint, this, fConservativeRasterClip, forceSpriteOnRestore);
+    device->unref();
+
+    layer->fNext = fMCRec->fTopLayer;
+    fMCRec->fLayer = layer;
+    fMCRec->fTopLayer = layer;    // this field is NOT an owner of layer
+}
+
+int SkCanvas::saveLayerAlpha(const SkRect* bounds, U8CPU alpha) {
+    return this->saveLayerAlpha(bounds, alpha, kARGB_ClipLayer_SaveFlag);
+}
+
+int SkCanvas::saveLayerAlpha(const SkRect* bounds, U8CPU alpha,
+                             SaveFlags flags) {
+    if (0xFF == alpha) {
+        return this->saveLayer(bounds, nullptr, flags);
+    } else {
+        SkPaint tmpPaint;
+        tmpPaint.setAlpha(alpha);
+        return this->saveLayer(bounds, &tmpPaint, flags);
+    }
+}
+
+void SkCanvas::internalRestore() {
+    SkASSERT(fMCStack.count() != 0);
+
+    fDeviceCMDirty = true;
+    fCachedLocalClipBoundsDirty = true;
+
+    fClipStack->restore();
+
+    // reserve our layer (if any)
+    DeviceCM* layer = fMCRec->fLayer;   // may be null
+    // now detach it from fMCRec so we can pop(). Gets freed after its drawn
+    fMCRec->fLayer = nullptr;
+
+    // now do the normal restore()
+    fMCRec->~MCRec();       // balanced in save()
+    fMCStack.pop_back();
+    fMCRec = (MCRec*)fMCStack.back();
+
+    /*  Time to draw the layer's offscreen. We can't call the public drawSprite,
+        since if we're being recorded, we don't want to record this (the
+        recorder will have already recorded the restore).
+    */
+    if (layer) {
+        if (layer->fNext) {
+            const SkIPoint& origin = layer->fDevice->getOrigin();
+            this->internalDrawDevice(layer->fDevice, origin.x(), origin.y(),
+                                     layer->fPaint, layer->fDeviceIsBitmapDevice);
+            // reset this, since internalDrawDevice will have set it to true
+            fDeviceCMDirty = true;
+            delete layer;
+        } else {
+            // we're at the root
+            SkASSERT(layer == (void*)fDeviceCMStorage);
+            layer->~DeviceCM();
+        }
+    }
+}
+
+SkSurface* SkCanvas::newSurface(const SkImageInfo& info, const SkSurfaceProps* props) {
+    if (nullptr == props) {
+        props = &fProps;
+    }
+    return this->onNewSurface(info, *props);
+}
+
+SkSurface* SkCanvas::onNewSurface(const SkImageInfo& info, const SkSurfaceProps& props) {
     SkBaseDevice* dev = this->getDevice();
-    return dev ? dev->newSurface(info) : NULL;
+    return dev ? dev->newSurface(info, props) : nullptr;
 }
 
 SkImageInfo SkCanvas::imageInfo() const {
@@ -972,36 +1274,55 @@ SkImageInfo SkCanvas::imageInfo() const {
 }
 
 const void* SkCanvas::peekPixels(SkImageInfo* info, size_t* rowBytes) {
-    return this->onPeekPixels(info, rowBytes);
+    SkPixmap pmap;
+    if (!this->onPeekPixels(&pmap)) {
+        return nullptr;
+    }
+    if (info) {
+        *info = pmap.info();
+    }
+    if (rowBytes) {
+        *rowBytes = pmap.rowBytes();
+    }
+    return pmap.addr();
 }
 
-const void* SkCanvas::onPeekPixels(SkImageInfo* info, size_t* rowBytes) {
+bool SkCanvas::onPeekPixels(SkPixmap* pmap) {
     SkBaseDevice* dev = this->getDevice();
-    return dev ? dev->peekPixels(info, rowBytes) : NULL;
+    return dev && dev->peekPixels(pmap);
 }
 
 void* SkCanvas::accessTopLayerPixels(SkImageInfo* info, size_t* rowBytes, SkIPoint* origin) {
-    void* pixels = this->onAccessTopLayerPixels(info, rowBytes);
-    if (pixels && origin) {
+    SkPixmap pmap;
+    if (!this->onAccessTopLayerPixels(&pmap)) {
+        return nullptr;
+    }
+    if (info) {
+        *info = pmap.info();
+    }
+    if (rowBytes) {
+        *rowBytes = pmap.rowBytes();
+    }
+    if (origin) {
         *origin = this->getTopDevice(false)->getOrigin();
     }
-    return pixels;
+    return pmap.writable_addr();
 }
 
-void* SkCanvas::onAccessTopLayerPixels(SkImageInfo* info, size_t* rowBytes) {
+bool SkCanvas::onAccessTopLayerPixels(SkPixmap* pmap) {
     SkBaseDevice* dev = this->getTopDevice();
-    return dev ? dev->accessPixels(info, rowBytes) : NULL;
+    return dev && dev->accessPixels(pmap);
 }
 
 SkAutoROCanvasPixels::SkAutoROCanvasPixels(SkCanvas* canvas) {
     fAddr = canvas->peekPixels(&fInfo, &fRowBytes);
-    if (NULL == fAddr) {
+    if (nullptr == fAddr) {
         fInfo = canvas->imageInfo();
-        if (kUnknown_SkColorType == fInfo.colorType() || !fBitmap.allocPixels(fInfo)) {
-            return; // failure, fAddr is NULL
+        if (kUnknown_SkColorType == fInfo.colorType() || !fBitmap.tryAllocPixels(fInfo)) {
+            return; // failure, fAddr is nullptr
         }
         if (!canvas->readPixels(&fBitmap, 0, 0)) {
-            return; // failure, fAddr is NULL
+            return; // failure, fAddr is nullptr
         }
         fAddr = fBitmap.getPixels();
         fRowBytes = fBitmap.rowBytes();
@@ -1018,105 +1339,12 @@ bool SkAutoROCanvasPixels::asROBitmap(SkBitmap* bitmap) const {
     }
 }
 
-void SkCanvas::onPushCull(const SkRect& cullRect) {
-    // do nothing. Subclasses may do something
-}
-
-void SkCanvas::onPopCull() {
-    // do nothing. Subclasses may do something
-}
-
 /////////////////////////////////////////////////////////////////////////////
-#ifdef SK_DEBUG
-// Ensure that cull rects are monotonically nested in device space.
-void SkCanvas::validateCull(const SkIRect& devCull) {
-    if (fCullStack.isEmpty()
-        || devCull.isEmpty()
-        || fCullStack.top().contains(devCull)) {
-        return;
-    }
-
-    SkDEBUGF(("Invalid cull: [%d %d %d %d] (previous cull: [%d %d %d %d])\n",
-              devCull.x(), devCull.y(), devCull.right(), devCull.bottom(),
-              fCullStack.top().x(), fCullStack.top().y(),
-              fCullStack.top().right(), fCullStack.top().bottom()));
-
-#ifdef ASSERT_NESTED_CULLING
-    SkDEBUGFAIL("Invalid cull.");
-#endif
-}
-#endif
-
-void SkCanvas::pushCull(const SkRect& cullRect) {
-    ++fCullCount;
-    this->onPushCull(cullRect);
-
-#ifdef SK_DEBUG
-    // Map the cull rect into device space.
-    SkRect mappedCull;
-    this->getTotalMatrix().mapRect(&mappedCull, cullRect);
-
-    // Take clipping into account.
-    SkIRect devClip, devCull;
-    mappedCull.roundOut(&devCull);
-    this->getClipDeviceBounds(&devClip);
-    if (!devCull.intersect(devClip)) {
-        devCull.setEmpty();
-    }
-
-    this->validateCull(devCull);
-    fCullStack.push(devCull); // balanced in popCull
-#endif
-}
-
-void SkCanvas::popCull() {
-    SkASSERT(fCullStack.count() == fCullCount);
-
-    if (fCullCount > 0) {
-        --fCullCount;
-        this->onPopCull();
-
-        SkDEBUGCODE(fCullStack.pop());
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-void SkCanvas::internalDrawBitmap(const SkBitmap& bitmap,
-                                const SkMatrix& matrix, const SkPaint* paint) {
-    if (bitmap.drawsNothing()) {
-        return;
-    }
-
-    SkLazyPaint lazy;
-    if (NULL == paint) {
-        paint = lazy.init();
-    }
-
-    SkDEBUGCODE(bitmap.validate();)
-
-    SkRect storage;
-    const SkRect* bounds = NULL;
-    if (paint && paint->canComputeFastBounds()) {
-        bitmap.getBounds(&storage);
-        matrix.mapRect(&storage);
-        bounds = &paint->computeFastBounds(storage, &storage);
-    }
-
-    LOOPER_BEGIN(*paint, SkDrawFilter::kBitmap_Type, bounds)
-
-    while (iter.next()) {
-        iter.fDevice->drawBitmap(iter, bitmap, matrix, looper.paint());
-    }
-
-    LOOPER_END
-}
 
 void SkCanvas::internalDrawDevice(SkBaseDevice* srcDev, int x, int y,
-                                  const SkPaint* paint) {
+                                  const SkPaint* paint, bool deviceIsBitmapDevice) {
     SkPaint tmp;
-    if (NULL == paint) {
-        tmp.setDither(true);
+    if (nullptr == paint) {
         paint = &tmp;
     }
 
@@ -1127,26 +1355,25 @@ void SkCanvas::internalDrawDevice(SkBaseDevice* srcDev, int x, int y,
         SkImageFilter* filter = paint->getImageFilter();
         SkIPoint pos = { x - iter.getX(), y - iter.getY() };
         if (filter && !dstDev->canHandleImageFilter(filter)) {
-            SkDeviceImageFilterProxy proxy(dstDev);
+            SkImageFilter::DeviceProxy proxy(dstDev);
             SkBitmap dst;
             SkIPoint offset = SkIPoint::Make(0, 0);
             const SkBitmap& src = srcDev->accessBitmap(false);
             SkMatrix matrix = *iter.fMatrix;
             matrix.postTranslate(SkIntToScalar(-pos.x()), SkIntToScalar(-pos.y()));
             SkIRect clipBounds = SkIRect::MakeWH(srcDev->width(), srcDev->height());
-            SkImageFilter::Cache* cache = SkImageFilter::GetExternalCache();
-            SkAutoUnref aur(NULL);
-            if (!cache) {
-                cache = SkImageFilter::Cache::Create();
-                aur.reset(cache);
-            }
-            SkImageFilter::Context ctx(matrix, clipBounds, cache);
+            SkAutoTUnref<SkImageFilter::Cache> cache(dstDev->getImageFilterCache());
+            SkImageFilter::Context ctx(matrix, clipBounds, cache.get(),
+                                       SkImageFilter::kApprox_SizeConstraint);
             if (filter->filterImage(&proxy, src, ctx, &dst, &offset)) {
                 SkPaint tmpUnfiltered(*paint);
-                tmpUnfiltered.setImageFilter(NULL);
+                tmpUnfiltered.setImageFilter(nullptr);
                 dstDev->drawSprite(iter, dst, pos.x() + offset.x(), pos.y() + offset.y(),
                                    tmpUnfiltered);
             }
+        } else if (deviceIsBitmapDevice) {
+            const SkBitmap& src = static_cast<SkBitmapDevice*>(srcDev)->fBitmap;
+            dstDev->drawSprite(iter, src, pos.x(), pos.y(), *paint);
         } else {
             dstDev->drawDevice(iter, srcDev, pos.x(), pos.y(), *paint);
         }
@@ -1154,15 +1381,23 @@ void SkCanvas::internalDrawDevice(SkBaseDevice* srcDev, int x, int y,
     LOOPER_END
 }
 
-void SkCanvas::drawSprite(const SkBitmap& bitmap, int x, int y,
-                          const SkPaint* paint) {
+void SkCanvas::onDrawSprite(const SkBitmap& bitmap, int x, int y, const SkPaint* paint) {
+    if (gTreatSpriteAsBitmap) {
+        this->save();
+        this->resetMatrix();
+        this->drawBitmap(bitmap, SkIntToScalar(x), SkIntToScalar(y), paint);
+        this->restore();
+        return;
+    }
+
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawSprite()");
     if (bitmap.drawsNothing()) {
         return;
     }
     SkDEBUGCODE(bitmap.validate();)
 
     SkPaint tmp;
-    if (NULL == paint) {
+    if (nullptr == paint) {
         paint = &tmp;
     }
 
@@ -1173,22 +1408,18 @@ void SkCanvas::drawSprite(const SkBitmap& bitmap, int x, int y,
         SkImageFilter* filter = paint->getImageFilter();
         SkIPoint pos = { x - iter.getX(), y - iter.getY() };
         if (filter && !iter.fDevice->canHandleImageFilter(filter)) {
-            SkDeviceImageFilterProxy proxy(iter.fDevice);
+            SkImageFilter::DeviceProxy proxy(iter.fDevice);
             SkBitmap dst;
             SkIPoint offset = SkIPoint::Make(0, 0);
             SkMatrix matrix = *iter.fMatrix;
             matrix.postTranslate(SkIntToScalar(-pos.x()), SkIntToScalar(-pos.y()));
-            SkIRect clipBounds = SkIRect::MakeWH(bitmap.width(), bitmap.height());
-            SkImageFilter::Cache* cache = SkImageFilter::GetExternalCache();
-            SkAutoUnref aur(NULL);
-            if (!cache) {
-                cache = SkImageFilter::Cache::Create();
-                aur.reset(cache);
-            }
-            SkImageFilter::Context ctx(matrix, clipBounds, cache);
+            const SkIRect clipBounds = bitmap.bounds();
+            SkAutoTUnref<SkImageFilter::Cache> cache(iter.fDevice->getImageFilterCache());
+            SkImageFilter::Context ctx(matrix, clipBounds, cache.get(),
+                                       SkImageFilter::kApprox_SizeConstraint);
             if (filter->filterImage(&proxy, bitmap, ctx, &dst, &offset)) {
                 SkPaint tmpUnfiltered(*paint);
-                tmpUnfiltered.setImageFilter(NULL);
+                tmpUnfiltered.setImageFilter(nullptr);
                 iter.fDevice->drawSprite(iter, dst, pos.x() + offset.x(), pos.y() + offset.y(),
                                          tmpUnfiltered);
             }
@@ -1229,6 +1460,7 @@ void SkCanvas::concat(const SkMatrix& matrix) {
         return;
     }
 
+    this->checkForDeferredSave();
     fDeviceCMDirty = true;
     fCachedLocalClipBoundsDirty = true;
     fMCRec->fMatrix.preConcat(matrix);
@@ -1237,6 +1469,7 @@ void SkCanvas::concat(const SkMatrix& matrix) {
 }
 
 void SkCanvas::setMatrix(const SkMatrix& matrix) {
+    this->checkForDeferredSave();
     fDeviceCMDirty = true;
     fCachedLocalClipBoundsDirty = true;
     fMCRec->fMatrix = matrix;
@@ -1253,6 +1486,7 @@ void SkCanvas::resetMatrix() {
 //////////////////////////////////////////////////////////////////////////////
 
 void SkCanvas::clipRect(const SkRect& rect, SkRegion::Op op, bool doAA) {
+    this->checkForDeferredSave();
     ClipEdgeStyle edgeStyle = doAA ? kSoft_ClipEdgeStyle : kHard_ClipEdgeStyle;
     this->onClipRect(rect, op, edgeStyle);
 }
@@ -1268,30 +1502,50 @@ void SkCanvas::onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle edg
             fDeviceCMDirty = true;
             fCachedLocalClipBoundsDirty = true;
 
-            fClipStack.clipEmpty();
+            fClipStack->clipEmpty();
             return fMCRec->fRasterClip.setEmpty();
         }
     }
 #endif
 
-    AutoValidateClip avc(this);
-
-    fDeviceCMDirty = true;
-    fCachedLocalClipBoundsDirty = true;
     if (!fAllowSoftClip) {
         edgeStyle = kHard_ClipEdgeStyle;
     }
 
-    if (fMCRec->fMatrix.rectStaysRect()) {
-        // for these simpler matrices, we can stay a rect even after applying
-        // the matrix. This means we don't have to a) make a path, and b) tell
-        // the region code to scan-convert the path, only to discover that it
-        // is really just a rect.
-        SkRect      r;
+    const bool rectStaysRect = fMCRec->fMatrix.rectStaysRect();
+    SkRect devR;
+    if (rectStaysRect) {
+        fMCRec->fMatrix.mapRect(&devR, rect);
+    }
 
-        fMCRec->fMatrix.mapRect(&r, rect);
-        fClipStack.clipDevRect(r, op, kSoft_ClipEdgeStyle == edgeStyle);
-        fMCRec->fRasterClip.op(r, op, kSoft_ClipEdgeStyle == edgeStyle);
+    // Check if we can quick-accept the clip call (and do nothing)
+    //
+    // TODO: investigate if a (conservative) version of this could be done in ::clipRect,
+    //       so that subclasses (like PictureRecording) didn't see unnecessary clips, which in turn
+    //       might allow lazy save/restores to eliminate entire save/restore blocks.
+    //
+    if (SkRegion::kIntersect_Op == op &&
+        kHard_ClipEdgeStyle == edgeStyle
+        && rectStaysRect)
+    {
+        if (devR.round().contains(fMCRec->fRasterClip.getBounds())) {
+#if 0
+            SkDebugf("------- ignored clipRect [%g %g %g %g]\n",
+                     rect.left(), rect.top(), rect.right(), rect.bottom());
+#endif
+            return;
+        }
+    }
+
+    AutoValidateClip avc(this);
+
+    fDeviceCMDirty = true;
+    fCachedLocalClipBoundsDirty = true;
+
+    if (rectStaysRect) {
+        const bool isAA = kSoft_ClipEdgeStyle == edgeStyle;
+        fClipStack->clipDevRect(devR, op, isAA);
+        fMCRec->fRasterClip.op(devR, this->getBaseLayerSize(), op, isAA);
     } else {
         // since we're rotated or some such thing, we convert the rect to a path
         // and clip against that, since it can handle any matrix. However, to
@@ -1304,42 +1558,13 @@ void SkCanvas::onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle edg
     }
 }
 
-static void clip_path_helper(const SkCanvas* canvas, SkRasterClip* currClip,
-                             const SkPath& devPath, SkRegion::Op op, bool doAA) {
-    // base is used to limit the size (and therefore memory allocation) of the
-    // region that results from scan converting devPath.
-    SkRegion base;
-
-    if (SkRegion::kIntersect_Op == op) {
-        // since we are intersect, we can do better (tighter) with currRgn's
-        // bounds, than just using the device. However, if currRgn is complex,
-        // our region blitter may hork, so we do that case in two steps.
-        if (currClip->isRect()) {
-            // FIXME: we should also be able to do this when currClip->isBW(),
-            // but relaxing the test above triggers GM asserts in
-            // SkRgnBuilder::blitH(). We need to investigate what's going on.
-            currClip->setPath(devPath, currClip->bwRgn(), doAA);
-        } else {
-            base.setRect(currClip->getBounds());
-            SkRasterClip clip;
-            clip.setPath(devPath, base, doAA);
-            currClip->op(clip, op);
-        }
-    } else {
-        const SkISize size = canvas->getBaseLayerSize();
-        base.setRect(0, 0, size.width(), size.height());
-
-        if (SkRegion::kReplace_Op == op) {
-            currClip->setPath(devPath, base, doAA);
-        } else {
-            SkRasterClip clip;
-            clip.setPath(devPath, base, doAA);
-            currClip->op(clip, op);
-        }
-    }
+static void rasterclip_path(SkRasterClip* rc, const SkCanvas* canvas, const SkPath& devPath,
+                            SkRegion::Op op, bool doAA) {
+    rc->op(devPath, canvas->getBaseLayerSize(), op, doAA);
 }
 
 void SkCanvas::clipRRect(const SkRRect& rrect, SkRegion::Op op, bool doAA) {
+    this->checkForDeferredSave();
     ClipEdgeStyle edgeStyle = doAA ? kSoft_ClipEdgeStyle : kHard_ClipEdgeStyle;
     if (rrect.isRect()) {
         this->onClipRect(rrect.getBounds(), op, edgeStyle);
@@ -1359,12 +1584,10 @@ void SkCanvas::onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle
             edgeStyle = kHard_ClipEdgeStyle;
         }
 
-        fClipStack.clipDevRRect(transformedRRect, op, kSoft_ClipEdgeStyle == edgeStyle);
+        fClipStack->clipDevRRect(transformedRRect, op, kSoft_ClipEdgeStyle == edgeStyle);
 
-        SkPath devPath;
-        devPath.addRRect(transformedRRect);
-
-        clip_path_helper(this, &fMCRec->fRasterClip, devPath, op, kSoft_ClipEdgeStyle == edgeStyle);
+        fMCRec->fRasterClip.op(transformedRRect, this->getBaseLayerSize(), op,
+                               kSoft_ClipEdgeStyle == edgeStyle);
         return;
     }
 
@@ -1375,13 +1598,28 @@ void SkCanvas::onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle
 }
 
 void SkCanvas::clipPath(const SkPath& path, SkRegion::Op op, bool doAA) {
+    this->checkForDeferredSave();
     ClipEdgeStyle edgeStyle = doAA ? kSoft_ClipEdgeStyle : kHard_ClipEdgeStyle;
-    SkRect r;
-    if (!path.isInverseFillType() && path.isRect(&r)) {
-        this->onClipRect(r, op, edgeStyle);
-    } else {
-        this->onClipPath(path, op, edgeStyle);
+
+    if (!path.isInverseFillType() && fMCRec->fMatrix.rectStaysRect()) {
+        SkRect r;
+        if (path.isRect(&r)) {
+            this->onClipRect(r, op, edgeStyle);
+            return;
+        }
+        SkRRect rrect;
+        if (path.isOval(&r)) {
+            rrect.setOval(r);
+            this->onClipRRect(rrect, op, edgeStyle);
+            return;
+        }
+        if (path.isRRect(&rrect)) {
+            this->onClipRRect(rrect, op, edgeStyle);
+            return;
+        }
     }
+
+    this->onClipPath(path, op, edgeStyle);
 }
 
 void SkCanvas::onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
@@ -1395,7 +1633,7 @@ void SkCanvas::onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edg
             fDeviceCMDirty = true;
             fCachedLocalClipBoundsDirty = true;
 
-            fClipStack.clipEmpty();
+            fClipStack->clipEmpty();
             return fMCRec->fRasterClip.setEmpty();
         }
     }
@@ -1423,116 +1661,22 @@ void SkCanvas::onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edg
     }
 
     // if we called path.swap() we could avoid a deep copy of this path
-    fClipStack.clipDevPath(devPath, op, kSoft_ClipEdgeStyle == edgeStyle);
+    fClipStack->clipDevPath(devPath, op, kSoft_ClipEdgeStyle == edgeStyle);
 
     if (fAllowSimplifyClip) {
-        devPath.reset();
-        devPath.setFillType(SkPath::kInverseEvenOdd_FillType);
-        const SkClipStack* clipStack = getClipStack();
-        SkClipStack::Iter iter(*clipStack, SkClipStack::Iter::kBottom_IterStart);
-        const SkClipStack::Element* element;
-        while ((element = iter.next())) {
-            SkClipStack::Element::Type type = element->getType();
-            SkPath operand;
-            if (type != SkClipStack::Element::kEmpty_Type) {
-                element->asPath(&operand);
-            }
-            SkRegion::Op elementOp = element->getOp();
-            if (elementOp == SkRegion::kReplace_Op) {
-                devPath = operand;
-            } else {
-                Op(devPath, operand, (SkPathOp) elementOp, &devPath);
-            }
-            // if the prev and curr clips disagree about aa -vs- not, favor the aa request.
-            // perhaps we need an API change to avoid this sort of mixed-signals about
-            // clipping.
-            if (element->isAA()) {
-                edgeStyle = kSoft_ClipEdgeStyle;
-            }
+        bool clipIsAA = getClipStack()->asPath(&devPath);
+        if (clipIsAA) {
+            edgeStyle = kSoft_ClipEdgeStyle;
         }
+
         op = SkRegion::kReplace_Op;
     }
 
-    clip_path_helper(this, &fMCRec->fRasterClip, devPath, op, edgeStyle);
-}
-
-void SkCanvas::updateClipConservativelyUsingBounds(const SkRect& bounds, SkRegion::Op op,
-                                                   bool inverseFilled) {
-    // This is for updating the clip conservatively using only bounds
-    // information.
-    // Contract:
-    //    The current clip must contain the true clip. The true
-    //    clip is the clip that would have normally been computed
-    //    by calls to clipPath and clipRRect
-    // Objective:
-    //    Keep the current clip as small as possible without
-    //    breaking the contract, using only clip bounding rectangles
-    //    (for performance).
-
-    // N.B.: This *never* calls back through a virtual on canvas, so subclasses
-    // don't have to worry about getting caught in a loop. Thus anywhere
-    // we call a virtual method, we explicitly prefix it with
-    // SkCanvas:: to be sure to call the base-class.
-
-    if (inverseFilled) {
-        switch (op) {
-            case SkRegion::kIntersect_Op:
-            case SkRegion::kDifference_Op:
-                // These ops can only shrink the current clip. So leaving
-                // the clip unchanged conservatively respects the contract.
-                break;
-            case SkRegion::kUnion_Op:
-            case SkRegion::kReplace_Op:
-            case SkRegion::kReverseDifference_Op:
-            case SkRegion::kXOR_Op: {
-                    // These ops can grow the current clip up to the extents of
-                    // the input clip, which is inverse filled, so we just set
-                    // the current clip to the device bounds.
-                    SkRect deviceBounds;
-                    SkIRect deviceIBounds;
-                    this->getDevice()->getGlobalBounds(&deviceIBounds);
-                    deviceBounds = SkRect::Make(deviceIBounds);
-
-                    // set the clip in device space
-                    SkMatrix savedMatrix = this->getTotalMatrix();
-                    this->SkCanvas::setMatrix(SkMatrix::I());
-                    this->SkCanvas::onClipRect(deviceBounds, SkRegion::kReplace_Op,
-                                               kHard_ClipEdgeStyle);
-                    this->setMatrix(savedMatrix);
-                    break;
-            }
-            default:
-                SkASSERT(0); // unhandled op?
-        }
-    } else {
-        // Not inverse filled
-        switch (op) {
-            case SkRegion::kIntersect_Op:
-            case SkRegion::kUnion_Op:
-            case SkRegion::kReplace_Op:
-                this->SkCanvas::onClipRect(bounds, op, kHard_ClipEdgeStyle);
-                break;
-            case SkRegion::kDifference_Op:
-                // Difference can only shrink the current clip.
-                // Leaving clip unchanged conservatively fullfills the contract.
-                break;
-            case SkRegion::kReverseDifference_Op:
-                // To reverse, we swap in the bounds with a replace op.
-                // As with difference, leave it unchanged.
-                this->SkCanvas::onClipRect(bounds, SkRegion::kReplace_Op, kHard_ClipEdgeStyle);
-                break;
-            case SkRegion::kXOR_Op:
-                // Be conservative, based on (A XOR B) always included in (A union B),
-                // which is always included in (bounds(A) union bounds(B))
-                this->SkCanvas::onClipRect(bounds, SkRegion::kUnion_Op, kHard_ClipEdgeStyle);
-                break;
-            default:
-                SkASSERT(0); // unhandled op?
-        }
-    }
+    rasterclip_path(&fMCRec->fRasterClip, this, devPath, op, edgeStyle);
 }
 
 void SkCanvas::clipRegion(const SkRegion& rgn, SkRegion::Op op) {
+    this->checkForDeferredSave();
     this->onClipRegion(rgn, op);
 }
 
@@ -1544,7 +1688,7 @@ void SkCanvas::onClipRegion(const SkRegion& rgn, SkRegion::Op op) {
 
     // todo: signal fClipStack that we have a region, and therefore (I guess)
     // we have to ignore it, and use the region directly?
-    fClipStack.clipDevRect(rgn.getBounds(), op);
+    fClipStack->clipDevRect(rgn.getBounds(), op);
 
     fMCRec->fRasterClip.op(rgn, op);
 }
@@ -1560,11 +1704,11 @@ void SkCanvas::validateClip() const {
 
     SkIRect ir;
     ir.set(0, 0, device->width(), device->height());
-    SkRasterClip tmpClip(ir);
+    SkRasterClip tmpClip(ir, fConservativeRasterClip);
 
-    SkClipStack::B2TIter                iter(fClipStack);
+    SkClipStack::B2TIter                iter(*fClipStack);
     const SkClipStack::Element* element;
-    while ((element = iter.next()) != NULL) {
+    while ((element = iter.next()) != nullptr) {
         switch (element->getType()) {
             case SkClipStack::Element::kRect_Type:
                 element->getRect().round(&ir);
@@ -1576,7 +1720,7 @@ void SkCanvas::validateClip() const {
             default: {
                 SkPath path;
                 element->asPath(&path);
-                clip_path_helper(this, &tmpClip, path, element->getOp(), element->isAA());
+                rasterclip_path(&tmpClip, this, path, element->getOp(), element->isAA());
                 break;
             }
         }
@@ -1585,10 +1729,10 @@ void SkCanvas::validateClip() const {
 #endif
 
 void SkCanvas::replayClips(ClipVisitor* visitor) const {
-    SkClipStack::B2TIter                iter(fClipStack);
+    SkClipStack::B2TIter                iter(*fClipStack);
     const SkClipStack::Element*         element;
 
-    while ((element = iter.next()) != NULL) {
+    while ((element = iter.next()) != nullptr) {
         element->replay(visitor);
     }
 }
@@ -1604,7 +1748,6 @@ bool SkCanvas::isClipRect() const {
 }
 
 bool SkCanvas::quickReject(const SkRect& rect) const {
-
     if (!rect.isFinite())
         return true;
 
@@ -1615,9 +1758,7 @@ bool SkCanvas::quickReject(const SkRect& rect) const {
     if (fMCRec->fMatrix.hasPerspective()) {
         SkRect dst;
         fMCRec->fMatrix.mapRect(&dst, rect);
-        SkIRect idst;
-        dst.roundOut(&idst);
-        return !SkIRect::Intersects(idst, fMCRec->fRasterClip.getBounds());
+        return !SkIRect::Intersects(dst.roundOut(), fMCRec->fRasterClip.getBounds());
     } else {
         const SkRect& clipR = this->getLocalClipBounds();
 
@@ -1652,7 +1793,7 @@ bool SkCanvas::getClipBounds(SkRect* bounds) const {
         return false;
     }
 
-    if (NULL != bounds) {
+    if (bounds) {
         SkRect r;
         // adjust it outwards in case we are antialiasing
         const int inset = 1;
@@ -1673,7 +1814,7 @@ bool SkCanvas::getClipDeviceBounds(SkIRect* bounds) const {
         return false;
     }
 
-    if (NULL != bounds) {
+    if (bounds) {
         *bounds = clip.getBounds();
     }
     return true;
@@ -1683,59 +1824,33 @@ const SkMatrix& SkCanvas::getTotalMatrix() const {
     return fMCRec->fMatrix;
 }
 
-#ifdef SK_SUPPORT_LEGACY_GETCLIPTYPE
-SkCanvas::ClipType SkCanvas::getClipType() const {
-    if (fMCRec->fRasterClip.isEmpty()) {
-        return kEmpty_ClipType;
-    }
-    if (fMCRec->fRasterClip.isRect()) {
-        return kRect_ClipType;
-    }
-    return kComplex_ClipType;
-}
-#endif
-
 const SkRegion& SkCanvas::internal_private_getTotalClip() const {
     return fMCRec->fRasterClip.forceGetBW();
 }
 
-void SkCanvas::internal_private_getTotalClipAsPath(SkPath* path) const {
-    path->reset();
-
-    const SkRegion& rgn = fMCRec->fRasterClip.forceGetBW();
-    if (rgn.isEmpty()) {
-        return;
-    }
-    (void)rgn.getBoundaryPath(path);
-}
-
 GrRenderTarget* SkCanvas::internal_private_accessTopLayerRenderTarget() {
     SkBaseDevice* dev = this->getTopDevice();
-    return dev ? dev->accessRenderTarget() : NULL;
-}
-
-SkBaseDevice* SkCanvas::createLayerDevice(const SkImageInfo& info) {
-    SkBaseDevice* device = this->getTopDevice();
-    return device ? device->createCompatibleDeviceForSaveLayer(info) : NULL;
+    return dev ? dev->accessRenderTarget() : nullptr;
 }
 
 GrContext* SkCanvas::getGrContext() {
 #if SK_SUPPORT_GPU
     SkBaseDevice* device = this->getTopDevice();
-    if (NULL != device) {
+    if (device) {
         GrRenderTarget* renderTarget = device->accessRenderTarget();
-        if (NULL != renderTarget) {
+        if (renderTarget) {
             return renderTarget->getContext();
         }
     }
 #endif
 
-    return NULL;
+    return nullptr;
 
 }
 
 void SkCanvas::drawDRRect(const SkRRect& outer, const SkRRect& inner,
                           const SkPaint& paint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawDRRect()");
     if (outer.isEmpty()) {
         return;
     }
@@ -1754,30 +1869,165 @@ void SkCanvas::drawDRRect(const SkRRect& outer, const SkRRect& inner,
     this->onDrawDRRect(outer, inner, paint);
 }
 
+// These need to stop being virtual -- clients need to override the onDraw... versions
+
+void SkCanvas::drawPaint(const SkPaint& paint) {
+    this->onDrawPaint(paint);
+}
+
+void SkCanvas::drawRect(const SkRect& r, const SkPaint& paint) {
+    this->onDrawRect(r, paint);
+}
+
+void SkCanvas::drawOval(const SkRect& r, const SkPaint& paint) {
+    this->onDrawOval(r, paint);
+}
+
+void SkCanvas::drawRRect(const SkRRect& rrect, const SkPaint& paint) {
+    this->onDrawRRect(rrect, paint);
+}
+
+void SkCanvas::drawPoints(PointMode mode, size_t count, const SkPoint pts[], const SkPaint& paint) {
+    this->onDrawPoints(mode, count, pts, paint);
+}
+
+void SkCanvas::drawVertices(VertexMode vmode, int vertexCount, const SkPoint vertices[],
+                            const SkPoint texs[], const SkColor colors[], SkXfermode* xmode,
+                            const uint16_t indices[], int indexCount, const SkPaint& paint) {
+    this->onDrawVertices(vmode, vertexCount, vertices, texs, colors, xmode,
+                         indices, indexCount, paint);
+}
+
+void SkCanvas::drawPath(const SkPath& path, const SkPaint& paint) {
+    this->onDrawPath(path, paint);
+}
+
+void SkCanvas::drawImage(const SkImage* image, SkScalar x, SkScalar y, const SkPaint* paint) {
+    this->onDrawImage(image, x, y, paint);
+}
+
+void SkCanvas::drawImageRect(const SkImage* image, const SkRect& src, const SkRect& dst,
+                             const SkPaint* paint, SrcRectConstraint constraint) {
+    if (dst.isEmpty() || src.isEmpty()) {
+        return;
+    }
+    this->onDrawImageRect(image, &src, dst, paint, constraint);
+}
+
+void SkCanvas::drawImageRect(const SkImage* image, const SkIRect& isrc, const SkRect& dst,
+                             const SkPaint* paint, SrcRectConstraint constraint) {
+    this->drawImageRect(image, SkRect::Make(isrc), dst, paint, constraint);
+}
+
+void SkCanvas::drawImageRect(const SkImage* image, const SkRect& dst, const SkPaint* paint,
+                             SrcRectConstraint constraint) {
+    this->drawImageRect(image, SkRect::MakeIWH(image->width(), image->height()), dst, paint,
+                        constraint);
+}
+
+void SkCanvas::drawImageNine(const SkImage* image, const SkIRect& center, const SkRect& dst,
+                             const SkPaint* paint) {
+    if (dst.isEmpty()) {
+        return;
+    }
+    if (!SkNinePatchIter::Valid(image->width(), image->height(), center)) {
+        this->drawImageRect(image, dst, paint);
+    }
+    this->onDrawImageNine(image, center, dst, paint);
+}
+
+void SkCanvas::drawBitmap(const SkBitmap& bitmap, SkScalar dx, SkScalar dy, const SkPaint* paint) {
+    if (bitmap.drawsNothing()) {
+        return;
+    }
+    this->onDrawBitmap(bitmap, dx, dy, paint);
+}
+
+void SkCanvas::drawBitmapRect(const SkBitmap& bitmap, const SkRect& src, const SkRect& dst,
+                              const SkPaint* paint, SrcRectConstraint constraint) {
+    if (bitmap.drawsNothing() || dst.isEmpty() || src.isEmpty()) {
+        return;
+    }
+    this->onDrawBitmapRect(bitmap, &src, dst, paint, constraint);
+}
+
+void SkCanvas::drawBitmapRect(const SkBitmap& bitmap, const SkIRect& isrc, const SkRect& dst,
+                              const SkPaint* paint, SrcRectConstraint constraint) {
+    this->drawBitmapRect(bitmap, SkRect::Make(isrc), dst, paint, constraint);
+}
+
+void SkCanvas::drawBitmapRect(const SkBitmap& bitmap, const SkRect& dst, const SkPaint* paint,
+                              SrcRectConstraint constraint) {
+    this->drawBitmapRect(bitmap, SkRect::MakeIWH(bitmap.width(), bitmap.height()), dst, paint,
+                         constraint);
+}
+
+void SkCanvas::drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center, const SkRect& dst,
+                              const SkPaint* paint) {
+    if (bitmap.drawsNothing() || dst.isEmpty()) {
+        return;
+    }
+    if (!SkNinePatchIter::Valid(bitmap.width(), bitmap.height(), center)) {
+        this->drawBitmapRect(bitmap, dst, paint);
+    }
+    this->onDrawBitmapNine(bitmap, center, dst, paint);
+}
+
+void SkCanvas::drawSprite(const SkBitmap& bitmap, int left, int top, const SkPaint* paint) {
+    if (bitmap.drawsNothing()) {
+        return;
+    }
+    this->onDrawSprite(bitmap, left, top, paint);
+}
+
+void SkCanvas::drawAtlas(const SkImage* atlas, const SkRSXform xform[], const SkRect tex[],
+                         const SkColor colors[], int count, SkXfermode::Mode mode,
+                         const SkRect* cull, const SkPaint* paint) {
+    if (count <= 0) {
+        return;
+    }
+    SkASSERT(atlas);
+    SkASSERT(xform);
+    SkASSERT(tex);
+    this->onDrawAtlas(atlas, xform, tex, colors, count, mode, cull, paint);
+}
+
+void SkCanvas::legacy_drawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
+                                    const SkPaint* paint, SrcRectConstraint constraint) {
+    if (src) {
+        this->drawImageRect(image, *src, dst, paint, constraint);
+    } else {
+        this->drawImageRect(image, SkRect::MakeIWH(image->width(), image->height()),
+                            dst, paint, constraint);
+    }
+}
+void SkCanvas::legacy_drawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst,
+                                     const SkPaint* paint, SrcRectConstraint constraint) {
+    if (src) {
+        this->drawBitmapRect(bitmap, *src, dst, paint, constraint);
+    } else {
+        this->drawBitmapRect(bitmap, SkRect::MakeIWH(bitmap.width(), bitmap.height()),
+                             dst, paint, constraint);
+    }
+}
+
 //////////////////////////////////////////////////////////////////////////////
 //  These are the virtual drawing methods
 //////////////////////////////////////////////////////////////////////////////
 
-void SkCanvas::clear(SkColor color) {
-    SkDrawIter  iter(this);
-    this->predrawNotify();
-    while (iter.next()) {
-        iter.fDevice->clear(color);
-    }
-}
-
 void SkCanvas::onDiscard() {
-    if (NULL != fSurfaceBase) {
+    if (fSurfaceBase) {
         fSurfaceBase->aboutToDraw(SkSurface::kDiscard_ContentChangeMode);
     }
 }
 
-void SkCanvas::drawPaint(const SkPaint& paint) {
+void SkCanvas::onDrawPaint(const SkPaint& paint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawPaint()");
     this->internalDrawPaint(paint);
 }
 
 void SkCanvas::internalDrawPaint(const SkPaint& paint) {
-    LOOPER_BEGIN(paint, SkDrawFilter::kPaint_Type, NULL)
+    LOOPER_BEGIN_CHECK_COMPLETE_OVERWRITE(paint, SkDrawFilter::kPaint_Type, nullptr, false)
 
     while (iter.next()) {
         iter.fDevice->drawPaint(iter, looper.paint());
@@ -1786,14 +2036,15 @@ void SkCanvas::internalDrawPaint(const SkPaint& paint) {
     LOOPER_END
 }
 
-void SkCanvas::drawPoints(PointMode mode, size_t count, const SkPoint pts[],
-                          const SkPaint& paint) {
+void SkCanvas::onDrawPoints(PointMode mode, size_t count, const SkPoint pts[],
+                            const SkPaint& paint) {
+    TRACE_EVENT1("disabled-by-default-skia", "SkCanvas::drawPoints()", "count", static_cast<uint64_t>(count));
     if ((long)count <= 0) {
         return;
     }
 
     SkRect r, storage;
-    const SkRect* bounds = NULL;
+    const SkRect* bounds = nullptr;
     if (paint.canComputeFastBounds()) {
         // special-case 2 points (common for drawing a single line)
         if (2 == count) {
@@ -1801,13 +2052,13 @@ void SkCanvas::drawPoints(PointMode mode, size_t count, const SkPoint pts[],
         } else {
             r.set(pts, SkToInt(count));
         }
-        bounds = &paint.computeFastStrokeBounds(r, &storage);
-        if (this->quickReject(*bounds)) {
+        if (this->quickReject(paint.computeFastStrokeBounds(r, &storage))) {
             return;
         }
+        bounds = &r;
     }
 
-    SkASSERT(pts != NULL);
+    SkASSERT(pts != nullptr);
 
     LOOPER_BEGIN(paint, SkDrawFilter::kPoint_Type, bounds)
 
@@ -1818,17 +2069,23 @@ void SkCanvas::drawPoints(PointMode mode, size_t count, const SkPoint pts[],
     LOOPER_END
 }
 
-void SkCanvas::drawRect(const SkRect& r, const SkPaint& paint) {
+void SkCanvas::onDrawRect(const SkRect& r, const SkPaint& paint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawRect()");
     SkRect storage;
-    const SkRect* bounds = NULL;
+    const SkRect* bounds = nullptr;
     if (paint.canComputeFastBounds()) {
-        bounds = &paint.computeFastBounds(r, &storage);
-        if (this->quickReject(*bounds)) {
+        // Skia will draw an inverted rect, because it explicitly "sorts" it downstream.
+        // To prevent accidental rejecting at this stage, we have to sort it before we check.
+        SkRect tmp(r);
+        tmp.sort();
+
+        if (this->quickReject(paint.computeFastBounds(tmp, &storage))) {
             return;
         }
+        bounds = &r;
     }
 
-    LOOPER_BEGIN(paint, SkDrawFilter::kRect_Type, bounds)
+    LOOPER_BEGIN_CHECK_COMPLETE_OVERWRITE(paint, SkDrawFilter::kRect_Type, bounds, false)
 
     while (iter.next()) {
         iter.fDevice->drawRect(iter, r, looper.paint());
@@ -1837,14 +2094,15 @@ void SkCanvas::drawRect(const SkRect& r, const SkPaint& paint) {
     LOOPER_END
 }
 
-void SkCanvas::drawOval(const SkRect& oval, const SkPaint& paint) {
+void SkCanvas::onDrawOval(const SkRect& oval, const SkPaint& paint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawOval()");
     SkRect storage;
-    const SkRect* bounds = NULL;
+    const SkRect* bounds = nullptr;
     if (paint.canComputeFastBounds()) {
-        bounds = &paint.computeFastBounds(oval, &storage);
-        if (this->quickReject(*bounds)) {
+        if (this->quickReject(paint.computeFastBounds(oval, &storage))) {
             return;
         }
+        bounds = &oval;
     }
 
     LOOPER_BEGIN(paint, SkDrawFilter::kOval_Type, bounds)
@@ -1856,14 +2114,15 @@ void SkCanvas::drawOval(const SkRect& oval, const SkPaint& paint) {
     LOOPER_END
 }
 
-void SkCanvas::drawRRect(const SkRRect& rrect, const SkPaint& paint) {
+void SkCanvas::onDrawRRect(const SkRRect& rrect, const SkPaint& paint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawRRect()");
     SkRect storage;
-    const SkRect* bounds = NULL;
+    const SkRect* bounds = nullptr;
     if (paint.canComputeFastBounds()) {
-        bounds = &paint.computeFastBounds(rrect.getBounds(), &storage);
-        if (this->quickReject(*bounds)) {
+        if (this->quickReject(paint.computeFastBounds(rrect.getBounds(), &storage))) {
             return;
         }
+        bounds = &rrect.getBounds();
     }
 
     if (rrect.isRect()) {
@@ -1888,12 +2147,12 @@ void SkCanvas::drawRRect(const SkRRect& rrect, const SkPaint& paint) {
 void SkCanvas::onDrawDRRect(const SkRRect& outer, const SkRRect& inner,
                             const SkPaint& paint) {
     SkRect storage;
-    const SkRect* bounds = NULL;
+    const SkRect* bounds = nullptr;
     if (paint.canComputeFastBounds()) {
-        bounds = &paint.computeFastBounds(outer.getBounds(), &storage);
-        if (this->quickReject(*bounds)) {
+        if (this->quickReject(paint.computeFastBounds(outer.getBounds(), &storage))) {
             return;
         }
+        bounds = &outer.getBounds();
     }
 
     LOOPER_BEGIN(paint, SkDrawFilter::kRRect_Type, bounds)
@@ -1905,27 +2164,28 @@ void SkCanvas::onDrawDRRect(const SkRRect& outer, const SkRRect& inner,
     LOOPER_END
 }
 
-void SkCanvas::drawPath(const SkPath& path, const SkPaint& paint) {
+void SkCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawPath()");
     if (!path.isFinite()) {
         return;
     }
 
     SkRect storage;
-    const SkRect* bounds = NULL;
+    const SkRect* bounds = nullptr;
     if (!path.isInverseFillType() && paint.canComputeFastBounds()) {
         const SkRect& pathBounds = path.getBounds();
-        bounds = &paint.computeFastBounds(pathBounds, &storage);
-        if (this->quickReject(*bounds)) {
+        if (this->quickReject(paint.computeFastBounds(pathBounds, &storage))) {
             return;
         }
+        bounds = &pathBounds;
     }
 
     const SkRect& r = path.getBounds();
     if (r.width() <= 0 && r.height() <= 0) {
         if (path.isInverseFillType()) {
             this->internalDrawPaint(paint);
+            return;
         }
-        return;
     }
 
     LOOPER_BEGIN(paint, SkDrawFilter::kPath_Type, bounds)
@@ -1937,161 +2197,197 @@ void SkCanvas::drawPath(const SkPath& path, const SkPaint& paint) {
     LOOPER_END
 }
 
-void SkCanvas::drawBitmap(const SkBitmap& bitmap, SkScalar x, SkScalar y,
-                          const SkPaint* paint) {
-    SkDEBUGCODE(bitmap.validate();)
-
-    if (NULL == paint || paint->canComputeFastBounds()) {
-        SkRect bounds = {
-            x, y,
-            x + SkIntToScalar(bitmap.width()),
-            y + SkIntToScalar(bitmap.height())
-        };
+void SkCanvas::onDrawImage(const SkImage* image, SkScalar x, SkScalar y, const SkPaint* paint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawImage()");
+    SkRect bounds = SkRect::MakeXYWH(x, y,
+                                     SkIntToScalar(image->width()), SkIntToScalar(image->height()));
+    if (nullptr == paint || paint->canComputeFastBounds()) {
+        SkRect tmp = bounds;
         if (paint) {
-            (void)paint->computeFastBounds(bounds, &bounds);
+            paint->computeFastBounds(tmp, &tmp);
         }
-        if (this->quickReject(bounds)) {
+        if (this->quickReject(tmp)) {
             return;
         }
     }
+    
+    SkLazyPaint lazy;
+    if (nullptr == paint) {
+        paint = lazy.init();
+    }
+    
+    LOOPER_BEGIN(*paint, SkDrawFilter::kBitmap_Type, &bounds)
+    
+    while (iter.next()) {
+        iter.fDevice->drawImage(iter, image, x, y, looper.paint());
+    }
+    
+    LOOPER_END
+}
 
-    SkMatrix matrix;
-    matrix.setTranslate(x, y);
-    this->internalDrawBitmap(bitmap, matrix, paint);
+void SkCanvas::onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
+                               const SkPaint* paint, SrcRectConstraint constraint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawImageRect()");
+    SkRect storage;
+    const SkRect* bounds = &dst;
+    if (nullptr == paint || paint->canComputeFastBounds()) {
+        storage = dst;
+        if (paint) {
+            paint->computeFastBounds(dst, &storage);
+        }
+        if (this->quickReject(storage)) {
+            return;
+        }
+    }
+    SkLazyPaint lazy;
+    if (nullptr == paint) {
+        paint = lazy.init();
+    }
+    
+    LOOPER_BEGIN_CHECK_COMPLETE_OVERWRITE(*paint, SkDrawFilter::kBitmap_Type, bounds,
+                                          image->isOpaque())
+    
+    while (iter.next()) {
+        iter.fDevice->drawImageRect(iter, image, src, dst, looper.paint(), constraint);
+    }
+    
+    LOOPER_END
+}
+
+void SkCanvas::onDrawBitmap(const SkBitmap& bitmap, SkScalar x, SkScalar y, const SkPaint* paint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawBitmap()");
+    SkDEBUGCODE(bitmap.validate();)
+
+    if (bitmap.drawsNothing()) {
+        return;
+    }
+
+    SkLazyPaint lazy;
+    if (nullptr == paint) {
+        paint = lazy.init();
+    }
+
+    const SkMatrix matrix = SkMatrix::MakeTrans(x, y);
+
+    SkRect storage;
+    const SkRect* bounds = nullptr;
+    if (paint->canComputeFastBounds()) {
+        bitmap.getBounds(&storage);
+        matrix.mapRect(&storage);
+        SkRect tmp = storage;
+        if (this->quickReject(paint->computeFastBounds(tmp, &tmp))) {
+            return;
+        }
+        bounds = &storage;
+    }
+
+    LOOPER_BEGIN(*paint, SkDrawFilter::kBitmap_Type, bounds)
+
+    while (iter.next()) {
+        iter.fDevice->drawBitmap(iter, bitmap, matrix, looper.paint());
+    }
+    
+    LOOPER_END
 }
 
 // this one is non-virtual, so it can be called safely by other canvas apis
 void SkCanvas::internalDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src,
                                       const SkRect& dst, const SkPaint* paint,
-                                      DrawBitmapRectFlags flags) {
+                                      SrcRectConstraint constraint) {
     if (bitmap.drawsNothing() || dst.isEmpty()) {
         return;
     }
 
     SkRect storage;
     const SkRect* bounds = &dst;
-    if (NULL == paint || paint->canComputeFastBounds()) {
-        if (paint) {
-            bounds = &paint->computeFastBounds(dst, &storage);
-        }
-        if (this->quickReject(*bounds)) {
+    if (nullptr == paint || paint->canComputeFastBounds()) {
+        if (this->quickReject(paint ? paint->computeFastBounds(dst, &storage) : dst)) {
             return;
         }
     }
 
     SkLazyPaint lazy;
-    if (NULL == paint) {
+    if (nullptr == paint) {
         paint = lazy.init();
     }
 
-    LOOPER_BEGIN(*paint, SkDrawFilter::kBitmap_Type, bounds)
+    LOOPER_BEGIN_CHECK_COMPLETE_OVERWRITE(*paint, SkDrawFilter::kBitmap_Type, bounds,
+                                          bitmap.isOpaque())
 
     while (iter.next()) {
-        iter.fDevice->drawBitmapRect(iter, bitmap, src, dst, looper.paint(), flags);
+        iter.fDevice->drawBitmapRect(iter, bitmap, src, dst, looper.paint(), constraint);
     }
 
     LOOPER_END
 }
 
-void SkCanvas::drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src,
-                                    const SkRect& dst, const SkPaint* paint,
-                                    DrawBitmapRectFlags flags) {
+void SkCanvas::onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst,
+                                const SkPaint* paint, SrcRectConstraint constraint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawBitmapRectToRect()");
     SkDEBUGCODE(bitmap.validate();)
-    this->internalDrawBitmapRect(bitmap, src, dst, paint, flags);
+    this->internalDrawBitmapRect(bitmap, src, dst, paint, constraint);
 }
 
-void SkCanvas::drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& matrix,
-                                const SkPaint* paint) {
-    SkDEBUGCODE(bitmap.validate();)
-    this->internalDrawBitmap(bitmap, matrix, paint);
-}
-
-void SkCanvas::internalDrawBitmapNine(const SkBitmap& bitmap,
-                                      const SkIRect& center, const SkRect& dst,
-                                      const SkPaint* paint) {
-    if (bitmap.drawsNothing()) {
-        return;
-    }
-    if (NULL == paint || paint->canComputeFastBounds()) {
-        SkRect storage;
-        const SkRect* bounds = &dst;
-        if (paint) {
-            bounds = &paint->computeFastBounds(dst, &storage);
-        }
-        if (this->quickReject(*bounds)) {
+void SkCanvas::onDrawImageNine(const SkImage* image, const SkIRect& center, const SkRect& dst,
+                               const SkPaint* paint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawImageNine()");
+    
+    SkRect storage;
+    const SkRect* bounds = &dst;
+    if (nullptr == paint || paint->canComputeFastBounds()) {
+        if (this->quickReject(paint ? paint->computeFastBounds(dst, &storage) : dst)) {
             return;
         }
     }
-
-    const int32_t w = bitmap.width();
-    const int32_t h = bitmap.height();
-
-    SkIRect c = center;
-    // pin center to the bounds of the bitmap
-    c.fLeft = SkMax32(0, center.fLeft);
-    c.fTop = SkMax32(0, center.fTop);
-    c.fRight = SkPin32(center.fRight, c.fLeft, w);
-    c.fBottom = SkPin32(center.fBottom, c.fTop, h);
-
-    const SkScalar srcX[4] = {
-        0, SkIntToScalar(c.fLeft), SkIntToScalar(c.fRight), SkIntToScalar(w)
-    };
-    const SkScalar srcY[4] = {
-        0, SkIntToScalar(c.fTop), SkIntToScalar(c.fBottom), SkIntToScalar(h)
-    };
-    SkScalar dstX[4] = {
-        dst.fLeft, dst.fLeft + SkIntToScalar(c.fLeft),
-        dst.fRight - SkIntToScalar(w - c.fRight), dst.fRight
-    };
-    SkScalar dstY[4] = {
-        dst.fTop, dst.fTop + SkIntToScalar(c.fTop),
-        dst.fBottom - SkIntToScalar(h - c.fBottom), dst.fBottom
-    };
-
-    if (dstX[1] > dstX[2]) {
-        dstX[1] = dstX[0] + (dstX[3] - dstX[0]) * c.fLeft / (w - c.width());
-        dstX[2] = dstX[1];
+    
+    SkLazyPaint lazy;
+    if (nullptr == paint) {
+        paint = lazy.init();
     }
-
-    if (dstY[1] > dstY[2]) {
-        dstY[1] = dstY[0] + (dstY[3] - dstY[0]) * c.fTop / (h - c.height());
-        dstY[2] = dstY[1];
-    }
-
-    for (int y = 0; y < 3; y++) {
-        SkRect s, d;
-
-        s.fTop = srcY[y];
-        s.fBottom = srcY[y+1];
-        d.fTop = dstY[y];
-        d.fBottom = dstY[y+1];
-        for (int x = 0; x < 3; x++) {
-            s.fLeft = srcX[x];
-            s.fRight = srcX[x+1];
-            d.fLeft = dstX[x];
-            d.fRight = dstX[x+1];
-            this->internalDrawBitmapRect(bitmap, &s, d, paint,
-                                         kNone_DrawBitmapRectFlag);
-        }
+    
+    LOOPER_BEGIN(*paint, SkDrawFilter::kBitmap_Type, bounds)
+    
+    while (iter.next()) {
+        iter.fDevice->drawImageNine(iter, image, center, dst, looper.paint());
     }
+    
+    LOOPER_END
 }
 
-void SkCanvas::drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
-                              const SkRect& dst, const SkPaint* paint) {
+void SkCanvas::onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center, const SkRect& dst,
+                                const SkPaint* paint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawBitmapNine()");
     SkDEBUGCODE(bitmap.validate();)
 
-    // Need a device entry-point, so gpu can use a mesh
-    this->internalDrawBitmapNine(bitmap, center, dst, paint);
+    SkRect storage;
+    const SkRect* bounds = &dst;
+    if (nullptr == paint || paint->canComputeFastBounds()) {
+        if (this->quickReject(paint ? paint->computeFastBounds(dst, &storage) : dst)) {
+            return;
+        }
+    }
+    
+    SkLazyPaint lazy;
+    if (nullptr == paint) {
+        paint = lazy.init();
+    }
+    
+    LOOPER_BEGIN(*paint, SkDrawFilter::kBitmap_Type, bounds)
+    
+    while (iter.next()) {
+        iter.fDevice->drawBitmapNine(iter, bitmap, center, dst, looper.paint());
+    }
+    
+    LOOPER_END
 }
 
 class SkDeviceFilteredPaint {
 public:
     SkDeviceFilteredPaint(SkBaseDevice* device, const SkPaint& paint) {
-        SkBaseDevice::TextFlags flags;
-        if (device->filterTextFlags(paint, &flags)) {
+        uint32_t filteredFlags = device->filterTextFlags(paint);
+        if (filteredFlags != paint.getFlags()) {
             SkPaint* newPaint = fLazy.set(paint);
-            newPaint->setFlags(flags.fFlags);
-            newPaint->setHinting(flags.fHinting);
+            newPaint->setFlags(filteredFlags);
             fPaint = newPaint;
         } else {
             fPaint = &paint;
@@ -2119,12 +2415,12 @@ void SkCanvas::DrawRect(const SkDraw& draw, const SkPaint& paint,
 void SkCanvas::DrawTextDecorations(const SkDraw& draw, const SkPaint& paint,
                                    const char text[], size_t byteLength,
                                    SkScalar x, SkScalar y) {
-    SkASSERT(byteLength == 0 || text != NULL);
+    SkASSERT(byteLength == 0 || text != nullptr);
 
     // nothing to draw
-    if (text == NULL || byteLength == 0 ||
+    if (text == nullptr || byteLength == 0 ||
         draw.fClip->isEmpty() ||
-        (paint.getAlpha() == 0 && paint.getXfermode() == NULL)) {
+        (paint.getAlpha() == 0 && paint.getXfermode() == nullptr)) {
         return;
     }
 
@@ -2179,7 +2475,7 @@ void SkCanvas::DrawTextDecorations(const SkDraw& draw, const SkPaint& paint,
 
 void SkCanvas::onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
                           const SkPaint& paint) {
-    LOOPER_BEGIN(paint, SkDrawFilter::kText_Type, NULL)
+    LOOPER_BEGIN(paint, SkDrawFilter::kText_Type, nullptr)
 
     while (iter.next()) {
         SkDeviceFilteredPaint dfp(iter.fDevice, looper.paint());
@@ -2193,11 +2489,13 @@ void SkCanvas::onDrawText(const void* text, size_t byteLength, SkScalar x, SkSca
 
 void SkCanvas::onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
                              const SkPaint& paint) {
-    LOOPER_BEGIN(paint, SkDrawFilter::kText_Type, NULL)
+    SkPoint textOffset = SkPoint::Make(0, 0);
+
+    LOOPER_BEGIN(paint, SkDrawFilter::kText_Type, nullptr)
 
     while (iter.next()) {
         SkDeviceFilteredPaint dfp(iter.fDevice, looper.paint());
-        iter.fDevice->drawPosText(iter, text, byteLength, &pos->fX, 0, 2,
+        iter.fDevice->drawPosText(iter, text, byteLength, &pos->fX, 2, textOffset,
                                   dfp.paint());
     }
 
@@ -2206,11 +2504,14 @@ void SkCanvas::onDrawPosText(const void* text, size_t byteLength, const SkPoint
 
 void SkCanvas::onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
                               SkScalar constY, const SkPaint& paint) {
-    LOOPER_BEGIN(paint, SkDrawFilter::kText_Type, NULL)
+
+    SkPoint textOffset = SkPoint::Make(0, constY);
+
+    LOOPER_BEGIN(paint, SkDrawFilter::kText_Type, nullptr)
 
     while (iter.next()) {
         SkDeviceFilteredPaint dfp(iter.fDevice, looper.paint());
-        iter.fDevice->drawPosText(iter, text, byteLength, xpos, constY, 1,
+        iter.fDevice->drawPosText(iter, text, byteLength, xpos, 1, textOffset,
                                   dfp.paint());
     }
 
@@ -2219,7 +2520,7 @@ void SkCanvas::onDrawPosTextH(const void* text, size_t byteLength, const SkScala
 
 void SkCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
                                 const SkMatrix* matrix, const SkPaint& paint) {
-    LOOPER_BEGIN(paint, SkDrawFilter::kText_Type, NULL)
+    LOOPER_BEGIN(paint, SkDrawFilter::kText_Type, nullptr)
 
     while (iter.next()) {
         iter.fDevice->drawTextOnPath(iter, text, byteLength, path,
@@ -2229,30 +2530,73 @@ void SkCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const SkPat
     LOOPER_END
 }
 
+void SkCanvas::onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
+                              const SkPaint& paint) {
+
+    SkRect storage;
+    const SkRect* bounds = nullptr;
+    if (paint.canComputeFastBounds()) {
+        storage = blob->bounds().makeOffset(x, y);
+        SkRect tmp;
+        if (this->quickReject(paint.computeFastBounds(storage, &tmp))) {
+            return;
+        }
+        bounds = &storage;
+    }
+
+    // We cannot filter in the looper as we normally do, because the paint is
+    // incomplete at this point (text-related attributes are embedded within blob run paints).
+    SkDrawFilter* drawFilter = fMCRec->fFilter;
+    fMCRec->fFilter = nullptr;
+
+    LOOPER_BEGIN(paint, SkDrawFilter::kText_Type, bounds)
+
+    while (iter.next()) {
+        SkDeviceFilteredPaint dfp(iter.fDevice, looper.paint());
+        iter.fDevice->drawTextBlob(iter, blob, x, y, dfp.paint(), drawFilter);
+    }
+
+    LOOPER_END
+
+    fMCRec->fFilter = drawFilter;
+}
+
 // These will become non-virtual, so they always call the (virtual) onDraw... method
 void SkCanvas::drawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
                         const SkPaint& paint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawText()");
     this->onDrawText(text, byteLength, x, y, paint);
 }
 void SkCanvas::drawPosText(const void* text, size_t byteLength, const SkPoint pos[],
                            const SkPaint& paint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawPosText()");
     this->onDrawPosText(text, byteLength, pos, paint);
 }
 void SkCanvas::drawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
                             SkScalar constY, const SkPaint& paint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawPosTextH()");
     this->onDrawPosTextH(text, byteLength, xpos, constY, paint);
 }
 void SkCanvas::drawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
                               const SkMatrix* matrix, const SkPaint& paint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawTextOnPath()");
     this->onDrawTextOnPath(text, byteLength, path, matrix, paint);
 }
-
-void SkCanvas::drawVertices(VertexMode vmode, int vertexCount,
-                            const SkPoint verts[], const SkPoint texs[],
-                            const SkColor colors[], SkXfermode* xmode,
-                            const uint16_t indices[], int indexCount,
+void SkCanvas::drawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
                             const SkPaint& paint) {
-    LOOPER_BEGIN(paint, SkDrawFilter::kPath_Type, NULL)
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawTextBlob()");
+    if (blob) {
+        this->onDrawTextBlob(blob, x, y, paint);
+    }
+}
+
+void SkCanvas::onDrawVertices(VertexMode vmode, int vertexCount,
+                              const SkPoint verts[], const SkPoint texs[],
+                              const SkColor colors[], SkXfermode* xmode,
+                              const uint16_t indices[], int indexCount,
+                              const SkPaint& paint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawVertices()");
+    LOOPER_BEGIN(paint, SkDrawFilter::kPath_Type, nullptr)
 
     while (iter.next()) {
         iter.fDevice->drawVertices(iter, vmode, vertexCount, verts, texs,
@@ -2263,6 +2607,86 @@ void SkCanvas::drawVertices(VertexMode vmode, int vertexCount,
     LOOPER_END
 }
 
+void SkCanvas::drawPatch(const SkPoint cubics[12], const SkColor colors[4],
+                         const SkPoint texCoords[4], SkXfermode* xmode, const SkPaint& paint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawPatch()");
+    if (nullptr == cubics) {
+        return;
+    }
+
+    // Since a patch is always within the convex hull of the control points, we discard it when its
+    // bounding rectangle is completely outside the current clip.
+    SkRect bounds;
+    bounds.set(cubics, SkPatchUtils::kNumCtrlPts);
+    if (this->quickReject(bounds)) {
+        return;
+    }
+
+    this->onDrawPatch(cubics, colors, texCoords, xmode, paint);
+}
+
+void SkCanvas::onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
+                           const SkPoint texCoords[4], SkXfermode* xmode, const SkPaint& paint) {
+
+    LOOPER_BEGIN(paint, SkDrawFilter::kPath_Type, nullptr)
+
+    while (iter.next()) {
+        iter.fDevice->drawPatch(iter, cubics, colors, texCoords, xmode, paint);
+    }
+
+    LOOPER_END
+}
+
+void SkCanvas::drawDrawable(SkDrawable* dr, SkScalar x, SkScalar y) {
+    if (dr) {
+        if (x || y) {
+            SkMatrix matrix = SkMatrix::MakeTrans(x, y);
+            this->onDrawDrawable(dr, &matrix);
+        } else {
+            this->onDrawDrawable(dr, nullptr);
+        }
+    }
+}
+
+void SkCanvas::drawDrawable(SkDrawable* dr, const SkMatrix* matrix) {
+    if (dr) {
+        if (matrix && matrix->isIdentity()) {
+            matrix = nullptr;
+        }
+        this->onDrawDrawable(dr, matrix);
+    }
+}
+
+void SkCanvas::onDrawDrawable(SkDrawable* dr, const SkMatrix* matrix) {
+    SkRect bounds = dr->getBounds();
+    if (matrix) {
+        matrix->mapRect(&bounds);
+    }
+    if (this->quickReject(bounds)) {
+        return;
+    }
+    dr->draw(this, matrix);
+}
+
+void SkCanvas::onDrawAtlas(const SkImage* atlas, const SkRSXform xform[], const SkRect tex[],
+                           const SkColor colors[], int count, SkXfermode::Mode mode,
+                           const SkRect* cull, const SkPaint* paint) {
+    if (cull && this->quickReject(*cull)) {
+        return;
+    }
+
+    SkPaint pnt;
+    if (paint) {
+        pnt = *paint;
+    }
+    
+    LOOPER_BEGIN(pnt, SkDrawFilter::kPath_Type, nullptr)
+    while (iter.next()) {
+        iter.fDevice->drawAtlas(iter, atlas, xform, tex, colors, count, mode, pnt);
+    }
+    LOOPER_END
+}
+
 //////////////////////////////////////////////////////////////////////////////
 // These methods are NOT virtual, and therefore must call back into virtual
 // methods, rather than actually drawing themselves.
@@ -2270,6 +2694,7 @@ void SkCanvas::drawVertices(VertexMode vmode, int vertexCount,
 
 void SkCanvas::drawARGB(U8CPU a, U8CPU r, U8CPU g, U8CPU b,
                         SkXfermode::Mode mode) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawARGB()");
     SkPaint paint;
 
     paint.setARGB(a, r, g, b);
@@ -2280,6 +2705,7 @@ void SkCanvas::drawARGB(U8CPU a, U8CPU r, U8CPU g, U8CPU b,
 }
 
 void SkCanvas::drawColor(SkColor c, SkXfermode::Mode mode) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawColor()");
     SkPaint paint;
 
     paint.setColor(c);
@@ -2290,6 +2716,7 @@ void SkCanvas::drawColor(SkColor c, SkXfermode::Mode mode) {
 }
 
 void SkCanvas::drawPoint(SkScalar x, SkScalar y, const SkPaint& paint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawPoint(SkPaint)");
     SkPoint pt;
 
     pt.set(x, y);
@@ -2297,6 +2724,7 @@ void SkCanvas::drawPoint(SkScalar x, SkScalar y, const SkPaint& paint) {
 }
 
 void SkCanvas::drawPoint(SkScalar x, SkScalar y, SkColor color) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawPoint(SkColor)");
     SkPoint pt;
     SkPaint paint;
 
@@ -2307,6 +2735,7 @@ void SkCanvas::drawPoint(SkScalar x, SkScalar y, SkColor color) {
 
 void SkCanvas::drawLine(SkScalar x0, SkScalar y0, SkScalar x1, SkScalar y1,
                         const SkPaint& paint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawLine()");
     SkPoint pts[2];
 
     pts[0].set(x0, y0);
@@ -2317,6 +2746,7 @@ void SkCanvas::drawLine(SkScalar x0, SkScalar y0, SkScalar x1, SkScalar y1,
 void SkCanvas::drawRectCoords(SkScalar left, SkScalar top,
                               SkScalar right, SkScalar bottom,
                               const SkPaint& paint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawRectCoords()");
     SkRect  r;
 
     r.set(left, top, right, bottom);
@@ -2325,6 +2755,7 @@ void SkCanvas::drawRectCoords(SkScalar left, SkScalar top,
 
 void SkCanvas::drawCircle(SkScalar cx, SkScalar cy, SkScalar radius,
                           const SkPaint& paint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawCircle()");
     if (radius < 0) {
         radius = 0;
     }
@@ -2336,6 +2767,7 @@ void SkCanvas::drawCircle(SkScalar cx, SkScalar cy, SkScalar radius,
 
 void SkCanvas::drawRoundRect(const SkRect& r, SkScalar rx, SkScalar ry,
                              const SkPaint& paint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawRoundRect()");
     if (rx > 0 && ry > 0) {
         if (paint.canComputeFastBounds()) {
             SkRect storage;
@@ -2354,6 +2786,7 @@ void SkCanvas::drawRoundRect(const SkRect& r, SkScalar rx, SkScalar ry,
 void SkCanvas::drawArc(const SkRect& oval, SkScalar startAngle,
                        SkScalar sweepAngle, bool useCenter,
                        const SkPaint& paint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawArc()");
     if (SkScalarAbs(sweepAngle) >= SkIntToScalar(360)) {
         this->drawOval(oval, paint);
     } else {
@@ -2372,6 +2805,7 @@ void SkCanvas::drawArc(const SkRect& oval, SkScalar startAngle,
 void SkCanvas::drawTextOnPathHV(const void* text, size_t byteLength,
                                 const SkPath& path, SkScalar hOffset,
                                 SkScalar vOffset, const SkPaint& paint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawTextOnPathHV()");
     SkMatrix    matrix;
 
     matrix.setTranslate(hOffset, vOffset);
@@ -2379,39 +2813,64 @@ void SkCanvas::drawTextOnPathHV(const void* text, size_t byteLength,
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void SkCanvas::EXPERIMENTAL_optimize(const SkPicture* picture) {
-    SkBaseDevice* device = this->getDevice();
-    if (NULL != device) {
-        device->EXPERIMENTAL_optimize(picture);
+
+/**
+ *  This constant is trying to balance the speed of ref'ing a subpicture into a parent picture,
+ *  against the playback cost of recursing into the subpicture to get at its actual ops.
+ *
+ *  For now we pick a conservatively small value, though measurement (and other heuristics like
+ *  the type of ops contained) may justify changing this value.
+ */
+#define kMaxPictureOpsToUnrollInsteadOfRef  1
+
+void SkCanvas::drawPicture(const SkPicture* picture, const SkMatrix* matrix, const SkPaint* paint) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawPicture()");
+    if (picture) {
+        if (matrix && matrix->isIdentity()) {
+            matrix = nullptr;
+        }
+        if (picture->approximateOpCount() <= kMaxPictureOpsToUnrollInsteadOfRef) {
+            SkAutoCanvasMatrixPaint acmp(this, matrix, paint, picture->cullRect());
+            picture->playback(this);
+        } else {
+            this->onDrawPicture(picture, matrix, paint);
+        }
     }
 }
 
-void SkCanvas::drawPicture(const SkPicture* picture) {
-    if (NULL != picture) {
-        this->onDrawPicture(picture);
+void SkCanvas::onDrawPicture(const SkPicture* picture, const SkMatrix* matrix,
+                             const SkPaint* paint) {
+    if (!paint || paint->canComputeFastBounds()) {
+        SkRect bounds = picture->cullRect();
+        if (paint) {
+            paint->computeFastBounds(bounds, &bounds);
+        }
+        if (matrix) {
+            matrix->mapRect(&bounds);
+        }
+        if (this->quickReject(bounds)) {
+            return;
+        }
     }
-}
-
-void SkCanvas::onDrawPicture(const SkPicture* picture) {
-    SkASSERT(NULL != picture);
 
     SkBaseDevice* device = this->getTopDevice();
-    if (NULL != device) {
+    if (device) {
         // Canvas has to first give the device the opportunity to render
         // the picture itself.
-        if (device->EXPERIMENTAL_drawPicture(this, picture)) {
+        if (device->EXPERIMENTAL_drawPicture(this, picture, matrix, paint)) {
             return; // the device has rendered the entire picture
         }
     }
 
-    picture->draw(this);
+    SkAutoCanvasMatrixPaint acmp(this, matrix, paint, picture->cullRect());
+    picture->playback(this);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
 SkCanvas::LayerIter::LayerIter(SkCanvas* canvas, bool skipEmptyClips) {
-    SK_COMPILE_ASSERT(sizeof(fStorage) >= sizeof(SkDrawIter), fStorage_too_small);
+    static_assert(sizeof(fStorage) >= sizeof(SkDrawIter), "fStorage_too_small");
 
     SkASSERT(canvas);
 
@@ -2437,7 +2896,7 @@ const SkMatrix& SkCanvas::LayerIter::matrix() const {
 
 const SkPaint& SkCanvas::LayerIter::paint() const {
     const SkPaint* paint = fImpl->getPaint();
-    if (NULL == paint) {
+    if (nullptr == paint) {
         paint = &fDefaultPaint;
     }
     return *paint;
@@ -2474,31 +2933,40 @@ static bool supported_for_raster_canvas(const SkImageInfo& info) {
     return true;
 }
 
-SkCanvas* SkCanvas::NewRaster(const SkImageInfo& info) {
-    if (!supported_for_raster_canvas(info)) {
-        return NULL;
-    }
-
-    SkBitmap bitmap;
-    if (!bitmap.allocPixels(info)) {
-        return NULL;
-    }
-
-    // should this functionality be moved into allocPixels()?
-    if (!bitmap.info().isOpaque()) {
-        bitmap.eraseColor(0);
-    }
-    return SkNEW_ARGS(SkCanvas, (bitmap));
-}
-
 SkCanvas* SkCanvas::NewRasterDirect(const SkImageInfo& info, void* pixels, size_t rowBytes) {
     if (!supported_for_raster_canvas(info)) {
-        return NULL;
+        return nullptr;
     }
 
     SkBitmap bitmap;
     if (!bitmap.installPixels(info, pixels, rowBytes)) {
-        return NULL;
+        return nullptr;
     }
-    return SkNEW_ARGS(SkCanvas, (bitmap));
+    return new SkCanvas(bitmap);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+SkAutoCanvasMatrixPaint::SkAutoCanvasMatrixPaint(SkCanvas* canvas, const SkMatrix* matrix,
+                                                 const SkPaint* paint, const SkRect& bounds)
+    : fCanvas(canvas)
+    , fSaveCount(canvas->getSaveCount())
+{
+    if (paint) {
+        SkRect newBounds = bounds;
+        if (matrix) {
+            matrix->mapRect(&newBounds);
+        }
+        canvas->saveLayer(&newBounds, paint);
+    } else if (matrix) {
+        canvas->save();
+    }
+
+    if (matrix) {
+        canvas->concat(*matrix);
+    }
+}
+
+SkAutoCanvasMatrixPaint::~SkAutoCanvasMatrixPaint() {
+    fCanvas->restoreToCount(fSaveCount);
 }
diff --git a/gfx/skia/skia/src/core/SkCanvasPriv.h b/gfx/skia/skia/src/core/SkCanvasPriv.h
new file mode 100644
index 000000000000..dfae154ecb8e
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkCanvasPriv.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkCanvasPriv_DEFINED
+#define SkCanvasPriv_DEFINED
+
+#include "SkCanvas.h"
+
+class SkAutoCanvasMatrixPaint : SkNoncopyable {
+public:
+    SkAutoCanvasMatrixPaint(SkCanvas*, const SkMatrix*, const SkPaint*, const SkRect& bounds);
+    ~SkAutoCanvasMatrixPaint();
+
+private:
+    SkCanvas*   fCanvas;
+    int         fSaveCount;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/core/SkChecksum.cpp b/gfx/skia/skia/src/core/SkChecksum.cpp
new file mode 100644
index 000000000000..4457eb4f9976
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkChecksum.cpp
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkChecksum.h"
+
+uint32_t SkChecksum::Murmur3(const void* data, size_t bytes, uint32_t seed) {
+    // Use may_alias to remind the compiler we're intentionally violating strict aliasing,
+    // and so not to apply strict-aliasing-based optimizations.
+    typedef uint32_t SK_ATTRIBUTE(may_alias) aliased_uint32_t;
+    typedef uint8_t SK_ATTRIBUTE(may_alias) aliased_uint8_t;
+
+    // Handle 4 bytes at a time while possible.
+    const aliased_uint32_t* safe_data = (const aliased_uint32_t*)data;
+    const size_t words = bytes/4;
+    uint32_t hash = seed;
+    for (size_t i = 0; i < words; i++) {
+        uint32_t k = safe_data[i];
+        k *= 0xcc9e2d51;
+        k = (k << 15) | (k >> 17);
+        k *= 0x1b873593;
+
+        hash ^= k;
+        hash = (hash << 13) | (hash >> 19);
+        hash *= 5;
+        hash += 0xe6546b64;
+    }
+
+    // Handle last 0-3 bytes.
+    const aliased_uint8_t* safe_tail = (const uint8_t*)(safe_data + words);
+    uint32_t k = 0;
+    switch (bytes & 3) {
+        case 3: k ^= safe_tail[2] << 16;
+        case 2: k ^= safe_tail[1] <<  8;
+        case 1: k ^= safe_tail[0] <<  0;
+                k *= 0xcc9e2d51;
+                k = (k << 15) | (k >> 17);
+                k *= 0x1b873593;
+                hash ^= k;
+    }
+
+    hash ^= bytes;
+    return SkChecksum::Mix(hash);
+}
diff --git a/gfx/skia/skia/src/core/SkChecksum.h b/gfx/skia/skia/src/core/SkChecksum.h
deleted file mode 100644
index 9f2ebf460aff..000000000000
--- a/gfx/skia/skia/src/core/SkChecksum.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkChecksum_DEFINED
-#define SkChecksum_DEFINED
-
-#include "SkTypes.h"
-
-/**
- *  Computes a 32bit checksum from a blob of 32bit aligned data. This is meant
- *  to be very very fast, as it is used internally by the font cache, in
- *  conjuction with the entire raw key. This algorithm does not generate
- *  unique values as well as others (e.g. MD5) but it performs much faster.
- *  Skia's use cases can survive non-unique values (since the entire key is
- *  always available). Clients should only be used in circumstances where speed
- *  over uniqueness is at a premium.
- */
-class SkChecksum : SkNoncopyable {
-private:
-    /*
-     *  Our Rotate and Mash helpers are meant to automatically do the right
-     *  thing depending if sizeof(uintptr_t) is 4 or 8.
-     */
-    enum {
-        ROTR = 17,
-        ROTL = sizeof(uintptr_t) * 8 - ROTR,
-        HALFBITS = sizeof(uintptr_t) * 4
-    };
-
-    static inline uintptr_t Mash(uintptr_t total, uintptr_t value) {
-        return ((total >> ROTR) | (total << ROTL)) ^ value;
-    }
-
-public:
-    /**
-     * uint32_t -> uint32_t hash, useful for when you're about to trucate this hash but you
-     * suspect its low bits aren't well mixed.
-     *
-     * This is the Murmur3 finalizer.
-     */
-    static uint32_t Mix(uint32_t hash) {
-        hash ^= hash >> 16;
-        hash *= 0x85ebca6b;
-        hash ^= hash >> 13;
-        hash *= 0xc2b2ae35;
-        hash ^= hash >> 16;
-        return hash;
-    }
-
-    /**
-     * Calculate 32-bit Murmur hash (murmur3).
-     * This should take 2-3x longer than SkChecksum::Compute, but is a considerably better hash.
-     * See en.wikipedia.org/wiki/MurmurHash.
-     *
-     *  @param data Memory address of the data block to be processed. Must be 32-bit aligned.
-     *  @param size Size of the data block in bytes. Must be a multiple of 4.
-     *  @param seed Initial hash seed. (optional)
-     *  @return hash result
-     */
-    static uint32_t Murmur3(const uint32_t* data, size_t bytes, uint32_t seed=0) {
-        // Use may_alias to remind the compiler we're intentionally violating strict aliasing,
-        // and so not to apply strict-aliasing-based optimizations.
-        typedef uint32_t SK_ATTRIBUTE(may_alias) aliased_uint32_t;
-        const aliased_uint32_t* safe_data = (const aliased_uint32_t*)data;
-
-        SkASSERTF(SkIsAlign4(bytes), "Expected 4-byte multiple, got %zu", bytes);
-        const size_t words = bytes/4;
-
-
-        uint32_t hash = seed;
-        for (size_t i = 0; i < words; i++) {
-            uint32_t k = safe_data[i];
-            k *= 0xcc9e2d51;
-            k = (k << 15) | (k >> 17);
-            k *= 0x1b873593;
-
-            hash ^= k;
-            hash = (hash << 13) | (hash >> 19);
-            hash *= 5;
-            hash += 0xe6546b64;
-        }
-        hash ^= bytes;
-        return Mix(hash);
-    }
-
-    /**
-     *  Compute a 32-bit checksum for a given data block
-     *
-     *  WARNING: this algorithm is tuned for efficiency, not backward/forward
-     *  compatibility.  It may change at any time, so a checksum generated with
-     *  one version of the Skia code may not match a checksum generated with
-     *  a different version of the Skia code.
-     *
-     *  @param data Memory address of the data block to be processed. Must be
-     *              32-bit aligned.
-     *  @param size Size of the data block in bytes. Must be a multiple of 4.
-     *  @return checksum result
-     */
-    static uint32_t Compute(const uint32_t* data, size_t size) {
-        // Use may_alias to remind the compiler we're intentionally violating strict aliasing,
-        // and so not to apply strict-aliasing-based optimizations.
-        typedef uint32_t SK_ATTRIBUTE(may_alias) aliased_uint32_t;
-        const aliased_uint32_t* safe_data = (const aliased_uint32_t*)data;
-
-        SkASSERT(SkIsAlign4(size));
-
-        /*
-         *  We want to let the compiler use 32bit or 64bit addressing and math
-         *  so we use uintptr_t as our magic type. This makes the code a little
-         *  more obscure (we can't hard-code 32 or 64 anywhere, but have to use
-         *  sizeof()).
-         */
-        uintptr_t result = 0;
-        const uintptr_t* ptr = reinterpret_cast<const uintptr_t*>(safe_data);
-
-        /*
-         *  count the number of quad element chunks. This takes into account
-         *  if we're on a 32bit or 64bit arch, since we use sizeof(uintptr_t)
-         *  to compute how much to shift-down the size.
-         */
-        size_t n4 = size / (sizeof(uintptr_t) << 2);
-        for (size_t i = 0; i < n4; ++i) {
-            result = Mash(result, *ptr++);
-            result = Mash(result, *ptr++);
-            result = Mash(result, *ptr++);
-            result = Mash(result, *ptr++);
-        }
-        size &= ((sizeof(uintptr_t) << 2) - 1);
-
-        safe_data = reinterpret_cast<const aliased_uint32_t*>(ptr);
-        const aliased_uint32_t* stop = safe_data + (size >> 2);
-        while (safe_data < stop) {
-            result = Mash(result, *safe_data++);
-        }
-
-        /*
-         *  smash us down to 32bits if we were 64. Note that when uintptr_t is
-         *  32bits, this code-path should go away, but I still got a warning
-         *  when I wrote
-         *      result ^= result >> 32;
-         *  since >>32 is undefined for 32bit ints, hence the wacky HALFBITS
-         *  define.
-         */
-        if (8 == sizeof(result)) {
-            result ^= result >> HALFBITS;
-        }
-        return static_cast<uint32_t>(result);
-    }
-};
-
-#endif
diff --git a/gfx/skia/skia/src/core/SkChunkAlloc.cpp b/gfx/skia/skia/src/core/SkChunkAlloc.cpp
index 62cdf1532f75..3f30276f1b36 100644
--- a/gfx/skia/skia/src/core/SkChunkAlloc.cpp
+++ b/gfx/skia/skia/src/core/SkChunkAlloc.cpp
@@ -23,6 +23,18 @@ struct SkChunkAlloc::Block {
     char*   fFreePtr;
     // data[] follows
 
+    size_t blockSize() { 
+        char* start = this->startOfData();
+        size_t bytes = fFreePtr - start;
+        return fFreeSize + bytes;
+    }
+
+    void reset() {
+        fNext = nullptr;
+        fFreeSize = this->blockSize();
+        fFreePtr = this->startOfData();
+    }
+
     char* startOfData() {
         return reinterpret_cast<char*>(this + 1);
     }
@@ -48,12 +60,13 @@ SkChunkAlloc::SkChunkAlloc(size_t minSize) {
         minSize = MIN_CHUNKALLOC_BLOCK_SIZE;
     }
 
-    fBlock = NULL;
+    fBlock = nullptr;
     fMinSize = minSize;
     fChunkSize = fMinSize;
     fTotalCapacity = 0;
     fTotalUsed = 0;
-    fBlockCount = 0;
+    SkDEBUGCODE(fTotalLost = 0;)
+    SkDEBUGCODE(fBlockCount = 0;)
 }
 
 SkChunkAlloc::~SkChunkAlloc() {
@@ -62,11 +75,44 @@ SkChunkAlloc::~SkChunkAlloc() {
 
 void SkChunkAlloc::reset() {
     Block::FreeChain(fBlock);
-    fBlock = NULL;
+    fBlock = nullptr;
     fChunkSize = fMinSize;  // reset to our initial minSize
     fTotalCapacity = 0;
     fTotalUsed = 0;
-    fBlockCount = 0;
+    SkDEBUGCODE(fTotalLost = 0;)
+    SkDEBUGCODE(fBlockCount = 0;)
+}
+
+void SkChunkAlloc::rewind() {
+    SkDEBUGCODE(this->validate();)
+
+    Block* largest = fBlock;
+
+    if (largest) {
+        Block* next;
+        for (Block* cur = largest->fNext; cur; cur = next) {
+            next = cur->fNext;
+            if (cur->blockSize() > largest->blockSize()) {
+                sk_free(largest);
+                largest = cur;
+            } else {
+                sk_free(cur);
+            }
+        }
+
+        largest->reset();
+        fTotalCapacity = largest->blockSize();
+        SkDEBUGCODE(fBlockCount = 1;)
+    } else {
+        fTotalCapacity = 0;
+        SkDEBUGCODE(fBlockCount = 0;)
+    }
+
+    fBlock = largest;
+    fChunkSize = fMinSize;  // reset to our initial minSize
+    fTotalUsed = 0;
+    SkDEBUGCODE(fTotalLost = 0;)
+    SkDEBUGCODE(this->validate();)
 }
 
 SkChunkAlloc::Block* SkChunkAlloc::newBlock(size_t bytes, AllocFailType ftype) {
@@ -79,43 +125,60 @@ SkChunkAlloc::Block* SkChunkAlloc::newBlock(size_t bytes, AllocFailType ftype) {
                         ftype == kThrow_AllocFailType ? SK_MALLOC_THROW : 0);
 
     if (block) {
-        //    block->fNext = fBlock;
         block->fFreeSize = size;
         block->fFreePtr = block->startOfData();
 
         fTotalCapacity += size;
-        fBlockCount += 1;
+        SkDEBUGCODE(fBlockCount += 1;)
 
         fChunkSize = increase_next_size(fChunkSize);
     }
     return block;
 }
 
-void* SkChunkAlloc::alloc(size_t bytes, AllocFailType ftype) {
-    fTotalUsed += bytes;
+SkChunkAlloc::Block* SkChunkAlloc::addBlockIfNecessary(size_t bytes, AllocFailType ftype) {
+    SkASSERT(SkIsAlign4(bytes));
 
-    bytes = SkAlign4(bytes);
-
-    Block* block = fBlock;
-
-    if (block == NULL || bytes > block->fFreeSize) {
-        block = this->newBlock(bytes, ftype);
-        if (NULL == block) {
-            return NULL;
+    if (!fBlock || bytes > fBlock->fFreeSize) {
+        Block* block = this->newBlock(bytes, ftype);
+        if (!block) {
+            return nullptr;
         }
+#ifdef SK_DEBUG
+        if (fBlock) {
+            fTotalLost += fBlock->fFreeSize;
+        }
+#endif
         block->fNext = fBlock;
         fBlock = block;
     }
 
-    SkASSERT(block && bytes <= block->fFreeSize);
+    SkASSERT(fBlock && bytes <= fBlock->fFreeSize);
+    return fBlock;
+}
+
+void* SkChunkAlloc::alloc(size_t bytes, AllocFailType ftype) {
+    SkDEBUGCODE(this->validate();)
+
+    bytes = SkAlign4(bytes);
+
+    Block* block = this->addBlockIfNecessary(bytes, ftype);
+    if (!block) {
+        return nullptr;
+    }
+
     char* ptr = block->fFreePtr;
 
+    fTotalUsed += bytes;
     block->fFreeSize -= bytes;
     block->fFreePtr = ptr + bytes;
+    SkDEBUGCODE(this->validate();)
     return ptr;
 }
 
 size_t SkChunkAlloc::unalloc(void* ptr) {
+    SkDEBUGCODE(this->validate();)
+
     size_t bytes = 0;
     Block* block = fBlock;
     if (block) {
@@ -123,10 +186,12 @@ size_t SkChunkAlloc::unalloc(void* ptr) {
         char* start = block->startOfData();
         if (start <= cPtr && cPtr < block->fFreePtr) {
             bytes = block->fFreePtr - cPtr;
+            fTotalUsed -= bytes;
             block->fFreeSize += bytes;
             block->fFreePtr = cPtr;
         }
     }
+    SkDEBUGCODE(this->validate();)
     return bytes;
 }
 
@@ -140,3 +205,31 @@ bool SkChunkAlloc::contains(const void* addr) const {
     }
     return false;
 }
+
+#ifdef SK_DEBUG
+void SkChunkAlloc::validate() {
+    int numBlocks = 0;
+    size_t totCapacity = 0;
+    size_t totUsed = 0;
+    size_t totLost = 0;
+    size_t totAvailable = 0;
+
+    for (Block* temp = fBlock; temp; temp = temp->fNext) {
+        ++numBlocks;
+        totCapacity += temp->blockSize();
+        totUsed += temp->fFreePtr - temp->startOfData();
+        if (temp == fBlock) {
+            totAvailable += temp->fFreeSize;
+        } else {
+            totLost += temp->fFreeSize;
+        }
+    }
+
+    SkASSERT(fBlockCount == numBlocks);
+    SkASSERT(fTotalCapacity == totCapacity);
+    SkASSERT(fTotalUsed == totUsed);
+    SkASSERT(fTotalLost == totLost);
+    SkASSERT(totCapacity == totUsed + totLost + totAvailable);
+}
+#endif
+
diff --git a/gfx/skia/skia/src/core/SkClipStack.cpp b/gfx/skia/skia/src/core/SkClipStack.cpp
index 85746b2eaf94..4227eeac68fc 100644
--- a/gfx/skia/skia/src/core/SkClipStack.cpp
+++ b/gfx/skia/skia/src/core/SkClipStack.cpp
@@ -5,10 +5,11 @@
  * found in the LICENSE file.
  */
 
+#include "SkAtomics.h"
 #include "SkCanvas.h"
 #include "SkClipStack.h"
 #include "SkPath.h"
-#include "SkThread.h"
+#include "SkPathOps.h"
 
 #include <new>
 
@@ -112,8 +113,9 @@ void SkClipStack::Element::invertShapeFillType() {
 void SkClipStack::Element::initPath(int saveCount, const SkPath& path, SkRegion::Op op,
                                     bool doAA) {
     if (!path.isInverseFillType()) {
-        if (SkPath::kNone_PathAsRect != path.asRect()) {
-            this->initRect(saveCount, path.getBounds(), op, doAA);
+        SkRect r;
+        if (path.isRect(&r)) {
+            this->initRect(saveCount, r, op, doAA);
             return;
         }
         SkRect ovalRect;
@@ -125,6 +127,7 @@ void SkClipStack::Element::initPath(int saveCount, const SkPath& path, SkRegion:
         }
     }
     fPath.set(path);
+    fPath.get()->setIsVolatile(true);
     fType = kPath_Type;
     this->initCommon(saveCount, op, doAA);
 }
@@ -133,19 +136,23 @@ void SkClipStack::Element::asPath(SkPath* path) const {
     switch (fType) {
         case kEmpty_Type:
             path->reset();
+            path->setIsVolatile(true);
             break;
         case kRect_Type:
             path->reset();
             path->addRect(this->getRect());
+            path->setIsVolatile(true);
             break;
         case kRRect_Type:
             path->reset();
             path->addRRect(fRRect);
+            path->setIsVolatile(true);
             break;
         case kPath_Type:
             *path = *fPath.get();
             break;
     }
+    path->setIsVolatile(true);
 }
 
 void SkClipStack::Element::setEmpty() {
@@ -391,7 +398,7 @@ void SkClipStack::Element::updateBoundAndGenID(const Element* prior) {
             fFiniteBoundType = kNormal_BoundsType;
 
             if (SkRegion::kReplace_Op == fOp ||
-                (SkRegion::kIntersect_Op == fOp && NULL == prior) ||
+                (SkRegion::kIntersect_Op == fOp && nullptr == prior) ||
                 (SkRegion::kIntersect_Op == fOp && prior->fIsIntersectionOfRects &&
                     prior->rectRectIntersectAllowed(this->getRect(), fDoAA))) {
                 fIsIntersectionOfRects = true;
@@ -416,12 +423,6 @@ void SkClipStack::Element::updateBoundAndGenID(const Element* prior) {
     }
 
     if (!fDoAA) {
-        // Here we mimic a non-anti-aliased scanline system. If there is
-        // no anti-aliasing we can integerize the bounding box to exclude
-        // fractional parts that won't be rendered.
-        // Note: the left edge is handled slightly differently below. We
-        // are a bit more generous in the rounding since we don't want to
-        // risk missing the left pixels when fLeft is very close to .5
         fFiniteBound.set(SkScalarFloorToScalar(fFiniteBound.fLeft+0.45f),
                          SkScalarRoundToScalar(fFiniteBound.fTop),
                          SkScalarRoundToScalar(fFiniteBound.fRight),
@@ -433,7 +434,7 @@ void SkClipStack::Element::updateBoundAndGenID(const Element* prior) {
     SkRect prevFinite;
     SkClipStack::BoundsType prevType;
 
-    if (NULL == prior) {
+    if (nullptr == prior) {
         // no prior clip means the entire plane is writable
         prevFinite.setEmpty();   // there are no pixels that cannot be drawn to
         prevType = kInsideOut_BoundsType;
@@ -531,7 +532,7 @@ SkClipStack& SkClipStack::operator=(const SkClipStack& b) {
     fSaveCount = b.fSaveCount;
     SkDeque::F2BIter recIter(b.fDeque);
     for (const Element* element = (const Element*)recIter.next();
-         element != NULL;
+         element != nullptr;
          element = (const Element*)recIter.next()) {
         new (fDeque.push_back()) Element(*element);
     }
@@ -552,14 +553,14 @@ bool SkClipStack::operator==(const SkClipStack& b) const {
     const Element* myElement = (const Element*)myIter.next();
     const Element* bElement = (const Element*)bIter.next();
 
-    while (myElement != NULL && bElement != NULL) {
+    while (myElement != nullptr && bElement != nullptr) {
         if (*myElement != *bElement) {
             return false;
         }
         myElement = (const Element*)myIter.next();
         bElement = (const Element*)bIter.next();
     }
-    return myElement == NULL && bElement == NULL;
+    return myElement == nullptr && bElement == nullptr;
 }
 
 void SkClipStack::reset() {
@@ -597,15 +598,15 @@ void SkClipStack::restoreTo(int saveCount) {
 void SkClipStack::getBounds(SkRect* canvFiniteBound,
                             BoundsType* boundType,
                             bool* isIntersectionOfRects) const {
-    SkASSERT(NULL != canvFiniteBound && NULL != boundType);
+    SkASSERT(canvFiniteBound && boundType);
 
     Element* element = (Element*)fDeque.back();
 
-    if (NULL == element) {
+    if (nullptr == element) {
         // the clip is wide open - the infinite plane w/ no pixels un-writeable
         canvFiniteBound->setEmpty();
         *boundType = kInsideOut_BoundsType;
-        if (NULL != isIntersectionOfRects) {
+        if (isIntersectionOfRects) {
             *isIntersectionOfRects = false;
         }
         return;
@@ -613,35 +614,16 @@ void SkClipStack::getBounds(SkRect* canvFiniteBound,
 
     *canvFiniteBound = element->fFiniteBound;
     *boundType = element->fFiniteBoundType;
-    if (NULL != isIntersectionOfRects) {
+    if (isIntersectionOfRects) {
         *isIntersectionOfRects = element->fIsIntersectionOfRects;
     }
 }
 
-bool SkClipStack::intersectRectWithClip(SkRect* rect) const {
-    SkASSERT(NULL != rect);
-
-    SkRect bounds;
-    SkClipStack::BoundsType bt;
-    this->getBounds(&bounds, &bt);
-    if (bt == SkClipStack::kInsideOut_BoundsType) {
-        if (bounds.contains(*rect)) {
-            return false;
-        } else {
-            // If rect's x values are both within bound's x range we
-            // could clip here. Same for y. But we don't bother to check.
-            return true;
-        }
-    } else {
-        return rect->intersect(bounds);
-    }
-}
-
 bool SkClipStack::quickContains(const SkRect& rect) const {
 
     Iter iter(*this, Iter::kTop_IterStart);
     const Element* element = iter.prev();
-    while (element != NULL) {
+    while (element != nullptr) {
         if (SkRegion::kIntersect_Op != element->getOp() && SkRegion::kReplace_Op != element->getOp())
             return false;
         if (element->isInverseFilled()) {
@@ -662,12 +644,41 @@ bool SkClipStack::quickContains(const SkRect& rect) const {
     return true;
 }
 
+bool SkClipStack::asPath(SkPath *path) const {
+    bool isAA = false;
+
+    path->reset();
+    path->setFillType(SkPath::kInverseEvenOdd_FillType);
+
+    SkClipStack::Iter iter(*this, SkClipStack::Iter::kBottom_IterStart);
+    while (const SkClipStack::Element* element = iter.next()) {
+        SkPath operand;
+        if (element->getType() != SkClipStack::Element::kEmpty_Type) {
+            element->asPath(&operand);
+        }
+
+        SkRegion::Op elementOp = element->getOp();
+        if (elementOp == SkRegion::kReplace_Op) {
+            *path = operand;
+        } else {
+            Op(*path, operand, (SkPathOp)elementOp, path);
+        }
+
+        // if the prev and curr clips disagree about aa -vs- not, favor the aa request.
+        // perhaps we need an API change to avoid this sort of mixed-signals about
+        // clipping.
+        isAA = (isAA || element->isAA());
+    }
+
+    return isAA;
+}
+
 void SkClipStack::pushElement(const Element& element) {
     // Use reverse iterator instead of back because Rect path may need previous
     SkDeque::Iter iter(fDeque, SkDeque::Iter::kBack_IterStart);
     Element* prior = (Element*) iter.prev();
 
-    if (NULL != prior) {
+    if (prior) {
         if (prior->canBeIntersectedInPlace(fSaveCount, element.getOp())) {
             switch (prior->fType) {
                 case Element::kEmpty_Type:
@@ -703,7 +714,7 @@ void SkClipStack::pushElement(const Element& element) {
             prior = (Element*) fDeque.back();
         }
     }
-    Element* newElement = SkNEW_PLACEMENT_ARGS(fDeque.push_back(), Element, (element));
+    Element* newElement = new (fDeque.push_back()) Element(element);
     newElement->updateBoundAndGenID(prior);
 }
 
@@ -739,7 +750,7 @@ bool SkClipStack::isWideOpen() const {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkClipStack::Iter::Iter() : fStack(NULL) {
+SkClipStack::Iter::Iter() : fStack(nullptr) {
 }
 
 SkClipStack::Iter::Iter(const SkClipStack& stack, IterStart startLoc)
@@ -757,16 +768,16 @@ const SkClipStack::Element* SkClipStack::Iter::prev() {
 
 const SkClipStack::Element* SkClipStack::Iter::skipToTopmost(SkRegion::Op op) {
 
-    if (NULL == fStack) {
-        return NULL;
+    if (nullptr == fStack) {
+        return nullptr;
     }
 
     fIter.reset(fStack->fDeque, SkDeque::Iter::kBack_IterStart);
 
-    const SkClipStack::Element* element = NULL;
+    const SkClipStack::Element* element = nullptr;
 
     for (element = (const SkClipStack::Element*) fIter.prev();
-         NULL != element;
+         element;
          element = (const SkClipStack::Element*) fIter.prev()) {
 
         if (op == element->fOp) {
@@ -776,7 +787,7 @@ const SkClipStack::Element* SkClipStack::Iter::skipToTopmost(SkRegion::Op op) {
             // return on the next "next" or "prev" call) the element
             // in front of it in the deque. Bump the iterator forward a
             // step so we get the expected result.
-            if (NULL == fIter.next()) {
+            if (nullptr == fIter.next()) {
                 // The reverse iterator has run off the front of the deque
                 // (i.e., the "op" clip is the first clip) and can't
                 // recover. Reset the iterator to start at the front.
@@ -786,7 +797,7 @@ const SkClipStack::Element* SkClipStack::Iter::skipToTopmost(SkRegion::Op op) {
         }
     }
 
-    if (NULL == element) {
+    if (nullptr == element) {
         // There were no "op" clips
         fIter.reset(fStack->fDeque, SkDeque::Iter::kFront_IterStart);
     }
@@ -806,7 +817,7 @@ void SkClipStack::getConservativeBounds(int offsetX,
                                         int maxHeight,
                                         SkRect* devBounds,
                                         bool* isIntersectionOfRects) const {
-    SkASSERT(NULL != devBounds);
+    SkASSERT(devBounds);
 
     devBounds->setLTRB(0, 0,
                        SkIntToScalar(maxWidth), SkIntToScalar(maxHeight));
@@ -854,11 +865,11 @@ void SkClipStack::Element::dump() const {
         "rrect",
         "path"
     };
-    SK_COMPILE_ASSERT(0 == kEmpty_Type, type_str);
-    SK_COMPILE_ASSERT(1 == kRect_Type, type_str);
-    SK_COMPILE_ASSERT(2 == kRRect_Type, type_str);
-    SK_COMPILE_ASSERT(3 == kPath_Type, type_str);
-    SK_COMPILE_ASSERT(SK_ARRAY_COUNT(kTypeStrings) == kTypeCnt, type_str);
+    static_assert(0 == kEmpty_Type, "type_str");
+    static_assert(1 == kRect_Type, "type_str");
+    static_assert(2 == kRRect_Type, "type_str");
+    static_assert(3 == kPath_Type, "type_str");
+    static_assert(SK_ARRAY_COUNT(kTypeStrings) == kTypeCnt, "type_str");
 
     static const char* kOpStrings[] = {
         "difference",
@@ -868,13 +879,13 @@ void SkClipStack::Element::dump() const {
         "reverse-difference",
         "replace",
     };
-    SK_COMPILE_ASSERT(0 == SkRegion::kDifference_Op, op_str);
-    SK_COMPILE_ASSERT(1 == SkRegion::kIntersect_Op, op_str);
-    SK_COMPILE_ASSERT(2 == SkRegion::kUnion_Op, op_str);
-    SK_COMPILE_ASSERT(3 == SkRegion::kXOR_Op, op_str);
-    SK_COMPILE_ASSERT(4 == SkRegion::kReverseDifference_Op, op_str);
-    SK_COMPILE_ASSERT(5 == SkRegion::kReplace_Op, op_str);
-    SK_COMPILE_ASSERT(SK_ARRAY_COUNT(kOpStrings) == SkRegion::kOpCnt, op_str);
+    static_assert(0 == SkRegion::kDifference_Op, "op_str");
+    static_assert(1 == SkRegion::kIntersect_Op, "op_str");
+    static_assert(2 == SkRegion::kUnion_Op, "op_str");
+    static_assert(3 == SkRegion::kXOR_Op, "op_str");
+    static_assert(4 == SkRegion::kReverseDifference_Op, "op_str");
+    static_assert(5 == SkRegion::kReplace_Op, "op_str");
+    static_assert(SK_ARRAY_COUNT(kOpStrings) == SkRegion::kOpCnt, "op_str");
 
     SkDebugf("Type: %s, Op: %s, AA: %s, Save Count: %d\n", kTypeStrings[fType],
              kOpStrings[fOp], (fDoAA ? "yes" : "no"), fSaveCount);
@@ -891,7 +902,7 @@ void SkClipStack::Element::dump() const {
             SkDebugf("\n");
             break;
         case kPath_Type:
-            this->getPath().dump(NULL, true);
+            this->getPath().dump(nullptr, true, false);
             break;
     }
 }
diff --git a/gfx/skia/skia/src/core/SkColor.cpp b/gfx/skia/skia/src/core/SkColor.cpp
index 6fa239ff5393..a21f0192398f 100644
--- a/gfx/skia/skia/src/core/SkColor.cpp
+++ b/gfx/skia/skia/src/core/SkColor.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,9 +5,9 @@
  * found in the LICENSE file.
  */
 
-
 #include "SkColor.h"
 #include "SkColorPriv.h"
+#include "SkFixed.h"
 
 SkPMColor SkPreMultiplyARGB(U8CPU a, U8CPU r, U8CPU g, U8CPU b) {
     return SkPremultiplyARGBInline(a, r, g, b);
@@ -71,21 +70,11 @@ void SkRGBToHSV(U8CPU r, U8CPU g, U8CPU b, SkScalar hsv[3]) {
     hsv[2] = v;
 }
 
-static inline U8CPU UnitScalarToByte(SkScalar x) {
-    if (x < 0) {
-        return 0;
-    }
-    if (x >= SK_Scalar1) {
-        return 255;
-    }
-    return SkScalarToFixed(x) >> 8;
-}
-
 SkColor SkHSVToColor(U8CPU a, const SkScalar hsv[3]) {
     SkASSERT(hsv);
 
-    U8CPU s = UnitScalarToByte(hsv[1]);
-    U8CPU v = UnitScalarToByte(hsv[2]);
+    U8CPU s = SkUnitScalarClampToByte(hsv[1]);
+    U8CPU v = SkUnitScalarClampToByte(hsv[2]);
 
     if (0 == s) { // shade of gray
         return SkColorSetARGB(a, v, v, v);
diff --git a/gfx/skia/skia/src/core/SkColorFilter.cpp b/gfx/skia/skia/src/core/SkColorFilter.cpp
index a686f4c41286..031f376eee18 100644
--- a/gfx/skia/skia/src/core/SkColorFilter.cpp
+++ b/gfx/skia/skia/src/core/SkColorFilter.cpp
@@ -6,12 +6,16 @@
  */
 
 #include "SkColorFilter.h"
-
 #include "SkReadBuffer.h"
-#include "SkWriteBuffer.h"
-#include "SkShader.h"
-#include "SkUnPreMultiply.h"
+#include "SkRefCnt.h"
 #include "SkString.h"
+#include "SkTDArray.h"
+#include "SkUnPreMultiply.h"
+#include "SkWriteBuffer.h"
+
+#if SK_SUPPORT_GPU
+#include "GrFragmentProcessor.h"
+#endif
 
 bool SkColorFilter::asColorMode(SkColor* color, SkXfermode::Mode* mode) const {
     return false;
@@ -25,21 +29,118 @@ bool SkColorFilter::asComponentTable(SkBitmap*) const {
     return false;
 }
 
-void SkColorFilter::filterSpan16(const uint16_t s[], int count, uint16_t d[]) const {
-    SkASSERT(this->getFlags() & SkColorFilter::kHasFilter16_Flag);
-    SkDEBUGFAIL("missing implementation of SkColorFilter::filterSpan16");
-
-    if (d != s) {
-        memcpy(d, s, count * sizeof(uint16_t));
-    }
-}
-
 SkColor SkColorFilter::filterColor(SkColor c) const {
     SkPMColor dst, src = SkPreMultiplyColor(c);
     this->filterSpan(&src, 1, &dst);
     return SkUnPreMultiply::PMColorToColor(dst);
 }
 
-GrEffect* SkColorFilter::asNewEffect(GrContext*) const {
-    return NULL;
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+/*
+ *  Since colorfilters may be used on the GPU backend, and in that case we may string together
+ *  many GrFragmentProcessors, we might exceed some internal instruction/resource limit.
+ *
+ *  Since we don't yet know *what* those limits might be when we construct the final shader,
+ *  we just set an arbitrary limit during construction. If later we find smarter ways to know what
+ *  the limnits are, we can change this constant (or remove it).
+ */
+#define SK_MAX_COMPOSE_COLORFILTER_COUNT    4
+
+class SkComposeColorFilter : public SkColorFilter {
+public:
+    uint32_t getFlags() const override {
+        // Can only claim alphaunchanged and 16bit support if both our proxys do.
+        return fOuter->getFlags() & fInner->getFlags();
+    }
+    
+    void filterSpan(const SkPMColor shader[], int count, SkPMColor result[]) const override {
+        fInner->filterSpan(shader, count, result);
+        fOuter->filterSpan(result, count, result);
+    }
+    
+#ifndef SK_IGNORE_TO_STRING
+    void toString(SkString* str) const override {
+        SkString outerS, innerS;
+        fOuter->toString(&outerS);
+        fInner->toString(&innerS);
+        str->appendf("SkComposeColorFilter: outer(%s) inner(%s)", outerS.c_str(), innerS.c_str());
+    }
+#endif
+
+#if SK_SUPPORT_GPU
+    const GrFragmentProcessor* asFragmentProcessor(GrContext* context) const override {
+        SkAutoTUnref<const GrFragmentProcessor> innerFP(fInner->asFragmentProcessor(context));
+        SkAutoTUnref<const GrFragmentProcessor> outerFP(fOuter->asFragmentProcessor(context));
+        if (!innerFP || !outerFP) {
+            return nullptr;
+        }
+        const GrFragmentProcessor* series[] = { innerFP, outerFP };
+        return GrFragmentProcessor::RunInSeries(series, 2);
+    }
+#endif
+
+    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeColorFilter)
+    
+protected:
+    void flatten(SkWriteBuffer& buffer) const override {
+        buffer.writeFlattenable(fOuter);
+        buffer.writeFlattenable(fInner);
+    }
+    
+private:
+    SkComposeColorFilter(SkColorFilter* outer, SkColorFilter* inner, int composedFilterCount)
+        : fOuter(SkRef(outer))
+        , fInner(SkRef(inner))
+        , fComposedFilterCount(composedFilterCount)
+    {
+        SkASSERT(composedFilterCount >= 2);
+        SkASSERT(composedFilterCount <= SK_MAX_COMPOSE_COLORFILTER_COUNT);
+    }
+
+    int privateComposedFilterCount() const override {
+        return fComposedFilterCount;
+    }
+
+    SkAutoTUnref<SkColorFilter> fOuter;
+    SkAutoTUnref<SkColorFilter> fInner;
+    const int                   fComposedFilterCount;
+
+    friend class SkColorFilter;
+
+    typedef SkColorFilter INHERITED;
+};
+
+SkFlattenable* SkComposeColorFilter::CreateProc(SkReadBuffer& buffer) {
+    SkAutoTUnref<SkColorFilter> outer(buffer.readColorFilter());
+    SkAutoTUnref<SkColorFilter> inner(buffer.readColorFilter());
+    return CreateComposeFilter(outer, inner);
 }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+SkColorFilter* SkColorFilter::CreateComposeFilter(SkColorFilter* outer, SkColorFilter* inner) {
+    if (!outer) {
+        return SkSafeRef(inner);
+    }
+    if (!inner) {
+        return SkSafeRef(outer);
+    }
+
+    // Give the subclass a shot at a more optimal composition...
+    SkColorFilter* composition = outer->newComposed(inner);
+    if (composition) {
+        return composition;
+    }
+
+    int count = inner->privateComposedFilterCount() + outer->privateComposedFilterCount();
+    if (count > SK_MAX_COMPOSE_COLORFILTER_COUNT) {
+        return nullptr;
+    }
+    return new SkComposeColorFilter(outer, inner, count);
+}
+
+SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkColorFilter)
+SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeColorFilter)
+SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END
+
diff --git a/gfx/skia/skia/include/core/SkColorShader.h b/gfx/skia/skia/src/core/SkColorShader.h
similarity index 52%
rename from gfx/skia/skia/include/core/SkColorShader.h
rename to gfx/skia/skia/src/core/SkColorShader.h
index 4ff7d2b01d37..e3fddb231a46 100644
--- a/gfx/skia/skia/include/core/SkColorShader.h
+++ b/gfx/skia/skia/src/core/SkColorShader.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2007 The Android Open Source Project
  *
@@ -6,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkColorShader_DEFINED
 #define SkColorShader_DEFINED
 
@@ -25,9 +23,9 @@ public:
     */
     explicit SkColorShader(SkColor c);
 
-    virtual bool isOpaque() const SK_OVERRIDE;
+    bool isOpaque() const override;
 
-    virtual size_t contextSize() const SK_OVERRIDE {
+    size_t contextSize() const override {
         return sizeof(ColorShaderContext);
     }
 
@@ -35,11 +33,11 @@ public:
     public:
         ColorShaderContext(const SkColorShader& shader, const ContextRec&);
 
-        virtual uint32_t getFlags() const SK_OVERRIDE;
-        virtual uint8_t getSpan16Alpha() const SK_OVERRIDE;
-        virtual void shadeSpan(int x, int y, SkPMColor span[], int count) SK_OVERRIDE;
-        virtual void shadeSpan16(int x, int y, uint16_t span[], int count) SK_OVERRIDE;
-        virtual void shadeSpanAlpha(int x, int y, uint8_t alpha[], int count) SK_OVERRIDE;
+        uint32_t getFlags() const override;
+        uint8_t getSpan16Alpha() const override;
+        void shadeSpan(int x, int y, SkPMColor span[], int count) override;
+        void shadeSpan16(int x, int y, uint16_t span[], int count) override;
+        void shadeSpanAlpha(int x, int y, uint8_t alpha[], int count) override;
 
     private:
         SkPMColor   fPMColor;
@@ -49,27 +47,27 @@ public:
         typedef SkShader::Context INHERITED;
     };
 
-    // we return false for this, use asAGradient
-    virtual BitmapType asABitmap(SkBitmap* outTexture,
-                                 SkMatrix* outMatrix,
-                                 TileMode xy[2]) const SK_OVERRIDE;
+    GradientType asAGradient(GradientInfo* info) const override;
 
-    virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE;
-
-    virtual bool asNewEffect(GrContext* context, const SkPaint& paint,
-                             const SkMatrix* localMatrix, GrColor* paintColor,
-                             GrEffect** effect) const SK_OVERRIDE;
+#if SK_SUPPORT_GPU
+    const GrFragmentProcessor* asFragmentProcessor(GrContext*, const SkMatrix& viewM,
+                                                   const SkMatrix*, SkFilterQuality) const override;
+#endif
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorShader)
 
 protected:
     SkColorShader(SkReadBuffer&);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
-    virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
+    Context* onCreateContext(const ContextRec&, void* storage) const override;
+    bool onAsLuminanceColor(SkColor* lum) const override {
+        *lum = fColor;
+        return true;
+    }
 
 private:
-    SkColor     fColor;         // ignored if fInheritColor is true
+    SkColor fColor;
 
     typedef SkShader INHERITED;
 };
diff --git a/gfx/skia/skia/src/core/SkColorTable.cpp b/gfx/skia/skia/src/core/SkColorTable.cpp
index b8e7b059e8fa..8e889d44c492 100644
--- a/gfx/skia/skia/src/core/SkColorTable.cpp
+++ b/gfx/skia/skia/src/core/SkColorTable.cpp
@@ -13,83 +13,58 @@
 #include "SkStream.h"
 #include "SkTemplates.h"
 
-// As copy constructor is hidden in the class hierarchy, we need to call
-// default constructor explicitly to suppress a compiler warning.
-SkColorTable::SkColorTable(const SkColorTable& src) : INHERITED() {
-    f16BitCache = NULL;
-    fAlphaType = src.fAlphaType;
-    int count = src.count();
-    fCount = SkToU16(count);
-    fColors = reinterpret_cast<SkPMColor*>(
-                                    sk_malloc_throw(count * sizeof(SkPMColor)));
-    memcpy(fColors, src.fColors, count * sizeof(SkPMColor));
+void SkColorTable::init(const SkPMColor colors[], int count) {
+    SkASSERT((unsigned)count <= 256);
 
-    SkDEBUGCODE(fColorLockCount = 0;)
-    SkDEBUGCODE(f16BitCacheLockCount = 0;)
+    fCount = count;
+    fColors = reinterpret_cast<SkPMColor*>(sk_malloc_throw(count * sizeof(SkPMColor)));
+
+    memcpy(fColors, colors, count * sizeof(SkPMColor));
 }
 
-SkColorTable::SkColorTable(const SkPMColor colors[], int count, SkAlphaType at)
-    : f16BitCache(NULL), fAlphaType(SkToU8(at))
-{
-    SkASSERT(0 == count || NULL != colors);
-
+SkColorTable::SkColorTable(const SkPMColor colors[], int count) {
+    SkASSERT(0 == count || colors);
     if (count < 0) {
         count = 0;
     } else if (count > 256) {
         count = 256;
     }
-
-    fCount = SkToU16(count);
-    fColors = reinterpret_cast<SkPMColor*>(
-                                    sk_malloc_throw(count * sizeof(SkPMColor)));
-
-    memcpy(fColors, colors, count * sizeof(SkPMColor));
-
-    SkDEBUGCODE(fColorLockCount = 0;)
-    SkDEBUGCODE(f16BitCacheLockCount = 0;)
+    this->init(colors, count);
 }
 
-SkColorTable::~SkColorTable()
+SkColorTable::SkColorTable(SkPMColor* colors, int count, AllocatedWithMalloc)
+    : fColors(colors)
+    , fCount(count)
 {
-    SkASSERT(fColorLockCount == 0);
-    SkASSERT(f16BitCacheLockCount == 0);
-
-    sk_free(fColors);
-    sk_free(f16BitCache);
+    SkASSERT(count > 0 && count <= 256);
+    SkASSERT(colors);
 }
 
-void SkColorTable::unlockColors() {
-    SkASSERT(fColorLockCount != 0);
-    SkDEBUGCODE(sk_atomic_dec(&fColorLockCount);)
+SkColorTable::~SkColorTable() {
+    sk_free(fColors);
+    // f16BitCache frees itself
 }
 
 #include "SkColorPriv.h"
 
-static inline void build_16bitcache(uint16_t dst[], const SkPMColor src[],
-                                    int count) {
-    while (--count >= 0) {
-        *dst++ = SkPixel32ToPixel16_ToU16(*src++);
-    }
-}
-
-const uint16_t* SkColorTable::lock16BitCache() {
-    if (this->isOpaque() && NULL == f16BitCache) {
-        f16BitCache = (uint16_t*)sk_malloc_throw(fCount * sizeof(uint16_t));
-        build_16bitcache(f16BitCache, fColors, fCount);
-    }
-
-    SkDEBUGCODE(f16BitCacheLockCount += 1);
-    return f16BitCache;
+const uint16_t* SkColorTable::read16BitCache() const {
+    return f16BitCache.get([&]{
+        auto cache = new uint16_t[fCount];
+        for (int i = 0; i < fCount; i++) {
+            cache[i] = SkPixel32ToPixel16_ToU16(fColors[i]);
+        }
+        return cache;
+    });
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
+#if 0
 SkColorTable::SkColorTable(SkReadBuffer& buffer) {
-    f16BitCache = NULL;
-    SkDEBUGCODE(fColorLockCount = 0;)
-    SkDEBUGCODE(f16BitCacheLockCount = 0;)
+    if (buffer.isVersionLT(SkReadBuffer::kRemoveColorTableAlpha_Version)) {
+        /*fAlphaType = */buffer.readUInt();
+    }
 
-    fAlphaType = SkToU8(buffer.readUInt());
     fCount = buffer.getArrayCount();
     size_t allocSize = fCount * sizeof(SkPMColor);
     SkDEBUGCODE(bool success = false;)
@@ -98,15 +73,40 @@ SkColorTable::SkColorTable(SkReadBuffer& buffer) {
         SkDEBUGCODE(success =) buffer.readColorArray(fColors, fCount);
     } else {
         fCount = 0;
-        fColors = NULL;
+        fColors = nullptr;
     }
 #ifdef SK_DEBUG
     SkASSERT((unsigned)fCount <= 256);
     SkASSERT(success);
 #endif
 }
+#endif
 
 void SkColorTable::writeToBuffer(SkWriteBuffer& buffer) const {
-    buffer.writeUInt(fAlphaType);
     buffer.writeColorArray(fColors, fCount);
 }
+
+SkColorTable* SkColorTable::Create(SkReadBuffer& buffer) {
+    if (buffer.isVersionLT(SkReadBuffer::kRemoveColorTableAlpha_Version)) {
+        /*fAlphaType = */buffer.readUInt();
+    }
+
+    const int count = buffer.getArrayCount();
+    if (0 == count) {
+        return new SkColorTable(nullptr, 0);
+    }
+
+    if (count < 0 || count > 256) {
+        buffer.validate(false);
+        return nullptr;
+    }
+
+    const size_t allocSize = count * sizeof(SkPMColor);
+    SkAutoTDelete<SkPMColor> colors((SkPMColor*)sk_malloc_throw(allocSize));
+    if (!buffer.readColorArray(colors, count)) {
+        return nullptr;
+    }
+
+    return new SkColorTable(colors.detach(), count, kAllocatedWithMalloc);
+}
+
diff --git a/gfx/skia/skia/src/core/SkComposeShader.cpp b/gfx/skia/skia/src/core/SkComposeShader.cpp
index f7de73b205d4..0dc0da68ef9b 100644
--- a/gfx/skia/skia/src/core/SkComposeShader.cpp
+++ b/gfx/skia/skia/src/core/SkComposeShader.cpp
@@ -26,19 +26,6 @@ SkComposeShader::SkComposeShader(SkShader* sA, SkShader* sB, SkXfermode* mode) {
     SkSafeRef(mode);
 }
 
-SkComposeShader::SkComposeShader(SkReadBuffer& buffer) :
-    INHERITED(buffer) {
-    fShaderA = buffer.readShader();
-    if (NULL == fShaderA) {
-        fShaderA = SkNEW_ARGS(SkColorShader, ((SkColor)0));
-    }
-    fShaderB = buffer.readShader();
-    if (NULL == fShaderB) {
-        fShaderB = SkNEW_ARGS(SkColorShader, ((SkColor)0));
-    }
-    fMode = buffer.readXfermode();
-}
-
 SkComposeShader::~SkComposeShader() {
     SkSafeUnref(fMode);
     fShaderB->unref();
@@ -66,8 +53,17 @@ private:
 };
 #define SkAutoAlphaRestore(...) SK_REQUIRE_LOCAL_VAR(SkAutoAlphaRestore)
 
+SkFlattenable* SkComposeShader::CreateProc(SkReadBuffer& buffer) {
+    SkAutoTUnref<SkShader> shaderA(buffer.readShader());
+    SkAutoTUnref<SkShader> shaderB(buffer.readShader());
+    SkAutoTUnref<SkXfermode> mode(buffer.readXfermode());
+    if (!shaderA.get() || !shaderB.get()) {
+        return nullptr;
+    }
+    return new SkComposeShader(shaderA, shaderB, mode);
+}
+
 void SkComposeShader::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
     buffer.writeFlattenable(fShaderA);
     buffer.writeFlattenable(fShaderB);
     buffer.writeFlattenable(fMode);
@@ -103,10 +99,10 @@ SkShader::Context* SkComposeShader::onCreateContext(const ContextRec& rec, void*
     if (!contextA || !contextB) {
         safe_call_destructor(contextA);
         safe_call_destructor(contextB);
-        return NULL;
+        return nullptr;
     }
 
-    return SkNEW_PLACEMENT_ARGS(storage, ComposeShaderContext, (*this, rec, contextA, contextB));
+    return new (storage) ComposeShaderContext(*this, rec, contextA, contextB);
 }
 
 SkComposeShader::ComposeShaderContext::ComposeShaderContext(
@@ -147,7 +143,7 @@ void SkComposeShader::ComposeShaderContext::shadeSpan(int x, int y, SkPMColor re
 
     SkPMColor   tmp[TMP_COLOR_COUNT];
 
-    if (NULL == mode) {   // implied SRC_OVER
+    if (nullptr == mode) {   // implied SRC_OVER
         // TODO: when we have a good test-case, should use SkBlitRow::Proc32
         // for these loops
         do {
@@ -183,7 +179,7 @@ void SkComposeShader::ComposeShaderContext::shadeSpan(int x, int y, SkPMColor re
 
             shaderContextA->shadeSpan(x, y, result, n);
             shaderContextB->shadeSpan(x, y, tmp, n);
-            mode->xfer32(result, tmp, n, NULL);
+            mode->xfer32(result, tmp, n, nullptr);
 
             if (256 != scale) {
                 for (int i = 0; i < n; i++) {
@@ -198,6 +194,50 @@ void SkComposeShader::ComposeShaderContext::shadeSpan(int x, int y, SkPMColor re
     }
 }
 
+#if SK_SUPPORT_GPU
+
+#include "effects/GrConstColorProcessor.h"
+#include "effects/GrXfermodeFragmentProcessor.h"
+
+/////////////////////////////////////////////////////////////////////
+
+const GrFragmentProcessor* SkComposeShader::asFragmentProcessor(GrContext* context,
+                                                            const SkMatrix& viewM,
+                                                            const SkMatrix* localMatrix,
+                                                            SkFilterQuality fq) const {
+    // Fragment processor will only support SkXfermode::Mode modes currently.
+    SkXfermode::Mode mode;
+    if (!(SkXfermode::AsMode(fMode, &mode))) {
+        return nullptr;
+    }
+
+    switch (mode) {
+        case SkXfermode::kClear_Mode:
+            return GrConstColorProcessor::Create(GrColor_TRANSPARENT_BLACK,
+                                                 GrConstColorProcessor::kIgnore_InputMode);
+            break;
+        case SkXfermode::kSrc_Mode:
+            return fShaderB->asFragmentProcessor(context, viewM, localMatrix, fq);
+            break;
+        case SkXfermode::kDst_Mode:
+            return fShaderA->asFragmentProcessor(context, viewM, localMatrix, fq);
+            break;
+        default:
+            SkAutoTUnref<const GrFragmentProcessor> fpA(fShaderA->asFragmentProcessor(context,
+                                                        viewM, localMatrix, fq));
+            if (!fpA.get()) {
+                return nullptr;
+            }
+            SkAutoTUnref<const GrFragmentProcessor> fpB(fShaderB->asFragmentProcessor(context,
+                                                        viewM, localMatrix, fq));
+            if (!fpB.get()) {
+                return nullptr;
+            }
+            return GrXfermodeFragmentProcessor::CreateFromTwoProcessors(fpB, fpA, mode);
+    }
+}
+#endif
+
 #ifndef SK_IGNORE_TO_STRING
 void SkComposeShader::toString(SkString* str) const {
     str->append("SkComposeShader: (");
@@ -206,8 +246,10 @@ void SkComposeShader::toString(SkString* str) const {
     fShaderA->toString(str);
     str->append(" ShaderB: ");
     fShaderB->toString(str);
-    str->append(" Xfermode: ");
-    fMode->toString(str);
+    if (fMode) {
+        str->append(" Xfermode: ");
+        fMode->toString(str);
+    }
 
     this->INHERITED::toString(str);
 
diff --git a/gfx/skia/skia/src/core/SkConfig8888.cpp b/gfx/skia/skia/src/core/SkConfig8888.cpp
index b0572c0544c6..53f35c373746 100644
--- a/gfx/skia/skia/src/core/SkConfig8888.cpp
+++ b/gfx/skia/skia/src/core/SkConfig8888.cpp
@@ -54,8 +54,8 @@ static bool is_32bit_colortype(SkColorType ct) {
 }
 
 static AlphaVerb compute_AlphaVerb(SkAlphaType src, SkAlphaType dst) {
-    SkASSERT(kIgnore_SkAlphaType != src);
-    SkASSERT(kIgnore_SkAlphaType != dst);
+    SkASSERT(kUnknown_SkAlphaType != src);
+    SkASSERT(kUnknown_SkAlphaType != dst);
 
     if (kOpaque_SkAlphaType == src || kOpaque_SkAlphaType == dst || src == dst) {
         return kNothing_AlphaVerb;
@@ -126,14 +126,44 @@ bool SkSrcPixelInfo::convertPixelsTo(SkDstPixelInfo* dst, int width, int height)
     return true;
 }
 
-static void rect_memcpy(void* dst, size_t dstRB, const void* src, size_t srcRB, size_t bytesPerRow,
-                        int rowCount) {
-    SkASSERT(bytesPerRow <= srcRB);
-    SkASSERT(bytesPerRow <= dstRB);
-    for (int i = 0; i < rowCount; ++i) {
-        memcpy(dst, src, bytesPerRow);
-        dst = (char*)dst + dstRB;
-        src = (const char*)src + srcRB;
+static void copy_g8_to_32(void* dst, size_t dstRB, const void* src, size_t srcRB, int w, int h) {
+    uint32_t* dst32 = (uint32_t*)dst;
+    const uint8_t* src8 = (const uint8_t*)src;
+    
+    for (int y = 0; y < h; ++y) {
+        for (int x = 0; x < w; ++x) {
+            dst32[x] = SkPackARGB32(0xFF, src8[x], src8[x], src8[x]);
+        }
+        dst32 = (uint32_t*)((char*)dst32 + dstRB);
+        src8 += srcRB;
+    }
+}
+
+static void copy_32_to_g8(void* dst, size_t dstRB, const void* src, size_t srcRB,
+                          const SkImageInfo& srcInfo) {
+    uint8_t* dst8 = (uint8_t*)dst;
+    const uint32_t* src32 = (const uint32_t*)src;
+
+    const int w = srcInfo.width();
+    const int h = srcInfo.height();
+    const bool isBGRA = (kBGRA_8888_SkColorType == srcInfo.colorType());
+
+    for (int y = 0; y < h; ++y) {
+        if (isBGRA) {
+            // BGRA
+            for (int x = 0; x < w; ++x) {
+                uint32_t s = src32[x];
+                dst8[x] = SkComputeLuminance((s >> 16) & 0xFF, (s >> 8) & 0xFF, s & 0xFF);
+            }
+        } else {
+            // RGBA
+            for (int x = 0; x < w; ++x) {
+                uint32_t s = src32[x];
+                dst8[x] = SkComputeLuminance(s & 0xFF, (s >> 8) & 0xFF, (s >> 16) & 0xFF);
+            }
+        }
+        src32 = (const uint32_t*)((const char*)src32 + srcRB);
+        dst8 += dstRB;
     }
 }
 
@@ -154,13 +184,13 @@ bool SkPixelInfo::CopyPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t
         dstPI.fAlphaType = dstInfo.alphaType();
         dstPI.fPixels = dstPixels;
         dstPI.fRowBytes = dstRB;
-        
+
         SkSrcPixelInfo srcPI;
         srcPI.fColorType = srcInfo.colorType();
         srcPI.fAlphaType = srcInfo.alphaType();
         srcPI.fPixels = srcPixels;
         srcPI.fRowBytes = srcRB;
-        
+
         return srcPI.convertPixelsTo(&dstPI, width, height);
     }
 
@@ -170,6 +200,7 @@ bool SkPixelInfo::CopyPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t
         switch (srcInfo.colorType()) {
             case kRGB_565_SkColorType:
             case kAlpha_8_SkColorType:
+            case kGray_8_SkColorType:
                 break;
             case kIndex_8_SkColorType:
             case kARGB_4444_SkColorType:
@@ -180,7 +211,7 @@ bool SkPixelInfo::CopyPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t
             default:
                 return false;
         }
-        rect_memcpy(dstPixels, dstRB, srcPixels, srcRB, width * srcInfo.bytesPerPixel(), height);
+        SkRectMemcpy(dstPixels, dstRB, srcPixels, srcRB, width * srcInfo.bytesPerPixel(), height);
         return true;
     }
 
@@ -189,6 +220,15 @@ bool SkPixelInfo::CopyPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t
      *  are supported.
      */
 
+    if (kGray_8_SkColorType == srcInfo.colorType() && 4 == dstInfo.bytesPerPixel()) {
+        copy_g8_to_32(dstPixels, dstRB, srcPixels, srcRB, width, height);
+        return true;
+    }
+    if (kGray_8_SkColorType == dstInfo.colorType() && 4 == srcInfo.bytesPerPixel()) {
+        copy_32_to_g8(dstPixels, dstRB, srcPixels, srcRB, srcInfo);
+        return true;
+    }
+
     // Can no longer draw directly into 4444, but we can manually whack it for a few combinations
     if (kARGB_4444_SkColorType == dstInfo.colorType() &&
         (kN32_SkColorType == srcInfo.colorType() || kIndex_8_SkColorType == srcInfo.colorType())) {
@@ -196,13 +236,13 @@ bool SkPixelInfo::CopyPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t
             // Our method for converting to 4444 assumes premultiplied.
             return false;
         }
-        
-        const SkPMColor* table = NULL;
+
+        const SkPMColor* table = nullptr;
         if (kIndex_8_SkColorType == srcInfo.colorType()) {
-            if (NULL == ctable) {
+            if (nullptr == ctable) {
                 return false;
             }
-            table = ctable->lockColors();
+            table = ctable->readColors();
         }
 
         for (int y = 0; y < height; ++y) {
@@ -222,10 +262,6 @@ bool SkPixelInfo::CopyPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t
             dstPixels = (char*)dstPixels + dstRB;
             srcPixels = (const char*)srcPixels + srcRB;
         }
-        
-        if (table) {
-            ctable->unlockColors();
-        }
         return true;
     }
 
@@ -240,11 +276,11 @@ bool SkPixelInfo::CopyPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t
     // TODO: switch the allocation of tmpDst to call sk_calloc_throw
     {
         SkBitmap bm;
-        if (!bm.installPixels(srcInfo, const_cast<void*>(srcPixels), srcRB, ctable, NULL, NULL)) {
+        if (!bm.installPixels(srcInfo, const_cast<void*>(srcPixels), srcRB, ctable, nullptr, nullptr)) {
             return false;
         }
         SkAutoTUnref<SkCanvas> canvas(SkCanvas::NewRasterDirect(dstInfo, dstPixels, dstRB));
-        if (NULL == canvas.get()) {
+        if (nullptr == canvas.get()) {
             return false;
         }
 
diff --git a/gfx/skia/skia/src/core/SkConfig8888.h b/gfx/skia/skia/src/core/SkConfig8888.h
index da0cbc66882f..ff287267aa47 100644
--- a/gfx/skia/skia/src/core/SkConfig8888.h
+++ b/gfx/skia/skia/src/core/SkConfig8888.h
@@ -10,6 +10,8 @@
 
 #include "SkImageInfo.h"
 
+class SkColorTable;
+
 struct SkPixelInfo {
     SkColorType fColorType;
     SkAlphaType fAlphaType;
@@ -17,7 +19,7 @@ struct SkPixelInfo {
 
     static bool CopyPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes,
                            const SkImageInfo& srcInfo, const void* srcPixels, size_t srcRowBytes,
-                           SkColorTable* srcCTable = NULL);
+                           SkColorTable* srcCTable = nullptr);
 };
 
 struct SkDstPixelInfo : SkPixelInfo {
@@ -32,4 +34,15 @@ struct SkSrcPixelInfo : SkPixelInfo {
     bool convertPixelsTo(SkDstPixelInfo* dst, int width, int height) const;
 };
 
+static inline void SkRectMemcpy(void* dst, size_t dstRB, const void* src, size_t srcRB,
+                                size_t bytesPerRow, int rowCount) {
+    SkASSERT(bytesPerRow <= srcRB);
+    SkASSERT(bytesPerRow <= dstRB);
+    for (int i = 0; i < rowCount; ++i) {
+        memcpy(dst, src, bytesPerRow);
+        dst = (char*)dst + dstRB;
+        src = (const char*)src + srcRB;
+    }
+}
+
 #endif
diff --git a/gfx/skia/skia/src/core/SkConvolver.cpp b/gfx/skia/skia/src/core/SkConvolver.cpp
index 23a1ee3aaf7d..28d3ab139ce1 100644
--- a/gfx/skia/skia/src/core/SkConvolver.cpp
+++ b/gfx/skia/skia/src/core/SkConvolver.cpp
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "SkConvolver.h"
+#include "SkMath.h"
 #include "SkSize.h"
 #include "SkTypes.h"
 
@@ -158,9 +159,12 @@ template<bool hasAlpha>
         }
     }
 
-    // There's a bug somewhere here with GCC autovectorization (-ftree-vectorize) on 32 bit builds.
-    // Dropping to -O2 disables -ftree-vectorize.  GCC 4.6 needs noinline.  http://skbug.com/2575
-    #if defined(__i386) && SK_HAS_ATTRIBUTE(optimize) && defined(SK_RELEASE)
+    // There's a bug somewhere here with GCC autovectorization (-ftree-vectorize).  We originally
+    // thought this was 32 bit only, but subsequent tests show that some 64 bit gcc compiles
+    // suffer here too.
+    //
+    // Dropping to -O2 disables -ftree-vectorize.  GCC 4.6 needs noinline.  https://bug.skia.org/2575
+    #if SK_HAS_ATTRIBUTE(optimize) && defined(SK_RELEASE)
         #define SK_MAYBE_DISABLE_VECTORIZATION __attribute__((optimize("O2"), noinline))
     #else
         #define SK_MAYBE_DISABLE_VECTORIZATION
@@ -349,13 +353,13 @@ const SkConvolutionFilter1D::ConvolutionFixed* SkConvolutionFilter1D::GetSingleF
     *filterLength = filter.fTrimmedLength;
     *specifiedFilterlength = filter.fLength;
     if (filter.fTrimmedLength == 0) {
-        return NULL;
+        return nullptr;
     }
 
     return &fFilterValues[filter.fDataLocation];
 }
 
-void BGRAConvolve2D(const unsigned char* sourceData,
+bool BGRAConvolve2D(const unsigned char* sourceData,
                     int sourceByteRowStride,
                     bool sourceHasAlpha,
                     const SkConvolutionFilter1D& filterX,
@@ -390,6 +394,20 @@ void BGRAConvolve2D(const unsigned char* sourceData,
     int rowBufferWidth = (filterX.numValues() + 15) & ~0xF;
     int rowBufferHeight = maxYFilterSize +
                           (convolveProcs.fConvolve4RowsHorizontally ? 4 : 0);
+
+    // check for too-big allocation requests : crbug.com/528628
+    {
+        int64_t size = sk_64_mul(rowBufferWidth, rowBufferHeight);
+        // need some limit, to avoid over-committing success from malloc, but then
+        // crashing when we try to actually use the memory.
+        // 100meg seems big enough to allow "normal" zoom factors and image sizes through
+        // while avoiding the crash seen by the bug (crbug.com/528628)
+        if (size > 100 * 1024 * 1024) {
+//            SkDebugf("BGRAConvolve2D: tmp allocation [%lld] too big\n", size);
+            return false;
+        }
+    }
+
     CircularRowBuffer rowBuffer(rowBufferWidth,
                                 rowBufferHeight,
                                 filterOffset);
@@ -433,7 +451,7 @@ void BGRAConvolve2D(const unsigned char* sourceData,
                     src[i] = &sourceData[(uint64_t)(nextXRow + i) * sourceByteRowStride];
                     outRow[i] = rowBuffer.advanceRow();
                 }
-                convolveProcs.fConvolve4RowsHorizontally(src, filterX, outRow);
+                convolveProcs.fConvolve4RowsHorizontally(src, filterX, outRow, 4*rowBufferWidth);
                 nextXRow += 4;
             } else {
                 // Check if we need to avoid SSE2 for this row.
@@ -483,4 +501,5 @@ void BGRAConvolve2D(const unsigned char* sourceData,
                                sourceHasAlpha);
         }
     }
+    return true;
 }
diff --git a/gfx/skia/skia/src/core/SkConvolver.h b/gfx/skia/skia/src/core/SkConvolver.h
index 8e53da2d4231..00305fa9fab2 100644
--- a/gfx/skia/skia/src/core/SkConvolver.h
+++ b/gfx/skia/skia/src/core/SkConvolver.h
@@ -46,7 +46,7 @@ public:
         // The cast relies on ConvolutionFixed being a short, implying that on
         // the platforms we care about all (16) bits will fit into
         // the mantissa of a (32-bit) float.
-        SK_COMPILE_ASSERT(sizeof(ConvolutionFixed) == 2, ConvolutionFixed_type_should_fit_in_float_mantissa);
+        static_assert(sizeof(ConvolutionFixed) == 2, "ConvolutionFixed_type_should_fit_in_float_mantissa");
         float raw = static_cast<float>(x);
         return ldexpf(raw, -kShiftBits);
     }
@@ -91,7 +91,7 @@ public:
         *filterOffset = filter.fOffset;
         *filterLength = filter.fTrimmedLength;
         if (filter.fTrimmedLength == 0) {
-            return NULL;
+            return nullptr;
         }
         return &fFilterValues[filter.fDataLocation];
     }
@@ -102,7 +102,7 @@ public:
   // |specifiedFilterLength| may be different if leading/trailing zeros of the
   // original floating point form were clipped.
   // There will be |filterLength| values in the return array.
-  // Returns NULL if the filter is 0-length (for instance when all floating
+  // Returns nullptr if the filter is 0-length (for instance when all floating
   // point values passed to AddFilter were clipped to 0).
     SK_API const ConvolutionFixed* GetSingleFilter(int* specifiedFilterLength,
         int* filterOffset,
@@ -153,7 +153,8 @@ typedef void (*SkConvolveVertically_pointer)(
 typedef void (*SkConvolve4RowsHorizontally_pointer)(
     const unsigned char* srcData[4],
     const SkConvolutionFilter1D& filter,
-    unsigned char* outRow[4]);
+    unsigned char* outRow[4],
+    size_t outRowBytes);
 typedef void (*SkConvolveHorizontally_pointer)(
     const unsigned char* srcData,
     const SkConvolutionFilter1D& filter,
@@ -192,7 +193,11 @@ struct SkConvolutionProcs {
 //
 // The layout in memory is assumed to be 4-bytes per pixel in B-G-R-A order
 // (this is ARGB when loaded into 32-bit words on a little-endian machine).
-SK_API void BGRAConvolve2D(const unsigned char* sourceData,
+/**
+ *  Returns false if it was unable to perform the convolution/rescale. in which case the output
+ *  buffer is assumed to be undefined.
+ */
+SK_API bool BGRAConvolve2D(const unsigned char* sourceData,
     int sourceByteRowStride,
     bool sourceHasAlpha,
     const SkConvolutionFilter1D& xfilter,
diff --git a/gfx/skia/skia/src/core/SkCoreBlitters.h b/gfx/skia/skia/src/core/SkCoreBlitters.h
index 20f9437ac8a8..b327039682e4 100644
--- a/gfx/skia/skia/src/core/SkCoreBlitters.h
+++ b/gfx/skia/skia/src/core/SkCoreBlitters.h
@@ -16,10 +16,10 @@
 
 class SkRasterBlitter : public SkBlitter {
 public:
-    SkRasterBlitter(const SkBitmap& device) : fDevice(device) {}
+    SkRasterBlitter(const SkPixmap& device) : fDevice(device) {}
 
 protected:
-    const SkBitmap& fDevice;
+    const SkPixmap fDevice;
 
 private:
     typedef SkBlitter INHERITED;
@@ -32,7 +32,7 @@ public:
       *  The blitter only ensures that the storage always holds a live object, but it may
       *  exchange that object.
       */
-    SkShaderBlitter(const SkBitmap& device, const SkPaint& paint,
+    SkShaderBlitter(const SkPixmap& device, const SkPaint& paint,
                     SkShader::Context* shaderContext);
     virtual ~SkShaderBlitter();
 
@@ -41,9 +41,9 @@ public:
       *  Will create the context at the same location as the old one (this is safe
       *  because the shader itself is unchanged).
       */
-    virtual bool resetShaderContext(const SkShader::ContextRec&) SK_OVERRIDE;
+    bool resetShaderContext(const SkShader::ContextRec&) override;
 
-    virtual SkShader::Context* getShaderContext() const SK_OVERRIDE { return fShaderContext; }
+    SkShader::Context* getShaderContext() const override { return fShaderContext; }
 
 protected:
     uint32_t            fShaderFlags;
@@ -61,24 +61,24 @@ private:
 
 class SkA8_Coverage_Blitter : public SkRasterBlitter {
 public:
-    SkA8_Coverage_Blitter(const SkBitmap& device, const SkPaint& paint);
-    virtual void blitH(int x, int y, int width) SK_OVERRIDE;
-    virtual void blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]) SK_OVERRIDE;
-    virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE;
-    virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE;
-    virtual void blitMask(const SkMask&, const SkIRect&) SK_OVERRIDE;
-    virtual const SkBitmap* justAnOpaqueColor(uint32_t*) SK_OVERRIDE;
+    SkA8_Coverage_Blitter(const SkPixmap& device, const SkPaint& paint);
+    void blitH(int x, int y, int width) override;
+    void blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]) override;
+    void blitV(int x, int y, int height, SkAlpha alpha) override;
+    void blitRect(int x, int y, int width, int height) override;
+    void blitMask(const SkMask&, const SkIRect&) override;
+    const SkPixmap* justAnOpaqueColor(uint32_t*) override;
 };
 
 class SkA8_Blitter : public SkRasterBlitter {
 public:
-    SkA8_Blitter(const SkBitmap& device, const SkPaint& paint);
-    virtual void blitH(int x, int y, int width);
-    virtual void blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]);
-    virtual void blitV(int x, int y, int height, SkAlpha alpha);
-    virtual void blitRect(int x, int y, int width, int height);
-    virtual void blitMask(const SkMask&, const SkIRect&);
-    virtual const SkBitmap* justAnOpaqueColor(uint32_t*);
+    SkA8_Blitter(const SkPixmap& device, const SkPaint& paint);
+    void blitH(int x, int y, int width) override;
+    void blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]) override;
+    void blitV(int x, int y, int height, SkAlpha alpha) override;
+    void blitRect(int x, int y, int width, int height) override;
+    void blitMask(const SkMask&, const SkIRect&) override;
+    const SkPixmap* justAnOpaqueColor(uint32_t*) override;
 
 private:
     unsigned fSrcA;
@@ -91,12 +91,12 @@ private:
 
 class SkA8_Shader_Blitter : public SkShaderBlitter {
 public:
-    SkA8_Shader_Blitter(const SkBitmap& device, const SkPaint& paint,
+    SkA8_Shader_Blitter(const SkPixmap& device, const SkPaint& paint,
                         SkShader::Context* shaderContext);
     virtual ~SkA8_Shader_Blitter();
-    virtual void blitH(int x, int y, int width);
-    virtual void blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]);
-    virtual void blitMask(const SkMask&, const SkIRect&);
+    void blitH(int x, int y, int width) override;
+    void blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]) override;
+    void blitMask(const SkMask&, const SkIRect&) override;
 
 private:
     SkXfermode* fXfermode;
@@ -113,19 +113,19 @@ private:
 
 class SkARGB32_Blitter : public SkRasterBlitter {
 public:
-    SkARGB32_Blitter(const SkBitmap& device, const SkPaint& paint);
-    virtual void blitH(int x, int y, int width);
-    virtual void blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]);
-    virtual void blitV(int x, int y, int height, SkAlpha alpha);
-    virtual void blitRect(int x, int y, int width, int height);
-    virtual void blitMask(const SkMask&, const SkIRect&);
-    virtual const SkBitmap* justAnOpaqueColor(uint32_t*);
+    SkARGB32_Blitter(const SkPixmap& device, const SkPaint& paint);
+    void blitH(int x, int y, int width) override;
+    void blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]) override;
+    void blitV(int x, int y, int height, SkAlpha alpha) override;
+    void blitRect(int x, int y, int width, int height) override;
+    void blitMask(const SkMask&, const SkIRect&) override;
+    const SkPixmap* justAnOpaqueColor(uint32_t*) override;
+    void blitAntiH2(int x, int y, U8CPU a0, U8CPU a1) override;
+    void blitAntiV2(int x, int y, U8CPU a0, U8CPU a1) override;
 
 protected:
     SkColor                fColor;
     SkPMColor              fPMColor;
-    SkBlitRow::ColorProc   fColor32Proc;
-    SkBlitRow::ColorRectProc fColorRect32Proc;
 
 private:
     unsigned fSrcA, fSrcR, fSrcG, fSrcB;
@@ -138,9 +138,11 @@ private:
 
 class SkARGB32_Opaque_Blitter : public SkARGB32_Blitter {
 public:
-    SkARGB32_Opaque_Blitter(const SkBitmap& device, const SkPaint& paint)
+    SkARGB32_Opaque_Blitter(const SkPixmap& device, const SkPaint& paint)
         : INHERITED(device, paint) { SkASSERT(paint.getAlpha() == 0xFF); }
-    virtual void blitMask(const SkMask&, const SkIRect&);
+    void blitMask(const SkMask&, const SkIRect&) override;
+    void blitAntiH2(int x, int y, U8CPU a0, U8CPU a1) override;
+    void blitAntiV2(int x, int y, U8CPU a0, U8CPU a1) override;
 
 private:
     typedef SkARGB32_Blitter INHERITED;
@@ -148,9 +150,11 @@ private:
 
 class SkARGB32_Black_Blitter : public SkARGB32_Opaque_Blitter {
 public:
-    SkARGB32_Black_Blitter(const SkBitmap& device, const SkPaint& paint)
+    SkARGB32_Black_Blitter(const SkPixmap& device, const SkPaint& paint)
         : INHERITED(device, paint) {}
-    virtual void blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]);
+    void blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]) override;
+    void blitAntiH2(int x, int y, U8CPU a0, U8CPU a1) override;
+    void blitAntiV2(int x, int y, U8CPU a0, U8CPU a1) override;
 
 private:
     typedef SkARGB32_Opaque_Blitter INHERITED;
@@ -158,14 +162,14 @@ private:
 
 class SkARGB32_Shader_Blitter : public SkShaderBlitter {
 public:
-    SkARGB32_Shader_Blitter(const SkBitmap& device, const SkPaint& paint,
+    SkARGB32_Shader_Blitter(const SkPixmap& device, const SkPaint& paint,
                             SkShader::Context* shaderContext);
     virtual ~SkARGB32_Shader_Blitter();
-    virtual void blitH(int x, int y, int width) SK_OVERRIDE;
-    virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE;
-    virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE;
-    virtual void blitAntiH(int x, int y, const SkAlpha[], const int16_t[]) SK_OVERRIDE;
-    virtual void blitMask(const SkMask&, const SkIRect&) SK_OVERRIDE;
+    void blitH(int x, int y, int width) override;
+    void blitV(int x, int y, int height, SkAlpha alpha) override;
+    void blitRect(int x, int y, int width, int height) override;
+    void blitAntiH(int x, int y, const SkAlpha[], const int16_t[]) override;
+    void blitMask(const SkMask&, const SkIRect&) override;
 
 private:
     SkXfermode*         fXfermode;
@@ -196,7 +200,7 @@ private:
     SkBlitter::Choose(...)
  */
 
-SkBlitter* SkBlitter_ChooseD565(const SkBitmap& device, const SkPaint& paint,
+SkBlitter* SkBlitter_ChooseD565(const SkPixmap& device, const SkPaint& paint,
                                 SkShader::Context* shaderContext,
                                 SkTBlitterAllocator* allocator);
 
diff --git a/gfx/skia/skia/src/core/SkData.cpp b/gfx/skia/skia/src/core/SkData.cpp
index c65328720a78..5bf833e1f372 100644
--- a/gfx/skia/skia/src/core/SkData.cpp
+++ b/gfx/skia/skia/src/core/SkData.cpp
@@ -6,26 +6,38 @@
  */
 
 #include "SkData.h"
-#include "SkLazyPtr.h"
 #include "SkOSFile.h"
+#include "SkOncePtr.h"
 #include "SkReadBuffer.h"
+#include "SkStream.h"
 #include "SkWriteBuffer.h"
 
 SkData::SkData(const void* ptr, size_t size, ReleaseProc proc, void* context) {
-    fPtr = ptr;
+    fPtr = const_cast<void*>(ptr);
     fSize = size;
     fReleaseProc = proc;
     fReleaseProcContext = context;
 }
 
+// This constructor means we are inline with our fPtr's contents. Thus we set fPtr
+// to point right after this. We also set our releaseproc to sk_inplace_sentinel_releaseproc,
+// since we need to handle "delete" ourselves. See internal_displose().
+//
+SkData::SkData(size_t size) {
+    fPtr = (char*)(this + 1);   // contents are immediately after this
+    fSize = size;
+    fReleaseProc = nullptr;
+    fReleaseProcContext = nullptr;
+}
+
 SkData::~SkData() {
     if (fReleaseProc) {
-        fReleaseProc(fPtr, fSize, fReleaseProcContext);
+        fReleaseProc(fPtr, fReleaseProcContext);
     }
 }
 
 bool SkData::equals(const SkData* other) const {
-    if (NULL == other) {
+    if (nullptr == other) {
         return false;
     }
 
@@ -47,61 +59,74 @@ size_t SkData::copyRange(size_t offset, size_t length, void* buffer) const {
     return length;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-
-SkData* SkData::NewEmptyImpl() {
-    return new SkData(NULL, 0, NULL, NULL);
-}
-void SkData::DeleteEmpty(SkData* ptr) { SkDELETE(ptr); }
-
-SkData* SkData::NewEmpty() {
-    SK_DECLARE_STATIC_LAZY_PTR(SkData, empty, NewEmptyImpl, DeleteEmpty);
-    return SkRef(empty.get());
-}
-
-// assumes fPtr was allocated via sk_malloc
-static void sk_free_releaseproc(const void* ptr, size_t, void*) {
-    sk_free((void*)ptr);
-}
-
-SkData* SkData::NewFromMalloc(const void* data, size_t length) {
-    return new SkData(data, length, sk_free_releaseproc, NULL);
-}
-
-SkData* SkData::NewWithCopy(const void* data, size_t length) {
+SkData* SkData::PrivateNewWithCopy(const void* srcOrNull, size_t length) {
     if (0 == length) {
         return SkData::NewEmpty();
     }
 
-    void* copy = sk_malloc_throw(length); // balanced in sk_free_releaseproc
-    memcpy(copy, data, length);
-    return new SkData(copy, length, sk_free_releaseproc, NULL);
+    const size_t actualLength = length + sizeof(SkData);
+    if (actualLength < length) {
+        // we overflowed
+        sk_throw();
+    }
+
+    char* storage = (char*)sk_malloc_throw(actualLength);
+    SkData* data = new (storage) SkData(length);
+    if (srcOrNull) {
+        memcpy(data->writable_data(), srcOrNull, length);
+    }
+    return data;
 }
 
-SkData* SkData::NewWithProc(const void* data, size_t length,
-                            ReleaseProc proc, void* context) {
-    return new SkData(data, length, proc, context);
+///////////////////////////////////////////////////////////////////////////////
+
+SK_DECLARE_STATIC_ONCE_PTR(SkData, gEmpty);
+SkData* SkData::NewEmpty() {
+    return SkRef(gEmpty.get([]{return new SkData(nullptr, 0, nullptr, nullptr); }));
+}
+
+// assumes fPtr was allocated via sk_malloc
+static void sk_free_releaseproc(const void* ptr, void*) {
+    sk_free((void*)ptr);
+}
+
+SkData* SkData::NewFromMalloc(const void* data, size_t length) {
+    return new SkData(data, length, sk_free_releaseproc, nullptr);
+}
+
+SkData* SkData::NewWithCopy(const void* src, size_t length) {
+    SkASSERT(src);
+    return PrivateNewWithCopy(src, length);
+}
+
+SkData* SkData::NewUninitialized(size_t length) {
+    return PrivateNewWithCopy(nullptr, length);
+}
+
+SkData* SkData::NewWithProc(const void* ptr, size_t length, ReleaseProc proc, void* context) {
+    return new SkData(ptr, length, proc, context);
 }
 
 // assumes fPtr was allocated with sk_fmmap
-static void sk_mmap_releaseproc(const void* addr, size_t length, void*) {
+static void sk_mmap_releaseproc(const void* addr, void* ctx) {
+    size_t length = reinterpret_cast<size_t>(ctx);
     sk_fmunmap(addr, length);
 }
 
-SkData* SkData::NewFromFILE(SkFILE* f) {
+SkData* SkData::NewFromFILE(FILE* f) {
     size_t size;
     void* addr = sk_fmmap(f, &size);
-    if (NULL == addr) {
-        return NULL;
+    if (nullptr == addr) {
+        return nullptr;
     }
 
-    return SkData::NewWithProc(addr, size, sk_mmap_releaseproc, NULL);
+    return SkData::NewWithProc(addr, size, sk_mmap_releaseproc, reinterpret_cast<void*>(size));
 }
 
 SkData* SkData::NewFromFileName(const char path[]) {
-    SkFILE* f = path ? sk_fopen(path, kRead_SkFILE_Flag) : NULL;
-    if (NULL == f) {
-        return NULL;
+    FILE* f = path ? sk_fopen(path, kRead_SkFILE_Flag) : nullptr;
+    if (nullptr == f) {
+        return nullptr;
     }
     SkData* data = NewFromFILE(f);
     sk_fclose(f);
@@ -111,15 +136,15 @@ SkData* SkData::NewFromFileName(const char path[]) {
 SkData* SkData::NewFromFD(int fd) {
     size_t size;
     void* addr = sk_fdmmap(fd, &size);
-    if (NULL == addr) {
-        return NULL;
+    if (nullptr == addr) {
+        return nullptr;
     }
 
-    return SkData::NewWithProc(addr, size, sk_mmap_releaseproc, NULL);
+    return SkData::NewWithProc(addr, size, sk_mmap_releaseproc, nullptr);
 }
 
 // assumes context is a SkData
-static void sk_dataref_releaseproc(const void*, size_t, void* context) {
+static void sk_dataref_releaseproc(const void*, void* context) {
     SkData* src = reinterpret_cast<SkData*>(context);
     src->unref();
 }
@@ -148,7 +173,7 @@ SkData* SkData::NewSubset(const SkData* src, size_t offset, size_t length) {
 
 SkData* SkData::NewWithCString(const char cstr[]) {
     size_t size;
-    if (NULL == cstr) {
+    if (nullptr == cstr) {
         cstr = "";
         size = 1;
     } else {
@@ -156,3 +181,14 @@ SkData* SkData::NewWithCString(const char cstr[]) {
     }
     return NewWithCopy(cstr, size);
 }
+
+///////////////////////////////////////////////////////////////////////////////
+
+SkData* SkData::NewFromStream(SkStream* stream, size_t size) {
+    SkAutoDataUnref data(SkData::NewUninitialized(size));
+    if (stream->read(data->writable_data(), size) != size) {
+        return nullptr;
+    }
+    return data.detach();
+}
+
diff --git a/gfx/skia/skia/src/core/SkDataTable.cpp b/gfx/skia/skia/src/core/SkDataTable.cpp
index e2644a05c98d..32e30af64df6 100644
--- a/gfx/skia/skia/src/core/SkDataTable.cpp
+++ b/gfx/skia/skia/src/core/SkDataTable.cpp
@@ -16,9 +16,9 @@ static void malloc_freeproc(void* context) {
 SkDataTable::SkDataTable() {
     fCount = 0;
     fElemSize = 0;   // 0 signals that we use fDir instead of fElems
-    fU.fDir = NULL;
-    fFreeProc = NULL;
-    fFreeProcContext = NULL;
+    fU.fDir = nullptr;
+    fFreeProc = nullptr;
+    fFreeProcContext = nullptr;
 }
 
 SkDataTable::SkDataTable(const void* array, size_t elemSize, int count,
@@ -78,8 +78,8 @@ const void* SkDataTable::at(int index, size_t* size) const {
 
 SkDataTable* SkDataTable::NewEmpty() {
     static SkDataTable* gEmpty;
-    if (NULL == gEmpty) {
-        gEmpty = SkNEW(SkDataTable);
+    if (nullptr == gEmpty) {
+        gEmpty = new SkDataTable;
     }
     gEmpty->ref();
     return gEmpty;
@@ -108,7 +108,7 @@ SkDataTable* SkDataTable::NewCopyArrays(const void * const * ptrs,
         elem += sizes[i];
     }
 
-    return SkNEW_ARGS(SkDataTable, (dir, count, malloc_freeproc, buffer));
+    return new SkDataTable(dir, count, malloc_freeproc, buffer);
 }
 
 SkDataTable* SkDataTable::NewCopyArray(const void* array, size_t elemSize,
@@ -121,8 +121,7 @@ SkDataTable* SkDataTable::NewCopyArray(const void* array, size_t elemSize,
     void* buffer = sk_malloc_throw(bufferSize);
     memcpy(buffer, array, bufferSize);
 
-    return SkNEW_ARGS(SkDataTable,
-                      (buffer, elemSize, count, malloc_freeproc, buffer));
+    return new SkDataTable(buffer, elemSize, count, malloc_freeproc, buffer);
 }
 
 SkDataTable* SkDataTable::NewArrayProc(const void* array, size_t elemSize,
@@ -130,17 +129,15 @@ SkDataTable* SkDataTable::NewArrayProc(const void* array, size_t elemSize,
     if (count <= 0) {
         return SkDataTable::NewEmpty();
     }
-    return SkNEW_ARGS(SkDataTable, (array, elemSize, count, proc, ctx));
+    return new SkDataTable(array, elemSize, count, proc, ctx);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static void chunkalloc_freeproc(void* context) {
-    SkDELETE((SkChunkAlloc*)context);
-}
+static void chunkalloc_freeproc(void* context) { delete (SkChunkAlloc*)context; }
 
 SkDataTableBuilder::SkDataTableBuilder(size_t minChunkSize)
-    : fHeap(NULL)
+    : fHeap(nullptr)
     , fMinChunkSize(minChunkSize) {}
 
 SkDataTableBuilder::~SkDataTableBuilder() { this->reset(); }
@@ -149,14 +146,14 @@ void SkDataTableBuilder::reset(size_t minChunkSize) {
     fMinChunkSize = minChunkSize;
     fDir.reset();
     if (fHeap) {
-        SkDELETE(fHeap);
-        fHeap = NULL;
+        delete fHeap;
+        fHeap = nullptr;
     }
 }
 
 void SkDataTableBuilder::append(const void* src, size_t size) {
-    if (NULL == fHeap) {
-        fHeap = SkNEW_ARGS(SkChunkAlloc, (fMinChunkSize));
+    if (nullptr == fHeap) {
+        fHeap = new SkChunkAlloc(fMinChunkSize);
     }
 
     void* dst = fHeap->alloc(size, SkChunkAlloc::kThrow_AllocFailType);
@@ -178,11 +175,9 @@ SkDataTable* SkDataTableBuilder::detachDataTable() {
                              SkChunkAlloc::kThrow_AllocFailType);
     memcpy(dir, fDir.begin(), count * sizeof(SkDataTable::Dir));
 
-    SkDataTable* table = SkNEW_ARGS(SkDataTable,
-                                    ((SkDataTable::Dir*)dir, count,
-                                     chunkalloc_freeproc, fHeap));
+    SkDataTable* table = new SkDataTable((SkDataTable::Dir*)dir, count, chunkalloc_freeproc, fHeap);
     // we have to detach our fHeap, since we are giving that to the table
-    fHeap = NULL;
+    fHeap = nullptr;
     fDir.reset();
     return table;
 }
diff --git a/gfx/skia/skia/src/core/SkDebug.cpp b/gfx/skia/skia/src/core/SkDebug.cpp
index b705a650ea2c..0a3a976771a3 100644
--- a/gfx/skia/skia/src/core/SkDebug.cpp
+++ b/gfx/skia/skia/src/core/SkDebug.cpp
@@ -57,3 +57,9 @@ size_t SkToSizeT(uintmax_t x) {
 }
 
 #endif
+
+#if defined(GOOGLE3)
+void SkDebugfForDumpStackTrace(const char* data, void* unused) {
+    SkDebugf("%s", data);
+}
+#endif
diff --git a/gfx/skia/skia/src/core/SkDeque.cpp b/gfx/skia/skia/src/core/SkDeque.cpp
index d210dcf20be1..2e469d1faf17 100644
--- a/gfx/skia/skia/src/core/SkDeque.cpp
+++ b/gfx/skia/skia/src/core/SkDeque.cpp
@@ -20,20 +20,20 @@ struct SkDeque::Block {
     const char* start() const { return (const char*)(this + 1); }
 
     void init(size_t size) {
-        fNext   = fPrev = NULL;
-        fBegin  = fEnd = NULL;
+        fNext   = fPrev = nullptr;
+        fBegin  = fEnd = nullptr;
         fStop   = (char*)this + size;
     }
 };
 
 SkDeque::SkDeque(size_t elemSize, int allocCount)
         : fElemSize(elemSize)
-        , fInitialStorage(NULL)
+        , fInitialStorage(nullptr)
         , fCount(0)
         , fAllocCount(allocCount) {
     SkASSERT(allocCount >= 1);
-    fFrontBlock = fBackBlock = NULL;
-    fFront = fBack = NULL;
+    fFrontBlock = fBackBlock = nullptr;
+    fFront = fBack = nullptr;
 }
 
 SkDeque::SkDeque(size_t elemSize, void* storage, size_t storageSize, int allocCount)
@@ -41,17 +41,17 @@ SkDeque::SkDeque(size_t elemSize, void* storage, size_t storageSize, int allocCo
         , fInitialStorage(storage)
         , fCount(0)
         , fAllocCount(allocCount) {
-    SkASSERT(storageSize == 0 || storage != NULL);
+    SkASSERT(storageSize == 0 || storage != nullptr);
     SkASSERT(allocCount >= 1);
 
     if (storageSize >= sizeof(Block) + elemSize) {
         fFrontBlock = (Block*)storage;
         fFrontBlock->init(storageSize);
     } else {
-        fFrontBlock = NULL;
+        fFrontBlock = nullptr;
     }
     fBackBlock = fFrontBlock;
-    fFront = fBack = NULL;
+    fFront = fBack = nullptr;
 }
 
 SkDeque::~SkDeque() {
@@ -70,7 +70,7 @@ SkDeque::~SkDeque() {
 void* SkDeque::push_front() {
     fCount += 1;
 
-    if (NULL == fFrontBlock) {
+    if (nullptr == fFrontBlock) {
         fFrontBlock = this->allocateBlock(fAllocCount);
         fBackBlock = fFrontBlock;     // update our linklist
     }
@@ -78,7 +78,7 @@ void* SkDeque::push_front() {
     Block*  first = fFrontBlock;
     char*   begin;
 
-    if (NULL == first->fBegin) {
+    if (nullptr == first->fBegin) {
     INIT_CHUNK:
         first->fEnd = first->fStop;
         begin = first->fStop - fElemSize;
@@ -96,11 +96,11 @@ void* SkDeque::push_front() {
 
     first->fBegin = begin;
 
-    if (NULL == fFront) {
-        SkASSERT(NULL == fBack);
+    if (nullptr == fFront) {
+        SkASSERT(nullptr == fBack);
         fFront = fBack = begin;
     } else {
-        SkASSERT(NULL != fBack);
+        SkASSERT(fBack);
         fFront = begin;
     }
 
@@ -110,7 +110,7 @@ void* SkDeque::push_front() {
 void* SkDeque::push_back() {
     fCount += 1;
 
-    if (NULL == fBackBlock) {
+    if (nullptr == fBackBlock) {
         fBackBlock = this->allocateBlock(fAllocCount);
         fFrontBlock = fBackBlock; // update our linklist
     }
@@ -118,7 +118,7 @@ void* SkDeque::push_back() {
     Block*  last = fBackBlock;
     char*   end;
 
-    if (NULL == last->fBegin) {
+    if (nullptr == last->fBegin) {
     INIT_CHUNK:
         last->fBegin = last->start();
         end = last->fBegin + fElemSize;
@@ -137,11 +137,11 @@ void* SkDeque::push_back() {
     last->fEnd = end;
     end -= fElemSize;
 
-    if (NULL == fBack) {
-        SkASSERT(NULL == fFront);
+    if (nullptr == fBack) {
+        SkASSERT(nullptr == fFront);
         fFront = fBack = end;
     } else {
-        SkASSERT(NULL != fFront);
+        SkASSERT(fFront);
         fBack = end;
     }
 
@@ -154,14 +154,14 @@ void SkDeque::pop_front() {
 
     Block*  first = fFrontBlock;
 
-    SkASSERT(first != NULL);
+    SkASSERT(first != nullptr);
 
-    if (first->fBegin == NULL) {  // we were marked empty from before
+    if (first->fBegin == nullptr) {  // we were marked empty from before
         first = first->fNext;
-        first->fPrev = NULL;
+        first->fPrev = nullptr;
         this->freeBlock(fFrontBlock);
         fFrontBlock = first;
-        SkASSERT(first != NULL);    // else we popped too far
+        SkASSERT(first != nullptr);    // else we popped too far
     }
 
     char* begin = first->fBegin + fElemSize;
@@ -169,14 +169,14 @@ void SkDeque::pop_front() {
 
     if (begin < fFrontBlock->fEnd) {
         first->fBegin = begin;
-        SkASSERT(NULL != first->fBegin);
+        SkASSERT(first->fBegin);
         fFront = first->fBegin;
     } else {
-        first->fBegin = first->fEnd = NULL;  // mark as empty
-        if (NULL == first->fNext) {
-            fFront = fBack = NULL;
+        first->fBegin = first->fEnd = nullptr;  // mark as empty
+        if (nullptr == first->fNext) {
+            fFront = fBack = nullptr;
         } else {
-            SkASSERT(NULL != first->fNext->fBegin);
+            SkASSERT(first->fNext->fBegin);
             fFront = first->fNext->fBegin;
         }
     }
@@ -188,14 +188,14 @@ void SkDeque::pop_back() {
 
     Block* last = fBackBlock;
 
-    SkASSERT(last != NULL);
+    SkASSERT(last != nullptr);
 
-    if (last->fEnd == NULL) {  // we were marked empty from before
+    if (last->fEnd == nullptr) {  // we were marked empty from before
         last = last->fPrev;
-        last->fNext = NULL;
+        last->fNext = nullptr;
         this->freeBlock(fBackBlock);
         fBackBlock = last;
-        SkASSERT(last != NULL);  // else we popped too far
+        SkASSERT(last != nullptr);  // else we popped too far
     }
 
     char* end = last->fEnd - fElemSize;
@@ -203,14 +203,14 @@ void SkDeque::pop_back() {
 
     if (end > last->fBegin) {
         last->fEnd = end;
-        SkASSERT(NULL != last->fEnd);
+        SkASSERT(last->fEnd);
         fBack = last->fEnd - fElemSize;
     } else {
-        last->fBegin = last->fEnd = NULL;    // mark as empty
-        if (NULL == last->fPrev) {
-            fFront = fBack = NULL;
+        last->fBegin = last->fEnd = nullptr;    // mark as empty
+        if (nullptr == last->fPrev) {
+            fFront = fBack = nullptr;
         } else {
-            SkASSERT(NULL != last->fPrev->fEnd);
+            SkASSERT(last->fPrev->fEnd);
             fBack = last->fPrev->fEnd - fElemSize;
         }
     }
@@ -238,7 +238,7 @@ void SkDeque::freeBlock(Block* block) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkDeque::Iter::Iter() : fCurBlock(NULL), fPos(NULL), fElemSize(0) {}
+SkDeque::Iter::Iter() : fCurBlock(nullptr), fPos(nullptr), fElemSize(0) {}
 
 SkDeque::Iter::Iter(const SkDeque& d, IterStart startLoc) {
     this->reset(d, startLoc);
@@ -255,8 +255,8 @@ void* SkDeque::Iter::next() {
         if (next == fCurBlock->fEnd) { // exhausted this chunk, move to next
             do {
                 fCurBlock = fCurBlock->fNext;
-            } while (fCurBlock != NULL && fCurBlock->fBegin == NULL);
-            next = fCurBlock ? fCurBlock->fBegin : NULL;
+            } while (fCurBlock != nullptr && fCurBlock->fBegin == nullptr);
+            next = fCurBlock ? fCurBlock->fBegin : nullptr;
         }
         fPos = next;
     }
@@ -274,8 +274,8 @@ void* SkDeque::Iter::prev() {
         if (prev < fCurBlock->fBegin) { // exhausted this chunk, move to prior
             do {
                 fCurBlock = fCurBlock->fPrev;
-            } while (fCurBlock != NULL && fCurBlock->fEnd == NULL);
-            prev = fCurBlock ? fCurBlock->fEnd - fElemSize : NULL;
+            } while (fCurBlock != nullptr && fCurBlock->fEnd == nullptr);
+            prev = fCurBlock ? fCurBlock->fEnd - fElemSize : nullptr;
         }
         fPos = prev;
     }
@@ -286,23 +286,23 @@ void* SkDeque::Iter::prev() {
 // of the doubly linked list until a non-empty one is found. The fPos
 // member is then set to the first (or last) element in the block. If
 // there are no elements in the deque both fCurBlock and fPos will come
-// out of this routine NULL.
+// out of this routine nullptr.
 void SkDeque::Iter::reset(const SkDeque& d, IterStart startLoc) {
     fElemSize = d.fElemSize;
 
     if (kFront_IterStart == startLoc) {
         // initialize the iterator to start at the front
         fCurBlock = d.fFrontBlock;
-        while (NULL != fCurBlock && NULL == fCurBlock->fBegin) {
+        while (fCurBlock && nullptr == fCurBlock->fBegin) {
             fCurBlock = fCurBlock->fNext;
         }
-        fPos = fCurBlock ? fCurBlock->fBegin : NULL;
+        fPos = fCurBlock ? fCurBlock->fBegin : nullptr;
     } else {
         // initialize the iterator to start at the back
         fCurBlock = d.fBackBlock;
-        while (NULL != fCurBlock && NULL == fCurBlock->fEnd) {
+        while (fCurBlock && nullptr == fCurBlock->fEnd) {
             fCurBlock = fCurBlock->fPrev;
         }
-        fPos = fCurBlock ? fCurBlock->fEnd - fElemSize : NULL;
+        fPos = fCurBlock ? fCurBlock->fEnd - fElemSize : nullptr;
     }
 }
diff --git a/gfx/skia/skia/src/core/SkDescriptor.h b/gfx/skia/skia/src/core/SkDescriptor.h
index d550863568ef..1f6f4a8657d0 100644
--- a/gfx/skia/skia/src/core/SkDescriptor.h
+++ b/gfx/skia/skia/src/core/SkDescriptor.h
@@ -37,12 +37,12 @@ public:
 
     uint32_t getLength() const { return fLength; }
 
-    void* addEntry(uint32_t tag, size_t length, const void* data = NULL) {
+    void* addEntry(uint32_t tag, size_t length, const void* data = nullptr) {
         SkASSERT(tag);
         SkASSERT(SkAlign4(length) == length);
-        SkASSERT(this->findEntry(tag, NULL) == NULL);
+        SkASSERT(this->findEntry(tag, nullptr) == nullptr);
 
-        Entry*  entry = (Entry*)((char*)this + fLength);
+        Entry* entry = (Entry*)((char*)this + fLength);
         entry->fTag = tag;
         entry->fLen = SkToU32(length);
         if (data) {
@@ -50,7 +50,7 @@ public:
         }
 
         fCount += 1;
-        fLength += sizeof(Entry) + length;
+        fLength = SkToU32(fLength + sizeof(Entry) + length);
         return (entry + 1); // return its data
     }
 
@@ -77,7 +77,7 @@ public:
             }
             entry = (const Entry*)((const char*)(entry + 1) + entry->fLen);
         }
-        return NULL;
+        return nullptr;
     }
 
     SkDescriptor* copy() const {
@@ -134,7 +134,18 @@ private:
 
 class SkAutoDescriptor : SkNoncopyable {
 public:
-    SkAutoDescriptor(size_t size) {
+    SkAutoDescriptor() : fDesc(nullptr) {}
+    SkAutoDescriptor(size_t size) : fDesc(nullptr) { this->reset(size); }
+    SkAutoDescriptor(const SkDescriptor& desc) : fDesc(nullptr) {
+        size_t size = desc.getLength();
+        this->reset(size);
+        memcpy(fDesc, &desc, size);
+    }
+
+    ~SkAutoDescriptor() { this->free(); }
+
+    void reset(size_t size) {
+        this->free();
         if (size <= sizeof(fStorage)) {
             fDesc = (SkDescriptor*)(void*)fStorage;
         } else {
@@ -142,14 +153,14 @@ public:
         }
     }
 
-    ~SkAutoDescriptor() {
+    SkDescriptor* getDesc() const { SkASSERT(fDesc); return fDesc; }
+private:
+    void free() {
         if (fDesc != (SkDescriptor*)(void*)fStorage) {
             SkDescriptor::Free(fDesc);
         }
     }
 
-    SkDescriptor* getDesc() const { return fDesc; }
-private:
     enum {
         kStorageSize =  sizeof(SkDescriptor)
                         + sizeof(SkDescriptor::Entry) + sizeof(SkScalerContext::Rec)    // for rec
diff --git a/gfx/skia/skia/src/core/SkDevice.cpp b/gfx/skia/skia/src/core/SkDevice.cpp
index e71c889451df..34c171db9071 100644
--- a/gfx/skia/skia/src/core/SkDevice.cpp
+++ b/gfx/skia/skia/src/core/SkDevice.cpp
@@ -5,45 +5,37 @@
  * found in the LICENSE file.
  */
 
+#include "SkColorFilter.h"
 #include "SkDevice.h"
+#include "SkDraw.h"
+#include "SkDrawFilter.h"
+#include "SkImage_Base.h"
 #include "SkMetaData.h"
+#include "SkNinePatchIter.h"
+#include "SkPatchUtils.h"
+#include "SkPathMeasure.h"
+#include "SkRasterClip.h"
+#include "SkRSXform.h"
+#include "SkShader.h"
+#include "SkTextBlobRunIterator.h"
+#include "SkTextToPathIter.h"
 
-SkBaseDevice::SkBaseDevice()
-    : fLeakyProperties(SkDeviceProperties::MakeDefault())
+SkBaseDevice::SkBaseDevice(const SkSurfaceProps& surfaceProps)
+    : fSurfaceProps(surfaceProps)
 #ifdef SK_DEBUG
     , fAttachedToCanvas(false)
 #endif
 {
     fOrigin.setZero();
-    fMetaData = NULL;
+    fMetaData = nullptr;
 }
 
-SkBaseDevice::SkBaseDevice(const SkDeviceProperties& deviceProperties)
-    : fLeakyProperties(deviceProperties)
-#ifdef SK_DEBUG
-    , fAttachedToCanvas(false)
-#endif
-{
-    fOrigin.setZero();
-    fMetaData = NULL;
-}
-
-SkBaseDevice::~SkBaseDevice() {
-    delete fMetaData;
-}
-
-SkBaseDevice* SkBaseDevice::createCompatibleDevice(const SkImageInfo& info) {
-    return this->onCreateDevice(info, kGeneral_Usage);
-}
-
-SkBaseDevice* SkBaseDevice::createCompatibleDeviceForSaveLayer(const SkImageInfo& info) {
-    return this->onCreateDevice(info, kSaveLayer_Usage);
-}
+SkBaseDevice::~SkBaseDevice() { delete fMetaData; }
 
 SkMetaData& SkBaseDevice::getMetaData() {
     // metadata users are rare, so we lazily allocate it. If that changes we
     // can decide to just make it a field in the device (rather than a ptr)
-    if (NULL == fMetaData) {
+    if (nullptr == fMetaData) {
         fMetaData = new SkMetaData;
     }
     return *fMetaData;
@@ -61,9 +53,23 @@ const SkBitmap& SkBaseDevice::accessBitmap(bool changePixels) {
     return bitmap;
 }
 
-SkSurface* SkBaseDevice::newSurface(const SkImageInfo&) { return NULL; }
-
-const void* SkBaseDevice::peekPixels(SkImageInfo*, size_t*) { return NULL; }
+SkPixelGeometry SkBaseDevice::CreateInfo::AdjustGeometry(const SkImageInfo& info,
+                                                         TileUsage tileUsage,
+                                                         SkPixelGeometry geo) {
+    switch (tileUsage) {
+        case kPossible_TileUsage:
+            // (we think) for compatibility with old clients, we assume this layer can support LCD
+            // even though they may not have marked it as opaque... seems like we should update
+            // our callers (reed/robertphilips).
+            break;
+        case kNever_TileUsage:
+            if (info.alphaType() != kOpaque_SkAlphaType) {
+                geo = kUnknown_SkPixelGeometry;
+            }
+            break;
+    }
+    return geo;
+}
 
 void SkBaseDevice::drawDRRect(const SkDraw& draw, const SkRRect& outer,
                               const SkRRect& inner, const SkPaint& paint) {
@@ -72,11 +78,146 @@ void SkBaseDevice::drawDRRect(const SkDraw& draw, const SkRRect& outer,
     path.addRRect(inner);
     path.setFillType(SkPath::kEvenOdd_FillType);
 
-    const SkMatrix* preMatrix = NULL;
+    const SkMatrix* preMatrix = nullptr;
     const bool pathIsMutable = true;
     this->drawPath(draw, path, paint, preMatrix, pathIsMutable);
 }
 
+void SkBaseDevice::drawPatch(const SkDraw& draw, const SkPoint cubics[12], const SkColor colors[4],
+                             const SkPoint texCoords[4], SkXfermode* xmode, const SkPaint& paint) {
+    SkPatchUtils::VertexData data;
+    
+    SkISize lod = SkPatchUtils::GetLevelOfDetail(cubics, draw.fMatrix);
+
+    // It automatically adjusts lodX and lodY in case it exceeds the number of indices.
+    // If it fails to generate the vertices, then we do not draw. 
+    if (SkPatchUtils::getVertexData(&data, cubics, colors, texCoords, lod.width(), lod.height())) {
+        this->drawVertices(draw, SkCanvas::kTriangles_VertexMode, data.fVertexCount, data.fPoints,
+                           data.fTexCoords, data.fColors, xmode, data.fIndices, data.fIndexCount,
+                           paint);
+    }
+}
+
+void SkBaseDevice::drawTextBlob(const SkDraw& draw, const SkTextBlob* blob, SkScalar x, SkScalar y,
+                                const SkPaint &paint, SkDrawFilter* drawFilter) {
+
+    SkPaint runPaint = paint;
+
+    SkTextBlobRunIterator it(blob);
+    for (;!it.done(); it.next()) {
+        size_t textLen = it.glyphCount() * sizeof(uint16_t);
+        const SkPoint& offset = it.offset();
+        // applyFontToPaint() always overwrites the exact same attributes,
+        // so it is safe to not re-seed the paint for this reason.
+        it.applyFontToPaint(&runPaint);
+
+        if (drawFilter && !drawFilter->filter(&runPaint, SkDrawFilter::kText_Type)) {
+            // A false return from filter() means we should abort the current draw.
+            runPaint = paint;
+            continue;
+        }
+
+        runPaint.setFlags(this->filterTextFlags(runPaint));
+
+        switch (it.positioning()) {
+        case SkTextBlob::kDefault_Positioning:
+            this->drawText(draw, it.glyphs(), textLen, x + offset.x(), y + offset.y(), runPaint);
+            break;
+        case SkTextBlob::kHorizontal_Positioning:
+            this->drawPosText(draw, it.glyphs(), textLen, it.pos(), 1,
+                              SkPoint::Make(x, y + offset.y()), runPaint);
+            break;
+        case SkTextBlob::kFull_Positioning:
+            this->drawPosText(draw, it.glyphs(), textLen, it.pos(), 2,
+                              SkPoint::Make(x, y), runPaint);
+            break;
+        default:
+            SkFAIL("unhandled positioning mode");
+        }
+
+        if (drawFilter) {
+            // A draw filter may change the paint arbitrarily, so we must re-seed in this case.
+            runPaint = paint;
+        }
+    }
+}
+
+void SkBaseDevice::drawImage(const SkDraw& draw, const SkImage* image, SkScalar x, SkScalar y,
+                             const SkPaint& paint) {
+    // Default impl : turns everything into raster bitmap
+    SkBitmap bm;
+    if (as_IB(image)->getROPixels(&bm)) {
+        this->drawBitmap(draw, bm, SkMatrix::MakeTrans(x, y), paint);
+    }
+}
+
+void SkBaseDevice::drawImageRect(const SkDraw& draw, const SkImage* image, const SkRect* src,
+                                 const SkRect& dst, const SkPaint& paint,
+                                 SkCanvas::SrcRectConstraint constraint) {
+    // Default impl : turns everything into raster bitmap
+    SkBitmap bm;
+    if (as_IB(image)->getROPixels(&bm)) {
+        this->drawBitmapRect(draw, bm, src, dst, paint, constraint);
+    }
+}
+
+void SkBaseDevice::drawImageNine(const SkDraw& draw, const SkImage* image, const SkIRect& center,
+                                 const SkRect& dst, const SkPaint& paint) {
+    SkNinePatchIter iter(image->width(), image->height(), center, dst);
+
+    SkRect srcR, dstR;
+    while (iter.next(&srcR, &dstR)) {
+        this->drawImageRect(draw, image, &srcR, dstR, paint, SkCanvas::kStrict_SrcRectConstraint);
+    }
+}
+
+void SkBaseDevice::drawBitmapNine(const SkDraw& draw, const SkBitmap& bitmap, const SkIRect& center,
+                                  const SkRect& dst, const SkPaint& paint) {
+    SkNinePatchIter iter(bitmap.width(), bitmap.height(), center, dst);
+    
+    SkRect srcR, dstR;
+    while (iter.next(&srcR, &dstR)) {
+        this->drawBitmapRect(draw, bitmap, &srcR, dstR, paint, SkCanvas::kStrict_SrcRectConstraint);
+    }
+}
+
+void SkBaseDevice::drawAtlas(const SkDraw& draw, const SkImage* atlas, const SkRSXform xform[],
+                             const SkRect tex[], const SkColor colors[], int count,
+                             SkXfermode::Mode mode, const SkPaint& paint) {
+    SkPath path;
+    path.setIsVolatile(true);
+
+    for (int i = 0; i < count; ++i) {
+        SkPoint quad[4];
+        xform[i].toQuad(tex[i].width(), tex[i].height(), quad);
+        
+        SkMatrix localM;
+        localM.setRSXform(xform[i]);
+        localM.preTranslate(-tex[i].left(), -tex[i].top());
+
+        SkPaint pnt(paint);
+        SkAutoTUnref<SkShader> shader(atlas->newShader(SkShader::kClamp_TileMode,
+                                                       SkShader::kClamp_TileMode,
+                                                       &localM));
+        if (!shader) {
+            break;
+        }
+        pnt.setShader(shader);
+
+        if (colors) {
+            SkAutoTUnref<SkColorFilter> cf(SkColorFilter::CreateModeFilter(colors[i], mode));
+            pnt.setColorFilter(cf);
+        }
+        
+        path.rewind();
+        path.addPoly(quad, 4, true);
+        path.setConvexity(SkPath::kConvex_Convexity);
+        this->drawPath(draw, path, pnt, nullptr, true);
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
 bool SkBaseDevice::readPixels(const SkImageInfo& info, void* dstP, size_t rowBytes, int x, int y) {
 #ifdef SK_DEBUG
     SkASSERT(info.width() > 0 && info.height() > 0);
@@ -114,27 +255,167 @@ bool SkBaseDevice::onReadPixels(const SkImageInfo&, void*, size_t, int x, int y)
     return false;
 }
 
-void* SkBaseDevice::accessPixels(SkImageInfo* info, size_t* rowBytes) {
-    SkImageInfo tmpInfo;
-    size_t tmpRowBytes;
-    if (NULL == info) {
-        info = &tmpInfo;
-    }
-    if (NULL == rowBytes) {
-        rowBytes = &tmpRowBytes;
-    }
-    return this->onAccessPixels(info, rowBytes);
-}
-
-void* SkBaseDevice::onAccessPixels(SkImageInfo* info, size_t* rowBytes) {
-    return NULL;
-}
-
-void SkBaseDevice::EXPERIMENTAL_optimize(const SkPicture* picture) {
-    // The base class doesn't perform any analysis but derived classes may
-}
-
-bool SkBaseDevice::EXPERIMENTAL_drawPicture(SkCanvas* canvas, const SkPicture* picture) {
+bool SkBaseDevice::EXPERIMENTAL_drawPicture(SkCanvas*, const SkPicture*, const SkMatrix*,
+                                            const SkPaint*) {
     // The base class doesn't perform any accelerated picture rendering
     return false;
 }
+
+bool SkBaseDevice::accessPixels(SkPixmap* pmap) {
+    SkPixmap tempStorage;
+    if (nullptr == pmap) {
+        pmap = &tempStorage;
+    }
+    return this->onAccessPixels(pmap);
+}
+
+bool SkBaseDevice::peekPixels(SkPixmap* pmap) {
+    SkPixmap tempStorage;
+    if (nullptr == pmap) {
+        pmap = &tempStorage;
+    }
+    return this->onPeekPixels(pmap);
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+
+static void morphpoints(SkPoint dst[], const SkPoint src[], int count,
+                        SkPathMeasure& meas, const SkMatrix& matrix) {
+    SkMatrix::MapXYProc proc = matrix.getMapXYProc();
+    
+    for (int i = 0; i < count; i++) {
+        SkPoint pos;
+        SkVector tangent;
+        
+        proc(matrix, src[i].fX, src[i].fY, &pos);
+        SkScalar sx = pos.fX;
+        SkScalar sy = pos.fY;
+        
+        if (!meas.getPosTan(sx, &pos, &tangent)) {
+            // set to 0 if the measure failed, so that we just set dst == pos
+            tangent.set(0, 0);
+        }
+        
+        /*  This is the old way (that explains our approach but is way too slow
+         SkMatrix    matrix;
+         SkPoint     pt;
+         
+         pt.set(sx, sy);
+         matrix.setSinCos(tangent.fY, tangent.fX);
+         matrix.preTranslate(-sx, 0);
+         matrix.postTranslate(pos.fX, pos.fY);
+         matrix.mapPoints(&dst[i], &pt, 1);
+         */
+        dst[i].set(pos.fX - SkScalarMul(tangent.fY, sy),
+                   pos.fY + SkScalarMul(tangent.fX, sy));
+    }
+}
+
+/*  TODO
+ 
+ Need differentially more subdivisions when the follow-path is curvy. Not sure how to
+ determine that, but we need it. I guess a cheap answer is let the caller tell us,
+ but that seems like a cop-out. Another answer is to get Rob Johnson to figure it out.
+ */
+static void morphpath(SkPath* dst, const SkPath& src, SkPathMeasure& meas,
+                      const SkMatrix& matrix) {
+    SkPath::Iter    iter(src, false);
+    SkPoint         srcP[4], dstP[3];
+    SkPath::Verb    verb;
+    
+    while ((verb = iter.next(srcP)) != SkPath::kDone_Verb) {
+        switch (verb) {
+            case SkPath::kMove_Verb:
+                morphpoints(dstP, srcP, 1, meas, matrix);
+                dst->moveTo(dstP[0]);
+                break;
+            case SkPath::kLine_Verb:
+                // turn lines into quads to look bendy
+                srcP[0].fX = SkScalarAve(srcP[0].fX, srcP[1].fX);
+                srcP[0].fY = SkScalarAve(srcP[0].fY, srcP[1].fY);
+                morphpoints(dstP, srcP, 2, meas, matrix);
+                dst->quadTo(dstP[0], dstP[1]);
+                break;
+            case SkPath::kQuad_Verb:
+                morphpoints(dstP, &srcP[1], 2, meas, matrix);
+                dst->quadTo(dstP[0], dstP[1]);
+                break;
+            case SkPath::kCubic_Verb:
+                morphpoints(dstP, &srcP[1], 3, meas, matrix);
+                dst->cubicTo(dstP[0], dstP[1], dstP[2]);
+                break;
+            case SkPath::kClose_Verb:
+                dst->close();
+                break;
+            default:
+                SkDEBUGFAIL("unknown verb");
+                break;
+        }
+    }
+}
+
+void SkBaseDevice::drawTextOnPath(const SkDraw& draw, const void* text, size_t byteLength,
+                                  const SkPath& follow, const SkMatrix* matrix,
+                                  const SkPaint& paint) {
+    SkASSERT(byteLength == 0 || text != nullptr);
+    
+    // nothing to draw
+    if (text == nullptr || byteLength == 0 || draw.fRC->isEmpty()) {
+        return;
+    }
+    
+    SkTextToPathIter    iter((const char*)text, byteLength, paint, true);
+    SkPathMeasure       meas(follow, false);
+    SkScalar            hOffset = 0;
+    
+    // need to measure first
+    if (paint.getTextAlign() != SkPaint::kLeft_Align) {
+        SkScalar pathLen = meas.getLength();
+        if (paint.getTextAlign() == SkPaint::kCenter_Align) {
+            pathLen = SkScalarHalf(pathLen);
+        }
+        hOffset += pathLen;
+    }
+    
+    const SkPath*   iterPath;
+    SkScalar        xpos;
+    SkMatrix        scaledMatrix;
+    SkScalar        scale = iter.getPathScale();
+    
+    scaledMatrix.setScale(scale, scale);
+    
+    while (iter.next(&iterPath, &xpos)) {
+        if (iterPath) {
+            SkPath      tmp;
+            SkMatrix    m(scaledMatrix);
+            
+            tmp.setIsVolatile(true);
+            m.postTranslate(xpos + hOffset, 0);
+            if (matrix) {
+                m.postConcat(*matrix);
+            }
+            morphpath(&tmp, *iterPath, meas, m);
+            this->drawPath(draw, tmp, iter.getPaint(), nullptr, true);
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+
+uint32_t SkBaseDevice::filterTextFlags(const SkPaint& paint) const {
+    uint32_t flags = paint.getFlags();
+
+    if (!paint.isLCDRenderText() || !paint.isAntiAlias()) {
+        return flags;
+    }
+
+    if (kUnknown_SkPixelGeometry == fSurfaceProps.pixelGeometry()
+        || this->onShouldDisableLCD(paint)) {
+
+        flags &= ~SkPaint::kLCDRenderText_Flag;
+        flags |= SkPaint::kGenA8FromLCD_Flag;
+    }
+
+    return flags;
+}
+
diff --git a/gfx/skia/skia/src/core/SkDeviceImageFilterProxy.h b/gfx/skia/skia/src/core/SkDeviceImageFilterProxy.h
deleted file mode 100644
index 5ee563484ee3..000000000000
--- a/gfx/skia/skia/src/core/SkDeviceImageFilterProxy.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2012 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkDeviceImageFilterProxy_DEFINED
-#define SkDeviceImageFilterProxy_DEFINED
-
-#include "SkImageFilter.h"
-
-class SkDeviceImageFilterProxy : public SkImageFilter::Proxy {
-public:
-    SkDeviceImageFilterProxy(SkBaseDevice* device) : fDevice(device) {}
-
-    virtual SkBaseDevice* createDevice(int w, int h) SK_OVERRIDE {
-        return fDevice->createCompatibleDevice(SkImageInfo::MakeN32Premul(w, h));
-    }
-    virtual bool canHandleImageFilter(const SkImageFilter* filter) SK_OVERRIDE {
-        return fDevice->canHandleImageFilter(filter);
-    }
-    virtual bool filterImage(const SkImageFilter* filter, const SkBitmap& src,
-                             const SkImageFilter::Context& ctx,
-                             SkBitmap* result, SkIPoint* offset) SK_OVERRIDE {
-        return fDevice->filterImage(filter, src, ctx, result, offset);
-    }
-
-private:
-    SkBaseDevice* fDevice;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/core/SkDeviceLooper.cpp b/gfx/skia/skia/src/core/SkDeviceLooper.cpp
index 9346465dfc9f..c4e401361c17 100644
--- a/gfx/skia/skia/src/core/SkDeviceLooper.cpp
+++ b/gfx/skia/skia/src/core/SkDeviceLooper.cpp
@@ -7,17 +7,17 @@
 
 #include "SkDeviceLooper.h"
 
-SkDeviceLooper::SkDeviceLooper(const SkBitmap& base,
-                               const SkRasterClip& rc,
-                               const SkIRect& bounds, bool aa)
-: fBaseBitmap(base)
-, fBaseRC(rc)
-, fDelta(aa ? kAA_Delta : kBW_Delta)
+SkDeviceLooper::SkDeviceLooper(const SkPixmap& base, const SkRasterClip& rc, const SkIRect& bounds,
+                               bool aa)
+    : fBaseDst(base)
+    , fBaseRC(rc)
+    , fSubsetRC(rc.isForceConservativeRects())
+    , fDelta(aa ? kAA_Delta : kBW_Delta)
 {
     // sentinels that next() has not yet been called, and so our mapper functions
     // should not be called either.
-    fCurrBitmap = NULL;
-    fCurrRC = NULL;
+    fCurrDst = nullptr;
+    fCurrRC = nullptr;
 
     if (!rc.isEmpty()) {
         // clip must be contained by the bitmap
@@ -37,12 +37,11 @@ SkDeviceLooper::SkDeviceLooper(const SkBitmap& base,
     }
 }
 
-SkDeviceLooper::~SkDeviceLooper() {
-}
+SkDeviceLooper::~SkDeviceLooper() {}
 
 void SkDeviceLooper::mapRect(SkRect* dst, const SkRect& src) const {
     SkASSERT(kDone_State != fState);
-    SkASSERT(fCurrBitmap);
+    SkASSERT(fCurrDst);
     SkASSERT(fCurrRC);
 
     *dst = src;
@@ -52,12 +51,11 @@ void SkDeviceLooper::mapRect(SkRect* dst, const SkRect& src) const {
 
 void SkDeviceLooper::mapMatrix(SkMatrix* dst, const SkMatrix& src) const {
     SkASSERT(kDone_State != fState);
-    SkASSERT(fCurrBitmap);
+    SkASSERT(fCurrDst);
     SkASSERT(fCurrRC);
 
     *dst = src;
-    dst->postTranslate(SkIntToScalar(-fCurrOffset.fX),
-                       SkIntToScalar(-fCurrOffset.fY));
+    dst->postTranslate(SkIntToScalar(-fCurrOffset.fX), SkIntToScalar(-fCurrOffset.fY));
 }
 
 bool SkDeviceLooper::computeCurrBitmapAndClip() {
@@ -65,16 +63,14 @@ bool SkDeviceLooper::computeCurrBitmapAndClip() {
 
     SkIRect r = SkIRect::MakeXYWH(fCurrOffset.x(), fCurrOffset.y(),
                                   fDelta, fDelta);
-    if (!fBaseBitmap.extractSubset(&fSubsetBitmap, r)) {
+    if (!fBaseDst.extractSubset(&fSubsetDst, r)) {
         fSubsetRC.setEmpty();
     } else {
-        fSubsetBitmap.lockPixels();
         fBaseRC.translate(-r.left(), -r.top(), &fSubsetRC);
-        (void)fSubsetRC.op(SkIRect::MakeWH(fDelta, fDelta),
-                           SkRegion::kIntersect_Op);
+        (void)fSubsetRC.op(SkIRect::MakeWH(fDelta, fDelta), SkRegion::kIntersect_Op);
     }
 
-    fCurrBitmap = &fSubsetBitmap;
+    fCurrDst = &fSubsetDst;
     fCurrRC = &fSubsetRC;
     return !fCurrRC->isEmpty();
 }
@@ -106,8 +102,8 @@ bool SkDeviceLooper::next() {
 
         case kSimple_State:
             // first time for simple
-            if (NULL == fCurrBitmap) {
-                fCurrBitmap = &fBaseBitmap;
+            if (nullptr == fCurrDst) {
+                fCurrDst = &fBaseDst;
                 fCurrRC = &fBaseRC;
                 fCurrOffset.set(0, 0);
                 return true;
diff --git a/gfx/skia/skia/src/core/SkDeviceLooper.h b/gfx/skia/skia/src/core/SkDeviceLooper.h
index a218345ae8b6..dd346d744559 100644
--- a/gfx/skia/skia/src/core/SkDeviceLooper.h
+++ b/gfx/skia/skia/src/core/SkDeviceLooper.h
@@ -30,14 +30,13 @@
  */
 class SkDeviceLooper {
 public:
-    SkDeviceLooper(const SkBitmap& base, const SkRasterClip&,
-                   const SkIRect& bounds, bool aa);
+    SkDeviceLooper(const SkPixmap& base, const SkRasterClip&, const SkIRect& bounds, bool aa);
     ~SkDeviceLooper();
 
-    const SkBitmap& getBitmap() const {
+    const SkPixmap& getPixmap() const {
         SkASSERT(kDone_State != fState);
-        SkASSERT(fCurrBitmap);
-        return *fCurrBitmap;
+        SkASSERT(fCurrDst);
+        return *fCurrDst;
     }
 
     const SkRasterClip& getRC() const {
@@ -61,7 +60,7 @@ public:
     bool next();
 
 private:
-    const SkBitmap&     fBaseBitmap;
+    const SkPixmap&     fBaseDst;
     const SkRasterClip& fBaseRC;
 
     enum State {
@@ -71,10 +70,10 @@ private:
     };
 
     // storage for our tiled versions. Perhaps could use SkTLazy
-    SkBitmap            fSubsetBitmap;
+    SkPixmap            fSubsetDst;
     SkRasterClip        fSubsetRC;
 
-    const SkBitmap*     fCurrBitmap;
+    const SkPixmap*     fCurrDst;
     const SkRasterClip* fCurrRC;
     SkIRect             fClippedBounds;
     SkIPoint            fCurrOffset;
diff --git a/gfx/skia/skia/src/core/SkDeviceProfile.cpp b/gfx/skia/skia/src/core/SkDeviceProfile.cpp
index 8d60151f6f29..e1c10c87d773 100644
--- a/gfx/skia/skia/src/core/SkDeviceProfile.cpp
+++ b/gfx/skia/skia/src/core/SkDeviceProfile.cpp
@@ -7,7 +7,7 @@
 
 
 #include "SkDeviceProfile.h"
-#include "SkThread.h"
+#include "SkMutex.h"
 
 #define DEFAULT_GAMMAEXP        2.2f
 #define DEFAULT_CONTRASTSCALE   0.5f
@@ -41,7 +41,7 @@ SkDeviceProfile* SkDeviceProfile::Create(float gammaExp,
                                          float contrast,
                                          LCDConfig config,
                                          FontHintLevel level) {
-    return SkNEW_ARGS(SkDeviceProfile, (gammaExp, contrast, config, level));
+    return new SkDeviceProfile(gammaExp, contrast, config, level);
 }
 
 SK_DECLARE_STATIC_MUTEX(gMutex);
@@ -51,7 +51,7 @@ static SkDeviceProfile* gGlobalProfile;
 SkDeviceProfile* SkDeviceProfile::GetDefault() {
     SkAutoMutexAcquire amc(gMutex);
 
-    if (NULL == gDefaultProfile) {
+    if (nullptr == gDefaultProfile) {
         gDefaultProfile = SkDeviceProfile::Create(DEFAULT_GAMMAEXP,
                                                   DEFAULT_CONTRASTSCALE,
                                                   DEFAULT_LCDCONFIG,
@@ -63,7 +63,7 @@ SkDeviceProfile* SkDeviceProfile::GetDefault() {
 SkDeviceProfile* SkDeviceProfile::RefGlobal() {
     SkAutoMutexAcquire amc(gMutex);
 
-    if (NULL == gGlobalProfile) {
+    if (nullptr == gGlobalProfile) {
         gGlobalProfile = SkDeviceProfile::GetDefault();
     }
     gGlobalProfile->ref();
diff --git a/gfx/skia/skia/src/core/SkDeviceProfile.h b/gfx/skia/skia/src/core/SkDeviceProfile.h
index 6ef8dfb8395f..2872b1345813 100644
--- a/gfx/skia/skia/src/core/SkDeviceProfile.h
+++ b/gfx/skia/skia/src/core/SkDeviceProfile.h
@@ -12,7 +12,7 @@
 
 class SkDeviceProfile : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkDeviceProfile)
+    
 
     enum LCDConfig {
         kNone_LCDConfig,   // disables LCD text rendering, uses A8 instead
@@ -52,7 +52,7 @@ public:
 
     /**
      *  Returns the global default profile, that is used if no global profile is
-     *  specified with SetGlobal(), or if NULL is specified to SetGlobal().
+     *  specified with SetGlobal(), or if nullptr is specified to SetGlobal().
      *  The references count is *not* incremented, and the caller should not
      *  call unref().
      */
@@ -69,7 +69,7 @@ public:
      *  Make the specified profile be the global value for all subsequently
      *  instantiated devices. Does not affect any existing devices.
      *  Increments the reference count on the profile.
-     *  Specify NULL for the "identity" profile (where there is no gamma or
+     *  Specify nullptr for the "identity" profile (where there is no gamma or
      *  contrast correction).
      */
     static void SetGlobal(SkDeviceProfile*);
diff --git a/gfx/skia/skia/src/core/SkDiscardableMemory.h b/gfx/skia/skia/src/core/SkDiscardableMemory.h
index f3159fe2af0c..8952b8df7f2d 100644
--- a/gfx/skia/skia/src/core/SkDiscardableMemory.h
+++ b/gfx/skia/skia/src/core/SkDiscardableMemory.h
@@ -19,13 +19,13 @@ class SK_API SkDiscardableMemory {
 public:
     /**
      *  Factory method that creates, initializes and locks an SkDiscardableMemory
-     *  object. If either of these steps fails, a NULL pointer will be returned.
+     *  object. If either of these steps fails, a nullptr pointer will be returned.
      */
     static SkDiscardableMemory* Create(size_t bytes);
 
     /**
      *  Factory class that creates, initializes and locks an SkDiscardableMemory
-     *  object. If either of these steps fails, a NULL pointer will be returned.
+     *  object. If either of these steps fails, a nullptr pointer will be returned.
      */
     class Factory : public SkRefCnt {
     public:
diff --git a/gfx/skia/skia/src/core/SkDistanceFieldGen.cpp b/gfx/skia/skia/src/core/SkDistanceFieldGen.cpp
index ef0ee86d59ce..30354e09f83c 100755
--- a/gfx/skia/skia/src/core/SkDistanceFieldGen.cpp
+++ b/gfx/skia/skia/src/core/SkDistanceFieldGen.cpp
@@ -332,8 +332,8 @@ static unsigned char pack_distance_field_val(float dist, float distanceMagnitude
 static bool generate_distance_field_from_image(unsigned char* distanceField,
                                                const unsigned char* copyPtr,
                                                int width, int height) {
-    SkASSERT(NULL != distanceField);
-    SkASSERT(NULL != copyPtr);
+    SkASSERT(distanceField);
+    SkASSERT(copyPtr);
 
     // we expand our temp data by one more on each side to simplify
     // the scanning code -- will always be treated as infinitely far away
@@ -461,9 +461,9 @@ static bool generate_distance_field_from_image(unsigned char* distanceField,
 // assumes an 8-bit image and distance field
 bool SkGenerateDistanceFieldFromA8Image(unsigned char* distanceField,
                                         const unsigned char* image,
-                                        int width, int height, int rowBytes) {
-    SkASSERT(NULL != distanceField);
-    SkASSERT(NULL != image);
+                                        int width, int height, size_t rowBytes) {
+    SkASSERT(distanceField);
+    SkASSERT(image);
 
     // create temp data
     SkAutoSMalloc<1024> copyStorage((width+2)*(height+2)*sizeof(char));
@@ -489,9 +489,9 @@ bool SkGenerateDistanceFieldFromA8Image(unsigned char* distanceField,
 // assumes a 1-bit image and 8-bit distance field
 bool SkGenerateDistanceFieldFromBWImage(unsigned char* distanceField,
                                         const unsigned char* image,
-                                        int width, int height, int rowBytes) {
-    SkASSERT(NULL != distanceField);
-    SkASSERT(NULL != image);
+                                        int width, int height, size_t rowBytes) {
+    SkASSERT(distanceField);
+    SkASSERT(image);
 
     // create temp data
     SkAutoSMalloc<1024> copyStorage((width+2)*(height+2)*sizeof(char));
diff --git a/gfx/skia/skia/src/core/SkDistanceFieldGen.h b/gfx/skia/skia/src/core/SkDistanceFieldGen.h
index 0510907f8c88..4a09ace107f1 100644
--- a/gfx/skia/skia/src/core/SkDistanceFieldGen.h
+++ b/gfx/skia/skia/src/core/SkDistanceFieldGen.h
@@ -35,7 +35,7 @@
  */
 bool SkGenerateDistanceFieldFromA8Image(unsigned char* distanceField,
                                         const unsigned char* image,
-                                        int w, int h, int rowBytes);
+                                        int w, int h, size_t rowBytes);
 
 /** Given 1-bit mask data, generate the associated distance field
 
@@ -48,7 +48,7 @@ bool SkGenerateDistanceFieldFromA8Image(unsigned char* distanceField,
  */
 bool SkGenerateDistanceFieldFromBWImage(unsigned char* distanceField,
                                         const unsigned char* image,
-                                        int w, int h, int rowBytes);
+                                        int w, int h, size_t rowBytes);
 
 /** Given width and height of original image, return size (in bytes) of distance field
  *  @param w                 Width of the original image.
diff --git a/gfx/skia/skia/src/core/SkDraw.cpp b/gfx/skia/skia/src/core/SkDraw.cpp
index d9c44a2b6fe4..e1a49d39b4a5 100644
--- a/gfx/skia/skia/src/core/SkDraw.cpp
+++ b/gfx/skia/skia/src/core/SkDraw.cpp
@@ -4,6 +4,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#define __STDC_LIMIT_MACROS
 
 #include "SkDraw.h"
 #include "SkBlitter.h"
@@ -11,8 +12,10 @@
 #include "SkColorPriv.h"
 #include "SkDevice.h"
 #include "SkDeviceLooper.h"
+#include "SkFindAndPlaceGlyph.h"
 #include "SkFixed.h"
 #include "SkMaskFilter.h"
+#include "SkMatrix.h"
 #include "SkPaint.h"
 #include "SkPathEffect.h"
 #include "SkRasterClip.h"
@@ -23,17 +26,18 @@
 #include "SkSmallAllocator.h"
 #include "SkString.h"
 #include "SkStroke.h"
+#include "SkStrokeRec.h"
+#include "SkTemplates.h"
 #include "SkTextMapStateProc.h"
 #include "SkTLazy.h"
+#include "SkUtility.h"
 #include "SkUtils.h"
 #include "SkVertState.h"
 
-#include "SkAutoKern.h"
 #include "SkBitmapProcShader.h"
 #include "SkDrawProcs.h"
 #include "SkMatrixUtils.h"
 
-
 //#define TRACE_BITMAP_DRAWS
 
 
@@ -42,21 +46,20 @@
 class SkAutoBlitterChoose : SkNoncopyable {
 public:
     SkAutoBlitterChoose() {
-        fBlitter = NULL;
+        fBlitter = nullptr;
     }
-    SkAutoBlitterChoose(const SkBitmap& device, const SkMatrix& matrix,
+    SkAutoBlitterChoose(const SkPixmap& dst, const SkMatrix& matrix,
                         const SkPaint& paint, bool drawCoverage = false) {
-        fBlitter = SkBlitter::Choose(device, matrix, paint, &fAllocator,
-                                     drawCoverage);
+        fBlitter = SkBlitter::Choose(dst, matrix, paint, &fAllocator, drawCoverage);
     }
 
     SkBlitter*  operator->() { return fBlitter; }
     SkBlitter*  get() const { return fBlitter; }
 
-    void choose(const SkBitmap& device, const SkMatrix& matrix,
-                const SkPaint& paint) {
+    void choose(const SkPixmap& dst, const SkMatrix& matrix,
+                const SkPaint& paint, bool drawCoverage = false) {
         SkASSERT(!fBlitter);
-        fBlitter = SkBlitter::Choose(device, matrix, paint, &fAllocator);
+        fBlitter = SkBlitter::Choose(dst, matrix, paint, &fAllocator, drawCoverage);
     }
 
 private:
@@ -74,11 +77,11 @@ private:
 class SkAutoBitmapShaderInstall : SkNoncopyable {
 public:
     SkAutoBitmapShaderInstall(const SkBitmap& src, const SkPaint& paint,
-                              const SkMatrix* localMatrix = NULL)
+                              const SkMatrix* localMatrix = nullptr)
             : fPaint(paint) /* makes a copy of the paint */ {
-        fPaint.setShader(CreateBitmapShader(src, SkShader::kClamp_TileMode,
-                                            SkShader::kClamp_TileMode,
-                                            localMatrix, &fAllocator));
+        fPaint.setShader(SkCreateBitmapShader(src, SkShader::kClamp_TileMode,
+                                              SkShader::kClamp_TileMode,
+                                              localMatrix, &fAllocator));
         // we deliberately left the shader with an owner-count of 2
         SkASSERT(2 == fPaint.getShader()->getRefCnt());
     }
@@ -87,7 +90,7 @@ public:
         // since fAllocator will destroy shader, we insist that owners == 2
         SkASSERT(2 == fPaint.getShader()->getRefCnt());
 
-        fPaint.setShader(NULL); // unref the shader by 1
+        fPaint.setShader(nullptr); // unref the shader by 1
 
     }
 
@@ -151,18 +154,17 @@ static void DA8_Src_BitmapXferProc(void* pixels, size_t bytes, uint32_t data) {
     memset(pixels, data, bytes);
 }
 
-static BitmapXferProc ChooseBitmapXferProc(const SkBitmap& bitmap,
-                                           const SkPaint& paint,
+static BitmapXferProc ChooseBitmapXferProc(const SkPixmap& dst, const SkPaint& paint,
                                            uint32_t* data) {
     // todo: we can apply colorfilter up front if no shader, so we wouldn't
     // need to abort this fastpath
     if (paint.getShader() || paint.getColorFilter()) {
-        return NULL;
+        return nullptr;
     }
 
     SkXfermode::Mode mode;
     if (!SkXfermode::AsMode(paint.getXfermode(), &mode)) {
-        return NULL;
+        return nullptr;
     }
 
     SkColor color = paint.getColor();
@@ -189,7 +191,7 @@ static BitmapXferProc ChooseBitmapXferProc(const SkBitmap& bitmap,
                 should I worry about dithering for the lower depths?
             */
             SkPMColor pmc = SkPreMultiplyColor(color);
-            switch (bitmap.colorType()) {
+            switch (dst.colorType()) {
                 case kN32_SkColorType:
                     if (data) {
                         *data = pmc;
@@ -216,13 +218,13 @@ static BitmapXferProc ChooseBitmapXferProc(const SkBitmap& bitmap,
         default:
             break;
     }
-    return NULL;
+    return nullptr;
 }
 
-static void CallBitmapXferProc(const SkBitmap& bitmap, const SkIRect& rect,
-                               BitmapXferProc proc, uint32_t procData) {
+static void CallBitmapXferProc(const SkPixmap& dst, const SkIRect& rect, BitmapXferProc proc,
+                               uint32_t procData) {
     int shiftPerPixel;
-    switch (bitmap.colorType()) {
+    switch (dst.colorType()) {
         case kN32_SkColorType:
             shiftPerPixel = 2;
             break;
@@ -237,9 +239,9 @@ static void CallBitmapXferProc(const SkBitmap& bitmap, const SkIRect& rect,
             return;
     }
 
-    uint8_t* pixels = (uint8_t*)bitmap.getPixels();
+    uint8_t* pixels = (uint8_t*)dst.writable_addr();
     SkASSERT(pixels);
-    const size_t rowBytes = bitmap.rowBytes();
+    const size_t rowBytes = dst.rowBytes();
     const int widthBytes = rect.width() << shiftPerPixel;
 
     // skip down to the first scanline and X position
@@ -258,7 +260,7 @@ void SkDraw::drawPaint(const SkPaint& paint) const {
     }
 
     SkIRect    devRect;
-    devRect.set(0, 0, fBitmap->width(), fBitmap->height());
+    devRect.set(0, 0, fDst.width(), fDst.height());
 
     if (fRC->isBW()) {
         /*  If we don't have a shader (i.e. we're just a solid color) we may
@@ -268,7 +270,7 @@ void SkDraw::drawPaint(const SkPaint& paint) const {
             in the clip, we don't have to worry about antialiasing.
         */
         uint32_t procData = 0;  // to avoid the warning
-        BitmapXferProc proc = ChooseBitmapXferProc(*fBitmap, paint, &procData);
+        BitmapXferProc proc = ChooseBitmapXferProc(fDst, paint, &procData);
         if (proc) {
             if (D_Dst_BitmapXferProc == proc) { // nothing to do
                 return;
@@ -276,7 +278,7 @@ void SkDraw::drawPaint(const SkPaint& paint) const {
 
             SkRegion::Iterator iter(fRC->bwRgn());
             while (!iter.done()) {
-                CallBitmapXferProc(*fBitmap, iter.rect(), proc, procData);
+                CallBitmapXferProc(fDst, iter.rect(), proc, procData);
                 iter.next();
             }
             return;
@@ -284,7 +286,7 @@ void SkDraw::drawPaint(const SkPaint& paint) const {
     }
 
     // normal case: use a blitter
-    SkAutoBlitterChoose blitter(*fBitmap, *fMatrix, paint);
+    SkAutoBlitterChoose blitter(fDst, *fMatrix, paint);
     SkScan::FillIRect(devRect, *fRC, blitter.get());
 }
 
@@ -330,11 +332,11 @@ static void bw_pt_rect_16_hair_proc(const PtProcRec& rec,
     SkASSERT(rec.fRC->isRect());
     const SkIRect& r = rec.fRC->getBounds();
     uint32_t value;
-    const SkBitmap* bitmap = blitter->justAnOpaqueColor(&value);
-    SkASSERT(bitmap);
+    const SkPixmap* dst = blitter->justAnOpaqueColor(&value);
+    SkASSERT(dst);
 
-    uint16_t* addr = bitmap->getAddr16(0, 0);
-    size_t    rb = bitmap->rowBytes();
+    uint16_t* addr = dst->writable_addr16(0, 0);
+    size_t    rb = dst->rowBytes();
 
     for (int i = 0; i < count; i++) {
         int x = SkScalarFloorToInt(devPts[i].fX);
@@ -351,11 +353,11 @@ static void bw_pt_rect_32_hair_proc(const PtProcRec& rec,
     SkASSERT(rec.fRC->isRect());
     const SkIRect& r = rec.fRC->getBounds();
     uint32_t value;
-    const SkBitmap* bitmap = blitter->justAnOpaqueColor(&value);
-    SkASSERT(bitmap);
+    const SkPixmap* dst = blitter->justAnOpaqueColor(&value);
+    SkASSERT(dst);
 
-    SkPMColor* addr = bitmap->getAddr32(0, 0);
-    size_t     rb = bitmap->rowBytes();
+    SkPMColor* addr = dst->writable_addr32(0, 0);
+    size_t     rb = dst->rowBytes();
 
     for (int i = 0; i < count; i++) {
         int x = SkScalarFloorToInt(devPts[i].fX);
@@ -380,15 +382,13 @@ static void bw_pt_hair_proc(const PtProcRec& rec, const SkPoint devPts[],
 static void bw_line_hair_proc(const PtProcRec& rec, const SkPoint devPts[],
                               int count, SkBlitter* blitter) {
     for (int i = 0; i < count; i += 2) {
-        SkScan::HairLine(devPts[i], devPts[i+1], *rec.fRC, blitter);
+        SkScan::HairLine(&devPts[i], 2, *rec.fRC, blitter);
     }
 }
 
 static void bw_poly_hair_proc(const PtProcRec& rec, const SkPoint devPts[],
                               int count, SkBlitter* blitter) {
-    for (int i = 0; i < count - 1; i++) {
-        SkScan::HairLine(devPts[i], devPts[i+1], *rec.fRC, blitter);
-    }
+    SkScan::HairLine(devPts, count, *rec.fRC, blitter);
 }
 
 // aa versions
@@ -396,15 +396,13 @@ static void bw_poly_hair_proc(const PtProcRec& rec, const SkPoint devPts[],
 static void aa_line_hair_proc(const PtProcRec& rec, const SkPoint devPts[],
                               int count, SkBlitter* blitter) {
     for (int i = 0; i < count; i += 2) {
-        SkScan::AntiHairLine(devPts[i], devPts[i+1], *rec.fRC, blitter);
+        SkScan::AntiHairLine(&devPts[i], 2, *rec.fRC, blitter);
     }
 }
 
 static void aa_poly_hair_proc(const PtProcRec& rec, const SkPoint devPts[],
                               int count, SkBlitter* blitter) {
-    for (int i = 0; i < count - 1; i++) {
-        SkScan::AntiHairLine(devPts[i], devPts[i+1], *rec.fRC, blitter);
-    }
+    SkScan::AntiHairLine(devPts, count, *rec.fRC, blitter);
 }
 
 // square procs (strokeWidth > 0 but matrix is square-scale (sx == sy)
@@ -446,6 +444,10 @@ static void aa_square_proc(const PtProcRec& rec, const SkPoint devPts[],
 // If this guy returns true, then chooseProc() must return a valid proc
 bool PtProcRec::init(SkCanvas::PointMode mode, const SkPaint& paint,
                      const SkMatrix* matrix, const SkRasterClip* rc) {
+    if ((unsigned)mode > (unsigned)SkCanvas::kPolygon_PointMode) {
+        return false;
+    }
+
     if (paint.getPathEffect()) {
         return false;
     }
@@ -453,13 +455,13 @@ bool PtProcRec::init(SkCanvas::PointMode mode, const SkPaint& paint,
     if (0 == width) {
         fMode = mode;
         fPaint = &paint;
-        fClip = NULL;
+        fClip = nullptr;
         fRC = rc;
         fRadius = SK_FixedHalf;
         return true;
     }
     if (paint.getStrokeCap() != SkPaint::kRound_Cap &&
-            matrix->rectStaysRect() && SkCanvas::kPoints_PointMode == mode) {
+        matrix->isScaleTranslate() && SkCanvas::kPoints_PointMode == mode) {
         SkScalar sx = matrix->get(SkMatrix::kMScaleX);
         SkScalar sy = matrix->get(SkMatrix::kMScaleY);
         if (SkScalarNearlyZero(sx - sy)) {
@@ -469,7 +471,7 @@ bool PtProcRec::init(SkCanvas::PointMode mode, const SkPaint& paint,
 
             fMode = mode;
             fPaint = &paint;
-            fClip = NULL;
+            fClip = nullptr;
             fRC = rc;
             fRadius = SkScalarToFixed(SkScalarMul(width, sx)) >> 1;
             return true;
@@ -479,7 +481,7 @@ bool PtProcRec::init(SkCanvas::PointMode mode, const SkPaint& paint,
 }
 
 PtProcRec::Proc PtProcRec::chooseProc(SkBlitter** blitterPtr) {
-    Proc proc = NULL;
+    Proc proc = nullptr;
 
     SkBlitter* blitter = *blitterPtr;
     if (fRC->isBW()) {
@@ -511,7 +513,7 @@ PtProcRec::Proc PtProcRec::chooseProc(SkBlitter** blitterPtr) {
         if (fRadius <= SK_FixedHalf) {    // small radii and hairline
             if (SkCanvas::kPoints_PointMode == fMode && fClip->isRect()) {
                 uint32_t value;
-                const SkBitmap* bm = blitter->justAnOpaqueColor(&value);
+                const SkPixmap* bm = blitter->justAnOpaqueColor(&value);
                 if (bm && kRGB_565_SkColorType == bm->colorType()) {
                     proc = bw_pt_rect_16_hair_proc;
                 } else if (bm && kN32_SkColorType == bm->colorType()) {
@@ -548,7 +550,7 @@ void SkDraw::drawPoints(SkCanvas::PointMode mode, size_t count,
         return;
     }
 
-    SkASSERT(pts != NULL);
+    SkASSERT(pts != nullptr);
     SkDEBUGCODE(this->validate();)
 
      // nothing to draw
@@ -558,7 +560,7 @@ void SkDraw::drawPoints(SkCanvas::PointMode mode, size_t count,
 
     PtProcRec rec;
     if (!forceUseDevice && rec.init(mode, paint, fMatrix, fRC)) {
-        SkAutoBlitterChoose blitter(*fBitmap, *fMatrix, paint);
+        SkAutoBlitterChoose blitter(fDst, *fMatrix, paint);
 
         SkPoint             devPts[MAX_DEV_PTS];
         const SkMatrix*     matrix = fMatrix;
@@ -600,6 +602,7 @@ void SkDraw::drawPoints(SkCanvas::PointMode mode, size_t count,
                         preMatrix.setTranslate(pts[i].fX, pts[i].fY);
                         // pass true for the last point, since we can modify
                         // then path then
+                        path.setIsVolatile((count-1) == i);
                         if (fDevice) {
                             fDevice->drawPath(*this, path, newPaint, &preMatrix,
                                               (count-1) == i);
@@ -626,8 +629,7 @@ void SkDraw::drawPoints(SkCanvas::PointMode mode, size_t count,
                 break;
             }
             case SkCanvas::kLines_PointMode:
-#ifndef SK_DISABLE_DASHING_OPTIMIZATION
-                if (2 == count && NULL != paint.getPathEffect()) {
+                if (2 == count && paint.getPathEffect()) {
                     // most likely a dashed line - see if it is one of the ones
                     // we can accelerate
                     SkStrokeRec rec(paint);
@@ -644,7 +646,7 @@ void SkDraw::drawPoints(SkCanvas::PointMode mode, size_t count,
                         // 'asPoints' managed to find some fast path
 
                         SkPaint newP(paint);
-                        newP.setPathEffect(NULL);
+                        newP.setPathEffect(nullptr);
                         newP.setStyle(SkPaint::kFill_Style);
 
                         if (!pointData.fFirst.isEmpty()) {
@@ -710,7 +712,6 @@ void SkDraw::drawPoints(SkCanvas::PointMode mode, size_t count,
                         break;
                     }
                 }
-#endif // DISABLE_DASHING_OPTIMIZATION
                 // couldn't take fast path so fall through!
             case SkCanvas::kPolygon_PointMode: {
                 count -= 1;
@@ -718,13 +719,14 @@ void SkDraw::drawPoints(SkCanvas::PointMode mode, size_t count,
                 SkPaint p(paint);
                 p.setStyle(SkPaint::kStroke_Style);
                 size_t inc = (SkCanvas::kLines_PointMode == mode) ? 2 : 1;
+                path.setIsVolatile(true);
                 for (size_t i = 0; i < count; i += inc) {
                     path.moveTo(pts[i]);
                     path.lineTo(pts[i+1]);
                     if (fDevice) {
-                        fDevice->drawPath(*this, path, p, NULL, true);
+                        fDevice->drawPath(*this, path, p, nullptr, true);
                     } else {
-                        this->drawPath(path, p, NULL, true);
+                        this->drawPath(path, p, nullptr, true);
                     }
                     path.rewind();
                 }
@@ -751,11 +753,7 @@ static bool easy_rect_join(const SkPaint& paint, const SkMatrix& matrix,
         return false;
     }
 
-    SkASSERT(matrix.rectStaysRect());
-    SkPoint pt = { paint.getStrokeWidth(), paint.getStrokeWidth() };
-    matrix.mapVectors(strokeSize, &pt, 1);
-    strokeSize->fX = SkScalarAbs(strokeSize->fX);
-    strokeSize->fY = SkScalarAbs(strokeSize->fY);
+    *strokeSize = compute_stroke_size(paint, matrix);
     return true;
 }
 
@@ -795,7 +793,8 @@ static SkPoint* rect_points(SkRect& r) {
     return SkTCast<SkPoint*>(&r);
 }
 
-void SkDraw::drawRect(const SkRect& rect, const SkPaint& paint) const {
+void SkDraw::drawRect(const SkRect& prePaintRect, const SkPaint& paint,
+                      const SkMatrix* paintMatrix, const SkRect* postPaintRect) const {
     SkDEBUGCODE(this->validate();)
 
     // nothing to draw
@@ -803,22 +802,36 @@ void SkDraw::drawRect(const SkRect& rect, const SkPaint& paint) const {
         return;
     }
 
+    const SkMatrix* matrix;
+    SkMatrix combinedMatrixStorage;
+    if (paintMatrix) {
+        SkASSERT(postPaintRect);
+        combinedMatrixStorage.setConcat(*fMatrix, *paintMatrix);
+        matrix = &combinedMatrixStorage;
+    } else {
+        SkASSERT(!postPaintRect);
+        matrix = fMatrix;
+    }
+
     SkPoint strokeSize;
     RectType rtype = ComputeRectType(paint, *fMatrix, &strokeSize);
 
     if (kPath_RectType == rtype) {
+        SkDraw draw(*this);
+        if (paintMatrix) {
+            draw.fMatrix = matrix;
+        }
         SkPath  tmp;
-        tmp.addRect(rect);
+        tmp.addRect(prePaintRect);
         tmp.setFillType(SkPath::kWinding_FillType);
-        this->drawPath(tmp, paint, NULL, true);
+        draw.drawPath(tmp, paint, nullptr, true);
         return;
     }
 
-    const SkMatrix& matrix = *fMatrix;
-    SkRect          devRect;
-
-    // transform rect into devRect
-    matrix.mapPoints(rect_points(devRect), rect_points(rect), 2);
+    SkRect devRect;
+    const SkRect& paintRect = paintMatrix ? *postPaintRect : prePaintRect;
+    // skip the paintMatrix when transforming the rect by the CTM
+    fMatrix->mapPoints(rect_points(devRect), rect_points(paintRect), 2);
     devRect.sort();
 
     // look for the quick exit, before we build a blitter
@@ -836,21 +849,19 @@ void SkDraw::drawRect(const SkRect& rect, const SkPaint& paint) const {
         }
     }
 
-    SkIRect ir;
-    bbox.roundOut(&ir);
+    SkIRect ir = bbox.roundOut();
     if (fRC->quickReject(ir)) {
         return;
     }
 
-    SkDeviceLooper looper(*fBitmap, *fRC, ir, paint.isAntiAlias());
+    SkDeviceLooper looper(fDst, *fRC, ir, paint.isAntiAlias());
     while (looper.next()) {
         SkRect localDevRect;
         looper.mapRect(&localDevRect, devRect);
         SkMatrix localMatrix;
-        looper.mapMatrix(&localMatrix, matrix);
+        looper.mapMatrix(&localMatrix, *matrix);
 
-        SkAutoBlitterChoose blitterStorage(looper.getBitmap(), localMatrix,
-                                           paint);
+        SkAutoBlitterChoose blitterStorage(looper.getPixmap(), localMatrix, paint);
         const SkRasterClip& clip = looper.getRC();
         SkBlitter*          blitter = blitterStorage.get();
 
@@ -894,14 +905,14 @@ void SkDraw::drawDevMask(const SkMask& srcM, const SkPaint& paint) const {
 
     SkMask dstM;
     if (paint.getMaskFilter() &&
-            paint.getMaskFilter()->filterMask(&dstM, srcM, *fMatrix, NULL)) {
+            paint.getMaskFilter()->filterMask(&dstM, srcM, *fMatrix, nullptr)) {
         mask = &dstM;
     } else {
-        dstM.fImage = NULL;
+        dstM.fImage = nullptr;
     }
     SkAutoMaskFreeImage ami(dstM.fImage);
 
-    SkAutoBlitterChoose blitterChooser(*fBitmap, *fMatrix, paint);
+    SkAutoBlitterChoose blitterChooser(fDst, *fMatrix, paint);
     SkBlitter* blitter = blitterChooser.get();
 
     SkAAClipBlitterWrapper wrapper;
@@ -926,22 +937,6 @@ static SkScalar fast_len(const SkVector& vec) {
     return x + SkScalarHalf(y);
 }
 
-static bool xfermodeSupportsCoverageAsAlpha(SkXfermode* xfer) {
-    SkXfermode::Coeff dc;
-    if (!SkXfermode::AsCoeff(xfer, NULL, &dc)) {
-        return false;
-    }
-
-    switch (dc) {
-        case SkXfermode::kOne_Coeff:
-        case SkXfermode::kISA_Coeff:
-        case SkXfermode::kISC_Coeff:
-            return true;
-        default:
-            return false;
-    }
-}
-
 bool SkDrawTreatAAStrokeAsHairline(SkScalar strokeWidth, const SkMatrix& matrix,
                                    SkScalar* coverage) {
     SkASSERT(strokeWidth > 0);
@@ -958,7 +953,7 @@ bool SkDrawTreatAAStrokeAsHairline(SkScalar strokeWidth, const SkMatrix& matrix,
     SkScalar len0 = fast_len(dst[0]);
     SkScalar len1 = fast_len(dst[1]);
     if (len0 <= SK_Scalar1 && len1 <= SK_Scalar1) {
-        if (NULL != coverage) {
+        if (coverage) {
             *coverage = SkScalarAve(len0, len1);
         }
         return true;
@@ -995,7 +990,7 @@ void SkDraw::drawRRect(const SkRRect& rrect, const SkPaint& paint) const {
         // Transform the rrect into device space.
         SkRRect devRRect;
         if (rrect.transform(*fMatrix, &devRRect)) {
-            SkAutoBlitterChoose blitter(*fBitmap, *fMatrix, paint);
+            SkAutoBlitterChoose blitter(fDst, *fMatrix, paint);
             if (paint.getMaskFilter()->filterRRect(devRRect, *fMatrix, *fRC, blitter.get(),
                                                    SkPaint::kFill_Style)) {
                 return; // filterRRect() called the blitter, so we're done
@@ -1007,12 +1002,23 @@ DRAW_PATH:
     // Now fall back to the default case of using a path.
     SkPath path;
     path.addRRect(rrect);
-    this->drawPath(path, paint, NULL, true);
+    this->drawPath(path, paint, nullptr, true);
+}
+
+static SkScalar compute_res_scale_for_stroking(const SkMatrix& matrix) {
+    if (!matrix.hasPerspective()) {
+        SkScalar sx = SkPoint::Length(matrix[SkMatrix::kMScaleX], matrix[SkMatrix::kMSkewY]);
+        SkScalar sy = SkPoint::Length(matrix[SkMatrix::kMSkewX],  matrix[SkMatrix::kMScaleY]);
+        if (SkScalarsAreFinite(sx, sy)) {
+            return SkTMax(sx, sy);
+        }
+    }
+    return 1;
 }
 
 void SkDraw::drawPath(const SkPath& origSrcPath, const SkPaint& origPaint,
                       const SkMatrix* prePathMatrix, bool pathIsMutable,
-                      bool drawCoverage) const {
+                      bool drawCoverage, SkBlitter* customBlitter) const {
     SkDEBUGCODE(this->validate();)
 
     // nothing to draw
@@ -1025,6 +1031,7 @@ void SkDraw::drawPath(const SkPath& origSrcPath, const SkPaint& origPaint,
     SkPath          tmpPath;
     SkMatrix        tmpMatrix;
     const SkMatrix* matrix = fMatrix;
+    tmpPath.setIsVolatile(true);
 
     if (prePathMatrix) {
         if (origPaint.getPathEffect() || origPaint.getStyle() != SkPaint::kFill_Style ||
@@ -1052,7 +1059,7 @@ void SkDraw::drawPath(const SkPath& origSrcPath, const SkPaint& origPaint,
         if (SkDrawTreatAsHairline(origPaint, *matrix, &coverage)) {
             if (SK_Scalar1 == coverage) {
                 paint.writable()->setStrokeWidth(0);
-            } else if (xfermodeSupportsCoverageAsAlpha(origPaint.getXfermode())) {
+            } else if (SkXfermode::SupportsCoverageAsAlpha(origPaint.getXfermode())) {
                 U8CPU newAlpha;
 #if 0
                 newAlpha = SkToU8(SkScalarRoundToInt(coverage *
@@ -1073,11 +1080,12 @@ void SkDraw::drawPath(const SkPath& origSrcPath, const SkPaint& origPaint,
 
     if (paint->getPathEffect() || paint->getStyle() != SkPaint::kFill_Style) {
         SkRect cullRect;
-        const SkRect* cullRectPtr = NULL;
+        const SkRect* cullRectPtr = nullptr;
         if (this->computeConservativeLocalClipBounds(&cullRect)) {
             cullRectPtr = &cullRect;
         }
-        doFill = paint->getFillPath(*pathPtr, &tmpPath, cullRectPtr);
+        doFill = paint->getFillPath(*pathPtr, &tmpPath, cullRectPtr,
+                                    compute_res_scale_for_stroking(*fMatrix));
         pathPtr = &tmpPath;
     }
 
@@ -1098,12 +1106,19 @@ void SkDraw::drawPath(const SkPath& origSrcPath, const SkPaint& origPaint,
     // transform the path into device space
     pathPtr->transform(*matrix, devPathPtr);
 
-    SkAutoBlitterChoose blitter(*fBitmap, *fMatrix, *paint, drawCoverage);
+    SkBlitter* blitter = nullptr;
+    SkAutoBlitterChoose blitterStorage;
+    if (nullptr == customBlitter) {
+        blitterStorage.choose(fDst, *fMatrix, *paint, drawCoverage);
+        blitter = blitterStorage.get();
+    } else {
+        blitter = customBlitter;
+    }
 
     if (paint->getMaskFilter()) {
         SkPaint::Style style = doFill ? SkPaint::kFill_Style :
             SkPaint::kStroke_Style;
-        if (paint->getMaskFilter()->filterPath(*devPathPtr, *fMatrix, *fRC, blitter.get(), style)) {
+        if (paint->getMaskFilter()->filterPath(*devPathPtr, *fMatrix, *fRC, blitter, style)) {
             return; // filterPath() called the blitter, so we're done
         }
     }
@@ -1122,7 +1137,7 @@ void SkDraw::drawPath(const SkPath& origSrcPath, const SkPaint& origPaint,
             proc = SkScan::HairPath;
         }
     }
-    proc(*devPathPtr, *fRC, blitter.get());
+    proc(*devPathPtr, *fRC, blitter);
 }
 
 /** For the purposes of drawing bitmaps, if a matrix is "almost" translate
@@ -1142,16 +1157,17 @@ void SkDraw::drawBitmapAsMask(const SkBitmap& bitmap,
         int ix = SkScalarRoundToInt(fMatrix->getTranslateX());
         int iy = SkScalarRoundToInt(fMatrix->getTranslateY());
 
-        SkAutoLockPixels alp(bitmap);
-        if (!bitmap.readyToDraw()) {
+        SkAutoPixmapUnlock result;
+        if (!bitmap.requestLock(&result)) {
             return;
         }
-
+        const SkPixmap& pmap = result.pixmap();
         SkMask  mask;
-        mask.fBounds.set(ix, iy, ix + bitmap.width(), iy + bitmap.height());
+        mask.fBounds.set(ix, iy, ix + pmap.width(), iy + pmap.height());
         mask.fFormat = SkMask::kA8_Format;
-        mask.fRowBytes = SkToU32(bitmap.rowBytes());
-        mask.fImage = bitmap.getAddr8(0, 0);
+        mask.fRowBytes = SkToU32(pmap.rowBytes());
+        // fImage is typed as writable, but in this case it is used read-only
+        mask.fImage = (uint8_t*)pmap.addr8(0, 0);
 
         this->drawDevMask(mask, paint);
     } else {    // need to xform the bitmap first
@@ -1167,7 +1183,7 @@ void SkDraw::drawBitmapAsMask(const SkBitmap& bitmap,
         // clipped to the actual device
         {
             SkIRect    devBounds;
-            devBounds.set(0, 0, fBitmap->width(), fBitmap->height());
+            devBounds.set(0, 0, fDst.width(), fDst.height());
             // need intersect(l, t, r, b) on irect
             if (!mask.fBounds.intersect(devBounds)) {
                 return;
@@ -1216,11 +1232,8 @@ void SkDraw::drawBitmapAsMask(const SkBitmap& bitmap,
 static bool clipped_out(const SkMatrix& m, const SkRasterClip& c,
                         const SkRect& srcR) {
     SkRect  dstR;
-    SkIRect devIR;
-
     m.mapRect(&dstR, srcR);
-    dstR.roundOut(&devIR);
-    return c.quickReject(devIR);
+    return c.quickReject(dstR.roundOut());
 }
 
 static bool clipped_out(const SkMatrix& matrix, const SkRasterClip& clip,
@@ -1230,14 +1243,12 @@ static bool clipped_out(const SkMatrix& matrix, const SkRasterClip& clip,
     return clipped_out(matrix, clip, r);
 }
 
-static bool clipHandlesSprite(const SkRasterClip& clip, int x, int y,
-                              const SkBitmap& bitmap) {
-    return clip.isBW() ||
-           clip.quickContains(x, y, x + bitmap.width(), y + bitmap.height());
+static bool clipHandlesSprite(const SkRasterClip& clip, int x, int y, const SkPixmap& pmap) {
+    return clip.isBW() || clip.quickContains(x, y, x + pmap.width(), y + pmap.height());
 }
 
 void SkDraw::drawBitmap(const SkBitmap& bitmap, const SkMatrix& prematrix,
-                        const SkPaint& origPaint) const {
+                        const SkRect* dstBounds, const SkPaint& origPaint) const {
     SkDEBUGCODE(this->validate();)
 
     // nothing to draw
@@ -1262,24 +1273,23 @@ void SkDraw::drawBitmap(const SkBitmap& bitmap, const SkMatrix& prematrix,
         // It is safe to call lock pixels now, since we know the matrix is
         // (more or less) identity.
         //
-        SkAutoLockPixels alp(bitmap);
-        if (!bitmap.readyToDraw()) {
+        SkAutoPixmapUnlock unlocker;
+        if (!bitmap.requestLock(&unlocker)) {
             return;
         }
+        const SkPixmap& pmap = unlocker.pixmap();
         int ix = SkScalarRoundToInt(matrix.getTranslateX());
         int iy = SkScalarRoundToInt(matrix.getTranslateY());
-        if (clipHandlesSprite(*fRC, ix, iy, bitmap)) {
+        if (clipHandlesSprite(*fRC, ix, iy, pmap)) {
             SkTBlitterAllocator allocator;
             // blitter will be owned by the allocator.
-            SkBlitter* blitter = SkBlitter::ChooseSprite(*fBitmap, paint, bitmap,
-                                                         ix, iy, &allocator);
+            SkBlitter* blitter = SkBlitter::ChooseSprite(fDst, paint, pmap, ix, iy, &allocator);
             if (blitter) {
-                SkIRect    ir;
-                ir.set(ix, iy, ix + bitmap.width(), iy + bitmap.height());
-
-                SkScan::FillIRect(ir, *fRC, blitter);
+                SkScan::FillIRect(SkIRect::MakeXYWH(ix, iy, pmap.width(), pmap.height()),
+                                  *fRC, blitter);
                 return;
             }
+            // if !blitter, then we fall-through to the slower case
         }
     }
 
@@ -1292,17 +1302,17 @@ void SkDraw::drawBitmap(const SkBitmap& bitmap, const SkMatrix& prematrix,
         draw.drawBitmapAsMask(bitmap, paint);
     } else {
         SkAutoBitmapShaderInstall install(bitmap, paint);
-
-        SkRect  r;
-        r.set(0, 0, SkIntToScalar(bitmap.width()),
-              SkIntToScalar(bitmap.height()));
-        // is this ok if paint has a rasterizer?
-        draw.drawRect(r, install.paintWithShader());
+        const SkPaint& paintWithShader = install.paintWithShader();
+        const SkRect srcBounds = SkRect::MakeIWH(bitmap.width(), bitmap.height());
+        if (dstBounds) {
+            this->drawRect(srcBounds, paintWithShader, &prematrix, dstBounds);
+        } else {
+            draw.drawRect(srcBounds, paintWithShader);
+        }
     }
 }
 
-void SkDraw::drawSprite(const SkBitmap& bitmap, int x, int y,
-                        const SkPaint& origPaint) const {
+void SkDraw::drawSprite(const SkBitmap& bitmap, int x, int y, const SkPaint& origPaint) const {
     SkDEBUGCODE(this->validate();)
 
     // nothing to draw
@@ -1312,8 +1322,7 @@ void SkDraw::drawSprite(const SkBitmap& bitmap, int x, int y,
         return;
     }
 
-    SkIRect    bounds;
-    bounds.set(x, y, x + bitmap.width(), y + bitmap.height());
+    const SkIRect bounds = SkIRect::MakeXYWH(x, y, bitmap.width(), bitmap.height());
 
     if (fRC->quickReject(bounds)) {
         return; // nothing to draw
@@ -1322,12 +1331,16 @@ void SkDraw::drawSprite(const SkBitmap& bitmap, int x, int y,
     SkPaint paint(origPaint);
     paint.setStyle(SkPaint::kFill_Style);
 
-    if (NULL == paint.getColorFilter() && clipHandlesSprite(*fRC, x, y, bitmap)) {
+    SkAutoPixmapUnlock unlocker;
+    if (!bitmap.requestLock(&unlocker)) {
+        return;
+    }
+    const SkPixmap& pmap = unlocker.pixmap();
+
+    if (nullptr == paint.getColorFilter() && clipHandlesSprite(*fRC, x, y, pmap)) {
         SkTBlitterAllocator allocator;
         // blitter will be owned by the allocator.
-        SkBlitter* blitter = SkBlitter::ChooseSprite(*fBitmap, paint, bitmap,
-                                                     x, y, &allocator);
-
+        SkBlitter* blitter = SkBlitter::ChooseSprite(fDst, paint, pmap, x, y, &allocator);
         if (blitter) {
             SkScan::FillIRect(bounds, *fRC, blitter);
             return;
@@ -1360,26 +1373,6 @@ void SkDraw::drawSprite(const SkBitmap& bitmap, int x, int y,
 #include "SkTextToPathIter.h"
 #include "SkUtils.h"
 
-static void measure_text(SkGlyphCache* cache, SkDrawCacheProc glyphCacheProc,
-                const char text[], size_t byteLength, SkVector* stopVector) {
-    SkFixed     x = 0, y = 0;
-    const char* stop = text + byteLength;
-
-    SkAutoKern  autokern;
-
-    while (text < stop) {
-        // don't need x, y here, since all subpixel variants will have the
-        // same advance
-        const SkGlyph& glyph = glyphCacheProc(cache, &text, 0, 0);
-
-        x += autokern.adjust(glyph) + glyph.fAdvanceX;
-        y += glyph.fAdvanceY;
-    }
-    stopVector->set(SkFixedToScalar(x), SkFixedToScalar(y));
-
-    SkASSERT(text == stop);
-}
-
 bool SkDraw::ShouldDrawTextAsPaths(const SkPaint& paint, const SkMatrix& ctm) {
     // hairline glyphs are fast enough so we don't need to cache them
     if (SkPaint::kStroke_Style == paint.getStyle() && 0 == paint.getStrokeWidth()) {
@@ -1429,14 +1422,63 @@ void SkDraw::drawText_asPaths(const char text[], size_t byteLength,
 #pragma warning ( disable : 4701 )
 #endif
 
-//////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////////////////
+struct SkDraw1Glyph {
+    const SkDraw* fDraw;
+    const SkRegion* fClip;
+    const SkAAClip* fAAClip;
+    SkBlitter* fBlitter;
+    SkGlyphCache* fCache;
+    const SkPaint* fPaint;
+    SkIRect fClipBounds;
+    /** Half the sampling frequency of the rasterized glyph in x. */
+    SkScalar fHalfSampleX;
+    /** Half the sampling frequency of the rasterized glyph in y. */
+    SkScalar fHalfSampleY;
 
-static void D1G_RectClip(const SkDraw1Glyph& state, SkFixed fx, SkFixed fy, const SkGlyph& glyph) {
-    int left = SkFixedFloorToInt(fx);
-    int top = SkFixedFloorToInt(fy);
+    /** Draws one glyph.
+     *
+     *  The x and y are pre-biased, so implementations may just truncate them.
+     *  i.e. half the sampling frequency has been added.
+     *  e.g. 1/2 or 1/(2^(SkGlyph::kSubBits+1)) has already been added.
+     *  This added bias can be found in fHalfSampleX,Y.
+     */
+    typedef void (*Proc)(const SkDraw1Glyph&, Sk48Dot16 x, Sk48Dot16 y, const SkGlyph&);
+
+    Proc init(const SkDraw* draw, SkBlitter* blitter, SkGlyphCache* cache,
+              const SkPaint&);
+
+    // call this instead of fBlitter->blitMask() since this wrapper will handle
+    // the case when the mask is ARGB32_Format
+    //
+    void blitMask(const SkMask& mask, const SkIRect& clip) const {
+        if (SkMask::kARGB32_Format == mask.fFormat) {
+            this->blitMaskAsSprite(mask);
+        } else {
+            fBlitter->blitMask(mask, clip);
+        }
+    }
+
+    // mask must be kARGB32_Format
+    void blitMaskAsSprite(const SkMask& mask) const;
+};
+
+static void D1G_RectClip(const SkDraw1Glyph& state, Sk48Dot16 fx, Sk48Dot16 fy,
+                         const SkGlyph& glyph) {
+    // Prevent glyphs from being drawn outside of or straddling the edge of device space.
+    if ((fx >> 16) > INT_MAX - (INT16_MAX + UINT16_MAX) ||
+        (fx >> 16) < INT_MIN - (INT16_MIN + 0 /*UINT16_MIN*/) ||
+        (fy >> 16) > INT_MAX - (INT16_MAX + UINT16_MAX) ||
+        (fy >> 16) < INT_MIN - (INT16_MIN + 0 /*UINT16_MIN*/))
+    {
+        return;
+    }
+
+    int left = Sk48Dot16FloorToInt(fx);
+    int top = Sk48Dot16FloorToInt(fy);
     SkASSERT(glyph.fWidth > 0 && glyph.fHeight > 0);
-    SkASSERT((NULL == state.fClip && state.fAAClip) ||
-             (state.fClip && NULL == state.fAAClip && state.fClip->isRect()));
+    SkASSERT((nullptr == state.fClip && state.fAAClip) ||
+             (state.fClip && nullptr == state.fAAClip && state.fClip->isRect()));
 
     left += glyph.fLeft;
     top  += glyph.fTop;
@@ -1459,9 +1501,9 @@ static void D1G_RectClip(const SkDraw1Glyph& state, SkFixed fx, SkFixed fy, cons
     }
 
     uint8_t* aa = (uint8_t*)glyph.fImage;
-    if (NULL == aa) {
+    if (nullptr == aa) {
         aa = (uint8_t*)state.fCache->findImage(glyph);
-        if (NULL == aa) {
+        if (nullptr == aa) {
             return; // can't rasterize glyph
         }
     }
@@ -1472,9 +1514,10 @@ static void D1G_RectClip(const SkDraw1Glyph& state, SkFixed fx, SkFixed fy, cons
     state.blitMask(mask, *bounds);
 }
 
-static void D1G_RgnClip(const SkDraw1Glyph& state, SkFixed fx, SkFixed fy, const SkGlyph& glyph) {
-    int left = SkFixedFloorToInt(fx);
-    int top = SkFixedFloorToInt(fy);
+static void D1G_RgnClip(const SkDraw1Glyph& state, Sk48Dot16 fx, Sk48Dot16 fy,
+                        const SkGlyph& glyph) {
+    int left = Sk48Dot16FloorToInt(fx);
+    int top = Sk48Dot16FloorToInt(fy);
     SkASSERT(glyph.fWidth > 0 && glyph.fHeight > 0);
     SkASSERT(!state.fClip->isRect());
 
@@ -1488,12 +1531,9 @@ static void D1G_RgnClip(const SkDraw1Glyph& state, SkFixed fx, SkFixed fy, const
 
     if (!clipper.done()) {
         const SkIRect&  cr = clipper.rect();
-        const uint8_t*  aa = (const uint8_t*)glyph.fImage;
-        if (NULL == aa) {
-            aa = (uint8_t*)state.fCache->findImage(glyph);
-            if (NULL == aa) {
-                return;
-            }
+        const uint8_t* aa = (uint8_t*)state.fCache->findImage(glyph);
+        if (nullptr == aa) {
+            return;
         }
 
         mask.fRowBytes = glyph.rowBytes();
@@ -1506,14 +1546,6 @@ static void D1G_RgnClip(const SkDraw1Glyph& state, SkFixed fx, SkFixed fy, const
     }
 }
 
-static bool hasCustomD1GProc(const SkDraw& draw) {
-    return draw.fProcs && draw.fProcs->fD1GProc;
-}
-
-static bool needsRasterTextBlit(const SkDraw& draw) {
-    return !hasCustomD1GProc(draw);
-}
-
 SkDraw1Glyph::Proc SkDraw1Glyph::init(const SkDraw* draw, SkBlitter* blitter, SkGlyphCache* cache,
                                       const SkPaint& pnt) {
     fDraw = draw;
@@ -1522,20 +1554,13 @@ SkDraw1Glyph::Proc SkDraw1Glyph::init(const SkDraw* draw, SkBlitter* blitter, Sk
     fPaint = &pnt;
 
     if (cache->isSubpixel()) {
-        fHalfSampleX = fHalfSampleY = (SK_FixedHalf >> SkGlyph::kSubBits);
+        fHalfSampleX = fHalfSampleY = SkFixedToScalar(SkGlyph::kSubpixelRound);
     } else {
-        fHalfSampleX = fHalfSampleY = SK_FixedHalf;
-    }
-
-    if (hasCustomD1GProc(*draw)) {
-        // todo: fix this assumption about clips w/ custom
-        fClip = draw->fClip;
-        fClipBounds = fClip->getBounds();
-        return draw->fProcs->fD1GProc;
+        fHalfSampleX = fHalfSampleY = SK_ScalarHalf;
     }
 
     if (draw->fRC->isBW()) {
-        fAAClip = NULL;
+        fAAClip = nullptr;
         fClip = &draw->fRC->bwRgn();
         fClipBounds = fClip->getBounds();
         if (fClip->isRect()) {
@@ -1545,7 +1570,7 @@ SkDraw1Glyph::Proc SkDraw1Glyph::init(const SkDraw* draw, SkBlitter* blitter, Sk
         }
     } else {    // aaclip
         fAAClip = &draw->fRC->aaRgn();
-        fClip = NULL;
+        fClip = nullptr;
         fClipBounds = fAAClip->getBounds();
         return D1G_RectClip;
     }
@@ -1565,12 +1590,12 @@ void SkDraw1Glyph::blitMaskAsSprite(const SkMask& mask) const {
 
 void SkDraw::drawText(const char text[], size_t byteLength,
                       SkScalar x, SkScalar y, const SkPaint& paint) const {
-    SkASSERT(byteLength == 0 || text != NULL);
+    SkASSERT(byteLength == 0 || text != nullptr);
 
     SkDEBUGCODE(this->validate();)
 
     // nothing to draw
-    if (text == NULL || byteLength == 0 || fRC->isEmpty()) {
+    if (text == nullptr || byteLength == 0 || fRC->isEmpty()) {
         return;
     }
 
@@ -1581,90 +1606,32 @@ void SkDraw::drawText(const char text[], size_t byteLength,
         return;
     }
 
-    SkDrawCacheProc glyphCacheProc = paint.getDrawCacheProc();
-
-    SkAutoGlyphCache    autoCache(paint, &fDevice->fLeakyProperties, fMatrix);
+    SkAutoGlyphCache    autoCache(paint, &fDevice->surfaceProps(), fMatrix);
     SkGlyphCache*       cache = autoCache.getCache();
 
-    // transform our starting point
-    {
-        SkPoint loc;
-        fMatrix->mapXY(x, y, &loc);
-        x = loc.fX;
-        y = loc.fY;
-    }
 
-    // need to measure first
-    if (paint.getTextAlign() != SkPaint::kLeft_Align) {
-        SkVector    stop;
+    // The Blitter Choose needs to be live while using the blitter below.
+    SkAutoBlitterChoose    blitterChooser(fDst, *fMatrix, paint);
+    SkAAClipBlitterWrapper wrapper(*fRC, blitterChooser.get());
 
-        measure_text(cache, glyphCacheProc, text, byteLength, &stop);
-
-        SkScalar    stopX = stop.fX;
-        SkScalar    stopY = stop.fY;
-
-        if (paint.getTextAlign() == SkPaint::kCenter_Align) {
-            stopX = SkScalarHalf(stopX);
-            stopY = SkScalarHalf(stopY);
-        }
-        x -= stopX;
-        y -= stopY;
-    }
-
-    const char* stop = text + byteLength;
-
-    SkAAClipBlitter     aaBlitter;
-    SkAutoBlitterChoose blitterChooser;
-    SkBlitter*          blitter = NULL;
-    if (needsRasterTextBlit(*this)) {
-        blitterChooser.choose(*fBitmap, *fMatrix, paint);
-        blitter = blitterChooser.get();
-        if (fRC->isAA()) {
-            aaBlitter.init(blitter, &fRC->aaRgn());
-            blitter = &aaBlitter;
-        }
-    }
-
-    SkAutoKern          autokern;
     SkDraw1Glyph        d1g;
-    SkDraw1Glyph::Proc  proc = d1g.init(this, blitter, cache, paint);
+    SkDraw1Glyph::Proc  proc = d1g.init(this, wrapper.getBlitter(), cache, paint);
 
-    SkFixed fxMask = ~0;
-    SkFixed fyMask = ~0;
-    if (cache->isSubpixel()) {
-        SkAxisAlignment baseline = SkComputeAxisAlignmentForHText(*fMatrix);
-        if (kX_SkAxisAlignment == baseline) {
-            fyMask = 0;
-            d1g.fHalfSampleY = SK_FixedHalf;
-        } else if (kY_SkAxisAlignment == baseline) {
-            fxMask = 0;
-            d1g.fHalfSampleX = SK_FixedHalf;
+    SkFindAndPlaceGlyph::ProcessText(
+        paint.getTextEncoding(), text, byteLength,
+        {x, y}, *fMatrix, paint.getTextAlign(), cache,
+        [&](const SkGlyph& glyph, SkPoint position, SkPoint rounding) {
+            position += rounding;
+            proc(d1g, SkScalarTo48Dot16(position.fX), SkScalarTo48Dot16(position.fY), glyph);
         }
-    }
-
-    SkFixed fx = SkScalarToFixed(x) + d1g.fHalfSampleX;
-    SkFixed fy = SkScalarToFixed(y) + d1g.fHalfSampleY;
-
-    while (text < stop) {
-        const SkGlyph& glyph = glyphCacheProc(cache, &text, fx & fxMask, fy & fyMask);
-
-        fx += autokern.adjust(glyph);
-
-        if (glyph.fWidth) {
-            proc(d1g, fx, fy, glyph);
-        }
-
-        fx += glyph.fAdvanceX;
-        fy += glyph.fAdvanceY;
-    }
+    );
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
 void SkDraw::drawPosText_asPaths(const char text[], size_t byteLength,
-                                 const SkScalar pos[], SkScalar constY,
-                                 int scalarsPerPosition,
-                                 const SkPaint& origPaint) const {
+                                 const SkScalar pos[], int scalarsPerPosition,
+                                 const SkPoint& offset, const SkPaint& origPaint) const {
     // setup our std paint, in hopes of getting hits in the cache
     SkPaint paint(origPaint);
     SkScalar matrixScale = paint.setupForAsPaths();
@@ -1674,15 +1641,15 @@ void SkDraw::drawPosText_asPaths(const char text[], size_t byteLength,
 
     // Temporarily jam in kFill, so we only ever ask for the raw outline from the cache.
     paint.setStyle(SkPaint::kFill_Style);
-    paint.setPathEffect(NULL);
+    paint.setPathEffect(nullptr);
 
     SkDrawCacheProc     glyphCacheProc = paint.getDrawCacheProc();
-    SkAutoGlyphCache    autoCache(paint, NULL, NULL);
+    SkAutoGlyphCache    autoCache(paint, &fDevice->surfaceProps(), nullptr);
     SkGlyphCache*       cache = autoCache.getCache();
 
     const char*        stop = text + byteLength;
-    SkTextAlignProcScalar alignProc(paint.getTextAlign());
-    SkTextMapStateProc tmsProc(SkMatrix::I(), constY, scalarsPerPosition);
+    SkTextAlignProc    alignProc(paint.getTextAlign());
+    SkTextMapStateProc tmsProc(SkMatrix::I(), offset, scalarsPerPosition);
 
     // Now restore the original settings, so we "draw" with whatever style/stroking.
     paint.setStyle(origPaint.getStyle());
@@ -1712,146 +1679,41 @@ void SkDraw::drawPosText_asPaths(const char text[], size_t byteLength,
 }
 
 void SkDraw::drawPosText(const char text[], size_t byteLength,
-                         const SkScalar pos[], SkScalar constY,
-                         int scalarsPerPosition, const SkPaint& paint) const {
-    SkASSERT(byteLength == 0 || text != NULL);
+                         const SkScalar pos[], int scalarsPerPosition,
+                         const SkPoint& offset, const SkPaint& paint) const {
+    SkASSERT(byteLength == 0 || text != nullptr);
     SkASSERT(1 == scalarsPerPosition || 2 == scalarsPerPosition);
 
     SkDEBUGCODE(this->validate();)
 
     // nothing to draw
-    if (text == NULL || byteLength == 0 || fRC->isEmpty()) {
+    if (text == nullptr || byteLength == 0 || fRC->isEmpty()) {
         return;
     }
 
     if (ShouldDrawTextAsPaths(paint, *fMatrix)) {
-        this->drawPosText_asPaths(text, byteLength, pos, constY,
-                                  scalarsPerPosition, paint);
+        this->drawPosText_asPaths(text, byteLength, pos, scalarsPerPosition, offset, paint);
         return;
     }
 
-    SkDrawCacheProc     glyphCacheProc = paint.getDrawCacheProc();
-    SkAutoGlyphCache    autoCache(paint, &fDevice->fLeakyProperties, fMatrix);
-    SkGlyphCache*       cache = autoCache.getCache();
+    // The Blitter Choose needs to be live while using the blitter below.
+    SkAutoBlitterChoose    blitterChooser(fDst, *fMatrix, paint);
+    SkAAClipBlitterWrapper wrapper(*fRC, blitterChooser.get());
 
-    SkAAClipBlitterWrapper wrapper;
-    SkAutoBlitterChoose blitterChooser;
-    SkBlitter* blitter = NULL;
-    if (needsRasterTextBlit(*this)) {
-        blitterChooser.choose(*fBitmap, *fMatrix, paint);
-        blitter = blitterChooser.get();
-        if (fRC->isAA()) {
-            wrapper.init(*fRC, blitter);
-            blitter = wrapper.getBlitter();
-        }
-    }
-
-    const char*        stop = text + byteLength;
-    SkTextAlignProc    alignProc(paint.getTextAlign());
+    SkAutoGlyphCache   autoCache(paint, &fDevice->surfaceProps(), fMatrix);
+    SkGlyphCache*      cache = autoCache.getCache();
     SkDraw1Glyph       d1g;
-    SkDraw1Glyph::Proc proc = d1g.init(this, blitter, cache, paint);
-    SkTextMapStateProc tmsProc(*fMatrix, constY, scalarsPerPosition);
+    SkDraw1Glyph::Proc proc = d1g.init(this, wrapper.getBlitter(), cache, paint);
+    SkPaint::Align     textAlignment = paint.getTextAlign();
 
-    if (cache->isSubpixel()) {
-        // maybe we should skip the rounding if linearText is set
-        SkAxisAlignment baseline = SkComputeAxisAlignmentForHText(*fMatrix);
-
-        SkFixed fxMask = ~0;
-        SkFixed fyMask = ~0;
-        if (kX_SkAxisAlignment == baseline) {
-            fyMask = 0;
-#ifndef SK_IGNORE_SUBPIXEL_AXIS_ALIGN_FIX
-            d1g.fHalfSampleY = SK_FixedHalf;
-#endif
-        } else if (kY_SkAxisAlignment == baseline) {
-            fxMask = 0;
-#ifndef SK_IGNORE_SUBPIXEL_AXIS_ALIGN_FIX
-            d1g.fHalfSampleX = SK_FixedHalf;
-#endif
+    SkFindAndPlaceGlyph::ProcessPosText(
+        paint.getTextEncoding(), text, byteLength,
+        offset, *fMatrix, pos, scalarsPerPosition, textAlignment, cache,
+        [&](const SkGlyph& glyph, SkPoint position, SkPoint rounding) {
+            position += rounding;
+            proc(d1g, SkScalarTo48Dot16(position.fX), SkScalarTo48Dot16(position.fY), glyph);
         }
-
-        if (SkPaint::kLeft_Align == paint.getTextAlign()) {
-            while (text < stop) {
-                SkPoint tmsLoc;
-                tmsProc(pos, &tmsLoc);
-                SkFixed fx = SkScalarToFixed(tmsLoc.fX) + d1g.fHalfSampleX;
-                SkFixed fy = SkScalarToFixed(tmsLoc.fY) + d1g.fHalfSampleY;
-
-                const SkGlyph& glyph = glyphCacheProc(cache, &text,
-                                                      fx & fxMask, fy & fyMask);
-
-                if (glyph.fWidth) {
-                    proc(d1g, fx, fy, glyph);
-                }
-                pos += scalarsPerPosition;
-            }
-        } else {
-            while (text < stop) {
-                const char* currentText = text;
-                const SkGlyph& metricGlyph = glyphCacheProc(cache, &text, 0, 0);
-
-                if (metricGlyph.fWidth) {
-                    SkDEBUGCODE(SkFixed prevAdvX = metricGlyph.fAdvanceX;)
-                    SkDEBUGCODE(SkFixed prevAdvY = metricGlyph.fAdvanceY;)
-                    SkPoint tmsLoc;
-                    tmsProc(pos, &tmsLoc);
-                    SkIPoint fixedLoc;
-                    alignProc(tmsLoc, metricGlyph, &fixedLoc);
-
-                    SkFixed fx = fixedLoc.fX + d1g.fHalfSampleX;
-                    SkFixed fy = fixedLoc.fY + d1g.fHalfSampleY;
-
-                    // have to call again, now that we've been "aligned"
-                    const SkGlyph& glyph = glyphCacheProc(cache, &currentText,
-                                                          fx & fxMask, fy & fyMask);
-                    // the assumption is that the metrics haven't changed
-                    SkASSERT(prevAdvX == glyph.fAdvanceX);
-                    SkASSERT(prevAdvY == glyph.fAdvanceY);
-                    SkASSERT(glyph.fWidth);
-
-                    proc(d1g, fx, fy, glyph);
-                }
-                pos += scalarsPerPosition;
-            }
-        }
-    } else {    // not subpixel
-        if (SkPaint::kLeft_Align == paint.getTextAlign()) {
-            while (text < stop) {
-                // the last 2 parameters are ignored
-                const SkGlyph& glyph = glyphCacheProc(cache, &text, 0, 0);
-
-                if (glyph.fWidth) {
-                    SkPoint tmsLoc;
-                    tmsProc(pos, &tmsLoc);
-
-                    proc(d1g,
-                         SkScalarToFixed(tmsLoc.fX) + SK_FixedHalf, //d1g.fHalfSampleX,
-                         SkScalarToFixed(tmsLoc.fY) + SK_FixedHalf, //d1g.fHalfSampleY,
-                         glyph);
-                }
-                pos += scalarsPerPosition;
-            }
-        } else {
-            while (text < stop) {
-                // the last 2 parameters are ignored
-                const SkGlyph& glyph = glyphCacheProc(cache, &text, 0, 0);
-
-                if (glyph.fWidth) {
-                    SkPoint tmsLoc;
-                    tmsProc(pos, &tmsLoc);
-
-                    SkIPoint fixedLoc;
-                    alignProc(tmsLoc, glyph, &fixedLoc);
-
-                    proc(d1g,
-                         fixedLoc.fX + SK_FixedHalf, //d1g.fHalfSampleX,
-                         fixedLoc.fY + SK_FixedHalf, //d1g.fHalfSampleY,
-                         glyph);
-                }
-                pos += scalarsPerPosition;
-            }
-        }
-    }
+    );
 }
 
 #if defined _WIN32 && _MSC_VER >= 1300
@@ -1860,138 +1722,7 @@ void SkDraw::drawPosText(const char text[], size_t byteLength,
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "SkPathMeasure.h"
-
-static void morphpoints(SkPoint dst[], const SkPoint src[], int count,
-                        SkPathMeasure& meas, const SkMatrix& matrix) {
-    SkMatrix::MapXYProc proc = matrix.getMapXYProc();
-
-    for (int i = 0; i < count; i++) {
-        SkPoint pos;
-        SkVector tangent;
-
-        proc(matrix, src[i].fX, src[i].fY, &pos);
-        SkScalar sx = pos.fX;
-        SkScalar sy = pos.fY;
-
-        if (!meas.getPosTan(sx, &pos, &tangent)) {
-            // set to 0 if the measure failed, so that we just set dst == pos
-            tangent.set(0, 0);
-        }
-
-        /*  This is the old way (that explains our approach but is way too slow
-            SkMatrix    matrix;
-            SkPoint     pt;
-
-            pt.set(sx, sy);
-            matrix.setSinCos(tangent.fY, tangent.fX);
-            matrix.preTranslate(-sx, 0);
-            matrix.postTranslate(pos.fX, pos.fY);
-            matrix.mapPoints(&dst[i], &pt, 1);
-        */
-        dst[i].set(pos.fX - SkScalarMul(tangent.fY, sy),
-                   pos.fY + SkScalarMul(tangent.fX, sy));
-    }
-}
-
-/*  TODO
-
-    Need differentially more subdivisions when the follow-path is curvy. Not sure how to
-    determine that, but we need it. I guess a cheap answer is let the caller tell us,
-    but that seems like a cop-out. Another answer is to get Rob Johnson to figure it out.
-*/
-static void morphpath(SkPath* dst, const SkPath& src, SkPathMeasure& meas,
-                      const SkMatrix& matrix) {
-    SkPath::Iter    iter(src, false);
-    SkPoint         srcP[4], dstP[3];
-    SkPath::Verb    verb;
-
-    while ((verb = iter.next(srcP)) != SkPath::kDone_Verb) {
-        switch (verb) {
-            case SkPath::kMove_Verb:
-                morphpoints(dstP, srcP, 1, meas, matrix);
-                dst->moveTo(dstP[0]);
-                break;
-            case SkPath::kLine_Verb:
-                // turn lines into quads to look bendy
-                srcP[0].fX = SkScalarAve(srcP[0].fX, srcP[1].fX);
-                srcP[0].fY = SkScalarAve(srcP[0].fY, srcP[1].fY);
-                morphpoints(dstP, srcP, 2, meas, matrix);
-                dst->quadTo(dstP[0], dstP[1]);
-                break;
-            case SkPath::kQuad_Verb:
-                morphpoints(dstP, &srcP[1], 2, meas, matrix);
-                dst->quadTo(dstP[0], dstP[1]);
-                break;
-            case SkPath::kCubic_Verb:
-                morphpoints(dstP, &srcP[1], 3, meas, matrix);
-                dst->cubicTo(dstP[0], dstP[1], dstP[2]);
-                break;
-            case SkPath::kClose_Verb:
-                dst->close();
-                break;
-            default:
-                SkDEBUGFAIL("unknown verb");
-                break;
-        }
-    }
-}
-
-void SkDraw::drawTextOnPath(const char text[], size_t byteLength,
-                            const SkPath& follow, const SkMatrix* matrix,
-                            const SkPaint& paint) const {
-    SkASSERT(byteLength == 0 || text != NULL);
-
-    // nothing to draw
-    if (text == NULL || byteLength == 0 || fRC->isEmpty()) {
-        return;
-    }
-
-    SkTextToPathIter    iter(text, byteLength, paint, true);
-    SkPathMeasure       meas(follow, false);
-    SkScalar            hOffset = 0;
-
-    // need to measure first
-    if (paint.getTextAlign() != SkPaint::kLeft_Align) {
-        SkScalar pathLen = meas.getLength();
-        if (paint.getTextAlign() == SkPaint::kCenter_Align) {
-            pathLen = SkScalarHalf(pathLen);
-        }
-        hOffset += pathLen;
-    }
-
-    const SkPath*   iterPath;
-    SkScalar        xpos;
-    SkMatrix        scaledMatrix;
-    SkScalar        scale = iter.getPathScale();
-
-    scaledMatrix.setScale(scale, scale);
-
-    while (iter.next(&iterPath, &xpos)) {
-        if (iterPath) {
-            SkPath      tmp;
-            SkMatrix    m(scaledMatrix);
-
-            m.postTranslate(xpos + hOffset, 0);
-            if (matrix) {
-                m.postConcat(*matrix);
-            }
-            morphpath(&tmp, *iterPath, meas, m);
-            if (fDevice) {
-                fDevice->drawPath(*this, tmp, iter.getPaint(), NULL, true);
-            } else {
-                this->drawPath(tmp, iter.getPaint(), NULL, true);
-            }
-        }
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-typedef void (*HairProc)(const SkPoint&, const SkPoint&, const SkRasterClip&,
-                         SkBlitter*);
-
-static HairProc ChooseHairProc(bool doAntiAlias) {
+static SkScan::HairRCProc ChooseHairProc(bool doAntiAlias) {
     return doAntiAlias ? SkScan::AntiHairLine : SkScan::HairLine;
 }
 
@@ -2012,7 +1743,7 @@ class SkTriColorShader : public SkShader {
 public:
     SkTriColorShader() {}
 
-    virtual size_t contextSize() const SK_OVERRIDE;
+    size_t contextSize() const override;
 
     class TriColorShaderContext : public SkShader::Context {
     public:
@@ -2021,7 +1752,7 @@ public:
 
         bool setup(const SkPoint pts[], const SkColor colors[], int, int, int);
 
-        virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE;
+        void shadeSpan(int x, int y, SkPMColor dstC[], int count) override;
 
     private:
         SkMatrix    fDstToUnit;
@@ -2031,13 +1762,13 @@ public:
     };
 
     SK_TO_STRING_OVERRIDE()
-    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTriColorShader)
+
+    // For serialization.  This will never be called.
+    Factory getFactory() const override { sk_throw(); return nullptr; }
 
 protected:
-    SkTriColorShader(SkReadBuffer& buffer) : SkShader(buffer) {}
-
-    virtual Context* onCreateContext(const ContextRec& rec, void* storage) const SK_OVERRIDE {
-        return SkNEW_PLACEMENT_ARGS(storage, TriColorShaderContext, (*this, rec));
+    Context* onCreateContext(const ContextRec& rec, void* storage) const override {
+        return new (storage) TriColorShaderContext(*this, rec);
     }
 
 private:
@@ -2144,7 +1875,7 @@ void SkDraw::drawVertices(SkCanvas::VertexMode vmode, int count,
                           const SkColor colors[], SkXfermode* xmode,
                           const uint16_t indices[], int indexCount,
                           const SkPaint& paint) const {
-    SkASSERT(0 == count || NULL != vertices);
+    SkASSERT(0 == count || vertices);
 
     // abort early if there is nothing to draw
     if (count < 3 || (indices && indexCount < 3) || fRC->isEmpty()) {
@@ -2171,30 +1902,30 @@ void SkDraw::drawVertices(SkCanvas::VertexMode vmode, int count,
     SkPaint p(paint);
 
     SkShader* shader = p.getShader();
-    if (NULL == shader) {
+    if (nullptr == shader) {
         // if we have no shader, we ignore the texture coordinates
-        textures = NULL;
-    } else if (NULL == textures) {
+        textures = nullptr;
+    } else if (nullptr == textures) {
         // if we don't have texture coordinates, ignore the shader
-        p.setShader(NULL);
-        shader = NULL;
+        p.setShader(nullptr);
+        shader = nullptr;
     }
 
     // setup the custom shader (if needed)
     SkAutoTUnref<SkComposeShader> composeShader;
-    if (NULL != colors) {
-        if (NULL == textures) {
+    if (colors) {
+        if (nullptr == textures) {
             // just colors (no texture)
             shader = p.setShader(&triShader);
         } else {
             // colors * texture
             SkASSERT(shader);
             bool releaseMode = false;
-            if (NULL == xmode) {
+            if (nullptr == xmode) {
                 xmode = SkXfermode::Create(SkXfermode::kModulate_Mode);
                 releaseMode = true;
             }
-            composeShader.reset(SkNEW_ARGS(SkComposeShader, (&triShader, shader, xmode)));
+            composeShader.reset(new SkComposeShader(&triShader, shader, xmode));
             p.setShader(composeShader);
             if (releaseMode) {
                 xmode->unref();
@@ -2202,7 +1933,7 @@ void SkDraw::drawVertices(SkCanvas::VertexMode vmode, int count,
         }
     }
 
-    SkAutoBlitterChoose blitter(*fBitmap, *fMatrix, p);
+    SkAutoBlitterChoose blitter(fDst, *fMatrix, p);
     // Abort early if we failed to create a shader context.
     if (blitter->isNullBlitter()) {
         return;
@@ -2212,19 +1943,18 @@ void SkDraw::drawVertices(SkCanvas::VertexMode vmode, int count,
     VertState       state(count, indices, indexCount);
     VertState::Proc vertProc = state.chooseProc(vmode);
 
-    if (NULL != textures || NULL != colors) {
+    if (textures || colors) {
         while (vertProc(&state)) {
-            if (NULL != textures) {
+            if (textures) {
                 SkMatrix tempM;
                 if (texture_to_matrix(state, vertices, textures, &tempM)) {
-                    SkShader::ContextRec rec(*fBitmap, p, *fMatrix);
-                    rec.fLocalMatrix = &tempM;
+                    SkShader::ContextRec rec(p, *fMatrix, &tempM);
                     if (!blitter->resetShaderContext(rec)) {
                         continue;
                     }
                 }
             }
-            if (NULL != colors) {
+            if (colors) {
                 // Find the context for triShader.
                 SkTriColorShader::TriColorShaderContext* triColorShaderContext;
 
@@ -2257,12 +1987,13 @@ void SkDraw::drawVertices(SkCanvas::VertexMode vmode, int count,
         }
     } else {
         // no colors[] and no texture, stroke hairlines with paint's color.
-        HairProc hairProc = ChooseHairProc(paint.isAntiAlias());
+        SkScan::HairRCProc hairProc = ChooseHairProc(paint.isAntiAlias());
         const SkRasterClip& clip = *fRC;
         while (vertProc(&state)) {
-            hairProc(devVerts[state.f0], devVerts[state.f1], clip, blitter.get());
-            hairProc(devVerts[state.f1], devVerts[state.f2], clip, blitter.get());
-            hairProc(devVerts[state.f2], devVerts[state.f0], clip, blitter.get());
+            SkPoint array[] = {
+                devVerts[state.f0], devVerts[state.f1], devVerts[state.f2], devVerts[state.f0]
+            };
+            hairProc(array, 4, clip, blitter.get());
         }
     }
 }
@@ -2273,15 +2004,14 @@ void SkDraw::drawVertices(SkCanvas::VertexMode vmode, int count,
 #ifdef SK_DEBUG
 
 void SkDraw::validate() const {
-    SkASSERT(fBitmap != NULL);
-    SkASSERT(fMatrix != NULL);
-    SkASSERT(fClip != NULL);
-    SkASSERT(fRC != NULL);
+    SkASSERT(fMatrix != nullptr);
+    SkASSERT(fClip != nullptr);
+    SkASSERT(fRC != nullptr);
 
     const SkIRect&  cr = fRC->getBounds();
     SkIRect         br;
 
-    br.set(0, 0, fBitmap->width(), fBitmap->height());
+    br.set(0, 0, fDst.width(), fDst.height());
     SkASSERT(cr.isEmpty() || br.contains(cr));
 }
 
@@ -2295,18 +2025,14 @@ void SkDraw::validate() const {
 #include "SkBlitter.h"
 
 static bool compute_bounds(const SkPath& devPath, const SkIRect* clipBounds,
-                       const SkMaskFilter* filter, const SkMatrix* filterMatrix,
+                           const SkMaskFilter* filter, const SkMatrix* filterMatrix,
                            SkIRect* bounds) {
     if (devPath.isEmpty()) {
         return false;
     }
 
     //  init our bounds from the path
-    {
-        SkRect pathBounds = devPath.getBounds();
-        pathBounds.inset(-SK_ScalarHalf, -SK_ScalarHalf);
-        pathBounds.roundOut(bounds);
-    }
+    *bounds = devPath.getBounds().makeOutset(SK_ScalarHalf, SK_ScalarHalf).roundOut();
 
     SkIPoint margin = SkIPoint::Make(0, 0);
     if (filter) {
@@ -2316,7 +2042,7 @@ static bool compute_bounds(const SkPath& devPath, const SkIRect* clipBounds,
 
         srcM.fBounds = *bounds;
         srcM.fFormat = SkMask::kA8_Format;
-        srcM.fImage = NULL;
+        srcM.fImage = nullptr;
         if (!filter->filterMask(&dstM, srcM, *filterMatrix, &margin)) {
             return false;
         }
@@ -2325,7 +2051,6 @@ static bool compute_bounds(const SkPath& devPath, const SkIRect* clipBounds,
     // (possibly) trim the bounds to reflect the clip
     // (plus whatever slop the filter needs)
     if (clipBounds) {
-        SkIRect tmp = *clipBounds;
         // Ugh. Guard against gigantic margins from wacky filters. Without this
         // check we can request arbitrary amounts of slop beyond our visible
         // clip, and bring down the renderer (at least on finite RAM machines
@@ -2333,9 +2058,8 @@ static bool compute_bounds(const SkPath& devPath, const SkIRect* clipBounds,
         // quality of large filters like blurs, and the corresponding memory
         // requests.
         static const int MAX_MARGIN = 128;
-        tmp.inset(-SkMin32(margin.fX, MAX_MARGIN),
-                  -SkMin32(margin.fY, MAX_MARGIN));
-        if (!bounds->intersect(tmp)) {
+        if (!bounds->intersect(clipBounds->makeOutset(SkMin32(margin.fX, MAX_MARGIN),
+                                                      SkMin32(margin.fY, MAX_MARGIN)))) {
             return false;
         }
     }
@@ -2343,22 +2067,20 @@ static bool compute_bounds(const SkPath& devPath, const SkIRect* clipBounds,
     return true;
 }
 
-static void draw_into_mask(const SkMask& mask, const SkPath& devPath,
-                           SkPaint::Style style) {
-    SkBitmap        bm;
-    SkDraw          draw;
+static void draw_into_mask(const SkMask& mask, const SkPath& devPath, SkPaint::Style style) {
+    SkDraw draw;
+    if (!draw.fDst.reset(mask)) {
+        return;
+    }
+
     SkRasterClip    clip;
     SkMatrix        matrix;
     SkPaint         paint;
 
-    bm.installPixels(SkImageInfo::MakeA8(mask.fBounds.width(), mask.fBounds.height()),
-                     mask.fImage, mask.fRowBytes);
-
     clip.setRect(SkIRect::MakeWH(mask.fBounds.width(), mask.fBounds.height()));
     matrix.setTranslate(-SkIntToScalar(mask.fBounds.fLeft),
                         -SkIntToScalar(mask.fBounds.fTop));
 
-    draw.fBitmap    = &bm;
     draw.fRC        = &clip;
     draw.fClip      = &clip.bwRgn();
     draw.fMatrix    = &matrix;
diff --git a/gfx/skia/skia/src/core/SkDrawLooper.cpp b/gfx/skia/skia/src/core/SkDrawLooper.cpp
index d18d12710abd..aa53f2e3a131 100644
--- a/gfx/skia/skia/src/core/SkDrawLooper.cpp
+++ b/gfx/skia/skia/src/core/SkDrawLooper.cpp
@@ -21,7 +21,7 @@ bool SkDrawLooper::canComputeFastBounds(const SkPaint& paint) const {
     for (;;) {
         SkPaint p(paint);
         if (context->next(&canvas, &p)) {
-            p.setLooper(NULL);
+            p.setLooper(nullptr);
             if (!p.canComputeFastBounds()) {
                 return false;
             }
@@ -32,8 +32,11 @@ bool SkDrawLooper::canComputeFastBounds(const SkPaint& paint) const {
     return true;
 }
 
-void SkDrawLooper::computeFastBounds(const SkPaint& paint, const SkRect& src,
+void SkDrawLooper::computeFastBounds(const SkPaint& paint, const SkRect& s,
                                      SkRect* dst) const {
+    // src and dst rects may alias and we need to keep the original src, so copy it.
+    const SkRect src = s;
+
     SkCanvas canvas;
     SkSmallAllocator<1, 32> allocator;
     void* buffer = allocator.reserveT<SkDrawLooper::Context>(this->contextSize());
@@ -45,7 +48,7 @@ void SkDrawLooper::computeFastBounds(const SkPaint& paint, const SkRect& src,
         if (context->next(&canvas, &p)) {
             SkRect r(src);
 
-            p.setLooper(NULL);
+            p.setLooper(nullptr);
             p.computeFastBounds(r, &r);
             canvas.getTotalMatrix().mapRect(&r);
 
diff --git a/gfx/skia/skia/src/core/SkDrawProcs.h b/gfx/skia/skia/src/core/SkDrawProcs.h
index d059c674701f..a861a0ad8668 100644
--- a/gfx/skia/skia/src/core/SkDrawProcs.h
+++ b/gfx/skia/skia/src/core/SkDrawProcs.h
@@ -8,57 +8,9 @@
 #ifndef SkDrawProcs_DEFINED
 #define SkDrawProcs_DEFINED
 
-#include "SkBlitter.h"
 #include "SkDraw.h"
 #include "SkGlyph.h"
 
-class SkAAClip;
-class SkBlitter;
-
-struct SkDraw1Glyph {
-    const SkDraw* fDraw;
-    const SkRegion* fClip;
-    const SkAAClip* fAAClip;
-    SkBlitter* fBlitter;
-    SkGlyphCache* fCache;
-    const SkPaint* fPaint;
-    SkIRect fClipBounds;
-    /** Half the sampling frequency of the rasterized glyph in x. */
-    SkFixed fHalfSampleX;
-    /** Half the sampling frequency of the rasterized glyph in y. */
-    SkFixed fHalfSampleY;
-
-    /** Draws one glyph.
-     *
-     *  The x and y are pre-biased, so implementations may just truncate them.
-     *  i.e. half the sampling frequency has been added.
-     *  e.g. 1/2 or 1/(2^(SkGlyph::kSubBits+1)) has already been added.
-     *  This added bias can be found in fHalfSampleX,Y.
-     */
-    typedef void (*Proc)(const SkDraw1Glyph&, SkFixed x, SkFixed y, const SkGlyph&);
-
-    Proc init(const SkDraw* draw, SkBlitter* blitter, SkGlyphCache* cache,
-              const SkPaint&);
-
-    // call this instead of fBlitter->blitMask() since this wrapper will handle
-    // the case when the mask is ARGB32_Format
-    //
-    void blitMask(const SkMask& mask, const SkIRect& clip) const {
-        if (SkMask::kARGB32_Format == mask.fFormat) {
-            this->blitMaskAsSprite(mask);
-        } else {
-            fBlitter->blitMask(mask, clip);
-        }
-    }
-
-    // mask must be kARGB32_Format
-    void blitMaskAsSprite(const SkMask& mask) const;
-};
-
-struct SkDrawProcs {
-    SkDraw1Glyph::Proc  fD1GProc;
-};
-
 bool SkDrawTreatAAStrokeAsHairline(SkScalar strokeWidth, const SkMatrix&,
                                    SkScalar* coverage);
 
@@ -93,31 +45,6 @@ public:
         : fAlign(align) {
     }
 
-    // Returns the position of the glyph in fixed point, which may be rounded or not
-    //         by the caller e.g. subpixel doesn't round.
-    // @param point interpreted as SkFixed [x, y].
-    void operator()(const SkPoint& loc, const SkGlyph& glyph, SkIPoint* dst) {
-        if (SkPaint::kLeft_Align == fAlign) {
-            dst->set(SkScalarToFixed(loc.fX), SkScalarToFixed(loc.fY));
-        } else if (SkPaint::kCenter_Align == fAlign) {
-            dst->set(SkScalarToFixed(loc.fX) - (glyph.fAdvanceX >> 1),
-                     SkScalarToFixed(loc.fY) - (glyph.fAdvanceY >> 1));
-        } else {
-            SkASSERT(SkPaint::kRight_Align == fAlign);
-            dst->set(SkScalarToFixed(loc.fX) - glyph.fAdvanceX,
-                     SkScalarToFixed(loc.fY) - glyph.fAdvanceY);
-        }
-    }
-private:
-    const SkPaint::Align fAlign;
-};
-
-class SkTextAlignProcScalar {
-public:
-    SkTextAlignProcScalar(SkPaint::Align align)
-        : fAlign(align) {
-    }
-
     // Returns the glyph position, which may be rounded or not by the caller
     //   e.g. subpixel doesn't round.
     void operator()(const SkPoint& loc, const SkGlyph& glyph, SkPoint* dst) {
diff --git a/gfx/skia/skia/src/core/SkDrawable.cpp b/gfx/skia/skia/src/core/SkDrawable.cpp
new file mode 100644
index 000000000000..8fea38be34a4
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkDrawable.cpp
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkAtomics.h"
+#include "SkCanvas.h"
+#include "SkDrawable.h"
+
+static int32_t next_generation_id() {
+    static int32_t gCanvasDrawableGenerationID;
+
+    // do a loop in case our global wraps around, as we never want to
+    // return a 0
+    int32_t genID;
+    do {
+        genID = sk_atomic_inc(&gCanvasDrawableGenerationID) + 1;
+    } while (0 == genID);
+    return genID;
+}
+
+SkDrawable::SkDrawable() : fGenerationID(0) {}
+
+static void draw_bbox(SkCanvas* canvas, const SkRect& r) {
+    SkPaint paint;
+    paint.setStyle(SkPaint::kStroke_Style);
+    paint.setColor(0xFFFF7088);
+    canvas->drawRect(r, paint);
+    canvas->drawLine(r.left(), r.top(), r.right(), r.bottom(), paint);
+    canvas->drawLine(r.left(), r.bottom(), r.right(), r.top(), paint);
+}
+
+void SkDrawable::draw(SkCanvas* canvas, const SkMatrix* matrix) {
+    SkAutoCanvasRestore acr(canvas, true);
+    if (matrix) {
+        canvas->concat(*matrix);
+    }
+    this->onDraw(canvas);
+
+    if (false) {
+        draw_bbox(canvas, this->getBounds());
+    }
+}
+
+void SkDrawable::draw(SkCanvas* canvas, SkScalar x, SkScalar y) {
+    SkMatrix matrix = SkMatrix::MakeTrans(x, y);
+    this->draw(canvas, &matrix);
+}
+
+SkPicture* SkDrawable::newPictureSnapshot() {
+    return this->onNewPictureSnapshot();
+}
+
+uint32_t SkDrawable::getGenerationID() {
+    if (0 == fGenerationID) {
+        fGenerationID = next_generation_id();
+    }
+    return fGenerationID;
+}
+
+SkRect SkDrawable::getBounds() {
+    return this->onGetBounds();
+}
+
+void SkDrawable::notifyDrawingChanged() {
+    fGenerationID = 0;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+
+#include "SkPictureRecorder.h"
+
+SkPicture* SkDrawable::onNewPictureSnapshot() {
+    SkPictureRecorder recorder;
+
+    const SkRect bounds = this->getBounds();
+    SkCanvas* canvas = recorder.beginRecording(bounds, nullptr, 0);
+    this->draw(canvas);
+    if (false) {
+        draw_bbox(canvas, bounds);
+    }
+    return recorder.endRecording();
+}
diff --git a/gfx/skia/skia/src/core/SkEdge.cpp b/gfx/skia/skia/src/core/SkEdge.cpp
index dd5ab5fbc62f..f91f5f87829c 100644
--- a/gfx/skia/skia/src/core/SkEdge.cpp
+++ b/gfx/skia/skia/src/core/SkEdge.cpp
@@ -66,12 +66,12 @@ int SkEdge::setLine(const SkPoint& p0, const SkPoint& p1, const SkIRect* clip,
         return 0;
     }
     // are we completely above or below the clip?
-    if (NULL != clip && (top >= clip->fBottom || bot <= clip->fTop)) {
+    if (clip && (top >= clip->fBottom || bot <= clip->fTop)) {
         return 0;
     }
 
     SkFixed slope = SkFDot6Div(x1 - x0, y1 - y0);
-    const int dy  = SkEdge_Compute_DY(top, y0);
+    const SkFDot6 dy  = SkEdge_Compute_DY(top, y0);
 
     fX          = SkFDot6ToFixed(x0 + SkFixedMul(slope, dy));   // + SK_Fixed1/2
     fDX         = slope;
@@ -112,7 +112,7 @@ int SkEdge::updateLine(SkFixed x0, SkFixed y0, SkFixed x1, SkFixed y1)
     x1 >>= 10;
 
     SkFixed slope = SkFDot6Div(x1 - x0, y1 - y0);
-    const int dy  = SkEdge_Compute_DY(top, y0);
+    const SkFDot6 dy  = SkEdge_Compute_DY(top, y0);
 
     fX          = SkFDot6ToFixed(x0 + SkFixedMul(slope, dy));   // + SK_Fixed1/2
     fDX         = slope;
@@ -332,8 +332,7 @@ static SkFDot6 cubic_delta_from_line(SkFDot6 a, SkFDot6 b, SkFDot6 c, SkFDot6 d)
     return SkMax32(SkAbs32(oneThird), SkAbs32(twoThird));
 }
 
-int SkCubicEdge::setCubic(const SkPoint pts[4], const SkIRect* clip, int shift)
-{
+int SkCubicEdge::setCubic(const SkPoint pts[4], int shift) {
     SkFDot6 x0, y0, x1, y1, x2, y2, x3, y3;
 
     {
@@ -376,10 +375,6 @@ int SkCubicEdge::setCubic(const SkPoint pts[4], const SkIRect* clip, int shift)
     if (top == bot)
         return 0;
 
-    // are we completely above or below the clip?
-    if (clip && (top >= clip->fBottom || bot <= clip->fTop))
-        return 0;
-
     // compute number of steps needed (1 << shift)
     {
         // Can't use (center of curve - center of baseline), since center-of-curve
@@ -433,16 +428,6 @@ int SkCubicEdge::setCubic(const SkPoint pts[4], const SkIRect* clip, int shift)
     fCLastX = SkFDot6ToFixed(x3);
     fCLastY = SkFDot6ToFixed(y3);
 
-    if (clip)
-    {
-        do {
-            if (!this->updateCubic()) {
-                return 0;
-            }
-        } while (!this->intersectsClip(*clip));
-        this->chopLineWithClip(*clip);
-        return 1;
-    }
     return this->updateCubic();
 }
 
diff --git a/gfx/skia/skia/src/core/SkEdge.h b/gfx/skia/skia/src/core/SkEdge.h
index 67a0ee787604..db6f43085dad 100644
--- a/gfx/skia/skia/src/core/SkEdge.h
+++ b/gfx/skia/skia/src/core/SkEdge.h
@@ -36,8 +36,7 @@ struct SkEdge {
     uint8_t fCubicDShift;   // applied to fCDx and fCDy only in cubic
     int8_t  fWinding;       // 1 or -1
 
-    int setLine(const SkPoint& p0, const SkPoint& p1, const SkIRect* clip,
-                int shiftUp);
+    int setLine(const SkPoint& p0, const SkPoint& p1, const SkIRect* clip, int shiftUp);
     // call this version if you know you don't have a clip
     inline int setLine(const SkPoint& p0, const SkPoint& p1, int shiftUp);
     inline int updateLine(SkFixed ax, SkFixed ay, SkFixed bx, SkFixed by);
@@ -81,7 +80,7 @@ struct SkCubicEdge : public SkEdge {
     SkFixed fCDDDx, fCDDDy;
     SkFixed fCLastX, fCLastY;
 
-    int setCubic(const SkPoint pts[4], const SkIRect* clip, int shiftUp);
+    int setCubic(const SkPoint pts[4], int shiftUp);
     int updateCubic();
 };
 
@@ -120,7 +119,7 @@ int SkEdge::setLine(const SkPoint& p0, const SkPoint& p1, int shift) {
     }
 
     SkFixed slope = SkFDot6Div(x1 - x0, y1 - y0);
-    const int dy  = SkEdge_Compute_DY(top, y0);
+    const SkFDot6 dy  = SkEdge_Compute_DY(top, y0);
 
     fX          = SkFDot6ToFixed(x0 + SkFixedMul(slope, dy));   // + SK_Fixed1/2
     fDX         = slope;
diff --git a/gfx/skia/skia/src/core/SkEdgeBuilder.cpp b/gfx/skia/skia/src/core/SkEdgeBuilder.cpp
index c3f5dafe8d7e..92c8330c16d6 100644
--- a/gfx/skia/skia/src/core/SkEdgeBuilder.cpp
+++ b/gfx/skia/skia/src/core/SkEdgeBuilder.cpp
@@ -19,7 +19,7 @@ template <typename T> static T* typedAllocThrow(SkChunkAlloc& alloc) {
 ///////////////////////////////////////////////////////////////////////////////
 
 SkEdgeBuilder::SkEdgeBuilder() : fAlloc(16*1024) {
-    fEdgeList = NULL;
+    fEdgeList = nullptr;
 }
 
 void SkEdgeBuilder::addLine(const SkPoint pts[]) {
@@ -42,7 +42,7 @@ void SkEdgeBuilder::addQuad(const SkPoint pts[]) {
 
 void SkEdgeBuilder::addCubic(const SkPoint pts[]) {
     SkCubicEdge* edge = typedAllocThrow<SkCubicEdge>(fAlloc);
-    if (edge->setCubic(pts, NULL, fShiftUp)) {
+    if (edge->setCubic(pts, fShiftUp)) {
         fList.push(edge);
     } else {
         // TODO: unallocate edge from storage...
@@ -79,8 +79,8 @@ static void setShiftedClip(SkRect* dst, const SkIRect& src, int shift) {
              SkIntToScalar(src.fBottom >> shift));
 }
 
-int SkEdgeBuilder::buildPoly(const SkPath& path, const SkIRect* iclip,
-                             int shiftUp) {
+int SkEdgeBuilder::buildPoly(const SkPath& path, const SkIRect* iclip, int shiftUp,
+                             bool canCullToTheRight) {
     SkPath::Iter    iter(path, true);
     SkPoint         pts[4];
     SkPath::Verb    verb;
@@ -115,7 +115,7 @@ int SkEdgeBuilder::buildPoly(const SkPath& path, const SkIRect* iclip,
                     break;
                 case SkPath::kLine_Verb: {
                     SkPoint lines[SkLineClipper::kMaxPoints];
-                    int lineCount = SkLineClipper::ClipLine(pts, clip, lines);
+                    int lineCount = SkLineClipper::ClipLine(pts, clip, lines, canCullToTheRight);
                     SkASSERT(lineCount <= SkLineClipper::kMaxClippedLineSegments);
                     for (int i = 0; i < lineCount; i++) {
                         if (edge->setLine(lines[i], lines[i + 1], shiftUp)) {
@@ -161,18 +161,19 @@ static void handle_quad(SkEdgeBuilder* builder, const SkPoint pts[3]) {
     }
 }
 
-int SkEdgeBuilder::build(const SkPath& path, const SkIRect* iclip,
-                         int shiftUp) {
+int SkEdgeBuilder::build(const SkPath& path, const SkIRect* iclip, int shiftUp,
+                         bool canCullToTheRight) {
     fAlloc.reset();
     fList.reset();
     fShiftUp = shiftUp;
 
-    SkScalar conicTol = SK_ScalarHalf * (1 << shiftUp);
-
     if (SkPath::kLine_SegmentMask == path.getSegmentMasks()) {
-        return this->buildPoly(path, iclip, shiftUp);
+        return this->buildPoly(path, iclip, shiftUp, canCullToTheRight);
     }
 
+    SkAutoConicToQuads quadder;
+    const SkScalar conicTol = SK_Scalar1 / 4;
+
     SkPath::Iter    iter(path, true);
     SkPoint         pts[4];
     SkPath::Verb    verb;
@@ -180,7 +181,7 @@ int SkEdgeBuilder::build(const SkPath& path, const SkIRect* iclip,
     if (iclip) {
         SkRect clip;
         setShiftedClip(&clip, *iclip, shiftUp);
-        SkEdgeClipper clipper;
+        SkEdgeClipper clipper(canCullToTheRight);
 
         while ((verb = iter.next(pts, false)) != SkPath::kDone_Verb) {
             switch (verb) {
@@ -191,7 +192,7 @@ int SkEdgeBuilder::build(const SkPath& path, const SkIRect* iclip,
                     break;
                 case SkPath::kLine_Verb: {
                     SkPoint lines[SkLineClipper::kMaxPoints];
-                    int lineCount = SkLineClipper::ClipLine(pts, clip, lines);
+                    int lineCount = SkLineClipper::ClipLine(pts, clip, lines, canCullToTheRight);
                     for (int i = 0; i < lineCount; i++) {
                         this->addLine(&lines[i]);
                     }
@@ -203,21 +204,13 @@ int SkEdgeBuilder::build(const SkPath& path, const SkIRect* iclip,
                     }
                     break;
                 case SkPath::kConic_Verb: {
-                    const int MAX_POW2 = 4;
-                    const int MAX_QUADS = 1 << MAX_POW2;
-                    const int MAX_QUAD_PTS = 1 + 2 * MAX_QUADS;
-                    SkPoint storage[MAX_QUAD_PTS];
-
-                    SkConic conic;
-                    conic.set(pts, iter.conicWeight());
-                    int pow2 = conic.computeQuadPOW2(conicTol);
-                    pow2 = SkMin32(pow2, MAX_POW2);
-                    int quadCount = conic.chopIntoQuadsPOW2(storage, pow2);
-                    SkASSERT(quadCount <= MAX_QUADS);
-                    for (int i = 0; i < quadCount; ++i) {
-                        if (clipper.clipQuad(&storage[i * 2], clip)) {
+                    const SkPoint* quadPts = quadder.computeQuads(
+                                          pts, iter.conicWeight(), conicTol);
+                    for (int i = 0; i < quadder.countQuads(); ++i) {
+                        if (clipper.clipQuad(quadPts, clip)) {
                             this->addClipper(&clipper);
                         }
+                        quadPts += 2;
                     }
                 } break;
                 case SkPath::kCubic_Verb:
@@ -246,19 +239,11 @@ int SkEdgeBuilder::build(const SkPath& path, const SkIRect* iclip,
                     break;
                 }
                 case SkPath::kConic_Verb: {
-                    const int MAX_POW2 = 4;
-                    const int MAX_QUADS = 1 << MAX_POW2;
-                    const int MAX_QUAD_PTS = 1 + 2 * MAX_QUADS;
-                    SkPoint storage[MAX_QUAD_PTS];
-
-                    SkConic conic;
-                    conic.set(pts, iter.conicWeight());
-                    int pow2 = conic.computeQuadPOW2(conicTol);
-                    pow2 = SkMin32(pow2, MAX_POW2);
-                    int quadCount = conic.chopIntoQuadsPOW2(storage, pow2);
-                    SkASSERT(quadCount <= MAX_QUADS);
-                    for (int i = 0; i < quadCount; ++i) {
-                        handle_quad(this, &storage[i * 2]);
+                    const SkPoint* quadPts = quadder.computeQuads(
+                                          pts, iter.conicWeight(), conicTol);
+                    for (int i = 0; i < quadder.countQuads(); ++i) {
+                        handle_quad(this, quadPts);
+                        quadPts += 2;
                     }
                 } break;
                 case SkPath::kCubic_Verb: {
diff --git a/gfx/skia/skia/src/core/SkEdgeBuilder.h b/gfx/skia/skia/src/core/SkEdgeBuilder.h
index f9e5976e17f6..625465b8a6b2 100644
--- a/gfx/skia/skia/src/core/SkEdgeBuilder.h
+++ b/gfx/skia/skia/src/core/SkEdgeBuilder.h
@@ -22,7 +22,7 @@ public:
 
     // returns the number of built edges. The array of those edge pointers
     // is returned from edgeList().
-    int build(const SkPath& path, const SkIRect* clip, int shiftUp);
+    int build(const SkPath& path, const SkIRect* clip, int shiftUp, bool clipToTheRight);
 
     SkEdge** edgeList() { return fEdgeList; }
 
@@ -36,9 +36,9 @@ private:
      *  empty, as we will have preallocated room for the pointers in fAlloc's
      *  block, and fEdgeList will point into that.
      */
-    SkEdge**            fEdgeList;
+    SkEdge**    fEdgeList;
 
-    int                 fShiftUp;
+    int         fShiftUp;
 
 public:
     void addLine(const SkPoint pts[]);
@@ -46,7 +46,7 @@ public:
     void addCubic(const SkPoint pts[]);
     void addClipper(SkEdgeClipper*);
 
-    int buildPoly(const SkPath& path, const SkIRect* clip, int shiftUp);
+    int buildPoly(const SkPath& path, const SkIRect* clip, int shiftUp, bool clipToTheRight);
 };
 
 #endif
diff --git a/gfx/skia/skia/src/core/SkEdgeClipper.cpp b/gfx/skia/skia/src/core/SkEdgeClipper.cpp
index 00a1dd2494bf..c6a4fb297131 100644
--- a/gfx/skia/skia/src/core/SkEdgeClipper.cpp
+++ b/gfx/skia/skia/src/core/SkEdgeClipper.cpp
@@ -148,7 +148,9 @@ void SkEdgeClipper::clipMonoQuad(const SkPoint srcPts[3], const SkRect& clip) {
         return;
     }
     if (pts[0].fX >= clip.fRight) {  // wholly to the right
-        this->appendVLine(clip.fRight, pts[0].fY, pts[2].fY, reverse);
+        if (!this->canCullToTheRight()) {
+            this->appendVLine(clip.fRight, pts[0].fY, pts[2].fY, reverse);
+        }
         return;
     }
 
@@ -223,54 +225,36 @@ bool SkEdgeClipper::clipQuad(const SkPoint srcPts[3], const SkRect& clip) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static SkScalar eval_cubic_coeff(SkScalar A, SkScalar B, SkScalar C,
-                                 SkScalar D, SkScalar t) {
-    return SkScalarMulAdd(SkScalarMulAdd(SkScalarMulAdd(A, t, B), t, C), t, D);
+static SkScalar mono_cubic_closestT(const SkScalar src[], SkScalar x) {
+    SkScalar t = 0.5f;
+    SkScalar lastT;
+    SkScalar bestT  SK_INIT_TO_AVOID_WARNING;
+    SkScalar step = 0.25f;
+    SkScalar D = src[0];
+    SkScalar A = src[6] + 3*(src[2] - src[4]) - D;
+    SkScalar B = 3*(src[4] - src[2] - src[2] + D);
+    SkScalar C = 3*(src[2] - D);
+    x -= D;
+    SkScalar closest = SK_ScalarMax;
+    do {
+        SkScalar loc = ((A * t + B) * t + C) * t;
+        SkScalar dist = SkScalarAbs(loc - x);
+        if (closest > dist) {
+            closest = dist;
+            bestT = t;
+        }
+        lastT = t;
+        t += loc < x ? step : -step;
+        step *= 0.5f;
+    } while (closest > 0.25f && lastT != t);
+    return bestT;
 }
 
-/*  Given 4 cubic points (either Xs or Ys), and a target X or Y, compute the
-    t value such that cubic(t) = target
- */
-static bool chopMonoCubicAt(SkScalar c0, SkScalar c1, SkScalar c2, SkScalar c3,
-                           SkScalar target, SkScalar* t) {
- //   SkASSERT(c0 <= c1 && c1 <= c2 && c2 <= c3);
-    SkASSERT(c0 < target && target < c3);
-
-    SkScalar D = c0 - target;
-    SkScalar A = c3 + 3*(c1 - c2) - c0;
-    SkScalar B = 3*(c2 - c1 - c1 + c0);
-    SkScalar C = 3*(c1 - c0);
-
-    const SkScalar TOLERANCE = SK_Scalar1 / 4096;
-    SkScalar minT = 0;
-    SkScalar maxT = SK_Scalar1;
-    SkScalar mid;
-
-    // This is a lot of iterations. Is there a faster way?
-    for (int i = 0; i < 24; i++) {
-        mid = SkScalarAve(minT, maxT);
-        SkScalar delta = eval_cubic_coeff(A, B, C, D, mid);
-        if (delta < 0) {
-            minT = mid;
-            delta = -delta;
-        } else {
-            maxT = mid;
-        }
-        if (delta < TOLERANCE) {
-            break;
-        }
+static void chop_mono_cubic_at_y(SkPoint src[4], SkScalar y, SkPoint dst[7]) {
+    if (SkChopMonoCubicAtY(src, y, dst)) {
+        return;
     }
-    *t = mid;
-//    SkDebugf("-- evalCubicAt %d delta %g\n", i, eval_cubic_coeff(A, B, C, D, *t));
-    return true;
-}
-
-static bool chopMonoCubicAtY(SkPoint pts[4], SkScalar y, SkScalar* t) {
-    return chopMonoCubicAt(pts[0].fY, pts[1].fY, pts[2].fY, pts[3].fY, y, t);
-}
-
-static bool chopMonoCubicAtX(SkPoint pts[4], SkScalar x, SkScalar* t) {
-    return chopMonoCubicAt(pts[0].fX, pts[1].fX, pts[2].fX, pts[3].fX, x, t);
+    SkChopCubicAt(src, dst, mono_cubic_closestT(&src->fY, y));
 }
 
 // Modify pts[] in place so that it is clipped in Y to the clip rect
@@ -278,52 +262,39 @@ static void chop_cubic_in_Y(SkPoint pts[4], const SkRect& clip) {
 
     // are we partially above
     if (pts[0].fY < clip.fTop) {
-        SkScalar t;
-        if (chopMonoCubicAtY(pts, clip.fTop, &t)) {
-            SkPoint tmp[7];
-            SkChopCubicAt(pts, tmp, t);
+        SkPoint tmp[7];
+        chop_mono_cubic_at_y(pts, clip.fTop, tmp);
+        // tmp[3, 4].fY should all be to the below clip.fTop.
+        // Since we can't trust the numerics of
+        // the chopper, we force those conditions now
+        tmp[3].fY = clip.fTop;
+        clamp_ge(tmp[4].fY, clip.fTop);
 
-            // tmp[3, 4, 5].fY should all be to the below clip.fTop.
-            // Since we can't trust the numerics of
-            // the chopper, we force those conditions now
-            tmp[3].fY = clip.fTop;
-            clamp_ge(tmp[4].fY, clip.fTop);
-            clamp_ge(tmp[5].fY, clip.fTop);
-
-            pts[0] = tmp[3];
-            pts[1] = tmp[4];
-            pts[2] = tmp[5];
-        } else {
-            // if chopMonoCubicAtY failed, then we may have hit inexact numerics
-            // so we just clamp against the top
-            for (int i = 0; i < 4; i++) {
-                clamp_ge(pts[i].fY, clip.fTop);
-            }
-        }
+        pts[0] = tmp[3];
+        pts[1] = tmp[4];
+        pts[2] = tmp[5];
     }
 
     // are we partially below
     if (pts[3].fY > clip.fBottom) {
-        SkScalar t;
-        if (chopMonoCubicAtY(pts, clip.fBottom, &t)) {
-            SkPoint tmp[7];
-            SkChopCubicAt(pts, tmp, t);
-            tmp[3].fY = clip.fBottom;
-            clamp_le(tmp[2].fY, clip.fBottom);
+        SkPoint tmp[7];
+        chop_mono_cubic_at_y(pts, clip.fBottom, tmp);
+        tmp[3].fY = clip.fBottom;
+        clamp_le(tmp[2].fY, clip.fBottom);
 
-            pts[1] = tmp[1];
-            pts[2] = tmp[2];
-            pts[3] = tmp[3];
-        } else {
-            // if chopMonoCubicAtY failed, then we may have hit inexact numerics
-            // so we just clamp against the bottom
-            for (int i = 0; i < 4; i++) {
-                clamp_le(pts[i].fY, clip.fBottom);
-            }
-        }
+        pts[1] = tmp[1];
+        pts[2] = tmp[2];
+        pts[3] = tmp[3];
     }
 }
 
+static void chop_mono_cubic_at_x(SkPoint src[4], SkScalar x, SkPoint dst[7]) {
+    if (SkChopMonoCubicAtX(src, x, dst)) {
+        return;
+    }
+    SkChopCubicAt(src, dst, mono_cubic_closestT(&src->fX, x));
+}
+
 // srcPts[] must be monotonic in X and Y
 void SkEdgeClipper::clipMonoCubic(const SkPoint src[4], const SkRect& clip) {
     SkPoint pts[4];
@@ -350,53 +321,38 @@ void SkEdgeClipper::clipMonoCubic(const SkPoint src[4], const SkRect& clip) {
         return;
     }
     if (pts[0].fX >= clip.fRight) {  // wholly to the right
-        this->appendVLine(clip.fRight, pts[0].fY, pts[3].fY, reverse);
+        if (!this->canCullToTheRight()) {
+            this->appendVLine(clip.fRight, pts[0].fY, pts[3].fY, reverse);
+        }
         return;
     }
 
     // are we partially to the left
     if (pts[0].fX < clip.fLeft) {
-        SkScalar t;
-        if (chopMonoCubicAtX(pts, clip.fLeft, &t)) {
-            SkPoint tmp[7];
-            SkChopCubicAt(pts, tmp, t);
-            this->appendVLine(clip.fLeft, tmp[0].fY, tmp[3].fY, reverse);
+        SkPoint tmp[7];
+        chop_mono_cubic_at_x(pts, clip.fLeft, tmp);
+        this->appendVLine(clip.fLeft, tmp[0].fY, tmp[3].fY, reverse);
 
-            // tmp[3, 4, 5].fX should all be to the right of clip.fLeft.
-            // Since we can't trust the numerics of
-            // the chopper, we force those conditions now
-            tmp[3].fX = clip.fLeft;
-            clamp_ge(tmp[4].fX, clip.fLeft);
-            clamp_ge(tmp[5].fX, clip.fLeft);
+        // tmp[3, 4].fX should all be to the right of clip.fLeft.
+        // Since we can't trust the numerics of
+        // the chopper, we force those conditions now
+        tmp[3].fX = clip.fLeft;
+        clamp_ge(tmp[4].fX, clip.fLeft);
 
-            pts[0] = tmp[3];
-            pts[1] = tmp[4];
-            pts[2] = tmp[5];
-        } else {
-            // if chopMonocubicAtY failed, then we may have hit inexact numerics
-            // so we just clamp against the left
-            this->appendVLine(clip.fLeft, pts[0].fY, pts[3].fY, reverse);
-            return;
-        }
+        pts[0] = tmp[3];
+        pts[1] = tmp[4];
+        pts[2] = tmp[5];
     }
 
     // are we partially to the right
     if (pts[3].fX > clip.fRight) {
-        SkScalar t;
-        if (chopMonoCubicAtX(pts, clip.fRight, &t)) {
-            SkPoint tmp[7];
-            SkChopCubicAt(pts, tmp, t);
-            tmp[3].fX = clip.fRight;
-            clamp_le(tmp[2].fX, clip.fRight);
-            clamp_le(tmp[1].fX, clip.fRight);
+        SkPoint tmp[7];
+        chop_mono_cubic_at_x(pts, clip.fRight, tmp);
+        tmp[3].fX = clip.fRight;
+        clamp_le(tmp[2].fX, clip.fRight);
 
-            this->appendCubic(tmp, reverse);
-            this->appendVLine(clip.fRight, tmp[3].fY, tmp[6].fY, reverse);
-        } else {
-            // if chopMonoCubicAtX failed, then we may have hit inexact numerics
-            // so we just clamp against the right
-            this->appendVLine(clip.fRight, pts[0].fY, pts[3].fY, reverse);
-        }
+        this->appendCubic(tmp, reverse);
+        this->appendVLine(clip.fRight, tmp[3].fY, tmp[6].fY, reverse);
     } else {    // wholly inside the clip
         this->appendCubic(pts, reverse);
     }
diff --git a/gfx/skia/skia/src/core/SkEdgeClipper.h b/gfx/skia/skia/src/core/SkEdgeClipper.h
index e16ed552ca22..16887b4a3213 100644
--- a/gfx/skia/skia/src/core/SkEdgeClipper.h
+++ b/gfx/skia/skia/src/core/SkEdgeClipper.h
@@ -17,14 +17,19 @@
  */
 class SkEdgeClipper {
 public:
+    SkEdgeClipper(bool canCullToTheRight) : fCanCullToTheRight(canCullToTheRight) {}
+
     bool clipQuad(const SkPoint pts[3], const SkRect& clip);
     bool clipCubic(const SkPoint pts[4], const SkRect& clip);
 
     SkPath::Verb next(SkPoint pts[]);
 
+    bool canCullToTheRight() const { return fCanCullToTheRight; }
+
 private:
     SkPoint*        fCurrPoint;
     SkPath::Verb*   fCurrVerb;
+    const bool      fCanCullToTheRight;
 
     enum {
         kMaxVerbs = 13,
diff --git a/gfx/skia/skia/src/core/SkEmptyShader.h b/gfx/skia/skia/src/core/SkEmptyShader.h
index 7de3bc1f8f9c..6453e0e4400b 100644
--- a/gfx/skia/skia/src/core/SkEmptyShader.h
+++ b/gfx/skia/skia/src/core/SkEmptyShader.h
@@ -14,14 +14,14 @@
 
 /**
  *  \class SkEmptyShader
- *  A Shader that always draws nothing. Its createContext always returns NULL.
+ *  A Shader that always draws nothing. Its createContext always returns nullptr.
  */
 class SK_API SkEmptyShader : public SkShader {
 public:
     SkEmptyShader() {}
 
-    virtual size_t contextSize() const SK_OVERRIDE {
-        // Even though createContext returns NULL we have to return a value of at least
+    size_t contextSize() const override {
+        // Even though createContext returns nullptr we have to return a value of at least
         // sizeof(SkShader::Context) to satisfy SkSmallAllocator.
         return sizeof(SkShader::Context);
     }
@@ -30,10 +30,14 @@ public:
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkEmptyShader)
 
 protected:
-    SkEmptyShader(SkReadBuffer& buffer) : INHERITED(buffer) {}
+    SkShader::Context* onCreateContext(const ContextRec&, void*) const override {
+        return nullptr;
+    }
 
-    virtual SkShader::Context* onCreateContext(const ContextRec&, void*) const SK_OVERRIDE {
-        return NULL;
+    void flatten(SkWriteBuffer& buffer) const override {
+        // Do nothing.
+        // We just don't want to fall through to SkShader::flatten(),
+        // which will write data we don't care to serialize or decode.
     }
 
 private:
diff --git a/gfx/skia/skia/include/core/SkEndian.h b/gfx/skia/skia/src/core/SkEndian.h
similarity index 97%
rename from gfx/skia/skia/include/core/SkEndian.h
rename to gfx/skia/skia/src/core/SkEndian.h
index 0955fcc505da..954afb046d91 100644
--- a/gfx/skia/skia/include/core/SkEndian.h
+++ b/gfx/skia/skia/src/core/SkEndian.h
@@ -39,7 +39,7 @@ template<uint16_t N> struct SkTEndianSwap16 {
     low two bytes of each value in the array.
 */
 static inline void SkEndianSwap16s(uint16_t array[], int count) {
-    SkASSERT(count == 0 || array != NULL);
+    SkASSERT(count == 0 || array != nullptr);
 
     while (--count >= 0) {
         *array = SkEndianSwap16(*array);
@@ -68,7 +68,7 @@ template<uint32_t N> struct SkTEndianSwap32 {
     bytes of each value in the array.
 */
 static inline void SkEndianSwap32s(uint32_t array[], int count) {
-    SkASSERT(count == 0 || array != NULL);
+    SkASSERT(count == 0 || array != nullptr);
 
     while (--count >= 0) {
         *array = SkEndianSwap32(*array);
@@ -104,7 +104,7 @@ template<uint64_t N> struct SkTEndianSwap64 {
     bytes of each value in the array.
 */
 static inline void SkEndianSwap64s(uint64_t array[], int count) {
-    SkASSERT(count == 0 || array != NULL);
+    SkASSERT(count == 0 || array != nullptr);
 
     while (--count >= 0) {
         *array = SkEndianSwap64(*array);
diff --git a/gfx/skia/skia/src/core/SkError.cpp b/gfx/skia/skia/src/core/SkError.cpp
index 9e8ff2ddef01..9e4385b4894d 100644
--- a/gfx/skia/skia/src/core/SkError.cpp
+++ b/gfx/skia/skia/src/core/SkError.cpp
@@ -15,43 +15,31 @@
 #include <stdarg.h>
 
 namespace {
-    void *CreateThreadError() {
-        return SkNEW_ARGS(SkError, (kNoError_SkError));
-    }
-    void DeleteThreadError(void* v) {
-        SkDELETE(reinterpret_cast<SkError*>(v));
-    }
+void *CreateThreadError() { return new SkError(kNoError_SkError); }
+void DeleteThreadError(void *v) { delete reinterpret_cast<SkError *>(v); }
     #define THREAD_ERROR \
         (*reinterpret_cast<SkError*>(SkTLS::Get(CreateThreadError, DeleteThreadError)))
 
     void *CreateThreadErrorCallback() {
-        return SkNEW_ARGS(SkErrorCallbackFunction, (SkErrorInternals::DefaultErrorCallback));
+        return new SkErrorCallbackFunction(SkErrorInternals::DefaultErrorCallback);
     }
     void DeleteThreadErrorCallback(void* v) {
-        SkDELETE(reinterpret_cast<SkErrorCallbackFunction *>(v));
+        delete reinterpret_cast<SkErrorCallbackFunction *>(v);
     }
 
     #define THREAD_ERROR_CALLBACK                                                             \
         *(reinterpret_cast<SkErrorCallbackFunction *>(SkTLS::Get(CreateThreadErrorCallback,   \
                                                                  DeleteThreadErrorCallback)))
 
-    void *CreateThreadErrorContext() {
-        return SkNEW_ARGS(void **, (NULL));
-    }
-    void DeleteThreadErrorContext(void* v) {
-        SkDELETE(reinterpret_cast<void **>(v));
-    }
+    void *CreateThreadErrorContext() { return new void **(nullptr); }
+    void DeleteThreadErrorContext(void *v) { delete reinterpret_cast<void **>(v); }
     #define THREAD_ERROR_CONTEXT \
         (*reinterpret_cast<void **>(SkTLS::Get(CreateThreadErrorContext, DeleteThreadErrorContext)))
 
     #define ERROR_STRING_LENGTH 2048
 
-    void *CreateThreadErrorString() {
-        return SkNEW_ARRAY(char, (ERROR_STRING_LENGTH));
-    }
-    void DeleteThreadErrorString(void* v) {
-        SkDELETE_ARRAY(reinterpret_cast<char *>(v));
-    }
+    void *CreateThreadErrorString() { return new char[(ERROR_STRING_LENGTH)]; }
+    void DeleteThreadErrorString(void *v) { delete[] reinterpret_cast<char *>(v); }
     #define THREAD_ERROR_STRING \
         (reinterpret_cast<char *>(SkTLS::Get(CreateThreadErrorString, DeleteThreadErrorString)))
 }
@@ -72,7 +60,7 @@ const char *SkGetLastErrorString() {
 // ------------ Private Error functions ---------
 
 void SkErrorInternals::SetErrorCallback(SkErrorCallbackFunction cb, void *context) {
-    if (cb == NULL) {
+    if (cb == nullptr) {
         THREAD_ERROR_CALLBACK = SkErrorInternals::DefaultErrorCallback;
     } else {
         THREAD_ERROR_CALLBACK = cb;
@@ -101,7 +89,7 @@ void SkErrorInternals::SetError(SkError code, const char *fmt, ...) {
     va_list args;
 
     char *str = THREAD_ERROR_STRING;
-    const char *error_name = NULL;
+    const char *error_name = nullptr;
     switch( code ) {
         case kNoError_SkError:
             error_name = "No Error";
diff --git a/gfx/skia/skia/src/core/SkFilterShader.cpp b/gfx/skia/skia/src/core/SkFilterShader.cpp
index 0c92d4c3e3f9..b52c2be8c4f5 100644
--- a/gfx/skia/skia/src/core/SkFilterShader.cpp
+++ b/gfx/skia/skia/src/core/SkFilterShader.cpp
@@ -21,19 +21,21 @@ SkFilterShader::SkFilterShader(SkShader* shader, SkColorFilter* filter) {
     filter->ref();
 }
 
-SkFilterShader::SkFilterShader(SkReadBuffer& buffer)
-    : INHERITED(buffer) {
-    fShader = buffer.readShader();
-    fFilter = buffer.readColorFilter();
-}
-
 SkFilterShader::~SkFilterShader() {
     fFilter->unref();
     fShader->unref();
 }
 
+SkFlattenable* SkFilterShader::CreateProc(SkReadBuffer& buffer) {
+    SkAutoTUnref<SkShader> shader(buffer.readShader());
+    SkAutoTUnref<SkColorFilter> filter(buffer.readColorFilter());
+    if (!shader.get() || !filter.get()) {
+        return nullptr;
+    }
+    return new SkFilterShader(shader, filter);
+}
+
 void SkFilterShader::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
     buffer.writeFlattenable(fShader);
     buffer.writeFlattenable(fFilter);
 }
@@ -44,13 +46,12 @@ uint32_t SkFilterShader::FilterShaderContext::getFlags() const {
     uint32_t shaderF = fShaderContext->getFlags();
     uint32_t filterF = filterShader.fFilter->getFlags();
 
-    // if the filter doesn't support 16bit, clear the matching bit in the shader
-    if (!(filterF & SkColorFilter::kHasFilter16_Flag)) {
-        shaderF &= ~SkShader::kHasSpan16_Flag;
-    }
+    // filters don't support 16bit, so clear the matching bit in the shader
+    shaderF &= ~SkShader::kHasSpan16_Flag;
+
     // if the filter might change alpha, clear the opaque flag in the shader
     if (!(filterF & SkColorFilter::kAlphaUnchanged_Flag)) {
-        shaderF &= ~(SkShader::kOpaqueAlpha_Flag | SkShader::kHasSpan16_Flag);
+        shaderF &= ~SkShader::kOpaqueAlpha_Flag;
     }
     return shaderF;
 }
@@ -58,10 +59,10 @@ uint32_t SkFilterShader::FilterShaderContext::getFlags() const {
 SkShader::Context* SkFilterShader::onCreateContext(const ContextRec& rec, void* storage) const {
     char* shaderContextStorage = (char*)storage + sizeof(FilterShaderContext);
     SkShader::Context* shaderContext = fShader->createContext(rec, shaderContextStorage);
-    if (NULL == shaderContext) {
-        return NULL;
+    if (nullptr == shaderContext) {
+        return nullptr;
     }
-    return SkNEW_PLACEMENT_ARGS(storage, FilterShaderContext, (*this, shaderContext, rec));
+    return new (storage) FilterShaderContext(*this, shaderContext, rec);
 }
 
 size_t SkFilterShader::contextSize() const {
@@ -85,16 +86,6 @@ void SkFilterShader::FilterShaderContext::shadeSpan(int x, int y, SkPMColor resu
     filterShader.fFilter->filterSpan(result, count, result);
 }
 
-void SkFilterShader::FilterShaderContext::shadeSpan16(int x, int y, uint16_t result[], int count) {
-    const SkFilterShader& filterShader = static_cast<const SkFilterShader&>(fShader);
-
-    SkASSERT(fShaderContext->getFlags() & SkShader::kHasSpan16_Flag);
-    SkASSERT(filterShader.fFilter->getFlags() & SkColorFilter::kHasFilter16_Flag);
-
-    fShaderContext->shadeSpan16(x, y, result, count);
-    filterShader.fFilter->filterSpan16(result, count, result);
-}
-
 #ifndef SK_IGNORE_TO_STRING
 void SkFilterShader::toString(SkString* str) const {
     str->append("SkFilterShader: (");
diff --git a/gfx/skia/skia/src/core/SkFilterShader.h b/gfx/skia/skia/src/core/SkFilterShader.h
index 1a4b71fe4694..ea5eaed34fe5 100644
--- a/gfx/skia/skia/src/core/SkFilterShader.h
+++ b/gfx/skia/skia/src/core/SkFilterShader.h
@@ -17,7 +17,7 @@ public:
     SkFilterShader(SkShader* shader, SkColorFilter* filter);
     virtual ~SkFilterShader();
 
-    virtual size_t contextSize() const SK_OVERRIDE;
+    size_t contextSize() const override;
 
     class FilterShaderContext : public SkShader::Context {
     public:
@@ -25,10 +25,14 @@ public:
         FilterShaderContext(const SkFilterShader&, SkShader::Context*, const ContextRec&);
         virtual ~FilterShaderContext();
 
-        virtual uint32_t getFlags() const SK_OVERRIDE;
+        uint32_t getFlags() const override;
 
-        virtual void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE;
-        virtual void shadeSpan16(int x, int y, uint16_t[], int count) SK_OVERRIDE;
+        void shadeSpan(int x, int y, SkPMColor[], int count) override;
+
+        void set3DMask(const SkMask* mask) override {
+            // forward to our proxy
+            fShaderContext->set3DMask(mask);
+        }
 
     private:
         SkShader::Context* fShaderContext;
@@ -40,9 +44,8 @@ public:
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkFilterShader)
 
 protected:
-    SkFilterShader(SkReadBuffer& );
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
-    virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
+    Context* onCreateContext(const ContextRec&, void* storage) const override;
 
 
 private:
diff --git a/gfx/skia/skia/src/core/SkFindAndPlaceGlyph.h b/gfx/skia/skia/src/core/SkFindAndPlaceGlyph.h
new file mode 100644
index 000000000000..278be07e0b87
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkFindAndPlaceGlyph.h
@@ -0,0 +1,712 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkFindAndPositionGlyph_DEFINED
+#define SkFindAndPositionGlyph_DEFINED
+
+#include "SkAutoKern.h"
+#include "SkGlyph.h"
+#include "SkGlyphCache.h"
+#include "SkPaint.h"
+#include "SkTemplates.h"
+#include "SkUtils.h"
+
+// Calculate a type with the same size as the max of all the Ts.
+// This must be top level because the is no specialization of inner classes.
+template<typename... Ts> struct SkMaxSizeOf;
+
+template<>
+struct SkMaxSizeOf<> {
+    static const size_t value = 0;
+};
+
+template<typename H, typename... Ts>
+struct SkMaxSizeOf<H, Ts...> {
+    static const size_t value =
+        sizeof(H) >= SkMaxSizeOf<Ts...>::value ? sizeof(H) : SkMaxSizeOf<Ts...>::value;
+};
+
+class SkFindAndPlaceGlyph {
+public:
+    template<typename ProcessOneGlyph>
+    static void ProcessText(
+        SkPaint::TextEncoding, const char text[], size_t byteLength,
+        SkPoint offset, const SkMatrix& matrix, SkPaint::Align textAlignment,
+        SkGlyphCache* cache, ProcessOneGlyph&& processOneGlyph);
+    // ProcessPosText handles all cases for finding and positioning glyphs. It has a very large
+    // multiplicity. It figures out the glyph, position and rounding and pass those parameters to
+    // processOneGlyph.
+    //
+    // The routine processOneGlyph passed in by the client has the following signature:
+    // void f(const SkGlyph& glyph, SkPoint position, SkPoint rounding);
+    //
+    // * Sub-pixel positioning (2) - use sub-pixel positioning.
+    // * Text alignment (3) - text alignment with respect to the glyph's width.
+    // * Matrix type (3) - special cases for translation and X-coordinate scaling.
+    // * Components per position (2) - the positions vector can have a common Y with different
+    //   Xs, or XY-pairs.
+    // * Axis Alignment (for sub-pixel positioning) (3) - when using sub-pixel positioning, round
+    //   to a whole coordinate instead of using sub-pixel positioning.
+    // The number of variations is 108 for sub-pixel and 36 for full-pixel.
+    // This routine handles all of them using inline polymorphic variable (no heap allocation).
+    template<typename ProcessOneGlyph>
+    static void ProcessPosText(
+        SkPaint::TextEncoding, const char text[], size_t byteLength,
+        SkPoint offset, const SkMatrix& matrix, const SkScalar pos[], int scalarsPerPosition,
+        SkPaint::Align textAlignment,
+        SkGlyphCache* cache, ProcessOneGlyph&& processOneGlyph);
+
+private:
+    // UntaggedVariant is a pile of memory that can hold one of the Ts. It provides a way
+    // to initialize that memory in a typesafe way.
+    template<typename... Ts>
+    class UntaggedVariant {
+    public:
+        UntaggedVariant() { }
+
+        ~UntaggedVariant() { }
+        UntaggedVariant(const UntaggedVariant&) = delete;
+        UntaggedVariant& operator=(const UntaggedVariant&) = delete;
+        UntaggedVariant(UntaggedVariant&&) = delete;
+        UntaggedVariant& operator=(UntaggedVariant&&) = delete;
+
+        template<typename Variant, typename... Args>
+        void initialize(Args&&... args) {
+            SkASSERT(sizeof(Variant) <= sizeof(fSpace));
+        #if defined(_MSC_VER) && _MSC_VER < 1900
+            #define alignof __alignof
+        #endif
+            SkASSERT(alignof(Variant) <= alignof(Space));
+            new(&fSpace) Variant(skstd::forward<Args>(args)...);
+        }
+
+    private:
+        typedef SkAlignedSStorage<SkMaxSizeOf<Ts...>::value> Space;
+        Space fSpace;
+    };
+
+    // PolymorphicVariant holds subclasses of Base without slicing. Ts must be subclasses of Base.
+    template<typename Base, typename... Ts>
+    class PolymorphicVariant {
+    public:
+        typedef UntaggedVariant<Ts...> Variants;
+
+        template<typename Initializer>
+        PolymorphicVariant(Initializer&& initializer) {
+            initializer(&fVariants);
+        }
+        ~PolymorphicVariant() { get()->~Base(); }
+        Base* get() const { return reinterpret_cast<Base*>(&fVariants); }
+        Base* operator->() const { return get(); }
+        Base& operator*() const { return *get(); }
+
+    private:
+        mutable Variants fVariants;
+    };
+
+    // GlyphFinderInterface is the polymorphic base for classes that parse a stream of chars into
+    // the right UniChar (or GlyphID) and lookup up the glyph on the cache. The concrete
+    // implementations are: Utf8GlyphFinder, Utf16GlyphFinder, Utf32GlyphFinder,
+    // and GlyphIdGlyphFinder.
+    class GlyphFinderInterface {
+    public:
+        virtual ~GlyphFinderInterface() {}
+        virtual const SkGlyph& lookupGlyph(const char** text) = 0;
+        virtual const SkGlyph& lookupGlyphXY(const char** text, SkFixed x, SkFixed y) = 0;
+    };
+
+    class UtfNGlyphFinder : public GlyphFinderInterface {
+    public:
+        UtfNGlyphFinder(SkGlyphCache* cache) : fCache(cache) { SkASSERT(cache != nullptr); }
+
+        const SkGlyph& lookupGlyph(const char** text) override {
+            SkASSERT(text != nullptr);
+            return fCache->getUnicharMetrics(nextUnichar(text));
+        }
+        const SkGlyph& lookupGlyphXY(const char** text, SkFixed x, SkFixed y) override {
+            SkASSERT(text != nullptr);
+            return fCache->getUnicharMetrics(nextUnichar(text), x, y);
+        }
+
+    private:
+        virtual SkUnichar nextUnichar(const char** text) = 0;
+        SkGlyphCache* fCache;
+    };
+
+    class Utf8GlyphFinder final : public UtfNGlyphFinder {
+    public:
+        Utf8GlyphFinder(SkGlyphCache* cache) : UtfNGlyphFinder(cache) { }
+
+    private:
+        SkUnichar nextUnichar(const char** text) override { return SkUTF8_NextUnichar(text); }
+    };
+
+    class Utf16GlyphFinder final : public UtfNGlyphFinder {
+    public:
+        Utf16GlyphFinder(SkGlyphCache* cache) : UtfNGlyphFinder(cache) { }
+
+    private:
+        SkUnichar nextUnichar(const char** text) override {
+            return SkUTF16_NextUnichar((const uint16_t**)text);
+        }
+    };
+
+    class Utf32GlyphFinder final : public UtfNGlyphFinder {
+    public:
+        Utf32GlyphFinder(SkGlyphCache* cache) : UtfNGlyphFinder(cache) { }
+
+    private:
+        SkUnichar nextUnichar(const char** text) override {
+            const int32_t* ptr = *(const int32_t**)text;
+            SkUnichar uni = *ptr++;
+            *text = (const char*)ptr;
+            return uni;
+        }
+    };
+
+    class GlyphIdGlyphFinder final : public GlyphFinderInterface {
+    public:
+        GlyphIdGlyphFinder(SkGlyphCache* cache) : fCache(cache) { SkASSERT(cache != nullptr); }
+
+        const SkGlyph& lookupGlyph(const char** text) override {
+            return fCache->getGlyphIDMetrics(nextGlyphId(text));
+        }
+        const SkGlyph& lookupGlyphXY(const char** text, SkFixed x, SkFixed y) override {
+            return fCache->getGlyphIDMetrics(nextGlyphId(text), x, y);
+        }
+
+    private:
+        uint16_t nextGlyphId(const char** text) {
+            SkASSERT(text != nullptr);
+
+            const uint16_t* ptr = *(const uint16_t**)text;
+            uint16_t glyphID = *ptr;
+            ptr += 1;
+            *text = (const char*)ptr;
+            return glyphID;
+        }
+        SkGlyphCache* fCache;
+    };
+
+    typedef PolymorphicVariant<
+        GlyphFinderInterface,
+        Utf8GlyphFinder,
+        Utf16GlyphFinder,
+        Utf32GlyphFinder,
+        GlyphIdGlyphFinder> LookupGlyphVariant;
+
+    class LookupGlyph : public LookupGlyphVariant {
+    public:
+        LookupGlyph(SkPaint::TextEncoding encoding, SkGlyphCache* cache)
+            : LookupGlyphVariant(
+            [&](LookupGlyphVariant::Variants* to_init) {
+                switch(encoding) {
+                    case SkPaint::kUTF8_TextEncoding:
+                        to_init->initialize<Utf8GlyphFinder>(cache);
+                        break;
+                    case SkPaint::kUTF16_TextEncoding:
+                        to_init->initialize<Utf16GlyphFinder>(cache);
+                        break;
+                    case SkPaint::kUTF32_TextEncoding:
+                        to_init->initialize<Utf32GlyphFinder>(cache);
+                        break;
+                    case SkPaint::kGlyphID_TextEncoding:
+                        to_init->initialize<GlyphIdGlyphFinder>(cache);
+                        break;
+                }
+            }
+        ) { }
+    };
+
+    // PositionReaderInterface reads a point from the pos vector.
+    // * HorizontalPositions - assumes a common Y for many X values.
+    // * ArbitraryPositions - a list of (X,Y) pairs.
+    class PositionReaderInterface {
+    public:
+        virtual ~PositionReaderInterface() { }
+        virtual SkPoint nextPoint() = 0;
+    };
+
+    class HorizontalPositions final : public PositionReaderInterface {
+    public:
+        explicit HorizontalPositions(const SkScalar* positions)
+            : fPositions(positions) { }
+
+        SkPoint nextPoint() override {
+            SkScalar x = *fPositions++;
+            return {x, 0};
+        }
+
+    private:
+        const SkScalar* fPositions;
+    };
+
+    class ArbitraryPositions final : public PositionReaderInterface {
+    public:
+        explicit ArbitraryPositions(const SkScalar* positions)
+            : fPositions(positions) { }
+
+        SkPoint nextPoint() override {
+            SkPoint to_return{fPositions[0], fPositions[1]};
+            fPositions += 2;
+            return to_return;
+        }
+
+    private:
+        const SkScalar* fPositions;
+    };
+
+    typedef PolymorphicVariant<PositionReaderInterface, HorizontalPositions, ArbitraryPositions>
+        PositionReader;
+
+    // MapperInterface given a point map it through the matrix. There are several shortcut
+    // variants.
+    // * TranslationMapper - assumes a translation only matrix.
+    // * XScaleMapper - assumes an X scaling and a translation.
+    // * GeneralMapper - Does all other matricies.
+    class MapperInterface {
+    public:
+        virtual ~MapperInterface() { }
+
+        virtual SkPoint map(SkPoint position) const = 0;
+    };
+
+    class TranslationMapper final : public MapperInterface {
+    public:
+        TranslationMapper(const SkMatrix& matrix, const SkPoint origin)
+            : fTranslate(matrix.mapXY(origin.fX, origin.fY)) { }
+
+        SkPoint map(SkPoint position) const override {
+            return position + fTranslate;
+        }
+
+    private:
+        const SkPoint fTranslate;
+    };
+
+    class XScaleMapper final : public MapperInterface {
+    public:
+        XScaleMapper(const SkMatrix& matrix, const SkPoint origin)
+            : fTranslate(matrix.mapXY(origin.fX, origin.fY)), fXScale(matrix.getScaleX()) { }
+
+        SkPoint map(SkPoint position) const override {
+            return {fXScale * position.fX + fTranslate.fX, fTranslate.fY};
+        }
+
+    private:
+        const SkPoint fTranslate;
+        const SkScalar fXScale;
+    };
+
+    // The caller must keep matrix alive while this class is used.
+    class GeneralMapper final : public MapperInterface {
+    public:
+        GeneralMapper(const SkMatrix& matrix, const SkPoint origin)
+            : fOrigin(origin), fMatrix(matrix), fMapProc(matrix.getMapXYProc()) { }
+
+        SkPoint map(SkPoint position) const override {
+            SkPoint result;
+            fMapProc(fMatrix, position.fX + fOrigin.fX, position.fY + fOrigin.fY, &result);
+            return result;
+        }
+
+    private:
+        const SkPoint fOrigin;
+        const SkMatrix& fMatrix;
+        const SkMatrix::MapXYProc fMapProc;
+    };
+
+    typedef PolymorphicVariant<
+        MapperInterface, TranslationMapper, XScaleMapper, GeneralMapper> Mapper;
+
+    // TextAlignmentAdjustment handles shifting the glyph based on its width.
+    static SkPoint TextAlignmentAdjustment(SkPaint::Align textAlignment, const SkGlyph& glyph) {
+        switch (textAlignment) {
+            case SkPaint::kLeft_Align:
+                return {0.0f, 0.0f};
+            case SkPaint::kCenter_Align:
+                return {SkFixedToScalar(glyph.fAdvanceX >> 1),
+                        SkFixedToScalar(glyph.fAdvanceY >> 1)};
+            case SkPaint::kRight_Align:
+                return {SkFixedToScalar(glyph.fAdvanceX),
+                        SkFixedToScalar(glyph.fAdvanceY)};
+        }
+        // Even though the entire enum is covered above, MVSC doesn't think so. Make it happy.
+        SkFAIL("Should never get here.");
+        return {0.0f, 0.0f};
+    }
+
+    // The "call" to SkFixedToScalar is actually a macro. It's macros all the way down.
+    // Needs to be a macro because you can't have a const float unless you make it constexpr.
+    #define kSubpixelRounding (SkFixedToScalar(SkGlyph::kSubpixelRound))
+
+    // The SubpixelPositionRounding function returns a point suitable for rounding a sub-pixel
+    // positioned glyph.
+    static SkPoint SubpixelPositionRounding(SkAxisAlignment axisAlignment) {
+        switch (axisAlignment) {
+            case kX_SkAxisAlignment:
+                return {SkFixedToScalar(SkGlyph::kSubpixelRound), SK_ScalarHalf};
+            case kY_SkAxisAlignment:
+                return {SK_ScalarHalf, kSubpixelRounding};
+            case kNone_SkAxisAlignment:
+                return {kSubpixelRounding, kSubpixelRounding};
+        }
+        SkFAIL("Should not get here.");
+        return {0.0f, 0.0f};
+    }
+
+    // The SubpixelAlignment function produces a suitable position for the glyph cache to
+    // produce the correct sub-pixel alignment. If a position is aligned with an axis a shortcut
+    // of 0 is used for the sub-pixel position.
+    static SkIPoint SubpixelAlignment(SkAxisAlignment axisAlignment, SkPoint position) {
+        switch (axisAlignment) {
+            case kX_SkAxisAlignment:
+                return {SkScalarToFixed(position.fX + kSubpixelRounding), 0};
+            case kY_SkAxisAlignment:
+                return {0, SkScalarToFixed(position.fY + kSubpixelRounding)};
+            case kNone_SkAxisAlignment:
+                return {SkScalarToFixed(position.fX + kSubpixelRounding),
+                        SkScalarToFixed(position.fY + kSubpixelRounding)};
+        }
+        SkFAIL("Should not get here.");
+        return {0, 0};
+    }
+
+    #undef kSubpixelRounding
+
+    // GlyphFindAndPlaceInterface given the text and position finds the correct glyph and does
+    // glyph specific position adjustment. The findAndPositionGlyph method takes text and
+    // position and calls processOneGlyph with the correct glyph, final position and rounding
+    // terms. The final position is not rounded yet and is the responsibility of processOneGlyph.
+    template<typename ProcessOneGlyph>
+    class GlyphFindAndPlaceInterface : SkNoncopyable {
+    public:
+        virtual ~GlyphFindAndPlaceInterface() { };
+
+        // findAndPositionGlyph calculates the position of the glyph, finds the glyph, and
+        // returns the position of where the next glyph will be using the glyph's advance and
+        // possibly kerning. The returned position is used by drawText, but ignored by drawPosText.
+        // The compiler should prune all this calculation if the return value is not used.
+        //
+        // This should be a pure virtual, but some versions of GCC <= 4.8 have a bug that causes a
+        // compile error.
+        // See GCC bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60277
+        virtual SkPoint findAndPositionGlyph(
+            const char** text, SkPoint position, ProcessOneGlyph&& processOneGlyph) {
+            SkFAIL("Should never get here.");
+            return {0.0f, 0.0f};
+        };
+    };
+
+    // GlyphFindAndPlaceSubpixel handles finding and placing glyphs when sub-pixel positioning is
+    // requested. After it has found and placed the glyph it calls the templated function
+    // ProcessOneGlyph in order to actually perform an action.
+    template<typename ProcessOneGlyph, SkPaint::Align kTextAlignment,
+             SkAxisAlignment kAxisAlignment>
+    class GlyphFindAndPlaceSubpixel final : public GlyphFindAndPlaceInterface<ProcessOneGlyph> {
+    public:
+        GlyphFindAndPlaceSubpixel(LookupGlyph& glyphFinder)
+            : fGlyphFinder(glyphFinder) { }
+
+        SkPoint findAndPositionGlyph(
+            const char** text, SkPoint position, ProcessOneGlyph&& processOneGlyph) override {
+            SkPoint finalPosition = position;
+            if (kTextAlignment != SkPaint::kLeft_Align) {
+                // Get the width of an un-sub-pixel positioned glyph for calculating the
+                // alignment. This is not needed for kLeftAlign because its adjustment is
+                // always {0, 0}.
+                const char* tempText = *text;
+                const SkGlyph &metricGlyph = fGlyphFinder->lookupGlyph(&tempText);
+
+                if (metricGlyph.fWidth <= 0) {
+                    // Exiting early, be sure to update text pointer.
+                    *text = tempText;
+                    return finalPosition + SkPoint{SkFixedToScalar(metricGlyph.fAdvanceX),
+                                                   SkFixedToScalar(metricGlyph.fAdvanceY)};
+                }
+
+                // Adjust the final position by the alignment adjustment.
+                finalPosition -= TextAlignmentAdjustment(kTextAlignment, metricGlyph);
+            }
+
+            // Find the glyph.
+            SkIPoint lookupPosition = SubpixelAlignment(kAxisAlignment, finalPosition);
+            const SkGlyph& renderGlyph =
+                fGlyphFinder->lookupGlyphXY(text, lookupPosition.fX, lookupPosition.fY);
+
+            // If the glyph has no width (no pixels) then don't bother processing it.
+            if (renderGlyph.fWidth > 0) {
+                processOneGlyph(renderGlyph, finalPosition,
+                                SubpixelPositionRounding(kAxisAlignment));
+            }
+            return finalPosition + SkPoint{SkFixedToScalar(renderGlyph.fAdvanceX),
+                                           SkFixedToScalar(renderGlyph.fAdvanceY)};
+        }
+
+    private:
+        LookupGlyph& fGlyphFinder;
+    };
+
+    enum SelectKerning {
+        kNoKerning = false,
+        kUseKerning = true
+    };
+
+    // GlyphFindAndPlaceFullPixel handles finding and placing glyphs when no sub-pixel
+    // positioning is requested. The kUseKerning argument should be true for drawText, and false
+    // for drawPosText.
+    template<typename ProcessOneGlyph, SkPaint::Align kTextAlignment, SelectKerning kUseKerning>
+    class GlyphFindAndPlaceFullPixel final : public GlyphFindAndPlaceInterface<ProcessOneGlyph> {
+    public:
+        GlyphFindAndPlaceFullPixel(LookupGlyph& glyphFinder)
+            : fGlyphFinder(glyphFinder) {
+            // Kerning can only be used with SkPaint::kLeft_Align
+            static_assert(!kUseKerning || SkPaint::kLeft_Align == kTextAlignment,
+                          "Kerning can only be used with left aligned text.");
+        }
+
+        SkPoint findAndPositionGlyph(
+            const char** text, SkPoint position, ProcessOneGlyph&& processOneGlyph) override {
+            SkPoint finalPosition = position;
+            const SkGlyph& glyph = fGlyphFinder->lookupGlyph(text);
+            if (kUseKerning) {
+                finalPosition += {SkFixedToScalar(fAutoKern.adjust(glyph)), 0.0f};
+            }
+            if (glyph.fWidth > 0) {
+                finalPosition -= TextAlignmentAdjustment(kTextAlignment, glyph);
+                processOneGlyph(glyph, finalPosition, {SK_ScalarHalf, SK_ScalarHalf});
+            }
+            return finalPosition + SkPoint{SkFixedToScalar(glyph.fAdvanceX),
+                                           SkFixedToScalar(glyph.fAdvanceY)};
+        }
+
+    private:
+        LookupGlyph& fGlyphFinder;
+
+        SkAutoKern fAutoKern;
+    };
+
+    // GlyphFindAndPlace is a large variant that encapsulates the multiple types of finding and
+    // placing a glyph. There are three factors that go into the different factors.
+    // * Is sub-pixel positioned - a boolean that says whether to use sub-pixel positioning.
+    // * Text alignment - indicates if the glyph should be placed to the right, centered or left
+    //   of a given position.
+    // * Axis alignment - indicates if the glyphs final sub-pixel position should be rounded to a
+    //   whole pixel if the glyph is aligned with an axis. This is only used for sub-pixel
+    //   positioning and allows the baseline to look crisp.
+    template<typename ProcessOneGlyph>
+    using GlyphFindAndPlace = PolymorphicVariant<
+        GlyphFindAndPlaceInterface<ProcessOneGlyph>,
+        // Subpixel
+        GlyphFindAndPlaceSubpixel<ProcessOneGlyph,  SkPaint::kLeft_Align,   kNone_SkAxisAlignment>,
+        GlyphFindAndPlaceSubpixel<ProcessOneGlyph,  SkPaint::kLeft_Align,   kX_SkAxisAlignment   >,
+        GlyphFindAndPlaceSubpixel<ProcessOneGlyph,  SkPaint::kLeft_Align,   kY_SkAxisAlignment   >,
+        GlyphFindAndPlaceSubpixel<ProcessOneGlyph,  SkPaint::kCenter_Align, kNone_SkAxisAlignment>,
+        GlyphFindAndPlaceSubpixel<ProcessOneGlyph,  SkPaint::kCenter_Align, kX_SkAxisAlignment   >,
+        GlyphFindAndPlaceSubpixel<ProcessOneGlyph,  SkPaint::kCenter_Align, kY_SkAxisAlignment   >,
+        GlyphFindAndPlaceSubpixel<ProcessOneGlyph,  SkPaint::kRight_Align,  kNone_SkAxisAlignment>,
+        GlyphFindAndPlaceSubpixel<ProcessOneGlyph,  SkPaint::kRight_Align,  kX_SkAxisAlignment   >,
+        GlyphFindAndPlaceSubpixel<ProcessOneGlyph,  SkPaint::kRight_Align,  kY_SkAxisAlignment   >,
+        // Full pixel
+        GlyphFindAndPlaceFullPixel<ProcessOneGlyph, SkPaint::kLeft_Align,   kNoKerning>,
+        GlyphFindAndPlaceFullPixel<ProcessOneGlyph, SkPaint::kCenter_Align, kNoKerning>,
+        GlyphFindAndPlaceFullPixel<ProcessOneGlyph, SkPaint::kRight_Align,  kNoKerning>
+    >;
+
+    // InitSubpixel is a helper function for initializing all the variants of
+    // GlyphFindAndPlaceSubpixel.
+    template<typename ProcessOneGlyph, SkPaint::Align kTextAlignment>
+    static void InitSubpixel(
+        typename GlyphFindAndPlace<ProcessOneGlyph>::Variants* to_init,
+        SkAxisAlignment axisAlignment,
+        LookupGlyph& glyphFinder) {
+        switch (axisAlignment) {
+            case kX_SkAxisAlignment:
+                to_init->template initialize<GlyphFindAndPlaceSubpixel<
+                    ProcessOneGlyph, kTextAlignment, kX_SkAxisAlignment>>(glyphFinder);
+                break;
+            case kNone_SkAxisAlignment:
+                to_init->template initialize<GlyphFindAndPlaceSubpixel<
+                    ProcessOneGlyph, kTextAlignment, kNone_SkAxisAlignment>>(glyphFinder);
+                break;
+            case kY_SkAxisAlignment:
+                to_init->template initialize<GlyphFindAndPlaceSubpixel<
+                    ProcessOneGlyph, kTextAlignment, kY_SkAxisAlignment>>(glyphFinder);
+                break;
+        }
+    }
+
+    static SkPoint MeasureText(LookupGlyph& glyphFinder, const char text[], size_t byteLength) {
+        SkFixed     x = 0, y = 0;
+        const char* stop = text + byteLength;
+
+        SkAutoKern  autokern;
+
+        while (text < stop) {
+            // don't need x, y here, since all subpixel variants will have the
+            // same advance
+            const SkGlyph& glyph = glyphFinder->lookupGlyph(&text);
+
+            x += autokern.adjust(glyph) + glyph.fAdvanceX;
+            y += glyph.fAdvanceY;
+        }
+        SkASSERT(text == stop);
+        return {SkFixedToScalar(x), SkFixedToScalar(y)};
+    }
+};
+
+template<typename ProcessOneGlyph>
+inline void SkFindAndPlaceGlyph::ProcessPosText(
+    SkPaint::TextEncoding textEncoding, const char text[], size_t byteLength,
+    SkPoint offset, const SkMatrix& matrix, const SkScalar pos[], int scalarsPerPosition,
+    SkPaint::Align textAlignment,
+    SkGlyphCache* cache, ProcessOneGlyph&& processOneGlyph) {
+
+    SkAxisAlignment axisAlignment = SkComputeAxisAlignmentForHText(matrix);
+    uint32_t mtype = matrix.getType();
+
+    LookupGlyph glyphFinder(textEncoding, cache);
+
+    // Specialized code for handling the most common case for blink. The while loop is totally
+    // de-virtualized.
+    if (scalarsPerPosition == 1
+        && textAlignment == SkPaint::kLeft_Align
+        && axisAlignment == kX_SkAxisAlignment
+        && cache->isSubpixel()
+        && mtype <= SkMatrix::kTranslate_Mask) {
+        typedef GlyphFindAndPlaceSubpixel<
+            ProcessOneGlyph, SkPaint::kLeft_Align, kX_SkAxisAlignment> Positioner;
+        HorizontalPositions positions{pos};
+        TranslationMapper mapper{matrix, offset};
+        Positioner positioner(glyphFinder);
+        const char* cursor = text;
+        const char* stop = text + byteLength;
+        while (cursor < stop) {
+            SkPoint mappedPoint = mapper.TranslationMapper::map(
+                positions.HorizontalPositions::nextPoint());
+            positioner.Positioner::findAndPositionGlyph(
+                &cursor, mappedPoint, skstd::forward<ProcessOneGlyph>(processOneGlyph));
+        }
+        return;
+    }
+
+    PositionReader positionReader{
+        [&](PositionReader::Variants* to_init) {
+            if (2 == scalarsPerPosition) {
+                to_init->initialize<ArbitraryPositions>(pos);
+            } else {
+                to_init->initialize<HorizontalPositions>(pos);
+            }
+        }
+    };
+
+    Mapper mapper{
+        [&](Mapper::Variants* to_init) {
+            if (mtype & (SkMatrix::kAffine_Mask | SkMatrix::kPerspective_Mask)
+                || scalarsPerPosition == 2) {
+                to_init->initialize<GeneralMapper>(matrix, offset);
+            } else if (mtype & SkMatrix::kScale_Mask) {
+                to_init->initialize<XScaleMapper>(matrix, offset);
+            } else {
+                to_init->initialize<TranslationMapper>(matrix, offset);
+            }
+        }
+    };
+
+    GlyphFindAndPlace<ProcessOneGlyph> findAndPosition{
+        [&](typename GlyphFindAndPlace<ProcessOneGlyph>::Variants* to_init) {
+            if (cache->isSubpixel()) {
+                switch (textAlignment) {
+                    case SkPaint::kLeft_Align:
+                        InitSubpixel<ProcessOneGlyph, SkPaint::kLeft_Align>(
+                            to_init, axisAlignment, glyphFinder);
+                        break;
+                    case SkPaint::kCenter_Align:
+                        InitSubpixel<ProcessOneGlyph, SkPaint::kCenter_Align>(
+                            to_init, axisAlignment, glyphFinder);
+                        break;
+                    case SkPaint::kRight_Align:
+                        InitSubpixel<ProcessOneGlyph, SkPaint::kRight_Align>(
+                            to_init, axisAlignment, glyphFinder);
+                        break;
+                }
+            } else {
+                switch (textAlignment) {
+                    case SkPaint::kLeft_Align:
+                        to_init->template initialize<
+                            GlyphFindAndPlaceFullPixel<ProcessOneGlyph,
+                            SkPaint::kLeft_Align, kNoKerning>>(glyphFinder);
+                        break;
+                    case SkPaint::kCenter_Align:
+                        to_init->template initialize<
+                            GlyphFindAndPlaceFullPixel<ProcessOneGlyph,
+                            SkPaint::kCenter_Align, kNoKerning>>(glyphFinder);
+                        break;
+                    case SkPaint::kRight_Align:
+                        to_init->template initialize<
+                            GlyphFindAndPlaceFullPixel<ProcessOneGlyph,
+                            SkPaint::kRight_Align, kNoKerning>>(glyphFinder);
+                        break;
+                }
+            }
+        }
+    };
+
+    const char* stop = text + byteLength;
+    while (text < stop) {
+        SkPoint mappedPoint = mapper->map(positionReader->nextPoint());
+        findAndPosition->findAndPositionGlyph(
+            &text, mappedPoint, skstd::forward<ProcessOneGlyph>(processOneGlyph));
+    }
+}
+
+template<typename ProcessOneGlyph>
+inline void SkFindAndPlaceGlyph::ProcessText(
+    SkPaint::TextEncoding textEncoding, const char text[], size_t byteLength,
+    SkPoint offset, const SkMatrix& matrix, SkPaint::Align textAlignment,
+    SkGlyphCache* cache, ProcessOneGlyph&& processOneGlyph) {
+
+    // transform the starting point
+    matrix.mapPoints(&offset, 1);
+
+    LookupGlyph glyphFinder(textEncoding, cache);
+
+    // need to measure first
+    if (textAlignment != SkPaint::kLeft_Align) {
+        SkVector stop = MeasureText(glyphFinder, text, byteLength);
+
+        if (textAlignment == SkPaint::kCenter_Align) {
+            stop *= SK_ScalarHalf;
+        }
+        offset -= stop;
+    }
+
+    GlyphFindAndPlace<ProcessOneGlyph> findAndPosition{
+        [&](typename GlyphFindAndPlace<ProcessOneGlyph>::Variants* to_init) {
+            if (cache->isSubpixel()) {
+                SkAxisAlignment axisAlignment = SkComputeAxisAlignmentForHText(matrix);
+                InitSubpixel<ProcessOneGlyph, SkPaint::kLeft_Align>(
+                    to_init, axisAlignment, glyphFinder);
+            } else {
+                to_init->template initialize<
+                    GlyphFindAndPlaceFullPixel<
+                        ProcessOneGlyph, SkPaint::kLeft_Align, kUseKerning>>(glyphFinder);
+            }
+        }
+    };
+
+    const char* stop = text + byteLength;
+    SkPoint current = offset;
+    while (text < stop) {
+        current =
+            findAndPosition->findAndPositionGlyph(
+                &text, current, skstd::forward<ProcessOneGlyph>(processOneGlyph));
+
+    }
+}
+
+#endif  // SkFindAndPositionGlyph_DEFINED
diff --git a/gfx/skia/skia/src/core/SkFlate.cpp b/gfx/skia/skia/src/core/SkFlate.cpp
deleted file mode 100644
index 2b4e36d7271e..000000000000
--- a/gfx/skia/skia/src/core/SkFlate.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-
-/*
- * Copyright 2010 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#include "SkData.h"
-#include "SkFlate.h"
-#include "SkStream.h"
-
-#ifndef SK_HAS_ZLIB
-bool SkFlate::HaveFlate() { return false; }
-bool SkFlate::Deflate(SkStream*, SkWStream*) { return false; }
-bool SkFlate::Deflate(const void*, size_t, SkWStream*) { return false; }
-bool SkFlate::Deflate(const SkData*, SkWStream*) { return false; }
-bool SkFlate::Inflate(SkStream*, SkWStream*) { return false; }
-#else
-
-// static
-bool SkFlate::HaveFlate() {
-    return true;
-}
-
-namespace {
-
-#ifdef SK_SYSTEM_ZLIB
-#include <zlib.h>
-#else
-#include SK_ZLIB_INCLUDE
-#endif
-
-// static
-const size_t kBufferSize = 1024;
-
-bool doFlate(bool compress, SkStream* src, SkWStream* dst) {
-    uint8_t inputBuffer[kBufferSize];
-    uint8_t outputBuffer[kBufferSize];
-    z_stream flateData;
-    flateData.zalloc = NULL;
-    flateData.zfree = NULL;
-    flateData.next_in = NULL;
-    flateData.avail_in = 0;
-    flateData.next_out = outputBuffer;
-    flateData.avail_out = kBufferSize;
-    int rc;
-    if (compress)
-        rc = deflateInit(&flateData, Z_DEFAULT_COMPRESSION);
-    else
-        rc = inflateInit(&flateData);
-    if (rc != Z_OK)
-        return false;
-
-    uint8_t* input = (uint8_t*)src->getMemoryBase();
-    size_t inputLength = src->getLength();
-    if (input == NULL || inputLength == 0) {
-        input = NULL;
-        flateData.next_in = inputBuffer;
-        flateData.avail_in = 0;
-    } else {
-        flateData.next_in = input;
-        flateData.avail_in = SkToUInt(inputLength);
-    }
-
-    rc = Z_OK;
-    while (true) {
-        if (flateData.avail_out < kBufferSize) {
-            if (!dst->write(outputBuffer, kBufferSize - flateData.avail_out)) {
-                rc = Z_BUF_ERROR;
-                break;
-            }
-            flateData.next_out = outputBuffer;
-            flateData.avail_out = kBufferSize;
-        }
-        if (rc != Z_OK)
-            break;
-        if (flateData.avail_in == 0) {
-            if (input != NULL)
-                break;
-            size_t read = src->read(&inputBuffer, kBufferSize);
-            if (read == 0)
-                break;
-            flateData.next_in = inputBuffer;
-            flateData.avail_in = SkToUInt(read);
-        }
-        if (compress)
-            rc = deflate(&flateData, Z_NO_FLUSH);
-        else
-            rc = inflate(&flateData, Z_NO_FLUSH);
-    }
-    while (rc == Z_OK) {
-        if (compress)
-            rc = deflate(&flateData, Z_FINISH);
-        else
-            rc = inflate(&flateData, Z_FINISH);
-        if (flateData.avail_out < kBufferSize) {
-            if (!dst->write(outputBuffer, kBufferSize - flateData.avail_out))
-                return false;
-            flateData.next_out = outputBuffer;
-            flateData.avail_out = kBufferSize;
-        }
-    }
-
-    if (compress)
-        deflateEnd(&flateData);
-    else
-        inflateEnd(&flateData);
-    if (rc == Z_STREAM_END)
-        return true;
-    return false;
-}
-
-}
-
-// static
-bool SkFlate::Deflate(SkStream* src, SkWStream* dst) {
-    return doFlate(true, src, dst);
-}
-
-bool SkFlate::Deflate(const void* ptr, size_t len, SkWStream* dst) {
-    SkMemoryStream stream(ptr, len);
-    return doFlate(true, &stream, dst);
-}
-
-bool SkFlate::Deflate(const SkData* data, SkWStream* dst) {
-    if (data) {
-        SkMemoryStream stream(data->data(), data->size());
-        return doFlate(true, &stream, dst);
-    }
-    return false;
-}
-
-// static
-bool SkFlate::Inflate(SkStream* src, SkWStream* dst) {
-    return doFlate(false, src, dst);
-}
-
-#endif
diff --git a/gfx/skia/skia/src/core/SkFlate.h b/gfx/skia/skia/src/core/SkFlate.h
deleted file mode 100644
index e4c1417d910d..000000000000
--- a/gfx/skia/skia/src/core/SkFlate.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-/*
- * Copyright 2010 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#ifndef SkFlate_DEFINED
-#define SkFlate_DEFINED
-
-#include "SkTypes.h"
-
-class SkData;
-class SkWStream;
-class SkStream;
-
-/** \class SkFlate
-    A class to provide access to the flate compression algorithm.
-*/
-class SkFlate {
-public:
-    /** Indicates if the flate algorithm is available.
-     */
-    static bool HaveFlate();
-
-    /**
-     *  Use the flate compression algorithm to compress the data in src,
-     *  putting the result into dst.  Returns false if an error occurs.
-     */
-    static bool Deflate(SkStream* src, SkWStream* dst);
-
-    /**
-     *  Use the flate compression algorithm to compress the data in src,
-     *  putting the result into dst.  Returns false if an error occurs.
-     */
-    static bool Deflate(const void* src, size_t len, SkWStream* dst);
-
-    /**
-     *  Use the flate compression algorithm to compress the data,
-     *  putting the result into dst.  Returns false if an error occurs.
-     */
-    static bool Deflate(const SkData*, SkWStream* dst);
-
-    /** Use the flate compression algorithm to decompress the data in src,
-        putting the result into dst.  Returns false if an error occurs.
-     */
-    static bool Inflate(SkStream* src, SkWStream* dst);
-};
-
-#endif
diff --git a/gfx/skia/skia/src/core/SkFlattenable.cpp b/gfx/skia/skia/src/core/SkFlattenable.cpp
index 410fe0d97495..c759a1ab3889 100644
--- a/gfx/skia/skia/src/core/SkFlattenable.cpp
+++ b/gfx/skia/skia/src/core/SkFlattenable.cpp
@@ -1,24 +1,13 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 #include "SkFlattenable.h"
 #include "SkPtrRecorder.h"
-
-///////////////////////////////////////////////////////////////////////////////
-
-void SkFlattenable::flatten(SkWriteBuffer&) const
-{
-    /*  we don't write anything at the moment, but this allows our subclasses
-        to not know that, since we want them to always call INHERITED::flatten()
-        in their code.
-    */
-}
-
-///////////////////////////////////////////////////////////////////////////////
+#include "SkReadBuffer.h"
 
 SkNamedFactorySet::SkNamedFactorySet() : fNextAddedFactory(0) {}
 
@@ -28,7 +17,7 @@ uint32_t SkNamedFactorySet::find(SkFlattenable::Factory factory) {
         return index;
     }
     const char* name = SkFlattenable::FactoryToName(factory);
-    if (NULL == name) {
+    if (nullptr == name) {
         return 0;
     }
     *fNames.append() = name;
@@ -39,7 +28,7 @@ const char* SkNamedFactorySet::getNextAddedFactoryName() {
     if (fNextAddedFactory < fNames.count()) {
         return fNames[fNextAddedFactory++];
     }
-    return NULL;
+    return nullptr;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -57,8 +46,6 @@ void SkRefCntSet::decPtr(void* ptr) {
     ((SkRefCnt*)ptr)->unref();
 }
 
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
 #define MAX_ENTRY_COUNT  1024
@@ -69,19 +56,12 @@ struct Entry {
     SkFlattenable::Type     fType;
 };
 
-static int gCount;
+static int gCount = 0;
 static Entry gEntries[MAX_ENTRY_COUNT];
 
 void SkFlattenable::Register(const char name[], Factory factory, SkFlattenable::Type type) {
     SkASSERT(name);
     SkASSERT(factory);
-
-    static bool gOnce = false;
-    if (!gOnce) {
-        gCount = 0;
-        gOnce = true;
-    }
-
     SkASSERT(gCount < MAX_ENTRY_COUNT);
 
     gEntries[gCount].fName = name;
@@ -111,11 +91,11 @@ SkFlattenable::Factory SkFlattenable::NameToFactory(const char name[]) {
             return entries[i].fFactory;
         }
     }
-    return NULL;
+    return nullptr;
 }
 
 bool SkFlattenable::NameToType(const char name[], SkFlattenable::Type* type) {
-    SkASSERT(NULL != type);
+    SkASSERT(type);
     InitializeFlattenablesIfNeeded();
 #ifdef SK_DEBUG
     report_no_entries(__FUNCTION__);
@@ -141,5 +121,5 @@ const char* SkFlattenable::FactoryToName(Factory fact) {
             return entries[i].fName;
         }
     }
-    return NULL;
+    return nullptr;
 }
diff --git a/gfx/skia/skia/src/core/SkFlattenableSerialization.cpp b/gfx/skia/skia/src/core/SkFlattenableSerialization.cpp
index b33bca6dbbe4..31602079a39b 100644
--- a/gfx/skia/skia/src/core/SkFlattenableSerialization.cpp
+++ b/gfx/skia/skia/src/core/SkFlattenableSerialization.cpp
@@ -15,9 +15,9 @@ SkData* SkValidatingSerializeFlattenable(SkFlattenable* flattenable) {
     SkWriteBuffer writer(SkWriteBuffer::kValidation_Flag);
     writer.writeFlattenable(flattenable);
     size_t size = writer.bytesWritten();
-    void* data = sk_malloc_throw(size);
-    writer.writeToMemory(data);
-    return SkData::NewFromMalloc(data, size);
+    SkData* data = SkData::NewUninitialized(size);
+    writer.writeToMemory(data->writable_data());
+    return data;
 }
 
 SkFlattenable* SkValidatingDeserializeFlattenable(const void* data, size_t size,
diff --git a/gfx/skia/skia/src/core/SkFloat.cpp b/gfx/skia/skia/src/core/SkFloat.cpp
deleted file mode 100644
index 9ec0a7a081b3..000000000000
--- a/gfx/skia/skia/src/core/SkFloat.cpp
+++ /dev/null
@@ -1,387 +0,0 @@
-
-/*
- * Copyright 2008 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#include "SkFloat.h"
-#include "SkMathPriv.h"
-
-#define EXP_BIAS    (127+23)
-
-static int get_unsigned_exp(uint32_t packed)
-{
-    return (packed << 1 >> 24);
-}
-
-static unsigned get_unsigned_value(uint32_t packed)
-{
-    return (packed << 9 >> 9) | (1 << 23);
-}
-
-static int get_signed_value(int32_t packed)
-{
-    return SkApplySign(get_unsigned_value(packed), SkExtractSign(packed));
-}
-
-/////////////////////////////////////////////////////////////////////////
-
-int SkFloat::GetShift(int32_t packed, int shift)
-{
-    if (packed == 0)
-        return 0;
-
-    int exp = get_unsigned_exp(packed) - EXP_BIAS - shift;
-    int value = get_unsigned_value(packed);
-
-    if (exp >= 0)
-    {
-        if (exp > 8)    // overflow
-            value = SK_MaxS32;
-        else
-            value <<= exp;
-    }
-    else
-    {
-        exp = -exp;
-        if (exp > 23)   // underflow
-            value = 0;
-        else
-            value >>= exp;
-    }
-    return SkApplySign(value, SkExtractSign(packed));
-}
-
-/////////////////////////////////////////////////////////////////////////////////////
-
-int32_t SkFloat::SetShift(int value, int shift)
-{
-    if (value == 0)
-        return 0;
-
-    // record the sign and make value positive
-    int sign = SkExtractSign(value);
-    value = SkApplySign(value, sign);
-
-    if (value >> 24)    // value is too big (has more than 24 bits set)
-    {
-        int bias = 8 - SkCLZ(value);
-        SkASSERT(bias > 0 && bias < 8);
-        value >>= bias;
-        shift += bias;
-    }
-    else
-    {
-        int zeros = SkCLZ(value << 8);
-        SkASSERT(zeros >= 0 && zeros <= 23);
-        value <<= zeros;
-        shift -= zeros;
-    }
-    // now value is left-aligned to 24 bits
-    SkASSERT((value >> 23) == 1);
-
-    shift += EXP_BIAS;
-    if (shift < 0)  // underflow
-        return 0;
-    else
-    {
-        if (shift > 255)    // overflow
-        {
-            shift = 255;
-            value = 0x00FFFFFF;
-        }
-        int32_t packed = sign << 31;        // set the sign-bit
-        packed |= shift << 23;          // store the packed exponent
-        packed |= ((unsigned)(value << 9) >> 9);    // clear 24th bit of value (its implied)
-
-#ifdef SK_DEBUG
-        {
-            int n;
-
-            n = SkExtractSign(packed);
-            SkASSERT(n == sign);
-            n = get_unsigned_exp(packed);
-            SkASSERT(n == shift);
-            n = get_unsigned_value(packed);
-            SkASSERT(n == value);
-        }
-#endif
-        return packed;
-    }
-}
-
-int32_t SkFloat::Neg(int32_t packed)
-{
-    if (packed)
-        packed = packed ^ (1 << 31);
-    return packed;
-}
-
-int32_t SkFloat::Add(int32_t packed_a, int32_t packed_b)
-{
-    if (packed_a == 0)
-        return packed_b;
-    if (packed_b == 0)
-        return packed_a;
-
-    int exp_a = get_unsigned_exp(packed_a);
-    int exp_b = get_unsigned_exp(packed_b);
-    int exp_diff = exp_a - exp_b;
-
-    int shift_a = 0, shift_b = 0;
-    int exp;
-
-    if (exp_diff >= 0)
-    {
-        if (exp_diff > 24)  // B is too small to contribute
-            return packed_a;
-        shift_b = exp_diff;
-        exp = exp_a;
-    }
-    else
-    {
-        exp_diff = -exp_diff;
-        if (exp_diff > 24)  // A is too small to contribute
-            return packed_b;
-        shift_a = exp_diff;
-        exp = exp_b;
-    }
-
-    int value_a = get_signed_value(packed_a) >> shift_a;
-    int value_b = get_signed_value(packed_b) >> shift_b;
-
-    return SkFloat::SetShift(value_a + value_b, exp - EXP_BIAS);
-}
-
-static inline int32_t mul24(int32_t a, int32_t b) {
-    int64_t tmp = (sk_64_mul(a, b) + (1 << 23)) >> 24;
-    return sk_64_asS32(tmp);
-}
-
-int32_t SkFloat::Mul(int32_t packed_a, int32_t packed_b)
-{
-    if (packed_a == 0 || packed_b == 0)
-        return 0;
-
-    int exp_a = get_unsigned_exp(packed_a);
-    int exp_b = get_unsigned_exp(packed_b);
-
-    int value_a = get_signed_value(packed_a);
-    int value_b = get_signed_value(packed_b);
-
-    return SkFloat::SetShift(mul24(value_a, value_b), exp_a + exp_b - 2*EXP_BIAS + 24);
-}
-
-int32_t SkFloat::MulInt(int32_t packed, int n)
-{
-    return Mul(packed, SetShift(n, 0));
-}
-
-int32_t SkFloat::Div(int32_t packed_n, int32_t packed_d)
-{
-    SkASSERT(packed_d != 0);
-
-    if (packed_n == 0)
-        return 0;
-
-    int exp_n = get_unsigned_exp(packed_n);
-    int exp_d = get_unsigned_exp(packed_d);
-
-    int value_n = get_signed_value(packed_n);
-    int value_d = get_signed_value(packed_d);
-
-    return SkFloat::SetShift(SkDivBits(value_n, value_d, 24), exp_n - exp_d - 24);
-}
-
-int32_t SkFloat::DivInt(int32_t packed, int n)
-{
-    return Div(packed, SetShift(n, 0));
-}
-
-int32_t SkFloat::Invert(int32_t packed)
-{
-    return Div(packed, SetShift(1, 0));
-}
-
-int32_t SkFloat::Sqrt(int32_t packed)
-{
-    if (packed < 0)
-    {
-        SkDEBUGFAIL("can't sqrt a negative number");
-        return 0;
-    }
-
-    int exp = get_unsigned_exp(packed);
-    int value = get_unsigned_value(packed);
-
-    int nexp = exp - EXP_BIAS;
-    int root = SkSqrtBits(value << (nexp & 1), 26);
-    nexp >>= 1;
-    return SkFloat::SetShift(root, nexp - 11);
-}
-
-#if defined _WIN32 && _MSC_VER >= 1300  // disable warning : unreachable code
-#pragma warning ( push )
-#pragma warning ( disable : 4702 )
-#endif
-
-int32_t SkFloat::CubeRoot(int32_t packed)
-{
-    sk_throw();
-    return 0;
-}
-
-#if defined _WIN32 && _MSC_VER >= 1300
-#pragma warning ( pop )
-#endif
-
-static inline int32_t clear_high_bit(int32_t n)
-{
-    return ((uint32_t)(n << 1)) >> 1;
-}
-
-static inline int int_sign(int32_t a, int32_t b)
-{
-    return a > b ? 1 : (a < b ? -1 : 0);
-}
-
-int SkFloat::Cmp(int32_t packed_a, int32_t packed_b)
-{
-    packed_a = SkApplySign(clear_high_bit(packed_a), SkExtractSign(packed_a));
-    packed_b = SkApplySign(clear_high_bit(packed_b), SkExtractSign(packed_b));
-
-    return int_sign(packed_a, packed_b);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////
-
-#ifdef SK_DEBUG
-
-#include "SkRandom.h"
-#include "SkFloatingPoint.h"
-
-void SkFloat::UnitTest()
-{
-#if 0 // def SK_SUPPORT_UNITTEST
-    SkFloat a, b, c, d;
-    int     n;
-
-    a.setZero();
-    n = a.getInt();
-    SkASSERT(n == 0);
-
-    b.setInt(5);
-    n = b.getInt();
-    SkASSERT(n == 5);
-
-    c.setInt(-3);
-    n = c.getInt();
-    SkASSERT(n == -3);
-
-    d.setAdd(c, b);
-    SkDebugf("SkFloat: %d + %d = %d\n", c.getInt(), b.getInt(), d.getInt());
-
-    SkRandom    rand;
-
-    int i;
-    for (i = 0; i < 1000; i++)
-    {
-        float fa, fb;
-        int aa = rand.nextS() >> 14;
-        int bb = rand.nextS() >> 14;
-        a.setInt(aa);
-        b.setInt(bb);
-        SkASSERT(a.getInt() == aa);
-        SkASSERT(b.getInt() == bb);
-
-        c.setAdd(a, b);
-        int cc = c.getInt();
-        SkASSERT(cc == aa + bb);
-
-        c.setSub(a, b);
-        cc = c.getInt();
-        SkASSERT(cc == aa - bb);
-
-        aa >>= 5;
-        bb >>= 5;
-        a.setInt(aa);
-        b.setInt(bb);
-        c.setMul(a, b);
-        cc = c.getInt();
-        SkASSERT(cc == aa * bb);
-        /////////////////////////////////////
-
-        aa = rand.nextS() >> 11;
-        a.setFixed(aa);
-        cc = a.getFixed();
-        SkASSERT(aa == cc);
-
-        bb = rand.nextS() >> 11;
-        b.setFixed(bb);
-        cc = b.getFixed();
-        SkASSERT(bb == cc);
-
-        cc = SkFixedMul(aa, bb);
-        c.setMul(a, b);
-        SkFixed dd = c.getFixed();
-        int diff = cc - dd;
-        SkASSERT(SkAbs32(diff) <= 1);
-
-        fa = (float)aa / 65536.0f;
-        fb = (float)bb / 65536.0f;
-        a.assertEquals(fa);
-        b.assertEquals(fb);
-        fa = a.getFloat();
-        fb = b.getFloat();
-
-        c.assertEquals(fa * fb, 1);
-
-        c.setDiv(a, b);
-        cc = SkFixedDiv(aa, bb);
-        dd = c.getFixed();
-        diff = cc - dd;
-        SkASSERT(SkAbs32(diff) <= 3);
-
-        c.assertEquals(fa / fb, 1);
-
-        SkASSERT((aa == bb) == (a == b));
-        SkASSERT((aa != bb) == (a != b));
-        SkASSERT((aa < bb) == (a < b));
-        SkASSERT((aa <= bb) == (a <= b));
-        SkASSERT((aa > bb) == (a > b));
-        SkASSERT((aa >= bb) == (a >= b));
-
-        if (aa < 0)
-        {
-            aa = -aa;
-            fa = -fa;
-        }
-        a.setFixed(aa);
-        c.setSqrt(a);
-        cc = SkFixedSqrt(aa);
-        dd = c.getFixed();
-        SkASSERT(dd == cc);
-
-        c.assertEquals(sk_float_sqrt(fa), 2);
-
-        // cuberoot
-#if 0
-        a.setInt(1);
-        a.cubeRoot();
-        a.assertEquals(1.0f, 0);
-        a.setInt(8);
-        a.cubeRoot();
-        a.assertEquals(2.0f, 0);
-        a.setInt(27);
-        a.cubeRoot();
-        a.assertEquals(3.0f, 0);
-#endif
-    }
-#endif
-}
-
-#endif
diff --git a/gfx/skia/skia/src/core/SkFloat.h b/gfx/skia/skia/src/core/SkFloat.h
deleted file mode 100644
index 0d4f9b41a744..000000000000
--- a/gfx/skia/skia/src/core/SkFloat.h
+++ /dev/null
@@ -1,107 +0,0 @@
-
-/*
- * Copyright 2008 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#ifndef SkFloat_DEFINED
-#define SkFloat_DEFINED
-
-#include "SkFixed.h"
-
-class SkFloat {
-public:
-    SkFloat() {}
-
-    void    setZero() { fPacked = 0; }
-//  void    setShift(int value, int shift) { fPacked = SetShift(value, shift); }
-    void    setInt(int value) { fPacked = SetShift(value, 0); }
-    void    setFixed(SkFixed value) { fPacked = SetShift(value, -16); }
-
-//  int     getShift(int shift) const { return GetShift(fPacked, shift); }
-    int     getInt() const { return GetShift(fPacked, 0); }
-    SkFixed getFixed() const { return GetShift(fPacked, -16); }
-
-    void    abs() { fPacked = Abs(fPacked); }
-    void    negate() { fPacked = Neg(fPacked); }
-
-    void    shiftLeft(int bits) { fPacked = Shift(fPacked, bits); }
-    void    setShiftLeft(const SkFloat& a, int bits) { fPacked = Shift(a.fPacked, bits); }
-
-    void    shiftRight(int bits) { fPacked = Shift(fPacked, -bits); }
-    void    setShiftRight(const SkFloat& a, int bits) { fPacked = Shift(a.fPacked, -bits); }
-
-    void    add(const SkFloat& a) { fPacked = Add(fPacked, a.fPacked); }
-    void    setAdd(const SkFloat& a, const SkFloat& b) { fPacked = Add(a.fPacked, b.fPacked); }
-
-    void    sub(const SkFloat& a) { fPacked = Add(fPacked, Neg(a.fPacked)); }
-    void    setSub(const SkFloat& a, const SkFloat& b) { fPacked = Add(a.fPacked, Neg(b.fPacked)); }
-
-    void    mul(const SkFloat& a) { fPacked = Mul(fPacked, a.fPacked); }
-    void    setMul(const SkFloat& a, const SkFloat& b) { fPacked = Mul(a.fPacked, b.fPacked); }
-
-    void    div(const SkFloat& a) { fPacked = Div(fPacked, a.fPacked); }
-    void    setDiv(const SkFloat& a, const SkFloat& b) { fPacked = Div(a.fPacked, b.fPacked); }
-
-    void    sqrt() { fPacked = Sqrt(fPacked); }
-    void    setSqrt(const SkFloat& a) { fPacked = Sqrt(a.fPacked); }
-    void    cubeRoot() { fPacked = CubeRoot(fPacked); }
-    void    setCubeRoot(const SkFloat& a) { fPacked = CubeRoot(a.fPacked); }
-
-    friend bool operator==(const SkFloat& a, const SkFloat& b) { return a.fPacked == b.fPacked; }
-    friend bool operator!=(const SkFloat& a, const SkFloat& b) { return a.fPacked != b.fPacked; }
-    friend bool operator<(const SkFloat& a, const SkFloat& b) { return Cmp(a.fPacked, b.fPacked) < 0; }
-    friend bool operator<=(const SkFloat& a, const SkFloat& b) { return Cmp(a.fPacked, b.fPacked) <= 0; }
-    friend bool operator>(const SkFloat& a, const SkFloat& b) { return Cmp(a.fPacked, b.fPacked) > 0; }
-    friend bool operator>=(const SkFloat& a, const SkFloat& b) { return Cmp(a.fPacked, b.fPacked) >= 0; }
-
-#ifdef SK_DEBUG
-    static void UnitTest();
-
-    void assertEquals(float f, int tolerance = 0)
-    {
-        union {
-            float   fFloat;
-            int32_t fPacked;
-        } tmp;
-
-        tmp.fFloat = f;
-        int d = tmp.fPacked - fPacked;
-        SkASSERT(SkAbs32(d) <= tolerance);
-    }
-    float getFloat() const
-    {
-        union {
-            float   fFloat;
-            int32_t fPacked;
-        } tmp;
-
-        tmp.fPacked = fPacked;
-        return tmp.fFloat;
-    }
-#endif
-
-private:
-    int32_t fPacked;
-
-public:
-    static int GetShift(int32_t packed, int shift);
-    static int32_t SetShift(int value, int shift);
-    static int32_t Neg(int32_t);
-    static int32_t Abs(int32_t packed) { return (uint32_t)(packed << 1) >> 1; }
-    static int32_t Shift(int32_t, int bits);
-    static int32_t Add(int32_t, int32_t);
-    static int32_t Mul(int32_t, int32_t);
-    static int32_t MulInt(int32_t, int);
-    static int32_t Div(int32_t, int32_t);
-    static int32_t DivInt(int32_t, int);
-    static int32_t Invert(int32_t);
-    static int32_t Sqrt(int32_t);
-    static int32_t CubeRoot(int32_t);
-    static int Cmp(int32_t, int32_t);
-};
-
-#endif
diff --git a/gfx/skia/skia/src/core/SkFloatBits.cpp b/gfx/skia/skia/src/core/SkFloatBits.cpp
index 6b35a75c88f7..919fd0610f22 100644
--- a/gfx/skia/skia/src/core/SkFloatBits.cpp
+++ b/gfx/skia/skia/src/core/SkFloatBits.cpp
@@ -85,7 +85,7 @@ int32_t SkFloatBits_toIntFloor(int32_t packed) {
         value = SkApplySign(value, SkExtractSign(packed));
         exp = -exp;
         if (exp > 25) {   // underflow
-#ifdef SK_DISCARD_DENORMALIZED_FOR_SPEED
+#ifdef SK_CPU_FLUSH_TO_ZERO
         // The iOS ARM processor discards small denormalized numbers to go faster.
         // The comparision below empirically causes the result to agree with the
         // tests in MathTest test_float_floor
@@ -154,7 +154,7 @@ int32_t SkFloatBits_toIntCeil(int32_t packed) {
         value = SkApplySign(value, SkExtractSign(packed));
         exp = -exp;
         if (exp > 25) {   // underflow
-#ifdef SK_DISCARD_DENORMALIZED_FOR_SPEED
+#ifdef SK_CPU_FLUSH_TO_ZERO
         // The iOS ARM processor discards small denormalized numbers to go faster.
         // The comparision below empirically causes the result to agree with the
         // tests in MathTest test_float_ceil
@@ -203,23 +203,3 @@ float SkIntToFloatCast(int32_t value) {
     data.fSignBitInt = (sign << 31) | (shift << 23) | (value & ~MATISSA_MAGIC_BIG);
     return data.fFloat;
 }
-
-float SkIntToFloatCast_NoOverflowCheck(int32_t value) {
-    if (0 == value) {
-        return 0;
-    }
-
-    int shift = EXP_BIAS;
-
-    // record the sign and make value positive
-    int sign = SkExtractSign(value);
-    value = SkApplySign(value, sign);
-
-    int zeros = SkCLZ(value << 8);
-    value <<= zeros;
-    shift -= zeros;
-
-    SkFloatIntUnion data;
-    data.fSignBitInt = (sign << 31) | (shift << 23) | (value & ~MATISSA_MAGIC_BIG);
-    return data.fFloat;
-}
diff --git a/gfx/skia/skia/src/core/SkFont.cpp b/gfx/skia/skia/src/core/SkFont.cpp
index dcc2f0bf67b7..c39cc185d3d5 100644
--- a/gfx/skia/skia/src/core/SkFont.cpp
+++ b/gfx/skia/skia/src/core/SkFont.cpp
@@ -31,16 +31,16 @@ SkFont::SkFont(SkTypeface* face, SkScalar size, SkScalar scaleX, SkScalar skewX,
 SkFont* SkFont::Create(SkTypeface* face, SkScalar size, SkScalar scaleX, SkScalar skewX,
                        MaskType mt, uint32_t flags) {
     if (size <= 0 || !SkScalarIsFinite(size)) {
-        return NULL;
+        return nullptr;
     }
     if (scaleX <= 0 || !SkScalarIsFinite(scaleX)) {
-        return NULL;
+        return nullptr;
     }
     if (!SkScalarIsFinite(skewX)) {
-        return NULL;
+        return nullptr;
     }
     flags &= kAllFlags;
-    return SkNEW_ARGS(SkFont, (face, size, scaleX, skewX, mt, flags));
+    return new SkFont(face, size, scaleX, skewX, mt, flags);
 }
 
 SkFont* SkFont::Create(SkTypeface* face, SkScalar size, MaskType mt, uint32_t flags) {
@@ -82,7 +82,7 @@ int SkFont::textToGlyphs(const void* text, size_t byteLength, SkTextEncoding enc
             count = SkToInt(byteLength >> 1);
             break;
     }
-    if (NULL == glyphs) {
+    if (nullptr == glyphs) {
         return count;
     }
 
diff --git a/gfx/skia/skia/src/core/SkFontDescriptor.cpp b/gfx/skia/skia/src/core/SkFontDescriptor.cpp
index 5088ed7687bc..8348d5fdba44 100644
--- a/gfx/skia/skia/src/core/SkFontDescriptor.cpp
+++ b/gfx/skia/skia/src/core/SkFontDescriptor.cpp
@@ -7,6 +7,7 @@
 
 #include "SkFontDescriptor.h"
 #include "SkStream.h"
+#include "SkData.h"
 
 enum {
     // these must match the sfnt 'name' enums
@@ -16,13 +17,13 @@ enum {
 
     // These count backwards from 0xFF, so as not to collide with the SFNT
     // defines for names in its 'name' table.
-    kFontFileName   = 0xFE,
+    kFontAxes       = 0xFC,
+    kFontIndex      = 0xFD,
+    kFontFileName   = 0xFE,  // Remove when MIN_PICTURE_VERSION > 41
     kSentinel       = 0xFF,
 };
 
-SkFontDescriptor::SkFontDescriptor(SkTypeface::Style style) {
-    fStyle = style;
-}
+SkFontDescriptor::SkFontDescriptor(SkTypeface::Style style) : fStyle(style) { }
 
 static void read_string(SkStream* stream, SkString* string) {
     const uint32_t length = SkToU32(stream->readPackedUInt());
@@ -32,8 +33,15 @@ static void read_string(SkStream* stream, SkString* string) {
     }
 }
 
-static void write_string(SkWStream* stream, const SkString& string,
-                         uint32_t id) {
+// Remove when MIN_PICTURE_VERSION > 41
+static void skip_string(SkStream* stream) {
+    const uint32_t length = SkToU32(stream->readPackedUInt());
+    if (length > 0) {
+        stream->skip(length);
+    }
+}
+
+static void write_string(SkWStream* stream, const SkString& string, uint32_t id) {
     if (!string.isEmpty()) {
         stream->writePackedUInt(id);
         stream->writePackedUInt(string.size());
@@ -41,11 +49,23 @@ static void write_string(SkWStream* stream, const SkString& string,
     }
 }
 
+static size_t read_uint(SkStream* stream) {
+    return stream->readPackedUInt();
+}
+
+static void write_uint(SkWStream* stream, size_t n, uint32_t id) {
+    stream->writePackedUInt(id);
+    stream->writePackedUInt(n);
+}
+
 SkFontDescriptor::SkFontDescriptor(SkStream* stream) {
     fStyle = (SkTypeface::Style)stream->readPackedUInt();
 
-    for (;;) {
-        switch (stream->readPackedUInt()) {
+    SkAutoSTMalloc<4, SkFixed> axis;
+    size_t axisCount = 0;
+    size_t index = 0;
+    for (size_t id; (id = stream->readPackedUInt()) != kSentinel;) {
+        switch (id) {
             case kFontFamilyName:
                 read_string(stream, &fFamilyName);
                 break;
@@ -55,16 +75,32 @@ SkFontDescriptor::SkFontDescriptor(SkStream* stream) {
             case kPostscriptName:
                 read_string(stream, &fPostscriptName);
                 break;
-            case kFontFileName:
-                read_string(stream, &fFontFileName);
+            case kFontAxes:
+                axisCount = read_uint(stream);
+                axis.reset(axisCount);
+                for (size_t i = 0; i < axisCount; ++i) {
+                    axis[i] = read_uint(stream);
+                }
+                break;
+            case kFontIndex:
+                index = read_uint(stream);
+                break;
+            case kFontFileName:  // Remove when MIN_PICTURE_VERSION > 41
+                skip_string(stream);
                 break;
-            case kSentinel:
-                return;
             default:
                 SkDEBUGFAIL("Unknown id used by a font descriptor");
                 return;
         }
     }
+
+    size_t length = stream->readPackedUInt();
+    if (length > 0) {
+        SkAutoTUnref<SkData> data(SkData::NewUninitialized(length));
+        if (stream->read(data->writable_data(), length) == length) {
+            fFontData.reset(new SkFontData(new SkMemoryStream(data), index, axis, axisCount));
+        }
+    }
 }
 
 void SkFontDescriptor::serialize(SkWStream* stream) {
@@ -73,7 +109,26 @@ void SkFontDescriptor::serialize(SkWStream* stream) {
     write_string(stream, fFamilyName, kFontFamilyName);
     write_string(stream, fFullName, kFullName);
     write_string(stream, fPostscriptName, kPostscriptName);
-    write_string(stream, fFontFileName, kFontFileName);
+    if (fFontData.get()) {
+        if (fFontData->getIndex()) {
+            write_uint(stream, fFontData->getIndex(), kFontIndex);
+        }
+        if (fFontData->getAxisCount()) {
+            write_uint(stream, fFontData->getAxisCount(), kFontAxes);
+            for (int i = 0; i < fFontData->getAxisCount(); ++i) {
+                stream->writePackedUInt(fFontData->getAxis()[i]);
+            }
+        }
+    }
 
     stream->writePackedUInt(kSentinel);
+
+    if (fFontData.get() && fFontData->hasStream()) {
+        SkAutoTDelete<SkStreamAsset> fontData(fFontData->detachStream());
+        size_t length = fontData->getLength();
+        stream->writePackedUInt(length);
+        stream->writeStream(fontData, length);
+    } else {
+        stream->writePackedUInt(0);
+    }
 }
diff --git a/gfx/skia/skia/src/core/SkFontDescriptor.h b/gfx/skia/skia/src/core/SkFontDescriptor.h
index 5febfd81a3f3..21fecdc41628 100644
--- a/gfx/skia/skia/src/core/SkFontDescriptor.h
+++ b/gfx/skia/skia/src/core/SkFontDescriptor.h
@@ -8,15 +8,49 @@
 #ifndef SkFontDescriptor_DEFINED
 #define SkFontDescriptor_DEFINED
 
+#include "SkStream.h"
 #include "SkString.h"
 #include "SkTypeface.h"
 
-class SkStream;
-class SkWStream;
+class SkFontData {
+public:
+    /** This takes ownership of 'stream'. Makes a copy of the data in 'axis'. */
+    SkFontData(SkStreamAsset* stream, int index, const SkFixed axis[], int axisCount)
+        : fStream(stream), fIndex(index), fAxisCount(axisCount), fAxis(axisCount)
+    {
+        for (int i = 0; i < axisCount; ++i) {
+            fAxis[i] = axis[i];
+        }
+    }
+    SkFontData(const SkFontData& that)
+        : fStream(that.fStream->duplicate())
+        , fIndex(that.fIndex)
+        , fAxisCount(that.fAxisCount)
+        , fAxis(fAxisCount)
+    {
+        for (int i = 0; i < fAxisCount; ++i) {
+            fAxis[i] = that.fAxis[i];
+        }
+    }
+    bool hasStream() const { return fStream.get() != nullptr; }
+    SkStreamAsset* duplicateStream() const { return fStream->duplicate(); }
+    SkStreamAsset* detachStream() { return fStream.detach(); }
+    SkStreamAsset* getStream() { return fStream.get(); }
+    int getIndex() const { return fIndex; }
+    int getAxisCount() const { return fAxisCount; }
+    const SkFixed* getAxis() const { return fAxis.get(); }
 
-class SkFontDescriptor {
+private:
+    SkAutoTDelete<SkStreamAsset> fStream;
+    int fIndex;
+    int fAxisCount;
+    SkAutoSTMalloc<4, SkFixed> fAxis;
+};
+
+class SkFontDescriptor : SkNoncopyable {
 public:
     SkFontDescriptor(SkTypeface::Style = SkTypeface::kNormal);
+    // Does not affect ownership of SkStream.
     SkFontDescriptor(SkStream*);
 
     void serialize(SkWStream*);
@@ -24,21 +58,24 @@ public:
     SkTypeface::Style getStyle() { return fStyle; }
     void setStyle(SkTypeface::Style style) { fStyle = style; }
 
-    const char* getFamilyName() { return fFamilyName.c_str(); }
-    const char* getFullName() { return fFullName.c_str(); }
-    const char* getPostscriptName() { return fPostscriptName.c_str(); }
-    const char* getFontFileName() { return fFontFileName.c_str(); }
+    const char* getFamilyName() const { return fFamilyName.c_str(); }
+    const char* getFullName() const { return fFullName.c_str(); }
+    const char* getPostscriptName() const { return fPostscriptName.c_str(); }
+    bool hasFontData() const { return fFontData.get() != nullptr; }
+    SkFontData* detachFontData() { return fFontData.detach(); }
 
     void setFamilyName(const char* name) { fFamilyName.set(name); }
     void setFullName(const char* name) { fFullName.set(name); }
     void setPostscriptName(const char* name) { fPostscriptName.set(name); }
-    void setFontFileName(const char* name) { fFontFileName.set(name); }
+    /** Set the font data only if it is necessary for serialization.
+     *  This method takes ownership of the font data. */
+    void setFontData(SkFontData* data) { fFontData.reset(data); }
 
 private:
     SkString fFamilyName;
     SkString fFullName;
     SkString fPostscriptName;
-    SkString fFontFileName;
+    SkAutoTDelete<SkFontData> fFontData;
 
     SkTypeface::Style fStyle;
 };
diff --git a/gfx/skia/skia/src/core/SkFontHost.cpp b/gfx/skia/skia/src/core/SkFontHost.cpp
index a16a8c42e029..4f0dc8637d57 100644
--- a/gfx/skia/skia/src/core/SkFontHost.cpp
+++ b/gfx/skia/skia/src/core/SkFontHost.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "SkFontLCDConfig.h"
-#include "SkLazyPtr.h"
 
 static SkFontLCDConfig::LCDOrientation gLCDOrientation = SkFontLCDConfig::kHorizontal_LCDOrientation;
 static SkFontLCDConfig::LCDOrder gLCDOrder = SkFontLCDConfig::kRGB_LCDOrder;
@@ -47,210 +46,3 @@ SkFontHost::LCDOrder SkFontHost::GetSubpixelOrder() {
 void SkFontHost::SetSubpixelOrder(LCDOrder order) {
     SkFontLCDConfig::SetSubpixelOrder((SkFontLCDConfig::LCDOrder)order);
 }
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-#include "SkFontStyle.h"
-
-SkFontStyle::SkFontStyle() {
-    fUnion.fU32 = 0;
-    fUnion.fR.fWeight = kNormal_Weight;
-    fUnion.fR.fWidth = kNormal_Width;
-    fUnion.fR.fSlant = kUpright_Slant;
-}
-
-SkFontStyle::SkFontStyle(int weight, int width, Slant slant) {
-    fUnion.fU32 = 0;
-    fUnion.fR.fWeight = SkPin32(weight, kThin_Weight, kBlack_Weight);
-    fUnion.fR.fWidth = SkPin32(width, kUltraCondensed_Width, kUltaExpanded_Width);
-    fUnion.fR.fSlant = SkPin32(slant, kUpright_Slant, kItalic_Slant);
-}
-
-#include "SkFontMgr.h"
-
-class SkEmptyFontStyleSet : public SkFontStyleSet {
-public:
-    virtual int count() SK_OVERRIDE { return 0; }
-    virtual void getStyle(int, SkFontStyle*, SkString*) SK_OVERRIDE {
-        SkDEBUGFAIL("SkFontStyleSet::getStyle called on empty set");
-    }
-    virtual SkTypeface* createTypeface(int index) SK_OVERRIDE {
-        SkDEBUGFAIL("SkFontStyleSet::createTypeface called on empty set");
-        return NULL;
-    }
-    virtual SkTypeface* matchStyle(const SkFontStyle&) SK_OVERRIDE {
-        return NULL;
-    }
-};
-
-SkFontStyleSet* SkFontStyleSet::CreateEmpty() {
-    return SkNEW(SkEmptyFontStyleSet);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-class SkEmptyFontMgr : public SkFontMgr {
-protected:
-    virtual int onCountFamilies() const SK_OVERRIDE {
-        return 0;
-    }
-    virtual void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE {
-        SkDEBUGFAIL("onGetFamilyName called with bad index");
-    }
-    virtual SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE {
-        SkDEBUGFAIL("onCreateStyleSet called with bad index");
-        return NULL;
-    }
-    virtual SkFontStyleSet* onMatchFamily(const char[]) const SK_OVERRIDE {
-        return SkFontStyleSet::CreateEmpty();
-    }
-
-    virtual SkTypeface* onMatchFamilyStyle(const char[],
-                                           const SkFontStyle&) const SK_OVERRIDE {
-        return NULL;
-    }
-    virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[],
-                                                    const SkFontStyle& style,
-                                                    const char bpc47[],
-                                                    uint32_t character) const SK_OVERRIDE {
-        return NULL;
-    }
-    virtual SkTypeface* onMatchFaceStyle(const SkTypeface*,
-                                         const SkFontStyle&) const SK_OVERRIDE {
-        return NULL;
-    }
-    virtual SkTypeface* onCreateFromData(SkData*, int) const SK_OVERRIDE {
-        return NULL;
-    }
-    virtual SkTypeface* onCreateFromStream(SkStream*, int) const SK_OVERRIDE {
-        return NULL;
-    }
-    virtual SkTypeface* onCreateFromFile(const char[], int) const SK_OVERRIDE {
-        return NULL;
-    }
-    virtual SkTypeface* onLegacyCreateTypeface(const char [], unsigned) const SK_OVERRIDE {
-        return NULL;
-    }
-};
-
-static SkFontStyleSet* emptyOnNull(SkFontStyleSet* fsset) {
-    if (NULL == fsset) {
-        fsset = SkFontStyleSet::CreateEmpty();
-    }
-    return fsset;
-}
-
-int SkFontMgr::countFamilies() const {
-    return this->onCountFamilies();
-}
-
-void SkFontMgr::getFamilyName(int index, SkString* familyName) const {
-    this->onGetFamilyName(index, familyName);
-}
-
-SkFontStyleSet* SkFontMgr::createStyleSet(int index) const {
-    return emptyOnNull(this->onCreateStyleSet(index));
-}
-
-SkFontStyleSet* SkFontMgr::matchFamily(const char familyName[]) const {
-    return emptyOnNull(this->onMatchFamily(familyName));
-}
-
-SkTypeface* SkFontMgr::matchFamilyStyle(const char familyName[],
-                                        const SkFontStyle& fs) const {
-    return this->onMatchFamilyStyle(familyName, fs);
-}
-
-SkTypeface* SkFontMgr::matchFamilyStyleCharacter(const char familyName[], const SkFontStyle& style,
-                                                 const char bpc47[], uint32_t character) const {
-    return this->onMatchFamilyStyleCharacter(familyName, style, bpc47, character);
-}
-
-SkTypeface* SkFontMgr::matchFaceStyle(const SkTypeface* face,
-                                      const SkFontStyle& fs) const {
-    return this->onMatchFaceStyle(face, fs);
-}
-
-SkTypeface* SkFontMgr::createFromData(SkData* data, int ttcIndex) const {
-    if (NULL == data) {
-        return NULL;
-    }
-    return this->onCreateFromData(data, ttcIndex);
-}
-
-SkTypeface* SkFontMgr::createFromStream(SkStream* stream, int ttcIndex) const {
-    if (NULL == stream) {
-        return NULL;
-    }
-    return this->onCreateFromStream(stream, ttcIndex);
-}
-
-SkTypeface* SkFontMgr::createFromFile(const char path[], int ttcIndex) const {
-    if (NULL == path) {
-        return NULL;
-    }
-    return this->onCreateFromFile(path, ttcIndex);
-}
-
-SkTypeface* SkFontMgr::legacyCreateTypeface(const char familyName[],
-                                            unsigned styleBits) const {
-    return this->onLegacyCreateTypeface(familyName, styleBits);
-}
-
-SkFontMgr* SkFontMgr::CreateDefault() {
-    SkFontMgr* fm = SkFontMgr::Factory();
-    return fm ? fm : SkNEW(SkEmptyFontMgr);
-}
-
-SkFontMgr* SkFontMgr::RefDefault() {
-    SK_DECLARE_STATIC_LAZY_PTR(SkFontMgr, singleton, CreateDefault);
-    return SkRef(singleton.get());
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-#ifndef SK_FONTHOST_DOES_NOT_USE_FONTMGR
-
-#if 0
-static SkFontStyle TypefaceStyleBitsToFontStyle(SkTypeface::Style styleBits) {
-    SkFontStyle::Weight weight = (styleBits & SkTypeface::kBold) ?
-                                     SkFontStyle::kBold_Weight :
-                                     SkFontStyle::kNormal_Weight;
-    SkFontStyle::Width width = SkFontStyle::kNormal_Width;
-    SkFontStyle::Slant slant = (styleBits & SkTypeface::kItalic) ?
-                                     SkFontStyle::kUpright_Slant :
-                                     SkFontStyle::kItalic_Slant;
-    return SkFontStyle(weight, width, slant);
-}
-#endif
-
-SkTypeface* SkFontHost::CreateTypeface(const SkTypeface* familyFace,
-                                       const char familyName[],
-                                       SkTypeface::Style style) {
-    SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
-    if (familyFace) {
-        bool bold = style & SkTypeface::kBold;
-        bool italic = style & SkTypeface::kItalic;
-        SkFontStyle newStyle = SkFontStyle(bold ? SkFontStyle::kBold_Weight
-                                                : SkFontStyle::kNormal_Weight,
-                                           SkFontStyle::kNormal_Width,
-                                           italic ? SkFontStyle::kItalic_Slant
-                                                  : SkFontStyle::kUpright_Slant);
-        return fm->matchFaceStyle(familyFace, newStyle);
-    } else {
-        return fm->legacyCreateTypeface(familyName, style);
-    }
-}
-
-SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) {
-    SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
-    return fm->createFromFile(path);
-}
-
-SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) {
-    SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
-    return fm->createFromStream(stream);
-}
-
-#endif
diff --git a/gfx/skia/skia/src/core/SkFontMgr.cpp b/gfx/skia/skia/src/core/SkFontMgr.cpp
new file mode 100644
index 000000000000..524691646399
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkFontMgr.cpp
@@ -0,0 +1,268 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkFontDescriptor.h"
+#include "SkFontMgr.h"
+#include "SkOncePtr.h"
+#include "SkStream.h"
+#include "SkTypes.h"
+
+class SkFontStyle;
+class SkTypeface;
+
+class SkEmptyFontStyleSet : public SkFontStyleSet {
+public:
+    int count() override { return 0; }
+    void getStyle(int, SkFontStyle*, SkString*) override {
+        SkDEBUGFAIL("SkFontStyleSet::getStyle called on empty set");
+    }
+    SkTypeface* createTypeface(int index) override {
+        SkDEBUGFAIL("SkFontStyleSet::createTypeface called on empty set");
+        return nullptr;
+    }
+    SkTypeface* matchStyle(const SkFontStyle&) override {
+        return nullptr;
+    }
+};
+
+SkFontStyleSet* SkFontStyleSet::CreateEmpty() { return new SkEmptyFontStyleSet; }
+
+///////////////////////////////////////////////////////////////////////////////
+
+class SkEmptyFontMgr : public SkFontMgr {
+protected:
+    int onCountFamilies() const override {
+        return 0;
+    }
+    void onGetFamilyName(int index, SkString* familyName) const override {
+        SkDEBUGFAIL("onGetFamilyName called with bad index");
+    }
+    SkFontStyleSet* onCreateStyleSet(int index) const override {
+        SkDEBUGFAIL("onCreateStyleSet called with bad index");
+        return nullptr;
+    }
+    SkFontStyleSet* onMatchFamily(const char[]) const override {
+        return SkFontStyleSet::CreateEmpty();
+    }
+
+    virtual SkTypeface* onMatchFamilyStyle(const char[],
+                                           const SkFontStyle&) const override {
+        return nullptr;
+    }
+    virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[],
+                                                    const SkFontStyle& style,
+                                                    const char* bcp47[],
+                                                    int bcp47Count,
+                                                    SkUnichar character) const override {
+        return nullptr;
+    }
+    virtual SkTypeface* onMatchFaceStyle(const SkTypeface*,
+                                         const SkFontStyle&) const override {
+        return nullptr;
+    }
+    SkTypeface* onCreateFromData(SkData*, int) const override {
+        return nullptr;
+    }
+    SkTypeface* onCreateFromStream(SkStreamAsset* stream, int) const override {
+        delete stream;
+        return nullptr;
+    }
+    SkTypeface* onCreateFromFile(const char[], int) const override {
+        return nullptr;
+    }
+    SkTypeface* onLegacyCreateTypeface(const char [], unsigned) const override {
+        return nullptr;
+    }
+};
+
+static SkFontStyleSet* emptyOnNull(SkFontStyleSet* fsset) {
+    if (nullptr == fsset) {
+        fsset = SkFontStyleSet::CreateEmpty();
+    }
+    return fsset;
+}
+
+int SkFontMgr::countFamilies() const {
+    return this->onCountFamilies();
+}
+
+void SkFontMgr::getFamilyName(int index, SkString* familyName) const {
+    this->onGetFamilyName(index, familyName);
+}
+
+SkFontStyleSet* SkFontMgr::createStyleSet(int index) const {
+    return emptyOnNull(this->onCreateStyleSet(index));
+}
+
+SkFontStyleSet* SkFontMgr::matchFamily(const char familyName[]) const {
+    return emptyOnNull(this->onMatchFamily(familyName));
+}
+
+SkTypeface* SkFontMgr::matchFamilyStyle(const char familyName[],
+                                        const SkFontStyle& fs) const {
+    return this->onMatchFamilyStyle(familyName, fs);
+}
+
+SkTypeface* SkFontMgr::matchFamilyStyleCharacter(const char familyName[], const SkFontStyle& style,
+                                                 const char* bcp47[], int bcp47Count,
+                                                 SkUnichar character) const {
+    return this->onMatchFamilyStyleCharacter(familyName, style, bcp47, bcp47Count, character);
+}
+
+SkTypeface* SkFontMgr::matchFaceStyle(const SkTypeface* face,
+                                      const SkFontStyle& fs) const {
+    return this->onMatchFaceStyle(face, fs);
+}
+
+SkTypeface* SkFontMgr::createFromData(SkData* data, int ttcIndex) const {
+    if (nullptr == data) {
+        return nullptr;
+    }
+    return this->onCreateFromData(data, ttcIndex);
+}
+
+SkTypeface* SkFontMgr::createFromStream(SkStreamAsset* stream, int ttcIndex) const {
+    if (nullptr == stream) {
+        return nullptr;
+    }
+    return this->onCreateFromStream(stream, ttcIndex);
+}
+
+SkTypeface* SkFontMgr::createFromFontData(SkFontData* data) const {
+    if (nullptr == data) {
+        return nullptr;
+    }
+    return this->onCreateFromFontData(data);
+}
+
+// This implementation is temporary until it can be made pure virtual.
+SkTypeface* SkFontMgr::onCreateFromFontData(SkFontData* data) const {
+    SkTypeface* ret = this->createFromStream(data->detachStream(), data->getIndex());
+    delete data;
+    return ret;
+}
+
+SkTypeface* SkFontMgr::createFromFile(const char path[], int ttcIndex) const {
+    if (nullptr == path) {
+        return nullptr;
+    }
+    return this->onCreateFromFile(path, ttcIndex);
+}
+
+SkTypeface* SkFontMgr::legacyCreateTypeface(const char familyName[],
+                                            unsigned styleBits) const {
+    return this->onLegacyCreateTypeface(familyName, styleBits);
+}
+
+SK_DECLARE_STATIC_ONCE_PTR(SkFontMgr, singleton);
+SkFontMgr* SkFontMgr::RefDefault() {
+    return SkRef(singleton.get([]{
+        SkFontMgr* fm = SkFontMgr::Factory();
+        return fm ? fm : new SkEmptyFontMgr;
+    }));
+}
+
+/**
+* Width has the greatest priority.
+* If the value of pattern.width is 5 (normal) or less,
+*    narrower width values are checked first, then wider values.
+* If the value of pattern.width is greater than 5 (normal),
+*    wider values are checked first, followed by narrower values.
+*
+* Italic/Oblique has the next highest priority.
+* If italic requested and there is some italic font, use it.
+* If oblique requested and there is some oblique font, use it.
+* If italic requested and there is some oblique font, use it.
+* If oblique requested and there is some italic font, use it.
+*
+* Exact match.
+* If pattern.weight < 400, weights below pattern.weight are checked
+*   in descending order followed by weights above pattern.weight
+*   in ascending order until a match is found.
+* If pattern.weight > 500, weights above pattern.weight are checked
+*   in ascending order followed by weights below pattern.weight
+*   in descending order until a match is found.
+* If pattern.weight is 400, 500 is checked first
+*   and then the rule for pattern.weight < 400 is used.
+* If pattern.weight is 500, 400 is checked first
+*   and then the rule for pattern.weight < 400 is used.
+*/
+SkTypeface* SkFontStyleSet::matchStyleCSS3(const SkFontStyle& pattern) {
+    int count = this->count();
+    if (0 == count) {
+        return nullptr;
+    }
+
+    struct Score {
+        int score;
+        int index;
+    };
+
+    Score maxScore = { 0, 0 };
+    for (int i = 0; i < count; ++i) {
+        SkFontStyle current;
+        this->getStyle(i, &current, nullptr);
+        Score currentScore = { 0, i };
+
+        // CSS stretch. (This is the width.)
+        // This has the highest priority.
+        if (pattern.width() <= SkFontStyle::kNormal_Width) {
+            if (current.width() <= pattern.width()) {
+                currentScore.score += 10 - pattern.width() + current.width();
+            } else {
+                currentScore.score += 10 - current.width();
+            }
+        } else {
+            if (current.width() > pattern.width()) {
+                currentScore.score += 10 + pattern.width() - current.width();
+            } else {
+                currentScore.score += current.width();
+            }
+        }
+        currentScore.score *= 1002;
+
+        // CSS style (italic/oblique)
+        // Being italic trumps all valid weights which are not italic.
+        // Note that newer specs differentiate between italic and oblique.
+        if (pattern.isItalic() == current.isItalic()) {
+            currentScore.score += 1001;
+        }
+
+        // Synthetics (weight/style) [no stretch synthetic?]
+
+        // The 'closer' to the target weight, the higher the score.
+        // 1000 is the 'heaviest' recognized weight
+        if (pattern.weight() == current.weight()) {
+            currentScore.score += 1000;
+        } else if (pattern.weight() <= 500) {
+            if (400 <= pattern.weight() && pattern.weight() < 450) {
+                if (450 <= current.weight() && current.weight() <= 500) {
+                    // Artificially boost the 500 weight.
+                    // TODO: determine correct number to use.
+                    currentScore.score += 500;
+                }
+            }
+            if (current.weight() <= pattern.weight()) {
+                currentScore.score += 1000 - pattern.weight() + current.weight();
+            } else {
+                currentScore.score += 1000 - current.weight();
+            }
+        } else if (pattern.weight() > 500) {
+            if (current.weight() > pattern.weight()) {
+                currentScore.score += 1000 + pattern.weight() - current.weight();
+            } else {
+                currentScore.score += current.weight();
+            }
+        }
+
+        if (currentScore.score > maxScore.score) {
+            maxScore = currentScore;
+        }
+    }
+
+    return this->createTypeface(maxScore.index);
+}
diff --git a/gfx/skia/skia/src/core/SkFontStream.cpp b/gfx/skia/skia/src/core/SkFontStream.cpp
index 580da37f43b8..b2ffe8deba4a 100644
--- a/gfx/skia/skia/src/core/SkFontStream.cpp
+++ b/gfx/skia/skia/src/core/SkFontStream.cpp
@@ -101,7 +101,7 @@ static int count_tables(SkStream* stream, int ttcIndex, size_t* offsetToDir) {
 ///////////////////////////////////////////////////////////////////////////////
 
 struct SfntHeader {
-    SfntHeader() : fCount(0), fDir(NULL) {}
+    SfntHeader() : fCount(0), fDir(nullptr) {}
     ~SfntHeader() { sk_free(fDir); }
 
     /** If it returns true, then fCount and fDir are properly initialized.
diff --git a/gfx/skia/skia/src/core/SkFontStream.h b/gfx/skia/skia/src/core/SkFontStream.h
index 0f7a052e6a48..0a2322fc06d6 100644
--- a/gfx/skia/skia/src/core/SkFontStream.h
+++ b/gfx/skia/skia/src/core/SkFontStream.h
@@ -42,7 +42,7 @@ public:
                                size_t offset, size_t length, void* data);
 
     static size_t GetTableSize(SkStream* stream, int ttcIndex, SkFontTableTag tag) {
-        return GetTableData(stream, ttcIndex, tag, 0, ~0U, NULL);
+        return GetTableData(stream, ttcIndex, tag, 0, ~0U, nullptr);
     }
 };
 
diff --git a/gfx/skia/skia/src/core/SkFontStyle.cpp b/gfx/skia/skia/src/core/SkFontStyle.cpp
new file mode 100644
index 000000000000..badf9d7a9d88
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkFontStyle.cpp
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkFontStyle.h"
+#include "SkTypeface.h"
+#include "SkTypes.h"
+
+SkFontStyle::SkFontStyle() {
+    fUnion.fU32 = 0;
+    fUnion.fR.fWeight = kNormal_Weight;
+    fUnion.fR.fWidth = kNormal_Width;
+    fUnion.fR.fSlant = kUpright_Slant;
+}
+
+SkFontStyle::SkFontStyle(int weight, int width, Slant slant) {
+    fUnion.fU32 = 0;
+    fUnion.fR.fWeight = SkTPin<int>(weight, kThin_Weight, kBlack_Weight);
+    fUnion.fR.fWidth = SkTPin<int>(width, kUltraCondensed_Width, kUltaExpanded_Width);
+    fUnion.fR.fSlant = SkTPin<int>(slant, kUpright_Slant, kItalic_Slant);
+}
+
+SkFontStyle::SkFontStyle(unsigned oldStyle) {
+    fUnion.fU32 = 0;
+    fUnion.fR.fWeight = (oldStyle & SkTypeface::kBold) ? SkFontStyle::kBold_Weight
+                                                       : SkFontStyle::kNormal_Weight;
+    fUnion.fR.fWidth = SkFontStyle::kNormal_Width;
+    fUnion.fR.fSlant = (oldStyle & SkTypeface::kItalic) ? SkFontStyle::kItalic_Slant
+                                                        : SkFontStyle::kUpright_Slant;
+}
diff --git a/gfx/skia/skia/src/core/SkForceCPlusPlusLinking.cpp b/gfx/skia/skia/src/core/SkForceCPlusPlusLinking.cpp
new file mode 100644
index 000000000000..829d0d3fe6c5
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkForceCPlusPlusLinking.cpp
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+// This file is intentionally empty.  We add it to the dependencies of skia_lib
+// so that GYP detects that libskia is a C++ library (implicitly depending on
+// the standard library, -lm, etc.) from its file extension.
+//
+// If we didn't do this, GYP would link libskia.so as a C library and we'd get
+// link-time failures for simple binaries that don't themselves depend on the
+// C++ standard library.
+//
+// Even if we try hard not to depend on the standard library, say, never
+// calling new or delete, the compiler can still insert calls on our behalf
+// that make us depend on it anyway: a handler when we call a for a pure
+// virtual, thread-safety guards around statics, probably other similar
+// language constructs.
diff --git a/gfx/skia/skia/src/core/SkGeometry.cpp b/gfx/skia/skia/src/core/SkGeometry.cpp
index 646dfb05b9d4..01b618073ab1 100644
--- a/gfx/skia/skia/src/core/SkGeometry.cpp
+++ b/gfx/skia/skia/src/core/SkGeometry.cpp
@@ -7,60 +7,24 @@
 
 #include "SkGeometry.h"
 #include "SkMatrix.h"
+#include "SkNx.h"
 
-bool SkXRayCrossesLine(const SkXRay& pt,
-                       const SkPoint pts[2],
-                       bool* ambiguous) {
-    if (ambiguous) {
-        *ambiguous = false;
-    }
-    // Determine quick discards.
-    // Consider query line going exactly through point 0 to not
-    // intersect, for symmetry with SkXRayCrossesMonotonicCubic.
-    if (pt.fY == pts[0].fY) {
-        if (ambiguous) {
-            *ambiguous = true;
-        }
-        return false;
-    }
-    if (pt.fY < pts[0].fY && pt.fY < pts[1].fY)
-        return false;
-    if (pt.fY > pts[0].fY && pt.fY > pts[1].fY)
-        return false;
-    if (pt.fX > pts[0].fX && pt.fX > pts[1].fX)
-        return false;
-    // Determine degenerate cases
-    if (SkScalarNearlyZero(pts[0].fY - pts[1].fY))
-        return false;
-    if (SkScalarNearlyZero(pts[0].fX - pts[1].fX)) {
-        // We've already determined the query point lies within the
-        // vertical range of the line segment.
-        if (pt.fX <= pts[0].fX) {
-            if (ambiguous) {
-                *ambiguous = (pt.fY == pts[1].fY);
-            }
-            return true;
-        }
-        return false;
-    }
-    // Ambiguity check
-    if (pt.fY == pts[1].fY) {
-        if (pt.fX <= pts[1].fX) {
-            if (ambiguous) {
-                *ambiguous = true;
-            }
-            return true;
-        }
-        return false;
-    }
-    // Full line segment evaluation
-    SkScalar delta_y = pts[1].fY - pts[0].fY;
-    SkScalar delta_x = pts[1].fX - pts[0].fX;
-    SkScalar slope = SkScalarDiv(delta_y, delta_x);
-    SkScalar b = pts[0].fY - SkScalarMul(slope, pts[0].fX);
-    // Solve for x coordinate at y = pt.fY
-    SkScalar x = SkScalarDiv(pt.fY - b, slope);
-    return pt.fX <= x;
+#if 0
+static Sk2s from_point(const SkPoint& point) {
+    return Sk2s::Load(&point.fX);
+}
+
+static SkPoint to_point(const Sk2s& x) {
+    SkPoint point;
+    x.store(&point.fX);
+    return point;
+}
+#endif
+
+static SkVector to_vector(const Sk2s& x) {
+    SkVector vector;
+    x.store(&vector.fX);
+    return vector;
 }
 
 /** If defined, this makes eval_quad and eval_cubic do more setup (sometimes
@@ -98,11 +62,11 @@ static int valid_unit_divide(SkScalar numer, SkScalar denom, SkScalar* ratio) {
         return 0;
     }
 
-    SkScalar r = SkScalarDiv(numer, denom);
+    SkScalar r = numer / denom;
     if (SkScalarIsNaN(r)) {
         return 0;
     }
-    SkASSERT(r >= 0 && r < SK_Scalar1);
+    SkASSERTF(r >= 0 && r < SK_Scalar1, "numer %f, denom %f, r %f", numer, denom, r);
     if (r == 0) { // catch underflow if numer <<<< denom
         return 0;
     }
@@ -146,6 +110,10 @@ int SkFindUnitQuadRoots(SkScalar A, SkScalar B, SkScalar C, SkScalar roots[2]) {
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
+static Sk2s quad_poly_eval(const Sk2s& A, const Sk2s& B, const Sk2s& C, const Sk2s& t) {
+    return (A * t + B) * t + C;
+}
+
 static SkScalar eval_quad(const SkScalar src[], SkScalar t) {
     SkASSERT(src);
     SkASSERT(t >= 0 && t <= SK_Scalar1);
@@ -162,21 +130,19 @@ static SkScalar eval_quad(const SkScalar src[], SkScalar t) {
 #endif
 }
 
-static SkScalar eval_quad_derivative(const SkScalar src[], SkScalar t) {
-    SkScalar A = src[4] - 2 * src[2] + src[0];
-    SkScalar B = src[2] - src[0];
+void SkQuadToCoeff(const SkPoint pts[3], SkPoint coeff[3]) {
+    Sk2s p0 = from_point(pts[0]);
+    Sk2s p1 = from_point(pts[1]);
+    Sk2s p2 = from_point(pts[2]);
 
-    return 2 * SkScalarMulAdd(A, t, B);
+    Sk2s p1minus2 = p1 - p0;
+
+    coeff[0] = to_point(p2 - p1 - p1 + p0);     // A * t^2
+    coeff[1] = to_point(p1minus2 + p1minus2);   // B * t
+    coeff[2] = pts[0];                          // C
 }
 
-static SkScalar eval_quad_derivative_at_half(const SkScalar src[]) {
-    SkScalar A = src[4] - 2 * src[2] + src[0];
-    SkScalar B = src[2] - src[0];
-    return A + 2 * B;
-}
-
-void SkEvalQuadAt(const SkPoint src[3], SkScalar t, SkPoint* pt,
-                  SkVector* tangent) {
+void SkEvalQuadAt(const SkPoint src[3], SkScalar t, SkPoint* pt, SkVector* tangent) {
     SkASSERT(src);
     SkASSERT(t >= 0 && t <= SK_Scalar1);
 
@@ -184,56 +150,71 @@ void SkEvalQuadAt(const SkPoint src[3], SkScalar t, SkPoint* pt,
         pt->set(eval_quad(&src[0].fX, t), eval_quad(&src[0].fY, t));
     }
     if (tangent) {
-        tangent->set(eval_quad_derivative(&src[0].fX, t),
-                     eval_quad_derivative(&src[0].fY, t));
+        *tangent = SkEvalQuadTangentAt(src, t);
     }
 }
 
-void SkEvalQuadAtHalf(const SkPoint src[3], SkPoint* pt, SkVector* tangent) {
+SkPoint SkEvalQuadAt(const SkPoint src[3], SkScalar t) {
     SkASSERT(src);
+    SkASSERT(t >= 0 && t <= SK_Scalar1);
 
-    if (pt) {
-        SkScalar x01 = SkScalarAve(src[0].fX, src[1].fX);
-        SkScalar y01 = SkScalarAve(src[0].fY, src[1].fY);
-        SkScalar x12 = SkScalarAve(src[1].fX, src[2].fX);
-        SkScalar y12 = SkScalarAve(src[1].fY, src[2].fY);
-        pt->set(SkScalarAve(x01, x12), SkScalarAve(y01, y12));
-    }
-    if (tangent) {
-        tangent->set(eval_quad_derivative_at_half(&src[0].fX),
-                     eval_quad_derivative_at_half(&src[0].fY));
-    }
+    const Sk2s t2(t);
+
+    Sk2s P0 = from_point(src[0]);
+    Sk2s P1 = from_point(src[1]);
+    Sk2s P2 = from_point(src[2]);
+
+    Sk2s B = P1 - P0;
+    Sk2s A = P2 - P1 - B;
+
+    return to_point((A * t2 + B+B) * t2 + P0);
 }
 
-static void interp_quad_coords(const SkScalar* src, SkScalar* dst, SkScalar t) {
-    SkScalar    ab = SkScalarInterp(src[0], src[2], t);
-    SkScalar    bc = SkScalarInterp(src[2], src[4], t);
+SkVector SkEvalQuadTangentAt(const SkPoint src[3], SkScalar t) {
+    // The derivative equation is 2(b - a +(a - 2b +c)t). This returns a
+    // zero tangent vector when t is 0 or 1, and the control point is equal
+    // to the end point. In this case, use the quad end points to compute the tangent.
+    if ((t == 0 && src[0] == src[1]) || (t == 1 && src[1] == src[2])) {
+        return src[2] - src[0];
+    }
+    SkASSERT(src);
+    SkASSERT(t >= 0 && t <= SK_Scalar1);
 
-    dst[0] = src[0];
-    dst[2] = ab;
-    dst[4] = SkScalarInterp(ab, bc, t);
-    dst[6] = bc;
-    dst[8] = src[4];
+    Sk2s P0 = from_point(src[0]);
+    Sk2s P1 = from_point(src[1]);
+    Sk2s P2 = from_point(src[2]);
+
+    Sk2s B = P1 - P0;
+    Sk2s A = P2 - P1 - B;
+    Sk2s T = A * Sk2s(t) + B;
+
+    return to_vector(T + T);
+}
+
+static inline Sk2s interp(const Sk2s& v0, const Sk2s& v1, const Sk2s& t) {
+    return v0 + (v1 - v0) * t;
 }
 
 void SkChopQuadAt(const SkPoint src[3], SkPoint dst[5], SkScalar t) {
     SkASSERT(t > 0 && t < SK_Scalar1);
 
-    interp_quad_coords(&src[0].fX, &dst[0].fX, t);
-    interp_quad_coords(&src[0].fY, &dst[0].fY, t);
+    Sk2s p0 = from_point(src[0]);
+    Sk2s p1 = from_point(src[1]);
+    Sk2s p2 = from_point(src[2]);
+    Sk2s tt(t);
+
+    Sk2s p01 = interp(p0, p1, tt);
+    Sk2s p12 = interp(p1, p2, tt);
+
+    dst[0] = to_point(p0);
+    dst[1] = to_point(p01);
+    dst[2] = to_point(interp(p01, p12, tt));
+    dst[3] = to_point(p12);
+    dst[4] = to_point(p2);
 }
 
 void SkChopQuadAtHalf(const SkPoint src[3], SkPoint dst[5]) {
-    SkScalar x01 = SkScalarAve(src[0].fX, src[1].fX);
-    SkScalar y01 = SkScalarAve(src[0].fY, src[1].fY);
-    SkScalar x12 = SkScalarAve(src[1].fX, src[2].fX);
-    SkScalar y12 = SkScalarAve(src[1].fY, src[2].fY);
-
-    dst[0] = src[0];
-    dst[1].set(x01, y01);
-    dst[2].set(SkScalarAve(x01, x12), SkScalarAve(y01, y12));
-    dst[3].set(x12, y12);
-    dst[4] = src[2];
+    SkChopQuadAt(src, dst, 0.5f); return;
 }
 
 /** Quad'(t) = At + B, where
@@ -342,15 +323,15 @@ int SkChopQuadAtMaxCurvature(const SkPoint src[3], SkPoint dst[5]) {
     }
 }
 
-#define SK_ScalarTwoThirds  (0.666666666f)
-
 void SkConvertQuadToCubic(const SkPoint src[3], SkPoint dst[4]) {
-    const SkScalar scale = SK_ScalarTwoThirds;
+    Sk2s scale(SkDoubleToScalar(2.0 / 3.0));
+    Sk2s s0 = from_point(src[0]);
+    Sk2s s1 = from_point(src[1]);
+    Sk2s s2 = from_point(src[2]);
+
     dst[0] = src[0];
-    dst[1].set(src[0].fX + SkScalarMul(src[1].fX - src[0].fX, scale),
-               src[0].fY + SkScalarMul(src[1].fY - src[0].fY, scale));
-    dst[2].set(src[2].fX + SkScalarMul(src[1].fX - src[2].fX, scale),
-               src[2].fY + SkScalarMul(src[1].fY - src[2].fY, scale));
+    dst[1] = to_point(s0 + (s1 - s0) * scale);
+    dst[2] = to_point(s2 + (s1 - s2) * scale);
     dst[3] = src[2];
 }
 
@@ -358,24 +339,6 @@ void SkConvertQuadToCubic(const SkPoint src[3], SkPoint dst[4]) {
 ///// CUBICS // CUBICS // CUBICS // CUBICS // CUBICS // CUBICS // CUBICS /////
 //////////////////////////////////////////////////////////////////////////////
 
-static void get_cubic_coeff(const SkScalar pt[], SkScalar coeff[4]) {
-    coeff[0] = pt[6] + 3*(pt[2] - pt[4]) - pt[0];
-    coeff[1] = 3*(pt[4] - pt[2] - pt[2] + pt[0]);
-    coeff[2] = 3*(pt[2] - pt[0]);
-    coeff[3] = pt[0];
-}
-
-void SkGetCubicCoeff(const SkPoint pts[4], SkScalar cx[4], SkScalar cy[4]) {
-    SkASSERT(pts);
-
-    if (cx) {
-        get_cubic_coeff(&pts[0].fX, cx);
-    }
-    if (cy) {
-        get_cubic_coeff(&pts[0].fY, cy);
-    }
-}
-
 static SkScalar eval_cubic(const SkScalar src[], SkScalar t) {
     SkASSERT(src);
     SkASSERT(t >= 0 && t <= SK_Scalar1);
@@ -433,8 +396,22 @@ void SkEvalCubicAt(const SkPoint src[4], SkScalar t, SkPoint* loc,
         loc->set(eval_cubic(&src[0].fX, t), eval_cubic(&src[0].fY, t));
     }
     if (tangent) {
-        tangent->set(eval_cubic_derivative(&src[0].fX, t),
-                     eval_cubic_derivative(&src[0].fY, t));
+        // The derivative equation returns a zero tangent vector when t is 0 or 1, and the
+        // adjacent control point is equal to the end point. In this case, use the
+        // next control point or the end points to compute the tangent.
+        if ((t == 0 && src[0] == src[1]) || (t == 1 && src[2] == src[3])) {
+            if (t == 0) {
+                *tangent = src[2] - src[0];
+            } else {
+                *tangent = src[3] - src[1];
+            }
+            if (!tangent->fX && !tangent->fY) {
+                *tangent = src[3] - src[0];
+            }
+        } else {
+            tangent->set(eval_cubic_derivative(&src[0].fX, t),
+                         eval_cubic_derivative(&src[0].fY, t));
+        }
     }
     if (curvature) {
         curvature->set(eval_cubic_2ndDerivative(&src[0].fX, t),
@@ -458,29 +435,49 @@ int SkFindCubicExtrema(SkScalar a, SkScalar b, SkScalar c, SkScalar d,
     return SkFindUnitQuadRoots(A, B, C, tValues);
 }
 
-static void interp_cubic_coords(const SkScalar* src, SkScalar* dst,
-                                SkScalar t) {
-    SkScalar    ab = SkScalarInterp(src[0], src[2], t);
-    SkScalar    bc = SkScalarInterp(src[2], src[4], t);
-    SkScalar    cd = SkScalarInterp(src[4], src[6], t);
-    SkScalar    abc = SkScalarInterp(ab, bc, t);
-    SkScalar    bcd = SkScalarInterp(bc, cd, t);
-    SkScalar    abcd = SkScalarInterp(abc, bcd, t);
-
-    dst[0] = src[0];
-    dst[2] = ab;
-    dst[4] = abc;
-    dst[6] = abcd;
-    dst[8] = bcd;
-    dst[10] = cd;
-    dst[12] = src[6];
-}
-
 void SkChopCubicAt(const SkPoint src[4], SkPoint dst[7], SkScalar t) {
     SkASSERT(t > 0 && t < SK_Scalar1);
 
-    interp_cubic_coords(&src[0].fX, &dst[0].fX, t);
-    interp_cubic_coords(&src[0].fY, &dst[0].fY, t);
+    Sk2s    p0 = from_point(src[0]);
+    Sk2s    p1 = from_point(src[1]);
+    Sk2s    p2 = from_point(src[2]);
+    Sk2s    p3 = from_point(src[3]);
+    Sk2s    tt(t);
+
+    Sk2s    ab = interp(p0, p1, tt);
+    Sk2s    bc = interp(p1, p2, tt);
+    Sk2s    cd = interp(p2, p3, tt);
+    Sk2s    abc = interp(ab, bc, tt);
+    Sk2s    bcd = interp(bc, cd, tt);
+    Sk2s    abcd = interp(abc, bcd, tt);
+
+    dst[0] = src[0];
+    dst[1] = to_point(ab);
+    dst[2] = to_point(abc);
+    dst[3] = to_point(abcd);
+    dst[4] = to_point(bcd);
+    dst[5] = to_point(cd);
+    dst[6] = src[3];
+}
+
+void SkCubicToCoeff(const SkPoint pts[4], SkPoint coeff[4]) {
+    Sk2s p0 = from_point(pts[0]);
+    Sk2s p1 = from_point(pts[1]);
+    Sk2s p2 = from_point(pts[2]);
+    Sk2s p3 = from_point(pts[3]);
+
+    const Sk2s three(3);
+    Sk2s p1minusp2 = p1 - p2;
+
+    Sk2s D = p0;
+    Sk2s A = p3 + three * p1minusp2 - D;
+    Sk2s B = three * (D - p1minusp2 - p1);
+    Sk2s C = three * (p1 - D);
+
+    coeff[0] = to_point(A);
+    coeff[1] = to_point(B);
+    coeff[2] = to_point(C);
+    coeff[3] = to_point(D);
 }
 
 /*  http://code.google.com/p/skia/issues/detail?id=32
@@ -550,25 +547,7 @@ void SkChopCubicAt(const SkPoint src[4], SkPoint dst[],
 }
 
 void SkChopCubicAtHalf(const SkPoint src[4], SkPoint dst[7]) {
-    SkScalar x01 = SkScalarAve(src[0].fX, src[1].fX);
-    SkScalar y01 = SkScalarAve(src[0].fY, src[1].fY);
-    SkScalar x12 = SkScalarAve(src[1].fX, src[2].fX);
-    SkScalar y12 = SkScalarAve(src[1].fY, src[2].fY);
-    SkScalar x23 = SkScalarAve(src[2].fX, src[3].fX);
-    SkScalar y23 = SkScalarAve(src[2].fY, src[3].fY);
-
-    SkScalar x012 = SkScalarAve(x01, x12);
-    SkScalar y012 = SkScalarAve(y01, y12);
-    SkScalar x123 = SkScalarAve(x12, x23);
-    SkScalar y123 = SkScalarAve(y12, y23);
-
-    dst[0] = src[0];
-    dst[1].set(x01, y01);
-    dst[2].set(x012, y012);
-    dst[3].set(SkScalarAve(x012, x123), SkScalarAve(y012, y123));
-    dst[4].set(x123, y123);
-    dst[5].set(x23, y23);
-    dst[6] = src[3];
+    SkChopCubicAt(src, dst, 0.5f);
 }
 
 static void flatten_double_cubic_extrema(SkScalar coords[14]) {
@@ -654,6 +633,75 @@ int SkChopCubicAtInflections(const SkPoint src[], SkPoint dst[10]) {
     return count + 1;
 }
 
+// See http://http.developer.nvidia.com/GPUGems3/gpugems3_ch25.html (from the book GPU Gems 3)
+// discr(I) = d0^2 * (3*d1^2 - 4*d0*d2)
+// Classification:
+// discr(I) > 0        Serpentine
+// discr(I) = 0        Cusp
+// discr(I) < 0        Loop
+// d0 = d1 = 0         Quadratic
+// d0 = d1 = d2 = 0    Line
+// p0 = p1 = p2 = p3   Point
+static SkCubicType classify_cubic(const SkPoint p[4], const SkScalar d[3]) {
+    if (p[0] == p[1] && p[0] == p[2] && p[0] == p[3]) {
+        return kPoint_SkCubicType;
+    }
+    const SkScalar discr = d[0] * d[0] * (3.f * d[1] * d[1] - 4.f * d[0] * d[2]);
+    if (discr > SK_ScalarNearlyZero) {
+        return kSerpentine_SkCubicType;
+    } else if (discr < -SK_ScalarNearlyZero) {
+        return kLoop_SkCubicType;
+    } else {
+        if (0.f == d[0] && 0.f == d[1]) {
+            return (0.f == d[2] ? kLine_SkCubicType : kQuadratic_SkCubicType);
+        } else {
+            return kCusp_SkCubicType;
+        }
+    }
+}
+
+// Assumes the third component of points is 1.
+// Calcs p0 . (p1 x p2)
+static SkScalar calc_dot_cross_cubic(const SkPoint& p0, const SkPoint& p1, const SkPoint& p2) {
+    const SkScalar xComp = p0.fX * (p1.fY - p2.fY);
+    const SkScalar yComp = p0.fY * (p2.fX - p1.fX);
+    const SkScalar wComp = p1.fX * p2.fY - p1.fY * p2.fX;
+    return (xComp + yComp + wComp);
+}
+
+// Calc coefficients of I(s,t) where roots of I are inflection points of curve
+// I(s,t) = t*(3*d0*s^2 - 3*d1*s*t + d2*t^2)
+// d0 = a1 - 2*a2+3*a3
+// d1 = -a2 + 3*a3
+// d2 = 3*a3
+// a1 = p0 . (p3 x p2)
+// a2 = p1 . (p0 x p3)
+// a3 = p2 . (p1 x p0)
+// Places the values of d1, d2, d3 in array d passed in
+static void calc_cubic_inflection_func(const SkPoint p[4], SkScalar d[3]) {
+    SkScalar a1 = calc_dot_cross_cubic(p[0], p[3], p[2]);
+    SkScalar a2 = calc_dot_cross_cubic(p[1], p[0], p[3]);
+    SkScalar a3 = calc_dot_cross_cubic(p[2], p[1], p[0]);
+
+    // need to scale a's or values in later calculations will grow to high
+    SkScalar max = SkScalarAbs(a1);
+    max = SkMaxScalar(max, SkScalarAbs(a2));
+    max = SkMaxScalar(max, SkScalarAbs(a3));
+    max = 1.f/max;
+    a1 = a1 * max;
+    a2 = a2 * max;
+    a3 = a3 * max;
+
+    d[2] = 3.f * a3;
+    d[1] = d[2] - a2;
+    d[0] = d[1] - a2 + a1;
+}
+
+SkCubicType SkClassifyCubic(const SkPoint src[4], SkScalar d[3]) {
+    calc_cubic_inflection_func(src, d);
+    return classify_cubic(src, d);
+}
+
 template <typename T> void bubble_sort(T array[], int count) {
     for (int i = count - 1; i > 0; --i)
         for (int j = i; j > 0; --j)
@@ -864,7 +912,7 @@ int SkChopCubicAtMaxCurvature(const SkPoint src[4], SkPoint dst[13],
                               SkScalar tValues[3]) {
     SkScalar    t_storage[3];
 
-    if (tValues == NULL) {
+    if (tValues == nullptr) {
         tValues = t_storage;
     }
 
@@ -880,128 +928,31 @@ int SkChopCubicAtMaxCurvature(const SkPoint src[4], SkPoint dst[13],
     return count + 1;
 }
 
-bool SkXRayCrossesMonotonicCubic(const SkXRay& pt, const SkPoint cubic[4],
-                                 bool* ambiguous) {
-    if (ambiguous) {
-        *ambiguous = false;
-    }
+#include "../pathops/SkPathOpsCubic.h"
 
-    // Find the minimum and maximum y of the extrema, which are the
-    // first and last points since this cubic is monotonic
-    SkScalar min_y = SkMinScalar(cubic[0].fY, cubic[3].fY);
-    SkScalar max_y = SkMaxScalar(cubic[0].fY, cubic[3].fY);
+typedef int (SkDCubic::*InterceptProc)(double intercept, double roots[3]) const;
 
-    if (pt.fY == cubic[0].fY
-        || pt.fY < min_y
-        || pt.fY > max_y) {
-        // The query line definitely does not cross the curve
-        if (ambiguous) {
-            *ambiguous = (pt.fY == cubic[0].fY);
-        }
-        return false;
-    }
-
-    bool pt_at_extremum = (pt.fY == cubic[3].fY);
-
-    SkScalar min_x =
-        SkMinScalar(
-            SkMinScalar(
-                SkMinScalar(cubic[0].fX, cubic[1].fX),
-                cubic[2].fX),
-            cubic[3].fX);
-    if (pt.fX < min_x) {
-        // The query line definitely crosses the curve
-        if (ambiguous) {
-            *ambiguous = pt_at_extremum;
-        }
-        return true;
-    }
-
-    SkScalar max_x =
-        SkMaxScalar(
-            SkMaxScalar(
-                SkMaxScalar(cubic[0].fX, cubic[1].fX),
-                cubic[2].fX),
-            cubic[3].fX);
-    if (pt.fX > max_x) {
-        // The query line definitely does not cross the curve
-        return false;
-    }
-
-    // Do a binary search to find the parameter value which makes y as
-    // close as possible to the query point. See whether the query
-    // line's origin is to the left of the associated x coordinate.
-
-    // kMaxIter is chosen as the number of mantissa bits for a float,
-    // since there's no way we are going to get more precision by
-    // iterating more times than that.
-    const int kMaxIter = 23;
-    SkPoint eval;
-    int iter = 0;
-    SkScalar upper_t;
-    SkScalar lower_t;
-    // Need to invert direction of t parameter if cubic goes up
-    // instead of down
-    if (cubic[3].fY > cubic[0].fY) {
-        upper_t = SK_Scalar1;
-        lower_t = 0;
-    } else {
-        upper_t = 0;
-        lower_t = SK_Scalar1;
-    }
-    do {
-        SkScalar t = SkScalarAve(upper_t, lower_t);
-        SkEvalCubicAt(cubic, t, &eval, NULL, NULL);
-        if (pt.fY > eval.fY) {
-            lower_t = t;
-        } else {
-            upper_t = t;
-        }
-    } while (++iter < kMaxIter
-             && !SkScalarNearlyZero(eval.fY - pt.fY));
-    if (pt.fX <= eval.fX) {
-        if (ambiguous) {
-            *ambiguous = pt_at_extremum;
+static bool cubic_dchop_at_intercept(const SkPoint src[4], SkScalar intercept, SkPoint dst[7],
+                                     InterceptProc method) {
+    SkDCubic cubic;
+    double roots[3];
+    int count = (cubic.set(src).*method)(intercept, roots);
+    if (count > 0) {
+        SkDCubicPair pair = cubic.chopAt(roots[0]);
+        for (int i = 0; i < 7; ++i) {
+            dst[i] = pair.pts[i].asSkPoint();
         }
         return true;
     }
     return false;
 }
 
-int SkNumXRayCrossingsForCubic(const SkXRay& pt,
-                               const SkPoint cubic[4],
-                               bool* ambiguous) {
-    int num_crossings = 0;
-    SkPoint monotonic_cubics[10];
-    int num_monotonic_cubics = SkChopCubicAtYExtrema(cubic, monotonic_cubics);
-    if (ambiguous) {
-        *ambiguous = false;
-    }
-    bool locally_ambiguous;
-    if (SkXRayCrossesMonotonicCubic(pt,
-                                    &monotonic_cubics[0],
-                                    &locally_ambiguous))
-        ++num_crossings;
-    if (ambiguous) {
-        *ambiguous |= locally_ambiguous;
-    }
-    if (num_monotonic_cubics > 0)
-        if (SkXRayCrossesMonotonicCubic(pt,
-                                        &monotonic_cubics[3],
-                                        &locally_ambiguous))
-            ++num_crossings;
-    if (ambiguous) {
-        *ambiguous |= locally_ambiguous;
-    }
-    if (num_monotonic_cubics > 1)
-        if (SkXRayCrossesMonotonicCubic(pt,
-                                        &monotonic_cubics[6],
-                                        &locally_ambiguous))
-            ++num_crossings;
-    if (ambiguous) {
-        *ambiguous |= locally_ambiguous;
-    }
-    return num_crossings;
+bool SkChopMonoCubicAtY(SkPoint src[4], SkScalar y, SkPoint dst[7]) {
+    return cubic_dchop_at_intercept(src, y, dst, &SkDCubic::horizontalIntersect);
+}
+
+bool SkChopMonoCubicAtX(SkPoint src[4], SkScalar x, SkPoint dst[7]) {
+    return cubic_dchop_at_intercept(src, x, dst, &SkDCubic::verticalIntersect);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1210,7 +1161,7 @@ static SkScalar conic_eval_pos(const SkScalar src[], SkScalar w, SkScalar t) {
     A = -B;
     SkScalar denom = SkScalarMulAdd(SkScalarMulAdd(A, t, B), t, C);
 
-    return SkScalarDiv(numer, denom);
+    return numer / denom;
 }
 
 // F' = 2 (C t (1 + t (-1 + w)) - A (-1 + t) (t (-1 + w) - w) + B (1 - 2 t) w)
@@ -1237,12 +1188,6 @@ static void conic_deriv_coeff(const SkScalar src[],
     coeff[2] = wP10;
 }
 
-static SkScalar conic_eval_tan(const SkScalar coord[], SkScalar w, SkScalar t) {
-    SkScalar coeff[3];
-    conic_deriv_coeff(coord, w, coeff);
-    return t * (t * coeff[0] + coeff[1]) + coeff[2];
-}
-
 static bool conic_find_extrema(const SkScalar src[], SkScalar w, SkScalar* t) {
     SkScalar coeff[3];
     conic_deriv_coeff(src, w, coeff);
@@ -1293,8 +1238,7 @@ void SkConic::evalAt(SkScalar t, SkPoint* pt, SkVector* tangent) const {
                 conic_eval_pos(&fPts[0].fY, fW, t));
     }
     if (tangent) {
-        tangent->set(conic_eval_tan(&fPts[0].fX, fW, t),
-                     conic_eval_tan(&fPts[0].fY, fW, t));
+        *tangent = evalTangentAt(t);
     }
 }
 
@@ -1326,28 +1270,80 @@ void SkConic::chopAt(SkScalar t, SkConic dst[2]) const {
     dst[1].fW = tmp2[2].fZ / root;
 }
 
+static Sk2s times_2(const Sk2s& value) {
+    return value + value;
+}
+
+SkPoint SkConic::evalAt(SkScalar t) const {
+    Sk2s p0 = from_point(fPts[0]);
+    Sk2s p1 = from_point(fPts[1]);
+    Sk2s p2 = from_point(fPts[2]);
+    Sk2s tt(t);
+    Sk2s ww(fW);
+    Sk2s one(1);
+
+    Sk2s p1w = p1 * ww;
+    Sk2s C = p0;
+    Sk2s A = p2 - times_2(p1w) + p0;
+    Sk2s B = times_2(p1w - C);
+    Sk2s numer = quad_poly_eval(A, B, C, tt);
+
+    B = times_2(ww - one);
+    A = Sk2s(0)-B;
+    Sk2s denom = quad_poly_eval(A, B, one, tt);
+
+    return to_point(numer / denom);
+}
+
+SkVector SkConic::evalTangentAt(SkScalar t) const {
+    // The derivative equation returns a zero tangent vector when t is 0 or 1,
+    // and the control point is equal to the end point.
+    // In this case, use the conic endpoints to compute the tangent.
+    if ((t == 0 && fPts[0] == fPts[1]) || (t == 1 && fPts[1] == fPts[2])) {
+        return fPts[2] - fPts[0];
+    }
+    Sk2s p0 = from_point(fPts[0]);
+    Sk2s p1 = from_point(fPts[1]);
+    Sk2s p2 = from_point(fPts[2]);
+    Sk2s ww(fW);
+
+    Sk2s p20 = p2 - p0;
+    Sk2s p10 = p1 - p0;
+
+    Sk2s C = ww * p10;
+    Sk2s A = ww * p20 - p20;
+    Sk2s B = p20 - C - C;
+
+    return to_vector(quad_poly_eval(A, B, C, Sk2s(t)));
+}
+
 static SkScalar subdivide_w_value(SkScalar w) {
     return SkScalarSqrt(SK_ScalarHalf + w * SK_ScalarHalf);
 }
 
-void SkConic::chop(SkConic dst[2]) const {
-    SkScalar scale = SkScalarInvert(SK_Scalar1 + fW);
-    SkScalar p1x = fW * fPts[1].fX;
-    SkScalar p1y = fW * fPts[1].fY;
-    SkScalar mx = (fPts[0].fX + 2 * p1x + fPts[2].fX) * scale * SK_ScalarHalf;
-    SkScalar my = (fPts[0].fY + 2 * p1y + fPts[2].fY) * scale * SK_ScalarHalf;
+static Sk2s twice(const Sk2s& value) {
+    return value + value;
+}
+
+void SkConic::chop(SkConic * SK_RESTRICT dst) const {
+    Sk2s scale = Sk2s(SkScalarInvert(SK_Scalar1 + fW));
+    SkScalar newW = subdivide_w_value(fW);
+
+    Sk2s p0 = from_point(fPts[0]);
+    Sk2s p1 = from_point(fPts[1]);
+    Sk2s p2 = from_point(fPts[2]);
+    Sk2s ww(fW);
+
+    Sk2s wp1 = ww * p1;
+    Sk2s m = (p0 + twice(wp1) + p2) * scale * Sk2s(0.5f);
 
     dst[0].fPts[0] = fPts[0];
-    dst[0].fPts[1].set((fPts[0].fX + p1x) * scale,
-                       (fPts[0].fY + p1y) * scale);
-    dst[0].fPts[2].set(mx, my);
-
-    dst[1].fPts[0].set(mx, my);
-    dst[1].fPts[1].set((p1x + fPts[2].fX) * scale,
-                       (p1y + fPts[2].fY) * scale);
+    dst[0].fPts[1] = to_point((p0 + wp1) * scale);
+    dst[0].fPts[2] = dst[1].fPts[0] = to_point(m);
+    dst[1].fPts[1] = to_point((wp1 + p2) * scale);
     dst[1].fPts[2] = fPts[2];
 
-    dst[0].fW = dst[1].fW = subdivide_w_value(fW);
+    dst[0].fW = dst[1].fW = newW;
 }
 
 /*
@@ -1370,15 +1366,42 @@ bool SkConic::asQuadTol(SkScalar tol) const {
     return (x * x + y * y) <= tol * tol;
 }
 
-int SkConic::computeQuadPOW2(SkScalar tol) const {
-    AS_QUAD_ERROR_SETUP
-    SkScalar error = SkScalarSqrt(x * x + y * y) - tol;
+// Limit the number of suggested quads to approximate a conic
+#define kMaxConicToQuadPOW2     5
 
-    if (error <= 0) {
+int SkConic::computeQuadPOW2(SkScalar tol) const {
+    if (tol < 0 || !SkScalarIsFinite(tol)) {
         return 0;
     }
-    uint32_t ierr = (uint32_t)error;
-    return (34 - SkCLZ(ierr)) >> 1;
+
+    AS_QUAD_ERROR_SETUP
+
+    SkScalar error = SkScalarSqrt(x * x + y * y);
+    int pow2;
+    for (pow2 = 0; pow2 < kMaxConicToQuadPOW2; ++pow2) {
+        if (error <= tol) {
+            break;
+        }
+        error *= 0.25f;
+    }
+    // float version -- using ceil gives the same results as the above.
+    if (false) {
+        SkScalar err = SkScalarSqrt(x * x + y * y);
+        if (err <= tol) {
+            return 0;
+        }
+        SkScalar tol2 = tol * tol;
+        if (tol2 == 0) {
+            return kMaxConicToQuadPOW2;
+        }
+        SkScalar fpow2 = SkScalarLog2((x * x + y * y) / tol2) * 0.25f;
+        int altPow2 = SkScalarCeilToInt(fpow2);
+        if (altPow2 != pow2) {
+            SkDebugf("pow2 %d altPow2 %d fbits %g err %g tol %g\n", pow2, altPow2, fpow2, err, tol);
+        }
+        pow2 = altPow2;
+    }
+    return pow2;
 }
 
 static SkPoint* subdivide(const SkConic& src, SkPoint pts[], int level) {
@@ -1462,7 +1485,115 @@ void SkConic::computeFastBounds(SkRect* bounds) const {
     bounds->set(fPts, 3);
 }
 
+#if 0  // unimplemented
 bool SkConic::findMaxCurvature(SkScalar* t) const {
     // TODO: Implement me
     return false;
 }
+#endif
+
+SkScalar SkConic::TransformW(const SkPoint pts[], SkScalar w,
+                             const SkMatrix& matrix) {
+    if (!matrix.hasPerspective()) {
+        return w;
+    }
+
+    SkP3D src[3], dst[3];
+
+    ratquad_mapTo3D(pts, w, src);
+
+    matrix.mapHomogeneousPoints(&dst[0].fX, &src[0].fX, 3);
+
+    // w' = sqrt(w1*w1/w0*w2)
+    SkScalar w0 = dst[0].fZ;
+    SkScalar w1 = dst[1].fZ;
+    SkScalar w2 = dst[2].fZ;
+    w = SkScalarSqrt((w1 * w1) / (w0 * w2));
+    return w;
+}
+
+int SkConic::BuildUnitArc(const SkVector& uStart, const SkVector& uStop, SkRotationDirection dir,
+                          const SkMatrix* userMatrix, SkConic dst[kMaxConicsForArc]) {
+    // rotate by x,y so that uStart is (1.0)
+    SkScalar x = SkPoint::DotProduct(uStart, uStop);
+    SkScalar y = SkPoint::CrossProduct(uStart, uStop);
+
+    SkScalar absY = SkScalarAbs(y);
+
+    // check for (effectively) coincident vectors
+    // this can happen if our angle is nearly 0 or nearly 180 (y == 0)
+    // ... we use the dot-prod to distinguish between 0 and 180 (x > 0)
+    if (absY <= SK_ScalarNearlyZero && x > 0 && ((y >= 0 && kCW_SkRotationDirection == dir) ||
+                                                 (y <= 0 && kCCW_SkRotationDirection == dir))) {
+        return 0;
+    }
+
+    if (dir == kCCW_SkRotationDirection) {
+        y = -y;
+    }
+
+    // We decide to use 1-conic per quadrant of a circle. What quadrant does [xy] lie in?
+    //      0 == [0  .. 90)
+    //      1 == [90 ..180)
+    //      2 == [180..270)
+    //      3 == [270..360)
+    //
+    int quadrant = 0;
+    if (0 == y) {
+        quadrant = 2;        // 180
+        SkASSERT(SkScalarAbs(x + SK_Scalar1) <= SK_ScalarNearlyZero);
+    } else if (0 == x) {
+        SkASSERT(absY - SK_Scalar1 <= SK_ScalarNearlyZero);
+        quadrant = y > 0 ? 1 : 3; // 90 : 270
+    } else {
+        if (y < 0) {
+            quadrant += 2;
+        }
+        if ((x < 0) != (y < 0)) {
+            quadrant += 1;
+        }
+    }
+
+    const SkPoint quadrantPts[] = {
+        { 1, 0 }, { 1, 1 }, { 0, 1 }, { -1, 1 }, { -1, 0 }, { -1, -1 }, { 0, -1 }, { 1, -1 }
+    };
+    const SkScalar quadrantWeight = SK_ScalarRoot2Over2;
+
+    int conicCount = quadrant;
+    for (int i = 0; i < conicCount; ++i) {
+        dst[i].set(&quadrantPts[i * 2], quadrantWeight);
+    }
+
+    // Now compute any remaing (sub-90-degree) arc for the last conic
+    const SkPoint finalP = { x, y };
+    const SkPoint& lastQ = quadrantPts[quadrant * 2];  // will already be a unit-vector
+    const SkScalar dot = SkVector::DotProduct(lastQ, finalP);
+    SkASSERT(0 <= dot && dot <= SK_Scalar1 + SK_ScalarNearlyZero);
+
+    if (dot < 1) {
+        SkVector offCurve = { lastQ.x() + x, lastQ.y() + y };
+        // compute the bisector vector, and then rescale to be the off-curve point.
+        // we compute its length from cos(theta/2) = length / 1, using half-angle identity we get
+        // length = sqrt(2 / (1 + cos(theta)). We already have cos() when to computed the dot.
+        // This is nice, since our computed weight is cos(theta/2) as well!
+        //
+        const SkScalar cosThetaOver2 = SkScalarSqrt((1 + dot) / 2);
+        offCurve.setLength(SkScalarInvert(cosThetaOver2));
+        dst[conicCount].set(lastQ, offCurve, finalP, cosThetaOver2);
+        conicCount += 1;
+    }
+
+    // now handle counter-clockwise and the initial unitStart rotation
+    SkMatrix    matrix;
+    matrix.setSinCos(uStart.fY, uStart.fX);
+    if (dir == kCCW_SkRotationDirection) {
+        matrix.preScale(SK_Scalar1, -SK_Scalar1);
+    }
+    if (userMatrix) {
+        matrix.postConcat(*userMatrix);
+    }
+    for (int i = 0; i < conicCount; ++i) {
+        matrix.mapPoints(dst[i].fPts, 3);
+    }
+    return conicCount;
+}
diff --git a/gfx/skia/skia/src/core/SkGeometry.h b/gfx/skia/skia/src/core/SkGeometry.h
index 119cfc68db54..79cad2eee0b3 100644
--- a/gfx/skia/skia/src/core/SkGeometry.h
+++ b/gfx/skia/skia/src/core/SkGeometry.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,26 +5,26 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkGeometry_DEFINED
 #define SkGeometry_DEFINED
 
 #include "SkMatrix.h"
+#include "SkNx.h"
 
-/** An XRay is a half-line that runs from the specific point/origin to
-    +infinity in the X direction. e.g. XRay(3,5) is the half-line
-    (3,5)....(infinity, 5)
- */
-typedef SkPoint SkXRay;
+static inline Sk2s from_point(const SkPoint& point) {
+    return Sk2s::Load(&point.fX);
+}
 
-/** Given a line segment from pts[0] to pts[1], and an xray, return true if
-    they intersect. Optional outgoing "ambiguous" argument indicates
-    whether the answer is ambiguous because the query occurred exactly at
-    one of the endpoints' y coordinates, indicating that another query y
-    coordinate is preferred for robustness.
-*/
-bool SkXRayCrossesLine(const SkXRay& pt, const SkPoint pts[2],
-                       bool* ambiguous = NULL);
+static inline SkPoint to_point(const Sk2s& x) {
+    SkPoint point;
+    x.store(&point.fX);
+    return point;
+}
+
+static inline Sk2s sk2s_cubic_eval(const Sk2s& A, const Sk2s& B, const Sk2s& C, const Sk2s& D,
+                                   const Sk2s& t) {
+    return ((A * t + B) * t + C) * t + D;
+}
 
 /** Given a quadratic equation Ax^2 + Bx + C = 0, return 0, 1, 2 roots for the
     equation.
@@ -34,13 +33,23 @@ int SkFindUnitQuadRoots(SkScalar A, SkScalar B, SkScalar C, SkScalar roots[2]);
 
 ///////////////////////////////////////////////////////////////////////////////
 
+SkPoint SkEvalQuadAt(const SkPoint src[3], SkScalar t);
+SkPoint SkEvalQuadTangentAt(const SkPoint src[3], SkScalar t);
+
 /** Set pt to the point on the src quadratic specified by t. t must be
     0 <= t <= 1.0
 */
-void SkEvalQuadAt(const SkPoint src[3], SkScalar t, SkPoint* pt,
-                  SkVector* tangent = NULL);
-void SkEvalQuadAtHalf(const SkPoint src[3], SkPoint* pt,
-                      SkVector* tangent = NULL);
+void SkEvalQuadAt(const SkPoint src[3], SkScalar t, SkPoint* pt, SkVector* tangent = nullptr);
+
+/**
+ *  output is : eval(t) == coeff[0] * t^2 + coeff[1] * t + coeff[2]
+ */
+void SkQuadToCoeff(const SkPoint pts[3], SkPoint coeff[3]);
+
+/**
+ *  output is : eval(t) == coeff[0] * t^3 + coeff[1] * t^2 + coeff[2] * t + coeff[3]
+ */
+void SkCubicToCoeff(const SkPoint pts[4], SkPoint coeff[4]);
 
 /** Given a src quadratic bezier, chop it at the specified t value,
     where 0 < t < 1, and return the two new quadratics in dst:
@@ -76,7 +85,7 @@ int SkChopQuadAtXExtrema(const SkPoint src[3], SkPoint dst[5]);
     curvature exists on the segment, returns the t value for this
     point along the curve. Otherwise it will return a value of 0.
 */
-float SkFindQuadMaxCurvature(const SkPoint src[3]);
+SkScalar SkFindQuadMaxCurvature(const SkPoint src[3]);
 
 /** Given 3 points on a quadratic bezier, divide it into 2 quadratics
     if the point of maximum curvature exists on the quad segment.
@@ -95,11 +104,6 @@ SK_API void SkConvertQuadToCubic(const SkPoint src[3], SkPoint dst[4]);
 
 ///////////////////////////////////////////////////////////////////////////////
 
-/** Convert from parametric from (pts) to polynomial coefficients
-    coeff[0]*T^3 + coeff[1]*T^2 + coeff[2]*T + coeff[3]
-*/
-void SkGetCubicCoeff(const SkPoint pts[4], SkScalar cx[4], SkScalar cy[4]);
-
 /** Set pt to the point on the src cubic specified by t. t must be
     0 <= t <= 1.0
 */
@@ -111,6 +115,7 @@ void SkEvalCubicAt(const SkPoint src[4], SkScalar t, SkPoint* locOrNull,
     dst[0..3] and dst[3..6]
 */
 void SkChopCubicAt(const SkPoint src[4], SkPoint dst[7], SkScalar t);
+
 /** Given a src cubic bezier, chop it at the specified t values,
     where 0 < t < 1, and return the new cubics in dst:
     dst[0..3],dst[3..6],...,dst[3*t_count..3*(t_count+1)]
@@ -159,37 +164,24 @@ int SkChopCubicAtInflections(const SkPoint src[4], SkPoint dst[10]);
 
 int SkFindCubicMaxCurvature(const SkPoint src[4], SkScalar tValues[3]);
 int SkChopCubicAtMaxCurvature(const SkPoint src[4], SkPoint dst[13],
-                              SkScalar tValues[3] = NULL);
+                              SkScalar tValues[3] = nullptr);
 
-/** Given a monotonic cubic bezier, determine whether an xray intersects the
-    cubic.
-    By definition the cubic is open at the starting point; in other
-    words, if pt.fY is equivalent to cubic[0].fY, and pt.fX is to the
-    left of the curve, the line is not considered to cross the curve,
-    but if it is equal to cubic[3].fY then it is considered to
-    cross.
-    Optional outgoing "ambiguous" argument indicates whether the answer is
-    ambiguous because the query occurred exactly at one of the endpoints' y
-    coordinates, indicating that another query y coordinate is preferred
-    for robustness.
- */
-bool SkXRayCrossesMonotonicCubic(const SkXRay& pt, const SkPoint cubic[4],
-                                 bool* ambiguous = NULL);
+bool SkChopMonoCubicAtX(SkPoint src[4], SkScalar y, SkPoint dst[7]);
+bool SkChopMonoCubicAtY(SkPoint src[4], SkScalar x, SkPoint dst[7]);
 
-/** Given an arbitrary cubic bezier, return the number of times an xray crosses
-    the cubic. Valid return values are [0..3]
-    By definition the cubic is open at the starting point; in other
-    words, if pt.fY is equivalent to cubic[0].fY, and pt.fX is to the
-    left of the curve, the line is not considered to cross the curve,
-    but if it is equal to cubic[3].fY then it is considered to
-    cross.
-    Optional outgoing "ambiguous" argument indicates whether the answer is
-    ambiguous because the query occurred exactly at one of the endpoints' y
-    coordinates or at a tangent point, indicating that another query y
-    coordinate is preferred for robustness.
- */
-int SkNumXRayCrossingsForCubic(const SkXRay& pt, const SkPoint cubic[4],
-                               bool* ambiguous = NULL);
+enum SkCubicType {
+    kSerpentine_SkCubicType,
+    kCusp_SkCubicType,
+    kLoop_SkCubicType,
+    kQuadratic_SkCubicType,
+    kLine_SkCubicType,
+    kPoint_SkCubicType
+};
+
+/** Returns the cubic classification. Pass scratch storage for computing inflection data,
+    which can be used with additional work to find the loop intersections and so on.
+*/
+SkCubicType SkClassifyCubic(const SkPoint p[4], SkScalar inflection[3]);
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -212,8 +204,19 @@ enum SkRotationDirection {
 int SkBuildQuadArc(const SkVector& unitStart, const SkVector& unitStop,
                    SkRotationDirection, const SkMatrix*, SkPoint quadPoints[]);
 
-// experimental
 struct SkConic {
+    SkConic() {}
+    SkConic(const SkPoint& p0, const SkPoint& p1, const SkPoint& p2, SkScalar w) {
+        fPts[0] = p0;
+        fPts[1] = p1;
+        fPts[2] = p2;
+        fW = w;
+    }
+    SkConic(const SkPoint pts[3], SkScalar w) {
+        memcpy(fPts, pts, sizeof(fPts));
+        fW = w;
+    }
+
     SkPoint  fPts[3];
     SkScalar fW;
 
@@ -222,6 +225,13 @@ struct SkConic {
         fW = w;
     }
 
+    void set(const SkPoint& p0, const SkPoint& p1, const SkPoint& p2, SkScalar w) {
+        fPts[0] = p0;
+        fPts[1] = p1;
+        fPts[2] = p2;
+        fW = w;
+    }
+
     /**
      *  Given a t-value [0...1] return its position and/or tangent.
      *  If pos is not null, return its position at the t-value.
@@ -229,10 +239,13 @@ struct SkConic {
      *  tangent value's length is arbitrary, and only its direction should
      *  be used.
      */
-    void evalAt(SkScalar t, SkPoint* pos, SkVector* tangent = NULL) const;
+    void evalAt(SkScalar t, SkPoint* pos, SkVector* tangent = nullptr) const;
     void chopAt(SkScalar t, SkConic dst[2]) const;
     void chop(SkConic dst[2]) const;
 
+    SkPoint evalAt(SkScalar t) const;
+    SkVector evalTangentAt(SkScalar t) const;
+
     void computeAsQuadError(SkVector* err) const;
     bool asQuadTol(SkScalar tol) const;
 
@@ -263,7 +276,15 @@ struct SkConic {
      *
      *  @return  true if max curvature found inside 0..1 range, false otherwise
      */
-    bool findMaxCurvature(SkScalar* t) const;
+//    bool findMaxCurvature(SkScalar* t) const;  // unimplemented
+
+    static SkScalar TransformW(const SkPoint[3], SkScalar w, const SkMatrix&);
+
+    enum {
+        kMaxConicsForArc = 5
+    };
+    static int BuildUnitArc(const SkVector& start, const SkVector& stop, SkRotationDirection,
+                            const SkMatrix*, SkConic conics[kMaxConicsForArc]);
 };
 
 #include "SkTemplates.h"
diff --git a/gfx/skia/skia/src/core/SkGlyph.h b/gfx/skia/skia/src/core/SkGlyph.h
index 73afb132d649..92f974bc2cf4 100644
--- a/gfx/skia/skia/src/core/SkGlyph.h
+++ b/gfx/skia/skia/src/core/SkGlyph.h
@@ -8,11 +8,13 @@
 #ifndef SkGlyph_DEFINED
 #define SkGlyph_DEFINED
 
+#include "SkChecksum.h"
 #include "SkTypes.h"
 #include "SkFixed.h"
 #include "SkMask.h"
 
 class SkPath;
+class SkGlyphCache;
 
 // needs to be != to any valid SkMask::Format
 #define MASK_FORMAT_UNKNOWN         (0xFF)
@@ -20,25 +22,43 @@ class SkPath;
 
 #define kMaxGlyphWidth (1<<13)
 
-struct SkGlyph {
+SK_BEGIN_REQUIRE_DENSE
+class SkGlyph {
+    enum {
+        kSubBits = 2,
+        kSubMask = ((1 << kSubBits) - 1),
+        kSubShift = 24, // must be large enough for glyphs and unichars
+        kCodeMask = ((1 << kSubShift) - 1),
+        // relative offsets for X and Y subpixel bits
+        kSubShiftX = kSubBits,
+        kSubShiftY = 0
+    };
+
+ public:
+    static const SkFixed kSubpixelRound = SK_FixedHalf >> SkGlyph::kSubBits;
+    // A value that can never be generated by MakeID.
+    static const uint32_t kImpossibleID = ~0;
     void*       fImage;
     SkPath*     fPath;
     SkFixed     fAdvanceX, fAdvanceY;
 
-    uint32_t    fID;
     uint16_t    fWidth, fHeight;
     int16_t     fTop, fLeft;
 
-    void*       fDistanceField;
     uint8_t     fMaskFormat;
     int8_t      fRsbDelta, fLsbDelta;  // used by auto-kerning
+    int8_t      fForceBW;
 
-    void init(uint32_t id) {
-        fID             = id;
-        fImage          = NULL;
-        fPath           = NULL;
-        fDistanceField  = NULL;
-        fMaskFormat     = MASK_FORMAT_UNKNOWN;
+    void initWithGlyphID(uint32_t glyph_id) {
+        this->initCommon(MakeID(glyph_id));
+    }
+
+    void initGlyphIdFrom(const SkGlyph& glyph) {
+        this->initCommon(glyph.fID);
+    }
+
+    void initGlyphFromCombinedID(uint32_t combined_id) {
+      this->initCommon(combined_id);
     }
 
     /**
@@ -48,9 +68,7 @@ struct SkGlyph {
         unsigned rb = width;
         if (SkMask::kBW_Format == format) {
             rb = (rb + 7) >> 3;
-        } else if (SkMask::kARGB32_Format == format ||
-                   SkMask::kLCD32_Format == format)
-        {
+        } else if (SkMask::kARGB32_Format == format) {
             rb <<= 2;
         } else if (SkMask::kLCD16_Format == format) {
             rb = SkAlign4(rb << 1);
@@ -76,12 +94,6 @@ struct SkGlyph {
         return ID2Code(fID);
     }
 
-    unsigned getGlyphID(unsigned baseGlyphCount) const {
-        unsigned code = ID2Code(fID);
-        SkASSERT(code >= baseGlyphCount);
-        return code - baseGlyphCount;
-    }
-
     unsigned getSubX() const {
         return ID2SubX(fID);
     }
@@ -102,16 +114,30 @@ struct SkGlyph {
      */
     void zeroMetrics();
 
-    enum {
-        kSubBits = 2,
-        kSubMask = ((1 << kSubBits) - 1),
-        kSubShift = 24, // must be large enough for glyphs and unichars
-        kCodeMask = ((1 << kSubShift) - 1),
-        // relative offsets for X and Y subpixel bits
-        kSubShiftX = kSubBits,
-        kSubShiftY = 0
+    void toMask(SkMask* mask) const;
+
+    class HashTraits {
+    public:
+        static uint32_t GetKey(const SkGlyph& glyph) {
+            return glyph.fID;
+        }
+        static uint32_t Hash(uint32_t glyphId) {
+            return SkChecksum::CheapMix(glyphId);
+        }
     };
 
+ private:
+    // TODO(herb) remove friend statement after SkGlyphCache cleanup.
+    friend class SkGlyphCache;
+
+    void initCommon(uint32_t id) {
+        fID             = id;
+        fImage          = nullptr;
+        fPath           = nullptr;
+        fMaskFormat     = MASK_FORMAT_UNKNOWN;
+        fForceBW        = 0;
+    }
+
     static unsigned ID2Code(uint32_t id) {
         return id & kCodeMask;
     }
@@ -134,6 +160,8 @@ struct SkGlyph {
     }
 
     static uint32_t MakeID(unsigned code) {
+        SkASSERT(code <= kCodeMask);
+        SkASSERT(code != kImpossibleID);
         return code;
     }
 
@@ -141,12 +169,20 @@ struct SkGlyph {
         SkASSERT(code <= kCodeMask);
         x = FixedToSub(x);
         y = FixedToSub(y);
-        return (x << (kSubShift + kSubShiftX)) |
-               (y << (kSubShift + kSubShiftY)) |
-               code;
+        uint32_t ID = (x << (kSubShift + kSubShiftX)) |
+                      (y << (kSubShift + kSubShiftY)) |
+                      code;
+        SkASSERT(ID != kImpossibleID);
+        return ID;
     }
 
-    void toMask(SkMask* mask) const;
+  // FIXME - This is needed because the Android frame work directly
+  // accesses fID. Remove when fID accesses are cleaned up.
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+  public:
+#endif
+    uint32_t    fID;
 };
+SK_END_REQUIRE_DENSE
 
 #endif
diff --git a/gfx/skia/skia/src/core/SkGlyphCache.cpp b/gfx/skia/skia/src/core/SkGlyphCache.cpp
old mode 100755
new mode 100644
index 2ab721aab464..1512dbf0e5dd
--- a/gfx/skia/skia/src/core/SkGlyphCache.cpp
+++ b/gfx/skia/skia/src/core/SkGlyphCache.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,66 +5,29 @@
  * found in the LICENSE file.
  */
 
-
 #include "SkGlyphCache.h"
 #include "SkGlyphCache_Globals.h"
-#include "SkDistanceFieldGen.h"
 #include "SkGraphics.h"
-#include "SkLazyPtr.h"
-#include "SkPaint.h"
+#include "SkOncePtr.h"
 #include "SkPath.h"
 #include "SkTemplates.h"
-#include "SkTLS.h"
+#include "SkTraceMemoryDump.h"
 #include "SkTypeface.h"
 
+#include <cctype>
+
 //#define SPEW_PURGE_STATUS
-//#define RECORD_HASH_EFFICIENCY
 
 namespace {
-
-SkGlyphCache_Globals* create_globals() {
-    return SkNEW_ARGS(SkGlyphCache_Globals, (SkGlyphCache_Globals::kYes_UseMutex));
-}
-
+const char gGlyphCacheDumpName[] = "skia/sk_glyph_cache";
 }  // namespace
 
 // Returns the shared globals
-static SkGlyphCache_Globals& getSharedGlobals() {
-    SK_DECLARE_STATIC_LAZY_PTR(SkGlyphCache_Globals, globals, create_globals);
-    return *globals.get();
+SK_DECLARE_STATIC_ONCE_PTR(SkGlyphCache_Globals, globals);
+static SkGlyphCache_Globals& get_globals() {
+    return *globals.get([]{ return new SkGlyphCache_Globals; });
 }
 
-// Returns the TLS globals (if set), or the shared globals
-static SkGlyphCache_Globals& getGlobals() {
-    SkGlyphCache_Globals* tls = SkGlyphCache_Globals::FindTLS();
-    return tls ? *tls : getSharedGlobals();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-#ifdef RECORD_HASH_EFFICIENCY
-    static uint32_t gHashSuccess;
-    static uint32_t gHashCollision;
-
-    static void RecordHashSuccess() {
-        gHashSuccess += 1;
-    }
-
-    static void RecordHashCollisionIf(bool pred) {
-        if (pred) {
-            gHashCollision += 1;
-
-            uint32_t total = gHashSuccess + gHashCollision;
-            SkDebugf("Font Cache Hash success rate: %d%%\n",
-                     100 * gHashSuccess / total);
-        }
-    }
-#else
-    #define RecordHashSuccess() (void)0
-    #define RecordHashCollisionIf(pred) (void)0
-#endif
-#define RecordHashCollision() RecordHashCollisionIf(true)
-
 ///////////////////////////////////////////////////////////////////////////////
 
 // so we don't grow our arrays a lot
@@ -74,67 +36,44 @@ static SkGlyphCache_Globals& getGlobals() {
 #define kMinAllocAmount     ((sizeof(SkGlyph) + kMinGlyphImageSize) * kMinGlyphCount)
 
 SkGlyphCache::SkGlyphCache(SkTypeface* typeface, const SkDescriptor* desc, SkScalerContext* ctx)
-        : fScalerContext(ctx), fGlyphAlloc(kMinAllocAmount) {
+    : fDesc(desc->copy())
+    , fScalerContext(ctx)
+    , fGlyphAlloc(kMinAllocAmount) {
     SkASSERT(typeface);
     SkASSERT(desc);
     SkASSERT(ctx);
 
-    fPrev = fNext = NULL;
+    fPrev = fNext = nullptr;
 
-    fDesc = desc->copy();
     fScalerContext->getFontMetrics(&fFontMetrics);
 
-    // init to 0 so that all of the pointers will be null
-    memset(fGlyphHash, 0, sizeof(fGlyphHash));
-    // init with 0xFF so that the charCode field will be -1, which is invalid
-    memset(fCharToGlyphHash, 0xFF, sizeof(fCharToGlyphHash));
-
     fMemoryUsed = sizeof(*this);
 
-    fGlyphArray.setReserve(kMinGlyphCount);
-
-    fAuxProcList = NULL;
+    fAuxProcList = nullptr;
 }
 
 SkGlyphCache::~SkGlyphCache() {
-#if 0
-    {
-        size_t ptrMem = fGlyphArray.count() * sizeof(SkGlyph*);
-        size_t glyphAlloc = fGlyphAlloc.totalCapacity();
-        size_t glyphHashUsed = 0;
-        size_t uniHashUsed = 0;
-        for (int i = 0; i < kHashCount; ++i) {
-            glyphHashUsed += fGlyphHash[i] ? sizeof(fGlyphHash[0]) : 0;
-            uniHashUsed += fCharToGlyphHash[i].fID != 0xFFFFFFFF ? sizeof(fCharToGlyphHash[0]) : 0;
-        }
-        size_t glyphUsed = fGlyphArray.count() * sizeof(SkGlyph);
-        size_t imageUsed = 0;
-        for (int i = 0; i < fGlyphArray.count(); ++i) {
-            const SkGlyph& g = *fGlyphArray[i];
-            if (g.fImage) {
-                imageUsed += g.fHeight * g.rowBytes();
-            }
-        }
-
-        printf("glyphPtrArray,%zu, Alloc,%zu, imageUsed,%zu, glyphUsed,%zu, glyphHashAlloc,%zu, glyphHashUsed,%zu, unicharHashAlloc,%zu, unicharHashUsed,%zu\n",
-                 ptrMem, glyphAlloc, imageUsed, glyphUsed, sizeof(fGlyphHash), glyphHashUsed, sizeof(fCharToGlyphHash), uniHashUsed);
-
-    }
-#endif
-    SkGlyph**   gptr = fGlyphArray.begin();
-    SkGlyph**   stop = fGlyphArray.end();
-    while (gptr < stop) {
-        SkPath* path = (*gptr)->fPath;
-        if (path) {
-            SkDELETE(path);
-        }
-        gptr += 1;
-    }
+    fGlyphMap.foreach ([](SkGlyph* g) { delete g->fPath; });
     SkDescriptor::Free(fDesc);
-    SkDELETE(fScalerContext);
+    delete fScalerContext;
     this->invokeAndRemoveAuxProcs();
 }
 
+SkGlyphCache::CharGlyphRec* SkGlyphCache::getCharGlyphRec(PackedUnicharID packedUnicharID) {
+    if (nullptr == fPackedUnicharIDToPackedGlyphID.get()) {
+        // Allocate the array.
+        fPackedUnicharIDToPackedGlyphID.reset(kHashCount);
+        // Initialize array to map character and position with the impossible glyph ID. This
+        // represents no mapping.
+        for (int i = 0; i <kHashCount; ++i) {
+            fPackedUnicharIDToPackedGlyphID[i].fPackedUnicharID = SkGlyph::kImpossibleID;
+            fPackedUnicharIDToPackedGlyphID[i].fPackedGlyphID = 0;
+        }
+    }
+
+    return &fPackedUnicharIDToPackedGlyphID[SkChecksum::CheapMix(packedUnicharID) & kHashMask];
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef SK_DEBUG
@@ -145,11 +84,11 @@ SkGlyphCache::~SkGlyphCache() {
 
 uint16_t SkGlyphCache::unicharToGlyph(SkUnichar charCode) {
     VALIDATE();
-    uint32_t id = SkGlyph::MakeID(charCode);
-    const CharGlyphRec& rec = fCharToGlyphHash[ID2HashIndex(id)];
+    PackedUnicharID packedUnicharID = SkGlyph::MakeID(charCode);
+    const CharGlyphRec& rec = *this->getCharGlyphRec(packedUnicharID);
 
-    if (rec.fID == id) {
-        return rec.fGlyph->getGlyphID();
+    if (rec.fPackedUnicharID == packedUnicharID) {
+        return SkGlyph::ID2Code(rec.fPackedGlyphID);
     } else {
         return fScalerContext->charToGlyphID(charCode);
     }
@@ -159,187 +98,108 @@ SkUnichar SkGlyphCache::glyphToUnichar(uint16_t glyphID) {
     return fScalerContext->glyphIDToChar(glyphID);
 }
 
-unsigned SkGlyphCache::getGlyphCount() {
+unsigned SkGlyphCache::getGlyphCount() const {
     return fScalerContext->getGlyphCount();
 }
 
+int SkGlyphCache::countCachedGlyphs() const {
+    return fGlyphMap.count();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 const SkGlyph& SkGlyphCache::getUnicharAdvance(SkUnichar charCode) {
     VALIDATE();
-    uint32_t id = SkGlyph::MakeID(charCode);
-    CharGlyphRec* rec = &fCharToGlyphHash[ID2HashIndex(id)];
-
-    if (rec->fID != id) {
-        // this ID is based on the UniChar
-        rec->fID = id;
-        // this ID is based on the glyph index
-        id = SkGlyph::MakeID(fScalerContext->charToGlyphID(charCode));
-        rec->fGlyph = this->lookupMetrics(id, kJustAdvance_MetricsType);
-    }
-    return *rec->fGlyph;
+    return *this->lookupByChar(charCode, kJustAdvance_MetricsType);
 }
 
 const SkGlyph& SkGlyphCache::getGlyphIDAdvance(uint16_t glyphID) {
     VALIDATE();
-    uint32_t id = SkGlyph::MakeID(glyphID);
-    unsigned index = ID2HashIndex(id);
-    SkGlyph* glyph = fGlyphHash[index];
-
-    if (NULL == glyph || glyph->fID != id) {
-        glyph = this->lookupMetrics(glyphID, kJustAdvance_MetricsType);
-        fGlyphHash[index] = glyph;
-    }
-    return *glyph;
+    PackedGlyphID packedGlyphID = SkGlyph::MakeID(glyphID);
+    return *this->lookupByPackedGlyphID(packedGlyphID, kJustAdvance_MetricsType);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 const SkGlyph& SkGlyphCache::getUnicharMetrics(SkUnichar charCode) {
     VALIDATE();
-    uint32_t id = SkGlyph::MakeID(charCode);
-    CharGlyphRec* rec = &fCharToGlyphHash[ID2HashIndex(id)];
-
-    if (rec->fID != id) {
-        RecordHashCollisionIf(rec->fGlyph != NULL);
-        // this ID is based on the UniChar
-        rec->fID = id;
-        // this ID is based on the glyph index
-        id = SkGlyph::MakeID(fScalerContext->charToGlyphID(charCode));
-        rec->fGlyph = this->lookupMetrics(id, kFull_MetricsType);
-    } else {
-        RecordHashSuccess();
-        if (rec->fGlyph->isJustAdvance()) {
-            fScalerContext->getMetrics(rec->fGlyph);
-        }
-    }
-    SkASSERT(rec->fGlyph->isFullMetrics());
-    return *rec->fGlyph;
+    return *this->lookupByChar(charCode, kFull_MetricsType);
 }
 
-const SkGlyph& SkGlyphCache::getUnicharMetrics(SkUnichar charCode,
-                                               SkFixed x, SkFixed y) {
+const SkGlyph& SkGlyphCache::getUnicharMetrics(SkUnichar charCode, SkFixed x, SkFixed y) {
     VALIDATE();
-    uint32_t id = SkGlyph::MakeID(charCode, x, y);
-    CharGlyphRec* rec = &fCharToGlyphHash[ID2HashIndex(id)];
-
-    if (rec->fID != id) {
-        RecordHashCollisionIf(rec->fGlyph != NULL);
-        // this ID is based on the UniChar
-        rec->fID = id;
-        // this ID is based on the glyph index
-        id = SkGlyph::MakeID(fScalerContext->charToGlyphID(charCode), x, y);
-        rec->fGlyph = this->lookupMetrics(id, kFull_MetricsType);
-    } else {
-        RecordHashSuccess();
-        if (rec->fGlyph->isJustAdvance()) {
-            fScalerContext->getMetrics(rec->fGlyph);
-        }
-    }
-    SkASSERT(rec->fGlyph->isFullMetrics());
-    return *rec->fGlyph;
+    return *this->lookupByChar(charCode, kFull_MetricsType, x, y);
 }
 
 const SkGlyph& SkGlyphCache::getGlyphIDMetrics(uint16_t glyphID) {
     VALIDATE();
-    uint32_t id = SkGlyph::MakeID(glyphID);
-    unsigned index = ID2HashIndex(id);
-    SkGlyph* glyph = fGlyphHash[index];
-
-    if (NULL == glyph || glyph->fID != id) {
-        RecordHashCollisionIf(glyph != NULL);
-        glyph = this->lookupMetrics(glyphID, kFull_MetricsType);
-        fGlyphHash[index] = glyph;
-    } else {
-        RecordHashSuccess();
-        if (glyph->isJustAdvance()) {
-            fScalerContext->getMetrics(glyph);
-        }
-    }
-    SkASSERT(glyph->isFullMetrics());
-    return *glyph;
+    PackedGlyphID packedGlyphID = SkGlyph::MakeID(glyphID);
+    return *this->lookupByPackedGlyphID(packedGlyphID, kFull_MetricsType);
 }
 
-const SkGlyph& SkGlyphCache::getGlyphIDMetrics(uint16_t glyphID,
-                                               SkFixed x, SkFixed y) {
+const SkGlyph& SkGlyphCache::getGlyphIDMetrics(uint16_t glyphID, SkFixed x, SkFixed y) {
     VALIDATE();
-    uint32_t id = SkGlyph::MakeID(glyphID, x, y);
-    unsigned index = ID2HashIndex(id);
-    SkGlyph* glyph = fGlyphHash[index];
-
-    if (NULL == glyph || glyph->fID != id) {
-        RecordHashCollisionIf(glyph != NULL);
-        glyph = this->lookupMetrics(id, kFull_MetricsType);
-        fGlyphHash[index] = glyph;
-    } else {
-        RecordHashSuccess();
-        if (glyph->isJustAdvance()) {
-            fScalerContext->getMetrics(glyph);
-        }
-    }
-    SkASSERT(glyph->isFullMetrics());
-    return *glyph;
+    PackedGlyphID packedGlyphID = SkGlyph::MakeID(glyphID, x, y);
+    return *this->lookupByPackedGlyphID(packedGlyphID, kFull_MetricsType);
 }
 
-SkGlyph* SkGlyphCache::lookupMetrics(uint32_t id, MetricsType mtype) {
-    SkGlyph* glyph;
+SkGlyph* SkGlyphCache::lookupByChar(SkUnichar charCode, MetricsType type, SkFixed x, SkFixed y) {
+    PackedUnicharID id = SkGlyph::MakeID(charCode, x, y);
+    CharGlyphRec* rec = this->getCharGlyphRec(id);
+    if (rec->fPackedUnicharID != id) {
+        // this ID is based on the UniChar
+        rec->fPackedUnicharID = id;
+        // this ID is based on the glyph index
+        PackedGlyphID combinedID = SkGlyph::MakeID(fScalerContext->charToGlyphID(charCode), x, y);
+        rec->fPackedGlyphID = combinedID;
+        return this->lookupByPackedGlyphID(combinedID, type);
+    } else {
+        return this->lookupByPackedGlyphID(rec->fPackedGlyphID, type);
+    }
+}
 
-    int     hi = 0;
-    int     count = fGlyphArray.count();
+SkGlyph* SkGlyphCache::lookupByPackedGlyphID(PackedGlyphID packedGlyphID, MetricsType type) {
+    SkGlyph* glyph = fGlyphMap.find(packedGlyphID);
 
-    if (count) {
-        SkGlyph**   gptr = fGlyphArray.begin();
-        int     lo = 0;
-
-        hi = count - 1;
-        while (lo < hi) {
-            int mid = (hi + lo) >> 1;
-            if (gptr[mid]->fID < id) {
-                lo = mid + 1;
-            } else {
-                hi = mid;
-            }
-        }
-        glyph = gptr[hi];
-        if (glyph->fID == id) {
-            if (kFull_MetricsType == mtype && glyph->isJustAdvance()) {
-                fScalerContext->getMetrics(glyph);
-            }
-            return glyph;
-        }
-
-        // check if we need to bump hi before falling though to the allocator
-        if (glyph->fID < id) {
-            hi += 1;
+    if (nullptr == glyph) {
+        glyph = this->allocateNewGlyph(packedGlyphID, type);
+    } else {
+        if (type == kFull_MetricsType && glyph->isJustAdvance()) {
+           fScalerContext->getMetrics(glyph);
         }
     }
+    return glyph;
+}
 
-    // not found, but hi tells us where to inser the new glyph
+SkGlyph* SkGlyphCache::allocateNewGlyph(PackedGlyphID packedGlyphID, MetricsType mtype) {
     fMemoryUsed += sizeof(SkGlyph);
 
-    glyph = (SkGlyph*)fGlyphAlloc.alloc(sizeof(SkGlyph),
-                                        SkChunkAlloc::kThrow_AllocFailType);
-    glyph->init(id);
-    *fGlyphArray.insert(hi) = glyph;
-
-    if (kJustAdvance_MetricsType == mtype) {
-        fScalerContext->getAdvance(glyph);
-    } else {
-        SkASSERT(kFull_MetricsType == mtype);
-        fScalerContext->getMetrics(glyph);
+    SkGlyph* glyphPtr;
+    {
+        SkGlyph glyph;
+        glyph.initGlyphFromCombinedID(packedGlyphID);
+        glyphPtr = fGlyphMap.set(glyph);
     }
 
-    return glyph;
+    if (kJustAdvance_MetricsType == mtype) {
+        fScalerContext->getAdvance(glyphPtr);
+    } else {
+        SkASSERT(kFull_MetricsType == mtype);
+        fScalerContext->getMetrics(glyphPtr);
+    }
+
+    SkASSERT(glyphPtr->fID != SkGlyph::kImpossibleID);
+    return glyphPtr;
 }
 
 const void* SkGlyphCache::findImage(const SkGlyph& glyph) {
     if (glyph.fWidth > 0 && glyph.fWidth < kMaxGlyphWidth) {
-        if (NULL == glyph.fImage) {
+        if (nullptr == glyph.fImage) {
             size_t  size = glyph.computeImageSize();
             const_cast<SkGlyph&>(glyph).fImage = fGlyphAlloc.alloc(size,
                                         SkChunkAlloc::kReturnNil_AllocFailType);
             // check that alloc() actually succeeded
-            if (NULL != glyph.fImage) {
+            if (glyph.fImage) {
                 fScalerContext->getImage(glyph);
                 // TODO: the scaler may have changed the maskformat during
                 // getImage (e.g. from AA or LCD to BW) which means we may have
@@ -354,8 +214,8 @@ const void* SkGlyphCache::findImage(const SkGlyph& glyph) {
 
 const SkPath* SkGlyphCache::findPath(const SkGlyph& glyph) {
     if (glyph.fWidth) {
-        if (glyph.fPath == NULL) {
-            const_cast<SkGlyph&>(glyph).fPath = SkNEW(SkPath);
+        if (glyph.fPath == nullptr) {
+            const_cast<SkGlyph&>(glyph).fPath = new SkPath;
             fScalerContext->getPath(glyph, glyph.fPath);
             fMemoryUsed += sizeof(SkPath) +
                     glyph.fPath->countPoints() * sizeof(SkPoint);
@@ -364,43 +224,23 @@ const SkPath* SkGlyphCache::findPath(const SkGlyph& glyph) {
     return glyph.fPath;
 }
 
-const void* SkGlyphCache::findDistanceField(const SkGlyph& glyph) {
-    if (glyph.fWidth > 0 && glyph.fWidth < kMaxGlyphWidth) {
-        if (NULL == glyph.fDistanceField) {
-            size_t  size = SkComputeDistanceFieldSize(glyph.fWidth, glyph.fHeight);
-            if (size == 0) {
-                return NULL;
-            }
-            const void* image = this->findImage(glyph);
-            // now generate the distance field
-            if (NULL != image) {
-                const_cast<SkGlyph&>(glyph).fDistanceField = fGlyphAlloc.alloc(size,
-                                            SkChunkAlloc::kReturnNil_AllocFailType);
-                if (NULL != glyph.fDistanceField) {
-                    SkMask::Format maskFormat = static_cast<SkMask::Format>(glyph.fMaskFormat);
-                    if (SkMask::kA8_Format == maskFormat) {
-                        // make the distance field from the image
-                        SkGenerateDistanceFieldFromA8Image((unsigned char*)glyph.fDistanceField,
-                                                           (unsigned char*)glyph.fImage,
-                                                           glyph.fWidth, glyph.fHeight,
-                                                           glyph.rowBytes());
-                        fMemoryUsed += size;
-                    } else if (SkMask::kBW_Format == maskFormat) {
-                        // make the distance field from the image
-                        SkGenerateDistanceFieldFromBWImage((unsigned char*)glyph.fDistanceField,
-                                                           (unsigned char*)glyph.fImage,
-                                                           glyph.fWidth, glyph.fHeight,
-                                                           glyph.rowBytes());
-                        fMemoryUsed += size;
-                    } else {
-                        fGlyphAlloc.unalloc(glyph.fDistanceField);
-                        const_cast<SkGlyph&>(glyph).fDistanceField = NULL;
-                    }
-                }
-            }
-        }
-    }
-    return glyph.fDistanceField;
+void SkGlyphCache::dump() const {
+    const SkTypeface* face = fScalerContext->getTypeface();
+    const SkScalerContextRec& rec = fScalerContext->getRec();
+    SkMatrix matrix;
+    rec.getSingleMatrix(&matrix);
+    matrix.preScale(SkScalarInvert(rec.fTextSize), SkScalarInvert(rec.fTextSize));
+    SkString name;
+    face->getFamilyName(&name);
+
+    SkString msg;
+    msg.printf("cache typeface:%x %25s:%d size:%2g [%g %g %g %g] lum:%02X devG:%d pntG:%d cntr:%d glyphs:%3d",
+               face->uniqueID(), name.c_str(), face->style(), rec.fTextSize,
+               matrix[SkMatrix::kMScaleX], matrix[SkMatrix::kMSkewX],
+               matrix[SkMatrix::kMSkewY], matrix[SkMatrix::kMScaleY],
+               rec.fLumBits & 0xFF, rec.fDeviceGamma, rec.fPaintGamma, rec.fContrast,
+               fGlyphMap.count());
+    SkDebugf("%s\n", msg.c_str());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -420,7 +260,7 @@ bool SkGlyphCache::getAuxProcData(void (*proc)(void*), void** dataPtr) const {
 }
 
 void SkGlyphCache::setAuxProc(void (*proc)(void*), void* data) {
-    if (proc == NULL) {
+    if (proc == nullptr) {
         return;
     }
 
@@ -433,7 +273,7 @@ void SkGlyphCache::setAuxProc(void (*proc)(void*), void* data) {
         rec = rec->fNext;
     }
     // not found, create a new rec
-    rec = SkNEW(AuxProcRec);
+    rec = new AuxProcRec;
     rec->fProc = proc;
     rec->fData = data;
     rec->fNext = fAuxProcList;
@@ -445,7 +285,7 @@ void SkGlyphCache::invokeAndRemoveAuxProcs() {
     while (rec) {
         rec->fProc(rec->fData);
         AuxProcRec* next = rec->fNext;
-        SkDELETE(rec);
+        delete rec;
         rec = next;
     }
 }
@@ -453,7 +293,7 @@ void SkGlyphCache::invokeAndRemoveAuxProcs() {
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "SkThread.h"
+typedef SkAutoTExclusive<SkSpinlock> Exclusive;
 
 size_t SkGlyphCache_Globals::setCacheSizeLimit(size_t newLimit) {
     static const size_t minLimit = 256 * 1024;
@@ -461,7 +301,7 @@ size_t SkGlyphCache_Globals::setCacheSizeLimit(size_t newLimit) {
         newLimit = minLimit;
     }
 
-    SkAutoMutexAcquire    ac(fMutex);
+    Exclusive ac(fLock);
 
     size_t prevLimit = fCacheSizeLimit;
     fCacheSizeLimit = newLimit;
@@ -474,7 +314,7 @@ int SkGlyphCache_Globals::setCacheCountLimit(int newCount) {
         newCount = 0;
     }
 
-    SkAutoMutexAcquire    ac(fMutex);
+    Exclusive ac(fLock);
 
     int prevCount = fCacheCountLimit;
     fCacheCountLimit = newCount;
@@ -483,27 +323,10 @@ int SkGlyphCache_Globals::setCacheCountLimit(int newCount) {
 }
 
 void SkGlyphCache_Globals::purgeAll() {
-    SkAutoMutexAcquire    ac(fMutex);
+    Exclusive ac(fLock);
     this->internalPurge(fTotalMemoryUsed);
 }
 
-void SkGlyphCache::VisitAllCaches(bool (*proc)(SkGlyphCache*, void*),
-                                  void* context) {
-    SkGlyphCache_Globals& globals = getGlobals();
-    SkAutoMutexAcquire    ac(globals.fMutex);
-    SkGlyphCache*         cache;
-
-    globals.validate();
-
-    for (cache = globals.internalGetHead(); cache != NULL; cache = cache->fNext) {
-        if (proc(cache, context)) {
-            break;
-        }
-    }
-
-    globals.validate();
-}
-
 /*  This guy calls the visitor from within the mutext lock, so the visitor
     cannot:
     - take too much time
@@ -519,26 +342,26 @@ SkGlyphCache* SkGlyphCache::VisitCache(SkTypeface* typeface,
     }
     SkASSERT(desc);
 
-    SkGlyphCache_Globals& globals = getGlobals();
-    SkAutoMutexAcquire    ac(globals.fMutex);
+    SkGlyphCache_Globals& globals = get_globals();
     SkGlyphCache*         cache;
-    bool                  insideMutex = true;
 
-    globals.validate();
+    {
+        Exclusive ac(globals.fLock);
 
-    for (cache = globals.internalGetHead(); cache != NULL; cache = cache->fNext) {
-        if (cache->fDesc->equals(*desc)) {
-            globals.internalDetachCache(cache);
-            goto FOUND_IT;
+        globals.validate();
+
+        for (cache = globals.internalGetHead(); cache != nullptr; cache = cache->fNext) {
+            if (cache->fDesc->equals(*desc)) {
+                globals.internalDetachCache(cache);
+                if (!proc(cache, context)) {
+                    globals.internalAttachCacheToHead(cache);
+                    cache = nullptr;
+                }
+                return cache;
+            }
         }
     }
 
-    /* Release the mutex now, before we create a new entry (which might have
-        side-effects like trying to access the cache/mutex (yikes!)
-    */
-    ac.release();           // release the mutex now
-    insideMutex = false;    // can't use globals anymore
-
     // Check if we can create a scaler-context before creating the glyphcache.
     // If not, we may have exhausted OS/font resources, so try purging the
     // cache once and try again.
@@ -547,39 +370,109 @@ SkGlyphCache* SkGlyphCache::VisitCache(SkTypeface* typeface,
         // so we can try the purge.
         SkScalerContext* ctx = typeface->createScalerContext(desc, true);
         if (!ctx) {
-            getSharedGlobals().purgeAll();
+            get_globals().purgeAll();
             ctx = typeface->createScalerContext(desc, false);
             SkASSERT(ctx);
         }
-        cache = SkNEW_ARGS(SkGlyphCache, (typeface, desc, ctx));
+        cache = new SkGlyphCache(typeface, desc, ctx);
     }
 
-FOUND_IT:
-
     AutoValidate av(cache);
 
     if (!proc(cache, context)) {   // need to reattach
-        if (insideMutex) {
-            globals.internalAttachCacheToHead(cache);
-        } else {
-            globals.attachCacheToHead(cache);
-        }
-        cache = NULL;
+        globals.attachCacheToHead(cache);
+        cache = nullptr;
     }
     return cache;
 }
 
 void SkGlyphCache::AttachCache(SkGlyphCache* cache) {
     SkASSERT(cache);
-    SkASSERT(cache->fNext == NULL);
+    SkASSERT(cache->fNext == nullptr);
 
-    getGlobals().attachCacheToHead(cache);
+    get_globals().attachCacheToHead(cache);
+}
+
+static void dump_visitor(const SkGlyphCache& cache, void* context) {
+    int* counter = (int*)context;
+    int index = *counter;
+    *counter += 1;
+
+    const SkScalerContextRec& rec = cache.getScalerContext()->getRec();
+
+    SkDebugf("[%3d] ID %3d, glyphs %3d, size %g, scale %g, skew %g, [%g %g %g %g]\n",
+             index, rec.fFontID, cache.countCachedGlyphs(),
+             rec.fTextSize, rec.fPreScaleX, rec.fPreSkewX,
+             rec.fPost2x2[0][0], rec.fPost2x2[0][1], rec.fPost2x2[1][0], rec.fPost2x2[1][1]);
+}
+
+void SkGlyphCache::Dump() {
+    SkDebugf("GlyphCache [     used    budget ]\n");
+    SkDebugf("    bytes  [ %8zu  %8zu ]\n",
+             SkGraphics::GetFontCacheUsed(), SkGraphics::GetFontCacheLimit());
+    SkDebugf("    count  [ %8zu  %8zu ]\n",
+             SkGraphics::GetFontCacheCountUsed(), SkGraphics::GetFontCacheCountLimit());
+
+    int counter = 0;
+    SkGlyphCache::VisitAll(dump_visitor, &counter);
+}
+
+static void sk_trace_dump_visitor(const SkGlyphCache& cache, void* context) {
+    SkTraceMemoryDump* dump = static_cast<SkTraceMemoryDump*>(context);
+
+    const SkTypeface* face = cache.getScalerContext()->getTypeface();
+    const SkScalerContextRec& rec = cache.getScalerContext()->getRec();
+
+    SkString fontName;
+    face->getFamilyName(&fontName);
+    // Replace all special characters with '_'.
+    for (size_t index = 0; index < fontName.size(); ++index) {
+        if (!std::isalnum(fontName[index])) {
+            fontName[index] = '_';
+        }
+    }
+
+    SkString dumpName = SkStringPrintf("%s/%s_%d/%p",
+                                       gGlyphCacheDumpName, fontName.c_str(), rec.fFontID, &cache);
+
+    dump->dumpNumericValue(dumpName.c_str(), "size", "bytes", cache.getMemoryUsed());
+    dump->dumpNumericValue(dumpName.c_str(), "glyph_count", "objects", cache.countCachedGlyphs());
+    dump->setMemoryBacking(dumpName.c_str(), "malloc", nullptr);
+}
+
+void SkGlyphCache::DumpMemoryStatistics(SkTraceMemoryDump* dump) {
+    dump->dumpNumericValue(gGlyphCacheDumpName, "size", "bytes", SkGraphics::GetFontCacheUsed());
+    dump->dumpNumericValue(gGlyphCacheDumpName, "budget_size", "bytes",
+                           SkGraphics::GetFontCacheLimit());
+    dump->dumpNumericValue(gGlyphCacheDumpName, "glyph_count", "objects",
+                           SkGraphics::GetFontCacheCountUsed());
+    dump->dumpNumericValue(gGlyphCacheDumpName, "budget_glyph_count", "objects",
+                           SkGraphics::GetFontCacheCountLimit());
+
+    if (dump->getRequestedDetails() == SkTraceMemoryDump::kLight_LevelOfDetail) {
+        dump->setMemoryBacking(gGlyphCacheDumpName, "malloc", nullptr);
+        return;
+    }
+
+    SkGlyphCache::VisitAll(sk_trace_dump_visitor, dump);
+}
+
+void SkGlyphCache::VisitAll(Visitor visitor, void* context) {
+    SkGlyphCache_Globals& globals = get_globals();
+    Exclusive ac(globals.fLock);
+    SkGlyphCache*         cache;
+
+    globals.validate();
+
+    for (cache = globals.internalGetHead(); cache != nullptr; cache = cache->fNext) {
+        visitor(*cache, context);
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkGlyphCache_Globals::attachCacheToHead(SkGlyphCache* cache) {
-    SkAutoMutexAcquire    ac(fMutex);
+    Exclusive ac(fLock);
 
     this->validate();
     cache->validate();
@@ -629,14 +522,14 @@ size_t SkGlyphCache_Globals::internalPurge(size_t minBytesNeeded) {
     // we start at the tail and proceed backwards, as the linklist is in LRU
     // order, with unimportant entries at the tail.
     SkGlyphCache* cache = this->internalGetTail();
-    while (cache != NULL &&
+    while (cache != nullptr &&
            (bytesFreed < bytesNeeded || countFreed < countNeeded)) {
         SkGlyphCache* prev = cache->fPrev;
         bytesFreed += cache->fMemoryUsed;
         countFreed += 1;
 
         this->internalDetachCache(cache);
-        SkDELETE(cache);
+        delete cache;
         cache = prev;
     }
 
@@ -653,7 +546,7 @@ size_t SkGlyphCache_Globals::internalPurge(size_t minBytesNeeded) {
 }
 
 void SkGlyphCache_Globals::internalAttachCacheToHead(SkGlyphCache* cache) {
-    SkASSERT(NULL == cache->fPrev && NULL == cache->fNext);
+    SkASSERT(nullptr == cache->fPrev && nullptr == cache->fNext);
     if (fHead) {
         fHead->fPrev = cache;
         cache->fNext = fHead;
@@ -677,7 +570,7 @@ void SkGlyphCache_Globals::internalDetachCache(SkGlyphCache* cache) {
     if (cache->fNext) {
         cache->fNext->fPrev = cache->fPrev;
     }
-    cache->fPrev = cache->fNext = NULL;
+    cache->fPrev = cache->fNext = nullptr;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -688,15 +581,11 @@ void SkGlyphCache::validate() const {
 #ifdef SK_DEBUG_GLYPH_CACHE
     int count = fGlyphArray.count();
     for (int i = 0; i < count; i++) {
-        const SkGlyph* glyph = fGlyphArray[i];
+        const SkGlyph* glyph = &fGlyphArray[i];
         SkASSERT(glyph);
-        SkASSERT(fGlyphAlloc.contains(glyph));
         if (glyph->fImage) {
             SkASSERT(fGlyphAlloc.contains(glyph->fImage));
         }
-        if (glyph->fDistanceField) {
-            SkASSERT(fGlyphAlloc.contains(glyph->fDistanceField));
-        }
     }
 #endif
 }
@@ -706,14 +595,16 @@ void SkGlyphCache_Globals::validate() const {
     int computedCount = 0;
 
     const SkGlyphCache* head = fHead;
-    while (head != NULL) {
+    while (head != nullptr) {
         computedBytes += head->fMemoryUsed;
         computedCount += 1;
         head = head->fNext;
     }
 
-    SkASSERT(fTotalMemoryUsed == computedBytes);
-    SkASSERT(fCacheCount == computedCount);
+    SkASSERTF(fCacheCount == computedCount, "fCacheCount: %d, computedCount: %d", fCacheCount,
+              computedCount);
+    SkASSERTF(fTotalMemoryUsed == computedBytes, "fTotalMemoryUsed: %d, computedBytes: %d",
+              fTotalMemoryUsed, computedBytes);
 }
 
 #endif
@@ -724,43 +615,34 @@ void SkGlyphCache_Globals::validate() const {
 #include "SkTypefaceCache.h"
 
 size_t SkGraphics::GetFontCacheLimit() {
-    return getSharedGlobals().getCacheSizeLimit();
+    return get_globals().getCacheSizeLimit();
 }
 
 size_t SkGraphics::SetFontCacheLimit(size_t bytes) {
-    return getSharedGlobals().setCacheSizeLimit(bytes);
+    return get_globals().setCacheSizeLimit(bytes);
 }
 
 size_t SkGraphics::GetFontCacheUsed() {
-    return getSharedGlobals().getTotalMemoryUsed();
+    return get_globals().getTotalMemoryUsed();
 }
 
 int SkGraphics::GetFontCacheCountLimit() {
-    return getSharedGlobals().getCacheCountLimit();
+    return get_globals().getCacheCountLimit();
 }
 
 int SkGraphics::SetFontCacheCountLimit(int count) {
-    return getSharedGlobals().setCacheCountLimit(count);
+    return get_globals().setCacheCountLimit(count);
 }
 
 int SkGraphics::GetFontCacheCountUsed() {
-    return getSharedGlobals().getCacheCountUsed();
+    return get_globals().getCacheCountUsed();
 }
 
 void SkGraphics::PurgeFontCache() {
-    getSharedGlobals().purgeAll();
+    get_globals().purgeAll();
     SkTypefaceCache::PurgeAll();
 }
 
-size_t SkGraphics::GetTLSFontCacheLimit() {
-    const SkGlyphCache_Globals* tls = SkGlyphCache_Globals::FindTLS();
-    return tls ? tls->getCacheSizeLimit() : 0;
-}
-
-void SkGraphics::SetTLSFontCacheLimit(size_t bytes) {
-    if (0 == bytes) {
-        SkGlyphCache_Globals::DeleteTLS();
-    } else {
-        SkGlyphCache_Globals::GetTLS().setCacheSizeLimit(bytes);
-    }
-}
+// TODO(herb): clean up TLS apis.
+size_t SkGraphics::GetTLSFontCacheLimit() { return 0; }
+void SkGraphics::SetTLSFontCacheLimit(size_t bytes) { }
diff --git a/gfx/skia/skia/src/core/SkGlyphCache.h b/gfx/skia/skia/src/core/SkGlyphCache.h
index 4daf6b06b6c0..2f1f417250ed 100644
--- a/gfx/skia/skia/src/core/SkGlyphCache.h
+++ b/gfx/skia/skia/src/core/SkGlyphCache.h
@@ -1,12 +1,9 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
+ * Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
  */
 
-
 #ifndef SkGlyphCache_DEFINED
 #define SkGlyphCache_DEFINED
 
@@ -14,88 +11,76 @@
 #include "SkChunkAlloc.h"
 #include "SkDescriptor.h"
 #include "SkGlyph.h"
+#include "SkTHash.h"
 #include "SkScalerContext.h"
 #include "SkTemplates.h"
 #include "SkTDArray.h"
 
-struct SkDeviceProperties;
 class SkPaint;
+class SkTraceMemoryDump;
 
 class SkGlyphCache_Globals;
 
 /** \class SkGlyphCache
 
-    This class represents a strike: a specific combination of typeface, size,
-    matrix, etc., and holds the glyphs for that strike. Calling any of the
-    getUnichar.../getGlyphID... methods will return the requested glyph,
-    either instantly if it is already cached, or by first generating it and then
-    adding it to the strike.
+    This class represents a strike: a specific combination of typeface, size, matrix, etc., and
+    holds the glyphs for that strike. Calling any of the getUnichar.../getGlyphID... methods will
+    return the requested glyph, either instantly if it is already cached, or by first generating
+    it and then adding it to the strike.
 
-    The strikes are held in a global list, available to all threads. To interact
-    with one, call either VisitCache() or DetachCache().
+    The strikes are held in a global list, available to all threads. To interact with one, call
+    either VisitCache() or DetachCache().
 */
 class SkGlyphCache {
 public:
-    /** Returns a glyph with valid fAdvance and fDevKern fields.
-        The remaining fields may be valid, but that is not guaranteed. If you
-        require those, call getUnicharMetrics or getGlyphIDMetrics instead.
+    /** Returns a glyph with valid fAdvance and fDevKern fields. The remaining fields may be
+        valid, but that is not guaranteed. If you require those, call getUnicharMetrics or
+        getGlyphIDMetrics instead.
     */
     const SkGlyph& getUnicharAdvance(SkUnichar);
     const SkGlyph& getGlyphIDAdvance(uint16_t);
 
-    /** Returns a glyph with all fields valid except fImage and fPath, which
-        may be null. If they are null, call findImage or findPath for those.
-        If they are not null, then they are valid.
+    /** Returns a glyph with all fields valid except fImage and fPath, which may be null. If they
+        are null, call findImage or findPath for those. If they are not null, then they are valid.
 
-        This call is potentially slower than the matching ...Advance call. If
-        you only need the fAdvance/fDevKern fields, call those instead.
+        This call is potentially slower than the matching ...Advance call. If you only need the
+        fAdvance/fDevKern fields, call those instead.
     */
     const SkGlyph& getUnicharMetrics(SkUnichar);
     const SkGlyph& getGlyphIDMetrics(uint16_t);
 
-    /** These are variants that take the device position of the glyph. Call
-        these only if you are drawing in subpixel mode. Passing 0, 0 is
-        effectively the same as calling the variants w/o the extra params, tho
-        a tiny bit slower.
+    /** These are variants that take the device position of the glyph. Call these only if you are
+        drawing in subpixel mode. Passing 0, 0 is effectively the same as calling the variants
+        w/o the extra params, though a tiny bit slower.
     */
     const SkGlyph& getUnicharMetrics(SkUnichar, SkFixed x, SkFixed y);
     const SkGlyph& getGlyphIDMetrics(uint16_t, SkFixed x, SkFixed y);
 
-    /** Return the glyphID for the specified Unichar. If the char has already
-        been seen, use the existing cache entry. If not, ask the scalercontext
-        to compute it for us.
+    /** Return the glyphID for the specified Unichar. If the char has already been seen, use the
+        existing cache entry. If not, ask the scalercontext to compute it for us.
     */
     uint16_t unicharToGlyph(SkUnichar);
 
-    /** Map the glyph to its Unicode equivalent. Unmappable glyphs map to
-        a character code of zero.
+    /** Map the glyph to its Unicode equivalent. Unmappable glyphs map to a character code of zero.
     */
     SkUnichar glyphToUnichar(uint16_t);
 
     /** Returns the number of glyphs for this strike.
     */
-    unsigned getGlyphCount();
+    unsigned getGlyphCount() const;
 
-#ifdef SK_BUILD_FOR_ANDROID
-    /** Returns the base glyph count for this strike.
-    */
-    unsigned getBaseGlyphCount(SkUnichar charCode) const {
-        return fScalerContext->getBaseGlyphCount(charCode);
-    }
-#endif
+    /** Return the number of glyphs currently cached. */
+    int countCachedGlyphs() const;
 
-    /** Return the image associated with the glyph. If it has not been generated
-        this will trigger that.
+    /** Return the image associated with the glyph. If it has not been generated this will
+        trigger that.
     */
     const void* findImage(const SkGlyph&);
-    /** Return the Path associated with the glyph. If it has not been generated
-        this will trigger that.
+
+    /** Return the Path associated with the glyph. If it has not been generated this will trigger
+        that.
     */
     const SkPath* findPath(const SkGlyph&);
-    /** Return the distance field associated with the glyph. If it has not been generated
-     this will trigger that.
-     */
-    const void* findDistanceField(const SkGlyph&);
 
     /** Return the vertical metrics for this strike.
     */
@@ -113,56 +98,61 @@ public:
         return fScalerContext->isSubpixel();
     }
 
-    /*  AuxProc/Data allow a client to associate data with this cache entry.
-        Multiple clients can use this, as their data is keyed with a function
-        pointer. In addition to serving as a key, the function pointer is called
-        with the data when the glyphcache object is deleted, so the client can
-        cleanup their data as well. NOTE: the auxProc must not try to access
-        this glyphcache in any way, since it may be in the process of being
-        deleted.
+    /** Return the approx RAM usage for this cache. */
+    size_t getMemoryUsed() const { return fMemoryUsed; }
+
+    void dump() const;
+
+    /** AuxProc/Data allow a client to associate data with this cache entry. Multiple clients can
+        use this, as their data is keyed with a function pointer. In addition to serving as a
+        key, the function pointer is called with the data when the glyphcache object is deleted,
+        so the client can cleanup their data as well.
+        NOTE: the auxProc must not try to access this glyphcache in any way, since it may be in
+        the process of being deleted.
     */
 
     //! If the proc is found, return true and set *dataPtr to its data
     bool getAuxProcData(void (*auxProc)(void*), void** dataPtr) const;
+
     //! Add a proc/data pair to the glyphcache. proc should be non-null
     void setAuxProc(void (*auxProc)(void*), void* auxData);
 
     SkScalerContext* getScalerContext() const { return fScalerContext; }
 
-    /** Call proc on all cache entries, stopping early if proc returns true.
-        The proc should not create or delete caches, since it could produce
-        deadlock.
-    */
-    static void VisitAllCaches(bool (*proc)(SkGlyphCache*, void*), void* ctx);
-
-    /** Find a matching cache entry, and call proc() with it. If none is found
-        create a new one. If the proc() returns true, detach the cache and
-        return it, otherwise leave it and return NULL.
+    /** Find a matching cache entry, and call proc() with it. If none is found create a new one.
+        If the proc() returns true, detach the cache and return it, otherwise leave it and return
+        nullptr.
     */
     static SkGlyphCache* VisitCache(SkTypeface*, const SkDescriptor* desc,
                                     bool (*proc)(const SkGlyphCache*, void*),
                                     void* context);
 
-    /** Given a strike that was returned by either VisitCache() or DetachCache()
-        add it back into the global cache list (after which the caller should
-        not reference it anymore.
+    /** Given a strike that was returned by either VisitCache() or DetachCache() add it back into
+        the global cache list (after which the caller should not reference it anymore.
     */
     static void AttachCache(SkGlyphCache*);
 
-    /** Detach a strike from the global cache matching the specified descriptor.
-        Once detached, it can be queried/modified by the current thread, and
-        when finished, be reattached to the global cache with AttachCache().
-        While detached, if another request is made with the same descriptor,
-        a different strike will be generated. This is fine. It does mean we
-        can have more than 1 strike for the same descriptor, but that will
-        eventually get purged, and the win is that different thread will never
-        block each other while a strike is being used.
+    /** Detach a strike from the global cache matching the specified descriptor. Once detached,
+        it can be queried/modified by the current thread, and when finished, be reattached to the
+        global cache with AttachCache(). While detached, if another request is made with the same
+        descriptor, a different strike will be generated. This is fine. It does mean we can have
+        more than 1 strike for the same descriptor, but that will eventually get purged, and the
+        win is that different thread will never block each other while a strike is being used.
     */
-    static SkGlyphCache* DetachCache(SkTypeface* typeface,
-                                     const SkDescriptor* desc) {
-        return VisitCache(typeface, desc, DetachProc, NULL);
+    static SkGlyphCache* DetachCache(SkTypeface* typeface, const SkDescriptor* desc) {
+        return VisitCache(typeface, desc, DetachProc, nullptr);
     }
 
+    static void Dump();
+
+    /** Dump memory usage statistics of all the attaches caches in the process using the
+        SkTraceMemoryDump interface.
+    */
+    static void DumpMemoryStatistics(SkTraceMemoryDump* dump);
+
+    typedef void (*Visitor)(const SkGlyphCache&, void* context);
+    static void VisitAll(Visitor, void* context);
+
 #ifdef SK_DEBUG
     void validate() const;
 #else
@@ -182,66 +172,83 @@ public:
             }
         }
         void forget() {
-            fCache = NULL;
+            fCache = nullptr;
         }
     private:
         const SkGlyphCache* fCache;
     };
 
 private:
-    // we take ownership of the scalercontext
-    SkGlyphCache(SkTypeface*, const SkDescriptor*, SkScalerContext*);
-    ~SkGlyphCache();
+    friend class SkGlyphCache_Globals;
 
     enum MetricsType {
         kJustAdvance_MetricsType,
         kFull_MetricsType
     };
 
-    SkGlyph* lookupMetrics(uint32_t id, MetricsType);
-    static bool DetachProc(const SkGlyphCache*, void*) { return true; }
-
-    SkGlyphCache*       fNext, *fPrev;
-    SkDescriptor*       fDesc;
-    SkScalerContext*    fScalerContext;
-    SkPaint::FontMetrics fFontMetrics;
-
     enum {
-        kHashBits   = 8,
-        kHashCount  = 1 << kHashBits,
-        kHashMask   = kHashCount - 1
+        kHashBits           = 8,
+        kHashCount          = 1 << kHashBits,
+        kHashMask           = kHashCount - 1
     };
-    SkGlyph*            fGlyphHash[kHashCount];
-    SkTDArray<SkGlyph*> fGlyphArray;
-    SkChunkAlloc        fGlyphAlloc;
+
+    typedef uint32_t PackedGlyphID;    // glyph-index + subpixel-pos
+    typedef uint32_t PackedUnicharID;  // unichar + subpixel-pos
 
     struct CharGlyphRec {
-        uint32_t    fID;    // unichar + subpixel
-        SkGlyph*    fGlyph;
+        PackedUnicharID    fPackedUnicharID;
+        PackedGlyphID      fPackedGlyphID;
     };
-    // no reason to use the same kHashCount as fGlyphHash, but we do for now
-    CharGlyphRec    fCharToGlyphHash[kHashCount];
-
-    static inline unsigned ID2HashIndex(uint32_t id) {
-        id ^= id >> 16;
-        id ^= id >> 8;
-        return id & kHashMask;
-    }
-
-    // used to track (approx) how much ram is tied-up in this cache
-    size_t  fMemoryUsed;
 
     struct AuxProcRec {
         AuxProcRec* fNext;
         void (*fProc)(void*);
         void* fData;
     };
-    AuxProcRec* fAuxProcList;
+
+    // SkGlyphCache takes ownership of the scalercontext.
+    SkGlyphCache(SkTypeface*, const SkDescriptor*, SkScalerContext*);
+    ~SkGlyphCache();
+
+    // Return the SkGlyph* associated with MakeID. The id parameter is the
+    // combined glyph/x/y id generated by MakeID. If it is just a glyph id
+    // then x and y are assumed to be zero.
+    SkGlyph* lookupByPackedGlyphID(PackedGlyphID packedGlyphID, MetricsType type);
+
+    // Return a SkGlyph* associated with unicode id and position x and y.
+    SkGlyph* lookupByChar(SkUnichar id, MetricsType type, SkFixed x = 0, SkFixed y = 0);
+
+    // Return a new SkGlyph for the glyph ID and subpixel position id. Limit the amount
+    // of work
+    // using type.
+    SkGlyph* allocateNewGlyph(PackedGlyphID packedGlyphID, MetricsType type);
+
+    static bool DetachProc(const SkGlyphCache*, void*) { return true; }
+
+    // The id arg is a combined id generated by MakeID.
+    CharGlyphRec* getCharGlyphRec(PackedUnicharID id);
+
     void invokeAndRemoveAuxProcs();
 
     inline static SkGlyphCache* FindTail(SkGlyphCache* head);
 
-    friend class SkGlyphCache_Globals;
+    SkGlyphCache*          fNext;
+    SkGlyphCache*          fPrev;
+    SkDescriptor* const    fDesc;
+    SkScalerContext* const fScalerContext;
+    SkPaint::FontMetrics   fFontMetrics;
+
+    // Map from a combined GlyphID and sub-pixel position to a SkGlyph.
+    SkTHashTable<SkGlyph, PackedGlyphID, SkGlyph::HashTraits> fGlyphMap;
+
+    SkChunkAlloc           fGlyphAlloc;
+
+    SkAutoTArray<CharGlyphRec> fPackedUnicharIDToPackedGlyphID;
+
+    // used to track (approx) how much ram is tied-up in this cache
+    size_t                 fMemoryUsed;
+
+    AuxProcRec*            fAuxProcList;
 };
 
 class SkAutoGlyphCacheBase {
@@ -251,24 +258,24 @@ public:
     void release() {
         if (fCache) {
             SkGlyphCache::AttachCache(fCache);
-            fCache = NULL;
+            fCache = nullptr;
         }
     }
 
 protected:
-    // Hide the constructors so we can't create one of these directly.
-    // Create SkAutoGlyphCache or SkAutoGlyphCacheNoCache instead.
+    // Hide the constructors so we can't create one of these directly. Create SkAutoGlyphCache or
+    // SkAutoGlyphCacheNoCache instead.
     SkAutoGlyphCacheBase(SkGlyphCache* cache) : fCache(cache) {}
     SkAutoGlyphCacheBase(SkTypeface* typeface, const SkDescriptor* desc) {
         fCache = SkGlyphCache::DetachCache(typeface, desc);
     }
-    SkAutoGlyphCacheBase(const SkPaint& paint,
-                         const SkDeviceProperties* deviceProperties,
-                         const SkMatrix* matrix) {
-        fCache = NULL;
+    SkAutoGlyphCacheBase(const SkPaint& /*paint*/,
+                         const SkSurfaceProps* /*surfaceProps*/,
+                         const SkMatrix* /*matrix*/) {
+        fCache = nullptr;
     }
     SkAutoGlyphCacheBase() {
-        fCache = NULL;
+        fCache = nullptr;
     }
     ~SkAutoGlyphCacheBase() {
         if (fCache) {
@@ -288,9 +295,9 @@ public:
     SkAutoGlyphCache(SkTypeface* typeface, const SkDescriptor* desc) :
         SkAutoGlyphCacheBase(typeface, desc) {}
     SkAutoGlyphCache(const SkPaint& paint,
-                     const SkDeviceProperties* deviceProperties,
+                     const SkSurfaceProps* surfaceProps,
                      const SkMatrix* matrix) {
-        fCache = paint.detachCache(deviceProperties, matrix, false);
+        fCache = paint.detachCache(surfaceProps, matrix, false);
     }
 
 private:
@@ -304,9 +311,9 @@ public:
     SkAutoGlyphCacheNoGamma(SkTypeface* typeface, const SkDescriptor* desc) :
         SkAutoGlyphCacheBase(typeface, desc) {}
     SkAutoGlyphCacheNoGamma(const SkPaint& paint,
-                            const SkDeviceProperties* deviceProperties,
+                            const SkSurfaceProps* surfaceProps,
                             const SkMatrix* matrix) {
-        fCache = paint.detachCache(deviceProperties, matrix, true);
+        fCache = paint.detachCache(surfaceProps, matrix, true);
     }
 
 private:
diff --git a/gfx/skia/skia/src/core/SkGlyphCache_Globals.h b/gfx/skia/skia/src/core/SkGlyphCache_Globals.h
index 4bd607c59803..e1825a2f0f90 100644
--- a/gfx/skia/skia/src/core/SkGlyphCache_Globals.h
+++ b/gfx/skia/skia/src/core/SkGlyphCache_Globals.h
@@ -9,6 +9,8 @@
 #define SkGlyphCache_Globals_DEFINED
 
 #include "SkGlyphCache.h"
+#include "SkMutex.h"
+#include "SkSpinlock.h"
 #include "SkTLS.h"
 
 #ifndef SK_DEFAULT_FONT_CACHE_COUNT_LIMIT
@@ -21,37 +23,26 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-class SkMutex;
-
 class SkGlyphCache_Globals {
 public:
-    enum UseMutex {
-        kNo_UseMutex,  // thread-local cache
-        kYes_UseMutex  // shared cache
-    };
-
-    SkGlyphCache_Globals(UseMutex um) {
-        fHead = NULL;
+    SkGlyphCache_Globals() {
+        fHead = nullptr;
         fTotalMemoryUsed = 0;
         fCacheSizeLimit = SK_DEFAULT_FONT_CACHE_LIMIT;
         fCacheCount = 0;
         fCacheCountLimit = SK_DEFAULT_FONT_CACHE_COUNT_LIMIT;
-
-        fMutex = (kYes_UseMutex == um) ? SkNEW(SkMutex) : NULL;
     }
 
     ~SkGlyphCache_Globals() {
         SkGlyphCache* cache = fHead;
         while (cache) {
             SkGlyphCache* next = cache->fNext;
-            SkDELETE(cache);
+            delete cache;
             cache = next;
         }
-
-        SkDELETE(fMutex);
     }
 
-    SkMutex*        fMutex;
+    SkSpinlock     fLock;
 
     SkGlyphCache* internalGetHead() const { return fHead; }
     SkGlyphCache* internalGetTail() const;
@@ -87,17 +78,6 @@ public:
     void internalDetachCache(SkGlyphCache*);
     void internalAttachCacheToHead(SkGlyphCache*);
 
-    // can return NULL
-    static SkGlyphCache_Globals* FindTLS() {
-        return (SkGlyphCache_Globals*)SkTLS::Find(CreateTLS);
-    }
-
-    static SkGlyphCache_Globals& GetTLS() {
-        return *(SkGlyphCache_Globals*)SkTLS::Get(CreateTLS, DeleteTLS);
-    }
-
-    static void DeleteTLS() { SkTLS::Delete(CreateTLS); }
-
 private:
     SkGlyphCache* fHead;
     size_t  fTotalMemoryUsed;
@@ -109,14 +89,6 @@ private:
     // and attempt to purge caches to match.
     // Returns number of bytes freed.
     size_t internalPurge(size_t minBytesNeeded = 0);
-
-    static void* CreateTLS() {
-        return SkNEW_ARGS(SkGlyphCache_Globals, (kNo_UseMutex));
-    }
-
-    static void DeleteTLS(void* ptr) {
-        SkDELETE((SkGlyphCache_Globals*)ptr);
-    }
 };
 
 #endif
diff --git a/gfx/skia/skia/src/core/SkGraphics.cpp b/gfx/skia/skia/src/core/SkGraphics.cpp
index a89237fcff6b..5290ea1d07a9 100644
--- a/gfx/skia/skia/src/core/SkGraphics.cpp
+++ b/gfx/skia/skia/src/core/SkGraphics.cpp
@@ -11,14 +11,16 @@
 
 #include "SkBlitter.h"
 #include "SkCanvas.h"
-#include "SkFloat.h"
 #include "SkGeometry.h"
+#include "SkGlyphCache.h"
 #include "SkMath.h"
 #include "SkMatrix.h"
+#include "SkOpts.h"
 #include "SkPath.h"
 #include "SkPathEffect.h"
 #include "SkPixelRef.h"
 #include "SkRefCnt.h"
+#include "SkResourceCache.h"
 #include "SkRTConf.h"
 #include "SkScalerContext.h"
 #include "SkShader.h"
@@ -28,6 +30,8 @@
 #include "SkUtils.h"
 #include "SkXfermode.h"
 
+#include <stdlib.h>
+
 void SkGraphics::GetVersion(int32_t* major, int32_t* minor, int32_t* patch) {
     if (major) {
         *major = SKIA_VERSION_MAJOR;
@@ -40,17 +44,10 @@ void SkGraphics::GetVersion(int32_t* major, int32_t* minor, int32_t* patch) {
     }
 }
 
-#define typesizeline(type)  { #type , sizeof(type) }
-
-#ifdef BUILD_EMBOSS_TABLE
-    extern void SkEmbossMask_BuildTable();
-#endif
-
-#ifdef BUILD_RADIALGRADIENT_TABLE
-    extern void SkRadialGradient_BuildTable();
-#endif
-
 void SkGraphics::Init() {
+    // SkGraphics::Init() must be thread-safe and idempotent.
+    SkOpts::Init();
+
 #ifdef SK_DEVELOPER
     skRTConfRegistry().possiblyDumpFile();
     skRTConfRegistry().validate();
@@ -59,76 +56,13 @@ void SkGraphics::Init() {
         skRTConfRegistry().printNonDefault();
     }
 #endif
-
-#ifdef BUILD_EMBOSS_TABLE
-    SkEmbossMask_BuildTable();
-#endif
-#ifdef BUILD_RADIALGRADIENT_TABLE
-    SkRadialGradient_BuildTable();
-#endif
-
-#ifdef SK_DEBUGx
-    int i;
-
-    static const struct {
-        const char* fTypeName;
-        size_t      fSizeOf;
-    } gTypeSize[] = {
-        typesizeline(char),
-        typesizeline(short),
-        typesizeline(int),
-        typesizeline(long),
-        typesizeline(size_t),
-        typesizeline(void*),
-
-        typesizeline(S8CPU),
-        typesizeline(U8CPU),
-        typesizeline(S16CPU),
-        typesizeline(U16CPU),
-
-        typesizeline(SkPoint),
-        typesizeline(SkRect),
-        typesizeline(SkMatrix),
-        typesizeline(SkPath),
-        typesizeline(SkGlyph),
-        typesizeline(SkRefCnt),
-
-        typesizeline(SkPaint),
-        typesizeline(SkCanvas),
-        typesizeline(SkBlitter),
-        typesizeline(SkShader),
-        typesizeline(SkXfermode),
-        typesizeline(SkPathEffect)
-    };
-
-#ifdef SK_CPU_BENDIAN
-    SkDebugf("SkGraphics: big-endian\n");
-#else
-    SkDebugf("SkGraphics: little-endian\n");
-#endif
-
-    {
-        char    test = 0xFF;
-        int     itest = test;   // promote to int, see if it sign-extended
-        if (itest < 0)
-            SkDebugf("SkGraphics: char is signed\n");
-        else
-            SkDebugf("SkGraphics: char is unsigned\n");
-    }
-    for (i = 0; i < (int)SK_ARRAY_COUNT(gTypeSize); i++) {
-        SkDebugf("SkGraphics: sizeof(%s) = %d\n",
-                 gTypeSize[i].fTypeName, gTypeSize[i].fSizeOf);
-    }
-    SkDebugf("SkGraphics: font cache limit %dK\n",
-             GetFontCacheLimit() >> 10);
-
-#endif
-
 }
 
-void SkGraphics::Term() {
-    PurgeFontCache();
-    SkPaint::Term();
+///////////////////////////////////////////////////////////////////////////////
+
+void SkGraphics::DumpMemoryStatistics(SkTraceMemoryDump* dump) {
+  SkResourceCache::DumpMemoryStatistics(dump);
+  SkGlyphCache::DumpMemoryStatistics(dump);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/gfx/skia/skia/src/core/SkHalf.cpp b/gfx/skia/skia/src/core/SkHalf.cpp
new file mode 100644
index 000000000000..0db979bc7661
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkHalf.cpp
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkHalf.h"
+#include "SkFloatBits.h"
+
+uint16_t halfMantissa(SkHalf h) {
+    return h & 0x03ff;
+}
+
+uint16_t halfExponent(SkHalf h) {
+    return (h >> 10) & 0x001f;
+}
+
+uint16_t halfSign(SkHalf h) {
+    return h >> 15;
+}
+
+union FloatUIntUnion {
+    uint32_t fUInt;    // this must come first for the initializations below to work
+    float    fFloat;
+};
+
+// based on Fabien Giesen's float_to_half_fast3()
+// see https://gist.github.com/rygorous/2156668
+SkHalf SkFloatToHalf(float f) {
+    static const uint32_t f32infty = { 255 << 23 };
+    static const uint32_t f16infty = { 31 << 23 };
+    static const FloatUIntUnion magic = { 15 << 23 };
+    static const uint32_t sign_mask = 0x80000000u;
+    static const uint32_t round_mask = ~0xfffu;
+    SkHalf o = 0;
+    
+    FloatUIntUnion floatUnion;
+    floatUnion.fFloat = f;
+    
+    uint32_t sign = floatUnion.fUInt & sign_mask;
+    floatUnion.fUInt ^= sign;
+    
+    // NOTE all the integer compares in this function can be safely
+    // compiled into signed compares since all operands are below
+    // 0x80000000. Important if you want fast straight SSE2 code
+    // (since there's no unsigned PCMPGTD).
+    
+    // Inf or NaN (all exponent bits set)
+    if (floatUnion.fUInt >= f32infty)
+        // NaN->qNaN and Inf->Inf
+        o = (floatUnion.fUInt > f32infty) ? 0x7e00 : 0x7c00;
+    // (De)normalized number or zero
+    else {
+        floatUnion.fUInt &= round_mask;
+        floatUnion.fFloat *= magic.fFloat;
+        floatUnion.fUInt -= round_mask;
+        // Clamp to signed infinity if overflowed
+        if (floatUnion.fUInt > f16infty) {
+            floatUnion.fUInt = f16infty;
+        }
+        
+        o = floatUnion.fUInt >> 13; // Take the bits!
+    }
+    
+    o |= sign >> 16;
+    return o;
+}
+
+// based on Fabien Giesen's half_to_float_fast2()
+// see https://fgiesen.wordpress.com/2012/03/28/half-to-float-done-quic/
+float SkHalfToFloat(SkHalf h) {
+    static const FloatUIntUnion magic = { 126 << 23 };
+    FloatUIntUnion o;
+    
+    if (halfExponent(h) == 0)
+    {
+        // Zero / Denormal
+        o.fUInt = magic.fUInt + halfMantissa(h);
+        o.fFloat -= magic.fFloat;
+    }
+    else
+    {
+        // Set mantissa
+        o.fUInt = halfMantissa(h) << 13;
+        // Set exponent
+        if (halfExponent(h) == 0x1f)
+            // Inf/NaN
+            o.fUInt |= (255 << 23);
+        else
+            o.fUInt |= ((127 - 15 + halfExponent(h)) << 23);
+    }
+    
+    // Set sign
+    o.fUInt |= (halfSign(h) << 31);
+    return o.fFloat;
+}
diff --git a/gfx/skia/skia/src/core/SkHalf.h b/gfx/skia/skia/src/core/SkHalf.h
new file mode 100644
index 000000000000..7e41c6ff0c64
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkHalf.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkHalf_DEFINED
+#define SkHalf_DEFINED
+
+#include "SkTypes.h"
+
+// 16-bit floating point value
+// format is 1 bit sign, 5 bits exponent, 10 bits mantissa
+// only used for storage
+typedef uint16_t SkHalf;
+
+#define SK_HalfMin      0x0400   // 2^-24  (minimum positive normal value)
+#define SK_HalfMax      0x7bff   // 65504
+#define SK_HalfEpsilon  0x1400   // 2^-10
+
+// convert between half and single precision floating point
+float SkHalfToFloat(SkHalf h);
+SkHalf SkFloatToHalf(float f);
+
+#endif
diff --git a/gfx/skia/skia/src/core/SkImageCacherator.cpp b/gfx/skia/skia/src/core/SkImageCacherator.cpp
new file mode 100644
index 000000000000..f4a2ab734a5d
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkImageCacherator.cpp
@@ -0,0 +1,355 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkBitmap.h"
+#include "SkBitmapCache.h"
+#include "SkImage_Base.h"
+#include "SkImageCacherator.h"
+#include "SkMallocPixelRef.h"
+#include "SkNextID.h"
+#include "SkPixelRef.h"
+#include "SkResourceCache.h"
+
+#if SK_SUPPORT_GPU
+#include "GrContext.h"
+#include "GrGpuResourcePriv.h"
+#include "GrResourceKey.h"
+#include "GrTextureParams.h"
+#include "GrYUVProvider.h"
+#include "SkGr.h"
+#include "SkGrPriv.h"
+#endif
+
+SkImageCacherator* SkImageCacherator::NewFromGenerator(SkImageGenerator* gen,
+                                                       const SkIRect* subset) {
+    if (!gen) {
+        return nullptr;
+    }
+
+    // We are required to take ownership of gen, regardless of if we return a cacherator or not
+    SkAutoTDelete<SkImageGenerator> genHolder(gen);
+
+    const SkImageInfo& info = gen->getInfo();
+    if (info.isEmpty()) {
+        return nullptr;
+    }
+
+    uint32_t uniqueID = gen->uniqueID();
+    const SkIRect bounds = SkIRect::MakeWH(info.width(), info.height());
+    if (subset) {
+        if (!bounds.contains(*subset)) {
+            return nullptr;
+        }
+        if (*subset != bounds) {
+            // we need a different uniqueID since we really are a subset of the raw generator
+            uniqueID = SkNextID::ImageID();
+        }
+    } else {
+        subset = &bounds;
+    }
+
+    // Now that we know we can hand-off the generator (to be owned by the cacherator) we can
+    // release our holder. (we DONT want to delete it here anymore)
+    genHolder.detach();
+
+    return new SkImageCacherator(gen, gen->getInfo().makeWH(subset->width(), subset->height()),
+                                 SkIPoint::Make(subset->x(), subset->y()), uniqueID);
+}
+
+SkImageCacherator::SkImageCacherator(SkImageGenerator* gen, const SkImageInfo& info,
+                                     const SkIPoint& origin, uint32_t uniqueID)
+    : fNotThreadSafeGenerator(gen)
+    , fInfo(info)
+    , fOrigin(origin)
+    , fUniqueID(uniqueID)
+{}
+
+SkData* SkImageCacherator::refEncoded() {
+    ScopedGenerator generator(this);
+    return generator->refEncodedData();
+}
+
+static bool check_output_bitmap(const SkBitmap& bitmap, uint32_t expectedID) {
+    SkASSERT(bitmap.getGenerationID() == expectedID);
+    SkASSERT(bitmap.isImmutable());
+    SkASSERT(bitmap.getPixels());
+    return true;
+}
+
+// Note, this returns a new, mutable, bitmap, with a new genID.
+// If you want the immutable bitmap with the same ID as our cacherator, call tryLockAsBitmap()
+//
+bool SkImageCacherator::generateBitmap(SkBitmap* bitmap) {
+    SkBitmap::Allocator* allocator = SkResourceCache::GetAllocator();
+
+    ScopedGenerator generator(this);
+    const SkImageInfo& genInfo = generator->getInfo();
+    if (fInfo.dimensions() == genInfo.dimensions()) {
+        SkASSERT(fOrigin.x() == 0 && fOrigin.y() == 0);
+        // fast-case, no copy needed
+        return generator->tryGenerateBitmap(bitmap, fInfo, allocator);
+    } else {
+        // need to handle subsetting, so we first generate the full size version, and then
+        // "read" from it to get our subset. See https://bug.skia.org/4213
+
+        SkBitmap full;
+        if (!generator->tryGenerateBitmap(&full, genInfo, allocator)) {
+            return false;
+        }
+        if (!bitmap->tryAllocPixels(fInfo, nullptr, full.getColorTable())) {
+            return false;
+        }
+        return full.readPixels(bitmap->info(), bitmap->getPixels(), bitmap->rowBytes(),
+                               fOrigin.x(), fOrigin.y());
+    }
+}
+
+bool SkImageCacherator::directGeneratePixels(const SkImageInfo& info, void* pixels, size_t rb,
+                                             int srcX, int srcY) {
+    ScopedGenerator generator(this);
+    const SkImageInfo& genInfo = generator->getInfo();
+    // Currently generators do not natively handle subsets, so check that first.
+    if (srcX || srcY || genInfo.width() != info.width() || genInfo.height() != info.height()) {
+        return false;
+    }
+    return generator->getPixels(info, pixels, rb);
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+
+bool SkImageCacherator::lockAsBitmapOnlyIfAlreadyCached(SkBitmap* bitmap) {
+    return SkBitmapCache::Find(fUniqueID, bitmap) && check_output_bitmap(*bitmap, fUniqueID);
+}
+
+bool SkImageCacherator::tryLockAsBitmap(SkBitmap* bitmap, const SkImage* client,
+                                        SkImage::CachingHint chint) {
+    if (this->lockAsBitmapOnlyIfAlreadyCached(bitmap)) {
+        return true;
+    }
+    if (!this->generateBitmap(bitmap)) {
+        return false;
+    }
+
+    bitmap->pixelRef()->setImmutableWithID(fUniqueID);
+    if (SkImage::kAllow_CachingHint == chint) {
+        SkBitmapCache::Add(fUniqueID, *bitmap);
+        if (client) {
+            as_IB(client)->notifyAddedToCache();
+        }
+    }
+    return true;
+}
+
+bool SkImageCacherator::lockAsBitmap(SkBitmap* bitmap, const SkImage* client,
+                                     SkImage::CachingHint chint) {
+    if (this->tryLockAsBitmap(bitmap, client, chint)) {
+        return check_output_bitmap(*bitmap, fUniqueID);
+    }
+
+#if SK_SUPPORT_GPU
+    // Try to get a texture and read it back to raster (and then cache that with our ID)
+    SkAutoTUnref<GrTexture> tex;
+
+    {
+        ScopedGenerator generator(this);
+        SkIRect subset = SkIRect::MakeXYWH(fOrigin.x(), fOrigin.y(), fInfo.width(), fInfo.height());
+        tex.reset(generator->generateTexture(nullptr, &subset));
+    }
+    if (!tex) {
+        bitmap->reset();
+        return false;
+    }
+
+    if (!bitmap->tryAllocPixels(fInfo)) {
+        bitmap->reset();
+        return false;
+    }
+
+    const uint32_t pixelOpsFlags = 0;
+    if (!tex->readPixels(0, 0, bitmap->width(), bitmap->height(), SkImageInfo2GrPixelConfig(fInfo),
+                         bitmap->getPixels(), bitmap->rowBytes(), pixelOpsFlags)) {
+        bitmap->reset();
+        return false;
+    }
+
+    bitmap->pixelRef()->setImmutableWithID(fUniqueID);
+    if (SkImage::kAllow_CachingHint == chint) {
+        SkBitmapCache::Add(fUniqueID, *bitmap);
+        if (client) {
+            as_IB(client)->notifyAddedToCache();
+        }
+    }
+    return check_output_bitmap(*bitmap, fUniqueID);
+#else
+    return false;
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+
+#if SK_SUPPORT_GPU
+
+static GrTexture* load_compressed_into_texture(GrContext* ctx, SkData* data, GrSurfaceDesc desc) {
+    const void* rawStart;
+    GrPixelConfig config = GrIsCompressedTextureDataSupported(ctx, data, desc.fWidth, desc.fHeight,
+                                                              &rawStart);
+    if (kUnknown_GrPixelConfig == config) {
+        return nullptr;
+    }
+
+    desc.fConfig = config;
+    return ctx->textureProvider()->createTexture(desc, true, rawStart, 0);
+}
+
+class Generator_GrYUVProvider : public GrYUVProvider {
+    SkImageGenerator* fGen;
+
+public:
+    Generator_GrYUVProvider(SkImageGenerator* gen) : fGen(gen) {}
+
+    uint32_t onGetID() override { return fGen->uniqueID(); }
+    bool onGetYUVSizes(SkISize sizes[3]) override {
+        return fGen->getYUV8Planes(sizes, nullptr, nullptr, nullptr);
+    }
+    bool onGetYUVPlanes(SkISize sizes[3], void* planes[3], size_t rowBytes[3],
+                        SkYUVColorSpace* space) override {
+        return fGen->getYUV8Planes(sizes, planes, rowBytes, space);
+    }
+};
+
+static GrTexture* set_key_and_return(GrTexture* tex, const GrUniqueKey& key) {
+    if (key.isValid()) {
+        tex->resourcePriv().setUniqueKey(key);
+    }
+    return tex;
+}
+
+/*
+ *  We have a 5 ways to try to return a texture (in sorted order)
+ *
+ *  1. Check the cache for a pre-existing one
+ *  2. Ask the generator to natively create one
+ *  3. Ask the generator to return a compressed form that the GPU might support
+ *  4. Ask the generator to return YUV planes, which the GPU can convert
+ *  5. Ask the generator to return RGB(A) data, which the GPU can convert
+ */
+GrTexture* SkImageCacherator::lockTexture(GrContext* ctx, const GrUniqueKey& key,
+                                          const SkImage* client, SkImage::CachingHint chint) {
+    // 1. Check the cache for a pre-existing one
+    if (key.isValid()) {
+        if (GrTexture* tex = ctx->textureProvider()->findAndRefTextureByUniqueKey(key)) {
+            return tex;
+        }
+    }
+
+    // 2. Ask the generator to natively create one
+    {
+        ScopedGenerator generator(this);
+        SkIRect subset = SkIRect::MakeXYWH(fOrigin.x(), fOrigin.y(), fInfo.width(), fInfo.height());
+        if (GrTexture* tex = generator->generateTexture(ctx, &subset)) {
+            return set_key_and_return(tex, key);
+        }
+    }
+
+    const GrSurfaceDesc desc = GrImageInfoToSurfaceDesc(fInfo);
+
+    // 3. Ask the generator to return a compressed form that the GPU might support
+    SkAutoTUnref<SkData> data(this->refEncoded());
+    if (data) {
+        GrTexture* tex = load_compressed_into_texture(ctx, data, desc);
+        if (tex) {
+            return set_key_and_return(tex, key);
+        }
+    }
+
+    // 4. Ask the generator to return YUV planes, which the GPU can convert
+    {
+        ScopedGenerator generator(this);
+        Generator_GrYUVProvider provider(generator);
+        GrTexture* tex = provider.refAsTexture(ctx, desc, true);
+        if (tex) {
+            return set_key_and_return(tex, key);
+        }
+    }
+
+    // 5. Ask the generator to return RGB(A) data, which the GPU can convert
+    SkBitmap bitmap;
+    if (this->tryLockAsBitmap(&bitmap, client, chint)) {
+        GrTexture* tex = GrUploadBitmapToTexture(ctx, bitmap);
+        if (tex) {
+            return set_key_and_return(tex, key);
+        }
+    }
+    return nullptr;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#include "GrTextureParamsAdjuster.h"
+
+class Cacherator_GrTextureMaker : public GrTextureMaker {
+public:
+    Cacherator_GrTextureMaker(GrContext* context, SkImageCacherator* cacher, const SkImage* client,
+                              SkImage::CachingHint chint)
+        : INHERITED(context, cacher->info().width(), cacher->info().height())
+        , fCacher(cacher)
+        , fClient(client)
+        , fCachingHint(chint)
+    {
+        if (client) {
+            GrMakeKeyFromImageID(&fOriginalKey, client->uniqueID(),
+                                 SkIRect::MakeWH(this->width(), this->height()));
+        }
+    }
+
+protected:
+    // TODO: consider overriding this, for the case where the underlying generator might be
+    //       able to efficiently produce a "stretched" texture natively (e.g. picture-backed)
+    //          GrTexture* generateTextureForParams(const CopyParams&) override;
+
+    GrTexture* refOriginalTexture() override {
+        return fCacher->lockTexture(this->context(), fOriginalKey, fClient, fCachingHint);
+    }
+
+    void makeCopyKey(const CopyParams& stretch, GrUniqueKey* paramsCopyKey) override {
+        if (fOriginalKey.isValid()) {
+            MakeCopyKeyFromOrigKey(fOriginalKey, stretch, paramsCopyKey);
+        }
+    }
+
+    void didCacheCopy(const GrUniqueKey& copyKey) override {
+        if (fClient) {
+            as_IB(fClient)->notifyAddedToCache();
+        }
+    }
+
+private:
+    SkImageCacherator*      fCacher;
+    const SkImage*          fClient;
+    GrUniqueKey             fOriginalKey;
+    SkImage::CachingHint    fCachingHint;
+
+    typedef GrTextureMaker INHERITED;
+};
+
+GrTexture* SkImageCacherator::lockAsTexture(GrContext* ctx, const GrTextureParams& params,
+                                            const SkImage* client, SkImage::CachingHint chint) {
+    if (!ctx) {
+        return nullptr;
+    }
+
+    return Cacherator_GrTextureMaker(ctx, this, client, chint).refTextureForParams(params);
+}
+
+#else
+
+GrTexture* SkImageCacherator::lockAsTexture(GrContext* ctx, const GrTextureParams&,
+                                            const SkImage* client, SkImage::CachingHint) {
+    return nullptr;
+}
+
+#endif
diff --git a/gfx/skia/skia/src/core/SkImageCacherator.h b/gfx/skia/skia/src/core/SkImageCacherator.h
new file mode 100644
index 000000000000..bce39679c628
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkImageCacherator.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkImageCacherator_DEFINED
+#define SkImageCacherator_DEFINED
+
+#include "SkImageGenerator.h"
+#include "SkMutex.h"
+#include "SkTemplates.h"
+
+class GrContext;
+class GrTextureParams;
+class GrUniqueKey;
+class SkBitmap;
+class SkImage;
+
+/*
+ *  Internal class to manage caching the output of an ImageGenerator.
+ */
+class SkImageCacherator {
+public:
+    // Takes ownership of the generator
+    static SkImageCacherator* NewFromGenerator(SkImageGenerator*, const SkIRect* subset = nullptr);
+
+    const SkImageInfo& info() const { return fInfo; }
+    uint32_t uniqueID() const { return fUniqueID; }
+
+    /**
+     *  On success (true), bitmap will point to the pixels for this generator. If this returns
+     *  false, the bitmap will be reset to empty.
+     *
+     *  If not NULL, the client will be notified (->notifyAddedToCache()) when resources are
+     *  added to the cache on its behalf.
+     */
+    bool lockAsBitmap(SkBitmap*, const SkImage* client,
+                      SkImage::CachingHint = SkImage::kAllow_CachingHint);
+
+    /**
+     *  Returns a ref() on the texture produced by this generator. The caller must call unref()
+     *  when it is done. Will return nullptr on failure.
+     *
+     *  If not NULL, the client will be notified (->notifyAddedToCache()) when resources are
+     *  added to the cache on its behalf.
+     *
+     *  The caller is responsible for calling texture->unref() when they are done.
+     */
+    GrTexture* lockAsTexture(GrContext*, const GrTextureParams&, const SkImage* client,
+                             SkImage::CachingHint = SkImage::kAllow_CachingHint);
+
+    /**
+     *  If the underlying src naturally is represented by an encoded blob (in SkData), this returns
+     *  a ref to that data. If not, it returns null.
+     */
+    SkData* refEncoded();
+
+    // Only return true if the generate has already been cached.
+    bool lockAsBitmapOnlyIfAlreadyCached(SkBitmap*);
+    // Call the underlying generator directly
+    bool directGeneratePixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRB,
+                              int srcX, int srcY);
+
+private:
+    SkImageCacherator(SkImageGenerator*, const SkImageInfo&, const SkIPoint&, uint32_t uniqueID);
+
+    bool generateBitmap(SkBitmap*);
+    bool tryLockAsBitmap(SkBitmap*, const SkImage*, SkImage::CachingHint);
+#if SK_SUPPORT_GPU
+    // Returns the texture. If the cacherator is generating the texture and wants to cache it,
+    // it should use the passed in key (if the key is valid).
+    GrTexture* lockTexture(GrContext*, const GrUniqueKey& key, const SkImage* client,
+                           SkImage::CachingHint);
+#endif
+
+    class ScopedGenerator {
+        SkImageCacherator* fCacher;
+    public:
+        ScopedGenerator(SkImageCacherator* cacher) : fCacher(cacher) {
+            fCacher->fMutexForGenerator.acquire();
+        }
+        ~ScopedGenerator() {
+            fCacher->fMutexForGenerator.release();
+        }
+        SkImageGenerator* operator->() const { return fCacher->fNotThreadSafeGenerator; }
+        operator SkImageGenerator*() const { return fCacher->fNotThreadSafeGenerator; }
+    };
+
+    SkMutex                         fMutexForGenerator;
+    SkAutoTDelete<SkImageGenerator> fNotThreadSafeGenerator;
+
+    const SkImageInfo   fInfo;
+    const SkIPoint      fOrigin;
+    const uint32_t      fUniqueID;
+
+    friend class Cacherator_GrTextureMaker;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/core/SkImageFilter.cpp b/gfx/skia/skia/src/core/SkImageFilter.cpp
index 11a1420dfaf2..6a3286ed6747 100644
--- a/gfx/skia/skia/src/core/SkImageFilter.cpp
+++ b/gfx/skia/skia/src/core/SkImageFilter.cpp
@@ -8,19 +8,126 @@
 #include "SkImageFilter.h"
 
 #include "SkBitmap.h"
+#include "SkBitmapDevice.h"
 #include "SkChecksum.h"
 #include "SkDevice.h"
+#include "SkLocalMatrixImageFilter.h"
+#include "SkMatrixImageFilter.h"
+#include "SkMutex.h"
+#include "SkOncePtr.h"
 #include "SkReadBuffer.h"
-#include "SkWriteBuffer.h"
 #include "SkRect.h"
 #include "SkTDynamicHash.h"
+#include "SkTInternalLList.h"
 #include "SkValidationUtils.h"
+#include "SkWriteBuffer.h"
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
+#include "GrDrawContext.h"
 #include "SkGrPixelRef.h"
 #include "SkGr.h"
 #endif
 
+#ifdef SK_BUILD_FOR_IOS
+  enum { kDefaultCacheSize = 2 * 1024 * 1024 };
+#else
+  enum { kDefaultCacheSize = 128 * 1024 * 1024 };
+#endif
+
+#ifndef SK_IGNORE_TO_STRING
+void SkImageFilter::CropRect::toString(SkString* str) const {
+    if (!fFlags) {
+        return;
+    }
+
+    str->appendf("cropRect (");
+    if (fFlags & CropRect::kHasLeft_CropEdge) {
+        str->appendf("%.2f, ", fRect.fLeft);
+    } else {
+        str->appendf("X, ");
+    }
+    if (fFlags & CropRect::kHasTop_CropEdge) {
+        str->appendf("%.2f, ", fRect.fTop);
+    } else {
+        str->appendf("X, ");
+    }
+    if (fFlags & CropRect::kHasWidth_CropEdge) {
+        str->appendf("%.2f, ", fRect.width());
+    } else {
+        str->appendf("X, ");
+    }
+    if (fFlags & CropRect::kHasHeight_CropEdge) {
+        str->appendf("%.2f", fRect.height());
+    } else {
+        str->appendf("X");
+    }
+    str->appendf(") ");
+}
+#endif
+
+bool SkImageFilter::CropRect::applyTo(const SkIRect& imageBounds, const Context& ctx,
+                                      SkIRect* cropped) const {
+    *cropped = imageBounds;
+    if (fFlags) {
+        SkRect devCropR;
+        ctx.ctm().mapRect(&devCropR, fRect);
+        const SkIRect devICropR = devCropR.roundOut();
+
+        // Compute the left/top first, in case we have to read them to compute right/bottom
+        if (fFlags & kHasLeft_CropEdge) {
+            cropped->fLeft = devICropR.fLeft;
+        }
+        if (fFlags & kHasTop_CropEdge) {
+            cropped->fTop = devICropR.fTop;
+        }
+        if (fFlags & kHasWidth_CropEdge) {
+            cropped->fRight = cropped->fLeft + devICropR.width();
+        }
+        if (fFlags & kHasHeight_CropEdge) {
+            cropped->fBottom = cropped->fTop + devICropR.height();
+        }
+    }
+    // Intersect against the clip bounds, in case the crop rect has
+    // grown the bounds beyond the original clip. This can happen for
+    // example in tiling, where the clip is much smaller than the filtered
+    // primitive. If we didn't do this, we would be processing the filter
+    // at the full crop rect size in every tile.
+    return cropped->intersect(ctx.clipBounds());
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+static int32_t next_image_filter_unique_id() {
+    static int32_t gImageFilterUniqueID;
+
+    // Never return 0.
+    int32_t id;
+    do {
+        id = sk_atomic_inc(&gImageFilterUniqueID) + 1;
+    } while (0 == id);
+    return id;
+}
+
+struct SkImageFilter::Cache::Key {
+    Key(const uint32_t uniqueID, const SkMatrix& matrix, const SkIRect& clipBounds, uint32_t srcGenID)
+      : fUniqueID(uniqueID), fMatrix(matrix), fClipBounds(clipBounds), fSrcGenID(srcGenID) {
+        // Assert that Key is tightly-packed, since it is hashed.
+        static_assert(sizeof(Key) == sizeof(uint32_t) + sizeof(SkMatrix) + sizeof(SkIRect) +
+                                     sizeof(uint32_t), "image_filter_key_tight_packing");
+        fMatrix.getType();  // force initialization of type, so hashes match
+    }
+    uint32_t fUniqueID;
+    SkMatrix fMatrix;
+    SkIRect fClipBounds;
+    uint32_t fSrcGenID;
+    bool operator==(const Key& other) const {
+        return fUniqueID == other.fUniqueID
+            && fMatrix == other.fMatrix
+            && fClipBounds == other.fClipBounds
+            && fSrcGenID == other.fSrcGenID;
+    }
+};
+
 SkImageFilter::Common::~Common() {
     for (int i = 0; i < fInputs.count(); ++i) {
         SkSafeUnref(fInputs[i]);
@@ -40,11 +147,11 @@ void SkImageFilter::Common::detachInputs(SkImageFilter** inputs) {
 }
 
 bool SkImageFilter::Common::unflatten(SkReadBuffer& buffer, int expectedCount) {
-    int count = buffer.readInt();
-    if (expectedCount < 0) {    // means the caller doesn't care how many
-        expectedCount = count;
+    const int count = buffer.readInt();
+    if (!buffer.validate(count >= 0)) {
+        return false;
     }
-    if (!buffer.validate((count == expectedCount) && (count >= 0))) {
+    if (!buffer.validate(expectedCount < 0 || count == expectedCount)) {
         return false;
     }
 
@@ -62,21 +169,28 @@ bool SkImageFilter::Common::unflatten(SkReadBuffer& buffer, int expectedCount) {
     if (!buffer.isValid() || !buffer.validate(SkIsValidRect(rect))) {
         return false;
     }
-    
+
     uint32_t flags = buffer.readUInt();
     fCropRect = CropRect(rect, flags);
+    if (buffer.isVersionLT(SkReadBuffer::kImageFilterNoUniqueID_Version)) {
+
+        (void) buffer.readUInt();
+    }
     return buffer.isValid();
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-SkImageFilter::Cache* gExternalCache;
-
 SkImageFilter::SkImageFilter(int inputCount, SkImageFilter** inputs, const CropRect* cropRect)
   : fInputCount(inputCount),
     fInputs(new SkImageFilter*[inputCount]),
-    fCropRect(cropRect ? *cropRect : CropRect(SkRect(), 0x0)) {
+    fUsesSrcInput(false),
+    fCropRect(cropRect ? *cropRect : CropRect(SkRect(), 0x0)),
+    fUniqueID(next_image_filter_unique_id()) {
     for (int i = 0; i < inputCount; ++i) {
+        if (nullptr == inputs[i] || inputs[i]->usesSrcInput()) {
+            fUsesSrcInput = true;
+        }
         fInputs[i] = inputs[i];
         SkSafeRef(fInputs[i]);
     }
@@ -89,25 +203,32 @@ SkImageFilter::~SkImageFilter() {
     delete[] fInputs;
 }
 
-SkImageFilter::SkImageFilter(int inputCount, SkReadBuffer& buffer) {
+SkImageFilter::SkImageFilter(int inputCount, SkReadBuffer& buffer)
+  : fUsesSrcInput(false)
+  , fUniqueID(next_image_filter_unique_id()) {
     Common common;
     if (common.unflatten(buffer, inputCount)) {
         fCropRect = common.cropRect();
         fInputCount = common.inputCount();
-        fInputs = SkNEW_ARRAY(SkImageFilter*, fInputCount);
+        fInputs = new SkImageFilter* [fInputCount];
         common.detachInputs(fInputs);
+        for (int i = 0; i < fInputCount; ++i) {
+            if (nullptr == fInputs[i] || fInputs[i]->usesSrcInput()) {
+                fUsesSrcInput = true;
+            }
+        }
     } else {
         fInputCount = 0;
-        fInputs = NULL;
+        fInputs = nullptr;
     }
 }
 
 void SkImageFilter::flatten(SkWriteBuffer& buffer) const {
     buffer.writeInt(fInputCount);
     for (int i = 0; i < fInputCount; i++) {
-        SkImageFilter* input = getInput(i);
-        buffer.writeBool(input != NULL);
-        if (input != NULL) {
+        SkImageFilter* input = this->getInput(i);
+        buffer.writeBool(input != nullptr);
+        if (input != nullptr) {
             buffer.writeFlattenable(input);
         }
     }
@@ -118,12 +239,14 @@ void SkImageFilter::flatten(SkWriteBuffer& buffer) const {
 bool SkImageFilter::filterImage(Proxy* proxy, const SkBitmap& src,
                                 const Context& context,
                                 SkBitmap* result, SkIPoint* offset) const {
-    Cache* cache = context.cache();
     SkASSERT(result);
     SkASSERT(offset);
-    SkASSERT(cache);
-    if (cache->get(this, result, offset)) {
-        return true;
+    uint32_t srcGenID = fUsesSrcInput ? src.getGenerationID() : 0;
+    Cache::Key key(fUniqueID, context.ctm(), context.clipBounds(), srcGenID);
+    if (context.cache()) {
+        if (context.cache()->get(key, result, offset)) {
+            return true;
+        }
     }
     /*
      *  Give the proxy first shot at the filter. If it returns false, ask
@@ -131,26 +254,35 @@ bool SkImageFilter::filterImage(Proxy* proxy, const SkBitmap& src,
      */
     if ((proxy && proxy->filterImage(this, src, context, result, offset)) ||
         this->onFilterImage(proxy, src, context, result, offset)) {
-        cache->set(this, *result, *offset);
+        if (context.cache()) {
+            context.cache()->set(key, *result, *offset);
+        }
         return true;
     }
     return false;
 }
 
-bool SkImageFilter::filterBounds(const SkIRect& src, const SkMatrix& ctm,
-                                 SkIRect* dst) const {
-    SkASSERT(&src);
-    SkASSERT(dst);
-    if (SkImageFilter::GetExternalCache()) {
-        /*
-         *  When the external cache is active, do not intersect the saveLayer
-         *  bounds with the clip bounds. This is so that the cached result
-         *  is always the full size of the primitive's bounds,
-         *  regardless of the clip active on first draw.
-         */
-        *dst = SkIRect::MakeLargest();
+bool SkImageFilter::filterInput(int index, Proxy* proxy, const SkBitmap& src,
+                                const Context& origCtx,
+                                SkBitmap* result, SkIPoint* offset,
+                                bool relaxSizeConstraint) const {
+    SkImageFilter* input = this->getInput(index);
+    if (!input) {
         return true;
     }
+
+    SizeConstraint constraint = origCtx.sizeConstraint();
+    if (relaxSizeConstraint && (kExact_SizeConstraint == constraint)) {
+        constraint = kApprox_SizeConstraint;
+    }
+    Context ctx(origCtx.ctm(), origCtx.clipBounds(), origCtx.cache(), constraint);
+
+    return input->filterImage(proxy, src, ctx, result, offset);
+}
+
+bool SkImageFilter::filterBounds(const SkIRect& src, const SkMatrix& ctm,
+                                 SkIRect* dst) const {
+    SkASSERT(dst);
     return this->onFilterBounds(src, ctm, dst);
 }
 
@@ -176,13 +308,30 @@ void SkImageFilter::computeFastBounds(const SkRect& src, SkRect* dst) const {
     }
 }
 
+bool SkImageFilter::canComputeFastBounds() const {
+    if (this->affectsTransparentBlack()) {
+        return false;
+    }
+    for (int i = 0; i < fInputCount; i++) {
+        SkImageFilter* input = this->getInput(i);
+        if (input && !input->canComputeFastBounds()) {
+            return false;
+        }
+    }
+    return true;
+}
+
+bool SkImageFilter::affectsTransparentBlack() const {
+    return false;
+}
+
 bool SkImageFilter::onFilterImage(Proxy*, const SkBitmap&, const Context&,
                                   SkBitmap*, SkIPoint*) const {
     return false;
 }
 
 bool SkImageFilter::canFilterImageGPU() const {
-    return this->asNewEffect(NULL, NULL, SkMatrix::I(), SkIRect());
+    return this->asFragmentProcessor(nullptr, nullptr, SkMatrix::I(), SkIRect());
 }
 
 bool SkImageFilter::filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx,
@@ -191,8 +340,7 @@ bool SkImageFilter::filterImageGPU(Proxy* proxy, const SkBitmap& src, const Cont
     SkBitmap input = src;
     SkASSERT(fInputCount == 1);
     SkIPoint srcOffset = SkIPoint::Make(0, 0);
-    if (this->getInput(0) &&
-        !this->getInput(0)->getInputResultGPU(proxy, src, ctx, &input, &srcOffset)) {
+    if (!this->filterInputGPU(0, proxy, src, ctx, &input, &srcOffset)) {
         return false;
     }
     GrTexture* srcTexture = input.getTexture();
@@ -204,56 +352,55 @@ bool SkImageFilter::filterImageGPU(Proxy* proxy, const SkBitmap& src, const Cont
     SkRect dstRect = SkRect::MakeWH(srcRect.width(), srcRect.height());
     GrContext* context = srcTexture->getContext();
 
-    GrTextureDesc desc;
-    desc.fFlags = kRenderTarget_GrTextureFlagBit,
+    GrSurfaceDesc desc;
+    desc.fFlags = kRenderTarget_GrSurfaceFlag,
     desc.fWidth = bounds.width();
     desc.fHeight = bounds.height();
     desc.fConfig = kRGBA_8888_GrPixelConfig;
 
-    GrAutoScratchTexture dst(context, desc);
-    GrContext::AutoMatrix am;
-    am.setIdentity(context);
-    GrContext::AutoRenderTarget art(context, dst.texture()->asRenderTarget());
-    GrContext::AutoClip acs(context, dstRect);
-    GrEffect* effect;
+    SkAutoTUnref<GrTexture> dst(context->textureProvider()->createTexture(desc,
+                                      GrTextureProvider::FromImageFilter(ctx.sizeConstraint())));
+    if (!dst) {
+        return false;
+    }
+
+    // setup new clip
+    GrClip clip(dstRect);
+
+    GrFragmentProcessor* fp;
     offset->fX = bounds.left();
     offset->fY = bounds.top();
     bounds.offset(-srcOffset);
     SkMatrix matrix(ctx.ctm());
     matrix.postTranslate(SkIntToScalar(-bounds.left()), SkIntToScalar(-bounds.top()));
-    this->asNewEffect(&effect, srcTexture, matrix, bounds);
-    SkASSERT(effect);
     GrPaint paint;
-    paint.addColorEffect(effect)->unref();
-    context->drawRectToRect(paint, dstRect, srcRect);
+    if (this->asFragmentProcessor(&fp, srcTexture, matrix, bounds)) {
+        SkASSERT(fp);
+        paint.addColorFragmentProcessor(fp)->unref();
+        paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode);
 
-    SkAutoTUnref<GrTexture> resultTex(dst.detach());
-    WrapTexture(resultTex, bounds.width(), bounds.height(), result);
-    return true;
-#else
-    return false;
+        SkAutoTUnref<GrDrawContext> drawContext(context->drawContext(dst->asRenderTarget()));
+        if (drawContext) {
+            drawContext->fillRectToRect(clip, paint, SkMatrix::I(), dstRect, srcRect);
+
+            WrapTexture(dst, bounds.width(), bounds.height(), result);
+            return true;
+        }
+    }
 #endif
+    return false;
 }
 
 bool SkImageFilter::applyCropRect(const Context& ctx, const SkBitmap& src,
-                                  const SkIPoint& srcOffset, SkIRect* bounds) const {
-    SkIRect srcBounds;
-    src.getBounds(&srcBounds);
-    srcBounds.offset(srcOffset);
-    SkRect cropRect;
-    ctx.ctm().mapRect(&cropRect, fCropRect.rect());
-    SkIRect cropRectI;
-    cropRect.roundOut(&cropRectI);
-    uint32_t flags = fCropRect.flags();
-    if (flags & CropRect::kHasLeft_CropEdge) srcBounds.fLeft = cropRectI.fLeft;
-    if (flags & CropRect::kHasTop_CropEdge) srcBounds.fTop = cropRectI.fTop;
-    if (flags & CropRect::kHasRight_CropEdge) srcBounds.fRight = cropRectI.fRight;
-    if (flags & CropRect::kHasBottom_CropEdge) srcBounds.fBottom = cropRectI.fBottom;
-    if (!srcBounds.intersect(ctx.clipBounds())) {
-        return false;
+                                  const SkIPoint& srcOffset, SkIRect* dstBounds,
+                                  SkIRect* srcBounds) const {
+    SkIRect storage;
+    if (!srcBounds) {
+        srcBounds = &storage;
     }
-    *bounds = srcBounds;
-    return true;
+    src.getBounds(srcBounds);
+    srcBounds->offset(srcOffset);
+    return fCropRect.applyTo(*srcBounds, ctx, dstBounds) && srcBounds->intersect(*dstBounds);
 }
 
 bool SkImageFilter::applyCropRect(const Context& ctx, Proxy* proxy, const SkBitmap& src,
@@ -261,19 +408,10 @@ bool SkImageFilter::applyCropRect(const Context& ctx, Proxy* proxy, const SkBitm
     SkIRect srcBounds;
     src.getBounds(&srcBounds);
     srcBounds.offset(*srcOffset);
-    SkRect cropRect;
-    ctx.ctm().mapRect(&cropRect, fCropRect.rect());
-    SkIRect cropRectI;
-    cropRect.roundOut(&cropRectI);
-    uint32_t flags = fCropRect.flags();
-    *bounds = srcBounds;
-    if (flags & CropRect::kHasLeft_CropEdge) bounds->fLeft = cropRectI.fLeft;
-    if (flags & CropRect::kHasTop_CropEdge) bounds->fTop = cropRectI.fTop;
-    if (flags & CropRect::kHasRight_CropEdge) bounds->fRight = cropRectI.fRight;
-    if (flags & CropRect::kHasBottom_CropEdge) bounds->fBottom = cropRectI.fBottom;
-    if (!bounds->intersect(ctx.clipBounds())) {
+    if (!fCropRect.applyTo(srcBounds, ctx, bounds)) {
         return false;
     }
+
     if (srcBounds.contains(*bounds)) {
         *dst = src;
         return true;
@@ -294,7 +432,8 @@ bool SkImageFilter::applyCropRect(const Context& ctx, Proxy* proxy, const SkBitm
 bool SkImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm,
                                    SkIRect* dst) const {
     if (fInputCount < 1) {
-        return false;
+        *dst = src;
+        return true;
     }
 
     SkIRect bounds;
@@ -317,20 +456,22 @@ bool SkImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm,
     return true;
 }
 
-bool SkImageFilter::asNewEffect(GrEffect**, GrTexture*, const SkMatrix&, const SkIRect&) const {
+bool SkImageFilter::asFragmentProcessor(GrFragmentProcessor**, GrTexture*,
+                                        const SkMatrix&, const SkIRect&) const {
     return false;
 }
 
-bool SkImageFilter::asColorFilter(SkColorFilter**) const {
-    return false;
+SkImageFilter* SkImageFilter::CreateMatrixFilter(const SkMatrix& matrix,
+                                                 SkFilterQuality filterQuality,
+                                                 SkImageFilter* input) {
+    return SkMatrixImageFilter::Create(matrix, filterQuality, input);
 }
 
-void SkImageFilter::SetExternalCache(Cache* cache) {
-    SkRefCnt_SafeAssign(gExternalCache, cache);
-}
-
-SkImageFilter::Cache* SkImageFilter::GetExternalCache() {
-    return gExternalCache;
+SkImageFilter* SkImageFilter::newWithLocalMatrix(const SkMatrix& matrix) const {
+    // SkLocalMatrixImageFilter takes SkImage* in its factory, but logically that parameter
+    // is *always* treated as a const ptr. Hence the const-cast here.
+    //
+    return SkLocalMatrixImageFilter::Create(matrix, const_cast<SkImageFilter*>(this));
 }
 
 #if SK_SUPPORT_GPU
@@ -338,52 +479,62 @@ SkImageFilter::Cache* SkImageFilter::GetExternalCache() {
 void SkImageFilter::WrapTexture(GrTexture* texture, int width, int height, SkBitmap* result) {
     SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
     result->setInfo(info);
-    result->setPixelRef(SkNEW_ARGS(SkGrPixelRef, (info, texture)))->unref();
+    result->setPixelRef(new SkGrPixelRef(info, texture))->unref();
 }
 
-bool SkImageFilter::getInputResultGPU(SkImageFilter::Proxy* proxy,
-                                      const SkBitmap& src, const Context& ctx,
-                                      SkBitmap* result, SkIPoint* offset) const {
+bool SkImageFilter::filterInputGPU(int index, SkImageFilter::Proxy* proxy,
+                                   const SkBitmap& src, const Context& origCtx,
+                                   SkBitmap* result, SkIPoint* offset,
+                                   bool relaxSizeConstraint) const {
+    SkImageFilter* input = this->getInput(index);
+    if (!input) {
+        return true;
+    }
     // Ensure that GrContext calls under filterImage and filterImageGPU below will see an identity
     // matrix with no clip and that the matrix, clip, and render target set before this function was
     // called are restored before we return to the caller.
     GrContext* context = src.getTexture()->getContext();
-    GrContext::AutoWideOpenIdentityDraw awoid(context, NULL);
-    if (this->canFilterImageGPU()) {
-        return this->filterImageGPU(proxy, src, ctx, result, offset);
-    } else {
-        if (this->filterImage(proxy, src, ctx, result, offset)) {
-            if (!result->getTexture()) {
-                const SkImageInfo info = result->info();
-                if (kUnknown_SkColorType == info.colorType()) {
-                    return false;
-                }
-                GrTexture* resultTex = GrLockAndRefCachedBitmapTexture(context, *result, NULL);
-                result->setPixelRef(new SkGrPixelRef(info, resultTex))->unref();
-                GrUnlockAndUnrefCachedBitmapTexture(resultTex);
+
+    SizeConstraint constraint = origCtx.sizeConstraint();
+    if (relaxSizeConstraint && (kExact_SizeConstraint == constraint)) {
+        constraint = kApprox_SizeConstraint;
+    }
+    Context ctx(origCtx.ctm(), origCtx.clipBounds(), origCtx.cache(), constraint);
+
+    if (input->filterImage(proxy, src, ctx, result, offset)) {
+        if (!result->getTexture()) {
+            const SkImageInfo info = result->info();
+            if (kUnknown_SkColorType == info.colorType()) {
+                return false;
             }
-            return true;
-        } else {
-            return false;
+            SkAutoTUnref<GrTexture> resultTex(
+                GrRefCachedBitmapTexture(context, *result,GrTextureParams::ClampNoFilter()));
+            result->setPixelRef(new SkGrPixelRef(info, resultTex))->unref();
         }
+        return true;
+    } else {
+        return false;
     }
 }
 #endif
 
+namespace {
+
 class CacheImpl : public SkImageFilter::Cache {
 public:
-    explicit CacheImpl(int minChildren) : fMinChildren(minChildren) {
-        SkASSERT(fMinChildren <= 2);
+    CacheImpl(size_t maxBytes) : fMaxBytes(maxBytes), fCurrentBytes(0) {
     }
+    virtual ~CacheImpl() {
+        SkTDynamicHash<Value, Key>::Iter iter(&fLookup);
 
-    virtual ~CacheImpl();
-    bool get(const SkImageFilter* key, SkBitmap* result, SkIPoint* offset) SK_OVERRIDE;
-    void set(const SkImageFilter* key, const SkBitmap& result, const SkIPoint& offset) SK_OVERRIDE;
-    void remove(const SkImageFilter* key) SK_OVERRIDE;
-private:
-    typedef const SkImageFilter* Key;
+        while (!iter.done()) {
+            Value* v = &*iter;
+            ++iter;
+            delete v;
+        }
+    }
     struct Value {
-        Value(Key key, const SkBitmap& bitmap, const SkIPoint& offset)
+        Value(const Key& key, const SkBitmap& bitmap, const SkIPoint& offset)
             : fKey(key), fBitmap(bitmap), fOffset(offset) {}
         Key fKey;
         SkBitmap fBitmap;
@@ -391,51 +542,101 @@ private:
         static const Key& GetKey(const Value& v) {
             return v.fKey;
         }
-        static uint32_t Hash(Key key) {
+        static uint32_t Hash(const Key& key) {
             return SkChecksum::Murmur3(reinterpret_cast<const uint32_t*>(&key), sizeof(Key));
         }
+        SK_DECLARE_INTERNAL_LLIST_INTERFACE(Value);
     };
-    SkTDynamicHash<Value, Key> fData;
-    int fMinChildren;
+    bool get(const Key& key, SkBitmap* result, SkIPoint* offset) const override {
+        SkAutoMutexAcquire mutex(fMutex);
+        if (Value* v = fLookup.find(key)) {
+            *result = v->fBitmap;
+            *offset = v->fOffset;
+            if (v != fLRU.head()) {
+                fLRU.remove(v);
+                fLRU.addToHead(v);
+            }
+            return true;
+        }
+        return false;
+    }
+    void set(const Key& key, const SkBitmap& result, const SkIPoint& offset) override {
+        SkAutoMutexAcquire mutex(fMutex);
+        if (Value* v = fLookup.find(key)) {
+            removeInternal(v);
+        }
+        Value* v = new Value(key, result, offset);
+        fLookup.add(v);
+        fLRU.addToHead(v);
+        fCurrentBytes += result.getSize();
+        while (fCurrentBytes > fMaxBytes) {
+            Value* tail = fLRU.tail();
+            SkASSERT(tail);
+            if (tail == v) {
+                break;
+            }
+            removeInternal(tail);
+        }
+    }
+
+    void purge() override {
+        SkAutoMutexAcquire mutex(fMutex);
+        while (fCurrentBytes > 0) {
+            Value* tail = fLRU.tail();
+            SkASSERT(tail);
+            this->removeInternal(tail);
+        }
+    }
+
+private:
+    void removeInternal(Value* v) {
+        fCurrentBytes -= v->fBitmap.getSize();
+        fLRU.remove(v);
+        fLookup.remove(v->fKey);
+        delete v;
+    }
+private:
+    SkTDynamicHash<Value, Key>         fLookup;
+    mutable SkTInternalLList<Value>    fLRU;
+    size_t                             fMaxBytes;
+    size_t                             fCurrentBytes;
+    mutable SkMutex                    fMutex;
 };
 
-bool CacheImpl::get(const SkImageFilter* key, SkBitmap* result, SkIPoint* offset) {
-    Value* v = fData.find(key);
-    if (v) {
-        *result = v->fBitmap;
-        *offset = v->fOffset;
-        return true;
+} // namespace
+
+SkImageFilter::Cache* SkImageFilter::Cache::Create(size_t maxBytes) {
+    return new CacheImpl(maxBytes);
+}
+
+SK_DECLARE_STATIC_ONCE_PTR(SkImageFilter::Cache, cache);
+SkImageFilter::Cache* SkImageFilter::Cache::Get() {
+    return cache.get([]{ return SkImageFilter::Cache::Create(kDefaultCacheSize); });
+}
+
+void SkImageFilter::PurgeCache() {
+    Cache::Get()->purge();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+SkBaseDevice* SkImageFilter::DeviceProxy::createDevice(int w, int h) {
+    SkBaseDevice::CreateInfo cinfo(SkImageInfo::MakeN32Premul(w, h),
+                                   SkBaseDevice::kNever_TileUsage,
+                                   kUnknown_SkPixelGeometry,
+                                   true /*forImageFilter*/);
+    SkBaseDevice* dev = fDevice->onCreateDevice(cinfo, nullptr);
+    if (nullptr == dev) {
+        const SkSurfaceProps surfaceProps(fDevice->fSurfaceProps.flags(),
+                                          kUnknown_SkPixelGeometry);
+        dev = SkBitmapDevice::Create(cinfo.fInfo, surfaceProps);
     }
-    return false;
+    return dev;
 }
 
-void CacheImpl::remove(const SkImageFilter* key) {
-    Value* v = fData.find(key);
-    if (v) {
-        fData.remove(key);
-        delete v;
-    }
+bool SkImageFilter::DeviceProxy::filterImage(const SkImageFilter* filter, const SkBitmap& src,
+                                       const SkImageFilter::Context& ctx,
+                                       SkBitmap* result, SkIPoint* offset) {
+    return fDevice->filterImage(filter, src, ctx, result, offset);
 }
 
-void CacheImpl::set(const SkImageFilter* key, const SkBitmap& result, const SkIPoint& offset) {
-    if (fMinChildren < 2 || !key->unique()) {
-        // We take !key->unique() as a signal that there are probably at least 2 refs on the key,
-        // meaning this filter probably has at least two children and is worth caching when
-        // fMinChildren is 2.  If fMinChildren is less than two, we'll just always cache.
-        fData.add(new Value(key, result, offset));
-    }
-}
-
-SkImageFilter::Cache* SkImageFilter::Cache::Create(int minChildren) {
-    return new CacheImpl(minChildren);
-}
-
-CacheImpl::~CacheImpl() {
-    SkTDynamicHash<Value, Key>::Iter iter(&fData);
-
-    while (!iter.done()) {
-        Value* v = &*iter;
-        ++iter;
-        delete v;
-    }
-}
diff --git a/gfx/skia/skia/src/core/SkImageGenerator.cpp b/gfx/skia/skia/src/core/SkImageGenerator.cpp
index 551d8f78dcbd..dcd3ad00b17e 100644
--- a/gfx/skia/skia/src/core/SkImageGenerator.cpp
+++ b/gfx/skia/skia/src/core/SkImageGenerator.cpp
@@ -6,22 +6,19 @@
  */
 
 #include "SkImageGenerator.h"
+#include "SkNextID.h"
 
-#ifndef SK_SUPPORT_LEGACY_IMAGEGENERATORAPI
-bool SkImageGenerator::getInfo(SkImageInfo* info) {
-    SkImageInfo dummy;
-    if (NULL == info) {
-        info = &dummy;
-    }
-    return this->onGetInfo(info);
-}
+SkImageGenerator::SkImageGenerator(const SkImageInfo& info)
+    : fInfo(info)
+    , fUniqueID(SkNextID::ImageID())
+{}
 
 bool SkImageGenerator::getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
                                  SkPMColor ctable[], int* ctableCount) {
     if (kUnknown_SkColorType == info.colorType()) {
         return false;
     }
-    if (NULL == pixels) {
+    if (nullptr == pixels) {
         return false;
     }
     if (rowBytes < info.minRowBytes()) {
@@ -29,19 +26,18 @@ bool SkImageGenerator::getPixels(const SkImageInfo& info, void* pixels, size_t r
     }
 
     if (kIndex_8_SkColorType == info.colorType()) {
-        if (NULL == ctable || NULL == ctableCount) {
+        if (nullptr == ctable || nullptr == ctableCount) {
             return false;
         }
     } else {
         if (ctableCount) {
             *ctableCount = 0;
         }
-        ctableCount = NULL;
-        ctable = NULL;
+        ctableCount = nullptr;
+        ctable = nullptr;
     }
 
-    bool success = this->onGetPixels(info, pixels, rowBytes, ctable, ctableCount);
-
+    const bool success = this->onGetPixels(info, pixels, rowBytes, ctable, ctableCount);
     if (success && ctableCount) {
         SkASSERT(*ctableCount >= 0 && *ctableCount <= 256);
     }
@@ -53,22 +49,22 @@ bool SkImageGenerator::getPixels(const SkImageInfo& info, void* pixels, size_t r
     if (kIndex_8_SkColorType == info.colorType()) {
         return false;
     }
-    return this->getPixels(info, pixels, rowBytes, NULL, NULL);
+    return this->getPixels(info, pixels, rowBytes, nullptr, nullptr);
 }
-#endif
 
-bool SkImageGenerator::getYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3]) {
+bool SkImageGenerator::getYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3],
+                                     SkYUVColorSpace* colorSpace) {
 #ifdef SK_DEBUG
     // In all cases, we need the sizes array
-    SkASSERT(NULL != sizes);
+    SkASSERT(sizes);
 
-    bool isValidWithPlanes = (NULL != planes) && (NULL != rowBytes) &&
-        ((NULL != planes[0]) && (NULL != planes[1]) && (NULL != planes[2]) &&
+    bool isValidWithPlanes = (planes) && (rowBytes) &&
+        ((planes[0]) && (planes[1]) && (planes[2]) &&
          (0  != rowBytes[0]) && (0  != rowBytes[1]) && (0  != rowBytes[2]));
     bool isValidWithoutPlanes =
-        ((NULL == planes) ||
-         ((NULL == planes[0]) && (NULL == planes[1]) && (NULL == planes[2]))) &&
-        ((NULL == rowBytes) ||
+        ((nullptr == planes) ||
+         ((nullptr == planes[0]) && (nullptr == planes[1]) && (nullptr == planes[2]))) &&
+        ((nullptr == rowBytes) ||
          ((0 == rowBytes[0]) && (0 == rowBytes[1]) && (0 == rowBytes[2])));
 
     // Either we have all planes and rowBytes information or we have none of it
@@ -89,23 +85,163 @@ bool SkImageGenerator::getYUV8Planes(SkISize sizes[3], void* planes[3], size_t r
               (rowBytes[2] >= (size_t)sizes[2].fWidth)));
 #endif
 
-    return this->onGetYUV8Planes(sizes, planes, rowBytes);
+    return this->onGetYUV8Planes(sizes, planes, rowBytes, colorSpace);
 }
 
 bool SkImageGenerator::onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3]) {
     return false;
 }
 
+bool SkImageGenerator::onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3],
+                                       SkYUVColorSpace* colorSpace) {
+    // In order to maintain compatibility with clients that implemented the original
+    // onGetYUV8Planes interface, we assume that the color space is JPEG.
+    // TODO(rileya): remove this and the old onGetYUV8Planes once clients switch over to
+    // the new interface.
+    if (colorSpace) {
+        *colorSpace = kJPEG_SkYUVColorSpace;
+    }
+    return this->onGetYUV8Planes(sizes, planes, rowBytes);
+}
+
+GrTexture* SkImageGenerator::generateTexture(GrContext* ctx, const SkIRect* subset) {
+    if (subset && !SkIRect::MakeWH(fInfo.width(), fInfo.height()).contains(*subset)) {
+        return nullptr;
+    }
+    return this->onGenerateTexture(ctx, subset);
+}
+
+bool SkImageGenerator::computeScaledDimensions(SkScalar scale, SupportedSizes* sizes) {
+    if (scale > 0 && scale <= 1) {
+        return this->onComputeScaledDimensions(scale, sizes);
+    }
+    return false;
+}
+
+bool SkImageGenerator::generateScaledPixels(const SkISize& scaledSize,
+                                            const SkIPoint& subsetOrigin,
+                                            const SkPixmap& subsetPixels) {
+    if (scaledSize.width() <= 0 || scaledSize.height() <= 0) {
+        return false;
+    }
+    if (subsetPixels.width() <= 0 || subsetPixels.height() <= 0) {
+        return false;
+    }
+    const SkIRect subset = SkIRect::MakeXYWH(subsetOrigin.x(), subsetOrigin.y(),
+                                             subsetPixels.width(), subsetPixels.height());
+    if (!SkIRect::MakeWH(scaledSize.width(), scaledSize.height()).contains(subset)) {
+        return false;
+    }
+    return this->onGenerateScaledPixels(scaledSize, subsetOrigin, subsetPixels);
+}
+
 /////////////////////////////////////////////////////////////////////////////////////////////
 
 SkData* SkImageGenerator::onRefEncodedData() {
-    return NULL;
+    return nullptr;
 }
 
-bool SkImageGenerator::onGetInfo(SkImageInfo*) {
+bool SkImageGenerator::onGetPixels(const SkImageInfo& info, void* dst, size_t rb,
+                                   SkPMColor* colors, int* colorCount) {
     return false;
 }
 
-bool SkImageGenerator::onGetPixels(const SkImageInfo&, void*, size_t, SkPMColor*, int*) {
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#include "SkBitmap.h"
+#include "SkColorTable.h"
+
+static bool reset_and_return_false(SkBitmap* bitmap) {
+    bitmap->reset();
     return false;
 }
+
+bool SkImageGenerator::tryGenerateBitmap(SkBitmap* bitmap, const SkImageInfo* infoPtr,
+                                         SkBitmap::Allocator* allocator) {
+    SkImageInfo info = infoPtr ? *infoPtr : this->getInfo();
+    if (0 == info.getSafeSize(info.minRowBytes())) {
+        return false;
+    }
+    if (!bitmap->setInfo(info)) {
+        return reset_and_return_false(bitmap);
+    }
+
+    SkPMColor ctStorage[256];
+    memset(ctStorage, 0xFF, sizeof(ctStorage)); // init with opaque-white for the moment
+    SkAutoTUnref<SkColorTable> ctable(new SkColorTable(ctStorage, 256));
+    if (!bitmap->tryAllocPixels(allocator, ctable)) {
+        // SkResourceCache's custom allcator can'thandle ctables, so it may fail on
+        // kIndex_8_SkColorTable.
+        // https://bug.skia.org/4355
+#if 1
+        // ignroe the allocator, and see if we can succeed without it
+        if (!bitmap->tryAllocPixels(nullptr, ctable)) {
+            return reset_and_return_false(bitmap);
+        }
+#else
+        // this is the up-scale technique, not fully debugged, but we keep it here at the moment
+        // to remind ourselves that this might be better than ignoring the allocator.
+
+        info = SkImageInfo::MakeN32(info.width(), info.height(), info.alphaType());
+        if (!bitmap->setInfo(info)) {
+            return reset_and_return_false(bitmap);
+        }
+        // we pass nullptr for the ctable arg, since we are now explicitly N32
+        if (!bitmap->tryAllocPixels(allocator, nullptr)) {
+            return reset_and_return_false(bitmap);
+        }
+#endif
+    }
+
+    bitmap->lockPixels();
+    if (!bitmap->getPixels()) {
+        return reset_and_return_false(bitmap);
+    }
+
+    int ctCount = 0;
+    if (!this->getPixels(bitmap->info(), bitmap->getPixels(), bitmap->rowBytes(),
+                         ctStorage, &ctCount)) {
+        return reset_and_return_false(bitmap);
+    }
+
+    if (ctCount > 0) {
+        SkASSERT(kIndex_8_SkColorType == bitmap->colorType());
+        // we and bitmap should be owners
+        SkASSERT(!ctable->unique());
+
+        // Now we need to overwrite the ctable we built earlier, with the correct colors.
+        // This does mean that we may have made the table too big, but that cannot be avoided
+        // until we can change SkImageGenerator's API to return us the ctable *before* we have to
+        // allocate space for all the pixels.
+        ctable->dangerous_overwriteColors(ctStorage, ctCount);
+    } else {
+        SkASSERT(kIndex_8_SkColorType != bitmap->colorType());
+        // we should be the only owner
+        SkASSERT(ctable->unique());
+    }
+    return true;
+}
+
+#include "SkGraphics.h"
+
+static SkGraphics::ImageGeneratorFromEncodedFactory gFactory;
+
+SkGraphics::ImageGeneratorFromEncodedFactory
+SkGraphics::SetImageGeneratorFromEncodedFactory(ImageGeneratorFromEncodedFactory factory)
+{
+    ImageGeneratorFromEncodedFactory prev = gFactory;
+    gFactory = factory;
+    return prev;
+}
+
+SkImageGenerator* SkImageGenerator::NewFromEncoded(SkData* data) {
+    if (nullptr == data) {
+        return nullptr;
+    }
+    if (gFactory) {
+        if (SkImageGenerator* generator = gFactory(data)) {
+            return generator;
+        }
+    }
+    return SkImageGenerator::NewFromEncodedImpl(data);
+}
diff --git a/gfx/skia/skia/src/core/SkImageGeneratorPriv.h b/gfx/skia/skia/src/core/SkImageGeneratorPriv.h
index e03294d3fa0a..93114e328fb5 100644
--- a/gfx/skia/skia/src/core/SkImageGeneratorPriv.h
+++ b/gfx/skia/skia/src/core/SkImageGeneratorPriv.h
@@ -17,23 +17,24 @@
  *  the generator.  If it succeeds, it will modify destination
  *  bitmap.
  *
- *  If generator is NULL, will safely return false.
+ *  If generator is nullptr, will safely return false.
  *
  *  If this fails or when the SkDiscardablePixelRef that is
  *  installed into destination is destroyed, it will call
- *  SkDELETE() on the generator.  Therefore, generator should be
- *  allocated with SkNEW() or SkNEW_ARGS().
+ *  `delete` on the generator.  Therefore, generator should be
+ *  allocated with `new`.
  *
  *  @param destination Upon success, this bitmap will be
  *  configured and have a pixelref installed.
  *
- *  @param factory If not NULL, this object will be used as a
- *  source of discardable memory when decoding.  If NULL, then
+ *  @param factory If not nullptr, this object will be used as a
+ *  source of discardable memory when decoding.  If nullptr, then
  *  SkDiscardableMemory::Create() will be called.
  *
  *  @return true iff successful.
  */
-bool SkInstallDiscardablePixelRef(SkImageGenerator*, SkBitmap* destination,
-                                  SkDiscardableMemory::Factory* factory);
+bool SkDEPRECATED_InstallDiscardablePixelRef(SkImageGenerator*, const SkIRect* subset,
+                                             SkBitmap* destination,
+                                             SkDiscardableMemory::Factory* factory);
 
 #endif
diff --git a/gfx/skia/skia/src/core/SkImageInfo.cpp b/gfx/skia/skia/src/core/SkImageInfo.cpp
index e61cd7d45f39..b90f858562aa 100644
--- a/gfx/skia/skia/src/core/SkImageInfo.cpp
+++ b/gfx/skia/skia/src/core/SkImageInfo.cpp
@@ -9,6 +9,10 @@
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 
+static bool profile_type_is_valid(SkColorProfileType profileType) {
+    return (profileType >= 0) && (profileType <= kLastEnum_SkColorProfileType);
+}
+
 static bool alpha_type_is_valid(SkAlphaType alphaType) {
     return (alphaType >= 0) && (alphaType <= kLastEnum_SkAlphaType);
 }
@@ -22,10 +26,12 @@ void SkImageInfo::unflatten(SkReadBuffer& buffer) {
     fHeight = buffer.read32();
 
     uint32_t packed = buffer.read32();
-    SkASSERT(0 == (packed >> 16));
+    SkASSERT(0 == (packed >> 24));
+    fProfileType = (SkColorProfileType)((packed >> 16) & 0xFF);
     fAlphaType = (SkAlphaType)((packed >> 8) & 0xFF);
     fColorType = (SkColorType)((packed >> 0) & 0xFF);
-    buffer.validate(alpha_type_is_valid(fAlphaType) &&
+    buffer.validate(profile_type_is_valid(fProfileType) &&
+                    alpha_type_is_valid(fAlphaType) &&
                     color_type_is_valid(fColorType));
 }
 
@@ -33,9 +39,10 @@ void SkImageInfo::flatten(SkWriteBuffer& buffer) const {
     buffer.write32(fWidth);
     buffer.write32(fHeight);
 
+    SkASSERT(0 == (fProfileType & ~0xFF));
     SkASSERT(0 == (fAlphaType & ~0xFF));
     SkASSERT(0 == (fColorType & ~0xFF));
-    uint32_t packed = (fAlphaType << 8) | fColorType;
+    uint32_t packed = (fProfileType << 16) | (fAlphaType << 8) | fColorType;
     buffer.write32(packed);
 }
 
@@ -43,7 +50,7 @@ bool SkColorTypeValidateAlphaType(SkColorType colorType, SkAlphaType alphaType,
                                   SkAlphaType* canonical) {
     switch (colorType) {
         case kUnknown_SkColorType:
-            alphaType = kIgnore_SkAlphaType;
+            alphaType = kUnknown_SkAlphaType;
             break;
         case kAlpha_8_SkColorType:
             if (kUnpremul_SkAlphaType == alphaType) {
@@ -54,11 +61,12 @@ bool SkColorTypeValidateAlphaType(SkColorType colorType, SkAlphaType alphaType,
         case kARGB_4444_SkColorType:
         case kRGBA_8888_SkColorType:
         case kBGRA_8888_SkColorType:
-            if (kIgnore_SkAlphaType == alphaType) {
+            if (kUnknown_SkAlphaType == alphaType) {
                 return false;
             }
             break;
         case kRGB_565_SkColorType:
+        case kGray_8_SkColorType:
             alphaType = kOpaque_SkAlphaType;
             break;
         default:
@@ -69,3 +77,47 @@ bool SkColorTypeValidateAlphaType(SkColorType colorType, SkAlphaType alphaType,
     }
     return true;
 }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#include "SkReadPixelsRec.h"
+
+bool SkReadPixelsRec::trim(int srcWidth, int srcHeight) {
+    switch (fInfo.colorType()) {
+        case kUnknown_SkColorType:
+        case kIndex_8_SkColorType:
+            return false;
+        default:
+            break;
+    }
+    if (nullptr == fPixels || fRowBytes < fInfo.minRowBytes()) {
+        return false;
+    }
+    if (0 == fInfo.width() || 0 == fInfo.height()) {
+        return false;
+    }
+
+    int x = fX;
+    int y = fY;
+    SkIRect srcR = SkIRect::MakeXYWH(x, y, fInfo.width(), fInfo.height());
+    if (!srcR.intersect(0, 0, srcWidth, srcHeight)) {
+        return false;
+    }
+
+    // if x or y are negative, then we have to adjust pixels
+    if (x > 0) {
+        x = 0;
+    }
+    if (y > 0) {
+        y = 0;
+    }
+    // here x,y are either 0 or negative
+    fPixels = ((char*)fPixels - y * fRowBytes - x * fInfo.bytesPerPixel());
+    // the intersect may have shrunk info's logical size
+    fInfo = fInfo.makeWH(srcR.width(), srcR.height());
+    fX = srcR.x();
+    fY = srcR.y();
+
+    return true;
+}
+
diff --git a/gfx/skia/skia/src/core/SkLayerInfo.h b/gfx/skia/skia/src/core/SkLayerInfo.h
new file mode 100644
index 000000000000..04ae1794a24f
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkLayerInfo.h
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkLayerInfo_DEFINED
+#define SkLayerInfo_DEFINED
+
+#include "SkBigPicture.h"
+#include "SkTArray.h"
+
+// This class stores information about the saveLayer/restore pairs found
+// within an SkPicture. It is used by Ganesh to perform layer hoisting.
+class SkLayerInfo : public SkBigPicture::AccelData {
+public:
+    // Information about a given saveLayer/restore block in an SkPicture
+    class BlockInfo {
+    public:
+        BlockInfo() : fPicture(nullptr), fPaint(nullptr), fKey(nullptr), fKeySize(0) {}
+        ~BlockInfo() {
+            SkSafeUnref(fPicture);
+            delete fPaint;
+            delete[] fKey;
+        }
+
+        // The picture owning the layer. If the owning picture is the top-most
+        // one (i.e., the picture for which this SkLayerInfo was created) then
+        // this pointer is nullptr. If it is a nested picture then the pointer
+        // is non-nullptr and owns a ref on the picture.
+        const SkPicture* fPicture;
+        // The device space bounds of this layer.
+        SkRect fBounds;
+        // If not-empty, the optional bounds parameter passed in to the saveLayer
+        // call.
+        SkRect fSrcBounds;
+        // The pre-matrix begins as the identity and accumulates the transforms
+        // of the containing SkPictures (if any). This matrix state has to be
+        // part of the initial matrix during replay so that it will be
+        // preserved across setMatrix calls.
+        SkMatrix fPreMat;
+        // The matrix state (in the leaf picture) in which this layer's draws
+        // must occur. It will/can be overridden by setMatrix calls in the
+        // layer itself. It does not include the translation needed to map the
+        // layer's top-left point to the origin (which must be part of the
+        // initial matrix).
+        SkMatrix fLocalMat;
+        // The paint to use on restore. Can be nullptr since it is optional.
+        const SkPaint* fPaint;
+        // The index of this saveLayer in the picture.
+        size_t  fSaveLayerOpID;
+        // The index of the matching restore in the picture.
+        size_t  fRestoreOpID;
+        // True if this saveLayer has at least one other saveLayer nested within it.
+        // False otherwise.
+        bool    fHasNestedLayers;
+        // True if this saveLayer is nested within another. False otherwise.
+        bool    fIsNested;
+        // The variable length key for this saveLayer block. It stores the
+        // thread of drawPicture and saveLayer operation indices that lead to this
+        // saveLayer (including its own op index). The BlockInfo owns this memory.
+        int* fKey;
+        int  fKeySize;  // # of ints
+    };
+
+    SkLayerInfo() {}
+
+    BlockInfo& addBlock() { return fBlocks.push_back(); }
+
+    int numBlocks() const { return fBlocks.count(); }
+
+    const BlockInfo& block(int index) const {
+        SkASSERT(index < fBlocks.count());
+
+        return fBlocks[index];
+    }
+
+private:
+    SkTArray<BlockInfo, true> fBlocks;
+
+    typedef SkBigPicture::AccelData INHERITED;
+};
+
+#endif // SkLayerInfo_DEFINED
diff --git a/gfx/skia/skia/src/core/SkLazyFnPtr.h b/gfx/skia/skia/src/core/SkLazyFnPtr.h
deleted file mode 100644
index 464e061a1318..000000000000
--- a/gfx/skia/skia/src/core/SkLazyFnPtr.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkLazyFnPtr_DEFINED
-#define SkLazyFnPtr_DEFINED
-
-/** Declare a lazily-chosen static function pointer of type F.
- *
- *  Example usage:
- *
- *  typedef int (*FooImpl)(int, int);
- *
- *  static FooImpl choose_foo() { return ... };
- *
- *  int Foo(int a, int b) {
- *     SK_DECLARE_STATIC_LAZY_FN_PTR(FooImpl, foo, choose_foo);
- *     return foo.get()(a, b);
- *  }
- *
- *  You can think of SK_DECLARE_STATIC_LAZY_FN_PTR as a cheaper specialization of SkOnce.
- *  There is no mutex, and in the fast path, no memory barriers are issued.
- *
- *  This must be used in a global or function scope, not as a class member.
- */
-#define SK_DECLARE_STATIC_LAZY_FN_PTR(F, name, Choose) static Private::SkLazyFnPtr<F, Choose> name
-
-
-// Everything below here is private implementation details.  Don't touch, don't even look.
-
-#include "SkDynamicAnnotations.h"
-#include "SkThreadPriv.h"
-
-namespace Private {
-
-// This has no constructor and must be zero-initialized (the macro above does this).
-template <typename F, F (*Choose)()>
-class SkLazyFnPtr {
-public:
-    F get() {
-        // First, try reading to see if it's already set.
-        F fn = (F)SK_ANNOTATE_UNPROTECTED_READ(fPtr);
-        if (fn != NULL) {
-            return fn;
-        }
-
-        // We think it's not already set.
-        fn = Choose();
-
-        // No particular memory barriers needed; we're not guarding anything but the pointer itself.
-        F prev = (F)sk_atomic_cas(&fPtr, NULL, (void*)fn);
-
-        // If prev != NULL, someone snuck in and set fPtr concurrently.
-        // If prev == NULL, we did write fn to fPtr.
-        return prev != NULL ? prev : fn;
-    }
-
-private:
-    void* fPtr;
-};
-
-}  // namespace Private
-
-#endif//SkLazyFnPtr_DEFINED
diff --git a/gfx/skia/skia/src/core/SkLazyPtr.h b/gfx/skia/skia/src/core/SkLazyPtr.h
deleted file mode 100644
index 13218a749ef1..000000000000
--- a/gfx/skia/skia/src/core/SkLazyPtr.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkLazyPtr_DEFINED
-#define SkLazyPtr_DEFINED
-
-/** Declare a lazily-chosen static pointer (or array of pointers) of type F.
- *
- *  Example usage:
- *
- *  Foo* GetSingletonFoo() {
- *      SK_DECLARE_STATIC_LAZY_PTR(Foo, singleton);  // Created with SkNEW, destroyed with SkDELETE.
- *      return singleton.get();
- *  }
- *
- *  These macros take an optional T* (*Create)() and void (*Destroy)(T*) at the end.
- *  If not given, we'll use SkNEW and SkDELETE.
- *  These options are most useful when T doesn't have a public constructor or destructor.
- *  Create comes first, so you may use a custom Create with a default Destroy, but not vice versa.
- *
- *  Foo* CustomCreate() { return ...; }
- *  void CustomDestroy(Foo* ptr) { ... }
- *  Foo* GetSingletonFooWithCustomCleanup() {
- *      SK_DECLARE_STATIC_LAZY_PTR(Foo, singleton, CustomCreate, CustomDestroy);
- *      return singleton.get();
- *  }
- *
- *  If you have a bunch of related static pointers of the same type, you can
- *  declare an array of lazy pointers together, and we'll pass the index to Create().
- *
- *  Foo* CreateFoo(int i) { return ...; }
- *  Foo* GetCachedFoo(Foo::Enum enumVal) {
- *      SK_DECLARE_STATIC_LAZY_PTR_ARRAY(Foo, Foo::kEnumCount, cachedFoos, CreateFoo);
- *      return cachedFoos[enumVal];
- *  }
- *
- *
- *  You can think of SK_DECLARE_STATIC_LAZY_PTR as a cheaper specialization of
- *  SkOnce.  There is no mutex or extra storage used past the pointer itself.
- *  In debug mode, each lazy pointer will be cleaned up at process exit so we
- *  can check that we've not leaked or freed them early.
- *
- *  We may call Create more than once, but all threads will see the same pointer
- *  returned from get().  Any extra calls to Create will be cleaned up.
- *
- *  These macros must be used in a global or function scope, not as a class member.
- */
-
-#define SK_DECLARE_STATIC_LAZY_PTR(T, name, ...) \
-    static Private::SkLazyPtr<T, ##__VA_ARGS__> name
-
-#define SK_DECLARE_STATIC_LAZY_PTR_ARRAY(T, name, N, ...) \
-    static Private::SkLazyPtrArray<T, N, ##__VA_ARGS__> name
-
-
-
-// Everything below here is private implementation details.  Don't touch, don't even look.
-
-#include "SkDynamicAnnotations.h"
-#include "SkThread.h"
-#include "SkThreadPriv.h"
-
-// See FIXME below.
-class SkFontConfigInterfaceDirect;
-
-namespace Private {
-
-// Set *dst to ptr if *dst is NULL.  Returns value of *dst, destroying ptr if not swapped in.
-// Issues the same memory barriers as sk_atomic_cas: acquire on failure, release on success.
-template <typename P, void (*Destroy)(P)>
-static P try_cas(void** dst, P ptr) {
-    P prev = (P)sk_atomic_cas(dst, NULL, ptr);
-
-    if (prev) {
-        // We need an acquire barrier before returning prev, which sk_atomic_cas provided.
-        Destroy(ptr);
-        return prev;
-    } else {
-        // We need a release barrier before returning ptr, which sk_atomic_cas provided.
-        return ptr;
-    }
-}
-
-template <typename T> T* sk_new() { return SkNEW(T); }
-template <typename T> void sk_delete(T* ptr) { SkDELETE(ptr); }
-
-// We're basing these implementations here on this article:
-//   http://preshing.com/20140709/the-purpose-of-memory_order_consume-in-cpp11/
-//
-// Because the users of SkLazyPtr and SkLazyPtrArray will read the pointers
-// _through_ our atomically set pointer, there is a data dependency between our
-// atomic and the guarded data, and so we only need writer-releases /
-// reader-consumes memory pairing rather than the more general write-releases /
-// reader-acquires convention.
-//
-// This is nice, because a sk_consume_load is free on all our platforms: x86,
-// ARM, MIPS.  In contrast, sk_acquire_load issues a memory barrier on non-x86.
-
-// This has no constructor and must be zero-initalized (the macro above does this).
-template <typename T, T* (*Create)() = sk_new<T>, void (*Destroy)(T*) = sk_delete<T> >
-class SkLazyPtr {
-public:
-    T* get() {
-        // If fPtr has already been filled, we need a consume barrier when loading it.
-        // If not, we need a release barrier when setting it.  try_cas will do that.
-        T* ptr = (T*)sk_consume_load(&fPtr);
-        return ptr ? ptr : try_cas<T*, Destroy>(&fPtr, Create());
-    }
-
-#ifdef SK_DEVELOPER
-    // FIXME: We know we leak refs on some classes.  For now, let them leak.
-    void cleanup(SkFontConfigInterfaceDirect*) {}
-    template <typename U> void cleanup(U* ptr) { Destroy(ptr); }
-
-    ~SkLazyPtr() {
-        this->cleanup((T*)fPtr);
-        fPtr = NULL;
-    }
-#endif
-
-private:
-    void* fPtr;
-};
-
-template <typename T> T* sk_new_arg(int i) { return SkNEW_ARGS(T, (i)); }
-
-// This has no constructor and must be zero-initalized (the macro above does this).
-template <typename T, int N, T* (*Create)(int) = sk_new_arg<T>, void (*Destroy)(T*) = sk_delete<T> >
-class SkLazyPtrArray {
-public:
-    T* operator[](int i) {
-        SkASSERT(i >= 0 && i < N);
-        // If fPtr has already been filled, we need an consume barrier when loading it.
-        // If not, we need a release barrier when setting it.  try_cas will do that.
-        T* ptr = (T*)sk_consume_load(&fArray[i]);
-        return ptr ? ptr : try_cas<T*, Destroy>(&fArray[i], Create(i));
-    }
-
-#ifdef SK_DEVELOPER
-    ~SkLazyPtrArray() {
-        for (int i = 0; i < N; i++) {
-            Destroy((T*)fArray[i]);
-            fArray[i] = NULL;
-        }
-    }
-#endif
-
-private:
-    void* fArray[N];
-};
-
-}  // namespace Private
-
-#endif//SkLazyPtr_DEFINED
diff --git a/gfx/skia/skia/src/core/SkLight.h b/gfx/skia/skia/src/core/SkLight.h
new file mode 100644
index 000000000000..4a6e149c76af
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkLight.h
@@ -0,0 +1,56 @@
+
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkLight_DEFINED
+#define SkLight_DEFINED
+
+#include "SkPoint3.h"
+
+class SK_API SkLight {
+public:
+    enum LightType {
+        kAmbient_LightType,       // only 'fColor' is used
+        kDirectional_LightType
+    };
+
+    SkLight() : fType(kAmbient_LightType) {
+        fColor.set(0.0f, 0.0f, 0.0f);
+        fDirection.set(0.0f, 0.0f, 1.0f);
+    }
+
+    SkLight(const SkColor3f& color)
+        : fType(kAmbient_LightType)
+        , fColor(color) {
+        fDirection.set(0.0f, 0.0f, 1.0f);
+    }
+
+    SkLight(const SkColor3f& color, const SkVector3& dir)
+        : fType(kDirectional_LightType)
+        , fColor(color)
+        , fDirection(dir) {
+        if (!fDirection.normalize()) {
+            fDirection.set(0.0f, 0.0f, 1.0f);
+        }
+    }
+
+    LightType type() const { return fType; }
+    const SkColor3f& color() const { return fColor; }
+    const SkVector3& dir() const { 
+        SkASSERT(kAmbient_LightType != fType);
+        return fDirection; 
+    }
+
+private:
+    LightType   fType;
+    SkColor3f   fColor;           // linear (unpremul) color. Range is 0..1 in each channel.
+    SkVector3   fDirection;       // direction towards the light (+Z is out of the screen).
+                                  // If degenerate, it will be replaced with (0, 0, 1).
+};
+
+
+#endif
diff --git a/gfx/skia/skia/src/core/SkLightingShader.cpp b/gfx/skia/skia/src/core/SkLightingShader.cpp
new file mode 100644
index 000000000000..147a7ef915cb
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkLightingShader.cpp
@@ -0,0 +1,725 @@
+
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkBitmapProcState.h"
+#include "SkColor.h"
+#include "SkEmptyShader.h"
+#include "SkErrorInternals.h"
+#include "SkLightingShader.h"
+#include "SkMathPriv.h"
+#include "SkPoint3.h"
+#include "SkReadBuffer.h"
+#include "SkWriteBuffer.h"
+
+////////////////////////////////////////////////////////////////////////////
+
+/*
+   SkLightingShader TODOs:
+        support other than clamp mode
+        allow 'diffuse' & 'normal' to be of different dimensions?
+        support different light types
+        support multiple lights
+        enforce normal map is 4 channel
+        use SkImages instead if SkBitmaps
+
+    To Test:
+        non-opaque diffuse textures
+        A8 diffuse textures
+        down & upsampled draws
+*/
+
+
+
+/** \class SkLightingShaderImpl
+    This subclass of shader applies lighting.
+*/
+class SK_API SkLightingShaderImpl : public SkShader {
+public:
+
+    /** Create a new lighting shader that uses the provided normal map and
+        lights to light the diffuse bitmap.
+        @param diffuse    the diffuse bitmap
+        @param normal     the normal map
+        @param lights     the lights applied to the normal map
+        @param invNormRotation rotation applied to the normal map's normals
+        @param diffLocalM the local matrix for the diffuse coordinates
+        @param normLocalM the local matrix for the normal coordinates
+    */
+    SkLightingShaderImpl(const SkBitmap& diffuse, const SkBitmap& normal,
+                         const SkLightingShader::Lights* lights,
+                         const SkVector& invNormRotation,
+                         const SkMatrix* diffLocalM, const SkMatrix* normLocalM) 
+        : INHERITED(diffLocalM)
+        , fDiffuseMap(diffuse)
+        , fNormalMap(normal)
+        , fLights(SkRef(lights))
+        , fInvNormRotation(invNormRotation) {
+
+        if (normLocalM) {
+            fNormLocalMatrix = *normLocalM;
+        } else {
+            fNormLocalMatrix.reset();
+        }
+        // Pre-cache so future calls to fNormLocalMatrix.getType() are threadsafe.
+        (void)fNormLocalMatrix.getType();
+
+    }
+
+    bool isOpaque() const override;
+
+#if SK_SUPPORT_GPU
+    const GrFragmentProcessor* asFragmentProcessor(GrContext*,
+                                                   const SkMatrix& viewM,
+                                                   const SkMatrix* localMatrix,
+                                                   SkFilterQuality) const override;
+#endif
+
+    size_t contextSize() const override;
+
+    class LightingShaderContext : public SkShader::Context {
+    public:
+        // The context takes ownership of the states. It will call their destructors
+        // but will NOT free the memory.
+        LightingShaderContext(const SkLightingShaderImpl&, const ContextRec&,
+                              SkBitmapProcState* diffuseState, SkBitmapProcState* normalState);
+        ~LightingShaderContext() override;
+
+        void shadeSpan(int x, int y, SkPMColor[], int count) override;
+
+        uint32_t getFlags() const override { return fFlags; }
+
+    private:
+        SkBitmapProcState* fDiffuseState;
+        SkBitmapProcState* fNormalState;
+        uint32_t           fFlags;
+
+        typedef SkShader::Context INHERITED;
+    };
+
+    SK_TO_STRING_OVERRIDE()
+    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLightingShaderImpl)
+
+protected:
+    void flatten(SkWriteBuffer&) const override;
+    Context* onCreateContext(const ContextRec&, void*) const override;
+    bool computeNormTotalInverse(const ContextRec& rec, SkMatrix* normTotalInverse) const;
+
+private:
+    SkBitmap  fDiffuseMap;
+    SkBitmap  fNormalMap;
+
+    SkAutoTUnref<const SkLightingShader::Lights>   fLights;
+
+    SkMatrix  fNormLocalMatrix;
+    SkVector  fInvNormRotation;
+
+    friend class SkLightingShader;
+
+    typedef SkShader INHERITED;
+};
+
+////////////////////////////////////////////////////////////////////////////
+
+#if SK_SUPPORT_GPU
+
+#include "GrCoordTransform.h"
+#include "GrFragmentProcessor.h"
+#include "GrTextureAccess.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+#include "SkGr.h"
+#include "SkGrPriv.h"
+
+class LightingFP : public GrFragmentProcessor {
+public:
+    LightingFP(GrTexture* diffuse, GrTexture* normal, const SkMatrix& diffMatrix,
+               const SkMatrix& normMatrix, const GrTextureParams& diffParams,
+               const GrTextureParams& normParams, const SkLightingShader::Lights* lights,
+               const SkVector& invNormRotation)
+        : fDiffDeviceTransform(kLocal_GrCoordSet, diffMatrix, diffuse, diffParams.filterMode())
+        , fNormDeviceTransform(kLocal_GrCoordSet, normMatrix, normal, normParams.filterMode())
+        , fDiffuseTextureAccess(diffuse, diffParams)
+        , fNormalTextureAccess(normal, normParams)
+        , fInvNormRotation(invNormRotation) {
+        this->addCoordTransform(&fDiffDeviceTransform);
+        this->addCoordTransform(&fNormDeviceTransform);
+        this->addTextureAccess(&fDiffuseTextureAccess);
+        this->addTextureAccess(&fNormalTextureAccess);
+
+        // fuse all ambient lights into a single one
+        fAmbientColor.set(0.0f, 0.0f, 0.0f);
+        for (int i = 0; i < lights->numLights(); ++i) {
+            if (SkLight::kAmbient_LightType == lights->light(i).type()) {
+                fAmbientColor += lights->light(i).color();
+            } else {
+                // TODO: handle more than one of these
+                fLightColor = lights->light(i).color();
+                fLightDir = lights->light(i).dir();
+            }
+        }
+
+        this->initClassID<LightingFP>();
+    }
+
+    class LightingGLFP : public GrGLSLFragmentProcessor {
+    public:
+        LightingGLFP() {
+            fLightDir.fX = 10000.0f;
+            fLightColor.fX = 0.0f;
+            fAmbientColor.fX = 0.0f;
+            fInvNormRotation.set(0.0f, 0.0f);
+        }
+
+        void emitCode(EmitArgs& args) override {
+
+            GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+
+            // add uniforms
+            const char* lightDirUniName = nullptr;
+            fLightDirUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                                     kVec3f_GrSLType, kDefault_GrSLPrecision,
+                                                     "LightDir", &lightDirUniName);
+
+            const char* lightColorUniName = nullptr;
+            fLightColorUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                                       kVec3f_GrSLType, kDefault_GrSLPrecision,
+                                                       "LightColor", &lightColorUniName);
+
+            const char* ambientColorUniName = nullptr;
+            fAmbientColorUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                                         kVec3f_GrSLType, kDefault_GrSLPrecision,
+                                                         "AmbientColor", &ambientColorUniName);
+
+            const char* xformUniName = nullptr;
+            fXformUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                                  kVec2f_GrSLType, kDefault_GrSLPrecision,
+                                                  "Xform", &xformUniName);
+
+            fragBuilder->codeAppend("vec4 diffuseColor = ");
+            fragBuilder->appendTextureLookupAndModulate(args.fInputColor, args.fSamplers[0], 
+                                                args.fCoords[0].c_str(), 
+                                                args.fCoords[0].getType());
+            fragBuilder->codeAppend(";");
+
+            fragBuilder->codeAppend("vec4 normalColor = ");
+            fragBuilder->appendTextureLookup(args.fSamplers[1],
+                                     args.fCoords[1].c_str(), 
+                                     args.fCoords[1].getType());
+            fragBuilder->codeAppend(";");
+
+            fragBuilder->codeAppend("vec3 normal = normalColor.rgb - vec3(0.5);");
+
+            fragBuilder->codeAppendf(
+                                 "mat3 m = mat3(%s.x, -%s.y, 0.0, %s.y, %s.x, 0.0, 0.0, 0.0, 1.0);",
+                                 xformUniName, xformUniName, xformUniName, xformUniName);
+            
+            // TODO: inverse map the light direction vectors in the vertex shader rather than
+            // transforming all the normals here!
+            fragBuilder->codeAppend("normal = normalize(m*normal);");
+
+            fragBuilder->codeAppendf("float NdotL = clamp(dot(normal, %s), 0.0, 1.0);",
+                                     lightDirUniName);
+            // diffuse light
+            fragBuilder->codeAppendf("vec3 result = %s*diffuseColor.rgb*NdotL;", lightColorUniName);
+            // ambient light
+            fragBuilder->codeAppendf("result += %s;", ambientColorUniName);
+            fragBuilder->codeAppendf("%s = vec4(result.rgb, diffuseColor.a);", args.fOutputColor);
+        }
+
+        static void GenKey(const GrProcessor& proc, const GrGLSLCaps&,
+                           GrProcessorKeyBuilder* b) {
+//            const LightingFP& lightingFP = proc.cast<LightingFP>();
+            // only one shader generated currently
+            b->add32(0x0);
+        }
+
+    protected:
+        void onSetData(const GrGLSLProgramDataManager& pdman, const GrProcessor& proc) override {
+            const LightingFP& lightingFP = proc.cast<LightingFP>();
+
+            const SkVector3& lightDir = lightingFP.lightDir();
+            if (lightDir != fLightDir) {
+                pdman.set3fv(fLightDirUni, 1, &lightDir.fX);
+                fLightDir = lightDir;
+            }
+
+            const SkColor3f& lightColor = lightingFP.lightColor();
+            if (lightColor != fLightColor) {
+                pdman.set3fv(fLightColorUni, 1, &lightColor.fX);
+                fLightColor = lightColor;
+            }
+
+            const SkColor3f& ambientColor = lightingFP.ambientColor();
+            if (ambientColor != fAmbientColor) {
+                pdman.set3fv(fAmbientColorUni, 1, &ambientColor.fX);
+                fAmbientColor = ambientColor;
+            }
+
+            const SkVector& invNormRotation = lightingFP.invNormRotation();
+            if (invNormRotation != fInvNormRotation) {
+                pdman.set2fv(fXformUni, 1, &invNormRotation.fX);
+                fInvNormRotation = invNormRotation;
+            }
+        }
+
+    private:
+        SkVector3 fLightDir;
+        GrGLSLProgramDataManager::UniformHandle fLightDirUni;
+
+        SkColor3f fLightColor;
+        GrGLSLProgramDataManager::UniformHandle fLightColorUni;
+
+        SkColor3f fAmbientColor;
+        GrGLSLProgramDataManager::UniformHandle fAmbientColorUni;
+
+        SkVector fInvNormRotation;
+        GrGLSLProgramDataManager::UniformHandle fXformUni;
+    };
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {
+        LightingGLFP::GenKey(*this, caps, b);
+    }
+
+    const char* name() const override { return "LightingFP"; }
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override {
+        inout->mulByUnknownFourComponents();
+    }
+
+    const SkVector3& lightDir() const { return fLightDir; }
+    const SkColor3f& lightColor() const { return fLightColor; }
+    const SkColor3f& ambientColor() const { return fAmbientColor; }
+    const SkVector& invNormRotation() const { return fInvNormRotation; }
+
+private:
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override { return new LightingGLFP; }
+
+    bool onIsEqual(const GrFragmentProcessor& proc) const override { 
+        const LightingFP& lightingFP = proc.cast<LightingFP>();
+        return fDiffDeviceTransform == lightingFP.fDiffDeviceTransform &&
+               fNormDeviceTransform == lightingFP.fNormDeviceTransform &&
+               fDiffuseTextureAccess == lightingFP.fDiffuseTextureAccess &&
+               fNormalTextureAccess == lightingFP.fNormalTextureAccess &&
+               fLightDir == lightingFP.fLightDir &&
+               fLightColor == lightingFP.fLightColor &&
+               fAmbientColor == lightingFP.fAmbientColor &&
+               fInvNormRotation == lightingFP.fInvNormRotation;
+    }
+
+    GrCoordTransform fDiffDeviceTransform;
+    GrCoordTransform fNormDeviceTransform;
+    GrTextureAccess  fDiffuseTextureAccess;
+    GrTextureAccess  fNormalTextureAccess;
+    SkVector3        fLightDir;
+    SkColor3f        fLightColor;
+    SkColor3f        fAmbientColor;
+
+    SkVector         fInvNormRotation;
+};
+
+////////////////////////////////////////////////////////////////////////////
+
+static bool make_mat(const SkBitmap& bm,
+                     const SkMatrix& localMatrix1,
+                     const SkMatrix* localMatrix2,
+                     SkMatrix* result) {
+    
+    result->setIDiv(bm.width(), bm.height());
+
+    SkMatrix lmInverse;
+    if (!localMatrix1.invert(&lmInverse)) {
+        return false;
+    }
+    if (localMatrix2) {
+        SkMatrix inv;
+        if (!localMatrix2->invert(&inv)) {
+            return false;
+        }
+        lmInverse.postConcat(inv);
+    }
+    result->preConcat(lmInverse);
+
+    return true;
+}
+
+const GrFragmentProcessor* SkLightingShaderImpl::asFragmentProcessor(
+                                                             GrContext* context,
+                                                             const SkMatrix& viewM,
+                                                             const SkMatrix* localMatrix,
+                                                             SkFilterQuality filterQuality) const {
+    // we assume diffuse and normal maps have same width and height
+    // TODO: support different sizes
+    SkASSERT(fDiffuseMap.width() == fNormalMap.width() &&
+             fDiffuseMap.height() == fNormalMap.height());
+    SkMatrix diffM, normM;
+    
+    if (!make_mat(fDiffuseMap, this->getLocalMatrix(), localMatrix, &diffM)) {
+        return nullptr;
+    }
+
+    if (!make_mat(fNormalMap, fNormLocalMatrix, localMatrix, &normM)) {
+        return nullptr;
+    }
+
+    bool doBicubic;
+    GrTextureParams::FilterMode diffFilterMode = GrSkFilterQualityToGrFilterMode(
+                                        SkTMin(filterQuality, kMedium_SkFilterQuality), 
+                                        viewM,
+                                        this->getLocalMatrix(),
+                                        &doBicubic); 
+    SkASSERT(!doBicubic);
+
+    GrTextureParams::FilterMode normFilterMode = GrSkFilterQualityToGrFilterMode(
+                                        SkTMin(filterQuality, kMedium_SkFilterQuality), 
+                                        viewM,
+                                        fNormLocalMatrix,
+                                        &doBicubic); 
+    SkASSERT(!doBicubic);
+
+    // TODO: support other tile modes
+    GrTextureParams diffParams(kClamp_TileMode, diffFilterMode);
+    SkAutoTUnref<GrTexture> diffuseTexture(GrRefCachedBitmapTexture(context,
+                                                                    fDiffuseMap, diffParams));
+    if (!diffuseTexture) {
+        SkErrorInternals::SetError(kInternalError_SkError, "Couldn't convert bitmap to texture.");
+        return nullptr;
+    }
+
+    GrTextureParams normParams(kClamp_TileMode, normFilterMode);
+    SkAutoTUnref<GrTexture> normalTexture(GrRefCachedBitmapTexture(context,
+                                                                   fNormalMap, normParams));
+    if (!normalTexture) {
+        SkErrorInternals::SetError(kInternalError_SkError, "Couldn't convert bitmap to texture.");
+        return nullptr;
+    }
+
+    SkAutoTUnref<const GrFragmentProcessor> inner (
+        new LightingFP(diffuseTexture, normalTexture, diffM, normM, diffParams, normParams, fLights,
+                       fInvNormRotation));
+    return GrFragmentProcessor::MulOutputByInputAlpha(inner);
+}
+
+#endif
+
+////////////////////////////////////////////////////////////////////////////
+
+bool SkLightingShaderImpl::isOpaque() const {
+    return fDiffuseMap.isOpaque();
+}
+
+size_t SkLightingShaderImpl::contextSize() const {
+    return 2 * sizeof(SkBitmapProcState) + sizeof(LightingShaderContext);
+}
+
+SkLightingShaderImpl::LightingShaderContext::LightingShaderContext(const SkLightingShaderImpl& shader,
+                                                                   const ContextRec& rec,
+                                                                   SkBitmapProcState* diffuseState,
+                                                                   SkBitmapProcState* normalState)
+    : INHERITED(shader, rec)
+    , fDiffuseState(diffuseState)
+    , fNormalState(normalState)
+{
+    const SkPixmap& pixmap = fDiffuseState->fPixmap;
+    bool isOpaque = pixmap.isOpaque();
+
+    // update fFlags
+    uint32_t flags = 0;
+    if (isOpaque && (255 == this->getPaintAlpha())) {
+        flags |= kOpaqueAlpha_Flag;
+    }
+
+    fFlags = flags;
+}
+
+SkLightingShaderImpl::LightingShaderContext::~LightingShaderContext() {
+    // The bitmap proc states have been created outside of the context on memory that will be freed
+    // elsewhere. Call the destructors but leave the freeing of the memory to the caller.
+    fDiffuseState->~SkBitmapProcState();
+    fNormalState->~SkBitmapProcState();
+}
+
+static inline SkPMColor convert(SkColor3f color, U8CPU a) {
+    if (color.fX <= 0.0f) {
+        color.fX = 0.0f;
+    } else if (color.fX >= 255.0f) {
+        color.fX = 255.0f;
+    } 
+
+    if (color.fY <= 0.0f) {
+        color.fY = 0.0f;
+    } else if (color.fY >= 255.0f) {
+        color.fY = 255.0f;
+    } 
+
+    if (color.fZ <= 0.0f) {
+        color.fZ = 0.0f;
+    } else if (color.fZ >= 255.0f) {
+        color.fZ = 255.0f;
+    } 
+
+    return SkPreMultiplyARGB(a, (int) color.fX,  (int) color.fY, (int) color.fZ);
+}
+
+// larger is better (fewer times we have to loop), but we shouldn't
+// take up too much stack-space (each one here costs 16 bytes)
+#define TMP_COUNT     16
+
+void SkLightingShaderImpl::LightingShaderContext::shadeSpan(int x, int y,
+                                                            SkPMColor result[], int count) {
+    const SkLightingShaderImpl& lightShader = static_cast<const SkLightingShaderImpl&>(fShader);
+
+    uint32_t  tmpColor[TMP_COUNT], tmpNormal[TMP_COUNT];
+    SkPMColor tmpColor2[2*TMP_COUNT], tmpNormal2[2*TMP_COUNT];
+
+    SkBitmapProcState::MatrixProc   diffMProc = fDiffuseState->getMatrixProc();
+    SkBitmapProcState::SampleProc32 diffSProc = fDiffuseState->getSampleProc32();
+
+    SkBitmapProcState::MatrixProc   normalMProc = fNormalState->getMatrixProc();
+    SkBitmapProcState::SampleProc32 normalSProc = fNormalState->getSampleProc32();
+
+    int diffMax = fDiffuseState->maxCountForBufferSize(sizeof(tmpColor[0]) * TMP_COUNT);
+    int normMax = fNormalState->maxCountForBufferSize(sizeof(tmpNormal[0]) * TMP_COUNT);
+    int max = SkTMin(diffMax, normMax);
+
+    SkASSERT(fDiffuseState->fPixmap.addr());
+    SkASSERT(fNormalState->fPixmap.addr());
+
+    SkPoint3 norm, xformedNorm;
+
+    do {
+        int n = count;
+        if (n > max) {
+            n = max;
+        }
+
+        diffMProc(*fDiffuseState, tmpColor, n, x, y);
+        diffSProc(*fDiffuseState, tmpColor, n, tmpColor2);
+
+        normalMProc(*fNormalState, tmpNormal, n, x, y);
+        normalSProc(*fNormalState, tmpNormal, n, tmpNormal2);
+
+        for (int i = 0; i < n; ++i) {
+            SkASSERT(0xFF == SkColorGetA(tmpNormal2[i]));  // opaque -> unpremul
+            norm.set(SkIntToScalar(SkGetPackedR32(tmpNormal2[i]))-127.0f,
+                     SkIntToScalar(SkGetPackedG32(tmpNormal2[i]))-127.0f,
+                     SkIntToScalar(SkGetPackedB32(tmpNormal2[i]))-127.0f);
+            norm.normalize();
+
+            xformedNorm.fX = lightShader.fInvNormRotation.fX * norm.fX +
+                             lightShader.fInvNormRotation.fY * norm.fY;
+            xformedNorm.fY = lightShader.fInvNormRotation.fX * norm.fX - 
+                             lightShader.fInvNormRotation.fY * norm.fY;
+            xformedNorm.fZ = norm.fZ;
+
+            SkColor diffColor = SkUnPreMultiply::PMColorToColor(tmpColor2[i]);
+
+            SkColor3f accum = SkColor3f::Make(0.0f, 0.0f, 0.0f);
+            // This is all done in linear unpremul color space (each component 0..255.0f though)
+            for (int l = 0; l < lightShader.fLights->numLights(); ++l) {
+                const SkLight& light = lightShader.fLights->light(l);
+
+                if (SkLight::kAmbient_LightType == light.type()) {
+                    accum += light.color().makeScale(255.0f);
+                } else {
+                    SkScalar NdotL = xformedNorm.dot(light.dir());
+                    if (NdotL < 0.0f) {
+                        NdotL = 0.0f;
+                    }
+
+                    accum.fX += light.color().fX * SkColorGetR(diffColor) * NdotL;
+                    accum.fY += light.color().fY * SkColorGetG(diffColor) * NdotL;
+                    accum.fZ += light.color().fZ * SkColorGetB(diffColor) * NdotL;
+                }
+            }
+
+            result[i] = convert(accum, SkColorGetA(diffColor));
+        }
+
+        result += n;
+        x += n;
+        count -= n;
+    } while (count > 0);
+}
+
+////////////////////////////////////////////////////////////////////////////
+
+#ifndef SK_IGNORE_TO_STRING
+void SkLightingShaderImpl::toString(SkString* str) const {
+    str->appendf("LightingShader: ()");
+}
+#endif
+
+SkFlattenable* SkLightingShaderImpl::CreateProc(SkReadBuffer& buf) {
+    SkMatrix diffLocalM;
+    bool hasDiffLocalM = buf.readBool();
+    if (hasDiffLocalM) {
+        buf.readMatrix(&diffLocalM);
+    } else {
+        diffLocalM.reset();
+    }
+
+    SkMatrix normLocalM;
+    bool hasNormLocalM = buf.readBool();
+    if (hasNormLocalM) {
+        buf.readMatrix(&normLocalM);
+    } else {
+        normLocalM.reset();
+    }
+
+    SkBitmap diffuse;
+    if (!buf.readBitmap(&diffuse)) {
+        return nullptr;
+    }
+    diffuse.setImmutable();
+
+    SkBitmap normal;
+    if (!buf.readBitmap(&normal)) {
+        return nullptr;
+    }
+    normal.setImmutable();
+
+    int numLights = buf.readInt();
+
+    SkLightingShader::Lights::Builder builder;
+
+    for (int l = 0; l < numLights; ++l) {
+        bool isAmbient = buf.readBool();
+
+        SkColor3f color;
+        if (!buf.readScalarArray(&color.fX, 3)) {
+            return nullptr;
+        }
+
+        if (isAmbient) {
+            builder.add(SkLight(color));
+        } else {
+            SkVector3 dir;
+            if (!buf.readScalarArray(&dir.fX, 3)) {
+                return nullptr;
+            }
+            builder.add(SkLight(color, dir));        
+        }
+    }
+
+    SkAutoTUnref<const SkLightingShader::Lights> lights(builder.finish());
+
+    return new SkLightingShaderImpl(diffuse, normal, lights, SkVector::Make(1.0f, 0.0f),
+                                    &diffLocalM, &normLocalM);
+}
+
+void SkLightingShaderImpl::flatten(SkWriteBuffer& buf) const {
+    this->INHERITED::flatten(buf);
+
+    bool hasNormLocalM = !fNormLocalMatrix.isIdentity();
+    buf.writeBool(hasNormLocalM);
+    if (hasNormLocalM) {
+        buf.writeMatrix(fNormLocalMatrix);
+    }
+
+    buf.writeBitmap(fDiffuseMap);
+    buf.writeBitmap(fNormalMap);
+
+    buf.writeInt(fLights->numLights());
+    for (int l = 0; l < fLights->numLights(); ++l) {
+        const SkLight& light = fLights->light(l);
+
+        bool isAmbient = SkLight::kAmbient_LightType == light.type();
+
+        buf.writeBool(isAmbient);
+        buf.writeScalarArray(&light.color().fX, 3);
+        if (!isAmbient) {
+            buf.writeScalarArray(&light.dir().fX, 3);
+        }
+    }
+}
+
+bool SkLightingShaderImpl::computeNormTotalInverse(const ContextRec& rec,
+                                                   SkMatrix* normTotalInverse) const {
+    SkMatrix total;
+    total.setConcat(*rec.fMatrix, fNormLocalMatrix);
+
+    const SkMatrix* m = &total;
+    if (rec.fLocalMatrix) {
+        total.setConcat(*m, *rec.fLocalMatrix);
+        m = &total;
+    }
+    return m->invert(normTotalInverse);
+}
+
+SkShader::Context* SkLightingShaderImpl::onCreateContext(const ContextRec& rec,
+                                                         void* storage) const {
+
+    SkMatrix diffTotalInv;
+    // computeTotalInverse was called in SkShader::createContext so we know it will succeed
+    SkAssertResult(this->computeTotalInverse(rec, &diffTotalInv));
+
+    SkMatrix normTotalInv;
+    if (!this->computeNormTotalInverse(rec, &normTotalInv)) {
+        return nullptr;
+    }
+
+    void* diffuseStateStorage = (char*)storage + sizeof(LightingShaderContext);
+    SkBitmapProcState* diffuseState = new (diffuseStateStorage) SkBitmapProcState(fDiffuseMap,
+                                              SkShader::kClamp_TileMode, SkShader::kClamp_TileMode);
+    SkASSERT(diffuseState);
+    if (!diffuseState->chooseProcs(diffTotalInv, *rec.fPaint)) {
+        diffuseState->~SkBitmapProcState();
+        return nullptr;
+    }
+
+    void* normalStateStorage = (char*)storage + sizeof(LightingShaderContext) + sizeof(SkBitmapProcState);
+    SkBitmapProcState* normalState = new (normalStateStorage) SkBitmapProcState(fNormalMap,
+                                            SkShader::kClamp_TileMode, SkShader::kClamp_TileMode);
+    SkASSERT(normalState);
+    if (!normalState->chooseProcs(normTotalInv, *rec.fPaint)) {
+        diffuseState->~SkBitmapProcState();
+        normalState->~SkBitmapProcState();
+        return nullptr;
+    }
+
+    return new (storage) LightingShaderContext(*this, rec, diffuseState, normalState);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+static bool bitmap_is_too_big(const SkBitmap& bm) {
+    // SkBitmapProcShader stores bitmap coordinates in a 16bit buffer, as it
+    // communicates between its matrix-proc and its sampler-proc. Until we can
+    // widen that, we have to reject bitmaps that are larger.
+    //
+    static const int kMaxSize = 65535;
+
+    return bm.width() > kMaxSize || bm.height() > kMaxSize;
+}
+
+SkShader* SkLightingShader::Create(const SkBitmap& diffuse, const SkBitmap& normal,
+                                   const Lights* lights,
+                                   const SkVector& invNormRotation,
+                                   const SkMatrix* diffLocalM, const SkMatrix* normLocalM) {
+    if (diffuse.isNull() || bitmap_is_too_big(diffuse) ||
+        normal.isNull() || bitmap_is_too_big(normal) ||
+        diffuse.width() != normal.width() ||
+        diffuse.height() != normal.height()) {
+        return nullptr;
+    }
+
+    SkASSERT(SkScalarNearlyEqual(invNormRotation.lengthSqd(), SK_Scalar1));
+
+    return new SkLightingShaderImpl(diffuse, normal, lights, invNormRotation, diffLocalM,
+                                    normLocalM);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkLightingShader)
+    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLightingShaderImpl)
+SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END
+
+///////////////////////////////////////////////////////////////////////////////
diff --git a/gfx/skia/skia/src/core/SkLightingShader.h b/gfx/skia/skia/src/core/SkLightingShader.h
new file mode 100644
index 000000000000..f87db31edbb8
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkLightingShader.h
@@ -0,0 +1,100 @@
+
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+
+#ifndef SkLightingShader_DEFINED
+#define SkLightingShader_DEFINED
+
+#include "SkFlattenable.h"
+#include "SkLight.h"
+#include "SkShader.h"
+#include "SkTDArray.h"
+
+class SkBitmap;
+class SkMatrix;
+
+class SK_API SkLightingShader {
+public:
+    class Lights  : public SkRefCnt {
+    public:
+        class Builder {
+        public:
+            Builder(const SkLight lights[], int numLights)
+                : fLights(new Lights(lights, numLights)) {}
+
+            Builder() : fLights(new Lights) {}
+
+            // TODO: limit the number of lights here or just ignore those
+            // above some maximum?
+            void add(const SkLight& light) {
+                if (fLights) {
+                    *fLights->fLights.push() = light;
+                }
+            }
+
+            const Lights* finish() {
+                return fLights.detach();
+            }
+
+        private:
+            SkAutoTUnref<Lights> fLights;
+        };
+
+        int numLights() const {
+            return fLights.count();
+        }
+
+        const SkLight& light(int index) const {
+            return fLights[index];
+        }
+
+    private:
+        Lights() {}
+        Lights(const SkLight lights[], int numLights) : fLights(lights, numLights) {}
+
+        SkTDArray<SkLight> fLights;
+
+        typedef SkRefCnt INHERITED;
+    };
+
+    /** Returns a shader that lights the diffuse and normal maps with a single light.
+
+        It returns a shader with a reference count of 1.
+        The caller should decrement the shader's reference count when done with the shader.
+        It is an error for count to be < 2.
+        @param  diffuse     the diffuse bitmap
+        @param  normal      the normal map
+        @param  light       the light applied to the normal map
+        @param  ambient     the linear (unpremul) ambient light color. Range is 0..1/channel.
+        @param  localMatrix the matrix mapping the textures to the dest rect 
+
+        nullptr will be returned if:
+            either 'diffuse' or 'normal' are empty
+            either 'diffuse' or 'normal' are too big (> 65535 on a side)
+            'diffuse' and 'normal' aren't the same size
+
+        The lighting equation is currently:
+            result = LightColor * DiffuseColor * (Normal * LightDir) + AmbientColor
+
+        The normal map is currently assumed to be an 8888 image where the normal at a texel
+        is retrieved by:
+            N.x = R-127;
+            N.y = G-127;
+            N.z = B-127;
+            N.normalize();
+        The +Z axis is thus encoded in RGB as (127, 127, 255) while the -Z axis is
+        (127, 127, 0).
+    */
+    static SkShader* Create(const SkBitmap& diffuse, const SkBitmap& normal,
+                            const Lights* lights, const SkVector& invNormRotation,
+                            const SkMatrix* diffLocalMatrix, const SkMatrix* normLocalMatrix);
+
+    SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP()
+};
+
+#endif
diff --git a/gfx/skia/skia/src/core/SkLineClipper.cpp b/gfx/skia/skia/src/core/SkLineClipper.cpp
index 1645917d70f5..189f03ac7351 100644
--- a/gfx/skia/skia/src/core/SkLineClipper.cpp
+++ b/gfx/skia/skia/src/core/SkLineClipper.cpp
@@ -1,10 +1,10 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 #include "SkLineClipper.h"
 
 template <typename T> T pin_unsorted(T value, T limit0, T limit1) {
@@ -78,7 +78,7 @@ bool SkLineClipper::IntersectLine(const SkPoint src[2], const SkRect& clip,
                                   SkPoint dst[2]) {
     SkRect bounds;
 
-    bounds.set(src, 2);
+    bounds.set(src[0], src[1]);
     if (containsNoEmptyCheck(clip, bounds)) {
         if (src != dst) {
             memcpy(dst, src, 2 * sizeof(SkPoint));
@@ -137,7 +137,7 @@ bool SkLineClipper::IntersectLine(const SkPoint src[2], const SkRect& clip,
         tmp[index1].set(clip.fRight, sect_with_vertical(src, clip.fRight));
     }
 #ifdef SK_DEBUG
-    bounds.set(tmp, 2);
+    bounds.set(tmp[0], tmp[1]);
     SkASSERT(containsNoEmptyCheck(clip, bounds));
 #endif
     memcpy(dst, tmp, sizeof(tmp));
@@ -172,8 +172,9 @@ static void sect_with_horizontal_test_for_pin_results() {
 }
 #endif
 
-int SkLineClipper::ClipLine(const SkPoint pts[], const SkRect& clip,
-                            SkPoint lines[]) {
+int SkLineClipper::ClipLine(const SkPoint pts[], const SkRect& clip, SkPoint lines[],
+                            bool canCullToTheRight) {
+
 #ifdef SK_DEBUG
     {
         static bool gOnce;
@@ -241,6 +242,9 @@ int SkLineClipper::ClipLine(const SkPoint pts[], const SkRect& clip,
         result = tmp;
         reverse = false;
     } else if (tmp[index0].fX >= clip.fRight) {    // wholly to the right
+        if (canCullToTheRight) {
+            return 0;
+        }
         tmp[0].fX = tmp[1].fX = clip.fRight;
         result = tmp;
         reverse = false;
diff --git a/gfx/skia/skia/src/core/SkLineClipper.h b/gfx/skia/skia/src/core/SkLineClipper.h
index 8026890b8d0a..11e0a73ca2a2 100644
--- a/gfx/skia/skia/src/core/SkLineClipper.h
+++ b/gfx/skia/skia/src/core/SkLineClipper.h
@@ -30,7 +30,7 @@ public:
             3rd segment: lines[2]..lines[3]
      */
     static int ClipLine(const SkPoint pts[2], const SkRect& clip,
-                        SkPoint lines[kMaxPoints]);
+                        SkPoint lines[kMaxPoints], bool canCullToTheRight);
 
     /*  Intersect the line segment against the rect. If there is a non-empty
         resulting segment, return true and set dst[] to that segment. If not,
@@ -40,8 +40,7 @@ public:
         segments on the sides to show where the line extended beyond the
         left or right sides. IntersectLine does not.
      */
-    static bool IntersectLine(const SkPoint src[2], const SkRect& clip,
-                              SkPoint dst[2]);
+    static bool IntersectLine(const SkPoint src[2], const SkRect& clip, SkPoint dst[2]);
 };
 
 #endif
diff --git a/gfx/skia/skia/src/core/SkLocalMatrixImageFilter.cpp b/gfx/skia/skia/src/core/SkLocalMatrixImageFilter.cpp
new file mode 100644
index 000000000000..e4fc0ceb0065
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkLocalMatrixImageFilter.cpp
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkLocalMatrixImageFilter.h"
+#include "SkReadBuffer.h"
+#include "SkString.h"
+
+SkImageFilter* SkLocalMatrixImageFilter::Create(const SkMatrix& localM, SkImageFilter* input) {
+    if (!input) {
+        return nullptr;
+    }
+    if (localM.getType() & (SkMatrix::kAffine_Mask | SkMatrix::kPerspective_Mask)) {
+        return nullptr;
+    }
+    if (localM.isIdentity()) {
+        return SkRef(input);
+    }
+    return new SkLocalMatrixImageFilter(localM, input);
+}
+
+SkLocalMatrixImageFilter::SkLocalMatrixImageFilter(const SkMatrix& localM, SkImageFilter* input)
+  : INHERITED(1, &input), fLocalM(localM)
+{}
+
+SkFlattenable* SkLocalMatrixImageFilter::CreateProc(SkReadBuffer& buffer) {
+    SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
+    SkMatrix lm;
+    buffer.readMatrix(&lm);
+    return SkLocalMatrixImageFilter::Create(lm, common.getInput(0));
+}
+
+void SkLocalMatrixImageFilter::flatten(SkWriteBuffer& buffer) const {
+    this->INHERITED::flatten(buffer);
+    buffer.writeMatrix(fLocalM);
+}
+
+bool SkLocalMatrixImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& src, const Context& ctx,
+                                             SkBitmap* result, SkIPoint* offset) const {
+    Context localCtx(SkMatrix::Concat(ctx.ctm(), fLocalM), ctx.clipBounds(), ctx.cache(),
+                     ctx.sizeConstraint());
+    return this->filterInput(0, proxy, src, localCtx, result, offset, false);
+}
+
+bool SkLocalMatrixImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& matrix,
+                                              SkIRect* dst) const {
+    return this->getInput(0)->filterBounds(src, SkMatrix::Concat(matrix, fLocalM), dst);
+}
+
+#ifndef SK_IGNORE_TO_STRING
+void SkLocalMatrixImageFilter::toString(SkString* str) const {
+    str->append("SkLocalMatrixImageFilter: (");
+    str->append(")");
+}
+#endif
diff --git a/gfx/skia/skia/src/core/SkLocalMatrixImageFilter.h b/gfx/skia/skia/src/core/SkLocalMatrixImageFilter.h
new file mode 100644
index 000000000000..f908d025a5a8
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkLocalMatrixImageFilter.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015 The Android Open Source Project
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkLocalMatrixImageFilter_DEFINED
+#define SkLocalMatrixImageFilter_DEFINED
+
+#include "SkImageFilter.h"
+#include "SkReadBuffer.h"
+#include "SkString.h"
+
+/**
+ *  Wraps another imagefilter + matrix, such that using this filter will give the same result
+ *  as using the wrapped filter with the matrix applied to its context.
+ */
+class SkLocalMatrixImageFilter : public SkImageFilter {
+public:
+    static SkImageFilter* Create(const SkMatrix& localM, SkImageFilter* input);
+
+    SK_TO_STRING_OVERRIDE()
+    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLocalMatrixImageFilter)
+
+protected:
+    void flatten(SkWriteBuffer&) const override;
+    bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
+                       SkBitmap* result, SkIPoint* offset) const override;
+    bool onFilterBounds(const SkIRect& src, const SkMatrix&, SkIRect* dst) const override;
+
+private:
+    SkLocalMatrixImageFilter(const SkMatrix& localM, SkImageFilter* input);
+
+    SkMatrix                    fLocalM;
+
+    typedef SkImageFilter INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/core/SkLocalMatrixShader.cpp b/gfx/skia/skia/src/core/SkLocalMatrixShader.cpp
index c77f38d6d68b..ce5a7cad713a 100644
--- a/gfx/skia/skia/src/core/SkLocalMatrixShader.cpp
+++ b/gfx/skia/skia/src/core/SkLocalMatrixShader.cpp
@@ -7,18 +7,18 @@
 
 #include "SkLocalMatrixShader.h"
 
-SkLocalMatrixShader::SkLocalMatrixShader(SkReadBuffer& buffer) : INHERITED(buffer) {
-    if (buffer.isVersionLT(SkReadBuffer::kSimplifyLocalMatrix_Version)) {
-        buffer.readMatrix(&(INHERITED::fLocalMatrix));
-    }
-    fProxyShader.reset(buffer.readShader());
-    if (NULL == fProxyShader.get()) {
-        sk_throw();
+SkFlattenable* SkLocalMatrixShader::CreateProc(SkReadBuffer& buffer) {
+    SkMatrix lm;
+    buffer.readMatrix(&lm);
+    SkAutoTUnref<SkShader> shader(buffer.readShader());
+    if (!shader.get()) {
+        return nullptr;
     }
+    return SkShader::CreateLocalMatrixShader(shader, lm);
 }
 
 void SkLocalMatrixShader::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
+    buffer.writeMatrix(this->getLocalMatrix());
     buffer.writeFlattenable(fProxyShader.get());
 }
 
@@ -27,7 +27,7 @@ SkShader::Context* SkLocalMatrixShader::onCreateContext(const ContextRec& rec,
     ContextRec newRec(rec);
     SkMatrix tmp;
     if (rec.fLocalMatrix) {
-        tmp.setConcat(this->getLocalMatrix(), *rec.fLocalMatrix);
+        tmp.setConcat(*rec.fLocalMatrix, this->getLocalMatrix());
         newRec.fLocalMatrix = &tmp;
     } else {
         newRec.fLocalMatrix = &this->getLocalMatrix();
@@ -48,6 +48,10 @@ void SkLocalMatrixShader::toString(SkString* str) const {
 #endif
 
 SkShader* SkShader::CreateLocalMatrixShader(SkShader* proxy, const SkMatrix& localMatrix) {
+    if (nullptr == proxy) {
+        return nullptr;
+    }
+
     if (localMatrix.isIdentity()) {
         return SkRef(proxy);
     }
@@ -62,5 +66,5 @@ SkShader* SkShader::CreateLocalMatrixShader(SkShader* proxy, const SkMatrix& loc
         proxy = otherProxy.get();
     }
 
-    return SkNEW_ARGS(SkLocalMatrixShader, (proxy, *lm));
+    return new SkLocalMatrixShader(proxy, *lm);
 }
diff --git a/gfx/skia/skia/src/core/SkLocalMatrixShader.h b/gfx/skia/skia/src/core/SkLocalMatrixShader.h
index 7eb7c1337aa1..62654275f430 100644
--- a/gfx/skia/skia/src/core/SkLocalMatrixShader.h
+++ b/gfx/skia/skia/src/core/SkLocalMatrixShader.h
@@ -19,41 +19,27 @@ public:
     , fProxyShader(SkRef(proxy))
     {}
 
-    virtual size_t contextSize() const SK_OVERRIDE {
+    size_t contextSize() const override {
         return fProxyShader->contextSize();
     }
 
-    virtual BitmapType asABitmap(SkBitmap* bitmap, SkMatrix* matrix,
-                                 TileMode* mode) const SK_OVERRIDE {
-        return fProxyShader->asABitmap(bitmap, matrix, mode);
-    }
-
-    virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE {
+    GradientType asAGradient(GradientInfo* info) const override {
         return fProxyShader->asAGradient(info);
     }
 
 #if SK_SUPPORT_GPU
-    
-    virtual bool asNewEffect(GrContext* context, const SkPaint& paint, const SkMatrix* localMatrix,
-                             GrColor* grColor, GrEffect** grEffect) const SK_OVERRIDE {
+    const GrFragmentProcessor* asFragmentProcessor(GrContext* context, const SkMatrix& viewM,
+                                                   const SkMatrix* localMatrix,
+                                                   SkFilterQuality fq) const override {
         SkMatrix tmp = this->getLocalMatrix();
         if (localMatrix) {
             tmp.preConcat(*localMatrix);
         }
-        return fProxyShader->asNewEffect(context, paint, &tmp, grColor, grEffect);
+        return fProxyShader->asFragmentProcessor(context, viewM, &tmp, fq);
     }
-    
-#else 
-    
-    virtual bool asNewEffect(GrContext* context, const SkPaint& paint, const SkMatrix* localMatrix,
-                             GrColor* grColor, GrEffect** grEffect) const SK_OVERRIDE {
-        SkDEBUGFAIL("Should not call in GPU-less build");
-        return false;
-    }
-    
 #endif
-    
-    virtual SkShader* refAsALocalMatrixShader(SkMatrix* localMatrix) const SK_OVERRIDE {
+
+    SkShader* refAsALocalMatrixShader(SkMatrix* localMatrix) const override {
         if (localMatrix) {
             *localMatrix = this->getLocalMatrix();
         }
@@ -64,9 +50,12 @@ public:
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLocalMatrixShader)
 
 protected:
-    SkLocalMatrixShader(SkReadBuffer&);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
-    virtual Context* onCreateContext(const ContextRec&, void*) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
+    Context* onCreateContext(const ContextRec&, void*) const override;
+
+    bool onIsABitmap(SkBitmap* bitmap, SkMatrix* matrix, TileMode* mode) const override {
+        return fProxyShader->isABitmap(bitmap, matrix, mode);
+    }
 
 private:
     SkAutoTUnref<SkShader> fProxyShader;
diff --git a/gfx/skia/skia/src/core/SkMallocPixelRef.cpp b/gfx/skia/skia/src/core/SkMallocPixelRef.cpp
index 0d50164832a0..fffc0448486c 100644
--- a/gfx/skia/skia/src/core/SkMallocPixelRef.cpp
+++ b/gfx/skia/skia/src/core/SkMallocPixelRef.cpp
@@ -16,10 +16,9 @@ static void sk_free_releaseproc(void* ptr, void*) {
 }
 
 static bool is_valid(const SkImageInfo& info, SkColorTable* ctable) {
-    if (info.fWidth < 0 ||
-        info.fHeight < 0 ||
-        (unsigned)info.fColorType > (unsigned)kLastEnum_SkColorType ||
-        (unsigned)info.fAlphaType > (unsigned)kLastEnum_SkAlphaType)
+    if (info.width() < 0 || info.height() < 0 ||
+        (unsigned)info.colorType() > (unsigned)kLastEnum_SkColorType ||
+        (unsigned)info.alphaType() > (unsigned)kLastEnum_SkAlphaType)
     {
         return false;
     }
@@ -28,10 +27,10 @@ static bool is_valid(const SkImageInfo& info, SkColorTable* ctable) {
     // that expect the pixelref to succeed even when there is a mismatch
     // with colortables. fix?
 #if 0
-    if (kIndex8_SkColorType == info.fColorType && NULL == ctable) {
+    if (kIndex8_SkColorType == info.fColorType && nullptr == ctable) {
         return false;
     }
-    if (kIndex8_SkColorType != info.fColorType && NULL != ctable) {
+    if (kIndex8_SkColorType != info.fColorType && ctable) {
         return false;
     }
 #endif
@@ -43,26 +42,27 @@ SkMallocPixelRef* SkMallocPixelRef::NewDirect(const SkImageInfo& info,
                                               size_t rowBytes,
                                               SkColorTable* ctable) {
     if (!is_valid(info, ctable)) {
-        return NULL;
+        return nullptr;
     }
-    return SkNEW_ARGS(SkMallocPixelRef,
-                      (info, addr, rowBytes, ctable, NULL, NULL));
+    return new SkMallocPixelRef(info, addr, rowBytes, ctable, nullptr, nullptr);
 }
 
 
-SkMallocPixelRef* SkMallocPixelRef::NewAllocate(const SkImageInfo& info,
-                                                size_t requestedRowBytes,
-                                                SkColorTable* ctable) {
+ SkMallocPixelRef* SkMallocPixelRef::NewUsing(void*(*alloc)(size_t),
+                                              const SkImageInfo& info,
+                                              size_t requestedRowBytes,
+                                              SkColorTable* ctable) {
     if (!is_valid(info, ctable)) {
-        return NULL;
+        return nullptr;
     }
 
-    int32_t minRB = SkToS32(info.minRowBytes());
-    if (minRB < 0) {
-        return NULL;    // allocation will be too large
+    // only want to permit 31bits of rowBytes
+    int64_t minRB = (int64_t)info.minRowBytes64();
+    if (minRB < 0 || !sk_64_isS32(minRB)) {
+        return nullptr;    // allocation will be too large
     }
     if (requestedRowBytes > 0 && (int32_t)requestedRowBytes < minRB) {
-        return NULL;    // cannot meet requested rowbytes
+        return nullptr;    // cannot meet requested rowbytes
     }
 
     int32_t rowBytes;
@@ -72,21 +72,32 @@ SkMallocPixelRef* SkMallocPixelRef::NewAllocate(const SkImageInfo& info,
         rowBytes = minRB;
     }
 
-    int64_t bigSize = (int64_t)info.fHeight * rowBytes;
+    int64_t bigSize = (int64_t)info.height() * rowBytes;
     if (!sk_64_isS32(bigSize)) {
-        return NULL;
+        return nullptr;
     }
 
     size_t size = sk_64_asS32(bigSize);
     SkASSERT(size >= info.getSafeSize(rowBytes));
-    void* addr = sk_malloc_flags(size, 0);
-    if (NULL == addr) {
-        return NULL;
+    void* addr = alloc(size);
+    if (nullptr == addr) {
+        return nullptr;
     }
 
-    return SkNEW_ARGS(SkMallocPixelRef,
-                      (info, addr, rowBytes, ctable,
-                       sk_free_releaseproc, NULL));
+    return new SkMallocPixelRef(info, addr, rowBytes, ctable, sk_free_releaseproc, nullptr);
+}
+
+SkMallocPixelRef* SkMallocPixelRef::NewAllocate(const SkImageInfo& info,
+                                                size_t rowBytes,
+                                                SkColorTable* ctable) {
+    auto sk_malloc_nothrow = [](size_t size) { return sk_malloc_flags(size, 0); };
+    return NewUsing(sk_malloc_nothrow, info, rowBytes, ctable);
+}
+
+SkMallocPixelRef* SkMallocPixelRef::NewZeroed(const SkImageInfo& info,
+                                              size_t rowBytes,
+                                              SkColorTable* ctable) {
+    return NewUsing(sk_calloc, info, rowBytes, ctable);
 }
 
 SkMallocPixelRef* SkMallocPixelRef::NewWithProc(const SkImageInfo& info,
@@ -96,10 +107,9 @@ SkMallocPixelRef* SkMallocPixelRef::NewWithProc(const SkImageInfo& info,
                                                 SkMallocPixelRef::ReleaseProc proc,
                                                 void* context) {
     if (!is_valid(info, ctable)) {
-        return NULL;
+        return nullptr;
     }
-    return SkNEW_ARGS(SkMallocPixelRef,
-                      (info, addr, rowBytes, ctable, proc, context));
+    return new SkMallocPixelRef(info, addr, rowBytes, ctable, proc, context);
 }
 
 static void sk_data_releaseproc(void*, void* dataPtr) {
@@ -110,20 +120,19 @@ SkMallocPixelRef* SkMallocPixelRef::NewWithData(const SkImageInfo& info,
                                                 size_t rowBytes,
                                                 SkColorTable* ctable,
                                                 SkData* data) {
-    SkASSERT(data != NULL);
+    SkASSERT(data != nullptr);
     if (!is_valid(info, ctable)) {
-        return NULL;
+        return nullptr;
     }
     if ((rowBytes < info.minRowBytes())
         || (data->size() < info.getSafeSize(rowBytes))) {
-        return NULL;
+        return nullptr;
     }
     data->ref();
-    SkMallocPixelRef* pr
-        = SkNEW_ARGS(SkMallocPixelRef,
-                     (info, const_cast<void*>(data->data()), rowBytes, ctable,
-                      sk_data_releaseproc, static_cast<void*>(data)));
-    SkASSERT(pr != NULL);
+    SkMallocPixelRef* pr =
+            new SkMallocPixelRef(info, const_cast<void*>(data->data()), rowBytes, ctable,
+                                 sk_data_releaseproc, static_cast<void*>(data));
+    SkASSERT(pr != nullptr);
     // We rely on the immutability of the pixels to make the
     // const_cast okay.
     pr->setImmutable();
@@ -136,14 +145,14 @@ SkMallocPixelRef::SkMallocPixelRef(const SkImageInfo& info, void* storage,
                                    size_t rowBytes, SkColorTable* ctable,
                                    bool ownsPixels)
     : INHERITED(info)
-    , fReleaseProc(ownsPixels ? sk_free_releaseproc : NULL)
-    , fReleaseProcContext(NULL) {
+    , fReleaseProc(ownsPixels ? sk_free_releaseproc : nullptr)
+    , fReleaseProcContext(nullptr) {
     // This constructor is now DEPRICATED.
     SkASSERT(is_valid(info, ctable));
     SkASSERT(rowBytes >= info.minRowBytes());
 
-    if (kIndex_8_SkColorType != info.fColorType) {
-        ctable = NULL;
+    if (kIndex_8_SkColorType != info.colorType()) {
+        ctable = nullptr;
     }
 
     fStorage = storage;
@@ -165,8 +174,8 @@ SkMallocPixelRef::SkMallocPixelRef(const SkImageInfo& info, void* storage,
     SkASSERT(is_valid(info, ctable));
     SkASSERT(rowBytes >= info.minRowBytes());
 
-    if (kIndex_8_SkColorType != info.fColorType) {
-        ctable = NULL;
+    if (kIndex_8_SkColorType != info.colorType()) {
+        ctable = nullptr;
     }
 
     fStorage = storage;
@@ -180,7 +189,7 @@ SkMallocPixelRef::SkMallocPixelRef(const SkImageInfo& info, void* storage,
 
 SkMallocPixelRef::~SkMallocPixelRef() {
     SkSafeUnref(fCTable);
-    if (fReleaseProc != NULL) {
+    if (fReleaseProc != nullptr) {
         fReleaseProc(fStorage, fReleaseProcContext);
     }
 }
@@ -206,3 +215,8 @@ SkPixelRef* SkMallocPixelRef::PRFactory::create(const SkImageInfo& info, size_t
                                                 SkColorTable* ctable) {
     return SkMallocPixelRef::NewAllocate(info, rowBytes, ctable);
 }
+
+SkPixelRef* SkMallocPixelRef::ZeroedPRFactory::create(const SkImageInfo& info, size_t rowBytes,
+                                                      SkColorTable* ctable) {
+    return SkMallocPixelRef::NewZeroed(info, rowBytes, ctable);
+}
diff --git a/gfx/skia/skia/src/core/SkMask.cpp b/gfx/skia/skia/src/core/SkMask.cpp
index 929835717ba9..111508074a3e 100644
--- a/gfx/skia/skia/src/core/SkMask.cpp
+++ b/gfx/skia/skia/src/core/SkMask.cpp
@@ -7,6 +7,8 @@
 
 #include "SkMask.h"
 
+//#define TRACK_SKMASK_LIFETIME
+
 /** returns the product if it is positive and fits in 31 bits. Otherwise this
     returns 0.
  */
@@ -30,10 +32,17 @@ size_t SkMask::computeTotalImageSize() const {
     return size;
 }
 
+#ifdef TRACK_SKMASK_LIFETIME
+    static int gCounter;
+#endif
+
 /** We explicitly use this allocator for SkBimap pixels, so that we can
     freely assign memory allocated by one class to the other.
 */
 uint8_t* SkMask::AllocImage(size_t size) {
+#ifdef TRACK_SKMASK_LIFETIME
+    SkDebugf("SkMask::AllocImage %d\n", gCounter++);
+#endif
     return (uint8_t*)sk_malloc_throw(SkAlign4(size));
 }
 
@@ -41,6 +50,11 @@ uint8_t* SkMask::AllocImage(size_t size) {
     freely assign memory allocated by one class to the other.
 */
 void SkMask::FreeImage(void* image) {
+#ifdef TRACK_SKMASK_LIFETIME
+    if (image) {
+        SkDebugf("SkMask::FreeImage  %d\n", --gCounter);
+    }
+#endif
     sk_free(image);
 }
 
@@ -52,7 +66,6 @@ static const int gMaskFormatToShift[] = {
     0,  // 3D
     2,  // ARGB32
     1,  // LCD16
-    2   // LCD32
 };
 
 static int maskFormatToShift(SkMask::Format format) {
diff --git a/gfx/skia/skia/src/core/SkMaskCache.cpp b/gfx/skia/skia/src/core/SkMaskCache.cpp
new file mode 100644
index 000000000000..da7b538d3e40
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkMaskCache.cpp
@@ -0,0 +1,191 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkMaskCache.h"
+
+#define CHECK_LOCAL(localCache, localName, globalName, ...) \
+    ((localCache) ? localCache->localName(__VA_ARGS__) : SkResourceCache::globalName(__VA_ARGS__))
+
+struct MaskValue {
+    SkMask          fMask;
+    SkCachedData*   fData;
+};
+
+namespace {
+static unsigned gRRectBlurKeyNamespaceLabel;
+
+struct RRectBlurKey : public SkResourceCache::Key {
+public:
+    RRectBlurKey(SkScalar sigma, const SkRRect& rrect, SkBlurStyle style, SkBlurQuality quality)
+        : fSigma(sigma)
+        , fStyle(style)
+        , fQuality(quality)
+        , fRRect(rrect)
+    {
+        this->init(&gRRectBlurKeyNamespaceLabel, 0,
+                   sizeof(fSigma) + sizeof(fStyle) + sizeof(fQuality) + sizeof(fRRect));
+    }
+
+    SkScalar   fSigma;
+    int32_t    fStyle;
+    int32_t    fQuality;
+    SkRRect    fRRect;
+};
+
+struct RRectBlurRec : public SkResourceCache::Rec {
+    RRectBlurRec(RRectBlurKey key, const SkMask& mask, SkCachedData* data)
+        : fKey(key)
+    {
+        fValue.fMask = mask;
+        fValue.fData = data;
+        fValue.fData->attachToCacheAndRef();
+    }
+    ~RRectBlurRec() {
+        fValue.fData->detachFromCacheAndUnref();
+    }
+
+    RRectBlurKey   fKey;
+    MaskValue      fValue;
+
+    const Key& getKey() const override { return fKey; }
+    size_t bytesUsed() const override { return sizeof(*this) + fValue.fData->size(); }
+    const char* getCategory() const override { return "rrect-blur"; }
+    SkDiscardableMemory* diagnostic_only_getDiscardable() const override {
+        return fValue.fData->diagnostic_only_getDiscardable();
+    }
+
+    static bool Visitor(const SkResourceCache::Rec& baseRec, void* contextData) {
+        const RRectBlurRec& rec = static_cast<const RRectBlurRec&>(baseRec);
+        MaskValue* result = (MaskValue*)contextData;
+
+        SkCachedData* tmpData = rec.fValue.fData;
+        tmpData->ref();
+        if (nullptr == tmpData->data()) {
+            tmpData->unref();
+            return false;
+        }
+        *result = rec.fValue;
+        return true;
+    }
+};
+} // namespace
+
+SkCachedData* SkMaskCache::FindAndRef(SkScalar sigma, SkBlurStyle style, SkBlurQuality quality,
+                                  const SkRRect& rrect, SkMask* mask, SkResourceCache* localCache) {
+    MaskValue result;
+    RRectBlurKey key(sigma, rrect, style, quality);
+    if (!CHECK_LOCAL(localCache, find, Find, key, RRectBlurRec::Visitor, &result)) {
+        return nullptr;
+    }
+
+    *mask = result.fMask;
+    mask->fImage = (uint8_t*)(result.fData->data());
+    return result.fData;
+}
+
+void SkMaskCache::Add(SkScalar sigma, SkBlurStyle style, SkBlurQuality quality,
+                      const SkRRect& rrect, const SkMask& mask, SkCachedData* data,
+                      SkResourceCache* localCache) {
+    RRectBlurKey key(sigma, rrect, style, quality);
+    return CHECK_LOCAL(localCache, add, Add, new RRectBlurRec(key, mask, data));
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+
+namespace {
+static unsigned gRectsBlurKeyNamespaceLabel;
+
+struct RectsBlurKey : public SkResourceCache::Key {
+public:
+    RectsBlurKey(SkScalar sigma, SkBlurStyle style, SkBlurQuality quality,
+                 const SkRect rects[], int count)
+        : fSigma(sigma)
+        , fStyle(style)
+        , fQuality(quality)
+    {
+        SkASSERT(1 == count || 2 == count);
+        SkIRect ir;
+        rects[0].roundOut(&ir);
+        fSizes[0] = SkSize::Make(0, 0);
+        fSizes[1] = SkSize::Make(0, 0);
+        fSizes[2] = SkSize::Make(0, 0);
+        fSizes[3] = SkSize::Make(rects[0].x() - ir.x(), rects[0].y() - ir.y());
+        for (int i = 0; i < count; i++) {
+            fSizes[i] = SkSize::Make(rects[i].width(), rects[i].height());
+        }
+        if (2 == count) {
+            fSizes[2] = SkSize::Make(rects[0].x() - rects[1].x(), rects[0].y() - rects[1].y());
+        }
+
+        this->init(&gRectsBlurKeyNamespaceLabel, 0,
+                   sizeof(fSigma) + sizeof(fStyle) + sizeof(fQuality) + sizeof(fSizes));
+    }
+
+    SkScalar    fSigma;
+    int32_t     fStyle;
+    int32_t     fQuality;
+    SkSize      fSizes[4];
+};
+
+struct RectsBlurRec : public SkResourceCache::Rec {
+    RectsBlurRec(RectsBlurKey key, const SkMask& mask, SkCachedData* data)
+        : fKey(key)
+    {
+        fValue.fMask = mask;
+        fValue.fData = data;
+        fValue.fData->attachToCacheAndRef();
+    }
+    ~RectsBlurRec() {
+        fValue.fData->detachFromCacheAndUnref();
+    }
+
+    RectsBlurKey   fKey;
+    MaskValue      fValue;
+
+    const Key& getKey() const override { return fKey; }
+    size_t bytesUsed() const override { return sizeof(*this) + fValue.fData->size(); }
+    const char* getCategory() const override { return "rects-blur"; }
+    SkDiscardableMemory* diagnostic_only_getDiscardable() const override {
+        return fValue.fData->diagnostic_only_getDiscardable();
+    }
+
+    static bool Visitor(const SkResourceCache::Rec& baseRec, void* contextData) {
+        const RectsBlurRec& rec = static_cast<const RectsBlurRec&>(baseRec);
+        MaskValue* result = static_cast<MaskValue*>(contextData);
+
+        SkCachedData* tmpData = rec.fValue.fData;
+        tmpData->ref();
+        if (nullptr == tmpData->data()) {
+            tmpData->unref();
+            return false;
+        }
+        *result = rec.fValue;
+        return true;
+    }
+};
+} // namespace
+
+SkCachedData* SkMaskCache::FindAndRef(SkScalar sigma, SkBlurStyle style, SkBlurQuality quality,
+                                      const SkRect rects[], int count, SkMask* mask,
+                                      SkResourceCache* localCache) {
+    MaskValue result;
+    RectsBlurKey key(sigma, style, quality, rects, count);
+    if (!CHECK_LOCAL(localCache, find, Find, key, RectsBlurRec::Visitor, &result)) {
+        return nullptr;
+    }
+
+    *mask = result.fMask;
+    mask->fImage = (uint8_t*)(result.fData->data());
+    return result.fData;
+}
+
+void SkMaskCache::Add(SkScalar sigma, SkBlurStyle style, SkBlurQuality quality,
+                      const SkRect rects[], int count, const SkMask& mask, SkCachedData* data,
+                      SkResourceCache* localCache) {
+    RectsBlurKey key(sigma, style, quality, rects, count);
+    return CHECK_LOCAL(localCache, add, Add, new RectsBlurRec(key, mask, data));
+}
diff --git a/gfx/skia/skia/src/core/SkMaskCache.h b/gfx/skia/skia/src/core/SkMaskCache.h
new file mode 100644
index 000000000000..9df1bf86018b
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkMaskCache.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkMaskCache_DEFINED
+#define SkMaskCache_DEFINED
+
+#include "SkBlurTypes.h"
+#include "SkCachedData.h"
+#include "SkMask.h"
+#include "SkRect.h"
+#include "SkResourceCache.h"
+#include "SkRRect.h"
+
+class SkMaskCache {
+public:
+    /**
+     * On success, return a ref to the SkCachedData that holds the pixels, and have mask
+     * already point to that memory.
+     *
+     * On failure, return nullptr.
+     */
+    static SkCachedData* FindAndRef(SkScalar sigma, SkBlurStyle style, SkBlurQuality quality,
+                                    const SkRRect& rrect, SkMask* mask,
+                                    SkResourceCache* localCache = nullptr);
+    static SkCachedData* FindAndRef(SkScalar sigma, SkBlurStyle style, SkBlurQuality quality,
+                                    const SkRect rects[], int count, SkMask* mask,
+                                    SkResourceCache* localCache = nullptr);
+
+    /**
+     * Add a mask and its pixel-data to the cache.
+     */
+    static void Add(SkScalar sigma, SkBlurStyle style, SkBlurQuality quality,
+                    const SkRRect& rrect, const SkMask& mask, SkCachedData* data,
+                    SkResourceCache* localCache = nullptr);
+    static void Add(SkScalar sigma, SkBlurStyle style, SkBlurQuality quality,
+                    const SkRect rects[], int count, const SkMask& mask, SkCachedData* data,
+                    SkResourceCache* localCache = nullptr);
+};
+
+#endif
diff --git a/gfx/skia/skia/src/core/SkMaskFilter.cpp b/gfx/skia/skia/src/core/SkMaskFilter.cpp
index a2adc7c32755..0753944a3b8f 100644
--- a/gfx/skia/skia/src/core/SkMaskFilter.cpp
+++ b/gfx/skia/skia/src/core/SkMaskFilter.cpp
@@ -10,6 +10,8 @@
 #include "SkMaskFilter.h"
 #include "SkBlitter.h"
 #include "SkDraw.h"
+#include "SkCachedData.h"
+#include "SkPath.h"
 #include "SkRasterClip.h"
 #include "SkRRect.h"
 #include "SkTypes.h"
@@ -20,6 +22,15 @@
 #include "SkGrPixelRef.h"
 #endif
 
+SkMaskFilter::NinePatch::~NinePatch() {
+    if (fCache) {
+        SkASSERT((const void*)fMask.fImage == fCache->data());
+        fCache->unref();
+    } else {
+        SkMask::FreeImage(fMask.fImage);
+    }
+}
+
 bool SkMaskFilter::filterMask(SkMask*, const SkMask&, const SkMatrix&,
                               SkIPoint*) const {
     return false;
@@ -198,7 +209,7 @@ static void draw_nine(const SkMask& mask, const SkIRect& outerR, const SkIPoint&
 }
 
 static int countNestedRects(const SkPath& path, SkRect rects[2]) {
-    if (path.isNestedRects(rects)) {
+    if (path.isNestedFillRects(rects)) {
         return 2;
     }
     return path.isRect(&rects[0]);
@@ -211,15 +222,14 @@ bool SkMaskFilter::filterRRect(const SkRRect& devRRect, const SkMatrix& matrix,
     // cannot be used, return false to allow our caller to recover and perform
     // the drawing another way.
     NinePatch patch;
-    patch.fMask.fImage = NULL;
+    patch.fMask.fImage = nullptr;
     if (kTrue_FilterReturn != this->filterRRectToNine(devRRect, matrix,
                                                       clip.getBounds(),
                                                       &patch)) {
-        SkASSERT(NULL == patch.fMask.fImage);
+        SkASSERT(nullptr == patch.fMask.fImage);
         return false;
     }
     draw_nine(patch.fMask, patch.fOuterRect, patch.fCenter, true, clip, blitter);
-    SkMask::FreeImage(patch.fMask.fImage);
     return true;
 }
 
@@ -234,21 +244,18 @@ bool SkMaskFilter::filterPath(const SkPath& devPath, const SkMatrix& matrix,
     if (rectCount > 0) {
         NinePatch patch;
 
-        patch.fMask.fImage = NULL;
-        switch (this->filterRectsToNine(rects, rectCount, matrix,
-                                        clip.getBounds(), &patch)) {
+        switch (this->filterRectsToNine(rects, rectCount, matrix, clip.getBounds(), &patch)) {
             case kFalse_FilterReturn:
-                SkASSERT(NULL == patch.fMask.fImage);
+                SkASSERT(nullptr == patch.fMask.fImage);
                 return false;
 
             case kTrue_FilterReturn:
                 draw_nine(patch.fMask, patch.fOuterRect, patch.fCenter, 1 == rectCount, clip,
                           blitter);
-                SkMask::FreeImage(patch.fMask.fImage);
                 return true;
 
             case kUnimplemented_FilterReturn:
-                SkASSERT(NULL == patch.fMask.fImage);
+                SkASSERT(nullptr == patch.fMask.fImage);
                 // fall through
                 break;
         }
@@ -263,7 +270,7 @@ bool SkMaskFilter::filterPath(const SkPath& devPath, const SkMatrix& matrix,
     }
     SkAutoMaskFreeImage autoSrc(srcM.fImage);
 
-    if (!this->filterMask(&dstM, srcM, matrix, NULL)) {
+    if (!this->filterMask(&dstM, srcM, matrix, nullptr)) {
         return false;
     }
     SkAutoMaskFreeImage autoDst(dstM.fImage);
@@ -298,27 +305,33 @@ SkMaskFilter::filterRectsToNine(const SkRect[], int count, const SkMatrix&,
 }
 
 #if SK_SUPPORT_GPU
-bool SkMaskFilter::asNewEffect(GrEffect** effect, GrTexture*, const SkMatrix&) const {
+bool SkMaskFilter::asFragmentProcessor(GrFragmentProcessor**, GrTexture*, const SkMatrix&) const {
     return false;
 }
 
-bool SkMaskFilter::canFilterMaskGPU(const SkRect& devBounds,
+bool SkMaskFilter::canFilterMaskGPU(const SkRRect& devRRect,
                                     const SkIRect& clipBounds,
                                     const SkMatrix& ctm,
                                     SkRect* maskRect) const {
     return false;
 }
 
- bool SkMaskFilter::directFilterMaskGPU(GrContext* context,
+ bool SkMaskFilter::directFilterMaskGPU(GrTextureProvider* texProvider,
+                                        GrDrawContext* drawContext,
                                         GrPaint* grp,
+                                        const GrClip&,
+                                        const SkMatrix& viewMatrix,
                                         const SkStrokeRec& strokeRec,
                                         const SkPath& path) const {
     return false;
 }
 
 
-bool SkMaskFilter::directFilterRRectMaskGPU(GrContext* context,
+bool SkMaskFilter::directFilterRRectMaskGPU(GrTextureProvider* texProvider,
+                                            GrDrawContext* drawContext,
                                             GrPaint* grp,
+                                            const GrClip&,
+                                            const SkMatrix& viewMatrix,
                                             const SkStrokeRec& strokeRec,
                                             const SkRRect& rrect) const {
     return false;
@@ -336,8 +349,8 @@ bool SkMaskFilter::filterMaskGPU(GrTexture* src,
 void SkMaskFilter::computeFastBounds(const SkRect& src, SkRect* dst) const {
     SkMask  srcM, dstM;
 
-    srcM.fImage = NULL;
-    src.roundOut(&srcM.fBounds);
+    srcM.fImage = nullptr;
+    srcM.fBounds = src.roundOut();
     srcM.fRowBytes = 0;
     srcM.fFormat = SkMask::kA8_Format;
 
diff --git a/gfx/skia/skia/src/core/SkMaskGamma.cpp b/gfx/skia/skia/src/core/SkMaskGamma.cpp
index a305d7216288..bbe72c4e350a 100644
--- a/gfx/skia/skia/src/core/SkMaskGamma.cpp
+++ b/gfx/skia/skia/src/core/SkMaskGamma.cpp
@@ -12,27 +12,27 @@
 #include "SkMaskGamma.h"
 
 class SkLinearColorSpaceLuminance : public SkColorSpaceLuminance {
-    virtual SkScalar toLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luminance) const SK_OVERRIDE {
+    SkScalar toLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luminance) const override {
         SkASSERT(SK_Scalar1 == gamma);
         return luminance;
     }
-    virtual SkScalar fromLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luma) const SK_OVERRIDE {
+    SkScalar fromLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luma) const override {
         SkASSERT(SK_Scalar1 == gamma);
         return luma;
     }
 };
 
 class SkGammaColorSpaceLuminance : public SkColorSpaceLuminance {
-    virtual SkScalar toLuma(SkScalar gamma, SkScalar luminance) const SK_OVERRIDE {
+    SkScalar toLuma(SkScalar gamma, SkScalar luminance) const override {
         return SkScalarPow(luminance, gamma);
     }
-    virtual SkScalar fromLuma(SkScalar gamma, SkScalar luma) const SK_OVERRIDE {
+    SkScalar fromLuma(SkScalar gamma, SkScalar luma) const override {
         return SkScalarPow(luma, SkScalarInvert(gamma));
     }
 };
 
 class SkSRGBColorSpaceLuminance : public SkColorSpaceLuminance {
-    virtual SkScalar toLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luminance) const SK_OVERRIDE {
+    SkScalar toLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luminance) const override {
         SkASSERT(0 == gamma);
         //The magic numbers are derived from the sRGB specification.
         //See http://www.color.org/chardata/rgb/srgb.xalter .
@@ -42,7 +42,7 @@ class SkSRGBColorSpaceLuminance : public SkColorSpaceLuminance {
         return SkScalarPow((luminance + 0.055f) / 1.055f,
                         2.4f);
     }
-    virtual SkScalar fromLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luma) const SK_OVERRIDE {
+    SkScalar fromLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luma) const override {
         SkASSERT(0 == gamma);
         //The magic numbers are derived from the sRGB specification.
         //See http://www.color.org/chardata/rgb/srgb.xalter .
diff --git a/gfx/skia/skia/src/core/SkMaskGamma.h b/gfx/skia/skia/src/core/SkMaskGamma.h
index 08ed97f913f2..16ea47b1b015 100644
--- a/gfx/skia/skia/src/core/SkMaskGamma.h
+++ b/gfx/skia/skia/src/core/SkMaskGamma.h
@@ -92,7 +92,7 @@ void SkTMaskGamma_build_correcting_lut(uint8_t table[256], U8CPU srcI, SkScalar
  * @param B The number of luminance bits to use [1, 8] from the blue channel.
  */
 template <int R_LUM_BITS, int G_LUM_BITS, int B_LUM_BITS> class SkTMaskGamma : public SkRefCnt {
-    SK_DECLARE_INST_COUNT(SkTMaskGamma)
+    
 public:
 
     /** Creates a linear SkTMaskGamma. */
@@ -168,7 +168,7 @@ private:
  * convert a linear alpha value for a given channel to a gamma correcting alpha
  * value for that channel. This class is immutable.
  *
- * If fR, fG, or fB is NULL, all of them will be. This indicates that no mask
+ * If fR, fG, or fB is nullptr, all of them will be. This indicates that no mask
  * pre blend should be applied. SkTMaskPreBlend::isApplicable() is provided as
  * a convenience function to test for the absence of this case.
  */
@@ -182,7 +182,7 @@ private:
     friend class SkTMaskGamma<R_LUM_BITS, G_LUM_BITS, B_LUM_BITS>;
 public:
     /** Creates a non applicable SkTMaskPreBlend. */
-    SkTMaskPreBlend() : fParent(), fR(NULL), fG(NULL), fB(NULL) { }
+    SkTMaskPreBlend() : fParent(), fR(nullptr), fG(nullptr), fB(nullptr) { }
 
     /**
      * This copy contructor exists for correctness, but should never be called
@@ -193,10 +193,8 @@ public:
 
     ~SkTMaskPreBlend() { }
 
-    /** True if this PreBlend should be applied. When false, fR, fG, and fB are NULL. */
-    bool isApplicable() const {
-        return NULL != this->fG;
-    }
+    /** True if this PreBlend should be applied. When false, fR, fG, and fB are nullptr. */
+    bool isApplicable() const { return SkToBool(this->fG); }
 
     const uint8_t* fR;
     const uint8_t* fG;
diff --git a/gfx/skia/skia/src/core/SkMath.cpp b/gfx/skia/skia/src/core/SkMath.cpp
index aeacebecd454..af93d7ecb2cf 100644
--- a/gfx/skia/skia/src/core/SkMath.cpp
+++ b/gfx/skia/skia/src/core/SkMath.cpp
@@ -43,27 +43,6 @@ int SkCLZ_portable(uint32_t x) {
     return zeros;
 }
 
-SkFixed SkFixedMul_portable(SkFixed a, SkFixed b) {
-#if defined(SkLONGLONG)
-    return static_cast<SkFixed>((int64_t)a * b >> 16);
-#else
-    int sa = SkExtractSign(a);
-    int sb = SkExtractSign(b);
-    // now make them positive
-    a = SkApplySign(a, sa);
-    b = SkApplySign(b, sb);
-
-    uint32_t    ah = a >> 16;
-    uint32_t    al = a & 0xFFFF;
-    uint32_t bh = b >> 16;
-    uint32_t bl = b & 0xFFFF;
-
-    uint32_t R = ah * b + al * bh + (al * bl >> 16);
-
-    return SkApplySign(R, sa ^ sb);
-#endif
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
 #define DIVBITS_ITER(n)                                 \
@@ -174,116 +153,3 @@ float SkScalarSinCos(float radians, float* cosValue) {
     }
     return sinValue;
 }
-
-#define INTERP_SINTABLE
-#define BUILD_TABLE_AT_RUNTIMEx
-
-#define kTableSize  256
-
-#ifdef BUILD_TABLE_AT_RUNTIME
-    static uint16_t gSkSinTable[kTableSize];
-
-    static void build_sintable(uint16_t table[]) {
-        for (int i = 0; i < kTableSize; i++) {
-            double  rad = i * 3.141592653589793 / (2*kTableSize);
-            double  val = sin(rad);
-            int     ival = (int)(val * SK_Fixed1);
-            table[i] = SkToU16(ival);
-        }
-    }
-#else
-    #include "SkSinTable.h"
-#endif
-
-#define SK_Fract1024SizeOver2PI     0x28BE60    /* floatToFract(1024 / 2PI) */
-
-#ifdef INTERP_SINTABLE
-static SkFixed interp_table(const uint16_t table[], int index, int partial255) {
-    SkASSERT((unsigned)index < kTableSize);
-    SkASSERT((unsigned)partial255 <= 255);
-
-    SkFixed lower = table[index];
-    SkFixed upper = (index == kTableSize - 1) ? SK_Fixed1 : table[index + 1];
-
-    SkASSERT(lower < upper);
-    SkASSERT(lower >= 0);
-    SkASSERT(upper <= SK_Fixed1);
-
-    partial255 += (partial255 >> 7);
-    return lower + ((upper - lower) * partial255 >> 8);
-}
-#endif
-
-SkFixed SkFixedSinCos(SkFixed radians, SkFixed* cosValuePtr) {
-    SkASSERT(SK_ARRAY_COUNT(gSkSinTable) == kTableSize);
-
-#ifdef BUILD_TABLE_AT_RUNTIME
-    static bool gFirstTime = true;
-    if (gFirstTime) {
-        build_sintable(gSinTable);
-        gFirstTime = false;
-    }
-#endif
-
-    // make radians positive
-    SkFixed sinValue, cosValue;
-    int32_t cosSign = 0;
-    int32_t sinSign = SkExtractSign(radians);
-    radians = SkApplySign(radians, sinSign);
-    // scale it to 0...1023 ...
-
-#ifdef INTERP_SINTABLE
-    radians = SkMulDiv(radians, 2 * kTableSize * 256, SK_FixedPI);
-    int findex = radians & (kTableSize * 256 - 1);
-    int index = findex >> 8;
-    int partial = findex & 255;
-    sinValue = interp_table(gSkSinTable, index, partial);
-
-    findex = kTableSize * 256 - findex - 1;
-    index = findex >> 8;
-    partial = findex & 255;
-    cosValue = interp_table(gSkSinTable, index, partial);
-
-    int quad = ((unsigned)radians / (kTableSize * 256)) & 3;
-#else
-    radians = SkMulDiv(radians, 2 * kTableSize, SK_FixedPI);
-    int     index = radians & (kTableSize - 1);
-
-    if (index == 0) {
-        sinValue = 0;
-        cosValue = SK_Fixed1;
-    } else {
-        sinValue = gSkSinTable[index];
-        cosValue = gSkSinTable[kTableSize - index];
-    }
-    int quad = ((unsigned)radians / kTableSize) & 3;
-#endif
-
-    if (quad & 1) {
-        SkTSwap<SkFixed>(sinValue, cosValue);
-    }
-    if (quad & 2) {
-        sinSign = ~sinSign;
-    }
-    if (((quad - 1) & 2) == 0) {
-        cosSign = ~cosSign;
-    }
-
-    // restore the sign for negative angles
-    sinValue = SkApplySign(sinValue, sinSign);
-    cosValue = SkApplySign(cosValue, cosSign);
-
-#ifdef SK_DEBUG
-    if (1) {
-        SkFixed sin2 = SkFixedMul(sinValue, sinValue);
-        SkFixed cos2 = SkFixedMul(cosValue, cosValue);
-        int diff = cos2 + sin2 - SK_Fixed1;
-        SkASSERT(SkAbs32(diff) <= 7);
-    }
-#endif
-
-    if (cosValuePtr) {
-        *cosValuePtr = cosValue;
-    }
-    return sinValue;
-}
diff --git a/gfx/skia/skia/src/core/SkMathPriv.h b/gfx/skia/skia/src/core/SkMathPriv.h
index e997045ea853..b9184a072693 100644
--- a/gfx/skia/skia/src/core/SkMathPriv.h
+++ b/gfx/skia/skia/src/core/SkMathPriv.h
@@ -10,10 +10,14 @@
 
 #include "SkMath.h"
 
-#ifdef SK_BUILD_FOR_IOS
-// The iOS ARM processor discards small denormalized numbers to go faster.
+#if defined(SK_BUILD_FOR_IOS) && (defined(SK_BUILD_FOR_ARM32) || defined(SK_BUILD_FOR_ARM64))
+// iOS on ARM starts processes with the Flush-To-Zero (FTZ) and
+// Denormals-Are-Zero (DAZ) bits in the fpscr register set.
 // Algorithms that rely on denormalized numbers need alternative implementations.
-#define SK_DISCARD_DENORMALIZED_FOR_SPEED
+// This can also be controlled in SSE with the MXCSR register,
+// x87 with FSTCW/FLDCW, and mips with FCSR. This should be detected at runtime,
+// or the library built one way or the other more generally (by the build).
+#define SK_CPU_FLUSH_TO_ZERO
 #endif
 
 /** Returns -1 if n < 0, else returns 0
@@ -53,7 +57,7 @@ static inline unsigned SkClampUMax(unsigned value, unsigned max) {
 static inline U8CPU SkMulDiv255Trunc(U8CPU a, U8CPU b) {
     SkASSERT((uint8_t)a == a);
     SkASSERT((uint8_t)b == b);
-    unsigned prod = SkMulS16(a, b) + 1;
+    unsigned prod = a*b + 1;
     return (prod + (prod >> 8)) >> 8;
 }
 
@@ -63,7 +67,7 @@ static inline U8CPU SkMulDiv255Trunc(U8CPU a, U8CPU b) {
 static inline U8CPU SkMulDiv255Ceiling(U8CPU a, U8CPU b) {
     SkASSERT((uint8_t)a == a);
     SkASSERT((uint8_t)b == b);
-    unsigned prod = SkMulS16(a, b) + 255;
+    unsigned prod = a*b + 255;
     return (prod + (prod >> 8)) >> 8;
 }
 
diff --git a/gfx/skia/skia/src/core/SkMatrix.cpp b/gfx/skia/skia/src/core/SkMatrix.cpp
index 35292ef4498b..b32f372bbdce 100644
--- a/gfx/skia/skia/src/core/SkMatrix.cpp
+++ b/gfx/skia/skia/src/core/SkMatrix.cpp
@@ -7,10 +7,36 @@
 
 #include "SkMatrix.h"
 #include "SkFloatBits.h"
+#include "SkRSXform.h"
 #include "SkString.h"
+#include "SkNx.h"
+#include "SkOpts.h"
 
 #include <stddef.h>
 
+static void normalize_perspective(SkScalar mat[9]) {
+    // If it was interesting to never store the last element, we could divide all 8 other
+    // elements here by the 9th, making it 1.0...
+    //
+    // When SkScalar was SkFixed, we would sometimes rescale the entire matrix to keep its
+    // component values from getting too large. This is not a concern when using floats/doubles,
+    // so we do nothing now.
+
+    // Disable this for now, but it could be enabled.
+#if 0
+    if (0 == mat[SkMatrix::kMPersp0] && 0 == mat[SkMatrix::kMPersp1]) {
+        SkScalar p2 = mat[SkMatrix::kMPersp2];
+        if (p2 != 0 && p2 != 1) {
+            double inv = 1.0 / p2;
+            for (int i = 0; i < 6; ++i) {
+                mat[i] = SkDoubleToScalar(mat[i] * inv);
+            }
+            mat[SkMatrix::kMPersp2] = 1;
+        }
+    }
+#endif
+}
+
 // In a few places, we performed the following
 //      a * b + c * d + e
 // as
@@ -40,10 +66,28 @@ void SkMatrix::reset() {
     fMat[kMSkewX]  = fMat[kMSkewY] =
     fMat[kMTransX] = fMat[kMTransY] =
     fMat[kMPersp0] = fMat[kMPersp1] = 0;
-
     this->setTypeMask(kIdentity_Mask | kRectStaysRect_Mask);
 }
 
+void SkMatrix::set9(const SkScalar buffer[]) {
+    memcpy(fMat, buffer, 9 * sizeof(SkScalar));
+    normalize_perspective(fMat);
+    this->setTypeMask(kUnknown_Mask);
+}
+
+void SkMatrix::setAffine(const SkScalar buffer[]) {
+    fMat[kMScaleX] = buffer[kAScaleX];
+    fMat[kMSkewX]  = buffer[kASkewX];
+    fMat[kMTransX] = buffer[kATransX];
+    fMat[kMSkewY]  = buffer[kASkewY];
+    fMat[kMScaleY] = buffer[kAScaleY];
+    fMat[kMTransY] = buffer[kATransY];
+    fMat[kMPersp0] = 0;
+    fMat[kMPersp1] = 0;
+    fMat[kMPersp2] = 1;
+    this->setTypeMask(kUnknown_Mask);
+}
+
 // this guy aligns with the masks, so we can compute a mask from a varaible 0/1
 enum {
     kTranslate_Shift,
@@ -176,20 +220,16 @@ bool SkMatrix::isSimilarity(SkScalar tol) const {
         return false;
     }
 
-    // it has scales and skews, but it could also be rotation, check it out.
-    SkVector vec[2];
-    vec[0].set(mx, sx);
-    vec[1].set(sy, my);
-
-    return SkScalarNearlyZero(vec[0].dot(vec[1]), SkScalarSquare(tol)) &&
-           SkScalarNearlyEqual(vec[0].lengthSqd(), vec[1].lengthSqd(),
-                               SkScalarSquare(tol));
+    // upper 2x2 is rotation/reflection + uniform scale if basis vectors
+    // are 90 degree rotations of each other
+    return (SkScalarNearlyEqual(mx, my, tol) && SkScalarNearlyEqual(sx, -sy, tol))
+        || (SkScalarNearlyEqual(mx, -my, tol) && SkScalarNearlyEqual(sx, sy, tol));
 }
 
 bool SkMatrix::preservesRightAngles(SkScalar tol) const {
     TypeMask mask = this->getType();
 
-    if (mask <= (SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask)) {
+    if (mask <= kTranslate_Mask) {
         // identity, translate and/or scale
         return true;
     }
@@ -197,7 +237,7 @@ bool SkMatrix::preservesRightAngles(SkScalar tol) const {
         return false;
     }
 
-    SkASSERT(mask & kAffine_Mask);
+    SkASSERT(mask & (kAffine_Mask | kScale_Mask));
 
     SkScalar mx = fMat[kMScaleX];
     SkScalar my = fMat[kMScaleY];
@@ -208,14 +248,12 @@ bool SkMatrix::preservesRightAngles(SkScalar tol) const {
         return false;
     }
 
-    // it has scales and skews, but it could also be rotation, check it out.
+    // upper 2x2 is scale + rotation/reflection if basis vectors are orthogonal
     SkVector vec[2];
-    vec[0].set(mx, sx);
-    vec[1].set(sy, my);
+    vec[0].set(mx, sy);
+    vec[1].set(sx, my);
 
-    return SkScalarNearlyZero(vec[0].dot(vec[1]), SkScalarSquare(tol)) &&
-           SkScalarNearlyEqual(vec[0].lengthSqd(), vec[1].lengthSqd(),
-                               SkScalarSquare(tol));
+    return SkScalarNearlyZero(vec[0].dot(vec[1]), SkScalarSquare(tol));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -286,16 +324,7 @@ void SkMatrix::setScale(SkScalar sx, SkScalar sy, SkScalar px, SkScalar py) {
     if (1 == sx && 1 == sy) {
         this->reset();
     } else {
-        fMat[kMScaleX] = sx;
-        fMat[kMScaleY] = sy;
-        fMat[kMTransX] = px - sx * px;
-        fMat[kMTransY] = py - sy * py;
-        fMat[kMPersp2] = 1;
-
-        fMat[kMSkewX]  = fMat[kMSkewY] =
-        fMat[kMPersp0] = fMat[kMPersp1] = 0;
-
-        this->setTypeMask(kScale_Mask | kTranslate_Mask | kRectStaysRect_Mask);
+        this->setScaleTranslate(sx, sy, px - sx * px, py - sy * py);
     }
 }
 
@@ -396,8 +425,7 @@ bool SkMatrix::postIDiv(int divx, int divy) {
 
 ////////////////////////////////////////////////////////////////////////////////////
 
-void SkMatrix::setSinCos(SkScalar sinV, SkScalar cosV,
-                         SkScalar px, SkScalar py) {
+void SkMatrix::setSinCos(SkScalar sinV, SkScalar cosV, SkScalar px, SkScalar py) {
     const SkScalar oneMinusCosV = 1 - cosV;
 
     fMat[kMScaleX]  = cosV;
@@ -414,6 +442,22 @@ void SkMatrix::setSinCos(SkScalar sinV, SkScalar cosV,
     this->setTypeMask(kUnknown_Mask | kOnlyPerspectiveValid_Mask);
 }
 
+SkMatrix& SkMatrix::setRSXform(const SkRSXform& xform) {
+    fMat[kMScaleX]  = xform.fSCos;
+    fMat[kMSkewX]   = -xform.fSSin;
+    fMat[kMTransX]  = xform.fTx;
+
+    fMat[kMSkewY]   = xform.fSSin;
+    fMat[kMScaleY]  = xform.fSCos;
+    fMat[kMTransY]  = xform.fTy;
+
+    fMat[kMPersp0] = fMat[kMPersp1] = 0;
+    fMat[kMPersp2] = 1;
+
+    this->setTypeMask(kUnknown_Mask | kOnlyPerspectiveValid_Mask);
+    return *this;
+}
+
 void SkMatrix::setSinCos(SkScalar sinV, SkScalar cosV) {
     fMat[kMScaleX]  = cosV;
     fMat[kMSkewX]   = -sinV;
@@ -523,9 +567,7 @@ void SkMatrix::postSkew(SkScalar sx, SkScalar sy) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-bool SkMatrix::setRectToRect(const SkRect& src, const SkRect& dst,
-                             ScaleToFit align)
-{
+bool SkMatrix::setRectToRect(const SkRect& src, const SkRect& dst, ScaleToFit align) {
     if (src.isEmpty()) {
         this->reset();
         return false;
@@ -533,6 +575,7 @@ bool SkMatrix::setRectToRect(const SkRect& src, const SkRect& dst,
 
     if (dst.isEmpty()) {
         sk_bzero(fMat, 8 * sizeof(SkScalar));
+        fMat[kMPersp2] = 1;
         this->setTypeMask(kScale_Mask | kRectStaysRect_Mask);
     } else {
         SkScalar    tx, sx = dst.width() / src.width();
@@ -570,24 +613,8 @@ bool SkMatrix::setRectToRect(const SkRect& src, const SkRect& dst,
             }
         }
 
-        fMat[kMScaleX] = sx;
-        fMat[kMScaleY] = sy;
-        fMat[kMTransX] = tx;
-        fMat[kMTransY] = ty;
-        fMat[kMSkewX]  = fMat[kMSkewY] =
-        fMat[kMPersp0] = fMat[kMPersp1] = 0;
-
-        unsigned mask = kRectStaysRect_Mask;
-        if (sx != 1 || sy != 1) {
-            mask |= kScale_Mask;
-        }
-        if (tx || ty) {
-            mask |= kTranslate_Mask;
-        }
-        this->setTypeMask(mask);
+        this->setScaleTranslate(sx, sy, tx, ty);
     }
-    // shared cleanup
-    fMat[kMPersp2] = 1;
     return true;
 }
 
@@ -601,21 +628,23 @@ static inline float rowcol3(const float row[], const float col[]) {
     return row[0] * col[0] + row[1] * col[3] + row[2] * col[6];
 }
 
-static void normalize_perspective(SkScalar mat[9]) {
-    if (SkScalarAbs(mat[SkMatrix::kMPersp2]) > 1) {
-        for (int i = 0; i < 9; i++)
-            mat[i] = SkScalarHalf(mat[i]);
-    }
+static bool only_scale_and_translate(unsigned mask) {
+    return 0 == (mask & (SkMatrix::kAffine_Mask | SkMatrix::kPerspective_Mask));
 }
 
 void SkMatrix::setConcat(const SkMatrix& a, const SkMatrix& b) {
-    TypeMask aType = a.getPerspectiveTypeMaskOnly();
-    TypeMask bType = b.getPerspectiveTypeMaskOnly();
+    TypeMask aType = a.getType();
+    TypeMask bType = b.getType();
 
     if (a.isTriviallyIdentity()) {
         *this = b;
     } else if (b.isTriviallyIdentity()) {
         *this = a;
+    } else if (only_scale_and_translate(aType | bType)) {
+        this->setScaleTranslate(a.fMat[kMScaleX] * b.fMat[kMScaleX],
+                                a.fMat[kMScaleY] * b.fMat[kMScaleY],
+                                a.fMat[kMScaleX] * b.fMat[kMTransX] + a.fMat[kMTransX],
+                                a.fMat[kMScaleY] * b.fMat[kMTransY] + a.fMat[kMTransY]);
     } else {
         SkMatrix tmp;
 
@@ -632,7 +661,7 @@ void SkMatrix::setConcat(const SkMatrix& a, const SkMatrix& b) {
 
             normalize_perspective(tmp.fMat);
             tmp.setTypeMask(kUnknown_Mask);
-        } else {    // not perspective
+        } else {
             tmp.fMat[kMScaleX] = muladdmul(a.fMat[kMScaleX],
                                            b.fMat[kMScaleX],
                                            a.fMat[kMSkewX],
@@ -646,9 +675,7 @@ void SkMatrix::setConcat(const SkMatrix& a, const SkMatrix& b) {
             tmp.fMat[kMTransX] = muladdmul(a.fMat[kMScaleX],
                                            b.fMat[kMTransX],
                                            a.fMat[kMSkewX],
-                                           b.fMat[kMTransY]);
-
-            tmp.fMat[kMTransX] += a.fMat[kMTransX];
+                                           b.fMat[kMTransY]) + a.fMat[kMTransX];
 
             tmp.fMat[kMSkewY]  = muladdmul(a.fMat[kMSkewY],
                                            b.fMat[kMScaleX],
@@ -663,10 +690,10 @@ void SkMatrix::setConcat(const SkMatrix& a, const SkMatrix& b) {
             tmp.fMat[kMTransY] = muladdmul(a.fMat[kMSkewY],
                                            b.fMat[kMTransX],
                                            a.fMat[kMScaleY],
-                                           b.fMat[kMTransY]);
+                                           b.fMat[kMTransY]) + a.fMat[kMTransY];
 
-            tmp.fMat[kMTransY] += a.fMat[kMTransY];
-            tmp.fMat[kMPersp0] = tmp.fMat[kMPersp1] = 0;
+            tmp.fMat[kMPersp0] = 0;
+            tmp.fMat[kMPersp1] = 0;
             tmp.fMat[kMPersp2] = 1;
             //SkDebugf("Concat mat non-persp type: %d\n", tmp.getType());
             //SkASSERT(!(tmp.getType() & kPerspective_Mask));
@@ -767,6 +794,37 @@ bool SkMatrix::asAffine(SkScalar affine[6]) const {
     return true;
 }
 
+void SkMatrix::ComputeInv(SkScalar dst[9], const SkScalar src[9], double invDet, bool isPersp) {
+    SkASSERT(src != dst);
+    SkASSERT(src && dst);
+
+    if (isPersp) {
+        dst[kMScaleX] = scross_dscale(src[kMScaleY], src[kMPersp2], src[kMTransY], src[kMPersp1], invDet);
+        dst[kMSkewX]  = scross_dscale(src[kMTransX], src[kMPersp1], src[kMSkewX],  src[kMPersp2], invDet);
+        dst[kMTransX] = scross_dscale(src[kMSkewX],  src[kMTransY], src[kMTransX], src[kMScaleY], invDet);
+
+        dst[kMSkewY]  = scross_dscale(src[kMTransY], src[kMPersp0], src[kMSkewY],  src[kMPersp2], invDet);
+        dst[kMScaleY] = scross_dscale(src[kMScaleX], src[kMPersp2], src[kMTransX], src[kMPersp0], invDet);
+        dst[kMTransY] = scross_dscale(src[kMTransX], src[kMSkewY],  src[kMScaleX], src[kMTransY], invDet);
+
+        dst[kMPersp0] = scross_dscale(src[kMSkewY],  src[kMPersp1], src[kMScaleY], src[kMPersp0], invDet);
+        dst[kMPersp1] = scross_dscale(src[kMSkewX],  src[kMPersp0], src[kMScaleX], src[kMPersp1], invDet);
+        dst[kMPersp2] = scross_dscale(src[kMScaleX], src[kMScaleY], src[kMSkewX],  src[kMSkewY],  invDet);
+    } else {   // not perspective
+        dst[kMScaleX] = SkDoubleToScalar(src[kMScaleY] * invDet);
+        dst[kMSkewX]  = SkDoubleToScalar(-src[kMSkewX] * invDet);
+        dst[kMTransX] = dcross_dscale(src[kMSkewX], src[kMTransY], src[kMScaleY], src[kMTransX], invDet);
+
+        dst[kMSkewY]  = SkDoubleToScalar(-src[kMSkewY] * invDet);
+        dst[kMScaleY] = SkDoubleToScalar(src[kMScaleX] * invDet);
+        dst[kMTransY] = dcross_dscale(src[kMSkewY], src[kMTransX], src[kMScaleX], src[kMTransY], invDet);
+
+        dst[kMPersp0] = 0;
+        dst[kMPersp1] = 0;
+        dst[kMPersp2] = 1;
+    }
+}
+
 bool SkMatrix::invertNonIdentity(SkMatrix* inv) const {
     SkASSERT(!this->isIdentity());
 
@@ -801,7 +859,7 @@ bool SkMatrix::invertNonIdentity(SkMatrix* inv) const {
                 // translate only
                 inv->setTranslate(-fMat[kMTransX], -fMat[kMTransY]);
             }
-        } else {    // inv is NULL, just check if we're invertible
+        } else {    // inv is nullptr, just check if we're invertible
             if (!fMat[kMScaleX] || !fMat[kMScaleY]) {
                 invertible = false;
             }
@@ -810,158 +868,51 @@ bool SkMatrix::invertNonIdentity(SkMatrix* inv) const {
     }
 
     int    isPersp = mask & kPerspective_Mask;
-    double scale = sk_inv_determinant(fMat, isPersp);
+    double invDet = sk_inv_determinant(fMat, isPersp);
 
-    if (scale == 0) { // underflow
+    if (invDet == 0) { // underflow
         return false;
     }
 
-    if (inv) {
-        SkMatrix tmp;
-        if (inv == this) {
-            inv = &tmp;
-        }
+    bool applyingInPlace = (inv == this);
 
-        if (isPersp) {
-            inv->fMat[kMScaleX] = scross_dscale(fMat[kMScaleY], fMat[kMPersp2], fMat[kMTransY], fMat[kMPersp1], scale);
-            inv->fMat[kMSkewX]  = scross_dscale(fMat[kMTransX], fMat[kMPersp1], fMat[kMSkewX],  fMat[kMPersp2], scale);
-            inv->fMat[kMTransX] = scross_dscale(fMat[kMSkewX],  fMat[kMTransY], fMat[kMTransX], fMat[kMScaleY], scale);
+    SkMatrix* tmp = inv;
 
-            inv->fMat[kMSkewY]  = scross_dscale(fMat[kMTransY], fMat[kMPersp0], fMat[kMSkewY],  fMat[kMPersp2], scale);
-            inv->fMat[kMScaleY] = scross_dscale(fMat[kMScaleX], fMat[kMPersp2], fMat[kMTransX], fMat[kMPersp0], scale);
-            inv->fMat[kMTransY] = scross_dscale(fMat[kMTransX], fMat[kMSkewY],  fMat[kMScaleX], fMat[kMTransY], scale);
-
-            inv->fMat[kMPersp0] = scross_dscale(fMat[kMSkewY],  fMat[kMPersp1], fMat[kMScaleY], fMat[kMPersp0], scale);
-            inv->fMat[kMPersp1] = scross_dscale(fMat[kMSkewX],  fMat[kMPersp0], fMat[kMScaleX], fMat[kMPersp1], scale);
-            inv->fMat[kMPersp2] = scross_dscale(fMat[kMScaleX], fMat[kMScaleY], fMat[kMSkewX],  fMat[kMSkewY],  scale);
-        } else {   // not perspective
-            inv->fMat[kMScaleX] = SkDoubleToScalar(fMat[kMScaleY] * scale);
-            inv->fMat[kMSkewX]  = SkDoubleToScalar(-fMat[kMSkewX] * scale);
-            inv->fMat[kMTransX] = dcross_dscale(fMat[kMSkewX], fMat[kMTransY], fMat[kMScaleY], fMat[kMTransX], scale);
-
-            inv->fMat[kMSkewY]  = SkDoubleToScalar(-fMat[kMSkewY] * scale);
-            inv->fMat[kMScaleY] = SkDoubleToScalar(fMat[kMScaleX] * scale);
-            inv->fMat[kMTransY] = dcross_dscale(fMat[kMSkewY], fMat[kMTransX], fMat[kMScaleX], fMat[kMTransY], scale);
-
-            inv->fMat[kMPersp0] = 0;
-            inv->fMat[kMPersp1] = 0;
-            inv->fMat[kMPersp2] = 1;
-        }
-
-        inv->setTypeMask(fTypeMask);
-
-        if (inv == &tmp) {
-            *(SkMatrix*)this = tmp;
-        }
+    SkMatrix storage;
+    if (applyingInPlace || nullptr == tmp) {
+        tmp = &storage;     // we either need to avoid trampling memory or have no memory
     }
+
+    ComputeInv(tmp->fMat, fMat, invDet, isPersp);
+    if (!tmp->isFinite()) {
+        return false;
+    }
+
+    tmp->setTypeMask(fTypeMask);
+
+    if (applyingInPlace) {
+        *inv = storage; // need to copy answer back
+    }
+
     return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void SkMatrix::Identity_pts(const SkMatrix& m, SkPoint dst[],
-                            const SkPoint src[], int count) {
+void SkMatrix::Identity_pts(const SkMatrix& m, SkPoint dst[], const SkPoint src[], int count) {
     SkASSERT(m.getType() == 0);
 
-    if (dst != src && count > 0)
+    if (dst != src && count > 0) {
         memcpy(dst, src, count * sizeof(SkPoint));
-}
-
-void SkMatrix::Trans_pts(const SkMatrix& m, SkPoint dst[],
-                         const SkPoint src[], int count) {
-    SkASSERT(m.getType() == kTranslate_Mask);
-
-    if (count > 0) {
-        SkScalar tx = m.fMat[kMTransX];
-        SkScalar ty = m.fMat[kMTransY];
-        do {
-            dst->fY = src->fY + ty;
-            dst->fX = src->fX + tx;
-            src += 1;
-            dst += 1;
-        } while (--count);
     }
 }
 
-void SkMatrix::Scale_pts(const SkMatrix& m, SkPoint dst[],
-                         const SkPoint src[], int count) {
-    SkASSERT(m.getType() == kScale_Mask);
-
-    if (count > 0) {
-        SkScalar mx = m.fMat[kMScaleX];
-        SkScalar my = m.fMat[kMScaleY];
-        do {
-            dst->fY = src->fY * my;
-            dst->fX = src->fX * mx;
-            src += 1;
-            dst += 1;
-        } while (--count);
-    }
+void SkMatrix::Trans_pts(const SkMatrix& m, SkPoint dst[], const SkPoint src[], int count) {
+    return SkOpts::matrix_translate(m,dst,src,count);
 }
 
-void SkMatrix::ScaleTrans_pts(const SkMatrix& m, SkPoint dst[],
-                              const SkPoint src[], int count) {
-    SkASSERT(m.getType() == (kScale_Mask | kTranslate_Mask));
-
-    if (count > 0) {
-        SkScalar mx = m.fMat[kMScaleX];
-        SkScalar my = m.fMat[kMScaleY];
-        SkScalar tx = m.fMat[kMTransX];
-        SkScalar ty = m.fMat[kMTransY];
-        do {
-            dst->fY = src->fY * my + ty;
-            dst->fX = src->fX * mx + tx;
-            src += 1;
-            dst += 1;
-        } while (--count);
-    }
-}
-
-void SkMatrix::Rot_pts(const SkMatrix& m, SkPoint dst[],
-                       const SkPoint src[], int count) {
-    SkASSERT((m.getType() & (kPerspective_Mask | kTranslate_Mask)) == 0);
-
-    if (count > 0) {
-        SkScalar mx = m.fMat[kMScaleX];
-        SkScalar my = m.fMat[kMScaleY];
-        SkScalar kx = m.fMat[kMSkewX];
-        SkScalar ky = m.fMat[kMSkewY];
-        do {
-            SkScalar sy = src->fY;
-            SkScalar sx = src->fX;
-            src += 1;
-            dst->fY = sdot(sx, ky, sy, my);
-            dst->fX = sdot(sx, mx, sy, kx);
-            dst += 1;
-        } while (--count);
-    }
-}
-
-void SkMatrix::RotTrans_pts(const SkMatrix& m, SkPoint dst[],
-                            const SkPoint src[], int count) {
-    SkASSERT(!m.hasPerspective());
-
-    if (count > 0) {
-        SkScalar mx = m.fMat[kMScaleX];
-        SkScalar my = m.fMat[kMScaleY];
-        SkScalar kx = m.fMat[kMSkewX];
-        SkScalar ky = m.fMat[kMSkewY];
-        SkScalar tx = m.fMat[kMTransX];
-        SkScalar ty = m.fMat[kMTransY];
-        do {
-            SkScalar sy = src->fY;
-            SkScalar sx = src->fX;
-            src += 1;
-#ifdef SK_LEGACY_MATRIX_MATH_ORDER
-            dst->fY = sx * ky + (sy * my + ty);
-            dst->fX = sx * mx + (sy * kx + tx);
-#else
-            dst->fY = sdot(sx, ky, sy, my) + ty;
-            dst->fX = sdot(sx, mx, sy, kx) + tx;
-#endif
-            dst += 1;
-        } while (--count);
-    }
+void SkMatrix::Scale_pts(const SkMatrix& m, SkPoint dst[], const SkPoint src[], int count) {
+    return SkOpts::matrix_scale_translate(m,dst,src,count);
 }
 
 void SkMatrix::Persp_pts(const SkMatrix& m, SkPoint dst[],
@@ -992,11 +943,15 @@ void SkMatrix::Persp_pts(const SkMatrix& m, SkPoint dst[],
     }
 }
 
+void SkMatrix::Affine_vpts(const SkMatrix& m, SkPoint dst[], const SkPoint src[], int count) {
+    return SkOpts::matrix_affine(m,dst,src,count);
+}
+
 const SkMatrix::MapPtsProc SkMatrix::gMapPtsProcs[] = {
     SkMatrix::Identity_pts, SkMatrix::Trans_pts,
-    SkMatrix::Scale_pts,    SkMatrix::ScaleTrans_pts,
-    SkMatrix::Rot_pts,      SkMatrix::RotTrans_pts,
-    SkMatrix::Rot_pts,      SkMatrix::RotTrans_pts,
+    SkMatrix::Scale_pts,   SkMatrix::Scale_pts,
+    SkMatrix::Affine_vpts,  SkMatrix::Affine_vpts,
+    SkMatrix::Affine_vpts,  SkMatrix::Affine_vpts,
     // repeat the persp proc 8 times
     SkMatrix::Persp_pts,    SkMatrix::Persp_pts,
     SkMatrix::Persp_pts,    SkMatrix::Persp_pts,
@@ -1004,20 +959,12 @@ const SkMatrix::MapPtsProc SkMatrix::gMapPtsProcs[] = {
     SkMatrix::Persp_pts,    SkMatrix::Persp_pts
 };
 
-void SkMatrix::mapPoints(SkPoint dst[], const SkPoint src[], int count) const {
-    SkASSERT((dst && src && count > 0) || 0 == count);
-    // no partial overlap
-    SkASSERT(src == dst || &dst[count] <= &src[0] || &src[count] <= &dst[0]);
-
-    this->getMapPtsProc()(*this, dst, src, count);
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkMatrix::mapHomogeneousPoints(SkScalar dst[], const SkScalar src[], int count) const {
     SkASSERT((dst && src && count > 0) || 0 == count);
     // no partial overlap
-    SkASSERT(src == dst || SkAbs32((int32_t)(src - dst)) >= 3*count);
+    SkASSERT(src == dst || &dst[3*count] <= &src[0] || &src[3*count] <= &dst[0]);
 
     if (count > 0) {
         if (this->isIdentity()) {
@@ -1561,33 +1508,34 @@ bool SkMatrix::getMinMaxScales(SkScalar scaleFactors[2]) const {
 
 namespace {
 
-struct PODMatrix {
+// SkMatrix is C++11 POD (trivial and standard-layout), but not aggregate (it has private fields).
+struct AggregateMatrix {
     SkScalar matrix[9];
     uint32_t typemask;
 
     const SkMatrix& asSkMatrix() const { return *reinterpret_cast<const SkMatrix*>(this); }
 };
-SK_COMPILE_ASSERT(sizeof(PODMatrix) == sizeof(SkMatrix), PODMatrixSizeMismatch);
+static_assert(sizeof(AggregateMatrix) == sizeof(SkMatrix), "AggregateMatrix size mismatch.");
 
 }  // namespace
 
 const SkMatrix& SkMatrix::I() {
-    SK_COMPILE_ASSERT(offsetof(SkMatrix, fMat)      == offsetof(PODMatrix, matrix),   BadfMat);
-    SK_COMPILE_ASSERT(offsetof(SkMatrix, fTypeMask) == offsetof(PODMatrix, typemask), BadfTypeMask);
+    static_assert(offsetof(SkMatrix,fMat)      == offsetof(AggregateMatrix,matrix),   "fMat");
+    static_assert(offsetof(SkMatrix,fTypeMask) == offsetof(AggregateMatrix,typemask), "fTypeMask");
 
-    static const PODMatrix identity = { {SK_Scalar1, 0, 0,
-                                         0, SK_Scalar1, 0,
-                                         0, 0, SK_Scalar1 },
-                                       kIdentity_Mask | kRectStaysRect_Mask};
+    static const AggregateMatrix identity = { {SK_Scalar1, 0, 0,
+                                               0, SK_Scalar1, 0,
+                                               0, 0, SK_Scalar1 },
+                                             kIdentity_Mask | kRectStaysRect_Mask};
     SkASSERT(identity.asSkMatrix().isIdentity());
     return identity.asSkMatrix();
 }
 
 const SkMatrix& SkMatrix::InvalidMatrix() {
-    SK_COMPILE_ASSERT(offsetof(SkMatrix, fMat)      == offsetof(PODMatrix, matrix),   BadfMat);
-    SK_COMPILE_ASSERT(offsetof(SkMatrix, fTypeMask) == offsetof(PODMatrix, typemask), BadfTypeMask);
+    static_assert(offsetof(SkMatrix,fMat)      == offsetof(AggregateMatrix,matrix),   "fMat");
+    static_assert(offsetof(SkMatrix,fTypeMask) == offsetof(AggregateMatrix,typemask), "fTypeMask");
 
-    static const PODMatrix invalid =
+    static const AggregateMatrix invalid =
         { {SK_ScalarMax, SK_ScalarMax, SK_ScalarMax,
            SK_ScalarMax, SK_ScalarMax, SK_ScalarMax,
            SK_ScalarMax, SK_ScalarMax, SK_ScalarMax },
@@ -1595,6 +1543,28 @@ const SkMatrix& SkMatrix::InvalidMatrix() {
     return invalid.asSkMatrix();
 }
 
+bool SkMatrix::decomposeScale(SkSize* scale, SkMatrix* remaining) const {
+    if (this->hasPerspective()) {
+        return false;
+    }
+
+    const SkScalar sx = SkVector::Length(this->getScaleX(), this->getSkewY());
+    const SkScalar sy = SkVector::Length(this->getSkewX(), this->getScaleY());
+    if (!SkScalarIsFinite(sx) || !SkScalarIsFinite(sy) ||
+        SkScalarNearlyZero(sx) || SkScalarNearlyZero(sy)) {
+        return false;
+    }
+
+    if (scale) {
+        scale->set(sx, sy);
+    }
+    if (remaining) {
+        *remaining = *this;
+        remaining->postScale(SkScalarInvert(sx), SkScalarInvert(sy));
+    }
+    return true;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 size_t SkMatrix::writeToMemory(void* buffer) const {
@@ -1618,21 +1588,17 @@ size_t SkMatrix::readFromMemory(const void* buffer, size_t length) {
     return sizeInMemory;
 }
 
-#ifdef SK_DEVELOPER
 void SkMatrix::dump() const {
     SkString str;
     this->toString(&str);
     SkDebugf("%s\n", str.c_str());
 }
-#endif
 
-#ifndef SK_IGNORE_TO_STRING
 void SkMatrix::toString(SkString* str) const {
     str->appendf("[%8.4f %8.4f %8.4f][%8.4f %8.4f %8.4f][%8.4f %8.4f %8.4f]",
              fMat[0], fMat[1], fMat[2], fMat[3], fMat[4], fMat[5],
              fMat[6], fMat[7], fMat[8]);
 }
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -1772,18 +1738,45 @@ bool SkDecomposeUpper2x2(const SkMatrix& matrix,
         sin1 = -sin1;
     }
 
-    if (NULL != scale) {
+    if (scale) {
         scale->fX = SkDoubleToScalar(w1);
         scale->fY = SkDoubleToScalar(w2);
     }
-    if (NULL != rotation1) {
+    if (rotation1) {
         rotation1->fX = cos1;
         rotation1->fY = sin1;
     }
-    if (NULL != rotation2) {
+    if (rotation2) {
         rotation2->fX = cos2;
         rotation2->fY = sin2;
     }
 
     return true;
 }
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+
+void SkRSXform::toQuad(SkScalar width, SkScalar height, SkPoint quad[4]) const {
+#if 0
+    // This is the slow way, but it documents what we're doing
+    quad[0].set(0, 0);
+    quad[1].set(width, 0);
+    quad[2].set(width, height);
+    quad[3].set(0, height);
+    SkMatrix m;
+    m.setRSXform(*this).mapPoints(quad, quad, 4);
+#else
+    const SkScalar m00 = fSCos;
+    const SkScalar m01 = -fSSin;
+    const SkScalar m02 = fTx;
+    const SkScalar m10 = -m01;
+    const SkScalar m11 = m00;
+    const SkScalar m12 = fTy;
+
+    quad[0].set(m02, m12);
+    quad[1].set(m00 * width + m02, m10 * width + m12);
+    quad[2].set(m00 * width + m01 * height + m02, m10 * width + m11 * height + m12);
+    quad[3].set(m01 * height + m02, m11 * height + m12);
+#endif
+}
+
diff --git a/gfx/skia/skia/src/core/SkMatrixClipStateMgr.cpp b/gfx/skia/skia/src/core/SkMatrixClipStateMgr.cpp
deleted file mode 100644
index 680cc364d25b..000000000000
--- a/gfx/skia/skia/src/core/SkMatrixClipStateMgr.cpp
+++ /dev/null
@@ -1,419 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkMatrixClipStateMgr.h"
-#include "SkPictureRecord.h"
-
-bool SkMatrixClipStateMgr::MatrixClipState::ClipInfo::clipPath(SkPictureRecord* picRecord,
-                                                               const SkPath& path,
-                                                               SkRegion::Op op,
-                                                               bool doAA,
-                                                               int matrixID) {
-    int pathID = picRecord->addPathToHeap(path);
-
-    ClipOp* newClip = fClips.append();
-    newClip->fClipType = kPath_ClipType;
-    newClip->fGeom.fPathID = pathID;
-    newClip->fOp = op;
-    newClip->fDoAA = doAA;
-    newClip->fMatrixID = matrixID;
-    return false;
-}
-
-bool SkMatrixClipStateMgr::MatrixClipState::ClipInfo::clipRegion(SkPictureRecord* picRecord,
-                                                                 int regionID,
-                                                                 SkRegion::Op op,
-                                                                 int matrixID) {
-    ClipOp* newClip = fClips.append();
-    newClip->fClipType = kRegion_ClipType;
-    newClip->fGeom.fRegionID = regionID;
-    newClip->fOp = op;
-    newClip->fDoAA = true;      // not necessary but sanity preserving
-    newClip->fMatrixID = matrixID;
-    return false;
-}
-
-void SkMatrixClipStateMgr::writeDeltaMat(int currentMatID, int desiredMatID) {
-    const SkMatrix& current = this->lookupMat(currentMatID);
-    const SkMatrix& desired = this->lookupMat(desiredMatID);
-
-    SkMatrix delta;
-    bool result = current.invert(&delta);
-    if (result) {
-        delta.preConcat(desired);
-    }
-    fPicRecord->recordConcat(delta);
-}
-
-// Note: this only writes out the clips for the current save state. To get the
-// entire clip stack requires iterating of the entire matrix/clip stack.
-void SkMatrixClipStateMgr::MatrixClipState::ClipInfo::writeClip(int* curMatID,
-                                                                SkMatrixClipStateMgr* mgr) {
-    for (int i = 0; i < fClips.count(); ++i) {
-        ClipOp& curClip = fClips[i];
-
-        // TODO: use the matrix ID to skip writing the identity matrix
-        // over and over, i.e.:
-        //  if (*curMatID != curClip.fMatrixID) {
-        //      mgr->writeDeltaMat...
-        //      *curMatID...
-        //  }
-        // Right now this optimization would throw off the testing harness.
-        // TODO: right now we're writing out the delta matrix from the prior
-        // matrix state. This is a side-effect of writing out the entire
-        // clip stack and should be resolved when that is fixed.
-        mgr->writeDeltaMat(*curMatID, curClip.fMatrixID);
-        *curMatID = curClip.fMatrixID;
-
-        size_t offset = 0;
-
-        switch (curClip.fClipType) {
-        case kRect_ClipType:
-            offset = mgr->getPicRecord()->recordClipRect(curClip.fGeom.fRRect.rect(),
-                                                         curClip.fOp, curClip.fDoAA);
-            break;
-        case kRRect_ClipType:
-            offset = mgr->getPicRecord()->recordClipRRect(curClip.fGeom.fRRect, curClip.fOp,
-                                                         curClip.fDoAA);
-            break;
-        case kPath_ClipType:
-            offset = mgr->getPicRecord()->recordClipPath(curClip.fGeom.fPathID, curClip.fOp,
-                                                         curClip.fDoAA);
-            break;
-        case kRegion_ClipType: {
-            const SkRegion* region = mgr->lookupRegion(curClip.fGeom.fRegionID);
-            offset = mgr->getPicRecord()->recordClipRegion(*region, curClip.fOp);
-            break;
-        }
-        default:
-            SkASSERT(0);
-        }
-
-        mgr->addClipOffset(offset);
-    }
-}
-
-SkMatrixClipStateMgr::SkMatrixClipStateMgr()
-    : fPicRecord(NULL)
-    , fMatrixClipStack(sizeof(MatrixClipState),
-                       fMatrixClipStackStorage,
-                       sizeof(fMatrixClipStackStorage))
-    , fCurOpenStateID(kIdentityWideOpenStateID) {
-
-    fSkipOffsets = SkNEW(SkTDArray<int>);
-
-    // The first slot in the matrix dictionary is reserved for the identity matrix
-    fMatrixDict.append()->reset();
-
-    fCurMCState = (MatrixClipState*)fMatrixClipStack.push_back();
-    new (fCurMCState) MatrixClipState(NULL);    // balanced in restore()
-
-#ifdef SK_DEBUG
-    fActualDepth = 0;
-#endif
-}
-
-SkMatrixClipStateMgr::~SkMatrixClipStateMgr() {
-    for (int i = 0; i < fRegionDict.count(); ++i) {
-        SkDELETE(fRegionDict[i]);
-    }
-
-    SkDELETE(fSkipOffsets);
-}
-
-
-int SkMatrixClipStateMgr::MCStackPush() {
-    MatrixClipState* newTop = (MatrixClipState*)fMatrixClipStack.push_back();
-    new (newTop) MatrixClipState(fCurMCState); // balanced in restore()
-    fCurMCState = newTop;
-
-    SkDEBUGCODE(this->validate();)
-
-    return fMatrixClipStack.count();
-}
-
-int SkMatrixClipStateMgr::save() {
-    SkDEBUGCODE(this->validate();)
-
-    return this->MCStackPush();
-}
-
-int SkMatrixClipStateMgr::saveLayer(const SkRect* bounds, const SkPaint* paint,
-                                    SkCanvas::SaveFlags flags) {
-#ifdef SK_DEBUG
-    if (fCurMCState->fIsSaveLayer) {
-        SkASSERT(0 == fSkipOffsets->count());
-    }
-#endif
-
-    // Since the saveLayer call draws something we need to potentially dump
-    // out the MC state
-    SkDEBUGCODE(bool saved =) this->call(kOther_CallType);
-
-    int result = this->MCStackPush();
-    ++fCurMCState->fLayerID;
-    fCurMCState->fIsSaveLayer = true;
-
-#ifdef SK_DEBUG
-    if (saved) {
-        fCurMCState->fExpectedDepth++; // 1 for nesting save
-    }
-    fCurMCState->fExpectedDepth++;   // 1 for saveLayer
-#endif
-
-    *fStateIDStack.append() = fCurOpenStateID;
-    fCurMCState->fSavedSkipOffsets = fSkipOffsets;
-
-    // TODO: recycle these rather then new & deleting them on every saveLayer/
-    // restore
-    fSkipOffsets = SkNEW(SkTDArray<int>);
-
-    fPicRecord->recordSaveLayer(bounds, paint, flags);
-#ifdef SK_DEBUG
-    fActualDepth++;
-#endif
-    return result;
-}
-
-void SkMatrixClipStateMgr::restore() {
-    SkDEBUGCODE(this->validate();)
-
-    if (fCurMCState->fIsSaveLayer) {
-        if (fCurMCState->fHasOpen) {
-            fCurMCState->fHasOpen = false;
-            fPicRecord->recordRestore(); // Close the open block inside the saveLayer
-#ifdef SK_DEBUG
-            SkASSERT(fActualDepth > 0);
-            fActualDepth--;
-#endif
-        } else {
-            SkASSERT(0 == fSkipOffsets->count());
-        }
-
-        // The saveLayer's don't carry any matrix or clip state in the
-        // new scheme so make sure the saveLayer's recordRestore doesn't
-        // try to finalize them (i.e., fill in their skip offsets).
-        fPicRecord->recordRestore(false); // close of saveLayer
-#ifdef SK_DEBUG
-        SkASSERT(fActualDepth > 0);
-        fActualDepth--;
-#endif
-
-        SkASSERT(fStateIDStack.count() >= 1);
-        fCurOpenStateID = fStateIDStack[fStateIDStack.count()-1];
-        fStateIDStack.pop();
-
-        SkASSERT(0 == fSkipOffsets->count());
-        SkASSERT(NULL != fCurMCState->fSavedSkipOffsets);
-
-        SkDELETE(fSkipOffsets);
-        fSkipOffsets = fCurMCState->fSavedSkipOffsets;
-    }
-
-    bool prevHadOpen = fCurMCState->fHasOpen;
-    bool prevWasSaveLayer = fCurMCState->fIsSaveLayer;
-
-    fCurMCState->~MatrixClipState();       // balanced in save()
-    fMatrixClipStack.pop_back();
-    fCurMCState = (MatrixClipState*)fMatrixClipStack.back();
-
-    if (!prevWasSaveLayer) {
-        fCurMCState->fHasOpen = prevHadOpen;
-    }
-
-    if (fCurMCState->fIsSaveLayer) {
-        if (0 != fSkipOffsets->count()) {
-            SkASSERT(fCurMCState->fHasOpen);
-        }
-    }
-
-    SkDEBUGCODE(this->validate();)
-}
-
-// kIdentityWideOpenStateID (0) is reserved for the identity/wide-open clip state
-int32_t SkMatrixClipStateMgr::NewMCStateID() {
-    // TODO: guard against wrap around
-    // TODO: make uint32_t
-    static int32_t gMCStateID = kIdentityWideOpenStateID;
-    ++gMCStateID;
-    return gMCStateID;
-}
-
-bool SkMatrixClipStateMgr::isNestingMCState(int stateID) {
-    return fStateIDStack.count() > 0 && fStateIDStack[fStateIDStack.count()-1] == fCurOpenStateID;
-}
-
-bool SkMatrixClipStateMgr::call(CallType callType) {
-    SkDEBUGCODE(this->validate();)
-
-    if (kMatrix_CallType == callType || kClip_CallType == callType) {
-        fCurMCState->fMCStateID = NewMCStateID();
-        SkDEBUGCODE(this->validate();)
-        return false;
-    }
-
-    SkASSERT(kOther_CallType == callType);
-
-    if (fCurMCState->fMCStateID == fCurOpenStateID) {
-        // Required MC state is already active one - nothing to do
-        SkDEBUGCODE(this->validate();)
-        return false;
-    }
-
-    if (kIdentityWideOpenStateID != fCurOpenStateID &&
-        !this->isNestingMCState(fCurOpenStateID)) {
-        // Don't write a restore if the open state is one in which a saveLayer
-        // is nested. The save after the saveLayer's restore will close it.
-        fPicRecord->recordRestore();    // Close the open block
-        fCurMCState->fHasOpen = false;
-#ifdef SK_DEBUG
-        SkASSERT(fActualDepth > 0);
-        fActualDepth--;
-#endif
-    }
-
-    // Install the required MC state as the active one
-    fCurOpenStateID = fCurMCState->fMCStateID;
-
-    if (kIdentityWideOpenStateID == fCurOpenStateID) {
-        SkASSERT(0 == fActualDepth);
-        SkASSERT(!fCurMCState->fHasOpen);
-        SkASSERT(0 == fSkipOffsets->count());
-        return false;
-    }
-
-    SkASSERT(!fCurMCState->fHasOpen);
-    SkASSERT(0 == fSkipOffsets->count());
-    fCurMCState->fHasOpen = true;
-    fPicRecord->recordSave();
-#ifdef SK_DEBUG
-    fActualDepth++;
-    SkASSERT(fActualDepth == fCurMCState->fExpectedDepth);
-#endif
-
-    // write out clips
-    SkDeque::Iter iter(fMatrixClipStack, SkDeque::Iter::kBack_IterStart);
-    const MatrixClipState* state;
-    // Loop back across the MC states until the last saveLayer. The MC
-    // state in front of the saveLayer has already been written out.
-    for (state = (const MatrixClipState*) iter.prev();
-         state != NULL;
-         state = (const MatrixClipState*) iter.prev()) {
-        if (state->fIsSaveLayer) {
-            break;
-        }
-    }
-
-    int curMatID;
-
-    if (NULL == state) {
-        // There was no saveLayer in the MC stack so we need to output them all
-        iter.reset(fMatrixClipStack, SkDeque::Iter::kFront_IterStart);
-        state = (const MatrixClipState*) iter.next();
-        curMatID = kIdentityMatID;
-    } else {
-        // SkDeque's iterators actually return the previous location so we
-        // need to reverse and go forward one to get back on track.
-        iter.next();
-        SkDEBUGCODE(const MatrixClipState* test = (const MatrixClipState*)) iter.next();
-        SkASSERT(test == state);
-
-        curMatID = state->fMatrixInfo->getID(this);
-
-        // TODO: this assumes that, in the case of Save|SaveLayer when the SaveLayer
-        // doesn't save the clip, that the SaveLayer doesn't add any additional clip state.
-        // This assumption will be removed when we explicitly store the clip state in
-        // self-contained objects. It is valid for the small set of skps.
-        if (NULL != state->fPrev && state->fClipInfo == state->fPrev->fClipInfo) {
-            // By the above assumption the SaveLayer's MC state has already been
-            // written out by the prior Save so don't output it again.
-            state = (const MatrixClipState*) iter.next();
-        }
-    }
-
-    for ( ; state != NULL; state = (const MatrixClipState*) iter.next()) {
-         state->fClipInfo->writeClip(&curMatID, this);
-    }
-
-    // write out matrix
-    // TODO: this test isn't quite right. It should be:
-    //   if (curMatID != fCurMCState->fMatrixInfo->getID(this)) {
-    // but right now the testing harness always expects a matrix if
-    // the matrices are non-I
-    if (kIdentityMatID != fCurMCState->fMatrixInfo->getID(this)) {
-        // TODO: writing out the delta matrix here is an artifact of the writing
-        // out of the entire clip stack (with its matrices). Ultimately we will
-        // write out the CTM here when the clip state is collapsed to a single path.
-        this->writeDeltaMat(curMatID, fCurMCState->fMatrixInfo->getID(this));
-    }
-
-    SkDEBUGCODE(this->validate();)
-    return true;
-}
-
-// Fill in the skip offsets for all the clips written in the current block
-void SkMatrixClipStateMgr::fillInSkips(SkWriter32* writer, int32_t restoreOffset) {
-    for (int i = 0; i < fSkipOffsets->count(); ++i) {
-        SkDEBUGCODE(int32_t peek = writer->readTAt<int32_t>((*fSkipOffsets)[i]);)
-        SkASSERT(-1 == peek);
-        writer->overwriteTAt<int32_t>((*fSkipOffsets)[i], restoreOffset);
-    }
-
-    fSkipOffsets->rewind();
-    SkASSERT(0 == fSkipOffsets->count());
-}
-
-void SkMatrixClipStateMgr::finish() {
-    if (kIdentityWideOpenStateID != fCurOpenStateID) {
-        fPicRecord->recordRestore();    // Close the open block
-        fCurMCState->fHasOpen = false;
-#ifdef SK_DEBUG
-        SkASSERT(fActualDepth > 0);
-        fActualDepth--;
-#endif
-        fCurOpenStateID = kIdentityWideOpenStateID;
-        SkASSERT(!fCurMCState->fHasOpen);
-    }
-}
-
-#ifdef SK_DEBUG
-void SkMatrixClipStateMgr::validate() {
-    if (fCurOpenStateID == fCurMCState->fMCStateID && !this->isNestingMCState(fCurOpenStateID)) {
-        // The current state is the active one so it should have a skip
-        // offset for each clip
-        SkDeque::Iter iter(fMatrixClipStack, SkDeque::Iter::kBack_IterStart);
-        int clipCount = 0;
-        for (const MatrixClipState* state = (const MatrixClipState*) iter.prev();
-             state != NULL;
-             state = (const MatrixClipState*) iter.prev()) {
-            if (NULL == state->fPrev || state->fPrev->fClipInfo != state->fClipInfo) {
-                clipCount += state->fClipInfo->numClips();
-            }
-            if (state->fIsSaveLayer) {
-                break;
-            }
-        }
-
-        SkASSERT(fSkipOffsets->count() == clipCount);
-    }
-}
-#endif
-
-int SkMatrixClipStateMgr::addRegionToDict(const SkRegion& region) {
-    int index = fRegionDict.count();
-    *fRegionDict.append() = SkNEW(SkRegion(region));
-    return index;
-}
-
-int SkMatrixClipStateMgr::addMatToDict(const SkMatrix& mat) {
-    if (mat.isIdentity()) {
-        return kIdentityMatID;
-    }
-
-    *fMatrixDict.append() = mat;
-    return fMatrixDict.count()-1;
-}
diff --git a/gfx/skia/skia/src/core/SkMatrixClipStateMgr.h b/gfx/skia/skia/src/core/SkMatrixClipStateMgr.h
deleted file mode 100644
index 9a80b0154e14..000000000000
--- a/gfx/skia/skia/src/core/SkMatrixClipStateMgr.h
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#ifndef SkMatrixClipStateMgr_DEFINED
-#define SkMatrixClipStateMgr_DEFINED
-
-#include "SkCanvas.h"
-#include "SkMatrix.h"
-#include "SkRegion.h"
-#include "SkRRect.h"
-#include "SkTypes.h"
-#include "SkTDArray.h"
-
-class SkPictureRecord;
-class SkWriter32;
-
-// The SkMatrixClipStateMgr collapses the matrix/clip state of an SkPicture into
-// a series of save/restore blocks of consistent matrix clip state, e.g.:
-//
-//   save
-//     clip(s)
-//     concat
-//     ... draw ops ...
-//   restore
-//
-// SaveLayers simply add another level, e.g.:
-//
-//   save
-//     clip(s)
-//     concat
-//     ... draw ops ...
-//     saveLayer
-//       save
-//         clip(s)
-//         concat
-//         ... draw ops ...
-//       restore
-//     restore
-//   restore
-//
-// As a side effect of this process all saves and saveLayers will become
-// kMatrixClip_SaveFlag style saves/saveLayers.
-
-// The SkMatrixClipStateMgr works by intercepting all the save*, restore, clip*,
-// and matrix calls sent to SkCanvas in order to track the current matrix/clip
-// state. All the other canvas calls get funnelled into a generic "call" entry
-// point that signals that a state block is required.
-class SkMatrixClipStateMgr {
-public:
-    static const int32_t kIdentityWideOpenStateID = 0;
-    static const int kIdentityMatID = 0;
-
-    class MatrixClipState : SkNoncopyable {
-    public:
-        class MatrixInfo {
-        public:
-            void reset() {
-                fMatrixID = kIdentityMatID;
-                fMatrix.reset();
-            }
-
-            void preTranslate(SkScalar dx, SkScalar dy) {
-                fMatrixID = -1;
-                fMatrix.preTranslate(dx, dy);
-            }
-
-            void preScale(SkScalar sx, SkScalar sy) {
-                fMatrixID = -1;
-                fMatrix.preScale(sx, sy);
-            }
-
-            void preRotate(SkScalar degrees) {
-                fMatrixID = -1;
-                fMatrix.preRotate(degrees);
-            }
-
-            void preSkew(SkScalar sx, SkScalar sy) {
-                fMatrixID = -1;
-                fMatrix.preSkew(sx, sy);
-            }
-
-            void preConcat(const SkMatrix& matrix) {
-                fMatrixID = -1;
-                fMatrix.preConcat(matrix);
-            }
-
-            void setMatrix(const SkMatrix& matrix) {
-                fMatrixID = -1;
-                fMatrix = matrix;
-            }
-
-            int getID(SkMatrixClipStateMgr* mgr) {
-                if (fMatrixID >= 0) {
-                    return fMatrixID;
-                }
-
-                fMatrixID = mgr->addMatToDict(fMatrix);
-                return fMatrixID;
-            }
-
-        private:
-            SkMatrix fMatrix;
-            int      fMatrixID;
-
-            typedef SkNoncopyable INHERITED;
-        };
-
-        class ClipInfo : SkNoncopyable {
-        public:
-            ClipInfo() {}
-
-            bool clipRect(const SkRect& rect,
-                          SkRegion::Op op,
-                          bool doAA,
-                          int matrixID) {
-                ClipOp* newClip = fClips.append();
-                newClip->fClipType = kRect_ClipType;
-                newClip->fGeom.fRRect.setRect(rect);   // storing the clipRect in the RRect
-                newClip->fOp = op;
-                newClip->fDoAA = doAA;
-                newClip->fMatrixID = matrixID;
-                return false;
-            }
-
-            bool clipRRect(const SkRRect& rrect,
-                           SkRegion::Op op,
-                           bool doAA,
-                           int matrixID) {
-                ClipOp* newClip = fClips.append();
-                newClip->fClipType = kRRect_ClipType;
-                newClip->fGeom.fRRect = rrect;
-                newClip->fOp = op;
-                newClip->fDoAA = doAA;
-                newClip->fMatrixID = matrixID;
-                return false;
-            }
-
-            bool clipPath(SkPictureRecord* picRecord,
-                          const SkPath& path,
-                          SkRegion::Op op,
-                          bool doAA,
-                          int matrixID);
-            bool clipRegion(SkPictureRecord* picRecord,
-                            int regionID,
-                            SkRegion::Op op,
-                            int matrixID);
-            void writeClip(int* curMatID, SkMatrixClipStateMgr* mgr);
-
-            SkDEBUGCODE(int numClips() const { return fClips.count(); })
-
-        private:
-            enum ClipType {
-                kRect_ClipType,
-                kRRect_ClipType,
-                kPath_ClipType,
-                kRegion_ClipType
-            };
-
-            class ClipOp {
-            public:
-                ClipType     fClipType;
-
-                union {
-                    SkRRect fRRect;        // also stores clip rect
-                    int     fPathID;
-                    int     fRegionID;
-                } fGeom;
-
-                bool         fDoAA;
-                SkRegion::Op fOp;
-
-                // The CTM in effect when this clip call was issued
-                int          fMatrixID;
-            };
-
-            SkTDArray<ClipOp> fClips;
-
-            typedef SkNoncopyable INHERITED;
-        };
-
-        MatrixClipState(MatrixClipState* prev)
-            : fPrev(prev)
-        {
-            fHasOpen = false;
-
-            if (NULL == prev) {
-                fLayerID = 0;
-
-                fMatrixInfoStorage.reset();
-                fMatrixInfo = &fMatrixInfoStorage;
-                fClipInfo = &fClipInfoStorage;  // ctor handles init of fClipInfoStorage
-
-                // The identity/wide-open-clip state is current by default
-                fMCStateID = kIdentityWideOpenStateID;
-#ifdef SK_DEBUG
-                fExpectedDepth = 1;
-#endif
-            }
-            else {
-                fLayerID = prev->fLayerID;
-
-                fMatrixInfoStorage = *prev->fMatrixInfo;
-                fMatrixInfo = &fMatrixInfoStorage;
-
-                // We don't copy the ClipOps of the previous clip states
-                fClipInfo = &fClipInfoStorage;
-
-                // Initially a new save/saveLayer represents the same MC state
-                // as its predecessor.
-                fMCStateID = prev->fMCStateID;
-#ifdef SK_DEBUG
-                fExpectedDepth = prev->fExpectedDepth;
-#endif
-            }
-
-            fIsSaveLayer = false;
-        }
-
-        MatrixInfo*  fMatrixInfo;
-        MatrixInfo   fMatrixInfoStorage;
-
-        ClipInfo*    fClipInfo;
-        ClipInfo     fClipInfoStorage;
-
-        // Tracks the current depth of saveLayers to support the isDrawingToLayer call
-        int          fLayerID;
-        // Does this MC state represent a saveLayer call?
-        bool         fIsSaveLayer;
-
-        // The next field is only valid when fIsSaveLayer is set.
-        SkTDArray<int>* fSavedSkipOffsets;
-
-        // Does the MC state have an open block in the skp?
-        bool         fHasOpen;
-
-        MatrixClipState* fPrev;
-
-#ifdef SK_DEBUG
-        int              fExpectedDepth;    // debugging aid
-#endif
-
-        int32_t     fMCStateID;
-    };
-
-    enum CallType {
-        kMatrix_CallType,
-        kClip_CallType,
-        kOther_CallType
-    };
-
-    SkMatrixClipStateMgr();
-    ~SkMatrixClipStateMgr();
-
-    void init(SkPictureRecord* picRecord) {
-        // Note: we're not taking a ref here. It is expected that the SkMatrixClipStateMgr
-        // is owned by the SkPictureRecord object
-        fPicRecord = picRecord;
-    }
-
-    SkPictureRecord* getPicRecord() { return fPicRecord; }
-
-    // TODO: need to override canvas' getSaveCount. Right now we pass the
-    // save* and restore calls on to the base SkCanvas in SkPictureRecord but
-    // this duplicates effort.
-    int getSaveCount() const { return fMatrixClipStack.count(); }
-
-    int save();
-
-    int saveLayer(const SkRect* bounds, const SkPaint* paint, SkCanvas::SaveFlags flags);
-
-    bool isDrawingToLayer() const {
-        return fCurMCState->fLayerID > 0;
-    }
-
-    void restore();
-
-    void translate(SkScalar dx, SkScalar dy) {
-        this->call(kMatrix_CallType);
-        fCurMCState->fMatrixInfo->preTranslate(dx, dy);
-    }
-
-    void scale(SkScalar sx, SkScalar sy) {
-        this->call(kMatrix_CallType);
-        fCurMCState->fMatrixInfo->preScale(sx, sy);
-    }
-
-    void rotate(SkScalar degrees) {
-        this->call(kMatrix_CallType);
-        fCurMCState->fMatrixInfo->preRotate(degrees);
-    }
-
-    void skew(SkScalar sx, SkScalar sy) {
-        this->call(kMatrix_CallType);
-        fCurMCState->fMatrixInfo->preSkew(sx, sy);
-    }
-
-    void concat(const SkMatrix& matrix) {
-        this->call(kMatrix_CallType);
-        fCurMCState->fMatrixInfo->preConcat(matrix);
-    }
-
-    void setMatrix(const SkMatrix& matrix) {
-        this->call(kMatrix_CallType);
-        fCurMCState->fMatrixInfo->setMatrix(matrix);
-    }
-
-    bool clipRect(const SkRect& rect, SkRegion::Op op, bool doAA) {
-        this->call(SkMatrixClipStateMgr::kClip_CallType);
-        return fCurMCState->fClipInfo->clipRect(rect, op, doAA,
-                                                fCurMCState->fMatrixInfo->getID(this));
-    }
-
-    bool clipRRect(const SkRRect& rrect, SkRegion::Op op, bool doAA) {
-        this->call(SkMatrixClipStateMgr::kClip_CallType);
-        return fCurMCState->fClipInfo->clipRRect(rrect, op, doAA,
-                                                 fCurMCState->fMatrixInfo->getID(this));
-    }
-
-    bool clipPath(const SkPath& path, SkRegion::Op op, bool doAA) {
-        this->call(SkMatrixClipStateMgr::kClip_CallType);
-        return fCurMCState->fClipInfo->clipPath(fPicRecord, path, op, doAA,
-                                                fCurMCState->fMatrixInfo->getID(this));
-    }
-
-    bool clipRegion(const SkRegion& region, SkRegion::Op op) {
-        this->call(SkMatrixClipStateMgr::kClip_CallType);
-        int regionID = this->addRegionToDict(region);
-        return fCurMCState->fClipInfo->clipRegion(fPicRecord, regionID, op,
-                                                  fCurMCState->fMatrixInfo->getID(this));
-    }
-
-    bool call(CallType callType);
-
-    void fillInSkips(SkWriter32* writer, int32_t restoreOffset);
-
-    void finish();
-
-protected:
-    SkPictureRecord* fPicRecord;
-
-    uint32_t         fMatrixClipStackStorage[43]; // sized to fit 2 clip states
-    SkDeque          fMatrixClipStack;
-    MatrixClipState* fCurMCState;
-
-    // This dictionary doesn't actually de-duplicate the matrices (except for the
-    // identity matrix). It merely stores the matrices and allows them to be looked
-    // up by ID later. The de-duplication mainly falls upon the matrix/clip stack
-    // which stores the ID so a revisited clip/matrix (via popping the stack) will
-    // use the same ID.
-    SkTDArray<SkMatrix> fMatrixDict;
-
-    SkTDArray<SkRegion*> fRegionDict;
-
-    // The MCStateID of the state currently in effect in the byte stream. 0 if none.
-    int32_t          fCurOpenStateID;
-    // The skip offsets for the current open state. These are the locations in the
-    // skp that must be filled in when the current open state is closed. These are
-    // here rather then distributed across the MatrixClipState's because saveLayers
-    // can cause MC states to be nested.
-    SkTDArray<int32_t>  *fSkipOffsets;  // TODO: should we store u32 or size_t instead?
-
-    SkDEBUGCODE(void validate();)
-
-    int MCStackPush();
-
-    void addClipOffset(size_t offset) {
-        SkASSERT(NULL != fSkipOffsets);
-        SkASSERT(kIdentityWideOpenStateID != fCurOpenStateID);
-        SkASSERT(fCurMCState->fHasOpen);
-        SkASSERT(!fCurMCState->fIsSaveLayer);
-
-        *fSkipOffsets->append() = SkToS32(offset);
-    }
-
-    void writeDeltaMat(int currentMatID, int desiredMatID);
-    static int32_t   NewMCStateID();
-
-    int addRegionToDict(const SkRegion& region);
-    const SkRegion* lookupRegion(int index) {
-        SkASSERT(index >= 0 && index < fRegionDict.count());
-        return fRegionDict[index];
-    }
-
-    // TODO: add stats to check if the dictionary really does
-    // reduce the size of the SkPicture.
-    int addMatToDict(const SkMatrix& mat);
-    const SkMatrix& lookupMat(int index) {
-        SkASSERT(index >= 0 && index < fMatrixDict.count());
-        return fMatrixDict[index];
-    }
-
-    bool isNestingMCState(int stateID);
-
-#ifdef SK_DEBUG
-    int fActualDepth;
-#endif
-
-    // save layers are nested within a specific MC state. This stack tracks
-    // the nesting MC state's ID as save layers are pushed and popped.
-    SkTDArray<int> fStateIDStack;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/effects/SkMatrixImageFilter.cpp b/gfx/skia/skia/src/core/SkMatrixImageFilter.cpp
similarity index 64%
rename from gfx/skia/skia/src/effects/SkMatrixImageFilter.cpp
rename to gfx/skia/skia/src/core/SkMatrixImageFilter.cpp
index c7c815a761de..4370ddadee2e 100644
--- a/gfx/skia/skia/src/effects/SkMatrixImageFilter.cpp
+++ b/gfx/skia/skia/src/core/SkMatrixImageFilter.cpp
@@ -16,29 +16,31 @@
 #include "SkRect.h"
 
 SkMatrixImageFilter::SkMatrixImageFilter(const SkMatrix& transform,
-                                         SkPaint::FilterLevel filterLevel,
+                                         SkFilterQuality filterQuality,
                                          SkImageFilter* input)
   : INHERITED(1, &input),
     fTransform(transform),
-    fFilterLevel(filterLevel) {
+    fFilterQuality(filterQuality) {
 }
 
 SkMatrixImageFilter* SkMatrixImageFilter::Create(const SkMatrix& transform,
-                                                 SkPaint::FilterLevel filterLevel,
+                                                 SkFilterQuality filterQuality,
                                                  SkImageFilter* input) {
-    return SkNEW_ARGS(SkMatrixImageFilter, (transform, filterLevel, input));
+    return new SkMatrixImageFilter(transform, filterQuality, input);
 }
 
-SkMatrixImageFilter::SkMatrixImageFilter(SkReadBuffer& buffer)
-  : INHERITED(1, buffer) {
-    buffer.readMatrix(&fTransform);
-    fFilterLevel = static_cast<SkPaint::FilterLevel>(buffer.readInt());
+SkFlattenable* SkMatrixImageFilter::CreateProc(SkReadBuffer& buffer) {
+    SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
+    SkMatrix matrix;
+    buffer.readMatrix(&matrix);
+    SkFilterQuality quality = static_cast<SkFilterQuality>(buffer.readInt());
+    return Create(matrix, quality, common.getInput(0));
 }
 
 void SkMatrixImageFilter::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
     buffer.writeMatrix(fTransform);
-    buffer.writeInt(fFilterLevel);
+    buffer.writeInt(fFilterQuality);
 }
 
 SkMatrixImageFilter::~SkMatrixImageFilter() {
@@ -51,7 +53,7 @@ bool SkMatrixImageFilter::onFilterImage(Proxy* proxy,
                                         SkIPoint* offset) const {
     SkBitmap src = source;
     SkIPoint srcOffset = SkIPoint::Make(0, 0);
-    if (getInput(0) && !getInput(0)->filterImage(proxy, source, ctx, &src, &srcOffset)) {
+    if (!this->filterInput(0, proxy, source, ctx, &src, &srcOffset)) {
         return false;
     }
 
@@ -70,7 +72,7 @@ bool SkMatrixImageFilter::onFilterImage(Proxy* proxy,
     dstRect.roundOut(&dstBounds);
 
     SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(dstBounds.width(), dstBounds.height()));
-    if (NULL == device.get()) {
+    if (nullptr == device.get()) {
         return false;
     }
 
@@ -80,7 +82,7 @@ bool SkMatrixImageFilter::onFilterImage(Proxy* proxy,
     SkPaint paint;
 
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
-    paint.setFilterLevel(fFilterLevel);
+    paint.setFilterQuality(fFilterQuality);
     canvas.drawBitmap(src, srcRect.x(), srcRect.y(), &paint);
 
     *result = device.get()->accessBitmap(false);
@@ -94,11 +96,8 @@ void SkMatrixImageFilter::computeFastBounds(const SkRect& src, SkRect* dst) cons
     if (getInput(0)) {
         getInput(0)->computeFastBounds(src, &bounds);
     }
-    SkMatrix matrix;
-    matrix.setTranslate(-bounds.x(), -bounds.y());
-    matrix.postConcat(fTransform);
-    matrix.postTranslate(bounds.x(), bounds.y());
-    matrix.mapRect(dst, bounds);
+    fTransform.mapRect(dst, bounds);
+    dst->join(bounds);   // Work around for skia:3194
 }
 
 bool SkMatrixImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm,
@@ -115,8 +114,7 @@ bool SkMatrixImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm
     matrix.postConcat(ctm);
     SkRect floatBounds;
     matrix.mapRect(&floatBounds, SkRect::Make(src));
-    SkIRect bounds;
-    floatBounds.roundOut(&bounds);
+    SkIRect bounds = floatBounds.roundOut();
     if (getInput(0) && !getInput(0)->filterBounds(bounds, ctm, &bounds)) {
         return false;
     }
@@ -124,3 +122,27 @@ bool SkMatrixImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm
     *dst = bounds;
     return true;
 }
+
+#ifndef SK_IGNORE_TO_STRING
+void SkMatrixImageFilter::toString(SkString* str) const {
+    str->appendf("SkMatrixImageFilter: (");
+
+    str->appendf("transform: (%f %f %f %f %f %f %f %f %f)",
+                 fTransform[SkMatrix::kMScaleX],
+                 fTransform[SkMatrix::kMSkewX],
+                 fTransform[SkMatrix::kMTransX],
+                 fTransform[SkMatrix::kMSkewY],
+                 fTransform[SkMatrix::kMScaleY],
+                 fTransform[SkMatrix::kMTransY],
+                 fTransform[SkMatrix::kMPersp0],
+                 fTransform[SkMatrix::kMPersp1],
+                 fTransform[SkMatrix::kMPersp2]);
+
+    str->append("<dt>FilterLevel:</dt><dd>");
+    static const char* gFilterLevelStrings[] = { "None", "Low", "Medium", "High" };
+    str->append(gFilterLevelStrings[fFilterQuality]);
+    str->append("</dd>");
+
+    str->appendf(")");
+}
+#endif
diff --git a/gfx/skia/skia/include/effects/SkMatrixImageFilter.h b/gfx/skia/skia/src/core/SkMatrixImageFilter.h
similarity index 71%
rename from gfx/skia/skia/include/effects/SkMatrixImageFilter.h
rename to gfx/skia/skia/src/core/SkMatrixImageFilter.h
index 14b0b8e153ac..86734b629cfd 100644
--- a/gfx/skia/skia/include/effects/SkMatrixImageFilter.h
+++ b/gfx/skia/skia/src/core/SkMatrixImageFilter.h
@@ -24,34 +24,34 @@ public:
     /** Construct a 2D transformation image filter.
      *  @param transform    The matrix to apply when drawing the src bitmap
      *  @param filterLevel  The quality of filtering to apply when scaling.
-     *  @param input        The input image filter.  If NULL, the src bitmap
+     *  @param input        The input image filter.  If nullptr, the src bitmap
      *                      passed to filterImage() is used instead.
      */
 
     static SkMatrixImageFilter* Create(const SkMatrix& transform,
-                                       SkPaint::FilterLevel,
-                                       SkImageFilter* input = NULL);
+                                       SkFilterQuality,
+                                       SkImageFilter* input = nullptr);
     virtual ~SkMatrixImageFilter();
 
-    virtual void computeFastBounds(const SkRect&, SkRect*) const SK_OVERRIDE;
+    void computeFastBounds(const SkRect&, SkRect*) const override;
 
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMatrixImageFilter)
 
 protected:
     SkMatrixImageFilter(const SkMatrix& transform,
-                        SkPaint::FilterLevel,
+                        SkFilterQuality,
                         SkImageFilter* input);
-    SkMatrixImageFilter(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
 
     virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                               SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE;
+                               SkBitmap* result, SkIPoint* loc) const override;
     virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&,
-                                SkIRect* dst) const SK_OVERRIDE;
+                                SkIRect* dst) const override;
 
 private:
     SkMatrix              fTransform;
-    SkPaint::FilterLevel  fFilterLevel;
+    SkFilterQuality       fFilterQuality;
     typedef SkImageFilter INHERITED;
 };
 
diff --git a/gfx/skia/skia/src/core/SkMessageBus.h b/gfx/skia/skia/src/core/SkMessageBus.h
index f36c42b4c7bc..a2802f06d401 100644
--- a/gfx/skia/skia/src/core/SkMessageBus.h
+++ b/gfx/skia/skia/src/core/SkMessageBus.h
@@ -8,9 +8,10 @@
 #ifndef SkMessageBus_DEFINED
 #define SkMessageBus_DEFINED
 
-#include "SkLazyPtr.h"
+#include "SkMutex.h"
+#include "SkOncePtr.h"
+#include "SkTArray.h"
 #include "SkTDArray.h"
-#include "SkThread.h"
 #include "SkTypes.h"
 
 template <typename Message>
@@ -25,10 +26,10 @@ public:
         ~Inbox();
 
         // Overwrite out with all the messages we've received since the last call.  Threadsafe.
-        void poll(SkTDArray<Message>* out);
+        void poll(SkTArray<Message>* out);
 
     private:
-        SkTDArray<Message> fMessages;
+        SkTArray<Message>  fMessages;
         SkMutex            fMessagesMutex;
 
         friend class SkMessageBus;
@@ -38,19 +39,18 @@ public:
 private:
     SkMessageBus();
     static SkMessageBus* Get();
-    static SkMessageBus* New();
 
     SkTDArray<Inbox*> fInboxes;
     SkMutex           fInboxesMutex;
 };
 
 // This must go in a single .cpp file, not some .h, or we risk creating more than one global
-// SkMessageBus per type when using shared libraries.
-#define DECLARE_SKMESSAGEBUS_MESSAGE(Message)                        \
-    template <>                                                      \
-    SkMessageBus<Message>* SkMessageBus<Message>::Get() {            \
-        SK_DECLARE_STATIC_LAZY_PTR(SkMessageBus<Message>, bus, New); \
-        return bus.get();                                            \
+// SkMessageBus per type when using shared libraries.  NOTE: at most one per file will compile.
+#define DECLARE_SKMESSAGEBUS_MESSAGE(Message)                      \
+    SK_DECLARE_STATIC_ONCE_PTR(SkMessageBus<Message>, bus);        \
+    template <>                                                    \
+    SkMessageBus<Message>* SkMessageBus<Message>::Get() {          \
+        return bus.get([]{ return new SkMessageBus<Message>(); }); \
     }
 
 //   ----------------------- Implementation of SkMessageBus::Inbox -----------------------
@@ -80,15 +80,15 @@ SkMessageBus<Message>::Inbox::~Inbox() {
 template<typename Message>
 void SkMessageBus<Message>::Inbox::receive(const Message& m) {
     SkAutoMutexAcquire lock(fMessagesMutex);
-    fMessages.push(m);
+    fMessages.push_back(m);
 }
 
 template<typename Message>
-void SkMessageBus<Message>::Inbox::poll(SkTDArray<Message>* messages) {
-    SkASSERT(NULL != messages);
+void SkMessageBus<Message>::Inbox::poll(SkTArray<Message>* messages) {
+    SkASSERT(messages);
     messages->reset();
     SkAutoMutexAcquire lock(fMessagesMutex);
-    messages->swap(fMessages);
+    fMessages.swap(messages);
 }
 
 //   ----------------------- Implementation of SkMessageBus -----------------------
@@ -96,11 +96,6 @@ void SkMessageBus<Message>::Inbox::poll(SkTDArray<Message>* messages) {
 template <typename Message>
 SkMessageBus<Message>::SkMessageBus() {}
 
-template <typename Message>
-/*static*/ SkMessageBus<Message>* SkMessageBus<Message>::New() {
-    return SkNEW(SkMessageBus<Message>);
-}
-
 template <typename Message>
 /*static*/ void SkMessageBus<Message>::Post(const Message& m) {
     SkMessageBus<Message>* bus = SkMessageBus<Message>::Get();
diff --git a/gfx/skia/skia/src/core/SkMetaData.cpp b/gfx/skia/skia/src/core/SkMetaData.cpp
index dfc2a949018a..dd6ed055711d 100644
--- a/gfx/skia/skia/src/core/SkMetaData.cpp
+++ b/gfx/skia/skia/src/core/SkMetaData.cpp
@@ -27,11 +27,11 @@ void* SkMetaData::RefCntProc(void* ptr, bool doRef) {
     return ptr;
 }
 
-SkMetaData::SkMetaData() : fRec(NULL)
+SkMetaData::SkMetaData() : fRec(nullptr)
 {
 }
 
-SkMetaData::SkMetaData(const SkMetaData& src) : fRec(NULL)
+SkMetaData::SkMetaData(const SkMetaData& src) : fRec(nullptr)
 {
     *this = src;
 }
@@ -55,7 +55,7 @@ void SkMetaData::reset()
         Rec::Free(rec);
         rec = next;
     }
-    fRec = NULL;
+    fRec = nullptr;
 }
 
 SkMetaData& SkMetaData::operator=(const SkMetaData& src)
@@ -86,7 +86,7 @@ SkScalar* SkMetaData::setScalars(const char name[], int count, const SkScalar va
     SkASSERT(count > 0);
     if (count > 0)
         return (SkScalar*)this->set(name, values, sizeof(SkScalar), kScalar_Type, count);
-    return NULL;
+    return nullptr;
 }
 
 void SkMetaData::setString(const char name[], const char value[])
@@ -179,7 +179,7 @@ const SkScalar* SkMetaData::findScalars(const char name[], int* count, SkScalar
             memcpy(values, rec->data(), rec->fDataCount * rec->fDataLen);
         return (const SkScalar*)rec->data();
     }
-    return NULL;
+    return nullptr;
 }
 
 bool SkMetaData::findPtr(const char name[], void** ptr, PtrProc* proc) const {
@@ -201,8 +201,8 @@ bool SkMetaData::findPtr(const char name[], void** ptr, PtrProc* proc) const {
 const char* SkMetaData::findString(const char name[]) const
 {
     const Rec* rec = this->find(name, kString_Type);
-    SkASSERT(rec == NULL || rec->fDataLen == sizeof(char));
-    return rec ? (const char*)rec->data() : NULL;
+    SkASSERT(rec == nullptr || rec->fDataLen == sizeof(char));
+    return rec ? (const char*)rec->data() : nullptr;
 }
 
 bool SkMetaData::findBool(const char name[], bool* value) const
@@ -227,7 +227,7 @@ const void* SkMetaData::findData(const char name[], size_t* length) const {
         }
         return rec->data();
     }
-    return NULL;
+    return nullptr;
 }
 
 const SkMetaData::Rec* SkMetaData::find(const char name[], Type type) const
@@ -239,12 +239,12 @@ const SkMetaData::Rec* SkMetaData::find(const char name[], Type type) const
             return rec;
         rec = rec->fNext;
     }
-    return NULL;
+    return nullptr;
 }
 
 bool SkMetaData::remove(const char name[], Type type) {
     Rec* rec = fRec;
-    Rec* prev = NULL;
+    Rec* prev = nullptr;
     while (rec) {
         Rec* next = rec->fNext;
         if (rec->fType == type && !strcmp(rec->name(), name)) {
@@ -309,7 +309,7 @@ void SkMetaData::Iter::reset(const SkMetaData& metadata) {
 }
 
 const char* SkMetaData::Iter::next(SkMetaData::Type* t, int* count) {
-    const char* name = NULL;
+    const char* name = nullptr;
 
     if (fRec) {
         if (t) {
diff --git a/gfx/skia/skia/src/core/SkMiniRecorder.cpp b/gfx/skia/skia/src/core/SkMiniRecorder.cpp
new file mode 100644
index 000000000000..ea179d78b33f
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkMiniRecorder.cpp
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkCanvas.h"
+#include "SkTLazy.h"
+#include "SkMiniRecorder.h"
+#include "SkOncePtr.h"
+#include "SkPicture.h"
+#include "SkPictureCommon.h"
+#include "SkRecordDraw.h"
+#include "SkTextBlob.h"
+
+using namespace SkRecords;
+
+class SkEmptyPicture final : public SkPicture {
+public:
+    void playback(SkCanvas*, AbortCallback*) const override { }
+
+    size_t approximateBytesUsed() const override { return sizeof(*this); }
+    int    approximateOpCount()   const override { return 0; }
+    SkRect cullRect()             const override { return SkRect::MakeEmpty(); }
+    bool   hasText()              const override { return false; }
+    int    numSlowPaths()         const override { return 0; }
+    bool   willPlayBackBitmaps()  const override { return false; }
+};
+SK_DECLARE_STATIC_ONCE_PTR(SkEmptyPicture, gEmptyPicture);
+
+template <typename T>
+class SkMiniPicture final : public SkPicture {
+public:
+    SkMiniPicture(SkRect cull, T* op) : fCull(cull) {
+        memcpy(&fOp, op, sizeof(fOp));  // We take ownership of op's guts.
+    }
+
+    void playback(SkCanvas* c, AbortCallback*) const override {
+        SkRecords::Draw(c, nullptr, nullptr, 0, nullptr)(fOp);
+    }
+
+    size_t approximateBytesUsed() const override { return sizeof(*this); }
+    int    approximateOpCount()   const override { return 1; }
+    SkRect cullRect()             const override { return fCull; }
+    bool   hasText()              const override { return SkTextHunter()(fOp); }
+    bool   willPlayBackBitmaps()  const override { return SkBitmapHunter()(fOp); }
+    int    numSlowPaths()         const override {
+        SkPathCounter counter;
+        counter(fOp);
+        return counter.fNumSlowPathsAndDashEffects;
+    }
+
+private:
+    SkRect fCull;
+    T      fOp;
+};
+
+
+SkMiniRecorder::SkMiniRecorder() : fState(State::kEmpty) {}
+SkMiniRecorder::~SkMiniRecorder() {
+    if (fState != State::kEmpty) {
+        // We have internal state pending.
+        // Detaching then deleting a picture is an easy way to clean up.
+        delete this->detachAsPicture(SkRect::MakeEmpty());
+    }
+    SkASSERT(fState == State::kEmpty);
+}
+
+#define TRY_TO_STORE(Type, ...)                    \
+    if (fState != State::kEmpty) { return false; } \
+    fState = State::k##Type;                       \
+    new (fBuffer.get()) Type{__VA_ARGS__};         \
+    return true
+
+bool SkMiniRecorder::drawBitmapRect(const SkBitmap& bm, const SkRect* src, const SkRect& dst,
+                                    const SkPaint* p, SkCanvas::SrcRectConstraint constraint) {
+    SkRect bounds;
+    if (!src) {
+        bm.getBounds(&bounds);
+        src = &bounds;
+    }
+    SkTLazy<SkPaint> defaultPaint;
+    if (!p) {
+        p = defaultPaint.init();
+    }
+    TRY_TO_STORE(DrawBitmapRectFixedSize, *p, bm, *src, dst, constraint);
+}
+
+bool SkMiniRecorder::drawRect(const SkRect& rect, const SkPaint& paint) {
+    TRY_TO_STORE(DrawRect, paint, rect);
+}
+
+bool SkMiniRecorder::drawPath(const SkPath& path, const SkPaint& paint) {
+    TRY_TO_STORE(DrawPath, paint, path);
+}
+
+bool SkMiniRecorder::drawTextBlob(const SkTextBlob* b, SkScalar x, SkScalar y, const SkPaint& p) {
+    TRY_TO_STORE(DrawTextBlob, p, b, x, y);
+}
+#undef TRY_TO_STORE
+
+
+SkPicture* SkMiniRecorder::detachAsPicture(const SkRect& cull) {
+#define CASE(Type)              \
+    case State::k##Type:        \
+        fState = State::kEmpty; \
+        return new SkMiniPicture<Type>(cull, reinterpret_cast<Type*>(fBuffer.get()))
+
+    switch (fState) {
+        case State::kEmpty: return SkRef(gEmptyPicture.get([]{ return new SkEmptyPicture; }));
+        CASE(DrawBitmapRectFixedSize);
+        CASE(DrawPath);
+        CASE(DrawRect);
+        CASE(DrawTextBlob);
+    }
+    SkASSERT(false);
+    return nullptr;
+#undef CASE
+}
+
+void SkMiniRecorder::flushAndReset(SkCanvas* canvas) {
+#define CASE(Type)                                                  \
+    case State::k##Type: {                                          \
+        fState = State::kEmpty;                                     \
+        Type* op = reinterpret_cast<Type*>(fBuffer.get());          \
+        SkRecords::Draw(canvas, nullptr, nullptr, 0, nullptr)(*op); \
+        op->~Type();                                                \
+    } return
+
+    switch (fState) {
+        case State::kEmpty: return;
+        CASE(DrawBitmapRectFixedSize);
+        CASE(DrawPath);
+        CASE(DrawRect);
+        CASE(DrawTextBlob);
+    }
+    SkASSERT(false);
+#undef CASE
+}
diff --git a/gfx/skia/skia/src/core/SkMipMap.cpp b/gfx/skia/skia/src/core/SkMipMap.cpp
index cb88eb4596be..6e0aaed6973e 100644
--- a/gfx/skia/skia/src/core/SkMipMap.cpp
+++ b/gfx/skia/skia/src/core/SkMipMap.cpp
@@ -9,32 +9,54 @@
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
 
-static void downsampleby2_proc32(SkBitmap* dst, int x, int y,
-                                 const SkBitmap& src) {
+static void downsample32_nocheck(void* dst, int, int, const void* srcPtr, const SkPixmap& srcPM) {
+    const uint32_t* p = static_cast<const uint32_t*>(srcPtr);
+    const uint32_t* baseP = p;
+    uint32_t c, ag, rb;
+
+    c = *p; ag = (c >> 8) & 0xFF00FF; rb = c & 0xFF00FF;
+    p += 1;
+
+    c = *p; ag += (c >> 8) & 0xFF00FF; rb += c & 0xFF00FF;
+
+    p = baseP;
+    p += srcPM.rowBytes() >> 2;
+
+    c = *p; ag += (c >> 8) & 0xFF00FF; rb += c & 0xFF00FF;
+    p += 1;
+
+    c = *p; ag += (c >> 8) & 0xFF00FF; rb += c & 0xFF00FF;
+
+    *(uint32_t*)dst = ((rb >> 2) & 0xFF00FF) | ((ag << 6) & 0xFF00FF00);
+}
+
+static void downsample32_check(void* dst, int x, int y, const void* srcPtr, const SkPixmap& srcPM) {
+    const uint32_t* p = static_cast<const uint32_t*>(srcPtr);
+    const uint32_t* baseP = p;
+
     x <<= 1;
     y <<= 1;
-    const SkPMColor* p = src.getAddr32(x, y);
-    const SkPMColor* baseP = p;
+    SkASSERT(srcPM.addr32(x, y) == p);
+
     SkPMColor c, ag, rb;
 
     c = *p; ag = (c >> 8) & 0xFF00FF; rb = c & 0xFF00FF;
-    if (x < src.width() - 1) {
+    if (x < srcPM.width() - 1) {
         p += 1;
     }
     c = *p; ag += (c >> 8) & 0xFF00FF; rb += c & 0xFF00FF;
 
     p = baseP;
-    if (y < src.height() - 1) {
-        p += src.rowBytes() >> 2;
+    if (y < srcPM.height() - 1) {
+        p += srcPM.rowBytes() >> 2;
     }
     c = *p; ag += (c >> 8) & 0xFF00FF; rb += c & 0xFF00FF;
-    if (x < src.width() - 1) {
+    if (x < srcPM.width() - 1) {
         p += 1;
     }
     c = *p; ag += (c >> 8) & 0xFF00FF; rb += c & 0xFF00FF;
 
-    *dst->getAddr32(x >> 1, y >> 1) =
-    ((rb >> 2) & 0xFF00FF) | ((ag << 6) & 0xFF00FF00);
+    *((uint32_t*)dst) = ((rb >> 2) & 0xFF00FF) | ((ag << 6) & 0xFF00FF00);
 }
 
 static inline uint32_t expand16(U16CPU c) {
@@ -47,31 +69,33 @@ static inline U16CPU pack16(uint32_t c) {
     return (c & ~SK_G16_MASK_IN_PLACE) | ((c >> 16) & SK_G16_MASK_IN_PLACE);
 }
 
-static void downsampleby2_proc16(SkBitmap* dst, int x, int y,
-                                 const SkBitmap& src) {
+static void downsample16(void* dst, int x, int y, const void* srcPtr, const SkPixmap& srcPM) {
+    const uint16_t* p = static_cast<const uint16_t*>(srcPtr);
+    const uint16_t* baseP = p;
+
     x <<= 1;
     y <<= 1;
-    const uint16_t* p = src.getAddr16(x, y);
-    const uint16_t* baseP = p;
-    SkPMColor       c;
+    SkASSERT(srcPM.addr16(x, y) == p);
+
+    SkPMColor c;
 
     c = expand16(*p);
-    if (x < src.width() - 1) {
+    if (x < srcPM.width() - 1) {
         p += 1;
     }
     c += expand16(*p);
 
     p = baseP;
-    if (y < src.height() - 1) {
-        p += src.rowBytes() >> 1;
+    if (y < srcPM.height() - 1) {
+        p += srcPM.rowBytes() >> 1;
     }
     c += expand16(*p);
-    if (x < src.width() - 1) {
+    if (x < srcPM.width() - 1) {
         p += 1;
     }
     c += expand16(*p);
 
-    *dst->getAddr16(x >> 1, y >> 1) = (uint16_t)pack16(c >> 2);
+    *((uint16_t*)dst) = (uint16_t)pack16(c >> 2);
 }
 
 static uint32_t expand4444(U16CPU c) {
@@ -82,67 +106,107 @@ static U16CPU collaps4444(uint32_t c) {
     return (c & 0xF0F) | ((c >> 12) & ~0xF0F);
 }
 
-static void downsampleby2_proc4444(SkBitmap* dst, int x, int y,
-                                   const SkBitmap& src) {
+static void downsample4444(void* dst, int x, int y, const void* srcPtr, const SkPixmap& srcPM) {
+    const uint16_t* p = static_cast<const uint16_t*>(srcPtr);
+    const uint16_t* baseP = p;
+
     x <<= 1;
     y <<= 1;
-    const uint16_t* p = src.getAddr16(x, y);
-    const uint16_t* baseP = p;
-    uint32_t        c;
+    SkASSERT(srcPM.addr16(x, y) == p);
+
+    uint32_t c;
 
     c = expand4444(*p);
-    if (x < src.width() - 1) {
+    if (x < srcPM.width() - 1) {
         p += 1;
     }
     c += expand4444(*p);
 
     p = baseP;
-    if (y < src.height() - 1) {
-        p += src.rowBytes() >> 1;
+    if (y < srcPM.height() - 1) {
+        p += srcPM.rowBytes() >> 1;
     }
     c += expand4444(*p);
-    if (x < src.width() - 1) {
+    if (x < srcPM.width() - 1) {
         p += 1;
     }
     c += expand4444(*p);
 
-    *dst->getAddr16(x >> 1, y >> 1) = (uint16_t)collaps4444(c >> 2);
+   *((uint16_t*)dst) = (uint16_t)collaps4444(c >> 2);
 }
 
-SkMipMap::Level* SkMipMap::AllocLevels(int levelCount, size_t pixelSize) {
+static void downsample8_nocheck(void* dst, int, int, const void* srcPtr, const SkPixmap& srcPM) {
+    const size_t rb = srcPM.rowBytes();
+    const uint8_t* p = static_cast<const uint8_t*>(srcPtr);
+    *(uint8_t*)dst = (p[0] + p[1] + p[rb] + p[rb + 1]) >> 2;
+}
+
+static void downsample8_check(void* dst, int x, int y, const void* srcPtr, const SkPixmap& srcPM) {
+    const uint8_t* p = static_cast<const uint8_t*>(srcPtr);
+    const uint8_t* baseP = p;
+
+    x <<= 1;
+    y <<= 1;
+    SkASSERT(srcPM.addr8(x, y) == p);
+
+    unsigned c = *p;
+    if (x < srcPM.width() - 1) {
+        p += 1;
+    }
+    c += *p;
+
+    p = baseP;
+    if (y < srcPM.height() - 1) {
+        p += srcPM.rowBytes();
+    }
+    c += *p;
+    if (x < srcPM.width() - 1) {
+        p += 1;
+    }
+    c += *p;
+
+    *(uint8_t*)dst = c >> 2;
+}
+
+size_t SkMipMap::AllocLevelsSize(int levelCount, size_t pixelSize) {
     if (levelCount < 0) {
-        return NULL;
+        return 0;
     }
     int64_t size = sk_64_mul(levelCount + 1, sizeof(Level)) + pixelSize;
     if (!sk_64_isS32(size)) {
-        return NULL;
+        return 0;
     }
-    return (Level*)sk_malloc_throw(sk_64_asS32(size));
+    return sk_64_asS32(size);
 }
 
-SkMipMap* SkMipMap::Build(const SkBitmap& src) {
-    void (*proc)(SkBitmap* dst, int x, int y, const SkBitmap& src);
+typedef void SkDownSampleProc(void*, int x, int y, const void* srcPtr, const SkPixmap& srcPM);
+
+SkMipMap* SkMipMap::Build(const SkBitmap& src, SkDiscardableFactoryProc fact) {
+    SkDownSampleProc* proc_nocheck, *proc_check;
 
     const SkColorType ct = src.colorType();
     const SkAlphaType at = src.alphaType();
     switch (ct) {
         case kRGBA_8888_SkColorType:
         case kBGRA_8888_SkColorType:
-            proc = downsampleby2_proc32;
+            proc_check = downsample32_check;
+            proc_nocheck = downsample32_nocheck;
             break;
         case kRGB_565_SkColorType:
-            proc = downsampleby2_proc16;
+            proc_check = downsample16;
+            proc_nocheck = proc_check;
             break;
         case kARGB_4444_SkColorType:
-            proc = downsampleby2_proc4444;
+            proc_check = downsample4444;
+            proc_nocheck = proc_check;
+            break;
+        case kAlpha_8_SkColorType:
+        case kGray_8_SkColorType:
+            proc_check = downsample8_check;
+            proc_nocheck = downsample8_nocheck;
             break;
         default:
-            return NULL; // don't build mipmaps for any other colortypes (yet)
-    }
-
-    SkAutoLockPixels alp(src);
-    if (!src.readyToDraw()) {
-        return NULL;
+            return nullptr; // don't build mipmaps for any other colortypes (yet)
     }
 
     // whip through our loop to compute the exact size needed
@@ -162,20 +226,46 @@ SkMipMap* SkMipMap::Build(const SkBitmap& src) {
         }
     }
     if (0 == countLevels) {
-        return NULL;
+        return nullptr;
     }
 
-    Level* levels = SkMipMap::AllocLevels(countLevels, size);
-    if (NULL == levels) {
-        return NULL;
+    size_t storageSize = SkMipMap::AllocLevelsSize(countLevels, size);
+    if (0 == storageSize) {
+        return nullptr;
     }
 
+    SkAutoPixmapUnlock srcUnlocker;
+    if (!src.requestLock(&srcUnlocker)) {
+        return nullptr;
+    }
+    const SkPixmap& srcPixmap = srcUnlocker.pixmap();
+    // Try to catch where we might have returned nullptr for src crbug.com/492818
+    if (nullptr == srcPixmap.addr()) {
+        sk_throw();
+    }
+
+    SkMipMap* mipmap;
+    if (fact) {
+        SkDiscardableMemory* dm = fact(storageSize);
+        if (nullptr == dm) {
+            return nullptr;
+        }
+        mipmap = new SkMipMap(storageSize, dm);
+    } else {
+        mipmap = new SkMipMap(sk_malloc_throw(storageSize), storageSize);
+    }
+
+    // init
+    mipmap->fCount = countLevels;
+    mipmap->fLevels = (Level*)mipmap->writable_data();
+
+    Level* levels = mipmap->fLevels;
     uint8_t*    baseAddr = (uint8_t*)&levels[countLevels];
     uint8_t*    addr = baseAddr;
     int         width = src.width();
     int         height = src.height();
     uint32_t    rowBytes;
-    SkBitmap    srcBM(src);
+    SkPixmap    srcPM(srcPixmap);
 
     for (int i = 0; i < countLevels; ++i) {
         width >>= 1;
@@ -188,58 +278,66 @@ SkMipMap* SkMipMap::Build(const SkBitmap& src) {
         levels[i].fRowBytes = rowBytes;
         levels[i].fScale    = (float)width / src.width();
 
-        SkBitmap dstBM;
-        dstBM.installPixels(SkImageInfo::Make(width, height, ct, at), addr, rowBytes);
+        SkPixmap dstPM(SkImageInfo::Make(width, height, ct, at), addr, rowBytes);
 
-        srcBM.lockPixels();
-        for (int y = 0; y < height; y++) {
+        const int widthEven = width & ~1;
+        const int heightEven = height & ~1;
+        const size_t pixelSize = srcPM.info().bytesPerPixel();
+
+        const void* srcBasePtr = srcPM.addr();
+        void* dstBasePtr = dstPM.writable_addr();
+        for (int y = 0; y < heightEven; y++) {
+            const void* srcPtr = srcBasePtr;
+            void* dstPtr = dstBasePtr;
+            for (int x = 0; x < widthEven; x++) {
+                proc_nocheck(dstPtr, x, y, srcPtr, srcPM);
+                srcPtr = (char*)srcPtr + pixelSize * 2;
+                dstPtr = (char*)dstPtr + pixelSize;
+            }
+            if (width & 1) {
+                proc_check(dstPtr, widthEven, y, srcPtr, srcPM);
+            }
+
+            srcBasePtr = (char*)srcBasePtr + srcPM.rowBytes() * 2;
+            dstBasePtr = (char*)dstBasePtr + dstPM.rowBytes();
+        }
+        if (height & 1) {
+            const void* srcPtr = srcBasePtr;
+            void* dstPtr = dstBasePtr;
             for (int x = 0; x < width; x++) {
-                proc(&dstBM, x, y, srcBM);
+                proc_check(dstPtr, x, heightEven, srcPtr, srcPM);
+                srcPtr = (char*)srcPtr + pixelSize * 2;
+                dstPtr = (char*)dstPtr + pixelSize;
             }
         }
-        srcBM.unlockPixels();
-
-        srcBM = dstBM;
+        srcPM = dstPM;
         addr += height * rowBytes;
     }
     SkASSERT(addr == baseAddr + size);
 
-    return SkNEW_ARGS(SkMipMap, (levels, countLevels, size));
+    return mipmap;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-//static int gCounter;
-
-SkMipMap::SkMipMap(Level* levels, int count, size_t size)
-    : fSize(size), fLevels(levels), fCount(count) {
-    SkASSERT(levels);
-    SkASSERT(count > 0);
-//    SkDebugf("mips %d\n", ++gCounter);
-}
-
-SkMipMap::~SkMipMap() {
-    sk_free(fLevels);
-//    SkDebugf("mips %d\n", --gCounter);
-}
-
-static SkFixed compute_level(SkScalar scale) {
-    SkFixed s = SkAbs32(SkScalarToFixed(SkScalarInvert(scale)));
-
-    if (s < SK_Fixed1) {
-        return 0;
-    }
-    int clz = SkCLZ(s);
-    SkASSERT(clz >= 1 && clz <= 15);
-    return SkIntToFixed(15 - clz) + ((unsigned)(s << (clz + 1)) >> 16);
-}
-
 bool SkMipMap::extractLevel(SkScalar scale, Level* levelPtr) const {
-    if (scale >= SK_Scalar1) {
+    if (nullptr == fLevels) {
         return false;
     }
 
-    int level = compute_level(scale) >> 16;
+    if (scale >= SK_Scalar1 || scale <= 0 || !SkScalarIsFinite(scale)) {
+        return false;
+    }
+
+    SkScalar L = -SkScalarLog2(scale);
+    if (!SkScalarIsFinite(L)) {
+        return false;
+    }
+    SkASSERT(L >= 0);
+//    int rndLevel = SkScalarRoundToInt(L);
+    int level = SkScalarFloorToInt(L);
+//    SkDebugf("mipmap scale=%g L=%g level=%d rndLevel=%d\n", scale, L, level, rndLevel);
+
     SkASSERT(level >= 0);
     if (level <= 0) {
         return false;
diff --git a/gfx/skia/skia/src/core/SkMipMap.h b/gfx/skia/skia/src/core/SkMipMap.h
index ed912ba97695..36c17ba91e36 100644
--- a/gfx/skia/skia/src/core/SkMipMap.h
+++ b/gfx/skia/skia/src/core/SkMipMap.h
@@ -8,14 +8,17 @@
 #ifndef SkMipMap_DEFINED
 #define SkMipMap_DEFINED
 
-#include "SkRefCnt.h"
+#include "SkCachedData.h"
 #include "SkScalar.h"
 
 class SkBitmap;
+class SkDiscardableMemory;
 
-class SkMipMap : public SkRefCnt {
+typedef SkDiscardableMemory* (*SkDiscardableFactoryProc)(size_t bytes);
+
+class SkMipMap : public SkCachedData {
 public:
-    static SkMipMap* Build(const SkBitmap& src);
+    static SkMipMap* Build(const SkBitmap& src, SkDiscardableFactoryProc);
 
     struct Level {
         void*       fPixels;
@@ -26,18 +29,22 @@ public:
 
     bool extractLevel(SkScalar scale, Level*) const;
 
-    size_t getSize() const { return fSize; }
+protected:
+    void onDataChange(void* oldData, void* newData) override {
+        fLevels = (Level*)newData; // could be nullptr
+    }
 
 private:
-    size_t  fSize;
     Level*  fLevels;
     int     fCount;
 
     // we take ownership of levels, and will free it with sk_free()
-    SkMipMap(Level* levels, int count, size_t size);
-    virtual ~SkMipMap();
+    SkMipMap(void* malloc, size_t size) : INHERITED(malloc, size) {}
+    SkMipMap(size_t size, SkDiscardableMemory* dm) : INHERITED(size, dm) {}
 
-    static Level* AllocLevels(int levelCount, size_t pixelSize);
+    static size_t AllocLevelsSize(int levelCount, size_t pixelSize);
+
+    typedef SkCachedData INHERITED;
 };
 
 #endif
diff --git a/gfx/skia/skia/src/core/SkMultiPictureDraw.cpp b/gfx/skia/skia/src/core/SkMultiPictureDraw.cpp
new file mode 100644
index 000000000000..672bd628b7c7
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkMultiPictureDraw.cpp
@@ -0,0 +1,207 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+// Need to include something before #if SK_SUPPORT_GPU so that the Android
+// framework build, which gets its defines from SkTypes rather than a makefile,
+// has the definition before checking it.
+#include "SkCanvas.h"
+#include "SkCanvasPriv.h"
+#include "SkMultiPictureDraw.h"
+#include "SkPicture.h"
+#include "SkTaskGroup.h"
+
+#if SK_SUPPORT_GPU
+#include "GrContext.h"
+#include "GrLayerHoister.h"
+#include "GrRecordReplaceDraw.h"
+#include "GrRenderTarget.h"
+#endif
+
+void SkMultiPictureDraw::DrawData::draw() {
+    fCanvas->drawPicture(fPicture, &fMatrix, fPaint);
+}
+
+void SkMultiPictureDraw::DrawData::init(SkCanvas* canvas, const SkPicture* picture,
+                                        const SkMatrix* matrix, const SkPaint* paint) {
+    fPicture = SkRef(picture);
+    fCanvas = SkRef(canvas);
+    if (matrix) {
+        fMatrix = *matrix;
+    } else {
+        fMatrix.setIdentity();
+    }
+    if (paint) {
+        fPaint = new SkPaint(*paint);
+    } else {
+        fPaint = nullptr;
+    }
+}
+
+void SkMultiPictureDraw::DrawData::Reset(SkTDArray<DrawData>& data) {
+    for (int i = 0; i < data.count(); ++i) {
+        data[i].fPicture->unref();
+        data[i].fCanvas->unref();
+        delete data[i].fPaint;
+    }
+    data.rewind();
+}
+
+//////////////////////////////////////////////////////////////////////////////////////
+
+SkMultiPictureDraw::SkMultiPictureDraw(int reserve) {
+    if (reserve > 0) {
+        fGPUDrawData.setReserve(reserve);
+        fThreadSafeDrawData.setReserve(reserve);
+    }
+}
+
+void SkMultiPictureDraw::reset() {
+    DrawData::Reset(fGPUDrawData);
+    DrawData::Reset(fThreadSafeDrawData);
+}
+
+void SkMultiPictureDraw::add(SkCanvas* canvas,
+                             const SkPicture* picture,
+                             const SkMatrix* matrix,
+                             const SkPaint* paint) {
+    if (nullptr == canvas || nullptr == picture) {
+        SkDEBUGFAIL("parameters to SkMultiPictureDraw::add should be non-nullptr");
+        return;
+    }
+
+    SkTDArray<DrawData>& array = canvas->getGrContext() ? fGPUDrawData : fThreadSafeDrawData;
+    array.append()->init(canvas, picture, matrix, paint);
+}
+
+class AutoMPDReset : SkNoncopyable {
+    SkMultiPictureDraw* fMPD;
+public:
+    AutoMPDReset(SkMultiPictureDraw* mpd) : fMPD(mpd) {}
+    ~AutoMPDReset() { fMPD->reset(); }
+};
+
+//#define FORCE_SINGLE_THREAD_DRAWING_FOR_TESTING
+
+void SkMultiPictureDraw::draw(bool flush) {
+    AutoMPDReset mpdreset(this);
+
+#ifdef FORCE_SINGLE_THREAD_DRAWING_FOR_TESTING
+    for (int i = 0; i < fThreadSafeDrawData.count(); ++i) {
+        fThreadSafeDrawData[i].draw();
+    }
+#else
+    sk_parallel_for(fThreadSafeDrawData.count(), [&](int i) {
+        fThreadSafeDrawData[i].draw();
+    });
+#endif
+
+    // N.B. we could get going on any GPU work from this main thread while the CPU work runs.
+    // But in practice, we've either got GPU work or CPU work, not both.
+
+    const int count = fGPUDrawData.count();
+    if (0 == count) {
+        return;
+    }
+
+#if !defined(SK_IGNORE_GPU_LAYER_HOISTING) && SK_SUPPORT_GPU
+    GrContext* context = fGPUDrawData[0].fCanvas->getGrContext();
+    SkASSERT(context);
+
+    // Start by collecting all the layers that are going to be atlased and render
+    // them (if necessary). Hoisting the free floating layers is deferred until
+    // drawing the canvas that requires them.
+    SkTDArray<GrHoistedLayer> atlasedNeedRendering, atlasedRecycled;
+
+    GrLayerHoister::Begin(context);
+
+    for (int i = 0; i < count; ++i) {
+        const DrawData& data = fGPUDrawData[i];
+        // we only expect 1 context for all the canvases
+        SkASSERT(data.fCanvas->getGrContext() == context);
+
+        if (!data.fPaint) {
+            SkRect clipBounds;
+            if (!data.fCanvas->getClipBounds(&clipBounds)) {
+                continue;
+            }
+
+            SkMatrix initialMatrix = data.fCanvas->getTotalMatrix();
+            initialMatrix.preConcat(data.fMatrix);
+
+            GrRenderTarget* rt = data.fCanvas->internal_private_accessTopLayerRenderTarget();
+            SkASSERT(rt);
+
+            // TODO: sorting the cacheable layers from smallest to largest
+            // would improve the packing and reduce the number of swaps
+            // TODO: another optimization would be to make a first pass to
+            // lock any required layer that is already in the atlas
+            GrLayerHoister::FindLayersToAtlas(context, data.fPicture, initialMatrix,
+                                              clipBounds,
+                                              &atlasedNeedRendering, &atlasedRecycled,
+                                              rt->numColorSamples());
+        }
+    }
+
+    GrLayerHoister::DrawLayersToAtlas(context, atlasedNeedRendering);
+
+    SkTDArray<GrHoistedLayer> needRendering, recycled;
+#endif
+
+    for (int i = 0; i < count; ++i) {
+        const DrawData& data = fGPUDrawData[i];
+        SkCanvas* canvas = data.fCanvas;
+        const SkPicture* picture = data.fPicture;
+
+#if !defined(SK_IGNORE_GPU_LAYER_HOISTING) && SK_SUPPORT_GPU
+        if (!data.fPaint) {
+
+            SkRect clipBounds;
+            if (!canvas->getClipBounds(&clipBounds)) {
+                continue;
+            }
+
+            SkAutoCanvasMatrixPaint acmp(canvas, &data.fMatrix, data.fPaint, picture->cullRect());
+
+            const SkMatrix initialMatrix = canvas->getTotalMatrix();
+
+            GrRenderTarget* rt = data.fCanvas->internal_private_accessTopLayerRenderTarget();
+            SkASSERT(rt);
+
+            // Find the layers required by this canvas. It will return atlased
+            // layers in the 'recycled' list since they have already been drawn.
+            GrLayerHoister::FindLayersToHoist(context, picture, initialMatrix,
+                                              clipBounds, &needRendering, &recycled,
+                                              rt->numColorSamples());
+
+            GrLayerHoister::DrawLayers(context, needRendering);
+
+            // Render the entire picture using new layers
+            GrRecordReplaceDraw(picture, canvas, context->getLayerCache(),
+                                initialMatrix, nullptr);
+
+            GrLayerHoister::UnlockLayers(context, needRendering);
+            GrLayerHoister::UnlockLayers(context, recycled);
+
+            needRendering.rewind();
+            recycled.rewind();
+        } else
+#endif
+        {
+            canvas->drawPicture(picture, &data.fMatrix, data.fPaint);
+        }
+        if (flush) {
+            canvas->flush();
+        }
+    }
+
+#if !defined(SK_IGNORE_GPU_LAYER_HOISTING) && SK_SUPPORT_GPU
+    GrLayerHoister::UnlockLayers(context, atlasedNeedRendering);
+    GrLayerHoister::UnlockLayers(context, atlasedRecycled);
+    GrLayerHoister::End(context);
+#endif
+}
+
diff --git a/gfx/skia/skia/src/core/SkNextID.h b/gfx/skia/skia/src/core/SkNextID.h
new file mode 100644
index 000000000000..570fd946dedf
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkNextID.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkNextID_DEFINED
+#define SkNextID_DEFINED
+
+#include "SkTypes.h"
+
+class SkNextID {
+public:
+    /**
+     *  Shared between SkPixelRef's generationID and SkImage's uniqueID
+     */
+    static uint32_t ImageID();
+};
+
+#endif
diff --git a/gfx/skia/skia/src/core/SkNinePatchIter.cpp b/gfx/skia/skia/src/core/SkNinePatchIter.cpp
new file mode 100644
index 000000000000..5d24d75e7a09
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkNinePatchIter.cpp
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkNinePatchIter.h"
+#include "SkRect.h"
+
+bool SkNinePatchIter::Valid(int width, int height, const SkIRect& center) {
+    return !center.isEmpty() && SkIRect::MakeWH(width, height).contains(center);
+}
+
+SkNinePatchIter::SkNinePatchIter(int w, int h, const SkIRect& c, const SkRect& dst) {
+    SkASSERT(SkIRect::MakeWH(w, h).contains(c));
+
+    fSrcX[0] = 0;
+    fSrcX[1] = SkIntToScalar(c.fLeft);
+    fSrcX[2] = SkIntToScalar(c.fRight);
+    fSrcX[3] = SkIntToScalar(w);
+    
+    fSrcY[0] = 0;
+    fSrcY[1] = SkIntToScalar(c.fTop);
+    fSrcY[2] = SkIntToScalar(c.fBottom);
+    fSrcY[3] = SkIntToScalar(h);
+    
+    fDstX[0] = dst.fLeft;
+    fDstX[1] = dst.fLeft + SkIntToScalar(c.fLeft);
+    fDstX[2] = dst.fRight - SkIntToScalar(w - c.fRight);
+    fDstX[3] = dst.fRight;
+    
+    fDstY[0] = dst.fTop;
+    fDstY[1] = dst.fTop + SkIntToScalar(c.fTop);
+    fDstY[2] = dst.fBottom - SkIntToScalar(h - c.fBottom);
+    fDstY[3] = dst.fBottom;
+    
+    if (fDstX[1] > fDstX[2]) {
+        fDstX[1] = fDstX[0] + (fDstX[3] - fDstX[0]) * c.fLeft / (w - c.width());
+        fDstX[2] = fDstX[1];
+    }
+
+    if (fDstY[1] > fDstY[2]) {
+        fDstY[1] = fDstY[0] + (fDstY[3] - fDstY[0]) * c.fTop / (h - c.height());
+        fDstY[2] = fDstY[1];
+    }
+
+    fCurrX = fCurrY = 0;
+    fDone = false;
+}
+
+bool SkNinePatchIter::next(SkRect* src, SkRect* dst) {
+    if (fDone) {
+        return false;
+    }
+
+    const int x = fCurrX;
+    const int y = fCurrY;
+    SkASSERT(x >= 0 && x < 3);
+    SkASSERT(y >= 0 && y < 3);
+
+    src->set(fSrcX[x], fSrcY[y], fSrcX[x + 1], fSrcY[y + 1]);
+    dst->set(fDstX[x], fDstY[y], fDstX[x + 1], fDstY[y + 1]);
+    if (3 == ++fCurrX) {
+        fCurrX = 0;
+        fCurrY += 1;
+        if (fCurrY >= 3) {
+            fDone = true;
+        }
+    }
+    return true;
+}
diff --git a/gfx/skia/skia/src/core/SkNinePatchIter.h b/gfx/skia/skia/src/core/SkNinePatchIter.h
new file mode 100644
index 000000000000..2d7e9a8b195e
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkNinePatchIter.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkNinePatchIter_DEFINED
+#define SkNinePatchIter_DEFINED
+
+#include "SkScalar.h"
+
+struct SkIRect;
+struct SkRect;
+
+/**
+ *  Disect a ninepatch request into an sequence of src-rect / dst-rect pairs
+ */
+class SkNinePatchIter {
+public:
+    static bool Valid(int imageWidth, int imageHeight, const SkIRect& center);
+
+    SkNinePatchIter(int imageWidth, int imageHeight, const SkIRect& center, const SkRect& dst);
+
+    /**
+     *  While it returns true, use src/dst to draw the image/bitmap
+     */
+    bool next(SkRect* src, SkRect* dst);
+    
+private:
+    SkScalar fSrcX[4];
+    SkScalar fSrcY[4];
+    SkScalar fDstX[4];
+    SkScalar fDstY[4];
+    
+    int fCurrX;
+    int fCurrY;
+    bool fDone;
+};
+
+#endif
+
diff --git a/gfx/skia/skia/src/core/SkNx.h b/gfx/skia/skia/src/core/SkNx.h
new file mode 100644
index 000000000000..36a645cac12d
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkNx.h
@@ -0,0 +1,336 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkNx_DEFINED
+#define SkNx_DEFINED
+
+
+#define SKNX_NO_SIMDx  // Remove the x to disable SIMD for all SkNx types.
+
+
+#include "SkScalar.h"
+#include "SkTypes.h"
+#include <math.h>
+#define REQUIRE(x) static_assert(x, #x)
+
+// This file may be included multiple times by .cpp files with different flags, leading
+// to different definitions.  Usually that doesn't matter because it's all inlined, but
+// in Debug modes the compilers may not inline everything.  So wrap everything in an
+// anonymous namespace to give each includer their own silo of this code (or the linker
+// will probably pick one randomly for us, which is rarely correct).
+namespace {
+
+// The default implementations just fall back on a pair of size N/2.
+
+template <int N, typename T>
+class SkNx {
+public:
+    SkNx() {}
+    SkNx(const SkNx<N/2, T>& lo, const SkNx<N/2, T>& hi) : fLo(lo), fHi(hi) {}
+    SkNx(T val) : fLo(val), fHi(val) {}
+    static SkNx Load(const T vals[N]) {
+        return SkNx(SkNx<N/2,T>::Load(vals), SkNx<N/2,T>::Load(vals+N/2));
+    }
+
+    SkNx(T a, T b)                                : fLo(a),       fHi(b)       { REQUIRE(N==2); }
+    SkNx(T a, T b, T c, T d)                      : fLo(a,b),     fHi(c,d)     { REQUIRE(N==4); }
+    SkNx(T a, T b, T c, T d,  T e, T f, T g, T h) : fLo(a,b,c,d), fHi(e,f,g,h) { REQUIRE(N==8); }
+    SkNx(T a, T b, T c, T d,  T e, T f, T g, T h,
+         T i, T j, T k, T l,  T m, T n, T o, T p)
+        : fLo(a,b,c,d, e,f,g,h), fHi(i,j,k,l, m,n,o,p) { REQUIRE(N==16); }
+
+    void store(T vals[N]) const {
+        fLo.store(vals);
+        fHi.store(vals+N/2);
+    }
+
+    SkNx saturatedAdd(const SkNx& o) const {
+        return SkNx(fLo.saturatedAdd(o.fLo), fHi.saturatedAdd(o.fHi));
+    }
+
+    SkNx operator + (const SkNx& o) const { return SkNx(fLo + o.fLo, fHi + o.fHi); }
+    SkNx operator - (const SkNx& o) const { return SkNx(fLo - o.fLo, fHi - o.fHi); }
+    SkNx operator * (const SkNx& o) const { return SkNx(fLo * o.fLo, fHi * o.fHi); }
+
+    SkNx operator << (int bits) const { return SkNx(fLo << bits, fHi << bits); }
+    SkNx operator >> (int bits) const { return SkNx(fLo >> bits, fHi >> bits); }
+
+    static SkNx Min(const SkNx& a, const SkNx& b) {
+        return SkNx(SkNx<N/2, T>::Min(a.fLo, b.fLo), SkNx<N/2, T>::Min(a.fHi, b.fHi));
+    }
+    SkNx operator < (const SkNx& o) const { return SkNx(fLo < o.fLo, fHi < o.fHi); }
+
+    template <int k> T kth() const {
+        SkASSERT(0 <= k && k < N);
+        return k < N/2 ? fLo.template kth<k>() : fHi.template kth<k-N/2>();
+    }
+
+    bool allTrue() const { return fLo.allTrue() && fHi.allTrue(); }
+    bool anyTrue() const { return fLo.anyTrue() || fHi.anyTrue(); }
+    SkNx thenElse(const SkNx& t, const SkNx& e) const {
+        return SkNx(fLo.thenElse(t.fLo, e.fLo), fHi.thenElse(t.fHi, e.fHi));
+    }
+
+protected:
+    REQUIRE(0 == (N & (N-1)));
+
+    SkNx<N/2, T> fLo, fHi;
+};
+
+template <int N>
+class SkNx<N,float> {
+public:
+    SkNx() {}
+    SkNx(float val) : fLo(val),  fHi(val) {}
+    static SkNx Load(const float vals[N]) {
+        return SkNx(SkNx<N/2, float>::Load(vals), SkNx<N/2, float>::Load(vals+N/2));
+    }
+    // FromBytes() and toBytes() specializations may assume their argument is N-byte aligned.
+    // E.g. Sk4f::FromBytes() may assume it's reading from a 4-byte-aligned pointer.
+    // Converts [0,255] bytes to [0.0, 255.0] floats.
+    static SkNx FromBytes(const uint8_t bytes[N]) {
+        return SkNx(SkNx<N/2, float>::FromBytes(bytes), SkNx<N/2, float>::FromBytes(bytes+N/2));
+    }
+
+    SkNx(float a, float b)                   : fLo(a),   fHi(b)   { REQUIRE(N==2); }
+    SkNx(float a, float b, float c, float d) : fLo(a,b), fHi(c,d) { REQUIRE(N==4); }
+    SkNx(float a, float b, float c, float d, float e, float f, float g, float h)
+        : fLo(a,b,c,d)
+        , fHi(e,f,g,h) { REQUIRE(N==8); }
+
+    void store(float vals[N]) const {
+        fLo.store(vals);
+        fHi.store(vals+N/2);
+    }
+    // Please see note on FromBytes().
+    // Clamps to [0.0,255.0] floats and truncates to [0,255] bytes.
+    void toBytes(uint8_t bytes[N]) const {
+        fLo.toBytes(bytes);
+        fHi.toBytes(bytes+N/2);
+    }
+
+    // Some implementations can do this faster.
+    static void ToBytes(uint8_t bytes[4*N],
+                        const SkNx& a, const SkNx& b, const SkNx& c, const SkNx& d) {
+        a.toBytes(bytes+0*N);
+        b.toBytes(bytes+1*N);
+        c.toBytes(bytes+2*N);
+        d.toBytes(bytes+3*N);
+    }
+
+    SkNx operator + (const SkNx& o) const { return SkNx(fLo + o.fLo, fHi + o.fHi); }
+    SkNx operator - (const SkNx& o) const { return SkNx(fLo - o.fLo, fHi - o.fHi); }
+    SkNx operator * (const SkNx& o) const { return SkNx(fLo * o.fLo, fHi * o.fHi); }
+    SkNx operator / (const SkNx& o) const { return SkNx(fLo / o.fLo, fHi / o.fHi); }
+
+    SkNx operator == (const SkNx& o) const { return SkNx(fLo == o.fLo, fHi == o.fHi); }
+    SkNx operator != (const SkNx& o) const { return SkNx(fLo != o.fLo, fHi != o.fHi); }
+    SkNx operator  < (const SkNx& o) const { return SkNx(fLo  < o.fLo, fHi  < o.fHi); }
+    SkNx operator  > (const SkNx& o) const { return SkNx(fLo  > o.fLo, fHi  > o.fHi); }
+    SkNx operator <= (const SkNx& o) const { return SkNx(fLo <= o.fLo, fHi <= o.fHi); }
+    SkNx operator >= (const SkNx& o) const { return SkNx(fLo >= o.fLo, fHi >= o.fHi); }
+
+    static SkNx Min(const SkNx& l, const SkNx& r) {
+        return SkNx(SkNx<N/2, float>::Min(l.fLo, r.fLo), SkNx<N/2, float>::Min(l.fHi, r.fHi));
+    }
+    static SkNx Max(const SkNx& l, const SkNx& r) {
+        return SkNx(SkNx<N/2, float>::Max(l.fLo, r.fLo), SkNx<N/2, float>::Max(l.fHi, r.fHi));
+    }
+
+    SkNx  sqrt() const { return SkNx(fLo. sqrt(), fHi. sqrt()); }
+
+    // Generally, increasing precision, increasing cost.
+    SkNx rsqrt0() const { return SkNx(fLo.rsqrt0(), fHi.rsqrt0()); }
+    SkNx rsqrt1() const { return SkNx(fLo.rsqrt1(), fHi.rsqrt1()); }
+    SkNx rsqrt2() const { return SkNx(fLo.rsqrt2(), fHi.rsqrt2()); }
+
+    SkNx       invert() const { return SkNx(fLo.      invert(), fHi.      invert()); }
+    SkNx approxInvert() const { return SkNx(fLo.approxInvert(), fHi.approxInvert()); }
+
+    template <int k> float kth() const {
+        SkASSERT(0 <= k && k < N);
+        return k < N/2 ? fLo.template kth<k>() : fHi.template kth<k-N/2>();
+    }
+
+    bool allTrue() const { return fLo.allTrue() && fHi.allTrue(); }
+    bool anyTrue() const { return fLo.anyTrue() || fHi.anyTrue(); }
+    SkNx thenElse(const SkNx& t, const SkNx& e) const {
+        return SkNx(fLo.thenElse(t.fLo, e.fLo), fHi.thenElse(t.fHi, e.fHi));
+    }
+
+protected:
+    REQUIRE(0 == (N & (N-1)));
+    SkNx(const SkNx<N/2, float>& lo, const SkNx<N/2, float>& hi) : fLo(lo), fHi(hi) {}
+
+    SkNx<N/2, float> fLo, fHi;
+};
+
+
+// Bottom out the default implementations with scalars when nothing's been specialized.
+
+template <typename T>
+class SkNx<1,T> {
+public:
+    SkNx() {}
+    SkNx(T val) : fVal(val) {}
+    static SkNx Load(const T vals[1]) { return SkNx(vals[0]); }
+
+    void store(T vals[1]) const { vals[0] = fVal; }
+
+    SkNx saturatedAdd(const SkNx& o) const {
+        SkASSERT((T)(~0) > 0); // TODO: support signed T
+        T sum = fVal + o.fVal;
+        return SkNx(sum < fVal ? (T)(~0) : sum);
+    }
+
+    SkNx operator + (const SkNx& o) const { return SkNx(fVal + o.fVal); }
+    SkNx operator - (const SkNx& o) const { return SkNx(fVal - o.fVal); }
+    SkNx operator * (const SkNx& o) const { return SkNx(fVal * o.fVal); }
+
+    SkNx operator << (int bits) const { return SkNx(fVal << bits); }
+    SkNx operator >> (int bits) const { return SkNx(fVal >> bits); }
+
+    static SkNx Min(const SkNx& a, const SkNx& b) { return SkNx(SkTMin(a.fVal, b.fVal)); }
+    SkNx operator <(const SkNx& o) const { return SkNx(fVal < o.fVal); }
+
+    template <int k> T kth() const {
+        SkASSERT(0 == k);
+        return fVal;
+    }
+
+    bool allTrue() const { return fVal; }
+    bool anyTrue() const { return fVal; }
+    SkNx thenElse(const SkNx& t, const SkNx& e) const { return fVal ? t : e; }
+
+protected:
+    T fVal;
+};
+
+template <>
+class SkNx<1,float> {
+public:
+    SkNx() {}
+    SkNx(float val) : fVal(val) {}
+    static SkNx Load(const float vals[1]) { return SkNx(vals[0]); }
+    static SkNx FromBytes(const uint8_t bytes[1]) { return SkNx((float)bytes[0]); }
+
+    void store(float vals[1]) const { vals[0] = fVal; }
+    void toBytes(uint8_t bytes[1]) const { bytes[0] = (uint8_t)(SkTMin(fVal, 255.0f)); }
+
+    SkNx operator + (const SkNx& o) const { return SkNx(fVal + o.fVal); }
+    SkNx operator - (const SkNx& o) const { return SkNx(fVal - o.fVal); }
+    SkNx operator * (const SkNx& o) const { return SkNx(fVal * o.fVal); }
+    SkNx operator / (const SkNx& o) const { return SkNx(fVal / o.fVal); }
+
+    SkNx operator == (const SkNx& o) const { return SkNx(fVal == o.fVal); }
+    SkNx operator != (const SkNx& o) const { return SkNx(fVal != o.fVal); }
+    SkNx operator  < (const SkNx& o) const { return SkNx(fVal  < o.fVal); }
+    SkNx operator  > (const SkNx& o) const { return SkNx(fVal  > o.fVal); }
+    SkNx operator <= (const SkNx& o) const { return SkNx(fVal <= o.fVal); }
+    SkNx operator >= (const SkNx& o) const { return SkNx(fVal >= o.fVal); }
+
+    static SkNx Min(const SkNx& l, const SkNx& r) { return SkNx(SkTMin(l.fVal, r.fVal)); }
+    static SkNx Max(const SkNx& l, const SkNx& r) { return SkNx(SkTMax(l.fVal, r.fVal)); }
+
+    SkNx  sqrt() const { return SkNx(sqrtf(fVal));        }
+    SkNx rsqrt0() const { return SkNx(1.0f / sqrtf(fVal)); }
+    SkNx rsqrt1() const { return this->rsqrt0(); }
+    SkNx rsqrt2() const { return this->rsqrt1(); }
+
+    SkNx       invert() const { return SkNx(1.0f / fVal); }
+    SkNx approxInvert() const { return this->invert();    }
+
+    template <int k> float kth() const {
+        SkASSERT(k == 0);
+        return fVal;
+    }
+
+    bool allTrue() const { return this->pun() != 0; }
+    bool anyTrue() const { return this->pun() != 0; }
+    SkNx thenElse(const SkNx& t, const SkNx& e) const { return this->pun() ? t : e; }
+
+protected:
+    uint32_t pun() const {
+        union { float f; uint32_t i; } pun = { fVal };
+        return pun.i;
+    }
+
+    float fVal;
+};
+
+// This default implementation can be specialized by ../opts/SkNx_foo.h
+// if there's a better platform-specific shuffle strategy.
+template <typename Nx, int... Ix>
+inline Nx SkNx_shuffle_impl(const Nx& src) { return Nx( src.template kth<Ix>()... ); }
+
+// This generic shuffle can be called with 1 or N indices:
+//     Sk4f f(a,b,c,d);
+//     SkNx_shuffle<3>(f);        // ~~~> Sk4f(d,d,d,d)
+//     SkNx_shuffle<2,1,0,3>(f);  // ~~~> Sk4f(c,b,a,d)
+template <int... Ix, typename Nx>
+inline Nx SkNx_shuffle(const Nx& src) { return SkNx_shuffle_impl<Nx, Ix...>(src); }
+
+// A reminder alias that shuffles can be used to duplicate a single index across a vector.
+template <int Ix, typename Nx>
+inline Nx SkNx_dup(const Nx& src) { return SkNx_shuffle<Ix>(src); }
+
+// This is a poor-man's std::make_index_sequence from C++14.
+// I'd implement it fully, but it hurts my head.
+template <int...> struct SkIntSequence {};
+template <int N> struct MakeSkIntSequence;
+template <> struct MakeSkIntSequence< 1> : SkIntSequence<0                                    >{};
+template <> struct MakeSkIntSequence< 2> : SkIntSequence<0,1                                  >{};
+template <> struct MakeSkIntSequence< 4> : SkIntSequence<0,1,2,3                              >{};
+template <> struct MakeSkIntSequence< 8> : SkIntSequence<0,1,2,3,4,5,6,7                      >{};
+template <> struct MakeSkIntSequence<16> : SkIntSequence<0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15>{};
+
+// This is the default/fallback implementation for SkNx_cast.  Best to specialize SkNx_cast!
+template <typename D, typename S, int N, int... Ix>
+SkNx<N,D> SkNx_cast_fallback(const SkNx<N,S>& src, SkIntSequence<Ix...>) {
+    return SkNx<N,D>( (D)src.template kth<Ix>()... );
+}
+
+// This is a generic cast between two SkNx with the same number of elements N.  E.g.
+//   Sk4b bs = ...;                    // Load 4 bytes.
+//   Sk4f fs = SkNx_cast<float>(bs);   // (This will replace SkNf::FromBytes() one day.)
+//   Sk4i is = SkNx_cast<int>(fs);     // Cast each float to int.
+// This can be specialized in ../opts/SkNx_foo.h if there's a better platform-specific cast.
+template <typename D, typename S, int N>
+SkNx<N,D> SkNx_cast(const SkNx<N,S>& src) {
+    return SkNx_cast_fallback<D,S,N>(src, MakeSkIntSequence<N>());
+}
+
+}  // namespace
+
+
+// Include platform specific specializations if available.
+#ifndef SKNX_NO_SIMD
+    #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_AVX
+        #include "../opts/SkNx_avx.h"
+    #elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
+        #include "../opts/SkNx_sse.h"
+    #elif defined(SK_ARM_HAS_NEON)
+        #include "../opts/SkNx_neon.h"
+    #endif
+#endif
+
+#undef REQUIRE
+
+typedef SkNx<2, float> Sk2f;
+typedef SkNx<2, float> Sk2s;
+typedef SkNx<4, float> Sk4f;
+typedef SkNx<4, float> Sk4s;
+typedef SkNx<8, float> Sk8f;
+typedef SkNx<8, float> Sk8s;
+
+typedef SkNx<8,  uint16_t> Sk8h;
+typedef SkNx<16, uint16_t> Sk16h;
+typedef SkNx<16, uint8_t>  Sk16b;
+
+typedef SkNx<4, int> Sk4i;
+
+#endif//SkNx_DEFINED
diff --git a/gfx/skia/skia/src/core/SkOpts.cpp b/gfx/skia/skia/src/core/SkOpts.cpp
new file mode 100644
index 000000000000..77666f06b3c1
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkOpts.cpp
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkOnce.h"
+#include "SkOpts.h"
+
+#define SK_OPTS_NS sk_default
+#include "SkBlitMask_opts.h"
+#include "SkBlitRow_opts.h"
+#include "SkBlurImageFilter_opts.h"
+#include "SkColorCubeFilter_opts.h"
+#include "SkFloatingPoint_opts.h"
+#include "SkMatrix_opts.h"
+#include "SkMorphologyImageFilter_opts.h"
+#include "SkTextureCompressor_opts.h"
+#include "SkUtils_opts.h"
+#include "SkXfermode_opts.h"
+
+#if defined(SK_CPU_X86)
+    #if defined(SK_BUILD_FOR_WIN32)
+        #include <intrin.h>
+        static void cpuid (uint32_t abcd[4]) { __cpuid  ((int*)abcd, 1);    }
+        static void cpuid7(uint32_t abcd[4]) { __cpuidex((int*)abcd, 7, 0); }
+        static uint64_t xgetbv(uint32_t xcr) { return _xgetbv(xcr); }
+    #else
+        #include <cpuid.h>
+        #if !defined(__cpuid_count)  // Old Mac Clang doesn't have this defined.
+            #define  __cpuid_count(eax, ecx, a, b, c, d) \
+                __asm__("cpuid" : "=a"(a), "=b"(b), "=c"(c), "=d"(d) : "0"(eax), "2"(ecx))
+        #endif
+        static void cpuid (uint32_t abcd[4]) { __get_cpuid(1, abcd+0, abcd+1, abcd+2, abcd+3); }
+        static void cpuid7(uint32_t abcd[4]) {
+            __cpuid_count(7, 0, abcd[0], abcd[1], abcd[2], abcd[3]);
+        }
+        static uint64_t xgetbv(uint32_t xcr) {
+            uint32_t eax, edx;
+            __asm__ __volatile__ ( "xgetbv" : "=a"(eax), "=d"(edx) : "c"(xcr));
+            return (uint64_t)(edx) << 32 | eax;
+        }
+    #endif
+#elif !defined(SK_ARM_HAS_NEON)      && \
+       defined(SK_CPU_ARM32)         && \
+       defined(SK_BUILD_FOR_ANDROID) && \
+      !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
+    #ifdef MOZ_SKIA
+        #include "mozilla/arm.h"
+    #else
+        #include <cpu-features.h>
+    #endif
+#endif
+
+namespace SkOpts {
+    // Define default function pointer values here...
+    // If our global compile options are set high enough, these defaults might even be
+    // CPU-specialized, e.g. a typical x86-64 machine might start with SSE2 defaults.
+    // They'll still get a chance to be replaced with even better ones, e.g. using SSE4.1.
+    decltype(rsqrt)                     rsqrt = sk_default::rsqrt;
+    decltype(memset16)               memset16 = sk_default::memset16;
+    decltype(memset32)               memset32 = sk_default::memset32;
+    decltype(create_xfermode) create_xfermode = sk_default::create_xfermode;
+    decltype(color_cube_filter_span) color_cube_filter_span = sk_default::color_cube_filter_span;
+
+    decltype(box_blur_xx) box_blur_xx = sk_default::box_blur_xx;
+    decltype(box_blur_xy) box_blur_xy = sk_default::box_blur_xy;
+    decltype(box_blur_yx) box_blur_yx = sk_default::box_blur_yx;
+
+    decltype(dilate_x) dilate_x = sk_default::dilate_x;
+    decltype(dilate_y) dilate_y = sk_default::dilate_y;
+    decltype( erode_x)  erode_x = sk_default::erode_x;
+    decltype( erode_y)  erode_y = sk_default::erode_y;
+
+    decltype(texture_compressor)       texture_compressor = sk_default::texture_compressor;
+    decltype(fill_block_dimensions) fill_block_dimensions = sk_default::fill_block_dimensions;
+
+    decltype(blit_mask_d32_a8) blit_mask_d32_a8 = sk_default::blit_mask_d32_a8;
+
+    decltype(blit_row_color32) blit_row_color32 = sk_default::blit_row_color32;
+
+    decltype(matrix_translate)       matrix_translate       = sk_default::matrix_translate;
+    decltype(matrix_scale_translate) matrix_scale_translate = sk_default::matrix_scale_translate;
+    decltype(matrix_affine)          matrix_affine          = sk_default::matrix_affine;
+
+    // Each Init_foo() is defined in src/opts/SkOpts_foo.cpp.
+    void Init_ssse3();
+    void Init_sse41();
+    void Init_sse42() {}
+    void Init_avx();
+    void Init_avx2() {}
+    void Init_neon();
+
+    static void init() {
+        // TODO: Chrome's not linking _sse* opts on iOS simulator builds.  Bug or feature?
+    #if defined(SK_CPU_X86) && !defined(SK_BUILD_FOR_IOS)
+        uint32_t abcd[] = {0,0,0,0};
+        cpuid(abcd);
+        if (abcd[2] & (1<< 9)) { Init_ssse3(); }
+        if (abcd[2] & (1<<19)) { Init_sse41(); }
+        if (abcd[2] & (1<<20)) { Init_sse42(); }
+
+        // AVX detection's kind of a pain.  This is cribbed from Chromium.
+        if ( (  abcd[2] & (7<<26)) == (7<<26) &&    // Check bits 26-28 of ecx are all set,
+             (xgetbv(0) & 6      ) == 6          ){ // and  check the OS supports XSAVE.
+            Init_avx();
+
+            // AVX2 additionally needs bit 5 set on ebx after calling cpuid(7).
+            uint32_t abcd7[] = {0,0,0,0};
+            cpuid7(abcd7);
+            if (abcd7[1] & (1<<5)) { Init_avx2(); }
+        }
+
+    #elif !defined(SK_ARM_HAS_NEON)      && \
+           defined(SK_CPU_ARM32)         && \
+           defined(SK_BUILD_FOR_ANDROID) && \
+          !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
+        #ifdef MOZ_SKIA
+            if (mozilla::supports_neon()) { Init_neon(); }
+        #else
+            if (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) { Init_neon(); }
+        #endif
+    #endif
+    }
+
+    SK_DECLARE_STATIC_ONCE(gInitOnce);
+    void Init() { SkOnce(&gInitOnce, init); }
+
+#if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
+    static struct AutoInit {
+        AutoInit() { Init(); }
+    } gAutoInit;
+#endif
+}
diff --git a/gfx/skia/skia/src/core/SkOpts.h b/gfx/skia/skia/src/core/SkOpts.h
new file mode 100644
index 000000000000..1b94126cf724
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkOpts.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkOpts_DEFINED
+#define SkOpts_DEFINED
+
+#include "SkMatrix.h"
+#include "SkTextureCompressor.h"
+#include "SkTypes.h"
+#include "SkXfermode.h"
+
+struct ProcCoeff;
+
+namespace SkOpts {
+    // Call to replace pointers to portable functions with pointers to CPU-specific functions.
+    // Thread-safe and idempotent.
+    // Called by SkGraphics::Init(), and automatically #if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS.
+    void Init();
+
+    // Declare function pointers here...
+
+    // Returns a fast approximation of 1.0f/sqrtf(x).
+    extern float (*rsqrt)(float);
+
+    // See SkUtils.h
+    extern void (*memset16)(uint16_t[], uint16_t, int);
+    extern void (*memset32)(uint32_t[], uint32_t, int);
+
+    // May return nullptr if we haven't specialized the given Mode.
+    extern SkXfermode* (*create_xfermode)(const ProcCoeff&, SkXfermode::Mode);
+
+    typedef void (*BoxBlur)(const SkPMColor*, int, const SkIRect& srcBounds, SkPMColor*, int, int, int, int, int);
+    extern BoxBlur box_blur_xx, box_blur_xy, box_blur_yx;
+
+    typedef void (*Morph)(const SkPMColor*, SkPMColor*, int, int, int, int, int);
+    extern Morph dilate_x, dilate_y, erode_x, erode_y;
+
+    typedef bool (*TextureCompressor)(uint8_t* dst, const uint8_t* src,
+                                      int width, int height, size_t rowBytes);
+    extern TextureCompressor (*texture_compressor)(SkColorType, SkTextureCompressor::Format);
+    extern bool (*fill_block_dimensions)(SkTextureCompressor::Format, int* x, int* y);
+
+    extern void (*blit_mask_d32_a8)(SkPMColor*, size_t, const SkAlpha*, size_t, SkColor, int, int);
+    extern void (*blit_row_color32)(SkPMColor*, const SkPMColor*, int, SkPMColor);
+
+    // This function is an optimized version of SkColorCubeFilter::filterSpan
+    extern void (*color_cube_filter_span)(const SkPMColor[],
+                                          int,
+                                          SkPMColor[],
+                                          const int * [2],
+                                          const SkScalar * [2],
+                                          int,
+                                          const SkColor*);
+
+    extern SkMatrix::MapPtsProc matrix_translate, matrix_scale_translate, matrix_affine;
+}
+
+#endif//SkOpts_DEFINED
diff --git a/gfx/skia/skia/src/core/SkPackBits.cpp b/gfx/skia/skia/src/core/SkPackBits.cpp
index 3c6197b6f27f..a3424e2bdcbe 100644
--- a/gfx/skia/skia/src/core/SkPackBits.cpp
+++ b/gfx/skia/skia/src/core/SkPackBits.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
@@ -7,150 +6,14 @@
  */
 #include "SkPackBits.h"
 
-#define GATHER_STATSx
-
-static inline void small_memcpy(void* SK_RESTRICT dst,
-                                const void* SK_RESTRICT src, size_t n) {
-    SkASSERT(n > 0 && n <= 15);
-    uint8_t* d = (uint8_t*)dst;
-    const uint8_t* s = (const uint8_t*)src;
-    switch (n) {
-        case 15: *d++ = *s++;
-        case 14: *d++ = *s++;
-        case 13: *d++ = *s++;
-        case 12: *d++ = *s++;
-        case 11: *d++ = *s++;
-        case 10: *d++ = *s++;
-        case  9: *d++ = *s++;
-        case  8: *d++ = *s++;
-        case  7: *d++ = *s++;
-        case  6: *d++ = *s++;
-        case  5: *d++ = *s++;
-        case  4: *d++ = *s++;
-        case  3: *d++ = *s++;
-        case  2: *d++ = *s++;
-        case  1: *d++ = *s++;
-        case  0: break;
-    }
-}
-
-static inline void small_memset(void* dst, uint8_t value, size_t n) {
-    SkASSERT(n > 0 && n <= 15);
-    uint8_t* d = (uint8_t*)dst;
-    switch (n) {
-        case 15: *d++ = value;
-        case 14: *d++ = value;
-        case 13: *d++ = value;
-        case 12: *d++ = value;
-        case 11: *d++ = value;
-        case 10: *d++ = value;
-        case  9: *d++ = value;
-        case  8: *d++ = value;
-        case  7: *d++ = value;
-        case  6: *d++ = value;
-        case  5: *d++ = value;
-        case  4: *d++ = value;
-        case  3: *d++ = value;
-        case  2: *d++ = value;
-        case  1: *d++ = value;
-        case  0: break;
-    }
-}
-
-// can we do better for small counts with our own inlined memcpy/memset?
-
-#define PB_MEMSET(addr, value, count)       \
-do {                                        \
-if ((count) > 15) {                     \
-memset(addr, value, count);         \
-} else {                                \
-small_memset(addr, value, count);   \
-}                                       \
-} while (0)
-
-#define PB_MEMCPY(dst, src, count)      \
-do {                                    \
-    if ((count) > 15) {                 \
-        memcpy(dst, src, count);        \
-    } else {                            \
-        small_memcpy(dst, src, count);  \
-    }                                   \
-} while (0)
-
-///////////////////////////////////////////////////////////////////////////////
-
-#ifdef GATHER_STATS
-    static int gMemSetBuckets[129];
-    static int gMemCpyBuckets[129];
-    static int gCounter;
-
-static void register_memset_count(int n) {
-    SkASSERT((unsigned)n <= 128);
-    gMemSetBuckets[n] += 1;
-    gCounter += 1;
-
-    if ((gCounter & 0xFF) == 0) {
-        SkDebugf("----- packbits memset stats: ");
-        for (size_t i = 0; i < SK_ARRAY_COUNT(gMemSetBuckets); i++) {
-            if (gMemSetBuckets[i]) {
-                SkDebugf(" %d:%d", i, gMemSetBuckets[i]);
-            }
-        }
-    }
-}
-static void register_memcpy_count(int n) {
-    SkASSERT((unsigned)n <= 128);
-    gMemCpyBuckets[n] += 1;
-    gCounter += 1;
-
-    if ((gCounter & 0x1FF) == 0) {
-        SkDebugf("----- packbits memcpy stats: ");
-        for (size_t i = 0; i < SK_ARRAY_COUNT(gMemCpyBuckets); i++) {
-            if (gMemCpyBuckets[i]) {
-                SkDebugf(" %d:%d", i, gMemCpyBuckets[i]);
-            }
-        }
-    }
-}
-#else
-#define register_memset_count(n)
-#define register_memcpy_count(n)
-#endif
-
-
-///////////////////////////////////////////////////////////////////////////////
-
-size_t SkPackBits::ComputeMaxSize16(int count) {
-    // worst case is the number of 16bit values (times 2) +
-    // 1 byte per (up to) 128 entries.
-    return ((count + 127) >> 7) + (count << 1);
-}
-
 size_t SkPackBits::ComputeMaxSize8(int count) {
     // worst case is the number of 8bit values + 1 byte per (up to) 128 entries.
     return ((count + 127) >> 7) + count;
 }
 
-static uint8_t* flush_same16(uint8_t dst[], uint16_t value, int count) {
+static uint8_t* flush_same8(uint8_t dst[], uint8_t value, size_t count) {
     while (count > 0) {
-        int n = count;
-        if (n > 128) {
-            n = 128;
-        }
-        *dst++ = (uint8_t)(n - 1);
-        *dst++ = (uint8_t)(value >> 8);
-        *dst++ = (uint8_t)value;
-        count -= n;
-    }
-    return dst;
-}
-
-static uint8_t* flush_same8(uint8_t dst[], uint8_t value, int count) {
-    while (count > 0) {
-        int n = count;
-        if (n > 128) {
-            n = 128;
-        }
+        int n = count > 128 ? 128 : count;
         *dst++ = (uint8_t)(n - 1);
         *dst++ = (uint8_t)value;
         count -= n;
@@ -158,31 +21,12 @@ static uint8_t* flush_same8(uint8_t dst[], uint8_t value, int count) {
     return dst;
 }
 
-static uint8_t* flush_diff16(uint8_t* SK_RESTRICT dst,
-                             const uint16_t* SK_RESTRICT src, int count) {
-    while (count > 0) {
-        int n = count;
-        if (n > 128) {
-            n = 128;
-        }
-        *dst++ = (uint8_t)(n + 127);
-        PB_MEMCPY(dst, src, n * sizeof(uint16_t));
-        src += n;
-        dst += n * sizeof(uint16_t);
-        count -= n;
-    }
-    return dst;
-}
-
 static uint8_t* flush_diff8(uint8_t* SK_RESTRICT dst,
-                            const uint8_t* SK_RESTRICT src, int count) {
+                            const uint8_t* SK_RESTRICT src, size_t count) {
     while (count > 0) {
-        int n = count;
-        if (n > 128) {
-            n = 128;
-        }
+        int n = count > 128 ? 128 : count;
         *dst++ = (uint8_t)(n + 127);
-        PB_MEMCPY(dst, src, n);
+        memcpy(dst, src, n);
         src += n;
         dst += n;
         count -= n;
@@ -190,64 +34,20 @@ static uint8_t* flush_diff8(uint8_t* SK_RESTRICT dst,
     return dst;
 }
 
-size_t SkPackBits::Pack16(const uint16_t* SK_RESTRICT src, int count,
-                          uint8_t* SK_RESTRICT dst) {
-    uint8_t* origDst = dst;
-    const uint16_t* stop = src + count;
-
-    for (;;) {
-        count = SkToInt(stop - src);
-        SkASSERT(count >= 0);
-        if (count == 0) {
-            return dst - origDst;
-        }
-        if (1 == count) {
-            *dst++ = 0;
-            *dst++ = (uint8_t)(*src >> 8);
-            *dst++ = (uint8_t)*src;
-            return dst - origDst;
-        }
-
-        unsigned value = *src;
-        const uint16_t* s = src + 1;
-
-        if (*s == value) { // accumulate same values...
-            do {
-                s++;
-                if (s == stop) {
-                    break;
-                }
-            } while (*s == value);
-            dst = flush_same16(dst, value, SkToInt(s - src));
-        } else {    // accumulate diff values...
-            do {
-                if (++s == stop) {
-                    goto FLUSH_DIFF;
-                }
-            } while (*s != s[-1]);
-            s -= 1; // back up so we don't grab one of the "same" values that follow
-        FLUSH_DIFF:
-            dst = flush_diff16(dst, src, SkToInt(s - src));
-        }
-        src = s;
+size_t SkPackBits::Pack8(const uint8_t* SK_RESTRICT src, size_t srcSize,
+                         uint8_t* SK_RESTRICT dst, size_t dstSize) {
+    if (dstSize < ComputeMaxSize8(srcSize)) {
+        return 0;
     }
-}
 
-size_t SkPackBits::Pack8(const uint8_t* SK_RESTRICT src, int count,
-                         uint8_t* SK_RESTRICT dst) {
-    uint8_t* origDst = dst;
-    const uint8_t* stop = src + count;
+    uint8_t* const origDst = dst;
+    const uint8_t* stop = src + srcSize;
 
-    for (;;) {
-        count = SkToInt(stop - src);
-        SkASSERT(count >= 0);
-        if (count == 0) {
-            return dst - origDst;
-        }
+    for (intptr_t count = stop - src; count > 0; count = stop - src) {
         if (1 == count) {
             *dst++ = 0;
             *dst++ = *src;
-            return dst - origDst;
+            break;
         }
 
         unsigned value = *src;
@@ -275,137 +75,35 @@ size_t SkPackBits::Pack8(const uint8_t* SK_RESTRICT src, int count,
         }
         src = s;
     }
+    return dst - origDst;
 }
 
 #include "SkUtils.h"
 
-int SkPackBits::Unpack16(const uint8_t* SK_RESTRICT src, size_t srcSize,
-                         uint16_t* SK_RESTRICT dst) {
-    uint16_t* origDst = dst;
-    const uint8_t* stop = src + srcSize;
-
-    while (src < stop) {
-        unsigned n = *src++;
-        if (n <= 127) {   // repeat count (n + 1)
-            n += 1;
-            sk_memset16(dst, (src[0] << 8) | src[1], n);
-            src += 2;
-        } else {    // same count (n - 127)
-            n -= 127;
-            PB_MEMCPY(dst, src, n * sizeof(uint16_t));
-            src += n * sizeof(uint16_t);
-        }
-        dst += n;
-    }
-    SkASSERT(src == stop);
-    return SkToInt(dst - origDst);
-}
-
 int SkPackBits::Unpack8(const uint8_t* SK_RESTRICT src, size_t srcSize,
-                        uint8_t* SK_RESTRICT dst) {
-    uint8_t* origDst = dst;
+                        uint8_t* SK_RESTRICT dst, size_t dstSize) {
+    uint8_t* const origDst = dst;
+    uint8_t* const endDst = dst + dstSize;
     const uint8_t* stop = src + srcSize;
 
     while (src < stop) {
         unsigned n = *src++;
         if (n <= 127) {   // repeat count (n + 1)
             n += 1;
-            PB_MEMSET(dst, *src++, n);
+            if (dst >(endDst - n)) {
+                return 0;
+            }
+            memset(dst, *src++, n);
         } else {    // same count (n - 127)
             n -= 127;
-            PB_MEMCPY(dst, src, n);
+            if (dst > (endDst - n)) {
+                return 0;
+            }
+            memcpy(dst, src, n);
             src += n;
         }
         dst += n;
     }
-    SkASSERT(src == stop);
+    SkASSERT(src <= stop);
     return SkToInt(dst - origDst);
 }
-
-enum UnpackState {
-    CLEAN_STATE,
-    REPEAT_BYTE_STATE,
-    COPY_SRC_STATE
-};
-
-void SkPackBits::Unpack8(uint8_t* SK_RESTRICT dst, size_t dstSkip,
-                         size_t dstWrite, const uint8_t* SK_RESTRICT src) {
-    if (dstWrite == 0) {
-        return;
-    }
-
-    UnpackState state = CLEAN_STATE;
-    size_t      stateCount = 0;
-
-    // state 1: do the skip-loop
-    while (dstSkip > 0) {
-        size_t n = *src++;
-        if (n <= 127) {   // repeat count (n + 1)
-            n += 1;
-            if (n > dstSkip) {
-                state = REPEAT_BYTE_STATE;
-                stateCount = n - dstSkip;
-                n = dstSkip;
-                // we don't increment src here, since its needed in stage 2
-            } else {
-                src++;  // skip the src byte
-            }
-        } else {    // same count (n - 127)
-            n -= 127;
-            if (n > dstSkip) {
-                state = COPY_SRC_STATE;
-                stateCount = n - dstSkip;
-                n = dstSkip;
-            }
-            src += n;
-        }
-        dstSkip -= n;
-    }
-
-    // stage 2: perform any catchup from the skip-stage
-    if (stateCount > dstWrite) {
-        stateCount = dstWrite;
-    }
-    switch (state) {
-        case REPEAT_BYTE_STATE:
-            SkASSERT(stateCount > 0);
-            register_memset_count(stateCount);
-            PB_MEMSET(dst, *src++, stateCount);
-            break;
-        case COPY_SRC_STATE:
-            SkASSERT(stateCount > 0);
-            register_memcpy_count(stateCount);
-            PB_MEMCPY(dst, src, stateCount);
-            src += stateCount;
-            break;
-        default:
-            SkASSERT(stateCount == 0);
-            break;
-    }
-    dst += stateCount;
-    dstWrite -= stateCount;
-
-    // copy at most dstWrite bytes into dst[]
-    while (dstWrite > 0) {
-        size_t n = *src++;
-        if (n <= 127) {   // repeat count (n + 1)
-            n += 1;
-            if (n > dstWrite) {
-                n = dstWrite;
-            }
-            register_memset_count(n);
-            PB_MEMSET(dst, *src++, n);
-        } else {    // same count (n - 127)
-            n -= 127;
-            if (n > dstWrite) {
-                n = dstWrite;
-            }
-            register_memcpy_count(n);
-            PB_MEMCPY(dst, src, n);
-            src += n;
-        }
-        dst += n;
-        dstWrite -= n;
-    }
-    SkASSERT(0 == dstWrite);
-}
diff --git a/gfx/skia/skia/src/core/SkPaint.cpp b/gfx/skia/skia/src/core/SkPaint.cpp
index 8fc7c1959566..2623052ec461 100644
--- a/gfx/skia/skia/src/core/SkPaint.cpp
+++ b/gfx/skia/skia/src/core/SkPaint.cpp
@@ -8,20 +8,19 @@
 #include "SkPaint.h"
 #include "SkAnnotation.h"
 #include "SkAutoKern.h"
+#include "SkChecksum.h"
 #include "SkColorFilter.h"
 #include "SkData.h"
-#include "SkDeviceProperties.h"
 #include "SkDraw.h"
 #include "SkFontDescriptor.h"
-#include "SkFontHost.h"
 #include "SkGlyphCache.h"
 #include "SkImageFilter.h"
 #include "SkMaskFilter.h"
 #include "SkMaskGamma.h"
+#include "SkMutex.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkPaintDefaults.h"
-#include "SkPaintOptionsAndroid.h"
 #include "SkPathEffect.h"
 #include "SkRasterizer.h"
 #include "SkScalar.h"
@@ -33,54 +32,25 @@
 #include "SkTextToPathIter.h"
 #include "SkTLazy.h"
 #include "SkTypeface.h"
+#include "SkStrokeRec.h"
+#include "SkSurfacePriv.h"
 #include "SkXfermode.h"
 
-enum {
-    kColor_DirtyBit               = 1 <<  0,
-    kTextSize_DirtyBit            = 1 <<  1,
-    kTextScaleX_DirtyBit          = 1 <<  2,
-    kTextSkewX_DirtyBit           = 1 <<  3,
-    kStrokeWidth_DirtyBit         = 1 <<  4,
-    kStrokeMiter_DirtyBit         = 1 <<  5,
-
-    kPOD_DirtyBitMask             = 63,
-
-    kPathEffect_DirtyBit          = 1 <<  6,
-    kShader_DirtyBit              = 1 <<  7,
-    kXfermode_DirtyBit            = 1 <<  8,
-    kMaskFilter_DirtyBit          = 1 <<  9,
-    kColorFilter_DirtyBit         = 1 << 10,
-    kRasterizer_DirtyBit          = 1 << 11,
-    kLooper_DirtyBit              = 1 << 12,
-    kImageFilter_DirtyBit         = 1 << 13,
-    kTypeface_DirtyBit            = 1 << 14,
-    kAnnotation_DirtyBit          = 1 << 15,
-    kPaintOptionsAndroid_DirtyBit = 1 << 16,
-};
-
 // define this to get a printf for out-of-range parameter in setters
 // e.g. setTextSize(-1)
 //#define SK_REPORT_API_RANGE_CHECK
 
-#ifdef SK_BUILD_FOR_ANDROID
-#define GEN_ID_INC                  fGenerationID++
-#define GEN_ID_INC_EVAL(expression) if (expression) { fGenerationID++; }
-#else
-#define GEN_ID_INC
-#define GEN_ID_INC_EVAL(expression)
-#endif
-
 SkPaint::SkPaint() {
-    fTypeface    = NULL;
-    fPathEffect  = NULL;
-    fShader      = NULL;
-    fXfermode    = NULL;
-    fMaskFilter  = NULL;
-    fColorFilter = NULL;
-    fRasterizer  = NULL;
-    fLooper      = NULL;
-    fImageFilter = NULL;
-    fAnnotation  = NULL;
+    fTypeface    = nullptr;
+    fPathEffect  = nullptr;
+    fShader      = nullptr;
+    fXfermode    = nullptr;
+    fMaskFilter  = nullptr;
+    fColorFilter = nullptr;
+    fRasterizer  = nullptr;
+    fLooper      = nullptr;
+    fImageFilter = nullptr;
+    fAnnotation  = nullptr;
 
     fTextSize   = SkPaintDefaults_TextSize;
     fTextScaleX = SK_Scalar1;
@@ -98,12 +68,6 @@ SkPaint::SkPaint() {
     fBitfields.fStyle        = kFill_Style;
     fBitfields.fTextEncoding = kUTF8_TextEncoding;
     fBitfields.fHinting      = SkPaintDefaults_Hinting;
-
-    fDirtyBits    = 0;
-#ifdef SK_BUILD_FOR_ANDROID
-    new (&fPaintOptionsAndroid) SkPaintOptionsAndroid;
-    fGenerationID = 0;
-#endif
 }
 
 SkPaint::SkPaint(const SkPaint& src) {
@@ -128,12 +92,6 @@ SkPaint::SkPaint(const SkPaint& src) {
     COPY(fWidth);
     COPY(fMiterLimit);
     COPY(fBitfields);
-    COPY(fDirtyBits);
-
-#ifdef SK_BUILD_FOR_ANDROID
-    new (&fPaintOptionsAndroid) SkPaintOptionsAndroid(src.fPaintOptionsAndroid);
-    COPY(fGenerationID);
-#endif
 
 #undef COPY
 #undef REF_COPY
@@ -160,8 +118,6 @@ SkPaint& SkPaint::operator=(const SkPaint& src) {
 #define COPY(field) field = src.field
 #define REF_COPY(field) SkSafeUnref(field); field = SkSafeRef(src.field)
 
-    SkASSERT(&src);
-
     REF_COPY(fTypeface);
     REF_COPY(fPathEffect);
     REF_COPY(fShader);
@@ -180,13 +136,6 @@ SkPaint& SkPaint::operator=(const SkPaint& src) {
     COPY(fWidth);
     COPY(fMiterLimit);
     COPY(fBitfields);
-    COPY(fDirtyBits);
-
-#ifdef SK_BUILD_FOR_ANDROID
-    fPaintOptionsAndroid.~SkPaintOptionsAndroid();
-    new (&fPaintOptionsAndroid) SkPaintOptionsAndroid(src.fPaintOptionsAndroid);
-    ++fGenerationID;
-#endif
 
     return *this;
 
@@ -196,7 +145,6 @@ SkPaint& SkPaint::operator=(const SkPaint& src) {
 
 bool operator==(const SkPaint& a, const SkPaint& b) {
 #define EQUAL(field) (a.field == b.field)
-    // Don't check fGenerationID or fDirtyBits, which can be different for logically equal paints.
     return EQUAL(fTypeface)
         && EQUAL(fPathEffect)
         && EQUAL(fShader)
@@ -214,61 +162,24 @@ bool operator==(const SkPaint& a, const SkPaint& b) {
         && EQUAL(fWidth)
         && EQUAL(fMiterLimit)
         && EQUAL(fBitfieldsUInt)
-#ifdef SK_BUILD_FOR_ANDROID
-        && EQUAL(fPaintOptionsAndroid)
-#endif
         ;
 #undef EQUAL
 }
 
 void SkPaint::reset() {
     SkPaint init;
-
-#ifdef SK_BUILD_FOR_ANDROID
-    uint32_t oldGenerationID = fGenerationID;
-#endif
     *this = init;
-#ifdef SK_BUILD_FOR_ANDROID
-    fGenerationID = oldGenerationID + 1;
-#endif
 }
 
-#ifdef SK_BUILD_FOR_ANDROID
-uint32_t SkPaint::getGenerationID() const {
-    return fGenerationID;
-}
-
-void SkPaint::setGenerationID(uint32_t generationID) {
-    fGenerationID = generationID;
-}
-
-unsigned SkPaint::getBaseGlyphCount(SkUnichar text) const {
-    SkAutoGlyphCache autoCache(*this, NULL, NULL);
-    SkGlyphCache* cache = autoCache.getCache();
-    return cache->getBaseGlyphCount(text);
-}
-
-void SkPaint::setPaintOptionsAndroid(const SkPaintOptionsAndroid& options) {
-    if (options != fPaintOptionsAndroid) {
-        fPaintOptionsAndroid = options;
-        GEN_ID_INC;
-        fDirtyBits |= kPaintOptionsAndroid_DirtyBit;
-    }
-}
-#endif
-
-void SkPaint::setFilterLevel(FilterLevel level) {
-    GEN_ID_INC_EVAL((unsigned) level != fBitfields.fFilterLevel);
-    fBitfields.fFilterLevel = level;
+void SkPaint::setFilterQuality(SkFilterQuality quality) {
+    fBitfields.fFilterQuality = quality;
 }
 
 void SkPaint::setHinting(Hinting hintingLevel) {
-    GEN_ID_INC_EVAL((unsigned) hintingLevel != fBitfields.fHinting);
     fBitfields.fHinting = hintingLevel;
 }
 
 void SkPaint::setFlags(uint32_t flags) {
-    GEN_ID_INC_EVAL(flags != fBitfields.fFlags);
     fBitfields.fFlags = flags;
 }
 
@@ -320,13 +231,8 @@ void SkPaint::setDevKernText(bool doDevKern) {
     this->setFlags(SkSetClearMask(fBitfields.fFlags, doDevKern, kDevKernText_Flag));
 }
 
-void SkPaint::setDistanceFieldTextTEMP(bool doDistanceFieldText) {
-    this->setFlags(SkSetClearMask(fBitfields.fFlags, doDistanceFieldText, kDistanceFieldTextTEMP_Flag));
-}
-
 void SkPaint::setStyle(Style style) {
     if ((unsigned)style < kStyleCount) {
-        GEN_ID_INC_EVAL((unsigned)style != fBitfields.fStyle);
         fBitfields.fStyle = style;
     } else {
 #ifdef SK_REPORT_API_RANGE_CHECK
@@ -336,9 +242,7 @@ void SkPaint::setStyle(Style style) {
 }
 
 void SkPaint::setColor(SkColor color) {
-    GEN_ID_INC_EVAL(color != fColor);
     fColor = color;
-    fDirtyBits |= kColor_DirtyBit;
 }
 
 void SkPaint::setAlpha(U8CPU a) {
@@ -352,9 +256,7 @@ void SkPaint::setARGB(U8CPU a, U8CPU r, U8CPU g, U8CPU b) {
 
 void SkPaint::setStrokeWidth(SkScalar width) {
     if (width >= 0) {
-        GEN_ID_INC_EVAL(width != fWidth);
         fWidth = width;
-        fDirtyBits |= kStrokeWidth_DirtyBit;
     } else {
 #ifdef SK_REPORT_API_RANGE_CHECK
         SkDebugf("SkPaint::setStrokeWidth() called with negative value\n");
@@ -364,9 +266,7 @@ void SkPaint::setStrokeWidth(SkScalar width) {
 
 void SkPaint::setStrokeMiter(SkScalar limit) {
     if (limit >= 0) {
-        GEN_ID_INC_EVAL(limit != fMiterLimit);
         fMiterLimit = limit;
-        fDirtyBits |= kStrokeMiter_DirtyBit;
     } else {
 #ifdef SK_REPORT_API_RANGE_CHECK
         SkDebugf("SkPaint::setStrokeMiter() called with negative value\n");
@@ -376,7 +276,6 @@ void SkPaint::setStrokeMiter(SkScalar limit) {
 
 void SkPaint::setStrokeCap(Cap ct) {
     if ((unsigned)ct < kCapCount) {
-        GEN_ID_INC_EVAL((unsigned)ct != fBitfields.fCapType);
         fBitfields.fCapType = SkToU8(ct);
     } else {
 #ifdef SK_REPORT_API_RANGE_CHECK
@@ -387,7 +286,6 @@ void SkPaint::setStrokeCap(Cap ct) {
 
 void SkPaint::setStrokeJoin(Join jt) {
     if ((unsigned)jt < kJoinCount) {
-        GEN_ID_INC_EVAL((unsigned)jt != fBitfields.fJoinType);
         fBitfields.fJoinType = SkToU8(jt);
     } else {
 #ifdef SK_REPORT_API_RANGE_CHECK
@@ -400,7 +298,6 @@ void SkPaint::setStrokeJoin(Join jt) {
 
 void SkPaint::setTextAlign(Align align) {
     if ((unsigned)align < kAlignCount) {
-        GEN_ID_INC_EVAL((unsigned)align != fBitfields.fTextAlign);
         fBitfields.fTextAlign = SkToU8(align);
     } else {
 #ifdef SK_REPORT_API_RANGE_CHECK
@@ -411,9 +308,7 @@ void SkPaint::setTextAlign(Align align) {
 
 void SkPaint::setTextSize(SkScalar ts) {
     if (ts >= 0) {
-        GEN_ID_INC_EVAL(ts != fTextSize);
         fTextSize = ts;
-        fDirtyBits |= kTextSize_DirtyBit;
     } else {
 #ifdef SK_REPORT_API_RANGE_CHECK
         SkDebugf("SkPaint::setTextSize() called with negative value\n");
@@ -422,20 +317,15 @@ void SkPaint::setTextSize(SkScalar ts) {
 }
 
 void SkPaint::setTextScaleX(SkScalar scaleX) {
-    GEN_ID_INC_EVAL(scaleX != fTextScaleX);
     fTextScaleX = scaleX;
-    fDirtyBits |= kTextScaleX_DirtyBit;
 }
 
 void SkPaint::setTextSkewX(SkScalar skewX) {
-    GEN_ID_INC_EVAL(skewX != fTextSkewX);
     fTextSkewX = skewX;
-    fDirtyBits |= kTextSkewX_DirtyBit;
 }
 
 void SkPaint::setTextEncoding(TextEncoding encoding) {
     if ((unsigned)encoding <= kGlyphID_TextEncoding) {
-        GEN_ID_INC_EVAL((unsigned)encoding != fBitfields.fTextEncoding);
         fBitfields.fTextEncoding = encoding;
     } else {
 #ifdef SK_REPORT_API_RANGE_CHECK
@@ -446,43 +336,28 @@ void SkPaint::setTextEncoding(TextEncoding encoding) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-// Returns dst with the given bitmask enabled or disabled, depending on value.
-inline static uint32_t set_mask(uint32_t dst, uint32_t bitmask, bool value) {
-    return value ? (dst | bitmask) : (dst & ~bitmask);
-}
-
 SkTypeface* SkPaint::setTypeface(SkTypeface* font) {
     SkRefCnt_SafeAssign(fTypeface, font);
-    GEN_ID_INC;
-    fDirtyBits = set_mask(fDirtyBits, kTypeface_DirtyBit, font != NULL);
     return font;
 }
 
 SkRasterizer* SkPaint::setRasterizer(SkRasterizer* r) {
     SkRefCnt_SafeAssign(fRasterizer, r);
-    GEN_ID_INC;
-    fDirtyBits = set_mask(fDirtyBits, kRasterizer_DirtyBit, r != NULL);
     return r;
 }
 
 SkDrawLooper* SkPaint::setLooper(SkDrawLooper* looper) {
     SkRefCnt_SafeAssign(fLooper, looper);
-    GEN_ID_INC;
-    fDirtyBits = set_mask(fDirtyBits, kLooper_DirtyBit, looper != NULL);
     return looper;
 }
 
 SkImageFilter* SkPaint::setImageFilter(SkImageFilter* imageFilter) {
     SkRefCnt_SafeAssign(fImageFilter, imageFilter);
-    GEN_ID_INC;
-    fDirtyBits = set_mask(fDirtyBits, kImageFilter_DirtyBit, imageFilter != NULL);
     return imageFilter;
 }
 
 SkAnnotation* SkPaint::setAnnotation(SkAnnotation* annotation) {
     SkRefCnt_SafeAssign(fAnnotation, annotation);
-    GEN_ID_INC;
-    fDirtyBits = set_mask(fDirtyBits, kAnnotation_DirtyBit, annotation != NULL);
     return annotation;
 }
 
@@ -524,9 +399,9 @@ int SkPaint::textToGlyphs(const void* textData, size_t byteLength,
         return 0;
     }
 
-    SkASSERT(textData != NULL);
+    SkASSERT(textData != nullptr);
 
-    if (NULL == glyphs) {
+    if (nullptr == glyphs) {
         switch (this->getTextEncoding()) {
         case kUTF8_TextEncoding:
             return SkUTF8_CountUnichars((const char*)textData, byteLength);
@@ -551,7 +426,7 @@ int SkPaint::textToGlyphs(const void* textData, size_t byteLength,
         return SkToInt(byteLength >> 1);
     }
 
-    SkAutoGlyphCache autoCache(*this, NULL, NULL);
+    SkAutoGlyphCache autoCache(*this, nullptr, nullptr);
     SkGlyphCache*    cache = autoCache.getCache();
 
     const char* text = (const char*)textData;
@@ -591,7 +466,7 @@ bool SkPaint::containsText(const void* textData, size_t byteLength) const {
         return true;
     }
 
-    SkASSERT(textData != NULL);
+    SkASSERT(textData != nullptr);
 
     // handle this encoding before the setup for the glyphcache
     if (this->getTextEncoding() == kGlyphID_TextEncoding) {
@@ -605,7 +480,7 @@ bool SkPaint::containsText(const void* textData, size_t byteLength) const {
         return true;
     }
 
-    SkAutoGlyphCache autoCache(*this, NULL, NULL);
+    SkAutoGlyphCache autoCache(*this, nullptr, nullptr);
     SkGlyphCache*    cache = autoCache.getCache();
 
     switch (this->getTextEncoding()) {
@@ -646,16 +521,16 @@ bool SkPaint::containsText(const void* textData, size_t byteLength) const {
     return true;
 }
 
-void SkPaint::glyphsToUnichars(const uint16_t glyphs[], int count,
-                               SkUnichar textData[]) const {
+void SkPaint::glyphsToUnichars(const uint16_t glyphs[], int count, SkUnichar textData[]) const {
     if (count <= 0) {
         return;
     }
 
-    SkASSERT(glyphs != NULL);
-    SkASSERT(textData != NULL);
+    SkASSERT(glyphs != nullptr);
+    SkASSERT(textData != nullptr);
 
-    SkAutoGlyphCache autoCache(*this, NULL, NULL);
+    SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
+    SkAutoGlyphCache autoCache(*this, &props, nullptr);
     SkGlyphCache*    cache = autoCache.getCache();
 
     for (int index = 0; index < count; index++) {
@@ -667,40 +542,24 @@ void SkPaint::glyphsToUnichars(const uint16_t glyphs[], int count,
 
 static const SkGlyph& sk_getMetrics_utf8_next(SkGlyphCache* cache,
                                               const char** text) {
-    SkASSERT(cache != NULL);
-    SkASSERT(text != NULL);
+    SkASSERT(cache != nullptr);
+    SkASSERT(text != nullptr);
 
     return cache->getUnicharMetrics(SkUTF8_NextUnichar(text));
 }
 
-static const SkGlyph& sk_getMetrics_utf8_prev(SkGlyphCache* cache,
-                                              const char** text) {
-    SkASSERT(cache != NULL);
-    SkASSERT(text != NULL);
-
-    return cache->getUnicharMetrics(SkUTF8_PrevUnichar(text));
-}
-
 static const SkGlyph& sk_getMetrics_utf16_next(SkGlyphCache* cache,
                                                const char** text) {
-    SkASSERT(cache != NULL);
-    SkASSERT(text != NULL);
+    SkASSERT(cache != nullptr);
+    SkASSERT(text != nullptr);
 
     return cache->getUnicharMetrics(SkUTF16_NextUnichar((const uint16_t**)text));
 }
 
-static const SkGlyph& sk_getMetrics_utf16_prev(SkGlyphCache* cache,
-                                               const char** text) {
-    SkASSERT(cache != NULL);
-    SkASSERT(text != NULL);
-
-    return cache->getUnicharMetrics(SkUTF16_PrevUnichar((const uint16_t**)text));
-}
-
 static const SkGlyph& sk_getMetrics_utf32_next(SkGlyphCache* cache,
                                                const char** text) {
-    SkASSERT(cache != NULL);
-    SkASSERT(text != NULL);
+    SkASSERT(cache != nullptr);
+    SkASSERT(text != nullptr);
 
     const int32_t* ptr = *(const int32_t**)text;
     SkUnichar uni = *ptr++;
@@ -708,21 +567,10 @@ static const SkGlyph& sk_getMetrics_utf32_next(SkGlyphCache* cache,
     return cache->getUnicharMetrics(uni);
 }
 
-static const SkGlyph& sk_getMetrics_utf32_prev(SkGlyphCache* cache,
-                                               const char** text) {
-    SkASSERT(cache != NULL);
-    SkASSERT(text != NULL);
-
-    const int32_t* ptr = *(const int32_t**)text;
-    SkUnichar uni = *--ptr;
-    *text = (const char*)ptr;
-    return cache->getUnicharMetrics(uni);
-}
-
 static const SkGlyph& sk_getMetrics_glyph_next(SkGlyphCache* cache,
                                                const char** text) {
-    SkASSERT(cache != NULL);
-    SkASSERT(text != NULL);
+    SkASSERT(cache != nullptr);
+    SkASSERT(text != nullptr);
 
     const uint16_t* ptr = *(const uint16_t**)text;
     unsigned glyphID = *ptr;
@@ -731,54 +579,26 @@ static const SkGlyph& sk_getMetrics_glyph_next(SkGlyphCache* cache,
     return cache->getGlyphIDMetrics(glyphID);
 }
 
-static const SkGlyph& sk_getMetrics_glyph_prev(SkGlyphCache* cache,
-                                               const char** text) {
-    SkASSERT(cache != NULL);
-    SkASSERT(text != NULL);
-
-    const uint16_t* ptr = *(const uint16_t**)text;
-    ptr -= 1;
-    unsigned glyphID = *ptr;
-    *text = (const char*)ptr;
-    return cache->getGlyphIDMetrics(glyphID);
-}
-
 static const SkGlyph& sk_getAdvance_utf8_next(SkGlyphCache* cache,
                                               const char** text) {
-    SkASSERT(cache != NULL);
-    SkASSERT(text != NULL);
+    SkASSERT(cache != nullptr);
+    SkASSERT(text != nullptr);
 
     return cache->getUnicharAdvance(SkUTF8_NextUnichar(text));
 }
 
-static const SkGlyph& sk_getAdvance_utf8_prev(SkGlyphCache* cache,
-                                              const char** text) {
-    SkASSERT(cache != NULL);
-    SkASSERT(text != NULL);
-
-    return cache->getUnicharAdvance(SkUTF8_PrevUnichar(text));
-}
-
 static const SkGlyph& sk_getAdvance_utf16_next(SkGlyphCache* cache,
                                                const char** text) {
-    SkASSERT(cache != NULL);
-    SkASSERT(text != NULL);
+    SkASSERT(cache != nullptr);
+    SkASSERT(text != nullptr);
 
     return cache->getUnicharAdvance(SkUTF16_NextUnichar((const uint16_t**)text));
 }
 
-static const SkGlyph& sk_getAdvance_utf16_prev(SkGlyphCache* cache,
-                                               const char** text) {
-    SkASSERT(cache != NULL);
-    SkASSERT(text != NULL);
-
-    return cache->getUnicharAdvance(SkUTF16_PrevUnichar((const uint16_t**)text));
-}
-
 static const SkGlyph& sk_getAdvance_utf32_next(SkGlyphCache* cache,
                                                const char** text) {
-    SkASSERT(cache != NULL);
-    SkASSERT(text != NULL);
+    SkASSERT(cache != nullptr);
+    SkASSERT(text != nullptr);
 
     const int32_t* ptr = *(const int32_t**)text;
     SkUnichar uni = *ptr++;
@@ -786,21 +606,10 @@ static const SkGlyph& sk_getAdvance_utf32_next(SkGlyphCache* cache,
     return cache->getUnicharAdvance(uni);
 }
 
-static const SkGlyph& sk_getAdvance_utf32_prev(SkGlyphCache* cache,
-                                               const char** text) {
-    SkASSERT(cache != NULL);
-    SkASSERT(text != NULL);
-
-    const int32_t* ptr = *(const int32_t**)text;
-    SkUnichar uni = *--ptr;
-    *text = (const char*)ptr;
-    return cache->getUnicharAdvance(uni);
-}
-
 static const SkGlyph& sk_getAdvance_glyph_next(SkGlyphCache* cache,
                                                const char** text) {
-    SkASSERT(cache != NULL);
-    SkASSERT(text != NULL);
+    SkASSERT(cache != nullptr);
+    SkASSERT(text != nullptr);
 
     const uint16_t* ptr = *(const uint16_t**)text;
     unsigned glyphID = *ptr;
@@ -809,49 +618,23 @@ static const SkGlyph& sk_getAdvance_glyph_next(SkGlyphCache* cache,
     return cache->getGlyphIDAdvance(glyphID);
 }
 
-static const SkGlyph& sk_getAdvance_glyph_prev(SkGlyphCache* cache,
-                                               const char** text) {
-    SkASSERT(cache != NULL);
-    SkASSERT(text != NULL);
-
-    const uint16_t* ptr = *(const uint16_t**)text;
-    ptr -= 1;
-    unsigned glyphID = *ptr;
-    *text = (const char*)ptr;
-    return cache->getGlyphIDAdvance(glyphID);
-}
-
-SkMeasureCacheProc SkPaint::getMeasureCacheProc(TextBufferDirection tbd,
-                                                bool needFullMetrics) const {
+SkMeasureCacheProc SkPaint::getMeasureCacheProc(bool needFullMetrics) const {
     static const SkMeasureCacheProc gMeasureCacheProcs[] = {
         sk_getMetrics_utf8_next,
         sk_getMetrics_utf16_next,
         sk_getMetrics_utf32_next,
         sk_getMetrics_glyph_next,
 
-        sk_getMetrics_utf8_prev,
-        sk_getMetrics_utf16_prev,
-        sk_getMetrics_utf32_prev,
-        sk_getMetrics_glyph_prev,
-
         sk_getAdvance_utf8_next,
         sk_getAdvance_utf16_next,
         sk_getAdvance_utf32_next,
         sk_getAdvance_glyph_next,
-
-        sk_getAdvance_utf8_prev,
-        sk_getAdvance_utf16_prev,
-        sk_getAdvance_utf32_prev,
-        sk_getAdvance_glyph_prev
     };
 
     unsigned index = this->getTextEncoding();
 
-    if (kBackward_TextBufferDirection == tbd) {
-        index += 4;
-    }
     if (!needFullMetrics && !this->isDevKernText()) {
-        index += 8;
+        index += 4;
     }
 
     SkASSERT(index < SK_ARRAY_COUNT(gMeasureCacheProcs));
@@ -862,32 +645,32 @@ SkMeasureCacheProc SkPaint::getMeasureCacheProc(TextBufferDirection tbd,
 
 static const SkGlyph& sk_getMetrics_utf8_00(SkGlyphCache* cache,
                                         const char** text, SkFixed, SkFixed) {
-    SkASSERT(cache != NULL);
-    SkASSERT(text != NULL);
+    SkASSERT(cache != nullptr);
+    SkASSERT(text != nullptr);
 
     return cache->getUnicharMetrics(SkUTF8_NextUnichar(text));
 }
 
 static const SkGlyph& sk_getMetrics_utf8_xy(SkGlyphCache* cache,
                                     const char** text, SkFixed x, SkFixed y) {
-    SkASSERT(cache != NULL);
-    SkASSERT(text != NULL);
+    SkASSERT(cache != nullptr);
+    SkASSERT(text != nullptr);
 
     return cache->getUnicharMetrics(SkUTF8_NextUnichar(text), x, y);
 }
 
 static const SkGlyph& sk_getMetrics_utf16_00(SkGlyphCache* cache,
                                         const char** text, SkFixed, SkFixed) {
-    SkASSERT(cache != NULL);
-    SkASSERT(text != NULL);
+    SkASSERT(cache != nullptr);
+    SkASSERT(text != nullptr);
 
     return cache->getUnicharMetrics(SkUTF16_NextUnichar((const uint16_t**)text));
 }
 
 static const SkGlyph& sk_getMetrics_utf16_xy(SkGlyphCache* cache,
                                      const char** text, SkFixed x, SkFixed y) {
-    SkASSERT(cache != NULL);
-    SkASSERT(text != NULL);
+    SkASSERT(cache != nullptr);
+    SkASSERT(text != nullptr);
 
     return cache->getUnicharMetrics(SkUTF16_NextUnichar((const uint16_t**)text),
                                     x, y);
@@ -895,8 +678,8 @@ static const SkGlyph& sk_getMetrics_utf16_xy(SkGlyphCache* cache,
 
 static const SkGlyph& sk_getMetrics_utf32_00(SkGlyphCache* cache,
                                     const char** text, SkFixed, SkFixed) {
-    SkASSERT(cache != NULL);
-    SkASSERT(text != NULL);
+    SkASSERT(cache != nullptr);
+    SkASSERT(text != nullptr);
 
     const int32_t* ptr = *(const int32_t**)text;
     SkUnichar uni = *ptr++;
@@ -906,8 +689,8 @@ static const SkGlyph& sk_getMetrics_utf32_00(SkGlyphCache* cache,
 
 static const SkGlyph& sk_getMetrics_utf32_xy(SkGlyphCache* cache,
                                     const char** text, SkFixed x, SkFixed y) {
-    SkASSERT(cache != NULL);
-    SkASSERT(text != NULL);
+    SkASSERT(cache != nullptr);
+    SkASSERT(text != nullptr);
 
     const int32_t* ptr = *(const int32_t**)text;
     SkUnichar uni = *ptr++;
@@ -917,8 +700,8 @@ static const SkGlyph& sk_getMetrics_utf32_xy(SkGlyphCache* cache,
 
 static const SkGlyph& sk_getMetrics_glyph_00(SkGlyphCache* cache,
                                          const char** text, SkFixed, SkFixed) {
-    SkASSERT(cache != NULL);
-    SkASSERT(text != NULL);
+    SkASSERT(cache != nullptr);
+    SkASSERT(text != nullptr);
 
     const uint16_t* ptr = *(const uint16_t**)text;
     unsigned glyphID = *ptr;
@@ -929,8 +712,8 @@ static const SkGlyph& sk_getMetrics_glyph_00(SkGlyphCache* cache,
 
 static const SkGlyph& sk_getMetrics_glyph_xy(SkGlyphCache* cache,
                                      const char** text, SkFixed x, SkFixed y) {
-    SkASSERT(cache != NULL);
-    SkASSERT(text != NULL);
+    SkASSERT(cache != nullptr);
+    SkASSERT(text != nullptr);
 
     const uint16_t* ptr = *(const uint16_t**)text;
     unsigned glyphID = *ptr;
@@ -1017,14 +800,6 @@ static void set_bounds(const SkGlyph& g, SkRect* bounds) {
                 SkIntToScalar(g.fTop + g.fHeight));
 }
 
-// 64bits wide, with a 16bit bias. Useful when accumulating lots of 16.16 so
-// we don't overflow along the way
-typedef int64_t Sk48Dot16;
-
-static inline float Sk48Dot16ToScalar(Sk48Dot16 x) {
-    return (float) (x * 1.5258789e-5);   // x * (1 / 65536.0f)
-}
-
 static void join_bounds_x(const SkGlyph& g, SkRect* bounds, Sk48Dot16 dx) {
     SkScalar sx = Sk48Dot16ToScalar(dx);
     bounds->join(SkIntToScalar(g.fLeft) + sx,
@@ -1061,9 +836,7 @@ SkScalar SkPaint::measure_text(SkGlyphCache* cache,
         return 0;
     }
 
-    SkMeasureCacheProc glyphCacheProc;
-    glyphCacheProc = this->getMeasureCacheProc(kForward_TextBufferDirection,
-                                               NULL != bounds);
+    SkMeasureCacheProc glyphCacheProc = this->getMeasureCacheProc(nullptr != bounds);
 
     int xyIndex;
     JoinBoundsProc joinBoundsProc;
@@ -1085,7 +858,7 @@ SkScalar SkPaint::measure_text(SkGlyphCache* cache,
 
     SkAutoKern  autokern;
 
-    if (NULL == bounds) {
+    if (nullptr == bounds) {
         if (this->isDevKernText()) {
             int rsb;
             for (; text < stop; n++) {
@@ -1123,22 +896,15 @@ SkScalar SkPaint::measure_text(SkGlyphCache* cache,
     return Sk48Dot16ToScalar(x);
 }
 
-SkScalar SkPaint::measureText(const void* textData, size_t length,
-                              SkRect* bounds, SkScalar zoom) const {
+SkScalar SkPaint::measureText(const void* textData, size_t length, SkRect* bounds) const {
     const char* text = (const char*)textData;
-    SkASSERT(text != NULL || length == 0);
+    SkASSERT(text != nullptr || length == 0);
 
     SkCanonicalizePaint canon(*this);
     const SkPaint& paint = canon.getPaint();
     SkScalar scale = canon.getScale();
 
-    SkMatrix zoomMatrix, *zoomPtr = NULL;
-    if (zoom) {
-        zoomMatrix.setScale(zoom, zoom);
-        zoomPtr = &zoomMatrix;
-    }
-
-    SkAutoGlyphCache    autoCache(paint, NULL, zoomPtr);
+    SkAutoGlyphCache    autoCache(paint, nullptr, nullptr);
     SkGlyphCache*       cache = autoCache.getCache();
 
     SkScalar width = 0;
@@ -1163,33 +929,8 @@ SkScalar SkPaint::measureText(const void* textData, size_t length,
     return width;
 }
 
-typedef bool (*SkTextBufferPred)(const char* text, const char* stop);
-
-static bool forward_textBufferPred(const char* text, const char* stop) {
-    return text < stop;
-}
-
-static bool backward_textBufferPred(const char* text, const char* stop) {
-    return text > stop;
-}
-
-static SkTextBufferPred chooseTextBufferPred(SkPaint::TextBufferDirection tbd,
-                                             const char** text, size_t length,
-                                             const char** stop) {
-    if (SkPaint::kForward_TextBufferDirection == tbd) {
-        *stop = *text + length;
-        return forward_textBufferPred;
-    } else {
-        // text should point to the end of the buffer, and stop to the beginning
-        *stop = *text;
-        *text += length;
-        return backward_textBufferPred;
-    }
-}
-
 size_t SkPaint::breakText(const void* textD, size_t length, SkScalar maxWidth,
-                          SkScalar* measuredWidth,
-                          TextBufferDirection tbd) const {
+                          SkScalar* measuredWidth) const {
     if (0 == length || 0 >= maxWidth) {
         if (measuredWidth) {
             *measuredWidth = 0;
@@ -1204,8 +945,9 @@ size_t SkPaint::breakText(const void* textD, size_t length, SkScalar maxWidth,
         return length;
     }
 
-    SkASSERT(textD != NULL);
+    SkASSERT(textD != nullptr);
     const char* text = (const char*)textD;
+    const char* stop = text + length;
 
     SkCanonicalizePaint canon(*this);
     const SkPaint& paint = canon.getPaint();
@@ -1216,12 +958,10 @@ size_t SkPaint::breakText(const void* textD, size_t length, SkScalar maxWidth,
         maxWidth /= scale;
     }
 
-    SkAutoGlyphCache    autoCache(paint, NULL, NULL);
+    SkAutoGlyphCache    autoCache(paint, nullptr, nullptr);
     SkGlyphCache*       cache = autoCache.getCache();
 
-    SkMeasureCacheProc glyphCacheProc = paint.getMeasureCacheProc(tbd, false);
-    const char*      stop;
-    SkTextBufferPred pred = chooseTextBufferPred(tbd, &text, length, &stop);
+    SkMeasureCacheProc glyphCacheProc = paint.getMeasureCacheProc(false);
     const int        xyIndex = paint.isVerticalText() ? 1 : 0;
     // use 64bits for our accumulator, to avoid overflowing 16.16
     Sk48Dot16        max = SkScalarToFixed(maxWidth);
@@ -1231,7 +971,7 @@ size_t SkPaint::breakText(const void* textD, size_t length, SkScalar maxWidth,
 
     if (this->isDevKernText()) {
         int rsb = 0;
-        while (pred(text, stop)) {
+        while (text < stop) {
             const char* curr = text;
             const SkGlyph& g = glyphCacheProc(cache, &text);
             SkFixed x = SkAutoKern_AdjustF(rsb, g.fLsbDelta) + advance(g, xyIndex);
@@ -1243,7 +983,7 @@ size_t SkPaint::breakText(const void* textD, size_t length, SkScalar maxWidth,
             rsb = g.fRsbDelta;
         }
     } else {
-        while (pred(text, stop)) {
+        while (text < stop) {
             const char* curr = text;
             SkFixed x = advance(glyphCacheProc(cache, &text), xyIndex);
             if ((width += x) > max) {
@@ -1263,8 +1003,7 @@ size_t SkPaint::breakText(const void* textD, size_t length, SkScalar maxWidth,
     }
 
     // return the number of bytes measured
-    return (kForward_TextBufferDirection == tbd) ?
-                text - stop + length : stop - text + length;
+    return text - stop + length;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1284,18 +1023,18 @@ SkScalar SkPaint::getFontMetrics(FontMetrics* metrics, SkScalar zoom) const {
     const SkPaint& paint = canon.getPaint();
     SkScalar scale = canon.getScale();
 
-    SkMatrix zoomMatrix, *zoomPtr = NULL;
+    SkMatrix zoomMatrix, *zoomPtr = nullptr;
     if (zoom) {
         zoomMatrix.setScale(zoom, zoom);
         zoomPtr = &zoomMatrix;
     }
 
     FontMetrics storage;
-    if (NULL == metrics) {
+    if (nullptr == metrics) {
         metrics = &storage;
     }
 
-    paint.descriptorProc(NULL, zoomPtr, FontMetricsDescProc, metrics, true);
+    paint.descriptorProc(nullptr, zoomPtr, FontMetricsDescProc, metrics, true);
 
     if (scale) {
         metrics->fTop = SkScalarMul(metrics->fTop, scale);
@@ -1328,9 +1067,9 @@ int SkPaint::getTextWidths(const void* textData, size_t byteLength,
         return 0;
     }
 
-    SkASSERT(NULL != textData);
+    SkASSERT(textData);
 
-    if (NULL == widths && NULL == bounds) {
+    if (nullptr == widths && nullptr == bounds) {
         return this->countText(textData, byteLength);
     }
 
@@ -1338,11 +1077,10 @@ int SkPaint::getTextWidths(const void* textData, size_t byteLength,
     const SkPaint& paint = canon.getPaint();
     SkScalar scale = canon.getScale();
 
-    SkAutoGlyphCache    autoCache(paint, NULL, NULL);
+    SkAutoGlyphCache    autoCache(paint, nullptr, nullptr);
     SkGlyphCache*       cache = autoCache.getCache();
     SkMeasureCacheProc  glyphCacheProc;
-    glyphCacheProc = paint.getMeasureCacheProc(kForward_TextBufferDirection,
-                                               NULL != bounds);
+    glyphCacheProc = paint.getMeasureCacheProc(nullptr != bounds);
 
     const char* text = (const char*)textData;
     const char* stop = text + byteLength;
@@ -1431,10 +1169,10 @@ int SkPaint::getTextWidths(const void* textData, size_t byteLength,
 
 void SkPaint::getTextPath(const void* textData, size_t length,
                           SkScalar x, SkScalar y, SkPath* path) const {
-    SkASSERT(length == 0 || textData != NULL);
+    SkASSERT(length == 0 || textData != nullptr);
 
     const char* text = (const char*)textData;
-    if (text == NULL || length == 0 || path == NULL) {
+    if (text == nullptr || length == 0 || path == nullptr) {
         return;
     }
 
@@ -1459,10 +1197,10 @@ void SkPaint::getTextPath(const void* textData, size_t length,
 
 void SkPaint::getPosTextPath(const void* textData, size_t length,
                              const SkPoint pos[], SkPath* path) const {
-    SkASSERT(length == 0 || textData != NULL);
+    SkASSERT(length == 0 || textData != nullptr);
 
     const char* text = (const char*)textData;
-    if (text == NULL || length == 0 || path == NULL) {
+    if (text == nullptr || length == 0 || path == nullptr) {
         return;
     }
 
@@ -1476,7 +1214,7 @@ void SkPaint::getPosTextPath(const void* textData, size_t length,
 
     unsigned int    i = 0;
     const SkPath*   iterPath;
-    while (iter.next(&iterPath, NULL)) {
+    while (iter.next(&iterPath, nullptr)) {
         matrix.postTranslate(pos[i].fX - prevPos.fX, pos[i].fY - prevPos.fY);
         if (iterPath) {
             path->addPath(*iterPath, matrix);
@@ -1486,13 +1224,27 @@ void SkPaint::getPosTextPath(const void* textData, size_t length,
     }
 }
 
-static void add_flattenable(SkDescriptor* desc, uint32_t tag,
-                            SkWriteBuffer* buffer) {
-    buffer->writeToMemory(desc->addEntry(tag, buffer->bytesWritten(), NULL));
+SkRect SkPaint::getFontBounds() const {
+    SkMatrix m;
+    m.setScale(fTextSize * fTextScaleX, fTextSize);
+    m.postSkew(fTextSkewX, 0);
+
+    SkTypeface* typeface = this->getTypeface();
+    if (nullptr == typeface) {
+        typeface = SkTypeface::GetDefaultTypeface();
+    }
+
+    SkRect bounds;
+    m.mapRect(&bounds, typeface->getBounds());
+    return bounds;
 }
 
-// SkFontHost can override this choice in FilterRec()
-static SkMask::Format computeMaskFormat(const SkPaint& paint) {
+static void add_flattenable(SkDescriptor* desc, uint32_t tag,
+                            SkWriteBuffer* buffer) {
+    buffer->writeToMemory(desc->addEntry(tag, buffer->bytesWritten(), nullptr));
+}
+
+static SkMask::Format compute_mask_format(const SkPaint& paint) {
     uint32_t flags = paint.getFlags();
 
     // Antialiasing being disabled trumps all other settings.
@@ -1520,10 +1272,12 @@ static SkPaint::Hinting computeHinting(const SkPaint& paint) {
 // return true if the paint is just a single color (i.e. not a shader). If its
 // a shader, then we can't compute a const luminance for it :(
 static bool justAColor(const SkPaint& paint, SkColor* color) {
-    if (paint.getShader()) {
+    SkColor c = paint.getColor();
+
+    SkShader* shader = paint.getShader();
+    if (shader && !shader->asLuminanceColor(&c)) {
         return false;
     }
-    SkColor c = paint.getColor();
     if (paint.getColorFilter()) {
         c = paint.getColorFilter()->filterColor(c);
     }
@@ -1533,9 +1287,9 @@ static bool justAColor(const SkPaint& paint, SkColor* color) {
     return true;
 }
 
-static SkColor computeLuminanceColor(const SkPaint& paint) {
+SkColor SkPaint::computeLuminanceColor() const {
     SkColor c;
-    if (!justAColor(paint, &c)) {
+    if (!justAColor(*this, &c)) {
         c = SkColorSetRGB(0x7F, 0x80, 0x7F);
     }
     return c;
@@ -1549,11 +1303,17 @@ static SkColor computeLuminanceColor(const SkPaint& paint) {
     #define SK_MAX_SIZE_FOR_LCDTEXT    48
 #endif
 
-static bool tooBigForLCD(const SkScalerContext::Rec& rec) {
-    SkScalar area = rec.fPost2x2[0][0] * rec.fPost2x2[1][1] -
-                    rec.fPost2x2[1][0] * rec.fPost2x2[0][1];
-    SkScalar size = SkScalarSqrt(SkScalarAbs(area)) * rec.fTextSize;
-    return size > SkIntToScalar(SK_MAX_SIZE_FOR_LCDTEXT);
+const SkScalar gMaxSize2ForLCDText = SK_MAX_SIZE_FOR_LCDTEXT * SK_MAX_SIZE_FOR_LCDTEXT;
+
+static bool too_big_for_lcd(const SkScalerContext::Rec& rec, bool checkPost2x2) {
+    if (checkPost2x2) {
+        SkScalar area = rec.fPost2x2[0][0] * rec.fPost2x2[1][1] -
+                        rec.fPost2x2[1][0] * rec.fPost2x2[0][1];
+        area *= rec.fTextSize * rec.fTextSize;
+        return area > gMaxSize2ForLCDText;
+    } else {
+        return rec.fTextSize > SK_MAX_SIZE_FOR_LCDTEXT;
+    }
 }
 
 /*
@@ -1567,26 +1327,38 @@ static SkScalar sk_relax(SkScalar x) {
 }
 
 void SkScalerContext::MakeRec(const SkPaint& paint,
-                              const SkDeviceProperties* deviceProperties,
+                              const SkSurfaceProps* surfaceProps,
                               const SkMatrix* deviceMatrix,
                               Rec* rec) {
-    SkASSERT(deviceMatrix == NULL || !deviceMatrix->hasPerspective());
+    SkASSERT(deviceMatrix == nullptr || !deviceMatrix->hasPerspective());
 
     SkTypeface* typeface = paint.getTypeface();
-    if (NULL == typeface) {
+    if (nullptr == typeface) {
         typeface = SkTypeface::GetDefaultTypeface();
     }
-    rec->fOrigFontID = typeface->uniqueID();
-    rec->fFontID = rec->fOrigFontID;
+    rec->fFontID = typeface->uniqueID();
     rec->fTextSize = paint.getTextSize();
     rec->fPreScaleX = paint.getTextScaleX();
     rec->fPreSkewX  = paint.getTextSkewX();
 
+    bool checkPost2x2 = false;
+
     if (deviceMatrix) {
-        rec->fPost2x2[0][0] = sk_relax(deviceMatrix->getScaleX());
-        rec->fPost2x2[0][1] = sk_relax(deviceMatrix->getSkewX());
-        rec->fPost2x2[1][0] = sk_relax(deviceMatrix->getSkewY());
-        rec->fPost2x2[1][1] = sk_relax(deviceMatrix->getScaleY());
+        const SkMatrix::TypeMask mask = deviceMatrix->getType();
+        if (mask & SkMatrix::kScale_Mask) {
+            rec->fPost2x2[0][0] = sk_relax(deviceMatrix->getScaleX());
+            rec->fPost2x2[1][1] = sk_relax(deviceMatrix->getScaleY());
+            checkPost2x2 = true;
+        } else {
+            rec->fPost2x2[0][0] = rec->fPost2x2[1][1] = SK_Scalar1;
+        }
+        if (mask & SkMatrix::kAffine_Mask) {
+            rec->fPost2x2[0][1] = sk_relax(deviceMatrix->getSkewX());
+            rec->fPost2x2[1][0] = sk_relax(deviceMatrix->getSkewY());
+            checkPost2x2 = true;
+        } else {
+            rec->fPost2x2[0][1] = rec->fPost2x2[1][0] = 0;
+        }
     } else {
         rec->fPost2x2[0][0] = rec->fPost2x2[1][1] = SK_Scalar1;
         rec->fPost2x2[0][1] = rec->fPost2x2[1][0] = 0;
@@ -1634,21 +1406,35 @@ void SkScalerContext::MakeRec(const SkPaint& paint,
         rec->fStrokeJoin = 0;
     }
 
-    rec->fMaskFormat = SkToU8(computeMaskFormat(paint));
+    rec->fMaskFormat = SkToU8(compute_mask_format(paint));
 
-    SkDeviceProperties::Geometry geometry = deviceProperties
-                                          ? deviceProperties->fGeometry
-                                          : SkDeviceProperties::Geometry::MakeDefault();
-    if (SkMask::kLCD16_Format == rec->fMaskFormat || SkMask::kLCD32_Format == rec->fMaskFormat) {
-        if (!geometry.isOrientationKnown() || !geometry.isLayoutKnown() || tooBigForLCD(*rec)) {
-            // eeek, can't support LCD
+    if (SkMask::kLCD16_Format == rec->fMaskFormat) {
+        if (too_big_for_lcd(*rec, checkPost2x2)) {
             rec->fMaskFormat = SkMask::kA8_Format;
+            flags |= SkScalerContext::kGenA8FromLCD_Flag;
         } else {
-            if (SkDeviceProperties::Geometry::kVertical_Orientation == geometry.getOrientation()) {
-                flags |= SkScalerContext::kLCD_Vertical_Flag;
-            }
-            if (SkDeviceProperties::Geometry::kBGR_Layout == geometry.getLayout()) {
-                flags |= SkScalerContext::kLCD_BGROrder_Flag;
+            SkPixelGeometry geometry = surfaceProps
+                                     ? surfaceProps->pixelGeometry()
+                                     : SkSurfacePropsDefaultPixelGeometry();
+            switch (geometry) {
+                case kUnknown_SkPixelGeometry:
+                    // eeek, can't support LCD
+                    rec->fMaskFormat = SkMask::kA8_Format;
+                    flags |= SkScalerContext::kGenA8FromLCD_Flag;
+                    break;
+                case kRGB_H_SkPixelGeometry:
+                    // our default, do nothing.
+                    break;
+                case kBGR_H_SkPixelGeometry:
+                    flags |= SkScalerContext::kLCD_BGROrder_Flag;
+                    break;
+                case kRGB_V_SkPixelGeometry:
+                    flags |= SkScalerContext::kLCD_Vertical_Flag;
+                    break;
+                case kBGR_V_SkPixelGeometry:
+                    flags |= SkScalerContext::kLCD_Vertical_Flag;
+                    flags |= SkScalerContext::kLCD_BGROrder_Flag;
+                    break;
             }
         }
     }
@@ -1673,20 +1459,14 @@ void SkScalerContext::MakeRec(const SkPaint& paint,
     // these modify fFlags, so do them after assigning fFlags
     rec->setHinting(computeHinting(paint));
 
-    rec->setLuminanceColor(computeLuminanceColor(paint));
+    rec->setLuminanceColor(paint.computeLuminanceColor());
 
-    if (NULL == deviceProperties) {
-        rec->setDeviceGamma(SK_GAMMA_EXPONENT);
-        rec->setPaintGamma(SK_GAMMA_EXPONENT);
-    } else {
-        rec->setDeviceGamma(deviceProperties->fGamma);
-
-        //For now always set the paint gamma equal to the device gamma.
-        //The math in SkMaskGamma can handle them being different,
-        //but it requires superluminous masks when
-        //Ex : deviceGamma(x) < paintGamma(x) and x is sufficiently large.
-        rec->setPaintGamma(deviceProperties->fGamma);
-    }
+    //For now always set the paint gamma equal to the device gamma.
+    //The math in SkMaskGamma can handle them being different,
+    //but it requires superluminous masks when
+    //Ex : deviceGamma(x) < paintGamma(x) and x is sufficiently large.
+    rec->setDeviceGamma(SK_GAMMA_EXPONENT);
+    rec->setPaintGamma(SK_GAMMA_EXPONENT);
 
 #ifdef SK_GAMMA_CONTRAST
     rec->setContrast(SK_GAMMA_CONTRAST);
@@ -1719,8 +1499,8 @@ void SkScalerContext::MakeRec(const SkPaint& paint,
  */
 SK_DECLARE_STATIC_MUTEX(gMaskGammaCacheMutex);
 
-static SkMaskGamma* gLinearMaskGamma = NULL;
-static SkMaskGamma* gMaskGamma = NULL;
+static SkMaskGamma* gLinearMaskGamma = nullptr;
+static SkMaskGamma* gMaskGamma = nullptr;
 static SkScalar gContrast = SK_ScalarMin;
 static SkScalar gPaintGamma = SK_ScalarMin;
 static SkScalar gDeviceGamma = SK_ScalarMin;
@@ -1731,14 +1511,14 @@ static SkScalar gDeviceGamma = SK_ScalarMin;
 static const SkMaskGamma& cachedMaskGamma(SkScalar contrast, SkScalar paintGamma, SkScalar deviceGamma) {
     gMaskGammaCacheMutex.assertHeld();
     if (0 == contrast && SK_Scalar1 == paintGamma && SK_Scalar1 == deviceGamma) {
-        if (NULL == gLinearMaskGamma) {
-            gLinearMaskGamma = SkNEW(SkMaskGamma);
+        if (nullptr == gLinearMaskGamma) {
+            gLinearMaskGamma = new SkMaskGamma;
         }
         return *gLinearMaskGamma;
     }
     if (gContrast != contrast || gPaintGamma != paintGamma || gDeviceGamma != deviceGamma) {
         SkSafeUnref(gMaskGamma);
-        gMaskGamma = SkNEW_ARGS(SkMaskGamma, (contrast, paintGamma, deviceGamma));
+        gMaskGamma = new SkMaskGamma(contrast, paintGamma, deviceGamma);
         gContrast = contrast;
         gPaintGamma = paintGamma;
         gDeviceGamma = deviceGamma;
@@ -1746,18 +1526,6 @@ static const SkMaskGamma& cachedMaskGamma(SkScalar contrast, SkScalar paintGamma
     return *gMaskGamma;
 }
 
-/*static*/ void SkPaint::Term() {
-    SkAutoMutexAcquire ama(gMaskGammaCacheMutex);
-
-    SkSafeUnref(gLinearMaskGamma);
-    gLinearMaskGamma = NULL;
-    SkSafeUnref(gMaskGamma);
-    gMaskGamma = NULL;
-    SkDEBUGCODE(gContrast = SK_ScalarMin;)
-    SkDEBUGCODE(gPaintGamma = SK_ScalarMin;)
-    SkDEBUGCODE(gDeviceGamma = SK_ScalarMin;)
-}
-
 /**
  *  We ensure that the rec is self-consistent and efficient (where possible)
  */
@@ -1768,8 +1536,7 @@ void SkScalerContext::PostMakeRec(const SkPaint&, SkScalerContext::Rec* rec) {
      *  the lum of one of them.
      */
     switch (rec->fMaskFormat) {
-        case SkMask::kLCD16_Format:
-        case SkMask::kLCD32_Format: {
+        case SkMask::kLCD16_Format: {
             // filter down the luminance color to a finite number of bits
             SkColor color = rec->getLuminanceColor();
             rec->setLuminanceColor(SkMaskGamma::CanonicalColor(color));
@@ -1800,148 +1567,185 @@ void SkScalerContext::PostMakeRec(const SkPaint&, SkScalerContext::Rec* rec) {
     #define TEST_DESC
 #endif
 
+static void write_out_descriptor(SkDescriptor* desc, const SkScalerContext::Rec& rec,
+                                 const SkPathEffect* pe, SkWriteBuffer* peBuffer,
+                                 const SkMaskFilter* mf, SkWriteBuffer* mfBuffer,
+                                 const SkRasterizer* ra, SkWriteBuffer* raBuffer,
+                                 size_t descSize) {
+    desc->init();
+    desc->addEntry(kRec_SkDescriptorTag, sizeof(rec), &rec);
+
+    if (pe) {
+        add_flattenable(desc, kPathEffect_SkDescriptorTag, peBuffer);
+    }
+    if (mf) {
+        add_flattenable(desc, kMaskFilter_SkDescriptorTag, mfBuffer);
+    }
+    if (ra) {
+        add_flattenable(desc, kRasterizer_SkDescriptorTag, raBuffer);
+    }
+
+    desc->computeChecksum();
+}
+
+static size_t fill_out_rec(const SkPaint& paint, SkScalerContext::Rec* rec,
+                           const SkSurfaceProps* surfaceProps,
+                           const SkMatrix* deviceMatrix, bool ignoreGamma,
+                           const SkPathEffect* pe, SkWriteBuffer* peBuffer,
+                           const SkMaskFilter* mf, SkWriteBuffer* mfBuffer,
+                           const SkRasterizer* ra, SkWriteBuffer* raBuffer) {
+    SkScalerContext::MakeRec(paint, surfaceProps, deviceMatrix, rec);
+    if (ignoreGamma) {
+        rec->ignorePreBlend();
+    }
+
+    int entryCount = 1;
+    size_t descSize = sizeof(*rec);
+
+    if (pe) {
+        peBuffer->writeFlattenable(pe);
+        descSize += peBuffer->bytesWritten();
+        entryCount += 1;
+        rec->fMaskFormat = SkMask::kA8_Format;  // force antialiasing when we do the scan conversion
+        // seems like we could support kLCD as well at this point...
+    }
+    if (mf) {
+        mfBuffer->writeFlattenable(mf);
+        descSize += mfBuffer->bytesWritten();
+        entryCount += 1;
+        rec->fMaskFormat = SkMask::kA8_Format;   // force antialiasing with maskfilters
+        /* Pre-blend is not currently applied to filtered text.
+           The primary filter is blur, for which contrast makes no sense,
+           and for which the destination guess error is more visible.
+           Also, all existing users of blur have calibrated for linear. */
+        rec->ignorePreBlend();
+    }
+    if (ra) {
+        raBuffer->writeFlattenable(ra);
+        descSize += raBuffer->bytesWritten();
+        entryCount += 1;
+        rec->fMaskFormat = SkMask::kA8_Format;  // force antialiasing when we do the scan conversion
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Now that we're done tweaking the rec, call the PostMakeRec cleanup
+    SkScalerContext::PostMakeRec(paint, rec);
+
+    descSize += SkDescriptor::ComputeOverhead(entryCount);
+    return descSize;
+}
+
+#ifdef TEST_DESC
+static void test_desc(const SkScalerContext::Rec& rec,
+                      const SkPathEffect* pe, SkWriteBuffer* peBuffer,
+                      const SkMaskFilter* mf, SkWriteBuffer* mfBuffer,
+                      const SkRasterizer* ra, SkWriteBuffer* raBuffer,
+                      const SkDescriptor* desc, size_t descSize) {
+    // Check that we completely write the bytes in desc (our key), and that
+    // there are no uninitialized bytes. If there were, then we would get
+    // false-misses (or worse, false-hits) in our fontcache.
+    //
+    // We do this buy filling 2 others, one with 0s and the other with 1s
+    // and create those, and then check that all 3 are identical.
+    SkAutoDescriptor    ad1(descSize);
+    SkAutoDescriptor    ad2(descSize);
+    SkDescriptor*       desc1 = ad1.getDesc();
+    SkDescriptor*       desc2 = ad2.getDesc();
+
+    memset(desc1, 0x00, descSize);
+    memset(desc2, 0xFF, descSize);
+
+    desc1->init();
+    desc2->init();
+    desc1->addEntry(kRec_SkDescriptorTag, sizeof(rec), &rec);
+    desc2->addEntry(kRec_SkDescriptorTag, sizeof(rec), &rec);
+
+    if (pe) {
+        add_flattenable(desc1, kPathEffect_SkDescriptorTag, peBuffer);
+        add_flattenable(desc2, kPathEffect_SkDescriptorTag, peBuffer);
+    }
+    if (mf) {
+        add_flattenable(desc1, kMaskFilter_SkDescriptorTag, mfBuffer);
+        add_flattenable(desc2, kMaskFilter_SkDescriptorTag, mfBuffer);
+    }
+    if (ra) {
+        add_flattenable(desc1, kRasterizer_SkDescriptorTag, raBuffer);
+        add_flattenable(desc2, kRasterizer_SkDescriptorTag, raBuffer);
+    }
+
+    SkASSERT(descSize == desc1->getLength());
+    SkASSERT(descSize == desc2->getLength());
+    desc1->computeChecksum();
+    desc2->computeChecksum();
+    SkASSERT(!memcmp(desc, desc1, descSize));
+    SkASSERT(!memcmp(desc, desc2, descSize));
+}
+#endif
+
+/* see the note on ignoreGamma on descriptorProc */
+void SkPaint::getScalerContextDescriptor(SkAutoDescriptor* ad,
+                                         const SkSurfaceProps& surfaceProps,
+                                         const SkMatrix* deviceMatrix, bool ignoreGamma) const {
+    SkScalerContext::Rec    rec;
+
+    SkPathEffect*   pe = this->getPathEffect();
+    SkMaskFilter*   mf = this->getMaskFilter();
+    SkRasterizer*   ra = this->getRasterizer();
+
+    SkWriteBuffer   peBuffer, mfBuffer, raBuffer;
+    size_t descSize = fill_out_rec(*this, &rec, &surfaceProps, deviceMatrix, ignoreGamma,
+                                   pe, &peBuffer, mf, &mfBuffer, ra, &raBuffer);
+
+    ad->reset(descSize);
+    SkDescriptor* desc = ad->getDesc();
+
+    write_out_descriptor(desc, rec, pe, &peBuffer, mf, &mfBuffer, ra, &raBuffer, descSize);
+
+    SkASSERT(descSize == desc->getLength());
+
+#ifdef TEST_DESC
+    test_desc(rec, pe, &peBuffer, mf, &mfBuffer, ra, &raBuffer, desc, descSize);
+#endif
+}
+
 /*
  *  ignoreGamma tells us that the caller just wants metrics that are unaffected
  *  by gamma correction, so we set the rec to ignore preblend: i.e. gamma = 1,
  *  contrast = 0, luminanceColor = transparent black.
  */
-void SkPaint::descriptorProc(const SkDeviceProperties* deviceProperties,
+void SkPaint::descriptorProc(const SkSurfaceProps* surfaceProps,
                              const SkMatrix* deviceMatrix,
                              void (*proc)(SkTypeface*, const SkDescriptor*, void*),
                              void* context, bool ignoreGamma) const {
     SkScalerContext::Rec    rec;
 
-    SkScalerContext::MakeRec(*this, deviceProperties, deviceMatrix, &rec);
-    if (ignoreGamma) {
-        rec.ignorePreBlend();
-    }
-
-    size_t          descSize = sizeof(rec);
-    int             entryCount = 1;
     SkPathEffect*   pe = this->getPathEffect();
     SkMaskFilter*   mf = this->getMaskFilter();
     SkRasterizer*   ra = this->getRasterizer();
 
-    SkWriteBuffer    peBuffer, mfBuffer, raBuffer;
-
-    if (pe) {
-        peBuffer.writeFlattenable(pe);
-        descSize += peBuffer.bytesWritten();
-        entryCount += 1;
-        rec.fMaskFormat = SkMask::kA8_Format;   // force antialiasing when we do the scan conversion
-        // seems like we could support kLCD as well at this point...
-    }
-    if (mf) {
-        mfBuffer.writeFlattenable(mf);
-        descSize += mfBuffer.bytesWritten();
-        entryCount += 1;
-        rec.fMaskFormat = SkMask::kA8_Format;   // force antialiasing with maskfilters
-        /* Pre-blend is not currently applied to filtered text.
-           The primary filter is blur, for which contrast makes no sense,
-           and for which the destination guess error is more visible.
-           Also, all existing users of blur have calibrated for linear. */
-        rec.ignorePreBlend();
-    }
-    if (ra) {
-        raBuffer.writeFlattenable(ra);
-        descSize += raBuffer.bytesWritten();
-        entryCount += 1;
-        rec.fMaskFormat = SkMask::kA8_Format;   // force antialiasing when we do the scan conversion
-    }
-
-#ifdef SK_BUILD_FOR_ANDROID
-    char buffer[128];
-    SkWriteBuffer androidBuffer(buffer, sizeof(buffer));
-    fPaintOptionsAndroid.flatten(androidBuffer);
-    descSize += androidBuffer.bytesWritten();
-    entryCount += 1;
-#endif
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Now that we're done tweaking the rec, call the PostMakeRec cleanup
-    SkScalerContext::PostMakeRec(*this, &rec);
-
-    descSize += SkDescriptor::ComputeOverhead(entryCount);
+    SkWriteBuffer   peBuffer, mfBuffer, raBuffer;
+    size_t descSize = fill_out_rec(*this, &rec, surfaceProps, deviceMatrix, ignoreGamma,
+                                   pe, &peBuffer, mf, &mfBuffer, ra, &raBuffer);
 
     SkAutoDescriptor    ad(descSize);
     SkDescriptor*       desc = ad.getDesc();
 
-    desc->init();
-    desc->addEntry(kRec_SkDescriptorTag, sizeof(rec), &rec);
-
-#ifdef SK_BUILD_FOR_ANDROID
-    add_flattenable(desc, kAndroidOpts_SkDescriptorTag, &androidBuffer);
-#endif
-
-    if (pe) {
-        add_flattenable(desc, kPathEffect_SkDescriptorTag, &peBuffer);
-    }
-    if (mf) {
-        add_flattenable(desc, kMaskFilter_SkDescriptorTag, &mfBuffer);
-    }
-    if (ra) {
-        add_flattenable(desc, kRasterizer_SkDescriptorTag, &raBuffer);
-    }
+    write_out_descriptor(desc, rec, pe, &peBuffer, mf, &mfBuffer, ra, &raBuffer, descSize);
 
     SkASSERT(descSize == desc->getLength());
-    desc->computeChecksum();
 
 #ifdef TEST_DESC
-    {
-        // Check that we completely write the bytes in desc (our key), and that
-        // there are no uninitialized bytes. If there were, then we would get
-        // false-misses (or worse, false-hits) in our fontcache.
-        //
-        // We do this buy filling 2 others, one with 0s and the other with 1s
-        // and create those, and then check that all 3 are identical.
-        SkAutoDescriptor    ad1(descSize);
-        SkAutoDescriptor    ad2(descSize);
-        SkDescriptor*       desc1 = ad1.getDesc();
-        SkDescriptor*       desc2 = ad2.getDesc();
-
-        memset(desc1, 0x00, descSize);
-        memset(desc2, 0xFF, descSize);
-
-        desc1->init();
-        desc2->init();
-        desc1->addEntry(kRec_SkDescriptorTag, sizeof(rec), &rec);
-        desc2->addEntry(kRec_SkDescriptorTag, sizeof(rec), &rec);
-
-#ifdef SK_BUILD_FOR_ANDROID
-        add_flattenable(desc1, kAndroidOpts_SkDescriptorTag, &androidBuffer);
-        add_flattenable(desc2, kAndroidOpts_SkDescriptorTag, &androidBuffer);
-#endif
-
-        if (pe) {
-            add_flattenable(desc1, kPathEffect_SkDescriptorTag, &peBuffer);
-            add_flattenable(desc2, kPathEffect_SkDescriptorTag, &peBuffer);
-        }
-        if (mf) {
-            add_flattenable(desc1, kMaskFilter_SkDescriptorTag, &mfBuffer);
-            add_flattenable(desc2, kMaskFilter_SkDescriptorTag, &mfBuffer);
-        }
-        if (ra) {
-            add_flattenable(desc1, kRasterizer_SkDescriptorTag, &raBuffer);
-            add_flattenable(desc2, kRasterizer_SkDescriptorTag, &raBuffer);
-        }
-
-        SkASSERT(descSize == desc1->getLength());
-        SkASSERT(descSize == desc2->getLength());
-        desc1->computeChecksum();
-        desc2->computeChecksum();
-        SkASSERT(!memcmp(desc, desc1, descSize));
-        SkASSERT(!memcmp(desc, desc2, descSize));
-    }
+    test_desc(rec, pe, &peBuffer, mf, &mfBuffer, ra, &raBuffer, desc, descSize);
 #endif
 
     proc(fTypeface, desc, context);
 }
 
-SkGlyphCache* SkPaint::detachCache(const SkDeviceProperties* deviceProperties,
+SkGlyphCache* SkPaint::detachCache(const SkSurfaceProps* surfaceProps,
                                    const SkMatrix* deviceMatrix,
                                    bool ignoreGamma) const {
     SkGlyphCache* cache;
-    this->descriptorProc(deviceProperties, deviceMatrix, DetachDescProc, &cache, ignoreGamma);
+    this->descriptorProc(surfaceProps, deviceMatrix, DetachDescProc, &cache, ignoreGamma);
     return cache;
 }
 
@@ -2032,11 +1836,10 @@ static uint32_t pack_4(unsigned a, unsigned b, unsigned c, unsigned d) {
 #endif
 
 enum FlatFlags {
-    kHasTypeface_FlatFlag                      = 0x01,
-    kHasEffects_FlatFlag                       = 0x02,
-    kHasNonDefaultPaintOptionsAndroid_FlatFlag = 0x04,
+    kHasTypeface_FlatFlag = 0x1,
+    kHasEffects_FlatFlag  = 0x2,
 
-    kFlatFlagMask = 0x7,
+    kFlatFlagMask         = 0x3,
 };
 
 enum BitsPerField {
@@ -2068,38 +1871,7 @@ static FlatFlags unpack_paint_flags(SkPaint* paint, uint32_t packed) {
     paint->setFlags(packed >> 16);
     paint->setHinting((SkPaint::Hinting)((packed >> 14) & BPF_Mask(kHint_BPF)));
     paint->setTextAlign((SkPaint::Align)((packed >> 12) & BPF_Mask(kAlign_BPF)));
-    paint->setFilterLevel((SkPaint::FilterLevel)((packed >> 10) & BPF_Mask(kFilter_BPF)));
-    return (FlatFlags)(packed & kFlatFlagMask);
-}
-
-// V22_COMPATIBILITY_CODE
-static FlatFlags unpack_paint_flags_v22(SkPaint* paint, uint32_t packed) {
-    enum {
-        kFilterBitmap_Flag    = 0x02,
-        kHighQualityFilterBitmap_Flag = 0x4000,
-
-        kAll_Flags = kFilterBitmap_Flag | kHighQualityFilterBitmap_Flag
-    };
-
-    // previously flags:16, textAlign:8, flatFlags:8
-    // now flags:16, hinting:4, textAlign:4, flatFlags:8
-    unsigned flags = packed >> 16;
-    int filter = 0;
-    if (flags & kFilterBitmap_Flag) {
-        filter |= 1;
-    }
-    if (flags & kHighQualityFilterBitmap_Flag) {
-        filter |= 2;
-    }
-    paint->setFilterLevel((SkPaint::FilterLevel)filter);
-    flags &= ~kAll_Flags;   // remove these (now dead) bit flags
-
-    paint->setFlags(flags);
-
-    // hinting added later. 0 in this nibble means use the default.
-    uint32_t hinting = (packed >> 12) & 0xF;
-    paint->setHinting(0 == hinting ? SkPaint::kNormal_Hinting : static_cast<SkPaint::Hinting>(hinting-1));
-    paint->setTextAlign(static_cast<SkPaint::Align>((packed >> 8) & 0xF));
+    paint->setFilterQuality((SkFilterQuality)((packed >> 10) & BPF_Mask(kFilter_BPF)));
     return (FlatFlags)(packed & kFlatFlagMask);
 }
 
@@ -2128,11 +1900,6 @@ void SkPaint::flatten(SkWriteBuffer& buffer) const {
         asint(this->getImageFilter())) {
         flatFlags |= kHasEffects_FlatFlag;
     }
-#ifdef SK_BUILD_FOR_ANDROID
-    if (this->getPaintOptionsAndroid() != SkPaintOptionsAndroid()) {
-        flatFlags |= kHasNonDefaultPaintOptionsAndroid_FlatFlag;
-    }
-#endif
 
     SkASSERT(SkAlign4(kPODPaintSize) == kPODPaintSize);
     uint32_t* ptr = buffer.reserve(kPODPaintSize);
@@ -2145,7 +1912,7 @@ void SkPaint::flatten(SkWriteBuffer& buffer) const {
     *ptr++ = this->getColor();
 
     *ptr++ = pack_paint_flags(this->getFlags(), this->getHinting(), this->getTextAlign(),
-                              this->getFilterLevel(), flatFlags);
+                              this->getFilterQuality(), flatFlags);
     *ptr++ = pack_4(this->getStrokeCap(), this->getStrokeJoin(),
                     this->getStyle(), this->getTextEncoding());
 
@@ -2171,11 +1938,6 @@ void SkPaint::flatten(SkWriteBuffer& buffer) const {
             buffer.writeBool(false);
         }
     }
-#ifdef SK_BUILD_FOR_ANDROID
-    if (flatFlags & kHasNonDefaultPaintOptionsAndroid_FlatFlag) {
-        this->getPaintOptionsAndroid().flatten(buffer);
-    }
-#endif
 }
 
 void SkPaint::unflatten(SkReadBuffer& buffer) {
@@ -2191,12 +1953,7 @@ void SkPaint::unflatten(SkReadBuffer& buffer) {
     this->setStrokeMiter(read_scalar(pod));
     this->setColor(*pod++);
 
-    unsigned flatFlags = 0;
-    if (buffer.isVersionLT(SkReadBuffer::kFilterLevelIsEnum_Version)) {
-        flatFlags = unpack_paint_flags_v22(this, *pod++);
-    } else {
-        flatFlags = unpack_paint_flags(this, *pod++);
-    }
+    unsigned flatFlags = unpack_paint_flags(this, *pod++);
 
     uint32_t tmp = *pod++;
     this->setStrokeCap(static_cast<Cap>((tmp >> 24) & 0xFF));
@@ -2207,7 +1964,7 @@ void SkPaint::unflatten(SkReadBuffer& buffer) {
     if (flatFlags & kHasTypeface_FlatFlag) {
         this->setTypeface(buffer.readTypeface());
     } else {
-        this->setTypeface(NULL);
+        this->setTypeface(nullptr);
     }
 
     if (flatFlags & kHasEffects_FlatFlag) {
@@ -2224,78 +1981,55 @@ void SkPaint::unflatten(SkReadBuffer& buffer) {
             this->setAnnotation(SkAnnotation::Create(buffer))->unref();
         }
     } else {
-        this->setPathEffect(NULL);
-        this->setShader(NULL);
-        this->setXfermode(NULL);
-        this->setMaskFilter(NULL);
-        this->setColorFilter(NULL);
-        this->setRasterizer(NULL);
-        this->setLooper(NULL);
-        this->setImageFilter(NULL);
-    }
-
-#ifdef SK_BUILD_FOR_ANDROID
-    this->setPaintOptionsAndroid(SkPaintOptionsAndroid());
-#endif
-    if (flatFlags & kHasNonDefaultPaintOptionsAndroid_FlatFlag) {
-        SkPaintOptionsAndroid options;
-        options.unflatten(buffer);
-#ifdef SK_BUILD_FOR_ANDROID
-        this->setPaintOptionsAndroid(options);
-#endif
+        this->setPathEffect(nullptr);
+        this->setShader(nullptr);
+        this->setXfermode(nullptr);
+        this->setMaskFilter(nullptr);
+        this->setColorFilter(nullptr);
+        this->setRasterizer(nullptr);
+        this->setLooper(nullptr);
+        this->setImageFilter(nullptr);
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkShader* SkPaint::setShader(SkShader* shader) {
-    GEN_ID_INC_EVAL(shader != fShader);
     SkRefCnt_SafeAssign(fShader, shader);
-    fDirtyBits = set_mask(fDirtyBits, kShader_DirtyBit, shader != NULL);
     return shader;
 }
 
 SkColorFilter* SkPaint::setColorFilter(SkColorFilter* filter) {
-    GEN_ID_INC_EVAL(filter != fColorFilter);
     SkRefCnt_SafeAssign(fColorFilter, filter);
-    fDirtyBits = set_mask(fDirtyBits, kColorFilter_DirtyBit, filter != NULL);
     return filter;
 }
 
 SkXfermode* SkPaint::setXfermode(SkXfermode* mode) {
-    GEN_ID_INC_EVAL(mode != fXfermode);
     SkRefCnt_SafeAssign(fXfermode, mode);
-    fDirtyBits = set_mask(fDirtyBits, kXfermode_DirtyBit, mode != NULL);
     return mode;
 }
 
 SkXfermode* SkPaint::setXfermodeMode(SkXfermode::Mode mode) {
     SkSafeUnref(fXfermode);
     fXfermode = SkXfermode::Create(mode);
-    GEN_ID_INC;
-    fDirtyBits = set_mask(fDirtyBits, kXfermode_DirtyBit, fXfermode != NULL);
     return fXfermode;
 }
 
 SkPathEffect* SkPaint::setPathEffect(SkPathEffect* effect) {
-    GEN_ID_INC_EVAL(effect != fPathEffect);
     SkRefCnt_SafeAssign(fPathEffect, effect);
-    fDirtyBits = set_mask(fDirtyBits, kPathEffect_DirtyBit, effect != NULL);
     return effect;
 }
 
 SkMaskFilter* SkPaint::setMaskFilter(SkMaskFilter* filter) {
-    GEN_ID_INC_EVAL(filter != fMaskFilter);
     SkRefCnt_SafeAssign(fMaskFilter, filter);
-    fDirtyBits = set_mask(fDirtyBits, kMaskFilter_DirtyBit, filter != NULL);
     return filter;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-bool SkPaint::getFillPath(const SkPath& src, SkPath* dst,
-                          const SkRect* cullRect) const {
-    SkStrokeRec rec(*this);
+bool SkPaint::getFillPath(const SkPath& src, SkPath* dst, const SkRect* cullRect,
+                          SkScalar resScale) const {
+    SkStrokeRec rec(*this, resScale);
 
     const SkPath* srcPtr = &src;
     SkPath tmpPath;
@@ -2318,6 +2052,16 @@ bool SkPaint::getFillPath(const SkPath& src, SkPath* dst,
     return !rec.isHairlineStyle();
 }
 
+bool SkPaint::canComputeFastBounds() const {
+    if (this->getLooper()) {
+        return this->getLooper()->canComputeFastBounds(*this);
+    }
+    if (this->getImageFilter() && !this->getImageFilter()->canComputeFastBounds()) {
+        return false;
+    }
+    return !this->getRasterizer();
+}
+
 const SkRect& SkPaint::doComputeFastBounds(const SkRect& origSrc,
                                            SkRect* storage,
                                            Style style) const {
@@ -2366,17 +2110,16 @@ const SkRect& SkPaint::doComputeFastBounds(const SkRect& origSrc,
 }
 
 #ifndef SK_IGNORE_TO_STRING
+
 void SkPaint::toString(SkString* str) const {
     str->append("<dl><dt>SkPaint:</dt><dd><dl>");
 
     SkTypeface* typeface = this->getTypeface();
-    if (NULL != typeface) {
+    if (typeface) {
         SkDynamicMemoryWStream ostream;
         typeface->serialize(&ostream);
-        SkAutoTUnref<SkData> data(ostream.copyToData());
-
-        SkMemoryStream stream(data);
-        SkFontDescriptor descriptor(&stream);
+        SkAutoTDelete<SkStreamAsset> istream(ostream.detachAsStream());
+        SkFontDescriptor descriptor(istream);
 
         str->append("<dt>Font Family Name:</dt><dd>");
         str->append(descriptor.getFamilyName());
@@ -2384,8 +2127,6 @@ void SkPaint::toString(SkString* str) const {
         str->append(descriptor.getFullName());
         str->append("</dd><dt>Font PS Name:</dt><dd>");
         str->append(descriptor.getPostscriptName());
-        str->append("</dd><dt>Font File Name:</dt><dd>");
-        str->append(descriptor.getFontFileName());
         str->append("</dd>");
     }
 
@@ -2402,60 +2143,62 @@ void SkPaint::toString(SkString* str) const {
     str->append("</dd>");
 
     SkPathEffect* pathEffect = this->getPathEffect();
-    if (NULL != pathEffect) {
+    if (pathEffect) {
         str->append("<dt>PathEffect:</dt><dd>");
+        pathEffect->toString(str);
         str->append("</dd>");
     }
 
     SkShader* shader = this->getShader();
-    if (NULL != shader) {
+    if (shader) {
         str->append("<dt>Shader:</dt><dd>");
         shader->toString(str);
         str->append("</dd>");
     }
 
     SkXfermode* xfer = this->getXfermode();
-    if (NULL != xfer) {
+    if (xfer) {
         str->append("<dt>Xfermode:</dt><dd>");
         xfer->toString(str);
         str->append("</dd>");
     }
 
     SkMaskFilter* maskFilter = this->getMaskFilter();
-    if (NULL != maskFilter) {
+    if (maskFilter) {
         str->append("<dt>MaskFilter:</dt><dd>");
         maskFilter->toString(str);
         str->append("</dd>");
     }
 
     SkColorFilter* colorFilter = this->getColorFilter();
-    if (NULL != colorFilter) {
+    if (colorFilter) {
         str->append("<dt>ColorFilter:</dt><dd>");
         colorFilter->toString(str);
         str->append("</dd>");
     }
 
     SkRasterizer* rasterizer = this->getRasterizer();
-    if (NULL != rasterizer) {
+    if (rasterizer) {
         str->append("<dt>Rasterizer:</dt><dd>");
         str->append("</dd>");
     }
 
     SkDrawLooper* looper = this->getLooper();
-    if (NULL != looper) {
+    if (looper) {
         str->append("<dt>DrawLooper:</dt><dd>");
         looper->toString(str);
         str->append("</dd>");
     }
 
     SkImageFilter* imageFilter = this->getImageFilter();
-    if (NULL != imageFilter) {
+    if (imageFilter) {
         str->append("<dt>ImageFilter:</dt><dd>");
+        imageFilter->toString(str);
         str->append("</dd>");
     }
 
     SkAnnotation* annotation = this->getAnnotation();
-    if (NULL != annotation) {
+    if (annotation) {
         str->append("<dt>Annotation:</dt><dd>");
         str->append("</dd>");
     }
@@ -2497,8 +2240,8 @@ void SkPaint::toString(SkString* str) const {
     str->append(")</dd>");
 
     str->append("<dt>FilterLevel:</dt><dd>");
-    static const char* gFilterLevelStrings[] = { "None", "Low", "Medium", "High" };
-    str->append(gFilterLevelStrings[this->getFilterLevel()]);
+    static const char* gFilterQualityStrings[] = { "None", "Low", "Medium", "High" };
+    str->append(gFilterQualityStrings[this->getFilterQuality()]);
     str->append("</dd>");
 
     str->append("<dt>TextAlign:</dt><dd>");
@@ -2542,26 +2285,25 @@ static bool has_thick_frame(const SkPaint& paint) {
             paint.getStyle() != SkPaint::kFill_Style;
 }
 
-SkTextToPathIter::SkTextToPathIter( const char text[], size_t length,
-                                    const SkPaint& paint,
-                                    bool applyStrokeAndPathEffects)
-                                    : fPaint(paint) {
-    fGlyphCacheProc = paint.getMeasureCacheProc(SkPaint::kForward_TextBufferDirection,
-                                                true);
+SkTextToPathIter::SkTextToPathIter(const char text[], size_t length,
+                                   const SkPaint& paint,
+                                   bool applyStrokeAndPathEffects)
+    : fPaint(paint) {
+    fGlyphCacheProc = paint.getMeasureCacheProc(true);
 
     fPaint.setLinearText(true);
-    fPaint.setMaskFilter(NULL);   // don't want this affecting our path-cache lookup
+    fPaint.setMaskFilter(nullptr);   // don't want this affecting our path-cache lookup
 
-    if (fPaint.getPathEffect() == NULL && !has_thick_frame(fPaint)) {
+    if (fPaint.getPathEffect() == nullptr && !has_thick_frame(fPaint)) {
         applyStrokeAndPathEffects = false;
     }
 
     // can't use our canonical size if we need to apply patheffects
-    if (fPaint.getPathEffect() == NULL) {
+    if (fPaint.getPathEffect() == nullptr) {
         fPaint.setTextSize(SkIntToScalar(SkPaint::kCanonicalTextSizeForPaths));
         fScale = paint.getTextSize() / SkPaint::kCanonicalTextSizeForPaths;
         if (has_thick_frame(fPaint)) {
-            fPaint.setStrokeWidth(SkScalarDiv(fPaint.getStrokeWidth(), fScale));
+            fPaint.setStrokeWidth(fPaint.getStrokeWidth() / fScale);
         }
     } else {
         fScale = SK_Scalar1;
@@ -2569,13 +2311,13 @@ SkTextToPathIter::SkTextToPathIter( const char text[], size_t length,
 
     if (!applyStrokeAndPathEffects) {
         fPaint.setStyle(SkPaint::kFill_Style);
-        fPaint.setPathEffect(NULL);
+        fPaint.setPathEffect(nullptr);
     }
 
-    fCache = fPaint.detachCache(NULL, NULL, false);
+    fCache = fPaint.detachCache(nullptr, nullptr, false);
 
     SkPaint::Style  style = SkPaint::kFill_Style;
-    SkPathEffect*   pe = NULL;
+    SkPathEffect*   pe = nullptr;
 
     if (!applyStrokeAndPathEffects) {
         style = paint.getStyle();   // restore
@@ -2591,7 +2333,7 @@ SkTextToPathIter::SkTextToPathIter( const char text[], size_t length,
     if (paint.getTextAlign() != SkPaint::kLeft_Align) { // need to measure first
         int      count;
         SkScalar width = SkScalarMul(fPaint.measure_text(fCache, text, length,
-                                                         &count, NULL), fScale);
+                                                         &count, nullptr), fScale);
         if (paint.getTextAlign() == SkPaint::kCenter_Align) {
             width = SkScalarHalf(width);
         }
@@ -2623,7 +2365,7 @@ bool SkTextToPathIter::next(const SkPath** path, SkScalar* xpos) {
             }
         } else {
             if (path) {
-                *path = NULL;
+                *path = nullptr;
             }
         }
         if (xpos) {
@@ -2636,6 +2378,18 @@ bool SkTextToPathIter::next(const SkPath** path, SkScalar* xpos) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
+// return true if the filter exists, and may affect alpha
+static bool affects_alpha(const SkColorFilter* cf) {
+    return cf && !(cf->getFlags() & SkColorFilter::kAlphaUnchanged_Flag);
+}
+
+// return true if the filter exists, and may affect alpha
+static bool affects_alpha(const SkImageFilter* imf) {
+    // TODO: check if we should allow imagefilters to broadcast that they don't affect alpha
+    // ala colorfilters
+    return imf != nullptr;
+}
+
 bool SkPaint::nothingToDraw() const {
     if (fLooper) {
         return false;
@@ -2648,7 +2402,10 @@ bool SkPaint::nothingToDraw() const {
             case SkXfermode::kDstOut_Mode:
             case SkXfermode::kDstOver_Mode:
             case SkXfermode::kPlus_Mode:
-                return 0 == this->getAlpha();
+                if (0 == this->getAlpha()) {
+                    return !affects_alpha(fColorFilter) && !affects_alpha(fImageFilter);
+                }
+                break;
             case SkXfermode::kDst_Mode:
                 return true;
             default:
@@ -2658,92 +2415,11 @@ bool SkPaint::nothingToDraw() const {
     return false;
 }
 
-inline static unsigned popcount(uint8_t x) {
-    // As in Hacker's delight, adapted for just 8 bits.
-    x = (x & 0x55) + ((x >> 1) & 0x55);  // a b c d w x y z -> a+b c+d w+x y+z
-    x = (x & 0x33) + ((x >> 2) & 0x33);  // a+b c+d w+x y+z -> a+b+c+d w+x+y+z
-    x = (x & 0x0F) + ((x >> 4) & 0x0F);  // a+b+c+d w+x+y+z -> a+b+c+d+w+x+y+z
-    return x;
-}
-
-void SkPaint::FlatteningTraits::Flatten(SkWriteBuffer& buffer, const SkPaint& paint) {
-    const uint32_t dirty = paint.fDirtyBits;
-
-    // Each of the low 7 dirty bits corresponds to a 4-byte flat value,
-    // plus one for the dirty bits and one for the bitfields
-    const size_t flatBytes = 4 * (popcount(dirty & kPOD_DirtyBitMask) + 2);
-    SkASSERT(flatBytes <= 32);
-    uint32_t* u32 = buffer.reserve(flatBytes);
-    *u32++ = dirty;
-    *u32++ = paint.fBitfieldsUInt;
-    if (0 == dirty) {
-        return;
-    }
-
-#define F(dst, field) if (dirty & k##field##_DirtyBit) *dst++ = paint.get##field()
-    F(u32, Color);
-    SkScalar* f32 = reinterpret_cast<SkScalar*>(u32);
-    F(f32, TextSize);
-    F(f32, TextScaleX);
-    F(f32, TextSkewX);
-    F(f32, StrokeWidth);
-    F(f32, StrokeMiter);
-#undef F
-#define F(field) if (dirty & k##field##_DirtyBit) buffer.writeFlattenable(paint.get##field())
-    F(PathEffect);
-    F(Shader);
-    F(Xfermode);
-    F(MaskFilter);
-    F(ColorFilter);
-    F(Rasterizer);
-    F(Looper);
-    F(ImageFilter);
-#undef F
-    if (dirty & kTypeface_DirtyBit) buffer.writeTypeface(paint.getTypeface());
-    if (dirty & kAnnotation_DirtyBit) paint.getAnnotation()->writeToBuffer(buffer);
-#ifdef SK_BUILD_FOR_ANDROID
-    if (dirty & kPaintOptionsAndroid_DirtyBit) paint.getPaintOptionsAndroid().flatten(buffer);
-#endif
-}
-
-void SkPaint::FlatteningTraits::Unflatten(SkReadBuffer& buffer, SkPaint* paint) {
-    const uint32_t dirty = buffer.readUInt();
-    paint->fBitfieldsUInt = buffer.readUInt();
-    if (dirty == 0) {
-        return;
-    }
-#define F(field, reader) if (dirty & k##field##_DirtyBit) paint->set##field(buffer.reader())
-// Same function, except it unrefs the object newly set on the paint:
-#define F_UNREF(field, reader)                      \
-    if (dirty & k##field##_DirtyBit)                \
-        paint->set##field(buffer.reader())->unref()
-
-    F(Color,       readUInt);
-    F(TextSize,    readScalar);
-    F(TextScaleX,  readScalar);
-    F(TextSkewX,   readScalar);
-    F(StrokeWidth, readScalar);
-    F(StrokeMiter, readScalar);
-    F_UNREF(PathEffect,  readPathEffect);
-    F_UNREF(Shader,      readShader);
-    F_UNREF(Xfermode,    readXfermode);
-    F_UNREF(MaskFilter,  readMaskFilter);
-    F_UNREF(ColorFilter, readColorFilter);
-    F_UNREF(Rasterizer,  readRasterizer);
-    F_UNREF(Looper,      readDrawLooper);
-    F_UNREF(ImageFilter, readImageFilter);
-    F(Typeface,    readTypeface);
-#undef F
-#undef F_UNREF
-    if (dirty & kAnnotation_DirtyBit) {
-        paint->setAnnotation(SkAnnotation::Create(buffer))->unref();
-    }
-#ifdef SK_BUILD_FOR_ANDROID
-    if (dirty & kPaintOptionsAndroid_DirtyBit) {
-        SkPaintOptionsAndroid options;
-        options.unflatten(buffer);
-        paint->setPaintOptionsAndroid(options);
-    }
-#endif
-    SkASSERT(dirty == paint->fDirtyBits);
+uint32_t SkPaint::getHash() const {
+    // We're going to hash 10 pointers and 7 32-bit values, finishing up with fBitfields,
+    // so fBitfields should be 10 pointers and 6 32-bit values from the start.
+    static_assert(offsetof(SkPaint, fBitfields) == 10 * sizeof(void*) + 6 * sizeof(uint32_t),
+                  "SkPaint_notPackedTightly");
+    return SkChecksum::Murmur3(reinterpret_cast<const uint32_t*>(this),
+                               offsetof(SkPaint, fBitfields) + sizeof(fBitfields));
 }
diff --git a/gfx/skia/skia/src/core/SkPaintOptionsAndroid.cpp b/gfx/skia/skia/src/core/SkPaintOptionsAndroid.cpp
deleted file mode 100644
index 56f1bd1654e4..000000000000
--- a/gfx/skia/skia/src/core/SkPaintOptionsAndroid.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-
-/*
- * Copyright 2012 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkPaintOptionsAndroid.h"
-#include "SkReadBuffer.h"
-#include "SkWriteBuffer.h"
-#include "SkTDict.h"
-#include "SkThread.h"
-#include <cstring>
-
-SkLanguage SkLanguage::getParent() const {
-    SkASSERT(!fTag.isEmpty());
-    const char* tag = fTag.c_str();
-
-    // strip off the rightmost "-.*"
-    const char* parentTagEnd = strrchr(tag, '-');
-    if (parentTagEnd == NULL) {
-        return SkLanguage();
-    }
-    size_t parentTagLen = parentTagEnd - tag;
-    return SkLanguage(tag, parentTagLen);
-}
-
-void SkPaintOptionsAndroid::flatten(SkWriteBuffer& buffer) const {
-    buffer.writeUInt(fFontVariant);
-    buffer.writeString(fLanguage.getTag().c_str());
-    buffer.writeBool(fUseFontFallbacks);
-}
-
-void SkPaintOptionsAndroid::unflatten(SkReadBuffer& buffer) {
-    fFontVariant = (FontVariant)buffer.readUInt();
-    SkString tag;
-    buffer.readString(&tag);
-    fLanguage = SkLanguage(tag);
-    fUseFontFallbacks = buffer.readBool();
-}
diff --git a/gfx/skia/skia/src/core/SkPaintPriv.cpp b/gfx/skia/skia/src/core/SkPaintPriv.cpp
index d7b3032227dd..6725cb49befd 100644
--- a/gfx/skia/skia/src/core/SkPaintPriv.cpp
+++ b/gfx/skia/skia/src/core/SkPaintPriv.cpp
@@ -5,85 +5,51 @@
  * found in the LICENSE file.
  */
 
-#include "SkPaintPriv.h"
-
 #include "SkBitmap.h"
 #include "SkColorFilter.h"
+#include "SkPaintPriv.h"
+#include "SkImage.h"
 #include "SkPaint.h"
 #include "SkShader.h"
 
-bool isPaintOpaque(const SkPaint* paint,
-                   const SkBitmap* bmpReplacesShader) {
-    // TODO: SkXfermode should have a virtual isOpaque method, which would
-    // make it possible to test modes that do not have a Coeff representation.
+static bool changes_alpha(const SkPaint& paint) {
+    SkColorFilter* cf = paint.getColorFilter();
+    return cf && !(cf->getFlags() & SkColorFilter::kAlphaUnchanged_Flag);
+}
 
+bool SkPaintPriv::Overwrites(const SkPaint* paint, ShaderOverrideOpacity overrideOpacity) {
     if (!paint) {
-        return bmpReplacesShader ? bmpReplacesShader->isOpaque() : true;
+        // No paint means we default to SRC_OVER, so we overwrite iff our shader-override
+        // is opaque, or we don't have one.
+        return overrideOpacity != kNotOpaque_ShaderOverrideOpacity;
     }
 
-    SkXfermode::Coeff srcCoeff, dstCoeff;
-    if (SkXfermode::AsCoeff(paint->getXfermode(), &srcCoeff, &dstCoeff)){
-        if (SkXfermode::kDA_Coeff == srcCoeff || SkXfermode::kDC_Coeff == srcCoeff ||
-            SkXfermode::kIDA_Coeff == srcCoeff || SkXfermode::kIDC_Coeff == srcCoeff) {
-            return false;
-        }
-        switch (dstCoeff) {
-        case SkXfermode::kZero_Coeff:
-            return true;
-        case SkXfermode::kISA_Coeff:
-            if (paint->getAlpha() != 255) {
-                break;
+    SkXfermode::SrcColorOpacity opacityType = SkXfermode::kUnknown_SrcColorOpacity;
+
+    if (!changes_alpha(*paint)) {
+        const unsigned paintAlpha = paint->getAlpha();
+        if (0xff == paintAlpha && overrideOpacity != kNotOpaque_ShaderOverrideOpacity &&
+            (!paint->getShader() || paint->getShader()->isOpaque()))
+        {
+            opacityType = SkXfermode::kOpaque_SrcColorOpacity;
+        } else if (0 == paintAlpha) {
+            if (overrideOpacity == kNone_ShaderOverrideOpacity && !paint->getShader()) {
+                opacityType = SkXfermode::kTransparentBlack_SrcColorOpacity;
+            } else {
+                opacityType = SkXfermode::kTransparentAlpha_SrcColorOpacity;
             }
-            if (bmpReplacesShader) {
-                if (!bmpReplacesShader->isOpaque()) {
-                    break;
-                }
-            } else if (paint->getShader() && !paint->getShader()->isOpaque()) {
-                break;
-            }
-            if (paint->getColorFilter() &&
-                ((paint->getColorFilter()->getFlags() &
-                SkColorFilter::kAlphaUnchanged_Flag) == 0)) {
-                break;
-            }
-            return true;
-        case SkXfermode::kSA_Coeff:
-            if (paint->getAlpha() != 0) {
-                break;
-            }
-            if (paint->getColorFilter() &&
-                ((paint->getColorFilter()->getFlags() &
-                SkColorFilter::kAlphaUnchanged_Flag) == 0)) {
-                break;
-            }
-            return true;
-        case SkXfermode::kSC_Coeff:
-            if (paint->getColor() != 0) { // all components must be 0
-                break;
-            }
-            if (bmpReplacesShader || paint->getShader()) {
-                break;
-            }
-            if (paint->getColorFilter() && (
-                (paint->getColorFilter()->getFlags() &
-                SkColorFilter::kAlphaUnchanged_Flag) == 0)) {
-                break;
-            }
-            return true;
-        default:
-            break;
         }
     }
-    return false;
+
+    return SkXfermode::IsOpaque(paint->getXfermode(), opacityType);
 }
 
-bool NeedsDeepCopy(const SkPaint& paint) {
-    /*
-     *  The types below are not yet immutable/reentrant-safe, and so we return
-     *  true if instances of them are present in the paint.
-     *
-     *  Eventually we hope this list will be empty, and we can always return
-     *  false.
-     */
-    return paint.getImageFilter();
+bool SkPaintPriv::Overwrites(const SkBitmap& bitmap, const SkPaint* paint) {
+    return Overwrites(paint, bitmap.isOpaque() ? kOpaque_ShaderOverrideOpacity
+                                               : kNotOpaque_ShaderOverrideOpacity);
+}
+
+bool SkPaintPriv::Overwrites(const SkImage* image, const SkPaint* paint) {
+    return Overwrites(paint, image->isOpaque() ? kOpaque_ShaderOverrideOpacity
+                                               : kNotOpaque_ShaderOverrideOpacity);
 }
diff --git a/gfx/skia/skia/src/core/SkPaintPriv.h b/gfx/skia/skia/src/core/SkPaintPriv.h
index 9668fef12751..a03f9b33909d 100644
--- a/gfx/skia/skia/src/core/SkPaintPriv.h
+++ b/gfx/skia/skia/src/core/SkPaintPriv.h
@@ -8,25 +8,43 @@
 #ifndef SkPaintPriv_DEFINED
 #define SkPaintPriv_DEFINED
 
+#include "SkTypes.h"
+
 class SkBitmap;
+class SkImage;
 class SkPaint;
 
-#include "SkTypes.h"
-/** Returns true if draw calls that use the paint will completely occlude
-    canvas contents that are covered by the draw.
-    @param paint The paint to be analyzed, NULL is equivalent to
-        the default paint.
-    @param bmpReplacesShader a bitmap to be used in place of the paint's
-        shader.
-    @return true if paint is opaque
-*/
-bool isPaintOpaque(const SkPaint* paint,
-                   const SkBitmap* bmpReplacesShader = NULL);
+class SkPaintPriv {
+public:
+    enum ShaderOverrideOpacity {
+        kNone_ShaderOverrideOpacity,        //!< there is no overriding shader (bitmap or image)
+        kOpaque_ShaderOverrideOpacity,      //!< the overriding shader is opaque
+        kNotOpaque_ShaderOverrideOpacity,   //!< the overriding shader may not be opaque
+    };
+    
+    /**
+     *  Returns true if drawing with this paint (or nullptr) will ovewrite all affected pixels.
+     *
+     *  Note: returns conservative true, meaning it may return false even though the paint might
+     *        in fact overwrite its pixels.
+     */
+    static bool Overwrites(const SkPaint* paint, ShaderOverrideOpacity);
+
+    static bool Overwrites(const SkPaint& paint) {
+        return Overwrites(&paint, kNone_ShaderOverrideOpacity);
+    }
+
+    /**
+     *  Returns true if drawing this bitmap with this paint (or nullptr) will ovewrite all affected
+     *  pixels.
+     */
+    static bool Overwrites(const SkBitmap&, const SkPaint* paint);
+
+    /**
+     *  Returns true if drawing this image with this paint (or nullptr) will ovewrite all affected
+     *  pixels.
+     */
+    static bool Overwrites(const SkImage*, const SkPaint* paint);
+};
 
-/** Returns true if the provided paint has fields which are not
-    immutable (and will thus require deep copying).
-    @param paint the paint to be analyzed
-    @return true if the paint requires a deep copy
-*/
-bool NeedsDeepCopy(const SkPaint& paint);
 #endif
diff --git a/gfx/skia/skia/src/core/SkPatch.cpp b/gfx/skia/skia/src/core/SkPatch.cpp
deleted file mode 100644
index acd6cb9b5772..000000000000
--- a/gfx/skia/skia/src/core/SkPatch.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkPatch.h"
-
-#include "SkGeometry.h"
-#include "SkColorPriv.h"
-
-////////////////////////////////////////////////////////////////////////////////
-
-/**
- * Evaluator to sample the values of a cubic bezier using forward differences.
- * Forward differences is a method for evaluating a nth degree polynomial at a uniform step by only
- * adding precalculated values.
- * For a linear example we have the function f(t) = m*t+b, then the value of that function at t+h
- * would be f(t+h) = m*(t+h)+b. If we want to know the uniform step that we must add to the first
- * evaluation f(t) then we need to substract f(t+h) - f(t) = m*t + m*h + b - m*t + b = mh. After
- * obtaining this value (mh) we could just add this constant step to our first sampled point
- * to compute the next one.
- *
- * For the cubic case the first difference gives as a result a quadratic polynomial to which we can
- * apply again forward differences and get linear function to which we can apply again forward
- * differences to get a constant difference. This is why we keep an array of size 4, the 0th
- * position keeps the sampled value while the next ones keep the quadratic, linear and constant
- * difference values.
- */
-
-class FwDCubicEvaluator {
-    
-public:
-    FwDCubicEvaluator() { }
-    
-    /**
-     * Receives the 4 control points of the cubic bezier.
-     */
-    FwDCubicEvaluator(SkPoint a, SkPoint b, SkPoint c, SkPoint d) {
-        fPoints[0] = a;
-        fPoints[1] = b;
-        fPoints[2] = c;
-        fPoints[3] = d;
-        
-        SkScalar cx[4], cy[4];
-        SkGetCubicCoeff(fPoints, cx, cy);
-        fCoefs[0].set(cx[0], cy[0]);
-        fCoefs[1].set(cx[1], cy[1]);
-        fCoefs[2].set(cx[2], cy[2]);
-        fCoefs[3].set(cx[3], cy[3]);
-        
-        this->restart(1);
-    }
-    
-    /**
-     * Restarts the forward differences evaluator to the first value of t = 0.
-     */
-    void restart(int divisions) {
-        fDivisions = divisions;
-        SkScalar h  = 1.f / fDivisions;
-        fCurrent    = 0;
-        fMax        = fDivisions + 1;
-        fFwDiff[0]  = fCoefs[3];
-        SkScalar h2 = h * h;
-        SkScalar h3 = h2 * h;
-        
-        fFwDiff[3].set(6.f * fCoefs[0].x() * h3, 6.f * fCoefs[0].y() * h3); //6ah^3
-        fFwDiff[2].set(fFwDiff[3].x() + 2.f * fCoefs[1].x() * h2, //6ah^3 + 2bh^2
-                       fFwDiff[3].y() + 2.f * fCoefs[1].y() * h2);
-        fFwDiff[1].set(fCoefs[0].x() * h3 + fCoefs[1].x() * h2 + fCoefs[2].x() * h,//ah^3 + bh^2 +ch
-                       fCoefs[0].y() * h3 + fCoefs[1].y() * h2 + fCoefs[2].y() * h);
-    }
-    
-    /**
-     * Check if the evaluator is still within the range of 0<=t<=1
-     */
-    bool done() const {
-        return fCurrent > fMax;
-    }
-    
-    /**
-     * Call next to obtain the SkPoint sampled and move to the next one.
-     */
-    SkPoint next() {
-        SkPoint point = fFwDiff[0];
-        fFwDiff[0]    += fFwDiff[1];
-        fFwDiff[1]    += fFwDiff[2];
-        fFwDiff[2]    += fFwDiff[3];
-        fCurrent++;
-        return point;
-    }
-    
-    const SkPoint* getCtrlPoints() const {
-        return fPoints;
-    }
-    
-private:
-    int fMax, fCurrent, fDivisions;
-    SkPoint fFwDiff[4], fCoefs[4], fPoints[4];
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-SkPatch::SkPatch(SkPoint points[12], SkColor colors[4]) {
-        
-    for (int i = 0; i<12; i++) {
-        fCtrlPoints[i] = points[i];
-    }
-    
-    fCornerColors[0] = SkPreMultiplyColor(colors[0]);
-    fCornerColors[1] = SkPreMultiplyColor(colors[1]);
-    fCornerColors[2] = SkPreMultiplyColor(colors[2]);
-    fCornerColors[3] = SkPreMultiplyColor(colors[3]);
-}
-
-uint8_t bilinear(SkScalar tx, SkScalar ty, SkScalar c00, SkScalar c10, SkScalar c01, SkScalar c11) {
-    SkScalar a = c00 * (1.f - tx) + c10 * tx;
-    SkScalar b = c01 * (1.f - tx) + c11 * tx;
-    return uint8_t(a * (1.f - ty) + b * ty);
-}
-
-bool SkPatch::getVertexData(SkPatch::VertexData* data, int divisions) {
-    
-    if (divisions < 1) {
-        return false;
-    }
-    
-    int divX = divisions, divY = divisions;
-    
-    data->fVertexCount = (divX + 1) * (divY + 1);
-    data->fIndexCount = divX * divY * 6;
-
-    data->fPoints = SkNEW_ARRAY(SkPoint, data->fVertexCount);
-    data->fColors = SkNEW_ARRAY(uint32_t, data->fVertexCount);
-    data->fTexCoords = SkNEW_ARRAY(SkPoint, data->fVertexCount);
-    data->fIndices = SkNEW_ARRAY(uint16_t, data->fIndexCount);
-    
-    FwDCubicEvaluator fBottom(fCtrlPoints[kBottomP0_CubicCtrlPts],
-                              fCtrlPoints[kBottomP1_CubicCtrlPts],
-                              fCtrlPoints[kBottomP2_CubicCtrlPts],
-                              fCtrlPoints[kBottomP3_CubicCtrlPts]),
-                        fTop(fCtrlPoints[kTopP0_CubicCtrlPts],
-                             fCtrlPoints[kTopP1_CubicCtrlPts],
-                             fCtrlPoints[kTopP2_CubicCtrlPts],
-                             fCtrlPoints[kTopP2_CubicCtrlPts]),
-                        fLeft(fCtrlPoints[kLeftP0_CubicCtrlPts],
-                              fCtrlPoints[kLeftP1_CubicCtrlPts],
-                              fCtrlPoints[kLeftP2_CubicCtrlPts],
-                              fCtrlPoints[kLeftP3_CubicCtrlPts]),
-                        fRight(fCtrlPoints[kRightP0_CubicCtrlPts],
-                               fCtrlPoints[kRightP1_CubicCtrlPts],
-                               fCtrlPoints[kRightP2_CubicCtrlPts],
-                               fCtrlPoints[kRightP3_CubicCtrlPts]);
-
-    fBottom.restart(divX);
-    fTop.restart(divX);
-
-    SkScalar u = 0.0f;
-    int stride = divY + 1;
-    for (int x = 0; x <= divX; x++) {
-        SkPoint bottom = fBottom.next(), top = fTop.next();
-        fLeft.restart(divY);
-        fRight.restart(divY);
-        SkScalar v = 0.f;
-        for (int y = 0; y <= divY; y++) {
-            int dataIndex = x * (divX + 1) + y;
-
-            SkPoint left = fLeft.next(), right = fRight.next();
-
-            SkPoint s0 = SkPoint::Make((1.0f - v) * top.x() + v * bottom.x(),
-                                       (1.0f - v) * top.y() + v * bottom.y());
-            SkPoint s1 = SkPoint::Make((1.0f - u) * left.x() + u * right.x(),
-                                       (1.0f - u) * left.y() + u * right.y());
-            SkPoint s2 = SkPoint::Make(
-                                       (1.0f - v) * ((1.0f - u) * fTop.getCtrlPoints()[0].x()
-                                        + u * fTop.getCtrlPoints()[3].x())
-                                        + v * ((1.0f - u) * fBottom.getCtrlPoints()[0].x()
-                                        + u * fBottom.getCtrlPoints()[3].x()),
-                                       (1.0f - v) * ((1.0f - u) * fTop.getCtrlPoints()[0].y()
-                                        + u * fTop.getCtrlPoints()[3].y())
-                                        + v * ((1.0f - u) * fBottom.getCtrlPoints()[0].y()
-                                        + u * fBottom.getCtrlPoints()[3].y()));
-            data->fPoints[dataIndex] = s0 + s1 - s2;
-
-            uint8_t a = bilinear(u, v, 
-                            SkScalar(SkColorGetA(fCornerColors[0])), 
-                            SkScalar(SkColorGetA(fCornerColors[1])), 
-                            SkScalar(SkColorGetA(fCornerColors[2])), 
-                            SkScalar(SkColorGetA(fCornerColors[3])));
-            uint8_t r = bilinear(u, v, 
-                            SkScalar(SkColorGetR(fCornerColors[0])), 
-                            SkScalar(SkColorGetR(fCornerColors[1])), 
-                            SkScalar(SkColorGetR(fCornerColors[2])), 
-                            SkScalar(SkColorGetR(fCornerColors[3])));
-            uint8_t g = bilinear(u, v, 
-                            SkScalar(SkColorGetG(fCornerColors[0])), 
-                            SkScalar(SkColorGetG(fCornerColors[1])), 
-                            SkScalar(SkColorGetG(fCornerColors[2])), 
-                            SkScalar(SkColorGetG(fCornerColors[3])));
-            uint8_t b = bilinear(u, v, 
-                            SkScalar(SkColorGetB(fCornerColors[0])), 
-                            SkScalar(SkColorGetB(fCornerColors[1])), 
-                            SkScalar(SkColorGetB(fCornerColors[2])), 
-                            SkScalar(SkColorGetB(fCornerColors[3])));
-            data->fColors[dataIndex] = SkPackARGB32(a,r,g,b);
-            
-            data->fTexCoords[dataIndex] = SkPoint::Make(u, v);
-
-            if(x < divX && y < divY) {
-                int i = 6 * (x * divY + y);
-                data->fIndices[i] = x * stride + y;
-                data->fIndices[i + 1] = x * stride + 1 + y;
-                data->fIndices[i + 2] = (x + 1) * stride + 1 + y;
-                data->fIndices[i + 3] = data->fIndices[i];
-                data->fIndices[i + 4] = data->fIndices[i + 2];
-                data->fIndices[i + 5] = (x + 1) * stride + y;
-            }
-            v += 1.f / divY;
-        }
-        u += 1.f / divX;
-    }
-    return true;
-}
diff --git a/gfx/skia/skia/src/core/SkPath.cpp b/gfx/skia/skia/src/core/SkPath.cpp
index 7f2e67a327ac..351629d1252c 100644
--- a/gfx/skia/skia/src/core/SkPath.cpp
+++ b/gfx/skia/skia/src/core/SkPath.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,14 +5,13 @@
  * found in the LICENSE file.
  */
 
-
 #include "SkBuffer.h"
 #include "SkErrorInternals.h"
+#include "SkGeometry.h"
 #include "SkMath.h"
-#include "SkPath.h"
+#include "SkPathPriv.h"
 #include "SkPathRef.h"
 #include "SkRRect.h"
-#include "SkThread.h"
 
 ////////////////////////////////////////////////////////////////////////////
 
@@ -38,16 +36,16 @@ static bool is_degenerate(const SkPath& path) {
 class SkAutoDisableDirectionCheck {
 public:
     SkAutoDisableDirectionCheck(SkPath* path) : fPath(path) {
-        fSaved = static_cast<SkPath::Direction>(fPath->fDirection);
+        fSaved = static_cast<SkPathPriv::FirstDirection>(fPath->fFirstDirection.load());
     }
 
     ~SkAutoDisableDirectionCheck() {
-        fPath->fDirection = fSaved;
+        fPath->fFirstDirection = fSaved;
     }
 
 private:
-    SkPath*              fPath;
-    SkPath::Direction    fSaved;
+    SkPath*                     fPath;
+    SkPathPriv::FirstDirection  fSaved;
 };
 #define SkAutoDisableDirectionCheck(...) SK_REQUIRE_LOCAL_VAR(SkAutoDisableDirectionCheck)
 
@@ -126,12 +124,9 @@ private:
 #define INITIAL_LASTMOVETOINDEX_VALUE   ~0
 
 SkPath::SkPath()
-    : fPathRef(SkPathRef::CreateEmpty())
-#ifdef SK_BUILD_FOR_ANDROID
-    , fSourcePath(NULL)
-#endif
-{
+    : fPathRef(SkPathRef::CreateEmpty()) {
     this->resetFields();
+    fIsVolatile = false;
 }
 
 void SkPath::resetFields() {
@@ -139,18 +134,15 @@ void SkPath::resetFields() {
     fLastMoveToIndex = INITIAL_LASTMOVETOINDEX_VALUE;
     fFillType = kWinding_FillType;
     fConvexity = kUnknown_Convexity;
-    fDirection = kUnknown_Direction;
+    fFirstDirection = SkPathPriv::kUnknown_FirstDirection;
 
     // We don't touch Android's fSourcePath.  It's used to track texture garbage collection, so we
-    // don't want to muck with it if it's been set to something non-NULL.
+    // don't want to muck with it if it's been set to something non-nullptr.
 }
 
 SkPath::SkPath(const SkPath& that)
     : fPathRef(SkRef(that.fPathRef.get())) {
     this->copyFields(that);
-#ifdef SK_BUILD_FOR_ANDROID
-    fSourcePath   = that.fSourcePath;
-#endif
     SkDEBUGCODE(that.validate();)
 }
 
@@ -164,9 +156,6 @@ SkPath& SkPath::operator=(const SkPath& that) {
     if (this != &that) {
         fPathRef.reset(SkRef(that.fPathRef.get()));
         this->copyFields(that);
-#ifdef SK_BUILD_FOR_ANDROID
-        fSourcePath = that.fSourcePath;
-#endif
     }
     SkDEBUGCODE(this->validate();)
     return *this;
@@ -177,7 +166,9 @@ void SkPath::copyFields(const SkPath& that) {
     fLastMoveToIndex = that.fLastMoveToIndex;
     fFillType        = that.fFillType;
     fConvexity       = that.fConvexity;
-    fDirection       = that.fDirection;
+    // Simulate fFirstDirection  = that.fFirstDirection;
+    fFirstDirection.store(that.fFirstDirection.load());
+    fIsVolatile      = that.fIsVolatile;
 }
 
 bool operator==(const SkPath& a, const SkPath& b) {
@@ -188,27 +179,26 @@ bool operator==(const SkPath& a, const SkPath& b) {
 }
 
 void SkPath::swap(SkPath& that) {
-    SkASSERT(&that != NULL);
-
     if (this != &that) {
-        fPathRef.swap(&that.fPathRef);
+        fPathRef.swap(that.fPathRef);
         SkTSwap<int>(fLastMoveToIndex, that.fLastMoveToIndex);
         SkTSwap<uint8_t>(fFillType, that.fFillType);
         SkTSwap<uint8_t>(fConvexity, that.fConvexity);
-        SkTSwap<uint8_t>(fDirection, that.fDirection);
-#ifdef SK_BUILD_FOR_ANDROID
-        SkTSwap<const SkPath*>(fSourcePath, that.fSourcePath);
-#endif
+        // Simulate SkTSwap<uint8_t>(fFirstDirection, that.fFirstDirection);
+        uint8_t temp = fFirstDirection;
+        fFirstDirection.store(that.fFirstDirection.load());
+        that.fFirstDirection.store(temp);
+        SkTSwap<SkBool8>(fIsVolatile, that.fIsVolatile);
     }
 }
 
 static inline bool check_edge_against_rect(const SkPoint& p0,
                                            const SkPoint& p1,
                                            const SkRect& rect,
-                                           SkPath::Direction dir) {
+                                           SkPathPriv::FirstDirection dir) {
     const SkPoint* edgeBegin;
     SkVector v;
-    if (SkPath::kCW_Direction == dir) {
+    if (SkPathPriv::kCW_FirstDirection == dir) {
         v = p1 - p0;
         edgeBegin = &p0;
     } else {
@@ -234,8 +224,8 @@ bool SkPath::conservativelyContainsRect(const SkRect& rect) const {
         return false;
     }
 
-    Direction direction;
-    if (!this->cheapComputeDirection(&direction)) {
+    SkPathPriv::FirstDirection direction;
+    if (!SkPathPriv::CheapComputeFirstDirection(*this, &direction)) {
         return false;
     }
 
@@ -279,8 +269,23 @@ bool SkPath::conservativelyContainsRect(const SkRect& rect) const {
                 SkDEBUGFAIL("unknown verb");
         }
         if (-1 != nextPt) {
-            if (!check_edge_against_rect(prevPt, pts[nextPt], rect, direction)) {
-                return false;
+            if (SkPath::kConic_Verb == verb) {
+                SkConic orig;
+                orig.set(pts, iter.conicWeight());
+                SkPoint quadPts[5];
+                int count = orig.chopIntoQuadsPOW2(quadPts, 1);
+                SK_ALWAYSBREAK(2 == count);
+
+                if (!check_edge_against_rect(quadPts[0], quadPts[2], rect, direction)) {
+                    return false;
+                }
+                if (!check_edge_against_rect(quadPts[2], quadPts[4], rect, direction)) {
+                    return false;
+                }
+            } else {
+                if (!check_edge_against_rect(prevPt, pts[nextPt], rect, direction)) {
+                    return false;
+                }
             }
             prevPt = pts[nextPt];
         }
@@ -291,23 +296,13 @@ bool SkPath::conservativelyContainsRect(const SkRect& rect) const {
 
 uint32_t SkPath::getGenerationID() const {
     uint32_t genID = fPathRef->genID();
-#ifdef SK_BUILD_FOR_ANDROID
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
     SkASSERT((unsigned)fFillType < (1 << (32 - kPathRefGenIDBitCnt)));
     genID |= static_cast<uint32_t>(fFillType) << kPathRefGenIDBitCnt;
 #endif
     return genID;
 }
 
-#ifdef SK_BUILD_FOR_ANDROID
-const SkPath* SkPath::getSourcePath() const {
-    return fSourcePath;
-}
-
-void SkPath::setSourcePath(const SkPath* path) {
-    fSourcePath = path;
-}
-#endif
-
 void SkPath::reset() {
     SkDEBUGCODE(this->validate();)
 
@@ -394,7 +389,7 @@ bool SkPath::isRectContour(bool allowPartial, int* currVerb, const SkPoint** pts
     int corners = 0;
     SkPoint first, last;
     const SkPoint* pts = *ptsPtr;
-    const SkPoint* savePts = NULL;
+    const SkPoint* savePts = nullptr;
     first.set(0, 0);
     last.set(0, 0);
     int firstDirection = 0;
@@ -402,13 +397,16 @@ bool SkPath::isRectContour(bool allowPartial, int* currVerb, const SkPoint** pts
     int nextDirection = 0;
     bool closedOrMoved = false;
     bool autoClose = false;
+    bool insertClose = false;
     int verbCnt = fPathRef->countVerbs();
     while (*currVerb < verbCnt && (!allowPartial || !autoClose)) {
-        switch (fPathRef->atVerb(*currVerb)) {
+        uint8_t verb = insertClose ? (uint8_t) kClose_Verb : fPathRef->atVerb(*currVerb);
+        switch (verb) {
             case kClose_Verb:
                 savePts = pts;
                 pts = *ptsPtr;
                 autoClose = true;
+                insertClose = false;
             case kLine_Verb: {
                 SkScalar left = last.fX;
                 SkScalar top = last.fY;
@@ -461,6 +459,11 @@ bool SkPath::isRectContour(bool allowPartial, int* currVerb, const SkPoint** pts
             case kCubic_Verb:
                 return false; // quadratic, cubic not allowed
             case kMove_Verb:
+                if (allowPartial && !autoClose && firstDirection) {
+                    insertClose = true;
+                    *currVerb -= 1;  // try move again afterwards
+                    goto addMissingClose;
+                }
                 last = *pts++;
                 closedOrMoved = true;
                 break;
@@ -470,6 +473,8 @@ bool SkPath::isRectContour(bool allowPartial, int* currVerb, const SkPoint** pts
         }
         *currVerb += 1;
         lastDirection = nextDirection;
+addMissingClose:
+        ;
     }
     // Success if 4 corners and first point equals last
     bool result = 4 == corners && (first == last || autoClose);
@@ -504,45 +509,43 @@ bool SkPath::isRectContour(bool allowPartial, int* currVerb, const SkPoint** pts
     return result;
 }
 
-SkPath::PathAsRect SkPath::asRect(Direction* direction) const {
-    SK_COMPILE_ASSERT(0 == kNone_PathAsRect, path_as_rect_mismatch);
-    SK_COMPILE_ASSERT(1 == kFill_PathAsRect, path_as_rect_mismatch);
-    SK_COMPILE_ASSERT(2 == kStroke_PathAsRect, path_as_rect_mismatch);
-    bool isClosed = false;
-    return (PathAsRect) (isRect(&isClosed, direction) + isClosed);
-}
-
-bool SkPath::isRect(SkRect* rect) const {
+bool SkPath::isRect(SkRect* rect, bool* isClosed, Direction* direction) const {
     SkDEBUGCODE(this->validate();)
     int currVerb = 0;
     const SkPoint* pts = fPathRef->points();
-    bool result = isRectContour(false, &currVerb, &pts, NULL, NULL);
-    if (result && rect) {
-        *rect = getBounds();
+    const SkPoint* first = pts;
+    if (!this->isRectContour(false, &currVerb, &pts, isClosed, direction)) {
+        return false;
     }
-    return result;
+    if (rect) {
+        int32_t num = SkToS32(pts - first);
+        if (num) {
+            rect->set(first, num);
+        } else {
+            // 'pts' isn't updated for open rects
+            *rect = this->getBounds();
+        }
+    }
+    return true;
 }
 
-bool SkPath::isRect(bool* isClosed, Direction* direction) const {
-    SkDEBUGCODE(this->validate();)
-    int currVerb = 0;
-    const SkPoint* pts = fPathRef->points();
-    return isRectContour(false, &currVerb, &pts, isClosed, direction);
-}
-
-bool SkPath::isNestedRects(SkRect rects[2], Direction dirs[2]) const {
+bool SkPath::isNestedFillRects(SkRect rects[2], Direction dirs[2]) const {
     SkDEBUGCODE(this->validate();)
     int currVerb = 0;
     const SkPoint* pts = fPathRef->points();
     const SkPoint* first = pts;
     Direction testDirs[2];
-    if (!isRectContour(true, &currVerb, &pts, NULL, &testDirs[0])) {
+    if (!isRectContour(true, &currVerb, &pts, nullptr, &testDirs[0])) {
         return false;
     }
     const SkPoint* last = pts;
     SkRect testRects[2];
-    if (isRectContour(false, &currVerb, &pts, NULL, &testDirs[1])) {
+    bool isClosed;
+    if (isRectContour(false, &currVerb, &pts, &isClosed, &testDirs[1])) {
         testRects[0].set(first, SkToS32(last - first));
+        if (!isClosed) {
+            pts = fPathRef->points() + fPathRef->countPoints();
+        }
         testRects[1].set(last, SkToS32(pts - last));
         if (testRects[0].contains(testRects[1])) {
             if (rects) {
@@ -629,6 +632,18 @@ bool SkPath::getLastPt(SkPoint* lastPt) const {
     return false;
 }
 
+void SkPath::setPt(int index, SkScalar x, SkScalar y) {
+    SkDEBUGCODE(this->validate();)
+
+    int count = fPathRef->countPoints();
+    if (count <= index) {
+        return;
+    } else {
+        SkPathRef::Editor ed(&fPathRef);
+        ed.atPoint(index)->set(x, y);
+    }
+}
+
 void SkPath::setLastPt(SkScalar x, SkScalar y) {
     SkDEBUGCODE(this->validate();)
 
@@ -650,10 +665,10 @@ void SkPath::setConvexity(Convexity c) {
 //////////////////////////////////////////////////////////////////////////////
 //  Construction methods
 
-#define DIRTY_AFTER_EDIT                 \
-    do {                                 \
-        fConvexity = kUnknown_Convexity; \
-        fDirection = kUnknown_Direction; \
+#define DIRTY_AFTER_EDIT                                        \
+    do {                                                        \
+        fConvexity = kUnknown_Convexity;                        \
+        fFirstDirection = SkPathPriv::kUnknown_FirstDirection;  \
     } while (0)
 
 void SkPath::incReserve(U16CPU inc) {
@@ -671,6 +686,8 @@ void SkPath::moveTo(SkScalar x, SkScalar y) {
     fLastMoveToIndex = fPathRef->countPoints();
 
     ed.growForVerb(kMove_Verb)->set(x, y);
+
+    DIRTY_AFTER_EDIT;
 }
 
 void SkPath::rMoveTo(SkScalar x, SkScalar y) {
@@ -823,35 +840,118 @@ void SkPath::close() {
 
 ///////////////////////////////////////////////////////////////////////////////
 
+namespace {
+
+template <unsigned N>
+class PointIterator {
+public:
+    PointIterator(SkPath::Direction dir, unsigned startIndex)
+        : fCurrent(startIndex % N)
+        , fAdvance(dir == SkPath::kCW_Direction ? 1 : N - 1) { }
+
+    const SkPoint& current() const {
+        SkASSERT(fCurrent < N);
+        return fPts[fCurrent];
+    }
+
+    const SkPoint& next() {
+        fCurrent = (fCurrent + fAdvance) % N;
+        return this->current();
+    }
+
+protected:
+    SkPoint fPts[N];
+
+private:
+    unsigned fCurrent;
+    unsigned fAdvance;
+};
+
+class RectPointIterator : public PointIterator<4> {
+public:
+    RectPointIterator(const SkRect& rect, SkPath::Direction dir, unsigned startIndex)
+        : PointIterator(dir, startIndex) {
+
+        fPts[0] = SkPoint::Make(rect.fLeft, rect.fTop);
+        fPts[1] = SkPoint::Make(rect.fRight, rect.fTop);
+        fPts[2] = SkPoint::Make(rect.fRight, rect.fBottom);
+        fPts[3] = SkPoint::Make(rect.fLeft, rect.fBottom);
+    }
+};
+
+class OvalPointIterator : public PointIterator<4> {
+public:
+    OvalPointIterator(const SkRect& oval, SkPath::Direction dir, unsigned startIndex)
+        : PointIterator(dir, startIndex) {
+
+        const SkScalar cx = oval.centerX();
+        const SkScalar cy = oval.centerY();
+
+        fPts[0] = SkPoint::Make(cx, oval.fTop);
+        fPts[1] = SkPoint::Make(oval.fRight, cy);
+        fPts[2] = SkPoint::Make(cx, oval.fBottom);
+        fPts[3] = SkPoint::Make(oval.fLeft, cy);
+    }
+};
+
+class RRectPointIterator : public PointIterator<8> {
+public:
+    RRectPointIterator(const SkRRect& rrect, SkPath::Direction dir, unsigned startIndex)
+        : PointIterator(dir, startIndex) {
+
+        const SkRect& bounds = rrect.getBounds();
+        const SkScalar L = bounds.fLeft;
+        const SkScalar T = bounds.fTop;
+        const SkScalar R = bounds.fRight;
+        const SkScalar B = bounds.fBottom;
+
+        fPts[0] = SkPoint::Make(L + rrect.radii(SkRRect::kUpperLeft_Corner).fX, T);
+        fPts[1] = SkPoint::Make(R - rrect.radii(SkRRect::kUpperRight_Corner).fX, T);
+        fPts[2] = SkPoint::Make(R, T + rrect.radii(SkRRect::kUpperRight_Corner).fY);
+        fPts[3] = SkPoint::Make(R, B - rrect.radii(SkRRect::kLowerRight_Corner).fY);
+        fPts[4] = SkPoint::Make(R - rrect.radii(SkRRect::kLowerRight_Corner).fX, B);
+        fPts[5] = SkPoint::Make(L + rrect.radii(SkRRect::kLowerLeft_Corner).fX, B);
+        fPts[6] = SkPoint::Make(L, B - rrect.radii(SkRRect::kLowerLeft_Corner).fY);
+        fPts[7] = SkPoint::Make(L, T + rrect.radii(SkRRect::kUpperLeft_Corner).fY);
+    }
+};
+
+} // anonymous namespace
+
 static void assert_known_direction(int dir) {
     SkASSERT(SkPath::kCW_Direction == dir || SkPath::kCCW_Direction == dir);
 }
 
 void SkPath::addRect(const SkRect& rect, Direction dir) {
-    this->addRect(rect.fLeft, rect.fTop, rect.fRight, rect.fBottom, dir);
+    this->addRect(rect, dir, 0);
 }
 
 void SkPath::addRect(SkScalar left, SkScalar top, SkScalar right,
                      SkScalar bottom, Direction dir) {
+    this->addRect(SkRect::MakeLTRB(left, top, right, bottom), dir, 0);
+}
+
+void SkPath::addRect(const SkRect &rect, Direction dir, unsigned startIndex) {
     assert_known_direction(dir);
-    fDirection = this->hasOnlyMoveTos() ? dir : kUnknown_Direction;
+    fFirstDirection = this->hasOnlyMoveTos() ?
+        (SkPathPriv::FirstDirection)dir : SkPathPriv::kUnknown_FirstDirection;
     SkAutoDisableDirectionCheck addc(this);
+    SkAutoPathBoundsUpdate apbu(this, rect);
 
-    SkAutoPathBoundsUpdate apbu(this, left, top, right, bottom);
+    SkDEBUGCODE(int initialVerbCount = this->countVerbs());
 
-    this->incReserve(5);
+    const int kVerbs = 5; // moveTo + 3x lineTo + close
+    this->incReserve(kVerbs);
 
-    this->moveTo(left, top);
-    if (dir == kCCW_Direction) {
-        this->lineTo(left, bottom);
-        this->lineTo(right, bottom);
-        this->lineTo(right, top);
-    } else {
-        this->lineTo(right, top);
-        this->lineTo(right, bottom);
-        this->lineTo(left, bottom);
-    }
+    RectPointIterator iter(rect, dir, startIndex);
+
+    this->moveTo(iter.current());
+    this->lineTo(iter.next());
+    this->lineTo(iter.next());
+    this->lineTo(iter.next());
     this->close();
+
+    SkASSERT(this->countVerbs() == initialVerbCount + kVerbs);
 }
 
 void SkPath::addPoly(const SkPoint pts[], int count, bool close) {
@@ -873,6 +973,7 @@ void SkPath::addPoly(const SkPoint pts[], int count, bool close) {
 
     if (close) {
         ed.growForVerb(kClose_Verb);
+        fLastMoveToIndex ^= ~fLastMoveToIndex >> (8 * sizeof(fLastMoveToIndex) - 1);
     }
 
     DIRTY_AFTER_EDIT;
@@ -881,17 +982,14 @@ void SkPath::addPoly(const SkPoint pts[], int count, bool close) {
 
 #include "SkGeometry.h"
 
-static int build_arc_points(const SkRect& oval, SkScalar startAngle,
-                            SkScalar sweepAngle,
-                            SkPoint pts[kSkBuildQuadArcStorage]) {
-
-    if (0 == sweepAngle &&
-        (0 == startAngle || SkIntToScalar(360) == startAngle)) {
+static bool arc_is_lone_point(const SkRect& oval, SkScalar startAngle, SkScalar sweepAngle,
+                              SkPoint* pt) {
+    if (0 == sweepAngle && (0 == startAngle || SkIntToScalar(360) == startAngle)) {
         // Chrome uses this path to move into and out of ovals. If not
         // treated as a special case the moves can distort the oval's
         // bounding box (and break the circle special case).
-        pts[0].set(oval.fRight, oval.centerY());
-        return 1;
+        pt->set(oval.fRight, oval.centerY());
+        return true;
     } else if (0 == oval.width() && 0 == oval.height()) {
         // Chrome will sometimes create 0 radius round rects. Having degenerate
         // quad segments in the path prevents the path from being recognized as
@@ -899,25 +997,28 @@ static int build_arc_points(const SkRect& oval, SkScalar startAngle,
         // TODO: optimizing the case where only one of width or height is zero
         // should also be considered. This case, however, doesn't seem to be
         // as common as the single point case.
-        pts[0].set(oval.fRight, oval.fTop);
-        return 1;
+        pt->set(oval.fRight, oval.fTop);
+        return true;
     }
+    return false;
+}
 
-    SkVector start, stop;
-
-    start.fY = SkScalarSinCos(SkDegreesToRadians(startAngle), &start.fX);
-    stop.fY = SkScalarSinCos(SkDegreesToRadians(startAngle + sweepAngle),
-                             &stop.fX);
+// Return the unit vectors pointing at the start/stop points for the given start/sweep angles
+//
+static void angles_to_unit_vectors(SkScalar startAngle, SkScalar sweepAngle,
+                                   SkVector* startV, SkVector* stopV, SkRotationDirection* dir) {
+    startV->fY = SkScalarSinCos(SkDegreesToRadians(startAngle), &startV->fX);
+    stopV->fY = SkScalarSinCos(SkDegreesToRadians(startAngle + sweepAngle), &stopV->fX);
 
     /*  If the sweep angle is nearly (but less than) 360, then due to precision
-        loss in radians-conversion and/or sin/cos, we may end up with coincident
-        vectors, which will fool SkBuildQuadArc into doing nothing (bad) instead
-        of drawing a nearly complete circle (good).
-             e.g. canvas.drawArc(0, 359.99, ...)
-             -vs- canvas.drawArc(0, 359.9, ...)
-        We try to detect this edge case, and tweak the stop vector
+     loss in radians-conversion and/or sin/cos, we may end up with coincident
+     vectors, which will fool SkBuildQuadArc into doing nothing (bad) instead
+     of drawing a nearly complete circle (good).
+     e.g. canvas.drawArc(0, 359.99, ...)
+     -vs- canvas.drawArc(0, 359.9, ...)
+     We try to detect this edge case, and tweak the stop vector
      */
-    if (start == stop) {
+    if (*startV == *stopV) {
         SkScalar sw = SkScalarAbs(sweepAngle);
         if (sw < SkIntToScalar(360) && sw > SkIntToScalar(359)) {
             SkScalar stopRad = SkDegreesToRadians(startAngle + sweepAngle);
@@ -926,20 +1027,30 @@ static int build_arc_points(const SkRect& oval, SkScalar startAngle,
             // not sure how much will be enough, so we use a loop
             do {
                 stopRad -= deltaRad;
-                stop.fY = SkScalarSinCos(stopRad, &stop.fX);
-            } while (start == stop);
+                stopV->fY = SkScalarSinCos(stopRad, &stopV->fX);
+            } while (*startV == *stopV);
         }
     }
+    *dir = sweepAngle > 0 ? kCW_SkRotationDirection : kCCW_SkRotationDirection;
+}
 
+/**
+ *  If this returns 0, then the caller should just line-to the singlePt, else it should
+ *  ignore singlePt and append the specified number of conics.
+ */
+static int build_arc_conics(const SkRect& oval, const SkVector& start, const SkVector& stop,
+                            SkRotationDirection dir, SkConic conics[SkConic::kMaxConicsForArc],
+                            SkPoint* singlePt) {
     SkMatrix    matrix;
 
     matrix.setScale(SkScalarHalf(oval.width()), SkScalarHalf(oval.height()));
     matrix.postTranslate(oval.centerX(), oval.centerY());
 
-    return SkBuildQuadArc(start, stop,
-                          sweepAngle > 0 ? kCW_SkRotationDirection :
-                                           kCCW_SkRotationDirection,
-                          &matrix, pts);
+    int count = SkConic::BuildUnitArc(start, stop, dir, &matrix, conics);
+    if (0 == count) {
+        matrix.mapXY(start.x(), start.y(), singlePt);
+    }
+    return count;
 }
 
 void SkPath::addRoundRect(const SkRect& rect, const SkScalar radii[],
@@ -949,175 +1060,73 @@ void SkPath::addRoundRect(const SkRect& rect, const SkScalar radii[],
     this->addRRect(rrect, dir);
 }
 
-/* The inline clockwise and counterclockwise round rect quad approximations
-   make it easier to see the symmetry patterns used by add corner quads.
-Clockwise                                                     corner value
-    path->lineTo(rect.fLeft,           rect.fTop    + ry);    0 upper left
-    path->quadTo(rect.fLeft,           rect.fTop    + offPtY,
-                 rect.fLeft  + midPtX, rect.fTop    + midPtY);
-    path->quadTo(rect.fLeft  + offPtX, rect.fTop,
-                 rect.fLeft  + rx,     rect.fTop);
-
-    path->lineTo(rect.fRight - rx,     rect.fTop);            1 upper right
-    path->quadTo(rect.fRight - offPtX, rect.fTop,
-                 rect.fRight - midPtX, rect.fTop    + midPtY);
-    path->quadTo(rect.fRight,          rect.fTop    + offPtY,
-                 rect.fRight,          rect.fTop    + ry);
-
-    path->lineTo(rect.fRight,          rect.fBottom - ry);    2 lower right
-    path->quadTo(rect.fRight,          rect.fBottom - offPtY,
-                 rect.fRight - midPtX, rect.fBottom - midPtY);
-    path->quadTo(rect.fRight - offPtX, rect.fBottom,
-                 rect.fRight - rx,     rect.fBottom);
-
-    path->lineTo(rect.fLeft  + rx,     rect.fBottom);         3 lower left
-    path->quadTo(rect.fLeft  + offPtX, rect.fBottom,
-                 rect.fLeft  + midPtX, rect.fBottom - midPtY);
-    path->quadTo(rect.fLeft,           rect.fBottom - offPtY,
-                 rect.fLeft,           rect.fBottom - ry);
-
-Counterclockwise
-    path->lineTo(rect.fLeft,           rect.fBottom - ry);    3 lower left
-    path->quadTo(rect.fLeft,           rect.fBottom - offPtY,
-                 rect.fLeft  + midPtX, rect.fBottom - midPtY);
-    path->quadTo(rect.fLeft  + offPtX, rect.fBottom,
-                 rect.fLeft  + rx,     rect.fBottom);
-
-    path->lineTo(rect.fRight - rx,     rect.fBottom);         2 lower right
-    path->quadTo(rect.fRight - offPtX, rect.fBottom,
-                 rect.fRight - midPtX, rect.fBottom - midPtY);
-    path->quadTo(rect.fRight,          rect.fBottom - offPtY,
-                 rect.fRight,          rect.fBottom - ry);
-
-    path->lineTo(rect.fRight,          rect.fTop    + ry);    1 upper right
-    path->quadTo(rect.fRight,          rect.fTop    + offPtY,
-                 rect.fRight - midPtX, rect.fTop    + midPtY);
-    path->quadTo(rect.fRight - offPtX, rect.fTop,
-                 rect.fRight - rx,     rect.fTop);
-
-    path->lineTo(rect.fLeft  + rx,     rect.fTop);            0 upper left
-    path->quadTo(rect.fLeft  + offPtX, rect.fTop,
-                 rect.fLeft  + midPtX, rect.fTop    + midPtY);
-    path->quadTo(rect.fLeft,           rect.fTop    + offPtY,
-                 rect.fLeft,           rect.fTop    + ry);
-*/
-static void add_corner_quads(SkPath* path, const SkRRect& rrect,
-                             SkRRect::Corner corner, SkPath::Direction dir) {
-    const SkRect& rect = rrect.rect();
-    const SkVector& radii = rrect.radii(corner);
-    SkScalar rx = radii.fX;
-    SkScalar ry = radii.fY;
-    // The mid point of the quadratic arc approximation is half way between the two
-    // control points.
-    const SkScalar mid = 1 - (SK_Scalar1 + SK_ScalarTanPIOver8) / 2;
-    SkScalar midPtX = rx * mid;
-    SkScalar midPtY = ry * mid;
-    const SkScalar control = 1 - SK_ScalarTanPIOver8;
-    SkScalar offPtX = rx * control;
-    SkScalar offPtY = ry * control;
-    static const int kCornerPts = 5;
-    SkScalar xOff[kCornerPts];
-    SkScalar yOff[kCornerPts];
-
-    if ((corner & 1) == (dir == SkPath::kCCW_Direction)) {  // corners always alternate direction
-        SkASSERT(dir == SkPath::kCCW_Direction
-             ? corner == SkRRect::kLowerLeft_Corner || corner == SkRRect::kUpperRight_Corner
-             : corner == SkRRect::kUpperLeft_Corner || corner == SkRRect::kLowerRight_Corner);
-        xOff[0] = xOff[1] = 0;
-        xOff[2] = midPtX;
-        xOff[3] = offPtX;
-        xOff[4] = rx;
-        yOff[0] = ry;
-        yOff[1] = offPtY;
-        yOff[2] = midPtY;
-        yOff[3] = yOff[4] = 0;
-    } else {
-        xOff[0] = rx;
-        xOff[1] = offPtX;
-        xOff[2] = midPtX;
-        xOff[3] = xOff[4] = 0;
-        yOff[0] = yOff[1] = 0;
-        yOff[2] = midPtY;
-        yOff[3] = offPtY;
-        yOff[4] = ry;
-    }
-    if ((corner - 1) & 2) {
-        SkASSERT(corner == SkRRect::kLowerLeft_Corner || corner == SkRRect::kUpperLeft_Corner);
-        for (int i = 0; i < kCornerPts; ++i) {
-            xOff[i] = rect.fLeft + xOff[i];
-        }
-    } else {
-        SkASSERT(corner == SkRRect::kLowerRight_Corner || corner == SkRRect::kUpperRight_Corner);
-        for (int i = 0; i < kCornerPts; ++i) {
-            xOff[i] = rect.fRight - xOff[i];
-        }
-    }
-    if (corner < SkRRect::kLowerRight_Corner) {
-        for (int i = 0; i < kCornerPts; ++i) {
-            yOff[i] = rect.fTop + yOff[i];
-        }
-    } else {
-        for (int i = 0; i < kCornerPts; ++i) {
-            yOff[i] = rect.fBottom - yOff[i];
-        }
-    }
-
-    SkPoint lastPt;
-    SkAssertResult(path->getLastPt(&lastPt));
-    if (lastPt.fX != xOff[0] || lastPt.fY != yOff[0]) {
-        path->lineTo(xOff[0], yOff[0]);
-    }
-    if (rx || ry) {
-        path->quadTo(xOff[1], yOff[1], xOff[2], yOff[2]);
-        path->quadTo(xOff[3], yOff[3], xOff[4], yOff[4]);
-    } else {
-        path->lineTo(xOff[2], yOff[2]);
-        path->lineTo(xOff[4], yOff[4]);
-    }
+void SkPath::addRRect(const SkRRect& rrect, Direction dir) {
+    // legacy start indices: 6 (CW) and 7(CCW)
+    this->addRRect(rrect, dir, dir == kCW_Direction ? 6 : 7);
 }
 
-void SkPath::addRRect(const SkRRect& rrect, Direction dir) {
-    assert_known_direction(dir);
+void SkPath::addRRect(const SkRRect &rrect, Direction dir, unsigned startIndex) {
+        assert_known_direction(dir);
 
-    if (rrect.isEmpty()) {
-        return;
-    }
-
-    const SkRect& bounds = rrect.getBounds();
-
-    if (rrect.isRect()) {
-        this->addRect(bounds, dir);
-    } else if (rrect.isOval()) {
-        this->addOval(bounds, dir);
-#ifdef SK_IGNORE_QUAD_RR_CORNERS_OPT
-    } else if (rrect.isSimple()) {
-        const SkVector& rad = rrect.getSimpleRadii();
-        this->addRoundRect(bounds, rad.x(), rad.y(), dir);
-#endif
-    } else {
-        fDirection = this->hasOnlyMoveTos() ? dir : kUnknown_Direction;
-
-        SkAutoPathBoundsUpdate apbu(this, bounds);
-        SkAutoDisableDirectionCheck addc(this);
-
-        this->incReserve(21);
-        if (kCW_Direction == dir) {
-            this->moveTo(bounds.fLeft,
-                         bounds.fBottom - rrect.fRadii[SkRRect::kLowerLeft_Corner].fY);
-            add_corner_quads(this, rrect, SkRRect::kUpperLeft_Corner, dir);
-            add_corner_quads(this, rrect, SkRRect::kUpperRight_Corner, dir);
-            add_corner_quads(this, rrect, SkRRect::kLowerRight_Corner, dir);
-            add_corner_quads(this, rrect, SkRRect::kLowerLeft_Corner, dir);
-        } else {
-            this->moveTo(bounds.fLeft,
-                         bounds.fTop + rrect.fRadii[SkRRect::kUpperLeft_Corner].fY);
-            add_corner_quads(this, rrect, SkRRect::kLowerLeft_Corner, dir);
-            add_corner_quads(this, rrect, SkRRect::kLowerRight_Corner, dir);
-            add_corner_quads(this, rrect, SkRRect::kUpperRight_Corner, dir);
-            add_corner_quads(this, rrect, SkRRect::kUpperLeft_Corner, dir);
+        if (rrect.isEmpty()) {
+            return;
         }
-        this->close();
-    }
+
+        bool isRRect = hasOnlyMoveTos();
+        const SkRect& bounds = rrect.getBounds();
+
+        if (rrect.isRect()) {
+            // degenerate(rect) => radii points are collapsing
+            this->addRect(bounds, dir, (startIndex + 1) / 2);
+        } else if (rrect.isOval()) {
+            // degenerate(oval) => line points are collapsing
+            this->addOval(bounds, dir, startIndex / 2);
+        } else {
+            fFirstDirection = this->hasOnlyMoveTos() ?
+                                (SkPathPriv::FirstDirection)dir : SkPathPriv::kUnknown_FirstDirection;
+
+            SkAutoPathBoundsUpdate apbu(this, bounds);
+            SkAutoDisableDirectionCheck addc(this);
+
+            // we start with a conic on odd indices when moving CW vs. even indices when moving CCW
+            const bool startsWithConic = ((startIndex & 1) == (dir == kCW_Direction));
+            const SkScalar weight = SK_ScalarRoot2Over2;
+
+            SkDEBUGCODE(int initialVerbCount = this->countVerbs());
+            const int kVerbs = startsWithConic
+                ? 9   // moveTo + 4x conicTo + 3x lineTo + close
+                : 10; // moveTo + 4x lineTo + 4x conicTo + close
+            this->incReserve(kVerbs);
+
+            RRectPointIterator rrectIter(rrect, dir, startIndex);
+            // Corner iterator indices follow the collapsed radii model,
+            // adjusted such that the start pt is "behind" the radii start pt.
+            const unsigned rectStartIndex = startIndex / 2 + (dir == kCW_Direction ? 0 : 1);
+            RectPointIterator rectIter(bounds, dir, rectStartIndex);
+
+            this->moveTo(rrectIter.current());
+            if (startsWithConic) {
+                for (unsigned i = 0; i < 3; ++i) {
+                    this->conicTo(rectIter.next(), rrectIter.next(), weight);
+                    this->lineTo(rrectIter.next());
+                }
+                this->conicTo(rectIter.next(), rrectIter.next(), weight);
+                // final lineTo handled by close().
+            } else {
+                for (unsigned i = 0; i < 4; ++i) {
+                    this->lineTo(rrectIter.next());
+                    this->conicTo(rectIter.next(), rrectIter.next(), weight);
+                }
+            }
+            this->close();
+
+            SkPathRef::Editor ed(&fPathRef);
+            ed.setIsRRect(isRRect);
+
+            SkASSERT(this->countVerbs() == initialVerbCount + kVerbs);
+        }
+
+        SkDEBUGCODE(fPathRef->validate();)
 }
 
 bool SkPath::hasOnlyMoveTos() const {
@@ -1135,10 +1144,6 @@ bool SkPath::hasOnlyMoveTos() const {
     return true;
 }
 
-#ifdef SK_IGNORE_QUAD_RR_CORNERS_OPT
-#define CUBIC_ARC_FACTOR    ((SK_ScalarSqrt2 - SK_Scalar1) * 4 / 3)
-#endif
-
 void SkPath::addRoundRect(const SkRect& rect, SkScalar rx, SkScalar ry,
                           Direction dir) {
     assert_known_direction(dir);
@@ -1151,99 +1156,17 @@ void SkPath::addRoundRect(const SkRect& rect, SkScalar rx, SkScalar ry,
         return;
     }
 
-#ifdef SK_IGNORE_QUAD_RR_CORNERS_OPT
-    SkScalar    w = rect.width();
-    SkScalar    halfW = SkScalarHalf(w);
-    SkScalar    h = rect.height();
-    SkScalar    halfH = SkScalarHalf(h);
-
-    if (halfW <= 0 || halfH <= 0) {
-        return;
-    }
-
-    bool skip_hori = rx >= halfW;
-    bool skip_vert = ry >= halfH;
-
-    if (skip_hori && skip_vert) {
-        this->addOval(rect, dir);
-        return;
-    }
-
-    fDirection = this->hasOnlyMoveTos() ? dir : kUnknown_Direction;
-
-    SkAutoPathBoundsUpdate apbu(this, rect);
-    SkAutoDisableDirectionCheck addc(this);
-
-    if (skip_hori) {
-        rx = halfW;
-    } else if (skip_vert) {
-        ry = halfH;
-    }
-    SkScalar    sx = SkScalarMul(rx, CUBIC_ARC_FACTOR);
-    SkScalar    sy = SkScalarMul(ry, CUBIC_ARC_FACTOR);
-
-    this->incReserve(17);
-    this->moveTo(rect.fRight - rx, rect.fTop);                  // top-right
-    if (dir == kCCW_Direction) {
-        if (!skip_hori) {
-            this->lineTo(rect.fLeft + rx, rect.fTop);           // top
-        }
-        this->cubicTo(rect.fLeft + rx - sx, rect.fTop,
-                      rect.fLeft, rect.fTop + ry - sy,
-                      rect.fLeft, rect.fTop + ry);          // top-left
-        if (!skip_vert) {
-            this->lineTo(rect.fLeft, rect.fBottom - ry);        // left
-        }
-        this->cubicTo(rect.fLeft, rect.fBottom - ry + sy,
-                      rect.fLeft + rx - sx, rect.fBottom,
-                      rect.fLeft + rx, rect.fBottom);       // bot-left
-        if (!skip_hori) {
-            this->lineTo(rect.fRight - rx, rect.fBottom);       // bottom
-        }
-        this->cubicTo(rect.fRight - rx + sx, rect.fBottom,
-                      rect.fRight, rect.fBottom - ry + sy,
-                      rect.fRight, rect.fBottom - ry);      // bot-right
-        if (!skip_vert) {
-            this->lineTo(rect.fRight, rect.fTop + ry);          // right
-        }
-        this->cubicTo(rect.fRight, rect.fTop + ry - sy,
-                      rect.fRight - rx + sx, rect.fTop,
-                      rect.fRight - rx, rect.fTop);         // top-right
-    } else {
-        this->cubicTo(rect.fRight - rx + sx, rect.fTop,
-                      rect.fRight, rect.fTop + ry - sy,
-                      rect.fRight, rect.fTop + ry);         // top-right
-        if (!skip_vert) {
-            this->lineTo(rect.fRight, rect.fBottom - ry);       // right
-        }
-        this->cubicTo(rect.fRight, rect.fBottom - ry + sy,
-                      rect.fRight - rx + sx, rect.fBottom,
-                      rect.fRight - rx, rect.fBottom);      // bot-right
-        if (!skip_hori) {
-            this->lineTo(rect.fLeft + rx, rect.fBottom);        // bottom
-        }
-        this->cubicTo(rect.fLeft + rx - sx, rect.fBottom,
-                      rect.fLeft, rect.fBottom - ry + sy,
-                      rect.fLeft, rect.fBottom - ry);       // bot-left
-        if (!skip_vert) {
-            this->lineTo(rect.fLeft, rect.fTop + ry);           // left
-        }
-        this->cubicTo(rect.fLeft, rect.fTop + ry - sy,
-                      rect.fLeft + rx - sx, rect.fTop,
-                      rect.fLeft + rx, rect.fTop);          // top-left
-        if (!skip_hori) {
-            this->lineTo(rect.fRight - rx, rect.fTop);          // top
-        }
-    }
-    this->close();
-#else
     SkRRect rrect;
     rrect.setRectXY(rect, rx, ry);
     this->addRRect(rrect, dir);
-#endif
 }
 
 void SkPath::addOval(const SkRect& oval, Direction dir) {
+    // legacy start index: 1
+    this->addOval(oval, dir, 1);
+}
+
+void SkPath::addOval(const SkRect &oval, Direction dir, unsigned startPointIndex) {
     assert_known_direction(dir);
 
     /* If addOval() is called after previous moveTo(),
@@ -1254,59 +1177,31 @@ void SkPath::addOval(const SkRect& oval, Direction dir) {
      */
     bool isOval = hasOnlyMoveTos();
     if (isOval) {
-        fDirection = dir;
+        fFirstDirection = (SkPathPriv::FirstDirection)dir;
     } else {
-        fDirection = kUnknown_Direction;
+        fFirstDirection = SkPathPriv::kUnknown_FirstDirection;
     }
 
     SkAutoDisableDirectionCheck addc(this);
-
     SkAutoPathBoundsUpdate apbu(this, oval);
 
-    SkScalar    cx = oval.centerX();
-    SkScalar    cy = oval.centerY();
-    SkScalar    rx = SkScalarHalf(oval.width());
-    SkScalar    ry = SkScalarHalf(oval.height());
+    SkDEBUGCODE(int initialVerbCount = this->countVerbs());
+    const int kVerbs = 6; // moveTo + 4x conicTo + close
+    this->incReserve(kVerbs);
 
-    SkScalar    sx = SkScalarMul(rx, SK_ScalarTanPIOver8);
-    SkScalar    sy = SkScalarMul(ry, SK_ScalarTanPIOver8);
-    SkScalar    mx = SkScalarMul(rx, SK_ScalarRoot2Over2);
-    SkScalar    my = SkScalarMul(ry, SK_ScalarRoot2Over2);
+    OvalPointIterator ovalIter(oval, dir, startPointIndex);
+    // The corner iterator pts are tracking "behind" the oval/radii pts.
+    RectPointIterator rectIter(oval, dir, startPointIndex + (dir == kCW_Direction ? 0 : 1));
+    const SkScalar weight = SK_ScalarRoot2Over2;
 
-    /*
-        To handle imprecision in computing the center and radii, we revert to
-        the provided bounds when we can (i.e. use oval.fLeft instead of cx-rx)
-        to ensure that we don't exceed the oval's bounds *ever*, since we want
-        to use oval for our fast-bounds, rather than have to recompute it.
-    */
-    const SkScalar L = oval.fLeft;      // cx - rx
-    const SkScalar T = oval.fTop;       // cy - ry
-    const SkScalar R = oval.fRight;     // cx + rx
-    const SkScalar B = oval.fBottom;    // cy + ry
-
-    this->incReserve(17);   // 8 quads + close
-    this->moveTo(R, cy);
-    if (dir == kCCW_Direction) {
-        this->quadTo(      R, cy - sy, cx + mx, cy - my);
-        this->quadTo(cx + sx,       T, cx     ,       T);
-        this->quadTo(cx - sx,       T, cx - mx, cy - my);
-        this->quadTo(      L, cy - sy,       L, cy     );
-        this->quadTo(      L, cy + sy, cx - mx, cy + my);
-        this->quadTo(cx - sx,       B, cx     ,       B);
-        this->quadTo(cx + sx,       B, cx + mx, cy + my);
-        this->quadTo(      R, cy + sy,       R, cy     );
-    } else {
-        this->quadTo(      R, cy + sy, cx + mx, cy + my);
-        this->quadTo(cx + sx,       B, cx     ,       B);
-        this->quadTo(cx - sx,       B, cx - mx, cy + my);
-        this->quadTo(      L, cy + sy,       L, cy     );
-        this->quadTo(      L, cy - sy, cx - mx, cy - my);
-        this->quadTo(cx - sx,       T, cx     ,       T);
-        this->quadTo(cx + sx,       T, cx + mx, cy - my);
-        this->quadTo(      R, cy - sy,       R, cy     );
+    this->moveTo(ovalIter.current());
+    for (unsigned i = 0; i < 4; ++i) {
+        this->conicTo(rectIter.next(), ovalIter.next(), weight);
     }
     this->close();
 
+    SkASSERT(this->countVerbs() == initialVerbCount + kVerbs);
+
     SkPathRef::Editor ed(&fPathRef);
 
     ed.setIsOval(isOval);
@@ -1314,9 +1209,7 @@ void SkPath::addOval(const SkRect& oval, Direction dir) {
 
 void SkPath::addCircle(SkScalar x, SkScalar y, SkScalar r, Direction dir) {
     if (r > 0) {
-        SkRect  rect;
-        rect.set(x - r, y - r, x + r, y + r);
-        this->addOval(rect, dir);
+        this->addOval(SkRect::MakeLTRB(x - r, y - r, x + r, y + r), dir);
     }
 }
 
@@ -1326,17 +1219,32 @@ void SkPath::arcTo(const SkRect& oval, SkScalar startAngle, SkScalar sweepAngle,
         return;
     }
 
-    SkPoint pts[kSkBuildQuadArcStorage];
-    int count = build_arc_points(oval, startAngle, sweepAngle, pts);
-    SkASSERT((count & 1) == 1);
-
     if (fPathRef->countVerbs() == 0) {
         forceMoveTo = true;
     }
-    this->incReserve(count);
-    forceMoveTo ? this->moveTo(pts[0]) : this->lineTo(pts[0]);
-    for (int i = 1; i < count; i += 2) {
-        this->quadTo(pts[i], pts[i+1]);
+
+    SkPoint lonePt;
+    if (arc_is_lone_point(oval, startAngle, sweepAngle, &lonePt)) {
+        forceMoveTo ? this->moveTo(lonePt) : this->lineTo(lonePt);
+        return;
+    }
+
+    SkVector startV, stopV;
+    SkRotationDirection dir;
+    angles_to_unit_vectors(startAngle, sweepAngle, &startV, &stopV, &dir);
+
+    SkPoint singlePt;
+    SkConic conics[SkConic::kMaxConicsForArc];
+    int count = build_arc_conics(oval, startV, stopV, dir, conics, &singlePt);
+    if (count) {
+        this->incReserve(count * 2 + 1);
+        const SkPoint& pt = conics[0].fPts[0];
+        forceMoveTo ? this->moveTo(pt) : this->lineTo(pt);
+        for (int i = 0; i < count; ++i) {
+            this->conicTo(conics[i].fPts[1], conics[i].fPts[2], conics[i].fW);
+        }
+    } else {
+        forceMoveTo ? this->moveTo(singlePt) : this->lineTo(singlePt);
     }
 }
 
@@ -1349,36 +1257,22 @@ void SkPath::addArc(const SkRect& oval, SkScalar startAngle, SkScalar sweepAngle
 
     if (sweepAngle >= kFullCircleAngle || sweepAngle <= -kFullCircleAngle) {
         this->addOval(oval, sweepAngle > 0 ? kCW_Direction : kCCW_Direction);
-        return;
+    } else {
+        this->arcTo(oval, startAngle, sweepAngle, true);
     }
-
-    SkPoint pts[kSkBuildQuadArcStorage];
-    int count = build_arc_points(oval, startAngle, sweepAngle, pts);
-
-    SkDEBUGCODE(this->validate();)
-    SkASSERT(count & 1);
-
-    fLastMoveToIndex = fPathRef->countPoints();
-
-    SkPathRef::Editor ed(&fPathRef, 1+(count-1)/2, count);
-
-    ed.growForVerb(kMove_Verb)->set(pts[0].fX, pts[0].fY);
-    if (count > 1) {
-        SkPoint* p = ed.growForRepeatedVerb(kQuad_Verb, (count-1)/2);
-        memcpy(p, &pts[1], (count-1) * sizeof(SkPoint));
-    }
-
-    DIRTY_AFTER_EDIT;
-    SkDEBUGCODE(this->validate();)
 }
 
 /*
     Need to handle the case when the angle is sharp, and our computed end-points
     for the arc go behind pt1 and/or p2...
 */
-void SkPath::arcTo(SkScalar x1, SkScalar y1, SkScalar x2, SkScalar y2,
-                   SkScalar radius) {
-    SkVector    before, after;
+void SkPath::arcTo(SkScalar x1, SkScalar y1, SkScalar x2, SkScalar y2, SkScalar radius) {
+    if (radius == 0) {
+        this->lineTo(x1, y1);
+        return;
+    }
+
+    SkVector before, after;
 
     // need to know our prev pt so we can construct tangent vectors
     {
@@ -1386,12 +1280,6 @@ void SkPath::arcTo(SkScalar x1, SkScalar y1, SkScalar x2, SkScalar y2,
         this->getLastPt(&start);
         // Handle degenerate cases by adding a line to the first point and
         // bailing out.
-        if ((x1 == start.fX && y1 == start.fY) ||
-            (x1 == x2 && y1 == y2) ||
-            radius == 0) {
-            this->lineTo(x1, y1);
-            return;
-        }
         before.setNormalize(x1 - start.fX, y1 - start.fY);
         after.setNormalize(x2 - x1, y2 - y1);
     }
@@ -1621,21 +1509,6 @@ void SkPath::offset(SkScalar dx, SkScalar dy, SkPath* dst) const {
     this->transform(matrix, dst);
 }
 
-#include "SkGeometry.h"
-
-static void subdivide_quad_to(SkPath* path, const SkPoint pts[3],
-                              int level = 2) {
-    if (--level >= 0) {
-        SkPoint tmp[5];
-
-        SkChopQuadAtHalf(pts, tmp);
-        subdivide_quad_to(path, &tmp[0], level);
-        subdivide_quad_to(path, &tmp[2], level);
-    } else {
-        path->quadTo(pts[1], pts[2]);
-    }
-}
-
 static void subdivide_cubic_to(SkPath* path, const SkPoint pts[4],
                                int level = 2) {
     if (--level >= 0) {
@@ -1651,7 +1524,7 @@ static void subdivide_cubic_to(SkPath* path, const SkPoint pts[4],
 
 void SkPath::transform(const SkMatrix& matrix, SkPath* dst) const {
     SkDEBUGCODE(this->validate();)
-    if (dst == NULL) {
+    if (dst == nullptr) {
         dst = (SkPath*)this;
     }
 
@@ -1672,11 +1545,13 @@ void SkPath::transform(const SkMatrix& matrix, SkPath* dst) const {
                     tmp.lineTo(pts[1]);
                     break;
                 case kQuad_Verb:
-                    subdivide_quad_to(&tmp, pts);
+                    // promote the quad to a conic
+                    tmp.conicTo(pts[1], pts[2],
+                                SkConic::TransformW(pts, SK_Scalar1, matrix));
                     break;
                 case kConic_Verb:
-                    SkDEBUGFAIL("TODO: compute new weight");
-                    tmp.conicTo(pts[1], pts[2], iter.conicWeight());
+                    tmp.conicTo(pts[1], pts[2],
+                                SkConic::TransformW(pts, iter.conicWeight(), matrix));
                     break;
                 case kCubic_Verb:
                     subdivide_cubic_to(&tmp, pts);
@@ -1693,28 +1568,30 @@ void SkPath::transform(const SkMatrix& matrix, SkPath* dst) const {
         dst->swap(tmp);
         SkPathRef::Editor ed(&dst->fPathRef);
         matrix.mapPoints(ed.points(), ed.pathRef()->countPoints());
-        dst->fDirection = kUnknown_Direction;
+        dst->fFirstDirection = SkPathPriv::kUnknown_FirstDirection;
     } else {
         SkPathRef::CreateTransformedCopy(&dst->fPathRef, *fPathRef.get(), matrix);
 
         if (this != dst) {
             dst->fFillType = fFillType;
             dst->fConvexity = fConvexity;
+            dst->fIsVolatile = fIsVolatile;
         }
 
-        if (kUnknown_Direction == fDirection) {
-            dst->fDirection = kUnknown_Direction;
+        if (SkPathPriv::kUnknown_FirstDirection == fFirstDirection) {
+            dst->fFirstDirection = SkPathPriv::kUnknown_FirstDirection;
         } else {
             SkScalar det2x2 =
                 SkScalarMul(matrix.get(SkMatrix::kMScaleX), matrix.get(SkMatrix::kMScaleY)) -
                 SkScalarMul(matrix.get(SkMatrix::kMSkewX), matrix.get(SkMatrix::kMSkewY));
             if (det2x2 < 0) {
-                dst->fDirection = SkPath::OppositeDirection(static_cast<Direction>(fDirection));
+                dst->fFirstDirection = SkPathPriv::OppositeFirstDirection(
+                        (SkPathPriv::FirstDirection)fFirstDirection.load());
             } else if (det2x2 > 0) {
-                dst->fDirection = fDirection;
+                dst->fFirstDirection = fFirstDirection.load();
             } else {
                 dst->fConvexity = kUnknown_Convexity;
-                dst->fDirection = kUnknown_Direction;
+                dst->fFirstDirection = SkPathPriv::kUnknown_FirstDirection;
             }
         }
 
@@ -1736,15 +1613,15 @@ enum SegmentState {
 
 SkPath::Iter::Iter() {
 #ifdef SK_DEBUG
-    fPts = NULL;
-    fConicWeights = NULL;
+    fPts = nullptr;
+    fConicWeights = nullptr;
     fMoveTo.fX = fMoveTo.fY = fLastPt.fX = fLastPt.fY = 0;
     fForceClose = fCloseLine = false;
     fSegmentState = kEmptyContour_SegmentState;
 #endif
     // need to init enough to make next() harmlessly return kDone_Verb
-    fVerbs = NULL;
-    fVerbStop = NULL;
+    fVerbs = nullptr;
+    fVerbStop = nullptr;
     fNeedClose = false;
 }
 
@@ -1765,7 +1642,7 @@ void SkPath::Iter::setPath(const SkPath& path, bool forceClose) {
 }
 
 bool SkPath::Iter::isClosedContour() const {
-    if (fVerbs == NULL || fVerbs == fVerbStop) {
+    if (fVerbs == nullptr || fVerbs == fVerbStop) {
         return false;
     }
     if (fForceClose) {
@@ -1826,11 +1703,12 @@ const SkPoint& SkPath::Iter::cons_moveTo() {
     }
 }
 
-void SkPath::Iter::consumeDegenerateSegments() {
+void SkPath::Iter::consumeDegenerateSegments(bool exact) {
     // We need to step over anything that will not move the current draw point
     // forward before the next move is seen
     const uint8_t* lastMoveVerb = 0;
     const SkPoint* lastMovePt = 0;
+    const SkScalar* lastMoveWeight = nullptr;
     SkPoint lastPt = fLastPt;
     while (fVerbs != fVerbStop) {
         unsigned verb = *(fVerbs - 1); // fVerbs is one beyond the current verb
@@ -1839,6 +1717,7 @@ void SkPath::Iter::consumeDegenerateSegments() {
                 // Keep a record of this most recent move
                 lastMoveVerb = fVerbs;
                 lastMovePt = fPts;
+                lastMoveWeight = fConicWeights;
                 lastPt = fPts[0];
                 fVerbs--;
                 fPts++;
@@ -1855,10 +1734,11 @@ void SkPath::Iter::consumeDegenerateSegments() {
                 break;
 
             case kLine_Verb:
-                if (!IsLineDegenerate(lastPt, fPts[0])) {
+                if (!IsLineDegenerate(lastPt, fPts[0], exact)) {
                     if (lastMoveVerb) {
                         fVerbs = lastMoveVerb;
                         fPts = lastMovePt;
+                        fConicWeights = lastMoveWeight;
                         return;
                     }
                     return;
@@ -1870,10 +1750,11 @@ void SkPath::Iter::consumeDegenerateSegments() {
 
             case kConic_Verb:
             case kQuad_Verb:
-                if (!IsQuadDegenerate(lastPt, fPts[0], fPts[1])) {
+                if (!IsQuadDegenerate(lastPt, fPts[0], fPts[1], exact)) {
                     if (lastMoveVerb) {
                         fVerbs = lastMoveVerb;
                         fPts = lastMovePt;
+                        fConicWeights = lastMoveWeight;
                         return;
                     }
                     return;
@@ -1885,10 +1766,11 @@ void SkPath::Iter::consumeDegenerateSegments() {
                 break;
 
             case kCubic_Verb:
-                if (!IsCubicDegenerate(lastPt, fPts[0], fPts[1], fPts[2])) {
+                if (!IsCubicDegenerate(lastPt, fPts[0], fPts[1], fPts[2], exact)) {
                     if (lastMoveVerb) {
                         fVerbs = lastMoveVerb;
                         fPts = lastMovePt;
+                        fConicWeights = lastMoveWeight;
                         return;
                     }
                     return;
@@ -1983,79 +1865,6 @@ SkPath::Verb SkPath::Iter::doNext(SkPoint ptsParam[4]) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkPath::RawIter::RawIter() {
-#ifdef SK_DEBUG
-    fPts = NULL;
-    fConicWeights = NULL;
-    fMoveTo.fX = fMoveTo.fY = fLastPt.fX = fLastPt.fY = 0;
-#endif
-    // need to init enough to make next() harmlessly return kDone_Verb
-    fVerbs = NULL;
-    fVerbStop = NULL;
-}
-
-SkPath::RawIter::RawIter(const SkPath& path) {
-    this->setPath(path);
-}
-
-void SkPath::RawIter::setPath(const SkPath& path) {
-    fPts = path.fPathRef->points();
-    fVerbs = path.fPathRef->verbs();
-    fVerbStop = path.fPathRef->verbsMemBegin();
-    fConicWeights = path.fPathRef->conicWeights() - 1; // begin one behind
-    fMoveTo.fX = fMoveTo.fY = 0;
-    fLastPt.fX = fLastPt.fY = 0;
-}
-
-SkPath::Verb SkPath::RawIter::next(SkPoint pts[4]) {
-    SkASSERT(NULL != pts);
-    if (fVerbs == fVerbStop) {
-        return kDone_Verb;
-    }
-
-    // fVerbs points one beyond next verb so decrement first.
-    unsigned verb = *(--fVerbs);
-    const SkPoint* srcPts = fPts;
-
-    switch (verb) {
-        case kMove_Verb:
-            pts[0] = *srcPts;
-            fMoveTo = srcPts[0];
-            fLastPt = fMoveTo;
-            srcPts += 1;
-            break;
-        case kLine_Verb:
-            pts[0] = fLastPt;
-            pts[1] = srcPts[0];
-            fLastPt = srcPts[0];
-            srcPts += 1;
-            break;
-        case kConic_Verb:
-            fConicWeights += 1;
-            // fall-through
-        case kQuad_Verb:
-            pts[0] = fLastPt;
-            memcpy(&pts[1], srcPts, 2 * sizeof(SkPoint));
-            fLastPt = srcPts[1];
-            srcPts += 2;
-            break;
-        case kCubic_Verb:
-            pts[0] = fLastPt;
-            memcpy(&pts[1], srcPts, 3 * sizeof(SkPoint));
-            fLastPt = srcPts[2];
-            srcPts += 3;
-            break;
-        case kClose_Verb:
-            fLastPt = fMoveTo;
-            pts[0] = fMoveTo;
-            break;
-    }
-    fPts = srcPts;
-    return (Verb)verb;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
 /*
     Format in compressed buffer: [ptCount, verbCount, pts[], verbs[]]
 */
@@ -2063,7 +1872,7 @@ SkPath::Verb SkPath::RawIter::next(SkPoint pts[4]) {
 size_t SkPath::writeToMemory(void* storage) const {
     SkDEBUGCODE(this->validate();)
 
-    if (NULL == storage) {
+    if (nullptr == storage) {
         const int byteCount = sizeof(int32_t) + fPathRef->writeSize();
         return SkAlign4(byteCount);
     }
@@ -2072,7 +1881,9 @@ size_t SkPath::writeToMemory(void* storage) const {
 
     int32_t packed = (fConvexity << kConvexity_SerializationShift) |
                      (fFillType << kFillType_SerializationShift) |
-                     (fDirection << kDirection_SerializationShift);
+                     (fFirstDirection << kDirection_SerializationShift) |
+                     (fIsVolatile << kIsVolatile_SerializationShift) |
+                     kCurrent_Version;
 
     buffer.write32(packed);
 
@@ -2090,19 +1901,41 @@ size_t SkPath::readFromMemory(const void* storage, size_t length) {
         return 0;
     }
 
+    unsigned version = packed & 0xFF;
+
     fConvexity = (packed >> kConvexity_SerializationShift) & 0xFF;
     fFillType = (packed >> kFillType_SerializationShift) & 0xFF;
-    fDirection = (packed >> kDirection_SerializationShift) & 0x3;
+    uint8_t dir = (packed >> kDirection_SerializationShift) & 0x3;
+    fIsVolatile = (packed >> kIsVolatile_SerializationShift) & 0x1;
     SkPathRef* pathRef = SkPathRef::CreateFromBuffer(&buffer);
 
+    // compatibility check
+    if (version < kPathPrivFirstDirection_Version) {
+        switch (dir) {  // old values
+            case 0:
+                fFirstDirection = SkPathPriv::kUnknown_FirstDirection;
+                break;
+            case 1:
+                fFirstDirection = SkPathPriv::kCW_FirstDirection;
+                break;
+            case 2:
+                fFirstDirection = SkPathPriv::kCCW_FirstDirection;
+                break;
+            default:
+                SkASSERT(false);
+        }
+    } else {
+        fFirstDirection = dir;
+    }
+
     size_t sizeRead = 0;
     if (buffer.isValid()) {
         fPathRef.reset(pathRef);
         SkDEBUGCODE(this->validate();)
         buffer.skipToAlign4();
         sizeRead = buffer.pos();
-    } else if (NULL != pathRef) {
-        // If the buffer is not valid, pathRef should be NULL
+    } else if (pathRef) {
+        // If the buffer is not valid, pathRef should be nullptr
         sk_throw();
     }
     return sizeRead;
@@ -2110,20 +1943,11 @@ size_t SkPath::readFromMemory(const void* storage, size_t length) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "SkString.h"
+#include "SkStringUtils.h"
 #include "SkStream.h"
 
-static void append_scalar(SkString* str, SkScalar value) {
-    SkString tmp;
-    tmp.printf("%g", value);
-    if (tmp.contains('.')) {
-        tmp.appendUnichar('f');
-    }
-    str->append(tmp);
-}
-
 static void append_params(SkString* str, const char label[], const SkPoint pts[],
-                          int count, SkScalar conicWeight = -1) {
+                          int count, SkScalarAsStringType strType, SkScalar conicWeight = -1) {
     str->append(label);
     str->append("(");
 
@@ -2131,19 +1955,34 @@ static void append_params(SkString* str, const char label[], const SkPoint pts[]
     count *= 2;
 
     for (int i = 0; i < count; ++i) {
-        append_scalar(str, values[i]);
+        SkAppendScalar(str, values[i], strType);
         if (i < count - 1) {
             str->append(", ");
         }
     }
     if (conicWeight >= 0) {
         str->append(", ");
-        append_scalar(str, conicWeight);
+        SkAppendScalar(str, conicWeight, strType);
     }
-    str->append(");\n");
+    str->append(");");
+    if (kHex_SkScalarAsStringType == strType) {
+        str->append("  // ");
+        for (int i = 0; i < count; ++i) {
+            SkAppendScalarDec(str, values[i]);
+            if (i < count - 1) {
+                str->append(", ");
+            }
+        }
+        if (conicWeight >= 0) {
+            str->append(", ");
+            SkAppendScalarDec(str, conicWeight);
+        }
+    }
+    str->append("\n");
 }
 
-void SkPath::dump(SkWStream* wStream, bool forceClose) const {
+void SkPath::dump(SkWStream* wStream, bool forceClose, bool dumpAsHex) const {
+    SkScalarAsStringType asType = dumpAsHex ? kHex_SkScalarAsStringType : kDec_SkScalarAsStringType;
     Iter    iter(*this, forceClose);
     SkPoint pts[4];
     Verb    verb;
@@ -2156,19 +1995,19 @@ void SkPath::dump(SkWStream* wStream, bool forceClose) const {
     while ((verb = iter.next(pts, false)) != kDone_Verb) {
         switch (verb) {
             case kMove_Verb:
-                append_params(&builder, "path.moveTo", &pts[0], 1);
+                append_params(&builder, "path.moveTo", &pts[0], 1, asType);
                 break;
             case kLine_Verb:
-                append_params(&builder, "path.lineTo", &pts[1], 1);
+                append_params(&builder, "path.lineTo", &pts[1], 1, asType);
                 break;
             case kQuad_Verb:
-                append_params(&builder, "path.quadTo", &pts[1], 2);
+                append_params(&builder, "path.quadTo", &pts[1], 2, asType);
                 break;
             case kConic_Verb:
-                append_params(&builder, "path.conicTo", &pts[1], 2, iter.conicWeight());
+                append_params(&builder, "path.conicTo", &pts[1], 2, asType, iter.conicWeight());
                 break;
             case kCubic_Verb:
-                append_params(&builder, "path.cubicTo", &pts[1], 3);
+                append_params(&builder, "path.cubicTo", &pts[1], 3, asType);
                 break;
             case kClose_Verb:
                 builder.append("path.close();\n");
@@ -2178,21 +2017,26 @@ void SkPath::dump(SkWStream* wStream, bool forceClose) const {
                 verb = kDone_Verb;  // stop the loop
                 break;
         }
+        if (!wStream && builder.size()) {
+            SkDebugf("%s", builder.c_str());
+            builder.reset();
+        }
     }
     if (wStream) {
         wStream->writeText(builder.c_str());
-    } else {
-        SkDebugf("%s", builder.c_str());
     }
 }
 
 void SkPath::dump() const {
-    this->dump(NULL, false);
+    this->dump(nullptr, false, false);
+}
+
+void SkPath::dumpHex() const {
+    this->dump(nullptr, false, true);
 }
 
 #ifdef SK_DEBUG
 void SkPath::validate() const {
-    SkASSERT(this != NULL);
     SkASSERT((fFillType & ~3) == 0);
 
 #ifdef SK_DEBUG_PATH
@@ -2228,6 +2072,16 @@ void SkPath::validate() const {
 static int sign(SkScalar x) { return x < 0; }
 #define kValueNeverReturnedBySign   2
 
+enum DirChange {
+    kLeft_DirChange,
+    kRight_DirChange,
+    kStraight_DirChange,
+    kBackwards_DirChange,
+
+    kInvalid_DirChange
+};
+
+
 static bool almost_equal(SkScalar compA, SkScalar compB) {
     // The error epsilon was empirically derived; worse case round rects
     // with a mid point outset by 2x float epsilon in tests had an error
@@ -2242,13 +2096,20 @@ static bool almost_equal(SkScalar compA, SkScalar compB) {
     return aBits < bBits + epsilon && bBits < aBits + epsilon;
 }
 
+static bool approximately_zero_when_compared_to(double x, double y) {
+    return x == 0 || fabs(x) < fabs(y * FLT_EPSILON);
+}
+
+
 // only valid for a single contour
 struct Convexicator {
     Convexicator()
     : fPtCount(0)
     , fConvexity(SkPath::kConvex_Convexity)
-    , fDirection(SkPath::kUnknown_Direction) {
-        fSign = 0;
+    , fFirstDirection(SkPathPriv::kUnknown_FirstDirection)
+    , fIsFinite(true)
+    , fIsCurve(false) {
+        fExpectedDir = kInvalid_DirChange;
         // warnings
         fLastPt.set(0, 0);
         fCurrPt.set(0, 0);
@@ -2262,10 +2123,10 @@ struct Convexicator {
     SkPath::Convexity getConvexity() const { return fConvexity; }
 
     /** The direction returned is only valid if the path is determined convex */
-    SkPath::Direction getDirection() const { return fDirection; }
+    SkPathPriv::FirstDirection getFirstDirection() const { return fFirstDirection; }
 
     void addPt(const SkPoint& pt) {
-        if (SkPath::kConcave_Convexity == fConvexity) {
+        if (SkPath::kConcave_Convexity == fConvexity || !fIsFinite) {
             return;
         }
 
@@ -2274,7 +2135,11 @@ struct Convexicator {
             ++fPtCount;
         } else {
             SkVector vec = pt - fCurrPt;
-            if (vec.fX || vec.fY) {
+            SkScalar lengthSqd = vec.lengthSqd();
+            if (!SkScalarIsFinite(lengthSqd)) {
+                fIsFinite = false;
+            } else if (lengthSqd) {
+                fPriorPt = fLastPt;
                 fLastPt = fCurrPt;
                 fCurrPt = pt;
                 if (++fPtCount == 2) {
@@ -2304,36 +2169,97 @@ struct Convexicator {
         }
     }
 
-private:
-    void addVec(const SkVector& vec) {
-        SkASSERT(vec.fX || vec.fY);
-        SkScalar cross = SkPoint::CrossProduct(fLastVec, vec);
+    DirChange directionChange(const SkVector& curVec) {
+        SkScalar cross = SkPoint::CrossProduct(fLastVec, curVec);
+
         SkScalar smallest = SkTMin(fCurrPt.fX, SkTMin(fCurrPt.fY, SkTMin(fLastPt.fX, fLastPt.fY)));
         SkScalar largest = SkTMax(fCurrPt.fX, SkTMax(fCurrPt.fY, SkTMax(fLastPt.fX, fLastPt.fY)));
         largest = SkTMax(largest, -smallest);
+
         if (!almost_equal(largest, largest + cross)) {
             int sign = SkScalarSignAsInt(cross);
-            if (0 == fSign) {
-                fSign = sign;
-                fDirection = (1 == sign) ? SkPath::kCW_Direction : SkPath::kCCW_Direction;
-            } else if (sign && fSign != sign) {
-                fConvexity = SkPath::kConcave_Convexity;
-                fDirection = SkPath::kUnknown_Direction;
+            if (sign) {
+                return (1 == sign) ? kRight_DirChange : kLeft_DirChange;
             }
-            fLastVec = vec;
+        }
+
+        if (cross) {
+            double dLastVecX = SkScalarToDouble(fLastPt.fX) - SkScalarToDouble(fPriorPt.fX);
+            double dLastVecY = SkScalarToDouble(fLastPt.fY) - SkScalarToDouble(fPriorPt.fY);
+            double dCurrVecX = SkScalarToDouble(fCurrPt.fX) - SkScalarToDouble(fLastPt.fX);
+            double dCurrVecY = SkScalarToDouble(fCurrPt.fY) - SkScalarToDouble(fLastPt.fY);
+            double dCross = dLastVecX * dCurrVecY - dLastVecY * dCurrVecX;
+            if (!approximately_zero_when_compared_to(dCross, SkScalarToDouble(largest))) {
+                int sign = SkScalarSignAsInt(SkDoubleToScalar(dCross));
+                if (sign) {
+                    return (1 == sign) ? kRight_DirChange : kLeft_DirChange;
+                }
+            }
+        }
+
+        if (!SkScalarNearlyZero(fLastVec.lengthSqd(), SK_ScalarNearlyZero*SK_ScalarNearlyZero) &&
+            !SkScalarNearlyZero(curVec.lengthSqd(), SK_ScalarNearlyZero*SK_ScalarNearlyZero) &&
+            fLastVec.dot(curVec) < 0.0f) {
+            return kBackwards_DirChange;
+        }
+
+        return kStraight_DirChange;
+    }
+
+
+    bool isFinite() const {
+        return fIsFinite;
+    }
+
+    void setCurve(bool isCurve) {
+        fIsCurve = isCurve;
+    }
+
+private:
+    void addVec(const SkVector& vec) {
+        SkASSERT(vec.fX || vec.fY);
+        DirChange dir = this->directionChange(vec);
+        switch (dir) {
+            case kLeft_DirChange:       // fall through
+            case kRight_DirChange:
+                if (kInvalid_DirChange == fExpectedDir) {
+                    fExpectedDir = dir;
+                    fFirstDirection = (kRight_DirChange == dir) ? SkPathPriv::kCW_FirstDirection
+                                                                : SkPathPriv::kCCW_FirstDirection;
+                } else if (dir != fExpectedDir) {
+                    fConvexity = SkPath::kConcave_Convexity;
+                    fFirstDirection = SkPathPriv::kUnknown_FirstDirection;
+                }
+                fLastVec = vec;
+                break;
+            case kStraight_DirChange:
+                break;
+            case kBackwards_DirChange:
+                if (fIsCurve) {
+                    fConvexity = SkPath::kConcave_Convexity;
+                    fFirstDirection = SkPathPriv::kUnknown_FirstDirection;
+                }
+                fLastVec = vec;
+                break;
+            case kInvalid_DirChange:
+                SkFAIL("Use of invalid direction change flag");
+                break;
         }
     }
 
+    SkPoint             fPriorPt;
     SkPoint             fLastPt;
     SkPoint             fCurrPt;
     // fLastVec does not necessarily start at fLastPt. We only advance it when the cross product
     // value with the current vec is deemed to be of a significant value.
     SkVector            fLastVec, fFirstVec;
     int                 fPtCount;   // non-degenerate points
-    int                 fSign;
+    DirChange           fExpectedDir;
     SkPath::Convexity   fConvexity;
-    SkPath::Direction   fDirection;
+    SkPathPriv::FirstDirection   fFirstDirection;
     int                 fDx, fDy, fSx, fSy;
+    bool                fIsFinite;
+    bool                fIsCurve;
 };
 
 SkPath::Convexity SkPath::internalGetConvexity() const {
@@ -2346,7 +2272,10 @@ SkPath::Convexity SkPath::internalGetConvexity() const {
     int             count;
     Convexicator    state;
 
-    while ((verb = iter.next(pts)) != SkPath::kDone_Verb) {
+    if (!isFinite()) {
+        return kUnknown_Convexity;
+    }
+    while ((verb = iter.next(pts, true, true)) != SkPath::kDone_Verb) {
         switch (verb) {
             case kMove_Verb:
                 if (++contourCount > 1) {
@@ -2354,13 +2283,23 @@ SkPath::Convexity SkPath::internalGetConvexity() const {
                     return kConcave_Convexity;
                 }
                 pts[1] = pts[0];
+                // fall through
+            case kLine_Verb:
                 count = 1;
+                state.setCurve(false);
+                break;
+            case kQuad_Verb:
+                // fall through
+            case kConic_Verb:
+                // fall through
+            case kCubic_Verb:
+                count = 2 + (kCubic_Verb == verb);
+                // As an additional enhancement, this could set curve true only
+                // if the curve is nonlinear
+                state.setCurve(true);
                 break;
-            case kLine_Verb: count = 1; break;
-            case kQuad_Verb: count = 2; break;
-            case kConic_Verb: count = 2; break;
-            case kCubic_Verb: count = 3; break;
             case kClose_Verb:
+                state.setCurve(false);
                 state.close();
                 count = 0;
                 break;
@@ -2374,14 +2313,17 @@ SkPath::Convexity SkPath::internalGetConvexity() const {
             state.addPt(pts[i]);
         }
         // early exit
+        if (!state.isFinite()) {
+            return kUnknown_Convexity;
+        }
         if (kConcave_Convexity == state.getConvexity()) {
             fConvexity = kConcave_Convexity;
             return kConcave_Convexity;
         }
     }
     fConvexity = state.getConvexity();
-    if (kConvex_Convexity == fConvexity && kUnknown_Direction == fDirection) {
-        fDirection = state.getDirection();
+    if (kConvex_Convexity == fConvexity && SkPathPriv::kUnknown_FirstDirection == fFirstDirection) {
+        fFirstDirection = state.getFirstDirection();
     }
     return static_cast<Convexity>(fConvexity);
 }
@@ -2542,8 +2484,8 @@ static int find_min_max_x_at_y(const SkPoint pts[], int index, int n,
     return minIndex;
 }
 
-static void crossToDir(SkScalar cross, SkPath::Direction* dir) {
-    *dir = cross > 0 ? SkPath::kCW_Direction : SkPath::kCCW_Direction;
+static void crossToDir(SkScalar cross, SkPathPriv::FirstDirection* dir) {
+    *dir = cross > 0 ? SkPathPriv::kCW_FirstDirection : SkPathPriv::kCCW_FirstDirection;
 }
 
 /*
@@ -2554,24 +2496,24 @@ static void crossToDir(SkScalar cross, SkPath::Direction* dir) {
  *  that is outer most (or at least has the global y-max) before we can consider
  *  its cross product.
  */
-bool SkPath::cheapComputeDirection(Direction* dir) const {
-    if (kUnknown_Direction != fDirection) {
-        *dir = static_cast<Direction>(fDirection);
+bool SkPathPriv::CheapComputeFirstDirection(const SkPath& path, FirstDirection* dir) {
+    if (kUnknown_FirstDirection != path.fFirstDirection.load()) {
+        *dir = static_cast<FirstDirection>(path.fFirstDirection.load());
         return true;
     }
 
     // don't want to pay the cost for computing this if it
     // is unknown, so we don't call isConvex()
-    if (kConvex_Convexity == this->getConvexityOrUnknown()) {
-        SkASSERT(kUnknown_Direction == fDirection);
-        *dir = static_cast<Direction>(fDirection);
+    if (SkPath::kConvex_Convexity == path.getConvexityOrUnknown()) {
+        SkASSERT(kUnknown_FirstDirection == path.fFirstDirection);
+        *dir = static_cast<FirstDirection>(path.fFirstDirection.load());
         return false;
     }
 
-    ContourIter iter(*fPathRef.get());
+    ContourIter iter(*path.fPathRef.get());
 
     // initialize with our logical y-min
-    SkScalar ymax = this->getBounds().fTop;
+    SkScalar ymax = path.getBounds().fTop;
     SkScalar ymaxCross = 0;
 
     for (; !iter.done(); iter.next()) {
@@ -2637,7 +2579,7 @@ bool SkPath::cheapComputeDirection(Direction* dir) const {
     }
     if (ymaxCross) {
         crossToDir(ymaxCross, dir);
-        fDirection = *dir;
+        path.fFirstDirection = *dir;
         return true;
     } else {
         return false;
@@ -2895,3 +2837,9 @@ bool SkPath::contains(SkScalar x, SkScalar y) const {
     }
     return SkToBool(w);
 }
+
+int SkPath::ConvertConicToQuads(const SkPoint& p0, const SkPoint& p1, const SkPoint& p2,
+                                SkScalar w, SkPoint pts[], int pow2) {
+    const SkConic conic(p0, p1, p2, w);
+    return conic.chopIntoQuadsPOW2(pts, pow2);
+}
diff --git a/gfx/skia/skia/src/core/SkPathEffect.cpp b/gfx/skia/skia/src/core/SkPathEffect.cpp
index 01d5d6f9619a..2403ffcb30c5 100644
--- a/gfx/skia/skia/src/core/SkPathEffect.cpp
+++ b/gfx/skia/skia/src/core/SkPathEffect.cpp
@@ -45,19 +45,31 @@ SkPairPathEffect::~SkPairPathEffect() {
     Format: [oe0-factory][pe1-factory][pe0-size][pe0-data][pe1-data]
 */
 void SkPairPathEffect::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
     buffer.writeFlattenable(fPE0);
     buffer.writeFlattenable(fPE1);
 }
 
-SkPairPathEffect::SkPairPathEffect(SkReadBuffer& buffer) {
-    fPE0 = buffer.readPathEffect();
-    fPE1 = buffer.readPathEffect();
-    // either of these may fail, so we have to check for nulls later on
+#ifndef SK_IGNORE_TO_STRING
+void SkPairPathEffect::toString(SkString* str) const {
+    str->appendf("first: ");
+    if (fPE0) {
+        fPE0->toString(str);
+    }
+    str->appendf(" second: ");
+    if (fPE1) {
+        fPE1->toString(str);
+    }
 }
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
+SkFlattenable* SkComposePathEffect::CreateProc(SkReadBuffer& buffer) {
+    SkAutoTUnref<SkPathEffect> pe0(buffer.readPathEffect());
+    SkAutoTUnref<SkPathEffect> pe1(buffer.readPathEffect());
+    return SkComposePathEffect::Create(pe0, pe1);
+}
+
 bool SkComposePathEffect::filterPath(SkPath* dst, const SkPath& src,
                              SkStrokeRec* rec, const SkRect* cullRect) const {
     // we may have failed to unflatten these, so we have to check
@@ -74,11 +86,35 @@ bool SkComposePathEffect::filterPath(SkPath* dst, const SkPath& src,
     return fPE0->filterPath(dst, *ptr, rec, cullRect);
 }
 
+
+#ifndef SK_IGNORE_TO_STRING
+void SkComposePathEffect::toString(SkString* str) const {
+    str->appendf("SkComposePathEffect: (");
+    this->INHERITED::toString(str);
+    str->appendf(")");
+}
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////
 
+SkFlattenable* SkSumPathEffect::CreateProc(SkReadBuffer& buffer) {
+    SkAutoTUnref<SkPathEffect> pe0(buffer.readPathEffect());
+    SkAutoTUnref<SkPathEffect> pe1(buffer.readPathEffect());
+    return SkSumPathEffect::Create(pe0, pe1);
+}
+
 bool SkSumPathEffect::filterPath(SkPath* dst, const SkPath& src,
                              SkStrokeRec* rec, const SkRect* cullRect) const {
     // use bit-or so that we always call both, even if the first one succeeds
     return fPE0->filterPath(dst, src, rec, cullRect) |
            fPE1->filterPath(dst, src, rec, cullRect);
 }
+
+
+#ifndef SK_IGNORE_TO_STRING
+void SkSumPathEffect::toString(SkString* str) const {
+    str->appendf("SkSumPathEffect: (");
+    this->INHERITED::toString(str);
+    str->appendf(")");
+}
+#endif
diff --git a/gfx/skia/skia/src/core/SkPathHeap.cpp b/gfx/skia/skia/src/core/SkPathHeap.cpp
deleted file mode 100644
index 84ffb04b80ee..000000000000
--- a/gfx/skia/skia/src/core/SkPathHeap.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#include "SkPathHeap.h"
-#include "SkPath.h"
-#include "SkStream.h"
-#include "SkReadBuffer.h"
-#include "SkTSearch.h"
-#include "SkWriteBuffer.h"
-#include <new>
-
-#define kPathCount  64
-
-SkPathHeap::SkPathHeap() : fHeap(kPathCount * sizeof(SkPath)) {
-}
-
-SkPathHeap::SkPathHeap(SkReadBuffer& buffer)
-            : fHeap(kPathCount * sizeof(SkPath)) {
-    const int count = buffer.readInt();
-
-    fPaths.setCount(count);
-    SkPath** ptr = fPaths.begin();
-    SkPath* p = (SkPath*)fHeap.allocThrow(count * sizeof(SkPath));
-
-    for (int i = 0; i < count; i++) {
-        new (p) SkPath;
-        buffer.readPath(p);
-        *ptr++ = p; // record the pointer
-        p++;        // move to the next storage location
-    }
-}
-
-SkPathHeap::~SkPathHeap() {
-    SkPath** iter = fPaths.begin();
-    SkPath** stop = fPaths.end();
-    while (iter < stop) {
-        (*iter)->~SkPath();
-        iter++;
-    }
-}
-
-int SkPathHeap::append(const SkPath& path) {
-    SkPath* p = (SkPath*)fHeap.allocThrow(sizeof(SkPath));
-    new (p) SkPath(path);
-    *fPaths.append() = p;
-    return fPaths.count();
-}
-
-SkPathHeap::LookupEntry::LookupEntry(const SkPath& path)
-    : fGenerationID(path.getGenerationID()), fStorageSlot(0) {
-}
-
-SkPathHeap::LookupEntry* SkPathHeap::addIfNotPresent(const SkPath& path) {
-    LookupEntry searchKey(path);
-    int index = SkTSearch<const LookupEntry, LookupEntry::Less>(
-                                    fLookupTable.begin(),
-                                    fLookupTable.count(),
-                                    searchKey,
-                                    sizeof(LookupEntry));
-    if (index < 0) {
-        index = ~index;
-        *fLookupTable.insert(index) = LookupEntry(path);
-    }
-
-    return &fLookupTable[index];;
-}
-
-int SkPathHeap::insert(const SkPath& path) {
-    SkPathHeap::LookupEntry* entry = this->addIfNotPresent(path);
-
-    if (entry->storageSlot() > 0) {
-        return entry->storageSlot();
-    }
-
-    int newSlot = this->append(path);
-    SkASSERT(newSlot > 0);
-    entry->setStorageSlot(newSlot);
-    return newSlot;
-}
-
-void SkPathHeap::flatten(SkWriteBuffer& buffer) const {
-    int count = fPaths.count();
-
-    buffer.writeInt(count);
-    SkPath* const* iter = fPaths.begin();
-    SkPath* const* stop = fPaths.end();
-    while (iter < stop) {
-        buffer.writePath(**iter);
-        iter++;
-    }
-}
diff --git a/gfx/skia/skia/src/core/SkPathHeap.h b/gfx/skia/skia/src/core/SkPathHeap.h
deleted file mode 100644
index 377d8d968ba1..000000000000
--- a/gfx/skia/skia/src/core/SkPathHeap.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#ifndef SkPathHeap_DEFINED
-#define SkPathHeap_DEFINED
-
-#include "SkRefCnt.h"
-#include "SkChunkAlloc.h"
-#include "SkTDArray.h"
-
-class SkPath;
-class SkReadBuffer;
-class SkWriteBuffer;
-
-class SkPathHeap : public SkRefCnt {
-public:
-    SK_DECLARE_INST_COUNT(SkPathHeap)
-
-    SkPathHeap();
-    SkPathHeap(SkReadBuffer&);
-    virtual ~SkPathHeap();
-
-    /** Copy the path into the heap, and return the new total number of paths.
-        Thus, the returned value will be index+1, where index is the index of
-        this newly added (copied) path.
-     */
-    int append(const SkPath&);
-
-    /** Add the specified path to the heap using its gen ID to de-duplicate.
-        Returns the path's index in the heap + 1.
-     */
-    int insert(const SkPath&);
-
-    // called during picture-playback
-    int count() const { return fPaths.count(); }
-    const SkPath& operator[](int index) const {
-        return *fPaths[index];
-    }
-
-    void flatten(SkWriteBuffer&) const;
-
-private:
-    // we store the paths in the heap (placement new)
-    SkChunkAlloc        fHeap;
-    // we just store ptrs into fHeap here
-    SkTDArray<SkPath*>  fPaths;
-
-    class LookupEntry {
-    public:
-        LookupEntry(const SkPath& path);
-
-        int storageSlot() const { return fStorageSlot; }
-        void setStorageSlot(int storageSlot) { fStorageSlot = storageSlot; }
-
-        static bool Less(const LookupEntry& a, const LookupEntry& b) {
-            return a.fGenerationID < b.fGenerationID;
-        }
-
-    private:
-        uint32_t fGenerationID;     // the SkPath's generation ID
-        // the path's index in the heap + 1. It is 0 if the path is not yet in the heap.
-        int      fStorageSlot;
-    };
-
-    SkTDArray<LookupEntry> fLookupTable;
-
-    SkPathHeap::LookupEntry* addIfNotPresent(const SkPath& path);
-
-    typedef SkRefCnt INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/core/SkPathMeasure.cpp b/gfx/skia/skia/src/core/SkPathMeasure.cpp
index 48f7571c0749..caff6df399d5 100644
--- a/gfx/skia/skia/src/core/SkPathMeasure.cpp
+++ b/gfx/skia/skia/src/core/SkPathMeasure.cpp
@@ -12,11 +12,12 @@
 #include "SkPath.h"
 #include "SkTSearch.h"
 
-// these must be 0,1,2 since they are in our 2-bit field
+// these must be 0,1,2,3 since they are in our 2-bit field
 enum {
     kLine_SegType,
     kQuad_SegType,
-    kCubic_SegType
+    kCubic_SegType,
+    kConic_SegType,
 };
 
 #define kMaxTValue  32767
@@ -104,6 +105,30 @@ SkScalar SkPathMeasure::compute_quad_segs(const SkPoint pts[3],
     return distance;
 }
 
+SkScalar SkPathMeasure::compute_conic_segs(const SkConic& conic,
+                                           SkScalar distance, int mint, int maxt, int ptIndex) {
+    if (tspan_big_enough(maxt - mint) && quad_too_curvy(conic.fPts)) {
+        SkConic tmp[2];
+        conic.chop(tmp);
+
+        int halft = (mint + maxt) >> 1;
+        distance = this->compute_conic_segs(tmp[0], distance, mint, halft, ptIndex);
+        distance = this->compute_conic_segs(tmp[1], distance, halft, maxt, ptIndex);
+    } else {
+        SkScalar d = SkPoint::Distance(conic.fPts[0], conic.fPts[2]);
+        SkScalar prevD = distance;
+        distance += d;
+        if (distance > prevD) {
+            Segment* seg = fSegments.append();
+            seg->fDistance = distance;
+            seg->fPtIndex = ptIndex;
+            seg->fType = kConic_SegType;
+            seg->fTValue = maxt;
+        }
+    }
+    return distance;
+}
+
 SkScalar SkPathMeasure::compute_cubic_segs(const SkPoint pts[4],
                            SkScalar distance, int mint, int maxt, int ptIndex) {
     if (tspan_big_enough(maxt - mint) && cubic_too_curvy(pts)) {
@@ -147,9 +172,6 @@ void SkPathMeasure::buildSegments() {
     bool done = false;
     do {
         switch (fIter.next(pts)) {
-            case SkPath::kConic_Verb:
-                SkASSERT(0);
-                break;
             case SkPath::kMove_Verb:
                 ptIndex += 1;
                 fPts.append(1, pts);
@@ -178,18 +200,30 @@ void SkPathMeasure::buildSegments() {
 
             case SkPath::kQuad_Verb: {
                 SkScalar prevD = distance;
-                distance = this->compute_quad_segs(pts, distance, 0,
-                                                   kMaxTValue, ptIndex);
+                distance = this->compute_quad_segs(pts, distance, 0, kMaxTValue, ptIndex);
                 if (distance > prevD) {
                     fPts.append(2, pts + 1);
                     ptIndex += 2;
                 }
             } break;
 
+            case SkPath::kConic_Verb: {
+                const SkConic conic(pts, fIter.conicWeight());
+                SkScalar prevD = distance;
+                distance = this->compute_conic_segs(conic, distance, 0, kMaxTValue, ptIndex);
+                if (distance > prevD) {
+                    // we store the conic weight in our next point, followed by the last 2 pts
+                    // thus to reconstitue a conic, you'd need to say
+                    // SkConic(pts[0], pts[2], pts[3], weight = pts[1].fX)
+                    fPts.append()->set(conic.fW, 0);
+                    fPts.append(2, pts + 1);
+                    ptIndex += 3;
+                }
+            } break;
+
             case SkPath::kCubic_Verb: {
                 SkScalar prevD = distance;
-                distance = this->compute_cubic_segs(pts, distance, 0,
-                                                    kMaxTValue, ptIndex);
+                distance = this->compute_cubic_segs(pts, distance, 0, kMaxTValue, ptIndex);
                 if (distance > prevD) {
                     fPts.append(3, pts + 1);
                     ptIndex += 3;
@@ -256,8 +290,14 @@ static void compute_pos_tan(const SkPoint pts[], int segType,
                 tangent->normalize();
             }
             break;
+        case kConic_SegType: {
+            SkConic(pts[0], pts[2], pts[3], pts[1].fX).evalAt(t, pos, tangent);
+            if (tangent) {
+                tangent->normalize();
+            }
+        } break;
         case kCubic_SegType:
-            SkEvalCubicAt(pts, t, pos, tangent, NULL);
+            SkEvalCubicAt(pts, t, pos, tangent, nullptr);
             if (tangent) {
                 tangent->normalize();
             }
@@ -274,10 +314,15 @@ static void seg_to(const SkPoint pts[], int segType,
     SkASSERT(startT <= stopT);
 
     if (startT == stopT) {
-        return; // should we report this, to undo a moveTo?
+        /* if the dash as a zero-length on segment, add a corresponding zero-length line.
+           The stroke code will add end caps to zero length lines as appropriate */
+        SkPoint lastPt;
+        SkAssertResult(dst->getLastPt(&lastPt));
+        dst->lineTo(lastPt);
+        return;
     }
 
-    SkPoint         tmp0[7], tmp1[7];
+    SkPoint tmp0[7], tmp1[7];
 
     switch (segType) {
         case kLine_SegType:
@@ -301,12 +346,34 @@ static void seg_to(const SkPoint pts[], int segType,
                 if (SK_Scalar1 == stopT) {
                     dst->quadTo(tmp0[3], tmp0[4]);
                 } else {
-                    SkChopQuadAt(&tmp0[2], tmp1, SkScalarDiv(stopT - startT,
-                                                         SK_Scalar1 - startT));
+                    SkChopQuadAt(&tmp0[2], tmp1, (stopT - startT) / (1 - startT));
                     dst->quadTo(tmp1[1], tmp1[2]);
                 }
             }
             break;
+        case kConic_SegType: {
+            SkConic conic(pts[0], pts[2], pts[3], pts[1].fX);
+
+            if (0 == startT) {
+                if (SK_Scalar1 == stopT) {
+                    dst->conicTo(conic.fPts[1], conic.fPts[2], conic.fW);
+                } else {
+                    SkConic tmp[2];
+                    conic.chopAt(stopT, tmp);
+                    dst->conicTo(tmp[0].fPts[1], tmp[0].fPts[2], tmp[0].fW);
+                }
+            } else {
+                SkConic tmp1[2];
+                conic.chopAt(startT, tmp1);
+                if (SK_Scalar1 == stopT) {
+                    dst->conicTo(tmp1[1].fPts[1], tmp1[1].fPts[2], tmp1[1].fW);
+                } else {
+                    SkConic tmp2[2];
+                    tmp1[1].chopAt((stopT - startT) / (SK_Scalar1 - startT), tmp2);
+                    dst->conicTo(tmp2[0].fPts[1], tmp2[0].fPts[2], tmp2[0].fW);
+                }
+            }
+        } break;
         case kCubic_SegType:
             if (0 == startT) {
                 if (SK_Scalar1 == stopT) {
@@ -320,8 +387,7 @@ static void seg_to(const SkPoint pts[], int segType,
                 if (SK_Scalar1 == stopT) {
                     dst->cubicTo(tmp0[4], tmp0[5], tmp0[6]);
                 } else {
-                    SkChopCubicAt(&tmp0[3], tmp1, SkScalarDiv(stopT - startT,
-                                                        SK_Scalar1 - startT));
+                    SkChopCubicAt(&tmp0[3], tmp1, (stopT - startT) / (1 - startT));
                     dst->cubicTo(tmp1[1], tmp1[2], tmp1[3]);
                 }
             }
@@ -336,7 +402,7 @@ static void seg_to(const SkPoint pts[], int segType,
 ////////////////////////////////////////////////////////////////////////////////
 
 SkPathMeasure::SkPathMeasure() {
-    fPath = NULL;
+    fPath = nullptr;
     fLength = -1;   // signal we need to compute it
     fForceClosed = false;
     fFirstPtIndex = -1;
@@ -369,7 +435,7 @@ void SkPathMeasure::setPath(const SkPath* path, bool forceClosed) {
 }
 
 SkScalar SkPathMeasure::getLength() {
-    if (fPath == NULL) {
+    if (fPath == nullptr) {
         return 0;
     }
     if (fLength < 0) {
@@ -379,6 +445,36 @@ SkScalar SkPathMeasure::getLength() {
     return fLength;
 }
 
+template <typename T, typename K>
+int SkTKSearch(const T base[], int count, const K& key) {
+    SkASSERT(count >= 0);
+    if (count <= 0) {
+        return ~0;
+    }
+    
+    SkASSERT(base != nullptr); // base may be nullptr if count is zero
+    
+    int lo = 0;
+    int hi = count - 1;
+    
+    while (lo < hi) {
+        int mid = (hi + lo) >> 1;
+        if (base[mid].fDistance < key) {
+            lo = mid + 1;
+        } else {
+            hi = mid;
+        }
+    }
+    
+    if (base[hi].fDistance < key) {
+        hi += 1;
+        hi = ~hi;
+    } else if (key < base[hi].fDistance) {
+        hi = ~hi;
+    }
+    return hi;
+}
+
 const SkPathMeasure::Segment* SkPathMeasure::distanceToSegment(
                                             SkScalar distance, SkScalar* t) {
     SkDEBUGCODE(SkScalar length = ) this->getLength();
@@ -387,7 +483,7 @@ const SkPathMeasure::Segment* SkPathMeasure::distanceToSegment(
     const Segment*  seg = fSegments.begin();
     int             count = fSegments.count();
 
-    int index = SkTSearch<SkScalar>(&seg->fDistance, count, distance, sizeof(Segment));
+    int index = SkTKSearch<Segment, SkScalar>(seg, count, distance);
     // don't care if we hit an exact match or not, so we xor index if it is negative
     index ^= (index >> 31);
     seg = &seg[index];
@@ -415,7 +511,7 @@ const SkPathMeasure::Segment* SkPathMeasure::distanceToSegment(
 
 bool SkPathMeasure::getPosTan(SkScalar distance, SkPoint* pos,
                               SkVector* tangent) {
-    if (NULL == fPath) {
+    if (nullptr == fPath) {
         return false;
     }
 
@@ -442,7 +538,7 @@ bool SkPathMeasure::getPosTan(SkScalar distance, SkPoint* pos,
 
 bool SkPathMeasure::getMatrix(SkScalar distance, SkMatrix* matrix,
                               MatrixFlags flags) {
-    if (NULL == fPath) {
+    if (nullptr == fPath) {
         return false;
     }
 
@@ -477,7 +573,7 @@ bool SkPathMeasure::getSegment(SkScalar startD, SkScalar stopD, SkPath* dst,
     if (stopD > length) {
         stopD = length;
     }
-    if (startD >= stopD) {
+    if (startD > stopD) {
         return false;
     }
 
@@ -488,7 +584,7 @@ bool SkPathMeasure::getSegment(SkScalar startD, SkScalar stopD, SkPath* dst,
     SkASSERT(seg <= stopSeg);
 
     if (startWithMoveTo) {
-        compute_pos_tan(&fPts[seg->fPtIndex], seg->fType, startT, &p, NULL);
+        compute_pos_tan(&fPts[seg->fPtIndex], seg->fType, startT, &p, nullptr);
         dst->moveTo(p);
     }
 
diff --git a/gfx/skia/skia/src/core/SkPathPriv.h b/gfx/skia/skia/src/core/SkPathPriv.h
new file mode 100644
index 000000000000..51a1a8009479
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkPathPriv.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPathPriv_DEFINED
+#define SkPathPriv_DEFINED
+
+#include "SkPath.h"
+
+class SkPathPriv {
+public:
+    enum FirstDirection {
+        kCW_FirstDirection,         // == SkPath::kCW_Direction
+        kCCW_FirstDirection,        // == SkPath::kCCW_Direction
+        kUnknown_FirstDirection,
+    };
+
+    static FirstDirection AsFirstDirection(SkPath::Direction dir) {
+        // since we agree numerically for the values in Direction, we can just cast.
+        return (FirstDirection)dir;
+    }
+
+    /**
+     *  Return the opposite of the specified direction. kUnknown is its own
+     *  opposite.
+     */
+    static FirstDirection OppositeFirstDirection(FirstDirection dir) {
+        static const FirstDirection gOppositeDir[] = {
+            kCCW_FirstDirection, kCW_FirstDirection, kUnknown_FirstDirection, 
+        };
+        return gOppositeDir[dir];
+    }
+
+    /**
+     *  Tries to quickly compute the direction of the first non-degenerate
+     *  contour. If it can be computed, return true and set dir to that
+     *  direction. If it cannot be (quickly) determined, return false and ignore
+     *  the dir parameter. If the direction was determined, it is cached to make
+     *  subsequent calls return quickly.
+     */
+    static bool CheapComputeFirstDirection(const SkPath&, FirstDirection* dir);
+
+    /**
+     *  Returns true if the path's direction can be computed via
+     *  cheapComputDirection() and if that computed direction matches the
+     *  specified direction. If dir is kUnknown, returns true if the direction
+     *  cannot be computed.
+     */
+    static bool CheapIsFirstDirection(const SkPath& path, FirstDirection dir) {
+        FirstDirection computedDir = kUnknown_FirstDirection;
+        (void)CheapComputeFirstDirection(path, &computedDir);
+        return computedDir == dir;
+    }
+
+    static bool LastVerbIsClose(const SkPath& path) {
+        int count = path.countVerbs();
+        return count >= 1 && path.fPathRef->verbs()[~(count - 1)] == SkPath::Verb::kClose_Verb;
+    }
+
+    static void AddGenIDChangeListener(const SkPath& path, SkPathRef::GenIDChangeListener* listener) {
+        path.fPathRef->addGenIDChangeListener(listener);
+    }
+};
+
+#endif
diff --git a/gfx/skia/skia/src/core/SkPathRef.cpp b/gfx/skia/skia/src/core/SkPathRef.cpp
index e60f618b4f65..fa073db3e0fb 100644
--- a/gfx/skia/skia/src/core/SkPathRef.cpp
+++ b/gfx/skia/skia/src/core/SkPathRef.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "SkBuffer.h"
-#include "SkLazyPtr.h"
+#include "SkOncePtr.h"
 #include "SkPath.h"
 #include "SkPathRef.h"
 
@@ -18,24 +18,39 @@ SkPathRef::Editor::Editor(SkAutoTUnref<SkPathRef>* pathRef,
     if ((*pathRef)->unique()) {
         (*pathRef)->incReserve(incReserveVerbs, incReservePoints);
     } else {
-        SkPathRef* copy = SkNEW(SkPathRef);
+        SkPathRef* copy = new SkPathRef;
         copy->copy(**pathRef, incReserveVerbs, incReservePoints);
         pathRef->reset(copy);
     }
     fPathRef = *pathRef;
+    fPathRef->callGenIDChangeListeners();
     fPathRef->fGenerationID = 0;
     SkDEBUGCODE(sk_atomic_inc(&fPathRef->fEditorsAttached);)
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-SkPathRef* SkPathRef::CreateEmptyImpl() {
-    return SkNEW(SkPathRef);
+SkPathRef::~SkPathRef() {
+    this->callGenIDChangeListeners();
+    SkDEBUGCODE(this->validate();)
+    sk_free(fPoints);
+
+    SkDEBUGCODE(fPoints = nullptr;)
+    SkDEBUGCODE(fVerbs = nullptr;)
+    SkDEBUGCODE(fVerbCnt = 0x9999999;)
+    SkDEBUGCODE(fPointCnt = 0xAAAAAAA;)
+    SkDEBUGCODE(fPointCnt = 0xBBBBBBB;)
+    SkDEBUGCODE(fGenerationID = 0xEEEEEEEE;)
+    SkDEBUGCODE(fEditorsAttached = 0x7777777;)
 }
 
+SK_DECLARE_STATIC_ONCE_PTR(SkPathRef, empty);
 SkPathRef* SkPathRef::CreateEmpty() {
-    SK_DECLARE_STATIC_LAZY_PTR(SkPathRef, empty, CreateEmptyImpl);
-    return SkRef(empty.get());
+    return SkRef(empty.get([]{
+        SkPathRef* pr = new SkPathRef;
+        pr->computeBounds();   // Avoids races later to be the first to do this.
+        return pr;
+    }));
 }
 
 void SkPathRef::CreateTransformedCopy(SkAutoTUnref<SkPathRef>* dst,
@@ -52,7 +67,7 @@ void SkPathRef::CreateTransformedCopy(SkAutoTUnref<SkPathRef>* dst,
     }
 
     if (!(*dst)->unique()) {
-        dst->reset(SkNEW(SkPathRef));
+        dst->reset(new SkPathRef);
     }
 
     if (*dst != &src) {
@@ -83,13 +98,19 @@ void SkPathRef::CreateTransformedCopy(SkAutoTUnref<SkPathRef>* dst,
     if (canXformBounds) {
         (*dst)->fBoundsIsDirty = false;
         if (src.fIsFinite) {
-            matrix.mapRect((*dst)->fBounds.get(), src.fBounds);
-            if (!((*dst)->fIsFinite = (*dst)->fBounds->isFinite())) {
-                (*dst)->fBounds->setEmpty();
+            matrix.mapRect(&(*dst)->fBounds, src.fBounds);
+            if (!((*dst)->fIsFinite = (*dst)->fBounds.isFinite())) {
+                (*dst)->fBounds.setEmpty();
+            } else if (src.fPointCnt & 1) {
+                /* Matrix optimizations may cause the first point to use slightly different
+                 * math for its transform, which can lead to it being outside the transformed
+                 * bounds. Include it in the bounds just in case.
+                 */
+                (*dst)->fBounds.growToInclude((*dst)->fPoints[0].fX, (*dst)->fPoints[0].fY);
             }
         } else {
             (*dst)->fIsFinite = false;
-            (*dst)->fBounds->setEmpty();
+            (*dst)->fBounds.setEmpty();
         }
     } else {
         (*dst)->fBoundsIsDirty = true;
@@ -98,33 +119,34 @@ void SkPathRef::CreateTransformedCopy(SkAutoTUnref<SkPathRef>* dst,
     (*dst)->fSegmentMask = src.fSegmentMask;
 
     // It's an oval only if it stays a rect.
-    (*dst)->fIsOval = src.fIsOval && matrix.rectStaysRect();
+    bool rectStaysRect = matrix.rectStaysRect();
+    (*dst)->fIsOval = src.fIsOval && rectStaysRect;
+    (*dst)->fIsRRect = src.fIsRRect && rectStaysRect;
 
     SkDEBUGCODE((*dst)->validate();)
 }
 
 SkPathRef* SkPathRef::CreateFromBuffer(SkRBuffer* buffer) {
-    SkPathRef* ref = SkNEW(SkPathRef);
-    bool isOval;
-    uint8_t segmentMask;
+    SkPathRef* ref = new SkPathRef;
 
     int32_t packed;
     if (!buffer->readS32(&packed)) {
-        SkDELETE(ref);
-        return NULL;
+        delete ref;
+        return nullptr;
     }
 
     ref->fIsFinite = (packed >> kIsFinite_SerializationShift) & 1;
-    segmentMask = (packed >> kSegmentMask_SerializationShift) & 0xF;
-    isOval  = (packed >> kIsOval_SerializationShift) & 1;
+    uint8_t segmentMask = (packed >> kSegmentMask_SerializationShift) & 0xF;
+    bool isOval  = (packed >> kIsOval_SerializationShift) & 1;
+    bool isRRect  = (packed >> kIsRRect_SerializationShift) & 1;
 
     int32_t verbCount, pointCount, conicCount;
     if (!buffer->readU32(&(ref->fGenerationID)) ||
         !buffer->readS32(&verbCount) ||
         !buffer->readS32(&pointCount) ||
         !buffer->readS32(&conicCount)) {
-        SkDELETE(ref);
-        return NULL;
+        delete ref;
+        return nullptr;
     }
 
     ref->resetToSize(verbCount, pointCount, conicCount);
@@ -136,20 +158,22 @@ SkPathRef* SkPathRef::CreateFromBuffer(SkRBuffer* buffer) {
         !buffer->read(ref->fPoints, pointCount * sizeof(SkPoint)) ||
         !buffer->read(ref->fConicWeights.begin(), conicCount * sizeof(SkScalar)) ||
         !buffer->read(&ref->fBounds, sizeof(SkRect))) {
-        SkDELETE(ref);
-        return NULL;
+        delete ref;
+        return nullptr;
     }
     ref->fBoundsIsDirty = false;
 
     // resetToSize clears fSegmentMask and fIsOval
     ref->fSegmentMask = segmentMask;
     ref->fIsOval = isOval;
+    ref->fIsRRect = isRRect;
     return ref;
 }
 
 void SkPathRef::Rewind(SkAutoTUnref<SkPathRef>* pathRef) {
     if ((*pathRef)->unique()) {
         SkDEBUGCODE((*pathRef)->validate();)
+        (*pathRef)->callGenIDChangeListeners();
         (*pathRef)->fBoundsIsDirty = true;  // this also invalidates fIsFinite
         (*pathRef)->fVerbCnt = 0;
         (*pathRef)->fPointCnt = 0;
@@ -158,11 +182,12 @@ void SkPathRef::Rewind(SkAutoTUnref<SkPathRef>* pathRef) {
         (*pathRef)->fConicWeights.rewind();
         (*pathRef)->fSegmentMask = 0;
         (*pathRef)->fIsOval = false;
+        (*pathRef)->fIsRRect = false;
         SkDEBUGCODE((*pathRef)->validate();)
     } else {
         int oldVCnt = (*pathRef)->countVerbs();
         int oldPCnt = (*pathRef)->countPoints();
-        pathRef->reset(SkNEW(SkPathRef));
+        pathRef->reset(new SkPathRef);
         (*pathRef)->resetToSize(0, 0, 0, oldVCnt, oldPCnt);
     }
 }
@@ -189,12 +214,18 @@ bool SkPathRef::operator== (const SkPathRef& ref) const {
         SkASSERT(!genIDMatch);
         return false;
     }
+    if (0 == ref.fVerbCnt) {
+        SkASSERT(0 == ref.fPointCnt);
+        return true;
+    }
+    SkASSERT(this->verbsMemBegin() && ref.verbsMemBegin());
     if (0 != memcmp(this->verbsMemBegin(),
                     ref.verbsMemBegin(),
                     ref.fVerbCnt * sizeof(uint8_t))) {
         SkASSERT(!genIDMatch);
         return false;
     }
+    SkASSERT(this->points() && ref.points());
     if (0 != memcmp(this->points(),
                     ref.points(),
                     ref.fPointCnt * sizeof(SkPoint))) {
@@ -205,13 +236,6 @@ bool SkPathRef::operator== (const SkPathRef& ref) const {
         SkASSERT(!genIDMatch);
         return false;
     }
-    // We've done the work to determine that these are equal. If either has a zero genID, copy
-    // the other's. If both are 0 then genID() will compute the next ID.
-    if (0 == fGenerationID) {
-        fGenerationID = ref.genID();
-    } else if (0 == ref.fGenerationID) {
-        ref.fGenerationID = this->genID();
-    }
     return true;
 }
 
@@ -225,6 +249,7 @@ void SkPathRef::writeToBuffer(SkWBuffer* buffer) const {
 
     int32_t packed = ((fIsFinite & 1) << kIsFinite_SerializationShift) |
                      ((fIsOval & 1) << kIsOval_SerializationShift) |
+                     ((fIsRRect & 1) << kIsRRect_SerializationShift) |
                      (fSegmentMask << kSegmentMask_SerializationShift);
     buffer->write32(packed);
 
@@ -259,9 +284,6 @@ void SkPathRef::copy(const SkPathRef& ref,
     memcpy(this->verbsMemWritable(), ref.verbsMemBegin(), ref.fVerbCnt * sizeof(uint8_t));
     memcpy(this->fPoints, ref.fPoints, ref.fPointCnt * sizeof(SkPoint));
     fConicWeights = ref.fConicWeights;
-    // We could call genID() here to force a real ID (instead of 0). However, if we're making
-    // a copy then presumably we intend to make a modification immediately afterwards.
-    fGenerationID = ref.fGenerationID;
     fBoundsIsDirty = ref.fBoundsIsDirty;
     if (!fBoundsIsDirty) {
         fBounds = ref.fBounds;
@@ -269,6 +291,7 @@ void SkPathRef::copy(const SkPathRef& ref,
     }
     fSegmentMask = ref.fSegmentMask;
     fIsOval = ref.fIsOval;
+    fIsRRect = ref.fIsRRect;
     SkDEBUGCODE(this->validate();)
 }
 
@@ -340,10 +363,11 @@ SkPoint* SkPathRef::growForRepeatedVerb(int /*SkPath::Verb*/ verb,
     fBoundsIsDirty = true;  // this also invalidates fIsFinite
     if (dirtyAfterEdit) {
         fIsOval = false;
+        fIsRRect = false;
     }
 
     if (SkPath::kConic_Verb == verb) {
-        SkASSERT(NULL != weights);
+        SkASSERT(weights);
         *weights = fConicWeights.append(numVbs);
     }
 
@@ -398,6 +422,7 @@ SkPoint* SkPathRef::growForVerb(int /* SkPath::Verb*/ verb, SkScalar weight) {
     fBoundsIsDirty = true;  // this also invalidates fIsFinite
     if (dirtyAfterEdit) {
         fIsOval = false;
+        fIsRRect = false;
     }
 
     if (SkPath::kConic_Verb == verb) {
@@ -426,27 +451,168 @@ uint32_t SkPathRef::genID() const {
     return fGenerationID;
 }
 
+void SkPathRef::addGenIDChangeListener(GenIDChangeListener* listener) {
+    if (nullptr == listener || this == (SkPathRef*)empty) {
+        delete listener;
+        return;
+    }
+    *fGenIDChangeListeners.append() = listener;
+}
+
+// we need to be called *before* the genID gets changed or zerod
+void SkPathRef::callGenIDChangeListeners() {
+    for (int i = 0; i < fGenIDChangeListeners.count(); i++) {
+        fGenIDChangeListeners[i]->onChange();
+    }
+
+    // Listeners get at most one shot, so whether these triggered or not, blow them away.
+    fGenIDChangeListeners.deleteAll();
+}
+
+SkRRect SkPathRef::getRRect() const {
+    const SkRect& bounds = this->getBounds();
+    SkVector radii[4] = {{0, 0}, {0, 0}, {0, 0}, {0, 0}};
+    Iter iter(*this);
+    SkPoint pts[4];
+    uint8_t verb = iter.next(pts);
+    SkASSERT(SkPath::kMove_Verb == verb);
+    while ((verb = iter.next(pts)) != SkPath::kDone_Verb) {
+        if (SkPath::kConic_Verb == verb) {
+            SkVector v1_0 = pts[1] - pts[0];
+            SkVector v2_1 = pts[2] - pts[1];
+            SkVector dxdy;
+            if (v1_0.fX) {
+                SkASSERT(!v2_1.fX && !v1_0.fY);
+                dxdy.set(SkScalarAbs(v1_0.fX), SkScalarAbs(v2_1.fY));
+            } else if (!v1_0.fY) {
+                SkASSERT(!v2_1.fX || !v2_1.fY);
+                dxdy.set(SkScalarAbs(v2_1.fX), SkScalarAbs(v2_1.fY));
+            } else {
+                SkASSERT(!v2_1.fY);
+                dxdy.set(SkScalarAbs(v2_1.fX), SkScalarAbs(v1_0.fY));
+            }
+            SkRRect::Corner corner =
+                    pts[1].fX == bounds.fLeft ?
+                        pts[1].fY == bounds.fTop ?
+                            SkRRect::kUpperLeft_Corner : SkRRect::kLowerLeft_Corner :
+                    pts[1].fY == bounds.fTop ?
+                            SkRRect::kUpperRight_Corner : SkRRect::kLowerRight_Corner;
+            SkASSERT(!radii[corner].fX && !radii[corner].fY);
+            radii[corner] = dxdy;
+        } else {
+            SkASSERT((verb == SkPath::kLine_Verb
+                    && (!(pts[1].fX - pts[0].fX) || !(pts[1].fY - pts[0].fY)))
+                    || verb == SkPath::kClose_Verb);
+        }
+    }
+    SkRRect rrect;
+    rrect.setRectRadii(bounds, radii);
+    return rrect;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+SkPathRef::Iter::Iter() {
+#ifdef SK_DEBUG
+    fPts = nullptr;
+    fConicWeights = nullptr;
+#endif
+    // need to init enough to make next() harmlessly return kDone_Verb
+    fVerbs = nullptr;
+    fVerbStop = nullptr;
+}
+
+SkPathRef::Iter::Iter(const SkPathRef& path) {
+    this->setPathRef(path);
+}
+
+void SkPathRef::Iter::setPathRef(const SkPathRef& path) {
+    fPts = path.points();
+    fVerbs = path.verbs();
+    fVerbStop = path.verbsMemBegin();
+    fConicWeights = path.conicWeights() - 1; // begin one behind
+}
+
+uint8_t SkPathRef::Iter::next(SkPoint pts[4]) {
+    SkASSERT(pts);
+    if (fVerbs == fVerbStop) {
+        return (uint8_t) SkPath::kDone_Verb;
+    }
+
+    // fVerbs points one beyond next verb so decrement first.
+    unsigned verb = *(--fVerbs);
+    const SkPoint* srcPts = fPts;
+
+    switch (verb) {
+        case SkPath::kMove_Verb:
+            pts[0] = srcPts[0];
+            srcPts += 1;
+            break;
+        case SkPath::kLine_Verb:
+            pts[0] = srcPts[-1];
+            pts[1] = srcPts[0];
+            srcPts += 1;
+            break;
+        case SkPath::kConic_Verb:
+            fConicWeights += 1;
+            // fall-through
+        case SkPath::kQuad_Verb:
+            pts[0] = srcPts[-1];
+            pts[1] = srcPts[0];
+            pts[2] = srcPts[1];
+            srcPts += 2;
+            break;
+        case SkPath::kCubic_Verb:
+            pts[0] = srcPts[-1];
+            pts[1] = srcPts[0];
+            pts[2] = srcPts[1];
+            pts[3] = srcPts[2];
+            srcPts += 3;
+            break;
+        case SkPath::kClose_Verb:
+            break;
+        case SkPath::kDone_Verb:
+            SkASSERT(fVerbs == fVerbStop);
+            break;
+    }
+    fPts = srcPts;
+    return (uint8_t) verb;
+}
+
 #ifdef SK_DEBUG
 void SkPathRef::validate() const {
     this->INHERITED::validate();
     SkASSERT(static_cast<ptrdiff_t>(fFreeSpace) >= 0);
     SkASSERT(reinterpret_cast<intptr_t>(fVerbs) - reinterpret_cast<intptr_t>(fPoints) >= 0);
-    SkASSERT((NULL == fPoints) == (NULL == fVerbs));
-    SkASSERT(!(NULL == fPoints && 0 != fFreeSpace));
-    SkASSERT(!(NULL == fPoints && 0 != fFreeSpace));
-    SkASSERT(!(NULL == fPoints && fPointCnt));
-    SkASSERT(!(NULL == fVerbs && fVerbCnt));
+    SkASSERT((nullptr == fPoints) == (nullptr == fVerbs));
+    SkASSERT(!(nullptr == fPoints && 0 != fFreeSpace));
+    SkASSERT(!(nullptr == fPoints && 0 != fFreeSpace));
+    SkASSERT(!(nullptr == fPoints && fPointCnt));
+    SkASSERT(!(nullptr == fVerbs && fVerbCnt));
     SkASSERT(this->currSize() ==
                 fFreeSpace + sizeof(SkPoint) * fPointCnt + sizeof(uint8_t) * fVerbCnt);
 
-    if (!fBoundsIsDirty && !fBounds->isEmpty()) {
+    if (!fBoundsIsDirty && !fBounds.isEmpty()) {
         bool isFinite = true;
         for (int i = 0; i < fPointCnt; ++i) {
-            SkASSERT(!fPoints[i].isFinite() || (
-                     fBounds->fLeft - fPoints[i].fX   < SK_ScalarNearlyZero &&
-                     fPoints[i].fX - fBounds->fRight  < SK_ScalarNearlyZero &&
-                     fBounds->fTop  - fPoints[i].fY   < SK_ScalarNearlyZero &&
-                     fPoints[i].fY - fBounds->fBottom < SK_ScalarNearlyZero));
+#ifdef SK_DEBUG
+            if (fPoints[i].isFinite() &&
+                (fPoints[i].fX < fBounds.fLeft || fPoints[i].fX > fBounds.fRight ||
+                 fPoints[i].fY < fBounds.fTop || fPoints[i].fY > fBounds.fBottom)) {
+                SkDebugf("bounds: %f %f %f %f\n",
+                         fBounds.fLeft, fBounds.fTop, fBounds.fRight, fBounds.fBottom);
+                for (int j = 0; j < fPointCnt; ++j) {
+                    if (i == j) {
+                        SkDebugf("*");
+                    }
+                    SkDebugf("%f %f\n", fPoints[j].fX, fPoints[j].fY);
+                }
+            }
+#endif
+
+            SkASSERT(!fPoints[i].isFinite() ||
+		     (fPoints[i].fX >= fBounds.fLeft && fPoints[i].fX <= fBounds.fRight &&
+		      fPoints[i].fY >= fBounds.fTop && fPoints[i].fY <= fBounds.fBottom));
             if (!fPoints[i].isFinite()) {
                 isFinite = false;
             }
diff --git a/gfx/skia/skia/src/core/SkPicture.cpp b/gfx/skia/skia/src/core/SkPicture.cpp
index 0b7a1dbcc592..8247336d49e9 100644
--- a/gfx/skia/skia/src/core/SkPicture.cpp
+++ b/gfx/skia/skia/src/core/SkPicture.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2007 The Android Open Source Project
  *
@@ -6,434 +5,201 @@
  * found in the LICENSE file.
  */
 
-
-#include "SkPictureFlat.h"
+#include "SkAtomics.h"
+#include "SkMessageBus.h"
+#include "SkPicture.h"
 #include "SkPictureData.h"
 #include "SkPicturePlayback.h"
 #include "SkPictureRecord.h"
 #include "SkPictureRecorder.h"
-#include "SkPictureStateTree.h"
 
-#include "SkBBHFactory.h"
-#include "SkBitmapDevice.h"
-#include "SkCanvas.h"
-#include "SkChunkAlloc.h"
-#include "SkDrawPictureCallback.h"
-#include "SkPaintPriv.h"
-#include "SkPicture.h"
-#include "SkRecordAnalysis.h"
-#include "SkRegion.h"
-#include "SkStream.h"
-#include "SkTDArray.h"
-#include "SkTSearch.h"
-#include "SkTime.h"
-
-#include "SkReader32.h"
-#include "SkWriter32.h"
-#include "SkRTree.h"
-#include "SkBBoxHierarchyRecord.h"
-
-#if SK_SUPPORT_GPU
-#include "GrContext.h"
+#if defined(SK_DISALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS) || \
+    defined(SK_ENABLE_PICTURE_IO_SECURITY_PRECAUTIONS)
+static bool g_AllPictureIOSecurityPrecautionsEnabled = true;
+#else
+static bool g_AllPictureIOSecurityPrecautionsEnabled = false;
 #endif
 
-#include "SkRecord.h"
-#include "SkRecordDraw.h"
-#include "SkRecorder.h"
+DECLARE_SKMESSAGEBUS_MESSAGE(SkPicture::DeletionMessage);
 
-template <typename T> int SafeCount(const T* obj) {
-    return obj ? obj->count() : 0;
-}
+/* SkPicture impl.  This handles generic responsibilities like unique IDs and serialization. */
 
-#define DUMP_BUFFER_SIZE 65536
+SkPicture::SkPicture() : fUniqueID(0) {}
 
-#ifdef SK_DEBUG
-// enable SK_DEBUG_TRACE to trace DrawType elements when
-//     recorded and played back
-// #define SK_DEBUG_TRACE
-// enable SK_DEBUG_SIZE to see the size of picture components
-// #define SK_DEBUG_SIZE
-// enable SK_DEBUG_DUMP to see the contents of recorded elements
-// #define SK_DEBUG_DUMP
-// enable SK_DEBUG_VALIDATE to check internal structures for consistency
-// #define SK_DEBUG_VALIDATE
-#endif
-
-#if defined SK_DEBUG_TRACE || defined SK_DEBUG_DUMP
-const char* DrawTypeToString(DrawType drawType) {
-    switch (drawType) {
-        case UNUSED: SkDebugf("DrawType UNUSED\n"); SkASSERT(0); break;
-        case CLIP_PATH: return "CLIP_PATH";
-        case CLIP_REGION: return "CLIP_REGION";
-        case CLIP_RECT: return "CLIP_RECT";
-        case CLIP_RRECT: return "CLIP_RRECT";
-        case CONCAT: return "CONCAT";
-        case DRAW_BITMAP: return "DRAW_BITMAP";
-        case DRAW_BITMAP_MATRIX: return "DRAW_BITMAP_MATRIX";
-        case DRAW_BITMAP_NINE: return "DRAW_BITMAP_NINE";
-        case DRAW_BITMAP_RECT_TO_RECT: return "DRAW_BITMAP_RECT_TO_RECT";
-        case DRAW_CLEAR: return "DRAW_CLEAR";
-        case DRAW_DATA: return "DRAW_DATA";
-        case DRAW_OVAL: return "DRAW_OVAL";
-        case DRAW_PAINT: return "DRAW_PAINT";
-        case DRAW_PATH: return "DRAW_PATH";
-        case DRAW_PICTURE: return "DRAW_PICTURE";
-        case DRAW_POINTS: return "DRAW_POINTS";
-        case DRAW_POS_TEXT: return "DRAW_POS_TEXT";
-        case DRAW_POS_TEXT_TOP_BOTTOM: return "DRAW_POS_TEXT_TOP_BOTTOM";
-        case DRAW_POS_TEXT_H: return "DRAW_POS_TEXT_H";
-        case DRAW_POS_TEXT_H_TOP_BOTTOM: return "DRAW_POS_TEXT_H_TOP_BOTTOM";
-        case DRAW_RECT: return "DRAW_RECT";
-        case DRAW_RRECT: return "DRAW_RRECT";
-        case DRAW_SPRITE: return "DRAW_SPRITE";
-        case DRAW_TEXT: return "DRAW_TEXT";
-        case DRAW_TEXT_ON_PATH: return "DRAW_TEXT_ON_PATH";
-        case DRAW_TEXT_TOP_BOTTOM: return "DRAW_TEXT_TOP_BOTTOM";
-        case DRAW_VERTICES: return "DRAW_VERTICES";
-        case RESTORE: return "RESTORE";
-        case ROTATE: return "ROTATE";
-        case SAVE: return "SAVE";
-        case SAVE_LAYER: return "SAVE_LAYER";
-        case SCALE: return "SCALE";
-        case SET_MATRIX: return "SET_MATRIX";
-        case SKEW: return "SKEW";
-        case TRANSLATE: return "TRANSLATE";
-        case NOOP: return "NOOP";
-        default:
-            SkDebugf("DrawType error 0x%08x\n", drawType);
-            SkASSERT(0);
-            break;
-    }
-    SkASSERT(0);
-    return NULL;
-}
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-
-#ifdef SK_SUPPORT_LEGACY_DEFAULT_PICTURE_CTOR
-// fRecord OK
-SkPicture::SkPicture()
-    : fWidth(0)
-    , fHeight(0)
-    , fRecordWillPlayBackBitmaps(false) {
-    this->needsNewGenID();
-}
-#endif
-
-// fRecord OK
-SkPicture::SkPicture(int width, int height,
-                     const SkPictureRecord& record,
-                     bool deepCopyOps)
-    : fWidth(width)
-    , fHeight(height)
-    , fRecordWillPlayBackBitmaps(false) {
-    this->needsNewGenID();
-
-    SkPictInfo info;
-    this->createHeader(&info);
-    fData.reset(SkNEW_ARGS(SkPictureData, (record, info, deepCopyOps)));
-}
-
-// Create an SkPictureData-backed SkPicture from an SkRecord.
-// This for compatibility with serialization code only.  This is not cheap.
-static SkPicture* backport(const SkRecord& src, int width, int height) {
-    SkPictureRecorder recorder;
-    SkRecordDraw(src, recorder.beginRecording(width, height));
-    return recorder.endRecording();
-}
-
-// fRecord OK
 SkPicture::~SkPicture() {
-    this->callDeletionListeners();
+    // TODO: move this to ~SkBigPicture() only?
+
+    // If the ID is still zero, no one has read it, so no need to send this message.
+    uint32_t id = sk_atomic_load(&fUniqueID, sk_memory_order_relaxed);
+    if (id != 0) {
+        SkPicture::DeletionMessage msg = { (int32_t)id };
+        SkMessageBus<SkPicture::DeletionMessage>::Post(msg);
+    }
 }
 
-#ifdef SK_SUPPORT_LEGACY_PICTURE_CLONE
-// fRecord TODO, fix by deleting this method
-SkPicture* SkPicture::clone() const {
-
-    SkAutoTDelete<SkPictureData> newData;
-
-    if (fData.get()) {
-        SkPictCopyInfo copyInfo;
-
-        int paintCount = SafeCount(fData->fPaints);
-
-        /* The alternative to doing this is to have a clone method on the paint and have it
-         * make the deep copy of its internal structures as needed. The holdup to doing
-         * that is at this point we would need to pass the SkBitmapHeap so that we don't
-         * unnecessarily flatten the pixels in a bitmap shader.
-         */
-        copyInfo.paintData.setCount(paintCount);
-
-        /* Use an SkBitmapHeap to avoid flattening bitmaps in shaders. If there already is
-         * one, use it. If this SkPictureData was created from a stream, fBitmapHeap
-         * will be NULL, so create a new one.
-         */
-        if (fData->fBitmapHeap.get() == NULL) {
-            // FIXME: Put this on the stack inside SkPicture::clone.
-            SkBitmapHeap* heap = SkNEW(SkBitmapHeap);
-            copyInfo.controller.setBitmapStorage(heap);
-            heap->unref();
+uint32_t SkPicture::uniqueID() const {
+    static uint32_t gNextID = 1;
+    uint32_t id = sk_atomic_load(&fUniqueID, sk_memory_order_relaxed);
+    while (id == 0) {
+        uint32_t next = sk_atomic_fetch_add(&gNextID, 1u);
+        if (sk_atomic_compare_exchange(&fUniqueID, &id, next,
+                                       sk_memory_order_relaxed,
+                                       sk_memory_order_relaxed)) {
+            id = next;
         } else {
-            copyInfo.controller.setBitmapStorage(fData->fBitmapHeap);
+            // sk_atomic_compare_exchange replaced id with the current value of fUniqueID.
         }
-
-        SkDEBUGCODE(int heapSize = SafeCount(fData->fBitmapHeap.get());)
-        for (int i = 0; i < paintCount; i++) {
-            if (NeedsDeepCopy(fData->fPaints->at(i))) {
-                copyInfo.paintData[i] =
-                    SkFlatData::Create<SkPaint::FlatteningTraits>(&copyInfo.controller,
-                    fData->fPaints->at(i), 0);
-
-            } else {
-                // this is our sentinel, which we use in the unflatten loop
-                copyInfo.paintData[i] = NULL;
-            }
-        }
-        SkASSERT(SafeCount(fData->fBitmapHeap.get()) == heapSize);
-
-        // needed to create typeface playback
-        copyInfo.controller.setupPlaybacks();
-
-        newData.reset(SkNEW_ARGS(SkPictureData, (*fData, &copyInfo)));
     }
-
-    SkPicture* clone = SkNEW_ARGS(SkPicture, (newData.detach(), fWidth, fHeight));
-    clone->fRecordWillPlayBackBitmaps = fRecordWillPlayBackBitmaps;
-    clone->fUniqueID = this->uniqueID(); // need to call method to ensure != 0
-
-    return clone;
+    return id;
 }
-#endif//SK_SUPPORT_LEGACY_PICTURE_CLONE
-
-// fRecord OK
-void SkPicture::EXPERIMENTAL_addAccelData(const SkPicture::AccelData* data) const {
-    fAccelData.reset(SkRef(data));
-}
-
-// fRecord OK
-const SkPicture::AccelData* SkPicture::EXPERIMENTAL_getAccelData(
-        SkPicture::AccelData::Key key) const {
-    if (NULL != fAccelData.get() && fAccelData->getKey() == key) {
-        return fAccelData.get();
-    }
-    return NULL;
-}
-
-// fRecord OK
-SkPicture::AccelData::Domain SkPicture::AccelData::GenerateDomain() {
-    static int32_t gNextID = 0;
-
-    int32_t id = sk_atomic_inc(&gNextID);
-    if (id >= 1 << (8 * sizeof(Domain))) {
-        SK_CRASH();
-    }
-
-    return static_cast<Domain>(id);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-uint32_t SkPicture::OperationList::offset(int index) const {
-    SkASSERT(index < fOps.count());
-    return ((SkPictureStateTree::Draw*)fOps[index])->fOffset;
-}
-
-const SkMatrix& SkPicture::OperationList::matrix(int index) const {
-    SkASSERT(index < fOps.count());
-    return *((SkPictureStateTree::Draw*)fOps[index])->fMatrix;
-}
-
-// fRecord TODO
-const SkPicture::OperationList* SkPicture::EXPERIMENTAL_getActiveOps(const SkIRect& queryRect) const {
-    SkASSERT(NULL != fData.get());
-    if (NULL != fData.get()) {
-        return fData->getActiveOps(queryRect);
-    }
-    return NULL;
-}
-
-// fRecord OK
-void SkPicture::draw(SkCanvas* canvas, SkDrawPictureCallback* callback) const {
-    SkASSERT(NULL != canvas);
-    SkASSERT(NULL != fData.get() || NULL != fRecord.get());
-
-    if (NULL != fData.get()) {
-        SkPicturePlayback playback(this);
-        playback.draw(canvas, callback);
-    }
-    if (NULL != fRecord.get()) {
-        SkRecordDraw(*fRecord, canvas, callback);
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-#include "SkStream.h"
 
 static const char kMagic[] = { 's', 'k', 'i', 'a', 'p', 'i', 'c', 't' };
 
-// fRecord OK
+SkPictInfo SkPicture::createHeader() const {
+    SkPictInfo info;
+    // Copy magic bytes at the beginning of the header
+    static_assert(sizeof(kMagic) == 8, "");
+    static_assert(sizeof(kMagic) == sizeof(info.fMagic), "");
+    memcpy(info.fMagic, kMagic, sizeof(kMagic));
+
+    // Set picture info after magic bytes in the header
+    info.fVersion = CURRENT_PICTURE_VERSION;
+    info.fCullRect = this->cullRect();
+    info.fFlags = SkPictInfo::kCrossProcess_Flag;
+    // TODO: remove this flag, since we're always float (now)
+    info.fFlags |= SkPictInfo::kScalarIsFloat_Flag;
+
+    if (8 == sizeof(void*)) {
+        info.fFlags |= SkPictInfo::kPtrIs64Bit_Flag;
+    }
+    return info;
+}
+
 bool SkPicture::IsValidPictInfo(const SkPictInfo& info) {
     if (0 != memcmp(info.fMagic, kMagic, sizeof(kMagic))) {
         return false;
     }
-
-    if (info.fVersion < MIN_PICTURE_VERSION ||
-        info.fVersion > CURRENT_PICTURE_VERSION) {
+    if (info.fVersion < MIN_PICTURE_VERSION || info.fVersion > CURRENT_PICTURE_VERSION) {
         return false;
     }
-
     return true;
 }
 
-// fRecord OK
 bool SkPicture::InternalOnly_StreamIsSKP(SkStream* stream, SkPictInfo* pInfo) {
-    if (NULL == stream) {
+    if (!stream) {
         return false;
     }
 
-    // Check magic bytes.
     SkPictInfo info;
     SkASSERT(sizeof(kMagic) == sizeof(info.fMagic));
-    if (!stream->read(&info, sizeof(info)) || !IsValidPictInfo(info)) {
+    if (!stream->read(&info.fMagic, sizeof(kMagic))) {
         return false;
     }
 
-    if (pInfo != NULL) {
-        *pInfo = info;
+    info.fVersion          = stream->readU32();
+    info.fCullRect.fLeft   = stream->readScalar();
+    info.fCullRect.fTop    = stream->readScalar();
+    info.fCullRect.fRight  = stream->readScalar();
+    info.fCullRect.fBottom = stream->readScalar();
+    info.fFlags            = stream->readU32();
+
+    if (IsValidPictInfo(info)) {
+        if (pInfo) { *pInfo = info; }
+        return true;
     }
-    return true;
+    return false;
 }
 
-// fRecord OK
-bool SkPicture::InternalOnly_BufferIsSKP(SkReadBuffer& buffer, SkPictInfo* pInfo) {
-    // Check magic bytes.
+bool SkPicture::InternalOnly_BufferIsSKP(SkReadBuffer* buffer, SkPictInfo* pInfo) {
     SkPictInfo info;
     SkASSERT(sizeof(kMagic) == sizeof(info.fMagic));
-    if (!buffer.readByteArray(&info, sizeof(info)) || !IsValidPictInfo(info)) {
+    if (!buffer->readByteArray(&info.fMagic, sizeof(kMagic))) {
         return false;
     }
 
-    if (pInfo != NULL) {
-        *pInfo = info;
+    info.fVersion = buffer->readUInt();
+    buffer->readRect(&info.fCullRect);
+    info.fFlags = buffer->readUInt();
+
+    if (IsValidPictInfo(info)) {
+        if (pInfo) { *pInfo = info; }
+        return true;
     }
-    return true;
+    return false;
 }
 
-// fRecord OK
-SkPicture::SkPicture(SkPictureData* data, int width, int height)
-    : fData(data)
-    , fWidth(width)
-    , fHeight(height)
-    , fRecordWillPlayBackBitmaps(false) {
-    this->needsNewGenID();
+SkPicture* SkPicture::Forwardport(const SkPictInfo& info, const SkPictureData* data) {
+    if (!data) {
+        return nullptr;
+    }
+    SkPicturePlayback playback(data);
+    SkPictureRecorder r;
+    playback.draw(r.beginRecording(info.fCullRect), nullptr/*no callback*/);
+    return r.endRecording();
 }
 
-// fRecord OK
 SkPicture* SkPicture::CreateFromStream(SkStream* stream, InstallPixelRefProc proc) {
-    SkPictInfo info;
-
-    if (!InternalOnly_StreamIsSKP(stream, &info)) {
-        return NULL;
-    }
-
-    // Check to see if there is a playback to recreate.
-    if (stream->readBool()) {
-        SkPictureData* data = SkPictureData::CreateFromStream(stream, info, proc);
-        if (NULL == data) {
-            return NULL;
-        }
-
-        return SkNEW_ARGS(SkPicture, (data, info.fWidth, info.fHeight));
-    }
-
-    return NULL;
+    return CreateFromStream(stream, proc, nullptr);
+}
+
+SkPicture* SkPicture::CreateFromStream(SkStream* stream,
+                                       InstallPixelRefProc proc,
+                                       SkTypefacePlayback* typefaces) {
+    SkPictInfo info;
+    if (!InternalOnly_StreamIsSKP(stream, &info) || !stream->readBool()) {
+        return nullptr;
+    }
+    SkAutoTDelete<SkPictureData> data(
+            SkPictureData::CreateFromStream(stream, info, proc, typefaces));
+    return Forwardport(info, data);
 }
 
-// fRecord OK
 SkPicture* SkPicture::CreateFromBuffer(SkReadBuffer& buffer) {
     SkPictInfo info;
-
-    if (!InternalOnly_BufferIsSKP(buffer, &info)) {
-        return NULL;
+    if (!InternalOnly_BufferIsSKP(&buffer, &info) || !buffer.readBool()) {
+        return nullptr;
     }
-
-    // Check to see if there is a playback to recreate.
-    if (buffer.readBool()) {
-        SkPictureData* data = SkPictureData::CreateFromBuffer(buffer, info);
-        if (NULL == data) {
-            return NULL;
-        }
-
-        return SkNEW_ARGS(SkPicture, (data, info.fWidth, info.fHeight));
-    }
-
-    return NULL;
+    SkAutoTDelete<SkPictureData> data(SkPictureData::CreateFromBuffer(buffer, info));
+    return Forwardport(info, data);
 }
 
-// fRecord OK
-void SkPicture::createHeader(SkPictInfo* info) const {
-    // Copy magic bytes at the beginning of the header
-    SkASSERT(sizeof(kMagic) == 8);
-    SkASSERT(sizeof(kMagic) == sizeof(info->fMagic));
-    memcpy(info->fMagic, kMagic, sizeof(kMagic));
-
-    // Set picture info after magic bytes in the header
-    info->fVersion = CURRENT_PICTURE_VERSION;
-    info->fWidth = fWidth;
-    info->fHeight = fHeight;
-    info->fFlags = SkPictInfo::kCrossProcess_Flag;
-    // TODO: remove this flag, since we're always float (now)
-    info->fFlags |= SkPictInfo::kScalarIsFloat_Flag;
-
-    if (8 == sizeof(void*)) {
-        info->fFlags |= SkPictInfo::kPtrIs64Bit_Flag;
-    }
+SkPictureData* SkPicture::backport() const {
+    SkPictInfo info = this->createHeader();
+    SkPictureRecord rec(SkISize::Make(info.fCullRect.width(), info.fCullRect.height()), 0/*flags*/);
+    rec.beginRecording();
+        this->playback(&rec);
+    rec.endRecording();
+    return new SkPictureData(rec, info, false /*deep copy ops?*/);
 }
 
-// fRecord OK
-void SkPicture::serialize(SkWStream* stream, EncodeBitmap encoder) const {
-    const SkPictureData* data = fData.get();
+void SkPicture::serialize(SkWStream* stream, SkPixelSerializer* pixelSerializer) const {
+    this->serialize(stream, pixelSerializer, nullptr);
+}
 
-    // If we're a new-format picture, backport to old format for serialization.
-    SkAutoTDelete<SkPicture> oldFormat;
-    if (NULL == data && NULL != fRecord.get()) {
-        oldFormat.reset(backport(*fRecord, fWidth, fHeight));
-        data = oldFormat->fData.get();
-        SkASSERT(NULL != data);
-    }
+void SkPicture::serialize(SkWStream* stream,
+                          SkPixelSerializer* pixelSerializer,
+                          SkRefCntSet* typefaceSet) const {
+    SkPictInfo info = this->createHeader();
+    SkAutoTDelete<SkPictureData> data(this->backport());
 
-    SkPictInfo info;
-    this->createHeader(&info);
     stream->write(&info, sizeof(info));
-
-    if (NULL != data) {
+    if (data) {
         stream->writeBool(true);
-        data->serialize(stream, encoder);
+        data->serialize(stream, pixelSerializer, typefaceSet);
     } else {
         stream->writeBool(false);
     }
 }
 
-// fRecord OK
 void SkPicture::flatten(SkWriteBuffer& buffer) const {
-    const SkPictureData* data = fData.get();
+    SkPictInfo info = this->createHeader();
+    SkAutoTDelete<SkPictureData> data(this->backport());
 
-    // If we're a new-format picture, backport to old format for serialization.
-    SkAutoTDelete<SkPicture> oldFormat;
-    if (NULL == data && NULL != fRecord.get()) {
-        oldFormat.reset(backport(*fRecord, fWidth, fHeight));
-        data = oldFormat->fData.get();
-        SkASSERT(NULL != data);
-    }
-
-    SkPictInfo info;
-    this->createHeader(&info);
-    buffer.writeByteArray(&info, sizeof(info));
-
-    if (NULL != data) {
+    buffer.writeByteArray(&info.fMagic, sizeof(info.fMagic));
+    buffer.writeUInt(info.fVersion);
+    buffer.writeRect(info.fCullRect);
+    buffer.writeUInt(info.fFlags);
+    if (data) {
         buffer.writeBool(true);
         data->flatten(buffer);
     } else {
@@ -441,74 +207,19 @@ void SkPicture::flatten(SkWriteBuffer& buffer) const {
     }
 }
 
-#if SK_SUPPORT_GPU
-// fRecord TODO
-bool SkPicture::suitableForGpuRasterization(GrContext* context, const char **reason) const {
-    if (NULL == fData.get()) {
-        if (NULL != reason) {
-            *reason = "Missing internal data.";
-        }
+bool SkPicture::suitableForGpuRasterization(GrContext*, const char** whyNot) const {
+    if (this->numSlowPaths() > 5) {
+        if (whyNot) { *whyNot = "Too many slow paths (either concave or dashed)."; }
         return false;
     }
-
-    return fData->suitableForGpuRasterization(context, reason);
-}
-#endif
-
-// fRecord OK
-bool SkPicture::willPlayBackBitmaps() const {
-    if (fRecord.get()) {
-        return fRecordWillPlayBackBitmaps;
-    }
-    if (!fData.get()) {
-        return false;
-    }
-    return fData->containsBitmaps();
+    return true;
 }
 
-// fRecord OK
-static int32_t next_picture_generation_id() {
-    static int32_t  gPictureGenerationID = 0;
-    // do a loop in case our global wraps around, as we never want to
-    // return a 0
-    int32_t genID;
-    do {
-        genID = sk_atomic_inc(&gPictureGenerationID) + 1;
-    } while (SK_InvalidGenID == genID);
-    return genID;
+// Global setting to disable security precautions for serialization.
+void SkPicture::SetPictureIOSecurityPrecautionsEnabled_Dangerous(bool set) {
+    g_AllPictureIOSecurityPrecautionsEnabled = set;
 }
 
-// fRecord OK
-uint32_t SkPicture::uniqueID() const {
-    if (SK_InvalidGenID == fUniqueID) {
-        fUniqueID = next_picture_generation_id();
-    }
-    return fUniqueID;
-}
-
-// fRecord OK
-SkPicture::SkPicture(int width, int height, SkRecord* record)
-    : fWidth(width)
-    , fHeight(height)
-    , fRecord(record)
-    , fRecordWillPlayBackBitmaps(SkRecordWillPlaybackBitmaps(*record)) {
-    this->needsNewGenID();
-}
-
-// Note that we are assuming that this entry point will only be called from
-// one thread. Currently the only client of this method is 
-// SkGpuDevice::EXPERIMENTAL_optimize which should be only called from a single
-// thread.
-void SkPicture::addDeletionListener(DeletionListener* listener) const {
-    SkASSERT(NULL != listener);
-
-    *fDeletionListeners.append() = SkRef(listener);
-}
-
-void SkPicture::callDeletionListeners() {
-    for (int i = 0; i < fDeletionListeners.count(); ++i) {
-        fDeletionListeners[i]->onDeletion(this->uniqueID());
-    }
-
-    fDeletionListeners.unrefAll();
+bool SkPicture::PictureIOSecurityPrecautionsEnabled() {
+    return g_AllPictureIOSecurityPrecautionsEnabled;
 }
diff --git a/gfx/skia/skia/src/core/SkPictureCommon.h b/gfx/skia/skia/src/core/SkPictureCommon.h
new file mode 100644
index 000000000000..6e95b296e0a6
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkPictureCommon.h
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+// Some shared code used by both SkBigPicture and SkMiniPicture.
+//   SkTextHunter   -- SkRecord visitor that returns true when the op draws text.
+//   SkBitmapHunter -- SkRecord visitor that returns true when the op draws a bitmap or image.
+//   SkPathCounter  -- SkRecord visitor that counts paths that draw slowly on the GPU.
+
+#include "SkPathEffect.h"
+#include "SkRecords.h"
+#include "SkTLogic.h"
+
+struct SkTextHunter {
+    // Most ops never have text.  Some always do.  Subpictures know themeselves.
+    bool operator()(const SkRecords::DrawPicture& op) { return op.picture->hasText(); }
+    bool operator()(const SkRecords::DrawDrawable&) { /*TODO*/ return false; }
+
+    template <typename T>
+    SK_WHEN(T::kTags & SkRecords::kHasText_Tag, bool) operator()(const T&) { return true; }
+    template <typename T>
+    SK_WHEN(!(T::kTags & SkRecords::kHasText_Tag), bool) operator()(const T&) { return false; }
+};
+
+
+// N.B. This name is slightly historical: hunting season is now open for SkImages too.
+struct SkBitmapHunter {
+    // Some ops have a paint, some have an optional paint.  Either way, get back a pointer.
+    static const SkPaint* AsPtr(const SkPaint& p) { return &p; }
+    static const SkPaint* AsPtr(const SkRecords::Optional<SkPaint>& p) { return p; }
+
+    // Main entry for visitor:
+    // If the op is a DrawPicture, recurse.
+    // If the op has a bitmap or image directly, return true.
+    // If the op has a paint and the paint has a bitmap, return true.
+    // Otherwise, return false.
+    bool operator()(const SkRecords::DrawPicture& op) { return op.picture->willPlayBackBitmaps(); }
+    bool operator()(const SkRecords::DrawDrawable&) { /*TODO*/ return false; }
+
+    template <typename T>
+    bool operator()(const T& op) { return CheckBitmap(op); }
+
+    // If the op is tagged as having an image, return true.
+    template <typename T>
+    static SK_WHEN(T::kTags & SkRecords::kHasImage_Tag, bool) CheckBitmap(const T&) {
+        return true;
+    }
+
+    // If not, look for one in its paint (if it has a paint).
+    template <typename T>
+    static SK_WHEN(!(T::kTags & SkRecords::kHasImage_Tag), bool) CheckBitmap(const T& op) {
+        return CheckPaint(op);
+    }
+
+    // Most draws-type ops have paints.
+    template <typename T>
+    static SK_WHEN(T::kTags & SkRecords::kDraw_Tag, bool) CheckPaint(const T& op) {
+        return PaintHasBitmap(AsPtr(op.paint));
+    }
+
+    // SaveLayers also have a paint to check.
+    static bool CheckPaint(const SkRecords::SaveLayer& op) {
+        return PaintHasBitmap(AsPtr(op.paint));
+    }
+
+    // Shouldn't be any non-Draw non-SaveLayer ops with paints.
+    template <typename T>
+    static SK_WHEN(!(T::kTags & SkRecords::kDraw_Tag), bool) CheckPaint(const T&) {
+        return false;
+    }
+
+private:
+    static bool PaintHasBitmap(const SkPaint* paint) {
+        if (paint) {
+            const SkShader* shader = paint->getShader();
+            if (shader && shader->isABitmap()) {
+                return true;
+            }
+        }
+        return false;
+    }
+};
+
+// TODO: might be nicer to have operator() return an int (the number of slow paths) ?
+struct SkPathCounter {
+    // Some ops have a paint, some have an optional paint.  Either way, get back a pointer.
+    static const SkPaint* AsPtr(const SkPaint& p) { return &p; }
+    static const SkPaint* AsPtr(const SkRecords::Optional<SkPaint>& p) { return p; }
+
+    SkPathCounter() : fNumSlowPathsAndDashEffects(0) {}
+
+    // Recurse into nested pictures.
+    void operator()(const SkRecords::DrawPicture& op) {
+        fNumSlowPathsAndDashEffects += op.picture->numSlowPaths();
+    }
+    void operator()(const SkRecords::DrawDrawable&) { /* TODO */ }
+
+    void checkPaint(const SkPaint* paint) {
+        if (paint && paint->getPathEffect()) {
+            // Initially assume it's slow.
+            fNumSlowPathsAndDashEffects++;
+        }
+    }
+
+    void operator()(const SkRecords::DrawPoints& op) {
+        this->checkPaint(&op.paint);
+        const SkPathEffect* effect = op.paint.getPathEffect();
+        if (effect) {
+            SkPathEffect::DashInfo info;
+            SkPathEffect::DashType dashType = effect->asADash(&info);
+            if (2 == op.count && SkPaint::kRound_Cap != op.paint.getStrokeCap() &&
+                SkPathEffect::kDash_DashType == dashType && 2 == info.fCount) {
+                fNumSlowPathsAndDashEffects--;
+            }
+        }
+    }
+
+    void operator()(const SkRecords::DrawPath& op) {
+        this->checkPaint(&op.paint);
+        if (op.paint.isAntiAlias() && !op.path.isConvex()) {
+            SkPaint::Style paintStyle = op.paint.getStyle();
+            const SkRect& pathBounds = op.path.getBounds();
+            if (SkPaint::kStroke_Style == paintStyle &&
+                0 == op.paint.getStrokeWidth()) {
+                // AA hairline concave path is not slow.
+            } else if (SkPaint::kFill_Style == paintStyle && pathBounds.width() < 64.f &&
+                       pathBounds.height() < 64.f && !op.path.isVolatile()) {
+                // AADF eligible concave path is not slow.
+            } else {
+                fNumSlowPathsAndDashEffects++;
+            }
+        }
+    }
+
+    void operator()(const SkRecords::SaveLayer& op) {
+        this->checkPaint(AsPtr(op.paint));
+    }
+
+    template <typename T>
+    SK_WHEN(T::kTags & SkRecords::kDraw_Tag, void) operator()(const T& op) {
+        this->checkPaint(AsPtr(op.paint));
+    }
+
+    template <typename T>
+    SK_WHEN(!(T::kTags & SkRecords::kDraw_Tag), void) operator()(const T& op) { /* do nothing */ }
+
+    int fNumSlowPathsAndDashEffects;
+};
diff --git a/gfx/skia/skia/src/core/SkPictureContentInfo.cpp b/gfx/skia/skia/src/core/SkPictureContentInfo.cpp
new file mode 100644
index 000000000000..42d42c408c5c
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkPictureContentInfo.cpp
@@ -0,0 +1,175 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkPaint.h"
+#include "SkPathEffect.h"
+#include "SkPictureContentInfo.h"
+
+bool SkPictureContentInfo::suitableForGpuRasterization(GrContext* context, const char **reason,
+                                                       int sampleCount) const {
+    // TODO: the heuristic used here needs to be refined
+    static const int kNumPaintWithPathEffectUsesTol = 1;
+    static const int kNumAAConcavePaths = 5;
+
+    SkASSERT(fNumAAHairlineConcavePaths <= fNumAAConcavePaths);
+
+    int numNonDashedPathEffects = fNumPaintWithPathEffectUses -
+                                  fNumFastPathDashEffects;
+
+    bool suitableForDash = (0 == fNumPaintWithPathEffectUses) ||
+                           (numNonDashedPathEffects < kNumPaintWithPathEffectUsesTol
+                            && 0 == sampleCount);
+
+    bool ret = suitableForDash &&
+                    (fNumAAConcavePaths - fNumAAHairlineConcavePaths - fNumAADFEligibleConcavePaths)
+                    < kNumAAConcavePaths;
+    if (!ret && reason) {
+        if (!suitableForDash) {
+            if (0 != sampleCount) {
+                *reason = "Can't use multisample on dash effect.";
+            } else {
+                *reason = "Too many non dashed path effects.";
+            }
+        } else if ((fNumAAConcavePaths - fNumAAHairlineConcavePaths - fNumAADFEligibleConcavePaths)
+                    >= kNumAAConcavePaths) {
+            *reason = "Too many anti-aliased concave paths.";
+        } else {
+            *reason = "Unknown reason for GPU unsuitability.";
+        }
+    }
+    return ret;
+}
+
+void SkPictureContentInfo::onDrawPoints(size_t count, const SkPaint& paint) {
+    if (paint.getPathEffect() != nullptr) {
+        SkPathEffect::DashInfo info;
+        SkPathEffect::DashType dashType = paint.getPathEffect()->asADash(&info);
+        if (2 == count && SkPaint::kRound_Cap != paint.getStrokeCap() &&
+            SkPathEffect::kDash_DashType == dashType && 2 == info.fCount) {
+            ++fNumFastPathDashEffects;
+        }
+    }
+}
+
+void SkPictureContentInfo::onDrawPath(const SkPath& path, const SkPaint& paint) {
+    if (paint.isAntiAlias() && !path.isConvex()) {
+        ++fNumAAConcavePaths;
+
+        SkPaint::Style paintStyle = paint.getStyle();
+        const SkRect& pathBounds = path.getBounds();
+        if (SkPaint::kStroke_Style == paint.getStyle() && 0 == paint.getStrokeWidth()) {
+            ++fNumAAHairlineConcavePaths;
+        } else if (SkPaint::kFill_Style == paintStyle && pathBounds.width() < 64.f &&
+                   pathBounds.height() < 64.f && !path.isVolatile()) {
+            ++fNumAADFEligibleConcavePaths;
+        }
+    }
+}
+
+void SkPictureContentInfo::onAddPaintPtr(const SkPaint* paint) {
+    if (paint && paint->getPathEffect()) {
+        ++fNumPaintWithPathEffectUses;
+    }
+}
+
+void SkPictureContentInfo::onSaveLayer() {
+    *fSaveStack.append() = kSaveLayer_Flag;
+}
+
+void SkPictureContentInfo::onSave() {
+    *fSaveStack.append() = kSave_Flag;
+}
+
+void SkPictureContentInfo::onRestore() {
+    SkASSERT(fSaveStack.count() > 0);
+
+    bool containedSaveLayer = fSaveStack.top() & kContainedSaveLayer_Flag;
+
+    if (fSaveStack.top() & kSaveLayer_Flag) {
+        ++fNumLayers;
+        if (containedSaveLayer) {
+            ++fNumInteriorLayers;
+        } else {
+            ++fNumLeafLayers;
+        }
+        containedSaveLayer = true;
+    }
+
+    fSaveStack.pop();
+
+    if (containedSaveLayer && fSaveStack.count() > 0) {
+        fSaveStack.top() |= kContainedSaveLayer_Flag;
+    }
+}
+
+void SkPictureContentInfo::rescindLastSave() {
+    SkASSERT(fSaveStack.count() > 0);
+    SkASSERT(fSaveStack.top() & kSave_Flag);
+
+    bool containedSaveLayer = fSaveStack.top() & kContainedSaveLayer_Flag;
+
+    fSaveStack.pop();
+
+    if (containedSaveLayer && fSaveStack.count() > 0) {
+        fSaveStack.top() |= kContainedSaveLayer_Flag;
+    }
+}
+
+void SkPictureContentInfo::rescindLastSaveLayer() {
+    SkASSERT(fSaveStack.count() > 0);
+    SkASSERT(fSaveStack.top() & kSaveLayer_Flag);
+
+    bool containedSaveLayer = fSaveStack.top() & kContainedSaveLayer_Flag;
+
+    fSaveStack.pop();
+
+    if (containedSaveLayer && fSaveStack.count() > 0) {
+        fSaveStack.top() |= kContainedSaveLayer_Flag;
+    }
+}
+
+void SkPictureContentInfo::set(const SkPictureContentInfo& src) {
+    fNumOperations = src.fNumOperations;
+    fNumTexts = src.fNumTexts;
+    fNumPaintWithPathEffectUses = src.fNumPaintWithPathEffectUses;
+    fNumFastPathDashEffects = src.fNumFastPathDashEffects;
+    fNumAAConcavePaths = src.fNumAAConcavePaths;
+    fNumAAHairlineConcavePaths = src.fNumAAHairlineConcavePaths;
+    fNumAADFEligibleConcavePaths = src.fNumAADFEligibleConcavePaths;
+    fNumLayers = src.fNumLayers;
+    fNumInteriorLayers = src.fNumInteriorLayers;
+    fNumLeafLayers = src.fNumLeafLayers;
+    fSaveStack = src.fSaveStack;
+}
+
+void SkPictureContentInfo::reset() {
+    fNumOperations = 0;
+    fNumTexts = 0;
+    fNumPaintWithPathEffectUses = 0;
+    fNumFastPathDashEffects = 0;
+    fNumAAConcavePaths = 0;
+    fNumAAHairlineConcavePaths = 0;
+    fNumAADFEligibleConcavePaths = 0;
+    fNumLayers = 0;
+    fNumInteriorLayers = 0;
+    fNumLeafLayers = 0;
+    fSaveStack.rewind();
+}
+
+void SkPictureContentInfo::swap(SkPictureContentInfo* other) {
+    SkTSwap(fNumOperations, other->fNumOperations);
+    SkTSwap(fNumTexts, other->fNumTexts);
+    SkTSwap(fNumPaintWithPathEffectUses, other->fNumPaintWithPathEffectUses);
+    SkTSwap(fNumFastPathDashEffects, other->fNumFastPathDashEffects);
+    SkTSwap(fNumAAConcavePaths, other->fNumAAConcavePaths);
+    SkTSwap(fNumAAHairlineConcavePaths, other->fNumAAHairlineConcavePaths);
+    SkTSwap(fNumAADFEligibleConcavePaths, other->fNumAADFEligibleConcavePaths);
+    SkTSwap(fNumLayers, other->fNumLayers);
+    SkTSwap(fNumInteriorLayers, other->fNumInteriorLayers);
+    SkTSwap(fNumLeafLayers, other->fNumLeafLayers);
+    fSaveStack.swap(other->fSaveStack);
+}
diff --git a/gfx/skia/skia/src/core/SkPictureContentInfo.h b/gfx/skia/skia/src/core/SkPictureContentInfo.h
new file mode 100644
index 000000000000..81c8a274e33b
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkPictureContentInfo.h
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPictureContentInfo_DEFINED
+#define SkPictureContentInfo_DEFINED
+
+#include "SkTDArray.h"
+
+class GrContext;
+
+class SkPictureContentInfo {
+public:
+    SkPictureContentInfo() { this->reset(); }
+    SkPictureContentInfo(const SkPictureContentInfo& src) { this->set(src); }
+
+    int numOperations() const { return fNumOperations; }
+    bool hasText() const { return fNumTexts > 0; }
+
+    int numLayers() const { return fNumLayers; }
+    int numInteriorLayers() const { return fNumInteriorLayers; }
+    int numLeafLayers() const { return fNumLeafLayers; }
+
+    bool suitableForGpuRasterization(GrContext* context, const char **reason,
+                                     int sampleCount) const;
+
+    void addOperation() { ++fNumOperations; }
+
+    void onDrawPoints(size_t count, const SkPaint& paint);
+    void onDrawPath(const SkPath& path, const SkPaint& paint);
+    void onAddPaintPtr(const SkPaint* paint);
+    void onDrawText() { ++fNumTexts; }
+
+    void onSaveLayer();
+    void onSave();
+    void onRestore();
+    void rescindLastSave();
+    void rescindLastSaveLayer();
+
+    void set(const SkPictureContentInfo& src);
+    void reset();
+    void swap(SkPictureContentInfo* other);
+
+private:
+    // Raw count of operations in the picture
+    int fNumOperations;
+    // Count of all forms of drawText
+    int fNumTexts;
+
+    // This field is incremented every time a paint with a path effect is
+    // used (i.e., it is not a de-duplicated count)
+    int fNumPaintWithPathEffectUses;
+    // This field is incremented every time a paint with a path effect that is
+    // dashed, we are drawing a line, and we can use the gpu fast path
+    int fNumFastPathDashEffects;
+    // This field is incremented every time an anti-aliased drawPath call is
+    // issued with a concave path
+    int fNumAAConcavePaths;
+    // This field is incremented every time a drawPath call is
+    // issued for a hairline stroked concave path.
+    int fNumAAHairlineConcavePaths;
+    // This field is incremented every time a drawPath call is
+    // issued for a concave path that can be rendered with distance fields
+    int fNumAADFEligibleConcavePaths;
+    // These fields track the different layer flavors. fNumLayers is just
+    // a count of all saveLayers, fNumInteriorLayers is the number of layers
+    // with a layer inside them, fNumLeafLayers is the number of layers with
+    // no layer inside them.
+    int fNumLayers;
+    int fNumInteriorLayers;
+    int fNumLeafLayers;
+
+    enum Flags {
+        kSave_Flag      = 0x1,
+        kSaveLayer_Flag = 0x2,
+
+        // Did the current save or saveLayer contain another saveLayer.
+        // Percolated back down the save stack.
+        kContainedSaveLayer_Flag = 0x4
+    };
+
+    // Stack of save vs saveLayer information to track nesting
+    SkTDArray<uint32_t> fSaveStack;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/core/SkPictureData.cpp b/gfx/skia/skia/src/core/SkPictureData.cpp
index 15534625972a..4391be4acf5d 100644
--- a/gfx/skia/skia/src/core/SkPictureData.cpp
+++ b/gfx/skia/skia/src/core/SkPictureData.cpp
@@ -5,13 +5,12 @@
  * found in the LICENSE file.
  */
 #include <new>
-#include "SkBBoxHierarchy.h"
-#include "SkDrawPictureCallback.h"
+#include "SkImageGenerator.h"
 #include "SkPictureData.h"
 #include "SkPictureRecord.h"
 #include "SkReadBuffer.h"
+#include "SkTextBlob.h"
 #include "SkTypeface.h"
-#include "SkTSort.h"
 #include "SkWriteBuffer.h"
 
 #if SK_SUPPORT_GPU
@@ -29,10 +28,8 @@ SkPictureData::SkPictureData(const SkPictInfo& info)
 
 void SkPictureData::initForPlayback() const {
     // ensure that the paths bounds are pre-computed
-    if (NULL != fPathHeap.get()) {
-        for (int i = 0; i < fPathHeap->count(); i++) {
-            (*fPathHeap.get())[i].updateBoundsCache();
-        }
+    for (int i = 0; i < fPaths.count(); i++) {
+        fPaths[i].updateBoundsCache();
     }
 }
 
@@ -40,195 +37,89 @@ SkPictureData::SkPictureData(const SkPictureRecord& record,
                              const SkPictInfo& info,
                              bool deepCopyOps)
     : fInfo(info) {
-#ifdef SK_DEBUG_SIZE
-    size_t overallBytes, bitmapBytes, matricesBytes,
-    paintBytes, pathBytes, pictureBytes, regionBytes;
-    int bitmaps = record.bitmaps(&bitmapBytes);
-    int matrices = record.matrices(&matricesBytes);
-    int paints = record.paints(&paintBytes);
-    int paths = record.paths(&pathBytes);
-    int pictures = record.pictures(&pictureBytes);
-    int regions = record.regions(&regionBytes);
-    SkDebugf("picture record mem used %zd (stream %zd) ", record.size(),
-             record.streamlen());
-    if (bitmaps != 0)
-        SkDebugf("bitmaps size %zd (bitmaps:%d) ", bitmapBytes, bitmaps);
-    if (matrices != 0)
-        SkDebugf("matrices size %zd (matrices:%d) ", matricesBytes, matrices);
-    if (paints != 0)
-        SkDebugf("paints size %zd (paints:%d) ", paintBytes, paints);
-    if (paths != 0)
-        SkDebugf("paths size %zd (paths:%d) ", pathBytes, paths);
-    if (pictures != 0)
-        SkDebugf("pictures size %zd (pictures:%d) ", pictureBytes, pictures);
-    if (regions != 0)
-        SkDebugf("regions size %zd (regions:%d) ", regionBytes, regions);
-    if (record.fPointWrites != 0)
-        SkDebugf("points size %zd (points:%d) ", record.fPointBytes, record.fPointWrites);
-    if (record.fRectWrites != 0)
-        SkDebugf("rects size %zd (rects:%d) ", record.fRectBytes, record.fRectWrites);
-    if (record.fTextWrites != 0)
-        SkDebugf("text size %zd (text strings:%d) ", record.fTextBytes, record.fTextWrites);
-
-    SkDebugf("\n");
-#endif
-#ifdef SK_DEBUG_DUMP
-    record.dumpMatrices();
-    record.dumpPaints();
-#endif
 
     this->init();
 
     fOpData = record.opData(deepCopyOps);
 
-    fBoundingHierarchy = record.fBoundingHierarchy;
-    fStateTree = record.fStateTree;
-
-    SkSafeRef(fBoundingHierarchy);
-    SkSafeRef(fStateTree);
     fContentInfo.set(record.fContentInfo);
 
-    if (NULL != fBoundingHierarchy) {
-        fBoundingHierarchy->flushDeferredInserts();
-    }
+    fBitmaps = record.fBitmaps;
+    fPaints  = record.fPaints;
 
-    // copy over the refcnt dictionary to our reader
-    record.fFlattenableHeap.setupPlaybacks();
-
-    fBitmaps = record.fBitmapHeap->extractBitmaps();
-    fPaints = record.fPaints.unflattenToArray();
-
-    fBitmapHeap.reset(SkSafeRef(record.fBitmapHeap));
-    fPathHeap.reset(SkSafeRef(record.pathHeap()));
+    fPaths.reset(record.fPaths.count());
+    record.fPaths.foreach([this](const SkPath& path, int n) {
+        // These indices are logically 1-based, but we need to serialize them
+        // 0-based to keep the deserializing SkPictureData::getPath() working.
+        fPaths[n-1] = path;
+    });
 
     this->initForPlayback();
 
     const SkTDArray<const SkPicture* >& pictures = record.getPictureRefs();
     fPictureCount = pictures.count();
     if (fPictureCount > 0) {
-        fPictureRefs = SkNEW_ARRAY(const SkPicture*, fPictureCount);
+        fPictureRefs = new const SkPicture* [fPictureCount];
         for (int i = 0; i < fPictureCount; i++) {
             fPictureRefs[i] = pictures[i];
             fPictureRefs[i]->ref();
         }
     }
 
-#ifdef SK_DEBUG_SIZE
-    int overall = fPlayback->size(&overallBytes);
-    bitmaps = fPlayback->bitmaps(&bitmapBytes);
-    paints = fPlayback->paints(&paintBytes);
-    paths = fPlayback->paths(&pathBytes);
-    pictures = fPlayback->pictures(&pictureBytes);
-    regions = fPlayback->regions(&regionBytes);
-    SkDebugf("playback size %zd (objects:%d) ", overallBytes, overall);
-    if (bitmaps != 0)
-        SkDebugf("bitmaps size %zd (bitmaps:%d) ", bitmapBytes, bitmaps);
-    if (paints != 0)
-        SkDebugf("paints size %zd (paints:%d) ", paintBytes, paints);
-    if (paths != 0)
-        SkDebugf("paths size %zd (paths:%d) ", pathBytes, paths);
-    if (pictures != 0)
-        SkDebugf("pictures size %zd (pictures:%d) ", pictureBytes, pictures);
-    if (regions != 0)
-        SkDebugf("regions size %zd (regions:%d) ", regionBytes, regions);
-    SkDebugf("\n");
-#endif
-}
-
-#ifdef SK_SUPPORT_LEGACY_PICTURE_CLONE
-SkPictureData::SkPictureData(const SkPictureData& src, SkPictCopyInfo* deepCopyInfo)
-    : fInfo(src.fInfo) {
-    this->init();
-
-    fBitmapHeap.reset(SkSafeRef(src.fBitmapHeap.get()));
-    fPathHeap.reset(SkSafeRef(src.fPathHeap.get()));
-
-    fOpData = SkSafeRef(src.fOpData);
-
-    fBoundingHierarchy = src.fBoundingHierarchy;
-    fStateTree = src.fStateTree;
-    fContentInfo.set(src.fContentInfo);
-
-    SkSafeRef(fBoundingHierarchy);
-    SkSafeRef(fStateTree);
-
-    if (deepCopyInfo) {
-        int paintCount = SafeCount(src.fPaints);
-
-        if (src.fBitmaps) {
-            fBitmaps = SkTRefArray<SkBitmap>::Create(src.fBitmaps->begin(), src.fBitmaps->count());
+    // templatize to consolidate with similar picture logic?
+    const SkTDArray<const SkTextBlob*>& blobs = record.getTextBlobRefs();
+    fTextBlobCount = blobs.count();
+    if (fTextBlobCount > 0) {
+        fTextBlobRefs = new const SkTextBlob* [fTextBlobCount];
+        for (int i = 0; i < fTextBlobCount; ++i) {
+            fTextBlobRefs[i] = SkRef(blobs[i]);
         }
-
-        fPaints = SkTRefArray<SkPaint>::Create(paintCount);
-        SkASSERT(deepCopyInfo->paintData.count() == paintCount);
-        SkBitmapHeap* bmHeap = deepCopyInfo->controller.getBitmapHeap();
-        SkTypefacePlayback* tfPlayback = deepCopyInfo->controller.getTypefacePlayback();
-        for (int i = 0; i < paintCount; i++) {
-            if (deepCopyInfo->paintData[i]) {
-                deepCopyInfo->paintData[i]->unflatten<SkPaint::FlatteningTraits>(
-                    &fPaints->writableAt(i), bmHeap, tfPlayback);
-            } else {
-                // needs_deep_copy was false, so just need to assign
-                fPaints->writableAt(i) = src.fPaints->at(i);
-            }
-        }
-
-    } else {
-        fBitmaps = SkSafeRef(src.fBitmaps);
-        fPaints = SkSafeRef(src.fPaints);
     }
 
-    fPictureCount = src.fPictureCount;
-    fPictureRefs = SkNEW_ARRAY(const SkPicture*, fPictureCount);
-    for (int i = 0; i < fPictureCount; i++) {
-        if (deepCopyInfo) {
-            fPictureRefs[i] = src.fPictureRefs[i]->clone();
-        } else {
-            fPictureRefs[i] = src.fPictureRefs[i];
-            fPictureRefs[i]->ref();
+    const SkTDArray<const SkImage*>& imgs = record.getImageRefs();
+    fImageCount = imgs.count();
+    if (fImageCount > 0) {
+        fImageRefs = new const SkImage* [fImageCount];
+        for (int i = 0; i < fImageCount; ++i) {
+            fImageRefs[i] = SkRef(imgs[i]);
         }
     }
 }
-#endif//SK_SUPPORT_LEGACY_PICTURE_CLONE
 
 void SkPictureData::init() {
-    fBitmaps = NULL;
-    fPaints = NULL;
-    fPictureRefs = NULL;
+    fPictureRefs = nullptr;
     fPictureCount = 0;
-    fOpData = NULL;
-    fFactoryPlayback = NULL;
-    fBoundingHierarchy = NULL;
-    fStateTree = NULL;
+    fTextBlobRefs = nullptr;
+    fTextBlobCount = 0;
+    fImageRefs = nullptr;
+    fImageCount = 0;
+    fOpData = nullptr;
+    fFactoryPlayback = nullptr;
 }
 
 SkPictureData::~SkPictureData() {
     SkSafeUnref(fOpData);
 
-    SkSafeUnref(fBitmaps);
-    SkSafeUnref(fPaints);
-    SkSafeUnref(fBoundingHierarchy);
-    SkSafeUnref(fStateTree);
-
     for (int i = 0; i < fPictureCount; i++) {
         fPictureRefs[i]->unref();
     }
-    SkDELETE_ARRAY(fPictureRefs);
+    delete[] fPictureRefs;
 
-    SkDELETE(fFactoryPlayback);
-}
+    for (int i = 0; i < fTextBlobCount; i++) {
+        fTextBlobRefs[i]->unref();
+    }
+    delete[] fTextBlobRefs;
 
-void SkPictureData::dumpSize() const {
-    SkDebugf("--- picture size: ops=%d bitmaps=%d [%d] paints=%d [%d]\n",
-             fOpData->size(),
-             SafeCount(fBitmaps), SafeCount(fBitmaps) * sizeof(SkBitmap),
-             SafeCount(fPaints), SafeCount(fPaints) * sizeof(SkPaint));
-    SkDebugf("--- picture size: paths=%d\n",
-             SafeCount(fPathHeap.get()));
+    for (int i = 0; i < fImageCount; i++) {
+        fImageRefs[i]->unref();
+    }
+    delete[] fImageRefs;
+
+    delete fFactoryPlayback;
 }
 
 bool SkPictureData::containsBitmaps() const {
-    if (fBitmaps && fBitmaps->count() > 0) {
+    if (fBitmaps.count() > 0 || fImageCount > 0) {
         return true;
     }
     for (int i = 0; i < fPictureCount; ++i) {
@@ -249,7 +140,7 @@ static size_t compute_chunk_size(SkFlattenable::Factory* array, int count) {
 
     for (int i = 0; i < count; i++) {
         const char* name = SkFlattenable::FactoryToName(array[i]);
-        if (NULL == name || 0 == *name) {
+        if (nullptr == name || 0 == *name) {
             size += SkWStream::SizeOfPackedUInt(0);
         } else {
             size_t len = strlen(name);
@@ -287,8 +178,7 @@ void SkPictureData::WriteFactories(SkWStream* stream, const SkFactorySet& rec) {
 
     for (int i = 0; i < count; i++) {
         const char* name = SkFlattenable::FactoryToName(array[i]);
-//        SkDebugf("---- write factories [%d] %p <%s>\n", i, array[i], name);
-        if (NULL == name || 0 == *name) {
+        if (nullptr == name || 0 == *name) {
             stream->writePackedUInt(0);
         } else {
             size_t len = strlen(name);
@@ -317,61 +207,94 @@ void SkPictureData::WriteTypefaces(SkWStream* stream, const SkRefCntSet& rec) {
 void SkPictureData::flattenToBuffer(SkWriteBuffer& buffer) const {
     int i, n;
 
-    if ((n = SafeCount(fBitmaps)) > 0) {
+    if ((n = fBitmaps.count()) > 0) {
         write_tag_size(buffer, SK_PICT_BITMAP_BUFFER_TAG, n);
         for (i = 0; i < n; i++) {
-            buffer.writeBitmap((*fBitmaps)[i]);
+            buffer.writeBitmap(fBitmaps[i]);
         }
     }
 
-    if ((n = SafeCount(fPaints)) > 0) {
+    if ((n = fPaints.count()) > 0) {
         write_tag_size(buffer, SK_PICT_PAINT_BUFFER_TAG, n);
         for (i = 0; i < n; i++) {
-            buffer.writePaint((*fPaints)[i]);
+            buffer.writePaint(fPaints[i]);
         }
     }
 
-    if ((n = SafeCount(fPathHeap.get())) > 0) {
+    if ((n = fPaths.count()) > 0) {
         write_tag_size(buffer, SK_PICT_PATH_BUFFER_TAG, n);
-        fPathHeap->flatten(buffer);
+        buffer.writeInt(n);
+        for (int i = 0; i < n; i++) {
+            buffer.writePath(fPaths[i]);
+        }
+    }
+
+    if (fTextBlobCount > 0) {
+        write_tag_size(buffer, SK_PICT_TEXTBLOB_BUFFER_TAG, fTextBlobCount);
+        for (i = 0; i  < fTextBlobCount; ++i) {
+            fTextBlobRefs[i]->flatten(buffer);
+        }
+    }
+
+    if (fImageCount > 0) {
+        write_tag_size(buffer, SK_PICT_IMAGE_BUFFER_TAG, fImageCount);
+        for (i = 0; i  < fImageCount; ++i) {
+            buffer.writeImage(fImageRefs[i]);
+        }
     }
 }
 
 void SkPictureData::serialize(SkWStream* stream,
-                                  SkPicture::EncodeBitmap encoder) const {
+                              SkPixelSerializer* pixelSerializer,
+                              SkRefCntSet* topLevelTypeFaceSet) const {
+    // This can happen at pretty much any time, so might as well do it first.
     write_tag_size(stream, SK_PICT_READER_TAG, fOpData->size());
     stream->write(fOpData->bytes(), fOpData->size());
 
+    // We serialize all typefaces into the typeface section of the top-level picture.
+    SkRefCntSet localTypefaceSet;
+    SkRefCntSet* typefaceSet = topLevelTypeFaceSet ? topLevelTypeFaceSet : &localTypefaceSet;
+
+    // We delay serializing the bulk of our data until after we've serialized
+    // factories and typefaces by first serializing to an in-memory write buffer.
+    SkFactorySet factSet;  // buffer refs factSet, so factSet must come first.
+    SkWriteBuffer buffer(SkWriteBuffer::kCrossProcess_Flag);
+    buffer.setFactoryRecorder(&factSet);
+    buffer.setPixelSerializer(pixelSerializer);
+    buffer.setTypefaceRecorder(typefaceSet);
+    this->flattenToBuffer(buffer);
+
+    // Dummy serialize our sub-pictures for the side effect of filling
+    // typefaceSet with typefaces from sub-pictures.
+    struct DevNull: public SkWStream {
+        DevNull() : fBytesWritten(0) {}
+        size_t fBytesWritten;
+        bool write(const void*, size_t size) override { fBytesWritten += size; return true; }
+        size_t bytesWritten() const override { return fBytesWritten; }
+    } devnull;
+    for (int i = 0; i < fPictureCount; i++) {
+        fPictureRefs[i]->serialize(&devnull, pixelSerializer, typefaceSet);
+    }
+
+    // We need to write factories before we write the buffer.
+    // We need to write typefaces before we write the buffer or any sub-picture.
+    WriteFactories(stream, factSet);
+    if (typefaceSet == &localTypefaceSet) {
+        WriteTypefaces(stream, *typefaceSet);
+    }
+
+    // Write the buffer.
+    write_tag_size(stream, SK_PICT_BUFFER_SIZE_TAG, buffer.bytesWritten());
+    buffer.writeToStream(stream);
+
+    // Write sub-pictures by calling serialize again.
     if (fPictureCount > 0) {
         write_tag_size(stream, SK_PICT_PICTURE_TAG, fPictureCount);
         for (int i = 0; i < fPictureCount; i++) {
-            fPictureRefs[i]->serialize(stream, encoder);
+            fPictureRefs[i]->serialize(stream, pixelSerializer, typefaceSet);
         }
     }
 
-    // Write some of our data into a writebuffer, and then serialize that
-    // into our stream
-    {
-        SkRefCntSet  typefaceSet;
-        SkFactorySet factSet;
-
-        SkWriteBuffer buffer(SkWriteBuffer::kCrossProcess_Flag);
-        buffer.setTypefaceRecorder(&typefaceSet);
-        buffer.setFactoryRecorder(&factSet);
-        buffer.setBitmapEncoder(encoder);
-
-        this->flattenToBuffer(buffer);
-
-        // We have to write these two sets into the stream *before* we write
-        // the buffer, since parsing that buffer will require that we already
-        // have these sets available to use.
-        WriteFactories(stream, factSet);
-        WriteTypefaces(stream, typefaceSet);
-
-        write_tag_size(stream, SK_PICT_BUFFER_SIZE_TAG, buffer.bytesWritten());
-        buffer.writeToStream(stream);
-    }
-
     stream->write32(SK_PICT_EOF_TAG);
 }
 
@@ -419,7 +342,8 @@ static uint32_t pictInfoFlagsToReadBufferFlags(uint32_t pictInfoFlags) {
 bool SkPictureData::parseStreamTag(SkStream* stream,
                                    uint32_t tag,
                                    uint32_t size,
-                                   SkPicture::InstallPixelRefProc proc) {
+                                   SkPicture::InstallPixelRefProc proc,
+                                   SkTypefacePlayback* topLevelTFPlayback) {
     /*
      *  By the time we encounter BUFFER_SIZE_TAG, we need to have already seen
      *  its dependents: FACTORY_TAG and TYPEFACE_TAG. These two are not required
@@ -432,28 +356,17 @@ bool SkPictureData::parseStreamTag(SkStream* stream,
     SkDEBUGCODE(bool haveBuffer = false;)
 
     switch (tag) {
-        case SK_PICT_READER_TAG: {
-            SkAutoMalloc storage(size);
-            if (stream->read(storage.get(), size) != size) {
+        case SK_PICT_READER_TAG:
+            SkASSERT(nullptr == fOpData);
+            fOpData = SkData::NewFromStream(stream, size);
+            if (!fOpData) {
                 return false;
             }
-            SkASSERT(NULL == fOpData);
-            fOpData = SkData::NewFromMalloc(storage.detach(), size);
-        } break;
+            break;
         case SK_PICT_FACTORY_TAG: {
             SkASSERT(!haveBuffer);
-        // Remove this code when v21 and below are no longer supported. At the
-        // same time add a new 'count' variable and use it rather then reusing 'size'.
-#ifndef DISABLE_V21_COMPATIBILITY_CODE
-            if (fInfo.fVersion >= 22) {
-                // in v22 this tag's size represents the size of the chunk in bytes
-                // and the number of factory strings is written out separately
-#endif
-                size = stream->readU32();
-#ifndef DISABLE_V21_COMPATIBILITY_CODE
-            }
-#endif
-            fFactoryPlayback = SkNEW_ARGS(SkFactoryPlayback, (size));
+            size = stream->readU32();
+            fFactoryPlayback = new SkFactoryPlayback(size);
             for (size_t i = 0; i < size; i++) {
                 SkString str;
                 const size_t len = stream->readPackedUInt();
@@ -479,26 +392,14 @@ bool SkPictureData::parseStreamTag(SkStream* stream,
             }
         } break;
         case SK_PICT_PICTURE_TAG: {
-            fPictureCount = size;
-            fPictureRefs = SkNEW_ARRAY(const SkPicture*, fPictureCount);
-            bool success = true;
-            int i = 0;
-            for ( ; i < fPictureCount; i++) {
-                fPictureRefs[i] = SkPicture::CreateFromStream(stream, proc);
-                if (NULL == fPictureRefs[i]) {
-                    success = false;
-                    break;
+            fPictureCount = 0;
+            fPictureRefs = new const SkPicture* [size];
+            for (uint32_t i = 0; i < size; i++) {
+                fPictureRefs[i] = SkPicture::CreateFromStream(stream, proc, topLevelTFPlayback);
+                if (!fPictureRefs[i]) {
+                    return false;
                 }
-            }
-            if (!success) {
-                // Delete all of the pictures that were already created (up to but excluding i):
-                for (int j = 0; j < i; j++) {
-                    fPictureRefs[j]->unref();
-                }
-                // Delete the array
-                SkDELETE_ARRAY(fPictureRefs);
-                fPictureCount = 0;
-                return false;
+                fPictureCount++;
             }
         } break;
         case SK_PICT_BUFFER_SIZE_TAG: {
@@ -507,86 +408,138 @@ bool SkPictureData::parseStreamTag(SkStream* stream,
                 return false;
             }
 
+            /* Should we use SkValidatingReadBuffer instead? */
             SkReadBuffer buffer(storage.get(), size);
             buffer.setFlags(pictInfoFlagsToReadBufferFlags(fInfo.fFlags));
             buffer.setVersion(fInfo.fVersion);
 
             fFactoryPlayback->setupBuffer(buffer);
-            fTFPlayback.setupBuffer(buffer);
             buffer.setBitmapDecoder(proc);
 
-            while (!buffer.eof()) {
+            if (fTFPlayback.count() > 0) {
+                // .skp files <= v43 have typefaces serialized with each sub picture.
+                fTFPlayback.setupBuffer(buffer);
+            } else {
+                // Newer .skp files serialize all typefaces with the top picture.
+                topLevelTFPlayback->setupBuffer(buffer);
+            }
+
+            while (!buffer.eof() && buffer.isValid()) {
                 tag = buffer.readUInt();
                 size = buffer.readUInt();
                 if (!this->parseBufferTag(buffer, tag, size)) {
                     return false;
                 }
             }
+            if (!buffer.isValid()) {
+                return false;
+            }
             SkDEBUGCODE(haveBuffer = true;)
         } break;
     }
     return true;    // success
 }
 
-bool SkPictureData::parseBufferTag(SkReadBuffer& buffer,
-                                   uint32_t tag, uint32_t size) {
+static const SkImage* create_image_from_buffer(SkReadBuffer& buffer) {
+    return buffer.readImage();
+}
+
+// Need a shallow wrapper to return const SkPicture* to match the other factories,
+// as SkPicture::CreateFromBuffer() returns SkPicture*
+static const SkPicture* create_picture_from_buffer(SkReadBuffer& buffer) {
+    return SkPicture::CreateFromBuffer(buffer);
+}
+
+template <typename T>
+bool new_array_from_buffer(SkReadBuffer& buffer, uint32_t inCount,
+                           const T*** array, int* outCount, const T* (*factory)(SkReadBuffer&)) {
+    if (!buffer.validate((0 == *outCount) && (nullptr == *array))) {
+        return false;
+    }
+    if (0 == inCount) {
+        return true;
+    }
+    *outCount = inCount;
+    *array = new const T* [*outCount];
+    bool success = true;
+    int i = 0;
+    for (; i < *outCount; i++) {
+        (*array)[i] = factory(buffer);
+        if (nullptr == (*array)[i]) {
+            success = false;
+            break;
+        }
+    }
+    if (!success) {
+        // Delete all of the blobs that were already created (up to but excluding i):
+        for (int j = 0; j < i; j++) {
+            (*array)[j]->unref();
+        }
+        // Delete the array
+        delete[] * array;
+        *array = nullptr;
+        *outCount = 0;
+        return false;
+    }
+    return true;
+}
+
+bool SkPictureData::parseBufferTag(SkReadBuffer& buffer, uint32_t tag, uint32_t size) {
     switch (tag) {
         case SK_PICT_BITMAP_BUFFER_TAG: {
             const int count = SkToInt(size);
-            fBitmaps = SkTRefArray<SkBitmap>::Create(size);
+            fBitmaps.reset(count);
             for (int i = 0; i < count; ++i) {
-                SkBitmap* bm = &fBitmaps->writableAt(i);
-                buffer.readBitmap(bm);
-                bm->setImmutable();
+                SkBitmap* bm = &fBitmaps[i];
+                if (buffer.readBitmap(bm)) {
+                    bm->setImmutable();
+                } else {
+                    return false;
+                }
             }
         } break;
         case SK_PICT_PAINT_BUFFER_TAG: {
             const int count = SkToInt(size);
-            fPaints = SkTRefArray<SkPaint>::Create(size);
+            fPaints.reset(count);
             for (int i = 0; i < count; ++i) {
-                buffer.readPaint(&fPaints->writableAt(i));
+                buffer.readPaint(&fPaints[i]);
             }
         } break;
         case SK_PICT_PATH_BUFFER_TAG:
             if (size > 0) {
-                fPathHeap.reset(SkNEW_ARGS(SkPathHeap, (buffer)));
+                const int count = buffer.readInt();
+                fPaths.reset(count);
+                for (int i = 0; i < count; i++) {
+                    buffer.readPath(&fPaths[i]);
+                }
+            } break;
+        case SK_PICT_TEXTBLOB_BUFFER_TAG:
+            if (!new_array_from_buffer(buffer, size, &fTextBlobRefs, &fTextBlobCount,
+                                       SkTextBlob::CreateFromBuffer)) {
+                return false;
+            }
+            break;
+        case SK_PICT_IMAGE_BUFFER_TAG:
+            if (!new_array_from_buffer(buffer, size, &fImageRefs, &fImageCount,
+                                       create_image_from_buffer)) {
+                return false;
             }
             break;
         case SK_PICT_READER_TAG: {
-            SkAutoMalloc storage(size);
-            if (!buffer.readByteArray(storage.get(), size) ||
-                !buffer.validate(NULL == fOpData)) {
+            SkAutoDataUnref data(SkData::NewUninitialized(size));
+            if (!buffer.readByteArray(data->writable_data(), size) ||
+                !buffer.validate(nullptr == fOpData)) {
                 return false;
             }
-            SkASSERT(NULL == fOpData);
-            fOpData = SkData::NewFromMalloc(storage.detach(), size);
+            SkASSERT(nullptr == fOpData);
+            fOpData = data.detach();
         } break;
-        case SK_PICT_PICTURE_TAG: {
-            if (!buffer.validate((0 == fPictureCount) && (NULL == fPictureRefs))) {
+        case SK_PICT_PICTURE_TAG:
+            if (!new_array_from_buffer(buffer, size, &fPictureRefs, &fPictureCount,
+                                       create_picture_from_buffer)) {
                 return false;
             }
-            fPictureCount = size;
-            fPictureRefs = SkNEW_ARRAY(const SkPicture*, fPictureCount);
-            bool success = true;
-            int i = 0;
-            for ( ; i < fPictureCount; i++) {
-                fPictureRefs[i] = SkPicture::CreateFromBuffer(buffer);
-                if (NULL == fPictureRefs[i]) {
-                    success = false;
-                    break;
-                }
-            }
-            if (!success) {
-                // Delete all of the pictures that were already created (up to but excluding i):
-                for (int j = 0; j < i; j++) {
-                    fPictureRefs[j]->unref();
-                }
-                // Delete the array
-                SkDELETE_ARRAY(fPictureRefs);
-                fPictureCount = 0;
-                return false;
-            }
-        } break;
+            break;
         default:
             // The tag was invalid.
             return false;
@@ -596,28 +549,33 @@ bool SkPictureData::parseBufferTag(SkReadBuffer& buffer,
 
 SkPictureData* SkPictureData::CreateFromStream(SkStream* stream,
                                                const SkPictInfo& info,
-                                               SkPicture::InstallPixelRefProc proc) {
-    SkAutoTDelete<SkPictureData> data(SkNEW_ARGS(SkPictureData, (info)));
+                                               SkPicture::InstallPixelRefProc proc,
+                                               SkTypefacePlayback* topLevelTFPlayback) {
+    SkAutoTDelete<SkPictureData> data(new SkPictureData(info));
+    if (!topLevelTFPlayback) {
+        topLevelTFPlayback = &data->fTFPlayback;
+    }
 
-    if (!data->parseStream(stream, proc)) {
-        return NULL;
+    if (!data->parseStream(stream, proc, topLevelTFPlayback)) {
+        return nullptr;
     }
     return data.detach();
 }
 
 SkPictureData* SkPictureData::CreateFromBuffer(SkReadBuffer& buffer,
                                                const SkPictInfo& info) {
-    SkAutoTDelete<SkPictureData> data(SkNEW_ARGS(SkPictureData, (info)));
+    SkAutoTDelete<SkPictureData> data(new SkPictureData(info));
     buffer.setVersion(info.fVersion);
 
     if (!data->parseBuffer(buffer)) {
-        return NULL;
+        return nullptr;
     }
     return data.detach();
 }
 
 bool SkPictureData::parseStream(SkStream* stream,
-                                SkPicture::InstallPixelRefProc proc) {
+                                SkPicture::InstallPixelRefProc proc,
+                                SkTypefacePlayback* topLevelTFPlayback) {
     for (;;) {
         uint32_t tag = stream->readU32();
         if (SK_PICT_EOF_TAG == tag) {
@@ -625,7 +583,7 @@ bool SkPictureData::parseStream(SkStream* stream,
         }
 
         uint32_t size = stream->readU32();
-        if (!this->parseStreamTag(stream, tag, size, proc)) {
+        if (!this->parseStreamTag(stream, tag, size, proc, topLevelTFPlayback)) {
             return false; // we're invalid
         }
     }
@@ -650,577 +608,27 @@ bool SkPictureData::parseBuffer(SkReadBuffer& buffer) {
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
-const SkPicture::OperationList* SkPictureData::getActiveOps(const SkIRect& query) const {
-    if (NULL == fStateTree || NULL == fBoundingHierarchy) {
-        return NULL;
-    }
-
-    SkPicture::OperationList* activeOps = SkNEW(SkPicture::OperationList);
-
-    fBoundingHierarchy->search(query, &(activeOps->fOps));
-    if (0 != activeOps->fOps.count()) {
-        SkTQSort<SkPictureStateTree::Draw>(
-            reinterpret_cast<SkPictureStateTree::Draw**>(activeOps->fOps.begin()),
-            reinterpret_cast<SkPictureStateTree::Draw**>(activeOps->fOps.end()-1));
-    }
-
-    return activeOps;
-}
-
 #if SK_SUPPORT_GPU
 bool SkPictureData::suitableForGpuRasterization(GrContext* context, const char **reason,
-                                                    int sampleCount) const {
-    // TODO: the heuristic used here needs to be refined
-    static const int kNumPaintWithPathEffectUsesTol = 1;
-    static const int kNumAAConcavePaths = 5;
-
-    SkASSERT(fContentInfo.numAAHairlineConcavePaths() <= fContentInfo.numAAConcavePaths());
-
-    int numNonDashedPathEffects = fContentInfo.numPaintWithPathEffectUses() -
-                                  fContentInfo.numFastPathDashEffects();
-
-    bool suitableForDash = (0 == fContentInfo.numPaintWithPathEffectUses()) ||
-                           (numNonDashedPathEffects < kNumPaintWithPathEffectUsesTol
-                            && 0 == sampleCount);
-
-    bool ret = suitableForDash &&
-                    (fContentInfo.numAAConcavePaths() - fContentInfo.numAAHairlineConcavePaths())
-                    < kNumAAConcavePaths;
-    if (!ret && NULL != reason) {
-        if (!suitableForDash) {
-            if (0 != sampleCount) {
-                *reason = "Can't use multisample on dash effect.";
-            } else {
-                *reason = "Too many non dashed path effects.";
-            }
-        } else if ((fContentInfo.numAAConcavePaths() - fContentInfo.numAAHairlineConcavePaths())
-                    >= kNumAAConcavePaths)
-            *reason = "Too many anti-aliased concave paths.";
-        else
-            *reason = "Unknown reason for GPU unsuitability.";
-    }
-    return ret;
+                                                int sampleCount) const {
+    return fContentInfo.suitableForGpuRasterization(context, reason, sampleCount);
 }
 
 bool SkPictureData::suitableForGpuRasterization(GrContext* context, const char **reason,
                                                 GrPixelConfig config, SkScalar dpi) const {
 
-    if (context != NULL) {
+    if (context != nullptr) {
         return this->suitableForGpuRasterization(context, reason,
                                                  context->getRecommendedSampleCount(config, dpi));
     } else {
-        return this->suitableForGpuRasterization(NULL, reason);
+        return this->suitableForGpuRasterization(nullptr, reason);
     }
 }
 
+bool SkPictureData::suitableForLayerOptimization() const {
+    return fContentInfo.numLayers() > 0;
+}
 #endif
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef SK_DEBUG_SIZE
-int SkPictureData::size(size_t* sizePtr) {
-    int objects = bitmaps(sizePtr);
-    objects += paints(sizePtr);
-    objects += paths(sizePtr);
-    objects += pictures(sizePtr);
-    objects += regions(sizePtr);
-    *sizePtr = fOpData.size();
-    return objects;
-}
 
-int SkPictureData::bitmaps(size_t* size) {
-    size_t result = 0;
-    for (int index = 0; index < fBitmapCount; index++) {
-     //   const SkBitmap& bitmap = fBitmaps[index];
-        result += sizeof(SkBitmap); // bitmap->size();
-    }
-    *size = result;
-    return fBitmapCount;
-}
-
-int SkPictureData::paints(size_t* size) {
-    size_t result = 0;
-    for (int index = 0; index < fPaintCount; index++) {
-    //    const SkPaint& paint = fPaints[index];
-        result += sizeof(SkPaint); // paint->size();
-    }
-    *size = result;
-    return fPaintCount;
-}
-
-int SkPictureData::paths(size_t* size) {
-    size_t result = 0;
-    for (int index = 0; index < fPathCount; index++) {
-        const SkPath& path = fPaths[index];
-        result += path.flatten(NULL);
-    }
-    *size = result;
-    return fPathCount;
-}
-#endif
-
-#ifdef SK_DEBUG_DUMP
-void SkPictureData::dumpBitmap(const SkBitmap& bitmap) const {
-    char pBuffer[DUMP_BUFFER_SIZE];
-    char* bufferPtr = pBuffer;
-    bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-        "BitmapData bitmap%p = {", &bitmap);
-    bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-        "{kWidth, %d}, ", bitmap.width());
-    bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-        "{kHeight, %d}, ", bitmap.height());
-    bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-        "{kRowBytes, %d}, ", bitmap.rowBytes());
-//        start here;
-    SkDebugf("%s{0}};\n", pBuffer);
-}
-
-void dumpMatrix(const SkMatrix& matrix) const {
-    SkMatrix defaultMatrix;
-    defaultMatrix.reset();
-    char pBuffer[DUMP_BUFFER_SIZE];
-    char* bufferPtr = pBuffer;
-    bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-        "MatrixData matrix%p = {", &matrix);
-    SkScalar scaleX = matrix.getScaleX();
-    if (scaleX != defaultMatrix.getScaleX())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kScaleX, %g}, ", SkScalarToFloat(scaleX));
-    SkScalar scaleY = matrix.getScaleY();
-    if (scaleY != defaultMatrix.getScaleY())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kScaleY, %g}, ", SkScalarToFloat(scaleY));
-    SkScalar skewX = matrix.getSkewX();
-    if (skewX != defaultMatrix.getSkewX())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kSkewX, %g}, ", SkScalarToFloat(skewX));
-    SkScalar skewY = matrix.getSkewY();
-    if (skewY != defaultMatrix.getSkewY())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kSkewY, %g}, ", SkScalarToFloat(skewY));
-    SkScalar translateX = matrix.getTranslateX();
-    if (translateX != defaultMatrix.getTranslateX())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kTranslateX, %g}, ", SkScalarToFloat(translateX));
-    SkScalar translateY = matrix.getTranslateY();
-    if (translateY != defaultMatrix.getTranslateY())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kTranslateY, %g}, ", SkScalarToFloat(translateY));
-    SkScalar perspX = matrix.getPerspX();
-    if (perspX != defaultMatrix.getPerspX())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kPerspX, %g}, ", perspX);
-    SkScalar perspY = matrix.getPerspY();
-    if (perspY != defaultMatrix.getPerspY())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kPerspY, %g}, ", perspY);
-    SkDebugf("%s{0}};\n", pBuffer);
-}
-
-void dumpPaint(const SkPaint& paint) const {
-    SkPaint defaultPaint;
-    char pBuffer[DUMP_BUFFER_SIZE];
-    char* bufferPtr = pBuffer;
-    bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-        "PaintPointers paintPtrs%p = {", &paint);
-    const SkTypeface* typeface = paint.getTypeface();
-    if (typeface != defaultPaint.getTypeface())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kTypeface, %p}, ", typeface);
-    const SkPathEffect* pathEffect = paint.getPathEffect();
-    if (pathEffect != defaultPaint.getPathEffect())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kPathEffect, %p}, ", pathEffect);
-    const SkShader* shader = paint.getShader();
-    if (shader != defaultPaint.getShader())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kShader, %p}, ", shader);
-    const SkXfermode* xfermode = paint.getXfermode();
-    if (xfermode != defaultPaint.getXfermode())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kXfermode, %p}, ", xfermode);
-    const SkMaskFilter* maskFilter = paint.getMaskFilter();
-    if (maskFilter != defaultPaint.getMaskFilter())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kMaskFilter, %p}, ", maskFilter);
-    const SkColorFilter* colorFilter = paint.getColorFilter();
-    if (colorFilter != defaultPaint.getColorFilter())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kColorFilter, %p}, ", colorFilter);
-    const SkRasterizer* rasterizer = paint.getRasterizer();
-    if (rasterizer != defaultPaint.getRasterizer())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kRasterizer, %p}, ", rasterizer);
-    const SkDrawLooper* drawLooper = paint.getLooper();
-    if (drawLooper != defaultPaint.getLooper())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kDrawLooper, %p}, ", drawLooper);
-    SkDebugf("%s{0}};\n", pBuffer);
-    bufferPtr = pBuffer;
-    bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-        "PaintScalars paintScalars%p = {", &paint);
-    SkScalar textSize = paint.getTextSize();
-    if (textSize != defaultPaint.getTextSize())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kTextSize, %g}, ", SkScalarToFloat(textSize));
-    SkScalar textScaleX = paint.getTextScaleX();
-    if (textScaleX != defaultPaint.getTextScaleX())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kTextScaleX, %g}, ", SkScalarToFloat(textScaleX));
-    SkScalar textSkewX = paint.getTextSkewX();
-    if (textSkewX != defaultPaint.getTextSkewX())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kTextSkewX, %g}, ", SkScalarToFloat(textSkewX));
-    SkScalar strokeWidth = paint.getStrokeWidth();
-    if (strokeWidth != defaultPaint.getStrokeWidth())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kStrokeWidth, %g}, ", SkScalarToFloat(strokeWidth));
-    SkScalar strokeMiter = paint.getStrokeMiter();
-    if (strokeMiter != defaultPaint.getStrokeMiter())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kStrokeMiter, %g}, ", SkScalarToFloat(strokeMiter));
-    SkDebugf("%s{0}};\n", pBuffer);
-    bufferPtr = pBuffer;
-    bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-        "PaintInts = paintInts%p = {", &paint);
-    unsigned color = paint.getColor();
-    if (color != defaultPaint.getColor())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kColor, 0x%x}, ", color);
-    unsigned flags = paint.getFlags();
-    if (flags != defaultPaint.getFlags())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kFlags, 0x%x}, ", flags);
-    int align = paint.getTextAlign();
-    if (align != defaultPaint.getTextAlign())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kAlign, 0x%x}, ", align);
-    int strokeCap = paint.getStrokeCap();
-    if (strokeCap != defaultPaint.getStrokeCap())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kStrokeCap, 0x%x}, ", strokeCap);
-    int strokeJoin = paint.getStrokeJoin();
-    if (strokeJoin != defaultPaint.getStrokeJoin())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kAlign, 0x%x}, ", strokeJoin);
-    int style = paint.getStyle();
-    if (style != defaultPaint.getStyle())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kStyle, 0x%x}, ", style);
-    int textEncoding = paint.getTextEncoding();
-    if (textEncoding != defaultPaint.getTextEncoding())
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "{kTextEncoding, 0x%x}, ", textEncoding);
-    SkDebugf("%s{0}};\n", pBuffer);
-
-    SkDebugf("PaintData paint%p = {paintPtrs%p, paintScalars%p, paintInts%p};\n",
-        &paint, &paint, &paint, &paint);
-}
-
-void SkPictureData::dumpPath(const SkPath& path) const {
-    SkDebugf("path dump unimplemented\n");
-}
-
-void SkPictureData::dumpPicture(const SkPicture& picture) const {
-    SkDebugf("picture dump unimplemented\n");
-}
-
-void SkPictureData::dumpRegion(const SkRegion& region) const {
-    SkDebugf("region dump unimplemented\n");
-}
-
-int SkPictureData::dumpDrawType(char* bufferPtr, char* buffer, DrawType drawType) {
-    return snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - buffer),
-        "k%s, ", DrawTypeToString(drawType));
-}
-
-int SkPictureData::dumpInt(char* bufferPtr, char* buffer, char* name) {
-    return snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - buffer),
-        "%s:%d, ", name, getInt());
-}
-
-int SkPictureData::dumpRect(char* bufferPtr, char* buffer, char* name) {
-    const SkRect* rect = fReader.skipRect();
-    return snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - buffer),
-        "%s:{l:%g t:%g r:%g b:%g}, ", name, SkScalarToFloat(rect.fLeft),
-        SkScalarToFloat(rect.fTop),
-        SkScalarToFloat(rect.fRight), SkScalarToFloat(rect.fBottom));
-}
-
-int SkPictureData::dumpPoint(char* bufferPtr, char* buffer, char* name) {
-    SkPoint pt;
-    getPoint(&pt);
-    return snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - buffer),
-        "%s:{x:%g y:%g}, ", name, SkScalarToFloat(pt.fX),
-        SkScalarToFloat(pt.fY));
-}
-
-void SkPictureData::dumpPointArray(char** bufferPtrPtr, char* buffer, int count) {
-    char* bufferPtr = *bufferPtrPtr;
-    const SkPoint* pts = (const SkPoint*)fReadStream.getAtPos();
-    fReadStream.skip(sizeof(SkPoint) * count);
-    bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - buffer),
-        "count:%d {", count);
-    for (int index = 0; index < count; index++)
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - buffer),
-        "{x:%g y:%g}, ", SkScalarToFloat(pts[index].fX),
-        SkScalarToFloat(pts[index].fY));
-    bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - buffer),
-        "} ");
-    *bufferPtrPtr = bufferPtr;
-}
-
-int SkPictureData::dumpPtr(char* bufferPtr, char* buffer, char* name, void* ptr) {
-    return snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - buffer),
-        "%s:%p, ", name, ptr);
-}
-
-int SkPictureData::dumpRectPtr(char* bufferPtr, char* buffer, char* name) {
-    char result;
-    fReadStream.read(&result, sizeof(result));
-    if (result)
-        return dumpRect(bufferPtr, buffer, name);
-    else
-        return snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - buffer),
-            "%s:NULL, ", name);
-}
-
-int SkPictureData::dumpScalar(char* bufferPtr, char* buffer, char* name) {
-    return snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - buffer),
-        "%s:%d, ", name, getScalar());
-}
-
-void SkPictureData::dumpText(char** bufferPtrPtr, char* buffer) {
-    char* bufferPtr = *bufferPtrPtr;
-    int length = getInt();
-    bufferPtr += dumpDrawType(bufferPtr, buffer);
-    fReadStream.skipToAlign4();
-    char* text = (char*) fReadStream.getAtPos();
-    fReadStream.skip(length);
-    bufferPtr += dumpInt(bufferPtr, buffer, "length");
-    int limit = DUMP_BUFFER_SIZE - (bufferPtr - buffer) - 2;
-    length >>= 1;
-    if (limit > length)
-        limit = length;
-    if (limit > 0) {
-        *bufferPtr++ = '"';
-        for (int index = 0; index < limit; index++) {
-            *bufferPtr++ = *(unsigned short*) text;
-            text += sizeof(unsigned short);
-        }
-        *bufferPtr++ = '"';
-    }
-    *bufferPtrPtr = bufferPtr;
-}
-
-#define DUMP_DRAWTYPE(drawType) \
-    bufferPtr += dumpDrawType(bufferPtr, buffer, drawType)
-
-#define DUMP_INT(name) \
-    bufferPtr += dumpInt(bufferPtr, buffer, #name)
-
-#define DUMP_RECT_PTR(name) \
-    bufferPtr += dumpRectPtr(bufferPtr, buffer, #name)
-
-#define DUMP_POINT(name) \
-    bufferPtr += dumpRect(bufferPtr, buffer, #name)
-
-#define DUMP_RECT(name) \
-    bufferPtr += dumpRect(bufferPtr, buffer, #name)
-
-#define DUMP_POINT_ARRAY(count) \
-    dumpPointArray(&bufferPtr, buffer, count)
-
-#define DUMP_PTR(name, ptr) \
-    bufferPtr += dumpPtr(bufferPtr, buffer, #name, (void*) ptr)
-
-#define DUMP_SCALAR(name) \
-    bufferPtr += dumpScalar(bufferPtr, buffer, #name)
-
-#define DUMP_TEXT() \
-    dumpText(&bufferPtr, buffer)
-
-void SkPictureData::dumpStream() {
-    SkDebugf("RecordStream stream = {\n");
-    DrawType drawType;
-    fReadStream.rewind();
-    char buffer[DUMP_BUFFER_SIZE], * bufferPtr;
-    while (fReadStream.read(&drawType, sizeof(drawType))) {
-        bufferPtr = buffer;
-        DUMP_DRAWTYPE(drawType);
-        switch (drawType) {
-            case CLIP_PATH: {
-                DUMP_PTR(SkPath, &getPath());
-                DUMP_INT(SkRegion::Op);
-                DUMP_INT(offsetToRestore);
-                } break;
-            case CLIP_REGION: {
-                DUMP_INT(SkRegion::Op);
-                DUMP_INT(offsetToRestore);
-            } break;
-            case CLIP_RECT: {
-                DUMP_RECT(rect);
-                DUMP_INT(SkRegion::Op);
-                DUMP_INT(offsetToRestore);
-                } break;
-            case CONCAT:
-                break;
-            case DRAW_BITMAP: {
-                DUMP_PTR(SkPaint, getPaint());
-                DUMP_PTR(SkBitmap, &getBitmap());
-                DUMP_SCALAR(left);
-                DUMP_SCALAR(top);
-                } break;
-            case DRAW_PAINT:
-                DUMP_PTR(SkPaint, getPaint());
-                break;
-            case DRAW_PATH: {
-                DUMP_PTR(SkPaint, getPaint());
-                DUMP_PTR(SkPath, &getPath());
-                } break;
-            case DRAW_PICTURE: {
-                DUMP_PTR(SkPicture, &getPicture());
-                } break;
-            case DRAW_POINTS: {
-                DUMP_PTR(SkPaint, getPaint());
-                (void)getInt(); // PointMode
-                size_t count = getInt();
-                fReadStream.skipToAlign4();
-                DUMP_POINT_ARRAY(count);
-                } break;
-            case DRAW_POS_TEXT: {
-                DUMP_PTR(SkPaint, getPaint());
-                DUMP_TEXT();
-                size_t points = getInt();
-                fReadStream.skipToAlign4();
-                DUMP_POINT_ARRAY(points);
-                } break;
-            case DRAW_POS_TEXT_H: {
-                DUMP_PTR(SkPaint, getPaint());
-                DUMP_TEXT();
-                size_t points = getInt();
-                fReadStream.skipToAlign4();
-                DUMP_SCALAR(top);
-                DUMP_SCALAR(bottom);
-                DUMP_SCALAR(constY);
-                DUMP_POINT_ARRAY(points);
-                } break;
-            case DRAW_RECT: {
-                DUMP_PTR(SkPaint, getPaint());
-                DUMP_RECT(rect);
-                } break;
-            case DRAW_SPRITE: {
-                DUMP_PTR(SkPaint, getPaint());
-                DUMP_PTR(SkBitmap, &getBitmap());
-                DUMP_SCALAR(left);
-                DUMP_SCALAR(top);
-                } break;
-            case DRAW_TEXT: {
-                DUMP_PTR(SkPaint, getPaint());
-                DUMP_TEXT();
-                DUMP_SCALAR(x);
-                DUMP_SCALAR(y);
-                } break;
-            case DRAW_TEXT_ON_PATH: {
-                DUMP_PTR(SkPaint, getPaint());
-                DUMP_TEXT();
-                DUMP_PTR(SkPath, &getPath());
-                } break;
-            case RESTORE:
-                break;
-            case ROTATE:
-                DUMP_SCALAR(rotate);
-                break;
-            case SAVE:
-                DUMP_INT(SkCanvas::SaveFlags);
-                break;
-            case SAVE_LAYER: {
-                DUMP_RECT_PTR(layer);
-                DUMP_PTR(SkPaint, getPaint());
-                DUMP_INT(SkCanvas::SaveFlags);
-                } break;
-            case SCALE: {
-                DUMP_SCALAR(sx);
-                DUMP_SCALAR(sy);
-                } break;
-            case SKEW: {
-                DUMP_SCALAR(sx);
-                DUMP_SCALAR(sy);
-                } break;
-            case TRANSLATE: {
-                DUMP_SCALAR(dx);
-                DUMP_SCALAR(dy);
-                } break;
-            default:
-                SkASSERT(0);
-        }
-        SkDebugf("%s\n", buffer);
-    }
-}
-
-void SkPictureData::dump() const {
-    char pBuffer[DUMP_BUFFER_SIZE];
-    char* bufferPtr = pBuffer;
-    int index;
-    if (fBitmapCount > 0)
-        SkDebugf("// bitmaps (%d)\n", fBitmapCount);
-    for (index = 0; index < fBitmapCount; index++) {
-        const SkBitmap& bitmap = fBitmaps[index];
-        dumpBitmap(bitmap);
-    }
-    if (fBitmapCount > 0)
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "Bitmaps bitmaps = {");
-    for (index = 0; index < fBitmapCount; index++)
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "bitmap%p, ", &fBitmaps[index]);
-    if (fBitmapCount > 0)
-        SkDebugf("%s0};\n", pBuffer);
-
-
-    if (fPaintCount > 0)
-        SkDebugf("// paints (%d)\n", fPaintCount);
-    for (index = 0; index < fPaintCount; index++) {
-        const SkPaint& paint = fPaints[index];
-        dumpPaint(paint);
-    }
-    bufferPtr = pBuffer;
-    if (fPaintCount > 0)
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "Paints paints = {");
-    for (index = 0; index < fPaintCount; index++)
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "paint%p, ", &fPaints[index]);
-    if (fPaintCount > 0)
-        SkDebugf("%s0};\n", pBuffer);
-
-    for (index = 0; index < fPathCount; index++) {
-        const SkPath& path = fPaths[index];
-        dumpPath(path);
-    }
-    bufferPtr = pBuffer;
-    if (fPathCount > 0)
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "Paths paths = {");
-    for (index = 0; index < fPathCount; index++)
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "path%p, ", &fPaths[index]);
-    if (fPathCount > 0)
-        SkDebugf("%s0};\n", pBuffer);
-
-    for (index = 0; index < fPictureCount; index++) {
-        dumpPicture(*fPictureRefs[index]);
-    }
-    bufferPtr = pBuffer;
-    if (fPictureCount > 0)
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "Pictures pictures = {");
-    for (index = 0; index < fPictureCount; index++)
-        bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
-            "picture%p, ", fPictureRefs[index]);
-    if (fPictureCount > 0)
-        SkDebugf("%s0};\n", pBuffer);
-
-    const_cast<SkPictureData*>(this)->dumpStream();
-}
-
-#endif
diff --git a/gfx/skia/skia/src/core/SkPictureData.h b/gfx/skia/skia/src/core/SkPictureData.h
index 6ea0b18b03c7..4e4deef55a32 100644
--- a/gfx/skia/skia/src/core/SkPictureData.h
+++ b/gfx/skia/skia/src/core/SkPictureData.h
@@ -9,13 +9,13 @@
 #define SkPictureData_DEFINED
 
 #include "SkBitmap.h"
-#include "SkPathHeap.h"
 #include "SkPicture.h"
+#include "SkPictureContentInfo.h"
 #include "SkPictureFlat.h"
-#include "SkPictureStateTree.h"
 
 class SkData;
 class SkPictureRecord;
+class SkPixelSerializer;
 class SkReader32;
 class SkStream;
 class SkWStream;
@@ -23,8 +23,8 @@ class SkBBoxHierarchy;
 class SkMatrix;
 class SkPaint;
 class SkPath;
-class SkPictureStateTree;
 class SkReadBuffer;
+class SkTextBlob;
 
 struct SkPictInfo {
     enum Flags {
@@ -35,8 +35,7 @@ struct SkPictInfo {
 
     char        fMagic[8];
     uint32_t    fVersion;
-    uint32_t    fWidth;
-    uint32_t    fHeight;
+    SkRect      fCullRect;
     uint32_t    fFlags;
 };
 
@@ -48,130 +47,59 @@ struct SkPictInfo {
 // This tag specifies the size of the ReadBuffer, needed for the following tags
 #define SK_PICT_BUFFER_SIZE_TAG     SkSetFourByteTag('a', 'r', 'a', 'y')
 // these are all inside the ARRAYS tag
-#define SK_PICT_BITMAP_BUFFER_TAG  SkSetFourByteTag('b', 't', 'm', 'p')
-#define SK_PICT_PAINT_BUFFER_TAG   SkSetFourByteTag('p', 'n', 't', ' ')
-#define SK_PICT_PATH_BUFFER_TAG    SkSetFourByteTag('p', 't', 'h', ' ')
+#define SK_PICT_BITMAP_BUFFER_TAG   SkSetFourByteTag('b', 't', 'm', 'p')
+#define SK_PICT_PAINT_BUFFER_TAG    SkSetFourByteTag('p', 'n', 't', ' ')
+#define SK_PICT_PATH_BUFFER_TAG     SkSetFourByteTag('p', 't', 'h', ' ')
+#define SK_PICT_TEXTBLOB_BUFFER_TAG SkSetFourByteTag('b', 'l', 'o', 'b')
+#define SK_PICT_IMAGE_BUFFER_TAG    SkSetFourByteTag('i', 'm', 'a', 'g')
 
 // Always write this guy last (with no length field afterwards)
 #define SK_PICT_EOF_TAG     SkSetFourByteTag('e', 'o', 'f', ' ')
 
-// SkPictureContentInfo is not serialized! It is intended solely for use
-// with suitableForGpuRasterization.
-class SkPictureContentInfo {
-public:
-    SkPictureContentInfo() { this->reset(); }
-
-    SkPictureContentInfo(const SkPictureContentInfo& src) { this->set(src); }
-
-    void set(const SkPictureContentInfo& src) {
-        fNumPaintWithPathEffectUses = src.fNumPaintWithPathEffectUses;
-        fNumFastPathDashEffects = src.fNumFastPathDashEffects;
-        fNumAAConcavePaths = src.fNumAAConcavePaths;
-        fNumAAHairlineConcavePaths = src.fNumAAHairlineConcavePaths;
-    }
-
-    void reset() {
-        fNumPaintWithPathEffectUses = 0;
-        fNumFastPathDashEffects = 0;
-        fNumAAConcavePaths = 0;
-        fNumAAHairlineConcavePaths = 0;
-    }
-
-    void swap(SkPictureContentInfo* other) {
-        SkTSwap(fNumPaintWithPathEffectUses, other->fNumPaintWithPathEffectUses);
-        SkTSwap(fNumFastPathDashEffects, other->fNumFastPathDashEffects);
-        SkTSwap(fNumAAConcavePaths, other->fNumAAConcavePaths);
-        SkTSwap(fNumAAHairlineConcavePaths, other->fNumAAHairlineConcavePaths);
-    }
-
-    void incPaintWithPathEffectUses() { ++fNumPaintWithPathEffectUses; }
-    int numPaintWithPathEffectUses() const { return fNumPaintWithPathEffectUses; }
-
-    void incFastPathDashEffects() { ++fNumFastPathDashEffects; }
-    int numFastPathDashEffects() const { return fNumFastPathDashEffects; }
-
-    void incAAConcavePaths() { ++fNumAAConcavePaths; }
-    int numAAConcavePaths() const { return fNumAAConcavePaths; }
-
-    void incAAHairlineConcavePaths() {
-        ++fNumAAHairlineConcavePaths;
-        SkASSERT(fNumAAHairlineConcavePaths <= fNumAAConcavePaths);
-    }
-    int numAAHairlineConcavePaths() const { return fNumAAHairlineConcavePaths; }
-
-private:
-    // This field is incremented every time a paint with a path effect is
-    // used (i.e., it is not a de-duplicated count)
-    int fNumPaintWithPathEffectUses;
-    // This field is incremented every time a paint with a path effect that is
-    // dashed, we are drawing a line, and we can use the gpu fast path
-    int fNumFastPathDashEffects;
-    // This field is incremented every time an anti-aliased drawPath call is
-    // issued with a concave path
-    int fNumAAConcavePaths;
-    // This field is incremented every time a drawPath call is
-    // issued for a hairline stroked concave path.
-    int fNumAAHairlineConcavePaths;
-};
-
-#ifdef SK_SUPPORT_LEGACY_PICTURE_CLONE
-/**
- * Container for data that is needed to deep copy a SkPicture. The container
- * enables the data to be generated once and reused for subsequent copies.
- */
-struct SkPictCopyInfo {
-    SkPictCopyInfo() : controller(1024) {}
-
-    SkChunkFlatController controller;
-    SkTDArray<SkFlatData*> paintData;
-};
-#endif
-
 class SkPictureData {
 public:
-#ifdef SK_SUPPORT_LEGACY_PICTURE_CLONE
-    SkPictureData(const SkPictureData& src, SkPictCopyInfo* deepCopyInfo = NULL);
-#endif
     SkPictureData(const SkPictureRecord& record, const SkPictInfo&, bool deepCopyOps);
+    // Does not affect ownership of SkStream.
     static SkPictureData* CreateFromStream(SkStream*,
                                            const SkPictInfo&,
-                                           SkPicture::InstallPixelRefProc);
+                                           SkPicture::InstallPixelRefProc,
+                                           SkTypefacePlayback*);
     static SkPictureData* CreateFromBuffer(SkReadBuffer&, const SkPictInfo&);
 
     virtual ~SkPictureData();
 
-    const SkPicture::OperationList* getActiveOps(const SkIRect& queryRect) const;
-
-    void serialize(SkWStream*, SkPicture::EncodeBitmap) const;
+    void serialize(SkWStream*, SkPixelSerializer*, SkRefCntSet*) const;
     void flatten(SkWriteBuffer&) const;
 
-    void dumpSize() const;
-
     bool containsBitmaps() const;
 
+    bool hasText() const { return fContentInfo.hasText(); }
+
+    int opCount() const { return fContentInfo.numOperations(); }
+
     const SkData* opData() const { return fOpData; }
 
 protected:
     explicit SkPictureData(const SkPictInfo& info);
 
-    bool parseStream(SkStream*, SkPicture::InstallPixelRefProc);
+    // Does not affect ownership of SkStream.
+    bool parseStream(SkStream*, SkPicture::InstallPixelRefProc, SkTypefacePlayback*);
     bool parseBuffer(SkReadBuffer& buffer);
 
 public:
     const SkBitmap& getBitmap(SkReader32* reader) const {
         const int index = reader->readInt();
-        if (SkBitmapHeap::INVALID_SLOT == index) {
-#ifdef SK_DEBUG
-            SkDebugf("An invalid bitmap was recorded!\n");
-#endif
-            return fBadBitmap;
-        }
-        return (*fBitmaps)[index];
+        return fBitmaps[index];
+    }
+
+    const SkImage* getImage(SkReader32* reader) const {
+        const int index = reader->readInt();
+        return fImageRefs[index];
     }
 
     const SkPath& getPath(SkReader32* reader) const {
         int index = reader->readInt() - 1;
-        return (*fPathHeap.get())[index];
+        return fPaths[index];
     }
 
     const SkPicture* getPicture(SkReader32* reader) const {
@@ -183,49 +111,17 @@ public:
     const SkPaint* getPaint(SkReader32* reader) const {
         int index = reader->readInt();
         if (index == 0) {
-            return NULL;
+            return nullptr;
         }
-        return &(*fPaints)[index - 1];
+        return &fPaints[index - 1];
     }
 
-    void initIterator(SkPictureStateTree::Iterator* iter, 
-                      const SkTDArray<void*>& draws,
-                      SkCanvas* canvas) const {
-        if (NULL != fStateTree) {
-            fStateTree->initIterator(iter, draws, canvas);
-        }
+    const SkTextBlob* getTextBlob(SkReader32* reader) const {
+        int index = reader->readInt();
+        SkASSERT(index > 0 && index <= fTextBlobCount);
+        return fTextBlobRefs[index - 1];
     }
 
-#ifdef SK_DEBUG_SIZE
-    int size(size_t* sizePtr);
-    int bitmaps(size_t* size);
-    int paints(size_t* size);
-    int paths(size_t* size);
-#endif
-
-#ifdef SK_DEBUG_DUMP
-private:
-    void dumpBitmap(const SkBitmap& bitmap) const;
-    void dumpMatrix(const SkMatrix& matrix) const;
-    void dumpPaint(const SkPaint& paint) const;
-    void dumpPath(const SkPath& path) const;
-    void dumpPicture(const SkPicture& picture) const;
-    void dumpRegion(const SkRegion& region) const;
-    int dumpDrawType(char* bufferPtr, char* buffer, DrawType drawType);
-    int dumpInt(char* bufferPtr, char* buffer, char* name);
-    int dumpRect(char* bufferPtr, char* buffer, char* name);
-    int dumpPoint(char* bufferPtr, char* buffer, char* name);
-    void dumpPointArray(char** bufferPtrPtr, char* buffer, int count);
-    int dumpPtr(char* bufferPtr, char* buffer, char* name, void* ptr);
-    int dumpRectPtr(char* bufferPtr, char* buffer, char* name);
-    int dumpScalar(char* bufferPtr, char* buffer, char* name);
-    void dumpText(char** bufferPtrPtr, char* buffer);
-    void dumpStream();
-
-public:
-    void dump() const;
-#endif
-
 #if SK_SUPPORT_GPU
     /**
      * sampleCount is the number of samples-per-pixel or zero if non-MSAA.
@@ -240,15 +136,17 @@ public:
      */
     bool suitableForGpuRasterization(GrContext* context, const char **reason,
                                      GrPixelConfig config, SkScalar dpi) const;
+
+    bool suitableForLayerOptimization() const;
 #endif
 
 private:
-    friend class SkPicture; // needed in SkPicture::clone (rm when it is removed)
-
     void init();
 
     // these help us with reading/writing
-    bool parseStreamTag(SkStream*, uint32_t tag, uint32_t size, SkPicture::InstallPixelRefProc);
+    // Does not affect ownership of SkStream.
+    bool parseStreamTag(SkStream*, uint32_t tag, uint32_t size,
+                        SkPicture::InstallPixelRefProc, SkTypefacePlayback*);
     bool parseBufferTag(SkReadBuffer&, uint32_t tag, uint32_t size);
     void flattenToBuffer(SkWriteBuffer&) const;
 
@@ -256,20 +154,18 @@ private:
     // bitmap allows playback to draw nothing and move on.
     SkBitmap fBadBitmap;
 
-    SkAutoTUnref<SkBitmapHeap> fBitmapHeap;
-
-    SkTRefArray<SkBitmap>* fBitmaps;
-    SkTRefArray<SkPaint>* fPaints;
+    SkTArray<SkBitmap> fBitmaps;
+    SkTArray<SkPaint>  fPaints;
+    SkTArray<SkPath>   fPaths;
 
     SkData* fOpData;    // opcodes and parameters
 
-    SkAutoTUnref<const SkPathHeap> fPathHeap;  // reference counted
-
     const SkPicture** fPictureRefs;
     int fPictureCount;
-
-    SkBBoxHierarchy* fBoundingHierarchy;
-    SkPictureStateTree* fStateTree;
+    const SkTextBlob** fTextBlobRefs;
+    int fTextBlobCount;
+    const SkImage** fImageRefs;
+    int fImageCount;
 
     SkPictureContentInfo fContentInfo;
 
diff --git a/gfx/skia/skia/src/core/SkPictureFlat.cpp b/gfx/skia/skia/src/core/SkPictureFlat.cpp
index 7b2e67f5efdc..02d85928302d 100644
--- a/gfx/skia/skia/src/core/SkPictureFlat.cpp
+++ b/gfx/skia/skia/src/core/SkPictureFlat.cpp
@@ -18,10 +18,10 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkTypefacePlayback::SkTypefacePlayback() : fCount(0), fArray(NULL) {}
+SkTypefacePlayback::SkTypefacePlayback() : fCount(0), fArray(nullptr) {}
 
 SkTypefacePlayback::~SkTypefacePlayback() {
-    this->reset(NULL);
+    this->reset(nullptr);
 }
 
 void SkTypefacePlayback::reset(const SkRefCntSet* rec) {
@@ -29,26 +29,26 @@ void SkTypefacePlayback::reset(const SkRefCntSet* rec) {
         SkASSERT(fArray[i]);
         fArray[i]->unref();
     }
-    SkDELETE_ARRAY(fArray);
+    delete[] fArray;
 
-    if (rec!= NULL && rec->count() > 0) {
+    if (rec!= nullptr && rec->count() > 0) {
         fCount = rec->count();
-        fArray = SkNEW_ARRAY(SkRefCnt*, fCount);
+        fArray = new SkRefCnt* [fCount];
         rec->copyToArray(fArray);
         for (int i = 0; i < fCount; i++) {
             fArray[i]->ref();
         }
     } else {
         fCount = 0;
-        fArray = NULL;
+        fArray = nullptr;
     }
 }
 
 void SkTypefacePlayback::setCount(int count) {
-    this->reset(NULL);
+    this->reset(nullptr);
 
     fCount = count;
-    fArray = SkNEW_ARRAY(SkRefCnt*, count);
+    fArray = new SkRefCnt* [count];
     sk_bzero(fArray, count * sizeof(SkRefCnt*));
 }
 
@@ -61,10 +61,10 @@ SkRefCnt* SkTypefacePlayback::set(int index, SkRefCnt* obj) {
 ///////////////////////////////////////////////////////////////////////////////
 
 SkFlatController::SkFlatController(uint32_t writeBufferFlags)
-: fBitmapHeap(NULL)
-, fTypefaceSet(NULL)
-, fTypefacePlayback(NULL)
-, fFactorySet(NULL)
+: fBitmapHeap(nullptr)
+, fTypefaceSet(nullptr)
+, fTypefacePlayback(nullptr)
+, fFactorySet(nullptr)
 , fWriteBufferFlags(writeBufferFlags) {}
 
 SkFlatController::~SkFlatController() {
diff --git a/gfx/skia/skia/src/core/SkPictureFlat.h b/gfx/skia/skia/src/core/SkPictureFlat.h
index 5d1a6b52d6e3..8befca0538da 100644
--- a/gfx/skia/skia/src/core/SkPictureFlat.h
+++ b/gfx/skia/skia/src/core/SkPictureFlat.h
@@ -8,7 +8,6 @@
 #ifndef SkPictureFlat_DEFINED
 #define SkPictureFlat_DEFINED
 
-//#define SK_DEBUG_SIZE
 
 #include "SkBitmapHeap.h"
 #include "SkChecksum.h"
@@ -19,7 +18,6 @@
 #include "SkPicture.h"
 #include "SkPtrRecorder.h"
 #include "SkTDynamicHash.h"
-#include "SkTRefArray.h"
 
 enum DrawType {
     UNUSED,
@@ -29,9 +27,9 @@ enum DrawType {
     CLIP_RRECT,
     CONCAT,
     DRAW_BITMAP,
-    DRAW_BITMAP_MATRIX,
+    DRAW_BITMAP_MATRIX, // deprecated, M41 was last Chromium version to write this to an .skp
     DRAW_BITMAP_NINE,
-    DRAW_BITMAP_RECT_TO_RECT,
+    DRAW_BITMAP_RECT,
     DRAW_CLEAR,
     DRAW_DATA,
     DRAW_OVAL,
@@ -59,16 +57,25 @@ enum DrawType {
     SKEW,
     TRANSLATE,
     NOOP,
-    BEGIN_COMMENT_GROUP,
-    COMMENT,
-    END_COMMENT_GROUP,
+    BEGIN_COMMENT_GROUP, // deprecated (M44)
+    COMMENT,             // deprecated (M44)
+    END_COMMENT_GROUP,   // deprecated (M44)
 
     // new ops -- feel free to re-alphabetize on next version bump
     DRAW_DRRECT,
-    PUSH_CULL,
-    POP_CULL,
+    PUSH_CULL,  // deprecated, M41 was last Chromium version to write this to an .skp
+    POP_CULL,   // deprecated, M41 was last Chromium version to write this to an .skp
 
-    LAST_DRAWTYPE_ENUM = POP_CULL
+    DRAW_PATCH, // could not add in aphabetical order
+    DRAW_PICTURE_MATRIX_PAINT,
+    DRAW_TEXT_BLOB,
+    DRAW_IMAGE,
+    DRAW_IMAGE_RECT_STRICT, // deprecated (M45)
+    DRAW_ATLAS,
+    DRAW_IMAGE_NINE,
+    DRAW_IMAGE_RECT,
+
+    LAST_DRAWTYPE_ENUM = DRAW_IMAGE_RECT
 };
 
 // In the 'match' method, this constant will match any flavor of DRAW_BITMAP*
@@ -81,6 +88,11 @@ enum DrawVertexFlags {
     DRAW_VERTICES_HAS_XFER    = 0x08,
 };
 
+enum DrawAtlasFlags {
+    DRAW_ATLAS_HAS_COLORS   = 1 << 0,
+    DRAW_ATLAS_HAS_CULL     = 1 << 1,
+};
+
 ///////////////////////////////////////////////////////////////////////////////
 // clipparams are packed in 5 bits
 //  doAA:1 | regionOp:4
@@ -123,13 +135,9 @@ protected:
 
 class SkFactoryPlayback {
 public:
-    SkFactoryPlayback(int count) : fCount(count) {
-        fArray = SkNEW_ARRAY(SkFlattenable::Factory, count);
-    }
+    SkFactoryPlayback(int count) : fCount(count) { fArray = new SkFlattenable::Factory[count]; }
 
-    ~SkFactoryPlayback() {
-        SkDELETE_ARRAY(fArray);
-    }
+    ~SkFactoryPlayback() { delete[] fArray; }
 
     SkFlattenable::Factory* base() const { return fArray; }
 
@@ -171,7 +179,7 @@ class SkFlatData;
 
 class SkFlatController : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkFlatController)
+
 
     SkFlatController(uint32_t writeBufferFlags = 0);
     virtual ~SkFlatController();
@@ -288,8 +296,8 @@ public:
     // Unflatten this into result, using bitmapHeap and facePlayback for bitmaps and fonts if given
     template <typename Traits, typename T>
     void unflatten(T* result,
-                   SkBitmapHeap* bitmapHeap = NULL,
-                   SkTypefacePlayback* facePlayback = NULL) const {
+                   SkBitmapHeap* bitmapHeap = nullptr,
+                   SkTypefacePlayback* facePlayback = nullptr) const {
         SkReadBuffer buffer(this->data(), fFlatSize);
 
         if (bitmapHeap) {
@@ -349,7 +357,7 @@ private:
         fIndex     = index;
         fFlatSize  = size;
         fTopBot[0] = SK_ScalarNaN;  // Mark as unwritten.
-        fChecksum  = SkChecksum::Compute((uint32_t*)this->data(), size);
+        fChecksum  = SkChecksum::Murmur3(this->data(), size);
     }
 
     int fIndex;
@@ -403,28 +411,28 @@ public:
      * Similar to find. Allows the caller to specify an SkFlatData to replace in
      * the case of an add. Also tells the caller whether a new SkFlatData was
      * added and whether the old one was replaced. The parameters added and
-     * replaced are required to be non-NULL. Rather than returning the index of
+     * replaced are required to be non-nullptr. Rather than returning the index of
      * the entry in the dictionary, it returns the actual SkFlatData.
      */
     const SkFlatData* findAndReplace(const T& element,
                                      const SkFlatData* toReplace,
                                      bool* added,
                                      bool* replaced) {
-        SkASSERT(added != NULL && replaced != NULL);
+        SkASSERT(added != nullptr && replaced != nullptr);
 
         const int oldCount = this->count();
         SkFlatData* flat = this->findAndReturnMutableFlat(element);
         *added = this->count() > oldCount;
 
         // If we don't want to replace anything, we're done.
-        if (!*added || toReplace == NULL) {
+        if (!*added || toReplace == nullptr) {
             *replaced = false;
             return flat;
         }
 
         // If we don't have the thing to replace, we're done.
         const SkFlatData* found = fHash.find(*toReplace);
-        if (found == NULL) {
+        if (found == nullptr) {
             *replaced = false;
             return flat;
         }
@@ -445,22 +453,6 @@ public:
         return flat;
     }
 
-    /**
-     *  Unflatten the objects and return them in SkTRefArray, or return NULL
-     *  if there no objects.  Caller takes ownership of result.
-     */
-    SkTRefArray<T>* unflattenToArray() const {
-        const int count = this->count();
-        if (count == 0) {
-            return NULL;
-        }
-        SkTRefArray<T>* array = SkTRefArray<T>::Create(count);
-        for (int i = 0; i < count; i++) {
-            this->unflatten(&array->writableAt(i), fIndexedData[i]);
-        }
-        return array;
-    }
-
     /**
      * Unflatten the specific object at the given index.
      * Caller takes ownership of the result.
@@ -477,7 +469,7 @@ public:
 
     /**
      * Find or insert a flattened version of element into the dictionary.
-     * Caller does not take ownership of the result.  This will not return NULL.
+     * Caller does not take ownership of the result.  This will not return nullptr.
      */
     const SkFlatData* findAndReturnFlat(const T& element) {
         return this->findAndReturnMutableFlat(element);
@@ -492,7 +484,7 @@ private:
         }
 
         // Without a bitmap heap, we'll flatten bitmaps into paints.  That's never what you want.
-        SkASSERT(fController->getBitmapHeap() != NULL);
+        SkASSERT(fController->getBitmapHeap() != nullptr);
         fScratch.setBitmapHeap(fController->getBitmapHeap());
         fScratch.setTypefaceRecorder(fController->getTypefaceSet());
         fScratch.setNamedFactoryRecorder(fController->getNamedFactorySet());
@@ -505,7 +497,7 @@ private:
         const SkFlatData& scratch = this->resetScratch(element, this->count()+1);
 
         SkFlatData* candidate = fHash.find(scratch);
-        if (candidate != NULL) {
+        if (candidate != nullptr) {
             return candidate;
         }
 
@@ -528,7 +520,7 @@ private:
 
         // Reinterpret data in fScratch as an SkFlatData.
         SkFlatData* scratch = (SkFlatData*)fScratch.getWriter32()->contiguousArray();
-        SkASSERT(scratch != NULL);
+        SkASSERT(scratch != nullptr);
         scratch->stampHeader(index, SkToS32(dataSize));
         return *scratch;
     }
@@ -542,7 +534,7 @@ private:
 
         // Copy scratch into the new SkFlatData.
         SkFlatData* scratch = (SkFlatData*)fScratch.getWriter32()->contiguousArray();
-        SkASSERT(scratch != NULL);
+        SkASSERT(scratch != nullptr);
         memcpy(detached, scratch, fScratch.bytesWritten());
 
         // We can now reuse fScratch, and detached will live until fController dies.
@@ -567,42 +559,4 @@ private:
     SkTDynamicHash<SkFlatData, SkFlatData, SkFlatData::HashTraits> fHash;
 };
 
-typedef SkFlatDictionary<SkPaint, SkPaint::FlatteningTraits> SkPaintDictionary;
-
-class SkChunkFlatController : public SkFlatController {
-public:
-    SkChunkFlatController(size_t minSize)
-    : fHeap(minSize)
-    , fTypefaceSet(SkNEW(SkRefCntSet))
-    , fLastAllocated(NULL) {
-        this->setTypefaceSet(fTypefaceSet);
-        this->setTypefacePlayback(&fTypefacePlayback);
-    }
-
-    virtual void* allocThrow(size_t bytes) SK_OVERRIDE {
-        fLastAllocated = fHeap.allocThrow(bytes);
-        return fLastAllocated;
-    }
-
-    virtual void unalloc(void* ptr) SK_OVERRIDE {
-        // fHeap can only free a pointer if it was the last one allocated.  Otherwise, we'll just
-        // have to wait until fHeap is destroyed.
-        if (ptr == fLastAllocated) (void)fHeap.unalloc(ptr);
-    }
-
-    void setupPlaybacks() const {
-        fTypefacePlayback.reset(fTypefaceSet.get());
-    }
-
-    void setBitmapStorage(SkBitmapHeap* heap) {
-        this->setBitmapHeap(heap);
-    }
-
-private:
-    SkChunkAlloc               fHeap;
-    SkAutoTUnref<SkRefCntSet>  fTypefaceSet;
-    void*                      fLastAllocated;
-    mutable SkTypefacePlayback fTypefacePlayback;
-};
-
 #endif
diff --git a/gfx/skia/skia/src/core/SkPictureImageGenerator.cpp b/gfx/skia/skia/src/core/SkPictureImageGenerator.cpp
new file mode 100644
index 000000000000..39caa55d0cff
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkPictureImageGenerator.cpp
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkImageGenerator.h"
+#include "SkCanvas.h"
+#include "SkMatrix.h"
+#include "SkPaint.h"
+#include "SkPicture.h"
+#include "SkSurface.h"
+#include "SkTLazy.h"
+
+class SkPictureImageGenerator : SkImageGenerator {
+public:
+    static SkImageGenerator* Create(const SkISize&, const SkPicture*, const SkMatrix*,
+                                    const SkPaint*);
+
+protected:
+    bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, SkPMColor ctable[],
+                     int* ctableCount) override;
+    bool onComputeScaledDimensions(SkScalar scale, SupportedSizes*) override;
+    bool onGenerateScaledPixels(const SkISize&, const SkIPoint&, const SkPixmap&) override;
+
+#if SK_SUPPORT_GPU
+    GrTexture* onGenerateTexture(GrContext*, const SkIRect*) override;
+#endif
+
+private:
+    SkPictureImageGenerator(const SkISize&, const SkPicture*, const SkMatrix*, const SkPaint*);
+
+    SkAutoTUnref<const SkPicture> fPicture;
+    SkMatrix                      fMatrix;
+    SkTLazy<SkPaint>              fPaint;
+
+    typedef SkImageGenerator INHERITED;
+};
+
+SkImageGenerator* SkPictureImageGenerator::Create(const SkISize& size, const SkPicture* picture,
+                                const SkMatrix* matrix, const SkPaint* paint) {
+    if (!picture || size.isEmpty()) {
+        return nullptr;
+    }
+
+    return new SkPictureImageGenerator(size, picture, matrix, paint);
+}
+
+SkPictureImageGenerator::SkPictureImageGenerator(const SkISize& size, const SkPicture* picture,
+                                                 const SkMatrix* matrix, const SkPaint* paint)
+    : INHERITED(SkImageInfo::MakeN32Premul(size))
+    , fPicture(SkRef(picture)) {
+
+    if (matrix) {
+        fMatrix = *matrix;
+    } else {
+        fMatrix.reset();
+    }
+
+    if (paint) {
+        fPaint.set(*paint);
+    }
+}
+
+bool SkPictureImageGenerator::onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
+                                          SkPMColor ctable[], int* ctableCount) {
+    if (info != getInfo() || ctable || ctableCount) {
+        return false;
+    }
+
+    SkBitmap bitmap;
+    if (!bitmap.installPixels(info, pixels, rowBytes)) {
+        return false;
+    }
+
+    bitmap.eraseColor(SK_ColorTRANSPARENT);
+    SkCanvas canvas(bitmap, SkSurfaceProps(0, kUnknown_SkPixelGeometry));
+    canvas.drawPicture(fPicture, &fMatrix, fPaint.getMaybeNull());
+
+    return true;
+}
+
+bool SkPictureImageGenerator::onComputeScaledDimensions(SkScalar scale,
+                                                        SupportedSizes* sizes) {
+    SkASSERT(scale > 0 && scale <= 1);
+    const int w = this->getInfo().width();
+    const int h = this->getInfo().height();
+    const int sw = SkScalarRoundToInt(scale * w);
+    const int sh = SkScalarRoundToInt(scale * h);
+    if (sw > 0 && sh > 0) {
+        sizes->fSizes[0].set(sw, sh);
+        sizes->fSizes[1].set(sw, sh);
+        return true;
+    }
+    return false;
+}
+
+bool SkPictureImageGenerator::onGenerateScaledPixels(const SkISize& scaledSize,
+                                                     const SkIPoint& scaledOrigin,
+                                                     const SkPixmap& scaledPixels) {
+    int w = scaledSize.width();
+    int h = scaledSize.height();
+
+    const SkScalar scaleX = SkIntToScalar(w) / this->getInfo().width();
+    const SkScalar scaleY = SkIntToScalar(h) / this->getInfo().height();
+    SkMatrix matrix = SkMatrix::MakeScale(scaleX, scaleY);
+    matrix.postTranslate(-SkIntToScalar(scaledOrigin.x()), -SkIntToScalar(scaledOrigin.y()));
+
+    SkBitmap bitmap;
+    if (!bitmap.installPixels(scaledPixels.info(), scaledPixels.writable_addr(),
+                              scaledPixels.rowBytes())) {
+        return false;
+    }
+
+    bitmap.eraseColor(SK_ColorTRANSPARENT);
+    SkCanvas canvas(bitmap, SkSurfaceProps(0, kUnknown_SkPixelGeometry));
+    matrix.preConcat(fMatrix);
+    canvas.drawPicture(fPicture, &matrix, fPaint.getMaybeNull());
+    return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+SkImageGenerator* SkImageGenerator::NewFromPicture(const SkISize& size, const SkPicture* picture,
+                                                   const SkMatrix* matrix, const SkPaint* paint) {
+    return SkPictureImageGenerator::Create(size, picture, matrix, paint);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#if SK_SUPPORT_GPU
+#include "GrTexture.h"
+
+GrTexture* SkPictureImageGenerator::onGenerateTexture(GrContext* ctx, const SkIRect* subset) {
+    const SkImageInfo& info = this->getInfo();
+    SkImageInfo surfaceInfo = subset ? info.makeWH(subset->width(), subset->height()) : info;
+
+    //
+    // TODO: respect the usage, by possibly creating a different (pow2) surface
+    //
+    SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(ctx,
+                                                               SkSurface::kYes_Budgeted,
+                                                               surfaceInfo));
+    if (!surface.get()) {
+        return nullptr;
+    }
+
+    SkMatrix matrix = fMatrix;
+    if (subset) {
+        matrix.postTranslate(-subset->x(), -subset->y());
+    }
+    surface->getCanvas()->clear(0); // does NewRenderTarget promise to do this for us?
+    surface->getCanvas()->drawPicture(fPicture, &matrix, fPaint.getMaybeNull());
+    SkAutoTUnref<SkImage> image(surface->newImageSnapshot());
+    if (!image.get()) {
+        return nullptr;
+    }
+    return SkSafeRef(image->getTexture());
+}
+#endif
diff --git a/gfx/skia/skia/src/core/SkPicturePlayback.cpp b/gfx/skia/skia/src/core/SkPicturePlayback.cpp
index d16a6353e9d5..b994071cbb4b 100644
--- a/gfx/skia/skia/src/core/SkPicturePlayback.cpp
+++ b/gfx/skia/skia/src/core/SkPicturePlayback.cpp
@@ -6,11 +6,13 @@
  */
 
 #include "SkCanvas.h"
+#include "SkPatchUtils.h"
 #include "SkPictureData.h"
 #include "SkPicturePlayback.h"
 #include "SkPictureRecord.h"
-#include "SkPictureStateTree.h"
 #include "SkReader32.h"
+#include "SkRSXform.h"
+#include "SkTextBlob.h"
 #include "SkTDArray.h"
 #include "SkTypes.h"
 
@@ -42,7 +44,7 @@ static const SkRect* get_rect_ptr(SkReader32* reader) {
     if (reader->readBool()) {
         return &reader->skipT<SkRect>();
     } else {
-        return NULL;
+        return nullptr;
     }
 }
 
@@ -64,118 +66,40 @@ static SkBitmap shallow_copy(const SkBitmap& bitmap) {
     return bitmap;
 }
 
-const SkPicture::OperationList* SkPicturePlayback::getActiveOps(const SkCanvas* canvas) {
-
-    if (fUseBBH) {
-        SkRect clipBounds;
-        if (canvas->getClipBounds(&clipBounds)) {
-            SkIRect query;
-            clipBounds.roundOut(&query);
-
-            return fPictureData->getActiveOps(query);
-        }
-    } 
-
-    return NULL;
-}
-
-// Initialize the state tree iterator. Return false if there is nothing left to draw.
-bool SkPicturePlayback::initIterator(SkPictureStateTree::Iterator* iter, 
-                                     SkCanvas* canvas,
-                                     const SkPicture::OperationList *activeOpsList) {
-
-    if (NULL != activeOpsList) {
-        if (0 == activeOpsList->numOps()) {
-            return false;  // nothing to draw
-        }
-
-        fPictureData->initIterator(iter, activeOpsList->fOps, canvas);
-    }
-
-    return true;
-}
-
-// If 'iter' is valid use it to skip forward through the picture.
-void SkPicturePlayback::StepIterator(SkPictureStateTree::Iterator* iter, SkReader32* reader) {
-    if (iter->isValid()) {
-        uint32_t skipTo = iter->nextDraw();
-        if (SkPictureStateTree::Iterator::kDrawComplete == skipTo) {
-            reader->setOffset(reader->size());  // skip to end
-        } else {
-            reader->setOffset(skipTo);
-        }
-    }
-}
-
-// Update the iterator and state tree to catch up with the skipped ops.
-void SkPicturePlayback::SkipIterTo(SkPictureStateTree::Iterator* iter,
-                                   SkReader32* reader,
-                                   uint32_t skipTo) {
-    SkASSERT(skipTo <= reader->size());
-    SkASSERT(reader->offset() <= skipTo); // should only be skipping forward
-
-    if (iter->isValid()) {
-        // If using a bounding box hierarchy, advance the state tree
-        // iterator until at or after skipTo
-        uint32_t adjustedSkipTo;
-        do {
-            adjustedSkipTo = iter->nextDraw();
-        } while (adjustedSkipTo < skipTo);
-        skipTo = adjustedSkipTo;
-    }
-    if (SkPictureStateTree::Iterator::kDrawComplete == skipTo) {
-        reader->setOffset(reader->size());  // skip to end
-    } else {
-        reader->setOffset(skipTo);
-    }
-}
-
-void SkPicturePlayback::draw(SkCanvas* canvas, SkDrawPictureCallback* callback) {
+void SkPicturePlayback::draw(SkCanvas* canvas, SkPicture::AbortCallback* callback) {
     AutoResetOpID aroi(this);
     SkASSERT(0 == fCurOffset);
 
-    SkAutoTDelete<const SkPicture::OperationList> activeOpsList(this->getActiveOps(canvas));
-    SkPictureStateTree::Iterator it;
-
-    if (!this->initIterator(&it, canvas, activeOpsList.get())) {
-        return;  // nothing to draw
-    }
-
     SkReader32 reader(fPictureData->opData()->bytes(), fPictureData->opData()->size());
 
-    StepIterator(&it, &reader);
-
     // Record this, so we can concat w/ it if we encounter a setMatrix()
     SkMatrix initialMatrix = canvas->getTotalMatrix();
 
     SkAutoCanvasRestore acr(canvas, false);
 
     while (!reader.eof()) {
-        if (NULL != callback && callback->abortDrawing()) {
+        if (callback && callback->abort()) {
             return;
         }
 
         fCurOffset = reader.offset();
         uint32_t size;
         DrawType op = ReadOpAndSize(&reader, &size);
-        if (NOOP == op) {
-            // NOOPs are to be ignored - do not propagate them any further
-            SkipIterTo(&it, &reader, fCurOffset + size);
-            continue;
-        }
 
         this->handleOp(&reader, op, size, canvas, initialMatrix);
-
-        StepIterator(&it, &reader);
     }
 }
 
-void SkPicturePlayback::handleOp(SkReader32* reader, 
-                                 DrawType op, 
-                                 uint32_t size, 
+void SkPicturePlayback::handleOp(SkReader32* reader,
+                                 DrawType op,
+                                 uint32_t size,
                                  SkCanvas* canvas,
                                  const SkMatrix& initialMatrix) {
     switch (op) {
+        case NOOP: {
+            SkASSERT(size >= 4);
+            reader->skip(size - 4);
+        } break;
         case CLIP_PATH: {
             const SkPath& path = fPictureData->getPath(reader);
             uint32_t packed = reader->readInt();
@@ -225,45 +149,56 @@ void SkPicturePlayback::handleOp(SkReader32* reader,
                 reader->setOffset(offsetToRestore);
             }
         } break;
-        case PUSH_CULL: {
-            const SkRect& cullRect = reader->skipT<SkRect>();
-            size_t offsetToRestore = reader->readInt();
-            if (offsetToRestore && canvas->quickReject(cullRect)) {
-                reader->setOffset(offsetToRestore);
-            } else {
-                canvas->pushCull(cullRect);
-            }
-        } break;
-        case POP_CULL:
-            canvas->popCull();
-            break;
+        case PUSH_CULL: break;  // Deprecated, safe to ignore both push and pop.
+        case POP_CULL:  break;
         case CONCAT: {
             SkMatrix matrix;
             reader->readMatrix(&matrix);
             canvas->concat(matrix);
             break;
         }
+        case DRAW_ATLAS: {
+            const SkPaint* paint = fPictureData->getPaint(reader);
+            const SkImage* atlas = fPictureData->getImage(reader);
+            const uint32_t flags = reader->readU32();
+            const int count = reader->readU32();
+            const SkRSXform* xform = (const SkRSXform*)reader->skip(count * sizeof(SkRSXform));
+            const SkRect* tex = (const SkRect*)reader->skip(count * sizeof(SkRect));
+            const SkColor* colors = nullptr;
+            SkXfermode::Mode mode = SkXfermode::kDst_Mode;
+            if (flags & DRAW_ATLAS_HAS_COLORS) {
+                colors = (const SkColor*)reader->skip(count * sizeof(SkColor));
+                mode = (SkXfermode::Mode)reader->readU32();
+            }
+            const SkRect* cull = nullptr;
+            if (flags & DRAW_ATLAS_HAS_CULL) {
+                cull = (const SkRect*)reader->skip(sizeof(SkRect));
+            }
+            canvas->drawAtlas(atlas, xform, tex, colors, count, mode, cull, paint);
+        } break;
         case DRAW_BITMAP: {
             const SkPaint* paint = fPictureData->getPaint(reader);
             const SkBitmap bitmap = shallow_copy(fPictureData->getBitmap(reader));
             const SkPoint& loc = reader->skipT<SkPoint>();
             canvas->drawBitmap(bitmap, loc.fX, loc.fY, paint);
         } break;
-        case DRAW_BITMAP_RECT_TO_RECT: {
+        case DRAW_BITMAP_RECT: {
             const SkPaint* paint = fPictureData->getPaint(reader);
             const SkBitmap bitmap = shallow_copy(fPictureData->getBitmap(reader));
             const SkRect* src = get_rect_ptr(reader);   // may be null
             const SkRect& dst = reader->skipT<SkRect>();     // required
-            SkCanvas::DrawBitmapRectFlags flags;
-            flags = (SkCanvas::DrawBitmapRectFlags) reader->readInt();
-            canvas->drawBitmapRectToRect(bitmap, src, dst, paint, flags);
+            SkCanvas::SrcRectConstraint constraint = (SkCanvas::SrcRectConstraint)reader->readInt();
+            canvas->legacy_drawBitmapRect(bitmap, src, dst, paint, constraint);
         } break;
         case DRAW_BITMAP_MATRIX: {
             const SkPaint* paint = fPictureData->getPaint(reader);
             const SkBitmap bitmap = shallow_copy(fPictureData->getBitmap(reader));
             SkMatrix matrix;
             reader->readMatrix(&matrix);
-            canvas->drawBitmapMatrix(bitmap, matrix, paint);
+
+            SkAutoCanvasRestore acr(canvas, true);
+            canvas->concat(matrix);
+            canvas->drawBitmap(bitmap, 0, 0, paint);
         } break;
         case DRAW_BITMAP_NINE: {
             const SkPaint* paint = fPictureData->getPaint(reader);
@@ -276,8 +211,9 @@ void SkPicturePlayback::handleOp(SkReader32* reader,
             canvas->clear(reader->readInt());
             break;
         case DRAW_DATA: {
+            // This opcode is now dead, just need to skip it for backwards compatibility
             size_t length = reader->readInt();
-            canvas->drawData(reader->skip(length), length);
+            (void)reader->skip(length);
             // skip handles padding the read out to a multiple of 4
         } break;
         case DRAW_DRRECT: {
@@ -287,17 +223,44 @@ void SkPicturePlayback::handleOp(SkReader32* reader,
             reader->readRRect(&inner);
             canvas->drawDRRect(outer, inner, paint);
         } break;
-        case BEGIN_COMMENT_GROUP: {
-            const char* desc = reader->readString();
-            canvas->beginCommentGroup(desc);
+        case BEGIN_COMMENT_GROUP:
+            reader->readString();
+            // deprecated (M44)
+            break;
+        case COMMENT:
+            reader->readString();
+            reader->readString();
+            // deprecated (M44)
+            break;
+        case END_COMMENT_GROUP:
+            // deprecated (M44)
+            break;
+        case DRAW_IMAGE: {
+            const SkPaint* paint = fPictureData->getPaint(reader);
+            const SkImage* image = fPictureData->getImage(reader);
+            const SkPoint& loc = reader->skipT<SkPoint>();
+            canvas->drawImage(image, loc.fX, loc.fY, paint);
         } break;
-        case COMMENT: {
-            const char* kywd = reader->readString();
-            const char* value = reader->readString();
-            canvas->addComment(kywd, value);
+        case DRAW_IMAGE_NINE: {
+            const SkPaint* paint = fPictureData->getPaint(reader);
+            const SkImage* image = fPictureData->getImage(reader);
+            const SkIRect& center = reader->skipT<SkIRect>();
+            const SkRect& dst = reader->skipT<SkRect>();
+            canvas->drawImageNine(image, center, dst, paint);
         } break;
-        case END_COMMENT_GROUP: {
-            canvas->endCommentGroup();
+        case DRAW_IMAGE_RECT_STRICT:
+        case DRAW_IMAGE_RECT: {
+            const SkPaint* paint = fPictureData->getPaint(reader);
+            const SkImage* image = fPictureData->getImage(reader);
+            const SkRect* src = get_rect_ptr(reader);   // may be null
+            const SkRect& dst = reader->skipT<SkRect>();     // required
+            // DRAW_IMAGE_RECT_STRICT assumes this constraint, and doesn't store it
+            SkCanvas::SrcRectConstraint constraint = SkCanvas::kStrict_SrcRectConstraint;
+            if (DRAW_IMAGE_RECT == op) {
+                // newer op-code stores the constraint explicitly
+                constraint = (SkCanvas::SrcRectConstraint)reader->readInt();
+            }
+            canvas->legacy_drawImageRect(image, src, dst, paint, constraint);
         } break;
         case DRAW_OVAL: {
             const SkPaint& paint = *fPictureData->getPaint(reader);
@@ -306,6 +269,31 @@ void SkPicturePlayback::handleOp(SkReader32* reader,
         case DRAW_PAINT:
             canvas->drawPaint(*fPictureData->getPaint(reader));
             break;
+        case DRAW_PATCH: {
+            const SkPaint& paint = *fPictureData->getPaint(reader);
+
+            const SkPoint* cubics = (const SkPoint*)reader->skip(SkPatchUtils::kNumCtrlPts *
+                                                                 sizeof(SkPoint));
+            uint32_t flag = reader->readInt();
+            const SkColor* colors = nullptr;
+            if (flag & DRAW_VERTICES_HAS_COLORS) {
+                colors = (const SkColor*)reader->skip(SkPatchUtils::kNumCorners * sizeof(SkColor));
+            }
+            const SkPoint* texCoords = nullptr;
+            if (flag & DRAW_VERTICES_HAS_TEXS) {
+                texCoords = (const SkPoint*)reader->skip(SkPatchUtils::kNumCorners *
+                                                         sizeof(SkPoint));
+            }
+            SkAutoTUnref<SkXfermode> xfer;
+            if (flag & DRAW_VERTICES_HAS_XFER) {
+                int mode = reader->readInt();
+                if (mode < 0 || mode > SkXfermode::kLastMode) {
+                    mode = SkXfermode::kModulate_Mode;
+                }
+                xfer.reset(SkXfermode::Create((SkXfermode::Mode)mode));
+            }
+            canvas->drawPatch(cubics, colors, texCoords, xfer, paint);
+        } break;
         case DRAW_PATH: {
             const SkPaint& paint = *fPictureData->getPaint(reader);
             canvas->drawPath(fPictureData->getPath(reader), paint);
@@ -313,6 +301,13 @@ void SkPicturePlayback::handleOp(SkReader32* reader,
         case DRAW_PICTURE:
             canvas->drawPicture(fPictureData->getPicture(reader));
             break;
+        case DRAW_PICTURE_MATRIX_PAINT: {
+            const SkPaint* paint = fPictureData->getPaint(reader);
+            SkMatrix matrix;
+            reader->readMatrix(&matrix);
+            const SkPicture* pic = fPictureData->getPicture(reader);
+            canvas->drawPicture(pic, &matrix, paint);
+        } break;
         case DRAW_POINTS: {
             const SkPaint& paint = *fPictureData->getPaint(reader);
             SkCanvas::PointMode mode = (SkCanvas::PointMode)reader->readInt();
@@ -387,6 +382,13 @@ void SkPicturePlayback::handleOp(SkReader32* reader,
             SkScalar y = reader->readScalar();
             canvas->drawText(text.text(), text.length(), x, y, paint);
         } break;
+        case DRAW_TEXT_BLOB: {
+            const SkPaint& paint = *fPictureData->getPaint(reader);
+            const SkTextBlob* blob = fPictureData->getTextBlob(reader);
+            SkScalar x = reader->readScalar();
+            SkScalar y = reader->readScalar();
+            canvas->drawTextBlob(blob, x, y, paint);
+        } break;
         case DRAW_TEXT_TOP_BOTTOM: {
             const SkPaint& paint = *fPictureData->getPaint(reader);
             TextContainer text;
@@ -416,9 +418,9 @@ void SkPicturePlayback::handleOp(SkReader32* reader,
             SkCanvas::VertexMode vmode = (SkCanvas::VertexMode)reader->readInt();
             int vCount = reader->readInt();
             const SkPoint* verts = (const SkPoint*)reader->skip(vCount * sizeof(SkPoint));
-            const SkPoint* texs = NULL;
-            const SkColor* colors = NULL;
-            const uint16_t* indices = NULL;
+            const SkPoint* texs = nullptr;
+            const SkColor* colors = nullptr;
+            const uint16_t* indices = nullptr;
             int iCount = 0;
             if (flags & DRAW_VERTICES_HAS_TEXS) {
                 texs = (const SkPoint*)reader->skip(vCount * sizeof(SkPoint));
@@ -480,7 +482,7 @@ void SkPicturePlayback::handleOp(SkReader32* reader,
             canvas->translate(dx, dy);
         } break;
         default:
-            SkASSERT(0);
+            SkASSERTF(false, "Unknown draw type: %d", op);
     }
 }
 
diff --git a/gfx/skia/skia/src/core/SkPicturePlayback.h b/gfx/skia/skia/src/core/SkPicturePlayback.h
index 6114fee5e780..ca6ad1ade47f 100644
--- a/gfx/skia/skia/src/core/SkPicturePlayback.h
+++ b/gfx/skia/skia/src/core/SkPicturePlayback.h
@@ -9,27 +9,22 @@
 #define SkPicturePlayback_DEFINED
 
 #include "SkPictureFlat.h"  // for DrawType
-#include "SkPictureStateTree.h"
 
 class SkBitmap;
 class SkCanvas;
-class SkDrawPictureCallback;
 class SkPaint;
 class SkPictureData;
 
 // The basic picture playback class replays the provided picture into a canvas.
-// If the picture was generated with a BBH it is used to accelerate drawing
-// unless disabled via setUseBBH.
 class SkPicturePlayback : SkNoncopyable {
 public:
-    SkPicturePlayback(const SkPicture* picture)
-        : fPictureData(picture->fData.get())
-        , fCurOffset(0)
-        , fUseBBH(true) {
+    SkPicturePlayback(const SkPictureData* data)
+        : fPictureData(data)
+        , fCurOffset(0) {
     }
     virtual ~SkPicturePlayback() { }
 
-    virtual void draw(SkCanvas* canvas, SkDrawPictureCallback*);
+    virtual void draw(SkCanvas* canvas, SkPicture::AbortCallback*);
 
     // TODO: remove the curOp calls after cleaning up GrGatherDevice
     // Return the ID of the operation currently being executed when playing
@@ -37,38 +32,25 @@ public:
     size_t curOpID() const { return fCurOffset; }
     void resetOpID() { fCurOffset = 0; }
 
-    // TODO: remove setUseBBH after cleaning up GrGatherCanvas
-    void setUseBBH(bool useBBH) { fUseBBH = useBBH; }
-
 protected:
     const SkPictureData* fPictureData;
 
     // The offset of the current operation when within the draw method
     size_t fCurOffset;
 
-    bool   fUseBBH;
-
-    void handleOp(SkReader32* reader, 
-                  DrawType op, 
-                  uint32_t size, 
+    void handleOp(SkReader32* reader,
+                  DrawType op,
+                  uint32_t size,
                   SkCanvas* canvas,
                   const SkMatrix& initialMatrix);
 
-    const SkPicture::OperationList* getActiveOps(const SkCanvas* canvas);
-    bool initIterator(SkPictureStateTree::Iterator* iter, 
-                      SkCanvas* canvas,
-                      const SkPicture::OperationList *activeOpsList);
-    static void StepIterator(SkPictureStateTree::Iterator* iter, SkReader32* reader);
-    static void SkipIterTo(SkPictureStateTree::Iterator* iter, 
-                           SkReader32* reader, uint32_t skipTo);
-
     static DrawType ReadOpAndSize(SkReader32* reader, uint32_t* size);
 
     class AutoResetOpID {
     public:
         AutoResetOpID(SkPicturePlayback* playback) : fPlayback(playback) { }
         ~AutoResetOpID() {
-            if (NULL != fPlayback) {
+            if (fPlayback) {
                 fPlayback->resetOpID();
             }
         }
diff --git a/gfx/skia/skia/src/core/SkPictureRangePlayback.cpp b/gfx/skia/skia/src/core/SkPictureRangePlayback.cpp
deleted file mode 100644
index b5e36d6f222d..000000000000
--- a/gfx/skia/skia/src/core/SkPictureRangePlayback.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkCanvas.h"
-#include "SkPictureData.h"
-#include "SkPictureRangePlayback.h"
-
-void SkPictureRangePlayback::draw(SkCanvas* canvas, SkDrawPictureCallback* callback) {
-    AutoResetOpID aroi(this);
-    SkASSERT(0 == fCurOffset);
-
-    SkReader32 reader(fPictureData->opData()->bytes(), fPictureData->opData()->size());
-
-    if (0 != fStart || 0 != fStop) {
-        reader.setOffset(fStart);
-        uint32_t size;
-        SkDEBUGCODE(DrawType op = ) ReadOpAndSize(&reader, &size);
-        SkASSERT(SAVE_LAYER == op);
-        reader.setOffset(fStart + size);
-    }
-
-    // Record this, so we can concat w/ it if we encounter a setMatrix()
-    SkMatrix initialMatrix = canvas->getTotalMatrix();
-
-    SkAutoCanvasRestore acr(canvas, false);
-
-    while (!reader.eof()) {
-        if (NULL != callback && callback->abortDrawing()) {
-            return;
-        }
-
-        if (0 != fStart || 0 != fStop) {
-            size_t offset = reader.offset();
-            if (offset >= fStop) {
-                SkDEBUGCODE(uint32_t size;)
-                SkDEBUGCODE(DrawType op = ReadOpAndSize(&reader, &size);)
-                SkASSERT(RESTORE == op);
-                return;
-            }
-        }
-
-        fCurOffset = reader.offset();
-        uint32_t size;
-        DrawType op = ReadOpAndSize(&reader, &size);
-        if (NOOP == op) {
-            // NOOPs are to be ignored - do not propagate them any further
-            reader.setOffset(fCurOffset + size);
-            continue;
-        }
-
-        this->handleOp(&reader, op, size, canvas, initialMatrix);
-    }
-}
diff --git a/gfx/skia/skia/src/core/SkPictureRangePlayback.h b/gfx/skia/skia/src/core/SkPictureRangePlayback.h
deleted file mode 100644
index ee114bde138f..000000000000
--- a/gfx/skia/skia/src/core/SkPictureRangePlayback.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkPictureRangePlayback_DEFINED
-#define SkPictureRangePlayback_DEFINED
-
-#include "SkPicturePlayback.h"
-
-// This version of picture playback plays all the operations between
-// a pair of start and stop values.
-// The opcode at 'start' should be a saveLayer while the opcode at
-// 'stop' should be a restore. Neither of those commands will be issued.
-// Since this class never uses the bounding box hierarchy, the base class'
-// useBBH setting is ignored.
-class SkPictureRangePlayback : public SkPicturePlayback {
-public:
-    // Set both start & stop to 0 to disable draw limiting. Note that disabling
-    // draw limiting isn't the same as using the base SkPicturePlayback object
-    // since this class never uses the bounding box hierarchy information.
-    SkPictureRangePlayback(const SkPicture* picture, size_t start, size_t stop)
-    : INHERITED(picture)
-    , fStart(start)
-    , fStop(stop) {
-    }
-
-    virtual void draw(SkCanvas* canvas, SkDrawPictureCallback*) SK_OVERRIDE;
-
-private:
-    size_t fStart;
-    size_t fStop;
-
-    typedef SkPicturePlayback INHERITED;
-};
-
-
-#endif
diff --git a/gfx/skia/skia/src/core/SkPictureRecord.cpp b/gfx/skia/skia/src/core/SkPictureRecord.cpp
index 566cb196baec..2b56b74dad84 100644
--- a/gfx/skia/skia/src/core/SkPictureRecord.cpp
+++ b/gfx/skia/skia/src/core/SkPictureRecord.cpp
@@ -6,24 +6,17 @@
  */
 
 #include "SkPictureRecord.h"
-#include "SkTSearch.h"
+#include "SkDevice.h"
+#include "SkImage_Base.h"
+#include "SkPatchUtils.h"
 #include "SkPixelRef.h"
 #include "SkRRect.h"
-#include "SkBBoxHierarchy.h"
-#include "SkDevice.h"
-#include "SkPictureStateTree.h"
+#include "SkRSXform.h"
+#include "SkTextBlob.h"
+#include "SkTSearch.h"
 
 #define HEAP_BLOCK_SIZE 4096
 
-// If SK_RECORD_LITERAL_PICTURES is defined, record our inputs as literally as possible.
-// Otherwise, we can be clever and record faster equivalents.  kBeClever is normally true.
-static const bool kBeClever =
-#ifdef SK_RECORD_LITERAL_PICTURES
-    false;
-#else
-    true;
-#endif
-
 enum {
     // just need a value that save or getSaveCount would never return
     kNoInitialSave = -1,
@@ -33,52 +26,32 @@ enum {
 static int const kUInt32Size = 4;
 
 static const uint32_t kSaveSize = kUInt32Size;
+#ifdef SK_DEBUG
 static const uint32_t kSaveLayerNoBoundsSize = 4 * kUInt32Size;
 static const uint32_t kSaveLayerWithBoundsSize = 4 * kUInt32Size + sizeof(SkRect);
+#endif//SK_DEBUG
 
 SkPictureRecord::SkPictureRecord(const SkISize& dimensions, uint32_t flags)
     : INHERITED(dimensions.width(), dimensions.height())
-    , fBoundingHierarchy(NULL)
-    , fStateTree(NULL)
-    , fFlattenableHeap(HEAP_BLOCK_SIZE)
-    , fPaints(&fFlattenableHeap)
     , fRecordFlags(flags)
-    , fOptsEnabled(kBeClever) {
-#ifdef SK_DEBUG_SIZE
-    fPointBytes = fRectBytes = fTextBytes = 0;
-    fPointWrites = fRectWrites = fTextWrites = 0;
-#endif
-
-    fBitmapHeap = SkNEW(SkBitmapHeap);
-    fFlattenableHeap.setBitmapStorage(fBitmapHeap);
-
-#ifndef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fFirstSavedLayerIndex = kNoSavedLayerIndex;
-#endif
-
-    fInitialSaveCount = kNoInitialSave;
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.init(this);
-#endif
+    , fInitialSaveCount(kNoInitialSave) {
 }
 
 SkPictureRecord::~SkPictureRecord() {
-    SkSafeUnref(fBitmapHeap);
-    SkSafeUnref(fBoundingHierarchy);
-    SkSafeUnref(fStateTree);
-    fFlattenableHeap.setBitmapStorage(NULL);
+    fImageRefs.unrefAll();
     fPictureRefs.unrefAll();
+    fTextBlobRefs.unrefAll();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
+#ifdef SK_DEBUG
 // Return the offset of the paint inside a given op's byte stream. A zero
 // return value means there is no paint (and you really shouldn't be calling
 // this method)
-static inline size_t getPaintOffset(DrawType op, size_t opSize) {
+static inline size_t get_paint_offset(DrawType op, size_t opSize) {
     // These offsets are where the paint would be if the op size doesn't overflow
-    static const uint8_t gPaintOffsets[LAST_DRAWTYPE_ENUM + 1] = {
+    static const uint8_t gPaintOffsets[] = {
         0,  // UNUSED - no paint
         0,  // CLIP_PATH - no paint
         0,  // CLIP_REGION - no paint
@@ -86,9 +59,9 @@ static inline size_t getPaintOffset(DrawType op, size_t opSize) {
         0,  // CLIP_RRECT - no paint
         0,  // CONCAT - no paint
         1,  // DRAW_BITMAP - right after op code
-        1,  // DRAW_BITMAP_MATRIX - right after op code
+        1,  // DRAW_BITMAP_MATRIX - right after op code, deprecated
         1,  // DRAW_BITMAP_NINE - right after op code
-        1,  // DRAW_BITMAP_RECT_TO_RECT - right after op code
+        1,  // DRAW_BITMAP_RECT - right after op code
         0,  // DRAW_CLEAR - no paint
         0,  // DRAW_DATA - no paint
         1,  // DRAW_OVAL - right after op code
@@ -122,10 +95,17 @@ static inline size_t getPaintOffset(DrawType op, size_t opSize) {
         1,  // DRAWDRRECT - right after op code
         0,  // PUSH_CULL - no paint
         0,  // POP_CULL - no paint
+        1,  // DRAW_PATCH - right after op code
+        1,  // DRAW_PICTURE_MATRIX_PAINT - right after op code
+        1,  // DRAW_TEXT_BLOB- right after op code
+        1,  // DRAW_IMAGE - right after op code
+        1,  // DRAW_IMAGE_RECT_STRICT - right after op code
+        1,  // DRAW_ATLAS - right after op code
+        1,  // DRAW_IMAGE_NINE - right after op code
+        1,  // DRAW_IMAGE_RECT - right after op code
     };
 
-    SK_COMPILE_ASSERT(sizeof(gPaintOffsets) == LAST_DRAWTYPE_ENUM + 1,
-                      need_to_be_in_sync);
+    static_assert(sizeof(gPaintOffsets) == LAST_DRAWTYPE_ENUM + 1, "need_to_be_in_sync");
     SkASSERT((unsigned)op <= (unsigned)LAST_DRAWTYPE_ENUM);
 
     int overflow = 0;
@@ -150,22 +130,20 @@ static inline size_t getPaintOffset(DrawType op, size_t opSize) {
     SkASSERT(0 != gPaintOffsets[op]);   // really shouldn't be calling this method
     return gPaintOffsets[op] * sizeof(uint32_t) + overflow;
 }
+#endif//SK_DEBUG
 
 void SkPictureRecord::willSave() {
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.save();
-#else
     // record the offset to us, making it non-positive to distinguish a save
     // from a clip entry.
     fRestoreOffsetStack.push(-(int32_t)fWriter.bytesWritten());
     this->recordSave();
-#endif
 
     this->INHERITED::willSave();
 }
 
 void SkPictureRecord::recordSave() {
+    fContentInfo.onSave();
+
     // op only
     size_t size = kSaveSize;
     size_t initialOffset = this->addDraw(SAVE, &size);
@@ -175,18 +153,10 @@ void SkPictureRecord::recordSave() {
 
 SkCanvas::SaveLayerStrategy SkPictureRecord::willSaveLayer(const SkRect* bounds,
                                                            const SkPaint* paint, SaveFlags flags) {
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.saveLayer(bounds, paint, flags);
-#else
     // record the offset to us, making it non-positive to distinguish a save
     // from a clip entry.
     fRestoreOffsetStack.push(-(int32_t)fWriter.bytesWritten());
     this->recordSaveLayer(bounds, paint, flags);
-    if (kNoSavedLayerIndex == fFirstSavedLayerIndex) {
-        fFirstSavedLayerIndex = fRestoreOffsetStack.count();
-    }
-#endif
 
     this->INHERITED::willSaveLayer(bounds, paint, flags);
     /*  No need for a (potentially very big) layer which we don't actually need
@@ -199,9 +169,11 @@ SkCanvas::SaveLayerStrategy SkPictureRecord::willSaveLayer(const SkRect* bounds,
 
 void SkPictureRecord::recordSaveLayer(const SkRect* bounds, const SkPaint* paint,
                                       SaveFlags flags) {
+    fContentInfo.onSaveLayer();
+
     // op + bool for 'bounds'
     size_t size = 2 * kUInt32Size;
-    if (NULL != bounds) {
+    if (bounds) {
         size += sizeof(*bounds); // + rect
     }
     // + paint index + flags
@@ -211,30 +183,14 @@ void SkPictureRecord::recordSaveLayer(const SkRect* bounds, const SkPaint* paint
 
     size_t initialOffset = this->addDraw(SAVE_LAYER, &size);
     this->addRectPtr(bounds);
-    SkASSERT(initialOffset+getPaintOffset(SAVE_LAYER, size) == fWriter.bytesWritten());
+    SkASSERT(initialOffset+get_paint_offset(SAVE_LAYER, size) == fWriter.bytesWritten());
     this->addPaintPtr(paint);
     this->addInt(flags);
 
     this->validate(initialOffset, size);
 }
 
-bool SkPictureRecord::isDrawingToLayer() const {
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    return fMCMgr.isDrawingToLayer();
-#else
-    return fFirstSavedLayerIndex != kNoSavedLayerIndex;
-#endif
-}
-
-/*
- * Read the op code from 'offset' in 'writer'.
- */
 #ifdef SK_DEBUG
-static DrawType peek_op(SkWriter32* writer, size_t offset) {
-    return (DrawType)(writer->readTAt<uint32_t>(offset) >> 24);
-}
-#endif
-
 /*
  * Read the op code from 'offset' in 'writer' and extract the size too.
  */
@@ -249,406 +205,28 @@ static DrawType peek_op_and_size(SkWriter32* writer, size_t offset, uint32_t* si
     }
     return (DrawType) op;
 }
-
-#ifdef TRACK_COLLAPSE_STATS
-    static int gCollapseCount, gCollapseCalls;
-#endif
-
-// Is the supplied paint simply a color?
-static bool is_simple(const SkPaint& p) {
-    intptr_t orAccum = (intptr_t)p.getPathEffect()  |
-                       (intptr_t)p.getShader()      |
-                       (intptr_t)p.getXfermode()    |
-                       (intptr_t)p.getMaskFilter()  |
-                       (intptr_t)p.getColorFilter() |
-                       (intptr_t)p.getRasterizer()  |
-                       (intptr_t)p.getLooper()      |
-                       (intptr_t)p.getImageFilter();
-    return 0 == orAccum;
-}
-
-// CommandInfos are fed to the 'match' method and filled in with command
-// information.
-struct CommandInfo {
-    DrawType fActualOp;
-    uint32_t fOffset;
-    uint32_t fSize;
-};
-
-/*
- * Attempt to match the provided pattern of commands starting at 'offset'
- * in the byte stream and stopping at the end of the stream. Upon success,
- * return true with all the pattern information filled out in the result
- * array (i.e., actual ops, offsets and sizes).
- * Note this method skips any NOOPs seen in the stream
- */
-static bool match(SkWriter32* writer, uint32_t offset,
-                  int* pattern, CommandInfo* result, int numCommands) {
-    SkASSERT(offset < writer->bytesWritten());
-
-    uint32_t curOffset = offset;
-    uint32_t curSize = 0;
-    int numMatched;
-    for (numMatched = 0; numMatched < numCommands && curOffset < writer->bytesWritten(); ++numMatched) {
-        DrawType op = peek_op_and_size(writer, curOffset, &curSize);
-        while (NOOP == op) {
-            curOffset += curSize;
-            if (curOffset >= writer->bytesWritten()) {
-                return false;
-            }
-            op = peek_op_and_size(writer, curOffset, &curSize);
-        }
-
-        if (kDRAW_BITMAP_FLAVOR == pattern[numMatched]) {
-            if (DRAW_BITMAP != op && DRAW_BITMAP_MATRIX != op &&
-                DRAW_BITMAP_NINE != op && DRAW_BITMAP_RECT_TO_RECT != op) {
-                return false;
-            }
-        } else if (op != pattern[numMatched]) {
-            return false;
-        }
-
-        result[numMatched].fActualOp = op;
-        result[numMatched].fOffset = curOffset;
-        result[numMatched].fSize = curSize;
-
-        curOffset += curSize;
-    }
-
-    if (numMatched != numCommands) {
-        return false;
-    }
-
-    curOffset += curSize;
-    if (curOffset < writer->bytesWritten()) {
-        // Something else between the last command and the end of the stream
-        return false;
-    }
-
-    return true;
-}
-
-// temporarily here to make code review easier
-static bool merge_savelayer_paint_into_drawbitmp(SkWriter32* writer,
-                                                 SkPaintDictionary* paintDict,
-                                                 const CommandInfo& saveLayerInfo,
-                                                 const CommandInfo& dbmInfo);
-
-/*
- * Restore has just been called (but not recorded), look back at the
- * matching save* and see if we are in the configuration:
- *   SAVE_LAYER
- *       DRAW_BITMAP|DRAW_BITMAP_MATRIX|DRAW_BITMAP_NINE|DRAW_BITMAP_RECT_TO_RECT
- *   RESTORE
- * where the saveLayer's color can be moved into the drawBitmap*'s paint
- */
-static bool remove_save_layer1(SkWriter32* writer, int32_t offset,
-                               SkPaintDictionary* paintDict) {
-    // back up to the save block
-    // TODO: add a stack to track save*/restore offsets rather than searching backwards
-    while (offset > 0) {
-        offset = writer->readTAt<uint32_t>(offset);
-    }
-
-    int pattern[] = { SAVE_LAYER, kDRAW_BITMAP_FLAVOR, /* RESTORE */ };
-    CommandInfo result[SK_ARRAY_COUNT(pattern)];
-
-    if (!match(writer, -offset, pattern, result, SK_ARRAY_COUNT(pattern))) {
-        return false;
-    }
-
-    if (kSaveLayerWithBoundsSize == result[0].fSize) {
-        // The saveLayer's bound can offset where the dbm is drawn
-        return false;
-    }
-
-    return merge_savelayer_paint_into_drawbitmp(writer, paintDict,
-                                                result[0], result[1]);
-}
-
-/*
- * Convert the command code located at 'offset' to a NOOP. Leave the size
- * field alone so the NOOP can be skipped later.
- */
-static void convert_command_to_noop(SkWriter32* writer, uint32_t offset) {
-    uint32_t command = writer->readTAt<uint32_t>(offset);
-    writer->overwriteTAt(offset, (command & MASK_24) | (NOOP << 24));
-}
-
-/*
- * Attempt to merge the saveLayer's paint into the drawBitmap*'s paint.
- * Return true on success; false otherwise.
- */
-static bool merge_savelayer_paint_into_drawbitmp(SkWriter32* writer,
-                                                 SkPaintDictionary* paintDict,
-                                                 const CommandInfo& saveLayerInfo,
-                                                 const CommandInfo& dbmInfo) {
-    SkASSERT(SAVE_LAYER == saveLayerInfo.fActualOp);
-    SkASSERT(DRAW_BITMAP == dbmInfo.fActualOp ||
-             DRAW_BITMAP_MATRIX == dbmInfo.fActualOp ||
-             DRAW_BITMAP_NINE == dbmInfo.fActualOp ||
-             DRAW_BITMAP_RECT_TO_RECT == dbmInfo.fActualOp);
-
-    size_t dbmPaintOffset = getPaintOffset(dbmInfo.fActualOp, dbmInfo.fSize);
-    size_t slPaintOffset = getPaintOffset(SAVE_LAYER, saveLayerInfo.fSize);
-
-    // we have a match, now we need to get the paints involved
-    uint32_t dbmPaintId = writer->readTAt<uint32_t>(dbmInfo.fOffset + dbmPaintOffset);
-    uint32_t saveLayerPaintId = writer->readTAt<uint32_t>(saveLayerInfo.fOffset + slPaintOffset);
-
-    if (0 == saveLayerPaintId) {
-        // In this case the saveLayer/restore isn't needed at all - just kill the saveLayer
-        // and signal the caller (by returning true) to not add the RESTORE op
-        convert_command_to_noop(writer, saveLayerInfo.fOffset);
-        return true;
-    }
-
-    if (0 == dbmPaintId) {
-        // In this case just make the DBM* use the saveLayer's paint, kill the saveLayer
-        // and signal the caller (by returning true) to not add the RESTORE op
-        convert_command_to_noop(writer, saveLayerInfo.fOffset);
-        writer->overwriteTAt(dbmInfo.fOffset + dbmPaintOffset, saveLayerPaintId);
-        return true;
-    }
-
-    SkAutoTDelete<SkPaint> saveLayerPaint(paintDict->unflatten(saveLayerPaintId));
-    if (NULL == saveLayerPaint.get() || !is_simple(*saveLayerPaint)) {
-        return false;
-    }
-
-    // For this optimization we only fold the saveLayer and drawBitmapRect
-    // together if the saveLayer's draw is simple (i.e., no fancy effects) and
-    // and the only difference in the colors is that the saveLayer's can have
-    // an alpha while the drawBitmapRect's is opaque.
-    // TODO: it should be possible to fold them together even if they both
-    // have different non-255 alphas
-    SkColor layerColor = saveLayerPaint->getColor() | 0xFF000000; // force opaque
-
-    SkAutoTDelete<SkPaint> dbmPaint(paintDict->unflatten(dbmPaintId));
-    if (NULL == dbmPaint.get() || dbmPaint->getColor() != layerColor || !is_simple(*dbmPaint)) {
-        return false;
-    }
-
-    SkColor newColor = SkColorSetA(dbmPaint->getColor(),
-                                   SkColorGetA(saveLayerPaint->getColor()));
-    dbmPaint->setColor(newColor);
-
-    const SkFlatData* data = paintDict->findAndReturnFlat(*dbmPaint);
-    if (NULL == data) {
-        return false;
-    }
-
-    // kill the saveLayer and alter the DBMR2R's paint to be the modified one
-    convert_command_to_noop(writer, saveLayerInfo.fOffset);
-    writer->overwriteTAt(dbmInfo.fOffset + dbmPaintOffset, data->index());
-    return true;
-}
-
-/*
- * Restore has just been called (but not recorded), look back at the
- * matching save* and see if we are in the configuration:
- *   SAVE_LAYER (with NULL == bounds)
- *      SAVE
- *         CLIP_RECT
- *         DRAW_BITMAP|DRAW_BITMAP_MATRIX|DRAW_BITMAP_NINE|DRAW_BITMAP_RECT_TO_RECT
- *      RESTORE
- *   RESTORE
- * where the saveLayer's color can be moved into the drawBitmap*'s paint
- */
-static bool remove_save_layer2(SkWriter32* writer, int32_t offset,
-                               SkPaintDictionary* paintDict) {
-
-    // back up to the save block
-    // TODO: add a stack to track save*/restore offsets rather than searching backwards
-    while (offset > 0) {
-        offset = writer->readTAt<uint32_t>(offset);
-    }
-
-    int pattern[] = { SAVE_LAYER, SAVE, CLIP_RECT, kDRAW_BITMAP_FLAVOR, RESTORE, /* RESTORE */ };
-    CommandInfo result[SK_ARRAY_COUNT(pattern)];
-
-    if (!match(writer, -offset, pattern, result, SK_ARRAY_COUNT(pattern))) {
-        return false;
-    }
-
-    if (kSaveLayerWithBoundsSize == result[0].fSize) {
-        // The saveLayer's bound can offset where the dbm is drawn
-        return false;
-    }
-
-    return merge_savelayer_paint_into_drawbitmp(writer, paintDict,
-                                                result[0], result[3]);
-}
-
-static bool is_drawing_op(DrawType op) {
-    return (op > CONCAT && op < ROTATE) || DRAW_DRRECT == op;
-}
-
-/*
- *  Restore has just been called (but not recorded), so look back at the
- *  matching save(), and see if we can eliminate the pair of them, due to no
- *  intervening matrix/clip calls.
- *
- *  If so, update the writer and return true, in which case we won't even record
- *  the restore() call. If we still need the restore(), return false.
- */
-static bool collapse_save_clip_restore(SkWriter32* writer, int32_t offset,
-                                       SkPaintDictionary* paintDict) {
-#ifdef TRACK_COLLAPSE_STATS
-    gCollapseCalls += 1;
-#endif
-
-    int32_t restoreOffset = (int32_t)writer->bytesWritten();
-
-    // back up to the save block
-    while (offset > 0) {
-        offset = writer->readTAt<uint32_t>(offset);
-    }
-
-    // now offset points to a save
-    offset = -offset;
-    uint32_t opSize;
-    DrawType op = peek_op_and_size(writer, offset, &opSize);
-    if (SAVE_LAYER == op) {
-        // not ready to cull these out yet (mrr)
-        return false;
-    }
-    SkASSERT(SAVE == op);
-    SkASSERT(kSaveSize == opSize);
-
-    // Walk forward until we get back to either a draw-verb (abort) or we hit
-    // our restore (success).
-    int32_t saveOffset = offset;
-
-    offset += opSize;
-    while (offset < restoreOffset) {
-        op = peek_op_and_size(writer, offset, &opSize);
-        if (is_drawing_op(op) || (SAVE_LAYER == op)) {
-            // drawing verb, abort
-            return false;
-        }
-        offset += opSize;
-    }
-
-#ifdef TRACK_COLLAPSE_STATS
-    gCollapseCount += 1;
-    SkDebugf("Collapse [%d out of %d] %g%spn", gCollapseCount, gCollapseCalls,
-             (double)gCollapseCount / gCollapseCalls, "%");
-#endif
-
-    writer->rewindToOffset(saveOffset);
-    return true;
-}
-
-typedef bool (*PictureRecordOptProc)(SkWriter32* writer, int32_t offset,
-                                     SkPaintDictionary* paintDict);
-enum PictureRecordOptType {
-    kRewind_OptType,  // Optimization rewinds the command stream
-    kCollapseSaveLayer_OptType,  // Optimization eliminates a save/restore pair
-};
-
-enum PictureRecordOptFlags {
-    kSkipIfBBoxHierarchy_Flag = 0x1,  // Optimization should be skipped if the
-                                      // SkPicture has a bounding box hierarchy.
-};
-
-struct PictureRecordOpt {
-    PictureRecordOptProc fProc;
-    PictureRecordOptType fType;
-    unsigned fFlags;
-};
-/*
- * A list of the optimizations that are tried upon seeing a restore
- * TODO: add a real API for such optimizations
- *       Add the ability to fire optimizations on any op (not just RESTORE)
- */
-static const PictureRecordOpt gPictureRecordOpts[] = {
-    // 'collapse_save_clip_restore' is skipped if there is a BBoxHierarchy
-    // because it is redundant with the state traversal optimization in
-    // SkPictureStateTree, and applying the optimization introduces significant
-    // record time overhead because it requires rewinding contents that were
-    // recorded into the BBoxHierarchy.
-    { collapse_save_clip_restore, kRewind_OptType, kSkipIfBBoxHierarchy_Flag },
-    { remove_save_layer1,         kCollapseSaveLayer_OptType, 0 },
-    { remove_save_layer2,         kCollapseSaveLayer_OptType, 0 }
-};
-
-// This is called after an optimization has been applied to the command stream
-// in order to adjust the contents and state of the bounding box hierarchy and
-// state tree to reflect the optimization.
-static void apply_optimization_to_bbh(PictureRecordOptType opt, SkPictureStateTree* stateTree,
-                                      SkBBoxHierarchy* boundingHierarchy) {
-    switch (opt) {
-    case kCollapseSaveLayer_OptType:
-        if (NULL != stateTree) {
-            stateTree->saveCollapsed();
-        }
-        break;
-    case kRewind_OptType:
-        if (NULL != boundingHierarchy) {
-            boundingHierarchy->rewindInserts();
-        }
-        // Note: No need to touch the state tree for this to work correctly.
-        // Unused branches do not burden the playback, and pruning the tree
-        // would be O(N^2), so it is best to leave it alone.
-        break;
-    default:
-        SkASSERT(0);
-    }
-}
+#endif//SK_DEBUG
 
 void SkPictureRecord::willRestore() {
-    // FIXME: SkDeferredCanvas needs to be refactored to respect
-    // save/restore balancing so that the following test can be
-    // turned on permanently.
 #if 0
     SkASSERT(fRestoreOffsetStack.count() > 1);
 #endif
 
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    if (fMCMgr.getSaveCount() == 1) {
-        return;
-    }
-
-    fMCMgr.restore();
-#else
     // check for underflow
     if (fRestoreOffsetStack.count() == 0) {
         return;
     }
 
-    if (fRestoreOffsetStack.count() == fFirstSavedLayerIndex) {
-        fFirstSavedLayerIndex = kNoSavedLayerIndex;
-    }
-
-    size_t opt = 0;
-    if (fOptsEnabled) {
-        for (opt = 0; opt < SK_ARRAY_COUNT(gPictureRecordOpts); ++opt) {
-            if (0 != (gPictureRecordOpts[opt].fFlags & kSkipIfBBoxHierarchy_Flag)
-                && NULL != fBoundingHierarchy) {
-                continue;
-            }
-            if ((*gPictureRecordOpts[opt].fProc)(&fWriter, fRestoreOffsetStack.top(), &fPaints)) {
-                // Some optimization fired so don't add the RESTORE
-                apply_optimization_to_bbh(gPictureRecordOpts[opt].fType,
-                                          fStateTree, fBoundingHierarchy);
-                break;
-            }
-        }
-    }
-
-    if (!fOptsEnabled || SK_ARRAY_COUNT(gPictureRecordOpts) == opt) {
-        // No optimization fired so add the RESTORE
-        this->recordRestore();
-    }
+    this->recordRestore();
 
     fRestoreOffsetStack.pop();
-#endif
 
     this->INHERITED::willRestore();
 }
 
 void SkPictureRecord::recordRestore(bool fillInSkips) {
+    fContentInfo.onRestore();
+
     if (fillInSkips) {
         this->fillRestoreOffsetPlaceholdersForCurrentStackLevel((uint32_t)fWriter.bytesWritten());
     }
@@ -680,10 +258,6 @@ void SkPictureRecord::recordScale(const SkMatrix& m) {
 }
 
 void SkPictureRecord::didConcat(const SkMatrix& matrix) {
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.concat(matrix);
-#else
     switch (matrix.getType()) {
         case SkMatrix::kTranslate_Mask:
             this->recordTranslate(matrix);
@@ -695,31 +269,25 @@ void SkPictureRecord::didConcat(const SkMatrix& matrix) {
             this->recordConcat(matrix);
             break;
     }
-#endif
     this->INHERITED::didConcat(matrix);
 }
 
 void SkPictureRecord::recordConcat(const SkMatrix& matrix) {
     this->validate(fWriter.bytesWritten(), 0);
     // op + matrix
-    size_t size = kUInt32Size + matrix.writeToMemory(NULL);
+    size_t size = kUInt32Size + matrix.writeToMemory(nullptr);
     size_t initialOffset = this->addDraw(CONCAT, &size);
     this->addMatrix(matrix);
     this->validate(initialOffset, size);
 }
 
 void SkPictureRecord::didSetMatrix(const SkMatrix& matrix) {
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.setMatrix(matrix);
-#else
     this->validate(fWriter.bytesWritten(), 0);
     // op + matrix
-    size_t size = kUInt32Size + matrix.writeToMemory(NULL);
+    size_t size = kUInt32Size + matrix.writeToMemory(nullptr);
     size_t initialOffset = this->addDraw(SET_MATRIX, &size);
     this->addMatrix(matrix);
     this->validate(initialOffset, size);
-#endif
     this->INHERITED::didSetMatrix(matrix);
 }
 
@@ -739,11 +307,6 @@ static bool regionOpExpands(SkRegion::Op op) {
     }
 }
 
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-void SkPictureRecord::fillRestoreOffsetPlaceholdersForCurrentStackLevel(uint32_t restoreOffset) {
-    fMCMgr.fillInSkips(&fWriter, restoreOffset);
-}
-#else
 void SkPictureRecord::fillRestoreOffsetPlaceholdersForCurrentStackLevel(uint32_t restoreOffset) {
     int32_t offset = fRestoreOffsetStack.top();
     while (offset > 0) {
@@ -753,13 +316,15 @@ void SkPictureRecord::fillRestoreOffsetPlaceholdersForCurrentStackLevel(uint32_t
     }
 
 #ifdef SK_DEBUG
-    // assert that the final offset value points to a save verb
-    uint32_t opSize;
-    DrawType drawOp = peek_op_and_size(&fWriter, -offset, &opSize);
-    SkASSERT(SAVE == drawOp || SAVE_LAYER == drawOp);
+    // offset of 0 has been disabled, so we skip it
+    if (offset > 0) {
+        // assert that the final offset value points to a save verb
+        uint32_t opSize;
+        DrawType drawOp = peek_op_and_size(&fWriter, -offset, &opSize);
+        SkASSERT(SAVE == drawOp || SAVE_LAYER == drawOp);
+    }
 #endif
 }
-#endif
 
 void SkPictureRecord::beginRecording() {
     // we have to call this *after* our constructor, to ensure that it gets
@@ -771,18 +336,8 @@ void SkPictureRecord::beginRecording() {
 void SkPictureRecord::endRecording() {
     SkASSERT(kNoInitialSave != fInitialSaveCount);
     this->restoreToCount(fInitialSaveCount);
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.finish();
-#endif
 }
 
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-int SkPictureRecord::recordRestoreOffsetPlaceholder(SkRegion::Op op) {
-    size_t offset = fWriter.bytesWritten();
-    this->addInt(-1);
-    return offset;
-}
-#else
 size_t SkPictureRecord::recordRestoreOffsetPlaceholder(SkRegion::Op op) {
     if (fRestoreOffsetStack.isEmpty()) {
         return -1;
@@ -812,30 +367,20 @@ size_t SkPictureRecord::recordRestoreOffsetPlaceholder(SkRegion::Op op) {
     fRestoreOffsetStack.top() = SkToU32(offset);
     return offset;
 }
-#endif
 
 void SkPictureRecord::onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.clipRect(rect, op, doAA);
-#else
     this->recordClipRect(rect, op, kSoft_ClipEdgeStyle == edgeStyle);
-#endif
     this->INHERITED::onClipRect(rect, op, edgeStyle);
 }
 
 size_t SkPictureRecord::recordClipRect(const SkRect& rect, SkRegion::Op op, bool doAA) {
     // id + rect + clip params
     size_t size = 1 * kUInt32Size + sizeof(rect) + 1 * kUInt32Size;
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    size += kUInt32Size;    // + restore offset
-#else
     // recordRestoreOffsetPlaceholder doesn't always write an offset
     if (!fRestoreOffsetStack.isEmpty()) {
         // + restore offset
         size += kUInt32Size;
     }
-#endif
     size_t initialOffset = this->addDraw(CLIP_RECT, &size);
     this->addRect(rect);
     this->addInt(ClipParams_pack(op, doAA));
@@ -846,27 +391,18 @@ size_t SkPictureRecord::recordClipRect(const SkRect& rect, SkRegion::Op op, bool
 }
 
 void SkPictureRecord::onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.clipRRect(rrect, op, doAA);
-#else
     this->recordClipRRect(rrect, op, kSoft_ClipEdgeStyle == edgeStyle);
-#endif
-    this->updateClipConservativelyUsingBounds(rrect.getBounds(), op, false);
+    this->INHERITED::onClipRRect(rrect, op, edgeStyle);
 }
 
 size_t SkPictureRecord::recordClipRRect(const SkRRect& rrect, SkRegion::Op op, bool doAA) {
     // op + rrect + clip params
     size_t size = 1 * kUInt32Size + SkRRect::kSizeInMemory + 1 * kUInt32Size;
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    size += kUInt32Size;    // + restore offset
-#else
     // recordRestoreOffsetPlaceholder doesn't always write an offset
     if (!fRestoreOffsetStack.isEmpty()) {
         // + restore offset
         size += kUInt32Size;
     }
-#endif
     size_t initialOffset = this->addDraw(CLIP_RRECT, &size);
     this->addRRect(rrect);
     this->addInt(ClipParams_pack(op, doAA));
@@ -876,30 +412,19 @@ size_t SkPictureRecord::recordClipRRect(const SkRRect& rrect, SkRegion::Op op, b
 }
 
 void SkPictureRecord::onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.clipPath(path, op, doAA);
-#else
     int pathID = this->addPathToHeap(path);
     this->recordClipPath(pathID, op, kSoft_ClipEdgeStyle == edgeStyle);
-#endif
-
-    this->updateClipConservativelyUsingBounds(path.getBounds(), op,
-                                              path.isInverseFillType());
+    this->INHERITED::onClipPath(path, op, edgeStyle);
 }
 
 size_t SkPictureRecord::recordClipPath(int pathID, SkRegion::Op op, bool doAA) {
     // op + path index + clip params
     size_t size = 3 * kUInt32Size;
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    size += kUInt32Size;    // + restore offset
-#else
     // recordRestoreOffsetPlaceholder doesn't always write an offset
     if (!fRestoreOffsetStack.isEmpty()) {
         // + restore offset
         size += kUInt32Size;
     }
-#endif
     size_t initialOffset = this->addDraw(CLIP_PATH, &size);
     this->addInt(pathID);
     this->addInt(ClipParams_pack(op, doAA));
@@ -909,27 +434,18 @@ size_t SkPictureRecord::recordClipPath(int pathID, SkRegion::Op op, bool doAA) {
 }
 
 void SkPictureRecord::onClipRegion(const SkRegion& region, SkRegion::Op op) {
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.clipRegion(region, op);
-#else
     this->recordClipRegion(region, op);
-#endif
     this->INHERITED::onClipRegion(region, op);
 }
 
 size_t SkPictureRecord::recordClipRegion(const SkRegion& region, SkRegion::Op op) {
     // op + clip params + region
-    size_t size = 2 * kUInt32Size + region.writeToMemory(NULL);
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    size += kUInt32Size;    // + restore offset
-#else
+    size_t size = 2 * kUInt32Size + region.writeToMemory(nullptr);
     // recordRestoreOffsetPlaceholder doesn't always write an offset
     if (!fRestoreOffsetStack.isEmpty()) {
         // + restore offset
         size += kUInt32Size;
     }
-#endif
     size_t initialOffset = this->addDraw(CLIP_REGION, &size);
     this->addRegion(region);
     this->addInt(ClipParams_pack(op, false));
@@ -939,165 +455,91 @@ size_t SkPictureRecord::recordClipRegion(const SkRegion& region, SkRegion::Op op
     return offset;
 }
 
-void SkPictureRecord::clear(SkColor color) {
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.call(SkMatrixClipStateMgr::kOther_CallType);
-#endif
-
-    // op + color
-    size_t size = 2 * kUInt32Size;
-    size_t initialOffset = this->addDraw(DRAW_CLEAR, &size);
-    this->addInt(color);
-    this->validate(initialOffset, size);
-}
-
-void SkPictureRecord::drawPaint(const SkPaint& paint) {
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.call(SkMatrixClipStateMgr::kOther_CallType);
-#endif
-
+void SkPictureRecord::onDrawPaint(const SkPaint& paint) {
     // op + paint index
     size_t size = 2 * kUInt32Size;
     size_t initialOffset = this->addDraw(DRAW_PAINT, &size);
-    SkASSERT(initialOffset+getPaintOffset(DRAW_PAINT, size) == fWriter.bytesWritten());
+    SkASSERT(initialOffset+get_paint_offset(DRAW_PAINT, size) == fWriter.bytesWritten());
     this->addPaint(paint);
     this->validate(initialOffset, size);
 }
 
-void SkPictureRecord::drawPoints(PointMode mode, size_t count, const SkPoint pts[],
-                                 const SkPaint& paint) {
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.call(SkMatrixClipStateMgr::kOther_CallType);
-#endif
+void SkPictureRecord::onDrawPoints(PointMode mode, size_t count, const SkPoint pts[],
+                                   const SkPaint& paint) {
+    fContentInfo.onDrawPoints(count, paint);
 
     // op + paint index + mode + count + point data
     size_t size = 4 * kUInt32Size + count * sizeof(SkPoint);
     size_t initialOffset = this->addDraw(DRAW_POINTS, &size);
-    SkASSERT(initialOffset+getPaintOffset(DRAW_POINTS, size) == fWriter.bytesWritten());
+    SkASSERT(initialOffset+get_paint_offset(DRAW_POINTS, size) == fWriter.bytesWritten());
     this->addPaint(paint);
-    if (paint.getPathEffect() != NULL) {
-        SkPathEffect::DashInfo info;
-        SkPathEffect::DashType dashType = paint.getPathEffect()->asADash(&info);
-        if (2 == count && SkPaint::kRound_Cap != paint.getStrokeCap() &&
-            SkPathEffect::kDash_DashType == dashType && 2 == info.fCount) {
-            fContentInfo.incFastPathDashEffects();
-        }
-    }
+
     this->addInt(mode);
     this->addInt(SkToInt(count));
     fWriter.writeMul4(pts, count * sizeof(SkPoint));
     this->validate(initialOffset, size);
 }
 
-void SkPictureRecord::drawOval(const SkRect& oval, const SkPaint& paint) {
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.call(SkMatrixClipStateMgr::kOther_CallType);
-#endif
-
+void SkPictureRecord::onDrawOval(const SkRect& oval, const SkPaint& paint) {
     // op + paint index + rect
     size_t size = 2 * kUInt32Size + sizeof(oval);
     size_t initialOffset = this->addDraw(DRAW_OVAL, &size);
-    SkASSERT(initialOffset+getPaintOffset(DRAW_OVAL, size) == fWriter.bytesWritten());
+    SkASSERT(initialOffset+get_paint_offset(DRAW_OVAL, size) == fWriter.bytesWritten());
     this->addPaint(paint);
     this->addRect(oval);
     this->validate(initialOffset, size);
 }
 
-void SkPictureRecord::drawRect(const SkRect& rect, const SkPaint& paint) {
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.call(SkMatrixClipStateMgr::kOther_CallType);
-#endif
-
+void SkPictureRecord::onDrawRect(const SkRect& rect, const SkPaint& paint) {
     // op + paint index + rect
     size_t size = 2 * kUInt32Size + sizeof(rect);
     size_t initialOffset = this->addDraw(DRAW_RECT, &size);
-    SkASSERT(initialOffset+getPaintOffset(DRAW_RECT, size) == fWriter.bytesWritten());
+    SkASSERT(initialOffset+get_paint_offset(DRAW_RECT, size) == fWriter.bytesWritten());
     this->addPaint(paint);
     this->addRect(rect);
     this->validate(initialOffset, size);
 }
 
-void SkPictureRecord::drawRRect(const SkRRect& rrect, const SkPaint& paint) {
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.call(SkMatrixClipStateMgr::kOther_CallType);
-#endif
-
-    if (rrect.isRect() && kBeClever) {
-        this->SkPictureRecord::drawRect(rrect.getBounds(), paint);
-    } else if (rrect.isOval() && kBeClever) {
-        this->SkPictureRecord::drawOval(rrect.getBounds(), paint);
-    } else {
-        // op + paint index + rrect
-        size_t size = 2 * kUInt32Size + SkRRect::kSizeInMemory;
-        size_t initialOffset = this->addDraw(DRAW_RRECT, &size);
-        SkASSERT(initialOffset+getPaintOffset(DRAW_RRECT, size) == fWriter.bytesWritten());
-        this->addPaint(paint);
-        this->addRRect(rrect);
-        this->validate(initialOffset, size);
-    }
+void SkPictureRecord::onDrawRRect(const SkRRect& rrect, const SkPaint& paint) {
+    // op + paint index + rrect
+    size_t size = 2 * kUInt32Size + SkRRect::kSizeInMemory;
+    size_t initialOffset = this->addDraw(DRAW_RRECT, &size);
+    SkASSERT(initialOffset+get_paint_offset(DRAW_RRECT, size) == fWriter.bytesWritten());
+    this->addPaint(paint);
+    this->addRRect(rrect);
+    this->validate(initialOffset, size);
 }
 
 void SkPictureRecord::onDrawDRRect(const SkRRect& outer, const SkRRect& inner,
                                    const SkPaint& paint) {
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.call(SkMatrixClipStateMgr::kOther_CallType);
-#endif
-
     // op + paint index + rrects
     size_t size = 2 * kUInt32Size + SkRRect::kSizeInMemory * 2;
     size_t initialOffset = this->addDraw(DRAW_DRRECT, &size);
-    SkASSERT(initialOffset+getPaintOffset(DRAW_DRRECT, size) == fWriter.bytesWritten());
+    SkASSERT(initialOffset+get_paint_offset(DRAW_DRRECT, size) == fWriter.bytesWritten());
     this->addPaint(paint);
     this->addRRect(outer);
     this->addRRect(inner);
     this->validate(initialOffset, size);
 }
 
-void SkPictureRecord::drawPath(const SkPath& path, const SkPaint& paint) {
-
-    if (paint.isAntiAlias() && !path.isConvex()) {
-        fContentInfo.incAAConcavePaths();
-
-        if (SkPaint::kStroke_Style == paint.getStyle() &&
-            0 == paint.getStrokeWidth()) {
-            fContentInfo.incAAHairlineConcavePaths();
-        }
-    }
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.call(SkMatrixClipStateMgr::kOther_CallType);
-#endif
+void SkPictureRecord::onDrawPath(const SkPath& path, const SkPaint& paint) {
+    fContentInfo.onDrawPath(path, paint);
 
     // op + paint index + path index
     size_t size = 3 * kUInt32Size;
     size_t initialOffset = this->addDraw(DRAW_PATH, &size);
-    SkASSERT(initialOffset+getPaintOffset(DRAW_PATH, size) == fWriter.bytesWritten());
+    SkASSERT(initialOffset+get_paint_offset(DRAW_PATH, size) == fWriter.bytesWritten());
     this->addPaint(paint);
     this->addPath(path);
     this->validate(initialOffset, size);
 }
 
-void SkPictureRecord::drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top,
-                                 const SkPaint* paint = NULL) {
-    if (bitmap.drawsNothing() && kBeClever) {
-        return;
-    }
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.call(SkMatrixClipStateMgr::kOther_CallType);
-#endif
-
+void SkPictureRecord::onDrawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top,
+                                   const SkPaint* paint) {
     // op + paint index + bitmap index + left + top
     size_t size = 3 * kUInt32Size + 2 * sizeof(SkScalar);
     size_t initialOffset = this->addDraw(DRAW_BITMAP, &size);
-    SkASSERT(initialOffset+getPaintOffset(DRAW_BITMAP, size) == fWriter.bytesWritten());
+    SkASSERT(initialOffset+get_paint_offset(DRAW_BITMAP, size) == fWriter.bytesWritten());
     this->addPaintPtr(paint);
     this->addBitmap(bitmap);
     this->addScalar(left);
@@ -1105,68 +547,78 @@ void SkPictureRecord::drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar
     this->validate(initialOffset, size);
 }
 
-void SkPictureRecord::drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src,
-                                           const SkRect& dst, const SkPaint* paint,
-                                           DrawBitmapRectFlags flags) {
-    if (bitmap.drawsNothing() && kBeClever) {
-        return;
-    }
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.call(SkMatrixClipStateMgr::kOther_CallType);
-#endif
+void SkPictureRecord::onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst,
+                                       const SkPaint* paint, SrcRectConstraint constraint) {
     // id + paint index + bitmap index + bool for 'src' + flags
     size_t size = 5 * kUInt32Size;
-    if (NULL != src) {
+    if (src) {
         size += sizeof(*src);   // + rect
     }
     size += sizeof(dst);        // + rect
 
-    size_t initialOffset = this->addDraw(DRAW_BITMAP_RECT_TO_RECT, &size);
-    SkASSERT(initialOffset+getPaintOffset(DRAW_BITMAP_RECT_TO_RECT, size)
-             == fWriter.bytesWritten());
+    size_t initialOffset = this->addDraw(DRAW_BITMAP_RECT, &size);
+    SkASSERT(initialOffset+get_paint_offset(DRAW_BITMAP_RECT, size) == fWriter.bytesWritten());
     this->addPaintPtr(paint);
     this->addBitmap(bitmap);
     this->addRectPtr(src);  // may be null
     this->addRect(dst);
-    this->addInt(flags);
+    this->addInt(constraint);
     this->validate(initialOffset, size);
 }
 
-void SkPictureRecord::drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& matrix,
-                                       const SkPaint* paint) {
-    if (bitmap.drawsNothing() && kBeClever) {
-        return;
-    }
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.call(SkMatrixClipStateMgr::kOther_CallType);
-#endif
-
-    // id + paint index + bitmap index + matrix
-    size_t size = 3 * kUInt32Size + matrix.writeToMemory(NULL);
-    size_t initialOffset = this->addDraw(DRAW_BITMAP_MATRIX, &size);
-    SkASSERT(initialOffset+getPaintOffset(DRAW_BITMAP_MATRIX, size) == fWriter.bytesWritten());
+void SkPictureRecord::onDrawImage(const SkImage* image, SkScalar x, SkScalar y,
+                                  const SkPaint* paint) {
+    // op + paint_index + image_index + x + y
+    size_t size = 3 * kUInt32Size + 2 * sizeof(SkScalar);
+    size_t initialOffset = this->addDraw(DRAW_IMAGE, &size);
+    SkASSERT(initialOffset+get_paint_offset(DRAW_IMAGE, size) == fWriter.bytesWritten());
     this->addPaintPtr(paint);
-    this->addBitmap(bitmap);
-    this->addMatrix(matrix);
+    this->addImage(image);
+    this->addScalar(x);
+    this->addScalar(y);
     this->validate(initialOffset, size);
 }
 
-void SkPictureRecord::drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
-                                     const SkRect& dst, const SkPaint* paint) {
-    if (bitmap.drawsNothing() && kBeClever) {
-        return;
+void SkPictureRecord::onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
+                                      const SkPaint* paint, SrcRectConstraint constraint) {
+    // id + paint_index + image_index + bool_for_src + constraint
+    size_t size = 5 * kUInt32Size;
+    if (src) {
+        size += sizeof(*src);   // + rect
     }
+    size += sizeof(dst);        // + rect
 
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.call(SkMatrixClipStateMgr::kOther_CallType);
-#endif
+    size_t initialOffset = this->addDraw(DRAW_IMAGE_RECT, &size);
+    SkASSERT(initialOffset+get_paint_offset(DRAW_IMAGE_RECT, size)
+             == fWriter.bytesWritten());
+    this->addPaintPtr(paint);
+    this->addImage(image);
+    this->addRectPtr(src);  // may be null
+    this->addRect(dst);
+    this->addInt(constraint);
+    this->validate(initialOffset, size);
+}
 
+void SkPictureRecord::onDrawImageNine(const SkImage* img, const SkIRect& center, const SkRect& dst,
+                                      const SkPaint* paint) {
+    // id + paint_index + image_index + center + dst
+    size_t size = 3 * kUInt32Size + sizeof(SkIRect) + sizeof(SkRect);
+
+    size_t initialOffset = this->addDraw(DRAW_IMAGE_NINE, &size);
+    SkASSERT(initialOffset+get_paint_offset(DRAW_IMAGE_NINE, size) == fWriter.bytesWritten());
+    this->addPaintPtr(paint);
+    this->addImage(img);
+    this->addIRect(center);
+    this->addRect(dst);
+    this->validate(initialOffset, size);
+}
+
+void SkPictureRecord::onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
+                                       const SkRect& dst, const SkPaint* paint) {
     // op + paint index + bitmap id + center + dst rect
     size_t size = 3 * kUInt32Size + sizeof(center) + sizeof(dst);
     size_t initialOffset = this->addDraw(DRAW_BITMAP_NINE, &size);
-    SkASSERT(initialOffset+getPaintOffset(DRAW_BITMAP_NINE, size) == fWriter.bytesWritten());
+    SkASSERT(initialOffset+get_paint_offset(DRAW_BITMAP_NINE, size) == fWriter.bytesWritten());
     this->addPaintPtr(paint);
     this->addBitmap(bitmap);
     this->addIRect(center);
@@ -1174,20 +626,12 @@ void SkPictureRecord::drawBitmapNine(const SkBitmap& bitmap, const SkIRect& cent
     this->validate(initialOffset, size);
 }
 
-void SkPictureRecord::drawSprite(const SkBitmap& bitmap, int left, int top,
-                                 const SkPaint* paint = NULL) {
-    if (bitmap.drawsNothing() && kBeClever) {
-        return;
-    }
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.call(SkMatrixClipStateMgr::kOther_CallType);
-#endif
-
+void SkPictureRecord::onDrawSprite(const SkBitmap& bitmap, int left, int top,
+                                   const SkPaint* paint) {
     // op + paint index + bitmap index + left + top
     size_t size = 5 * kUInt32Size;
     size_t initialOffset = this->addDraw(DRAW_SPRITE, &size);
-    SkASSERT(initialOffset+getPaintOffset(DRAW_SPRITE, size) == fWriter.bytesWritten());
+    SkASSERT(initialOffset+get_paint_offset(DRAW_SPRITE, size) == fWriter.bytesWritten());
     this->addPaintPtr(paint);
     this->addBitmap(bitmap);
     this->addInt(left);
@@ -1195,204 +639,64 @@ void SkPictureRecord::drawSprite(const SkBitmap& bitmap, int left, int top,
     this->validate(initialOffset, size);
 }
 
-void SkPictureRecord::ComputeFontMetricsTopBottom(const SkPaint& paint, SkScalar topbot[2]) {
-    SkPaint::FontMetrics metrics;
-    paint.getFontMetrics(&metrics);
-    SkRect bounds;
-    // construct a rect so we can see any adjustments from the paint.
-    // we use 0,1 for left,right, just so the rect isn't empty
-    bounds.set(0, metrics.fTop, SK_Scalar1, metrics.fBottom);
-    (void)paint.computeFastBounds(bounds, &bounds);
-    topbot[0] = bounds.fTop;
-    topbot[1] = bounds.fBottom;
-}
-
-void SkPictureRecord::addFontMetricsTopBottom(const SkPaint& paint, const SkFlatData& flat,
-                                              SkScalar minY, SkScalar maxY) {
-    WriteTopBot(paint, flat);
-    this->addScalar(flat.topBot()[0] + minY);
-    this->addScalar(flat.topBot()[1] + maxY);
-}
-
 void SkPictureRecord::onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
                                  const SkPaint& paint) {
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.call(SkMatrixClipStateMgr::kOther_CallType);
-#endif
-
-    bool fast = !paint.isVerticalText() && paint.canComputeFastBounds() && kBeClever;
-
     // op + paint index + length + 'length' worth of chars + x + y
     size_t size = 3 * kUInt32Size + SkAlign4(byteLength) + 2 * sizeof(SkScalar);
-    if (fast) {
-        size += 2 * sizeof(SkScalar); // + top & bottom
-    }
 
-    DrawType op = fast ? DRAW_TEXT_TOP_BOTTOM : DRAW_TEXT;
+    DrawType op = DRAW_TEXT;
     size_t initialOffset = this->addDraw(op, &size);
-    SkASSERT(initialOffset+getPaintOffset(op, size) == fWriter.bytesWritten());
-    const SkFlatData* flatPaintData = addPaint(paint);
-    SkASSERT(flatPaintData);
+    SkASSERT(initialOffset+get_paint_offset(op, size) == fWriter.bytesWritten());
+    this->addPaint(paint);
     this->addText(text, byteLength);
     this->addScalar(x);
     this->addScalar(y);
-    if (fast) {
-        this->addFontMetricsTopBottom(paint, *flatPaintData, y, y);
-    }
     this->validate(initialOffset, size);
 }
 
 void SkPictureRecord::onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
                                     const SkPaint& paint) {
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.call(SkMatrixClipStateMgr::kOther_CallType);
-#endif
-
     int points = paint.countText(text, byteLength);
-    if (0 == points)
-        return;
 
-    bool canUseDrawH = true;
-    SkScalar minY = pos[0].fY;
-    SkScalar maxY = pos[0].fY;
-    // check if the caller really should have used drawPosTextH()
-    {
-        const SkScalar firstY = pos[0].fY;
-        for (int index = 1; index < points; index++) {
-            if (pos[index].fY != firstY) {
-                canUseDrawH = false;
-                if (pos[index].fY < minY) {
-                    minY = pos[index].fY;
-                } else if (pos[index].fY > maxY) {
-                    maxY = pos[index].fY;
-                }
-            }
-        }
-    }
+    // op + paint index + length + 'length' worth of data + num points + x&y point data
+    size_t size = 3 * kUInt32Size + SkAlign4(byteLength) + kUInt32Size + points * sizeof(SkPoint);
 
-    bool fastBounds = !paint.isVerticalText() && paint.canComputeFastBounds() && kBeClever;
-    bool fast = canUseDrawH && fastBounds && kBeClever;
+    DrawType op = DRAW_POS_TEXT;
 
-    // op + paint index + length + 'length' worth of data + num points
-    size_t size = 3 * kUInt32Size + SkAlign4(byteLength) + 1 * kUInt32Size;
-    if (canUseDrawH) {
-        if (fast) {
-            size += 2 * sizeof(SkScalar); // + top & bottom
-        }
-        // + y-pos + actual x-point data
-        size += sizeof(SkScalar) + points * sizeof(SkScalar);
-    } else {
-        // + x&y point data
-        size += points * sizeof(SkPoint);
-        if (fastBounds) {
-            size += 2 * sizeof(SkScalar); // + top & bottom
-        }
-    }
-
-    DrawType op;
-    if (fast) {
-        op = DRAW_POS_TEXT_H_TOP_BOTTOM;
-    } else if (canUseDrawH) {
-        op = DRAW_POS_TEXT_H;
-    } else if (fastBounds) {
-        op = DRAW_POS_TEXT_TOP_BOTTOM;
-    } else {
-        op = DRAW_POS_TEXT;
-    }
     size_t initialOffset = this->addDraw(op, &size);
-    SkASSERT(initialOffset+getPaintOffset(op, size) == fWriter.bytesWritten());
-    const SkFlatData* flatPaintData = this->addPaint(paint);
-    SkASSERT(flatPaintData);
+    SkASSERT(initialOffset+get_paint_offset(op, size) == fWriter.bytesWritten());
+    this->addPaint(paint);
     this->addText(text, byteLength);
     this->addInt(points);
-
-#ifdef SK_DEBUG_SIZE
-    size_t start = fWriter.bytesWritten();
-#endif
-    if (canUseDrawH) {
-        if (fast) {
-            this->addFontMetricsTopBottom(paint, *flatPaintData, pos[0].fY, pos[0].fY);
-        }
-        this->addScalar(pos[0].fY);
-        SkScalar* xptr = (SkScalar*)fWriter.reserve(points * sizeof(SkScalar));
-        for (int index = 0; index < points; index++)
-            *xptr++ = pos[index].fX;
-    } else {
-        fWriter.writeMul4(pos, points * sizeof(SkPoint));
-        if (fastBounds) {
-            this->addFontMetricsTopBottom(paint, *flatPaintData, minY, maxY);
-        }
-    }
-#ifdef SK_DEBUG_SIZE
-    fPointBytes += fWriter.bytesWritten() - start;
-    fPointWrites += points;
-#endif
+    fWriter.writeMul4(pos, points * sizeof(SkPoint));
     this->validate(initialOffset, size);
 }
 
 void SkPictureRecord::onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
                                      SkScalar constY, const SkPaint& paint) {
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.call(SkMatrixClipStateMgr::kOther_CallType);
-#endif
-
-    const SkFlatData* flatPaintData = this->getFlatPaintData(paint);
-    this->drawPosTextHImpl(text, byteLength, xpos, constY, paint, flatPaintData);
-}
-
-void SkPictureRecord::drawPosTextHImpl(const void* text, size_t byteLength,
-                          const SkScalar xpos[], SkScalar constY,
-                          const SkPaint& paint, const SkFlatData* flatPaintData) {
     int points = paint.countText(text, byteLength);
-    if (0 == points && kBeClever) {
-        return;
-    }
-
-    bool fast = !paint.isVerticalText() && paint.canComputeFastBounds() && kBeClever;
 
     // op + paint index + length + 'length' worth of data + num points
     size_t size = 3 * kUInt32Size + SkAlign4(byteLength) + 1 * kUInt32Size;
-    if (fast) {
-        size += 2 * sizeof(SkScalar); // + top & bottom
-    }
     // + y + the actual points
     size += 1 * kUInt32Size + points * sizeof(SkScalar);
-    size_t initialOffset = this->addDraw(fast ? DRAW_POS_TEXT_H_TOP_BOTTOM : DRAW_POS_TEXT_H,
-                                         &size);
-    SkASSERT(flatPaintData);
-    this->addFlatPaint(flatPaintData);
 
+    size_t initialOffset = this->addDraw(DRAW_POS_TEXT_H, &size);
+    this->addPaint(paint);
     this->addText(text, byteLength);
     this->addInt(points);
-
-#ifdef SK_DEBUG_SIZE
-    size_t start = fWriter.bytesWritten();
-#endif
-    if (fast) {
-        this->addFontMetricsTopBottom(paint, *flatPaintData, constY, constY);
-    }
     this->addScalar(constY);
     fWriter.writeMul4(xpos, points * sizeof(SkScalar));
-#ifdef SK_DEBUG_SIZE
-    fPointBytes += fWriter.bytesWritten() - start;
-    fPointWrites += points;
-#endif
     this->validate(initialOffset, size);
 }
 
 void SkPictureRecord::onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
                                        const SkMatrix* matrix, const SkPaint& paint) {
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.call(SkMatrixClipStateMgr::kOther_CallType);
-#endif
-
     // op + paint index + length + 'length' worth of data + path index + matrix
     const SkMatrix& m = matrix ? *matrix : SkMatrix::I();
-    size_t size = 3 * kUInt32Size + SkAlign4(byteLength) + kUInt32Size + m.writeToMemory(NULL);
+    size_t size = 3 * kUInt32Size + SkAlign4(byteLength) + kUInt32Size + m.writeToMemory(nullptr);
     size_t initialOffset = this->addDraw(DRAW_TEXT_ON_PATH, &size);
-    SkASSERT(initialOffset+getPaintOffset(DRAW_TEXT_ON_PATH, size) == fWriter.bytesWritten());
+    SkASSERT(initialOffset+get_paint_offset(DRAW_TEXT_ON_PATH, size) == fWriter.bytesWritten());
     this->addPaint(paint);
     this->addText(text, byteLength);
     this->addPath(path);
@@ -1400,29 +704,49 @@ void SkPictureRecord::onDrawTextOnPath(const void* text, size_t byteLength, cons
     this->validate(initialOffset, size);
 }
 
-void SkPictureRecord::onDrawPicture(const SkPicture* picture) {
+void SkPictureRecord::onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
+                                     const SkPaint& paint) {
 
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.call(SkMatrixClipStateMgr::kOther_CallType);
-#endif
+    // op + paint index + blob index + x/y
+    size_t size = 3 * kUInt32Size + 2 * sizeof(SkScalar);
+    size_t initialOffset = this->addDraw(DRAW_TEXT_BLOB, &size);
+    SkASSERT(initialOffset + get_paint_offset(DRAW_TEXT_BLOB, size) == fWriter.bytesWritten());
+
+    this->addPaint(paint);
+    this->addTextBlob(blob);
+    this->addScalar(x);
+    this->addScalar(y);
 
-    // op + picture index
-    size_t size = 2 * kUInt32Size;
-    size_t initialOffset = this->addDraw(DRAW_PICTURE, &size);
-    this->addPicture(picture);
     this->validate(initialOffset, size);
 }
 
-void SkPictureRecord::drawVertices(VertexMode vmode, int vertexCount,
-                          const SkPoint vertices[], const SkPoint texs[],
-                          const SkColor colors[], SkXfermode* xfer,
-                          const uint16_t indices[], int indexCount,
-                          const SkPaint& paint) {
+void SkPictureRecord::onDrawPicture(const SkPicture* picture, const SkMatrix* matrix,
+                                    const SkPaint* paint) {
+    // op + picture index
+    size_t size = 2 * kUInt32Size;
+    size_t initialOffset;
 
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.call(SkMatrixClipStateMgr::kOther_CallType);
-#endif
+    if (nullptr == matrix && nullptr == paint) {
+        initialOffset = this->addDraw(DRAW_PICTURE, &size);
+        this->addPicture(picture);
+    } else {
+        const SkMatrix& m = matrix ? *matrix : SkMatrix::I();
+        size += m.writeToMemory(nullptr) + kUInt32Size;    // matrix + paint
+        initialOffset = this->addDraw(DRAW_PICTURE_MATRIX_PAINT, &size);
+        SkASSERT(initialOffset + get_paint_offset(DRAW_PICTURE_MATRIX_PAINT, size)
+                 == fWriter.bytesWritten());
+        this->addPaintPtr(paint);
+        this->addMatrix(m);
+        this->addPicture(picture);
+    }
+    this->validate(initialOffset, size);
+}
 
+void SkPictureRecord::onDrawVertices(VertexMode vmode, int vertexCount,
+                                     const SkPoint vertices[], const SkPoint texs[],
+                                     const SkColor colors[], SkXfermode* xfer,
+                                     const uint16_t indices[], int indexCount,
+                                     const SkPaint& paint) {
     uint32_t flags = 0;
     if (texs) {
         flags |= DRAW_VERTICES_HAS_TEXS;
@@ -1433,7 +757,7 @@ void SkPictureRecord::drawVertices(VertexMode vmode, int vertexCount,
     if (indexCount > 0) {
         flags |= DRAW_VERTICES_HAS_INDICES;
     }
-    if (NULL != xfer) {
+    if (xfer) {
         SkXfermode::Mode mode;
         if (xfer->asMode(&mode) && SkXfermode::kModulate_Mode != mode) {
             flags |= DRAW_VERTICES_HAS_XFER;
@@ -1457,7 +781,7 @@ void SkPictureRecord::drawVertices(VertexMode vmode, int vertexCount,
     }
 
     size_t initialOffset = this->addDraw(DRAW_VERTICES, &size);
-    SkASSERT(initialOffset+getPaintOffset(DRAW_VERTICES, size) == fWriter.bytesWritten());
+    SkASSERT(initialOffset+get_paint_offset(DRAW_VERTICES, size) == fWriter.bytesWritten());
     this->addPaint(paint);
     this->addInt(flags);
     this->addInt(vmode);
@@ -1481,139 +805,204 @@ void SkPictureRecord::drawVertices(VertexMode vmode, int vertexCount,
     this->validate(initialOffset, size);
 }
 
-void SkPictureRecord::drawData(const void* data, size_t length) {
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    fMCMgr.call(SkMatrixClipStateMgr::kOther_CallType);
-#endif
-
-    // op + length + 'length' worth of data
-    size_t size = 2 * kUInt32Size + SkAlign4(length);
-    size_t initialOffset = this->addDraw(DRAW_DATA, &size);
-    this->addInt(SkToInt(length));
-    fWriter.writePad(data, length);
-    this->validate(initialOffset, size);
-}
-
-void SkPictureRecord::beginCommentGroup(const char* description) {
-    // op/size + length of string + \0 terminated chars
-    size_t length = strlen(description);
-    size_t size = 2 * kUInt32Size + SkAlign4(length + 1);
-    size_t initialOffset = this->addDraw(BEGIN_COMMENT_GROUP, &size);
-    fWriter.writeString(description, length);
-    this->validate(initialOffset, size);
-}
-
-void SkPictureRecord::addComment(const char* kywd, const char* value) {
-    // op/size + 2x length of string + 2x \0 terminated chars
-    size_t kywdLen = strlen(kywd);
-    size_t valueLen = strlen(value);
-    size_t size = 3 * kUInt32Size + SkAlign4(kywdLen + 1) + SkAlign4(valueLen + 1);
-    size_t initialOffset = this->addDraw(COMMENT, &size);
-    fWriter.writeString(kywd, kywdLen);
-    fWriter.writeString(value, valueLen);
-    this->validate(initialOffset, size);
-}
-
-void SkPictureRecord::endCommentGroup() {
-    // op/size
-    size_t size = 1 * kUInt32Size;
-    size_t initialOffset = this->addDraw(END_COMMENT_GROUP, &size);
-    this->validate(initialOffset, size);
-}
-
-// [op/size] [rect] [skip offset]
-static const uint32_t kPushCullOpSize = 2 * kUInt32Size + sizeof(SkRect);
-void SkPictureRecord::onPushCull(const SkRect& cullRect) {
-    size_t size = kPushCullOpSize;
-    size_t initialOffset = this->addDraw(PUSH_CULL, &size);
-    // PUSH_CULL's size should stay constant (used to rewind).
-    SkASSERT(size == kPushCullOpSize);
-
-    this->addRect(cullRect);
-    fCullOffsetStack.push(SkToU32(fWriter.bytesWritten()));
-    this->addInt(0);
-    this->validate(initialOffset, size);
-}
-
-void SkPictureRecord::onPopCull() {
-    SkASSERT(!fCullOffsetStack.isEmpty());
-
-    uint32_t cullSkipOffset = fCullOffsetStack.top();
-    fCullOffsetStack.pop();
-
-    // Collapse empty push/pop pairs.
-    if ((size_t)(cullSkipOffset + kUInt32Size) == fWriter.bytesWritten() && kBeClever) {
-        SkASSERT(fWriter.bytesWritten() >= kPushCullOpSize);
-        SkASSERT(PUSH_CULL == peek_op(&fWriter, fWriter.bytesWritten() - kPushCullOpSize));
-        fWriter.rewindToOffset(fWriter.bytesWritten() - kPushCullOpSize);
-        return;
+void SkPictureRecord::onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
+                                  const SkPoint texCoords[4], SkXfermode* xmode,
+                                  const SkPaint& paint) {
+    // op + paint index + patch 12 control points + flag + patch 4 colors + 4 texture coordinates
+    size_t size = 2 * kUInt32Size + SkPatchUtils::kNumCtrlPts * sizeof(SkPoint) + kUInt32Size;
+    uint32_t flag = 0;
+    if (colors) {
+        flag |= DRAW_VERTICES_HAS_COLORS;
+        size += SkPatchUtils::kNumCorners * sizeof(SkColor);
+    }
+    if (texCoords) {
+        flag |= DRAW_VERTICES_HAS_TEXS;
+        size += SkPatchUtils::kNumCorners * sizeof(SkPoint);
+    }
+    if (xmode) {
+        SkXfermode::Mode mode;
+        if (xmode->asMode(&mode) && SkXfermode::kModulate_Mode != mode) {
+            flag |= DRAW_VERTICES_HAS_XFER;
+            size += kUInt32Size;
+        }
     }
 
-    // op only
-    size_t size = kUInt32Size;
-    size_t initialOffset = this->addDraw(POP_CULL, &size);
+    size_t initialOffset = this->addDraw(DRAW_PATCH, &size);
+    SkASSERT(initialOffset+get_paint_offset(DRAW_PATCH, size) == fWriter.bytesWritten());
+    this->addPaint(paint);
+    this->addPatch(cubics);
+    this->addInt(flag);
 
-    // update the cull skip offset to point past this op.
-    fWriter.overwriteTAt<uint32_t>(cullSkipOffset, SkToU32(fWriter.bytesWritten()));
+    // write optional parameters
+    if (colors) {
+        fWriter.write(colors, SkPatchUtils::kNumCorners * sizeof(SkColor));
+    }
+    if (texCoords) {
+        fWriter.write(texCoords, SkPatchUtils::kNumCorners * sizeof(SkPoint));
+    }
+    if (flag & DRAW_VERTICES_HAS_XFER) {
+        SkXfermode::Mode mode = SkXfermode::kModulate_Mode;
+        xmode->asMode(&mode);
+        this->addInt(mode);
+    }
+    this->validate(initialOffset, size);
+}
 
+void SkPictureRecord::onDrawAtlas(const SkImage* atlas, const SkRSXform xform[], const SkRect tex[],
+                                  const SkColor colors[], int count, SkXfermode::Mode mode,
+                                  const SkRect* cull, const SkPaint* paint) {
+    // [op + paint-index + atlas-index + flags + count] + [xform] + [tex] + [*colors + mode] + cull
+    size_t size = 5 * kUInt32Size + count * sizeof(SkRSXform) + count * sizeof(SkRect);
+    uint32_t flags = 0;
+    if (colors) {
+        flags |= DRAW_ATLAS_HAS_COLORS;
+        size += count * sizeof(SkColor);
+        size += sizeof(uint32_t);   // xfermode::mode
+    }
+    if (cull) {
+        flags |= DRAW_ATLAS_HAS_CULL;
+        size += sizeof(SkRect);
+    }
+
+    size_t initialOffset = this->addDraw(DRAW_ATLAS, &size);
+    SkASSERT(initialOffset+get_paint_offset(DRAW_ATLAS, size) == fWriter.bytesWritten());
+    this->addPaintPtr(paint);
+    this->addImage(atlas);
+    this->addInt(flags);
+    this->addInt(count);
+    fWriter.write(xform, count * sizeof(SkRSXform));
+    fWriter.write(tex, count * sizeof(SkRect));
+
+    // write optional parameters
+    if (colors) {
+        fWriter.write(colors, count * sizeof(SkColor));
+        this->addInt(mode);
+    }
+    if (cull) {
+        fWriter.write(cull, sizeof(SkRect));
+    }
     this->validate(initialOffset, size);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkSurface* SkPictureRecord::onNewSurface(const SkImageInfo& info) {
-    return NULL;
+SkSurface* SkPictureRecord::onNewSurface(const SkImageInfo& info, const SkSurfaceProps&) {
+    return nullptr;
 }
 
-int SkPictureRecord::addBitmap(const SkBitmap& bitmap) {
-    const int index = fBitmapHeap->insert(bitmap);
-    // In debug builds, a bad return value from insert() will crash, allowing for debugging. In
-    // release builds, the invalid value will be recorded so that the reader will know that there
-    // was a problem.
-    SkASSERT(index != SkBitmapHeap::INVALID_SLOT);
-    this->addInt(index);
-    return index;
+// If we already have a stored, can we reuse it instead of also storing b?
+static bool equivalent(const SkBitmap& a, const SkBitmap& b) {
+    if (a.info() != b.info() || a.pixelRefOrigin() != b.pixelRefOrigin()) {
+        // Requiring a.info() == b.info() may be overkill in some cases (alphatype mismatch),
+        // but it sure makes things easier to reason about below.
+        return false;
+    }
+    if (a.pixelRef() == b.pixelRef()) {
+        return true;  // Same shape and same pixels -> same bitmap.
+    }
+
+    // From here down we're going to have to look at the bitmap data, so we require pixelRefs().
+    if (!a.pixelRef() || !b.pixelRef()) {
+        return false;
+    }
+
+    // If the bitmaps have encoded data, check first before locking pixels so they don't decode.
+    SkAutoTUnref<SkData> encA(a.pixelRef()->refEncodedData()),
+                         encB(b.pixelRef()->refEncodedData());
+    if (encA && encB) {
+        return encA->equals(encB);
+    } else if (encA || encB) {
+        return false;   // One has encoded data but the other does not.
+    }
+
+    // As a last resort, we have to look at the pixels.  This will read back textures.
+    SkAutoLockPixels al(a), bl(b);
+    const char* ap = (const char*)a.getPixels();
+    const char* bp = (const char*)b.getPixels();
+    if (ap && bp) {
+        // We check row by row; row bytes might differ.
+        SkASSERT(a.info() == b.info());          // We checked this above.
+        SkASSERT(a.info().bytesPerPixel() > 0);  // If we have pixelRefs, this better be true.
+        const SkImageInfo info = a.info();
+        const size_t bytesToCompare = info.width() * info.bytesPerPixel();
+        for (int row = 0; row < info.height(); row++) {
+            if (0 != memcmp(ap, bp, bytesToCompare)) {
+                return false;
+            }
+            ap += a.rowBytes();
+            bp += b.rowBytes();
+        }
+        return true;
+    }
+    return false;  // Couldn't get pixels for both bitmaps.
+}
+
+void SkPictureRecord::addBitmap(const SkBitmap& bitmap) {
+    // First see if we already have this bitmap.  This deduplication should really
+    // only be important for our tests, where bitmaps tend not to be tagged immutable.
+    // In Chrome (and hopefully Android?) they're typically immutable.
+    for (int i = 0; i < fBitmaps.count(); i++) {
+        if (equivalent(fBitmaps[i], bitmap)) {
+            this->addInt(i);  // Unlike the rest, bitmap indices are 0-based.
+            return;
+        }
+    }
+    // Don't have it.  We'll add it to our list, making sure it's tagged as immutable.
+    if (bitmap.isImmutable()) {
+        // Shallow copies of bitmaps are cheap, so immutable == fast.
+        fBitmaps.push_back(bitmap);
+    } else {
+        // If you see this block on a memory profile, it's a good opportunity to reduce RAM usage.
+        SkBitmap copy;
+        bitmap.copyTo(&copy);
+        copy.setImmutable();
+        fBitmaps.push_back(copy);
+    }
+    this->addInt(fBitmaps.count()-1);  // Remember, 0-based.
+}
+
+void SkPictureRecord::addImage(const SkImage* image) {
+    int index = fImageRefs.find(image);
+    if (index >= 0) {
+        this->addInt(index);
+    } else {
+        *fImageRefs.append() = SkRef(image);
+        this->addInt(fImageRefs.count()-1);
+    }
 }
 
 void SkPictureRecord::addMatrix(const SkMatrix& matrix) {
     fWriter.writeMatrix(matrix);
 }
 
-const SkFlatData* SkPictureRecord::getFlatPaintData(const SkPaint& paint) {
-    return fPaints.findAndReturnFlat(paint);
-}
+void SkPictureRecord::addPaintPtr(const SkPaint* paint) {
+    fContentInfo.onAddPaintPtr(paint);
 
-const SkFlatData* SkPictureRecord::addPaintPtr(const SkPaint* paint) {
-    if (NULL != paint && NULL != paint->getPathEffect()) {
-        fContentInfo.incPaintWithPathEffectUses();
+    if (paint) {
+        fPaints.push_back(*paint);
+        this->addInt(fPaints.count());
+    } else {
+        this->addInt(0);
     }
-
-    const SkFlatData* data = paint ? getFlatPaintData(*paint) : NULL;
-    this->addFlatPaint(data);
-    return data;
-}
-
-void SkPictureRecord::addFlatPaint(const SkFlatData* flatPaint) {
-    int index = flatPaint ? flatPaint->index() : 0;
-    this->addInt(index);
 }
 
 int SkPictureRecord::addPathToHeap(const SkPath& path) {
-    if (NULL == fPathHeap) {
-        fPathHeap.reset(SkNEW(SkPathHeap));
+    if (int* n = fPaths.find(path)) {
+        return *n;
     }
-#ifdef SK_DEDUP_PICTURE_PATHS
-    return fPathHeap->insert(path);
-#else
-    return fPathHeap->append(path);
-#endif
+    int n = fPaths.count() + 1;  // 0 is reserved for null / error.
+    fPaths.set(path, n);
+    return n;
 }
 
 void SkPictureRecord::addPath(const SkPath& path) {
     this->addInt(this->addPathToHeap(path));
 }
 
+void SkPictureRecord::addPatch(const SkPoint cubics[12]) {
+    fWriter.write(cubics, SkPatchUtils::kNumCtrlPts * sizeof(SkPoint));
+}
+
 void SkPictureRecord::addPicture(const SkPicture* picture) {
     int index = fPictureRefs.find(picture);
     if (index < 0) {    // not found
@@ -1626,22 +1015,11 @@ void SkPictureRecord::addPicture(const SkPicture* picture) {
 }
 
 void SkPictureRecord::addPoint(const SkPoint& point) {
-#ifdef SK_DEBUG_SIZE
-    size_t start = fWriter.bytesWritten();
-#endif
     fWriter.writePoint(point);
-#ifdef SK_DEBUG_SIZE
-    fPointBytes += fWriter.bytesWritten() - start;
-    fPointWrites++;
-#endif
 }
 
 void SkPictureRecord::addPoints(const SkPoint pts[], int count) {
     fWriter.writeMul4(pts, count * sizeof(SkPoint));
-#ifdef SK_DEBUG_SIZE
-    fPointBytes += count * sizeof(SkPoint);
-    fPointWrites++;
-#endif
 }
 
 void SkPictureRecord::addNoOp() {
@@ -1650,18 +1028,11 @@ void SkPictureRecord::addNoOp() {
 }
 
 void SkPictureRecord::addRect(const SkRect& rect) {
-#ifdef SK_DEBUG_SIZE
-    size_t start = fWriter.bytesWritten();
-#endif
     fWriter.writeRect(rect);
-#ifdef SK_DEBUG_SIZE
-    fRectBytes += fWriter.bytesWritten() - start;
-    fRectWrites++;
-#endif
 }
 
 void SkPictureRecord::addRectPtr(const SkRect* rect) {
-    if (fWriter.writeBool(rect != NULL)) {
+    if (fWriter.writeBool(rect != nullptr)) {
         fWriter.writeRect(*rect);
     }
 }
@@ -1671,7 +1042,7 @@ void SkPictureRecord::addIRect(const SkIRect& rect) {
 }
 
 void SkPictureRecord::addIRectPtr(const SkIRect* rect) {
-    if (fWriter.writeBool(rect != NULL)) {
+    if (fWriter.writeBool(rect != nullptr)) {
         *(SkIRect*)fWriter.reserve(sizeof(SkIRect)) = *rect;
     }
 }
@@ -1685,147 +1056,18 @@ void SkPictureRecord::addRegion(const SkRegion& region) {
 }
 
 void SkPictureRecord::addText(const void* text, size_t byteLength) {
-#ifdef SK_DEBUG_SIZE
-    size_t start = fWriter.bytesWritten();
-#endif
+    fContentInfo.onDrawText();
     addInt(SkToInt(byteLength));
     fWriter.writePad(text, byteLength);
-#ifdef SK_DEBUG_SIZE
-    fTextBytes += fWriter.bytesWritten() - start;
-    fTextWrites++;
-#endif
+}
+
+void SkPictureRecord::addTextBlob(const SkTextBlob *blob) {
+    int index = fTextBlobRefs.count();
+    *fTextBlobRefs.append() = blob;
+    blob->ref();
+    // follow the convention of recording a 1-based index
+    this->addInt(index + 1);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef SK_DEBUG_SIZE
-size_t SkPictureRecord::size() const {
-    size_t result = 0;
-    size_t sizeData;
-    bitmaps(&sizeData);
-    result += sizeData;
-    matrices(&sizeData);
-    result += sizeData;
-    paints(&sizeData);
-    result += sizeData;
-    paths(&sizeData);
-    result += sizeData;
-    pictures(&sizeData);
-    result += sizeData;
-    regions(&sizeData);
-    result += sizeData;
-    result += streamlen();
-    return result;
-}
-
-int SkPictureRecord::bitmaps(size_t* size) const {
-    size_t result = 0;
-    int count = fBitmaps.count();
-    for (int index = 0; index < count; index++)
-        result += sizeof(fBitmaps[index]) + fBitmaps[index]->size();
-    *size = result;
-    return count;
-}
-
-int SkPictureRecord::matrices(size_t* size) const {
-    int count = fMatrices.count();
-    *size = sizeof(fMatrices[0]) * count;
-    return count;
-}
-
-int SkPictureRecord::paints(size_t* size) const {
-    size_t result = 0;
-    int count = fPaints.count();
-    for (int index = 0; index < count; index++)
-        result += sizeof(fPaints[index]) + fPaints[index]->size();
-    *size = result;
-    return count;
-}
-
-int SkPictureRecord::paths(size_t* size) const {
-    size_t result = 0;
-    int count = fPaths.count();
-    for (int index = 0; index < count; index++)
-        result += sizeof(fPaths[index]) + fPaths[index]->size();
-    *size = result;
-    return count;
-}
-
-int SkPictureRecord::regions(size_t* size) const {
-    size_t result = 0;
-    int count = fRegions.count();
-    for (int index = 0; index < count; index++)
-        result += sizeof(fRegions[index]) + fRegions[index]->size();
-    *size = result;
-    return count;
-}
-
-size_t SkPictureRecord::streamlen() const {
-    return fWriter.size();
-}
-#endif
-
-#ifdef SK_DEBUG_VALIDATE
-void SkPictureRecord::validate(uint32_t initialOffset, uint32_t size) const {
-    SkASSERT(fWriter.size() == initialOffset + size);
-
-    validateBitmaps();
-    validateMatrices();
-    validatePaints();
-    validatePaths();
-    validateRegions();
-}
-
-void SkPictureRecord::validateBitmaps() const {
-    int count = fBitmapHeap->count();
-    SkASSERT((unsigned) count < 0x1000);
-    for (int index = 0; index < count; index++) {
-        const SkBitmap* bitPtr = fBitmapHeap->getBitmap(index);
-        SkASSERT(bitPtr);
-        bitPtr->validate();
-    }
-}
-
-void SkPictureRecord::validateMatrices() const {
-    int count = fMatrices.count();
-    SkASSERT((unsigned) count < 0x1000);
-    for (int index = 0; index < count; index++) {
-        const SkFlatData* matrix = fMatrices[index];
-        SkASSERT(matrix);
-//        matrix->validate();
-    }
-}
-
-void SkPictureRecord::validatePaints() const {
-    int count = fPaints.count();
-    SkASSERT((unsigned) count < 0x1000);
-    for (int index = 0; index < count; index++) {
-        const SkFlatData* paint = fPaints[index];
-        SkASSERT(paint);
-//            paint->validate();
-    }
-}
-
-void SkPictureRecord::validatePaths() const {
-    if (NULL == fPathHeap) {
-        return;
-    }
-
-    int count = fPathHeap->count();
-    SkASSERT((unsigned) count < 0x1000);
-    for (int index = 0; index < count; index++) {
-        const SkPath& path = (*fPathHeap)[index];
-        path.validate();
-    }
-}
-
-void SkPictureRecord::validateRegions() const {
-    int count = fRegions.count();
-    SkASSERT((unsigned) count < 0x1000);
-    for (int index = 0; index < count; index++) {
-        const SkFlatData* region = fRegions[index];
-        SkASSERT(region);
-//        region->validate();
-    }
-}
-#endif
diff --git a/gfx/skia/skia/src/core/SkPictureRecord.h b/gfx/skia/skia/src/core/SkPictureRecord.h
index a1b52fb19537..7e21fab11208 100644
--- a/gfx/skia/skia/src/core/SkPictureRecord.h
+++ b/gfx/skia/skia/src/core/SkPictureRecord.h
@@ -10,19 +10,13 @@
 
 #include "SkCanvas.h"
 #include "SkFlattenable.h"
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-#include "SkMatrixClipStateMgr.h"
-#endif
-#include "SkPathHeap.h"
 #include "SkPicture.h"
 #include "SkPictureData.h"
-#include "SkPictureFlat.h"
-#include "SkTemplates.h"
+#include "SkTArray.h"
+#include "SkTDArray.h"
+#include "SkTHash.h"
 #include "SkWriter32.h"
 
-class SkBBoxHierarchy;
-class SkPictureStateTree;
-
 // These macros help with packing and unpacking a single byte value and
 // a 3 byte value into/out of a uint32_t
 #define MASK_24 0x00FFFFFF
@@ -37,43 +31,18 @@ public:
     SkPictureRecord(const SkISize& dimensions, uint32_t recordFlags);
     virtual ~SkPictureRecord();
 
-    virtual void clear(SkColor) SK_OVERRIDE;
-    virtual void drawPaint(const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawPoints(PointMode, size_t count, const SkPoint pts[],
-                            const SkPaint&) SK_OVERRIDE;
-    virtual void drawOval(const SkRect&, const SkPaint&) SK_OVERRIDE;
-    virtual void drawRect(const SkRect&, const SkPaint&) SK_OVERRIDE;
-    virtual void drawRRect(const SkRRect&, const SkPaint&) SK_OVERRIDE;
-    virtual void drawPath(const SkPath& path, const SkPaint&) SK_OVERRIDE;
-    virtual void drawBitmap(const SkBitmap&, SkScalar left, SkScalar top,
-                            const SkPaint*) SK_OVERRIDE;
-    virtual void drawBitmapRectToRect(const SkBitmap&, const SkRect* src,
-                                      const SkRect& dst, const SkPaint* paint,
-                                      DrawBitmapRectFlags flags) SK_OVERRIDE;
-    virtual void drawBitmapMatrix(const SkBitmap&, const SkMatrix&,
-                                  const SkPaint*) SK_OVERRIDE;
-    virtual void drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
-                                const SkRect& dst, const SkPaint*) SK_OVERRIDE;
-    virtual void drawSprite(const SkBitmap&, int left, int top,
-                            const SkPaint*) SK_OVERRIDE;
-    virtual void drawVertices(VertexMode, int vertexCount,
-                          const SkPoint vertices[], const SkPoint texs[],
-                          const SkColor colors[], SkXfermode*,
-                          const uint16_t indices[], int indexCount,
-                              const SkPaint&) SK_OVERRIDE;
-    virtual void drawData(const void*, size_t) SK_OVERRIDE;
-    virtual void beginCommentGroup(const char* description) SK_OVERRIDE;
-    virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE;
-    virtual void endCommentGroup() SK_OVERRIDE;
-    virtual bool isDrawingToLayer() const SK_OVERRIDE;
-
-    void addFontMetricsTopBottom(const SkPaint& paint, const SkFlatData&,
-                                 SkScalar minY, SkScalar maxY);
-
     const SkTDArray<const SkPicture* >& getPictureRefs() const {
         return fPictureRefs;
     }
 
+    const SkTDArray<const SkTextBlob* >& getTextBlobRefs() const {
+        return fTextBlobRefs;
+    }
+
+    const SkTDArray<const SkImage* >& getImageRefs() const {
+        return fImageRefs;
+    }
+
     SkData* opData(bool deepCopy) const {
         this->validate(fWriter.bytesWritten(), 0);
 
@@ -88,10 +57,6 @@ public:
         return fWriter.snapshotAsData();
     }
 
-    const SkPathHeap* pathHeap() const {
-        return fPathHeap.get();
-    }
-
     const SkPictureContentInfo& contentInfo() const {
         return fContentInfo;
     }
@@ -107,10 +72,6 @@ public:
     void beginRecording();
     void endRecording();
 
-    void internalOnly_EnableOpts(bool optsEnabled) {
-        fOptsEnabled = optsEnabled;
-    }
-
 protected:
     void addNoOp();
 
@@ -119,13 +80,7 @@ private:
     size_t recordRestoreOffsetPlaceholder(SkRegion::Op);
     void fillRestoreOffsetPlaceholdersForCurrentStackLevel(uint32_t restoreOffset);
 
-#ifndef SK_COLLAPSE_MATRIX_CLIP_STATE
     SkTDArray<int32_t> fRestoreOffsetStack;
-    int fFirstSavedLayerIndex;
-    enum {
-        kNoSavedLayerIndex = -1
-    };
-#endif
 
     SkTDArray<uint32_t> fCullOffsetStack;
 
@@ -145,10 +100,7 @@ private:
         size_t offset = fWriter.bytesWritten();
 
         this->predrawNotify();
-
-    #ifdef SK_DEBUG_TRACE
-        SkDebugf("add %s\n", DrawTypeToString(drawType));
-    #endif
+        fContentInfo.addOperation();
 
         SkASSERT(0 != *size);
         SkASSERT(((uint8_t) drawType) == drawType);
@@ -171,12 +123,12 @@ private:
         fWriter.writeScalar(scalar);
     }
 
-    // The command at 'offset' in the skp uses the specified bitmap
-    int addBitmap(const SkBitmap& bitmap);
+    void addBitmap(const SkBitmap& bitmap);
+    void addImage(const SkImage*);
     void addMatrix(const SkMatrix& matrix);
-    const SkFlatData* addPaint(const SkPaint& paint) { return this->addPaintPtr(&paint); }
-    const SkFlatData* addPaintPtr(const SkPaint* paint);
-    void addFlatPaint(const SkFlatData* flatPaint);
+    void addPaint(const SkPaint& paint) { this->addPaintPtr(&paint); }
+    void addPaintPtr(const SkPaint* paint);
+    void addPatch(const SkPoint cubics[12]);
     void addPath(const SkPath& path);
     void addPicture(const SkPicture* picture);
     void addPoint(const SkPoint& point);
@@ -188,98 +140,71 @@ private:
     void addRRect(const SkRRect&);
     void addRegion(const SkRegion& region);
     void addText(const void* text, size_t byteLength);
+    void addTextBlob(const SkTextBlob* blob);
 
     int find(const SkBitmap& bitmap);
 
-#ifdef SK_DEBUG_DUMP
-public:
-    void dumpMatrices();
-    void dumpPaints();
-#endif
-
-#ifdef SK_DEBUG_SIZE
-public:
-    size_t size() const;
-    int bitmaps(size_t* size) const;
-    int matrices(size_t* size) const;
-    int paints(size_t* size) const;
-    int paths(size_t* size) const;
-    int regions(size_t* size) const;
-    size_t streamlen() const;
-
-    size_t fPointBytes, fRectBytes, fTextBytes;
-    int fPointWrites, fRectWrites, fTextWrites;
-#endif
-
-#ifdef SK_DEBUG_VALIDATE
-public:
-    void validate(size_t initialOffset, uint32_t size) const;
-private:
-    void validateBitmaps() const;
-    void validateMatrices() const;
-    void validatePaints() const;
-    void validatePaths() const;
-    void validateRegions() const;
-#else
-public:
+protected:
     void validate(size_t initialOffset, size_t size) const {
         SkASSERT(fWriter.bytesWritten() == initialOffset + size);
     }
-#endif
 
-protected:
-    virtual SkSurface* onNewSurface(const SkImageInfo&) SK_OVERRIDE;
-    const void* onPeekPixels(SkImageInfo*, size_t*) SK_OVERRIDE {
-        return NULL;
-    }
+    SkSurface* onNewSurface(const SkImageInfo&, const SkSurfaceProps&) override;
+    bool onPeekPixels(SkPixmap*) override { return false; }
 
-    virtual void willSave() SK_OVERRIDE;
-    virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE;
-    virtual void willRestore() SK_OVERRIDE;
+    void willSave() override;
+    SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) override;
+    void willRestore() override;
 
-    virtual void didConcat(const SkMatrix&) SK_OVERRIDE;
-    virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE;
+    void didConcat(const SkMatrix&) override;
+    void didSetMatrix(const SkMatrix&) override;
 
-    virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE;
-    virtual void onPushCull(const SkRect&) SK_OVERRIDE;
-    virtual void onPopCull() SK_OVERRIDE;
+    void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override;
 
-    virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
-                            const SkPaint&) SK_OVERRIDE;
-    virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
-                               const SkPaint&) SK_OVERRIDE;
-    virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
-                                SkScalar constY, const SkPaint&) SK_OVERRIDE;
-    virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
-                                  const SkMatrix* matrix, const SkPaint&) SK_OVERRIDE;
+    void onDrawText(const void* text, size_t, SkScalar x, SkScalar y, const SkPaint&) override;
+    void onDrawPosText(const void* text, size_t, const SkPoint pos[], const SkPaint&) override;
+    void onDrawPosTextH(const void* text, size_t, const SkScalar xpos[], SkScalar constY,
+                        const SkPaint&) override;
+    void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
+                                  const SkMatrix* matrix, const SkPaint&) override;
+    void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
+                                const SkPaint& paint) override;
 
-    virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE;
+    void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
+                             const SkPoint texCoords[4], SkXfermode* xmode,
+                             const SkPaint& paint) override;
+    void onDrawAtlas(const SkImage*, const SkRSXform[], const SkRect[], const SkColor[], int,
+                     SkXfermode::Mode, const SkRect*, const SkPaint*) override;
 
-    virtual void onDrawPicture(const SkPicture* picture) SK_OVERRIDE;
+    void onDrawPaint(const SkPaint&) override;
+    void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override;
+    void onDrawRect(const SkRect&, const SkPaint&) override;
+    void onDrawOval(const SkRect&, const SkPaint&) override;
+    void onDrawRRect(const SkRRect&, const SkPaint&) override;
+    void onDrawPath(const SkPath&, const SkPaint&) override;
+    void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) override;
+    void onDrawBitmapRect(const SkBitmap&, const SkRect* src, const SkRect& dst, const SkPaint*,
+                          SrcRectConstraint) override;
+    void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) override;
+    void onDrawImageRect(const SkImage*, const SkRect* src, const SkRect& dst,
+                         const SkPaint*, SrcRectConstraint) override;
+    void onDrawImageNine(const SkImage*, const SkIRect& center, const SkRect& dst,
+                         const SkPaint*) override;
+    void onDrawBitmapNine(const SkBitmap&, const SkIRect& center, const SkRect& dst,
+                          const SkPaint*) override;
+    void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) override;
+    void onDrawVertices(VertexMode vmode, int vertexCount,
+                        const SkPoint vertices[], const SkPoint texs[],
+                        const SkColor colors[], SkXfermode* xmode,
+                        const uint16_t indices[], int indexCount,
+                        const SkPaint&) override;
 
-    // Return fontmetrics.fTop,fBottom in topbot[0,1], after they have been
-    // tweaked by paint.computeFastBounds().
-    static void ComputeFontMetricsTopBottom(const SkPaint& paint, SkScalar topbot[2]);
+    void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) override;
+    void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) override;
+    void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) override;
+    void onClipRegion(const SkRegion&, SkRegion::Op) override;
 
-    // Make sure that flat has fTopBot written.
-    static void WriteTopBot(const SkPaint& paint, const SkFlatData& flat) {
-        if (!flat.isTopBotWritten()) {
-            ComputeFontMetricsTopBottom(paint, flat.writableTopBot());
-            SkASSERT(flat.isTopBotWritten());
-        }
-    }
-    // Will return a cached version when possible.
-    const SkFlatData* getFlatPaintData(const SkPaint& paint);
-    /**
-     * SkBBoxRecord::drawPosTextH gets a flat paint and uses it,
-     * then it calls this, using the extra parameter, to avoid duplication.
-     */
-    void drawPosTextHImpl(const void* text, size_t byteLength,
-                          const SkScalar xpos[], SkScalar constY,
-                          const SkPaint& paint, const SkFlatData* flatPaintData);
+    void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
 
     int addPathToHeap(const SkPath& path);  // does not write to ops stream
 
@@ -297,40 +222,28 @@ protected:
     void recordSaveLayer(const SkRect* bounds, const SkPaint* paint, SaveFlags flags);
     void recordRestore(bool fillInSkips = true);
 
-    // These are set to NULL in our constructor, but may be changed by
-    // subclasses, in which case they will be SkSafeUnref'd in our destructor.
-    SkBBoxHierarchy* fBoundingHierarchy;
-    SkPictureStateTree* fStateTree;
-
-    // Allocated in the constructor and managed by this class.
-    SkBitmapHeap* fBitmapHeap;
-
 private:
-    friend class MatrixClipState; // for access to *Impl methods
-    friend class SkMatrixClipStateMgr; // for access to *Impl methods
-
     SkPictureContentInfo fContentInfo;
-    SkAutoTUnref<SkPathHeap> fPathHeap;
 
-    SkChunkFlatController fFlattenableHeap;
+    SkTArray<SkBitmap> fBitmaps;
+    SkTArray<SkPaint>  fPaints;
 
-    SkPaintDictionary fPaints;
+    struct PathHash {
+        uint32_t operator()(const SkPath& p) { return p.getGenerationID(); }
+    };
+    SkTHashMap<SkPath, int, PathHash> fPaths;
 
     SkWriter32 fWriter;
 
     // we ref each item in these arrays
-    SkTDArray<const SkPicture*> fPictureRefs;
+    SkTDArray<const SkImage*>    fImageRefs;
+    SkTDArray<const SkPicture*>  fPictureRefs;
+    SkTDArray<const SkTextBlob*> fTextBlobRefs;
 
     uint32_t fRecordFlags;
-    bool     fOptsEnabled;
     int      fInitialSaveCount;
 
     friend class SkPictureData;   // for SkPictureData's SkPictureRecord-based constructor
-    friend class SkPictureTester; // for unit testing
-
-#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
-    SkMatrixClipStateMgr fMCMgr;
-#endif
 
     typedef SkCanvas INHERITED;
 };
diff --git a/gfx/skia/skia/src/core/SkPictureRecorder.cpp b/gfx/skia/skia/src/core/SkPictureRecorder.cpp
index 798514500179..62fa0e968fa8 100644
--- a/gfx/skia/skia/src/core/SkPictureRecorder.cpp
+++ b/gfx/skia/skia/src/core/SkPictureRecorder.cpp
@@ -5,90 +5,199 @@
  * found in the LICENSE file.
  */
 
-#include "SkBBoxHierarchyRecord.h"
-#include "SkPictureRecord.h"
+#include "SkBigPicture.h"
+#include "SkData.h"
+#include "SkDrawable.h"
+#include "SkLayerInfo.h"
 #include "SkPictureRecorder.h"
+#include "SkPictureUtils.h"
 #include "SkRecord.h"
 #include "SkRecordDraw.h"
+#include "SkRecordOpts.h"
 #include "SkRecorder.h"
 #include "SkTypes.h"
 
-SkPictureRecorder::SkPictureRecorder() {}
+SkPictureRecorder::SkPictureRecorder() {
+    fActivelyRecording = false;
+    fRecorder.reset(new SkRecorder(nullptr, SkRect::MakeWH(0, 0), &fMiniRecorder));
+}
 
 SkPictureRecorder::~SkPictureRecorder() {}
 
-SkCanvas* SkPictureRecorder::beginRecording(int width, int height,
-                                            SkBBHFactory* bbhFactory /* = NULL */,
+SkCanvas* SkPictureRecorder::beginRecording(const SkRect& cullRect,
+                                            SkBBHFactory* bbhFactory /* = nullptr */,
                                             uint32_t recordFlags /* = 0 */) {
-    fWidth = width;
-    fHeight = height;
+    fCullRect = cullRect;
+    fFlags = recordFlags;
 
-    const SkISize size = SkISize::Make(width, height);
-
-    if (NULL != bbhFactory) {
-        SkAutoTUnref<SkBBoxHierarchy> tree((*bbhFactory)(width, height));
-        SkASSERT(NULL != tree);
-        fPictureRecord.reset(SkNEW_ARGS(SkBBoxHierarchyRecord, (size, recordFlags, tree.get())));
-    } else {
-        fPictureRecord.reset(SkNEW_ARGS(SkPictureRecord, (size, recordFlags)));
+    if (bbhFactory) {
+        fBBH.reset((*bbhFactory)(cullRect));
+        SkASSERT(fBBH.get());
     }
 
-    fPictureRecord->beginRecording();
-    return this->getRecordingCanvas();
-}
-
-SkCanvas* SkPictureRecorder::EXPERIMENTAL_beginRecording(int width, int height,
-                                                         SkBBHFactory* bbhFactory /* = NULL */) {
-    fWidth = width;
-    fHeight = height;
-
-    // TODO: plumb bbhFactory through
-    fRecord.reset(SkNEW(SkRecord));
-    fRecorder.reset(SkNEW_ARGS(SkRecorder, (fRecord.get(), width, height)));
+    if (!fRecord) {
+        fRecord.reset(new SkRecord);
+    }
+    SkRecorder::DrawPictureMode dpm = (recordFlags & kPlaybackDrawPicture_RecordFlag)
+        ? SkRecorder::Playback_DrawPictureMode
+        : SkRecorder::Record_DrawPictureMode;
+    fRecorder->reset(fRecord.get(), cullRect, dpm, &fMiniRecorder);
+    fActivelyRecording = true;
     return this->getRecordingCanvas();
 }
 
 SkCanvas* SkPictureRecorder::getRecordingCanvas() {
-    if (NULL != fRecorder.get()) {
-        return fRecorder.get();
-    }
-    return fPictureRecord.get();
+    return fActivelyRecording ? fRecorder.get() : nullptr;
 }
 
-SkPicture* SkPictureRecorder::endRecording() {
-    SkPicture* picture = NULL;
+SkPicture* SkPictureRecorder::endRecordingAsPicture() {
+    fActivelyRecording = false;
+    fRecorder->restoreToCount(1);  // If we were missing any restores, add them now.
 
-    if (NULL != fRecord.get()) {
-        picture = SkNEW_ARGS(SkPicture, (fWidth, fHeight, fRecord.detach()));
+    if (fRecord->count() == 0) {
+        return fMiniRecorder.detachAsPicture(fCullRect);
     }
 
-    if (NULL != fPictureRecord.get()) {
-        fPictureRecord->endRecording();
-        const bool deepCopyOps = false;
-        picture = SkNEW_ARGS(SkPicture, (fWidth, fHeight, *fPictureRecord.get(), deepCopyOps));
+    // TODO: delay as much of this work until just before first playback?
+    SkRecordOptimize(fRecord);
+
+    SkAutoTUnref<SkLayerInfo> saveLayerData;
+
+    if (fBBH && (fFlags & kComputeSaveLayerInfo_RecordFlag)) {
+        saveLayerData.reset(new SkLayerInfo);
     }
 
-    return picture;
+    SkDrawableList* drawableList = fRecorder->getDrawableList();
+    SkBigPicture::SnapshotArray* pictList =
+        drawableList ? drawableList->newDrawableSnapshot() : nullptr;
+
+    if (fBBH.get()) {
+        SkAutoTMalloc<SkRect> bounds(fRecord->count());
+        if (saveLayerData) {
+            SkRecordComputeLayers(fCullRect, *fRecord, bounds, pictList, saveLayerData);
+        } else {
+            SkRecordFillBounds(fCullRect, *fRecord, bounds);
+        }
+        fBBH->insert(bounds, fRecord->count());
+
+        // Now that we've calculated content bounds, we can update fCullRect, often trimming it.
+        // TODO: get updated fCullRect from bounds instead of forcing the BBH to return it?
+        SkRect bbhBound = fBBH->getRootBound();
+        SkASSERT((bbhBound.isEmpty() || fCullRect.contains(bbhBound))
+            || (bbhBound.isEmpty() && fCullRect.isEmpty()));
+        fCullRect = bbhBound;
+    }
+
+    size_t subPictureBytes = fRecorder->approxBytesUsedBySubPictures();
+    for (int i = 0; pictList && i < pictList->count(); i++) {
+        subPictureBytes += SkPictureUtils::ApproximateBytesUsed(pictList->begin()[i]);
+    }
+    return new SkBigPicture(fCullRect, fRecord.detach(), pictList, fBBH.detach(),
+                            saveLayerData.detach(), subPictureBytes);
 }
 
-void SkPictureRecorder::internalOnly_EnableOpts(bool enableOpts) {
-    if (NULL != fPictureRecord.get()) {
-        fPictureRecord->internalOnly_EnableOpts(enableOpts);
-    }
+SkPicture* SkPictureRecorder::endRecordingAsPicture(const SkRect& cullRect) {
+    fCullRect = cullRect;
+    return this->endRecordingAsPicture();
 }
 
+
 void SkPictureRecorder::partialReplay(SkCanvas* canvas) const {
-    if (NULL == canvas) {
+    if (nullptr == canvas) {
         return;
     }
 
-    if (NULL != fRecord.get()) {
-        SkRecordDraw(*fRecord, canvas);
+    int drawableCount = 0;
+    SkDrawable* const* drawables = nullptr;
+    SkDrawableList* drawableList = fRecorder->getDrawableList();
+    if (drawableList) {
+        drawableCount = drawableList->count();
+        drawables = drawableList->begin();
+    }
+    SkRecordDraw(*fRecord, canvas, nullptr, drawables, drawableCount, nullptr/*bbh*/, nullptr/*callback*/);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+class SkRecordedDrawable : public SkDrawable {
+    SkAutoTUnref<SkRecord>          fRecord;
+    SkAutoTUnref<SkBBoxHierarchy>   fBBH;
+    SkAutoTDelete<SkDrawableList>   fDrawableList;
+    const SkRect                    fBounds;
+    const bool                      fDoSaveLayerInfo;
+
+public:
+    SkRecordedDrawable(SkRecord* record, SkBBoxHierarchy* bbh, SkDrawableList* drawableList,
+                       const SkRect& bounds, bool doSaveLayerInfo)
+        : fRecord(SkRef(record))
+        , fBBH(SkSafeRef(bbh))
+        , fDrawableList(drawableList)   // we take ownership
+        , fBounds(bounds)
+        , fDoSaveLayerInfo(doSaveLayerInfo)
+    {}
+
+protected:
+    SkRect onGetBounds() override { return fBounds; }
+
+    void onDraw(SkCanvas* canvas) override {
+        SkDrawable* const* drawables = nullptr;
+        int drawableCount = 0;
+        if (fDrawableList) {
+            drawables = fDrawableList->begin();
+            drawableCount = fDrawableList->count();
+        }
+        SkRecordDraw(*fRecord, canvas, nullptr, drawables, drawableCount, fBBH, nullptr/*callback*/);
     }
 
-    if (NULL != fPictureRecord.get()) {
-        const bool deepCopyOps = true;
-        SkPicture picture(fWidth, fHeight, *fPictureRecord.get(), deepCopyOps);
-        picture.draw(canvas);
+    SkPicture* onNewPictureSnapshot() override {
+        SkBigPicture::SnapshotArray* pictList = nullptr;
+        if (fDrawableList) {
+            // TODO: should we plumb-down the BBHFactory and recordFlags from our host
+            //       PictureRecorder?
+            pictList = fDrawableList->newDrawableSnapshot();
+        }
+
+        SkAutoTUnref<SkLayerInfo> saveLayerData;
+        if (fBBH && fDoSaveLayerInfo) {
+            // TODO: can we avoid work by not allocating / filling these bounds?
+            SkAutoTMalloc<SkRect> scratchBounds(fRecord->count());
+            saveLayerData.reset(new SkLayerInfo);
+
+            SkRecordComputeLayers(fBounds, *fRecord, scratchBounds, pictList, saveLayerData);
+        }
+
+        size_t subPictureBytes = 0;
+        for (int i = 0; pictList && i < pictList->count(); i++) {
+            subPictureBytes += SkPictureUtils::ApproximateBytesUsed(pictList->begin()[i]);
+        }
+        // SkBigPicture will take ownership of a ref on both fRecord and fBBH.
+        // We're not willing to give up our ownership, so we must ref them for SkPicture.
+        return new SkBigPicture(fBounds, SkRef(fRecord.get()), pictList, SkSafeRef(fBBH.get()),
+                                saveLayerData.detach(), subPictureBytes);
     }
+};
+
+SkDrawable* SkPictureRecorder::endRecordingAsDrawable() {
+    fActivelyRecording = false;
+    fRecorder->flushMiniRecorder();
+    fRecorder->restoreToCount(1);  // If we were missing any restores, add them now.
+
+    // TODO: delay as much of this work until just before first playback?
+    SkRecordOptimize(fRecord);
+
+    if (fBBH.get()) {
+        SkAutoTMalloc<SkRect> bounds(fRecord->count());
+        SkRecordFillBounds(fCullRect, *fRecord, bounds);
+        fBBH->insert(bounds, fRecord->count());
+    }
+
+    SkDrawable* drawable =
+            new SkRecordedDrawable(fRecord, fBBH, fRecorder->detachDrawableList(), fCullRect,
+                                   SkToBool(fFlags & kComputeSaveLayerInfo_RecordFlag));
+
+    // release our refs now, so only the drawable will be the owner.
+    fRecord.reset(nullptr);
+    fBBH.reset(nullptr);
+
+    return drawable;
 }
diff --git a/gfx/skia/skia/src/core/SkPictureReplacementPlayback.cpp b/gfx/skia/skia/src/core/SkPictureReplacementPlayback.cpp
deleted file mode 100644
index 12498064e085..000000000000
--- a/gfx/skia/skia/src/core/SkPictureReplacementPlayback.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-
-/*
- * Copyright 2014 Google Inc.
- * 
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkCanvas.h"
-#include "SkPicture.h"
-#include "SkPictureData.h"
-#include "SkPictureReplacementPlayback.h"
-
-
-SkPictureReplacementPlayback::PlaybackReplacements::ReplacementInfo*
-SkPictureReplacementPlayback::PlaybackReplacements::push() {
-    SkDEBUGCODE(this->validate());
-    return fReplacements.push();
-}
-
-void SkPictureReplacementPlayback::PlaybackReplacements::freeAll() {
-    for (int i = 0; i < fReplacements.count(); ++i) {
-        SkDELETE(fReplacements[i].fBM);
-    }
-    fReplacements.reset();
-}
-
-#ifdef SK_DEBUG
-void SkPictureReplacementPlayback::PlaybackReplacements::validate() const {
-    // Check that the ranges are monotonically increasing and non-overlapping
-    if (fReplacements.count() > 0) {
-        SkASSERT(fReplacements[0].fStart < fReplacements[0].fStop);
-
-        for (int i = 1; i < fReplacements.count(); ++i) {
-            SkASSERT(fReplacements[i].fStart < fReplacements[i].fStop);
-            SkASSERT(fReplacements[i - 1].fStop < fReplacements[i].fStart);
-        }
-    }
-}
-#endif
-
-// TODO: Replace with hash or pass in "lastLookedUp" hint
-SkPictureReplacementPlayback::PlaybackReplacements::ReplacementInfo*
-SkPictureReplacementPlayback::PlaybackReplacements::lookupByStart(size_t start) {
-    SkDEBUGCODE(this->validate());
-    for (int i = 0; i < fReplacements.count(); ++i) {
-        if (start == fReplacements[i].fStart) {
-            return &fReplacements[i];
-        } else if (start < fReplacements[i].fStart) {
-            return NULL;  // the ranges are monotonically increasing and non-overlapping
-        }
-    }
-
-    return NULL;
-}
-
-bool SkPictureReplacementPlayback::replaceOps(SkPictureStateTree::Iterator* iter,
-                                              SkReader32* reader,
-                                              SkCanvas* canvas,
-                                              const SkMatrix& initialMatrix) {
-    if (NULL != fReplacements) {
-        // Potentially replace a block of operations with a single drawBitmap call
-        PlaybackReplacements::ReplacementInfo* temp =
-                                  fReplacements->lookupByStart(reader->offset());
-        if (NULL != temp) {
-            SkASSERT(NULL != temp->fBM);
-            SkASSERT(NULL != temp->fPaint);
-            canvas->save();
-            canvas->setMatrix(initialMatrix);
-            SkRect src = SkRect::Make(temp->fSrcRect);
-            SkRect dst = SkRect::MakeXYWH(temp->fPos.fX, temp->fPos.fY,
-                                          temp->fSrcRect.width(),
-                                          temp->fSrcRect.height());
-            canvas->drawBitmapRectToRect(*temp->fBM, &src, dst, temp->fPaint);
-            canvas->restore();
-
-            if (iter->isValid()) {
-                // This save is needed since the BBH will automatically issue
-                // a restore to balanced the saveLayer we're skipping
-                canvas->save();
-
-                // At this point we know that the PictureStateTree was aiming
-                // for some draw op within temp's saveLayer (although potentially
-                // in a separate saveLayer nested inside it).
-                // We need to skip all the operations inside temp's range
-                // along with all the associated state changes but update
-                // the state tree to the first operation outside temp's range.
-
-                uint32_t skipTo;
-                do {
-                    skipTo = iter->nextDraw();
-                    if (SkPictureStateTree::Iterator::kDrawComplete == skipTo) {
-                        break;
-                    }
-
-                    if (skipTo <= temp->fStop) {
-                        reader->setOffset(skipTo);
-                        uint32_t size;
-                        DrawType op = ReadOpAndSize(reader, &size);
-                        // Since we are relying on the normal SkPictureStateTree
-                        // playback we need to convert any nested saveLayer calls
-                        // it may issue into saves (so that all its internal
-                        // restores will be balanced).
-                        if (SAVE_LAYER == op) {
-                            canvas->save();
-                        }
-                    }
-                } while (skipTo <= temp->fStop);
-
-                if (SkPictureStateTree::Iterator::kDrawComplete == skipTo) {
-                    reader->setOffset(reader->size());      // skip to end
-                    return true;
-                }
-
-                reader->setOffset(skipTo);
-            } else {
-                reader->setOffset(temp->fStop);
-                uint32_t size;
-                SkDEBUGCODE(DrawType op = ) ReadOpAndSize(reader, &size);
-                SkASSERT(RESTORE == op);
-            }
-
-            return true;
-        }
-    }
-
-    return false;
-}
-
-void SkPictureReplacementPlayback::draw(SkCanvas* canvas, SkDrawPictureCallback* callback) {
-    AutoResetOpID aroi(this);
-    SkASSERT(0 == fCurOffset);
-
-    SkPictureStateTree::Iterator it;
-
-    if (!this->initIterator(&it, canvas, fActiveOpsList)) {
-        return;  // nothing to draw
-    }
-
-    SkReader32 reader(fPictureData->opData()->bytes(), fPictureData->opData()->size());
-
-    StepIterator(&it, &reader);
-
-    // Record this, so we can concat w/ it if we encounter a setMatrix()
-    SkMatrix initialMatrix = canvas->getTotalMatrix();
-
-    SkAutoCanvasRestore acr(canvas, false);
-
-    while (!reader.eof()) {
-        if (NULL != callback && callback->abortDrawing()) {
-            return;
-        }
-
-        if (this->replaceOps(&it, &reader, canvas, initialMatrix)) {
-            continue;
-        }
-
-        fCurOffset = reader.offset();
-        uint32_t size;
-        DrawType op = ReadOpAndSize(&reader, &size);
-        if (NOOP == op) {
-            // NOOPs are to be ignored - do not propagate them any further
-            SkipIterTo(&it, &reader, fCurOffset + size);
-            continue;
-        }
-
-        this->handleOp(&reader, op, size, canvas, initialMatrix);
-
-        StepIterator(&it, &reader);
-    }
-}
diff --git a/gfx/skia/skia/src/core/SkPictureReplacementPlayback.h b/gfx/skia/skia/src/core/SkPictureReplacementPlayback.h
deleted file mode 100644
index 166a3bfbd350..000000000000
--- a/gfx/skia/skia/src/core/SkPictureReplacementPlayback.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkPictureReplacementPlayback_DEFINED
-#define SkPictureReplacementPlayback_DEFINED
-
-#include "SkPicturePlayback.h"
-
-// This playback class replaces complete "saveLayer ... restore" runs with a
-// single drawBitmap call.
-class SkPictureReplacementPlayback : public SkPicturePlayback {
-public:
-    // PlaybackReplacements collects op ranges that can be replaced with
-    // a single drawBitmap call (using a precomputed bitmap).
-    class PlaybackReplacements {
-    public:
-        // All the operations between fStart and fStop (inclusive) will be replaced with
-        // a single drawBitmap call using fPos, fBM and fPaint.
-        // fPaint will be NULL if the picture's paint wasn't copyable
-        struct ReplacementInfo {
-            size_t          fStart;
-            size_t          fStop;
-            SkIPoint        fPos;
-            SkBitmap*       fBM;     // fBM is allocated so ReplacementInfo can remain POD
-            const SkPaint*  fPaint;  // Note: this object doesn't own the paint
-
-            SkIRect         fSrcRect;
-        };
-
-        ~PlaybackReplacements() { this->freeAll(); }
-
-        // Add a new replacement range. The replacement ranges should be
-        // sorted in increasing order and non-overlapping (esp. no nested
-        // saveLayers).
-        ReplacementInfo* push();
-
-        // look up a replacement range by its start offset
-        ReplacementInfo* lookupByStart(size_t start);
-
-    private:
-        SkTDArray<ReplacementInfo> fReplacements;
-
-        void freeAll();
-
-#ifdef SK_DEBUG
-        void validate() const;
-#endif
-    };
-
-    // This class doesn't take ownership of either 'replacements' or 'activeOpsList'
-    // The caller must guarantee they exist across any calls to 'draw'.
-    // 'activeOpsList' can be NULL but in that case BBH acceleration will not 
-    // be used ('replacements' can be NULL too but that defeats the purpose
-    // of using this class).
-    SkPictureReplacementPlayback(const SkPicture* picture, 
-                                 PlaybackReplacements* replacements,
-                                 const SkPicture::OperationList* activeOpsList)
-        : INHERITED(picture)
-        , fReplacements(replacements)
-        , fActiveOpsList(activeOpsList) {
-    }
-
-    virtual void draw(SkCanvas* canvas, SkDrawPictureCallback*) SK_OVERRIDE;
-
-private:
-    PlaybackReplacements*           fReplacements;
-    const SkPicture::OperationList* fActiveOpsList;
-
-    // This method checks if the current op pointed at by 'iter' and 'reader'
-    // is within a replacement range. If so, it issues the drawBitmap call,
-    // updates 'iter' and 'reader' to be after the restore operation, and
-    // returns true. If the operation is not in a replacement range (and thus
-    // needs to be drawn normally) false is returned.
-    bool replaceOps(SkPictureStateTree::Iterator* iter,
-                    SkReader32* reader,
-                    SkCanvas* canvas,
-                    const SkMatrix& initialMatrix);
-
-    typedef SkPicturePlayback INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/core/SkPictureShader.cpp b/gfx/skia/skia/src/core/SkPictureShader.cpp
index 6ea67f803569..92e615734380 100644
--- a/gfx/skia/skia/src/core/SkPictureShader.cpp
+++ b/gfx/skia/skia/src/core/SkPictureShader.cpp
@@ -10,100 +10,228 @@
 #include "SkBitmap.h"
 #include "SkBitmapProcShader.h"
 #include "SkCanvas.h"
+#include "SkImageGenerator.h"
 #include "SkMatrixUtils.h"
 #include "SkPicture.h"
 #include "SkReadBuffer.h"
+#include "SkResourceCache.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
+#include "GrCaps.h"
 #endif
 
+namespace {
+static unsigned gBitmapSkaderKeyNamespaceLabel;
+
+struct BitmapShaderKey : public SkResourceCache::Key {
+public:
+    BitmapShaderKey(uint32_t pictureID,
+                    const SkRect& tile,
+                    SkShader::TileMode tmx,
+                    SkShader::TileMode tmy,
+                    const SkSize& scale,
+                    const SkMatrix& localMatrix)
+        : fPictureID(pictureID)
+        , fTile(tile)
+        , fTmx(tmx)
+        , fTmy(tmy)
+        , fScale(scale) {
+
+        for (int i = 0; i < 9; ++i) {
+            fLocalMatrixStorage[i] = localMatrix[i];
+        }
+
+        static const size_t keySize = sizeof(fPictureID) +
+                                      sizeof(fTile) +
+                                      sizeof(fTmx) + sizeof(fTmy) +
+                                      sizeof(fScale) +
+                                      sizeof(fLocalMatrixStorage);
+        // This better be packed.
+        SkASSERT(sizeof(uint32_t) * (&fEndOfStruct - &fPictureID) == keySize);
+        this->init(&gBitmapSkaderKeyNamespaceLabel, 0, keySize);
+    }
+
+private:
+    uint32_t           fPictureID;
+    SkRect             fTile;
+    SkShader::TileMode fTmx, fTmy;
+    SkSize             fScale;
+    SkScalar           fLocalMatrixStorage[9];
+
+    SkDEBUGCODE(uint32_t fEndOfStruct;)
+};
+
+struct BitmapShaderRec : public SkResourceCache::Rec {
+    BitmapShaderRec(const BitmapShaderKey& key, SkShader* tileShader, size_t bitmapBytes)
+        : fKey(key)
+        , fShader(SkRef(tileShader))
+        , fBitmapBytes(bitmapBytes) {}
+
+    BitmapShaderKey        fKey;
+    SkAutoTUnref<SkShader> fShader;
+    size_t                 fBitmapBytes;
+
+    const Key& getKey() const override { return fKey; }
+    size_t bytesUsed() const override {
+        return sizeof(fKey) + sizeof(SkShader) + fBitmapBytes;
+    }
+    const char* getCategory() const override { return "bitmap-shader"; }
+    SkDiscardableMemory* diagnostic_only_getDiscardable() const override { return nullptr; }
+
+    static bool Visitor(const SkResourceCache::Rec& baseRec, void* contextShader) {
+        const BitmapShaderRec& rec = static_cast<const BitmapShaderRec&>(baseRec);
+        SkAutoTUnref<SkShader>* result = reinterpret_cast<SkAutoTUnref<SkShader>*>(contextShader);
+
+        result->reset(SkRef(rec.fShader.get()));
+
+        // The bitmap shader is backed by an image generator, thus it can always re-generate its
+        // pixels if discarded.
+        return true;
+    }
+};
+
+} // namespace
+
 SkPictureShader::SkPictureShader(const SkPicture* picture, TileMode tmx, TileMode tmy,
-                                 const SkMatrix* localMatrix)
+                                 const SkMatrix* localMatrix, const SkRect* tile)
     : INHERITED(localMatrix)
     , fPicture(SkRef(picture))
+    , fTile(tile ? *tile : picture->cullRect())
     , fTmx(tmx)
-    , fTmy(tmy) { }
-
-SkPictureShader::SkPictureShader(SkReadBuffer& buffer)
-        : INHERITED(buffer) {
-    fTmx = static_cast<SkShader::TileMode>(buffer.read32());
-    fTmy = static_cast<SkShader::TileMode>(buffer.read32());
-    fPicture = SkPicture::CreateFromBuffer(buffer);
+    , fTmy(tmy) {
 }
 
-SkPictureShader::~SkPictureShader() {
-    fPicture->unref();
-}
-
-SkPictureShader* SkPictureShader::Create(const SkPicture* picture, TileMode tmx, TileMode tmy,
-                                         const SkMatrix* localMatrix) {
-    if (!picture || 0 == picture->width() || 0 == picture->height()) {
-        return NULL;
+SkShader* SkPictureShader::Create(const SkPicture* picture, TileMode tmx, TileMode tmy,
+                                         const SkMatrix* localMatrix, const SkRect* tile) {
+    if (!picture || picture->cullRect().isEmpty() || (tile && tile->isEmpty())) {
+        return SkShader::CreateEmptyShader();
     }
-    return SkNEW_ARGS(SkPictureShader, (picture, tmx, tmy, localMatrix));
+    return new SkPictureShader(picture, tmx, tmy, localMatrix, tile);
+}
+
+SkFlattenable* SkPictureShader::CreateProc(SkReadBuffer& buffer) {
+    SkMatrix lm;
+    buffer.readMatrix(&lm);
+    TileMode mx = (TileMode)buffer.read32();
+    TileMode my = (TileMode)buffer.read32();
+    SkRect tile;
+    buffer.readRect(&tile);
+
+    SkAutoTUnref<SkPicture> picture;
+
+    if (buffer.isCrossProcess() && SkPicture::PictureIOSecurityPrecautionsEnabled()) {
+        if (buffer.isVersionLT(SkReadBuffer::kPictureShaderHasPictureBool_Version)) {
+            // Older code blindly serialized pictures.  We don't trust them.
+            buffer.validate(false);
+            return nullptr;
+        }
+        // Newer code won't serialize pictures in disallow-cross-process-picture mode.
+        // Assert that they didn't serialize anything except a false here.
+        buffer.validate(!buffer.readBool());
+    } else {
+        // Old code always serialized the picture.  New code writes a 'true' first if it did.
+        if (buffer.isVersionLT(SkReadBuffer::kPictureShaderHasPictureBool_Version) ||
+            buffer.readBool()) {
+            picture.reset(SkPicture::CreateFromBuffer(buffer));
+        }
+    }
+    return SkPictureShader::Create(picture, mx, my, &lm, &tile);
 }
 
 void SkPictureShader::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
-
+    buffer.writeMatrix(this->getLocalMatrix());
     buffer.write32(fTmx);
     buffer.write32(fTmy);
-    fPicture->flatten(buffer);
+    buffer.writeRect(fTile);
+
+    // The deserialization code won't trust that our serialized picture is safe to deserialize.
+    // So write a 'false' telling it that we're not serializing a picture.
+    if (buffer.isCrossProcess() && SkPicture::PictureIOSecurityPrecautionsEnabled()) {
+        buffer.writeBool(false);
+    } else {
+        buffer.writeBool(true);
+        fPicture->flatten(buffer);
+    }
 }
 
-SkShader* SkPictureShader::refBitmapShader(const SkMatrix& matrix, const SkMatrix* localM) const {
-    SkASSERT(fPicture && fPicture->width() > 0 && fPicture->height() > 0);
+SkShader* SkPictureShader::refBitmapShader(const SkMatrix& viewMatrix, const SkMatrix* localM,
+                                           const int maxTextureSize) const {
+    SkASSERT(fPicture && !fPicture->cullRect().isEmpty());
 
     SkMatrix m;
-    m.setConcat(matrix, this->getLocalMatrix());
+    m.setConcat(viewMatrix, this->getLocalMatrix());
     if (localM) {
         m.preConcat(*localM);
     }
 
     // Use a rotation-invariant scale
     SkPoint scale;
-    if (!SkDecomposeUpper2x2(m, NULL, &scale, NULL)) {
+    //
+    // TODO: replace this with decomposeScale() -- but beware LayoutTest rebaselines!
+    //
+    if (!SkDecomposeUpper2x2(m, nullptr, &scale, nullptr)) {
         // Decomposition failed, use an approximation.
         scale.set(SkScalarSqrt(m.getScaleX() * m.getScaleX() + m.getSkewX() * m.getSkewX()),
                   SkScalarSqrt(m.getScaleY() * m.getScaleY() + m.getSkewY() * m.getSkewY()));
     }
-    SkSize scaledSize = SkSize::Make(scale.x() * fPicture->width(), scale.y() * fPicture->height());
+    SkSize scaledSize = SkSize::Make(SkScalarAbs(scale.x() * fTile.width()),
+                                     SkScalarAbs(scale.y() * fTile.height()));
+
+    // Clamp the tile size to about 4M pixels
+    static const SkScalar kMaxTileArea = 2048 * 2048;
+    SkScalar tileArea = SkScalarMul(scaledSize.width(), scaledSize.height());
+    if (tileArea > kMaxTileArea) {
+        SkScalar clampScale = SkScalarSqrt(kMaxTileArea / tileArea);
+        scaledSize.set(SkScalarMul(scaledSize.width(), clampScale),
+                       SkScalarMul(scaledSize.height(), clampScale));
+    }
+#if SK_SUPPORT_GPU
+    // Scale down the tile size if larger than maxTextureSize for GPU Path or it should fail on create texture
+    if (maxTextureSize) {
+        if (scaledSize.width() > maxTextureSize || scaledSize.height() > maxTextureSize) {
+            SkScalar downScale = maxTextureSize / SkMaxScalar(scaledSize.width(), scaledSize.height());
+            scaledSize.set(SkScalarFloorToScalar(SkScalarMul(scaledSize.width(), downScale)),
+                           SkScalarFloorToScalar(SkScalarMul(scaledSize.height(), downScale)));
+        }
+    }
+#endif
 
     SkISize tileSize = scaledSize.toRound();
     if (tileSize.isEmpty()) {
-        return NULL;
+        return SkShader::CreateEmptyShader();
     }
 
-    // The actual scale, compensating for rounding.
-    SkSize tileScale = SkSize::Make(SkIntToScalar(tileSize.width()) / fPicture->width(),
-                                    SkIntToScalar(tileSize.height()) / fPicture->height());
+    // The actual scale, compensating for rounding & clamping.
+    SkSize tileScale = SkSize::Make(SkIntToScalar(tileSize.width()) / fTile.width(),
+                                    SkIntToScalar(tileSize.height()) / fTile.height());
 
-    SkAutoMutexAcquire ama(fCachedBitmapShaderMutex);
+    SkAutoTUnref<SkShader> tileShader;
+    BitmapShaderKey key(fPicture->uniqueID(),
+                        fTile,
+                        fTmx,
+                        fTmy,
+                        tileScale,
+                        this->getLocalMatrix());
 
-    if (!fCachedBitmapShader || tileScale != fCachedTileScale) {
+    if (!SkResourceCache::Find(key, BitmapShaderRec::Visitor, &tileShader)) {
+        SkMatrix tileMatrix;
+        tileMatrix.setRectToRect(fTile, SkRect::MakeIWH(tileSize.width(), tileSize.height()),
+                             SkMatrix::kFill_ScaleToFit);
         SkBitmap bm;
-        if (!bm.allocN32Pixels(tileSize.width(), tileSize.height())) {
-            return NULL;
+        if (!SkDEPRECATED_InstallDiscardablePixelRef(
+            SkImageGenerator::NewFromPicture(tileSize, fPicture, &tileMatrix, nullptr), &bm)) {
+            return nullptr;
         }
-        bm.eraseColor(SK_ColorTRANSPARENT);
-
-        SkCanvas canvas(bm);
-        canvas.scale(tileScale.width(), tileScale.height());
-        canvas.drawPicture(fPicture);
-
-        fCachedTileScale = tileScale;
 
         SkMatrix shaderMatrix = this->getLocalMatrix();
         shaderMatrix.preScale(1 / tileScale.width(), 1 / tileScale.height());
-        fCachedBitmapShader.reset(CreateBitmapShader(bm, fTmx, fTmy, &shaderMatrix));
+        tileShader.reset(CreateBitmapShader(bm, fTmx, fTmy, &shaderMatrix));
+
+        SkResourceCache::Add(new BitmapShaderRec(key, tileShader.get(), bm.getSize()));
     }
 
-    // Increment the ref counter inside the mutex to ensure the returned pointer is still valid.
-    // Otherwise, the pointer may have been overwritten on a different thread before the object's
-    // ref count was incremented.
-    fCachedBitmapShader.get()->ref();
-    return fCachedBitmapShader;
+    return tileShader.detach();
 }
 
 size_t SkPictureShader::contextSize() const {
@@ -112,8 +240,8 @@ size_t SkPictureShader::contextSize() const {
 
 SkShader::Context* SkPictureShader::onCreateContext(const ContextRec& rec, void* storage) const {
     SkAutoTUnref<SkShader> bitmapShader(this->refBitmapShader(*rec.fMatrix, rec.fLocalMatrix));
-    if (NULL == bitmapShader.get()) {
-        return NULL;
+    if (nullptr == bitmapShader.get()) {
+        return nullptr;
     }
     return PictureShaderContext::Create(storage, *this, rec, bitmapShader);
 }
@@ -122,11 +250,10 @@ SkShader::Context* SkPictureShader::onCreateContext(const ContextRec& rec, void*
 
 SkShader::Context* SkPictureShader::PictureShaderContext::Create(void* storage,
                    const SkPictureShader& shader, const ContextRec& rec, SkShader* bitmapShader) {
-    PictureShaderContext* ctx = SkNEW_PLACEMENT_ARGS(storage, PictureShaderContext,
-                                                     (shader, rec, bitmapShader));
-    if (NULL == ctx->fBitmapShaderContext) {
+    PictureShaderContext* ctx = new (storage) PictureShaderContext(shader, rec, bitmapShader);
+    if (nullptr == ctx->fBitmapShaderContext) {
         ctx->~PictureShaderContext();
-        ctx = NULL;
+        ctx = nullptr;
     }
     return ctx;
 }
@@ -174,9 +301,11 @@ void SkPictureShader::toString(SkString* str) const {
         "clamp", "repeat", "mirror"
     };
 
-    str->appendf("PictureShader: [%d:%d] ",
-                 fPicture ? fPicture->width() : 0,
-                 fPicture ? fPicture->height() : 0);
+    str->appendf("PictureShader: [%f:%f:%f:%f] ",
+                 fPicture->cullRect().fLeft,
+                 fPicture->cullRect().fTop,
+                 fPicture->cullRect().fRight,
+                 fPicture->cullRect().fBottom);
 
     str->appendf("(%s, %s)", gTileModeName[fTmx], gTileModeName[fTmy]);
 
@@ -185,20 +314,19 @@ void SkPictureShader::toString(SkString* str) const {
 #endif
 
 #if SK_SUPPORT_GPU
-bool SkPictureShader::asNewEffect(GrContext* context, const SkPaint& paint,
-                                  const SkMatrix* localMatrix, GrColor* paintColor,
-                                  GrEffect** effect) const {
-    SkAutoTUnref<SkShader> bitmapShader(this->refBitmapShader(context->getMatrix(), localMatrix));
-    if (!bitmapShader) {
-        return false;
+const GrFragmentProcessor* SkPictureShader::asFragmentProcessor(
+                                                    GrContext* context,
+                                                    const SkMatrix& viewM,
+                                                    const SkMatrix* localMatrix,
+                                                    SkFilterQuality fq) const {
+    int maxTextureSize = 0;
+    if (context) {
+        maxTextureSize = context->caps()->maxTextureSize();
     }
-    return bitmapShader->asNewEffect(context, paint, NULL, paintColor, effect);
-}
-#else
-bool SkPictureShader::asNewEffect(GrContext* context, const SkPaint& paint,
-                                  const SkMatrix* localMatrix, GrColor* paintColor,
-                                  GrEffect** effect) const {
-    SkDEBUGFAIL("Should not call in GPU-less build");
-    return false;
+    SkAutoTUnref<SkShader> bitmapShader(this->refBitmapShader(viewM, localMatrix, maxTextureSize));
+    if (!bitmapShader) {
+        return nullptr;
+    }
+    return bitmapShader->asFragmentProcessor(context, viewM, nullptr, fq);
 }
 #endif
diff --git a/gfx/skia/skia/src/core/SkPictureShader.h b/gfx/skia/skia/src/core/SkPictureShader.h
index 00aee9b07866..2657bab74c13 100644
--- a/gfx/skia/skia/src/core/SkPictureShader.h
+++ b/gfx/skia/skia/src/core/SkPictureShader.h
@@ -1,3 +1,4 @@
+
 /*
  * Copyright 2014 Google Inc.
  *
@@ -21,33 +22,34 @@ class SkPicture;
  */
 class SkPictureShader : public SkShader {
 public:
-    static SkPictureShader* Create(const SkPicture*, TileMode, TileMode, const SkMatrix* = NULL);
-    virtual ~SkPictureShader();
+    static SkShader* Create(const SkPicture*, TileMode, TileMode, const SkMatrix*,
+                                   const SkRect*);
 
-    virtual size_t contextSize() const SK_OVERRIDE;
+    size_t contextSize() const override;
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPictureShader)
 
-    bool asNewEffect(GrContext*, const SkPaint&, const SkMatrix*, GrColor*, GrEffect**)
-        const SK_OVERRIDE;
+#if SK_SUPPORT_GPU
+    const GrFragmentProcessor* asFragmentProcessor(GrContext*,
+                                                   const SkMatrix& viewM,
+                                                   const SkMatrix*,
+                                                   SkFilterQuality) const override;
+#endif
 
 protected:
     SkPictureShader(SkReadBuffer&);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
-    virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
+    Context* onCreateContext(const ContextRec&, void* storage) const override;
 
 private:
-    SkPictureShader(const SkPicture*, TileMode, TileMode, const SkMatrix* = NULL);
+    SkPictureShader(const SkPicture*, TileMode, TileMode, const SkMatrix*, const SkRect*);
 
-    SkShader* refBitmapShader(const SkMatrix&, const SkMatrix* localMatrix) const;
+    SkShader* refBitmapShader(const SkMatrix&, const SkMatrix* localMatrix, const int maxTextureSize = 0) const;
 
-    const SkPicture*  fPicture;
-    TileMode          fTmx, fTmy;
-
-    mutable SkMutex                 fCachedBitmapShaderMutex;
-    mutable SkAutoTUnref<SkShader>  fCachedBitmapShader;
-    mutable SkSize                  fCachedTileScale;
+    SkAutoTUnref<const SkPicture> fPicture;
+    SkRect                        fTile;
+    TileMode                      fTmx, fTmy;
 
     class PictureShaderContext : public SkShader::Context {
     public:
@@ -56,11 +58,11 @@ private:
 
         virtual ~PictureShaderContext();
 
-        virtual uint32_t getFlags() const SK_OVERRIDE;
+        uint32_t getFlags() const override;
 
-        virtual ShadeProc asAShadeProc(void** ctx) SK_OVERRIDE;
-        virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE;
-        virtual void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE;
+        ShadeProc asAShadeProc(void** ctx) override;
+        void shadeSpan(int x, int y, SkPMColor dstC[], int count) override;
+        void shadeSpan16(int x, int y, uint16_t dstC[], int count) override;
 
     private:
         PictureShaderContext(const SkPictureShader&, const ContextRec&, SkShader* bitmapShader);
diff --git a/gfx/skia/skia/src/core/SkPictureStateTree.cpp b/gfx/skia/skia/src/core/SkPictureStateTree.cpp
deleted file mode 100644
index d2f0e6efcd40..000000000000
--- a/gfx/skia/skia/src/core/SkPictureStateTree.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkPictureStateTree.h"
-#include "SkCanvas.h"
-
-SkPictureStateTree::SkPictureStateTree()
-    : fAlloc(2048)
-    , fLastRestoredNode(NULL)
-    , fStateStack(sizeof(Draw), 16) {
-    fRootMatrix.reset();
-    fRoot.fParent = NULL;
-    fRoot.fMatrix = &fRootMatrix;
-    fRoot.fFlags = Node::kSave_Flag;
-    fRoot.fOffset = 0;
-    fRoot.fLevel = 0;
-    fCurrentState.fNode = &fRoot;
-    fCurrentState.fMatrix = &fRootMatrix;
-    *static_cast<Draw*>(fStateStack.push_back()) = fCurrentState;
-}
-
-SkPictureStateTree::~SkPictureStateTree() {
-}
-
-SkPictureStateTree::Draw* SkPictureStateTree::appendDraw(size_t offset) {
-    Draw* draw = static_cast<Draw*>(fAlloc.allocThrow(sizeof(Draw)));
-    *draw = fCurrentState;
-    draw->fOffset = SkToU32(offset);
-    return draw;
-}
-
-void SkPictureStateTree::appendSave() {
-    *static_cast<Draw*>(fStateStack.push_back()) = fCurrentState;
-    fCurrentState.fNode->fFlags |= Node::kSave_Flag;
-}
-
-void SkPictureStateTree::appendSaveLayer(size_t offset) {
-    *static_cast<Draw*>(fStateStack.push_back()) = fCurrentState;
-    this->appendNode(offset);
-    fCurrentState.fNode->fFlags |= Node::kSaveLayer_Flag;
-}
-
-void SkPictureStateTree::saveCollapsed() {
-    SkASSERT(NULL != fLastRestoredNode);
-    SkASSERT(SkToBool(fLastRestoredNode->fFlags & \
-        (Node::kSaveLayer_Flag | Node::kSave_Flag)));
-    SkASSERT(fLastRestoredNode->fParent == fCurrentState.fNode);
-    // The structure of the tree is not modified here. We just turn off
-    // the save or saveLayer flag to prevent the iterator from making state
-    // changing calls on the playback canvas when traversing a save or
-    // saveLayerNode node.
-    fLastRestoredNode->fFlags = 0;
-}
-
-void SkPictureStateTree::appendRestore() {
-    fLastRestoredNode = fCurrentState.fNode;
-    fCurrentState = *static_cast<Draw*>(fStateStack.back());
-    fStateStack.pop_back();
-}
-
-void SkPictureStateTree::appendTransform(const SkMatrix& trans) {
-    SkMatrix* m = static_cast<SkMatrix*>(fAlloc.allocThrow(sizeof(SkMatrix)));
-    *m = trans;
-    fCurrentState.fMatrix = m;
-}
-
-void SkPictureStateTree::appendClip(size_t offset) {
-    this->appendNode(offset);
-}
-
-void SkPictureStateTree::initIterator(SkPictureStateTree::Iterator* iter,
-                                      const SkTDArray<void*>& draws,
-                                      SkCanvas* canvas) {
-    iter->init(draws, canvas, &fRoot);
-}
-
-void SkPictureStateTree::appendNode(size_t offset) {
-    Node* n = static_cast<Node*>(fAlloc.allocThrow(sizeof(Node)));
-    n->fOffset = SkToU32(offset);
-    n->fFlags = 0;
-    n->fParent = fCurrentState.fNode;
-    n->fLevel = fCurrentState.fNode->fLevel + 1;
-    n->fMatrix = fCurrentState.fMatrix;
-    fCurrentState.fNode = n;
-}
-
-void SkPictureStateTree::Iterator::init(const SkTDArray<void*>& draws, SkCanvas* canvas, Node* root) {
-    SkASSERT(!fValid);
-    fDraws = &draws;
-    fCanvas = canvas;
-    fCurrentNode = root;
-    fPlaybackMatrix = canvas->getTotalMatrix();
-    fCurrentMatrix = NULL;
-    fPlaybackIndex = 0;
-    fSave = false;
-    fValid = true;
-}
-
-void SkPictureStateTree::Iterator::setCurrentMatrix(const SkMatrix* matrix) {
-    SkASSERT(NULL != matrix);
-
-    if (matrix == fCurrentMatrix) {
-        return;
-    }
-
-    // The matrix is in recording space, but we also inherit
-    // a playback matrix from out target canvas.
-    SkMatrix m = *matrix;
-    m.postConcat(fPlaybackMatrix);
-    fCanvas->setMatrix(m);
-    fCurrentMatrix = matrix;
-}
-
-uint32_t SkPictureStateTree::Iterator::finish() {
-    if (fCurrentNode->fFlags & Node::kSaveLayer_Flag) {
-        fCanvas->restore();
-    }
-
-    for (fCurrentNode = fCurrentNode->fParent; fCurrentNode;
-            fCurrentNode = fCurrentNode->fParent) {
-        // Note: we call restore() twice when both flags are set.
-        if (fCurrentNode->fFlags & Node::kSave_Flag) {
-            fCanvas->restore();
-        }
-        if (fCurrentNode->fFlags & Node::kSaveLayer_Flag) {
-            fCanvas->restore();
-        }
-    }
-
-    fCanvas->setMatrix(fPlaybackMatrix);
-    fCurrentMatrix = NULL;
-    return kDrawComplete;
-}
-
-uint32_t SkPictureStateTree::Iterator::nextDraw() {
-    SkASSERT(this->isValid());
-    if (fPlaybackIndex >= fDraws->count()) {
-        return this->finish();
-    }
-
-    Draw* draw = static_cast<Draw*>((*fDraws)[fPlaybackIndex]);
-    Node* targetNode = draw->fNode;
-
-    if (fSave) {
-        fCanvas->save();
-        fSave = false;
-    }
-
-    if (fCurrentNode != targetNode) {
-        // If we're not at the target and we don't have a list of nodes to get there, we need to
-        // figure out the path from our current node, to the target
-        if (fNodes.count() == 0) {
-            // Trace back up to a common ancestor, restoring to get our current state to match that
-            // of the ancestor, and saving a list of nodes whose state we need to apply to get to
-            // the target (we can restore up to the ancestor immediately, but we'll need to return
-            // an offset for each node on the way down to the target, to apply the desired clips and
-            // saveLayers, so it may take several draw() calls before the next draw actually occurs)
-            Node* tmp = fCurrentNode;
-            Node* ancestor = targetNode;
-            while (tmp != ancestor) {
-                uint16_t currentLevel = tmp->fLevel;
-                uint16_t targetLevel = ancestor->fLevel;
-                if (currentLevel >= targetLevel) {
-                    if (tmp != fCurrentNode && tmp->fFlags & Node::kSave_Flag) {
-                        fCanvas->restore();
-                        // restore() may change the matrix, so we need to reapply.
-                        fCurrentMatrix = NULL;
-                    }
-                    if (tmp->fFlags & Node::kSaveLayer_Flag) {
-                        fCanvas->restore();
-                        // restore() may change the matrix, so we need to reapply.
-                        fCurrentMatrix = NULL;
-                    }
-                    tmp = tmp->fParent;
-                }
-                if (currentLevel <= targetLevel) {
-                    fNodes.push(ancestor);
-                    ancestor = ancestor->fParent;
-                }
-            }
-
-            if (ancestor->fFlags & Node::kSave_Flag) {
-                if (fCurrentNode != ancestor) {
-                    fCanvas->restore();
-                    // restore() may change the matrix, so we need to reapply.
-                    fCurrentMatrix = NULL;
-                }
-                if (targetNode != ancestor) {
-                    fCanvas->save();
-                }
-            }
-            fCurrentNode = ancestor;
-        }
-
-        // If we're not at the target node yet, we'll need to return an offset to make the caller
-        // apply the next clip or saveLayer.
-        if (fCurrentNode != targetNode) {
-            uint32_t offset = fNodes.top()->fOffset;
-            fCurrentNode = fNodes.top();
-            fSave = fCurrentNode != targetNode && fCurrentNode->fFlags & Node::kSave_Flag;
-            fNodes.pop();
-            this->setCurrentMatrix(fCurrentNode->fMatrix);
-            return offset;
-        }
-    }
-
-    // If we got this far, the clip/saveLayer state is all set, so we can proceed to set the matrix
-    // for the draw, and return its offset.
-    this->setCurrentMatrix(draw->fMatrix);
-
-    ++fPlaybackIndex;
-    return draw->fOffset;
-}
diff --git a/gfx/skia/skia/src/core/SkPictureStateTree.h b/gfx/skia/skia/src/core/SkPictureStateTree.h
deleted file mode 100644
index 15bb02f35486..000000000000
--- a/gfx/skia/skia/src/core/SkPictureStateTree.h
+++ /dev/null
@@ -1,162 +0,0 @@
-
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkPictureStateTree_DEFINED
-#define SkPictureStateTree_DEFINED
-
-#include "SkTDArray.h"
-#include "SkChunkAlloc.h"
-#include "SkDeque.h"
-#include "SkMatrix.h"
-#include "SkRefCnt.h"
-
-class SkCanvas;
-
-/**
- * Provides an interface that, given a sequence of draws into an SkPicture with corresponding
- * offsets, allows for playback of an arbitrary subset of the draws (note that Z-order is only
- * guaranteed if the draws are explicitly sorted).
- */
-class SkPictureStateTree : public SkRefCnt {
-private:
-    struct Node;
-public:
-    SK_DECLARE_INST_COUNT(SkPictureStateTree)
-
-    /**
-     * A draw call, stores offset into command buffer, a pointer to the matrix, and a pointer to
-     * the node in the tree that corresponds to its clip/layer state
-     */
-    struct Draw {
-        SkMatrix* fMatrix;
-        Node* fNode;
-        uint32_t fOffset;
-        bool operator<(const Draw& other) const { return fOffset < other.fOffset; }
-    };
-
-    class Iterator;
-
-    SkPictureStateTree();
-    ~SkPictureStateTree();
-
-    /**
-     * Creates and returns a struct representing a draw at the given offset.
-     */
-    Draw* appendDraw(size_t offset);
-
-    /**
-     * Given a list of draws, and a canvas, initialize an iterator that produces the correct 
-     * sequence of offsets into the command buffer to carry out those calls with correct 
-     * matrix/clip state. This handles saves/restores, and does all necessary matrix setup.
-     */
-    void initIterator(SkPictureStateTree::Iterator* iter, 
-                      const SkTDArray<void*>& draws, 
-                      SkCanvas* canvas);
-
-    void appendSave();
-    void appendSaveLayer(size_t offset);
-    void appendRestore();
-    void appendTransform(const SkMatrix& trans);
-    void appendClip(size_t offset);
-
-    /**
-     * Call this immediately after an appendRestore call that is associated
-     * a save or saveLayer that was removed from the command stream
-     * due to a command pattern optimization in SkPicture.
-     */
-    void saveCollapsed();
-
-    /**
-     * Playback helper
-     */
-    class Iterator {
-    public:
-        /** Returns the next op offset needed to create the drawing state
-            required by the queued up draw operation or the offset of the queued
-            up draw operation itself. In the latter case, the next draw operation
-            will move into the queued up slot.
-            It retuns kDrawComplete when done.
-            TODO: this might be better named nextOp
-        */
-        uint32_t nextDraw();
-        static const uint32_t kDrawComplete = SK_MaxU32;
-        Iterator() : fValid(false) { }
-        bool isValid() const { return fValid; }
-
-    private:
-        void init(const SkTDArray<void*>& draws, SkCanvas* canvas, Node* root);
-
-        void setCurrentMatrix(const SkMatrix*);
-
-        // The draws this iterator is associated with
-        const SkTDArray<void*>* fDraws;
-
-        // canvas this is playing into (so we can insert saves/restores as necessary)
-        SkCanvas* fCanvas;
-
-        // current state node
-        Node* fCurrentNode;
-
-        // List of nodes whose state we need to apply to reach TargetNode
-        SkTDArray<Node*> fNodes;
-
-        // The matrix of the canvas we're playing back into
-        SkMatrix fPlaybackMatrix;
-
-        // Cache of current matrix, so we can avoid redundantly setting it
-        const SkMatrix* fCurrentMatrix;
-
-        // current position in the array of draws
-        int fPlaybackIndex;
-        // Whether or not we need to do a save next iteration
-        bool fSave;
-
-        // Whether or not this is a valid iterator (the default public constructor sets this false)
-        bool fValid;
-
-        uint32_t finish();
-
-        friend class SkPictureStateTree;
-    };
-
-private:
-
-    void appendNode(size_t offset);
-
-    SkChunkAlloc fAlloc;
-    // Needed by saveCollapsed() because nodes do not currently store
-    // references to their children.  If they did, we could just retrieve the
-    // last added child.
-    Node* fLastRestoredNode;
-
-    // The currently active state
-    Draw fCurrentState;
-    // A stack of states for tracking save/restores
-    SkDeque fStateStack;
-
-    // Represents a notable piece of state that requires an offset into the command buffer,
-    // corresponding to a clip/saveLayer/etc call, to apply.
-    struct Node {
-        Node* fParent;
-        uint32_t fOffset;
-        uint16_t fLevel;
-        uint16_t fFlags;
-        SkMatrix* fMatrix;
-        enum Flags {
-            kSave_Flag      = 0x1,
-            kSaveLayer_Flag = 0x2
-        };
-    };
-
-    Node fRoot;
-    SkMatrix fRootMatrix;
-
-    typedef SkRefCnt INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/core/SkPixelRef.cpp b/gfx/skia/skia/src/core/SkPixelRef.cpp
index 106407019258..d7117617f62e 100644
--- a/gfx/skia/skia/src/core/SkPixelRef.cpp
+++ b/gfx/skia/skia/src/core/SkPixelRef.cpp
@@ -5,125 +5,103 @@
  * found in the LICENSE file.
  */
 
+#include "SkBitmapCache.h"
+#include "SkMutex.h"
 #include "SkPixelRef.h"
-#include "SkThread.h"
+#include "SkTraceEvent.h"
 
-#ifdef SK_USE_POSIX_THREADS
+//#define SK_SUPPORT_LEGACY_UNBALANCED_PIXELREF_LOCKCOUNT
+//#define SK_TRACE_PIXELREF_LIFETIME
 
-    static SkBaseMutex gPixelRefMutexRing[] = {
-        SK_BASE_MUTEX_INIT, SK_BASE_MUTEX_INIT,
-        SK_BASE_MUTEX_INIT, SK_BASE_MUTEX_INIT,
-        SK_BASE_MUTEX_INIT, SK_BASE_MUTEX_INIT,
-        SK_BASE_MUTEX_INIT, SK_BASE_MUTEX_INIT,
+#include "SkNextID.h"
 
-        SK_BASE_MUTEX_INIT, SK_BASE_MUTEX_INIT,
-        SK_BASE_MUTEX_INIT, SK_BASE_MUTEX_INIT,
-        SK_BASE_MUTEX_INIT, SK_BASE_MUTEX_INIT,
-        SK_BASE_MUTEX_INIT, SK_BASE_MUTEX_INIT,
-
-        SK_BASE_MUTEX_INIT, SK_BASE_MUTEX_INIT,
-        SK_BASE_MUTEX_INIT, SK_BASE_MUTEX_INIT,
-        SK_BASE_MUTEX_INIT, SK_BASE_MUTEX_INIT,
-        SK_BASE_MUTEX_INIT, SK_BASE_MUTEX_INIT,
-
-        SK_BASE_MUTEX_INIT, SK_BASE_MUTEX_INIT,
-        SK_BASE_MUTEX_INIT, SK_BASE_MUTEX_INIT,
-        SK_BASE_MUTEX_INIT, SK_BASE_MUTEX_INIT,
-        SK_BASE_MUTEX_INIT, SK_BASE_MUTEX_INIT,
-    };
-
-    // must be a power-of-2. undef to just use 1 mutex
-    #define PIXELREF_MUTEX_RING_COUNT SK_ARRAY_COUNT(gPixelRefMutexRing)
-
-#else // not pthreads
-
-    // must be a power-of-2. undef to just use 1 mutex
-    #define PIXELREF_MUTEX_RING_COUNT       32
-    static SkBaseMutex gPixelRefMutexRing[PIXELREF_MUTEX_RING_COUNT];
-
-#endif
-
-static SkBaseMutex* get_default_mutex() {
-    static int32_t gPixelRefMutexRingIndex;
-
-    SkASSERT(SkIsPow2(PIXELREF_MUTEX_RING_COUNT));
-
-    // atomic_inc might be overkill here. It may be fine if once in a while
-    // we hit a race-condition and two subsequent calls get the same index...
-    int index = sk_atomic_inc(&gPixelRefMutexRingIndex);
-    return &gPixelRefMutexRing[index & (PIXELREF_MUTEX_RING_COUNT - 1)];
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-int32_t SkNextPixelRefGenerationID();
-
-int32_t SkNextPixelRefGenerationID() {
-    static int32_t  gPixelRefGenerationID;
-    // do a loop in case our global wraps around, as we never want to
-    // return a 0
-    int32_t genID;
+uint32_t SkNextID::ImageID() {
+    static uint32_t gID = 0;
+    uint32_t id;
+    // Loop in case our global wraps around, as we never want to return a 0.
     do {
-        genID = sk_atomic_inc(&gPixelRefGenerationID) + 1;
-    } while (0 == genID);
-    return genID;
+        id = sk_atomic_fetch_add(&gID, 2u) + 2;  // Never set the low bit.
+    } while (0 == id);
+    return id;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void SkPixelRef::setMutex(SkBaseMutex* mutex) {
-    if (NULL == mutex) {
-        mutex = get_default_mutex();
-    }
-    fMutex = mutex;
-}
-
 // just need a > 0 value, so pick a funny one to aid in debugging
 #define SKPIXELREF_PRELOCKED_LOCKCOUNT     123456789
 
-SkPixelRef::SkPixelRef(const SkImageInfo& info) : fInfo(info) {
-    SkAssertResult(SkColorTypeValidateAlphaType(fInfo.colorType(), fInfo.alphaType(),
-                                                const_cast<SkAlphaType*>(&fInfo.fAlphaType)));
-
-    this->setMutex(NULL);
-    fRec.zero();
-    fLockCount = 0;
-    this->needsNewGenID();
-    fIsImmutable = false;
-    fPreLocked = false;
+static SkImageInfo validate_info(const SkImageInfo& info) {
+    SkAlphaType newAlphaType = info.alphaType();
+    SkAssertResult(SkColorTypeValidateAlphaType(info.colorType(), info.alphaType(), &newAlphaType));
+    return info.makeAlphaType(newAlphaType);
 }
 
+#ifdef SK_TRACE_PIXELREF_LIFETIME
+    static int32_t gInstCounter;
+#endif
 
-SkPixelRef::SkPixelRef(const SkImageInfo& info, SkBaseMutex* mutex) : fInfo(info) {
-    SkAssertResult(SkColorTypeValidateAlphaType(fInfo.colorType(), fInfo.alphaType(),
-                                                const_cast<SkAlphaType*>(&fInfo.fAlphaType)));
+SkPixelRef::SkPixelRef(const SkImageInfo& info)
+    : fInfo(validate_info(info))
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+    , fStableID(SkNextID::ImageID())
+#endif
 
-    this->setMutex(mutex);
+{
+#ifdef SK_TRACE_PIXELREF_LIFETIME
+    SkDebugf(" pixelref %d\n", sk_atomic_inc(&gInstCounter));
+#endif
     fRec.zero();
     fLockCount = 0;
     this->needsNewGenID();
-    fIsImmutable = false;
+    fMutability = kMutable;
     fPreLocked = false;
+    fAddedToCache.store(false);
 }
 
 SkPixelRef::~SkPixelRef() {
+#ifndef SK_SUPPORT_LEGACY_UNBALANCED_PIXELREF_LOCKCOUNT
+    SkASSERT(SKPIXELREF_PRELOCKED_LOCKCOUNT == fLockCount || 0 == fLockCount);
+#endif
+
+#ifdef SK_TRACE_PIXELREF_LIFETIME
+    SkDebugf("~pixelref %d\n", sk_atomic_dec(&gInstCounter) - 1);
+#endif
     this->callGenIDChangeListeners();
 }
 
 void SkPixelRef::needsNewGenID() {
-    fGenerationID = 0;
-    fUniqueGenerationID = false;
+    fTaggedGenID.store(0);
+    SkASSERT(!this->genIDIsUnique()); // This method isn't threadsafe, so the assert should be fine.
 }
 
 void SkPixelRef::cloneGenID(const SkPixelRef& that) {
     // This is subtle.  We must call that.getGenerationID() to make sure its genID isn't 0.
-    this->fGenerationID = that.getGenerationID();
-    this->fUniqueGenerationID = false;
-    that.fUniqueGenerationID = false;
+    uint32_t genID = that.getGenerationID();
+
+    // Neither ID is unique any more.
+    // (These & ~1u are actually redundant.  that.getGenerationID() just did it for us.)
+    this->fTaggedGenID.store(genID & ~1u);
+    that. fTaggedGenID.store(genID & ~1u);
+
+    // This method isn't threadsafe, so these asserts should be fine.
+    SkASSERT(!this->genIDIsUnique());
+    SkASSERT(!that. genIDIsUnique());
+}
+
+static void validate_pixels_ctable(const SkImageInfo& info, const SkColorTable* ctable) {
+    if (info.isEmpty()) {
+        return; // can't require ctable if the dimensions are empty
+    }
+    if (kIndex_8_SkColorType == info.colorType()) {
+        SkASSERT(ctable);
+    } else {
+        SkASSERT(nullptr == ctable);
+    }
 }
 
 void SkPixelRef::setPreLocked(void* pixels, size_t rowBytes, SkColorTable* ctable) {
-#ifndef SK_IGNORE_PIXELREF_SETPRELOCKED
+    SkASSERT(pixels);
+    validate_pixels_ctable(fInfo, ctable);
     // only call me in your constructor, otherwise fLockCount tracking can get
     // out of sync.
     fRec.fPixels = pixels;
@@ -131,40 +109,70 @@ void SkPixelRef::setPreLocked(void* pixels, size_t rowBytes, SkColorTable* ctabl
     fRec.fRowBytes = rowBytes;
     fLockCount = SKPIXELREF_PRELOCKED_LOCKCOUNT;
     fPreLocked = true;
-#endif
 }
 
-bool SkPixelRef::lockPixels(LockRec* rec) {
+// Increments fLockCount only on success
+bool SkPixelRef::lockPixelsInsideMutex() {
+    fMutex.assertHeld();
+
+    if (1 == ++fLockCount) {
+        SkASSERT(fRec.isZero());
+        if (!this->onNewLockPixels(&fRec)) {
+            fRec.zero();
+            fLockCount -= 1;    // we return fLockCount unchanged if we fail.
+            return false;
+        }
+    }
+    if (fRec.fPixels) {
+        validate_pixels_ctable(fInfo, fRec.fColorTable);
+        return true;
+    }
+    // no pixels, so we failed (somehow)
+    --fLockCount;
+    return false;
+}
+
+// For historical reasons, we always inc fLockCount, even if we return false.
+// It would be nice to change this (it seems), and only inc if we actually succeed...
+bool SkPixelRef::lockPixels() {
     SkASSERT(!fPreLocked || SKPIXELREF_PRELOCKED_LOCKCOUNT == fLockCount);
 
     if (!fPreLocked) {
-        SkAutoMutexAcquire  ac(*fMutex);
+        TRACE_EVENT_BEGIN0("skia", "SkPixelRef::lockPixelsMutex");
+        SkAutoMutexAcquire  ac(fMutex);
+        TRACE_EVENT_END0("skia", "SkPixelRef::lockPixelsMutex");
+        SkDEBUGCODE(int oldCount = fLockCount;)
+        bool success = this->lockPixelsInsideMutex();
+        // lockPixelsInsideMutex only increments the count if it succeeds.
+        SkASSERT(oldCount + (int)success == fLockCount);
 
-        if (1 == ++fLockCount) {
-            SkASSERT(fRec.isZero());
-
-            LockRec rec;
-            if (!this->onNewLockPixels(&rec)) {
-                return false;
-            }
-            SkASSERT(!rec.isZero());    // else why did onNewLock return true?
-            fRec = rec;
+        if (!success) {
+            // For compatibility with SkBitmap calling lockPixels, we still want to increment
+            // fLockCount even if we failed. If we updated SkBitmap we could remove this oddity.
+            fLockCount += 1;
+            return false;
         }
     }
-    *rec = fRec;
-    return true;
+    if (fRec.fPixels) {
+        validate_pixels_ctable(fInfo, fRec.fColorTable);
+        return true;
+    }
+    return false;
 }
 
-bool SkPixelRef::lockPixels() {
-    LockRec rec;
-    return this->lockPixels(&rec);
+bool SkPixelRef::lockPixels(LockRec* rec) {
+    if (this->lockPixels()) {
+        *rec = fRec;
+        return true;
+    }
+    return false;
 }
 
 void SkPixelRef::unlockPixels() {
     SkASSERT(!fPreLocked || SKPIXELREF_PRELOCKED_LOCKCOUNT == fLockCount);
 
     if (!fPreLocked) {
-        SkAutoMutexAcquire  ac(*fMutex);
+        SkAutoMutexAcquire  ac(fMutex);
 
         SkASSERT(fLockCount > 0);
         if (0 == --fLockCount) {
@@ -179,6 +187,36 @@ void SkPixelRef::unlockPixels() {
     }
 }
 
+bool SkPixelRef::requestLock(const LockRequest& request, LockResult* result) {
+    SkASSERT(result);
+    if (request.fSize.isEmpty()) {
+        return false;
+    }
+    // until we support subsets, we have to check this...
+    if (request.fSize.width() != fInfo.width() || request.fSize.height() != fInfo.height()) {
+        return false;
+    }
+
+    if (fPreLocked) {
+        result->fUnlockProc = nullptr;
+        result->fUnlockContext = nullptr;
+        result->fCTable = fRec.fColorTable;
+        result->fPixels = fRec.fPixels;
+        result->fRowBytes = fRec.fRowBytes;
+        result->fSize.set(fInfo.width(), fInfo.height());
+    } else {
+        SkAutoMutexAcquire  ac(fMutex);
+        if (!this->onRequestLock(request, result)) {
+            return false;
+        }
+    }
+    if (result->fPixels) {
+        validate_pixels_ctable(fInfo, result->fCTable);
+        return true;
+    }
+    return false;
+}
+
 bool SkPixelRef::lockPixelsAreWritable() const {
     return this->onLockPixelsAreWritable();
 }
@@ -187,37 +225,43 @@ bool SkPixelRef::onLockPixelsAreWritable() const {
     return true;
 }
 
-bool SkPixelRef::onImplementsDecodeInto() {
-    return false;
-}
-
-bool SkPixelRef::onDecodeInto(int pow2, SkBitmap* bitmap) {
-    return false;
-}
-
 uint32_t SkPixelRef::getGenerationID() const {
-    if (0 == fGenerationID) {
-        fGenerationID = SkNextPixelRefGenerationID();
-        fUniqueGenerationID = true;  // The only time we can be sure of this!
+    uint32_t id = fTaggedGenID.load();
+    if (0 == id) {
+        uint32_t next = SkNextID::ImageID() | 1u;
+        if (fTaggedGenID.compare_exchange(&id, next)) {
+            id = next;  // There was no race or we won the race.  fTaggedGenID is next now.
+        } else {
+            // We lost a race to set fTaggedGenID. compare_exchange() filled id with the winner.
+        }
+        // We can't quite SkASSERT(this->genIDIsUnique()). It could be non-unique
+        // if we got here via the else path (pretty unlikely, but possible).
     }
-    return fGenerationID;
+    return id & ~1u;  // Mask off bottom unique bit.
 }
 
 void SkPixelRef::addGenIDChangeListener(GenIDChangeListener* listener) {
-    if (NULL == listener || !fUniqueGenerationID) {
+    if (nullptr == listener || !this->genIDIsUnique()) {
         // No point in tracking this if we're not going to call it.
-        SkDELETE(listener);
+        delete listener;
         return;
     }
     *fGenIDChangeListeners.append() = listener;
 }
 
+// we need to be called *before* the genID gets changed or zerod
 void SkPixelRef::callGenIDChangeListeners() {
     // We don't invalidate ourselves if we think another SkPixelRef is sharing our genID.
-    if (fUniqueGenerationID) {
+    if (this->genIDIsUnique()) {
         for (int i = 0; i < fGenIDChangeListeners.count(); i++) {
             fGenIDChangeListeners[i]->onChange();
         }
+
+        // TODO: SkAtomic could add "old_value = atomic.xchg(new_value)" to make this clearer.
+        if (fAddedToCache.load()) {
+            SkNotifyBitmapGenIDIsStale(this->getGenerationID());
+            fAddedToCache.store(false);
+        }
     }
     // Listeners get at most one shot, so whether these triggered or not, blow them away.
     fGenIDChangeListeners.deleteAll();
@@ -225,35 +269,62 @@ void SkPixelRef::callGenIDChangeListeners() {
 
 void SkPixelRef::notifyPixelsChanged() {
 #ifdef SK_DEBUG
-    if (fIsImmutable) {
+    if (this->isImmutable()) {
         SkDebugf("========== notifyPixelsChanged called on immutable pixelref");
     }
 #endif
     this->callGenIDChangeListeners();
     this->needsNewGenID();
+    this->onNotifyPixelsChanged();
 }
 
 void SkPixelRef::changeAlphaType(SkAlphaType at) {
-    *const_cast<SkAlphaType*>(&fInfo.fAlphaType) = at;
+    *const_cast<SkImageInfo*>(&fInfo) = fInfo.makeAlphaType(at);
 }
 
 void SkPixelRef::setImmutable() {
-    fIsImmutable = true;
+    fMutability = kImmutable;
+}
+
+void SkPixelRef::setImmutableWithID(uint32_t genID) {
+    /*
+     *  We are forcing the genID to match an external value. The caller must ensure that this
+     *  value does not conflict with other content.
+     *
+     *  One use is to force this pixelref's id to match an SkImage's id
+     */
+    fMutability = kImmutable;
+    fTaggedGenID.store(genID);
+}
+
+void SkPixelRef::setTemporarilyImmutable() {
+    SkASSERT(fMutability != kImmutable);
+    fMutability = kTemporarilyImmutable;
+}
+
+void SkPixelRef::restoreMutability() {
+    SkASSERT(fMutability != kImmutable);
+    fMutability = kMutable;
 }
 
 bool SkPixelRef::readPixels(SkBitmap* dst, const SkIRect* subset) {
     return this->onReadPixels(dst, subset);
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
 bool SkPixelRef::onReadPixels(SkBitmap* dst, const SkIRect* subset) {
     return false;
 }
 
+void SkPixelRef::onNotifyPixelsChanged() { }
+
 SkData* SkPixelRef::onRefEncodedData() {
-    return NULL;
+    return nullptr;
 }
 
-bool SkPixelRef::onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3]) {
+bool SkPixelRef::onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3],
+                                 SkYUVColorSpace* colorSpace) {
     return false;
 }
 
@@ -261,14 +332,22 @@ size_t SkPixelRef::getAllocatedSizeInBytes() const {
     return 0;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-
-#ifdef SK_BUILD_FOR_ANDROID
-void SkPixelRef::globalRef(void* data) {
-    this->ref();
+static void unlock_legacy_result(void* ctx) {
+    SkPixelRef* pr = (SkPixelRef*)ctx;
+    pr->unlockPixels();
+    pr->unref();    // balancing the Ref in onRequestLoc
 }
 
-void SkPixelRef::globalUnref() {
-    this->unref();
+bool SkPixelRef::onRequestLock(const LockRequest& request, LockResult* result) {
+    if (!this->lockPixelsInsideMutex()) {
+        return false;
+    }
+
+    result->fUnlockProc = unlock_legacy_result;
+    result->fUnlockContext = SkRef(this);   // this is balanced in our fUnlockProc
+    result->fCTable = fRec.fColorTable;
+    result->fPixels = fRec.fPixels;
+    result->fRowBytes = fRec.fRowBytes;
+    result->fSize.set(fInfo.width(), fInfo.height());
+    return true;
 }
-#endif
diff --git a/gfx/skia/skia/src/core/SkPixmap.cpp b/gfx/skia/skia/src/core/SkPixmap.cpp
new file mode 100644
index 000000000000..718be88c57a8
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkPixmap.cpp
@@ -0,0 +1,275 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkColorPriv.h"
+#include "SkConfig8888.h"
+#include "SkMask.h"
+#include "SkPixmap.h"
+#include "SkUtils.h"
+
+void SkAutoPixmapUnlock::reset(const SkPixmap& pm, void (*unlock)(void*), void* ctx) {
+    SkASSERT(pm.addr() != nullptr);
+
+    this->unlock();
+    fPixmap = pm;
+    fUnlockProc = unlock;
+    fUnlockContext = ctx;
+    fIsLocked = true;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////////
+
+void SkPixmap::reset() {
+    fPixels = nullptr;
+    fCTable = nullptr;
+    fRowBytes = 0;
+    fInfo = SkImageInfo::MakeUnknown();
+}
+
+void SkPixmap::reset(const SkImageInfo& info, const void* addr, size_t rowBytes, SkColorTable* ct) {
+    if (addr) {
+        SkASSERT(info.validRowBytes(rowBytes));
+    }
+    fPixels = addr;
+    fCTable = ct;
+    fRowBytes = rowBytes;
+    fInfo = info;
+}
+
+bool SkPixmap::reset(const SkMask& src) {
+    if (SkMask::kA8_Format == src.fFormat) {
+        this->reset(SkImageInfo::MakeA8(src.fBounds.width(), src.fBounds.height()),
+                    src.fImage, src.fRowBytes, nullptr);
+        return true;
+    }
+    this->reset();
+    return false;
+}
+
+bool SkPixmap::extractSubset(SkPixmap* result, const SkIRect& subset) const {
+    SkIRect srcRect, r;
+    srcRect.set(0, 0, this->width(), this->height());
+    if (!r.intersect(srcRect, subset)) {
+        return false;   // r is empty (i.e. no intersection)
+    }
+    
+    // If the upper left of the rectangle was outside the bounds of this SkBitmap, we should have
+    // exited above.
+    SkASSERT(static_cast<unsigned>(r.fLeft) < static_cast<unsigned>(this->width()));
+    SkASSERT(static_cast<unsigned>(r.fTop) < static_cast<unsigned>(this->height()));
+
+    const void* pixels = nullptr;
+    if (fPixels) {
+        const size_t bpp = fInfo.bytesPerPixel();
+        pixels = (const uint8_t*)fPixels + r.fTop * fRowBytes + r.fLeft * bpp;
+    }
+    result->reset(fInfo.makeWH(r.width(), r.height()), pixels, fRowBytes, fCTable);
+    return true;
+}
+
+bool SkPixmap::readPixels(const SkImageInfo& requestedDstInfo, void* dstPixels, size_t dstRB,
+                          int x, int y) const {
+    if (kUnknown_SkColorType == requestedDstInfo.colorType()) {
+        return false;
+    }
+    if (nullptr == dstPixels || dstRB < requestedDstInfo.minRowBytes()) {
+        return false;
+    }
+    if (0 == requestedDstInfo.width() || 0 == requestedDstInfo.height()) {
+        return false;
+    }
+    
+    SkIRect srcR = SkIRect::MakeXYWH(x, y, requestedDstInfo.width(), requestedDstInfo.height());
+    if (!srcR.intersect(0, 0, this->width(), this->height())) {
+        return false;
+    }
+    
+    // the intersect may have shrunk info's logical size
+    const SkImageInfo dstInfo = requestedDstInfo.makeWH(srcR.width(), srcR.height());
+    
+    // if x or y are negative, then we have to adjust pixels
+    if (x > 0) {
+        x = 0;
+    }
+    if (y > 0) {
+        y = 0;
+    }
+    // here x,y are either 0 or negative
+    dstPixels = ((char*)dstPixels - y * dstRB - x * dstInfo.bytesPerPixel());
+
+    const SkImageInfo srcInfo = this->info().makeWH(dstInfo.width(), dstInfo.height());
+    const void* srcPixels = this->addr(srcR.x(), srcR.y());
+    return SkPixelInfo::CopyPixels(dstInfo, dstPixels, dstRB,
+                                   srcInfo, srcPixels, this->rowBytes(), this->ctable());
+}
+
+static uint16_t pack_8888_to_4444(unsigned a, unsigned r, unsigned g, unsigned b) {
+    unsigned pixel = (SkA32To4444(a) << SK_A4444_SHIFT) |
+    (SkR32To4444(r) << SK_R4444_SHIFT) |
+    (SkG32To4444(g) << SK_G4444_SHIFT) |
+    (SkB32To4444(b) << SK_B4444_SHIFT);
+    return SkToU16(pixel);
+}
+
+bool SkPixmap::erase(SkColor color, const SkIRect& inArea) const {
+    if (nullptr == fPixels) {
+        return false;
+    }
+    SkIRect area;
+    if (!area.intersect(this->bounds(), inArea)) {
+        return false;
+    }
+
+    U8CPU a = SkColorGetA(color);
+    U8CPU r = SkColorGetR(color);
+    U8CPU g = SkColorGetG(color);
+    U8CPU b = SkColorGetB(color);
+
+    int height = area.height();
+    const int width = area.width();
+    const int rowBytes = this->rowBytes();
+    
+    switch (this->colorType()) {
+        case kGray_8_SkColorType: {
+            if (255 != a) {
+                r = SkMulDiv255Round(r, a);
+                g = SkMulDiv255Round(g, a);
+                b = SkMulDiv255Round(b, a);
+            }
+            int gray = SkComputeLuminance(r, g, b);
+            uint8_t* p = this->writable_addr8(area.fLeft, area.fTop);
+            while (--height >= 0) {
+                memset(p, gray, width);
+                p += rowBytes;
+            }
+            break;
+        }
+        case kAlpha_8_SkColorType: {
+            uint8_t* p = this->writable_addr8(area.fLeft, area.fTop);
+            while (--height >= 0) {
+                memset(p, a, width);
+                p += rowBytes;
+            }
+            break;
+        }
+        case kARGB_4444_SkColorType:
+        case kRGB_565_SkColorType: {
+            uint16_t* p = this->writable_addr16(area.fLeft, area.fTop);
+            uint16_t v;
+            
+            // make rgb premultiplied
+            if (255 != a) {
+                r = SkAlphaMul(r, a);
+                g = SkAlphaMul(g, a);
+                b = SkAlphaMul(b, a);
+            }
+            
+            if (kARGB_4444_SkColorType == this->colorType()) {
+                v = pack_8888_to_4444(a, r, g, b);
+            } else {
+                v = SkPackRGB16(r >> (8 - SK_R16_BITS),
+                                g >> (8 - SK_G16_BITS),
+                                b >> (8 - SK_B16_BITS));
+            }
+            while (--height >= 0) {
+                sk_memset16(p, v, width);
+                p = (uint16_t*)((char*)p + rowBytes);
+            }
+            break;
+        }
+        case kBGRA_8888_SkColorType:
+        case kRGBA_8888_SkColorType: {
+            uint32_t* p = this->writable_addr32(area.fLeft, area.fTop);
+            
+            if (255 != a && kPremul_SkAlphaType == this->alphaType()) {
+                r = SkAlphaMul(r, a);
+                g = SkAlphaMul(g, a);
+                b = SkAlphaMul(b, a);
+            }
+            uint32_t v = kRGBA_8888_SkColorType == this->colorType() ?
+            SkPackARGB_as_RGBA(a, r, g, b) : SkPackARGB_as_BGRA(a, r, g, b);
+            
+            while (--height >= 0) {
+                sk_memset32(p, v, width);
+                p = (uint32_t*)((char*)p + rowBytes);
+            }
+            break;
+        }
+        default:
+            return false; // no change, so don't call notifyPixelsChanged()
+    }
+    return true;
+}
+
+#include "SkBitmap.h"
+#include "SkCanvas.h"
+#include "SkSurface.h"
+#include "SkXfermode.h"
+
+bool SkPixmap::scalePixels(const SkPixmap& dst, SkFilterQuality quality) const {
+    // Can't do anthing with empty src or dst
+    if (this->width() <= 0 || this->height() <= 0 || dst.width() <= 0 || dst.height() <= 0) {
+        return false;
+    }
+
+    // no scaling involved?
+    if (dst.width() == this->width() && dst.height() == this->height()) {
+        return this->readPixels(dst);
+    }
+
+    SkBitmap bitmap;
+    // we will only ready from this pixmap, but the bitmap setting takes void*, hence the cast
+    void* readOnlyAddr = const_cast<void*>(this->addr());
+    if (!bitmap.installPixels(this->info(), readOnlyAddr, this->rowBytes())) {
+        return false;
+    }
+    bitmap.setIsVolatile(true); // so we don't try to cache it
+
+    SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterDirect(dst.info(), dst.writable_addr(),
+                                                               dst.rowBytes()));
+    if (!surface) {
+        return false;
+    }
+
+    SkPaint paint;
+    paint.setFilterQuality(quality);
+    paint.setXfermodeMode(SkXfermode::kSrc_Mode);
+    surface->getCanvas()->drawBitmapRect(bitmap, SkRect::MakeIWH(dst.width(), dst.height()),
+                                         &paint);
+    return true;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+
+SkAutoPixmapStorage::SkAutoPixmapStorage() : fStorage(nullptr) {}
+
+SkAutoPixmapStorage::~SkAutoPixmapStorage() {
+    this->freeStorage();
+}
+
+bool SkAutoPixmapStorage::tryAlloc(const SkImageInfo& info) {
+    this->freeStorage();
+    
+    size_t rb = info.minRowBytes();
+    size_t size = info.getSafeSize(rb);
+    if (0 == size) {
+        return false;
+    }
+    void* pixels = sk_malloc_flags(size, 0);
+    if (nullptr == pixels) {
+        return false;
+    }
+    this->reset(info, pixels, rb);
+    fStorage = pixels;
+    return true;
+}
+
+void SkAutoPixmapStorage::alloc(const SkImageInfo& info) {
+    if (!this->tryAlloc(info)) {
+        sk_throw();
+    }
+}
diff --git a/gfx/skia/skia/src/core/SkPoint.cpp b/gfx/skia/skia/src/core/SkPoint.cpp
index 8a6d0564af59..345ef3744865 100644
--- a/gfx/skia/skia/src/core/SkPoint.cpp
+++ b/gfx/skia/skia/src/core/SkPoint.cpp
@@ -43,16 +43,6 @@ void SkPoint::setIRectFan(int l, int t, int r, int b, size_t stride) {
                                                    SkIntToScalar(t));
 }
 
-void SkPoint::setRectFan(SkScalar l, SkScalar t, SkScalar r, SkScalar b,
-                         size_t stride) {
-    SkASSERT(stride >= sizeof(SkPoint));
-
-    ((SkPoint*)((intptr_t)this + 0 * stride))->set(l, t);
-    ((SkPoint*)((intptr_t)this + 1 * stride))->set(l, b);
-    ((SkPoint*)((intptr_t)this + 2 * stride))->set(r, b);
-    ((SkPoint*)((intptr_t)this + 3 * stride))->set(r, t);
-}
-
 void SkPoint::rotateCW(SkPoint* dst) const {
     SkASSERT(dst);
 
@@ -110,6 +100,7 @@ SkScalar SkPoint::Normalize(SkPoint* pt) {
     float y = pt->fY;
     float mag2;
     if (isLengthNearlyZero(x, y, &mag2)) {
+        pt->set(0, 0);
         return 0;
     }
 
@@ -157,6 +148,7 @@ SkScalar SkPoint::Length(SkScalar dx, SkScalar dy) {
 bool SkPoint::setLength(float x, float y, float length) {
     float mag2;
     if (isLengthNearlyZero(x, y, &mag2)) {
+        this->set(0, 0);
         return false;
     }
 
@@ -169,7 +161,7 @@ bool SkPoint::setLength(float x, float y, float length) {
         // divide by inf. and return (0,0) vector.
         double xx = x;
         double yy = y;
-    #ifdef SK_DISCARD_DENORMALIZED_FOR_SPEED
+    #ifdef SK_CPU_FLUSH_TO_ZERO
         // The iOS ARM processor discards small denormalized numbers to go faster.
         // Casting this to a float would cause the scale to go to zero. Keeping it
         // as a double for the multiply keeps the scale non-zero.
@@ -193,6 +185,7 @@ bool SkPoint::setLengthFast(float length) {
 bool SkPoint::setLengthFast(float x, float y, float length) {
     float mag2;
     if (isLengthNearlyZero(x, y, &mag2)) {
+        this->set(0, 0);
         return false;
     }
 
@@ -224,13 +217,15 @@ SkScalar SkPoint::distanceToLineBetweenSqd(const SkPoint& a,
 
     SkScalar uLengthSqd = u.lengthSqd();
     SkScalar det = u.cross(v);
-    if (NULL != side) {
+    if (side) {
         SkASSERT(-1 == SkPoint::kLeft_Side &&
                   0 == SkPoint::kOn_Side &&
                   1 == kRight_Side);
         *side = (Side) SkScalarSignAsInt(det);
     }
-    return SkScalarMulDiv(det, det, uLengthSqd);
+    SkScalar temp = det / uLengthSqd;
+    temp *= det;
+    return temp;
 }
 
 SkScalar SkPoint::distanceToLineSegmentBetweenSqd(const SkPoint& a,
@@ -263,6 +258,8 @@ SkScalar SkPoint::distanceToLineSegmentBetweenSqd(const SkPoint& a,
         return b.distanceToSqd(*this);
     } else {
         SkScalar det = u.cross(v);
-        return SkScalarMulDiv(det, det, uLengthSqd);
+        SkScalar temp = det / uLengthSqd;
+        temp *= det;
+        return temp;
     }
 }
diff --git a/gfx/skia/skia/src/core/SkPoint3.cpp b/gfx/skia/skia/src/core/SkPoint3.cpp
new file mode 100644
index 000000000000..3b5586b06707
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkPoint3.cpp
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkPoint3.h"
+
+// Returns the square of the Euclidian distance to (x,y,z).
+static inline float get_length_squared(float x, float y, float z) {
+    return x * x + y * y + z * z;
+}
+
+// Calculates the square of the Euclidian distance to (x,y,z) and stores it in
+// *lengthSquared.  Returns true if the distance is judged to be "nearly zero".
+//
+// This logic is encapsulated in a helper method to make it explicit that we
+// always perform this check in the same manner, to avoid inconsistencies
+// (see http://code.google.com/p/skia/issues/detail?id=560 ).
+static inline bool is_length_nearly_zero(float x, float y, float z, float *lengthSquared) {
+    *lengthSquared = get_length_squared(x, y, z);
+    return *lengthSquared <= (SK_ScalarNearlyZero * SK_ScalarNearlyZero);
+}
+
+SkScalar SkPoint3::Length(SkScalar x, SkScalar y, SkScalar z) {
+    float magSq = get_length_squared(x, y, z);
+    if (SkScalarIsFinite(magSq)) {
+        return sk_float_sqrt(magSq);
+    } else {
+        double xx = x;
+        double yy = y;
+        double zz = z;
+        return (float)sqrt(xx * xx + yy * yy + zz * zz);
+    }
+}
+
+/*
+ *  We have to worry about 2 tricky conditions:
+ *  1. underflow of magSq (compared against nearlyzero^2)
+ *  2. overflow of magSq (compared w/ isfinite)
+ *
+ *  If we underflow, we return false. If we overflow, we compute again using
+ *  doubles, which is much slower (3x in a desktop test) but will not overflow.
+ */
+bool SkPoint3::normalize() {
+    float magSq;
+    if (is_length_nearly_zero(fX, fY, fZ, &magSq)) {
+        this->set(0, 0, 0);
+        return false;
+    }
+
+    float scale;
+    if (SkScalarIsFinite(magSq)) {
+        scale = 1.0f / sk_float_sqrt(magSq);
+    } else {
+        // our magSq step overflowed to infinity, so use doubles instead.
+        // much slower, but needed when x, y or z is very large, otherwise we
+        // divide by inf. and return (0,0,0) vector.
+        double xx = fX;
+        double yy = fY;
+        double zz = fZ;
+#ifdef SK_CPU_FLUSH_TO_ZERO
+        // The iOS ARM processor discards small denormalized numbers to go faster.
+        // Casting this to a float would cause the scale to go to zero. Keeping it
+        // as a double for the multiply keeps the scale non-zero.
+        double dscale = 1.0f / sqrt(xx * xx + yy * yy + zz * zz);
+        fX = x * dscale;
+        fY = y * dscale;
+        fZ = z * dscale;
+        return true;
+#else
+        scale = (float)(1.0f / sqrt(xx * xx + yy * yy + zz * zz));
+#endif
+    }
+    fX *= scale;
+    fY *= scale;
+    fZ *= scale;
+    return true;
+}
diff --git a/gfx/skia/skia/src/core/SkProcSpriteBlitter.cpp b/gfx/skia/skia/src/core/SkProcSpriteBlitter.cpp
deleted file mode 100644
index 2b535d947db4..000000000000
--- a/gfx/skia/skia/src/core/SkProcSpriteBlitter.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#if 0   // experimental
-
-class SkProcSpriteBlitter : public SkSpriteBlitter {
-public:
-    typedef void (*Proc)(void* dst, const void* src, int count, const SkPMColor ctable[]);
-
-    SkProcSpriteBlitter(const SkBitmap& source, Proc proc, unsigned srcShift, unsigned dstShift)
-        : SkSpriteBlitter(source), fProc(proc), fSrcShift(SkToU8(srcShift)), fDstShift(SkToU8(dstShift)) {}
-
-    virtual void blitRect(int x, int y, int width, int height)
-    {
-        size_t      dstRB = fDevice.rowBytes();
-        size_t      srcRB = fSource.rowBytes();
-        char*       dst = (char*)fDevice.getPixels() + y * dstRB + (x << fDstShift);
-        const char* src = (const char*)fSource.getPixels() + (y - fTop) * srcRB + ((x - fLeft) << fSrcShift);
-        Proc        proc = fProc;
-        const SkPMColor* ctable = NULL;
-
-        if fSource.getColorTable())
-            ctable = fSource.getColorTable()->lockColors();
-
-        while (--height >= 0)
-        {
-            proc(dst, src, width, ctable);
-            dst += dstRB;
-            src += srcRB;
-        }
-
-        if fSource.getColorTable())
-            fSource.getColorTable()->unlockColors();
-    }
-
-private:
-    Proc    fProc;
-    uint8_t fSrcShift, fDstShift;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/core/SkPtrRecorder.cpp b/gfx/skia/skia/src/core/SkPtrRecorder.cpp
index aae28d0e3f06..be169d7b0d9e 100644
--- a/gfx/skia/skia/src/core/SkPtrRecorder.cpp
+++ b/gfx/skia/skia/src/core/SkPtrRecorder.cpp
@@ -23,7 +23,7 @@ bool SkPtrSet::Less(const Pair& a, const Pair& b) {
 }
 
 uint32_t SkPtrSet::find(void* ptr) const {
-    if (NULL == ptr) {
+    if (nullptr == ptr) {
         return 0;
     }
 
@@ -39,7 +39,7 @@ uint32_t SkPtrSet::find(void* ptr) const {
 }
 
 uint32_t SkPtrSet::add(void* ptr) {
-    if (NULL == ptr) {
+    if (nullptr == ptr) {
         return 0;
     }
 
diff --git a/gfx/skia/skia/src/core/SkPtrRecorder.h b/gfx/skia/skia/src/core/SkPtrRecorder.h
index 06e14ab6ec03..2d755e69e58d 100644
--- a/gfx/skia/skia/src/core/SkPtrRecorder.h
+++ b/gfx/skia/skia/src/core/SkPtrRecorder.h
@@ -22,11 +22,11 @@
  */
 class SkPtrSet : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkPtrSet)
+    
 
     /**
      *  Search for the specified ptr in the set. If it is found, return its
-     *  32bit ID [1..N], or if not found, return 0. Always returns 0 for NULL.
+     *  32bit ID [1..N], or if not found, return 0. Always returns 0 for nullptr.
      */
     uint32_t find(void*) const;
 
@@ -34,7 +34,7 @@ public:
      *  Add the specified ptr to the set, returning a unique 32bit ID for it
      *  [1...N]. Duplicate ptrs will return the same ID.
      *
-     *  If the ptr is NULL, it is not added, and 0 is returned.
+     *  If the ptr is nullptr, it is not added, and 0 is returned.
      */
     uint32_t add(void*);
 
@@ -58,13 +58,34 @@ public:
      */
     void reset();
 
+    /**
+     * Set iterator.
+     */
+    class Iter {
+    public:
+        Iter(const SkPtrSet& set)
+            : fSet(set)
+            , fIndex(0) {}
+
+        /**
+         * Return the next ptr in the set or null if the end was reached.
+         */
+        void* next() {
+            return fIndex < fSet.fList.count() ? fSet.fList[fIndex++].fPtr : nullptr;
+        }
+
+    private:
+        const SkPtrSet& fSet;
+        int             fIndex;
+    };
+
 protected:
     virtual void incPtr(void*) {}
     virtual void decPtr(void*) {}
 
 private:
     struct Pair {
-        void*       fPtr;   // never NULL
+        void*       fPtr;   // never nullptr
         uint32_t    fIndex; // 1...N
     };
 
@@ -123,7 +144,7 @@ class SkFactorySet : public SkTPtrSet<SkFlattenable::Factory> {};
  */
 class SkNamedFactorySet : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkNamedFactorySet)
+    
 
     SkNamedFactorySet();
 
diff --git a/gfx/skia/skia/src/core/SkPx.h b/gfx/skia/skia/src/core/SkPx.h
new file mode 100644
index 000000000000..62ec598cd696
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkPx.h
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPx_DEFINED
+#define SkPx_DEFINED
+
+#include "SkTypes.h"
+#include "SkColorPriv.h"
+
+// We'll include one of src/opts/SkPx_{sse,neon,none}.h to define a type SkPx.
+//
+// SkPx represents up to SkPx::N 8888 pixels.  It's agnostic to whether these
+// are SkColors or SkPMColors; it only assumes that alpha is the high byte.
+static_assert(SK_A32_SHIFT == 24, "For both SkColor and SkPMColor, alpha is always the high byte.");
+//
+// SkPx::Alpha represents up to SkPx::N 8-bit values, usually coverage or alpha.
+// SkPx::Wide represents up to SkPx::N pixels with 16 bits per component.
+//
+// SkPx supports the following methods:
+//    static SkPx Dup(uint32_t);
+//    static SkPx Load(const uint32_t*);
+//    static SkPx Load(const uint32_t*, int n);  // where 0<n<SkPx::N
+//    void store(uint32_t*) const;
+//    void store(uint32_t*, int n) const;        // where 0<n<SkPx::N
+//
+//    Alpha alpha() const;    // argb -> a
+//    Wide widenLo() const;   // argb -> 0a0r0g0b
+//    Wide widenHi() const;   // argb -> a0r0g0b0
+//    Wide widenLoHi() const; // argb -> aarrggbb
+//
+//    SkPx    operator+(const SkPx&) const;
+//    SkPx    operator-(const SkPx&) const;
+//    SkPx saturatedAdd(const SkPx&) const;
+//
+//    Wide operator*(const Alpha&) const;  // argb * A -> (a*A)(r*A)(g*A)(b*A)
+//
+//    // Fast approximate (px*a+127)/255.
+//    // Never off by more than 1, and always correct when px or a is 0 or 255.
+//    // We use the approximation (px*a+px)/256.
+//    SkPx approxMulDiv255(const Alpha&) const;
+//
+//    SkPx addAlpha(const Alpha&) const;  // argb + A -> (a+A)rgb
+//
+// SkPx::Alpha supports the following methods:
+//    static Alpha Dup(uint8_t);
+//    static Alpha Load(const uint8_t*);
+//    static Alpha Load(const uint8_t*, int n);  // where 0<n<SkPx::N
+//
+//    Alpha inv() const;  // a -> 255-a
+//
+// SkPx::Wide supports the following methods:
+//    Wide operator+(const Wide&);
+//    Wide operator-(const Wide&);
+//    Wide shl<int bits>();
+//    Wide shr<int bits>();
+//
+//    // Return the high byte of each component of (*this + o.widenLo()).
+//    SkPx addNarrowHi(const SkPx& o);
+//
+// Methods left unwritten, but certainly to come:
+//    SkPx SkPx::operator<(const SkPx&) const;
+//    SkPx SkPx::thenElse(const SkPx& then, const SkPx& else) const;
+//    Wide Wide::operator<(const Wide&) const;
+//    Wide Wide::thenElse(const Wide& then, const Wide& else) const;
+//
+//    SkPx Wide::div255() const;  // Rounds, think (*this + 127) / 255.
+//
+//  The different implementations of SkPx have complete freedom to choose
+//  SkPx::N and how they represent SkPx, SkPx::Alpha, and SkPx::Wide.
+//
+//  All observable math must remain identical.
+
+#if defined(SKNX_NO_SIMD)
+    #include "../opts/SkPx_none.h"
+#else
+    #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
+        #include "../opts/SkPx_sse.h"
+    #elif defined(SK_ARM_HAS_NEON)
+        #include "../opts/SkPx_neon.h"
+    #else
+        #include "../opts/SkPx_none.h"
+    #endif
+#endif
+
+#endif//SkPx_DEFINED
diff --git a/gfx/skia/skia/src/core/SkQuadTree.cpp b/gfx/skia/skia/src/core/SkQuadTree.cpp
deleted file mode 100644
index a11613d08b02..000000000000
--- a/gfx/skia/skia/src/core/SkQuadTree.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkQuadTree.h"
-#include "SkTSort.h"
-#include <stdio.h>
-
-static const int kSplitThreshold = 8;
-
-enum {
-    kTopLeft,
-    kTopRight,
-    kBottomLeft,
-    kBottomRight,
-};
-enum {
-    kTopLeft_Bit = 1 << kTopLeft,
-    kTopRight_Bit = 1 << kTopRight,
-    kBottomLeft_Bit = 1 << kBottomLeft,
-    kBottomRight_Bit = 1 << kBottomRight,
-};
-enum {
-    kMaskLeft = kTopLeft_Bit | kBottomLeft_Bit,
-    kMaskRight = kTopRight_Bit | kBottomRight_Bit,
-    kMaskTop = kTopLeft_Bit | kTopRight_Bit,
-    kMaskBottom = kBottomLeft_Bit | kBottomRight_Bit,
-};
-
-static U8CPU child_intersect(const SkIRect& query, const SkIPoint& split) {
-    // fast quadrant test
-    U8CPU intersect = 0xf;
-    if (query.fRight <  split.fX) {
-        intersect &= ~kMaskRight;
-    } else if(query.fLeft >= split.fX) {
-        intersect &= ~kMaskLeft;
-    }
-    if (query.fBottom < split.fY) {
-        intersect &= ~kMaskBottom;
-    } else if(query.fTop >= split.fY) {
-        intersect &= ~kMaskTop;
-    }
-    return intersect;
-}
-
-SkQuadTree::SkQuadTree(const SkIRect& bounds) : fRoot(NULL) {
-    SkASSERT((bounds.width() * bounds.height()) > 0);
-    fRootBounds = bounds;
-}
-
-SkQuadTree::~SkQuadTree() {
-}
-
-void SkQuadTree::insert(Node* node, Entry* entry) {
-    // does it belong in a child?
-    if (NULL != node->fChildren[0]) {
-        switch(child_intersect(entry->fBounds, node->fSplitPoint)) {
-            case kTopLeft_Bit:
-                this->insert(node->fChildren[kTopLeft], entry);
-                return;
-            case kTopRight_Bit:
-                this->insert(node->fChildren[kTopRight], entry);
-                return;
-            case kBottomLeft_Bit:
-                this->insert(node->fChildren[kBottomLeft], entry);
-                return;
-            case kBottomRight_Bit:
-                this->insert(node->fChildren[kBottomRight], entry);
-                return;
-            default:
-                node->fEntries.push(entry);
-                return;
-        }
-    }
-    // No children yet, add to this node
-    node->fEntries.push(entry);
-    // should I split?
-    if (node->fEntries.getCount() > kSplitThreshold) {
-        this->split(node);
-    }
-}
-
-void SkQuadTree::split(Node* node) {
-    // Build all the children
-    node->fSplitPoint = SkIPoint::Make(node->fBounds.centerX(),
-                                       node->fBounds.centerY());
-    for(int index=0; index<kChildCount; ++index) {
-        node->fChildren[index] = fNodePool.acquire();
-    }
-    node->fChildren[0]->fBounds = SkIRect::MakeLTRB(
-        node->fBounds.fLeft,    node->fBounds.fTop,
-        node->fSplitPoint.fX,   node->fSplitPoint.fY);
-    node->fChildren[1]->fBounds = SkIRect::MakeLTRB(
-        node->fSplitPoint.fX,   node->fBounds.fTop,
-        node->fBounds.fRight,   node->fSplitPoint.fY);
-    node->fChildren[2]->fBounds = SkIRect::MakeLTRB(
-        node->fBounds.fLeft,    node->fSplitPoint.fY,
-        node->fSplitPoint.fX,   node->fBounds.fBottom);
-    node->fChildren[3]->fBounds = SkIRect::MakeLTRB(
-        node->fSplitPoint.fX,   node->fSplitPoint.fY,
-        node->fBounds.fRight,   node->fBounds.fBottom);
-    // reinsert all the entries of this node to allow child trickle
-    SkTInternalSList<Entry> entries;
-    entries.pushAll(&node->fEntries);
-    while(!entries.isEmpty()) {
-        this->insert(node, entries.pop());
-    }
-}
-
-void SkQuadTree::search(Node* node, const SkIRect& query,
-                        SkTDArray<void*>* results) const {
-    for (Entry* entry = node->fEntries.head(); NULL != entry;
-        entry = entry->getSListNext()) {
-        if (SkIRect::IntersectsNoEmptyCheck(entry->fBounds, query)) {
-            results->push(entry->fData);
-        }
-    }
-    if (NULL == node->fChildren[0]) {
-        return;
-    }
-    U8CPU intersect = child_intersect(query, node->fSplitPoint);
-    for(int index=0; index<kChildCount; ++index) {
-        if (intersect & (1 << index)) {
-            this->search(node->fChildren[index], query, results);
-        }
-    }
-}
-
-void SkQuadTree::clear(Node* node) {
-    // first clear the entries of this node
-    fEntryPool.releaseAll(&node->fEntries);
-    // recurse into and clear all child nodes
-    for(int index=0; index<kChildCount; ++index) {
-        Node* child = node->fChildren[index];
-        node->fChildren[index] = NULL;
-        if (NULL != child) {
-            this->clear(child);
-            fNodePool.release(child);
-        }
-    }
-}
-
-int SkQuadTree::getDepth(Node* node) const {
-    int maxDepth = 0;
-    if (NULL != node) {
-        for(int index=0; index<kChildCount; ++index) {
-            maxDepth = SkMax32(maxDepth, getDepth(node->fChildren[index]));
-        }
-    }
-    return maxDepth + 1;
-}
-
-void SkQuadTree::insert(void* data, const SkIRect& bounds, bool) {
-    if (bounds.isEmpty()) {
-        SkASSERT(false);
-        return;
-    }
-    Entry* entry = fEntryPool.acquire();
-    entry->fData = data;
-    entry->fBounds = bounds;
-    if (NULL == fRoot) {
-        fDeferred.push(entry);
-    } else {
-        this->insert(fRoot, entry);
-    }
-}
-
-void SkQuadTree::search(const SkIRect& query, SkTDArray<void*>* results) {
-    SkASSERT(NULL != fRoot);
-    SkASSERT(NULL != results);
-    if (SkIRect::Intersects(fRootBounds, query)) {
-        this->search(fRoot, query, results);
-    }
-}
-
-void SkQuadTree::clear() {
-    this->flushDeferredInserts();
-    if (NULL != fRoot) {
-        this->clear(fRoot);
-        fNodePool.release(fRoot);
-        fRoot = NULL;
-    }
-    SkASSERT(fEntryPool.allocated() == fEntryPool.available());
-    SkASSERT(fNodePool.allocated() == fNodePool.available());
-}
-
-int SkQuadTree::getDepth() const {
-    return this->getDepth(fRoot);
-}
-
-void SkQuadTree::rewindInserts() {
-    SkASSERT(fClient);
-     // Currently only supports deferred inserts
-    SkASSERT(NULL == fRoot);
-    SkTInternalSList<Entry> entries;
-    entries.pushAll(&fDeferred);
-    while(!entries.isEmpty()) {
-        Entry* entry = entries.pop();
-        if (fClient->shouldRewind(entry->fData)) {
-            entry->fData = NULL;
-            fEntryPool.release(entry);
-        } else {
-            fDeferred.push(entry);
-        }
-    }
-}
-
-void SkQuadTree::flushDeferredInserts() {
-    if (NULL == fRoot) {
-        fRoot = fNodePool.acquire();
-        fRoot->fBounds = fRootBounds;
-    }
-    while(!fDeferred.isEmpty()) {
-        this->insert(fRoot, fDeferred.pop());
-    }
-}
diff --git a/gfx/skia/skia/src/core/SkQuadTree.h b/gfx/skia/skia/src/core/SkQuadTree.h
deleted file mode 100644
index bf1bc8ebbac3..000000000000
--- a/gfx/skia/skia/src/core/SkQuadTree.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkQuadTree_DEFINED
-#define SkQuadTree_DEFINED
-
-#include "SkRect.h"
-#include "SkTDArray.h"
-#include "SkBBoxHierarchy.h"
-#include "SkTInternalSList.h"
-#include "SkTObjectPool.h"
-
-/**
- * A QuadTree implementation. In short, it is a tree containing a hierarchy of bounding rectangles
- * in which each internal node has exactly four children.
- *
- * For more details see:
- *
- * http://en.wikipedia.org/wiki/Quadtree
- */
-class SkQuadTree : public SkBBoxHierarchy {
-public:
-    SK_DECLARE_INST_COUNT(SkQuadTree)
-
-    /**
-     * Quad tree constructor.
-     * @param bounds The bounding box for the root of the quad tree.
-     *               giving the quad tree bounds that fall outside the root
-     *               bounds may result in pathological but correct behavior.
-     */
-    SkQuadTree(const SkIRect& bounds);
-
-    virtual ~SkQuadTree();
-
-    /**
-     * Insert a node, consisting of bounds and a data value into the tree, if we don't immediately
-     * need to use the tree; we may allow the insert to be deferred (this can allow us to bulk-load
-     * a large batch of nodes at once, which tends to be faster and produce a better tree).
-     *  @param data The data value
-     *  @param bounds The corresponding bounding box
-     *  @param defer Can this insert be deferred? (this may be ignored)
-     */
-    virtual void insert(void* data, const SkIRect& bounds, bool defer = false) SK_OVERRIDE;
-
-    /**
-     * If any inserts have been deferred, this will add them into the tree
-     */
-    virtual void flushDeferredInserts() SK_OVERRIDE;
-
-    /**
-     * Given a query rectangle, populates the passed-in array with the elements it intersects
-     */
-    virtual void search(const SkIRect& query, SkTDArray<void*>* results) SK_OVERRIDE;
-
-    virtual void clear() SK_OVERRIDE;
-
-    /**
-     * Gets the depth of the tree structure
-     */
-    virtual int getDepth() const SK_OVERRIDE;
-
-    /**
-     * This gets the insertion count (rather than the node count)
-     */
-    virtual int getCount() const SK_OVERRIDE {
-        return fEntryPool.allocated() - fEntryPool.available();
-    }
-
-    virtual void rewindInserts() SK_OVERRIDE;
-
-private:
-    struct Entry {
-        Entry() : fData(NULL) {}
-        SkIRect fBounds;
-        void* fData;
-        SK_DECLARE_INTERNAL_SLIST_INTERFACE(Entry);
-    };
-
-    static const int kChildCount = 4;
-
-    struct Node {
-        Node() {
-            for (int index=0; index<kChildCount; ++index) {
-                fChildren[index] = NULL;
-            }
-        }
-        SkTInternalSList<Entry> fEntries;
-        SkIRect fBounds;
-        SkIPoint fSplitPoint; // Only valid if the node has children.
-        Node* fChildren[kChildCount];
-        SK_DECLARE_INTERNAL_SLIST_ADAPTER(Node, fChildren[0]);
-    };
-
-    SkTObjectPool<Entry> fEntryPool;
-    SkTObjectPool<Node> fNodePool;
-    Node* fRoot;
-    SkIRect fRootBounds;
-    SkTInternalSList<Entry> fDeferred;
-
-    void insert(Node* node, Entry* entry);
-    void split(Node* node);
-    void search(Node* node, const SkIRect& query, SkTDArray<void*>* results) const;
-    void clear(Node* node);
-    int getDepth(Node* node) const;
-
-    typedef SkBBoxHierarchy INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/core/SkRRect.cpp b/gfx/skia/skia/src/core/SkRRect.cpp
index 10d3d7676b66..ad62e5bbae82 100644
--- a/gfx/skia/skia/src/core/SkRRect.cpp
+++ b/gfx/skia/skia/src/core/SkRRect.cpp
@@ -11,26 +11,30 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkRRect::setRectXY(const SkRect& rect, SkScalar xRad, SkScalar yRad) {
-    if (rect.isEmpty()) {
+    fRect = rect;
+    fRect.sort();
+
+    if (fRect.isEmpty() || !fRect.isFinite()) {
         this->setEmpty();
         return;
     }
 
+    if (!SkScalarsAreFinite(xRad, yRad)) {
+        xRad = yRad = 0;    // devolve into a simple rect
+    }
     if (xRad <= 0 || yRad <= 0) {
         // all corners are square in this case
         this->setRect(rect);
         return;
     }
 
-    if (rect.width() < xRad+xRad || rect.height() < yRad+yRad) {
-        SkScalar scale = SkMinScalar(SkScalarDiv(rect.width(), xRad + xRad),
-                                     SkScalarDiv(rect.height(), yRad + yRad));
+    if (fRect.width() < xRad+xRad || fRect.height() < yRad+yRad) {
+        SkScalar scale = SkMinScalar(fRect.width() / (xRad + xRad), fRect.height() / (yRad + yRad));
         SkASSERT(scale < SK_Scalar1);
         xRad = SkScalarMul(xRad, scale);
         yRad = SkScalarMul(yRad, scale);
     }
 
-    fRect = rect;
     for (int i = 0; i < 4; ++i) {
         fRadii[i].set(xRad, yRad);
     }
@@ -45,22 +49,31 @@ void SkRRect::setRectXY(const SkRect& rect, SkScalar xRad, SkScalar yRad) {
 
 void SkRRect::setNinePatch(const SkRect& rect, SkScalar leftRad, SkScalar topRad,
                            SkScalar rightRad, SkScalar bottomRad) {
-    if (rect.isEmpty()) {
+    fRect = rect;
+    fRect.sort();
+
+    if (fRect.isEmpty() || !fRect.isFinite()) {
         this->setEmpty();
         return;
     }
 
+    const SkScalar array[4] = { leftRad, topRad, rightRad, bottomRad };
+    if (!SkScalarsAreFinite(array, 4)) {
+        this->setRect(rect);    // devolve into a simple rect
+        return;
+    }
+
     leftRad = SkMaxScalar(leftRad, 0);
     topRad = SkMaxScalar(topRad, 0);
     rightRad = SkMaxScalar(rightRad, 0);
     bottomRad = SkMaxScalar(bottomRad, 0);
 
     SkScalar scale = SK_Scalar1;
-    if (leftRad + rightRad > rect.width()) {
-        scale = SkScalarDiv(rect.width(), leftRad + rightRad);
+    if (leftRad + rightRad > fRect.width()) {
+        scale = fRect.width() / (leftRad + rightRad);
     }
-    if (topRad + bottomRad > rect.height()) {
-        scale = SkMinScalar(scale, SkScalarDiv(rect.width(), leftRad + rightRad));
+    if (topRad + bottomRad > fRect.height()) {
+        scale = SkMinScalar(scale, fRect.height() / (topRad + bottomRad));
     }
 
     if (scale < SK_Scalar1) {
@@ -71,7 +84,7 @@ void SkRRect::setNinePatch(const SkRect& rect, SkScalar leftRad, SkScalar topRad
     }
 
     if (leftRad == rightRad && topRad == bottomRad) {
-        if (leftRad >= SkScalarHalf(rect.width()) && topRad >= SkScalarHalf(rect.height())) {
+        if (leftRad >= SkScalarHalf(fRect.width()) && topRad >= SkScalarHalf(fRect.height())) {
             fType = kOval_Type;
         } else if (0 == leftRad || 0 == topRad) {
             // If the left and (by equality check above) right radii are zero then it is a rect.
@@ -88,7 +101,6 @@ void SkRRect::setNinePatch(const SkRect& rect, SkScalar leftRad, SkScalar topRad
         fType = kNinePatch_Type;
     }
 
-    fRect = rect;
     fRadii[kUpperLeft_Corner].set(leftRad, topRad);
     fRadii[kUpperRight_Corner].set(rightRad, topRad);
     fRadii[kLowerRight_Corner].set(rightRad, bottomRad);
@@ -97,14 +109,52 @@ void SkRRect::setNinePatch(const SkRect& rect, SkScalar leftRad, SkScalar topRad
     SkDEBUGCODE(this->validate();)
 }
 
+/*
+ *  TODO: clean this guy up and possibly add to SkScalar.h
+ */
+static inline SkScalar SkScalarDecULP(SkScalar value) {
+#if SK_SCALAR_IS_FLOAT
+        return SkBits2Float(SkFloat2Bits(value) - 1);
+#else
+    #error "need impl for doubles"
+#endif
+}
+
+ /**
+ *  We need all combinations of predicates to be true to have a "safe" radius value.
+ */
+static SkScalar clamp_radius_check_predicates(SkScalar rad, SkScalar min, SkScalar max) {
+    SkASSERT(min < max);
+    if (rad > max - min || min + rad > max || max - rad < min) {
+        rad = SkScalarDecULP(rad);
+    }
+    return rad;
+}
+
+// These parameters intentionally double. Apropos crbug.com/463920, if one of the
+// radii is huge while the other is small, single precision math can completely
+// miss the fact that a scale is required.
+static double compute_min_scale(double rad1, double rad2, double limit, double curMin) {
+    if ((rad1 + rad2) > limit) {
+        return SkTMin(curMin, limit / (rad1 + rad2));
+    }
+    return curMin;
+}
 
 void SkRRect::setRectRadii(const SkRect& rect, const SkVector radii[4]) {
-    if (rect.isEmpty()) {
+    fRect = rect;
+    fRect.sort();
+
+    if (fRect.isEmpty() || !fRect.isFinite()) {
         this->setEmpty();
         return;
     }
 
-    fRect = rect;
+    if (!SkScalarsAreFinite(&radii[0].fX, 8)) {
+        this->setRect(rect);    // devolve into a simple rect
+        return;
+    }
+
     memcpy(fRadii, radii, sizeof(fRadii));
 
     bool allCornersSquare = true;
@@ -138,36 +188,33 @@ void SkRRect::setRectRadii(const SkRect& rect, const SkVector radii[4]) {
     //   and Ltop = Lbottom = the width of the box,
     //   and Lleft = Lright = the height of the box.
     // If f < 1, then all corner radii are reduced by multiplying them by f."
-    SkScalar scale = SK_Scalar1;
+    double scale = 1.0;
 
-    if (fRadii[0].fX + fRadii[1].fX > rect.width()) {
-        scale = SkMinScalar(scale,
-                            SkScalarDiv(rect.width(), fRadii[0].fX + fRadii[1].fX));
-    }
-    if (fRadii[1].fY + fRadii[2].fY > rect.height()) {
-        scale = SkMinScalar(scale,
-                            SkScalarDiv(rect.height(), fRadii[1].fY + fRadii[2].fY));
-    }
-    if (fRadii[2].fX + fRadii[3].fX > rect.width()) {
-        scale = SkMinScalar(scale,
-                            SkScalarDiv(rect.width(), fRadii[2].fX + fRadii[3].fX));
-    }
-    if (fRadii[3].fY + fRadii[0].fY > rect.height()) {
-        scale = SkMinScalar(scale,
-                            SkScalarDiv(rect.height(), fRadii[3].fY + fRadii[0].fY));
-    }
+    scale = compute_min_scale(fRadii[0].fX, fRadii[1].fX, fRect.width(),  scale);
+    scale = compute_min_scale(fRadii[1].fY, fRadii[2].fY, fRect.height(), scale);
+    scale = compute_min_scale(fRadii[2].fX, fRadii[3].fX, fRect.width(),  scale);
+    scale = compute_min_scale(fRadii[3].fY, fRadii[0].fY, fRect.height(), scale);
 
-    if (scale < SK_Scalar1) {
+    if (scale < 1.0) {
         for (int i = 0; i < 4; ++i) {
-            fRadii[i].fX = SkScalarMul(fRadii[i].fX, scale);
-            fRadii[i].fY = SkScalarMul(fRadii[i].fY, scale);
+            fRadii[i].fX *= scale;
+            fRadii[i].fY *= scale;
         }
     }
 
-    // At this point we're either oval, simple, or complex (not empty or rect)
-    // but we lazily resolve the type to avoid the work if the information
-    // isn't required.
-    fType = (SkRRect::Type) kUnknown_Type;
+    // https://bug.skia.org/3239 -- its possible that we can hit the following inconsistency:
+    //     rad == bounds.bottom - bounds.top
+    //     bounds.bottom - radius < bounds.top
+    //     YIKES
+    // We need to detect and "fix" this now, otherwise we can have the following wackiness:
+    //     path.addRRect(rrect);
+    //     rrect.rect() != path.getBounds()
+    for (int i = 0; i < 4; ++i) {
+        fRadii[i].fX = clamp_radius_check_predicates(fRadii[i].fX, fRect.fLeft, fRect.fRight);
+        fRadii[i].fY = clamp_radius_check_predicates(fRadii[i].fY, fRect.fTop, fRect.fBottom);
+    }
+    // At this point we're either oval, simple, or complex (not empty or rect).
+    this->computeType();
 
     SkDEBUGCODE(this->validate();)
 }
@@ -263,8 +310,12 @@ static bool radii_are_nine_patch(const SkVector radii[4]) {
 }
 
 // There is a simplified version of this method in setRectXY
-void SkRRect::computeType() const {
-    SkDEBUGCODE(this->validate();)
+void SkRRect::computeType() {
+    struct Validator {
+        Validator(const SkRRect* r) : fR(r) {}
+        ~Validator() { SkDEBUGCODE(fR->validate();) }
+        const SkRRect* fR;
+    } autoValidate(this);
 
     if (fRect.isEmpty()) {
         fType = kEmpty_Type;
@@ -314,7 +365,7 @@ static bool matrix_only_scale_and_translate(const SkMatrix& matrix) {
 }
 
 bool SkRRect::transform(const SkMatrix& matrix, SkRRect* dst) const {
-    if (NULL == dst) {
+    if (nullptr == dst) {
         return false;
     }
 
@@ -339,6 +390,13 @@ bool SkRRect::transform(const SkMatrix& matrix, SkRRect* dst) const {
         return false;
     }
 
+    // The matrix may have scaled us to zero (or due to float madness, we now have collapsed
+    // some dimension of the rect, so we need to check for that.
+    if (newRect.isEmpty()) {
+        dst->setEmpty();
+        return true;
+    }
+
     // At this point, this is guaranteed to succeed, so we can modify dst.
     dst->fRect = newRect;
 
@@ -398,9 +456,8 @@ bool SkRRect::transform(const SkMatrix& matrix, SkRRect* dst) const {
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkRRect::inset(SkScalar dx, SkScalar dy, SkRRect* dst) const {
-    SkRect r = fRect;
+    const SkRect r = fRect.makeInset(dx, dy);
 
-    r.inset(dx, dy);
     if (r.isEmpty()) {
         dst->setEmpty();
         return;
@@ -445,21 +502,41 @@ size_t SkRRect::readFromMemory(const void* buffer, size_t length) {
     return kSizeInMemory;
 }
 
-#ifdef SK_DEVELOPER
-void SkRRect::dump() const {
-    SkDebugf("Rect: ");
-    fRect.dump();
-    SkDebugf(" Corners: { TL: (%f, %f), TR: (%f, %f), BR: (%f, %f), BL: (%f, %f) }",
-             fRadii[kUpperLeft_Corner].fX,  fRadii[kUpperLeft_Corner].fY,
-             fRadii[kUpperRight_Corner].fX, fRadii[kUpperRight_Corner].fY,
-             fRadii[kLowerRight_Corner].fX, fRadii[kLowerRight_Corner].fY,
-             fRadii[kLowerLeft_Corner].fX,  fRadii[kLowerLeft_Corner].fY);
+#include "SkString.h"
+#include "SkStringUtils.h"
+
+void SkRRect::dump(bool asHex) const {
+    SkScalarAsStringType asType = asHex ? kHex_SkScalarAsStringType : kDec_SkScalarAsStringType;
+
+    fRect.dump(asHex);
+    SkString line("const SkPoint corners[] = {\n");
+    for (int i = 0; i < 4; ++i) {
+        SkString strX, strY;
+        SkAppendScalar(&strX, fRadii[i].x(), asType);
+        SkAppendScalar(&strY, fRadii[i].y(), asType);
+        line.appendf("    { %s, %s },", strX.c_str(), strY.c_str());
+        if (asHex) {
+            line.appendf(" /* %f %f */", fRadii[i].x(), fRadii[i].y());
+        }
+        line.append("\n");
+    }
+    line.append("};");
+    SkDebugf("%s\n", line.c_str());
 }
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef SK_DEBUG
+/**
+ *  We need all combinations of predicates to be true to have a "safe" radius value.
+ */
+static void validate_radius_check_predicates(SkScalar rad, SkScalar min, SkScalar max) {
+    SkASSERT(min <= max);
+    SkASSERT(rad <= max - min);
+    SkASSERT(min + rad <= max);
+    SkASSERT(max - rad >= min);
+}
+
 void SkRRect::validate() const {
     bool allRadiiZero = (0 == fRadii[0].fX && 0 == fRadii[0].fY);
     bool allCornersSquare = (0 == fRadii[0].fX || 0 == fRadii[0].fY);
@@ -512,9 +589,11 @@ void SkRRect::validate() const {
             SkASSERT(!allRadiiZero && !allRadiiSame && !allCornersSquare);
             SkASSERT(!patchesOfNine);
             break;
-        case kUnknown_Type:
-            // no limits on this
-            break;
+    }
+
+    for (int i = 0; i < 4; ++i) {
+        validate_radius_check_predicates(fRadii[i].fX, fRect.fLeft, fRect.fRight);
+        validate_radius_check_predicates(fRadii[i].fY, fRect.fTop, fRect.fBottom);
     }
 }
 #endif // SK_DEBUG
diff --git a/gfx/skia/skia/src/core/SkRTree.cpp b/gfx/skia/skia/src/core/SkRTree.cpp
index fe08437da363..bae2fdce3f86 100644
--- a/gfx/skia/skia/src/core/SkRTree.cpp
+++ b/gfx/skia/skia/src/core/SkRTree.cpp
@@ -6,477 +6,183 @@
  */
 
 #include "SkRTree.h"
-#include "SkTSort.h"
 
-static inline uint32_t get_area(const SkIRect& rect);
-static inline uint32_t get_overlap(const SkIRect& rect1, const SkIRect& rect2);
-static inline uint32_t get_margin(const SkIRect& rect);
-static inline uint32_t get_area_increase(const SkIRect& rect1, SkIRect rect2);
-static inline void join_no_empty_check(const SkIRect& joinWith, SkIRect* out);
+SkRTree::SkRTree(SkScalar aspectRatio) : fCount(0), fAspectRatio(aspectRatio) {}
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-SkRTree* SkRTree::Create(int minChildren, int maxChildren, SkScalar aspectRatio,
-            bool sortWhenBulkLoading) {
-    if (minChildren < maxChildren && (maxChildren + 1) / 2 >= minChildren &&
-        minChildren > 0 && maxChildren < static_cast<int>(SK_MaxU16)) {
-        return new SkRTree(minChildren, maxChildren, aspectRatio, sortWhenBulkLoading);
-    }
-    return NULL;
-}
-
-SkRTree::SkRTree(int minChildren, int maxChildren, SkScalar aspectRatio,
-        bool sortWhenBulkLoading)
-    : fMinChildren(minChildren)
-    , fMaxChildren(maxChildren)
-    , fNodeSize(sizeof(Node) + sizeof(Branch) * maxChildren)
-    , fCount(0)
-    , fNodes(fNodeSize * 256)
-    , fAspectRatio(aspectRatio)
-    , fSortWhenBulkLoading(sortWhenBulkLoading) {
-    SkASSERT(minChildren < maxChildren && minChildren > 0 && maxChildren <
-             static_cast<int>(SK_MaxU16));
-    SkASSERT((maxChildren + 1) / 2 >= minChildren);
-    this->validate();
-}
-
-SkRTree::~SkRTree() {
-    this->clear();
-}
-
-void SkRTree::insert(void* data, const SkIRect& bounds, bool defer) {
-    this->validate();
-    if (bounds.isEmpty()) {
-        SkASSERT(false);
-        return;
-    }
-    Branch newBranch;
-    newBranch.fBounds = bounds;
-    newBranch.fChild.data = data;
-    if (this->isEmpty()) {
-        // since a bulk-load into an existing tree is as of yet unimplemented (and arguably not
-        // of vital importance right now), we only batch up inserts if the tree is empty.
-        if (defer) {
-            fDeferredInserts.push(newBranch);
-            return;
-        } else {
-            fRoot.fChild.subtree = allocateNode(0);
-            fRoot.fChild.subtree->fNumChildren = 0;
-        }
-    }
-
-    Branch* newSibling = insert(fRoot.fChild.subtree, &newBranch);
-    fRoot.fBounds = this->computeBounds(fRoot.fChild.subtree);
-
-    if (NULL != newSibling) {
-        Node* oldRoot = fRoot.fChild.subtree;
-        Node* newRoot = this->allocateNode(oldRoot->fLevel + 1);
-        newRoot->fNumChildren = 2;
-        *newRoot->child(0) = fRoot;
-        *newRoot->child(1) = *newSibling;
-        fRoot.fChild.subtree = newRoot;
-        fRoot.fBounds = this->computeBounds(fRoot.fChild.subtree);
-    }
-
-    ++fCount;
-    this->validate();
-}
-
-void SkRTree::flushDeferredInserts() {
-    this->validate();
-    if (this->isEmpty() && fDeferredInserts.count() > 0) {
-        fCount = fDeferredInserts.count();
-        if (1 == fCount) {
-            fRoot.fChild.subtree = allocateNode(0);
-            fRoot.fChild.subtree->fNumChildren = 0;
-            this->insert(fRoot.fChild.subtree, &fDeferredInserts[0]);
-            fRoot.fBounds = fDeferredInserts[0].fBounds;
-        } else {
-            fRoot = this->bulkLoad(&fDeferredInserts);
-        }
+SkRect SkRTree::getRootBound() const {
+    if (fCount) {
+        return fRoot.fBounds;
     } else {
-        // TODO: some algorithm for bulk loading into an already populated tree
-        SkASSERT(0 == fDeferredInserts.count());
+        return SkRect::MakeEmpty();
     }
-    fDeferredInserts.rewind();
-    this->validate();
 }
 
-void SkRTree::search(const SkIRect& query, SkTDArray<void*>* results) {
-    this->validate();
-    if (0 != fDeferredInserts.count()) {
-        this->flushDeferredInserts();
+void SkRTree::insert(const SkRect boundsArray[], int N) {
+    SkASSERT(0 == fCount);
+
+    SkTDArray<Branch> branches;
+    branches.setReserve(N);
+
+    for (int i = 0; i < N; i++) {
+        const SkRect& bounds = boundsArray[i];
+        if (bounds.isEmpty()) {
+            continue;
+        }
+
+        Branch* b = branches.push();
+        b->fBounds = bounds;
+        b->fOpIndex = i;
     }
-    if (!this->isEmpty() && SkIRect::IntersectsNoEmptyCheck(fRoot.fBounds, query)) {
-        this->search(fRoot.fChild.subtree, query, results);
+
+    fCount = branches.count();
+    if (fCount) {
+        if (1 == fCount) {
+            fNodes.setReserve(1);
+            Node* n = this->allocateNodeAtLevel(0);
+            n->fNumChildren = 1;
+            n->fChildren[0] = branches[0];
+            fRoot.fSubtree = n;
+            fRoot.fBounds  = branches[0].fBounds;
+        } else {
+            fNodes.setReserve(CountNodes(fCount, fAspectRatio));
+            fRoot = this->bulkLoad(&branches);
+        }
     }
-    this->validate();
 }
 
-void SkRTree::clear() {
-    this->validate();
-    fNodes.reset();
-    fDeferredInserts.rewind();
-    fCount = 0;
-    this->validate();
-}
-
-SkRTree::Node* SkRTree::allocateNode(uint16_t level) {
-    Node* out = static_cast<Node*>(fNodes.allocThrow(fNodeSize));
+SkRTree::Node* SkRTree::allocateNodeAtLevel(uint16_t level) {
+    SkDEBUGCODE(Node* p = fNodes.begin());
+    Node* out = fNodes.push();
+    SkASSERT(fNodes.begin() == p);  // If this fails, we didn't setReserve() enough.
     out->fNumChildren = 0;
     out->fLevel = level;
     return out;
 }
 
-SkRTree::Branch* SkRTree::insert(Node* root, Branch* branch, uint16_t level) {
-    Branch* toInsert = branch;
-    if (root->fLevel != level) {
-        int childIndex = this->chooseSubtree(root, branch);
-        toInsert = this->insert(root->child(childIndex)->fChild.subtree, branch, level);
-        root->child(childIndex)->fBounds = this->computeBounds(
-            root->child(childIndex)->fChild.subtree);
+// This function parallels bulkLoad, but just counts how many nodes bulkLoad would allocate.
+int SkRTree::CountNodes(int branches, SkScalar aspectRatio) {
+    if (branches == 1) {
+        return 1;
     }
-    if (NULL != toInsert) {
-        if (root->fNumChildren == fMaxChildren) {
-            // handle overflow by splitting. TODO: opportunistic reinsertion
-
-            // decide on a distribution to divide with
-            Node* newSibling = this->allocateNode(root->fLevel);
-            Branch* toDivide = SkNEW_ARRAY(Branch, fMaxChildren + 1);
-            for (int i = 0; i < fMaxChildren; ++i) {
-                toDivide[i] = *root->child(i);
-            }
-            toDivide[fMaxChildren] = *toInsert;
-            int splitIndex = this->distributeChildren(toDivide);
-
-            // divide up the branches
-            root->fNumChildren = splitIndex;
-            newSibling->fNumChildren = fMaxChildren + 1 - splitIndex;
-            for (int i = 0; i < splitIndex; ++i) {
-                *root->child(i) = toDivide[i];
-            }
-            for (int i = splitIndex; i < fMaxChildren + 1; ++i) {
-                *newSibling->child(i - splitIndex) = toDivide[i];
-            }
-            SkDELETE_ARRAY(toDivide);
-
-            // pass the new sibling branch up to the parent
-            branch->fChild.subtree = newSibling;
-            branch->fBounds = this->computeBounds(newSibling);
-            return branch;
+    int numBranches = branches / kMaxChildren;
+    int remainder   = branches % kMaxChildren;
+    if (remainder > 0) {
+        numBranches++;
+        if (remainder >= kMinChildren) {
+            remainder = 0;
         } else {
-            *root->child(root->fNumChildren) = *toInsert;
-            ++root->fNumChildren;
-            return NULL;
+            remainder = kMinChildren - remainder;
         }
     }
-    return NULL;
-}
-
-int SkRTree::chooseSubtree(Node* root, Branch* branch) {
-    SkASSERT(!root->isLeaf());
-    if (1 < root->fLevel) {
-        // root's child pointers do not point to leaves, so minimize area increase
-        int32_t minAreaIncrease = SK_MaxS32;
-        int32_t minArea         = SK_MaxS32;
-        int32_t bestSubtree     = -1;
-        for (int i = 0; i < root->fNumChildren; ++i) {
-            const SkIRect& subtreeBounds = root->child(i)->fBounds;
-            int32_t areaIncrease = get_area_increase(subtreeBounds, branch->fBounds);
-            // break ties in favor of subtree with smallest area
-            if (areaIncrease < minAreaIncrease || (areaIncrease == minAreaIncrease &&
-                static_cast<int32_t>(get_area(subtreeBounds)) < minArea)) {
-                minAreaIncrease = areaIncrease;
-                minArea = get_area(subtreeBounds);
-                bestSubtree = i;
-            }
-        }
-        SkASSERT(-1 != bestSubtree);
-        return bestSubtree;
-    } else if (1 == root->fLevel) {
-        // root's child pointers do point to leaves, so minimize overlap increase
-        int32_t minOverlapIncrease = SK_MaxS32;
-        int32_t minAreaIncrease    = SK_MaxS32;
-        int32_t bestSubtree = -1;
-        for (int32_t i = 0; i < root->fNumChildren; ++i) {
-            const SkIRect& subtreeBounds = root->child(i)->fBounds;
-            SkIRect expandedBounds = subtreeBounds;
-            join_no_empty_check(branch->fBounds, &expandedBounds);
-            int32_t overlap = 0;
-            for (int32_t j = 0; j < root->fNumChildren; ++j) {
-                if (j == i) continue;
-                // Note: this would be more correct if we subtracted the original pre-expanded
-                // overlap, but computing overlaps is expensive and omitting it doesn't seem to
-                // hurt query performance. See get_overlap_increase()
-                overlap += get_overlap(expandedBounds, root->child(j)->fBounds);
-            }
-            // break ties with lowest area increase
-            if (overlap < minOverlapIncrease || (overlap == minOverlapIncrease &&
-                static_cast<int32_t>(get_area_increase(branch->fBounds, subtreeBounds)) <
-                minAreaIncrease)) {
-                minOverlapIncrease = overlap;
-                minAreaIncrease = get_area_increase(branch->fBounds, subtreeBounds);
-                bestSubtree = i;
-            }
-        }
-        return bestSubtree;
-    } else {
-        SkASSERT(false);
-        return 0;
-    }
-}
-
-SkIRect SkRTree::computeBounds(Node* n) {
-    SkIRect r = n->child(0)->fBounds;
-    for (int i = 1; i < n->fNumChildren; ++i) {
-        join_no_empty_check(n->child(i)->fBounds, &r);
-    }
-    return r;
-}
-
-int SkRTree::distributeChildren(Branch* children) {
-    // We have two sides to sort by on each of two axes:
-    const static SortSide sorts[2][2] = {
-        {&SkIRect::fLeft, &SkIRect::fRight},
-        {&SkIRect::fTop, &SkIRect::fBottom}
-    };
-
-    // We want to choose an axis to split on, then a distribution along that axis; we'll need
-    // three pieces of info: the split axis, the side to sort by on that axis, and the index
-    // to split the sorted array on.
-    int32_t sortSide = -1;
-    int32_t k        = -1;
-    int32_t axis     = -1;
-    int32_t bestS    = SK_MaxS32;
-
-    // Evaluate each axis, we want the min summed margin-value (s) over all distributions
-    for (int i = 0; i < 2; ++i) {
-        int32_t minOverlap   = SK_MaxS32;
-        int32_t minArea      = SK_MaxS32;
-        int32_t axisBestK    = 0;
-        int32_t axisBestSide = 0;
-        int32_t s = 0;
-
-        // Evaluate each sort
-        for (int j = 0; j < 2; ++j) {
-            SkTQSort(children, children + fMaxChildren, RectLessThan(sorts[i][j]));
-
-            // Evaluate each split index
-            for (int32_t k = 1; k <= fMaxChildren - 2 * fMinChildren + 2; ++k) {
-                SkIRect r1 = children[0].fBounds;
-                SkIRect r2 = children[fMinChildren + k - 1].fBounds;
-                for (int32_t l = 1; l < fMinChildren - 1 + k; ++l) {
-                    join_no_empty_check(children[l].fBounds, &r1);
-                }
-                for (int32_t l = fMinChildren + k; l < fMaxChildren + 1; ++l) {
-                    join_no_empty_check(children[l].fBounds, &r2);
-                }
-
-                int32_t area = get_area(r1) + get_area(r2);
-                int32_t overlap = get_overlap(r1, r2);
-                s += get_margin(r1) + get_margin(r2);
-
-                if (overlap < minOverlap || (overlap == minOverlap && area < minArea)) {
-                    minOverlap = overlap;
-                    minArea = area;
-                    axisBestSide = j;
-                    axisBestK = k;
+    int numStrips = SkScalarCeilToInt(SkScalarSqrt(SkIntToScalar(numBranches) / aspectRatio));
+    int numTiles  = SkScalarCeilToInt(SkIntToScalar(numBranches) / SkIntToScalar(numStrips));
+    int currentBranch = 0;
+    int nodes = 0;
+    for (int i = 0; i < numStrips; ++i) {
+        for (int j = 0; j < numTiles && currentBranch < branches; ++j) {
+            int incrementBy = kMaxChildren;
+            if (remainder != 0) {
+                if (remainder <= kMaxChildren - kMinChildren) {
+                    incrementBy -= remainder;
+                    remainder = 0;
+                } else {
+                    incrementBy = kMinChildren;
+                    remainder -= kMaxChildren - kMinChildren;
                 }
             }
-        }
-
-        if (s < bestS) {
-            bestS = s;
-            axis = i;
-            sortSide = axisBestSide;
-            k = axisBestK;
-        }
-    }
-
-    // replicate the sort of the winning distribution, (we can skip this if the last
-    // sort ended up being best)
-    if (!(axis == 1 && sortSide == 1)) {
-        SkTQSort(children, children + fMaxChildren, RectLessThan(sorts[axis][sortSide]));
-    }
-
-    return fMinChildren - 1 + k;
-}
-
-void SkRTree::search(Node* root, const SkIRect query, SkTDArray<void*>* results) const {
-    for (int i = 0; i < root->fNumChildren; ++i) {
-        if (SkIRect::IntersectsNoEmptyCheck(root->child(i)->fBounds, query)) {
-            if (root->isLeaf()) {
-                results->push(root->child(i)->fChild.data);
-            } else {
-                this->search(root->child(i)->fChild.subtree, query, results);
+            nodes++;
+            currentBranch++;
+            for (int k = 1; k < incrementBy && currentBranch < branches; ++k) {
+                currentBranch++;
             }
         }
     }
+    return nodes + CountNodes(nodes, aspectRatio);
 }
 
 SkRTree::Branch SkRTree::bulkLoad(SkTDArray<Branch>* branches, int level) {
-    if (branches->count() == 1) {
-        // Only one branch: it will be the root
-        Branch out = (*branches)[0];
-        branches->rewind();
-        return out;
-    } else {
-        // We sort the whole list by y coordinates, if we are told to do so.
-        //
-        // We expect Webkit / Blink to give us a reasonable x,y order.
-        // Avoiding this call resulted in a 17% win for recording with
-        // negligible difference in playback speed.
-        if (fSortWhenBulkLoading) {
-            SkTQSort(branches->begin(), branches->end() - 1, RectLessY());
-        }
-
-        int numBranches = branches->count() / fMaxChildren;
-        int remainder = branches->count() % fMaxChildren;
-        int newBranches = 0;
-
-        if (0 != remainder) {
-            ++numBranches;
-            // If the remainder isn't enough to fill a node, we'll need to add fewer nodes to
-            // some other branches to make up for it
-            if (remainder >= fMinChildren) {
-                remainder = 0;
-            } else {
-                remainder = fMinChildren - remainder;
-            }
-        }
-
-        int numStrips = SkScalarCeilToInt(SkScalarSqrt(SkIntToScalar(numBranches) *
-                                     SkScalarInvert(fAspectRatio)));
-        int numTiles = SkScalarCeilToInt(SkIntToScalar(numBranches) /
-                                    SkIntToScalar(numStrips));
-        int currentBranch = 0;
-
-        for (int i = 0; i < numStrips; ++i) {
-            // Once again, if we are told to do so, we sort by x.
-            if (fSortWhenBulkLoading) {
-                int begin = currentBranch;
-                int end = currentBranch + numTiles * fMaxChildren - SkMin32(remainder,
-                        (fMaxChildren - fMinChildren) * numTiles);
-                if (end > branches->count()) {
-                    end = branches->count();
-                }
-
-                // Now we sort horizontal strips of rectangles by their x coords
-                SkTQSort(branches->begin() + begin, branches->begin() + end - 1, RectLessX());
-            }
-
-            for (int j = 0; j < numTiles && currentBranch < branches->count(); ++j) {
-                int incrementBy = fMaxChildren;
-                if (remainder != 0) {
-                    // if need be, omit some nodes to make up for remainder
-                    if (remainder <= fMaxChildren - fMinChildren) {
-                        incrementBy -= remainder;
-                        remainder = 0;
-                    } else {
-                        incrementBy = fMinChildren;
-                        remainder -= fMaxChildren - fMinChildren;
-                    }
-                }
-                Node* n = allocateNode(level);
-                n->fNumChildren = 1;
-                *n->child(0) = (*branches)[currentBranch];
-                Branch b;
-                b.fBounds = (*branches)[currentBranch].fBounds;
-                b.fChild.subtree = n;
-                ++currentBranch;
-                for (int k = 1; k < incrementBy && currentBranch < branches->count(); ++k) {
-                    b.fBounds.join((*branches)[currentBranch].fBounds);
-                    *n->child(k) = (*branches)[currentBranch];
-                    ++n->fNumChildren;
-                    ++currentBranch;
-                }
-                (*branches)[newBranches] = b;
-                ++newBranches;
-            }
-        }
-        branches->setCount(newBranches);
-        return this->bulkLoad(branches, level + 1);
+    if (branches->count() == 1) { // Only one branch.  It will be the root.
+        return (*branches)[0];
     }
-}
 
-void SkRTree::validate() {
-#ifdef SK_DEBUG
-    if (this->isEmpty()) {
-        return;
-    }
-    SkASSERT(fCount == this->validateSubtree(fRoot.fChild.subtree, fRoot.fBounds, true));
-#endif
-}
+    // We might sort our branches here, but we expect Blink gives us a reasonable x,y order.
+    // Skipping a call to sort (in Y) here resulted in a 17% win for recording with negligible
+    // difference in playback speed.
+    int numBranches = branches->count() / kMaxChildren;
+    int remainder   = branches->count() % kMaxChildren;
+    int newBranches = 0;
 
-int SkRTree::validateSubtree(Node* root, SkIRect bounds, bool isRoot) {
-    // make sure the pointer is pointing to a valid place
-    SkASSERT(fNodes.contains(static_cast<void*>(root)));
-
-    if (isRoot) {
-        // If the root of this subtree is the overall root, we have looser standards:
-        if (root->isLeaf()) {
-            SkASSERT(root->fNumChildren >= 1 && root->fNumChildren <= fMaxChildren);
+    if (remainder > 0) {
+        ++numBranches;
+        // If the remainder isn't enough to fill a node, we'll add fewer nodes to other branches.
+        if (remainder >= kMinChildren) {
+            remainder = 0;
         } else {
-            SkASSERT(root->fNumChildren >= 2 && root->fNumChildren <= fMaxChildren);
+            remainder = kMinChildren - remainder;
         }
-    } else {
-        SkASSERT(root->fNumChildren >= fMinChildren && root->fNumChildren <= fMaxChildren);
     }
 
-    for (int i = 0; i < root->fNumChildren; ++i) {
-        SkASSERT(bounds.contains(root->child(i)->fBounds));
-    }
+    int numStrips = SkScalarCeilToInt(SkScalarSqrt(SkIntToScalar(numBranches) / fAspectRatio));
+    int numTiles  = SkScalarCeilToInt(SkIntToScalar(numBranches) / SkIntToScalar(numStrips));
+    int currentBranch = 0;
 
-    if (root->isLeaf()) {
-        SkASSERT(0 == root->fLevel);
-        return root->fNumChildren;
-    } else {
-        int childCount = 0;
-        for (int i = 0; i < root->fNumChildren; ++i) {
-            SkASSERT(root->child(i)->fChild.subtree->fLevel == root->fLevel - 1);
-            childCount += this->validateSubtree(root->child(i)->fChild.subtree,
-                                                root->child(i)->fBounds);
+    for (int i = 0; i < numStrips; ++i) {
+        // Might be worth sorting by X here too.
+        for (int j = 0; j < numTiles && currentBranch < branches->count(); ++j) {
+            int incrementBy = kMaxChildren;
+            if (remainder != 0) {
+                // if need be, omit some nodes to make up for remainder
+                if (remainder <= kMaxChildren - kMinChildren) {
+                    incrementBy -= remainder;
+                    remainder = 0;
+                } else {
+                    incrementBy = kMinChildren;
+                    remainder -= kMaxChildren - kMinChildren;
+                }
+            }
+            Node* n = allocateNodeAtLevel(level);
+            n->fNumChildren = 1;
+            n->fChildren[0] = (*branches)[currentBranch];
+            Branch b;
+            b.fBounds = (*branches)[currentBranch].fBounds;
+            b.fSubtree = n;
+            ++currentBranch;
+            for (int k = 1; k < incrementBy && currentBranch < branches->count(); ++k) {
+                b.fBounds.join((*branches)[currentBranch].fBounds);
+                n->fChildren[k] = (*branches)[currentBranch];
+                ++n->fNumChildren;
+                ++currentBranch;
+            }
+            (*branches)[newBranches] = b;
+            ++newBranches;
         }
-        return childCount;
+    }
+    branches->setCount(newBranches);
+    return this->bulkLoad(branches, level + 1);
+}
+
+void SkRTree::search(const SkRect& query, SkTDArray<int>* results) const {
+    if (fCount > 0 && SkRect::Intersects(fRoot.fBounds, query)) {
+        this->search(fRoot.fSubtree, query, results);
     }
 }
 
-void SkRTree::rewindInserts() {
-    SkASSERT(this->isEmpty()); // Currently only supports deferred inserts
-    while (!fDeferredInserts.isEmpty() &&
-           fClient->shouldRewind(fDeferredInserts.top().fChild.data)) {
-        fDeferredInserts.pop();
+void SkRTree::search(Node* node, const SkRect& query, SkTDArray<int>* results) const {
+    for (int i = 0; i < node->fNumChildren; ++i) {
+        if (SkRect::Intersects(node->fChildren[i].fBounds, query)) {
+            if (0 == node->fLevel) {
+                results->push(node->fChildren[i].fOpIndex);
+            } else {
+                this->search(node->fChildren[i].fSubtree, query, results);
+            }
+        }
     }
 }
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
+size_t SkRTree::bytesUsed() const {
+    size_t byteCount = sizeof(SkRTree);
 
-static inline uint32_t get_area(const SkIRect& rect) {
-    return rect.width() * rect.height();
-}
+    byteCount += fNodes.reserved() * sizeof(Node);
 
-static inline uint32_t get_overlap(const SkIRect& rect1, const SkIRect& rect2) {
-    // I suspect there's a more efficient way of computing this...
-    return SkMax32(0, SkMin32(rect1.fRight, rect2.fRight) - SkMax32(rect1.fLeft, rect2.fLeft)) *
-           SkMax32(0, SkMin32(rect1.fBottom, rect2.fBottom) - SkMax32(rect1.fTop, rect2.fTop));
-}
-
-// Get the margin (aka perimeter)
-static inline uint32_t get_margin(const SkIRect& rect) {
-    return 2 * (rect.width() + rect.height());
-}
-
-static inline uint32_t get_area_increase(const SkIRect& rect1, SkIRect rect2) {
-    join_no_empty_check(rect1, &rect2);
-    return get_area(rect2) - get_area(rect1);
-}
-
-// Expand 'out' to include 'joinWith'
-static inline void join_no_empty_check(const SkIRect& joinWith, SkIRect* out) {
-    // since we check for empty bounds on insert, we know we'll never have empty rects
-    // and we can save the empty check that SkIRect::join requires
-    if (joinWith.fLeft < out->fLeft) { out->fLeft = joinWith.fLeft; }
-    if (joinWith.fTop < out->fTop) { out->fTop = joinWith.fTop; }
-    if (joinWith.fRight > out->fRight) { out->fRight = joinWith.fRight; }
-    if (joinWith.fBottom > out->fBottom) { out->fBottom = joinWith.fBottom; }
+    return byteCount;
 }
diff --git a/gfx/skia/skia/src/core/SkRTree.h b/gfx/skia/skia/src/core/SkRTree.h
index d21b5f8d3716..557817189d18 100644
--- a/gfx/skia/skia/src/core/SkRTree.h
+++ b/gfx/skia/skia/src/core/SkRTree.h
@@ -9,191 +9,88 @@
 #ifndef SkRTree_DEFINED
 #define SkRTree_DEFINED
 
+#include "SkBBoxHierarchy.h"
 #include "SkRect.h"
 #include "SkTDArray.h"
-#include "SkChunkAlloc.h"
-#include "SkBBoxHierarchy.h"
 
 /**
  * An R-Tree implementation. In short, it is a balanced n-ary tree containing a hierarchy of
  * bounding rectangles.
  *
- * Much like a B-Tree it maintains balance by enforcing minimum and maximum child counts, and
- * splitting nodes when they become overfull. Unlike B-trees, however, we're using spatial data; so
- * there isn't a canonical ordering to use when choosing insertion locations and splitting
- * distributions. A variety of heuristics have been proposed for these problems; here, we're using
- * something resembling an R*-tree, which attempts to minimize area and overlap during insertion,
- * and aims to minimize a combination of margin, overlap, and area when splitting.
+ * It only supports bulk-loading, i.e. creation from a batch of bounding rectangles.
+ * This performs a bottom-up bulk load using the STR (sort-tile-recursive) algorithm.
  *
- * One detail that is thus far unimplemented that may improve tree quality is attempting to remove
- * and reinsert nodes when they become full, instead of immediately splitting (nodes that may have
- * been placed well early on may hurt the tree later when more nodes have been added; removing
- * and reinserting nodes generally helps reduce overlap and make a better tree). Deletion of nodes
- * is also unimplemented.
+ * TODO: Experiment with other bulk-load algorithms (in particular the Hilbert pack variant,
+ * which groups rects by position on the Hilbert curve, is probably worth a look). There also
+ * exist top-down bulk load variants (VAMSplit, TopDownGreedy, etc).
  *
  * For more details see:
  *
  *  Beckmann, N.; Kriegel, H. P.; Schneider, R.; Seeger, B. (1990). "The R*-tree:
  *      an efficient and robust access method for points and rectangles"
- *
- * It also supports bulk-loading from a batch of bounds and values; if you don't require the tree
- * to be usable in its intermediate states while it is being constructed, this is significantly
- * quicker than individual insertions and produces more consistent trees.
  */
 class SkRTree : public SkBBoxHierarchy {
 public:
-    SK_DECLARE_INST_COUNT(SkRTree)
+
 
     /**
-     * Create a new R-Tree with specified min/max child counts.
-     * The child counts are valid iff:
-     * - (max + 1) / 2 >= min (splitting an overfull node must be enough to populate 2 nodes)
-     * - min < max
-     * - min > 0
-     * - max < SK_MaxU16
      * If you have some prior information about the distribution of bounds you're expecting, you
-     * can provide an optional aspect ratio parameter. This allows the bulk-load algorithm to create
-     * better proportioned tiles of rectangles.
+     * can provide an optional aspect ratio parameter. This allows the bulk-load algorithm to
+     * create better proportioned tiles of rectangles.
      */
-    static SkRTree* Create(int minChildren, int maxChildren, SkScalar aspectRatio = 1,
-            bool orderWhenBulkLoading = true);
-    virtual ~SkRTree();
+    explicit SkRTree(SkScalar aspectRatio = 1);
+    virtual ~SkRTree() {}
 
-    /**
-     * Insert a node, consisting of bounds and a data value into the tree, if we don't immediately
-     * need to use the tree; we may allow the insert to be deferred (this can allow us to bulk-load
-     * a large batch of nodes at once, which tends to be faster and produce a better tree).
-     *  @param data The data value
-     *  @param bounds The corresponding bounding box
-     *  @param defer Can this insert be deferred? (this may be ignored)
-     */
-    virtual void insert(void* data, const SkIRect& bounds, bool defer = false) SK_OVERRIDE;
+    void insert(const SkRect[], int N) override;
+    void search(const SkRect& query, SkTDArray<int>* results) const override;
+    size_t bytesUsed() const override;
 
-    /**
-     * If any inserts have been deferred, this will add them into the tree
-     */
-    virtual void flushDeferredInserts() SK_OVERRIDE;
+    // Methods and constants below here are only public for tests.
 
-    /**
-     * Given a query rectangle, populates the passed-in array with the elements it intersects
-     */
-    virtual void search(const SkIRect& query, SkTDArray<void*>* results) SK_OVERRIDE;
+    // Return the depth of the tree structure.
+    int getDepth() const { return fCount ? fRoot.fSubtree->fLevel + 1 : 0; }
+    // Insertion count (not overall node count, which may be greater).
+    int getCount() const { return fCount; }
 
-    virtual void clear() SK_OVERRIDE;
-    bool isEmpty() const { return 0 == fCount; }
+    // Get the root bound.
+    SkRect getRootBound() const override;
 
-    /**
-     * Gets the depth of the tree structure
-     */
-    virtual int getDepth() const SK_OVERRIDE {
-        return this->isEmpty() ? 0 : fRoot.fChild.subtree->fLevel + 1;
-    }
-
-    /**
-     * This gets the insertion count (rather than the node count)
-     */
-    virtual int getCount() const SK_OVERRIDE { return fCount; }
-
-    virtual void rewindInserts() SK_OVERRIDE;
+    // These values were empirically determined to produce reasonable performance in most cases.
+    static const int kMinChildren = 6,
+                     kMaxChildren = 11;
 
 private:
-
     struct Node;
 
-    /**
-     * A branch of the tree, this may contain a pointer to another interior node, or a data value
-     */
     struct Branch {
         union {
-            Node* subtree;
-            void* data;
-        } fChild;
-        SkIRect fBounds;
+            Node* fSubtree;
+            int fOpIndex;
+        };
+        SkRect fBounds;
     };
 
-    /**
-     * A node in the tree, has between fMinChildren and fMaxChildren (the root is a special case)
-     */
     struct Node {
         uint16_t fNumChildren;
         uint16_t fLevel;
-        bool isLeaf() { return 0 == fLevel; }
-        // Since we want to be able to pick min/max child counts at runtime, we assume the creator
-        // has allocated sufficient space directly after us in memory, and index into that space
-        Branch* child(size_t index) {
-            return reinterpret_cast<Branch*>(this + 1) + index;
-        }
+        Branch fChildren[kMaxChildren];
     };
 
-    typedef int32_t SkIRect::*SortSide;
+    void search(Node* root, const SkRect& query, SkTDArray<int>* results) const;
 
-    // Helper for sorting our children arrays by sides of their rects
-    struct RectLessThan {
-        RectLessThan(SkRTree::SortSide side) : fSide(side) { }
-        bool operator()(const SkRTree::Branch lhs, const SkRTree::Branch rhs) const {
-            return lhs.fBounds.*fSide < rhs.fBounds.*fSide;
-        }
-    private:
-        const SkRTree::SortSide fSide;
-    };
-
-    struct RectLessX {
-        bool operator()(const SkRTree::Branch lhs, const SkRTree::Branch rhs) {
-            return ((lhs.fBounds.fRight - lhs.fBounds.fLeft) >> 1) <
-                   ((rhs.fBounds.fRight - lhs.fBounds.fLeft) >> 1);
-        }
-    };
-
-    struct RectLessY {
-        bool operator()(const SkRTree::Branch lhs, const SkRTree::Branch rhs) {
-            return ((lhs.fBounds.fBottom - lhs.fBounds.fTop) >> 1) <
-                   ((rhs.fBounds.fBottom - lhs.fBounds.fTop) >> 1);
-        }
-    };
-
-    SkRTree(int minChildren, int maxChildren, SkScalar aspectRatio, bool orderWhenBulkLoading);
-
-    /**
-     * Recursively descend the tree to find an insertion position for 'branch', updates
-     * bounding boxes on the way up.
-     */
-    Branch* insert(Node* root, Branch* branch, uint16_t level = 0);
-
-    int chooseSubtree(Node* root, Branch* branch);
-    SkIRect computeBounds(Node* n);
-    int distributeChildren(Branch* children);
-    void search(Node* root, const SkIRect query, SkTDArray<void*>* results) const;
-
-    /**
-     * This performs a bottom-up bulk load using the STR (sort-tile-recursive) algorithm, this
-     * seems to generally produce better, more consistent trees at significantly lower cost than
-     * repeated insertions.
-     *
-     * This consumes the input array.
-     *
-     * TODO: Experiment with other bulk-load algorithms (in particular the Hilbert pack variant,
-     * which groups rects by position on the Hilbert curve, is probably worth a look). There also
-     * exist top-down bulk load variants (VAMSplit, TopDownGreedy, etc).
-     */
+    // Consumes the input array.
     Branch bulkLoad(SkTDArray<Branch>* branches, int level = 0);
 
-    void validate();
-    int validateSubtree(Node* root, SkIRect bounds, bool isRoot = false);
+    // How many times will bulkLoad() call allocateNodeAtLevel()?
+    static int CountNodes(int branches, SkScalar aspectRatio);
 
-    const int fMinChildren;
-    const int fMaxChildren;
-    const size_t fNodeSize;
+    Node* allocateNodeAtLevel(uint16_t level);
 
     // This is the count of data elements (rather than total nodes in the tree)
     int fCount;
-
-    Branch fRoot;
-    SkChunkAlloc fNodes;
-    SkTDArray<Branch> fDeferredInserts;
     SkScalar fAspectRatio;
-    bool fSortWhenBulkLoading;
-
-    Node* allocateNode(uint16_t level);
+    Branch fRoot;
+    SkTDArray<Node> fNodes;
 
     typedef SkBBoxHierarchy INHERITED;
 };
diff --git a/gfx/skia/skia/src/core/SkRWBuffer.cpp b/gfx/skia/skia/src/core/SkRWBuffer.cpp
new file mode 100644
index 000000000000..e9147dc684f7
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkRWBuffer.cpp
@@ -0,0 +1,349 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkRWBuffer.h"
+#include "SkStream.h"
+
+// Force small chunks to be a page's worth
+static const size_t kMinAllocSize = 4096;
+
+struct SkBufferBlock {
+    SkBufferBlock*  fNext;
+    size_t          fUsed;
+    size_t          fCapacity;
+
+    const void* startData() const { return this + 1; };
+
+    size_t avail() const { return fCapacity - fUsed; }
+    void* availData() { return (char*)this->startData() + fUsed; }
+
+    static SkBufferBlock* Alloc(size_t length) {
+        size_t capacity = LengthToCapacity(length);
+        SkBufferBlock* block = (SkBufferBlock*)sk_malloc_throw(sizeof(SkBufferBlock) + capacity);
+        block->fNext = nullptr;
+        block->fUsed = 0;
+        block->fCapacity = capacity;
+        return block;
+    }
+
+    // Return number of bytes actually appended
+    size_t append(const void* src, size_t length) {
+        this->validate();
+        size_t amount = SkTMin(this->avail(), length);
+        memcpy(this->availData(), src, amount);
+        fUsed += amount;
+        this->validate();
+        return amount;
+    }
+
+    void validate() const {
+#ifdef SK_DEBUG
+        SkASSERT(fCapacity > 0);
+        SkASSERT(fUsed <= fCapacity);
+#endif
+    }
+
+private:
+    static size_t LengthToCapacity(size_t length) {
+        const size_t minSize = kMinAllocSize - sizeof(SkBufferBlock);
+        return SkTMax(length, minSize);
+    }
+};
+
+struct SkBufferHead {
+    mutable int32_t fRefCnt;
+    SkBufferBlock   fBlock;
+
+    static size_t LengthToCapacity(size_t length) {
+        const size_t minSize = kMinAllocSize - sizeof(SkBufferHead);
+        return SkTMax(length, minSize);
+    }
+
+    static SkBufferHead* Alloc(size_t length) {
+        size_t capacity = LengthToCapacity(length);
+        size_t size = sizeof(SkBufferHead) + capacity;
+        SkBufferHead* head = (SkBufferHead*)sk_malloc_throw(size);
+        head->fRefCnt = 1;
+        head->fBlock.fNext = nullptr;
+        head->fBlock.fUsed = 0;
+        head->fBlock.fCapacity = capacity;
+        return head;
+    }
+
+    void ref() const {
+        SkASSERT(fRefCnt > 0);
+        sk_atomic_inc(&fRefCnt);
+    }
+
+    void unref() const {
+        SkASSERT(fRefCnt > 0);
+        // A release here acts in place of all releases we "should" have been doing in ref().
+        if (1 == sk_atomic_fetch_add(&fRefCnt, -1, sk_memory_order_acq_rel)) {
+            // Like unique(), the acquire is only needed on success.
+            SkBufferBlock* block = fBlock.fNext;
+            sk_free((void*)this);
+            while (block) {
+                SkBufferBlock* next = block->fNext;
+                sk_free(block);
+                block = next;
+            }
+        }
+    }
+
+    void validate(size_t minUsed, SkBufferBlock* tail = nullptr) const {
+#ifdef SK_DEBUG
+        SkASSERT(fRefCnt > 0);
+        size_t totalUsed = 0;
+        const SkBufferBlock* block = &fBlock;
+        const SkBufferBlock* lastBlock = block;
+        while (block) {
+            block->validate();
+            totalUsed += block->fUsed;
+            lastBlock = block;
+            block = block->fNext;
+        }
+        SkASSERT(minUsed <= totalUsed);
+        if (tail) {
+            SkASSERT(tail == lastBlock);
+        }
+#endif
+    }
+};
+
+SkROBuffer::SkROBuffer(const SkBufferHead* head, size_t used) : fHead(head), fUsed(used) {
+    if (head) {
+        fHead->ref();
+        SkASSERT(used > 0);
+        head->validate(used);
+    } else {
+        SkASSERT(0 == used);
+    }
+}
+
+SkROBuffer::~SkROBuffer() {
+    if (fHead) {
+        fHead->validate(fUsed);
+        fHead->unref();
+    }
+}
+
+SkROBuffer::Iter::Iter(const SkROBuffer* buffer) {
+    this->reset(buffer);
+}
+
+void SkROBuffer::Iter::reset(const SkROBuffer* buffer) {
+    if (buffer) {
+        fBlock = &buffer->fHead->fBlock;
+        fRemaining = buffer->fUsed;
+    } else {
+        fBlock = nullptr;
+        fRemaining = 0;
+    }
+}
+
+const void* SkROBuffer::Iter::data() const {
+    return fRemaining ? fBlock->startData() : nullptr;
+}
+
+size_t SkROBuffer::Iter::size() const {
+    return SkTMin(fBlock->fUsed, fRemaining);
+}
+
+bool SkROBuffer::Iter::next() {
+    if (fRemaining) {
+        fRemaining -= this->size();
+        fBlock = fBlock->fNext;
+    }
+    return fRemaining != 0;
+}
+
+SkRWBuffer::SkRWBuffer(size_t initialCapacity) : fHead(nullptr), fTail(nullptr), fTotalUsed(0) {}
+
+SkRWBuffer::~SkRWBuffer() {
+    this->validate();
+    fHead->unref();
+}
+
+void SkRWBuffer::append(const void* src, size_t length) {
+    this->validate();
+    if (0 == length) {
+        return;
+    }
+
+    fTotalUsed += length;
+
+    if (nullptr == fHead) {
+        fHead = SkBufferHead::Alloc(length);
+        fTail = &fHead->fBlock;
+    }
+
+    size_t written = fTail->append(src, length);
+    SkASSERT(written <= length);
+    src = (const char*)src + written;
+    length -= written;
+
+    if (length) {
+        SkBufferBlock* block = SkBufferBlock::Alloc(length);
+        fTail->fNext = block;
+        fTail = block;
+        written = fTail->append(src, length);
+        SkASSERT(written == length);
+    }
+    this->validate();
+}
+
+void* SkRWBuffer::append(size_t length) {
+    this->validate();
+    if (0 == length) {
+        return nullptr;
+    }
+
+    fTotalUsed += length;
+
+    if (nullptr == fHead) {
+        fHead = SkBufferHead::Alloc(length);
+        fTail = &fHead->fBlock;
+    } else if (fTail->avail() < length) {
+        SkBufferBlock* block = SkBufferBlock::Alloc(length);
+        fTail->fNext = block;
+        fTail = block;
+    }
+
+    fTail->fUsed += length;
+    this->validate();
+    return (char*)fTail->availData() - length;
+}
+
+#ifdef SK_DEBUG
+void SkRWBuffer::validate() const {
+    if (fHead) {
+        fHead->validate(fTotalUsed, fTail);
+    } else {
+        SkASSERT(nullptr == fTail);
+        SkASSERT(0 == fTotalUsed);
+    }
+}
+#endif
+
+SkROBuffer* SkRWBuffer::newRBufferSnapshot() const { return new SkROBuffer(fHead, fTotalUsed); }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+class SkROBufferStreamAsset : public SkStreamAsset {
+    void validate() const {
+#ifdef SK_DEBUG
+        SkASSERT(fGlobalOffset <= fBuffer->size());
+        SkASSERT(fLocalOffset <= fIter.size());
+        SkASSERT(fLocalOffset <= fGlobalOffset);
+#endif
+    }
+
+#ifdef SK_DEBUG
+    class AutoValidate {
+        SkROBufferStreamAsset* fStream;
+    public:
+        AutoValidate(SkROBufferStreamAsset* stream) : fStream(stream) { stream->validate(); }
+        ~AutoValidate() { fStream->validate(); }
+    };
+    #define AUTO_VALIDATE   AutoValidate av(this);
+#else
+    #define AUTO_VALIDATE
+#endif
+
+public:
+    SkROBufferStreamAsset(const SkROBuffer* buffer) : fBuffer(SkRef(buffer)), fIter(buffer) {
+        fGlobalOffset = fLocalOffset = 0;
+    }
+
+    virtual ~SkROBufferStreamAsset() { fBuffer->unref(); }
+
+    size_t getLength() const override { return fBuffer->size(); }
+
+    bool rewind() override {
+        AUTO_VALIDATE
+        fIter.reset(fBuffer);
+        fGlobalOffset = fLocalOffset = 0;
+        return true;
+    }
+
+    size_t read(void* dst, size_t request) override {
+        AUTO_VALIDATE
+        size_t bytesRead = 0;
+        for (;;) {
+            size_t size = fIter.size();
+            SkASSERT(fLocalOffset <= size);
+            size_t avail = SkTMin(size - fLocalOffset, request - bytesRead);
+            if (dst) {
+                memcpy(dst, (const char*)fIter.data() + fLocalOffset, avail);
+                dst = (char*)dst + avail;
+            }
+            bytesRead += avail;
+            fLocalOffset += avail;
+            SkASSERT(bytesRead <= request);
+            if (bytesRead == request) {
+                break;
+            }
+            // If we get here, we've exhausted the current iter
+            SkASSERT(fLocalOffset == size);
+            fLocalOffset = 0;
+            if (!fIter.next()) {
+                break;   // ran out of data
+            }
+        }
+        fGlobalOffset += bytesRead;
+        SkASSERT(fGlobalOffset <= fBuffer->size());
+        return bytesRead;
+    }
+
+    bool isAtEnd() const override {
+        return fBuffer->size() == fGlobalOffset;
+    }
+
+    SkStreamAsset* duplicate() const override { return new SkROBufferStreamAsset(fBuffer); }
+
+    size_t getPosition() const override {
+        return fGlobalOffset;
+    }
+
+    bool seek(size_t position) override {
+        AUTO_VALIDATE
+        if (position < fGlobalOffset) {
+            this->rewind();
+        }
+        (void)this->skip(position - fGlobalOffset);
+        return true;
+    }
+
+    bool move(long offset)  override{
+        AUTO_VALIDATE
+        offset += fGlobalOffset;
+        if (offset <= 0) {
+            this->rewind();
+        } else {
+            (void)this->seek(SkToSizeT(offset));
+        }
+        return true;
+    }
+
+    SkStreamAsset* fork() const override {
+        SkStreamAsset* clone = this->duplicate();
+        clone->seek(this->getPosition());
+        return clone;
+    }
+
+
+private:
+    const SkROBuffer*   fBuffer;
+    SkROBuffer::Iter    fIter;
+    size_t              fLocalOffset;
+    size_t              fGlobalOffset;
+};
+
+SkStreamAsset* SkRWBuffer::newStreamSnapshot() const {
+    SkAutoTUnref<SkROBuffer> buffer(this->newRBufferSnapshot());
+    return new SkROBufferStreamAsset(buffer);
+}
diff --git a/gfx/skia/skia/src/core/SkRWBuffer.h b/gfx/skia/skia/src/core/SkRWBuffer.h
new file mode 100644
index 000000000000..9d88a60203f6
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkRWBuffer.h
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkRWBuffer_DEFINED
+#define SkRWBuffer_DEFINED
+
+#include "SkRefCnt.h"
+
+struct SkBufferBlock;
+struct SkBufferHead;
+class SkRWBuffer;
+class SkStreamAsset;
+
+/**
+ *  Contains a read-only, thread-sharable block of memory. To access the memory, the caller must
+ *  instantiate a local iterator, as the memory is stored in 1 or more contiguous blocks.
+ */
+class SkROBuffer : public SkRefCnt {
+public:
+    /**
+     *  Return the logical length of the data owned/shared by this buffer. It may be stored in
+     *  multiple contiguous blocks, accessible via the iterator.
+     */
+    size_t size() const { return fUsed; }
+    
+    class Iter {
+    public:
+        Iter(const SkROBuffer*);
+
+        void reset(const SkROBuffer*);
+
+        /**
+         *  Return the current continuous block of memory, or nullptr if the iterator is exhausted
+         */
+        const void* data() const;
+
+        /**
+         *  Returns the number of bytes in the current continguous block of memory, or 0 if the
+         *  iterator is exhausted.
+         */
+        size_t size() const;
+
+        /**
+         *  Advance to the next contiguous block of memory, returning true if there is another
+         *  block, or false if the iterator is exhausted.
+         */
+        bool next();
+        
+    private:
+        const SkBufferBlock* fBlock;
+        size_t               fRemaining;
+    };
+
+private:
+    SkROBuffer(const SkBufferHead* head, size_t used);
+    virtual ~SkROBuffer();
+    
+    const SkBufferHead* fHead;
+    const size_t        fUsed;
+    
+    friend class SkRWBuffer;
+};
+
+/**
+ *  Accumulates bytes of memory that are "appended" to it, growing internal storage as needed.
+ *  The growth is done such that at any time, a RBuffer or StreamAsset can be snapped off, which
+ *  can see the previously stored bytes, but which will be unaware of any future writes.
+ */
+class SkRWBuffer {
+public:
+    SkRWBuffer(size_t initialCapacity = 0);
+    ~SkRWBuffer();
+    
+    size_t size() const { return fTotalUsed; }
+    void append(const void* buffer, size_t length);
+    void* append(size_t length);
+
+    SkROBuffer* newRBufferSnapshot() const;
+    SkStreamAsset* newStreamSnapshot() const;
+    
+#ifdef SK_DEBUG
+    void validate() const;
+#else
+    void validate() const {}
+#endif
+    
+private:
+    SkBufferHead*   fHead;
+    SkBufferBlock*  fTail;
+    size_t          fTotalUsed;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/core/SkRasterClip.cpp b/gfx/skia/skia/src/core/SkRasterClip.cpp
index 664211f64f3e..ea1a7db429b4 100644
--- a/gfx/skia/skia/src/core/SkRasterClip.cpp
+++ b/gfx/skia/skia/src/core/SkRasterClip.cpp
@@ -6,18 +6,12 @@
  */
 
 #include "SkRasterClip.h"
-
-
-SkRasterClip::SkRasterClip() {
-    fIsBW = true;
-    fIsEmpty = true;
-    fIsRect = false;
-    SkDEBUGCODE(this->validate();)
-}
+#include "SkPath.h"
 
 SkRasterClip::SkRasterClip(const SkRasterClip& src) {
     AUTO_RASTERCLIP_VALIDATE(src);
 
+    fForceConservativeRects = src.fForceConservativeRects;
     fIsBW = src.fIsBW;
     if (fIsBW) {
         fBW = src.fBW;
@@ -30,13 +24,22 @@ SkRasterClip::SkRasterClip(const SkRasterClip& src) {
     SkDEBUGCODE(this->validate();)
 }
 
-SkRasterClip::SkRasterClip(const SkIRect& bounds) : fBW(bounds) {
+SkRasterClip::SkRasterClip(const SkIRect& bounds, bool forceConservativeRects) : fBW(bounds) {
+    fForceConservativeRects = forceConservativeRects;
     fIsBW = true;
     fIsEmpty = this->computeIsEmpty();  // bounds might be empty, so compute
     fIsRect = !fIsEmpty;
     SkDEBUGCODE(this->validate();)
 }
 
+SkRasterClip::SkRasterClip(bool forceConservativeRects) {
+    fForceConservativeRects = forceConservativeRects;
+    fIsBW = true;
+    fIsEmpty = true;
+    fIsRect = false;
+    SkDEBUGCODE(this->validate();)
+}
+
 SkRasterClip::~SkRasterClip() {
     SkDEBUGCODE(this->validate();)
 }
@@ -70,9 +73,81 @@ bool SkRasterClip::setRect(const SkIRect& rect) {
     return fIsRect;
 }
 
+/////////////////////////////////////////////////////////////////////////////////////
+
+bool SkRasterClip::setConservativeRect(const SkRect& r, const SkIRect& clipR, bool isInverse) {
+    SkRegion::Op op;
+    if (isInverse) {
+        op = SkRegion::kDifference_Op;
+    } else {
+        op = SkRegion::kIntersect_Op;
+    }
+    fBW.setRect(clipR);
+    fBW.op(r.roundOut(), op);
+    return this->updateCacheAndReturnNonEmpty();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+enum MutateResult {
+    kDoNothing_MutateResult,
+    kReplaceClippedAgainstGlobalBounds_MutateResult,
+    kContinue_MutateResult,
+};
+
+static MutateResult mutate_conservative_op(SkRegion::Op* op, bool inverseFilled) {
+    if (inverseFilled) {
+        switch (*op) {
+            case SkRegion::kIntersect_Op:
+            case SkRegion::kDifference_Op:
+                // These ops can only shrink the current clip. So leaving
+                // the clip unchanged conservatively respects the contract.
+                return kDoNothing_MutateResult;
+            case SkRegion::kUnion_Op:
+            case SkRegion::kReplace_Op:
+            case SkRegion::kReverseDifference_Op:
+            case SkRegion::kXOR_Op: {
+                // These ops can grow the current clip up to the extents of
+                // the input clip, which is inverse filled, so we just set
+                // the current clip to the device bounds.
+                *op = SkRegion::kReplace_Op;
+                return kReplaceClippedAgainstGlobalBounds_MutateResult;
+            }
+        }
+    } else {
+        // Not inverse filled
+        switch (*op) {
+            case SkRegion::kIntersect_Op:
+            case SkRegion::kUnion_Op:
+            case SkRegion::kReplace_Op:
+                return kContinue_MutateResult;
+            case SkRegion::kDifference_Op:
+                // Difference can only shrink the current clip.
+                // Leaving clip unchanged conservatively fullfills the contract.
+                return kDoNothing_MutateResult;
+            case SkRegion::kReverseDifference_Op:
+                // To reverse, we swap in the bounds with a replace op.
+                // As with difference, leave it unchanged.
+                *op = SkRegion::kReplace_Op;
+                return kContinue_MutateResult;
+            case SkRegion::kXOR_Op:
+                // Be conservative, based on (A XOR B) always included in (A union B),
+                // which is always included in (bounds(A) union bounds(B))
+                *op = SkRegion::kUnion_Op;
+                return kContinue_MutateResult;
+        }
+    }
+    SkFAIL("should not get here");
+    return kDoNothing_MutateResult;
+}
+
 bool SkRasterClip::setPath(const SkPath& path, const SkRegion& clip, bool doAA) {
     AUTO_RASTERCLIP_VALIDATE(*this);
 
+    if (fForceConservativeRects) {
+        return this->setConservativeRect(path.getBounds(), clip.getBounds(), path.isInverseFillType());
+    }
+
     if (this->isBW() && !doAA) {
         (void)fBW.setPath(path, clip);
     } else {
@@ -86,6 +161,67 @@ bool SkRasterClip::setPath(const SkPath& path, const SkRegion& clip, bool doAA)
     return this->updateCacheAndReturnNonEmpty();
 }
 
+bool SkRasterClip::op(const SkRRect& rrect, const SkISize& size, SkRegion::Op op, bool doAA) {
+    if (fForceConservativeRects) {
+        return this->op(rrect.getBounds(), size, op, doAA);
+    }
+
+    SkPath path;
+    path.addRRect(rrect);
+
+    return this->op(path, size, op, doAA);
+}
+
+bool SkRasterClip::op(const SkPath& path, const SkISize& size, SkRegion::Op op, bool doAA) {
+    AUTO_RASTERCLIP_VALIDATE(*this);
+
+    if (fForceConservativeRects) {
+        SkIRect ir;
+        switch (mutate_conservative_op(&op, path.isInverseFillType())) {
+            case kDoNothing_MutateResult:
+                return !this->isEmpty();
+            case kReplaceClippedAgainstGlobalBounds_MutateResult:
+                ir = SkIRect::MakeSize(size);
+                break;
+            case kContinue_MutateResult:
+                ir = path.getBounds().roundOut();
+                break;
+        }
+        return this->op(ir, op);
+    }
+
+    // base is used to limit the size (and therefore memory allocation) of the
+    // region that results from scan converting devPath.
+    SkRegion base;
+
+    if (SkRegion::kIntersect_Op == op) {
+        // since we are intersect, we can do better (tighter) with currRgn's
+        // bounds, than just using the device. However, if currRgn is complex,
+        // our region blitter may hork, so we do that case in two steps.
+        if (this->isRect()) {
+            // FIXME: we should also be able to do this when this->isBW(),
+            // but relaxing the test above triggers GM asserts in
+            // SkRgnBuilder::blitH(). We need to investigate what's going on.
+            return this->setPath(path, this->bwRgn(), doAA);
+        } else {
+            base.setRect(this->getBounds());
+            SkRasterClip clip(fForceConservativeRects);
+            clip.setPath(path, base, doAA);
+            return this->op(clip, op);
+        }
+    } else {
+        base.setRect(0, 0, size.width(), size.height());
+        
+        if (SkRegion::kReplace_Op == op) {
+            return this->setPath(path, base, doAA);
+        } else {
+            SkRasterClip clip(fForceConservativeRects);
+            clip.setPath(path, base, doAA);
+            return this->op(clip, op);
+        }
+    }
+}
+
 bool SkRasterClip::setPath(const SkPath& path, const SkIRect& clip, bool doAA) {
     SkRegion tmp;
     tmp.setRect(clip);
@@ -149,9 +285,24 @@ static bool nearly_integral(SkScalar x) {
     return x - SkScalarFloorToScalar(x) < domain;
 }
 
-bool SkRasterClip::op(const SkRect& r, SkRegion::Op op, bool doAA) {
+bool SkRasterClip::op(const SkRect& r, const SkISize& size, SkRegion::Op op, bool doAA) {
     AUTO_RASTERCLIP_VALIDATE(*this);
 
+    if (fForceConservativeRects) {
+        SkIRect ir;
+        switch (mutate_conservative_op(&op, false)) {
+            case kDoNothing_MutateResult:
+                return !this->isEmpty();
+            case kReplaceClippedAgainstGlobalBounds_MutateResult:
+                ir = SkIRect::MakeSize(size);
+                break;
+            case kContinue_MutateResult:
+                ir = r.roundOut();
+                break;
+        }
+        return this->op(ir, op);
+    }
+    
     if (fIsBW && doAA) {
         // check that the rect really needs aa, or is it close enought to
         // integer boundaries that we can just treat it as a BW rect?
@@ -175,7 +326,7 @@ bool SkRasterClip::op(const SkRect& r, SkRegion::Op op, bool doAA) {
 }
 
 void SkRasterClip::translate(int dx, int dy, SkRasterClip* dst) const {
-    if (NULL == dst) {
+    if (nullptr == dst) {
         return;
     }
 
@@ -218,11 +369,16 @@ const SkRegion& SkRasterClip::forceGetBW() {
 
 void SkRasterClip::convertToAA() {
     AUTO_RASTERCLIP_VALIDATE(*this);
-
+    
+    SkASSERT(!fForceConservativeRects);
+    
     SkASSERT(fIsBW);
     fAA.setRegion(fBW);
     fIsBW = false;
-    (void)this->updateCacheAndReturnNonEmpty();
+    
+    // since we are being explicitly asked to convert-to-aa, we pass false so we don't "optimize"
+    // ourselves back to BW.
+    (void)this->updateCacheAndReturnNonEmpty(false);
 }
 
 #ifdef SK_DEBUG
@@ -243,8 +399,8 @@ void SkRasterClip::validate() const {
 ///////////////////////////////////////////////////////////////////////////////
 
 SkAAClipBlitterWrapper::SkAAClipBlitterWrapper() {
-    SkDEBUGCODE(fClipRgn = NULL;)
-    SkDEBUGCODE(fBlitter = NULL;)
+    SkDEBUGCODE(fClipRgn = nullptr;)
+    SkDEBUGCODE(fBlitter = nullptr;)
 }
 
 SkAAClipBlitterWrapper::SkAAClipBlitterWrapper(const SkRasterClip& clip,
diff --git a/gfx/skia/skia/src/core/SkRasterClip.h b/gfx/skia/skia/src/core/SkRasterClip.h
index 0c2723314ccb..4e2b1416e8b8 100644
--- a/gfx/skia/skia/src/core/SkRasterClip.h
+++ b/gfx/skia/skia/src/core/SkRasterClip.h
@@ -11,13 +11,17 @@
 #include "SkRegion.h"
 #include "SkAAClip.h"
 
+class SkRRect;
+
 class SkRasterClip {
 public:
-    SkRasterClip();
-    SkRasterClip(const SkIRect&);
+    SkRasterClip(bool forceConservativeRects = false);
+    SkRasterClip(const SkIRect&, bool forceConservativeRects = false);
     SkRasterClip(const SkRasterClip&);
     ~SkRasterClip();
 
+    bool isForceConservativeRects() const { return fForceConservativeRects; }
+
     bool isBW() const { return fIsBW; }
     bool isAA() const { return !fIsBW; }
     const SkRegion& bwRgn() const { SkASSERT(fIsBW); return fBW; }
@@ -39,14 +43,12 @@ public:
     bool setEmpty();
     bool setRect(const SkIRect&);
 
-    bool setPath(const SkPath& path, const SkRegion& clip, bool doAA);
-    bool setPath(const SkPath& path, const SkIRect& clip, bool doAA);
-
     bool op(const SkIRect&, SkRegion::Op);
     bool op(const SkRegion&, SkRegion::Op);
-    bool op(const SkRasterClip&, SkRegion::Op);
-    bool op(const SkRect&, SkRegion::Op, bool doAA);
-
+    bool op(const SkRect&, const SkISize&, SkRegion::Op, bool doAA);
+    bool op(const SkRRect&, const SkISize&, SkRegion::Op, bool doAA);
+    bool op(const SkPath&, const SkISize&, SkRegion::Op, bool doAA);
+    
     void translate(int dx, int dy, SkRasterClip* dst) const;
     void translate(int dx, int dy) {
         this->translate(dx, dy, this);
@@ -63,8 +65,7 @@ public:
      *  intersect, but returning true is a guarantee that they do not.
      */
     bool quickReject(const SkIRect& rect) const {
-        return this->isEmpty() || rect.isEmpty() ||
-               !SkIRect::Intersects(this->getBounds(), rect);
+        return !SkIRect::Intersects(this->getBounds(), rect);
     }
 
     // hack for SkCanvas::getTotalClip
@@ -79,6 +80,7 @@ public:
 private:
     SkRegion    fBW;
     SkAAClip    fAA;
+    bool        fForceConservativeRects;
     bool        fIsBW;
     // these 2 are caches based on querying the right obj based on fIsBW
     bool        fIsEmpty;
@@ -89,16 +91,29 @@ private:
     }
 
     bool computeIsRect() const {
-        return fIsBW ? fBW.isRect() : false;
+        return fIsBW ? fBW.isRect() : fAA.isRect();
     }
 
-    bool updateCacheAndReturnNonEmpty() {
+    bool updateCacheAndReturnNonEmpty(bool detectAARect = true) {
         fIsEmpty = this->computeIsEmpty();
+
+        // detect that our computed AA is really just a (hard-edged) rect
+        if (detectAARect && !fIsEmpty && !fIsBW && fAA.isRect()) {
+            fBW.setRect(fAA.getBounds());
+            fAA.setEmpty(); // don't need this guy anymore
+            fIsBW = true;
+        }
+
         fIsRect = this->computeIsRect();
         return !fIsEmpty;
     }
 
     void convertToAA();
+
+    bool setPath(const SkPath& path, const SkRegion& clip, bool doAA);
+    bool setPath(const SkPath& path, const SkIRect& clip, bool doAA);
+    bool op(const SkRasterClip&, SkRegion::Op);
+    bool setConservativeRect(const SkRect& r, const SkIRect& clipR, bool isInverse);
 };
 
 class SkAutoRasterClipValidate : SkNoncopyable {
diff --git a/gfx/skia/skia/src/core/SkRasterizer.cpp b/gfx/skia/skia/src/core/SkRasterizer.cpp
index 3a7af955551f..87b9caa24231 100644
--- a/gfx/skia/skia/src/core/SkRasterizer.cpp
+++ b/gfx/skia/skia/src/core/SkRasterizer.cpp
@@ -23,12 +23,11 @@ bool SkRasterizer::rasterize(const SkPath& fillPath, const SkMatrix& matrix,
 
         srcM.fFormat = SkMask::kA8_Format;
         srcM.fBounds.set(0, 0, 1, 1);
-        srcM.fImage = NULL;
+        srcM.fImage = nullptr;
         if (!filter->filterMask(&dstM, srcM, matrix, &margin)) {
             return false;
         }
-        storage = *clipBounds;
-        storage.inset(-margin.fX, -margin.fY);
+        storage = clipBounds->makeOutset(margin.fX, margin.fY);
         clipBounds = &storage;
     }
 
@@ -43,6 +42,6 @@ bool SkRasterizer::onRasterize(const SkPath& fillPath, const SkMatrix& matrix,
     SkPath  devPath;
 
     fillPath.transform(matrix, &devPath);
-    return SkDraw::DrawToMask(devPath, clipBounds, NULL, NULL, mask, mode,
+    return SkDraw::DrawToMask(devPath, clipBounds, nullptr, nullptr, mask, mode,
                               SkPaint::kFill_Style);
 }
diff --git a/gfx/skia/skia/src/core/SkReadBuffer.cpp b/gfx/skia/skia/src/core/SkReadBuffer.cpp
index 43587862b94f..06aa9cb6a9f4 100644
--- a/gfx/skia/skia/src/core/SkReadBuffer.cpp
+++ b/gfx/skia/skia/src/core/SkReadBuffer.cpp
@@ -8,6 +8,8 @@
 
 #include "SkBitmap.h"
 #include "SkErrorInternals.h"
+#include "SkImage.h"
+#include "SkImageGenerator.h"
 #include "SkReadBuffer.h"
 #include "SkStream.h"
 #include "SkTypeface.h"
@@ -24,16 +26,16 @@ static uint32_t default_flags() {
 SkReadBuffer::SkReadBuffer() {
     fFlags = default_flags();
     fVersion = 0;
-    fMemoryPtr = NULL;
+    fMemoryPtr = nullptr;
 
-    fBitmapStorage = NULL;
-    fTFArray = NULL;
+    fBitmapStorage = nullptr;
+    fTFArray = nullptr;
     fTFCount = 0;
 
-    fFactoryTDArray = NULL;
-    fFactoryArray = NULL;
+    fFactoryTDArray = nullptr;
+    fFactoryArray = nullptr;
     fFactoryCount = 0;
-    fBitmapDecoder = NULL;
+    fBitmapDecoder = nullptr;
 #ifdef DEBUG_NON_DETERMINISTIC_ASSERT
     fDecodedBitmapIndex = -1;
 #endif // DEBUG_NON_DETERMINISTIC_ASSERT
@@ -43,16 +45,16 @@ SkReadBuffer::SkReadBuffer(const void* data, size_t size) {
     fFlags = default_flags();
     fVersion = 0;
     fReader.setMemory(data, size);
-    fMemoryPtr = NULL;
+    fMemoryPtr = nullptr;
 
-    fBitmapStorage = NULL;
-    fTFArray = NULL;
+    fBitmapStorage = nullptr;
+    fTFArray = nullptr;
     fTFCount = 0;
 
-    fFactoryTDArray = NULL;
-    fFactoryArray = NULL;
+    fFactoryTDArray = nullptr;
+    fFactoryArray = nullptr;
     fFactoryCount = 0;
-    fBitmapDecoder = NULL;
+    fBitmapDecoder = nullptr;
 #ifdef DEBUG_NON_DETERMINISTIC_ASSERT
     fDecodedBitmapIndex = -1;
 #endif // DEBUG_NON_DETERMINISTIC_ASSERT
@@ -66,14 +68,14 @@ SkReadBuffer::SkReadBuffer(SkStream* stream) {
     stream->read(fMemoryPtr, length);
     fReader.setMemory(fMemoryPtr, length);
 
-    fBitmapStorage = NULL;
-    fTFArray = NULL;
+    fBitmapStorage = nullptr;
+    fTFArray = nullptr;
     fTFCount = 0;
 
-    fFactoryTDArray = NULL;
-    fFactoryArray = NULL;
+    fFactoryTDArray = nullptr;
+    fFactoryArray = nullptr;
     fFactoryCount = 0;
-    fBitmapDecoder = NULL;
+    fBitmapDecoder = nullptr;
 #ifdef DEBUG_NON_DETERMINISTIC_ASSERT
     fDecodedBitmapIndex = -1;
 #endif // DEBUG_NON_DETERMINISTIC_ASSERT
@@ -223,7 +225,7 @@ bool SkReadBuffer::readBitmap(SkBitmap* bitmap) {
             const void* data = this->skip(length);
             const int32_t xOffset = this->readInt();
             const int32_t yOffset = this->readInt();
-            if (fBitmapDecoder != NULL && fBitmapDecoder(data, length, bitmap)) {
+            if (fBitmapDecoder != nullptr && fBitmapDecoder(data, length, bitmap)) {
                 if (bitmap->width() == width && bitmap->height() == height) {
 #ifdef DEBUG_NON_DETERMINISTIC_ASSERT
                     if (0 != xOffset || 0 != yOffset) {
@@ -259,18 +261,14 @@ bool SkReadBuffer::readBitmap(SkBitmap* bitmap) {
             // This bitmap was encoded when written, but we are unable to decode, possibly due to
             // not having a decoder.
             SkErrorInternals::SetError(kParseError_SkError,
-                                       "Could not decode bitmap. Resulting bitmap will be red.");
-        } else {
-            // A size of zero means the SkBitmap was simply flattened.
-            if (this->isVersionLT(kNoMoreBitmapFlatten_Version)) {
-                SkBitmap tmp;
-                tmp.legacyUnflatten(*this);
-                // just throw this guy away
-            } else {
-                if (SkBitmap::ReadRawPixels(this, bitmap)) {
-                    return true;
-                }
-            }
+                                       "Could not decode bitmap. Resulting bitmap will be empty.");
+            // Even though we weren't able to decode the pixels, the readbuffer should still be
+            // intact, so we return true with an empty bitmap, so we don't force an abort of the
+            // larger deserialize.
+            bitmap->setInfo(SkImageInfo::MakeUnknown(width, height));
+            return true;
+        } else if (SkBitmap::ReadRawPixels(this, bitmap)) {
+            return true;
         }
     }
     // Could not read the SkBitmap. Use a placeholder bitmap.
@@ -278,14 +276,51 @@ bool SkReadBuffer::readBitmap(SkBitmap* bitmap) {
     return false;
 }
 
+namespace {
+
+// This generator intentionally should always fail on all attempts to get its pixels,
+// simulating a bad or empty codec stream.
+class EmptyImageGenerator final : public SkImageGenerator {
+public:
+    EmptyImageGenerator(const SkImageInfo& info) : INHERITED(info) { }
+
+private:
+    typedef SkImageGenerator INHERITED;
+};
+
+} // anonymous namespace
+
+SkImage* SkReadBuffer::readImage() {
+    int width = this->read32();
+    int height = this->read32();
+    if (width <= 0 || height <= 0) {    // SkImage never has a zero dimension
+        this->validate(false);
+        return nullptr;
+    }
+
+    SkAutoTUnref<SkData> encoded(this->readByteArrayAsData());
+    if (encoded->size() == 0) {
+        // The image could not be encoded at serialization time - return an empty placeholder.
+        return SkImage::NewFromGenerator(
+            new EmptyImageGenerator(SkImageInfo::MakeN32Premul(width, height)));
+    }
+
+    int originX = this->read32();
+    int originY = this->read32();
+    if (originX < 0 || originY < 0) {
+        this->validate(false);
+        return nullptr;
+    }
+
+    const SkIRect subset = SkIRect::MakeXYWH(originX, originY, width, height);
+    return SkImage::NewFromEncoded(encoded, &subset);
+}
+
 SkTypeface* SkReadBuffer::readTypeface() {
 
     uint32_t index = fReader.readU32();
     if (0 == index || index > (unsigned)fTFCount) {
-        if (index) {
-            SkDebugf("====== typeface index %d\n", index);
-        }
-        return NULL;
+        return nullptr;
     } else {
         SkASSERT(fTFArray);
         return fTFArray[index - 1];
@@ -297,12 +332,12 @@ SkFlattenable* SkReadBuffer::readFlattenable(SkFlattenable::Type ft) {
     // TODO: confirm that ft matches the factory we decide to use
     //
 
-    SkFlattenable::Factory factory = NULL;
+    SkFlattenable::Factory factory = nullptr;
 
     if (fFactoryCount > 0) {
         int32_t index = fReader.readU32();
         if (0 == index) {
-            return NULL; // writer failed to give us the flattenable
+            return nullptr; // writer failed to give us the flattenable
         }
         index -= 1;     // we stored the index-base-1
         SkASSERT(index < fFactoryCount);
@@ -310,20 +345,20 @@ SkFlattenable* SkReadBuffer::readFlattenable(SkFlattenable::Type ft) {
     } else if (fFactoryTDArray) {
         int32_t index = fReader.readU32();
         if (0 == index) {
-            return NULL; // writer failed to give us the flattenable
+            return nullptr; // writer failed to give us the flattenable
         }
         index -= 1;     // we stored the index-base-1
         factory = (*fFactoryTDArray)[index];
     } else {
         factory = (SkFlattenable::Factory)readFunctionPtr();
-        if (NULL == factory) {
-            return NULL; // writer failed to give us the flattenable
+        if (nullptr == factory) {
+            return nullptr; // writer failed to give us the flattenable
         }
     }
 
     // if we get here, factory may still be null, but if that is the case, the
     // failure was ours, not the writer.
-    SkFlattenable* obj = NULL;
+    SkFlattenable* obj = nullptr;
     uint32_t sizeRecorded = fReader.readU32();
     if (factory) {
         size_t offset = fReader.offset();
@@ -355,7 +390,7 @@ void SkReadBuffer::skipFlattenable() {
             return;
         }
     } else {
-        if (NULL == this->readFunctionPtr()) {
+        if (nullptr == this->readFunctionPtr()) {
             return;
         }
     }
diff --git a/gfx/skia/skia/include/core/SkReadBuffer.h b/gfx/skia/skia/src/core/SkReadBuffer.h
similarity index 92%
rename from gfx/skia/skia/include/core/SkReadBuffer.h
rename to gfx/skia/skia/src/core/SkReadBuffer.h
index faf7eb81a572..3d6dd362accc 100644
--- a/gfx/skia/skia/include/core/SkReadBuffer.h
+++ b/gfx/skia/skia/src/core/SkReadBuffer.h
@@ -26,6 +26,7 @@
 #include "SkXfermode.h"
 
 class SkBitmap;
+class SkImage;
 
 #if defined(SK_DEBUG) && defined(SK_BUILD_FOR_MAC)
     #define DEBUG_NON_DETERMINISTIC_ASSERT
@@ -39,6 +40,7 @@ public:
     virtual ~SkReadBuffer();
 
     enum Version {
+        /*
         kFilterLevelIsEnum_Version         = 23,
         kGradientFlippedFlag_Version       = 24,
         kDashWritesPhaseIntervals_Version  = 25,
@@ -46,6 +48,18 @@ public:
         kNoUnitMappers_Version             = 27,
         kNoMoreBitmapFlatten_Version       = 28,
         kSimplifyLocalMatrix_Version       = 30,
+        kImageFilterUniqueID_Version       = 31,
+        kRemoveAndroidPaintOpts_Version    = 32,
+        kFlattenCreateProc_Version         = 33,
+        */
+        kRemoveColorTableAlpha_Version     = 36,
+        kDropShadowMode_Version            = 37,
+        kPictureImageFilterResolution_Version = 38,
+        kPictureImageFilterLevel_Version   = 39,
+        kImageFilterNoUniqueID_Version     = 40,
+        kBitmapSourceFilterQuality_Version = 41,
+        kPictureShaderHasPictureBool_Version = 42,
+        kHasDrawImageOpCodes_Version       = 43,
     };
 
     /**
@@ -107,6 +121,7 @@ public:
     virtual void readIRect(SkIRect* rect);
     virtual void readRect(SkRect* rect);
     virtual void readRegion(SkRegion* region);
+
     virtual void readPath(SkPath* path);
     void readPaint(SkPaint* paint) { paint->unflatten(*this); }
 
@@ -155,6 +170,8 @@ public:
      */
     bool readBitmap(SkBitmap* bitmap);
 
+    SkImage* readImage();
+
     virtual SkTypeface* readTypeface();
 
     void setBitmapStorage(SkBitmapHeapReader* bitmapStorage) {
@@ -171,7 +188,7 @@ public:
      *  were created/written by the writer. SkPicture uses this.
      */
     void setFactoryPlayback(SkFlattenable::Factory array[], int count) {
-        fFactoryTDArray = NULL;
+        fFactoryTDArray = nullptr;
         fFactoryArray = array;
         fFactoryCount = count;
     }
@@ -183,7 +200,7 @@ public:
      */
     void setFactoryArray(SkTDArray<SkFlattenable::Factory>* array) {
         fFactoryTDArray = array;
-        fFactoryArray = NULL;
+        fFactoryArray = nullptr;
         fFactoryCount = 0;
     }
 
diff --git a/gfx/skia/skia/include/core/SkReader32.h b/gfx/skia/skia/src/core/SkReader32.h
similarity index 88%
rename from gfx/skia/skia/include/core/SkReader32.h
rename to gfx/skia/skia/src/core/SkReader32.h
index 51e28ef146c0..68dda23c6efc 100644
--- a/gfx/skia/skia/include/core/SkReader32.h
+++ b/gfx/skia/skia/src/core/SkReader32.h
@@ -20,7 +20,7 @@ class SkString;
 
 class SkReader32 : SkNoncopyable {
 public:
-    SkReader32() : fCurr(NULL), fStop(NULL), fBase(NULL) {}
+    SkReader32() : fCurr(nullptr), fStop(nullptr), fBase(nullptr) {}
     SkReader32(const void* data, size_t size)  {
         this->setMemory(data, size);
     }
@@ -94,7 +94,7 @@ public:
     }
 
     void read(void* dst, size_t size) {
-        SkASSERT(0 == size || dst != NULL);
+        SkASSERT(0 == size || dst != nullptr);
         SkASSERT(ptr_align_4(fCurr));
         memcpy(dst, fCurr, size);
         fCurr += SkAlign4(size);
@@ -107,27 +107,27 @@ public:
     uint32_t readU32() { return this->readInt(); }
 
     bool readPath(SkPath* path) {
-        return readObjectFromMemory(path);
+        return this->readObjectFromMemory(path);
     }
 
     bool readMatrix(SkMatrix* matrix) {
-        return readObjectFromMemory(matrix);
+        return this->readObjectFromMemory(matrix);
     }
 
     bool readRRect(SkRRect* rrect) {
-        return readObjectFromMemory(rrect);
+        return this->readObjectFromMemory(rrect);
     }
 
     bool readRegion(SkRegion* rgn) {
-        return readObjectFromMemory(rgn);
+        return this->readObjectFromMemory(rgn);
     }
 
     /**
      *  Read the length of a string (written by SkWriter32::writeString) into
-     *  len (if len is not NULL) and return the null-ternimated address of the
+     *  len (if len is not nullptr) and return the null-ternimated address of the
      *  string within the reader's buffer.
      */
-    const char* readString(size_t* len = NULL);
+    const char* readString(size_t* len = nullptr);
 
     /**
      *  Read the string (written by SkWriter32::writeString) and return it in
@@ -152,7 +152,7 @@ private:
 
 #ifdef SK_DEBUG
     static bool ptr_align_4(const void* ptr) {
-        return (((const char*)ptr - (const char*)NULL) & 3) == 0;
+        return (((const char*)ptr - (const char*)nullptr) & 3) == 0;
     }
 #endif
 };
diff --git a/gfx/skia/skia/src/core/SkRecord.cpp b/gfx/skia/skia/src/core/SkRecord.cpp
new file mode 100644
index 000000000000..2e03e993b82a
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkRecord.cpp
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkRecord.h"
+#include <algorithm>
+
+SkRecord::~SkRecord() {
+    Destroyer destroyer;
+    for (int i = 0; i < this->count(); i++) {
+        this->mutate<void>(i, destroyer);
+    }
+}
+
+void SkRecord::grow() {
+    SkASSERT(fCount == fReserved);
+    SkASSERT(fReserved > 0);
+    fReserved *= 2;
+    fRecords.realloc(fReserved);
+}
+
+size_t SkRecord::bytesUsed() const {
+    size_t bytes = fAlloc.approxBytesAllocated() + sizeof(SkRecord);
+    // If fReserved <= kInlineRecords, we've already accounted for fRecords with sizeof(SkRecord).
+    // When we go over that limit, they're allocated on the heap (and the inline space is wasted).
+    if (fReserved > kInlineRecords) {
+        bytes += fReserved * sizeof(Record);
+    }
+    return bytes;
+}
+
+void SkRecord::defrag() {
+    // Remove all the NoOps, preserving the order of other ops, e.g.
+    //      Save, ClipRect, NoOp, DrawRect, NoOp, NoOp, Restore
+    //  ->  Save, ClipRect, DrawRect, Restore
+    Record* noops = std::remove_if(fRecords.get(), fRecords.get() + fCount,
+                                   [](Record op) { return op.type() == SkRecords::NoOp_Type; });
+    fCount = noops - fRecords.get();
+}
diff --git a/gfx/skia/skia/src/core/SkRecord.h b/gfx/skia/skia/src/core/SkRecord.h
index 6c5177eefb6c..8901d62e9193 100644
--- a/gfx/skia/skia/src/core/SkRecord.h
+++ b/gfx/skia/skia/src/core/SkRecord.h
@@ -8,12 +8,12 @@
 #ifndef SkRecord_DEFINED
 #define SkRecord_DEFINED
 
-#include "SkChunkAlloc.h"
 #include "SkRecords.h"
 #include "SkTLogic.h"
 #include "SkTemplates.h"
+#include "SkVarAlloc.h"
 
-// SkRecord (REC-ord) represents a sequence of SkCanvas calls, saved for future use.
+// SkRecord represents a sequence of SkCanvas calls, saved for future use.
 // These future uses may include: replay, optimization, serialization, or combinations of those.
 //
 // Though an enterprising user may find calling alloc(), append(), visit(), and mutate() enough to
@@ -25,29 +25,31 @@
 // only with SkRecords::* structs defined in SkRecords.h.  Your compiler will helpfully yell if you
 // get this wrong.
 
-class SkRecord : SkNoncopyable {
+class SkRecord : public SkNVRefCnt<SkRecord> {
+    enum {
+        // TODO: tune these two constants.
+        kInlineRecords      = 4, // Ideally our lower limit on recorded ops per picture.
+        kInlineAllocLgBytes = 8, // 1<<8 == 256 bytes inline, then SkVarAlloc starting at 512 bytes.
+    };
 public:
-    SkRecord(size_t chunkBytes = 4096, unsigned firstReserveCount = 64 / sizeof(void*))
-        : fAlloc(chunkBytes), fCount(0), fReserved(0), kFirstReserveCount(firstReserveCount) {}
-
-    ~SkRecord() {
-        Destroyer destroyer;
-        for (unsigned i = 0; i < this->count(); i++) {
-            this->mutate<void>(i, destroyer);
-        }
-    }
+    SkRecord()
+        : fCount(0)
+        , fReserved(kInlineRecords)
+        , fAlloc(kInlineAllocLgBytes+1,  // First malloc'd block is 2x as large as fInlineAlloc.
+                 fInlineAlloc, sizeof(fInlineAlloc)) {}
+    ~SkRecord();
 
     // Returns the number of canvas commands in this SkRecord.
-    unsigned count() const { return fCount; }
+    int count() const { return fCount; }
 
     // Visit the i-th canvas command with a functor matching this interface:
     //   template <typename T>
     //   R operator()(const T& record) { ... }
     // This operator() must be defined for at least all SkRecords::*.
     template <typename R, typename F>
-    R visit(unsigned i, F& f) const {
+    R visit(int i, F& f) const {
         SkASSERT(i < this->count());
-        return fRecords[i].visit<R>(fTypes[i], f);
+        return fRecords[i].visit<R>(f);
     }
 
     // Mutate the i-th canvas command with a functor matching this interface:
@@ -55,17 +57,18 @@ public:
     //   R operator()(T* record) { ... }
     // This operator() must be defined for at least all SkRecords::*.
     template <typename R, typename F>
-    R mutate(unsigned i, F& f) {
+    R mutate(int i, F& f) {
         SkASSERT(i < this->count());
-        return fRecords[i].mutate<R>(fTypes[i], f);
+        return fRecords[i].mutate<R>(f);
     }
-    // TODO: It'd be nice to infer R from F for visit and mutate if we ever get std::result_of.
+
+    // TODO: It'd be nice to infer R from F for visit and mutate.
 
     // Allocate contiguous space for count Ts, to be freed when the SkRecord is destroyed.
     // Here T can be any class, not just those from SkRecords.  Throws on failure.
     template <typename T>
-    T* alloc(unsigned count = 1) {
-        return (T*)fAlloc.allocThrow(sizeof(T) * count);
+    T* alloc(size_t count = 1) {
+        return (T*)fAlloc.alloc(sizeof(T) * count);
     }
 
     // Add a new command of type T to the end of this SkRecord.
@@ -73,12 +76,8 @@ public:
     template <typename T>
     T* append() {
         if (fCount == fReserved) {
-            fReserved = SkTMax(kFirstReserveCount, fReserved*2);
-            fRecords.realloc(fReserved);
-            fTypes.realloc(fReserved);
+            this->grow();
         }
-
-        fTypes[fCount] = T::kType;
         return fRecords[fCount++].set(this->allocCommand<T>());
     }
 
@@ -86,13 +85,12 @@ public:
     // You are expected to placement new an object of type T onto this pointer.
     // References to the original command are invalidated.
     template <typename T>
-    T* replace(unsigned i) {
+    T* replace(int i) {
         SkASSERT(i < this->count());
 
         Destroyer destroyer;
         this->mutate<void>(i, destroyer);
 
-        fTypes[i] = T::kType;
         return fRecords[i].set(this->allocCommand<T>());
     }
 
@@ -100,20 +98,25 @@ public:
     // You are expected to placement new an object of type T onto this pointer.
     // You must show proof that you've already adopted the existing command.
     template <typename T, typename Existing>
-    T* replace(unsigned i, const SkRecords::Adopted<Existing>& proofOfAdoption) {
+    T* replace(int i, const SkRecords::Adopted<Existing>& proofOfAdoption) {
         SkASSERT(i < this->count());
 
-        SkASSERT(Existing::kType == fTypes[i]);
-        SkASSERT(proofOfAdoption == fRecords[i].ptr<Existing>());
+        SkASSERT(Existing::kType == fRecords[i].type());
+        SkASSERT(proofOfAdoption == fRecords[i].ptr());
 
-        fTypes[i] = T::kType;
         return fRecords[i].set(this->allocCommand<T>());
     }
 
+    // Does not return the bytes in any pointers embedded in the Records; callers
+    // need to iterate with a visitor to measure those they care for.
+    size_t bytesUsed() const;
+
+    // Rearrange and resize this record to eliminate any NoOps.
+    // May change count() and the indices of ops, but preserves their order.
+    void defrag();
+
 private:
-    // Implementation notes!
-    //
-    // Logically an SkRecord is structured as an array of pointers into a big chunk of memory where
+    // An SkRecord is structured as an array of pointers into a big chunk of memory where
     // records representing each canvas draw call are stored:
     //
     // fRecords:  [*][*][*]...
@@ -125,27 +128,8 @@ private:
     //             v                    v                        v
     //   fAlloc:  [SkRecords::DrawRect][SkRecords::DrawPosTextH][SkRecords::DrawRect]...
     //
-    // In the scheme above, the pointers in fRecords are void*: they have no type.  The type is not
-    // stored in fAlloc either; we just write raw data there.  But we need that type information.
-    // Here are some options:
-    //   1) use inheritance, virtuals, and vtables to make the fRecords pointers smarter
-    //   2) store the type data manually in fAlloc at the start of each record
-    //   3) store the type data manually somewhere with fRecords
-    //
-    // This code uses approach 3).  The implementation feels very similar to 1), but it's
-    // devirtualized instead of using the language's polymorphism mechanisms.  This lets us work
-    // with the types themselves (as SkRecords::Type), a sort of limited free RTTI; it lets us pay
-    // only 1 byte to store the type instead of a full pointer (4-8 bytes); and it leads to better
-    // decoupling between the SkRecords::* record types and the operations performed on them in
-    // visit() or mutate().  The recorded canvas calls don't have to have any idea about the
-    // operations performed on them.
-    //
-    // We store the types in a parallel fTypes array, mainly so that they can be tightly packed as
-    // single bytes.  This has the side effect of allowing very fast analysis passes over an
-    // SkRecord looking for just patterns of draw commands (or using this as a quick reject
-    // mechanism) though there's admittedly not a very good API exposed publically for this.
-    //
-    // The cost to append a T into this structure is 1 + sizeof(void*) + sizeof(T).
+    // We store the types of each of the pointers alongside the pointer.
+    // The cost to append a T to this structure is 8 + sizeof(T) bytes.
 
     // A mutator that can be used with replace to destroy canvas commands.
     struct Destroyer {
@@ -153,82 +137,66 @@ private:
         void operator()(T* record) { record->~T(); }
     };
 
-    // Logically the same as SkRecords::Type, but packed into 8 bits.
-    struct Type8 {
-    public:
-        // This intentionally converts implicitly back and forth.
-        Type8(SkRecords::Type type) : fType(type) { SkASSERT(*this == type); }
-        operator SkRecords::Type () { return (SkRecords::Type)fType; }
-
-    private:
-        uint8_t fType;
-    };
-
-    // No point in allocating any more than one of an empty struct.
-    // We could just return NULL but it's sort of confusing to return NULL on success.
     template <typename T>
-    SK_WHEN(SkTIsEmpty<T>, T*) allocCommand() {
+    SK_WHEN(skstd::is_empty<T>::value, T*) allocCommand() {
         static T singleton = {};
         return &singleton;
     }
 
     template <typename T>
-    SK_WHEN(!SkTIsEmpty<T>, T*) allocCommand() { return this->alloc<T>(); }
+    SK_WHEN(!skstd::is_empty<T>::value, T*) allocCommand() { return this->alloc<T>(); }
 
-    // An untyped pointer to some bytes in fAlloc.  This is the interface for polymorphic dispatch:
-    // visit() and mutate() work with the parallel fTypes array to do the work of a vtable.
+    void grow();
+
+    // A typed pointer to some bytes in fAlloc.  visit() and mutate() allow polymorphic dispatch.
     struct Record {
-    public:
+        // On 32-bit machines we store type in 4 bytes, followed by a pointer.  Simple.
+        // On 64-bit machines we store a pointer with the type slotted into two top (unused) bytes.
+        // FWIW, SkRecords::Type is tiny.  It can easily fit in one byte.
+        uint64_t fTypeAndPtr;
+        static const int kTypeShift = sizeof(void*) == 4 ? 32 : 48;
+
         // Point this record to its data in fAlloc.  Returns ptr for convenience.
         template <typename T>
         T* set(T* ptr) {
-            fPtr = ptr;
+            fTypeAndPtr = ((uint64_t)T::kType) << kTypeShift | (uintptr_t)ptr;
+            SkASSERT(this->ptr() == ptr && this->type() == T::kType);
             return ptr;
         }
 
-        // Get the data in fAlloc, assuming it's of type T.
-        template <typename T>
-        T* ptr() const { return (T*)fPtr; }
+        SkRecords::Type type() const { return (SkRecords::Type)(fTypeAndPtr >> kTypeShift); }
+        void* ptr() const { return (void*)(fTypeAndPtr & ((1ull<<kTypeShift)-1)); }
 
-        // Visit this record with functor F (see public API above) assuming the record we're
-        // pointing to has this type.
+        // Visit this record with functor F (see public API above).
         template <typename R, typename F>
-        R visit(Type8 type, F& f) const {
-        #define CASE(T) case SkRecords::T##_Type: return f(*this->ptr<SkRecords::T>());
-            switch(type) { SK_RECORD_TYPES(CASE) }
+        R visit(F& f) const {
+        #define CASE(T) case SkRecords::T##_Type: return f(*(const SkRecords::T*)this->ptr());
+            switch(this->type()) { SK_RECORD_TYPES(CASE) }
         #undef CASE
             SkDEBUGFAIL("Unreachable");
             return R();
         }
 
-        // Mutate this record with functor F (see public API above) assuming the record we're
-        // pointing to has this type.
+        // Mutate this record with functor F (see public API above).
         template <typename R, typename F>
-        R mutate(Type8 type, F& f) {
-        #define CASE(T) case SkRecords::T##_Type: return f(this->ptr<SkRecords::T>());
-            switch(type) { SK_RECORD_TYPES(CASE) }
+        R mutate(F& f) {
+        #define CASE(T) case SkRecords::T##_Type: return f((SkRecords::T*)this->ptr());
+            switch(this->type()) { SK_RECORD_TYPES(CASE) }
         #undef CASE
             SkDEBUGFAIL("Unreachable");
             return R();
         }
-
-    private:
-        void* fPtr;
     };
 
+    // fRecords needs to be a data structure that can append fixed length data, and need to
+    // support efficient random access and forward iteration.  (It doesn't need to be contiguous.)
+    int fCount, fReserved;
+    SkAutoSTMalloc<kInlineRecords, Record> fRecords;
+
     // fAlloc needs to be a data structure which can append variable length data in contiguous
     // chunks, returning a stable handle to that data for later retrieval.
-    //
-    // fRecords and fTypes need to be data structures that can append fixed length data, and need to
-    // support efficient forward iteration.  (They don't need to be contiguous or indexable.)
-
-    SkChunkAlloc fAlloc;
-    SkAutoTMalloc<Record> fRecords;
-    SkAutoTMalloc<Type8> fTypes;
-    // fCount and fReserved measure both fRecords and fTypes, which always grow in lock step.
-    unsigned fCount;
-    unsigned fReserved;
-    const unsigned kFirstReserveCount;
+    SkVarAlloc fAlloc;
+    char fInlineAlloc[1 << kInlineAllocLgBytes];
 };
 
 #endif//SkRecord_DEFINED
diff --git a/gfx/skia/skia/src/core/SkRecordAnalysis.cpp b/gfx/skia/skia/src/core/SkRecordAnalysis.cpp
deleted file mode 100644
index 0bfbaef9a65f..000000000000
--- a/gfx/skia/skia/src/core/SkRecordAnalysis.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include "SkRecordAnalysis.h"
-
-#include "SkShader.h"
-#include "SkTLogic.h"
-
-/** SkRecords visitor to determine whether an instance may require an
-    "external" bitmap to rasterize. May return false positives.
-    Does not return true for bitmap text.
-
-    Expected use is to determine whether images need to be decoded before
-    rasterizing a particular SkRecord.
- */
-struct BitmapTester {
-    // Helpers.  These create HasMember_bitmap and HasMember_paint.
-    SK_CREATE_MEMBER_DETECTOR(bitmap);
-    SK_CREATE_MEMBER_DETECTOR(paint);
-
-    // Some commands have a paint, some have an optional paint.  Either way, get back a pointer.
-    static const SkPaint* AsPtr(const SkPaint& p) { return &p; }
-    static const SkPaint* AsPtr(const SkRecords::Optional<SkPaint>& p) { return p; }
-
-
-    // Main entry for visitor:
-    // If the command has a bitmap directly, return true.
-    // If the command has a paint and the paint has a bitmap, return true.
-    // Otherwise, return false.
-    template <typename T>
-    bool operator()(const T& r) { return CheckBitmap(r); }
-
-
-    // If the command has a bitmap, of course we're going to play back bitmaps.
-    template <typename T>
-    static SK_WHEN(HasMember_bitmap<T>, bool) CheckBitmap(const T&) { return true; }
-
-    // If not, look for one in its paint (if it has a paint).
-    template <typename T>
-    static SK_WHEN(!HasMember_bitmap<T>, bool) CheckBitmap(const T& r) { return CheckPaint(r); }
-
-    // If we have a paint, dig down into the effects looking for a bitmap.
-    template <typename T>
-    static SK_WHEN(HasMember_paint<T>, bool) CheckPaint(const T& r) {
-        const SkPaint* paint = AsPtr(r.paint);
-        if (paint) {
-            const SkShader* shader = paint->getShader();
-            if (shader &&
-                shader->asABitmap(NULL, NULL, NULL) == SkShader::kDefault_BitmapType) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    // If we don't have a paint, that non-paint has no bitmap.
-    template <typename T>
-    static SK_WHEN(!HasMember_paint<T>, bool) CheckPaint(const T&) { return false; }
-};
-
-bool SkRecordWillPlaybackBitmaps(const SkRecord& record) {
-    BitmapTester tester;
-    for (unsigned i = 0; i < record.count(); i++) {
-        if (record.visit<bool>(i, tester)) {
-            return true;
-        }
-    }
-    return false;
-}
diff --git a/gfx/skia/skia/src/core/SkRecordAnalysis.h b/gfx/skia/skia/src/core/SkRecordAnalysis.h
deleted file mode 100644
index 6bdd5bc3111d..000000000000
--- a/gfx/skia/skia/src/core/SkRecordAnalysis.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef SkRecordAnalysis_DEFINED
-#define SkRecordAnalysis_DEFINED
-
-#include "SkRecord.h"
-
-bool SkRecordWillPlaybackBitmaps(const SkRecord& record);
-
-#endif // SkRecordAnalysis_DEFINED
diff --git a/gfx/skia/skia/src/core/SkRecordDraw.cpp b/gfx/skia/skia/src/core/SkRecordDraw.cpp
index 89efb8e18bf0..4847273f52a8 100644
--- a/gfx/skia/skia/src/core/SkRecordDraw.cpp
+++ b/gfx/skia/skia/src/core/SkRecordDraw.cpp
@@ -5,37 +5,73 @@
  * found in the LICENSE file.
  */
 
+#include "SkLayerInfo.h"
 #include "SkRecordDraw.h"
+#include "SkPatchUtils.h"
 
-void SkRecordDraw(const SkRecord& record, SkCanvas* canvas, SkDrawPictureCallback* callback) {
+void SkRecordDraw(const SkRecord& record,
+                  SkCanvas* canvas,
+                  SkPicture const* const drawablePicts[],
+                  SkDrawable* const drawables[],
+                  int drawableCount,
+                  const SkBBoxHierarchy* bbh,
+                  SkPicture::AbortCallback* callback) {
     SkAutoCanvasRestore saveRestore(canvas, true /*save now, restore at exit*/);
-    for (SkRecords::Draw draw(canvas); draw.index() < record.count(); draw.next()) {
-        if (NULL != callback && callback->abortDrawing()) {
-            return;
+
+    if (bbh) {
+        // Draw only ops that affect pixels in the canvas's current clip.
+        // The SkRecord and BBH were recorded in identity space.  This canvas
+        // is not necessarily in that same space.  getClipBounds() returns us
+        // this canvas' clip bounds transformed back into identity space, which
+        // lets us query the BBH.
+        SkRect query;
+        if (!canvas->getClipBounds(&query)) {
+            query.setEmpty();
         }
-        record.visit<void>(draw.index(), draw);
+
+        SkTDArray<int> ops;
+        bbh->search(query, &ops);
+
+        SkRecords::Draw draw(canvas, drawablePicts, drawables, drawableCount);
+        for (int i = 0; i < ops.count(); i++) {
+            if (callback && callback->abort()) {
+                return;
+            }
+            // This visit call uses the SkRecords::Draw::operator() to call
+            // methods on the |canvas|, wrapped by methods defined with the
+            // DRAW() macro.
+            record.visit<void>(ops[i], draw);
+        }
+    } else {
+        // Draw all ops.
+        SkRecords::Draw draw(canvas, drawablePicts, drawables, drawableCount);
+        for (int i = 0; i < record.count(); i++) {
+            if (callback && callback->abort()) {
+                return;
+            }
+            // This visit call uses the SkRecords::Draw::operator() to call
+            // methods on the |canvas|, wrapped by methods defined with the
+            // DRAW() macro.
+            record.visit<void>(i, draw);
+        }
+    }
+}
+
+void SkRecordPartialDraw(const SkRecord& record, SkCanvas* canvas,
+                         SkPicture const* const drawablePicts[], int drawableCount,
+                         int start, int stop,
+                         const SkMatrix& initialCTM) {
+    SkAutoCanvasRestore saveRestore(canvas, true /*save now, restore at exit*/);
+
+    stop = SkTMin(stop, record.count());
+    SkRecords::Draw draw(canvas, drawablePicts, nullptr, drawableCount, &initialCTM);
+    for (int i = start; i < stop; i++) {
+        record.visit<void>(i, draw);
     }
 }
 
 namespace SkRecords {
 
-bool Draw::skip(const PairedPushCull& r) {
-    if (fCanvas->quickReject(r.base->rect)) {
-        fIndex += r.skip;
-        return true;
-    }
-    return false;
-}
-
-bool Draw::skip(const BoundedDrawPosTextH& r) {
-    return fCanvas->quickRejectY(r.minY, r.maxY);
-}
-
-// FIXME: SkBitmaps are stateful, so we need to copy them to play back in multiple threads.
-static SkBitmap shallow_copy(const SkBitmap& bitmap) {
-    return bitmap;
-}
-
 // NoOps draw nothing.
 template <> void Draw::draw(const NoOp&) {}
 
@@ -43,39 +79,731 @@ template <> void Draw::draw(const NoOp&) {}
 DRAW(Restore, restore());
 DRAW(Save, save());
 DRAW(SaveLayer, saveLayer(r.bounds, r.paint, r.flags));
-DRAW(PopCull, popCull());
-DRAW(PushCull, pushCull(r.rect));
-DRAW(Clear, clear(r.color));
-DRAW(Concat, concat(r.matrix));
 DRAW(SetMatrix, setMatrix(SkMatrix::Concat(fInitialCTM, r.matrix)));
+DRAW(Concat, concat(r.matrix));
 
-DRAW(ClipPath, clipPath(r.path, r.op, r.doAA));
-DRAW(ClipRRect, clipRRect(r.rrect, r.op, r.doAA));
-DRAW(ClipRect, clipRect(r.rect, r.op, r.doAA));
+DRAW(ClipPath, clipPath(r.path, r.opAA.op, r.opAA.aa));
+DRAW(ClipRRect, clipRRect(r.rrect, r.opAA.op, r.opAA.aa));
+DRAW(ClipRect, clipRect(r.rect, r.opAA.op, r.opAA.aa));
 DRAW(ClipRegion, clipRegion(r.region, r.op));
 
-DRAW(DrawBitmap, drawBitmap(shallow_copy(r.bitmap), r.left, r.top, r.paint));
-DRAW(DrawBitmapMatrix, drawBitmapMatrix(shallow_copy(r.bitmap), r.matrix, r.paint));
-DRAW(DrawBitmapNine, drawBitmapNine(shallow_copy(r.bitmap), r.center, r.dst, r.paint));
-DRAW(DrawBitmapRectToRect,
-        drawBitmapRectToRect(shallow_copy(r.bitmap), r.src, r.dst, r.paint, r.flags));
+DRAW(DrawBitmap, drawBitmap(r.bitmap.shallowCopy(), r.left, r.top, r.paint));
+DRAW(DrawBitmapNine, drawBitmapNine(r.bitmap.shallowCopy(), r.center, r.dst, r.paint));
+DRAW(DrawBitmapRect,
+        legacy_drawBitmapRect(r.bitmap.shallowCopy(), r.src, r.dst, r.paint,
+                             SkCanvas::kStrict_SrcRectConstraint));
+DRAW(DrawBitmapRectFast,
+        legacy_drawBitmapRect(r.bitmap.shallowCopy(), r.src, r.dst, r.paint,
+                       SkCanvas::kFast_SrcRectConstraint));
+DRAW(DrawBitmapRectFixedSize,
+        legacy_drawBitmapRect(r.bitmap.shallowCopy(), &r.src, r.dst, &r.paint, r.constraint));
 DRAW(DrawDRRect, drawDRRect(r.outer, r.inner, r.paint));
+DRAW(DrawImage, drawImage(r.image, r.left, r.top, r.paint));
+DRAW(DrawImageRect, legacy_drawImageRect(r.image, r.src, r.dst, r.paint, r.constraint));
+DRAW(DrawImageNine, drawImageNine(r.image, r.center, r.dst, r.paint));
 DRAW(DrawOval, drawOval(r.oval, r.paint));
 DRAW(DrawPaint, drawPaint(r.paint));
 DRAW(DrawPath, drawPath(r.path, r.paint));
+DRAW(DrawPatch, drawPatch(r.cubics, r.colors, r.texCoords, r.xmode, r.paint));
+DRAW(DrawPicture, drawPicture(r.picture, &r.matrix, r.paint));
 DRAW(DrawPoints, drawPoints(r.mode, r.count, r.pts, r.paint));
 DRAW(DrawPosText, drawPosText(r.text, r.byteLength, r.pos, r.paint));
 DRAW(DrawPosTextH, drawPosTextH(r.text, r.byteLength, r.xpos, r.y, r.paint));
 DRAW(DrawRRect, drawRRect(r.rrect, r.paint));
 DRAW(DrawRect, drawRect(r.rect, r.paint));
-DRAW(DrawSprite, drawSprite(shallow_copy(r.bitmap), r.left, r.top, r.paint));
+DRAW(DrawSprite, drawSprite(r.bitmap.shallowCopy(), r.left, r.top, r.paint));
 DRAW(DrawText, drawText(r.text, r.byteLength, r.x, r.y, r.paint));
-DRAW(DrawTextOnPath, drawTextOnPath(r.text, r.byteLength, r.path, r.matrix, r.paint));
+DRAW(DrawTextBlob, drawTextBlob(r.blob, r.x, r.y, r.paint));
+DRAW(DrawTextOnPath, drawTextOnPath(r.text, r.byteLength, r.path, &r.matrix, r.paint));
+DRAW(DrawAtlas, drawAtlas(r.atlas, r.xforms, r.texs, r.colors, r.count, r.mode, r.cull, r.paint));
 DRAW(DrawVertices, drawVertices(r.vmode, r.vertexCount, r.vertices, r.texs, r.colors,
-                                r.xmode.get(), r.indices, r.indexCount, r.paint));
+                                r.xmode, r.indices, r.indexCount, r.paint));
 #undef DRAW
 
-template <> void Draw::draw(const PairedPushCull& r) { this->draw(*r.base); }
-template <> void Draw::draw(const BoundedDrawPosTextH& r) { this->draw(*r.base); }
+template <> void Draw::draw(const DrawDrawable& r) {
+    SkASSERT(r.index >= 0);
+    SkASSERT(r.index < fDrawableCount);
+    if (fDrawables) {
+        SkASSERT(nullptr == fDrawablePicts);
+        fCanvas->drawDrawable(fDrawables[r.index], r.matrix);
+    } else {
+        fCanvas->drawPicture(fDrawablePicts[r.index], r.matrix, nullptr);
+    }
+}
+
+// This is an SkRecord visitor that fills an SkBBoxHierarchy.
+//
+// The interesting part here is how to calculate bounds for ops which don't
+// have intrinsic bounds.  What is the bounds of a Save or a Translate?
+//
+// We answer this by thinking about a particular definition of bounds: if I
+// don't execute this op, pixels in this rectangle might draw incorrectly.  So
+// the bounds of a Save, a Translate, a Restore, etc. are the union of the
+// bounds of Draw* ops that they might have an effect on.  For any given
+// Save/Restore block, the bounds of the Save, the Restore, and any other
+// non-drawing ("control") ops inside are exactly the union of the bounds of
+// the drawing ops inside that block.
+//
+// To implement this, we keep a stack of active Save blocks.  As we consume ops
+// inside the Save/Restore block, drawing ops are unioned with the bounds of
+// the block, and control ops are stashed away for later.  When we finish the
+// block with a Restore, our bounds are complete, and we go back and fill them
+// in for all the control ops we stashed away.
+class FillBounds : SkNoncopyable {
+public:
+    FillBounds(const SkRect& cullRect, const SkRecord& record, SkRect bounds[])
+        : fNumRecords(record.count())
+        , fCullRect(cullRect)
+        , fBounds(bounds) {
+        fCTM = SkMatrix::I();
+        fCurrentClipBounds = fCullRect;
+    }
+
+    void cleanUp() {
+        // If we have any lingering unpaired Saves, simulate restores to make
+        // sure all ops in those Save blocks have their bounds calculated.
+        while (!fSaveStack.isEmpty()) {
+            this->popSaveBlock();
+        }
+
+        // Any control ops not part of any Save/Restore block draw everywhere.
+        while (!fControlIndices.isEmpty()) {
+            this->popControl(fCullRect);
+        }
+    }
+
+    void setCurrentOp(int currentOp) { fCurrentOp = currentOp; }
+
+
+    template <typename T> void operator()(const T& op) {
+        this->updateCTM(op);
+        this->updateClipBounds(op);
+        this->trackBounds(op);
+    }
+
+    // In this file, SkRect are in local coordinates, Bounds are translated back to identity space.
+    typedef SkRect Bounds;
+
+    int currentOp() const { return fCurrentOp; }
+    const SkMatrix& ctm() const { return fCTM; }
+    const Bounds& getBounds(int index) const { return fBounds[index]; }
+
+    // Adjust rect for all paints that may affect its geometry, then map it to identity space.
+    Bounds adjustAndMap(SkRect rect, const SkPaint* paint) const {
+        // Inverted rectangles really confuse our BBHs.
+        rect.sort();
+
+        // Adjust the rect for its own paint.
+        if (!AdjustForPaint(paint, &rect)) {
+            // The paint could do anything to our bounds.  The only safe answer is the current clip.
+            return fCurrentClipBounds;
+        }
+
+        // Adjust rect for all the paints from the SaveLayers we're inside.
+        if (!this->adjustForSaveLayerPaints(&rect)) {
+            // Same deal as above.
+            return fCurrentClipBounds;
+        }
+
+        // Map the rect back to identity space.
+        fCTM.mapRect(&rect);
+
+        // Nothing can draw outside the current clip.
+        if (!rect.intersect(fCurrentClipBounds)) {
+            return Bounds::MakeEmpty();
+        }
+
+        return rect;
+    }
+
+private:
+    struct SaveBounds {
+        int controlOps;        // Number of control ops in this Save block, including the Save.
+        Bounds bounds;         // Bounds of everything in the block.
+        const SkPaint* paint;  // Unowned.  If set, adjusts the bounds of all ops in this block.
+    };
+
+    // Only Restore, SetMatrix, and Concat change the CTM.
+    template <typename T> void updateCTM(const T&) {}
+    void updateCTM(const Restore& op)   { fCTM = op.matrix; }
+    void updateCTM(const SetMatrix& op) { fCTM = op.matrix; }
+    void updateCTM(const Concat& op)    { fCTM.preConcat(op.matrix); }
+
+    // Most ops don't change the clip.
+    template <typename T> void updateClipBounds(const T&) {}
+
+    // Clip{Path,RRect,Rect,Region} obviously change the clip.  They all know their bounds already.
+    void updateClipBounds(const ClipPath&   op) { this->updateClipBoundsForClipOp(op.devBounds); }
+    void updateClipBounds(const ClipRRect&  op) { this->updateClipBoundsForClipOp(op.devBounds); }
+    void updateClipBounds(const ClipRect&   op) { this->updateClipBoundsForClipOp(op.devBounds); }
+    void updateClipBounds(const ClipRegion& op) { this->updateClipBoundsForClipOp(op.devBounds); }
+
+    // The bounds of clip ops need to be adjusted for the paints of saveLayers they're inside.
+    void updateClipBoundsForClipOp(const SkIRect& devBounds) {
+        Bounds clip = SkRect::Make(devBounds);
+        // We don't call adjustAndMap() because as its last step it would intersect the adjusted
+        // clip bounds with the previous clip, exactly what we can't do when the clip grows.
+        if (this->adjustForSaveLayerPaints(&clip)) {
+            fCurrentClipBounds = clip.intersect(fCullRect) ? clip : Bounds::MakeEmpty();
+        } else {
+            fCurrentClipBounds = fCullRect;
+        }
+    }
+
+    // Restore holds the devBounds for the clip after the {save,saveLayer}/restore block completes.
+    void updateClipBounds(const Restore& op) {
+        // This is just like the clip ops above, but we need to skip the effects (if any) of our
+        // paired saveLayer (if it is one); it has not yet been popped off the save stack.  Our
+        // devBounds reflect the state of the world after the saveLayer/restore block is done,
+        // so they are not affected by the saveLayer's paint.
+        const int kSavesToIgnore = 1;
+        Bounds clip = SkRect::Make(op.devBounds);
+        if (this->adjustForSaveLayerPaints(&clip, kSavesToIgnore)) {
+            fCurrentClipBounds = clip.intersect(fCullRect) ? clip : Bounds::MakeEmpty();
+        } else {
+            fCurrentClipBounds = fCullRect;
+        }
+    }
+
+    // We also take advantage of SaveLayer bounds when present to further cut the clip down.
+    void updateClipBounds(const SaveLayer& op)  {
+        if (op.bounds) {
+            // adjustAndMap() intersects these layer bounds with the previous clip for us.
+            fCurrentClipBounds = this->adjustAndMap(*op.bounds, op.paint);
+        }
+    }
+
+    // The bounds of these ops must be calculated when we hit the Restore
+    // from the bounds of the ops in the same Save block.
+    void trackBounds(const Save&)          { this->pushSaveBlock(nullptr); }
+    void trackBounds(const SaveLayer& op)  { this->pushSaveBlock(op.paint); }
+    void trackBounds(const Restore&) { fBounds[fCurrentOp] = this->popSaveBlock(); }
+
+    void trackBounds(const SetMatrix&)         { this->pushControl(); }
+    void trackBounds(const Concat&)            { this->pushControl(); }
+    void trackBounds(const ClipRect&)          { this->pushControl(); }
+    void trackBounds(const ClipRRect&)         { this->pushControl(); }
+    void trackBounds(const ClipPath&)          { this->pushControl(); }
+    void trackBounds(const ClipRegion&)        { this->pushControl(); }
+
+    // For all other ops, we can calculate and store the bounds directly now.
+    template <typename T> void trackBounds(const T& op) {
+        fBounds[fCurrentOp] = this->bounds(op);
+        this->updateSaveBounds(fBounds[fCurrentOp]);
+    }
+
+    void pushSaveBlock(const SkPaint* paint) {
+        // Starting a new Save block.  Push a new entry to represent that.
+        SaveBounds sb;
+        sb.controlOps = 0;
+        // If the paint affects transparent black, the bound shouldn't be smaller
+        // than the current clip bounds.
+        sb.bounds =
+            PaintMayAffectTransparentBlack(paint) ? fCurrentClipBounds : Bounds::MakeEmpty();
+        sb.paint = paint;
+
+        fSaveStack.push(sb);
+        this->pushControl();
+    }
+
+    static bool PaintMayAffectTransparentBlack(const SkPaint* paint) {
+        if (paint) {
+            // FIXME: this is very conservative
+            if (paint->getImageFilter() || paint->getColorFilter()) {
+                return true;
+            }
+
+            // Unusual Xfermodes require us to process a saved layer
+            // even with operations outisde the clip.
+            // For example, DstIn is used by masking layers.
+            // https://code.google.com/p/skia/issues/detail?id=1291
+            // https://crbug.com/401593
+            SkXfermode* xfermode = paint->getXfermode();
+            SkXfermode::Mode mode;
+            // SrcOver is ok, and is also the common case with a nullptr xfermode.
+            // So we should make that the fast path and bypass the mode extraction
+            // and test.
+            if (xfermode && xfermode->asMode(&mode)) {
+                switch (mode) {
+                    // For each of the following transfer modes, if the source
+                    // alpha is zero (our transparent black), the resulting
+                    // blended alpha is not necessarily equal to the original
+                    // destination alpha.
+                    case SkXfermode::kClear_Mode:
+                    case SkXfermode::kSrc_Mode:
+                    case SkXfermode::kSrcIn_Mode:
+                    case SkXfermode::kDstIn_Mode:
+                    case SkXfermode::kSrcOut_Mode:
+                    case SkXfermode::kDstATop_Mode:
+                    case SkXfermode::kModulate_Mode:
+                        return true;
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+        return false;
+    }
+
+    Bounds popSaveBlock() {
+        // We're done the Save block.  Apply the block's bounds to all control ops inside it.
+        SaveBounds sb;
+        fSaveStack.pop(&sb);
+
+        while (sb.controlOps --> 0) {
+            this->popControl(sb.bounds);
+        }
+
+        // This whole Save block may be part another Save block.
+        this->updateSaveBounds(sb.bounds);
+
+        // If called from a real Restore (not a phony one for balance), it'll need the bounds.
+        return sb.bounds;
+    }
+
+    void pushControl() {
+        fControlIndices.push(fCurrentOp);
+        if (!fSaveStack.isEmpty()) {
+            fSaveStack.top().controlOps++;
+        }
+    }
+
+    void popControl(const Bounds& bounds) {
+        fBounds[fControlIndices.top()] = bounds;
+        fControlIndices.pop();
+    }
+
+    void updateSaveBounds(const Bounds& bounds) {
+        // If we're in a Save block, expand its bounds to cover these bounds too.
+        if (!fSaveStack.isEmpty()) {
+            fSaveStack.top().bounds.join(bounds);
+        }
+    }
+
+    // FIXME: this method could use better bounds
+    Bounds bounds(const DrawText&) const { return fCurrentClipBounds; }
+
+    Bounds bounds(const DrawPaint&) const { return fCurrentClipBounds; }
+    Bounds bounds(const NoOp&)  const { return Bounds::MakeEmpty(); }    // NoOps don't draw.
+
+    Bounds bounds(const DrawSprite& op) const {  // Ignores the matrix, but respects the clip.
+        SkRect rect = Bounds::MakeXYWH(op.left, op.top, op.bitmap.width(), op.bitmap.height());
+        if (!rect.intersect(fCurrentClipBounds)) {
+            return Bounds::MakeEmpty();
+        }
+        return rect;
+    }
+
+    Bounds bounds(const DrawRect& op) const { return this->adjustAndMap(op.rect, &op.paint); }
+    Bounds bounds(const DrawOval& op) const { return this->adjustAndMap(op.oval, &op.paint); }
+    Bounds bounds(const DrawRRect& op) const {
+        return this->adjustAndMap(op.rrect.rect(), &op.paint);
+    }
+    Bounds bounds(const DrawDRRect& op) const {
+        return this->adjustAndMap(op.outer.rect(), &op.paint);
+    }
+    Bounds bounds(const DrawImage& op) const {
+        const SkImage* image = op.image;
+        SkRect rect = SkRect::MakeXYWH(op.left, op.top, image->width(), image->height());
+
+        return this->adjustAndMap(rect, op.paint);
+    }
+    Bounds bounds(const DrawImageRect& op) const {
+        return this->adjustAndMap(op.dst, op.paint);
+    }
+    Bounds bounds(const DrawImageNine& op) const {
+        return this->adjustAndMap(op.dst, op.paint);
+    }
+    Bounds bounds(const DrawBitmapRect& op) const {
+        return this->adjustAndMap(op.dst, op.paint);
+    }
+    Bounds bounds(const DrawBitmapRectFast& op) const {
+        return this->adjustAndMap(op.dst, op.paint);
+    }
+    Bounds bounds(const DrawBitmapRectFixedSize& op) const {
+        return this->adjustAndMap(op.dst, &op.paint);
+    }
+    Bounds bounds(const DrawBitmapNine& op) const {
+        return this->adjustAndMap(op.dst, op.paint);
+    }
+    Bounds bounds(const DrawBitmap& op) const {
+        return this->adjustAndMap(
+                SkRect::MakeXYWH(op.left, op.top, op.bitmap.width(), op.bitmap.height()),
+                op.paint);
+    }
+
+    Bounds bounds(const DrawPath& op) const {
+        return op.path.isInverseFillType() ? fCurrentClipBounds
+                                           : this->adjustAndMap(op.path.getBounds(), &op.paint);
+    }
+    Bounds bounds(const DrawPoints& op) const {
+        SkRect dst;
+        dst.set(op.pts, op.count);
+
+        // Pad the bounding box a little to make sure hairline points' bounds aren't empty.
+        SkScalar stroke = SkMaxScalar(op.paint.getStrokeWidth(), 0.01f);
+        dst.outset(stroke/2, stroke/2);
+
+        return this->adjustAndMap(dst, &op.paint);
+    }
+    Bounds bounds(const DrawPatch& op) const {
+        SkRect dst;
+        dst.set(op.cubics, SkPatchUtils::kNumCtrlPts);
+        return this->adjustAndMap(dst, &op.paint);
+    }
+    Bounds bounds(const DrawVertices& op) const {
+        SkRect dst;
+        dst.set(op.vertices, op.vertexCount);
+        return this->adjustAndMap(dst, &op.paint);
+    }
+
+    Bounds bounds(const DrawAtlas& op) const {
+        if (op.cull) {
+            return this->adjustAndMap(*op.cull, op.paint);
+        } else {
+            return fCurrentClipBounds;
+        }
+    }
+
+    Bounds bounds(const DrawPicture& op) const {
+        SkRect dst = op.picture->cullRect();
+        op.matrix.mapRect(&dst);
+        return this->adjustAndMap(dst, op.paint);
+    }
+
+    Bounds bounds(const DrawPosText& op) const {
+        const int N = op.paint.countText(op.text, op.byteLength);
+        if (N == 0) {
+            return Bounds::MakeEmpty();
+        }
+
+        SkRect dst;
+        dst.set(op.pos, N);
+        AdjustTextForFontMetrics(&dst, op.paint);
+        return this->adjustAndMap(dst, &op.paint);
+    }
+    Bounds bounds(const DrawPosTextH& op) const {
+        const int N = op.paint.countText(op.text, op.byteLength);
+        if (N == 0) {
+            return Bounds::MakeEmpty();
+        }
+
+        SkScalar left = op.xpos[0], right = op.xpos[0];
+        for (int i = 1; i < N; i++) {
+            left  = SkMinScalar(left,  op.xpos[i]);
+            right = SkMaxScalar(right, op.xpos[i]);
+        }
+        SkRect dst = { left, op.y, right, op.y };
+        AdjustTextForFontMetrics(&dst, op.paint);
+        return this->adjustAndMap(dst, &op.paint);
+    }
+    Bounds bounds(const DrawTextOnPath& op) const {
+        SkRect dst = op.path.getBounds();
+
+        // Pad all sides by the maximum padding in any direction we'd normally apply.
+        SkRect pad = { 0, 0, 0, 0};
+        AdjustTextForFontMetrics(&pad, op.paint);
+
+        // That maximum padding happens to always be the right pad today.
+        SkASSERT(pad.fLeft == -pad.fRight);
+        SkASSERT(pad.fTop  == -pad.fBottom);
+        SkASSERT(pad.fRight > pad.fBottom);
+        dst.outset(pad.fRight, pad.fRight);
+
+        return this->adjustAndMap(dst, &op.paint);
+    }
+
+    Bounds bounds(const DrawTextBlob& op) const {
+        SkRect dst = op.blob->bounds();
+        dst.offset(op.x, op.y);
+        return this->adjustAndMap(dst, &op.paint);
+    }
+
+    Bounds bounds(const DrawDrawable& op) const {
+        return this->adjustAndMap(op.worstCaseBounds, nullptr);
+    }
+
+    static void AdjustTextForFontMetrics(SkRect* rect, const SkPaint& paint) {
+#ifdef SK_DEBUG
+        SkRect correct = *rect;
+#endif
+        // crbug.com/373785 ~~> xPad = 4x yPad
+        // crbug.com/424824 ~~> bump yPad from 2x text size to 2.5x
+        const SkScalar yPad = 2.5f * paint.getTextSize(),
+                       xPad = 4.0f * yPad;
+        rect->outset(xPad, yPad);
+#ifdef SK_DEBUG
+        SkPaint::FontMetrics metrics;
+        paint.getFontMetrics(&metrics);
+        correct.fLeft   += metrics.fXMin;
+        correct.fTop    += metrics.fTop;
+        correct.fRight  += metrics.fXMax;
+        correct.fBottom += metrics.fBottom;
+        // See skia:2862 for why we ignore small text sizes.
+        SkASSERTF(paint.getTextSize() < 0.001f || rect->contains(correct),
+                  "%f %f %f %f vs. %f %f %f %f\n",
+                  -xPad, -yPad, +xPad, +yPad,
+                  metrics.fXMin, metrics.fTop, metrics.fXMax, metrics.fBottom);
+#endif
+    }
+
+    // Returns true if rect was meaningfully adjusted for the effects of paint,
+    // false if the paint could affect the rect in unknown ways.
+    static bool AdjustForPaint(const SkPaint* paint, SkRect* rect) {
+        if (paint) {
+            if (paint->canComputeFastBounds()) {
+                *rect = paint->computeFastBounds(*rect, rect);
+                return true;
+            }
+            return false;
+        }
+        return true;
+    }
+
+    bool adjustForSaveLayerPaints(SkRect* rect, int savesToIgnore = 0) const {
+        for (int i = fSaveStack.count() - 1 - savesToIgnore; i >= 0; i--) {
+            if (!AdjustForPaint(fSaveStack[i].paint, rect)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    const int fNumRecords;
+
+    // We do not guarantee anything for operations outside of the cull rect
+    const SkRect fCullRect;
+
+    // Conservative identity-space bounds for each op in the SkRecord.
+    Bounds* fBounds;
+
+    // We walk fCurrentOp through the SkRecord, as we go using updateCTM()
+    // and updateClipBounds() to maintain the exact CTM (fCTM) and conservative
+    // identity-space bounds of the current clip (fCurrentClipBounds).
+    int fCurrentOp;
+    SkMatrix fCTM;
+    Bounds fCurrentClipBounds;
+
+    // Used to track the bounds of Save/Restore blocks and the control ops inside them.
+    SkTDArray<SaveBounds> fSaveStack;
+    SkTDArray<int>   fControlIndices;
+};
+
+// SkRecord visitor to gather saveLayer/restore information.
+class CollectLayers : SkNoncopyable {
+public:
+    CollectLayers(const SkRect& cullRect, const SkRecord& record, SkRect bounds[],
+                  const SkBigPicture::SnapshotArray* pictList, SkLayerInfo* accelData)
+        : fSaveLayersInStack(0)
+        , fAccelData(accelData)
+        , fPictList(pictList)
+        , fFillBounds(cullRect, record, bounds)
+    {}
+
+    void cleanUp() {
+        // fFillBounds must perform its cleanUp first so that all the bounding
+        // boxes associated with unbalanced restores are updated (prior to
+        // fetching their bound in popSaveLayerInfo).
+        fFillBounds.cleanUp();
+        while (!fSaveLayerStack.isEmpty()) {
+            this->popSaveLayerInfo();
+        }
+    }
+
+    void setCurrentOp(int currentOp) { fFillBounds.setCurrentOp(currentOp); }
+
+
+    template <typename T> void operator()(const T& op) {
+        fFillBounds(op);
+        this->trackSaveLayers(op);
+    }
+
+private:
+    struct SaveLayerInfo {
+        SaveLayerInfo() { }
+        SaveLayerInfo(int opIndex, bool isSaveLayer, const SkRect* bounds, const SkPaint* paint)
+            : fStartIndex(opIndex)
+            , fIsSaveLayer(isSaveLayer)
+            , fHasNestedSaveLayer(false)
+            , fBounds(bounds ? *bounds : SkRect::MakeEmpty())
+            , fPaint(paint) {
+        }
+
+        int                fStartIndex;
+        bool               fIsSaveLayer;
+        bool               fHasNestedSaveLayer;
+        SkRect             fBounds;
+        const SkPaint*     fPaint;
+    };
+
+    template <typename T> void trackSaveLayers(const T& op) {
+        /* most ops aren't involved in saveLayers */
+    }
+    void trackSaveLayers(const Save& s) { this->pushSaveLayerInfo(false, nullptr, nullptr); }
+    void trackSaveLayers(const SaveLayer& sl) { this->pushSaveLayerInfo(true, sl.bounds, sl.paint); }
+    void trackSaveLayers(const Restore& r) { this->popSaveLayerInfo(); }
+
+    void trackSaveLayersForPicture(const SkPicture* picture, const SkPaint* paint) {
+        // For sub-pictures, we wrap their layer information within the parent
+        // picture's rendering hierarchy
+        const SkLayerInfo* childData = nullptr;
+        if (const SkBigPicture* bp = picture->asSkBigPicture()) {
+            childData = static_cast<const SkLayerInfo*>(bp->accelData());
+        }
+        if (!childData) {
+            // If the child layer hasn't been generated with saveLayer data we
+            // assume the worst (i.e., that it does contain layers which nest
+            // inside existing layers). Layers within sub-pictures that don't
+            // have saveLayer data cannot be hoisted.
+            // TODO: could the analysis data be use to fine tune this?
+            this->updateStackForSaveLayer();
+            return;
+        }
+
+        for (int i = 0; i < childData->numBlocks(); ++i) {
+            const SkLayerInfo::BlockInfo& src = childData->block(i);
+
+            FillBounds::Bounds newBound = fFillBounds.adjustAndMap(src.fBounds, paint);
+            if (newBound.isEmpty()) {
+                continue;
+            }
+
+            this->updateStackForSaveLayer();
+
+            SkLayerInfo::BlockInfo& dst = fAccelData->addBlock();
+
+            // If src.fPicture is nullptr the layer is in dp.picture; otherwise
+            // it belongs to a sub-picture.
+            dst.fPicture = src.fPicture ? src.fPicture : picture;
+            dst.fPicture->ref();
+            dst.fBounds = newBound;
+            dst.fSrcBounds = src.fSrcBounds;
+            dst.fLocalMat = src.fLocalMat;
+            dst.fPreMat = src.fPreMat;
+            dst.fPreMat.postConcat(fFillBounds.ctm());
+            if (src.fPaint) {
+                dst.fPaint = new SkPaint(*src.fPaint);
+            }
+            dst.fSaveLayerOpID = src.fSaveLayerOpID;
+            dst.fRestoreOpID = src.fRestoreOpID;
+            dst.fHasNestedLayers = src.fHasNestedLayers;
+            dst.fIsNested = fSaveLayersInStack > 0 || src.fIsNested;
+
+            // Store 'saveLayer ops from enclosing picture' + drawPict op + 'ops from sub-picture'
+            dst.fKeySize = fSaveLayerOpStack.count() + src.fKeySize + 1;
+            dst.fKey = new int[dst.fKeySize];
+            memcpy(dst.fKey, fSaveLayerOpStack.begin(), fSaveLayerOpStack.count() * sizeof(int));
+            dst.fKey[fSaveLayerOpStack.count()] = fFillBounds.currentOp();
+            memcpy(&dst.fKey[fSaveLayerOpStack.count()+1], src.fKey, src.fKeySize * sizeof(int));
+        }
+    }
+
+    void trackSaveLayers(const DrawPicture& dp) {
+        this->trackSaveLayersForPicture(dp.picture, dp.paint);
+    }
+
+    void trackSaveLayers(const DrawDrawable& dp) {
+        SkASSERT(fPictList);
+        SkASSERT(dp.index >= 0 && dp.index < fPictList->count());
+        const SkPaint* paint = nullptr;    // drawables don't get a side-car paint
+        this->trackSaveLayersForPicture(fPictList->begin()[dp.index], paint);
+    }
+
+    // Inform all the saveLayers already on the stack that they now have a
+    // nested saveLayer inside them
+    void updateStackForSaveLayer() {
+        for (int index = fSaveLayerStack.count() - 1; index >= 0; --index) {
+            if (fSaveLayerStack[index].fHasNestedSaveLayer) {
+                break;
+            }
+            fSaveLayerStack[index].fHasNestedSaveLayer = true;
+            if (fSaveLayerStack[index].fIsSaveLayer) {
+                break;
+            }
+        }
+    }
+
+    void pushSaveLayerInfo(bool isSaveLayer, const SkRect* bounds, const SkPaint* paint) {
+        if (isSaveLayer) {
+            this->updateStackForSaveLayer();
+            ++fSaveLayersInStack;
+            fSaveLayerOpStack.push(fFillBounds.currentOp());
+        }
+
+        fSaveLayerStack.push(SaveLayerInfo(fFillBounds.currentOp(), isSaveLayer, bounds, paint));
+    }
+
+    void popSaveLayerInfo() {
+        if (fSaveLayerStack.count() <= 0) {
+            SkASSERT(false);
+            return;
+        }
+
+        SkASSERT(fSaveLayersInStack == fSaveLayerOpStack.count());
+
+        SaveLayerInfo sli;
+        fSaveLayerStack.pop(&sli);
+
+        if (!sli.fIsSaveLayer) {
+            return;
+        }
+
+        --fSaveLayersInStack;
+
+        SkLayerInfo::BlockInfo& block = fAccelData->addBlock();
+
+        SkASSERT(nullptr == block.fPicture);  // This layer is in the top-most picture
+
+        block.fBounds = fFillBounds.getBounds(sli.fStartIndex);
+        block.fLocalMat = fFillBounds.ctm();
+        block.fPreMat = SkMatrix::I();
+        if (sli.fPaint) {
+            block.fPaint = new SkPaint(*sli.fPaint);
+        }
+
+        block.fSrcBounds = sli.fBounds;
+        block.fSaveLayerOpID = sli.fStartIndex;
+        block.fRestoreOpID = fFillBounds.currentOp();
+        block.fHasNestedLayers = sli.fHasNestedSaveLayer;
+        block.fIsNested = fSaveLayersInStack > 0;
+
+        block.fKeySize = fSaveLayerOpStack.count();
+        block.fKey = new int[block.fKeySize];
+        memcpy(block.fKey, fSaveLayerOpStack.begin(), block.fKeySize * sizeof(int));
+
+        fSaveLayerOpStack.pop();
+    }
+
+    // Used to collect saveLayer information for layer hoisting
+    int                      fSaveLayersInStack;
+    SkTDArray<SaveLayerInfo> fSaveLayerStack;
+    // The op code indices of all the currently active saveLayers
+    SkTDArray<int>           fSaveLayerOpStack;
+    SkLayerInfo*             fAccelData;
+    const SkBigPicture::SnapshotArray* fPictList;
+
+    SkRecords::FillBounds fFillBounds;
+};
 
 }  // namespace SkRecords
+
+void SkRecordFillBounds(const SkRect& cullRect, const SkRecord& record, SkRect bounds[]) {
+    SkRecords::FillBounds visitor(cullRect, record, bounds);
+    for (int curOp = 0; curOp < record.count(); curOp++) {
+        visitor.setCurrentOp(curOp);
+        record.visit<void>(curOp, visitor);
+    }
+    visitor.cleanUp();
+}
+
+void SkRecordComputeLayers(const SkRect& cullRect, const SkRecord& record, SkRect bounds[],
+                           const SkBigPicture::SnapshotArray* pictList, SkLayerInfo* data) {
+    SkRecords::CollectLayers visitor(cullRect, record, bounds, pictList, data);
+    for (int curOp = 0; curOp < record.count(); curOp++) {
+        visitor.setCurrentOp(curOp);
+        record.visit<void>(curOp, visitor);
+    }
+    visitor.cleanUp();
+}
+
diff --git a/gfx/skia/skia/src/core/SkRecordDraw.h b/gfx/skia/skia/src/core/SkRecordDraw.h
index 92b94c442335..fdf98824acf8 100644
--- a/gfx/skia/skia/src/core/SkRecordDraw.h
+++ b/gfx/skia/skia/src/core/SkRecordDraw.h
@@ -8,47 +8,73 @@
 #ifndef SkRecordDraw_DEFINED
 #define SkRecordDraw_DEFINED
 
-#include "SkRecord.h"
+#include "SkBBoxHierarchy.h"
+#include "SkBigPicture.h"
 #include "SkCanvas.h"
-#include "SkDrawPictureCallback.h"
+#include "SkMatrix.h"
+#include "SkRecord.h"
+
+class SkDrawable;
+class SkLayerInfo;
+
+// Calculate conservative identity space bounds for each op in the record.
+void SkRecordFillBounds(const SkRect& cullRect, const SkRecord&, SkRect bounds[]);
+
+// SkRecordFillBounds(), and gathers information about saveLayers and stores it for later
+// use (e.g., layer hoisting). The gathered information is sufficient to determine
+// where each saveLayer will land and which ops in the picture it represents.
+void SkRecordComputeLayers(const SkRect& cullRect, const SkRecord&, SkRect bounds[],
+                           const SkBigPicture::SnapshotArray*, SkLayerInfo* data);
 
 // Draw an SkRecord into an SkCanvas.  A convenience wrapper around SkRecords::Draw.
-void SkRecordDraw(const SkRecord&, SkCanvas*, SkDrawPictureCallback* = NULL);
+void SkRecordDraw(const SkRecord&, SkCanvas*, SkPicture const* const drawablePicts[],
+                  SkDrawable* const drawables[], int drawableCount,
+                  const SkBBoxHierarchy*, SkPicture::AbortCallback*);
+
+// Draw a portion of an SkRecord into an SkCanvas.
+// When drawing a portion of an SkRecord the CTM on the passed in canvas must be
+// the composition of the replay matrix with the record-time CTM (for the portion
+// of the record that is being replayed). For setMatrix calls to behave correctly
+// the initialCTM parameter must set to just the replay matrix.
+void SkRecordPartialDraw(const SkRecord&, SkCanvas*,
+                         SkPicture const* const drawablePicts[], int drawableCount,
+                         int start, int stop, const SkMatrix& initialCTM);
 
 namespace SkRecords {
 
 // This is an SkRecord visitor that will draw that SkRecord to an SkCanvas.
 class Draw : SkNoncopyable {
 public:
-    explicit Draw(SkCanvas* canvas)
-        : fInitialCTM(canvas->getTotalMatrix()), fCanvas(canvas), fIndex(0) {}
-
-    unsigned index() const { return fIndex; }
-    void next() { ++fIndex; }
+    explicit Draw(SkCanvas* canvas, SkPicture const* const drawablePicts[],
+                  SkDrawable* const drawables[], int drawableCount,
+                  const SkMatrix* initialCTM = nullptr)
+        : fInitialCTM(initialCTM ? *initialCTM : canvas->getTotalMatrix())
+        , fCanvas(canvas)
+        , fDrawablePicts(drawablePicts)
+        , fDrawables(drawables)
+        , fDrawableCount(drawableCount)
+    {}
 
+    // This operator calls methods on the |canvas|. The various draw() wrapper
+    // methods around SkCanvas are defined by the DRAW() macro in
+    // SkRecordDraw.cpp.
     template <typename T> void operator()(const T& r) {
-        if (!this->skip(r)) {
-            this->draw(r);
-        }
+        this->draw(r);
     }
 
+protected:
+    SkPicture const* const* drawablePicts() const { return fDrawablePicts; }
+    int drawableCount() const { return fDrawableCount; }
+
 private:
     // No base case, so we'll be compile-time checked that we implement all possibilities.
     template <typename T> void draw(const T&);
 
-    // skip() should return true if we can skip this command, false if not.
-    // It may update fIndex directly to skip more than just this one command.
-
-    // Mostly we just blindly call fCanvas and let it handle quick rejects itself.
-    template <typename T> bool skip(const T&) { return false; }
-
-    // We add our own quick rejects for commands added by optimizations.
-    bool skip(const PairedPushCull&);
-    bool skip(const BoundedDrawPosTextH&);
-
     const SkMatrix fInitialCTM;
     SkCanvas* fCanvas;
-    unsigned fIndex;
+    SkPicture const* const* fDrawablePicts;
+    SkDrawable* const* fDrawables;
+    int fDrawableCount;
 };
 
 }  // namespace SkRecords
diff --git a/gfx/skia/skia/src/core/SkRecordOpts.cpp b/gfx/skia/skia/src/core/SkRecordOpts.cpp
index cb429cf76cd1..d1520adf561c 100644
--- a/gfx/skia/skia/src/core/SkRecordOpts.cpp
+++ b/gfx/skia/skia/src/core/SkRecordOpts.cpp
@@ -13,79 +13,151 @@
 
 using namespace SkRecords;
 
-void SkRecordOptimize(SkRecord* record) {
-    // TODO(mtklein): fuse independent optimizations to reduce number of passes?
-    SkRecordNoopCulls(record);
-    SkRecordNoopSaveRestores(record);
-    // TODO(mtklein): figure out why we draw differently and reenable
-    //SkRecordNoopSaveLayerDrawRestores(record);
-
-    SkRecordAnnotateCullingPairs(record);
-    SkRecordReduceDrawPosTextStrength(record);  // Helpful to run this before BoundDrawPosTextH.
-    SkRecordBoundDrawPosTextH(record);
-}
-
 // Most of the optimizations in this file are pattern-based.  These are all defined as structs with:
-//   - a Pattern typedef
-//   - a bool onMatch(SkRceord*, Pattern*, unsigned begin, unsigned end) method,
+//   - a Match typedef
+//   - a bool onMatch(SkRceord*, Match*, int begin, int end) method,
 //     which returns true if it made changes and false if not.
 
 // Run a pattern-based optimization once across the SkRecord, returning true if it made any changes.
-// It looks for spans which match Pass::Pattern, and when found calls onMatch() with the pattern,
+// It looks for spans which match Pass::Match, and when found calls onMatch() with that pattern,
 // record, and [begin,end) span of the commands that matched.
 template <typename Pass>
 static bool apply(Pass* pass, SkRecord* record) {
-    typename Pass::Pattern pattern;
+    typename Pass::Match match;
     bool changed = false;
-    unsigned begin, end = 0;
+    int begin, end = 0;
 
-    while (pattern.search(record, &begin, &end)) {
-        changed |= pass->onMatch(record, &pattern, begin, end);
+    while (match.search(record, &begin, &end)) {
+        changed |= pass->onMatch(record, &match, begin, end);
     }
     return changed;
 }
 
-struct CullNooper {
-    typedef Pattern3<Is<PushCull>, Star<Is<NoOp> >, Is<PopCull> > Pattern;
+///////////////////////////////////////////////////////////////////////////////////////////////////
 
-    bool onMatch(SkRecord* record, Pattern* pattern, unsigned begin, unsigned end) {
-        record->replace<NoOp>(begin);  // PushCull
-        record->replace<NoOp>(end-1);  // PopCull
-        return true;
-    }
-};
+static void multiple_set_matrices(SkRecord* record) {
+    struct {
+        typedef Pattern<Is<SetMatrix>,
+                        Greedy<Is<NoOp>>,
+                        Is<SetMatrix> >
+            Match;
 
-void SkRecordNoopCulls(SkRecord* record) {
-    CullNooper pass;
+        bool onMatch(SkRecord* record, Match* pattern, int begin, int end) {
+            record->replace<NoOp>(begin);  // first SetMatrix
+            return true;
+        }
+    } pass;
     while (apply(&pass, record));
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#if 0   // experimental, but needs knowledge of previous matrix to operate correctly
+static void apply_matrix_to_draw_params(SkRecord* record) {
+    struct {
+        typedef Pattern<Is<SetMatrix>,
+                        Greedy<Is<NoOp>>,
+                        Is<SetMatrix> >
+            Pattern;
+
+        bool onMatch(SkRecord* record, Pattern* pattern, int begin, int end) {
+            record->replace<NoOp>(begin);  // first SetMatrix
+            return true;
+        }
+    } pass;
+    // No need to loop, as we never "open up" opportunities for more of this type of optimization.
+    apply(&pass, record);
+}
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
 // Turns the logical NoOp Save and Restore in Save-Draw*-Restore patterns into actual NoOps.
 struct SaveOnlyDrawsRestoreNooper {
-    typedef Pattern3<Is<Save>,
-                     Star<Or<Is<NoOp>, IsDraw> >,
-                     Is<Restore> >
-        Pattern;
+    typedef Pattern<Is<Save>,
+                    Greedy<Or<Is<NoOp>, IsDraw>>,
+                    Is<Restore>>
+        Match;
 
-    bool onMatch(SkRecord* record, Pattern* pattern, unsigned begin, unsigned end) {
+    bool onMatch(SkRecord* record, Match*, int begin, int end) {
         record->replace<NoOp>(begin);  // Save
         record->replace<NoOp>(end-1);  // Restore
         return true;
     }
 };
+
+static bool fold_opacity_layer_color_to_paint(const SkPaint& layerPaint,
+                                              bool isSaveLayer,
+                                              SkPaint* paint) {
+    // We assume layerPaint is always from a saveLayer.  If isSaveLayer is
+    // true, we assume paint is too.
+
+    // The alpha folding can proceed if the filter layer paint does not have properties which cause
+    // the resulting filter layer to be "blended" in complex ways to the parent layer. For example,
+    // looper drawing unmodulated filter layer twice and then modulating the result produces
+    // different image to drawing modulated filter layer twice.
+    // TODO: most likely the looper and only some xfer modes are the hard constraints
+    if (paint->getXfermode() || paint->getLooper()) {
+        return false;
+    }
+
+    if (!isSaveLayer && paint->getImageFilter()) {
+        // For normal draws, the paint color is used as one input for the color for the draw. Image
+        // filter will operate on the result, and thus we can not change the input.
+        // For layer saves, the image filter is applied to the layer contents. The layer is then
+        // modulated with the paint color, so it's fine to proceed with the fold for saveLayer
+        // paints with image filters.
+        return false;
+    }
+
+    if (paint->getColorFilter()) {
+        // Filter input depends on the paint color.
+
+        // Here we could filter the color if we knew the draw is going to be uniform color.  This
+        // should be detectable as drawPath/drawRect/.. without a shader being uniform, while
+        // drawBitmap/drawSprite or a shader being non-uniform. However, current matchers don't
+        // give the type out easily, so just do not optimize that at the moment.
+        return false;
+    }
+
+    const uint32_t layerColor = layerPaint.getColor();
+    // The layer paint color must have only alpha component.
+    if (SK_ColorTRANSPARENT != SkColorSetA(layerColor, SK_AlphaTRANSPARENT)) {
+        return false;
+    }
+
+    // The layer paint can not have any effects.
+    if (layerPaint.getPathEffect() ||
+        layerPaint.getShader()      ||
+        layerPaint.getXfermode()    ||
+        layerPaint.getMaskFilter()  ||
+        layerPaint.getColorFilter() ||
+        layerPaint.getRasterizer()  ||
+        layerPaint.getLooper()      ||
+        layerPaint.getImageFilter()) {
+        return false;
+    }
+
+    paint->setAlpha(SkMulDiv255Round(paint->getAlpha(), SkColorGetA(layerColor)));
+
+    return true;
+}
+
 // Turns logical no-op Save-[non-drawing command]*-Restore patterns into actual no-ops.
 struct SaveNoDrawsRestoreNooper {
-    // Star matches greedily, so we also have to exclude Save and Restore.
-    typedef Pattern3<Is<Save>,
-                     Star<Not<Or3<Is<Save>,
+    // Greedy matches greedily, so we also have to exclude Save and Restore.
+    // Nested SaveLayers need to be excluded, or we'll match their Restore!
+    typedef Pattern<Is<Save>,
+                    Greedy<Not<Or<Is<Save>,
+                                  Is<SaveLayer>,
                                   Is<Restore>,
-                                  IsDraw> > >,
-                     Is<Restore> >
-        Pattern;
+                                  IsDraw>>>,
+                    Is<Restore>>
+        Match;
 
-    bool onMatch(SkRecord* record, Pattern* pattern, unsigned begin, unsigned end) {
+    bool onMatch(SkRecord* record, Match*, int begin, int end) {
         // The entire span between Save and Restore (inclusively) does nothing.
-        for (unsigned i = begin; i < end; i++) {
+        for (int i = begin; i < end; i++) {
             record->replace<NoOp>(i);
         }
         return true;
@@ -102,64 +174,35 @@ void SkRecordNoopSaveRestores(SkRecord* record) {
 // For some SaveLayer-[drawing command]-Restore patterns, merge the SaveLayer's alpha into the
 // draw, and no-op the SaveLayer and Restore.
 struct SaveLayerDrawRestoreNooper {
-    typedef Pattern3<Is<SaveLayer>, IsDraw, Is<Restore> > Pattern;
+    typedef Pattern<Is<SaveLayer>, IsDraw, Is<Restore>> Match;
 
-    bool onMatch(SkRecord* record, Pattern* pattern, unsigned begin, unsigned end) {
-        SaveLayer* saveLayer = pattern->first<SaveLayer>();
-        if (saveLayer->bounds != NULL) {
-            // SaveLayer with bounds is too tricky for us.
-            return false;
-        }
-
-        SkPaint* layerPaint = saveLayer->paint;
-        if (NULL == layerPaint) {
+    bool onMatch(SkRecord* record, Match* match, int begin, int end) {
+        // A SaveLayer's bounds field is just a hint, so we should be free to ignore it.
+        SkPaint* layerPaint = match->first<SaveLayer>()->paint;
+        if (nullptr == layerPaint) {
             // There wasn't really any point to this SaveLayer at all.
             return KillSaveLayerAndRestore(record, begin);
         }
 
-        SkPaint* drawPaint = pattern->second<SkPaint>();
-        if (drawPaint == NULL) {
+        SkPaint* drawPaint = match->second<SkPaint>();
+        if (drawPaint == nullptr) {
             // We can just give the draw the SaveLayer's paint.
             // TODO(mtklein): figure out how to do this clearly
             return false;
         }
 
-        const uint32_t layerColor = layerPaint->getColor();
-        const uint32_t  drawColor =  drawPaint->getColor();
-        if (!IsOnlyAlpha(layerColor)  || !IsOpaque(drawColor) ||
-            HasAnyEffect(*layerPaint) || HasAnyEffect(*drawPaint)) {
-            // Too fancy for us.  Actually, as long as layerColor is just an alpha
-            // we can blend it into drawColor's alpha; drawColor doesn't strictly have to be opaque.
+        if (!fold_opacity_layer_color_to_paint(*layerPaint, false /*isSaveLayer*/, drawPaint)) {
             return false;
         }
 
-        drawPaint->setColor(SkColorSetA(drawColor, SkColorGetA(layerColor)));
         return KillSaveLayerAndRestore(record, begin);
     }
 
-    static bool KillSaveLayerAndRestore(SkRecord* record, unsigned saveLayerIndex) {
+    static bool KillSaveLayerAndRestore(SkRecord* record, int saveLayerIndex) {
         record->replace<NoOp>(saveLayerIndex);    // SaveLayer
         record->replace<NoOp>(saveLayerIndex+2);  // Restore
         return true;
     }
-
-    static bool HasAnyEffect(const SkPaint& paint) {
-        return paint.getPathEffect()  ||
-               paint.getShader()      ||
-               paint.getXfermode()    ||
-               paint.getMaskFilter()  ||
-               paint.getColorFilter() ||
-               paint.getRasterizer()  ||
-               paint.getLooper()      ||
-               paint.getImageFilter();
-    }
-
-    static bool IsOpaque(SkColor color) {
-        return SkColorGetA(color) == SK_AlphaOPAQUE;
-    }
-    static bool IsOnlyAlpha(SkColor color) {
-        return SK_ColorTRANSPARENT == SkColorSetA(color, SK_AlphaTRANSPARENT);
-    }
 };
 void SkRecordNoopSaveLayerDrawRestores(SkRecord* record) {
     SaveLayerDrawRestoreNooper pass;
@@ -167,132 +210,76 @@ void SkRecordNoopSaveLayerDrawRestores(SkRecord* record) {
 }
 
 
-// Replaces DrawPosText with DrawPosTextH when all Y coordinates are equal.
-struct StrengthReducer {
-    typedef Pattern1<Is<DrawPosText> > Pattern;
+/* For SVG generated:
+  SaveLayer (non-opaque, typically for CSS opacity)
+    Save
+      ClipRect
+      SaveLayer (typically for SVG filter)
+      Restore
+    Restore
+  Restore
+*/
+struct SvgOpacityAndFilterLayerMergePass {
+    typedef Pattern<Is<SaveLayer>, Is<Save>, Is<ClipRect>, Is<SaveLayer>,
+                    Is<Restore>, Is<Restore>, Is<Restore>> Match;
 
-    bool onMatch(SkRecord* record, Pattern* pattern, unsigned begin, unsigned end) {
-        SkASSERT(end == begin + 1);
-        DrawPosText* draw = pattern->first<DrawPosText>();
-
-        const unsigned points = draw->paint.countText(draw->text, draw->byteLength);
-        if (points == 0) {
-            return false;  // No point (ha!).
+    bool onMatch(SkRecord* record, Match* match, int begin, int end) {
+        SkPaint* opacityPaint = match->first<SaveLayer>()->paint;
+        if (nullptr == opacityPaint) {
+            // There wasn't really any point to this SaveLayer at all.
+            return KillSaveLayerAndRestore(record, begin);
         }
 
-        const SkScalar firstY = draw->pos[0].fY;
-        for (unsigned i = 1; i < points; i++) {
-            if (draw->pos[i].fY != firstY) {
-                return false;  // Needs full power of DrawPosText.
-            }
-        }
-        // All ys are the same.  We can replace DrawPosText with DrawPosTextH.
-
-        // draw->pos is points SkPoints, [(x,y),(x,y),(x,y),(x,y), ... ].
-        // We're going to squint and look at that as 2*points SkScalars, [x,y,x,y,x,y,x,y, ...].
-        // Then we'll rearrange things so all the xs are in order up front, clobbering the ys.
-        SK_COMPILE_ASSERT(sizeof(SkPoint) == 2 * sizeof(SkScalar), SquintingIsNotSafe);
-        SkScalar* scalars = &draw->pos[0].fX;
-        for (unsigned i = 0; i < 2*points; i += 2) {
-            scalars[i/2] = scalars[i];
-        }
-
-        // Extend lifetime of draw to the end of the loop so we can copy its paint.
-        Adopted<DrawPosText> adopted(draw);
-        SkNEW_PLACEMENT_ARGS(record->replace<DrawPosTextH>(begin, adopted),
-                             DrawPosTextH,
-                             (draw->paint, draw->text, draw->byteLength, scalars, firstY));
-        return true;
-    }
-};
-void SkRecordReduceDrawPosTextStrength(SkRecord* record) {
-    StrengthReducer pass;
-    apply(&pass, record);
-}
-
-// Tries to replace DrawPosTextH with BoundedDrawPosTextH, which knows conservative upper and lower
-// bounds to use with SkCanvas::quickRejectY.
-struct TextBounder {
-    typedef Pattern1<Is<DrawPosTextH> > Pattern;
-
-    bool onMatch(SkRecord* record, Pattern* pattern, unsigned begin, unsigned end) {
-        SkASSERT(end == begin + 1);
-        DrawPosTextH* draw = pattern->first<DrawPosTextH>();
-
-        // If we're drawing vertical text, none of the checks we're about to do make any sense.
-        // We'll need to call SkPaint::computeFastBounds() later, so bail if that's not possible.
-        if (draw->paint.isVerticalText() || !draw->paint.canComputeFastBounds()) {
+        // This layer typically contains a filter, but this should work for layers with for other
+        // purposes too.
+        SkPaint* filterLayerPaint = match->fourth<SaveLayer>()->paint;
+        if (filterLayerPaint == nullptr) {
+            // We can just give the inner SaveLayer the paint of the outer SaveLayer.
+            // TODO(mtklein): figure out how to do this clearly
             return false;
         }
 
-        // Rather than checking the top and bottom font metrics, we guess.  Actually looking up the
-        // top and bottom metrics is slow, and this overapproximation should be good enough.
-        const SkScalar buffer = draw->paint.getTextSize() * 1.5f;
-        SkDEBUGCODE(SkPaint::FontMetrics metrics;)
-        SkDEBUGCODE(draw->paint.getFontMetrics(&metrics);)
-        SkASSERT(-buffer <= metrics.fTop);
-        SkASSERT(+buffer >= metrics.fBottom);
+        if (!fold_opacity_layer_color_to_paint(*opacityPaint, true /*isSaveLayer*/,
+                                               filterLayerPaint)) {
+            return false;
+        }
 
-        // Let the paint adjust the text bounds.  We don't care about left and right here, so we use
-        // 0 and 1 respectively just so the bounds rectangle isn't empty.
-        SkRect bounds;
-        bounds.set(0, draw->y - buffer, SK_Scalar1, draw->y + buffer);
-        SkRect adjusted = draw->paint.computeFastBounds(bounds, &bounds);
+        return KillSaveLayerAndRestore(record, begin);
+    }
 
-        Adopted<DrawPosTextH> adopted(draw);
-        SkNEW_PLACEMENT_ARGS(record->replace<BoundedDrawPosTextH>(begin, adopted),
-                             BoundedDrawPosTextH,
-                             (&adopted, adjusted.fTop, adjusted.fBottom));
+    static bool KillSaveLayerAndRestore(SkRecord* record, int saveLayerIndex) {
+        record->replace<NoOp>(saveLayerIndex);     // SaveLayer
+        record->replace<NoOp>(saveLayerIndex + 6); // Restore
         return true;
     }
 };
-void SkRecordBoundDrawPosTextH(SkRecord* record) {
-    TextBounder pass;
+
+void SkRecordMergeSvgOpacityAndFilterLayers(SkRecord* record) {
+    SvgOpacityAndFilterLayerMergePass pass;
     apply(&pass, record);
 }
 
-// Replaces PushCull with PairedPushCull, which lets us skip to the paired PopCull when the canvas
-// can quickReject the cull rect.
-// There's no efficient way (yet?) to express this one as a pattern, so we write a custom pass.
-class CullAnnotator {
-public:
-    // Do nothing to most ops.
-    template <typename T> void operator()(T*) {}
+///////////////////////////////////////////////////////////////////////////////////////////////////
 
-    void operator()(PushCull* push) {
-        Pair pair = { fIndex, push };
-        fPushStack.push(pair);
-    }
+void SkRecordOptimize(SkRecord* record) {
+    // This might be useful  as a first pass in the future if we want to weed
+    // out junk for other optimization passes.  Right now, nothing needs it,
+    // and the bounding box hierarchy will do the work of skipping no-op
+    // Save-NoDraw-Restore sequences better than we can here.
+    //SkRecordNoopSaveRestores(record);
 
-    void operator()(PopCull* pop) {
-        Pair push = fPushStack.top();
-        fPushStack.pop();
+    SkRecordNoopSaveLayerDrawRestores(record);
+    SkRecordMergeSvgOpacityAndFilterLayers(record);
 
-        SkASSERT(fIndex > push.index);
-        unsigned skip = fIndex - push.index;
-
-        Adopted<PushCull> adopted(push.command);
-        SkNEW_PLACEMENT_ARGS(fRecord->replace<PairedPushCull>(push.index, adopted),
-                             PairedPushCull, (&adopted, skip));
-    }
-
-    void apply(SkRecord* record) {
-        for (fRecord = record, fIndex = 0; fIndex < record->count(); fIndex++) {
-            fRecord->mutate<void>(fIndex, *this);
-        }
-    }
-
-private:
-    struct Pair {
-        unsigned index;
-        PushCull* command;
-    };
-
-    SkTDArray<Pair> fPushStack;
-    SkRecord* fRecord;
-    unsigned fIndex;
-};
-void SkRecordAnnotateCullingPairs(SkRecord* record) {
-    CullAnnotator pass;
-    pass.apply(record);
+    record->defrag();
 }
+
+void SkRecordOptimize2(SkRecord* record) {
+    multiple_set_matrices(record);
+    SkRecordNoopSaveRestores(record);
+    SkRecordNoopSaveLayerDrawRestores(record);
+    SkRecordMergeSvgOpacityAndFilterLayers(record);
+
+    record->defrag();
+}
+
diff --git a/gfx/skia/skia/src/core/SkRecordOpts.h b/gfx/skia/skia/src/core/SkRecordOpts.h
index b535ec958ad9..d6531b522686 100644
--- a/gfx/skia/skia/src/core/SkRecordOpts.h
+++ b/gfx/skia/skia/src/core/SkRecordOpts.h
@@ -13,9 +13,6 @@
 // Run all optimizations in recommended order.
 void SkRecordOptimize(SkRecord*);
 
-// NoOp away pointless PushCull/PopCull pairs with nothing between them.
-void SkRecordNoopCulls(SkRecord*);
-
 // Turns logical no-op Save-[non-drawing command]*-Restore patterns into actual no-ops.
 void SkRecordNoopSaveRestores(SkRecord*);
 
@@ -23,13 +20,11 @@ void SkRecordNoopSaveRestores(SkRecord*);
 // draw, and no-op the SaveLayer and Restore.
 void SkRecordNoopSaveLayerDrawRestores(SkRecord*);
 
-// Annotates PushCull commands with the relative offset of their paired PopCull.
-void SkRecordAnnotateCullingPairs(SkRecord*);
+// For SVG generated SaveLayer-Save-ClipRect-SaveLayer-3xRestore patterns, merge
+// the alpha of the first SaveLayer to the second SaveLayer.
+void SkRecordMergeSvgOpacityAndFilterLayers(SkRecord*);
 
-// Convert DrawPosText to DrawPosTextH when all the Y coordinates are equal.
-void SkRecordReduceDrawPosTextStrength(SkRecord*);
-
-// Calculate min and max Y bounds for DrawPosTextH commands, for use with SkCanvas::quickRejectY.
-void SkRecordBoundDrawPosTextH(SkRecord*);
+// Experimental optimizers
+void SkRecordOptimize2(SkRecord*);
 
 #endif//SkRecordOpts_DEFINED
diff --git a/gfx/skia/skia/src/core/SkRecordPattern.h b/gfx/skia/skia/src/core/SkRecordPattern.h
index 57779ffd761f..9493bbfaf73a 100644
--- a/gfx/skia/skia/src/core/SkRecordPattern.h
+++ b/gfx/skia/skia/src/core/SkRecordPattern.h
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #ifndef SkRecordPattern_DEFINED
 #define SkRecordPattern_DEFINED
 
@@ -12,7 +19,7 @@ namespace SkRecords {
 template <typename T>
 class Is {
 public:
-    Is() : fPtr(NULL) {}
+    Is() : fPtr(nullptr) {}
 
     typedef T type;
     type* get() { return fPtr; }
@@ -24,7 +31,7 @@ public:
 
     template <typename U>
     bool operator()(U*) {
-        fPtr = NULL;
+        fPtr = nullptr;
         return false;
     }
 
@@ -34,28 +41,27 @@ private:
 
 // Matches any command that draws, and stores its paint.
 class IsDraw {
-    SK_CREATE_MEMBER_DETECTOR(paint);
 public:
-    IsDraw() : fPaint(NULL) {}
+    IsDraw() : fPaint(nullptr) {}
 
     typedef SkPaint type;
     type* get() { return fPaint; }
 
     template <typename T>
-    SK_WHEN(HasMember_paint<T>, bool) operator()(T* draw) {
+    SK_WHEN(T::kTags & kDraw_Tag, bool) operator()(T* draw) {
         fPaint = AsPtr(draw->paint);
         return true;
     }
 
-    template <typename T>
-    SK_WHEN(!HasMember_paint<T>, bool) operator()(T*) {
-        fPaint = NULL;
-        return false;
+    bool operator()(DrawDrawable*) {
+        static_assert(DrawDrawable::kTags & kDraw_Tag, "");
+        fPaint = nullptr;
+        return true;
     }
 
-    // SaveLayer has an SkPaint named paint, but it's not a draw.
-    bool operator()(SaveLayer*) {
-        fPaint = NULL;
+    template <typename T>
+    SK_WHEN(!(T::kTags & kDraw_Tag), bool) operator()(T* draw) {
+        fPaint = nullptr;
         return false;
     }
 
@@ -74,45 +80,53 @@ struct Not {
     bool operator()(T* ptr) { return !Matcher()(ptr); }
 };
 
-// Matches if either of A or B does.  Stores nothing.
-template <typename A, typename B>
+// Matches if any of First or Rest... does.  Stores nothing.
+template <typename First, typename... Rest>
 struct Or {
     template <typename T>
-    bool operator()(T* ptr) { return A()(ptr) || B()(ptr); }
+    bool operator()(T* ptr) { return First()(ptr) || Or<Rest...>()(ptr); }
+};
+template <typename First>
+struct Or<First> {
+    template <typename T>
+    bool operator()(T* ptr) { return First()(ptr); }
 };
 
-// Matches if any of A, B or C does.  Stores nothing.
-template <typename A, typename B, typename C>
-struct Or3 : Or<A, Or<B, C> > {};
 
-// Star is a special matcher that greedily matches Matcher 0 or more times.  Stores nothing.
+// Greedy is a special matcher that greedily matches Matcher 0 or more times.  Stores nothing.
 template <typename Matcher>
-struct Star {
+struct Greedy {
     template <typename T>
     bool operator()(T* ptr) { return Matcher()(ptr); }
 };
 
-// Cons builds a list of Matchers.
-// It first matches Matcher (something from above), then Pattern (another Cons or Nil).
+// Pattern matches each of its matchers in order.
 //
 // This is the main entry point to pattern matching, and so provides a couple of extra API bits:
 //  - search scans through the record to look for matches;
-//  - first, second, and third return the data stored by their respective matchers in the pattern.
-//
-// These Cons build lists analogously to Lisp's "cons".  See Pattern# for the "list" equivalent.
-template <typename Matcher, typename Pattern>
-class Cons {
+//  - first, second, third, ... return the data stored by their respective matchers in the pattern.
+
+template <typename... Matchers> class Pattern;
+
+template <> class Pattern<> {
 public:
-    // If this pattern matches the SkRecord starting at i,
+    // Bottoms out recursion.  Just return whatever i the front decided on.
+    int match(SkRecord*, int i) { return i; }
+};
+
+template <typename First, typename... Rest>
+class Pattern<First, Rest...> {
+public:
+    // If this pattern matches the SkRecord starting from i,
     // return the index just past the end of the pattern, otherwise return 0.
-    SK_ALWAYS_INLINE unsigned match(SkRecord* record, unsigned i) {
-        i = this->matchHead(&fHead, record, i);
-        return i == 0 ? 0 : fTail.match(record, i);
+    SK_ALWAYS_INLINE int match(SkRecord* record, int i) {
+        i = this->matchFirst(&fFirst, record, i);
+        return i > 0 ? fRest.match(record, i) : 0;
     }
 
     // Starting from *end, walk through the SkRecord to find the first span matching this pattern.
     // If there is no such span, return false.  If there is, return true and set [*begin, *end).
-    SK_ALWAYS_INLINE bool search(SkRecord* record, unsigned* begin, unsigned* end) {
+    SK_ALWAYS_INLINE bool search(SkRecord* record, int* begin, int* end) {
         for (*begin = *end; *begin < record->count(); ++(*begin)) {
             *end = this->match(record, *begin);
             if (*end != 0) {
@@ -122,30 +136,29 @@ public:
         return false;
     }
 
-    // Once either match or search has succeeded, access the stored data of the first, second,
-    // or third matcher in this pattern.  Add as needed for longer patterns.
-    // T is checked statically at compile time; no casting is involved.  It's just an API wart.
-    template <typename T> T* first()  { return fHead.get(); }
-    template <typename T> T* second() { return fTail.fHead.get(); }
-    template <typename T> T* third()  { return fTail.fTail.fHead.get(); }
+    // TODO: some sort of smart get<i>()
+    template <typename T> T* first()  { return fFirst.get();   }
+    template <typename T> T* second() { return fRest.template first<T>();  }
+    template <typename T> T* third()  { return fRest.template second<T>(); }
+    template <typename T> T* fourth() { return fRest.template third<T>();  }
 
 private:
-    // If head isn't a Star, try to match at i once.
+    // If first isn't a Greedy, try to match at i once.
     template <typename T>
-    unsigned matchHead(T*, SkRecord* record, unsigned i) {
+    int matchFirst(T* first, SkRecord* record, int i) {
         if (i < record->count()) {
-            if (record->mutate<bool>(i, fHead)) {
+            if (record->mutate<bool>(i, *first)) {
                 return i+1;
             }
         }
         return 0;
     }
 
-    // If head is a Star, walk i until it doesn't match.
+    // If first is a Greedy, walk i until it doesn't match.
     template <typename T>
-    unsigned matchHead(Star<T>*, SkRecord* record, unsigned i) {
+    int matchFirst(Greedy<T>* first, SkRecord* record, int i) {
         while (i < record->count()) {
-            if (!record->mutate<bool>(i, fHead)) {
+            if (!record->mutate<bool>(i, *first)) {
                 return i;
             }
             i++;
@@ -153,31 +166,10 @@ private:
         return 0;
     }
 
-    Matcher fHead;
-    Pattern fTail;
-
-    // All Cons are friends with each other.  This lets first, second, and third work.
-    template <typename, typename> friend class Cons;
+    First            fFirst;
+    Pattern<Rest...> fRest;
 };
 
-// Nil is the end of every pattern Cons chain.
-struct Nil {
-    // Bottoms out recursion down the fTail chain.  Just return whatever i the front decided on.
-    unsigned match(SkRecord*, unsigned i) { return i; }
-};
-
-// These Pattern# types are syntax sugar over Cons and Nil, just to help eliminate some of the
-// template noise.  Use these if you can.  Feel free to add more for longer patterns.
-// All types A, B, C, ... are Matchers.
-template <typename A>
-struct Pattern1 : Cons<A, Nil> {};
-
-template <typename A, typename B>
-struct Pattern2 : Cons<A, Pattern1<B> > {};
-
-template <typename A, typename B, typename C>
-struct Pattern3 : Cons<A, Pattern2<B, C> > {};
-
 }  // namespace SkRecords
 
 #endif//SkRecordPattern_DEFINED
diff --git a/gfx/skia/skia/src/core/SkRecorder.cpp b/gfx/skia/skia/src/core/SkRecorder.cpp
index 4c02a35c9f53..d90b2c025ac0 100644
--- a/gfx/skia/skia/src/core/SkRecorder.cpp
+++ b/gfx/skia/skia/src/core/SkRecorder.cpp
@@ -5,65 +5,99 @@
  * found in the LICENSE file.
  */
 
-#include "SkRecorder.h"
+#include "SkBigPicture.h"
+#include "SkCanvasPriv.h"
+#include "SkPatchUtils.h"
 #include "SkPicture.h"
+#include "SkPictureUtils.h"
+#include "SkRecorder.h"
 
-// SkCanvas will fail in mysterious ways if it doesn't know the real width and height.
-SkRecorder::SkRecorder(SkRecord* record, int width, int height)
-    : SkCanvas(width, height), fRecord(record) {}
+//#define WRAP_BITMAP_AS_IMAGE
+
+SkDrawableList::~SkDrawableList() {
+    fArray.unrefAll();
+}
+
+SkBigPicture::SnapshotArray* SkDrawableList::newDrawableSnapshot() {
+    const int count = fArray.count();
+    if (0 == count) {
+        return nullptr;
+    }
+    SkAutoTMalloc<const SkPicture*> pics(count);
+    for (int i = 0; i < count; ++i) {
+        pics[i] = fArray[i]->newPictureSnapshot();
+    }
+    return new SkBigPicture::SnapshotArray(pics.detach(), count);
+}
+
+void SkDrawableList::append(SkDrawable* drawable) {
+    *fArray.append() = SkRef(drawable);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+SkRecorder::SkRecorder(SkRecord* record, int width, int height, SkMiniRecorder* mr)
+    : SkCanvas(SkIRect::MakeWH(width, height), SkCanvas::kConservativeRasterClip_InitFlag)
+    , fDrawPictureMode(Record_DrawPictureMode)
+    , fApproxBytesUsedBySubPictures(0)
+    , fRecord(record)
+    , fMiniRecorder(mr) {}
+
+SkRecorder::SkRecorder(SkRecord* record, const SkRect& bounds, SkMiniRecorder* mr)
+    : SkCanvas(bounds.roundOut(), SkCanvas::kConservativeRasterClip_InitFlag)
+    , fDrawPictureMode(Record_DrawPictureMode)
+    , fApproxBytesUsedBySubPictures(0)
+    , fRecord(record)
+    , fMiniRecorder(mr) {}
+
+void SkRecorder::reset(SkRecord* record, const SkRect& bounds,
+                       DrawPictureMode dpm, SkMiniRecorder* mr) {
+    this->forgetRecord();
+    fDrawPictureMode = dpm;
+    fRecord = record;
+    this->resetForNextPicture(bounds.roundOut());
+    fMiniRecorder = mr;
+}
 
 void SkRecorder::forgetRecord() {
-    fRecord = NULL;
+    fDrawableList.reset(nullptr);
+    fApproxBytesUsedBySubPictures = 0;
+    fRecord = nullptr;
 }
 
 // To make appending to fRecord a little less verbose.
-#define APPEND(T, ...) \
-        SkNEW_PLACEMENT_ARGS(fRecord->append<SkRecords::T>(), SkRecords::T, (__VA_ARGS__))
+#define APPEND(T, ...)             \
+    if (fMiniRecorder) {           \
+        this->flushMiniRecorder(); \
+    }                              \
+    new (fRecord->append<SkRecords::T>()) SkRecords::T{__VA_ARGS__}
+
+#define TRY_MINIRECORDER(method, ...)                       \
+    if (fMiniRecorder && fMiniRecorder->method(__VA_ARGS__)) { return; }
 
 // For methods which must call back into SkCanvas.
 #define INHERITED(method, ...) this->SkCanvas::method(__VA_ARGS__)
 
-// The structs we're creating all copy their constructor arguments.  Given the way the SkRecords
-// framework works, sometimes they happen to technically be copied twice, which is fine and elided
-// into a single copy unless the class has a non-trivial copy constructor.  For classes with
-// non-trivial copy constructors, we skip the first copy (and its destruction) by wrapping the value
-// with delay_copy(), forcing the argument to be passed by const&.
-//
-// This is used below for SkBitmap, SkPaint, SkPath, and SkRegion, which all have non-trivial copy
-// constructors and destructors.  You'll know you've got a good candidate T if you see ~T() show up
-// unexpectedly on a profile of record time.  Otherwise don't bother.
-template <typename T>
-class Reference {
-public:
-    Reference(const T& x) : fX(x) {}
-    operator const T&() const { return fX; }
-private:
-    const T& fX;
-};
-
-template <typename T>
-static Reference<T> delay_copy(const T& x) { return Reference<T>(x); }
-
 // Use copy() only for optional arguments, to be copied if present or skipped if not.
 // (For most types we just pass by value and let copy constructors do their thing.)
 template <typename T>
 T* SkRecorder::copy(const T* src) {
-    if (NULL == src) {
-        return NULL;
+    if (nullptr == src) {
+        return nullptr;
     }
-    return SkNEW_PLACEMENT_ARGS(fRecord->alloc<T>(), T, (*src));
+    return new (fRecord->alloc<T>()) T(*src);
 }
 
 // This copy() is for arrays.
 // It will work with POD or non-POD, though currently we only use it for POD.
 template <typename T>
-T* SkRecorder::copy(const T src[], unsigned count) {
-    if (NULL == src) {
-        return NULL;
+T* SkRecorder::copy(const T src[], size_t count) {
+    if (nullptr == src) {
+        return nullptr;
     }
     T* dst = fRecord->alloc<T>(count);
-    for (unsigned i = 0; i < count; i++) {
-        SkNEW_PLACEMENT_ARGS(dst + i, T, (src[i]));
+    for (size_t i = 0; i < count; i++) {
+        new (dst + i) T(src[i]);
     }
     return dst;
 }
@@ -72,94 +106,155 @@ T* SkRecorder::copy(const T src[], unsigned count) {
 // This measured around 2x faster for copying code points,
 // but I found no corresponding speedup for other arrays.
 template <>
-char* SkRecorder::copy(const char src[], unsigned count) {
-    if (NULL == src) {
-        return NULL;
+char* SkRecorder::copy(const char src[], size_t count) {
+    if (nullptr == src) {
+        return nullptr;
     }
     char* dst = fRecord->alloc<char>(count);
     memcpy(dst, src, count);
     return dst;
 }
 
-void SkRecorder::clear(SkColor color) {
-    APPEND(Clear, color);
+// As above, assuming and copying a terminating \0.
+template <>
+char* SkRecorder::copy(const char* src) {
+    return this->copy(src, strlen(src)+1);
 }
 
-void SkRecorder::drawPaint(const SkPaint& paint) {
-    APPEND(DrawPaint, delay_copy(paint));
+void SkRecorder::flushMiniRecorder() {
+    if (fMiniRecorder) {
+        SkMiniRecorder* mr = fMiniRecorder;
+        fMiniRecorder = nullptr;  // Needs to happen before flushAndReset() or we recurse forever.
+        mr->flushAndReset(this);
+    }
 }
 
-void SkRecorder::drawPoints(PointMode mode,
-                            size_t count,
-                            const SkPoint pts[],
-                            const SkPaint& paint) {
-    APPEND(DrawPoints, delay_copy(paint), mode, count, this->copy(pts, count));
+void SkRecorder::onDrawPaint(const SkPaint& paint) {
+    APPEND(DrawPaint, paint);
 }
 
-void SkRecorder::drawRect(const SkRect& rect, const SkPaint& paint) {
-    APPEND(DrawRect, delay_copy(paint), rect);
+void SkRecorder::onDrawPoints(PointMode mode,
+                              size_t count,
+                              const SkPoint pts[],
+                              const SkPaint& paint) {
+    APPEND(DrawPoints, paint, mode, SkToUInt(count), this->copy(pts, count));
 }
 
-void SkRecorder::drawOval(const SkRect& oval, const SkPaint& paint) {
-    APPEND(DrawOval, delay_copy(paint), oval);
+void SkRecorder::onDrawRect(const SkRect& rect, const SkPaint& paint) {
+    TRY_MINIRECORDER(drawRect, rect, paint);
+    APPEND(DrawRect, paint, rect);
 }
 
-void SkRecorder::drawRRect(const SkRRect& rrect, const SkPaint& paint) {
-    APPEND(DrawRRect, delay_copy(paint), rrect);
+void SkRecorder::onDrawOval(const SkRect& oval, const SkPaint& paint) {
+    APPEND(DrawOval, paint, oval);
+}
+
+void SkRecorder::onDrawRRect(const SkRRect& rrect, const SkPaint& paint) {
+    APPEND(DrawRRect, paint, rrect);
 }
 
 void SkRecorder::onDrawDRRect(const SkRRect& outer, const SkRRect& inner, const SkPaint& paint) {
-    APPEND(DrawDRRect, delay_copy(paint), outer, inner);
+    APPEND(DrawDRRect, paint, outer, inner);
 }
 
-void SkRecorder::drawPath(const SkPath& path, const SkPaint& paint) {
-    APPEND(DrawPath, delay_copy(paint), delay_copy(path));
+void SkRecorder::onDrawDrawable(SkDrawable* drawable, const SkMatrix* matrix) {
+    if (fDrawPictureMode == Record_DrawPictureMode) {
+        if (!fDrawableList) {
+            fDrawableList.reset(new SkDrawableList);
+        }
+        fDrawableList->append(drawable);
+        APPEND(DrawDrawable, this->copy(matrix), drawable->getBounds(), fDrawableList->count() - 1);
+    } else {
+        SkASSERT(fDrawPictureMode == Playback_DrawPictureMode);
+        drawable->draw(this, matrix);
+    }
 }
 
-void SkRecorder::drawBitmap(const SkBitmap& bitmap,
-                            SkScalar left,
-                            SkScalar top,
-                            const SkPaint* paint) {
-    APPEND(DrawBitmap, this->copy(paint), delay_copy(bitmap), left, top);
+void SkRecorder::onDrawPath(const SkPath& path, const SkPaint& paint) {
+    TRY_MINIRECORDER(drawPath, path, paint);
+    APPEND(DrawPath, paint, path);
 }
 
-void SkRecorder::drawBitmapRectToRect(const SkBitmap& bitmap,
-                                      const SkRect* src,
-                                      const SkRect& dst,
-                                      const SkPaint* paint,
-                                      DrawBitmapRectFlags flags) {
-    APPEND(DrawBitmapRectToRect,
-           this->copy(paint), delay_copy(bitmap), this->copy(src), dst, flags);
+void SkRecorder::onDrawBitmap(const SkBitmap& bitmap,
+                              SkScalar left,
+                              SkScalar top,
+                              const SkPaint* paint) {
+#ifdef WRAP_BITMAP_AS_IMAGE
+    SkAutoTUnref<SkImage> image(SkImage::NewFromBitmap(bitmap));
+    if (image) {
+        this->onDrawImage(image, left, top, paint);
+    }
+#else
+    APPEND(DrawBitmap, this->copy(paint), bitmap, left, top);
+#endif
 }
 
-void SkRecorder::drawBitmapMatrix(const SkBitmap& bitmap,
-                                  const SkMatrix& matrix,
+void SkRecorder::onDrawBitmapRect(const SkBitmap& bitmap,
+                                  const SkRect* src,
+                                  const SkRect& dst,
+                                  const SkPaint* paint,
+                                  SrcRectConstraint constraint) {
+#ifdef WRAP_BITMAP_AS_IMAGE
+    // TODO: need a way to support the flags for images...
+    SkAutoTUnref<SkImage> image(SkImage::NewFromBitmap(bitmap));
+    if (image) {
+        this->onDrawImageRect(image, src, dst, paint);
+    }
+#else
+    TRY_MINIRECORDER(drawBitmapRect, bitmap, src, dst, paint, constraint);
+    if (kFast_SrcRectConstraint == constraint) {
+        APPEND(DrawBitmapRectFast, this->copy(paint), bitmap, this->copy(src), dst);
+        return;
+    }
+    SkASSERT(kStrict_SrcRectConstraint == constraint);
+    APPEND(DrawBitmapRect, this->copy(paint), bitmap, this->copy(src), dst);
+#endif
+}
+
+void SkRecorder::onDrawBitmapNine(const SkBitmap& bitmap,
+                                  const SkIRect& center,
+                                  const SkRect& dst,
                                   const SkPaint* paint) {
-    APPEND(DrawBitmapMatrix, this->copy(paint), delay_copy(bitmap), matrix);
+#ifdef WRAP_BITMAP_AS_IMAGE
+    SkAutoTUnref<SkImage> image(SkImage::NewFromBitmap(bitmap));
+    if (image) {
+        this->onDrawImageNine(image, center, dst, paint);
+    }
+#else
+    APPEND(DrawBitmapNine, this->copy(paint), bitmap, center, dst);
+#endif
 }
 
-void SkRecorder::drawBitmapNine(const SkBitmap& bitmap,
-                                const SkIRect& center,
-                                const SkRect& dst,
-                                const SkPaint* paint) {
-    APPEND(DrawBitmapNine, this->copy(paint), delay_copy(bitmap), center, dst);
+void SkRecorder::onDrawImage(const SkImage* image, SkScalar left, SkScalar top,
+                             const SkPaint* paint) {
+    APPEND(DrawImage, this->copy(paint), image, left, top);
 }
 
-void SkRecorder::drawSprite(const SkBitmap& bitmap, int left, int top, const SkPaint* paint) {
-    APPEND(DrawSprite, this->copy(paint), delay_copy(bitmap), left, top);
+void SkRecorder::onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
+                                 const SkPaint* paint, SrcRectConstraint constraint) {
+    APPEND(DrawImageRect, this->copy(paint), image, this->copy(src), dst, constraint);
+}
+
+void SkRecorder::onDrawImageNine(const SkImage* image, const SkIRect& center,
+                                 const SkRect& dst, const SkPaint* paint) {
+    APPEND(DrawImageNine, this->copy(paint), image, center, dst);
+}
+
+void SkRecorder::onDrawSprite(const SkBitmap& bitmap, int left, int top, const SkPaint* paint) {
+    APPEND(DrawSprite, this->copy(paint), bitmap, left, top);
 }
 
 void SkRecorder::onDrawText(const void* text, size_t byteLength,
                             SkScalar x, SkScalar y, const SkPaint& paint) {
     APPEND(DrawText,
-           delay_copy(paint), this->copy((const char*)text, byteLength), byteLength, x, y);
+           paint, this->copy((const char*)text, byteLength), byteLength, x, y);
 }
 
 void SkRecorder::onDrawPosText(const void* text, size_t byteLength,
                                const SkPoint pos[], const SkPaint& paint) {
-    const unsigned points = paint.countText(text, byteLength);
+    const int points = paint.countText(text, byteLength);
     APPEND(DrawPosText,
-           delay_copy(paint),
+           paint,
            this->copy((const char*)text, byteLength),
            byteLength,
            this->copy(pos, points));
@@ -167,97 +262,123 @@ void SkRecorder::onDrawPosText(const void* text, size_t byteLength,
 
 void SkRecorder::onDrawPosTextH(const void* text, size_t byteLength,
                                 const SkScalar xpos[], SkScalar constY, const SkPaint& paint) {
-    const unsigned points = paint.countText(text, byteLength);
+    const int points = paint.countText(text, byteLength);
     APPEND(DrawPosTextH,
-           delay_copy(paint),
+           paint,
            this->copy((const char*)text, byteLength),
-           byteLength,
-           this->copy(xpos, points),
-           constY);
+           SkToUInt(byteLength),
+           constY,
+           this->copy(xpos, points));
 }
 
 void SkRecorder::onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
                                   const SkMatrix* matrix, const SkPaint& paint) {
     APPEND(DrawTextOnPath,
-           delay_copy(paint),
+           paint,
            this->copy((const char*)text, byteLength),
            byteLength,
-           delay_copy(path),
-           this->copy(matrix));
+           path,
+           matrix ? *matrix : SkMatrix::I());
 }
 
-void SkRecorder::onDrawPicture(const SkPicture* picture) {
-    picture->draw(this);
+void SkRecorder::onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
+                                const SkPaint& paint) {
+    TRY_MINIRECORDER(drawTextBlob, blob, x, y, paint);
+    APPEND(DrawTextBlob, paint, blob, x, y);
 }
 
-void SkRecorder::drawVertices(VertexMode vmode,
-                              int vertexCount, const SkPoint vertices[],
-                              const SkPoint texs[], const SkColor colors[],
-                              SkXfermode* xmode,
-                              const uint16_t indices[], int indexCount, const SkPaint& paint) {
-    APPEND(DrawVertices, delay_copy(paint),
+void SkRecorder::onDrawPicture(const SkPicture* pic, const SkMatrix* matrix, const SkPaint* paint) {
+    if (fDrawPictureMode == Record_DrawPictureMode) {
+        fApproxBytesUsedBySubPictures += SkPictureUtils::ApproximateBytesUsed(pic);
+        APPEND(DrawPicture, this->copy(paint), pic, matrix ? *matrix : SkMatrix::I());
+    } else {
+        SkASSERT(fDrawPictureMode == Playback_DrawPictureMode);
+        SkAutoCanvasMatrixPaint acmp(this, matrix, paint, pic->cullRect());
+        pic->playback(this);
+    }
+}
+
+void SkRecorder::onDrawVertices(VertexMode vmode,
+                                int vertexCount, const SkPoint vertices[],
+                                const SkPoint texs[], const SkColor colors[],
+                                SkXfermode* xmode,
+                                const uint16_t indices[], int indexCount, const SkPaint& paint) {
+    APPEND(DrawVertices, paint,
                          vmode,
                          vertexCount,
                          this->copy(vertices, vertexCount),
-                         texs ? this->copy(texs, vertexCount) : NULL,
-                         colors ? this->copy(colors, vertexCount) : NULL,
+                         texs ? this->copy(texs, vertexCount) : nullptr,
+                         colors ? this->copy(colors, vertexCount) : nullptr,
                          xmode,
                          this->copy(indices, indexCount),
                          indexCount);
 }
 
+void SkRecorder::onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
+                             const SkPoint texCoords[4], SkXfermode* xmode, const SkPaint& paint) {
+    APPEND(DrawPatch, paint,
+           cubics ? this->copy(cubics, SkPatchUtils::kNumCtrlPts) : nullptr,
+           colors ? this->copy(colors, SkPatchUtils::kNumCorners) : nullptr,
+           texCoords ? this->copy(texCoords, SkPatchUtils::kNumCorners) : nullptr,
+           xmode);
+}
+
+void SkRecorder::onDrawAtlas(const SkImage* atlas, const SkRSXform xform[], const SkRect tex[],
+                             const SkColor colors[], int count, SkXfermode::Mode mode,
+                             const SkRect* cull, const SkPaint* paint) {
+    APPEND(DrawAtlas, this->copy(paint),
+           atlas,
+           this->copy(xform, count),
+           this->copy(tex, count),
+           this->copy(colors, count),
+           count,
+           mode,
+           this->copy(cull));
+}
+
 void SkRecorder::willSave() {
     APPEND(Save);
-    INHERITED(willSave);
 }
 
 SkCanvas::SaveLayerStrategy SkRecorder::willSaveLayer(const SkRect* bounds,
                                                       const SkPaint* paint,
                                                       SkCanvas::SaveFlags flags) {
     APPEND(SaveLayer, this->copy(bounds), this->copy(paint), flags);
-    INHERITED(willSaveLayer, bounds, paint, flags);
     return SkCanvas::kNoLayer_SaveLayerStrategy;
 }
 
-void SkRecorder::willRestore() {
-    APPEND(Restore);
-    INHERITED(willRestore);
-}
-
-void SkRecorder::onPushCull(const SkRect& rect) {
-    APPEND(PushCull, rect);
-}
-
-void SkRecorder::onPopCull() {
-    APPEND(PopCull);
+void SkRecorder::didRestore() {
+    APPEND(Restore, this->devBounds(), this->getTotalMatrix());
 }
 
 void SkRecorder::didConcat(const SkMatrix& matrix) {
     APPEND(Concat, matrix);
-    INHERITED(didConcat, matrix);
 }
 
 void SkRecorder::didSetMatrix(const SkMatrix& matrix) {
     APPEND(SetMatrix, matrix);
-    INHERITED(didSetMatrix, matrix);
 }
 
 void SkRecorder::onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
-    APPEND(ClipRect, rect, op, edgeStyle == kSoft_ClipEdgeStyle);
     INHERITED(onClipRect, rect, op, edgeStyle);
+    SkRecords::RegionOpAndAA opAA(op, kSoft_ClipEdgeStyle == edgeStyle);
+    APPEND(ClipRect, this->devBounds(), rect, opAA);
 }
 
 void SkRecorder::onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
-    APPEND(ClipRRect, rrect, op, edgeStyle == kSoft_ClipEdgeStyle);
-    INHERITED(updateClipConservativelyUsingBounds, rrect.getBounds(), op, false);
+    INHERITED(onClipRRect, rrect, op, edgeStyle);
+    SkRecords::RegionOpAndAA opAA(op, kSoft_ClipEdgeStyle == edgeStyle);
+    APPEND(ClipRRect, this->devBounds(), rrect, opAA);
 }
 
 void SkRecorder::onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
-    APPEND(ClipPath, delay_copy(path), op, edgeStyle == kSoft_ClipEdgeStyle);
-    INHERITED(updateClipConservativelyUsingBounds, path.getBounds(), op, path.isInverseFillType());
+    INHERITED(onClipPath, path, op, edgeStyle);
+    SkRecords::RegionOpAndAA opAA(op, kSoft_ClipEdgeStyle == edgeStyle);
+    APPEND(ClipPath, this->devBounds(), path, opAA);
 }
 
 void SkRecorder::onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) {
-    APPEND(ClipRegion, delay_copy(deviceRgn), op);
     INHERITED(onClipRegion, deviceRgn, op);
+    APPEND(ClipRegion, this->devBounds(), deviceRgn, op);
 }
+
diff --git a/gfx/skia/skia/src/core/SkRecorder.h b/gfx/skia/skia/src/core/SkRecorder.h
index 0eb11d7af859..92197a0a3c61 100644
--- a/gfx/skia/skia/src/core/SkRecorder.h
+++ b/gfx/skia/skia/src/core/SkRecorder.h
@@ -8,105 +8,143 @@
 #ifndef SkRecorder_DEFINED
 #define SkRecorder_DEFINED
 
+#include "SkBigPicture.h"
 #include "SkCanvas.h"
+#include "SkMiniRecorder.h"
 #include "SkRecord.h"
 #include "SkRecords.h"
+#include "SkTDArray.h"
+
+class SkBBHFactory;
+
+class SkDrawableList : SkNoncopyable {
+public:
+    SkDrawableList() {}
+    ~SkDrawableList();
+
+    int count() const { return fArray.count(); }
+    SkDrawable* const* begin() const { return fArray.begin(); }
+
+    void append(SkDrawable* drawable);
+
+    // Return a new or ref'd array of pictures that were snapped from our drawables.
+    SkBigPicture::SnapshotArray* newDrawableSnapshot();
+
+private:
+    SkTDArray<SkDrawable*> fArray;
+};
 
 // SkRecorder provides an SkCanvas interface for recording into an SkRecord.
 
 class SkRecorder : public SkCanvas {
 public:
     // Does not take ownership of the SkRecord.
-    SkRecorder(SkRecord*, int width, int height);
+    SkRecorder(SkRecord*, int width, int height, SkMiniRecorder* = nullptr);   // legacy version
+    SkRecorder(SkRecord*, const SkRect& bounds, SkMiniRecorder* = nullptr);
+
+    enum DrawPictureMode { Record_DrawPictureMode, Playback_DrawPictureMode };
+    void reset(SkRecord*, const SkRect& bounds, DrawPictureMode, SkMiniRecorder* = nullptr);
+
+    size_t approxBytesUsedBySubPictures() const { return fApproxBytesUsedBySubPictures; }
+
+    SkDrawableList* getDrawableList() const { return fDrawableList.get(); }
+    SkDrawableList* detachDrawableList() { return fDrawableList.detach(); }
 
     // Make SkRecorder forget entirely about its SkRecord*; all calls to SkRecorder will fail.
     void forgetRecord();
 
-    void clear(SkColor) SK_OVERRIDE;
-    void drawPaint(const SkPaint& paint) SK_OVERRIDE;
-    void drawPoints(PointMode mode,
-                    size_t count,
-                    const SkPoint pts[],
-                    const SkPaint& paint) SK_OVERRIDE;
-    void drawRect(const SkRect& rect, const SkPaint& paint) SK_OVERRIDE;
-    void drawOval(const SkRect& oval, const SkPaint&) SK_OVERRIDE;
-    void drawRRect(const SkRRect& rrect, const SkPaint& paint) SK_OVERRIDE;
-    void drawPath(const SkPath& path, const SkPaint& paint) SK_OVERRIDE;
-    void drawBitmap(const SkBitmap& bitmap,
-                    SkScalar left,
-                    SkScalar top,
-                    const SkPaint* paint = NULL) SK_OVERRIDE;
-    void drawBitmapRectToRect(const SkBitmap& bitmap,
-                              const SkRect* src,
-                              const SkRect& dst,
-                              const SkPaint* paint = NULL,
-                              DrawBitmapRectFlags flags = kNone_DrawBitmapRectFlag) SK_OVERRIDE;
-    void drawBitmapMatrix(const SkBitmap& bitmap,
-                          const SkMatrix& m,
-                          const SkPaint* paint = NULL) SK_OVERRIDE;
-    void drawBitmapNine(const SkBitmap& bitmap,
-                        const SkIRect& center,
-                        const SkRect& dst,
-                        const SkPaint* paint = NULL) SK_OVERRIDE;
-    void drawSprite(const SkBitmap& bitmap,
-                    int left,
-                    int top,
-                    const SkPaint* paint = NULL) SK_OVERRIDE;
-    void drawVertices(VertexMode vmode,
-                      int vertexCount,
-                      const SkPoint vertices[],
-                      const SkPoint texs[],
-                      const SkColor colors[],
-                      SkXfermode* xmode,
-                      const uint16_t indices[],
-                      int indexCount,
-                      const SkPaint& paint) SK_OVERRIDE;
+    void willSave() override;
+    SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SkCanvas::SaveFlags) override;
+    void willRestore() override {}
+    void didRestore() override;
 
-    void willSave() SK_OVERRIDE;
-    SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SkCanvas::SaveFlags) SK_OVERRIDE;
-    void willRestore() SK_OVERRIDE;
+    void didConcat(const SkMatrix&) override;
+    void didSetMatrix(const SkMatrix&) override;
 
-    void didConcat(const SkMatrix&) SK_OVERRIDE;
-    void didSetMatrix(const SkMatrix&) SK_OVERRIDE;
-
-    void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE;
+    void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override;
+    void onDrawDrawable(SkDrawable*, const SkMatrix*) override;
     void onDrawText(const void* text,
                     size_t byteLength,
                     SkScalar x,
                     SkScalar y,
-                    const SkPaint& paint) SK_OVERRIDE;
+                    const SkPaint& paint) override;
     void onDrawPosText(const void* text,
                        size_t byteLength,
                        const SkPoint pos[],
-                       const SkPaint& paint) SK_OVERRIDE;
+                       const SkPaint& paint) override;
     void onDrawPosTextH(const void* text,
                         size_t byteLength,
                         const SkScalar xpos[],
                         SkScalar constY,
-                        const SkPaint& paint) SK_OVERRIDE;
+                        const SkPaint& paint) override;
     void onDrawTextOnPath(const void* text,
                           size_t byteLength,
                           const SkPath& path,
                           const SkMatrix* matrix,
-                          const SkPaint& paint) SK_OVERRIDE;
-    void onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle edgeStyle) SK_OVERRIDE;
-    void onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle edgeStyle) SK_OVERRIDE;
-    void onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edgeStyle) SK_OVERRIDE;
-    void onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) SK_OVERRIDE;
+                          const SkPaint& paint) override;
+    void onDrawTextBlob(const SkTextBlob* blob,
+                        SkScalar x,
+                        SkScalar y,
+                        const SkPaint& paint) override;
+    void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
+                     const SkPoint texCoords[4], SkXfermode* xmode,
+                     const SkPaint& paint) override;
 
-    void onDrawPicture(const SkPicture* picture) SK_OVERRIDE;
+    void onDrawPaint(const SkPaint&) override;
+    void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override;
+    void onDrawRect(const SkRect&, const SkPaint&) override;
+    void onDrawOval(const SkRect&, const SkPaint&) override;
+    void onDrawRRect(const SkRRect&, const SkPaint&) override;
+    void onDrawPath(const SkPath&, const SkPaint&) override;
+    void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) override;
+    void onDrawBitmapRect(const SkBitmap&, const SkRect* src, const SkRect& dst, const SkPaint*,
+                          SrcRectConstraint) override;
+    void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) override;
+    void onDrawImageRect(const SkImage*, const SkRect* src, const SkRect& dst,
+                         const SkPaint*, SrcRectConstraint) override;
+    void onDrawImageNine(const SkImage*, const SkIRect& center, const SkRect& dst,
+                         const SkPaint*) override;
+    void onDrawBitmapNine(const SkBitmap&, const SkIRect& center, const SkRect& dst,
+                          const SkPaint*) override;
+    void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) override;
+    void onDrawVertices(VertexMode vmode, int vertexCount,
+                        const SkPoint vertices[], const SkPoint texs[],
+                        const SkColor colors[], SkXfermode* xmode,
+                        const uint16_t indices[], int indexCount,
+                        const SkPaint&) override;
+    void onDrawAtlas(const SkImage*, const SkRSXform[], const SkRect[], const SkColor[],
+                     int count, SkXfermode::Mode, const SkRect* cull, const SkPaint*) override;
 
-    void onPushCull(const SkRect& cullRect) SK_OVERRIDE;
-    void onPopCull() SK_OVERRIDE;
+    void onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle edgeStyle) override;
+    void onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle edgeStyle) override;
+    void onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edgeStyle) override;
+    void onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) override;
+
+    void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
+
+    SkSurface* onNewSurface(const SkImageInfo&, const SkSurfaceProps&) override { return nullptr; }
+
+    void flushMiniRecorder();
 
 private:
     template <typename T>
     T* copy(const T*);
 
     template <typename T>
-    T* copy(const T[], unsigned count);
+    T* copy(const T[], size_t count);
 
+    SkIRect devBounds() const {
+        SkIRect devBounds;
+        this->getClipDeviceBounds(&devBounds);
+        return devBounds;
+    }
+
+    DrawPictureMode fDrawPictureMode;
+    size_t fApproxBytesUsedBySubPictures;
     SkRecord* fRecord;
+    SkAutoTDelete<SkDrawableList> fDrawableList;
+
+    SkMiniRecorder* fMiniRecorder;
 };
 
 #endif//SkRecorder_DEFINED
diff --git a/gfx/skia/skia/src/core/SkRecording.cpp b/gfx/skia/skia/src/core/SkRecording.cpp
deleted file mode 100644
index 94fabce91218..000000000000
--- a/gfx/skia/skia/src/core/SkRecording.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "../../include/record/SkRecording.h"
-
-#include "SkRecord.h"
-#include "SkRecordOpts.h"
-#include "SkRecordDraw.h"
-#include "SkRecorder.h"
-
-namespace EXPERIMENTAL {
-
-SkPlayback::SkPlayback(const SkRecord* record) : fRecord(record) {}
-
-SkPlayback::~SkPlayback() {}
-
-void SkPlayback::draw(SkCanvas* canvas) const {
-    SkASSERT(fRecord.get() != NULL);
-    SkRecordDraw(*fRecord, canvas);
-}
-
-SkRecording::SkRecording(int width, int height)
-    : fRecord(SkNEW(SkRecord))
-    , fRecorder(SkNEW_ARGS(SkRecorder, (fRecord.get(), width, height)))
-    {}
-
-SkPlayback* SkRecording::releasePlayback() {
-    SkASSERT(fRecorder->unique());
-    fRecorder->forgetRecord();
-    SkRecordOptimize(fRecord.get());
-    return SkNEW_ARGS(SkPlayback, (fRecord.detach()));
-}
-
-SkRecording::~SkRecording() {}
-
-SkCanvas* SkRecording::canvas() {
-    return fRecord.get() ? fRecorder.get() : NULL;
-}
-
-}  // namespace EXPERIMENTAL
diff --git a/gfx/skia/skia/src/core/SkRecords.cpp b/gfx/skia/skia/src/core/SkRecords.cpp
new file mode 100644
index 000000000000..d0a3ddbe10c9
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkRecords.cpp
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkPathPriv.h"
+#include "SkRecords.h"
+
+namespace SkRecords {
+    ImmutableBitmap::ImmutableBitmap(const SkBitmap& bitmap) {
+        if (bitmap.isImmutable()) {
+            fBitmap = bitmap;
+        } else {
+            bitmap.copyTo(&fBitmap);
+        }
+        fBitmap.setImmutable();
+    }
+
+    PreCachedPath::PreCachedPath(const SkPath& path) : SkPath(path) {
+        this->updateBoundsCache();
+#if 0  // Disabled to see if we ever really race on this.  It costs time, chromium:496982.
+        SkPathPriv::FirstDirection junk;
+        (void)SkPathPriv::CheapComputeFirstDirection(*this, &junk);
+#endif
+    }
+
+    TypedMatrix::TypedMatrix(const SkMatrix& matrix) : SkMatrix(matrix) {
+        (void)this->getType();
+    }
+}
diff --git a/gfx/skia/skia/src/core/SkRecords.h b/gfx/skia/skia/src/core/SkRecords.h
deleted file mode 100644
index 02cfc64032ca..000000000000
--- a/gfx/skia/skia/src/core/SkRecords.h
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkRecords_DEFINED
-#define SkRecords_DEFINED
-
-#include "SkCanvas.h"
-
-namespace SkRecords {
-
-// A list of all the types of canvas calls we can record.
-// Each of these is reified into a struct below.
-//
-// (We're using the macro-of-macro trick here to do several different things with the same list.)
-//
-// We leave this SK_RECORD_TYPES macro defined for use by code that wants to operate on SkRecords
-// types polymorphically.  (See SkRecord::Record::{visit,mutate} for an example.)
-//
-// Order doesn't technically matter here, but the compiler can generally generate better code if
-// you keep them semantically grouped, especially the Draws.  It's also nice to leave NoOp at 0.
-#define SK_RECORD_TYPES(M)                                          \
-    M(NoOp)                                                         \
-    M(Restore)                                                      \
-    M(Save)                                                         \
-    M(SaveLayer)                                                    \
-    M(PushCull)                                                     \
-    M(PopCull)                                                      \
-    M(PairedPushCull)         /*From SkRecordAnnotateCullingPairs*/ \
-    M(Concat)                                                       \
-    M(SetMatrix)                                                    \
-    M(ClipPath)                                                     \
-    M(ClipRRect)                                                    \
-    M(ClipRect)                                                     \
-    M(ClipRegion)                                                   \
-    M(Clear)                                                        \
-    M(DrawBitmap)                                                   \
-    M(DrawBitmapMatrix)                                             \
-    M(DrawBitmapNine)                                               \
-    M(DrawBitmapRectToRect)                                         \
-    M(DrawDRRect)                                                   \
-    M(DrawOval)                                                     \
-    M(DrawPaint)                                                    \
-    M(DrawPath)                                                     \
-    M(DrawPoints)                                                   \
-    M(DrawPosText)                                                  \
-    M(DrawPosTextH)                                                 \
-    M(DrawRRect)                                                    \
-    M(DrawRect)                                                     \
-    M(DrawSprite)                                                   \
-    M(DrawText)                                                     \
-    M(DrawTextOnPath)                                               \
-    M(DrawVertices)                                                 \
-    M(BoundedDrawPosTextH)    /*From SkRecordBoundDrawPosTextH*/
-
-// Defines SkRecords::Type, an enum of all record types.
-#define ENUM(T) T##_Type,
-enum Type { SK_RECORD_TYPES(ENUM) };
-#undef ENUM
-
-// Macros to make it easier to define a record for a draw call with 0 args, 1 args, 2 args, etc.
-// These should be clearer when you look at their use below.
-#define RECORD0(T)                      \
-struct T {                              \
-    static const Type kType = T##_Type; \
-};
-
-// We try to be flexible about the types the constructors take.  Instead of requring the exact type
-// A here, we take any type Z which implicitly casts to A.  This allows the delay_copy() trick to
-// work, allowing the caller to decide whether to pass by value or by const&.
-
-#define RECORD1(T, A, a)                \
-struct T {                              \
-    static const Type kType = T##_Type; \
-    template <typename Z>               \
-    T(Z a) : a(a) {}                    \
-    A a;                                \
-};
-
-#define RECORD2(T, A, a, B, b)          \
-struct T {                              \
-    static const Type kType = T##_Type; \
-    template <typename Z, typename Y>   \
-    T(Z a, Y b) : a(a), b(b) {}         \
-    A a; B b;                           \
-};
-
-#define RECORD3(T, A, a, B, b, C, c)              \
-struct T {                                        \
-    static const Type kType = T##_Type;           \
-    template <typename Z, typename Y, typename X> \
-    T(Z a, Y b, X c) : a(a), b(b), c(c) {}        \
-    A a; B b; C c;                                \
-};
-
-#define RECORD4(T, A, a, B, b, C, c, D, d)                    \
-struct T {                                                    \
-    static const Type kType = T##_Type;                       \
-    template <typename Z, typename Y, typename X, typename W> \
-    T(Z a, Y b, X c, W d) : a(a), b(b), c(c), d(d) {}         \
-    A a; B b; C c; D d;                                       \
-};
-
-#define RECORD5(T, A, a, B, b, C, c, D, d, E, e)                          \
-struct T {                                                                \
-    static const Type kType = T##_Type;                                   \
-    template <typename Z, typename Y, typename X, typename W, typename V> \
-    T(Z a, Y b, X c, W d, V e) : a(a), b(b), c(c), d(d), e(e) {}          \
-    A a; B b; C c; D d; E e;                                              \
-};
-
-#define ACT_AS_PTR(ptr)                       \
-    operator T*() { return ptr; }             \
-    operator const T*() const { return ptr; } \
-    T* operator->() { return ptr; }           \
-    const T* operator->() const { return ptr; }
-
-// An Optional doesn't own the pointer's memory, but may need to destroy non-POD data.
-template <typename T>
-class Optional : SkNoncopyable {
-public:
-    Optional(T* ptr) : fPtr(ptr) {}
-    ~Optional() { if (fPtr) fPtr->~T(); }
-
-    ACT_AS_PTR(fPtr);
-private:
-    T* fPtr;
-};
-
-// Like Optional, but ptr must not be NULL.
-template <typename T>
-class Adopted : SkNoncopyable {
-public:
-    Adopted(T* ptr) : fPtr(ptr) { SkASSERT(fPtr); }
-    Adopted(Adopted* source) {
-        // Transfer ownership from source to this.
-        fPtr = source->fPtr;
-        source->fPtr = NULL;
-    }
-    ~Adopted() { if (fPtr) fPtr->~T(); }
-
-    ACT_AS_PTR(fPtr);
-private:
-    T* fPtr;
-};
-
-// PODArray doesn't own the pointer's memory, and we assume the data is POD.
-template <typename T>
-class PODArray {
-public:
-    PODArray(T* ptr) : fPtr(ptr) {}
-    // Default copy and assign.
-
-    ACT_AS_PTR(fPtr);
-private:
-    T* fPtr;
-};
-
-#undef ACT_AS_PTR
-
-// Like SkBitmap, but deep copies pixels if they're not immutable.
-// Using this, we guarantee the immutability of all bitmaps we record.
-class ImmutableBitmap {
-public:
-    explicit ImmutableBitmap(const SkBitmap& bitmap) {
-        if (bitmap.isImmutable()) {
-            fBitmap = bitmap;
-        } else {
-            bitmap.copyTo(&fBitmap);
-        }
-        fBitmap.setImmutable();
-    }
-
-    operator const SkBitmap& () const { return fBitmap; }
-
-private:
-    SkBitmap fBitmap;
-};
-
-RECORD0(NoOp);
-
-RECORD0(Restore);
-RECORD0(Save);
-RECORD3(SaveLayer, Optional<SkRect>, bounds, Optional<SkPaint>, paint, SkCanvas::SaveFlags, flags);
-
-RECORD1(PushCull, SkRect, rect);
-RECORD0(PopCull);
-
-RECORD1(Concat, SkMatrix, matrix);
-RECORD1(SetMatrix, SkMatrix, matrix);
-
-RECORD3(ClipPath, SkPath, path, SkRegion::Op, op, bool, doAA);
-RECORD3(ClipRRect, SkRRect, rrect, SkRegion::Op, op, bool, doAA);
-RECORD3(ClipRect, SkRect, rect, SkRegion::Op, op, bool, doAA);
-RECORD2(ClipRegion, SkRegion, region, SkRegion::Op, op);
-
-RECORD1(Clear, SkColor, color);
-// While not strictly required, if you have an SkPaint, it's fastest to put it first.
-RECORD4(DrawBitmap, Optional<SkPaint>, paint,
-                    ImmutableBitmap, bitmap,
-                    SkScalar, left,
-                    SkScalar, top);
-RECORD3(DrawBitmapMatrix, Optional<SkPaint>, paint, ImmutableBitmap, bitmap, SkMatrix, matrix);
-RECORD4(DrawBitmapNine, Optional<SkPaint>, paint,
-                        ImmutableBitmap, bitmap,
-                        SkIRect, center,
-                        SkRect, dst);
-RECORD5(DrawBitmapRectToRect, Optional<SkPaint>, paint,
-                              ImmutableBitmap, bitmap,
-                              Optional<SkRect>, src,
-                              SkRect, dst,
-                              SkCanvas::DrawBitmapRectFlags, flags);
-RECORD3(DrawDRRect, SkPaint, paint, SkRRect, outer, SkRRect, inner);
-RECORD2(DrawOval, SkPaint, paint, SkRect, oval);
-RECORD1(DrawPaint, SkPaint, paint);
-RECORD2(DrawPath, SkPaint, paint, SkPath, path);
-RECORD4(DrawPoints, SkPaint, paint, SkCanvas::PointMode, mode, size_t, count, SkPoint*, pts);
-RECORD4(DrawPosText, SkPaint, paint,
-                     PODArray<char>, text,
-                     size_t, byteLength,
-                     PODArray<SkPoint>, pos);
-RECORD5(DrawPosTextH, SkPaint, paint,
-                      PODArray<char>, text,
-                      size_t, byteLength,
-                      PODArray<SkScalar>, xpos,
-                      SkScalar, y);
-RECORD2(DrawRRect, SkPaint, paint, SkRRect, rrect);
-RECORD2(DrawRect, SkPaint, paint, SkRect, rect);
-RECORD4(DrawSprite, Optional<SkPaint>, paint, ImmutableBitmap, bitmap, int, left, int, top);
-RECORD5(DrawText, SkPaint, paint,
-                  PODArray<char>, text,
-                  size_t, byteLength,
-                  SkScalar, x,
-                  SkScalar, y);
-RECORD5(DrawTextOnPath, SkPaint, paint,
-                        PODArray<char>, text,
-                        size_t, byteLength,
-                        SkPath, path,
-                        Optional<SkMatrix>, matrix);
-
-// This guy is so ugly we just write it manually.
-struct DrawVertices {
-    static const Type kType = DrawVertices_Type;
-
-    DrawVertices(const SkPaint& paint,
-                 SkCanvas::VertexMode vmode,
-                 int vertexCount,
-                 SkPoint* vertices,
-                 SkPoint* texs,
-                 SkColor* colors,
-                 SkXfermode* xmode,
-                 uint16_t* indices,
-                 int indexCount)
-        : paint(paint)
-        , vmode(vmode)
-        , vertexCount(vertexCount)
-        , vertices(vertices)
-        , texs(texs)
-        , colors(colors)
-        , xmode(SkSafeRef(xmode))
-        , indices(indices)
-        , indexCount(indexCount) {}
-
-    SkPaint paint;
-    SkCanvas::VertexMode vmode;
-    int vertexCount;
-    PODArray<SkPoint> vertices;
-    PODArray<SkPoint> texs;
-    PODArray<SkColor> colors;
-    SkAutoTUnref<SkXfermode> xmode;
-    PODArray<uint16_t> indices;
-    int indexCount;
-};
-
-// Records added by optimizations.
-RECORD2(PairedPushCull, Adopted<PushCull>, base, unsigned, skip);
-RECORD3(BoundedDrawPosTextH, Adopted<DrawPosTextH>, base, SkScalar, minY, SkScalar, maxY);
-
-#undef RECORD0
-#undef RECORD1
-#undef RECORD2
-#undef RECORD3
-#undef RECORD4
-#undef RECORD5
-
-}  // namespace SkRecords
-
-#endif//SkRecords_DEFINED
diff --git a/gfx/skia/skia/src/core/SkRect.cpp b/gfx/skia/skia/src/core/SkRect.cpp
index 2814375abba0..6c44ea2544ea 100644
--- a/gfx/skia/skia/src/core/SkRect.cpp
+++ b/gfx/skia/skia/src/core/SkRect.cpp
@@ -6,7 +6,6 @@
  * found in the LICENSE file.
  */
 
-
 #include "SkRect.h"
 
 void SkIRect::join(int32_t left, int32_t top, int32_t right, int32_t bottom) {
@@ -37,15 +36,6 @@ void SkIRect::sort() {
 
 /////////////////////////////////////////////////////////////////////////////
 
-void SkRect::sort() {
-    if (fLeft > fRight) {
-        SkTSwap<SkScalar>(fLeft, fRight);
-    }
-    if (fTop > fBottom) {
-        SkTSwap<SkScalar>(fTop, fBottom);
-    }
-}
-
 void SkRect::toQuad(SkPoint quad[4]) const {
     SkASSERT(quad);
 
@@ -55,6 +45,13 @@ void SkRect::toQuad(SkPoint quad[4]) const {
     quad[3].set(fLeft, fBottom);
 }
 
+#include "SkNx.h"
+
+static inline bool is_finite(const Sk4s& value) {
+    auto finite = value * Sk4s(0) == Sk4s(0);
+    return finite.allTrue();
+}
+
 bool SkRect::setBoundsCheck(const SkPoint pts[], int count) {
     SkASSERT((pts && count > 0) || count == 0);
 
@@ -63,91 +60,73 @@ bool SkRect::setBoundsCheck(const SkPoint pts[], int count) {
     if (count <= 0) {
         sk_bzero(this, sizeof(SkRect));
     } else {
-        SkScalar    l, t, r, b;
+        Sk4s min, max, accum;
 
-        l = r = pts[0].fX;
-        t = b = pts[0].fY;
+        if (count & 1) {
+            min = Sk4s(pts[0].fX, pts[0].fY, pts[0].fX, pts[0].fY);
+            pts += 1;
+            count -= 1;
+        } else {
+            min = Sk4s::Load(&pts[0].fX);
+            pts += 2;
+            count -= 2;
+        }
+        accum = max = min;
+        accum = accum * Sk4s(0);
 
-        // If all of the points are finite, accum should stay 0. If we encounter
-        // a NaN or infinity, then accum should become NaN.
-        float accum = 0;
-        accum *= l; accum *= t;
-
-        for (int i = 1; i < count; i++) {
-            SkScalar x = pts[i].fX;
-            SkScalar y = pts[i].fY;
-
-            accum *= x; accum *= y;
-
-            // we use if instead of if/else, so we can generate min/max
-            // float instructions (at least on SSE)
-            if (x < l) l = x;
-            if (x > r) r = x;
-
-            if (y < t) t = y;
-            if (y > b) b = y;
+        count >>= 1;
+        for (int i = 0; i < count; ++i) {
+            Sk4s xy = Sk4s::Load(&pts->fX);
+            accum = accum * xy;
+            min = Sk4s::Min(min, xy);
+            max = Sk4s::Max(max, xy);
+            pts += 2;
         }
 
-        SkASSERT(!accum || !SkScalarIsFinite(accum));
-        if (accum) {
-            l = t = r = b = 0;
+        /**
+         *  With some trickery, we may be able to use Min/Max to also propogate non-finites,
+         *  in which case we could eliminate accum entirely, and just check min and max for
+         *  "is_finite".
+         */
+        if (is_finite(accum)) {
+            float minArray[4], maxArray[4];
+            min.store(minArray);
+            max.store(maxArray);
+            this->set(SkTMin(minArray[0], minArray[2]), SkTMin(minArray[1], minArray[3]),
+                      SkTMax(maxArray[0], maxArray[2]), SkTMax(maxArray[1], maxArray[3]));
+        } else {
+            // we hit a non-finite value, so zero everything and return false
+            this->setEmpty();
             isFinite = false;
         }
-        this->set(l, t, r, b);
     }
-
     return isFinite;
 }
 
-bool SkRect::intersect(SkScalar left, SkScalar top, SkScalar right,
-                       SkScalar bottom) {
-    if (left < right && top < bottom && !this->isEmpty() && // check for empties
-        fLeft < right && left < fRight && fTop < bottom && top < fBottom)
-    {
-        if (fLeft < left) fLeft = left;
-        if (fTop < top) fTop = top;
-        if (fRight > right) fRight = right;
-        if (fBottom > bottom) fBottom = bottom;
-        return true;
-    }
-    return false;
+#define CHECK_INTERSECT(al, at, ar, ab, bl, bt, br, bb) \
+    SkScalar L = SkMaxScalar(al, bl);                   \
+    SkScalar R = SkMinScalar(ar, br);                   \
+    SkScalar T = SkMaxScalar(at, bt);                   \
+    SkScalar B = SkMinScalar(ab, bb);                   \
+    do { if (L >= R || T >= B) return false; } while (0)
+
+bool SkRect::intersect(SkScalar left, SkScalar top, SkScalar right, SkScalar bottom) {
+    CHECK_INTERSECT(left, top, right, bottom, fLeft, fTop, fRight, fBottom);
+    this->setLTRB(L, T, R, B);
+    return true;
 }
 
 bool SkRect::intersect(const SkRect& r) {
     return this->intersect(r.fLeft, r.fTop, r.fRight, r.fBottom);
 }
 
-bool SkRect::intersect2(const SkRect& r) {
-    SkScalar L = SkMaxScalar(fLeft, r.fLeft);
-    SkScalar R = SkMinScalar(fRight, r.fRight);
-    if (L >= R) {
-        return false;
-    }
-    SkScalar T = SkMaxScalar(fTop, r.fTop);
-    SkScalar B = SkMinScalar(fBottom, r.fBottom);
-    if (T >= B) {
-        return false;
-    }
-    this->set(L, T, R, B);
+bool SkRect::intersect(const SkRect& a, const SkRect& b) {
+    CHECK_INTERSECT(a.fLeft, a.fTop, a.fRight, a.fBottom, b.fLeft, b.fTop, b.fRight, b.fBottom);
+    this->setLTRB(L, T, R, B);
     return true;
 }
 
-bool SkRect::intersect(const SkRect& a, const SkRect& b) {
-
-    if (!a.isEmpty() && !b.isEmpty() &&
-        a.fLeft < b.fRight && b.fLeft < a.fRight &&
-        a.fTop < b.fBottom && b.fTop < a.fBottom) {
-        fLeft   = SkMaxScalar(a.fLeft,   b.fLeft);
-        fTop    = SkMaxScalar(a.fTop,    b.fTop);
-        fRight  = SkMinScalar(a.fRight,  b.fRight);
-        fBottom = SkMinScalar(a.fBottom, b.fBottom);
-        return true;
-    }
-    return false;
-}
-
-void SkRect::join(SkScalar left, SkScalar top, SkScalar right,
-                  SkScalar bottom) {
+void SkRect::join(SkScalar left, SkScalar top, SkScalar right, SkScalar bottom) {
     // do nothing if the params are empty
     if (left >= right || top >= bottom) {
         return;
@@ -157,9 +136,42 @@ void SkRect::join(SkScalar left, SkScalar top, SkScalar right,
     if (fLeft >= fRight || fTop >= fBottom) {
         this->set(left, top, right, bottom);
     } else {
-        if (left < fLeft) fLeft = left;
-        if (top < fTop) fTop = top;
-        if (right > fRight) fRight = right;
-        if (bottom > fBottom) fBottom = bottom;
+        fLeft   = SkMinScalar(fLeft, left);
+        fTop    = SkMinScalar(fTop, top);
+        fRight  = SkMaxScalar(fRight, right);
+        fBottom = SkMaxScalar(fBottom, bottom);
     }
 }
+
+////////////////////////////////////////////////////////////////////////////////////////////////
+
+#include "SkString.h"
+#include "SkStringUtils.h"
+
+static const char* set_scalar(SkString* storage, SkScalar value, SkScalarAsStringType asType) {
+    storage->reset();
+    SkAppendScalar(storage, value, asType);
+    return storage->c_str();
+}
+
+void SkRect::dump(bool asHex) const {
+    SkScalarAsStringType asType = asHex ? kHex_SkScalarAsStringType : kDec_SkScalarAsStringType;
+
+    SkString line;
+    if (asHex) {
+        SkString tmp;
+        line.printf( "SkRect::MakeLTRB(%s, /* %f */\n", set_scalar(&tmp, fLeft, asType), fLeft);
+        line.appendf("                 %s, /* %f */\n", set_scalar(&tmp, fTop, asType), fTop);
+        line.appendf("                 %s, /* %f */\n", set_scalar(&tmp, fRight, asType), fRight);
+        line.appendf("                 %s  /* %f */);", set_scalar(&tmp, fBottom, asType), fBottom);
+    } else {
+        SkString strL, strT, strR, strB;
+        SkAppendScalarDec(&strL, fLeft);
+        SkAppendScalarDec(&strT, fTop);
+        SkAppendScalarDec(&strR, fRight);
+        SkAppendScalarDec(&strB, fBottom);
+        line.printf("SkRect::MakeLTRB(%s, %s, %s, %s);",
+                    strL.c_str(), strT.c_str(), strR.c_str(), strB.c_str());
+    }
+    SkDebugf("%s\n", line.c_str());
+}
diff --git a/gfx/skia/skia/src/core/SkRefDict.cpp b/gfx/skia/skia/src/core/SkRefDict.cpp
index 44eddf01a982..9364a39cc04b 100644
--- a/gfx/skia/skia/src/core/SkRefDict.cpp
+++ b/gfx/skia/skia/src/core/SkRefDict.cpp
@@ -16,15 +16,15 @@ struct SkRefDict::Impl {
     SkRefCnt*   fData;
 };
 
-SkRefDict::SkRefDict() : fImpl(NULL) {}
+SkRefDict::SkRefDict() : fImpl(nullptr) {}
 
 SkRefDict::~SkRefDict() {
     this->removeAll();
 }
 
 SkRefCnt* SkRefDict::find(const char name[]) const {
-    if (NULL == name) {
-        return NULL;
+    if (nullptr == name) {
+        return nullptr;
     }
 
     Impl* rec = fImpl;
@@ -34,16 +34,16 @@ SkRefCnt* SkRefDict::find(const char name[]) const {
         }
         rec = rec->fNext;
     }
-    return NULL;
+    return nullptr;
 }
 
 void SkRefDict::set(const char name[], SkRefCnt* data) {
-    if (NULL == name) {
+    if (nullptr == name) {
         return;
     }
 
     Impl* rec = fImpl;
-    Impl* prev = NULL;
+    Impl* prev = nullptr;
     while (rec) {
         if (rec->fName.equals(name)) {
             if (data) {
@@ -85,5 +85,5 @@ void SkRefDict::removeAll() {
         delete rec;
         rec = next;
     }
-    fImpl = NULL;
+    fImpl = nullptr;
 }
diff --git a/gfx/skia/skia/src/core/SkRefDict.h b/gfx/skia/skia/src/core/SkRefDict.h
index 55b9bfe0cf4f..9583df1f1231 100644
--- a/gfx/skia/skia/src/core/SkRefDict.h
+++ b/gfx/skia/skia/src/core/SkRefDict.h
@@ -22,15 +22,15 @@ public:
     ~SkRefDict();
 
     /**
-     *  Return the data associated with name[], or NULL if no matching entry
+     *  Return the data associated with name[], or nullptr if no matching entry
      *  is found. The reference-count of the entry is not affected.
      */
     SkRefCnt* find(const char name[]) const;
 
     /**
-     *  If data is NULL, remove (if present) the entry matching name and call
+     *  If data is nullptr, remove (if present) the entry matching name and call
      *  prev_data->unref() on the data for the matching entry.
-     *  If data is not-NULL, replace the existing entry matching name and
+     *  If data is not-nullptr, replace the existing entry matching name and
      *  call (prev_data->unref()), or add a new one. In either case,
      *  data->ref() is called.
      */
@@ -39,7 +39,7 @@ public:
     /**
      *  Remove the matching entry (if found) and unref its data.
      */
-    void remove(const char name[]) { this->set(name, NULL); }
+    void remove(const char name[]) { this->set(name, nullptr); }
 
     /**
      *  Remove all entries, and unref() their associated data.
diff --git a/gfx/skia/skia/src/core/SkRegion.cpp b/gfx/skia/skia/src/core/SkRegion.cpp
index 24d7248582f6..3a542c616976 100644
--- a/gfx/skia/skia/src/core/SkRegion.cpp
+++ b/gfx/skia/skia/src/core/SkRegion.cpp
@@ -7,9 +7,9 @@
  */
 
 
+#include "SkAtomics.h"
 #include "SkRegionPriv.h"
 #include "SkTemplates.h"
-#include "SkThread.h"
 #include "SkUtils.h"
 
 /* Region Layout
@@ -193,9 +193,9 @@ char* SkRegion::toString() {
     }
     // 4 ints, up to 10 digits each plus sign, 3 commas, '(', ')', SkRegion() and '\0'
     const int max = (count*((11*4)+5))+11+1;
-    char* result = (char*)malloc(max);
-    if (result == NULL) {
-        return NULL;
+    char* result = (char*)sk_malloc_throw(max);
+    if (result == nullptr) {
+        return nullptr;
     }
     count = sprintf(result, "SkRegion(");
     iter.reset(*this);
@@ -408,7 +408,7 @@ bool SkRegion::contains(const SkRegion& rgn) const {
      *  A contains B is equivalent to
      *  B - A == 0
      */
-    return !Oper(rgn, *this, kDifference_Op, NULL);
+    return !Oper(rgn, *this, kDifference_Op, nullptr);
 }
 
 const SkRegion::RunType* SkRegion::getRuns(RunType tmpStorage[],
@@ -498,7 +498,7 @@ bool SkRegion::intersects(const SkRegion& rgn) const {
     }
 
     // both of us are complex
-    return Oper(*this, rgn, kIntersect_Op, NULL);
+    return Oper(*this, rgn, kIntersect_Op, nullptr);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -533,7 +533,7 @@ bool SkRegion::operator==(const SkRegion& b) const {
 void SkRegion::translate(int dx, int dy, SkRegion* dst) const {
     SkDEBUGCODE(this->validate();)
 
-    if (NULL == dst) {
+    if (nullptr == dst) {
         return;
     }
     if (this->isEmpty()) {
@@ -1074,7 +1074,7 @@ bool SkRegion::Oper(const SkRegion& rgnaOrig, const SkRegion& rgnbOrig, Op op,
 //  sk_memset32((uint32_t*)array.get(), 0x7FFFFFFF, dstCount);
 #endif
 
-    int count = operate(a_runs, b_runs, array.get(), op, NULL == result);
+    int count = operate(a_runs, b_runs, array.get(), op, nullptr == result);
     SkASSERT(count <= dstCount);
 
     if (result) {
@@ -1095,7 +1095,7 @@ bool SkRegion::op(const SkRegion& rgna, const SkRegion& rgnb, Op op) {
 #include "SkBuffer.h"
 
 size_t SkRegion::writeToMemory(void* storage) const {
-    if (NULL == storage) {
+    if (nullptr == storage) {
         size_t size = sizeof(int32_t); // -1 (empty), 0 (rect), runCount
         if (!this->isEmpty()) {
             size += sizeof(fBounds);
@@ -1295,7 +1295,7 @@ void SkRegion::Iterator::reset(const SkRegion& rgn) {
         fDone = false;
         if (rgn.isRect()) {
             fRect = rgn.fBounds;
-            fRuns = NULL;
+            fRuns = nullptr;
         } else {
             fRuns = rgn.fRunHead->readonly_runs();
             fRect.set(fRuns[3], fRuns[0], fRuns[4], fRuns[1]);
@@ -1310,7 +1310,7 @@ void SkRegion::Iterator::next() {
         return;
     }
 
-    if (fRuns == NULL) {   // rect case
+    if (fRuns == nullptr) {   // rect case
         fDone = true;
         return;
     }
@@ -1402,7 +1402,7 @@ SkRegion::Spanerator::Spanerator(const SkRegion& rgn, int y, int left,
             }
             fLeft = left;
             fRight = right;
-            fRuns = NULL;    // means we're a rect, not a rgn
+            fRuns = nullptr;    // means we're a rect, not a rgn
             fDone = false;
         } else {
             const SkRegion::RunType* runs = rgn.fRunHead->findScanline(y);
@@ -1433,7 +1433,7 @@ bool SkRegion::Spanerator::next(int* left, int* right) {
         return false;
     }
 
-    if (fRuns == NULL) {   // we're a rect
+    if (fRuns == nullptr) {   // we're a rect
         fDone = true;   // ok, now we're done
         if (left) {
             *left = fLeft;
diff --git a/gfx/skia/skia/src/core/SkRegionPriv.h b/gfx/skia/skia/src/core/SkRegionPriv.h
index c8f000df35e6..160c55d55501 100644
--- a/gfx/skia/skia/src/core/SkRegionPriv.h
+++ b/gfx/skia/skia/src/core/SkRegionPriv.h
@@ -11,7 +11,7 @@
 #define SkRegionPriv_DEFINED
 
 #include "SkRegion.h"
-#include "SkThread.h"
+#include "SkAtomics.h"
 
 #define assert_sentinel(value, isSentinel) \
     SkASSERT(((value) == SkRegion::kRunTypeSentinel) == isSentinel)
@@ -65,7 +65,10 @@ public:
 
         SkASSERT(count >= SkRegion::kRectRegionRuns);
 
-        RunHead* head = (RunHead*)sk_malloc_throw(sizeof(RunHead) + count * sizeof(RunType));
+        const int64_t size = sk_64_mul(count, sizeof(RunType)) + sizeof(RunHead);
+        if (count < 0 || !sk_64_isS32(size)) { SK_CRASH(); }
+
+        RunHead* head = (RunHead*)sk_malloc_throw(size);
         head->fRefCnt = 1;
         head->fRunCount = count;
         // these must be filled in later, otherwise we will be invalid
@@ -139,7 +142,7 @@ public:
     /**
      *  Return the scanline that contains the Y value. This requires that the Y
      *  value is already known to be contained within the bounds of the region,
-     *  and so this routine never returns NULL.
+     *  and so this routine never returns nullptr.
      *
      *  It returns the beginning of the scanline, starting with its Bottom value.
      */
diff --git a/gfx/skia/skia/src/core/SkRegion_path.cpp b/gfx/skia/skia/src/core/SkRegion_path.cpp
index 108511c6c5d9..9289641c69d5 100644
--- a/gfx/skia/skia/src/core/SkRegion_path.cpp
+++ b/gfx/skia/skia/src/core/SkRegion_path.cpp
@@ -8,6 +8,7 @@
 #include "SkRegionPriv.h"
 #include "SkBlitter.h"
 #include "SkScan.h"
+#include "SkTSort.h"
 #include "SkTDArray.h"
 #include "SkPath.h"
 
@@ -31,7 +32,7 @@ public:
     bool init(int maxHeight, int maxTransitions, bool pathIsInverse);
 
     void done() {
-        if (fCurrScanline != NULL) {
+        if (fCurrScanline != nullptr) {
             fCurrScanline->fXCount = (SkRegion::RunType)((int)(fCurrXPtr - fCurrScanline->firstX()));
             if (!this->collapsWithPrev()) { // flush the last line
                 fCurrScanline = fCurrScanline->nextScanline();
@@ -43,7 +44,7 @@ public:
     void    copyToRect(SkIRect*) const;
     void    copyToRgn(SkRegion::RunType runs[]) const;
 
-    virtual void blitH(int x, int y, int width);
+    void blitH(int x, int y, int width) override;
 
 #ifdef SK_DEBUG
     void dump() const {
@@ -93,7 +94,7 @@ private:
     int fStorageCount;
 
     bool collapsWithPrev() {
-        if (fPrevScanline != NULL &&
+        if (fPrevScanline != nullptr &&
             fPrevScanline->fLastY + 1 == fCurrScanline->fLastY &&
             fPrevScanline->fXCount == fCurrScanline->fXCount &&
             sk_memeq32(fPrevScanline->firstX(), fCurrScanline->firstX(), fCurrScanline->fXCount))
@@ -107,7 +108,7 @@ private:
 };
 
 SkRgnBuilder::SkRgnBuilder()
-    : fStorage(NULL) {
+    : fStorage(nullptr) {
 }
 
 SkRgnBuilder::~SkRgnBuilder() {
@@ -146,17 +147,17 @@ bool SkRgnBuilder::init(int maxHeight, int maxTransitions, bool pathIsInverse) {
     }
 
     fStorage = (SkRegion::RunType*)sk_malloc_flags(sk_64_asS32(size), 0);
-    if (NULL == fStorage) {
+    if (nullptr == fStorage) {
         return false;
     }
 
-    fCurrScanline = NULL;    // signal empty collection
-    fPrevScanline = NULL;    // signal first scanline
+    fCurrScanline = nullptr;    // signal empty collection
+    fPrevScanline = nullptr;    // signal first scanline
     return true;
 }
 
 void SkRgnBuilder::blitH(int x, int y, int width) {
-    if (fCurrScanline == NULL) {  // first time
+    if (fCurrScanline == nullptr) {  // first time
         fTop = (SkRegion::RunType)(y);
         fCurrScanline = (Scanline*)fStorage;
         fCurrScanline->fLastY = (SkRegion::RunType)(y);
@@ -196,7 +197,7 @@ void SkRgnBuilder::blitH(int x, int y, int width) {
 }
 
 int SkRgnBuilder::computeRunCount() const {
-    if (fCurrScanline == NULL) {
+    if (fCurrScanline == nullptr) {
         return 0;
     }
 
@@ -207,7 +208,7 @@ int SkRgnBuilder::computeRunCount() const {
 }
 
 void SkRgnBuilder::copyToRect(SkIRect* r) const {
-    SkASSERT(fCurrScanline != NULL);
+    SkASSERT(fCurrScanline != nullptr);
     // A rect's scanline is [bottom intervals left right sentinel] == 5
     SkASSERT((const SkRegion::RunType*)fCurrScanline - fStorage == 5);
 
@@ -218,7 +219,7 @@ void SkRgnBuilder::copyToRect(SkIRect* r) const {
 }
 
 void SkRgnBuilder::copyToRgn(SkRegion::RunType runs[]) const {
-    SkASSERT(fCurrScanline != NULL);
+    SkASSERT(fCurrScanline != nullptr);
     SkASSERT((const SkRegion::RunType*)fCurrScanline - fStorage > 4);
 
     const Scanline* line = (const Scanline*)fStorage;
@@ -268,7 +269,7 @@ static unsigned verb_to_max_edges(unsigned verb) {
     return gPathVerbToMaxEdges[verb];
 }
 
-
+// If returns 0, ignore itop and ibot
 static int count_path_runtype_values(const SkPath& path, int* itop, int* ibot) {
     SkPath::Iter    iter(path, true);
     SkPoint         pts[4];
@@ -298,13 +299,24 @@ static int count_path_runtype_values(const SkPath& path, int* itop, int* ibot) {
             }
         }
     }
-    SkASSERT(top <= bot);
+    if (0 == maxEdges) {
+        return 0;   // we have only moves+closes
+    }
 
+    SkASSERT(top <= bot);
     *itop = SkScalarRoundToInt(top);
     *ibot = SkScalarRoundToInt(bot);
     return maxEdges;
 }
 
+static bool check_inverse_on_empty_return(SkRegion* dst, const SkPath& path, const SkRegion& clip) {
+    if (path.isInverseFillType()) {
+        return dst->set(clip);
+    } else {
+        return dst->setEmpty();
+    }
+}
+
 bool SkRegion::setPath(const SkPath& path, const SkRegion& clip) {
     SkDEBUGCODE(this->validate();)
 
@@ -313,26 +325,24 @@ bool SkRegion::setPath(const SkPath& path, const SkRegion& clip) {
     }
 
     if (path.isEmpty()) {
-        if (path.isInverseFillType()) {
-            return this->set(clip);
-        } else {
-            return this->setEmpty();
-        }
+        return check_inverse_on_empty_return(this, path, clip);
     }
 
     //  compute worst-case rgn-size for the path
     int pathTop, pathBot;
     int pathTransitions = count_path_runtype_values(path, &pathTop, &pathBot);
-    int clipTop, clipBot;
-    int clipTransitions;
+    if (0 == pathTransitions) {
+        return check_inverse_on_empty_return(this, path, clip);
+    }
 
-    clipTransitions = clip.count_runtype_values(&clipTop, &clipBot);
+    int clipTop, clipBot;
+    int clipTransitions = clip.count_runtype_values(&clipTop, &clipBot);
 
     int top = SkMax32(pathTop, clipTop);
     int bot = SkMin32(pathBot, clipBot);
-
-    if (top >= bot)
-        return this->setEmpty();
+    if (top >= bot) {
+        return check_inverse_on_empty_return(this, path, clip);
+    }
 
     SkRgnBuilder builder;
 
@@ -387,7 +397,7 @@ struct Edge {
         fY0 = (SkRegion::RunType)(y0);
         fY1 = (SkRegion::RunType)(y1);
         fFlags = 0;
-        SkDEBUGCODE(fNext = NULL;)
+        SkDEBUGCODE(fNext = nullptr;)
     }
 
     int top() const {
@@ -413,7 +423,7 @@ static void find_link(Edge* base, Edge* stop) {
         for (;;) {
             e += 1;
             if ((e->fFlags & Edge::kY1Link) == 0 && y0 == e->fY1) {
-                SkASSERT(NULL == e->fNext);
+                SkASSERT(nullptr == e->fNext);
                 e->fNext = base;
                 e->fFlags = SkToU8(e->fFlags | Edge::kY1Link);
                 break;
@@ -426,7 +436,7 @@ static void find_link(Edge* base, Edge* stop) {
         for (;;) {
             e += 1;
             if ((e->fFlags & Edge::kY0Link) == 0 && y1 == e->fY0) {
-                SkASSERT(NULL == base->fNext);
+                SkASSERT(nullptr == base->fNext);
                 base->fNext = e;
                 e->fFlags = SkToU8(e->fFlags | Edge::kY0Link);
                 break;
@@ -467,14 +477,14 @@ static int extract_path(Edge* edge, Edge* stop, SkPath* path) {
     return count;
 }
 
-#include "SkTSearch.h"
-
-static int EdgeProc(const Edge* a, const Edge* b) {
-    return (a->fX == b->fX) ? a->top() - b->top() : a->fX - b->fX;
-}
+struct EdgeLT {
+    bool operator()(const Edge& a, const Edge& b) const {
+        return (a.fX == b.fX) ? a.top() < b.top() : a.fX < b.fX;
+    }
+};
 
 bool SkRegion::getBoundaryPath(SkPath* path) const {
-    // path could safely be NULL if we're empty, but the caller shouldn't
+    // path could safely be nullptr if we're empty, but the caller shouldn't
     // *know* that
     SkASSERT(path);
 
@@ -499,20 +509,20 @@ bool SkRegion::getBoundaryPath(SkPath* path) const {
         edge[0].set(r.fLeft, r.fBottom, r.fTop);
         edge[1].set(r.fRight, r.fTop, r.fBottom);
     }
-    qsort(edges.begin(), edges.count(), sizeof(Edge), SkCastForQSort(EdgeProc));
 
     int count = edges.count();
     Edge* start = edges.begin();
     Edge* stop = start + count;
-    Edge* e;
+    SkTQSort<Edge>(start, stop - 1, EdgeLT());
 
+    Edge* e;
     for (e = start; e != stop; e++) {
         find_link(e, stop);
     }
 
 #ifdef SK_DEBUG
     for (e = start; e != stop; e++) {
-        SkASSERT(e->fNext != NULL);
+        SkASSERT(e->fNext != nullptr);
         SkASSERT(e->fFlags == Edge::kCompleteLink);
     }
 #endif
diff --git a/gfx/skia/skia/src/core/SkRemote.cpp b/gfx/skia/skia/src/core/SkRemote.cpp
new file mode 100644
index 000000000000..1209be014c6f
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkRemote.cpp
@@ -0,0 +1,758 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkAnnotation.h"
+#include "SkCanvas.h"
+#include "SkColorFilter.h"
+#include "SkDrawLooper.h"
+#include "SkImage.h"
+#include "SkImageFilter.h"
+#include "SkMaskFilter.h"
+#include "SkNinePatchIter.h"
+#include "SkPath.h"
+#include "SkPathEffect.h"
+#include "SkRasterizer.h"
+#include "SkRect.h"
+#include "SkRemote.h"
+#include "SkShader.h"
+#include "SkTHash.h"
+#include "SkTextBlob.h"
+
+namespace SkRemote {
+
+    Misc Misc::CreateFrom(const SkPaint& paint) {
+        Misc misc = {
+            paint.getColor(),
+            paint.getFilterQuality(),
+            paint.isAntiAlias(),
+            paint.isDither(),
+        };
+        return misc;
+    }
+
+    void Misc::applyTo(SkPaint* paint) const {
+        paint->setColor        (fColor);
+        paint->setFilterQuality(fFilterQuality);
+        paint->setAntiAlias    (fAntiAlias);
+        paint->setDither       (fDither);
+    }
+
+    static bool operator==(const Misc& a, const Misc& b) {
+        return a.fColor         == b.fColor
+            && a.fFilterQuality == b.fFilterQuality
+            && a.fAntiAlias     == b.fAntiAlias
+            && a.fDither        == b.fDither;
+    }
+
+    // Misc carries 10 bytes of data in a 12 byte struct, so we need a custom hash.
+    static_assert(sizeof(Misc) > offsetof(Misc, fDither) + sizeof(Misc().fDither), "");
+    struct MiscHash {
+        uint32_t operator()(const Misc& misc) {
+            return SkChecksum::Murmur3(&misc, offsetof(Misc, fDither) + sizeof(Misc().fDither));
+        }
+    };
+
+    Stroke Stroke::CreateFrom(const SkPaint& paint) {
+        Stroke stroke = {
+            paint.getStrokeWidth(),
+            paint.getStrokeMiter(),
+            paint.getStrokeCap(),
+            paint.getStrokeJoin(),
+        };
+        return stroke;
+    }
+
+    void Stroke::applyTo(SkPaint* paint) const {
+        paint->setStrokeWidth(fWidth);
+        paint->setStrokeMiter(fMiter);
+        paint->setStrokeCap  (fCap);
+        paint->setStrokeJoin (fJoin);
+    }
+
+    static bool operator==(const Stroke& a, const Stroke& b) {
+        return a.fWidth == b.fWidth
+            && a.fMiter == b.fMiter
+            && a.fCap   == b.fCap
+            && a.fJoin  == b.fJoin;
+    }
+
+    // The default SkGoodHash works fine for Stroke, as it's dense.
+    static_assert(sizeof(Stroke) == offsetof(Stroke, fJoin) + sizeof(Stroke().fJoin), "");
+
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
+
+    class Canvas final : public SkCanvas {
+    public:
+        explicit Canvas(Encoder* encoder)
+            : SkCanvas(1,1)
+            , fEncoder(encoder) {}
+
+    private:
+        // Calls Encoder::define() when created, Encoder::undefine() when destroyed.
+        class AutoID : ::SkNoncopyable {
+        public:
+            template <typename T>
+            explicit AutoID(Encoder* encoder, const T& val)
+                : fEncoder(encoder)
+                , fID(encoder->define(val)) {}
+            ~AutoID() { if (fEncoder) fEncoder->undefine(fID); }
+
+            AutoID(AutoID&& o) : fEncoder(o.fEncoder), fID(o.fID) {
+                o.fEncoder = nullptr;
+            }
+            AutoID& operator=(AutoID&&) = delete;
+
+            operator ID () const { return fID; }
+
+        private:
+            Encoder* fEncoder;
+            const ID fID;
+        };
+
+        // Like AutoID, but for CommonIDs.
+        class AutoCommonIDs : ::SkNoncopyable {
+        public:
+            explicit AutoCommonIDs(Encoder* encoder, const SkPaint& paint)
+                : fEncoder(encoder) {
+                fIDs.misc        = fEncoder->define(Misc::CreateFrom(paint));
+                fIDs.patheffect  = fEncoder->define(paint.getPathEffect());
+                fIDs.shader      = fEncoder->define(paint.getShader());
+                fIDs.xfermode    = fEncoder->define(paint.getXfermode());
+                fIDs.maskfilter  = fEncoder->define(paint.getMaskFilter());
+                fIDs.colorfilter = fEncoder->define(paint.getColorFilter());
+                fIDs.rasterizer  = fEncoder->define(paint.getRasterizer());
+                fIDs.looper      = fEncoder->define(paint.getLooper());
+                fIDs.imagefilter = fEncoder->define(paint.getImageFilter());
+                fIDs.annotation  = fEncoder->define(paint.getAnnotation());
+            }
+            ~AutoCommonIDs() {
+                if (fEncoder) {
+                    fEncoder->undefine(fIDs.misc);
+                    fEncoder->undefine(fIDs.patheffect);
+                    fEncoder->undefine(fIDs.shader);
+                    fEncoder->undefine(fIDs.xfermode);
+                    fEncoder->undefine(fIDs.maskfilter);
+                    fEncoder->undefine(fIDs.colorfilter);
+                    fEncoder->undefine(fIDs.rasterizer);
+                    fEncoder->undefine(fIDs.looper);
+                    fEncoder->undefine(fIDs.imagefilter);
+                    fEncoder->undefine(fIDs.annotation);
+                }
+            }
+
+            AutoCommonIDs(AutoCommonIDs&& o) : fEncoder(o.fEncoder), fIDs(o.fIDs) {
+                o.fEncoder = nullptr;
+            }
+            AutoID& operator=(AutoID&&) = delete;
+
+            operator Encoder::CommonIDs () const { return fIDs; }
+
+        private:
+            Encoder*           fEncoder;
+            Encoder::CommonIDs fIDs;
+        };
+
+        template <typename T>
+        AutoID id(const T& val) { return AutoID(fEncoder, val); }
+
+        AutoCommonIDs commonIDs(const SkPaint& paint) { return AutoCommonIDs(fEncoder, paint); }
+
+        void   willSave() override { fEncoder->   save(); }
+        void didRestore() override { fEncoder->restore(); }
+        SaveLayerStrategy willSaveLayer(const SkRect* bounds,
+                                        const SkPaint* paint,
+                                        SaveFlags flags) override {
+            SkPath path;
+            if (bounds) {
+                path.addRect(*bounds);
+            }
+            const SkPaint defaultPaint;
+            if (!paint) {
+                paint = &defaultPaint;
+            }
+            fEncoder->saveLayer(this->id(path), this->commonIDs(*paint), flags);
+            return kNoLayer_SaveLayerStrategy;
+        }
+
+        void    didConcat(const SkMatrix&) override { this->didSetMatrix(this->getTotalMatrix()); }
+        void didSetMatrix(const SkMatrix& matrix) override {
+            fEncoder->setMatrix(this->id(matrix));
+        }
+
+        void onDrawOval(const SkRect& oval, const SkPaint& paint) override {
+            SkPath path;
+            path.addOval(oval);
+            this->onDrawPath(path, paint);
+        }
+
+        void onDrawRect(const SkRect& rect, const SkPaint& paint) override {
+            SkPath path;
+            path.addRect(rect);
+            this->onDrawPath(path, paint);
+        }
+
+        void onDrawRRect(const SkRRect& rrect, const SkPaint& paint) override {
+            SkPath path;
+            path.addRRect(rrect);
+            this->onDrawPath(path, paint);
+        }
+
+        void onDrawDRRect(const SkRRect& outside, const SkRRect& inside,
+                          const SkPaint& paint) override {
+            SkPath path;
+            path.addRRect(outside);
+            path.addRRect(inside, SkPath::kCCW_Direction);
+            this->onDrawPath(path, paint);
+        }
+
+        void onDrawPath(const SkPath& path, const SkPaint& paint) override {
+            auto common = this->commonIDs(paint);
+            auto p = this->id(path);
+
+            if (paint.getStyle() == SkPaint::kFill_Style) {
+                fEncoder->fillPath(p, common);
+            } else {
+                // TODO: handle kStrokeAndFill_Style
+                fEncoder->strokePath(p, common, this->id(Stroke::CreateFrom(paint)));
+            }
+        }
+
+        void onDrawPaint(const SkPaint& paint) override {
+            SkPath path;
+            path.setFillType(SkPath::kInverseWinding_FillType);  // Either inverse FillType is fine.
+            this->onDrawPath(path, paint);
+        }
+
+        void onDrawPoints(PointMode mode,
+                          size_t count,
+                          const SkPoint pts[],
+                          const SkPaint& paint) override {
+            // TODO
+        }
+
+        void onDrawDrawable(SkDrawable* drawable, const SkMatrix* matrix) override {
+            // TODO
+            this->INHERITED::onDrawDrawable(drawable, matrix);
+        }
+
+        void onDrawPicture(const SkPicture* pic,
+                           const SkMatrix* matrix,
+                           const SkPaint* paint) override {
+            // TODO
+            this->INHERITED::onDrawPicture(pic, matrix, paint);
+        }
+
+        void onDrawVertices(VertexMode vmode,
+                            int vertexCount,
+                            const SkPoint vertices[],
+                            const SkPoint texs[],
+                            const SkColor colors[],
+                            SkXfermode* xmode,
+                            const uint16_t indices[],
+                            int indexCount,
+                            const SkPaint& paint) override {
+            // TODO
+        }
+
+        void onDrawPatch(const SkPoint cubics[12],
+                         const SkColor colors[4],
+                         const SkPoint texCoords[4],
+                         SkXfermode* xmode,
+                         const SkPaint& paint) override {
+            // TODO
+        }
+
+        void onDrawAtlas(const SkImage* atlas,
+                         const SkRSXform xform[],
+                         const SkRect tex[],
+                         const SkColor colors[],
+                         int count,
+                         SkXfermode::Mode mode,
+                         const SkRect* cull,
+                         const SkPaint* paint) override {
+            // TODO
+        }
+
+        void onDrawBitmap(const SkBitmap& bitmap,
+                          SkScalar left,
+                          SkScalar top,
+                          const SkPaint* paint) override {
+            auto src = SkRect::MakeWH(bitmap.width(), bitmap.height()),
+                 dst = src.makeOffset(left, top);
+            this->onDrawBitmapRect(bitmap, &src, dst, paint, kStrict_SrcRectConstraint);
+        }
+
+        void onDrawBitmapRect(const SkBitmap& bitmap,
+                              const SkRect* src,
+                              const SkRect& dst,
+                              const SkPaint* paint,
+                              SrcRectConstraint constraint) override {
+            SkAutoTUnref<SkImage> image(SkImage::NewFromBitmap(bitmap));
+            this->onDrawImageRect(image, src, dst, paint, constraint);
+        }
+
+        void onDrawImage(const SkImage* image,
+                         SkScalar left,
+                         SkScalar top,
+                         const SkPaint* paint) override {
+            if (!image) {
+                return;
+            }
+            auto src = SkRect::MakeWH(image->width(), image->height()),
+                 dst = src.makeOffset(left, top);
+            this->onDrawImageRect(image, &src, dst, paint, kStrict_SrcRectConstraint);
+        }
+
+        void onDrawImageRect(const SkImage* image,
+                             const SkRect* src,
+                             const SkRect& dst,
+                             const SkPaint* paint,
+                             SrcRectConstraint constraint) override {
+            // TODO: this is all a (likely buggy) hack to get images drawing quickly.
+            if (!image) {
+                return;
+            }
+
+            auto bounds = SkRect::MakeWH(image->width(), image->height());
+            if (!src) {
+                src = &bounds;
+            }
+            auto matrix = SkMatrix::MakeRectToRect(*src, dst, SkMatrix::kFill_ScaleToFit);
+
+            SkAutoTUnref<SkImage> subset;
+            if (src) {
+                if (!bounds.intersect(*src)) {
+                    return;
+                }
+                subset.reset(image->newSubset(bounds.roundOut()));
+                image = subset;
+            }
+
+            auto paintWithShader = paint ? *paint : SkPaint();
+            SkAutoTUnref<SkShader> shader(
+                image->newShader(SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, &matrix));
+            paintWithShader.setShader(shader);
+
+            this->onDrawRect(dst, paintWithShader);
+        }
+
+        void onDrawBitmapNine(const SkBitmap& bitmap,
+                              const SkIRect& center,
+                              const SkRect& dst,
+                              const SkPaint* paint) override {
+            SkAutoTUnref<SkImage> image(SkImage::NewFromBitmap(bitmap));
+            this->onDrawImageNine(image, center, dst, paint);
+        }
+
+        void onDrawImageNine(const SkImage* image,
+                             const SkIRect& center,
+                             const SkRect& dst,
+                             const SkPaint* paint) override {
+            SkNinePatchIter iter(image->width(), image->height(), center, dst);
+            SkRect s,d;
+            while (iter.next(&s, &d)) {
+                this->onDrawImageRect(image, &s, d, paint, kStrict_SrcRectConstraint);
+            }
+        }
+
+        void onDrawTextBlob(const SkTextBlob* text,
+                            SkScalar x,
+                            SkScalar y,
+                            const SkPaint& paint) override {
+            SkPoint offset{x,y};
+            auto t = this->id(text);
+            auto common = this->commonIDs(paint);
+
+            if (paint.getStyle() == SkPaint::kFill_Style) {
+                fEncoder->fillText(t, offset, common);
+            } else {
+                // TODO: handle kStrokeAndFill_Style
+                fEncoder->strokeText(t, offset, common, this->id(Stroke::CreateFrom(paint)));
+            }
+        }
+
+        void onDrawText(const void* text, size_t byteLength,
+                        SkScalar x, SkScalar y, const SkPaint& paint) override {
+            // Text-as-paths is a temporary hack.
+            // TODO: send SkTextBlobs and SkTypefaces
+            SkPath path;
+            paint.getTextPath(text, byteLength, x, y, &path);
+            this->onDrawPath(path, paint);
+        }
+
+        void onDrawPosText(const void* text, size_t byteLength,
+                           const SkPoint pos[], const SkPaint& paint) override {
+            // Text-as-paths is a temporary hack.
+            // TODO: send SkTextBlobs and SkTypefaces
+            SkPath path;
+            paint.getPosTextPath(text, byteLength, pos, &path);
+            this->onDrawPath(path, paint);
+        }
+
+        void onDrawPosTextH(const void* text, size_t byteLength,
+                            const SkScalar xpos[], SkScalar constY, const SkPaint& paint) override {
+            size_t length = paint.countText(text, byteLength);
+            SkAutoTArray<SkPoint> pos(length);
+            for(size_t i = 0; i < length; ++i) {
+                pos[i].set(xpos[i], constY);
+            }
+            this->onDrawPosText(text, byteLength, &pos[0], paint);
+        }
+
+        // All clip calls need to call their parent method or we'll not get any quick rejects.
+        void onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle edgeStyle) override {
+            this->INHERITED::onClipRect(rect, op, edgeStyle);
+            SkPath path;
+            path.addRect(rect);
+            this->onClipPath(path, op, edgeStyle);
+        }
+
+        void onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle edgeStyle) override {
+            this->INHERITED::onClipRRect(rrect, op, edgeStyle);
+            SkPath path;
+            path.addRRect(rrect);
+            this->onClipPath(path, op, edgeStyle);
+        }
+
+        void onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edgeStyle) override {
+            this->INHERITED::onClipPath(path, op, edgeStyle);
+            fEncoder->clipPath(this->id(path), op, edgeStyle == kSoft_ClipEdgeStyle);
+        }
+
+        void onClipRegion(const SkRegion& region, SkRegion::Op op) override {
+            this->INHERITED::onClipRegion(region, op);
+            // TODO
+        }
+
+        Encoder* fEncoder;
+        typedef SkCanvas INHERITED;
+    };
+
+    SkCanvas* NewCanvas(Encoder* encoder) { return new Canvas(encoder); }
+
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
+
+    class Decoder final : public Encoder {
+    public:
+        explicit Decoder(SkCanvas* canvas) : fCanvas(canvas) {}
+
+    private:
+        template <typename Map, typename T>
+        ID define(Type type, Map* map, const T& val) {
+            ID id(type, fNextID++);
+            map->set(id, val);
+            return id;
+        }
+
+    #define O override
+        ID define(const SkMatrix&   v)O{return this->define(Type::kMatrix,      &fMatrix,      v);}
+        ID define(const Misc&       v)O{return this->define(Type::kMisc,        &fMisc,        v);}
+        ID define(const SkPath&     v)O{return this->define(Type::kPath,        &fPath,        v);}
+        ID define(const Stroke&     v)O{return this->define(Type::kStroke,      &fStroke,      v);}
+        ID define(const SkTextBlob* v)O{return this->define(Type::kTextBlob,    &fTextBlob,    v);}
+        ID define(SkPathEffect*     v)O{return this->define(Type::kPathEffect,  &fPathEffect,  v);}
+        ID define(SkShader*         v)O{return this->define(Type::kShader,      &fShader,      v);}
+        ID define(SkXfermode*       v)O{return this->define(Type::kXfermode,    &fXfermode,    v);}
+        ID define(SkMaskFilter*     v)O{return this->define(Type::kMaskFilter,  &fMaskFilter,  v);}
+        ID define(SkColorFilter*    v)O{return this->define(Type::kColorFilter, &fColorFilter, v);}
+        ID define(SkRasterizer*     v)O{return this->define(Type::kRasterizer,  &fRasterizer,  v);}
+        ID define(SkDrawLooper*     v)O{return this->define(Type::kDrawLooper,  &fDrawLooper,  v);}
+        ID define(SkImageFilter*    v)O{return this->define(Type::kImageFilter, &fImageFilter, v);}
+        ID define(SkAnnotation*     v)O{return this->define(Type::kAnnotation,  &fAnnotation,  v);}
+    #undef O
+
+
+        void undefine(ID id) override {
+            switch(id.type()) {
+                case Type::kMatrix:      return fMatrix     .remove(id);
+                case Type::kMisc:        return fMisc       .remove(id);
+                case Type::kPath:        return fPath       .remove(id);
+                case Type::kStroke:      return fStroke     .remove(id);
+                case Type::kTextBlob:    return fTextBlob   .remove(id);
+                case Type::kPathEffect:  return fPathEffect .remove(id);
+                case Type::kShader:      return fShader     .remove(id);
+                case Type::kXfermode:    return fXfermode   .remove(id);
+                case Type::kMaskFilter:  return fMaskFilter .remove(id);
+                case Type::kColorFilter: return fColorFilter.remove(id);
+                case Type::kRasterizer:  return fRasterizer .remove(id);
+                case Type::kDrawLooper:  return fDrawLooper .remove(id);
+                case Type::kImageFilter: return fImageFilter.remove(id);
+                case Type::kAnnotation:  return fAnnotation .remove(id);
+            };
+        }
+
+        void applyCommon(const CommonIDs& common, SkPaint* paint) const {
+            fMisc.find(common.misc).applyTo(paint);
+            paint->setPathEffect (fPathEffect .find(common.patheffect));
+            paint->setShader     (fShader     .find(common.shader));
+            paint->setXfermode   (fXfermode   .find(common.xfermode));
+            paint->setMaskFilter (fMaskFilter .find(common.maskfilter));
+            paint->setColorFilter(fColorFilter.find(common.colorfilter));
+            paint->setRasterizer (fRasterizer .find(common.rasterizer));
+            paint->setLooper     (fDrawLooper .find(common.looper));
+            paint->setImageFilter(fImageFilter.find(common.imagefilter));
+            paint->setAnnotation (fAnnotation .find(common.annotation));
+        }
+
+        void    save() override { fCanvas->save(); }
+        void restore() override { fCanvas->restore(); }
+        void saveLayer(ID bounds, CommonIDs common, SkCanvas::SaveFlags flags) override {
+            SkPaint paint;
+            this->applyCommon(common, &paint);
+            SkRect rect;
+            fCanvas->saveLayer(fPath.find(bounds).isRect(&rect) ? &rect : nullptr, &paint, flags);
+        }
+
+        void setMatrix(ID matrix) override { fCanvas->setMatrix(fMatrix.find(matrix)); }
+
+        void clipPath(ID path, SkRegion::Op op, bool aa) override {
+            fCanvas->clipPath(fPath.find(path), op, aa);
+        }
+        void fillPath(ID path, CommonIDs common) override {
+            SkPaint paint;
+            paint.setStyle(SkPaint::kFill_Style);
+            this->applyCommon(common, &paint);
+            fCanvas->drawPath(fPath.find(path), paint);
+        }
+        void strokePath(ID path, CommonIDs common, ID stroke) override {
+            SkPaint paint;
+            paint.setStyle(SkPaint::kStroke_Style);
+            this->applyCommon(common, &paint);
+            fStroke.find(stroke).applyTo(&paint);
+            fCanvas->drawPath(fPath.find(path), paint);
+        }
+        void fillText(ID text, SkPoint offset, CommonIDs common) override {
+            SkPaint paint;
+            paint.setStyle(SkPaint::kFill_Style);
+            this->applyCommon(common, &paint);
+            fCanvas->drawTextBlob(fTextBlob.find(text), offset.x(), offset.y(), paint);
+        }
+        void strokeText(ID text, SkPoint offset, CommonIDs common, ID stroke) override {
+            SkPaint paint;
+            this->applyCommon(common, &paint);
+            fStroke.find(stroke).applyTo(&paint);
+            fCanvas->drawTextBlob(fTextBlob.find(text), offset.x(), offset.y(), paint);
+        }
+
+        // Maps ID -> T.
+        template <typename T, Type kType>
+        class IDMap {
+        public:
+            ~IDMap() {
+                // A well-behaved client always cleans up its definitions.
+                SkASSERT(fMap.count() == 0);
+            }
+
+            void set(const ID& id, const T& val) {
+                SkASSERT(id.type() == kType);
+                fMap.set(id, val);
+            }
+
+            void remove(const ID& id) {
+                SkASSERT(id.type() == kType);
+                fMap.remove(id);
+            }
+
+            const T& find(const ID& id) const {
+                SkASSERT(id.type() == kType);
+                T* val = fMap.find(id);
+                SkASSERT(val != nullptr);
+                return *val;
+            }
+
+        private:
+            SkTHashMap<ID, T> fMap;
+        };
+
+        // Maps ID -> T*, and keeps the T alive by reffing it.
+        template <typename T, Type kType>
+        class ReffedIDMap {
+        public:
+            ReffedIDMap() {}
+            ~ReffedIDMap() {
+                // A well-behaved client always cleans up its definitions.
+                SkASSERT(fMap.count() == 0);
+            }
+
+            void set(const ID& id, T* val) {
+                SkASSERT(id.type() == kType);
+                fMap.set(id, SkSafeRef(val));
+            }
+
+            void remove(const ID& id) {
+                SkASSERT(id.type() == kType);
+                T** val = fMap.find(id);
+                SkASSERT(val);
+                SkSafeUnref(*val);
+                fMap.remove(id);
+            }
+
+            T* find(const ID& id) const {
+                SkASSERT(id.type() == kType);
+                T** val = fMap.find(id);
+                SkASSERT(val);
+                return *val;
+            }
+
+        private:
+            SkTHashMap<ID, T*> fMap;
+        };
+
+
+              IDMap<SkMatrix        , Type::kMatrix     > fMatrix;
+              IDMap<Misc            , Type::kMisc       > fMisc;
+              IDMap<SkPath          , Type::kPath       > fPath;
+              IDMap<Stroke          , Type::kStroke     > fStroke;
+        ReffedIDMap<const SkTextBlob, Type::kTextBlob   > fTextBlob;
+        ReffedIDMap<SkPathEffect    , Type::kPathEffect > fPathEffect;
+        ReffedIDMap<SkShader        , Type::kShader     > fShader;
+        ReffedIDMap<SkXfermode      , Type::kXfermode   > fXfermode;
+        ReffedIDMap<SkMaskFilter    , Type::kMaskFilter > fMaskFilter;
+        ReffedIDMap<SkColorFilter   , Type::kColorFilter> fColorFilter;
+        ReffedIDMap<SkRasterizer    , Type::kRasterizer > fRasterizer;
+        ReffedIDMap<SkDrawLooper    , Type::kDrawLooper > fDrawLooper;
+        ReffedIDMap<SkImageFilter   , Type::kImageFilter> fImageFilter;
+        ReffedIDMap<SkAnnotation    , Type::kAnnotation > fAnnotation;
+
+        SkCanvas* fCanvas;
+        uint64_t fNextID = 0;
+    };
+
+    Encoder* NewDecoder(SkCanvas* canvas) { return new Decoder(canvas); }
+
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
+
+    class CachingEncoder final : public Encoder {
+    public:
+        explicit CachingEncoder(Encoder* wrapped) : fWrapped(wrapped) {}
+
+    private:
+        struct Undef {
+            Encoder* fEncoder;
+            template <typename T>
+            void operator()(const T&, ID* id) const { fEncoder->undefine(*id); }
+        };
+
+        ~CachingEncoder() override {
+            Undef undef{fWrapped};
+            fMatrix     .foreach(undef);
+            fMisc       .foreach(undef);
+            fPath       .foreach(undef);
+            fStroke     .foreach(undef);
+            fTextBlob   .foreach(undef);
+            fPathEffect .foreach(undef);
+            fShader     .foreach(undef);
+            fXfermode   .foreach(undef);
+            fMaskFilter .foreach(undef);
+            fColorFilter.foreach(undef);
+            fRasterizer .foreach(undef);
+            fDrawLooper .foreach(undef);
+            fImageFilter.foreach(undef);
+            fAnnotation .foreach(undef);
+        }
+
+        template <typename Map, typename T>
+        ID define(Map* map, const T& v) {
+            if (const ID* id = map->find(v)) {
+                return *id;
+            }
+            ID id = fWrapped->define(v);
+            map->set(v, id);
+            return id;
+        }
+
+        ID define(const SkMatrix&   v) override { return this->define(&fMatrix     , v); }
+        ID define(const Misc&       v) override { return this->define(&fMisc       , v); }
+        ID define(const SkPath&     v) override { return this->define(&fPath       , v); }
+        ID define(const Stroke&     v) override { return this->define(&fStroke     , v); }
+        ID define(const SkTextBlob* v) override { return this->define(&fTextBlob   , v); }
+        ID define(SkPathEffect*     v) override { return this->define(&fPathEffect , v); }
+        ID define(SkShader*         v) override { return this->define(&fShader     , v); }
+        ID define(SkXfermode*       v) override { return this->define(&fXfermode   , v); }
+        ID define(SkMaskFilter*     v) override { return this->define(&fMaskFilter , v); }
+        ID define(SkColorFilter*    v) override { return this->define(&fColorFilter, v); }
+        ID define(SkRasterizer*     v) override { return this->define(&fRasterizer , v); }
+        ID define(SkDrawLooper*     v) override { return this->define(&fDrawLooper , v); }
+        ID define(SkImageFilter*    v) override { return this->define(&fImageFilter, v); }
+        ID define(SkAnnotation*     v) override { return this->define(&fAnnotation , v); }
+
+        void undefine(ID) override {}
+
+        void    save() override { fWrapped->   save(); }
+        void restore() override { fWrapped->restore(); }
+        void saveLayer(ID bounds, CommonIDs common, SkCanvas::SaveFlags flags) override {
+            fWrapped->saveLayer(bounds, common, flags);
+        }
+
+        void setMatrix(ID matrix) override { fWrapped->setMatrix(matrix); }
+
+        void clipPath(ID path, SkRegion::Op op, bool aa) override {
+            fWrapped->clipPath(path, op, aa);
+        }
+        void fillPath(ID path, CommonIDs common) override {
+            fWrapped->fillPath(path, common);
+        }
+        void strokePath(ID path, CommonIDs common, ID stroke) override {
+            fWrapped->strokePath(path, common, stroke);
+        }
+        void fillText(ID text, SkPoint offset, CommonIDs common) override {
+            fWrapped->fillText(text, offset, common);
+        }
+        void strokeText(ID text, SkPoint offset, CommonIDs common, ID stroke) override {
+            fWrapped->strokeText(text, offset, common, stroke);
+        }
+
+        // Maps const T* -> ID, and refs the key.
+        template <typename T, Type kType>
+        class RefKeyMap {
+        public:
+            RefKeyMap() {}
+            ~RefKeyMap() { fMap.foreach([](const T* key, ID*) { SkSafeUnref(key); }); }
+
+            void set(const T* key, ID id) {
+                SkASSERT(id.type() == kType);
+                fMap.set(SkSafeRef(key), id);
+            }
+
+            void remove(const T* key) {
+                fMap.remove(key);
+                SkSafeUnref(key);
+            }
+
+            const ID* find(const T* key) const {
+                return fMap.find(key);
+            }
+
+            template <typename Fn>
+            void foreach(const Fn& fn) {
+                fMap.foreach(fn);
+            }
+        private:
+            SkTHashMap<const T*, ID> fMap;
+        };
+
+        SkTHashMap<SkMatrix, ID>                        fMatrix;
+        SkTHashMap<Misc, ID, MiscHash>                  fMisc;
+        SkTHashMap<SkPath, ID>                          fPath;
+        SkTHashMap<Stroke, ID>                          fStroke;
+        RefKeyMap<const SkTextBlob, Type::kTextBlob   > fTextBlob;
+        RefKeyMap<SkPathEffect    , Type::kPathEffect > fPathEffect;
+        RefKeyMap<SkShader        , Type::kShader     > fShader;
+        RefKeyMap<SkXfermode      , Type::kXfermode   > fXfermode;
+        RefKeyMap<SkMaskFilter    , Type::kMaskFilter > fMaskFilter;
+        RefKeyMap<SkColorFilter   , Type::kColorFilter> fColorFilter;
+        RefKeyMap<SkRasterizer    , Type::kRasterizer > fRasterizer;
+        RefKeyMap<SkDrawLooper    , Type::kDrawLooper > fDrawLooper;
+        RefKeyMap<SkImageFilter   , Type::kImageFilter> fImageFilter;
+        RefKeyMap<SkAnnotation    , Type::kAnnotation > fAnnotation;
+
+        Encoder* fWrapped;
+    };
+
+    Encoder* NewCachingEncoder(Encoder* wrapped) { return new CachingEncoder(wrapped); }
+
+} // namespace SkRemote
diff --git a/gfx/skia/skia/src/core/SkRemote.h b/gfx/skia/skia/src/core/SkRemote.h
new file mode 100644
index 000000000000..924e63e220c8
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkRemote.h
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkRemote_DEFINED
+#define SkRemote_DEFINED
+
+#include "SkPaint.h"
+#include "SkRegion.h"
+#include "SkRemote_protocol.h"
+#include "SkTypes.h"
+
+class SkCanvas;
+class SkMatrix;
+class SkPath;
+class SkShader;
+class SkTextBlob;
+class SkXfermode;
+
+// TODO: document
+
+namespace SkRemote {
+
+    // General purpose identifier.  Holds a Type and a 56-bit value.
+    class ID {
+    public:
+        ID() {}
+        ID(Type type, uint64_t val) {
+            fVal = (uint64_t)type << 56 | val;
+            SkASSERT(this->type() == type && this->val() == val);
+        }
+
+        Type    type() const { return (Type)(fVal >> 56); }
+        uint64_t val() const { return fVal & ~((uint64_t)0xFF << 56); }
+
+        bool operator==(ID o) const { return fVal == o.fVal; }
+
+    private:
+        uint64_t fVal;
+    };
+
+    // Fields from SkPaint used by stroke, fill, and text draws.
+    struct Misc {
+        SkColor         fColor;
+        SkFilterQuality fFilterQuality;
+        bool fAntiAlias, fDither;
+
+        static Misc CreateFrom(const SkPaint&);
+        void applyTo(SkPaint*) const;
+    };
+
+    // Fields from SkPaint used by stroke draws only.
+    struct Stroke {
+        SkScalar fWidth, fMiter;
+        SkPaint::Cap  fCap;
+        SkPaint::Join fJoin;
+
+        static Stroke CreateFrom(const SkPaint&);
+        void applyTo(SkPaint*) const;
+    };
+
+    // TODO: document
+    struct Encoder {
+        virtual ~Encoder() {}
+
+        virtual ID define(const SkMatrix&)   = 0;
+        virtual ID define(const Misc&)       = 0;
+        virtual ID define(const SkPath&)     = 0;
+        virtual ID define(const Stroke&)     = 0;
+        virtual ID define(const SkTextBlob*) = 0;
+        virtual ID define(SkPathEffect*)     = 0;
+        virtual ID define(SkShader*)         = 0;
+        virtual ID define(SkXfermode*)       = 0;
+        virtual ID define(SkMaskFilter*)     = 0;
+        virtual ID define(SkColorFilter*)    = 0;
+        virtual ID define(SkRasterizer*)     = 0;
+        virtual ID define(SkDrawLooper*)     = 0;
+        virtual ID define(SkImageFilter*)    = 0;
+        virtual ID define(SkAnnotation*)     = 0;
+
+        virtual void undefine(ID) = 0;
+
+        // TODO: do these all belong here in CommonIDs?
+        struct CommonIDs {
+            ID misc, patheffect, shader, xfermode, maskfilter,
+               colorfilter, rasterizer, looper, imagefilter, annotation;
+        };
+
+        virtual void    save() = 0;
+        virtual void restore() = 0;
+        virtual void saveLayer(ID bounds, CommonIDs, SkCanvas::SaveFlags) = 0;
+
+        virtual void setMatrix(ID matrix) = 0;
+
+        virtual void   clipPath(ID path, SkRegion::Op, bool aa)         = 0;
+        virtual void   fillPath(ID path, CommonIDs)                     = 0;
+        virtual void strokePath(ID path, CommonIDs, ID stroke)          = 0;
+        virtual void   fillText(ID text, SkPoint, CommonIDs)            = 0;
+        virtual void strokeText(ID text, SkPoint, CommonIDs, ID stroke) = 0;
+    };
+
+    // None of these factories take ownership of their arguments.
+
+    // Returns a new SkCanvas that translates to the Encoder API.
+    SkCanvas* NewCanvas(Encoder*);
+    // Returns an Encoder that translates back to the SkCanvas API.
+    Encoder* NewDecoder(SkCanvas*);
+    // Wraps another Encoder with a cache.  TODO: parameterize
+    Encoder* NewCachingEncoder(Encoder*);
+
+}  // namespace SkRemote
+
+#endif//SkRemote_DEFINED
diff --git a/gfx/skia/skia/src/core/SkRemote_protocol.h b/gfx/skia/skia/src/core/SkRemote_protocol.h
new file mode 100644
index 000000000000..19bdc33fdd68
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkRemote_protocol.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkRemote_protocol_DEFINED
+#define SkRemote_protocol_DEFINED
+
+// ATTENTION!  Changes to this file can break protocol compatibility.  Tread carefully.
+
+namespace SkRemote {
+
+    // It is safe to append to this enum without breaking protocol compatibility.
+    // Resorting, deleting, or inserting anywhere but the end will break compatibility.
+    enum class Type : uint8_t {
+        kMatrix,
+        kMisc,
+        kPath,
+        kStroke,
+        kTextBlob,
+        kPathEffect,
+        kShader,
+        kXfermode,
+        kMaskFilter,
+        kColorFilter,
+        kRasterizer,
+        kDrawLooper,
+        kImageFilter,
+        kAnnotation,
+    };
+
+}  // namespace SkRemote
+
+#endif//SkRemote_protocol_DEFINED
diff --git a/gfx/skia/skia/src/core/SkResourceCache.cpp b/gfx/skia/skia/src/core/SkResourceCache.cpp
new file mode 100644
index 000000000000..6d8e1662d964
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkResourceCache.cpp
@@ -0,0 +1,709 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkChecksum.h"
+#include "SkMessageBus.h"
+#include "SkMipMap.h"
+#include "SkMutex.h"
+#include "SkPixelRef.h"
+#include "SkResourceCache.h"
+#include "SkTraceMemoryDump.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+
+DECLARE_SKMESSAGEBUS_MESSAGE(SkResourceCache::PurgeSharedIDMessage)
+
+// This can be defined by the caller's build system
+//#define SK_USE_DISCARDABLE_SCALEDIMAGECACHE
+
+#ifndef SK_DISCARDABLEMEMORY_SCALEDIMAGECACHE_COUNT_LIMIT
+#   define SK_DISCARDABLEMEMORY_SCALEDIMAGECACHE_COUNT_LIMIT   1024
+#endif
+
+#ifndef SK_DEFAULT_IMAGE_CACHE_LIMIT
+    #define SK_DEFAULT_IMAGE_CACHE_LIMIT     (32 * 1024 * 1024)
+#endif
+
+void SkResourceCache::Key::init(void* nameSpace, uint64_t sharedID, size_t length) {
+    SkASSERT(SkAlign4(length) == length);
+
+    // fCount32 and fHash are not hashed
+    static const int kUnhashedLocal32s = 2; // fCache32 + fHash
+    static const int kSharedIDLocal32s = 2; // fSharedID_lo + fSharedID_hi
+    static const int kHashedLocal32s = kSharedIDLocal32s + (sizeof(fNamespace) >> 2);
+    static const int kLocal32s = kUnhashedLocal32s + kHashedLocal32s;
+
+    static_assert(sizeof(Key) == (kLocal32s << 2), "unaccounted_key_locals");
+    static_assert(sizeof(Key) == offsetof(Key, fNamespace) + sizeof(fNamespace),
+                 "namespace_field_must_be_last");
+
+    fCount32 = SkToS32(kLocal32s + (length >> 2));
+    fSharedID_lo = (uint32_t)sharedID;
+    fSharedID_hi = (uint32_t)(sharedID >> 32);
+    fNamespace = nameSpace;
+    // skip unhashed fields when computing the murmur
+    fHash = SkChecksum::Murmur3(this->as32() + kUnhashedLocal32s,
+                                (fCount32 - kUnhashedLocal32s) << 2);
+}
+
+#include "SkTDynamicHash.h"
+
+class SkResourceCache::Hash :
+    public SkTDynamicHash<SkResourceCache::Rec, SkResourceCache::Key> {};
+
+
+///////////////////////////////////////////////////////////////////////////////
+
+void SkResourceCache::init() {
+    fHead = nullptr;
+    fTail = nullptr;
+    fHash = new Hash;
+    fTotalBytesUsed = 0;
+    fCount = 0;
+    fSingleAllocationByteLimit = 0;
+    fAllocator = nullptr;
+
+    // One of these should be explicit set by the caller after we return.
+    fTotalByteLimit = 0;
+    fDiscardableFactory = nullptr;
+}
+
+#include "SkDiscardableMemory.h"
+
+class SkOneShotDiscardablePixelRef : public SkPixelRef {
+public:
+
+    // Ownership of the discardablememory is transfered to the pixelref
+    // The pixelref will ref() the colortable (if not NULL), and unref() in destructor
+    SkOneShotDiscardablePixelRef(const SkImageInfo&, SkDiscardableMemory*, size_t rowBytes,
+                                 SkColorTable*);
+    ~SkOneShotDiscardablePixelRef();
+
+protected:
+    bool onNewLockPixels(LockRec*) override;
+    void onUnlockPixels() override;
+    size_t getAllocatedSizeInBytes() const override;
+
+    SkDiscardableMemory* diagnostic_only_getDiscardable() const override { return fDM; }
+
+private:
+    SkDiscardableMemory* fDM;
+    size_t               fRB;
+    bool                 fFirstTime;
+    SkColorTable*        fCTable;
+
+    typedef SkPixelRef INHERITED;
+};
+
+SkOneShotDiscardablePixelRef::SkOneShotDiscardablePixelRef(const SkImageInfo& info,
+                                             SkDiscardableMemory* dm,
+                                             size_t rowBytes,
+                                             SkColorTable* ctable)
+    : INHERITED(info)
+    , fDM(dm)
+    , fRB(rowBytes)
+    , fCTable(ctable)
+{
+    SkASSERT(dm->data());
+    fFirstTime = true;
+    SkSafeRef(ctable);
+}
+
+SkOneShotDiscardablePixelRef::~SkOneShotDiscardablePixelRef() {
+    delete fDM;
+    SkSafeUnref(fCTable);
+}
+
+bool SkOneShotDiscardablePixelRef::onNewLockPixels(LockRec* rec) {
+    if (fFirstTime) {
+        // we're already locked
+        SkASSERT(fDM->data());
+        fFirstTime = false;
+        goto SUCCESS;
+    }
+
+    // A previous call to onUnlock may have deleted our DM, so check for that
+    if (nullptr == fDM) {
+        return false;
+    }
+
+    if (!fDM->lock()) {
+        // since it failed, we delete it now, to free-up the resource
+        delete fDM;
+        fDM = nullptr;
+        return false;
+    }
+
+SUCCESS:
+    rec->fPixels = fDM->data();
+    rec->fColorTable = fCTable;
+    rec->fRowBytes = fRB;
+    return true;
+}
+
+void SkOneShotDiscardablePixelRef::onUnlockPixels() {
+    SkASSERT(!fFirstTime);
+    fDM->unlock();
+}
+
+size_t SkOneShotDiscardablePixelRef::getAllocatedSizeInBytes() const {
+    return this->info().getSafeSize(fRB);
+}
+
+class SkResourceCacheDiscardableAllocator : public SkBitmap::Allocator {
+public:
+    SkResourceCacheDiscardableAllocator(SkResourceCache::DiscardableFactory factory) {
+        SkASSERT(factory);
+        fFactory = factory;
+    }
+
+    bool allocPixelRef(SkBitmap*, SkColorTable*) override;
+
+private:
+    SkResourceCache::DiscardableFactory fFactory;
+};
+
+bool SkResourceCacheDiscardableAllocator::allocPixelRef(SkBitmap* bitmap, SkColorTable* ctable) {
+    size_t size = bitmap->getSize();
+    uint64_t size64 = bitmap->computeSize64();
+    if (0 == size || size64 > (uint64_t)size) {
+        return false;
+    }
+
+    if (kIndex_8_SkColorType == bitmap->colorType()) {
+        if (!ctable) {
+            return false;
+        }
+    } else {
+        ctable = nullptr;
+    }
+
+    SkDiscardableMemory* dm = fFactory(size);
+    if (nullptr == dm) {
+        return false;
+    }
+
+    SkImageInfo info = bitmap->info();
+    bitmap->setPixelRef(new SkOneShotDiscardablePixelRef(info, dm, bitmap->rowBytes(),
+                                                         ctable))->unref();
+    bitmap->lockPixels();
+    return bitmap->readyToDraw();
+}
+
+SkResourceCache::SkResourceCache(DiscardableFactory factory) {
+    this->init();
+    fDiscardableFactory = factory;
+
+    fAllocator = new SkResourceCacheDiscardableAllocator(factory);
+}
+
+SkResourceCache::SkResourceCache(size_t byteLimit) {
+    this->init();
+    fTotalByteLimit = byteLimit;
+}
+
+SkResourceCache::~SkResourceCache() {
+    SkSafeUnref(fAllocator);
+
+    Rec* rec = fHead;
+    while (rec) {
+        Rec* next = rec->fNext;
+        delete rec;
+        rec = next;
+    }
+    delete fHash;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+bool SkResourceCache::find(const Key& key, FindVisitor visitor, void* context) {
+    this->checkMessages();
+
+    Rec* rec = fHash->find(key);
+    if (rec) {
+        if (visitor(*rec, context)) {
+            this->moveToHead(rec);  // for our LRU
+            return true;
+        } else {
+            this->remove(rec);  // stale
+            return false;
+        }
+    }
+    return false;
+}
+
+static void make_size_str(size_t size, SkString* str) {
+    const char suffix[] = { 'b', 'k', 'm', 'g', 't', 0 };
+    int i = 0;
+    while (suffix[i] && (size > 1024)) {
+        i += 1;
+        size >>= 10;
+    }
+    str->printf("%zu%c", size, suffix[i]);
+}
+
+static bool gDumpCacheTransactions;
+
+void SkResourceCache::add(Rec* rec) {
+    this->checkMessages();
+
+    SkASSERT(rec);
+    // See if we already have this key (racy inserts, etc.)
+    Rec* existing = fHash->find(rec->getKey());
+    if (existing) {
+        delete rec;
+        return;
+    }
+
+    this->addToHead(rec);
+    fHash->add(rec);
+
+    if (gDumpCacheTransactions) {
+        SkString bytesStr, totalStr;
+        make_size_str(rec->bytesUsed(), &bytesStr);
+        make_size_str(fTotalBytesUsed, &totalStr);
+        SkDebugf("RC:    add %5s %12p key %08x -- total %5s, count %d\n",
+                 bytesStr.c_str(), rec, rec->getHash(), totalStr.c_str(), fCount);
+    }
+
+    // since the new rec may push us over-budget, we perform a purge check now
+    this->purgeAsNeeded();
+}
+
+void SkResourceCache::remove(Rec* rec) {
+    size_t used = rec->bytesUsed();
+    SkASSERT(used <= fTotalBytesUsed);
+
+    this->detach(rec);
+    fHash->remove(rec->getKey());
+
+    fTotalBytesUsed -= used;
+    fCount -= 1;
+
+    if (gDumpCacheTransactions) {
+        SkString bytesStr, totalStr;
+        make_size_str(used, &bytesStr);
+        make_size_str(fTotalBytesUsed, &totalStr);
+        SkDebugf("RC: remove %5s %12p key %08x -- total %5s, count %d\n",
+                 bytesStr.c_str(), rec, rec->getHash(), totalStr.c_str(), fCount);
+    }
+
+    delete rec;
+}
+
+void SkResourceCache::purgeAsNeeded(bool forcePurge) {
+    size_t byteLimit;
+    int    countLimit;
+
+    if (fDiscardableFactory) {
+        countLimit = SK_DISCARDABLEMEMORY_SCALEDIMAGECACHE_COUNT_LIMIT;
+        byteLimit = SK_MaxU32;  // no limit based on bytes
+    } else {
+        countLimit = SK_MaxS32; // no limit based on count
+        byteLimit = fTotalByteLimit;
+    }
+
+    Rec* rec = fTail;
+    while (rec) {
+        if (!forcePurge && fTotalBytesUsed < byteLimit && fCount < countLimit) {
+            break;
+        }
+
+        Rec* prev = rec->fPrev;
+        this->remove(rec);
+        rec = prev;
+    }
+}
+
+//#define SK_TRACK_PURGE_SHAREDID_HITRATE
+
+#ifdef SK_TRACK_PURGE_SHAREDID_HITRATE
+static int gPurgeCallCounter;
+static int gPurgeHitCounter;
+#endif
+
+void SkResourceCache::purgeSharedID(uint64_t sharedID) {
+    if (0 == sharedID) {
+        return;
+    }
+
+#ifdef SK_TRACK_PURGE_SHAREDID_HITRATE
+    gPurgeCallCounter += 1;
+    bool found = false;
+#endif
+    // go backwards, just like purgeAsNeeded, just to make the code similar.
+    // could iterate either direction and still be correct.
+    Rec* rec = fTail;
+    while (rec) {
+        Rec* prev = rec->fPrev;
+        if (rec->getKey().getSharedID() == sharedID) {
+//            SkDebugf("purgeSharedID id=%llx rec=%p\n", sharedID, rec);
+            this->remove(rec);
+#ifdef SK_TRACK_PURGE_SHAREDID_HITRATE
+            found = true;
+#endif
+        }
+        rec = prev;
+    }
+
+#ifdef SK_TRACK_PURGE_SHAREDID_HITRATE
+    if (found) {
+        gPurgeHitCounter += 1;
+    }
+
+    SkDebugf("PurgeShared calls=%d hits=%d rate=%g\n", gPurgeCallCounter, gPurgeHitCounter,
+             gPurgeHitCounter * 100.0 / gPurgeCallCounter);
+#endif
+}
+
+void SkResourceCache::visitAll(Visitor visitor, void* context) {
+    // go backwards, just like purgeAsNeeded, just to make the code similar.
+    // could iterate either direction and still be correct.
+    Rec* rec = fTail;
+    while (rec) {
+        visitor(*rec, context);
+        rec = rec->fPrev;
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+size_t SkResourceCache::setTotalByteLimit(size_t newLimit) {
+    size_t prevLimit = fTotalByteLimit;
+    fTotalByteLimit = newLimit;
+    if (newLimit < prevLimit) {
+        this->purgeAsNeeded();
+    }
+    return prevLimit;
+}
+
+SkCachedData* SkResourceCache::newCachedData(size_t bytes) {
+    this->checkMessages();
+
+    if (fDiscardableFactory) {
+        SkDiscardableMemory* dm = fDiscardableFactory(bytes);
+        return dm ? new SkCachedData(bytes, dm) : nullptr;
+    } else {
+        return new SkCachedData(sk_malloc_throw(bytes), bytes);
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+void SkResourceCache::detach(Rec* rec) {
+    Rec* prev = rec->fPrev;
+    Rec* next = rec->fNext;
+
+    if (!prev) {
+        SkASSERT(fHead == rec);
+        fHead = next;
+    } else {
+        prev->fNext = next;
+    }
+
+    if (!next) {
+        fTail = prev;
+    } else {
+        next->fPrev = prev;
+    }
+
+    rec->fNext = rec->fPrev = nullptr;
+}
+
+void SkResourceCache::moveToHead(Rec* rec) {
+    if (fHead == rec) {
+        return;
+    }
+
+    SkASSERT(fHead);
+    SkASSERT(fTail);
+
+    this->validate();
+
+    this->detach(rec);
+
+    fHead->fPrev = rec;
+    rec->fNext = fHead;
+    fHead = rec;
+
+    this->validate();
+}
+
+void SkResourceCache::addToHead(Rec* rec) {
+    this->validate();
+
+    rec->fPrev = nullptr;
+    rec->fNext = fHead;
+    if (fHead) {
+        fHead->fPrev = rec;
+    }
+    fHead = rec;
+    if (!fTail) {
+        fTail = rec;
+    }
+    fTotalBytesUsed += rec->bytesUsed();
+    fCount += 1;
+
+    this->validate();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+#ifdef SK_DEBUG
+void SkResourceCache::validate() const {
+    if (nullptr == fHead) {
+        SkASSERT(nullptr == fTail);
+        SkASSERT(0 == fTotalBytesUsed);
+        return;
+    }
+
+    if (fHead == fTail) {
+        SkASSERT(nullptr == fHead->fPrev);
+        SkASSERT(nullptr == fHead->fNext);
+        SkASSERT(fHead->bytesUsed() == fTotalBytesUsed);
+        return;
+    }
+
+    SkASSERT(nullptr == fHead->fPrev);
+    SkASSERT(fHead->fNext);
+    SkASSERT(nullptr == fTail->fNext);
+    SkASSERT(fTail->fPrev);
+
+    size_t used = 0;
+    int count = 0;
+    const Rec* rec = fHead;
+    while (rec) {
+        count += 1;
+        used += rec->bytesUsed();
+        SkASSERT(used <= fTotalBytesUsed);
+        rec = rec->fNext;
+    }
+    SkASSERT(fCount == count);
+
+    rec = fTail;
+    while (rec) {
+        SkASSERT(count > 0);
+        count -= 1;
+        SkASSERT(used >= rec->bytesUsed());
+        used -= rec->bytesUsed();
+        rec = rec->fPrev;
+    }
+
+    SkASSERT(0 == count);
+    SkASSERT(0 == used);
+}
+#endif
+
+void SkResourceCache::dump() const {
+    this->validate();
+
+    SkDebugf("SkResourceCache: count=%d bytes=%d %s\n",
+             fCount, fTotalBytesUsed, fDiscardableFactory ? "discardable" : "malloc");
+}
+
+size_t SkResourceCache::setSingleAllocationByteLimit(size_t newLimit) {
+    size_t oldLimit = fSingleAllocationByteLimit;
+    fSingleAllocationByteLimit = newLimit;
+    return oldLimit;
+}
+
+size_t SkResourceCache::getSingleAllocationByteLimit() const {
+    return fSingleAllocationByteLimit;
+}
+
+size_t SkResourceCache::getEffectiveSingleAllocationByteLimit() const {
+    // fSingleAllocationByteLimit == 0 means the caller is asking for our default
+    size_t limit = fSingleAllocationByteLimit;
+
+    // if we're not discardable (i.e. we are fixed-budget) then cap the single-limit
+    // to our budget.
+    if (nullptr == fDiscardableFactory) {
+        if (0 == limit) {
+            limit = fTotalByteLimit;
+        } else {
+            limit = SkTMin(limit, fTotalByteLimit);
+        }
+    }
+    return limit;
+}
+
+void SkResourceCache::checkMessages() {
+    SkTArray<PurgeSharedIDMessage> msgs;
+    fPurgeSharedIDInbox.poll(&msgs);
+    for (int i = 0; i < msgs.count(); ++i) {
+        this->purgeSharedID(msgs[i].fSharedID);
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+SK_DECLARE_STATIC_MUTEX(gMutex);
+static SkResourceCache* gResourceCache = nullptr;
+static void cleanup_gResourceCache() {
+    // We'll clean this up in our own tests, but disable for clients.
+    // Chrome seems to have funky multi-process things going on in unit tests that
+    // makes this unsafe to delete when the main process atexit()s.
+    // SkLazyPtr does the same sort of thing.
+#if SK_DEVELOPER
+    delete gResourceCache;
+#endif
+}
+
+/** Must hold gMutex when calling. */
+static SkResourceCache* get_cache() {
+    // gMutex is always held when this is called, so we don't need to be fancy in here.
+    gMutex.assertHeld();
+    if (nullptr == gResourceCache) {
+#ifdef SK_USE_DISCARDABLE_SCALEDIMAGECACHE
+        gResourceCache = new SkResourceCache(SkDiscardableMemory::Create);
+#else
+        gResourceCache = new SkResourceCache(SK_DEFAULT_IMAGE_CACHE_LIMIT);
+#endif
+        atexit(cleanup_gResourceCache);
+    }
+    return gResourceCache;
+}
+
+size_t SkResourceCache::GetTotalBytesUsed() {
+    SkAutoMutexAcquire am(gMutex);
+    return get_cache()->getTotalBytesUsed();
+}
+
+size_t SkResourceCache::GetTotalByteLimit() {
+    SkAutoMutexAcquire am(gMutex);
+    return get_cache()->getTotalByteLimit();
+}
+
+size_t SkResourceCache::SetTotalByteLimit(size_t newLimit) {
+    SkAutoMutexAcquire am(gMutex);
+    return get_cache()->setTotalByteLimit(newLimit);
+}
+
+SkResourceCache::DiscardableFactory SkResourceCache::GetDiscardableFactory() {
+    SkAutoMutexAcquire am(gMutex);
+    return get_cache()->discardableFactory();
+}
+
+SkBitmap::Allocator* SkResourceCache::GetAllocator() {
+    SkAutoMutexAcquire am(gMutex);
+    return get_cache()->allocator();
+}
+
+SkCachedData* SkResourceCache::NewCachedData(size_t bytes) {
+    SkAutoMutexAcquire am(gMutex);
+    return get_cache()->newCachedData(bytes);
+}
+
+void SkResourceCache::Dump() {
+    SkAutoMutexAcquire am(gMutex);
+    get_cache()->dump();
+}
+
+size_t SkResourceCache::SetSingleAllocationByteLimit(size_t size) {
+    SkAutoMutexAcquire am(gMutex);
+    return get_cache()->setSingleAllocationByteLimit(size);
+}
+
+size_t SkResourceCache::GetSingleAllocationByteLimit() {
+    SkAutoMutexAcquire am(gMutex);
+    return get_cache()->getSingleAllocationByteLimit();
+}
+
+size_t SkResourceCache::GetEffectiveSingleAllocationByteLimit() {
+    SkAutoMutexAcquire am(gMutex);
+    return get_cache()->getEffectiveSingleAllocationByteLimit();
+}
+
+void SkResourceCache::PurgeAll() {
+    SkAutoMutexAcquire am(gMutex);
+    return get_cache()->purgeAll();
+}
+
+bool SkResourceCache::Find(const Key& key, FindVisitor visitor, void* context) {
+    SkAutoMutexAcquire am(gMutex);
+    return get_cache()->find(key, visitor, context);
+}
+
+void SkResourceCache::Add(Rec* rec) {
+    SkAutoMutexAcquire am(gMutex);
+    get_cache()->add(rec);
+}
+
+void SkResourceCache::VisitAll(Visitor visitor, void* context) {
+    SkAutoMutexAcquire am(gMutex);
+    get_cache()->visitAll(visitor, context);
+}
+
+void SkResourceCache::PostPurgeSharedID(uint64_t sharedID) {
+    if (sharedID) {
+        SkMessageBus<PurgeSharedIDMessage>::Post(PurgeSharedIDMessage(sharedID));
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+#include "SkGraphics.h"
+#include "SkImageFilter.h"
+
+size_t SkGraphics::GetResourceCacheTotalBytesUsed() {
+    return SkResourceCache::GetTotalBytesUsed();
+}
+
+size_t SkGraphics::GetResourceCacheTotalByteLimit() {
+    return SkResourceCache::GetTotalByteLimit();
+}
+
+size_t SkGraphics::SetResourceCacheTotalByteLimit(size_t newLimit) {
+    return SkResourceCache::SetTotalByteLimit(newLimit);
+}
+
+size_t SkGraphics::GetResourceCacheSingleAllocationByteLimit() {
+    return SkResourceCache::GetSingleAllocationByteLimit();
+}
+
+size_t SkGraphics::SetResourceCacheSingleAllocationByteLimit(size_t newLimit) {
+    return SkResourceCache::SetSingleAllocationByteLimit(newLimit);
+}
+
+void SkGraphics::PurgeResourceCache() {
+    SkImageFilter::PurgeCache();
+    return SkResourceCache::PurgeAll();
+}
+
+/////////////
+
+static void dump_visitor(const SkResourceCache::Rec& rec, void*) {
+    SkDebugf("RC: %12s bytes %9lu  discardable %p\n",
+             rec.getCategory(), rec.bytesUsed(), rec.diagnostic_only_getDiscardable());
+}
+
+void SkResourceCache::TestDumpMemoryStatistics() {
+    VisitAll(dump_visitor, nullptr);
+}
+
+static void sk_trace_dump_visitor(const SkResourceCache::Rec& rec, void* context) {
+    SkTraceMemoryDump* dump = static_cast<SkTraceMemoryDump*>(context);
+    SkString dumpName = SkStringPrintf("skia/sk_resource_cache/%s_%p", rec.getCategory(), &rec);
+    SkDiscardableMemory* discardable = rec.diagnostic_only_getDiscardable();
+    if (discardable) {
+        dump->setDiscardableMemoryBacking(dumpName.c_str(), *discardable);
+
+        // The discardable memory size will be calculated by dumper, but we also dump what we think
+        // the size of object in memory is irrespective of whether object is live or dead.
+        dump->dumpNumericValue(dumpName.c_str(), "discardable_size", "bytes", rec.bytesUsed());
+    } else {
+        dump->dumpNumericValue(dumpName.c_str(), "size", "bytes", rec.bytesUsed());
+        dump->setMemoryBacking(dumpName.c_str(), "malloc", nullptr);
+    }
+}
+
+void SkResourceCache::DumpMemoryStatistics(SkTraceMemoryDump* dump) {
+    // Since resource could be backed by malloc or discardable, the cache always dumps detailed
+    // stats to be accurate.
+    VisitAll(sk_trace_dump_visitor, dump);
+}
diff --git a/gfx/skia/skia/src/core/SkResourceCache.h b/gfx/skia/skia/src/core/SkResourceCache.h
new file mode 100644
index 000000000000..a748133c964d
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkResourceCache.h
@@ -0,0 +1,286 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkResourceCache_DEFINED
+#define SkResourceCache_DEFINED
+
+#include "SkBitmap.h"
+#include "SkMessageBus.h"
+#include "SkTDArray.h"
+
+class SkCachedData;
+class SkDiscardableMemory;
+class SkTraceMemoryDump;
+
+/**
+ *  Cache object for bitmaps (with possible scale in X Y as part of the key).
+ *
+ *  Multiple caches can be instantiated, but each instance is not implicitly
+ *  thread-safe, so if a given instance is to be shared across threads, the
+ *  caller must manage the access itself (e.g. via a mutex).
+ *
+ *  As a convenience, a global instance is also defined, which can be safely
+ *  access across threads via the static methods (e.g. FindAndLock, etc.).
+ */
+class SkResourceCache {
+public:
+    struct Key {
+        // Call this to access your private contents. Must not use the address after calling init()
+        void* writableContents() { return this + 1; }
+
+        // must call this after your private data has been written.
+        // nameSpace must be unique per Key subclass.
+        // sharedID == 0 means ignore this field : does not support group purging.
+        // length must be a multiple of 4
+        void init(void* nameSpace, uint64_t sharedID, size_t length);
+
+        void* getNamespace() const { return fNamespace; }
+        uint64_t getSharedID() const { return ((uint64_t)fSharedID_hi << 32) | fSharedID_lo; }
+
+        // This is only valid after having called init().
+        uint32_t hash() const { return fHash; }
+
+        bool operator==(const Key& other) const {
+            const uint32_t* a = this->as32();
+            const uint32_t* b = other.as32();
+            for (int i = 0; i < fCount32; ++i) {  // (This checks fCount == other.fCount first.)
+                if (a[i] != b[i]) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+    private:
+        int32_t  fCount32;   // local + user contents count32
+        uint32_t fHash;
+        // split uint64_t into hi and lo so we don't force ourselves to pad on 32bit machines.
+        uint32_t fSharedID_lo;
+        uint32_t fSharedID_hi;
+        void*    fNamespace; // A unique namespace tag. This is hashed.
+        /* uint32_t fContents32[] */
+
+        const uint32_t* as32() const { return (const uint32_t*)this; }
+    };
+
+    struct Rec {
+        typedef SkResourceCache::Key Key;
+
+        Rec() {}
+        virtual ~Rec() {}
+
+        uint32_t getHash() const { return this->getKey().hash(); }
+
+        virtual const Key& getKey() const = 0;
+        virtual size_t bytesUsed() const = 0;
+
+        // for memory usage diagnostics
+        virtual const char* getCategory() const = 0;
+        virtual SkDiscardableMemory* diagnostic_only_getDiscardable() const { return nullptr; }
+
+        // for SkTDynamicHash::Traits
+        static uint32_t Hash(const Key& key) { return key.hash(); }
+        static const Key& GetKey(const Rec& rec) { return rec.getKey(); }
+
+    private:
+        Rec*    fNext;
+        Rec*    fPrev;
+
+        friend class SkResourceCache;
+    };
+
+    // Used with SkMessageBus
+    struct PurgeSharedIDMessage {
+        PurgeSharedIDMessage(uint64_t sharedID) : fSharedID(sharedID) {}
+
+        uint64_t    fSharedID;
+    };
+
+    typedef const Rec* ID;
+
+    /**
+     *  Callback function for find(). If called, the cache will have found a match for the
+     *  specified Key, and will pass in the corresponding Rec, along with a caller-specified
+     *  context. The function can read the data in Rec, and copy whatever it likes into context
+     *  (casting context to whatever it really is).
+     *
+     *  The return value determines what the cache will do with the Rec. If the function returns
+     *  true, then the Rec is considered "valid". If false is returned, the Rec will be considered
+     *  "stale" and will be purged from the cache.
+     */
+    typedef bool (*FindVisitor)(const Rec&, void* context);
+
+    /**
+     *  Returns a locked/pinned SkDiscardableMemory instance for the specified
+     *  number of bytes, or nullptr on failure.
+     */
+    typedef SkDiscardableMemory* (*DiscardableFactory)(size_t bytes);
+
+    /*
+     *  The following static methods are thread-safe wrappers around a global
+     *  instance of this cache.
+     */
+
+    /**
+     *  Returns true if the visitor was called on a matching Key, and the visitor returned true.
+     *
+     *  Find() will search the cache for the specified Key. If no match is found, return false and
+     *  do not call the FindVisitor. If a match is found, return whatever the visitor returns.
+     *  Its return value is interpreted to mean:
+     *      true  : Rec is valid
+     *      false : Rec is "stale" -- the cache will purge it.
+     */
+    static bool Find(const Key& key, FindVisitor, void* context);
+    static void Add(Rec*);
+
+    typedef void (*Visitor)(const Rec&, void* context);
+    // Call the visitor for every Rec in the cache.
+    static void VisitAll(Visitor, void* context);
+
+    static size_t GetTotalBytesUsed();
+    static size_t GetTotalByteLimit();
+    static size_t SetTotalByteLimit(size_t newLimit);
+
+    static size_t SetSingleAllocationByteLimit(size_t);
+    static size_t GetSingleAllocationByteLimit();
+    static size_t GetEffectiveSingleAllocationByteLimit();
+
+    static void PurgeAll();
+
+    static void TestDumpMemoryStatistics();
+
+    /** Dump memory usage statistics of every Rec in the cache using the
+        SkTraceMemoryDump interface.
+     */
+    static void DumpMemoryStatistics(SkTraceMemoryDump* dump);
+
+    /**
+     *  Returns the DiscardableFactory used by the global cache, or nullptr.
+     */
+    static DiscardableFactory GetDiscardableFactory();
+
+    /**
+     * Use this allocator for bitmaps, so they can use ashmem when available.
+     * Returns nullptr if the ResourceCache has not been initialized with a DiscardableFactory.
+     */
+    static SkBitmap::Allocator* GetAllocator();
+
+    static SkCachedData* NewCachedData(size_t bytes);
+
+    static void PostPurgeSharedID(uint64_t sharedID);
+
+    /**
+     *  Call SkDebugf() with diagnostic information about the state of the cache
+     */
+    static void Dump();
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    /**
+     *  Construct the cache to call DiscardableFactory when it
+     *  allocates memory for the pixels. In this mode, the cache has
+     *  not explicit budget, and so methods like getTotalBytesUsed()
+     *  and getTotalByteLimit() will return 0, and setTotalByteLimit
+     *  will ignore its argument and return 0.
+     */
+    SkResourceCache(DiscardableFactory);
+
+    /**
+     *  Construct the cache, allocating memory with malloc, and respect the
+     *  byteLimit, purging automatically when a new image is added to the cache
+     *  that pushes the total bytesUsed over the limit. Note: The limit can be
+     *  changed at runtime with setTotalByteLimit.
+     */
+    explicit SkResourceCache(size_t byteLimit);
+    ~SkResourceCache();
+
+    /**
+     *  Returns true if the visitor was called on a matching Key, and the visitor returned true.
+     *
+     *  find() will search the cache for the specified Key. If no match is found, return false and
+     *  do not call the FindVisitor. If a match is found, return whatever the visitor returns.
+     *  Its return value is interpreted to mean:
+     *      true  : Rec is valid
+     *      false : Rec is "stale" -- the cache will purge it.
+     */
+    bool find(const Key&, FindVisitor, void* context);
+    void add(Rec*);
+    void visitAll(Visitor, void* context);
+
+    size_t getTotalBytesUsed() const { return fTotalBytesUsed; }
+    size_t getTotalByteLimit() const { return fTotalByteLimit; }
+
+    /**
+     *  This is respected by SkBitmapProcState::possiblyScaleImage.
+     *  0 is no maximum at all; this is the default.
+     *  setSingleAllocationByteLimit() returns the previous value.
+     */
+    size_t setSingleAllocationByteLimit(size_t maximumAllocationSize);
+    size_t getSingleAllocationByteLimit() const;
+    // returns the logical single allocation size (pinning against the budget when the cache
+    // is not backed by discardable memory.
+    size_t getEffectiveSingleAllocationByteLimit() const;
+
+    /**
+     *  Set the maximum number of bytes available to this cache. If the current
+     *  cache exceeds this new value, it will be purged to try to fit within
+     *  this new limit.
+     */
+    size_t setTotalByteLimit(size_t newLimit);
+
+    void purgeSharedID(uint64_t sharedID);
+
+    void purgeAll() {
+        this->purgeAsNeeded(true);
+    }
+
+    DiscardableFactory discardableFactory() const { return fDiscardableFactory; }
+    SkBitmap::Allocator* allocator() const { return fAllocator; };
+
+    SkCachedData* newCachedData(size_t bytes);
+
+    /**
+     *  Call SkDebugf() with diagnostic information about the state of the cache
+     */
+    void dump() const;
+
+private:
+    Rec*    fHead;
+    Rec*    fTail;
+
+    class Hash;
+    Hash*   fHash;
+
+    DiscardableFactory  fDiscardableFactory;
+    // the allocator is nullptr or one that matches discardables
+    SkBitmap::Allocator* fAllocator;
+
+    size_t  fTotalBytesUsed;
+    size_t  fTotalByteLimit;
+    size_t  fSingleAllocationByteLimit;
+    int     fCount;
+
+    SkMessageBus<PurgeSharedIDMessage>::Inbox fPurgeSharedIDInbox;
+
+    void checkMessages();
+    void purgeAsNeeded(bool forcePurge = false);
+
+    // linklist management
+    void moveToHead(Rec*);
+    void addToHead(Rec*);
+    void detach(Rec*);
+    void remove(Rec*);
+
+    void init();    // called by constructors
+
+#ifdef SK_DEBUG
+    void validate() const;
+#else
+    void validate() const {}
+#endif
+};
+#endif
diff --git a/gfx/skia/skia/src/core/SkScalar.cpp b/gfx/skia/skia/src/core/SkScalar.cpp
index c48d3890ad8a..7cb0a8b148a9 100644
--- a/gfx/skia/skia/src/core/SkScalar.cpp
+++ b/gfx/skia/skia/src/core/SkScalar.cpp
@@ -13,8 +13,8 @@
 SkScalar SkScalarInterpFunc(SkScalar searchKey, const SkScalar keys[],
                             const SkScalar values[], int length) {
     SkASSERT(length > 0);
-    SkASSERT(keys != NULL);
-    SkASSERT(values != NULL);
+    SkASSERT(keys != nullptr);
+    SkASSERT(values != nullptr);
 #ifdef SK_DEBUG
     for (int i = 1; i < length; i++)
         SkASSERT(keys[i] >= keys[i-1]);
@@ -31,6 +31,6 @@ SkScalar SkScalarInterpFunc(SkScalar searchKey, const SkScalar keys[],
     // Otherwise, interpolate between right - 1 and right.
     SkScalar rightKey = keys[right];
     SkScalar leftKey = keys[right-1];
-    SkScalar fract = SkScalarDiv(searchKey-leftKey,rightKey-leftKey);
+    SkScalar fract = (searchKey - leftKey) / (rightKey - leftKey);
     return SkScalarInterp(values[right-1], values[right], fract);
 }
diff --git a/gfx/skia/skia/src/core/SkScaledImageCache.cpp b/gfx/skia/skia/src/core/SkScaledImageCache.cpp
deleted file mode 100644
index dca75969f8bc..000000000000
--- a/gfx/skia/skia/src/core/SkScaledImageCache.cpp
+++ /dev/null
@@ -1,796 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkChecksum.h"
-#include "SkScaledImageCache.h"
-#include "SkMipMap.h"
-#include "SkPixelRef.h"
-#include "SkRect.h"
-
-// This can be defined by the caller's build system
-//#define SK_USE_DISCARDABLE_SCALEDIMAGECACHE
-
-#ifndef SK_DISCARDABLEMEMORY_SCALEDIMAGECACHE_COUNT_LIMIT
-#   define SK_DISCARDABLEMEMORY_SCALEDIMAGECACHE_COUNT_LIMIT   1024
-#endif
-
-#ifndef SK_DEFAULT_IMAGE_CACHE_LIMIT
-    #define SK_DEFAULT_IMAGE_CACHE_LIMIT     (2 * 1024 * 1024)
-#endif
-
-static inline SkScaledImageCache::ID* rec_to_id(SkScaledImageCache::Rec* rec) {
-    return reinterpret_cast<SkScaledImageCache::ID*>(rec);
-}
-
-static inline SkScaledImageCache::Rec* id_to_rec(SkScaledImageCache::ID* id) {
-    return reinterpret_cast<SkScaledImageCache::Rec*>(id);
-}
-
-struct SkScaledImageCache::Key {
-    Key(uint32_t genID,
-        SkScalar scaleX,
-        SkScalar scaleY,
-        SkIRect  bounds)
-        : fGenID(genID)
-        , fScaleX(scaleX)
-        , fScaleY(scaleY)
-        , fBounds(bounds) {
-        fHash = SkChecksum::Murmur3(&fGenID, 28);
-    }
-
-    bool operator<(const Key& other) const {
-        const uint32_t* a = &fGenID;
-        const uint32_t* b = &other.fGenID;
-        for (int i = 0; i < 7; ++i) {
-            if (a[i] < b[i]) {
-                return true;
-            }
-            if (a[i] > b[i]) {
-                return false;
-            }
-        }
-        return false;
-    }
-
-    bool operator==(const Key& other) const {
-        const uint32_t* a = &fHash;
-        const uint32_t* b = &other.fHash;
-        for (int i = 0; i < 8; ++i) {
-            if (a[i] != b[i]) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    uint32_t    fHash;
-    uint32_t    fGenID;
-    float       fScaleX;
-    float       fScaleY;
-    SkIRect     fBounds;
-};
-
-struct SkScaledImageCache::Rec {
-    Rec(const Key& key, const SkBitmap& bm) : fKey(key), fBitmap(bm) {
-        fLockCount = 1;
-        fMip = NULL;
-    }
-
-    Rec(const Key& key, const SkMipMap* mip) : fKey(key) {
-        fLockCount = 1;
-        fMip = mip;
-        mip->ref();
-    }
-
-    ~Rec() {
-        SkSafeUnref(fMip);
-    }
-
-    static const Key& GetKey(const Rec& rec) { return rec.fKey; }
-    static uint32_t Hash(const Key& key) { return key.fHash; }
-
-    size_t bytesUsed() const {
-        return fMip ? fMip->getSize() : fBitmap.getSize();
-    }
-
-    Rec*    fNext;
-    Rec*    fPrev;
-
-    // this guy wants to be 64bit aligned
-    Key     fKey;
-
-    int32_t fLockCount;
-
-    // we use either fBitmap or fMip, but not both
-    SkBitmap fBitmap;
-    const SkMipMap* fMip;
-};
-
-#include "SkTDynamicHash.h"
-
-class SkScaledImageCache::Hash :
-    public SkTDynamicHash<SkScaledImageCache::Rec, SkScaledImageCache::Key> {};
-
-
-///////////////////////////////////////////////////////////////////////////////
-
-// experimental hash to speed things up
-#define USE_HASH
-
-#if !defined(USE_HASH)
-static inline SkScaledImageCache::Rec* find_rec_in_list(
-        SkScaledImageCache::Rec* head, const Key & key) {
-    SkScaledImageCache::Rec* rec = head;
-    while ((rec != NULL) && (rec->fKey != key)) {
-        rec = rec->fNext;
-    }
-    return rec;
-}
-#endif
-
-void SkScaledImageCache::init() {
-    fHead = NULL;
-    fTail = NULL;
-#ifdef USE_HASH
-    fHash = new Hash;
-#else
-    fHash = NULL;
-#endif
-    fTotalBytesUsed = 0;
-    fCount = 0;
-    fSingleAllocationByteLimit = 0;
-    fAllocator = NULL;
-
-    // One of these should be explicit set by the caller after we return.
-    fTotalByteLimit = 0;
-    fDiscardableFactory = NULL;
-}
-
-#include "SkDiscardableMemory.h"
-
-class SkOneShotDiscardablePixelRef : public SkPixelRef {
-public:
-    SK_DECLARE_INST_COUNT(SkOneShotDiscardablePixelRef)
-    // Ownership of the discardablememory is transfered to the pixelref
-    SkOneShotDiscardablePixelRef(const SkImageInfo&, SkDiscardableMemory*, size_t rowBytes);
-    ~SkOneShotDiscardablePixelRef();
-
-protected:
-    virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE;
-    virtual void onUnlockPixels() SK_OVERRIDE;
-    virtual size_t getAllocatedSizeInBytes() const SK_OVERRIDE;
-
-private:
-    SkDiscardableMemory* fDM;
-    size_t               fRB;
-    bool                 fFirstTime;
-
-    typedef SkPixelRef INHERITED;
-};
-
-SkOneShotDiscardablePixelRef::SkOneShotDiscardablePixelRef(const SkImageInfo& info,
-                                             SkDiscardableMemory* dm,
-                                             size_t rowBytes)
-    : INHERITED(info)
-    , fDM(dm)
-    , fRB(rowBytes)
-{
-    SkASSERT(dm->data());
-    fFirstTime = true;
-}
-
-SkOneShotDiscardablePixelRef::~SkOneShotDiscardablePixelRef() {
-    SkDELETE(fDM);
-}
-
-bool SkOneShotDiscardablePixelRef::onNewLockPixels(LockRec* rec) {
-    if (fFirstTime) {
-        // we're already locked
-        SkASSERT(fDM->data());
-        fFirstTime = false;
-        goto SUCCESS;
-    }
-
-    // A previous call to onUnlock may have deleted our DM, so check for that
-    if (NULL == fDM) {
-        return false;
-    }
-
-    if (!fDM->lock()) {
-        // since it failed, we delete it now, to free-up the resource
-        delete fDM;
-        fDM = NULL;
-        return false;
-    }
-
-SUCCESS:
-    rec->fPixels = fDM->data();
-    rec->fColorTable = NULL;
-    rec->fRowBytes = fRB;
-    return true;
-}
-
-void SkOneShotDiscardablePixelRef::onUnlockPixels() {
-    SkASSERT(!fFirstTime);
-    fDM->unlock();
-}
-
-size_t SkOneShotDiscardablePixelRef::getAllocatedSizeInBytes() const {
-    return this->info().getSafeSize(fRB);
-}
-
-class SkScaledImageCacheDiscardableAllocator : public SkBitmap::Allocator {
-public:
-    SkScaledImageCacheDiscardableAllocator(
-                            SkScaledImageCache::DiscardableFactory factory) {
-        SkASSERT(factory);
-        fFactory = factory;
-    }
-
-    virtual bool allocPixelRef(SkBitmap*, SkColorTable*) SK_OVERRIDE;
-
-private:
-    SkScaledImageCache::DiscardableFactory fFactory;
-};
-
-bool SkScaledImageCacheDiscardableAllocator::allocPixelRef(SkBitmap* bitmap,
-                                                       SkColorTable* ctable) {
-    size_t size = bitmap->getSize();
-    uint64_t size64 = bitmap->computeSize64();
-    if (0 == size || size64 > (uint64_t)size) {
-        return false;
-    }
-
-    SkDiscardableMemory* dm = fFactory(size);
-    if (NULL == dm) {
-        return false;
-    }
-
-    // can we relax this?
-    if (kN32_SkColorType != bitmap->colorType()) {
-        return false;
-    }
-
-    SkImageInfo info = bitmap->info();
-    bitmap->setPixelRef(SkNEW_ARGS(SkOneShotDiscardablePixelRef,
-                                   (info, dm, bitmap->rowBytes())))->unref();
-    bitmap->lockPixels();
-    return bitmap->readyToDraw();
-}
-
-SkScaledImageCache::SkScaledImageCache(DiscardableFactory factory) {
-    this->init();
-    fDiscardableFactory = factory;
-
-    fAllocator = SkNEW_ARGS(SkScaledImageCacheDiscardableAllocator, (factory));
-}
-
-SkScaledImageCache::SkScaledImageCache(size_t byteLimit) {
-    this->init();
-    fTotalByteLimit = byteLimit;
-}
-
-SkScaledImageCache::~SkScaledImageCache() {
-    SkSafeUnref(fAllocator);
-
-    Rec* rec = fHead;
-    while (rec) {
-        Rec* next = rec->fNext;
-        SkDELETE(rec);
-        rec = next;
-    }
-    delete fHash;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-
-SkScaledImageCache::Rec* SkScaledImageCache::findAndLock(uint32_t genID,
-                                                        SkScalar scaleX,
-                                                        SkScalar scaleY,
-                                                        const SkIRect& bounds) {
-    const Key key(genID, scaleX, scaleY, bounds);
-    return this->findAndLock(key);
-}
-
-/**
-   This private method is the fully general record finder. All other
-   record finders should call this function or the one above. */
-SkScaledImageCache::Rec* SkScaledImageCache::findAndLock(const SkScaledImageCache::Key& key) {
-    if (key.fBounds.isEmpty()) {
-        return NULL;
-    }
-#ifdef USE_HASH
-    Rec* rec = fHash->find(key);
-#else
-    Rec* rec = find_rec_in_list(fHead, key);
-#endif
-    if (rec) {
-        this->moveToHead(rec);  // for our LRU
-        rec->fLockCount += 1;
-    }
-    return rec;
-}
-
-/**
-   This function finds the bounds of the bitmap *within its pixelRef*.
-   If the bitmap lacks a pixelRef, it will return an empty rect, since
-   that doesn't make sense.  This may be a useful enough function that
-   it should be somewhere else (in SkBitmap?). */
-static SkIRect get_bounds_from_bitmap(const SkBitmap& bm) {
-    if (!(bm.pixelRef())) {
-        return SkIRect::MakeEmpty();
-    }
-    SkIPoint origin = bm.pixelRefOrigin();
-    return SkIRect::MakeXYWH(origin.fX, origin.fY, bm.width(), bm.height());
-}
-
-
-SkScaledImageCache::ID* SkScaledImageCache::findAndLock(uint32_t genID,
-                                                        int32_t width,
-                                                        int32_t height,
-                                                        SkBitmap* bitmap) {
-    Rec* rec = this->findAndLock(genID, SK_Scalar1, SK_Scalar1,
-                                 SkIRect::MakeWH(width, height));
-    if (rec) {
-        SkASSERT(NULL == rec->fMip);
-        SkASSERT(rec->fBitmap.pixelRef());
-        *bitmap = rec->fBitmap;
-    }
-    return rec_to_id(rec);
-}
-
-SkScaledImageCache::ID* SkScaledImageCache::findAndLock(const SkBitmap& orig,
-                                                        SkScalar scaleX,
-                                                        SkScalar scaleY,
-                                                        SkBitmap* scaled) {
-    if (0 == scaleX || 0 == scaleY) {
-        // degenerate, and the key we use for mipmaps
-        return NULL;
-    }
-    Rec* rec = this->findAndLock(orig.getGenerationID(), scaleX,
-                                 scaleY, get_bounds_from_bitmap(orig));
-    if (rec) {
-        SkASSERT(NULL == rec->fMip);
-        SkASSERT(rec->fBitmap.pixelRef());
-        *scaled = rec->fBitmap;
-    }
-    return rec_to_id(rec);
-}
-
-SkScaledImageCache::ID* SkScaledImageCache::findAndLockMip(const SkBitmap& orig,
-                                                           SkMipMap const ** mip) {
-    Rec* rec = this->findAndLock(orig.getGenerationID(), 0, 0,
-                                 get_bounds_from_bitmap(orig));
-    if (rec) {
-        SkASSERT(rec->fMip);
-        SkASSERT(NULL == rec->fBitmap.pixelRef());
-        *mip = rec->fMip;
-    }
-    return rec_to_id(rec);
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-/**
-   This private method is the fully general record adder. All other
-   record adders should call this funtion. */
-SkScaledImageCache::ID* SkScaledImageCache::addAndLock(SkScaledImageCache::Rec* rec) {
-    SkASSERT(rec);
-    // See if we already have this key (racy inserts, etc.)
-    Rec* existing = this->findAndLock(rec->fKey);
-    if (NULL != existing) {
-        // Since we already have a matching entry, just delete the new one and return.
-        // Call sites cannot assume the passed in object will live past this call.
-        existing->fBitmap = rec->fBitmap;
-        SkDELETE(rec);
-        return rec_to_id(existing);
-    }
-
-    this->addToHead(rec);
-    SkASSERT(1 == rec->fLockCount);
-#ifdef USE_HASH
-    SkASSERT(fHash);
-    fHash->add(rec);
-#endif
-    // We may (now) be overbudget, so see if we need to purge something.
-    this->purgeAsNeeded();
-    return rec_to_id(rec);
-}
-
-SkScaledImageCache::ID* SkScaledImageCache::addAndLock(uint32_t genID,
-                                                       int32_t width,
-                                                       int32_t height,
-                                                       const SkBitmap& bitmap) {
-    Key key(genID, SK_Scalar1, SK_Scalar1, SkIRect::MakeWH(width, height));
-    Rec* rec = SkNEW_ARGS(Rec, (key, bitmap));
-    return this->addAndLock(rec);
-}
-
-SkScaledImageCache::ID* SkScaledImageCache::addAndLock(const SkBitmap& orig,
-                                                       SkScalar scaleX,
-                                                       SkScalar scaleY,
-                                                       const SkBitmap& scaled) {
-    if (0 == scaleX || 0 == scaleY) {
-        // degenerate, and the key we use for mipmaps
-        return NULL;
-    }
-    SkIRect bounds = get_bounds_from_bitmap(orig);
-    if (bounds.isEmpty()) {
-        return NULL;
-    }
-    Key key(orig.getGenerationID(), scaleX, scaleY, bounds);
-    Rec* rec = SkNEW_ARGS(Rec, (key, scaled));
-    return this->addAndLock(rec);
-}
-
-SkScaledImageCache::ID* SkScaledImageCache::addAndLockMip(const SkBitmap& orig,
-                                                          const SkMipMap* mip) {
-    SkIRect bounds = get_bounds_from_bitmap(orig);
-    if (bounds.isEmpty()) {
-        return NULL;
-    }
-    Key key(orig.getGenerationID(), 0, 0, bounds);
-    Rec* rec = SkNEW_ARGS(Rec, (key, mip));
-    return this->addAndLock(rec);
-}
-
-void SkScaledImageCache::unlock(SkScaledImageCache::ID* id) {
-    SkASSERT(id);
-
-#ifdef SK_DEBUG
-    {
-        bool found = false;
-        Rec* rec = fHead;
-        while (rec != NULL) {
-            if (rec == id_to_rec(id)) {
-                found = true;
-                break;
-            }
-            rec = rec->fNext;
-        }
-        SkASSERT(found);
-    }
-#endif
-    Rec* rec = id_to_rec(id);
-    SkASSERT(rec->fLockCount > 0);
-    rec->fLockCount -= 1;
-
-    // we may have been over-budget, but now have released something, so check
-    // if we should purge.
-    if (0 == rec->fLockCount) {
-        this->purgeAsNeeded();
-    }
-}
-
-void SkScaledImageCache::purgeAsNeeded() {
-    size_t byteLimit;
-    int    countLimit;
-
-    if (fDiscardableFactory) {
-        countLimit = SK_DISCARDABLEMEMORY_SCALEDIMAGECACHE_COUNT_LIMIT;
-        byteLimit = SK_MaxU32;  // no limit based on bytes
-    } else {
-        countLimit = SK_MaxS32; // no limit based on count
-        byteLimit = fTotalByteLimit;
-    }
-
-    size_t bytesUsed = fTotalBytesUsed;
-    int    countUsed = fCount;
-
-    Rec* rec = fTail;
-    while (rec) {
-        if (bytesUsed < byteLimit && countUsed < countLimit) {
-            break;
-        }
-
-        Rec* prev = rec->fPrev;
-        if (0 == rec->fLockCount) {
-            size_t used = rec->bytesUsed();
-            SkASSERT(used <= bytesUsed);
-            this->detach(rec);
-#ifdef USE_HASH
-            fHash->remove(rec->fKey);
-#endif
-
-            SkDELETE(rec);
-
-            bytesUsed -= used;
-            countUsed -= 1;
-        }
-        rec = prev;
-    }
-
-    fTotalBytesUsed = bytesUsed;
-    fCount = countUsed;
-}
-
-size_t SkScaledImageCache::setTotalByteLimit(size_t newLimit) {
-    size_t prevLimit = fTotalByteLimit;
-    fTotalByteLimit = newLimit;
-    if (newLimit < prevLimit) {
-        this->purgeAsNeeded();
-    }
-    return prevLimit;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-void SkScaledImageCache::detach(Rec* rec) {
-    Rec* prev = rec->fPrev;
-    Rec* next = rec->fNext;
-
-    if (!prev) {
-        SkASSERT(fHead == rec);
-        fHead = next;
-    } else {
-        prev->fNext = next;
-    }
-
-    if (!next) {
-        fTail = prev;
-    } else {
-        next->fPrev = prev;
-    }
-
-    rec->fNext = rec->fPrev = NULL;
-}
-
-void SkScaledImageCache::moveToHead(Rec* rec) {
-    if (fHead == rec) {
-        return;
-    }
-
-    SkASSERT(fHead);
-    SkASSERT(fTail);
-
-    this->validate();
-
-    this->detach(rec);
-
-    fHead->fPrev = rec;
-    rec->fNext = fHead;
-    fHead = rec;
-
-    this->validate();
-}
-
-void SkScaledImageCache::addToHead(Rec* rec) {
-    this->validate();
-
-    rec->fPrev = NULL;
-    rec->fNext = fHead;
-    if (fHead) {
-        fHead->fPrev = rec;
-    }
-    fHead = rec;
-    if (!fTail) {
-        fTail = rec;
-    }
-    fTotalBytesUsed += rec->bytesUsed();
-    fCount += 1;
-
-    this->validate();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-#ifdef SK_DEBUG
-void SkScaledImageCache::validate() const {
-    if (NULL == fHead) {
-        SkASSERT(NULL == fTail);
-        SkASSERT(0 == fTotalBytesUsed);
-        return;
-    }
-
-    if (fHead == fTail) {
-        SkASSERT(NULL == fHead->fPrev);
-        SkASSERT(NULL == fHead->fNext);
-        SkASSERT(fHead->bytesUsed() == fTotalBytesUsed);
-        return;
-    }
-
-    SkASSERT(NULL == fHead->fPrev);
-    SkASSERT(NULL != fHead->fNext);
-    SkASSERT(NULL == fTail->fNext);
-    SkASSERT(NULL != fTail->fPrev);
-
-    size_t used = 0;
-    int count = 0;
-    const Rec* rec = fHead;
-    while (rec) {
-        count += 1;
-        used += rec->bytesUsed();
-        SkASSERT(used <= fTotalBytesUsed);
-        rec = rec->fNext;
-    }
-    SkASSERT(fCount == count);
-
-    rec = fTail;
-    while (rec) {
-        SkASSERT(count > 0);
-        count -= 1;
-        SkASSERT(used >= rec->bytesUsed());
-        used -= rec->bytesUsed();
-        rec = rec->fPrev;
-    }
-
-    SkASSERT(0 == count);
-    SkASSERT(0 == used);
-}
-#endif
-
-void SkScaledImageCache::dump() const {
-    this->validate();
-
-    const Rec* rec = fHead;
-    int locked = 0;
-    while (rec) {
-        locked += rec->fLockCount > 0;
-        rec = rec->fNext;
-    }
-
-    SkDebugf("SkScaledImageCache: count=%d bytes=%d locked=%d %s\n",
-             fCount, fTotalBytesUsed, locked,
-             fDiscardableFactory ? "discardable" : "malloc");
-}
-
-size_t SkScaledImageCache::setSingleAllocationByteLimit(size_t newLimit) {
-    size_t oldLimit = fSingleAllocationByteLimit;
-    fSingleAllocationByteLimit = newLimit;
-    return oldLimit;
-}
-
-size_t SkScaledImageCache::getSingleAllocationByteLimit() const {
-    return fSingleAllocationByteLimit;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-#include "SkThread.h"
-
-SK_DECLARE_STATIC_MUTEX(gMutex);
-static SkScaledImageCache* gScaledImageCache = NULL;
-static void cleanup_gScaledImageCache() {
-    // We'll clean this up in our own tests, but disable for clients.
-    // Chrome seems to have funky multi-process things going on in unit tests that
-    // makes this unsafe to delete when the main process atexit()s.
-    // SkLazyPtr does the same sort of thing.
-#if SK_DEVELOPER
-    SkDELETE(gScaledImageCache);
-#endif
-}
-
-/** Must hold gMutex when calling. */
-static SkScaledImageCache* get_cache() {
-    // gMutex is always held when this is called, so we don't need to be fancy in here.
-    gMutex.assertHeld();
-    if (NULL == gScaledImageCache) {
-#ifdef SK_USE_DISCARDABLE_SCALEDIMAGECACHE
-        gScaledImageCache = SkNEW_ARGS(SkScaledImageCache, (SkDiscardableMemory::Create));
-#else
-        gScaledImageCache = SkNEW_ARGS(SkScaledImageCache, (SK_DEFAULT_IMAGE_CACHE_LIMIT));
-#endif
-        atexit(cleanup_gScaledImageCache);
-    }
-    return gScaledImageCache;
-}
-
-
-SkScaledImageCache::ID* SkScaledImageCache::FindAndLock(
-                                uint32_t pixelGenerationID,
-                                int32_t width,
-                                int32_t height,
-                                SkBitmap* scaled) {
-    SkAutoMutexAcquire am(gMutex);
-    return get_cache()->findAndLock(pixelGenerationID, width, height, scaled);
-}
-
-SkScaledImageCache::ID* SkScaledImageCache::AddAndLock(
-                               uint32_t pixelGenerationID,
-                               int32_t width,
-                               int32_t height,
-                               const SkBitmap& scaled) {
-    SkAutoMutexAcquire am(gMutex);
-    return get_cache()->addAndLock(pixelGenerationID, width, height, scaled);
-}
-
-
-SkScaledImageCache::ID* SkScaledImageCache::FindAndLock(const SkBitmap& orig,
-                                                        SkScalar scaleX,
-                                                        SkScalar scaleY,
-                                                        SkBitmap* scaled) {
-    SkAutoMutexAcquire am(gMutex);
-    return get_cache()->findAndLock(orig, scaleX, scaleY, scaled);
-}
-
-SkScaledImageCache::ID* SkScaledImageCache::FindAndLockMip(const SkBitmap& orig,
-                                                       SkMipMap const ** mip) {
-    SkAutoMutexAcquire am(gMutex);
-    return get_cache()->findAndLockMip(orig, mip);
-}
-
-SkScaledImageCache::ID* SkScaledImageCache::AddAndLock(const SkBitmap& orig,
-                                                       SkScalar scaleX,
-                                                       SkScalar scaleY,
-                                                       const SkBitmap& scaled) {
-    SkAutoMutexAcquire am(gMutex);
-    return get_cache()->addAndLock(orig, scaleX, scaleY, scaled);
-}
-
-SkScaledImageCache::ID* SkScaledImageCache::AddAndLockMip(const SkBitmap& orig,
-                                                          const SkMipMap* mip) {
-    SkAutoMutexAcquire am(gMutex);
-    return get_cache()->addAndLockMip(orig, mip);
-}
-
-void SkScaledImageCache::Unlock(SkScaledImageCache::ID* id) {
-    SkAutoMutexAcquire am(gMutex);
-    get_cache()->unlock(id);
-
-//    get_cache()->dump();
-}
-
-size_t SkScaledImageCache::GetTotalBytesUsed() {
-    SkAutoMutexAcquire am(gMutex);
-    return get_cache()->getTotalBytesUsed();
-}
-
-size_t SkScaledImageCache::GetTotalByteLimit() {
-    SkAutoMutexAcquire am(gMutex);
-    return get_cache()->getTotalByteLimit();
-}
-
-size_t SkScaledImageCache::SetTotalByteLimit(size_t newLimit) {
-    SkAutoMutexAcquire am(gMutex);
-    return get_cache()->setTotalByteLimit(newLimit);
-}
-
-SkBitmap::Allocator* SkScaledImageCache::GetAllocator() {
-    SkAutoMutexAcquire am(gMutex);
-    return get_cache()->allocator();
-}
-
-void SkScaledImageCache::Dump() {
-    SkAutoMutexAcquire am(gMutex);
-    get_cache()->dump();
-}
-
-size_t SkScaledImageCache::SetSingleAllocationByteLimit(size_t size) {
-    SkAutoMutexAcquire am(gMutex);
-    return get_cache()->setSingleAllocationByteLimit(size);
-}
-
-size_t SkScaledImageCache::GetSingleAllocationByteLimit() {
-    SkAutoMutexAcquire am(gMutex);
-    return get_cache()->getSingleAllocationByteLimit();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-#include "SkGraphics.h"
-
-size_t SkGraphics::GetImageCacheTotalBytesUsed() {
-    return SkScaledImageCache::GetTotalBytesUsed();
-}
-
-size_t SkGraphics::GetImageCacheTotalByteLimit() {
-    return SkScaledImageCache::GetTotalByteLimit();
-}
-
-size_t SkGraphics::SetImageCacheTotalByteLimit(size_t newLimit) {
-    return SkScaledImageCache::SetTotalByteLimit(newLimit);
-}
-
-size_t SkGraphics::GetImageCacheSingleAllocationByteLimit() {
-    return SkScaledImageCache::GetSingleAllocationByteLimit();
-}
-
-size_t SkGraphics::SetImageCacheSingleAllocationByteLimit(size_t newLimit) {
-    return SkScaledImageCache::SetSingleAllocationByteLimit(newLimit);
-}
-
diff --git a/gfx/skia/skia/src/core/SkScaledImageCache.h b/gfx/skia/skia/src/core/SkScaledImageCache.h
deleted file mode 100644
index 817147e3b81e..000000000000
--- a/gfx/skia/skia/src/core/SkScaledImageCache.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkScaledImageCache_DEFINED
-#define SkScaledImageCache_DEFINED
-
-#include "SkBitmap.h"
-
-class SkDiscardableMemory;
-class SkMipMap;
-
-/**
- *  Cache object for bitmaps (with possible scale in X Y as part of the key).
- *
- *  Multiple caches can be instantiated, but each instance is not implicitly
- *  thread-safe, so if a given instance is to be shared across threads, the
- *  caller must manage the access itself (e.g. via a mutex).
- *
- *  As a convenience, a global instance is also defined, which can be safely
- *  access across threads via the static methods (e.g. FindAndLock, etc.).
- */
-class SkScaledImageCache {
-public:
-    struct ID;
-
-    /**
-     *  Returns a locked/pinned SkDiscardableMemory instance for the specified
-     *  number of bytes, or NULL on failure.
-     */
-    typedef SkDiscardableMemory* (*DiscardableFactory)(size_t bytes);
-
-    /*
-     *  The following static methods are thread-safe wrappers around a global
-     *  instance of this cache.
-     */
-
-    static ID* FindAndLock(uint32_t pixelGenerationID,
-                           int32_t width,
-                           int32_t height,
-                           SkBitmap* returnedBitmap);
-
-    static ID* FindAndLock(const SkBitmap& original, SkScalar scaleX,
-                           SkScalar scaleY, SkBitmap* returnedBitmap);
-    static ID* FindAndLockMip(const SkBitmap& original,
-                              SkMipMap const** returnedMipMap);
-
-
-    static ID* AddAndLock(uint32_t pixelGenerationID,
-                          int32_t width,
-                          int32_t height,
-                          const SkBitmap& bitmap);
-
-    static ID* AddAndLock(const SkBitmap& original, SkScalar scaleX,
-                          SkScalar scaleY, const SkBitmap& bitmap);
-    static ID* AddAndLockMip(const SkBitmap& original, const SkMipMap* mipMap);
-
-    static void Unlock(ID*);
-
-    static size_t GetTotalBytesUsed();
-    static size_t GetTotalByteLimit();
-    static size_t SetTotalByteLimit(size_t newLimit);
-
-    static size_t SetSingleAllocationByteLimit(size_t);
-    static size_t GetSingleAllocationByteLimit();
-
-    static SkBitmap::Allocator* GetAllocator();
-
-    /**
-     *  Call SkDebugf() with diagnostic information about the state of the cache
-     */
-    static void Dump();
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    /**
-     *  Construct the cache to call DiscardableFactory when it
-     *  allocates memory for the pixels. In this mode, the cache has
-     *  not explicit budget, and so methods like getTotalBytesUsed()
-     *  and getTotalByteLimit() will return 0, and setTotalByteLimit
-     *  will ignore its argument and return 0.
-     */
-    SkScaledImageCache(DiscardableFactory);
-
-    /**
-     *  Construct the cache, allocating memory with malloc, and respect the
-     *  byteLimit, purging automatically when a new image is added to the cache
-     *  that pushes the total bytesUsed over the limit. Note: The limit can be
-     *  changed at runtime with setTotalByteLimit.
-     */
-    SkScaledImageCache(size_t byteLimit);
-
-    ~SkScaledImageCache();
-
-    /**
-     *  Search the cache for a matching bitmap (using generationID,
-     *  width, and height as a search key). If found, return it in
-     *  returnedBitmap, and return its ID pointer. Use the returned
-     *  ptr to unlock the cache when you are done using
-     *  returnedBitmap.
-     *
-     *  If a match is not found, returnedBitmap will be unmodifed, and
-     *  NULL will be returned.
-     *
-     *  This is used if there is no scaling or subsetting, for example
-     *  by SkLazyPixelRef.
-     */
-    ID* findAndLock(uint32_t pixelGenerationID, int32_t width, int32_t height,
-                    SkBitmap* returnedBitmap);
-
-    /**
-     *  Search the cache for a scaled version of original. If found,
-     *  return it in returnedBitmap, and return its ID pointer. Use
-     *  the returned ptr to unlock the cache when you are done using
-     *  returnedBitmap.
-     *
-     *  If a match is not found, returnedBitmap will be unmodifed, and
-     *  NULL will be returned.
-     */
-    ID* findAndLock(const SkBitmap& original, SkScalar scaleX,
-                    SkScalar scaleY, SkBitmap* returnedBitmap);
-    ID* findAndLockMip(const SkBitmap& original,
-                       SkMipMap const** returnedMipMap);
-
-    /**
-     *  To add a new bitmap (or mipMap) to the cache, call
-     *  AddAndLock. Use the returned ptr to unlock the cache when you
-     *  are done using scaled.
-     *
-     *  Use (generationID, width, and height) or (original, scaleX,
-     *  scaleY) or (original) as a search key
-     */
-    ID* addAndLock(uint32_t pixelGenerationID, int32_t width, int32_t height,
-                   const SkBitmap& bitmap);
-    ID* addAndLock(const SkBitmap& original, SkScalar scaleX,
-                   SkScalar scaleY, const SkBitmap& bitmap);
-    ID* addAndLockMip(const SkBitmap& original, const SkMipMap* mipMap);
-
-    /**
-     *  Given a non-null ID ptr returned by either findAndLock or addAndLock,
-     *  this releases the associated resources to be available to be purged
-     *  if needed. After this, the cached bitmap should no longer be
-     *  referenced by the caller.
-     */
-    void unlock(ID*);
-
-    size_t getTotalBytesUsed() const { return fTotalBytesUsed; }
-    size_t getTotalByteLimit() const { return fTotalByteLimit; }
-
-    /**
-     *  This is respected by SkBitmapProcState::possiblyScaleImage.
-     *  0 is no maximum at all; this is the default.
-     *  setSingleAllocationByteLimit() returns the previous value.
-     */
-    size_t setSingleAllocationByteLimit(size_t maximumAllocationSize);
-    size_t getSingleAllocationByteLimit() const;
-    /**
-     *  Set the maximum number of bytes available to this cache. If the current
-     *  cache exceeds this new value, it will be purged to try to fit within
-     *  this new limit.
-     */
-    size_t setTotalByteLimit(size_t newLimit);
-
-    SkBitmap::Allocator* allocator() const { return fAllocator; };
-
-    /**
-     *  Call SkDebugf() with diagnostic information about the state of the cache
-     */
-    void dump() const;
-
-public:
-    struct Rec;
-    struct Key;
-private:
-    Rec*    fHead;
-    Rec*    fTail;
-
-    class Hash;
-    Hash*   fHash;
-
-    DiscardableFactory  fDiscardableFactory;
-    // the allocator is NULL or one that matches discardables
-    SkBitmap::Allocator* fAllocator;
-
-    size_t  fTotalBytesUsed;
-    size_t  fTotalByteLimit;
-    size_t  fSingleAllocationByteLimit;
-    int     fCount;
-
-    Rec* findAndLock(uint32_t generationID, SkScalar sx, SkScalar sy,
-                     const SkIRect& bounds);
-    Rec* findAndLock(const Key& key);
-    ID* addAndLock(Rec* rec);
-
-    void purgeRec(Rec*);
-    void purgeAsNeeded();
-
-    // linklist management
-    void moveToHead(Rec*);
-    void addToHead(Rec*);
-    void detach(Rec*);
-
-    void init();    // called by constructors
-
-#ifdef SK_DEBUG
-    void validate() const;
-#else
-    void validate() const {}
-#endif
-};
-#endif
diff --git a/gfx/skia/skia/src/core/SkScalerContext.cpp b/gfx/skia/skia/src/core/SkScalerContext.cpp
index b18dc1a79c31..29f794a99f1d 100644
--- a/gfx/skia/skia/src/core/SkScalerContext.cpp
+++ b/gfx/skia/skia/src/core/SkScalerContext.cpp
@@ -11,21 +11,17 @@
 #include "SkColorPriv.h"
 #include "SkDescriptor.h"
 #include "SkDraw.h"
-#include "SkFontHost.h"
 #include "SkGlyph.h"
 #include "SkMaskFilter.h"
 #include "SkMaskGamma.h"
+#include "SkMatrix22.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkPathEffect.h"
 #include "SkRasterizer.h"
 #include "SkRasterClip.h"
 #include "SkStroke.h"
-#include "SkThread.h"
-
-#ifdef SK_BUILD_FOR_ANDROID
-    #include "SkTypeface_android.h"
-#endif
+#include "SkStrokeRec.h"
 
 #define ComputeBWRowBytes(width)        (((unsigned)(width) + 7) >> 3)
 
@@ -68,7 +64,7 @@ void SkGlyph::zeroMetrics() {
 
 static SkFlattenable* load_flattenable(const SkDescriptor* desc, uint32_t tag,
                                        SkFlattenable::Type ft) {
-    SkFlattenable*  obj = NULL;
+    SkFlattenable*  obj = nullptr;
     uint32_t        len;
     const void*     data = desc->findEntry(tag, &len);
 
@@ -81,9 +77,8 @@ static SkFlattenable* load_flattenable(const SkDescriptor* desc, uint32_t tag,
 }
 
 SkScalerContext::SkScalerContext(SkTypeface* typeface, const SkDescriptor* desc)
-    : fRec(*static_cast<const Rec*>(desc->findEntry(kRec_SkDescriptorTag, NULL)))
+    : fRec(*static_cast<const Rec*>(desc->findEntry(kRec_SkDescriptorTag, nullptr)))
 
-    , fBaseGlyphCount(0)
     , fTypeface(SkRef(typeface))
     , fPathEffect(static_cast<SkPathEffect*>(load_flattenable(desc, kPathEffect_SkDescriptorTag,
                                              SkFlattenable::kSkPathEffect_Type)))
@@ -92,9 +87,7 @@ SkScalerContext::SkScalerContext(SkTypeface* typeface, const SkDescriptor* desc)
     , fRasterizer(static_cast<SkRasterizer*>(load_flattenable(desc, kRasterizer_SkDescriptorTag,
                                              SkFlattenable::kSkRasterizer_Type)))
       // Initialize based on our settings. Subclasses can also force this.
-    , fGenerateImageFromPath(fRec.fFrameWidth > 0 || fPathEffect != NULL || fRasterizer != NULL)
-
-    , fNextContext(NULL)
+    , fGenerateImageFromPath(fRec.fFrameWidth > 0 || fPathEffect != nullptr || fRasterizer != nullptr)
 
     , fPreBlend(fMaskFilter ? SkMaskGamma::PreBlend() : SkScalerContext::GetMaskPreBlend(fRec))
     , fPreBlendForFilter(fMaskFilter ? SkScalerContext::GetMaskPreBlend(fRec)
@@ -111,195 +104,28 @@ SkScalerContext::SkScalerContext(SkTypeface* typeface, const SkDescriptor* desc)
         rec->fFrameWidth, rec->fMiterLimit, rec->fHints, rec->fFrameAndFill,
         rec->fMaskFormat, rec->fStrokeJoin);
     SkDebugf("  pathEffect %x maskFilter %x\n",
-             desc->findEntry(kPathEffect_SkDescriptorTag, NULL),
-        desc->findEntry(kMaskFilter_SkDescriptorTag, NULL));
-#endif
-#ifdef SK_BUILD_FOR_ANDROID
-    uint32_t len;
-    const void* data = desc->findEntry(kAndroidOpts_SkDescriptorTag, &len);
-    if (data) {
-        SkReadBuffer buffer(data, len);
-        fPaintOptionsAndroid.unflatten(buffer);
-        SkASSERT(buffer.offset() == buffer.size());
-    }
+             desc->findEntry(kPathEffect_SkDescriptorTag, nullptr),
+        desc->findEntry(kMaskFilter_SkDescriptorTag, nullptr));
 #endif
 }
 
 SkScalerContext::~SkScalerContext() {
-    SkDELETE(fNextContext);
-
     SkSafeUnref(fPathEffect);
     SkSafeUnref(fMaskFilter);
     SkSafeUnref(fRasterizer);
 }
 
-// Return the context associated with the next logical typeface, or NULL if
-// there are no more entries in the fallback chain.
-SkScalerContext* SkScalerContext::allocNextContext() const {
-#ifdef SK_BUILD_FOR_ANDROID
-    SkTypeface* newFace = SkAndroidNextLogicalTypeface(fRec.fFontID,
-                                                       fRec.fOrigFontID,
-                                                       fPaintOptionsAndroid);
-    if (0 == newFace) {
-        return NULL;
-    }
-
-    SkAutoTUnref<SkTypeface> aur(newFace);
-    uint32_t newFontID = newFace->uniqueID();
-
-    SkWriteBuffer androidBuffer;
-    fPaintOptionsAndroid.flatten(androidBuffer);
-
-    SkAutoDescriptor    ad(sizeof(fRec) + androidBuffer.bytesWritten()
-                           + SkDescriptor::ComputeOverhead(2));
-    SkDescriptor*       desc = ad.getDesc();
-
-    desc->init();
-    SkScalerContext::Rec* newRec =
-    (SkScalerContext::Rec*)desc->addEntry(kRec_SkDescriptorTag,
-                                          sizeof(fRec), &fRec);
-    androidBuffer.writeToMemory(desc->addEntry(kAndroidOpts_SkDescriptorTag,
-                                               androidBuffer.bytesWritten(), NULL));
-
-    newRec->fFontID = newFontID;
-    desc->computeChecksum();
-
-    return newFace->createScalerContext(desc);
-#else
-    return NULL;
-#endif
-}
-
-/*  Return the next context, creating it if its not already created, but return
-    NULL if the fonthost says there are no more fonts to fallback to.
- */
-SkScalerContext* SkScalerContext::getNextContext() {
-    SkScalerContext* next = fNextContext;
-    // if next is null, then either it isn't cached yet, or we're at the
-    // end of our possible chain
-    if (NULL == next) {
-        next = this->allocNextContext();
-        if (NULL == next) {
-            return NULL;
-        }
-        // next's base is our base + our local count
-        next->setBaseGlyphCount(fBaseGlyphCount + this->getGlyphCount());
-        // cache the answer
-        fNextContext = next;
-    }
-    return next;
-}
-
-SkScalerContext* SkScalerContext::getGlyphContext(const SkGlyph& glyph) {
-    unsigned glyphID = glyph.getGlyphID();
-    SkScalerContext* ctx = this;
-    for (;;) {
-        unsigned count = ctx->getGlyphCount();
-        if (glyphID < count) {
-            break;
-        }
-        glyphID -= count;
-        ctx = ctx->getNextContext();
-        if (NULL == ctx) {
-//            SkDebugf("--- no context for glyph %x\n", glyph.getGlyphID());
-            // just return the original context (this)
-            return this;
-        }
-    }
-    return ctx;
-}
-
-SkScalerContext* SkScalerContext::getContextFromChar(SkUnichar uni,
-                                                     uint16_t* glyphID) {
-    SkScalerContext* ctx = this;
-    for (;;) {
-        const uint16_t glyph = ctx->generateCharToGlyph(uni);
-        if (glyph) {
-            if (NULL != glyphID) {
-                *glyphID = glyph;
-            }
-            break;  // found it
-        }
-        ctx = ctx->getNextContext();
-        if (NULL == ctx) {
-            return NULL;
-        }
-    }
-    return ctx;
-}
-
-#ifdef SK_BUILD_FOR_ANDROID
-SkFontID SkScalerContext::findTypefaceIdForChar(SkUnichar uni) {
-    SkScalerContext* ctx = this->getContextFromChar(uni, NULL);
-    if (NULL != ctx) {
-        return ctx->fRec.fFontID;
-    } else {
-        return 0;
-    }
-}
-
-/*  This loops through all available fallback contexts (if needed) until it
-    finds some context that can handle the unichar and return it.
-
-    As this is somewhat expensive operation, it should only be done on the first
-    char of a run.
- */
-unsigned SkScalerContext::getBaseGlyphCount(SkUnichar uni) {
-    SkScalerContext* ctx = this->getContextFromChar(uni, NULL);
-    if (NULL != ctx) {
-        return ctx->fBaseGlyphCount;
-    } else {
-        SkDEBUGF(("--- no context for char %x\n", uni));
-        return this->fBaseGlyphCount;
-    }
-}
-#endif
-
-/*  This loops through all available fallback contexts (if needed) until it
-    finds some context that can handle the unichar. If all fail, returns 0
- */
-uint16_t SkScalerContext::charToGlyphID(SkUnichar uni) {
-
-    uint16_t tempID;
-    SkScalerContext* ctx = this->getContextFromChar(uni, &tempID);
-    if (NULL == ctx) {
-        return 0; // no more contexts, return missing glyph
-    }
-    // add the ctx's base, making glyphID unique for chain of contexts
-    unsigned glyphID = tempID + ctx->fBaseGlyphCount;
-    // check for overflow of 16bits, since our glyphID cannot exceed that
-    if (glyphID > 0xFFFF) {
-        glyphID = 0;
-    }
-    return SkToU16(glyphID);
-}
-
-SkUnichar SkScalerContext::glyphIDToChar(uint16_t glyphID) {
-    SkScalerContext* ctx = this;
-    unsigned rangeEnd = 0;
-    do {
-        unsigned rangeStart = rangeEnd;
-
-        rangeEnd += ctx->getGlyphCount();
-        if (rangeStart <= glyphID && glyphID < rangeEnd) {
-            return ctx->generateGlyphToChar(glyphID - rangeStart);
-        }
-        ctx = ctx->getNextContext();
-    } while (NULL != ctx);
-    return 0;
-}
-
 void SkScalerContext::getAdvance(SkGlyph* glyph) {
     // mark us as just having a valid advance
     glyph->fMaskFormat = MASK_FORMAT_JUST_ADVANCE;
     // we mark the format before making the call, in case the impl
     // internally ends up calling its generateMetrics, which is OK
     // albeit slower than strictly necessary
-    this->getGlyphContext(*glyph)->generateAdvance(glyph);
+    generateAdvance(glyph);
 }
 
 void SkScalerContext::getMetrics(SkGlyph* glyph) {
-    this->getGlyphContext(*glyph)->generateMetrics(glyph);
+    generateMetrics(glyph);
 
     // for now we have separate cache entries for devkerning on and off
     // in the future we might share caches, but make our measure/draw
@@ -329,7 +155,7 @@ void SkScalerContext::getMetrics(SkGlyph* glyph) {
         if (fRasterizer) {
             SkMask  mask;
 
-            if (fRasterizer->rasterize(fillPath, fillToDevMatrix, NULL,
+            if (fRasterizer->rasterize(fillPath, fillToDevMatrix, nullptr,
                                        fMaskFilter, &mask,
                                        SkMask::kJustComputeBounds_CreateMode)) {
                 glyph->fLeft    = mask.fBounds.fLeft;
@@ -341,8 +167,7 @@ void SkScalerContext::getMetrics(SkGlyph* glyph) {
             }
         } else {
             // just use devPath
-            SkIRect ir;
-            devPath.getBounds().roundOut(&ir);
+            const SkIRect ir = devPath.getBounds().roundOut();
 
             if (ir.isEmpty() || !ir.is16Bit()) {
                 goto SK_ERROR;
@@ -355,7 +180,6 @@ void SkScalerContext::getMetrics(SkGlyph* glyph) {
             if (glyph->fWidth > 0) {
                 switch (fRec.fMaskFormat) {
                 case SkMask::kLCD16_Format:
-                case SkMask::kLCD32_Format:
                     glyph->fWidth += 2;
                     glyph->fLeft -= 1;
                     break;
@@ -383,12 +207,12 @@ void SkScalerContext::getMetrics(SkGlyph* glyph) {
         glyph->toMask(&src);
         fRec.getMatrixFrom2x2(&matrix);
 
-        src.fImage = NULL;  // only want the bounds from the filter
-        if (fMaskFilter->filterMask(&dst, src, matrix, NULL)) {
+        src.fImage = nullptr;  // only want the bounds from the filter
+        if (fMaskFilter->filterMask(&dst, src, matrix, nullptr)) {
             if (dst.fBounds.isEmpty() || !dst.fBounds.is16Bit()) {
                 goto SK_ERROR;
             }
-            SkASSERT(dst.fImage == NULL);
+            SkASSERT(dst.fImage == nullptr);
             glyph->fLeft    = dst.fBounds.fLeft;
             glyph->fTop     = dst.fBounds.fTop;
             glyph->fWidth   = SkToU16(dst.fBounds.width());
@@ -424,7 +248,7 @@ static void applyLUTToA8Mask(const SkMask& mask, const uint8_t* lut) {
 }
 
 template<bool APPLY_PREBLEND>
-static void pack4xHToLCD16(const SkBitmap& src, const SkMask& dst,
+static void pack4xHToLCD16(const SkPixmap& src, const SkMask& dst,
                            const SkMaskGamma::PreBlend& maskPreBlend) {
 #define SAMPLES_PER_PIXEL 4
 #define LCD_PER_PIXEL 3
@@ -467,7 +291,7 @@ static void pack4xHToLCD16(const SkBitmap& src, const SkMask& dst,
     };
 
     for (int y = 0; y < height; ++y) {
-        const uint8_t* srcP = src.getAddr8(0, y);
+        const uint8_t* srcP = src.addr8(0, y);
 
         // TODO: this fir filter implementation is straight forward, but slow.
         // It should be possible to make it much faster.
@@ -499,31 +323,6 @@ static void pack4xHToLCD16(const SkBitmap& src, const SkMask& dst,
     }
 }
 
-template<bool APPLY_PREBLEND>
-static void pack4xHToLCD32(const SkBitmap& src, const SkMask& dst,
-                           const SkMaskGamma::PreBlend& maskPreBlend) {
-    SkASSERT(kAlpha_8_SkColorType == src.colorType());
-    SkASSERT(SkMask::kLCD32_Format == dst.fFormat);
-
-    const int width = dst.fBounds.width();
-    const int height = dst.fBounds.height();
-    SkPMColor* dstP = (SkPMColor*)dst.fImage;
-    size_t dstRB = dst.fRowBytes;
-
-    for (int y = 0; y < height; ++y) {
-        const uint8_t* srcP = src.getAddr8(0, y);
-
-        // TODO: need to use fir filter here as well.
-        for (int x = 0; x < width; ++x) {
-            U8CPU r = sk_apply_lut_if<APPLY_PREBLEND>(*srcP++, maskPreBlend.fR);
-            U8CPU g = sk_apply_lut_if<APPLY_PREBLEND>(*srcP++, maskPreBlend.fG);
-            U8CPU b = sk_apply_lut_if<APPLY_PREBLEND>(*srcP++, maskPreBlend.fB);
-            dstP[x] = SkPackARGB32(0xFF, r, g, b);
-        }
-        dstP = (SkPMColor*)((char*)dstP + dstRB);
-    }
-}
-
 static inline int convert_8_to_1(unsigned byte) {
     SkASSERT(byte <= 0xFF);
     return byte >> 7;
@@ -592,7 +391,6 @@ static void generateMask(const SkMask& mask, const SkPath& path,
         case SkMask::kA8_Format:
             break;
         case SkMask::kLCD16_Format:
-        case SkMask::kLCD32_Format:
             // TODO: trigger off LCD orientation
             dstW = 4*dstW - 8;
             matrix.setTranslate(-SkIntToScalar(mask.fBounds.fLeft + 1),
@@ -608,29 +406,29 @@ static void generateMask(const SkMask& mask, const SkPath& path,
     clip.setRect(SkIRect::MakeWH(dstW, dstH));
 
     const SkImageInfo info = SkImageInfo::MakeA8(dstW, dstH);
-    SkBitmap bm;
+    SkAutoPixmapStorage dst;
 
     if (0 == dstRB) {
-        if (!bm.allocPixels(info)) {
+        if (!dst.tryAlloc(info)) {
             // can't allocate offscreen, so empty the mask and return
             sk_bzero(mask.fImage, mask.computeImageSize());
             return;
         }
     } else {
-        bm.installPixels(info, mask.fImage, dstRB);
+        dst.reset(info, mask.fImage, dstRB);
     }
-    sk_bzero(bm.getPixels(), bm.getSafeSize());
+    sk_bzero(dst.writable_addr(), dst.getSafeSize());
 
     SkDraw  draw;
+    draw.fDst   = dst;
     draw.fRC    = &clip;
     draw.fClip  = &clip.bwRgn();
     draw.fMatrix = &matrix;
-    draw.fBitmap = &bm;
     draw.drawPath(path, paint);
 
     switch (mask.fFormat) {
         case SkMask::kBW_Format:
-            packA8ToA1(mask, bm.getAddr8(0, 0), bm.rowBytes());
+            packA8ToA1(mask, dst.addr8(0, 0), dst.rowBytes());
             break;
         case SkMask::kA8_Format:
             if (maskPreBlend.isApplicable()) {
@@ -639,16 +437,9 @@ static void generateMask(const SkMask& mask, const SkPath& path,
             break;
         case SkMask::kLCD16_Format:
             if (maskPreBlend.isApplicable()) {
-                pack4xHToLCD16<true>(bm, mask, maskPreBlend);
+                pack4xHToLCD16<true>(dst, mask, maskPreBlend);
             } else {
-                pack4xHToLCD16<false>(bm, mask, maskPreBlend);
-            }
-            break;
-        case SkMask::kLCD32_Format:
-            if (maskPreBlend.isApplicable()) {
-                pack4xHToLCD32<true>(bm, mask, maskPreBlend);
-            } else {
-                pack4xHToLCD32<false>(bm, mask, maskPreBlend);
+                pack4xHToLCD16<false>(dst, mask, maskPreBlend);
             }
             break;
         default:
@@ -691,11 +482,11 @@ void SkScalerContext::getImage(const SkGlyph& origGlyph) {
              SkMask::kARGB32_Format != origGlyph.fMaskFormat);
 
     if (fMaskFilter) {   // restore the prefilter bounds
-        tmpGlyph.init(origGlyph.fID);
+        tmpGlyph.initGlyphIdFrom(origGlyph);
 
         // need the original bounds, sans our maskfilter
         SkMaskFilter* mf = fMaskFilter;
-        fMaskFilter = NULL;             // temp disable
+        fMaskFilter = nullptr;             // temp disable
         this->getMetrics(&tmpGlyph);
         fMaskFilter = mf;               // restore
 
@@ -724,7 +515,7 @@ void SkScalerContext::getImage(const SkGlyph& origGlyph) {
             mask.fFormat = SkMask::kA8_Format;
             sk_bzero(glyph->fImage, mask.computeImageSize());
 
-            if (!fRasterizer->rasterize(fillPath, fillToDevMatrix, NULL,
+            if (!fRasterizer->rasterize(fillPath, fillToDevMatrix, nullptr,
                                         fMaskFilter, &mask,
                                         SkMask::kJustRenderImage_CreateMode)) {
                 return;
@@ -737,7 +528,7 @@ void SkScalerContext::getImage(const SkGlyph& origGlyph) {
             generateMask(mask, devPath, fPreBlend);
         }
     } else {
-        this->getGlyphContext(*glyph)->generateImage(*glyph);
+        generateImage(*glyph);
     }
 
     if (fMaskFilter) {
@@ -763,7 +554,7 @@ void SkScalerContext::getImage(const SkGlyph& origGlyph) {
 
         fRec.getMatrixFrom2x2(&matrix);
 
-        if (fMaskFilter->filterMask(&dstM, srcM, matrix, NULL)) {
+        if (fMaskFilter->filterMask(&dstM, srcM, matrix, nullptr)) {
             int width = SkFastMin32(origGlyph.fWidth, dstM.fBounds.width());
             int height = SkFastMin32(origGlyph.fHeight, dstM.fBounds.height());
             int dstRB = origGlyph.rowBytes();
@@ -795,7 +586,7 @@ void SkScalerContext::getImage(const SkGlyph& origGlyph) {
 }
 
 void SkScalerContext::getPath(const SkGlyph& glyph, SkPath* path) {
-    this->internalGetPath(glyph, NULL, path, NULL);
+    this->internalGetPath(glyph, nullptr, path, nullptr);
 }
 
 void SkScalerContext::getFontMetrics(SkPaint::FontMetrics* fm) {
@@ -811,8 +602,7 @@ SkUnichar SkScalerContext::generateGlyphToChar(uint16_t glyph) {
 void SkScalerContext::internalGetPath(const SkGlyph& glyph, SkPath* fillPath,
                                   SkPath* devPath, SkMatrix* fillToDevMatrix) {
     SkPath  path;
-
-    this->getGlyphContext(glyph)->generatePath(glyph, &path);
+    generatePath(glyph, &path);
 
     if (fRec.fFlags & SkScalerContext::kSubpixelPositioning_Flag) {
         SkFixed dx = glyph.getSubXFixed();
@@ -822,7 +612,7 @@ void SkScalerContext::internalGetPath(const SkGlyph& glyph, SkPath* fillPath,
         }
     }
 
-    if (fRec.fFrameWidth > 0 || fPathEffect != NULL) {
+    if (fRec.fFrameWidth > 0 || fPathEffect != nullptr) {
         // need the path in user-space, with only the point-size applied
         // so that our stroking and effects will operate the same way they
         // would if the user had extracted the path themself, and then
@@ -852,7 +642,7 @@ void SkScalerContext::internalGetPath(const SkGlyph& glyph, SkPath* fillPath,
 
         if (fPathEffect) {
             SkPath effectPath;
-            if (fPathEffect->filterPath(&effectPath, localPath, &rec, NULL)) {
+            if (fPathEffect->filterPath(&effectPath, localPath, &rec, nullptr)) {
                 localPath.swap(effectPath);
             }
         }
@@ -879,7 +669,7 @@ void SkScalerContext::internalGetPath(const SkGlyph& glyph, SkPath* fillPath,
             fillToDevMatrix->reset();
         }
         if (devPath) {
-            if (fillPath == NULL) {
+            if (fillPath == nullptr) {
                 devPath->swap(path);
             } else {
                 *devPath = path;
@@ -903,7 +693,7 @@ void SkScalerContext::internalGetPath(const SkGlyph& glyph, SkPath* fillPath,
 void SkScalerContextRec::getMatrixFrom2x2(SkMatrix* dst) const {
     dst->setAll(fPost2x2[0][0], fPost2x2[0][1], 0,
                 fPost2x2[1][0], fPost2x2[1][1], 0,
-                0,              0,              SkScalarToPersp(SK_Scalar1));
+                0,              0,              1);
 }
 
 void SkScalerContextRec::getLocalMatrix(SkMatrix* m) const {
@@ -919,13 +709,127 @@ void SkScalerContextRec::getSingleMatrix(SkMatrix* m) const {
     m->postConcat(deviceMatrix);
 }
 
+void SkScalerContextRec::computeMatrices(PreMatrixScale preMatrixScale, SkVector* s, SkMatrix* sA,
+                                         SkMatrix* GsA, SkMatrix* G_inv, SkMatrix* A_out)
+{
+    // A is the 'total' matrix.
+    SkMatrix A;
+    this->getSingleMatrix(&A);
+
+    // The caller may find the 'total' matrix useful when dealing directly with EM sizes.
+    if (A_out) {
+        *A_out = A;
+    }
+
+    // If the 'total' matrix is singular, set the 'scale' to something finite and zero the matrices.
+    // All underlying ports have issues with zero text size, so use the matricies to zero.
+
+    // Map the vectors [1,1] and [1,-1] (the EM) through the 'total' matrix.
+    // If the length of one of these vectors is less than 1/256 then an EM filling square will
+    // never affect any pixels.
+    SkVector diag[2] = { { A.getScaleX() + A.getSkewX(), A.getScaleY() + A.getSkewY() },
+                         { A.getScaleX() - A.getSkewX(), A.getScaleY() - A.getSkewY() }, };
+    if (diag[0].lengthSqd() <= SK_ScalarNearlyZero * SK_ScalarNearlyZero ||
+        diag[1].lengthSqd() <= SK_ScalarNearlyZero * SK_ScalarNearlyZero)
+    {
+        s->fX = SK_Scalar1;
+        s->fY = SK_Scalar1;
+        sA->setScale(0, 0);
+        if (GsA) {
+            GsA->setScale(0, 0);
+        }
+        if (G_inv) {
+            G_inv->reset();
+        }
+        return;
+    }
+
+    // GA is the matrix A with rotation removed.
+    SkMatrix GA;
+    bool skewedOrFlipped = A.getSkewX() || A.getSkewY() || A.getScaleX() < 0 || A.getScaleY() < 0;
+    if (skewedOrFlipped) {
+        // h is where A maps the horizontal baseline.
+        SkPoint h = SkPoint::Make(SK_Scalar1, 0);
+        A.mapPoints(&h, 1);
+
+        // G is the Givens Matrix for A (rotational matrix where GA[0][1] == 0).
+        SkMatrix G;
+        SkComputeGivensRotation(h, &G);
+
+        GA = G;
+        GA.preConcat(A);
+
+        // The 'remainingRotation' is G inverse, which is fairly simple since G is 2x2 rotational.
+        if (G_inv) {
+            G_inv->setAll(
+                G.get(SkMatrix::kMScaleX), -G.get(SkMatrix::kMSkewX), G.get(SkMatrix::kMTransX),
+                -G.get(SkMatrix::kMSkewY), G.get(SkMatrix::kMScaleY), G.get(SkMatrix::kMTransY),
+                G.get(SkMatrix::kMPersp0), G.get(SkMatrix::kMPersp1), G.get(SkMatrix::kMPersp2));
+        }
+    } else {
+        GA = A;
+        if (G_inv) {
+            G_inv->reset();
+        }
+    }
+
+    // At this point, given GA, create s.
+    switch (preMatrixScale) {
+        case kFull_PreMatrixScale:
+            s->fX = SkScalarAbs(GA.get(SkMatrix::kMScaleX));
+            s->fY = SkScalarAbs(GA.get(SkMatrix::kMScaleY));
+            break;
+        case kVertical_PreMatrixScale: {
+            SkScalar yScale = SkScalarAbs(GA.get(SkMatrix::kMScaleY));
+            s->fX = yScale;
+            s->fY = yScale;
+            break;
+        }
+        case kVerticalInteger_PreMatrixScale: {
+            SkScalar realYScale = SkScalarAbs(GA.get(SkMatrix::kMScaleY));
+            SkScalar intYScale = SkScalarRoundToScalar(realYScale);
+            if (intYScale == 0) {
+                intYScale = SK_Scalar1;
+            }
+            s->fX = intYScale;
+            s->fY = intYScale;
+            break;
+        }
+    }
+
+    // The 'remaining' matrix sA is the total matrix A without the scale.
+    if (!skewedOrFlipped && (
+            (kFull_PreMatrixScale == preMatrixScale) ||
+            (kVertical_PreMatrixScale == preMatrixScale && A.getScaleX() == A.getScaleY())))
+    {
+        // If GA == A and kFull_PreMatrixScale, sA is identity.
+        // If GA == A and kVertical_PreMatrixScale and A.scaleX == A.scaleY, sA is identity.
+        sA->reset();
+    } else if (!skewedOrFlipped && kVertical_PreMatrixScale == preMatrixScale) {
+        // If GA == A and kVertical_PreMatrixScale, sA.scaleY is SK_Scalar1.
+        sA->reset();
+        sA->setScaleX(A.getScaleX() / s->fY);
+    } else {
+        // TODO: like kVertical_PreMatrixScale, kVerticalInteger_PreMatrixScale with int scales.
+        *sA = A;
+        sA->preScale(SkScalarInvert(s->fX), SkScalarInvert(s->fY));
+    }
+
+    // The 'remainingWithoutRotation' matrix GsA is the non-rotational part of A without the scale.
+    if (GsA) {
+        *GsA = GA;
+         // G is rotational so reorders with the scale.
+        GsA->preScale(SkScalarInvert(s->fX), SkScalarInvert(s->fY));
+    }
+}
+
 SkAxisAlignment SkComputeAxisAlignmentForHText(const SkMatrix& matrix) {
     SkASSERT(!matrix.hasPerspective());
 
     if (0 == matrix[SkMatrix::kMSkewY]) {
         return kX_SkAxisAlignment;
     }
-    if (0 == matrix[SkMatrix::kMScaleX]) {
+    if (0 == matrix[SkMatrix::kMSkewX]) {
         return kY_SkAxisAlignment;
     }
     return kNone_SkAxisAlignment;
@@ -933,29 +837,27 @@ SkAxisAlignment SkComputeAxisAlignmentForHText(const SkMatrix& matrix) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "SkFontHost.h"
-
 class SkScalerContext_Empty : public SkScalerContext {
 public:
     SkScalerContext_Empty(SkTypeface* face, const SkDescriptor* desc)
         : SkScalerContext(face, desc) {}
 
 protected:
-    virtual unsigned generateGlyphCount() SK_OVERRIDE {
+    unsigned generateGlyphCount() override {
         return 0;
     }
-    virtual uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE {
+    uint16_t generateCharToGlyph(SkUnichar uni) override {
         return 0;
     }
-    virtual void generateAdvance(SkGlyph* glyph) SK_OVERRIDE {
+    void generateAdvance(SkGlyph* glyph) override {
         glyph->zeroMetrics();
     }
-    virtual void generateMetrics(SkGlyph* glyph) SK_OVERRIDE {
+    void generateMetrics(SkGlyph* glyph) override {
         glyph->zeroMetrics();
     }
-    virtual void generateImage(const SkGlyph& glyph) SK_OVERRIDE {}
-    virtual void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE {}
-    virtual void generateFontMetrics(SkPaint::FontMetrics* metrics) SK_OVERRIDE {
+    void generateImage(const SkGlyph& glyph) override {}
+    void generatePath(const SkGlyph& glyph, SkPath* path) override {}
+    void generateFontMetrics(SkPaint::FontMetrics* metrics) override {
         if (metrics) {
             sk_bzero(metrics, sizeof(*metrics));
         }
@@ -969,8 +871,7 @@ SkScalerContext* SkTypeface::createScalerContext(const SkDescriptor* desc,
     SkScalerContext* c = this->onCreateScalerContext(desc);
 
     if (!c && !allowFailure) {
-        c = SkNEW_ARGS(SkScalerContext_Empty,
-                       (const_cast<SkTypeface*>(this), desc));
+        c = new SkScalerContext_Empty(const_cast<SkTypeface*>(this), desc);
     }
     return c;
 }
diff --git a/gfx/skia/skia/src/core/SkScalerContext.h b/gfx/skia/skia/src/core/SkScalerContext.h
index be5d3b555eb5..302698ee4e58 100644
--- a/gfx/skia/skia/src/core/SkScalerContext.h
+++ b/gfx/skia/skia/src/core/SkScalerContext.h
@@ -14,11 +14,7 @@
 #include "SkPaint.h"
 #include "SkTypeface.h"
 
-#ifdef SK_BUILD_FOR_ANDROID
-    #include "SkPaintOptionsAndroid.h"
-#endif
-
-struct SkGlyph;
+class SkGlyph;
 class SkDescriptor;
 class SkMaskFilter;
 class SkPathEffect;
@@ -29,7 +25,6 @@ class SkRasterizer;
  *  than a nested struct inside SkScalerContext (where it started).
  */
 struct SkScalerContextRec {
-    uint32_t    fOrigFontID;
     uint32_t    fFontID;
     SkScalar    fTextSize, fPreScaleX, fPreSkewX;
     SkScalar    fPost2x2[2][2];
@@ -89,6 +84,50 @@ struct SkScalerContextRec {
     void    getLocalMatrix(SkMatrix*) const;
     void    getSingleMatrix(SkMatrix*) const;
 
+    /** The kind of scale which will be applied by the underlying port (pre-matrix). */
+    enum PreMatrixScale {
+        kFull_PreMatrixScale,  // The underlying port can apply both x and y scale.
+        kVertical_PreMatrixScale,  // The underlying port can only apply a y scale.
+        kVerticalInteger_PreMatrixScale  // The underlying port can only apply an integer y scale.
+    };
+    /**
+     *  Compute useful matrices for use with sizing in underlying libraries.
+     *
+     *  There are two kinds of text size, a 'requested/logical size' which is like asking for size
+     *  '12' and a 'real' size which is the size after the matrix is applied. The matrices produced
+     *  by this method are based on the 'real' size. This method effectively finds the total device
+     *  matrix and decomposes it in various ways.
+     *
+     *  The most useful decomposition is into 'scale' and 'remaining'. The 'scale' is applied first
+     *  and then the 'remaining' to fully apply the total matrix. This decomposition is useful when
+     *  the text size ('scale') may have meaning apart from the total matrix. This is true when
+     *  hinting, and sometimes true for other properties as well.
+     *
+     *  The second (optional) decomposition is of 'remaining' into a non-rotational part
+     *  'remainingWithoutRotation' and a rotational part 'remainingRotation'. The 'scale' is applied
+     *  first, then 'remainingWithoutRotation', then 'remainingRotation' to fully apply the total
+     *  matrix. This decomposition is helpful when only horizontal metrics can be trusted, so the
+     *  'scale' and 'remainingWithoutRotation' will be handled by the underlying library, but
+     *  the final rotation 'remainingRotation' will be handled manually.
+     *
+     *  The 'total' matrix is also (optionally) available. This is useful in cases where the
+     *  underlying library will not be used, often when working directly with font data.
+     *
+     *  The parameters 'scale' and 'remaining' are required, the other pointers may be nullptr.
+     *
+     *  @param preMatrixScale the kind of scale to extract from the total matrix.
+     *  @param scale the scale extracted from the total matrix (both values positive).
+     *  @param remaining apply after scale to apply the total matrix.
+     *  @param remainingWithoutRotation apply after scale to apply the total matrix sans rotation.
+     *  @param remainingRotation apply after remainingWithoutRotation to apply the total matrix.
+     *  @param total the total matrix.
+     */
+    void computeMatrices(PreMatrixScale preMatrixScale,
+                         SkVector* scale, SkMatrix* remaining,
+                         SkMatrix* remainingWithoutRotation = nullptr,
+                         SkMatrix* remainingRotation = nullptr,
+                         SkMatrix* total = nullptr);
+
     inline SkPaint::Hinting getHinting() const;
     inline void setHinting(SkPaint::Hinting);
 
@@ -132,7 +171,7 @@ public:
         kHintingBit2_Flag         = 0x0100,
 
         // Pixel geometry information.
-        // only meaningful if fMaskFormat is LCD16 or LCD32
+        // only meaningful if fMaskFormat is kLCD16
         kLCD_Vertical_Flag        = 0x0200,    // else Horizontal
         kLCD_BGROrder_Flag        = 0x0400,    // else RGB order
 
@@ -164,22 +203,21 @@ public:
         return SkToBool(fRec.fFlags & kVertical_Flag);
     }
 
-    // remember our glyph offset/base
-    void setBaseGlyphCount(unsigned baseGlyphCount) {
-        fBaseGlyphCount = baseGlyphCount;
-    }
-
     /** Return the corresponding glyph for the specified unichar. Since contexts
         may be chained (under the hood), the glyphID that is returned may in
         fact correspond to a different font/context. In that case, we use the
         base-glyph-count to know how to translate back into local glyph space.
      */
-    uint16_t charToGlyphID(SkUnichar uni);
+    uint16_t charToGlyphID(SkUnichar uni) {
+        return generateCharToGlyph(uni);
+    }
 
     /** Map the glyphID to its glyph index, and then to its char code. Unmapped
         glyphs return zero.
     */
-    SkUnichar glyphIDToChar(uint16_t glyphID);
+    SkUnichar glyphIDToChar(uint16_t glyphID) {
+        return (glyphID < getGlyphCount()) ? generateGlyphToChar(glyphID) : 0;
+    }
 
     unsigned    getGlyphCount() { return this->generateGlyphCount(); }
     void        getAdvance(SkGlyph*);
@@ -199,23 +237,16 @@ public:
     static void   GetGammaLUTData(SkScalar contrast, SkScalar paintGamma, SkScalar deviceGamma,
                                   void* data);
 
-#ifdef SK_BUILD_FOR_ANDROID
-    unsigned getBaseGlyphCount(SkUnichar charCode);
-
-    // This function must be public for SkTypeface_android.h, but should not be
-    // called by other callers
-    SkFontID findTypefaceIdForChar(SkUnichar uni);
-#endif
-
-    static void MakeRec(const SkPaint&, const SkDeviceProperties* deviceProperties,
+    static void MakeRec(const SkPaint&, const SkSurfaceProps* surfaceProps,
                         const SkMatrix*, Rec* rec);
     static inline void PostMakeRec(const SkPaint&, Rec*);
 
     static SkMaskGamma::PreBlend GetMaskPreBlend(const Rec& rec);
 
+    const Rec& getRec() const { return fRec; }
+
 protected:
     Rec         fRec;
-    unsigned    fBaseGlyphCount;
 
     /** Generates the contents of glyph.fAdvanceX and glyph.fAdvanceY.
      *  May call getMetrics if that would be just as fast.
@@ -267,15 +298,14 @@ protected:
     virtual SkUnichar generateGlyphToChar(uint16_t glyphId);
 
     void forceGenerateImageFromPath() { fGenerateImageFromPath = true; }
+    void forceOffGenerateImageFromPath() { fGenerateImageFromPath = false; }
 
 private:
+    friend class SkRandomScalerContext; // For debug purposes
+
     // never null
     SkAutoTUnref<SkTypeface> fTypeface;
 
-#ifdef SK_BUILD_FOR_ANDROID
-    SkPaintOptionsAndroid fPaintOptionsAndroid;
-#endif
-
     // optional object, which may be null
     SkPathEffect*   fPathEffect;
     SkMaskFilter*   fMaskFilter;
@@ -288,25 +318,11 @@ private:
     void internalGetPath(const SkGlyph& glyph, SkPath* fillPath,
                          SkPath* devPath, SkMatrix* fillToDevMatrix);
 
-    // Return the context associated with the next logical typeface, or NULL if
-    // there are no more entries in the fallback chain.
-    SkScalerContext* allocNextContext() const;
-
-    // return the next context, treating fNextContext as a cache of the answer
-    SkScalerContext* getNextContext();
-
-    // returns the right context from our link-list for this glyph. If no match
-    // is found, just returns the original context (this)
-    SkScalerContext* getGlyphContext(const SkGlyph& glyph);
-
     // returns the right context from our link-list for this char. If no match
-    // is found it returns NULL. If a match is found then the glyphID param is
+    // is found it returns nullptr. If a match is found then the glyphID param is
     // set to the glyphID that maps to the provided char.
     SkScalerContext* getContextFromChar(SkUnichar uni, uint16_t* glyphID);
 
-    // link-list of context, to handle missing chars. null-terminated.
-    SkScalerContext* fNextContext;
-
     // SkMaskGamma::PreBlend converts linear masks to gamma correcting masks.
 protected:
     // Visible to subclasses so that generateImage can apply the pre-blend directly.
@@ -321,9 +337,6 @@ private:
 #define kPathEffect_SkDescriptorTag     SkSetFourByteTag('p', 't', 'h', 'e')
 #define kMaskFilter_SkDescriptorTag     SkSetFourByteTag('m', 's', 'k', 'f')
 #define kRasterizer_SkDescriptorTag     SkSetFourByteTag('r', 'a', 's', 't')
-#ifdef SK_BUILD_FOR_ANDROID
-#define kAndroidOpts_SkDescriptorTag    SkSetFourByteTag('a', 'n', 'd', 'r')
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/gfx/skia/skia/src/core/SkScan.h b/gfx/skia/skia/src/core/SkScan.h
index 46a81073ead2..ef4487356960 100644
--- a/gfx/skia/skia/src/core/SkScan.h
+++ b/gfx/skia/skia/src/core/SkScan.h
@@ -24,6 +24,15 @@ typedef SkIRect SkXRect;
 
 class SkScan {
 public:
+    /*
+     *  Draws count-1 line segments, one at a time:
+     *      line(pts[0], pts[1])
+     *      line(pts[1], pts[2])
+     *      line(......, pts[count - 1])
+     */
+    typedef void (*HairRgnProc)(const SkPoint[], int count, const SkRegion*, SkBlitter*);
+    typedef void (*HairRCProc)(const SkPoint[], int count, const SkRasterClip&, SkBlitter*);
+
     static void FillPath(const SkPath&, const SkIRect&, SkBlitter*);
 
     ///////////////////////////////////////////////////////////////////////////
@@ -41,10 +50,8 @@ public:
     static void AntiFrameRect(const SkRect&, const SkPoint& strokeSize,
                               const SkRasterClip&, SkBlitter*);
     static void FillTriangle(const SkPoint pts[], const SkRasterClip&, SkBlitter*);
-    static void HairLine(const SkPoint&, const SkPoint&, const SkRasterClip&,
-                         SkBlitter*);
-    static void AntiHairLine(const SkPoint&, const SkPoint&, const SkRasterClip&,
-                             SkBlitter*);
+    static void HairLine(const SkPoint[], int count, const SkRasterClip&, SkBlitter*);
+    static void AntiHairLine(const SkPoint[], int count, const SkRasterClip&, SkBlitter*);
     static void HairRect(const SkRect&, const SkRasterClip&, SkBlitter*);
     static void AntiHairRect(const SkRect&, const SkRasterClip&, SkBlitter*);
     static void HairPath(const SkPath&, const SkRasterClip&, SkBlitter*);
@@ -66,10 +73,8 @@ private:
 
     static void AntiFrameRect(const SkRect&, const SkPoint& strokeSize,
                               const SkRegion*, SkBlitter*);
-    static void HairLineRgn(const SkPoint&, const SkPoint&, const SkRegion*,
-                         SkBlitter*);
-    static void AntiHairLineRgn(const SkPoint&, const SkPoint&, const SkRegion*,
-                             SkBlitter*);
+    static void HairLineRgn(const SkPoint[], int count, const SkRegion*, SkBlitter*);
+    static void AntiHairLineRgn(const SkPoint[], int count, const SkRegion*, SkBlitter*);
 };
 
 /** Assign an SkXRect from a SkIRect, by promoting the src rect's coordinates
diff --git a/gfx/skia/skia/src/core/SkScan_AntiPath.cpp b/gfx/skia/skia/src/core/SkScan_AntiPath.cpp
index b7d470715de0..6ea6b8b07ea3 100644
--- a/gfx/skia/skia/src/core/SkScan_AntiPath.cpp
+++ b/gfx/skia/skia/src/core/SkScan_AntiPath.cpp
@@ -29,15 +29,10 @@
     - destination coordinates, scale equal to the output - often
         abbreviated with 'i' or 'I' in variable names
     - supersampled coordinates, scale equal to the output * SCALE
-
-    Enabling SK_USE_LEGACY_AA_COVERAGE keeps the aa coverage calculations as
-    they were before the fix that unified the output of the RLE and MASK
-    supersamplers.
  */
 
 //#define FORCE_SUPERMASK
 //#define FORCE_RLE
-//#define SK_USE_LEGACY_AA_COVERAGE
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -45,15 +40,15 @@
 class BaseSuperBlitter : public SkBlitter {
 public:
     BaseSuperBlitter(SkBlitter* realBlitter, const SkIRect& ir,
-                     const SkRegion& clip);
+                     const SkRegion& clip, bool isInverse);
 
     /// Must be explicitly defined on subclasses.
     virtual void blitAntiH(int x, int y, const SkAlpha antialias[],
-                           const int16_t runs[]) SK_OVERRIDE {
+                           const int16_t runs[]) override {
         SkDEBUGFAIL("How did I get here?");
     }
     /// May not be called on BaseSuperBlitter because it blits out of order.
-    virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE {
+    void blitV(int x, int y, int height, SkAlpha alpha) override {
         SkDEBUGFAIL("How did I get here?");
     }
 
@@ -73,38 +68,42 @@ protected:
     int fCurrY;
     /// Initial y coordinate (top of bounds).
     int fTop;
+
+    SkIRect fSectBounds;
 };
 
-BaseSuperBlitter::BaseSuperBlitter(SkBlitter* realBlitter, const SkIRect& ir,
-                                   const SkRegion& clip) {
-    fRealBlitter = realBlitter;
+BaseSuperBlitter::BaseSuperBlitter(SkBlitter* realBlit, const SkIRect& ir, const SkRegion& clip,
+                                   bool isInverse) {
+    fRealBlitter = realBlit;
 
-    /*
-     *  We use the clip bounds instead of the ir, since we may be asked to
-     *  draw outside of the rect if we're a inverse filltype
-     */
-    const int left = clip.getBounds().fLeft;
-    const int right = clip.getBounds().fRight;
+    SkIRect sectBounds;
+    if (isInverse) {
+        // We use the clip bounds instead of the ir, since we may be asked to
+        //draw outside of the rect when we're a inverse filltype
+        sectBounds = clip.getBounds();
+    } else {
+        if (!sectBounds.intersect(ir, clip.getBounds())) {
+            sectBounds.setEmpty();
+        }
+    }
+
+    const int left = sectBounds.left();
+    const int right = sectBounds.right();
 
     fLeft = left;
     fSuperLeft = left << SHIFT;
     fWidth = right - left;
-#if 0
-    fCurrIY = -1;
-    fCurrY = -1;
-#else
-    fTop = ir.fTop;
-    fCurrIY = ir.fTop - 1;
-    fCurrY = (ir.fTop << SHIFT) - 1;
-#endif
+    fTop = sectBounds.top();
+    fCurrIY = fTop - 1;
+    fCurrY = (fTop << SHIFT) - 1;
+
     SkDEBUGCODE(fCurrX = -1;)
 }
 
 /// Run-length-encoded supersampling antialiased blitter.
 class SuperBlitter : public BaseSuperBlitter {
 public:
-    SuperBlitter(SkBlitter* realBlitter, const SkIRect& ir,
-                 const SkRegion& clip);
+    SuperBlitter(SkBlitter* realBlitter, const SkIRect& ir, const SkRegion& clip, bool isInverse);
 
     virtual ~SuperBlitter() {
         this->flush();
@@ -116,10 +115,10 @@ public:
 
     /// Blits a row of pixels, with location and width specified
     /// in supersampled coordinates.
-    virtual void blitH(int x, int y, int width) SK_OVERRIDE;
+    void blitH(int x, int y, int width) override;
     /// Blits a rectangle of pixels, with location and size specified
     /// in supersampled coordinates.
-    virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE;
+    void blitRect(int x, int y, int width, int height) override;
 
 private:
     // The next three variables are used to track a circular buffer that
@@ -149,9 +148,10 @@ private:
     int         fOffsetX;
 };
 
-SuperBlitter::SuperBlitter(SkBlitter* realBlitter, const SkIRect& ir,
-                           const SkRegion& clip)
-        : BaseSuperBlitter(realBlitter, ir, clip) {
+SuperBlitter::SuperBlitter(SkBlitter* realBlitter, const SkIRect& ir, const SkRegion& clip,
+                           bool isInverse)
+        : BaseSuperBlitter(realBlitter, ir, clip, isInverse)
+{
     fRunsToBuffer = realBlitter->requestRowsPreserved();
     fRunsBuffer = realBlitter->allocBlitMemory(fRunsToBuffer * this->getRunsSz());
     fCurrentRun = -1;
@@ -185,9 +185,6 @@ void SuperBlitter::flush() {
 */
 static inline int coverage_to_partial_alpha(int aa) {
     aa <<= 8 - 2*SHIFT;
-#ifdef SK_USE_LEGACY_AA_COVERAGE
-    aa -= aa >> (8 - SHIFT - 1);
-#endif
     return aa;
 }
 
@@ -398,13 +395,12 @@ void SuperBlitter::blitRect(int x, int y, int width, int height) {
 /// Masked supersampling antialiased blitter.
 class MaskSuperBlitter : public BaseSuperBlitter {
 public:
-    MaskSuperBlitter(SkBlitter* realBlitter, const SkIRect& ir,
-                     const SkRegion& clip);
+    MaskSuperBlitter(SkBlitter* realBlitter, const SkIRect& ir, const SkRegion&, bool isInverse);
     virtual ~MaskSuperBlitter() {
         fRealBlitter->blitMask(fMask, fClipRect);
     }
 
-    virtual void blitH(int x, int y, int width) SK_OVERRIDE;
+    void blitH(int x, int y, int width) override;
 
     static bool CanHandleRect(const SkIRect& bounds) {
 #ifdef FORCE_RLE
@@ -437,10 +433,12 @@ private:
     uint32_t    fStorage[(kMAX_STORAGE >> 2) + 1];
 };
 
-MaskSuperBlitter::MaskSuperBlitter(SkBlitter* realBlitter, const SkIRect& ir,
-                                   const SkRegion& clip)
-        : BaseSuperBlitter(realBlitter, ir, clip) {
+MaskSuperBlitter::MaskSuperBlitter(SkBlitter* realBlitter, const SkIRect& ir, const SkRegion& clip,
+                                   bool isInverse)
+    : BaseSuperBlitter(realBlitter, ir, clip, isInverse)
+{
     SkASSERT(CanHandleRect(ir));
+    SkASSERT(!isInverse);
 
     fMask.fImage    = (uint8_t*)fStorage;
     fMask.fBounds   = ir;
@@ -448,7 +446,10 @@ MaskSuperBlitter::MaskSuperBlitter(SkBlitter* realBlitter, const SkIRect& ir,
     fMask.fFormat   = SkMask::kA8_Format;
 
     fClipRect = ir;
-    fClipRect.intersect(clip.getBounds());
+    if (!fClipRect.intersect(clip.getBounds())) {
+        SkASSERT(0);
+        fClipRect.setEmpty();
+    }
 
     // For valgrind, write 1 extra byte at the end so we don't read
     // uninitialized memory. See comment in add_aa_span and fStorage[].
@@ -628,6 +629,7 @@ void SkScan::AntiFillPath(const SkPath& path, const SkRegion& origClip,
         return;
     }
 
+    const bool isInverse = path.isInverseFillType();
     SkIRect ir;
 
     if (!safeRoundOut(path.getBounds(), &ir, SK_MaxS32 >> SHIFT)) {
@@ -638,7 +640,7 @@ void SkScan::AntiFillPath(const SkPath& path, const SkRegion& origClip,
         return;
     }
     if (ir.isEmpty()) {
-        if (path.isInverseFillType()) {
+        if (isInverse) {
             blitter->blitRegion(origClip);
         }
         return;
@@ -648,7 +650,7 @@ void SkScan::AntiFillPath(const SkPath& path, const SkRegion& origClip,
     // will overflow 32767 when << by SHIFT, we can't supersample,
     // so draw without antialiasing.
     SkIRect clippedIR;
-    if (path.isInverseFillType()) {
+    if (isInverse) {
        // If the path is an inverse fill, it's going to fill the entire
        // clip, and we care whether the entire clip exceeds our limits.
        clippedIR = origClip.getBounds();
@@ -684,8 +686,8 @@ void SkScan::AntiFillPath(const SkPath& path, const SkRegion& origClip,
     SkScanClipper   clipper(blitter, clipRgn, ir);
     const SkIRect*  clipRect = clipper.getClipRect();
 
-    if (clipper.getBlitter() == NULL) { // clipped out
-        if (path.isInverseFillType()) {
+    if (clipper.getBlitter() == nullptr) { // clipped out
+        if (isInverse) {
             blitter->blitRegion(*clipRgn);
         }
         return;
@@ -694,11 +696,11 @@ void SkScan::AntiFillPath(const SkPath& path, const SkRegion& origClip,
     // now use the (possibly wrapped) blitter
     blitter = clipper.getBlitter();
 
-    if (path.isInverseFillType()) {
+    if (isInverse) {
         sk_blit_above(blitter, ir, *clipRgn);
     }
 
-    SkIRect superRect, *superClipRect = NULL;
+    SkIRect superRect, *superClipRect = nullptr;
 
     if (clipRect) {
         superRect.set(  clipRect->fLeft << SHIFT, clipRect->fTop << SHIFT,
@@ -710,16 +712,16 @@ void SkScan::AntiFillPath(const SkPath& path, const SkRegion& origClip,
 
     // MaskSuperBlitter can't handle drawing outside of ir, so we can't use it
     // if we're an inverse filltype
-    if (!path.isInverseFillType() && MaskSuperBlitter::CanHandleRect(ir) && !forceRLE) {
-        MaskSuperBlitter    superBlit(blitter, ir, *clipRgn);
+    if (!isInverse && MaskSuperBlitter::CanHandleRect(ir) && !forceRLE) {
+        MaskSuperBlitter    superBlit(blitter, ir, *clipRgn, isInverse);
         SkASSERT(SkIntToScalar(ir.fTop) <= path.getBounds().fTop);
         sk_fill_path(path, superClipRect, &superBlit, ir.fTop, ir.fBottom, SHIFT, *clipRgn);
     } else {
-        SuperBlitter    superBlit(blitter, ir, *clipRgn);
+        SuperBlitter    superBlit(blitter, ir, *clipRgn, isInverse);
         sk_fill_path(path, superClipRect, &superBlit, ir.fTop, ir.fBottom, SHIFT, *clipRgn);
     }
 
-    if (path.isInverseFillType()) {
+    if (isInverse) {
         sk_blit_below(blitter, ir, *clipRgn);
     }
 }
diff --git a/gfx/skia/skia/src/core/SkScan_Antihair.cpp b/gfx/skia/skia/src/core/SkScan_Antihair.cpp
index 1ad68e507598..b14e12bab8c8 100644
--- a/gfx/skia/skia/src/core/SkScan_Antihair.cpp
+++ b/gfx/skia/skia/src/core/SkScan_Antihair.cpp
@@ -17,13 +17,13 @@
 /*  Our attempt to compute the worst case "bounds" for the horizontal and
     vertical cases has some numerical bug in it, and we sometimes undervalue
     our extends. The bug is that when this happens, we will set the clip to
-    NULL (for speed), and thus draw outside of the clip by a pixel, which might
+    nullptr (for speed), and thus draw outside of the clip by a pixel, which might
     only look bad, but it might also access memory outside of the valid range
     allcoated for the device bitmap.
 
     This define enables our fix to outset our "bounds" by 1, thus avoiding the
     chance of the bug, but at the cost of sometimes taking the rectblitter
-    case (i.e. not setting the clip to NULL) when we might not actually need
+    case (i.e. not setting the clip to nullptr) when we might not actually need
     to. If we can improve/fix the actual calculations, then we can remove this
     step.
  */
@@ -34,7 +34,7 @@
 static inline int SmallDot6Scale(int value, int dot6) {
     SkASSERT((int16_t)value == value);
     SkASSERT((unsigned)dot6 <= 64);
-    return SkMulS16(value, dot6) >> 6;
+    return (value * dot6) >> 6;
 }
 
 //#define TEST_GAMMA
@@ -88,7 +88,7 @@ static void call_hline_blitter(SkBlitter* blitter, int x, int y, int count,
 
 class SkAntiHairBlitter {
 public:
-    SkAntiHairBlitter() : fBlitter(NULL) {}
+    SkAntiHairBlitter() : fBlitter(nullptr) {}
     virtual ~SkAntiHairBlitter() {}
 
     SkBlitter* getBlitter() const { return fBlitter; }
@@ -106,7 +106,7 @@ private:
 
 class HLine_SkAntiHairBlitter : public SkAntiHairBlitter {
 public:
-    virtual SkFixed drawCap(int x, SkFixed fy, SkFixed slope, int mod64) SK_OVERRIDE {
+    SkFixed drawCap(int x, SkFixed fy, SkFixed slope, int mod64) override {
         fy += SK_Fixed1/2;
 
         int y = fy >> 16;
@@ -128,7 +128,7 @@ public:
     }
 
     virtual SkFixed drawLine(int x, int stopx, SkFixed fy,
-                             SkFixed slope) SK_OVERRIDE {
+                             SkFixed slope) override {
         SkASSERT(x < stopx);
         int count = stopx - x;
         fy += SK_Fixed1/2;
@@ -153,68 +153,27 @@ public:
 
 class Horish_SkAntiHairBlitter : public SkAntiHairBlitter {
 public:
-    virtual SkFixed drawCap(int x, SkFixed fy, SkFixed dy, int mod64) SK_OVERRIDE {
-        int16_t runs[2];
-        uint8_t  aa[1];
-
-        runs[0] = 1;
-        runs[1] = 0;
-
+    SkFixed drawCap(int x, SkFixed fy, SkFixed dy, int mod64) override {
         fy += SK_Fixed1/2;
-        SkBlitter* blitter = this->getBlitter();
 
         int lower_y = fy >> 16;
         uint8_t  a = (uint8_t)(fy >> 8);
-        unsigned ma = SmallDot6Scale(a, mod64);
-        if (ma) {
-            aa[0] = ApplyGamma(gamma, ma);
-            blitter->blitAntiH(x, lower_y, aa, runs);
-            // the clipping blitters might edit runs, but should not affect us
-            SkASSERT(runs[0] == 1);
-            SkASSERT(runs[1] == 0);
-        }
-        ma = SmallDot6Scale(255 - a, mod64);
-        if (ma) {
-            aa[0] = ApplyGamma(gamma, ma);
-            blitter->blitAntiH(x, lower_y - 1, aa, runs);
-            // the clipping blitters might edit runs, but should not affect us
-            SkASSERT(runs[0] == 1);
-            SkASSERT(runs[1] == 0);
-        }
-        fy += dy;
+        unsigned a0 = SmallDot6Scale(255 - a, mod64);
+        unsigned a1 = SmallDot6Scale(a, mod64);
+        this->getBlitter()->blitAntiV2(x, lower_y - 1, a0, a1);
 
-        return fy - SK_Fixed1/2;
+        return fy + dy - SK_Fixed1/2;
     }
 
-    virtual SkFixed drawLine(int x, int stopx, SkFixed fy, SkFixed dy) SK_OVERRIDE {
+    SkFixed drawLine(int x, int stopx, SkFixed fy, SkFixed dy) override {
         SkASSERT(x < stopx);
 
-        int16_t runs[2];
-        uint8_t  aa[1];
-
-        runs[0] = 1;
-        runs[1] = 0;
-
         fy += SK_Fixed1/2;
         SkBlitter* blitter = this->getBlitter();
         do {
             int lower_y = fy >> 16;
             uint8_t  a = (uint8_t)(fy >> 8);
-            if (a) {
-                aa[0] = a;
-                blitter->blitAntiH(x, lower_y, aa, runs);
-                // the clipping blitters might edit runs, but should not affect us
-                SkASSERT(runs[0] == 1);
-                SkASSERT(runs[1] == 0);
-            }
-            a = 255 - a;
-            if (a) {
-                aa[0] = a;
-                blitter->blitAntiH(x, lower_y - 1, aa, runs);
-                // the clipping blitters might edit runs, but should not affect us
-                SkASSERT(runs[0] == 1);
-                SkASSERT(runs[1] == 0);
-            }
+            blitter->blitAntiV2(x, lower_y - 1, 255 - a, a);
             fy += dy;
         } while (++x < stopx);
 
@@ -224,7 +183,7 @@ public:
 
 class VLine_SkAntiHairBlitter : public SkAntiHairBlitter {
 public:
-    virtual SkFixed drawCap(int y, SkFixed fx, SkFixed dx, int mod64) SK_OVERRIDE {
+    SkFixed drawCap(int y, SkFixed fx, SkFixed dx, int mod64) override {
         SkASSERT(0 == dx);
         fx += SK_Fixed1/2;
 
@@ -243,7 +202,7 @@ public:
         return fx - SK_Fixed1/2;
     }
 
-    virtual SkFixed drawLine(int y, int stopy, SkFixed fx, SkFixed dx) SK_OVERRIDE {
+    SkFixed drawLine(int y, int stopy, SkFixed fx, SkFixed dx) override {
         SkASSERT(y < stopy);
         SkASSERT(0 == dx);
         fx += SK_Fixed1/2;
@@ -265,51 +224,24 @@ public:
 
 class Vertish_SkAntiHairBlitter : public SkAntiHairBlitter {
 public:
-    virtual SkFixed drawCap(int y, SkFixed fx, SkFixed dx, int mod64) SK_OVERRIDE {
-        int16_t runs[3];
-        uint8_t  aa[2];
-
-        runs[0] = 1;
-        runs[2] = 0;
-
+    SkFixed drawCap(int y, SkFixed fx, SkFixed dx, int mod64) override {
         fx += SK_Fixed1/2;
+
         int x = fx >> 16;
-        uint8_t  a = (uint8_t)(fx >> 8);
+        uint8_t a = (uint8_t)(fx >> 8);
+        this->getBlitter()->blitAntiH2(x - 1, y,
+                                       SmallDot6Scale(255 - a, mod64), SmallDot6Scale(a, mod64));
 
-        aa[0] = SmallDot6Scale(255 - a, mod64);
-        aa[1] = SmallDot6Scale(a, mod64);
-        // the clippng blitters might overwrite this guy, so we have to reset it each time
-        runs[1] = 1;
-        this->getBlitter()->blitAntiH(x - 1, y, aa, runs);
-        // the clipping blitters might edit runs, but should not affect us
-        SkASSERT(runs[0] == 1);
-        SkASSERT(runs[2] == 0);
-        fx += dx;
-
-        return fx - SK_Fixed1/2;
+        return fx + dx - SK_Fixed1/2;
     }
 
-    virtual SkFixed drawLine(int y, int stopy, SkFixed fx, SkFixed dx) SK_OVERRIDE {
+    SkFixed drawLine(int y, int stopy, SkFixed fx, SkFixed dx) override {
         SkASSERT(y < stopy);
-        int16_t runs[3];
-        uint8_t  aa[2];
-
-        runs[0] = 1;
-        runs[2] = 0;
-
         fx += SK_Fixed1/2;
         do {
             int x = fx >> 16;
-            uint8_t  a = (uint8_t)(fx >> 8);
-
-            aa[0] = 255 - a;
-            aa[1] = a;
-            // the clippng blitters might overwrite this guy, so we have to reset it each time
-            runs[1] = 1;
-            this->getBlitter()->blitAntiH(x - 1, y, aa, runs);
-            // the clipping blitters might edit runs, but should not affect us
-            SkASSERT(runs[0] == 1);
-            SkASSERT(runs[2] == 0);
+            uint8_t a = (uint8_t)(fx >> 8);
+            this->getBlitter()->blitAntiH2(x - 1, y, 255 - a, a);
             fx += dx;
         } while (++y < stopy);
 
@@ -408,7 +340,7 @@ static void do_anti_hairline(SkFDot6 x0, SkFDot6 y0, SkFDot6 x1, SkFDot6 y1,
     Horish_SkAntiHairBlitter    horish_blitter;
     VLine_SkAntiHairBlitter     vline_blitter;
     Vertish_SkAntiHairBlitter   vertish_blitter;
-    SkAntiHairBlitter*          hairBlitter = NULL;
+    SkAntiHairBlitter*          hairBlitter = nullptr;
 
     if (SkAbs32(x1 - x0) > SkAbs32(y1 - y0)) {   // mostly horizontal
         if (x0 > x1) {    // we want to go left-to-right
@@ -480,7 +412,7 @@ static void do_anti_hairline(SkFDot6 x0, SkFDot6 y0, SkFDot6 x1, SkFDot6 y1,
                 return;
             }
             if (clip->fTop <= top && clip->fBottom >= bottom) {
-                clip = NULL;
+                clip = nullptr;
             }
         }
     } else {   // mostly vertical
@@ -556,7 +488,7 @@ static void do_anti_hairline(SkFDot6 x0, SkFDot6 y0, SkFDot6 x1, SkFDot6 y1,
                 return;
             }
             if (clip->fLeft <= left && clip->fRight >= right) {
-                clip = NULL;
+                clip = nullptr;
             }
         }
     }
@@ -588,98 +520,95 @@ static void do_anti_hairline(SkFDot6 x0, SkFDot6 y0, SkFDot6 x1, SkFDot6 y1,
     }
 }
 
-void SkScan::AntiHairLineRgn(const SkPoint& pt0, const SkPoint& pt1,
-                             const SkRegion* clip, SkBlitter* blitter) {
+void SkScan::AntiHairLineRgn(const SkPoint array[], int arrayCount, const SkRegion* clip,
+                             SkBlitter* blitter) {
     if (clip && clip->isEmpty()) {
         return;
     }
 
-    SkASSERT(clip == NULL || !clip->getBounds().isEmpty());
+    SkASSERT(clip == nullptr || !clip->getBounds().isEmpty());
 
 #ifdef TEST_GAMMA
     build_gamma_table();
 #endif
 
-    SkPoint pts[2] = { pt0, pt1 };
-
-    // We have to pre-clip the line to fit in a SkFixed, so we just chop
-    // the line. TODO find a way to actually draw beyond that range.
-    {
-        SkRect fixedBounds;
-        const SkScalar max = SkIntToScalar(32767);
-        fixedBounds.set(-max, -max, max, max);
-        if (!SkLineClipper::IntersectLine(pts, fixedBounds, pts)) {
-            return;
-        }
-    }
+    const SkScalar max = SkIntToScalar(32767);
+    const SkRect fixedBounds = SkRect::MakeLTRB(-max, -max, max, max);
 
+    SkRect clipBounds;
     if (clip) {
-        SkRect clipBounds;
         clipBounds.set(clip->getBounds());
         /*  We perform integral clipping later on, but we do a scalar clip first
-            to ensure that our coordinates are expressible in fixed/integers.
+         to ensure that our coordinates are expressible in fixed/integers.
 
-            antialiased hairlines can draw up to 1/2 of a pixel outside of
-            their bounds, so we need to outset the clip before calling the
-            clipper. To make the numerics safer, we outset by a whole pixel,
-            since the 1/2 pixel boundary is important to the antihair blitter,
-            we don't want to risk numerical fate by chopping on that edge.
+         antialiased hairlines can draw up to 1/2 of a pixel outside of
+         their bounds, so we need to outset the clip before calling the
+         clipper. To make the numerics safer, we outset by a whole pixel,
+         since the 1/2 pixel boundary is important to the antihair blitter,
+         we don't want to risk numerical fate by chopping on that edge.
          */
-        clipBounds.inset(-SK_Scalar1, -SK_Scalar1);
-
-        if (!SkLineClipper::IntersectLine(pts, clipBounds, pts)) {
-            return;
-        }
+        clipBounds.outset(SK_Scalar1, SK_Scalar1);
     }
 
-    SkFDot6 x0 = SkScalarToFDot6(pts[0].fX);
-    SkFDot6 y0 = SkScalarToFDot6(pts[0].fY);
-    SkFDot6 x1 = SkScalarToFDot6(pts[1].fX);
-    SkFDot6 y1 = SkScalarToFDot6(pts[1].fY);
+    for (int i = 0; i < arrayCount - 1; ++i) {
+        SkPoint pts[2];
 
-    if (clip) {
-        SkFDot6 left = SkMin32(x0, x1);
-        SkFDot6 top = SkMin32(y0, y1);
-        SkFDot6 right = SkMax32(x0, x1);
-        SkFDot6 bottom = SkMax32(y0, y1);
-        SkIRect ir;
-
-        ir.set( SkFDot6Floor(left) - 1,
-                SkFDot6Floor(top) - 1,
-                SkFDot6Ceil(right) + 1,
-                SkFDot6Ceil(bottom) + 1);
-
-        if (clip->quickReject(ir)) {
-            return;
+        // We have to pre-clip the line to fit in a SkFixed, so we just chop
+        // the line. TODO find a way to actually draw beyond that range.
+        if (!SkLineClipper::IntersectLine(&array[i], fixedBounds, pts)) {
+            continue;
         }
-        if (!clip->quickContains(ir)) {
-            SkRegion::Cliperator iter(*clip, ir);
-            const SkIRect*       r = &iter.rect();
 
-            while (!iter.done()) {
-                do_anti_hairline(x0, y0, x1, y1, r, blitter);
-                iter.next();
+        if (clip && !SkLineClipper::IntersectLine(pts, clipBounds, pts)) {
+            continue;
+        }
+
+        SkFDot6 x0 = SkScalarToFDot6(pts[0].fX);
+        SkFDot6 y0 = SkScalarToFDot6(pts[0].fY);
+        SkFDot6 x1 = SkScalarToFDot6(pts[1].fX);
+        SkFDot6 y1 = SkScalarToFDot6(pts[1].fY);
+
+        if (clip) {
+            SkFDot6 left = SkMin32(x0, x1);
+            SkFDot6 top = SkMin32(y0, y1);
+            SkFDot6 right = SkMax32(x0, x1);
+            SkFDot6 bottom = SkMax32(y0, y1);
+            SkIRect ir;
+
+            ir.set( SkFDot6Floor(left) - 1,
+                    SkFDot6Floor(top) - 1,
+                    SkFDot6Ceil(right) + 1,
+                    SkFDot6Ceil(bottom) + 1);
+
+            if (clip->quickReject(ir)) {
+                continue;
             }
-            return;
+            if (!clip->quickContains(ir)) {
+                SkRegion::Cliperator iter(*clip, ir);
+                const SkIRect*       r = &iter.rect();
+
+                while (!iter.done()) {
+                    do_anti_hairline(x0, y0, x1, y1, r, blitter);
+                    iter.next();
+                }
+                continue;
+            }
+            // fall through to no-clip case
         }
-        // fall through to no-clip case
+        do_anti_hairline(x0, y0, x1, y1, nullptr, blitter);
     }
-    do_anti_hairline(x0, y0, x1, y1, NULL, blitter);
 }
 
 void SkScan::AntiHairRect(const SkRect& rect, const SkRasterClip& clip,
                           SkBlitter* blitter) {
-    SkPoint p0, p1;
+    SkPoint pts[5];
 
-    p0.set(rect.fLeft, rect.fTop);
-    p1.set(rect.fRight, rect.fTop);
-    SkScan::AntiHairLine(p0, p1, clip, blitter);
-    p0.set(rect.fRight, rect.fBottom);
-    SkScan::AntiHairLine(p0, p1, clip, blitter);
-    p1.set(rect.fLeft, rect.fBottom);
-    SkScan::AntiHairLine(p0, p1, clip, blitter);
-    p0.set(rect.fLeft, rect.fTop);
-    SkScan::AntiHairLine(p0, p1, clip, blitter);
+    pts[0].set(rect.fLeft, rect.fTop);
+    pts[1].set(rect.fRight, rect.fTop);
+    pts[2].set(rect.fRight, rect.fBottom);
+    pts[3].set(rect.fLeft, rect.fBottom);
+    pts[4] = pts[0];
+    SkScan::AntiHairLine(pts, 5, clip, blitter);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -770,7 +699,7 @@ static void antifillrect(const SkXRect& xr, SkBlitter* blitter) {
 
 void SkScan::AntiFillXRect(const SkXRect& xr, const SkRegion* clip,
                           SkBlitter* blitter) {
-    if (NULL == clip) {
+    if (nullptr == clip) {
         antifillrect(xr, blitter);
     } else {
         SkIRect outerBounds;
@@ -816,7 +745,7 @@ void SkScan::AntiFillXRect(const SkXRect& xr, const SkRasterClip& clip,
         XRect_roundOut(xr, &outerBounds);
 
         if (clip.quickContains(outerBounds)) {
-            AntiFillXRect(xr, NULL, blitter);
+            AntiFillXRect(xr, nullptr, blitter);
         } else {
             SkAAClipBlitterWrapper wrapper(clip, blitter);
             blitter = wrapper.getBlitter();
@@ -854,8 +783,7 @@ void SkScan::AntiFillRect(const SkRect& origR, const SkRegion* clip,
             return;
         }
 
-        SkIRect outerBounds;
-        newR.roundOut(&outerBounds);
+        const SkIRect outerBounds = newR.roundOut();
 
         if (clip->isRect()) {
             antifillrect(newR, blitter);
@@ -919,7 +847,11 @@ static void inner_scanline(FDot8 L, int top, FDot8 R, U8CPU alpha,
     SkASSERT(L < R);
 
     if ((L >> 8) == ((R - 1) >> 8)) {  // 1x1 pixel
-        blitter->blitV(L >> 8, top, 1, InvAlphaMul(alpha, R - L));
+        FDot8 widClamp = R - L;
+        // border case clamp 256 to 255 instead of going through call_hline_blitter
+        // see skbug/4406
+        widClamp = widClamp - (widClamp >> 8);
+        blitter->blitV(L >> 8, top, 1, InvAlphaMul(alpha, widClamp));
         return;
     }
 
@@ -975,6 +907,15 @@ static void innerstrokedot8(FDot8 L, FDot8 T, FDot8 R, FDot8 B,
     }
 }
 
+static inline void align_thin_stroke(FDot8& edge1, FDot8& edge2) {
+    SkASSERT(edge1 <= edge2);
+
+    if (FDot8Floor(edge1) == FDot8Floor(edge2)) {
+        edge2 -= (edge1 & 0xFF);
+        edge1 &= ~0xFF;
+    }
+}
+
 void SkScan::AntiFrameRect(const SkRect& r, const SkPoint& strokeSize,
                            const SkRegion* clip, SkBlitter* blitter) {
     SkASSERT(strokeSize.fX >= 0 && strokeSize.fY >= 0);
@@ -983,14 +924,14 @@ void SkScan::AntiFrameRect(const SkRect& r, const SkPoint& strokeSize,
     SkScalar ry = SkScalarHalf(strokeSize.fY);
 
     // outset by the radius
-    FDot8 L = SkScalarToFDot8(r.fLeft - rx);
-    FDot8 T = SkScalarToFDot8(r.fTop - ry);
-    FDot8 R = SkScalarToFDot8(r.fRight + rx);
-    FDot8 B = SkScalarToFDot8(r.fBottom + ry);
+    FDot8 outerL = SkScalarToFDot8(r.fLeft - rx);
+    FDot8 outerT = SkScalarToFDot8(r.fTop - ry);
+    FDot8 outerR = SkScalarToFDot8(r.fRight + rx);
+    FDot8 outerB = SkScalarToFDot8(r.fBottom + ry);
 
     SkIRect outer;
     // set outer to the outer rect of the outer section
-    outer.set(FDot8Floor(L), FDot8Floor(T), FDot8Ceil(R), FDot8Ceil(B));
+    outer.set(FDot8Floor(outerL), FDot8Floor(outerT), FDot8Ceil(outerR), FDot8Ceil(outerB));
 
     SkBlitterClipper clipper;
     if (clip) {
@@ -1003,28 +944,40 @@ void SkScan::AntiFrameRect(const SkRect& r, const SkPoint& strokeSize,
         // now we can ignore clip for the rest of the function
     }
 
-    // stroke the outer hull
-    antifilldot8(L, T, R, B, blitter, false);
-
-    // set outer to the outer rect of the middle section
-    outer.set(FDot8Ceil(L), FDot8Ceil(T), FDot8Floor(R), FDot8Floor(B));
-
     // in case we lost a bit with diameter/2
     rx = strokeSize.fX - rx;
     ry = strokeSize.fY - ry;
-    // inset by the radius
-    L = SkScalarToFDot8(r.fLeft + rx);
-    T = SkScalarToFDot8(r.fTop + ry);
-    R = SkScalarToFDot8(r.fRight - rx);
-    B = SkScalarToFDot8(r.fBottom - ry);
 
-    if (L >= R || T >= B) {
+    // inset by the radius
+    FDot8 innerL = SkScalarToFDot8(r.fLeft + rx);
+    FDot8 innerT = SkScalarToFDot8(r.fTop + ry);
+    FDot8 innerR = SkScalarToFDot8(r.fRight - rx);
+    FDot8 innerB = SkScalarToFDot8(r.fBottom - ry);
+
+    // For sub-unit strokes, tweak the hulls such that one of the edges coincides with the pixel
+    // edge. This ensures that the general rect stroking logic below
+    //   a) doesn't blit the same scanline twice
+    //   b) computes the correct coverage when both edges fall within the same pixel
+    if (strokeSize.fX < 1 || strokeSize.fY < 1) {
+        align_thin_stroke(outerL, innerL);
+        align_thin_stroke(outerT, innerT);
+        align_thin_stroke(innerR, outerR);
+        align_thin_stroke(innerB, outerB);
+    }
+
+    // stroke the outer hull
+    antifilldot8(outerL, outerT, outerR, outerB, blitter, false);
+
+    // set outer to the outer rect of the middle section
+    outer.set(FDot8Ceil(outerL), FDot8Ceil(outerT), FDot8Floor(outerR), FDot8Floor(outerB));
+
+    if (innerL >= innerR || innerT >= innerB) {
         fillcheckrect(outer.fLeft, outer.fTop, outer.fRight, outer.fBottom,
                       blitter);
     } else {
         SkIRect inner;
         // set inner to the inner rect of the middle section
-        inner.set(FDot8Floor(L), FDot8Floor(T), FDot8Ceil(R), FDot8Ceil(B));
+        inner.set(FDot8Floor(innerL), FDot8Floor(innerT), FDot8Ceil(innerR), FDot8Ceil(innerB));
 
         // draw the frame in 4 pieces
         fillcheckrect(outer.fLeft, outer.fTop, outer.fRight, inner.fTop,
@@ -1039,7 +992,7 @@ void SkScan::AntiFrameRect(const SkRect& r, const SkPoint& strokeSize,
         // now stroke the inner rect, which is similar to antifilldot8() except that
         // it treats the fractional coordinates with the inverse bias (since its
         // inner).
-        innerstrokedot8(L, T, R, B, blitter);
+        innerstrokedot8(innerL, innerT, innerR, innerB, blitter);
     }
 }
 
diff --git a/gfx/skia/skia/src/core/SkScan_Hairline.cpp b/gfx/skia/skia/src/core/SkScan_Hairline.cpp
index 1e7e762b5a86..7a6e3ba1874e 100644
--- a/gfx/skia/skia/src/core/SkScan_Hairline.cpp
+++ b/gfx/skia/skia/src/core/SkScan_Hairline.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-
 #include "SkScan.h"
 #include "SkBlitter.h"
 #include "SkRasterClip.h"
@@ -40,103 +38,105 @@ static bool canConvertFDot6ToFixed(SkFDot6 x) {
 }
 #endif
 
-void SkScan::HairLineRgn(const SkPoint& pt0, const SkPoint& pt1,
-                         const SkRegion* clip, SkBlitter* blitter) {
+void SkScan::HairLineRgn(const SkPoint array[], int arrayCount, const SkRegion* clip,
+                         SkBlitter* origBlitter) {
     SkBlitterClipper    clipper;
-    SkRect  r;
     SkIRect clipR, ptsR;
-    SkPoint pts[2] = { pt0, pt1 };
 
-    // We have to pre-clip the line to fit in a SkFixed, so we just chop
-    // the line. TODO find a way to actually draw beyond that range.
-    {
-        SkRect fixedBounds;
-        const SkScalar max = SkIntToScalar(32767);
-        fixedBounds.set(-max, -max, max, max);
-        if (!SkLineClipper::IntersectLine(pts, fixedBounds, pts)) {
-            return;
-        }
+    const SkScalar max = SkIntToScalar(32767);
+    const SkRect fixedBounds = SkRect::MakeLTRB(-max, -max, max, max);
+
+    SkRect clipBounds;
+    if (clip) {
+        clipBounds.set(clip->getBounds());
     }
 
-    if (clip) {
+    for (int i = 0; i < arrayCount - 1; ++i) {
+        SkBlitter* blitter = origBlitter;
+
+        SkPoint pts[2];
+
+        // We have to pre-clip the line to fit in a SkFixed, so we just chop
+        // the line. TODO find a way to actually draw beyond that range.
+        if (!SkLineClipper::IntersectLine(&array[i], fixedBounds, pts)) {
+            continue;
+        }
+
         // Perform a clip in scalar space, so we catch huge values which might
         // be missed after we convert to SkFDot6 (overflow)
-        r.set(clip->getBounds());
-        if (!SkLineClipper::IntersectLine(pts, r, pts)) {
-            return;
-        }
-    }
-
-    SkFDot6 x0 = SkScalarToFDot6(pts[0].fX);
-    SkFDot6 y0 = SkScalarToFDot6(pts[0].fY);
-    SkFDot6 x1 = SkScalarToFDot6(pts[1].fX);
-    SkFDot6 y1 = SkScalarToFDot6(pts[1].fY);
-
-    SkASSERT(canConvertFDot6ToFixed(x0));
-    SkASSERT(canConvertFDot6ToFixed(y0));
-    SkASSERT(canConvertFDot6ToFixed(x1));
-    SkASSERT(canConvertFDot6ToFixed(y1));
-
-    if (clip) {
-        // now perform clipping again, as the rounding to dot6 can wiggle us
-        // our rects are really dot6 rects, but since we've already used
-        // lineclipper, we know they will fit in 32bits (26.6)
-        const SkIRect& bounds = clip->getBounds();
-
-        clipR.set(SkIntToFDot6(bounds.fLeft), SkIntToFDot6(bounds.fTop),
-                  SkIntToFDot6(bounds.fRight), SkIntToFDot6(bounds.fBottom));
-        ptsR.set(x0, y0, x1, y1);
-        ptsR.sort();
-
-        // outset the right and bottom, to account for how hairlines are
-        // actually drawn, which may hit the pixel to the right or below of
-        // the coordinate
-        ptsR.fRight += SK_FDot6One;
-        ptsR.fBottom += SK_FDot6One;
-
-        if (!SkIRect::Intersects(ptsR, clipR)) {
-            return;
-        }
-        if (clip->isRect() && clipR.contains(ptsR)) {
-            clip = NULL;
-        } else {
-            blitter = clipper.apply(blitter, clip);
-        }
-    }
-
-    SkFDot6 dx = x1 - x0;
-    SkFDot6 dy = y1 - y0;
-
-    if (SkAbs32(dx) > SkAbs32(dy)) { // mostly horizontal
-        if (x0 > x1) {   // we want to go left-to-right
-            SkTSwap<SkFDot6>(x0, x1);
-            SkTSwap<SkFDot6>(y0, y1);
-        }
-        int ix0 = SkFDot6Round(x0);
-        int ix1 = SkFDot6Round(x1);
-        if (ix0 == ix1) {// too short to draw
-            return;
+        if (clip && !SkLineClipper::IntersectLine(pts, clipBounds, pts)) {
+            continue;
         }
 
-        SkFixed slope = SkFixedDiv(dy, dx);
-        SkFixed startY = SkFDot6ToFixed(y0) + (slope * ((32 - x0) & 63) >> 6);
+        SkFDot6 x0 = SkScalarToFDot6(pts[0].fX);
+        SkFDot6 y0 = SkScalarToFDot6(pts[0].fY);
+        SkFDot6 x1 = SkScalarToFDot6(pts[1].fX);
+        SkFDot6 y1 = SkScalarToFDot6(pts[1].fY);
 
-        horiline(ix0, ix1, startY, slope, blitter);
-    } else {              // mostly vertical
-        if (y0 > y1) {   // we want to go top-to-bottom
-            SkTSwap<SkFDot6>(x0, x1);
-            SkTSwap<SkFDot6>(y0, y1);
-        }
-        int iy0 = SkFDot6Round(y0);
-        int iy1 = SkFDot6Round(y1);
-        if (iy0 == iy1) { // too short to draw
-            return;
+        SkASSERT(canConvertFDot6ToFixed(x0));
+        SkASSERT(canConvertFDot6ToFixed(y0));
+        SkASSERT(canConvertFDot6ToFixed(x1));
+        SkASSERT(canConvertFDot6ToFixed(y1));
+
+        if (clip) {
+            // now perform clipping again, as the rounding to dot6 can wiggle us
+            // our rects are really dot6 rects, but since we've already used
+            // lineclipper, we know they will fit in 32bits (26.6)
+            const SkIRect& bounds = clip->getBounds();
+
+            clipR.set(SkIntToFDot6(bounds.fLeft), SkIntToFDot6(bounds.fTop),
+                      SkIntToFDot6(bounds.fRight), SkIntToFDot6(bounds.fBottom));
+            ptsR.set(x0, y0, x1, y1);
+            ptsR.sort();
+
+            // outset the right and bottom, to account for how hairlines are
+            // actually drawn, which may hit the pixel to the right or below of
+            // the coordinate
+            ptsR.fRight += SK_FDot6One;
+            ptsR.fBottom += SK_FDot6One;
+
+            if (!SkIRect::Intersects(ptsR, clipR)) {
+                continue;
+            }
+            if (!clip->isRect() || !clipR.contains(ptsR)) {
+                blitter = clipper.apply(origBlitter, clip);
+            }
         }
 
-        SkFixed slope = SkFixedDiv(dx, dy);
-        SkFixed startX = SkFDot6ToFixed(x0) + (slope * ((32 - y0) & 63) >> 6);
+        SkFDot6 dx = x1 - x0;
+        SkFDot6 dy = y1 - y0;
 
-        vertline(iy0, iy1, startX, slope, blitter);
+        if (SkAbs32(dx) > SkAbs32(dy)) { // mostly horizontal
+            if (x0 > x1) {   // we want to go left-to-right
+                SkTSwap<SkFDot6>(x0, x1);
+                SkTSwap<SkFDot6>(y0, y1);
+            }
+            int ix0 = SkFDot6Round(x0);
+            int ix1 = SkFDot6Round(x1);
+            if (ix0 == ix1) {// too short to draw
+                continue;
+            }
+
+            SkFixed slope = SkFixedDiv(dy, dx);
+            SkFixed startY = SkFDot6ToFixed(y0) + (slope * ((32 - x0) & 63) >> 6);
+
+            horiline(ix0, ix1, startY, slope, blitter);
+        } else {              // mostly vertical
+            if (y0 > y1) {   // we want to go top-to-bottom
+                SkTSwap<SkFDot6>(x0, x1);
+                SkTSwap<SkFDot6>(y0, y1);
+            }
+            int iy0 = SkFDot6Round(y0);
+            int iy1 = SkFDot6Round(y1);
+            if (iy0 == iy1) { // too short to draw
+                continue;
+            }
+
+            SkFixed slope = SkFixedDiv(dx, dy);
+            SkFixed startX = SkFDot6ToFixed(x0) + (slope * ((32 - y0) & 63) >> 6);
+
+            vertline(iy0, iy1, startX, slope, blitter);
+        }
     }
 }
 
@@ -190,6 +190,10 @@ void SkScan::HairRect(const SkRect& rect, const SkRasterClip& clip,
 
 #include "SkPath.h"
 #include "SkGeometry.h"
+#include "SkNx.h"
+
+#define kMaxCubicSubdivideLevel 6
+#define kMaxQuadSubdivideLevel  5
 
 static int compute_int_quad_dist(const SkPoint pts[3]) {
     // compute the vector between the control point ([1]) and the middle of the
@@ -210,37 +214,124 @@ static int compute_int_quad_dist(const SkPoint pts[3]) {
     }
 }
 
-typedef void (*LineProc)(const SkPoint&, const SkPoint&, const SkRegion*,
-                         SkBlitter*);
-
 static void hairquad(const SkPoint pts[3], const SkRegion* clip,
-                     SkBlitter* blitter, int level, LineProc lineproc) {
-    if (level > 0) {
-        SkPoint tmp[5];
+                     SkBlitter* blitter, int level, SkScan::HairRgnProc lineproc) {
+    SkASSERT(level <= kMaxQuadSubdivideLevel);
 
-        SkChopQuadAtHalf(pts, tmp);
-        hairquad(tmp, clip, blitter, level - 1, lineproc);
-        hairquad(&tmp[2], clip, blitter, level - 1, lineproc);
-    } else {
-        lineproc(pts[0], pts[2], clip, blitter);
+    SkPoint coeff[3];
+    SkQuadToCoeff(pts, coeff);
+
+    const int lines = 1 << level;
+    Sk2s t(0);
+    Sk2s dt(SK_Scalar1 / lines);
+
+    SkPoint tmp[(1 << kMaxQuadSubdivideLevel) + 1];
+    SkASSERT((unsigned)lines < SK_ARRAY_COUNT(tmp));
+
+    tmp[0] = pts[0];
+    Sk2s A = Sk2s::Load(&coeff[0].fX);
+    Sk2s B = Sk2s::Load(&coeff[1].fX);
+    Sk2s C = Sk2s::Load(&coeff[2].fX);
+    for (int i = 1; i < lines; ++i) {
+        t = t + dt;
+        ((A * t + B) * t + C).store(&tmp[i].fX);
     }
+    tmp[lines] = pts[2];
+    lineproc(tmp, lines + 1, clip, blitter);
 }
 
-static void haircubic(const SkPoint pts[4], const SkRegion* clip,
-                      SkBlitter* blitter, int level, LineProc lineproc) {
-    if (level > 0) {
-        SkPoint tmp[7];
-
-        SkChopCubicAt(pts, tmp, SK_Scalar1/2);
-        haircubic(tmp, clip, blitter, level - 1, lineproc);
-        haircubic(&tmp[3], clip, blitter, level - 1, lineproc);
-    } else {
-        lineproc(pts[0], pts[3], clip, blitter);
-    }
+static inline Sk2s abs(const Sk2s& value) {
+    return Sk2s::Max(value, Sk2s(0)-value);
 }
 
-#define kMaxCubicSubdivideLevel 6
-#define kMaxQuadSubdivideLevel  5
+static inline SkScalar max_component(const Sk2s& value) {
+    SkScalar components[2];
+    value.store(components);
+    return SkTMax(components[0], components[1]);
+}
+
+static inline int compute_cubic_segs(const SkPoint pts[4]) {
+    Sk2s p0 = from_point(pts[0]);
+    Sk2s p1 = from_point(pts[1]);
+    Sk2s p2 = from_point(pts[2]);
+    Sk2s p3 = from_point(pts[3]);
+
+    const Sk2s oneThird(1.0f / 3.0f);
+    const Sk2s twoThird(2.0f / 3.0f);
+
+    Sk2s p13 = oneThird * p3 + twoThird * p0;
+    Sk2s p23 = oneThird * p0 + twoThird * p3;
+
+    SkScalar diff = max_component(Sk2s::Max(abs(p1 - p13), abs(p2 - p23)));
+    SkScalar tol = SK_Scalar1 / 8;
+
+    for (int i = 0; i < kMaxCubicSubdivideLevel; ++i) {
+        if (diff < tol) {
+            return 1 << i;
+        }
+        tol *= 4;
+    }
+    return 1 << kMaxCubicSubdivideLevel;
+}
+
+static bool lt_90(SkPoint p0, SkPoint pivot, SkPoint p2) {
+    return SkVector::DotProduct(p0 - pivot, p2 - pivot) >= 0;
+}
+
+// The off-curve points are "inside" the limits of the on-curve pts
+static bool quick_cubic_niceness_check(const SkPoint pts[4]) {
+    return lt_90(pts[1], pts[0], pts[3]) &&
+           lt_90(pts[2], pts[0], pts[3]) &&
+           lt_90(pts[1], pts[3], pts[0]) &&
+           lt_90(pts[2], pts[3], pts[0]);
+}
+
+static void hair_cubic(const SkPoint pts[4], const SkRegion* clip, SkBlitter* blitter,
+                       SkScan::HairRgnProc lineproc) {
+    const int lines = compute_cubic_segs(pts);
+    SkASSERT(lines > 0);
+    if (1 == lines) {
+        SkPoint tmp[2] = { pts[0], pts[3] };
+        lineproc(tmp, 2, clip, blitter);
+        return;
+    }
+
+    SkPoint coeff[4];
+    SkCubicToCoeff(pts, coeff);
+
+    const Sk2s dt(SK_Scalar1 / lines);
+    Sk2s t(0);
+
+    SkPoint tmp[(1 << kMaxCubicSubdivideLevel) + 1];
+    SkASSERT((unsigned)lines < SK_ARRAY_COUNT(tmp));
+
+    tmp[0] = pts[0];
+    Sk2s A = Sk2s::Load(&coeff[0].fX);
+    Sk2s B = Sk2s::Load(&coeff[1].fX);
+    Sk2s C = Sk2s::Load(&coeff[2].fX);
+    Sk2s D = Sk2s::Load(&coeff[3].fX);
+    for (int i = 1; i < lines; ++i) {
+        t = t + dt;
+        (((A * t + B) * t + C) * t + D).store(&tmp[i].fX);
+    }
+    tmp[lines] = pts[3];
+    lineproc(tmp, lines + 1, clip, blitter);
+}
+
+static inline void haircubic(const SkPoint pts[4], const SkRegion* clip,
+                      SkBlitter* blitter, int level, SkScan::HairRgnProc lineproc) {
+    if (quick_cubic_niceness_check(pts)) {
+        hair_cubic(pts, clip, blitter, lineproc);
+    } else {
+        SkPoint  tmp[13];
+        SkScalar tValues[3];
+
+        int count = SkChopCubicAtMaxCurvature(pts, tmp, tValues);
+        for (int i = 0; i < count; i++) {
+            hair_cubic(&tmp[i * 3], clip, blitter, lineproc);
+        }
+    }
+}
 
 static int compute_quad_level(const SkPoint pts[3]) {
     int d = compute_int_quad_dist(pts);
@@ -257,19 +348,17 @@ static int compute_quad_level(const SkPoint pts[3]) {
     return level;
 }
 
-static void hair_path(const SkPath& path, const SkRasterClip& rclip,
-                      SkBlitter* blitter, LineProc lineproc) {
+static void hair_path(const SkPath& path, const SkRasterClip& rclip, SkBlitter* blitter,
+                      SkScan::HairRgnProc lineproc) {
     if (path.isEmpty()) {
         return;
     }
 
     SkAAClipBlitterWrapper wrap;
-    const SkRegion* clip = NULL;
+    const SkRegion* clip = nullptr;
 
     {
-        SkIRect ibounds;
-        path.getBounds().roundOut(&ibounds);
-        ibounds.inset(-1, -1);
+        const SkIRect ibounds = path.getBounds().roundOut().makeOutset(1, 1);
 
         if (rclip.quickReject(ibounds)) {
             return;
@@ -295,7 +384,7 @@ static void hair_path(const SkPath& path, const SkRasterClip& rclip,
             case SkPath::kMove_Verb:
                 break;
             case SkPath::kLine_Verb:
-                lineproc(pts[0], pts[1], clip, blitter);
+                lineproc(pts, 2, clip, blitter);
                 break;
             case SkPath::kQuad_Verb:
                 hairquad(pts, clip, blitter, compute_quad_level(pts), lineproc);
@@ -312,9 +401,9 @@ static void hair_path(const SkPath& path, const SkRasterClip& rclip,
                 }
                 break;
             }
-            case SkPath::kCubic_Verb:
+            case SkPath::kCubic_Verb: {
                 haircubic(pts, clip, blitter, kMaxCubicSubdivideLevel, lineproc);
-                break;
+            } break;
             case SkPath::kClose_Verb:
                 break;
             case SkPath::kDone_Verb:
@@ -323,13 +412,11 @@ static void hair_path(const SkPath& path, const SkRasterClip& rclip,
     }
 }
 
-void SkScan::HairPath(const SkPath& path, const SkRasterClip& clip,
-                      SkBlitter* blitter) {
+void SkScan::HairPath(const SkPath& path, const SkRasterClip& clip, SkBlitter* blitter) {
     hair_path(path, clip, blitter, SkScan::HairLineRgn);
 }
 
-void SkScan::AntiHairPath(const SkPath& path, const SkRasterClip& clip,
-                          SkBlitter* blitter) {
+void SkScan::AntiHairPath(const SkPath& path, const SkRasterClip& clip, SkBlitter* blitter) {
     hair_path(path, clip, blitter, SkScan::AntiHairLineRgn);
 }
 
@@ -370,48 +457,43 @@ void SkScan::FrameRect(const SkRect& r, const SkPoint& strokeSize,
     SkScan::FillRect(tmp, clip, blitter);
 }
 
-void SkScan::HairLine(const SkPoint& p0, const SkPoint& p1,
-                      const SkRasterClip& clip, SkBlitter* blitter) {
+void SkScan::HairLine(const SkPoint pts[], int count, const SkRasterClip& clip,
+                      SkBlitter* blitter) {
     if (clip.isBW()) {
-        HairLineRgn(p0, p1, &clip.bwRgn(), blitter);
+        HairLineRgn(pts, count, &clip.bwRgn(), blitter);
     } else {
-        const SkRegion* clipRgn = NULL;
+        const SkRegion* clipRgn = nullptr;
+
         SkRect r;
-        SkIRect ir;
-        r.set(p0.fX, p0.fY, p1.fX, p1.fY);
-        r.sort();
-        r.inset(-SK_ScalarHalf, -SK_ScalarHalf);
-        r.roundOut(&ir);
+        r.set(pts, count);
+        r.outset(SK_ScalarHalf, SK_ScalarHalf);
 
         SkAAClipBlitterWrapper wrap;
-        if (!clip.quickContains(ir)) {
+        if (!clip.quickContains(r.roundOut())) {
             wrap.init(clip, blitter);
             blitter = wrap.getBlitter();
             clipRgn = &wrap.getRgn();
         }
-        HairLineRgn(p0, p1, clipRgn, blitter);
+        HairLineRgn(pts, count, clipRgn, blitter);
     }
 }
 
-void SkScan::AntiHairLine(const SkPoint& p0, const SkPoint& p1,
-                          const SkRasterClip& clip, SkBlitter* blitter) {
+void SkScan::AntiHairLine(const SkPoint pts[], int count, const SkRasterClip& clip,
+                          SkBlitter* blitter) {
     if (clip.isBW()) {
-        AntiHairLineRgn(p0, p1, &clip.bwRgn(), blitter);
+        AntiHairLineRgn(pts, count, &clip.bwRgn(), blitter);
     } else {
-        const SkRegion* clipRgn = NULL;
+        const SkRegion* clipRgn = nullptr;
+
         SkRect r;
-        SkIRect ir;
-        r.set(p0.fX, p0.fY, p1.fX, p1.fY);
-        r.sort();
-        r.roundOut(&ir);
-        ir.inset(-1, -1);
+        r.set(pts, count);
 
         SkAAClipBlitterWrapper wrap;
-        if (!clip.quickContains(ir)) {
+        if (!clip.quickContains(r.roundOut().makeOutset(1, 1))) {
             wrap.init(clip, blitter);
             blitter = wrap.getBlitter();
             clipRgn = &wrap.getRgn();
         }
-        AntiHairLineRgn(p0, p1, clipRgn, blitter);
+        AntiHairLineRgn(pts, count, clipRgn, blitter);
     }
 }
diff --git a/gfx/skia/skia/src/core/SkScan_Path.cpp b/gfx/skia/skia/src/core/SkScan_Path.cpp
index 6eaf44b08ad9..fc79fc8537d0 100644
--- a/gfx/skia/skia/src/core/SkScan_Path.cpp
+++ b/gfx/skia/skia/src/core/SkScan_Path.cpp
@@ -17,10 +17,6 @@
 #include "SkTemplates.h"
 #include "SkTSort.h"
 
-#ifdef SK_USE_LEGACY_AA_COVERAGE
-    #define SK_USE_STD_SORT_FOR_EDGES
-#endif
-
 #define kEDGE_HEAD_Y    SK_MinS32
 #define kEDGE_TAIL_Y    SK_MaxS32
 
@@ -45,34 +41,23 @@ static inline void remove_edge(SkEdge* edge) {
     edge->fNext->fPrev = edge->fPrev;
 }
 
-static inline void swap_edges(SkEdge* prev, SkEdge* next) {
-    SkASSERT(prev->fNext == next && next->fPrev == prev);
-
-    // remove prev from the list
-    prev->fPrev->fNext = next;
-    next->fPrev = prev->fPrev;
-
-    // insert prev after next
-    prev->fNext = next->fNext;
-    next->fNext->fPrev = prev;
-    next->fNext = prev;
-    prev->fPrev = next;
+static inline void insert_edge_after(SkEdge* edge, SkEdge* afterMe) {
+    edge->fPrev = afterMe;
+    edge->fNext = afterMe->fNext;
+    afterMe->fNext->fPrev = edge;
+    afterMe->fNext = edge;
 }
 
 static void backward_insert_edge_based_on_x(SkEdge* edge SkDECLAREPARAM(int, curr_y)) {
     SkFixed x = edge->fX;
 
-    for (;;) {
-        SkEdge* prev = edge->fPrev;
-
-        // add 1 to curr_y since we may have added new edges (built from curves)
-        // that start on the next scanline
-        SkASSERT(prev && prev->fFirstY <= curr_y + 1);
-
-        if (prev->fX <= x) {
-            break;
-        }
-        swap_edges(prev, edge);
+    SkEdge* prev = edge->fPrev;
+    while (prev->fX > x) {
+        prev = prev->fPrev;
+    }
+    if (prev->fNext != edge) {
+        remove_edge(edge);
+        insert_edge_after(edge, prev);
     }
 }
 
@@ -113,7 +98,7 @@ typedef void (*PrePostProc)(SkBlitter* blitter, int y, bool isStartOfScanline);
 
 static void walk_edges(SkEdge* prevHead, SkPath::FillType fillType,
                        SkBlitter* blitter, int start_y, int stop_y,
-                       PrePostProc proc) {
+                       PrePostProc proc, int rightClip) {
     validate_sort(prevHead->fNext);
 
     int curr_y = start_y;
@@ -183,6 +168,14 @@ static void walk_edges(SkEdge* prevHead, SkPath::FillType fillType,
             SkASSERT(currE);
         }
 
+        // was our right-edge culled away?
+        if (in_interval) {
+            int width = rightClip - left;
+            if (width > 0) {
+                blitter->blitH(left, curr_y, width);
+            }
+        }
+
         if (proc) {
             proc(blitter, curr_y, PREPOST_END);    // post-proc
         }
@@ -260,8 +253,6 @@ static void walk_convex_edges(SkEdge* prevHead, SkPath::FillType,
             if (L < R) {
                 count += 1;
                 blitter->blitRect(L, local_top, R - L, count);
-                left += count * dLeft;
-                rite += count * dRite;
             }
             local_top = local_bot + 1;
         } else {
@@ -332,7 +323,7 @@ public:
     }
 
     // overrides
-    virtual void blitH(int x, int y, int width) {
+    void blitH(int x, int y, int width) override {
         int invWidth = x - fPrevX;
         if (invWidth > 0) {
             fBlitter->blitH(fPrevX, y, invWidth);
@@ -341,21 +332,21 @@ public:
     }
 
     // we do not expect to get called with these entrypoints
-    virtual void blitAntiH(int, int, const SkAlpha[], const int16_t runs[]) {
+    void blitAntiH(int, int, const SkAlpha[], const int16_t runs[]) override {
         SkDEBUGFAIL("blitAntiH unexpected");
     }
-    virtual void blitV(int x, int y, int height, SkAlpha alpha) {
+    void blitV(int x, int y, int height, SkAlpha alpha) override {
         SkDEBUGFAIL("blitV unexpected");
     }
-    virtual void blitRect(int x, int y, int width, int height) {
+    void blitRect(int x, int y, int width, int height) override {
         SkDEBUGFAIL("blitRect unexpected");
     }
-    virtual void blitMask(const SkMask&, const SkIRect& clip) {
+    void blitMask(const SkMask&, const SkIRect& clip) override {
         SkDEBUGFAIL("blitMask unexpected");
     }
-    virtual const SkBitmap* justAnOpaqueColor(uint32_t* value) {
+    const SkPixmap* justAnOpaqueColor(uint32_t* value) override {
         SkDEBUGFAIL("justAnOpaqueColor unexpected");
-        return NULL;
+        return nullptr;
     }
 
 private:
@@ -373,27 +364,6 @@ static void PrePostInverseBlitterProc(SkBlitter* blitter, int y, bool isStart) {
 #pragma warning ( pop )
 #endif
 
-#ifdef SK_USE_STD_SORT_FOR_EDGES
-extern "C" {
-    static int edge_compare(const void* a, const void* b) {
-        const SkEdge* edgea = *(const SkEdge**)a;
-        const SkEdge* edgeb = *(const SkEdge**)b;
-
-        int valuea = edgea->fFirstY;
-        int valueb = edgeb->fFirstY;
-
-        if (valuea == valueb) {
-            valuea = edgea->fX;
-            valueb = edgeb->fX;
-        }
-
-        // this overflows if valuea >>> valueb or vice-versa
-        //     return valuea - valueb;
-        // do perform the slower but safe compares
-        return (valuea < valueb) ? -1 : (valuea > valueb);
-    }
-}
-#else
 static bool operator<(const SkEdge& a, const SkEdge& b) {
     int valuea = a.fFirstY;
     int valueb = b.fFirstY;
@@ -405,14 +375,9 @@ static bool operator<(const SkEdge& a, const SkEdge& b) {
 
     return valuea < valueb;
 }
-#endif
 
 static SkEdge* sort_edges(SkEdge* list[], int count, SkEdge** last) {
-#ifdef SK_USE_STD_SORT_FOR_EDGES
-    qsort(list, count, sizeof(SkEdge*), edge_compare);
-#else
     SkTQSort(list, list + count - 1);
-#endif
 
     // now make the edges linked in sorted order
     for (int i = 1; i < count; i++) {
@@ -430,16 +395,20 @@ static SkEdge* sort_edges(SkEdge* list[], int count, SkEdge** last) {
 // clipRect (if no null) has already been shifted up
 //
 void sk_fill_path(const SkPath& path, const SkIRect* clipRect, SkBlitter* blitter,
-                  int start_y, int stop_y, int shiftEdgesUp,
-                  const SkRegion& clipRgn) {
+                  int start_y, int stop_y, int shiftEdgesUp, const SkRegion& clipRgn) {
     SkASSERT(blitter);
 
     SkEdgeBuilder   builder;
 
-    int count = builder.build(path, clipRect, shiftEdgesUp);
+    // If we're convex, then we need both edges, even the right edge is past the clip
+    const bool canCullToTheRight = !path.isConvex();
+
+    int count = builder.build(path, clipRect, shiftEdgesUp, canCullToTheRight);
+    SkASSERT(count >= 0);
+
     SkEdge**    list = builder.edgeList();
 
-    if (count < 2) {
+    if (0 == count) {
         if (path.isInverseFillType()) {
             /*
              *  Since we are in inverse-fill, our caller has already drawn above
@@ -461,7 +430,6 @@ void sk_fill_path(const SkPath& path, const SkIRect* clipRect, SkBlitter* blitte
                                   rect.height() << shiftEdgesUp);
             }
         }
-
         return;
     }
 
@@ -469,14 +437,14 @@ void sk_fill_path(const SkPath& path, const SkIRect* clipRect, SkBlitter* blitte
     // this returns the first and last edge after they're sorted into a dlink list
     SkEdge* edge = sort_edges(list, count, &last);
 
-    headEdge.fPrev = NULL;
+    headEdge.fPrev = nullptr;
     headEdge.fNext = edge;
     headEdge.fFirstY = kEDGE_HEAD_Y;
     headEdge.fX = SK_MinS32;
     edge->fPrev = &headEdge;
 
     tailEdge.fPrev = last;
-    tailEdge.fNext = NULL;
+    tailEdge.fNext = nullptr;
     tailEdge.fFirstY = kEDGE_TAIL_Y;
     last->fNext = &tailEdge;
 
@@ -492,7 +460,7 @@ void sk_fill_path(const SkPath& path, const SkIRect* clipRect, SkBlitter* blitte
     }
 
     InverseBlitter  ib;
-    PrePostProc     proc = NULL;
+    PrePostProc     proc = nullptr;
 
     if (path.isInverseFillType()) {
         ib.setBlitter(blitter, clipRgn.getBounds(), shiftEdgesUp);
@@ -500,10 +468,18 @@ void sk_fill_path(const SkPath& path, const SkIRect* clipRect, SkBlitter* blitte
         proc = PrePostInverseBlitterProc;
     }
 
-    if (path.isConvex() && (NULL == proc)) {
-        walk_convex_edges(&headEdge, path.getFillType(), blitter, start_y, stop_y, NULL);
+    if (path.isConvex() && (nullptr == proc)) {
+        SkASSERT(count >= 2);   // convex walker does not handle missing right edges
+        walk_convex_edges(&headEdge, path.getFillType(), blitter, start_y, stop_y, nullptr);
     } else {
-        walk_edges(&headEdge, path.getFillType(), blitter, start_y, stop_y, proc);
+        int rightEdge;
+        if (clipRect) {
+            rightEdge = clipRect->right();
+        } else {
+            rightEdge = SkScalarRoundToInt(path.getBounds().right()) << shiftEdgesUp;
+        }
+        
+        walk_edges(&headEdge, path.getFillType(), blitter, start_y, stop_y, proc, rightEdge);
     }
 }
 
@@ -542,8 +518,8 @@ void sk_blit_below(SkBlitter* blitter, const SkIRect& ir, const SkRegion& clip)
  */
 SkScanClipper::SkScanClipper(SkBlitter* blitter, const SkRegion* clip,
                              const SkIRect& ir, bool skipRejectTest) {
-    fBlitter = NULL;     // null means blit nothing
-    fClipRect = NULL;
+    fBlitter = nullptr;     // null means blit nothing
+    fClipRect = nullptr;
 
     if (clip) {
         fClipRect = &clip->getBounds();
@@ -553,7 +529,7 @@ SkScanClipper::SkScanClipper(SkBlitter* blitter, const SkRegion* clip,
 
         if (clip->isRect()) {
             if (fClipRect->contains(ir)) {
-                fClipRect = NULL;
+                fClipRect = nullptr;
             } else {
                 // only need a wrapper blitter if we're horizontally clipped
                 if (fClipRect->fLeft > ir.fLeft || fClipRect->fRight < ir.fRight) {
@@ -677,14 +653,14 @@ static void sk_fill_triangle(const SkPoint pts[], const SkIRect* clipRect,
     // this returns the first and last edge after they're sorted into a dlink list
     SkEdge* edge = sort_edges(list, count, &last);
 
-    headEdge.fPrev = NULL;
+    headEdge.fPrev = nullptr;
     headEdge.fNext = edge;
     headEdge.fFirstY = kEDGE_HEAD_Y;
     headEdge.fX = SK_MinS32;
     edge->fPrev = &headEdge;
 
     tailEdge.fPrev = last;
-    tailEdge.fNext = NULL;
+    tailEdge.fNext = nullptr;
     tailEdge.fFirstY = kEDGE_TAIL_Y;
     last->fNext = &tailEdge;
 
@@ -697,8 +673,8 @@ static void sk_fill_triangle(const SkPoint pts[], const SkIRect* clipRect,
     if (clipRect && start_y < clipRect->fTop) {
         start_y = clipRect->fTop;
     }
-    walk_convex_edges(&headEdge, SkPath::kEvenOdd_FillType, blitter, start_y, stop_y, NULL);
-//    walk_edges(&headEdge, SkPath::kEvenOdd_FillType, blitter, start_y, stop_y, NULL);
+    walk_convex_edges(&headEdge, SkPath::kEvenOdd_FillType, blitter, start_y, stop_y, nullptr);
+//    walk_edges(&headEdge, SkPath::kEvenOdd_FillType, blitter, start_y, stop_y, nullptr);
 }
 
 void SkScan::FillTriangle(const SkPoint pts[], const SkRasterClip& clip,
@@ -727,7 +703,7 @@ void SkScan::FillTriangle(const SkPoint pts[], const SkRasterClip& clip,
 
     SkScanClipper clipper(blitter, clipRgn, ir);
     blitter = clipper.getBlitter();
-    if (NULL != blitter) {
+    if (blitter) {
         sk_fill_triangle(pts, clipper.getClipRect(), blitter, ir);
     }
 }
diff --git a/gfx/skia/skia/src/core/SkSemaphore.cpp b/gfx/skia/skia/src/core/SkSemaphore.cpp
new file mode 100644
index 000000000000..da422e282f6e
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkSemaphore.cpp
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "../private/SkSemaphore.h"
+
+#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
+    #include <mach/mach.h>
+    struct SkBaseSemaphore::OSSemaphore {
+        semaphore_t fSemaphore;
+
+        OSSemaphore()  {
+            semaphore_create(mach_task_self(), &fSemaphore, SYNC_POLICY_LIFO, 0/*initial count*/);
+        }
+        ~OSSemaphore() { semaphore_destroy(mach_task_self(), fSemaphore); }
+
+        void signal(int n) { while (n --> 0) { semaphore_signal(fSemaphore); } }
+        void wait() { semaphore_wait(fSemaphore); }
+    };
+#elif defined(SK_BUILD_FOR_WIN32)
+    struct SkBaseSemaphore::OSSemaphore {
+        HANDLE fSemaphore;
+
+        OSSemaphore()  {
+            fSemaphore = CreateSemaphore(nullptr    /*security attributes, optional*/,
+                                         0       /*initial count*/,
+                                         MAXLONG /*max count*/,
+                                         nullptr    /*name, optional*/);
+        }
+        ~OSSemaphore() { CloseHandle(fSemaphore); }
+
+        void signal(int n) {
+            ReleaseSemaphore(fSemaphore, n, nullptr/*returns previous count, optional*/);
+        }
+        void wait() { WaitForSingleObject(fSemaphore, INFINITE/*timeout in ms*/); }
+    };
+#else
+    // It's important we test for Mach before this.  This code will compile but not work there.
+    #include <errno.h>
+    #include <semaphore.h>
+    struct SkBaseSemaphore::OSSemaphore {
+        sem_t fSemaphore;
+
+        OSSemaphore()  { sem_init(&fSemaphore, 0/*cross process?*/, 0/*initial count*/); }
+        ~OSSemaphore() { sem_destroy(&fSemaphore); }
+
+        void signal(int n) { while (n --> 0) { sem_post(&fSemaphore); } }
+        void wait() {
+            // Try until we're not interrupted.
+            while(sem_wait(&fSemaphore) == -1 && errno == EINTR);
+        }
+    };
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+
+void SkBaseSemaphore::signal(int n) {
+    SkASSERT(n >= 0);
+
+    // We only want to call the OS semaphore when our logical count crosses
+    // from <= 0 to >0 (when we need to wake sleeping threads).
+    //
+    // This is easiest to think about with specific examples of prev and n.
+    // If n == 5 and prev == -3, there are 3 threads sleeping and we signal
+    // SkTMin(-(-3), 5) == 3 times on the OS semaphore, leaving the count at 2.
+    //
+    // If prev >= 0, no threads are waiting, SkTMin(-prev, n) is always <= 0,
+    // so we don't call the OS semaphore, leaving the count at (prev + n).
+    int prev = sk_atomic_fetch_add(&fCount, n, sk_memory_order_release);
+    int toSignal = SkTMin(-prev, n);
+    if (toSignal > 0) {
+        this->osSignal(toSignal);
+    }
+}
+
+static SkBaseSemaphore::OSSemaphore* semaphore(SkBaseSemaphore* semaphore) {
+    return semaphore->fOSSemaphore.get([](){ return new SkBaseSemaphore::OSSemaphore(); });
+}
+
+void SkBaseSemaphore::osSignal(int n) { semaphore(this)->signal(n); }
+
+void SkBaseSemaphore::osWait() { semaphore(this)->wait(); }
+
+void SkBaseSemaphore::deleteSemaphore() {
+    delete (OSSemaphore*) fOSSemaphore;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+SkSemaphore::SkSemaphore(){ fBaseSemaphore = {0, {0}}; }
+
+SkSemaphore::~SkSemaphore() { fBaseSemaphore.deleteSemaphore(); }
+
+void SkSemaphore::wait() { fBaseSemaphore.wait(); }
+
+void SkSemaphore::signal(int n) {fBaseSemaphore.signal(n); }
diff --git a/gfx/skia/skia/src/core/SkShader.cpp b/gfx/skia/skia/src/core/SkShader.cpp
index d533cd69b422..0ec1433a9084 100644
--- a/gfx/skia/skia/src/core/SkShader.cpp
+++ b/gfx/skia/skia/src/core/SkShader.cpp
@@ -5,16 +5,17 @@
  * found in the LICENSE file.
  */
 
+#include "SkAtomics.h"
 #include "SkBitmapProcShader.h"
+#include "SkColorShader.h"
 #include "SkEmptyShader.h"
-#include "SkReadBuffer.h"
 #include "SkMallocPixelRef.h"
 #include "SkPaint.h"
 #include "SkPicture.h"
 #include "SkPictureShader.h"
+#include "SkReadBuffer.h"
 #include "SkScalar.h"
 #include "SkShader.h"
-#include "SkThread.h"
 #include "SkWriteBuffer.h"
 
 //#define SK_TRACK_SHADER_LIFETIME
@@ -43,15 +44,8 @@ SkShader::SkShader(const SkMatrix* localMatrix) {
     } else {
         fLocalMatrix.reset();
     }
-}
-
-SkShader::SkShader(SkReadBuffer& buffer) : INHERITED(buffer) {
-    inc_shader_counter();
-    if (buffer.readBool()) {
-        buffer.readMatrix(&fLocalMatrix);
-    } else {
-        fLocalMatrix.reset();
-    }
+    // Pre-cache so future calls to fLocalMatrix.getType() are threadsafe.
+    (void)fLocalMatrix.getType();
 }
 
 SkShader::~SkShader() {
@@ -79,15 +73,27 @@ bool SkShader::computeTotalInverse(const ContextRec& rec, SkMatrix* totalInverse
     return m->invert(totalInverse);
 }
 
+bool SkShader::asLuminanceColor(SkColor* colorPtr) const {
+    SkColor storage;
+    if (nullptr == colorPtr) {
+        colorPtr = &storage;
+    }
+    if (this->onAsLuminanceColor(colorPtr)) {
+        *colorPtr = SkColorSetA(*colorPtr, 0xFF);   // we only return opaque
+        return true;
+    }
+    return false;
+}
+
 SkShader::Context* SkShader::createContext(const ContextRec& rec, void* storage) const {
-    if (!this->computeTotalInverse(rec, NULL)) {
-        return NULL;
+    if (!this->computeTotalInverse(rec, nullptr)) {
+        return nullptr;
     }
     return this->onCreateContext(rec, storage);
 }
 
 SkShader::Context* SkShader::onCreateContext(const ContextRec& rec, void*) const {
-    return NULL;
+    return nullptr;
 }
 
 size_t SkShader::contextSize() const {
@@ -108,7 +114,7 @@ SkShader::Context::Context(const SkShader& shader, const ContextRec& rec)
 SkShader::Context::~Context() {}
 
 SkShader::Context::ShadeProc SkShader::Context::asAShadeProc(void** ctx) {
-    return NULL;
+    return nullptr;
 }
 
 #include "SkColorPriv.h"
@@ -189,7 +195,7 @@ SkShader::Context::MatrixClass SkShader::Context::ComputeMatrixClass(const SkMat
     MatrixClass mc = kLinear_MatrixClass;
 
     if (mat.hasPerspective()) {
-        if (mat.fixedStepInX(0, NULL, NULL)) {
+        if (mat.fixedStepInX(0, nullptr, nullptr)) {
             mc = kFixedStepInX_MatrixClass;
         } else {
             mc = kPerspective_MatrixClass;
@@ -200,36 +206,31 @@ SkShader::Context::MatrixClass SkShader::Context::ComputeMatrixClass(const SkMat
 
 //////////////////////////////////////////////////////////////////////////////
 
-SkShader::BitmapType SkShader::asABitmap(SkBitmap*, SkMatrix*, TileMode*) const {
-    return kNone_BitmapType;
-}
-
 SkShader::GradientType SkShader::asAGradient(GradientInfo* info) const {
     return kNone_GradientType;
 }
 
-bool SkShader::asNewEffect(GrContext* context, const SkPaint& paint,
-                           const SkMatrix* localMatrixOrNull, GrColor* paintColor,
-                           GrEffect** effect)  const {
-    return false;
+const GrFragmentProcessor* SkShader::asFragmentProcessor(GrContext*, const SkMatrix&,
+                                                         const SkMatrix*, SkFilterQuality)  const {
+    return nullptr;
 }
 
 SkShader* SkShader::refAsALocalMatrixShader(SkMatrix*) const {
-    return NULL;
+    return nullptr;
 }
 
-SkShader* SkShader::CreateEmptyShader() {
-    return SkNEW(SkEmptyShader);
-}
+SkShader* SkShader::CreateEmptyShader() { return new SkEmptyShader; }
+
+SkShader* SkShader::CreateColorShader(SkColor color) { return new SkColorShader(color); }
 
 SkShader* SkShader::CreateBitmapShader(const SkBitmap& src, TileMode tmx, TileMode tmy,
                                        const SkMatrix* localMatrix) {
-    return ::CreateBitmapShader(src, tmx, tmy, localMatrix, NULL);
+    return SkCreateBitmapShader(src, tmx, tmy, localMatrix, nullptr);
 }
 
-SkShader* SkShader::CreatePictureShader(SkPicture* src, TileMode tmx, TileMode tmy,
-                                       const SkMatrix* localMatrix) {
-    return SkPictureShader::Create(src, tmx, tmy, localMatrix);
+SkShader* SkShader::CreatePictureShader(const SkPicture* src, TileMode tmx, TileMode tmy,
+                                        const SkMatrix* localMatrix, const SkRect* tile) {
+    return SkPictureShader::Create(src, tmx, tmy, localMatrix, tile);
 }
 
 #ifndef SK_IGNORE_TO_STRING
@@ -243,7 +244,6 @@ void SkShader::toString(SkString* str) const {
 
 //////////////////////////////////////////////////////////////////////////////
 
-#include "SkColorShader.h"
 #include "SkUtils.h"
 
 SkColorShader::SkColorShader(SkColor c)
@@ -254,21 +254,11 @@ bool SkColorShader::isOpaque() const {
     return SkColorGetA(fColor) == 255;
 }
 
-SkColorShader::SkColorShader(SkReadBuffer& b) : INHERITED(b) {
-    // V25_COMPATIBILITY_CODE We had a boolean to make the color shader inherit the paint's
-    // color. We don't support that any more.
-    if (b.isVersionLT(SkReadBuffer::kColorShaderNoBool_Version)) {
-        if (b.readBool()) {
-            SkDEBUGFAIL("We shouldn't have pictures that recorded the inherited case.");
-            fColor = SK_ColorWHITE;
-            return;
-        }
-    }
-    fColor = b.readColor();
+SkFlattenable* SkColorShader::CreateProc(SkReadBuffer& buffer) {
+    return new SkColorShader(buffer.readColor());
 }
 
 void SkColorShader::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
     buffer.writeColor(fColor);
 }
 
@@ -281,7 +271,7 @@ uint8_t SkColorShader::ColorShaderContext::getSpan16Alpha() const {
 }
 
 SkShader::Context* SkColorShader::onCreateContext(const ContextRec& rec, void* storage) const {
-    return SkNEW_PLACEMENT_ARGS(storage, ColorShaderContext, (*this, rec));
+    return new (storage) ColorShaderContext(*this, rec);
 }
 
 SkColorShader::ColorShaderContext::ColorShaderContext(const SkColorShader& shader,
@@ -326,12 +316,6 @@ void SkColorShader::ColorShaderContext::shadeSpanAlpha(int x, int y, uint8_t alp
     memset(alpha, SkGetPackedA32(fPMColor), count);
 }
 
-// if we had a asAColor method, that would be more efficient...
-SkShader::BitmapType SkColorShader::asABitmap(SkBitmap* bitmap, SkMatrix* matrix,
-                                              TileMode modes[]) const {
-    return kNone_BitmapType;
-}
-
 SkShader::GradientType SkColorShader::asAGradient(GradientInfo* info) const {
     if (info) {
         if (info->fColors && info->fColorCount >= 1) {
@@ -346,24 +330,12 @@ SkShader::GradientType SkColorShader::asAGradient(GradientInfo* info) const {
 #if SK_SUPPORT_GPU
 
 #include "SkGr.h"
-
-bool SkColorShader::asNewEffect(GrContext* context, const SkPaint& paint,
-                                const SkMatrix* localMatrix, GrColor* paintColor,
-                                GrEffect** effect) const {
-    *effect = NULL;
-    SkColor skColor = fColor;
-    U8CPU newA = SkMulDiv255Round(SkColorGetA(fColor), paint.getAlpha());
-    *paintColor = SkColor2GrColor(SkColorSetA(skColor, newA));
-    return true;
-}
-
-#else
-
-bool SkColorShader::asNewEffect(GrContext* context, const SkPaint& paint,
-                                     const SkMatrix* localMatrix, GrColor* paintColor,
-                                     GrEffect** effect) const {
-    SkDEBUGFAIL("Should not call in GPU-less build");
-    return false;
+#include "effects/GrConstColorProcessor.h"
+const GrFragmentProcessor* SkColorShader::asFragmentProcessor(GrContext*, const SkMatrix&,
+                                                              const SkMatrix*,
+                                                              SkFilterQuality) const {
+    GrColor color = SkColorToPremulGrColor(fColor);
+    return GrConstColorProcessor::Create(color, GrConstColorProcessor::kModulateA_InputMode);
 }
 
 #endif
@@ -383,6 +355,10 @@ void SkColorShader::toString(SkString* str) const {
 
 ///////////////////////////////////////////////////////////////////////////////
 
+SkFlattenable* SkEmptyShader::CreateProc(SkReadBuffer&) {
+    return SkShader::CreateEmptyShader();
+}
+
 #ifndef SK_IGNORE_TO_STRING
 #include "SkEmptyShader.h"
 
diff --git a/gfx/skia/skia/src/core/SkSharedMutex.cpp b/gfx/skia/skia/src/core/SkSharedMutex.cpp
new file mode 100644
index 000000000000..aeaf5776bf4e
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkSharedMutex.cpp
@@ -0,0 +1,350 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkSharedMutex.h"
+
+#include "SkAtomics.h"
+#include "SkTypes.h"
+#include "SkSemaphore.h"
+
+#if defined(THREAD_SANITIZER)
+
+/* Report that a lock has been created at address "lock". */
+#define ANNOTATE_RWLOCK_CREATE(lock) \
+    AnnotateRWLockCreate(__FILE__, __LINE__, lock)
+
+/* Report that the lock at address "lock" is about to be destroyed. */
+#define ANNOTATE_RWLOCK_DESTROY(lock) \
+    AnnotateRWLockDestroy(__FILE__, __LINE__, lock)
+
+/* Report that the lock at address "lock" has been acquired.
+   is_w=1 for writer lock, is_w=0 for reader lock. */
+#define ANNOTATE_RWLOCK_ACQUIRED(lock, is_w) \
+    AnnotateRWLockAcquired(__FILE__, __LINE__, lock, is_w)
+
+/* Report that the lock at address "lock" is about to be released. */
+#define ANNOTATE_RWLOCK_RELEASED(lock, is_w) \
+  AnnotateRWLockReleased(__FILE__, __LINE__, lock, is_w)
+
+#ifdef DYNAMIC_ANNOTATIONS_WANT_ATTRIBUTE_WEAK
+# ifdef __GNUC__
+#  define DYNAMIC_ANNOTATIONS_ATTRIBUTE_WEAK __attribute__((weak))
+# else
+/* TODO(glider): for Windows support we may want to change this macro in order
+   to prepend __declspec(selectany) to the annotations' declarations. */
+#  error weak annotations are not supported for your compiler
+# endif
+#else
+# define DYNAMIC_ANNOTATIONS_ATTRIBUTE_WEAK
+#endif
+
+extern "C" {
+void AnnotateRWLockCreate(
+    const char *file, int line,
+    const volatile void *lock) DYNAMIC_ANNOTATIONS_ATTRIBUTE_WEAK;
+void AnnotateRWLockDestroy(
+    const char *file, int line,
+    const volatile void *lock) DYNAMIC_ANNOTATIONS_ATTRIBUTE_WEAK;
+void AnnotateRWLockAcquired(
+    const char *file, int line,
+    const volatile void *lock, long is_w) DYNAMIC_ANNOTATIONS_ATTRIBUTE_WEAK;
+void AnnotateRWLockReleased(
+    const char *file, int line,
+    const volatile void *lock, long is_w) DYNAMIC_ANNOTATIONS_ATTRIBUTE_WEAK;
+}
+
+#else
+
+#define ANNOTATE_RWLOCK_CREATE(lock)
+#define ANNOTATE_RWLOCK_DESTROY(lock)
+#define ANNOTATE_RWLOCK_ACQUIRED(lock, is_w)
+#define ANNOTATE_RWLOCK_RELEASED(lock, is_w)
+
+#endif
+
+#ifdef SK_DEBUG
+
+    #include "SkThreadID.h"
+    #include "SkTDArray.h"
+
+    class SkSharedMutex::ThreadIDSet {
+    public:
+        // Returns true if threadID is in the set.
+        bool find(SkThreadID threadID) const {
+            for (auto& t : fThreadIDs) {
+                if (t == threadID) return true;
+            }
+            return false;
+        }
+
+        // Returns true if did not already exist.
+        bool tryAdd(SkThreadID threadID) {
+            for (auto& t : fThreadIDs) {
+                if (t == threadID) return false;
+            }
+            fThreadIDs.append(1, &threadID);
+            return true;
+        }
+        // Returns true if already exists in Set.
+        bool tryRemove(SkThreadID threadID) {
+            for (int i = 0; i < fThreadIDs.count(); ++i) {
+                if (fThreadIDs[i] == threadID) {
+                    fThreadIDs.remove(i);
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        void swap(ThreadIDSet& other) {
+            fThreadIDs.swap(other.fThreadIDs);
+        }
+
+        int count() const {
+            return fThreadIDs.count();
+        }
+
+    private:
+        SkTDArray<SkThreadID> fThreadIDs;
+    };
+
+    SkSharedMutex::SkSharedMutex()
+        : fCurrentShared(new ThreadIDSet)
+        , fWaitingExclusive(new ThreadIDSet)
+        , fWaitingShared(new ThreadIDSet){
+        ANNOTATE_RWLOCK_CREATE(this);
+    }
+
+    SkSharedMutex::~SkSharedMutex() {  ANNOTATE_RWLOCK_DESTROY(this); }
+
+    void SkSharedMutex::acquire() {
+        SkThreadID threadID(SkGetThreadID());
+        int currentSharedCount;
+        int waitingExclusiveCount;
+        {
+            SkAutoMutexAcquire l(&fMu);
+
+            if (!fWaitingExclusive->tryAdd(threadID)) {
+                SkDEBUGFAILF("Thread %lx already has an exclusive lock\n", threadID);
+            }
+
+            currentSharedCount = fCurrentShared->count();
+            waitingExclusiveCount = fWaitingExclusive->count();
+        }
+
+        if (currentSharedCount > 0 || waitingExclusiveCount > 1) {
+            fExclusiveQueue.wait();
+        }
+
+        ANNOTATE_RWLOCK_ACQUIRED(this, 1);
+    }
+
+    // Implementation Detail:
+    // The shared threads need two seperate queues to keep the threads that were added after the
+    // exclusive lock separate from the threads added before.
+    void SkSharedMutex::release() {
+        ANNOTATE_RWLOCK_RELEASED(this, 1);
+        SkThreadID threadID(SkGetThreadID());
+        int sharedWaitingCount;
+        int exclusiveWaitingCount;
+        int sharedQueueSelect;
+        {
+            SkAutoMutexAcquire l(&fMu);
+            SkASSERT(0 == fCurrentShared->count());
+            if (!fWaitingExclusive->tryRemove(threadID)) {
+                SkDEBUGFAILF("Thread %lx did not have the lock held.\n", threadID);
+            }
+            exclusiveWaitingCount = fWaitingExclusive->count();
+            sharedWaitingCount = fWaitingShared->count();
+            fWaitingShared.swap(fCurrentShared);
+            sharedQueueSelect = fSharedQueueSelect;
+            if (sharedWaitingCount > 0) {
+                fSharedQueueSelect = 1 - fSharedQueueSelect;
+            }
+        }
+
+        if (sharedWaitingCount > 0) {
+            fSharedQueue[sharedQueueSelect].signal(sharedWaitingCount);
+        } else if (exclusiveWaitingCount > 0) {
+            fExclusiveQueue.signal();
+        }
+    }
+
+    void SkSharedMutex::assertHeld() const {
+        SkThreadID threadID(SkGetThreadID());
+        SkAutoMutexAcquire l(&fMu);
+        SkASSERT(0 == fCurrentShared->count());
+        SkASSERT(fWaitingExclusive->find(threadID));
+    }
+
+    void SkSharedMutex::acquireShared() {
+        SkThreadID threadID(SkGetThreadID());
+        int exclusiveWaitingCount;
+        int sharedQueueSelect;
+        {
+            SkAutoMutexAcquire l(&fMu);
+            exclusiveWaitingCount = fWaitingExclusive->count();
+            if (exclusiveWaitingCount > 0) {
+                if (!fWaitingShared->tryAdd(threadID)) {
+                    SkDEBUGFAILF("Thread %lx was already waiting!\n", threadID);
+                }
+            } else {
+                if (!fCurrentShared->tryAdd(threadID)) {
+                    SkDEBUGFAILF("Thread %lx already holds a shared lock!\n", threadID);
+                }
+            }
+            sharedQueueSelect = fSharedQueueSelect;
+        }
+
+        if (exclusiveWaitingCount > 0) {
+            fSharedQueue[sharedQueueSelect].wait();
+        }
+
+        ANNOTATE_RWLOCK_ACQUIRED(this, 0);
+    }
+
+    void SkSharedMutex::releaseShared() {
+        ANNOTATE_RWLOCK_RELEASED(this, 0);
+        SkThreadID threadID(SkGetThreadID());
+
+        int currentSharedCount;
+        int waitingExclusiveCount;
+        {
+            SkAutoMutexAcquire l(&fMu);
+            if (!fCurrentShared->tryRemove(threadID)) {
+                SkDEBUGFAILF("Thread %lx does not hold a shared lock.\n", threadID);
+            }
+            currentSharedCount = fCurrentShared->count();
+            waitingExclusiveCount = fWaitingExclusive->count();
+        }
+
+        if (0 == currentSharedCount && waitingExclusiveCount > 0) {
+            fExclusiveQueue.signal();
+        }
+    }
+
+    void SkSharedMutex::assertHeldShared() const {
+        SkThreadID threadID(SkGetThreadID());
+        SkAutoMutexAcquire l(&fMu);
+        SkASSERT(fCurrentShared->find(threadID));
+    }
+
+#else
+
+    // The fQueueCounts fields holds many counts in an int32_t in order to make managing them atomic.
+    // These three counts must be the same size, so each gets 10 bits. The 10 bits represent
+    // the log of the count which is 1024.
+    //
+    // The three counts held in fQueueCounts are:
+    // * Shared - the number of shared lock holders currently running.
+    // * WaitingExclusive - the number of threads waiting for an exclusive lock.
+    // * WaitingShared - the number of threads waiting to run while waiting for an exclusive thread
+    //   to finish.
+    static const int kLogThreadCount = 10;
+
+    enum {
+        kSharedOffset          = (0 * kLogThreadCount),
+        kWaitingExlusiveOffset = (1 * kLogThreadCount),
+        kWaitingSharedOffset   = (2 * kLogThreadCount),
+        kSharedMask            = ((1 << kLogThreadCount) - 1) << kSharedOffset,
+        kWaitingExclusiveMask  = ((1 << kLogThreadCount) - 1) << kWaitingExlusiveOffset,
+        kWaitingSharedMask     = ((1 << kLogThreadCount) - 1) << kWaitingSharedOffset,
+    };
+
+    SkSharedMutex::SkSharedMutex() : fQueueCounts(0) { ANNOTATE_RWLOCK_CREATE(this); }
+    SkSharedMutex::~SkSharedMutex() {  ANNOTATE_RWLOCK_DESTROY(this); }
+    void SkSharedMutex::acquire() {
+        // Increment the count of exclusive queue waiters.
+        int32_t oldQueueCounts = fQueueCounts.fetch_add(1 << kWaitingExlusiveOffset,
+                                                        sk_memory_order_acquire);
+
+        // If there are no other exclusive waiters and no shared threads are running then run
+        // else wait.
+        if ((oldQueueCounts & kWaitingExclusiveMask) > 0 || (oldQueueCounts & kSharedMask) > 0) {
+            fExclusiveQueue.wait();
+        }
+        ANNOTATE_RWLOCK_ACQUIRED(this, 1);
+    }
+
+    void SkSharedMutex::release() {
+        ANNOTATE_RWLOCK_RELEASED(this, 1);
+
+        int32_t oldQueueCounts = fQueueCounts.load(sk_memory_order_relaxed);
+        int32_t waitingShared;
+        int32_t newQueueCounts;
+        do {
+            newQueueCounts = oldQueueCounts;
+
+            // Decrement exclusive waiters.
+            newQueueCounts -= 1 << kWaitingExlusiveOffset;
+
+            // The number of threads waiting to acquire a shared lock.
+            waitingShared = (oldQueueCounts & kWaitingSharedMask) >> kWaitingSharedOffset;
+
+            // If there are any move the counts of all the shared waiters to actual shared. They are
+            // going to run next.
+            if (waitingShared > 0) {
+
+                // Set waiting shared to zero.
+                newQueueCounts &= ~kWaitingSharedMask;
+
+                // Because this is the exclusive release, then there are zero readers. So, the bits
+                // for shared locks should be zero. Since those bits are zero, we can just |= in the
+                // waitingShared count instead of clearing with an &= and then |= the count.
+                newQueueCounts |= waitingShared << kSharedOffset;
+            }
+
+        } while (!fQueueCounts.compare_exchange(&oldQueueCounts, newQueueCounts,
+                                                sk_memory_order_release, sk_memory_order_relaxed));
+
+        if (waitingShared > 0) {
+            // Run all the shared.
+            fSharedQueue.signal(waitingShared);
+        } else if ((newQueueCounts & kWaitingExclusiveMask) > 0) {
+            // Run a single exclusive waiter.
+            fExclusiveQueue.signal();
+        }
+    }
+
+    void SkSharedMutex::acquireShared() {
+        int32_t oldQueueCounts = fQueueCounts.load(sk_memory_order_relaxed);
+        int32_t newQueueCounts;
+        do {
+            newQueueCounts = oldQueueCounts;
+            // If there are waiting exclusives then this shared lock waits else it runs.
+            if ((newQueueCounts & kWaitingExclusiveMask) > 0) {
+                newQueueCounts += 1 << kWaitingSharedOffset;
+            } else {
+                newQueueCounts += 1 << kSharedOffset;
+            }
+        } while (!fQueueCounts.compare_exchange(&oldQueueCounts, newQueueCounts,
+                                                sk_memory_order_acquire, sk_memory_order_relaxed));
+
+        // If there are waiting exclusives, then this shared waits until after it runs.
+        if ((newQueueCounts & kWaitingExclusiveMask) > 0) {
+            fSharedQueue.wait();
+        }
+        ANNOTATE_RWLOCK_ACQUIRED(this, 0);
+
+    }
+
+    void SkSharedMutex::releaseShared() {
+        ANNOTATE_RWLOCK_RELEASED(this, 0);
+
+        // Decrement the shared count.
+        int32_t oldQueueCounts = fQueueCounts.fetch_sub(1 << kSharedOffset,
+                                                        sk_memory_order_release);
+
+        // If shared count is going to zero (because the old count == 1) and there are exclusive
+        // waiters, then run a single exclusive waiter.
+        if (((oldQueueCounts & kSharedMask) >> kSharedOffset) == 1
+            && (oldQueueCounts & kWaitingExclusiveMask) > 0) {
+            fExclusiveQueue.signal();
+        }
+    }
+
+#endif
diff --git a/gfx/skia/skia/src/core/SkSharedMutex.h b/gfx/skia/skia/src/core/SkSharedMutex.h
new file mode 100644
index 000000000000..840c2d36adf1
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkSharedMutex.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkSharedLock_DEFINED
+#define SkSharedLock_DEFINED
+
+#include "SkAtomics.h"
+#include "SkSemaphore.h"
+#include "SkTypes.h"
+
+#ifdef SK_DEBUG
+    #include "SkMutex.h"
+    #include "SkUniquePtr.h"
+#endif  // SK_DEBUG
+
+// There are two shared lock implementations one debug the other is high performance. They implement
+// an interface similar to pthread's rwlocks.
+// This is a shared lock implementation similar to pthreads rwlocks. The high performance
+// implementation is cribbed from Preshing's article:
+// http://preshing.com/20150316/semaphores-are-surprisingly-versatile/
+//
+// This lock does not obey strict queue ordering. It will always alternate between readers and
+// a single writer.
+class SkSharedMutex {
+public:
+    SkSharedMutex();
+    ~SkSharedMutex();
+    // Acquire lock for exclusive use.
+    void acquire();
+
+    // Release lock for exclusive use.
+    void release();
+
+    // Fail if exclusive is not held.
+    void assertHeld() const;
+
+    // Acquire lock for shared use.
+    void acquireShared();
+
+    // Release lock for shared use.
+    void releaseShared();
+
+    // Fail if shared lock not held.
+    void assertHeldShared() const;
+
+private:
+#ifdef SK_DEBUG
+    class ThreadIDSet;
+    skstd::unique_ptr<ThreadIDSet> fCurrentShared;
+    skstd::unique_ptr<ThreadIDSet> fWaitingExclusive;
+    skstd::unique_ptr<ThreadIDSet> fWaitingShared;
+    int fSharedQueueSelect{0};
+    mutable SkMutex fMu;
+    SkSemaphore fSharedQueue[2];
+    SkSemaphore fExclusiveQueue;
+#else
+    SkAtomic<int32_t> fQueueCounts;
+    SkSemaphore       fSharedQueue;
+    SkSemaphore       fExclusiveQueue;
+#endif  // SK_DEBUG
+};
+
+#ifndef SK_DEBUG
+inline void SkSharedMutex::assertHeld() const {};
+inline void SkSharedMutex::assertHeldShared() const {};
+#endif  // SK_DEBUG
+
+class SkAutoSharedMutexShared {
+public:
+    SkAutoSharedMutexShared(SkSharedMutex& lock) : fLock(lock) { lock.acquireShared(); }
+    ~SkAutoSharedMutexShared() { fLock.releaseShared(); }
+private:
+    SkSharedMutex& fLock;
+};
+
+#define SkAutoSharedMutexShared(...) SK_REQUIRE_LOCAL_VAR(SkAutoSharedMutexShared)
+
+#endif // SkSharedLock_DEFINED
diff --git a/gfx/skia/skia/src/core/SkSinTable.h b/gfx/skia/skia/src/core/SkSinTable.h
deleted file mode 100644
index ac26b9e59b29..000000000000
--- a/gfx/skia/skia/src/core/SkSinTable.h
+++ /dev/null
@@ -1,277 +0,0 @@
-
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#ifndef SkSinTable_DEFINED
-#define SkSinTable_DEFINED
-
-#include "SkTypes.h"
-
-/* Fixed point values (low 16 bits) of sin(radians) for
-    radians in [0...PI/2)
-*/
-static const uint16_t gSkSinTable[256] = {
-    0x0000,
-    0x0192,
-    0x0324,
-    0x04B6,
-    0x0648,
-    0x07DA,
-    0x096C,
-    0x0AFE,
-    0x0C8F,
-    0x0E21,
-    0x0FB2,
-    0x1144,
-    0x12D5,
-    0x1466,
-    0x15F6,
-    0x1787,
-    0x1917,
-    0x1AA7,
-    0x1C37,
-    0x1DC7,
-    0x1F56,
-    0x20E5,
-    0x2273,
-    0x2402,
-    0x2590,
-    0x271D,
-    0x28AA,
-    0x2A37,
-    0x2BC4,
-    0x2D50,
-    0x2EDB,
-    0x3066,
-    0x31F1,
-    0x337B,
-    0x3505,
-    0x368E,
-    0x3817,
-    0x399F,
-    0x3B26,
-    0x3CAD,
-    0x3E33,
-    0x3FB9,
-    0x413E,
-    0x42C3,
-    0x4447,
-    0x45CA,
-    0x474D,
-    0x48CE,
-    0x4A50,
-    0x4BD0,
-    0x4D50,
-    0x4ECF,
-    0x504D,
-    0x51CA,
-    0x5347,
-    0x54C3,
-    0x563E,
-    0x57B8,
-    0x5931,
-    0x5AAA,
-    0x5C22,
-    0x5D98,
-    0x5F0E,
-    0x6083,
-    0x61F7,
-    0x636A,
-    0x64DC,
-    0x664D,
-    0x67BD,
-    0x692D,
-    0x6A9B,
-    0x6C08,
-    0x6D74,
-    0x6EDF,
-    0x7049,
-    0x71B1,
-    0x7319,
-    0x7480,
-    0x75E5,
-    0x774A,
-    0x78AD,
-    0x7A0F,
-    0x7B70,
-    0x7CD0,
-    0x7E2E,
-    0x7F8B,
-    0x80E7,
-    0x8242,
-    0x839C,
-    0x84F4,
-    0x864B,
-    0x87A1,
-    0x88F5,
-    0x8A48,
-    0x8B9A,
-    0x8CEA,
-    0x8E39,
-    0x8F87,
-    0x90D3,
-    0x921E,
-    0x9368,
-    0x94B0,
-    0x95F6,
-    0x973C,
-    0x987F,
-    0x99C2,
-    0x9B02,
-    0x9C42,
-    0x9D7F,
-    0x9EBC,
-    0x9FF6,
-    0xA12F,
-    0xA267,
-    0xA39D,
-    0xA4D2,
-    0xA605,
-    0xA736,
-    0xA866,
-    0xA994,
-    0xAAC0,
-    0xABEB,
-    0xAD14,
-    0xAE3B,
-    0xAF61,
-    0xB085,
-    0xB1A8,
-    0xB2C8,
-    0xB3E7,
-    0xB504,
-    0xB620,
-    0xB73A,
-    0xB852,
-    0xB968,
-    0xBA7C,
-    0xBB8F,
-    0xBCA0,
-    0xBDAE,
-    0xBEBC,
-    0xBFC7,
-    0xC0D0,
-    0xC1D8,
-    0xC2DE,
-    0xC3E2,
-    0xC4E3,
-    0xC5E4,
-    0xC6E2,
-    0xC7DE,
-    0xC8D8,
-    0xC9D1,
-    0xCAC7,
-    0xCBBB,
-    0xCCAE,
-    0xCD9F,
-    0xCE8D,
-    0xCF7A,
-    0xD064,
-    0xD14D,
-    0xD233,
-    0xD318,
-    0xD3FA,
-    0xD4DB,
-    0xD5B9,
-    0xD695,
-    0xD770,
-    0xD848,
-    0xD91E,
-    0xD9F2,
-    0xDAC4,
-    0xDB94,
-    0xDC61,
-    0xDD2D,
-    0xDDF6,
-    0xDEBE,
-    0xDF83,
-    0xE046,
-    0xE106,
-    0xE1C5,
-    0xE282,
-    0xE33C,
-    0xE3F4,
-    0xE4AA,
-    0xE55E,
-    0xE60F,
-    0xE6BE,
-    0xE76B,
-    0xE816,
-    0xE8BF,
-    0xE965,
-    0xEA09,
-    0xEAAB,
-    0xEB4B,
-    0xEBE8,
-    0xEC83,
-    0xED1C,
-    0xEDB2,
-    0xEE46,
-    0xEED8,
-    0xEF68,
-    0xEFF5,
-    0xF080,
-    0xF109,
-    0xF18F,
-    0xF213,
-    0xF294,
-    0xF314,
-    0xF391,
-    0xF40B,
-    0xF484,
-    0xF4FA,
-    0xF56D,
-    0xF5DE,
-    0xF64D,
-    0xF6BA,
-    0xF724,
-    0xF78B,
-    0xF7F1,
-    0xF853,
-    0xF8B4,
-    0xF912,
-    0xF96E,
-    0xF9C7,
-    0xFA1E,
-    0xFA73,
-    0xFAC5,
-    0xFB14,
-    0xFB61,
-    0xFBAC,
-    0xFBF5,
-    0xFC3B,
-    0xFC7E,
-    0xFCBF,
-    0xFCFE,
-    0xFD3A,
-    0xFD74,
-    0xFDAB,
-    0xFDE0,
-    0xFE13,
-    0xFE43,
-    0xFE70,
-    0xFE9B,
-    0xFEC4,
-    0xFEEA,
-    0xFF0E,
-    0xFF2F,
-    0xFF4E,
-    0xFF6A,
-    0xFF84,
-    0xFF9C,
-    0xFFB1,
-    0xFFC3,
-    0xFFD3,
-    0xFFE1,
-    0xFFEC,
-    0xFFF4,
-    0xFFFB,
-    0xFFFE
-};
-
-#endif
diff --git a/gfx/skia/skia/src/core/SkSmallAllocator.h b/gfx/skia/skia/src/core/SkSmallAllocator.h
index 018705f974f1..79b1d299bce8 100644
--- a/gfx/skia/skia/src/core/SkSmallAllocator.h
+++ b/gfx/skia/skia/src/core/SkSmallAllocator.h
@@ -11,17 +11,13 @@
 #include "SkTDArray.h"
 #include "SkTypes.h"
 
-// Used by SkSmallAllocator to call the destructor for objects it has
-// allocated.
-template<typename T> void destroyT(void* ptr) {
-   static_cast<T*>(ptr)->~T();
-}
+#include <new>
 
 /*
  *  Template class for allocating small objects without additional heap memory
  *  allocations. kMaxObjects is a hard limit on the number of objects that can
  *  be allocated using this class. After that, attempts to create more objects
- *  with this class will assert and return NULL.
+ *  with this class will assert and return nullptr.
  *  kTotalBytes is the total number of bytes provided for storage for all
  *  objects created by this allocator. If an object to be created is larger
  *  than the storage (minus storage already used), it will be allocated on the
@@ -44,7 +40,7 @@ public:
             Rec* rec = &fRecs[fNumObjects];
             rec->fKillProc(rec->fObj);
             // Safe to do if fObj is in fStorage, since fHeapStorage will
-            // point to NULL.
+            // point to nullptr.
             sk_free(rec->fHeapStorage);
         }
     }
@@ -52,58 +48,16 @@ public:
     /*
      *  Create a new object of type T. Its lifetime will be handled by this
      *  SkSmallAllocator.
-     *  Each version behaves the same but takes a different number of
-     *  arguments.
-     *  Note: If kMaxObjects have been created by this SkSmallAllocator, NULL
+     *  Note: If kMaxObjects have been created by this SkSmallAllocator, nullptr
      *  will be returned.
      */
-    template<typename T>
-    T* createT() {
+    template<typename T, typename... Args>
+    T* createT(const Args&... args) {
         void* buf = this->reserveT<T>();
-        if (NULL == buf) {
-            return NULL;
+        if (nullptr == buf) {
+            return nullptr;
         }
-        SkNEW_PLACEMENT(buf, T);
-        return static_cast<T*>(buf);
-    }
-
-    template<typename T, typename A1> T* createT(const A1& a1) {
-        void* buf = this->reserveT<T>();
-        if (NULL == buf) {
-            return NULL;
-        }
-        SkNEW_PLACEMENT_ARGS(buf, T, (a1));
-        return static_cast<T*>(buf);
-    }
-
-    template<typename T, typename A1, typename A2>
-    T* createT(const A1& a1, const A2& a2) {
-        void* buf = this->reserveT<T>();
-        if (NULL == buf) {
-            return NULL;
-        }
-        SkNEW_PLACEMENT_ARGS(buf, T, (a1, a2));
-        return static_cast<T*>(buf);
-    }
-
-    template<typename T, typename A1, typename A2, typename A3>
-    T* createT(const A1& a1, const A2& a2, const A3& a3) {
-        void* buf = this->reserveT<T>();
-        if (NULL == buf) {
-            return NULL;
-        }
-        SkNEW_PLACEMENT_ARGS(buf, T, (a1, a2, a3));
-        return static_cast<T*>(buf);
-    }
-
-    template<typename T, typename A1, typename A2, typename A3, typename A4>
-    T* createT(const A1& a1, const A2& a2, const A3& a3, const A4& a4) {
-        void* buf = this->reserveT<T>();
-        if (NULL == buf) {
-            return NULL;
-        }
-        SkNEW_PLACEMENT_ARGS(buf, T, (a1, a2, a3, a4));
-        return static_cast<T*>(buf);
+        return new (buf) T(args...);
     }
 
     /*
@@ -117,7 +71,7 @@ public:
         SkASSERT(fNumObjects < kMaxObjects);
         SkASSERT(storageRequired >= sizeof(T));
         if (kMaxObjects == fNumObjects) {
-            return NULL;
+            return nullptr;
         }
         const size_t storageRemaining = SkAlign4(kTotalBytes) - fStorageUsed;
         storageRequired = SkAlign4(storageRequired);
@@ -133,12 +87,12 @@ public:
         } else {
             // There is space in fStorage.
             rec->fStorageSize = storageRequired;
-            rec->fHeapStorage = NULL;
+            rec->fHeapStorage = nullptr;
             SkASSERT(SkIsAlign4(fStorageUsed));
             rec->fObj = static_cast<void*>(fStorage + (fStorageUsed / 4));
             fStorageUsed += storageRequired;
         }
-        rec->fKillProc = destroyT<T>;
+        rec->fKillProc = DestroyT<T>;
         fNumObjects++;
         return rec->fObj;
     }
@@ -165,6 +119,12 @@ private:
         void   (*fKillProc)(void*);
     };
 
+    // Used to call the destructor for allocated objects.
+    template<typename T>
+    static void DestroyT(void* ptr) {
+        static_cast<T*>(ptr)->~T();
+    }
+
     // Number of bytes used so far.
     size_t              fStorageUsed;
     // Pad the storage size to be 4-byte aligned.
diff --git a/gfx/skia/skia/src/core/SkSpinlock.cpp b/gfx/skia/skia/src/core/SkSpinlock.cpp
new file mode 100644
index 000000000000..0f764278df08
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkSpinlock.cpp
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkSpinlock.h"
+
+void SkPODSpinlock::contendedAcquire() {
+    // To act as a mutex, we need an acquire barrier when we take the lock.
+    while(sk_atomic_exchange(&fLocked, true, sk_memory_order_acquire)) { /*spin*/ }
+}
diff --git a/gfx/skia/skia/src/core/SkSpriteBlitter.h b/gfx/skia/skia/src/core/SkSpriteBlitter.h
index f69a55a2a0bf..536c8926d47d 100644
--- a/gfx/skia/skia/src/core/SkSpriteBlitter.h
+++ b/gfx/skia/skia/src/core/SkSpriteBlitter.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,13 +5,11 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkSpriteBlitter_DEFINED
 #define SkSpriteBlitter_DEFINED
 
-#include "SkBitmap.h"
-#include "SkBitmapProcShader.h"
 #include "SkBlitter.h"
+#include "SkPixmap.h"
 #include "SkShader.h"
 #include "SkSmallAllocator.h"
 
@@ -20,28 +17,23 @@ class SkPaint;
 
 class SkSpriteBlitter : public SkBlitter {
 public:
-            SkSpriteBlitter(const SkBitmap& source);
-    virtual ~SkSpriteBlitter();
+    SkSpriteBlitter(const SkPixmap& source);
 
-    virtual void setup(const SkBitmap& device, int left, int top,
-                       const SkPaint& paint);
+    virtual void setup(const SkPixmap& dst, int left, int top, const SkPaint&);
 
-    // overrides
 #ifdef SK_DEBUG
-    virtual void    blitH(int x, int y, int width);
-    virtual void    blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]);
-    virtual void    blitV(int x, int y, int height, SkAlpha alpha);
-    virtual void    blitMask(const SkMask&, const SkIRect& clip);
+    void blitH(int x, int y, int width) override;
+    void blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]) override;
+    void blitV(int x, int y, int height, SkAlpha alpha) override;
+    void blitMask(const SkMask&, const SkIRect& clip) override;
 #endif
 
-    static SkSpriteBlitter* ChooseD16(const SkBitmap& source, const SkPaint&,
-                                      SkTBlitterAllocator*);
-    static SkSpriteBlitter* ChooseD32(const SkBitmap& source, const SkPaint&,
-                                      SkTBlitterAllocator*);
+    static SkSpriteBlitter* ChooseD16(const SkPixmap& source, const SkPaint&, SkTBlitterAllocator*);
+    static SkSpriteBlitter* ChooseD32(const SkPixmap& source, const SkPaint&, SkTBlitterAllocator*);
 
 protected:
-    const SkBitmap* fDevice;
-    const SkBitmap* fSource;
+    SkPixmap        fDst;
+    const SkPixmap  fSource;
     int             fLeft, fTop;
     const SkPaint*  fPaint;
 };
diff --git a/gfx/skia/skia/src/core/SkSpriteBlitterTemplate.h b/gfx/skia/skia/src/core/SkSpriteBlitterTemplate.h
index 0243e4f28a0e..36d3852fbe76 100644
--- a/gfx/skia/skia/src/core/SkSpriteBlitterTemplate.h
+++ b/gfx/skia/skia/src/core/SkSpriteBlitterTemplate.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,12 +5,9 @@
  * found in the LICENSE file.
  */
 
-
-
 class SkSPRITE_CLASSNAME : public SkSpriteBlitter {
 public:
-    SkSPRITE_CLASSNAME(const SkBitmap& source SkSPRITE_ARGS)
-        : SkSpriteBlitter(source) {
+    SkSPRITE_CLASSNAME(const SkPixmap& source SkSPRITE_ARGS) : SkSpriteBlitter(source) {
         SkSPRITE_INIT
     }
 
@@ -19,16 +15,15 @@ public:
         SkASSERT(width > 0 && height > 0);
         int srcX = x - fLeft;
         int srcY = y - fTop;
-        SkSPRITE_DST_TYPE* SK_RESTRICT dst =fDevice->SkSPRITE_DST_GETADDR(x, y);
-        const SkSPRITE_SRC_TYPE* SK_RESTRICT src =
-                                      fSource->SkSPRITE_SRC_GETADDR(srcX, srcY);
-        size_t dstRB = fDevice->rowBytes();
-        size_t srcRB = fSource->rowBytes();
+        SkSPRITE_DST_TYPE* SK_RESTRICT dst =fDst.SkSPRITE_DST_GETADDR(x, y);
+        const SkSPRITE_SRC_TYPE* SK_RESTRICT src = fSource.SkSPRITE_SRC_GETADDR(srcX, srcY);
+        size_t dstRB = fDst.rowBytes();
+        size_t srcRB = fSource.rowBytes();
 
-        SkDEBUGCODE((void)fDevice->SkSPRITE_DST_GETADDR(x + width - 1, y + height - 1);)
-        SkDEBUGCODE((void)fSource->SkSPRITE_SRC_GETADDR(srcX + width  - 1, srcY + height - 1);)
+        SkDEBUGCODE((void)fDst.SkSPRITE_DST_GETADDR(x + width - 1, y + height - 1);)
+        SkDEBUGCODE((void)fSource.SkSPRITE_SRC_GETADDR(srcX + width  - 1, srcY + height - 1);)
 
-        SkSPRITE_PREAMBLE((*fSource), srcX, srcY);
+        SkSPRITE_PREAMBLE(fSource, srcX, srcY);
 
         do {
             SkSPRITE_DST_TYPE* d = dst;
@@ -48,8 +43,7 @@ public:
             } while (--w != 0);
 #endif
             dst = (SkSPRITE_DST_TYPE* SK_RESTRICT)((char*)dst + dstRB);
-            src = (const SkSPRITE_SRC_TYPE* SK_RESTRICT)
-                                            ((const char*)src + srcRB);
+            src = (const SkSPRITE_SRC_TYPE* SK_RESTRICT)((const char*)src + srcRB);
             SkSPRITE_NEXT_ROW
 #ifdef SkSPRITE_ROW_PROC
             y += 1;
diff --git a/gfx/skia/skia/src/core/SkSpriteBlitter_ARGB32.cpp b/gfx/skia/skia/src/core/SkSpriteBlitter_ARGB32.cpp
index a4ae41c689be..9c4784408256 100644
--- a/gfx/skia/skia/src/core/SkSpriteBlitter_ARGB32.cpp
+++ b/gfx/skia/skia/src/core/SkSpriteBlitter_ARGB32.cpp
@@ -19,7 +19,7 @@
 
 class Sprite_D32_S32 : public SkSpriteBlitter {
 public:
-    Sprite_D32_S32(const SkBitmap& src, U8CPU alpha)  : INHERITED(src) {
+    Sprite_D32_S32(const SkPixmap& src, U8CPU alpha)  : INHERITED(src) {
         SkASSERT(src.colorType() == kN32_SkColorType);
 
         unsigned flags32 = 0;
@@ -34,13 +34,12 @@ public:
         fAlpha = alpha;
     }
 
-    virtual void blitRect(int x, int y, int width, int height) {
+    void blitRect(int x, int y, int width, int height) override {
         SkASSERT(width > 0 && height > 0);
-        uint32_t* SK_RESTRICT dst = fDevice->getAddr32(x, y);
-        const uint32_t* SK_RESTRICT src = fSource->getAddr32(x - fLeft,
-                                                             y - fTop);
-        size_t dstRB = fDevice->rowBytes();
-        size_t srcRB = fSource->rowBytes();
+        uint32_t* SK_RESTRICT dst = fDst.writable_addr32(x, y);
+        const uint32_t* SK_RESTRICT src = fSource.addr32(x - fLeft, y - fTop);
+        size_t dstRB = fDst.rowBytes();
+        size_t srcRB = fSource.rowBytes();
         SkBlitRow::Proc32 proc = fProc32;
         U8CPU             alpha = fAlpha;
 
@@ -62,8 +61,7 @@ private:
 
 class Sprite_D32_XferFilter : public SkSpriteBlitter {
 public:
-    Sprite_D32_XferFilter(const SkBitmap& source, const SkPaint& paint)
-        : SkSpriteBlitter(source) {
+    Sprite_D32_XferFilter(const SkPixmap& source, const SkPaint& paint) : SkSpriteBlitter(source) {
         fColorFilter = paint.getColorFilter();
         SkSafeRef(fColorFilter);
 
@@ -71,7 +69,7 @@ public:
         SkSafeRef(fXfermode);
 
         fBufferSize = 0;
-        fBuffer = NULL;
+        fBuffer = nullptr;
 
         unsigned flags32 = 0;
         if (255 != paint.getAlpha()) {
@@ -91,11 +89,10 @@ public:
         SkSafeUnref(fColorFilter);
     }
 
-    virtual void setup(const SkBitmap& device, int left, int top,
-                       const SkPaint& paint) {
-        this->INHERITED::setup(device, left, top, paint);
+    void setup(const SkPixmap& dst, int left, int top, const SkPaint& paint) override {
+        this->INHERITED::setup(dst, left, top, paint);
 
-        int width = device.width();
+        int width = dst.width();
         if (width > fBufferSize) {
             fBufferSize = width;
             delete[] fBuffer;
@@ -119,29 +116,28 @@ private:
 
 class Sprite_D32_S32A_XferFilter : public Sprite_D32_XferFilter {
 public:
-    Sprite_D32_S32A_XferFilter(const SkBitmap& source, const SkPaint& paint)
+    Sprite_D32_S32A_XferFilter(const SkPixmap& source, const SkPaint& paint)
         : Sprite_D32_XferFilter(source, paint) {}
 
-    virtual void blitRect(int x, int y, int width, int height) {
+    void blitRect(int x, int y, int width, int height) override {
         SkASSERT(width > 0 && height > 0);
-        uint32_t* SK_RESTRICT dst = fDevice->getAddr32(x, y);
-        const uint32_t* SK_RESTRICT src = fSource->getAddr32(x - fLeft,
-                                                             y - fTop);
-        size_t dstRB = fDevice->rowBytes();
-        size_t srcRB = fSource->rowBytes();
+        uint32_t* SK_RESTRICT dst = fDst.writable_addr32(x, y);
+        const uint32_t* SK_RESTRICT src = fSource.addr32(x - fLeft, y - fTop);
+        size_t dstRB = fDst.rowBytes();
+        size_t srcRB = fSource.rowBytes();
         SkColorFilter* colorFilter = fColorFilter;
         SkXfermode* xfermode = fXfermode;
 
         do {
             const SkPMColor* tmp = src;
 
-            if (NULL != colorFilter) {
+            if (colorFilter) {
                 colorFilter->filterSpan(src, width, fBuffer);
                 tmp = fBuffer;
             }
 
-            if (NULL != xfermode) {
-                xfermode->xfer32(dst, tmp, width, NULL);
+            if (xfermode) {
+                xfermode->xfer32(dst, tmp, width, nullptr);
             } else {
                 fProc32(dst, tmp, width, fAlpha);
             }
@@ -166,16 +162,15 @@ static void fillbuffer(SkPMColor* SK_RESTRICT dst,
 
 class Sprite_D32_S4444_XferFilter : public Sprite_D32_XferFilter {
 public:
-    Sprite_D32_S4444_XferFilter(const SkBitmap& source, const SkPaint& paint)
+    Sprite_D32_S4444_XferFilter(const SkPixmap& source, const SkPaint& paint)
         : Sprite_D32_XferFilter(source, paint) {}
 
-    virtual void blitRect(int x, int y, int width, int height) {
+    void blitRect(int x, int y, int width, int height) override {
         SkASSERT(width > 0 && height > 0);
-        SkPMColor* SK_RESTRICT dst = fDevice->getAddr32(x, y);
-        const SkPMColor16* SK_RESTRICT src = fSource->getAddr16(x - fLeft,
-                                                                y - fTop);
-        size_t dstRB = fDevice->rowBytes();
-        size_t srcRB = fSource->rowBytes();
+        SkPMColor* SK_RESTRICT dst = fDst.writable_addr32(x, y);
+        const SkPMColor16* SK_RESTRICT src = fSource.addr16(x - fLeft, y - fTop);
+        size_t dstRB = fDst.rowBytes();
+        size_t srcRB = fSource.rowBytes();
         SkPMColor* SK_RESTRICT buffer = fBuffer;
         SkColorFilter* colorFilter = fColorFilter;
         SkXfermode* xfermode = fXfermode;
@@ -183,11 +178,11 @@ public:
         do {
             fillbuffer(buffer, src, width);
 
-            if (NULL != colorFilter) {
+            if (colorFilter) {
                 colorFilter->filterSpan(buffer, width, buffer);
             }
-            if (NULL != xfermode) {
-                xfermode->xfer32(dst, buffer, width, NULL);
+            if (xfermode) {
+                xfermode->xfer32(dst, buffer, width, nullptr);
             } else {
                 fProc32(dst, buffer, width, fAlpha);
             }
@@ -214,15 +209,14 @@ static void src_row(SkPMColor* SK_RESTRICT dst,
 
 class Sprite_D32_S4444_Opaque : public SkSpriteBlitter {
 public:
-    Sprite_D32_S4444_Opaque(const SkBitmap& source) : SkSpriteBlitter(source) {}
+    Sprite_D32_S4444_Opaque(const SkPixmap& source) : SkSpriteBlitter(source) {}
 
-    virtual void blitRect(int x, int y, int width, int height) {
+    void blitRect(int x, int y, int width, int height) override {
         SkASSERT(width > 0 && height > 0);
-        SkPMColor* SK_RESTRICT dst = fDevice->getAddr32(x, y);
-        const SkPMColor16* SK_RESTRICT src = fSource->getAddr16(x - fLeft,
-                                                                y - fTop);
-        size_t dstRB = fDevice->rowBytes();
-        size_t srcRB = fSource->rowBytes();
+        SkPMColor* SK_RESTRICT dst = fDst.writable_addr32(x, y);
+        const SkPMColor16* SK_RESTRICT src = fSource.addr16(x - fLeft, y - fTop);
+        size_t dstRB = fDst.rowBytes();
+        size_t srcRB = fSource.rowBytes();
 
         do {
             src_row(dst, src, width);
@@ -243,15 +237,14 @@ static void srcover_row(SkPMColor* SK_RESTRICT dst,
 
 class Sprite_D32_S4444 : public SkSpriteBlitter {
 public:
-    Sprite_D32_S4444(const SkBitmap& source) : SkSpriteBlitter(source) {}
+    Sprite_D32_S4444(const SkPixmap& source) : SkSpriteBlitter(source) {}
 
-    virtual void blitRect(int x, int y, int width, int height) {
+    void blitRect(int x, int y, int width, int height) override {
         SkASSERT(width > 0 && height > 0);
-        SkPMColor* SK_RESTRICT dst = fDevice->getAddr32(x, y);
-        const SkPMColor16* SK_RESTRICT src = fSource->getAddr16(x - fLeft,
-                                                                y - fTop);
-        size_t dstRB = fDevice->rowBytes();
-        size_t srcRB = fSource->rowBytes();
+        SkPMColor* SK_RESTRICT dst = fDst.writable_addr32(x, y);
+        const SkPMColor16* SK_RESTRICT src = fSource.addr16(x - fLeft, y - fTop);
+        size_t dstRB = fDst.rowBytes();
+        size_t srcRB = fSource.rowBytes();
 
         do {
             srcover_row(dst, src, width);
@@ -263,23 +256,23 @@ public:
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkSpriteBlitter* SkSpriteBlitter::ChooseD32(const SkBitmap& source, const SkPaint& paint,
+SkSpriteBlitter* SkSpriteBlitter::ChooseD32(const SkPixmap& source, const SkPaint& paint,
         SkTBlitterAllocator* allocator) {
-    SkASSERT(allocator != NULL);
+    SkASSERT(allocator != nullptr);
 
-    if (paint.getMaskFilter() != NULL) {
-        return NULL;
+    if (paint.getMaskFilter() != nullptr) {
+        return nullptr;
     }
 
     U8CPU       alpha = paint.getAlpha();
     SkXfermode* xfermode = paint.getXfermode();
     SkColorFilter* filter = paint.getColorFilter();
-    SkSpriteBlitter* blitter = NULL;
+    SkSpriteBlitter* blitter = nullptr;
 
     switch (source.colorType()) {
         case kARGB_4444_SkColorType:
             if (alpha != 0xFF) {
-                return NULL;    // we only have opaque sprites
+                return nullptr;    // we only have opaque sprites
             }
             if (xfermode || filter) {
                 blitter = allocator->createT<Sprite_D32_S4444_XferFilter>(source, paint);
diff --git a/gfx/skia/skia/src/core/SkSpriteBlitter_RGB16.cpp b/gfx/skia/skia/src/core/SkSpriteBlitter_RGB16.cpp
index 3d1d28d0a570..4dd4164423f3 100644
--- a/gfx/skia/skia/src/core/SkSpriteBlitter_RGB16.cpp
+++ b/gfx/skia/skia/src/core/SkSpriteBlitter_RGB16.cpp
@@ -32,12 +32,9 @@ static inline void D16_S32A_Blend_Pixel_helper(uint16_t* dst, SkPMColor sc,
         db = SkAlphaBlend(SkPacked32ToB16(sc), SkGetPackedB16(dc), src_scale);
     } else {
         unsigned dst_scale = 255 - SkAlphaMul(sa, src_scale);
-        dr = (SkPacked32ToR16(sc) * src_scale +
-              SkGetPackedR16(dc) * dst_scale) >> 8;
-        dg = (SkPacked32ToG16(sc) * src_scale +
-              SkGetPackedG16(dc) * dst_scale) >> 8;
-        db = (SkPacked32ToB16(sc) * src_scale +
-              SkGetPackedB16(dc) * dst_scale) >> 8;
+        dr = (SkPacked32ToR16(sc) * src_scale + SkGetPackedR16(dc) * dst_scale) >> 8;
+        dg = (SkPacked32ToG16(sc) * src_scale + SkGetPackedG16(dc) * dst_scale) >> 8;
+        db = (SkPacked32ToB16(sc) * src_scale + SkGetPackedB16(dc) * dst_scale) >> 8;
     }
     *dst = SkPackRGB16(dr, dg, db);
 }
@@ -50,16 +47,14 @@ static inline void D16_S32A_Blend_Pixel_helper(uint16_t* dst, SkPMColor sc,
 
 class Sprite_D16_S16_Opaque : public SkSpriteBlitter {
 public:
-    Sprite_D16_S16_Opaque(const SkBitmap& source)
-        : SkSpriteBlitter(source) {}
+    Sprite_D16_S16_Opaque(const SkPixmap& source) : SkSpriteBlitter(source) {}
 
     // overrides
-    virtual void blitRect(int x, int y, int width, int height) {
-        uint16_t* SK_RESTRICT dst = fDevice->getAddr16(x, y);
-        const uint16_t* SK_RESTRICT src = fSource->getAddr16(x - fLeft,
-                                                             y - fTop);
-        size_t dstRB = fDevice->rowBytes();
-        size_t srcRB = fSource->rowBytes();
+    void blitRect(int x, int y, int width, int height) override {
+        uint16_t* SK_RESTRICT dst = fDst.writable_addr16(x, y);
+        const uint16_t* SK_RESTRICT src = fSource.addr16(x - fLeft, y - fTop);
+        size_t dstRB = fDst.rowBytes();
+        size_t srcRB = fSource.rowBytes();
 
         while (--height >= 0) {
             memcpy(dst, src, width << 1);
@@ -81,8 +76,8 @@ public:
 #define SkSPRITE_INIT                       fSrcAlpha = alpha;
 #define SkSPRITE_DST_TYPE                   uint16_t
 #define SkSPRITE_SRC_TYPE                   uint16_t
-#define SkSPRITE_DST_GETADDR                getAddr16
-#define SkSPRITE_SRC_GETADDR                getAddr16
+#define SkSPRITE_DST_GETADDR                writable_addr16
+#define SkSPRITE_SRC_GETADDR                addr16
 #define SkSPRITE_PREAMBLE(srcBM, x, y)      int scale = SkAlpha255To256(fSrcAlpha);
 #define SkSPRITE_BLIT_PIXEL(dst, src)       D16_S16_Blend_Pixel(dst, src, scale)
 #define SkSPRITE_NEXT_ROW
@@ -103,8 +98,8 @@ public:
 #define SkSPRITE_INIT
 #define SkSPRITE_DST_TYPE                   uint16_t
 #define SkSPRITE_SRC_TYPE                   SkPMColor16
-#define SkSPRITE_DST_GETADDR                getAddr16
-#define SkSPRITE_SRC_GETADDR                getAddr16
+#define SkSPRITE_DST_GETADDR                writable_addr16
+#define SkSPRITE_SRC_GETADDR                addr16
 #define SkSPRITE_PREAMBLE(srcBM, x, y)
 #define SkSPRITE_BLIT_PIXEL(dst, src)       D16_S4444_Opaque(dst, src)
 #define SkSPRITE_NEXT_ROW
@@ -124,8 +119,8 @@ public:
 #define SkSPRITE_INIT                       fSrcAlpha = alpha;
 #define SkSPRITE_DST_TYPE                   uint16_t
 #define SkSPRITE_SRC_TYPE                   uint16_t
-#define SkSPRITE_DST_GETADDR                getAddr16
-#define SkSPRITE_SRC_GETADDR                getAddr16
+#define SkSPRITE_DST_GETADDR                writable_addr16
+#define SkSPRITE_SRC_GETADDR                addr16
 #define SkSPRITE_PREAMBLE(srcBM, x, y)      int scale = SkAlpha15To16(fSrcAlpha);
 #define SkSPRITE_BLIT_PIXEL(dst, src)       D16_S4444_Blend(dst, src, scale)
 #define SkSPRITE_NEXT_ROW
@@ -140,12 +135,12 @@ public:
 #define SkSPRITE_INIT
 #define SkSPRITE_DST_TYPE                   uint16_t
 #define SkSPRITE_SRC_TYPE                   uint8_t
-#define SkSPRITE_DST_GETADDR                getAddr16
-#define SkSPRITE_SRC_GETADDR                getAddr8
-#define SkSPRITE_PREAMBLE(srcBM, x, y)      const SkPMColor* ctable = srcBM.getColorTable()->lockColors()
+#define SkSPRITE_DST_GETADDR                writable_addr16
+#define SkSPRITE_SRC_GETADDR                addr8
+#define SkSPRITE_PREAMBLE(srcBM, x, y)      const SkPMColor* ctable = srcBM.ctable()->readColors()
 #define SkSPRITE_BLIT_PIXEL(dst, src)       D16_S32A_Opaque_Pixel(dst, ctable[src])
 #define SkSPRITE_NEXT_ROW
-#define SkSPRITE_POSTAMBLE(srcBM)           srcBM.getColorTable()->unlockColors()
+#define SkSPRITE_POSTAMBLE(srcBM)
 #include "SkSpriteBlitterTemplate.h"
 
 #define SkSPRITE_CLASSNAME                  Sprite_D16_SIndex8A_Blend
@@ -154,12 +149,12 @@ public:
 #define SkSPRITE_INIT                       fSrcAlpha = alpha;
 #define SkSPRITE_DST_TYPE                   uint16_t
 #define SkSPRITE_SRC_TYPE                   uint8_t
-#define SkSPRITE_DST_GETADDR                getAddr16
-#define SkSPRITE_SRC_GETADDR                getAddr8
-#define SkSPRITE_PREAMBLE(srcBM, x, y)      const SkPMColor* ctable = srcBM.getColorTable()->lockColors(); unsigned src_scale = SkAlpha255To256(fSrcAlpha);
+#define SkSPRITE_DST_GETADDR                writable_addr16
+#define SkSPRITE_SRC_GETADDR                addr8
+#define SkSPRITE_PREAMBLE(srcBM, x, y)      const SkPMColor* ctable = srcBM.ctable()->readColors(); unsigned src_scale = SkAlpha255To256(fSrcAlpha);
 #define SkSPRITE_BLIT_PIXEL(dst, src)       D16_S32A_Blend_Pixel(dst, ctable[src], src_scale)
 #define SkSPRITE_NEXT_ROW
-#define SkSPRITE_POSTAMBLE(srcBM)           srcBM.getColorTable()->unlockColors();
+#define SkSPRITE_POSTAMBLE(srcBM)
 #include "SkSpriteBlitterTemplate.h"
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -232,12 +227,12 @@ static void blitrow_d16_si8(uint16_t* SK_RESTRICT dst,
 #define SkSPRITE_INIT
 #define SkSPRITE_DST_TYPE                   uint16_t
 #define SkSPRITE_SRC_TYPE                   uint8_t
-#define SkSPRITE_DST_GETADDR                getAddr16
-#define SkSPRITE_SRC_GETADDR                getAddr8
-#define SkSPRITE_PREAMBLE(srcBM, x, y)      const uint16_t* ctable = srcBM.getColorTable()->lock16BitCache()
+#define SkSPRITE_DST_GETADDR                writable_addr16
+#define SkSPRITE_SRC_GETADDR                addr8
+#define SkSPRITE_PREAMBLE(srcBM, x, y)      const uint16_t* ctable = srcBM.ctable()->read16BitCache()
 #define SkSPRITE_BLIT_PIXEL(dst, src)       *dst = ctable[src]
 #define SkSPRITE_NEXT_ROW
-#define SkSPRITE_POSTAMBLE(srcBM)           srcBM.getColorTable()->unlock16BitCache()
+#define SkSPRITE_POSTAMBLE(srcBM)
 #include "SkSpriteBlitterTemplate.h"
 
 #define SkSPRITE_CLASSNAME                  Sprite_D16_SIndex8_Blend
@@ -246,48 +241,43 @@ static void blitrow_d16_si8(uint16_t* SK_RESTRICT dst,
 #define SkSPRITE_INIT                       fSrcAlpha = alpha;
 #define SkSPRITE_DST_TYPE                   uint16_t
 #define SkSPRITE_SRC_TYPE                   uint8_t
-#define SkSPRITE_DST_GETADDR                getAddr16
-#define SkSPRITE_SRC_GETADDR                getAddr8
-#define SkSPRITE_PREAMBLE(srcBM, x, y)      const uint16_t* ctable = srcBM.getColorTable()->lock16BitCache(); unsigned src_scale = SkAlpha255To256(fSrcAlpha);
+#define SkSPRITE_DST_GETADDR                writable_addr16
+#define SkSPRITE_SRC_GETADDR                addr8
+#define SkSPRITE_PREAMBLE(srcBM, x, y)      const uint16_t* ctable = srcBM.ctable()->read16BitCache(); unsigned src_scale = SkAlpha255To256(fSrcAlpha);
 #define SkSPRITE_BLIT_PIXEL(dst, src)       D16_S16_Blend_Pixel(dst, ctable[src], src_scale)
 #define SkSPRITE_NEXT_ROW
-#define SkSPRITE_POSTAMBLE(srcBM)           srcBM.getColorTable()->unlock16BitCache();
+#define SkSPRITE_POSTAMBLE(srcBM)
 #include "SkSpriteBlitterTemplate.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class Sprite_D16_S32_BlitRowProc : public SkSpriteBlitter {
 public:
-    Sprite_D16_S32_BlitRowProc(const SkBitmap& source)
-        : SkSpriteBlitter(source) {}
+    Sprite_D16_S32_BlitRowProc(const SkPixmap& source) : SkSpriteBlitter(source) {}
 
-    // overrides
-
-    virtual void setup(const SkBitmap& device, int left, int top,
-                       const SkPaint& paint) {
-        this->INHERITED::setup(device, left, top, paint);
+    void setup(const SkPixmap& dst, int left, int top, const SkPaint& paint) override {
+        this->INHERITED::setup(dst, left, top, paint);
 
         unsigned flags = 0;
 
         if (paint.getAlpha() < 0xFF) {
             flags |= SkBlitRow::kGlobalAlpha_Flag;
         }
-        if (!fSource->isOpaque()) {
+        if (!fSource.isOpaque()) {
             flags |= SkBlitRow::kSrcPixelAlpha_Flag;
         }
         if (paint.isDither()) {
             flags |= SkBlitRow::kDither_Flag;
         }
-        fProc = SkBlitRow::Factory(flags, kRGB_565_SkColorType);
+        fProc = SkBlitRow::Factory16(flags);
     }
 
-    virtual void blitRect(int x, int y, int width, int height) {
-        uint16_t* SK_RESTRICT dst = fDevice->getAddr16(x, y);
-        const SkPMColor* SK_RESTRICT src = fSource->getAddr32(x - fLeft,
-                                                              y - fTop);
-        size_t dstRB = fDevice->rowBytes();
-        size_t srcRB = fSource->rowBytes();
-        SkBlitRow::Proc proc = fProc;
+    void blitRect(int x, int y, int width, int height) override {
+        uint16_t* SK_RESTRICT dst = fDst.writable_addr16(x, y);
+        const SkPMColor* SK_RESTRICT src = fSource.addr32(x - fLeft, y - fTop);
+        size_t dstRB = fDst.rowBytes();
+        size_t srcRB = fSource.rowBytes();
+        SkBlitRow::Proc16 proc = fProc;
         U8CPU alpha = fPaint->getAlpha();
 
         while (--height >= 0) {
@@ -299,31 +289,31 @@ public:
     }
 
 private:
-    SkBlitRow::Proc fProc;
+    SkBlitRow::Proc16 fProc;
 
     typedef SkSpriteBlitter INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkSpriteBlitter* SkSpriteBlitter::ChooseD16(const SkBitmap& source, const SkPaint& paint,
-        SkTBlitterAllocator* allocator) {
+SkSpriteBlitter* SkSpriteBlitter::ChooseD16(const SkPixmap& source, const SkPaint& paint,
+                                            SkTBlitterAllocator* allocator) {
 
-    SkASSERT(allocator != NULL);
+    SkASSERT(allocator != nullptr);
 
-    if (paint.getMaskFilter() != NULL) { // may add cases for this
-        return NULL;
+    if (paint.getMaskFilter() != nullptr) { // may add cases for this
+        return nullptr;
     }
-    if (paint.getXfermode() != NULL) { // may add cases for this
-        return NULL;
+    if (paint.getXfermode() != nullptr) { // may add cases for this
+        return nullptr;
     }
-    if (paint.getColorFilter() != NULL) { // may add cases for this
-        return NULL;
+    if (paint.getColorFilter() != nullptr) { // may add cases for this
+        return nullptr;
     }
 
     const SkAlphaType at = source.alphaType();
 
-    SkSpriteBlitter* blitter = NULL;
+    SkSpriteBlitter* blitter = nullptr;
     unsigned alpha = paint.getAlpha();
 
     switch (source.colorType()) {
diff --git a/gfx/skia/skia/src/core/SkStream.cpp b/gfx/skia/skia/src/core/SkStream.cpp
index 5069bb0a7e07..05867d91bfe5 100644
--- a/gfx/skia/skia/src/core/SkStream.cpp
+++ b/gfx/skia/skia/src/core/SkStream.cpp
@@ -64,17 +64,6 @@ size_t SkStream::readPackedUInt() {
     }
 }
 
-SkData* SkStream::readData() {
-    size_t size = this->readU32();
-    if (0 == size) {
-        return SkData::NewEmpty();
-    } else {
-        void* buffer = sk_malloc_throw(size);
-        this->read(buffer, size);
-        return SkData::NewFromMalloc(buffer, size);
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////////////////
 
 SkWStream::~SkWStream()
@@ -98,16 +87,16 @@ bool SkWStream::writeText(const char text[])
 
 bool SkWStream::writeDecAsText(int32_t dec)
 {
-    SkString    tmp;
-    tmp.appendS32(dec);
-    return this->write(tmp.c_str(), tmp.size());
+    char buffer[SkStrAppendS32_MaxSize];
+    char* stop = SkStrAppendS32(buffer, dec);
+    return this->write(buffer, stop - buffer);
 }
 
 bool SkWStream::writeBigDecAsText(int64_t dec, int minDigits)
 {
-    SkString    tmp;
-    tmp.appendS64(dec, minDigits);
-    return this->write(tmp.c_str(), tmp.size());
+    char buffer[SkStrAppendU64_MaxSize];
+    char* stop = SkStrAppendU64(buffer, dec, minDigits);
+    return this->write(buffer, stop - buffer);
 }
 
 bool SkWStream::writeHexAsText(uint32_t hex, int digits)
@@ -119,9 +108,9 @@ bool SkWStream::writeHexAsText(uint32_t hex, int digits)
 
 bool SkWStream::writeScalarAsText(SkScalar value)
 {
-    SkString    tmp;
-    tmp.appendScalar(value);
-    return this->write(tmp.c_str(), tmp.size());
+    char buffer[SkStrAppendScalar_MaxSize];
+    char* stop = SkStrAppendScalar(buffer, value);
+    return this->write(buffer, stop - buffer);
 }
 
 bool SkWStream::write8(U8CPU value) {
@@ -189,24 +178,14 @@ bool SkWStream::writeStream(SkStream* stream, size_t length) {
     return true;
 }
 
-bool SkWStream::writeData(const SkData* data) {
-    if (data) {
-        this->write32(SkToU32(data->size()));
-        this->write(data->data(), data->size());
-    } else {
-        this->write32(0);
-    }
-    return true;
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
 SkFILEStream::SkFILEStream(const char file[]) : fName(file), fOwnership(kCallerPasses_Ownership) {
-    fFILE = file ? sk_fopen(fName.c_str(), kRead_SkFILE_Flag) : NULL;
+    fFILE = file ? sk_fopen(fName.c_str(), kRead_SkFILE_Flag) : nullptr;
 }
 
 SkFILEStream::SkFILEStream(FILE* file, Ownership ownership)
-    : fFILE((SkFILE*)file)
+    : fFILE(file)
     , fOwnership(ownership) {
 }
 
@@ -220,7 +199,7 @@ void SkFILEStream::setPath(const char path[]) {
     fName.set(path);
     if (fFILE) {
         sk_fclose(fFILE);
-        fFILE = NULL;
+        fFILE = nullptr;
     }
     if (path) {
         fFILE = sk_fopen(fName.c_str(), kRead_SkFILE_Flag);
@@ -245,30 +224,30 @@ bool SkFILEStream::rewind() {
         }
         // we hit an error
         sk_fclose(fFILE);
-        fFILE = NULL;
+        fFILE = nullptr;
     }
     return false;
 }
 
 SkStreamAsset* SkFILEStream::duplicate() const {
-    if (NULL == fFILE) {
+    if (nullptr == fFILE) {
         return new SkMemoryStream();
     }
 
-    if (NULL != fData.get()) {
+    if (fData.get()) {
         return new SkMemoryStream(fData);
     }
 
     if (!fName.isEmpty()) {
-        SkAutoTUnref<SkFILEStream> that(new SkFILEStream(fName.c_str()));
+        SkAutoTDelete<SkFILEStream> that(new SkFILEStream(fName.c_str()));
         if (sk_fidentical(that->fFILE, this->fFILE)) {
             return that.detach();
         }
     }
 
     fData.reset(SkData::NewFromFILE(fFILE));
-    if (NULL == fData.get()) {
-        return NULL;
+    if (nullptr == fData.get()) {
+        return nullptr;
     }
     return new SkMemoryStream(fData);
 }
@@ -286,7 +265,7 @@ bool SkFILEStream::move(long offset) {
 }
 
 SkStreamAsset* SkFILEStream::fork() const {
-    SkAutoTUnref<SkStreamAsset> that(this->duplicate());
+    SkAutoTDelete<SkStreamAsset> that(this->duplicate());
     that->seek(this->getPosition());
     return that.detach();
 }
@@ -296,8 +275,8 @@ size_t SkFILEStream::getLength() const {
 }
 
 const void* SkFILEStream::getMemoryBase() {
-    if (NULL == fData.get()) {
-        return NULL;
+    if (nullptr == fData.get()) {
+        return nullptr;
     }
     return fData->data();
 }
@@ -308,7 +287,7 @@ static SkData* newFromParams(const void* src, size_t size, bool copyData) {
     if (copyData) {
         return SkData::NewWithCopy(src, size);
     } else {
-        return SkData::NewWithProc(src, size, NULL, NULL);
+        return SkData::NewWithoutCopy(src, size);
     }
 }
 
@@ -318,7 +297,7 @@ SkMemoryStream::SkMemoryStream() {
 }
 
 SkMemoryStream::SkMemoryStream(size_t size) {
-    fData = SkData::NewFromMalloc(sk_malloc_throw(size), size);
+    fData = SkData::NewUninitialized(size);
     fOffset = 0;
 }
 
@@ -328,7 +307,7 @@ SkMemoryStream::SkMemoryStream(const void* src, size_t size, bool copyData) {
 }
 
 SkMemoryStream::SkMemoryStream(SkData* data) {
-    if (NULL == data) {
+    if (nullptr == data) {
         fData = SkData::NewEmpty();
     } else {
         fData = data;
@@ -360,7 +339,7 @@ SkData* SkMemoryStream::copyToData() const {
 
 SkData* SkMemoryStream::setData(SkData* data) {
     fData->unref();
-    if (NULL == data) {
+    if (nullptr == data) {
         fData = SkData::NewEmpty();
     } else {
         fData = data;
@@ -388,6 +367,20 @@ size_t SkMemoryStream::read(void* buffer, size_t size) {
     return size;
 }
 
+bool SkMemoryStream::peek(void* buffer, size_t size) const {
+    SkASSERT(buffer != nullptr);
+    const size_t position = fOffset;
+    if (size > fData->size() - position) {
+        // The stream is not large enough to satisfy this request.
+        return false;
+    }
+    SkMemoryStream* nonConstThis = const_cast<SkMemoryStream*>(this);
+    SkDEBUGCODE(const size_t bytesRead =) nonConstThis->read(buffer, size);
+    SkASSERT(bytesRead == size);
+    nonConstThis->fOffset = position;
+    return true;
+}
+
 bool SkMemoryStream::isAtEnd() const {
     return fOffset == fData->size();
 }
@@ -397,9 +390,7 @@ bool SkMemoryStream::rewind() {
     return true;
 }
 
-SkMemoryStream* SkMemoryStream::duplicate() const {
-    return SkNEW_ARGS(SkMemoryStream, (fData));
-}
+SkMemoryStream* SkMemoryStream::duplicate() const { return new SkMemoryStream(fData); }
 
 size_t SkMemoryStream::getPosition() const {
     return fOffset;
@@ -417,7 +408,7 @@ bool SkMemoryStream::move(long offset) {
 }
 
 SkMemoryStream* SkMemoryStream::fork() const {
-    SkAutoTUnref<SkMemoryStream> that(this->duplicate());
+    SkAutoTDelete<SkMemoryStream> that(this->duplicate());
     that->seek(fOffset);
     return that.detach();
 }
@@ -455,7 +446,7 @@ size_t SkFILEWStream::bytesWritten() const {
 
 bool SkFILEWStream::write(const void* buffer, size_t size)
 {
-    if (fFILE == NULL) {
+    if (fFILE == nullptr) {
         return false;
     }
 
@@ -463,7 +454,7 @@ bool SkFILEWStream::write(const void* buffer, size_t size)
     {
         SkDEBUGCODE(SkDebugf("SkFILEWStream failed writing %d bytes\n", size);)
         sk_fclose(fFILE);
-        fFILE = NULL;
+        fFILE = nullptr;
         return false;
     }
     return true;
@@ -509,7 +500,7 @@ struct SkDynamicMemoryWStream::Block {
 
     void init(size_t size)
     {
-        fNext = NULL;
+        fNext = nullptr;
         fCurr = this->start();
         fStop = this->start() + size;
     }
@@ -524,7 +515,7 @@ struct SkDynamicMemoryWStream::Block {
 };
 
 SkDynamicMemoryWStream::SkDynamicMemoryWStream()
-    : fHead(NULL), fTail(NULL), fBytesWritten(0), fCopy(NULL)
+    : fHead(nullptr), fTail(nullptr), fBytesWritten(0), fCopy(nullptr)
 {
 }
 
@@ -539,12 +530,12 @@ void SkDynamicMemoryWStream::reset()
 
     Block*  block = fHead;
 
-    while (block != NULL) {
+    while (block != nullptr) {
         Block*  next = block->fNext;
         sk_free(block);
         block = next;
     }
-    fHead = fTail = NULL;
+    fHead = fTail = nullptr;
     fBytesWritten = 0;
 }
 
@@ -557,7 +548,7 @@ bool SkDynamicMemoryWStream::write(const void* buffer, size_t count)
 
         size_t  size;
 
-        if (fTail != NULL && fTail->avail() > 0) {
+        if (fTail != nullptr && fTail->avail() > 0) {
             size = SkTMin(fTail->avail(), count);
             buffer = fTail->append(buffer, size);
             SkASSERT(count >= size);
@@ -571,7 +562,7 @@ bool SkDynamicMemoryWStream::write(const void* buffer, size_t count)
         block->init(size);
         block->append(buffer, count);
 
-        if (fTail != NULL)
+        if (fTail != nullptr)
             fTail->fNext = block;
         else
             fHead = fTail = block;
@@ -589,7 +580,7 @@ bool SkDynamicMemoryWStream::write(const void* buffer, size_t offset, size_t cou
     this->invalidateCopy();
 
     Block* block = fHead;
-    while (block != NULL) {
+    while (block != nullptr) {
         size_t size = block->written();
         if (offset < size) {
             size_t part = offset + count > size ? size - offset : count;
@@ -610,7 +601,7 @@ bool SkDynamicMemoryWStream::read(void* buffer, size_t offset, size_t count)
     if (offset + count > fBytesWritten)
         return false; // test does not partially modify
     Block* block = fHead;
-    while (block != NULL) {
+    while (block != nullptr) {
         size_t size = block->written();
         if (offset < size) {
             size_t part = offset + count > size ? size - offset : count;
@@ -633,7 +624,7 @@ void SkDynamicMemoryWStream::copyTo(void* dst) const
     } else {
         Block* block = fHead;
 
-        while (block != NULL) {
+        while (block != nullptr) {
             size_t size = block->written();
             memcpy(dst, block->start(), size);
             dst = (void*)((char*)dst + size);
@@ -642,6 +633,12 @@ void SkDynamicMemoryWStream::copyTo(void* dst) const
     }
 }
 
+void SkDynamicMemoryWStream::writeToStream(SkWStream* dst) const {
+    for (Block* block = fHead; block != nullptr; block = block->fNext) {
+        dst->write(block->start(), block->written());
+    }
+}
+
 void SkDynamicMemoryWStream::padToAlign4()
 {
     // cast to remove unary-minus warning
@@ -653,19 +650,19 @@ void SkDynamicMemoryWStream::padToAlign4()
 }
 
 SkData* SkDynamicMemoryWStream::copyToData() const {
-    if (NULL == fCopy) {
-        void* buffer = sk_malloc_throw(fBytesWritten);
-        this->copyTo(buffer);
-        fCopy = SkData::NewFromMalloc(buffer, fBytesWritten);
+    if (nullptr == fCopy) {
+        SkData* data = SkData::NewUninitialized(fBytesWritten);
+        // be sure to call copyTo() before we assign to fCopy
+        this->copyTo(data->writable_data());
+        fCopy = data;
     }
-    fCopy->ref();
-    return fCopy;
+    return SkRef(fCopy);
 }
 
 void SkDynamicMemoryWStream::invalidateCopy() {
     if (fCopy) {
         fCopy->unref();
-        fCopy = NULL;
+        fCopy = nullptr;
     }
 }
 
@@ -675,7 +672,7 @@ public:
 
     virtual ~SkBlockMemoryRefCnt() {
         SkDynamicMemoryWStream::Block* block = fHead;
-        while (block != NULL) {
+        while (block != nullptr) {
             SkDynamicMemoryWStream::Block* next = block->fNext;
             sk_free(block);
             block = next;
@@ -688,20 +685,23 @@ public:
 class SkBlockMemoryStream : public SkStreamAsset {
 public:
     SkBlockMemoryStream(SkDynamicMemoryWStream::Block* head, size_t size)
-        : fBlockMemory(SkNEW_ARGS(SkBlockMemoryRefCnt, (head))), fCurrent(head)
-        , fSize(size) , fOffset(0), fCurrentOffset(0) { }
+        : fBlockMemory(new SkBlockMemoryRefCnt(head))
+        , fCurrent(head)
+        , fSize(size)
+        , fOffset(0)
+        , fCurrentOffset(0) {}
 
     SkBlockMemoryStream(SkBlockMemoryRefCnt* headRef, size_t size)
         : fBlockMemory(SkRef(headRef)), fCurrent(fBlockMemory->fHead)
         , fSize(size) , fOffset(0), fCurrentOffset(0) { }
 
-    virtual size_t read(void* buffer, size_t rawCount) SK_OVERRIDE {
+    size_t read(void* buffer, size_t rawCount) override {
         size_t count = rawCount;
         if (fOffset + count > fSize) {
             count = fSize - fOffset;
         }
         size_t bytesLeftToRead = count;
-        while (fCurrent != NULL) {
+        while (fCurrent != nullptr) {
             size_t bytesLeftInCurrent = fCurrent->written() - fCurrentOffset;
             size_t bytesFromCurrent = SkTMin(bytesLeftToRead, bytesLeftInCurrent);
             if (buffer) {
@@ -721,26 +721,47 @@ public:
         return 0;
     }
 
-    virtual bool isAtEnd() const SK_OVERRIDE {
+    bool isAtEnd() const override {
         return fOffset == fSize;
     }
 
-    virtual bool rewind() SK_OVERRIDE {
+    bool peek(void* buff, size_t size) const override {
+        SkASSERT(buff != nullptr);
+        if (fOffset + size > fSize) {
+            return false;
+        }
+        char* buffer = static_cast<char*>(buff);
+        const SkDynamicMemoryWStream::Block* current = fCurrent;
+        size_t currentOffset = fCurrentOffset;
+        while (size) {
+            SkASSERT(current);
+            size_t bytesFromCurrent =
+                    SkTMin(current->written() - currentOffset, size);
+            memcpy(buffer, current->start() + currentOffset, bytesFromCurrent);
+            size -= bytesFromCurrent;
+            buffer += bytesFromCurrent;
+            current = current->fNext;
+            currentOffset = 0;
+        }
+        return true;
+    }
+
+    bool rewind() override {
         fCurrent = fBlockMemory->fHead;
         fOffset = 0;
         fCurrentOffset = 0;
         return true;
     }
 
-    virtual SkBlockMemoryStream* duplicate() const SK_OVERRIDE {
-        return SkNEW_ARGS(SkBlockMemoryStream, (fBlockMemory.get(), fSize));
+    SkBlockMemoryStream* duplicate() const override {
+        return new SkBlockMemoryStream(fBlockMemory.get(), fSize);
     }
 
-    virtual size_t getPosition() const SK_OVERRIDE {
+    size_t getPosition() const override {
         return fOffset;
     }
 
-    virtual bool seek(size_t position) SK_OVERRIDE {
+    bool seek(size_t position) override {
         // If possible, skip forward.
         if (position >= fOffset) {
             size_t skipAmount = position - fOffset;
@@ -757,27 +778,28 @@ public:
         return this->rewind() && this->skip(position) == position;
     }
 
-    virtual bool move(long offset) SK_OVERRIDE {
+    bool move(long offset) override {
         return seek(fOffset + offset);
     }
 
-    virtual SkBlockMemoryStream* fork() const SK_OVERRIDE {
-        SkAutoTUnref<SkBlockMemoryStream> that(this->duplicate());
+    SkBlockMemoryStream* fork() const override {
+        SkAutoTDelete<SkBlockMemoryStream> that(this->duplicate());
         that->fCurrent = this->fCurrent;
         that->fOffset = this->fOffset;
         that->fCurrentOffset = this->fCurrentOffset;
         return that.detach();
     }
 
-    virtual size_t getLength() const SK_OVERRIDE {
+    size_t getLength() const override {
         return fSize;
     }
 
-    virtual const void* getMemoryBase() SK_OVERRIDE {
-        if (NULL == fBlockMemory->fHead->fNext) {
+    const void* getMemoryBase() override {
+        if (nullptr != fBlockMemory->fHead &&
+            nullptr == fBlockMemory->fHead->fNext) {
             return fBlockMemory->fHead->start();
         }
-        return NULL;
+        return nullptr;
     }
 
 private:
@@ -790,11 +812,11 @@ private:
 
 SkStreamAsset* SkDynamicMemoryWStream::detachAsStream() {
     if (fCopy) {
-        SkMemoryStream* stream = SkNEW_ARGS(SkMemoryStream, (fCopy));
+        SkMemoryStream* stream = new SkMemoryStream(fCopy);
         this->reset();
         return stream;
     }
-    SkBlockMemoryStream* stream = SkNEW_ARGS(SkBlockMemoryStream, (fHead, fBytesWritten));
+    SkBlockMemoryStream* stream = new SkBlockMemoryStream(fHead, fBytesWritten);
     fHead = 0;
     this->reset();
     return stream;
@@ -828,9 +850,9 @@ bool SkDebugWStream::write(const void* buffer, size_t size)
 
 
 static SkData* mmap_filename(const char path[]) {
-    SkFILE* file = sk_fopen(path, kRead_SkFILE_Flag);
-    if (NULL == file) {
-        return NULL;
+    FILE* file = sk_fopen(path, kRead_SkFILE_Flag);
+    if (nullptr == file) {
+        return nullptr;
     }
 
     SkData* data = SkData::NewFromFILE(file);
@@ -841,23 +863,23 @@ static SkData* mmap_filename(const char path[]) {
 SkStreamAsset* SkStream::NewFromFile(const char path[]) {
     SkAutoTUnref<SkData> data(mmap_filename(path));
     if (data.get()) {
-        return SkNEW_ARGS(SkMemoryStream, (data.get()));
+        return new SkMemoryStream(data.get());
     }
 
     // If we get here, then our attempt at using mmap failed, so try normal
     // file access.
-    SkFILEStream* stream = SkNEW_ARGS(SkFILEStream, (path));
+    SkFILEStream* stream = new SkFILEStream(path);
     if (!stream->isValid()) {
-        stream->unref();
-        stream = NULL;
+        delete stream;
+        stream = nullptr;
     }
     return stream;
 }
 
 // Declared in SkStreamPriv.h:
 size_t SkCopyStreamToStorage(SkAutoMalloc* storage, SkStream* stream) {
-    SkASSERT(storage != NULL);
-    SkASSERT(stream != NULL);
+    SkASSERT(storage != nullptr);
+    SkASSERT(stream != nullptr);
 
     if (stream->hasLength()) {
         const size_t length = stream->getLength();
@@ -870,7 +892,12 @@ size_t SkCopyStreamToStorage(SkAutoMalloc* storage, SkStream* stream) {
 
     SkDynamicMemoryWStream tempStream;
     // Arbitrary buffer size.
+#if defined(GOOGLE3)
+    // Stack frame size is limited in GOOGLE3.
+    const size_t bufferSize = 8 * 1024; // 8KB
+#else
     const size_t bufferSize = 256 * 1024; // 256KB
+#endif
     char buffer[bufferSize];
     SkDEBUGCODE(size_t debugLength = 0;)
     do {
@@ -887,15 +914,10 @@ size_t SkCopyStreamToStorage(SkAutoMalloc* storage, SkStream* stream) {
 
 // Declared in SkStreamPriv.h:
 SkData* SkCopyStreamToData(SkStream* stream) {
-    SkASSERT(stream != NULL);
+    SkASSERT(stream != nullptr);
 
     if (stream->hasLength()) {
-        const size_t length = stream->getLength();
-        SkAutoMalloc dst(length);
-        if (stream->read(dst.get(), length) != length) {
-            return NULL;
-        }
-        return SkData::NewFromMalloc(dst.detach(), length);
+        return SkData::NewFromStream(stream, stream->getLength());
     }
 
     SkDynamicMemoryWStream tempStream;
@@ -910,9 +932,9 @@ SkData* SkCopyStreamToData(SkStream* stream) {
 
 SkStreamRewindable* SkStreamRewindableFromSkStream(SkStream* stream) {
     if (!stream) {
-        return NULL;
+        return nullptr;
     }
-    SkAutoTUnref<SkStreamRewindable> dupStream(stream->duplicate());
+    SkAutoTDelete<SkStreamRewindable> dupStream(stream->duplicate());
     if (dupStream) {
         return dupStream.detach();
     }
@@ -922,12 +944,8 @@ SkStreamRewindable* SkStreamRewindableFromSkStream(SkStream* stream) {
         if (stream->hasPosition()) {  // If stream has length, but can't rewind.
             length -= stream->getPosition();
         }
-        SkAutoMalloc allocMemory(length);
-        SkDEBUGCODE(size_t read =) stream->read(allocMemory.get(), length);
-        SkASSERT(length == read);
-        SkAutoTUnref<SkData> data(
-                SkData::NewFromMalloc(allocMemory.detach(), length));
-        return SkNEW_ARGS(SkMemoryStream, (data.get()));
+        SkAutoTUnref<SkData> data(SkData::NewFromStream(stream, length));
+        return new SkMemoryStream(data.get());
     }
     SkDynamicMemoryWStream tempStream;
     const size_t bufferSize = 4096;
@@ -939,3 +957,25 @@ SkStreamRewindable* SkStreamRewindableFromSkStream(SkStream* stream) {
     return tempStream.detachAsStream();  // returns a SkBlockMemoryStream,
                                          // cheaper than copying to SkData
 }
+
+bool SkStreamCopy(SkWStream* out, SkStream* input) {
+    const char* base = static_cast<const char*>(input->getMemoryBase());
+    if (base && input->hasPosition() && input->hasLength()) {
+        // Shortcut that avoids the while loop.
+        size_t position = input->getPosition();
+        size_t length = input->getLength();
+        SkASSERT(length >= position);
+        return out->write(&base[position], length - position);
+    }
+    char scratch[4096];
+    size_t count;
+    while (true) {
+        count = input->read(scratch, sizeof(scratch));
+        if (0 == count) {
+            return true;
+        }
+        if (!out->write(scratch, count)) {
+            return false;
+        }
+    }
+}
diff --git a/gfx/skia/skia/src/core/SkStreamPriv.h b/gfx/skia/skia/src/core/SkStreamPriv.h
index 718097d1cc06..b82f7d84e9de 100644
--- a/gfx/skia/skia/src/core/SkStreamPriv.h
+++ b/gfx/skia/skia/src/core/SkStreamPriv.h
@@ -31,7 +31,7 @@ size_t SkCopyStreamToStorage(SkAutoMalloc* storage, SkStream* stream);
  *  @param stream SkStream to be copied into data.
  *  @return SkData* The resulting SkData after the copy. This data
  *      will have a ref count of one upon return and belongs to the
- *      caller. Returns NULL on failure.
+ *      caller. Returns nullptr on failure.
  */
 SkData *SkCopyStreamToData(SkStream* stream);
 
@@ -43,4 +43,10 @@ SkData *SkCopyStreamToData(SkStream* stream);
  */
 SkStreamRewindable* SkStreamRewindableFromSkStream(SkStream* stream);
 
+/**
+ *  Copies the input stream from the current position to the end.
+ *  Does not rewind the input stream.
+ */
+bool SkStreamCopy(SkWStream* out, SkStream* input);
+
 #endif  // SkStreamPriv_DEFINED
diff --git a/gfx/skia/skia/src/core/SkString.cpp b/gfx/skia/skia/src/core/SkString.cpp
index a19118420f00..e730753fca25 100644
--- a/gfx/skia/skia/src/core/SkString.cpp
+++ b/gfx/skia/skia/src/core/SkString.cpp
@@ -7,9 +7,9 @@
  */
 
 
-#include "SkString.h"
+#include "SkAtomics.h"
 #include "SkFixed.h"
-#include "SkThread.h"
+#include "SkString.h"
 #include "SkUtils.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -26,12 +26,13 @@ static const size_t kBufferSize = 1024;
     #define SNPRINTF    snprintf
 #endif
 
-#define ARGS_TO_BUFFER(format, buffer, size)        \
-    do {                                            \
-        va_list args;                               \
-        va_start(args, format);                     \
-        VSNPRINTF(buffer, size, format, args);      \
-        va_end(args);                               \
+#define ARGS_TO_BUFFER(format, buffer, size, written)      \
+    do {                                                   \
+        va_list args;                                      \
+        va_start(args, format);                            \
+        written = VSNPRINTF(buffer, size, format, args);   \
+        SkASSERT(written >= 0 && written < SkToInt(size)); \
+        va_end(args);                                      \
     } while (0)
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -89,11 +90,12 @@ char* SkStrAppendU32(char string[], uint32_t dec) {
 }
 
 char* SkStrAppendS32(char string[], int32_t dec) {
+    uint32_t udec = dec;
     if (dec < 0) {
         *string++ = '-';
-        dec = -dec;
+        udec = ~udec + 1;  // udec = -udec, but silences some warnings that are trying to be helpful
     }
-    return SkStrAppendU32(string, static_cast<uint32_t>(dec));
+    return SkStrAppendU32(string, udec);
 }
 
 char* SkStrAppendU64(char string[], uint64_t dec, int minDigits) {
@@ -123,11 +125,12 @@ char* SkStrAppendU64(char string[], uint64_t dec, int minDigits) {
 }
 
 char* SkStrAppendS64(char string[], int64_t dec, int minDigits) {
+    uint64_t udec = dec;
     if (dec < 0) {
         *string++ = '-';
-        dec = -dec;
+        udec = ~udec + 1;  // udec = -udec, but silences some warnings that are trying to be helpful
     }
-    return SkStrAppendU64(string, static_cast<uint64_t>(dec), minDigits);
+    return SkStrAppendU64(string, udec, minDigits);
 }
 
 char* SkStrAppendFloat(char string[], float value) {
@@ -244,48 +247,32 @@ void SkString::validate() const {
         SkASSERT(fRec->fRefCnt > 0);
         SkASSERT(0 == fRec->data()[fRec->fLength]);
     }
-    SkASSERT(fStr == c_str());
 }
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkString::SkString() : fRec(const_cast<Rec*>(&gEmptyRec)) {
-#ifdef SK_DEBUG
-    fStr = fRec->data();
-#endif
 }
 
 SkString::SkString(size_t len) {
-    fRec = AllocRec(NULL, len);
-#ifdef SK_DEBUG
-    fStr = fRec->data();
-#endif
+    fRec = AllocRec(nullptr, len);
 }
 
 SkString::SkString(const char text[]) {
     size_t  len = text ? strlen(text) : 0;
 
     fRec = AllocRec(text, len);
-#ifdef SK_DEBUG
-    fStr = fRec->data();
-#endif
 }
 
 SkString::SkString(const char text[], size_t len) {
     fRec = AllocRec(text, len);
-#ifdef SK_DEBUG
-    fStr = fRec->data();
-#endif
 }
 
 SkString::SkString(const SkString& src) {
     src.validate();
 
     fRec = RefRec(src.fRec);
-#ifdef SK_DEBUG
-    fStr = fRec->data();
-#endif
 }
 
 SkString::~SkString() {
@@ -308,7 +295,7 @@ bool SkString::equals(const char text[]) const {
 }
 
 bool SkString::equals(const char text[], size_t len) const {
-    SkASSERT(len == 0 || text != NULL);
+    SkASSERT(len == 0 || text != nullptr);
 
     return fRec->fLength == len && !memcmp(fRec->data(), text, len);
 }
@@ -343,9 +330,6 @@ void SkString::reset() {
     }
 
     fRec = const_cast<Rec*>(&gEmptyRec);
-#ifdef SK_DEBUG
-    fStr = fRec->data();
-#endif
 }
 
 char* SkString::writable_str() {
@@ -361,9 +345,6 @@ char* SkString::writable_str() {
                 sk_free(fRec);
             }
             fRec = rec;
-        #ifdef SK_DEBUG
-            fStr = fRec->data();
-        #endif
         }
     }
     return fRec->data();
@@ -528,7 +509,7 @@ void SkString::insertU64(size_t offset, uint64_t dec, int minDigits) {
 }
 
 void SkString::insertHex(size_t offset, uint32_t hex, int minDigits) {
-    minDigits = SkPin32(minDigits, 0, 8);
+    minDigits = SkTPin(minDigits, 0, 8);
 
     static const char gHex[] = "0123456789ABCDEF";
 
@@ -557,56 +538,67 @@ void SkString::insertScalar(size_t offset, SkScalar value) {
 
 void SkString::printf(const char format[], ...) {
     char    buffer[kBufferSize];
-    ARGS_TO_BUFFER(format, buffer, kBufferSize);
+    int length;
+    ARGS_TO_BUFFER(format, buffer, kBufferSize, length);
 
-    this->set(buffer, strlen(buffer));
+    this->set(buffer, length);
 }
 
 void SkString::appendf(const char format[], ...) {
     char    buffer[kBufferSize];
-    ARGS_TO_BUFFER(format, buffer, kBufferSize);
+    int length;
+    ARGS_TO_BUFFER(format, buffer, kBufferSize, length);
 
-    this->append(buffer, strlen(buffer));
+    this->append(buffer, length);
 }
 
 void SkString::appendVAList(const char format[], va_list args) {
     char    buffer[kBufferSize];
-    VSNPRINTF(buffer, kBufferSize, format, args);
+    int length = VSNPRINTF(buffer, kBufferSize, format, args);
+    SkASSERT(length >= 0 && length < SkToInt(kBufferSize));
 
-    this->append(buffer, strlen(buffer));
+    this->append(buffer, length);
 }
 
 void SkString::prependf(const char format[], ...) {
     char    buffer[kBufferSize];
-    ARGS_TO_BUFFER(format, buffer, kBufferSize);
+    int length;
+    ARGS_TO_BUFFER(format, buffer, kBufferSize, length);
 
-    this->prepend(buffer, strlen(buffer));
+    this->prepend(buffer, length);
 }
 
+void SkString::prependVAList(const char format[], va_list args) {
+    char    buffer[kBufferSize];
+    int length = VSNPRINTF(buffer, kBufferSize, format, args);
+    SkASSERT(length >= 0 && length < SkToInt(kBufferSize));
+
+    this->prepend(buffer, length);
+}
+
+
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkString::remove(size_t offset, size_t length) {
     size_t size = this->size();
 
     if (offset < size) {
-        if (offset + length > size) {
+        if (length > size - offset) {
             length = size - offset;
         }
+        SkASSERT(length <= size);
+        SkASSERT(offset <= size - length);
         if (length > 0) {
-            SkASSERT(size > length);
             SkString    tmp(size - length);
             char*       dst = tmp.writable_str();
             const char* src = this->c_str();
 
             if (offset) {
-                SkASSERT(offset <= tmp.size());
                 memcpy(dst, src, offset);
             }
-            size_t tail = size - offset - length;
-            SkASSERT((int32_t)tail >= 0);
+            size_t tail = size - (offset + length);
             if (tail) {
-        //      SkASSERT(offset + length <= tmp.size());
-                memcpy(dst + offset, src + offset + length, tail);
+                memcpy(dst + offset, src + (offset + length), tail);
             }
             SkASSERT(dst[tmp.size()] == 0);
             this->swap(tmp);
@@ -619,9 +611,6 @@ void SkString::swap(SkString& other) {
     other.validate();
 
     SkTSwap<Rec*>(fRec, other.fRec);
-#ifdef SK_DEBUG
-    SkTSwap<const char*>(fStr, other.fStr);
-#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -629,7 +618,8 @@ void SkString::swap(SkString& other) {
 SkString SkStringPrintf(const char* format, ...) {
     SkString formattedOutput;
     char buffer[kBufferSize];
-    ARGS_TO_BUFFER(format, buffer, kBufferSize);
+    SK_UNUSED int length;
+    ARGS_TO_BUFFER(format, buffer, kBufferSize, length);
     formattedOutput.set(buffer);
     return formattedOutput;
 }
diff --git a/gfx/skia/skia/src/core/SkStringUtils.cpp b/gfx/skia/skia/src/core/SkStringUtils.cpp
index 0f93b8e30dcd..6f5699c8053e 100644
--- a/gfx/skia/skia/src/core/SkStringUtils.cpp
+++ b/gfx/skia/skia/src/core/SkStringUtils.cpp
@@ -17,3 +17,47 @@ void SkAddFlagToString(SkString* string, bool flag, const char* flagStr, bool* n
         *needSeparator = true;
     }
 }
+
+void SkAppendScalar(SkString* str, SkScalar value, SkScalarAsStringType asType) {
+    switch (asType) {
+        case kHex_SkScalarAsStringType:
+            str->appendf("SkBits2Float(0x%08x)", SkFloat2Bits(value));
+            break;
+        case kDec_SkScalarAsStringType: {
+            SkString tmp;
+            tmp.printf("%g", value);
+            if (tmp.contains('.')) {
+                tmp.appendUnichar('f');
+            }
+            str->append(tmp);
+            break;
+        }
+    }
+}
+
+SkString SkTabString(const SkString& string, int tabCnt) {
+    if (tabCnt <= 0) {
+        return string;
+    }
+    SkString tabs;
+    for (int i = 0; i < tabCnt; ++i) {
+        tabs.append("\t");
+    }
+    SkString result;
+    static const char newline[] = "\n";
+    const char* input = string.c_str();
+    int nextNL = SkStrFind(input, newline);
+    while (nextNL >= 0) {
+        if (nextNL > 0) {
+            result.append(tabs);
+        }
+        result.append(input, nextNL + 1);
+        input += nextNL + 1;
+        nextNL = SkStrFind(input, newline);
+    }
+    if (*input != '\0') {
+        result.append(tabs);
+        result.append(input);
+    }
+    return result;
+}
diff --git a/gfx/skia/skia/src/core/SkStringUtils.h b/gfx/skia/skia/src/core/SkStringUtils.h
index aa5c809f2cb3..fd158c30bd51 100644
--- a/gfx/skia/skia/src/core/SkStringUtils.h
+++ b/gfx/skia/skia/src/core/SkStringUtils.h
@@ -20,4 +20,22 @@ void SkAddFlagToString(SkString* string, bool flag,
                        const char* flagStr, bool* needSeparator);
 
 
+enum SkScalarAsStringType {
+    kDec_SkScalarAsStringType,
+    kHex_SkScalarAsStringType,
+};
+
+void SkAppendScalar(SkString*, SkScalar, SkScalarAsStringType);
+
+static inline void SkAppendScalarDec(SkString* str, SkScalar value) {
+    SkAppendScalar(str, value, kDec_SkScalarAsStringType);
+}
+
+static inline void SkAppendScalarHex(SkString* str, SkScalar value) {
+    SkAppendScalar(str, value, kHex_SkScalarAsStringType);
+}
+
+/** Indents every non-empty line of the string by tabCnt tabs */
+SkString SkTabString(const SkString& string, int tabCnt);
+
 #endif
diff --git a/gfx/skia/skia/src/core/SkStroke.cpp b/gfx/skia/skia/src/core/SkStroke.cpp
index b138c326bab4..65267d11fd4e 100644
--- a/gfx/skia/skia/src/core/SkStroke.cpp
+++ b/gfx/skia/skia/src/core/SkStroke.cpp
@@ -7,47 +7,55 @@
 
 #include "SkStrokerPriv.h"
 #include "SkGeometry.h"
-#include "SkPath.h"
+#include "SkPathPriv.h"
 
-#define kMaxQuadSubdivide   5
-#define kMaxCubicSubdivide  7
+enum {
+    kTangent_RecursiveLimit,
+    kCubic_RecursiveLimit,
+    kConic_RecursiveLimit,
+    kQuad_RecursiveLimit
+};
+
+// quads with extreme widths (e.g. (0,1) (1,6) (0,3) width=5e7) recurse to point of failure
+// largest seen for normal cubics : 5, 26
+// largest seen for normal quads : 11
+static const int kRecursiveLimits[] = { 5*3, 26*3, 11*3, 11*3 }; // 3x limits seen in practice
+
+static_assert(0 == kTangent_RecursiveLimit, "cubic_stroke_relies_on_tangent_equalling_zero");
+static_assert(1 == kCubic_RecursiveLimit, "cubic_stroke_relies_on_cubic_equalling_one");
+static_assert(SK_ARRAY_COUNT(kRecursiveLimits) == kQuad_RecursiveLimit + 1,
+              "recursive_limits_mismatch");
+
+#ifdef SK_DEBUG
+    int gMaxRecursion[SK_ARRAY_COUNT(kRecursiveLimits)] = { 0 };
+#endif
+#ifndef DEBUG_QUAD_STROKER
+    #define DEBUG_QUAD_STROKER 0
+#endif
+
+#if DEBUG_QUAD_STROKER
+    /* Enable to show the decisions made in subdividing the curve -- helpful when the resulting
+        stroke has more than the optimal number of quadratics and lines */
+    #define STROKER_RESULT(resultType, depth, quadPts, format, ...) \
+            SkDebugf("[%d] %s " format "\n", depth, __FUNCTION__, __VA_ARGS__), \
+            SkDebugf("  " #resultType " t=(%g,%g)\n", quadPts->fStartT, quadPts->fEndT), \
+            resultType
+    #define STROKER_DEBUG_PARAMS(...) , __VA_ARGS__
+#else
+    #define STROKER_RESULT(resultType, depth, quadPts, format, ...) \
+            resultType
+    #define STROKER_DEBUG_PARAMS(...)
+#endif
 
 static inline bool degenerate_vector(const SkVector& v) {
     return !SkPoint::CanNormalize(v.fX, v.fY);
 }
 
-static inline bool normals_too_curvy(const SkVector& norm0, SkVector& norm1) {
-    /*  root2/2 is a 45-degree angle
-        make this constant bigger for more subdivisions (but not >= 1)
-    */
-    static const SkScalar kFlatEnoughNormalDotProd =
-                                            SK_ScalarSqrt2/2 + SK_Scalar1/10;
-
-    SkASSERT(kFlatEnoughNormalDotProd > 0 &&
-             kFlatEnoughNormalDotProd < SK_Scalar1);
-
-    return SkPoint::DotProduct(norm0, norm1) <= kFlatEnoughNormalDotProd;
-}
-
-static inline bool normals_too_pinchy(const SkVector& norm0, SkVector& norm1) {
-    // if the dot-product is -1, then we are definitely too pinchy. We tweak
-    // that by an epsilon to ensure we have significant bits in our test
-    static const int kMinSigBitsForDot = 8;
-    static const SkScalar kDotEpsilon = FLT_EPSILON * (1 << kMinSigBitsForDot);
-    static const SkScalar kTooPinchyNormalDotProd = kDotEpsilon - 1;
-
-    // just some sanity asserts to help document the expected range
-    SkASSERT(kTooPinchyNormalDotProd >= -1);
-    SkASSERT(kTooPinchyNormalDotProd < SkDoubleToScalar(-0.999));
-
-    SkScalar dot = SkPoint::DotProduct(norm0, norm1);
-    return dot <= kTooPinchyNormalDotProd;
-}
-
-static bool set_normal_unitnormal(const SkPoint& before, const SkPoint& after,
+static bool set_normal_unitnormal(const SkPoint& before, const SkPoint& after, SkScalar scale,
                                   SkScalar radius,
                                   SkVector* normal, SkVector* unitNormal) {
-    if (!unitNormal->setNormalize(after.fX - before.fX, after.fY - before.fY)) {
+    if (!unitNormal->setNormalize((after.fX - before.fX) * scale,
+            (after.fY - before.fY) * scale)) {
         return false;
     }
     unitNormal->rotateCCW();
@@ -68,15 +76,59 @@ static bool set_normal_unitnormal(const SkVector& vec,
 
 ///////////////////////////////////////////////////////////////////////////////
 
+struct SkQuadConstruct {    // The state of the quad stroke under construction.
+    SkPoint fQuad[3];       // the stroked quad parallel to the original curve
+    SkPoint fTangentStart;  // a point tangent to fQuad[0]
+    SkPoint fTangentEnd;    // a point tangent to fQuad[2]
+    SkScalar fStartT;       // a segment of the original curve
+    SkScalar fMidT;         //              "
+    SkScalar fEndT;         //              "
+    bool fStartSet;         // state to share common points across structs
+    bool fEndSet;           //                     "
+
+    // return false if start and end are too close to have a unique middle
+    bool init(SkScalar start, SkScalar end) {
+        fStartT = start;
+        fMidT = (start + end) * SK_ScalarHalf;
+        fEndT = end;
+        fStartSet = fEndSet = false;
+        return fStartT < fMidT && fMidT < fEndT;
+    }
+
+    bool initWithStart(SkQuadConstruct* parent) {
+        if (!init(parent->fStartT, parent->fMidT)) {
+            return false;
+        }
+        fQuad[0] = parent->fQuad[0];
+        fTangentStart = parent->fTangentStart;
+        fStartSet = true;
+        return true;
+    }
+
+    bool initWithEnd(SkQuadConstruct* parent) {
+        if (!init(parent->fMidT, parent->fEndT)) {
+            return false;
+        }
+        fQuad[2] = parent->fQuad[2];
+        fTangentEnd = parent->fTangentEnd;
+        fEndSet = true;
+        return true;
+   }
+};
+
 class SkPathStroker {
 public:
     SkPathStroker(const SkPath& src,
-                  SkScalar radius, SkScalar miterLimit, SkPaint::Cap cap,
-                  SkPaint::Join join);
+                  SkScalar radius, SkScalar miterLimit, SkPaint::Cap,
+                  SkPaint::Join, SkScalar resScale);
+
+    bool hasOnlyMoveTo() const { return 0 == fSegmentCount; }
+    SkPoint moveToPt() const { return fFirstPt; }
 
     void moveTo(const SkPoint&);
     void lineTo(const SkPoint&);
     void quadTo(const SkPoint&, const SkPoint&);
+    void conicTo(const SkPoint&, const SkPoint&, SkScalar weight);
     void cubicTo(const SkPoint&, const SkPoint&, const SkPoint&);
     void close(bool isLine) { this->finishContour(true, isLine); }
 
@@ -86,9 +138,14 @@ public:
         dst->swap(fOuter);
     }
 
+    SkScalar getResScale() const { return fResScale; }
+
 private:
     SkScalar    fRadius;
     SkScalar    fInvMiterLimit;
+    SkScalar    fResScale;
+    SkScalar    fInvResScale;
+    SkScalar    fInvResScaleSquared;
 
     SkVector    fFirstNormal, fPrevNormal, fFirstUnitNormal, fPrevUnitNormal;
     SkPoint     fFirstPt, fPrevPt;  // on original path
@@ -102,34 +159,102 @@ private:
     SkPath  fInner, fOuter; // outer is our working answer, inner is temp
     SkPath  fExtra;         // added as extra complete contours
 
+    enum StrokeType {
+        kOuter_StrokeType = 1,      // use sign-opposite values later to flip perpendicular axis
+        kInner_StrokeType = -1
+    } fStrokeType;
+
+    enum ResultType {
+        kSplit_ResultType,          // the caller should split the quad stroke in two
+        kDegenerate_ResultType,     // the caller should add a line
+        kQuad_ResultType,           // the caller should (continue to try to) add a quad stroke
+        kNormalError_ResultType,    // the cubic's normal couldn't be computed -- abort
+    };
+
+    enum ReductionType {
+        kPoint_ReductionType,       // all curve points are practically identical
+        kLine_ReductionType,        // the control point is on the line between the ends
+        kQuad_ReductionType,        // the control point is outside the line between the ends
+        kDegenerate_ReductionType,  // the control point is on the line but outside the ends
+        kDegenerate2_ReductionType, // two control points are on the line but outside ends (cubic)
+        kDegenerate3_ReductionType, // three areas of max curvature found (for cubic)
+    };
+
+    enum IntersectRayType {
+        kCtrlPt_RayType,
+        kResultType_RayType,
+    };
+
+    int fRecursionDepth;            // track stack depth to abort if numerics run amok
+    bool fFoundTangents;            // do less work until tangents meet (cubic)
+
+    void addDegenerateLine(const SkQuadConstruct* );
+    static ReductionType CheckConicLinear(const SkConic& , SkPoint* reduction);
+    static ReductionType CheckCubicLinear(const SkPoint cubic[4], SkPoint reduction[3],
+                                   const SkPoint** tanPtPtr);
+    static ReductionType CheckQuadLinear(const SkPoint quad[3], SkPoint* reduction);
+    ResultType compareQuadConic(const SkConic& , SkQuadConstruct* ) const;
+    ResultType compareQuadCubic(const SkPoint cubic[4], SkQuadConstruct* );
+    ResultType compareQuadQuad(const SkPoint quad[3], SkQuadConstruct* );
+    void conicPerpRay(const SkConic& , SkScalar t, SkPoint* tPt, SkPoint* onPt,
+                      SkPoint* tangent) const;
+    void conicQuadEnds(const SkConic& , SkQuadConstruct* ) const;
+    bool conicStroke(const SkConic& , SkQuadConstruct* );
+    bool cubicMidOnLine(const SkPoint cubic[4], const SkQuadConstruct* ) const;
+    bool cubicPerpRay(const SkPoint cubic[4], SkScalar t, SkPoint* tPt, SkPoint* onPt,
+                      SkPoint* tangent) const;
+    bool cubicQuadEnds(const SkPoint cubic[4], SkQuadConstruct* );
+    bool cubicQuadMid(const SkPoint cubic[4], const SkQuadConstruct* , SkPoint* mid) const;
+    bool cubicStroke(const SkPoint cubic[4], SkQuadConstruct* );
+    void init(StrokeType strokeType, SkQuadConstruct* , SkScalar tStart, SkScalar tEnd);
+    ResultType intersectRay(SkQuadConstruct* , IntersectRayType  STROKER_DEBUG_PARAMS(int) ) const;
+    bool ptInQuadBounds(const SkPoint quad[3], const SkPoint& pt) const;
+    void quadPerpRay(const SkPoint quad[3], SkScalar t, SkPoint* tPt, SkPoint* onPt,
+                     SkPoint* tangent) const;
+    bool quadStroke(const SkPoint quad[3], SkQuadConstruct* );
+    void setConicEndNormal(const SkConic& ,
+                           const SkVector& normalAB, const SkVector& unitNormalAB,
+                           SkVector* normalBC, SkVector* unitNormalBC);
+    void setCubicEndNormal(const SkPoint cubic[4],
+                           const SkVector& normalAB, const SkVector& unitNormalAB,
+                           SkVector* normalCD, SkVector* unitNormalCD);
+    void setQuadEndNormal(const SkPoint quad[3],
+                          const SkVector& normalAB, const SkVector& unitNormalAB,
+                          SkVector* normalBC, SkVector* unitNormalBC);
+    void setRayPts(const SkPoint& tPt, SkVector* dxy, SkPoint* onPt, SkPoint* tangent) const;
+    static bool SlightAngle(SkQuadConstruct* );
+    ResultType strokeCloseEnough(const SkPoint stroke[3], const SkPoint ray[2],
+                                 SkQuadConstruct*  STROKER_DEBUG_PARAMS(int depth) ) const;
+    ResultType tangentsMeet(const SkPoint cubic[4], SkQuadConstruct* );
+
     void    finishContour(bool close, bool isLine);
-    void    preJoinTo(const SkPoint&, SkVector* normal, SkVector* unitNormal,
+    bool    preJoinTo(const SkPoint&, SkVector* normal, SkVector* unitNormal,
                       bool isLine);
     void    postJoinTo(const SkPoint&, const SkVector& normal,
                        const SkVector& unitNormal);
 
     void    line_to(const SkPoint& currPt, const SkVector& normal);
-    void    quad_to(const SkPoint pts[3],
-                    const SkVector& normalAB, const SkVector& unitNormalAB,
-                    SkVector* normalBC, SkVector* unitNormalBC,
-                    int subDivide);
-    void    cubic_to(const SkPoint pts[4],
-                    const SkVector& normalAB, const SkVector& unitNormalAB,
-                    SkVector* normalCD, SkVector* unitNormalCD,
-                    int subDivide);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void SkPathStroker::preJoinTo(const SkPoint& currPt, SkVector* normal,
+bool SkPathStroker::preJoinTo(const SkPoint& currPt, SkVector* normal,
                               SkVector* unitNormal, bool currIsLine) {
     SkASSERT(fSegmentCount >= 0);
 
     SkScalar    prevX = fPrevPt.fX;
     SkScalar    prevY = fPrevPt.fY;
 
-    SkAssertResult(set_normal_unitnormal(fPrevPt, currPt, fRadius, normal,
-                                         unitNormal));
+    if (!set_normal_unitnormal(fPrevPt, currPt, fResScale, fRadius, normal, unitNormal)) {
+        if (SkStrokerPriv::CapFactory(SkPaint::kButt_Cap) == fCapper) {
+            return false;
+        }
+        /* Square caps and round caps draw even if the segment length is zero.
+           Since the zero length segment has no direction, set the orientation
+           to upright as the default orientation */
+        normal->set(fRadius, 0);
+        unitNormal->set(1, 0);
+    }
 
     if (fSegmentCount == 0) {
         fFirstNormal = *normal;
@@ -143,6 +268,7 @@ void SkPathStroker::preJoinTo(const SkPoint& currPt, SkVector* normal,
                 fRadius, fInvMiterLimit, fPrevIsLine, currIsLine);
     }
     fPrevIsLine = currIsLine;
+    return true;
 }
 
 void SkPathStroker::postJoinTo(const SkPoint& currPt, const SkVector& normal,
@@ -171,11 +297,11 @@ void SkPathStroker::finishContour(bool close, bool currIsLine) {
             // cap the end
             fInner.getLastPt(&pt);
             fCapper(&fOuter, fPrevPt, fPrevNormal, pt,
-                    currIsLine ? &fInner : NULL);
+                    currIsLine ? &fInner : nullptr);
             fOuter.reversePathTo(fInner);
             // cap the start
             fCapper(&fOuter, fFirstPt, -fFirstNormal, fFirstOuterPt,
-                    fPrevIsLine ? &fInner : NULL);
+                    fPrevIsLine ? &fInner : nullptr);
             fOuter.close();
         }
     }
@@ -189,8 +315,9 @@ void SkPathStroker::finishContour(bool close, bool currIsLine) {
 
 SkPathStroker::SkPathStroker(const SkPath& src,
                              SkScalar radius, SkScalar miterLimit,
-                             SkPaint::Cap cap, SkPaint::Join join)
-        : fRadius(radius) {
+                             SkPaint::Cap cap, SkPaint::Join join, SkScalar resScale)
+        : fRadius(radius)
+        , fResScale(resScale) {
 
     /*  This is only used when join is miter_join, but we initialize it here
         so that it is always defined, to fis valgrind warnings.
@@ -216,7 +343,14 @@ SkPathStroker::SkPathStroker(const SkPath& src,
     // 3x for result == inner + outer + join (swag)
     // 1x for inner == 'wag' (worst contour length would be better guess)
     fOuter.incReserve(src.countPoints() * 3);
+    fOuter.setIsVolatile(true);
     fInner.incReserve(src.countPoints());
+    fInner.setIsVolatile(true);
+    // TODO : write a common error function used by stroking and filling
+    // The '4' below matches the fill scan converter's error term
+    fInvResScale = SkScalarInvert(resScale * 4);
+    fInvResScaleSquared = fInvResScale * fInvResScale;
+    fRecursionDepth = 0;
 }
 
 void SkPathStroker::moveTo(const SkPoint& pt) {
@@ -233,237 +367,859 @@ void SkPathStroker::line_to(const SkPoint& currPt, const SkVector& normal) {
 }
 
 void SkPathStroker::lineTo(const SkPoint& currPt) {
-    if (SkPath::IsLineDegenerate(fPrevPt, currPt)) {
+    if (SkStrokerPriv::CapFactory(SkPaint::kButt_Cap) == fCapper
+            && fPrevPt.equalsWithinTolerance(currPt, SK_ScalarNearlyZero * fInvResScale)) {
         return;
     }
     SkVector    normal, unitNormal;
 
-    this->preJoinTo(currPt, &normal, &unitNormal, true);
+    if (!this->preJoinTo(currPt, &normal, &unitNormal, true)) {
+        return;
+    }
     this->line_to(currPt, normal);
     this->postJoinTo(currPt, normal, unitNormal);
 }
 
-void SkPathStroker::quad_to(const SkPoint pts[3],
-                      const SkVector& normalAB, const SkVector& unitNormalAB,
-                      SkVector* normalBC, SkVector* unitNormalBC,
-                      int subDivide) {
-    if (!set_normal_unitnormal(pts[1], pts[2], fRadius,
-                               normalBC, unitNormalBC)) {
-        // pts[1] nearly equals pts[2], so just draw a line to pts[2]
-        this->line_to(pts[2], normalAB);
+void SkPathStroker::setQuadEndNormal(const SkPoint quad[3], const SkVector& normalAB,
+        const SkVector& unitNormalAB, SkVector* normalBC, SkVector* unitNormalBC) {
+    if (!set_normal_unitnormal(quad[1], quad[2], fResScale, fRadius, normalBC, unitNormalBC)) {
         *normalBC = normalAB;
         *unitNormalBC = unitNormalAB;
-        return;
-    }
-
-    if (--subDivide >= 0 && normals_too_curvy(unitNormalAB, *unitNormalBC)) {
-        SkPoint     tmp[5];
-        SkVector    norm, unit;
-
-        SkChopQuadAtHalf(pts, tmp);
-        this->quad_to(&tmp[0], normalAB, unitNormalAB, &norm, &unit, subDivide);
-        this->quad_to(&tmp[2], norm, unit, normalBC, unitNormalBC, subDivide);
-    } else {
-        SkVector    normalB;
-
-        normalB = pts[2] - pts[0];
-        normalB.rotateCCW();
-        SkScalar dot = SkPoint::DotProduct(unitNormalAB, *unitNormalBC);
-        SkAssertResult(normalB.setLength(SkScalarDiv(fRadius,
-                                     SkScalarSqrt((SK_Scalar1 + dot)/2))));
-
-        fOuter.quadTo(  pts[1].fX + normalB.fX, pts[1].fY + normalB.fY,
-                        pts[2].fX + normalBC->fX, pts[2].fY + normalBC->fY);
-        fInner.quadTo(  pts[1].fX - normalB.fX, pts[1].fY - normalB.fY,
-                        pts[2].fX - normalBC->fX, pts[2].fY - normalBC->fY);
     }
 }
 
-void SkPathStroker::cubic_to(const SkPoint pts[4],
-                      const SkVector& normalAB, const SkVector& unitNormalAB,
-                      SkVector* normalCD, SkVector* unitNormalCD,
-                      int subDivide) {
-    SkVector    ab = pts[1] - pts[0];
-    SkVector    cd = pts[3] - pts[2];
-    SkVector    normalBC, unitNormalBC;
+void SkPathStroker::setConicEndNormal(const SkConic& conic, const SkVector& normalAB,
+        const SkVector& unitNormalAB, SkVector* normalBC, SkVector* unitNormalBC) {
+    setQuadEndNormal(conic.fPts, normalAB, unitNormalAB, normalBC, unitNormalBC);
+}
+
+void SkPathStroker::setCubicEndNormal(const SkPoint cubic[4], const SkVector& normalAB,
+        const SkVector& unitNormalAB, SkVector* normalCD, SkVector* unitNormalCD) {
+    SkVector    ab = cubic[1] - cubic[0];
+    SkVector    cd = cubic[3] - cubic[2];
 
     bool    degenerateAB = degenerate_vector(ab);
     bool    degenerateCD = degenerate_vector(cd);
 
     if (degenerateAB && degenerateCD) {
-DRAW_LINE:
-        this->line_to(pts[3], normalAB);
+        goto DEGENERATE_NORMAL;
+    }
+
+    if (degenerateAB) {
+        ab = cubic[2] - cubic[0];
+        degenerateAB = degenerate_vector(ab);
+    }
+    if (degenerateCD) {
+        cd = cubic[3] - cubic[1];
+        degenerateCD = degenerate_vector(cd);
+    }
+    if (degenerateAB || degenerateCD) {
+DEGENERATE_NORMAL:
         *normalCD = normalAB;
         *unitNormalCD = unitNormalAB;
         return;
     }
-
-    if (degenerateAB) {
-        ab = pts[2] - pts[0];
-        degenerateAB = degenerate_vector(ab);
-    }
-    if (degenerateCD) {
-        cd = pts[3] - pts[1];
-        degenerateCD = degenerate_vector(cd);
-    }
-    if (degenerateAB || degenerateCD) {
-        goto DRAW_LINE;
-    }
     SkAssertResult(set_normal_unitnormal(cd, fRadius, normalCD, unitNormalCD));
-    bool degenerateBC = !set_normal_unitnormal(pts[1], pts[2], fRadius,
-                                               &normalBC, &unitNormalBC);
-#ifndef SK_IGNORE_CUBIC_STROKE_FIX
-    if (--subDivide < 0) {
-        goto DRAW_LINE;
+}
+
+void SkPathStroker::init(StrokeType strokeType, SkQuadConstruct* quadPts, SkScalar tStart,
+        SkScalar tEnd) {
+    fStrokeType = strokeType;
+    fFoundTangents = false;
+    quadPts->init(tStart, tEnd);
+}
+
+// returns the distance squared from the point to the line
+static SkScalar pt_to_line(const SkPoint& pt, const SkPoint& lineStart, const SkPoint& lineEnd) {
+    SkVector dxy = lineEnd - lineStart;
+    if (degenerate_vector(dxy)) {
+        return pt.distanceToSqd(lineStart);
     }
-#endif
-    if (degenerateBC || normals_too_curvy(unitNormalAB, unitNormalBC) ||
-             normals_too_curvy(unitNormalBC, *unitNormalCD)) {
-#ifdef SK_IGNORE_CUBIC_STROKE_FIX
-        // subdivide if we can
-        if (--subDivide < 0) {
-            goto DRAW_LINE;
+    SkVector ab0 = pt - lineStart;
+    SkScalar numer = dxy.dot(ab0);
+    SkScalar denom = dxy.dot(dxy);
+    SkScalar t = numer / denom;
+    SkPoint hit;
+    hit.fX = lineStart.fX * (1 - t) + lineEnd.fX * t;
+    hit.fY = lineStart.fY * (1 - t) + lineEnd.fY * t;
+    return hit.distanceToSqd(pt);
+}
+
+/*  Given a cubic, determine if all four points are in a line.
+    Return true if the inner points is close to a line connecting the outermost points.
+
+    Find the outermost point by looking for the largest difference in X or Y.
+    Given the indices of the outermost points, and that outer_1 is greater than outer_2,
+    this table shows the index of the smaller of the remaining points:
+
+                      outer_2
+                  0    1    2    3
+      outer_1     ----------------
+         0     |  -    2    1    1
+         1     |  -    -    0    0
+         2     |  -    -    -    0
+         3     |  -    -    -    -
+
+    If outer_1 == 0 and outer_2 == 1, the smaller of the remaining indices (2 and 3) is 2.
+
+    This table can be collapsed to: (1 + (2 >> outer_2)) >> outer_1
+
+    Given three indices (outer_1 outer_2 mid_1) from 0..3, the remaining index is:
+
+               mid_2 == (outer_1 ^ outer_2 ^ mid_1)
+ */
+static bool cubic_in_line(const SkPoint cubic[4]) {
+    SkScalar ptMax = -1;
+    int outer1 SK_INIT_TO_AVOID_WARNING;
+    int outer2 SK_INIT_TO_AVOID_WARNING;
+    for (int index = 0; index < 3; ++index) {
+        for (int inner = index + 1; inner < 4; ++inner) {
+            SkVector testDiff = cubic[inner] - cubic[index];
+            SkScalar testMax = SkTMax(SkScalarAbs(testDiff.fX), SkScalarAbs(testDiff.fY));
+            if (ptMax < testMax) {
+                outer1 = index;
+                outer2 = inner;
+                ptMax = testMax;
+            }
         }
-#endif
-        SkPoint     tmp[7];
-        SkVector    norm, unit, dummy, unitDummy;
-
-        SkChopCubicAtHalf(pts, tmp);
-        this->cubic_to(&tmp[0], normalAB, unitNormalAB, &norm, &unit,
-                       subDivide);
-        // we use dummys since we already have a valid (and more accurate)
-        // normals for CD
-        this->cubic_to(&tmp[3], norm, unit, &dummy, &unitDummy, subDivide);
-    } else {
-        SkVector    normalB, normalC;
-
-        // need normals to inset/outset the off-curve pts B and C
-
-        SkVector    unitBC = pts[2] - pts[1];
-        unitBC.normalize();
-        unitBC.rotateCCW();
-
-        normalB = unitNormalAB + unitBC;
-        normalC = *unitNormalCD + unitBC;
-
-        SkScalar dot = SkPoint::DotProduct(unitNormalAB, unitBC);
-        SkAssertResult(normalB.setLength(SkScalarDiv(fRadius,
-                                    SkScalarSqrt((SK_Scalar1 + dot)/2))));
-        dot = SkPoint::DotProduct(*unitNormalCD, unitBC);
-        SkAssertResult(normalC.setLength(SkScalarDiv(fRadius,
-                                    SkScalarSqrt((SK_Scalar1 + dot)/2))));
-
-        fOuter.cubicTo( pts[1].fX + normalB.fX, pts[1].fY + normalB.fY,
-                        pts[2].fX + normalC.fX, pts[2].fY + normalC.fY,
-                        pts[3].fX + normalCD->fX, pts[3].fY + normalCD->fY);
-
-        fInner.cubicTo( pts[1].fX - normalB.fX, pts[1].fY - normalB.fY,
-                        pts[2].fX - normalC.fX, pts[2].fY - normalC.fY,
-                        pts[3].fX - normalCD->fX, pts[3].fY - normalCD->fY);
     }
+    SkASSERT(outer1 >= 0 && outer1 <= 2);
+    SkASSERT(outer2 >= 1 && outer2 <= 3);
+    SkASSERT(outer1 < outer2);
+    int mid1 = (1 + (2 >> outer2)) >> outer1;
+    SkASSERT(mid1 >= 0 && mid1 <= 2);
+    SkASSERT(outer1 != mid1 && outer2 != mid1);
+    int mid2 = outer1 ^ outer2 ^ mid1;
+    SkASSERT(mid2 >= 1 && mid2 <= 3);
+    SkASSERT(mid2 != outer1 && mid2 != outer2 && mid2 != mid1);
+    SkASSERT(((1 << outer1) | (1 << outer2) | (1 << mid1) | (1 << mid2)) == 0x0f);
+    SkScalar lineSlop = ptMax * ptMax * 0.00001f;  // this multiplier is pulled out of the air
+    return pt_to_line(cubic[mid1], cubic[outer1], cubic[outer2]) <= lineSlop
+            && pt_to_line(cubic[mid2], cubic[outer1], cubic[outer2]) <= lineSlop;
+}
+
+/* Given quad, see if all there points are in a line.
+   Return true if the inside point is close to a line connecting the outermost points.
+
+   Find the outermost point by looking for the largest difference in X or Y.
+   Since the XOR of the indices is 3  (0 ^ 1 ^ 2)
+   the missing index equals: outer_1 ^ outer_2 ^ 3
+ */
+static bool quad_in_line(const SkPoint quad[3]) {
+    SkScalar ptMax = -1;
+    int outer1 SK_INIT_TO_AVOID_WARNING;
+    int outer2 SK_INIT_TO_AVOID_WARNING;
+    for (int index = 0; index < 2; ++index) {
+        for (int inner = index + 1; inner < 3; ++inner) {
+            SkVector testDiff = quad[inner] - quad[index];
+            SkScalar testMax = SkTMax(SkScalarAbs(testDiff.fX), SkScalarAbs(testDiff.fY));
+            if (ptMax < testMax) {
+                outer1 = index;
+                outer2 = inner;
+                ptMax = testMax;
+            }
+        }
+    }
+    SkASSERT(outer1 >= 0 && outer1 <= 1);
+    SkASSERT(outer2 >= 1 && outer2 <= 2);
+    SkASSERT(outer1 < outer2);
+    int mid = outer1 ^ outer2 ^ 3;
+    SkScalar lineSlop =  ptMax * ptMax * 0.00001f;  // this multiplier is pulled out of the air
+    return pt_to_line(quad[mid], quad[outer1], quad[outer2]) <= lineSlop;
+}
+
+static bool conic_in_line(const SkConic& conic) {
+    return quad_in_line(conic.fPts);
+}
+
+SkPathStroker::ReductionType SkPathStroker::CheckCubicLinear(const SkPoint cubic[4],
+        SkPoint reduction[3], const SkPoint** tangentPtPtr) {
+    bool degenerateAB = degenerate_vector(cubic[1] - cubic[0]);
+    bool degenerateBC = degenerate_vector(cubic[2] - cubic[1]);
+    bool degenerateCD = degenerate_vector(cubic[3] - cubic[2]);
+    if (degenerateAB & degenerateBC & degenerateCD) {
+        return kPoint_ReductionType;
+    }
+    if (degenerateAB + degenerateBC + degenerateCD == 2) {
+        return kLine_ReductionType;
+    }
+    if (!cubic_in_line(cubic)) {
+        *tangentPtPtr = degenerateAB ? &cubic[2] : &cubic[1];
+        return kQuad_ReductionType;
+    }
+    SkScalar tValues[3];
+    int count = SkFindCubicMaxCurvature(cubic, tValues);
+    if (count == 0) {
+        return kLine_ReductionType;
+    }
+    for (int index = 0; index < count; ++index) {
+        SkScalar t = tValues[index];
+        SkEvalCubicAt(cubic, t, &reduction[index], nullptr, nullptr);
+    }
+    static_assert(kQuad_ReductionType + 1 == kDegenerate_ReductionType, "enum_out_of_whack");
+    static_assert(kQuad_ReductionType + 2 == kDegenerate2_ReductionType, "enum_out_of_whack");
+    static_assert(kQuad_ReductionType + 3 == kDegenerate3_ReductionType, "enum_out_of_whack");
+
+    return (ReductionType) (kQuad_ReductionType + count);
+}
+
+SkPathStroker::ReductionType SkPathStroker::CheckConicLinear(const SkConic& conic,
+        SkPoint* reduction) {
+    bool degenerateAB = degenerate_vector(conic.fPts[1] - conic.fPts[0]);
+    bool degenerateBC = degenerate_vector(conic.fPts[2] - conic.fPts[1]);
+    if (degenerateAB & degenerateBC) {
+        return kPoint_ReductionType;
+    }
+    if (degenerateAB | degenerateBC) {
+        return kLine_ReductionType;
+    }
+    if (!conic_in_line(conic)) {
+        return kQuad_ReductionType;
+    }
+#if 0   // once findMaxCurvature is implemented, this will be a better solution
+    SkScalar t;
+    if (!conic.findMaxCurvature(&t) || 0 == t) {
+        return kLine_ReductionType;
+    }
+#else  // but for now, use extrema instead
+    SkScalar xT = 0, yT = 0;
+    (void) conic.findXExtrema(&xT);
+    (void) conic.findYExtrema(&yT);
+    SkScalar t = SkTMax(xT, yT); 
+    if (0 == t) {
+        return kLine_ReductionType;
+    }
+#endif
+    conic.evalAt(t, reduction, nullptr);
+    return kDegenerate_ReductionType;
+}
+
+SkPathStroker::ReductionType SkPathStroker::CheckQuadLinear(const SkPoint quad[3],
+        SkPoint* reduction) {
+    bool degenerateAB = degenerate_vector(quad[1] - quad[0]);
+    bool degenerateBC = degenerate_vector(quad[2] - quad[1]);
+    if (degenerateAB & degenerateBC) {
+        return kPoint_ReductionType;
+    }
+    if (degenerateAB | degenerateBC) {
+        return kLine_ReductionType;
+    }
+    if (!quad_in_line(quad)) {
+        return kQuad_ReductionType;
+    }
+    SkScalar t = SkFindQuadMaxCurvature(quad);
+    if (0 == t) {
+        return kLine_ReductionType;
+    }
+    *reduction = SkEvalQuadAt(quad, t);
+    return kDegenerate_ReductionType;
+}
+
+void SkPathStroker::conicTo(const SkPoint& pt1, const SkPoint& pt2, SkScalar weight) {
+    const SkConic conic(fPrevPt, pt1, pt2, weight);
+    SkPoint reduction;
+    ReductionType reductionType = CheckConicLinear(conic, &reduction);
+    if (kPoint_ReductionType == reductionType) {
+        /* If the stroke consists of a moveTo followed by a degenerate curve, treat it
+            as if it were followed by a zero-length line. Lines without length
+            can have square and round end caps. */
+        this->lineTo(pt2);
+        return;
+    }
+    if (kLine_ReductionType == reductionType) {
+        this->lineTo(pt2);
+        return;
+    }
+    if (kDegenerate_ReductionType == reductionType) {
+        this->lineTo(reduction);
+        SkStrokerPriv::JoinProc saveJoiner = fJoiner;
+        fJoiner = SkStrokerPriv::JoinFactory(SkPaint::kRound_Join);
+        this->lineTo(pt2);
+        fJoiner = saveJoiner;
+        return;
+    }
+    SkASSERT(kQuad_ReductionType == reductionType);
+    SkVector normalAB, unitAB, normalBC, unitBC;
+    if (!this->preJoinTo(pt1, &normalAB, &unitAB, false)) {
+        this->lineTo(pt2);
+        return;
+    }
+    SkQuadConstruct quadPts;
+    this->init(kOuter_StrokeType, &quadPts, 0, 1);
+    (void) this->conicStroke(conic, &quadPts);
+    this->init(kInner_StrokeType, &quadPts, 0, 1);
+    (void) this->conicStroke(conic, &quadPts);
+    this->setConicEndNormal(conic, normalAB, unitAB, &normalBC, &unitBC);
+    this->postJoinTo(pt2, normalBC, unitBC);
 }
 
 void SkPathStroker::quadTo(const SkPoint& pt1, const SkPoint& pt2) {
-    bool    degenerateAB = SkPath::IsLineDegenerate(fPrevPt, pt1);
-    bool    degenerateBC = SkPath::IsLineDegenerate(pt1, pt2);
-
-    if (degenerateAB | degenerateBC) {
-        if (degenerateAB ^ degenerateBC) {
-            this->lineTo(pt2);
-        }
+    const SkPoint quad[3] = { fPrevPt, pt1, pt2 };
+    SkPoint reduction;
+    ReductionType reductionType = CheckQuadLinear(quad, &reduction);
+    if (kPoint_ReductionType == reductionType) {
+        /* If the stroke consists of a moveTo followed by a degenerate curve, treat it
+            as if it were followed by a zero-length line. Lines without length
+            can have square and round end caps. */
+        this->lineTo(pt2);
         return;
     }
-
-    SkVector    normalAB, unitAB, normalBC, unitBC;
-
-    this->preJoinTo(pt1, &normalAB, &unitAB, false);
-
-    {
-        SkPoint pts[3], tmp[5];
-        pts[0] = fPrevPt;
-        pts[1] = pt1;
-        pts[2] = pt2;
-
-        if (SkChopQuadAtMaxCurvature(pts, tmp) == 2) {
-            unitBC.setNormalize(pts[2].fX - pts[1].fX, pts[2].fY - pts[1].fY);
-            unitBC.rotateCCW();
-            if (normals_too_pinchy(unitAB, unitBC)) {
-                normalBC = unitBC;
-                normalBC.scale(fRadius);
-
-                fOuter.lineTo(tmp[2].fX + normalAB.fX, tmp[2].fY + normalAB.fY);
-                fOuter.lineTo(tmp[2].fX + normalBC.fX, tmp[2].fY + normalBC.fY);
-                fOuter.lineTo(tmp[4].fX + normalBC.fX, tmp[4].fY + normalBC.fY);
-
-                fInner.lineTo(tmp[2].fX - normalAB.fX, tmp[2].fY - normalAB.fY);
-                fInner.lineTo(tmp[2].fX - normalBC.fX, tmp[2].fY - normalBC.fY);
-                fInner.lineTo(tmp[4].fX - normalBC.fX, tmp[4].fY - normalBC.fY);
-
-                fExtra.addCircle(tmp[2].fX, tmp[2].fY, fRadius,
-                                 SkPath::kCW_Direction);
-            } else {
-                this->quad_to(&tmp[0], normalAB, unitAB, &normalBC, &unitBC,
-                              kMaxQuadSubdivide);
-                SkVector n = normalBC;
-                SkVector u = unitBC;
-                this->quad_to(&tmp[2], n, u, &normalBC, &unitBC,
-                              kMaxQuadSubdivide);
-            }
-        } else {
-            this->quad_to(pts, normalAB, unitAB, &normalBC, &unitBC,
-                          kMaxQuadSubdivide);
-        }
+    if (kLine_ReductionType == reductionType) {
+        this->lineTo(pt2);
+        return;
     }
+    if (kDegenerate_ReductionType == reductionType) {
+        this->lineTo(reduction);
+        SkStrokerPriv::JoinProc saveJoiner = fJoiner;
+        fJoiner = SkStrokerPriv::JoinFactory(SkPaint::kRound_Join);
+        this->lineTo(pt2);
+        fJoiner = saveJoiner;
+        return;
+    }
+    SkASSERT(kQuad_ReductionType == reductionType);
+    SkVector normalAB, unitAB, normalBC, unitBC;
+    if (!this->preJoinTo(pt1, &normalAB, &unitAB, false)) {
+        this->lineTo(pt2);
+        return;
+    }
+    SkQuadConstruct quadPts;
+    this->init(kOuter_StrokeType, &quadPts, 0, 1);
+    (void) this->quadStroke(quad, &quadPts);
+    this->init(kInner_StrokeType, &quadPts, 0, 1);
+    (void) this->quadStroke(quad, &quadPts);
+    this->setQuadEndNormal(quad, normalAB, unitAB, &normalBC, &unitBC);
 
     this->postJoinTo(pt2, normalBC, unitBC);
 }
 
+// Given a point on the curve and its derivative, scale the derivative by the radius, and
+// compute the perpendicular point and its tangent.
+void SkPathStroker::setRayPts(const SkPoint& tPt, SkVector* dxy, SkPoint* onPt,
+        SkPoint* tangent) const {
+    SkPoint oldDxy = *dxy;
+    if (!dxy->setLength(fRadius)) {  // consider moving double logic into SkPoint::setLength
+        double xx = oldDxy.fX;
+        double yy = oldDxy.fY;
+        double dscale = fRadius / sqrt(xx * xx + yy * yy);
+        dxy->fX = SkDoubleToScalar(xx * dscale);
+        dxy->fY = SkDoubleToScalar(yy * dscale);
+    }
+    SkScalar axisFlip = SkIntToScalar(fStrokeType);  // go opposite ways for outer, inner
+    onPt->fX = tPt.fX + axisFlip * dxy->fY;
+    onPt->fY = tPt.fY - axisFlip * dxy->fX;
+    if (tangent) {
+        tangent->fX = onPt->fX + dxy->fX;
+        tangent->fY = onPt->fY + dxy->fY;
+    }
+}
+
+// Given a conic and t, return the point on curve, its perpendicular, and the perpendicular tangent.
+// Returns false if the perpendicular could not be computed (because the derivative collapsed to 0)
+void SkPathStroker::conicPerpRay(const SkConic& conic, SkScalar t, SkPoint* tPt, SkPoint* onPt,
+        SkPoint* tangent) const {
+    SkVector dxy;
+    conic.evalAt(t, tPt, &dxy);
+    if (dxy.fX == 0 && dxy.fY == 0) {
+        dxy = conic.fPts[2] - conic.fPts[0];
+    }
+    this->setRayPts(*tPt, &dxy, onPt, tangent);
+}
+
+// Given a conic and a t range, find the start and end if they haven't been found already.
+void SkPathStroker::conicQuadEnds(const SkConic& conic, SkQuadConstruct* quadPts) const {
+    if (!quadPts->fStartSet) {
+        SkPoint conicStartPt;
+        this->conicPerpRay(conic, quadPts->fStartT, &conicStartPt, &quadPts->fQuad[0],
+                &quadPts->fTangentStart);
+        quadPts->fStartSet = true;
+    }
+    if (!quadPts->fEndSet) {
+        SkPoint conicEndPt;
+        this->conicPerpRay(conic, quadPts->fEndT, &conicEndPt, &quadPts->fQuad[2],
+                &quadPts->fTangentEnd);
+        quadPts->fEndSet = true;
+    }
+}
+
+
+// Given a cubic and t, return the point on curve, its perpendicular, and the perpendicular tangent.
+// Returns false if the perpendicular could not be computed (because the derivative collapsed to 0)
+bool SkPathStroker::cubicPerpRay(const SkPoint cubic[4], SkScalar t, SkPoint* tPt, SkPoint* onPt,
+        SkPoint* tangent) const {
+    SkVector dxy;
+    SkEvalCubicAt(cubic, t, tPt, &dxy, nullptr);
+    if (dxy.fX == 0 && dxy.fY == 0) {
+        if (SkScalarNearlyZero(t)) {
+            dxy = cubic[2] - cubic[0];
+        } else if (SkScalarNearlyZero(1 - t)) {
+            dxy = cubic[3] - cubic[1];
+        } else {
+            return false;
+        }
+        if (dxy.fX == 0 && dxy.fY == 0) {
+            dxy = cubic[3] - cubic[0];
+        }
+    }
+    setRayPts(*tPt, &dxy, onPt, tangent);
+    return true;
+}
+
+// Given a cubic and a t range, find the start and end if they haven't been found already.
+bool SkPathStroker::cubicQuadEnds(const SkPoint cubic[4], SkQuadConstruct* quadPts) {
+    if (!quadPts->fStartSet) {
+        SkPoint cubicStartPt;
+        if (!this->cubicPerpRay(cubic, quadPts->fStartT, &cubicStartPt, &quadPts->fQuad[0],
+                &quadPts->fTangentStart)) {
+            return false;
+        }
+        quadPts->fStartSet = true;
+    }
+    if (!quadPts->fEndSet) {
+        SkPoint cubicEndPt;
+        if (!this->cubicPerpRay(cubic, quadPts->fEndT, &cubicEndPt, &quadPts->fQuad[2],
+                &quadPts->fTangentEnd)) {
+            return false;
+        }
+        quadPts->fEndSet = true;
+    }
+    return true;
+}
+
+bool SkPathStroker::cubicQuadMid(const SkPoint cubic[4], const SkQuadConstruct* quadPts,
+        SkPoint* mid) const {
+    SkPoint cubicMidPt;
+    return this->cubicPerpRay(cubic, quadPts->fMidT, &cubicMidPt, mid, nullptr);
+}
+
+// Given a quad and t, return the point on curve, its perpendicular, and the perpendicular tangent.
+void SkPathStroker::quadPerpRay(const SkPoint quad[3], SkScalar t, SkPoint* tPt, SkPoint* onPt,
+        SkPoint* tangent) const {
+    SkVector dxy;
+    SkEvalQuadAt(quad, t, tPt, &dxy);
+    if (dxy.fX == 0 && dxy.fY == 0) {
+        dxy = quad[2] - quad[0];
+    }
+    setRayPts(*tPt, &dxy, onPt, tangent);
+}
+
+// Find the intersection of the stroke tangents to construct a stroke quad.
+// Return whether the stroke is a degenerate (a line), a quad, or must be split.
+// Optionally compute the quad's control point.
+SkPathStroker::ResultType SkPathStroker::intersectRay(SkQuadConstruct* quadPts,
+        IntersectRayType intersectRayType  STROKER_DEBUG_PARAMS(int depth)) const {
+    const SkPoint& start = quadPts->fQuad[0];
+    const SkPoint& end = quadPts->fQuad[2];
+    SkVector aLen = quadPts->fTangentStart - start;
+    SkVector bLen = quadPts->fTangentEnd - end;
+    /* Slopes match when denom goes to zero:
+                      axLen / ayLen ==                   bxLen / byLen
+    (ayLen * byLen) * axLen / ayLen == (ayLen * byLen) * bxLen / byLen
+             byLen  * axLen         ==  ayLen          * bxLen
+             byLen  * axLen         -   ayLen          * bxLen         ( == denom )
+     */
+    SkScalar denom = aLen.cross(bLen);
+    if (denom == 0 || !SkScalarIsFinite(denom)) {
+        return STROKER_RESULT(kDegenerate_ResultType, depth, quadPts, "denom == 0");
+    }
+    SkVector ab0 = start - end;
+    SkScalar numerA = bLen.cross(ab0);
+    SkScalar numerB = aLen.cross(ab0);
+    if ((numerA >= 0) == (numerB >= 0)) { // if the control point is outside the quad ends
+        // if the perpendicular distances from the quad points to the opposite tangent line
+        // are small, a straight line is good enough
+        SkScalar dist1 = pt_to_line(start, end, quadPts->fTangentEnd);
+        SkScalar dist2 = pt_to_line(end, start, quadPts->fTangentStart);
+        if (SkTMax(dist1, dist2) <= fInvResScaleSquared) {
+            return STROKER_RESULT(kDegenerate_ResultType, depth, quadPts,
+                    "SkTMax(dist1=%g, dist2=%g) <= fInvResScaleSquared", dist1, dist2);
+        }
+        return STROKER_RESULT(kSplit_ResultType, depth, quadPts,
+                "(numerA=%g >= 0) == (numerB=%g >= 0)", numerA, numerB);
+    }
+    // check to see if the denominator is teeny relative to the numerator
+    // if the offset by one will be lost, the ratio is too large
+    numerA /= denom;
+    bool validDivide = numerA > numerA - 1;
+    if (validDivide) {
+        if (kCtrlPt_RayType == intersectRayType) {
+            SkPoint* ctrlPt = &quadPts->fQuad[1];
+            // the intersection of the tangents need not be on the tangent segment
+            // so 0 <= numerA <= 1 is not necessarily true
+            ctrlPt->fX = start.fX * (1 - numerA) + quadPts->fTangentStart.fX * numerA;
+            ctrlPt->fY = start.fY * (1 - numerA) + quadPts->fTangentStart.fY * numerA;
+        }
+        return STROKER_RESULT(kQuad_ResultType, depth, quadPts,
+                "(numerA=%g >= 0) != (numerB=%g >= 0)", numerA, numerB);
+    }
+    // if the lines are parallel, straight line is good enough
+    return STROKER_RESULT(kDegenerate_ResultType, depth, quadPts,
+            "SkScalarNearlyZero(denom=%g)", denom);
+}
+
+// Given a cubic and a t-range, determine if the stroke can be described by a quadratic.
+SkPathStroker::ResultType SkPathStroker::tangentsMeet(const SkPoint cubic[4],
+        SkQuadConstruct* quadPts) {
+    if (!this->cubicQuadEnds(cubic, quadPts)) {
+        return kNormalError_ResultType;
+    }
+    return this->intersectRay(quadPts, kResultType_RayType  STROKER_DEBUG_PARAMS(fRecursionDepth));
+}
+
+// Intersect the line with the quad and return the t values on the quad where the line crosses.
+static int intersect_quad_ray(const SkPoint line[2], const SkPoint quad[3], SkScalar roots[2]) {
+    SkVector vec = line[1] - line[0];
+    SkScalar r[3];
+    for (int n = 0; n < 3; ++n) {
+        r[n] = (quad[n].fY - line[0].fY) * vec.fX - (quad[n].fX - line[0].fX) * vec.fY;
+    }
+    SkScalar A = r[2];
+    SkScalar B = r[1];
+    SkScalar C = r[0];
+    A += C - 2 * B;  // A = a - 2*b + c
+    B -= C;  // B = -(b - c)
+    return SkFindUnitQuadRoots(A, 2 * B, C, roots);
+}
+
+// Return true if the point is close to the bounds of the quad. This is used as a quick reject.
+bool SkPathStroker::ptInQuadBounds(const SkPoint quad[3], const SkPoint& pt) const {
+    SkScalar xMin = SkTMin(SkTMin(quad[0].fX, quad[1].fX), quad[2].fX);
+    if (pt.fX + fInvResScale < xMin) {
+        return false;
+    }
+    SkScalar xMax = SkTMax(SkTMax(quad[0].fX, quad[1].fX), quad[2].fX);
+    if (pt.fX - fInvResScale > xMax) {
+        return false;
+    }
+    SkScalar yMin = SkTMin(SkTMin(quad[0].fY, quad[1].fY), quad[2].fY);
+    if (pt.fY + fInvResScale < yMin) {
+        return false;
+    }
+    SkScalar yMax = SkTMax(SkTMax(quad[0].fY, quad[1].fY), quad[2].fY);
+    if (pt.fY - fInvResScale > yMax) {
+        return false;
+    }
+    return true;
+}
+
+static bool points_within_dist(const SkPoint& nearPt, const SkPoint& farPt, SkScalar limit) {
+    return nearPt.distanceToSqd(farPt) <= limit * limit;
+}
+
+static bool sharp_angle(const SkPoint quad[3]) {
+    SkVector smaller = quad[1] - quad[0];
+    SkVector larger = quad[1] - quad[2];
+    SkScalar smallerLen = smaller.lengthSqd();
+    SkScalar largerLen = larger.lengthSqd();
+    if (smallerLen > largerLen) {
+        SkTSwap(smaller, larger);
+        largerLen = smallerLen;
+    }
+    if (!smaller.setLength(largerLen)) {
+        return false;
+    }
+    SkScalar dot = smaller.dot(larger);
+    return dot > 0;
+}
+
+SkPathStroker::ResultType SkPathStroker::strokeCloseEnough(const SkPoint stroke[3],
+        const SkPoint ray[2], SkQuadConstruct* quadPts  STROKER_DEBUG_PARAMS(int depth)) const {
+    SkPoint strokeMid = SkEvalQuadAt(stroke, SK_ScalarHalf);
+    // measure the distance from the curve to the quad-stroke midpoint, compare to radius
+    if (points_within_dist(ray[0], strokeMid, fInvResScale)) {  // if the difference is small
+        if (sharp_angle(quadPts->fQuad)) {
+            return STROKER_RESULT(kSplit_ResultType, depth, quadPts,
+                    "sharp_angle (1) =%g,%g, %g,%g, %g,%g",
+                    quadPts->fQuad[0].fX, quadPts->fQuad[0].fY,
+                    quadPts->fQuad[1].fX, quadPts->fQuad[1].fY,
+                    quadPts->fQuad[2].fX, quadPts->fQuad[2].fY);
+        }
+        return STROKER_RESULT(kQuad_ResultType, depth, quadPts,
+                "points_within_dist(ray[0]=%g,%g, strokeMid=%g,%g, fInvResScale=%g)",
+                ray[0].fX, ray[0].fY, strokeMid.fX, strokeMid.fY, fInvResScale);
+    }
+    // measure the distance to quad's bounds (quick reject)
+        // an alternative : look for point in triangle
+    if (!ptInQuadBounds(stroke, ray[0])) {  // if far, subdivide
+        return STROKER_RESULT(kSplit_ResultType, depth, quadPts,
+                "!pt_in_quad_bounds(stroke=(%g,%g %g,%g %g,%g), ray[0]=%g,%g)",
+                stroke[0].fX, stroke[0].fY, stroke[1].fX, stroke[1].fY, stroke[2].fX, stroke[2].fY,
+                ray[0].fX, ray[0].fY);
+    }
+    // measure the curve ray distance to the quad-stroke
+    SkScalar roots[2];
+    int rootCount = intersect_quad_ray(ray, stroke, roots);
+    if (rootCount != 1) {
+        return STROKER_RESULT(kSplit_ResultType, depth, quadPts,
+                "rootCount=%d != 1", rootCount);
+    }
+    SkPoint quadPt = SkEvalQuadAt(stroke, roots[0]);
+    SkScalar error = fInvResScale * (SK_Scalar1 - SkScalarAbs(roots[0] - 0.5f) * 2);
+    if (points_within_dist(ray[0], quadPt, error)) {  // if the difference is small, we're done
+        if (sharp_angle(quadPts->fQuad)) {
+            return STROKER_RESULT(kSplit_ResultType, depth, quadPts,
+                    "sharp_angle (2) =%g,%g, %g,%g, %g,%g",
+                    quadPts->fQuad[0].fX, quadPts->fQuad[0].fY,
+                    quadPts->fQuad[1].fX, quadPts->fQuad[1].fY,
+                    quadPts->fQuad[2].fX, quadPts->fQuad[2].fY);
+        }
+        return STROKER_RESULT(kQuad_ResultType, depth, quadPts,
+                "points_within_dist(ray[0]=%g,%g, quadPt=%g,%g, error=%g)",
+                ray[0].fX, ray[0].fY, quadPt.fX, quadPt.fY, error);
+    }
+    // otherwise, subdivide
+    return STROKER_RESULT(kSplit_ResultType, depth, quadPts, "%s", "fall through");
+}
+
+SkPathStroker::ResultType SkPathStroker::compareQuadCubic(const SkPoint cubic[4],
+        SkQuadConstruct* quadPts) {
+    // get the quadratic approximation of the stroke
+    if (!this->cubicQuadEnds(cubic, quadPts)) {
+        return kNormalError_ResultType;
+    }
+    ResultType resultType = this->intersectRay(quadPts, kCtrlPt_RayType
+            STROKER_DEBUG_PARAMS(fRecursionDepth) );
+    if (resultType != kQuad_ResultType) {
+        return resultType;
+    }
+    // project a ray from the curve to the stroke
+    SkPoint ray[2];  // points near midpoint on quad, midpoint on cubic
+    if (!this->cubicPerpRay(cubic, quadPts->fMidT, &ray[1], &ray[0], nullptr)) {
+        return kNormalError_ResultType;
+    }
+    return this->strokeCloseEnough(quadPts->fQuad, ray, quadPts
+            STROKER_DEBUG_PARAMS(fRecursionDepth));
+}
+
+SkPathStroker::ResultType SkPathStroker::compareQuadConic(const SkConic& conic,
+        SkQuadConstruct* quadPts) const {
+    // get the quadratic approximation of the stroke
+    this->conicQuadEnds(conic, quadPts);
+    ResultType resultType = this->intersectRay(quadPts, kCtrlPt_RayType
+            STROKER_DEBUG_PARAMS(fRecursionDepth) );
+    if (resultType != kQuad_ResultType) {
+        return resultType;
+    }
+    // project a ray from the curve to the stroke
+    SkPoint ray[2];  // points near midpoint on quad, midpoint on conic
+    this->conicPerpRay(conic, quadPts->fMidT, &ray[1], &ray[0], nullptr);
+    return this->strokeCloseEnough(quadPts->fQuad, ray, quadPts
+            STROKER_DEBUG_PARAMS(fRecursionDepth));
+}
+
+SkPathStroker::ResultType SkPathStroker::compareQuadQuad(const SkPoint quad[3],
+        SkQuadConstruct* quadPts) {
+    // get the quadratic approximation of the stroke
+    if (!quadPts->fStartSet) {
+        SkPoint quadStartPt;
+        this->quadPerpRay(quad, quadPts->fStartT, &quadStartPt, &quadPts->fQuad[0],
+                &quadPts->fTangentStart);
+        quadPts->fStartSet = true;
+    }
+    if (!quadPts->fEndSet) {
+        SkPoint quadEndPt;
+        this->quadPerpRay(quad, quadPts->fEndT, &quadEndPt, &quadPts->fQuad[2],
+                &quadPts->fTangentEnd);
+        quadPts->fEndSet = true;
+    }
+    ResultType resultType = this->intersectRay(quadPts, kCtrlPt_RayType
+            STROKER_DEBUG_PARAMS(fRecursionDepth));
+    if (resultType != kQuad_ResultType) {
+        return resultType;
+    }
+    // project a ray from the curve to the stroke
+    SkPoint ray[2];
+    this->quadPerpRay(quad, quadPts->fMidT, &ray[1], &ray[0], nullptr);
+    return this->strokeCloseEnough(quadPts->fQuad, ray, quadPts
+            STROKER_DEBUG_PARAMS(fRecursionDepth));
+}
+
+void SkPathStroker::addDegenerateLine(const SkQuadConstruct* quadPts) {
+    const SkPoint* quad = quadPts->fQuad;
+    SkPath* path = fStrokeType == kOuter_StrokeType ? &fOuter : &fInner;
+    path->lineTo(quad[2].fX, quad[2].fY);
+}
+
+bool SkPathStroker::cubicMidOnLine(const SkPoint cubic[4], const SkQuadConstruct* quadPts) const {
+    SkPoint strokeMid;
+    if (!cubicQuadMid(cubic, quadPts, &strokeMid)) {
+        return false;
+    }
+    SkScalar dist = pt_to_line(strokeMid, quadPts->fQuad[0], quadPts->fQuad[2]);
+    return dist < fInvResScaleSquared;
+}
+
+bool SkPathStroker::cubicStroke(const SkPoint cubic[4], SkQuadConstruct* quadPts) {
+    if (!fFoundTangents) {
+        ResultType resultType = this->tangentsMeet(cubic, quadPts);
+        if (kQuad_ResultType != resultType) {
+            if (kNormalError_ResultType == resultType) {
+                return false;
+            }
+            if ((kDegenerate_ResultType == resultType
+                    || points_within_dist(quadPts->fQuad[0], quadPts->fQuad[2],
+                    fInvResScale)) && cubicMidOnLine(cubic, quadPts)) {
+                addDegenerateLine(quadPts);
+                return true;
+            }
+        } else {
+            fFoundTangents = true;
+        }
+    }
+    if (fFoundTangents) {
+        ResultType resultType = this->compareQuadCubic(cubic, quadPts);
+        if (kQuad_ResultType == resultType) {
+            SkPath* path = fStrokeType == kOuter_StrokeType ? &fOuter : &fInner;
+            const SkPoint* stroke = quadPts->fQuad;
+            path->quadTo(stroke[1].fX, stroke[1].fY, stroke[2].fX, stroke[2].fY);
+            return true;
+        }
+        if (kDegenerate_ResultType == resultType) {
+            addDegenerateLine(quadPts);
+            return true;
+        }
+        if (kNormalError_ResultType == resultType) {
+            return false;
+        }
+    }
+    if (!SkScalarIsFinite(quadPts->fQuad[2].fX) || !SkScalarIsFinite(quadPts->fQuad[2].fY)) {
+        return false;  // just abort if projected quad isn't representable
+    }
+    SkDEBUGCODE(gMaxRecursion[fFoundTangents] = SkTMax(gMaxRecursion[fFoundTangents],
+            fRecursionDepth + 1));
+    if (++fRecursionDepth > kRecursiveLimits[fFoundTangents]) {
+        return false;  // just abort if projected quad isn't representable
+    }
+    SkQuadConstruct half;
+    if (!half.initWithStart(quadPts)) {
+        addDegenerateLine(quadPts);
+        return true;
+    }
+    if (!this->cubicStroke(cubic, &half)) {
+        return false;
+    }
+    if (!half.initWithEnd(quadPts)) {
+        addDegenerateLine(quadPts);
+        return true;
+    }
+    if (!this->cubicStroke(cubic, &half)) {
+        return false;
+    }
+    --fRecursionDepth;
+    return true;
+}
+
+bool SkPathStroker::conicStroke(const SkConic& conic, SkQuadConstruct* quadPts) {
+    ResultType resultType = this->compareQuadConic(conic, quadPts);
+    if (kQuad_ResultType == resultType) {
+        const SkPoint* stroke = quadPts->fQuad;
+        SkPath* path = fStrokeType == kOuter_StrokeType ? &fOuter : &fInner;
+        path->quadTo(stroke[1].fX, stroke[1].fY, stroke[2].fX, stroke[2].fY);
+        return true;
+    }
+    if (kDegenerate_ResultType == resultType) {
+        addDegenerateLine(quadPts);
+        return true;
+    }
+    SkDEBUGCODE(gMaxRecursion[kConic_RecursiveLimit] = SkTMax(gMaxRecursion[kConic_RecursiveLimit],
+            fRecursionDepth + 1));
+    if (++fRecursionDepth > kRecursiveLimits[kConic_RecursiveLimit]) {
+        return false;  // just abort if projected quad isn't representable
+    }
+    SkQuadConstruct half;
+    (void) half.initWithStart(quadPts);
+    if (!this->conicStroke(conic, &half)) {
+        return false;
+    }
+    (void) half.initWithEnd(quadPts);
+    if (!this->conicStroke(conic, &half)) {
+        return false;
+    }
+    --fRecursionDepth;
+    return true;
+}
+
+bool SkPathStroker::quadStroke(const SkPoint quad[3], SkQuadConstruct* quadPts) {
+    ResultType resultType = this->compareQuadQuad(quad, quadPts);
+    if (kQuad_ResultType == resultType) {
+        const SkPoint* stroke = quadPts->fQuad;
+        SkPath* path = fStrokeType == kOuter_StrokeType ? &fOuter : &fInner;
+        path->quadTo(stroke[1].fX, stroke[1].fY, stroke[2].fX, stroke[2].fY);
+        return true;
+    }
+    if (kDegenerate_ResultType == resultType) {
+        addDegenerateLine(quadPts);
+        return true;
+    }
+    SkDEBUGCODE(gMaxRecursion[kQuad_RecursiveLimit] = SkTMax(gMaxRecursion[kQuad_RecursiveLimit],
+            fRecursionDepth + 1));
+    if (++fRecursionDepth > kRecursiveLimits[kQuad_RecursiveLimit]) {
+        return false;  // just abort if projected quad isn't representable
+    }
+    SkQuadConstruct half;
+    (void) half.initWithStart(quadPts);
+    if (!this->quadStroke(quad, &half)) {
+        return false;
+    }
+    (void) half.initWithEnd(quadPts);
+    if (!this->quadStroke(quad, &half)) {
+        return false;
+    }
+    --fRecursionDepth;
+    return true;
+}
+
 void SkPathStroker::cubicTo(const SkPoint& pt1, const SkPoint& pt2,
                             const SkPoint& pt3) {
-    bool    degenerateAB = SkPath::IsLineDegenerate(fPrevPt, pt1);
-    bool    degenerateBC = SkPath::IsLineDegenerate(pt1, pt2);
-    bool    degenerateCD = SkPath::IsLineDegenerate(pt2, pt3);
-
-    if (degenerateAB + degenerateBC + degenerateCD >= 2) {
+    const SkPoint cubic[4] = { fPrevPt, pt1, pt2, pt3 };
+    SkPoint reduction[3];
+    const SkPoint* tangentPt;
+    ReductionType reductionType = CheckCubicLinear(cubic, reduction, &tangentPt);
+    if (kPoint_ReductionType == reductionType) {
+        /* If the stroke consists of a moveTo followed by a degenerate curve, treat it
+            as if it were followed by a zero-length line. Lines without length
+            can have square and round end caps. */
         this->lineTo(pt3);
         return;
     }
-
-    SkVector    normalAB, unitAB, normalCD, unitCD;
-
-    // find the first tangent (which might be pt1 or pt2
-    {
-        const SkPoint*  nextPt = &pt1;
-        if (degenerateAB)
-            nextPt = &pt2;
-        this->preJoinTo(*nextPt, &normalAB, &unitAB, false);
+    if (kLine_ReductionType == reductionType) {
+        this->lineTo(pt3);
+        return;
     }
-
-    {
-        SkPoint pts[4], tmp[13];
-        int         i, count;
-        SkVector    n, u;
-        SkScalar    tValues[3];
-
-        pts[0] = fPrevPt;
-        pts[1] = pt1;
-        pts[2] = pt2;
-        pts[3] = pt3;
-
-        count = SkChopCubicAtMaxCurvature(pts, tmp, tValues);
-        n = normalAB;
-        u = unitAB;
-        for (i = 0; i < count; i++) {
-            this->cubic_to(&tmp[i * 3], n, u, &normalCD, &unitCD,
-                           kMaxCubicSubdivide);
-            if (i == count - 1) {
-                break;
-            }
-            n = normalCD;
-            u = unitCD;
-
+    if (kDegenerate_ReductionType <= reductionType && kDegenerate3_ReductionType >= reductionType) {
+        this->lineTo(reduction[0]);
+        SkStrokerPriv::JoinProc saveJoiner = fJoiner;
+        fJoiner = SkStrokerPriv::JoinFactory(SkPaint::kRound_Join);
+        if (kDegenerate2_ReductionType <= reductionType) {
+            this->lineTo(reduction[1]);
         }
+        if (kDegenerate3_ReductionType == reductionType) {
+            this->lineTo(reduction[2]);
+        }
+        this->lineTo(pt3);
+        fJoiner = saveJoiner;
+        return;
     }
+    SkASSERT(kQuad_ReductionType == reductionType);
+    SkVector normalAB, unitAB, normalCD, unitCD;
+    if (!this->preJoinTo(*tangentPt, &normalAB, &unitAB, false)) {
+        this->lineTo(pt3);
+        return;
+    }
+    SkScalar tValues[2];
+    int count = SkFindCubicInflections(cubic, tValues);
+    SkScalar lastT = 0;
+    for (int index = 0; index <= count; ++index) {
+        SkScalar nextT = index < count ? tValues[index] : 1;
+        SkQuadConstruct quadPts;
+        this->init(kOuter_StrokeType, &quadPts, lastT, nextT);
+        (void) this->cubicStroke(cubic, &quadPts);
+        this->init(kInner_StrokeType, &quadPts, lastT, nextT);
+        (void) this->cubicStroke(cubic, &quadPts);
+        lastT = nextT;
+    }
+    // emit the join even if one stroke succeeded but the last one failed
+    // this avoids reversing an inner stroke with a partial path followed by another moveto
+    this->setCubicEndNormal(cubic, normalAB, unitAB, &normalCD, &unitCD);
 
     this->postJoinTo(pt3, normalCD, unitCD);
 }
@@ -546,7 +1302,7 @@ private:
 };
 
 void SkStroke::strokePath(const SkPath& src, SkPath* dst) const {
-    SkASSERT(&src != NULL && dst != NULL);
+    SkASSERT(dst);
 
     SkScalar radius = SkScalarHalf(fWidth);
 
@@ -558,10 +1314,11 @@ void SkStroke::strokePath(const SkPath& src, SkPath* dst) const {
 
     // If src is really a rect, call our specialty strokeRect() method
     {
+        SkRect rect;
         bool isClosed;
         SkPath::Direction dir;
-        if (src.isRect(&isClosed, &dir) && isClosed) {
-            this->strokeRect(src.getBounds(), dst, dir);
+        if (src.isRect(&rect, &isClosed, &dir) && isClosed) {
+            this->strokeRect(rect, dst, dir);
             // our answer should preserve the inverseness of the src
             if (src.isInverseFillType()) {
                 SkASSERT(!dst->isInverseFillType());
@@ -571,11 +1328,7 @@ void SkStroke::strokePath(const SkPath& src, SkPath* dst) const {
         }
     }
 
-    SkAutoConicToQuads converter;
-    const SkScalar conicTol = SK_Scalar1 / 4;
-
-    SkPathStroker   stroker(src, radius, fMiterLimit, this->getCap(),
-                            this->getJoin());
+    SkPathStroker   stroker(src, radius, fMiterLimit, this->getCap(), this->getJoin(), fResScale);
     SkPath::Iter    iter(src, false);
     SkPath::Verb    lastSegment = SkPath::kMove_Verb;
 
@@ -594,21 +1347,23 @@ void SkStroke::strokePath(const SkPath& src, SkPath* dst) const {
                 lastSegment = SkPath::kQuad_Verb;
                 break;
             case SkPath::kConic_Verb: {
-                // todo: if we had maxcurvature for conics, perhaps we should
-                // natively extrude the conic instead of converting to quads.
-                const SkPoint* quadPts =
-                    converter.computeQuads(pts, iter.conicWeight(), conicTol);
-                for (int i = 0; i < converter.countQuads(); ++i) {
-                    stroker.quadTo(quadPts[1], quadPts[2]);
-                    quadPts += 2;
-                }
-                lastSegment = SkPath::kQuad_Verb;
+                stroker.conicTo(pts[1], pts[2], iter.conicWeight());
+                lastSegment = SkPath::kConic_Verb;
+                break;
             } break;
             case SkPath::kCubic_Verb:
                 stroker.cubicTo(pts[1], pts[2], pts[3]);
                 lastSegment = SkPath::kCubic_Verb;
                 break;
             case SkPath::kClose_Verb:
+                if (stroker.hasOnlyMoveTo() && SkPaint::kButt_Cap != this->getCap()) {
+                    /* If the stroke consists of a moveTo followed by a close, treat it
+                       as if it were followed by a zero-length line. Lines without length
+                       can have square and round end caps. */
+                    stroker.lineTo(stroker.moveToPt());
+                    lastSegment = SkPath::kLine_Verb;
+                    break;
+                }
                 stroker.close(lastSegment == SkPath::kLine_Verb);
                 break;
             case SkPath::kDone_Verb:
@@ -619,7 +1374,7 @@ DONE:
     stroker.done(dst, lastSegment == SkPath::kLine_Verb);
 
     if (fDoFill) {
-        if (src.cheapIsDirection(SkPath::kCCW_Direction)) {
+        if (SkPathPriv::CheapIsFirstDirection(src, SkPathPriv::kCCW_FirstDirection)) {
             dst->reverseAddPath(src);
         } else {
             dst->addPath(src);
@@ -654,8 +1409,8 @@ DONE:
 }
 
 static SkPath::Direction reverse_direction(SkPath::Direction dir) {
-    SkASSERT(SkPath::kUnknown_Direction != dir);
-    return SkPath::kCW_Direction == dir ? SkPath::kCCW_Direction : SkPath::kCW_Direction;
+    static const SkPath::Direction gOpposite[] = { SkPath::kCCW_Direction, SkPath::kCW_Direction };
+    return gOpposite[dir];
 }
 
 static void addBevel(SkPath* path, const SkRect& r, const SkRect& outer, SkPath::Direction dir) {
@@ -685,7 +1440,7 @@ static void addBevel(SkPath* path, const SkRect& r, const SkRect& outer, SkPath:
 
 void SkStroke::strokeRect(const SkRect& origRect, SkPath* dst,
                           SkPath::Direction dir) const {
-    SkASSERT(dst != NULL);
+    SkASSERT(dst != nullptr);
     dst->reset();
 
     SkScalar radius = SkScalarHalf(fWidth);
diff --git a/gfx/skia/skia/src/core/SkStroke.h b/gfx/skia/skia/src/core/SkStroke.h
index a6a9f083311d..f93efdee0fd1 100644
--- a/gfx/skia/skia/src/core/SkStroke.h
+++ b/gfx/skia/skia/src/core/SkStroke.h
@@ -11,6 +11,13 @@
 #include "SkPath.h"
 #include "SkPoint.h"
 #include "SkPaint.h"
+#include "SkStrokerPriv.h"
+
+#ifdef SK_DEBUG
+extern bool gDebugStrokerErrorSet;
+extern SkScalar gDebugStrokerError;
+extern int gMaxRecursion[];
+#endif
 
 /** \class SkStroke
     SkStroke is the utility class that constructs paths by stroking
@@ -36,6 +43,20 @@ public:
     bool    getDoFill() const { return SkToBool(fDoFill); }
     void    setDoFill(bool doFill) { fDoFill = SkToU8(doFill); }
 
+    /**
+     *  ResScale is the "intended" resolution for the output.
+     *      Default is 1.0.
+     *      Larger values (res > 1) indicate that the result should be more precise, since it will
+     *          be zoomed up, and small errors will be magnified.
+     *      Smaller values (0 < res < 1) indicate that the result can be less precise, since it will
+     *          be zoomed down, and small errors may be invisible.
+     */
+    SkScalar getResScale() const { return fResScale; }
+    void setResScale(SkScalar rs) {
+        SkASSERT(rs > 0 && SkScalarIsFinite(rs));
+        fResScale = rs;
+    }
+
     /**
      *  Stroke the specified rect, winding it in the specified direction..
      */
@@ -47,6 +68,7 @@ public:
 
 private:
     SkScalar    fWidth, fMiterLimit;
+    SkScalar    fResScale;
     uint8_t     fCap, fJoin;
     SkBool8     fDoFill;
 
diff --git a/gfx/skia/skia/src/core/SkStrokeRec.cpp b/gfx/skia/skia/src/core/SkStrokeRec.cpp
index a4c73af2c5ac..6c975b445f0d 100644
--- a/gfx/skia/skia/src/core/SkStrokeRec.cpp
+++ b/gfx/skia/skia/src/core/SkStrokeRec.cpp
@@ -12,6 +12,7 @@
 #define kStrokeRec_FillStyleWidth     (-SK_Scalar1)
 
 SkStrokeRec::SkStrokeRec(InitStyle s) {
+    fResScale       = 1;
     fWidth          = (kFill_InitStyle == s) ? kStrokeRec_FillStyleWidth : 0;
     fMiterLimit     = SkPaintDefaults_MiterLimit;
     fCap            = SkPaint::kDefault_Cap;
@@ -19,19 +20,17 @@ SkStrokeRec::SkStrokeRec(InitStyle s) {
     fStrokeAndFill  = false;
 }
 
-SkStrokeRec::SkStrokeRec(const SkStrokeRec& src) {
-    memcpy(this, &src, sizeof(src));
+SkStrokeRec::SkStrokeRec(const SkPaint& paint, SkScalar resScale) {
+    this->init(paint, paint.getStyle(), resScale);
 }
 
-SkStrokeRec::SkStrokeRec(const SkPaint& paint) {
-    this->init(paint, paint.getStyle());
+SkStrokeRec::SkStrokeRec(const SkPaint& paint, SkPaint::Style styleOverride, SkScalar resScale) {
+    this->init(paint, styleOverride, resScale);
 }
 
-SkStrokeRec::SkStrokeRec(const SkPaint& paint, SkPaint::Style styleOverride) {
-    this->init(paint, styleOverride);
-}
+void SkStrokeRec::init(const SkPaint& paint, SkPaint::Style style, SkScalar resScale) {
+    fResScale = resScale;
 
-void SkStrokeRec::init(const SkPaint& paint, SkPaint::Style style) {
     switch (style) {
         case SkPaint::kFill_Style:
             fWidth = kStrokeRec_FillStyleWidth;
@@ -97,17 +96,41 @@ void SkStrokeRec::setStrokeStyle(SkScalar width, bool strokeAndFill) {
 
 #include "SkStroke.h"
 
+#ifdef SK_DEBUG  
+    // enables tweaking these values at runtime from SampleApp
+    bool gDebugStrokerErrorSet = false;
+    SkScalar gDebugStrokerError;
+#endif
+
 bool SkStrokeRec::applyToPath(SkPath* dst, const SkPath& src) const {
     if (fWidth <= 0) {  // hairline or fill
         return false;
     }
 
     SkStroke stroker;
-    stroker.setCap(fCap);
-    stroker.setJoin(fJoin);
+    stroker.setCap((SkPaint::Cap)fCap);
+    stroker.setJoin((SkPaint::Join)fJoin);
     stroker.setMiterLimit(fMiterLimit);
     stroker.setWidth(fWidth);
     stroker.setDoFill(fStrokeAndFill);
+#ifdef SK_DEBUG
+    stroker.setResScale(gDebugStrokerErrorSet ? gDebugStrokerError : fResScale);
+#else
+    stroker.setResScale(fResScale);
+#endif
     stroker.strokePath(src, dst);
     return true;
 }
+
+void SkStrokeRec::applyToPaint(SkPaint* paint) const {
+    if (fWidth < 0) {  // fill
+        paint->setStyle(SkPaint::kFill_Style);
+        return;
+    }
+
+    paint->setStyle(fStrokeAndFill ? SkPaint::kStrokeAndFill_Style : SkPaint::kStroke_Style);
+    paint->setStrokeWidth(fWidth);
+    paint->setStrokeMiter(fMiterLimit);
+    paint->setStrokeCap((SkPaint::Cap)fCap);
+    paint->setStrokeJoin((SkPaint::Join)fJoin);
+}
diff --git a/gfx/skia/skia/src/core/SkStrokerPriv.cpp b/gfx/skia/skia/src/core/SkStrokerPriv.cpp
index ad9c0c4d6fd6..7fc773a114c1 100644
--- a/gfx/skia/skia/src/core/SkStrokerPriv.cpp
+++ b/gfx/skia/skia/src/core/SkStrokerPriv.cpp
@@ -22,19 +22,13 @@ static void RoundCapper(SkPath* path, const SkPoint& pivot,
                         const SkVector& normal, const SkPoint& stop,
                         SkPath*)
 {
-    SkScalar    px = pivot.fX;
-    SkScalar    py = pivot.fY;
-    SkScalar    nx = normal.fX;
-    SkScalar    ny = normal.fY;
-    SkScalar    sx = SkScalarMul(nx, CUBIC_ARC_FACTOR);
-    SkScalar    sy = SkScalarMul(ny, CUBIC_ARC_FACTOR);
+    SkVector parallel;
+    normal.rotateCW(&parallel);
 
-    path->cubicTo(px + nx + CWX(sx, sy), py + ny + CWY(sx, sy),
-                  px + CWX(nx, ny) + sx, py + CWY(nx, ny) + sy,
-                  px + CWX(nx, ny), py + CWY(nx, ny));
-    path->cubicTo(px + CWX(nx, ny) - sx, py + CWY(nx, ny) - sy,
-                  px - nx + CWX(sx, sy), py - ny + CWY(sx, sy),
-                  stop.fX, stop.fY);
+    SkPoint projectedCenter = pivot + parallel;
+
+    path->conicTo(projectedCenter + normal, projectedCenter, SK_ScalarRoot2Over2);
+    path->conicTo(projectedCenter - normal, stop, SK_ScalarRoot2Over2);
 }
 
 static void SquareCapper(SkPath* path, const SkPoint& pivot,
@@ -136,18 +130,15 @@ static void RoundJoiner(SkPath* outer, SkPath* inner, const SkVector& beforeUnit
         dir = kCCW_SkRotationDirection;
     }
 
-    SkPoint     pts[kSkBuildQuadArcStorage];
     SkMatrix    matrix;
     matrix.setScale(radius, radius);
     matrix.postTranslate(pivot.fX, pivot.fY);
-    int count = SkBuildQuadArc(before, after, dir, &matrix, pts);
-    SkASSERT((count & 1) == 1);
-
-    if (count > 1)
-    {
-        for (int i = 1; i < count; i += 2)
-            outer->quadTo(pts[i].fX, pts[i].fY, pts[i+1].fX, pts[i+1].fY);
-
+    SkConic conics[SkConic::kMaxConicsForArc];
+    int count = SkConic::BuildUnitArc(before, after, dir, &matrix, conics);
+    if (count > 0) {
+        for (int i = 0; i < count; ++i) {
+            outer->conicTo(conics[i].fPts[1], conics[i].fPts[2], conics[i].fW);
+        }
         after.scale(radius);
         HandleInnerJoin(inner, pivot, after);
     }
@@ -223,7 +214,7 @@ static void MiterJoiner(SkPath* outer, SkPath* inner, const SkVector& beforeUnit
     else
         mid.set(before.fX + after.fX, before.fY + after.fY);
 
-    mid.setLength(SkScalarDiv(radius, sinHalfAngle));
+    mid.setLength(radius / sinHalfAngle);
 DO_MITER:
     if (prevIsLine)
         outer->setLastPt(pivot.fX + mid.fX, pivot.fY + mid.fY);
diff --git a/gfx/skia/skia/src/core/SkSurfacePriv.h b/gfx/skia/skia/src/core/SkSurfacePriv.h
new file mode 100644
index 000000000000..74d19a6df49c
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkSurfacePriv.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkSurfacePriv_DEFINED
+#define SkSurfacePriv_DEFINED
+
+#include "SkSurfaceProps.h"
+
+static inline SkSurfaceProps SkSurfacePropsCopyOrDefault(const SkSurfaceProps* props) {
+    if (props) {
+        return *props;
+    } else {
+        return SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType);
+    }
+}
+
+static inline SkPixelGeometry SkSurfacePropsDefaultPixelGeometry() {
+    return SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType).pixelGeometry();
+}
+
+#endif
diff --git a/gfx/skia/skia/src/core/SkTDPQueue.h b/gfx/skia/skia/src/core/SkTDPQueue.h
new file mode 100644
index 000000000000..1545f9799537
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkTDPQueue.h
@@ -0,0 +1,195 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkTDPQueue_DEFINED
+#define SkTDPQueue_DEFINED
+
+#include "SkTDArray.h"
+
+/**
+ * This class implements a priority queue. T is the type of the elements in the queue. LESS is a
+ * function that compares two Ts and returns true if the first is higher priority than the second.
+ *
+ * Optionally objects may know their index into the priority queue. The queue will update the index
+ * as the objects move through the queue. This is enabled by using a non-nullptr function for INDEX.
+ * When an INDEX function is provided random deletes from the queue are allowed using remove().
+ * Additionally, the * priority is allowed to change as long as priorityDidChange() is called
+ * afterwards. In debug builds the index will be set to -1 before an element is removed from the
+ * queue.
+ */
+template <typename T,
+          bool (*LESS)(const T&, const T&),
+          int* (*INDEX)(const T&) = (int* (*)(const T&))nullptr>
+class SkTDPQueue : public SkNoncopyable {
+public:
+    SkTDPQueue() {}
+
+    /** Number of items in the queue. */
+    int count() const { return fArray.count(); }
+
+    /** Gets the next item in the queue without popping it. */
+    const T& peek() const { return fArray[0]; }
+    T& peek() { return fArray[0]; }
+    
+    /** Removes the next item. */
+    void pop() {
+        this->validate();
+        SkDEBUGCODE(if (SkToBool(INDEX)) { *INDEX(fArray[0]) = -1; })
+        if (1 == fArray.count()) {
+            fArray.pop();
+            return;
+        }
+
+        fArray[0] = fArray[fArray.count() - 1];
+        this->setIndex(0);
+        fArray.pop();
+        this->percolateDownIfNecessary(0);
+
+        this->validate();
+    }
+
+    /** Inserts a new item in the queue based on its priority. */
+    void insert(T entry) {
+        this->validate();
+        int index = fArray.count();
+        *fArray.append() = entry;
+        this->setIndex(fArray.count() - 1);
+        this->percolateUpIfNecessary(index);
+        this->validate();
+    }
+
+    /** Random access removal. This requires that the INDEX function is non-nullptr. */
+    void remove(T entry) {
+        SkASSERT(nullptr != INDEX);
+        int index = *INDEX(entry);
+        SkASSERT(index >= 0 && index < fArray.count());
+        this->validate();
+        SkDEBUGCODE(*INDEX(fArray[index]) = -1;)
+        if (index == fArray.count() - 1) {
+            fArray.pop();
+            return;
+        }
+        fArray[index] = fArray[fArray.count() - 1];
+        fArray.pop();
+        this->setIndex(index);
+        this->percolateUpOrDown(index);
+        this->validate();
+    }
+
+    /** Notification that the priority of an entry has changed. This must be called after an
+        item's priority is changed to maintain correct ordering. Changing the priority is only
+        allowed if an INDEX function is provided. */
+    void priorityDidChange(T entry) {
+        SkASSERT(nullptr != INDEX);
+        int index = *INDEX(entry);
+        SkASSERT(index >= 0 && index < fArray.count());
+        this->validate(index);
+        this->percolateUpOrDown(index);
+        this->validate();
+    }
+
+    /** Gets the item at index i in the priority queue (for i < this->count()). at(0) is equivalent
+        to peek(). Otherwise, there is no guarantee about ordering of elements in the queue. */
+    T at(int i) const { return fArray[i]; }
+
+private:
+    static int LeftOf(int x) { SkASSERT(x >= 0); return 2 * x + 1; }
+    static int ParentOf(int x) { SkASSERT(x > 0); return (x - 1) >> 1; }
+
+    void percolateUpOrDown(int index) {
+        SkASSERT(index >= 0);
+        if (!percolateUpIfNecessary(index)) {
+            this->validate(index);
+            this->percolateDownIfNecessary(index);
+        }
+    }
+
+    bool percolateUpIfNecessary(int index) {
+        SkASSERT(index >= 0);
+        bool percolated = false;
+        do {
+            if (0 == index) {
+                this->setIndex(index);
+                return percolated;
+            }
+            int p = ParentOf(index);
+            if (LESS(fArray[index], fArray[p])) {
+                SkTSwap(fArray[index], fArray[p]);
+                this->setIndex(index);
+                index = p;
+                percolated = true;
+            } else {
+                this->setIndex(index);
+                return percolated;
+            }
+            this->validate(index);
+        } while (true);
+    }
+
+    void percolateDownIfNecessary(int index) {
+        SkASSERT(index >= 0);
+        do {
+            int child = LeftOf(index);
+            
+            if (child >= fArray.count()) {
+                // We're a leaf.
+                this->setIndex(index);
+                return;
+            }
+
+            if (child + 1 >= fArray.count()) {
+                // We only have a left child.
+                if (LESS(fArray[child], fArray[index])) {
+                    SkTSwap(fArray[child], fArray[index]);
+                    this->setIndex(child);
+                    this->setIndex(index);
+                    return;
+                }
+            } else if (LESS(fArray[child + 1], fArray[child])) {
+                // The right child is the one we should swap with, if we swap.
+                child++;
+            }
+
+            // Check if we need to swap.
+            if (LESS(fArray[child], fArray[index])) {
+                SkTSwap(fArray[child], fArray[index]);
+                this->setIndex(index);
+                index = child;
+            } else {
+                // We're less than both our children.
+                this->setIndex(index);
+                return;
+            }
+            this->validate(index);
+        } while (true);
+    }
+
+    void setIndex(int index) {
+        SkASSERT(index < fArray.count());
+        if (SkToBool(INDEX)) {
+            *INDEX(fArray[index]) = index;
+        }
+    }
+
+    void validate(int excludedIndex = -1) const {
+#ifdef SK_DEBUG
+        for (int i = 1; i < fArray.count(); ++i) {
+            int p = ParentOf(i);
+            if (excludedIndex != p && excludedIndex != i) {
+                SkASSERT(!(LESS(fArray[i], fArray[p])));
+                SkASSERT(!SkToBool(INDEX) || *INDEX(fArray[i]) == i);
+            }
+        }
+#endif
+    }
+
+    SkTDArray<T> fArray;
+    
+    typedef SkNoncopyable INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/core/SkTDynamicHash.h b/gfx/skia/skia/src/core/SkTDynamicHash.h
index 496dc8d1417e..2fa37b54f741 100644
--- a/gfx/skia/skia/src/core/SkTDynamicHash.h
+++ b/gfx/skia/skia/src/core/SkTDynamicHash.h
@@ -22,7 +22,7 @@ template <typename T,
           int kGrowPercent = 75>  // Larger -> more memory efficient, but slower.
 class SkTDynamicHash {
 public:
-    SkTDynamicHash() : fCount(0), fDeleted(0), fCapacity(0), fArray(NULL) {
+    SkTDynamicHash() : fCount(0), fDeleted(0), fCapacity(0), fArray(nullptr) {
         SkASSERT(this->validate());
     }
 
@@ -86,14 +86,14 @@ public:
 
     int count() const { return fCount; }
 
-    // Return the entry with this key if we have it, otherwise NULL.
+    // Return the entry with this key if we have it, otherwise nullptr.
     T* find(const Key& key) const {
         int index = this->firstIndex(key);
         for (int round = 0; round < fCapacity; round++) {
             SkASSERT(index >= 0 && index < fCapacity);
             T* candidate = fArray[index];
             if (Empty() == candidate) {
-                return NULL;
+                return nullptr;
             }
             if (Deleted() != candidate && GetKey(*candidate) == key) {
                 return candidate;
@@ -101,12 +101,12 @@ public:
             index = this->nextIndex(index, round);
         }
         SkASSERT(fCapacity == 0);
-        return NULL;
+        return nullptr;
     }
 
     // Add an entry with this key.  We require that no entry with newEntry's key is already present.
     void add(T* newEntry) {
-        SkASSERT(NULL == this->find(GetKey(*newEntry)));
+        SkASSERT(nullptr == this->find(GetKey(*newEntry)));
         this->maybeGrow();
         this->innerAdd(newEntry);
         SkASSERT(this->validate());
@@ -114,13 +114,13 @@ public:
 
     // Remove the entry with this key.  We require that an entry with this key is present.
     void remove(const Key& key) {
-        SkASSERT(NULL != this->find(key));
+        SkASSERT(this->find(key));
         this->innerRemove(key);
         SkASSERT(this->validate());
     }
 
     void rewind() {
-        if (NULL != fArray) {
+        if (fArray) {
             sk_bzero(fArray, sizeof(T*)* fCapacity);
         }
         fCount = 0;
@@ -132,7 +132,7 @@ public:
         fDeleted = 0; 
         fCapacity = 0; 
         sk_free(fArray); 
-        fArray = NULL; 
+        fArray = nullptr; 
     }
 
 protected:
@@ -157,11 +157,11 @@ protected:
 
 private:
     // We have two special values to indicate an empty or deleted entry.
-    static T* Empty()   { return reinterpret_cast<T*>(0); }  // i.e. NULL
+    static T* Empty()   { return reinterpret_cast<T*>(0); }  // i.e. nullptr
     static T* Deleted() { return reinterpret_cast<T*>(1); }  // Also an invalid pointer.
 
     bool validate() const {
-        #define SKTDYNAMICHASH_CHECK(x) SkASSERT((x)); if (!(x)) return false
+        #define SKTDYNAMICHASH_CHECK(x) SkASSERT(x); if (!(x)) return false
         static const int kLarge = 50;  // Arbitrary, tweak to suit your patience.
 
         // O(1) checks, always done.
@@ -177,7 +177,7 @@ private:
                     deleted++;
                 } else if (Empty() != fArray[i]) {
                     count++;
-                    SKTDYNAMICHASH_CHECK(NULL != this->find(GetKey(*fArray[i])));
+                    SKTDYNAMICHASH_CHECK(this->find(GetKey(*fArray[i])));
                 }
             }
             SKTDYNAMICHASH_CHECK(count == fCount);
diff --git a/gfx/skia/skia/src/core/SkTInternalSList.h b/gfx/skia/skia/src/core/SkTInternalSList.h
deleted file mode 100644
index 4695e5af292b..000000000000
--- a/gfx/skia/skia/src/core/SkTInternalSList.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkTInternalSList_DEFINED
-#define SkTInternalSList_DEFINED
-
-#include "SkTInternalLList.h" // for SkPtrWrapper
-
-/**
- * This macro creates the methods required by the SkTInternalSList class.
- * It should be instantiated in the private block of the class you want to put
- * into an SkTInternalSList.
- * For most use cases you should use SK_DECLARE_INTERNAL_SLIST_INTERFACE and not
- * this macro. If you care about the field name, or want to re-use an existing
- * field, then you can use this macro to declare the methods pointing to a
- * specific field.
- * Unlike SK_DECLARE_INTERNAL_SLIST_INTERFACE this does not declare the field
- * itself.
- * It also makes SkTInternalSList<ClassName> a friend to give it access to the
- * methods.
- */
-#define SK_DECLARE_INTERNAL_SLIST_ADAPTER(ClassName, field)     \
-    ClassName* getSListNext() {                                 \
-        return this->field;                                     \
-    }                                                           \
-    void setSListNext(ClassName* next) {                        \
-        this->field = next;                                     \
-    }                                                           \
-    friend class SkTInternalSList<ClassName>
-
-/**
- * This macro declares an fSListNext that auto initializes to NULL and then
- * uses SK_DECLARE_INTERNAL_SLIST_ADAPTER to add the methods needed by
- * SkTInternalSList.
- * It should be instantiated in the private block of the class you want to put
- * into an SkTInternalSList.
- */
-#define SK_DECLARE_INTERNAL_SLIST_INTERFACE(ClassName)          \
-    SK_DECLARE_INTERNAL_SLIST_ADAPTER(ClassName, fSListNext);   \
-    SkPtrWrapper<ClassName> fSListNext
-
-/**
- * An implementation of an intrusive singly linked list.
- * The type T must have a methods getSListNext and setSListNext that are visible
- * to the list. The easiest way to do this is with
- * SK_DECLARE_INTERNAL_SLIST_INTERFACE.
- * The list does not maintain ownership of any of its elements, or ever delete
- * them.
- */
-template<typename T> class SkTInternalSList {
-public:
-    SkTInternalSList() : fHead(NULL), fCount(0) {}
-
-    /**
-     * Push an item onto the head of the list.
-     * This method is *not* thread safe.
-     */
-    void push(T* entry) {
-        SkASSERT(entry->getSListNext() == NULL);
-        entry->setSListNext(fHead);
-        fHead = entry;
-        ++fCount;
-    }
-
-    /**
-     * Takes all the items from another list and pushes them into this list.
-     * No ordering guarantees are made, the other list will be emptied.
-     * This method is *not* thread safe.
-     */
-    void pushAll(SkTInternalSList<T>* other) {
-        if (this->isEmpty()) {
-            this->swap(other);
-            return;
-        }
-        while (!other->isEmpty()) {
-            this->push(other->pop());
-        }
-    }
-
-    /**
-     * Pop an item from the head of the list.
-     * Returns NULL if the list is empty.
-     * This method is *not* thread safe.
-     */
-    T* pop() {
-        if (NULL == fHead) {
-            return NULL;
-        }
-        T* result = fHead;
-        fHead = result->getSListNext();
-        result->setSListNext(NULL);
-        --fCount;
-        return result;
-    }
-
-    T* head() const {
-        return fHead;
-    }
-
-    /**
-     * Returns true if the list has no elements.
-     */
-    bool isEmpty() const {
-        return NULL == fHead;
-    }
-
-    /**
-     * Swaps the contents of this list with another one.
-     * This method is *not* thread safe.
-     */
-    void swap(SkTInternalSList<T>* other) {
-        SkTSwap(fHead, other->fHead);
-        SkTSwap(fCount, other->fCount);
-    }
-
-    /**
-     * Returns the count of elements in the list.
-     */
-    int getCount() const {
-        return fCount;
-    }
-private:
-    T* fHead;
-    int fCount;
-};
-
-
-#endif
diff --git a/gfx/skia/skia/src/core/SkTLList.h b/gfx/skia/skia/src/core/SkTLList.h
index e2b9691430ac..211a44141355 100644
--- a/gfx/skia/skia/src/core/SkTLList.h
+++ b/gfx/skia/skia/src/core/SkTLList.h
@@ -9,13 +9,8 @@
 #define SkTLList_DEFINED
 
 #include "SkTInternalLList.h"
-#include "SkTemplates.h"
-
-template <typename T> class SkTLList;
-template <typename T>
-inline void* operator new(size_t, SkTLList<T>* list,
-                          typename SkTLList<T>::Placement placement,
-                          const typename SkTLList<T>::Iter& location);
+#include "SkTypes.h"
+#include "SkUtility.h"
 
 /** Doubly-linked list of objects. The objects' lifetimes are controlled by the list. I.e. the
     the list creates the objects and they are deleted upon removal. This class block-allocates
@@ -26,9 +21,11 @@ inline void* operator new(size_t, SkTLList<T>* list,
         SkNEW_INSERT_IN_LLIST_AFTER(list, location, type_name, args)
     where list is a SkTLList<type_name>*, location is an iterator, and args is the paren-surrounded
     constructor arguments for type_name. These macros behave like addBefore() and addAfter().
+
+    allocCnt is the number of objects to allocate as a group. In the worst case fragmentation
+    each object is using the space required for allocCnt unfragmented objects.
 */
-template <typename T>
-class SkTLList : SkNoncopyable {
+template <typename T, unsigned int N> class SkTLList : SkNoncopyable {
 private:
     struct Block;
     struct Node {
@@ -39,13 +36,14 @@ private:
     typedef SkTInternalLList<Node> NodeList;
 
 public:
-
     class Iter;
 
-    /** allocCnt is the number of objects to allocate as a group. In the worst case fragmentation
-        each object is using the space required for allocCnt unfragmented objects. */
-    SkTLList(int allocCnt = 1) : fCount(0), fAllocCnt(allocCnt) {
-        SkASSERT(allocCnt > 0);
+    SkTLList() : fCount(0) {
+        fFirstBlock.fNodesInUse = 0;
+        for (unsigned int i = 0; i < N; ++i) {
+            fFreeList.addToHead(fFirstBlock.fNodes + i);
+            fFirstBlock.fNodes[i].fBlock = &fFirstBlock;
+        }
         this->validate();
     }
 
@@ -53,65 +51,57 @@ public:
         this->validate();
         typename NodeList::Iter iter;
         Node* node = iter.init(fList, Iter::kHead_IterStart);
-        while (NULL != node) {
+        while (node) {
             SkTCast<T*>(node->fObj)->~T();
             Block* block = node->fBlock;
             node = iter.next();
             if (0 == --block->fNodesInUse) {
-                for (int i = 0; i < fAllocCnt; ++i) {
+                for (unsigned int i = 0; i < N; ++i) {
                     block->fNodes[i].~Node();
                 }
-                sk_free(block);
+                if (block != &fFirstBlock) {
+                    sk_free(block);
+                }
             }
         }
     }
 
-    T* addToHead(const T& t) {
+    /** Adds a new element to the list at the head. */
+    template <typename... Args> T* addToHead(Args&&... args) {
         this->validate();
         Node* node = this->createNode();
         fList.addToHead(node);
-        SkNEW_PLACEMENT_ARGS(node->fObj, T, (t));
         this->validate();
-        return reinterpret_cast<T*>(node->fObj);
+        return new (node->fObj)  T(skstd::forward<Args>(args)...);
     }
 
-    T* addToHead() {
-        this->validate();
-        Node* node = this->createNode();
-        fList.addToHead(node);
-        SkNEW_PLACEMENT(node->fObj, T);
-        this->validate();
-        return reinterpret_cast<T*>(node->fObj);
-    }
-
-    T* addToTail(const T& t) {
+    /** Adds a new element to the list at the tail. */
+    template <typename... Args> T* addToTail(Args&&... args) {
         this->validate();
         Node* node = this->createNode();
         fList.addToTail(node);
-        SkNEW_PLACEMENT_ARGS(node->fObj, T, (t));
         this->validate();
-        return reinterpret_cast<T*>(node->fObj);
-    }
-
-    T* addToTail() {
-        this->validate();
-        Node* node = this->createNode();
-        fList.addToTail(node);
-        SkNEW_PLACEMENT(node->fObj, T);
-        this->validate();
-        return reinterpret_cast<T*>(node->fObj);
+        return new (node->fObj) T(skstd::forward<Args>(args)...);
     }
 
     /** Adds a new element to the list before the location indicated by the iterator. If the
-        iterator refers to a NULL location then the new element is added at the tail */
-    T* addBefore(const T& t, const Iter& location) {
-        return SkNEW_PLACEMENT_ARGS(this->internalAddBefore(location), T, (t));
+        iterator refers to a nullptr location then the new element is added at the tail */
+    template <typename... Args> T* addBefore(Iter location, Args&&... args) {
+        this->validate();
+        Node* node = this->createNode();
+        fList.addBefore(node, location.getNode());
+        this->validate();
+        return new (node->fObj) T(skstd::forward<Args>(args)...);
     }
 
     /** Adds a new element to the list after the location indicated by the iterator. If the
-        iterator refers to a NULL location then the new element is added at the head */
-    T* addAfter(const T& t, const Iter& location) {
-        return SkNEW_PLACEMENT_ARGS(this->internalAddAfter(location), T, (t));
+        iterator refers to a nullptr location then the new element is added at the head */
+    template <typename... Args> T* addAfter(Iter location, Args&&... args) {
+        this->validate();
+        Node* node = this->createNode();
+        fList.addAfter(node, location.getNode());
+        this->validate();
+        return new (node->fObj) T(skstd::forward<Args>(args)...);
     }
 
     /** Convenience methods for getting an iterator initialized to the head/tail of the list. */
@@ -126,7 +116,7 @@ public:
     void popHead() {
         this->validate();
         Node* node = fList.head();
-        if (NULL != node) {
+        if (node) {
             this->removeNode(node);
         }
         this->validate();
@@ -135,7 +125,7 @@ public:
     void popTail() {
         this->validate();
         Node* node = fList.head();
-        if (NULL != node) {
+        if (node) {
             this->removeNode(node);
         }
         this->validate();
@@ -175,7 +165,7 @@ public:
         for (Iter a(*this, Iter::kHead_IterStart), b(list, Iter::kHead_IterStart);
              a.get();
              a.next(), b.next()) {
-            SkASSERT(NULL != b.get()); // already checked that counts match.
+            SkASSERT(b.get()); // already checked that counts match.
             if (!(*a.get() == *b.get())) {
                 return false;
             }
@@ -219,41 +209,36 @@ public:
         Node* getNode() { return INHERITED::get(); }
 
         T* nodeToObj(Node* node) {
-            if (NULL != node) {
+            if (node) {
                 return reinterpret_cast<T*>(node->fObj);
             } else {
-                return NULL;
+                return nullptr;
             }
         }
     };
 
-    // For use with operator new
-    enum Placement {
-        kBefore_Placement,
-        kAfter_Placement,
-    };
-
 private:
     struct Block {
         int fNodesInUse;
-        Node fNodes[1];
+        Node fNodes[N];
     };
 
-    size_t blockSize() const { return sizeof(Block) + sizeof(Node) * (fAllocCnt-1); }
-
     Node* createNode() {
         Node* node = fFreeList.head();
-        if (NULL != node) {
+        if (node) {
             fFreeList.remove(node);
             ++node->fBlock->fNodesInUse;
         } else {
-            Block* block = reinterpret_cast<Block*>(sk_malloc_flags(this->blockSize(), 0));
+            // Should not get here when count == 0 because we always have the preallocated first
+            // block.
+            SkASSERT(fCount > 0);
+            Block* block = reinterpret_cast<Block*>(sk_malloc_throw(sizeof(Block)));
             node = &block->fNodes[0];
-            SkNEW_PLACEMENT(node, Node);
+            new (node) Node;
             node->fBlock = block;
             block->fNodesInUse = 1;
-            for (int i = 1; i < fAllocCnt; ++i) {
-                SkNEW_PLACEMENT(block->fNodes + i, Node);
+            for (unsigned int i = 1; i < N; ++i) {
+                new (block->fNodes + i) Node;
                 fFreeList.addToHead(block->fNodes + i);
                 block->fNodes[i].fBlock = block;
             }
@@ -263,12 +248,13 @@ private:
     }
 
     void removeNode(Node* node) {
-        SkASSERT(NULL != node);
+        SkASSERT(node);
         fList.remove(node);
         SkTCast<T*>(node->fObj)->~T();
-        if (0 == --node->fBlock->fNodesInUse) {
-            Block* block = node->fBlock;
-            for (int i = 0; i < fAllocCnt; ++i) {
+        Block* block = node->fBlock;
+        // Don't ever elease the first block, just add its nodes to the free list
+        if (0 == --block->fNodesInUse && block != &fFirstBlock) {
+            for (unsigned int i = 0; i < N; ++i) {
                 if (block->fNodes + i != node) {
                     fFreeList.remove(block->fNodes + i);
                 }
@@ -285,8 +271,10 @@ private:
     void validate() const {
 #ifdef SK_DEBUG
         SkASSERT((0 == fCount) == fList.isEmpty());
-        SkASSERT((0 != fCount) || fFreeList.isEmpty());
-
+        if (0 == fCount) {
+            // Should only have the nodes from the first block in the free list.
+            SkASSERT(fFreeList.countEntries() == N);
+        }
         fList.validate();
         fFreeList.validate();
         typename NodeList::Iter iter;
@@ -294,11 +282,12 @@ private:
         while (freeNode) {
             SkASSERT(fFreeList.isInList(freeNode));
             Block* block = freeNode->fBlock;
-            SkASSERT(block->fNodesInUse > 0 && block->fNodesInUse < fAllocCnt);
-
+            // Only the first block is allowed to have all its nodes in the free list.
+            SkASSERT(block->fNodesInUse > 0 || block == &fFirstBlock);
+            SkASSERT((unsigned)block->fNodesInUse < N);
             int activeCnt = 0;
             int freeCnt = 0;
-            for (int i = 0; i < fAllocCnt; ++i) {
+            for (unsigned int i = 0; i < N; ++i) {
                 bool free = fFreeList.isInList(block->fNodes + i);
                 bool active = fList.isInList(block->fNodes + i);
                 SkASSERT(free != active);
@@ -315,11 +304,11 @@ private:
             ++count;
             SkASSERT(fList.isInList(activeNode));
             Block* block = activeNode->fBlock;
-            SkASSERT(block->fNodesInUse > 0 && block->fNodesInUse <= fAllocCnt);
+            SkASSERT(block->fNodesInUse > 0 && (unsigned)block->fNodesInUse <= N);
 
             int activeCnt = 0;
             int freeCnt = 0;
-            for (int i = 0; i < fAllocCnt; ++i) {
+            for (unsigned int i = 0; i < N; ++i) {
                 bool free = fFreeList.isInList(block->fNodes + i);
                 bool active = fList.isInList(block->fNodes + i);
                 SkASSERT(free != active);
@@ -333,71 +322,10 @@ private:
 #endif
     }
 
-    // Support in-place initializing of objects inserted into the list via operator new.
-    friend void* operator new<T>(size_t,
-                                 SkTLList* list,
-                                 Placement placement,
-                                 const Iter& location);
-
-
-    // Helpers that insert the node and returns a pointer to where the new object should be init'ed.
-    void* internalAddBefore(Iter location) {
-        this->validate();
-        Node* node = this->createNode();
-        fList.addBefore(node, location.getNode());
-        this->validate();
-        return node->fObj;
-    }
-
-    void* internalAddAfter(Iter location) {
-        this->validate();
-        Node* node = this->createNode();
-        fList.addAfter(node, location.getNode());
-        this->validate();
-        return node->fObj;
-    }
-
     NodeList fList;
     NodeList fFreeList;
+    Block    fFirstBlock;
     int fCount;
-    int fAllocCnt;
-
 };
 
-// Use the below macros rather than calling this directly
-template <typename T>
-void *operator new(size_t, SkTLList<T>* list,
-                   typename SkTLList<T>::Placement placement,
-                   const typename SkTLList<T>::Iter& location) {
-    SkASSERT(NULL != list);
-    if (SkTLList<T>::kBefore_Placement == placement) {
-        return list->internalAddBefore(location);
-    } else {
-        return list->internalAddAfter(location);
-    }
-}
-
-// Skia doesn't use C++ exceptions but it may be compiled with them enabled. Having an op delete
-// to match the op new silences warnings about missing op delete when a constructor throws an
-// exception.
-template <typename T>
-void operator delete(void*,
-                     SkTLList<T>*,
-                     typename SkTLList<T>::Placement,
-                     const typename SkTLList<T>::Iter&) {
-    SK_CRASH();
-}
-
-#define SkNEW_INSERT_IN_LLIST_BEFORE(list, location, type_name, args) \
-    (new ((list), SkTLList< type_name >::kBefore_Placement, (location)) type_name args)
-
-#define SkNEW_INSERT_IN_LLIST_AFTER(list, location, type_name, args) \
-    (new ((list), SkTLList< type_name >::kAfter_Placement, (location)) type_name args)
-
-#define SkNEW_INSERT_AT_LLIST_HEAD(list, type_name, args) \
-    SkNEW_INSERT_IN_LLIST_BEFORE((list), (list)->headIter(), type_name, args)
-
-#define SkNEW_INSERT_AT_LLIST_TAIL(list, type_name, args) \
-    SkNEW_INSERT_IN_LLIST_AFTER((list), (list)->tailIter(), type_name, args)
-
 #endif
diff --git a/gfx/skia/skia/src/core/SkTLS.cpp b/gfx/skia/skia/src/core/SkTLS.cpp
index f7bf3048c335..a47dc14b5af6 100755
--- a/gfx/skia/skia/src/core/SkTLS.cpp
+++ b/gfx/skia/skia/src/core/SkTLS.cpp
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkTLS.h"
 
 // enable to help debug TLS storage
@@ -5,7 +12,7 @@
 
 
 #ifdef SK_TRACE_TLS_LIFETIME
-    #include "SkThread.h"
+    #include "SkAtomics.h"
     static int32_t gTLSRecCount;
 #endif
 
@@ -43,14 +50,14 @@ void SkTLS::Destructor(void* ptr) {
     SkTLSRec* rec = (SkTLSRec*)ptr;
     do {
         SkTLSRec* next = rec->fNext;
-        SkDELETE(rec);
+        delete rec;
         rec = next;
-    } while (NULL != rec);
+    } while (rec);
 }
 
 void* SkTLS::Get(CreateProc createProc, DeleteProc deleteProc) {
-    if (NULL == createProc) {
-        return NULL;
+    if (nullptr == createProc) {
+        return nullptr;
     }
 
     void* ptr = SkTLS::PlatformGetSpecific(true);
@@ -62,7 +69,7 @@ void* SkTLS::Get(CreateProc createProc, DeleteProc deleteProc) {
                 SkASSERT(rec->fDeleteProc == deleteProc);
                 return rec->fData;
             }
-        } while ((rec = rec->fNext) != NULL);
+        } while ((rec = rec->fNext) != nullptr);
         // not found, so create a new one
     }
 
@@ -79,8 +86,8 @@ void* SkTLS::Get(CreateProc createProc, DeleteProc deleteProc) {
 }
 
 void* SkTLS::Find(CreateProc createProc) {
-    if (NULL == createProc) {
-        return NULL;
+    if (nullptr == createProc) {
+        return nullptr;
     }
 
     void* ptr = SkTLS::PlatformGetSpecific(false);
@@ -91,20 +98,20 @@ void* SkTLS::Find(CreateProc createProc) {
             if (rec->fCreateProc == createProc) {
                 return rec->fData;
             }
-        } while ((rec = rec->fNext) != NULL);
+        } while ((rec = rec->fNext) != nullptr);
     }
-    return NULL;
+    return nullptr;
 }
 
 void SkTLS::Delete(CreateProc createProc) {
-    if (NULL == createProc) {
+    if (nullptr == createProc) {
         return;
     }
 
     void* ptr = SkTLS::PlatformGetSpecific(false);
 
     SkTLSRec* curr = (SkTLSRec*)ptr;
-    SkTLSRec* prev = NULL;
+    SkTLSRec* prev = nullptr;
     while (curr) {
         SkTLSRec* next = curr->fNext;
         if (curr->fCreateProc == createProc) {
@@ -114,7 +121,7 @@ void SkTLS::Delete(CreateProc createProc) {
                 // we have a new head of our chain
                 SkTLS::PlatformSetSpecific(next);
             }
-            SkDELETE(curr);
+            delete curr;
             break;
         }
         prev = curr;
diff --git a/gfx/skia/skia/src/core/SkTLS.h b/gfx/skia/skia/src/core/SkTLS.h
index ad5daa7c1fba..ace2de59e6c9 100644
--- a/gfx/skia/skia/src/core/SkTLS.h
+++ b/gfx/skia/skia/src/core/SkTLS.h
@@ -1,10 +1,9 @@
-//
-//  SkTLS.h
-//
-//
-//  Created by Mike Reed on 4/21/12.
-//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
-//
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #ifndef SkTLS_DEFINED
 #define SkTLS_DEFINED
@@ -21,7 +20,7 @@ public:
 
     /**
      *  If Get() has previously been called with this CreateProc, then this
-     *  returns its cached data, otherwise it returns NULL. The CreateProc is
+     *  returns its cached data, otherwise it returns nullptr. The CreateProc is
      *  never invoked in Find, it is only used as a key for searching the
      *  cache.
      */
@@ -53,8 +52,8 @@ private:
      *  Implemented by the platform, to return the value of our (one) slot per-thread
      *
      *  If forceCreateTheSlot is true, then we must have created the "slot" for
-     *  our TLS, even though we know that the return value will be NULL in that
-     *  case (i.e. no-slot and first-time-slot both return NULL). This ensures
+     *  our TLS, even though we know that the return value will be nullptr in that
+     *  case (i.e. no-slot and first-time-slot both return nullptr). This ensures
      *  that after calling GetSpecific, we know that we can legally call
      *  SetSpecific.
      *
diff --git a/gfx/skia/skia/src/core/SkTMultiMap.h b/gfx/skia/skia/src/core/SkTMultiMap.h
index c0b59ba0b953..b0d04d5aa813 100644
--- a/gfx/skia/skia/src/core/SkTMultiMap.h
+++ b/gfx/skia/skia/src/core/SkTMultiMap.h
@@ -20,7 +20,7 @@ template <typename T,
           typename HashTraits=T>
 class SkTMultiMap {
     struct ValueList {
-        explicit ValueList(T* value) : fValue(value), fNext(NULL) {}
+        explicit ValueList(T* value) : fValue(value), fNext(nullptr) {}
 
         static const Key& GetKey(const ValueList& e) { return HashTraits::GetKey(*e.fValue); }
         static uint32_t Hash(const Key& key) { return HashTraits::Hash(key); }
@@ -37,17 +37,17 @@ public:
 
     void insert(const Key& key, T* value) {
         ValueList* list = fHash.find(key);
-        if (NULL != list) {
+        if (list) {
             // The new ValueList entry is inserted as the second element in the
             // linked list, and it will contain the value of the first element.
-            ValueList* newEntry = SkNEW_ARGS(ValueList, (list->fValue));
+            ValueList* newEntry = new ValueList(list->fValue);
             newEntry->fNext = list->fNext;
             // The existing first ValueList entry is updated to contain the
             // inserted value.
             list->fNext = newEntry;
             list->fValue = value;
         } else {
-            fHash.add(SkNEW_ARGS(ValueList, (value)));
+            fHash.add(new ValueList(value));
         }
 
         ++fCount;
@@ -57,24 +57,24 @@ public:
         ValueList* list = fHash.find(key);
         // Since we expect the caller to be fully aware of what is stored, just
         // assert that the caller removes an existing value.
-        SkASSERT(NULL != list);
-        ValueList* prev = NULL;
+        SkASSERT(list);
+        ValueList* prev = nullptr;
         while (list->fValue != value) {
             prev = list;
             list = list->fNext;
         }
 
-        if (NULL != list->fNext) {
+        if (list->fNext) {
             ValueList* next = list->fNext;
             list->fValue = next->fValue;
             list->fNext = next->fNext;
-            SkDELETE(next);
-        } else if (NULL != prev) {
-            prev->fNext = NULL;
-            SkDELETE(list);
+            delete next;
+        } else if (prev) {
+            prev->fNext = nullptr;
+            delete list;
         } else {
             fHash.remove(key);
-            SkDELETE(list);
+            delete list;
         }
 
         --fCount;
@@ -82,26 +82,39 @@ public:
 
     T* find(const Key& key) const {
         ValueList* list = fHash.find(key);
-        if (NULL != list) {
+        if (list) {
             return list->fValue;
         }
-        return NULL;
+        return nullptr;
     }
 
     template<class FindPredicate>
     T* find(const Key& key, const FindPredicate f) {
         ValueList* list = fHash.find(key);
-        while (NULL != list) {
+        while (list) {
             if (f(list->fValue)){
                 return list->fValue;
             }
             list = list->fNext;
         }
-        return NULL;
+        return nullptr;
     }
 
     int count() const { return fCount; }
 
+#ifdef SK_DEBUG
+    // This is not particularly fast and only used for validation, so debug only.
+    int countForKey(const Key& key) const {
+        int count = 0;
+        ValueList* list = fHash.find(key);
+        while (list) {
+            list = list->fNext;
+            ++count;
+        }
+        return count;
+    }
+#endif
+
 private:
     SkTDynamicHash<ValueList, Key> fHash;
     int fCount;
diff --git a/gfx/skia/skia/src/core/SkTObjectPool.h b/gfx/skia/skia/src/core/SkTObjectPool.h
deleted file mode 100644
index f2a471f634aa..000000000000
--- a/gfx/skia/skia/src/core/SkTObjectPool.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkFreeList_DEFINED
-#define SkFreeList_DEFINED
-
-#include "SkTInternalSList.h"
-
-/**
- * An implementation of a self growing pool of objects.
- * It maintains a pool of fully initialized objects. If an attempt is made to
- * acquire one, and there are none left, it makes some more.
- * It does not automatically reclaim them, they have to be given back to it.
- * Constructors will be called on objects allocated by the pool at allocation
- * time.
- * All allocated objects will be destroyed and memory will be reclaimed when
- * the pool is destroyed, so the pool must survive longer than you are using
- * any item taken from it.
- */
-template<typename T, int numItemsPerBlock = 4096/sizeof(T)> class SkTObjectPool {
-public:
-    SkTObjectPool() {}
-    ~SkTObjectPool() {
-        while (!fBlocks.isEmpty()) {
-            SkDELETE(fBlocks.pop());
-        }
-    }
-
-    /**
-     * Get an item from the pool.
-     * If the pool has no free items, it will allocate and construct some more.
-     * The returned item is only valid as long as the pool has not been
-     * destroyed, at that point all memory allocated by grow will have been
-     * reclaimed.
-     * This method is *not* thread safe.
-     */
-    T* acquire() {
-        if (fAvailable.isEmpty()) {
-            grow();
-        }
-        return fAvailable.pop();
-    }
-
-    /**
-     * Release an item into the pool.
-     * The item does not have to have come from the pool, but if it did not
-     * it must have a lifetime greater than the pool does.
-     * This method is *not* thread safe.
-     */
-    void release(T* entry) {
-        fAvailable.push(entry);
-    }
-
-    /**
-     * Takes all the items from an SkTInternalSList and adds them back to this
-     * pool. The other list will be left empty.
-     */
-    void releaseAll(SkTInternalSList<T>* other) {
-        fAvailable.pushAll(other);
-    }
-
-    /**
-     * Returns the number of items immediately available without having to
-     * construct any new ones.
-     */
-    int available() const { return fAvailable.getCount(); }
-
-    /**
-     * Returns the number of blocks of items the pool has allocated so far.
-     */
-    int blocks() const { return fBlocks.getCount(); }
-
-    /**
-     * Returns the number of items allocated by the pool in total.
-     */
-    int allocated() const { return fBlocks.getCount() * numItemsPerBlock; }
-
-private:
-    /**
-     * The type for a new block of entries for the list.
-     */
-    struct Block {
-        T entries[numItemsPerBlock];
-        SK_DECLARE_INTERNAL_SLIST_INTERFACE(Block);
-    };
-    SkTInternalSList<Block> fBlocks;
-    SkTInternalSList<T> fAvailable;
-
-    /**
-     * When the free list runs out of items, this method is called to allocate
-     * a new block of them.
-     * It calls the constructors and then pushes the nodes into the available
-     * list.
-     */
-    void grow() {
-        Block* block = SkNEW(Block);
-        fBlocks.push(block);
-        for(int index = 0; index < numItemsPerBlock; ++index) {
-            fAvailable.push(&block->entries[index]);
-        }
-    }
-
-};
-
-#endif
diff --git a/gfx/skia/skia/src/core/SkTRefArray.h b/gfx/skia/skia/src/core/SkTRefArray.h
deleted file mode 100644
index c4bca241d77f..000000000000
--- a/gfx/skia/skia/src/core/SkTRefArray.h
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-//  SkTRefArray.h
-//  core
-//
-//  Created by Mike Reed on 7/17/12.
-//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
-//
-
-#ifndef SkTRefArray_DEFINED
-#define SkTRefArray_DEFINED
-
-#include "SkRefCnt.h"
-#include <new>
-
-/**
- *  Wrapper to manage thread-safe sharing of an array of T objects. The array
- *  cannot be grown or shrunk.
- */
-template <typename T> class SkTRefArray : public SkRefCnt {
-    /*
-     *  Shared factory to allocate the space needed for our instance plus N
-     *  T entries at the end. We call our constructor, but not the constructors
-     *  for the elements. Those are called by the proper Create method.
-     */
-    static SkTRefArray<T>* Alloc(int count) {
-        // space for us, and our [count] elements
-        size_t size = sizeof(SkTRefArray<T>) + count * sizeof(T);
-        SkTRefArray<T>* obj = (SkTRefArray<T>*)sk_malloc_throw(size);
-
-        SkNEW_PLACEMENT(obj, SkTRefArray<T>);
-        obj->fCount = count;
-        return obj;
-    }
-
-public:
-    /**
-     *  Return a new array with 'count' elements, initialized to their default
-     *  value. To change them to some other value, use writableBegin/End or
-     *  writableAt(), but do that before this array is given to another thread.
-     */
-    static SkTRefArray<T>* Create(int count) {
-        SkTRefArray<T>* obj = Alloc(count);
-        T* array = const_cast<T*>(obj->begin());
-        for (int i = 0; i < count; ++i) {
-            SkNEW_PLACEMENT(&array[i], T);
-        }
-        return obj;
-    }
-
-    /**
-     *  Return a new array with 'count' elements, initialized from the provided
-     *  src array. To change them to some other value, use writableBegin/End or
-     *  writableAt(), but do that before this array is given to another thread.
-     */
-    static SkTRefArray<T>* Create(const T src[], int count) {
-        SkTRefArray<T>* obj = Alloc(count);
-        T* array = const_cast<T*>(obj->begin());
-        for (int i = 0; i < count; ++i) {
-            SkNEW_PLACEMENT_ARGS(&array[i], T, (src[i]));
-        }
-        return obj;
-    }
-
-    int count() const { return fCount; }
-    const T* begin() const { return (const T*)(this + 1); }
-    const T* end() const { return this->begin() + fCount; }
-    const T& at(int index) const {
-        SkASSERT((unsigned)index < (unsigned)fCount);
-        return this->begin()[index];
-    }
-    const T& operator[](int index) const { return this->at(index); }
-
-    // For the writable methods, we assert that we are the only owner if we
-    // call these, since other owners are not informed if we change an element.
-
-    T* writableBegin() {
-        SkASSERT(this->unique());
-        return (T*)(this + 1);
-    }
-    T* writableEnd() {
-        return this->writableBegin() + fCount;
-    }
-    T& writableAt(int index) {
-        SkASSERT((unsigned)index < (unsigned)fCount);
-        return this->writableBegin()[index];
-    }
-
-protected:
-    virtual void internal_dispose() const SK_OVERRIDE {
-        T* array = const_cast<T*>(this->begin());
-        int n = fCount;
-
-        for (int i = 0; i < n; ++i) {
-            array->~T();
-            array += 1;
-        }
-
-        this->internal_dispose_restore_refcnt_to_1();
-        this->~SkTRefArray<T>();
-        sk_free((void*)this);
-    }
-
-private:
-    int fCount;
-
-    // hide this
-    virtual ~SkTRefArray() {}
-
-    typedef SkRefCnt INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/core/SkTSearch.cpp b/gfx/skia/skia/src/core/SkTSearch.cpp
index 64c70cb31107..5b5f13904292 100644
--- a/gfx/skia/skia/src/core/SkTSearch.cpp
+++ b/gfx/skia/skia/src/core/SkTSearch.cpp
@@ -22,7 +22,7 @@ int SkStrSearch(const char*const* base, int count, const char target[],
     if (count <= 0)
         return ~0;
 
-    SkASSERT(base != NULL);
+    SkASSERT(base != nullptr);
 
     int lo = 0;
     int hi = count - 1;
diff --git a/gfx/skia/skia/src/core/SkTTopoSort.h b/gfx/skia/skia/src/core/SkTTopoSort.h
new file mode 100644
index 000000000000..35b85eeb8147
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkTTopoSort.h
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkTTopoSort_DEFINED
+#define SkTTopoSort_DEFINED
+
+#include "SkTDArray.h"
+
+#ifdef SK_DEBUG
+template <typename T, typename Traits = T>
+void SkTTopoSort_CheckAllUnmarked(const SkTDArray<T*>& graph) {
+    for (int i = 0; i < graph.count(); ++i) {
+        SkASSERT(!Traits::IsTempMarked(graph[i]));
+        SkASSERT(!Traits::WasOutput(graph[i]));
+    }
+}
+
+template <typename T, typename Traits = T>
+void SkTTopoSort_CleanExit(const SkTDArray<T*>& graph) {
+    for (int i = 0; i < graph.count(); ++i) {
+        SkASSERT(!Traits::IsTempMarked(graph[i]));
+        SkASSERT(Traits::WasOutput(graph[i]));
+    }
+}
+#endif
+
+// Recursively visit a node and all the other nodes it depends on.
+// Return false if there is a loop.
+template <typename T, typename Traits = T>
+bool SkTTopoSort_Visit(T* node, SkTDArray<T*>* result) {
+    if (Traits::IsTempMarked(node)) {
+        // There is a loop.
+        return false;
+    }
+
+    // If the node under consideration has been already been output it means it
+    // (and all the nodes it depends on) are already in 'result'.
+    if (!Traits::WasOutput(node)) {
+        // This node hasn't been output yet. Recursively assess all the
+        // nodes it depends on outputing them first.
+        Traits::SetTempMark(node);
+        for (int i = 0; i < Traits::NumDependencies(node); ++i) {
+            if (!SkTTopoSort_Visit<T, Traits>(Traits::Dependency(node, i), result)) {
+                return false;
+            }
+        }
+        Traits::Output(node, result->count()); // mark this node as output
+        Traits::ResetTempMark(node);
+
+        *result->append() = node;
+    }
+
+    return true;
+}
+
+// Topologically sort the nodes in 'graph'. For this sort, when node 'i' depends
+// on node 'j' it means node 'j' must appear in the result before node 'i'.
+// A false return value means there was a loop and the contents of 'graph' will
+// be in some arbitrary state.
+//
+// Traits requires:
+//   static void Output(T* t, int index) { ... }  // 'index' is 't's position in the result
+//   static bool WasOutput(const T* t) { ... }
+//
+//   static void SetTempMark(T* t) { ... }        // transiently used during toposort
+//   static void ResetTempMark(T* t) { ... }
+//   static bool IsTempMarked(const T* t) { ... }
+//
+//   static int NumDependencies(const T* t) { ... } // 't' will be output after all the other -
+//   static T* Dependency(T* t, int index) { ... }  // nodes on which it depends
+// We'll look on T for these by default, or you can pass a custom Traits type.
+//
+// TODO: potentially add a version that takes a seed node and just outputs that
+// node and all the nodes on which it depends. This could be used to partially
+// flush a drawTarget DAG.
+template <typename T, typename Traits = T>
+bool SkTTopoSort(SkTDArray<T*>* graph) {
+    SkTDArray<T*> result;
+
+#ifdef SK_DEBUG
+    SkTTopoSort_CheckAllUnmarked<T, Traits>(*graph);
+#endif
+
+    result.setReserve(graph->count());
+
+    for (int i = 0; i < graph->count(); ++i) {
+        if (Traits::WasOutput((*graph)[i])) {
+            // This node was depended on by some earlier node and has already
+            // been output
+            continue;
+        }
+
+        // Output this node after all the nodes it depends on have been output.
+        if (!SkTTopoSort_Visit<T, Traits>((*graph)[i], &result)) {
+            return false;
+        }
+    }
+
+    SkASSERT(graph->count() == result.count());
+    graph->swap(result);
+
+#ifdef SK_DEBUG
+    SkTTopoSort_CleanExit<T, Traits>(*graph);
+#endif
+    return true;
+}
+
+#endif
diff --git a/gfx/skia/skia/src/core/SkTaskGroup.cpp b/gfx/skia/skia/src/core/SkTaskGroup.cpp
new file mode 100644
index 000000000000..863195cfd3fe
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkTaskGroup.cpp
@@ -0,0 +1,228 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkOnce.h"
+#include "SkRunnable.h"
+#include "SkSemaphore.h"
+#include "SkSpinlock.h"
+#include "SkTDArray.h"
+#include "SkTaskGroup.h"
+#include "SkThreadUtils.h"
+
+#if defined(SK_BUILD_FOR_WIN32)
+    static void query_num_cores(int* num_cores) {
+        SYSTEM_INFO sysinfo;
+        GetNativeSystemInfo(&sysinfo);
+        *num_cores = sysinfo.dwNumberOfProcessors;
+    }
+#else
+    #include <unistd.h>
+    static void query_num_cores(int* num_cores) {
+        *num_cores = (int)sysconf(_SC_NPROCESSORS_ONLN);
+    }
+#endif
+
+// We cache sk_num_cores() so we only query the OS once.
+SK_DECLARE_STATIC_ONCE(g_query_num_cores_once);
+int sk_num_cores() {
+    static int num_cores = 0;
+    SkOnce(&g_query_num_cores_once, query_num_cores, &num_cores);
+    SkASSERT(num_cores > 0);
+    return num_cores;
+}
+
+namespace {
+
+class ThreadPool : SkNoncopyable {
+public:
+    static void Add(SkRunnable* task, SkAtomic<int32_t>* pending) {
+        if (!gGlobal) {  // If we have no threads, run synchronously.
+            return task->run();
+        }
+        gGlobal->add(&CallRunnable, task, pending);
+    }
+
+    static void Add(void (*fn)(void*), void* arg, SkAtomic<int32_t>* pending) {
+        if (!gGlobal) {
+            return fn(arg);
+        }
+        gGlobal->add(fn, arg, pending);
+    }
+
+    static void Batch(void (*fn)(void*), void* args, int N, size_t stride,
+                      SkAtomic<int32_t>* pending) {
+        if (!gGlobal) {
+            for (int i = 0; i < N; i++) { fn((char*)args + i*stride); }
+            return;
+        }
+        gGlobal->batch(fn, args, N, stride, pending);
+    }
+
+    static void Wait(SkAtomic<int32_t>* pending) {
+        if (!gGlobal) {  // If we have no threads, the work must already be done.
+            SkASSERT(pending->load(sk_memory_order_relaxed) == 0);
+            return;
+        }
+        // Acquire pairs with decrement release here or in Loop.
+        while (pending->load(sk_memory_order_acquire) > 0) {
+            // Lend a hand until our SkTaskGroup of interest is done.
+            Work work;
+            {
+                // We're stealing work opportunistically,
+                // so we never call fWorkAvailable.wait(), which could sleep us if there's no work.
+                // This means fWorkAvailable is only an upper bound on fWork.count().
+                AutoLock lock(&gGlobal->fWorkLock);
+                if (gGlobal->fWork.isEmpty()) {
+                    // Someone has picked up all the work (including ours).  How nice of them!
+                    // (They may still be working on it, so we can't assert *pending == 0 here.)
+                    continue;
+                }
+                gGlobal->fWork.pop(&work);
+            }
+            // This Work isn't necessarily part of our SkTaskGroup of interest, but that's fine.
+            // We threads gotta stick together.  We're always making forward progress.
+            work.fn(work.arg);
+            work.pending->fetch_add(-1, sk_memory_order_release);  // Pairs with load above.
+        }
+    }
+
+private:
+    struct AutoLock {
+        AutoLock(SkSpinlock* lock) : fLock(lock) { fLock->acquire(); }
+        ~AutoLock() { fLock->release(); }
+    private:
+        SkSpinlock* fLock;
+    };
+
+    static void CallRunnable(void* arg) { static_cast<SkRunnable*>(arg)->run(); }
+
+    struct Work {
+        void (*fn)(void*);            // A function to call,
+        void* arg;                    // its argument,
+        SkAtomic<int32_t>* pending;   // then decrement pending afterwards.
+    };
+
+    explicit ThreadPool(int threads) {
+        if (threads == -1) {
+            threads = sk_num_cores();
+        }
+        for (int i = 0; i < threads; i++) {
+            fThreads.push(new SkThread(&ThreadPool::Loop, this));
+            fThreads.top()->start();
+        }
+    }
+
+    ~ThreadPool() {
+        SkASSERT(fWork.isEmpty());  // All SkTaskGroups should be destroyed by now.
+
+        // Send a poison pill to each thread.
+        SkAtomic<int> dummy(0);
+        for (int i = 0; i < fThreads.count(); i++) {
+            this->add(nullptr, nullptr, &dummy);
+        }
+        // Wait for them all to swallow the pill and die.
+        for (int i = 0; i < fThreads.count(); i++) {
+            fThreads[i]->join();
+        }
+        SkASSERT(fWork.isEmpty());  // Can't hurt to double check.
+        fThreads.deleteAll();
+    }
+
+    void add(void (*fn)(void*), void* arg, SkAtomic<int32_t>* pending) {
+        Work work = { fn, arg, pending };
+        pending->fetch_add(+1, sk_memory_order_relaxed);  // No barrier needed.
+        {
+            AutoLock lock(&fWorkLock);
+            fWork.push(work);
+        }
+        fWorkAvailable.signal(1);
+    }
+
+    void batch(void (*fn)(void*), void* arg, int N, size_t stride, SkAtomic<int32_t>* pending) {
+        pending->fetch_add(+N, sk_memory_order_relaxed);  // No barrier needed.
+        {
+            AutoLock lock(&fWorkLock);
+            Work* batch = fWork.append(N);
+            for (int i = 0; i < N; i++) {
+                Work work = { fn, (char*)arg + i*stride, pending };
+                batch[i] = work;
+            }
+        }
+        fWorkAvailable.signal(N);
+    }
+
+    static void Loop(void* arg) {
+        ThreadPool* pool = (ThreadPool*)arg;
+        Work work;
+        while (true) {
+            // Sleep until there's work available, and claim one unit of Work as we wake.
+            pool->fWorkAvailable.wait();
+            {
+                AutoLock lock(&pool->fWorkLock);
+                if (pool->fWork.isEmpty()) {
+                    // Someone in Wait() stole our work (fWorkAvailable is an upper bound).
+                    // Well, that's fine, back to sleep for us.
+                    continue;
+                }
+                pool->fWork.pop(&work);
+            }
+            if (!work.fn) {
+                return;  // Poison pill.  Time... to die.
+            }
+            work.fn(work.arg);
+            work.pending->fetch_add(-1, sk_memory_order_release);  // Pairs with load in Wait().
+        }
+    }
+
+    // fWorkLock must be held when reading or modifying fWork.
+    SkSpinlock      fWorkLock;
+    SkTDArray<Work> fWork;
+
+    // A thread-safe upper bound for fWork.count().
+    //
+    // We'd have it be an exact count but for the loop in Wait():
+    // we never want that to block, so it can't call fWorkAvailable.wait(),
+    // and that's the only way to decrement fWorkAvailable.
+    // So fWorkAvailable may overcount actual the work available.
+    // We make do, but this means some worker threads may wake spuriously.
+    SkSemaphore fWorkAvailable;
+
+    // These are only changed in a single-threaded context.
+    SkTDArray<SkThread*> fThreads;
+    static ThreadPool* gGlobal;
+
+    friend struct SkTaskGroup::Enabler;
+    friend int ::sk_parallel_for_thread_count();
+};
+ThreadPool* ThreadPool::gGlobal = nullptr;
+
+}  // namespace
+
+SkTaskGroup::Enabler::Enabler(int threads) {
+    SkASSERT(ThreadPool::gGlobal == nullptr);
+    if (threads != 0) {
+        ThreadPool::gGlobal = new ThreadPool(threads);
+    }
+}
+
+SkTaskGroup::Enabler::~Enabler() { delete ThreadPool::gGlobal; }
+
+SkTaskGroup::SkTaskGroup() : fPending(0) {}
+
+void SkTaskGroup::wait()                            { ThreadPool::Wait(&fPending); }
+void SkTaskGroup::add(SkRunnable* task)             { ThreadPool::Add(task, &fPending); }
+void SkTaskGroup::add(void (*fn)(void*), void* arg) { ThreadPool::Add(fn, arg, &fPending); }
+void SkTaskGroup::batch (void (*fn)(void*), void* args, int N, size_t stride) {
+    ThreadPool::Batch(fn, args, N, stride, &fPending);
+}
+
+int sk_parallel_for_thread_count() {
+    if (ThreadPool::gGlobal != nullptr) {
+        return ThreadPool::gGlobal->fThreads.count();
+    }
+    return 0;
+}
diff --git a/gfx/skia/skia/src/core/SkTaskGroup.h b/gfx/skia/skia/src/core/SkTaskGroup.h
new file mode 100644
index 000000000000..f68c528a1ffd
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkTaskGroup.h
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkTaskGroup_DEFINED
+#define SkTaskGroup_DEFINED
+
+#include "SkTypes.h"
+#include "SkAtomics.h"
+#include "SkTemplates.h"
+
+struct SkRunnable;
+
+class SkTaskGroup : SkNoncopyable {
+public:
+    // Create one of these in main() to enable SkTaskGroups globally.
+    struct Enabler : SkNoncopyable {
+        explicit Enabler(int threads = -1);  // Default is system-reported core count.
+        ~Enabler();
+    };
+
+    SkTaskGroup();
+    ~SkTaskGroup() { this->wait(); }
+
+    // Add a task to this SkTaskGroup.  It will likely run on another thread.
+    // Neither add() method takes owership of any of its parameters.
+    void add(SkRunnable*);
+
+    template <typename T>
+    void add(void (*fn)(T*), T* arg) { this->add((void_fn)fn, (void*)arg); }
+
+    // Add a batch of N tasks, all calling fn with different arguments.
+    // Equivalent to a loop over add(fn, arg), but with perhaps less synchronization overhead.
+    template <typename T>
+    void batch(void (*fn)(T*), T* args, int N) { this->batch((void_fn)fn, args, N, sizeof(T)); }
+
+    // Block until all Tasks previously add()ed to this SkTaskGroup have run.
+    // You may safely reuse this SkTaskGroup after wait() returns.
+    void wait();
+
+private:
+    typedef void(*void_fn)(void*);
+
+    void add  (void_fn, void* arg);
+    void batch(void_fn, void* args, int N, size_t stride);
+
+    SkAtomic<int32_t> fPending;
+};
+
+// Returns best estimate of number of CPU cores available to use.
+int sk_num_cores();
+
+int sk_parallel_for_thread_count();
+
+// Call f(i) for i in [0, end).
+template <typename Func>
+void sk_parallel_for(int end, const Func& f) {
+    if (end <= 0) { return; }
+
+    struct Chunk {
+        const Func* f;
+        int start, end;
+    };
+
+    // TODO(mtklein): this chunking strategy could probably use some tuning.
+    int max_chunks  = sk_num_cores() * 2,
+        stride      = (end + max_chunks - 1 ) / max_chunks,
+        nchunks     = (end + stride - 1 ) / stride;
+    SkASSERT(nchunks <= max_chunks);
+
+#if defined(GOOGLE3)
+    // Stack frame size is limited in GOOGLE3.
+    SkAutoSTMalloc<512, Chunk> chunks(nchunks);
+#else
+    // With the chunking strategy above this won't malloc until we have a machine with >512 cores.
+    SkAutoSTMalloc<1024, Chunk> chunks(nchunks);
+#endif
+
+    for (int i = 0; i < nchunks; i++) {
+        Chunk& c = chunks[i];
+        c.f     = &f;
+        c.start = i * stride;
+        c.end   = SkTMin(c.start + stride, end);
+        SkASSERT(c.start < c.end);  // Nothing will break if start >= end, but it's a wasted chunk.
+    }
+
+    void(*run_chunk)(Chunk*) = [](Chunk* c) {
+        for (int i = c->start; i < c->end; i++) {
+            (*c->f)(i);
+        }
+    };
+    SkTaskGroup().batch(run_chunk, chunks.get(), nchunks);
+}
+
+#endif//SkTaskGroup_DEFINED
diff --git a/gfx/skia/skia/src/core/SkTextBlob.cpp b/gfx/skia/skia/src/core/SkTextBlob.cpp
new file mode 100644
index 000000000000..7f6536cc8adb
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkTextBlob.cpp
@@ -0,0 +1,649 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkTextBlobRunIterator.h"
+
+#include "SkReadBuffer.h"
+#include "SkTypeface.h"
+#include "SkWriteBuffer.h"
+
+namespace {
+
+// TODO(fmalita): replace with SkFont.
+class RunFont : SkNoncopyable {
+public:
+    RunFont(const SkPaint& paint)
+        : fSize(paint.getTextSize())
+        , fScaleX(paint.getTextScaleX())
+        , fTypeface(SkSafeRef(paint.getTypeface()))
+        , fSkewX(paint.getTextSkewX())
+        , fAlign(paint.getTextAlign())
+        , fHinting(paint.getHinting())
+        , fFlags(paint.getFlags() & kFlagsMask) { }
+
+    void applyToPaint(SkPaint* paint) const {
+        paint->setTextEncoding(SkPaint::kGlyphID_TextEncoding);
+        paint->setTypeface(fTypeface.get());
+        paint->setTextSize(fSize);
+        paint->setTextScaleX(fScaleX);
+        paint->setTextSkewX(fSkewX);
+        paint->setTextAlign(static_cast<SkPaint::Align>(fAlign));
+        paint->setHinting(static_cast<SkPaint::Hinting>(fHinting));
+
+        paint->setFlags((paint->getFlags() & ~kFlagsMask) | fFlags);
+    }
+
+    bool operator==(const RunFont& other) const {
+        return fTypeface == other.fTypeface
+            && fSize == other.fSize
+            && fScaleX == other.fScaleX
+            && fSkewX == other.fSkewX
+            && fAlign == other.fAlign
+            && fHinting == other.fHinting
+            && fFlags == other.fFlags;
+    }
+
+    bool operator!=(const RunFont& other) const {
+        return !(*this == other);
+    }
+
+    uint32_t flags() const { return fFlags; }
+
+private:
+    const static uint32_t kFlagsMask =
+        SkPaint::kAntiAlias_Flag          |
+        SkPaint::kUnderlineText_Flag      |
+        SkPaint::kStrikeThruText_Flag     |
+        SkPaint::kFakeBoldText_Flag       |
+        SkPaint::kLinearText_Flag         |
+        SkPaint::kSubpixelText_Flag       |
+        SkPaint::kDevKernText_Flag        |
+        SkPaint::kLCDRenderText_Flag      |
+        SkPaint::kEmbeddedBitmapText_Flag |
+        SkPaint::kAutoHinting_Flag        |
+        SkPaint::kVerticalText_Flag       |
+        SkPaint::kGenA8FromLCD_Flag;
+
+    SkScalar                 fSize;
+    SkScalar                 fScaleX;
+
+    // Keep this SkAutoTUnref off the first position, to avoid interfering with SkNoncopyable
+    // empty baseclass optimization (http://code.google.com/p/skia/issues/detail?id=3694).
+    SkAutoTUnref<SkTypeface> fTypeface;
+    SkScalar                 fSkewX;
+
+    static_assert(SkPaint::kAlignCount < 4, "insufficient_align_bits");
+    uint32_t                 fAlign : 2;
+    static_assert(SkPaint::kFull_Hinting < 4, "insufficient_hinting_bits");
+    uint32_t                 fHinting : 2;
+    static_assert((kFlagsMask & 0xffff) == kFlagsMask, "insufficient_flags_bits");
+    uint32_t                 fFlags : 16;
+
+    typedef SkNoncopyable INHERITED;
+};
+
+struct RunFontStorageEquivalent {
+    SkScalar fSize, fScaleX;
+    void*    fTypeface;
+    SkScalar fSkewX;
+    uint32_t fFlags;
+};
+static_assert(sizeof(RunFont) == sizeof(RunFontStorageEquivalent), "runfont_should_stay_packed");
+
+} // anonymous namespace
+
+//
+// Textblob data is laid out into externally-managed storage as follows:
+//
+//    -----------------------------------------------------------------------------
+//   | SkTextBlob | RunRecord | Glyphs[] | Pos[] | RunRecord | Glyphs[] | Pos[] | ...
+//    -----------------------------------------------------------------------------
+//
+//  Each run record describes a text blob run, and can be used to determine the (implicit)
+//  location of the following record.
+
+SkDEBUGCODE(static const unsigned kRunRecordMagic = 0xb10bcafe;)
+
+class SkTextBlob::RunRecord {
+public:
+    RunRecord(uint32_t count, const SkPoint& offset, const SkPaint& font, GlyphPositioning pos)
+        : fFont(font)
+        , fCount(count)
+        , fOffset(offset)
+        , fPositioning(pos) {
+        SkDEBUGCODE(fMagic = kRunRecordMagic);
+    }
+
+    uint32_t glyphCount() const {
+        return fCount;
+    }
+
+    const SkPoint& offset() const {
+        return fOffset;
+    }
+
+    const RunFont& font() const {
+        return fFont;
+    }
+
+    GlyphPositioning positioning() const {
+        return fPositioning;
+    }
+
+    uint16_t* glyphBuffer() const {
+        // Glyph are stored immediately following the record.
+        return reinterpret_cast<uint16_t*>(const_cast<RunRecord*>(this) + 1);
+    }
+
+    SkScalar* posBuffer() const {
+        // Position scalars follow the (aligned) glyph buffer.
+        return reinterpret_cast<SkScalar*>(reinterpret_cast<uint8_t*>(this->glyphBuffer()) +
+                                           SkAlign4(fCount * sizeof(uint16_t)));
+    }
+
+    static size_t StorageSize(int glyphCount, SkTextBlob::GlyphPositioning positioning) {
+        // RunRecord object + (aligned) glyph buffer + position buffer
+        return SkAlignPtr(sizeof(SkTextBlob::RunRecord)
+                        + SkAlign4(glyphCount* sizeof(uint16_t))
+                        + glyphCount * sizeof(SkScalar) * ScalarsPerGlyph(positioning));
+    }
+
+    static const RunRecord* First(const SkTextBlob* blob) {
+        // The first record (if present) is stored following the blob object.
+        return reinterpret_cast<const RunRecord*>(blob + 1);
+    }
+
+    static const RunRecord* Next(const RunRecord* run) {
+        return reinterpret_cast<const RunRecord*>(reinterpret_cast<const uint8_t*>(run)
+            + StorageSize(run->glyphCount(), run->positioning()));
+    }
+
+    void validate(const uint8_t* storageTop) const {
+        SkASSERT(kRunRecordMagic == fMagic);
+        SkASSERT((uint8_t*)Next(this) <= storageTop);
+        SkASSERT(glyphBuffer() + fCount <= (uint16_t*)posBuffer());
+        SkASSERT(posBuffer() + fCount * ScalarsPerGlyph(fPositioning) <= (SkScalar*)Next(this));
+    }
+
+private:
+    friend class SkTextBlobBuilder;
+
+    void grow(uint32_t count) {
+        SkScalar* initialPosBuffer = posBuffer();
+        uint32_t initialCount = fCount;
+        fCount += count;
+
+        // Move the initial pos scalars to their new location.
+        size_t copySize = initialCount * sizeof(SkScalar) * ScalarsPerGlyph(fPositioning);
+        SkASSERT((uint8_t*)posBuffer() + copySize <= (uint8_t*)Next(this));
+
+        // memmove, as the buffers may overlap
+        memmove(posBuffer(), initialPosBuffer, copySize);
+    }
+
+    RunFont          fFont;
+    uint32_t         fCount;
+    SkPoint          fOffset;
+    GlyphPositioning fPositioning;
+
+    SkDEBUGCODE(unsigned fMagic;)
+};
+
+static int32_t gNextID = 1;
+static int32_t next_id() {
+    int32_t id;
+    do {
+        id = sk_atomic_inc(&gNextID);
+    } while (id == SK_InvalidGenID);
+    return id;
+}
+
+SkTextBlob::SkTextBlob(int runCount, const SkRect& bounds)
+    : fRunCount(runCount)
+    , fBounds(bounds)
+    , fUniqueID(next_id()) {
+}
+
+SkTextBlob::~SkTextBlob() {
+    const RunRecord* run = RunRecord::First(this);
+    for (int i = 0; i < fRunCount; ++i) {
+        const RunRecord* nextRun = RunRecord::Next(run);
+        SkDEBUGCODE(run->validate((uint8_t*)this + fStorageSize);)
+        run->~RunRecord();
+        run = nextRun;
+    }
+}
+
+void SkTextBlob::flatten(SkWriteBuffer& buffer) const {
+    int runCount = fRunCount;
+
+    buffer.write32(runCount);
+    buffer.writeRect(fBounds);
+
+    SkPaint runPaint;
+    SkTextBlobRunIterator it(this);
+    while (!it.done()) {
+        SkASSERT(it.glyphCount() > 0);
+
+        buffer.write32(it.glyphCount());
+        buffer.write32(it.positioning());
+        buffer.writePoint(it.offset());
+        // This should go away when switching to SkFont
+        it.applyFontToPaint(&runPaint);
+        buffer.writePaint(runPaint);
+
+        buffer.writeByteArray(it.glyphs(), it.glyphCount() * sizeof(uint16_t));
+        buffer.writeByteArray(it.pos(),
+            it.glyphCount() * sizeof(SkScalar) * ScalarsPerGlyph(it.positioning()));
+
+        it.next();
+        SkDEBUGCODE(runCount--);
+    }
+    SkASSERT(0 == runCount);
+}
+
+const SkTextBlob* SkTextBlob::CreateFromBuffer(SkReadBuffer& reader) {
+    int runCount = reader.read32();
+    if (runCount < 0) {
+        return nullptr;
+    }
+
+    SkRect bounds;
+    reader.readRect(&bounds);
+
+    SkTextBlobBuilder blobBuilder;
+    for (int i = 0; i < runCount; ++i) {
+        int glyphCount = reader.read32();
+        GlyphPositioning pos = static_cast<GlyphPositioning>(reader.read32());
+        if (glyphCount <= 0 || pos > kFull_Positioning) {
+            return nullptr;
+        }
+
+        SkPoint offset;
+        reader.readPoint(&offset);
+        SkPaint font;
+        reader.readPaint(&font);
+
+        const SkTextBlobBuilder::RunBuffer* buf = nullptr;
+        switch (pos) {
+        case kDefault_Positioning:
+            buf = &blobBuilder.allocRun(font, glyphCount, offset.x(), offset.y(), &bounds);
+            break;
+        case kHorizontal_Positioning:
+            buf = &blobBuilder.allocRunPosH(font, glyphCount, offset.y(), &bounds);
+            break;
+        case kFull_Positioning:
+            buf = &blobBuilder.allocRunPos(font, glyphCount, &bounds);
+            break;
+        default:
+            return nullptr;
+        }
+
+        if (!reader.readByteArray(buf->glyphs, glyphCount * sizeof(uint16_t)) ||
+            !reader.readByteArray(buf->pos,
+                                  glyphCount * sizeof(SkScalar) * ScalarsPerGlyph(pos))) {
+            return nullptr;
+        }
+    }
+
+    return blobBuilder.build();
+}
+
+unsigned SkTextBlob::ScalarsPerGlyph(GlyphPositioning pos) {
+    // GlyphPositioning values are directly mapped to scalars-per-glyph.
+    SkASSERT(pos <= 2);
+    return pos;
+}
+
+SkTextBlobRunIterator::SkTextBlobRunIterator(const SkTextBlob* blob)
+    : fCurrentRun(SkTextBlob::RunRecord::First(blob))
+    , fRemainingRuns(blob->fRunCount) {
+    SkDEBUGCODE(fStorageTop = (uint8_t*)blob + blob->fStorageSize;)
+}
+
+bool SkTextBlobRunIterator::done() const {
+    return fRemainingRuns <= 0;
+}
+
+void SkTextBlobRunIterator::next() {
+    SkASSERT(!this->done());
+
+    if (!this->done()) {
+        SkDEBUGCODE(fCurrentRun->validate(fStorageTop);)
+        fCurrentRun = SkTextBlob::RunRecord::Next(fCurrentRun);
+        fRemainingRuns--;
+    }
+}
+
+uint32_t SkTextBlobRunIterator::glyphCount() const {
+    SkASSERT(!this->done());
+    return fCurrentRun->glyphCount();
+}
+
+const uint16_t* SkTextBlobRunIterator::glyphs() const {
+    SkASSERT(!this->done());
+    return fCurrentRun->glyphBuffer();
+}
+
+const SkScalar* SkTextBlobRunIterator::pos() const {
+    SkASSERT(!this->done());
+    return fCurrentRun->posBuffer();
+}
+
+const SkPoint& SkTextBlobRunIterator::offset() const {
+    SkASSERT(!this->done());
+    return fCurrentRun->offset();
+}
+
+SkTextBlob::GlyphPositioning SkTextBlobRunIterator::positioning() const {
+    SkASSERT(!this->done());
+    return fCurrentRun->positioning();
+}
+
+void SkTextBlobRunIterator::applyFontToPaint(SkPaint* paint) const {
+    SkASSERT(!this->done());
+
+    fCurrentRun->font().applyToPaint(paint);
+}
+
+bool SkTextBlobRunIterator::isLCD() const {
+    return SkToBool(fCurrentRun->font().flags() & SkPaint::kLCDRenderText_Flag);
+}
+
+SkTextBlobBuilder::SkTextBlobBuilder()
+    : fStorageSize(0)
+    , fStorageUsed(0)
+    , fRunCount(0)
+    , fDeferredBounds(false)
+    , fLastRun(0) {
+    fBounds.setEmpty();
+}
+
+SkTextBlobBuilder::~SkTextBlobBuilder() {
+    if (nullptr != fStorage.get()) {
+        // We are abandoning runs and must destruct the associated font data.
+        // The easiest way to accomplish that is to use the blob destructor.
+        build()->unref();
+    }
+}
+
+SkRect SkTextBlobBuilder::TightRunBounds(const SkTextBlob::RunRecord& run) {
+    SkRect bounds;
+    SkPaint paint;
+    run.font().applyToPaint(&paint);
+
+    if (SkTextBlob::kDefault_Positioning == run.positioning()) {
+        paint.measureText(run.glyphBuffer(), run.glyphCount() * sizeof(uint16_t), &bounds);
+        return bounds.makeOffset(run.offset().x(), run.offset().y());
+    }
+
+    SkAutoSTArray<16, SkRect> glyphBounds(run.glyphCount());
+    paint.getTextWidths(run.glyphBuffer(),
+                        run.glyphCount() * sizeof(uint16_t),
+                        NULL,
+                        glyphBounds.get());
+
+    SkASSERT(SkTextBlob::kFull_Positioning == run.positioning() ||
+             SkTextBlob::kHorizontal_Positioning == run.positioning());
+    // kFull_Positioning       => [ x, y, x, y... ]
+    // kHorizontal_Positioning => [ x, x, x... ]
+    //                            (const y applied by runBounds.offset(run->offset()) later)
+    const SkScalar horizontalConstY = 0;
+    const SkScalar* glyphPosX = run.posBuffer();
+    const SkScalar* glyphPosY = (run.positioning() == SkTextBlob::kFull_Positioning) ?
+                                                      glyphPosX + 1 : &horizontalConstY;
+    const unsigned posXInc = SkTextBlob::ScalarsPerGlyph(run.positioning());
+    const unsigned posYInc = (run.positioning() == SkTextBlob::kFull_Positioning) ?
+                                                   posXInc : 0;
+
+    bounds.setEmpty();
+    for (unsigned i = 0; i < run.glyphCount(); ++i) {
+        bounds.join(glyphBounds[i].makeOffset(*glyphPosX, *glyphPosY));
+        glyphPosX += posXInc;
+        glyphPosY += posYInc;
+    }
+
+    SkASSERT((void*)glyphPosX <= SkTextBlob::RunRecord::Next(&run));
+
+    return bounds.makeOffset(run.offset().x(), run.offset().y());
+}
+
+SkRect SkTextBlobBuilder::ConservativeRunBounds(const SkTextBlob::RunRecord& run) {
+    SkASSERT(run.glyphCount() > 0);
+    SkASSERT(SkTextBlob::kFull_Positioning == run.positioning() ||
+             SkTextBlob::kHorizontal_Positioning == run.positioning());
+
+    SkPaint paint;
+    run.font().applyToPaint(&paint);
+    const SkRect fontBounds = paint.getFontBounds();
+    if (fontBounds.isEmpty()) {
+        // Empty font bounds are likely a font bug.  TightBounds has a better chance of
+        // producing useful results in this case.
+        return TightRunBounds(run);
+    }
+
+    // Compute the glyph position bbox.
+    SkRect bounds;
+    switch (run.positioning()) {
+    case SkTextBlob::kHorizontal_Positioning: {
+        const SkScalar* glyphPos = run.posBuffer();
+        SkASSERT((void*)(glyphPos + run.glyphCount()) <= SkTextBlob::RunRecord::Next(&run));
+
+        SkScalar minX = *glyphPos;
+        SkScalar maxX = *glyphPos;
+        for (unsigned i = 1; i < run.glyphCount(); ++i) {
+            SkScalar x = glyphPos[i];
+            minX = SkMinScalar(x, minX);
+            maxX = SkMaxScalar(x, maxX);
+        }
+
+        bounds.setLTRB(minX, 0, maxX, 0);
+    } break;
+    case SkTextBlob::kFull_Positioning: {
+        const SkPoint* glyphPosPts = reinterpret_cast<const SkPoint*>(run.posBuffer());
+        SkASSERT((void*)(glyphPosPts + run.glyphCount()) <= SkTextBlob::RunRecord::Next(&run));
+
+        bounds.setBounds(glyphPosPts, run.glyphCount());
+    } break;
+    default:
+        SkFAIL("unsupported positioning mode");
+    }
+
+    // Expand by typeface glyph bounds.
+    bounds.fLeft   += fontBounds.left();
+    bounds.fTop    += fontBounds.top();
+    bounds.fRight  += fontBounds.right();
+    bounds.fBottom += fontBounds.bottom();
+
+    // Offset by run position.
+    return bounds.makeOffset(run.offset().x(), run.offset().y());
+}
+
+void SkTextBlobBuilder::updateDeferredBounds() {
+    SkASSERT(!fDeferredBounds || fRunCount > 0);
+
+    if (!fDeferredBounds) {
+        return;
+    }
+
+    SkASSERT(fLastRun >= sizeof(SkTextBlob));
+    SkTextBlob::RunRecord* run = reinterpret_cast<SkTextBlob::RunRecord*>(fStorage.get() +
+                                                                          fLastRun);
+
+    // FIXME: we should also use conservative bounds for kDefault_Positioning.
+    SkRect runBounds = SkTextBlob::kDefault_Positioning == run->positioning() ?
+                       TightRunBounds(*run) : ConservativeRunBounds(*run);
+    fBounds.join(runBounds);
+    fDeferredBounds = false;
+}
+
+void SkTextBlobBuilder::reserve(size_t size) {
+    // We don't currently pre-allocate, but maybe someday...
+    if (fStorageUsed + size <= fStorageSize) {
+        return;
+    }
+
+    if (0 == fRunCount) {
+        SkASSERT(nullptr == fStorage.get());
+        SkASSERT(0 == fStorageSize);
+        SkASSERT(0 == fStorageUsed);
+
+        // the first allocation also includes blob storage
+        fStorageUsed += sizeof(SkTextBlob);
+    }
+
+    fStorageSize = fStorageUsed + size;
+    // FYI: This relies on everything we store being relocatable, particularly SkPaint.
+    fStorage.realloc(fStorageSize);
+}
+
+bool SkTextBlobBuilder::mergeRun(const SkPaint &font, SkTextBlob::GlyphPositioning positioning,
+                                 int count, SkPoint offset) {
+    if (0 == fLastRun) {
+        SkASSERT(0 == fRunCount);
+        return false;
+    }
+
+    SkASSERT(fLastRun >= sizeof(SkTextBlob));
+    SkTextBlob::RunRecord* run = reinterpret_cast<SkTextBlob::RunRecord*>(fStorage.get() +
+                                                                          fLastRun);
+    SkASSERT(run->glyphCount() > 0);
+
+    if (run->positioning() != positioning
+        || run->font() != font
+        || (run->glyphCount() + count < run->glyphCount())) {
+        return false;
+    }
+
+    // we can merge same-font/same-positioning runs in the following cases:
+    //   * fully positioned run following another fully positioned run
+    //   * horizontally postioned run following another horizontally positioned run with the same
+    //     y-offset
+    if (SkTextBlob::kFull_Positioning != positioning
+        && (SkTextBlob::kHorizontal_Positioning != positioning
+            || run->offset().y() != offset.y())) {
+        return false;
+    }
+
+    size_t sizeDelta = SkTextBlob::RunRecord::StorageSize(run->glyphCount() + count, positioning) -
+                       SkTextBlob::RunRecord::StorageSize(run->glyphCount(), positioning);
+    this->reserve(sizeDelta);
+
+    // reserve may have realloced
+    run = reinterpret_cast<SkTextBlob::RunRecord*>(fStorage.get() + fLastRun);
+    uint32_t preMergeCount = run->glyphCount();
+    run->grow(count);
+
+    // Callers expect the buffers to point at the newly added slice, ant not at the beginning.
+    fCurrentRunBuffer.glyphs = run->glyphBuffer() + preMergeCount;
+    fCurrentRunBuffer.pos = run->posBuffer()
+                          + preMergeCount * SkTextBlob::ScalarsPerGlyph(positioning);
+
+    fStorageUsed += sizeDelta;
+
+    SkASSERT(fStorageUsed <= fStorageSize);
+    run->validate(fStorage.get() + fStorageUsed);
+
+    return true;
+}
+
+void SkTextBlobBuilder::allocInternal(const SkPaint &font,
+                                      SkTextBlob::GlyphPositioning positioning,
+                                      int count, SkPoint offset, const SkRect* bounds) {
+    SkASSERT(count > 0);
+    SkASSERT(SkPaint::kGlyphID_TextEncoding == font.getTextEncoding());
+
+    if (!this->mergeRun(font, positioning, count, offset)) {
+        this->updateDeferredBounds();
+
+        size_t runSize = SkTextBlob::RunRecord::StorageSize(count, positioning);
+        this->reserve(runSize);
+
+        SkASSERT(fStorageUsed >= sizeof(SkTextBlob));
+        SkASSERT(fStorageUsed + runSize <= fStorageSize);
+
+        SkTextBlob::RunRecord* run = new (fStorage.get() + fStorageUsed)
+                                         SkTextBlob::RunRecord(count, offset, font, positioning);
+
+        fCurrentRunBuffer.glyphs = run->glyphBuffer();
+        fCurrentRunBuffer.pos = run->posBuffer();
+
+        fLastRun = fStorageUsed;
+        fStorageUsed += runSize;
+        fRunCount++;
+
+        SkASSERT(fStorageUsed <= fStorageSize);
+        run->validate(fStorage.get() + fStorageUsed);
+    }
+
+    if (!fDeferredBounds) {
+        if (bounds) {
+            fBounds.join(*bounds);
+        } else {
+            fDeferredBounds = true;
+        }
+    }
+}
+
+const SkTextBlobBuilder::RunBuffer& SkTextBlobBuilder::allocRun(const SkPaint& font, int count,
+                                                                SkScalar x, SkScalar y,
+                                                                const SkRect* bounds) {
+    this->allocInternal(font, SkTextBlob::kDefault_Positioning, count, SkPoint::Make(x, y), bounds);
+
+    return fCurrentRunBuffer;
+}
+
+const SkTextBlobBuilder::RunBuffer& SkTextBlobBuilder::allocRunPosH(const SkPaint& font, int count,
+                                                                    SkScalar y,
+                                                                    const SkRect* bounds) {
+    this->allocInternal(font, SkTextBlob::kHorizontal_Positioning, count, SkPoint::Make(0, y),
+                        bounds);
+
+    return fCurrentRunBuffer;
+}
+
+const SkTextBlobBuilder::RunBuffer& SkTextBlobBuilder::allocRunPos(const SkPaint& font, int count,
+                                                                   const SkRect *bounds) {
+    this->allocInternal(font, SkTextBlob::kFull_Positioning, count, SkPoint::Make(0, 0), bounds);
+
+    return fCurrentRunBuffer;
+}
+
+const SkTextBlob* SkTextBlobBuilder::build() {
+    SkASSERT((fRunCount > 0) == (nullptr != fStorage.get()));
+
+    this->updateDeferredBounds();
+
+    if (0 == fRunCount) {
+        SkASSERT(nullptr == fStorage.get());
+        fStorageUsed = sizeof(SkTextBlob);
+        fStorage.realloc(fStorageUsed);
+    }
+
+    const SkTextBlob* blob = new (fStorage.detach()) SkTextBlob(fRunCount, fBounds);
+    SkDEBUGCODE(const_cast<SkTextBlob*>(blob)->fStorageSize = fStorageSize;)
+
+    SkDEBUGCODE(
+        size_t validateSize = sizeof(SkTextBlob);
+        const SkTextBlob::RunRecord* run = SkTextBlob::RunRecord::First(blob);
+        for (int i = 0; i < fRunCount; ++i) {
+            validateSize += SkTextBlob::RunRecord::StorageSize(run->fCount, run->fPositioning);
+            run->validate(reinterpret_cast<const uint8_t*>(blob) + fStorageUsed);
+            run = SkTextBlob::RunRecord::Next(run);
+        }
+        SkASSERT(validateSize == fStorageUsed);
+    )
+
+    fStorageUsed = 0;
+    fStorageSize = 0;
+    fRunCount = 0;
+    fLastRun = 0;
+    fBounds.setEmpty();
+
+    return blob;
+}
+
diff --git a/gfx/skia/skia/src/core/SkTextBlobRunIterator.h b/gfx/skia/skia/src/core/SkTextBlobRunIterator.h
new file mode 100644
index 000000000000..42bbac0bc9d6
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkTextBlobRunIterator.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef SkTextBlobRunIterator_DEFINED
+#define SkTextBlobRunIterator_DEFINED
+
+#include "SkTextBlob.h"
+
+/**
+ *  Iterate through all of the text runs of the text blob.  For example:
+ *    for (SkTextBlobRunIterator it(blob); !it.done(); it.next()) {
+ *         .....
+ *    }
+ */
+class SkTextBlobRunIterator {
+public:
+    SkTextBlobRunIterator(const SkTextBlob* blob);
+
+    bool done() const;
+    void next();
+
+    uint32_t glyphCount() const;
+    const uint16_t* glyphs() const;
+    const SkScalar* pos() const;
+    const SkPoint& offset() const;
+    void applyFontToPaint(SkPaint*) const;
+    SkTextBlob::GlyphPositioning positioning() const;
+    bool isLCD() const;
+
+private:
+    const SkTextBlob::RunRecord* fCurrentRun;
+    int fRemainingRuns;
+
+    SkDEBUGCODE(uint8_t* fStorageTop;)
+};
+
+#endif  // SkTextBlobRunIterator_DEFINED
diff --git a/gfx/skia/skia/src/core/SkTextFormatParams.h b/gfx/skia/skia/src/core/SkTextFormatParams.h
index dac4aefd62fc..f41c4de1d545 100644
--- a/gfx/skia/skia/src/core/SkTextFormatParams.h
+++ b/gfx/skia/skia/src/core/SkTextFormatParams.h
@@ -30,12 +30,10 @@ static const SkScalar kStdFakeBoldInterpKeys[] = {
 };
 static const SkScalar kStdFakeBoldInterpValues[] = {
     SK_Scalar1/24,
-    SK_Scalar1/32
+    SK_Scalar1/32,
 };
-SK_COMPILE_ASSERT(SK_ARRAY_COUNT(kStdFakeBoldInterpKeys) ==
-                  SK_ARRAY_COUNT(kStdFakeBoldInterpValues),
-                  mismatched_array_size);
-static const int kStdFakeBoldInterpLength =
-    SK_ARRAY_COUNT(kStdFakeBoldInterpKeys);
+static_assert(SK_ARRAY_COUNT(kStdFakeBoldInterpKeys) == SK_ARRAY_COUNT(kStdFakeBoldInterpValues),
+              "mismatched_array_size");
+static const int kStdFakeBoldInterpLength = SK_ARRAY_COUNT(kStdFakeBoldInterpKeys);
 
 #endif  //SkTextFormatParams_DEFINES
diff --git a/gfx/skia/skia/src/core/SkTextMapStateProc.h b/gfx/skia/skia/src/core/SkTextMapStateProc.h
index 5a8dcaa3b1a5..8ef9389b3ab5 100644
--- a/gfx/skia/skia/src/core/SkTextMapStateProc.h
+++ b/gfx/skia/skia/src/core/SkTextMapStateProc.h
@@ -13,20 +13,22 @@
 
 class SkTextMapStateProc {
 public:
-    SkTextMapStateProc(const SkMatrix& matrix, SkScalar y, int scalarsPerPosition)
+    SkTextMapStateProc(const SkMatrix& matrix, const SkPoint& offset, int scalarsPerPosition)
         : fMatrix(matrix)
         , fProc(matrix.getMapXYProc())
-        , fY(y)
-        , fScaleX(fMatrix.getScaleX())
-        , fTransX(fMatrix.getTranslateX()) {
+        , fOffset(offset)
+        , fScaleX(fMatrix.getScaleX()) {
         SkASSERT(1 == scalarsPerPosition || 2 == scalarsPerPosition);
         if (1 == scalarsPerPosition) {
             unsigned mtype = fMatrix.getType();
             if (mtype & (SkMatrix::kAffine_Mask | SkMatrix::kPerspective_Mask)) {
                 fMapCase = kX;
             } else {
-                fY = SkScalarMul(y, fMatrix.getScaleY()) +
-                    fMatrix.getTranslateY();
+                // Bake the matrix scale/translation components into fOffset,
+                // to expedite proc computations.
+                fOffset.set(SkScalarMul(offset.x(), fMatrix.getScaleX()) + fMatrix.getTranslateX(),
+                            SkScalarMul(offset.y(), fMatrix.getScaleY()) + fMatrix.getTranslateY());
+
                 if (mtype & SkMatrix::kScale_Mask) {
                     fMapCase = kOnlyScaleX;
                 } else {
@@ -49,25 +51,25 @@ private:
         kX
     } fMapCase;
     const SkMatrix::MapXYProc fProc;
-    SkScalar fY; // Ignored by kXY case.
-    SkScalar fScaleX, fTransX; // These are only used by Only... cases.
+    SkPoint  fOffset; // In kOnly* mode, this includes the matrix translation component.
+    SkScalar fScaleX; // This is only used by kOnly... cases.
 };
 
 inline void SkTextMapStateProc::operator()(const SkScalar pos[], SkPoint* loc) const {
     switch(fMapCase) {
     case kXY:
-        fProc(fMatrix, pos[0], pos[1], loc);
+        fProc(fMatrix, pos[0] + fOffset.x(), pos[1] + fOffset.y(), loc);
         break;
     case kOnlyScaleX:
-        loc->set(SkScalarMul(fScaleX, *pos) + fTransX, fY);
+        loc->set(SkScalarMul(fScaleX, *pos) + fOffset.x(), fOffset.y());
         break;
     case kOnlyTransX:
-        loc->set(*pos + fTransX, fY);
+        loc->set(*pos + fOffset.x(), fOffset.y());
         break;
     default:
         SkASSERT(false);
     case kX:
-        fProc(fMatrix, *pos, fY, loc);
+        fProc(fMatrix, *pos + fOffset.x(), fOffset.y(), loc);
         break;
     }
 }
diff --git a/gfx/skia/skia/src/core/SkThreadID.cpp b/gfx/skia/skia/src/core/SkThreadID.cpp
new file mode 100644
index 000000000000..589b4da05a8b
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkThreadID.cpp
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkThreadID.h"
+
+#ifdef SK_BUILD_FOR_WIN
+    #include <windows.h>
+    SkThreadID SkGetThreadID() { return GetCurrentThreadId(); }
+#else
+    #include <pthread.h>
+    SkThreadID SkGetThreadID() { return (int64_t)pthread_self(); }
+#endif
diff --git a/gfx/skia/skia/src/core/SkThreadPriv.h b/gfx/skia/skia/src/core/SkThreadPriv.h
deleted file mode 100644
index c44cca535090..000000000000
--- a/gfx/skia/skia/src/core/SkThreadPriv.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkThreadPriv_DEFINED
-#define SkThreadPriv_DEFINED
-
-#include "SkTypes.h"
-
-// SK_ATOMICS_PLATFORM_H must provide inline implementations for the following declarations.
-
-/** Atomic compare and set, for pointers.
- *  If *addr == before, set *addr to after.  Always returns previous value of *addr.
- *  This must issue a release barrier on success, acquire on failure, and always a compiler barrier.
- */
-static void* sk_atomic_cas(void** addr, void* before, void* after);
-
-#include SK_ATOMICS_PLATFORM_H
-
-#endif//SkThreadPriv_DEFINED
diff --git a/gfx/skia/skia/src/core/SkTileGrid.cpp b/gfx/skia/skia/src/core/SkTileGrid.cpp
deleted file mode 100644
index 35f85d26c964..000000000000
--- a/gfx/skia/skia/src/core/SkTileGrid.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkTileGrid.h"
-
-SkTileGrid::SkTileGrid(int xTileCount, int yTileCount, const SkTileGridFactory::TileGridInfo& info,
-                       SkTileGridNextDatumFunctionPtr nextDatumFunction) {
-    fXTileCount = xTileCount;
-    fYTileCount = yTileCount;
-    fInfo = info;
-    // Margin is offset by 1 as a provision for AA and
-    // to cancel-out the outset applied by getClipDeviceBounds.
-    fInfo.fMargin.fHeight++;
-    fInfo.fMargin.fWidth++;
-    fTileCount = fXTileCount * fYTileCount;
-    fInsertionCount = 0;
-    fGridBounds = SkIRect::MakeXYWH(0, 0, fInfo.fTileInterval.width() * fXTileCount,
-        fInfo.fTileInterval.height() * fYTileCount);
-    fNextDatumFunction = nextDatumFunction;
-    fTileData = SkNEW_ARRAY(SkTDArray<void *>, fTileCount);
-}
-
-SkTileGrid::~SkTileGrid() {
-    SkDELETE_ARRAY(fTileData);
-}
-
-int SkTileGrid::tileCount(int x, int y) {
-    return this->tile(x, y).count();
-}
-
-SkTDArray<void *>& SkTileGrid::tile(int x, int y) {
-    return fTileData[y * fXTileCount + x];
-}
-
-void SkTileGrid::insert(void* data, const SkIRect& bounds, bool) {
-    SkASSERT(!bounds.isEmpty());
-    SkIRect dilatedBounds = bounds;
-    dilatedBounds.outset(fInfo.fMargin.width(), fInfo.fMargin.height());
-    dilatedBounds.offset(fInfo.fOffset);
-    if (!SkIRect::Intersects(dilatedBounds, fGridBounds)) {
-        return;
-    }
-
-    // Note: SkIRects are non-inclusive of the right() column and bottom() row,
-    // hence the "-1"s in the computations of maxTileX and maxTileY.
-    int minTileX = SkMax32(SkMin32(dilatedBounds.left() / fInfo.fTileInterval.width(),
-        fXTileCount - 1), 0);
-    int maxTileX = SkMax32(SkMin32((dilatedBounds.right() - 1) / fInfo.fTileInterval.width(),
-        fXTileCount - 1), 0);
-    int minTileY = SkMax32(SkMin32(dilatedBounds.top() / fInfo.fTileInterval.height(),
-        fYTileCount -1), 0);
-    int maxTileY = SkMax32(SkMin32((dilatedBounds.bottom() -1) / fInfo.fTileInterval.height(),
-        fYTileCount -1), 0);
-
-    for (int x = minTileX; x <= maxTileX; x++) {
-        for (int y = minTileY; y <= maxTileY; y++) {
-            this->tile(x, y).push(data);
-        }
-    }
-    fInsertionCount++;
-}
-
-void SkTileGrid::search(const SkIRect& query, SkTDArray<void*>* results) {
-    SkIRect adjustedQuery = query;
-    // The inset is to counteract the outset that was applied in 'insert'
-    // The outset/inset is to optimize for lookups of size
-    // 'tileInterval + 2 * margin' that are aligned with the tile grid.
-    adjustedQuery.inset(fInfo.fMargin.width(), fInfo.fMargin.height());
-    adjustedQuery.offset(fInfo.fOffset);
-    adjustedQuery.sort();  // in case the inset inverted the rectangle
-    // Convert the query rectangle from device coordinates to tile coordinates
-    // by rounding outwards to the nearest tile boundary so that the resulting tile
-    // region includes the query rectangle. (using truncating division to "floor")
-    int tileStartX = adjustedQuery.left() / fInfo.fTileInterval.width();
-    int tileEndX = (adjustedQuery.right() + fInfo.fTileInterval.width() - 1) /
-        fInfo.fTileInterval.width();
-    int tileStartY = adjustedQuery.top() / fInfo.fTileInterval.height();
-    int tileEndY = (adjustedQuery.bottom() + fInfo.fTileInterval.height() - 1) /
-        fInfo.fTileInterval.height();
-
-    tileStartX = SkPin32(tileStartX, 0, fXTileCount - 1);
-    tileEndX = SkPin32(tileEndX, tileStartX+1, fXTileCount);
-    tileStartY = SkPin32(tileStartY, 0, fYTileCount - 1);
-    tileEndY = SkPin32(tileEndY, tileStartY+1, fYTileCount);
-
-    int queryTileCount = (tileEndX - tileStartX) * (tileEndY - tileStartY);
-    SkASSERT(queryTileCount);
-    if (queryTileCount == 1) {
-        *results = this->tile(tileStartX, tileStartY);
-    } else {
-        results->reset();
-        SkAutoSTArray<kStackAllocationTileCount, int> curPositions(queryTileCount);
-        SkAutoSTArray<kStackAllocationTileCount, SkTDArray<void *>*> storage(queryTileCount);
-        SkTDArray<void *>** tileRange = storage.get();
-        int tile = 0;
-        for (int x = tileStartX; x < tileEndX; ++x) {
-            for (int y = tileStartY; y < tileEndY; ++y) {
-                tileRange[tile] = &this->tile(x, y);
-                curPositions[tile] = tileRange[tile]->count() ? 0 : kTileFinished;
-                ++tile;
-            }
-        }
-        void *nextElement;
-        while(NULL != (nextElement = fNextDatumFunction(tileRange, curPositions))) {
-            results->push(nextElement);
-        }
-    }
-}
-
-void SkTileGrid::clear() {
-    for (int i = 0; i < fTileCount; i++) {
-        fTileData[i].reset();
-    }
-}
-
-int SkTileGrid::getCount() const {
-    return fInsertionCount;
-}
-
-void SkTileGrid::rewindInserts() {
-    SkASSERT(fClient);
-    for (int i = 0; i < fTileCount; ++i) {
-        while (!fTileData[i].isEmpty() && fClient->shouldRewind(fTileData[i].top())) {
-            fTileData[i].pop();
-        }
-    }
-}
diff --git a/gfx/skia/skia/src/core/SkTileGrid.h b/gfx/skia/skia/src/core/SkTileGrid.h
deleted file mode 100644
index 0ec5c2c39321..000000000000
--- a/gfx/skia/skia/src/core/SkTileGrid.h
+++ /dev/null
@@ -1,142 +0,0 @@
-
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkTileGrid_DEFINED
-#define SkTileGrid_DEFINED
-
-#include "SkBBHFactory.h"
-#include "SkBBoxHierarchy.h"
-#include "SkPictureStateTree.h"
-
-/**
- * Subclass of SkBBoxHierarchy that stores elements in buckets that correspond
- * to tile regions, disposed in a regular grid.  This is useful when the tile
- * structure that will be use in search() calls is known prior to insertion.
- * Calls to search will return in constant time.
- *
- * Note: Current implementation of search() only supports looking-up regions
- * that are an exact match to a single tile.  Implementation could be augmented
- * to support arbitrary rectangles, but performance would be sub-optimal.
- */
-class SkTileGrid : public SkBBoxHierarchy {
-public:
-    enum {
-        // Number of tiles for which data is allocated on the stack in
-        // SkTileGrid::search. If malloc becomes a bottleneck, we may consider
-        // increasing this number. Typical large web page, say 2k x 16k, would
-        // require 512 tiles of size 256 x 256 pixels.
-        kStackAllocationTileCount = 1024
-    };
-
-    typedef void* (*SkTileGridNextDatumFunctionPtr)(SkTDArray<void*>** tileData, SkAutoSTArray<kStackAllocationTileCount, int>& tileIndices);
-
-    SkTileGrid(int xTileCount, int yTileCount, const SkTileGridFactory::TileGridInfo& info,
-        SkTileGridNextDatumFunctionPtr nextDatumFunction);
-
-    virtual ~SkTileGrid();
-
-    /**
-     * Insert a data pointer and corresponding bounding box
-     * @param data The data pointer, may be NULL
-     * @param bounds The bounding box, should not be empty
-     * @param defer Ignored, TileArray does not defer insertions
-     */
-    virtual void insert(void* data, const SkIRect& bounds, bool) SK_OVERRIDE;
-
-    virtual void flushDeferredInserts() SK_OVERRIDE {};
-
-    /**
-     * Populate 'results' with data pointers corresponding to bounding boxes that intersect 'query'
-     * The query argument is expected to be an exact match to a tile of the grid
-     */
-    virtual void search(const SkIRect& query, SkTDArray<void*>* results) SK_OVERRIDE;
-
-    virtual void clear() SK_OVERRIDE;
-
-    /**
-     * Gets the number of insertions
-     */
-    virtual int getCount() const SK_OVERRIDE;
-
-    virtual int getDepth() const SK_OVERRIDE { return -1; }
-
-    virtual void rewindInserts() SK_OVERRIDE;
-
-    // Used by search() and in SkTileGridHelper implementations
-    enum {
-        kTileFinished = -1,
-    };
-
-    int tileCount(int x, int y);  // For testing only.
-
-private:
-    SkTDArray<void*>& tile(int x, int y);
-
-    int fXTileCount, fYTileCount, fTileCount;
-    SkTileGridFactory::TileGridInfo fInfo;
-    SkTDArray<void*>* fTileData;
-    int fInsertionCount;
-    SkIRect fGridBounds;
-    SkTileGridNextDatumFunctionPtr fNextDatumFunction;
-
-    typedef SkBBoxHierarchy INHERITED;
-};
-
-/**
- * Generic implementation for SkTileGridNextDatumFunctionPtr. user code may instantiate
- * this template to get a valid SkTileGridNextDatumFunction implementation
- *
- * Returns the next element of tileData[i][tileIndices[i]] for all i and advances
- * tileIndices[] past them. The order in which data are returned by successive
- * calls to this method must reflect the order in which the were originally
- * recorded into the tile grid.
- *
- * \param tileData array of pointers to arrays of tile data
- * \param tileIndices per-tile data indices, indices are incremented for tiles that contain
- *     the next datum.
- * \tparam T a type to which it is safe to cast a datum and that has an operator <
- *     such that 'a < b' is true if 'a' was inserted into the tile grid before 'b'.
- */
-template <typename T>
-void* SkTileGridNextDatum(SkTDArray<void*>** tileData, SkAutoSTArray<SkTileGrid::kStackAllocationTileCount, int>& tileIndices) {
-    T* minVal = NULL;
-    int tileCount = tileIndices.count();
-    int minIndex = tileCount;
-    int maxIndex = 0;
-    // Find the next Datum; track where it's found so we reduce the size of the second loop.
-    for (int tile = 0; tile < tileCount; ++tile) {
-        int pos = tileIndices[tile];
-        if (pos != SkTileGrid::kTileFinished) {
-            T* candidate = (T*)(*tileData[tile])[pos];
-            if (NULL == minVal || (*candidate) < (*minVal)) {
-                minVal = candidate;
-                minIndex = tile;
-                maxIndex = tile;
-            } else if (!((*minVal) < (*candidate))) {
-                // We don't require operator==; if !(candidate<minVal) && !(minVal<candidate),
-                // candidate==minVal and we have to add this tile to the range searched.
-                maxIndex = tile;
-            }
-        }
-    }
-    // Increment indices past the next datum
-    if (minVal != NULL) {
-        for (int tile = minIndex; tile <= maxIndex; ++tile) {
-            int pos = tileIndices[tile];
-            if (pos != SkTileGrid::kTileFinished && (*tileData[tile])[pos] == minVal) {
-                if (++(tileIndices[tile]) >= tileData[tile]->count()) {
-                    tileIndices[tile] = SkTileGrid::kTileFinished;
-                }
-            }
-        }
-        return minVal;
-    }
-    return NULL;
-}
-
-#endif
diff --git a/gfx/skia/skia/src/core/SkTime.cpp b/gfx/skia/skia/src/core/SkTime.cpp
new file mode 100644
index 000000000000..2f66057878f9
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkTime.cpp
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkOncePtr.h"
+#include "SkString.h"
+#include "SkTime.h"
+
+void SkTime::DateTime::toISO8601(SkString* dst) const {
+    if (dst) {
+        int timeZoneMinutes = SkToInt(fTimeZoneMinutes);
+        char timezoneSign = timeZoneMinutes >= 0 ? '+' : '-';
+        int timeZoneHours = SkTAbs(timeZoneMinutes) / 60;
+        timeZoneMinutes = SkTAbs(timeZoneMinutes) % 60;
+        dst->printf("%04u-%02u-%02uT%02u:%02u:%02u%c%02d:%02d",
+                    static_cast<unsigned>(fYear), static_cast<unsigned>(fMonth),
+                    static_cast<unsigned>(fDay), static_cast<unsigned>(fHour),
+                    static_cast<unsigned>(fMinute),
+                    static_cast<unsigned>(fSecond), timezoneSign, timeZoneHours,
+                    timeZoneMinutes);
+    }
+}
+
+#if defined(_MSC_VER)
+    // TODO: try std::chrono again with MSVC 2015?
+    #include <intrin.h>
+    SK_DECLARE_STATIC_ONCE_PTR(double, ns_per_tick);
+    double SkTime::GetNSecs() {
+        uint64_t ticks = __rdtsc();
+        return ticks * *ns_per_tick.get([]{
+            LARGE_INTEGER khz;  // The docs say this returns Hz, but it returns KHz.
+            QueryPerformanceFrequency(&khz);
+            return new double(1e6 / khz.QuadPart);
+        });
+    }
+#elif defined(__MACH__)
+    // TODO: fold into std::chrono when available?
+    #include <mach/mach_time.h>
+    SK_DECLARE_STATIC_ONCE_PTR(double, ns_per_tick);
+    double SkTime::GetNSecs() {
+        uint64_t ticks = mach_absolute_time();
+        return ticks * *ns_per_tick.get([]{
+            mach_timebase_info_data_t timebase;
+            (void)mach_timebase_info(&timebase);
+            return new double(timebase.numer * 1.0 / timebase.denom);
+        });
+    }
+#elif defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID)
+    #include <time.h>
+    double SkTime::GetNSecs() {
+        struct timespec ts;
+        if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0) {
+          return 0.0;
+        }
+        return ts.tv_sec * 1e9 + ts.tv_nsec;
+    }
+#else
+    // This std::chrono code looks great on Linux and Android,
+    // but MSVC 2013 returned mostly garbage (0ns times, etc).
+    #include <chrono>
+    double SkTime::GetNSecs() {
+        auto now = std::chrono::high_resolution_clock::now();
+        std::chrono::duration<double, std::nano> ns = now.time_since_epoch();
+        return ns.count();
+    }
+#endif
diff --git a/gfx/skia/skia/src/core/SkTraceEvent.h b/gfx/skia/skia/src/core/SkTraceEvent.h
index 34e3adf0eda3..05dc340fa2cc 100644
--- a/gfx/skia/skia/src/core/SkTraceEvent.h
+++ b/gfx/skia/skia/src/core/SkTraceEvent.h
@@ -3,165 +3,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// This header file defines the set of trace_event macros without specifying
-// how the events actually get collected and stored. If you need to expose trace
-// events to some other universe, you can copy-and-paste this file as well as
-// trace_event.h, modifying the macros contained there as necessary for the
-// target platform. The end result is that multiple libraries can funnel events
-// through to a shared trace event collector.
-
-// Trace events are for tracking application performance and resource usage.
-// Macros are provided to track:
-//    Begin and end of function calls
-//    Counters
-//
-// Events are issued against categories. Whereas LOG's
-// categories are statically defined, TRACE categories are created
-// implicitly with a string. For example:
-//   TRACE_EVENT_INSTANT0("MY_SUBSYSTEM", "SomeImportantEvent",
-//                        TRACE_EVENT_SCOPE_THREAD)
-//
-// It is often the case that one trace may belong in multiple categories at the
-// same time. The first argument to the trace can be a comma-separated list of
-// categories, forming a category group, like:
-//
-// TRACE_EVENT_INSTANT0("input,views", "OnMouseOver", TRACE_EVENT_SCOPE_THREAD)
-//
-// We can enable/disable tracing of OnMouseOver by enabling/disabling either
-// category.
-//
-// Events can be INSTANT, or can be pairs of BEGIN and END in the same scope:
-//   TRACE_EVENT_BEGIN0("MY_SUBSYSTEM", "SomethingCostly")
-//   doSomethingCostly()
-//   TRACE_EVENT_END0("MY_SUBSYSTEM", "SomethingCostly")
-// Note: our tools can't always determine the correct BEGIN/END pairs unless
-// these are used in the same scope. Use ASYNC_BEGIN/ASYNC_END macros if you
-// need them to be in separate scopes.
-//
-// A common use case is to trace entire function scopes. This
-// issues a trace BEGIN and END automatically:
-//   void doSomethingCostly() {
-//     TRACE_EVENT0("MY_SUBSYSTEM", "doSomethingCostly");
-//     ...
-//   }
-//
-// Additional parameters can be associated with an event:
-//   void doSomethingCostly2(int howMuch) {
-//     TRACE_EVENT1("MY_SUBSYSTEM", "doSomethingCostly",
-//         "howMuch", howMuch);
-//     ...
-//   }
-//
-// The trace system will automatically add to this information the
-// current process id, thread id, and a timestamp in microseconds.
-//
-// To trace an asynchronous procedure such as an IPC send/receive, use
-// ASYNC_BEGIN and ASYNC_END:
-//   [single threaded sender code]
-//     static int send_count = 0;
-//     ++send_count;
-//     TRACE_EVENT_ASYNC_BEGIN0("ipc", "message", send_count);
-//     Send(new MyMessage(send_count));
-//   [receive code]
-//     void OnMyMessage(send_count) {
-//       TRACE_EVENT_ASYNC_END0("ipc", "message", send_count);
-//     }
-// The third parameter is a unique ID to match ASYNC_BEGIN/ASYNC_END pairs.
-// ASYNC_BEGIN and ASYNC_END can occur on any thread of any traced process.
-// Pointers can be used for the ID parameter, and they will be mangled
-// internally so that the same pointer on two different processes will not
-// match. For example:
-//   class MyTracedClass {
-//    public:
-//     MyTracedClass() {
-//       TRACE_EVENT_ASYNC_BEGIN0("category", "MyTracedClass", this);
-//     }
-//     ~MyTracedClass() {
-//       TRACE_EVENT_ASYNC_END0("category", "MyTracedClass", this);
-//     }
-//   }
-//
-// Trace event also supports counters, which is a way to track a quantity
-// as it varies over time. Counters are created with the following macro:
-//   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter", g_myCounterValue);
-//
-// Counters are process-specific. The macro itself can be issued from any
-// thread, however.
-//
-// Sometimes, you want to track two counters at once. You can do this with two
-// counter macros:
-//   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter0", g_myCounterValue[0]);
-//   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter1", g_myCounterValue[1]);
-// Or you can do it with a combined macro:
-//   TRACE_COUNTER2("MY_SUBSYSTEM", "myCounter",
-//       "bytesPinned", g_myCounterValue[0],
-//       "bytesAllocated", g_myCounterValue[1]);
-// This indicates to the tracing UI that these counters should be displayed
-// in a single graph, as a summed area chart.
-//
-// Since counters are in a global namespace, you may want to disambiguate with a
-// unique ID, by using the TRACE_COUNTER_ID* variations.
-//
-// By default, trace collection is compiled in, but turned off at runtime.
-// Collecting trace data is the responsibility of the embedding
-// application. In Chrome's case, navigating to about:tracing will turn on
-// tracing and display data collected across all active processes.
-//
-//
-// Memory scoping note:
-// Tracing copies the pointers, not the string content, of the strings passed
-// in for category_group, name, and arg_names.  Thus, the following code will
-// cause problems:
-//     char* str = strdup("importantName");
-//     TRACE_EVENT_INSTANT0("SUBSYSTEM", str);  // BAD!
-//     free(str);                   // Trace system now has dangling pointer
-//
-// To avoid this issue with the |name| and |arg_name| parameters, use the
-// TRACE_EVENT_COPY_XXX overloads of the macros at additional runtime overhead.
-// Notes: The category must always be in a long-lived char* (i.e. static const).
-//        The |arg_values|, when used, are always deep copied with the _COPY
-//        macros.
-//
-// When are string argument values copied:
-// const char* arg_values are only referenced by default:
-//     TRACE_EVENT1("category", "name",
-//                  "arg1", "literal string is only referenced");
-// Use TRACE_STR_COPY to force copying of a const char*:
-//     TRACE_EVENT1("category", "name",
-//                  "arg1", TRACE_STR_COPY("string will be copied"));
-// std::string arg_values are always copied:
-//     TRACE_EVENT1("category", "name",
-//                  "arg1", std::string("string will be copied"));
-//
-//
-// Thread Safety:
-// A thread safe singleton and mutex are used for thread safety. Category
-// enabled flags are used to limit the performance impact when the system
-// is not enabled.
-//
-// TRACE_EVENT macros first cache a pointer to a category. The categories are
-// statically allocated and safe at all times, even after exit. Fetching a
-// category is protected by the TraceLog::lock_. Multiple threads initializing
-// the static variable is safe, as they will be serialized by the lock and
-// multiple calls will return the same pointer to the category.
-//
-// Then the category_group_enabled flag is checked. This is a unsigned char, and
-// not intended to be multithread safe. It optimizes access to AddTraceEvent
-// which is threadsafe internally via TraceLog::lock_. The enabled flag may
-// cause some threads to incorrectly call or skip calling AddTraceEvent near
-// the time of the system being enabled or disabled. This is acceptable as
-// we tolerate some data loss while the system is being enabled/disabled and
-// because AddTraceEvent is threadsafe internally and checks the enabled state
-// again under lock.
-//
-// Without the use of these static category pointers and enabled flags all
-// trace points would carry a significant performance cost of acquiring a lock
-// and resolving the category.
+// This header file defines implementation details of how the trace macros in
+// SkTraceEventCommon.h collect and store trace events. Anything not
+// implementation-specific should go in SkTraceEventCommon.h instead of here.
 
 #ifndef SkTraceEvent_DEFINED
 #define SkTraceEvent_DEFINED
 
+#include "SkAtomics.h"
 #include "SkEventTracer.h"
+#include "SkTraceEventCommon.h"
+
+////////////////////////////////////////////////////////////////////////////////
+// Implementation specific tracing API definitions.
 
 // By default, const char* argument values are assumed to have long-lived scope
 // and will not be copied. Use this macro to force a const char* to be copied.
@@ -178,101 +32,6 @@
 #define TRACE_ID_DONT_MANGLE(id) \
     skia::tracing_internals::TraceID::DontMangle(id)
 
-// Records a pair of begin and end events called "name" for the current
-// scope, with 0, 1 or 2 associated arguments. If the category is not
-// enabled, then this does nothing.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-#define TRACE_EVENT0(category_group, name) \
-    INTERNAL_TRACE_EVENT_ADD_SCOPED(category_group, name)
-#define TRACE_EVENT1(category_group, name, arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_SCOPED(category_group, name, arg1_name, arg1_val)
-#define TRACE_EVENT2( \
-    category_group, name, arg1_name, arg1_val, arg2_name, arg2_val) \
-  INTERNAL_TRACE_EVENT_ADD_SCOPED( \
-      category_group, name, arg1_name, arg1_val, arg2_name, arg2_val)
-
-// Records events like TRACE_EVENT2 but uses |memory_tag| for memory tracing.
-// Use this where |name| is too generic to accurately aggregate allocations.
-#define TRACE_EVENT_WITH_MEMORY_TAG2( \
-    category, name, memory_tag, arg1_name, arg1_val, arg2_name, arg2_val) \
-  INTERNAL_TRACE_EVENT_ADD_SCOPED( \
-      category, name, arg1_name, arg1_val, arg2_name, arg2_val)
-
-// UNSHIPPED_TRACE_EVENT* are like TRACE_EVENT* except that they are not
-// included in official builds.
-
-#if OFFICIAL_BUILD
-#undef TRACING_IS_OFFICIAL_BUILD
-#define TRACING_IS_OFFICIAL_BUILD 1
-#elif !defined(TRACING_IS_OFFICIAL_BUILD)
-#define TRACING_IS_OFFICIAL_BUILD 0
-#endif
-
-#if TRACING_IS_OFFICIAL_BUILD
-#define UNSHIPPED_TRACE_EVENT0(category_group, name) (void)0
-#define UNSHIPPED_TRACE_EVENT1(category_group, name, arg1_name, arg1_val) \
-    (void)0
-#define UNSHIPPED_TRACE_EVENT2(category_group, name, arg1_name, arg1_val, \
-                               arg2_name, arg2_val) (void)0
-#define UNSHIPPED_TRACE_EVENT_INSTANT0(category_group, name, scope) (void)0
-#define UNSHIPPED_TRACE_EVENT_INSTANT1(category_group, name, scope, \
-                                       arg1_name, arg1_val) (void)0
-#define UNSHIPPED_TRACE_EVENT_INSTANT2(category_group, name, scope, \
-                                       arg1_name, arg1_val, \
-                                       arg2_name, arg2_val) (void)0
-#else
-#define UNSHIPPED_TRACE_EVENT0(category_group, name) \
-    TRACE_EVENT0(category_group, name)
-#define UNSHIPPED_TRACE_EVENT1(category_group, name, arg1_name, arg1_val) \
-    TRACE_EVENT1(category_group, name, arg1_name, arg1_val)
-#define UNSHIPPED_TRACE_EVENT2(category_group, name, arg1_name, arg1_val, \
-                               arg2_name, arg2_val) \
-    TRACE_EVENT2(category_group, name, arg1_name, arg1_val, arg2_name, arg2_val)
-#define UNSHIPPED_TRACE_EVENT_INSTANT0(category_group, name, scope) \
-    TRACE_EVENT_INSTANT0(category_group, name, scope)
-#define UNSHIPPED_TRACE_EVENT_INSTANT1(category_group, name, scope, \
-                                       arg1_name, arg1_val) \
-    TRACE_EVENT_INSTANT1(category_group, name, scope, arg1_name, arg1_val)
-#define UNSHIPPED_TRACE_EVENT_INSTANT2(category_group, name, scope, \
-                                       arg1_name, arg1_val, \
-                                       arg2_name, arg2_val) \
-    TRACE_EVENT_INSTANT2(category_group, name, scope, arg1_name, arg1_val, \
-                         arg2_name, arg2_val)
-#endif
-
-// Records a single event called "name" immediately, with 0, 1 or 2
-// associated arguments. If the category is not enabled, then this
-// does nothing.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-#define TRACE_EVENT_INSTANT0(category_group, name, scope) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \
-        category_group, name, TRACE_EVENT_FLAG_NONE | scope)
-#define TRACE_EVENT_INSTANT1(category_group, name, scope, arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \
-        category_group, name, TRACE_EVENT_FLAG_NONE | scope, \
-        arg1_name, arg1_val)
-#define TRACE_EVENT_INSTANT2(category_group, name, scope, arg1_name, arg1_val, \
-                             arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \
-        category_group, name, TRACE_EVENT_FLAG_NONE | scope, \
-        arg1_name, arg1_val, arg2_name, arg2_val)
-#define TRACE_EVENT_COPY_INSTANT0(category_group, name, scope) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \
-        category_group, name, TRACE_EVENT_FLAG_COPY | scope)
-#define TRACE_EVENT_COPY_INSTANT1(category_group, name, scope, \
-                                  arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \
-        category_group, name, TRACE_EVENT_FLAG_COPY | scope, arg1_name, \
-        arg1_val)
-#define TRACE_EVENT_COPY_INSTANT2(category_group, name, scope, \
-                                  arg1_name, arg1_val, \
-                                  arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \
-        category_group, name, TRACE_EVENT_FLAG_COPY | scope, \
-        arg1_name, arg1_val, arg2_name, arg2_val)
-
 // Sets the current sample state to the given category and name (both must be
 // constant strings). These states are intended for a sampling profiler.
 // Implementation note: we store category and name together because we don't
@@ -299,425 +58,12 @@
     skia::tracing_internals::TraceEventSamplingStateScope<bucket_number>   \
         traceEventSamplingScope(category "\0" name);
 
-// Syntactic sugars for the sampling tracing in the main thread.
-#define TRACE_EVENT_SCOPED_SAMPLING_STATE(category, name) \
-    TRACE_EVENT_SCOPED_SAMPLING_STATE_FOR_BUCKET(0, category, name)
-#define TRACE_EVENT_GET_SAMPLING_STATE() \
-    TRACE_EVENT_GET_SAMPLING_STATE_FOR_BUCKET(0)
-#define TRACE_EVENT_SET_SAMPLING_STATE(category, name) \
-    TRACE_EVENT_SET_SAMPLING_STATE_FOR_BUCKET(0, category, name)
-
-
-// Records a single BEGIN event called "name" immediately, with 0, 1 or 2
-// associated arguments. If the category is not enabled, then this
-// does nothing.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-#define TRACE_EVENT_BEGIN0(category_group, name) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \
-        category_group, name, TRACE_EVENT_FLAG_NONE)
-#define TRACE_EVENT_BEGIN1(category_group, name, arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \
-        category_group, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
-#define TRACE_EVENT_BEGIN2(category_group, name, arg1_name, arg1_val, \
-        arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \
-        category_group, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val, \
-        arg2_name, arg2_val)
-#define TRACE_EVENT_COPY_BEGIN0(category_group, name) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \
-        category_group, name, TRACE_EVENT_FLAG_COPY)
-#define TRACE_EVENT_COPY_BEGIN1(category_group, name, arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \
-        category_group, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val)
-#define TRACE_EVENT_COPY_BEGIN2(category_group, name, arg1_name, arg1_val, \
-        arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \
-        category_group, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val, \
-        arg2_name, arg2_val)
-
-// Similar to TRACE_EVENT_BEGINx but with a custom |at| timestamp provided.
-// - |id| is used to match the _BEGIN event with the _END event.
-//   Events are considered to match if their category_group, name and id values
-//   all match. |id| must either be a pointer or an integer value up to 64 bits.
-//   If it's a pointer, the bits will be xored with a hash of the process ID so
-//   that the same pointer on two different processes will not collide.
-#define TRACE_EVENT_BEGIN_WITH_ID_TID_AND_TIMESTAMP0(category_group, \
-        name, id, thread_id) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP( \
-        TRACE_EVENT_PHASE_ASYNC_BEGIN, category_group, name, id, thread_id, \
-        timestamp, TRACE_EVENT_FLAG_NONE)
-#define TRACE_EVENT_COPY_BEGIN_WITH_ID_TID_AND_TIMESTAMP0( \
-        category_group, name, id, thread_id) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP( \
-        TRACE_EVENT_PHASE_ASYNC_BEGIN, category_group, name, id, thread_id, \
-        timestamp, TRACE_EVENT_FLAG_COPY)
-
-// Records a single END event for "name" immediately. If the category
-// is not enabled, then this does nothing.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-#define TRACE_EVENT_END0(category_group, name) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \
-        category_group, name, TRACE_EVENT_FLAG_NONE)
-#define TRACE_EVENT_END1(category_group, name, arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \
-        category_group, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
-#define TRACE_EVENT_END2(category_group, name, arg1_name, arg1_val, \
-        arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \
-        category_group, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val, \
-        arg2_name, arg2_val)
-#define TRACE_EVENT_COPY_END0(category_group, name) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \
-        category_group, name, TRACE_EVENT_FLAG_COPY)
-#define TRACE_EVENT_COPY_END1(category_group, name, arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \
-        category_group, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val)
-#define TRACE_EVENT_COPY_END2(category_group, name, arg1_name, arg1_val, \
-        arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \
-        category_group, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val, \
-        arg2_name, arg2_val)
-
-// Similar to TRACE_EVENT_ENDx but with a custom |at| timestamp provided.
-// - |id| is used to match the _BEGIN event with the _END event.
-//   Events are considered to match if their category_group, name and id values
-//   all match. |id| must either be a pointer or an integer value up to 64 bits.
-//   If it's a pointer, the bits will be xored with a hash of the process ID so
-//   that the same pointer on two different processes will not collide.
-#define TRACE_EVENT_END_WITH_ID_TID_AND_TIMESTAMP0(category_group, \
-        name, id, thread_id) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP( \
-        TRACE_EVENT_PHASE_ASYNC_END, category_group, name, id, thread_id, \
-        timestamp, TRACE_EVENT_FLAG_NONE)
-#define TRACE_EVENT_COPY_END_WITH_ID_TID_AND_TIMESTAMP0( \
-        category_group, name, id, thread_id) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP( \
-        TRACE_EVENT_PHASE_ASYNC_END, category_group, name, id, thread_id, \
-        timestamp, TRACE_EVENT_FLAG_COPY)
-
-// Records the value of a counter called "name" immediately. Value
-// must be representable as a 32 bit integer.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-#define TRACE_COUNTER1(category_group, name, value) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, \
-        category_group, name, TRACE_EVENT_FLAG_NONE, \
-        "value", static_cast<int>(value))
-#define TRACE_COPY_COUNTER1(category_group, name, value) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, \
-        category_group, name, TRACE_EVENT_FLAG_COPY, \
-        "value", static_cast<int>(value))
-
-// Records the values of a multi-parted counter called "name" immediately.
-// The UI will treat value1 and value2 as parts of a whole, displaying their
-// values as a stacked-bar chart.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-#define TRACE_COUNTER2(category_group, name, value1_name, value1_val, \
-        value2_name, value2_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, \
-        category_group, name, TRACE_EVENT_FLAG_NONE, \
-        value1_name, static_cast<int>(value1_val), \
-        value2_name, static_cast<int>(value2_val))
-#define TRACE_COPY_COUNTER2(category_group, name, value1_name, value1_val, \
-        value2_name, value2_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, \
-        category_group, name, TRACE_EVENT_FLAG_COPY, \
-        value1_name, static_cast<int>(value1_val), \
-        value2_name, static_cast<int>(value2_val))
-
-// Records the value of a counter called "name" immediately. Value
-// must be representable as a 32 bit integer.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-// - |id| is used to disambiguate counters with the same name. It must either
-//   be a pointer or an integer value up to 64 bits. If it's a pointer, the bits
-//   will be xored with a hash of the process ID so that the same pointer on
-//   two different processes will not collide.
-#define TRACE_COUNTER_ID1(category_group, name, id, value) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, \
-        category_group, name, id, TRACE_EVENT_FLAG_NONE, \
-        "value", static_cast<int>(value))
-#define TRACE_COPY_COUNTER_ID1(category_group, name, id, value) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, \
-        category_group, name, id, TRACE_EVENT_FLAG_COPY, \
-        "value", static_cast<int>(value))
-
-// Records the values of a multi-parted counter called "name" immediately.
-// The UI will treat value1 and value2 as parts of a whole, displaying their
-// values as a stacked-bar chart.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-// - |id| is used to disambiguate counters with the same name. It must either
-//   be a pointer or an integer value up to 64 bits. If it's a pointer, the bits
-//   will be xored with a hash of the process ID so that the same pointer on
-//   two different processes will not collide.
-#define TRACE_COUNTER_ID2(category_group, name, id, value1_name, value1_val, \
-        value2_name, value2_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, \
-        category_group, name, id, TRACE_EVENT_FLAG_NONE, \
-        value1_name, static_cast<int>(value1_val), \
-        value2_name, static_cast<int>(value2_val))
-#define TRACE_COPY_COUNTER_ID2(category_group, name, id, value1_name, \
-        value1_val, value2_name, value2_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, \
-        category_group, name, id, TRACE_EVENT_FLAG_COPY, \
-        value1_name, static_cast<int>(value1_val), \
-        value2_name, static_cast<int>(value2_val))
-
-
-// Records a single ASYNC_BEGIN event called "name" immediately, with 0, 1 or 2
-// associated arguments. If the category is not enabled, then this
-// does nothing.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-// - |id| is used to match the ASYNC_BEGIN event with the ASYNC_END event. ASYNC
-//   events are considered to match if their category_group, name and id values
-//   all match. |id| must either be a pointer or an integer value up to 64 bits.
-//   If it's a pointer, the bits will be xored with a hash of the process ID so
-//   that the same pointer on two different processes will not collide.
-//
-// An asynchronous operation can consist of multiple phases. The first phase is
-// defined by the ASYNC_BEGIN calls. Additional phases can be defined using the
-// ASYNC_STEP_INTO or ASYNC_STEP_PAST macros. The ASYNC_STEP_INTO macro will
-// annotate the block following the call. The ASYNC_STEP_PAST macro will
-// annotate the block prior to the call. Note that any particular event must use
-// only STEP_INTO or STEP_PAST macros; they can not mix and match. When the
-// operation completes, call ASYNC_END.
-//
-// An ASYNC trace typically occurs on a single thread (if not, they will only be
-// drawn on the thread defined in the ASYNC_BEGIN event), but all events in that
-// operation must use the same |name| and |id|. Each step can have its own
-// args.
-#define TRACE_EVENT_ASYNC_BEGIN0(category_group, name, id) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
-        category_group, name, id, TRACE_EVENT_FLAG_NONE)
-#define TRACE_EVENT_ASYNC_BEGIN1(category_group, name, id, arg1_name, \
-        arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
-        category_group, name, id, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
-#define TRACE_EVENT_ASYNC_BEGIN2(category_group, name, id, arg1_name, \
-        arg1_val, arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
-        category_group, name, id, TRACE_EVENT_FLAG_NONE, \
-        arg1_name, arg1_val, arg2_name, arg2_val)
-#define TRACE_EVENT_COPY_ASYNC_BEGIN0(category_group, name, id) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
-        category_group, name, id, TRACE_EVENT_FLAG_COPY)
-#define TRACE_EVENT_COPY_ASYNC_BEGIN1(category_group, name, id, arg1_name, \
-        arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
-        category_group, name, id, TRACE_EVENT_FLAG_COPY, \
-        arg1_name, arg1_val)
-#define TRACE_EVENT_COPY_ASYNC_BEGIN2(category_group, name, id, arg1_name, \
-        arg1_val, arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
-        category_group, name, id, TRACE_EVENT_FLAG_COPY, \
-        arg1_name, arg1_val, arg2_name, arg2_val)
-
-// Records a single ASYNC_STEP_INTO event for |step| immediately. If the
-// category is not enabled, then this does nothing. The |name| and |id| must
-// match the ASYNC_BEGIN event above. The |step| param identifies this step
-// within the async event. This should be called at the beginning of the next
-// phase of an asynchronous operation. The ASYNC_BEGIN event must not have any
-// ASYNC_STEP_PAST events.
-#define TRACE_EVENT_ASYNC_STEP_INTO0(category_group, name, id, step) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP_INTO, \
-        category_group, name, id, TRACE_EVENT_FLAG_NONE, "step", step)
-#define TRACE_EVENT_ASYNC_STEP_INTO1(category_group, name, id, step, \
-                                     arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP_INTO, \
-        category_group, name, id, TRACE_EVENT_FLAG_NONE, "step", step, \
-        arg1_name, arg1_val)
-
-// Records a single ASYNC_STEP_PAST event for |step| immediately. If the
-// category is not enabled, then this does nothing. The |name| and |id| must
-// match the ASYNC_BEGIN event above. The |step| param identifies this step
-// within the async event. This should be called at the beginning of the next
-// phase of an asynchronous operation. The ASYNC_BEGIN event must not have any
-// ASYNC_STEP_INTO events.
-#define TRACE_EVENT_ASYNC_STEP_PAST0(category_group, name, id, step) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP_PAST, \
-        category_group, name, id, TRACE_EVENT_FLAG_NONE, "step", step)
-#define TRACE_EVENT_ASYNC_STEP_PAST1(category_group, name, id, step, \
-                                     arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP_PAST, \
-        category_group, name, id, TRACE_EVENT_FLAG_NONE, "step", step, \
-        arg1_name, arg1_val)
-
-// Records a single ASYNC_END event for "name" immediately. If the category
-// is not enabled, then this does nothing.
-#define TRACE_EVENT_ASYNC_END0(category_group, name, id) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
-        category_group, name, id, TRACE_EVENT_FLAG_NONE)
-#define TRACE_EVENT_ASYNC_END1(category_group, name, id, arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
-        category_group, name, id, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
-#define TRACE_EVENT_ASYNC_END2(category_group, name, id, arg1_name, arg1_val, \
-        arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
-        category_group, name, id, TRACE_EVENT_FLAG_NONE, \
-        arg1_name, arg1_val, arg2_name, arg2_val)
-#define TRACE_EVENT_COPY_ASYNC_END0(category_group, name, id) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
-        category_group, name, id, TRACE_EVENT_FLAG_COPY)
-#define TRACE_EVENT_COPY_ASYNC_END1(category_group, name, id, arg1_name, \
-        arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
-        category_group, name, id, TRACE_EVENT_FLAG_COPY, \
-        arg1_name, arg1_val)
-#define TRACE_EVENT_COPY_ASYNC_END2(category_group, name, id, arg1_name, \
-        arg1_val, arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
-        category_group, name, id, TRACE_EVENT_FLAG_COPY, \
-        arg1_name, arg1_val, arg2_name, arg2_val)
-
-
-// Records a single FLOW_BEGIN event called "name" immediately, with 0, 1 or 2
-// associated arguments. If the category is not enabled, then this
-// does nothing.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-// - |id| is used to match the FLOW_BEGIN event with the FLOW_END event. FLOW
-//   events are considered to match if their category_group, name and id values
-//   all match. |id| must either be a pointer or an integer value up to 64 bits.
-//   If it's a pointer, the bits will be xored with a hash of the process ID so
-//   that the same pointer on two different processes will not collide.
-// FLOW events are different from ASYNC events in how they are drawn by the
-// tracing UI. A FLOW defines asynchronous data flow, such as posting a task
-// (FLOW_BEGIN) and later executing that task (FLOW_END). Expect FLOWs to be
-// drawn as lines or arrows from FLOW_BEGIN scopes to FLOW_END scopes. Similar
-// to ASYNC, a FLOW can consist of multiple phases. The first phase is defined
-// by the FLOW_BEGIN calls. Additional phases can be defined using the FLOW_STEP
-// macros. When the operation completes, call FLOW_END. An async operation can
-// span threads and processes, but all events in that operation must use the
-// same |name| and |id|. Each event can have its own args.
-#define TRACE_EVENT_FLOW_BEGIN0(category_group, name, id) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_BEGIN, \
-        category_group, name, id, TRACE_EVENT_FLAG_NONE)
-#define TRACE_EVENT_FLOW_BEGIN1(category_group, name, id, arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_BEGIN, \
-        category_group, name, id, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
-#define TRACE_EVENT_FLOW_BEGIN2(category_group, name, id, arg1_name, arg1_val, \
-        arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_BEGIN, \
-        category_group, name, id, TRACE_EVENT_FLAG_NONE, \
-        arg1_name, arg1_val, arg2_name, arg2_val)
-#define TRACE_EVENT_COPY_FLOW_BEGIN0(category_group, name, id) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_BEGIN, \
-        category_group, name, id, TRACE_EVENT_FLAG_COPY)
-#define TRACE_EVENT_COPY_FLOW_BEGIN1(category_group, name, id, arg1_name, \
-        arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_BEGIN, \
-        category_group, name, id, TRACE_EVENT_FLAG_COPY, \
-        arg1_name, arg1_val)
-#define TRACE_EVENT_COPY_FLOW_BEGIN2(category_group, name, id, arg1_name, \
-        arg1_val, arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_BEGIN, \
-        category_group, name, id, TRACE_EVENT_FLAG_COPY, \
-        arg1_name, arg1_val, arg2_name, arg2_val)
-
-// Records a single FLOW_STEP event for |step| immediately. If the category
-// is not enabled, then this does nothing. The |name| and |id| must match the
-// FLOW_BEGIN event above. The |step| param identifies this step within the
-// async event. This should be called at the beginning of the next phase of an
-// asynchronous operation.
-#define TRACE_EVENT_FLOW_STEP0(category_group, name, id, step) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_STEP, \
-        category_group, name, id, TRACE_EVENT_FLAG_NONE, "step", step)
-#define TRACE_EVENT_FLOW_STEP1(category_group, name, id, step, \
-        arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_STEP, \
-        category_group, name, id, TRACE_EVENT_FLAG_NONE, "step", step, \
-        arg1_name, arg1_val)
-#define TRACE_EVENT_COPY_FLOW_STEP0(category_group, name, id, step) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_STEP, \
-        category_group, name, id, TRACE_EVENT_FLAG_COPY, "step", step)
-#define TRACE_EVENT_COPY_FLOW_STEP1(category_group, name, id, step, \
-        arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_STEP, \
-        category_group, name, id, TRACE_EVENT_FLAG_COPY, "step", step, \
-        arg1_name, arg1_val)
-
-// Records a single FLOW_END event for "name" immediately. If the category
-// is not enabled, then this does nothing.
-#define TRACE_EVENT_FLOW_END0(category_group, name, id) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_END, \
-        category_group, name, id, TRACE_EVENT_FLAG_NONE)
-#define TRACE_EVENT_FLOW_END1(category_group, name, id, arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_END, \
-        category_group, name, id, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
-#define TRACE_EVENT_FLOW_END2(category_group, name, id, arg1_name, arg1_val, \
-        arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_END, \
-        category_group, name, id, TRACE_EVENT_FLAG_NONE, \
-        arg1_name, arg1_val, arg2_name, arg2_val)
-#define TRACE_EVENT_COPY_FLOW_END0(category_group, name, id) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_END, \
-        category_group, name, id, TRACE_EVENT_FLAG_COPY)
-#define TRACE_EVENT_COPY_FLOW_END1(category_group, name, id, arg1_name, \
-        arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_END, \
-        category_group, name, id, TRACE_EVENT_FLAG_COPY, \
-        arg1_name, arg1_val)
-#define TRACE_EVENT_COPY_FLOW_END2(category_group, name, id, arg1_name, \
-        arg1_val, arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_END, \
-        category_group, name, id, TRACE_EVENT_FLAG_COPY, \
-        arg1_name, arg1_val, arg2_name, arg2_val)
-
-// Macros to track the life time and value of arbitrary client objects.
-// See also TraceTrackableObject.
-#define TRACE_EVENT_OBJECT_CREATED_WITH_ID(category_group, name, id) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_CREATE_OBJECT, \
-        category_group, name, TRACE_ID_DONT_MANGLE(id), TRACE_EVENT_FLAG_NONE)
-
-#define TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(category_group, name, id, snapshot) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_SNAPSHOT_OBJECT, \
-        category_group, name, TRACE_ID_DONT_MANGLE(id), TRACE_EVENT_FLAG_NONE,\
-        "snapshot", snapshot)
-
-#define TRACE_EVENT_OBJECT_DELETED_WITH_ID(category_group, name, id) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_DELETE_OBJECT, \
-        category_group, name, TRACE_ID_DONT_MANGLE(id), TRACE_EVENT_FLAG_NONE)
 
 #define INTERNAL_TRACE_EVENT_CATEGORY_GROUP_ENABLED_FOR_RECORDING_MODE() \
     *INTERNAL_TRACE_EVENT_UID(category_group_enabled) & \
         (SkEventTracer::kEnabledForRecording_CategoryGroupEnabledFlags | \
          SkEventTracer::kEnabledForEventCallback_CategoryGroupEnabledFlags)
 
-// Macro to efficiently determine if a given category group is enabled.
-#define TRACE_EVENT_CATEGORY_GROUP_ENABLED(category_group, ret) \
-    do { \
-      INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category_group); \
-      if (INTERNAL_TRACE_EVENT_CATEGORY_GROUP_ENABLED_FOR_RECORDING_MODE()) { \
-        *ret = true; \
-      } else { \
-        *ret = false; \
-      } \
-    } while (0)
-
-// Macro to efficiently determine, through polling, if a new trace has begun.
-#define TRACE_EVENT_IS_NEW_TRACE(ret) \
-    do { \
-      static int INTERNAL_TRACE_EVENT_UID(lastRecordingNumber) = 0; \
-      int num_traces_recorded = TRACE_EVENT_API_GET_NUM_TRACES_RECORDED(); \
-      if (num_traces_recorded != -1 && \
-          num_traces_recorded != \
-          INTERNAL_TRACE_EVENT_UID(lastRecordingNumber)) { \
-        INTERNAL_TRACE_EVENT_UID(lastRecordingNumber) = \
-            num_traces_recorded; \
-        *ret = true; \
-      } else { \
-        *ret = false; \
-      } \
-    } while (0)
-
-////////////////////////////////////////////////////////////////////////////////
-// Implementation specific tracing API definitions.
-
 // Get a pointer to the enabled state of the given trace category. Only
 // long-lived literal strings should be given as the category group. The
 // returned pointer can be held permanently in a local static for example. If
@@ -759,15 +105,10 @@
 #define TRACE_EVENT_API_UPDATE_TRACE_EVENT_DURATION \
     SkEventTracer::GetInstance()->updateTraceEventDuration
 
-// These operations are atomic in the Chrome tracing implementation
-// to cater to ARM's weak memory consistency; we're just doing read/
-// write here because it's not strictly needed for correctness.
-// So says Nat.
-// FIXME
-
 #define TRACE_EVENT_API_ATOMIC_WORD intptr_t
-#define TRACE_EVENT_API_ATOMIC_LOAD(var) (*(&var))
-#define TRACE_EVENT_API_ATOMIC_STORE(var, value) (var=value)
+#define TRACE_EVENT_API_ATOMIC_LOAD(var) sk_atomic_load(&var, sk_memory_order_relaxed)
+#define TRACE_EVENT_API_ATOMIC_STORE(var, value) \
+    sk_atomic_store(&var, value, sk_memory_order_relaxed)
 
 // Defines visibility for classes in trace_event.h
 #define TRACE_EVENT_API_CLASS_EXPORT SK_API
@@ -878,59 +219,7 @@ TRACE_EVENT_API_CLASS_EXPORT extern \
       } \
     } while (0)
 
-// Notes regarding the following definitions:
-// New values can be added and propagated to third party libraries, but existing
-// definitions must never be changed, because third party libraries may use old
-// definitions.
-
-// Phase indicates the nature of an event entry. E.g. part of a begin/end pair.
-#define TRACE_EVENT_PHASE_BEGIN    ('B')
-#define TRACE_EVENT_PHASE_END      ('E')
-#define TRACE_EVENT_PHASE_COMPLETE ('X')
-#define TRACE_EVENT_PHASE_INSTANT  ('i')
-#define TRACE_EVENT_PHASE_ASYNC_BEGIN ('S')
-#define TRACE_EVENT_PHASE_ASYNC_STEP_INTO  ('T')
-#define TRACE_EVENT_PHASE_ASYNC_STEP_PAST  ('p')
-#define TRACE_EVENT_PHASE_ASYNC_END   ('F')
-#define TRACE_EVENT_PHASE_FLOW_BEGIN ('s')
-#define TRACE_EVENT_PHASE_FLOW_STEP  ('t')
-#define TRACE_EVENT_PHASE_FLOW_END   ('f')
-#define TRACE_EVENT_PHASE_METADATA ('M')
-#define TRACE_EVENT_PHASE_COUNTER  ('C')
-#define TRACE_EVENT_PHASE_SAMPLE  ('P')
-#define TRACE_EVENT_PHASE_CREATE_OBJECT ('N')
-#define TRACE_EVENT_PHASE_SNAPSHOT_OBJECT ('O')
-#define TRACE_EVENT_PHASE_DELETE_OBJECT ('D')
-
-// Flags for changing the behavior of TRACE_EVENT_API_ADD_TRACE_EVENT.
-#define TRACE_EVENT_FLAG_NONE         (static_cast<unsigned char>(0))
-#define TRACE_EVENT_FLAG_COPY         (static_cast<unsigned char>(1 << 0))
-#define TRACE_EVENT_FLAG_HAS_ID       (static_cast<unsigned char>(1 << 1))
-#define TRACE_EVENT_FLAG_MANGLE_ID    (static_cast<unsigned char>(1 << 2))
-#define TRACE_EVENT_FLAG_SCOPE_OFFSET (static_cast<unsigned char>(1 << 3))
-
-#define TRACE_EVENT_FLAG_SCOPE_MASK   (static_cast<unsigned char>( \
-    TRACE_EVENT_FLAG_SCOPE_OFFSET | (TRACE_EVENT_FLAG_SCOPE_OFFSET << 1)))
-
-// Type values for identifying types in the TraceValue union.
-#define TRACE_VALUE_TYPE_BOOL         (static_cast<unsigned char>(1))
-#define TRACE_VALUE_TYPE_UINT         (static_cast<unsigned char>(2))
-#define TRACE_VALUE_TYPE_INT          (static_cast<unsigned char>(3))
-#define TRACE_VALUE_TYPE_DOUBLE       (static_cast<unsigned char>(4))
-#define TRACE_VALUE_TYPE_POINTER      (static_cast<unsigned char>(5))
-#define TRACE_VALUE_TYPE_STRING       (static_cast<unsigned char>(6))
-#define TRACE_VALUE_TYPE_COPY_STRING  (static_cast<unsigned char>(7))
-#define TRACE_VALUE_TYPE_CONVERTABLE  (static_cast<unsigned char>(8))
-
-// Enum reflecting the scope of an INSTANT event. Must fit within
-// TRACE_EVENT_FLAG_SCOPE_MASK.
-#define TRACE_EVENT_SCOPE_GLOBAL  (static_cast<unsigned char>(0 << 3))
-#define TRACE_EVENT_SCOPE_PROCESS (static_cast<unsigned char>(1 << 3))
-#define TRACE_EVENT_SCOPE_THREAD  (static_cast<unsigned char>(2 << 3))
-
-#define TRACE_EVENT_SCOPE_NAME_GLOBAL  ('g')
-#define TRACE_EVENT_SCOPE_NAME_PROCESS ('p')
-#define TRACE_EVENT_SCOPE_NAME_THREAD  ('t')
+#define INTERNAL_TRACE_MEMORY(category, name)
 
 namespace skia {
 namespace tracing_internals {
@@ -1106,7 +395,7 @@ AddTraceEvent(
     unsigned char flags) {
   return TRACE_EVENT_API_ADD_TRACE_EVENT(
       phase, category_group_enabled, name, id,
-      kZeroNumArgs, NULL, NULL, NULL, flags);
+      kZeroNumArgs, nullptr, nullptr, nullptr, flags);
 }
 
 template<class ARG1_TYPE>
@@ -1155,7 +444,7 @@ AddTraceEvent(
 class TRACE_EVENT_API_CLASS_EXPORT ScopedTracer {
  public:
   // Note: members of data_ intentionally left uninitialized. See Initialize.
-  ScopedTracer() : p_data_(NULL) {}
+  ScopedTracer() : p_data_(nullptr) {}
 
   ~ScopedTracer() {
     if (p_data_ && *data_.category_group_enabled)
diff --git a/gfx/skia/skia/src/core/SkTraceEventCommon.h b/gfx/skia/skia/src/core/SkTraceEventCommon.h
new file mode 100644
index 000000000000..aa5a49353626
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkTraceEventCommon.h
@@ -0,0 +1,1038 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This header file defines the set of trace_event macros without specifying
+// how the events actually get collected and stored. If you need to expose trace
+// events to some other universe, you can copy-and-paste this file as well as
+// trace_event.h, modifying the macros contained there as necessary for the
+// target platform. The end result is that multiple libraries can funnel events
+// through to a shared trace event collector.
+
+// IMPORTANT: To avoid conflicts, if you need to modify this file for a library,
+// land your change in base/ first, and then copy-and-paste it.
+
+// Trace events are for tracking application performance and resource usage.
+// Macros are provided to track:
+//    Begin and end of function calls
+//    Counters
+//
+// Events are issued against categories. Whereas LOG's
+// categories are statically defined, TRACE categories are created
+// implicitly with a string. For example:
+//   TRACE_EVENT_INSTANT0("MY_SUBSYSTEM", "SomeImportantEvent",
+//                        TRACE_EVENT_SCOPE_THREAD)
+//
+// It is often the case that one trace may belong in multiple categories at the
+// same time. The first argument to the trace can be a comma-separated list of
+// categories, forming a category group, like:
+//
+// TRACE_EVENT_INSTANT0("input,views", "OnMouseOver", TRACE_EVENT_SCOPE_THREAD)
+//
+// We can enable/disable tracing of OnMouseOver by enabling/disabling either
+// category.
+//
+// Events can be INSTANT, or can be pairs of BEGIN and END in the same scope:
+//   TRACE_EVENT_BEGIN0("MY_SUBSYSTEM", "SomethingCostly")
+//   doSomethingCostly()
+//   TRACE_EVENT_END0("MY_SUBSYSTEM", "SomethingCostly")
+// Note: our tools can't always determine the correct BEGIN/END pairs unless
+// these are used in the same scope. Use ASYNC_BEGIN/ASYNC_END macros if you
+// need them to be in separate scopes.
+//
+// A common use case is to trace entire function scopes. This
+// issues a trace BEGIN and END automatically:
+//   void doSomethingCostly() {
+//     TRACE_EVENT0("MY_SUBSYSTEM", "doSomethingCostly");
+//     ...
+//   }
+//
+// Additional parameters can be associated with an event:
+//   void doSomethingCostly2(int howMuch) {
+//     TRACE_EVENT1("MY_SUBSYSTEM", "doSomethingCostly",
+//         "howMuch", howMuch);
+//     ...
+//   }
+//
+// The trace system will automatically add to this information the
+// current process id, thread id, and a timestamp in microseconds.
+//
+// To trace an asynchronous procedure such as an IPC send/receive, use
+// ASYNC_BEGIN and ASYNC_END:
+//   [single threaded sender code]
+//     static int send_count = 0;
+//     ++send_count;
+//     TRACE_EVENT_ASYNC_BEGIN0("ipc", "message", send_count);
+//     Send(new MyMessage(send_count));
+//   [receive code]
+//     void OnMyMessage(send_count) {
+//       TRACE_EVENT_ASYNC_END0("ipc", "message", send_count);
+//     }
+// The third parameter is a unique ID to match ASYNC_BEGIN/ASYNC_END pairs.
+// ASYNC_BEGIN and ASYNC_END can occur on any thread of any traced process.
+// Pointers can be used for the ID parameter, and they will be mangled
+// internally so that the same pointer on two different processes will not
+// match. For example:
+//   class MyTracedClass {
+//    public:
+//     MyTracedClass() {
+//       TRACE_EVENT_ASYNC_BEGIN0("category", "MyTracedClass", this);
+//     }
+//     ~MyTracedClass() {
+//       TRACE_EVENT_ASYNC_END0("category", "MyTracedClass", this);
+//     }
+//   }
+//
+// Trace event also supports counters, which is a way to track a quantity
+// as it varies over time. Counters are created with the following macro:
+//   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter", g_myCounterValue);
+//
+// Counters are process-specific. The macro itself can be issued from any
+// thread, however.
+//
+// Sometimes, you want to track two counters at once. You can do this with two
+// counter macros:
+//   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter0", g_myCounterValue[0]);
+//   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter1", g_myCounterValue[1]);
+// Or you can do it with a combined macro:
+//   TRACE_COUNTER2("MY_SUBSYSTEM", "myCounter",
+//       "bytesPinned", g_myCounterValue[0],
+//       "bytesAllocated", g_myCounterValue[1]);
+// This indicates to the tracing UI that these counters should be displayed
+// in a single graph, as a summed area chart.
+//
+// Since counters are in a global namespace, you may want to disambiguate with a
+// unique ID, by using the TRACE_COUNTER_ID* variations.
+//
+// By default, trace collection is compiled in, but turned off at runtime.
+// Collecting trace data is the responsibility of the embedding
+// application. In Chrome's case, navigating to about:tracing will turn on
+// tracing and display data collected across all active processes.
+//
+//
+// Memory scoping note:
+// Tracing copies the pointers, not the string content, of the strings passed
+// in for category_group, name, and arg_names.  Thus, the following code will
+// cause problems:
+//     char* str = strdup("importantName");
+//     TRACE_EVENT_INSTANT0("SUBSYSTEM", str);  // BAD!
+//     free(str);                   // Trace system now has dangling pointer
+//
+// To avoid this issue with the |name| and |arg_name| parameters, use the
+// TRACE_EVENT_COPY_XXX overloads of the macros at additional runtime overhead.
+// Notes: The category must always be in a long-lived char* (i.e. static const).
+//        The |arg_values|, when used, are always deep copied with the _COPY
+//        macros.
+//
+// When are string argument values copied:
+// const char* arg_values are only referenced by default:
+//     TRACE_EVENT1("category", "name",
+//                  "arg1", "literal string is only referenced");
+// Use TRACE_STR_COPY to force copying of a const char*:
+//     TRACE_EVENT1("category", "name",
+//                  "arg1", TRACE_STR_COPY("string will be copied"));
+// std::string arg_values are always copied:
+//     TRACE_EVENT1("category", "name",
+//                  "arg1", std::string("string will be copied"));
+//
+//
+// Convertable notes:
+// Converting a large data type to a string can be costly. To help with this,
+// the trace framework provides an interface ConvertableToTraceFormat. If you
+// inherit from it and implement the AppendAsTraceFormat method the trace
+// framework will call back to your object to convert a trace output time. This
+// means, if the category for the event is disabled, the conversion will not
+// happen.
+//
+//   class MyData : public base::trace_event::ConvertableToTraceFormat {
+//    public:
+//     MyData() {}
+//     void AppendAsTraceFormat(std::string* out) const override {
+//       out->append("{\"foo\":1}");
+//     }
+//    private:
+//     ~MyData() override {}
+//     DISALLOW_COPY_AND_ASSIGN(MyData);
+//   };
+//
+//   TRACE_EVENT1("foo", "bar", "data",
+//                scoped_refptr<ConvertableToTraceFormat>(new MyData()));
+//
+// The trace framework will take ownership if the passed pointer and it will
+// be free'd when the trace buffer is flushed.
+//
+// Note, we only do the conversion when the buffer is flushed, so the provided
+// data object should not be modified after it's passed to the trace framework.
+//
+//
+// Thread Safety:
+// A thread safe singleton and mutex are used for thread safety. Category
+// enabled flags are used to limit the performance impact when the system
+// is not enabled.
+//
+// TRACE_EVENT macros first cache a pointer to a category. The categories are
+// statically allocated and safe at all times, even after exit. Fetching a
+// category is protected by the TraceLog::lock_. Multiple threads initializing
+// the static variable is safe, as they will be serialized by the lock and
+// multiple calls will return the same pointer to the category.
+//
+// Then the category_group_enabled flag is checked. This is a unsigned char, and
+// not intended to be multithread safe. It optimizes access to AddTraceEvent
+// which is threadsafe internally via TraceLog::lock_. The enabled flag may
+// cause some threads to incorrectly call or skip calling AddTraceEvent near
+// the time of the system being enabled or disabled. This is acceptable as
+// we tolerate some data loss while the system is being enabled/disabled and
+// because AddTraceEvent is threadsafe internally and checks the enabled state
+// again under lock.
+//
+// Without the use of these static category pointers and enabled flags all
+// trace points would carry a significant performance cost of acquiring a lock
+// and resolving the category.
+
+#if defined(TRACE_EVENT0)
+#error "Another copy of this file has already been included."
+#endif
+
+// This will mark the trace event as disabled by default. The user will need
+// to explicitly enable the event.
+#define TRACE_DISABLED_BY_DEFAULT(name) "disabled-by-default-" name
+
+// Records a pair of begin and end events called "name" for the current
+// scope, with 0, 1 or 2 associated arguments. If the category is not
+// enabled, then this does nothing.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
+#define TRACE_EVENT0(category_group, name)    \
+  INTERNAL_TRACE_MEMORY(category_group, name) \
+  INTERNAL_TRACE_EVENT_ADD_SCOPED(category_group, name)
+#define TRACE_EVENT_WITH_FLOW0(category_group, name, bind_id, flow_flags)  \
+  INTERNAL_TRACE_MEMORY(category_group, name)                              \
+  INTERNAL_TRACE_EVENT_ADD_SCOPED_WITH_FLOW(category_group, name, bind_id, \
+                                            flow_flags)
+#define TRACE_EVENT1(category_group, name, arg1_name, arg1_val) \
+  INTERNAL_TRACE_MEMORY(category_group, name)                   \
+  INTERNAL_TRACE_EVENT_ADD_SCOPED(category_group, name, arg1_name, arg1_val)
+#define TRACE_EVENT_WITH_FLOW1(category_group, name, bind_id, flow_flags,  \
+                               arg1_name, arg1_val)                        \
+  INTERNAL_TRACE_MEMORY(category_group, name)                              \
+  INTERNAL_TRACE_EVENT_ADD_SCOPED_WITH_FLOW(category_group, name, bind_id, \
+                                            flow_flags, arg1_name, arg1_val)
+#define TRACE_EVENT2(category_group, name, arg1_name, arg1_val, arg2_name,   \
+                     arg2_val)                                               \
+  INTERNAL_TRACE_MEMORY(category_group, name)                                \
+  INTERNAL_TRACE_EVENT_ADD_SCOPED(category_group, name, arg1_name, arg1_val, \
+                                  arg2_name, arg2_val)
+#define TRACE_EVENT_WITH_FLOW2(category_group, name, bind_id, flow_flags,    \
+                               arg1_name, arg1_val, arg2_name, arg2_val)     \
+  INTERNAL_TRACE_MEMORY(category_group, name)                                \
+  INTERNAL_TRACE_EVENT_ADD_SCOPED_WITH_FLOW(category_group, name, bind_id,   \
+                                            flow_flags, arg1_name, arg1_val, \
+                                            arg2_name, arg2_val)
+
+// Records events like TRACE_EVENT2 but uses |memory_tag| for memory tracing.
+// Use this where |name| is too generic to accurately aggregate allocations.
+#define TRACE_EVENT_WITH_MEMORY_TAG2(category, name, memory_tag, arg1_name, \
+                                     arg1_val, arg2_name, arg2_val)         \
+  INTERNAL_TRACE_MEMORY(category, memory_tag)                               \
+  INTERNAL_TRACE_EVENT_ADD_SCOPED(category, name, arg1_name, arg1_val,      \
+                                  arg2_name, arg2_val)
+
+// UNSHIPPED_TRACE_EVENT* are like TRACE_EVENT* except that they are not
+// included in official builds.
+
+#if OFFICIAL_BUILD
+#undef TRACING_IS_OFFICIAL_BUILD
+#define TRACING_IS_OFFICIAL_BUILD 1
+#elif !defined(TRACING_IS_OFFICIAL_BUILD)
+#define TRACING_IS_OFFICIAL_BUILD 0
+#endif
+
+#if TRACING_IS_OFFICIAL_BUILD
+#define UNSHIPPED_TRACE_EVENT0(category_group, name) (void)0
+#define UNSHIPPED_TRACE_EVENT1(category_group, name, arg1_name, arg1_val) \
+  (void)0
+#define UNSHIPPED_TRACE_EVENT2(category_group, name, arg1_name, arg1_val, \
+                               arg2_name, arg2_val)                       \
+  (void)0
+#define UNSHIPPED_TRACE_EVENT_INSTANT0(category_group, name, scope) (void)0
+#define UNSHIPPED_TRACE_EVENT_INSTANT1(category_group, name, scope, arg1_name, \
+                                       arg1_val)                               \
+  (void)0
+#define UNSHIPPED_TRACE_EVENT_INSTANT2(category_group, name, scope, arg1_name, \
+                                       arg1_val, arg2_name, arg2_val)          \
+  (void)0
+#else
+#define UNSHIPPED_TRACE_EVENT0(category_group, name) \
+  TRACE_EVENT0(category_group, name)
+#define UNSHIPPED_TRACE_EVENT1(category_group, name, arg1_name, arg1_val) \
+  TRACE_EVENT1(category_group, name, arg1_name, arg1_val)
+#define UNSHIPPED_TRACE_EVENT2(category_group, name, arg1_name, arg1_val, \
+                               arg2_name, arg2_val)                       \
+  TRACE_EVENT2(category_group, name, arg1_name, arg1_val, arg2_name, arg2_val)
+#define UNSHIPPED_TRACE_EVENT_INSTANT0(category_group, name, scope) \
+  TRACE_EVENT_INSTANT0(category_group, name, scope)
+#define UNSHIPPED_TRACE_EVENT_INSTANT1(category_group, name, scope, arg1_name, \
+                                       arg1_val)                               \
+  TRACE_EVENT_INSTANT1(category_group, name, scope, arg1_name, arg1_val)
+#define UNSHIPPED_TRACE_EVENT_INSTANT2(category_group, name, scope, arg1_name, \
+                                       arg1_val, arg2_name, arg2_val)          \
+  TRACE_EVENT_INSTANT2(category_group, name, scope, arg1_name, arg1_val,       \
+                       arg2_name, arg2_val)
+#endif
+
+// Records a single event called "name" immediately, with 0, 1 or 2
+// associated arguments. If the category is not enabled, then this
+// does nothing.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
+#define TRACE_EVENT_INSTANT0(category_group, name, scope)                   \
+  INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, category_group, name, \
+                           TRACE_EVENT_FLAG_NONE | scope)
+#define TRACE_EVENT_INSTANT1(category_group, name, scope, arg1_name, arg1_val) \
+  INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, category_group, name,    \
+                           TRACE_EVENT_FLAG_NONE | scope, arg1_name, arg1_val)
+#define TRACE_EVENT_INSTANT2(category_group, name, scope, arg1_name, arg1_val, \
+                             arg2_name, arg2_val)                              \
+  INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, category_group, name,    \
+                           TRACE_EVENT_FLAG_NONE | scope, arg1_name, arg1_val, \
+                           arg2_name, arg2_val)
+#define TRACE_EVENT_COPY_INSTANT0(category_group, name, scope)              \
+  INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, category_group, name, \
+                           TRACE_EVENT_FLAG_COPY | scope)
+#define TRACE_EVENT_COPY_INSTANT1(category_group, name, scope, arg1_name,   \
+                                  arg1_val)                                 \
+  INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, category_group, name, \
+                           TRACE_EVENT_FLAG_COPY | scope, arg1_name, arg1_val)
+#define TRACE_EVENT_COPY_INSTANT2(category_group, name, scope, arg1_name,      \
+                                  arg1_val, arg2_name, arg2_val)               \
+  INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, category_group, name,    \
+                           TRACE_EVENT_FLAG_COPY | scope, arg1_name, arg1_val, \
+                           arg2_name, arg2_val)
+
+// Syntactic sugars for the sampling tracing in the main thread.
+#define TRACE_EVENT_SCOPED_SAMPLING_STATE(category, name) \
+  TRACE_EVENT_SCOPED_SAMPLING_STATE_FOR_BUCKET(0, category, name)
+#define TRACE_EVENT_GET_SAMPLING_STATE() \
+  TRACE_EVENT_GET_SAMPLING_STATE_FOR_BUCKET(0)
+#define TRACE_EVENT_SET_SAMPLING_STATE(category, name) \
+  TRACE_EVENT_SET_SAMPLING_STATE_FOR_BUCKET(0, category, name)
+#define TRACE_EVENT_SET_NONCONST_SAMPLING_STATE(categoryAndName) \
+  TRACE_EVENT_SET_NONCONST_SAMPLING_STATE_FOR_BUCKET(0, categoryAndName)
+
+// Records a single BEGIN event called "name" immediately, with 0, 1 or 2
+// associated arguments. If the category is not enabled, then this
+// does nothing.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
+#define TRACE_EVENT_BEGIN0(category_group, name)                          \
+  INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, category_group, name, \
+                           TRACE_EVENT_FLAG_NONE)
+#define TRACE_EVENT_BEGIN1(category_group, name, arg1_name, arg1_val)     \
+  INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, category_group, name, \
+                           TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
+#define TRACE_EVENT_BEGIN2(category_group, name, arg1_name, arg1_val,     \
+                           arg2_name, arg2_val)                           \
+  INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, category_group, name, \
+                           TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val,    \
+                           arg2_name, arg2_val)
+#define TRACE_EVENT_COPY_BEGIN0(category_group, name)                     \
+  INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, category_group, name, \
+                           TRACE_EVENT_FLAG_COPY)
+#define TRACE_EVENT_COPY_BEGIN1(category_group, name, arg1_name, arg1_val) \
+  INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, category_group, name,  \
+                           TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val)
+#define TRACE_EVENT_COPY_BEGIN2(category_group, name, arg1_name, arg1_val, \
+                                arg2_name, arg2_val)                       \
+  INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, category_group, name,  \
+                           TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val,     \
+                           arg2_name, arg2_val)
+
+// Similar to TRACE_EVENT_BEGINx but with a custom |at| timestamp provided.
+// - |id| is used to match the _BEGIN event with the _END event.
+//   Events are considered to match if their category_group, name and id values
+//   all match. |id| must either be a pointer or an integer value up to 64 bits.
+//   If it's a pointer, the bits will be xored with a hash of the process ID so
+//   that the same pointer on two different processes will not collide.
+#define TRACE_EVENT_BEGIN_WITH_ID_TID_AND_TIMESTAMP0(category_group, name, id, \
+                                                     thread_id, timestamp)     \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP(                          \
+      TRACE_EVENT_PHASE_ASYNC_BEGIN, category_group, name, id, thread_id,      \
+      timestamp, TRACE_EVENT_FLAG_NONE)
+#define TRACE_EVENT_COPY_BEGIN_WITH_ID_TID_AND_TIMESTAMP0(                \
+    category_group, name, id, thread_id, timestamp)                       \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP(                     \
+      TRACE_EVENT_PHASE_ASYNC_BEGIN, category_group, name, id, thread_id, \
+      timestamp, TRACE_EVENT_FLAG_COPY)
+#define TRACE_EVENT_COPY_BEGIN_WITH_ID_TID_AND_TIMESTAMP1(                \
+    category_group, name, id, thread_id, timestamp, arg1_name, arg1_val)  \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP(                     \
+      TRACE_EVENT_PHASE_ASYNC_BEGIN, category_group, name, id, thread_id, \
+      timestamp, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val)
+#define TRACE_EVENT_COPY_BEGIN_WITH_ID_TID_AND_TIMESTAMP2(                \
+    category_group, name, id, thread_id, timestamp, arg1_name, arg1_val,  \
+    arg2_name, arg2_val)                                                  \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP(                     \
+      TRACE_EVENT_PHASE_ASYNC_BEGIN, category_group, name, id, thread_id, \
+      timestamp, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val, arg2_name,   \
+      arg2_val)
+
+// Records a single END event for "name" immediately. If the category
+// is not enabled, then this does nothing.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
+#define TRACE_EVENT_END0(category_group, name)                          \
+  INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, category_group, name, \
+                           TRACE_EVENT_FLAG_NONE)
+#define TRACE_EVENT_END1(category_group, name, arg1_name, arg1_val)     \
+  INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, category_group, name, \
+                           TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
+#define TRACE_EVENT_END2(category_group, name, arg1_name, arg1_val, arg2_name, \
+                         arg2_val)                                             \
+  INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, category_group, name,        \
+                           TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val,         \
+                           arg2_name, arg2_val)
+#define TRACE_EVENT_COPY_END0(category_group, name)                     \
+  INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, category_group, name, \
+                           TRACE_EVENT_FLAG_COPY)
+#define TRACE_EVENT_COPY_END1(category_group, name, arg1_name, arg1_val) \
+  INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, category_group, name,  \
+                           TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val)
+#define TRACE_EVENT_COPY_END2(category_group, name, arg1_name, arg1_val, \
+                              arg2_name, arg2_val)                       \
+  INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, category_group, name,  \
+                           TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val,   \
+                           arg2_name, arg2_val)
+
+#define TRACE_EVENT_MARK(category_group, name)                           \
+  INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_MARK, category_group, name, \
+                           TRACE_EVENT_FLAG_NONE)
+
+#define TRACE_EVENT_MARK_WITH_TIMESTAMP(category_group, name, timestamp)   \
+  INTERNAL_TRACE_EVENT_ADD_WITH_TIMESTAMP(TRACE_EVENT_PHASE_MARK,          \
+                                          category_group, name, timestamp, \
+                                          TRACE_EVENT_FLAG_NONE)
+
+#define TRACE_EVENT_COPY_MARK(category_group, name)                      \
+  INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_MARK, category_group, name, \
+                           TRACE_EVENT_FLAG_COPY)
+
+#define TRACE_EVENT_COPY_MARK_WITH_TIMESTAMP(category_group, name, timestamp) \
+  INTERNAL_TRACE_EVENT_ADD_WITH_TIMESTAMP(TRACE_EVENT_PHASE_MARK,             \
+                                          category_group, name, timestamp,    \
+                                          TRACE_EVENT_FLAG_COPY)
+
+// Similar to TRACE_EVENT_ENDx but with a custom |at| timestamp provided.
+// - |id| is used to match the _BEGIN event with the _END event.
+//   Events are considered to match if their category_group, name and id values
+//   all match. |id| must either be a pointer or an integer value up to 64 bits.
+//   If it's a pointer, the bits will be xored with a hash of the process ID so
+//   that the same pointer on two different processes will not collide.
+#define TRACE_EVENT_END_WITH_ID_TID_AND_TIMESTAMP0(category_group, name, id, \
+                                                   thread_id, timestamp)     \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP(                        \
+      TRACE_EVENT_PHASE_ASYNC_END, category_group, name, id, thread_id,      \
+      timestamp, TRACE_EVENT_FLAG_NONE)
+#define TRACE_EVENT_COPY_END_WITH_ID_TID_AND_TIMESTAMP0(                \
+    category_group, name, id, thread_id, timestamp)                     \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP(                   \
+      TRACE_EVENT_PHASE_ASYNC_END, category_group, name, id, thread_id, \
+      timestamp, TRACE_EVENT_FLAG_COPY)
+#define TRACE_EVENT_COPY_END_WITH_ID_TID_AND_TIMESTAMP1(                 \
+    category_group, name, id, thread_id, timestamp, arg1_name, arg1_val) \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP(                    \
+      TRACE_EVENT_PHASE_ASYNC_END, category_group, name, id, thread_id,  \
+      timestamp, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val)
+#define TRACE_EVENT_COPY_END_WITH_ID_TID_AND_TIMESTAMP2(                 \
+    category_group, name, id, thread_id, timestamp, arg1_name, arg1_val, \
+    arg2_name, arg2_val)                                                 \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP(                    \
+      TRACE_EVENT_PHASE_ASYNC_END, category_group, name, id, thread_id,  \
+      timestamp, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val, arg2_name,  \
+      arg2_val)
+
+// Records the value of a counter called "name" immediately. Value
+// must be representable as a 32 bit integer.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
+#define TRACE_COUNTER1(category_group, name, value)                         \
+  INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, category_group, name, \
+                           TRACE_EVENT_FLAG_NONE, "value",                  \
+                           static_cast<int>(value))
+#define TRACE_COPY_COUNTER1(category_group, name, value)                    \
+  INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, category_group, name, \
+                           TRACE_EVENT_FLAG_COPY, "value",                  \
+                           static_cast<int>(value))
+
+// Records the values of a multi-parted counter called "name" immediately.
+// The UI will treat value1 and value2 as parts of a whole, displaying their
+// values as a stacked-bar chart.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
+#define TRACE_COUNTER2(category_group, name, value1_name, value1_val,       \
+                       value2_name, value2_val)                             \
+  INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, category_group, name, \
+                           TRACE_EVENT_FLAG_NONE, value1_name,              \
+                           static_cast<int>(value1_val), value2_name,       \
+                           static_cast<int>(value2_val))
+#define TRACE_COPY_COUNTER2(category_group, name, value1_name, value1_val,  \
+                            value2_name, value2_val)                        \
+  INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, category_group, name, \
+                           TRACE_EVENT_FLAG_COPY, value1_name,              \
+                           static_cast<int>(value1_val), value2_name,       \
+                           static_cast<int>(value2_val))
+
+// Records the value of a counter called "name" immediately. Value
+// must be representable as a 32 bit integer.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
+// - |id| is used to disambiguate counters with the same name. It must either
+//   be a pointer or an integer value up to 64 bits. If it's a pointer, the bits
+//   will be xored with a hash of the process ID so that the same pointer on
+//   two different processes will not collide.
+#define TRACE_COUNTER_ID1(category_group, name, id, value)                    \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, category_group, \
+                                   name, id, TRACE_EVENT_FLAG_NONE, "value",  \
+                                   static_cast<int>(value))
+#define TRACE_COPY_COUNTER_ID1(category_group, name, id, value)               \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, category_group, \
+                                   name, id, TRACE_EVENT_FLAG_COPY, "value",  \
+                                   static_cast<int>(value))
+
+// Records the values of a multi-parted counter called "name" immediately.
+// The UI will treat value1 and value2 as parts of a whole, displaying their
+// values as a stacked-bar chart.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
+// - |id| is used to disambiguate counters with the same name. It must either
+//   be a pointer or an integer value up to 64 bits. If it's a pointer, the bits
+//   will be xored with a hash of the process ID so that the same pointer on
+//   two different processes will not collide.
+#define TRACE_COUNTER_ID2(category_group, name, id, value1_name, value1_val,  \
+                          value2_name, value2_val)                            \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, category_group, \
+                                   name, id, TRACE_EVENT_FLAG_NONE,           \
+                                   value1_name, static_cast<int>(value1_val), \
+                                   value2_name, static_cast<int>(value2_val))
+#define TRACE_COPY_COUNTER_ID2(category_group, name, id, value1_name,         \
+                               value1_val, value2_name, value2_val)           \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, category_group, \
+                                   name, id, TRACE_EVENT_FLAG_COPY,           \
+                                   value1_name, static_cast<int>(value1_val), \
+                                   value2_name, static_cast<int>(value2_val))
+
+// TRACE_EVENT_SAMPLE_* events are injected by the sampling profiler.
+#define TRACE_EVENT_SAMPLE_WITH_TID_AND_TIMESTAMP0(category_group, name,       \
+                                                   thread_id, timestamp)       \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP(                          \
+      TRACE_EVENT_PHASE_SAMPLE, category_group, name, 0, thread_id, timestamp, \
+      TRACE_EVENT_FLAG_NONE)
+
+#define TRACE_EVENT_SAMPLE_WITH_TID_AND_TIMESTAMP1(                            \
+    category_group, name, thread_id, timestamp, arg1_name, arg1_val)           \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP(                          \
+      TRACE_EVENT_PHASE_SAMPLE, category_group, name, 0, thread_id, timestamp, \
+      TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
+
+#define TRACE_EVENT_SAMPLE_WITH_TID_AND_TIMESTAMP2(category_group, name,       \
+                                                   thread_id, timestamp,       \
+                                                   arg1_name, arg1_val,        \
+                                                   arg2_name, arg2_val)        \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP(                          \
+      TRACE_EVENT_PHASE_SAMPLE, category_group, name, 0, thread_id, timestamp, \
+      TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val, arg2_name, arg2_val)
+
+// ASYNC_STEP_* APIs should be only used by legacy code. New code should
+// consider using NESTABLE_ASYNC_* APIs to describe substeps within an async
+// event.
+// Records a single ASYNC_BEGIN event called "name" immediately, with 0, 1 or 2
+// associated arguments. If the category is not enabled, then this
+// does nothing.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
+// - |id| is used to match the ASYNC_BEGIN event with the ASYNC_END event. ASYNC
+//   events are considered to match if their category_group, name and id values
+//   all match. |id| must either be a pointer or an integer value up to 64 bits.
+//   If it's a pointer, the bits will be xored with a hash of the process ID so
+//   that the same pointer on two different processes will not collide.
+//
+// An asynchronous operation can consist of multiple phases. The first phase is
+// defined by the ASYNC_BEGIN calls. Additional phases can be defined using the
+// ASYNC_STEP_INTO or ASYNC_STEP_PAST macros. The ASYNC_STEP_INTO macro will
+// annotate the block following the call. The ASYNC_STEP_PAST macro will
+// annotate the block prior to the call. Note that any particular event must use
+// only STEP_INTO or STEP_PAST macros; they can not mix and match. When the
+// operation completes, call ASYNC_END.
+//
+// An ASYNC trace typically occurs on a single thread (if not, they will only be
+// drawn on the thread defined in the ASYNC_BEGIN event), but all events in that
+// operation must use the same |name| and |id|. Each step can have its own
+// args.
+#define TRACE_EVENT_ASYNC_BEGIN0(category_group, name, id)        \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
+                                   category_group, name, id,      \
+                                   TRACE_EVENT_FLAG_NONE)
+#define TRACE_EVENT_ASYNC_BEGIN1(category_group, name, id, arg1_name, \
+                                 arg1_val)                            \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN,     \
+                                   category_group, name, id,          \
+                                   TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
+#define TRACE_EVENT_ASYNC_BEGIN2(category_group, name, id, arg1_name, \
+                                 arg1_val, arg2_name, arg2_val)       \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(                                   \
+      TRACE_EVENT_PHASE_ASYNC_BEGIN, category_group, name, id,        \
+      TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val, arg2_name, arg2_val)
+#define TRACE_EVENT_COPY_ASYNC_BEGIN0(category_group, name, id)   \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
+                                   category_group, name, id,      \
+                                   TRACE_EVENT_FLAG_COPY)
+#define TRACE_EVENT_COPY_ASYNC_BEGIN1(category_group, name, id, arg1_name, \
+                                      arg1_val)                            \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN,          \
+                                   category_group, name, id,               \
+                                   TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val)
+#define TRACE_EVENT_COPY_ASYNC_BEGIN2(category_group, name, id, arg1_name, \
+                                      arg1_val, arg2_name, arg2_val)       \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(                                        \
+      TRACE_EVENT_PHASE_ASYNC_BEGIN, category_group, name, id,             \
+      TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val, arg2_name, arg2_val)
+
+// Similar to TRACE_EVENT_ASYNC_BEGINx but with a custom |at| timestamp
+// provided.
+#define TRACE_EVENT_ASYNC_BEGIN_WITH_TIMESTAMP0(category_group, name, id, \
+                                                timestamp)                \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP(                     \
+      TRACE_EVENT_PHASE_ASYNC_BEGIN, category_group, name, id,            \
+      TRACE_EVENT_API_CURRENT_THREAD_ID, timestamp, TRACE_EVENT_FLAG_NONE)
+#define TRACE_EVENT_COPY_ASYNC_BEGIN_WITH_TIMESTAMP0(category_group, name, id, \
+                                                     timestamp)                \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP(                          \
+      TRACE_EVENT_PHASE_ASYNC_BEGIN, category_group, name, id,                 \
+      TRACE_EVENT_API_CURRENT_THREAD_ID, timestamp, TRACE_EVENT_FLAG_COPY)
+
+// Records a single ASYNC_STEP_INTO event for |step| immediately. If the
+// category is not enabled, then this does nothing. The |name| and |id| must
+// match the ASYNC_BEGIN event above. The |step| param identifies this step
+// within the async event. This should be called at the beginning of the next
+// phase of an asynchronous operation. The ASYNC_BEGIN event must not have any
+// ASYNC_STEP_PAST events.
+#define TRACE_EVENT_ASYNC_STEP_INTO0(category_group, name, id, step)  \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP_INTO, \
+                                   category_group, name, id,          \
+                                   TRACE_EVENT_FLAG_NONE, "step", step)
+#define TRACE_EVENT_ASYNC_STEP_INTO1(category_group, name, id, step, \
+                                     arg1_name, arg1_val)            \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(                                  \
+      TRACE_EVENT_PHASE_ASYNC_STEP_INTO, category_group, name, id,   \
+      TRACE_EVENT_FLAG_NONE, "step", step, arg1_name, arg1_val)
+
+// Similar to TRACE_EVENT_ASYNC_STEP_INTOx but with a custom |at| timestamp
+// provided.
+#define TRACE_EVENT_ASYNC_STEP_INTO_WITH_TIMESTAMP0(category_group, name, id, \
+                                                    step, timestamp)          \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP(                         \
+      TRACE_EVENT_PHASE_ASYNC_STEP_INTO, category_group, name, id,            \
+      TRACE_EVENT_API_CURRENT_THREAD_ID, timestamp, TRACE_EVENT_FLAG_NONE,    \
+      "step", step)
+
+// Records a single ASYNC_STEP_PAST event for |step| immediately. If the
+// category is not enabled, then this does nothing. The |name| and |id| must
+// match the ASYNC_BEGIN event above. The |step| param identifies this step
+// within the async event. This should be called at the beginning of the next
+// phase of an asynchronous operation. The ASYNC_BEGIN event must not have any
+// ASYNC_STEP_INTO events.
+#define TRACE_EVENT_ASYNC_STEP_PAST0(category_group, name, id, step)  \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP_PAST, \
+                                   category_group, name, id,          \
+                                   TRACE_EVENT_FLAG_NONE, "step", step)
+#define TRACE_EVENT_ASYNC_STEP_PAST1(category_group, name, id, step, \
+                                     arg1_name, arg1_val)            \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(                                  \
+      TRACE_EVENT_PHASE_ASYNC_STEP_PAST, category_group, name, id,   \
+      TRACE_EVENT_FLAG_NONE, "step", step, arg1_name, arg1_val)
+
+// Records a single ASYNC_END event for "name" immediately. If the category
+// is not enabled, then this does nothing.
+#define TRACE_EVENT_ASYNC_END0(category_group, name, id)        \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
+                                   category_group, name, id,    \
+                                   TRACE_EVENT_FLAG_NONE)
+#define TRACE_EVENT_ASYNC_END1(category_group, name, id, arg1_name, arg1_val) \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END,               \
+                                   category_group, name, id,                  \
+                                   TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
+#define TRACE_EVENT_ASYNC_END2(category_group, name, id, arg1_name, arg1_val, \
+                               arg2_name, arg2_val)                           \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(                                           \
+      TRACE_EVENT_PHASE_ASYNC_END, category_group, name, id,                  \
+      TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val, arg2_name, arg2_val)
+#define TRACE_EVENT_COPY_ASYNC_END0(category_group, name, id)   \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
+                                   category_group, name, id,    \
+                                   TRACE_EVENT_FLAG_COPY)
+#define TRACE_EVENT_COPY_ASYNC_END1(category_group, name, id, arg1_name, \
+                                    arg1_val)                            \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END,          \
+                                   category_group, name, id,             \
+                                   TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val)
+#define TRACE_EVENT_COPY_ASYNC_END2(category_group, name, id, arg1_name, \
+                                    arg1_val, arg2_name, arg2_val)       \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(                                      \
+      TRACE_EVENT_PHASE_ASYNC_END, category_group, name, id,             \
+      TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val, arg2_name, arg2_val)
+
+// Similar to TRACE_EVENT_ASYNC_ENDx but with a custom |at| timestamp provided.
+#define TRACE_EVENT_ASYNC_END_WITH_TIMESTAMP0(category_group, name, id, \
+                                              timestamp)                \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP(                   \
+      TRACE_EVENT_PHASE_ASYNC_END, category_group, name, id,            \
+      TRACE_EVENT_API_CURRENT_THREAD_ID, timestamp, TRACE_EVENT_FLAG_NONE)
+
+// NESTABLE_ASYNC_* APIs are used to describe an async operation, which can
+// be nested within a NESTABLE_ASYNC event and/or have inner NESTABLE_ASYNC
+// events.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
+// - A pair of NESTABLE_ASYNC_BEGIN event and NESTABLE_ASYNC_END event is
+//   considered as a match if their category_group, name and id all match.
+// - |id| must either be a pointer or an integer value up to 64 bits.
+//   If it's a pointer, the bits will be xored with a hash of the process ID so
+//   that the same pointer on two different processes will not collide.
+// - |id| is used to match a child NESTABLE_ASYNC event with its parent
+//   NESTABLE_ASYNC event. Therefore, events in the same nested event tree must
+//   be logged using the same id and category_group.
+//
+// Unmatched NESTABLE_ASYNC_END event will be parsed as an event that starts
+// at the first NESTABLE_ASYNC event of that id, and unmatched
+// NESTABLE_ASYNC_BEGIN event will be parsed as an event that ends at the last
+// NESTABLE_ASYNC event of that id. Corresponding warning messages for
+// unmatched events will be shown in the analysis view.
+
+// Records a single NESTABLE_ASYNC_BEGIN event called "name" immediately, with
+// 0, 1 or 2 associated arguments. If the category is not enabled, then this
+// does nothing.
+#define TRACE_EVENT_NESTABLE_ASYNC_BEGIN0(category_group, name, id)        \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_NESTABLE_ASYNC_BEGIN, \
+                                   category_group, name, id,               \
+                                   TRACE_EVENT_FLAG_NONE)
+#define TRACE_EVENT_NESTABLE_ASYNC_BEGIN1(category_group, name, id, arg1_name, \
+                                          arg1_val)                            \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_NESTABLE_ASYNC_BEGIN,     \
+                                   category_group, name, id,                   \
+                                   TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
+#define TRACE_EVENT_NESTABLE_ASYNC_BEGIN2(category_group, name, id, arg1_name, \
+                                          arg1_val, arg2_name, arg2_val)       \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(                                            \
+      TRACE_EVENT_PHASE_NESTABLE_ASYNC_BEGIN, category_group, name, id,        \
+      TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val, arg2_name, arg2_val)
+// Records a single NESTABLE_ASYNC_END event called "name" immediately, with 0
+// or 2 associated arguments. If the category is not enabled, then this does
+// nothing.
+#define TRACE_EVENT_NESTABLE_ASYNC_END0(category_group, name, id)        \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_NESTABLE_ASYNC_END, \
+                                   category_group, name, id,             \
+                                   TRACE_EVENT_FLAG_NONE)
+// Records a single NESTABLE_ASYNC_END event called "name" immediately, with 1
+// associated argument. If the category is not enabled, then this does nothing.
+#define TRACE_EVENT_NESTABLE_ASYNC_END1(category_group, name, id, arg1_name, \
+                                        arg1_val)                            \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_NESTABLE_ASYNC_END,     \
+                                   category_group, name, id,                 \
+                                   TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
+#define TRACE_EVENT_NESTABLE_ASYNC_END2(category_group, name, id, arg1_name, \
+                                        arg1_val, arg2_name, arg2_val)       \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(                                          \
+      TRACE_EVENT_PHASE_NESTABLE_ASYNC_END, category_group, name, id,        \
+      TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val, arg2_name, arg2_val)
+
+// Records a single NESTABLE_ASYNC_INSTANT event called "name" immediately,
+// with one associated argument. If the category is not enabled, then this
+// does nothing.
+#define TRACE_EVENT_NESTABLE_ASYNC_INSTANT1(category_group, name, id,        \
+                                            arg1_name, arg1_val)             \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_NESTABLE_ASYNC_INSTANT, \
+                                   category_group, name, id,                 \
+                                   TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
+// Records a single NESTABLE_ASYNC_INSTANT event called "name" immediately,
+// with 2 associated arguments. If the category is not enabled, then this
+// does nothing.
+#define TRACE_EVENT_NESTABLE_ASYNC_INSTANT2(                              \
+    category_group, name, id, arg1_name, arg1_val, arg2_name, arg2_val)   \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(                                       \
+      TRACE_EVENT_PHASE_NESTABLE_ASYNC_INSTANT, category_group, name, id, \
+      TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val, arg2_name, arg2_val)
+
+#define TRACE_EVENT_COPY_NESTABLE_ASYNC_BEGIN_WITH_TTS2(                       \
+    category_group, name, id, arg1_name, arg1_val, arg2_name, arg2_val)        \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(                                            \
+      TRACE_EVENT_PHASE_NESTABLE_ASYNC_BEGIN, category_group, name, id,        \
+      TRACE_EVENT_FLAG_ASYNC_TTS | TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val, \
+      arg2_name, arg2_val)
+#define TRACE_EVENT_COPY_NESTABLE_ASYNC_END_WITH_TTS2(                         \
+    category_group, name, id, arg1_name, arg1_val, arg2_name, arg2_val)        \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(                                            \
+      TRACE_EVENT_PHASE_NESTABLE_ASYNC_END, category_group, name, id,          \
+      TRACE_EVENT_FLAG_ASYNC_TTS | TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val, \
+      arg2_name, arg2_val)
+
+// Similar to TRACE_EVENT_NESTABLE_ASYNC_{BEGIN,END}x but with a custom
+// |timestamp| provided.
+#define TRACE_EVENT_NESTABLE_ASYNC_BEGIN_WITH_TIMESTAMP0(category_group, name, \
+                                                         id, timestamp)        \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP(                          \
+      TRACE_EVENT_PHASE_NESTABLE_ASYNC_BEGIN, category_group, name, id,        \
+      TRACE_EVENT_API_CURRENT_THREAD_ID, timestamp, TRACE_EVENT_FLAG_NONE)
+
+#define TRACE_EVENT_NESTABLE_ASYNC_END_WITH_TIMESTAMP0(category_group, name, \
+                                                       id, timestamp)        \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP(                        \
+      TRACE_EVENT_PHASE_NESTABLE_ASYNC_END, category_group, name, id,        \
+      TRACE_EVENT_API_CURRENT_THREAD_ID, timestamp, TRACE_EVENT_FLAG_NONE)
+
+#define TRACE_EVENT_COPY_NESTABLE_ASYNC_BEGIN_WITH_TIMESTAMP0(          \
+    category_group, name, id, timestamp)                                \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID_AND_TIMESTAMP(                       \
+      TRACE_EVENT_PHASE_NESTABLE_ASYNC_BEGIN, category_group, name, id, \
+      timestamp, TRACE_EVENT_FLAG_COPY)
+#define TRACE_EVENT_COPY_NESTABLE_ASYNC_END_WITH_TIMESTAMP0(          \
+    category_group, name, id, timestamp)                              \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID_AND_TIMESTAMP(                     \
+      TRACE_EVENT_PHASE_NESTABLE_ASYNC_END, category_group, name, id, \
+      timestamp, TRACE_EVENT_FLAG_COPY)
+
+// Records a single NESTABLE_ASYNC_INSTANT event called "name" immediately,
+// with 2 associated arguments. If the category is not enabled, then this
+// does nothing.
+#define TRACE_EVENT_NESTABLE_ASYNC_INSTANT2(                              \
+    category_group, name, id, arg1_name, arg1_val, arg2_name, arg2_val)   \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(                                       \
+      TRACE_EVENT_PHASE_NESTABLE_ASYNC_INSTANT, category_group, name, id, \
+      TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val, arg2_name, arg2_val)
+
+// Records a single FLOW_BEGIN event called "name" immediately, with 0, 1 or 2
+// associated arguments. If the category is not enabled, then this
+// does nothing.
+// - category and name strings must have application lifetime (statics or
+//   literals). They may not include " chars.
+// - |id| is used to match the FLOW_BEGIN event with the FLOW_END event. FLOW
+//   events are considered to match if their category_group, name and id values
+//   all match. |id| must either be a pointer or an integer value up to 64 bits.
+//   If it's a pointer, the bits will be xored with a hash of the process ID so
+//   that the same pointer on two different processes will not collide.
+// FLOW events are different from ASYNC events in how they are drawn by the
+// tracing UI. A FLOW defines asynchronous data flow, such as posting a task
+// (FLOW_BEGIN) and later executing that task (FLOW_END). Expect FLOWs to be
+// drawn as lines or arrows from FLOW_BEGIN scopes to FLOW_END scopes. Similar
+// to ASYNC, a FLOW can consist of multiple phases. The first phase is defined
+// by the FLOW_BEGIN calls. Additional phases can be defined using the FLOW_STEP
+// macros. When the operation completes, call FLOW_END. An async operation can
+// span threads and processes, but all events in that operation must use the
+// same |name| and |id|. Each event can have its own args.
+#define TRACE_EVENT_FLOW_BEGIN0(category_group, name, id)        \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_BEGIN, \
+                                   category_group, name, id,     \
+                                   TRACE_EVENT_FLAG_NONE)
+#define TRACE_EVENT_FLOW_BEGIN1(category_group, name, id, arg1_name, arg1_val) \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_BEGIN,               \
+                                   category_group, name, id,                   \
+                                   TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
+#define TRACE_EVENT_FLOW_BEGIN2(category_group, name, id, arg1_name, arg1_val, \
+                                arg2_name, arg2_val)                           \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(                                            \
+      TRACE_EVENT_PHASE_FLOW_BEGIN, category_group, name, id,                  \
+      TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val, arg2_name, arg2_val)
+#define TRACE_EVENT_COPY_FLOW_BEGIN0(category_group, name, id)   \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_BEGIN, \
+                                   category_group, name, id,     \
+                                   TRACE_EVENT_FLAG_COPY)
+#define TRACE_EVENT_COPY_FLOW_BEGIN1(category_group, name, id, arg1_name, \
+                                     arg1_val)                            \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_BEGIN,          \
+                                   category_group, name, id,              \
+                                   TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val)
+#define TRACE_EVENT_COPY_FLOW_BEGIN2(category_group, name, id, arg1_name, \
+                                     arg1_val, arg2_name, arg2_val)       \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(                                       \
+      TRACE_EVENT_PHASE_FLOW_BEGIN, category_group, name, id,             \
+      TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val, arg2_name, arg2_val)
+
+// Records a single FLOW_STEP event for |step| immediately. If the category
+// is not enabled, then this does nothing. The |name| and |id| must match the
+// FLOW_BEGIN event above. The |step| param identifies this step within the
+// async event. This should be called at the beginning of the next phase of an
+// asynchronous operation.
+#define TRACE_EVENT_FLOW_STEP0(category_group, name, id, step)  \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_STEP, \
+                                   category_group, name, id,    \
+                                   TRACE_EVENT_FLAG_NONE, "step", step)
+#define TRACE_EVENT_FLOW_STEP1(category_group, name, id, step, arg1_name, \
+                               arg1_val)                                  \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(                                       \
+      TRACE_EVENT_PHASE_FLOW_STEP, category_group, name, id,              \
+      TRACE_EVENT_FLAG_NONE, "step", step, arg1_name, arg1_val)
+#define TRACE_EVENT_COPY_FLOW_STEP0(category_group, name, id, step) \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_STEP,     \
+                                   category_group, name, id,        \
+                                   TRACE_EVENT_FLAG_COPY, "step", step)
+#define TRACE_EVENT_COPY_FLOW_STEP1(category_group, name, id, step, arg1_name, \
+                                    arg1_val)                                  \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(                                            \
+      TRACE_EVENT_PHASE_FLOW_STEP, category_group, name, id,                   \
+      TRACE_EVENT_FLAG_COPY, "step", step, arg1_name, arg1_val)
+
+// Records a single FLOW_END event for "name" immediately. If the category
+// is not enabled, then this does nothing.
+#define TRACE_EVENT_FLOW_END0(category_group, name, id)                        \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_END, category_group, \
+                                   name, id, TRACE_EVENT_FLAG_NONE)
+#define TRACE_EVENT_FLOW_END_BIND_TO_ENCLOSING0(category_group, name, id)      \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_END, category_group, \
+                                   name, id,                                   \
+                                   TRACE_EVENT_FLAG_BIND_TO_ENCLOSING)
+#define TRACE_EVENT_FLOW_END1(category_group, name, id, arg1_name, arg1_val)   \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_END, category_group, \
+                                   name, id, TRACE_EVENT_FLAG_NONE, arg1_name, \
+                                   arg1_val)
+#define TRACE_EVENT_FLOW_END2(category_group, name, id, arg1_name, arg1_val,   \
+                              arg2_name, arg2_val)                             \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_END, category_group, \
+                                   name, id, TRACE_EVENT_FLAG_NONE, arg1_name, \
+                                   arg1_val, arg2_name, arg2_val)
+#define TRACE_EVENT_COPY_FLOW_END0(category_group, name, id)                   \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_END, category_group, \
+                                   name, id, TRACE_EVENT_FLAG_COPY)
+#define TRACE_EVENT_COPY_FLOW_END1(category_group, name, id, arg1_name,        \
+                                   arg1_val)                                   \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_END, category_group, \
+                                   name, id, TRACE_EVENT_FLAG_COPY, arg1_name, \
+                                   arg1_val)
+#define TRACE_EVENT_COPY_FLOW_END2(category_group, name, id, arg1_name,        \
+                                   arg1_val, arg2_name, arg2_val)              \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_END, category_group, \
+                                   name, id, TRACE_EVENT_FLAG_COPY, arg1_name, \
+                                   arg1_val, arg2_name, arg2_val)
+
+// Macros to track the life time and value of arbitrary client objects.
+// See also TraceTrackableObject.
+#define TRACE_EVENT_OBJECT_CREATED_WITH_ID(category_group, name, id) \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(                                  \
+      TRACE_EVENT_PHASE_CREATE_OBJECT, category_group, name,         \
+      TRACE_ID_DONT_MANGLE(id), TRACE_EVENT_FLAG_NONE)
+
+#define TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(category_group, name, id, \
+                                            snapshot)                 \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(                                   \
+      TRACE_EVENT_PHASE_SNAPSHOT_OBJECT, category_group, name,        \
+      TRACE_ID_DONT_MANGLE(id), TRACE_EVENT_FLAG_NONE, "snapshot", snapshot)
+
+#define TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID_AND_TIMESTAMP(                    \
+    category_group, name, id, timestamp, snapshot)                            \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP(                         \
+      TRACE_EVENT_PHASE_SNAPSHOT_OBJECT, category_group, name,                \
+      TRACE_ID_DONT_MANGLE(id), TRACE_EVENT_API_CURRENT_THREAD_ID, timestamp, \
+      TRACE_EVENT_FLAG_NONE, "snapshot", snapshot)
+
+#define TRACE_EVENT_OBJECT_DELETED_WITH_ID(category_group, name, id) \
+  INTERNAL_TRACE_EVENT_ADD_WITH_ID(                                  \
+      TRACE_EVENT_PHASE_DELETE_OBJECT, category_group, name,         \
+      TRACE_ID_DONT_MANGLE(id), TRACE_EVENT_FLAG_NONE)
+
+// Macro to efficiently determine if a given category group is enabled.
+#define TRACE_EVENT_CATEGORY_GROUP_ENABLED(category_group, ret)             \
+  do {                                                                      \
+    INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category_group);                 \
+    if (INTERNAL_TRACE_EVENT_CATEGORY_GROUP_ENABLED_FOR_RECORDING_MODE()) { \
+      *ret = true;                                                          \
+    } else {                                                                \
+      *ret = false;                                                         \
+    }                                                                       \
+  } while (0)
+
+// Macro to explicitly warm up a given category group. This could be useful in
+// cases where we want to initialize a category group before any trace events
+// for that category group is reported. For example, to have a category group
+// always show up in the "record categories" list for manually selecting
+// settings in about://tracing.
+#define TRACE_EVENT_WARMUP_CATEGORY(category_group) \
+  INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category_group)
+
+// Macro to efficiently determine, through polling, if a new trace has begun.
+#define TRACE_EVENT_IS_NEW_TRACE(ret)                                      \
+  do {                                                                     \
+    static int INTERNAL_TRACE_EVENT_UID(lastRecordingNumber) = 0;          \
+    int num_traces_recorded = TRACE_EVENT_API_GET_NUM_TRACES_RECORDED();   \
+    if (num_traces_recorded != -1 &&                                       \
+        num_traces_recorded !=                                             \
+            INTERNAL_TRACE_EVENT_UID(lastRecordingNumber)) {               \
+      INTERNAL_TRACE_EVENT_UID(lastRecordingNumber) = num_traces_recorded; \
+      *ret = true;                                                         \
+    } else {                                                               \
+      *ret = false;                                                        \
+    }                                                                      \
+  } while (0)
+
+// Notes regarding the following definitions:
+// New values can be added and propagated to third party libraries, but existing
+// definitions must never be changed, because third party libraries may use old
+// definitions.
+
+// Phase indicates the nature of an event entry. E.g. part of a begin/end pair.
+#define TRACE_EVENT_PHASE_BEGIN ('B')
+#define TRACE_EVENT_PHASE_END ('E')
+#define TRACE_EVENT_PHASE_COMPLETE ('X')
+#define TRACE_EVENT_PHASE_INSTANT ('I')
+#define TRACE_EVENT_PHASE_ASYNC_BEGIN ('S')
+#define TRACE_EVENT_PHASE_ASYNC_STEP_INTO ('T')
+#define TRACE_EVENT_PHASE_ASYNC_STEP_PAST ('p')
+#define TRACE_EVENT_PHASE_ASYNC_END ('F')
+#define TRACE_EVENT_PHASE_NESTABLE_ASYNC_BEGIN ('b')
+#define TRACE_EVENT_PHASE_NESTABLE_ASYNC_END ('e')
+#define TRACE_EVENT_PHASE_NESTABLE_ASYNC_INSTANT ('n')
+#define TRACE_EVENT_PHASE_FLOW_BEGIN ('s')
+#define TRACE_EVENT_PHASE_FLOW_STEP ('t')
+#define TRACE_EVENT_PHASE_FLOW_END ('f')
+#define TRACE_EVENT_PHASE_METADATA ('M')
+#define TRACE_EVENT_PHASE_COUNTER ('C')
+#define TRACE_EVENT_PHASE_SAMPLE ('P')
+#define TRACE_EVENT_PHASE_CREATE_OBJECT ('N')
+#define TRACE_EVENT_PHASE_SNAPSHOT_OBJECT ('O')
+#define TRACE_EVENT_PHASE_DELETE_OBJECT ('D')
+#define TRACE_EVENT_PHASE_MEMORY_DUMP ('v')
+#define TRACE_EVENT_PHASE_MARK ('R')
+
+// Flags for changing the behavior of TRACE_EVENT_API_ADD_TRACE_EVENT.
+#define TRACE_EVENT_FLAG_NONE (static_cast<unsigned int>(0))
+#define TRACE_EVENT_FLAG_COPY (static_cast<unsigned int>(1 << 0))
+#define TRACE_EVENT_FLAG_HAS_ID (static_cast<unsigned int>(1 << 1))
+#define TRACE_EVENT_FLAG_MANGLE_ID (static_cast<unsigned int>(1 << 2))
+#define TRACE_EVENT_FLAG_SCOPE_OFFSET (static_cast<unsigned int>(1 << 3))
+#define TRACE_EVENT_FLAG_SCOPE_EXTRA (static_cast<unsigned int>(1 << 4))
+#define TRACE_EVENT_FLAG_EXPLICIT_TIMESTAMP (static_cast<unsigned int>(1 << 5))
+#define TRACE_EVENT_FLAG_ASYNC_TTS (static_cast<unsigned int>(1 << 6))
+#define TRACE_EVENT_FLAG_BIND_TO_ENCLOSING (static_cast<unsigned int>(1 << 7))
+#define TRACE_EVENT_FLAG_FLOW_IN (static_cast<unsigned int>(1 << 8))
+#define TRACE_EVENT_FLAG_FLOW_OUT (static_cast<unsigned int>(1 << 9))
+#define TRACE_EVENT_FLAG_HAS_CONTEXT_ID (static_cast<unsigned int>(1 << 10))
+
+#define TRACE_EVENT_FLAG_SCOPE_MASK                          \
+  (static_cast<unsigned int>(TRACE_EVENT_FLAG_SCOPE_OFFSET | \
+                             TRACE_EVENT_FLAG_SCOPE_EXTRA))
+
+// Type values for identifying types in the TraceValue union.
+#define TRACE_VALUE_TYPE_BOOL (static_cast<unsigned char>(1))
+#define TRACE_VALUE_TYPE_UINT (static_cast<unsigned char>(2))
+#define TRACE_VALUE_TYPE_INT (static_cast<unsigned char>(3))
+#define TRACE_VALUE_TYPE_DOUBLE (static_cast<unsigned char>(4))
+#define TRACE_VALUE_TYPE_POINTER (static_cast<unsigned char>(5))
+#define TRACE_VALUE_TYPE_STRING (static_cast<unsigned char>(6))
+#define TRACE_VALUE_TYPE_COPY_STRING (static_cast<unsigned char>(7))
+#define TRACE_VALUE_TYPE_CONVERTABLE (static_cast<unsigned char>(8))
+
+// Enum reflecting the scope of an INSTANT event. Must fit within
+// TRACE_EVENT_FLAG_SCOPE_MASK.
+#define TRACE_EVENT_SCOPE_GLOBAL (static_cast<unsigned char>(0 << 3))
+#define TRACE_EVENT_SCOPE_PROCESS (static_cast<unsigned char>(1 << 3))
+#define TRACE_EVENT_SCOPE_THREAD (static_cast<unsigned char>(2 << 3))
+
+#define TRACE_EVENT_SCOPE_NAME_GLOBAL ('g')
+#define TRACE_EVENT_SCOPE_NAME_PROCESS ('p')
+#define TRACE_EVENT_SCOPE_NAME_THREAD ('t')
diff --git a/gfx/skia/skia/src/core/SkTypeface.cpp b/gfx/skia/skia/src/core/SkTypeface.cpp
index 01b534c95fa4..e6a9b4d66cd0 100644
--- a/gfx/skia/skia/src/core/SkTypeface.cpp
+++ b/gfx/skia/skia/src/core/SkTypeface.cpp
@@ -8,98 +8,87 @@
 #include "SkAdvancedTypefaceMetrics.h"
 #include "SkEndian.h"
 #include "SkFontDescriptor.h"
-#include "SkFontHost.h"
-#include "SkLazyPtr.h"
+#include "SkFontMgr.h"
+#include "SkMutex.h"
 #include "SkOTTable_OS_2.h"
+#include "SkOncePtr.h"
 #include "SkStream.h"
 #include "SkTypeface.h"
 
-//#define TRACE_LIFECYCLE
+SkTypeface::SkTypeface(const SkFontStyle& style, SkFontID fontID, bool isFixedPitch)
+    : fUniqueID(fontID), fStyle(style), fIsFixedPitch(isFixedPitch) { }
 
-#ifdef TRACE_LIFECYCLE
-    static int32_t gTypefaceCounter;
+SkTypeface::~SkTypeface() { }
+
+#ifdef SK_WHITELIST_SERIALIZED_TYPEFACES
+extern void WhitelistSerializeTypeface(const SkTypeface*, SkWStream* );
+#define SK_TYPEFACE_DELEGATE WhitelistSerializeTypeface
+#else
+#define SK_TYPEFACE_DELEGATE nullptr
 #endif
 
-SkTypeface::SkTypeface(Style style, SkFontID fontID, bool isFixedPitch)
-    : fUniqueID(fontID), fStyle(style), fIsFixedPitch(isFixedPitch) {
-#ifdef TRACE_LIFECYCLE
-    SkDebugf("SkTypeface: create  %p fontID %d total %d\n",
-             this, fontID, ++gTypefaceCounter);
-#endif
-}
-
-SkTypeface::~SkTypeface() {
-#ifdef TRACE_LIFECYCLE
-    SkDebugf("SkTypeface: destroy %p fontID %d total %d\n",
-             this, fUniqueID, --gTypefaceCounter);
-#endif
-}
+SkTypeface* (*gCreateTypefaceDelegate)(const char [], SkTypeface::Style ) = nullptr;
+void (*gSerializeTypefaceDelegate)(const SkTypeface*, SkWStream* ) = SK_TYPEFACE_DELEGATE;
+SkTypeface* (*gDeserializeTypefaceDelegate)(SkStream* ) = nullptr;
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class SkEmptyTypeface : public SkTypeface {
 public:
-    static SkEmptyTypeface* Create() {
-        return SkNEW(SkEmptyTypeface);
-    }
+    static SkEmptyTypeface* Create() { return new SkEmptyTypeface; }
 protected:
-    SkEmptyTypeface() : SkTypeface(SkTypeface::kNormal, 0, true) { }
+    SkEmptyTypeface() : SkTypeface(SkFontStyle(), 0, true) { }
 
-    virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE { return NULL; }
-    virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE {
-        return NULL;
+    SkStreamAsset* onOpenStream(int* ttcIndex) const override { return nullptr; }
+    SkScalerContext* onCreateScalerContext(const SkDescriptor*) const override {
+        return nullptr;
     }
-    virtual void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE { }
+    void onFilterRec(SkScalerContextRec*) const override { }
     virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
-                                SkAdvancedTypefaceMetrics::PerGlyphInfo,
-                                const uint32_t*, uint32_t) const SK_OVERRIDE { return NULL; }
-    virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE { }
+                                PerGlyphInfo,
+                                const uint32_t*, uint32_t) const override { return nullptr; }
+    void onGetFontDescriptor(SkFontDescriptor*, bool*) const override { }
     virtual int onCharsToGlyphs(const void* chars, Encoding encoding,
-                                uint16_t glyphs[], int glyphCount) const SK_OVERRIDE {
+                                uint16_t glyphs[], int glyphCount) const override {
         if (glyphs && glyphCount > 0) {
             sk_bzero(glyphs, glyphCount * sizeof(glyphs[0]));
         }
         return 0;
     }
-    virtual int onCountGlyphs() const SK_OVERRIDE { return 0; };
-    virtual int onGetUPEM() const SK_OVERRIDE { return 0; };
+    int onCountGlyphs() const override { return 0; };
+    int onGetUPEM() const override { return 0; };
     class EmptyLocalizedStrings : public SkTypeface::LocalizedStrings {
     public:
-        virtual bool next(SkTypeface::LocalizedString*) SK_OVERRIDE { return false; }
+        bool next(SkTypeface::LocalizedString*) override { return false; }
     };
-    virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE {
-        return SkNEW(EmptyLocalizedStrings);
+    void onGetFamilyName(SkString* familyName) const override {
+        familyName->reset();
+    }
+    SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override {
+        return new EmptyLocalizedStrings;
     };
-    virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE { return 0; }
-    virtual size_t onGetTableData(SkFontTableTag, size_t, size_t, void*) const SK_OVERRIDE {
+    int onGetTableTags(SkFontTableTag tags[]) const override { return 0; }
+    size_t onGetTableData(SkFontTableTag, size_t, size_t, void*) const override {
         return 0;
     }
 };
 
 SK_DECLARE_STATIC_MUTEX(gCreateDefaultMutex);
-SkTypeface* SkTypeface::CreateDefault(int style) {
-    // If backed by fontconfig, it's not safe to call SkFontHost::CreateTypeface concurrently.
-    // To be safe, we serialize here with a mutex so only one call to
-    // CreateTypeface is happening at any given time.
-    // TODO(bungeman, mtklein): This is sad.  Make our fontconfig code safe?
-    SkAutoMutexAcquire lock(&gCreateDefaultMutex);
-
-    SkTypeface* t = SkFontHost::CreateTypeface(NULL, NULL, (Style)style);
-    return t ? t : SkEmptyTypeface::Create();
-}
-
-void SkTypeface::DeleteDefault(SkTypeface* t) {
-    // The SkTypeface returned by SkFontHost::CreateTypeface may _itself_ be a
-    // cleverly-shared singleton.  This is less than ideal.  This means we
-    // cannot just assert our ownership and SkDELETE(t) like we'd want to.
-    SkSafeUnref(t);
-}
+SK_DECLARE_STATIC_ONCE_PTR(SkTypeface, defaults[4]);
 
 SkTypeface* SkTypeface::GetDefaultTypeface(Style style) {
-    SK_DECLARE_STATIC_LAZY_PTR_ARRAY(SkTypeface, defaults, 4, CreateDefault, DeleteDefault);
-
     SkASSERT((int)style < 4);
-    return defaults[style];
+    return defaults[style].get([=]{
+        // It is not safe to call FontConfigTypeface::LegacyCreateTypeface concurrently.
+        // To be safe, we serialize here with a mutex so only one call to
+        // CreateTypeface is happening at any given time.
+        // TODO(bungeman, mtklein): This is sad.  Make our fontconfig code safe?
+        SkAutoMutexAcquire lock(&gCreateDefaultMutex);
+
+        SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
+        SkTypeface* t = fm->legacyCreateTypeface(nullptr, style);
+        return t ? t : SkEmptyTypeface::Create();
+    });
 }
 
 SkTypeface* SkTypeface::RefDefault(Style style) {
@@ -107,94 +96,105 @@ SkTypeface* SkTypeface::RefDefault(Style style) {
 }
 
 uint32_t SkTypeface::UniqueID(const SkTypeface* face) {
-    if (NULL == face) {
+    if (nullptr == face) {
         face = GetDefaultTypeface();
     }
     return face->uniqueID();
 }
 
 bool SkTypeface::Equal(const SkTypeface* facea, const SkTypeface* faceb) {
-    return SkTypeface::UniqueID(facea) == SkTypeface::UniqueID(faceb);
+    return facea == faceb || SkTypeface::UniqueID(facea) == SkTypeface::UniqueID(faceb);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkTypeface* SkTypeface::CreateFromName(const char name[], Style style) {
-    if (NULL == name) {
+    if (gCreateTypefaceDelegate) {
+        SkTypeface* result = (*gCreateTypefaceDelegate)(name, style);
+        if (result) {
+            return result;
+        }
+    }
+    if (nullptr == name) {
         return RefDefault(style);
     }
-    return SkFontHost::CreateTypeface(NULL, name, style);
+    SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
+    return fm->legacyCreateTypeface(name, style);
 }
 
 SkTypeface* SkTypeface::CreateFromTypeface(const SkTypeface* family, Style s) {
-    if (family && family->style() == s) {
+    if (!family) {
+        return SkTypeface::RefDefault(s);
+    }
+
+    if (family->style() == s) {
         family->ref();
         return const_cast<SkTypeface*>(family);
     }
-    return SkFontHost::CreateTypeface(family, NULL, s);
+
+    SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
+    bool bold = s & SkTypeface::kBold;
+    bool italic = s & SkTypeface::kItalic;
+    SkFontStyle newStyle = SkFontStyle(bold ? SkFontStyle::kBold_Weight
+                                            : SkFontStyle::kNormal_Weight,
+                                       SkFontStyle::kNormal_Width,
+                                       italic ? SkFontStyle::kItalic_Slant
+                                              : SkFontStyle::kUpright_Slant);
+    return fm->matchFaceStyle(family, newStyle);
 }
 
-SkTypeface* SkTypeface::CreateFromStream(SkStream* stream) {
-    return SkFontHost::CreateTypefaceFromStream(stream);
+SkTypeface* SkTypeface::CreateFromStream(SkStreamAsset* stream, int index) {
+    SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
+    return fm->createFromStream(stream, index);
 }
 
-SkTypeface* SkTypeface::CreateFromFile(const char path[]) {
-    return SkFontHost::CreateTypefaceFromFile(path);
+SkTypeface* SkTypeface::CreateFromFontData(SkFontData* data) {
+    SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
+    return fm->createFromFontData(data);
+}
+
+SkTypeface* SkTypeface::CreateFromFile(const char path[], int index) {
+    SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
+    return fm->createFromFile(path, index);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkTypeface::serialize(SkWStream* wstream) const {
+    if (gSerializeTypefaceDelegate) {
+        (*gSerializeTypefaceDelegate)(this, wstream);
+        return;
+    }
     bool isLocal = false;
     SkFontDescriptor desc(this->style());
     this->onGetFontDescriptor(&desc, &isLocal);
 
-    desc.serialize(wstream);
-    if (isLocal) {
-        int ttcIndex;   // TODO: write this to the stream?
-        SkAutoTUnref<SkStream> rstream(this->openStream(&ttcIndex));
-        if (rstream.get()) {
-            size_t length = rstream->getLength();
-            wstream->writePackedUInt(length);
-            wstream->writeStream(rstream, length);
-        } else {
-            wstream->writePackedUInt(0);
-        }
-    } else {
-        wstream->writePackedUInt(0);
+    // Embed font data if it's a local font.
+    if (isLocal && !desc.hasFontData()) {
+        desc.setFontData(this->onCreateFontData());
     }
+    desc.serialize(wstream);
 }
 
 SkTypeface* SkTypeface::Deserialize(SkStream* stream) {
+    if (gDeserializeTypefaceDelegate) {
+        return (*gDeserializeTypefaceDelegate)(stream);
+    }
     SkFontDescriptor desc(stream);
-    size_t length = stream->readPackedUInt();
-    if (length > 0) {
-        void* addr = sk_malloc_flags(length, 0);
-        if (addr) {
-            SkAutoTUnref<SkMemoryStream> localStream(SkNEW(SkMemoryStream));
-            localStream->setMemoryOwned(addr, length);
-
-            if (stream->read(addr, length) == length) {
-                return SkTypeface::CreateFromStream(localStream.get());
-            } else {
-                // Failed to read the full font data, so fall through and try to create from name.
-                // If this is because of EOF, all subsequent reads from the stream will be EOF.
-                // If this is because of a stream error, the stream is in an error state,
-                // do not attempt to skip any remaining bytes.
-            }
-        } else {
-            // failed to allocate, so just skip and create-from-name
-            stream->skip(length);
+    SkFontData* data = desc.detachFontData();
+    if (data) {
+        SkTypeface* typeface = SkTypeface::CreateFromFontData(data);
+        if (typeface) {
+            return typeface;
         }
     }
-
     return SkTypeface::CreateFromName(desc.getFamilyName(), desc.getStyle());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 int SkTypeface::countTables() const {
-    return this->onGetTableTags(NULL);
+    return this->onGetTableTags(nullptr);
 }
 
 int SkTypeface::getTableTags(SkFontTableTag tags[]) const {
@@ -202,7 +202,7 @@ int SkTypeface::getTableTags(SkFontTableTag tags[]) const {
 }
 
 size_t SkTypeface::getTableSize(SkFontTableTag tag) const {
-    return this->onGetTableData(tag, 0, ~0U, NULL);
+    return this->onGetTableData(tag, 0, ~0U, nullptr);
 }
 
 size_t SkTypeface::getTableData(SkFontTableTag tag, size_t offset, size_t length,
@@ -210,21 +210,32 @@ size_t SkTypeface::getTableData(SkFontTableTag tag, size_t offset, size_t length
     return this->onGetTableData(tag, offset, length, data);
 }
 
-SkStream* SkTypeface::openStream(int* ttcIndex) const {
+SkStreamAsset* SkTypeface::openStream(int* ttcIndex) const {
     int ttcIndexStorage;
-    if (NULL == ttcIndex) {
+    if (nullptr == ttcIndex) {
         // So our subclasses don't need to check for null param
         ttcIndex = &ttcIndexStorage;
     }
     return this->onOpenStream(ttcIndex);
 }
 
+SkFontData* SkTypeface::createFontData() const {
+    return this->onCreateFontData();
+}
+
+// This implementation is temporary until this method can be made pure virtual.
+SkFontData* SkTypeface::onCreateFontData() const {
+    int index;
+    SkAutoTDelete<SkStreamAsset> stream(this->onOpenStream(&index));
+    return new SkFontData(stream.detach(), index, nullptr, 0);
+};
+
 int SkTypeface::charsToGlyphs(const void* chars, Encoding encoding,
                               uint16_t glyphs[], int glyphCount) const {
     if (glyphCount <= 0) {
         return 0;
     }
-    if (NULL == chars || (unsigned)encoding > kUTF32_Encoding) {
+    if (nullptr == chars || (unsigned)encoding > kUTF32_Encoding) {
         if (glyphs) {
             sk_bzero(glyphs, glyphCount * sizeof(glyphs[0]));
         }
@@ -245,13 +256,13 @@ int SkTypeface::getUnitsPerEm() const {
 bool SkTypeface::getKerningPairAdjustments(const uint16_t glyphs[], int count,
                                            int32_t adjustments[]) const {
     SkASSERT(count >= 0);
-    // check for the only legal way to pass a NULL.. everything is 0
+    // check for the only legal way to pass a nullptr.. everything is 0
     // in which case they just want to know if this face can possibly support
     // kerning (true) or never (false).
-    if (NULL == glyphs || NULL == adjustments) {
-        SkASSERT(NULL == glyphs);
+    if (nullptr == glyphs || nullptr == adjustments) {
+        SkASSERT(nullptr == glyphs);
         SkASSERT(0 == count);
-        SkASSERT(NULL == adjustments);
+        SkASSERT(nullptr == adjustments);
     }
     return this->onGetKerningPairAdjustments(glyphs, count, adjustments);
 }
@@ -261,14 +272,12 @@ SkTypeface::LocalizedStrings* SkTypeface::createFamilyNameIterator() const {
 }
 
 void SkTypeface::getFamilyName(SkString* name) const {
-    bool isLocal = false;
-    SkFontDescriptor desc(this->style());
-    this->onGetFontDescriptor(&desc, &isLocal);
-    name->set(desc.getFamilyName());
+    SkASSERT(name);
+    this->onGetFamilyName(name);
 }
 
 SkAdvancedTypefaceMetrics* SkTypeface::getAdvancedTypefaceMetrics(
-                                SkAdvancedTypefaceMetrics::PerGlyphInfo info,
+                                PerGlyphInfo info,
                                 const uint32_t* glyphIDs,
                                 uint32_t glyphIDsCount) const {
     SkAdvancedTypefaceMetrics* result =
@@ -295,9 +304,53 @@ SkAdvancedTypefaceMetrics* SkTypeface::getAdvancedTypefaceMetrics(
     return result;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-
 bool SkTypeface::onGetKerningPairAdjustments(const uint16_t glyphs[], int count,
                                              int32_t adjustments[]) const {
     return false;
 }
+
+///////////////////////////////////////////////////////////////////////////////
+
+#include "SkDescriptor.h"
+#include "SkPaint.h"
+
+SkRect SkTypeface::getBounds() const {
+    return *fLazyBounds.get([&] {
+        SkRect* rect = new SkRect;
+        if (!this->onComputeBounds(rect)) {
+            rect->setEmpty();
+        }
+        return rect;
+    });
+}
+
+bool SkTypeface::onComputeBounds(SkRect* bounds) const {
+    // we use a big size to ensure lots of significant bits from the scalercontext.
+    // then we scale back down to return our final answer (at 1-pt)
+    const SkScalar textSize = 2048;
+    const SkScalar invTextSize = 1 / textSize;
+
+    SkPaint paint;
+    paint.setTypeface(const_cast<SkTypeface*>(this));
+    paint.setTextSize(textSize);
+    paint.setLinearText(true);
+
+    SkScalerContext::Rec rec;
+    SkScalerContext::MakeRec(paint, nullptr, nullptr, &rec);
+
+    SkAutoDescriptor ad(sizeof(rec) + SkDescriptor::ComputeOverhead(1));
+    SkDescriptor*    desc = ad.getDesc();
+    desc->init();
+    desc->addEntry(kRec_SkDescriptorTag, sizeof(rec), &rec);
+
+    SkAutoTDelete<SkScalerContext> ctx(this->createScalerContext(desc, true));
+    if (ctx.get()) {
+        SkPaint::FontMetrics fm;
+        ctx->getFontMetrics(&fm);
+        bounds->set(fm.fXMin * invTextSize, fm.fTop * invTextSize,
+                    fm.fXMax * invTextSize, fm.fBottom * invTextSize);
+        return true;
+    }
+    return false;
+}
+
diff --git a/gfx/skia/skia/src/core/SkTypefaceCache.cpp b/gfx/skia/skia/src/core/SkTypefaceCache.cpp
index f864e1c9dc51..5fe080d05d82 100644
--- a/gfx/skia/skia/src/core/SkTypefaceCache.cpp
+++ b/gfx/skia/skia/src/core/SkTypefaceCache.cpp
@@ -9,7 +9,8 @@
 
 
 #include "SkTypefaceCache.h"
-#include "SkThread.h"
+#include "SkAtomics.h"
+#include "SkMutex.h"
 
 #define TYPEFACE_CACHE_LIMIT    1024
 
@@ -19,43 +20,19 @@ SkTypefaceCache::~SkTypefaceCache() {
     const Rec* curr = fArray.begin();
     const Rec* stop = fArray.end();
     while (curr < stop) {
-        if (curr->fStrong) {
-            curr->fFace->unref();
-        } else {
-            curr->fFace->weak_unref();
-        }
+        curr->fFace->unref();
         curr += 1;
     }
 }
 
-void SkTypefaceCache::add(SkTypeface* face,
-                          SkTypeface::Style requestedStyle,
-                          bool strong) {
+void SkTypefaceCache::add(SkTypeface* face, const SkFontStyle& requestedStyle) {
     if (fArray.count() >= TYPEFACE_CACHE_LIMIT) {
         this->purge(TYPEFACE_CACHE_LIMIT >> 2);
     }
 
     Rec* rec = fArray.append();
-    rec->fFace = face;
+    rec->fFace = SkRef(face);
     rec->fRequestedStyle = requestedStyle;
-    rec->fStrong = strong;
-    if (strong) {
-        face->ref();
-    } else {
-        face->weak_ref();
-    }
-}
-
-SkTypeface* SkTypefaceCache::findByID(SkFontID fontID) const {
-    const Rec* curr = fArray.begin();
-    const Rec* stop = fArray.end();
-    while (curr < stop) {
-        if (curr->fFace->uniqueID() == fontID) {
-            return curr->fFace;
-        }
-        curr += 1;
-    }
-    return NULL;
 }
 
 SkTypeface* SkTypefaceCache::findByProcAndRef(FindProc proc, void* ctx) const {
@@ -64,18 +41,11 @@ SkTypeface* SkTypefaceCache::findByProcAndRef(FindProc proc, void* ctx) const {
     while (curr < stop) {
         SkTypeface* currFace = curr->fFace;
         if (proc(currFace, curr->fRequestedStyle, ctx)) {
-            if (curr->fStrong) {
-                currFace->ref();
-                return currFace;
-            } else if (currFace->try_ref()) {
-                return currFace;
-            } else {
-                //remove currFace from fArray?
-            }
+            return SkRef(currFace);
         }
         curr += 1;
     }
-    return NULL;
+    return nullptr;
 }
 
 void SkTypefaceCache::purge(int numToPurge) {
@@ -83,13 +53,8 @@ void SkTypefaceCache::purge(int numToPurge) {
     int i = 0;
     while (i < count) {
         SkTypeface* face = fArray[i].fFace;
-        bool strong = fArray[i].fStrong;
-        if ((strong && face->unique()) || (!strong && face->weak_expired())) {
-            if (strong) {
-                face->unref();
-            } else {
-                face->weak_unref();
-            }
+        if (face->unique()) {
+            face->unref();
             fArray.remove(i);
             --count;
             if (--numToPurge == 0) {
@@ -119,16 +84,9 @@ SkFontID SkTypefaceCache::NewFontID() {
 
 SK_DECLARE_STATIC_MUTEX(gMutex);
 
-void SkTypefaceCache::Add(SkTypeface* face,
-                          SkTypeface::Style requestedStyle,
-                          bool strong) {
+void SkTypefaceCache::Add(SkTypeface* face, const SkFontStyle& requestedStyle) {
     SkAutoMutexAcquire ama(gMutex);
-    Get().add(face, requestedStyle, strong);
-}
-
-SkTypeface* SkTypefaceCache::FindByID(SkFontID fontID) {
-    SkAutoMutexAcquire ama(gMutex);
-    return Get().findByID(fontID);
+    Get().add(face, requestedStyle);
 }
 
 SkTypeface* SkTypefaceCache::FindByProcAndRef(FindProc proc, void* ctx) {
@@ -145,9 +103,9 @@ void SkTypefaceCache::PurgeAll() {
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef SK_DEBUG
-static bool DumpProc(SkTypeface* face, SkTypeface::Style style, void* ctx) {
-    SkDebugf("SkTypefaceCache: face %p fontID %d style %d refcnt %d\n",
-             face, face->uniqueID(), style, face->getRefCnt());
+static bool DumpProc(SkTypeface* face, const SkFontStyle& s, void* ctx) {
+    SkDebugf("SkTypefaceCache: face %p fontID %d weight %d width %d style %d refcnt %d\n",
+             face, face->uniqueID(), s.weight(), s.width(), s.slant(), face->getRefCnt());
     return false;
 }
 #endif
@@ -155,6 +113,6 @@ static bool DumpProc(SkTypeface* face, SkTypeface::Style style, void* ctx) {
 void SkTypefaceCache::Dump() {
 #ifdef SK_DEBUG
     SkAutoMutexAcquire ama(gMutex);
-    (void)Get().findByProcAndRef(DumpProc, NULL);
+    (void)Get().findByProcAndRef(DumpProc, nullptr);
 #endif
 }
diff --git a/gfx/skia/skia/src/core/SkTypefaceCache.h b/gfx/skia/skia/src/core/SkTypefaceCache.h
index ae37ab76ec4b..f39b0d7a44cb 100644
--- a/gfx/skia/skia/src/core/SkTypefaceCache.h
+++ b/gfx/skia/skia/src/core/SkTypefaceCache.h
@@ -31,7 +31,7 @@ public:
      * for the given context. The passed typeface is owned by the cache and is
      * not additionally ref()ed. The typeface may be in the disposed state.
      */
-    typedef bool (*FindProc)(SkTypeface*, SkTypeface::Style, void* context);
+    typedef bool(*FindProc)(SkTypeface*, const SkFontStyle&, void* context);
 
     /**
      *  Add a typeface to the cache. This ref()s the typeface, so that the
@@ -39,20 +39,12 @@ public:
      *  whose refcnt is 1 (meaning only the cache is an owner) will be
      *  unref()ed.
      */
-    void add(SkTypeface*, SkTypeface::Style requested, bool strong = true);
-
-    /**
-     *  Search the cache for a typeface with the specified fontID (uniqueID).
-     *  If one is found, return it (its reference count is unmodified). If none
-     *  is found, return NULL. The reference count is unmodified as it is
-     *  assumed that the stack will contain a ref to the typeface.
-     */
-    SkTypeface* findByID(SkFontID findID) const;
+    void add(SkTypeface*, const SkFontStyle& requested);
 
     /**
      *  Iterate through the cache, calling proc(typeface, ctx) with each
      *  typeface. If proc returns true, then we return that typeface (this
-     *  ref()s the typeface). If it never returns true, we return NULL.
+     *  ref()s the typeface). If it never returns true, we return nullptr.
      */
     SkTypeface* findByProcAndRef(FindProc proc, void* ctx) const;
 
@@ -72,10 +64,7 @@ public:
 
     // These are static wrappers around a global instance of a cache.
 
-    static void Add(SkTypeface*,
-                    SkTypeface::Style requested,
-                    bool strong = true);
-    static SkTypeface* FindByID(SkFontID fontID);
+    static void Add(SkTypeface*, const SkFontStyle& requested);
     static SkTypeface* FindByProcAndRef(FindProc proc, void* ctx);
     static void PurgeAll();
 
@@ -90,9 +79,8 @@ private:
     void purge(int count);
 
     struct Rec {
-        SkTypeface*         fFace;
-        bool                fStrong;
-        SkTypeface::Style   fRequestedStyle;
+        SkTypeface* fFace;
+        SkFontStyle fRequestedStyle;
     };
     SkTDArray<Rec> fArray;
 };
diff --git a/gfx/skia/skia/src/core/SkUtils.cpp b/gfx/skia/skia/src/core/SkUtils.cpp
index eff718b20fbf..b3f698b4e7b1 100644
--- a/gfx/skia/skia/src/core/SkUtils.cpp
+++ b/gfx/skia/skia/src/core/SkUtils.cpp
@@ -8,148 +8,6 @@
 
 
 #include "SkUtils.h"
-#include "SkLazyFnPtr.h"
-
-#if 0
-#define assign_16_longs(dst, value)             \
-    do {                                        \
-        (dst)[0] = value;   (dst)[1] = value;   \
-        (dst)[2] = value;   (dst)[3] = value;   \
-        (dst)[4] = value;   (dst)[5] = value;   \
-        (dst)[6] = value;   (dst)[7] = value;   \
-        (dst)[8] = value;   (dst)[9] = value;   \
-        (dst)[10] = value;  (dst)[11] = value;  \
-        (dst)[12] = value;  (dst)[13] = value;  \
-        (dst)[14] = value;  (dst)[15] = value;  \
-    } while (0)
-#else
-#define assign_16_longs(dst, value)             \
-    do {                                        \
-        *(dst)++ = value;   *(dst)++ = value;   \
-        *(dst)++ = value;   *(dst)++ = value;   \
-        *(dst)++ = value;   *(dst)++ = value;   \
-        *(dst)++ = value;   *(dst)++ = value;   \
-        *(dst)++ = value;   *(dst)++ = value;   \
-        *(dst)++ = value;   *(dst)++ = value;   \
-        *(dst)++ = value;   *(dst)++ = value;   \
-        *(dst)++ = value;   *(dst)++ = value;   \
-    } while (0)
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-
-static void sk_memset16_portable(uint16_t dst[], uint16_t value, int count) {
-    SkASSERT(dst != NULL && count >= 0);
-
-    if (count <= 0) {
-        return;
-    }
-
-    // not sure if this helps to short-circuit on small values of count
-    if (count < 8) {
-        do {
-            *dst++ = (uint16_t)value;
-        } while (--count != 0);
-        return;
-    }
-
-    // ensure we're on a long boundary
-    if ((size_t)dst & 2) {
-        *dst++ = (uint16_t)value;
-        count -= 1;
-    }
-
-    uint32_t value32 = ((uint32_t)value << 16) | value;
-
-    // handle the bulk with our unrolled macro
-    {
-        int sixteenlongs = count >> 5;
-        if (sixteenlongs) {
-            uint32_t* dst32 = (uint32_t*)dst;
-            do {
-                assign_16_longs(dst32, value32);
-            } while (--sixteenlongs != 0);
-            dst = (uint16_t*)dst32;
-            count &= 31;
-        }
-    }
-
-    // handle (most) of the rest
-    {
-        int longs = count >> 1;
-        if (longs) {
-            do {
-                *(uint32_t*)dst = value32;
-                dst += 2;
-            } while (--longs != 0);
-        }
-    }
-
-    // cleanup a possible trailing short
-    if (count & 1) {
-        *dst = (uint16_t)value;
-    }
-}
-
-static void sk_memset32_portable(uint32_t dst[], uint32_t value, int count) {
-    SkASSERT(dst != NULL && count >= 0);
-
-    int sixteenlongs = count >> 4;
-    if (sixteenlongs) {
-        do {
-            assign_16_longs(dst, value);
-        } while (--sixteenlongs != 0);
-        count &= 15;
-    }
-
-    if (count) {
-        do {
-            *dst++ = value;
-        } while (--count != 0);
-    }
-}
-
-static void sk_memcpy32_portable(uint32_t dst[], const uint32_t src[], int count) {
-    memcpy(dst, src, count * sizeof(uint32_t));
-}
-
-namespace {
-// These three methods technically need external linkage to be passed as template parameters.
-// Since they can't be static, we hide them in an anonymous namespace instead.
-
-SkMemset16Proc choose_memset16() {
-    SkMemset16Proc proc = SkMemset16GetPlatformProc();
-    return proc ? proc : sk_memset16_portable;
-}
-
-SkMemset32Proc choose_memset32() {
-    SkMemset32Proc proc = SkMemset32GetPlatformProc();
-    return proc ? proc : sk_memset32_portable;
-}
-
-SkMemcpy32Proc choose_memcpy32() {
-    SkMemcpy32Proc proc = SkMemcpy32GetPlatformProc();
-    return proc ? proc : sk_memcpy32_portable;
-}
-
-}  // namespace
-
-void sk_memset16(uint16_t dst[], uint16_t value, int count) {
-    SK_DECLARE_STATIC_LAZY_FN_PTR(SkMemset16Proc, proc, choose_memset16);
-    proc.get()(dst, value, count);
-}
-
-void sk_memset32(uint32_t dst[], uint32_t value, int count) {
-    SK_DECLARE_STATIC_LAZY_FN_PTR(SkMemset32Proc, proc, choose_memset32);
-    proc.get()(dst, value, count);
-}
-
-void sk_memcpy32(uint32_t dst[], const uint32_t src[], int count) {
-    SK_DECLARE_STATIC_LAZY_FN_PTR(SkMemcpy32Proc, proc, choose_memcpy32);
-    proc.get()(dst, src, count);
-}
-
-///////////////////////////////////////////////////////////////////////////////
 
 /*  0xxxxxxx    1 total
     10xxxxxx    // never a leading byte
@@ -193,7 +51,7 @@ int SkUTF8_CountUnichars(const char utf8[]) {
 }
 
 int SkUTF8_CountUnichars(const char utf8[], size_t byteLength) {
-    SkASSERT(NULL != utf8 || 0 == byteLength);
+    SkASSERT(utf8 || 0 == byteLength);
 
     int         count = 0;
     const char* stop = utf8 + byteLength;
@@ -206,7 +64,7 @@ int SkUTF8_CountUnichars(const char utf8[], size_t byteLength) {
 }
 
 SkUnichar SkUTF8_ToUnichar(const char utf8[]) {
-    SkASSERT(NULL != utf8);
+    SkASSERT(utf8);
 
     const uint8_t*  p = (const uint8_t*)utf8;
     int             c = *p;
@@ -227,7 +85,7 @@ SkUnichar SkUTF8_ToUnichar(const char utf8[]) {
 }
 
 SkUnichar SkUTF8_NextUnichar(const char** ptr) {
-    SkASSERT(NULL != ptr && NULL != *ptr);
+    SkASSERT(ptr && *ptr);
 
     const uint8_t*  p = (const uint8_t*)*ptr;
     int             c = *p;
@@ -249,7 +107,7 @@ SkUnichar SkUTF8_NextUnichar(const char** ptr) {
 }
 
 SkUnichar SkUTF8_PrevUnichar(const char** ptr) {
-    SkASSERT(NULL != ptr && NULL != *ptr);
+    SkASSERT(ptr && *ptr);
 
     const char* p = *ptr;
 
@@ -297,7 +155,7 @@ size_t SkUTF8_FromUnichar(SkUnichar uni, char utf8[]) {
         *--utf8 = (char)(~(0xFF >> count) | uni);
     }
 
-    SkASSERT(utf8 == NULL || orig == SkUTF8_ToUnichar(utf8));
+    SkASSERT(utf8 == nullptr || orig == SkUTF8_ToUnichar(utf8));
     return count;
 }
 
@@ -402,14 +260,14 @@ size_t SkUTF16_ToUTF8(const uint16_t utf16[], int numberOf16BitValues,
         return 0;
     }
 
-    SkASSERT(utf16 != NULL);
+    SkASSERT(utf16 != nullptr);
 
     const uint16_t* stop = utf16 + numberOf16BitValues;
     size_t          size = 0;
 
-    if (utf8 == NULL) {    // just count
+    if (utf8 == nullptr) {    // just count
         while (utf16 < stop) {
-            size += SkUTF8_FromUnichar(SkUTF16_NextUnichar(&utf16), NULL);
+            size += SkUTF8_FromUnichar(SkUTF16_NextUnichar(&utf16), nullptr);
         }
     } else {
         char* start = utf8;
diff --git a/gfx/skia/skia/src/core/SkUtilsArm.cpp b/gfx/skia/skia/src/core/SkUtilsArm.cpp
index 58cf1157c307..682f97160727 100644
--- a/gfx/skia/skia/src/core/SkUtilsArm.cpp
+++ b/gfx/skia/skia/src/core/SkUtilsArm.cpp
@@ -16,73 +16,30 @@
 #include <string.h>
 #include <pthread.h>
 
-// Set USE_ANDROID_NDK_CPU_FEATURES to use the Android NDK's
-// cpu-features helper library to detect NEON at runtime. See
-// http://crbug.com/164154 to see why this is needed in Chromium
-// for Android.
-#if !defined(USE_ANDROID_NDK_CPU_FEATURES)
-#  if defined(SK_BUILD_FOR_ANDROID)
-#    define USE_ANDROID_NDK_CPU_FEATURES 1
+#if defined(SK_BUILD_FOR_ANDROID)
+#  ifdef MOZ_SKIA
+#    include "mozilla/arm.h"
 #  else
-#    define USE_ANDROID_NDK_CPU_FEATURES 0
-#  endif
-#endif
-
-#if USE_ANDROID_NDK_CPU_FEATURES
-#  include <cpu-features.h>
-#endif
-
-// Set NEON_DEBUG to 1 to allow debugging of the CPU features probing.
-// For now, we always set it for SK_DEBUG builds.
-#ifdef SK_DEBUG
-#  define NEON_DEBUG  1
-#else
-#  define NEON_DEBUG 0
-#endif
-
-#if NEON_DEBUG
-#  ifdef SK_BUILD_FOR_ANDROID
-     // used to declare PROP_VALUE_MAX and __system_property_get()
-#    include <sys/system_properties.h>
+#    include <cpu-features.h>
 #  endif
 #endif
 
 // A function used to determine at runtime if the target CPU supports
 // the ARM NEON instruction set. This implementation is Linux-specific.
 static bool sk_cpu_arm_check_neon(void) {
+    // If we fail any of the following, assume we don't have NEON instructions
+    // This allows us to return immediately in case of error.
     bool result = false;
 
-#if NEON_DEBUG
-    // Allow forcing the mode through the environment during debugging.
-#  ifdef SK_BUILD_FOR_ANDROID
-    // On Android, we use a system property
-#   define PROP_NAME  "debug.skia.arm_neon_mode"
-    char prop[PROP_VALUE_MAX];
-    if (__system_property_get(PROP_NAME, prop) > 0) {
+// Use the Android NDK's cpu-features helper library to detect NEON at runtime.
+// See http://crbug.com/164154 to see why this is needed in Chromium for Android.
+#ifdef SK_BUILD_FOR_ANDROID
+#  ifdef MOZ_SKIA
+  result = mozilla::supports_neon();
 #  else
-#   define PROP_NAME   "SKIA_ARM_NEON_MODE"
-    // On ARM Linux, we use an environment variable
-    const char* prop = getenv(PROP_NAME);
-    if (prop != NULL) {
-#  endif
-        SkDebugf("%s: %s", PROP_NAME, prop);
-        if (!strcmp(prop, "1")) {
-            SkDebugf("Forcing ARM Neon mode to full!\n");
-            return true;
-        }
-        if (!strcmp(prop, "0")) {
-            SkDebugf("Disabling ARM NEON mode\n");
-            return false;
-        }
-    }
-    SkDebugf("Running dynamic CPU feature detection\n");
-#endif
-
-#if USE_ANDROID_NDK_CPU_FEATURES
-
   result = (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
-
-#else  // USE_ANDROID_NDK_CPU_FEATURES
+#endif
+#else  // SK_BUILD_FOR_ANDROID
 
     // There is no user-accessible CPUID instruction on ARM that we can use.
     // Instead, we must parse /proc/cpuinfo and look for the 'neon' feature.
@@ -103,10 +60,6 @@ static bool sk_cpu_arm_check_neon(void) {
     */
     char   buffer[4096];
 
-    // If we fail any of the following, assume we don't have NEON instructions
-    // This allows us to return immediately in case of error.
-    result = false;
-
     do {
         // open /proc/cpuinfo
         int fd = TEMP_FAILURE_RETRY(open("/proc/cpuinfo", O_RDONLY));
@@ -141,7 +94,7 @@ static bool sk_cpu_arm_check_neon(void) {
 
         char*  line = (char*) memmem(buffer, buffer_end - buffer,
                                      features, features_len);
-        if (line == NULL) {  // Weird, no Features line, bad kernel?
+        if (line == nullptr) {  // Weird, no Features line, bad kernel?
             SkDebugf("Could not find a line starting with 'Features'"
               "in /proc/cpuinfo ?\n");
             break;
@@ -151,7 +104,7 @@ static bool sk_cpu_arm_check_neon(void) {
 
         // Find the end of the current line
         char* line_end = (char*) memchr(line, '\n', buffer_end - line);
-        if (line_end == NULL)
+        if (line_end == nullptr)
             line_end = buffer_end;
 
         // Now find an instance of 'neon' in the flags list. We want to
@@ -161,7 +114,7 @@ static bool sk_cpu_arm_check_neon(void) {
         const size_t neon_len = sizeof(neon)-1;
         const char* flag = (const char*) memmem(line, line_end - line,
                                                 neon, neon_len);
-        if (flag == NULL)
+        if (flag == nullptr)
             break;
 
         // Ensure it is followed by a space or a newline.
@@ -173,12 +126,12 @@ static bool sk_cpu_arm_check_neon(void) {
 
     } while (0);
 
-#endif  // USE_ANDROID_NDK_CPU_FEATURES
+#endif  // SK_BUILD_FOR_ANDROID
 
     if (result) {
-        SkDebugf("Device supports ARM NEON instructions!\n");
+        SkDEBUGF(("Device supports ARM NEON instructions!\n"));
     } else {
-        SkDebugf("Device does NOT support ARM NEON instructions!\n");
+        SkDEBUGF(("Device does NOT support ARM NEON instructions!\n"));
     }
     return result;
 }
diff --git a/gfx/skia/skia/src/core/SkUtilsArm.h b/gfx/skia/skia/src/core/SkUtilsArm.h
index 09ddaf39466e..51ae7e4a9567 100644
--- a/gfx/skia/skia/src/core/SkUtilsArm.h
+++ b/gfx/skia/skia/src/core/SkUtilsArm.h
@@ -21,9 +21,9 @@
 #define SK_ARM_NEON_MODE_ALWAYS   1
 #define SK_ARM_NEON_MODE_DYNAMIC  2
 
-#if defined(SK_CPU_ARM32) && defined(__ARM_HAVE_OPTIONAL_NEON_SUPPORT)
+#if defined(SK_ARM_HAS_OPTIONAL_NEON)
 #  define SK_ARM_NEON_MODE  SK_ARM_NEON_MODE_DYNAMIC
-#elif defined(SK_CPU_ARM32) && defined(__ARM_HAVE_NEON) || defined(SK_CPU_ARM64)
+#elif defined(SK_ARM_HAS_NEON)
 #  define SK_ARM_NEON_MODE  SK_ARM_NEON_MODE_ALWAYS
 #else
 #  define SK_ARM_NEON_MODE  SK_ARM_NEON_MODE_NONE
diff --git a/gfx/skia/skia/src/core/SkValidatingReadBuffer.cpp b/gfx/skia/skia/src/core/SkValidatingReadBuffer.cpp
index 037a99465b28..bc5611a3e382 100644
--- a/gfx/skia/skia/src/core/SkValidatingReadBuffer.cpp
+++ b/gfx/skia/skia/src/core/SkValidatingReadBuffer.cpp
@@ -111,7 +111,7 @@ void* SkValidatingReadBuffer::readEncodedString(size_t* length, SkPaint::TextEnc
     this->validate(encodingType == encoding);
     *length = this->readInt();
     const void* ptr = this->skip(SkAlign4(*length));
-    void* data = NULL;
+    void* data = nullptr;
     if (!fError) {
         data = sk_malloc_throw(*length);
         memcpy(data, ptr, *length);
@@ -175,7 +175,9 @@ bool SkValidatingReadBuffer::readArray(void* value, size_t size, size_t elementS
     const uint32_t count = this->getArrayCount();
     this->validate(size == count);
     (void)this->skip(sizeof(uint32_t)); // Skip array count
+    const uint64_t byteLength64 = sk_64_mul(count, elementSize);
     const size_t byteLength = count * elementSize;
+    this->validate(byteLength == byteLength64);
     const void* ptr = this->skip(SkAlign4(byteLength));
     if (!fError) {
         memcpy(value, ptr, byteLength);
@@ -211,8 +213,9 @@ uint32_t SkValidatingReadBuffer::getArrayCount() {
 }
 
 SkTypeface* SkValidatingReadBuffer::readTypeface() {
+    SkASSERT(false);
     // TODO: Implement this (securely) when needed
-    return NULL;
+    return nullptr;
 }
 
 bool SkValidatingReadBuffer::validateAvailable(size_t size) {
@@ -223,24 +226,24 @@ SkFlattenable* SkValidatingReadBuffer::readFlattenable(SkFlattenable::Type type)
     SkString name;
     this->readString(&name);
     if (fError) {
-        return NULL;
+        return nullptr;
     }
 
     // Is this the type we wanted ?
     const char* cname = name.c_str();
     SkFlattenable::Type baseType;
     if (!SkFlattenable::NameToType(cname, &baseType) || (baseType != type)) {
-        return NULL;
+        return nullptr;
     }
 
     SkFlattenable::Factory factory = SkFlattenable::NameToFactory(cname);
-    if (NULL == factory) {
-        return NULL; // writer failed to give us the flattenable
+    if (nullptr == factory) {
+        return nullptr; // writer failed to give us the flattenable
     }
 
     // if we get here, factory may still be null, but if that is the case, the
     // failure was ours, not the writer.
-    SkFlattenable* obj = NULL;
+    SkFlattenable* obj = nullptr;
     uint32_t sizeRecorded = this->readUInt();
     if (factory) {
         size_t offset = fReader.offset();
@@ -250,8 +253,8 @@ SkFlattenable* SkValidatingReadBuffer::readFlattenable(SkFlattenable::Type type)
         this->validate(sizeRecorded == sizeRead);
         if (fError) {
             // we could try to fix up the offset...
-            delete obj;
-            obj = NULL;
+            SkSafeUnref(obj);
+            obj = nullptr;
         }
     } else {
         // we must skip the remaining data
diff --git a/gfx/skia/skia/src/core/SkValidatingReadBuffer.h b/gfx/skia/skia/src/core/SkValidatingReadBuffer.h
index 5cf3abed68f2..bcdcba5de4a7 100644
--- a/gfx/skia/skia/src/core/SkValidatingReadBuffer.h
+++ b/gfx/skia/skia/src/core/SkValidatingReadBuffer.h
@@ -23,48 +23,48 @@ public:
     SkValidatingReadBuffer(const void* data, size_t size);
     virtual ~SkValidatingReadBuffer();
 
-    virtual const void* skip(size_t size) SK_OVERRIDE;
+    const void* skip(size_t size) override;
 
     // primitives
-    virtual bool readBool() SK_OVERRIDE;
-    virtual SkColor readColor() SK_OVERRIDE;
-    virtual SkFixed readFixed() SK_OVERRIDE;
-    virtual int32_t readInt() SK_OVERRIDE;
-    virtual SkScalar readScalar() SK_OVERRIDE;
-    virtual uint32_t readUInt() SK_OVERRIDE;
-    virtual int32_t read32() SK_OVERRIDE;
+    bool readBool() override;
+    SkColor readColor() override;
+    SkFixed readFixed() override;
+    int32_t readInt() override;
+    SkScalar readScalar() override;
+    uint32_t readUInt() override;
+    int32_t read32() override;
 
     // strings -- the caller is responsible for freeing the string contents
-    virtual void readString(SkString* string) SK_OVERRIDE;
-    virtual void* readEncodedString(size_t* length, SkPaint::TextEncoding encoding) SK_OVERRIDE;
+    void readString(SkString* string) override;
+    void* readEncodedString(size_t* length, SkPaint::TextEncoding encoding) override;
 
     // common data structures
-    virtual SkFlattenable* readFlattenable(SkFlattenable::Type type) SK_OVERRIDE;
-    virtual void skipFlattenable() SK_OVERRIDE;
-    virtual void readPoint(SkPoint* point) SK_OVERRIDE;
-    virtual void readMatrix(SkMatrix* matrix) SK_OVERRIDE;
-    virtual void readIRect(SkIRect* rect) SK_OVERRIDE;
-    virtual void readRect(SkRect* rect) SK_OVERRIDE;
-    virtual void readRegion(SkRegion* region) SK_OVERRIDE;
-    virtual void readPath(SkPath* path) SK_OVERRIDE;
+    SkFlattenable* readFlattenable(SkFlattenable::Type type) override;
+    void skipFlattenable() override;
+    void readPoint(SkPoint* point) override;
+    void readMatrix(SkMatrix* matrix) override;
+    void readIRect(SkIRect* rect) override;
+    void readRect(SkRect* rect) override;
+    void readRegion(SkRegion* region) override;
+    void readPath(SkPath* path) override;
 
     // binary data and arrays
-    virtual bool readByteArray(void* value, size_t size) SK_OVERRIDE;
-    virtual bool readColorArray(SkColor* colors, size_t size) SK_OVERRIDE;
-    virtual bool readIntArray(int32_t* values, size_t size) SK_OVERRIDE;
-    virtual bool readPointArray(SkPoint* points, size_t size) SK_OVERRIDE;
-    virtual bool readScalarArray(SkScalar* values, size_t size) SK_OVERRIDE;
+    bool readByteArray(void* value, size_t size) override;
+    bool readColorArray(SkColor* colors, size_t size) override;
+    bool readIntArray(int32_t* values, size_t size) override;
+    bool readPointArray(SkPoint* points, size_t size) override;
+    bool readScalarArray(SkScalar* values, size_t size) override;
 
     // helpers to get info about arrays and binary data
-    virtual uint32_t getArrayCount() SK_OVERRIDE;
+    uint32_t getArrayCount() override;
 
     // TODO: Implement this (securely) when needed
-    virtual SkTypeface* readTypeface() SK_OVERRIDE;
+    SkTypeface* readTypeface() override;
 
-    virtual bool validate(bool isValid) SK_OVERRIDE;
-    virtual bool isValid() const SK_OVERRIDE;
+    bool validate(bool isValid) override;
+    bool isValid() const override;
 
-    virtual bool validateAvailable(size_t size) SK_OVERRIDE;
+    bool validateAvailable(size_t size) override;
 
 private:
     bool readArray(void* value, size_t size, size_t elementSize);
diff --git a/gfx/skia/skia/src/core/SkVarAlloc.cpp b/gfx/skia/skia/src/core/SkVarAlloc.cpp
new file mode 100644
index 000000000000..840cf2834728
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkVarAlloc.cpp
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkVarAlloc.h"
+
+// We use non-standard malloc diagnostic methods to make sure our allocations are sized well.
+#if defined(SK_BUILD_FOR_MAC)
+    #include <malloc/malloc.h>
+#elif defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_WIN32)
+    #include <malloc.h>
+#endif
+
+struct SkVarAlloc::Block {
+    Block* prev;
+    char* data() { return (char*)(this + 1); }
+
+    static Block* Alloc(Block* prev, size_t size) {
+        SkASSERT(size >= sizeof(Block));
+        Block* b = (Block*)sk_malloc_throw(size);
+        b->prev = prev;
+        return b;
+    }
+};
+
+SkVarAlloc::SkVarAlloc(size_t minLgSize)
+    : fBytesAllocated(0)
+    , fByte(nullptr)
+    , fRemaining(0)
+    , fLgSize(minLgSize)
+    , fBlock(nullptr) {}
+
+SkVarAlloc::SkVarAlloc(size_t minLgSize, char* storage, size_t len)
+    : fBytesAllocated(0)
+    , fByte(storage)
+    , fRemaining(len)
+    , fLgSize(minLgSize)
+    , fBlock(nullptr) {}
+
+SkVarAlloc::~SkVarAlloc() {
+    Block* b = fBlock;
+    while (b) {
+        Block* prev = b->prev;
+        sk_free(b);
+        b = prev;
+    }
+}
+
+void SkVarAlloc::makeSpace(size_t bytes) {
+    SkASSERT(SkIsAlignPtr(bytes));
+
+    size_t alloc = 1<<fLgSize++;
+    while (alloc < bytes + sizeof(Block)) {
+        alloc *= 2;
+    }
+    fBytesAllocated += alloc;
+    fBlock = Block::Alloc(fBlock, alloc);
+    fByte = fBlock->data();
+    fRemaining = alloc - sizeof(Block);
+
+#if defined(SK_BUILD_FOR_MAC)
+    SkASSERT(alloc == malloc_good_size(alloc));
+#elif defined(SK_BUILD_FOR_UNIX) && !defined(__UCLIBC__)
+    // TODO(mtklein): tune so we can assert something like this
+    //SkASSERT(alloc == malloc_usable_size(fBlock));
+#endif
+}
diff --git a/gfx/skia/skia/src/core/SkVarAlloc.h b/gfx/skia/skia/src/core/SkVarAlloc.h
new file mode 100644
index 000000000000..3729bad1051b
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkVarAlloc.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkVarAlloc_DEFINED
+#define SkVarAlloc_DEFINED
+
+#include "SkTypes.h"
+
+class SkVarAlloc : SkNoncopyable {
+public:
+    // Smallest block we'll allocate is 2**N bytes.
+    explicit SkVarAlloc(size_t minLgSize);
+    // Same as above, but first uses up to len bytes from storage.
+    SkVarAlloc(size_t minLgSize, char* storage, size_t len);
+
+    ~SkVarAlloc();
+
+    // Returns contiguous bytes aligned at least for pointers.
+    char* alloc(size_t bytes) {
+        bytes = SkAlignPtr(bytes);
+
+        if (bytes > fRemaining) {
+            this->makeSpace(bytes);
+        }
+        SkASSERT(bytes <= fRemaining);
+
+        char* ptr = fByte;
+        fByte += bytes;
+        fRemaining = SkToU32(fRemaining - bytes);
+        return ptr;
+    }
+
+    // Returns our best estimate of the number of bytes we've allocated.
+    // (We may not track this precisely to save space.)
+    size_t approxBytesAllocated() const { return fBytesAllocated; }
+
+private:
+    void makeSpace(size_t bytes);
+
+    size_t fBytesAllocated;
+
+    char* fByte;
+    unsigned fRemaining;
+    unsigned fLgSize;
+
+    struct Block;
+    Block* fBlock;
+};
+static_assert(sizeof(SkVarAlloc) <= 32, "SkVarAllocSize");
+
+#endif//SkVarAlloc_DEFINED
diff --git a/gfx/skia/skia/src/core/SkVertState.cpp b/gfx/skia/skia/src/core/SkVertState.cpp
index f23b1083feed..7c3047ec407d 100644
--- a/gfx/skia/skia/src/core/SkVertState.cpp
+++ b/gfx/skia/skia/src/core/SkVertState.cpp
@@ -101,6 +101,6 @@ VertState::Proc VertState::chooseProc(SkCanvas::VertexMode mode) {
         case SkCanvas::kTriangleFan_VertexMode:
             return fIndices ? TriangleFanX : TriangleFan;
         default:
-            return NULL;
+            return nullptr;
     }
 }
diff --git a/gfx/skia/skia/src/core/SkVertState.h b/gfx/skia/skia/src/core/SkVertState.h
index ecf1773dc7ad..ab794521b08d 100644
--- a/gfx/skia/skia/src/core/SkVertState.h
+++ b/gfx/skia/skia/src/core/SkVertState.h
@@ -22,7 +22,7 @@ struct VertState {
 
     /**
      *  Construct a VertState from a vertex count, index array, and index count.
-     *  If the vertices are unindexed pass NULL for indices.
+     *  If the vertices are unindexed pass nullptr for indices.
      */
     VertState(int vCount, const uint16_t indices[], int indexCount)
             : fIndices(indices) {
diff --git a/gfx/skia/skia/src/core/SkWriteBuffer.cpp b/gfx/skia/skia/src/core/SkWriteBuffer.cpp
index f2be41b266b6..1dfe0b3972c6 100644
--- a/gfx/skia/skia/src/core/SkWriteBuffer.cpp
+++ b/gfx/skia/skia/src/core/SkWriteBuffer.cpp
@@ -8,6 +8,7 @@
 
 #include "SkWriteBuffer.h"
 #include "SkBitmap.h"
+#include "SkBitmapHeap.h"
 #include "SkData.h"
 #include "SkPixelRef.h"
 #include "SkPtrRecorder.h"
@@ -16,21 +17,19 @@
 
 SkWriteBuffer::SkWriteBuffer(uint32_t flags)
     : fFlags(flags)
-    , fFactorySet(NULL)
-    , fNamedFactorySet(NULL)
-    , fBitmapHeap(NULL)
-    , fTFSet(NULL)
-    , fBitmapEncoder(NULL) {
+    , fFactorySet(nullptr)
+    , fNamedFactorySet(nullptr)
+    , fBitmapHeap(nullptr)
+    , fTFSet(nullptr) {
 }
 
 SkWriteBuffer::SkWriteBuffer(void* storage, size_t storageSize, uint32_t flags)
     : fFlags(flags)
-    , fFactorySet(NULL)
-    , fNamedFactorySet(NULL)
+    , fFactorySet(nullptr)
+    , fNamedFactorySet(nullptr)
     , fWriter(storage, storageSize)
-    , fBitmapHeap(NULL)
-    , fTFSet(NULL)
-    , fBitmapEncoder(NULL) {
+    , fBitmapHeap(nullptr)
+    , fTFSet(nullptr) {
 }
 
 SkWriteBuffer::~SkWriteBuffer() {
@@ -166,12 +165,12 @@ void SkWriteBuffer::writeBitmap(const SkBitmap& bitmap) {
     //    the size of the encoded data. A non-zero size signifies that encoded data was written.
     // 3. Call SkBitmap::flatten. After writing a boolean value of false, signifying that a heap was
     //    not used, write a zero to signify that the data was not encoded.
-    bool useBitmapHeap = fBitmapHeap != NULL;
+    bool useBitmapHeap = fBitmapHeap != nullptr;
     // Write a bool: true if the SkBitmapHeap is to be used, in which case the reader must use an
     // SkBitmapHeapReader to read the SkBitmap. False if the bitmap was serialized another way.
     this->writeBool(useBitmapHeap);
     if (useBitmapHeap) {
-        SkASSERT(NULL == fBitmapEncoder);
+        SkASSERT(nullptr == fPixelSerializer);
         int32_t slot = fBitmapHeap->insert(bitmap);
         fWriter.write32(slot);
         // crbug.com/155875
@@ -184,25 +183,34 @@ void SkWriteBuffer::writeBitmap(const SkBitmap& bitmap) {
         return;
     }
 
-    // see if the pixelref already has an encoded version
-    if (bitmap.pixelRef()) {
-        SkAutoDataUnref data(bitmap.pixelRef()->refEncodedData());
-        if (data.get() != NULL) {
-            write_encoded_bitmap(this, data, bitmap.pixelRefOrigin());
-            return;
+    SkPixelRef* pixelRef = bitmap.pixelRef();
+    if (pixelRef) {
+        // see if the pixelref already has an encoded version
+        SkAutoDataUnref existingData(pixelRef->refEncodedData());
+        if (existingData.get() != nullptr) {
+            // Assumes that if the client did not set a serializer, they are
+            // happy to get the encoded data.
+            if (!fPixelSerializer || fPixelSerializer->useEncodedData(existingData->data(),
+                                                                      existingData->size())) {
+                write_encoded_bitmap(this, existingData, bitmap.pixelRefOrigin());
+                return;
+            }
         }
-    }
 
-    // see if the caller wants to manually encode
-    if (fBitmapEncoder != NULL) {
-        SkASSERT(NULL == fBitmapHeap);
-        size_t offset = 0;  // this parameter is deprecated/ignored
-        // if we have to "encode" the bitmap, then we assume there is no
-        // offset to share, since we are effectively creating a new pixelref
-        SkAutoDataUnref data(fBitmapEncoder(&offset, bitmap));
-        if (data.get() != NULL) {
-            write_encoded_bitmap(this, data, SkIPoint::Make(0, 0));
-            return;
+        // see if the caller wants to manually encode
+        SkAutoPixmapUnlock result;
+        if (fPixelSerializer && bitmap.requestLock(&result)) {
+            const SkPixmap& pmap = result.pixmap();
+            SkASSERT(nullptr == fBitmapHeap);
+            SkAutoDataUnref data(fPixelSerializer->encodePixels(pmap.info(),
+                                                                pmap.addr(),
+                                                                pmap.rowBytes()));
+            if (data.get() != nullptr) {
+                // if we have to "encode" the bitmap, then we assume there is no
+                // offset to share, since we are effectively creating a new pixelref
+                write_encoded_bitmap(this, data, SkIPoint::Make(0, 0));
+                return;
+            }
         }
     }
 
@@ -210,8 +218,21 @@ void SkWriteBuffer::writeBitmap(const SkBitmap& bitmap) {
     SkBitmap::WriteRawPixels(this, bitmap);
 }
 
+void SkWriteBuffer::writeImage(const SkImage* image) {
+    this->writeInt(image->width());
+    this->writeInt(image->height());
+
+    SkAutoTUnref<SkData> encoded(image->encode(this->getPixelSerializer()));
+    if (encoded && encoded->size() > 0) {
+        write_encoded_bitmap(this, encoded, SkIPoint::Make(0, 0));
+        return;
+    }
+
+    this->writeUInt(0); // signal no pixels (in place of the size of the encoded data)
+}
+
 void SkWriteBuffer::writeTypeface(SkTypeface* obj) {
-    if (NULL == obj || NULL == fTFSet) {
+    if (nullptr == obj || nullptr == fTFSet) {
         fWriter.write32(0);
     } else {
         fWriter.write32(fTFSet->add(obj));
@@ -220,18 +241,18 @@ void SkWriteBuffer::writeTypeface(SkTypeface* obj) {
 
 SkFactorySet* SkWriteBuffer::setFactoryRecorder(SkFactorySet* rec) {
     SkRefCnt_SafeAssign(fFactorySet, rec);
-    if (fNamedFactorySet != NULL) {
+    if (fNamedFactorySet != nullptr) {
         fNamedFactorySet->unref();
-        fNamedFactorySet = NULL;
+        fNamedFactorySet = nullptr;
     }
     return rec;
 }
 
 SkNamedFactorySet* SkWriteBuffer::setNamedFactoryRecorder(SkNamedFactorySet* rec) {
     SkRefCnt_SafeAssign(fNamedFactorySet, rec);
-    if (fFactorySet != NULL) {
+    if (fFactorySet != nullptr) {
         fFactorySet->unref();
-        fFactorySet = NULL;
+        fFactorySet = nullptr;
     }
     return rec;
 }
@@ -243,18 +264,19 @@ SkRefCntSet* SkWriteBuffer::setTypefaceRecorder(SkRefCntSet* rec) {
 
 void SkWriteBuffer::setBitmapHeap(SkBitmapHeap* bitmapHeap) {
     SkRefCnt_SafeAssign(fBitmapHeap, bitmapHeap);
-    if (bitmapHeap != NULL) {
-        SkASSERT(NULL == fBitmapEncoder);
-        fBitmapEncoder = NULL;
+    if (bitmapHeap != nullptr) {
+        SkASSERT(nullptr == fPixelSerializer);
+        fPixelSerializer.reset(nullptr);
     }
 }
 
-void SkWriteBuffer::setBitmapEncoder(SkPicture::EncodeBitmap bitmapEncoder) {
-    fBitmapEncoder = bitmapEncoder;
-    if (bitmapEncoder != NULL) {
-        SkASSERT(NULL == fBitmapHeap);
+void SkWriteBuffer::setPixelSerializer(SkPixelSerializer* serializer) {
+    fPixelSerializer.reset(serializer);
+    if (serializer) {
+        serializer->ref();
+        SkASSERT(nullptr == fBitmapHeap);
         SkSafeUnref(fBitmapHeap);
-        fBitmapHeap = NULL;
+        fBitmapHeap = nullptr;
     }
 }
 
@@ -269,19 +291,19 @@ void SkWriteBuffer::writeFlattenable(const SkFlattenable* flattenable) {
      *  The distinction is important, since 0-index is 32bits (always), but a
      *  0-functionptr might be 32 or 64 bits.
      */
-    if (NULL == flattenable) {
+    if (nullptr == flattenable) {
         if (this->isValidating()) {
             this->writeString("");
-        } else if (fFactorySet != NULL || fNamedFactorySet != NULL) {
+        } else if (fFactorySet != nullptr || fNamedFactorySet != nullptr) {
             this->write32(0);
         } else {
-            this->writeFunctionPtr(NULL);
+            this->writeFunctionPtr(nullptr);
         }
         return;
     }
 
     SkFlattenable::Factory factory = flattenable->getFactory();
-    SkASSERT(factory != NULL);
+    SkASSERT(factory != nullptr);
 
     /*
      *  We can write 1 of 3 versions of the flattenable:
diff --git a/gfx/skia/skia/src/core/SkWriter32.cpp b/gfx/skia/skia/src/core/SkWriter32.cpp
index 00c46368b604..457cff49abab 100644
--- a/gfx/skia/skia/src/core/SkWriter32.cpp
+++ b/gfx/skia/skia/src/core/SkWriter32.cpp
@@ -37,7 +37,7 @@ size_t SkReader32::readIntoString(SkString* copy) {
 }
 
 void SkWriter32::writeString(const char str[], size_t len) {
-    if (NULL == str) {
+    if (nullptr == str) {
         str = "";
         len = 0;
     }
@@ -64,7 +64,7 @@ size_t SkWriter32::WriteStringSize(const char* str, size_t len) {
 }
 
 void SkWriter32::growToAtLeast(size_t size) {
-    const bool wasExternal = (fExternal != NULL) && (fData == fExternal);
+    const bool wasExternal = (fExternal != nullptr) && (fData == fExternal);
 
     fCapacity = 4096 + SkTMax(size, fCapacity + (fCapacity / 2));
     fInternal.realloc(fCapacity);
@@ -74,32 +74,8 @@ void SkWriter32::growToAtLeast(size_t size) {
         // we were external, so copy in the data
         memcpy(fData, fExternal, fUsed);
     }
-    // Invalidate the snapshot, we know it is no longer useful.
-    fSnapshot.reset(NULL);
 }
 
 SkData* SkWriter32::snapshotAsData() const {
-    // get a non const version of this, we are only conceptually const
-    SkWriter32& mutable_this = *const_cast<SkWriter32*>(this);
-    // we use size change detection to invalidate the cached data
-    if ((fSnapshot.get() != NULL) && (fSnapshot->size() != fUsed)) {
-        mutable_this.fSnapshot.reset(NULL);
-    }
-    if (fSnapshot.get() == NULL) {
-        uint8_t* buffer = NULL;
-        if ((fExternal != NULL) && (fData == fExternal)) {
-            // We need to copy to an allocated buffer before returning.
-            buffer = (uint8_t*)sk_malloc_throw(fUsed);
-            memcpy(buffer, fData, fUsed);
-        } else {
-            buffer = mutable_this.fInternal.detach();
-            // prepare us to do copy on write, by pretending the data buffer
-            // is external and size limited
-            mutable_this.fData = buffer;
-            mutable_this.fCapacity = fUsed;
-            mutable_this.fExternal = buffer;
-        }
-        mutable_this.fSnapshot.reset(SkData::NewFromMalloc(buffer, fUsed));
-    }
-    return SkRef(fSnapshot.get()); // Take an extra ref for the caller.
+    return SkData::NewWithCopy(fData, fUsed);
 }
diff --git a/gfx/skia/skia/src/core/SkXfermode.cpp b/gfx/skia/skia/src/core/SkXfermode.cpp
index 0811808d46c3..79de322c2dac 100644
--- a/gfx/skia/skia/src/core/SkXfermode.cpp
+++ b/gfx/skia/skia/src/core/SkXfermode.cpp
@@ -6,39 +6,18 @@
  * found in the LICENSE file.
  */
 
-
 #include "SkXfermode.h"
-#include "SkXfermode_opts_SSE2.h"
 #include "SkXfermode_proccoeff.h"
 #include "SkColorPriv.h"
-#include "SkLazyPtr.h"
 #include "SkMathPriv.h"
+#include "SkOncePtr.h"
+#include "SkOpts.h"
 #include "SkReadBuffer.h"
 #include "SkString.h"
-#include "SkUtilsArm.h"
 #include "SkWriteBuffer.h"
 
-#if !SK_ARM_NEON_IS_NONE
-#include "SkXfermode_opts_arm_neon.h"
-#endif
-
 #define SkAlphaMulAlpha(a, b)   SkMulDiv255Round(a, b)
 
-#if 0
-// idea for higher precision blends in xfer procs (and slightly faster)
-// see DstATop as a probable caller
-static U8CPU mulmuldiv255round(U8CPU a, U8CPU b, U8CPU c, U8CPU d) {
-    SkASSERT(a <= 255);
-    SkASSERT(b <= 255);
-    SkASSERT(c <= 255);
-    SkASSERT(d <= 255);
-    unsigned prod = SkMulS16(a, b) + SkMulS16(c, d) + 128;
-    unsigned result = (prod + (prod >> 8)) >> 8;
-    SkASSERT(result <= 255);
-    return result;
-}
-#endif
-
 static inline unsigned saturated_add(unsigned a, unsigned b) {
     SkASSERT(a <= 255);
     SkASSERT(b <= 255);
@@ -668,30 +647,17 @@ const ProcCoeff gProcCoeffs[] = {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-bool SkXfermode::asCoeff(Coeff* src, Coeff* dst) const {
-    return false;
-}
-
 bool SkXfermode::asMode(Mode* mode) const {
     return false;
 }
 
-bool SkXfermode::asNewEffect(GrEffect** effect, GrTexture* background) const {
+bool SkXfermode::asFragmentProcessor(const GrFragmentProcessor**,
+                                     const GrFragmentProcessor*) const {
     return false;
 }
 
-bool SkXfermode::AsNewEffectOrCoeff(SkXfermode* xfermode,
-                                    GrEffect** effect,
-                                    Coeff* src,
-                                    Coeff* dst,
-                                    GrTexture* background) {
-    if (NULL == xfermode) {
-        return ModeAsCoeff(kSrcOver_Mode, src, dst);
-    } else if (xfermode->asCoeff(src, dst)) {
-        return true;
-    } else {
-        return xfermode->asNewEffect(effect, background);
-    }
+bool SkXfermode::asXPFactory(GrXPFactory**) const {
+    return false;
 }
 
 SkPMColor SkXfermode::xferColor(SkPMColor src, SkPMColor dst) const{
@@ -704,7 +670,7 @@ void SkXfermode::xfer32(SkPMColor* SK_RESTRICT dst,
                         const SkAlpha* SK_RESTRICT aa) const {
     SkASSERT(dst && src && count >= 0);
 
-    if (NULL == aa) {
+    if (nullptr == aa) {
         for (int i = count - 1; i >= 0; --i) {
             dst[i] = this->xferColor(src[i], dst[i]);
         }
@@ -728,7 +694,7 @@ void SkXfermode::xfer16(uint16_t* dst,
                         const SkAlpha* SK_RESTRICT aa) const {
     SkASSERT(dst && src && count >= 0);
 
-    if (NULL == aa) {
+    if (nullptr == aa) {
         for (int i = count - 1; i >= 0; --i) {
             SkPMColor dstC = SkPixel16ToPixel32(dst[i]);
             dst[i] = SkPixel32ToPixel16_ToU16(this->xferColor(src[i], dstC));
@@ -753,7 +719,7 @@ void SkXfermode::xferA8(SkAlpha* SK_RESTRICT dst,
                         const SkAlpha* SK_RESTRICT aa) const {
     SkASSERT(dst && src && count >= 0);
 
-    if (NULL == aa) {
+    if (nullptr == aa) {
         for (int i = count - 1; i >= 0; --i) {
             SkPMColor res = this->xferColor(src[i], (dst[i] << SK_A32_SHIFT));
             dst[i] = SkToU8(SkGetPackedA32(res));
@@ -774,485 +740,27 @@ void SkXfermode::xferA8(SkAlpha* SK_RESTRICT dst,
     }
 }
 
-//////////////////////////////////////////////////////////////////////////////
-
-#if SK_SUPPORT_GPU
-
-#include "GrEffect.h"
-#include "GrCoordTransform.h"
-#include "GrEffectUnitTest.h"
-#include "GrTBackendEffectFactory.h"
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
-
-/**
- * GrEffect that implements the all the separable xfer modes that cannot be expressed as Coeffs.
- */
-class XferEffect : public GrEffect {
-public:
-    static bool IsSupportedMode(SkXfermode::Mode mode) {
-        return mode > SkXfermode::kLastCoeffMode && mode <= SkXfermode::kLastMode;
-    }
-
-    static GrEffect* Create(SkXfermode::Mode mode, GrTexture* background) {
-        if (!IsSupportedMode(mode)) {
-            return NULL;
-        } else {
-            return SkNEW_ARGS(XferEffect, (mode, background));
-        }
-    }
-
-    virtual void getConstantColorComponents(GrColor* color,
-                                            uint32_t* validFlags) const SK_OVERRIDE {
-        *validFlags = 0;
-    }
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE {
-        return GrTBackendEffectFactory<XferEffect>::getInstance();
-    }
-
-    static const char* Name() { return "XferEffect"; }
-
-    SkXfermode::Mode mode() const { return fMode; }
-    const GrTextureAccess&  backgroundAccess() const { return fBackgroundAccess; }
-
-    class GLEffect : public GrGLEffect {
-    public:
-        GLEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&)
-            : GrGLEffect(factory) {
-        }
-        virtual void emitCode(GrGLShaderBuilder* builder,
-                              const GrDrawEffect& drawEffect,
-                              const GrEffectKey& key,
-                              const char* outputColor,
-                              const char* inputColor,
-                              const TransformedCoordsArray& coords,
-                              const TextureSamplerArray& samplers) SK_OVERRIDE {
-            SkXfermode::Mode mode = drawEffect.castEffect<XferEffect>().mode();
-            const GrTexture* backgroundTex = drawEffect.castEffect<XferEffect>().backgroundAccess().getTexture();
-            const char* dstColor;
-            if (backgroundTex) {
-                dstColor = "bgColor";
-                builder->fsCodeAppendf("\t\tvec4 %s = ", dstColor);
-                builder->fsAppendTextureLookup(samplers[0], coords[0].c_str(), coords[0].type());
-                builder->fsCodeAppendf(";\n");
-            } else {
-                dstColor = builder->dstColor();
-            }
-            SkASSERT(NULL != dstColor);
-
-            // We don't try to optimize for this case at all
-            if (NULL == inputColor) {
-                builder->fsCodeAppendf("\t\tconst vec4 ones = vec4(1);\n");
-                inputColor = "ones";
-            }
-            builder->fsCodeAppendf("\t\t// SkXfermode::Mode: %s\n", SkXfermode::ModeName(mode));
-
-            // These all perform src-over on the alpha channel.
-            builder->fsCodeAppendf("\t\t%s.a = %s.a + (1.0 - %s.a) * %s.a;\n",
-                                    outputColor, inputColor, inputColor, dstColor);
-
-            switch (mode) {
-                case SkXfermode::kOverlay_Mode:
-                    // Overlay is Hard-Light with the src and dst reversed
-                    HardLight(builder, outputColor, dstColor, inputColor);
-                    break;
-                case SkXfermode::kDarken_Mode:
-                    builder->fsCodeAppendf("\t\t%s.rgb = min((1.0 - %s.a) * %s.rgb + %s.rgb, "
-                                                            "(1.0 - %s.a) * %s.rgb + %s.rgb);\n",
-                                            outputColor,
-                                            inputColor, dstColor, inputColor,
-                                            dstColor, inputColor, dstColor);
-                    break;
-                case SkXfermode::kLighten_Mode:
-                    builder->fsCodeAppendf("\t\t%s.rgb = max((1.0 - %s.a) * %s.rgb + %s.rgb, "
-                                                            "(1.0 - %s.a) * %s.rgb + %s.rgb);\n",
-                                            outputColor,
-                                            inputColor, dstColor, inputColor,
-                                            dstColor, inputColor, dstColor);
-                    break;
-                case SkXfermode::kColorDodge_Mode:
-                    ColorDodgeComponent(builder, outputColor, inputColor, dstColor, 'r');
-                    ColorDodgeComponent(builder, outputColor, inputColor, dstColor, 'g');
-                    ColorDodgeComponent(builder, outputColor, inputColor, dstColor, 'b');
-                    break;
-                case SkXfermode::kColorBurn_Mode:
-                    ColorBurnComponent(builder, outputColor, inputColor, dstColor, 'r');
-                    ColorBurnComponent(builder, outputColor, inputColor, dstColor, 'g');
-                    ColorBurnComponent(builder, outputColor, inputColor, dstColor, 'b');
-                    break;
-                case SkXfermode::kHardLight_Mode:
-                    HardLight(builder, outputColor, inputColor, dstColor);
-                    break;
-                case SkXfermode::kSoftLight_Mode:
-                    builder->fsCodeAppendf("\t\tif (0.0 == %s.a) {\n", dstColor);
-                    builder->fsCodeAppendf("\t\t\t%s.rgba = %s;\n", outputColor, inputColor);
-                    builder->fsCodeAppendf("\t\t} else {\n");
-                    SoftLightComponentPosDstAlpha(builder, outputColor, inputColor, dstColor, 'r');
-                    SoftLightComponentPosDstAlpha(builder, outputColor, inputColor, dstColor, 'g');
-                    SoftLightComponentPosDstAlpha(builder, outputColor, inputColor, dstColor, 'b');
-                    builder->fsCodeAppendf("\t\t}\n");
-                    break;
-                case SkXfermode::kDifference_Mode:
-                    builder->fsCodeAppendf("\t\t%s.rgb = %s.rgb + %s.rgb -"
-                                                       "2.0 * min(%s.rgb * %s.a, %s.rgb * %s.a);\n",
-                                           outputColor, inputColor, dstColor, inputColor, dstColor,
-                                           dstColor, inputColor);
-                    break;
-                case SkXfermode::kExclusion_Mode:
-                    builder->fsCodeAppendf("\t\t%s.rgb = %s.rgb + %s.rgb - "
-                                                        "2.0 * %s.rgb * %s.rgb;\n",
-                                           outputColor, dstColor, inputColor, dstColor, inputColor);
-                    break;
-                case SkXfermode::kMultiply_Mode:
-                    builder->fsCodeAppendf("\t\t%s.rgb = (1.0 - %s.a) * %s.rgb + "
-                                                        "(1.0 - %s.a) * %s.rgb + "
-                                                         "%s.rgb * %s.rgb;\n",
-                                           outputColor, inputColor, dstColor, dstColor, inputColor,
-                                           inputColor, dstColor);
-                    break;
-                case SkXfermode::kHue_Mode: {
-                    //  SetLum(SetSat(S * Da, Sat(D * Sa)), Sa*Da, D*Sa) + (1 - Sa) * D + (1 - Da) * S
-                    SkString setSat, setLum;
-                    AddSatFunction(builder, &setSat);
-                    AddLumFunction(builder, &setLum);
-                    builder->fsCodeAppendf("\t\tvec4 dstSrcAlpha = %s * %s.a;\n",
-                                           dstColor, inputColor);
-                    builder->fsCodeAppendf("\t\t%s.rgb = %s(%s(%s.rgb * %s.a, dstSrcAlpha.rgb), dstSrcAlpha.a, dstSrcAlpha.rgb);\n",
-                                           outputColor, setLum.c_str(), setSat.c_str(), inputColor,
-                                           dstColor);
-                    builder->fsCodeAppendf("\t\t%s.rgb += (1.0 - %s.a) * %s.rgb + (1.0 - %s.a) * %s.rgb;\n",
-                                           outputColor, inputColor, dstColor, dstColor, inputColor);
-                    break;
-                }
-                case SkXfermode::kSaturation_Mode: {
-                    // SetLum(SetSat(D * Sa, Sat(S * Da)), Sa*Da, D*Sa)) + (1 - Sa) * D + (1 - Da) * S
-                    SkString setSat, setLum;
-                    AddSatFunction(builder, &setSat);
-                    AddLumFunction(builder, &setLum);
-                    builder->fsCodeAppendf("\t\tvec4 dstSrcAlpha = %s * %s.a;\n",
-                                           dstColor, inputColor);
-                    builder->fsCodeAppendf("\t\t%s.rgb = %s(%s(dstSrcAlpha.rgb, %s.rgb * %s.a), dstSrcAlpha.a, dstSrcAlpha.rgb);\n",
-                                           outputColor, setLum.c_str(), setSat.c_str(), inputColor,
-                                           dstColor);
-                    builder->fsCodeAppendf("\t\t%s.rgb += (1.0 - %s.a) * %s.rgb + (1.0 - %s.a) * %s.rgb;\n",
-                                           outputColor, inputColor, dstColor, dstColor, inputColor);
-                    break;
-                }
-                case SkXfermode::kColor_Mode: {
-                    //  SetLum(S * Da, Sa* Da, D * Sa) + (1 - Sa) * D + (1 - Da) * S
-                    SkString setLum;
-                    AddLumFunction(builder, &setLum);
-                    builder->fsCodeAppendf("\t\tvec4 srcDstAlpha = %s * %s.a;\n",
-                                           inputColor, dstColor);
-                    builder->fsCodeAppendf("\t\t%s.rgb = %s(srcDstAlpha.rgb, srcDstAlpha.a, %s.rgb * %s.a);\n",
-                                           outputColor, setLum.c_str(), dstColor, inputColor);
-                    builder->fsCodeAppendf("\t\t%s.rgb += (1.0 - %s.a) * %s.rgb + (1.0 - %s.a) * %s.rgb;\n",
-                                           outputColor, inputColor, dstColor, dstColor, inputColor);
-                    break;
-                }
-                case SkXfermode::kLuminosity_Mode: {
-                    //  SetLum(D * Sa, Sa* Da, S * Da) + (1 - Sa) * D + (1 - Da) * S
-                    SkString setLum;
-                    AddLumFunction(builder, &setLum);
-                    builder->fsCodeAppendf("\t\tvec4 srcDstAlpha = %s * %s.a;\n",
-                                           inputColor, dstColor);
-                    builder->fsCodeAppendf("\t\t%s.rgb = %s(%s.rgb * %s.a, srcDstAlpha.a, srcDstAlpha.rgb);\n",
-                                           outputColor, setLum.c_str(), dstColor, inputColor);
-                    builder->fsCodeAppendf("\t\t%s.rgb += (1.0 - %s.a) * %s.rgb + (1.0 - %s.a) * %s.rgb;\n",
-                                           outputColor, inputColor, dstColor, dstColor, inputColor);
-                    break;
-                }
-                default:
-                    SkFAIL("Unknown XferEffect mode.");
-                    break;
-            }
-        }
-
-        static inline void GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
-                                  GrEffectKeyBuilder* b) {
-            // The background may come from the dst or from a texture.
-            uint32_t key = drawEffect.effect()->numTextures();
-            SkASSERT(key <= 1);
-            key |= drawEffect.castEffect<XferEffect>().mode() << 1;
-            b->add32(key);
-        }
-
-    private:
-        static void HardLight(GrGLShaderBuilder* builder,
-                              const char* final,
-                              const char* src,
-                              const char* dst) {
-            static const char kComponents[] = {'r', 'g', 'b'};
-            for (size_t i = 0; i < SK_ARRAY_COUNT(kComponents); ++i) {
-                char component = kComponents[i];
-                builder->fsCodeAppendf("\t\tif (2.0 * %s.%c <= %s.a) {\n", src, component, src);
-                builder->fsCodeAppendf("\t\t\t%s.%c = 2.0 * %s.%c * %s.%c;\n", final, component, src, component, dst, component);
-                builder->fsCodeAppend("\t\t} else {\n");
-                builder->fsCodeAppendf("\t\t\t%s.%c = %s.a * %s.a - 2.0 * (%s.a - %s.%c) * (%s.a - %s.%c);\n",
-                                       final, component, src, dst, dst, dst, component, src, src, component);
-                builder->fsCodeAppend("\t\t}\n");
-            }
-            builder->fsCodeAppendf("\t\t%s.rgb += %s.rgb * (1.0 - %s.a) + %s.rgb * (1.0 - %s.a);\n",
-                                   final, src, dst, dst, src);
-        }
-
-        // Does one component of color-dodge
-        static void ColorDodgeComponent(GrGLShaderBuilder* builder,
-                                        const char* final,
-                                        const char* src,
-                                        const char* dst,
-                                        const char component) {
-            builder->fsCodeAppendf("\t\tif (0.0 == %s.%c) {\n", dst, component);
-            builder->fsCodeAppendf("\t\t\t%s.%c = %s.%c * (1.0 - %s.a);\n",
-                                   final, component, src, component, dst);
-            builder->fsCodeAppend("\t\t} else {\n");
-            builder->fsCodeAppendf("\t\t\tfloat d = %s.a - %s.%c;\n", src, src, component);
-            builder->fsCodeAppend("\t\t\tif (0.0 == d) {\n");
-            builder->fsCodeAppendf("\t\t\t\t%s.%c = %s.a * %s.a + %s.%c * (1.0 - %s.a) + %s.%c * (1.0 - %s.a);\n",
-                                   final, component, src, dst, src, component, dst, dst, component,
-                                   src);
-            builder->fsCodeAppend("\t\t\t} else {\n");
-            builder->fsCodeAppendf("\t\t\t\td = min(%s.a, %s.%c * %s.a / d);\n",
-                                   dst, dst, component, src);
-            builder->fsCodeAppendf("\t\t\t\t%s.%c = d * %s.a + %s.%c * (1.0 - %s.a) + %s.%c * (1.0 - %s.a);\n",
-                                   final, component, src, src, component, dst, dst, component, src);
-            builder->fsCodeAppend("\t\t\t}\n");
-            builder->fsCodeAppend("\t\t}\n");
-        }
-
-        // Does one component of color-burn
-        static void ColorBurnComponent(GrGLShaderBuilder* builder,
-                                       const char* final,
-                                       const char* src,
-                                       const char* dst,
-                                       const char component) {
-            builder->fsCodeAppendf("\t\tif (%s.a == %s.%c) {\n", dst, dst, component);
-            builder->fsCodeAppendf("\t\t\t%s.%c = %s.a * %s.a + %s.%c * (1.0 - %s.a) + %s.%c * (1.0 - %s.a);\n",
-                                   final, component, src, dst, src, component, dst, dst, component,
-                                   src);
-            builder->fsCodeAppendf("\t\t} else if (0.0 == %s.%c) {\n", src, component);
-            builder->fsCodeAppendf("\t\t\t%s.%c = %s.%c * (1.0 - %s.a);\n",
-                                   final, component, dst, component, src);
-            builder->fsCodeAppend("\t\t} else {\n");
-            builder->fsCodeAppendf("\t\t\tfloat d = max(0.0, %s.a - (%s.a - %s.%c) * %s.a / %s.%c);\n",
-                                   dst, dst, dst, component, src, src, component);
-            builder->fsCodeAppendf("\t\t\t%s.%c = %s.a * d + %s.%c * (1.0 - %s.a) + %s.%c * (1.0 - %s.a);\n",
-                                   final, component, src, src, component, dst, dst, component, src);
-            builder->fsCodeAppend("\t\t}\n");
-        }
-
-        // Does one component of soft-light. Caller should have already checked that dst alpha > 0.
-        static void SoftLightComponentPosDstAlpha(GrGLShaderBuilder* builder,
-                                                  const char* final,
-                                                  const char* src,
-                                                  const char* dst,
-                                                  const char component) {
-            // if (2S < Sa)
-            builder->fsCodeAppendf("\t\t\tif (2.0 * %s.%c <= %s.a) {\n", src, component, src);
-            // (D^2 (Sa-2 S))/Da+(1-Da) S+D (-Sa+2 S+1)
-            builder->fsCodeAppendf("\t\t\t\t%s.%c = (%s.%c*%s.%c*(%s.a - 2.0*%s.%c)) / %s.a + (1.0 - %s.a) * %s.%c + %s.%c*(-%s.a + 2.0*%s.%c + 1.0);\n",
-                                   final, component, dst, component, dst, component, src, src,
-                                   component, dst, dst, src, component, dst, component, src, src,
-                                   component);
-            // else if (4D < Da)
-            builder->fsCodeAppendf("\t\t\t} else if (4.0 * %s.%c <= %s.a) {\n",
-                                   dst, component, dst);
-            builder->fsCodeAppendf("\t\t\t\tfloat DSqd = %s.%c * %s.%c;\n",
-                                   dst, component, dst, component);
-            builder->fsCodeAppendf("\t\t\t\tfloat DCub = DSqd * %s.%c;\n", dst, component);
-            builder->fsCodeAppendf("\t\t\t\tfloat DaSqd = %s.a * %s.a;\n", dst, dst);
-            builder->fsCodeAppendf("\t\t\t\tfloat DaCub = DaSqd * %s.a;\n", dst);
-            // (Da^3 (-S)+Da^2 (S-D (3 Sa-6 S-1))+12 Da D^2 (Sa-2 S)-16 D^3 (Sa-2 S))/Da^2
-            builder->fsCodeAppendf("\t\t\t\t%s.%c = (-DaCub*%s.%c + DaSqd*(%s.%c - %s.%c * (3.0*%s.a - 6.0*%s.%c - 1.0)) + 12.0*%s.a*DSqd*(%s.a - 2.0*%s.%c) - 16.0*DCub * (%s.a - 2.0*%s.%c)) / DaSqd;\n",
-                                   final, component, src, component, src, component, dst, component,
-                                   src, src, component, dst, src, src, component, src, src,
-                                   component);
-            builder->fsCodeAppendf("\t\t\t} else {\n");
-            // -sqrt(Da * D) (Sa-2 S)-Da S+D (Sa-2 S+1)+S
-            builder->fsCodeAppendf("\t\t\t\t%s.%c = -sqrt(%s.a*%s.%c)*(%s.a - 2.0*%s.%c) - %s.a*%s.%c + %s.%c*(%s.a - 2.0*%s.%c + 1.0) + %s.%c;\n",
-                                    final, component, dst, dst, component, src, src, component, dst,
-                                    src, component, dst, component, src, src, component, src,
-                                    component);
-            builder->fsCodeAppendf("\t\t\t}\n");
-        }
-
-        // Adds a function that takes two colors and an alpha as input. It produces a color with the
-        // hue and saturation of the first color, the luminosity of the second color, and the input
-        // alpha. It has this signature:
-        //      vec3 set_luminance(vec3 hueSatColor, float alpha, vec3 lumColor).
-        static void AddLumFunction(GrGLShaderBuilder* builder, SkString* setLumFunction) {
-            // Emit a helper that gets the luminance of a color.
-            SkString getFunction;
-            GrGLShaderVar getLumArgs[] = {
-                GrGLShaderVar("color", kVec3f_GrSLType),
-            };
-            SkString getLumBody("\treturn dot(vec3(0.3, 0.59, 0.11), color);\n");
-            builder->fsEmitFunction(kFloat_GrSLType,
-                                    "luminance",
-                                    SK_ARRAY_COUNT(getLumArgs), getLumArgs,
-                                    getLumBody.c_str(),
-                                    &getFunction);
-
-            // Emit the set luminance function.
-            GrGLShaderVar setLumArgs[] = {
-                GrGLShaderVar("hueSat", kVec3f_GrSLType),
-                GrGLShaderVar("alpha", kFloat_GrSLType),
-                GrGLShaderVar("lumColor", kVec3f_GrSLType),
-            };
-            SkString setLumBody;
-            setLumBody.printf("\tfloat diff = %s(lumColor - hueSat);\n", getFunction.c_str());
-            setLumBody.append("\tvec3 outColor = hueSat + diff;\n");
-            setLumBody.appendf("\tfloat outLum = %s(outColor);\n", getFunction.c_str());
-            setLumBody.append("\tfloat minComp = min(min(outColor.r, outColor.g), outColor.b);\n"
-                              "\tfloat maxComp = max(max(outColor.r, outColor.g), outColor.b);\n"
-                              "\tif (minComp < 0.0) {\n"
-                              "\t\toutColor = outLum + ((outColor - vec3(outLum, outLum, outLum)) * outLum) / (outLum - minComp);\n"
-                              "\t}\n"
-                              "\tif (maxComp > alpha) {\n"
-                              "\t\toutColor = outLum + ((outColor - vec3(outLum, outLum, outLum)) * (alpha - outLum)) / (maxComp - outLum);\n"
-                              "\t}\n"
-                              "\treturn outColor;\n");
-            builder->fsEmitFunction(kVec3f_GrSLType,
-                                    "set_luminance",
-                                    SK_ARRAY_COUNT(setLumArgs), setLumArgs,
-                                    setLumBody.c_str(),
-                                    setLumFunction);
-        }
-
-        // Adds a function that creates a color with the hue and luminosity of one input color and
-        // the saturation of another color. It will have this signature:
-        //      float set_saturation(vec3 hueLumColor, vec3 satColor)
-        static void AddSatFunction(GrGLShaderBuilder* builder, SkString* setSatFunction) {
-            // Emit a helper that gets the saturation of a color
-            SkString getFunction;
-            GrGLShaderVar getSatArgs[] = { GrGLShaderVar("color", kVec3f_GrSLType) };
-            SkString getSatBody;
-            getSatBody.printf("\treturn max(max(color.r, color.g), color.b) - "
-                              "min(min(color.r, color.g), color.b);\n");
-            builder->fsEmitFunction(kFloat_GrSLType,
-                                    "saturation",
-                                    SK_ARRAY_COUNT(getSatArgs), getSatArgs,
-                                    getSatBody.c_str(),
-                                    &getFunction);
-
-            // Emit a helper that sets the saturation given sorted input channels. This used
-            // to use inout params for min, mid, and max components but that seems to cause
-            // problems on PowerVR drivers. So instead it returns a vec3 where r, g ,b are the
-            // adjusted min, mid, and max inputs, respectively.
-            SkString helperFunction;
-            GrGLShaderVar helperArgs[] = {
-                GrGLShaderVar("minComp", kFloat_GrSLType),
-                GrGLShaderVar("midComp", kFloat_GrSLType),
-                GrGLShaderVar("maxComp", kFloat_GrSLType),
-                GrGLShaderVar("sat", kFloat_GrSLType),
-            };
-            static const char kHelperBody[] = "\tif (minComp < maxComp) {\n"
-                                              "\t\tvec3 result;\n"
-                                              "\t\tresult.r = 0.0;\n"
-                                              "\t\tresult.g = sat * (midComp - minComp) / (maxComp - minComp);\n"
-                                              "\t\tresult.b = sat;\n"
-                                              "\t\treturn result;\n"
-                                              "\t} else {\n"
-                                              "\t\treturn vec3(0, 0, 0);\n"
-                                              "\t}\n";
-            builder->fsEmitFunction(kVec3f_GrSLType,
-                                    "set_saturation_helper",
-                                    SK_ARRAY_COUNT(helperArgs), helperArgs,
-                                    kHelperBody,
-                                    &helperFunction);
-
-            GrGLShaderVar setSatArgs[] = {
-                GrGLShaderVar("hueLumColor", kVec3f_GrSLType),
-                GrGLShaderVar("satColor", kVec3f_GrSLType),
-            };
-            const char* helpFunc = helperFunction.c_str();
-            SkString setSatBody;
-            setSatBody.appendf("\tfloat sat = %s(satColor);\n"
-                               "\tif (hueLumColor.r <= hueLumColor.g) {\n"
-                               "\t\tif (hueLumColor.g <= hueLumColor.b) {\n"
-                               "\t\t\thueLumColor.rgb = %s(hueLumColor.r, hueLumColor.g, hueLumColor.b, sat);\n"
-                               "\t\t} else if (hueLumColor.r <= hueLumColor.b) {\n"
-                               "\t\t\thueLumColor.rbg = %s(hueLumColor.r, hueLumColor.b, hueLumColor.g, sat);\n"
-                               "\t\t} else {\n"
-                               "\t\t\thueLumColor.brg = %s(hueLumColor.b, hueLumColor.r, hueLumColor.g, sat);\n"
-                               "\t\t}\n"
-                               "\t} else if (hueLumColor.r <= hueLumColor.b) {\n"
-                               "\t\thueLumColor.grb = %s(hueLumColor.g, hueLumColor.r, hueLumColor.b, sat);\n"
-                               "\t} else if (hueLumColor.g <= hueLumColor.b) {\n"
-                               "\t\thueLumColor.gbr = %s(hueLumColor.g, hueLumColor.b, hueLumColor.r, sat);\n"
-                               "\t} else {\n"
-                               "\t\thueLumColor.bgr = %s(hueLumColor.b, hueLumColor.g, hueLumColor.r, sat);\n"
-                               "\t}\n"
-                               "\treturn hueLumColor;\n",
-                               getFunction.c_str(), helpFunc, helpFunc, helpFunc, helpFunc,
-                               helpFunc, helpFunc);
-            builder->fsEmitFunction(kVec3f_GrSLType,
-                                    "set_saturation",
-                                    SK_ARRAY_COUNT(setSatArgs), setSatArgs,
-                                    setSatBody.c_str(),
-                                    setSatFunction);
-
-        }
-
-        typedef GrGLEffect INHERITED;
-    };
-
-    GR_DECLARE_EFFECT_TEST;
-
-private:
-    XferEffect(SkXfermode::Mode mode, GrTexture* background)
-        : fMode(mode) {
-        if (background) {
-            fBackgroundTransform.reset(kLocal_GrCoordSet, background);
-            this->addCoordTransform(&fBackgroundTransform);
-            fBackgroundAccess.reset(background);
-            this->addTextureAccess(&fBackgroundAccess);
-        } else {
-            this->setWillReadDstColor();
-        }
-    }
-    virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE {
-        const XferEffect& s = CastEffect<XferEffect>(other);
-        return fMode == s.fMode &&
-               fBackgroundAccess.getTexture() == s.fBackgroundAccess.getTexture();
-    }
-
-    SkXfermode::Mode fMode;
-    GrCoordTransform fBackgroundTransform;
-    GrTextureAccess  fBackgroundAccess;
-
-    typedef GrEffect INHERITED;
-};
-
-GR_DEFINE_EFFECT_TEST(XferEffect);
-GrEffect* XferEffect::TestCreate(SkRandom* rand,
-                                 GrContext*,
-                                 const GrDrawTargetCaps&,
-                                 GrTexture*[]) {
-    int mode = rand->nextRangeU(SkXfermode::kLastCoeffMode + 1, SkXfermode::kLastSeparableMode);
-
-    return SkNEW_ARGS(XferEffect, (static_cast<SkXfermode::Mode>(mode), NULL));
+bool SkXfermode::supportsCoverageAsAlpha() const {
+    return false;
 }
 
-#endif
+bool SkXfermode::isOpaque(SkXfermode::SrcColorOpacity opacityType) const {
+    return false;
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
-SkProcCoeffXfermode::SkProcCoeffXfermode(SkReadBuffer& buffer) : INHERITED(buffer) {
-    uint32_t mode32 = buffer.read32() % SK_ARRAY_COUNT(gProcCoeffs);
-    if (mode32 >= SK_ARRAY_COUNT(gProcCoeffs)) {
-        // out of range, just set to something harmless
-        mode32 = SkXfermode::kSrcOut_Mode;
+SkFlattenable* SkProcCoeffXfermode::CreateProc(SkReadBuffer& buffer) {
+    uint32_t mode32 = buffer.read32();
+    if (!buffer.validate(mode32 < SK_ARRAY_COUNT(gProcCoeffs))) {
+        return nullptr;
     }
-    fMode = (SkXfermode::Mode)mode32;
+    return SkXfermode::Create((SkXfermode::Mode)mode32);
+}
 
-    const ProcCoeff& rec = gProcCoeffs[fMode];
-    fProc = rec.fProc;
-    // these may be valid, or may be CANNOT_USE_COEFF
-    fSrcCoeff = rec.fSC;
-    fDstCoeff = rec.fDC;
+void SkProcCoeffXfermode::flatten(SkWriteBuffer& buffer) const {
+    buffer.write32(fMode);
 }
 
 bool SkProcCoeffXfermode::asMode(Mode* mode) const {
@@ -1262,18 +770,45 @@ bool SkProcCoeffXfermode::asMode(Mode* mode) const {
     return true;
 }
 
-bool SkProcCoeffXfermode::asCoeff(Coeff* sc, Coeff* dc) const {
+bool SkProcCoeffXfermode::supportsCoverageAsAlpha() const {
     if (CANNOT_USE_COEFF == fSrcCoeff) {
         return false;
     }
 
-    if (sc) {
-        *sc = fSrcCoeff;
+    switch (fDstCoeff) {
+        case SkXfermode::kOne_Coeff:
+        case SkXfermode::kISA_Coeff:
+        case SkXfermode::kISC_Coeff:
+            return true;
+        default:
+            return false;
     }
-    if (dc) {
-        *dc = fDstCoeff;
+}
+
+bool SkProcCoeffXfermode::isOpaque(SkXfermode::SrcColorOpacity opacityType) const {
+    if (CANNOT_USE_COEFF == fSrcCoeff) {
+        return false;
     }
-    return true;
+
+    if (SkXfermode::kDA_Coeff == fSrcCoeff || SkXfermode::kDC_Coeff == fSrcCoeff ||
+        SkXfermode::kIDA_Coeff == fSrcCoeff || SkXfermode::kIDC_Coeff == fSrcCoeff) {
+        return false;
+    }
+
+    switch (fDstCoeff) {
+        case SkXfermode::kZero_Coeff:
+            return true;
+        case SkXfermode::kISA_Coeff:
+            return SkXfermode::kOpaque_SrcColorOpacity == opacityType;
+        case SkXfermode::kSA_Coeff:
+            return SkXfermode::kTransparentBlack_SrcColorOpacity == opacityType ||
+                   SkXfermode::kTransparentAlpha_SrcColorOpacity == opacityType;
+        case SkXfermode::kSC_Coeff:
+            return SkXfermode::kTransparentBlack_SrcColorOpacity == opacityType;
+        default:
+            return false;
+    }
+
 }
 
 void SkProcCoeffXfermode::xfer32(SkPMColor* SK_RESTRICT dst,
@@ -1283,8 +818,8 @@ void SkProcCoeffXfermode::xfer32(SkPMColor* SK_RESTRICT dst,
 
     SkXfermodeProc proc = fProc;
 
-    if (NULL != proc) {
-        if (NULL == aa) {
+    if (proc) {
+        if (nullptr == aa) {
             for (int i = count - 1; i >= 0; --i) {
                 dst[i] = proc(src[i], dst[i]);
             }
@@ -1311,8 +846,8 @@ void SkProcCoeffXfermode::xfer16(uint16_t* SK_RESTRICT dst,
 
     SkXfermodeProc proc = fProc;
 
-    if (NULL != proc) {
-        if (NULL == aa) {
+    if (proc) {
+        if (nullptr == aa) {
             for (int i = count - 1; i >= 0; --i) {
                 SkPMColor dstC = SkPixel16ToPixel32(dst[i]);
                 dst[i] = SkPixel32ToPixel16_ToU16(proc(src[i], dstC));
@@ -1340,8 +875,8 @@ void SkProcCoeffXfermode::xferA8(SkAlpha* SK_RESTRICT dst,
 
     SkXfermodeProc proc = fProc;
 
-    if (NULL != proc) {
-        if (NULL == aa) {
+    if (proc) {
+        if (nullptr == aa) {
             for (int i = count - 1; i >= 0; --i) {
                 SkPMColor res = proc(src[i], dst[i] << SK_A32_SHIFT);
                 dst[i] = SkToU8(SkGetPackedA32(res));
@@ -1364,11 +899,33 @@ void SkProcCoeffXfermode::xferA8(SkAlpha* SK_RESTRICT dst,
 }
 
 #if SK_SUPPORT_GPU
-bool SkProcCoeffXfermode::asNewEffect(GrEffect** effect, GrTexture* background) const {
-    if (XferEffect::IsSupportedMode(fMode)) {
-        if (NULL != effect) {
-            *effect = XferEffect::Create(fMode, background);
-            SkASSERT(NULL != *effect);
+#include "effects/GrCustomXfermode.h"
+#include "effects/GrPorterDuffXferProcessor.h"
+#include "effects/GrXfermodeFragmentProcessor.h"
+
+bool SkProcCoeffXfermode::asFragmentProcessor(const GrFragmentProcessor** fp,
+                                              const GrFragmentProcessor* dst) const {
+    if (fp) {
+        SkASSERT(dst);
+        *fp = GrXfermodeFragmentProcessor::CreateFromDstProcessor(dst, fMode);
+        SkASSERT(*fp || kSrc_Mode == fMode);
+    }
+    return true;
+}
+
+bool SkProcCoeffXfermode::asXPFactory(GrXPFactory** xp) const {
+    if (CANNOT_USE_COEFF != fSrcCoeff) {
+        if (xp) {
+            *xp = GrPorterDuffXPFactory::Create(fMode);
+            SkASSERT(*xp);
+        }
+        return true;
+    }
+
+    if (GrCustomXfermode::IsSupportedMode(fMode)) {
+        if (xp) {
+            *xp = GrCustomXfermode::CreateXPFactory(fMode);
+            SkASSERT(*xp);
         }
         return true;
     }
@@ -1376,11 +933,6 @@ bool SkProcCoeffXfermode::asNewEffect(GrEffect** effect, GrTexture* background)
 }
 #endif
 
-void SkProcCoeffXfermode::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
-    buffer.write32(fMode);
-}
-
 const char* SkXfermode::ModeName(Mode mode) {
     SkASSERT((unsigned) mode <= (unsigned)kLastMode);
     const char* gModeStrings[] = {
@@ -1391,7 +943,7 @@ const char* SkXfermode::ModeName(Mode mode) {
         "Multiply", "Hue", "Saturation", "Color",  "Luminosity"
     };
     return gModeStrings[mode];
-    SK_COMPILE_ASSERT(SK_ARRAY_COUNT(gModeStrings) == kLastMode + 1, mode_count);
+    static_assert(SK_ARRAY_COUNT(gModeStrings) == kLastMode + 1, "mode_count");
 }
 
 #ifndef SK_IGNORE_TO_STRING
@@ -1421,306 +973,34 @@ void SkProcCoeffXfermode::toString(SkString* str) const {
 }
 #endif
 
-///////////////////////////////////////////////////////////////////////////////
-
-class SkClearXfermode : public SkProcCoeffXfermode {
-public:
-    static SkClearXfermode* Create(const ProcCoeff& rec) {
-        return SkNEW_ARGS(SkClearXfermode, (rec));
-    }
-
-    virtual void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE;
-    virtual void xferA8(SkAlpha*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE;
-
-    SK_TO_STRING_OVERRIDE()
-    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkClearXfermode)
-
-private:
-    SkClearXfermode(const ProcCoeff& rec) : SkProcCoeffXfermode(rec, kClear_Mode) {}
-    SkClearXfermode(SkReadBuffer& buffer)
-        : SkProcCoeffXfermode(buffer) {}
-
-    typedef SkProcCoeffXfermode INHERITED;
-};
-
-void SkClearXfermode::xfer32(SkPMColor* SK_RESTRICT dst,
-                             const SkPMColor* SK_RESTRICT, int count,
-                             const SkAlpha* SK_RESTRICT aa) const {
-    SkASSERT(dst && count >= 0);
-
-    if (NULL == aa) {
-        memset(dst, 0, count << 2);
-    } else {
-        for (int i = count - 1; i >= 0; --i) {
-            unsigned a = aa[i];
-            if (0xFF == a) {
-                dst[i] = 0;
-            } else if (a != 0) {
-                dst[i] = SkAlphaMulQ(dst[i], SkAlpha255To256(255 - a));
-            }
-        }
-    }
-}
-void SkClearXfermode::xferA8(SkAlpha* SK_RESTRICT dst,
-                             const SkPMColor* SK_RESTRICT, int count,
-                             const SkAlpha* SK_RESTRICT aa) const {
-    SkASSERT(dst && count >= 0);
-
-    if (NULL == aa) {
-        memset(dst, 0, count);
-    } else {
-        for (int i = count - 1; i >= 0; --i) {
-            unsigned a = aa[i];
-            if (0xFF == a) {
-                dst[i] = 0;
-            } else if (0 != a) {
-                dst[i] = SkAlphaMulAlpha(dst[i], 255 - a);
-            }
-        }
-    }
-}
-
-#ifndef SK_IGNORE_TO_STRING
-void SkClearXfermode::toString(SkString* str) const {
-    this->INHERITED::toString(str);
-}
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-
-class SkSrcXfermode : public SkProcCoeffXfermode {
-public:
-    static SkSrcXfermode* Create(const ProcCoeff& rec) {
-        return SkNEW_ARGS(SkSrcXfermode, (rec));
-    }
-
-    virtual void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE;
-    virtual void xferA8(SkAlpha*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE;
-
-    SK_TO_STRING_OVERRIDE()
-    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSrcXfermode)
-
-private:
-    SkSrcXfermode(const ProcCoeff& rec) : SkProcCoeffXfermode(rec, kSrc_Mode) {}
-    SkSrcXfermode(SkReadBuffer& buffer)
-        : SkProcCoeffXfermode(buffer) {}
-
-    typedef SkProcCoeffXfermode INHERITED;
-};
-
-void SkSrcXfermode::xfer32(SkPMColor* SK_RESTRICT dst,
-                           const SkPMColor* SK_RESTRICT src, int count,
-                           const SkAlpha* SK_RESTRICT aa) const {
-    SkASSERT(dst && src && count >= 0);
-
-    if (NULL == aa) {
-        memcpy(dst, src, count << 2);
-    } else {
-        for (int i = count - 1; i >= 0; --i) {
-            unsigned a = aa[i];
-            if (a == 0xFF) {
-                dst[i] = src[i];
-            } else if (a != 0) {
-                dst[i] = SkFourByteInterp(src[i], dst[i], a);
-            }
-        }
-    }
-}
-
-void SkSrcXfermode::xferA8(SkAlpha* SK_RESTRICT dst,
-                           const SkPMColor* SK_RESTRICT src, int count,
-                           const SkAlpha* SK_RESTRICT aa) const {
-    SkASSERT(dst && src && count >= 0);
-
-    if (NULL == aa) {
-        for (int i = count - 1; i >= 0; --i) {
-            dst[i] = SkToU8(SkGetPackedA32(src[i]));
-        }
-    } else {
-        for (int i = count - 1; i >= 0; --i) {
-            unsigned a = aa[i];
-            if (0 != a) {
-                unsigned srcA = SkGetPackedA32(src[i]);
-                if (a == 0xFF) {
-                    dst[i] = SkToU8(srcA);
-                } else {
-                    dst[i] = SkToU8(SkAlphaBlend(srcA, dst[i], a));
-                }
-            }
-        }
-    }
-}
-#ifndef SK_IGNORE_TO_STRING
-void SkSrcXfermode::toString(SkString* str) const {
-    this->INHERITED::toString(str);
-}
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-
-class SkDstInXfermode : public SkProcCoeffXfermode {
-public:
-    static SkDstInXfermode* Create(const ProcCoeff& rec) {
-        return SkNEW_ARGS(SkDstInXfermode, (rec));
-    }
-
-    virtual void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE;
-
-    SK_TO_STRING_OVERRIDE()
-    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDstInXfermode)
-
-private:
-    SkDstInXfermode(const ProcCoeff& rec) : SkProcCoeffXfermode(rec, kDstIn_Mode) {}
-    SkDstInXfermode(SkReadBuffer& buffer) : INHERITED(buffer) {}
-
-    typedef SkProcCoeffXfermode INHERITED;
-};
-
-void SkDstInXfermode::xfer32(SkPMColor* SK_RESTRICT dst,
-                             const SkPMColor* SK_RESTRICT src, int count,
-                             const SkAlpha* SK_RESTRICT aa) const {
-    SkASSERT(dst && src);
-
-    if (count <= 0) {
-        return;
-    }
-    if (NULL != aa) {
-        return this->INHERITED::xfer32(dst, src, count, aa);
-    }
-
-    do {
-        unsigned a = SkGetPackedA32(*src);
-        *dst = SkAlphaMulQ(*dst, SkAlpha255To256(a));
-        dst++;
-        src++;
-    } while (--count != 0);
-}
-
-#ifndef SK_IGNORE_TO_STRING
-void SkDstInXfermode::toString(SkString* str) const {
-    this->INHERITED::toString(str);
-}
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-
-class SkDstOutXfermode : public SkProcCoeffXfermode {
-public:
-    static SkDstOutXfermode* Create(const ProcCoeff& rec) {
-        return SkNEW_ARGS(SkDstOutXfermode, (rec));
-    }
-
-    virtual void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE;
-
-    SK_TO_STRING_OVERRIDE()
-    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDstOutXfermode)
-
-private:
-    SkDstOutXfermode(const ProcCoeff& rec) : SkProcCoeffXfermode(rec, kDstOut_Mode) {}
-    SkDstOutXfermode(SkReadBuffer& buffer)
-        : INHERITED(buffer) {}
-
-    typedef SkProcCoeffXfermode INHERITED;
-};
-
-void SkDstOutXfermode::xfer32(SkPMColor* SK_RESTRICT dst,
-                              const SkPMColor* SK_RESTRICT src, int count,
-                              const SkAlpha* SK_RESTRICT aa) const {
-    SkASSERT(dst && src);
-
-    if (count <= 0) {
-        return;
-    }
-    if (NULL != aa) {
-        return this->INHERITED::xfer32(dst, src, count, aa);
-    }
-
-    do {
-        unsigned a = SkGetPackedA32(*src);
-        *dst = SkAlphaMulQ(*dst, SkAlpha255To256(255 - a));
-        dst++;
-        src++;
-    } while (--count != 0);
-}
-
-#ifndef SK_IGNORE_TO_STRING
-void SkDstOutXfermode::toString(SkString* str) const {
-    this->INHERITED::toString(str);
-}
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-
-extern SkProcCoeffXfermode* SkPlatformXfermodeFactory(const ProcCoeff& rec, SkXfermode::Mode mode);
-extern SkXfermodeProc SkPlatformXfermodeProcFactory(SkXfermode::Mode mode);
-
-// Technically, can't be static and passed as a template parameter.  So we use anonymous namespace.
-namespace {
-SkXfermode* create_mode(int iMode) {
-    SkXfermode::Mode mode = (SkXfermode::Mode)iMode;
-
-    ProcCoeff rec = gProcCoeffs[mode];
-    SkXfermodeProc pp = SkPlatformXfermodeProcFactory(mode);
-    if (pp != NULL) {
-        rec.fProc = pp;
-    }
-
-    SkXfermode* xfer = NULL;
-    // check if we have a platform optim for that
-    SkProcCoeffXfermode* xfm = SkPlatformXfermodeFactory(rec, mode);
-    if (xfm != NULL) {
-        xfer = xfm;
-    } else {
-        // All modes can in theory be represented by the ProcCoeff rec, since
-        // it contains function ptrs. However, a few modes are both simple and
-        // commonly used, so we call those out for their own subclasses here.
-        switch (mode) {
-            case SkXfermode::kClear_Mode:
-                xfer = SkClearXfermode::Create(rec);
-                break;
-            case SkXfermode::kSrc_Mode:
-                xfer = SkSrcXfermode::Create(rec);
-                break;
-            case SkXfermode::kSrcOver_Mode:
-                SkASSERT(false);    // should not land here
-                break;
-            case SkXfermode::kDstIn_Mode:
-                xfer = SkDstInXfermode::Create(rec);
-                break;
-            case SkXfermode::kDstOut_Mode:
-                xfer = SkDstOutXfermode::Create(rec);
-                break;
-            default:
-                // no special-case, just rely in the rec and its function-ptrs
-                xfer = SkProcCoeffXfermode::Create(rec, mode);
-                break;
-        }
-    }
-    return xfer;
-}
-}  // namespace
 
+SK_DECLARE_STATIC_ONCE_PTR(SkXfermode, cached[SkXfermode::kLastMode + 1]);
 
 SkXfermode* SkXfermode::Create(Mode mode) {
     SkASSERT(SK_ARRAY_COUNT(gProcCoeffs) == kModeCount);
 
     if ((unsigned)mode >= kModeCount) {
         // report error
-        return NULL;
+        return nullptr;
     }
 
-    // Skia's "default" mode is srcover. NULL in SkPaint is interpreted as srcover
-    // so we can just return NULL from the factory.
+    // Skia's "default" mode is srcover. nullptr in SkPaint is interpreted as srcover
+    // so we can just return nullptr from the factory.
     if (kSrcOver_Mode == mode) {
-        return NULL;
+        return nullptr;
     }
 
-    SK_DECLARE_STATIC_LAZY_PTR_ARRAY(SkXfermode, cached, kModeCount, create_mode);
-    return SkSafeRef(cached[mode]);
+    return SkSafeRef(cached[mode].get([=]{
+        ProcCoeff rec = gProcCoeffs[mode];
+        if (auto xfermode = SkOpts::create_xfermode(rec, mode)) {
+            return xfermode;
+        }
+        return (SkXfermode*) new SkProcCoeffXfermode(rec, mode);
+    }));
 }
 
 SkXfermodeProc SkXfermode::GetProc(Mode mode) {
-    SkXfermodeProc  proc = NULL;
+    SkXfermodeProc  proc = nullptr;
     if ((unsigned)mode < kModeCount) {
         proc = gProcCoeffs[mode].fProc;
     }
@@ -1752,7 +1032,7 @@ bool SkXfermode::ModeAsCoeff(Mode mode, Coeff* src, Coeff* dst) {
 }
 
 bool SkXfermode::AsMode(const SkXfermode* xfer, Mode* mode) {
-    if (NULL == xfer) {
+    if (nullptr == xfer) {
         if (mode) {
             *mode = kSrcOver_Mode;
         }
@@ -1761,13 +1041,6 @@ bool SkXfermode::AsMode(const SkXfermode* xfer, Mode* mode) {
     return xfer->asMode(mode);
 }
 
-bool SkXfermode::AsCoeff(const SkXfermode* xfer, Coeff* src, Coeff* dst) {
-    if (NULL == xfer) {
-        return ModeAsCoeff(kSrcOver_Mode, src, dst);
-    }
-    return xfer->asCoeff(src, dst);
-}
-
 bool SkXfermode::IsMode(const SkXfermode* xfer, Mode mode) {
     // if xfer==null then the mode is srcover
     Mode m = kSrcOver_Mode;
@@ -1777,189 +1050,24 @@ bool SkXfermode::IsMode(const SkXfermode* xfer, Mode mode) {
     return mode == m;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-//////////// 16bit xfermode procs
-
-#ifdef SK_DEBUG
-static bool require_255(SkPMColor src) { return SkGetPackedA32(src) == 0xFF; }
-static bool require_0(SkPMColor src) { return SkGetPackedA32(src) == 0; }
-#endif
-
-static uint16_t src_modeproc16_255(SkPMColor src, uint16_t dst) {
-    SkASSERT(require_255(src));
-    return SkPixel32ToPixel16(src);
-}
-
-static uint16_t dst_modeproc16(SkPMColor src, uint16_t dst) {
-    return dst;
-}
-
-static uint16_t srcover_modeproc16_0(SkPMColor src, uint16_t dst) {
-    SkASSERT(require_0(src));
-    return dst;
-}
-
-static uint16_t srcover_modeproc16_255(SkPMColor src, uint16_t dst) {
-    SkASSERT(require_255(src));
-    return SkPixel32ToPixel16(src);
-}
-
-static uint16_t dstover_modeproc16_0(SkPMColor src, uint16_t dst) {
-    SkASSERT(require_0(src));
-    return dst;
-}
-
-static uint16_t dstover_modeproc16_255(SkPMColor src, uint16_t dst) {
-    SkASSERT(require_255(src));
-    return dst;
-}
-
-static uint16_t srcin_modeproc16_255(SkPMColor src, uint16_t dst) {
-    SkASSERT(require_255(src));
-    return SkPixel32ToPixel16(src);
-}
-
-static uint16_t dstin_modeproc16_255(SkPMColor src, uint16_t dst) {
-    SkASSERT(require_255(src));
-    return dst;
-}
-
-static uint16_t dstout_modeproc16_0(SkPMColor src, uint16_t dst) {
-    SkASSERT(require_0(src));
-    return dst;
-}
-
-static uint16_t srcatop_modeproc16(SkPMColor src, uint16_t dst) {
-    unsigned isa = 255 - SkGetPackedA32(src);
-
-    return SkPackRGB16(
-           SkPacked32ToR16(src) + SkAlphaMulAlpha(SkGetPackedR16(dst), isa),
-           SkPacked32ToG16(src) + SkAlphaMulAlpha(SkGetPackedG16(dst), isa),
-           SkPacked32ToB16(src) + SkAlphaMulAlpha(SkGetPackedB16(dst), isa));
-}
-
-static uint16_t srcatop_modeproc16_0(SkPMColor src, uint16_t dst) {
-    SkASSERT(require_0(src));
-    return dst;
-}
-
-static uint16_t srcatop_modeproc16_255(SkPMColor src, uint16_t dst) {
-    SkASSERT(require_255(src));
-    return SkPixel32ToPixel16(src);
-}
-
-static uint16_t dstatop_modeproc16_255(SkPMColor src, uint16_t dst) {
-    SkASSERT(require_255(src));
-    return dst;
-}
-
-/*********
-    darken and lighten boil down to this.
-
-    darken  = (1 - Sa) * Dc + min(Sc, Dc)
-    lighten = (1 - Sa) * Dc + max(Sc, Dc)
-
-    if (Sa == 0) these become
-        darken  = Dc + min(0, Dc) = 0
-        lighten = Dc + max(0, Dc) = Dc
-
-    if (Sa == 1) these become
-        darken  = min(Sc, Dc)
-        lighten = max(Sc, Dc)
-*/
-
-static uint16_t darken_modeproc16_0(SkPMColor src, uint16_t dst) {
-    SkASSERT(require_0(src));
-    return 0;
-}
-
-static uint16_t darken_modeproc16_255(SkPMColor src, uint16_t dst) {
-    SkASSERT(require_255(src));
-    unsigned r = SkFastMin32(SkPacked32ToR16(src), SkGetPackedR16(dst));
-    unsigned g = SkFastMin32(SkPacked32ToG16(src), SkGetPackedG16(dst));
-    unsigned b = SkFastMin32(SkPacked32ToB16(src), SkGetPackedB16(dst));
-    return SkPackRGB16(r, g, b);
-}
-
-static uint16_t lighten_modeproc16_0(SkPMColor src, uint16_t dst) {
-    SkASSERT(require_0(src));
-    return dst;
-}
-
-static uint16_t lighten_modeproc16_255(SkPMColor src, uint16_t dst) {
-    SkASSERT(require_255(src));
-    unsigned r = SkMax32(SkPacked32ToR16(src), SkGetPackedR16(dst));
-    unsigned g = SkMax32(SkPacked32ToG16(src), SkGetPackedG16(dst));
-    unsigned b = SkMax32(SkPacked32ToB16(src), SkGetPackedB16(dst));
-    return SkPackRGB16(r, g, b);
-}
-
-struct Proc16Rec {
-    SkXfermodeProc16    fProc16_0;
-    SkXfermodeProc16    fProc16_255;
-    SkXfermodeProc16    fProc16_General;
-};
-
-static const Proc16Rec gModeProcs16[] = {
-    { NULL,                 NULL,                   NULL            }, // CLEAR
-    { NULL,                 src_modeproc16_255,     NULL            },
-    { dst_modeproc16,       dst_modeproc16,         dst_modeproc16  },
-    { srcover_modeproc16_0, srcover_modeproc16_255, NULL            },
-    { dstover_modeproc16_0, dstover_modeproc16_255, NULL            },
-    { NULL,                 srcin_modeproc16_255,   NULL            },
-    { NULL,                 dstin_modeproc16_255,   NULL            },
-    { NULL,                 NULL,                   NULL            },// SRC_OUT
-    { dstout_modeproc16_0,  NULL,                   NULL            },
-    { srcatop_modeproc16_0, srcatop_modeproc16_255, srcatop_modeproc16  },
-    { NULL,                 dstatop_modeproc16_255, NULL            },
-    { NULL,                 NULL,                   NULL            }, // XOR
-
-    { NULL,                 NULL,                   NULL            }, // plus
-    { NULL,                 NULL,                   NULL            }, // modulate
-    { NULL,                 NULL,                   NULL            }, // screen
-    { NULL,                 NULL,                   NULL            }, // overlay
-    { darken_modeproc16_0,  darken_modeproc16_255,  NULL            }, // darken
-    { lighten_modeproc16_0, lighten_modeproc16_255, NULL            }, // lighten
-    { NULL,                 NULL,                   NULL            }, // colordodge
-    { NULL,                 NULL,                   NULL            }, // colorburn
-    { NULL,                 NULL,                   NULL            }, // hardlight
-    { NULL,                 NULL,                   NULL            }, // softlight
-    { NULL,                 NULL,                   NULL            }, // difference
-    { NULL,                 NULL,                   NULL            }, // exclusion
-    { NULL,                 NULL,                   NULL            }, // multiply
-    { NULL,                 NULL,                   NULL            }, // hue
-    { NULL,                 NULL,                   NULL            }, // saturation
-    { NULL,                 NULL,                   NULL            }, // color
-    { NULL,                 NULL,                   NULL            }, // luminosity
-};
-
-SkXfermodeProc16 SkXfermode::GetProc16(Mode mode, SkColor srcColor) {
-    SkXfermodeProc16  proc16 = NULL;
-    if ((unsigned)mode < kModeCount) {
-        const Proc16Rec& rec = gModeProcs16[mode];
-        unsigned a = SkColorGetA(srcColor);
-
-        if (0 == a) {
-            proc16 = rec.fProc16_0;
-        } else if (255 == a) {
-            proc16 = rec.fProc16_255;
-        } else {
-            proc16 = rec.fProc16_General;
-        }
+bool SkXfermode::SupportsCoverageAsAlpha(const SkXfermode* xfer) {
+    // if xfer is nullptr we treat it as srcOver which always supports coverageAsAlpha
+    if (!xfer) {
+        return true;
     }
-    return proc16;
+
+    return xfer->supportsCoverageAsAlpha();
+}
+
+bool SkXfermode::IsOpaque(const SkXfermode* xfer, SrcColorOpacity opacityType) {
+    // if xfer is nullptr we treat it as srcOver which is opaque if our src is opaque
+    if (!xfer) {
+        return SkXfermode::kOpaque_SrcColorOpacity == opacityType;
+    }
+
+    return xfer->isOpaque(opacityType);
 }
 
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkXfermode)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkProcCoeffXfermode)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkClearXfermode)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkSrcXfermode)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDstInXfermode)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDstOutXfermode)
-#if !SK_ARM_NEON_IS_NONE
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkNEONProcCoeffXfermode)
-#endif
-#if defined(SK_CPU_X86) && !defined(SK_BUILD_FOR_IOS)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkSSE2ProcCoeffXfermode)
-#endif
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END
diff --git a/gfx/skia/skia/src/core/SkXfermodeInterpretation.cpp b/gfx/skia/skia/src/core/SkXfermodeInterpretation.cpp
new file mode 100644
index 000000000000..1b2c8e32e631
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkXfermodeInterpretation.cpp
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkXfermodeInterpretation.h"
+#include "SkPaint.h"
+
+static bool just_solid_color(const SkPaint& p) {
+    return SK_AlphaOPAQUE == p.getAlpha()
+        && !p.getColorFilter() && !p.getShader();
+}
+
+SkXfermodeInterpretation SkInterpretXfermode(const SkPaint& paint,
+                                             bool dstIsOpaque) {
+    const SkXfermode* xfer = paint.getXfermode();
+    SkXfermode::Mode mode;
+    if (!SkXfermode::AsMode(xfer, &mode)) {
+        return kNormal_SkXfermodeInterpretation;
+    }
+    switch (mode) {
+        case SkXfermode::kSrcOver_Mode:
+            return kSrcOver_SkXfermodeInterpretation;
+        case SkXfermode::kSrc_Mode:
+            if (just_solid_color(paint)) {
+                return kSrcOver_SkXfermodeInterpretation;
+            }
+            return kNormal_SkXfermodeInterpretation;
+        case SkXfermode::kDst_Mode:
+            return kSkipDrawing_SkXfermodeInterpretation;
+        case SkXfermode::kDstOver_Mode:
+            if (dstIsOpaque) {
+                return kSkipDrawing_SkXfermodeInterpretation;
+            }
+            return kNormal_SkXfermodeInterpretation;
+        case SkXfermode::kSrcIn_Mode:
+            if (dstIsOpaque && just_solid_color(paint)) {
+                return kSrcOver_SkXfermodeInterpretation;
+            }
+            return kNormal_SkXfermodeInterpretation;
+        case SkXfermode::kDstIn_Mode:
+            if (just_solid_color(paint)) {
+                return kSkipDrawing_SkXfermodeInterpretation;
+            }
+            return kNormal_SkXfermodeInterpretation;
+        default:
+            return kNormal_SkXfermodeInterpretation;
+    }
+}
diff --git a/gfx/skia/skia/src/core/SkXfermodeInterpretation.h b/gfx/skia/skia/src/core/SkXfermodeInterpretation.h
new file mode 100644
index 000000000000..d0a420f383d4
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkXfermodeInterpretation.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkXfermodeInterpretation_DEFINED
+#define SkXfermodeInterpretation_DEFINED
+
+class SkPaint;
+
+/**
+ *  By analyzing the paint, we may decide we can take special
+ *  action. This enum lists our possible actions.
+ */
+enum SkXfermodeInterpretation {
+    kNormal_SkXfermodeInterpretation,      //< draw normally
+    kSrcOver_SkXfermodeInterpretation,     //< draw as if in srcover mode
+    kSkipDrawing_SkXfermodeInterpretation  //< draw nothing
+};
+
+/**
+ *  Given a paint, determine whether the paint's transfer mode can be
+ *  replaced with kSrcOver_Mode or not drawn at all.  This is used by
+ *  SkBlitter and SkPDFDevice.
+ */
+SkXfermodeInterpretation SkInterpretXfermode(const SkPaint&, bool dstIsOpaque);
+
+#endif  // SkXfermodeInterpretation_DEFINED
diff --git a/gfx/skia/skia/src/core/SkXfermode_proccoeff.h b/gfx/skia/skia/src/core/SkXfermode_proccoeff.h
index b777f62b5c61..f86af2df0161 100644
--- a/gfx/skia/skia/src/core/SkXfermode_proccoeff.h
+++ b/gfx/skia/skia/src/core/SkXfermode_proccoeff.h
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #ifndef SkXfermode_proccoeff_DEFINED
 #define SkXfermode_proccoeff_DEFINED
 
@@ -15,30 +22,6 @@ struct ProcCoeff {
 
 class SK_API SkProcCoeffXfermode : public SkXfermode {
 public:
-    static SkProcCoeffXfermode* Create(const ProcCoeff& rec, Mode mode) {
-        return SkNEW_ARGS(SkProcCoeffXfermode, (rec, mode));
-    }
-
-    virtual void xfer32(SkPMColor dst[], const SkPMColor src[], int count,
-                        const SkAlpha aa[]) const SK_OVERRIDE;
-    virtual void xfer16(uint16_t dst[], const SkPMColor src[], int count,
-                        const SkAlpha aa[]) const SK_OVERRIDE;
-    virtual void xferA8(SkAlpha dst[], const SkPMColor src[], int count,
-                        const SkAlpha aa[]) const SK_OVERRIDE;
-
-    virtual bool asMode(Mode* mode) const SK_OVERRIDE;
-
-    virtual bool asCoeff(Coeff* sc, Coeff* dc) const SK_OVERRIDE;
-
-#if SK_SUPPORT_GPU
-    virtual bool asNewEffect(GrEffect** effect,
-                             GrTexture* background) const SK_OVERRIDE;
-#endif
-
-    SK_TO_STRING_OVERRIDE()
-    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkProcCoeffXfermode)
-
-protected:
     SkProcCoeffXfermode(const ProcCoeff& rec, Mode mode) {
         fMode = mode;
         fProc = rec.fProc;
@@ -47,9 +30,31 @@ protected:
         fDstCoeff = rec.fDC;
     }
 
-    SkProcCoeffXfermode(SkReadBuffer& buffer);
+    void xfer32(SkPMColor dst[], const SkPMColor src[], int count,
+                const SkAlpha aa[]) const override;
+    void xfer16(uint16_t dst[], const SkPMColor src[], int count,
+                const SkAlpha aa[]) const override;
+    void xferA8(SkAlpha dst[], const SkPMColor src[], int count,
+                const SkAlpha aa[]) const override;
 
-    virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE;
+    bool asMode(Mode* mode) const override;
+
+    bool supportsCoverageAsAlpha() const override;
+
+    bool isOpaque(SkXfermode::SrcColorOpacity opacityType) const override;
+
+#if SK_SUPPORT_GPU
+    bool asFragmentProcessor(const GrFragmentProcessor**,
+                             const GrFragmentProcessor*) const override;
+
+    bool asXPFactory(GrXPFactory**) const override;
+#endif
+
+    SK_TO_STRING_OVERRIDE()
+    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkProcCoeffXfermode)
+
+protected:
+    void flatten(SkWriteBuffer& buffer) const override;
 
     Mode getMode() const { return fMode; }
 
@@ -60,6 +65,8 @@ private:
     Mode            fMode;
     Coeff           fSrcCoeff, fDstCoeff;
 
+    friend class SkXfermode;
+
     typedef SkXfermode INHERITED;
 };
 
diff --git a/gfx/skia/skia/src/core/SkYUVPlanesCache.cpp b/gfx/skia/skia/src/core/SkYUVPlanesCache.cpp
new file mode 100644
index 000000000000..336b581246f1
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkYUVPlanesCache.cpp
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkBitmapCache.h"
+#include "SkResourceCache.h"
+#include "SkYUVPlanesCache.h"
+
+#define CHECK_LOCAL(localCache, localName, globalName, ...) \
+    ((localCache) ? localCache->localName(__VA_ARGS__) : SkResourceCache::globalName(__VA_ARGS__))
+
+namespace {
+static unsigned gYUVPlanesKeyNamespaceLabel;
+
+struct YUVValue {
+    SkYUVPlanesCache::Info fInfo;
+    SkCachedData*          fData;
+};
+
+struct YUVPlanesKey : public SkResourceCache::Key {
+    YUVPlanesKey(uint32_t genID)
+        : fGenID(genID)
+    {
+        this->init(&gYUVPlanesKeyNamespaceLabel, SkMakeResourceCacheSharedIDForBitmap(genID),
+                   sizeof(genID));
+    }
+
+    uint32_t fGenID;
+};
+
+struct YUVPlanesRec : public SkResourceCache::Rec {
+    YUVPlanesRec(YUVPlanesKey key, SkCachedData* data, SkYUVPlanesCache::Info* info)
+        : fKey(key)
+    {
+        fValue.fData = data;
+        fValue.fInfo = *info;
+        fValue.fData->attachToCacheAndRef();
+    }
+    ~YUVPlanesRec() {
+        fValue.fData->detachFromCacheAndUnref();
+    }
+
+    YUVPlanesKey  fKey;
+    YUVValue      fValue;
+
+    const Key& getKey() const override { return fKey; }
+    size_t bytesUsed() const override { return sizeof(*this) + fValue.fData->size(); }
+    const char* getCategory() const override { return "yuv-planes"; }
+    SkDiscardableMemory* diagnostic_only_getDiscardable() const override {
+        return fValue.fData->diagnostic_only_getDiscardable();
+    }
+
+    static bool Visitor(const SkResourceCache::Rec& baseRec, void* contextData) {
+        const YUVPlanesRec& rec = static_cast<const YUVPlanesRec&>(baseRec);
+        YUVValue* result = static_cast<YUVValue*>(contextData);
+
+        SkCachedData* tmpData = rec.fValue.fData;
+        tmpData->ref();
+        if (nullptr == tmpData->data()) {
+            tmpData->unref();
+            return false;
+        }
+        result->fData = tmpData;
+        result->fInfo = rec.fValue.fInfo;
+        return true;
+    }
+};
+} // namespace
+
+SkCachedData* SkYUVPlanesCache::FindAndRef(uint32_t genID, Info* info,
+                                           SkResourceCache* localCache) {
+    YUVValue result;
+    YUVPlanesKey key(genID);
+    if (!CHECK_LOCAL(localCache, find, Find, key, YUVPlanesRec::Visitor, &result)) {
+        return nullptr;
+    }
+    
+    *info = result.fInfo;
+    return result.fData;
+}
+
+void SkYUVPlanesCache::Add(uint32_t genID, SkCachedData* data, Info* info,
+                           SkResourceCache* localCache) {
+    YUVPlanesKey key(genID);
+    return CHECK_LOCAL(localCache, add, Add, new YUVPlanesRec(key, data, info));
+}
diff --git a/gfx/skia/skia/src/core/SkYUVPlanesCache.h b/gfx/skia/skia/src/core/SkYUVPlanesCache.h
new file mode 100644
index 000000000000..a024192d07c2
--- /dev/null
+++ b/gfx/skia/skia/src/core/SkYUVPlanesCache.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkYUVPlanesCache_DEFINED
+#define SkYUVPlanesCache_DEFINED
+
+#include "SkCachedData.h"
+#include "SkImageInfo.h"
+
+class SkResourceCache;
+
+class SkYUVPlanesCache {
+public:
+    /**
+     * The Info struct contains data about the 3 Y, U and V planes of memory stored
+     * contiguously, in that order, as a single block of memory within SkYUVPlanesCache.
+     *
+     * fSize: Width and height of each of the 3 planes (in pixels).
+     * fSizeInMemory: Amount of memory allocated for each plane (may be different from
+                      "height * rowBytes", depending on the jpeg decoder's block size).
+     *                The sum of these is the total size stored within SkYUVPlanesCache.
+     * fRowBytes: rowBytes for each of the 3 planes (in bytes).
+     * fColorSpace: color space that will be used for the YUV -> RGB conversion.
+     */
+    struct Info {
+        SkISize fSize[3];
+        size_t  fSizeInMemory[3];
+        size_t  fRowBytes[3];
+        SkYUVColorSpace fColorSpace;
+    };
+    /**
+     * On success, return a ref to the SkCachedData that holds the pixels.
+     *
+     * On failure, return nullptr.
+     */
+    static SkCachedData* FindAndRef(uint32_t genID, Info* info,
+                                    SkResourceCache* localCache = nullptr);
+
+    /**
+     * Add a pixelRef ID and its YUV planes data to the cache.
+     */
+    static void Add(uint32_t genID, SkCachedData* data, Info* info,
+                    SkResourceCache* localCache = nullptr);
+};
+
+#endif
diff --git a/gfx/skia/skia/src/device/xps/SkXPSDevice.cpp b/gfx/skia/skia/src/device/xps/SkXPSDevice.cpp
index bdc612fae6d1..86c729c9e405 100644
--- a/gfx/skia/skia/src/device/xps/SkXPSDevice.cpp
+++ b/gfx/skia/skia/src/device/xps/SkXPSDevice.cpp
@@ -5,13 +5,15 @@
  * found in the LICENSE file.
  */
 
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_WIN32)
+
 #ifndef UNICODE
 #define UNICODE
 #endif
 #ifndef _UNICODE
 #define _UNICODE
 #endif
-#include "SkTypes.h"
 #include <ObjBase.h>
 #include <XpsObjectModel.h>
 #include <T2EmbApi.h>
@@ -21,15 +23,16 @@
 #include "SkConstexprMath.h"
 #include "SkData.h"
 #include "SkDraw.h"
-#include "SkDrawProcs.h"
 #include "SkEndian.h"
-#include "SkFontHost.h"
+#include "SkFindAndPlaceGlyph.h"
+#include "SkGeometry.h"
 #include "SkGlyphCache.h"
 #include "SkHRESULT.h"
 #include "SkImageEncoder.h"
 #include "SkIStream.h"
 #include "SkMaskFilter.h"
 #include "SkPaint.h"
+#include "SkPathOps.h"
 #include "SkPoint.h"
 #include "SkRasterizer.h"
 #include "SkSFNTHeader.h"
@@ -48,9 +51,9 @@
 //make it clear when converting a scalar that this is what is wanted.
 #define SkScalarToFLOAT(n) SkScalarToFloat(n)
 
-//Dummy representation of a GUID from create_id.
+//Dummy representation of a GUID from createId.
 #define L_GUID_ID L"XXXXXXXXsXXXXsXXXXsXXXXsXXXXXXXXXXXX"
-//Length of GUID representation from create_id, including NULL terminator.
+//Length of GUID representation from createId, including nullptr terminator.
 #define GUID_ID_LEN SK_ARRAY_COUNT(L_GUID_ID)
 
 /**
@@ -84,18 +87,16 @@ static int format_guid(const GUID& guid,
                       guid.Data4[7]);
 }
 
-/**
-   Creates a GUID based id and places it into buffer.
-   buffer should have space for at least GUID_ID_LEN wide characters.
-   The string will always be wchar null terminated.
-   XXXXXXXXsXXXXsXXXXsXXXXsXXXXXXXXXXXX0
-   The string may begin with a digit,
-   and so may not be suitable as a bare resource key.
- */
-static HRESULT create_id(wchar_t* buffer, size_t bufferSize,
-                         wchar_t sep = '-') {
+HRESULT SkXPSDevice::createId(wchar_t* buffer, size_t bufferSize, wchar_t sep) {
     GUID guid = {};
+#ifdef SK_XPS_USE_DETERMINISTIC_IDS
+    guid.Data1 = fNextId++;
+    // The following make this a valid Type4 UUID.
+    guid.Data3 = 0x4000;
+    guid.Data4[0] = 0x80;
+#else
     HRM(CoCreateGuid(&guid), "Could not create GUID for id.");
+#endif
 
     if (format_guid(guid, buffer, bufferSize, sep) == -1) {
         HRM(E_UNEXPECTED, "Could not format GUID into id.");
@@ -112,18 +113,33 @@ static SkBitmap make_fake_bitmap(int width, int height) {
 
 // TODO: should inherit from SkBaseDevice instead of SkBitmapDevice...
 SkXPSDevice::SkXPSDevice()
-    : SkBitmapDevice(make_fake_bitmap(10000, 10000))
+    : INHERITED(make_fake_bitmap(10000, 10000), SkSurfaceProps(0, kUnknown_SkPixelGeometry))
     , fCurrentPage(0) {
 }
 
+SkXPSDevice::SkXPSDevice(IXpsOMObjectFactory* xpsFactory)
+    : INHERITED(make_fake_bitmap(10000, 10000), SkSurfaceProps(0, kUnknown_SkPixelGeometry))
+    , fCurrentPage(0) {
+
+    HRVM(CoCreateInstance(
+             CLSID_XpsOMObjectFactory,
+             nullptr,
+             CLSCTX_INPROC_SERVER,
+             IID_PPV_ARGS(&this->fXpsFactory)),
+         "Could not create factory for layer.");
+
+    HRVM(this->fXpsFactory->CreateCanvas(&this->fCurrentXpsCanvas),
+         "Could not create canvas for layer.");
+}
+
 SkXPSDevice::~SkXPSDevice() {
 }
 
 SkXPSDevice::TypefaceUse::TypefaceUse()
     : typefaceId(0xffffffff)
-    , fontData(NULL)
-    , xpsFont(NULL)
-    , glyphsUsed(NULL) {
+    , fontData(nullptr)
+    , xpsFont(nullptr)
+    , glyphsUsed(nullptr) {
 }
 
 SkXPSDevice::TypefaceUse::~TypefaceUse() {
@@ -138,7 +154,7 @@ bool SkXPSDevice::beginPortfolio(SkWStream* outputStream) {
     //Create XPS Factory.
     HRBM(CoCreateInstance(
              CLSID_XpsOMObjectFactory,
-             NULL,
+             nullptr,
              CLSCTX_INPROC_SERVER,
              IID_PPV_ARGS(&this->fXpsFactory)),
          "Could not create XPS factory.");
@@ -178,7 +194,7 @@ HRESULT SkXPSDevice::createXpsThumbnail(IXpsOMPage* page,
     SkTScopedComPtr<IXpsOMThumbnailGenerator> thumbnailGenerator;
     HRM(CoCreateInstance(
             CLSID_XpsOMThumbnailGenerator,
-            NULL,
+            nullptr,
             CLSCTX_INPROC_SERVER,
             IID_PPV_ARGS(&thumbnailGenerator)),
         "Could not create thumbnail generator.");
@@ -193,7 +209,7 @@ HRESULT SkXPSDevice::createXpsThumbnail(IXpsOMPage* page,
         swprintf_s(buffer, size, L"/Documents/1/Metadata/%u.png", pageNum);
     } else {
         wchar_t id[GUID_ID_LEN];
-        HR(create_id(id, GUID_ID_LEN));
+        HR(this->createId(id, GUID_ID_LEN));
         swprintf_s(buffer, size, L"/Metadata/%s.png", id);
     }
     HRM(this->fXpsFactory->CreatePartUri(buffer, &partUri),
@@ -242,10 +258,10 @@ HRESULT SkXPSDevice::initXpsDocumentWriter(IXpsOMImageResource* image) {
                 TRUE,
                 XPS_INTERLEAVING_OFF, //XPS_INTERLEAVING_ON,
                 partUri.get(),
-                NULL,
+                nullptr,
                 image,
-                NULL,
-                NULL,
+                nullptr,
+                nullptr,
                 &this->fPackageWriter),
             "Could not create package writer.");
     }
@@ -258,10 +274,10 @@ HRESULT SkXPSDevice::initXpsDocumentWriter(IXpsOMImageResource* image) {
                 &partUri),
             "Could not create fixed document part uri.");
         HRM(this->fPackageWriter->StartNewDocument(partUri.get(),
-                                                   NULL,
-                                                   NULL,
-                                                   NULL,
-                                                   NULL),
+                                                   nullptr,
+                                                   nullptr,
+                                                   nullptr,
+                                                   nullptr),
             "Could not start document.");
     }
 
@@ -313,7 +329,7 @@ bool SkXPSDevice::endSheet() {
          "Could not add scale canvas to page.");
 
     //Create the package writer if it hasn't been created yet.
-    if (NULL == this->fPackageWriter.get()) {
+    if (nullptr == this->fPackageWriter.get()) {
         SkTScopedComPtr<IXpsOMImageResource> image;
         //Ignore return, thumbnail is completely optional.
         this->createXpsThumbnail(page.get(), 0, &image);
@@ -323,10 +339,10 @@ bool SkXPSDevice::endSheet() {
 
     HRBM(this->fPackageWriter->AddPage(page.get(),
                                        &pageSize,
-                                       NULL,
-                                       NULL,
-                                       NULL,
-                                       NULL),
+                                       nullptr,
+                                       nullptr,
+                                       nullptr,
+                                       nullptr),
          "Could not write the page.");
     this->fCurrentXpsCanvas.reset();
 
@@ -342,7 +358,7 @@ static HRESULT subset_typeface(SkXPSDevice::TypefaceUse* current) {
     int ttcCount = (current->ttcIndex + 1);
 
     //The following are declared with the types required by CreateFontPackage.
-    unsigned char *fontPackageBufferRaw = NULL;
+    unsigned char *fontPackageBufferRaw = nullptr;
     unsigned long fontPackageBufferSize;
     unsigned long bytesWritten;
     unsigned long result = CreateFontPackage(
@@ -362,7 +378,7 @@ static HRESULT subset_typeface(SkXPSDevice::TypefaceUse* current) {
         sk_malloc_throw,
         sk_realloc_throw,
         sk_free,
-        NULL);
+        nullptr);
     SkAutoTMalloc<unsigned char> fontPackageBuffer(fontPackageBufferRaw);
     if (result != NO_ERROR) {
         SkDEBUGF(("CreateFontPackage Error %lu", result));
@@ -386,7 +402,7 @@ static HRESULT subset_typeface(SkXPSDevice::TypefaceUse* current) {
         ttcfHeader->numOffsets = SkEndian_SwapBE32(ttcCount);
         SK_OT_ULONG* offsetPtr = SkTAfter<SK_OT_ULONG>(ttcfHeader);
         for (int i = 0; i < ttcCount; ++i, ++offsetPtr) {
-            *offsetPtr = SkEndian_SwapBE32(extra);
+            *offsetPtr = SkEndian_SwapBE32(SkToU32(extra));
         }
 
         // Fix up offsets in sfnt table entries.
@@ -396,14 +412,14 @@ static HRESULT subset_typeface(SkXPSDevice::TypefaceUse* current) {
             SkTAfter<SkSFNTHeader::TableDirectoryEntry>(sfntHeader);
         for (int i = 0; i < numTables; ++i, ++tableDirectory) {
             tableDirectory->offset = SkEndian_SwapBE32(
-                SkEndian_SwapBE32(tableDirectory->offset) + extra);
+                SkToU32(SkEndian_SwapBE32(SkToU32(tableDirectory->offset)) + extra));
         }
     } else {
         extra = 0;
         fontPackageBuffer.realloc(bytesWritten);
     }
 
-    SkAutoTUnref<SkMemoryStream> newStream(new SkMemoryStream());
+    SkAutoTDelete<SkMemoryStream> newStream(new SkMemoryStream());
     newStream->setMemoryOwned(fontPackageBuffer.detach(), bytesWritten + extra);
 
     SkTScopedComPtr<IStream> newIStream;
@@ -512,7 +528,7 @@ static void transform_offsets(SkScalar* stopOffsets, const int numOffsets,
         SkScalar startToStop = (stopTransformed.fX - startTransformed.fX)
                              + (stopTransformed.fY - startTransformed.fY);
         //Percentage along transformed line.
-        stopOffsets[i] = SkScalarDiv(startToStop, startToEnd);
+        stopOffsets[i] = startToStop / startToEnd;
     }
 }
 
@@ -520,7 +536,7 @@ HRESULT SkXPSDevice::createXpsTransform(const SkMatrix& matrix,
                                         IXpsOMMatrixTransform** xpsTransform) {
     SkScalar affine[6];
     if (!matrix.asAffine(affine)) {
-        *xpsTransform = NULL;
+        *xpsTransform = nullptr;
         return S_FALSE;
     }
     XPS_MATRIX rawXpsMatrix = {
@@ -560,7 +576,7 @@ HRESULT SkXPSDevice::createXpsSolidColorBrush(const SkColor skColor,
                                               IXpsOMBrush** xpsBrush) {
     XPS_COLOR xpsColor = xps_color(skColor);
     SkTScopedComPtr<IXpsOMSolidColorBrush> solidBrush;
-    HRM(this->fXpsFactory->CreateSolidColorBrush(&xpsColor, NULL, &solidBrush),
+    HRM(this->fXpsFactory->CreateSolidColorBrush(&xpsColor, nullptr, &solidBrush),
         "Could not create solid color brush.");
     HRM(solidBrush->SetOpacity(alpha / 255.0f), "Could not set opacity.");
     HRM(solidBrush->QueryInterface<IXpsOMBrush>(xpsBrush), "QI Fail.");
@@ -647,7 +663,7 @@ HRESULT SkXPSDevice::createXpsImageBrush(
         SK_ARRAY_COUNT(L"/Documents/1/Resources/Images/" L_GUID_ID L".png");
     wchar_t buffer[size];
     wchar_t id[GUID_ID_LEN];
-    HR(create_id(id, GUID_ID_LEN));
+    HR(this->createId(id, GUID_ID_LEN));
     swprintf_s(buffer, size, L"/Documents/1/Resources/Images/%s.png", id);
 
     SkTScopedComPtr<IOpcPartUri> imagePartUri;
@@ -810,7 +826,7 @@ HRESULT SkXPSDevice::createXpsImageBrush(
 
     SkTScopedComPtr<IXpsOMMatrixTransform> xpsMatrixToUse;
     HR(this->createXpsTransform(localMatrix, &xpsMatrixToUse));
-    if (NULL != xpsMatrixToUse.get()) {
+    if (xpsMatrixToUse.get()) {
         HRM((*xpsBrush)->SetTransformLocal(xpsMatrixToUse.get()),
             "Could not set transform for image brush.");
     } else {
@@ -825,7 +841,7 @@ HRESULT SkXPSDevice::createXpsGradientStop(const SkColor skColor,
                                            IXpsOMGradientStop** xpsGradStop) {
     XPS_COLOR gradStopXpsColor = xps_color(skColor);
     HRM(this->fXpsFactory->CreateGradientStop(&gradStopXpsColor,
-                                              NULL,
+                                              nullptr,
                                               SkScalarToFLOAT(offset),
                                               xpsGradStop),
         "Could not create gradient stop.");
@@ -839,7 +855,7 @@ HRESULT SkXPSDevice::createXpsLinearGradient(SkShader::GradientInfo info,
                                              IXpsOMBrush** xpsBrush) {
     XPS_POINT startPoint;
     XPS_POINT endPoint;
-    if (NULL != xpsMatrix) {
+    if (xpsMatrix) {
         startPoint = xps_point(info.fPoint[0]);
         endPoint = xps_point(info.fPoint[1]);
     } else {
@@ -867,7 +883,7 @@ HRESULT SkXPSDevice::createXpsLinearGradient(SkShader::GradientInfo info,
                                                      &endPoint,
                                                      &gradientBrush),
         "Could not create linear gradient brush.");
-    if (NULL != xpsMatrix) {
+    if (xpsMatrix) {
         HRM(gradientBrush->SetTransformLocal(xpsMatrix),
             "Could not set transform on linear gradient brush.");
     }
@@ -913,7 +929,7 @@ HRESULT SkXPSDevice::createXpsRadialGradient(SkShader::GradientInfo info,
     XPS_POINT centerPoint;
     XPS_POINT gradientOrigin;
     XPS_SIZE radiiSizes;
-    if (NULL != xpsMatrix) {
+    if (xpsMatrix) {
         centerPoint = xps_point(info.fPoint[0]);
         gradientOrigin = xps_point(info.fPoint[0]);
         radiiSizes.width = SkScalarToFLOAT(info.fRadius[0]);
@@ -944,7 +960,7 @@ HRESULT SkXPSDevice::createXpsRadialGradient(SkShader::GradientInfo info,
                                                      &radiiSizes,
                                                      &gradientBrush),
         "Could not create radial gradient brush.");
-    if (NULL != xpsMatrix) {
+    if (xpsMatrix) {
         HRM(gradientBrush->SetTransformLocal(xpsMatrix),
             "Could not set transform on radial gradient brush.");
     }
@@ -975,7 +991,7 @@ HRESULT SkXPSDevice::createXpsBrush(const SkPaint& skPaint,
                                     IXpsOMBrush** brush,
                                     const SkMatrix* parentTransform) {
     const SkShader *shader = skPaint.getShader();
-    if (NULL == shader) {
+    if (nullptr == shader) {
         HR(this->createXpsSolidColorBrush(skPaint.getColor(), 0xFF, brush));
         return S_OK;
     }
@@ -983,8 +999,8 @@ HRESULT SkXPSDevice::createXpsBrush(const SkPaint& skPaint,
     //Gradient shaders.
     SkShader::GradientInfo info;
     info.fColorCount = 0;
-    info.fColors = NULL;
-    info.fColorOffsets = NULL;
+    info.fColors = nullptr;
+    info.fColorOffsets = nullptr;
     SkShader::GradientType gradientType = shader->asAGradient(&info);
 
     if (SkShader::kNone_GradientType == gradientType) {
@@ -1020,7 +1036,7 @@ HRESULT SkXPSDevice::createXpsBrush(const SkPaint& skPaint,
         }
 
         SkMatrix localMatrix = shader->getLocalMatrix();
-        if (NULL != parentTransform) {
+        if (parentTransform) {
             localMatrix.preConcat(*parentTransform);
         }
         SkTScopedComPtr<IXpsOMMatrixTransform> xpsMatrixToUse;
@@ -1044,8 +1060,7 @@ HRESULT SkXPSDevice::createXpsBrush(const SkPaint& skPaint,
             return S_OK;
         }
 
-        if (SkShader::kRadial2_GradientType == gradientType ||
-            SkShader::kConical_GradientType == gradientType) {
+        if (SkShader::kConical_GradientType == gradientType) {
             //simple if affine and one is 0, otherwise will have to fake
         }
 
@@ -1057,38 +1072,24 @@ HRESULT SkXPSDevice::createXpsBrush(const SkPaint& skPaint,
     SkBitmap outTexture;
     SkMatrix outMatrix;
     SkShader::TileMode xy[2];
-    SkShader::BitmapType bitmapType = shader->asABitmap(&outTexture,
-                                                        &outMatrix,
-                                                        xy);
-    switch (bitmapType) {
-        case SkShader::kNone_BitmapType:
-            break;
-        case SkShader::kDefault_BitmapType: {
-            //TODO: outMatrix??
-            SkMatrix localMatrix = shader->getLocalMatrix();
-            if (NULL != parentTransform) {
-                localMatrix.preConcat(*parentTransform);
-            }
-
-            SkTScopedComPtr<IXpsOMTileBrush> tileBrush;
-            HR(this->createXpsImageBrush(outTexture,
-                                         localMatrix,
-                                         xy,
-                                         skPaint.getAlpha(),
-                                         &tileBrush));
-
-            HRM(tileBrush->QueryInterface<IXpsOMBrush>(brush), "QI failed.");
-
-            return S_OK;
+    if (shader->isABitmap(&outTexture, &outMatrix, xy)) {
+        //TODO: outMatrix??
+        SkMatrix localMatrix = shader->getLocalMatrix();
+        if (parentTransform) {
+            localMatrix.preConcat(*parentTransform);
         }
-        case SkShader::kRadial_BitmapType:
-        case SkShader::kSweep_BitmapType:
-        case SkShader::kTwoPointRadial_BitmapType:
-        default:
-            break;
-    }
 
-    HR(this->createXpsSolidColorBrush(skPaint.getColor(), 0xFF, brush));
+        SkTScopedComPtr<IXpsOMTileBrush> tileBrush;
+        HR(this->createXpsImageBrush(outTexture,
+                                     localMatrix,
+                                     xy,
+                                     skPaint.getAlpha(),
+                                     &tileBrush));
+
+        HRM(tileBrush->QueryInterface<IXpsOMBrush>(brush), "QI failed.");
+    } else {
+        HR(this->createXpsSolidColorBrush(skPaint.getColor(), 0xFF, brush));
+    }
     return S_OK;
 }
 
@@ -1160,11 +1161,6 @@ HRESULT SkXPSDevice::createXpsQuad(const SkPoint (&points)[4],
     return S_OK;
 }
 
-void SkXPSDevice::clear(SkColor color) {
-    //TODO: override this for XPS
-    SkDEBUGF(("XPS clear not yet implemented."));
-}
-
 void SkXPSDevice::drawPoints(const SkDraw& d, SkCanvas::PointMode mode,
                              size_t count, const SkPoint points[],
                              const SkPaint& paint) {
@@ -1205,7 +1201,7 @@ void SkXPSDevice::drawRRect(const SkDraw& d,
                             const SkPaint& paint) {
     SkPath path;
     path.addRRect(rr);
-    this->drawPath(d, path, paint, NULL, true);
+    this->drawPath(d, path, paint, nullptr, true);
 }
 
 void SkXPSDevice::internalDrawRect(const SkDraw& d,
@@ -1214,7 +1210,7 @@ void SkXPSDevice::internalDrawRect(const SkDraw& d,
                                    const SkPaint& paint) {
     //Exit early if there is nothing to draw.
     if (d.fClip->isEmpty() ||
-        (paint.getAlpha() == 0 && paint.getXfermode() == NULL)) {
+        (paint.getAlpha() == 0 && paint.getXfermode() == nullptr)) {
         return;
     }
 
@@ -1223,7 +1219,7 @@ void SkXPSDevice::internalDrawRect(const SkDraw& d,
         SkPath tmp;
         tmp.addRect(r);
         tmp.setFillType(SkPath::kWinding_FillType);
-        this->drawPath(d, tmp, paint, NULL, true);
+        this->drawPath(d, tmp, paint, nullptr, true);
         return;
     }
 
@@ -1328,7 +1324,7 @@ HRESULT SkXPSDevice::addXpsPathGeometry(
     while ((verb = iter.next(points)) != SkPath::kDone_Verb) {
         switch (verb) {
             case SkPath::kMove_Verb: {
-                if (NULL != xpsFigure.get()) {
+                if (xpsFigure.get()) {
                     HR(close_figure(segmentTypes, segmentStrokes, segmentData,
                                     stroke, fill,
                                     xpsFigure.get() , xpsFigures));
@@ -1370,6 +1366,21 @@ HRESULT SkXPSDevice::addXpsPathGeometry(
                 segmentData.push(SkScalarToFLOAT(points[3].fX));
                 segmentData.push(SkScalarToFLOAT(points[3].fY));
                 break;
+            case SkPath::kConic_Verb: {
+                const SkScalar tol = SK_Scalar1 / 4;
+                SkAutoConicToQuads converter;
+                const SkPoint* quads =
+                    converter.computeQuads(points, iter.conicWeight(), tol);
+                for (int i = 0; i < converter.countQuads(); ++i) {
+                    segmentTypes.push(XPS_SEGMENT_TYPE_QUADRATIC_BEZIER);
+                    segmentStrokes.push(stroke);
+                    segmentData.push(SkScalarToFLOAT(quads[2 * i + 1].fX));
+                    segmentData.push(SkScalarToFLOAT(quads[2 * i + 1].fY));
+                    segmentData.push(SkScalarToFLOAT(quads[2 * i + 2].fX));
+                    segmentData.push(SkScalarToFLOAT(quads[2 * i + 2].fY));
+                }
+                break;
+            }
             case SkPath::kClose_Verb:
                 // we ignore these, and just get the whole segment from
                 // the corresponding line/quad/cubic verbs
@@ -1379,7 +1390,7 @@ HRESULT SkXPSDevice::addXpsPathGeometry(
                 break;
         }
     }
-    if (NULL != xpsFigure.get()) {
+    if (xpsFigure.get()) {
         HR(close_figure(segmentTypes, segmentStrokes, segmentData,
                         stroke, fill,
                         xpsFigure.get(), xpsFigures));
@@ -1387,171 +1398,13 @@ HRESULT SkXPSDevice::addXpsPathGeometry(
     return S_OK;
 }
 
-HRESULT SkXPSDevice::drawInverseWindingPath(const SkDraw& d,
-                                            const SkPath& devicePath,
-                                            IXpsOMPath* shadedPath) {
-    const SkRect universeRect = SkRect::MakeLTRB(0, 0,
-        this->fCurrentCanvasSize.fWidth, this->fCurrentCanvasSize.fHeight);
-
-    const XPS_RECT universeRectXps = {
-        0.0f, 0.0f,
-        SkScalarToFLOAT(this->fCurrentCanvasSize.fWidth),
-        SkScalarToFLOAT(this->fCurrentCanvasSize.fHeight),
-    };
-
-    //Get the geometry.
-    SkTScopedComPtr<IXpsOMGeometry> shadedGeometry;
-    HRM(shadedPath->GetGeometry(&shadedGeometry),
-        "Could not get shaded geometry for inverse path.");
-
-    //Get the figures from the geometry.
-    SkTScopedComPtr<IXpsOMGeometryFigureCollection> shadedFigures;
-    HRM(shadedGeometry->GetFigures(&shadedFigures),
-        "Could not get shaded figures for inverse path.");
-
-    HRM(shadedGeometry->SetFillRule(XPS_FILL_RULE_NONZERO),
-        "Could not set shaded fill rule for inverse path.");
-
-    //Take everything drawn so far, and make a shared resource out of it.
-    //Replace everything drawn so far with
-    //inverse canvas
-    //  old canvas of everything so far
-    //  world shaded figure, clipped to current clip
-    //  top canvas of everything so far, clipped to path
-    //Note: this is not quite right when there is nothing solid in the
-    //canvas of everything so far, as the bit on top will allow
-    //the world paint to show through.
-
-    //Create new canvas.
-    SkTScopedComPtr<IXpsOMCanvas> newCanvas;
-    HRM(this->fXpsFactory->CreateCanvas(&newCanvas),
-        "Could not create inverse canvas.");
-
-    //Save the old canvas to a dictionary on the new canvas.
-    SkTScopedComPtr<IXpsOMDictionary> newDictionary;
-    HRM(this->fXpsFactory->CreateDictionary(&newDictionary),
-        "Could not create inverse dictionary.");
-    HRM(newCanvas->SetDictionaryLocal(newDictionary.get()),
-        "Could not set inverse dictionary.");
-
-    const size_t size = SK_ARRAY_COUNT(L"ID" L_GUID_ID);
-    wchar_t buffer[size];
-    wchar_t id[GUID_ID_LEN];
-    HR(create_id(id, GUID_ID_LEN, '_'));
-    swprintf_s(buffer, size, L"ID%s", id);
-    HRM(newDictionary->Append(buffer, this->fCurrentXpsCanvas.get()),
-        "Could not add canvas to inverse dictionary.");
-
-    //Start drawing
-    SkTScopedComPtr<IXpsOMVisualCollection> newVisuals;
-    HRM(newCanvas->GetVisuals(&newVisuals),
-        "Could not get inverse canvas visuals.");
-
-    //Draw old canvas from dictionary onto new canvas.
-    SkTScopedComPtr<IXpsOMGeometry> oldGeometry;
-    HRM(this->fXpsFactory->CreateGeometry(&oldGeometry),
-        "Could not create old inverse geometry.");
-
-    SkTScopedComPtr<IXpsOMGeometryFigureCollection> oldFigures;
-    HRM(oldGeometry->GetFigures(&oldFigures),
-        "Could not get old inverse figures.");
-
-    SkTScopedComPtr<IXpsOMGeometryFigure> oldFigure;
-    HR(this->createXpsRect(universeRect, FALSE, TRUE, &oldFigure));
-    HRM(oldFigures->Append(oldFigure.get()),
-        "Could not add old inverse figure.");
-
-    SkTScopedComPtr<IXpsOMVisualBrush> oldBrush;
-    HRM(this->fXpsFactory->CreateVisualBrush(&universeRectXps,
-                                             &universeRectXps,
-                                             &oldBrush),
-        "Could not create old inverse brush.");
-
-    SkTScopedComPtr<IXpsOMPath> oldPath;
-    HRM(this->fXpsFactory->CreatePath(&oldPath),
-        "Could not create old inverse path.");
-    HRM(oldPath->SetGeometryLocal(oldGeometry.get()),
-        "Could not set old inverse geometry.");
-    HRM(oldPath->SetFillBrushLocal(oldBrush.get()),
-        "Could not set old inverse fill brush.");
-    //the brush must be parented before setting the lookup.
-    HRM(newVisuals->Append(oldPath.get()),
-        "Could not add old inverse path to new canvas visuals.");
-    HRM(oldBrush->SetVisualLookup(buffer),
-        "Could not set old inverse brush visual lookup.");
-
-    //Draw the clip filling shader.
-    SkTScopedComPtr<IXpsOMGeometryFigure> shadedFigure;
-    HR(this->createXpsRect(universeRect, FALSE, TRUE, &shadedFigure));
-    HRM(shadedFigures->Append(shadedFigure.get()),
-        "Could not add inverse shaded figure.");
-    //the geometry is already set
-    HR(this->clip(shadedPath, d));
-    HRM(newVisuals->Append(shadedPath),
-        "Could not add inverse shaded path to canvas visuals.");
-
-    //Draw the old canvas on top, clipped to the original path.
-    SkTScopedComPtr<IXpsOMCanvas> topCanvas;
-    HRM(this->fXpsFactory->CreateCanvas(&topCanvas),
-        "Could not create top inverse canvas.");
-    //Clip the canvas to prevent alpha spill.
-    //This is the entire reason this canvas exists.
-    HR(this->clip(topCanvas.get(), d));
-
-    SkTScopedComPtr<IXpsOMGeometry> topGeometry;
-    HRM(this->fXpsFactory->CreateGeometry(&topGeometry),
-        "Could not create top inverse geometry.");
-
-    SkTScopedComPtr<IXpsOMGeometryFigureCollection> topFigures;
-    HRM(topGeometry->GetFigures(&topFigures),
-        "Could not get top inverse figures.");
-
-    SkTScopedComPtr<IXpsOMGeometryFigure> topFigure;
-    HR(this->createXpsRect(universeRect, FALSE, TRUE, &topFigure));
-    HRM(topFigures->Append(topFigure.get()),
-        "Could not add old inverse figure.");
-
-    SkTScopedComPtr<IXpsOMVisualBrush> topBrush;
-    HRM(this->fXpsFactory->CreateVisualBrush(&universeRectXps,
-                                             &universeRectXps,
-                                             &topBrush),
-        "Could not create top inverse brush.");
-
-    SkTScopedComPtr<IXpsOMPath> topPath;
-    HRM(this->fXpsFactory->CreatePath(&topPath),
-        "Could not create top inverse path.");
-    HRM(topPath->SetGeometryLocal(topGeometry.get()),
-        "Could not set top inverse geometry.");
-    HRM(topPath->SetFillBrushLocal(topBrush.get()),
-        "Could not set top inverse fill brush.");
-    //the brush must be parented before setting the lookup.
-    HRM(newVisuals->Append(topCanvas.get()),
-        "Could not add top canvas to inverse canvas visuals.");
-    SkTScopedComPtr<IXpsOMVisualCollection> topVisuals;
-    HRM(topCanvas->GetVisuals(&topVisuals),
-        "Could not get top inverse canvas visuals.");
-    HRM(topVisuals->Append(topPath.get()),
-        "Could not add top inverse path to top canvas visuals.");
-    HRM(topBrush->SetVisualLookup(buffer),
-        "Could not set top inverse brush visual lookup.");
-
-    HR(this->clipToPath(topPath.get(), devicePath, XPS_FILL_RULE_NONZERO));
-
-    //swap current canvas to new canvas
-    this->fCurrentXpsCanvas.swap(newCanvas);
-
-    return S_OK;
-}
-
 void SkXPSDevice::convertToPpm(const SkMaskFilter* filter,
                                SkMatrix* matrix,
                                SkVector* ppuScale,
                                const SkIRect& clip, SkIRect* clipIRect) {
     //This action is in unit space, but the ppm is specified in physical space.
-    ppuScale->fX = SkScalarDiv(this->fCurrentPixelsPerMeter.fX,
-                               this->fCurrentUnitsPerMeter.fX);
-    ppuScale->fY = SkScalarDiv(this->fCurrentPixelsPerMeter.fY,
-                               this->fCurrentUnitsPerMeter.fY);
+    ppuScale->set(fCurrentPixelsPerMeter.fX / fCurrentUnitsPerMeter.fX,
+                  fCurrentPixelsPerMeter.fY / fCurrentUnitsPerMeter.fY);
 
     matrix->postScale(ppuScale->fX, ppuScale->fY);
 
@@ -1673,7 +1526,7 @@ void SkXPSDevice::drawPath(const SkDraw& d,
 
     // nothing to draw
     if (d.fClip->isEmpty() ||
-        (paint->getAlpha() == 0 && paint->getXfermode() == NULL)) {
+        (paint->getAlpha() == 0 && paint->getXfermode() == nullptr)) {
         return;
     }
 
@@ -1706,7 +1559,7 @@ void SkXPSDevice::drawPath(const SkDraw& d,
         bool fill = paint->getFillPath(*skeletalPath, fillablePath);
 
         SkPaint* writablePaint = paint.writable();
-        writablePaint->setPathEffect(NULL);
+        writablePaint->setPathEffect(nullptr);
         if (fill) {
             writablePaint->setStyle(SkPaint::kFill_Style);
         } else {
@@ -1758,7 +1611,7 @@ void SkXPSDevice::drawPath(const SkDraw& d,
                            d.fClip->getBounds(),
                            &clipIRect);
 
-        SkMask* mask = NULL;
+        SkMask* mask = nullptr;
 
         //[Fillable-path -> Mask]
         SkMask rasteredMask;
@@ -1776,11 +1629,11 @@ void SkXPSDevice::drawPath(const SkDraw& d,
             //[Mask -> Mask]
             SkMask filteredMask;
             if (filter &&
-                filter->filterMask(&filteredMask, *mask, *d.fMatrix, NULL)) {
+                filter->filterMask(&filteredMask, *mask, *d.fMatrix, nullptr)) {
 
                 mask = &filteredMask;
             } else {
-                filteredMask.fImage = NULL;
+                filteredMask.fImage = nullptr;
             }
             SkAutoMaskFreeImage filteredAmi(filteredMask.fImage);
 
@@ -1804,7 +1657,7 @@ void SkXPSDevice::drawPath(const SkDraw& d,
         SkPath* pixelPath = pathIsMutable ? fillablePath : &modifiedPath;
         fillablePath->transform(matrix, pixelPath);
 
-        SkMask* mask = NULL;
+        SkMask* mask = nullptr;
 
         //[Pixel-path -> Mask]
         SkMask rasteredMask;
@@ -1825,10 +1678,10 @@ void SkXPSDevice::drawPath(const SkDraw& d,
             if (filter->filterMask(&filteredMask,
                                    rasteredMask,
                                    matrix,
-                                   NULL)) {
+                                   nullptr)) {
                 mask = &filteredMask;
             } else {
-                filteredMask.fImage = NULL;
+                filteredMask.fImage = nullptr;
             }
             SkAutoMaskFreeImage filteredAmi(filteredMask.fImage);
 
@@ -1846,8 +1699,9 @@ void SkXPSDevice::drawPath(const SkDraw& d,
     bool xpsTransformsPath = true;
 
     //Set the fill rule.
+    SkPath* xpsCompatiblePath = fillablePath;
     XPS_FILL_RULE xpsFillRule;
-    switch (platonicPath.getFillType()) {
+    switch (fillablePath->getFillType()) {
         case SkPath::kWinding_FillType:
             xpsFillRule = XPS_FILL_RULE_NONZERO;
             break;
@@ -1855,15 +1709,17 @@ void SkXPSDevice::drawPath(const SkDraw& d,
             xpsFillRule = XPS_FILL_RULE_EVENODD;
             break;
         case SkPath::kInverseWinding_FillType: {
-            //[Fillable-path -> Device-path]
-            SkPath* devicePath = pathIsMutable ? fillablePath : &modifiedPath;
-            fillablePath->transform(matrix, devicePath);
-
-            HRV(this->drawInverseWindingPath(d,
-                                             *devicePath,
-                                             shadedPath.get()));
-            return;
+            //[Fillable-path (inverse winding) -> XPS-path (inverse even odd)]
+            if (!pathIsMutable) {
+                xpsCompatiblePath = &modifiedPath;
+                pathIsMutable = true;
+            }
+            if (!Simplify(*fillablePath, xpsCompatiblePath)) {
+                SkDEBUGF(("Could not simplify inverse winding path."));
+                return;
+            }
         }
+        // The xpsCompatiblePath is noW inverse even odd, so fall through.
         case SkPath::kInverseEvenOdd_FillType: {
             const SkRect universe = SkRect::MakeLTRB(
                 0, 0,
@@ -1896,11 +1752,11 @@ void SkXPSDevice::drawPath(const SkDraw& d,
         }
     }
 
-    SkPath* devicePath = fillablePath;
+    SkPath* devicePath = xpsCompatiblePath;
     if (!xpsTransformsPath) {
         //[Fillable-path -> Device-path]
-        devicePath = pathIsMutable ? fillablePath : &modifiedPath;
-        fillablePath->transform(matrix, devicePath);
+        devicePath = pathIsMutable ? xpsCompatiblePath : &modifiedPath;
+        xpsCompatiblePath->transform(matrix, devicePath);
     }
     HRV(this->addXpsPathGeometry(shadedFigures.get(),
                                  stroke, fill, *devicePath));
@@ -1988,7 +1844,7 @@ void SkXPSDevice::drawBitmap(const SkDraw& d, const SkBitmap& bitmap,
     }
 
     SkTScopedComPtr<IXpsOMGeometryFigure> rectFigure;
-    if (NULL != xpsTransform.get()) {
+    if (xpsTransform.get()) {
         const SkShader::TileMode xy[2] = {
             SkShader::kClamp_TileMode,
             SkShader::kClamp_TileMode,
@@ -2058,7 +1914,7 @@ HRESULT SkXPSDevice::CreateTypefaceUse(const SkPaint& paint,
         SK_ARRAY_COUNT(L"/Resources/Fonts/" L_GUID_ID L".odttf");
     wchar_t buffer[size];
     wchar_t id[GUID_ID_LEN];
-    HR(create_id(id, GUID_ID_LEN));
+    HR(this->createId(id, GUID_ID_LEN));
     swprintf_s(buffer, size, L"/Resources/Fonts/%s.odttf", id);
 
     SkTScopedComPtr<IOpcPartUri> partUri;
@@ -2085,7 +1941,7 @@ HRESULT SkXPSDevice::CreateTypefaceUse(const SkPaint& paint,
     newTypefaceUse.fontData = fontData;
     newTypefaceUse.xpsFont = xpsFontResource.release();
 
-    SkAutoGlyphCache agc(paint, NULL, &SkMatrix::I());
+    SkAutoGlyphCache agc(paint, &this->surfaceProps(), &SkMatrix::I());
     SkGlyphCache* glyphCache = agc.getCache();
     unsigned int glyphCount = glyphCache->getGlyphCount();
     newTypefaceUse.glyphsUsed = new SkBitSet(glyphCount);
@@ -2133,12 +1989,12 @@ HRESULT SkXPSDevice::AddGlyphs(const SkDraw& d,
     SkTScopedComPtr<IXpsOMGlyphsEditor> glyphsEditor;
     HRM(glyphs->GetGlyphsEditor(&glyphsEditor), "Could not get glyph editor.");
 
-    if (NULL != text) {
+    if (text) {
         HRM(glyphsEditor->SetUnicodeString(text),
             "Could not set unicode string.");
     }
 
-    if (NULL != xpsGlyphs) {
+    if (xpsGlyphs) {
         HRM(glyphsEditor->SetGlyphIndices(xpsGlyphsLen, xpsGlyphs),
             "Could not set glyphs.");
     }
@@ -2149,7 +2005,7 @@ HRESULT SkXPSDevice::AddGlyphs(const SkDraw& d,
     HR(this->createXpsBrush(
             paint,
             &xpsFillBrush,
-            useCanvasForClip ? NULL : &transform));
+            useCanvasForClip ? nullptr : &transform));
 
     HRM(glyphs->SetFillBrushLocal(xpsFillBrush.get()),
         "Could not set fill brush.");
@@ -2188,74 +2044,18 @@ HRESULT SkXPSDevice::AddGlyphs(const SkDraw& d,
     return S_OK;
 }
 
-struct SkXPSDrawProcs : public SkDrawProcs {
-public:
-    /** [in] Advance width and offsets for glyphs measured in
-    hundredths of the font em size (XPS Spec 5.1.3). */
-    FLOAT centemPerUnit;
-    /** [in,out] The accumulated glyphs used in the current typeface. */
-    SkBitSet* glyphUse;
-    /** [out] The glyphs to draw. */
-    SkTDArray<XPS_GLYPH_INDEX> xpsGlyphs;
-};
-
-static void xps_draw_1_glyph(const SkDraw1Glyph& state,
-                             SkFixed x, SkFixed y,
-                             const SkGlyph& skGlyph) {
-    SkASSERT(skGlyph.fWidth > 0 && skGlyph.fHeight > 0);
-
-    SkXPSDrawProcs* procs = static_cast<SkXPSDrawProcs*>(state.fDraw->fProcs);
-
-    //Draw pre-adds half the sampling frequency for floor rounding.
-    x -= state.fHalfSampleX;
-    y -= state.fHalfSampleY;
-
-    XPS_GLYPH_INDEX* xpsGlyph = procs->xpsGlyphs.append();
-    uint16_t glyphID = skGlyph.getGlyphID();
-    procs->glyphUse->setBit(glyphID, true);
-    xpsGlyph->index = glyphID;
-    if (1 == procs->xpsGlyphs.count()) {
-        xpsGlyph->advanceWidth = 0.0f;
-        xpsGlyph->horizontalOffset = SkFixedToFloat(x) * procs->centemPerUnit;
-        xpsGlyph->verticalOffset = SkFixedToFloat(y) * -procs->centemPerUnit;
-    } else {
-        const XPS_GLYPH_INDEX& first = procs->xpsGlyphs[0];
-        xpsGlyph->advanceWidth = 0.0f;
-        xpsGlyph->horizontalOffset = (SkFixedToFloat(x) * procs->centemPerUnit)
-                                     - first.horizontalOffset;
-        xpsGlyph->verticalOffset = (SkFixedToFloat(y) * -procs->centemPerUnit)
-                                   - first.verticalOffset;
+static int num_glyph_guess(SkPaint::TextEncoding encoding, const void* text, size_t byteLength) {
+    switch (encoding) {
+    case SkPaint::kUTF8_TextEncoding:
+        return SkUTF8_CountUnichars(static_cast<const char *>(text), byteLength);
+    case SkPaint::kUTF16_TextEncoding:
+        return SkUTF16_CountUnichars(static_cast<const uint16_t *>(text), SkToInt(byteLength));
+    case SkPaint::kGlyphID_TextEncoding:
+        return SkToInt(byteLength / 2);
+    default:
+        SK_ALWAYSBREAK(true);
     }
-}
-
-static void text_draw_init(const SkPaint& paint,
-                           const void* text, size_t byteLength,
-                           SkBitSet& glyphsUsed,
-                           SkDraw& myDraw, SkXPSDrawProcs& procs) {
-    procs.fD1GProc = xps_draw_1_glyph;
-    size_t numGlyphGuess;
-    switch (paint.getTextEncoding()) {
-        case SkPaint::kUTF8_TextEncoding:
-            numGlyphGuess = SkUTF8_CountUnichars(
-                static_cast<const char *>(text),
-                byteLength);
-            break;
-        case SkPaint::kUTF16_TextEncoding:
-            numGlyphGuess = SkUTF16_CountUnichars(
-                static_cast<const uint16_t *>(text),
-                byteLength);
-            break;
-        case SkPaint::kGlyphID_TextEncoding:
-            numGlyphGuess = byteLength / 2;
-            break;
-        default:
-            SK_ALWAYSBREAK(true);
-    }
-    procs.xpsGlyphs.setReserve(numGlyphGuess);
-    procs.glyphUse = &glyphsUsed;
-    procs.centemPerUnit = 100.0f / SkScalarToFLOAT(paint.getTextSize());
-
-    myDraw.fProcs = &procs;
+    return 0;
 }
 
 static bool text_must_be_pathed(const SkPaint& paint, const SkMatrix& matrix) {
@@ -2268,6 +2068,50 @@ static bool text_must_be_pathed(const SkPaint& paint, const SkMatrix& matrix) {
     ;
 }
 
+typedef SkTDArray<XPS_GLYPH_INDEX> GlyphRun;
+
+class ProcessOneGlyph {
+public:
+    ProcessOneGlyph(FLOAT centemPerUnit, SkBitSet* glyphUse, GlyphRun* xpsGlyphs)
+        : fCentemPerUnit(centemPerUnit)
+        , fGlyphUse(glyphUse)
+        , fXpsGlyphs(xpsGlyphs) { }
+
+    void operator()(const SkGlyph& glyph, SkPoint position, SkPoint) {
+        SkASSERT(glyph.fWidth > 0 && glyph.fHeight > 0);
+
+        SkScalar x = position.fX;
+        SkScalar y = position.fY;
+
+        XPS_GLYPH_INDEX* xpsGlyph = fXpsGlyphs->append();
+        uint16_t glyphID = glyph.getGlyphID();
+        fGlyphUse->setBit(glyphID, true);
+        xpsGlyph->index = glyphID;
+        if (1 == fXpsGlyphs->count()) {
+            xpsGlyph->advanceWidth = 0.0f;
+            xpsGlyph->horizontalOffset = SkScalarToFloat(x) * fCentemPerUnit;
+            xpsGlyph->verticalOffset = SkScalarToFloat(y) * -fCentemPerUnit;
+        }
+        else {
+            const XPS_GLYPH_INDEX& first = (*fXpsGlyphs)[0];
+            xpsGlyph->advanceWidth = 0.0f;
+            xpsGlyph->horizontalOffset = (SkScalarToFloat(x) * fCentemPerUnit)
+                - first.horizontalOffset;
+            xpsGlyph->verticalOffset = (SkScalarToFloat(y) * -fCentemPerUnit)
+                - first.verticalOffset;
+        }
+    }
+
+private:
+    /** [in] Advance width and offsets for glyphs measured in
+    hundredths of the font em size (XPS Spec 5.1.3). */
+    const FLOAT fCentemPerUnit;
+    /** [in,out] The accumulated glyphs used in the current typeface. */
+    SkBitSet* const fGlyphUse;
+    /** [out] The glyphs to draw. */
+    GlyphRun* const fXpsGlyphs;
+};
+
 void SkXPSDevice::drawText(const SkDraw& d,
                            const void* text, size_t byteLen,
                            SkScalar x, SkScalar y,
@@ -2277,7 +2121,7 @@ void SkXPSDevice::drawText(const SkDraw& d,
     if (text_must_be_pathed(paint, *d.fMatrix)) {
         SkPath path;
         paint.getTextPath(text, byteLen, x, y, &path);
-        this->drawPath(d, path, paint, NULL, true);
+        this->drawPath(d, path, paint, nullptr, true);
         //TODO: add automation "text"
         return;
     }
@@ -2285,31 +2129,41 @@ void SkXPSDevice::drawText(const SkDraw& d,
     TypefaceUse* typeface;
     HRV(CreateTypefaceUse(paint, &typeface));
 
-    SkDraw myDraw(d);
-    myDraw.fMatrix = &SkMatrix::I();
-    SkXPSDrawProcs procs;
-    text_draw_init(paint, text, byteLen, *typeface->glyphsUsed, myDraw, procs);
+    const SkMatrix& matrix = SkMatrix::I();
 
-    myDraw.drawText(static_cast<const char*>(text), byteLen, x, y, paint);
+    SkAutoGlyphCache    autoCache(paint, &this->surfaceProps(), &matrix);
+    SkGlyphCache*       cache = autoCache.getCache();
 
-    // SkDraw may have clipped out the glyphs, so we need to check
-    if (procs.xpsGlyphs.count() == 0) {
+    // Advance width and offsets for glyphs measured in hundredths of the font em size
+    // (XPS Spec 5.1.3).
+    FLOAT centemPerUnit = 100.0f / SkScalarToFLOAT(paint.getTextSize());
+    GlyphRun xpsGlyphs;
+    xpsGlyphs.setReserve(num_glyph_guess(paint.getTextEncoding(),
+        static_cast<const char*>(text), byteLen));
+
+    ProcessOneGlyph processOneGlyph(centemPerUnit, typeface->glyphsUsed, &xpsGlyphs);
+
+    SkFindAndPlaceGlyph::ProcessText(
+        paint.getTextEncoding(), static_cast<const char*>(text), byteLen,
+        SkPoint{ x, y }, matrix, paint.getTextAlign(), cache, processOneGlyph);
+
+    if (xpsGlyphs.count() == 0) {
         return;
     }
 
     XPS_POINT origin = {
-        procs.xpsGlyphs[0].horizontalOffset / procs.centemPerUnit,
-        procs.xpsGlyphs[0].verticalOffset / -procs.centemPerUnit,
+        xpsGlyphs[0].horizontalOffset / centemPerUnit,
+        xpsGlyphs[0].verticalOffset / -centemPerUnit,
     };
-    procs.xpsGlyphs[0].horizontalOffset = 0.0f;
-    procs.xpsGlyphs[0].verticalOffset = 0.0f;
+    xpsGlyphs[0].horizontalOffset = 0.0f;
+    xpsGlyphs[0].verticalOffset = 0.0f;
 
     HRV(AddGlyphs(d,
                   this->fXpsFactory.get(),
                   this->fCurrentXpsCanvas.get(),
                   typeface,
-                  NULL,
-                  procs.xpsGlyphs.begin(), procs.xpsGlyphs.count(),
+                  nullptr,
+                  xpsGlyphs.begin(), xpsGlyphs.count(),
                   &origin,
                   SkScalarToFLOAT(paint.getTextSize()),
                   XPS_STYLE_SIMULATION_NONE,
@@ -2319,16 +2173,15 @@ void SkXPSDevice::drawText(const SkDraw& d,
 
 void SkXPSDevice::drawPosText(const SkDraw& d,
                               const void* text, size_t byteLen,
-                              const SkScalar pos[],
-                              SkScalar constY, int scalarsPerPos,
-                              const SkPaint& paint) {
+                              const SkScalar pos[], int scalarsPerPos,
+                              const SkPoint& offset, const SkPaint& paint) {
     if (byteLen < 1) return;
 
     if (text_must_be_pathed(paint, *d.fMatrix)) {
         SkPath path;
         //TODO: make this work, Draw currently does not handle as well.
         //paint.getTextPath(text, byteLength, x, y, &path);
-        //this->drawPath(d, path, paint, NULL, true);
+        //this->drawPath(d, path, paint, nullptr, true);
         //TODO: add automation "text"
         return;
     }
@@ -2336,33 +2189,41 @@ void SkXPSDevice::drawPosText(const SkDraw& d,
     TypefaceUse* typeface;
     HRV(CreateTypefaceUse(paint, &typeface));
 
-    SkDraw myDraw(d);
-    myDraw.fMatrix = &SkMatrix::I();
-    SkXPSDrawProcs procs;
-    text_draw_init(paint, text, byteLen, *typeface->glyphsUsed, myDraw, procs);
+    const SkMatrix& matrix = SkMatrix::I();
 
-    myDraw.drawPosText(static_cast<const char*>(text), byteLen,
-                       pos, constY, scalarsPerPos,
-                       paint);
+    SkAutoGlyphCache    autoCache(paint, &this->surfaceProps(), &matrix);
+    SkGlyphCache*       cache = autoCache.getCache();
 
-    // SkDraw may have clipped out the glyphs, so we need to check
-    if (procs.xpsGlyphs.count() == 0) {
+    // Advance width and offsets for glyphs measured in hundredths of the font em size
+    // (XPS Spec 5.1.3).
+    FLOAT centemPerUnit = 100.0f / SkScalarToFLOAT(paint.getTextSize());
+    GlyphRun xpsGlyphs;
+    xpsGlyphs.setReserve(num_glyph_guess(paint.getTextEncoding(),
+        static_cast<const char*>(text), byteLen));
+
+    ProcessOneGlyph processOneGlyph(centemPerUnit, typeface->glyphsUsed, &xpsGlyphs);
+
+    SkFindAndPlaceGlyph::ProcessPosText(
+        paint.getTextEncoding(), static_cast<const char*>(text), byteLen,
+        offset, matrix, pos, scalarsPerPos, paint.getTextAlign(), cache, processOneGlyph);
+
+    if (xpsGlyphs.count() == 0) {
         return;
     }
 
     XPS_POINT origin = {
-        procs.xpsGlyphs[0].horizontalOffset / procs.centemPerUnit,
-        procs.xpsGlyphs[0].verticalOffset / -procs.centemPerUnit,
+        xpsGlyphs[0].horizontalOffset / centemPerUnit,
+        xpsGlyphs[0].verticalOffset / -centemPerUnit,
     };
-    procs.xpsGlyphs[0].horizontalOffset = 0.0f;
-    procs.xpsGlyphs[0].verticalOffset = 0.0f;
+    xpsGlyphs[0].horizontalOffset = 0.0f;
+    xpsGlyphs[0].verticalOffset = 0.0f;
 
     HRV(AddGlyphs(d,
                   this->fXpsFactory.get(),
                   this->fCurrentXpsCanvas.get(),
                   typeface,
-                  NULL,
-                  procs.xpsGlyphs.begin(), procs.xpsGlyphs.count(),
+                  nullptr,
+                  xpsGlyphs.begin(), xpsGlyphs.count(),
                   &origin,
                   SkScalarToFLOAT(paint.getTextSize()),
                   XPS_STYLE_SIMULATION_NONE,
@@ -2370,13 +2231,6 @@ void SkXPSDevice::drawPosText(const SkDraw& d,
                   paint));
 }
 
-void SkXPSDevice::drawTextOnPath(const SkDraw& d, const void* text, size_t len,
-                                 const SkPath& path, const SkMatrix* matrix,
-                                 const SkPaint& paint) {
-    //This will call back into the device to do the drawing.
-     d.drawTextOnPath((const char*)text, len, path, matrix, paint);
-}
-
 void SkXPSDevice::drawDevice(const SkDraw& d, SkBaseDevice* dev,
                              int x, int y,
                              const SkPaint&) {
@@ -2404,11 +2258,11 @@ void SkXPSDevice::drawDevice(const SkDraw& d, SkBaseDevice* dev,
          "Could not add layer to current visuals.");
 }
 
-SkBaseDevice* SkXPSDevice::onCreateDevice(const SkImageInfo&, Usage) {
+SkBaseDevice* SkXPSDevice::onCreateDevice(const CreateInfo& info, const SkPaint*) {
 //Conditional for bug compatibility with PDF device.
 #if 0
-    if (SkBaseDevice::kGeneral_Usage == usage) {
-        return NULL;
+    if (SkBaseDevice::kGeneral_Usage == info.fUsage) {
+        return nullptr;
         SK_CRASH();
         //To what stream do we write?
         //SkXPSDevice* dev = new SkXPSDevice(this);
@@ -2420,21 +2274,4 @@ SkBaseDevice* SkXPSDevice::onCreateDevice(const SkImageInfo&, Usage) {
     return new SkXPSDevice(this->fXpsFactory.get());
 }
 
-SkXPSDevice::SkXPSDevice(IXpsOMObjectFactory* xpsFactory)
-    : SkBitmapDevice(make_fake_bitmap(10000, 10000))
-    , fCurrentPage(0) {
-
-    HRVM(CoCreateInstance(
-             CLSID_XpsOMObjectFactory,
-             NULL,
-             CLSCTX_INPROC_SERVER,
-             IID_PPV_ARGS(&this->fXpsFactory)),
-         "Could not create factory for layer.");
-
-    HRVM(this->fXpsFactory->CreateCanvas(&this->fCurrentXpsCanvas),
-         "Could not create canvas for layer.");
-}
-
-bool SkXPSDevice::allowImageFilter(const SkImageFilter*) {
-    return false;
-}
+#endif//defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/src/doc/SkDocument.cpp b/gfx/skia/skia/src/doc/SkDocument.cpp
index 5b2237d18a66..fa25e44f8645 100644
--- a/gfx/skia/skia/src/doc/SkDocument.cpp
+++ b/gfx/skia/skia/src/doc/SkDocument.cpp
@@ -21,7 +21,7 @@ SkDocument::~SkDocument() {
 SkCanvas* SkDocument::beginPage(SkScalar width, SkScalar height,
                                 const SkRect* content) {
     if (width <= 0 || height <= 0) {
-        return NULL;
+        return nullptr;
     }
 
     SkRect outer = SkRect::MakeWH(width, height);
@@ -29,7 +29,7 @@ SkCanvas* SkDocument::beginPage(SkScalar width, SkScalar height,
     if (content) {
         inner = *content;
         if (!inner.intersect(outer)) {
-            return NULL;
+            return nullptr;
         }
     } else {
         inner = outer;
@@ -44,11 +44,11 @@ SkCanvas* SkDocument::beginPage(SkScalar width, SkScalar height,
                 this->endPage();
                 break;
             case kClosed_State:
-                return NULL;
+                return nullptr;
         }
     }
     SkDEBUGFAIL("never get here");
-    return NULL;
+    return nullptr;
 }
 
 void SkDocument::endPage() {
@@ -68,9 +68,9 @@ bool SkDocument::close() {
                 if (fDoneProc) {
                     fDoneProc(fStream, false);
                 }
-                // we don't own the stream, but we mark it NULL since we can
+                // we don't own the stream, but we mark it nullptr since we can
                 // no longer write to it.
-                fStream = NULL;
+                fStream = nullptr;
                 return success;
             }
             case kInPage_State:
@@ -89,7 +89,7 @@ void SkDocument::abort() {
     if (fDoneProc) {
         fDoneProc(fStream, true);
     }
-    // we don't own the stream, but we mark it NULL since we can
+    // we don't own the stream, but we mark it nullptr since we can
     // no longer write to it.
-    fStream = NULL;
+    fStream = nullptr;
 }
diff --git a/gfx/skia/skia/src/doc/SkDocument_PDF.cpp b/gfx/skia/skia/src/doc/SkDocument_PDF.cpp
index 142099375cbf..ff7a038b6bf2 100644
--- a/gfx/skia/skia/src/doc/SkDocument_PDF.cpp
+++ b/gfx/skia/skia/src/doc/SkDocument_PDF.cpp
@@ -1,26 +1,330 @@
 /*
- * Copyright 2013 Google Inc.
+ * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDocument.h"
-#include "SkPDFDocument.h"
-#include "SkPDFDeviceFlattener.h"
+#include "SkPDFCanon.h"
+#include "SkPDFDevice.h"
+#include "SkPDFFont.h"
+#include "SkPDFStream.h"
+#include "SkPDFTypes.h"
+#include "SkPDFUtils.h"
+#include "SkStream.h"
+#include "SkPDFMetadata.h"
 
+class SkPDFDict;
+
+static void emit_pdf_header(SkWStream* stream) {
+    stream->writeText("%PDF-1.4\n%");
+    // The PDF spec recommends including a comment with four bytes, all
+    // with their high bits set.  This is "Skia" with the high bits set.
+    stream->write32(0xD3EBE9E1);
+    stream->writeText("\n");
+}
+
+static void emit_pdf_footer(SkWStream* stream,
+                            const SkPDFObjNumMap& objNumMap,
+                            const SkPDFSubstituteMap& substitutes,
+                            SkPDFObject* docCatalog,
+                            int64_t objCount,
+                            int32_t xRefFileOffset,
+                            SkPDFObject* info /* take ownership */,
+                            SkPDFObject* id /* take ownership */) {
+    SkPDFDict trailerDict;
+    // TODO(http://crbug.com/80908): Linearized format will take a
+    //                               Prev entry too.
+    trailerDict.insertInt("Size", int(objCount));
+    trailerDict.insertObjRef("Root", SkRef(docCatalog));
+    SkASSERT(info);
+    trailerDict.insertObjRef("Info", info);
+    if (id) {
+        trailerDict.insertObject("ID", id);
+    }
+    stream->writeText("trailer\n");
+    trailerDict.emitObject(stream, objNumMap, substitutes);
+    stream->writeText("\nstartxref\n");
+    stream->writeBigDecAsText(xRefFileOffset);
+    stream->writeText("\n%%EOF");
+}
+
+static void perform_font_subsetting(
+        const SkTDArray<const SkPDFDevice*>& pageDevices,
+        SkPDFSubstituteMap* substituteMap) {
+    SkASSERT(substituteMap);
+
+    SkPDFGlyphSetMap usage;
+    for (int i = 0; i < pageDevices.count(); ++i) {
+        usage.merge(pageDevices[i]->getFontGlyphUsage());
+    }
+    SkPDFGlyphSetMap::F2BIter iterator(usage);
+    const SkPDFGlyphSetMap::FontGlyphSetPair* entry = iterator.next();
+    while (entry) {
+        SkAutoTUnref<SkPDFFont> subsetFont(
+                entry->fFont->getFontSubset(entry->fGlyphSet));
+        if (subsetFont) {
+            substituteMap->setSubstitute(entry->fFont, subsetFont.get());
+        }
+        entry = iterator.next();
+    }
+}
+
+static SkPDFObject* create_pdf_page_content(const SkPDFDevice* pageDevice) {
+    SkAutoTDelete<SkStreamAsset> content(pageDevice->content());
+    return new SkPDFStream(content.get());
+}
+
+static SkPDFDict* create_pdf_page(const SkPDFDevice* pageDevice) {
+    SkAutoTUnref<SkPDFDict> page(new SkPDFDict("Page"));
+    page->insertObject("Resources", pageDevice->createResourceDict());
+    page->insertObject("MediaBox", pageDevice->copyMediaBox());
+    SkAutoTUnref<SkPDFArray> annotations(new SkPDFArray);
+    pageDevice->appendAnnotations(annotations);
+    if (annotations->size() > 0) {
+        page->insertObject("Annots", annotations.detach());
+    }
+    page->insertObjRef("Contents", create_pdf_page_content(pageDevice));
+    return page.detach();
+}
+
+static void generate_page_tree(const SkTDArray<SkPDFDict*>& pages,
+                               SkTDArray<SkPDFDict*>* pageTree,
+                               SkPDFDict** rootNode) {
+    // PDF wants a tree describing all the pages in the document.  We arbitrary
+    // choose 8 (kNodeSize) as the number of allowed children.  The internal
+    // nodes have type "Pages" with an array of children, a parent pointer, and
+    // the number of leaves below the node as "Count."  The leaves are passed
+    // into the method, have type "Page" and need a parent pointer. This method
+    // builds the tree bottom up, skipping internal nodes that would have only
+    // one child.
+    static const int kNodeSize = 8;
+
+    // curNodes takes a reference to its items, which it passes to pageTree.
+    SkTDArray<SkPDFDict*> curNodes;
+    curNodes.setReserve(pages.count());
+    for (int i = 0; i < pages.count(); i++) {
+        SkSafeRef(pages[i]);
+        curNodes.push(pages[i]);
+    }
+
+    // nextRoundNodes passes its references to nodes on to curNodes.
+    SkTDArray<SkPDFDict*> nextRoundNodes;
+    nextRoundNodes.setReserve((pages.count() + kNodeSize - 1)/kNodeSize);
+
+    int treeCapacity = kNodeSize;
+    do {
+        for (int i = 0; i < curNodes.count(); ) {
+            if (i > 0 && i + 1 == curNodes.count()) {
+                nextRoundNodes.push(curNodes[i]);
+                break;
+            }
+
+            SkAutoTUnref<SkPDFDict> newNode(new SkPDFDict("Pages"));
+            SkAutoTUnref<SkPDFArray> kids(new SkPDFArray);
+            kids->reserve(kNodeSize);
+
+            int count = 0;
+            for (; i < curNodes.count() && count < kNodeSize; i++, count++) {
+                curNodes[i]->insertObjRef("Parent", SkRef(newNode.get()));
+                kids->appendObjRef(SkRef(curNodes[i]));
+
+                // TODO(vandebo): put the objects in strict access order.
+                // Probably doesn't matter because they are so small.
+                if (curNodes[i] != pages[0]) {
+                    pageTree->push(curNodes[i]);  // Transfer reference.
+                } else {
+                    SkSafeUnref(curNodes[i]);
+                }
+            }
+
+            // treeCapacity is the number of leaf nodes possible for the
+            // current set of subtrees being generated. (i.e. 8, 64, 512, ...).
+            // It is hard to count the number of leaf nodes in the current
+            // subtree. However, by construction, we know that unless it's the
+            // last subtree for the current depth, the leaf count will be
+            // treeCapacity, otherwise it's what ever is left over after
+            // consuming treeCapacity chunks.
+            int pageCount = treeCapacity;
+            if (i == curNodes.count()) {
+                pageCount = ((pages.count() - 1) % treeCapacity) + 1;
+            }
+            newNode->insertInt("Count", pageCount);
+            newNode->insertObject("Kids", kids.detach());
+            nextRoundNodes.push(newNode.detach());  // Transfer reference.
+        }
+
+        curNodes = nextRoundNodes;
+        nextRoundNodes.rewind();
+        treeCapacity *= kNodeSize;
+    } while (curNodes.count() > 1);
+
+    pageTree->push(curNodes[0]);  // Transfer reference.
+    if (rootNode) {
+        *rootNode = curNodes[0];
+    }
+}
+
+static bool emit_pdf_document(const SkTDArray<const SkPDFDevice*>& pageDevices,
+                              const SkPDFMetadata& metadata,
+                              SkWStream* stream) {
+    if (pageDevices.isEmpty()) {
+        return false;
+    }
+
+    SkTDArray<SkPDFDict*> pages;
+    SkAutoTUnref<SkPDFDict> dests(new SkPDFDict);
+
+    for (int i = 0; i < pageDevices.count(); i++) {
+        SkASSERT(pageDevices[i]);
+        SkASSERT(i == 0 ||
+                 pageDevices[i - 1]->getCanon() == pageDevices[i]->getCanon());
+        SkAutoTUnref<SkPDFDict> page(create_pdf_page(pageDevices[i]));
+        pageDevices[i]->appendDestinations(dests, page.get());
+        pages.push(page.detach());
+    }
+
+    SkAutoTUnref<SkPDFDict> docCatalog(new SkPDFDict("Catalog"));
+
+    SkAutoTUnref<SkPDFObject> infoDict(
+            metadata.createDocumentInformationDict());
+
+    SkAutoTUnref<SkPDFObject> id, xmp;
+#ifdef SK_PDF_GENERATE_PDFA
+    SkPDFMetadata::UUID uuid = metadata.uuid();
+    // We use the same UUID for Document ID and Instance ID since this
+    // is the first revision of this document (and Skia does not
+    // support revising existing PDF documents).
+    // If we are not in PDF/A mode, don't use a UUID since testing
+    // works best with reproducible outputs.
+    id.reset(SkPDFMetadata::CreatePdfId(uuid, uuid));
+    xmp.reset(metadata.createXMPObject(uuid, uuid));
+    docCatalog->insertObjRef("Metadata", xmp.detach());
+
+    // sRGB is specified by HTML, CSS, and SVG.
+    SkAutoTUnref<SkPDFDict> outputIntent(new SkPDFDict("OutputIntent"));
+    outputIntent->insertName("S", "GTS_PDFA1");
+    outputIntent->insertString("RegistryName", "http://www.color.org");
+    outputIntent->insertString("OutputConditionIdentifier",
+                               "sRGB IEC61966-2.1");
+    SkAutoTUnref<SkPDFArray> intentArray(new SkPDFArray);
+    intentArray->appendObject(outputIntent.detach());
+    // Don't specify OutputIntents if we are not in PDF/A mode since
+    // no one has ever asked for this feature.
+    docCatalog->insertObject("OutputIntents", intentArray.detach());
+#endif
+
+    SkTDArray<SkPDFDict*> pageTree;
+    SkPDFDict* pageTreeRoot;
+    generate_page_tree(pages, &pageTree, &pageTreeRoot);
+    docCatalog->insertObjRef("Pages", SkRef(pageTreeRoot));
+
+    if (dests->size() > 0) {
+        docCatalog->insertObjRef("Dests", dests.detach());
+    }
+
+    // Build font subsetting info before proceeding.
+    SkPDFSubstituteMap substitutes;
+    perform_font_subsetting(pageDevices, &substitutes);
+
+    SkPDFObjNumMap objNumMap;
+    objNumMap.addObjectRecursively(infoDict, substitutes);
+    objNumMap.addObjectRecursively(docCatalog.get(), substitutes);
+    size_t baseOffset = stream->bytesWritten();
+    emit_pdf_header(stream);
+    SkTDArray<int32_t> offsets;
+    for (int i = 0; i < objNumMap.objects().count(); ++i) {
+        SkPDFObject* object = objNumMap.objects()[i];
+        size_t offset = stream->bytesWritten();
+        // This assert checks that size(pdf_header) > 0 and that
+        // the output stream correctly reports bytesWritten().
+        SkASSERT(offset > baseOffset);
+        offsets.push(SkToS32(offset - baseOffset));
+        SkASSERT(object == substitutes.getSubstitute(object));
+        SkASSERT(objNumMap.getObjectNumber(object) == i + 1);
+        stream->writeDecAsText(i + 1);
+        stream->writeText(" 0 obj\n");  // Generation number is always 0.
+        object->emitObject(stream, objNumMap, substitutes);
+        stream->writeText("\nendobj\n");
+    }
+    int32_t xRefFileOffset = SkToS32(stream->bytesWritten() - baseOffset);
+
+    // Include the zeroth object in the count.
+    int32_t objCount = SkToS32(offsets.count() + 1);
+
+    stream->writeText("xref\n0 ");
+    stream->writeDecAsText(objCount);
+    stream->writeText("\n0000000000 65535 f \n");
+    for (int i = 0; i < offsets.count(); i++) {
+        SkASSERT(offsets[i] > 0);
+        stream->writeBigDecAsText(offsets[i], 10);
+        stream->writeText(" 00000 n \n");
+    }
+    emit_pdf_footer(stream, objNumMap, substitutes, docCatalog.get(), objCount,
+                    xRefFileOffset, infoDict.detach(), id.detach());
+
+    // The page tree has both child and parent pointers, so it creates a
+    // reference cycle.  We must clear that cycle to properly reclaim memory.
+    for (int i = 0; i < pageTree.count(); i++) {
+        pageTree[i]->clear();
+    }
+    pageTree.safeUnrefAll();
+    pages.unrefAll();
+    return true;
+}
+
+#if 0
+// TODO(halcanary): expose notEmbeddableCount in SkDocument
+void GetCountOfFontTypes(
+        const SkTDArray<SkPDFDevice*>& pageDevices,
+        int counts[SkAdvancedTypefaceMetrics::kOther_Font + 1],
+        int* notSubsettableCount,
+        int* notEmbeddableCount) {
+    sk_bzero(counts, sizeof(int) *
+                     (SkAdvancedTypefaceMetrics::kOther_Font + 1));
+    SkTDArray<SkFontID> seenFonts;
+    int notSubsettable = 0;
+    int notEmbeddable = 0;
+
+    for (int pageNumber = 0; pageNumber < pageDevices.count(); pageNumber++) {
+        const SkTDArray<SkPDFFont*>& fontResources =
+                pageDevices[pageNumber]->getFontResources();
+        for (int font = 0; font < fontResources.count(); font++) {
+            SkFontID fontID = fontResources[font]->typeface()->uniqueID();
+            if (seenFonts.find(fontID) == -1) {
+                counts[fontResources[font]->getType()]++;
+                seenFonts.push(fontID);
+                if (!fontResources[font]->canSubset()) {
+                    notSubsettable++;
+                }
+                if (!fontResources[font]->canEmbed()) {
+                    notEmbeddable++;
+                }
+            }
+        }
+    }
+    if (notSubsettableCount) {
+        *notSubsettableCount = notSubsettable;
+
+    }
+    if (notEmbeddableCount) {
+        *notEmbeddableCount = notEmbeddable;
+    }
+}
+#endif
+
+template <typename T> static T* clone(const T* o) { return o ? new T(*o) : nullptr; }
+////////////////////////////////////////////////////////////////////////////////
+
+namespace {
 class SkDocument_PDF : public SkDocument {
 public:
-    SkDocument_PDF(SkWStream* stream, void (*doneProc)(SkWStream*,bool),
-                   SkPicture::EncodeBitmap encoder,
+    SkDocument_PDF(SkWStream* stream,
+                   void (*doneProc)(SkWStream*, bool),
                    SkScalar rasterDpi)
-            : SkDocument(stream, doneProc)
-            , fEncoder(encoder)
-            , fRasterDpi(rasterDpi) {
-        fDoc = SkNEW(SkPDFDocument);
-        fCanvas = NULL;
-        fDevice = NULL;
-    }
+        : SkDocument(stream, doneProc)
+        , fRasterDpi(rasterDpi) {}
 
     virtual ~SkDocument_PDF() {
         // subclasses must call close() in their destructors
@@ -28,81 +332,69 @@ public:
     }
 
 protected:
-    virtual SkCanvas* onBeginPage(SkScalar width, SkScalar height,
-                                  const SkRect& trimBox) SK_OVERRIDE {
-        SkASSERT(NULL == fCanvas);
-        SkASSERT(NULL == fDevice);
+    SkCanvas* onBeginPage(SkScalar width, SkScalar height,
+                          const SkRect& trimBox) override {
+        SkASSERT(!fCanvas.get());
 
-        SkSize mediaBoxSize;
-        mediaBoxSize.set(width, height);
-
-        fDevice = SkNEW_ARGS(SkPDFDeviceFlattener, (mediaBoxSize, &trimBox));
-        if (fEncoder) {
-            fDevice->setDCTEncoder(fEncoder);
-        }
-        if (fRasterDpi != 0) {
-            fDevice->setRasterDpi(fRasterDpi);
-        }
-        fCanvas = SkNEW_ARGS(SkCanvas, (fDevice));
-        return fCanvas;
+        SkISize pageSize = SkISize::Make(
+                SkScalarRoundToInt(width), SkScalarRoundToInt(height));
+        SkAutoTUnref<SkPDFDevice> device(
+                SkPDFDevice::Create(pageSize, fRasterDpi, &fCanon));
+        fCanvas.reset(new SkCanvas(device.get()));
+        fPageDevices.push(device.detach());
+        fCanvas->clipRect(trimBox);
+        fCanvas->translate(trimBox.x(), trimBox.y());
+        return fCanvas.get();
     }
 
-    virtual void onEndPage() SK_OVERRIDE {
-        SkASSERT(fCanvas);
-        SkASSERT(fDevice);
-
+    void onEndPage() override {
+        SkASSERT(fCanvas.get());
         fCanvas->flush();
-        fDoc->appendPage(fDevice);
-
-        fCanvas->unref();
-        fDevice->unref();
-
-        fCanvas = NULL;
-        fDevice = NULL;
+        fCanvas.reset(nullptr);
     }
 
-    virtual bool onClose(SkWStream* stream) SK_OVERRIDE {
-        SkASSERT(NULL == fCanvas);
-        SkASSERT(NULL == fDevice);
+    bool onClose(SkWStream* stream) override {
+        SkASSERT(!fCanvas.get());
 
-        bool success = fDoc->emitPDF(stream);
-        SkDELETE(fDoc);
-        fDoc = NULL;
+        bool success = emit_pdf_document(fPageDevices, fMetadata, stream);
+        fPageDevices.unrefAll();
+        fCanon.reset();
         return success;
     }
 
-    virtual void onAbort() SK_OVERRIDE {
-        SkDELETE(fDoc);
-        fDoc = NULL;
+    void onAbort() override {
+        fPageDevices.unrefAll();
+        fCanon.reset();
+    }
+
+    void setMetadata(const SkTArray<SkDocument::Attribute>& info,
+                     const SkTime::DateTime* creationDate,
+                     const SkTime::DateTime* modifiedDate) override {
+        fMetadata.fInfo = info;
+        fMetadata.fCreation.reset(clone(creationDate));
+        fMetadata.fModified.reset(clone(modifiedDate));
     }
 
 private:
-    SkPDFDocument*  fDoc;
-    SkPDFDeviceFlattener* fDevice;
-    SkCanvas*       fCanvas;
-    SkPicture::EncodeBitmap fEncoder;
-    SkScalar        fRasterDpi;
+    SkPDFCanon fCanon;
+    SkTDArray<const SkPDFDevice*> fPageDevices;
+    SkAutoTUnref<SkCanvas> fCanvas;
+    SkScalar fRasterDpi;
+    SkPDFMetadata fMetadata;
 };
-
+}  // namespace
 ///////////////////////////////////////////////////////////////////////////////
 
-SkDocument* SkDocument::CreatePDF(SkWStream* stream, void (*done)(SkWStream*,bool),
-                                  SkPicture::EncodeBitmap enc,
-                                  SkScalar dpi) {
-    return stream ? SkNEW_ARGS(SkDocument_PDF, (stream, done, enc, dpi)) : NULL;
+SkDocument* SkDocument::CreatePDF(SkWStream* stream, SkScalar dpi) {
+    return stream ? new SkDocument_PDF(stream, nullptr, dpi) : nullptr;
 }
 
-static void delete_wstream(SkWStream* stream, bool aborted) {
-    SkDELETE(stream);
-}
-
-SkDocument* SkDocument::CreatePDF(const char path[],
-                                  SkPicture::EncodeBitmap enc,
-                                  SkScalar dpi) {
-    SkFILEWStream* stream = SkNEW_ARGS(SkFILEWStream, (path));
+SkDocument* SkDocument::CreatePDF(const char path[], SkScalar dpi) {
+    SkFILEWStream* stream = new SkFILEWStream(path);
     if (!stream->isValid()) {
-        SkDELETE(stream);
-        return NULL;
+        delete stream;
+        return nullptr;
     }
-    return SkNEW_ARGS(SkDocument_PDF, (stream, delete_wstream, enc, dpi));
+    auto delete_wstream = [](SkWStream* stream, bool) { delete stream; };
+    return new SkDocument_PDF(stream, delete_wstream, dpi);
 }
diff --git a/gfx/skia/skia/src/doc/SkDocument_PDF_None.cpp b/gfx/skia/skia/src/doc/SkDocument_PDF_None.cpp
new file mode 100644
index 000000000000..f146cba01861
--- /dev/null
+++ b/gfx/skia/skia/src/doc/SkDocument_PDF_None.cpp
@@ -0,0 +1,9 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "SkDocument.h"
+SkDocument* SkDocument::CreatePDF(SkWStream*, SkScalar) { return  nullptr; }
+SkDocument* SkDocument::CreatePDF(const char path[], SkScalar) { return nullptr; }
diff --git a/gfx/skia/skia/src/doc/SkDocument_XPS.cpp b/gfx/skia/skia/src/doc/SkDocument_XPS.cpp
new file mode 100644
index 000000000000..0e241d9aaa36
--- /dev/null
+++ b/gfx/skia/skia/src/doc/SkDocument_XPS.cpp
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_WIN32)
+
+#include "SkDocument.h"
+#include "SkXPSDevice.h"
+#include "SkStream.h"
+
+class SkDocument_XPS : public SkDocument {
+public:
+    SkDocument_XPS(SkWStream* stream,
+                   void (*doneProc)(SkWStream*, bool),
+                   SkScalar dpi)
+        : SkDocument(stream, doneProc) {
+        const SkScalar kPointsPerMeter = SkDoubleToScalar(360000.0 / 127.0);
+        fUnitsPerMeter.set(kPointsPerMeter, kPointsPerMeter);
+        SkScalar pixelsPerMeterScale = SkDoubleToScalar(dpi * 5000.0 / 127.0);
+        fPixelsPerMeter.set(pixelsPerMeterScale, pixelsPerMeterScale);
+        fDevice.beginPortfolio(stream);
+    }
+
+    virtual ~SkDocument_XPS() {
+        // subclasses must call close() in their destructors
+        this->close();
+    }
+
+protected:
+    SkCanvas* onBeginPage(SkScalar width,
+                          SkScalar height,
+                          const SkRect& trimBox) override {
+        fDevice.beginSheet(fUnitsPerMeter, fPixelsPerMeter,
+                           SkSize::Make(width, height));
+        fCanvas.reset(new SkCanvas(&fDevice));
+        fCanvas->clipRect(trimBox);
+        fCanvas->translate(trimBox.x(), trimBox.y());
+        return fCanvas.get();
+    }
+
+    void onEndPage() override {
+        SkASSERT(fCanvas.get());
+        fCanvas->flush();
+        fCanvas.reset(nullptr);
+        fDevice.endSheet();
+    }
+
+    bool onClose(SkWStream*) override {
+        SkASSERT(!fCanvas.get());
+        return fDevice.endPortfolio();
+    }
+
+    void onAbort() override {}
+
+private:
+    SkXPSDevice fDevice;
+    SkAutoTUnref<SkCanvas> fCanvas;
+    SkVector fUnitsPerMeter;
+    SkVector fPixelsPerMeter;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+SkDocument* SkDocument::CreateXPS(SkWStream* stream, SkScalar dpi) {
+    return stream ? new SkDocument_XPS(stream, nullptr, dpi) : nullptr;
+}
+
+static void delete_wstream(SkWStream* stream, bool aborted) { delete stream; }
+
+SkDocument* SkDocument::CreateXPS(const char path[], SkScalar dpi) {
+    SkAutoTDelete<SkFILEWStream> stream(new SkFILEWStream(path));
+    if (!stream->isValid()) {
+        return nullptr;
+    }
+    return new SkDocument_XPS(stream.detach(), delete_wstream, dpi);
+}
+
+#endif//defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/src/doc/SkDocument_XPS_None.cpp b/gfx/skia/skia/src/doc/SkDocument_XPS_None.cpp
new file mode 100644
index 000000000000..32b18fb221ca
--- /dev/null
+++ b/gfx/skia/skia/src/doc/SkDocument_XPS_None.cpp
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkTypes.h"
+#if !defined(SK_BUILD_FOR_WIN32)
+
+#include "SkDocument.h"
+SkDocument* SkDocument::CreateXPS(SkWStream*, SkScalar) { return nullptr; }
+SkDocument* SkDocument::CreateXPS(const char path[], SkScalar) { return nullptr; }
+
+#endif//!defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/src/effects/GrCircleBlurFragmentProcessor.cpp b/gfx/skia/skia/src/effects/GrCircleBlurFragmentProcessor.cpp
new file mode 100644
index 000000000000..8c9d20492867
--- /dev/null
+++ b/gfx/skia/skia/src/effects/GrCircleBlurFragmentProcessor.cpp
@@ -0,0 +1,261 @@
+
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrCircleBlurFragmentProcessor.h"
+
+#if SK_SUPPORT_GPU
+
+#include "GrContext.h"
+#include "GrTextureProvider.h"
+
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+
+class GrGLCircleBlurFragmentProcessor : public GrGLSLFragmentProcessor {
+public:
+    GrGLCircleBlurFragmentProcessor(const GrProcessor&) {}
+    void emitCode(EmitArgs&) override;
+
+protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
+
+private:
+    GrGLSLProgramDataManager::UniformHandle fDataUniform;
+
+    typedef GrGLSLFragmentProcessor INHERITED;
+};
+
+void GrGLCircleBlurFragmentProcessor::emitCode(EmitArgs& args) {
+
+    const char *dataName;
+
+    // The data is formatted as:
+    // x,y  - the center of the circle
+    // z    - the distance at which the intensity starts falling off (e.g., the start of the table)
+    // w    - the size of the profile texture
+    fDataUniform = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                             kVec4f_GrSLType,
+                                             kDefault_GrSLPrecision,
+                                             "data",
+                                             &dataName);
+
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    const char *fragmentPos = fragBuilder->fragmentPosition();
+
+    if (args.fInputColor) {
+        fragBuilder->codeAppendf("vec4 src=%s;", args.fInputColor);
+    } else {
+        fragBuilder->codeAppendf("vec4 src=vec4(1);");
+    }
+
+    fragBuilder->codeAppendf("vec2 vec = %s.xy - %s.xy;", fragmentPos, dataName);
+    fragBuilder->codeAppendf("float dist = (length(vec) - %s.z + 0.5) / %s.w;", dataName, dataName);
+
+    fragBuilder->codeAppendf("float intensity = ");
+    fragBuilder->appendTextureLookup(args.fSamplers[0], "vec2(dist, 0.5)");
+    fragBuilder->codeAppend(".a;");
+
+    fragBuilder->codeAppendf("%s = src * intensity;\n", args.fOutputColor );
+}
+
+void GrGLCircleBlurFragmentProcessor::onSetData(const GrGLSLProgramDataManager& pdman,
+                                                const GrProcessor& proc) {
+    const GrCircleBlurFragmentProcessor& cbfp = proc.cast<GrCircleBlurFragmentProcessor>();
+    const SkRect& circle = cbfp.circle();
+
+    // The data is formatted as:
+    // x,y  - the center of the circle
+    // z    - the distance at which the intensity starts falling off (e.g., the start of the table)
+    // w    - the size of the profile texture
+    pdman.set4f(fDataUniform, circle.centerX(), circle.centerY(), cbfp.offset(),
+                SkIntToScalar(cbfp.profileSize()));
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+GrCircleBlurFragmentProcessor::GrCircleBlurFragmentProcessor(const SkRect& circle,
+                                                             float sigma,
+                                                             float offset,
+                                                             GrTexture* blurProfile) 
+    : fCircle(circle)
+    , fSigma(sigma)
+    , fOffset(offset)
+    , fBlurProfileAccess(blurProfile, GrTextureParams::kBilerp_FilterMode) {
+    this->initClassID<GrCircleBlurFragmentProcessor>();
+    this->addTextureAccess(&fBlurProfileAccess);
+    this->setWillReadFragmentPosition();
+}
+
+GrGLSLFragmentProcessor* GrCircleBlurFragmentProcessor::onCreateGLSLInstance() const {
+    return new GrGLCircleBlurFragmentProcessor(*this);
+}
+
+void GrCircleBlurFragmentProcessor::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                                          GrProcessorKeyBuilder* b) const {
+    GrGLCircleBlurFragmentProcessor::GenKey(*this, caps, b);
+}
+
+void GrCircleBlurFragmentProcessor::onComputeInvariantOutput(GrInvariantOutput* inout) const {
+    inout->mulByUnknownSingleComponent();
+}
+
+// Evaluate an AA circle function centered at the origin with 'radius' at (x,y)
+static inline float disk(float x, float y, float radius) {
+    float distSq = x*x + y*y;
+    if (distSq <= (radius-0.5f)*(radius-0.5f)) {
+        return 1.0f;
+    } else if (distSq >= (radius+0.5f)*(radius+0.5f)) {
+        return 0.0f;
+    } else {
+        float ramp = radius + 0.5f - sqrtf(distSq);
+        SkASSERT(ramp >= 0.0f && ramp <= 1.0f);
+        return ramp;
+    }
+}
+
+// Create the top half of an even-sized Gaussian kernel
+static void make_half_kernel(float* kernel, int kernelWH, float sigma) {
+    SkASSERT(!(kernelWH & 1));
+
+    const float kernelOff = (kernelWH-1)/2.0f;
+
+    float b = 1.0f / (2.0f * sigma * sigma);
+    // omit the scale term since we're just going to renormalize
+
+    float tot = 0.0f;
+    for (int y = 0; y < kernelWH/2; ++y) {
+        for (int x = 0; x < kernelWH/2; ++x) {
+            // TODO: use a cheap approximation of the 2D Guassian?
+            float x2 = (x-kernelOff) * (x-kernelOff);
+            float y2 = (y-kernelOff) * (y-kernelOff);
+            // The kernel is symmetric so only compute it once for both sides
+            kernel[y*kernelWH+(kernelWH-x-1)] = kernel[y*kernelWH+x] = expf(-(x2 + y2) * b);
+            tot += 2.0f * kernel[y*kernelWH+x];
+        }
+    }
+    // Still normalize the half kernel to 1.0 (rather than 0.5) so we don't
+    // have to scale by 2.0 after convolution.
+    for (int y = 0; y < kernelWH/2; ++y) {
+        for (int x = 0; x < kernelWH; ++x) {
+            kernel[y*kernelWH+x] /= tot;
+        }
+    }
+}
+
+// Apply the half-kernel at 't' away from the center of the circle
+static uint8_t eval_at(float t, float halfWidth, float* halfKernel, int kernelWH) {
+    SkASSERT(!(kernelWH & 1));
+
+    const float kernelOff = (kernelWH-1)/2.0f;
+
+    float acc = 0;
+
+    for (int y = 0; y < kernelWH/2; ++y) {
+        if (kernelOff-y > halfWidth+0.5f) {
+            // All disk() samples in this row will be 0.0f
+            continue;
+        }
+
+        for (int x = 0; x < kernelWH; ++x) {
+            float image = disk(t - kernelOff + x, -kernelOff + y, halfWidth);
+            float kernel = halfKernel[y*kernelWH+x];
+            acc += kernel * image;
+        }
+    }
+
+    return SkUnitScalarClampToByte(acc);
+}
+
+static inline void compute_profile_offset_and_size(float halfWH, float sigma,
+                                                   float* offset, int* size) {
+
+    if (3*sigma <= halfWH) {
+        // The circle is bigger than the Gaussian. In this case we know the interior of the
+        // blurred circle is solid.
+        *offset = halfWH - 3 * sigma; // This location maps to 0.5f in the weights texture.
+                                     // It should always be 255.
+        *size = SkScalarCeilToInt(6*sigma);
+    } else {
+        // The Gaussian is bigger than the circle.
+        *offset = 0.0f;
+        *size = SkScalarCeilToInt(halfWH + 3*sigma);
+    }
+}
+
+static uint8_t* create_profile(float halfWH, float sigma) {
+
+    int kernelWH = SkScalarCeilToInt(6.0f*sigma);
+    kernelWH = (kernelWH + 1) & ~1; // make it the next even number up
+
+    SkAutoTArray<float> halfKernel(kernelWH*kernelWH/2);
+
+    make_half_kernel(halfKernel.get(), kernelWH, sigma);
+
+    float offset;
+    int numSteps;
+
+    compute_profile_offset_and_size(halfWH, sigma, &offset, &numSteps);
+
+    uint8_t* weights = new uint8_t[numSteps];
+    for (int i = 0; i < numSteps; ++i) {
+        weights[i] = eval_at(offset+i, halfWH, halfKernel.get(), kernelWH);
+    }
+
+    return weights;
+}
+
+GrTexture* GrCircleBlurFragmentProcessor::CreateCircleBlurProfileTexture(
+                                                                GrTextureProvider* textureProvider,
+                                                                const SkRect& circle,
+                                                                float sigma,
+                                                                float* offset) {
+    float halfWH = circle.width() / 2.0f;
+
+    int size;
+    compute_profile_offset_and_size(halfWH, sigma, offset, &size);
+
+    GrSurfaceDesc texDesc;
+    texDesc.fWidth = size;
+    texDesc.fHeight = 1;
+    texDesc.fConfig = kAlpha_8_GrPixelConfig;
+
+    static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
+    GrUniqueKey key;
+    GrUniqueKey::Builder builder(&key, kDomain, 2);
+    // The profile curve varies with both the sigma of the Gaussian and the size of the
+    // disk. Quantizing to 16.16 should be close enough though.
+    builder[0] = SkScalarToFixed(sigma);
+    builder[1] = SkScalarToFixed(halfWH);
+    builder.finish();
+
+    GrTexture *blurProfile = textureProvider->findAndRefTextureByUniqueKey(key);
+
+    if (!blurProfile) {
+        SkAutoTDeleteArray<uint8_t> profile(create_profile(halfWH, sigma));
+
+        blurProfile = textureProvider->createTexture(texDesc, true, profile.get(), 0);
+        if (blurProfile) {
+            textureProvider->assignUniqueKeyToTexture(key, blurProfile);
+        }
+    }
+
+    return blurProfile;
+}
+
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrCircleBlurFragmentProcessor);
+
+const GrFragmentProcessor* GrCircleBlurFragmentProcessor::TestCreate(GrProcessorTestData* d) {
+    SkScalar wh = d->fRandom->nextRangeScalar(100.f, 1000.f);
+    SkScalar sigma = d->fRandom->nextRangeF(1.f,10.f);
+    SkRect circle = SkRect::MakeWH(wh, wh);
+    return GrCircleBlurFragmentProcessor::Create(d->fContext->textureProvider(), circle, sigma);
+}
+
+#endif
diff --git a/gfx/skia/skia/src/effects/GrCircleBlurFragmentProcessor.h b/gfx/skia/skia/src/effects/GrCircleBlurFragmentProcessor.h
new file mode 100644
index 000000000000..999596eb2c1d
--- /dev/null
+++ b/gfx/skia/skia/src/effects/GrCircleBlurFragmentProcessor.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrCircleBlurFragmentProcessor_DEFINED
+#define GrCircleBlurFragmentProcessor_DEFINED
+
+#include "SkString.h"
+#include "SkTypes.h"
+
+#if SK_SUPPORT_GPU
+
+#include "GrFragmentProcessor.h"
+#include "GrProcessorUnitTest.h"
+
+class GrTextureProvider;
+
+// This FP handles the special case of a blurred circle. It uses a 1D 
+// profile that is just rotated about the origin of the circle.
+class GrCircleBlurFragmentProcessor : public GrFragmentProcessor {
+public:
+    ~GrCircleBlurFragmentProcessor() override {};
+
+    const char* name() const override { return "CircleBlur"; }
+
+    SkString dumpInfo() const override {
+        SkString str;
+        str.appendf("Rect [L: %.2f, T: %.2f, R: %.2f, B: %.2f], Sigma %.2f, Offset: %.2f",
+                    fCircle.fLeft, fCircle.fTop, fCircle.fRight, fCircle.fBottom,
+                    fSigma, fOffset);
+        return str;
+    }
+
+    static const GrFragmentProcessor* Create(GrTextureProvider*textureProvider,
+                                             const SkRect& circle, float sigma) {
+        float offset;
+
+        SkAutoTUnref<GrTexture> blurProfile(CreateCircleBlurProfileTexture(textureProvider,
+                                                                           circle,
+                                                                           sigma,
+                                                                           &offset));
+        if (!blurProfile) {
+           return nullptr;
+        }
+        return new GrCircleBlurFragmentProcessor(circle, sigma, offset, blurProfile);
+    }
+
+    const SkRect& circle() const { return fCircle; }
+    float sigma() const { return fSigma; }
+    float offset() const { return fOffset; }
+    int profileSize() const { return fBlurProfileAccess.getTexture()->width(); }
+
+private:
+    GrCircleBlurFragmentProcessor(const SkRect& circle, float sigma,
+                                  float offset, GrTexture* blurProfile);
+
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
+
+    bool onIsEqual(const GrFragmentProcessor& other) const override {
+        const GrCircleBlurFragmentProcessor& cbfp = other.cast<GrCircleBlurFragmentProcessor>();
+        // fOffset is computed from the circle width and the sigma
+        return this->circle().width() == cbfp.circle().width() && fSigma == cbfp.fSigma;    
+    }
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
+
+    static GrTexture* CreateCircleBlurProfileTexture(GrTextureProvider*,
+                                                     const SkRect& circle,
+                                                     float sigma, float* offset);
+
+    SkRect              fCircle;
+    float               fSigma;
+    float               fOffset;
+    GrTextureAccess     fBlurProfileAccess;
+
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+
+    typedef GrFragmentProcessor INHERITED;
+};
+
+#endif
+#endif
diff --git a/gfx/skia/skia/src/effects/Sk1DPathEffect.cpp b/gfx/skia/skia/src/effects/Sk1DPathEffect.cpp
index 7354cdacb45b..041886e1db9f 100644
--- a/gfx/skia/skia/src/effects/Sk1DPathEffect.cpp
+++ b/gfx/skia/skia/src/effects/Sk1DPathEffect.cpp
@@ -11,6 +11,7 @@
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkPathMeasure.h"
+#include "SkStrokeRec.h"
 
 bool Sk1DPathEffect::filterPath(SkPath* dst, const SkPath& src,
                                 SkStrokeRec*, const SkRect*) const {
@@ -147,26 +148,23 @@ static void morphpath(SkPath* dst, const SkPath& src, SkPathMeasure& meas,
     }
 }
 
-SkPath1DPathEffect::SkPath1DPathEffect(SkReadBuffer& buffer) {
-    fAdvance = buffer.readScalar();
-    if (fAdvance > 0) {
-        buffer.readPath(&fPath);
-        fInitialOffset = buffer.readScalar();
-        fStyle = (Style) buffer.readUInt();
-    } else {
-        SkDEBUGF(("SkPath1DPathEffect can't use advance <= 0\n"));
-        // Make Coverity happy.
-        fInitialOffset = 0;
-        fStyle = kStyleCount;
-    }
-}
-
 SkScalar SkPath1DPathEffect::begin(SkScalar contourLength) const {
     return fInitialOffset;
 }
 
+SkFlattenable* SkPath1DPathEffect::CreateProc(SkReadBuffer& buffer) {
+    SkScalar advance = buffer.readScalar();
+    if (advance > 0) {
+        SkPath path;
+        buffer.readPath(&path);
+        SkScalar phase = buffer.readScalar();
+        Style style = (Style)buffer.readUInt();
+        return SkPath1DPathEffect::Create(path, advance, phase, style);
+    }
+    return nullptr;
+}
+
 void SkPath1DPathEffect::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
     buffer.writeScalar(fAdvance);
     if (fAdvance > 0) {
         buffer.writePath(fPath);
@@ -180,7 +178,7 @@ SkScalar SkPath1DPathEffect::next(SkPath* dst, SkScalar distance,
     switch (fStyle) {
         case kTranslate_Style: {
             SkPoint pos;
-            if (meas.getPosTan(distance, &pos, NULL)) {
+            if (meas.getPosTan(distance, &pos, nullptr)) {
                 dst->addPath(fPath, pos.fX, pos.fY);
             }
         } break;
@@ -199,3 +197,13 @@ SkScalar SkPath1DPathEffect::next(SkPath* dst, SkScalar distance,
     }
     return fAdvance;
 }
+
+
+#ifndef SK_IGNORE_TO_STRING
+void SkPath1DPathEffect::toString(SkString* str) const {
+    str->appendf("SkPath1DPathEffect: (");
+    // TODO: add path and style
+    str->appendf("advance: %.2f phase %.2f", fAdvance, fInitialOffset);
+    str->appendf(")");
+}
+#endif
diff --git a/gfx/skia/skia/src/effects/Sk2DPathEffect.cpp b/gfx/skia/skia/src/effects/Sk2DPathEffect.cpp
index 252866c05413..7144526dd08a 100644
--- a/gfx/skia/skia/src/effects/Sk2DPathEffect.cpp
+++ b/gfx/skia/skia/src/effects/Sk2DPathEffect.cpp
@@ -12,6 +12,7 @@
 #include "SkWriteBuffer.h"
 #include "SkPath.h"
 #include "SkRegion.h"
+#include "SkStrokeRec.h"
 
 Sk2DPathEffect::Sk2DPathEffect(const SkMatrix& mat) : fMatrix(mat) {
     fMatrixIsInvertible = mat.invert(&fInverse);
@@ -73,10 +74,14 @@ void Sk2DPathEffect::flatten(SkWriteBuffer& buffer) const {
     buffer.writeMatrix(fMatrix);
 }
 
-Sk2DPathEffect::Sk2DPathEffect(SkReadBuffer& buffer) {
-    buffer.readMatrix(&fMatrix);
-    fMatrixIsInvertible = fMatrix.invert(&fInverse);
+#ifndef SK_IGNORE_TO_STRING
+void Sk2DPathEffect::toString(SkString* str) const {
+    str->appendf("(matrix: %.2f %.2f %.2f %.2f %.2f %.2f %.2f %.2f %.2f)",
+            fMatrix[SkMatrix::kMScaleX], fMatrix[SkMatrix::kMSkewX],  fMatrix[SkMatrix::kMTransX],
+            fMatrix[SkMatrix::kMSkewY],  fMatrix[SkMatrix::kMScaleY], fMatrix[SkMatrix::kMTransY],
+            fMatrix[SkMatrix::kMPersp0], fMatrix[SkMatrix::kMPersp1], fMatrix[SkMatrix::kMPersp2]);
 }
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -102,28 +107,44 @@ void SkLine2DPathEffect::nextSpan(int u, int v, int ucount, SkPath* dst) const {
     }
 }
 
-SkLine2DPathEffect::SkLine2DPathEffect(SkReadBuffer& buffer) : INHERITED(buffer) {
-    fWidth = buffer.readScalar();
+SkFlattenable* SkLine2DPathEffect::CreateProc(SkReadBuffer& buffer) {
+    SkMatrix matrix;
+    buffer.readMatrix(&matrix);
+    SkScalar width = buffer.readScalar();
+    return SkLine2DPathEffect::Create(width, matrix);
 }
 
 void SkLine2DPathEffect::flatten(SkWriteBuffer &buffer) const {
-    this->INHERITED::flatten(buffer);
+    buffer.writeMatrix(this->getMatrix());
     buffer.writeScalar(fWidth);
 }
 
+
+#ifndef SK_IGNORE_TO_STRING
+void SkLine2DPathEffect::toString(SkString* str) const {
+    str->appendf("SkLine2DPathEffect: (");
+    this->INHERITED::toString(str);
+    str->appendf("width: %f", fWidth);
+    str->appendf(")");
+}
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////
 
 SkPath2DPathEffect::SkPath2DPathEffect(const SkMatrix& m, const SkPath& p)
     : INHERITED(m), fPath(p) {
 }
 
-SkPath2DPathEffect::SkPath2DPathEffect(SkReadBuffer& buffer)
-        : INHERITED(buffer) {
-    buffer.readPath(&fPath);
+SkFlattenable* SkPath2DPathEffect::CreateProc(SkReadBuffer& buffer) {
+    SkMatrix matrix;
+    buffer.readMatrix(&matrix);
+    SkPath path;
+    buffer.readPath(&path);
+    return SkPath2DPathEffect::Create(matrix, path);
 }
 
 void SkPath2DPathEffect::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
+    buffer.writeMatrix(this->getMatrix());
     buffer.writePath(fPath);
 }
 
@@ -131,3 +152,12 @@ void SkPath2DPathEffect::next(const SkPoint& loc, int u, int v,
                               SkPath* dst) const {
     dst->addPath(fPath, loc.fX, loc.fY);
 }
+
+#ifndef SK_IGNORE_TO_STRING
+void SkPath2DPathEffect::toString(SkString* str) const {
+    str->appendf("SkPath2DPathEffect: (");
+    this->INHERITED::toString(str);
+    // TODO: print out path information
+    str->appendf(")");
+}
+#endif
diff --git a/gfx/skia/skia/src/effects/SkAlphaThresholdFilter.cpp b/gfx/skia/skia/src/effects/SkAlphaThresholdFilter.cpp
index 76e1bc8ec7b8..e6f1f088cbae 100644
--- a/gfx/skia/skia/src/effects/SkAlphaThresholdFilter.cpp
+++ b/gfx/skia/skia/src/effects/SkAlphaThresholdFilter.cpp
@@ -7,26 +7,30 @@
 
 #include "SkAlphaThresholdFilter.h"
 #include "SkBitmap.h"
+#include "SkDevice.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkRegion.h"
+#if SK_SUPPORT_GPU
+#include "GrDrawContext.h"
+#endif
 
 class SK_API SkAlphaThresholdFilterImpl : public SkImageFilter {
 public:
     SkAlphaThresholdFilterImpl(const SkRegion& region, SkScalar innerThreshold,
                                SkScalar outerThreshold, SkImageFilter* input);
 
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkAlphaThresholdFilterImpl)
 
 protected:
-    explicit SkAlphaThresholdFilterImpl(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
 
-    virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                               SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
+    bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
+                       SkBitmap* result, SkIPoint* offset) const override;
 #if SK_SUPPORT_GPU
-    virtual bool asNewEffect(GrEffect** effect, GrTexture* texture,
-                             const SkMatrix& matrix, const SkIRect& bounds) const SK_OVERRIDE;
+    bool asFragmentProcessor(GrFragmentProcessor**, GrTexture*, const SkMatrix&,
+                             const SkIRect& bounds) const override;
 #endif
 
 private:
@@ -40,47 +44,41 @@ SkImageFilter* SkAlphaThresholdFilter::Create(const SkRegion& region,
                                               SkScalar innerThreshold,
                                               SkScalar outerThreshold,
                                               SkImageFilter* input) {
-    return SkNEW_ARGS(SkAlphaThresholdFilterImpl, (region, innerThreshold, outerThreshold, input));
+    return new SkAlphaThresholdFilterImpl(region, innerThreshold, outerThreshold, input);
 }
 
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #include "GrCoordTransform.h"
-#include "GrEffect.h"
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
-#include "GrTBackendEffectFactory.h"
+#include "GrFragmentProcessor.h"
+#include "GrInvariantOutput.h"
 #include "GrTextureAccess.h"
+#include "effects/GrPorterDuffXferProcessor.h"
 
 #include "SkGr.h"
 
-class GrGLAlphaThresholdEffect;
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
 
-class AlphaThresholdEffect : public GrEffect {
+class AlphaThresholdEffect : public GrFragmentProcessor {
 
 public:
-    static GrEffect* Create(GrTexture* texture,
-                            GrTexture* maskTexture,
-                            float innerThreshold,
-                            float outerThreshold) {
-        return SkNEW_ARGS(AlphaThresholdEffect, (texture,
-                                                 maskTexture,
-                                                 innerThreshold,
-                                                 outerThreshold));
+    static GrFragmentProcessor* Create(GrTexture* texture,
+                                       GrTexture* maskTexture,
+                                       float innerThreshold,
+                                       float outerThreshold) {
+        return new AlphaThresholdEffect(texture, maskTexture, innerThreshold, outerThreshold);
     }
 
     virtual ~AlphaThresholdEffect() {};
 
-    static const char* Name() { return "Alpha Threshold"; }
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
+    const char* name() const override { return "Alpha Threshold"; }
 
     float innerThreshold() const { return fInnerThreshold; }
     float outerThreshold() const { return fOuterThreshold; }
 
-    typedef GrGLAlphaThresholdEffect GLEffect;
-
 private:
     AlphaThresholdEffect(GrTexture* texture,
                          GrTexture* maskTexture,
@@ -88,19 +86,30 @@ private:
                          float outerThreshold)
         : fInnerThreshold(innerThreshold)
         , fOuterThreshold(outerThreshold)
-        , fImageCoordTransform(kLocal_GrCoordSet, MakeDivByTextureWHMatrix(texture), texture)
+        , fImageCoordTransform(kLocal_GrCoordSet,
+                               GrCoordTransform::MakeDivByTextureWHMatrix(texture), texture,
+                               GrTextureParams::kNone_FilterMode)
         , fImageTextureAccess(texture)
-        , fMaskCoordTransform(kLocal_GrCoordSet, MakeDivByTextureWHMatrix(maskTexture), maskTexture)
+        , fMaskCoordTransform(kLocal_GrCoordSet,
+                              GrCoordTransform::MakeDivByTextureWHMatrix(maskTexture), maskTexture,
+                              GrTextureParams::kNone_FilterMode)
         , fMaskTextureAccess(maskTexture) {
+        this->initClassID<AlphaThresholdEffect>();
         this->addCoordTransform(&fImageCoordTransform);
         this->addTextureAccess(&fImageTextureAccess);
         this->addCoordTransform(&fMaskCoordTransform);
         this->addTextureAccess(&fMaskTextureAccess);
     }
 
-    virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE;
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
 
-    GR_DECLARE_EFFECT_TEST;
+    void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
+
+    bool onIsEqual(const GrFragmentProcessor&) const override;
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
+
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
 
     float fInnerThreshold;
     float fOuterThreshold;
@@ -109,135 +118,125 @@ private:
     GrCoordTransform fMaskCoordTransform;
     GrTextureAccess  fMaskTextureAccess;
 
-    typedef GrEffect INHERITED;
+    typedef GrFragmentProcessor INHERITED;
 };
 
-class GrGLAlphaThresholdEffect : public GrGLEffect {
+class GrGLAlphaThresholdEffect : public GrGLSLFragmentProcessor {
 public:
-    GrGLAlphaThresholdEffect(const GrBackendEffectFactory&, const GrDrawEffect&);
+    GrGLAlphaThresholdEffect(const GrFragmentProcessor&) {}
 
-    virtual void emitCode(GrGLShaderBuilder*,
-                          const GrDrawEffect&,
-                          const GrEffectKey&,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    virtual void emitCode(EmitArgs&) override;
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
 
 private:
 
-    GrGLUniformManager::UniformHandle       fInnerThresholdVar;
-    GrGLUniformManager::UniformHandle       fOuterThresholdVar;
+    GrGLSLProgramDataManager::UniformHandle fInnerThresholdVar;
+    GrGLSLProgramDataManager::UniformHandle fOuterThresholdVar;
 
-    typedef GrGLEffect INHERITED;
+    typedef GrGLSLFragmentProcessor INHERITED;
 };
 
-GrGLAlphaThresholdEffect::GrGLAlphaThresholdEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&)
-    : INHERITED(factory) {
+void GrGLAlphaThresholdEffect::emitCode(EmitArgs& args) {
+    fInnerThresholdVar = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                                   kFloat_GrSLType, kDefault_GrSLPrecision,
+                                                   "inner_threshold");
+    fOuterThresholdVar = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                                   kFloat_GrSLType, kDefault_GrSLPrecision,
+                                                   "outer_threshold");
+
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    SkString coords2D = fragBuilder->ensureFSCoords2D(args.fCoords, 0);
+    SkString maskCoords2D = fragBuilder->ensureFSCoords2D(args.fCoords, 1);
+
+    fragBuilder->codeAppendf("\t\tvec2 coord = %s;\n", coords2D.c_str());
+    fragBuilder->codeAppendf("\t\tvec2 mask_coord = %s;\n", maskCoords2D.c_str());
+    fragBuilder->codeAppend("\t\tvec4 input_color = ");
+    fragBuilder->appendTextureLookup(args.fSamplers[0], "coord");
+    fragBuilder->codeAppend(";\n");
+    fragBuilder->codeAppend("\t\tvec4 mask_color = ");
+    fragBuilder->appendTextureLookup(args.fSamplers[1], "mask_coord");
+    fragBuilder->codeAppend(";\n");
+
+    fragBuilder->codeAppendf("\t\tfloat inner_thresh = %s;\n",
+                             args.fBuilder->getUniformCStr(fInnerThresholdVar));
+    fragBuilder->codeAppendf("\t\tfloat outer_thresh = %s;\n",
+                             args.fBuilder->getUniformCStr(fOuterThresholdVar));
+    fragBuilder->codeAppend("\t\tfloat mask = mask_color.a;\n");
+
+    fragBuilder->codeAppend("vec4 color = input_color;\n");
+    fragBuilder->codeAppend("\t\tif (mask < 0.5) {\n"
+                            "\t\t\tif (color.a > outer_thresh) {\n"
+                            "\t\t\t\tfloat scale = outer_thresh / color.a;\n"
+                            "\t\t\t\tcolor.rgb *= scale;\n"
+                            "\t\t\t\tcolor.a = outer_thresh;\n"
+                            "\t\t\t}\n"
+                            "\t\t} else if (color.a < inner_thresh) {\n"
+                            "\t\t\tfloat scale = inner_thresh / max(0.001, color.a);\n"
+                            "\t\t\tcolor.rgb *= scale;\n"
+                            "\t\t\tcolor.a = inner_thresh;\n"
+                            "\t\t}\n");
+
+    fragBuilder->codeAppendf("%s = %s;\n", args.fOutputColor,
+                             (GrGLSLExpr4(args.fInputColor) * GrGLSLExpr4("color")).c_str());
 }
 
-void GrGLAlphaThresholdEffect::emitCode(GrGLShaderBuilder* builder,
-                                        const GrDrawEffect&,
-                                        const GrEffectKey& key,
-                                        const char* outputColor,
-                                        const char* inputColor,
-                                        const TransformedCoordsArray& coords,
-                                        const TextureSamplerArray& samplers) {
-    SkString coords2D = builder->ensureFSCoords2D(coords, 0);
-    SkString maskCoords2D = builder->ensureFSCoords2D(coords, 1);
-    fInnerThresholdVar = builder->addUniform(
-        GrGLShaderBuilder::kFragment_Visibility,
-        kFloat_GrSLType, "inner_threshold");
-    fOuterThresholdVar = builder->addUniform(
-        GrGLShaderBuilder::kFragment_Visibility,
-        kFloat_GrSLType, "outer_threshold");
-
-    builder->fsCodeAppendf("\t\tvec2 coord = %s;\n", coords2D.c_str());
-    builder->fsCodeAppendf("\t\tvec2 mask_coord = %s;\n", maskCoords2D.c_str());
-    builder->fsCodeAppend("\t\tvec4 input_color = ");
-    builder->fsAppendTextureLookup(samplers[0], "coord");
-    builder->fsCodeAppend(";\n");
-    builder->fsCodeAppend("\t\tvec4 mask_color = ");
-    builder->fsAppendTextureLookup(samplers[1], "mask_coord");
-    builder->fsCodeAppend(";\n");
-
-    builder->fsCodeAppendf("\t\tfloat inner_thresh = %s;\n",
-                           builder->getUniformCStr(fInnerThresholdVar));
-    builder->fsCodeAppendf("\t\tfloat outer_thresh = %s;\n",
-                           builder->getUniformCStr(fOuterThresholdVar));
-    builder->fsCodeAppend("\t\tfloat mask = mask_color.a;\n");
-
-    builder->fsCodeAppend("vec4 color = input_color;\n");
-    builder->fsCodeAppend("\t\tif (mask < 0.5) {\n"
-                          "\t\t\tif (color.a > outer_thresh) {\n"
-                          "\t\t\t\tfloat scale = outer_thresh / color.a;\n"
-                          "\t\t\t\tcolor.rgb *= scale;\n"
-                          "\t\t\t\tcolor.a = outer_thresh;\n"
-                          "\t\t\t}\n"
-                          "\t\t} else if (color.a < inner_thresh) {\n"
-                          "\t\t\tfloat scale = inner_thresh / max(0.001, color.a);\n"
-                          "\t\t\tcolor.rgb *= scale;\n"
-                          "\t\t\tcolor.a = inner_thresh;\n"
-                          "\t\t}\n");
-
-    builder->fsCodeAppendf("%s = %s;\n", outputColor,
-                           (GrGLSLExpr4(inputColor) * GrGLSLExpr4("color")).c_str());
-}
-
-void GrGLAlphaThresholdEffect::setData(const GrGLUniformManager& uman,
-                                  const GrDrawEffect& drawEffect) {
-    const AlphaThresholdEffect& alpha_threshold =
-        drawEffect.castEffect<AlphaThresholdEffect>();
-    uman.set1f(fInnerThresholdVar, alpha_threshold.innerThreshold());
-    uman.set1f(fOuterThresholdVar, alpha_threshold.outerThreshold());
+void GrGLAlphaThresholdEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                                       const GrProcessor& proc) {
+    const AlphaThresholdEffect& alpha_threshold = proc.cast<AlphaThresholdEffect>();
+    pdman.set1f(fInnerThresholdVar, alpha_threshold.innerThreshold());
+    pdman.set1f(fOuterThresholdVar, alpha_threshold.outerThreshold());
 }
 
 /////////////////////////////////////////////////////////////////////
 
-GR_DEFINE_EFFECT_TEST(AlphaThresholdEffect);
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(AlphaThresholdEffect);
 
-GrEffect* AlphaThresholdEffect::TestCreate(SkRandom* random,
-                                           GrContext* context,
-                                           const GrDrawTargetCaps&,
-                                           GrTexture** textures) {
-    GrTexture* bmpTex = textures[GrEffectUnitTest::kSkiaPMTextureIdx];
-    GrTexture* maskTex = textures[GrEffectUnitTest::kAlphaTextureIdx];
-    float inner_thresh = random->nextUScalar1();
-    float outer_thresh = random->nextUScalar1();
-    return AlphaThresholdEffect::Create(bmpTex, maskTex, inner_thresh, outer_thresh);
+const GrFragmentProcessor* AlphaThresholdEffect::TestCreate(GrProcessorTestData* d) {
+    GrTexture* bmpTex = d->fTextures[GrProcessorUnitTest::kSkiaPMTextureIdx];
+    GrTexture* maskTex = d->fTextures[GrProcessorUnitTest::kAlphaTextureIdx];
+    float innerThresh = d->fRandom->nextUScalar1();
+    float outerThresh = d->fRandom->nextUScalar1();
+    return AlphaThresholdEffect::Create(bmpTex, maskTex, innerThresh, outerThresh);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-const GrBackendEffectFactory& AlphaThresholdEffect::getFactory() const {
-    return GrTBackendEffectFactory<AlphaThresholdEffect>::getInstance();
+void AlphaThresholdEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                                 GrProcessorKeyBuilder* b) const {
+    GrGLAlphaThresholdEffect::GenKey(*this, caps, b);
 }
 
-bool AlphaThresholdEffect::onIsEqual(const GrEffect& sBase) const {
-    const AlphaThresholdEffect& s = CastEffect<AlphaThresholdEffect>(sBase);
-    return (this->texture(0) == s.texture(0) &&
-            this->fInnerThreshold == s.fInnerThreshold &&
+GrGLSLFragmentProcessor* AlphaThresholdEffect::onCreateGLSLInstance() const {
+    return new GrGLAlphaThresholdEffect(*this);
+}
+
+bool AlphaThresholdEffect::onIsEqual(const GrFragmentProcessor& sBase) const {
+    const AlphaThresholdEffect& s = sBase.cast<AlphaThresholdEffect>();
+    return (this->fInnerThreshold == s.fInnerThreshold &&
             this->fOuterThreshold == s.fOuterThreshold);
 }
 
-void AlphaThresholdEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
-    if ((*validFlags & kA_GrColorComponentFlag) && 0xFF == GrColorUnpackA(*color) &&
-        GrPixelConfigIsOpaque(this->texture(0)->config())) {
-        *validFlags = kA_GrColorComponentFlag;
+void AlphaThresholdEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const {
+    if (GrPixelConfigIsAlphaOnly(this->texture(0)->config())) {
+        inout->mulByUnknownSingleComponent();
+    } else if (GrPixelConfigIsOpaque(this->texture(0)->config()) && fOuterThreshold >= 1.f) {
+        inout->mulByUnknownOpaqueFourComponents();
     } else {
-        *validFlags = 0;
+        inout->mulByUnknownFourComponents();
     }
 }
 
 #endif
 
-SkAlphaThresholdFilterImpl::SkAlphaThresholdFilterImpl(SkReadBuffer& buffer)
-  : INHERITED(1, buffer) {
-    fInnerThreshold = buffer.readScalar();
-    fOuterThreshold = buffer.readScalar();
-    buffer.readRegion(&fRegion);
+SkFlattenable* SkAlphaThresholdFilterImpl::CreateProc(SkReadBuffer& buffer) {
+    SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
+    SkScalar inner = buffer.readScalar();
+    SkScalar outer = buffer.readScalar();
+    SkRegion rgn;
+    buffer.readRegion(&rgn);
+    return SkAlphaThresholdFilter::Create(rgn, inner, outer, common.getInput(0));
 }
 
 SkAlphaThresholdFilterImpl::SkAlphaThresholdFilterImpl(const SkRegion& region,
@@ -251,49 +250,48 @@ SkAlphaThresholdFilterImpl::SkAlphaThresholdFilterImpl(const SkRegion& region,
 }
 
 #if SK_SUPPORT_GPU
-bool SkAlphaThresholdFilterImpl::asNewEffect(GrEffect** effect, GrTexture* texture,
-                                             const SkMatrix& in_matrix, const SkIRect&) const {
-    if (effect) {
+bool SkAlphaThresholdFilterImpl::asFragmentProcessor(GrFragmentProcessor** fp,
+                                                     GrTexture* texture,
+                                                     const SkMatrix& inMatrix,
+                                                     const SkIRect&) const {
+    if (fp) {
         GrContext* context = texture->getContext();
-        GrTextureDesc maskDesc;
-        if (context->isConfigRenderable(kAlpha_8_GrPixelConfig, false)) {
+        GrSurfaceDesc maskDesc;
+        if (context->caps()->isConfigRenderable(kAlpha_8_GrPixelConfig, false)) {
             maskDesc.fConfig = kAlpha_8_GrPixelConfig;
         } else {
             maskDesc.fConfig = kRGBA_8888_GrPixelConfig;
         }
-        maskDesc.fFlags = kRenderTarget_GrTextureFlagBit | kNoStencil_GrTextureFlagBit;
+        maskDesc.fFlags = kRenderTarget_GrSurfaceFlag;
         // Add one pixel of border to ensure that clamp mode will be all zeros
         // the outside.
         maskDesc.fWidth = texture->width();
         maskDesc.fHeight = texture->height();
-        GrAutoScratchTexture ast(context, maskDesc, GrContext::kApprox_ScratchTexMatch);
-        GrTexture*  maskTexture = ast.texture();
-        if (NULL == maskTexture) {
+        SkAutoTUnref<GrTexture> maskTexture(
+            context->textureProvider()->createApproxTexture(maskDesc));
+        if (!maskTexture) {
             return false;
         }
 
-        {
-            GrContext::AutoRenderTarget art(context, ast.texture()->asRenderTarget());
+        SkAutoTUnref<GrDrawContext> drawContext(
+                                            context->drawContext(maskTexture->asRenderTarget()));
+        if (drawContext) {
             GrPaint grPaint;
-            grPaint.setBlendFunc(kOne_GrBlendCoeff, kZero_GrBlendCoeff);
+            grPaint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode);
             SkRegion::Iterator iter(fRegion);
-            context->clear(NULL, 0x0, true);
-
-            SkMatrix old_matrix = context->getMatrix();
-            context->setMatrix(in_matrix);
+            drawContext->clear(nullptr, 0x0, true);
 
             while (!iter.done()) {
                 SkRect rect = SkRect::Make(iter.rect());
-                context->drawRect(grPaint, rect);
+                drawContext->drawRect(GrClip::WideOpen(), grPaint, inMatrix, rect);
                 iter.next();
             }
-            context->setMatrix(old_matrix);
         }
 
-        *effect = AlphaThresholdEffect::Create(texture,
-                                               maskTexture,
-                                               fInnerThreshold,
-                                               fOuterThreshold);
+        *fp = AlphaThresholdEffect::Create(texture,
+                                           maskTexture,
+                                           fInnerThreshold,
+                                           fOuterThreshold);
     }
     return true;
 }
@@ -306,7 +304,7 @@ void SkAlphaThresholdFilterImpl::flatten(SkWriteBuffer& buffer) const {
     buffer.writeRegion(fRegion);
 }
 
-bool SkAlphaThresholdFilterImpl::onFilterImage(Proxy*, const SkBitmap& src,
+bool SkAlphaThresholdFilterImpl::onFilterImage(Proxy* proxy, const SkBitmap& src,
                                                const Context& ctx, SkBitmap* dst,
                                                SkIPoint* offset) const {
     SkASSERT(src.colorType() == kN32_SkColorType);
@@ -326,9 +324,12 @@ bool SkAlphaThresholdFilterImpl::onFilterImage(Proxy*, const SkBitmap& src,
         return false;
     }
 
-    if (!dst->allocPixels(src.info())) {
+    SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(src.width(), src.height()));
+    if (!device) {
         return false;
     }
+    *dst = device->accessBitmap(false);
+    SkAutoLockPixels alp_dst(*dst);
 
     U8CPU innerThreshold = (U8CPU)(fInnerThreshold * 0xFF);
     U8CPU outerThreshold = (U8CPU)(fOuterThreshold * 0xFF);
@@ -367,3 +368,12 @@ bool SkAlphaThresholdFilterImpl::onFilterImage(Proxy*, const SkBitmap& src,
 
     return true;
 }
+
+#ifndef SK_IGNORE_TO_STRING
+void SkAlphaThresholdFilterImpl::toString(SkString* str) const {
+    str->appendf("SkAlphaThresholdImageFilter: (");
+    str->appendf("inner: %f outer: %f", fInnerThreshold, fOuterThreshold);
+    str->append(")");
+}
+#endif
+
diff --git a/gfx/skia/skia/src/effects/SkArcToPathEffect.cpp b/gfx/skia/skia/src/effects/SkArcToPathEffect.cpp
new file mode 100644
index 000000000000..06cba96109c6
--- /dev/null
+++ b/gfx/skia/skia/src/effects/SkArcToPathEffect.cpp
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkArcToPathEffect.h"
+#include "SkPath.h"
+#include "SkPoint.h"
+#include "SkReadBuffer.h"
+#include "SkWriteBuffer.h"
+
+SkArcToPathEffect::SkArcToPathEffect(SkScalar radius) : fRadius(radius) {}
+
+bool SkArcToPathEffect::filterPath(SkPath* dst, const SkPath& src,
+                                   SkStrokeRec*, const SkRect*) const {
+    SkPath::Iter    iter(src, false);
+    SkPath::Verb    verb;
+    SkPoint         pts[4];
+
+    SkPoint         lastCorner = { 0, 0 }; // avoid warning
+    SkPath::Verb    prevVerb = SkPath::kMove_Verb;
+
+    for (;;) {
+        switch (verb = iter.next(pts, false)) {
+            case SkPath::kMove_Verb:
+                if (SkPath::kLine_Verb == prevVerb) {
+                    dst->lineTo(lastCorner);
+                }
+                dst->moveTo(pts[0]);
+                break;
+            case SkPath::kLine_Verb:
+                if (prevVerb == SkPath::kLine_Verb) {
+                    dst->arcTo(pts[0], pts[1], fRadius);
+                }
+                lastCorner = pts[1];
+                break;
+            case SkPath::kQuad_Verb:
+                dst->quadTo(pts[1], pts[2]);
+                lastCorner = pts[2];
+                break;
+            case SkPath::kConic_Verb:
+                dst->conicTo(pts[1], pts[2], iter.conicWeight());
+                lastCorner = pts[2];
+                break;
+            case SkPath::kCubic_Verb:
+                dst->cubicTo(pts[1], pts[2], pts[3]);
+                lastCorner = pts[3];
+                break;
+            case SkPath::kClose_Verb:
+                dst->lineTo(lastCorner);
+                break;
+            case SkPath::kDone_Verb:
+                dst->lineTo(lastCorner);
+                goto DONE;
+        }
+        prevVerb = verb;
+    }
+DONE:
+    return true;
+}
+
+SkFlattenable* SkArcToPathEffect::CreateProc(SkReadBuffer& buffer) {
+    return SkArcToPathEffect::Create(buffer.readScalar());
+}
+
+void SkArcToPathEffect::flatten(SkWriteBuffer& buffer) const {
+    buffer.writeScalar(fRadius);
+}
+
+#ifndef SK_IGNORE_TO_STRING
+void SkArcToPathEffect::toString(SkString* str) const {
+    str->appendf("SkArcToPathEffect: (");
+    str->appendf("radius: %f", fRadius);
+    str->appendf(")");
+}
+#endif
diff --git a/gfx/skia/skia/src/effects/SkArithmeticMode.cpp b/gfx/skia/skia/src/effects/SkArithmeticMode.cpp
index e43603ac1e1f..87af82efdbc6 100644
--- a/gfx/skia/skia/src/effects/SkArithmeticMode.cpp
+++ b/gfx/skia/skia/src/effects/SkArithmeticMode.cpp
@@ -12,11 +12,7 @@
 #include "SkString.h"
 #include "SkUnPreMultiply.h"
 #if SK_SUPPORT_GPU
-#include "GrContext.h"
-#include "GrCoordTransform.h"
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
-#include "GrTBackendEffectFactory.h"
+#include "SkArithmeticMode_gpu.h"
 #endif
 
 static const bool gUseUnpremul = false;
@@ -25,17 +21,20 @@ class SkArithmeticMode_scalar : public SkXfermode {
 public:
     static SkArithmeticMode_scalar* Create(SkScalar k1, SkScalar k2, SkScalar k3, SkScalar k4,
                                            bool enforcePMColor) {
-        return SkNEW_ARGS(SkArithmeticMode_scalar, (k1, k2, k3, k4, enforcePMColor));
+        return new SkArithmeticMode_scalar(k1, k2, k3, k4, enforcePMColor);
     }
 
     virtual void xfer32(SkPMColor dst[], const SkPMColor src[], int count,
-                        const SkAlpha aa[]) const SK_OVERRIDE;
+                        const SkAlpha aa[]) const override;
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkArithmeticMode_scalar)
 
 #if SK_SUPPORT_GPU
-    virtual bool asNewEffect(GrEffect** effect, GrTexture* background) const SK_OVERRIDE;
+    bool asFragmentProcessor(const GrFragmentProcessor**,
+                             const GrFragmentProcessor* dst) const override;
+
+    bool asXPFactory(GrXPFactory**) const override;
 #endif
 
 private:
@@ -47,16 +46,7 @@ private:
         fEnforcePMColor = enforcePMColor;
     }
 
-    SkArithmeticMode_scalar(SkReadBuffer& buffer) : INHERITED(buffer) {
-        fK[0] = buffer.readScalar();
-        fK[1] = buffer.readScalar();
-        fK[2] = buffer.readScalar();
-        fK[3] = buffer.readScalar();
-        fEnforcePMColor = buffer.readBool();
-    }
-
-    virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE {
-        INHERITED::flatten(buffer);
+    void flatten(SkWriteBuffer& buffer) const override {
         buffer.writeScalar(fK[0]);
         buffer.writeScalar(fK[1]);
         buffer.writeScalar(fK[2]);
@@ -66,9 +56,20 @@ private:
     SkScalar fK[4];
     bool fEnforcePMColor;
 
+    friend class SkArithmeticMode;
+
     typedef SkXfermode INHERITED;
 };
 
+SkFlattenable* SkArithmeticMode_scalar::CreateProc(SkReadBuffer& buffer) {
+    const SkScalar k1 = buffer.readScalar();
+    const SkScalar k2 = buffer.readScalar();
+    const SkScalar k3 = buffer.readScalar();
+    const SkScalar k4 = buffer.readScalar();
+    const bool enforcePMColor = buffer.readBool();
+    return Create(k1, k2, k3, k4, enforcePMColor);
+}
+
 static int pinToByte(int value) {
     if (value < 0) {
         value = 0;
@@ -104,7 +105,7 @@ void SkArithmeticMode_scalar::xfer32(SkPMColor dst[], const SkPMColor src[],
     SkScalar k4 = fK[3] * 255;
 
     for (int i = 0; i < count; ++i) {
-        if ((NULL == aaCoverage) || aaCoverage[i]) {
+        if ((nullptr == aaCoverage) || aaCoverage[i]) {
             SkPMColor sc = src[i];
             SkPMColor dc = dst[i];
 
@@ -216,15 +217,15 @@ SkXfermode* SkArithmeticMode::Create(SkScalar k1, SkScalar k2,
         int32_t i3 = toDot8(k3);
         int32_t i4 = toDot8(k4);
         if (i1) {
-            return SkNEW_ARGS(SkArithmeticMode_quad, (i1, i2, i3, i4));
+            return new SkArithmeticMode_quad  (i1, i2, i3, i4);
         }
         if (0 == i2) {
-            return SkNEW_ARGS(SkArithmeticMode_dst, (i3, i4));
+            return new SkArithmeticMode_dst  (i3, i4);
         }
         if (0 == i3) {
-            return SkNEW_ARGS(SkArithmeticMode_src, (i2, i4));
+            return new SkArithmeticMode_src  (i2, i4);
         }
-        return SkNEW_ARGS(SkArithmeticMode_linear, (i2, i3, i4));
+        return new SkArithmeticMode_linear  (i2, i3, i4);
 #endif
     }
     return SkArithmeticMode_scalar::Create(k1, k2, k3, k4, enforcePMColor);
@@ -234,206 +235,26 @@ SkXfermode* SkArithmeticMode::Create(SkScalar k1, SkScalar k2,
 //////////////////////////////////////////////////////////////////////////////
 
 #if SK_SUPPORT_GPU
-
-class GrGLArithmeticEffect : public GrGLEffect {
-public:
-    GrGLArithmeticEffect(const GrBackendEffectFactory&, const GrDrawEffect&);
-    virtual ~GrGLArithmeticEffect();
-
-    virtual void emitCode(GrGLShaderBuilder*,
-                          const GrDrawEffect&,
-                          const GrEffectKey&,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
-
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
-
-    static void GenKey(const GrDrawEffect&, const GrGLCaps& caps, GrEffectKeyBuilder* b);
-
-private:
-    GrGLUniformManager::UniformHandle fKUni;
-    bool fEnforcePMColor;
-
-    typedef GrGLEffect INHERITED;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
-class GrArithmeticEffect : public GrEffect {
-public:
-    static GrEffect* Create(float k1, float k2, float k3, float k4, bool enforcePMColor,
-                               GrTexture* background) {
-        return SkNEW_ARGS(GrArithmeticEffect, (k1, k2, k3, k4, enforcePMColor, background));
-    }
-
-    virtual ~GrArithmeticEffect();
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
-
-    typedef GrGLArithmeticEffect GLEffect;
-    static const char* Name() { return "Arithmetic"; }
-    GrTexture* backgroundTexture() const { return fBackgroundAccess.getTexture(); }
-
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
-
-    float k1() const { return fK1; }
-    float k2() const { return fK2; }
-    float k3() const { return fK3; }
-    float k4() const { return fK4; }
-    bool enforcePMColor() const { return fEnforcePMColor; }
-
-private:
-    virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE;
-
-    GrArithmeticEffect(float k1, float k2, float k3, float k4, bool enforcePMColor,
-                       GrTexture* background);
-    float                       fK1, fK2, fK3, fK4;
-    bool                        fEnforcePMColor;
-    GrCoordTransform            fBackgroundTransform;
-    GrTextureAccess             fBackgroundAccess;
-
-    GR_DECLARE_EFFECT_TEST;
-    typedef GrEffect INHERITED;
-
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
-GrArithmeticEffect::GrArithmeticEffect(float k1, float k2, float k3, float k4,
-                                       bool enforcePMColor, GrTexture* background)
-  : fK1(k1), fK2(k2), fK3(k3), fK4(k4), fEnforcePMColor(enforcePMColor) {
-    if (background) {
-        fBackgroundTransform.reset(kLocal_GrCoordSet, background);
-        this->addCoordTransform(&fBackgroundTransform);
-        fBackgroundAccess.reset(background);
-        this->addTextureAccess(&fBackgroundAccess);
-    } else {
-        this->setWillReadDstColor();
+bool SkArithmeticMode_scalar::asFragmentProcessor(const GrFragmentProcessor** fp,
+                                                  const GrFragmentProcessor* dst) const {
+    if (fp) {
+        *fp = GrArithmeticFP::Create(SkScalarToFloat(fK[0]),
+                                     SkScalarToFloat(fK[1]),
+                                     SkScalarToFloat(fK[2]),
+                                     SkScalarToFloat(fK[3]),
+                                     fEnforcePMColor,
+                                     dst);
     }
+    return true;
 }
 
-GrArithmeticEffect::~GrArithmeticEffect() {
-}
-
-bool GrArithmeticEffect::onIsEqual(const GrEffect& sBase) const {
-    const GrArithmeticEffect& s = CastEffect<GrArithmeticEffect>(sBase);
-    return fK1 == s.fK1 &&
-           fK2 == s.fK2 &&
-           fK3 == s.fK3 &&
-           fK4 == s.fK4 &&
-           fEnforcePMColor == s.fEnforcePMColor &&
-           backgroundTexture() == s.backgroundTexture();
-}
-
-const GrBackendEffectFactory& GrArithmeticEffect::getFactory() const {
-    return GrTBackendEffectFactory<GrArithmeticEffect>::getInstance();
-}
-
-void GrArithmeticEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
-    // TODO: optimize this
-    *validFlags = 0;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-GrGLArithmeticEffect::GrGLArithmeticEffect(const GrBackendEffectFactory& factory,
-                                           const GrDrawEffect& drawEffect)
-   : INHERITED(factory),
-     fEnforcePMColor(true) {
-}
-
-GrGLArithmeticEffect::~GrGLArithmeticEffect() {
-}
-
-void GrGLArithmeticEffect::emitCode(GrGLShaderBuilder* builder,
-                                    const GrDrawEffect& drawEffect,
-                                    const GrEffectKey& key,
-                                    const char* outputColor,
-                                    const char* inputColor,
-                                    const TransformedCoordsArray& coords,
-                                    const TextureSamplerArray& samplers) {
-
-    GrTexture* backgroundTex = drawEffect.castEffect<GrArithmeticEffect>().backgroundTexture();
-    const char* dstColor;
-    if (backgroundTex) {
-        builder->fsCodeAppend("\t\tvec4 bgColor = ");
-        builder->fsAppendTextureLookup(samplers[0], coords[0].c_str(), coords[0].type());
-        builder->fsCodeAppendf(";\n");
-        dstColor = "bgColor";
-    } else {
-        dstColor = builder->dstColor();
-    }
-
-    SkASSERT(NULL != dstColor);
-    fKUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                kVec4f_GrSLType, "k");
-    const char* kUni = builder->getUniformCStr(fKUni);
-
-    // We don't try to optimize for this case at all
-    if (NULL == inputColor) {
-        builder->fsCodeAppendf("\t\tconst vec4 src = vec4(1);\n");
-    } else {
-        builder->fsCodeAppendf("\t\tvec4 src = %s;\n", inputColor);
-        if (gUseUnpremul) {
-            builder->fsCodeAppendf("\t\tsrc.rgb = clamp(src.rgb / src.a, 0.0, 1.0);\n");
-        }
-    }
-
-    builder->fsCodeAppendf("\t\tvec4 dst = %s;\n", dstColor);
-    if (gUseUnpremul) {
-        builder->fsCodeAppendf("\t\tdst.rgb = clamp(dst.rgb / dst.a, 0.0, 1.0);\n");
-    }
-
-    builder->fsCodeAppendf("\t\t%s = %s.x * src * dst + %s.y * src + %s.z * dst + %s.w;\n", outputColor, kUni, kUni, kUni, kUni);
-    builder->fsCodeAppendf("\t\t%s = clamp(%s, 0.0, 1.0);\n", outputColor, outputColor);
-    if (gUseUnpremul) {
-        builder->fsCodeAppendf("\t\t%s.rgb *= %s.a;\n", outputColor, outputColor);
-    } else if (fEnforcePMColor) {
-        builder->fsCodeAppendf("\t\t%s.rgb = min(%s.rgb, %s.a);\n", outputColor, outputColor, outputColor);
-    }
-}
-
-void GrGLArithmeticEffect::setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) {
-    const GrArithmeticEffect& arith = drawEffect.castEffect<GrArithmeticEffect>();
-    uman.set4f(fKUni, arith.k1(), arith.k2(), arith.k3(), arith.k4());
-    fEnforcePMColor = arith.enforcePMColor();
-}
-
-void GrGLArithmeticEffect::GenKey(const GrDrawEffect& drawEffect,
-                                  const GrGLCaps&, GrEffectKeyBuilder* b) {
-    const GrArithmeticEffect& arith = drawEffect.castEffect<GrArithmeticEffect>();
-    uint32_t key = arith.enforcePMColor() ? 1 : 0;
-    if (arith.backgroundTexture()) {
-        key |= 2;
-    }
-    b->add32(key);
-}
-
-GrEffect* GrArithmeticEffect::TestCreate(SkRandom* rand,
-                                         GrContext*,
-                                         const GrDrawTargetCaps&,
-                                         GrTexture*[]) {
-    float k1 = rand->nextF();
-    float k2 = rand->nextF();
-    float k3 = rand->nextF();
-    float k4 = rand->nextF();
-    bool enforcePMColor = rand->nextBool();
-
-    return SkNEW_ARGS(GrArithmeticEffect, (k1, k2, k3, k4, enforcePMColor, NULL));
-}
-
-GR_DEFINE_EFFECT_TEST(GrArithmeticEffect);
-
-bool SkArithmeticMode_scalar::asNewEffect(GrEffect** effect, GrTexture* background) const {
-    if (effect) {
-        *effect = GrArithmeticEffect::Create(SkScalarToFloat(fK[0]),
+bool SkArithmeticMode_scalar::asXPFactory(GrXPFactory** xpf) const {
+    if (xpf) {
+        *xpf = GrArithmeticXPFactory::Create(SkScalarToFloat(fK[0]),
                                              SkScalarToFloat(fK[1]),
                                              SkScalarToFloat(fK[2]),
                                              SkScalarToFloat(fK[3]),
-                                             fEnforcePMColor,
-                                             background);
+                                             fEnforcePMColor);
     }
     return true;
 }
diff --git a/gfx/skia/skia/src/effects/SkArithmeticMode_gpu.cpp b/gfx/skia/skia/src/effects/SkArithmeticMode_gpu.cpp
new file mode 100644
index 000000000000..a3793243ee6a
--- /dev/null
+++ b/gfx/skia/skia/src/effects/SkArithmeticMode_gpu.cpp
@@ -0,0 +1,321 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkArithmeticMode_gpu.h"
+
+#if SK_SUPPORT_GPU
+#include "GrContext.h"
+#include "GrFragmentProcessor.h"
+#include "GrInvariantOutput.h"
+#include "GrProcessor.h"
+#include "GrTexture.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+#include "glsl/GrGLSLXferProcessor.h"
+
+static const bool gUseUnpremul = false;
+
+static void add_arithmetic_code(GrGLSLFragmentBuilder* fragBuilder,
+                                const char* srcColor,
+                                const char* dstColor,
+                                const char* outputColor,
+                                const char* kUni,
+                                bool enforcePMColor) {
+    // We don't try to optimize for this case at all
+    if (nullptr == srcColor) {
+        fragBuilder->codeAppend("const vec4 src = vec4(1);");
+    } else {
+        fragBuilder->codeAppendf("vec4 src = %s;", srcColor);
+        if (gUseUnpremul) {
+            fragBuilder->codeAppend("src.rgb = clamp(src.rgb / src.a, 0.0, 1.0);");
+        }
+    }
+
+    fragBuilder->codeAppendf("vec4 dst = %s;", dstColor);
+    if (gUseUnpremul) {
+        fragBuilder->codeAppend("dst.rgb = clamp(dst.rgb / dst.a, 0.0, 1.0);");
+    }
+
+    fragBuilder->codeAppendf("%s = %s.x * src * dst + %s.y * src + %s.z * dst + %s.w;",
+                             outputColor, kUni, kUni, kUni, kUni);
+    fragBuilder->codeAppendf("%s = clamp(%s, 0.0, 1.0);\n", outputColor, outputColor);
+    if (gUseUnpremul) {
+        fragBuilder->codeAppendf("%s.rgb *= %s.a;", outputColor, outputColor);
+    } else if (enforcePMColor) {
+        fragBuilder->codeAppendf("%s.rgb = min(%s.rgb, %s.a);",
+                                 outputColor, outputColor, outputColor);
+    }
+}
+
+class GLArithmeticFP : public GrGLSLFragmentProcessor {
+public:
+    GLArithmeticFP(const GrArithmeticFP& arithmeticFP)
+        : fEnforcePMColor(arithmeticFP.enforcePMColor()) {}
+
+    ~GLArithmeticFP() override {}
+
+    void emitCode(EmitArgs& args) override {
+        GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+        SkString dstColor("dstColor");
+        this->emitChild(0, nullptr, &dstColor, args);
+
+        fKUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                          kVec4f_GrSLType, kDefault_GrSLPrecision,
+                                          "k");
+        const char* kUni = args.fBuilder->getUniformCStr(fKUni);
+
+        add_arithmetic_code(fragBuilder,
+                            args.fInputColor,
+                            dstColor.c_str(),
+                            args.fOutputColor,
+                            kUni,
+                            fEnforcePMColor);
+    }
+
+    static void GenKey(const GrProcessor& proc, const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) {
+        const GrArithmeticFP& arith = proc.cast<GrArithmeticFP>();
+        uint32_t key = arith.enforcePMColor() ? 1 : 0;
+        b->add32(key);
+    }
+
+protected:
+    void onSetData(const GrGLSLProgramDataManager& pdman, const GrProcessor& proc) override {
+        const GrArithmeticFP& arith = proc.cast<GrArithmeticFP>();
+        pdman.set4f(fKUni, arith.k1(), arith.k2(), arith.k3(), arith.k4());
+        fEnforcePMColor = arith.enforcePMColor();
+    }
+
+private:
+    GrGLSLProgramDataManager::UniformHandle fKUni;
+    bool fEnforcePMColor;
+
+    typedef GrGLSLFragmentProcessor INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+GrArithmeticFP::GrArithmeticFP(float k1, float k2, float k3, float k4, bool enforcePMColor,
+                               const GrFragmentProcessor* dst)
+  : fK1(k1), fK2(k2), fK3(k3), fK4(k4), fEnforcePMColor(enforcePMColor) {
+    this->initClassID<GrArithmeticFP>();
+
+    SkASSERT(dst);
+    SkDEBUGCODE(int dstIndex = )this->registerChildProcessor(dst);
+    SkASSERT(0 == dstIndex);
+}
+
+void GrArithmeticFP::onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const {
+    GLArithmeticFP::GenKey(*this, caps, b);
+}
+
+GrGLSLFragmentProcessor* GrArithmeticFP::onCreateGLSLInstance() const {
+    return new GLArithmeticFP(*this);
+}
+
+bool GrArithmeticFP::onIsEqual(const GrFragmentProcessor& fpBase) const {
+    const GrArithmeticFP& fp = fpBase.cast<GrArithmeticFP>();
+    return fK1 == fp.fK1 &&
+           fK2 == fp.fK2 &&
+           fK3 == fp.fK3 &&
+           fK4 == fp.fK4 &&
+           fEnforcePMColor == fp.fEnforcePMColor;
+}
+
+void GrArithmeticFP::onComputeInvariantOutput(GrInvariantOutput* inout) const {
+    // TODO: optimize this
+    inout->setToUnknown(GrInvariantOutput::kWill_ReadInput);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+const GrFragmentProcessor* GrArithmeticFP::TestCreate(GrProcessorTestData* d) {
+    float k1 = d->fRandom->nextF();
+    float k2 = d->fRandom->nextF();
+    float k3 = d->fRandom->nextF();
+    float k4 = d->fRandom->nextF();
+    bool enforcePMColor = d->fRandom->nextBool();
+
+    SkAutoTUnref<const GrFragmentProcessor> dst(GrProcessorUnitTest::CreateChildFP(d));
+    return new GrArithmeticFP(k1, k2, k3, k4, enforcePMColor, dst);
+}
+
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrArithmeticFP);
+
+///////////////////////////////////////////////////////////////////////////////
+// Xfer Processor
+///////////////////////////////////////////////////////////////////////////////
+
+class ArithmeticXP : public GrXferProcessor {
+public:
+    ArithmeticXP(const DstTexture*, bool hasMixedSamples,
+                 float k1, float k2, float k3, float k4, bool enforcePMColor);
+
+    const char* name() const override { return "Arithmetic"; }
+
+    GrGLSLXferProcessor* createGLSLInstance() const override;
+
+    float k1() const { return fK1; }
+    float k2() const { return fK2; }
+    float k3() const { return fK3; }
+    float k4() const { return fK4; }
+    bool enforcePMColor() const { return fEnforcePMColor; }
+
+private:
+    GrXferProcessor::OptFlags onGetOptimizations(const GrPipelineOptimizations& optimizations,
+                                                 bool doesStencilWrite,
+                                                 GrColor* overrideColor,
+                                                 const GrCaps& caps) const override;
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
+
+    bool onIsEqual(const GrXferProcessor& xpBase) const override {
+        const ArithmeticXP& xp = xpBase.cast<ArithmeticXP>();
+        if (fK1 != xp.fK1 ||
+            fK2 != xp.fK2 ||
+            fK3 != xp.fK3 ||
+            fK4 != xp.fK4 ||
+            fEnforcePMColor != xp.fEnforcePMColor) {
+            return false;
+        }
+        return true;
+    }
+
+    float                       fK1, fK2, fK3, fK4;
+    bool                        fEnforcePMColor;
+
+    typedef GrXferProcessor INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+class GLArithmeticXP : public GrGLSLXferProcessor {
+public:
+    GLArithmeticXP(const ArithmeticXP& arithmeticXP)
+        : fEnforcePMColor(arithmeticXP.enforcePMColor()) {
+    }
+
+    ~GLArithmeticXP() override {}
+
+    static void GenKey(const GrProcessor& processor, const GrGLSLCaps& caps,
+                       GrProcessorKeyBuilder* b) {
+        const ArithmeticXP& arith = processor.cast<ArithmeticXP>();
+        uint32_t key = arith.enforcePMColor() ? 1 : 0;
+        b->add32(key);
+    }
+
+private:
+    void emitBlendCodeForDstRead(GrGLSLXPBuilder* pb,
+                                 GrGLSLXPFragmentBuilder* fragBuilder,
+                                 const char* srcColor,
+                                 const char* srcCoverage,
+                                 const char* dstColor,
+                                 const char* outColor,
+                                 const char* outColorSecondary,
+                                 const GrXferProcessor& proc) override {
+        fKUni = pb->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                               kVec4f_GrSLType, kDefault_GrSLPrecision,
+                               "k");
+        const char* kUni = pb->getUniformCStr(fKUni);
+
+        add_arithmetic_code(fragBuilder, srcColor, dstColor, outColor, kUni, fEnforcePMColor);
+
+        // Apply coverage.
+        if (proc.dstReadUsesMixedSamples()) {
+            if (srcCoverage) {
+                fragBuilder->codeAppendf("%s *= %s;", outColor, srcCoverage);
+                fragBuilder->codeAppendf("%s = %s;", outColorSecondary, srcCoverage);
+            } else {
+                fragBuilder->codeAppendf("%s = vec4(1.0);", outColorSecondary);
+            }
+        } else if (srcCoverage) {
+            fragBuilder->codeAppendf("%s = %s * %s + (vec4(1.0) - %s) * %s;",
+                                     outColor, srcCoverage, outColor, srcCoverage, dstColor);
+        }
+    }
+
+    void onSetData(const GrGLSLProgramDataManager& pdman,
+                   const GrXferProcessor& processor) override {
+        const ArithmeticXP& arith = processor.cast<ArithmeticXP>();
+        pdman.set4f(fKUni, arith.k1(), arith.k2(), arith.k3(), arith.k4());
+        fEnforcePMColor = arith.enforcePMColor();
+    };
+
+    GrGLSLProgramDataManager::UniformHandle fKUni;
+    bool fEnforcePMColor;
+
+    typedef GrGLSLXferProcessor INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+ArithmeticXP::ArithmeticXP(const DstTexture* dstTexture, bool hasMixedSamples,
+                           float k1, float k2, float k3, float k4, bool enforcePMColor)
+    : INHERITED(dstTexture, true, hasMixedSamples)
+    , fK1(k1)
+    , fK2(k2)
+    , fK3(k3)
+    , fK4(k4)
+    , fEnforcePMColor(enforcePMColor) {
+    this->initClassID<ArithmeticXP>();
+}
+
+void ArithmeticXP::onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const {
+    GLArithmeticXP::GenKey(*this, caps, b);
+}
+
+GrGLSLXferProcessor* ArithmeticXP::createGLSLInstance() const { return new GLArithmeticXP(*this); }
+
+GrXferProcessor::OptFlags ArithmeticXP::onGetOptimizations(
+                                                       const GrPipelineOptimizations& optimizations,
+                                                       bool doesStencilWrite,
+                                                       GrColor* overrideColor,
+                                                       const GrCaps& caps) const {
+   return GrXferProcessor::kNone_OptFlags;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+GrArithmeticXPFactory::GrArithmeticXPFactory(float k1, float k2, float k3, float k4,
+                                             bool enforcePMColor)
+    : fK1(k1), fK2(k2), fK3(k3), fK4(k4), fEnforcePMColor(enforcePMColor) {
+    this->initClassID<GrArithmeticXPFactory>();
+}
+
+GrXferProcessor*
+GrArithmeticXPFactory::onCreateXferProcessor(const GrCaps& caps,
+                                             const GrPipelineOptimizations& optimizations,
+                                             bool hasMixedSamples,
+                                             const DstTexture* dstTexture) const {
+    return new ArithmeticXP(dstTexture, hasMixedSamples, fK1, fK2, fK3, fK4, fEnforcePMColor);
+}
+
+
+void GrArithmeticXPFactory::getInvariantBlendedColor(const GrProcOptInfo& colorPOI,
+                                                     InvariantBlendedColor* blendedColor) const {
+    blendedColor->fWillBlendWithDst = true;
+
+    // TODO: We could try to optimize this more. For example if fK1 and fK3 are zero, then we won't
+    // be blending the color with dst at all so we can know what the output color is (up to the
+    // valid color components passed in).
+    blendedColor->fKnownColorFlags = kNone_GrColorComponentFlags;
+}
+
+GR_DEFINE_XP_FACTORY_TEST(GrArithmeticXPFactory);
+
+const GrXPFactory* GrArithmeticXPFactory::TestCreate(GrProcessorTestData* d) {
+    float k1 = d->fRandom->nextF();
+    float k2 = d->fRandom->nextF();
+    float k3 = d->fRandom->nextF();
+    float k4 = d->fRandom->nextF();
+    bool enforcePMColor = d->fRandom->nextBool();
+
+    return GrArithmeticXPFactory::Create(k1, k2, k3, k4, enforcePMColor);
+}
+
+#endif
diff --git a/gfx/skia/skia/src/effects/SkArithmeticMode_gpu.h b/gfx/skia/skia/src/effects/SkArithmeticMode_gpu.h
new file mode 100644
index 000000000000..d6b1f881dff4
--- /dev/null
+++ b/gfx/skia/skia/src/effects/SkArithmeticMode_gpu.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkArithmeticMode_gpu_DEFINED
+#define SkArithmeticMode_gpu_DEFINED
+
+#include "SkTypes.h"
+
+#if SK_SUPPORT_GPU
+
+#include "GrCaps.h"
+#include "GrCoordTransform.h"
+#include "GrFragmentProcessor.h"
+#include "GrTextureAccess.h"
+#include "GrTypes.h"
+#include "GrXferProcessor.h"
+
+class GrInvariantOutput;
+class GrProcOptInfo;
+class GrTexture;
+
+///////////////////////////////////////////////////////////////////////////////
+// Fragment Processor
+///////////////////////////////////////////////////////////////////////////////
+
+class GrGLArtithmeticFP;
+
+class GrArithmeticFP : public GrFragmentProcessor {
+public:
+    static const GrFragmentProcessor* Create(float k1, float k2, float k3, float k4,
+                                             bool enforcePMColor, const GrFragmentProcessor* dst) {
+        return new GrArithmeticFP(k1, k2, k3, k4, enforcePMColor, dst);
+    }
+
+    ~GrArithmeticFP() override {};
+
+    const char* name() const override { return "Arithmetic"; }
+
+    SkString dumpInfo() const override {
+        SkString str;
+        str.appendf("K1: %.2f K2: %.2f K3: %.2f K4: %.2f", fK1, fK2, fK3, fK4);
+        return str;
+    }
+
+    float k1() const { return fK1; }
+    float k2() const { return fK2; }
+    float k3() const { return fK3; }
+    float k4() const { return fK4; }
+    bool enforcePMColor() const { return fEnforcePMColor; }
+
+private:
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
+
+    bool onIsEqual(const GrFragmentProcessor&) const override;
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
+
+    GrArithmeticFP(float k1, float k2, float k3, float k4, bool enforcePMColor,
+                   const GrFragmentProcessor* dst);
+
+    float                       fK1, fK2, fK3, fK4;
+    bool                        fEnforcePMColor;
+
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+    typedef GrFragmentProcessor INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// Xfer Processor
+///////////////////////////////////////////////////////////////////////////////
+
+class GrArithmeticXPFactory : public GrXPFactory {
+public:
+    static GrXPFactory* Create(float k1, float k2, float k3, float k4, bool enforcePMColor) {
+        return new GrArithmeticXPFactory(k1, k2, k3, k4, enforcePMColor);
+    }
+
+    void getInvariantBlendedColor(const GrProcOptInfo& colorPOI,
+                                  GrXPFactory::InvariantBlendedColor*) const override;
+
+private:
+    GrArithmeticXPFactory(float k1, float k2, float k3, float k4, bool enforcePMColor); 
+
+    GrXferProcessor* onCreateXferProcessor(const GrCaps& caps,
+                                           const GrPipelineOptimizations& optimizations,
+                                           bool hasMixedSamples,
+                                           const DstTexture*) const override; 
+
+    bool willReadDstColor(const GrCaps& caps,
+                          const GrPipelineOptimizations& optimizations,
+                          bool hasMixedSamples) const override {
+        return true;
+    }
+
+    bool onIsEqual(const GrXPFactory& xpfBase) const override {
+        const GrArithmeticXPFactory& xpf = xpfBase.cast<GrArithmeticXPFactory>();
+        if (fK1 != xpf.fK1 ||
+            fK2 != xpf.fK2 ||
+            fK3 != xpf.fK3 ||
+            fK4 != xpf.fK4 ||
+            fEnforcePMColor != xpf.fEnforcePMColor) {
+            return false;
+        }
+        return true;
+    }
+
+    GR_DECLARE_XP_FACTORY_TEST;
+
+    float                       fK1, fK2, fK3, fK4;
+    bool                        fEnforcePMColor;
+
+    typedef GrXPFactory INHERITED;
+};
+
+#endif
+#endif
diff --git a/gfx/skia/skia/src/effects/SkAvoidXfermode.cpp b/gfx/skia/skia/src/effects/SkAvoidXfermode.cpp
deleted file mode 100644
index ffe6a219ab8f..000000000000
--- a/gfx/skia/skia/src/effects/SkAvoidXfermode.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkAvoidXfermode.h"
-#include "SkColorPriv.h"
-#include "SkReadBuffer.h"
-#include "SkWriteBuffer.h"
-#include "SkString.h"
-
-SkAvoidXfermode::SkAvoidXfermode(SkColor opColor, U8CPU tolerance, Mode mode) {
-    if (tolerance > 255) {
-        tolerance = 255;
-    }
-
-    fOpColor = opColor;
-    fDistMul = (256 << 14) / (tolerance + 1);
-    fMode = mode;
-}
-
-SkAvoidXfermode::SkAvoidXfermode(SkReadBuffer& buffer)
-    : INHERITED(buffer) {
-    fOpColor = buffer.readColor();
-    fDistMul = buffer.readUInt();
-    fMode = (Mode)buffer.readUInt();
-}
-
-void SkAvoidXfermode::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
-
-    buffer.writeColor(fOpColor);
-    buffer.writeUInt(fDistMul);
-    buffer.writeUInt(fMode);
-}
-
-// returns 0..31
-static unsigned color_dist16(uint16_t c, unsigned r, unsigned g, unsigned b) {
-    SkASSERT(r <= SK_R16_MASK);
-    SkASSERT(g <= SK_G16_MASK);
-    SkASSERT(b <= SK_B16_MASK);
-
-    unsigned dr = SkAbs32(SkGetPackedR16(c) - r);
-    unsigned dg = SkAbs32(SkGetPackedG16(c) - g) >> (SK_G16_BITS - SK_R16_BITS);
-    unsigned db = SkAbs32(SkGetPackedB16(c) - b);
-
-    return SkMax32(dr, SkMax32(dg, db));
-}
-
-// returns 0..255
-static unsigned color_dist32(SkPMColor c, U8CPU r, U8CPU g, U8CPU b) {
-    SkASSERT(r <= 0xFF);
-    SkASSERT(g <= 0xFF);
-    SkASSERT(b <= 0xFF);
-
-    unsigned dr = SkAbs32(SkGetPackedR32(c) - r);
-    unsigned dg = SkAbs32(SkGetPackedG32(c) - g);
-    unsigned db = SkAbs32(SkGetPackedB32(c) - b);
-
-    return SkMax32(dr, SkMax32(dg, db));
-}
-
-static int scale_dist_14(int dist, uint32_t mul, uint32_t sub) {
-    int tmp = dist * mul - sub;
-    int result = (tmp + (1 << 13)) >> 14;
-
-    return result;
-}
-
-static inline unsigned Accurate255To256(unsigned x) {
-    return x + (x >> 7);
-}
-
-void SkAvoidXfermode::xfer32(SkPMColor dst[], const SkPMColor src[], int count,
-                             const SkAlpha aa[]) const {
-    unsigned    opR = SkColorGetR(fOpColor);
-    unsigned    opG = SkColorGetG(fOpColor);
-    unsigned    opB = SkColorGetB(fOpColor);
-    uint32_t    mul = fDistMul;
-    uint32_t    sub = (fDistMul - (1 << 14)) << 8;
-
-    int MAX, mask;
-
-    if (kTargetColor_Mode == fMode) {
-        mask = -1;
-        MAX = 255;
-    } else {
-        mask = 0;
-        MAX = 0;
-    }
-
-    for (int i = 0; i < count; i++) {
-        int d = color_dist32(dst[i], opR, opG, opB);
-        // now reverse d if we need to
-        d = MAX + (d ^ mask) - mask;
-        SkASSERT((unsigned)d <= 255);
-        d = Accurate255To256(d);
-
-        d = scale_dist_14(d, mul, sub);
-        SkASSERT(d <= 256);
-
-        if (d > 0) {
-            if (NULL != aa) {
-                d = SkAlphaMul(d, Accurate255To256(*aa++));
-                if (0 == d) {
-                    continue;
-                }
-            }
-            dst[i] = SkFourByteInterp256(src[i], dst[i], d);
-        }
-    }
-}
-
-static inline U16CPU SkBlend3216(SkPMColor src, U16CPU dst, unsigned scale) {
-    SkASSERT(scale <= 32);
-    scale <<= 3;
-
-    return SkPackRGB16( SkAlphaBlend(SkPacked32ToR16(src), SkGetPackedR16(dst), scale),
-                        SkAlphaBlend(SkPacked32ToG16(src), SkGetPackedG16(dst), scale),
-                        SkAlphaBlend(SkPacked32ToB16(src), SkGetPackedB16(dst), scale));
-}
-
-void SkAvoidXfermode::xfer16(uint16_t dst[], const SkPMColor src[], int count,
-                             const SkAlpha aa[]) const {
-    unsigned    opR = SkColorGetR(fOpColor) >> (8 - SK_R16_BITS);
-    unsigned    opG = SkColorGetG(fOpColor) >> (8 - SK_G16_BITS);
-    unsigned    opB = SkColorGetB(fOpColor) >> (8 - SK_R16_BITS);
-    uint32_t    mul = fDistMul;
-    uint32_t    sub = (fDistMul - (1 << 14)) << SK_R16_BITS;
-
-    int MAX, mask;
-
-    if (kTargetColor_Mode == fMode) {
-        mask = -1;
-        MAX = 31;
-    } else {
-        mask = 0;
-        MAX = 0;
-    }
-
-    for (int i = 0; i < count; i++) {
-        int d = color_dist16(dst[i], opR, opG, opB);
-        // now reverse d if we need to
-        d = MAX + (d ^ mask) - mask;
-        SkASSERT((unsigned)d <= 31);
-        // convert from 0..31 to 0..32
-        d += d >> 4;
-        d = scale_dist_14(d, mul, sub);
-        SkASSERT(d <= 32);
-
-        if (d > 0) {
-            if (NULL != aa) {
-                d = SkAlphaMul(d, Accurate255To256(*aa++));
-                if (0 == d) {
-                    continue;
-                }
-            }
-            dst[i] = SkBlend3216(src[i], dst[i], d);
-        }
-    }
-}
-
-void SkAvoidXfermode::xferA8(SkAlpha dst[], const SkPMColor src[], int count,
-                             const SkAlpha aa[]) const {
-    // override in subclass
-}
-
-#ifndef SK_IGNORE_TO_STRING
-void SkAvoidXfermode::toString(SkString* str) const {
-    str->append("SkAvoidXfermode: opColor: ");
-    str->appendHex(fOpColor);
-    str->appendf("distMul: %d ", fDistMul);
-
-    static const char* gModeStrings[] = { "Avoid", "Target" };
-
-    str->appendf("mode: %s", gModeStrings[fMode]);
-}
-#endif
diff --git a/gfx/skia/skia/src/effects/SkBitmapSource.cpp b/gfx/skia/skia/src/effects/SkBitmapSource.cpp
deleted file mode 100644
index d8d4329e655a..000000000000
--- a/gfx/skia/skia/src/effects/SkBitmapSource.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2012 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkBitmapSource.h"
-#include "SkDevice.h"
-#include "SkCanvas.h"
-#include "SkReadBuffer.h"
-#include "SkWriteBuffer.h"
-#include "SkValidationUtils.h"
-
-SkBitmapSource::SkBitmapSource(const SkBitmap& bitmap)
-  : INHERITED(0, 0),
-    fBitmap(bitmap),
-    fSrcRect(SkRect::MakeWH(SkIntToScalar(bitmap.width()),
-                            SkIntToScalar(bitmap.height()))),
-    fDstRect(fSrcRect) {
-}
-
-SkBitmapSource::SkBitmapSource(const SkBitmap& bitmap, const SkRect& srcRect, const SkRect& dstRect)
-  : INHERITED(0, 0)
-  , fBitmap(bitmap)
-  , fSrcRect(srcRect)
-  , fDstRect(dstRect) {}
-
-SkBitmapSource::SkBitmapSource(SkReadBuffer& buffer) : INHERITED(0, buffer) {
-    if (buffer.isVersionLT(SkReadBuffer::kNoMoreBitmapFlatten_Version)) {
-        fBitmap.legacyUnflatten(buffer);
-    } else {
-        buffer.readBitmap(&fBitmap);
-    }
-    buffer.readRect(&fSrcRect);
-    buffer.readRect(&fDstRect);
-    buffer.validate(buffer.isValid() && SkIsValidRect(fSrcRect) && SkIsValidRect(fDstRect));
-}
-
-void SkBitmapSource::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
-    buffer.writeBitmap(fBitmap);
-    buffer.writeRect(fSrcRect);
-    buffer.writeRect(fDstRect);
-}
-
-bool SkBitmapSource::onFilterImage(Proxy* proxy, const SkBitmap&, const Context& ctx,
-                                   SkBitmap* result, SkIPoint* offset) const {
-    SkRect bounds, dstRect;
-    fBitmap.getBounds(&bounds);
-    ctx.ctm().mapRect(&dstRect, fDstRect);
-    if (fSrcRect == bounds && dstRect == bounds) {
-        // No regions cropped out or resized; return entire bitmap.
-        *result = fBitmap;
-        offset->fX = offset->fY = 0;
-        return true;
-    }
-    SkIRect dstIRect;
-    dstRect.roundOut(&dstIRect);
-
-    SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(dstIRect.width(), dstIRect.height()));
-    if (NULL == device.get()) {
-        return false;
-    }
-
-    SkCanvas canvas(device.get());
-    SkPaint paint;
-
-    // Subtract off the integer component of the translation (will be applied in loc, below).
-    dstRect.offset(-SkIntToScalar(dstIRect.fLeft), -SkIntToScalar(dstIRect.fTop));
-    paint.setXfermodeMode(SkXfermode::kSrc_Mode);
-    // FIXME: this probably shouldn't be necessary, but drawBitmapRectToRect asserts
-    // None filtering when it's translate-only
-    paint.setFilterLevel(
-        fSrcRect.width() == dstRect.width() && fSrcRect.height() == dstRect.height() ?
-        SkPaint::kNone_FilterLevel : SkPaint::kHigh_FilterLevel);
-    canvas.drawBitmapRectToRect(fBitmap, &fSrcRect, dstRect, &paint);
-
-    *result = device.get()->accessBitmap(false);
-    offset->fX = dstIRect.fLeft;
-    offset->fY = dstIRect.fTop;
-    return true;
-}
-
-void SkBitmapSource::computeFastBounds(const SkRect&, SkRect* dst) const {
-    *dst = fDstRect;
-}
-
-bool SkBitmapSource::onFilterBounds(const SkIRect& src, const SkMatrix& ctm,
-                                    SkIRect* dst) const {
-    *dst = src;
-    return true;
-}
diff --git a/gfx/skia/skia/src/effects/SkBlurDrawLooper.cpp b/gfx/skia/skia/src/effects/SkBlurDrawLooper.cpp
index c3b843f18852..9f10ff5250f1 100644
--- a/gfx/skia/skia/src/effects/SkBlurDrawLooper.cpp
+++ b/gfx/skia/skia/src/effects/SkBlurDrawLooper.cpp
@@ -36,7 +36,7 @@ void SkBlurDrawLooper::initEffects() {
 
         fBlur = SkBlurMaskFilter::Create(kNormal_SkBlurStyle, fSigma, flags);
     } else {
-        fBlur = NULL;
+        fBlur = nullptr;
     }
 
     if (fBlurFlags & kOverrideColor_BlurFlag) {
@@ -47,7 +47,7 @@ void SkBlurDrawLooper::initEffects() {
         fColorFilter = SkColorFilter::CreateModeFilter(opaqueColor,
                                                        SkXfermode::kSrcIn_Mode);
     } else {
-        fColorFilter = NULL;
+        fColorFilter = nullptr;
     }
 }
 
@@ -62,23 +62,20 @@ void SkBlurDrawLooper::init(SkScalar sigma, SkScalar dx, SkScalar dy,
     this->initEffects();
 }
 
-SkBlurDrawLooper::SkBlurDrawLooper(SkReadBuffer& buffer) : INHERITED(buffer) {
-
-    fSigma = buffer.readScalar();
-    fDx = buffer.readScalar();
-    fDy = buffer.readScalar();
-    fBlurColor = buffer.readColor();
-    fBlurFlags = buffer.readUInt() & kAll_BlurFlag;
-
-    this->initEffects();
+SkFlattenable* SkBlurDrawLooper::CreateProc(SkReadBuffer& buffer) {
+    const SkColor color = buffer.readColor();
+    const SkScalar sigma = buffer.readScalar();
+    const SkScalar dx = buffer.readScalar();
+    const SkScalar dy = buffer.readScalar();
+    const uint32_t flags = buffer.read32();
+    return Create(color, sigma, dx, dy, flags);
 }
 
 void SkBlurDrawLooper::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
+    buffer.writeColor(fBlurColor);
     buffer.writeScalar(fSigma);
     buffer.writeScalar(fDx);
     buffer.writeScalar(fDy);
-    buffer.writeColor(fBlurColor);
     buffer.write32(fBlurFlags);
 }
 
@@ -106,7 +103,7 @@ bool SkBlurDrawLooper::asABlurShadow(BlurShadowRec* rec) const {
 ////////////////////////////////////////////////////////////////////////////////////////
 
 SkDrawLooper::Context* SkBlurDrawLooper::createContext(SkCanvas*, void* storage) const {
-    return SkNEW_PLACEMENT_ARGS(storage, BlurDrawLooperContext, (this));
+    return new (storage) BlurDrawLooperContext(this);
 }
 
 SkBlurDrawLooper::BlurDrawLooperContext::BlurDrawLooperContext(
diff --git a/gfx/skia/skia/src/effects/SkBlurImageFilter.cpp b/gfx/skia/skia/src/effects/SkBlurImageFilter.cpp
index 5c3ff493c27e..928793de62fc 100644
--- a/gfx/skia/skia/src/effects/SkBlurImageFilter.cpp
+++ b/gfx/skia/skia/src/effects/SkBlurImageFilter.cpp
@@ -8,10 +8,11 @@
 #include "SkBitmap.h"
 #include "SkBlurImageFilter.h"
 #include "SkColorPriv.h"
+#include "SkDevice.h"
+#include "SkGpuBlurUtils.h"
+#include "SkOpts.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
-#include "SkGpuBlurUtils.h"
-#include "SkBlurImage_opts.h"
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #endif
@@ -23,14 +24,12 @@
 // raster paths.
 #define MAX_SIGMA SkIntToScalar(532)
 
-SkBlurImageFilter::SkBlurImageFilter(SkReadBuffer& buffer)
-  : INHERITED(1, buffer) {
-    fSigma.fWidth = buffer.readScalar();
-    fSigma.fHeight = buffer.readScalar();
-    buffer.validate(SkScalarIsFinite(fSigma.fWidth) &&
-                    SkScalarIsFinite(fSigma.fHeight) &&
-                    (fSigma.fWidth >= 0) &&
-                    (fSigma.fHeight >= 0));
+static SkVector mapSigma(const SkSize& localSigma, const SkMatrix& ctm) {
+    SkVector sigma = SkVector::Make(localSigma.width(), localSigma.height());
+    ctm.mapVectors(&sigma, 1);
+    sigma.fX = SkMinScalar(SkScalarAbs(sigma.fX), MAX_SIGMA);
+    sigma.fY = SkMinScalar(SkScalarAbs(sigma.fY), MAX_SIGMA);
+    return sigma;
 }
 
 SkBlurImageFilter::SkBlurImageFilter(SkScalar sigmaX,
@@ -38,7 +37,13 @@ SkBlurImageFilter::SkBlurImageFilter(SkScalar sigmaX,
                                      SkImageFilter* input,
                                      const CropRect* cropRect)
     : INHERITED(1, &input, cropRect), fSigma(SkSize::Make(sigmaX, sigmaY)) {
-    SkASSERT(sigmaX >= 0 && sigmaY >= 0);
+}
+
+SkFlattenable* SkBlurImageFilter::CreateProc(SkReadBuffer& buffer) {
+    SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
+    SkScalar sigmaX = buffer.readScalar();
+    SkScalar sigmaY = buffer.readScalar();
+    return Create(sigmaX, sigmaY, common.getInput(0), &common.cropRect());
 }
 
 void SkBlurImageFilter::flatten(SkWriteBuffer& buffer) const {
@@ -47,83 +52,6 @@ void SkBlurImageFilter::flatten(SkWriteBuffer& buffer) const {
     buffer.writeScalar(fSigma.fHeight);
 }
 
-enum BlurDirection {
-    kX, kY
-};
-
-/**
- *
- * In order to make memory accesses cache-friendly, we reorder the passes to
- * use contiguous memory reads wherever possible.
- *
- * For example, the 6 passes of the X-and-Y blur case are rewritten as
- * follows. Instead of 3 passes in X and 3 passes in Y, we perform
- * 2 passes in X, 1 pass in X transposed to Y on write, 2 passes in X,
- * then 1 pass in X transposed to Y on write.
- *
- * +----+       +----+       +----+        +---+       +---+       +---+        +----+
- * + AB + ----> | AB | ----> | AB | -----> | A | ----> | A | ----> | A | -----> | AB |
- * +----+ blurX +----+ blurX +----+ blurXY | B | blurX | B | blurX | B | blurXY +----+
- *                                         +---+       +---+       +---+
- *
- * In this way, two of the y-blurs become x-blurs applied to transposed
- * images, and all memory reads are contiguous.
- */
-
-template<BlurDirection srcDirection, BlurDirection dstDirection>
-static void boxBlur(const SkPMColor* src, int srcStride, SkPMColor* dst, int kernelSize,
-                    int leftOffset, int rightOffset, int width, int height)
-{
-    int rightBorder = SkMin32(rightOffset + 1, width);
-    int srcStrideX = srcDirection == kX ? 1 : srcStride;
-    int dstStrideX = dstDirection == kX ? 1 : height;
-    int srcStrideY = srcDirection == kX ? srcStride : 1;
-    int dstStrideY = dstDirection == kX ? width : 1;
-    uint32_t scale = (1 << 24) / kernelSize;
-    uint32_t half = 1 << 23;
-    for (int y = 0; y < height; ++y) {
-        int sumA = 0, sumR = 0, sumG = 0, sumB = 0;
-        const SkPMColor* p = src;
-        for (int i = 0; i < rightBorder; ++i) {
-            sumA += SkGetPackedA32(*p);
-            sumR += SkGetPackedR32(*p);
-            sumG += SkGetPackedG32(*p);
-            sumB += SkGetPackedB32(*p);
-            p += srcStrideX;
-        }
-
-        const SkPMColor* sptr = src;
-        SkColor* dptr = dst;
-        for (int x = 0; x < width; ++x) {
-            *dptr = SkPackARGB32((sumA * scale + half) >> 24,
-                                 (sumR * scale + half) >> 24,
-                                 (sumG * scale + half) >> 24,
-                                 (sumB * scale + half) >> 24);
-            if (x >= leftOffset) {
-                SkColor l = *(sptr - leftOffset * srcStrideX);
-                sumA -= SkGetPackedA32(l);
-                sumR -= SkGetPackedR32(l);
-                sumG -= SkGetPackedG32(l);
-                sumB -= SkGetPackedB32(l);
-            }
-            if (x + rightOffset + 1 < width) {
-                SkColor r = *(sptr + (rightOffset + 1) * srcStrideX);
-                sumA += SkGetPackedA32(r);
-                sumR += SkGetPackedR32(r);
-                sumG += SkGetPackedG32(r);
-                sumB += SkGetPackedB32(r);
-            }
-            sptr += srcStrideX;
-            if (srcDirection == kY) {
-                SK_PREFETCH(sptr + (rightOffset + 1) * srcStrideX);
-            }
-            dptr += dstStrideX;
-        }
-        src += srcStrideY;
-        dst += dstStrideY;
-    }
-}
-
 static void getBox3Params(SkScalar s, int *kernelSize, int* kernelSize3, int *lowOffset,
                           int *highOffset)
 {
@@ -145,7 +73,7 @@ bool SkBlurImageFilter::onFilterImage(Proxy* proxy,
                                       SkBitmap* dst, SkIPoint* offset) const {
     SkBitmap src = source;
     SkIPoint srcOffset = SkIPoint::Make(0, 0);
-    if (getInput(0) && !getInput(0)->filterImage(proxy, source, ctx, &src, &srcOffset)) {
+    if (!this->filterInput(0, proxy, source, ctx, &src, &srcOffset)) {
         return false;
     }
 
@@ -154,7 +82,7 @@ bool SkBlurImageFilter::onFilterImage(Proxy* proxy,
     }
 
     SkIRect srcBounds, dstBounds;
-    if (!this->applyCropRect(ctx, proxy, src, &srcOffset, &srcBounds, &src)) {
+    if (!this->applyCropRect(ctx, src, srcOffset, &dstBounds, &srcBounds)) {
         return false;
     }
 
@@ -163,15 +91,14 @@ bool SkBlurImageFilter::onFilterImage(Proxy* proxy,
         return false;
     }
 
-    if (!dst->allocPixels(src.info().makeWH(srcBounds.width(), srcBounds.height()))) {
+    SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(dstBounds.width(), dstBounds.height()));
+    if (!device) {
         return false;
     }
-    dst->getBounds(&dstBounds);
+    *dst = device->accessBitmap(false);
+    SkAutoLockPixels alp_dst(*dst);
 
-    SkVector sigma = SkVector::Make(fSigma.width(), fSigma.height());
-    ctx.ctm().mapVectors(&sigma, 1);
-    sigma.fX = SkMinScalar(sigma.fX, MAX_SIGMA);
-    sigma.fY = SkMinScalar(sigma.fY, MAX_SIGMA);
+    SkVector sigma = mapSigma(fSigma, ctx.ctm());
 
     int kernelSizeX, kernelSizeX3, lowOffsetX, highOffsetX;
     int kernelSizeY, kernelSizeY3, lowOffsetY, highOffsetY;
@@ -184,55 +111,71 @@ bool SkBlurImageFilter::onFilterImage(Proxy* proxy,
 
     if (kernelSizeX == 0 && kernelSizeY == 0) {
         src.copyTo(dst, dst->colorType());
-        offset->fX = srcBounds.fLeft;
-        offset->fY = srcBounds.fTop;
+        offset->fX = dstBounds.x() + srcOffset.x();
+        offset->fY = dstBounds.y() + srcOffset.y();
         return true;
     }
 
-    SkBitmap temp;
-    if (!temp.allocPixels(dst->info())) {
+    SkAutoTUnref<SkBaseDevice> tempDevice(proxy->createDevice(dst->width(), dst->height()));
+    if (!tempDevice) {
         return false;
     }
+    SkBitmap temp = tempDevice->accessBitmap(false);
+    SkAutoLockPixels alpTemp(temp);
 
-    offset->fX = srcBounds.fLeft;
-    offset->fY = srcBounds.fTop;
-    srcBounds.offset(-srcOffset);
-    const SkPMColor* s = src.getAddr32(srcBounds.left(), srcBounds.top());
+    offset->fX = dstBounds.fLeft;
+    offset->fY = dstBounds.fTop;
     SkPMColor* t = temp.getAddr32(0, 0);
     SkPMColor* d = dst->getAddr32(0, 0);
     int w = dstBounds.width(), h = dstBounds.height();
+    const SkPMColor* s = src.getAddr32(srcBounds.x() - srcOffset.x(), srcBounds.y() - srcOffset.y());
+    srcBounds.offset(-dstBounds.x(), -dstBounds.y());
+    dstBounds.offset(-dstBounds.x(), -dstBounds.y());
+    SkIRect srcBoundsT = SkIRect::MakeLTRB(srcBounds.top(), srcBounds.left(), srcBounds.bottom(), srcBounds.right());
+    SkIRect dstBoundsT = SkIRect::MakeWH(dstBounds.height(), dstBounds.width());
     int sw = src.rowBytesAsPixels();
-    SkBoxBlurProc boxBlurX, boxBlurY, boxBlurXY, boxBlurYX;
-    if (!SkBoxBlurGetPlatformProcs(&boxBlurX, &boxBlurY, &boxBlurXY, &boxBlurYX)) {
-        boxBlurX = boxBlur<kX, kX>;
-        boxBlurY = boxBlur<kY, kY>;
-        boxBlurXY = boxBlur<kX, kY>;
-        boxBlurYX = boxBlur<kY, kX>;
-    }
 
+    /**
+     *
+     * In order to make memory accesses cache-friendly, we reorder the passes to
+     * use contiguous memory reads wherever possible.
+     *
+     * For example, the 6 passes of the X-and-Y blur case are rewritten as
+     * follows. Instead of 3 passes in X and 3 passes in Y, we perform
+     * 2 passes in X, 1 pass in X transposed to Y on write, 2 passes in X,
+     * then 1 pass in X transposed to Y on write.
+     *
+     * +----+       +----+       +----+        +---+       +---+       +---+        +----+
+     * + AB + ----> | AB | ----> | AB | -----> | A | ----> | A | ----> | A | -----> | AB |
+     * +----+ blurX +----+ blurX +----+ blurXY | B | blurX | B | blurX | B | blurXY +----+
+     *                                         +---+       +---+       +---+
+     *
+     * In this way, two of the y-blurs become x-blurs applied to transposed
+     * images, and all memory reads are contiguous.
+     */
     if (kernelSizeX > 0 && kernelSizeY > 0) {
-        boxBlurX(s,  sw, t, kernelSizeX,  lowOffsetX,  highOffsetX, w, h);
-        boxBlurX(t,  w,  d, kernelSizeX,  highOffsetX, lowOffsetX,  w, h);
-        boxBlurXY(d, w,  t, kernelSizeX3, highOffsetX, highOffsetX, w, h);
-        boxBlurX(t,  h,  d, kernelSizeY,  lowOffsetY,  highOffsetY, h, w);
-        boxBlurX(d,  h,  t, kernelSizeY,  highOffsetY, lowOffsetY,  h, w);
-        boxBlurXY(t, h,  d, kernelSizeY3, highOffsetY, highOffsetY, h, w);
+        SkOpts::box_blur_xx(s, sw,  srcBounds,  t, kernelSizeX,  lowOffsetX,  highOffsetX, w, h);
+        SkOpts::box_blur_xx(t,  w,  dstBounds,  d, kernelSizeX,  highOffsetX, lowOffsetX,  w, h);
+        SkOpts::box_blur_xy(d,  w,  dstBounds,  t, kernelSizeX3, highOffsetX, highOffsetX, w, h);
+        SkOpts::box_blur_xx(t,  h,  dstBoundsT, d, kernelSizeY,  lowOffsetY,  highOffsetY, h, w);
+        SkOpts::box_blur_xx(d,  h,  dstBoundsT, t, kernelSizeY,  highOffsetY, lowOffsetY,  h, w);
+        SkOpts::box_blur_xy(t,  h,  dstBoundsT, d, kernelSizeY3, highOffsetY, highOffsetY, h, w);
     } else if (kernelSizeX > 0) {
-        boxBlurX(s,  sw, d, kernelSizeX,  lowOffsetX,  highOffsetX, w, h);
-        boxBlurX(d,  w,  t, kernelSizeX,  highOffsetX, lowOffsetX,  w, h);
-        boxBlurX(t,  w,  d, kernelSizeX3, highOffsetX, highOffsetX, w, h);
+        SkOpts::box_blur_xx(s, sw,  srcBounds,  d, kernelSizeX,  lowOffsetX,  highOffsetX, w, h);
+        SkOpts::box_blur_xx(d,  w,  dstBounds,  t, kernelSizeX,  highOffsetX, lowOffsetX,  w, h);
+        SkOpts::box_blur_xx(t,  w,  dstBounds,  d, kernelSizeX3, highOffsetX, highOffsetX, w, h);
     } else if (kernelSizeY > 0) {
-        boxBlurYX(s, sw, d, kernelSizeY,  lowOffsetY,  highOffsetY, h, w);
-        boxBlurX(d,  h,  t, kernelSizeY,  highOffsetY, lowOffsetY,  h, w);
-        boxBlurXY(t, h,  d, kernelSizeY3, highOffsetY, highOffsetY, h, w);
+        SkOpts::box_blur_yx(s, sw,  srcBoundsT, d, kernelSizeY,  lowOffsetY,  highOffsetY, h, w);
+        SkOpts::box_blur_xx(d,  h,  dstBoundsT, t, kernelSizeY,  highOffsetY, lowOffsetY,  h, w);
+        SkOpts::box_blur_xy(t,  h,  dstBoundsT, d, kernelSizeY3, highOffsetY, highOffsetY, h, w);
     }
     return true;
 }
 
 
 void SkBlurImageFilter::computeFastBounds(const SkRect& src, SkRect* dst) const {
-    if (getInput(0)) {
-        getInput(0)->computeFastBounds(src, dst);
+    if (this->getInput(0)) {
+        this->getInput(0)->computeFastBounds(src, dst);
     } else {
         *dst = src;
     }
@@ -244,13 +187,12 @@ void SkBlurImageFilter::computeFastBounds(const SkRect& src, SkRect* dst) const
 bool SkBlurImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm,
                                        SkIRect* dst) const {
     SkIRect bounds = src;
-    if (getInput(0) && !getInput(0)->filterBounds(src, ctm, &bounds)) {
-        return false;
-    }
-    SkVector sigma = SkVector::Make(fSigma.width(), fSigma.height());
-    ctm.mapVectors(&sigma, 1);
+    SkVector sigma = mapSigma(fSigma, ctm);
     bounds.outset(SkScalarCeilToInt(SkScalarMul(sigma.x(), SkIntToScalar(3))),
                   SkScalarCeilToInt(SkScalarMul(sigma.y(), SkIntToScalar(3))));
+    if (this->getInput(0) && !this->getInput(0)->filterBounds(bounds, ctm, &bounds)) {
+        return false;
+    }
     *dst = bounds;
     return true;
 }
@@ -260,32 +202,49 @@ bool SkBlurImageFilter::filterImageGPU(Proxy* proxy, const SkBitmap& src, const
 #if SK_SUPPORT_GPU
     SkBitmap input = src;
     SkIPoint srcOffset = SkIPoint::Make(0, 0);
-    if (getInput(0) && !getInput(0)->getInputResultGPU(proxy, src, ctx, &input, &srcOffset)) {
+    if (!this->filterInputGPU(0, proxy, src, ctx, &input, &srcOffset)) {
         return false;
     }
-    SkIRect rect;
-    if (!this->applyCropRect(ctx, proxy, input, &srcOffset, &rect, &input)) {
+    SkIRect srcBounds, dstBounds;
+    if (!this->applyCropRect(ctx, input, srcOffset, &dstBounds, &srcBounds)) {
         return false;
     }
     GrTexture* source = input.getTexture();
-    SkVector sigma = SkVector::Make(fSigma.width(), fSigma.height());
-    ctx.ctm().mapVectors(&sigma, 1);
-    sigma.fX = SkMinScalar(sigma.fX, MAX_SIGMA);
-    sigma.fY = SkMinScalar(sigma.fY, MAX_SIGMA);
-    offset->fX = rect.fLeft;
-    offset->fY = rect.fTop;
-    rect.offset(-srcOffset);
+    SkVector sigma = mapSigma(fSigma, ctx.ctm());
+    offset->fX = dstBounds.fLeft;
+    offset->fY = dstBounds.fTop;
+    srcBounds.offset(-srcOffset);
+    dstBounds.offset(-srcOffset);
+    SkRect srcBoundsF(SkRect::Make(srcBounds));
+    auto constraint = GrTextureProvider::FromImageFilter(ctx.sizeConstraint());
     SkAutoTUnref<GrTexture> tex(SkGpuBlurUtils::GaussianBlur(source->getContext(),
                                                              source,
                                                              false,
-                                                             SkRect::Make(rect),
-                                                             true,
+                                                             SkRect::Make(dstBounds),
+                                                             &srcBoundsF,
                                                              sigma.x(),
-                                                             sigma.y()));
-    WrapTexture(tex, rect.width(), rect.height(), result);
+                                                             sigma.y(),
+                                                             constraint));
+    if (!tex) {
+        return false;
+    }
+    WrapTexture(tex, dstBounds.width(), dstBounds.height(), result);
     return true;
 #else
     SkDEBUGFAIL("Should not call in GPU-less build");
     return false;
 #endif
 }
+
+#ifndef SK_IGNORE_TO_STRING
+void SkBlurImageFilter::toString(SkString* str) const {
+    str->appendf("SkBlurImageFilter: (");
+    str->appendf("sigma: (%f, %f) input (", fSigma.fWidth, fSigma.fHeight);
+
+    if (this->getInput(0)) {
+        this->getInput(0)->toString(str);
+    }
+
+    str->append("))");
+}
+#endif
diff --git a/gfx/skia/skia/src/effects/SkBlurMask.cpp b/gfx/skia/skia/src/effects/SkBlurMask.cpp
index bf50845ab6cb..acee70ff254a 100644
--- a/gfx/skia/skia/src/effects/SkBlurMask.cpp
+++ b/gfx/skia/skia/src/effects/SkBlurMask.cpp
@@ -530,7 +530,7 @@ bool SkBlurMask::BoxBlur(SkMask* dst, const SkMask& src,
 
     dst->fRowBytes = dst->fBounds.width();
     dst->fFormat = SkMask::kA8_Format;
-    dst->fImage = NULL;
+    dst->fImage = nullptr;
 
     if (src.fImage) {
         size_t dstSize = dst->computeImageSize();
@@ -678,11 +678,11 @@ static float gaussianIntegral(float x) {
     memory returned in profile_out.
 */
 
-void SkBlurMask::ComputeBlurProfile(SkScalar sigma, uint8_t **profile_out) {
+uint8_t* SkBlurMask::ComputeBlurProfile(SkScalar sigma) {
     int size = SkScalarCeilToInt(6*sigma);
 
     int center = size >> 1;
-    uint8_t *profile = SkNEW_ARRAY(uint8_t, size);
+    uint8_t* profile = new uint8_t[size];
 
     float invr = 1.f/(2*sigma);
 
@@ -693,7 +693,7 @@ void SkBlurMask::ComputeBlurProfile(SkScalar sigma, uint8_t **profile_out) {
         profile[x] = 255 - (uint8_t) (255.f * gi);
     }
 
-    *profile_out = profile;
+    return profile;
 }
 
 // TODO MAYBE: Maintain a profile cache to avoid recomputing this for
@@ -754,7 +754,7 @@ bool SkBlurMask::BlurRect(SkScalar sigma, SkMask *dst,
 
     dst->fRowBytes = dst->fBounds.width();
     dst->fFormat = SkMask::kA8_Format;
-    dst->fImage = NULL;
+    dst->fImage = nullptr;
 
     int             sw = SkScalarFloorToInt(src.width());
     int             sh = SkScalarFloorToInt(src.height());
@@ -769,10 +769,8 @@ bool SkBlurMask::BlurRect(SkScalar sigma, SkMask *dst,
         }
         return true;
     }
-    uint8_t *profile = NULL;
 
-    ComputeBlurProfile(sigma, &profile);
-    SkAutoTDeleteArray<uint8_t> ada(profile);
+    SkAutoTDeleteArray<uint8_t> profile(ComputeBlurProfile(sigma));
 
     size_t dstSize = dst->computeImageSize();
     if (0 == dstSize) {
@@ -791,8 +789,8 @@ bool SkBlurMask::BlurRect(SkScalar sigma, SkMask *dst,
     SkAutoTMalloc<uint8_t> horizontalScanline(dstWidth);
     SkAutoTMalloc<uint8_t> verticalScanline(dstHeight);
 
-    ComputeBlurredScanline(horizontalScanline, profile, dstWidth, sigma);
-    ComputeBlurredScanline(verticalScanline, profile, dstHeight, sigma);
+    ComputeBlurredScanline(horizontalScanline, profile.get(), dstWidth, sigma);
+    ComputeBlurredScanline(verticalScanline, profile.get(), dstHeight, sigma);
 
     for (int y = 0 ; y < dstHeight ; ++y) {
         for (int x = 0 ; x < dstWidth ; x++) {
@@ -890,7 +888,7 @@ bool SkBlurMask::BlurGroundTruth(SkScalar sigma, SkMask* dst, const SkMask& src,
 
     dst->fRowBytes = dst->fBounds.width();
     dst->fFormat = SkMask::kA8_Format;
-    dst->fImage = NULL;
+    dst->fImage = nullptr;
 
     if (src.fImage) {
 
diff --git a/gfx/skia/skia/src/effects/SkBlurMask.h b/gfx/skia/skia/src/effects/SkBlurMask.h
index 71f60d91faab..b6c37fb4619a 100644
--- a/gfx/skia/skia/src/effects/SkBlurMask.h
+++ b/gfx/skia/skia/src/effects/SkBlurMask.h
@@ -16,11 +16,11 @@
 class SkBlurMask {
 public:
     static bool BlurRect(SkScalar sigma, SkMask *dst, const SkRect &src, SkBlurStyle,
-                         SkIPoint *margin = NULL,
+                         SkIPoint *margin = nullptr,
                          SkMask::CreateMode createMode =
                                                 SkMask::kComputeBoundsAndRenderImage_CreateMode);
     static bool BlurRRect(SkScalar sigma, SkMask *dst, const SkRRect &src, SkBlurStyle,
-                         SkIPoint *margin = NULL,
+                         SkIPoint *margin = nullptr,
                          SkMask::CreateMode createMode =
                                                 SkMask::kComputeBoundsAndRenderImage_CreateMode);
 
@@ -32,12 +32,12 @@ public:
 
     static bool BoxBlur(SkMask* dst, const SkMask& src,
                         SkScalar sigma, SkBlurStyle style, SkBlurQuality quality,
-                        SkIPoint* margin = NULL, bool force_quality=false);
+                        SkIPoint* margin = nullptr, bool force_quality=false);
 
     // the "ground truth" blur does a gaussian convolution; it's slow
     // but useful for comparison purposes.
     static bool BlurGroundTruth(SkScalar sigma, SkMask* dst, const SkMask& src, SkBlurStyle,
-                                SkIPoint* margin = NULL);
+                                SkIPoint* margin = nullptr);
 
     // If radius > 0, return the corresponding sigma, else return 0
     static SkScalar ConvertRadiusToSigma(SkScalar radius);
@@ -54,15 +54,14 @@ public:
         @param blurred_width The width of the final, blurred rectangle
         @param sharp_width The width of the original, unblurred rectangle.
     */
-    static uint8_t ProfileLookup(const uint8_t* profile, int loc, int blurred_width, int sharp_width);
+    static uint8_t ProfileLookup(const uint8_t* profile, int loc, int blurredWidth, int sharpWidth);
 
     /** Allocate memory for and populate the profile of a 1D blurred halfplane.  The caller
         must free the memory.  The amount of memory allocated will be exactly 6*sigma bytes.
         @param sigma The standard deviation of the gaussian blur kernel
-        @param profile_out The location to store the allocated profile curve
     */
 
-    static void ComputeBlurProfile(SkScalar sigma, uint8_t** profile_out);
+    static uint8_t* ComputeBlurProfile(SkScalar sigma);
 
     /** Compute an entire scanline of a blurred step function.  This is a 1D helper that
         will produce both the horizontal and vertical profiles of the blurry rectangle.
diff --git a/gfx/skia/skia/src/effects/SkBlurMaskFilter.cpp b/gfx/skia/skia/src/effects/SkBlurMaskFilter.cpp
index 3c502f4a6a04..8dd82c5ac369 100644
--- a/gfx/skia/skia/src/effects/SkBlurMaskFilter.cpp
+++ b/gfx/skia/skia/src/effects/SkBlurMaskFilter.cpp
@@ -18,15 +18,20 @@
 #include "SkStrokeRec.h"
 
 #if SK_SUPPORT_GPU
+#include "GrCircleBlurFragmentProcessor.h"
 #include "GrContext.h"
+#include "GrDrawContext.h"
 #include "GrTexture.h"
-#include "GrEffect.h"
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
-#include "effects/GrSimpleTextureEffect.h"
-#include "GrTBackendEffectFactory.h"
+#include "GrFragmentProcessor.h"
+#include "GrInvariantOutput.h"
 #include "SkGrPixelRef.h"
 #include "SkDraw.h"
+#include "effects/GrSimpleTextureEffect.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+#include "glsl/GrGLSLTextureSampler.h"
 #endif
 
 SkScalar SkBlurMaskFilter::ConvertRadiusToSigma(SkScalar radius) {
@@ -38,45 +43,50 @@ public:
     SkBlurMaskFilterImpl(SkScalar sigma, SkBlurStyle, uint32_t flags);
 
     // overrides from SkMaskFilter
-    virtual SkMask::Format getFormat() const SK_OVERRIDE;
-    virtual bool filterMask(SkMask* dst, const SkMask& src, const SkMatrix&,
-                            SkIPoint* margin) const SK_OVERRIDE;
+    SkMask::Format getFormat() const override;
+    bool filterMask(SkMask* dst, const SkMask& src, const SkMatrix&,
+                    SkIPoint* margin) const override;
 
 #if SK_SUPPORT_GPU
-    virtual bool canFilterMaskGPU(const SkRect& devBounds,
-                                  const SkIRect& clipBounds,
-                                  const SkMatrix& ctm,
-                                  SkRect* maskRect) const SK_OVERRIDE;
-    virtual bool directFilterMaskGPU(GrContext* context,
-                                     GrPaint* grp,
-                                     const SkStrokeRec& strokeRec,
-                                     const SkPath& path) const SK_OVERRIDE;
-    virtual bool directFilterRRectMaskGPU(GrContext* context,
-                                          GrPaint* grp,
-                                          const SkStrokeRec& strokeRec,
-                                          const SkRRect& rrect) const SK_OVERRIDE;
-
-    virtual bool filterMaskGPU(GrTexture* src,
-                               const SkMatrix& ctm,
-                               const SkRect& maskRect,
-                               GrTexture** result,
-                               bool canOverwriteSrc) const SK_OVERRIDE;
+    bool canFilterMaskGPU(const SkRRect& devRRect,
+                          const SkIRect& clipBounds,
+                          const SkMatrix& ctm,
+                          SkRect* maskRect) const override;
+    bool directFilterMaskGPU(GrTextureProvider* texProvider,
+                             GrDrawContext* drawContext,
+                             GrPaint* grp,
+                             const GrClip&,
+                             const SkMatrix& viewMatrix,
+                             const SkStrokeRec& strokeRec,
+                             const SkPath& path) const override;
+    bool directFilterRRectMaskGPU(GrTextureProvider* texProvider,
+                                  GrDrawContext* drawContext,
+                                  GrPaint* grp,
+                                  const GrClip&,
+                                  const SkMatrix& viewMatrix,
+                                  const SkStrokeRec& strokeRec,
+                                  const SkRRect& rrect) const override;
+    bool filterMaskGPU(GrTexture* src,
+                       const SkMatrix& ctm,
+                       const SkRect& maskRect,
+                       GrTexture** result,
+                       bool canOverwriteSrc) const override;
 #endif
 
-    virtual void computeFastBounds(const SkRect&, SkRect*) const SK_OVERRIDE;
-    virtual bool asABlur(BlurRec*) const SK_OVERRIDE;
+    void computeFastBounds(const SkRect&, SkRect*) const override;
+    bool asABlur(BlurRec*) const override;
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBlurMaskFilterImpl)
 
 protected:
-    virtual FilterReturn filterRectsToNine(const SkRect[], int count, const SkMatrix&,
-                                           const SkIRect& clipBounds,
-                                           NinePatch*) const SK_OVERRIDE;
+    FilterReturn filterRectsToNine(const SkRect[], int count, const SkMatrix&,
+                                   const SkIRect& clipBounds,
+                                   NinePatch*) const override;
 
-    virtual FilterReturn filterRRectToNine(const SkRRect&, const SkMatrix&,
-                                           const SkIRect& clipBounds,
-                                           NinePatch*) const SK_OVERRIDE;
+    FilterReturn filterRRectToNine(const SkRRect&, const SkMatrix&,
+                                   const SkIRect& clipBounds,
+                                   NinePatch*) const override;
 
     bool filterRectMask(SkMask* dstM, const SkRect& r, const SkMatrix& matrix,
                         SkIPoint* margin, SkMask::CreateMode createMode) const;
@@ -99,7 +109,7 @@ private:
     }
 
     SkBlurMaskFilterImpl(SkReadBuffer&);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
 
     SkScalar computeXformedSigma(const SkMatrix& ctm) const {
         bool ignoreTransform = SkToBool(fBlurFlags & SkBlurMaskFilter::kIgnoreTransform_BlurFlag);
@@ -108,6 +118,8 @@ private:
         return SkMinScalar(xformedSigma, kMAX_BLUR_SIGMA);
     }
 
+    friend class SkBlurMaskFilter;
+
     typedef SkMaskFilter INHERITED;
 };
 
@@ -115,15 +127,15 @@ const SkScalar SkBlurMaskFilterImpl::kMAX_BLUR_SIGMA = SkIntToScalar(128);
 
 SkMaskFilter* SkBlurMaskFilter::Create(SkBlurStyle style, SkScalar sigma, uint32_t flags) {
     if (!SkScalarIsFinite(sigma) || sigma <= 0) {
-        return NULL;
+        return nullptr;
     }
     if ((unsigned)style > (unsigned)kLastEnum_SkBlurStyle) {
-        return NULL;
+        return nullptr;
     }
     if (flags > SkBlurMaskFilter::kAll_BlurFlag) {
-        return NULL;
+        return nullptr;
     }
-    return SkNEW_ARGS(SkBlurMaskFilterImpl, (sigma, style, flags));
+    return new SkBlurMaskFilterImpl(sigma, style, flags);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -156,40 +168,38 @@ bool SkBlurMaskFilterImpl::asABlur(BlurRec* rec) const {
 
 bool SkBlurMaskFilterImpl::filterMask(SkMask* dst, const SkMask& src,
                                       const SkMatrix& matrix,
-                                      SkIPoint* margin) const{
+                                      SkIPoint* margin) const {
     SkScalar sigma = this->computeXformedSigma(matrix);
     return SkBlurMask::BoxBlur(dst, src, sigma, fBlurStyle, this->getQuality(), margin);
 }
 
 bool SkBlurMaskFilterImpl::filterRectMask(SkMask* dst, const SkRect& r,
                                           const SkMatrix& matrix,
-                                          SkIPoint* margin, SkMask::CreateMode createMode) const{
+                                          SkIPoint* margin, SkMask::CreateMode createMode) const {
     SkScalar sigma = computeXformedSigma(matrix);
 
-    return SkBlurMask::BlurRect(sigma, dst, r, fBlurStyle,
-                                margin, createMode);
+    return SkBlurMask::BlurRect(sigma, dst, r, fBlurStyle, margin, createMode);
 }
 
 bool SkBlurMaskFilterImpl::filterRRectMask(SkMask* dst, const SkRRect& r,
                                           const SkMatrix& matrix,
-                                          SkIPoint* margin, SkMask::CreateMode createMode) const{
+                                          SkIPoint* margin, SkMask::CreateMode createMode) const {
     SkScalar sigma = computeXformedSigma(matrix);
 
-    return SkBlurMask::BlurRRect(sigma, dst, r, fBlurStyle,
-                                margin, createMode);
+    return SkBlurMask::BlurRRect(sigma, dst, r, fBlurStyle, margin, createMode);
 }
 
 #include "SkCanvas.h"
 
 static bool prepare_to_draw_into_mask(const SkRect& bounds, SkMask* mask) {
-    SkASSERT(mask != NULL);
+    SkASSERT(mask != nullptr);
 
-    bounds.roundOut(&mask->fBounds);
+    mask->fBounds = bounds.roundOut();
     mask->fRowBytes = SkAlign4(mask->fBounds.width());
     mask->fFormat = SkMask::kA8_Format;
     const size_t size = mask->computeImageSize();
     mask->fImage = SkMask::AllocImage(size);
-    if (NULL == mask->fImage) {
+    if (nullptr == mask->fImage) {
         return false;
     }
 
@@ -255,22 +265,59 @@ static bool rect_exceeds(const SkRect& r, SkScalar v) {
            r.width() > v || r.height() > v;
 }
 
+#include "SkMaskCache.h"
+
+static SkCachedData* copy_mask_to_cacheddata(SkMask* mask) {
+    const size_t size = mask->computeTotalImageSize();
+    SkCachedData* data = SkResourceCache::NewCachedData(size);
+    if (data) {
+        memcpy(data->writable_data(), mask->fImage, size);
+        SkMask::FreeImage(mask->fImage);
+        mask->fImage = (uint8_t*)data->data();
+    }
+    return data;
+}
+
+static SkCachedData* find_cached_rrect(SkMask* mask, SkScalar sigma, SkBlurStyle style,
+                                       SkBlurQuality quality, const SkRRect& rrect) {
+    return SkMaskCache::FindAndRef(sigma, style, quality, rrect, mask);
+}
+
+static SkCachedData* add_cached_rrect(SkMask* mask, SkScalar sigma, SkBlurStyle style,
+                                      SkBlurQuality quality, const SkRRect& rrect) {
+    SkCachedData* cache = copy_mask_to_cacheddata(mask);
+    if (cache) {
+        SkMaskCache::Add(sigma, style, quality, rrect, *mask, cache);
+    }
+    return cache;
+}
+
+static SkCachedData* find_cached_rects(SkMask* mask, SkScalar sigma, SkBlurStyle style,
+                                       SkBlurQuality quality, const SkRect rects[], int count) {
+    return SkMaskCache::FindAndRef(sigma, style, quality, rects, count, mask);
+}
+
+static SkCachedData* add_cached_rects(SkMask* mask, SkScalar sigma, SkBlurStyle style,
+                                      SkBlurQuality quality, const SkRect rects[], int count) {
+    SkCachedData* cache = copy_mask_to_cacheddata(mask);
+    if (cache) {
+        SkMaskCache::Add(sigma, style, quality, rects, count, *mask, cache);
+    }
+    return cache;
+}
+
 #ifdef SK_IGNORE_FAST_RRECT_BLUR
-SK_CONF_DECLARE( bool, c_analyticBlurRRect, "mask.filter.blur.analyticblurrrect", false, "Use the faster analytic blur approach for ninepatch rects" );
+SK_CONF_DECLARE(bool, c_analyticBlurRRect, "mask.filter.blur.analyticblurrrect", false, "Use the faster analytic blur approach for ninepatch rects");
 #else
-SK_CONF_DECLARE( bool, c_analyticBlurRRect, "mask.filter.blur.analyticblurrrect", true, "Use the faster analytic blur approach for ninepatch round rects" );
+SK_CONF_DECLARE(bool, c_analyticBlurRRect, "mask.filter.blur.analyticblurrrect", true, "Use the faster analytic blur approach for ninepatch round rects");
 #endif
 
 SkMaskFilter::FilterReturn
 SkBlurMaskFilterImpl::filterRRectToNine(const SkRRect& rrect, const SkMatrix& matrix,
                                         const SkIRect& clipBounds,
                                         NinePatch* patch) const {
-    SkASSERT(patch != NULL);
+    SkASSERT(patch != nullptr);
     switch (rrect.getType()) {
-        case SkRRect::kUnknown_Type:
-            // Unknown should never be returned.
-            SkASSERT(false);
-            // Fall through.
         case SkRRect::kEmpty_Type:
             // Nothing to draw.
             return kFalse_FilterReturn;
@@ -305,8 +352,8 @@ SkBlurMaskFilterImpl::filterRRectToNine(const SkRRect& rrect, const SkMatrix& ma
 
     SkIPoint margin;
     SkMask  srcM, dstM;
-    rrect.rect().roundOut(&srcM.fBounds);
-    srcM.fImage = NULL;
+    srcM.fBounds = rrect.rect().roundOut();
+    srcM.fImage = nullptr;
     srcM.fFormat = SkMask::kA8_Format;
     srcM.fRowBytes = 0;
 
@@ -366,33 +413,41 @@ SkBlurMaskFilterImpl::filterRRectToNine(const SkRRect& rrect, const SkMatrix& ma
     radii[SkRRect::kLowerLeft_Corner] = LL;
     smallRR.setRectRadii(smallR, radii);
 
-    bool analyticBlurWorked = false;
-    if (c_analyticBlurRRect) {
-        analyticBlurWorked =
-            this->filterRRectMask(&patch->fMask, smallRR, matrix, &margin,
-                                  SkMask::kComputeBoundsAndRenderImage_CreateMode);
-    }
-
-    if (!analyticBlurWorked) {
-        if (!draw_rrect_into_mask(smallRR, &srcM)) {
-            return kFalse_FilterReturn;
+    const SkScalar sigma = this->computeXformedSigma(matrix);
+    SkCachedData* cache = find_cached_rrect(&patch->fMask, sigma, fBlurStyle,
+                                            this->getQuality(), smallRR);
+    if (!cache) {
+        bool analyticBlurWorked = false;
+        if (c_analyticBlurRRect) {
+            analyticBlurWorked =
+                this->filterRRectMask(&patch->fMask, smallRR, matrix, &margin,
+                                      SkMask::kComputeBoundsAndRenderImage_CreateMode);
         }
 
-        SkAutoMaskFreeImage amf(srcM.fImage);
+        if (!analyticBlurWorked) {
+            if (!draw_rrect_into_mask(smallRR, &srcM)) {
+                return kFalse_FilterReturn;
+            }
 
-        if (!this->filterMask(&patch->fMask, srcM, matrix, &margin)) {
-            return kFalse_FilterReturn;
+            SkAutoMaskFreeImage amf(srcM.fImage);
+
+            if (!this->filterMask(&patch->fMask, srcM, matrix, &margin)) {
+                return kFalse_FilterReturn;
+            }
         }
+        cache = add_cached_rrect(&patch->fMask, sigma, fBlurStyle, this->getQuality(), smallRR);
     }
 
     patch->fMask.fBounds.offsetTo(0, 0);
     patch->fOuterRect = dstM.fBounds;
     patch->fCenter.fX = SkScalarCeilToInt(leftUnstretched) + 1;
     patch->fCenter.fY = SkScalarCeilToInt(topUnstretched) + 1;
+    SkASSERT(nullptr == patch->fCache);
+    patch->fCache = cache;  // transfer ownership to patch
     return kTrue_FilterReturn;
 }
 
-SK_CONF_DECLARE( bool, c_analyticBlurNinepatch, "mask.filter.analyticNinePatch", true, "Use the faster analytic blur approach for ninepatch rects" );
+SK_CONF_DECLARE(bool, c_analyticBlurNinepatch, "mask.filter.analyticNinePatch", true, "Use the faster analytic blur approach for ninepatch rects");
 
 SkMaskFilter::FilterReturn
 SkBlurMaskFilterImpl::filterRectsToNine(const SkRect rects[], int count,
@@ -417,8 +472,8 @@ SkBlurMaskFilterImpl::filterRectsToNine(const SkRect rects[], int count,
 
     SkIPoint margin;
     SkMask  srcM, dstM;
-    rects[0].roundOut(&srcM.fBounds);
-    srcM.fImage = NULL;
+    srcM.fBounds = rects[0].roundOut();
+    srcM.fImage = nullptr;
     srcM.fFormat = SkMask::kA8_Format;
     srcM.fRowBytes = 0;
 
@@ -492,25 +547,33 @@ SkBlurMaskFilterImpl::filterRectsToNine(const SkRect rects[], int count,
         SkASSERT(!smallR[1].isEmpty());
     }
 
-    if (count > 1 || !c_analyticBlurNinepatch) {
-        if (!draw_rects_into_mask(smallR, count, &srcM)) {
-            return kFalse_FilterReturn;
-        }
+    const SkScalar sigma = this->computeXformedSigma(matrix);
+    SkCachedData* cache = find_cached_rects(&patch->fMask, sigma, fBlurStyle,
+                                            this->getQuality(), smallR, count);
+    if (!cache) {
+        if (count > 1 || !c_analyticBlurNinepatch) {
+            if (!draw_rects_into_mask(smallR, count, &srcM)) {
+                return kFalse_FilterReturn;
+            }
 
-        SkAutoMaskFreeImage amf(srcM.fImage);
+            SkAutoMaskFreeImage amf(srcM.fImage);
 
-        if (!this->filterMask(&patch->fMask, srcM, matrix, &margin)) {
-            return kFalse_FilterReturn;
-        }
-    } else {
-        if (!this->filterRectMask(&patch->fMask, smallR[0], matrix, &margin,
-                                  SkMask::kComputeBoundsAndRenderImage_CreateMode)) {
-            return kFalse_FilterReturn;
+            if (!this->filterMask(&patch->fMask, srcM, matrix, &margin)) {
+                return kFalse_FilterReturn;
+            }
+        } else {
+            if (!this->filterRectMask(&patch->fMask, smallR[0], matrix, &margin,
+                                      SkMask::kComputeBoundsAndRenderImage_CreateMode)) {
+                return kFalse_FilterReturn;
+            }
         }
+        cache = add_cached_rects(&patch->fMask, sigma, fBlurStyle, this->getQuality(), smallR, count);
     }
     patch->fMask.fBounds.offsetTo(0, 0);
     patch->fOuterRect = dstM.fBounds;
     patch->fCenter = center;
+    SkASSERT(nullptr == patch->fCache);
+    patch->fCache = cache;  // transfer ownership to patch
     return kTrue_FilterReturn;
 }
 
@@ -522,19 +585,19 @@ void SkBlurMaskFilterImpl::computeFastBounds(const SkRect& src,
              src.fRight + pad, src.fBottom + pad);
 }
 
-SkBlurMaskFilterImpl::SkBlurMaskFilterImpl(SkReadBuffer& buffer)
-        : SkMaskFilter(buffer) {
-    fSigma = buffer.readScalar();
-    fBlurStyle = (SkBlurStyle)buffer.readInt();
-    fBlurFlags = buffer.readUInt() & SkBlurMaskFilter::kAll_BlurFlag;
-    SkASSERT(fSigma > 0);
-    SkASSERT((unsigned)fBlurStyle <= kLastEnum_SkBlurStyle);
+SkFlattenable* SkBlurMaskFilterImpl::CreateProc(SkReadBuffer& buffer) {
+    const SkScalar sigma = buffer.readScalar();
+    const unsigned style = buffer.readUInt();
+    const unsigned flags = buffer.readUInt();
+    if (style <= kLastEnum_SkBlurStyle) {
+        return SkBlurMaskFilter::Create((SkBlurStyle)style, sigma, flags);
+    }
+    return nullptr;
 }
 
 void SkBlurMaskFilterImpl::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
     buffer.writeScalar(fSigma);
-    buffer.writeInt(fBlurStyle);
+    buffer.writeUInt(fBlurStyle);
     buffer.writeUInt(fBlurFlags);
 }
 
@@ -542,310 +605,341 @@ void SkBlurMaskFilterImpl::flatten(SkWriteBuffer& buffer) const {
 
 class GrGLRectBlurEffect;
 
-class GrRectBlurEffect : public GrEffect {
+class GrRectBlurEffect : public GrFragmentProcessor {
 public:
-    virtual ~GrRectBlurEffect();
+    ~GrRectBlurEffect() override { }
 
-    static const char* Name() { return "RectBlur"; }
+    const char* name() const override { return "RectBlur"; }
 
-    typedef GrGLRectBlurEffect GLEffect;
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
-
-    /**
-     * Create a simple filter effect with custom bicubic coefficients.
-     */
-    static GrEffect* Create(GrContext *context, const SkRect& rect, float sigma) {
-        GrTexture *blurProfileTexture = NULL;
+    static GrFragmentProcessor* Create(GrTextureProvider *textureProvider,
+                                       const SkRect& rect, float sigma) {
         int doubleProfileSize = SkScalarCeilToInt(12*sigma);
 
         if (doubleProfileSize >= rect.width() || doubleProfileSize >= rect.height()) {
             // if the blur sigma is too large so the gaussian overlaps the whole
             // rect in either direction, fall back to CPU path for now.
-
-            return NULL;
+            return nullptr;
         }
 
-        bool createdBlurProfileTexture = CreateBlurProfileTexture(context, sigma, &blurProfileTexture);
-        SkAutoTUnref<GrTexture> hunref(blurProfileTexture);
-        if (!createdBlurProfileTexture) {
-           return NULL;
+        SkAutoTUnref<GrTexture> blurProfile(CreateBlurProfileTexture(textureProvider, sigma));
+        if (!blurProfile) {
+           return nullptr;
         }
-        return SkNEW_ARGS(GrRectBlurEffect, (rect, sigma, blurProfileTexture));
+        // in OpenGL ES, mediump floats have a minimum range of 2^14. If we have coordinates bigger
+        // than that, the shader math will end up with infinities and result in the blur effect not
+        // working correctly. To avoid this, we switch into highp when the coordinates are too big.
+        // As 2^14 is the minimum range but the actual range can be bigger, we might end up 
+        // switching to highp sooner than strictly necessary, but most devices that have a bigger 
+        // range for mediump also have mediump being exactly the same as highp (e.g. all non-OpenGL
+        // ES devices), and thus incur no additional penalty for the switch.
+        static const SkScalar kMAX_BLUR_COORD = SkIntToScalar(16000);
+        GrSLPrecision precision;
+        if (SkScalarAbs(rect.top()) > kMAX_BLUR_COORD ||
+            SkScalarAbs(rect.left()) > kMAX_BLUR_COORD ||
+            SkScalarAbs(rect.bottom()) > kMAX_BLUR_COORD ||
+            SkScalarAbs(rect.right()) > kMAX_BLUR_COORD ||
+            SkScalarAbs(rect.width()) > kMAX_BLUR_COORD ||
+            SkScalarAbs(rect.height()) > kMAX_BLUR_COORD) {
+            precision = kHigh_GrSLPrecision;
+        }
+        else {
+            precision = kDefault_GrSLPrecision;
+        }
+        return new GrRectBlurEffect(rect, sigma, blurProfile, precision);
     }
 
     const SkRect& getRect() const { return fRect; }
     float getSigma() const { return fSigma; }
 
 private:
-    GrRectBlurEffect(const SkRect& rect, float sigma, GrTexture *blur_profile);
-    virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE;
+    GrRectBlurEffect(const SkRect& rect, float sigma, GrTexture *blurProfile,
+                     GrSLPrecision fPrecision);
 
-    static bool CreateBlurProfileTexture(GrContext *context, float sigma,
-                                       GrTexture **blurProfileTexture);
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
+
+    bool onIsEqual(const GrFragmentProcessor&) const override;
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
+
+    static GrTexture* CreateBlurProfileTexture(GrTextureProvider*, float sigma);
 
     SkRect          fRect;
     float           fSigma;
     GrTextureAccess fBlurProfileAccess;
+    GrSLPrecision   fPrecision;
 
-    GR_DECLARE_EFFECT_TEST;
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
 
-    typedef GrEffect INHERITED;
+    typedef GrFragmentProcessor INHERITED;
 };
 
-class GrGLRectBlurEffect : public GrGLEffect {
+class GrGLRectBlurEffect : public GrGLSLFragmentProcessor {
 public:
-    GrGLRectBlurEffect(const GrBackendEffectFactory& factory,
-                      const GrDrawEffect&);
-    virtual void emitCode(GrGLShaderBuilder*,
-                          const GrDrawEffect&,
-                          const GrEffectKey&,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    GrGLRectBlurEffect(const GrProcessor&, GrSLPrecision precision) 
+    : fPrecision(precision) {
+    }
+    void emitCode(EmitArgs&) override;
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+    static void GenKey(GrSLPrecision precision, GrProcessorKeyBuilder* b);
+
+protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
 
 private:
-    typedef GrGLUniformManager::UniformHandle        UniformHandle;
+    typedef GrGLSLProgramDataManager::UniformHandle UniformHandle;
 
     UniformHandle       fProxyRectUniform;
     UniformHandle       fProfileSizeUniform;
+    GrSLPrecision       fPrecision;
 
-    typedef GrGLEffect INHERITED;
+    typedef GrGLSLFragmentProcessor INHERITED;
 };
 
-
-
-GrGLRectBlurEffect::GrGLRectBlurEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&)
-    : INHERITED(factory) {
-}
-
-void OutputRectBlurProfileLookup(GrGLShaderBuilder* builder,
-                                 const GrGLShaderBuilder::TextureSampler& sampler,
+void OutputRectBlurProfileLookup(GrGLSLFragmentBuilder* fragBuilder,
+                                 const GrGLSLTextureSampler& sampler,
                                  const char *output,
                                  const char *profileSize, const char *loc,
                                  const char *blurred_width,
                                  const char *sharp_width) {
-    builder->fsCodeAppendf("\tfloat %s;\n", output);
-    builder->fsCodeAppendf("\t\t{\n");
-    builder->fsCodeAppendf("\t\t\tfloat coord = (0.5 * (abs(2.0*%s - %s) - %s))/%s;\n",
+    fragBuilder->codeAppendf("float %s;", output);
+    fragBuilder->codeAppendf("{");
+    fragBuilder->codeAppendf("float coord = ((abs(%s - 0.5 * %s) - 0.5 * %s)) / %s;",
                            loc, blurred_width, sharp_width, profileSize);
-    builder->fsCodeAppendf("\t\t\t%s = ", output);
-    builder->fsAppendTextureLookup(sampler, "vec2(coord,0.5)");
-    builder->fsCodeAppend(".a;\n");
-    builder->fsCodeAppendf("\t\t}\n");
+    fragBuilder->codeAppendf("%s = ", output);
+    fragBuilder->appendTextureLookup(sampler, "vec2(coord,0.5)");
+    fragBuilder->codeAppend(".a;");
+    fragBuilder->codeAppendf("}");
 }
 
-void GrGLRectBlurEffect::emitCode(GrGLShaderBuilder* builder,
-                                 const GrDrawEffect&,
-                                 const GrEffectKey& key,
-                                 const char* outputColor,
-                                 const char* inputColor,
-                                 const TransformedCoordsArray& coords,
-                                 const TextureSamplerArray& samplers) {
+
+void GrGLRectBlurEffect::GenKey(GrSLPrecision precision, GrProcessorKeyBuilder* b) {
+    b->add32(precision);
+}
+
+
+void GrGLRectBlurEffect::emitCode(EmitArgs& args) {
 
     const char *rectName;
     const char *profileSizeName;
 
-    fProxyRectUniform = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
+    const char* precisionString = GrGLSLShaderVar::PrecisionString(args.fGLSLCaps, fPrecision);
+    fProxyRectUniform = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
                                             kVec4f_GrSLType,
+                                            fPrecision,
                                             "proxyRect",
                                             &rectName);
-    fProfileSizeUniform = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
+    fProfileSizeUniform = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
                                             kFloat_GrSLType,
+                                            kDefault_GrSLPrecision,
                                             "profileSize",
                                             &profileSizeName);
 
-    const char *fragmentPos = builder->fragmentPosition();
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    const char *fragmentPos = fragBuilder->fragmentPosition();
 
-    if (inputColor) {
-        builder->fsCodeAppendf("\tvec4 src=%s;\n", inputColor);
+    if (args.fInputColor) {
+        fragBuilder->codeAppendf("vec4 src=%s;", args.fInputColor);
     } else {
-        builder->fsCodeAppendf("\tvec4 src=vec4(1)\n;");
+        fragBuilder->codeAppendf("vec4 src=vec4(1);");
     }
 
-    builder->fsCodeAppendf("\tvec2 translatedPos = %s.xy - %s.xy;\n", fragmentPos, rectName );
-    builder->fsCodeAppendf("\tfloat width = %s.z - %s.x;\n", rectName, rectName);
-    builder->fsCodeAppendf("\tfloat height = %s.w - %s.y;\n", rectName, rectName);
+    fragBuilder->codeAppendf("%s vec2 translatedPos = %s.xy - %s.xy;", precisionString, fragmentPos, 
+                             rectName);
+    fragBuilder->codeAppendf("%s float width = %s.z - %s.x;", precisionString, rectName, rectName);
+    fragBuilder->codeAppendf("%s float height = %s.w - %s.y;", precisionString, rectName, rectName);
 
-    builder->fsCodeAppendf("\tvec2 smallDims = vec2(width - %s, height-%s);\n", profileSizeName, profileSizeName);
-    builder->fsCodeAppendf("\tfloat center = 2.0 * floor(%s/2.0 + .25) - 1.0;\n", profileSizeName);
-    builder->fsCodeAppendf("\tvec2 wh = smallDims - vec2(center,center);\n");
+    fragBuilder->codeAppendf("%s vec2 smallDims = vec2(width - %s, height - %s);", precisionString, 
+                             profileSizeName, profileSizeName);
+    fragBuilder->codeAppendf("%s float center = 2.0 * floor(%s/2.0 + .25) - 1.0;", precisionString,
+                             profileSizeName);
+    fragBuilder->codeAppendf("%s vec2 wh = smallDims - vec2(center,center);", precisionString);
 
-    OutputRectBlurProfileLookup(builder, samplers[0], "horiz_lookup", profileSizeName, "translatedPos.x", "width", "wh.x");
-    OutputRectBlurProfileLookup(builder, samplers[0], "vert_lookup", profileSizeName, "translatedPos.y", "height", "wh.y");
+    OutputRectBlurProfileLookup(fragBuilder, args.fSamplers[0], "horiz_lookup", profileSizeName,
+                                "translatedPos.x", "width", "wh.x");
+    OutputRectBlurProfileLookup(fragBuilder, args.fSamplers[0], "vert_lookup", profileSizeName, 
+                                "translatedPos.y", "height", "wh.y");
 
-    builder->fsCodeAppendf("\tfloat final = horiz_lookup * vert_lookup;\n");
-    builder->fsCodeAppendf("\t%s = src * vec4(final);\n", outputColor );
+    fragBuilder->codeAppendf("float final = horiz_lookup * vert_lookup;");
+    fragBuilder->codeAppendf("%s = src * final;", args.fOutputColor);
 }
 
-void GrGLRectBlurEffect::setData(const GrGLUniformManager& uman,
-                                 const GrDrawEffect& drawEffect) {
-    const GrRectBlurEffect& rbe = drawEffect.castEffect<GrRectBlurEffect>();
+void GrGLRectBlurEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                                   const GrProcessor& proc) {
+    const GrRectBlurEffect& rbe = proc.cast<GrRectBlurEffect>();
     SkRect rect = rbe.getRect();
 
-    uman.set4f(fProxyRectUniform, rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
-    uman.set1f(fProfileSizeUniform, SkScalarCeilToScalar(6*rbe.getSigma()));
+    pdman.set4f(fProxyRectUniform, rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
+    pdman.set1f(fProfileSizeUniform, SkScalarCeilToScalar(6*rbe.getSigma()));
 }
 
-bool GrRectBlurEffect::CreateBlurProfileTexture(GrContext *context, float sigma,
-                                              GrTexture **blurProfileTexture) {
-    GrTextureParams params;
-    GrTextureDesc texDesc;
+GrTexture* GrRectBlurEffect::CreateBlurProfileTexture(GrTextureProvider* textureProvider,
+                                                      float sigma) {
+    GrSurfaceDesc texDesc;
 
-    unsigned int profile_size = SkScalarCeilToInt(6*sigma);
+    unsigned int profileSize = SkScalarCeilToInt(6*sigma);
 
-    texDesc.fWidth = profile_size;
+    texDesc.fWidth = profileSize;
     texDesc.fHeight = 1;
     texDesc.fConfig = kAlpha_8_GrPixelConfig;
 
-    static const GrCacheID::Domain gBlurProfileDomain = GrCacheID::GenerateDomain();
-    GrCacheID::Key key;
-    memset(&key, 0, sizeof(key));
-    key.fData32[0] = profile_size;
-    key.fData32[1] = 1;
-    GrCacheID blurProfileKey(gBlurProfileDomain, key);
+    static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
+    GrUniqueKey key;
+    GrUniqueKey::Builder builder(&key, kDomain, 1);
+    builder[0] = profileSize;
+    builder.finish();
 
-    uint8_t *profile = NULL;
-    SkAutoTDeleteArray<uint8_t> ada(NULL);
+    GrTexture *blurProfile = textureProvider->findAndRefTextureByUniqueKey(key);
 
-    *blurProfileTexture = context->findAndRefTexture(texDesc, blurProfileKey, &params);
+    if (!blurProfile) {
+        SkAutoTDeleteArray<uint8_t> profile(SkBlurMask::ComputeBlurProfile(sigma));
 
-    if (NULL == *blurProfileTexture) {
-
-        SkBlurMask::ComputeBlurProfile(sigma, &profile);
-        ada.reset(profile);
-
-        *blurProfileTexture = context->createTexture(&params, texDesc, blurProfileKey,
-                                                     profile, 0);
-
-        if (NULL == *blurProfileTexture) {
-            return false;
+        blurProfile = textureProvider->createTexture(texDesc, true, profile.get(), 0);
+        if (blurProfile) {
+            textureProvider->assignUniqueKeyToTexture(key, blurProfile);
         }
     }
 
-    return true;
+    return blurProfile;
 }
 
-GrRectBlurEffect::GrRectBlurEffect(const SkRect& rect, float sigma,
-                                   GrTexture *blur_profile)
-  : INHERITED(),
-    fRect(rect),
-    fSigma(sigma),
-    fBlurProfileAccess(blur_profile) {
+GrRectBlurEffect::GrRectBlurEffect(const SkRect& rect, float sigma, GrTexture *blurProfile,
+                                   GrSLPrecision precision)
+    : fRect(rect)
+    , fSigma(sigma)
+    , fBlurProfileAccess(blurProfile)
+    , fPrecision(precision) {
+    this->initClassID<GrRectBlurEffect>();
     this->addTextureAccess(&fBlurProfileAccess);
     this->setWillReadFragmentPosition();
 }
 
-GrRectBlurEffect::~GrRectBlurEffect() {
+void GrRectBlurEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                             GrProcessorKeyBuilder* b) const {
+    GrGLRectBlurEffect::GenKey(fPrecision, b);
 }
 
-const GrBackendEffectFactory& GrRectBlurEffect::getFactory() const {
-    return GrTBackendEffectFactory<GrRectBlurEffect>::getInstance();
+GrGLSLFragmentProcessor* GrRectBlurEffect::onCreateGLSLInstance() const {
+    return new GrGLRectBlurEffect(*this, fPrecision);
 }
 
-bool GrRectBlurEffect::onIsEqual(const GrEffect& sBase) const {
-    const GrRectBlurEffect& s = CastEffect<GrRectBlurEffect>(sBase);
+bool GrRectBlurEffect::onIsEqual(const GrFragmentProcessor& sBase) const {
+    const GrRectBlurEffect& s = sBase.cast<GrRectBlurEffect>();
     return this->getSigma() == s.getSigma() && this->getRect() == s.getRect();
 }
 
-void GrRectBlurEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
-    *validFlags = 0;
-    return;
+void GrRectBlurEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const {
+    inout->mulByUnknownSingleComponent();
 }
 
-GR_DEFINE_EFFECT_TEST(GrRectBlurEffect);
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrRectBlurEffect);
 
-GrEffect* GrRectBlurEffect::TestCreate(SkRandom* random,
-                                       GrContext* context,
-                                       const GrDrawTargetCaps&,
-                                       GrTexture**) {
-    float sigma = random->nextRangeF(3,8);
-    float width = random->nextRangeF(200,300);
-    float height = random->nextRangeF(200,300);
-    return GrRectBlurEffect::Create(context, SkRect::MakeWH(width, height), sigma);
+const GrFragmentProcessor* GrRectBlurEffect::TestCreate(GrProcessorTestData* d) {
+    float sigma = d->fRandom->nextRangeF(3,8);
+    float width = d->fRandom->nextRangeF(200,300);
+    float height = d->fRandom->nextRangeF(200,300);
+    return GrRectBlurEffect::Create(d->fContext->textureProvider(), SkRect::MakeWH(width, height),
+                                    sigma);
 }
 
 
-bool SkBlurMaskFilterImpl::directFilterMaskGPU(GrContext* context,
+bool SkBlurMaskFilterImpl::directFilterMaskGPU(GrTextureProvider* texProvider,
+                                               GrDrawContext* drawContext,
                                                GrPaint* grp,
+                                               const GrClip& clip,
+                                               const SkMatrix& viewMatrix,
                                                const SkStrokeRec& strokeRec,
                                                const SkPath& path) const {
+    SkASSERT(drawContext);
+
     if (fBlurStyle != kNormal_SkBlurStyle) {
         return false;
     }
 
-    SkRect rect;
-    if (!path.isRect(&rect)) {
-        return false;
-    }
-
+    // TODO: we could handle blurred stroked circles
     if (!strokeRec.isFillStyle()) {
         return false;
     }
 
-    SkMatrix ctm = context->getMatrix();
-    SkScalar xformedSigma = this->computeXformedSigma(ctm);
+    SkScalar xformedSigma = this->computeXformedSigma(viewMatrix);
 
-    int pad=SkScalarCeilToInt(6*xformedSigma)/2;
-    rect.outset(SkIntToScalar(pad), SkIntToScalar(pad));
+    SkAutoTUnref<const GrFragmentProcessor> fp;
 
-    SkAutoTUnref<GrEffect> effect(GrRectBlurEffect::Create(context, rect, xformedSigma));
-    if (!effect) {
+    SkRect rect;
+    if (path.isRect(&rect)) {
+        int pad = SkScalarCeilToInt(6*xformedSigma)/2;
+        rect.outset(SkIntToScalar(pad), SkIntToScalar(pad));
+
+        fp.reset(GrRectBlurEffect::Create(texProvider, rect, xformedSigma));
+    } else if (path.isOval(&rect) && SkScalarNearlyEqual(rect.width(), rect.height())) {
+        fp.reset(GrCircleBlurFragmentProcessor::Create(texProvider, rect, xformedSigma));
+
+        // expand the rect for the coverage geometry
+        int pad = SkScalarCeilToInt(6*xformedSigma)/2;
+        rect.outset(SkIntToScalar(pad), SkIntToScalar(pad));
+    } else {
         return false;
     }
 
-    GrContext::AutoMatrix am;
-    if (!am.setIdentity(context, grp)) {
-       return false;
+    if (!fp) {
+        return false;
     }
 
-    grp->addCoverageEffect(effect);
+    grp->addCoverageFragmentProcessor(fp);
 
-    context->drawRect(*grp, rect);
+    SkMatrix inverse;
+    if (!viewMatrix.invert(&inverse)) {
+        return false;
+    }
+
+    drawContext->fillRectWithLocalMatrix(clip, *grp, SkMatrix::I(), rect, inverse);
     return true;
 }
 
-class GrGLRRectBlurEffect;
+//////////////////////////////////////////////////////////////////////////////
 
-class GrRRectBlurEffect : public GrEffect {
+class GrRRectBlurEffect : public GrFragmentProcessor {
 public:
 
-    static GrEffect* Create(GrContext* context, float sigma, const SkRRect&);
+    static const GrFragmentProcessor* Create(GrTextureProvider*, float sigma, const SkRRect&);
 
     virtual ~GrRRectBlurEffect() {};
-    static const char* Name() { return "GrRRectBlur"; }
+    const char* name() const override { return "GrRRectBlur"; }
 
     const SkRRect& getRRect() const { return fRRect; }
     float getSigma() const { return fSigma; }
 
-    typedef GrGLRRectBlurEffect GLEffect;
-
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
-
 private:
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
+
     GrRRectBlurEffect(float sigma, const SkRRect&, GrTexture* profileTexture);
 
-    virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE;
+    virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                       GrProcessorKeyBuilder* b) const override;
+
+    bool onIsEqual(const GrFragmentProcessor& other) const override;
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
 
     SkRRect             fRRect;
     float               fSigma;
     GrTextureAccess     fNinePatchAccess;
 
-    GR_DECLARE_EFFECT_TEST;
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
 
-    typedef GrEffect INHERITED;
+    typedef GrFragmentProcessor INHERITED;
 };
 
 
-GrEffect* GrRRectBlurEffect::Create(GrContext* context, float sigma, const SkRRect& rrect) {
+const GrFragmentProcessor* GrRRectBlurEffect::Create(GrTextureProvider* texProvider, float sigma,
+                                                     const SkRRect& rrect) {
+    if (rrect.isCircle()) {
+        return GrCircleBlurFragmentProcessor::Create(texProvider, rrect.rect(), sigma);
+    }
+
     if (!rrect.isSimpleCircular()) {
-        return NULL;
+        return nullptr;
     }
 
     // Make sure we can successfully ninepatch this rrect -- the blur sigma has to be
@@ -856,31 +950,23 @@ GrEffect* GrRRectBlurEffect::Create(GrContext* context, float sigma, const SkRRe
     unsigned int cornerRadius = SkScalarCeilToInt(rrect.getSimpleRadii().x());
     if (cornerRadius + blurRadius > rrect.width()/2 ||
         cornerRadius + blurRadius > rrect.height()/2) {
-        return NULL;
+        return nullptr;
     }
 
-    static const GrCacheID::Domain gRRectBlurDomain = GrCacheID::GenerateDomain();
-    GrCacheID::Key key;
-    memset(&key, 0, sizeof(key));
-    key.fData32[0] = blurRadius;
-    key.fData32[1] = cornerRadius;
-    GrCacheID blurRRectNinePatchID(gRRectBlurDomain, key);
+    static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
+    GrUniqueKey key;
+    GrUniqueKey::Builder builder(&key, kDomain, 2);
+    builder[0] = blurRadius;
+    builder[1] = cornerRadius;
+    builder.finish();
 
-    GrTextureParams params;
-    params.setFilterMode(GrTextureParams::kBilerp_FilterMode);
+    SkAutoTUnref<GrTexture> blurNinePatchTexture(texProvider->findAndRefTextureByUniqueKey(key));
 
-    unsigned int smallRectSide = 2*(blurRadius + cornerRadius) + 1;
-    unsigned int texSide = smallRectSide + 2*blurRadius;
-    GrTextureDesc texDesc;
-    texDesc.fWidth = texSide;
-    texDesc.fHeight = texSide;
-    texDesc.fConfig = kAlpha_8_GrPixelConfig;
-
-    GrTexture *blurNinePatchTexture = context->findAndRefTexture(texDesc, blurRRectNinePatchID, &params);
-
-    if (NULL == blurNinePatchTexture) {
+    if (!blurNinePatchTexture) {
         SkMask mask;
 
+        unsigned int smallRectSide = 2*(blurRadius + cornerRadius) + 1;
+
         mask.fBounds = SkIRect::MakeWH(smallRectSide, smallRectSide);
         mask.fFormat = SkMask::kA8_Format;
         mask.fRowBytes = mask.fBounds.width();
@@ -896,98 +982,83 @@ GrEffect* GrRRectBlurEffect::Create(GrContext* context, float sigma, const SkRRe
         smallRRect.setRectXY(smallRect, SkIntToScalar(cornerRadius), SkIntToScalar(cornerRadius));
 
         SkPath path;
-        path.addRRect( smallRRect );
+        path.addRRect(smallRRect);
 
-        SkDraw::DrawToMask(path, &mask.fBounds, NULL, NULL, &mask, SkMask::kJustRenderImage_CreateMode, SkPaint::kFill_Style);
+        SkDraw::DrawToMask(path, &mask.fBounds, nullptr, nullptr, &mask,
+                           SkMask::kJustRenderImage_CreateMode, SkPaint::kFill_Style);
 
-        SkMask blurred_mask;
-        SkBlurMask::BoxBlur(&blurred_mask, mask, sigma, kNormal_SkBlurStyle, kHigh_SkBlurQuality, NULL, true );
+        SkMask blurredMask;
+        SkBlurMask::BoxBlur(&blurredMask, mask, sigma, kNormal_SkBlurStyle, kHigh_SkBlurQuality,
+                            nullptr, true);
 
-        blurNinePatchTexture = context->createTexture(&params, texDesc, blurRRectNinePatchID, blurred_mask.fImage, 0);
-        SkMask::FreeImage(blurred_mask.fImage);
+        unsigned int texSide = smallRectSide + 2*blurRadius;
+        GrSurfaceDesc texDesc;
+        texDesc.fWidth = texSide;
+        texDesc.fHeight = texSide;
+        texDesc.fConfig = kAlpha_8_GrPixelConfig;
+
+        blurNinePatchTexture.reset(
+            texProvider->createTexture(texDesc, true, blurredMask.fImage, 0));
+        SkMask::FreeImage(blurredMask.fImage);
+        if (!blurNinePatchTexture) {
+            return nullptr;
+        }
+        texProvider->assignUniqueKeyToTexture(key, blurNinePatchTexture);
     }
-
-    SkAutoTUnref<GrTexture> blurunref(blurNinePatchTexture);
-    if (NULL == blurNinePatchTexture) {
-        return NULL;
-    }
-
-    return SkNEW_ARGS(GrRRectBlurEffect, (sigma, rrect, blurNinePatchTexture));
+    return new GrRRectBlurEffect(sigma, rrect, blurNinePatchTexture);
 }
 
-void GrRRectBlurEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
-    *validFlags = 0;
-}
-
-const GrBackendEffectFactory& GrRRectBlurEffect::getFactory() const {
-    return GrTBackendEffectFactory<GrRRectBlurEffect>::getInstance();
+void GrRRectBlurEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const {
+    inout->mulByUnknownSingleComponent();
 }
 
 GrRRectBlurEffect::GrRRectBlurEffect(float sigma, const SkRRect& rrect, GrTexture *ninePatchTexture)
     : fRRect(rrect),
       fSigma(sigma),
       fNinePatchAccess(ninePatchTexture) {
+    this->initClassID<GrRRectBlurEffect>();
     this->addTextureAccess(&fNinePatchAccess);
     this->setWillReadFragmentPosition();
 }
 
-bool GrRRectBlurEffect::onIsEqual(const GrEffect& other) const {
-    const GrRRectBlurEffect& rrbe = CastEffect<GrRRectBlurEffect>(other);
+bool GrRRectBlurEffect::onIsEqual(const GrFragmentProcessor& other) const {
+    const GrRRectBlurEffect& rrbe = other.cast<GrRRectBlurEffect>();
     return fRRect.getSimpleRadii().fX == rrbe.fRRect.getSimpleRadii().fX && fSigma == rrbe.fSigma;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-GR_DEFINE_EFFECT_TEST(GrRRectBlurEffect);
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrRRectBlurEffect);
 
-GrEffect* GrRRectBlurEffect::TestCreate(SkRandom* random,
-                                        GrContext* context,
-                                        const GrDrawTargetCaps& caps,
-                                        GrTexture*[]) {
-    SkScalar w = random->nextRangeScalar(100.f, 1000.f);
-    SkScalar h = random->nextRangeScalar(100.f, 1000.f);
-    SkScalar r = random->nextRangeF(1.f, 9.f);
-    SkScalar sigma = random->nextRangeF(1.f,10.f);
+const GrFragmentProcessor* GrRRectBlurEffect::TestCreate(GrProcessorTestData* d) {
+    SkScalar w = d->fRandom->nextRangeScalar(100.f, 1000.f);
+    SkScalar h = d->fRandom->nextRangeScalar(100.f, 1000.f);
+    SkScalar r = d->fRandom->nextRangeF(1.f, 9.f);
+    SkScalar sigma = d->fRandom->nextRangeF(1.f,10.f);
     SkRRect rrect;
     rrect.setRectXY(SkRect::MakeWH(w, h), r, r);
-    return GrRRectBlurEffect::Create(context, sigma, rrect);
+    return GrRRectBlurEffect::Create(d->fContext->textureProvider(), sigma, rrect);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-class GrGLRRectBlurEffect : public GrGLEffect {
+class GrGLRRectBlurEffect : public GrGLSLFragmentProcessor {
 public:
-    GrGLRRectBlurEffect(const GrBackendEffectFactory&, const GrDrawEffect&);
+    GrGLRRectBlurEffect(const GrProcessor&) {}
 
-    virtual void emitCode(GrGLShaderBuilder* builder,
-                          const GrDrawEffect& drawEffect,
-                          const GrEffectKey& key,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    virtual void emitCode(EmitArgs&) override;
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
 
 private:
-    GrGLUniformManager::UniformHandle   fProxyRectUniform;
-    GrGLUniformManager::UniformHandle   fCornerRadiusUniform;
-    GrGLUniformManager::UniformHandle   fBlurRadiusUniform;
-    typedef GrGLEffect INHERITED;
+    GrGLSLProgramDataManager::UniformHandle fProxyRectUniform;
+    GrGLSLProgramDataManager::UniformHandle fCornerRadiusUniform;
+    GrGLSLProgramDataManager::UniformHandle fBlurRadiusUniform;
+    typedef GrGLSLFragmentProcessor INHERITED;
 };
 
-GrGLRRectBlurEffect::GrGLRRectBlurEffect(const GrBackendEffectFactory& factory,
-                             const GrDrawEffect& drawEffect)
-    : INHERITED (factory) {
-}
-
-void GrGLRRectBlurEffect::emitCode(GrGLShaderBuilder* builder,
-                             const GrDrawEffect& drawEffect,
-                             const GrEffectKey& key,
-                             const char* outputColor,
-                             const char* inputColor,
-                             const TransformedCoordsArray&,
-                             const TextureSamplerArray& samplers) {
+void GrGLRRectBlurEffect::emitCode(EmitArgs& args) {
     const char *rectName;
     const char *cornerRadiusName;
     const char *blurRadiusName;
@@ -995,70 +1066,90 @@ void GrGLRRectBlurEffect::emitCode(GrGLShaderBuilder* builder,
     // The proxy rect has left, top, right, and bottom edges correspond to
     // components x, y, z, and w, respectively.
 
-    fProxyRectUniform = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                            kVec4f_GrSLType,
-                                            "proxyRect",
-                                            &rectName);
-    fCornerRadiusUniform = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                                 kFloat_GrSLType,
-                                                 "cornerRadius",
-                                                 &cornerRadiusName);
-    fBlurRadiusUniform = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                                 kFloat_GrSLType,
-                                                 "blurRadius",
-                                                 &blurRadiusName);
-    const char* fragmentPos = builder->fragmentPosition();
+    fProxyRectUniform = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                                  kVec4f_GrSLType,
+                                                  kDefault_GrSLPrecision,
+                                                  "proxyRect",
+                                                  &rectName);
+    fCornerRadiusUniform = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                                     kFloat_GrSLType,
+                                                     kDefault_GrSLPrecision,
+                                                     "cornerRadius",
+                                                     &cornerRadiusName);
+    fBlurRadiusUniform = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                                   kFloat_GrSLType,
+                                                   kDefault_GrSLPrecision,
+                                                   "blurRadius",
+                                                   &blurRadiusName);
+
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    const char* fragmentPos = fragBuilder->fragmentPosition();
 
     // warp the fragment position to the appropriate part of the 9patch blur texture
 
-    builder->fsCodeAppendf("\t\tvec2 rectCenter = (%s.xy + %s.zw)/2.0;\n", rectName, rectName);
-    builder->fsCodeAppendf("\t\tvec2 translatedFragPos = %s.xy - %s.xy;\n", fragmentPos, rectName);
-    builder->fsCodeAppendf("\t\tfloat threshold = %s + 2.0*%s;\n", cornerRadiusName, blurRadiusName );
-    builder->fsCodeAppendf("\t\tvec2 middle = %s.zw - %s.xy - 2.0*threshold;\n", rectName, rectName );
+    fragBuilder->codeAppendf("vec2 rectCenter = (%s.xy + %s.zw)/2.0;", rectName, rectName);
+    fragBuilder->codeAppendf("vec2 translatedFragPos = %s.xy - %s.xy;", fragmentPos, rectName);
+    fragBuilder->codeAppendf("float threshold = %s + 2.0*%s;", cornerRadiusName, blurRadiusName);
+    fragBuilder->codeAppendf("vec2 middle = %s.zw - %s.xy - 2.0*threshold;", rectName, rectName);
 
-    builder->fsCodeAppendf("\t\tif (translatedFragPos.x >= threshold && translatedFragPos.x < (middle.x+threshold)) {\n" );
-    builder->fsCodeAppendf("\t\t\ttranslatedFragPos.x = threshold;\n");
-    builder->fsCodeAppendf("\t\t} else if (translatedFragPos.x >= (middle.x + threshold)) {\n");
-    builder->fsCodeAppendf("\t\t\ttranslatedFragPos.x -= middle.x - 1.0;\n");
-    builder->fsCodeAppendf("\t\t}\n");
+    fragBuilder->codeAppendf(
+           "if (translatedFragPos.x >= threshold && translatedFragPos.x < (middle.x+threshold)) {");
+    fragBuilder->codeAppendf("translatedFragPos.x = threshold;\n");
+    fragBuilder->codeAppendf("} else if (translatedFragPos.x >= (middle.x + threshold)) {");
+    fragBuilder->codeAppendf("translatedFragPos.x -= middle.x - 1.0;");
+    fragBuilder->codeAppendf("}");
 
-    builder->fsCodeAppendf("\t\tif (translatedFragPos.y > threshold && translatedFragPos.y < (middle.y+threshold)) {\n" );
-    builder->fsCodeAppendf("\t\t\ttranslatedFragPos.y = threshold;\n");
-    builder->fsCodeAppendf("\t\t} else if (translatedFragPos.y >= (middle.y + threshold)) {\n");
-    builder->fsCodeAppendf("\t\t\ttranslatedFragPos.y -= middle.y - 1.0;\n");
-    builder->fsCodeAppendf("\t\t}\n");
+    fragBuilder->codeAppendf(
+            "if (translatedFragPos.y > threshold && translatedFragPos.y < (middle.y+threshold)) {");
+    fragBuilder->codeAppendf("translatedFragPos.y = threshold;");
+    fragBuilder->codeAppendf("} else if (translatedFragPos.y >= (middle.y + threshold)) {");
+    fragBuilder->codeAppendf("translatedFragPos.y -= middle.y - 1.0;");
+    fragBuilder->codeAppendf("}");
 
-    builder->fsCodeAppendf("\t\tvec2 proxyDims = vec2(2.0*threshold+1.0);\n");
-    builder->fsCodeAppendf("\t\tvec2 texCoord = translatedFragPos / proxyDims;\n");
+    fragBuilder->codeAppendf("vec2 proxyDims = vec2(2.0*threshold+1.0);");
+    fragBuilder->codeAppendf("vec2 texCoord = translatedFragPos / proxyDims;");
 
-    builder->fsCodeAppendf("\t%s = ", outputColor);
-    builder->fsAppendTextureLookupAndModulate(inputColor, samplers[0], "texCoord");
-    builder->fsCodeAppend(";\n");
+    fragBuilder->codeAppendf("%s = ", args.fOutputColor);
+    fragBuilder->appendTextureLookupAndModulate(args.fInputColor, args.fSamplers[0], "texCoord");
+    fragBuilder->codeAppend(";");
 }
 
-void GrGLRRectBlurEffect::setData(const GrGLUniformManager& uman,
-                                    const GrDrawEffect& drawEffect) {
-    const GrRRectBlurEffect& brre = drawEffect.castEffect<GrRRectBlurEffect>();
+void GrGLRRectBlurEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                                    const GrProcessor& proc) {
+    const GrRRectBlurEffect& brre = proc.cast<GrRRectBlurEffect>();
     SkRRect rrect = brre.getRRect();
 
     float blurRadius = 3.f*SkScalarCeilToScalar(brre.getSigma()-1/6.0f);
-    uman.set1f(fBlurRadiusUniform, blurRadius);
+    pdman.set1f(fBlurRadiusUniform, blurRadius);
 
     SkRect rect = rrect.getBounds();
     rect.outset(blurRadius, blurRadius);
-    uman.set4f(fProxyRectUniform, rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
+    pdman.set4f(fProxyRectUniform, rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
 
     SkScalar radius = 0;
     SkASSERT(rrect.isSimpleCircular() || rrect.isRect());
     radius = rrect.getSimpleRadii().fX;
-    uman.set1f(fCornerRadiusUniform, radius);
+    pdman.set1f(fCornerRadiusUniform, radius);
 }
 
+void GrRRectBlurEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                              GrProcessorKeyBuilder* b) const {
+    GrGLRRectBlurEffect::GenKey(*this, caps, b);
+}
 
-bool SkBlurMaskFilterImpl::directFilterRRectMaskGPU(GrContext* context,
+GrGLSLFragmentProcessor* GrRRectBlurEffect::onCreateGLSLInstance() const {
+    return new GrGLRRectBlurEffect(*this);
+}
+
+bool SkBlurMaskFilterImpl::directFilterRRectMaskGPU(GrTextureProvider* texProvider,
+                                                    GrDrawContext* drawContext,
                                                     GrPaint* grp,
+                                                    const GrClip& clip,
+                                                    const SkMatrix& viewMatrix,
                                                     const SkStrokeRec& strokeRec,
                                                     const SkRRect& rrect) const {
+    SkASSERT(drawContext);
+
     if (fBlurStyle != kNormal_SkBlurStyle) {
         return false;
     }
@@ -1067,30 +1158,30 @@ bool SkBlurMaskFilterImpl::directFilterRRectMaskGPU(GrContext* context,
         return false;
     }
 
-    SkRect proxy_rect = rrect.rect();
-    SkMatrix ctm = context->getMatrix();
-    SkScalar xformedSigma = this->computeXformedSigma(ctm);
+    SkScalar xformedSigma = this->computeXformedSigma(viewMatrix);
     float extra=3.f*SkScalarCeilToScalar(xformedSigma-1/6.0f);
-    proxy_rect.outset(extra, extra);
 
-    SkAutoTUnref<GrEffect> effect(GrRRectBlurEffect::Create(
-            context, xformedSigma, rrect));
-    if (!effect) {
+    SkRect proxyRect = rrect.rect();
+    proxyRect.outset(extra, extra);
+
+    SkAutoTUnref<const GrFragmentProcessor> fp(GrRRectBlurEffect::Create(texProvider, 
+                                                                         xformedSigma, rrect));
+    if (!fp) {
         return false;
     }
 
-    GrContext::AutoMatrix am;
-    if (!am.setIdentity(context, grp)) {
-       return false;
+    grp->addCoverageFragmentProcessor(fp);
+
+    SkMatrix inverse;
+    if (!viewMatrix.invert(&inverse)) {
+        return false;
     }
 
-    grp->addCoverageEffect(effect);
-
-    context->drawRect(*grp, proxy_rect);
+    drawContext->fillRectWithLocalMatrix(clip, *grp, SkMatrix::I(), proxyRect, inverse);
     return true;
 }
 
-bool SkBlurMaskFilterImpl::canFilterMaskGPU(const SkRect& srcBounds,
+bool SkBlurMaskFilterImpl::canFilterMaskGPU(const SkRRect& devRRect,
                                             const SkIRect& clipBounds,
                                             const SkMatrix& ctm,
                                             SkRect* maskRect) const {
@@ -1099,17 +1190,20 @@ bool SkBlurMaskFilterImpl::canFilterMaskGPU(const SkRect& srcBounds,
         return false;
     }
 
-    static const SkScalar kMIN_GPU_BLUR_SIZE  = SkIntToScalar(64);
-    static const SkScalar kMIN_GPU_BLUR_SIGMA = SkIntToScalar(32);
+    // We always do circles on the GPU
+    if (!devRRect.isCircle()) {
+        static const SkScalar kMIN_GPU_BLUR_SIZE  = SkIntToScalar(64);
+        static const SkScalar kMIN_GPU_BLUR_SIGMA = SkIntToScalar(32);
 
-    if (srcBounds.width() <= kMIN_GPU_BLUR_SIZE &&
-        srcBounds.height() <= kMIN_GPU_BLUR_SIZE &&
-        xformedSigma <= kMIN_GPU_BLUR_SIGMA) {
-        // We prefer to blur small rect with small radius via CPU.
-        return false;
+        if (devRRect.width() <= kMIN_GPU_BLUR_SIZE &&
+            devRRect.height() <= kMIN_GPU_BLUR_SIZE &&
+            xformedSigma <= kMIN_GPU_BLUR_SIGMA) {
+            // We prefer to blur small rects with small radii on the CPU.
+            return false;
+        }
     }
 
-    if (NULL == maskRect) {
+    if (nullptr == maskRect) {
         // don't need to compute maskRect
         return true;
     }
@@ -1117,12 +1211,14 @@ bool SkBlurMaskFilterImpl::canFilterMaskGPU(const SkRect& srcBounds,
     float sigma3 = 3 * SkScalarToFloat(xformedSigma);
 
     SkRect clipRect = SkRect::Make(clipBounds);
-    SkRect srcRect(srcBounds);
+    SkRect srcRect(devRRect.rect());
 
     // Outset srcRect and clipRect by 3 * sigma, to compute affected blur area.
     srcRect.outset(sigma3, sigma3);
     clipRect.outset(sigma3, sigma3);
-    srcRect.intersect(clipRect);
+    if (!srcRect.intersect(clipRect)) {
+        srcRect.setEmpty();
+    }
     *maskRect = srcRect;
     return true;
 }
@@ -1136,8 +1232,6 @@ bool SkBlurMaskFilterImpl::filterMaskGPU(GrTexture* src,
 
     GrContext* context = src->getContext();
 
-    GrContext::AutoWideOpenIdentityDraw awo(context, NULL);
-
     SkScalar xformedSigma = this->computeXformedSigma(ctm);
     SkASSERT(xformedSigma > 0);
 
@@ -1145,32 +1239,39 @@ bool SkBlurMaskFilterImpl::filterMaskGPU(GrTexture* src,
     // gaussianBlur.  Otherwise, we need to save it for later compositing.
     bool isNormalBlur = (kNormal_SkBlurStyle == fBlurStyle);
     *result = SkGpuBlurUtils::GaussianBlur(context, src, isNormalBlur && canOverwriteSrc,
-                                           clipRect, false, xformedSigma, xformedSigma);
-    if (NULL == *result) {
+                                           clipRect, nullptr, xformedSigma, xformedSigma,
+                                           GrTextureProvider::kApprox_SizeConstraint);
+    if (nullptr == *result) {
         return false;
     }
 
     if (!isNormalBlur) {
-        context->setIdentityMatrix();
         GrPaint paint;
         SkMatrix matrix;
         matrix.setIDiv(src->width(), src->height());
         // Blend pathTexture over blurTexture.
-        GrContext::AutoRenderTarget art(context, (*result)->asRenderTarget());
-        paint.addColorEffect(GrSimpleTextureEffect::Create(src, matrix))->unref();
+        paint.addCoverageFragmentProcessor(GrSimpleTextureEffect::Create(src, matrix))->unref();
         if (kInner_SkBlurStyle == fBlurStyle) {
             // inner:  dst = dst * src
-            paint.setBlendFunc(kDC_GrBlendCoeff, kZero_GrBlendCoeff);
+            paint.setCoverageSetOpXPFactory(SkRegion::kIntersect_Op);
         } else if (kSolid_SkBlurStyle == fBlurStyle) {
             // solid:  dst = src + dst - src * dst
-            //             = (1 - dst) * src + 1 * dst
-            paint.setBlendFunc(kIDC_GrBlendCoeff, kOne_GrBlendCoeff);
+            //             = src + (1 - src) * dst
+            paint.setCoverageSetOpXPFactory(SkRegion::kUnion_Op);
         } else if (kOuter_SkBlurStyle == fBlurStyle) {
             // outer:  dst = dst * (1 - src)
             //             = 0 * src + (1 - src) * dst
-            paint.setBlendFunc(kZero_GrBlendCoeff, kISC_GrBlendCoeff);
+            paint.setCoverageSetOpXPFactory(SkRegion::kDifference_Op);
+        } else {
+            paint.setCoverageSetOpXPFactory(SkRegion::kReplace_Op);
         }
-        context->drawRect(paint, clipRect);
+
+        SkAutoTUnref<GrDrawContext> drawContext(context->drawContext((*result)->asRenderTarget()));
+        if (!drawContext) {
+            return false;
+        }
+
+        drawContext->drawRect(GrClip::WideOpen(), paint, SkMatrix::I(), clipRect);
     }
 
     return true;
diff --git a/gfx/skia/skia/src/effects/SkColorCubeFilter.cpp b/gfx/skia/skia/src/effects/SkColorCubeFilter.cpp
new file mode 100644
index 000000000000..a6f8e78e6e79
--- /dev/null
+++ b/gfx/skia/skia/src/effects/SkColorCubeFilter.cpp
@@ -0,0 +1,336 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkColorCubeFilter.h"
+#include "SkColorPriv.h"
+#include "SkOnce.h"
+#include "SkOpts.h"
+#include "SkReadBuffer.h"
+#include "SkUnPreMultiply.h"
+#include "SkWriteBuffer.h"
+#if SK_SUPPORT_GPU
+#include "GrContext.h"
+#include "GrCoordTransform.h"
+#include "GrInvariantOutput.h"
+#include "GrTexturePriv.h"
+#include "SkGr.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+namespace {
+
+int32_t SkNextColorCubeUniqueID() {
+    static int32_t gColorCubeUniqueID;
+    // do a loop in case our global wraps around, as we never want to return a 0
+    int32_t genID;
+    do {
+        genID = sk_atomic_inc(&gColorCubeUniqueID) + 1;
+    } while (0 == genID);
+    return genID;
+}
+
+} // end namespace
+
+static const int MIN_CUBE_SIZE = 4;
+static const int MAX_CUBE_SIZE = 64;
+
+static bool is_valid_3D_lut(SkData* cubeData, int cubeDimension) {
+    size_t minMemorySize = sizeof(uint8_t) * 4 * cubeDimension * cubeDimension * cubeDimension;
+    return (cubeDimension >= MIN_CUBE_SIZE) && (cubeDimension <= MAX_CUBE_SIZE) &&
+           (nullptr != cubeData) && (cubeData->size() >= minMemorySize);
+}
+
+SkColorFilter* SkColorCubeFilter::Create(SkData* cubeData, int cubeDimension) {
+    if (!is_valid_3D_lut(cubeData, cubeDimension)) {
+        return nullptr;
+    }
+
+    return new SkColorCubeFilter(cubeData, cubeDimension);
+}
+
+SkColorCubeFilter::SkColorCubeFilter(SkData* cubeData, int cubeDimension)
+  : fCubeData(SkRef(cubeData))
+  , fUniqueID(SkNextColorCubeUniqueID())
+  , fCache(cubeDimension) {
+}
+
+uint32_t SkColorCubeFilter::getFlags() const {
+    return this->INHERITED::getFlags() | kAlphaUnchanged_Flag;
+}
+
+SkColorCubeFilter::ColorCubeProcesingCache::ColorCubeProcesingCache(int cubeDimension)
+  : fCubeDimension(cubeDimension)
+  , fLutsInited(false) {
+    fColorToIndex[0] = fColorToIndex[1] = nullptr;
+    fColorToFactors[0] = fColorToFactors[1] = nullptr;
+    fColorToScalar = nullptr;
+}
+
+void SkColorCubeFilter::ColorCubeProcesingCache::getProcessingLuts(
+    const int* (*colorToIndex)[2], const SkScalar* (*colorToFactors)[2],
+    const SkScalar** colorToScalar) {
+    SkOnce(&fLutsInited, &fLutsMutex,
+           SkColorCubeFilter::ColorCubeProcesingCache::initProcessingLuts, this);
+    SkASSERT((fColorToIndex[0] != nullptr) &&
+             (fColorToIndex[1] != nullptr) &&
+             (fColorToFactors[0] != nullptr) &&
+             (fColorToFactors[1] != nullptr) &&
+             (fColorToScalar != nullptr));
+    (*colorToIndex)[0] = fColorToIndex[0];
+    (*colorToIndex)[1] = fColorToIndex[1];
+    (*colorToFactors)[0] = fColorToFactors[0];
+    (*colorToFactors)[1] = fColorToFactors[1];
+    (*colorToScalar) = fColorToScalar;
+}
+
+void SkColorCubeFilter::ColorCubeProcesingCache::initProcessingLuts(
+    SkColorCubeFilter::ColorCubeProcesingCache* cache) {
+    static const SkScalar inv8bit = SkScalarInvert(SkIntToScalar(255));
+
+    // We need 256 int * 2 for fColorToIndex, so a total of 512 int.
+    // We need 256 SkScalar * 2 for fColorToFactors and 256 SkScalar
+    // for fColorToScalar, so a total of 768 SkScalar.
+    cache->fLutStorage.reset(512 * sizeof(int) + 768 * sizeof(SkScalar));
+    uint8_t* storage = (uint8_t*)cache->fLutStorage.get();
+    cache->fColorToIndex[0] = (int*)storage;
+    cache->fColorToIndex[1] = cache->fColorToIndex[0] + 256;
+    cache->fColorToFactors[0] = (SkScalar*)(storage + (512 * sizeof(int)));
+    cache->fColorToFactors[1] = cache->fColorToFactors[0] + 256;
+    cache->fColorToScalar = cache->fColorToFactors[1] + 256;
+
+    SkScalar size = SkIntToScalar(cache->fCubeDimension);
+    SkScalar scale = (size - SK_Scalar1) * inv8bit;
+
+    for (int i = 0; i < 256; ++i) {
+        SkScalar index = scale * i;
+        cache->fColorToIndex[0][i] = SkScalarFloorToInt(index);
+        cache->fColorToIndex[1][i] = cache->fColorToIndex[0][i] + 1;
+        cache->fColorToScalar[i] = inv8bit * i;
+        if (cache->fColorToIndex[1][i] < cache->fCubeDimension) {
+            cache->fColorToFactors[1][i] = index - SkIntToScalar(cache->fColorToIndex[0][i]);
+            cache->fColorToFactors[0][i] = SK_Scalar1 - cache->fColorToFactors[1][i];
+        } else {
+            cache->fColorToIndex[1][i] = cache->fColorToIndex[0][i];
+            cache->fColorToFactors[0][i] = SK_Scalar1;
+            cache->fColorToFactors[1][i] = 0;
+        }
+    }
+}
+
+void SkColorCubeFilter::filterSpan(const SkPMColor src[], int count, SkPMColor dst[]) const {
+    const int* colorToIndex[2];
+    const SkScalar* colorToFactors[2];
+    const SkScalar* colorToScalar;
+    fCache.getProcessingLuts(&colorToIndex, &colorToFactors, &colorToScalar);
+
+    SkOpts::color_cube_filter_span(src, count, dst, colorToIndex,
+                                   colorToFactors, fCache.cubeDimension(),
+                                   (const SkColor*)fCubeData->data());
+}
+
+SkFlattenable* SkColorCubeFilter::CreateProc(SkReadBuffer& buffer) {
+    int cubeDimension = buffer.readInt();
+    SkAutoDataUnref cubeData(buffer.readByteArrayAsData());
+    if (!buffer.validate(is_valid_3D_lut(cubeData, cubeDimension))) {
+        return nullptr;
+    }
+    return Create(cubeData, cubeDimension);
+}
+
+void SkColorCubeFilter::flatten(SkWriteBuffer& buffer) const {
+    this->INHERITED::flatten(buffer);
+    buffer.writeInt(fCache.cubeDimension());
+    buffer.writeDataAsByteArray(fCubeData);
+}
+
+#ifndef SK_IGNORE_TO_STRING
+void SkColorCubeFilter::toString(SkString* str) const {
+    str->append("SkColorCubeFilter ");
+}
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+#if SK_SUPPORT_GPU
+
+class GrColorCubeEffect : public GrFragmentProcessor {
+public:
+    static const GrFragmentProcessor* Create(GrTexture* colorCube) {
+        return (nullptr != colorCube) ? new GrColorCubeEffect(colorCube) : nullptr;
+    }
+
+    virtual ~GrColorCubeEffect();
+
+    const char* name() const override { return "ColorCube"; }
+
+    int colorCubeSize() const { return fColorCubeAccess.getTexture()->width(); }
+
+
+    void onComputeInvariantOutput(GrInvariantOutput*) const override;
+
+    class GLSLProcessor : public GrGLSLFragmentProcessor {
+    public:
+        GLSLProcessor(const GrProcessor&);
+        virtual ~GLSLProcessor();
+
+        virtual void emitCode(EmitArgs&) override;
+
+        static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*);
+
+    protected:
+        void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
+
+    private:
+        GrGLSLProgramDataManager::UniformHandle fColorCubeSizeUni;
+        GrGLSLProgramDataManager::UniformHandle fColorCubeInvSizeUni;
+
+        typedef GrGLSLFragmentProcessor INHERITED;
+    };
+
+private:
+    virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                     GrProcessorKeyBuilder* b) const override;
+
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
+
+    bool onIsEqual(const GrFragmentProcessor&) const override { return true; }
+
+    GrColorCubeEffect(GrTexture* colorCube);
+
+    GrTextureAccess     fColorCubeAccess;
+
+    typedef GrFragmentProcessor INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+GrColorCubeEffect::GrColorCubeEffect(GrTexture* colorCube)
+    : fColorCubeAccess(colorCube, "bgra", GrTextureParams::kBilerp_FilterMode) {
+    this->initClassID<GrColorCubeEffect>();
+    this->addTextureAccess(&fColorCubeAccess);
+}
+
+GrColorCubeEffect::~GrColorCubeEffect() {
+}
+
+void GrColorCubeEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                              GrProcessorKeyBuilder* b) const {
+    GLSLProcessor::GenKey(*this, caps, b);
+}
+
+GrGLSLFragmentProcessor* GrColorCubeEffect::onCreateGLSLInstance() const {
+    return new GLSLProcessor(*this);
+}
+
+void GrColorCubeEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const {
+    inout->setToUnknown(GrInvariantOutput::kWill_ReadInput);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+GrColorCubeEffect::GLSLProcessor::GLSLProcessor(const GrProcessor&) {
+}
+
+GrColorCubeEffect::GLSLProcessor::~GLSLProcessor() {
+}
+
+void GrColorCubeEffect::GLSLProcessor::emitCode(EmitArgs& args) {
+    if (nullptr == args.fInputColor) {
+        args.fInputColor = "vec4(1)";
+    }
+
+    fColorCubeSizeUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                            kFloat_GrSLType, kDefault_GrSLPrecision,
+                                            "Size");
+    const char* colorCubeSizeUni = args.fBuilder->getUniformCStr(fColorCubeSizeUni);
+    fColorCubeInvSizeUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                               kFloat_GrSLType, kDefault_GrSLPrecision,
+                                               "InvSize");
+    const char* colorCubeInvSizeUni = args.fBuilder->getUniformCStr(fColorCubeInvSizeUni);
+
+    const char* nonZeroAlpha = "nonZeroAlpha";
+    const char* unPMColor = "unPMColor";
+    const char* cubeIdx = "cubeIdx";
+    const char* cCoords1 = "cCoords1";
+    const char* cCoords2 = "cCoords2";
+
+    // Note: if implemented using texture3D in OpenGL ES older than OpenGL ES 3.0,
+    //       the shader might need "#extension GL_OES_texture_3D : enable".
+
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+
+    // Unpremultiply color
+    fragBuilder->codeAppendf("\tfloat %s = max(%s.a, 0.00001);\n", nonZeroAlpha, args.fInputColor);
+    fragBuilder->codeAppendf("\tvec4 %s = vec4(%s.rgb / %s, %s);\n",
+                             unPMColor, args.fInputColor, nonZeroAlpha, nonZeroAlpha);
+
+    // Fit input color into the cube.
+    fragBuilder->codeAppendf(
+        "vec3 %s = vec3(%s.rg * vec2((%s - 1.0) * %s) + vec2(0.5 * %s), %s.b * (%s - 1.0));\n",
+        cubeIdx, unPMColor, colorCubeSizeUni, colorCubeInvSizeUni, colorCubeInvSizeUni,
+        unPMColor, colorCubeSizeUni);
+
+    // Compute y coord for for texture fetches.
+    fragBuilder->codeAppendf("vec2 %s = vec2(%s.r, (floor(%s.b) + %s.g) * %s);\n",
+                             cCoords1, cubeIdx, cubeIdx, cubeIdx, colorCubeInvSizeUni);
+    fragBuilder->codeAppendf("vec2 %s = vec2(%s.r, (ceil(%s.b) + %s.g) * %s);\n",
+                             cCoords2, cubeIdx, cubeIdx, cubeIdx, colorCubeInvSizeUni);
+
+    // Apply the cube.
+    fragBuilder->codeAppendf("%s = vec4(mix(", args.fOutputColor);
+    fragBuilder->appendTextureLookup(args.fSamplers[0], cCoords1);
+    fragBuilder->codeAppend(".rgb, ");
+    fragBuilder->appendTextureLookup(args.fSamplers[0], cCoords2);
+
+    // Premultiply color by alpha. Note that the input alpha is not modified by this shader.
+    fragBuilder->codeAppendf(".rgb, fract(%s.b)) * vec3(%s), %s.a);\n",
+                             cubeIdx, nonZeroAlpha, args.fInputColor);
+}
+
+void GrColorCubeEffect::GLSLProcessor::onSetData(const GrGLSLProgramDataManager& pdman,
+                                                 const GrProcessor& proc) {
+    const GrColorCubeEffect& colorCube = proc.cast<GrColorCubeEffect>();
+    SkScalar size = SkIntToScalar(colorCube.colorCubeSize());
+    pdman.set1f(fColorCubeSizeUni, SkScalarToFloat(size));
+    pdman.set1f(fColorCubeInvSizeUni, SkScalarToFloat(SkScalarInvert(size)));
+}
+
+void GrColorCubeEffect::GLSLProcessor::GenKey(const GrProcessor& proc,
+                                              const GrGLSLCaps&, GrProcessorKeyBuilder* b) {
+}
+
+const GrFragmentProcessor* SkColorCubeFilter::asFragmentProcessor(GrContext* context) const {
+    static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
+    GrUniqueKey key;
+    GrUniqueKey::Builder builder(&key, kDomain, 2);
+    builder[0] = fUniqueID;
+    builder[1] = fCache.cubeDimension();
+    builder.finish();
+
+    GrSurfaceDesc desc;
+    desc.fWidth = fCache.cubeDimension();
+    desc.fHeight = fCache.cubeDimension() * fCache.cubeDimension();
+    desc.fConfig = kRGBA_8888_GrPixelConfig;
+
+    SkAutoTUnref<GrTexture> textureCube(
+        context->textureProvider()->findAndRefTextureByUniqueKey(key));
+    if (!textureCube) {
+        textureCube.reset(context->textureProvider()->createTexture(
+            desc, true, fCubeData->data(), 0));
+        if (textureCube) {
+            context->textureProvider()->assignUniqueKeyToTexture(key, textureCube);
+        } else {
+            return nullptr;
+        }
+    }
+
+    return GrColorCubeEffect::Create(textureCube);
+}
+#endif
diff --git a/gfx/skia/skia/src/effects/SkColorFilterImageFilter.cpp b/gfx/skia/skia/src/effects/SkColorFilterImageFilter.cpp
old mode 100755
new mode 100644
index 2c3706769fa4..8d394aa17b42
--- a/gfx/skia/skia/src/effects/SkColorFilterImageFilter.cpp
+++ b/gfx/skia/skia/src/effects/SkColorFilterImageFilter.cpp
@@ -12,90 +12,47 @@
 #include "SkDevice.h"
 #include "SkColorFilter.h"
 #include "SkReadBuffer.h"
+#include "SkTableColorFilter.h"
 #include "SkWriteBuffer.h"
 
-namespace {
+SkImageFilter* SkColorFilterImageFilter::Create(SkColorFilter* cf, SkImageFilter* input,
+                                                const CropRect* cropRect) {
+    if (nullptr == cf) {
+        return nullptr;
+    }
 
-void mult_color_matrix(SkScalar a[20], SkScalar b[20], SkScalar out[20]) {
-    for (int j = 0; j < 4; ++j) {
-        for (int i = 0; i < 5; ++i) {
-            out[i+j*5] = 4 == i ? a[4+j*5] : 0;
-            for (int k = 0; k < 4; ++k)
-                out[i+j*5] += SkScalarMul(a[k+j*5], b[i+k*5]);
+    SkColorFilter* inputCF;
+    if (input && input->isColorFilterNode(&inputCF)) {
+        // This is an optimization, as it collapses the hierarchy by just combining the two
+        // colorfilters into a single one, which the new imagefilter will wrap.
+        SkAutoUnref autoUnref(inputCF);
+        SkAutoTUnref<SkColorFilter> newCF(SkColorFilter::CreateComposeFilter(cf, inputCF));
+        if (newCF) {
+            return new SkColorFilterImageFilter(newCF, input->getInput(0), cropRect);
         }
     }
-}
 
-// To detect if we need to apply clamping after applying a matrix, we check if
-// any output component might go outside of [0, 255] for any combination of
-// input components in [0..255].
-// Each output component is an affine transformation of the input component, so
-// the minimum and maximum values are for any combination of minimum or maximum
-// values of input components (i.e. 0 or 255).
-// E.g. if R' = x*R + y*G + z*B + w*A + t
-// Then the maximum value will be for R=255 if x>0 or R=0 if x<0, and the
-// minimum value will be for R=0 if x>0 or R=255 if x<0.
-// Same goes for all components.
-bool component_needs_clamping(SkScalar row[5]) {
-    SkScalar maxValue = row[4] / 255;
-    SkScalar minValue = row[4] / 255;
-    for (int i = 0; i < 4; ++i) {
-        if (row[i] > 0)
-            maxValue += row[i];
-        else
-            minValue += row[i];
-    }
-    return (maxValue > 1) || (minValue < 0);
-}
-
-bool matrix_needs_clamping(SkScalar matrix[20]) {
-    return component_needs_clamping(matrix)
-        || component_needs_clamping(matrix+5)
-        || component_needs_clamping(matrix+10)
-        || component_needs_clamping(matrix+15);
-}
-
-};
-
-SkColorFilterImageFilter* SkColorFilterImageFilter::Create(SkColorFilter* cf,
-        SkImageFilter* input, const CropRect* cropRect) {
-    SkASSERT(cf);
-    SkScalar colorMatrix[20], inputMatrix[20];
-    SkColorFilter* inputColorFilter;
-    if (input && cf->asColorMatrix(colorMatrix)
-              && input->asColorFilter(&inputColorFilter)
-              && (NULL != inputColorFilter)) {
-        SkAutoUnref autoUnref(inputColorFilter);
-        if (inputColorFilter->asColorMatrix(inputMatrix) && !matrix_needs_clamping(inputMatrix)) {
-            SkScalar combinedMatrix[20];
-            mult_color_matrix(colorMatrix, inputMatrix, combinedMatrix);
-            SkAutoTUnref<SkColorFilter> newCF(SkColorMatrixFilter::Create(combinedMatrix));
-            return SkNEW_ARGS(SkColorFilterImageFilter, (newCF, input->getInput(0), cropRect));
-        }
-    }
-    return SkNEW_ARGS(SkColorFilterImageFilter, (cf, input, cropRect));
+    return new SkColorFilterImageFilter(cf, input, cropRect);
 }
 
 SkColorFilterImageFilter::SkColorFilterImageFilter(SkColorFilter* cf,
         SkImageFilter* input, const CropRect* cropRect)
-    : INHERITED(1, &input, cropRect), fColorFilter(cf) {
-    SkASSERT(cf);
-    SkSafeRef(cf);
+    : INHERITED(1, &input, cropRect), fColorFilter(SkRef(cf)) {
 }
 
-SkColorFilterImageFilter::SkColorFilterImageFilter(SkReadBuffer& buffer)
-  : INHERITED(1, buffer) {
-    fColorFilter = buffer.readColorFilter();
+SkFlattenable* SkColorFilterImageFilter::CreateProc(SkReadBuffer& buffer) {
+    SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
+    SkAutoTUnref<SkColorFilter> cf(buffer.readColorFilter());
+    return Create(cf, common.getInput(0), &common.cropRect());
 }
 
 void SkColorFilterImageFilter::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
-
     buffer.writeFlattenable(fColorFilter);
 }
 
 SkColorFilterImageFilter::~SkColorFilterImageFilter() {
-    SkSafeUnref(fColorFilter);
+    fColorFilter->unref();
 }
 
 bool SkColorFilterImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& source,
@@ -104,7 +61,7 @@ bool SkColorFilterImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& sourc
                                              SkIPoint* offset) const {
     SkBitmap src = source;
     SkIPoint srcOffset = SkIPoint::Make(0, 0);
-    if (getInput(0) && !getInput(0)->filterImage(proxy, source, ctx, &src, &srcOffset)) {
+    if (!this->filterInput(0, proxy, source, ctx, &src, &srcOffset)) {
         return false;
     }
 
@@ -114,7 +71,7 @@ bool SkColorFilterImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& sourc
     }
 
     SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(), bounds.height()));
-    if (NULL == device.get()) {
+    if (nullptr == device.get()) {
         return false;
     }
     SkCanvas canvas(device.get());
@@ -122,7 +79,8 @@ bool SkColorFilterImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& sourc
 
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
     paint.setColorFilter(fColorFilter);
-    canvas.drawSprite(src, srcOffset.fX - bounds.fLeft, srcOffset.fY - bounds.fTop, &paint);
+    canvas.drawBitmap(src, SkIntToScalar(srcOffset.fX - bounds.fLeft),
+                           SkIntToScalar(srcOffset.fY - bounds.fTop), &paint);
 
     *result = device.get()->accessBitmap(false);
     offset->fX = bounds.fLeft;
@@ -130,13 +88,34 @@ bool SkColorFilterImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& sourc
     return true;
 }
 
-bool SkColorFilterImageFilter::asColorFilter(SkColorFilter** filter) const {
-    if (!cropRectIsSet()) {
+bool SkColorFilterImageFilter::onIsColorFilterNode(SkColorFilter** filter) const {
+    SkASSERT(1 == this->countInputs());
+    if (!this->cropRectIsSet()) {
         if (filter) {
-            *filter = fColorFilter;
-            fColorFilter->ref();
+            *filter = SkRef(fColorFilter);
         }
         return true;
     }
     return false;
 }
+
+bool SkColorFilterImageFilter::affectsTransparentBlack() const {
+    return fColorFilter->affectsTransparentBlack();
+}
+
+#ifndef SK_IGNORE_TO_STRING
+void SkColorFilterImageFilter::toString(SkString* str) const {
+    str->appendf("SkColorFilterImageFilter: (");
+
+    str->appendf("input: (");
+
+    if (this->getInput(0)) {
+        this->getInput(0)->toString(str);
+    }
+
+    str->appendf(") color filter: ");
+    fColorFilter->toString(str);
+
+    str->append(")");
+}
+#endif
diff --git a/gfx/skia/skia/src/effects/SkColorFilters.cpp b/gfx/skia/skia/src/effects/SkColorFilters.cpp
index 43df21555b00..4515c0d3fefa 100644
--- a/gfx/skia/skia/src/effects/SkColorFilters.cpp
+++ b/gfx/skia/skia/src/effects/SkColorFilters.cpp
@@ -8,6 +8,7 @@
 #include "SkBlitRow.h"
 #include "SkColorFilter.h"
 #include "SkColorPriv.h"
+#include "SkModeColorFilter.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkUtils.h"
@@ -15,405 +16,85 @@
 #include "SkValidationUtils.h"
 #include "SkColorMatrixFilter.h"
 
-#define ILLEGAL_XFERMODE_MODE   ((SkXfermode::Mode)-1)
-
-// baseclass for filters that store a color and mode
-class SkModeColorFilter : public SkColorFilter {
-public:
-    SkModeColorFilter(SkColor color) {
-        fColor = color;
-        fMode = ILLEGAL_XFERMODE_MODE;
-        this->updateCache();
+bool SkModeColorFilter::asColorMode(SkColor* color, SkXfermode::Mode* mode) const {
+    if (color) {
+        *color = fColor;
     }
-
-    SkModeColorFilter(SkColor color, SkXfermode::Mode mode) {
-        fColor = color;
-        fMode = mode;
-        this->updateCache();
-    };
-
-    SkColor getColor() const { return fColor; }
-    SkXfermode::Mode getMode() const { return fMode; }
-    bool isModeValid() const { return ILLEGAL_XFERMODE_MODE != fMode; }
-    SkPMColor getPMColor() const { return fPMColor; }
-
-    virtual bool asColorMode(SkColor* color, SkXfermode::Mode* mode) const SK_OVERRIDE {
-        if (ILLEGAL_XFERMODE_MODE == fMode) {
-            return false;
-        }
-
-        if (color) {
-            *color = fColor;
-        }
-        if (mode) {
-            *mode = fMode;
-        }
-        return true;
+    if (mode) {
+        *mode = fMode;
     }
+    return true;
+}
 
-    virtual uint32_t getFlags() const SK_OVERRIDE {
-        return fProc16 ? (kAlphaUnchanged_Flag | kHasFilter16_Flag) : 0;
+uint32_t SkModeColorFilter::getFlags() const {
+    switch (fMode) {
+        case SkXfermode::kDst_Mode:      //!< [Da, Dc]
+        case SkXfermode::kSrcATop_Mode:  //!< [Da, Sc * Da + (1 - Sa) * Dc]
+            return kAlphaUnchanged_Flag;
+        default:
+            break;
     }
+    return 0;
+}
 
-    virtual void filterSpan(const SkPMColor shader[], int count,
-                            SkPMColor result[]) const SK_OVERRIDE {
-        SkPMColor       color = fPMColor;
-        SkXfermodeProc  proc = fProc;
+void SkModeColorFilter::filterSpan(const SkPMColor shader[], int count, SkPMColor result[]) const {
+    SkPMColor       color = fPMColor;
+    SkXfermodeProc  proc = fProc;
 
-        for (int i = 0; i < count; i++) {
-            result[i] = proc(color, shader[i]);
-        }
+    for (int i = 0; i < count; i++) {
+        result[i] = proc(color, shader[i]);
     }
+}
 
-    virtual void filterSpan16(const uint16_t shader[], int count,
-                              uint16_t result[]) const SK_OVERRIDE {
-        SkASSERT(this->getFlags() & kHasFilter16_Flag);
+void SkModeColorFilter::flatten(SkWriteBuffer& buffer) const {
+    buffer.writeColor(fColor);
+    buffer.writeUInt(fMode);
+}
 
-        SkPMColor        color = fPMColor;
-        SkXfermodeProc16 proc16 = fProc16;
+void SkModeColorFilter::updateCache() {
+    fPMColor = SkPreMultiplyColor(fColor);
+    fProc = SkXfermode::GetProc(fMode);
+}
 
-        for (int i = 0; i < count; i++) {
-            result[i] = proc16(color, shader[i]);
-        }
-    }
-
-#ifndef SK_IGNORE_TO_STRING
-    virtual void toString(SkString* str) const SK_OVERRIDE {
-        str->append("SkModeColorFilter: color: 0x");
-        str->appendHex(fColor);
-        str->append(" mode: ");
-        str->append(SkXfermode::ModeName(fMode));
-    }
-#endif
-
-#if SK_SUPPORT_GPU
-    virtual GrEffect* asNewEffect(GrContext*) const SK_OVERRIDE;
-#endif
-    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkModeColorFilter)
-
-protected:
-    virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE {
-        this->INHERITED::flatten(buffer);
-        buffer.writeColor(fColor);
-        buffer.writeUInt(fMode);
-    }
-
-    SkModeColorFilter(SkReadBuffer& buffer) {
-        fColor = buffer.readColor();
-        fMode = (SkXfermode::Mode)buffer.readUInt();
-        if (buffer.isValid()) {
-            this->updateCache();
-            buffer.validate(SkIsValidMode(fMode));
-        }
-    }
-
-private:
-    SkColor             fColor;
-    SkXfermode::Mode    fMode;
-    // cache
-    SkPMColor           fPMColor;
-    SkXfermodeProc      fProc;
-    SkXfermodeProc16    fProc16;
-
-    void updateCache() {
-        fPMColor = SkPreMultiplyColor(fColor);
-        fProc = SkXfermode::GetProc(fMode);
-        fProc16 = SkXfermode::GetProc16(fMode, fColor);
-    }
-
-    typedef SkColorFilter INHERITED;
-};
+SkFlattenable* SkModeColorFilter::CreateProc(SkReadBuffer& buffer) {
+    SkColor color = buffer.readColor();
+    SkXfermode::Mode mode = (SkXfermode::Mode)buffer.readUInt();
+    return SkColorFilter::CreateModeFilter(color, mode);
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 #if SK_SUPPORT_GPU
 #include "GrBlend.h"
-#include "GrEffect.h"
-#include "GrEffectUnitTest.h"
-#include "GrTBackendEffectFactory.h"
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
+#include "GrInvariantOutput.h"
+#include "effects/GrXfermodeFragmentProcessor.h"
+#include "effects/GrConstColorProcessor.h"
 #include "SkGr.h"
 
-namespace {
-/**
- * A definition of blend equation for one coefficient. Generates a
- * blend_coeff * value "expression".
- */
-template<typename ColorExpr>
-static inline ColorExpr blend_term(SkXfermode::Coeff coeff,
-                                   const ColorExpr& src,
-                                   const ColorExpr& dst,
-                                   const ColorExpr& value) {
-    switch (coeff) {
-    default:
-        SkFAIL("Unexpected xfer coeff.");
-    case SkXfermode::kZero_Coeff:    /** 0 */
-        return ColorExpr(0);
-    case SkXfermode::kOne_Coeff:     /** 1 */
-        return value;
-    case SkXfermode::kSC_Coeff:
-        return src * value;
-    case SkXfermode::kISC_Coeff:
-        return (ColorExpr(1) - src) * dst;
-    case SkXfermode::kDC_Coeff:
-        return dst * value;
-    case SkXfermode::kIDC_Coeff:
-        return (ColorExpr(1) - dst) * value;
-    case SkXfermode::kSA_Coeff:      /** src alpha */
-        return src.a() * value;
-    case SkXfermode::kISA_Coeff:     /** inverse src alpha (i.e. 1 - sa) */
-        return (typename ColorExpr::AExpr(1) - src.a()) * value;
-    case SkXfermode::kDA_Coeff:      /** dst alpha */
-        return dst.a() * value;
-    case SkXfermode::kIDA_Coeff:     /** inverse dst alpha (i.e. 1 - da) */
-        return (typename ColorExpr::AExpr(1) - dst.a()) *  value;
-    }
-}
-/**
- * Creates a color filter expression which modifies the color by
- * the specified color filter.
- */
-template <typename ColorExpr>
-static inline ColorExpr color_filter_expression(const SkXfermode::Mode& mode,
-                                                const ColorExpr& filterColor,
-                                                const ColorExpr& inColor) {
-    SkXfermode::Coeff colorCoeff;
-    SkXfermode::Coeff filterColorCoeff;
-    SkAssertResult(SkXfermode::ModeAsCoeff(mode, &filterColorCoeff, &colorCoeff));
-    return blend_term(colorCoeff, filterColor, inColor, inColor) +
-        blend_term(filterColorCoeff, filterColor, inColor, filterColor);
-}
-
-}
-
-class ModeColorFilterEffect : public GrEffect {
-public:
-    static GrEffect* Create(const GrColor& c, SkXfermode::Mode mode) {
-        // TODO: Make the effect take the coeffs rather than mode since we already do the
-        // conversion here.
-        SkXfermode::Coeff srcCoeff, dstCoeff;
-        if (!SkXfermode::ModeAsCoeff(mode, &srcCoeff, &dstCoeff)) {
-            SkDebugf("Failing to create color filter for mode %d\n", mode);
-            return NULL;
-        }
-        return SkNEW_ARGS(ModeColorFilterEffect, (c, mode));
+const GrFragmentProcessor* SkModeColorFilter::asFragmentProcessor(GrContext*) const {
+    if (SkXfermode::kDst_Mode == fMode) {
+        return nullptr;
     }
 
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
-
-    bool willUseFilterColor() const {
-        SkXfermode::Coeff dstCoeff;
-        SkXfermode::Coeff srcCoeff;
-        SkAssertResult(SkXfermode::ModeAsCoeff(fMode, &srcCoeff, &dstCoeff));
-        if (SkXfermode::kZero_Coeff == srcCoeff) {
-            return GrBlendCoeffRefsSrc(sk_blend_to_grblend(dstCoeff));
-        }
-        return true;
+    SkAutoTUnref<const GrFragmentProcessor> constFP(
+        GrConstColorProcessor::Create(SkColorToPremulGrColor(fColor),
+                                        GrConstColorProcessor::kIgnore_InputMode));
+    const GrFragmentProcessor* fp =
+        GrXfermodeFragmentProcessor::CreateFromSrcProcessor(constFP, fMode);
+    if (!fp) {
+        return nullptr;
     }
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE {
-        return GrTBackendEffectFactory<ModeColorFilterEffect>::getInstance();
+#ifdef SK_DEBUG
+    // With a solid color input this should always be able to compute the blended color
+    // (at least for coeff modes)
+    if (fMode <= SkXfermode::kLastCoeffMode) {
+        static SkRandom gRand;
+        GrInvariantOutput io(GrPremulColor(gRand.nextU()), kRGBA_GrColorComponentFlags,
+                                false);
+        fp->computeInvariantOutput(&io);
+        SkASSERT(io.validFlags() == kRGBA_GrColorComponentFlags);
     }
-
-    static const char* Name() { return "ModeColorFilterEffect"; }
-
-    SkXfermode::Mode mode() const { return fMode; }
-    GrColor color() const { return fColor; }
-
-    class GLEffect : public GrGLEffect {
-    public:
-        GLEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&)
-            : INHERITED(factory) {
-        }
-
-        virtual void emitCode(GrGLShaderBuilder* builder,
-                              const GrDrawEffect& drawEffect,
-                              const GrEffectKey& key,
-                              const char* outputColor,
-                              const char* inputColor,
-                              const TransformedCoordsArray& coords,
-                              const TextureSamplerArray& samplers) SK_OVERRIDE {
-            SkXfermode::Mode mode = drawEffect.castEffect<ModeColorFilterEffect>().mode();
-
-            SkASSERT(SkXfermode::kDst_Mode != mode);
-            const char* colorFilterColorUniName = NULL;
-            if (drawEffect.castEffect<ModeColorFilterEffect>().willUseFilterColor()) {
-                fFilterColorUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                                      kVec4f_GrSLType, "FilterColor",
-                                                      &colorFilterColorUniName);
-            }
-
-            GrGLSLExpr4 filter =
-                color_filter_expression(mode, GrGLSLExpr4(colorFilterColorUniName), GrGLSLExpr4(inputColor));
-
-            builder->fsCodeAppendf("\t%s = %s;\n", outputColor, filter.c_str());
-        }
-
-        static void GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
-                           GrEffectKeyBuilder* b) {
-            const ModeColorFilterEffect& colorModeFilter = drawEffect.castEffect<ModeColorFilterEffect>();
-            // The SL code does not depend on filter color at the moment, so no need to represent it
-            // in the key.
-            b->add32(colorModeFilter.mode());
-        }
-
-        virtual void setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) SK_OVERRIDE {
-            if (fFilterColorUni.isValid()) {
-                const ModeColorFilterEffect& colorModeFilter = drawEffect.castEffect<ModeColorFilterEffect>();
-                GrGLfloat c[4];
-                GrColorToRGBAFloat(colorModeFilter.color(), c);
-                uman.set4fv(fFilterColorUni, 1, c);
-            }
-        }
-
-    private:
-
-        GrGLUniformManager::UniformHandle fFilterColorUni;
-        typedef GrGLEffect INHERITED;
-    };
-
-    GR_DECLARE_EFFECT_TEST;
-
-private:
-    ModeColorFilterEffect(GrColor color, SkXfermode::Mode mode)
-        : fMode(mode),
-          fColor(color) {
-
-        SkXfermode::Coeff dstCoeff;
-        SkXfermode::Coeff srcCoeff;
-        SkAssertResult(SkXfermode::ModeAsCoeff(fMode, &srcCoeff, &dstCoeff));
-        // These could be calculated from the blend equation with template trickery..
-        if (SkXfermode::kZero_Coeff == dstCoeff && !GrBlendCoeffRefsDst(sk_blend_to_grblend(srcCoeff))) {
-            this->setWillNotUseInputColor();
-        }
-    }
-
-    virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE {
-        const ModeColorFilterEffect& s = CastEffect<ModeColorFilterEffect>(other);
-        return fMode == s.fMode && fColor == s.fColor;
-    }
-
-    SkXfermode::Mode fMode;
-    GrColor fColor;
-
-    typedef GrEffect INHERITED;
-};
-
-namespace {
-
-/** Function color_component_to_int tries to reproduce the GLSL rounding. The spec doesn't specify
- * to which direction the 0.5 goes.
- */
-static inline int color_component_to_int(float value) {
-    return sk_float_round2int(SkTMax(0.f, SkTMin(1.f, value)) * 255.f);
-}
-
-/** MaskedColorExpr is used to evaluate the color and valid color component flags through the
- * blending equation. It has members similar to GrGLSLExpr so that it can be used with the
- * templated helpers above.
- */
-class MaskedColorExpr {
-public:
-    MaskedColorExpr(const float color[], uint32_t flags)
-        : fFlags(flags) {
-        fColor[0] = color[0];
-        fColor[1] = color[1];
-        fColor[2] = color[2];
-        fColor[3] = color[3];
-    }
-
-    MaskedColorExpr(float v, uint32_t flags = kRGBA_GrColorComponentFlags)
-        : fFlags(flags) {
-        fColor[0] = v;
-        fColor[1] = v;
-        fColor[2] = v;
-        fColor[3] = v;
-    }
-
-    MaskedColorExpr operator*(const MaskedColorExpr& other) const {
-        float tmp[4];
-        tmp[0] = fColor[0] * other.fColor[0];
-        tmp[1] = fColor[1] * other.fColor[1];
-        tmp[2] = fColor[2] * other.fColor[2];
-        tmp[3] = fColor[3] * other.fColor[3];
-
-        return MaskedColorExpr(tmp, fFlags & other.fFlags);
-    }
-
-    MaskedColorExpr operator+(const MaskedColorExpr& other) const {
-        float tmp[4];
-        tmp[0] = fColor[0] + other.fColor[0];
-        tmp[1] = fColor[1] + other.fColor[1];
-        tmp[2] = fColor[2] + other.fColor[2];
-        tmp[3] = fColor[3] + other.fColor[3];
-
-        return MaskedColorExpr(tmp, fFlags & other.fFlags);
-    }
-
-    MaskedColorExpr operator-(const MaskedColorExpr& other) const {
-        float tmp[4];
-        tmp[0] = fColor[0] - other.fColor[0];
-        tmp[1] = fColor[1] - other.fColor[1];
-        tmp[2] = fColor[2] - other.fColor[2];
-        tmp[3] = fColor[3] - other.fColor[3];
-
-        return MaskedColorExpr(tmp, fFlags & other.fFlags);
-    }
-
-    MaskedColorExpr a() const {
-        uint32_t flags = (fFlags & kA_GrColorComponentFlag) ? kRGBA_GrColorComponentFlags : 0;
-        return MaskedColorExpr(fColor[3], flags);
-    }
-
-    GrColor getColor() const {
-        return GrColorPackRGBA(color_component_to_int(fColor[0]),
-                               color_component_to_int(fColor[1]),
-                               color_component_to_int(fColor[2]),
-                               color_component_to_int(fColor[3]));
-    }
-
-    uint32_t getValidComponents() const  { return fFlags; }
-
-    typedef MaskedColorExpr AExpr;
-private:
-    float fColor[4];
-    uint32_t fFlags;
-};
-
-}
-
-void ModeColorFilterEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
-    float inputColor[4];
-    GrColorToRGBAFloat(*color, inputColor);
-    float filterColor[4];
-    GrColorToRGBAFloat(fColor, filterColor);
-    MaskedColorExpr result =
-        color_filter_expression(fMode,
-                                MaskedColorExpr(filterColor, kRGBA_GrColorComponentFlags),
-                                MaskedColorExpr(inputColor, *validFlags));
-
-    *color = result.getColor();
-    *validFlags = result.getValidComponents();
-}
-
-GR_DEFINE_EFFECT_TEST(ModeColorFilterEffect);
-GrEffect* ModeColorFilterEffect::TestCreate(SkRandom* rand,
-                                            GrContext*,
-                                            const GrDrawTargetCaps&,
-                                            GrTexture*[]) {
-    SkXfermode::Mode mode = SkXfermode::kDst_Mode;
-    while (SkXfermode::kDst_Mode == mode) {
-        mode = static_cast<SkXfermode::Mode>(rand->nextRangeU(0, SkXfermode::kLastCoeffMode));
-    }
-    GrColor color = rand->nextU();
-    return ModeColorFilterEffect::Create(color, mode);
-}
-
-GrEffect* SkModeColorFilter::asNewEffect(GrContext*) const {
-    if (SkXfermode::kDst_Mode != fMode) {
-        return ModeColorFilterEffect::Create(SkColor2GrColor(fColor), fMode);
-    }
-    return NULL;
+#endif
+    return fp;
 }
 
 #endif
@@ -424,80 +105,33 @@ class Src_SkModeColorFilter : public SkModeColorFilter {
 public:
     Src_SkModeColorFilter(SkColor color) : INHERITED(color, SkXfermode::kSrc_Mode) {}
 
-    virtual uint32_t getFlags() const SK_OVERRIDE {
-        if (SkGetPackedA32(this->getPMColor()) == 0xFF) {
-            return kAlphaUnchanged_Flag | kHasFilter16_Flag;
-        } else {
-            return 0;
-        }
-    }
-
-    virtual void filterSpan(const SkPMColor shader[], int count,
-                            SkPMColor result[]) const SK_OVERRIDE {
+    void filterSpan(const SkPMColor shader[], int count, SkPMColor result[]) const override {
         sk_memset32(result, this->getPMColor(), count);
     }
 
-    virtual void filterSpan16(const uint16_t shader[], int count,
-                              uint16_t result[]) const SK_OVERRIDE {
-        SkASSERT(this->getFlags() & kHasFilter16_Flag);
-        sk_memset16(result, SkPixel32ToPixel16(this->getPMColor()), count);
-    }
-
-    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(Src_SkModeColorFilter)
-
-protected:
-    Src_SkModeColorFilter(SkReadBuffer& buffer)
-        : INHERITED(buffer) {}
-
 private:
     typedef SkModeColorFilter INHERITED;
 };
 
 class SrcOver_SkModeColorFilter : public SkModeColorFilter {
 public:
-    SrcOver_SkModeColorFilter(SkColor color)
-            : INHERITED(color, SkXfermode::kSrcOver_Mode) {
-        fColor32Proc = SkBlitRow::ColorProcFactory();
+    SrcOver_SkModeColorFilter(SkColor color) : INHERITED(color, SkXfermode::kSrcOver_Mode) { }
+
+    void filterSpan(const SkPMColor shader[], int count, SkPMColor result[]) const override {
+        SkBlitRow::Color32(result, shader, count, this->getPMColor());
     }
 
-    virtual uint32_t getFlags() const SK_OVERRIDE {
-        if (SkGetPackedA32(this->getPMColor()) == 0xFF) {
-            return kAlphaUnchanged_Flag | kHasFilter16_Flag;
-        } else {
-            return 0;
-        }
-    }
-
-    virtual void filterSpan(const SkPMColor shader[], int count,
-                            SkPMColor result[]) const SK_OVERRIDE {
-        fColor32Proc(result, shader, count, this->getPMColor());
-    }
-
-    virtual void filterSpan16(const uint16_t shader[], int count,
-                              uint16_t result[]) const SK_OVERRIDE {
-        SkASSERT(this->getFlags() & kHasFilter16_Flag);
-        sk_memset16(result, SkPixel32ToPixel16(this->getPMColor()), count);
-    }
-
-    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SrcOver_SkModeColorFilter)
-
-protected:
-    SrcOver_SkModeColorFilter(SkReadBuffer& buffer)
-        : INHERITED(buffer) {
-            fColor32Proc = SkBlitRow::ColorProcFactory();
-        }
-
 private:
-
-    SkBlitRow::ColorProc fColor32Proc;
-
     typedef SkModeColorFilter INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkColorFilter* SkColorFilter::CreateModeFilter(SkColor color,
-                                               SkXfermode::Mode mode) {
+SkColorFilter* SkColorFilter::CreateModeFilter(SkColor color, SkXfermode::Mode mode) {
+    if (!SkIsValidMode(mode)) {
+        return nullptr;
+    }
+
     unsigned alpha = SkColorGetA(color);
 
     // first collaps some modes if possible
@@ -523,16 +157,16 @@ SkColorFilter* SkColorFilter::CreateModeFilter(SkColor color,
                         SkXfermode::kXor_Mode == mode ||
                         SkXfermode::kDarken_Mode == mode)) ||
             (0xFF == alpha && SkXfermode::kDstIn_Mode == mode)) {
-        return NULL;
+        return nullptr;
     }
 
     switch (mode) {
         case SkXfermode::kSrc_Mode:
-            return SkNEW_ARGS(Src_SkModeColorFilter, (color));
+            return new Src_SkModeColorFilter(color);
         case SkXfermode::kSrcOver_Mode:
-            return SkNEW_ARGS(SrcOver_SkModeColorFilter, (color));
+            return new SrcOver_SkModeColorFilter(color);
         default:
-            return SkNEW_ARGS(SkModeColorFilter, (color, mode));
+            return SkModeColorFilter::Create(color, mode);
     }
 }
 
@@ -560,8 +194,3 @@ SkColorFilter* SkColorFilter::CreateLightingFilter(SkColor mul, SkColor add) {
     return SkColorMatrixFilter::Create(matrix);
 }
 
-SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkColorFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkModeColorFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(Src_SkModeColorFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SrcOver_SkModeColorFilter)
-SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END
diff --git a/gfx/skia/skia/src/effects/SkColorMatrix.cpp b/gfx/skia/skia/src/effects/SkColorMatrix.cpp
index 3842285bf404..d99d51e1de52 100644
--- a/gfx/skia/skia/src/effects/SkColorMatrix.cpp
+++ b/gfx/skia/skia/src/effects/SkColorMatrix.cpp
@@ -6,6 +6,68 @@
  */
 #include "SkColorMatrix.h"
 
+// To detect if we need to apply clamping after applying a matrix, we check if
+// any output component might go outside of [0, 255] for any combination of
+// input components in [0..255].
+// Each output component is an affine transformation of the input component, so
+// the minimum and maximum values are for any combination of minimum or maximum
+// values of input components (i.e. 0 or 255).
+// E.g. if R' = x*R + y*G + z*B + w*A + t
+// Then the maximum value will be for R=255 if x>0 or R=0 if x<0, and the
+// minimum value will be for R=0 if x>0 or R=255 if x<0.
+// Same goes for all components.
+static bool component_needs_clamping(const SkScalar row[5]) {
+    SkScalar maxValue = row[4] / 255;
+    SkScalar minValue = row[4] / 255;
+    for (int i = 0; i < 4; ++i) {
+        if (row[i] > 0)
+            maxValue += row[i];
+        else
+            minValue += row[i];
+    }
+    return (maxValue > 1) || (minValue < 0);
+}
+
+bool SkColorMatrix::NeedsClamping(const SkScalar matrix[20]) {
+    return component_needs_clamping(matrix)
+        || component_needs_clamping(matrix+5)
+        || component_needs_clamping(matrix+10)
+        || component_needs_clamping(matrix+15);
+}
+
+void SkColorMatrix::SetConcat(SkScalar result[20],
+                              const SkScalar outer[20], const SkScalar inner[20]) {
+    SkScalar    tmp[20];
+    SkScalar*   target;
+
+    if (outer == result || inner == result) {
+        target = tmp;   // will memcpy answer when we're done into result
+    } else {
+        target = result;
+    }
+
+    int index = 0;
+    for (int j = 0; j < 20; j += 5) {
+        for (int i = 0; i < 4; i++) {
+            target[index++] =   outer[j + 0] * inner[i + 0] +
+                                outer[j + 1] * inner[i + 5] +
+                                outer[j + 2] * inner[i + 10] +
+                                outer[j + 3] * inner[i + 15];
+        }
+        target[index++] =   outer[j + 0] * inner[4] +
+                            outer[j + 1] * inner[9] +
+                            outer[j + 2] * inner[14] +
+                            outer[j + 3] * inner[19] +
+                            outer[j + 4];
+    }
+
+    if (target != result) {
+        memcpy(result, target, 20 * sizeof(SkScalar));
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
 void SkColorMatrix::setIdentity() {
     memset(fMat, 0, sizeof(fMat));
     fMat[kR_Scale] = fMat[kG_Scale] = fMat[kB_Scale] = fMat[kA_Scale] = 1;
@@ -67,38 +129,8 @@ void SkColorMatrix::postRotate(Axis axis, SkScalar degrees) {
     this->postConcat(tmp);
 }
 
-///////////////////////////////////////////////////////////////////////////////
-
-void SkColorMatrix::setConcat(const SkColorMatrix& matA,
-                              const SkColorMatrix& matB) {
-    SkScalar    tmp[20];
-    SkScalar*   result = fMat;
-
-    if (&matA == this || &matB == this) {
-        result = tmp;
-    }
-
-    const SkScalar* a = matA.fMat;
-    const SkScalar* b = matB.fMat;
-
-    int index = 0;
-    for (int j = 0; j < 20; j += 5) {
-        for (int i = 0; i < 4; i++) {
-            result[index++] =   SkScalarMul(a[j + 0], b[i + 0]) +
-                                SkScalarMul(a[j + 1], b[i + 5]) +
-                                SkScalarMul(a[j + 2], b[i + 10]) +
-                                SkScalarMul(a[j + 3], b[i + 15]);
-        }
-        result[index++] =   SkScalarMul(a[j + 0], b[4]) +
-                            SkScalarMul(a[j + 1], b[9]) +
-                            SkScalarMul(a[j + 2], b[14]) +
-                            SkScalarMul(a[j + 3], b[19]) +
-                            a[j + 4];
-    }
-
-    if (fMat != result) {
-        memcpy(fMat, result, sizeof(fMat));
-    }
+void SkColorMatrix::setConcat(const SkColorMatrix& matA, const SkColorMatrix& matB) {
+    SetConcat(fMat, matA.fMat, matB.fMat);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -160,3 +192,4 @@ void SkColorMatrix::setYUV2RGB() {
     setrow(fMat + 10, 1, kU2B, 0);
     fMat[kA_Scale] = 1;
 }
+
diff --git a/gfx/skia/skia/src/effects/SkColorMatrixFilter.cpp b/gfx/skia/skia/src/effects/SkColorMatrixFilter.cpp
index 31a76ab9cdfe..6e1c8ddb813d 100644
--- a/gfx/skia/skia/src/effects/SkColorMatrixFilter.cpp
+++ b/gfx/skia/skia/src/effects/SkColorMatrixFilter.cpp
@@ -1,18 +1,38 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 #include "SkColorMatrixFilter.h"
 #include "SkColorMatrix.h"
 #include "SkColorPriv.h"
+#include "SkNx.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkUnPreMultiply.h"
 #include "SkString.h"
 
+#define SK_PMORDER_INDEX_A  (SK_A32_SHIFT / 8)
+#define SK_PMORDER_INDEX_R  (SK_R32_SHIFT / 8)
+#define SK_PMORDER_INDEX_G  (SK_G32_SHIFT / 8)
+#define SK_PMORDER_INDEX_B  (SK_B32_SHIFT / 8)
+
+static void transpose_to_pmorder(float dst[20], const float src[20]) {
+    const float* srcR = src + 0;
+    const float* srcG = src + 5;
+    const float* srcB = src + 10;
+    const float* srcA = src + 15;
+
+    for (int i = 0; i < 20; i += 4) {
+        dst[i + SK_PMORDER_INDEX_A] = *srcA++;
+        dst[i + SK_PMORDER_INDEX_R] = *srcR++;
+        dst[i + SK_PMORDER_INDEX_G] = *srcG++;
+        dst[i + SK_PMORDER_INDEX_B] = *srcB++;
+    }
+}
+
 static int32_t rowmul4(const int32_t array[], unsigned r, unsigned g,
                           unsigned b, unsigned a) {
     return array[0] * r + array[1] * g  + array[2] * b + array[3] * a + array[4];
@@ -117,12 +137,11 @@ static void Add16(const SkColorMatrixFilter::State& state,
     result[3] = a;
 }
 
-#define kNO_ALPHA_FLAGS (SkColorFilter::kAlphaUnchanged_Flag |  \
-                         SkColorFilter::kHasFilter16_Flag)
-
 // src is [20] but some compilers won't accept __restrict__ on anything
 // but an raw pointer or reference
 void SkColorMatrixFilter::initState(const SkScalar* SK_RESTRICT src) {
+    transpose_to_pmorder(fTranspose, src);
+
     int32_t* array = fState.fArray;
     SkFixed max = 0;
     for (int i = 0; i < 20; i++) {
@@ -159,7 +178,7 @@ void SkColorMatrixFilter::initState(const SkScalar* SK_RESTRICT src) {
         fProc = shiftIs16 ? General16 : General;
         fFlags = changesAlpha ? 0 : SkColorFilter::kAlphaUnchanged_Flag;
     } else {
-        fFlags = kNO_ALPHA_FLAGS;
+        fFlags = SkColorFilter::kAlphaUnchanged_Flag;
 
         int32_t needsScale = (array[SkColorMatrix::kR_Scale] - one) |
                              (array[SkColorMatrix::kG_Scale] - one) |
@@ -178,7 +197,7 @@ void SkColorMatrixFilter::initState(const SkScalar* SK_RESTRICT src) {
                    array[SkColorMatrix::kB_Trans]) {
             fProc = shiftIs16 ? Add16 : Add;
         } else {
-            fProc = NULL;   // identity
+            fProc = nullptr;   // identity
         }
     }
 
@@ -186,7 +205,7 @@ void SkColorMatrixFilter::initState(const SkScalar* SK_RESTRICT src) {
         analyze the array, so we don't miss the case where the caller has zeros
         which could make us accidentally take the General or Add case.
     */
-    if (NULL != fProc) {
+    if (fProc) {
         int32_t add = 1 << (fState.fShift - 1);
         array[4] += add;
         array[9] += add;
@@ -220,100 +239,130 @@ uint32_t SkColorMatrixFilter::getFlags() const {
     return this->INHERITED::getFlags() | fFlags;
 }
 
-void SkColorMatrixFilter::filterSpan(const SkPMColor src[], int count,
-                                     SkPMColor dst[]) const {
-    Proc proc = fProc;
-    const State& state = fState;
-    int32_t result[4];
+static Sk4f scale_rgb(float scale) {
+    static_assert(SK_A32_SHIFT == 24, "Alpha is lane 3");
+    return Sk4f(scale, scale, scale, 1);
+}
 
-    if (NULL == proc) {
+static Sk4f premul(const Sk4f& x) {
+    return x * scale_rgb(x.kth<SK_A32_SHIFT/8>());
+}
+
+static Sk4f unpremul(const Sk4f& x) {
+    return x * scale_rgb(1 / x.kth<SK_A32_SHIFT/8>());  // TODO: fast/approx invert?
+}
+
+static Sk4f clamp_0_1(const Sk4f& x) {
+    return Sk4f::Max(Sk4f::Min(x, Sk4f(1)), Sk4f(0));
+}
+
+static SkPMColor round(const Sk4f& x) {
+    SkPMColor c;
+    (x * Sk4f(255) + Sk4f(0.5f)).toBytes((uint8_t*)&c);
+    return c;
+}
+
+void SkColorMatrixFilter::filterSpan(const SkPMColor src[], int count, SkPMColor dst[]) const {
+    Proc proc = fProc;
+    if (nullptr == proc) {
         if (src != dst) {
             memcpy(dst, src, count * sizeof(SkPMColor));
         }
         return;
     }
 
-    const SkUnPreMultiply::Scale* table = SkUnPreMultiply::GetScaleTable();
+#ifdef SK_SUPPORT_LEGACY_INT_COLORMATRIX
+    const bool use_floats = false;
+#else
+    const bool use_floats = true;
+#endif
 
-    for (int i = 0; i < count; i++) {
-        SkPMColor c = src[i];
+    if (use_floats) {
+        // c0-c3 are already in [0,1].
+        const Sk4f c0 = Sk4f::Load(fTranspose + 0);
+        const Sk4f c1 = Sk4f::Load(fTranspose + 4);
+        const Sk4f c2 = Sk4f::Load(fTranspose + 8);
+        const Sk4f c3 = Sk4f::Load(fTranspose + 12);
+        // c4 (the translate vector) is in [0, 255].  Bring it back to [0,1].
+        const Sk4f c4 = Sk4f::Load(fTranspose + 16)*Sk4f(1.0f/255);
 
-        unsigned r = SkGetPackedR32(c);
-        unsigned g = SkGetPackedG32(c);
-        unsigned b = SkGetPackedB32(c);
-        unsigned a = SkGetPackedA32(c);
+        // todo: we could cache this in the constructor...
+        SkPMColor matrix_translate_pmcolor = round(premul(clamp_0_1(c4)));
 
-        // need our components to be un-premultiplied
-        if (255 != a) {
-            SkUnPreMultiply::Scale scale = table[a];
-            r = SkUnPreMultiply::ApplyScale(scale, r);
-            g = SkUnPreMultiply::ApplyScale(scale, g);
-            b = SkUnPreMultiply::ApplyScale(scale, b);
+        for (int i = 0; i < count; i++) {
+            const SkPMColor src_c = src[i];
+            if (0 == src_c) {
+                dst[i] = matrix_translate_pmcolor;
+                continue;
+            }
 
-            SkASSERT(r <= 255);
-            SkASSERT(g <= 255);
-            SkASSERT(b <= 255);
+            Sk4f srcf = Sk4f::FromBytes((const uint8_t*)&src_c) * Sk4f(1.0f/255);
+
+            if (0xFF != SkGetPackedA32(src_c)) {
+                srcf = unpremul(srcf);
+            }
+
+            Sk4f r4 = SkNx_dup<SK_R32_SHIFT/8>(srcf);
+            Sk4f g4 = SkNx_dup<SK_G32_SHIFT/8>(srcf);
+            Sk4f b4 = SkNx_dup<SK_B32_SHIFT/8>(srcf);
+            Sk4f a4 = SkNx_dup<SK_A32_SHIFT/8>(srcf);
+
+            // apply matrix
+            Sk4f dst4 = c0 * r4 + c1 * g4 + c2 * b4 + c3 * a4 + c4;
+
+            // clamp, re-premul, and write
+            dst[i] = round(premul(clamp_0_1(dst4)));
         }
+    } else {
+        const State& state = fState;
+        int32_t result[4];
+        const SkUnPreMultiply::Scale* table = SkUnPreMultiply::GetScaleTable();
 
-        proc(state, r, g, b, a, result);
+        for (int i = 0; i < count; i++) {
+            SkPMColor c = src[i];
 
-        r = pin(result[0], SK_R32_MASK);
-        g = pin(result[1], SK_G32_MASK);
-        b = pin(result[2], SK_B32_MASK);
-        a = pin(result[3], SK_A32_MASK);
-        // re-prepremultiply if needed
-        dst[i] = SkPremultiplyARGBInline(a, r, g, b);
-    }
-}
+            unsigned r = SkGetPackedR32(c);
+            unsigned g = SkGetPackedG32(c);
+            unsigned b = SkGetPackedB32(c);
+            unsigned a = SkGetPackedA32(c);
 
-void SkColorMatrixFilter::filterSpan16(const uint16_t src[], int count,
-                                       uint16_t dst[]) const {
-    SkASSERT(fFlags & SkColorFilter::kHasFilter16_Flag);
+            // need our components to be un-premultiplied
+            if (255 != a) {
+                SkUnPreMultiply::Scale scale = table[a];
+                r = SkUnPreMultiply::ApplyScale(scale, r);
+                g = SkUnPreMultiply::ApplyScale(scale, g);
+                b = SkUnPreMultiply::ApplyScale(scale, b);
 
-    Proc   proc = fProc;
-    const State& state = fState;
-    int32_t result[4];
+                SkASSERT(r <= 255);
+                SkASSERT(g <= 255);
+                SkASSERT(b <= 255);
+            }
 
-    if (NULL == proc) {
-        if (src != dst) {
-            memcpy(dst, src, count * sizeof(uint16_t));
+            proc(state, r, g, b, a, result);
+
+            r = pin(result[0], SK_R32_MASK);
+            g = pin(result[1], SK_G32_MASK);
+            b = pin(result[2], SK_B32_MASK);
+            a = pin(result[3], SK_A32_MASK);
+            // re-prepremultiply if needed
+            dst[i] = SkPremultiplyARGBInline(a, r, g, b);
         }
-        return;
-    }
-
-    for (int i = 0; i < count; i++) {
-        uint16_t c = src[i];
-
-        // expand to 8bit components (since our matrix translate is 8bit biased
-        unsigned r = SkPacked16ToR32(c);
-        unsigned g = SkPacked16ToG32(c);
-        unsigned b = SkPacked16ToB32(c);
-
-        proc(state, r, g, b, 0, result);
-
-        r = pin(result[0], SK_R32_MASK);
-        g = pin(result[1], SK_G32_MASK);
-        b = pin(result[2], SK_B32_MASK);
-
-        // now packed it back down to 16bits (hmmm, could dither...)
-        dst[i] = SkPack888ToRGB16(r, g, b);
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkColorMatrixFilter::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
     SkASSERT(sizeof(fMatrix.fMat)/sizeof(SkScalar) == 20);
     buffer.writeScalarArray(fMatrix.fMat, 20);
 }
 
-SkColorMatrixFilter::SkColorMatrixFilter(SkReadBuffer& buffer)
-        : INHERITED(buffer) {
-    SkASSERT(buffer.getArrayCount() == 20);
-    if (buffer.readScalarArray(fMatrix.fMat, 20)) {
-        this->initState(fMatrix.fMat);
+SkFlattenable* SkColorMatrixFilter::CreateProc(SkReadBuffer& buffer) {
+    SkColorMatrix matrix;
+    if (buffer.readScalarArray(matrix.fMat, 20)) {
+        return Create(matrix);
     }
+    return nullptr;
 }
 
 bool SkColorMatrixFilter::asColorMatrix(SkScalar matrix[20]) const {
@@ -323,26 +372,115 @@ bool SkColorMatrixFilter::asColorMatrix(SkScalar matrix[20]) const {
     return true;
 }
 
+SkColorFilter* SkColorMatrixFilter::newComposed(const SkColorFilter* innerFilter) const {
+    SkScalar innerMatrix[20];
+    if (innerFilter->asColorMatrix(innerMatrix) && !SkColorMatrix::NeedsClamping(innerMatrix)) {
+        SkScalar concat[20];
+        SkColorMatrix::SetConcat(concat, fMatrix.fMat, innerMatrix);
+        return SkColorMatrixFilter::Create(concat);
+    }
+    return nullptr;
+}
+
 #if SK_SUPPORT_GPU
-#include "GrEffect.h"
-#include "GrTBackendEffectFactory.h"
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
+#include "GrFragmentProcessor.h"
+#include "GrInvariantOutput.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
 
-class ColorMatrixEffect : public GrEffect {
+class ColorMatrixEffect : public GrFragmentProcessor {
 public:
-    static GrEffect* Create(const SkColorMatrix& matrix) {
-        return SkNEW_ARGS(ColorMatrixEffect, (matrix));
+    static const GrFragmentProcessor* Create(const SkColorMatrix& matrix) {
+        return new ColorMatrixEffect(matrix);
     }
 
-    static const char* Name() { return "Color Matrix"; }
+    const char* name() const override { return "Color Matrix"; }
 
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE {
-        return GrTBackendEffectFactory<ColorMatrixEffect>::getInstance();
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+
+    class GLSLProcessor : public GrGLSLFragmentProcessor {
+    public:
+        // this class always generates the same code.
+        static void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder* b) {}
+
+        GLSLProcessor(const GrProcessor&) {}
+
+        virtual void emitCode(EmitArgs& args) override {
+            fMatrixHandle = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                                kMat44f_GrSLType, kDefault_GrSLPrecision,
+                                                "ColorMatrix");
+            fVectorHandle = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                                kVec4f_GrSLType, kDefault_GrSLPrecision,
+                                                "ColorMatrixVector");
+
+            if (nullptr == args.fInputColor) {
+                // could optimize this case, but we aren't for now.
+                args.fInputColor = "vec4(1)";
+            }
+            GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+            // The max() is to guard against 0 / 0 during unpremul when the incoming color is
+            // transparent black.
+            fragBuilder->codeAppendf("\tfloat nonZeroAlpha = max(%s.a, 0.00001);\n",
+                                     args.fInputColor);
+            fragBuilder->codeAppendf("\t%s = %s * vec4(%s.rgb / nonZeroAlpha, nonZeroAlpha) + %s;\n",
+                                     args.fOutputColor,
+                                     args.fBuilder->getUniformCStr(fMatrixHandle),
+                                     args.fInputColor,
+                                     args.fBuilder->getUniformCStr(fVectorHandle));
+            fragBuilder->codeAppendf("\t%s = clamp(%s, 0.0, 1.0);\n",
+                                     args.fOutputColor, args.fOutputColor);
+            fragBuilder->codeAppendf("\t%s.rgb *= %s.a;\n", args.fOutputColor, args.fOutputColor);
+        }
+
+    protected:
+        virtual void onSetData(const GrGLSLProgramDataManager& uniManager,
+                               const GrProcessor& proc) override {
+            const ColorMatrixEffect& cme = proc.cast<ColorMatrixEffect>();
+            const float* m = cme.fMatrix.fMat;
+            // The GL matrix is transposed from SkColorMatrix.
+            float mt[]  = {
+                m[0], m[5], m[10], m[15],
+                m[1], m[6], m[11], m[16],
+                m[2], m[7], m[12], m[17],
+                m[3], m[8], m[13], m[18],
+            };
+            static const float kScale = 1.0f / 255.0f;
+            float vec[] = {
+                m[4] * kScale, m[9] * kScale, m[14] * kScale, m[19] * kScale,
+            };
+            uniManager.setMatrix4fv(fMatrixHandle, 1, mt);
+            uniManager.set4fv(fVectorHandle, 1, vec);
+        }
+
+    private:
+        GrGLSLProgramDataManager::UniformHandle fMatrixHandle;
+        GrGLSLProgramDataManager::UniformHandle fVectorHandle;
+
+        typedef GrGLSLFragmentProcessor INHERITED;
+    };
+
+private:
+    ColorMatrixEffect(const SkColorMatrix& matrix) : fMatrix(matrix) {
+        this->initClassID<ColorMatrixEffect>();
     }
 
-    virtual void getConstantColorComponents(GrColor* color,
-                                            uint32_t* validFlags) const SK_OVERRIDE {
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override {
+        return new GLSLProcessor(*this);
+    }
+
+    virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                       GrProcessorKeyBuilder* b) const override {
+        GLSLProcessor::GenKey(*this, caps, b);
+    }
+
+    bool onIsEqual(const GrFragmentProcessor& s) const override {
+        const ColorMatrixEffect& cme = s.cast<ColorMatrixEffect>();
+        return cme.fMatrix == fMatrix;
+    }
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override {
         // We only bother to check whether the alpha channel will be constant. If SkColorMatrix had
         // type flags it might be worth checking the other components.
 
@@ -368,119 +506,41 @@ public:
             // If any relevant component of the color to be passed through the matrix is non-const
             // then we can't know the final result.
             if (0 != fMatrix.fMat[kAlphaRowStartIdx + i]) {
-                if (!(*validFlags & kRGBAFlags[i])) {
-                    *validFlags = 0;
+                if (!(inout->validFlags() & kRGBAFlags[i])) {
+                    inout->setToUnknown(GrInvariantOutput::kWill_ReadInput);
                     return;
                 } else {
-                    uint32_t component = (*color >> kShifts[i]) & 0xFF;
+                    uint32_t component = (inout->color() >> kShifts[i]) & 0xFF;
                     outputA += fMatrix.fMat[kAlphaRowStartIdx + i] * component;
                 }
             }
         }
         outputA += fMatrix.fMat[kAlphaRowTranslateIdx];
-        *validFlags = kA_GrColorComponentFlag;
         // We pin the color to [0,1]. This would happen to the *final* color output from the frag
         // shader but currently the effect does not pin its own output. So in the case of over/
         // underflow this may deviate from the actual result. Maybe the effect should pin its
         // result if the matrix could over/underflow for any component?
-        *color = static_cast<uint8_t>(SkScalarPin(outputA, 0, 255)) << GrColor_SHIFT_A;
-    }
-
-    GR_DECLARE_EFFECT_TEST;
-
-    class GLEffect : public GrGLEffect {
-    public:
-        // this class always generates the same code.
-        static void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder* b) {}
-
-        GLEffect(const GrBackendEffectFactory& factory,
-                 const GrDrawEffect&)
-        : INHERITED(factory) {
-        }
-
-        virtual void emitCode(GrGLShaderBuilder* builder,
-                              const GrDrawEffect&,
-                              const GrEffectKey&,
-                              const char* outputColor,
-                              const char* inputColor,
-                              const TransformedCoordsArray&,
-                              const TextureSamplerArray&) SK_OVERRIDE {
-            fMatrixHandle = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                                kMat44f_GrSLType,
-                                                "ColorMatrix");
-            fVectorHandle = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                                kVec4f_GrSLType,
-                                                "ColorMatrixVector");
-
-            if (NULL == inputColor) {
-                // could optimize this case, but we aren't for now.
-                inputColor = "vec4(1)";
-            }
-            // The max() is to guard against 0 / 0 during unpremul when the incoming color is
-            // transparent black.
-            builder->fsCodeAppendf("\tfloat nonZeroAlpha = max(%s.a, 0.00001);\n", inputColor);
-            builder->fsCodeAppendf("\t%s = %s * vec4(%s.rgb / nonZeroAlpha, nonZeroAlpha) + %s;\n",
-                                   outputColor,
-                                   builder->getUniformCStr(fMatrixHandle),
-                                   inputColor,
-                                   builder->getUniformCStr(fVectorHandle));
-            builder->fsCodeAppendf("\t%s = clamp(%s, 0.0, 1.0);\n", outputColor, outputColor);
-            builder->fsCodeAppendf("\t%s.rgb *= %s.a;\n", outputColor, outputColor);
-        }
-
-        virtual void setData(const GrGLUniformManager& uniManager,
-                             const GrDrawEffect& drawEffect) SK_OVERRIDE {
-            const ColorMatrixEffect& cme = drawEffect.castEffect<ColorMatrixEffect>();
-            const float* m = cme.fMatrix.fMat;
-            // The GL matrix is transposed from SkColorMatrix.
-            GrGLfloat mt[]  = {
-                m[0], m[5], m[10], m[15],
-                m[1], m[6], m[11], m[16],
-                m[2], m[7], m[12], m[17],
-                m[3], m[8], m[13], m[18],
-            };
-            static const float kScale = 1.0f / 255.0f;
-            GrGLfloat vec[] = {
-                m[4] * kScale, m[9] * kScale, m[14] * kScale, m[19] * kScale,
-            };
-            uniManager.setMatrix4fv(fMatrixHandle, 1, mt);
-            uniManager.set4fv(fVectorHandle, 1, vec);
-        }
-
-    private:
-        GrGLUniformManager::UniformHandle fMatrixHandle;
-        GrGLUniformManager::UniformHandle fVectorHandle;
-
-        typedef GrGLEffect INHERITED;
-    };
-
-private:
-    ColorMatrixEffect(const SkColorMatrix& matrix) : fMatrix(matrix) {}
-
-    virtual bool onIsEqual(const GrEffect& s) const {
-        const ColorMatrixEffect& cme = CastEffect<ColorMatrixEffect>(s);
-        return cme.fMatrix == fMatrix;
+        inout->setToOther(kA_GrColorComponentFlag,
+                          static_cast<uint8_t>(SkScalarPin(outputA, 0, 255)) << GrColor_SHIFT_A,
+                          GrInvariantOutput::kWill_ReadInput);
     }
 
     SkColorMatrix fMatrix;
 
-    typedef GrEffect INHERITED;
+    typedef GrFragmentProcessor INHERITED;
 };
 
-GR_DEFINE_EFFECT_TEST(ColorMatrixEffect);
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(ColorMatrixEffect);
 
-GrEffect* ColorMatrixEffect::TestCreate(SkRandom* random,
-                                        GrContext*,
-                                        const GrDrawTargetCaps&,
-                                        GrTexture* dummyTextures[2]) {
+const GrFragmentProcessor* ColorMatrixEffect::TestCreate(GrProcessorTestData* d) {
     SkColorMatrix colorMatrix;
     for (size_t i = 0; i < SK_ARRAY_COUNT(colorMatrix.fMat); ++i) {
-        colorMatrix.fMat[i] = random->nextSScalar1();
+        colorMatrix.fMat[i] = d->fRandom->nextSScalar1();
     }
     return ColorMatrixEffect::Create(colorMatrix);
 }
 
-GrEffect* SkColorMatrixFilter::asNewEffect(GrContext*) const {
+const GrFragmentProcessor* SkColorMatrixFilter::asFragmentProcessor(GrContext*) const {
     return ColorMatrixEffect::Create(fMatrix);
 }
 
diff --git a/gfx/skia/skia/src/effects/SkComposeImageFilter.cpp b/gfx/skia/skia/src/effects/SkComposeImageFilter.cpp
index 645d63372a0c..1be03a337084 100644
--- a/gfx/skia/skia/src/effects/SkComposeImageFilter.cpp
+++ b/gfx/skia/skia/src/effects/SkComposeImageFilter.cpp
@@ -13,25 +13,35 @@
 SkComposeImageFilter::~SkComposeImageFilter() {
 }
 
+void SkComposeImageFilter::computeFastBounds(const SkRect& src, SkRect* dst) const {
+    SkImageFilter* outer = getInput(0);
+    SkImageFilter* inner = getInput(1);
+
+    SkRect tmp;
+    inner->computeFastBounds(src, &tmp);
+    outer->computeFastBounds(tmp, dst);
+}
+
 bool SkComposeImageFilter::onFilterImage(Proxy* proxy,
                                          const SkBitmap& src,
                                          const Context& ctx,
                                          SkBitmap* result,
                                          SkIPoint* offset) const {
-    SkImageFilter* outer = getInput(0);
-    SkImageFilter* inner = getInput(1);
+    SkBitmap tmp;
+    SkIPoint innerOffset = SkIPoint::Make(0, 0);
+    SkIPoint outerOffset = SkIPoint::Make(0, 0);
+    if (!this->filterInput(1, proxy, src, ctx, &tmp, &innerOffset))
+        return false;
 
-    if (!outer && !inner) {
+    SkMatrix outerMatrix(ctx.ctm());
+    outerMatrix.postTranslate(SkIntToScalar(-innerOffset.x()), SkIntToScalar(-innerOffset.y()));
+    Context outerContext(outerMatrix, ctx.clipBounds(), ctx.cache(), ctx.sizeConstraint());
+    if (!this->filterInput(0, proxy, tmp, outerContext, result, &outerOffset, false)) {
         return false;
     }
 
-    if (!outer || !inner) {
-        return (outer ? outer : inner)->filterImage(proxy, src, ctx, result, offset);
-    }
-
-    SkBitmap tmp;
-    return inner->filterImage(proxy, src, ctx, &tmp, offset) &&
-           outer->filterImage(proxy, tmp, ctx, result, offset);
+    *offset = innerOffset + outerOffset;
+    return true;
 }
 
 bool SkComposeImageFilter::onFilterBounds(const SkIRect& src,
@@ -40,19 +50,28 @@ bool SkComposeImageFilter::onFilterBounds(const SkIRect& src,
     SkImageFilter* outer = getInput(0);
     SkImageFilter* inner = getInput(1);
 
-    if (!outer && !inner) {
-        return false;
-    }
-
-    if (!outer || !inner) {
-        return (outer ? outer : inner)->filterBounds(src, ctm, dst);
-    }
-
     SkIRect tmp;
-    return inner->filterBounds(src, ctm, &tmp) &&
-           outer->filterBounds(tmp, ctm, dst);
+    return inner->filterBounds(src, ctm, &tmp) && outer->filterBounds(tmp, ctm, dst);
 }
 
-SkComposeImageFilter::SkComposeImageFilter(SkReadBuffer& buffer)
-  : INHERITED(2, buffer) {
+SkFlattenable* SkComposeImageFilter::CreateProc(SkReadBuffer& buffer) {
+    SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 2);
+    return SkComposeImageFilter::Create(common.getInput(0), common.getInput(1));
 }
+
+#ifndef SK_IGNORE_TO_STRING
+void SkComposeImageFilter::toString(SkString* str) const {
+    SkImageFilter* outer = getInput(0);
+    SkImageFilter* inner = getInput(1);
+
+    str->appendf("SkComposeImageFilter: (");
+
+    str->appendf("outer: ");
+    outer->toString(str);
+
+    str->appendf("inner: ");
+    inner->toString(str);
+
+    str->appendf(")");
+}
+#endif
diff --git a/gfx/skia/skia/src/effects/SkCornerPathEffect.cpp b/gfx/skia/skia/src/effects/SkCornerPathEffect.cpp
index 5b61e06df804..4b81f261fe66 100644
--- a/gfx/skia/skia/src/effects/SkCornerPathEffect.cpp
+++ b/gfx/skia/skia/src/effects/SkCornerPathEffect.cpp
@@ -20,13 +20,12 @@ static bool ComputeStep(const SkPoint& a, const SkPoint& b, SkScalar radius,
                         SkPoint* step) {
     SkScalar dist = SkPoint::Distance(a, b);
 
-    step->set(b.fX - a.fX, b.fY - a.fY);
-
+    *step = b - a;
     if (dist <= radius * 2) {
-        step->scale(SK_ScalarHalf);
+        *step *= SK_ScalarHalf;
         return false;
     } else {
-        step->scale(SkScalarDiv(radius, dist));
+        *step *= radius / dist;
         return true;
     }
 }
@@ -47,6 +46,7 @@ bool SkCornerPathEffect::filterPath(SkPath* dst, const SkPath& src,
     bool        prevIsValid = true;
 
     // to avoid warnings
+    step.set(0, 0);
     moveTo.set(0, 0);
     firstStep.set(0, 0);
     lastCorner.set(0, 0);
@@ -94,6 +94,16 @@ bool SkCornerPathEffect::filterPath(SkPath* dst, const SkPath& src,
                 lastCorner = pts[2];
                 firstStep.set(0, 0);
                 break;
+            case SkPath::kConic_Verb:
+                // TBD - just replicate the curve for now
+                if (!prevIsValid) {
+                    dst->moveTo(pts[0]);
+                    prevIsValid = true;
+                }
+                dst->conicTo(pts[1], pts[2], iter.conicWeight());
+                lastCorner = pts[2];
+                firstStep.set(0, 0);
+                break;
             case SkPath::kCubic_Verb:
                 if (!prevIsValid) {
                     dst->moveTo(pts[0]);
@@ -111,11 +121,12 @@ bool SkCornerPathEffect::filterPath(SkPath* dst, const SkPath& src,
                                 lastCorner.fY + firstStep.fY);
                     }
                 dst->close();
-                break;
-            case SkPath::kConic_Verb:
-                SkASSERT(0);
+                prevIsValid = false;
                 break;
             case SkPath::kDone_Verb:
+                if (prevIsValid) {
+                    dst->lineTo(lastCorner);
+                }
                 goto DONE;
         }
 
@@ -128,11 +139,18 @@ DONE:
     return true;
 }
 
+SkFlattenable* SkCornerPathEffect::CreateProc(SkReadBuffer& buffer) {
+    return SkCornerPathEffect::Create(buffer.readScalar());
+}
+
 void SkCornerPathEffect::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
     buffer.writeScalar(fRadius);
 }
 
-SkCornerPathEffect::SkCornerPathEffect(SkReadBuffer& buffer) {
-    fRadius = buffer.readScalar();
+#ifndef SK_IGNORE_TO_STRING
+void SkCornerPathEffect::toString(SkString* str) const {
+    str->appendf("SkCornerPathEffect: (");
+    str->appendf("radius: %.2f", fRadius);
+    str->appendf(")");
 }
+#endif
diff --git a/gfx/skia/skia/src/effects/SkDashPathEffect.cpp b/gfx/skia/skia/src/effects/SkDashPathEffect.cpp
index eb4b3033ede1..6e10e5466d62 100644
--- a/gfx/skia/skia/src/effects/SkDashPathEffect.cpp
+++ b/gfx/skia/skia/src/effects/SkDashPathEffect.cpp
@@ -10,6 +10,7 @@
 #include "SkDashPathPriv.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
+#include "SkStrokeRec.h"
 
 SkDashPathEffect::SkDashPathEffect(const SkScalar intervals[], int count, SkScalar phase)
         : fPhase(0)
@@ -41,6 +42,116 @@ bool SkDashPathEffect::filterPath(SkPath* dst, const SkPath& src,
                                       fInitialDashLength, fInitialDashIndex, fIntervalLength);
 }
 
+static void outset_for_stroke(SkRect* rect, const SkStrokeRec& rec) {
+    SkScalar radius = SkScalarHalf(rec.getWidth());
+    if (0 == radius) {
+        radius = SK_Scalar1;    // hairlines
+    }
+    if (SkPaint::kMiter_Join == rec.getJoin()) {
+        radius = SkScalarMul(radius, rec.getMiter());
+    }
+    rect->outset(radius, radius);
+}
+
+// Attempt to trim the line to minimally cover the cull rect (currently
+// only works for horizontal and vertical lines).
+// Return true if processing should continue; false otherwise.
+static bool cull_line(SkPoint* pts, const SkStrokeRec& rec,
+                      const SkMatrix& ctm, const SkRect* cullRect,
+                      const SkScalar intervalLength) {
+    if (nullptr == cullRect) {
+        SkASSERT(false); // Shouldn't ever occur in practice
+        return false;
+    }
+
+    SkScalar dx = pts[1].x() - pts[0].x();
+    SkScalar dy = pts[1].y() - pts[0].y();
+
+    if ((dx && dy) || (!dx && !dy)) {
+        return false;
+    }
+
+    SkRect bounds = *cullRect;
+    outset_for_stroke(&bounds, rec);
+
+    // cullRect is in device space while pts are in the local coordinate system
+    // defined by the ctm. We want our answer in the local coordinate system.
+
+    SkASSERT(ctm.rectStaysRect());
+    SkMatrix inv;
+    if (!ctm.invert(&inv)) {
+        return false;
+    }
+
+    inv.mapRect(&bounds);
+
+    if (dx) {
+        SkASSERT(dx && !dy);
+        SkScalar minX = pts[0].fX;
+        SkScalar maxX = pts[1].fX;
+
+        if (dx < 0) {
+            SkTSwap(minX, maxX);
+        }
+
+        SkASSERT(minX < maxX);
+        if (maxX <= bounds.fLeft || minX >= bounds.fRight) {
+            return false;
+        }
+
+        // Now we actually perform the chop, removing the excess to the left and
+        // right of the bounds (keeping our new line "in phase" with the dash,
+        // hence the (mod intervalLength).
+
+        if (minX < bounds.fLeft) {
+            minX = bounds.fLeft - SkScalarMod(bounds.fLeft - minX, intervalLength);
+        }
+        if (maxX > bounds.fRight) {
+            maxX = bounds.fRight + SkScalarMod(maxX - bounds.fRight, intervalLength);
+        }
+
+        SkASSERT(maxX > minX);
+        if (dx < 0) {
+            SkTSwap(minX, maxX);
+        }
+        pts[0].fX = minX;
+        pts[1].fX = maxX;
+    } else {
+        SkASSERT(dy && !dx);
+        SkScalar minY = pts[0].fY;
+        SkScalar maxY = pts[1].fY;
+
+        if (dy < 0) {
+            SkTSwap(minY, maxY);
+        }
+
+        SkASSERT(minY < maxY);
+        if (maxY <= bounds.fTop || minY >= bounds.fBottom) {
+            return false;
+        }
+
+        // Now we actually perform the chop, removing the excess to the top and
+        // bottom of the bounds (keeping our new line "in phase" with the dash,
+        // hence the (mod intervalLength).
+
+        if (minY < bounds.fTop) {
+            minY = bounds.fTop - SkScalarMod(bounds.fTop - minY, intervalLength);
+        }
+        if (maxY > bounds.fBottom) {
+            maxY = bounds.fBottom + SkScalarMod(maxY - bounds.fBottom, intervalLength);
+        }
+
+        SkASSERT(maxY > minY);
+        if (dy < 0) {
+            SkTSwap(minY, maxY);
+        }
+        pts[0].fY = minY;
+        pts[1].fY = maxY;
+    }
+
+    return true;
+}
+
 // Currently asPoints is more restrictive then it needs to be. In the future
 // we need to:
 //      allow kRound_Cap capping (could allow rotations in the matrix with this)
@@ -83,7 +194,12 @@ bool SkDashPathEffect::asPoints(PointData* results,
         return false;
     }
 
-    SkScalar        length = SkPoint::Distance(pts[1], pts[0]);
+    // See if the line can be limited to something plausible.
+    if (!cull_line(pts, rec, matrix, cullRect, fIntervalLength)) {
+        return false;
+    }
+
+    SkScalar length = SkPoint::Distance(pts[1], pts[0]);
 
     SkVector tangent = pts[1] - pts[0];
     if (tangent.isZero()) {
@@ -106,7 +222,7 @@ bool SkDashPathEffect::asPoints(PointData* results,
         return false;
     }
 
-    if (NULL != results) {
+    if (results) {
         results->fFlags = 0;
         SkScalar clampedInitialDashLength = SkMinScalar(length, fInitialDashLength);
 
@@ -133,7 +249,7 @@ bool SkDashPathEffect::asPoints(PointData* results,
                 len2 -= clampedInitialDashLength; // skip initial partial empty
             }
         }
-        int numMidPoints = SkScalarFloorToInt(SkScalarDiv(len2, fIntervalLength));
+        int numMidPoints = SkScalarFloorToInt(len2 / fIntervalLength);
         results->fNumPoints += numMidPoints;
         len2 -= numMidPoints * fIntervalLength;
         bool partialLast = false;
@@ -231,7 +347,7 @@ bool SkDashPathEffect::asPoints(PointData* results,
 
 SkPathEffect::DashType SkDashPathEffect::asADash(DashInfo* info) const {
     if (info) {
-        if (info->fCount >= fCount && NULL != info->fIntervals) {
+        if (info->fCount >= fCount && info->fIntervals) {
             memcpy(info->fIntervals, fIntervals, fCount * sizeof(SkScalar));
         }
         info->fCount = fCount;
@@ -240,57 +356,31 @@ SkPathEffect::DashType SkDashPathEffect::asADash(DashInfo* info) const {
     return kDash_DashType;
 }
 
-SkFlattenable::Factory SkDashPathEffect::getFactory() const {
-    return CreateProc;
-}
-
 void SkDashPathEffect::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
     buffer.writeScalar(fPhase);
     buffer.writeScalarArray(fIntervals, fCount);
 }
 
 SkFlattenable* SkDashPathEffect::CreateProc(SkReadBuffer& buffer) {
-    return SkNEW_ARGS(SkDashPathEffect, (buffer));
+    const SkScalar phase = buffer.readScalar();
+    uint32_t count = buffer.getArrayCount();
+    SkAutoSTArray<32, SkScalar> intervals(count);
+    if (buffer.readScalarArray(intervals.get(), count)) {
+        return Create(intervals.get(), SkToInt(count), phase);
+    }
+    return nullptr;
 }
 
-SkDashPathEffect::SkDashPathEffect(SkReadBuffer& buffer)
-        : INHERITED(buffer)
-        , fPhase(0)
-        , fInitialDashLength(0)
-        , fInitialDashIndex(0)
-        , fIntervalLength(0) {
-    bool useOldPic = buffer.isVersionLT(SkReadBuffer::kDashWritesPhaseIntervals_Version);
-    if (useOldPic) {
-        fInitialDashIndex = buffer.readInt();
-        fInitialDashLength = buffer.readScalar();
-        fIntervalLength = buffer.readScalar();
-        buffer.readBool(); // Dummy for old ScalarToFit field
-    } else {
-        fPhase = buffer.readScalar();
-    }
-
-    fCount = buffer.getArrayCount();
-    size_t allocSize = sizeof(SkScalar) * fCount;
-    if (buffer.validateAvailable(allocSize)) {
-        fIntervals = (SkScalar*)sk_malloc_throw(allocSize);
-        buffer.readScalarArray(fIntervals, fCount);
-    } else {
-        fIntervals = NULL;
-    }
-
-    if (useOldPic) {
-        fPhase = 0;
-        if (fInitialDashLength != -1) { // Signal for bad dash interval
-            for (int i = 0; i < fInitialDashIndex; ++i) {
-                fPhase += fIntervals[i];
-            }
-            fPhase += fIntervals[fInitialDashIndex] - fInitialDashLength;
+#ifndef SK_IGNORE_TO_STRING
+void SkDashPathEffect::toString(SkString* str) const {
+    str->appendf("SkDashPathEffect: (");
+    str->appendf("count: %d phase %.2f intervals: (", fCount, fPhase);
+    for (int i = 0; i < fCount; ++i) {
+        str->appendf("%.2f", fIntervals[i]);
+        if (i < fCount-1) {
+            str->appendf(", ");
         }
-    } else {
-        // set the internal data members, fPhase should have been between 0 and intervalLength
-        // when written to buffer so no need to adjust it
-        SkDashPath::CalcDashParameters(fPhase, fIntervals, fCount,
-                &fInitialDashLength, &fInitialDashIndex, &fIntervalLength);
     }
+    str->appendf("))");
 }
+#endif
diff --git a/gfx/skia/skia/src/effects/SkDiscretePathEffect.cpp b/gfx/skia/skia/src/effects/SkDiscretePathEffect.cpp
index f6f911244794..acde041298f2 100644
--- a/gfx/skia/skia/src/effects/SkDiscretePathEffect.cpp
+++ b/gfx/skia/skia/src/effects/SkDiscretePathEffect.cpp
@@ -11,7 +11,7 @@
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkPathMeasure.h"
-#include "SkRandom.h"
+#include "SkStrokeRec.h"
 
 static void Perterb(SkPoint* p, const SkVector& tangent, SkScalar scale) {
     SkVector normal = tangent;
@@ -27,6 +27,48 @@ SkDiscretePathEffect::SkDiscretePathEffect(SkScalar segLength,
 {
 }
 
+/** \class LCGRandom
+
+    Utility class that implements pseudo random 32bit numbers using a fast
+    linear equation. Unlike rand(), this class holds its own seed (initially
+    set to 0), so that multiple instances can be used with no side-effects.
+
+    Copied from the original implementation of SkRandom. Only contains the
+    methods used by SkDiscretePathEffect::filterPath, with methods that were
+    not called directly moved to private.
+*/
+
+class LCGRandom {
+public:
+    LCGRandom(uint32_t seed) : fSeed(seed) {}
+
+    /** Return the next pseudo random number expressed as a SkScalar
+        in the range (-SK_Scalar1..SK_Scalar1).
+    */
+    SkScalar nextSScalar1() { return SkFixedToScalar(this->nextSFixed1()); }
+
+private:
+    /** Return the next pseudo random number as an unsigned 32bit value.
+    */
+    uint32_t nextU() { uint32_t r = fSeed * kMul + kAdd; fSeed = r; return r; }
+
+    /** Return the next pseudo random number as a signed 32bit value.
+     */
+    int32_t nextS() { return (int32_t)this->nextU(); }
+
+    /** Return the next pseudo random number expressed as a signed SkFixed
+     in the range (-SK_Fixed1..SK_Fixed1).
+     */
+    SkFixed nextSFixed1() { return this->nextS() >> 15; }
+
+    //  See "Numerical Recipes in C", 1992 page 284 for these constants
+    enum {
+        kMul = 1664525,
+        kAdd = 1013904223
+    };
+    uint32_t fSeed;
+};
+
 bool SkDiscretePathEffect::filterPath(SkPath* dst, const SkPath& src,
                                       SkStrokeRec* rec, const SkRect*) const {
     bool doFill = rec->isFillStyle();
@@ -36,10 +78,10 @@ bool SkDiscretePathEffect::filterPath(SkPath* dst, const SkPath& src,
     /* Caller may supply their own seed assist, which by default is 0 */
     uint32_t seed = fSeedAssist ^ SkScalarRoundToInt(meas.getLength());
 
-    SkLCGRandom     rand(seed ^ ((seed << 16) | (seed >> 16)));
-    SkScalar        scale = fPerterb;
-    SkPoint         p;
-    SkVector        v;
+    LCGRandom   rand(seed ^ ((seed << 16) | (seed >> 16)));
+    SkScalar    scale = fPerterb;
+    SkPoint     p;
+    SkVector    v;
 
     do {
         SkScalar    length = meas.getLength();
@@ -75,15 +117,23 @@ bool SkDiscretePathEffect::filterPath(SkPath* dst, const SkPath& src,
     return true;
 }
 
+SkFlattenable* SkDiscretePathEffect::CreateProc(SkReadBuffer& buffer) {
+    SkScalar segLength = buffer.readScalar();
+    SkScalar perterb = buffer.readScalar();
+    uint32_t seed = buffer.readUInt();
+    return Create(segLength, perterb, seed);
+}
+
 void SkDiscretePathEffect::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
     buffer.writeScalar(fSegLength);
     buffer.writeScalar(fPerterb);
     buffer.writeUInt(fSeedAssist);
 }
 
-SkDiscretePathEffect::SkDiscretePathEffect(SkReadBuffer& buffer) {
-    fSegLength = buffer.readScalar();
-    fPerterb = buffer.readScalar();
-    fSeedAssist = buffer.readUInt();
+#ifndef SK_IGNORE_TO_STRING
+void SkDiscretePathEffect::toString(SkString* str) const {
+    str->appendf("SkDiscretePathEffect: (");
+    str->appendf("segLength: %.2f deviation: %.2f seed %d", fSegLength, fPerterb, fSeedAssist);
+    str->append(")");
 }
+#endif
diff --git a/gfx/skia/skia/src/effects/SkDisplacementMapEffect.cpp b/gfx/skia/skia/src/effects/SkDisplacementMapEffect.cpp
index 55935b4bdcd9..fe918581c421 100644
--- a/gfx/skia/skia/src/effects/SkDisplacementMapEffect.cpp
+++ b/gfx/skia/skia/src/effects/SkDisplacementMapEffect.cpp
@@ -6,16 +6,21 @@
  */
 
 #include "SkDisplacementMapEffect.h"
+#include "SkDevice.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkUnPreMultiply.h"
 #include "SkColorPriv.h"
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
+#include "GrDrawContext.h"
 #include "GrCoordTransform.h"
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
-#include "GrTBackendEffectFactory.h"
+#include "GrInvariantOutput.h"
+#include "effects/GrTextureDomain.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
 #endif
 
 namespace {
@@ -55,7 +60,7 @@ void computeDisplacement(const SkVector& scale, SkBitmap* dst,
                          SkBitmap* src,
                          const SkIRect& bounds)
 {
-    static const SkScalar Inv8bit = SkScalarDiv(SK_Scalar1, 255.0f);
+    static const SkScalar Inv8bit = SkScalarInvert(255);
     const int srcW = src->width();
     const int srcH = src->height();
     const SkVector scaleForColor = SkVector::Make(SkScalarMul(scale.fX, Inv8bit),
@@ -159,6 +164,21 @@ bool channel_selector_type_is_valid(SkDisplacementMapEffect::ChannelSelectorType
 
 ///////////////////////////////////////////////////////////////////////////////
 
+SkDisplacementMapEffect* SkDisplacementMapEffect::Create(ChannelSelectorType xChannelSelector,
+                                                         ChannelSelectorType yChannelSelector,
+                                                         SkScalar scale,
+                                                         SkImageFilter* displacement,
+                                                         SkImageFilter* color,
+                                                         const CropRect* cropRect) {
+    if (!channel_selector_type_is_valid(xChannelSelector) ||
+        !channel_selector_type_is_valid(yChannelSelector)) {
+        return nullptr;
+    }
+
+    SkImageFilter* inputs[2] = { displacement, color };
+    return new SkDisplacementMapEffect(xChannelSelector, yChannelSelector, scale, inputs, cropRect);
+}
+
 SkDisplacementMapEffect::SkDisplacementMapEffect(ChannelSelectorType xChannelSelector,
                                                  ChannelSelectorType yChannelSelector,
                                                  SkScalar scale,
@@ -174,15 +194,12 @@ SkDisplacementMapEffect::SkDisplacementMapEffect(ChannelSelectorType xChannelSel
 SkDisplacementMapEffect::~SkDisplacementMapEffect() {
 }
 
-SkDisplacementMapEffect::SkDisplacementMapEffect(SkReadBuffer& buffer)
-  : INHERITED(2, buffer)
-{
-    fXChannelSelector = (SkDisplacementMapEffect::ChannelSelectorType) buffer.readInt();
-    fYChannelSelector = (SkDisplacementMapEffect::ChannelSelectorType) buffer.readInt();
-    fScale            = buffer.readScalar();
-    buffer.validate(channel_selector_type_is_valid(fXChannelSelector) &&
-                    channel_selector_type_is_valid(fYChannelSelector) &&
-                    SkScalarIsFinite(fScale));
+SkFlattenable* SkDisplacementMapEffect::CreateProc(SkReadBuffer& buffer) {
+    SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 2);
+    ChannelSelectorType xsel = (ChannelSelectorType)buffer.readInt();
+    ChannelSelectorType ysel = (ChannelSelectorType)buffer.readInt();
+    SkScalar scale = buffer.readScalar();
+    return Create(xsel, ysel, scale, common.getInput(0), common.getInput(1), &common.cropRect());
 }
 
 void SkDisplacementMapEffect::flatten(SkWriteBuffer& buffer) const {
@@ -198,11 +215,9 @@ bool SkDisplacementMapEffect::onFilterImage(Proxy* proxy,
                                             SkBitmap* dst,
                                             SkIPoint* offset) const {
     SkBitmap displ = src, color = src;
-    const SkImageFilter* colorInput = getColorInput();
-    const SkImageFilter* displInput = getDisplacementInput();
     SkIPoint colorOffset = SkIPoint::Make(0, 0), displOffset = SkIPoint::Make(0, 0);
-    if ((colorInput && !colorInput->filterImage(proxy, src, ctx, &color, &colorOffset)) ||
-        (displInput && !displInput->filterImage(proxy, src, ctx, &displ, &displOffset))) {
+    if (!this->filterInput(1, proxy, src, ctx, &color, &colorOffset) ||
+        !this->filterInput(0, proxy, src, ctx, &displ, &displOffset)) {
         return false;
     }
     if ((displ.colorType() != kN32_SkColorType) ||
@@ -227,9 +242,12 @@ bool SkDisplacementMapEffect::onFilterImage(Proxy* proxy,
         return false;
     }
 
-    if (!dst->allocPixels(color.info().makeWH(bounds.width(), bounds.height()))) {
+    SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(), bounds.height()));
+    if (!device) {
         return false;
     }
+    *dst = device->accessBitmap(false);
+    SkAutoLockPixels alp_dst(*dst);
 
     SkVector scale = SkVector::Make(fScale, fScale);
     ctx.ctm().mapVectors(&scale, 1);
@@ -245,8 +263,8 @@ bool SkDisplacementMapEffect::onFilterImage(Proxy* proxy,
 }
 
 void SkDisplacementMapEffect::computeFastBounds(const SkRect& src, SkRect* dst) const {
-    if (getColorInput()) {
-        getColorInput()->computeFastBounds(src, dst);
+    if (this->getColorInput()) {
+        this->getColorInput()->computeFastBounds(src, dst);
     } else {
         *dst = src;
     }
@@ -260,108 +278,124 @@ bool SkDisplacementMapEffect::onFilterBounds(const SkIRect& src, const SkMatrix&
     ctm.mapVectors(&scale, 1);
     bounds.outset(SkScalarCeilToInt(scale.fX * SK_ScalarHalf),
                   SkScalarCeilToInt(scale.fY * SK_ScalarHalf));
-    if (getColorInput()) {
-        return getColorInput()->filterBounds(bounds, ctm, dst);
+    if (this->getColorInput()) {
+        return this->getColorInput()->filterBounds(bounds, ctm, dst);
     }
     *dst = bounds;
     return true;
 }
 
+#ifndef SK_IGNORE_TO_STRING
+void SkDisplacementMapEffect::toString(SkString* str) const {
+    str->appendf("SkDisplacementMapEffect: (");
+    str->appendf("scale: %f ", fScale);
+    str->appendf("displacement: (");
+    if (this->getDisplacementInput()) {
+        this->getDisplacementInput()->toString(str);
+    }
+    str->appendf(") color: (");
+    if (this->getColorInput()) {
+        this->getColorInput()->toString(str);
+    }
+    str->appendf("))");
+}
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////
 
 #if SK_SUPPORT_GPU
-class GrGLDisplacementMapEffect : public GrGLEffect {
+class GrGLDisplacementMapEffect : public GrGLSLFragmentProcessor {
 public:
-    GrGLDisplacementMapEffect(const GrBackendEffectFactory& factory,
-                              const GrDrawEffect& drawEffect);
+    GrGLDisplacementMapEffect(const GrProcessor&);
     virtual ~GrGLDisplacementMapEffect();
 
-    virtual void emitCode(GrGLShaderBuilder*,
-                          const GrDrawEffect&,
-                          const GrEffectKey&,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    virtual void emitCode(EmitArgs&) override;
 
-    static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*);
+    static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*);
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+    const GrTextureDomain::GLDomain& glDomain() const { return fGLDomain; }
+
+protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
 
 private:
     SkDisplacementMapEffect::ChannelSelectorType fXChannelSelector;
     SkDisplacementMapEffect::ChannelSelectorType fYChannelSelector;
-    GrGLUniformManager::UniformHandle fScaleUni;
+    GrGLSLProgramDataManager::UniformHandle fScaleUni;
+    GrTextureDomain::GLDomain fGLDomain;
 
-    typedef GrGLEffect INHERITED;
+    typedef GrGLSLFragmentProcessor INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-class GrDisplacementMapEffect : public GrEffect {
+class GrDisplacementMapEffect : public GrFragmentProcessor {
 public:
-    static GrEffect* Create(SkDisplacementMapEffect::ChannelSelectorType xChannelSelector,
-                            SkDisplacementMapEffect::ChannelSelectorType yChannelSelector,
-                            SkVector scale,
-                            GrTexture* displacement, const SkMatrix& offsetMatrix,
-                            GrTexture* color) {
-        return SkNEW_ARGS(GrDisplacementMapEffect, (xChannelSelector,
-                                                    yChannelSelector,
-                                                    scale,
-                                                    displacement,
-                                                    offsetMatrix,
-                                                    color));
+    static GrFragmentProcessor* Create(
+            SkDisplacementMapEffect::ChannelSelectorType xChannelSelector,
+            SkDisplacementMapEffect::ChannelSelectorType yChannelSelector, SkVector scale,
+            GrTexture* displacement, const SkMatrix& offsetMatrix, GrTexture* color,
+            const SkISize& colorDimensions) {
+        return new GrDisplacementMapEffect(xChannelSelector, yChannelSelector, scale, displacement,
+                                           offsetMatrix, color, colorDimensions);
     }
 
     virtual ~GrDisplacementMapEffect();
 
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
     SkDisplacementMapEffect::ChannelSelectorType xChannelSelector() const
         { return fXChannelSelector; }
     SkDisplacementMapEffect::ChannelSelectorType yChannelSelector() const
         { return fYChannelSelector; }
     const SkVector& scale() const { return fScale; }
 
-    typedef GrGLDisplacementMapEffect GLEffect;
-    static const char* Name() { return "DisplacementMap"; }
-
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
+    const char* name() const override { return "DisplacementMap"; }
+    const GrTextureDomain& domain() const { return fDomain; }
 
 private:
-    virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE;
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override {
+        return new GrGLDisplacementMapEffect(*this);
+    }
+
+    virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                       GrProcessorKeyBuilder* b) const override {
+        GrGLDisplacementMapEffect::GenKey(*this, caps, b);
+    }
+
+    bool onIsEqual(const GrFragmentProcessor&) const override;
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
 
     GrDisplacementMapEffect(SkDisplacementMapEffect::ChannelSelectorType xChannelSelector,
                             SkDisplacementMapEffect::ChannelSelectorType yChannelSelector,
                             const SkVector& scale,
                             GrTexture* displacement, const SkMatrix& offsetMatrix,
-                            GrTexture* color);
+                            GrTexture* color,
+                            const SkISize& colorDimensions);
 
-    GR_DECLARE_EFFECT_TEST;
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
 
     GrCoordTransform            fDisplacementTransform;
     GrTextureAccess             fDisplacementAccess;
     GrCoordTransform            fColorTransform;
+    GrTextureDomain             fDomain;
     GrTextureAccess             fColorAccess;
     SkDisplacementMapEffect::ChannelSelectorType fXChannelSelector;
     SkDisplacementMapEffect::ChannelSelectorType fYChannelSelector;
     SkVector fScale;
 
-    typedef GrEffect INHERITED;
+    typedef GrFragmentProcessor INHERITED;
 };
 
 bool SkDisplacementMapEffect::filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx,
                                              SkBitmap* result, SkIPoint* offset) const {
     SkBitmap colorBM = src;
     SkIPoint colorOffset = SkIPoint::Make(0, 0);
-    if (getColorInput() && !getColorInput()->getInputResultGPU(proxy, src, ctx, &colorBM,
-                                                               &colorOffset)) {
+    if (!this->filterInputGPU(1, proxy, src, ctx, &colorBM, &colorOffset)) {
         return false;
     }
     SkBitmap displacementBM = src;
     SkIPoint displacementOffset = SkIPoint::Make(0, 0);
-    if (getDisplacementInput() &&
-        !getDisplacementInput()->getInputResultGPU(proxy, src, ctx, &displacementBM,
-                                                   &displacementOffset)) {
+    if (!this->filterInputGPU(0, proxy, src, ctx, &displacementBM, &displacementOffset)) {
         return false;
     }
     SkIRect bounds;
@@ -382,41 +416,48 @@ bool SkDisplacementMapEffect::filterImageGPU(Proxy* proxy, const SkBitmap& src,
     GrTexture* displacement = displacementBM.getTexture();
     GrContext* context = color->getContext();
 
-    GrTextureDesc desc;
-    desc.fFlags = kRenderTarget_GrTextureFlagBit | kNoStencil_GrTextureFlagBit;
+    GrSurfaceDesc desc;
+    desc.fFlags = kRenderTarget_GrSurfaceFlag;
     desc.fWidth = bounds.width();
     desc.fHeight = bounds.height();
     desc.fConfig = kSkia8888_GrPixelConfig;
 
-    GrAutoScratchTexture ast(context, desc);
-    SkAutoTUnref<GrTexture> dst(ast.detach());
+    auto constraint = GrTextureProvider::FromImageFilter(ctx.sizeConstraint());
+    SkAutoTUnref<GrTexture> dst(context->textureProvider()->createTexture(desc, constraint));
 
-    GrContext::AutoRenderTarget art(context, dst->asRenderTarget());
+    if (!dst) {
+        return false;
+    }
 
     SkVector scale = SkVector::Make(fScale, fScale);
     ctx.ctm().mapVectors(&scale, 1);
 
     GrPaint paint;
-    SkMatrix offsetMatrix = GrEffect::MakeDivByTextureWHMatrix(displacement);
+    SkMatrix offsetMatrix = GrCoordTransform::MakeDivByTextureWHMatrix(displacement);
     offsetMatrix.preTranslate(SkIntToScalar(colorOffset.fX - displacementOffset.fX),
                               SkIntToScalar(colorOffset.fY - displacementOffset.fY));
 
-    paint.addColorEffect(
+    paint.addColorFragmentProcessor(
         GrDisplacementMapEffect::Create(fXChannelSelector,
                                         fYChannelSelector,
                                         scale,
                                         displacement,
                                         offsetMatrix,
-                                        color))->unref();
+                                        color,
+                                        colorBM.dimensions()))->unref();
+    paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode);
     SkIRect colorBounds = bounds;
     colorBounds.offset(-colorOffset);
-    GrContext::AutoMatrix am;
-    am.setIdentity(context);
     SkMatrix matrix;
     matrix.setTranslate(-SkIntToScalar(colorBounds.x()),
                         -SkIntToScalar(colorBounds.y()));
-    context->concatMatrix(matrix);
-    context->drawRect(paint, SkRect::Make(colorBounds));
+
+    SkAutoTUnref<GrDrawContext> drawContext(context->drawContext(dst->asRenderTarget()));
+    if (!drawContext) {
+        return false;
+    }
+
+    drawContext->drawRect(GrClip::WideOpen(), paint, matrix, SkRect::Make(colorBounds));
     offset->fX = bounds.left();
     offset->fY = bounds.top();
     WrapTexture(dst, bounds.width(), bounds.height(), result);
@@ -431,128 +472,118 @@ GrDisplacementMapEffect::GrDisplacementMapEffect(
                              const SkVector& scale,
                              GrTexture* displacement,
                              const SkMatrix& offsetMatrix,
-                             GrTexture* color)
-    : fDisplacementTransform(kLocal_GrCoordSet, offsetMatrix, displacement)
+                             GrTexture* color,
+                             const SkISize& colorDimensions)
+    : fDisplacementTransform(kLocal_GrCoordSet, offsetMatrix, displacement,
+                             GrTextureParams::kNone_FilterMode)
     , fDisplacementAccess(displacement)
-    , fColorTransform(kLocal_GrCoordSet, color)
+    , fColorTransform(kLocal_GrCoordSet, color, GrTextureParams::kNone_FilterMode)
+    , fDomain(GrTextureDomain::MakeTexelDomain(color, SkIRect::MakeSize(colorDimensions)),
+              GrTextureDomain::kDecal_Mode)
     , fColorAccess(color)
     , fXChannelSelector(xChannelSelector)
     , fYChannelSelector(yChannelSelector)
     , fScale(scale) {
+    this->initClassID<GrDisplacementMapEffect>();
     this->addCoordTransform(&fDisplacementTransform);
     this->addTextureAccess(&fDisplacementAccess);
     this->addCoordTransform(&fColorTransform);
     this->addTextureAccess(&fColorAccess);
-    this->setWillNotUseInputColor();
 }
 
 GrDisplacementMapEffect::~GrDisplacementMapEffect() {
 }
 
-bool GrDisplacementMapEffect::onIsEqual(const GrEffect& sBase) const {
-    const GrDisplacementMapEffect& s = CastEffect<GrDisplacementMapEffect>(sBase);
-    return fDisplacementAccess.getTexture() == s.fDisplacementAccess.getTexture() &&
-           fColorAccess.getTexture() == s.fColorAccess.getTexture() &&
-           fXChannelSelector == s.fXChannelSelector &&
+bool GrDisplacementMapEffect::onIsEqual(const GrFragmentProcessor& sBase) const {
+    const GrDisplacementMapEffect& s = sBase.cast<GrDisplacementMapEffect>();
+    return fXChannelSelector == s.fXChannelSelector &&
            fYChannelSelector == s.fYChannelSelector &&
            fScale == s.fScale;
 }
 
-const GrBackendEffectFactory& GrDisplacementMapEffect::getFactory() const {
-    return GrTBackendEffectFactory<GrDisplacementMapEffect>::getInstance();
-}
-
-void GrDisplacementMapEffect::getConstantColorComponents(GrColor*,
-                                                         uint32_t* validFlags) const {
+void GrDisplacementMapEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const {
     // Any displacement offset bringing a pixel out of bounds will output a color of (0,0,0,0),
     // so the only way we'd get a constant alpha is if the input color image has a constant alpha
     // and no displacement offset push any texture coordinates out of bounds OR if the constant
     // alpha is 0. Since this isn't trivial to compute at this point, let's assume the output is
     // not of constant color when a displacement effect is applied.
-    *validFlags = 0;
+    inout->setToUnknown(GrInvariantOutput::kWillNot_ReadInput);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-GR_DEFINE_EFFECT_TEST(GrDisplacementMapEffect);
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrDisplacementMapEffect);
 
-GrEffect* GrDisplacementMapEffect::TestCreate(SkRandom* random,
-                                              GrContext*,
-                                              const GrDrawTargetCaps&,
-                                              GrTexture* textures[]) {
-    int texIdxDispl = random->nextBool() ? GrEffectUnitTest::kSkiaPMTextureIdx :
-                                           GrEffectUnitTest::kAlphaTextureIdx;
-    int texIdxColor = random->nextBool() ? GrEffectUnitTest::kSkiaPMTextureIdx :
-                                           GrEffectUnitTest::kAlphaTextureIdx;
+const GrFragmentProcessor* GrDisplacementMapEffect::TestCreate(GrProcessorTestData* d) {
+    int texIdxDispl = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :
+                                               GrProcessorUnitTest::kAlphaTextureIdx;
+    int texIdxColor = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :
+                                               GrProcessorUnitTest::kAlphaTextureIdx;
     static const int kMaxComponent = 4;
     SkDisplacementMapEffect::ChannelSelectorType xChannelSelector =
         static_cast<SkDisplacementMapEffect::ChannelSelectorType>(
-        random->nextRangeU(1, kMaxComponent));
+                d->fRandom->nextRangeU(1, kMaxComponent));
     SkDisplacementMapEffect::ChannelSelectorType yChannelSelector =
         static_cast<SkDisplacementMapEffect::ChannelSelectorType>(
-        random->nextRangeU(1, kMaxComponent));
-    SkVector scale = SkVector::Make(random->nextRangeScalar(0, 100.0f),
-                                    random->nextRangeScalar(0, 100.0f));
-
+                d->fRandom->nextRangeU(1, kMaxComponent));
+    SkVector scale = SkVector::Make(d->fRandom->nextRangeScalar(0, 100.0f),
+                                    d->fRandom->nextRangeScalar(0, 100.0f));
+    SkISize colorDimensions;
+    colorDimensions.fWidth = d->fRandom->nextRangeU(0, d->fTextures[texIdxColor]->width());
+    colorDimensions.fHeight = d->fRandom->nextRangeU(0, d->fTextures[texIdxColor]->height());
     return GrDisplacementMapEffect::Create(xChannelSelector, yChannelSelector, scale,
-                                           textures[texIdxDispl], SkMatrix::I(),
-                                           textures[texIdxColor]);
+                                           d->fTextures[texIdxDispl], SkMatrix::I(),
+                                           d->fTextures[texIdxColor], colorDimensions);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-GrGLDisplacementMapEffect::GrGLDisplacementMapEffect(const GrBackendEffectFactory& factory,
-                                                     const GrDrawEffect& drawEffect)
-    : INHERITED(factory)
-    , fXChannelSelector(drawEffect.castEffect<GrDisplacementMapEffect>().xChannelSelector())
-    , fYChannelSelector(drawEffect.castEffect<GrDisplacementMapEffect>().yChannelSelector()) {
+GrGLDisplacementMapEffect::GrGLDisplacementMapEffect(const GrProcessor& proc)
+    : fXChannelSelector(proc.cast<GrDisplacementMapEffect>().xChannelSelector())
+    , fYChannelSelector(proc.cast<GrDisplacementMapEffect>().yChannelSelector()) {
 }
 
 GrGLDisplacementMapEffect::~GrGLDisplacementMapEffect() {
 }
 
-void GrGLDisplacementMapEffect::emitCode(GrGLShaderBuilder* builder,
-                                         const GrDrawEffect&,
-                                         const GrEffectKey& key,
-                                         const char* outputColor,
-                                         const char* inputColor,
-                                         const TransformedCoordsArray& coords,
-                                         const TextureSamplerArray& samplers) {
-    sk_ignore_unused_variable(inputColor);
+void GrGLDisplacementMapEffect::emitCode(EmitArgs& args) {
+    const GrTextureDomain& domain = args.fFp.cast<GrDisplacementMapEffect>().domain();
 
-    fScaleUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                    kVec2f_GrSLType, "Scale");
-    const char* scaleUni = builder->getUniformCStr(fScaleUni);
+    fScaleUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                          kVec2f_GrSLType, kDefault_GrSLPrecision, "Scale");
+    const char* scaleUni = args.fBuilder->getUniformCStr(fScaleUni);
     const char* dColor = "dColor";
     const char* cCoords = "cCoords";
-    const char* outOfBounds = "outOfBounds";
     const char* nearZero = "1e-6"; // Since 6.10352e−5 is the smallest half float, use
                                    // a number smaller than that to approximate 0, but
                                    // leave room for 32-bit float GPU rounding errors.
 
-    builder->fsCodeAppendf("\t\tvec4 %s = ", dColor);
-    builder->fsAppendTextureLookup(samplers[0], coords[0].c_str(), coords[0].type());
-    builder->fsCodeAppend(";\n");
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    fragBuilder->codeAppendf("\t\tvec4 %s = ", dColor);
+    fragBuilder->appendTextureLookup(args.fSamplers[0], args.fCoords[0].c_str(),
+                                   args.fCoords[0].getType());
+    fragBuilder->codeAppend(";\n");
 
     // Unpremultiply the displacement
-    builder->fsCodeAppendf("\t\t%s.rgb = (%s.a < %s) ? vec3(0.0) : clamp(%s.rgb / %s.a, 0.0, 1.0);",
-                           dColor, dColor, nearZero, dColor, dColor);
-
-    builder->fsCodeAppendf("\t\tvec2 %s = %s + %s*(%s.",
-                           cCoords, coords[1].c_str(), scaleUni, dColor);
+    fragBuilder->codeAppendf(
+        "\t\t%s.rgb = (%s.a < %s) ? vec3(0.0) : clamp(%s.rgb / %s.a, 0.0, 1.0);",
+        dColor, dColor, nearZero, dColor, dColor);
+    SkString coords2D = fragBuilder->ensureFSCoords2D(args.fCoords, 1);
+    fragBuilder->codeAppendf("\t\tvec2 %s = %s + %s*(%s.",
+                             cCoords, coords2D.c_str(), scaleUni, dColor);
 
     switch (fXChannelSelector) {
       case SkDisplacementMapEffect::kR_ChannelSelectorType:
-        builder->fsCodeAppend("r");
+        fragBuilder->codeAppend("r");
         break;
       case SkDisplacementMapEffect::kG_ChannelSelectorType:
-        builder->fsCodeAppend("g");
+        fragBuilder->codeAppend("g");
         break;
       case SkDisplacementMapEffect::kB_ChannelSelectorType:
-        builder->fsCodeAppend("b");
+        fragBuilder->codeAppend("b");
         break;
       case SkDisplacementMapEffect::kA_ChannelSelectorType:
-        builder->fsCodeAppend("a");
+        fragBuilder->codeAppend("a");
         break;
       case SkDisplacementMapEffect::kUnknown_ChannelSelectorType:
       default:
@@ -561,49 +592,47 @@ void GrGLDisplacementMapEffect::emitCode(GrGLShaderBuilder* builder,
 
     switch (fYChannelSelector) {
       case SkDisplacementMapEffect::kR_ChannelSelectorType:
-        builder->fsCodeAppend("r");
+        fragBuilder->codeAppend("r");
         break;
       case SkDisplacementMapEffect::kG_ChannelSelectorType:
-        builder->fsCodeAppend("g");
+        fragBuilder->codeAppend("g");
         break;
       case SkDisplacementMapEffect::kB_ChannelSelectorType:
-        builder->fsCodeAppend("b");
+        fragBuilder->codeAppend("b");
         break;
       case SkDisplacementMapEffect::kA_ChannelSelectorType:
-        builder->fsCodeAppend("a");
+        fragBuilder->codeAppend("a");
         break;
       case SkDisplacementMapEffect::kUnknown_ChannelSelectorType:
       default:
         SkDEBUGFAIL("Unknown Y channel selector");
     }
-    builder->fsCodeAppend("-vec2(0.5));\t\t");
+    fragBuilder->codeAppend("-vec2(0.5));\t\t");
 
-    // FIXME : This can be achieved with a "clamp to border" texture repeat mode and
-    //         a 0 border color instead of computing if cCoords is out of bounds here.
-    builder->fsCodeAppendf(
-        "bool %s = (%s.x < 0.0) || (%s.y < 0.0) || (%s.x > 1.0) || (%s.y > 1.0);\t\t",
-        outOfBounds, cCoords, cCoords, cCoords, cCoords);
-    builder->fsCodeAppendf("%s = %s ? vec4(0.0) : ", outputColor, outOfBounds);
-    builder->fsAppendTextureLookup(samplers[1], cCoords, coords[1].type());
-    builder->fsCodeAppend(";\n");
+    fGLDomain.sampleTexture(fragBuilder,
+                            args.fGLSLCaps,
+                            domain,
+                            args.fOutputColor,
+                            SkString(cCoords),
+                            args.fSamplers[1]);
+    fragBuilder->codeAppend(";\n");
 }
 
-void GrGLDisplacementMapEffect::setData(const GrGLUniformManager& uman,
-                                        const GrDrawEffect& drawEffect) {
-    const GrDisplacementMapEffect& displacementMap =
-        drawEffect.castEffect<GrDisplacementMapEffect>();
+void GrGLDisplacementMapEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                                          const GrProcessor& proc) {
+    const GrDisplacementMapEffect& displacementMap = proc.cast<GrDisplacementMapEffect>();
     GrTexture* colorTex = displacementMap.texture(1);
-    SkScalar scaleX = SkScalarDiv(displacementMap.scale().fX, SkIntToScalar(colorTex->width()));
-    SkScalar scaleY = SkScalarDiv(displacementMap.scale().fY, SkIntToScalar(colorTex->height()));
-    uman.set2f(fScaleUni, SkScalarToFloat(scaleX),
-               colorTex->origin() == kTopLeft_GrSurfaceOrigin ?
-               SkScalarToFloat(scaleY) : SkScalarToFloat(-scaleY));
+    SkScalar scaleX = displacementMap.scale().fX / colorTex->width();
+    SkScalar scaleY = displacementMap.scale().fY / colorTex->height();
+    pdman.set2f(fScaleUni, SkScalarToFloat(scaleX),
+                colorTex->origin() == kTopLeft_GrSurfaceOrigin ?
+                SkScalarToFloat(scaleY) : SkScalarToFloat(-scaleY));
+    fGLDomain.setData(pdman, displacementMap.domain(), colorTex->origin());
 }
 
-void GrGLDisplacementMapEffect::GenKey(const GrDrawEffect& drawEffect,
-                                       const GrGLCaps&, GrEffectKeyBuilder* b) {
-    const GrDisplacementMapEffect& displacementMap =
-        drawEffect.castEffect<GrDisplacementMapEffect>();
+void GrGLDisplacementMapEffect::GenKey(const GrProcessor& proc,
+                                       const GrGLSLCaps&, GrProcessorKeyBuilder* b) {
+    const GrDisplacementMapEffect& displacementMap = proc.cast<GrDisplacementMapEffect>();
 
     uint32_t xKey = displacementMap.xChannelSelector();
     uint32_t yKey = displacementMap.yChannelSelector() << kChannelSelectorKeyBits;
@@ -611,3 +640,4 @@ void GrGLDisplacementMapEffect::GenKey(const GrDrawEffect& drawEffect,
     b->add32(xKey | yKey);
 }
 #endif
+
diff --git a/gfx/skia/skia/src/effects/SkDropShadowImageFilter.cpp b/gfx/skia/skia/src/effects/SkDropShadowImageFilter.cpp
index 1d22bbdb2e41..7519d5313d08 100644
--- a/gfx/skia/skia/src/effects/SkDropShadowImageFilter.cpp
+++ b/gfx/skia/skia/src/effects/SkDropShadowImageFilter.cpp
@@ -17,37 +17,40 @@
 
 SkDropShadowImageFilter::SkDropShadowImageFilter(SkScalar dx, SkScalar dy,
                                                  SkScalar sigmaX, SkScalar sigmaY, SkColor color,
-                                                 SkImageFilter* input, const CropRect* cropRect)
+                                                 ShadowMode shadowMode, SkImageFilter* input,
+                                                 const CropRect* cropRect)
     : INHERITED(1, &input, cropRect)
     , fDx(dx)
     , fDy(dy)
     , fSigmaX(sigmaX)
     , fSigmaY(sigmaY)
     , fColor(color)
+    , fShadowMode(shadowMode)
 {
 }
 
-SkDropShadowImageFilter::SkDropShadowImageFilter(SkReadBuffer& buffer)
- : INHERITED(1, buffer) {
-    fDx = buffer.readScalar();
-    fDy = buffer.readScalar();
-    fSigmaX = buffer.readScalar();
-    fSigmaY = buffer.readScalar();
-    fColor = buffer.readColor();
-    buffer.validate(SkScalarIsFinite(fDx) &&
-                    SkScalarIsFinite(fDy) &&
-                    SkScalarIsFinite(fSigmaX) &&
-                    SkScalarIsFinite(fSigmaY));
+SkFlattenable* SkDropShadowImageFilter::CreateProc(SkReadBuffer& buffer) {
+    SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
+    SkScalar dx = buffer.readScalar();
+    SkScalar dy = buffer.readScalar();
+    SkScalar sigmaX = buffer.readScalar();
+    SkScalar sigmaY = buffer.readScalar();
+    SkColor color = buffer.readColor();
+    ShadowMode shadowMode = buffer.isVersionLT(SkReadBuffer::kDropShadowMode_Version) ?
+                            kDrawShadowAndForeground_ShadowMode :
+                            static_cast<ShadowMode>(buffer.readInt());
+    return Create(dx, dy, sigmaX, sigmaY, color, shadowMode, common.getInput(0),
+                  &common.cropRect());
 }
 
-void SkDropShadowImageFilter::flatten(SkWriteBuffer& buffer) const
-{
+void SkDropShadowImageFilter::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
     buffer.writeScalar(fDx);
     buffer.writeScalar(fDy);
     buffer.writeScalar(fSigmaX);
     buffer.writeScalar(fSigmaY);
     buffer.writeColor(fColor);
+    buffer.writeInt(static_cast<int>(fShadowMode));
 }
 
 bool SkDropShadowImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& source,
@@ -56,7 +59,7 @@ bool SkDropShadowImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& source
 {
     SkBitmap src = source;
     SkIPoint srcOffset = SkIPoint::Make(0, 0);
-    if (getInput(0) && !getInput(0)->filterImage(proxy, source, ctx, &src, &srcOffset))
+    if (!this->filterInput(0, proxy, source, ctx, &src, &srcOffset))
         return false;
 
     SkIRect bounds;
@@ -65,7 +68,7 @@ bool SkDropShadowImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& source
     }
 
     SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(), bounds.height()));
-    if (NULL == device.get()) {
+    if (nullptr == device.get()) {
         return false;
     }
     SkCanvas canvas(device.get());
@@ -86,7 +89,9 @@ bool SkDropShadowImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& source
     canvas.translate(SkIntToScalar(srcOffset.fX - bounds.fLeft),
                      SkIntToScalar(srcOffset.fY - bounds.fTop));
     canvas.drawBitmap(src, offsetVec.fX, offsetVec.fY, &paint);
-    canvas.drawBitmap(src, 0, 0);
+    if (fShadowMode == kDrawShadowAndForeground_ShadowMode) {
+        canvas.drawBitmap(src, 0, 0);
+    }
     *result = device->accessBitmap(false);
     offset->fX = bounds.fLeft;
     offset->fY = bounds.fTop;
@@ -104,15 +109,16 @@ void SkDropShadowImageFilter::computeFastBounds(const SkRect& src, SkRect* dst)
     shadowBounds.offset(fDx, fDy);
     shadowBounds.outset(SkScalarMul(fSigmaX, SkIntToScalar(3)),
                         SkScalarMul(fSigmaY, SkIntToScalar(3)));
-    dst->join(shadowBounds);
+    if (fShadowMode == kDrawShadowAndForeground_ShadowMode) {
+        dst->join(shadowBounds);
+    } else {
+        *dst = shadowBounds;
+    }
 }
 
 bool SkDropShadowImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm,
                                              SkIRect* dst) const {
     SkIRect bounds = src;
-    if (getInput(0) && !getInput(0)->filterBounds(src, ctm, &bounds)) {
-        return false;
-    }
     SkVector offsetVec = SkVector::Make(fDx, fDy);
     ctm.mapVectors(&offsetVec, 1);
     bounds.offset(-SkScalarCeilToInt(offsetVec.x()),
@@ -121,7 +127,36 @@ bool SkDropShadowImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix&
     ctm.mapVectors(&sigma, 1);
     bounds.outset(SkScalarCeilToInt(SkScalarMul(sigma.x(), SkIntToScalar(3))),
                   SkScalarCeilToInt(SkScalarMul(sigma.y(), SkIntToScalar(3))));
-    bounds.join(src);
+    if (fShadowMode == kDrawShadowAndForeground_ShadowMode) {
+        bounds.join(src);
+    }
+    if (getInput(0) && !getInput(0)->filterBounds(bounds, ctm, &bounds)) {
+        return false;
+    }
     *dst = bounds;
     return true;
 }
+
+#ifndef SK_IGNORE_TO_STRING
+void SkDropShadowImageFilter::toString(SkString* str) const {
+    str->appendf("SkDropShadowImageFilter: (");
+
+    str->appendf("dX: %f ", fDx);
+    str->appendf("dY: %f ", fDy);
+    str->appendf("sigmaX: %f ", fSigmaX);
+    str->appendf("sigmaY: %f ", fSigmaY);
+
+    str->append("Color: ");
+    str->appendHex(fColor);
+
+    static const char* gModeStrings[] = {
+        "kDrawShadowAndForeground", "kDrawShadowOnly"
+    };
+
+    static_assert(kShadowModeCount == SK_ARRAY_COUNT(gModeStrings), "enum_mismatch");
+
+    str->appendf(" mode: %s", gModeStrings[fShadowMode]);
+
+    str->append(")");
+}
+#endif
diff --git a/gfx/skia/skia/src/effects/SkEmbossMaskFilter.cpp b/gfx/skia/skia/src/effects/SkEmbossMaskFilter.cpp
index cdd55fcc5b83..2607e255d9a0 100644
--- a/gfx/skia/skia/src/effects/SkEmbossMaskFilter.cpp
+++ b/gfx/skia/skia/src/effects/SkEmbossMaskFilter.cpp
@@ -14,7 +14,7 @@
 #include "SkString.h"
 
 SkEmbossMaskFilter* SkEmbossMaskFilter::Create(SkScalar blurSigma, const Light& light) {
-    return SkNEW_ARGS(SkEmbossMaskFilter, (blurSigma, light));
+    return new SkEmbossMaskFilter(blurSigma, light);
 }
 
 static inline int pin2byte(int n) {
@@ -35,8 +35,8 @@ SkMaskFilter* SkBlurMaskFilter::CreateEmboss(const SkScalar direction[3],
 
 SkMaskFilter* SkBlurMaskFilter::CreateEmboss(SkScalar blurSigma, const SkScalar direction[3],
                                              SkScalar ambient, SkScalar specular) {
-    if (direction == NULL) {
-        return NULL;
+    if (direction == nullptr) {
+        return nullptr;
     }
 
     // ambient should be 0...1 as a scalar
@@ -61,7 +61,7 @@ static void normalize(SkScalar v[3]) {
     mag = SkScalarSqrt(mag);
 
     for (int i = 0; i < 3; i++) {
-        v[i] = SkScalarDiv(v[i], mag);
+        v[i] /= mag;
     }
 }
 
@@ -87,7 +87,7 @@ bool SkEmbossMaskFilter::filterMask(SkMask* dst, const SkMask& src,
         margin->set(SkScalarCeilToInt(3*sigma), SkScalarCeilToInt(3*sigma));
     }
 
-    if (src.fImage == NULL) {
+    if (src.fImage == nullptr) {
         return true;
     }
 
@@ -124,17 +124,17 @@ bool SkEmbossMaskFilter::filterMask(SkMask* dst, const SkMask& src,
     return true;
 }
 
-SkEmbossMaskFilter::SkEmbossMaskFilter(SkReadBuffer& buffer)
-        : SkMaskFilter(buffer) {
-    SkASSERT(buffer.getArrayCount() == sizeof(Light));
-    buffer.readByteArray(&fLight, sizeof(Light));
-    SkASSERT(fLight.fPad == 0); // for the font-cache lookup to be clean
-    fBlurSigma = buffer.readScalar();
+SkFlattenable* SkEmbossMaskFilter::CreateProc(SkReadBuffer& buffer) {
+    Light light;
+    if (buffer.readByteArray(&light, sizeof(Light))) {
+        light.fPad = 0; // for the font-cache lookup to be clean
+        const SkScalar sigma = buffer.readScalar();
+        return Create(sigma, light);
+    }
+    return nullptr;
 }
 
 void SkEmbossMaskFilter::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
-
     Light tmpLight = fLight;
     tmpLight.fPad = 0;    // for the font-cache lookup to be clean
     buffer.writeByteArray(&tmpLight, sizeof(tmpLight));
diff --git a/gfx/skia/skia/src/effects/SkGpuBlurUtils.cpp b/gfx/skia/skia/src/effects/SkGpuBlurUtils.cpp
index 58881087553c..8ab05dd86216 100644
--- a/gfx/skia/skia/src/effects/SkGpuBlurUtils.cpp
+++ b/gfx/skia/skia/src/effects/SkGpuBlurUtils.cpp
@@ -11,8 +11,10 @@
 
 #if SK_SUPPORT_GPU
 #include "effects/GrConvolutionEffect.h"
-#include "effects/GrTextureDomain.h"
+#include "effects/GrMatrixConvolutionEffect.h"
 #include "GrContext.h"
+#include "GrCaps.h"
+#include "GrDrawContext.h"
 #endif
 
 namespace SkGpuBlurUtils {
@@ -43,227 +45,357 @@ static float adjust_sigma(float sigma, int maxTextureSize, int *scaleFactor, int
     return sigma;
 }
 
-static void convolve_gaussian_pass(GrContext* context,
-                                   const SkRect& srcRect,
-                                   const SkRect& dstRect,
-                                   GrTexture* texture,
-                                   Gr1DKernelEffect::Direction direction,
-                                   int radius,
-                                   float sigma,
-                                   bool useBounds,
-                                   float bounds[2]) {
+static void convolve_gaussian_1d(GrDrawContext* drawContext,
+                                 const GrClip& clip,
+                                 const SkRect& dstRect,
+                                 const SkPoint& srcOffset,
+                                 GrTexture* texture,
+                                 Gr1DKernelEffect::Direction direction,
+                                 int radius,
+                                 float sigma,
+                                 bool useBounds,
+                                 float bounds[2]) {
     GrPaint paint;
-    paint.reset();
-    SkAutoTUnref<GrEffect> conv(GrConvolutionEffect::CreateGaussian(
+    SkAutoTUnref<GrFragmentProcessor> conv(GrConvolutionEffect::CreateGaussian(
         texture, direction, radius, sigma, useBounds, bounds));
-    paint.reset();
-    paint.addColorEffect(conv);
-    context->drawRectToRect(paint, dstRect, srcRect);
+    paint.addColorFragmentProcessor(conv);
+    paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode);
+    SkMatrix localMatrix = SkMatrix::MakeTrans(srcOffset.x(), srcOffset.y());
+    drawContext->fillRectWithLocalMatrix(clip, paint, SkMatrix::I(), dstRect, localMatrix);
 }
 
-static void convolve_gaussian(GrContext* context,
+static void convolve_gaussian_2d(GrDrawContext* drawContext,
+                                 const GrClip& clip,
+                                 const SkRect& srcRect,
+                                 GrTexture* texture,
+                                 int radiusX,
+                                 int radiusY,
+                                 SkScalar sigmaX,
+                                 SkScalar sigmaY,
+                                 const SkRect* srcBounds) {
+    SkRect dstRect = SkRect::MakeWH(srcRect.width(), srcRect.height());
+    SkMatrix localMatrix = SkMatrix::MakeTrans(srcRect.x(), srcRect.y());
+    SkISize size = SkISize::Make(2 * radiusX + 1,  2 * radiusY + 1);
+    SkIPoint kernelOffset = SkIPoint::Make(radiusX, radiusY);
+    GrPaint paint;
+    SkIRect bounds;
+    if (srcBounds) {
+        srcBounds->roundOut(&bounds);
+    } else {
+        bounds.setEmpty();
+    }
+
+    SkAutoTUnref<GrFragmentProcessor> conv(GrMatrixConvolutionEffect::CreateGaussian(
+            texture, bounds, size, 1.0, 0.0, kernelOffset,
+            srcBounds ? GrTextureDomain::kDecal_Mode : GrTextureDomain::kIgnore_Mode,
+            true, sigmaX, sigmaY));
+    paint.addColorFragmentProcessor(conv);
+    paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode);
+    drawContext->fillRectWithLocalMatrix(clip, paint, SkMatrix::I(), dstRect, localMatrix);
+}
+
+static void convolve_gaussian(GrDrawContext* drawContext,
+                              const GrClip& clip,
                               const SkRect& srcRect,
-                              const SkRect& dstRect,
                               GrTexture* texture,
                               Gr1DKernelEffect::Direction direction,
                               int radius,
                               float sigma,
-                              bool cropToSrcRect) {
+                              const SkRect* srcBounds,
+                              const SkPoint& srcOffset) {
     float bounds[2] = { 0.0f, 1.0f };
-    if (!cropToSrcRect) {
-        convolve_gaussian_pass(context, srcRect, dstRect, texture,
-                          direction, radius, sigma, false, bounds);
+    SkRect dstRect = SkRect::MakeWH(srcRect.width(), srcRect.height());
+    if (!srcBounds) {
+        convolve_gaussian_1d(drawContext, clip, dstRect, srcOffset, texture,
+                             direction, radius, sigma, false, bounds);
         return;
     }
-    SkRect lowerSrcRect = srcRect, lowerDstRect = dstRect;
-    SkRect middleSrcRect = srcRect, middleDstRect = dstRect;
-    SkRect upperSrcRect = srcRect, upperDstRect = dstRect;
-    SkScalar size;
+    SkRect midRect = *srcBounds, leftRect, rightRect;
+    midRect.offset(srcOffset);
+    SkIRect topRect, bottomRect;
     SkScalar rad = SkIntToScalar(radius);
     if (direction == Gr1DKernelEffect::kX_Direction) {
-        bounds[0] = SkScalarToFloat(srcRect.left()) / texture->width();
-        bounds[1] = SkScalarToFloat(srcRect.right()) / texture->width();
-        size = srcRect.width();
-        lowerSrcRect.fRight = srcRect.left() + rad;
-        lowerDstRect.fRight = dstRect.left() + rad;
-        upperSrcRect.fLeft = srcRect.right() - rad;
-        upperDstRect.fLeft = dstRect.right() - rad;
-        middleSrcRect.inset(rad, 0);
-        middleDstRect.inset(rad, 0);
+        bounds[0] = SkScalarToFloat(srcBounds->left()) / texture->width();
+        bounds[1] = SkScalarToFloat(srcBounds->right()) / texture->width();
+        SkRect::MakeLTRB(0, 0, dstRect.right(), midRect.top()).roundOut(&topRect);
+        SkRect::MakeLTRB(0, midRect.bottom(), dstRect.right(), dstRect.bottom())
+            .roundOut(&bottomRect);
+        midRect.inset(rad, 0);
+        leftRect = SkRect::MakeLTRB(0, midRect.top(), midRect.left(), midRect.bottom());
+        rightRect =
+            SkRect::MakeLTRB(midRect.right(), midRect.top(), dstRect.width(), midRect.bottom());
+        dstRect.fTop = midRect.top();
+        dstRect.fBottom = midRect.bottom();
     } else {
-        bounds[0] = SkScalarToFloat(srcRect.top()) / texture->height();
-        bounds[1] = SkScalarToFloat(srcRect.bottom()) / texture->height();
-        size = srcRect.height();
-        lowerSrcRect.fBottom = srcRect.top() + rad;
-        lowerDstRect.fBottom = dstRect.top() + rad;
-        upperSrcRect.fTop = srcRect.bottom() - rad;
-        upperDstRect.fTop = dstRect.bottom() - rad;
-        middleSrcRect.inset(0, rad);
-        middleDstRect.inset(0, rad);
+        bounds[0] = SkScalarToFloat(srcBounds->top()) / texture->height();
+        bounds[1] = SkScalarToFloat(srcBounds->bottom()) / texture->height();
+        SkRect::MakeLTRB(0, 0, midRect.left(), dstRect.bottom()).roundOut(&topRect);
+        SkRect::MakeLTRB(midRect.right(), 0, dstRect.right(), dstRect.bottom())
+            .roundOut(&bottomRect);;
+        midRect.inset(0, rad);
+        leftRect = SkRect::MakeLTRB(midRect.left(), 0, midRect.right(), midRect.top());
+        rightRect =
+            SkRect::MakeLTRB(midRect.left(), midRect.bottom(), midRect.right(), dstRect.height());
+        dstRect.fLeft = midRect.left();
+        dstRect.fRight = midRect.right();
     }
-    if (radius >= size * SK_ScalarHalf) {
-        // Blur radius covers srcRect; use bounds over entire draw
-        convolve_gaussian_pass(context, srcRect, dstRect, texture,
-                          direction, radius, sigma, true, bounds);
+    if (!topRect.isEmpty()) {
+        drawContext->clear(&topRect, 0, false);
+    }
+
+    if (!bottomRect.isEmpty()) {
+        drawContext->clear(&bottomRect, 0, false);
+    }
+    if (midRect.isEmpty()) {
+        // Blur radius covers srcBounds; use bounds over entire draw
+        convolve_gaussian_1d(drawContext, clip, dstRect, -srcOffset, texture,
+                            direction, radius, sigma, true, bounds);
     } else {
-        // Draw upper and lower margins with bounds; middle without.
-        convolve_gaussian_pass(context, lowerSrcRect, lowerDstRect, texture,
-                          direction, radius, sigma, true, bounds);
-        convolve_gaussian_pass(context, upperSrcRect, upperDstRect, texture,
-                          direction, radius, sigma, true, bounds);
-        convolve_gaussian_pass(context, middleSrcRect, middleDstRect, texture,
-                          direction, radius, sigma, false, bounds);
+        // Draw right and left margins with bounds; middle without.
+        convolve_gaussian_1d(drawContext, clip, leftRect, -srcOffset, texture,
+                             direction, radius, sigma, true, bounds);
+        convolve_gaussian_1d(drawContext, clip, rightRect, -srcOffset, texture,
+                             direction, radius, sigma, true, bounds);
+        convolve_gaussian_1d(drawContext, clip, midRect, -srcOffset, texture,
+                             direction, radius, sigma, false, bounds);
     }
 }
 
 GrTexture* GaussianBlur(GrContext* context,
                         GrTexture* srcTexture,
                         bool canClobberSrc,
-                        const SkRect& rect,
-                        bool cropToRect,
+                        const SkRect& dstBounds,
+                        const SkRect* srcBounds,
                         float sigmaX,
-                        float sigmaY) {
-    SkASSERT(NULL != context);
-
-    GrContext::AutoRenderTarget art(context);
-
-    GrContext::AutoMatrix am;
-    am.setIdentity(context);
-
+                        float sigmaY,
+                        GrTextureProvider::SizeConstraint constraint) {
+    SkASSERT(context);
     SkIRect clearRect;
     int scaleFactorX, radiusX;
     int scaleFactorY, radiusY;
-    int maxTextureSize = context->getMaxTextureSize();
+    int maxTextureSize = context->caps()->maxTextureSize();
     sigmaX = adjust_sigma(sigmaX, maxTextureSize, &scaleFactorX, &radiusX);
     sigmaY = adjust_sigma(sigmaY, maxTextureSize, &scaleFactorY, &radiusY);
 
-    SkRect srcRect(rect);
+    SkPoint srcOffset = SkPoint::Make(-dstBounds.x(), -dstBounds.y());
+    SkRect localDstBounds = SkRect::MakeWH(dstBounds.width(), dstBounds.height());
+    SkRect localSrcBounds;
+    SkRect srcRect;
+    if (srcBounds) {
+        srcRect = localSrcBounds = *srcBounds;
+        srcRect.offset(srcOffset);
+        srcBounds = &localSrcBounds;
+    } else {
+        srcRect = localDstBounds;
+    }
+
     scale_rect(&srcRect, 1.0f / scaleFactorX, 1.0f / scaleFactorY);
-    srcRect.roundOut();
+    srcRect.roundOut(&srcRect);
     scale_rect(&srcRect, static_cast<float>(scaleFactorX),
                          static_cast<float>(scaleFactorY));
 
-    GrContext::AutoClip acs(context, SkRect::MakeWH(srcRect.width(), srcRect.height()));
+    // setup new clip
+    GrClip clip(localDstBounds);
 
     SkASSERT(kBGRA_8888_GrPixelConfig == srcTexture->config() ||
              kRGBA_8888_GrPixelConfig == srcTexture->config() ||
              kAlpha_8_GrPixelConfig == srcTexture->config());
 
-    GrTextureDesc desc;
-    desc.fFlags = kRenderTarget_GrTextureFlagBit | kNoStencil_GrTextureFlagBit;
-    desc.fWidth = SkScalarFloorToInt(srcRect.width());
-    desc.fHeight = SkScalarFloorToInt(srcRect.height());
+    GrSurfaceDesc desc;
+    desc.fFlags = kRenderTarget_GrSurfaceFlag;
+    desc.fWidth = SkScalarFloorToInt(dstBounds.width());
+    desc.fHeight = SkScalarFloorToInt(dstBounds.height());
     desc.fConfig = srcTexture->config();
 
-    GrAutoScratchTexture temp1, temp2;
-    GrTexture* dstTexture = temp1.set(context, desc);
-    GrTexture* tempTexture = canClobberSrc ? srcTexture : temp2.set(context, desc);
-    if (NULL == dstTexture || NULL == tempTexture) {
-        return NULL;
+    GrTexture* dstTexture;
+    GrTexture* tempTexture;
+    SkAutoTUnref<GrTexture> temp1, temp2;
+
+    temp1.reset(context->textureProvider()->createTexture(desc, constraint));
+    dstTexture = temp1.get();
+    if (canClobberSrc) {
+        tempTexture = srcTexture;
+    } else {
+        temp2.reset(context->textureProvider()->createTexture(desc, constraint));
+        tempTexture = temp2.get();
     }
 
+    if (nullptr == dstTexture || nullptr == tempTexture) {
+        return nullptr;
+    }
+
+    SkAutoTUnref<GrDrawContext> srcDrawContext;
+
     for (int i = 1; i < scaleFactorX || i < scaleFactorY; i *= 2) {
         GrPaint paint;
         SkMatrix matrix;
         matrix.setIDiv(srcTexture->width(), srcTexture->height());
-        context->setRenderTarget(dstTexture->asRenderTarget());
         SkRect dstRect(srcRect);
-        if (cropToRect && i == 1) {
-            dstRect.offset(-dstRect.fLeft, -dstRect.fTop);
+        if (srcBounds && i == 1) {
             SkRect domain;
-            matrix.mapRect(&domain, rect);
-            domain.inset(i < scaleFactorX ? SK_ScalarHalf / srcTexture->width() : 0.0f,
-                         i < scaleFactorY ? SK_ScalarHalf / srcTexture->height() : 0.0f);
-            SkAutoTUnref<GrEffect> effect(GrTextureDomainEffect::Create(
+            matrix.mapRect(&domain, *srcBounds);
+            domain.inset((i < scaleFactorX) ? SK_ScalarHalf / srcTexture->width() : 0.0f,
+                         (i < scaleFactorY) ? SK_ScalarHalf / srcTexture->height() : 0.0f);
+            SkAutoTUnref<const GrFragmentProcessor> fp(GrTextureDomainEffect::Create(
                 srcTexture,
                 matrix,
                 domain,
                 GrTextureDomain::kDecal_Mode,
                 GrTextureParams::kBilerp_FilterMode));
-            paint.addColorEffect(effect);
+            paint.addColorFragmentProcessor(fp);
+            srcRect.offset(-srcOffset);
+            srcOffset.set(0, 0);
         } else {
             GrTextureParams params(SkShader::kClamp_TileMode, GrTextureParams::kBilerp_FilterMode);
-            paint.addColorTextureEffect(srcTexture, matrix, params);
+            paint.addColorTextureProcessor(srcTexture, matrix, params);
         }
+        paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode);
         scale_rect(&dstRect, i < scaleFactorX ? 0.5f : 1.0f,
                              i < scaleFactorY ? 0.5f : 1.0f);
-        context->drawRectToRect(paint, dstRect, srcRect);
-        srcRect = dstRect;
-        srcTexture = dstTexture;
-        SkTSwap(dstTexture, tempTexture);
-    }
 
-    SkIRect srcIRect;
-    srcRect.roundOut(&srcIRect);
-
-    if (sigmaX > 0.0f) {
-        if (scaleFactorX > 1) {
-            // Clear out a radius to the right of the srcRect to prevent the
-            // X convolution from reading garbage.
-            clearRect = SkIRect::MakeXYWH(srcIRect.fRight, srcIRect.fTop,
-                                          radiusX, srcIRect.height());
-            context->clear(&clearRect, 0x0, false);
+        SkAutoTUnref<GrDrawContext> dstDrawContext(
+                                             context->drawContext(dstTexture->asRenderTarget()));
+        if (!dstDrawContext) {
+            return nullptr;
         }
-        context->setRenderTarget(dstTexture->asRenderTarget());
-        SkRect dstRect = SkRect::MakeWH(srcRect.width(), srcRect.height());
-        convolve_gaussian(context, srcRect, dstRect, srcTexture,
-                          Gr1DKernelEffect::kX_Direction, radiusX, sigmaX, cropToRect);
-        srcTexture = dstTexture;
+        dstDrawContext->fillRectToRect(clip, paint, SkMatrix::I(), dstRect, srcRect);
+
+        srcDrawContext.swap(dstDrawContext);
         srcRect = dstRect;
+        srcTexture = dstTexture;
         SkTSwap(dstTexture, tempTexture);
+        localSrcBounds = srcRect;
     }
 
-    if (sigmaY > 0.0f) {
-        if (scaleFactorY > 1 || sigmaX > 0.0f) {
-            // Clear out a radius below the srcRect to prevent the Y
-            // convolution from reading garbage.
-            clearRect = SkIRect::MakeXYWH(srcIRect.fLeft, srcIRect.fBottom,
-                                          srcIRect.width(), radiusY);
-            context->clear(&clearRect, 0x0, false);
+    // For really small blurs (certainly no wider than 5x5 on desktop gpus) it is faster to just
+    // launch a single non separable kernel vs two launches
+    if (sigmaX > 0.0f && sigmaY > 0.0f &&
+            (2 * radiusX + 1) * (2 * radiusY + 1) <= MAX_KERNEL_SIZE) {
+        // We shouldn't be scaling because this is a small size blur
+        SkASSERT((1 == scaleFactorX) && (1 == scaleFactorY));
+
+        SkAutoTUnref<GrDrawContext> dstDrawContext(
+                                             context->drawContext(dstTexture->asRenderTarget()));
+        if (!dstDrawContext) {
+            return nullptr;
+        }
+        convolve_gaussian_2d(dstDrawContext, clip, srcRect,
+                             srcTexture, radiusX, radiusY, sigmaX, sigmaY, srcBounds);
+
+        srcDrawContext.swap(dstDrawContext);
+        srcRect.offsetTo(0, 0);
+        srcTexture = dstTexture;
+        SkTSwap(dstTexture, tempTexture);
+
+    } else {
+        srcRect = localDstBounds;
+        scale_rect(&srcRect, 1.0f / scaleFactorX, 1.0f / scaleFactorY);
+        srcRect.roundOut(&srcRect);
+        const SkIRect srcIRect = srcRect.roundOut();
+        if (sigmaX > 0.0f) {
+            if (scaleFactorX > 1) {
+                // TODO: if we pass in the source draw context we don't need this here
+                if (!srcDrawContext) {
+                    srcDrawContext.reset(context->drawContext(srcTexture->asRenderTarget()));
+                    if (!srcDrawContext) {
+                        return nullptr;
+                    }        
+                }
+
+                // Clear out a radius to the right of the srcRect to prevent the
+                // X convolution from reading garbage.
+                clearRect = SkIRect::MakeXYWH(srcIRect.fRight, srcIRect.fTop,
+                                              radiusX, srcIRect.height());
+                srcDrawContext->clear(&clearRect, 0x0, false);
+            }
+
+            SkAutoTUnref<GrDrawContext> dstDrawContext(
+                                             context->drawContext(dstTexture->asRenderTarget()));
+            if (!dstDrawContext) {
+                return nullptr;
+            }
+            convolve_gaussian(dstDrawContext, clip, srcRect,
+                              srcTexture, Gr1DKernelEffect::kX_Direction, radiusX, sigmaX,
+                              srcBounds, srcOffset);
+            srcDrawContext.swap(dstDrawContext);
+            srcTexture = dstTexture;
+            srcRect.offsetTo(0, 0);
+            SkTSwap(dstTexture, tempTexture);
+            localSrcBounds = srcRect;
+            srcOffset.set(0, 0);
         }
 
-        context->setRenderTarget(dstTexture->asRenderTarget());
-        SkRect dstRect = SkRect::MakeWH(srcRect.width(), srcRect.height());
-        convolve_gaussian(context, srcRect, dstRect, srcTexture,
-                          Gr1DKernelEffect::kY_Direction, radiusY, sigmaY, cropToRect);
-        srcTexture = dstTexture;
-        srcRect = dstRect;
-        SkTSwap(dstTexture, tempTexture);
+        if (sigmaY > 0.0f) {
+            if (scaleFactorY > 1 || sigmaX > 0.0f) {
+                // TODO: if we pass in the source draw context we don't need this here
+                if (!srcDrawContext) {
+                    srcDrawContext.reset(context->drawContext(srcTexture->asRenderTarget()));
+                    if (!srcDrawContext) {
+                        return nullptr;
+                    }        
+                }
+
+                // Clear out a radius below the srcRect to prevent the Y
+                // convolution from reading garbage.
+                clearRect = SkIRect::MakeXYWH(srcIRect.fLeft, srcIRect.fBottom,
+                                              srcIRect.width(), radiusY);
+                srcDrawContext->clear(&clearRect, 0x0, false);
+            }
+
+            SkAutoTUnref<GrDrawContext> dstDrawContext(
+                                               context->drawContext(dstTexture->asRenderTarget()));
+            if (!dstDrawContext) {
+                return nullptr;
+            }
+            convolve_gaussian(dstDrawContext, clip, srcRect,
+                              srcTexture, Gr1DKernelEffect::kY_Direction, radiusY, sigmaY,
+                              srcBounds, srcOffset);
+
+            srcDrawContext.swap(dstDrawContext);
+            srcTexture = dstTexture;
+            srcRect.offsetTo(0, 0);
+            SkTSwap(dstTexture, tempTexture);
+        }
     }
+    const SkIRect srcIRect = srcRect.roundOut();
 
     if (scaleFactorX > 1 || scaleFactorY > 1) {
+        SkASSERT(srcDrawContext);
+
         // Clear one pixel to the right and below, to accommodate bilinear
         // upsampling.
         clearRect = SkIRect::MakeXYWH(srcIRect.fLeft, srcIRect.fBottom,
                                       srcIRect.width() + 1, 1);
-        context->clear(&clearRect, 0x0, false);
+        srcDrawContext->clear(&clearRect, 0x0, false);
         clearRect = SkIRect::MakeXYWH(srcIRect.fRight, srcIRect.fTop,
                                       1, srcIRect.height());
-        context->clear(&clearRect, 0x0, false);
+        srcDrawContext->clear(&clearRect, 0x0, false);
         SkMatrix matrix;
         matrix.setIDiv(srcTexture->width(), srcTexture->height());
-        context->setRenderTarget(dstTexture->asRenderTarget());
 
         GrPaint paint;
         // FIXME:  this should be mitchell, not bilinear.
         GrTextureParams params(SkShader::kClamp_TileMode, GrTextureParams::kBilerp_FilterMode);
-        paint.addColorTextureEffect(srcTexture, matrix, params);
+        paint.addColorTextureProcessor(srcTexture, matrix, params);
+        paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode);
 
         SkRect dstRect(srcRect);
         scale_rect(&dstRect, (float) scaleFactorX, (float) scaleFactorY);
-        context->drawRectToRect(paint, dstRect, srcRect);
+
+        SkAutoTUnref<GrDrawContext> dstDrawContext(
+                                context->drawContext(dstTexture->asRenderTarget()));
+        if (!dstDrawContext) {
+            return nullptr;
+        }
+        dstDrawContext->fillRectToRect(clip, paint, SkMatrix::I(), dstRect, srcRect);
+
+        srcDrawContext.swap(dstDrawContext);
         srcRect = dstRect;
         srcTexture = dstTexture;
         SkTSwap(dstTexture, tempTexture);
     }
-    if (srcTexture == temp1.texture()) {
-        return temp1.detach();
-    } else if (srcTexture == temp2.texture()) {
-        return temp2.detach();
-    } else {
-        srcTexture->ref();
-        return srcTexture;
-    }
+
+    return SkRef(srcTexture);
 }
 #endif
 
diff --git a/gfx/skia/skia/src/effects/SkGpuBlurUtils.h b/gfx/skia/skia/src/effects/SkGpuBlurUtils.h
index 98be8130e28b..84e3252cc2a4 100644
--- a/gfx/skia/skia/src/effects/SkGpuBlurUtils.h
+++ b/gfx/skia/skia/src/effects/SkGpuBlurUtils.h
@@ -9,6 +9,8 @@
 #define SkGpuBlurUtils_DEFINED
 
 #if SK_SUPPORT_GPU
+#include "GrTextureProvider.h"
+
 class GrTexture;
 class GrContext;
 #endif
@@ -24,9 +26,9 @@ namespace SkGpuBlurUtils {
     * @param srcTexture      The source texture to be blurred.
     * @param canClobberSrc   If true, srcTexture may be overwritten, and
     *                        may be returned as the result.
-    * @param rect            The destination rectangle.
-    * @param cropToRect      If true, do not sample any pixels outside the
-    *                        source rect.
+    * @param dstBounds       The destination bounds, relative to the source texture.
+    * @param srcBounds       The source bounds, relative to the source texture. If non-null,
+    *                        no pixels will be sampled outside of this rectangle.
     * @param sigmaX          The blur's standard deviation in X.
     * @param sigmaY          The blur's standard deviation in Y.
     * @return the blurred texture, which may be srcTexture reffed, or a
@@ -35,10 +37,11 @@ namespace SkGpuBlurUtils {
     GrTexture* GaussianBlur(GrContext* context,
                             GrTexture* srcTexture,
                             bool canClobberSrc,
-                            const SkRect& rect,
-                            bool cropToRect,
+                            const SkRect& dstBounds,
+                            const SkRect* srcBounds,
                             float sigmaX,
-                            float sigmaY);
+                            float sigmaY,
+                            GrTextureProvider::SizeConstraint);
 #endif
 
 };
diff --git a/gfx/skia/skia/src/effects/SkImageSource.cpp b/gfx/skia/skia/src/effects/SkImageSource.cpp
new file mode 100644
index 000000000000..2686fcb6c6ca
--- /dev/null
+++ b/gfx/skia/skia/src/effects/SkImageSource.cpp
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkImageSource.h"
+
+#include "SkCanvas.h"
+#include "SkDevice.h"
+#include "SkImage.h"
+#include "SkReadBuffer.h"
+#include "SkWriteBuffer.h"
+#include "SkString.h"
+
+SkImageFilter* SkImageSource::Create(const SkImage* image) {
+    return image ? new SkImageSource(image) : nullptr;
+}
+
+SkImageFilter* SkImageSource::Create(const SkImage* image,
+                                     const SkRect& srcRect,
+                                     const SkRect& dstRect,
+                                     SkFilterQuality filterQuality) {
+    return image ? new SkImageSource(image, srcRect, dstRect, filterQuality) : nullptr;
+}
+
+SkImageSource::SkImageSource(const SkImage* image)
+    : INHERITED(0, nullptr)
+    , fImage(SkRef(image))
+    , fSrcRect(SkRect::MakeIWH(image->width(), image->height()))
+    , fDstRect(fSrcRect)
+    , fFilterQuality(kHigh_SkFilterQuality) { }
+
+SkImageSource::SkImageSource(const SkImage* image,
+                             const SkRect& srcRect,
+                             const SkRect& dstRect,
+                             SkFilterQuality filterQuality)
+    : INHERITED(0, nullptr)
+    , fImage(SkRef(image))
+    , fSrcRect(srcRect)
+    , fDstRect(dstRect)
+    , fFilterQuality(filterQuality) { }
+
+SkFlattenable* SkImageSource::CreateProc(SkReadBuffer& buffer) {
+    SkFilterQuality filterQuality = (SkFilterQuality)buffer.readInt();
+
+    SkRect src, dst;
+    buffer.readRect(&src);
+    buffer.readRect(&dst);
+
+    SkAutoTUnref<SkImage> image(buffer.readImage());
+    if (!image) {
+        return nullptr;
+    }
+
+    return SkImageSource::Create(image, src, dst, filterQuality);
+}
+
+void SkImageSource::flatten(SkWriteBuffer& buffer) const {
+    buffer.writeInt(fFilterQuality);
+    buffer.writeRect(fSrcRect);
+    buffer.writeRect(fDstRect);
+    buffer.writeImage(fImage);
+}
+
+bool SkImageSource::onFilterImage(Proxy* proxy, const SkBitmap& src, const Context& ctx,
+                                  SkBitmap* result, SkIPoint* offset) const {
+    SkRect dstRect;
+    ctx.ctm().mapRect(&dstRect, fDstRect);
+    SkRect bounds = SkRect::MakeIWH(fImage->width(), fImage->height());
+    if (fSrcRect == bounds && dstRect == bounds) {
+        // No regions cropped out or resized; return entire image.
+        offset->fX = offset->fY = 0;
+        return fImage->asLegacyBitmap(result, SkImage::kRO_LegacyBitmapMode);
+    }
+
+    const SkIRect dstIRect = dstRect.roundOut();
+    SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(dstIRect.width(), dstIRect.height()));
+    if (nullptr == device.get()) {
+        return false;
+    }
+
+    SkCanvas canvas(device.get());
+    SkPaint paint;
+
+    // Subtract off the integer component of the translation (will be applied in loc, below).
+    dstRect.offset(-SkIntToScalar(dstIRect.fLeft), -SkIntToScalar(dstIRect.fTop));
+    paint.setXfermodeMode(SkXfermode::kSrc_Mode);
+    // FIXME: this probably shouldn't be necessary, but drawImageRect asserts
+    // None filtering when it's translate-only
+    paint.setFilterQuality(
+        fSrcRect.width() == dstRect.width() && fSrcRect.height() == dstRect.height() ?
+               kNone_SkFilterQuality : fFilterQuality);
+    canvas.drawImageRect(fImage, fSrcRect, dstRect, &paint, SkCanvas::kStrict_SrcRectConstraint);
+
+    *result = device.get()->accessBitmap(false);
+    offset->fX = dstIRect.fLeft;
+    offset->fY = dstIRect.fTop;
+
+    return true;
+}
+
+void SkImageSource::computeFastBounds(const SkRect& src, SkRect* dst) const {
+    *dst = fDstRect;
+}
+
+#ifndef SK_IGNORE_TO_STRING
+void SkImageSource::toString(SkString* str) const {
+    str->appendf("SkImageSource: (");
+    str->appendf("src: (%f,%f,%f,%f) dst: (%f,%f,%f,%f) ",
+                 fSrcRect.fLeft, fSrcRect.fTop, fSrcRect.fRight, fSrcRect.fBottom,
+                 fDstRect.fLeft, fDstRect.fTop, fDstRect.fRight, fDstRect.fBottom);
+    str->appendf("image: (%d,%d)",
+                 fImage->width(), fImage->height());
+    str->append(")");
+}
+#endif
diff --git a/gfx/skia/skia/src/effects/SkLayerDrawLooper.cpp b/gfx/skia/skia/src/effects/SkLayerDrawLooper.cpp
index aed2c9bbd4ef..bca65ef77a2c 100644
--- a/gfx/skia/skia/src/effects/SkLayerDrawLooper.cpp
+++ b/gfx/skia/skia/src/effects/SkLayerDrawLooper.cpp
@@ -22,8 +22,7 @@ SkLayerDrawLooper::LayerInfo::LayerInfo() {
 }
 
 SkLayerDrawLooper::SkLayerDrawLooper()
-        : fRecs(NULL),
-          fTopRec(NULL),
+        : fRecs(nullptr),
           fCount(0) {
 }
 
@@ -31,14 +30,14 @@ SkLayerDrawLooper::~SkLayerDrawLooper() {
     Rec* rec = fRecs;
     while (rec) {
         Rec* next = rec->fNext;
-        SkDELETE(rec);
+        delete rec;
         rec = next;
     }
 }
 
 SkLayerDrawLooper::Context* SkLayerDrawLooper::createContext(SkCanvas* canvas, void* storage) const {
     canvas->save();
-    return SkNEW_PLACEMENT_ARGS(storage, LayerDrawLooperContext, (this));
+    return new (storage) LayerDrawLooperContext(this);
 }
 
 static SkColor xferColor(SkColor src, SkColor dst, SkXfermode::Mode mode) {
@@ -134,7 +133,7 @@ SkLayerDrawLooper::LayerDrawLooperContext::LayerDrawLooperContext(
 bool SkLayerDrawLooper::LayerDrawLooperContext::next(SkCanvas* canvas,
                                                      SkPaint* paint) {
     canvas->restore();
-    if (NULL == fCurrRec) {
+    if (nullptr == fCurrRec) {
         return false;
     }
 
@@ -167,7 +166,7 @@ bool SkLayerDrawLooper::asABlurShadow(BlurShadowRec* bsRec) const {
         return false;
     }
     const SkMaskFilter* mf = rec->fPaint.getMaskFilter();
-    if (NULL == mf) {
+    if (nullptr == mf) {
         return false;
     }
     SkMaskFilter::BlurRec maskBlur;
@@ -200,20 +199,6 @@ bool SkLayerDrawLooper::asABlurShadow(BlurShadowRec* bsRec) const {
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkLayerDrawLooper::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
-
-#ifdef SK_DEBUG
-    {
-        Rec* rec = fRecs;
-        int count = 0;
-        while (rec) {
-            rec = rec->fNext;
-            count += 1;
-        }
-        SkASSERT(count == fCount);
-    }
-#endif
-
     buffer.writeInt(fCount);
 
     Rec* rec = fRecs;
@@ -245,22 +230,7 @@ SkFlattenable* SkLayerDrawLooper::CreateProc(SkReadBuffer& buffer) {
         info.fPostTranslate = buffer.readBool();
         buffer.readPaint(builder.addLayerOnTop(info));
     }
-    SkLayerDrawLooper* looper = builder.detachLooper();
-    SkASSERT(count == looper->fCount);
-
-#ifdef SK_DEBUG
-    {
-        Rec* rec = looper->fRecs;
-        int n = 0;
-        while (rec) {
-            rec = rec->fNext;
-            n += 1;
-        }
-        SkASSERT(count == n);
-    }
-#endif
-
-    return looper;
+    return builder.detachLooper();
 }
 
 #ifndef SK_IGNORE_TO_STRING
@@ -322,8 +292,8 @@ void SkLayerDrawLooper::toString(SkString* str) const {
 #endif
 
 SkLayerDrawLooper::Builder::Builder()
-        : fRecs(NULL),
-          fTopRec(NULL),
+        : fRecs(nullptr),
+          fTopRec(nullptr),
           fCount(0) {
 }
 
@@ -331,7 +301,7 @@ SkLayerDrawLooper::Builder::~Builder() {
     Rec* rec = fRecs;
     while (rec) {
         Rec* next = rec->fNext;
-        SkDELETE(rec);
+        delete rec;
         rec = next;
     }
 }
@@ -339,11 +309,11 @@ SkLayerDrawLooper::Builder::~Builder() {
 SkPaint* SkLayerDrawLooper::Builder::addLayer(const LayerInfo& info) {
     fCount += 1;
 
-    Rec* rec = SkNEW(Rec);
+    Rec* rec = new Rec;
     rec->fNext = fRecs;
     rec->fInfo = info;
     fRecs = rec;
-    if (NULL == fTopRec) {
+    if (nullptr == fTopRec) {
         fTopRec = rec;
     }
 
@@ -360,13 +330,13 @@ void SkLayerDrawLooper::Builder::addLayer(SkScalar dx, SkScalar dy) {
 SkPaint* SkLayerDrawLooper::Builder::addLayerOnTop(const LayerInfo& info) {
     fCount += 1;
 
-    Rec* rec = SkNEW(Rec);
-    rec->fNext = NULL;
+    Rec* rec = new Rec;
+    rec->fNext = nullptr;
     rec->fInfo = info;
-    if (NULL == fRecs) {
+    if (nullptr == fRecs) {
         fRecs = rec;
     } else {
-        SkASSERT(NULL != fTopRec);
+        SkASSERT(fTopRec);
         fTopRec->fNext = rec;
     }
     fTopRec = rec;
@@ -375,13 +345,13 @@ SkPaint* SkLayerDrawLooper::Builder::addLayerOnTop(const LayerInfo& info) {
 }
 
 SkLayerDrawLooper* SkLayerDrawLooper::Builder::detachLooper() {
-    SkLayerDrawLooper* looper = SkNEW(SkLayerDrawLooper);
+    SkLayerDrawLooper* looper = new SkLayerDrawLooper;
     looper->fCount = fCount;
     looper->fRecs = fRecs;
 
     fCount = 0;
-    fRecs = NULL;
-    fTopRec = NULL;
+    fRecs = nullptr;
+    fTopRec = nullptr;
 
     return looper;
 }
diff --git a/gfx/skia/skia/src/effects/SkLayerRasterizer.cpp b/gfx/skia/skia/src/effects/SkLayerRasterizer.cpp
index 9b7bdca3f4b7..6c08afc6f5c1 100644
--- a/gfx/skia/skia/src/effects/SkLayerRasterizer.cpp
+++ b/gfx/skia/skia/src/effects/SkLayerRasterizer.cpp
@@ -25,10 +25,7 @@ struct SkLayerRasterizer_Rec {
     SkVector    fOffset;
 };
 
-SkLayerRasterizer::SkLayerRasterizer()
-    : fLayers(SkNEW_ARGS(SkDeque, (sizeof(SkLayerRasterizer_Rec))))
-{
-}
+SkLayerRasterizer::SkLayerRasterizer() : fLayers(new SkDeque(sizeof(SkLayerRasterizer_Rec))) {}
 
 SkLayerRasterizer::SkLayerRasterizer(SkDeque* layers) : fLayers(layers)
 {
@@ -39,10 +36,10 @@ static void clean_up_layers(SkDeque* layers) {
     SkDeque::F2BIter        iter(*layers);
     SkLayerRasterizer_Rec*  rec;
 
-    while ((rec = (SkLayerRasterizer_Rec*)iter.next()) != NULL)
+    while ((rec = (SkLayerRasterizer_Rec*)iter.next()) != nullptr)
         rec->fPaint.~SkPaint();
 
-    SkDELETE(layers);
+    delete layers;
 }
 
 SkLayerRasterizer::~SkLayerRasterizer() {
@@ -58,7 +55,7 @@ static bool compute_bounds(const SkDeque& layers, const SkPath& path,
 
     bounds->set(SK_MaxS32, SK_MaxS32, SK_MinS32, SK_MinS32);
 
-    while ((rec = (SkLayerRasterizer_Rec*)iter.next()) != NULL) {
+    while ((rec = (SkLayerRasterizer_Rec*)iter.next()) != nullptr) {
         const SkPaint&  paint = rec->fPaint;
         SkPath          fillPath, devPath;
         const SkPath*   p = &path;
@@ -116,9 +113,12 @@ bool SkLayerRasterizer::onRasterize(const SkPath& path, const SkMatrix& matrix,
     }
 
     if (SkMask::kJustComputeBounds_CreateMode != mode) {
-        SkBitmap        device;
-        SkRasterClip    rectClip;
         SkDraw          draw;
+        if (!draw.fDst.reset(*mask)) {
+            return false;
+        }
+
+        SkRasterClip    rectClip;
         SkMatrix        translatedMatrix;  // this translates us to our local pixels
         SkMatrix        drawMatrix;        // this translates the path by each layer's offset
 
@@ -128,9 +128,6 @@ bool SkLayerRasterizer::onRasterize(const SkPath& path, const SkMatrix& matrix,
         translatedMatrix.postTranslate(-SkIntToScalar(mask->fBounds.fLeft),
                                        -SkIntToScalar(mask->fBounds.fTop));
 
-        device.installMaskPixels(*mask);
-
-        draw.fBitmap    = &device;
         draw.fMatrix    = &drawMatrix;
         draw.fRC        = &rectClip;
         draw.fClip      = &rectClip.bwRgn();
@@ -139,7 +136,7 @@ bool SkLayerRasterizer::onRasterize(const SkPath& path, const SkMatrix& matrix,
         SkDeque::F2BIter        iter(*fLayers);
         SkLayerRasterizer_Rec*  rec;
 
-        while ((rec = (SkLayerRasterizer_Rec*)iter.next()) != NULL) {
+        while ((rec = (SkLayerRasterizer_Rec*)iter.next()) != nullptr) {
             drawMatrix = translatedMatrix;
             drawMatrix.preTranslate(rec->fOffset.fX, rec->fOffset.fY);
             draw.drawPath(path, rec->fPaint);
@@ -148,17 +145,18 @@ bool SkLayerRasterizer::onRasterize(const SkPath& path, const SkMatrix& matrix,
     return true;
 }
 
-SkLayerRasterizer::SkLayerRasterizer(SkReadBuffer& buffer)
-    : SkRasterizer(buffer), fLayers(ReadLayers(buffer)) {}
+SkFlattenable* SkLayerRasterizer::CreateProc(SkReadBuffer& buffer) {
+    return new SkLayerRasterizer(ReadLayers(buffer));
+}
 
 SkDeque* SkLayerRasterizer::ReadLayers(SkReadBuffer& buffer) {
     int count = buffer.readInt();
 
-    SkDeque* layers = SkNEW_ARGS(SkDeque, (sizeof(SkLayerRasterizer_Rec)));
+    SkDeque* layers = new SkDeque(sizeof(SkLayerRasterizer_Rec));
     for (int i = 0; i < count; i++) {
         SkLayerRasterizer_Rec* rec = (SkLayerRasterizer_Rec*)layers->push_back();
 
-        SkNEW_PLACEMENT(&rec->fPaint, SkPaint);
+        new (&rec->fPaint) SkPaint;
         buffer.readPaint(&rec->fPaint);
         buffer.readPoint(&rec->fOffset);
     }
@@ -174,20 +172,17 @@ void SkLayerRasterizer::flatten(SkWriteBuffer& buffer) const {
     SkDeque::F2BIter                iter(*fLayers);
     const SkLayerRasterizer_Rec*    rec;
 
-    while ((rec = (const SkLayerRasterizer_Rec*)iter.next()) != NULL) {
+    while ((rec = (const SkLayerRasterizer_Rec*)iter.next()) != nullptr) {
         buffer.writePaint(rec->fPaint);
         buffer.writePoint(rec->fOffset);
     }
 }
 
-SkLayerRasterizer::Builder::Builder()
-        : fLayers(SkNEW_ARGS(SkDeque, (sizeof(SkLayerRasterizer_Rec))))
-{
-}
+SkLayerRasterizer::Builder::Builder() : fLayers(new SkDeque(sizeof(SkLayerRasterizer_Rec))) {}
 
 SkLayerRasterizer::Builder::~Builder()
 {
-    if (fLayers != NULL) {
+    if (fLayers != nullptr) {
         clean_up_layers(fLayers);
     }
 }
@@ -197,38 +192,38 @@ void SkLayerRasterizer::Builder::addLayer(const SkPaint& paint, SkScalar dx,
     SkASSERT(fLayers);
     SkLayerRasterizer_Rec* rec = (SkLayerRasterizer_Rec*)fLayers->push_back();
 
-    SkNEW_PLACEMENT_ARGS(&rec->fPaint, SkPaint, (paint));
+    new (&rec->fPaint) SkPaint(paint);
     rec->fOffset.set(dx, dy);
 }
 
 SkLayerRasterizer* SkLayerRasterizer::Builder::detachRasterizer() {
     SkLayerRasterizer* rasterizer;
     if (0 == fLayers->count()) {
-        rasterizer = NULL;
-        SkDELETE(fLayers);
+        rasterizer = nullptr;
+        delete fLayers;
     } else {
-        rasterizer = SkNEW_ARGS(SkLayerRasterizer, (fLayers));
+        rasterizer = new SkLayerRasterizer(fLayers);
     }
-    fLayers = NULL;
+    fLayers = nullptr;
     return rasterizer;
 }
 
 SkLayerRasterizer* SkLayerRasterizer::Builder::snapshotRasterizer() const {
     if (0 == fLayers->count()) {
-        return NULL;
+        return nullptr;
     }
-    SkDeque* layers = SkNEW_ARGS(SkDeque, (sizeof(SkLayerRasterizer_Rec), fLayers->count()));
+    SkDeque* layers = new SkDeque(sizeof(SkLayerRasterizer_Rec), fLayers->count());
     SkDeque::F2BIter                iter(*fLayers);
     const SkLayerRasterizer_Rec*    recOrig;
     SkDEBUGCODE(int                 count = 0;)
-    while ((recOrig = static_cast<SkLayerRasterizer_Rec*>(iter.next())) != NULL) {
+    while ((recOrig = static_cast<SkLayerRasterizer_Rec*>(iter.next())) != nullptr) {
         SkDEBUGCODE(count++);
         SkLayerRasterizer_Rec* recCopy = static_cast<SkLayerRasterizer_Rec*>(layers->push_back());
-        SkNEW_PLACEMENT_ARGS(&recCopy->fPaint, SkPaint, (recOrig->fPaint));
+        new (&recCopy->fPaint) SkPaint(recOrig->fPaint);
         recCopy->fOffset = recOrig->fOffset;
     }
     SkASSERT(fLayers->count() == count);
     SkASSERT(layers->count() == count);
-    SkLayerRasterizer* rasterizer = SkNEW_ARGS(SkLayerRasterizer, (layers));
+    SkLayerRasterizer* rasterizer = new SkLayerRasterizer(layers);
     return rasterizer;
 }
diff --git a/gfx/skia/skia/src/effects/SkLerpXfermode.cpp b/gfx/skia/skia/src/effects/SkLerpXfermode.cpp
index c8389fea799c..a9b0d9e3e75f 100644
--- a/gfx/skia/skia/src/effects/SkLerpXfermode.cpp
+++ b/gfx/skia/skia/src/effects/SkLerpXfermode.cpp
@@ -18,19 +18,17 @@ SkXfermode* SkLerpXfermode::Create(SkScalar scale) {
     } else if (scale256 <= 0) {
         return SkXfermode::Create(SkXfermode::kDst_Mode);
     }
-    return SkNEW_ARGS(SkLerpXfermode, (scale256));
+    return new SkLerpXfermode(scale256);
 }
 
 SkLerpXfermode::SkLerpXfermode(unsigned scale256) : fScale256(scale256) {}
 
-SkLerpXfermode::SkLerpXfermode(SkReadBuffer& buffer)
-    : INHERITED(buffer) {
-    fScale256 = buffer.readUInt();
+void SkLerpXfermode::flatten(SkWriteBuffer& buffer) const {
+    buffer.writeUInt(fScale256);
 }
 
-void SkLerpXfermode::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
-    buffer.writeUInt(fScale256);
+SkFlattenable* SkLerpXfermode::CreateProc(SkReadBuffer& buffer) {
+    return new SkLerpXfermode(buffer.readUInt());
 }
 
 void SkLerpXfermode::xfer32(SkPMColor dst[], const SkPMColor src[], int count,
diff --git a/gfx/skia/skia/src/effects/SkLightingImageFilter.cpp b/gfx/skia/skia/src/effects/SkLightingImageFilter.cpp
index 6e6828b74561..9b6a20f0efb0 100644
--- a/gfx/skia/skia/src/effects/SkLightingImageFilter.cpp
+++ b/gfx/skia/skia/src/effects/SkLightingImageFilter.cpp
@@ -8,41 +8,48 @@
 #include "SkLightingImageFilter.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
+#include "SkDevice.h"
+#include "SkPoint3.h"
 #include "SkReadBuffer.h"
-#include "SkWriteBuffer.h"
-#include "SkReadBuffer.h"
-#include "SkWriteBuffer.h"
 #include "SkTypes.h"
+#include "SkWriteBuffer.h"
 
 #if SK_SUPPORT_GPU
+#include "GrContext.h"
+#include "GrDrawContext.h"
+#include "GrFragmentProcessor.h"
+#include "GrInvariantOutput.h"
+#include "GrPaint.h"
 #include "effects/GrSingleTextureEffect.h"
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
-#include "GrEffect.h"
-#include "GrTBackendEffectFactory.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
 
 class GrGLDiffuseLightingEffect;
 class GrGLSpecularLightingEffect;
 
 // For brevity
-typedef GrGLUniformManager::UniformHandle UniformHandle;
+typedef GrGLSLProgramDataManager::UniformHandle UniformHandle;
 #endif
 
 namespace {
 
-const SkScalar gOneThird = SkScalarInvert(SkIntToScalar(3));
-const SkScalar gTwoThirds = SkScalarDiv(SkIntToScalar(2), SkIntToScalar(3));
+const SkScalar gOneThird = SkIntToScalar(1) / 3;
+const SkScalar gTwoThirds = SkIntToScalar(2) / 3;
 const SkScalar gOneHalf = 0.5f;
 const SkScalar gOneQuarter = 0.25f;
 
 #if SK_SUPPORT_GPU
-void setUniformPoint3(const GrGLUniformManager& uman, UniformHandle uni, const SkPoint3& point) {
-    GR_STATIC_ASSERT(sizeof(SkPoint3) == 3 * sizeof(GrGLfloat));
-    uman.set3fv(uni, 1, &point.fX);
+void setUniformPoint3(const GrGLSLProgramDataManager& pdman, UniformHandle uni,
+                      const SkPoint3& point) {
+    GR_STATIC_ASSERT(sizeof(SkPoint3) == 3 * sizeof(float));
+    pdman.set3fv(uni, 1, &point.fX);
 }
 
-void setUniformNormal3(const GrGLUniformManager& uman, UniformHandle uni, const SkPoint3& point) {
-    setUniformPoint3(uman, uni, SkPoint3(point.fX, point.fY, point.fZ));
+void setUniformNormal3(const GrGLSLProgramDataManager& pdman, UniformHandle uni,
+                       const SkPoint3& point) {
+    setUniformPoint3(pdman, uni, point);
 }
 #endif
 
@@ -56,14 +63,24 @@ inline void shiftMatrixLeft(int m[9]) {
     m[7] = m[8];
 }
 
+static inline void fast_normalize(SkPoint3* vector) {
+    // add a tiny bit so we don't have to worry about divide-by-zero
+    SkScalar magSq = vector->dot(*vector) + SK_ScalarNearlyZero;
+    SkScalar scale = sk_float_rsqrt(magSq);
+    vector->fX *= scale;
+    vector->fY *= scale;
+    vector->fZ *= scale;
+}
+
 class DiffuseLightingType {
 public:
     DiffuseLightingType(SkScalar kd)
         : fKD(kd) {}
-    SkPMColor light(const SkPoint3& normal, const SkPoint3& surfaceTolight, const SkPoint3& lightColor) const {
+    SkPMColor light(const SkPoint3& normal, const SkPoint3& surfaceTolight,
+                    const SkPoint3& lightColor) const {
         SkScalar colorScale = SkScalarMul(fKD, normal.dot(surfaceTolight));
         colorScale = SkScalarClampMax(colorScale, SK_Scalar1);
-        SkPoint3 color(lightColor * colorScale);
+        SkPoint3 color = lightColor.makeScale(colorScale);
         return SkPackARGB32(255,
                             SkClampMax(SkScalarRoundToInt(color.fX), 255),
                             SkClampMax(SkScalarRoundToInt(color.fY), 255),
@@ -73,19 +90,24 @@ private:
     SkScalar fKD;
 };
 
+static SkScalar max_component(const SkPoint3& p) {
+    return p.x() > p.y() ? (p.x() > p.z() ? p.x() : p.z()) : (p.y() > p.z() ? p.y() : p.z());
+}
+
 class SpecularLightingType {
 public:
     SpecularLightingType(SkScalar ks, SkScalar shininess)
         : fKS(ks), fShininess(shininess) {}
-    SkPMColor light(const SkPoint3& normal, const SkPoint3& surfaceTolight, const SkPoint3& lightColor) const {
+    SkPMColor light(const SkPoint3& normal, const SkPoint3& surfaceTolight,
+                    const SkPoint3& lightColor) const {
         SkPoint3 halfDir(surfaceTolight);
         halfDir.fZ += SK_Scalar1;        // eye position is always (0, 0, 1)
-        halfDir.normalize();
+        fast_normalize(&halfDir);
         SkScalar colorScale = SkScalarMul(fKS,
             SkScalarPow(normal.dot(halfDir), fShininess));
         colorScale = SkScalarClampMax(colorScale, SK_Scalar1);
-        SkPoint3 color(lightColor * colorScale);
-        return SkPackARGB32(SkClampMax(SkScalarRoundToInt(color.maxComponent()), 255),
+        SkPoint3 color = lightColor.makeScale(colorScale);
+        return SkPackARGB32(SkClampMax(SkScalarRoundToInt(max_component(color)), 255),
                             SkClampMax(SkScalarRoundToInt(color.fX), 255),
                             SkClampMax(SkScalarRoundToInt(color.fY), 255),
                             SkClampMax(SkScalarRoundToInt(color.fZ), 255));
@@ -100,10 +122,10 @@ inline SkScalar sobel(int a, int b, int c, int d, int e, int f, SkScalar scale)
 }
 
 inline SkPoint3 pointToNormal(SkScalar x, SkScalar y, SkScalar surfaceScale) {
-    SkPoint3 vector(SkScalarMul(-x, surfaceScale),
-                    SkScalarMul(-y, surfaceScale),
-                    SK_Scalar1);
-    vector.normalize();
+    SkPoint3 vector = SkPoint3::Make(SkScalarMul(-x, surfaceScale),
+                                     SkScalarMul(-y, surfaceScale),
+                                     SK_Scalar1);
+    fast_normalize(&vector);
     return vector;
 }
 
@@ -162,7 +184,12 @@ inline SkPoint3 bottomRightNormal(int m[9], SkScalar surfaceScale) {
                          surfaceScale);
 }
 
-template <class LightingType, class LightType> void lightBitmap(const LightingType& lightingType, const SkLight* light, const SkBitmap& src, SkBitmap* dst, SkScalar surfaceScale, const SkIRect& bounds) {
+template <class LightingType, class LightType> void lightBitmap(const LightingType& lightingType,
+                                                                const SkImageFilterLight* light,
+                                                                const SkBitmap& src,
+                                                                SkBitmap* dst,
+                                                                SkScalar surfaceScale,
+                                                                const SkIRect& bounds) {
     SkASSERT(dst->width() == bounds.width() && dst->height() == bounds.height());
     const LightType* l = static_cast<const LightType*>(light);
     int left = bounds.left(), right = bounds.right();
@@ -179,18 +206,21 @@ template <class LightingType, class LightType> void lightBitmap(const LightingTy
         m[7] = SkGetPackedA32(*row2++);
         m[8] = SkGetPackedA32(*row2++);
         SkPoint3 surfaceToLight = l->surfaceToLight(x, y, m[4], surfaceScale);
-        *dptr++ = lightingType.light(topLeftNormal(m, surfaceScale), surfaceToLight, l->lightColor(surfaceToLight));
+        *dptr++ = lightingType.light(topLeftNormal(m, surfaceScale), surfaceToLight,
+                                     l->lightColor(surfaceToLight));
         for (++x; x < right - 1; ++x)
         {
             shiftMatrixLeft(m);
             m[5] = SkGetPackedA32(*row1++);
             m[8] = SkGetPackedA32(*row2++);
             surfaceToLight = l->surfaceToLight(x, y, m[4], surfaceScale);
-            *dptr++ = lightingType.light(topNormal(m, surfaceScale), surfaceToLight, l->lightColor(surfaceToLight));
+            *dptr++ = lightingType.light(topNormal(m, surfaceScale), surfaceToLight,
+                                         l->lightColor(surfaceToLight));
         }
         shiftMatrixLeft(m);
         surfaceToLight = l->surfaceToLight(x, y, m[4], surfaceScale);
-        *dptr++ = lightingType.light(topRightNormal(m, surfaceScale), surfaceToLight, l->lightColor(surfaceToLight));
+        *dptr++ = lightingType.light(topRightNormal(m, surfaceScale), surfaceToLight,
+                                     l->lightColor(surfaceToLight));
     }
 
     for (++y; y < bottom - 1; ++y) {
@@ -206,18 +236,21 @@ template <class LightingType, class LightType> void lightBitmap(const LightingTy
         m[7] = SkGetPackedA32(*row2++);
         m[8] = SkGetPackedA32(*row2++);
         SkPoint3 surfaceToLight = l->surfaceToLight(x, y, m[4], surfaceScale);
-        *dptr++ = lightingType.light(leftNormal(m, surfaceScale), surfaceToLight, l->lightColor(surfaceToLight));
+        *dptr++ = lightingType.light(leftNormal(m, surfaceScale), surfaceToLight,
+                                     l->lightColor(surfaceToLight));
         for (++x; x < right - 1; ++x) {
             shiftMatrixLeft(m);
             m[2] = SkGetPackedA32(*row0++);
             m[5] = SkGetPackedA32(*row1++);
             m[8] = SkGetPackedA32(*row2++);
             surfaceToLight = l->surfaceToLight(x, y, m[4], surfaceScale);
-            *dptr++ = lightingType.light(interiorNormal(m, surfaceScale), surfaceToLight, l->lightColor(surfaceToLight));
+            *dptr++ = lightingType.light(interiorNormal(m, surfaceScale), surfaceToLight,
+                                         l->lightColor(surfaceToLight));
         }
         shiftMatrixLeft(m);
         surfaceToLight = l->surfaceToLight(x, y, m[4], surfaceScale);
-        *dptr++ = lightingType.light(rightNormal(m, surfaceScale), surfaceToLight, l->lightColor(surfaceToLight));
+        *dptr++ = lightingType.light(rightNormal(m, surfaceScale), surfaceToLight,
+                                     l->lightColor(surfaceToLight));
     }
 
     {
@@ -230,18 +263,21 @@ template <class LightingType, class LightType> void lightBitmap(const LightingTy
         m[4] = SkGetPackedA32(*row1++);
         m[5] = SkGetPackedA32(*row1++);
         SkPoint3 surfaceToLight = l->surfaceToLight(x, y, m[4], surfaceScale);
-        *dptr++ = lightingType.light(bottomLeftNormal(m, surfaceScale), surfaceToLight, l->lightColor(surfaceToLight));
+        *dptr++ = lightingType.light(bottomLeftNormal(m, surfaceScale), surfaceToLight,
+                                     l->lightColor(surfaceToLight));
         for (++x; x < right - 1; ++x)
         {
             shiftMatrixLeft(m);
             m[2] = SkGetPackedA32(*row0++);
             m[5] = SkGetPackedA32(*row1++);
             surfaceToLight = l->surfaceToLight(x, y, m[4], surfaceScale);
-            *dptr++ = lightingType.light(bottomNormal(m, surfaceScale), surfaceToLight, l->lightColor(surfaceToLight));
+            *dptr++ = lightingType.light(bottomNormal(m, surfaceScale), surfaceToLight,
+                                         l->lightColor(surfaceToLight));
         }
         shiftMatrixLeft(m);
         surfaceToLight = l->surfaceToLight(x, y, m[4], surfaceScale);
-        *dptr++ = lightingType.light(bottomRightNormal(m, surfaceScale), surfaceToLight, l->lightColor(surfaceToLight));
+        *dptr++ = lightingType.light(bottomRightNormal(m, surfaceScale), surfaceToLight,
+                                     l->lightColor(surfaceToLight));
     }
 }
 
@@ -262,148 +298,292 @@ void writePoint3(const SkPoint3& point, SkWriteBuffer& buffer) {
     buffer.writeScalar(point.fZ);
 };
 
-class SkDiffuseLightingImageFilter : public SkLightingImageFilter {
+enum BoundaryMode {
+    kTopLeft_BoundaryMode,
+    kTop_BoundaryMode,
+    kTopRight_BoundaryMode,
+    kLeft_BoundaryMode,
+    kInterior_BoundaryMode,
+    kRight_BoundaryMode,
+    kBottomLeft_BoundaryMode,
+    kBottom_BoundaryMode,
+    kBottomRight_BoundaryMode,
+
+    kBoundaryModeCount,
+};
+
+class SkLightingImageFilterInternal : public SkLightingImageFilter {
+protected:
+    SkLightingImageFilterInternal(SkImageFilterLight* light,
+                                  SkScalar surfaceScale,
+                                  SkImageFilter* input,
+                                  const CropRect* cropRect)
+      : INHERITED(light, surfaceScale, input, cropRect) {}
+
+#if SK_SUPPORT_GPU
+    bool canFilterImageGPU() const override { return true; }
+    bool filterImageGPU(Proxy*, const SkBitmap& src, const Context&,
+                        SkBitmap* result, SkIPoint* offset) const override;
+    virtual GrFragmentProcessor* getFragmentProcessor(GrTexture*,
+                                                      const SkMatrix&,
+                                                      const SkIRect& bounds,
+                                                      BoundaryMode boundaryMode) const = 0;
+#endif
+private:
+#if SK_SUPPORT_GPU
+    void drawRect(GrDrawContext* drawContext,
+                  GrTexture* src,
+                  const SkMatrix& matrix,
+                  const GrClip& clip,
+                  const SkRect& dstRect,
+                  BoundaryMode boundaryMode,
+                  const SkIRect& bounds) const;
+#endif
+    typedef SkLightingImageFilter INHERITED;
+};
+
+#if SK_SUPPORT_GPU
+void SkLightingImageFilterInternal::drawRect(GrDrawContext* drawContext,
+                                             GrTexture* src,
+                                             const SkMatrix& matrix,
+                                             const GrClip& clip,
+                                             const SkRect& dstRect,
+                                             BoundaryMode boundaryMode,
+                                             const SkIRect& bounds) const {
+    SkRect srcRect = dstRect.makeOffset(SkIntToScalar(bounds.x()), SkIntToScalar(bounds.y()));
+    GrPaint paint;
+    GrFragmentProcessor* fp = this->getFragmentProcessor(src, matrix, bounds, boundaryMode);
+    paint.addColorFragmentProcessor(fp)->unref();
+    paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode);
+    drawContext->fillRectToRect(clip, paint, SkMatrix::I(), dstRect, srcRect);
+}
+
+bool SkLightingImageFilterInternal::filterImageGPU(Proxy* proxy,
+                                                   const SkBitmap& src,
+                                                   const Context& ctx,
+                                                   SkBitmap* result,
+                                                   SkIPoint* offset) const {
+    SkBitmap input = src;
+    SkIPoint srcOffset = SkIPoint::Make(0, 0);
+    if (!this->filterInputGPU(0, proxy, src, ctx, &input, &srcOffset)) {
+        return false;
+    }
+    SkIRect bounds;
+    if (!this->applyCropRect(ctx, proxy, input, &srcOffset, &bounds, &input)) {
+        return false;
+    }
+    SkRect dstRect = SkRect::MakeWH(SkIntToScalar(bounds.width()),
+                                    SkIntToScalar(bounds.height()));
+    GrTexture* srcTexture = input.getTexture();
+    GrContext* context = srcTexture->getContext();
+
+    GrSurfaceDesc desc;
+    desc.fFlags = kRenderTarget_GrSurfaceFlag,
+    desc.fWidth = bounds.width();
+    desc.fHeight = bounds.height();
+    desc.fConfig = kRGBA_8888_GrPixelConfig;
+
+    auto constraint = GrTextureProvider::FromImageFilter(ctx.sizeConstraint());
+    SkAutoTUnref<GrTexture> dst(context->textureProvider()->createTexture(desc, constraint));
+    if (!dst) {
+        return false;
+    }
+
+    // setup new clip
+    GrClip clip(dstRect);
+
+    offset->fX = bounds.left();
+    offset->fY = bounds.top();
+    SkMatrix matrix(ctx.ctm());
+    matrix.postTranslate(SkIntToScalar(-bounds.left()), SkIntToScalar(-bounds.top()));
+    bounds.offset(-srcOffset);
+    SkRect topLeft = SkRect::MakeXYWH(0, 0, 1, 1);
+    SkRect top = SkRect::MakeXYWH(1, 0, dstRect.width() - 2, 1);
+    SkRect topRight = SkRect::MakeXYWH(dstRect.width() - 1, 0, 1, 1);
+    SkRect left = SkRect::MakeXYWH(0, 1, 1, dstRect.height() - 2);
+    SkRect interior = dstRect.makeInset(1, 1);
+    SkRect right = SkRect::MakeXYWH(dstRect.width() - 1, 1, 1, dstRect.height() - 2);
+    SkRect bottomLeft = SkRect::MakeXYWH(0, dstRect.height() - 1, 1, 1);
+    SkRect bottom = SkRect::MakeXYWH(1, dstRect.height() - 1, dstRect.width() - 2, 1);
+    SkRect bottomRight = SkRect::MakeXYWH(dstRect.width() - 1, dstRect.height() - 1, 1, 1);
+
+    SkAutoTUnref<GrDrawContext> drawContext(context->drawContext(dst->asRenderTarget()));
+    if (!drawContext) {
+        return false;
+    }
+
+    this->drawRect(drawContext, srcTexture, matrix, clip, topLeft, kTopLeft_BoundaryMode, bounds);
+    this->drawRect(drawContext, srcTexture, matrix, clip, top, kTop_BoundaryMode, bounds);
+    this->drawRect(drawContext, srcTexture, matrix, clip, topRight, kTopRight_BoundaryMode,
+                   bounds);
+    this->drawRect(drawContext, srcTexture, matrix, clip, left, kLeft_BoundaryMode, bounds);
+    this->drawRect(drawContext, srcTexture, matrix, clip, interior, kInterior_BoundaryMode,
+                   bounds);
+    this->drawRect(drawContext, srcTexture, matrix, clip, right, kRight_BoundaryMode, bounds);
+    this->drawRect(drawContext, srcTexture, matrix, clip, bottomLeft, kBottomLeft_BoundaryMode,
+                   bounds);
+    this->drawRect(drawContext, srcTexture, matrix, clip, bottom, kBottom_BoundaryMode, bounds);
+    this->drawRect(drawContext, srcTexture, matrix, clip, bottomRight,
+                   kBottomRight_BoundaryMode, bounds);
+    WrapTexture(dst, bounds.width(), bounds.height(), result);
+    return true;
+}
+#endif
+
+class SkDiffuseLightingImageFilter : public SkLightingImageFilterInternal {
 public:
-    SkDiffuseLightingImageFilter(SkLight* light, SkScalar surfaceScale,
-                                 SkScalar kd, SkImageFilter* input, const CropRect* cropRect);
+    static SkImageFilter* Create(SkImageFilterLight* light, SkScalar surfaceScale,
+                                 SkScalar kd, SkImageFilter*,
+                                 const CropRect*);
+
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDiffuseLightingImageFilter)
     SkScalar kd() const { return fKD; }
 
 protected:
-    explicit SkDiffuseLightingImageFilter(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE;
-    virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                               SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
+    SkDiffuseLightingImageFilter(SkImageFilterLight* light, SkScalar surfaceScale,
+                                 SkScalar kd, SkImageFilter* input, const CropRect* cropRect);
+    void flatten(SkWriteBuffer& buffer) const override;
+    bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
+                       SkBitmap* result, SkIPoint* offset) const override;
 #if SK_SUPPORT_GPU
-    virtual bool asNewEffect(GrEffect** effect, GrTexture*, const SkMatrix& matrix,
-                             const SkIRect& bounds) const SK_OVERRIDE;
+    GrFragmentProcessor* getFragmentProcessor(GrTexture*, const SkMatrix&, const SkIRect& bounds,
+                                              BoundaryMode) const override;
 #endif
 
 private:
-    typedef SkLightingImageFilter INHERITED;
+    friend class SkLightingImageFilter;
+    typedef SkLightingImageFilterInternal INHERITED;
     SkScalar fKD;
 };
 
-class SkSpecularLightingImageFilter : public SkLightingImageFilter {
+class SkSpecularLightingImageFilter : public SkLightingImageFilterInternal {
 public:
-    SkSpecularLightingImageFilter(SkLight* light, SkScalar surfaceScale, SkScalar ks, SkScalar shininess, SkImageFilter* input, const CropRect* cropRect);
+    static SkImageFilter* Create(SkImageFilterLight* light, SkScalar surfaceScale,
+                                 SkScalar ks, SkScalar shininess, SkImageFilter*, const CropRect*);
+
+    SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSpecularLightingImageFilter)
 
     SkScalar ks() const { return fKS; }
     SkScalar shininess() const { return fShininess; }
 
 protected:
-    explicit SkSpecularLightingImageFilter(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE;
-    virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
-                               SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
+    SkSpecularLightingImageFilter(SkImageFilterLight* light, SkScalar surfaceScale, SkScalar ks,
+                                  SkScalar shininess, SkImageFilter* input, const CropRect*);
+    void flatten(SkWriteBuffer& buffer) const override;
+    bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
+                       SkBitmap* result, SkIPoint* offset) const override;
 #if SK_SUPPORT_GPU
-    virtual bool asNewEffect(GrEffect** effect, GrTexture*, const SkMatrix& matrix,
-                             const SkIRect& bounds) const SK_OVERRIDE;
+    GrFragmentProcessor* getFragmentProcessor(GrTexture*, const SkMatrix&, const SkIRect& bounds,
+                                              BoundaryMode) const override;
 #endif
 
 private:
-    typedef SkLightingImageFilter INHERITED;
     SkScalar fKS;
     SkScalar fShininess;
+    friend class SkLightingImageFilter;
+    typedef SkLightingImageFilterInternal INHERITED;
 };
 
 #if SK_SUPPORT_GPU
 
 class GrLightingEffect : public GrSingleTextureEffect {
 public:
-    GrLightingEffect(GrTexture* texture, const SkLight* light, SkScalar surfaceScale, const SkMatrix& matrix);
-    virtual ~GrLightingEffect();
+    GrLightingEffect(GrTexture* texture, const SkImageFilterLight* light, SkScalar surfaceScale,
+                     const SkMatrix& matrix, BoundaryMode boundaryMode);
+    ~GrLightingEffect() override;
 
-    const SkLight* light() const { return fLight; }
+    const SkImageFilterLight* light() const { return fLight; }
     SkScalar surfaceScale() const { return fSurfaceScale; }
     const SkMatrix& filterMatrix() const { return fFilterMatrix; }
-
-    virtual void getConstantColorComponents(GrColor* color,
-                                            uint32_t* validFlags) const SK_OVERRIDE {
-        // lighting shaders are complicated. We just throw up our hands.
-        *validFlags = 0;
-    }
+    BoundaryMode boundaryMode() const { return fBoundaryMode; }
 
 protected:
-    virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE;
+    bool onIsEqual(const GrFragmentProcessor&) const override;
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override {
+        // lighting shaders are complicated. We just throw up our hands.
+        inout->mulByUnknownFourComponents();
+    }
 
 private:
-    typedef GrSingleTextureEffect INHERITED;
-    const SkLight* fLight;
+    const SkImageFilterLight* fLight;
     SkScalar fSurfaceScale;
     SkMatrix fFilterMatrix;
+    BoundaryMode fBoundaryMode;
+
+    typedef GrSingleTextureEffect INHERITED;
 };
 
 class GrDiffuseLightingEffect : public GrLightingEffect {
 public:
-    static GrEffect* Create(GrTexture* texture,
-                            const SkLight* light,
-                            SkScalar surfaceScale,
-                            const SkMatrix& matrix,
-                            SkScalar kd) {
-        return SkNEW_ARGS(GrDiffuseLightingEffect, (texture,
-                                                    light,
-                                                    surfaceScale,
-                                                    matrix,
-                                                    kd));
+    static GrFragmentProcessor* Create(GrTexture* texture,
+                                       const SkImageFilterLight* light,
+                                       SkScalar surfaceScale,
+                                       const SkMatrix& matrix,
+                                       SkScalar kd,
+                                       BoundaryMode boundaryMode) {
+        return new GrDiffuseLightingEffect(texture, light, surfaceScale, matrix, kd, boundaryMode);
     }
 
-    static const char* Name() { return "DiffuseLighting"; }
+    const char* name() const override { return "DiffuseLighting"; }
 
-    typedef GrGLDiffuseLightingEffect GLEffect;
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
     SkScalar kd() const { return fKD; }
 
 private:
-    virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE;
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
+
+    bool onIsEqual(const GrFragmentProcessor&) const override;
 
     GrDiffuseLightingEffect(GrTexture* texture,
-                            const SkLight* light,
+                            const SkImageFilterLight* light,
                             SkScalar surfaceScale,
                             const SkMatrix& matrix,
-                            SkScalar kd);
+                            SkScalar kd,
+                            BoundaryMode boundaryMode);
 
-    GR_DECLARE_EFFECT_TEST;
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
     typedef GrLightingEffect INHERITED;
     SkScalar fKD;
 };
 
 class GrSpecularLightingEffect : public GrLightingEffect {
 public:
-    static GrEffect* Create(GrTexture* texture,
-                            const SkLight* light,
-                            SkScalar surfaceScale,
-                            const SkMatrix& matrix,
-                            SkScalar ks,
-                            SkScalar shininess) {
-        return SkNEW_ARGS(GrSpecularLightingEffect, (texture,
-                                                     light,
-                                                     surfaceScale,
-                                                     matrix,
-                                                     ks,
-                                                     shininess));
+    static GrFragmentProcessor* Create(GrTexture* texture,
+                                       const SkImageFilterLight* light,
+                                       SkScalar surfaceScale,
+                                       const SkMatrix& matrix,
+                                       SkScalar ks,
+                                       SkScalar shininess,
+                                       BoundaryMode boundaryMode) {
+        return new GrSpecularLightingEffect(texture, light, surfaceScale, matrix, ks, shininess,
+                                            boundaryMode);
     }
-    static const char* Name() { return "SpecularLighting"; }
 
-    typedef GrGLSpecularLightingEffect GLEffect;
+    const char* name() const override { return "SpecularLighting"; }
+
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
 
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
     SkScalar ks() const { return fKS; }
     SkScalar shininess() const { return fShininess; }
 
 private:
-    virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE;
+    void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
+
+    bool onIsEqual(const GrFragmentProcessor&) const override;
 
     GrSpecularLightingEffect(GrTexture* texture,
-                             const SkLight* light,
+                             const SkImageFilterLight* light,
                              SkScalar surfaceScale,
                              const SkMatrix& matrix,
                              SkScalar ks,
-                             SkScalar shininess);
+                             SkScalar shininess,
+                             BoundaryMode boundaryMode);
 
-    GR_DECLARE_EFFECT_TEST;
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
     typedef GrLightingEffect INHERITED;
     SkScalar fKS;
     SkScalar fShininess;
@@ -419,7 +599,7 @@ public:
      * This is called by GrGLLightingEffect::emitCode() before either of the two virtual functions
      * below. It adds a vec3f uniform visible in the FS that represents the constant light color.
      */
-    void emitLightColorUniform(GrGLShaderBuilder*);
+    void emitLightColorUniform(GrGLSLFPBuilder*);
 
     /**
      * These two functions are called from GrGLLightingEffect's emitCode() function.
@@ -429,13 +609,14 @@ public:
      * the FS. The default of emitLightColor appends the name of the constant light color uniform
      * and so this function only needs to be overridden if the light color varies spatially.
      */
-    virtual void emitSurfaceToLight(GrGLShaderBuilder*, const char* z) = 0;
-    virtual void emitLightColor(GrGLShaderBuilder*, const char *surfaceToLight);
+    virtual void emitSurfaceToLight(GrGLSLFPBuilder*, GrGLSLFragmentBuilder*, const char* z) = 0;
+    virtual void emitLightColor(GrGLSLFPBuilder*,
+                                GrGLSLFragmentBuilder*,
+                                const char *surfaceToLight);
 
     // This is called from GrGLLightingEffect's setData(). Subclasses of GrGLLight must call
     // INHERITED::setData().
-    virtual void setData(const GrGLUniformManager&,
-                         const SkLight* light) const;
+    virtual void setData(const GrGLSLProgramDataManager&, const SkImageFilterLight* light) const;
 
 protected:
     /**
@@ -455,9 +636,8 @@ private:
 class GrGLDistantLight : public GrGLLight {
 public:
     virtual ~GrGLDistantLight() {}
-    virtual void setData(const GrGLUniformManager&,
-                         const SkLight* light) const SK_OVERRIDE;
-    virtual void emitSurfaceToLight(GrGLShaderBuilder*, const char* z) SK_OVERRIDE;
+    void setData(const GrGLSLProgramDataManager&, const SkImageFilterLight* light) const override;
+    void emitSurfaceToLight(GrGLSLFPBuilder*, GrGLSLFragmentBuilder*, const char* z) override;
 
 private:
     typedef GrGLLight INHERITED;
@@ -469,9 +649,8 @@ private:
 class GrGLPointLight : public GrGLLight {
 public:
     virtual ~GrGLPointLight() {}
-    virtual void setData(const GrGLUniformManager&,
-                         const SkLight* light) const SK_OVERRIDE;
-    virtual void emitSurfaceToLight(GrGLShaderBuilder*, const char* z) SK_OVERRIDE;
+    void setData(const GrGLSLProgramDataManager&, const SkImageFilterLight* light) const override;
+    void emitSurfaceToLight(GrGLSLFPBuilder*, GrGLSLFragmentBuilder*, const char* z) override;
 
 private:
     typedef GrGLLight INHERITED;
@@ -483,10 +662,11 @@ private:
 class GrGLSpotLight : public GrGLLight {
 public:
     virtual ~GrGLSpotLight() {}
-    virtual void setData(const GrGLUniformManager&,
-                         const SkLight* light) const SK_OVERRIDE;
-    virtual void emitSurfaceToLight(GrGLShaderBuilder*, const char* z) SK_OVERRIDE;
-    virtual void emitLightColor(GrGLShaderBuilder*, const char *surfaceToLight) SK_OVERRIDE;
+    void setData(const GrGLSLProgramDataManager&, const SkImageFilterLight* light) const override;
+    void emitSurfaceToLight(GrGLSLFPBuilder*, GrGLSLFragmentBuilder*, const char* z) override;
+    void emitLightColor(GrGLSLFPBuilder*,
+                        GrGLSLFragmentBuilder*,
+                        const char *surfaceToLight) override;
 
 private:
     typedef GrGLLight INHERITED;
@@ -509,9 +689,9 @@ class GrGLLight;
 
 ///////////////////////////////////////////////////////////////////////////////
 
-class SkLight : public SkRefCnt {
+class SkImageFilterLight : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkLight)
+    
 
     enum LightType {
         kDistant_LightType,
@@ -521,25 +701,26 @@ public:
     virtual LightType type() const = 0;
     const SkPoint3& color() const { return fColor; }
     virtual GrGLLight* createGLLight() const = 0;
-    virtual bool isEqual(const SkLight& other) const {
+    virtual bool isEqual(const SkImageFilterLight& other) const {
         return fColor == other.fColor;
     }
     // Called to know whether the generated GrGLLight will require access to the fragment position.
     virtual bool requiresFragmentPosition() const = 0;
-    virtual SkLight* transform(const SkMatrix& matrix) const = 0;
+    virtual SkImageFilterLight* transform(const SkMatrix& matrix) const = 0;
 
     // Defined below SkLight's subclasses.
     void flattenLight(SkWriteBuffer& buffer) const;
-    static SkLight* UnflattenLight(SkReadBuffer& buffer);
+    static SkImageFilterLight* UnflattenLight(SkReadBuffer& buffer);
 
 protected:
-    SkLight(SkColor color)
-      : fColor(SkIntToScalar(SkColorGetR(color)),
-               SkIntToScalar(SkColorGetG(color)),
-               SkIntToScalar(SkColorGetB(color))) {}
-    SkLight(const SkPoint3& color)
+    SkImageFilterLight(SkColor color) {
+        fColor = SkPoint3::Make(SkIntToScalar(SkColorGetR(color)),
+                                SkIntToScalar(SkColorGetG(color)),
+                                SkIntToScalar(SkColorGetB(color)));
+    }
+    SkImageFilterLight(const SkPoint3& color)
       : fColor(color) {}
-    SkLight(SkReadBuffer& buffer) {
+    SkImageFilterLight(SkReadBuffer& buffer) {
         fColor = readPoint3(buffer);
     }
 
@@ -553,7 +734,7 @@ private:
 
 ///////////////////////////////////////////////////////////////////////////////
 
-class SkDistantLight : public SkLight {
+class SkDistantLight : public SkImageFilterLight {
 public:
     SkDistantLight(const SkPoint3& direction, SkColor color)
       : INHERITED(color), fDirection(direction) {
@@ -562,20 +743,20 @@ public:
     SkPoint3 surfaceToLight(int x, int y, int z, SkScalar surfaceScale) const {
         return fDirection;
     };
-    SkPoint3 lightColor(const SkPoint3&) const { return color(); }
-    virtual LightType type() const { return kDistant_LightType; }
+    const SkPoint3& lightColor(const SkPoint3&) const { return this->color(); }
+    LightType type() const override { return kDistant_LightType; }
     const SkPoint3& direction() const { return fDirection; }
-    virtual GrGLLight* createGLLight() const SK_OVERRIDE {
+    GrGLLight* createGLLight() const override {
 #if SK_SUPPORT_GPU
-        return SkNEW(GrGLDistantLight);
+        return new GrGLDistantLight;
 #else
         SkDEBUGFAIL("Should not call in GPU-less build");
-        return NULL;
+        return nullptr;
 #endif
     }
-    virtual bool requiresFragmentPosition() const SK_OVERRIDE { return false; }
+    bool requiresFragmentPosition() const override { return false; }
 
-    virtual bool isEqual(const SkLight& other) const SK_OVERRIDE {
+    bool isEqual(const SkImageFilterLight& other) const override {
         if (other.type() != kDistant_LightType) {
             return false;
         }
@@ -593,45 +774,47 @@ protected:
     SkDistantLight(const SkPoint3& direction, const SkPoint3& color)
       : INHERITED(color), fDirection(direction) {
     }
-    virtual SkLight* transform(const SkMatrix& matrix) const {
+    SkImageFilterLight* transform(const SkMatrix& matrix) const override {
         return new SkDistantLight(direction(), color());
     }
-    virtual void onFlattenLight(SkWriteBuffer& buffer) const SK_OVERRIDE {
+    void onFlattenLight(SkWriteBuffer& buffer) const override {
         writePoint3(fDirection, buffer);
     }
 
 private:
-    typedef SkLight INHERITED;
     SkPoint3 fDirection;
+
+    typedef SkImageFilterLight INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-class SkPointLight : public SkLight {
+class SkPointLight : public SkImageFilterLight {
 public:
     SkPointLight(const SkPoint3& location, SkColor color)
      : INHERITED(color), fLocation(location) {}
 
     SkPoint3 surfaceToLight(int x, int y, int z, SkScalar surfaceScale) const {
-        SkPoint3 direction(fLocation.fX - SkIntToScalar(x),
-                           fLocation.fY - SkIntToScalar(y),
-                           fLocation.fZ - SkScalarMul(SkIntToScalar(z), surfaceScale));
-        direction.normalize();
+        SkPoint3 direction = SkPoint3::Make(fLocation.fX - SkIntToScalar(x),
+                                            fLocation.fY - SkIntToScalar(y),
+                                            fLocation.fZ - SkScalarMul(SkIntToScalar(z),
+                                                                       surfaceScale));
+        fast_normalize(&direction);
         return direction;
     };
-    SkPoint3 lightColor(const SkPoint3&) const { return color(); }
-    virtual LightType type() const { return kPoint_LightType; }
+    const SkPoint3& lightColor(const SkPoint3&) const { return this->color(); }
+    LightType type() const override { return kPoint_LightType; }
     const SkPoint3& location() const { return fLocation; }
-    virtual GrGLLight* createGLLight() const SK_OVERRIDE {
+    GrGLLight* createGLLight() const override {
 #if SK_SUPPORT_GPU
-        return SkNEW(GrGLPointLight);
+        return new GrGLPointLight;
 #else
         SkDEBUGFAIL("Should not call in GPU-less build");
-        return NULL;
+        return nullptr;
 #endif
     }
-    virtual bool requiresFragmentPosition() const SK_OVERRIDE { return true; }
-    virtual bool isEqual(const SkLight& other) const SK_OVERRIDE {
+    bool requiresFragmentPosition() const override { return true; }
+    bool isEqual(const SkImageFilterLight& other) const override {
         if (other.type() != kPoint_LightType) {
             return false;
         }
@@ -639,13 +822,15 @@ public:
         return INHERITED::isEqual(other) &&
                fLocation == o.fLocation;
     }
-    virtual SkLight* transform(const SkMatrix& matrix) const {
+    SkImageFilterLight* transform(const SkMatrix& matrix) const override {
         SkPoint location2 = SkPoint::Make(fLocation.fX, fLocation.fY);
         matrix.mapPoints(&location2, 1);
         // Use X scale and Y scale on Z and average the result
         SkPoint locationZ = SkPoint::Make(fLocation.fZ, fLocation.fZ);
         matrix.mapVectors(&locationZ, 1);
-        SkPoint3 location(location2.fX, location2.fY, SkScalarAve(locationZ.fX, locationZ.fY));
+        SkPoint3 location = SkPoint3::Make(location2.fX, 
+                                           location2.fY, 
+                                           SkScalarAve(locationZ.fX, locationZ.fY));
         return new SkPointLight(location, color());
     }
 
@@ -656,79 +841,94 @@ public:
 protected:
     SkPointLight(const SkPoint3& location, const SkPoint3& color)
      : INHERITED(color), fLocation(location) {}
-    virtual void onFlattenLight(SkWriteBuffer& buffer) const SK_OVERRIDE {
+    void onFlattenLight(SkWriteBuffer& buffer) const override {
         writePoint3(fLocation, buffer);
     }
 
 private:
-    typedef SkLight INHERITED;
     SkPoint3 fLocation;
+
+    typedef SkImageFilterLight INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-class SkSpotLight : public SkLight {
+class SkSpotLight : public SkImageFilterLight {
 public:
-    SkSpotLight(const SkPoint3& location, const SkPoint3& target, SkScalar specularExponent, SkScalar cutoffAngle, SkColor color)
+    SkSpotLight(const SkPoint3& location,
+                const SkPoint3& target,
+                SkScalar specularExponent,
+                SkScalar cutoffAngle,
+                SkColor color)
      : INHERITED(color),
        fLocation(location),
        fTarget(target),
        fSpecularExponent(SkScalarPin(specularExponent, kSpecularExponentMin, kSpecularExponentMax))
     {
        fS = target - location;
-       fS.normalize();
+       fast_normalize(&fS);
        fCosOuterConeAngle = SkScalarCos(SkDegreesToRadians(cutoffAngle));
        const SkScalar antiAliasThreshold = 0.016f;
        fCosInnerConeAngle = fCosOuterConeAngle + antiAliasThreshold;
        fConeScale = SkScalarInvert(antiAliasThreshold);
     }
 
-    virtual SkLight* transform(const SkMatrix& matrix) const {
+    SkImageFilterLight* transform(const SkMatrix& matrix) const override {
         SkPoint location2 = SkPoint::Make(fLocation.fX, fLocation.fY);
         matrix.mapPoints(&location2, 1);
         // Use X scale and Y scale on Z and average the result
         SkPoint locationZ = SkPoint::Make(fLocation.fZ, fLocation.fZ);
         matrix.mapVectors(&locationZ, 1);
-        SkPoint3 location(location2.fX, location2.fY, SkScalarAve(locationZ.fX, locationZ.fY));
+        SkPoint3 location = SkPoint3::Make(location2.fX, location2.fY,
+                                           SkScalarAve(locationZ.fX, locationZ.fY));
         SkPoint target2 = SkPoint::Make(fTarget.fX, fTarget.fY);
         matrix.mapPoints(&target2, 1);
         SkPoint targetZ = SkPoint::Make(fTarget.fZ, fTarget.fZ);
         matrix.mapVectors(&targetZ, 1);
-        SkPoint3 target(target2.fX, target2.fY, SkScalarAve(targetZ.fX, targetZ.fY));
+        SkPoint3 target = SkPoint3::Make(target2.fX, target2.fY,
+                                         SkScalarAve(targetZ.fX, targetZ.fY));
         SkPoint3 s = target - location;
-        s.normalize();
-        return new SkSpotLight(location, target, fSpecularExponent, fCosOuterConeAngle, fCosInnerConeAngle, fConeScale, s, color());
+        fast_normalize(&s);
+        return new SkSpotLight(location,
+                               target,
+                               fSpecularExponent,
+                               fCosOuterConeAngle,
+                               fCosInnerConeAngle,
+                               fConeScale,
+                               s,
+                               color());
     }
 
     SkPoint3 surfaceToLight(int x, int y, int z, SkScalar surfaceScale) const {
-        SkPoint3 direction(fLocation.fX - SkIntToScalar(x),
-                           fLocation.fY - SkIntToScalar(y),
-                           fLocation.fZ - SkScalarMul(SkIntToScalar(z), surfaceScale));
-        direction.normalize();
+        SkPoint3 direction = SkPoint3::Make(fLocation.fX - SkIntToScalar(x),
+                                            fLocation.fY - SkIntToScalar(y),
+                                            fLocation.fZ - SkScalarMul(SkIntToScalar(z),
+                                                                       surfaceScale));
+        fast_normalize(&direction);
         return direction;
     };
     SkPoint3 lightColor(const SkPoint3& surfaceToLight) const {
         SkScalar cosAngle = -surfaceToLight.dot(fS);
-        if (cosAngle < fCosOuterConeAngle) {
-            return SkPoint3(0, 0, 0);
+        SkScalar scale = 0;
+        if (cosAngle >= fCosOuterConeAngle) {
+            scale = SkScalarPow(cosAngle, fSpecularExponent);
+            if (cosAngle < fCosInnerConeAngle) {
+                scale = SkScalarMul(scale, cosAngle - fCosOuterConeAngle);
+                scale *= fConeScale;
+            }
         }
-        SkScalar scale = SkScalarPow(cosAngle, fSpecularExponent);
-        if (cosAngle < fCosInnerConeAngle) {
-            scale = SkScalarMul(scale, cosAngle - fCosOuterConeAngle);
-            return color() * SkScalarMul(scale, fConeScale);
-        }
-        return color() * scale;
+        return this->color().makeScale(scale);
     }
-    virtual GrGLLight* createGLLight() const SK_OVERRIDE {
+    GrGLLight* createGLLight() const override {
 #if SK_SUPPORT_GPU
-        return SkNEW(GrGLSpotLight);
+        return new GrGLSpotLight;
 #else
         SkDEBUGFAIL("Should not call in GPU-less build");
-        return NULL;
+        return nullptr;
 #endif
     }
-    virtual bool requiresFragmentPosition() const SK_OVERRIDE { return true; }
-    virtual LightType type() const { return kSpot_LightType; }
+    bool requiresFragmentPosition() const override { return true; }
+    LightType type() const override { return kSpot_LightType; }
     const SkPoint3& location() const { return fLocation; }
     const SkPoint3& target() const { return fTarget; }
     SkScalar specularExponent() const { return fSpecularExponent; }
@@ -751,7 +951,14 @@ public:
                         SkScalarIsFinite(fConeScale));
     }
 protected:
-    SkSpotLight(const SkPoint3& location, const SkPoint3& target, SkScalar specularExponent, SkScalar cosOuterConeAngle, SkScalar cosInnerConeAngle, SkScalar coneScale, const SkPoint3& s, const SkPoint3& color)
+    SkSpotLight(const SkPoint3& location,
+                const SkPoint3& target,
+                SkScalar specularExponent,
+                SkScalar cosOuterConeAngle,
+                SkScalar cosInnerConeAngle,
+                SkScalar coneScale,
+                const SkPoint3& s,
+                const SkPoint3& color)
      : INHERITED(color),
        fLocation(location),
        fTarget(target),
@@ -762,7 +969,7 @@ protected:
        fS(s)
     {
     }
-    virtual void onFlattenLight(SkWriteBuffer& buffer) const SK_OVERRIDE {
+    void onFlattenLight(SkWriteBuffer& buffer) const override {
         writePoint3(fLocation, buffer);
         writePoint3(fTarget, buffer);
         buffer.writeScalar(fSpecularExponent);
@@ -772,7 +979,7 @@ protected:
         writePoint3(fS, buffer);
     }
 
-    virtual bool isEqual(const SkLight& other) const SK_OVERRIDE {
+    bool isEqual(const SkImageFilterLight& other) const override {
         if (other.type() != kSpot_LightType) {
             return false;
         }
@@ -789,7 +996,6 @@ private:
     static const SkScalar kSpecularExponentMin;
     static const SkScalar kSpecularExponentMax;
 
-    typedef SkLight INHERITED;
     SkPoint3 fLocation;
     SkPoint3 fTarget;
     SkScalar fSpecularExponent;
@@ -797,6 +1003,8 @@ private:
     SkScalar fCosInnerConeAngle;
     SkScalar fConeScale;
     SkPoint3 fS;
+
+    typedef SkImageFilterLight INHERITED;
 };
 
 // According to the spec, the specular term should be in the range [1, 128] :
@@ -806,126 +1014,156 @@ const SkScalar SkSpotLight::kSpecularExponentMax = 128.0f;
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void SkLight::flattenLight(SkWriteBuffer& buffer) const {
+void SkImageFilterLight::flattenLight(SkWriteBuffer& buffer) const {
     // Write type first, then baseclass, then subclass.
     buffer.writeInt(this->type());
     writePoint3(fColor, buffer);
     this->onFlattenLight(buffer);
 }
 
-/*static*/ SkLight* SkLight::UnflattenLight(SkReadBuffer& buffer) {
+/*static*/ SkImageFilterLight* SkImageFilterLight::UnflattenLight(SkReadBuffer& buffer) {
     // Read type first.
-    const SkLight::LightType type = (SkLight::LightType)buffer.readInt();
+    const SkImageFilterLight::LightType type = (SkImageFilterLight::LightType)buffer.readInt();
     switch (type) {
         // Each of these constructors must first call SkLight's, so we'll read the baseclass
         // then subclass, same order as flattenLight.
-        case SkLight::kDistant_LightType: return SkNEW_ARGS(SkDistantLight, (buffer));
-        case SkLight::kPoint_LightType:   return SkNEW_ARGS(SkPointLight, (buffer));
-        case SkLight::kSpot_LightType:    return SkNEW_ARGS(SkSpotLight, (buffer));
+        case SkImageFilterLight::kDistant_LightType:
+            return new SkDistantLight(buffer);
+        case SkImageFilterLight::kPoint_LightType:
+            return new SkPointLight(buffer);
+        case SkImageFilterLight::kSpot_LightType:
+            return new SkSpotLight(buffer);
         default:
             SkDEBUGFAIL("Unknown LightType.");
             buffer.validate(false);
-            return NULL;
+            return nullptr;
     }
 }
 ///////////////////////////////////////////////////////////////////////////////
 
-SkLightingImageFilter::SkLightingImageFilter(SkLight* light, SkScalar surfaceScale,
+SkLightingImageFilter::SkLightingImageFilter(SkImageFilterLight* light, SkScalar surfaceScale,
                                              SkImageFilter* input, const CropRect* cropRect)
-  : INHERITED(1, &input, cropRect),
-    fLight(light),
-    fSurfaceScale(SkScalarDiv(surfaceScale, SkIntToScalar(255)))
-{
-    SkASSERT(fLight);
-    // our caller knows that we take ownership of the light, so we don't
-    // need to call ref() here.
+  : INHERITED(1, &input, cropRect)
+  , fLight(SkRef(light))
+  , fSurfaceScale(surfaceScale / 255)
+{}
+
+SkImageFilter* SkLightingImageFilter::CreateDistantLitDiffuse(const SkPoint3& direction,
+                                                              SkColor lightColor,
+                                                              SkScalar surfaceScale,
+                                                              SkScalar kd,
+                                                              SkImageFilter* input,
+                                                              const CropRect* cropRect) {
+    SkAutoTUnref<SkImageFilterLight> light(new SkDistantLight(direction, lightColor));
+    return SkDiffuseLightingImageFilter::Create(light, surfaceScale, kd, input, cropRect);
 }
 
-SkImageFilter* SkLightingImageFilter::CreateDistantLitDiffuse(
-    const SkPoint3& direction, SkColor lightColor, SkScalar surfaceScale,
-    SkScalar kd, SkImageFilter* input, const CropRect* cropRect) {
-    return SkNEW_ARGS(SkDiffuseLightingImageFilter,
-        (SkNEW_ARGS(SkDistantLight, (direction, lightColor)), surfaceScale, kd,
-        input, cropRect));
+SkImageFilter* SkLightingImageFilter::CreatePointLitDiffuse(const SkPoint3& location,
+                                                            SkColor lightColor,
+                                                            SkScalar surfaceScale,
+                                                            SkScalar kd,
+                                                            SkImageFilter* input,
+                                                            const CropRect* cropRect) {
+    SkAutoTUnref<SkImageFilterLight> light(new SkPointLight(location, lightColor));
+    return SkDiffuseLightingImageFilter::Create(light, surfaceScale, kd, input, cropRect);
 }
 
-SkImageFilter* SkLightingImageFilter::CreatePointLitDiffuse(
-    const SkPoint3& location, SkColor lightColor, SkScalar surfaceScale,
-    SkScalar kd, SkImageFilter* input, const CropRect* cropRect) {
-    return SkNEW_ARGS(SkDiffuseLightingImageFilter,
-        (SkNEW_ARGS(SkPointLight, (location, lightColor)), surfaceScale, kd,
-        input, cropRect));
+SkImageFilter* SkLightingImageFilter::CreateSpotLitDiffuse(const SkPoint3& location,
+                                                           const SkPoint3& target,
+                                                           SkScalar specularExponent,
+                                                           SkScalar cutoffAngle,
+                                                           SkColor lightColor,
+                                                           SkScalar surfaceScale,
+                                                           SkScalar kd,
+                                                           SkImageFilter* input,
+                                                           const CropRect* cropRect) {
+    SkAutoTUnref<SkImageFilterLight> light(
+            new SkSpotLight(location, target, specularExponent, cutoffAngle, lightColor));
+    return SkDiffuseLightingImageFilter::Create(light, surfaceScale, kd, input, cropRect);
 }
 
-SkImageFilter* SkLightingImageFilter::CreateSpotLitDiffuse(
-    const SkPoint3& location, const SkPoint3& target,
-    SkScalar specularExponent, SkScalar cutoffAngle,
-    SkColor lightColor, SkScalar surfaceScale, SkScalar kd,
-    SkImageFilter* input, const CropRect* cropRect) {
-    return SkNEW_ARGS(SkDiffuseLightingImageFilter,
-        (SkNEW_ARGS(SkSpotLight, (location, target, specularExponent,
-                                  cutoffAngle, lightColor)),
-                    surfaceScale, kd, input, cropRect));
+SkImageFilter* SkLightingImageFilter::CreateDistantLitSpecular(const SkPoint3& direction,
+                                                               SkColor lightColor,
+                                                               SkScalar surfaceScale,
+                                                               SkScalar ks,
+                                                               SkScalar shine,
+                                                               SkImageFilter* input,
+                                                               const CropRect* cropRect) {
+    SkAutoTUnref<SkImageFilterLight> light(new SkDistantLight(direction, lightColor));
+    return SkSpecularLightingImageFilter::Create(light, surfaceScale, ks, shine, input, cropRect);
 }
 
-SkImageFilter* SkLightingImageFilter::CreateDistantLitSpecular(
-    const SkPoint3& direction, SkColor lightColor, SkScalar surfaceScale,
-    SkScalar ks, SkScalar shininess, SkImageFilter* input, const CropRect* cropRect) {
-    return SkNEW_ARGS(SkSpecularLightingImageFilter,
-        (SkNEW_ARGS(SkDistantLight, (direction, lightColor)),
-        surfaceScale, ks, shininess, input, cropRect));
+SkImageFilter* SkLightingImageFilter::CreatePointLitSpecular(const SkPoint3& location,
+                                                             SkColor lightColor,
+                                                             SkScalar surfaceScale,
+                                                             SkScalar ks,
+                                                             SkScalar shine,
+                                                             SkImageFilter* input,
+                                                             const CropRect* cropRect) {
+    SkAutoTUnref<SkImageFilterLight> light(new SkPointLight(location, lightColor));
+    return SkSpecularLightingImageFilter::Create(light, surfaceScale, ks, shine, input, cropRect);
 }
 
-SkImageFilter* SkLightingImageFilter::CreatePointLitSpecular(
-    const SkPoint3& location, SkColor lightColor, SkScalar surfaceScale,
-    SkScalar ks, SkScalar shininess, SkImageFilter* input, const CropRect* cropRect) {
-    return SkNEW_ARGS(SkSpecularLightingImageFilter,
-        (SkNEW_ARGS(SkPointLight, (location, lightColor)),
-        surfaceScale, ks, shininess, input, cropRect));
+SkImageFilter* SkLightingImageFilter::CreateSpotLitSpecular(const SkPoint3& location,
+                                                            const SkPoint3& target,
+                                                            SkScalar specularExponent,
+                                                            SkScalar cutoffAngle,
+                                                            SkColor lightColor,
+                                                            SkScalar surfaceScale,
+                                                            SkScalar ks,
+                                                            SkScalar shine,
+                                                            SkImageFilter* input,
+                                                            const CropRect* cropRect) {
+    SkAutoTUnref<SkImageFilterLight> light(
+            new SkSpotLight(location, target, specularExponent, cutoffAngle, lightColor));
+    return SkSpecularLightingImageFilter::Create(light, surfaceScale, ks, shine, input, cropRect);
 }
 
-SkImageFilter* SkLightingImageFilter::CreateSpotLitSpecular(
-    const SkPoint3& location, const SkPoint3& target,
-    SkScalar specularExponent, SkScalar cutoffAngle,
-    SkColor lightColor, SkScalar surfaceScale,
-    SkScalar ks, SkScalar shininess, SkImageFilter* input, const CropRect* cropRect) {
-    return SkNEW_ARGS(SkSpecularLightingImageFilter,
-        (SkNEW_ARGS(SkSpotLight, (location, target, specularExponent, cutoffAngle, lightColor)),
-        surfaceScale, ks, shininess, input, cropRect));
-}
-
-SkLightingImageFilter::~SkLightingImageFilter() {
-    SkSafeUnref(fLight);
-}
-
-SkLightingImageFilter::SkLightingImageFilter(SkReadBuffer& buffer)
-  : INHERITED(1, buffer) {
-    fLight = SkLight::UnflattenLight(buffer);
-    fSurfaceScale = buffer.readScalar();
-    buffer.validate(SkScalarIsFinite(fSurfaceScale));
-}
+SkLightingImageFilter::~SkLightingImageFilter() {}
 
 void SkLightingImageFilter::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
     fLight->flattenLight(buffer);
-    buffer.writeScalar(fSurfaceScale);
+    buffer.writeScalar(fSurfaceScale * 255);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkDiffuseLightingImageFilter::SkDiffuseLightingImageFilter(SkLight* light, SkScalar surfaceScale, SkScalar kd, SkImageFilter* input, const CropRect* cropRect = NULL)
-  : SkLightingImageFilter(light, surfaceScale, input, cropRect),
+SkImageFilter* SkDiffuseLightingImageFilter::Create(SkImageFilterLight* light,
+                                                    SkScalar surfaceScale,
+                                                    SkScalar kd,
+                                                    SkImageFilter* input,
+                                                    const CropRect* cropRect) {
+    if (nullptr == light) {
+        return nullptr;
+    }
+    if (!SkScalarIsFinite(surfaceScale) || !SkScalarIsFinite(kd)) {
+        return nullptr;
+    }
     // According to the spec, kd can be any non-negative number :
     // http://www.w3.org/TR/SVG/filters.html#feDiffuseLightingElement
-    fKD(kd < 0 ? 0 : kd)
+    if (kd < 0) {
+        return nullptr;
+    }
+    return new SkDiffuseLightingImageFilter(light, surfaceScale, kd, input, cropRect);
+}
+
+SkDiffuseLightingImageFilter::SkDiffuseLightingImageFilter(SkImageFilterLight* light,
+                                                           SkScalar surfaceScale,
+                                                           SkScalar kd,
+                                                           SkImageFilter* input,
+                                                           const CropRect* cropRect)
+  : INHERITED(light, surfaceScale, input, cropRect),
+    fKD(kd)
 {
 }
 
-SkDiffuseLightingImageFilter::SkDiffuseLightingImageFilter(SkReadBuffer& buffer)
-  : INHERITED(buffer)
-{
-    fKD = buffer.readScalar();
-    buffer.validate(SkScalarIsFinite(fKD) && (fKD >= 0));
+SkFlattenable* SkDiffuseLightingImageFilter::CreateProc(SkReadBuffer& buffer) {
+    SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
+    SkAutoTUnref<SkImageFilterLight> light(SkImageFilterLight::UnflattenLight(buffer));
+    SkScalar surfaceScale = buffer.readScalar();
+    SkScalar kd = buffer.readScalar();
+    return Create(light, surfaceScale, kd, common.getInput(0), &common.cropRect());
 }
 
 void SkDiffuseLightingImageFilter::flatten(SkWriteBuffer& buffer) const {
@@ -938,10 +1176,9 @@ bool SkDiffuseLightingImageFilter::onFilterImage(Proxy* proxy,
                                                  const Context& ctx,
                                                  SkBitmap* dst,
                                                  SkIPoint* offset) const {
-    SkImageFilter* input = getInput(0);
     SkBitmap src = source;
     SkIPoint srcOffset = SkIPoint::Make(0, 0);
-    if (input && !input->filterImage(proxy, source, ctx, &src, &srcOffset)) {
+    if (!this->filterInput(0, proxy, source, ctx, &src, &srcOffset)) {
         return false;
     }
 
@@ -962,60 +1199,113 @@ bool SkDiffuseLightingImageFilter::onFilterImage(Proxy* proxy,
         return false;
     }
 
-    if (!dst->allocPixels(src.info().makeWH(bounds.width(), bounds.height()))) {
+    SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(), bounds.height()));
+    if (!device) {
         return false;
     }
+    *dst = device->accessBitmap(false);
+    SkAutoLockPixels alp_dst(*dst);
 
-    SkAutoTUnref<SkLight> transformedLight(light()->transform(ctx.ctm()));
+    SkMatrix matrix(ctx.ctm());
+    matrix.postTranslate(SkIntToScalar(-srcOffset.x()), SkIntToScalar(-srcOffset.y()));
+    SkAutoTUnref<SkImageFilterLight> transformedLight(light()->transform(matrix));
 
     DiffuseLightingType lightingType(fKD);
     offset->fX = bounds.left();
     offset->fY = bounds.top();
     bounds.offset(-srcOffset);
     switch (transformedLight->type()) {
-        case SkLight::kDistant_LightType:
-            lightBitmap<DiffuseLightingType, SkDistantLight>(lightingType, transformedLight, src, dst, surfaceScale(), bounds);
+        case SkImageFilterLight::kDistant_LightType:
+            lightBitmap<DiffuseLightingType, SkDistantLight>(lightingType,
+                                                             transformedLight,
+                                                             src,
+                                                             dst,
+                                                             surfaceScale(),
+                                                             bounds);
             break;
-        case SkLight::kPoint_LightType:
-            lightBitmap<DiffuseLightingType, SkPointLight>(lightingType, transformedLight, src, dst, surfaceScale(), bounds);
+        case SkImageFilterLight::kPoint_LightType:
+            lightBitmap<DiffuseLightingType, SkPointLight>(lightingType,
+                                                           transformedLight,
+                                                           src,
+                                                           dst,
+                                                           surfaceScale(),
+                                                           bounds);
             break;
-        case SkLight::kSpot_LightType:
-            lightBitmap<DiffuseLightingType, SkSpotLight>(lightingType, transformedLight, src, dst, surfaceScale(), bounds);
+        case SkImageFilterLight::kSpot_LightType:
+            lightBitmap<DiffuseLightingType, SkSpotLight>(lightingType,
+                                                          transformedLight,
+                                                          src,
+                                                          dst,
+                                                          surfaceScale(),
+                                                          bounds);
             break;
     }
 
     return true;
 }
 
+#ifndef SK_IGNORE_TO_STRING
+void SkDiffuseLightingImageFilter::toString(SkString* str) const {
+    str->appendf("SkDiffuseLightingImageFilter: (");
+    str->appendf("kD: %f\n", fKD);
+    str->append(")");
+}
+#endif
+
 #if SK_SUPPORT_GPU
-bool SkDiffuseLightingImageFilter::asNewEffect(GrEffect** effect, GrTexture* texture,
-                                               const SkMatrix& matrix, const SkIRect&) const {
-    if (effect) {
-        SkScalar scale = SkScalarMul(surfaceScale(), SkIntToScalar(255));
-        *effect = GrDiffuseLightingEffect::Create(texture, light(), scale, matrix, kd());
-    }
-    return true;
+GrFragmentProcessor* SkDiffuseLightingImageFilter::getFragmentProcessor(
+                                                   GrTexture* texture,
+                                                   const SkMatrix& matrix,
+                                                   const SkIRect&,
+                                                   BoundaryMode boundaryMode
+) const {
+    SkScalar scale = SkScalarMul(this->surfaceScale(), SkIntToScalar(255));
+    return GrDiffuseLightingEffect::Create(texture, this->light(), scale, matrix, this->kd(),
+                                           boundaryMode);
 }
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkSpecularLightingImageFilter::SkSpecularLightingImageFilter(SkLight* light, SkScalar surfaceScale, SkScalar ks, SkScalar shininess, SkImageFilter* input, const CropRect* cropRect)
-  : SkLightingImageFilter(light, surfaceScale, input, cropRect),
+SkImageFilter* SkSpecularLightingImageFilter::Create(SkImageFilterLight* light,
+                                                     SkScalar surfaceScale,
+                                                     SkScalar ks,
+                                                     SkScalar shininess,
+                                                     SkImageFilter* input,
+                                                     const CropRect* cropRect) {
+    if (nullptr == light) {
+        return nullptr;
+    }
+    if (!SkScalarIsFinite(surfaceScale) || !SkScalarIsFinite(ks) || !SkScalarIsFinite(shininess)) {
+        return nullptr;
+    }
     // According to the spec, ks can be any non-negative number :
     // http://www.w3.org/TR/SVG/filters.html#feSpecularLightingElement
-    fKS(ks < 0 ? 0 : ks),
+    if (ks < 0) {
+        return nullptr;
+    }
+    return new SkSpecularLightingImageFilter(light, surfaceScale, ks, shininess, input, cropRect);
+}
+
+SkSpecularLightingImageFilter::SkSpecularLightingImageFilter(SkImageFilterLight* light,
+                                                             SkScalar surfaceScale,
+                                                             SkScalar ks,
+                                                             SkScalar shininess,
+                                                             SkImageFilter* input,
+                                                             const CropRect* cropRect)
+  : INHERITED(light, surfaceScale, input, cropRect),
+    fKS(ks),
     fShininess(shininess)
 {
 }
 
-SkSpecularLightingImageFilter::SkSpecularLightingImageFilter(SkReadBuffer& buffer)
-  : INHERITED(buffer)
-{
-    fKS = buffer.readScalar();
-    fShininess = buffer.readScalar();
-    buffer.validate(SkScalarIsFinite(fKS) && (fKS >= 0) &&
-                    SkScalarIsFinite(fShininess));
+SkFlattenable* SkSpecularLightingImageFilter::CreateProc(SkReadBuffer& buffer) {
+    SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
+    SkAutoTUnref<SkImageFilterLight> light(SkImageFilterLight::UnflattenLight(buffer));
+    SkScalar surfaceScale = buffer.readScalar();
+    SkScalar ks = buffer.readScalar();
+    SkScalar shine = buffer.readScalar();
+    return Create(light, surfaceScale, ks, shine, common.getInput(0), &common.cropRect());
 }
 
 void SkSpecularLightingImageFilter::flatten(SkWriteBuffer& buffer) const {
@@ -1029,10 +1319,9 @@ bool SkSpecularLightingImageFilter::onFilterImage(Proxy* proxy,
                                                   const Context& ctx,
                                                   SkBitmap* dst,
                                                   SkIPoint* offset) const {
-    SkImageFilter* input = getInput(0);
     SkBitmap src = source;
     SkIPoint srcOffset = SkIPoint::Make(0, 0);
-    if (input && !input->filterImage(proxy, source, ctx, &src, &srcOffset)) {
+    if (!this->filterInput(0, proxy, source, ctx, &src, &srcOffset)) {
         return false;
     }
 
@@ -1054,37 +1343,66 @@ bool SkSpecularLightingImageFilter::onFilterImage(Proxy* proxy,
         return false;
     }
 
-    if (!dst->allocPixels(src.info().makeWH(bounds.width(), bounds.height()))) {
+    SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(), bounds.height()));
+    if (!device) {
         return false;
     }
+    *dst = device->accessBitmap(false);
+    SkAutoLockPixels alp_dst(*dst);
 
     SpecularLightingType lightingType(fKS, fShininess);
     offset->fX = bounds.left();
     offset->fY = bounds.top();
+    SkMatrix matrix(ctx.ctm());
+    matrix.postTranslate(SkIntToScalar(-srcOffset.x()), SkIntToScalar(-srcOffset.y()));
+    SkAutoTUnref<SkImageFilterLight> transformedLight(light()->transform(matrix));
     bounds.offset(-srcOffset);
-    SkAutoTUnref<SkLight> transformedLight(light()->transform(ctx.ctm()));
     switch (transformedLight->type()) {
-        case SkLight::kDistant_LightType:
-            lightBitmap<SpecularLightingType, SkDistantLight>(lightingType, transformedLight, src, dst, surfaceScale(), bounds);
+        case SkImageFilterLight::kDistant_LightType:
+            lightBitmap<SpecularLightingType, SkDistantLight>(lightingType,
+                                                              transformedLight,
+                                                              src,
+                                                              dst,
+                                                              surfaceScale(),
+                                                              bounds);
             break;
-        case SkLight::kPoint_LightType:
-            lightBitmap<SpecularLightingType, SkPointLight>(lightingType, transformedLight, src, dst, surfaceScale(), bounds);
+        case SkImageFilterLight::kPoint_LightType:
+            lightBitmap<SpecularLightingType, SkPointLight>(lightingType,
+                                                            transformedLight,
+                                                            src,
+                                                            dst,
+                                                            surfaceScale(),
+                                                            bounds);
             break;
-        case SkLight::kSpot_LightType:
-            lightBitmap<SpecularLightingType, SkSpotLight>(lightingType, transformedLight, src, dst, surfaceScale(), bounds);
+        case SkImageFilterLight::kSpot_LightType:
+            lightBitmap<SpecularLightingType, SkSpotLight>(lightingType,
+                                                           transformedLight,
+                                                           src,
+                                                           dst,
+                                                           surfaceScale(),
+                                                           bounds);
             break;
     }
     return true;
 }
 
+#ifndef SK_IGNORE_TO_STRING
+void SkSpecularLightingImageFilter::toString(SkString* str) const {
+    str->appendf("SkSpecularLightingImageFilter: (");
+    str->appendf("kS: %f shininess: %f", fKS, fShininess);
+    str->append(")");
+}
+#endif
+
 #if SK_SUPPORT_GPU
-bool SkSpecularLightingImageFilter::asNewEffect(GrEffect** effect, GrTexture* texture,
-                                                const SkMatrix& matrix, const SkIRect&) const {
-    if (effect) {
-        SkScalar scale = SkScalarMul(surfaceScale(), SkIntToScalar(255));
-        *effect = GrSpecularLightingEffect::Create(texture, light(), scale, matrix, ks(), shininess());
-    }
-    return true;
+GrFragmentProcessor* SkSpecularLightingImageFilter::getFragmentProcessor(
+                                                    GrTexture* texture,
+                                                    const SkMatrix& matrix,
+                                                    const SkIRect&,
+                                                    BoundaryMode boundaryMode) const {
+    SkScalar scale = SkScalarMul(this->surfaceScale(), SkIntToScalar(255));
+    return GrSpecularLightingEffect::Create(texture, this->light(), scale, matrix, this->ks(),
+                                            this->shininess(), boundaryMode);
 }
 #endif
 
@@ -1094,75 +1412,142 @@ bool SkSpecularLightingImageFilter::asNewEffect(GrEffect** effect, GrTexture* te
 
 namespace {
 SkPoint3 random_point3(SkRandom* random) {
-    return SkPoint3(SkScalarToFloat(random->nextSScalar1()),
-                    SkScalarToFloat(random->nextSScalar1()),
-                    SkScalarToFloat(random->nextSScalar1()));
+    return SkPoint3::Make(SkScalarToFloat(random->nextSScalar1()),
+                          SkScalarToFloat(random->nextSScalar1()),
+                          SkScalarToFloat(random->nextSScalar1()));
 }
 
-SkLight* create_random_light(SkRandom* random) {
+SkImageFilterLight* create_random_light(SkRandom* random) {
     int type = random->nextULessThan(3);
     switch (type) {
         case 0: {
-            return SkNEW_ARGS(SkDistantLight, (random_point3(random), random->nextU()));
+            return new SkDistantLight(random_point3(random), random->nextU());
         }
         case 1: {
-            return SkNEW_ARGS(SkPointLight, (random_point3(random), random->nextU()));
+            return new SkPointLight(random_point3(random), random->nextU());
         }
         case 2: {
-            return SkNEW_ARGS(SkSpotLight, (random_point3(random),
-                                            random_point3(random),
-                                            random->nextUScalar1(),
-                                            random->nextUScalar1(),
-                                            random->nextU()));
+            return new SkSpotLight(random_point3(random), random_point3(random),
+                                   random->nextUScalar1(), random->nextUScalar1(), random->nextU());
         }
         default:
             SkFAIL("Unexpected value.");
-            return NULL;
+            return nullptr;
     }
 }
 
+SkString emitNormalFunc(BoundaryMode mode,
+                        const char* pointToNormalName,
+                        const char* sobelFuncName) {
+    SkString result;
+    switch (mode) {
+    case kTopLeft_BoundaryMode:
+        result.printf("\treturn %s(%s(0.0, 0.0, m[4], m[5], m[7], m[8], %g),\n"
+                      "\t          %s(0.0, 0.0, m[4], m[7], m[5], m[8], %g),\n"
+                      "\t          surfaceScale);\n",
+                      pointToNormalName, sobelFuncName, gTwoThirds,
+                                         sobelFuncName, gTwoThirds);
+        break;
+    case kTop_BoundaryMode:
+        result.printf("\treturn %s(%s(0.0, 0.0, m[3], m[5], m[6], m[8], %g),\n"
+                      "\t          %s(0.0, 0.0, m[4], m[7], m[5], m[8], %g),\n"
+                      "\t          surfaceScale);\n",
+                      pointToNormalName, sobelFuncName, gOneThird,
+                                         sobelFuncName, gOneHalf);
+        break;
+    case kTopRight_BoundaryMode:
+        result.printf("\treturn %s(%s( 0.0,  0.0, m[3], m[4], m[6], m[7], %g),\n"
+                      "\t          %s(m[3], m[6], m[4], m[7],  0.0,  0.0, %g),\n"
+                      "\t          surfaceScale);\n",
+                      pointToNormalName, sobelFuncName, gTwoThirds,
+                                         sobelFuncName, gTwoThirds);
+        break;
+    case kLeft_BoundaryMode:
+        result.printf("\treturn %s(%s(m[1], m[2], m[4], m[5], m[7], m[8], %g),\n"
+                      "\t          %s( 0.0,  0.0, m[1], m[7], m[2], m[8], %g),\n"
+                      "\t          surfaceScale);\n",
+                      pointToNormalName, sobelFuncName, gOneHalf,
+                                         sobelFuncName, gOneThird);
+        break;
+    case kInterior_BoundaryMode:
+        result.printf("\treturn %s(%s(m[0], m[2], m[3], m[5], m[6], m[8], %g),\n"
+                      "\t          %s(m[0], m[6], m[1], m[7], m[2], m[8], %g),\n"
+                      "\t          surfaceScale);\n",
+                      pointToNormalName, sobelFuncName, gOneQuarter,
+                                         sobelFuncName, gOneQuarter);
+        break;
+    case kRight_BoundaryMode:
+        result.printf("\treturn %s(%s(m[0], m[1], m[3], m[4], m[6], m[7], %g),\n"
+                      "\t          %s(m[0], m[6], m[1], m[7],  0.0,  0.0, %g),\n"
+                      "\t          surfaceScale);\n",
+                      pointToNormalName, sobelFuncName, gOneHalf,
+                                         sobelFuncName, gOneThird);
+        break;
+    case kBottomLeft_BoundaryMode:
+        result.printf("\treturn %s(%s(m[1], m[2], m[4], m[5],  0.0,  0.0, %g),\n"
+                      "\t          %s( 0.0,  0.0, m[1], m[4], m[2], m[5], %g),\n"
+                      "\t          surfaceScale);\n",
+                      pointToNormalName, sobelFuncName, gTwoThirds,
+                                         sobelFuncName, gTwoThirds);
+        break;
+    case kBottom_BoundaryMode:
+        result.printf("\treturn %s(%s(m[0], m[2], m[3], m[5],  0.0,  0.0, %g),\n"
+                      "\t          %s(m[0], m[3], m[1], m[4], m[2], m[5], %g),\n"
+                      "\t          surfaceScale);\n",
+                      pointToNormalName, sobelFuncName, gOneThird,
+                                         sobelFuncName, gOneHalf);
+        break;
+    case kBottomRight_BoundaryMode:
+        result.printf("\treturn %s(%s(m[0], m[1], m[3], m[4],  0.0,  0.0, %g),\n"
+                      "\t          %s(m[0], m[3], m[1], m[4],  0.0,  0.0, %g),\n"
+                      "\t          surfaceScale);\n",
+                      pointToNormalName, sobelFuncName, gTwoThirds,
+                                         sobelFuncName, gTwoThirds);
+        break;
+    default:
+        SkASSERT(false);
+        break;
+    }
+    return result;
 }
 
-class GrGLLightingEffect  : public GrGLEffect {
+}
+
+class GrGLLightingEffect  : public GrGLSLFragmentProcessor {
 public:
-    GrGLLightingEffect(const GrBackendEffectFactory& factory,
-                       const GrDrawEffect& effect);
+    GrGLLightingEffect(const GrProcessor&);
     virtual ~GrGLLightingEffect();
 
-    virtual void emitCode(GrGLShaderBuilder*,
-                          const GrDrawEffect&,
-                          const GrEffectKey&,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    void emitCode(EmitArgs&) override;
 
-    static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder* b);
-
-    /**
-     * Subclasses of GrGLLightingEffect must call INHERITED::setData();
-     */
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+    static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder* b);
 
 protected:
-    virtual void emitLightFunc(GrGLShaderBuilder*, SkString* funcName) = 0;
+    /**
+     * Subclasses of GrGLLightingEffect must call INHERITED::onSetData();
+     */
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
+
+    virtual void emitLightFunc(GrGLSLFPBuilder*, GrGLSLFragmentBuilder*, SkString* funcName) = 0;
 
 private:
-    typedef GrGLEffect INHERITED;
+    typedef GrGLSLFragmentProcessor INHERITED;
 
     UniformHandle       fImageIncrementUni;
     UniformHandle       fSurfaceScaleUni;
     GrGLLight*          fLight;
+    BoundaryMode        fBoundaryMode;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class GrGLDiffuseLightingEffect  : public GrGLLightingEffect {
 public:
-    GrGLDiffuseLightingEffect(const GrBackendEffectFactory& factory,
-                              const GrDrawEffect& drawEffect);
-    virtual void emitLightFunc(GrGLShaderBuilder*, SkString* funcName) SK_OVERRIDE;
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+    GrGLDiffuseLightingEffect(const GrProcessor&);
+    void emitLightFunc(GrGLSLFPBuilder*, GrGLSLFragmentBuilder*, SkString* funcName) override;
+
+protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
 
 private:
     typedef GrGLLightingEffect INHERITED;
@@ -1174,10 +1559,11 @@ private:
 
 class GrGLSpecularLightingEffect  : public GrGLLightingEffect {
 public:
-    GrGLSpecularLightingEffect(const GrBackendEffectFactory& factory,
-                               const GrDrawEffect& effect);
-    virtual void emitLightFunc(GrGLShaderBuilder*, SkString* funcName) SK_OVERRIDE;
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+    GrGLSpecularLightingEffect(const GrProcessor&);
+    void emitLightFunc(GrGLSLFPBuilder*, GrGLSLFragmentBuilder*, SkString* funcName) override;
+
+protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
 
 private:
     typedef GrGLLightingEffect INHERITED;
@@ -1189,13 +1575,15 @@ private:
 ///////////////////////////////////////////////////////////////////////////////
 
 GrLightingEffect::GrLightingEffect(GrTexture* texture,
-                                   const SkLight* light,
+                                   const SkImageFilterLight* light,
                                    SkScalar surfaceScale,
-                                   const SkMatrix& matrix)
-    : INHERITED(texture, MakeDivByTextureWHMatrix(texture))
+                                   const SkMatrix& matrix,
+                                   BoundaryMode boundaryMode)
+    : INHERITED(texture, GrCoordTransform::MakeDivByTextureWHMatrix(texture))
     , fLight(light)
     , fSurfaceScale(surfaceScale)
-    , fFilterMatrix(matrix) {
+    , fFilterMatrix(matrix)
+    , fBoundaryMode(boundaryMode) {
     fLight->ref();
     if (light->requiresFragmentPosition()) {
         this->setWillReadFragmentPosition();
@@ -1206,373 +1594,394 @@ GrLightingEffect::~GrLightingEffect() {
     fLight->unref();
 }
 
-bool GrLightingEffect::onIsEqual(const GrEffect& sBase) const {
-    const GrLightingEffect& s = CastEffect<GrLightingEffect>(sBase);
-    return this->texture(0) == s.texture(0) &&
-           fLight->isEqual(*s.fLight) &&
-           fSurfaceScale == s.fSurfaceScale;
+bool GrLightingEffect::onIsEqual(const GrFragmentProcessor& sBase) const {
+    const GrLightingEffect& s = sBase.cast<GrLightingEffect>();
+    return fLight->isEqual(*s.fLight) &&
+           fSurfaceScale == s.fSurfaceScale &&
+           fBoundaryMode == s.fBoundaryMode;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 GrDiffuseLightingEffect::GrDiffuseLightingEffect(GrTexture* texture,
-                                                 const SkLight* light,
+                                                 const SkImageFilterLight* light,
                                                  SkScalar surfaceScale,
                                                  const SkMatrix& matrix,
-                                                 SkScalar kd)
-    : INHERITED(texture, light, surfaceScale, matrix), fKD(kd) {
+                                                 SkScalar kd,
+                                                 BoundaryMode boundaryMode)
+    : INHERITED(texture, light, surfaceScale, matrix, boundaryMode), fKD(kd) {
+    this->initClassID<GrDiffuseLightingEffect>();
 }
 
-const GrBackendEffectFactory& GrDiffuseLightingEffect::getFactory() const {
-    return GrTBackendEffectFactory<GrDiffuseLightingEffect>::getInstance();
-}
-
-bool GrDiffuseLightingEffect::onIsEqual(const GrEffect& sBase) const {
-    const GrDiffuseLightingEffect& s = CastEffect<GrDiffuseLightingEffect>(sBase);
+bool GrDiffuseLightingEffect::onIsEqual(const GrFragmentProcessor& sBase) const {
+    const GrDiffuseLightingEffect& s = sBase.cast<GrDiffuseLightingEffect>();
     return INHERITED::onIsEqual(sBase) &&
             this->kd() == s.kd();
 }
 
-GR_DEFINE_EFFECT_TEST(GrDiffuseLightingEffect);
+void GrDiffuseLightingEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                                    GrProcessorKeyBuilder* b) const {
+    GrGLDiffuseLightingEffect::GenKey(*this, caps, b);
+}
 
-GrEffect* GrDiffuseLightingEffect::TestCreate(SkRandom* random,
-                                              GrContext* context,
-                                              const GrDrawTargetCaps&,
-                                              GrTexture* textures[]) {
-    SkScalar surfaceScale = random->nextSScalar1();
-    SkScalar kd = random->nextUScalar1();
-    SkAutoTUnref<SkLight> light(create_random_light(random));
+GrGLSLFragmentProcessor* GrDiffuseLightingEffect::onCreateGLSLInstance() const {
+    return new GrGLDiffuseLightingEffect(*this);
+}
+
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrDiffuseLightingEffect);
+
+const GrFragmentProcessor* GrDiffuseLightingEffect::TestCreate(GrProcessorTestData* d) {
+    SkScalar surfaceScale = d->fRandom->nextSScalar1();
+    SkScalar kd = d->fRandom->nextUScalar1();
+    SkAutoTUnref<SkImageFilterLight> light(create_random_light(d->fRandom));
     SkMatrix matrix;
     for (int i = 0; i < 9; i++) {
-        matrix[i] = random->nextUScalar1();
+        matrix[i] = d->fRandom->nextUScalar1();
     }
-    return GrDiffuseLightingEffect::Create(textures[GrEffectUnitTest::kAlphaTextureIdx],
-                                           light, surfaceScale, matrix, kd);
+    BoundaryMode mode = static_cast<BoundaryMode>(d->fRandom->nextU() % kBoundaryModeCount);
+    return GrDiffuseLightingEffect::Create(d->fTextures[GrProcessorUnitTest::kAlphaTextureIdx],
+                                           light, surfaceScale, matrix, kd, mode);
 }
 
 
 ///////////////////////////////////////////////////////////////////////////////
 
-GrGLLightingEffect::GrGLLightingEffect(const GrBackendEffectFactory& factory,
-                                       const GrDrawEffect& drawEffect)
-    : INHERITED(factory) {
-    const GrLightingEffect& m = drawEffect.castEffect<GrLightingEffect>();
+GrGLLightingEffect::GrGLLightingEffect(const GrProcessor& fp) {
+    const GrLightingEffect& m = fp.cast<GrLightingEffect>();
     fLight = m.light()->createGLLight();
+    fBoundaryMode = m.boundaryMode();
 }
 
 GrGLLightingEffect::~GrGLLightingEffect() {
     delete fLight;
 }
 
-void GrGLLightingEffect::emitCode(GrGLShaderBuilder* builder,
-                                  const GrDrawEffect&,
-                                  const GrEffectKey& key,
-                                  const char* outputColor,
-                                  const char* inputColor,
-                                  const TransformedCoordsArray& coords,
-                                  const TextureSamplerArray& samplers) {
-    SkString coords2D = builder->ensureFSCoords2D(coords, 0);
-
-    fImageIncrementUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                              kVec2f_GrSLType,
+void GrGLLightingEffect::emitCode(EmitArgs& args) {
+    fImageIncrementUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                              kVec2f_GrSLType, kDefault_GrSLPrecision,
                                              "ImageIncrement");
-    fSurfaceScaleUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                           kFloat_GrSLType,
+    fSurfaceScaleUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                           kFloat_GrSLType, kDefault_GrSLPrecision,
                                            "SurfaceScale");
-    fLight->emitLightColorUniform(builder);
+    fLight->emitLightColorUniform(args.fBuilder);
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
     SkString lightFunc;
-    this->emitLightFunc(builder, &lightFunc);
-    static const GrGLShaderVar gSobelArgs[] =  {
-        GrGLShaderVar("a", kFloat_GrSLType),
-        GrGLShaderVar("b", kFloat_GrSLType),
-        GrGLShaderVar("c", kFloat_GrSLType),
-        GrGLShaderVar("d", kFloat_GrSLType),
-        GrGLShaderVar("e", kFloat_GrSLType),
-        GrGLShaderVar("f", kFloat_GrSLType),
-        GrGLShaderVar("scale", kFloat_GrSLType),
+    this->emitLightFunc(args.fBuilder, fragBuilder, &lightFunc);
+    static const GrGLSLShaderVar gSobelArgs[] =  {
+        GrGLSLShaderVar("a", kFloat_GrSLType),
+        GrGLSLShaderVar("b", kFloat_GrSLType),
+        GrGLSLShaderVar("c", kFloat_GrSLType),
+        GrGLSLShaderVar("d", kFloat_GrSLType),
+        GrGLSLShaderVar("e", kFloat_GrSLType),
+        GrGLSLShaderVar("f", kFloat_GrSLType),
+        GrGLSLShaderVar("scale", kFloat_GrSLType),
     };
     SkString sobelFuncName;
-    builder->fsEmitFunction(kFloat_GrSLType,
-                            "sobel",
-                            SK_ARRAY_COUNT(gSobelArgs),
-                            gSobelArgs,
-                            "\treturn (-a + b - 2.0 * c + 2.0 * d -e + f) * scale;\n",
-                            &sobelFuncName);
-    static const GrGLShaderVar gPointToNormalArgs[] =  {
-        GrGLShaderVar("x", kFloat_GrSLType),
-        GrGLShaderVar("y", kFloat_GrSLType),
-        GrGLShaderVar("scale", kFloat_GrSLType),
+    SkString coords2D = fragBuilder->ensureFSCoords2D(args.fCoords, 0);
+
+    fragBuilder->emitFunction(kFloat_GrSLType,
+                              "sobel",
+                              SK_ARRAY_COUNT(gSobelArgs),
+                              gSobelArgs,
+                              "\treturn (-a + b - 2.0 * c + 2.0 * d -e + f) * scale;\n",
+                              &sobelFuncName);
+    static const GrGLSLShaderVar gPointToNormalArgs[] =  {
+        GrGLSLShaderVar("x", kFloat_GrSLType),
+        GrGLSLShaderVar("y", kFloat_GrSLType),
+        GrGLSLShaderVar("scale", kFloat_GrSLType),
     };
     SkString pointToNormalName;
-    builder->fsEmitFunction(kVec3f_GrSLType,
-                            "pointToNormal",
-                            SK_ARRAY_COUNT(gPointToNormalArgs),
-                            gPointToNormalArgs,
-                            "\treturn normalize(vec3(-x * scale, y * scale, 1));\n",
-                            &pointToNormalName);
+    fragBuilder->emitFunction(kVec3f_GrSLType,
+                              "pointToNormal",
+                              SK_ARRAY_COUNT(gPointToNormalArgs),
+                              gPointToNormalArgs,
+                              "\treturn normalize(vec3(-x * scale, -y * scale, 1));\n",
+                              &pointToNormalName);
 
-    static const GrGLShaderVar gInteriorNormalArgs[] =  {
-        GrGLShaderVar("m", kFloat_GrSLType, 9),
-        GrGLShaderVar("surfaceScale", kFloat_GrSLType),
+    static const GrGLSLShaderVar gInteriorNormalArgs[] =  {
+        GrGLSLShaderVar("m", kFloat_GrSLType, 9),
+        GrGLSLShaderVar("surfaceScale", kFloat_GrSLType),
     };
-    SkString interiorNormalBody;
-    interiorNormalBody.appendf("\treturn %s(%s(m[0], m[2], m[3], m[5], m[6], m[8], 0.25),\n"
-                               "\t       %s(m[0], m[6], m[1], m[7], m[2], m[8], 0.25),\n"
-                               "\t       surfaceScale);\n",
-                                pointToNormalName.c_str(),
-                                sobelFuncName.c_str(),
-                                sobelFuncName.c_str());
-    SkString interiorNormalName;
-    builder->fsEmitFunction(kVec3f_GrSLType,
-                            "interiorNormal",
-                            SK_ARRAY_COUNT(gInteriorNormalArgs),
-                            gInteriorNormalArgs,
-                            interiorNormalBody.c_str(),
-                            &interiorNormalName);
+    SkString normalBody = emitNormalFunc(fBoundaryMode,
+                                         pointToNormalName.c_str(),
+                                         sobelFuncName.c_str());
+    SkString normalName;
+    fragBuilder->emitFunction(kVec3f_GrSLType,
+                              "normal",
+                              SK_ARRAY_COUNT(gInteriorNormalArgs),
+                              gInteriorNormalArgs,
+                              normalBody.c_str(),
+                              &normalName);
 
-    builder->fsCodeAppendf("\t\tvec2 coord = %s;\n", coords2D.c_str());
-    builder->fsCodeAppend("\t\tfloat m[9];\n");
+    fragBuilder->codeAppendf("\t\tvec2 coord = %s;\n", coords2D.c_str());
+    fragBuilder->codeAppend("\t\tfloat m[9];\n");
 
-    const char* imgInc = builder->getUniformCStr(fImageIncrementUni);
-    const char* surfScale = builder->getUniformCStr(fSurfaceScaleUni);
+    const char* imgInc = args.fBuilder->getUniformCStr(fImageIncrementUni);
+    const char* surfScale = args.fBuilder->getUniformCStr(fSurfaceScaleUni);
 
     int index = 0;
-    for (int dy = -1; dy <= 1; dy++) {
+    for (int dy = 1; dy >= -1; dy--) {
         for (int dx = -1; dx <= 1; dx++) {
             SkString texCoords;
             texCoords.appendf("coord + vec2(%d, %d) * %s", dx, dy, imgInc);
-            builder->fsCodeAppendf("\t\tm[%d] = ", index++);
-            builder->fsAppendTextureLookup(samplers[0], texCoords.c_str());
-            builder->fsCodeAppend(".a;\n");
+            fragBuilder->codeAppendf("\t\tm[%d] = ", index++);
+            fragBuilder->appendTextureLookup(args.fSamplers[0], texCoords.c_str());
+            fragBuilder->codeAppend(".a;\n");
         }
     }
-    builder->fsCodeAppend("\t\tvec3 surfaceToLight = ");
+    fragBuilder->codeAppend("\t\tvec3 surfaceToLight = ");
     SkString arg;
     arg.appendf("%s * m[4]", surfScale);
-    fLight->emitSurfaceToLight(builder, arg.c_str());
-    builder->fsCodeAppend(";\n");
-    builder->fsCodeAppendf("\t\t%s = %s(%s(m, %s), surfaceToLight, ",
-                           outputColor, lightFunc.c_str(), interiorNormalName.c_str(), surfScale);
-    fLight->emitLightColor(builder, "surfaceToLight");
-    builder->fsCodeAppend(");\n");
+    fLight->emitSurfaceToLight(args.fBuilder, fragBuilder, arg.c_str());
+    fragBuilder->codeAppend(";\n");
+    fragBuilder->codeAppendf("\t\t%s = %s(%s(m, %s), surfaceToLight, ",
+                             args.fOutputColor, lightFunc.c_str(), normalName.c_str(), surfScale);
+    fLight->emitLightColor(args.fBuilder, fragBuilder, "surfaceToLight");
+    fragBuilder->codeAppend(");\n");
     SkString modulate;
-    GrGLSLMulVarBy4f(&modulate, 2, outputColor, inputColor);
-    builder->fsCodeAppend(modulate.c_str());
+    GrGLSLMulVarBy4f(&modulate, args.fOutputColor, args.fInputColor);
+    fragBuilder->codeAppend(modulate.c_str());
 }
 
-void GrGLLightingEffect::GenKey(const GrDrawEffect& drawEffect,
-                                const GrGLCaps& caps, GrEffectKeyBuilder* b) {
-    b->add32(drawEffect.castEffect<GrLightingEffect>().light()->type());
+void GrGLLightingEffect::GenKey(const GrProcessor& proc,
+                                const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) {
+    const GrLightingEffect& lighting = proc.cast<GrLightingEffect>();
+    b->add32(lighting.boundaryMode() << 2 | lighting.light()->type());
 }
 
-void GrGLLightingEffect::setData(const GrGLUniformManager& uman,
-                                 const GrDrawEffect& drawEffect) {
-    const GrLightingEffect& lighting = drawEffect.castEffect<GrLightingEffect>();
+void GrGLLightingEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                                   const GrProcessor& proc) {
+    const GrLightingEffect& lighting = proc.cast<GrLightingEffect>();
     GrTexture* texture = lighting.texture(0);
     float ySign = texture->origin() == kTopLeft_GrSurfaceOrigin ? -1.0f : 1.0f;
-    uman.set2f(fImageIncrementUni, 1.0f / texture->width(), ySign / texture->height());
-    uman.set1f(fSurfaceScaleUni, lighting.surfaceScale());
-    SkAutoTUnref<SkLight> transformedLight(lighting.light()->transform(lighting.filterMatrix()));
-    fLight->setData(uman, transformedLight);
+    pdman.set2f(fImageIncrementUni, 1.0f / texture->width(), ySign / texture->height());
+    pdman.set1f(fSurfaceScaleUni, lighting.surfaceScale());
+    SkAutoTUnref<SkImageFilterLight> transformedLight(
+                                            lighting.light()->transform(lighting.filterMatrix()));
+    fLight->setData(pdman, transformedLight);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
 
-GrGLDiffuseLightingEffect::GrGLDiffuseLightingEffect(const GrBackendEffectFactory& factory,
-                                                     const GrDrawEffect& drawEffect)
-    : INHERITED(factory, drawEffect) {
+GrGLDiffuseLightingEffect::GrGLDiffuseLightingEffect(const GrProcessor& proc)
+    : INHERITED(proc) {
 }
 
-void GrGLDiffuseLightingEffect::emitLightFunc(GrGLShaderBuilder* builder, SkString* funcName) {
+void GrGLDiffuseLightingEffect::emitLightFunc(GrGLSLFPBuilder* builder,
+                                              GrGLSLFragmentBuilder* fragBuilder,
+                                              SkString* funcName) {
     const char* kd;
-    fKDUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                 kFloat_GrSLType,
-                                 "KD",
-                                 &kd);
+    fKDUni = builder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                 kFloat_GrSLType, kDefault_GrSLPrecision,
+                                 "KD", &kd);
 
-    static const GrGLShaderVar gLightArgs[] = {
-        GrGLShaderVar("normal", kVec3f_GrSLType),
-        GrGLShaderVar("surfaceToLight", kVec3f_GrSLType),
-        GrGLShaderVar("lightColor", kVec3f_GrSLType)
+    static const GrGLSLShaderVar gLightArgs[] = {
+        GrGLSLShaderVar("normal", kVec3f_GrSLType),
+        GrGLSLShaderVar("surfaceToLight", kVec3f_GrSLType),
+        GrGLSLShaderVar("lightColor", kVec3f_GrSLType)
     };
     SkString lightBody;
     lightBody.appendf("\tfloat colorScale = %s * dot(normal, surfaceToLight);\n", kd);
     lightBody.appendf("\treturn vec4(lightColor * clamp(colorScale, 0.0, 1.0), 1.0);\n");
-    builder->fsEmitFunction(kVec4f_GrSLType,
-                            "light",
-                            SK_ARRAY_COUNT(gLightArgs),
-                            gLightArgs,
-                            lightBody.c_str(),
-                            funcName);
+    fragBuilder->emitFunction(kVec4f_GrSLType,
+                              "light",
+                              SK_ARRAY_COUNT(gLightArgs),
+                              gLightArgs,
+                              lightBody.c_str(),
+                              funcName);
 }
 
-void GrGLDiffuseLightingEffect::setData(const GrGLUniformManager& uman,
-                                        const GrDrawEffect& drawEffect) {
-    INHERITED::setData(uman, drawEffect);
-    const GrDiffuseLightingEffect& diffuse = drawEffect.castEffect<GrDiffuseLightingEffect>();
-    uman.set1f(fKDUni, diffuse.kd());
+void GrGLDiffuseLightingEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                                          const GrProcessor& proc) {
+    INHERITED::onSetData(pdman, proc);
+    const GrDiffuseLightingEffect& diffuse = proc.cast<GrDiffuseLightingEffect>();
+    pdman.set1f(fKDUni, diffuse.kd());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 GrSpecularLightingEffect::GrSpecularLightingEffect(GrTexture* texture,
-                                                   const SkLight* light,
+                                                   const SkImageFilterLight* light,
                                                    SkScalar surfaceScale,
                                                    const SkMatrix& matrix,
                                                    SkScalar ks,
-                                                   SkScalar shininess)
-    : INHERITED(texture, light, surfaceScale, matrix),
-      fKS(ks),
-      fShininess(shininess) {
+                                                   SkScalar shininess,
+                                                   BoundaryMode boundaryMode)
+    : INHERITED(texture, light, surfaceScale, matrix, boundaryMode)
+    , fKS(ks)
+    , fShininess(shininess) {
+    this->initClassID<GrSpecularLightingEffect>();
 }
 
-const GrBackendEffectFactory& GrSpecularLightingEffect::getFactory() const {
-    return GrTBackendEffectFactory<GrSpecularLightingEffect>::getInstance();
-}
-
-bool GrSpecularLightingEffect::onIsEqual(const GrEffect& sBase) const {
-    const GrSpecularLightingEffect& s = CastEffect<GrSpecularLightingEffect>(sBase);
+bool GrSpecularLightingEffect::onIsEqual(const GrFragmentProcessor& sBase) const {
+    const GrSpecularLightingEffect& s = sBase.cast<GrSpecularLightingEffect>();
     return INHERITED::onIsEqual(sBase) &&
            this->ks() == s.ks() &&
            this->shininess() == s.shininess();
 }
 
-GR_DEFINE_EFFECT_TEST(GrSpecularLightingEffect);
+void GrSpecularLightingEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                                     GrProcessorKeyBuilder* b) const {
+    GrGLSpecularLightingEffect::GenKey(*this, caps, b);
+}
 
-GrEffect* GrSpecularLightingEffect::TestCreate(SkRandom* random,
-                                               GrContext* context,
-                                               const GrDrawTargetCaps&,
-                                               GrTexture* textures[]) {
-    SkScalar surfaceScale = random->nextSScalar1();
-    SkScalar ks = random->nextUScalar1();
-    SkScalar shininess = random->nextUScalar1();
-    SkAutoTUnref<SkLight> light(create_random_light(random));
+GrGLSLFragmentProcessor* GrSpecularLightingEffect::onCreateGLSLInstance() const {
+    return new GrGLSpecularLightingEffect(*this);
+}
+
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrSpecularLightingEffect);
+
+const GrFragmentProcessor* GrSpecularLightingEffect::TestCreate(GrProcessorTestData* d) {
+    SkScalar surfaceScale = d->fRandom->nextSScalar1();
+    SkScalar ks = d->fRandom->nextUScalar1();
+    SkScalar shininess = d->fRandom->nextUScalar1();
+    SkAutoTUnref<SkImageFilterLight> light(create_random_light(d->fRandom));
     SkMatrix matrix;
     for (int i = 0; i < 9; i++) {
-        matrix[i] = random->nextUScalar1();
+        matrix[i] = d->fRandom->nextUScalar1();
     }
-    return GrSpecularLightingEffect::Create(textures[GrEffectUnitTest::kAlphaTextureIdx],
-                                            light, surfaceScale, matrix, ks, shininess);
+    BoundaryMode mode = static_cast<BoundaryMode>(d->fRandom->nextU() % kBoundaryModeCount);
+    return GrSpecularLightingEffect::Create(d->fTextures[GrProcessorUnitTest::kAlphaTextureIdx],
+                                            light, surfaceScale, matrix, ks, shininess, mode);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-GrGLSpecularLightingEffect::GrGLSpecularLightingEffect(const GrBackendEffectFactory& factory,
-                                                       const GrDrawEffect& drawEffect)
-    : INHERITED(factory, drawEffect) {
+GrGLSpecularLightingEffect::GrGLSpecularLightingEffect(const GrProcessor& proc)
+    : INHERITED(proc) {
 }
 
-void GrGLSpecularLightingEffect::emitLightFunc(GrGLShaderBuilder* builder, SkString* funcName) {
+void GrGLSpecularLightingEffect::emitLightFunc(GrGLSLFPBuilder* builder,
+                                               GrGLSLFragmentBuilder* fragBuilder,
+                                               SkString* funcName) {
     const char* ks;
     const char* shininess;
 
-    fKSUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                 kFloat_GrSLType, "KS", &ks);
-    fShininessUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                        kFloat_GrSLType, "Shininess", &shininess);
+    fKSUni = builder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                 kFloat_GrSLType, kDefault_GrSLPrecision, "KS", &ks);
+    fShininessUni = builder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                        kFloat_GrSLType,
+                                        kDefault_GrSLPrecision,
+                                        "Shininess",
+                                        &shininess);
 
-    static const GrGLShaderVar gLightArgs[] = {
-        GrGLShaderVar("normal", kVec3f_GrSLType),
-        GrGLShaderVar("surfaceToLight", kVec3f_GrSLType),
-        GrGLShaderVar("lightColor", kVec3f_GrSLType)
+    static const GrGLSLShaderVar gLightArgs[] = {
+        GrGLSLShaderVar("normal", kVec3f_GrSLType),
+        GrGLSLShaderVar("surfaceToLight", kVec3f_GrSLType),
+        GrGLSLShaderVar("lightColor", kVec3f_GrSLType)
     };
     SkString lightBody;
     lightBody.appendf("\tvec3 halfDir = vec3(normalize(surfaceToLight + vec3(0, 0, 1)));\n");
     lightBody.appendf("\tfloat colorScale = %s * pow(dot(normal, halfDir), %s);\n", ks, shininess);
     lightBody.appendf("\tvec3 color = lightColor * clamp(colorScale, 0.0, 1.0);\n");
     lightBody.appendf("\treturn vec4(color, max(max(color.r, color.g), color.b));\n");
-    builder->fsEmitFunction(kVec4f_GrSLType,
-                            "light",
-                            SK_ARRAY_COUNT(gLightArgs),
-                            gLightArgs,
-                            lightBody.c_str(),
-                            funcName);
+    fragBuilder->emitFunction(kVec4f_GrSLType,
+                              "light",
+                              SK_ARRAY_COUNT(gLightArgs),
+                              gLightArgs,
+                              lightBody.c_str(),
+                              funcName);
 }
 
-void GrGLSpecularLightingEffect::setData(const GrGLUniformManager& uman,
-                                         const GrDrawEffect& drawEffect) {
-    INHERITED::setData(uman, drawEffect);
-    const GrSpecularLightingEffect& spec = drawEffect.castEffect<GrSpecularLightingEffect>();
-    uman.set1f(fKSUni, spec.ks());
-    uman.set1f(fShininessUni, spec.shininess());
+void GrGLSpecularLightingEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                                           const GrProcessor& effect) {
+    INHERITED::onSetData(pdman, effect);
+    const GrSpecularLightingEffect& spec = effect.cast<GrSpecularLightingEffect>();
+    pdman.set1f(fKSUni, spec.ks());
+    pdman.set1f(fShininessUni, spec.shininess());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void GrGLLight::emitLightColorUniform(GrGLShaderBuilder* builder) {
-    fColorUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                    kVec3f_GrSLType, "LightColor");
+void GrGLLight::emitLightColorUniform(GrGLSLFPBuilder* builder) {
+    fColorUni = builder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                    kVec3f_GrSLType, kDefault_GrSLPrecision,
+                                    "LightColor");
 }
 
-void GrGLLight::emitLightColor(GrGLShaderBuilder* builder,
+void GrGLLight::emitLightColor(GrGLSLFPBuilder* builder,
+                               GrGLSLFragmentBuilder* fragBuilder,
                                const char *surfaceToLight) {
-    builder->fsCodeAppend(builder->getUniformCStr(this->lightColorUni()));
+    fragBuilder->codeAppend(builder->getUniformCStr(this->lightColorUni()));
 }
 
-void GrGLLight::setData(const GrGLUniformManager& uman,
-                        const SkLight* light) const {
-    setUniformPoint3(uman, fColorUni, light->color() * SkScalarInvert(SkIntToScalar(255)));
+void GrGLLight::setData(const GrGLSLProgramDataManager& pdman,
+                        const SkImageFilterLight* light) const {
+    setUniformPoint3(pdman, fColorUni,
+                     light->color().makeScale(SkScalarInvert(SkIntToScalar(255))));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void GrGLDistantLight::setData(const GrGLUniformManager& uman,
-                               const SkLight* light) const {
-    INHERITED::setData(uman, light);
-    SkASSERT(light->type() == SkLight::kDistant_LightType);
+void GrGLDistantLight::setData(const GrGLSLProgramDataManager& pdman,
+                               const SkImageFilterLight* light) const {
+    INHERITED::setData(pdman, light);
+    SkASSERT(light->type() == SkImageFilterLight::kDistant_LightType);
     const SkDistantLight* distantLight = static_cast<const SkDistantLight*>(light);
-    setUniformNormal3(uman, fDirectionUni, distantLight->direction());
+    setUniformNormal3(pdman, fDirectionUni, distantLight->direction());
 }
 
-void GrGLDistantLight::emitSurfaceToLight(GrGLShaderBuilder* builder, const char* z) {
+void GrGLDistantLight::emitSurfaceToLight(GrGLSLFPBuilder* builder,
+                                          GrGLSLFragmentBuilder* fragBuilder,
+                                          const char* z) {
     const char* dir;
-    fDirectionUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility, kVec3f_GrSLType,
+    fDirectionUni = builder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                        kVec3f_GrSLType, kDefault_GrSLPrecision,
                                         "LightDirection", &dir);
-    builder->fsCodeAppend(dir);
+    fragBuilder->codeAppend(dir);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void GrGLPointLight::setData(const GrGLUniformManager& uman,
-                             const SkLight* light) const {
-    INHERITED::setData(uman, light);
-    SkASSERT(light->type() == SkLight::kPoint_LightType);
+void GrGLPointLight::setData(const GrGLSLProgramDataManager& pdman,
+                             const SkImageFilterLight* light) const {
+    INHERITED::setData(pdman, light);
+    SkASSERT(light->type() == SkImageFilterLight::kPoint_LightType);
     const SkPointLight* pointLight = static_cast<const SkPointLight*>(light);
-    setUniformPoint3(uman, fLocationUni, pointLight->location());
+    setUniformPoint3(pdman, fLocationUni, pointLight->location());
 }
 
-void GrGLPointLight::emitSurfaceToLight(GrGLShaderBuilder* builder, const char* z) {
+void GrGLPointLight::emitSurfaceToLight(GrGLSLFPBuilder* builder,
+                                        GrGLSLFragmentBuilder* fragBuilder,
+                                        const char* z) {
     const char* loc;
-    fLocationUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility, kVec3f_GrSLType,
+    fLocationUni = builder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                       kVec3f_GrSLType, kDefault_GrSLPrecision,
                                        "LightLocation", &loc);
-    builder->fsCodeAppendf("normalize(%s - vec3(%s.xy, %s))", loc, builder->fragmentPosition(), z);
+    fragBuilder->codeAppendf("normalize(%s - vec3(%s.xy, %s))",
+                             loc, fragBuilder->fragmentPosition(), z);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void GrGLSpotLight::setData(const GrGLUniformManager& uman,
-                            const SkLight* light) const {
-    INHERITED::setData(uman, light);
-    SkASSERT(light->type() == SkLight::kSpot_LightType);
+void GrGLSpotLight::setData(const GrGLSLProgramDataManager& pdman,
+                            const SkImageFilterLight* light) const {
+    INHERITED::setData(pdman, light);
+    SkASSERT(light->type() == SkImageFilterLight::kSpot_LightType);
     const SkSpotLight* spotLight = static_cast<const SkSpotLight *>(light);
-    setUniformPoint3(uman, fLocationUni, spotLight->location());
-    uman.set1f(fExponentUni, spotLight->specularExponent());
-    uman.set1f(fCosInnerConeAngleUni, spotLight->cosInnerConeAngle());
-    uman.set1f(fCosOuterConeAngleUni, spotLight->cosOuterConeAngle());
-    uman.set1f(fConeScaleUni, spotLight->coneScale());
-    setUniformNormal3(uman, fSUni, spotLight->s());
+    setUniformPoint3(pdman, fLocationUni, spotLight->location());
+    pdman.set1f(fExponentUni, spotLight->specularExponent());
+    pdman.set1f(fCosInnerConeAngleUni, spotLight->cosInnerConeAngle());
+    pdman.set1f(fCosOuterConeAngleUni, spotLight->cosOuterConeAngle());
+    pdman.set1f(fConeScaleUni, spotLight->coneScale());
+    setUniformNormal3(pdman, fSUni, spotLight->s());
 }
 
-void GrGLSpotLight::emitSurfaceToLight(GrGLShaderBuilder* builder, const char* z) {
+void GrGLSpotLight::emitSurfaceToLight(GrGLSLFPBuilder* builder,
+                                       GrGLSLFragmentBuilder* fragBuilder,
+                                       const char* z) {
     const char* location;
-    fLocationUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                       kVec3f_GrSLType, "LightLocation", &location);
-    builder->fsCodeAppendf("normalize(%s - vec3(%s.xy, %s))",
-                           location, builder->fragmentPosition(), z);
+    fLocationUni = builder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                       kVec3f_GrSLType, kDefault_GrSLPrecision,
+                                       "LightLocation", &location);
+
+    fragBuilder->codeAppendf("normalize(%s - vec3(%s.xy, %s))",
+                             location, fragBuilder->fragmentPosition(), z);
 }
 
-void GrGLSpotLight::emitLightColor(GrGLShaderBuilder* builder,
+void GrGLSpotLight::emitLightColor(GrGLSLFPBuilder* builder,
+                                   GrGLSLFragmentBuilder* fragBuilder,
                                    const char *surfaceToLight) {
 
     const char* color = builder->getUniformCStr(this->lightColorUni()); // created by parent class.
@@ -1582,19 +1991,23 @@ void GrGLSpotLight::emitLightColor(GrGLShaderBuilder* builder,
     const char* cosOuter;
     const char* coneScale;
     const char* s;
-    fExponentUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                       kFloat_GrSLType, "Exponent", &exponent);
-    fCosInnerConeAngleUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                                kFloat_GrSLType, "CosInnerConeAngle", &cosInner);
-    fCosOuterConeAngleUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                                kFloat_GrSLType, "CosOuterConeAngle", &cosOuter);
-    fConeScaleUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                        kFloat_GrSLType, "ConeScale", &coneScale);
-    fSUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                kVec3f_GrSLType, "S", &s);
+    fExponentUni = builder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                       kFloat_GrSLType, kDefault_GrSLPrecision,
+                                       "Exponent", &exponent);
+    fCosInnerConeAngleUni = builder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                                kFloat_GrSLType, kDefault_GrSLPrecision,
+                                                "CosInnerConeAngle", &cosInner);
+    fCosOuterConeAngleUni = builder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                                kFloat_GrSLType, kDefault_GrSLPrecision,
+                                                "CosOuterConeAngle", &cosOuter);
+    fConeScaleUni = builder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                        kFloat_GrSLType, kDefault_GrSLPrecision,
+                                        "ConeScale", &coneScale);
+    fSUni = builder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                kVec3f_GrSLType, kDefault_GrSLPrecision, "S", &s);
 
-    static const GrGLShaderVar gLightColorArgs[] = {
-        GrGLShaderVar("surfaceToLight", kVec3f_GrSLType)
+    static const GrGLSLShaderVar gLightColorArgs[] = {
+        GrGLSLShaderVar("surfaceToLight", kVec3f_GrSLType)
     };
     SkString lightColorBody;
     lightColorBody.appendf("\tfloat cosAngle = -dot(surfaceToLight, %s);\n", s);
@@ -1607,14 +2020,14 @@ void GrGLSpotLight::emitLightColor(GrGLShaderBuilder* builder,
                            color, cosOuter, coneScale);
     lightColorBody.appendf("\t}\n");
     lightColorBody.appendf("\treturn %s;\n", color);
-    builder->fsEmitFunction(kVec3f_GrSLType,
-                            "lightColor",
-                            SK_ARRAY_COUNT(gLightColorArgs),
-                            gLightColorArgs,
-                            lightColorBody.c_str(),
-                            &fLightColorFunc);
+    fragBuilder->emitFunction(kVec3f_GrSLType,
+                              "lightColor",
+                              SK_ARRAY_COUNT(gLightColorArgs),
+                              gLightColorArgs,
+                              lightColorBody.c_str(),
+                              &fLightColorFunc);
 
-    builder->fsCodeAppendf("%s(%s)", fLightColorFunc.c_str(), surfaceToLight);
+    fragBuilder->codeAppendf("%s(%s)", fLightColorFunc.c_str(), surfaceToLight);
 }
 
 #endif
diff --git a/gfx/skia/skia/src/effects/SkLumaColorFilter.cpp b/gfx/skia/skia/src/effects/SkLumaColorFilter.cpp
index d33e5e8d78ea..a131b0f43455 100644
--- a/gfx/skia/skia/src/effects/SkLumaColorFilter.cpp
+++ b/gfx/skia/skia/src/effects/SkLumaColorFilter.cpp
@@ -11,10 +11,11 @@
 #include "SkString.h"
 
 #if SK_SUPPORT_GPU
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
 #include "GrContext.h"
-#include "GrTBackendEffectFactory.h"
+#include "GrInvariantOutput.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
 #endif
 
 void SkLumaColorFilter::filterSpan(const SkPMColor src[], int count,
@@ -37,20 +38,13 @@ void SkLumaColorFilter::filterSpan(const SkPMColor src[], int count,
     }
 }
 
-SkColorFilter* SkLumaColorFilter::Create() {
-    return SkNEW(SkLumaColorFilter);
-}
+SkColorFilter* SkLumaColorFilter::Create() { return new SkLumaColorFilter; }
 
-SkLumaColorFilter::SkLumaColorFilter()
-    : INHERITED() {
-}
+SkLumaColorFilter::SkLumaColorFilter() : INHERITED() {}
 
-SkLumaColorFilter::SkLumaColorFilter(SkReadBuffer& buffer)
-    : INHERITED(buffer) {
-}
+SkFlattenable* SkLumaColorFilter::CreateProc(SkReadBuffer&) { return new SkLumaColorFilter; }
 
-void SkLumaColorFilter::flatten(SkWriteBuffer&) const {
-}
+void SkLumaColorFilter::flatten(SkWriteBuffer&) const {}
 
 #ifndef SK_IGNORE_TO_STRING
 void SkLumaColorFilter::toString(SkString* str) const {
@@ -59,67 +53,65 @@ void SkLumaColorFilter::toString(SkString* str) const {
 #endif
 
 #if SK_SUPPORT_GPU
-class LumaColorFilterEffect : public GrEffect {
+class LumaColorFilterEffect : public GrFragmentProcessor {
 public:
-    static GrEffect* Create() {
-        GR_CREATE_STATIC_EFFECT(gLumaEffect, LumaColorFilterEffect, ());
-        return SkRef(gLumaEffect);
+    static const GrFragmentProcessor* Create() {
+        return new LumaColorFilterEffect;
     }
 
-    static const char* Name() { return "Luminance-to-Alpha"; }
+    const char* name() const override { return "Luminance-to-Alpha"; }
 
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE {
-        return GrTBackendEffectFactory<LumaColorFilterEffect>::getInstance();
-    }
-
-    virtual void getConstantColorComponents(GrColor* color,
-                                            uint32_t* validFlags) const SK_OVERRIDE {
-        // The output is always black.
-        *color = GrColorPackRGBA(0, 0, 0, GrColorUnpackA(*color));
-        *validFlags = kRGB_GrColorComponentFlags;
-    }
-
-    class GLEffect : public GrGLEffect {
+    class GLSLProcessor : public GrGLSLFragmentProcessor {
     public:
-        GLEffect(const GrBackendEffectFactory& factory,
-                 const GrDrawEffect&)
-        : INHERITED(factory) {
-        }
+        GLSLProcessor(const GrProcessor&) {}
 
-        static void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder* b) {}
+        static void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder* b) {}
 
-        virtual void emitCode(GrGLShaderBuilder* builder,
-                              const GrDrawEffect&,
-                              const GrEffectKey&,
-                              const char* outputColor,
-                              const char* inputColor,
-                              const TransformedCoordsArray&,
-                              const TextureSamplerArray&) SK_OVERRIDE {
-            if (NULL == inputColor) {
-                inputColor = "vec4(1)";
+        virtual void emitCode(EmitArgs& args) override {
+            if (nullptr == args.fInputColor) {
+                args.fInputColor = "vec4(1)";
             }
 
-            builder->fsCodeAppendf("\tfloat luma = dot(vec3(%f, %f, %f), %s.rgb);\n",
-                                   SK_ITU_BT709_LUM_COEFF_R,
-                                   SK_ITU_BT709_LUM_COEFF_G,
-                                   SK_ITU_BT709_LUM_COEFF_B,
-                                   inputColor);
-            builder->fsCodeAppendf("\t%s = vec4(0, 0, 0, luma);\n",
-                                   outputColor);
+            GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+            fragBuilder->codeAppendf("\tfloat luma = dot(vec3(%f, %f, %f), %s.rgb);\n",
+                                     SK_ITU_BT709_LUM_COEFF_R,
+                                     SK_ITU_BT709_LUM_COEFF_G,
+                                     SK_ITU_BT709_LUM_COEFF_B,
+                                     args.fInputColor);
+            fragBuilder->codeAppendf("\t%s = vec4(0, 0, 0, luma);\n",
+                                     args.fOutputColor);
 
         }
 
     private:
-        typedef GrGLEffect INHERITED;
+        typedef GrGLSLFragmentProcessor INHERITED;
     };
 
 private:
-    virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE {
-        return true;
+    LumaColorFilterEffect() {
+        this->initClassID<LumaColorFilterEffect>();
+    }
+
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override {
+        return new GLSLProcessor(*this);
+    }
+
+    virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                       GrProcessorKeyBuilder* b) const override {
+        GLSLProcessor::GenKey(*this, caps, b);
+    }
+
+    bool onIsEqual(const GrFragmentProcessor&) const override { return true; }
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override {
+        // The output is always black. The alpha value for the color passed in is arbitrary.
+        inout->setToOther(kRGB_GrColorComponentFlags, GrColorPackRGBA(0, 0, 0, 0),
+                          GrInvariantOutput::kWill_ReadInput);
     }
 };
 
-GrEffect* SkLumaColorFilter::asNewEffect(GrContext*) const {
+const GrFragmentProcessor* SkLumaColorFilter::asFragmentProcessor(GrContext*) const {
+
     return LumaColorFilterEffect::Create();
 }
 #endif
diff --git a/gfx/skia/skia/src/effects/SkMagnifierImageFilter.cpp b/gfx/skia/skia/src/effects/SkMagnifierImageFilter.cpp
index d3adf2718316..911294444aba 100644
--- a/gfx/skia/skia/src/effects/SkMagnifierImageFilter.cpp
+++ b/gfx/skia/skia/src/effects/SkMagnifierImageFilter.cpp
@@ -8,76 +8,83 @@
 #include "SkBitmap.h"
 #include "SkMagnifierImageFilter.h"
 #include "SkColorPriv.h"
+#include "SkDevice.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkValidationUtils.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 #if SK_SUPPORT_GPU
+#include "GrInvariantOutput.h"
 #include "effects/GrSingleTextureEffect.h"
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
-#include "gl/GrGLSL.h"
-#include "gl/GrGLTexture.h"
-#include "GrTBackendEffectFactory.h"
-
-class GrGLMagnifierEffect;
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
 
 class GrMagnifierEffect : public GrSingleTextureEffect {
 
 public:
-    static GrEffect* Create(GrTexture* texture,
-                            float xOffset,
-                            float yOffset,
-                            float xInvZoom,
-                            float yInvZoom,
-                            float xInvInset,
-                            float yInvInset) {
-        return SkNEW_ARGS(GrMagnifierEffect, (texture,
-                                              xOffset,
-                                              yOffset,
-                                              xInvZoom,
-                                              yInvZoom,
-                                              xInvInset,
-                                              yInvInset));
+    static GrFragmentProcessor* Create(GrTexture* texture,
+                                       const SkRect& bounds,
+                                       float xOffset,
+                                       float yOffset,
+                                       float xInvZoom,
+                                       float yInvZoom,
+                                       float xInvInset,
+                                       float yInvInset) {
+        return new GrMagnifierEffect(texture, bounds, xOffset, yOffset, xInvZoom, yInvZoom, xInvInset,
+                                     yInvInset);
     }
 
     virtual ~GrMagnifierEffect() {};
 
-    static const char* Name() { return "Magnifier"; }
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
+    const char* name() const override { return "Magnifier"; }
 
+    const SkRect& bounds() const { return fBounds; }    // Bounds of source image.
+    // Offset to apply to zoomed pixels, (srcRect position / texture size).
     float x_offset() const { return fXOffset; }
     float y_offset() const { return fYOffset; }
+
+    // Scale to apply to zoomed pixels (srcRect size / bounds size).
     float x_inv_zoom() const { return fXInvZoom; }
     float y_inv_zoom() const { return fYInvZoom; }
+
+    // 1/radius over which to transition from unzoomed to zoomed pixels (bounds size / inset).
     float x_inv_inset() const { return fXInvInset; }
     float y_inv_inset() const { return fYInvInset; }
 
-    typedef GrGLMagnifierEffect GLEffect;
-
 private:
     GrMagnifierEffect(GrTexture* texture,
+                      const SkRect& bounds,
                       float xOffset,
                       float yOffset,
                       float xInvZoom,
                       float yInvZoom,
                       float xInvInset,
                       float yInvInset)
-        : GrSingleTextureEffect(texture, MakeDivByTextureWHMatrix(texture))
+        : INHERITED(texture, GrCoordTransform::MakeDivByTextureWHMatrix(texture))
+        , fBounds(bounds)
         , fXOffset(xOffset)
         , fYOffset(yOffset)
         , fXInvZoom(xInvZoom)
         , fYInvZoom(yInvZoom)
         , fXInvInset(xInvInset)
-        , fYInvInset(yInvInset) {}
+        , fYInvInset(yInvInset) {
+        this->initClassID<GrMagnifierEffect>();
+    }
 
-    virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE;
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
 
-    GR_DECLARE_EFFECT_TEST;
+    void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
 
+    bool onIsEqual(const GrFragmentProcessor&) const override;
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
+
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+
+    SkRect fBounds;
     float fXOffset;
     float fYOffset;
     float fXInvZoom;
@@ -89,134 +96,130 @@ private:
 };
 
 // For brevity
-typedef GrGLUniformManager::UniformHandle UniformHandle;
+typedef GrGLSLProgramDataManager::UniformHandle UniformHandle;
 
-class GrGLMagnifierEffect : public GrGLEffect {
+class GrGLMagnifierEffect : public GrGLSLFragmentProcessor {
 public:
-    GrGLMagnifierEffect(const GrBackendEffectFactory&, const GrDrawEffect&);
+    GrGLMagnifierEffect(const GrProcessor&);
 
-    virtual void emitCode(GrGLShaderBuilder*,
-                          const GrDrawEffect&,
-                          const GrEffectKey&,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    virtual void emitCode(EmitArgs&) override;
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
 
 private:
     UniformHandle       fOffsetVar;
     UniformHandle       fInvZoomVar;
     UniformHandle       fInvInsetVar;
+    UniformHandle       fBoundsVar;
 
-    typedef GrGLEffect INHERITED;
+    typedef GrGLSLFragmentProcessor INHERITED;
 };
 
-GrGLMagnifierEffect::GrGLMagnifierEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&)
-    : INHERITED(factory) {
+GrGLMagnifierEffect::GrGLMagnifierEffect(const GrProcessor&) {
 }
 
-void GrGLMagnifierEffect::emitCode(GrGLShaderBuilder* builder,
-                                   const GrDrawEffect&,
-                                   const GrEffectKey& key,
-                                   const char* outputColor,
-                                   const char* inputColor,
-                                   const TransformedCoordsArray& coords,
-                                   const TextureSamplerArray& samplers) {
-    SkString coords2D = builder->ensureFSCoords2D(coords, 0);
-    fOffsetVar = builder->addUniform(
-        GrGLShaderBuilder::kFragment_Visibility |
-        GrGLShaderBuilder::kVertex_Visibility,
-        kVec2f_GrSLType, "Offset");
-    fInvZoomVar = builder->addUniform(
-        GrGLShaderBuilder::kFragment_Visibility |
-        GrGLShaderBuilder::kVertex_Visibility,
-        kVec2f_GrSLType, "InvZoom");
-    fInvInsetVar = builder->addUniform(
-        GrGLShaderBuilder::kFragment_Visibility |
-        GrGLShaderBuilder::kVertex_Visibility,
-        kVec2f_GrSLType, "InvInset");
+void GrGLMagnifierEffect::emitCode(EmitArgs& args) {
+    fOffsetVar = args.fBuilder->addUniform(
+        GrGLSLProgramBuilder::kFragment_Visibility,
+        kVec2f_GrSLType, kDefault_GrSLPrecision, "Offset");
+    fInvZoomVar = args.fBuilder->addUniform(
+        GrGLSLProgramBuilder::kFragment_Visibility,
+        kVec2f_GrSLType, kDefault_GrSLPrecision, "InvZoom");
+    fInvInsetVar = args.fBuilder->addUniform(
+        GrGLSLProgramBuilder::kFragment_Visibility,
+        kVec2f_GrSLType, kDefault_GrSLPrecision, "InvInset");
+    fBoundsVar = args.fBuilder->addUniform(
+        GrGLSLProgramBuilder::kFragment_Visibility,
+        kVec4f_GrSLType, kDefault_GrSLPrecision, "Bounds");
 
-    builder->fsCodeAppendf("\t\tvec2 coord = %s;\n", coords2D.c_str());
-    builder->fsCodeAppendf("\t\tvec2 zoom_coord = %s + %s * %s;\n",
-                           builder->getUniformCStr(fOffsetVar),
-                           coords2D.c_str(),
-                           builder->getUniformCStr(fInvZoomVar));
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    SkString coords2D = fragBuilder->ensureFSCoords2D(args.fCoords, 0);
+    fragBuilder->codeAppendf("\t\tvec2 coord = %s;\n", coords2D.c_str());
+    fragBuilder->codeAppendf("\t\tvec2 zoom_coord = %s + %s * %s;\n",
+                             args.fBuilder->getUniformCStr(fOffsetVar),
+                             coords2D.c_str(),
+                             args.fBuilder->getUniformCStr(fInvZoomVar));
+    const char* bounds = args.fBuilder->getUniformCStr(fBoundsVar);
+    fragBuilder->codeAppendf("\t\tvec2 delta = (coord - %s.xy) * %s.zw;\n", bounds, bounds);
+    fragBuilder->codeAppendf("\t\tdelta = min(delta, vec2(1.0, 1.0) - delta);\n");
+    fragBuilder->codeAppendf("\t\tdelta = delta * %s;\n",
+                             args.fBuilder->getUniformCStr(fInvInsetVar));
 
-    builder->fsCodeAppend("\t\tvec2 delta = min(coord, vec2(1.0, 1.0) - coord);\n");
+    fragBuilder->codeAppend("\t\tfloat weight = 0.0;\n");
+    fragBuilder->codeAppend("\t\tif (delta.s < 2.0 && delta.t < 2.0) {\n");
+    fragBuilder->codeAppend("\t\t\tdelta = vec2(2.0, 2.0) - delta;\n");
+    fragBuilder->codeAppend("\t\t\tfloat dist = length(delta);\n");
+    fragBuilder->codeAppend("\t\t\tdist = max(2.0 - dist, 0.0);\n");
+    fragBuilder->codeAppend("\t\t\tweight = min(dist * dist, 1.0);\n");
+    fragBuilder->codeAppend("\t\t} else {\n");
+    fragBuilder->codeAppend("\t\t\tvec2 delta_squared = delta * delta;\n");
+    fragBuilder->codeAppend("\t\t\tweight = min(min(delta_squared.x, delta_squared.y), 1.0);\n");
+    fragBuilder->codeAppend("\t\t}\n");
 
-    builder->fsCodeAppendf("\t\tdelta = delta * %s;\n", builder->getUniformCStr(fInvInsetVar));
+    fragBuilder->codeAppend("\t\tvec2 mix_coord = mix(coord, zoom_coord, weight);\n");
+    fragBuilder->codeAppend("\t\tvec4 output_color = ");
+    fragBuilder->appendTextureLookup(args.fSamplers[0], "mix_coord");
+    fragBuilder->codeAppend(";\n");
 
-    builder->fsCodeAppend("\t\tfloat weight = 0.0;\n");
-    builder->fsCodeAppend("\t\tif (delta.s < 2.0 && delta.t < 2.0) {\n");
-    builder->fsCodeAppend("\t\t\tdelta = vec2(2.0, 2.0) - delta;\n");
-    builder->fsCodeAppend("\t\t\tfloat dist = length(delta);\n");
-    builder->fsCodeAppend("\t\t\tdist = max(2.0 - dist, 0.0);\n");
-    builder->fsCodeAppend("\t\t\tweight = min(dist * dist, 1.0);\n");
-    builder->fsCodeAppend("\t\t} else {\n");
-    builder->fsCodeAppend("\t\t\tvec2 delta_squared = delta * delta;\n");
-    builder->fsCodeAppend("\t\t\tweight = min(min(delta_squared.x, delta_squared.y), 1.0);\n");
-    builder->fsCodeAppend("\t\t}\n");
-
-    builder->fsCodeAppend("\t\tvec2 mix_coord = mix(coord, zoom_coord, weight);\n");
-    builder->fsCodeAppend("\t\tvec4 output_color = ");
-    builder->fsAppendTextureLookup(samplers[0], "mix_coord");
-    builder->fsCodeAppend(";\n");
-
-    builder->fsCodeAppendf("\t\t%s = output_color;", outputColor);
+    fragBuilder->codeAppendf("\t\t%s = output_color;", args.fOutputColor);
     SkString modulate;
-    GrGLSLMulVarBy4f(&modulate, 2, outputColor, inputColor);
-    builder->fsCodeAppend(modulate.c_str());
+    GrGLSLMulVarBy4f(&modulate, args.fOutputColor, args.fInputColor);
+    fragBuilder->codeAppend(modulate.c_str());
 }
 
-void GrGLMagnifierEffect::setData(const GrGLUniformManager& uman,
-                                  const GrDrawEffect& drawEffect) {
-    const GrMagnifierEffect& zoom = drawEffect.castEffect<GrMagnifierEffect>();
-    uman.set2f(fOffsetVar, zoom.x_offset(), zoom.y_offset());
-    uman.set2f(fInvZoomVar, zoom.x_inv_zoom(), zoom.y_inv_zoom());
-    uman.set2f(fInvInsetVar, zoom.x_inv_inset(), zoom.y_inv_inset());
+void GrGLMagnifierEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                                    const GrProcessor& effect) {
+    const GrMagnifierEffect& zoom = effect.cast<GrMagnifierEffect>();
+    pdman.set2f(fOffsetVar, zoom.x_offset(), zoom.y_offset());
+    pdman.set2f(fInvZoomVar, zoom.x_inv_zoom(), zoom.y_inv_zoom());
+    pdman.set2f(fInvInsetVar, zoom.x_inv_inset(), zoom.y_inv_inset());
+    pdman.set4f(fBoundsVar, zoom.bounds().x(), zoom.bounds().y(),
+                            zoom.bounds().width(), zoom.bounds().height());
 }
 
 /////////////////////////////////////////////////////////////////////
 
-GR_DEFINE_EFFECT_TEST(GrMagnifierEffect);
+void GrMagnifierEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                              GrProcessorKeyBuilder* b) const {
+    GrGLMagnifierEffect::GenKey(*this, caps, b);
+}
 
-GrEffect* GrMagnifierEffect::TestCreate(SkRandom* random,
-                                        GrContext* context,
-                                        const GrDrawTargetCaps&,
-                                        GrTexture** textures) {
-    GrTexture* texture = textures[0];
+GrGLSLFragmentProcessor* GrMagnifierEffect::onCreateGLSLInstance() const {
+    return new GrGLMagnifierEffect(*this);
+}
+
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrMagnifierEffect);
+
+const GrFragmentProcessor* GrMagnifierEffect::TestCreate(GrProcessorTestData* d) {
+    GrTexture* texture = d->fTextures[0];
     const int kMaxWidth = 200;
     const int kMaxHeight = 200;
     const int kMaxInset = 20;
-    uint32_t width = random->nextULessThan(kMaxWidth);
-    uint32_t height = random->nextULessThan(kMaxHeight);
-    uint32_t x = random->nextULessThan(kMaxWidth - width);
-    uint32_t y = random->nextULessThan(kMaxHeight - height);
-    uint32_t inset = random->nextULessThan(kMaxInset);
+    uint32_t width = d->fRandom->nextULessThan(kMaxWidth);
+    uint32_t height = d->fRandom->nextULessThan(kMaxHeight);
+    uint32_t x = d->fRandom->nextULessThan(kMaxWidth - width);
+    uint32_t y = d->fRandom->nextULessThan(kMaxHeight - height);
+    uint32_t inset = d->fRandom->nextULessThan(kMaxInset);
 
-    GrEffect* effect = GrMagnifierEffect::Create(
+    GrFragmentProcessor* effect = GrMagnifierEffect::Create(
         texture,
+        SkRect::MakeWH(SkIntToScalar(kMaxWidth), SkIntToScalar(kMaxHeight)),
         (float) width / texture->width(),
         (float) height / texture->height(),
         texture->width() / (float) x,
         texture->height() / (float) y,
         (float) inset / texture->width(),
         (float) inset / texture->height());
-    SkASSERT(NULL != effect);
+    SkASSERT(effect);
     return effect;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-const GrBackendEffectFactory& GrMagnifierEffect::getFactory() const {
-    return GrTBackendEffectFactory<GrMagnifierEffect>::getInstance();
-}
-
-bool GrMagnifierEffect::onIsEqual(const GrEffect& sBase) const {
-    const GrMagnifierEffect& s = CastEffect<GrMagnifierEffect>(sBase);
-    return (this->texture(0) == s.texture(0) &&
+bool GrMagnifierEffect::onIsEqual(const GrFragmentProcessor& sBase) const {
+    const GrMagnifierEffect& s = sBase.cast<GrMagnifierEffect>();
+    return (this->fBounds == s.fBounds &&
             this->fXOffset == s.fXOffset &&
             this->fYOffset == s.fYOffset &&
             this->fXInvZoom == s.fXInvZoom &&
@@ -225,27 +228,28 @@ bool GrMagnifierEffect::onIsEqual(const GrEffect& sBase) const {
             this->fYInvInset == s.fYInvInset);
 }
 
-void GrMagnifierEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
-    this->updateConstantColorComponentsForModulation(color, validFlags);
+void GrMagnifierEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const {
+    this->updateInvariantOutputForModulation(inout);
 }
 
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
-SkMagnifierImageFilter::SkMagnifierImageFilter(SkReadBuffer& buffer)
-  : INHERITED(1, buffer) {
-    float x = buffer.readScalar();
-    float y = buffer.readScalar();
-    float width = buffer.readScalar();
-    float height = buffer.readScalar();
-    fSrcRect = SkRect::MakeXYWH(x, y, width, height);
-    fInset = buffer.readScalar();
 
-    buffer.validate(SkScalarIsFinite(fInset) && SkIsValidRect(fSrcRect) &&
-                    // Negative numbers in src rect are not supported
-                    (fSrcRect.fLeft >= 0) && (fSrcRect.fTop >= 0));
+SkImageFilter* SkMagnifierImageFilter::Create(const SkRect& srcRect, SkScalar inset,
+                                              SkImageFilter* input) {
+
+    if (!SkScalarIsFinite(inset) || !SkIsValidRect(srcRect)) {
+        return nullptr;
+    }
+    // Negative numbers in src rect are not supported
+    if (srcRect.fLeft < 0 || srcRect.fTop < 0) {
+        return nullptr;
+    }
+    return new SkMagnifierImageFilter(srcRect, inset, input);
 }
 
+
 SkMagnifierImageFilter::SkMagnifierImageFilter(const SkRect& srcRect, SkScalar inset,
                                                SkImageFilter* input)
     : INHERITED(1, &input), fSrcRect(srcRect), fInset(inset) {
@@ -253,40 +257,50 @@ SkMagnifierImageFilter::SkMagnifierImageFilter(const SkRect& srcRect, SkScalar i
 }
 
 #if SK_SUPPORT_GPU
-bool SkMagnifierImageFilter::asNewEffect(GrEffect** effect, GrTexture* texture, const SkMatrix&,
-                                         const SkIRect&) const {
-    if (effect) {
-        SkScalar yOffset = (texture->origin() == kTopLeft_GrSurfaceOrigin) ? fSrcRect.y() :
-                           (texture->height() - (fSrcRect.y() + fSrcRect.height()));
+bool SkMagnifierImageFilter::asFragmentProcessor(GrFragmentProcessor** fp,
+                                                 GrTexture* texture, const SkMatrix&,
+                                                 const SkIRect&bounds) const {
+    if (fp) {
+        SkScalar yOffset = texture->origin() == kTopLeft_GrSurfaceOrigin ? fSrcRect.y() :
+           texture->height() - fSrcRect.height() * texture->height() / bounds.height()
+                             - fSrcRect.y();
+        int boundsY = (texture->origin() == kTopLeft_GrSurfaceOrigin) ? bounds.y() :
+                      (texture->height() - bounds.height());
+        SkRect effectBounds = SkRect::MakeXYWH(
+            SkIntToScalar(bounds.x()) / texture->width(),
+            SkIntToScalar(boundsY) / texture->height(),
+            SkIntToScalar(texture->width()) / bounds.width(),
+            SkIntToScalar(texture->height()) / bounds.height());
         SkScalar invInset = fInset > 0 ? SkScalarInvert(fInset) : SK_Scalar1;
-        *effect = GrMagnifierEffect::Create(texture,
-                                            fSrcRect.x() / texture->width(),
-                                            yOffset / texture->height(),
-                                            fSrcRect.width() / texture->width(),
-                                            fSrcRect.height() / texture->height(),
-                                            texture->width() * invInset,
-                                            texture->height() * invInset);
+        *fp = GrMagnifierEffect::Create(texture,
+                                        effectBounds,
+                                        fSrcRect.x() / texture->width(),
+                                        yOffset / texture->height(),
+                                        fSrcRect.width() / bounds.width(),
+                                        fSrcRect.height() / bounds.height(),
+                                        bounds.width() * invInset,
+                                        bounds.height() * invInset);
     }
     return true;
 }
 #endif
 
+SkFlattenable* SkMagnifierImageFilter::CreateProc(SkReadBuffer& buffer) {
+    SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
+    SkRect src;
+    buffer.readRect(&src);
+    return Create(src, buffer.readScalar(), common.getInput(0));
+}
+
 void SkMagnifierImageFilter::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
-    buffer.writeScalar(fSrcRect.x());
-    buffer.writeScalar(fSrcRect.y());
-    buffer.writeScalar(fSrcRect.width());
-    buffer.writeScalar(fSrcRect.height());
+    buffer.writeRect(fSrcRect);
     buffer.writeScalar(fInset);
 }
 
-bool SkMagnifierImageFilter::onFilterImage(Proxy*, const SkBitmap& src,
+bool SkMagnifierImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& src,
                                            const Context&, SkBitmap* dst,
                                            SkIPoint* offset) const {
-    SkASSERT(src.colorType() == kN32_SkColorType);
-    SkASSERT(fSrcRect.width() < src.width());
-    SkASSERT(fSrcRect.height() < src.height());
-
     if ((src.colorType() != kN32_SkColorType) ||
         (fSrcRect.width() >= src.width()) ||
         (fSrcRect.height() >= src.height())) {
@@ -299,9 +313,12 @@ bool SkMagnifierImageFilter::onFilterImage(Proxy*, const SkBitmap& src,
       return false;
     }
 
-    if (!dst->allocPixels(src.info())) {
+    SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(src.width(), src.height()));
+    if (!device) {
         return false;
     }
+    *dst = device->accessBitmap(false);
+    SkAutoLockPixels alp_dst(*dst);
 
     SkScalar inv_inset = fInset > 0 ? SkScalarInvert(fInset) : SK_Scalar1;
 
@@ -340,8 +357,8 @@ bool SkMagnifierImageFilter::onFilterImage(Proxy*, const SkBitmap& src,
             SkScalar y_interp = SkScalarMul(weight, (fSrcRect.y() + y * inv_y_zoom)) +
                            (SK_Scalar1 - weight) * y;
 
-            int x_val = SkPin32(SkScalarFloorToInt(x_interp), 0, width - 1);
-            int y_val = SkPin32(SkScalarFloorToInt(y_interp), 0, height - 1);
+            int x_val = SkTPin(SkScalarFloorToInt(x_interp), 0, width - 1);
+            int y_val = SkTPin(SkScalarFloorToInt(y_interp), 0, height - 1);
 
             *dptr = sptr[y_val * width + x_val];
             dptr++;
@@ -349,3 +366,13 @@ bool SkMagnifierImageFilter::onFilterImage(Proxy*, const SkBitmap& src,
     }
     return true;
 }
+
+#ifndef SK_IGNORE_TO_STRING
+void SkMagnifierImageFilter::toString(SkString* str) const {
+    str->appendf("SkMagnifierImageFilter: (");
+    str->appendf("src: (%f,%f,%f,%f) ",
+                 fSrcRect.fLeft, fSrcRect.fTop, fSrcRect.fRight, fSrcRect.fBottom);
+    str->appendf("inset: %f", fInset);
+    str->append(")");
+}
+#endif
diff --git a/gfx/skia/skia/src/effects/SkMatrixConvolutionImageFilter.cpp b/gfx/skia/skia/src/effects/SkMatrixConvolutionImageFilter.cpp
index f1017203bf8d..e58eec10f4e2 100644
--- a/gfx/skia/skia/src/effects/SkMatrixConvolutionImageFilter.cpp
+++ b/gfx/skia/skia/src/effects/SkMatrixConvolutionImageFilter.cpp
@@ -8,6 +8,7 @@
 #include "SkMatrixConvolutionImageFilter.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
+#include "SkDevice.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkRect.h"
@@ -17,17 +18,9 @@
 #include "effects/GrMatrixConvolutionEffect.h"
 #endif
 
-static bool tile_mode_is_valid(SkMatrixConvolutionImageFilter::TileMode tileMode) {
-    switch (tileMode) {
-    case SkMatrixConvolutionImageFilter::kClamp_TileMode:
-    case SkMatrixConvolutionImageFilter::kRepeat_TileMode:
-    case SkMatrixConvolutionImageFilter::kClampToBlack_TileMode:
-        return true;
-    default:
-        break;
-    }
-    return false;
-}
+// We need to be able to read at most SK_MaxS32 bytes, so divide that
+// by the size of a scalar to know how many scalars we can read.
+static const int32_t gMaxKernelSize = SK_MaxS32 / sizeof(SkScalar);
 
 SkMatrixConvolutionImageFilter::SkMatrixConvolutionImageFilter(
     const SkISize& kernelSize,
@@ -46,45 +39,65 @@ SkMatrixConvolutionImageFilter::SkMatrixConvolutionImageFilter(
     fKernelOffset(kernelOffset),
     fTileMode(tileMode),
     fConvolveAlpha(convolveAlpha) {
-    uint32_t size = fKernelSize.fWidth * fKernelSize.fHeight;
-    fKernel = SkNEW_ARRAY(SkScalar, size);
+    size_t size = (size_t) sk_64_mul(fKernelSize.width(), fKernelSize.height());
+    fKernel = new SkScalar[size];
     memcpy(fKernel, kernel, size * sizeof(SkScalar));
     SkASSERT(kernelSize.fWidth >= 1 && kernelSize.fHeight >= 1);
     SkASSERT(kernelOffset.fX >= 0 && kernelOffset.fX < kernelSize.fWidth);
     SkASSERT(kernelOffset.fY >= 0 && kernelOffset.fY < kernelSize.fHeight);
 }
 
-SkMatrixConvolutionImageFilter::SkMatrixConvolutionImageFilter(SkReadBuffer& buffer)
-    : INHERITED(1, buffer) {
-    // We need to be able to read at most SK_MaxS32 bytes, so divide that
-    // by the size of a scalar to know how many scalars we can read.
-    static const int32_t kMaxSize = SK_MaxS32 / sizeof(SkScalar);
-    fKernelSize.fWidth = buffer.readInt();
-    fKernelSize.fHeight = buffer.readInt();
-    if ((fKernelSize.fWidth >= 1) && (fKernelSize.fHeight >= 1) &&
-        // Make sure size won't be larger than a signed int,
-        // which would still be extremely large for a kernel,
-        // but we don't impose a hard limit for kernel size
-        (kMaxSize / fKernelSize.fWidth >= fKernelSize.fHeight)) {
-        size_t size = fKernelSize.fWidth * fKernelSize.fHeight;
-        fKernel = SkNEW_ARRAY(SkScalar, size);
-        SkDEBUGCODE(bool success =) buffer.readScalarArray(fKernel, size);
-        SkASSERT(success);
-    } else {
-        fKernel = 0;
+SkMatrixConvolutionImageFilter* SkMatrixConvolutionImageFilter::Create(
+    const SkISize& kernelSize,
+    const SkScalar* kernel,
+    SkScalar gain,
+    SkScalar bias,
+    const SkIPoint& kernelOffset,
+    TileMode tileMode,
+    bool convolveAlpha,
+    SkImageFilter* input,
+    const CropRect* cropRect) {
+    if (kernelSize.width() < 1 || kernelSize.height() < 1) {
+        return nullptr;
     }
-    fGain = buffer.readScalar();
-    fBias = buffer.readScalar();
-    fKernelOffset.fX = buffer.readInt();
-    fKernelOffset.fY = buffer.readInt();
-    fTileMode = (TileMode) buffer.readInt();
-    fConvolveAlpha = buffer.readBool();
-    buffer.validate((fKernel != 0) &&
-                    SkScalarIsFinite(fGain) &&
-                    SkScalarIsFinite(fBias) &&
-                    tile_mode_is_valid(fTileMode) &&
-                    (fKernelOffset.fX >= 0) && (fKernelOffset.fX < fKernelSize.fWidth) &&
-                    (fKernelOffset.fY >= 0) && (fKernelOffset.fY < fKernelSize.fHeight));
+    if (gMaxKernelSize / kernelSize.fWidth < kernelSize.fHeight) {
+        return nullptr;
+    }
+    if (!kernel) {
+        return nullptr;
+    }
+    if ((kernelOffset.fX < 0) || (kernelOffset.fX >= kernelSize.fWidth) ||
+        (kernelOffset.fY < 0) || (kernelOffset.fY >= kernelSize.fHeight)) {
+        return nullptr;
+    }
+    return new SkMatrixConvolutionImageFilter(kernelSize, kernel, gain, bias, kernelOffset,
+                                              tileMode, convolveAlpha, input, cropRect);
+}
+
+SkFlattenable* SkMatrixConvolutionImageFilter::CreateProc(SkReadBuffer& buffer) {
+    SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
+    SkISize kernelSize;
+    kernelSize.fWidth = buffer.readInt();
+    kernelSize.fHeight = buffer.readInt();
+    const int count = buffer.getArrayCount();
+
+    const int64_t kernelArea = sk_64_mul(kernelSize.width(), kernelSize.height());
+    if (!buffer.validate(kernelArea == count)) {
+        return nullptr;
+    }
+    SkAutoSTArray<16, SkScalar> kernel(count);
+    if (!buffer.readScalarArray(kernel.get(), count)) {
+        return nullptr;
+    }
+    SkScalar gain = buffer.readScalar();
+    SkScalar bias = buffer.readScalar();
+    SkIPoint kernelOffset;
+    kernelOffset.fX = buffer.readInt();
+    kernelOffset.fY = buffer.readInt();
+    TileMode tileMode = (TileMode)buffer.readInt();
+    bool convolveAlpha = buffer.readBool();
+    return Create(kernelSize, kernel.get(), gain, bias, kernelOffset, tileMode, convolveAlpha,
+                  common.getInput(0), &common.cropRect());
 }
 
 void SkMatrixConvolutionImageFilter::flatten(SkWriteBuffer& buffer) const {
@@ -114,8 +127,8 @@ public:
 class ClampPixelFetcher {
 public:
     static inline SkPMColor fetch(const SkBitmap& src, int x, int y, const SkIRect& bounds) {
-        x = SkPin32(x, bounds.fLeft, bounds.fRight - 1);
-        y = SkPin32(y, bounds.fTop, bounds.fBottom - 1);
+        x = SkTPin(x, bounds.fLeft, bounds.fRight - 1);
+        y = SkTPin(y, bounds.fTop, bounds.fBottom - 1);
         return *src.getAddr32(x, y);
     }
 };
@@ -229,16 +242,18 @@ void SkMatrixConvolutionImageFilter::filterBorderPixels(const SkBitmap& src,
 // FIXME:  This should be refactored to SkImageFilterUtils for
 // use by other filters.  For now, we assume the input is always
 // premultiplied and unpremultiply it
-static SkBitmap unpremultiplyBitmap(const SkBitmap& src)
+static SkBitmap unpremultiplyBitmap(SkImageFilter::Proxy* proxy, const SkBitmap& src)
 {
     SkAutoLockPixels alp(src);
     if (!src.getPixels()) {
         return SkBitmap();
     }
-    SkBitmap result;
-    if (!result.allocPixels(src.info())) {
+    SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(src.width(), src.height()));
+    if (!device) {
         return SkBitmap();
     }
+    SkBitmap result = device->accessBitmap(false);
+    SkAutoLockPixels alp_result(result);
     for (int y = 0; y < src.height(); ++y) {
         const uint32_t* srcRow = src.getAddr32(0, y);
         uint32_t* dstRow = result.getAddr32(0, y);
@@ -256,7 +271,7 @@ bool SkMatrixConvolutionImageFilter::onFilterImage(Proxy* proxy,
                                                    SkIPoint* offset) const {
     SkBitmap src = source;
     SkIPoint srcOffset = SkIPoint::Make(0, 0);
-    if (getInput(0) && !getInput(0)->filterImage(proxy, source, ctx, &src, &srcOffset)) {
+    if (!this->filterInput(0, proxy, source, ctx, &src, &srcOffset)) {
         return false;
     }
 
@@ -270,7 +285,7 @@ bool SkMatrixConvolutionImageFilter::onFilterImage(Proxy* proxy,
     }
 
     if (!fConvolveAlpha && !src.isOpaque()) {
-        src = unpremultiplyBitmap(src);
+        src = unpremultiplyBitmap(proxy, src);
     }
 
     SkAutoLockPixels alp(src);
@@ -278,9 +293,12 @@ bool SkMatrixConvolutionImageFilter::onFilterImage(Proxy* proxy,
         return false;
     }
 
-    if (!result->allocPixels(src.info().makeWH(bounds.width(), bounds.height()))) {
+    SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(), bounds.height()));
+    if (!device) {
         return false;
     }
+    *result = device->accessBitmap(false);
+    SkAutoLockPixels alp_result(*result);
 
     offset->fX = bounds.fLeft;
     offset->fY = bounds.fTop;
@@ -319,37 +337,55 @@ bool SkMatrixConvolutionImageFilter::onFilterBounds(const SkIRect& src, const Sk
 
 #if SK_SUPPORT_GPU
 
-static GrMatrixConvolutionEffect::TileMode convert_tilemodes(
+static GrTextureDomain::Mode convert_tilemodes(
         SkMatrixConvolutionImageFilter::TileMode tileMode) {
-    GR_STATIC_ASSERT(static_cast<int>(SkMatrixConvolutionImageFilter::kClamp_TileMode) ==
-                     static_cast<int>(GrMatrixConvolutionEffect::kClamp_TileMode));
-    GR_STATIC_ASSERT(static_cast<int>(SkMatrixConvolutionImageFilter::kRepeat_TileMode) ==
-                     static_cast<int>(GrMatrixConvolutionEffect::kRepeat_TileMode));
-    GR_STATIC_ASSERT(static_cast<int>(SkMatrixConvolutionImageFilter::kClampToBlack_TileMode) ==
-                     static_cast<int>(GrMatrixConvolutionEffect::kClampToBlack_TileMode));
-    GR_STATIC_ASSERT(static_cast<int>(SkMatrixConvolutionImageFilter::kMax_TileMode) ==
-                     static_cast<int>(GrMatrixConvolutionEffect::kMax_TileMode));
-    return static_cast<GrMatrixConvolutionEffect::TileMode>(tileMode);
+    switch (tileMode) {
+        case SkMatrixConvolutionImageFilter::kClamp_TileMode:
+            return GrTextureDomain::kClamp_Mode;
+        case SkMatrixConvolutionImageFilter::kRepeat_TileMode:
+            return GrTextureDomain::kRepeat_Mode;
+        case SkMatrixConvolutionImageFilter::kClampToBlack_TileMode:
+            return GrTextureDomain::kDecal_Mode;
+        default:
+            SkASSERT(false);
+    }
+    return GrTextureDomain::kIgnore_Mode;
 }
 
-bool SkMatrixConvolutionImageFilter::asNewEffect(GrEffect** effect,
-                                                 GrTexture* texture,
-                                                 const SkMatrix&,
-                                                 const SkIRect& bounds
-                                                 ) const {
-    if (!effect) {
+bool SkMatrixConvolutionImageFilter::asFragmentProcessor(GrFragmentProcessor** fp,
+                                                         GrTexture* texture,
+                                                         const SkMatrix&,
+                                                         const SkIRect& bounds) const {
+    if (!fp) {
         return fKernelSize.width() * fKernelSize.height() <= MAX_KERNEL_SIZE;
     }
     SkASSERT(fKernelSize.width() * fKernelSize.height() <= MAX_KERNEL_SIZE);
-    *effect = GrMatrixConvolutionEffect::Create(texture,
-                                                bounds,
-                                                fKernelSize,
-                                                fKernel,
-                                                fGain,
-                                                fBias,
-                                                fKernelOffset,
-                                                convert_tilemodes(fTileMode),
-                                                fConvolveAlpha);
+    *fp = GrMatrixConvolutionEffect::Create(texture,
+                                            bounds,
+                                            fKernelSize,
+                                            fKernel,
+                                            fGain,
+                                            fBias,
+                                            fKernelOffset,
+                                            convert_tilemodes(fTileMode),
+                                            fConvolveAlpha);
     return true;
 }
 #endif
+
+#ifndef SK_IGNORE_TO_STRING
+void SkMatrixConvolutionImageFilter::toString(SkString* str) const {
+    str->appendf("SkMatrixConvolutionImageFilter: (");
+    str->appendf("size: (%d,%d) kernel: (", fKernelSize.width(), fKernelSize.height());
+    for (int y = 0; y < fKernelSize.height(); y++) {
+        for (int x = 0; x < fKernelSize.width(); x++) {
+            str->appendf("%f ", fKernel[y * fKernelSize.width() + x]);
+        }
+    }
+    str->appendf(")");
+    str->appendf("gain: %f bias: %f ", fGain, fBias);
+    str->appendf("offset: (%d, %d) ", fKernelOffset.fX, fKernelOffset.fY);
+    str->appendf("convolveAlpha: %s", fConvolveAlpha ? "true" : "false");
+    str->append(")");
+}
+#endif
diff --git a/gfx/skia/skia/src/effects/SkMergeImageFilter.cpp b/gfx/skia/skia/src/effects/SkMergeImageFilter.cpp
index 4022da3096d4..2ae8b35cd023 100755
--- a/gfx/skia/skia/src/effects/SkMergeImageFilter.cpp
+++ b/gfx/skia/skia/src/effects/SkMergeImageFilter.cpp
@@ -15,7 +15,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkMergeImageFilter::initAllocModes() {
-    int inputCount = countInputs();
+    int inputCount = this->countInputs();
     if (inputCount) {
         size_t size = sizeof(uint8_t) * inputCount;
         if (size <= sizeof(fStorage)) {
@@ -24,25 +24,26 @@ void SkMergeImageFilter::initAllocModes() {
             fModes = SkTCast<uint8_t*>(sk_malloc_throw(size));
         }
     } else {
-        fModes = NULL;
+        fModes = nullptr;
     }
 }
 
 void SkMergeImageFilter::initModes(const SkXfermode::Mode modes[]) {
     if (modes) {
         this->initAllocModes();
-        int inputCount = countInputs();
+        int inputCount = this->countInputs();
         for (int i = 0; i < inputCount; ++i) {
             fModes[i] = SkToU8(modes[i]);
         }
     } else {
-        fModes = NULL;
+        fModes = nullptr;
     }
 }
 
 SkMergeImageFilter::SkMergeImageFilter(SkImageFilter* filters[], int count,
                                        const SkXfermode::Mode modes[],
-                                       const CropRect* cropRect) : INHERITED(count, filters, cropRect) {
+                                       const CropRect* cropRect)
+  : INHERITED(count, filters, cropRect) {
     SkASSERT(count >= 0);
     this->initModes(modes);
 }
@@ -57,46 +58,62 @@ SkMergeImageFilter::~SkMergeImageFilter() {
 bool SkMergeImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& src,
                                        const Context& ctx,
                                        SkBitmap* result, SkIPoint* offset) const {
-    if (countInputs() < 1) {
+    int inputCount = this->countInputs();
+    if (inputCount < 1) {
         return false;
     }
 
     SkIRect bounds;
-    if (!this->applyCropRect(ctx, src, SkIPoint::Make(0, 0), &bounds)) {
+
+    SkAutoTDeleteArray<SkBitmap> inputs(new SkBitmap[inputCount]);
+    SkAutoTDeleteArray<SkIPoint> offsets(new SkIPoint[inputCount]);
+    bool didProduceResult = false;
+
+    // Filter all of the inputs.
+    for (int i = 0; i < inputCount; ++i) {
+        inputs[i] = src;
+        offsets[i].setZero();
+        if (!this->filterInput(i, proxy, src, ctx, &inputs[i], &offsets[i])) {
+            inputs[i].reset();
+            continue;
+        }
+        SkIRect srcBounds;
+        inputs[i].getBounds(&srcBounds);
+        srcBounds.offset(offsets[i]);
+        if (!didProduceResult) {
+            bounds = srcBounds;
+            didProduceResult = true;
+        } else {
+            bounds.join(srcBounds);
+        }
+    }
+    if (!didProduceResult) {
+        return false;
+    }
+
+    // Apply the crop rect to the union of the inputs' bounds.
+    if (!this->getCropRect().applyTo(bounds, ctx, &bounds)) {
         return false;
     }
 
     const int x0 = bounds.left();
     const int y0 = bounds.top();
 
+    // Allocate the destination buffer.
     SkAutoTUnref<SkBaseDevice> dst(proxy->createDevice(bounds.width(), bounds.height()));
-    if (NULL == dst) {
+    if (nullptr == dst) {
         return false;
     }
     SkCanvas canvas(dst);
-    SkPaint paint;
 
-    int inputCount = countInputs();
+    // Composite all of the filter inputs.
     for (int i = 0; i < inputCount; ++i) {
-        SkBitmap tmp;
-        const SkBitmap* srcPtr;
-        SkIPoint pos = SkIPoint::Make(0, 0);
-        SkImageFilter* filter = getInput(i);
-        if (filter) {
-            if (!filter->filterImage(proxy, src, ctx, &tmp, &pos)) {
-                return false;
-            }
-            srcPtr = &tmp;
-        } else {
-            srcPtr = &src;
-        }
-
+        SkPaint paint;
         if (fModes) {
             paint.setXfermodeMode((SkXfermode::Mode)fModes[i]);
-        } else {
-            paint.setXfermode(NULL);
         }
-        canvas.drawSprite(*srcPtr, pos.x() - x0, pos.y() - y0, &paint);
+        canvas.drawBitmap(inputs[i], SkIntToScalar(offsets[i].x() - x0),
+                                     SkIntToScalar(offsets[i].y() - y0), &paint);
     }
 
     offset->fX = bounds.left();
@@ -105,30 +122,51 @@ bool SkMergeImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& src,
     return true;
 }
 
-void SkMergeImageFilter::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
-
-    buffer.writeBool(fModes != NULL);
-    if (fModes) {
-        buffer.writeByteArray(fModes, countInputs() * sizeof(fModes[0]));
+SkFlattenable* SkMergeImageFilter::CreateProc(SkReadBuffer& buffer) {
+    Common common;
+    if (!common.unflatten(buffer, -1)) {
+        return nullptr;
     }
-}
 
-SkMergeImageFilter::SkMergeImageFilter(SkReadBuffer& buffer)
-  : INHERITED(-1, buffer) {
+    const int count = common.inputCount();
     bool hasModes = buffer.readBool();
     if (hasModes) {
-        this->initAllocModes();
-        int nbInputs = countInputs();
-        size_t size = nbInputs * sizeof(fModes[0]);
-        SkASSERT(buffer.getArrayCount() == size);
-        if (buffer.validate(buffer.getArrayCount() == size) &&
-            buffer.readByteArray(fModes, size)) {
-            for (int i = 0; i < nbInputs; ++i) {
-                buffer.validate(SkIsValidMode((SkXfermode::Mode)fModes[i]));
-            }
+        SkAutoSTArray<4, SkXfermode::Mode> modes(count);
+        SkAutoSTArray<4, uint8_t> modes8(count);
+        if (!buffer.readByteArray(modes8.get(), count)) {
+            return nullptr;
         }
-    } else {
-        fModes = 0;
+        for (int i = 0; i < count; ++i) {
+            modes[i] = (SkXfermode::Mode)modes8[i];
+            buffer.validate(SkIsValidMode(modes[i]));
+        }
+        if (!buffer.isValid()) {
+            return nullptr;
+        }
+        return Create(common.inputs(), count, modes.get(), &common.cropRect());
+    }
+    return Create(common.inputs(), count, nullptr, &common.cropRect());
+}
+
+void SkMergeImageFilter::flatten(SkWriteBuffer& buffer) const {
+    this->INHERITED::flatten(buffer);
+    buffer.writeBool(fModes != nullptr);
+    if (fModes) {
+        buffer.writeByteArray(fModes, this->countInputs() * sizeof(fModes[0]));
     }
 }
+
+#ifndef SK_IGNORE_TO_STRING
+void SkMergeImageFilter::toString(SkString* str) const {
+    str->appendf("SkMergeImageFilter: (");
+    
+    for (int i = 0; i < this->countInputs(); ++i) {
+        SkImageFilter* filter = this->getInput(i);
+        str->appendf("%d: (", i);
+        filter->toString(str);
+        str->appendf(")");
+    }
+
+    str->append(")");
+}
+#endif
diff --git a/gfx/skia/skia/src/effects/SkMorphologyImageFilter.cpp b/gfx/skia/skia/src/effects/SkMorphologyImageFilter.cpp
index 7be4435b687a..484ed57f37bc 100644
--- a/gfx/skia/skia/src/effects/SkMorphologyImageFilter.cpp
+++ b/gfx/skia/skia/src/effects/SkMorphologyImageFilter.cpp
@@ -8,27 +8,23 @@
 #include "SkMorphologyImageFilter.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
+#include "SkDevice.h"
+#include "SkOpts.h"
 #include "SkReadBuffer.h"
-#include "SkWriteBuffer.h"
 #include "SkRect.h"
-#include "SkMorphology_opts.h"
+#include "SkWriteBuffer.h"
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
+#include "GrDrawContext.h"
+#include "GrInvariantOutput.h"
 #include "GrTexture.h"
-#include "GrTBackendEffectFactory.h"
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
 #include "effects/Gr1DKernelEffect.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
 #endif
 
-SkMorphologyImageFilter::SkMorphologyImageFilter(SkReadBuffer& buffer)
-  : INHERITED(1, buffer) {
-    fRadius.fWidth = buffer.readInt();
-    fRadius.fHeight = buffer.readInt();
-    buffer.validate((fRadius.fWidth >= 0) &&
-                    (fRadius.fHeight >= 0));
-}
-
 SkMorphologyImageFilter::SkMorphologyImageFilter(int radiusX,
                                                  int radiusY,
                                                  SkImageFilter* input,
@@ -36,93 +32,12 @@ SkMorphologyImageFilter::SkMorphologyImageFilter(int radiusX,
     : INHERITED(1, &input, cropRect), fRadius(SkISize::Make(radiusX, radiusY)) {
 }
 
-
 void SkMorphologyImageFilter::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
     buffer.writeInt(fRadius.fWidth);
     buffer.writeInt(fRadius.fHeight);
 }
 
-enum MorphDirection {
-    kX, kY
-};
-
-template<MorphDirection direction>
-static void erode(const SkPMColor* src, SkPMColor* dst,
-                  int radius, int width, int height,
-                  int srcStride, int dstStride)
-{
-    const int srcStrideX = direction == kX ? 1 : srcStride;
-    const int dstStrideX = direction == kX ? 1 : dstStride;
-    const int srcStrideY = direction == kX ? srcStride : 1;
-    const int dstStrideY = direction == kX ? dstStride : 1;
-    radius = SkMin32(radius, width - 1);
-    const SkPMColor* upperSrc = src + radius * srcStrideX;
-    for (int x = 0; x < width; ++x) {
-        const SkPMColor* lp = src;
-        const SkPMColor* up = upperSrc;
-        SkPMColor* dptr = dst;
-        for (int y = 0; y < height; ++y) {
-            int minB = 255, minG = 255, minR = 255, minA = 255;
-            for (const SkPMColor* p = lp; p <= up; p += srcStrideX) {
-                int b = SkGetPackedB32(*p);
-                int g = SkGetPackedG32(*p);
-                int r = SkGetPackedR32(*p);
-                int a = SkGetPackedA32(*p);
-                if (b < minB) minB = b;
-                if (g < minG) minG = g;
-                if (r < minR) minR = r;
-                if (a < minA) minA = a;
-            }
-            *dptr = SkPackARGB32(minA, minR, minG, minB);
-            dptr += dstStrideY;
-            lp += srcStrideY;
-            up += srcStrideY;
-        }
-        if (x >= radius) src += srcStrideX;
-        if (x + radius < width - 1) upperSrc += srcStrideX;
-        dst += dstStrideX;
-    }
-}
-
-template<MorphDirection direction>
-static void dilate(const SkPMColor* src, SkPMColor* dst,
-                   int radius, int width, int height,
-                   int srcStride, int dstStride)
-{
-    const int srcStrideX = direction == kX ? 1 : srcStride;
-    const int dstStrideX = direction == kX ? 1 : dstStride;
-    const int srcStrideY = direction == kX ? srcStride : 1;
-    const int dstStrideY = direction == kX ? dstStride : 1;
-    radius = SkMin32(radius, width - 1);
-    const SkPMColor* upperSrc = src + radius * srcStrideX;
-    for (int x = 0; x < width; ++x) {
-        const SkPMColor* lp = src;
-        const SkPMColor* up = upperSrc;
-        SkPMColor* dptr = dst;
-        for (int y = 0; y < height; ++y) {
-            int maxB = 0, maxG = 0, maxR = 0, maxA = 0;
-            for (const SkPMColor* p = lp; p <= up; p += srcStrideX) {
-                int b = SkGetPackedB32(*p);
-                int g = SkGetPackedG32(*p);
-                int r = SkGetPackedR32(*p);
-                int a = SkGetPackedA32(*p);
-                if (b > maxB) maxB = b;
-                if (g > maxG) maxG = g;
-                if (r > maxR) maxR = r;
-                if (a > maxA) maxA = a;
-            }
-            *dptr = SkPackARGB32(maxA, maxR, maxG, maxB);
-            dptr += dstStrideY;
-            lp += srcStrideY;
-            up += srcStrideY;
-        }
-        if (x >= radius) src += srcStrideX;
-        if (x + radius < width - 1) upperSrc += srcStrideX;
-        dst += dstStrideX;
-    }
-}
-
 static void callProcX(SkMorphologyImageFilter::Proc procX, const SkBitmap& src, SkBitmap* dst, int radiusX, const SkIRect& bounds)
 {
     procX(src.getAddr32(bounds.left(), bounds.top()), dst->getAddr32(0, 0),
@@ -146,7 +61,7 @@ bool SkMorphologyImageFilter::filterImageGeneric(SkMorphologyImageFilter::Proc p
                                                  SkIPoint* offset) const {
     SkBitmap src = source;
     SkIPoint srcOffset = SkIPoint::Make(0, 0);
-    if (getInput(0) && !getInput(0)->filterImage(proxy, source, ctx, &src, &srcOffset)) {
+    if (!this->filterInput(0, proxy, source, ctx, &src, &srcOffset)) {
         return false;
     }
 
@@ -164,10 +79,6 @@ bool SkMorphologyImageFilter::filterImageGeneric(SkMorphologyImageFilter::Proc p
         return false;
     }
 
-    if (!dst->allocPixels(src.info().makeWH(bounds.width(), bounds.height()))) {
-        return false;
-    }
-
     SkVector radius = SkVector::Make(SkIntToScalar(this->radius().width()),
                                      SkIntToScalar(this->radius().height()));
     ctx.ctm().mapVectors(&radius, 1);
@@ -188,12 +99,20 @@ bool SkMorphologyImageFilter::filterImageGeneric(SkMorphologyImageFilter::Proc p
         return true;
     }
 
-    SkBitmap temp;
-    if (!temp.allocPixels(dst->info())) {
+    SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(), bounds.height()));
+    if (!device) {
         return false;
     }
+    *dst = device->accessBitmap(false);
+    SkAutoLockPixels alp_dst(*dst);
 
     if (width > 0 && height > 0) {
+        SkAutoTUnref<SkBaseDevice> tempDevice(proxy->createDevice(dst->width(), dst->height()));
+        if (!tempDevice) {
+            return false;
+        }
+        SkBitmap temp = tempDevice->accessBitmap(false);
+        SkAutoLockPixels alp_temp(temp);
         callProcX(procX, src, &temp, width, srcBounds);
         SkIRect tmpBounds = SkIRect::MakeWH(srcBounds.width(), srcBounds.height());
         callProcY(procY, temp, dst, height, tmpBounds);
@@ -210,34 +129,20 @@ bool SkMorphologyImageFilter::filterImageGeneric(SkMorphologyImageFilter::Proc p
 bool SkErodeImageFilter::onFilterImage(Proxy* proxy,
                                        const SkBitmap& source, const Context& ctx,
                                        SkBitmap* dst, SkIPoint* offset) const {
-    Proc erodeXProc = SkMorphologyGetPlatformProc(kErodeX_SkMorphologyProcType);
-    if (!erodeXProc) {
-        erodeXProc = erode<kX>;
-    }
-    Proc erodeYProc = SkMorphologyGetPlatformProc(kErodeY_SkMorphologyProcType);
-    if (!erodeYProc) {
-        erodeYProc = erode<kY>;
-    }
-    return this->filterImageGeneric(erodeXProc, erodeYProc, proxy, source, ctx, dst, offset);
+    return this->filterImageGeneric(SkOpts::erode_x, SkOpts::erode_y,
+                                    proxy, source, ctx, dst, offset);
 }
 
 bool SkDilateImageFilter::onFilterImage(Proxy* proxy,
                                         const SkBitmap& source, const Context& ctx,
                                         SkBitmap* dst, SkIPoint* offset) const {
-    Proc dilateXProc = SkMorphologyGetPlatformProc(kDilateX_SkMorphologyProcType);
-    if (!dilateXProc) {
-        dilateXProc = dilate<kX>;
-    }
-    Proc dilateYProc = SkMorphologyGetPlatformProc(kDilateY_SkMorphologyProcType);
-    if (!dilateYProc) {
-        dilateYProc = dilate<kY>;
-    }
-    return this->filterImageGeneric(dilateXProc, dilateYProc, proxy, source, ctx, dst, offset);
+    return this->filterImageGeneric(SkOpts::dilate_x, SkOpts::dilate_y,
+                                    proxy, source, ctx, dst, offset);
 }
 
 void SkMorphologyImageFilter::computeFastBounds(const SkRect& src, SkRect* dst) const {
-    if (getInput(0)) {
-        getInput(0)->computeFastBounds(src, dst);
+    if (this->getInput(0)) {
+        this->getInput(0)->computeFastBounds(src, dst);
     } else {
         *dst = src;
     }
@@ -247,23 +152,50 @@ void SkMorphologyImageFilter::computeFastBounds(const SkRect& src, SkRect* dst)
 bool SkMorphologyImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm,
                                              SkIRect* dst) const {
     SkIRect bounds = src;
-    if (getInput(0) && !getInput(0)->filterBounds(src, ctm, &bounds)) {
-        return false;
-    }
     SkVector radius = SkVector::Make(SkIntToScalar(this->radius().width()),
                                      SkIntToScalar(this->radius().height()));
     ctm.mapVectors(&radius, 1);
     bounds.outset(SkScalarCeilToInt(radius.x()), SkScalarCeilToInt(radius.y()));
+    if (this->getInput(0) && !this->getInput(0)->filterBounds(bounds, ctm, &bounds)) {
+        return false;
+    }
     *dst = bounds;
     return true;
 }
 
+SkFlattenable* SkErodeImageFilter::CreateProc(SkReadBuffer& buffer) {
+    SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
+    const int width = buffer.readInt();
+    const int height = buffer.readInt();
+    return Create(width, height, common.getInput(0), &common.cropRect());
+}
+
+SkFlattenable* SkDilateImageFilter::CreateProc(SkReadBuffer& buffer) {
+    SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
+    const int width = buffer.readInt();
+    const int height = buffer.readInt();
+    return Create(width, height, common.getInput(0), &common.cropRect());
+}
+
+#ifndef SK_IGNORE_TO_STRING
+void SkErodeImageFilter::toString(SkString* str) const {
+    str->appendf("SkErodeImageFilter: (");
+    str->appendf("radius: (%d,%d)", this->radius().fWidth, this->radius().fHeight);
+    str->append(")");
+}
+#endif
+
+#ifndef SK_IGNORE_TO_STRING
+void SkDilateImageFilter::toString(SkString* str) const {
+    str->appendf("SkDilateImageFilter: (");
+    str->appendf("radius: (%d,%d)", this->radius().fWidth, this->radius().fHeight);
+    str->append(")");
+}
+#endif
+
 #if SK_SUPPORT_GPU
 
 ///////////////////////////////////////////////////////////////////////////////
-
-class GrGLMorphologyEffect;
-
 /**
  * Morphology effects. Depending upon the type of morphology, either the
  * component-wise min (Erode_Type) or max (Dilate_Type) of all pixels in the
@@ -279,90 +211,102 @@ public:
         kDilate_MorphologyType,
     };
 
-    static GrEffect* Create(GrTexture* tex, Direction dir, int radius, MorphologyType type) {
-        return SkNEW_ARGS(GrMorphologyEffect, (tex, dir, radius, type));
+    static GrFragmentProcessor* Create(GrTexture* tex, Direction dir, int radius,
+                                       MorphologyType type) {
+        return new GrMorphologyEffect(tex, dir, radius, type);
+    }
+
+    static GrFragmentProcessor* Create(GrTexture* tex, Direction dir, int radius,
+                                       MorphologyType type, float bounds[2]) {
+        return new GrMorphologyEffect(tex, dir, radius, type, bounds);
     }
 
     virtual ~GrMorphologyEffect();
 
     MorphologyType type() const { return fType; }
+    bool useRange() const { return fUseRange; }
+    const float* range() const { return fRange; }
 
-    static const char* Name() { return "Morphology"; }
-
-    typedef GrGLMorphologyEffect GLEffect;
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
+    const char* name() const override { return "Morphology"; }
 
 protected:
 
     MorphologyType fType;
+    bool fUseRange;
+    float fRange[2];
 
 private:
-    virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE;
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
+
+    bool onIsEqual(const GrFragmentProcessor&) const override;
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
 
     GrMorphologyEffect(GrTexture*, Direction, int radius, MorphologyType);
+    GrMorphologyEffect(GrTexture*, Direction, int radius, MorphologyType,
+                       float bounds[2]);
 
-    GR_DECLARE_EFFECT_TEST;
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
 
     typedef Gr1DKernelEffect INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-class GrGLMorphologyEffect : public GrGLEffect {
+class GrGLMorphologyEffect : public GrGLSLFragmentProcessor {
 public:
-    GrGLMorphologyEffect (const GrBackendEffectFactory&, const GrDrawEffect&);
+    GrGLMorphologyEffect(const GrProcessor&);
 
-    virtual void emitCode(GrGLShaderBuilder*,
-                          const GrDrawEffect&,
-                          const GrEffectKey&,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    virtual void emitCode(EmitArgs&) override;
 
-    static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder* b);
+    static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder* b);
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
 
 private:
     int width() const { return GrMorphologyEffect::WidthFromRadius(fRadius); }
 
-    int                                 fRadius;
-    GrMorphologyEffect::MorphologyType  fType;
-    GrGLUniformManager::UniformHandle   fImageIncrementUni;
+    int                                   fRadius;
+    Gr1DKernelEffect::Direction           fDirection;
+    bool                                  fUseRange;
+    GrMorphologyEffect::MorphologyType    fType;
+    GrGLSLProgramDataManager::UniformHandle fPixelSizeUni;
+    GrGLSLProgramDataManager::UniformHandle fRangeUni;
 
-    typedef GrGLEffect INHERITED;
+    typedef GrGLSLFragmentProcessor INHERITED;
 };
 
-GrGLMorphologyEffect::GrGLMorphologyEffect(const GrBackendEffectFactory& factory,
-                                           const GrDrawEffect& drawEffect)
-    : INHERITED(factory) {
-    const GrMorphologyEffect& m = drawEffect.castEffect<GrMorphologyEffect>();
+GrGLMorphologyEffect::GrGLMorphologyEffect(const GrProcessor& proc) {
+    const GrMorphologyEffect& m = proc.cast<GrMorphologyEffect>();
     fRadius = m.radius();
+    fDirection = m.direction();
+    fUseRange = m.useRange();
     fType = m.type();
 }
 
-void GrGLMorphologyEffect::emitCode(GrGLShaderBuilder* builder,
-                                    const GrDrawEffect&,
-                                    const GrEffectKey& key,
-                                    const char* outputColor,
-                                    const char* inputColor,
-                                    const TransformedCoordsArray& coords,
-                                    const TextureSamplerArray& samplers) {
-    SkString coords2D = builder->ensureFSCoords2D(coords, 0);
-    fImageIncrementUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                             kVec2f_GrSLType, "ImageIncrement");
+void GrGLMorphologyEffect::emitCode(EmitArgs& args) {
+    fPixelSizeUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                            kFloat_GrSLType, kDefault_GrSLPrecision,
+                                            "PixelSize");
+    const char* pixelSizeInc = args.fBuilder->getUniformCStr(fPixelSizeUni);
+    fRangeUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                            kVec2f_GrSLType, kDefault_GrSLPrecision,
+                                            "Range");
+    const char* range = args.fBuilder->getUniformCStr(fRangeUni);
 
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    SkString coords2D = fragBuilder->ensureFSCoords2D(args.fCoords, 0);
     const char* func;
     switch (fType) {
         case GrMorphologyEffect::kErode_MorphologyType:
-            builder->fsCodeAppendf("\t\t%s = vec4(1, 1, 1, 1);\n", outputColor);
+            fragBuilder->codeAppendf("\t\t%s = vec4(1, 1, 1, 1);\n", args.fOutputColor);
             func = "min";
             break;
         case GrMorphologyEffect::kDilate_MorphologyType:
-            builder->fsCodeAppendf("\t\t%s = vec4(0, 0, 0, 0);\n", outputColor);
+            fragBuilder->codeAppendf("\t\t%s = vec4(0, 0, 0, 0);\n", args.fOutputColor);
             func = "max";
             break;
         default:
@@ -370,46 +314,87 @@ void GrGLMorphologyEffect::emitCode(GrGLShaderBuilder* builder,
             func = ""; // suppress warning
             break;
     }
-    const char* imgInc = builder->getUniformCStr(fImageIncrementUni);
 
-    builder->fsCodeAppendf("\t\tvec2 coord = %s - %d.0 * %s;\n", coords2D.c_str(), fRadius, imgInc);
-    builder->fsCodeAppendf("\t\tfor (int i = 0; i < %d; i++) {\n", this->width());
-    builder->fsCodeAppendf("\t\t\t%s = %s(%s, ", outputColor, func, outputColor);
-    builder->fsAppendTextureLookup(samplers[0], "coord");
-    builder->fsCodeAppend(");\n");
-    builder->fsCodeAppendf("\t\t\tcoord += %s;\n", imgInc);
-    builder->fsCodeAppend("\t\t}\n");
+    const char* dir;
+    switch (fDirection) {
+        case Gr1DKernelEffect::kX_Direction:
+            dir = "x";
+            break;
+        case Gr1DKernelEffect::kY_Direction:
+            dir = "y";
+            break;
+        default:
+            SkFAIL("Unknown filter direction.");
+            dir = ""; // suppress warning
+    }
+
+    // vec2 coord = coord2D;
+    fragBuilder->codeAppendf("\t\tvec2 coord = %s;\n", coords2D.c_str());
+    // coord.x -= radius * pixelSize;
+    fragBuilder->codeAppendf("\t\tcoord.%s -= %d.0 * %s; \n", dir, fRadius, pixelSizeInc);
+    if (fUseRange) {
+        // highBound = min(highBound, coord.x + (width-1) * pixelSize);
+        fragBuilder->codeAppendf("\t\tfloat highBound = min(%s.y, coord.%s + %f * %s);",
+                                 range, dir, float(width() - 1), pixelSizeInc);
+        // coord.x = max(lowBound, coord.x);
+        fragBuilder->codeAppendf("\t\tcoord.%s = max(%s.x, coord.%s);", dir, range, dir);
+    }
+    fragBuilder->codeAppendf("\t\tfor (int i = 0; i < %d; i++) {\n", width());
+    fragBuilder->codeAppendf("\t\t\t%s = %s(%s, ", args.fOutputColor, func, args.fOutputColor);
+    fragBuilder->appendTextureLookup(args.fSamplers[0], "coord");
+    fragBuilder->codeAppend(");\n");
+    // coord.x += pixelSize;
+    fragBuilder->codeAppendf("\t\t\tcoord.%s += %s;\n", dir, pixelSizeInc);
+    if (fUseRange) {
+        // coord.x = min(highBound, coord.x);
+        fragBuilder->codeAppendf("\t\t\tcoord.%s = min(highBound, coord.%s);", dir, dir);
+    }
+    fragBuilder->codeAppend("\t\t}\n");
     SkString modulate;
-    GrGLSLMulVarBy4f(&modulate, 2, outputColor, inputColor);
-    builder->fsCodeAppend(modulate.c_str());
+    GrGLSLMulVarBy4f(&modulate, args.fOutputColor, args.fInputColor);
+    fragBuilder->codeAppend(modulate.c_str());
 }
 
-void GrGLMorphologyEffect::GenKey(const GrDrawEffect& drawEffect,
-                                  const GrGLCaps&, GrEffectKeyBuilder* b) {
-    const GrMorphologyEffect& m = drawEffect.castEffect<GrMorphologyEffect>();
+void GrGLMorphologyEffect::GenKey(const GrProcessor& proc,
+                                  const GrGLSLCaps&, GrProcessorKeyBuilder* b) {
+    const GrMorphologyEffect& m = proc.cast<GrMorphologyEffect>();
     uint32_t key = static_cast<uint32_t>(m.radius());
     key |= (m.type() << 8);
+    key |= (m.direction() << 9);
+    if (m.useRange()) key |= 1 << 10;
     b->add32(key);
 }
 
-void GrGLMorphologyEffect::setData(const GrGLUniformManager& uman,
-                                   const GrDrawEffect& drawEffect) {
-    const Gr1DKernelEffect& kern = drawEffect.castEffect<Gr1DKernelEffect>();
-    GrTexture& texture = *kern.texture(0);
-    // the code we generated was for a specific kernel radius
-    SkASSERT(kern.radius() == fRadius);
-    float imageIncrement[2] = { 0 };
-    switch (kern.direction()) {
+void GrGLMorphologyEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                                   const GrProcessor& proc) {
+    const GrMorphologyEffect& m = proc.cast<GrMorphologyEffect>();
+    GrTexture& texture = *m.texture(0);
+    // the code we generated was for a specific kernel radius, direction and bound usage
+    SkASSERT(m.radius() == fRadius);
+    SkASSERT(m.direction() == fDirection);
+    SkASSERT(m.useRange() == fUseRange);
+
+    float pixelSize = 0.0f;
+    switch (fDirection) {
         case Gr1DKernelEffect::kX_Direction:
-            imageIncrement[0] = 1.0f / texture.width();
+            pixelSize = 1.0f / texture.width();
             break;
         case Gr1DKernelEffect::kY_Direction:
-            imageIncrement[1] = 1.0f / texture.height();
+            pixelSize = 1.0f / texture.height();
             break;
         default:
             SkFAIL("Unknown filter direction.");
     }
-    uman.set2fv(fImageIncrementUni, 1, imageIncrement);
+    pdman.set1f(fPixelSizeUni, pixelSize);
+
+    if (fUseRange) {
+        const float* range = m.range();
+        if (fDirection && texture.origin() == kBottomLeft_GrSurfaceOrigin) {
+            pdman.set2f(fRangeUni, 1.0f - range[1], 1.0f - range[0]);
+        } else {
+            pdman.set2f(fRangeUni, range[0], range[1]);
+        }
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -418,113 +403,222 @@ GrMorphologyEffect::GrMorphologyEffect(GrTexture* texture,
                                        Direction direction,
                                        int radius,
                                        MorphologyType type)
-    : Gr1DKernelEffect(texture, direction, radius)
-    , fType(type) {
+    : INHERITED(texture, direction, radius)
+    , fType(type), fUseRange(false) {
+    this->initClassID<GrMorphologyEffect>();
+}
+
+GrMorphologyEffect::GrMorphologyEffect(GrTexture* texture,
+                                       Direction direction,
+                                       int radius,
+                                       MorphologyType type,
+                                       float range[2])
+    : INHERITED(texture, direction, radius)
+    , fType(type), fUseRange(true) {
+    this->initClassID<GrMorphologyEffect>();
+    fRange[0] = range[0];
+    fRange[1] = range[1];
 }
 
 GrMorphologyEffect::~GrMorphologyEffect() {
 }
 
-const GrBackendEffectFactory& GrMorphologyEffect::getFactory() const {
-    return GrTBackendEffectFactory<GrMorphologyEffect>::getInstance();
+void GrMorphologyEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                               GrProcessorKeyBuilder* b) const {
+    GrGLMorphologyEffect::GenKey(*this, caps, b);
 }
 
-bool GrMorphologyEffect::onIsEqual(const GrEffect& sBase) const {
-    const GrMorphologyEffect& s = CastEffect<GrMorphologyEffect>(sBase);
-    return (this->texture(0) == s.texture(0) &&
-            this->radius() == s.radius() &&
+GrGLSLFragmentProcessor* GrMorphologyEffect::onCreateGLSLInstance() const {
+    return new GrGLMorphologyEffect(*this);
+}
+bool GrMorphologyEffect::onIsEqual(const GrFragmentProcessor& sBase) const {
+    const GrMorphologyEffect& s = sBase.cast<GrMorphologyEffect>();
+    return (this->radius() == s.radius() &&
             this->direction() == s.direction() &&
+            this->useRange() == s.useRange() &&
             this->type() == s.type());
 }
 
-void GrMorphologyEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
+void GrMorphologyEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const {
     // This is valid because the color components of the result of the kernel all come
     // exactly from existing values in the source texture.
-    this->updateConstantColorComponentsForModulation(color, validFlags);
+    this->updateInvariantOutputForModulation(inout);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-GR_DEFINE_EFFECT_TEST(GrMorphologyEffect);
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrMorphologyEffect);
 
-GrEffect* GrMorphologyEffect::TestCreate(SkRandom* random,
-                                         GrContext*,
-                                         const GrDrawTargetCaps&,
-                                         GrTexture* textures[]) {
-    int texIdx = random->nextBool() ? GrEffectUnitTest::kSkiaPMTextureIdx :
-                                      GrEffectUnitTest::kAlphaTextureIdx;
-    Direction dir = random->nextBool() ? kX_Direction : kY_Direction;
+const GrFragmentProcessor* GrMorphologyEffect::TestCreate(GrProcessorTestData* d) {
+    int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :
+                                      GrProcessorUnitTest::kAlphaTextureIdx;
+    Direction dir = d->fRandom->nextBool() ? kX_Direction : kY_Direction;
     static const int kMaxRadius = 10;
-    int radius = random->nextRangeU(1, kMaxRadius);
-    MorphologyType type = random->nextBool() ? GrMorphologyEffect::kErode_MorphologyType :
+    int radius = d->fRandom->nextRangeU(1, kMaxRadius);
+    MorphologyType type = d->fRandom->nextBool() ? GrMorphologyEffect::kErode_MorphologyType :
                                                GrMorphologyEffect::kDilate_MorphologyType;
 
-    return GrMorphologyEffect::Create(textures[texIdx], dir, radius, type);
+    return GrMorphologyEffect::Create(d->fTextures[texIdx], dir, radius, type);
 }
 
 namespace {
 
-void apply_morphology_pass(GrContext* context,
+
+void apply_morphology_rect(GrDrawContext* drawContext,
+                           const GrClip& clip,
+                           GrTexture* texture,
+                           const SkIRect& srcRect,
+                           const SkIRect& dstRect,
+                           int radius,
+                           GrMorphologyEffect::MorphologyType morphType,
+                           float bounds[2],
+                           Gr1DKernelEffect::Direction direction) {
+    GrPaint paint;
+    paint.addColorFragmentProcessor(GrMorphologyEffect::Create(texture,
+                                                               direction,
+                                                               radius,
+                                                               morphType,
+                                                               bounds))->unref();
+    paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode);
+    drawContext->fillRectToRect(clip, paint, SkMatrix::I(), SkRect::Make(dstRect),
+                                     SkRect::Make(srcRect));
+}
+
+void apply_morphology_rect_no_bounds(GrDrawContext* drawContext,
+                                     const GrClip& clip,
+                                     GrTexture* texture,
+                                     const SkIRect& srcRect,
+                                     const SkIRect& dstRect,
+                                     int radius,
+                                     GrMorphologyEffect::MorphologyType morphType,
+                                     Gr1DKernelEffect::Direction direction) {
+    GrPaint paint;
+    paint.addColorFragmentProcessor(GrMorphologyEffect::Create(texture,
+                                                               direction,
+                                                               radius,
+                                                               morphType))->unref();
+    paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode);
+    drawContext->fillRectToRect(clip, paint, SkMatrix::I(), SkRect::Make(dstRect),
+                                SkRect::Make(srcRect));
+}
+
+void apply_morphology_pass(GrDrawContext* drawContext,
+                           const GrClip& clip,
                            GrTexture* texture,
                            const SkIRect& srcRect,
                            const SkIRect& dstRect,
                            int radius,
                            GrMorphologyEffect::MorphologyType morphType,
                            Gr1DKernelEffect::Direction direction) {
-    GrPaint paint;
-    paint.addColorEffect(GrMorphologyEffect::Create(texture,
-                                                    direction,
-                                                    radius,
-                                                    morphType))->unref();
-    context->drawRectToRect(paint, SkRect::Make(dstRect), SkRect::Make(srcRect));
+    float bounds[2] = { 0.0f, 1.0f };
+    SkIRect lowerSrcRect = srcRect, lowerDstRect = dstRect;
+    SkIRect middleSrcRect = srcRect, middleDstRect = dstRect;
+    SkIRect upperSrcRect = srcRect, upperDstRect = dstRect;
+    if (direction == Gr1DKernelEffect::kX_Direction) {
+        bounds[0] = (SkIntToScalar(srcRect.left()) + 0.5f) / texture->width();
+        bounds[1] = (SkIntToScalar(srcRect.right()) - 0.5f) / texture->width();
+        lowerSrcRect.fRight = srcRect.left() + radius;
+        lowerDstRect.fRight = dstRect.left() + radius;
+        upperSrcRect.fLeft = srcRect.right() - radius;
+        upperDstRect.fLeft = dstRect.right() - radius;
+        middleSrcRect.inset(radius, 0);
+        middleDstRect.inset(radius, 0);
+    } else {
+        bounds[0] = (SkIntToScalar(srcRect.top()) + 0.5f) / texture->height();
+        bounds[1] = (SkIntToScalar(srcRect.bottom()) - 0.5f) / texture->height();
+        lowerSrcRect.fBottom = srcRect.top() + radius;
+        lowerDstRect.fBottom = dstRect.top() + radius;
+        upperSrcRect.fTop = srcRect.bottom() - radius;
+        upperDstRect.fTop = dstRect.bottom() - radius;
+        middleSrcRect.inset(0, radius);
+        middleDstRect.inset(0, radius);
+    }
+    if (middleSrcRect.fLeft - middleSrcRect.fRight >= 0) {
+        // radius covers srcRect; use bounds over entire draw
+        apply_morphology_rect(drawContext, clip, texture, srcRect, dstRect, radius,
+                              morphType, bounds, direction);
+    } else {
+        // Draw upper and lower margins with bounds; middle without.
+        apply_morphology_rect(drawContext, clip, texture, lowerSrcRect, lowerDstRect, radius,
+                              morphType, bounds, direction);
+        apply_morphology_rect(drawContext, clip, texture, upperSrcRect, upperDstRect, radius,
+                              morphType, bounds, direction);
+        apply_morphology_rect_no_bounds(drawContext, clip, texture, middleSrcRect, middleDstRect,
+                                        radius, morphType, direction);
+    }
 }
 
 bool apply_morphology(const SkBitmap& input,
                       const SkIRect& rect,
                       GrMorphologyEffect::MorphologyType morphType,
                       SkISize radius,
-                      SkBitmap* dst) {
-    GrTexture* srcTexture = input.getTexture();
-    SkASSERT(NULL != srcTexture);
+                      SkBitmap* dst,
+                      GrTextureProvider::SizeConstraint constraint) {
+    SkAutoTUnref<GrTexture> srcTexture(SkRef(input.getTexture()));
+    SkASSERT(srcTexture);
     GrContext* context = srcTexture->getContext();
-    srcTexture->ref();
-    SkAutoTUnref<GrTexture> src(srcTexture);
 
-    GrContext::AutoMatrix am;
-    am.setIdentity(context);
-
-    GrContext::AutoClip acs(context, SkRect::MakeWH(SkIntToScalar(srcTexture->width()),
-                                                    SkIntToScalar(srcTexture->height())));
+    // setup new clip
+    GrClip clip(SkRect::MakeWH(SkIntToScalar(srcTexture->width()),
+                               SkIntToScalar(srcTexture->height())));
 
     SkIRect dstRect = SkIRect::MakeWH(rect.width(), rect.height());
-    GrTextureDesc desc;
-    desc.fFlags = kRenderTarget_GrTextureFlagBit | kNoStencil_GrTextureFlagBit;
+    GrSurfaceDesc desc;
+    desc.fFlags = kRenderTarget_GrSurfaceFlag;
     desc.fWidth = rect.width();
     desc.fHeight = rect.height();
     desc.fConfig = kSkia8888_GrPixelConfig;
     SkIRect srcRect = rect;
 
     if (radius.fWidth > 0) {
-        GrAutoScratchTexture ast(context, desc);
-        GrContext::AutoRenderTarget art(context, ast.texture()->asRenderTarget());
-        apply_morphology_pass(context, src, srcRect, dstRect, radius.fWidth,
-                              morphType, Gr1DKernelEffect::kX_Direction);
+        GrTextureProvider::SizeConstraint horiConstraint = constraint;
+        if (radius.fHeight > 0) {
+            // Optimization: we will fall through and allocate the "real" texture after this one
+            // so ours can be approximate (likely faster to allocate)
+            horiConstraint = GrTextureProvider::kApprox_SizeConstraint;
+        }
+
+        GrTexture* scratch = context->textureProvider()->createTexture(desc, horiConstraint);
+        if (nullptr == scratch) {
+            return false;
+        }
+        SkAutoTUnref<GrDrawContext> dstDrawContext(
+                                                context->drawContext(scratch->asRenderTarget()));
+        if (!dstDrawContext) {
+            return false;
+        }
+
+        apply_morphology_pass(dstDrawContext, clip, srcTexture,
+                              srcRect, dstRect, radius.fWidth, morphType,
+                              Gr1DKernelEffect::kX_Direction);
         SkIRect clearRect = SkIRect::MakeXYWH(dstRect.fLeft, dstRect.fBottom,
                                               dstRect.width(), radius.fHeight);
-        context->clear(&clearRect, GrMorphologyEffect::kErode_MorphologyType == morphType ?
-                                   SK_ColorWHITE :
-                                   SK_ColorTRANSPARENT, false);
-        src.reset(ast.detach());
+        GrColor clearColor = GrMorphologyEffect::kErode_MorphologyType == morphType ?
+                                SK_ColorWHITE :
+                                SK_ColorTRANSPARENT;
+        dstDrawContext->clear(&clearRect, clearColor, false);
+
+        srcTexture.reset(scratch);
         srcRect = dstRect;
     }
     if (radius.fHeight > 0) {
-        GrAutoScratchTexture ast(context, desc);
-        GrContext::AutoRenderTarget art(context, ast.texture()->asRenderTarget());
-        apply_morphology_pass(context, src, srcRect, dstRect, radius.fHeight,
-                              morphType, Gr1DKernelEffect::kY_Direction);
-        src.reset(ast.detach());
+        GrTexture* scratch = context->textureProvider()->createTexture(desc, constraint);
+        if (nullptr == scratch) {
+            return false;
+        }
+        SkAutoTUnref<GrDrawContext> dstDrawContext(
+                                                context->drawContext(scratch->asRenderTarget()));
+        if (!dstDrawContext) {
+            return false;
+        }
+
+        apply_morphology_pass(dstDrawContext, clip, srcTexture,
+                              srcRect, dstRect, radius.fHeight, morphType,
+                              Gr1DKernelEffect::kY_Direction);
+
+        srcTexture.reset(scratch);
     }
-    SkImageFilter::WrapTexture(src, rect.width(), rect.height(), dst);
+    SkImageFilter::WrapTexture(srcTexture, rect.width(), rect.height(), dst);
     return true;
 }
 
@@ -538,7 +632,7 @@ bool SkMorphologyImageFilter::filterImageGPUGeneric(bool dilate,
                                                     SkIPoint* offset) const {
     SkBitmap input = src;
     SkIPoint srcOffset = SkIPoint::Make(0, 0);
-    if (getInput(0) && !getInput(0)->getInputResultGPU(proxy, src, ctx, &input, &srcOffset)) {
+    if (!this->filterInputGPU(0, proxy, src, ctx, &input, &srcOffset)) {
         return false;
     }
     SkIRect bounds;
@@ -564,9 +658,10 @@ bool SkMorphologyImageFilter::filterImageGPUGeneric(bool dilate,
         return true;
     }
 
-    GrMorphologyEffect::MorphologyType type = dilate ? GrMorphologyEffect::kDilate_MorphologyType : GrMorphologyEffect::kErode_MorphologyType;
-    if (!apply_morphology(input, srcBounds, type,
-                          SkISize::Make(width, height), result)) {
+    GrMorphologyEffect::MorphologyType type = dilate ? GrMorphologyEffect::kDilate_MorphologyType
+                                                     : GrMorphologyEffect::kErode_MorphologyType;
+    if (!apply_morphology(input, srcBounds, type, SkISize::Make(width, height), result,
+                          GrTextureProvider::FromImageFilter(ctx.sizeConstraint()))) {
         return false;
     }
     offset->fX = bounds.left();
diff --git a/gfx/skia/skia/src/effects/SkOffsetImageFilter.cpp b/gfx/skia/skia/src/effects/SkOffsetImageFilter.cpp
index 57f36db113ca..9da026b2793b 100644
--- a/gfx/skia/skia/src/effects/SkOffsetImageFilter.cpp
+++ b/gfx/skia/skia/src/effects/SkOffsetImageFilter.cpp
@@ -18,7 +18,6 @@ bool SkOffsetImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& source,
                                         const Context& ctx,
                                         SkBitmap* result,
                                         SkIPoint* offset) const {
-    SkImageFilter* input = getInput(0);
     SkBitmap src = source;
     SkIPoint srcOffset = SkIPoint::Make(0, 0);
 #ifdef SK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION
@@ -26,7 +25,7 @@ bool SkOffsetImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& source,
 #else
     if (!cropRectIsSet()) {
 #endif
-        if (input && !input->filterImage(proxy, source, ctx, &src, &srcOffset)) {
+        if (!this->filterInput(0, proxy, source, ctx, &src, &srcOffset)) {
             return false;
         }
 
@@ -37,7 +36,7 @@ bool SkOffsetImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& source,
         offset->fY = srcOffset.fY + SkScalarRoundToInt(vec.fY);
         *result = src;
     } else {
-        if (input && !input->filterImage(proxy, source, ctx, &src, &srcOffset)) {
+        if (!this->filterInput(0, proxy, source, ctx, &src, &srcOffset)) {
             return false;
         }
 
@@ -47,7 +46,7 @@ bool SkOffsetImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& source,
         }
 
         SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(), bounds.height()));
-        if (NULL == device.get()) {
+        if (nullptr == device.get()) {
             return false;
         }
         SkCanvas canvas(device);
@@ -91,6 +90,13 @@ bool SkOffsetImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm
     return true;
 }
 
+SkFlattenable* SkOffsetImageFilter::CreateProc(SkReadBuffer& buffer) {
+    SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
+    SkPoint offset;
+    buffer.readPoint(&offset);
+    return Create(offset.x(), offset.y(), common.getInput(0), &common.cropRect());
+}
+
 void SkOffsetImageFilter::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
     buffer.writePoint(fOffset);
@@ -102,9 +108,14 @@ SkOffsetImageFilter::SkOffsetImageFilter(SkScalar dx, SkScalar dy, SkImageFilter
     fOffset.set(dx, dy);
 }
 
-SkOffsetImageFilter::SkOffsetImageFilter(SkReadBuffer& buffer)
-  : INHERITED(1, buffer) {
-    buffer.readPoint(&fOffset);
-    buffer.validate(SkScalarIsFinite(fOffset.fX) &&
-                    SkScalarIsFinite(fOffset.fY));
+#ifndef SK_IGNORE_TO_STRING
+void SkOffsetImageFilter::toString(SkString* str) const {
+    str->appendf("SkOffsetImageFilter: (");
+    str->appendf("offset: (%f, %f) ", fOffset.fX, fOffset.fY);
+    str->append("input: (");
+    if (this->getInput(0)) {
+        this->getInput(0)->toString(str);
+    }
+    str->append("))");
 }
+#endif
diff --git a/gfx/skia/skia/src/effects/SkPerlinNoiseShader.cpp b/gfx/skia/skia/src/effects/SkPerlinNoiseShader.cpp
index f0b9f67712cc..916cf78f0df5 100644
--- a/gfx/skia/skia/src/effects/SkPerlinNoiseShader.cpp
+++ b/gfx/skia/skia/src/effects/SkPerlinNoiseShader.cpp
@@ -17,10 +17,13 @@
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #include "GrCoordTransform.h"
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
-#include "GrTBackendEffectFactory.h"
+#include "GrInvariantOutput.h"
 #include "SkGr.h"
+#include "effects/GrConstColorProcessor.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
 #endif
 
 static const int kBlockSize = 256;
@@ -50,11 +53,6 @@ inline SkScalar smoothCurve(SkScalar t) {
     return SkScalarMul(SkScalarSquare(t), SK_Scalar3 - 2 * t);
 }
 
-bool perlin_noise_type_is_valid(SkPerlinNoiseShader::Type type) {
-    return (SkPerlinNoiseShader::kFractalNoise_Type == type) ||
-           (SkPerlinNoiseShader::kTurbulence_Type == type);
-}
-
 } // end namespace
 
 struct SkPerlinNoiseShader::StitchData {
@@ -83,16 +81,14 @@ struct SkPerlinNoiseShader::PaintingData {
                  SkScalar baseFrequencyX, SkScalar baseFrequencyY,
                  const SkMatrix& matrix)
     {
-        SkVector wavelength = SkVector::Make(SkScalarInvert(baseFrequencyX),
-                                             SkScalarInvert(baseFrequencyY));
-        matrix.mapVectors(&wavelength, 1);
-        fBaseFrequency.fX = SkScalarInvert(wavelength.fX);
-        fBaseFrequency.fY = SkScalarInvert(wavelength.fY);
-        SkVector sizeVec = SkVector::Make(SkIntToScalar(tileSize.fWidth),
-                                          SkIntToScalar(tileSize.fHeight));
-        matrix.mapVectors(&sizeVec, 1);
-        fTileSize.fWidth = SkScalarRoundToInt(sizeVec.fX);
-        fTileSize.fHeight = SkScalarRoundToInt(sizeVec.fY);
+        SkVector vec[2] = {
+            { SkScalarInvert(baseFrequencyX),   SkScalarInvert(baseFrequencyY)  },
+            { SkIntToScalar(tileSize.fWidth),   SkIntToScalar(tileSize.fHeight) },
+        };
+        matrix.mapVectors(vec, 2);
+
+        fBaseFrequency.set(SkScalarInvert(vec[0].fX), SkScalarInvert(vec[0].fY));
+        fTileSize.set(SkScalarRoundToInt(vec[1].fX), SkScalarRoundToInt(vec[1].fY));
         this->init(seed);
         if (!fTileSize.isEmpty()) {
             this->stitch();
@@ -219,8 +215,7 @@ private:
             SkScalar highFrequencx =
                 SkScalarCeilToScalar(tileWidth * fBaseFrequency.fX) / tileWidth;
             // BaseFrequency should be non-negative according to the standard.
-            if (SkScalarDiv(fBaseFrequency.fX, lowFrequencx) <
-                SkScalarDiv(highFrequencx, fBaseFrequency.fX)) {
+            if (fBaseFrequency.fX / lowFrequencx < highFrequencx / fBaseFrequency.fX) {
                 fBaseFrequency.fX = lowFrequencx;
             } else {
                 fBaseFrequency.fX = highFrequencx;
@@ -231,8 +226,7 @@ private:
                 SkScalarFloorToScalar(tileHeight * fBaseFrequency.fY) / tileHeight;
             SkScalar highFrequency =
                 SkScalarCeilToScalar(tileHeight * fBaseFrequency.fY) / tileHeight;
-            if (SkScalarDiv(fBaseFrequency.fY, lowFrequency) <
-                SkScalarDiv(highFrequency, fBaseFrequency.fY)) {
+            if (fBaseFrequency.fY / lowFrequency < highFrequency / fBaseFrequency.fY) {
                 fBaseFrequency.fY = lowFrequency;
             } else {
                 fBaseFrequency.fY = highFrequency;
@@ -259,15 +253,15 @@ public:
 SkShader* SkPerlinNoiseShader::CreateFractalNoise(SkScalar baseFrequencyX, SkScalar baseFrequencyY,
                                                   int numOctaves, SkScalar seed,
                                                   const SkISize* tileSize) {
-    return SkNEW_ARGS(SkPerlinNoiseShader, (kFractalNoise_Type, baseFrequencyX, baseFrequencyY,
-                                            numOctaves, seed, tileSize));
+    return new SkPerlinNoiseShader(kFractalNoise_Type, baseFrequencyX, baseFrequencyY, numOctaves,
+                                   seed, tileSize);
 }
 
 SkShader* SkPerlinNoiseShader::CreateTurbulence(SkScalar baseFrequencyX, SkScalar baseFrequencyY,
                                               int numOctaves, SkScalar seed,
                                               const SkISize* tileSize) {
-    return SkNEW_ARGS(SkPerlinNoiseShader, (kTurbulence_Type, baseFrequencyX, baseFrequencyY,
-                                            numOctaves, seed, tileSize));
+    return new SkPerlinNoiseShader(kTurbulence_Type, baseFrequencyX, baseFrequencyY, numOctaves,
+                                   seed, tileSize);
 }
 
 SkPerlinNoiseShader::SkPerlinNoiseShader(SkPerlinNoiseShader::Type type,
@@ -281,39 +275,41 @@ SkPerlinNoiseShader::SkPerlinNoiseShader(SkPerlinNoiseShader::Type type,
   , fBaseFrequencyY(baseFrequencyY)
   , fNumOctaves(numOctaves > 255 ? 255 : numOctaves/*[0,255] octaves allowed*/)
   , fSeed(seed)
-  , fTileSize(NULL == tileSize ? SkISize::Make(0, 0) : *tileSize)
+  , fTileSize(nullptr == tileSize ? SkISize::Make(0, 0) : *tileSize)
   , fStitchTiles(!fTileSize.isEmpty())
 {
     SkASSERT(numOctaves >= 0 && numOctaves < 256);
 }
 
-SkPerlinNoiseShader::SkPerlinNoiseShader(SkReadBuffer& buffer)
-    : INHERITED(buffer)
-{
-    fType           = (SkPerlinNoiseShader::Type) buffer.readInt();
-    fBaseFrequencyX = buffer.readScalar();
-    fBaseFrequencyY = buffer.readScalar();
-    fNumOctaves     = buffer.readInt();
-    fSeed           = buffer.readScalar();
-    fStitchTiles    = buffer.readBool();
-    fTileSize.fWidth  = buffer.readInt();
-    fTileSize.fHeight = buffer.readInt();
-    buffer.validate(perlin_noise_type_is_valid(fType) &&
-                    (fNumOctaves >= 0) && (fNumOctaves <= 255) &&
-                    (fStitchTiles != fTileSize.isEmpty()));
-}
-
 SkPerlinNoiseShader::~SkPerlinNoiseShader() {
 }
 
+SkFlattenable* SkPerlinNoiseShader::CreateProc(SkReadBuffer& buffer) {
+    Type type = (Type)buffer.readInt();
+    SkScalar freqX = buffer.readScalar();
+    SkScalar freqY = buffer.readScalar();
+    int octaves = buffer.readInt();
+    SkScalar seed = buffer.readScalar();
+    SkISize tileSize;
+    tileSize.fWidth = buffer.readInt();
+    tileSize.fHeight = buffer.readInt();
+
+    switch (type) {
+        case kFractalNoise_Type:
+            return SkPerlinNoiseShader::CreateFractalNoise(freqX, freqY, octaves, seed, &tileSize);
+        case kTurbulence_Type:
+            return SkPerlinNoiseShader::CreateTubulence(freqX, freqY, octaves, seed, &tileSize);
+        default:
+            return nullptr;
+    }
+}
+
 void SkPerlinNoiseShader::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
     buffer.writeInt((int) fType);
     buffer.writeScalar(fBaseFrequencyX);
     buffer.writeScalar(fBaseFrequencyY);
     buffer.writeInt(fNumOctaves);
     buffer.writeScalar(fSeed);
-    buffer.writeBool(fStitchTiles);
     buffer.writeInt(fTileSize.fWidth);
     buffer.writeInt(fTileSize.fHeight);
 }
@@ -389,8 +385,9 @@ SkScalar SkPerlinNoiseShader::PerlinNoiseShaderContext::calculateTurbulenceValue
     SkScalar ratio = SK_Scalar1;
     for (int octave = 0; octave < perlinNoiseShader.fNumOctaves; ++octave) {
         SkScalar noise = noise2D(channel, stitchData, noiseVector);
-        turbulenceFunctionResult += SkScalarDiv(
-            (perlinNoiseShader.fType == kFractalNoise_Type) ? noise : SkScalarAbs(noise), ratio);
+        SkScalar numer = (perlinNoiseShader.fType == kFractalNoise_Type) ?
+                            noise : SkScalarAbs(noise);
+        turbulenceFunctionResult += numer / ratio;
         noiseVector.fX *= 2;
         noiseVector.fY *= 2;
         ratio *= 2;
@@ -411,8 +408,7 @@ SkScalar SkPerlinNoiseShader::PerlinNoiseShaderContext::calculateTurbulenceValue
     }
 
     if (channel == 3) { // Scale alpha by paint value
-        turbulenceFunctionResult = SkScalarMul(turbulenceFunctionResult,
-            SkScalarDiv(SkIntToScalar(getPaintAlpha()), SkIntToScalar(255)));
+        turbulenceFunctionResult *= SkIntToScalar(getPaintAlpha()) / 255;
     }
 
     // Clamp result
@@ -436,7 +432,7 @@ SkPMColor SkPerlinNoiseShader::PerlinNoiseShaderContext::shade(
 
 SkShader::Context* SkPerlinNoiseShader::onCreateContext(const ContextRec& rec,
                                                         void* storage) const {
-    return SkNEW_PLACEMENT_ARGS(storage, PerlinNoiseShaderContext, (*this, rec));
+    return new (storage) PerlinNoiseShaderContext(*this, rec);
 }
 
 size_t SkPerlinNoiseShader::contextSize() const {
@@ -455,12 +451,11 @@ SkPerlinNoiseShader::PerlinNoiseShaderContext::PerlinNoiseShaderContext(
     // This (1,1) translation is due to WebKit's 1 based coordinates for the noise
     // (as opposed to 0 based, usually). The same adjustment is in the setData() function.
     fMatrix.setTranslate(-newMatrix.getTranslateX() + SK_Scalar1, -newMatrix.getTranslateY() + SK_Scalar1);
-    fPaintingData = SkNEW_ARGS(PaintingData, (shader.fTileSize, shader.fSeed, shader.fBaseFrequencyX, shader.fBaseFrequencyY, newMatrix));
+    fPaintingData = new PaintingData(shader.fTileSize, shader.fSeed, shader.fBaseFrequencyX,
+                                     shader.fBaseFrequencyY, newMatrix);
 }
 
-SkPerlinNoiseShader::PerlinNoiseShaderContext::~PerlinNoiseShaderContext() {
-    SkDELETE(fPaintingData);
-}
+SkPerlinNoiseShader::PerlinNoiseShaderContext::~PerlinNoiseShaderContext() { delete fPaintingData; }
 
 void SkPerlinNoiseShader::PerlinNoiseShaderContext::shadeSpan(
         int x, int y, SkPMColor result[], int count) {
@@ -489,60 +484,47 @@ void SkPerlinNoiseShader::PerlinNoiseShaderContext::shadeSpan16(
 
 #if SK_SUPPORT_GPU
 
-#include "GrTBackendEffectFactory.h"
-
-class GrGLPerlinNoise : public GrGLEffect {
+class GrGLPerlinNoise : public GrGLSLFragmentProcessor {
 public:
-    GrGLPerlinNoise(const GrBackendEffectFactory& factory,
-                    const GrDrawEffect& drawEffect);
+    GrGLPerlinNoise(const GrProcessor&);
     virtual ~GrGLPerlinNoise() {}
 
-    virtual void emitCode(GrGLShaderBuilder*,
-                          const GrDrawEffect&,
-                          const GrEffectKey&,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    virtual void emitCode(EmitArgs&) override;
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+    static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder* b);
 
-    static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder* b);
+protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
 
 private:
 
-    GrGLUniformManager::UniformHandle   fStitchDataUni;
-    SkPerlinNoiseShader::Type           fType;
-    bool                                fStitchTiles;
-    int                                 fNumOctaves;
-    GrGLUniformManager::UniformHandle   fBaseFrequencyUni;
-    GrGLUniformManager::UniformHandle   fAlphaUni;
+    GrGLSLProgramDataManager::UniformHandle fStitchDataUni;
+    SkPerlinNoiseShader::Type               fType;
+    bool                                    fStitchTiles;
+    int                                     fNumOctaves;
+    GrGLSLProgramDataManager::UniformHandle fBaseFrequencyUni;
 
 private:
-    typedef GrGLEffect INHERITED;
+    typedef GrGLSLFragmentProcessor INHERITED;
 };
 
 /////////////////////////////////////////////////////////////////////
 
-class GrPerlinNoiseEffect : public GrEffect {
+class GrPerlinNoiseEffect : public GrFragmentProcessor {
 public:
-    static GrEffect* Create(SkPerlinNoiseShader::Type type,
-                            int numOctaves, bool stitchTiles,
-                            SkPerlinNoiseShader::PaintingData* paintingData,
-                            GrTexture* permutationsTexture, GrTexture* noiseTexture,
-                            const SkMatrix& matrix, uint8_t alpha) {
-        return SkNEW_ARGS(GrPerlinNoiseEffect, (type, numOctaves, stitchTiles, paintingData,
-                                                permutationsTexture, noiseTexture, matrix, alpha));
+    static GrFragmentProcessor* Create(SkPerlinNoiseShader::Type type,
+                                       int numOctaves, bool stitchTiles,
+                                       SkPerlinNoiseShader::PaintingData* paintingData,
+                                       GrTexture* permutationsTexture, GrTexture* noiseTexture,
+                                       const SkMatrix& matrix) {
+        return new GrPerlinNoiseEffect(type, numOctaves, stitchTiles, paintingData,
+                                       permutationsTexture, noiseTexture, matrix);
     }
 
-    virtual ~GrPerlinNoiseEffect() {
-        SkDELETE(fPaintingData);
-    }
+    virtual ~GrPerlinNoiseEffect() { delete fPaintingData; }
+
+    const char* name() const override { return "PerlinNoise"; }
 
-    static const char* Name() { return "PerlinNoise"; }
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE {
-        return GrTBackendEffectFactory<GrPerlinNoiseEffect>::getInstance();
-    }
     const SkPerlinNoiseShader::StitchData& stitchData() const { return fPaintingData->fStitchDataInit; }
 
     SkPerlinNoiseShader::Type type() const { return fType; }
@@ -550,124 +532,108 @@ public:
     const SkVector& baseFrequency() const { return fPaintingData->fBaseFrequency; }
     int numOctaves() const { return fNumOctaves; }
     const SkMatrix& matrix() const { return fCoordTransform.getMatrix(); }
-    uint8_t alpha() const { return fAlpha; }
-
-    typedef GrGLPerlinNoise GLEffect;
 
 private:
-    virtual bool onIsEqual(const GrEffect& sBase) const SK_OVERRIDE {
-        const GrPerlinNoiseEffect& s = CastEffect<GrPerlinNoiseEffect>(sBase);
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override {
+        return new GrGLPerlinNoise(*this);
+    }
+
+    virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                       GrProcessorKeyBuilder* b) const override {
+        GrGLPerlinNoise::GenKey(*this, caps, b);
+    }
+
+    bool onIsEqual(const GrFragmentProcessor& sBase) const override {
+        const GrPerlinNoiseEffect& s = sBase.cast<GrPerlinNoiseEffect>();
         return fType == s.fType &&
                fPaintingData->fBaseFrequency == s.fPaintingData->fBaseFrequency &&
                fNumOctaves == s.fNumOctaves &&
                fStitchTiles == s.fStitchTiles &&
-               fCoordTransform.getMatrix() == s.fCoordTransform.getMatrix() &&
-               fAlpha == s.fAlpha &&
-               fPermutationsAccess.getTexture() == s.fPermutationsAccess.getTexture() &&
-               fNoiseAccess.getTexture() == s.fNoiseAccess.getTexture() &&
                fPaintingData->fStitchDataInit == s.fPaintingData->fStitchDataInit;
     }
 
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override {
+        inout->setToUnknown(GrInvariantOutput::kWillNot_ReadInput);
+    }
+
     GrPerlinNoiseEffect(SkPerlinNoiseShader::Type type,
                         int numOctaves, bool stitchTiles,
                         SkPerlinNoiseShader::PaintingData* paintingData,
                         GrTexture* permutationsTexture, GrTexture* noiseTexture,
-                        const SkMatrix& matrix, uint8_t alpha)
+                        const SkMatrix& matrix)
       : fType(type)
       , fNumOctaves(numOctaves)
       , fStitchTiles(stitchTiles)
-      , fAlpha(alpha)
       , fPermutationsAccess(permutationsTexture)
       , fNoiseAccess(noiseTexture)
       , fPaintingData(paintingData) {
+        this->initClassID<GrPerlinNoiseEffect>();
         this->addTextureAccess(&fPermutationsAccess);
         this->addTextureAccess(&fNoiseAccess);
         fCoordTransform.reset(kLocal_GrCoordSet, matrix);
         this->addCoordTransform(&fCoordTransform);
-        this->setWillNotUseInputColor();
     }
 
-    GR_DECLARE_EFFECT_TEST;
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
 
     SkPerlinNoiseShader::Type       fType;
     GrCoordTransform                fCoordTransform;
     int                             fNumOctaves;
     bool                            fStitchTiles;
-    uint8_t                         fAlpha;
     GrTextureAccess                 fPermutationsAccess;
     GrTextureAccess                 fNoiseAccess;
     SkPerlinNoiseShader::PaintingData *fPaintingData;
 
-    void getConstantColorComponents(GrColor*, uint32_t* validFlags) const SK_OVERRIDE {
-        *validFlags = 0; // This is noise. Nothing is constant.
-    }
-
 private:
-    typedef GrEffect INHERITED;
+    typedef GrFragmentProcessor INHERITED;
 };
 
 /////////////////////////////////////////////////////////////////////
-GR_DEFINE_EFFECT_TEST(GrPerlinNoiseEffect);
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrPerlinNoiseEffect);
 
-GrEffect* GrPerlinNoiseEffect::TestCreate(SkRandom* random,
-                                          GrContext* context,
-                                          const GrDrawTargetCaps&,
-                                          GrTexture**) {
-    int      numOctaves = random->nextRangeU(2, 10);
-    bool     stitchTiles = random->nextBool();
-    SkScalar seed = SkIntToScalar(random->nextU());
-    SkISize  tileSize = SkISize::Make(random->nextRangeU(4, 4096), random->nextRangeU(4, 4096));
-    SkScalar baseFrequencyX = random->nextRangeScalar(0.01f,
-                                                      0.99f);
-    SkScalar baseFrequencyY = random->nextRangeScalar(0.01f,
-                                                      0.99f);
+const GrFragmentProcessor* GrPerlinNoiseEffect::TestCreate(GrProcessorTestData* d) {
+    int      numOctaves = d->fRandom->nextRangeU(2, 10);
+    bool     stitchTiles = d->fRandom->nextBool();
+    SkScalar seed = SkIntToScalar(d->fRandom->nextU());
+    SkISize  tileSize = SkISize::Make(d->fRandom->nextRangeU(4, 4096),
+                                      d->fRandom->nextRangeU(4, 4096));
+    SkScalar baseFrequencyX = d->fRandom->nextRangeScalar(0.01f,
+                                                          0.99f);
+    SkScalar baseFrequencyY = d->fRandom->nextRangeScalar(0.01f,
+                                                          0.99f);
 
-    SkShader* shader = random->nextBool() ?
+    SkAutoTUnref<SkShader> shader(d->fRandom->nextBool() ?
         SkPerlinNoiseShader::CreateFractalNoise(baseFrequencyX, baseFrequencyY, numOctaves, seed,
-                                                stitchTiles ? &tileSize : NULL) :
+                                                stitchTiles ? &tileSize : nullptr) :
         SkPerlinNoiseShader::CreateTurbulence(baseFrequencyX, baseFrequencyY, numOctaves, seed,
-                                             stitchTiles ? &tileSize : NULL);
+                                             stitchTiles ? &tileSize : nullptr));
 
-    SkPaint paint;
-    GrColor paintColor;
-    GrEffect* effect;
-    SkAssertResult(shader->asNewEffect(context, paint, NULL, &paintColor, &effect));
-
-    SkDELETE(shader);
-
-    return effect;
+    return shader->asFragmentProcessor(d->fContext,
+                                       GrTest::TestMatrix(d->fRandom), nullptr,
+                                       kNone_SkFilterQuality);
 }
 
-GrGLPerlinNoise::GrGLPerlinNoise(const GrBackendEffectFactory& factory, const GrDrawEffect& drawEffect)
-  : INHERITED (factory)
-  , fType(drawEffect.castEffect<GrPerlinNoiseEffect>().type())
-  , fStitchTiles(drawEffect.castEffect<GrPerlinNoiseEffect>().stitchTiles())
-  , fNumOctaves(drawEffect.castEffect<GrPerlinNoiseEffect>().numOctaves()) {
+GrGLPerlinNoise::GrGLPerlinNoise(const GrProcessor& processor)
+  : fType(processor.cast<GrPerlinNoiseEffect>().type())
+  , fStitchTiles(processor.cast<GrPerlinNoiseEffect>().stitchTiles())
+  , fNumOctaves(processor.cast<GrPerlinNoiseEffect>().numOctaves()) {
 }
 
-void GrGLPerlinNoise::emitCode(GrGLShaderBuilder* builder,
-                               const GrDrawEffect&,
-                               const GrEffectKey& key,
-                               const char* outputColor,
-                               const char* inputColor,
-                               const TransformedCoordsArray& coords,
-                               const TextureSamplerArray& samplers) {
-    sk_ignore_unused_variable(inputColor);
+void GrGLPerlinNoise::emitCode(EmitArgs& args) {
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    SkString vCoords = fragBuilder->ensureFSCoords2D(args.fCoords, 0);
 
-    SkString vCoords = builder->ensureFSCoords2D(coords, 0);
+    fBaseFrequencyUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                                  kVec2f_GrSLType, kDefault_GrSLPrecision,
+                                                  "baseFrequency");
+    const char* baseFrequencyUni = args.fBuilder->getUniformCStr(fBaseFrequencyUni);
 
-    fBaseFrequencyUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                            kVec2f_GrSLType, "baseFrequency");
-    const char* baseFrequencyUni = builder->getUniformCStr(fBaseFrequencyUni);
-    fAlphaUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                    kFloat_GrSLType, "alpha");
-    const char* alphaUni = builder->getUniformCStr(fAlphaUni);
-
-    const char* stitchDataUni = NULL;
+    const char* stitchDataUni = nullptr;
     if (fStitchTiles) {
-        fStitchDataUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                             kVec2f_GrSLType, "stitchData");
-        stitchDataUni = builder->getUniformCStr(fStitchDataUni);
+        fStitchDataUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                                   kVec2f_GrSLType, kDefault_GrSLPrecision,
+                                                   "stitchData");
+        stitchDataUni = args.fBuilder->getUniformCStr(fStitchDataUni);
     }
 
     // There are 4 lines, so the center of each line is 1/8, 3/8, 5/8 and 7/8
@@ -693,15 +659,15 @@ void GrGLPerlinNoise::emitCode(GrGLShaderBuilder* builder,
     const char* dotLattice  = "dot(((%s.ga + %s.rb * vec2(%s)) * vec2(2.0) - vec2(1.0)), %s);";
 
     // Add noise function
-    static const GrGLShaderVar gPerlinNoiseArgs[] =  {
-        GrGLShaderVar(chanCoord, kFloat_GrSLType),
-        GrGLShaderVar(noiseVec, kVec2f_GrSLType)
+    static const GrGLSLShaderVar gPerlinNoiseArgs[] =  {
+        GrGLSLShaderVar(chanCoord, kFloat_GrSLType),
+        GrGLSLShaderVar(noiseVec, kVec2f_GrSLType)
     };
 
-    static const GrGLShaderVar gPerlinNoiseStitchArgs[] =  {
-        GrGLShaderVar(chanCoord, kFloat_GrSLType),
-        GrGLShaderVar(noiseVec, kVec2f_GrSLType),
-        GrGLShaderVar(stitchData, kVec2f_GrSLType)
+    static const GrGLSLShaderVar gPerlinNoiseStitchArgs[] =  {
+        GrGLSLShaderVar(chanCoord, kFloat_GrSLType),
+        GrGLSLShaderVar(noiseVec, kVec2f_GrSLType),
+        GrGLSLShaderVar(stitchData, kVec2f_GrSLType)
     };
 
     SkString noiseCode;
@@ -718,18 +684,18 @@ void GrGLPerlinNoise::emitCode(GrGLShaderBuilder* builder,
     // Adjust frequencies if we're stitching tiles
     if (fStitchTiles) {
         noiseCode.appendf("\n\tif(%s.x >= %s.x) { %s.x -= %s.x; }",
-            floorVal, stitchData, floorVal, stitchData);
+                          floorVal, stitchData, floorVal, stitchData);
         noiseCode.appendf("\n\tif(%s.y >= %s.y) { %s.y -= %s.y; }",
-            floorVal, stitchData, floorVal, stitchData);
+                          floorVal, stitchData, floorVal, stitchData);
         noiseCode.appendf("\n\tif(%s.z >= %s.x) { %s.z -= %s.x; }",
-            floorVal, stitchData, floorVal, stitchData);
+                          floorVal, stitchData, floorVal, stitchData);
         noiseCode.appendf("\n\tif(%s.w >= %s.y) { %s.w -= %s.y; }",
-            floorVal, stitchData, floorVal, stitchData);
+                          floorVal, stitchData, floorVal, stitchData);
     }
 
     // Get texture coordinates and normalize
     noiseCode.appendf("\n\t%s = fract(floor(mod(%s, 256.0)) / vec4(256.0));\n",
-        floorVal, floorVal);
+                      floorVal, floorVal);
 
     // Get permutation for x
     {
@@ -737,7 +703,8 @@ void GrGLPerlinNoise::emitCode(GrGLShaderBuilder* builder,
         xCoords.appendf("vec2(%s.x, 0.5)", floorVal);
 
         noiseCode.appendf("\n\tvec2 %s;\n\t%s.x = ", latticeIdx, latticeIdx);
-        builder->appendTextureLookup(&noiseCode, samplers[0], xCoords.c_str(), kVec2f_GrSLType);
+        fragBuilder->appendTextureLookup(&noiseCode, args.fSamplers[0], xCoords.c_str(),
+                                         kVec2f_GrSLType);
         noiseCode.append(".r;");
     }
 
@@ -747,7 +714,8 @@ void GrGLPerlinNoise::emitCode(GrGLShaderBuilder* builder,
         xCoords.appendf("vec2(%s.z, 0.5)", floorVal);
 
         noiseCode.appendf("\n\t%s.y = ", latticeIdx);
-        builder->appendTextureLookup(&noiseCode, samplers[0], xCoords.c_str(), kVec2f_GrSLType);
+        fragBuilder->appendTextureLookup(&noiseCode, args.fSamplers[0], xCoords.c_str(),
+                                         kVec2f_GrSLType);
         noiseCode.append(".r;");
     }
 
@@ -771,8 +739,8 @@ void GrGLPerlinNoise::emitCode(GrGLShaderBuilder* builder,
         SkString latticeCoords("");
         latticeCoords.appendf("vec2(%s.x, %s)", bcoords, chanCoord);
         noiseCode.appendf("\n\tvec4 %s = ", lattice);
-        builder->appendTextureLookup(&noiseCode, samplers[1], latticeCoords.c_str(),
-            kVec2f_GrSLType);
+        fragBuilder->appendTextureLookup(&noiseCode, args.fSamplers[1], latticeCoords.c_str(),
+                                         kVec2f_GrSLType);
         noiseCode.appendf(".bgra;\n\t%s.x = ", uv);
         noiseCode.appendf(dotLattice, lattice, lattice, inc8bit, fractVal);
     }
@@ -783,8 +751,8 @@ void GrGLPerlinNoise::emitCode(GrGLShaderBuilder* builder,
         SkString latticeCoords("");
         latticeCoords.appendf("vec2(%s.y, %s)", bcoords, chanCoord);
         noiseCode.append("\n\tlattice = ");
-        builder->appendTextureLookup(&noiseCode, samplers[1], latticeCoords.c_str(),
-            kVec2f_GrSLType);
+        fragBuilder->appendTextureLookup(&noiseCode, args.fSamplers[1], latticeCoords.c_str(),
+                                         kVec2f_GrSLType);
         noiseCode.appendf(".bgra;\n\t%s.y = ", uv);
         noiseCode.appendf(dotLattice, lattice, lattice, inc8bit, fractVal);
     }
@@ -799,8 +767,8 @@ void GrGLPerlinNoise::emitCode(GrGLShaderBuilder* builder,
         SkString latticeCoords("");
         latticeCoords.appendf("vec2(%s.w, %s)", bcoords, chanCoord);
         noiseCode.append("\n\tlattice = ");
-        builder->appendTextureLookup(&noiseCode, samplers[1], latticeCoords.c_str(),
-            kVec2f_GrSLType);
+        fragBuilder->appendTextureLookup(&noiseCode, args.fSamplers[1], latticeCoords.c_str(),
+                                         kVec2f_GrSLType);
         noiseCode.appendf(".bgra;\n\t%s.y = ", uv);
         noiseCode.appendf(dotLattice, lattice, lattice, inc8bit, fractVal);
     }
@@ -811,8 +779,8 @@ void GrGLPerlinNoise::emitCode(GrGLShaderBuilder* builder,
         SkString latticeCoords("");
         latticeCoords.appendf("vec2(%s.z, %s)", bcoords, chanCoord);
         noiseCode.append("\n\tlattice = ");
-        builder->appendTextureLookup(&noiseCode, samplers[1], latticeCoords.c_str(),
-            kVec2f_GrSLType);
+        fragBuilder->appendTextureLookup(&noiseCode, args.fSamplers[1], latticeCoords.c_str(),
+                                         kVec2f_GrSLType);
         noiseCode.appendf(".bgra;\n\t%s.x = ", uv);
         noiseCode.appendf(dotLattice, lattice, lattice, inc8bit, fractVal);
     }
@@ -824,38 +792,38 @@ void GrGLPerlinNoise::emitCode(GrGLShaderBuilder* builder,
 
     SkString noiseFuncName;
     if (fStitchTiles) {
-        builder->fsEmitFunction(kFloat_GrSLType,
-                                "perlinnoise", SK_ARRAY_COUNT(gPerlinNoiseStitchArgs),
-                                gPerlinNoiseStitchArgs, noiseCode.c_str(), &noiseFuncName);
+        fragBuilder->emitFunction(kFloat_GrSLType,
+                                  "perlinnoise", SK_ARRAY_COUNT(gPerlinNoiseStitchArgs),
+                                  gPerlinNoiseStitchArgs, noiseCode.c_str(), &noiseFuncName);
     } else {
-        builder->fsEmitFunction(kFloat_GrSLType,
-                                "perlinnoise", SK_ARRAY_COUNT(gPerlinNoiseArgs),
-                                gPerlinNoiseArgs, noiseCode.c_str(), &noiseFuncName);
+        fragBuilder->emitFunction(kFloat_GrSLType,
+                                  "perlinnoise", SK_ARRAY_COUNT(gPerlinNoiseArgs),
+                                  gPerlinNoiseArgs, noiseCode.c_str(), &noiseFuncName);
     }
 
     // There are rounding errors if the floor operation is not performed here
-    builder->fsCodeAppendf("\n\t\tvec2 %s = floor(%s.xy) * %s;",
-                           noiseVec, vCoords.c_str(), baseFrequencyUni);
+    fragBuilder->codeAppendf("\n\t\tvec2 %s = floor(%s.xy) * %s;",
+                             noiseVec, vCoords.c_str(), baseFrequencyUni);
 
     // Clear the color accumulator
-    builder->fsCodeAppendf("\n\t\t%s = vec4(0.0);", outputColor);
+    fragBuilder->codeAppendf("\n\t\t%s = vec4(0.0);", args.fOutputColor);
 
     if (fStitchTiles) {
         // Set up TurbulenceInitial stitch values.
-        builder->fsCodeAppendf("\n\t\tvec2 %s = %s;", stitchData, stitchDataUni);
+        fragBuilder->codeAppendf("\n\t\tvec2 %s = %s;", stitchData, stitchDataUni);
     }
 
-    builder->fsCodeAppendf("\n\t\tfloat %s = 1.0;", ratio);
+    fragBuilder->codeAppendf("\n\t\tfloat %s = 1.0;", ratio);
 
     // Loop over all octaves
-    builder->fsCodeAppendf("\n\t\tfor (int octave = 0; octave < %d; ++octave) {", fNumOctaves);
+    fragBuilder->codeAppendf("\n\t\tfor (int octave = 0; octave < %d; ++octave) {", fNumOctaves);
 
-    builder->fsCodeAppendf("\n\t\t\t%s += ", outputColor);
+    fragBuilder->codeAppendf("\n\t\t\t%s += ", args.fOutputColor);
     if (fType != SkPerlinNoiseShader::kFractalNoise_Type) {
-        builder->fsCodeAppend("abs(");
+        fragBuilder->codeAppend("abs(");
     }
     if (fStitchTiles) {
-        builder->fsCodeAppendf(
+        fragBuilder->codeAppendf(
             "vec4(\n\t\t\t\t%s(%s, %s, %s),\n\t\t\t\t%s(%s, %s, %s),"
                  "\n\t\t\t\t%s(%s, %s, %s),\n\t\t\t\t%s(%s, %s, %s))",
             noiseFuncName.c_str(), chanCoordR, noiseVec, stitchData,
@@ -863,7 +831,7 @@ void GrGLPerlinNoise::emitCode(GrGLShaderBuilder* builder,
             noiseFuncName.c_str(), chanCoordB, noiseVec, stitchData,
             noiseFuncName.c_str(), chanCoordA, noiseVec, stitchData);
     } else {
-        builder->fsCodeAppendf(
+        fragBuilder->codeAppendf(
             "vec4(\n\t\t\t\t%s(%s, %s),\n\t\t\t\t%s(%s, %s),"
                  "\n\t\t\t\t%s(%s, %s),\n\t\t\t\t%s(%s, %s))",
             noiseFuncName.c_str(), chanCoordR, noiseVec,
@@ -872,36 +840,37 @@ void GrGLPerlinNoise::emitCode(GrGLShaderBuilder* builder,
             noiseFuncName.c_str(), chanCoordA, noiseVec);
     }
     if (fType != SkPerlinNoiseShader::kFractalNoise_Type) {
-        builder->fsCodeAppendf(")"); // end of "abs("
+        fragBuilder->codeAppendf(")"); // end of "abs("
     }
-    builder->fsCodeAppendf(" * %s;", ratio);
+    fragBuilder->codeAppendf(" * %s;", ratio);
 
-    builder->fsCodeAppendf("\n\t\t\t%s *= vec2(2.0);", noiseVec);
-    builder->fsCodeAppendf("\n\t\t\t%s *= 0.5;", ratio);
+    fragBuilder->codeAppendf("\n\t\t\t%s *= vec2(2.0);", noiseVec);
+    fragBuilder->codeAppendf("\n\t\t\t%s *= 0.5;", ratio);
 
     if (fStitchTiles) {
-        builder->fsCodeAppendf("\n\t\t\t%s *= vec2(2.0);", stitchData);
+        fragBuilder->codeAppendf("\n\t\t\t%s *= vec2(2.0);", stitchData);
     }
-    builder->fsCodeAppend("\n\t\t}"); // end of the for loop on octaves
+    fragBuilder->codeAppend("\n\t\t}"); // end of the for loop on octaves
 
     if (fType == SkPerlinNoiseShader::kFractalNoise_Type) {
         // The value of turbulenceFunctionResult comes from ((turbulenceFunctionResult) + 1) / 2
         // by fractalNoise and (turbulenceFunctionResult) by turbulence.
-        builder->fsCodeAppendf("\n\t\t%s = %s * vec4(0.5) + vec4(0.5);", outputColor, outputColor);
+        fragBuilder->codeAppendf("\n\t\t%s = %s * vec4(0.5) + vec4(0.5);",
+                                 args.fOutputColor,args.fOutputColor);
     }
 
-    builder->fsCodeAppendf("\n\t\t%s.a *= %s;", outputColor, alphaUni);
-
     // Clamp values
-    builder->fsCodeAppendf("\n\t\t%s = clamp(%s, 0.0, 1.0);", outputColor, outputColor);
+    fragBuilder->codeAppendf("\n\t\t%s = clamp(%s, 0.0, 1.0);", args.fOutputColor, args.fOutputColor);
 
     // Pre-multiply the result
-    builder->fsCodeAppendf("\n\t\t%s = vec4(%s.rgb * %s.aaa, %s.a);\n",
-                  outputColor, outputColor, outputColor, outputColor);
+    fragBuilder->codeAppendf("\n\t\t%s = vec4(%s.rgb * %s.aaa, %s.a);\n",
+                             args.fOutputColor, args.fOutputColor,
+                             args.fOutputColor, args.fOutputColor);
 }
 
-void GrGLPerlinNoise::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&, GrEffectKeyBuilder* b) {
-    const GrPerlinNoiseEffect& turbulence = drawEffect.castEffect<GrPerlinNoiseEffect>();
+void GrGLPerlinNoise::GenKey(const GrProcessor& processor, const GrGLSLCaps&,
+                             GrProcessorKeyBuilder* b) {
+    const GrPerlinNoiseEffect& turbulence = processor.cast<GrPerlinNoiseEffect>();
 
     uint32_t key = turbulence.numOctaves();
 
@@ -926,94 +895,77 @@ void GrGLPerlinNoise::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&, Gr
     b->add32(key);
 }
 
-void GrGLPerlinNoise::setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) {
-    INHERITED::setData(uman, drawEffect);
+void GrGLPerlinNoise::onSetData(const GrGLSLProgramDataManager& pdman,
+                                const GrProcessor& processor) {
+    INHERITED::onSetData(pdman, processor);
 
-    const GrPerlinNoiseEffect& turbulence = drawEffect.castEffect<GrPerlinNoiseEffect>();
+    const GrPerlinNoiseEffect& turbulence = processor.cast<GrPerlinNoiseEffect>();
 
     const SkVector& baseFrequency = turbulence.baseFrequency();
-    uman.set2f(fBaseFrequencyUni, baseFrequency.fX, baseFrequency.fY);
-    uman.set1f(fAlphaUni, SkScalarDiv(SkIntToScalar(turbulence.alpha()), SkIntToScalar(255)));
+    pdman.set2f(fBaseFrequencyUni, baseFrequency.fX, baseFrequency.fY);
 
     if (turbulence.stitchTiles()) {
         const SkPerlinNoiseShader::StitchData& stitchData = turbulence.stitchData();
-        uman.set2f(fStitchDataUni, SkIntToScalar(stitchData.fWidth),
+        pdman.set2f(fStitchDataUni, SkIntToScalar(stitchData.fWidth),
                                    SkIntToScalar(stitchData.fHeight));
     }
 }
 
 /////////////////////////////////////////////////////////////////////
-
-bool SkPerlinNoiseShader::asNewEffect(GrContext* context, const SkPaint& paint,
-                                      const SkMatrix* externalLocalMatrix, GrColor* paintColor,
-                                      GrEffect** effect) const {
-    SkASSERT(NULL != context);
-    
-    *paintColor = SkColor2GrColorJustAlpha(paint.getColor());
+const GrFragmentProcessor* SkPerlinNoiseShader::asFragmentProcessor(
+                                                    GrContext* context,
+                                                    const SkMatrix& viewM,
+                                                    const SkMatrix* externalLocalMatrix,
+                                                    SkFilterQuality) const {
+    SkASSERT(context);
 
     SkMatrix localMatrix = this->getLocalMatrix();
     if (externalLocalMatrix) {
         localMatrix.preConcat(*externalLocalMatrix);
     }
 
-    SkMatrix matrix = context->getMatrix();
+    SkMatrix matrix = viewM;
     matrix.preConcat(localMatrix);
 
     if (0 == fNumOctaves) {
-        SkColor clearColor = 0;
         if (kFractalNoise_Type == fType) {
-            clearColor = SkColorSetARGB(paint.getAlpha() / 2, 127, 127, 127);
+            // Extract the incoming alpha and emit rgba = (a/4, a/4, a/4, a/2)
+            SkAutoTUnref<const GrFragmentProcessor> inner(
+                GrConstColorProcessor::Create(0x80404040,
+                                              GrConstColorProcessor::kModulateRGBA_InputMode));
+            return GrFragmentProcessor::MulOutputByInputAlpha(inner);
         }
-        SkAutoTUnref<SkColorFilter> cf(SkColorFilter::CreateModeFilter(
-                                                clearColor, SkXfermode::kSrc_Mode));
-        *effect = cf->asNewEffect(context);
-        return true;
+        // Emit zero.
+        return GrConstColorProcessor::Create(0x0, GrConstColorProcessor::kIgnore_InputMode);
     }
 
     // Either we don't stitch tiles, either we have a valid tile size
     SkASSERT(!fStitchTiles || !fTileSize.isEmpty());
 
-    SkPerlinNoiseShader::PaintingData* paintingData = SkNEW_ARGS(PaintingData, (fTileSize, fSeed, fBaseFrequencyX, fBaseFrequencyY, matrix));
-    GrTexture* permutationsTexture = GrLockAndRefCachedBitmapTexture(
-        context, paintingData->getPermutationsBitmap(), NULL);
-    GrTexture* noiseTexture = GrLockAndRefCachedBitmapTexture(
-        context, paintingData->getNoiseBitmap(), NULL);
+    SkPerlinNoiseShader::PaintingData* paintingData =
+            new PaintingData(fTileSize, fSeed, fBaseFrequencyX, fBaseFrequencyY, matrix);
+    SkAutoTUnref<GrTexture> permutationsTexture(
+        GrRefCachedBitmapTexture(context, paintingData->getPermutationsBitmap(),
+                                 GrTextureParams::ClampNoFilter()));
+    SkAutoTUnref<GrTexture> noiseTexture(
+        GrRefCachedBitmapTexture(context, paintingData->getNoiseBitmap(),
+                                 GrTextureParams::ClampNoFilter()));
 
-    SkMatrix m = context->getMatrix();
+    SkMatrix m = viewM;
     m.setTranslateX(-localMatrix.getTranslateX() + SK_Scalar1);
     m.setTranslateY(-localMatrix.getTranslateY() + SK_Scalar1);
-    if ((NULL != permutationsTexture) && (NULL != noiseTexture)) {
-        *effect = GrPerlinNoiseEffect::Create(fType,
-                                                fNumOctaves,
-                                                fStitchTiles,
-                                                paintingData,
-                                                permutationsTexture, noiseTexture,
-                                                m, paint.getAlpha());
-    } else {
-        SkDELETE(paintingData);
-        *effect = NULL;
+    if ((permutationsTexture) && (noiseTexture)) {
+        SkAutoTUnref<GrFragmentProcessor> inner(
+            GrPerlinNoiseEffect::Create(fType,
+                                        fNumOctaves,
+                                        fStitchTiles,
+                                        paintingData,
+                                        permutationsTexture, noiseTexture,
+                                        m));
+        return GrFragmentProcessor::MulOutputByInputAlpha(inner);
     }
-
-    // Unlock immediately, this is not great, but we don't have a way of
-    // knowing when else to unlock it currently. TODO: Remove this when
-    // unref becomes the unlock replacement for all types of textures.
-    if (NULL != permutationsTexture) {
-        GrUnlockAndUnrefCachedBitmapTexture(permutationsTexture);
-    }
-    if (NULL != noiseTexture) {
-        GrUnlockAndUnrefCachedBitmapTexture(noiseTexture);
-    }
-
-    return true;
-}
-
-#else
-
-bool SkPerlinNoiseShader::asNewEffect(GrContext* context, const SkPaint& paint,
-                                      const SkMatrix* externalLocalMatrix, GrColor* paintColor,
-                                      GrEffect** effect) const {
-    SkDEBUGFAIL("Should not call in GPU-less build");
-    return false;
+    delete paintingData;
+    return nullptr;
 }
 
 #endif
diff --git a/gfx/skia/skia/src/effects/SkPictureImageFilter.cpp b/gfx/skia/skia/src/effects/SkPictureImageFilter.cpp
index d0f4d54308cc..d85024e22542 100644
--- a/gfx/skia/skia/src/effects/SkPictureImageFilter.cpp
+++ b/gfx/skia/skia/src/effects/SkPictureImageFilter.cpp
@@ -9,53 +9,79 @@
 #include "SkDevice.h"
 #include "SkCanvas.h"
 #include "SkReadBuffer.h"
+#include "SkSurfaceProps.h"
 #include "SkWriteBuffer.h"
 #include "SkValidationUtils.h"
 
 SkPictureImageFilter::SkPictureImageFilter(const SkPicture* picture)
-  : INHERITED(0, 0),
-    fPicture(picture),
-    fCropRect(SkRect::MakeWH(picture ? SkIntToScalar(picture->width()) : 0,
-                             picture ? SkIntToScalar(picture->height()) : 0)) {
-    SkSafeRef(fPicture);
+    : INHERITED(0, 0, nullptr)
+    , fPicture(SkSafeRef(picture))
+    , fCropRect(picture ? picture->cullRect() : SkRect::MakeEmpty())
+    , fPictureResolution(kDeviceSpace_PictureResolution) 
+    , fFilterQuality(kLow_SkFilterQuality) {
 }
 
-SkPictureImageFilter::SkPictureImageFilter(const SkPicture* picture, const SkRect& cropRect)
-  : INHERITED(0, 0),
-    fPicture(picture),
-    fCropRect(cropRect) {
-    SkSafeRef(fPicture);
+SkPictureImageFilter::SkPictureImageFilter(const SkPicture* picture, const SkRect& cropRect,
+                                           PictureResolution pictureResolution,
+                                           SkFilterQuality filterQuality)
+    : INHERITED(0, 0, nullptr)
+    , fPicture(SkSafeRef(picture))
+    , fCropRect(cropRect)
+    , fPictureResolution(pictureResolution)
+    , fFilterQuality(filterQuality) {
 }
 
 SkPictureImageFilter::~SkPictureImageFilter() {
     SkSafeUnref(fPicture);
 }
 
-SkPictureImageFilter::SkPictureImageFilter(SkReadBuffer& buffer)
-  : INHERITED(0, buffer),
-    fPicture(NULL) {
-    if (!buffer.isCrossProcess()) {
-        if (buffer.readBool()) {
-            fPicture = SkPicture::CreateFromBuffer(buffer);
-        }
-    } else {
+SkFlattenable* SkPictureImageFilter::CreateProc(SkReadBuffer& buffer) {
+    SkAutoTUnref<SkPicture> picture;
+    SkRect cropRect;
+
+    if (buffer.isCrossProcess() && SkPicture::PictureIOSecurityPrecautionsEnabled()) {
         buffer.validate(!buffer.readBool());
+    } else {
+        if (buffer.readBool()) {
+            picture.reset(SkPicture::CreateFromBuffer(buffer));
+        }
     }
-    buffer.readRect(&fCropRect);
+    buffer.readRect(&cropRect);
+    PictureResolution pictureResolution;
+    if (buffer.isVersionLT(SkReadBuffer::kPictureImageFilterResolution_Version)) {
+        pictureResolution = kDeviceSpace_PictureResolution;
+    } else {
+        pictureResolution = (PictureResolution)buffer.readInt();
+    }  
+
+    if (kLocalSpace_PictureResolution == pictureResolution) {
+        //filterLevel is only serialized if pictureResolution is LocalSpace
+        SkFilterQuality filterQuality;
+        if (buffer.isVersionLT(SkReadBuffer::kPictureImageFilterLevel_Version)) {
+            filterQuality = kLow_SkFilterQuality;
+        } else {
+            filterQuality = (SkFilterQuality)buffer.readInt();
+        }
+        return CreateForLocalSpace(picture, cropRect, filterQuality);
+    }
+    return Create(picture, cropRect);
 }
 
 void SkPictureImageFilter::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
-    if (!buffer.isCrossProcess()) {
-        bool hasPicture = (fPicture != NULL);
+    if (buffer.isCrossProcess() && SkPicture::PictureIOSecurityPrecautionsEnabled()) {
+        buffer.writeBool(false);
+    } else {
+        bool hasPicture = (fPicture != nullptr);
         buffer.writeBool(hasPicture);
         if (hasPicture) {
             fPicture->flatten(buffer);
         }
-    } else {
-        buffer.writeBool(false);
     }
     buffer.writeRect(fCropRect);
+    buffer.writeInt(fPictureResolution);
+    if (kLocalSpace_PictureResolution == fPictureResolution) {
+        buffer.writeInt(fFilterQuality);
+    }
 }
 
 bool SkPictureImageFilter::onFilterImage(Proxy* proxy, const SkBitmap&, const Context& ctx,
@@ -66,9 +92,11 @@ bool SkPictureImageFilter::onFilterImage(Proxy* proxy, const SkBitmap&, const Co
     }
 
     SkRect floatBounds;
-    SkIRect bounds;
     ctx.ctm().mapRect(&floatBounds, fCropRect);
-    floatBounds.roundOut(&bounds);
+    SkIRect bounds = floatBounds.roundOut();
+    if (!bounds.intersect(ctx.clipBounds())) {
+        return false;
+    }
 
     if (bounds.isEmpty()) {
         offset->fX = offset->fY = 0;
@@ -76,16 +104,16 @@ bool SkPictureImageFilter::onFilterImage(Proxy* proxy, const SkBitmap&, const Co
     }
 
     SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(), bounds.height()));
-    if (NULL == device.get()) {
+    if (nullptr == device.get()) {
         return false;
     }
 
-    SkCanvas canvas(device.get());
-    SkPaint paint;
-
-    canvas.translate(-SkIntToScalar(bounds.fLeft), -SkIntToScalar(bounds.fTop));
-    canvas.concat(ctx.ctm());
-    canvas.drawPicture(fPicture);
+    if (kDeviceSpace_PictureResolution == fPictureResolution || 
+        0 == (ctx.ctm().getType() & ~SkMatrix::kTranslate_Mask)) {
+        this->drawPictureAtDeviceResolution(device.get(), bounds, ctx);        
+    } else {
+        this->drawPictureAtLocalResolution(proxy, device.get(), bounds, ctx);
+    }
 
     *result = device.get()->accessBitmap(false);
     offset->fX = bounds.fLeft;
@@ -93,9 +121,56 @@ bool SkPictureImageFilter::onFilterImage(Proxy* proxy, const SkBitmap&, const Co
     return true;
 }
 
-bool SkPictureImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm,
-                                          SkIRect* dst) const {
-    *dst = src;
-    return true;
+void SkPictureImageFilter::drawPictureAtDeviceResolution(SkBaseDevice* device,
+                                                         const SkIRect& deviceBounds,
+                                                         const Context& ctx) const {
+    SkCanvas canvas(device);
+
+    canvas.translate(-SkIntToScalar(deviceBounds.fLeft), -SkIntToScalar(deviceBounds.fTop));
+    canvas.concat(ctx.ctm());
+    canvas.drawPicture(fPicture);
 }
 
+void SkPictureImageFilter::drawPictureAtLocalResolution(Proxy* proxy, SkBaseDevice* device,
+                                                        const SkIRect& deviceBounds,
+                                                        const Context& ctx) const {
+    SkMatrix inverseCtm;
+    if (!ctx.ctm().invert(&inverseCtm)) {
+        return;
+    }
+
+    SkRect localBounds = SkRect::Make(ctx.clipBounds());
+    inverseCtm.mapRect(&localBounds);
+    if (!localBounds.intersect(fCropRect)) {
+        return;
+    }
+    SkIRect localIBounds = localBounds.roundOut();
+    SkAutoTUnref<SkBaseDevice> localDevice(proxy->createDevice(localIBounds.width(), localIBounds.height()));
+
+    SkCanvas localCanvas(localDevice);
+    localCanvas.translate(-SkIntToScalar(localIBounds.fLeft), -SkIntToScalar(localIBounds.fTop));
+    localCanvas.drawPicture(fPicture);
+
+    SkCanvas canvas(device);
+
+    canvas.translate(-SkIntToScalar(deviceBounds.fLeft), -SkIntToScalar(deviceBounds.fTop));
+    canvas.concat(ctx.ctm());
+    SkPaint paint;
+    paint.setFilterQuality(fFilterQuality);
+    canvas.drawBitmap(localDevice.get()->accessBitmap(false), SkIntToScalar(localIBounds.fLeft),
+                      SkIntToScalar(localIBounds.fTop), &paint);
+}
+
+#ifndef SK_IGNORE_TO_STRING
+void SkPictureImageFilter::toString(SkString* str) const {
+    str->appendf("SkPictureImageFilter: (");
+    str->appendf("crop: (%f,%f,%f,%f) ", 
+                 fCropRect.fLeft, fCropRect.fTop, fCropRect.fRight, fCropRect.fBottom);
+    if (fPicture) {
+        str->appendf("picture: (%f,%f,%f,%f)",
+                     fPicture->cullRect().fLeft, fPicture->cullRect().fTop,
+                     fPicture->cullRect().fRight, fPicture->cullRect().fBottom);
+    }
+    str->append(")");
+}
+#endif
diff --git a/gfx/skia/skia/src/effects/SkPixelXorXfermode.cpp b/gfx/skia/skia/src/effects/SkPixelXorXfermode.cpp
index 129f1823d5fc..2a6ac47aac4f 100644
--- a/gfx/skia/skia/src/effects/SkPixelXorXfermode.cpp
+++ b/gfx/skia/skia/src/effects/SkPixelXorXfermode.cpp
@@ -22,13 +22,11 @@ SkPMColor SkPixelXorXfermode::xferColor(SkPMColor src, SkPMColor dst) const {
 }
 
 void SkPixelXorXfermode::flatten(SkWriteBuffer& wb) const {
-    this->INHERITED::flatten(wb);
     wb.writeColor(fOpColor);
 }
 
-SkPixelXorXfermode::SkPixelXorXfermode(SkReadBuffer& rb)
-        : INHERITED(rb) {
-    fOpColor = rb.readColor();
+SkFlattenable* SkPixelXorXfermode::CreateProc(SkReadBuffer& buffer) {
+    return Create(buffer.readColor());
 }
 
 #ifndef SK_IGNORE_TO_STRING
diff --git a/gfx/skia/skia/src/effects/SkPorterDuff.cpp b/gfx/skia/skia/src/effects/SkPorterDuff.cpp
deleted file mode 100644
index 4cdcf798a1c5..000000000000
--- a/gfx/skia/skia/src/effects/SkPorterDuff.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#include "SkPorterDuff.h"
-#include "SkXfermode.h"
-
-/*  This file just exists as a compatibility layer, gluing the PorterDuff API
-    into the (extended) SkXfermode API
- */
-
-#define MAKE_PAIR(mode) { SkPorterDuff::k##mode##_Mode, SkXfermode::k##mode##_Mode }
-
-// this table must be in SkPorterDuff::Mode order, so it can be indexed directly
-// with a porterduff mode.
-static const struct Pair {
-    SkPorterDuff::Mode  fPD;
-    SkXfermode::Mode    fXF;
-} gPairs[] = {
-    MAKE_PAIR(Clear),
-    MAKE_PAIR(Src),
-    MAKE_PAIR(Dst),
-    MAKE_PAIR(SrcOver),
-    MAKE_PAIR(DstOver),
-    MAKE_PAIR(SrcIn),
-    MAKE_PAIR(DstIn),
-    MAKE_PAIR(SrcOut),
-    MAKE_PAIR(DstOut),
-    MAKE_PAIR(SrcATop),
-    MAKE_PAIR(DstATop),
-    MAKE_PAIR(Xor),
-    MAKE_PAIR(Darken),
-    MAKE_PAIR(Lighten),
-    MAKE_PAIR(Modulate),
-    MAKE_PAIR(Screen),
-    { SkPorterDuff::kAdd_Mode, SkXfermode::kPlus_Mode },
-#ifdef SK_BUILD_FOR_ANDROID
-    MAKE_PAIR(Overlay),
-#endif
-};
-
-static bool find_pdmode(SkXfermode::Mode src, SkPorterDuff::Mode* dst) {
-    const Pair* pairs = gPairs;
-    for (size_t i = 0; i < SK_ARRAY_COUNT(gPairs); i++) {
-        if (pairs[i].fXF == src) {
-            if (dst) {
-                *dst = pairs[i].fPD;
-            }
-            return true;
-        }
-    }
-    return false;
-}
-
-SkXfermode::Mode SkPorterDuff::ToXfermodeMode(Mode mode) {
-    SkASSERT((unsigned)mode < SkPorterDuff::kModeCount);
-    const Pair& pair = gPairs[mode];
-    SkASSERT(pair.fPD == mode);
-    return pair.fXF;
-}
-
-SkXfermode* SkPorterDuff::CreateXfermode(SkPorterDuff::Mode mode) {
-    const Pair& pair = gPairs[mode];
-    SkASSERT(pair.fPD == mode);
-    return SkXfermode::Create(pair.fXF);
-}
-
-bool SkPorterDuff::IsMode(SkXfermode* xfer, Mode* pdmode) {
-    SkXfermode::Mode xfmode;
-    if (!SkXfermode::AsMode(xfer, &xfmode)) {
-        return false;
-    }
-    return find_pdmode(xfmode, pdmode);
-}
-
-SkXfermodeProc SkPorterDuff::GetXfermodeProc(Mode mode) {
-    return SkXfermode::GetProc(gPairs[mode].fXF);
-}
-
-SkXfermodeProc16 SkPorterDuff::GetXfermodeProc16(Mode mode, SkColor srcColor) {
-    return SkXfermode::GetProc16(gPairs[mode].fXF, srcColor);
-}
diff --git a/gfx/skia/skia/src/effects/SkRectShaderImageFilter.cpp b/gfx/skia/skia/src/effects/SkRectShaderImageFilter.cpp
index 6961facc10b4..14837d02b156 100644
--- a/gfx/skia/skia/src/effects/SkRectShaderImageFilter.cpp
+++ b/gfx/skia/skia/src/effects/SkRectShaderImageFilter.cpp
@@ -13,41 +13,39 @@
 #include "SkWriteBuffer.h"
 #include "SkShader.h"
 
-SkRectShaderImageFilter* SkRectShaderImageFilter::Create(SkShader* s, const SkRect& rect) {
+SkImageFilter* SkRectShaderImageFilter::Create(SkShader* s, const SkRect& rect) {
     SkASSERT(s);
     uint32_t flags = CropRect::kHasAll_CropEdge;
     if (rect.width() == 0 || rect.height() == 0) {
         flags = 0x0;
     }
     CropRect cropRect(rect, flags);
-    return SkNEW_ARGS(SkRectShaderImageFilter, (s, &cropRect));
+    return s ? new SkRectShaderImageFilter(s, &cropRect) : nullptr;
 }
 
-SkRectShaderImageFilter* SkRectShaderImageFilter::Create(SkShader* s, const CropRect* cropRect) {
+SkImageFilter* SkRectShaderImageFilter::Create(SkShader* s, const CropRect* cropRect) {
     SkASSERT(s);
-    return SkNEW_ARGS(SkRectShaderImageFilter, (s, cropRect));
+    return s ? new SkRectShaderImageFilter(s, cropRect) : nullptr;
 }
 
 SkRectShaderImageFilter::SkRectShaderImageFilter(SkShader* s, const CropRect* cropRect)
-  : INHERITED(0, NULL, cropRect)
-  , fShader(s) {
-    SkASSERT(s);
-    s->ref();
+  : INHERITED(0, nullptr, cropRect)
+  , fShader(SkRef(s)) {
 }
 
-SkRectShaderImageFilter::SkRectShaderImageFilter(SkReadBuffer& buffer)
-  : INHERITED(0, buffer) {
-    fShader = buffer.readShader();
+SkFlattenable* SkRectShaderImageFilter::CreateProc(SkReadBuffer& buffer) {
+    SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 0);
+    SkAutoTUnref<SkShader> shader(buffer.readShader());
+    return Create(shader.get(), &common.cropRect());
 }
 
 void SkRectShaderImageFilter::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
-
     buffer.writeFlattenable(fShader);
 }
 
 SkRectShaderImageFilter::~SkRectShaderImageFilter() {
-    SkSafeUnref(fShader);
+    fShader->unref();
 }
 
 bool SkRectShaderImageFilter::onFilterImage(Proxy* proxy,
@@ -62,7 +60,7 @@ bool SkRectShaderImageFilter::onFilterImage(Proxy* proxy,
 
     SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(),
                                                           bounds.height()));
-    if (NULL == device.get()) {
+    if (nullptr == device.get()) {
         return false;
     }
     SkCanvas canvas(device.get());
@@ -70,7 +68,7 @@ bool SkRectShaderImageFilter::onFilterImage(Proxy* proxy,
     SkPaint paint;
     SkMatrix matrix(ctx.ctm());
     matrix.postTranslate(SkIntToScalar(-bounds.left()), SkIntToScalar(-bounds.top()));
-    paint.setShader(SkShader::CreateLocalMatrixShader(fShader, matrix))->unref();
+    SkSafeUnref(paint.setShader(SkShader::CreateLocalMatrixShader(fShader, matrix)));
 
     SkRect rect = SkRect::MakeWH(SkIntToScalar(bounds.width()), SkIntToScalar(bounds.height()));
     canvas.drawRect(rect, paint);
@@ -80,3 +78,14 @@ bool SkRectShaderImageFilter::onFilterImage(Proxy* proxy,
     offset->fY = bounds.fTop;
     return true;
 }
+
+bool SkRectShaderImageFilter::affectsTransparentBlack() const {
+    return true;
+}
+
+#ifndef SK_IGNORE_TO_STRING
+void SkRectShaderImageFilter::toString(SkString* str) const {
+    str->appendf("SkRectShaderImageFilter: (");
+    str->append(")");
+}
+#endif
diff --git a/gfx/skia/skia/src/effects/SkStippleMaskFilter.cpp b/gfx/skia/skia/src/effects/SkStippleMaskFilter.cpp
deleted file mode 100644
index 4aceb110662d..000000000000
--- a/gfx/skia/skia/src/effects/SkStippleMaskFilter.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkStippleMaskFilter.h"
-#include "SkString.h"
-
-bool SkStippleMaskFilter::filterMask(SkMask* dst,
-                                     const SkMask& src,
-                                     const SkMatrix& matrix,
-                                     SkIPoint* margin) const {
-
-    if (src.fFormat != SkMask::kA8_Format) {
-        return false;
-    }
-
-    dst->fBounds = src.fBounds;
-    dst->fRowBytes = dst->fBounds.width();
-    dst->fFormat = SkMask::kA8_Format;
-    dst->fImage = NULL;
-
-    if (NULL != src.fImage) {
-        size_t dstSize = dst->computeImageSize();
-        if (0 == dstSize) {
-            return false;   // too big to allocate, abort
-        }
-
-        dst->fImage = SkMask::AllocImage(dstSize);
-
-        uint8_t* srcScanLine = src.fImage;
-        uint8_t* scanline = dst->fImage;
-
-        for (int y = 0; y < src.fBounds.height(); ++y) {
-            for (int x = 0; x < src.fBounds.width(); ++x) {
-                scanline[x] = srcScanLine[x] && ((x+y) & 0x1) ? 0xFF : 0x00;
-            }
-            scanline += dst->fRowBytes;
-            srcScanLine += src.fRowBytes;
-        }
-    }
-
-    return true;
-}
-
-#ifndef SK_IGNORE_TO_STRING
-void SkStippleMaskFilter::toString(SkString* str) const {
-    str->append("SkStippleMaskFilter: ()");
-}
-#endif
diff --git a/gfx/skia/skia/src/effects/SkTableColorFilter.cpp b/gfx/skia/skia/src/effects/SkTableColorFilter.cpp
index e9ce20f6c1d3..9d97411042f7 100644
--- a/gfx/skia/skia/src/effects/SkTableColorFilter.cpp
+++ b/gfx/skia/skia/src/effects/SkTableColorFilter.cpp
@@ -1,17 +1,24 @@
+/*
+* Copyright 2015 Google Inc.
+*
+* Use of this source code is governed by a BSD-style license that can be
+* found in the LICENSE file.
+*/
+
+#include "SkTableColorFilter.h"
 
 #include "SkBitmap.h"
-#include "SkTableColorFilter.h"
 #include "SkColorPriv.h"
 #include "SkReadBuffer.h"
-#include "SkWriteBuffer.h"
-#include "SkUnPreMultiply.h"
 #include "SkString.h"
+#include "SkUnPreMultiply.h"
+#include "SkWriteBuffer.h"
 
 class SkTable_ColorFilter : public SkColorFilter {
 public:
     SkTable_ColorFilter(const uint8_t tableA[], const uint8_t tableR[],
                         const uint8_t tableG[], const uint8_t tableB[]) {
-        fBitmap = NULL;
+        fBitmap = nullptr;
         fFlags = 0;
 
         uint8_t* dst = fStorage;
@@ -36,18 +43,16 @@ public:
         }
     }
 
-    virtual ~SkTable_ColorFilter() {
-        SkDELETE(fBitmap);
-    }
+    virtual ~SkTable_ColorFilter() { delete fBitmap; }
 
-    virtual bool asComponentTable(SkBitmap* table) const SK_OVERRIDE;
+    bool asComponentTable(SkBitmap* table) const override;
+    SkColorFilter* newComposed(const SkColorFilter* inner) const override;
 
 #if SK_SUPPORT_GPU
-    virtual GrEffect* asNewEffect(GrContext* context) const SK_OVERRIDE;
+    const GrFragmentProcessor* asFragmentProcessor(GrContext*) const override;
 #endif
 
-    virtual void filterSpan(const SkPMColor src[], int count,
-                            SkPMColor dst[]) const SK_OVERRIDE;
+    void filterSpan(const SkPMColor src[], int count, SkPMColor dst[]) const override;
 
     SK_TO_STRING_OVERRIDE()
 
@@ -61,8 +66,7 @@ public:
     };
 
 protected:
-    SkTable_ColorFilter(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
 
 private:
     mutable const SkBitmap* fBitmap; // lazily allocated
@@ -70,6 +74,8 @@ private:
     uint8_t fStorage[256 * 4];
     unsigned fFlags;
 
+    friend class SkTableColorFilter;
+
     typedef SkColorFilter INHERITED;
 };
 
@@ -108,8 +114,7 @@ static const uint8_t gIdentityTable[] = {
     0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
 };
 
-void SkTable_ColorFilter::filterSpan(const SkPMColor src[], int count,
-                                     SkPMColor dst[]) const {
+void SkTable_ColorFilter::filterSpan(const SkPMColor src[], int count, SkPMColor dst[]) const {
     const uint8_t* table = fStorage;
     const uint8_t* tableA = gIdentityTable;
     const uint8_t* tableR = gIdentityTable;
@@ -154,7 +159,32 @@ void SkTable_ColorFilter::filterSpan(const SkPMColor src[], int count,
 
 #ifndef SK_IGNORE_TO_STRING
 void SkTable_ColorFilter::toString(SkString* str) const {
-    str->append("SkTable_ColorFilter");
+    const uint8_t* table = fStorage;
+    const uint8_t* tableA = gIdentityTable;
+    const uint8_t* tableR = gIdentityTable;
+    const uint8_t* tableG = gIdentityTable;
+    const uint8_t* tableB = gIdentityTable;
+    if (fFlags & kA_Flag) {
+        tableA = table; table += 256;
+    }
+    if (fFlags & kR_Flag) {
+        tableR = table; table += 256;
+    }
+    if (fFlags & kG_Flag) {
+        tableG = table; table += 256;
+    }
+    if (fFlags & kB_Flag) {
+        tableB = table;
+    }
+
+    str->append("SkTable_ColorFilter (");
+
+    for (int i = 0; i < 256; ++i) {
+        str->appendf("%d: %d,%d,%d,%d\n",
+                     i, tableR[i], tableG[i], tableB[i], tableA[i]);
+    }
+
+    str->append(")");
 }
 #endif
 
@@ -168,42 +198,66 @@ static const uint8_t gCountNibBits[] = {
 #include "SkPackBits.h"
 
 void SkTable_ColorFilter::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
-
     uint8_t storage[5*256];
     int count = gCountNibBits[fFlags & 0xF];
-    size_t size = SkPackBits::Pack8(fStorage, count * 256, storage);
-    SkASSERT(size <= sizeof(storage));
+    size_t size = SkPackBits::Pack8(fStorage, count * 256, storage,
+                                    sizeof(storage));
 
-//    SkDebugf("raw %d packed %d\n", count * 256, size);
-
-    buffer.writeInt(fFlags);
+    buffer.write32(fFlags);
     buffer.writeByteArray(storage, size);
 }
 
-SkTable_ColorFilter::SkTable_ColorFilter(SkReadBuffer& buffer) : INHERITED(buffer) {
-    fBitmap = NULL;
+SkFlattenable* SkTable_ColorFilter::CreateProc(SkReadBuffer& buffer) {
+    const int flags = buffer.read32();
+    const size_t count = gCountNibBits[flags & 0xF];
+    SkASSERT(count <= 4);
 
-    uint8_t storage[5*256];
+    uint8_t packedStorage[5*256];
+    size_t packedSize = buffer.getArrayCount();
+    if (!buffer.validate(packedSize <= sizeof(packedStorage))) {
+        return nullptr;
+    }
+    if (!buffer.readByteArray(packedStorage, packedSize)) {
+        return nullptr;
+    }
 
-    fFlags = buffer.readInt();
+    uint8_t unpackedStorage[4*256];
+    size_t unpackedSize = SkPackBits::Unpack8(packedStorage, packedSize,
+                              unpackedStorage, sizeof(unpackedStorage));
+    // now check that we got the size we expected
+    if (!buffer.validate(unpackedSize == count*256)) {
+        return nullptr;
+    }
 
-    size_t size = buffer.getArrayCount();
-    SkASSERT(size <= sizeof(storage));
-    buffer.validate(size <= sizeof(storage));
-    buffer.readByteArray(storage, size);
+    const uint8_t* a = nullptr;
+    const uint8_t* r = nullptr;
+    const uint8_t* g = nullptr;
+    const uint8_t* b = nullptr;
+    const uint8_t* ptr = unpackedStorage;
 
-    SkDEBUGCODE(size_t raw = ) SkPackBits::Unpack8(storage, size, fStorage);
-
-    SkASSERT(raw <= sizeof(fStorage));
-    SkDEBUGCODE(size_t count = gCountNibBits[fFlags & 0xF]);
-    SkASSERT(raw == count * 256);
+    if (flags & kA_Flag) {
+        a = ptr;
+        ptr += 256;
+    }
+    if (flags & kR_Flag) {
+        r = ptr;
+        ptr += 256;
+    }
+    if (flags & kG_Flag) {
+        g = ptr;
+        ptr += 256;
+    }
+    if (flags & kB_Flag) {
+        b = ptr;
+        ptr += 256;
+    }
+    return SkTableColorFilter::CreateARGB(a, r, g, b);
 }
 
 bool SkTable_ColorFilter::asComponentTable(SkBitmap* table) const {
     if (table) {
-        if (NULL == fBitmap) {
-            SkBitmap* bmp = SkNEW(SkBitmap);
+        if (nullptr == fBitmap) {
+            SkBitmap* bmp = new SkBitmap;
             bmp->allocPixels(SkImageInfo::MakeA8(256, 4));
             uint8_t* bitmapPixels = bmp->getAddr8(0, 0);
             int offset = 0;
@@ -225,179 +279,302 @@ bool SkTable_ColorFilter::asComponentTable(SkBitmap* table) const {
     return true;
 }
 
+// Combines the two lookup tables so that making a lookup using res[] has
+// the same effect as making a lookup through inner[] then outer[].
+static void combine_tables(uint8_t res[256], const uint8_t outer[256], const uint8_t inner[256]) {
+    for (int i = 0; i < 256; i++) {
+        res[i] = outer[inner[i]];
+    }
+}
+
+SkColorFilter* SkTable_ColorFilter::newComposed(const SkColorFilter* innerFilter) const {
+    SkBitmap innerBM;
+    if (!innerFilter->asComponentTable(&innerBM)) {
+        return nullptr;
+    }
+
+    innerBM.lockPixels();
+    if (nullptr == innerBM.getPixels()) {
+        return nullptr;
+    }
+
+    const uint8_t* table = fStorage;
+    const uint8_t* tableA = gIdentityTable;
+    const uint8_t* tableR = gIdentityTable;
+    const uint8_t* tableG = gIdentityTable;
+    const uint8_t* tableB = gIdentityTable;
+    if (fFlags & kA_Flag) {
+        tableA = table; table += 256;
+    }
+    if (fFlags & kR_Flag) {
+        tableR = table; table += 256;
+    }
+    if (fFlags & kG_Flag) {
+        tableG = table; table += 256;
+    }
+    if (fFlags & kB_Flag) {
+        tableB = table;
+    }
+
+    uint8_t concatA[256];
+    uint8_t concatR[256];
+    uint8_t concatG[256];
+    uint8_t concatB[256];
+
+    combine_tables(concatA, tableA, innerBM.getAddr8(0, 0));
+    combine_tables(concatR, tableR, innerBM.getAddr8(0, 1));
+    combine_tables(concatG, tableG, innerBM.getAddr8(0, 2));
+    combine_tables(concatB, tableB, innerBM.getAddr8(0, 3));
+
+    return SkTableColorFilter::CreateARGB(concatA, concatR, concatG, concatB);
+}
+
 #if SK_SUPPORT_GPU
 
-#include "GrEffect.h"
-#include "GrTBackendEffectFactory.h"
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
+#include "GrFragmentProcessor.h"
+#include "GrInvariantOutput.h"
 #include "SkGr.h"
+#include "effects/GrTextureStripAtlas.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
 
-class GLColorTableEffect;
-
-class ColorTableEffect : public GrEffect {
+class ColorTableEffect : public GrFragmentProcessor {
 public:
-    static GrEffect* Create(GrTexture* texture, unsigned flags) {
-        return SkNEW_ARGS(ColorTableEffect, (texture, flags));
-    }
+    static const GrFragmentProcessor* Create(GrContext* context, SkBitmap bitmap, unsigned flags);
 
     virtual ~ColorTableEffect();
 
-    static const char* Name() { return "ColorTable"; }
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
+    const char* name() const override { return "ColorTable"; }
 
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
-
-    typedef GLColorTableEffect GLEffect;
+    const GrTextureStripAtlas* atlas() const { return fAtlas; }
+    int atlasRow() const { return fRow; }
 
 private:
-    virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE;
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
 
-    explicit ColorTableEffect(GrTexture* texture, unsigned flags);
+    void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
 
-    GR_DECLARE_EFFECT_TEST;
+    bool onIsEqual(const GrFragmentProcessor&) const override;
 
-    GrTextureAccess fTextureAccess;
-    unsigned        fFlags; // currently not used in shader code, just to assist
-                            // getConstantColorComponents().
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
 
-    typedef GrEffect INHERITED;
+    ColorTableEffect(GrTexture* texture, GrTextureStripAtlas* atlas, int row, unsigned flags);
+
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+
+    GrTextureAccess         fTextureAccess;
+
+    // currently not used in shader code, just to assist onComputeInvariantOutput().
+    unsigned                fFlags;
+
+    GrTextureStripAtlas*    fAtlas;
+    int                     fRow;
+
+    typedef GrFragmentProcessor INHERITED;
 };
 
-class GLColorTableEffect : public GrGLEffect {
+class GLColorTableEffect : public GrGLSLFragmentProcessor {
 public:
-    GLColorTableEffect(const GrBackendEffectFactory&, const GrDrawEffect&);
+    GLColorTableEffect(const GrProcessor&);
 
-    virtual void emitCode(GrGLShaderBuilder*,
-                          const GrDrawEffect&,
-                          const GrEffectKey&,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    virtual void emitCode(EmitArgs&) override;
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE {}
+    static void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder* b) {}
 
-    static void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder* b) {}
+protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
 
 private:
-
-    typedef GrGLEffect INHERITED;
+    UniformHandle fRGBAYValuesUni;
+    typedef GrGLSLFragmentProcessor INHERITED;
 };
 
-GLColorTableEffect::GLColorTableEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&)
-    : INHERITED(factory) {
- }
+GLColorTableEffect::GLColorTableEffect(const GrProcessor&) {
+}
 
-void GLColorTableEffect::emitCode(GrGLShaderBuilder* builder,
-                                  const GrDrawEffect&,
-                                  const GrEffectKey&,
-                                  const char* outputColor,
-                                  const char* inputColor,
-                                  const TransformedCoordsArray&,
-                                  const TextureSamplerArray& samplers) {
+void GLColorTableEffect::onSetData(const GrGLSLProgramDataManager& pdm, const GrProcessor& proc) {
+    // The textures are organized in a strip where the rows are ordered a, r, g, b.
+    float rgbaYValues[4];
+    const ColorTableEffect& cte = proc.cast<ColorTableEffect>();
+    if (cte.atlas()) {
+        SkScalar yDelta = cte.atlas()->getNormalizedTexelHeight();
+        rgbaYValues[3] = cte.atlas()->getYOffset(cte.atlasRow()) + SK_ScalarHalf * yDelta;
+        rgbaYValues[0] = rgbaYValues[3] + yDelta;
+        rgbaYValues[1] = rgbaYValues[0] + yDelta;
+        rgbaYValues[2] = rgbaYValues[1] + yDelta;
+    } else {
+        rgbaYValues[3] = 0.125;
+        rgbaYValues[0] = 0.375;
+        rgbaYValues[1] = 0.625;
+        rgbaYValues[2] = 0.875;
+    }
+    pdm.set4fv(fRGBAYValuesUni, 1, rgbaYValues);
+}
 
+void GLColorTableEffect::emitCode(EmitArgs& args) {
+    const char* yoffsets;
+    fRGBAYValuesUni = args.fBuilder->addUniform(GrGLSLFPBuilder::kFragment_Visibility,
+                                                kVec4f_GrSLType, kDefault_GrSLPrecision,
+                                                "yoffsets", &yoffsets);
     static const float kColorScaleFactor = 255.0f / 256.0f;
     static const float kColorOffsetFactor = 1.0f / 512.0f;
-    if (NULL == inputColor) {
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    if (nullptr == args.fInputColor) {
         // the input color is solid white (all ones).
         static const float kMaxValue = kColorScaleFactor + kColorOffsetFactor;
-        builder->fsCodeAppendf("\t\tvec4 coord = vec4(%f, %f, %f, %f);\n",
-                               kMaxValue, kMaxValue, kMaxValue, kMaxValue);
+        fragBuilder->codeAppendf("\t\tvec4 coord = vec4(%f, %f, %f, %f);\n",
+                                 kMaxValue, kMaxValue, kMaxValue, kMaxValue);
 
     } else {
-        builder->fsCodeAppendf("\t\tfloat nonZeroAlpha = max(%s.a, .0001);\n", inputColor);
-        builder->fsCodeAppendf("\t\tvec4 coord = vec4(%s.rgb / nonZeroAlpha, nonZeroAlpha);\n", inputColor);
-        builder->fsCodeAppendf("\t\tcoord = coord * %f + vec4(%f, %f, %f, %f);\n",
-                              kColorScaleFactor,
-                              kColorOffsetFactor, kColorOffsetFactor,
-                              kColorOffsetFactor, kColorOffsetFactor);
+        fragBuilder->codeAppendf("\t\tfloat nonZeroAlpha = max(%s.a, .0001);\n", args.fInputColor);
+        fragBuilder->codeAppendf("\t\tvec4 coord = vec4(%s.rgb / nonZeroAlpha, nonZeroAlpha);\n",
+                                 args.fInputColor);
+        fragBuilder->codeAppendf("\t\tcoord = coord * %f + vec4(%f, %f, %f, %f);\n",
+                                 kColorScaleFactor,
+                                 kColorOffsetFactor, kColorOffsetFactor,
+                                 kColorOffsetFactor, kColorOffsetFactor);
     }
 
-    builder->fsCodeAppendf("\t\t%s.a = ", outputColor);
-    builder->fsAppendTextureLookup(samplers[0], "vec2(coord.a, 0.125)");
-    builder->fsCodeAppend(";\n");
+    SkString coord;
 
-    builder->fsCodeAppendf("\t\t%s.r = ", outputColor);
-    builder->fsAppendTextureLookup(samplers[0], "vec2(coord.r, 0.375)");
-    builder->fsCodeAppend(";\n");
+    fragBuilder->codeAppendf("\t\t%s.a = ", args.fOutputColor);
+    coord.printf("vec2(coord.a, %s.a)", yoffsets);
+    fragBuilder->appendTextureLookup(args.fSamplers[0], coord.c_str());
+    fragBuilder->codeAppend(";\n");
 
-    builder->fsCodeAppendf("\t\t%s.g = ", outputColor);
-    builder->fsAppendTextureLookup(samplers[0], "vec2(coord.g, 0.625)");
-    builder->fsCodeAppend(";\n");
+    fragBuilder->codeAppendf("\t\t%s.r = ", args.fOutputColor);
+    coord.printf("vec2(coord.r, %s.r)", yoffsets);
+    fragBuilder->appendTextureLookup(args.fSamplers[0], coord.c_str());
+    fragBuilder->codeAppend(";\n");
 
-    builder->fsCodeAppendf("\t\t%s.b = ", outputColor);
-    builder->fsAppendTextureLookup(samplers[0], "vec2(coord.b, 0.875)");
-    builder->fsCodeAppend(";\n");
+    fragBuilder->codeAppendf("\t\t%s.g = ", args.fOutputColor);
+    coord.printf("vec2(coord.g, %s.g)", yoffsets);
+    fragBuilder->appendTextureLookup(args.fSamplers[0], coord.c_str());
+    fragBuilder->codeAppend(";\n");
 
-    builder->fsCodeAppendf("\t\t%s.rgb *= %s.a;\n", outputColor, outputColor);
+    fragBuilder->codeAppendf("\t\t%s.b = ", args.fOutputColor);
+    coord.printf("vec2(coord.b, %s.b)", yoffsets);
+    fragBuilder->appendTextureLookup(args.fSamplers[0], coord.c_str());
+    fragBuilder->codeAppend(";\n");
+
+    fragBuilder->codeAppendf("\t\t%s.rgb *= %s.a;\n", args.fOutputColor, args.fOutputColor);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
+const GrFragmentProcessor* ColorTableEffect::Create(GrContext* context, SkBitmap bitmap,
+                                                    unsigned flags) {
 
-ColorTableEffect::ColorTableEffect(GrTexture* texture, unsigned flags)
+    GrTextureStripAtlas::Desc desc;
+    desc.fWidth  = bitmap.width();
+    desc.fHeight = 128;
+    desc.fRowHeight = bitmap.height();
+    desc.fContext = context;
+    desc.fConfig = SkImageInfo2GrPixelConfig(bitmap.info());
+    GrTextureStripAtlas* atlas = GrTextureStripAtlas::GetAtlas(desc);
+    int row = atlas->lockRow(bitmap);
+    SkAutoTUnref<GrTexture> texture;
+    if (-1 == row) {
+        atlas = nullptr;
+        texture.reset(GrRefCachedBitmapTexture(context, bitmap, GrTextureParams::ClampNoFilter()));
+    } else {
+        texture.reset(SkRef(atlas->getTexture()));
+    }
+
+    return new ColorTableEffect(texture, atlas, row, flags);
+}
+
+ColorTableEffect::ColorTableEffect(GrTexture* texture, GrTextureStripAtlas* atlas, int row,
+                                   unsigned flags)
     : fTextureAccess(texture, "a")
-    , fFlags(flags) {
+    , fFlags(flags)
+    , fAtlas(atlas)
+    , fRow(row) {
+    this->initClassID<ColorTableEffect>();
     this->addTextureAccess(&fTextureAccess);
 }
 
 ColorTableEffect::~ColorTableEffect() {
+    if (fAtlas) {
+        fAtlas->unlockRow(fRow);
+    }
 }
 
-const GrBackendEffectFactory&  ColorTableEffect::getFactory() const {
-    return GrTBackendEffectFactory<ColorTableEffect>::getInstance();
+void ColorTableEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                             GrProcessorKeyBuilder* b) const {
+    GLColorTableEffect::GenKey(*this, caps, b);
 }
 
-bool ColorTableEffect::onIsEqual(const GrEffect& sBase) const {
-    return this->texture(0) == sBase.texture(0);
+GrGLSLFragmentProcessor* ColorTableEffect::onCreateGLSLInstance() const {
+    return new GLColorTableEffect(*this);
 }
 
-void ColorTableEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
+bool ColorTableEffect::onIsEqual(const GrFragmentProcessor& other) const {
+    // For non-atlased instances, the texture (compared by base class) is sufficient to
+    // differentiate different tables. For atlased instances we ensure they are using the
+    // same row.
+    const ColorTableEffect& that = other.cast<ColorTableEffect>();
+    SkASSERT(SkToBool(fAtlas) == SkToBool(that.fAtlas));
+    // Ok to always do this comparison since both would be -1 if non-atlased.
+    return fRow == that.fRow;
+}
+
+void ColorTableEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const {
     // If we kept the table in the effect then we could actually run known inputs through the
     // table.
+    GrColorComponentFlags invalidateFlags = kNone_GrColorComponentFlags;
     if (fFlags & SkTable_ColorFilter::kR_Flag) {
-        *validFlags &= ~kR_GrColorComponentFlag;
+        invalidateFlags |= kR_GrColorComponentFlag;
     }
     if (fFlags & SkTable_ColorFilter::kG_Flag) {
-        *validFlags &= ~kG_GrColorComponentFlag;
+        invalidateFlags |= kG_GrColorComponentFlag;
     }
     if (fFlags & SkTable_ColorFilter::kB_Flag) {
-        *validFlags &= ~kB_GrColorComponentFlag;
+        invalidateFlags |= kB_GrColorComponentFlag;
     }
     if (fFlags & SkTable_ColorFilter::kA_Flag) {
-        *validFlags &= ~kA_GrColorComponentFlag;
+        invalidateFlags |= kA_GrColorComponentFlag;
     }
+    inout->invalidateComponents(invalidateFlags, GrInvariantOutput::kWill_ReadInput);
 }
 
-
 ///////////////////////////////////////////////////////////////////////////////
 
-GR_DEFINE_EFFECT_TEST(ColorTableEffect);
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(ColorTableEffect);
 
-GrEffect* ColorTableEffect::TestCreate(SkRandom* random,
-                                       GrContext* context,
-                                       const GrDrawTargetCaps&,
-                                       GrTexture* textures[]) {
-    static unsigned kAllFlags = SkTable_ColorFilter::kR_Flag | SkTable_ColorFilter::kG_Flag |
-                                SkTable_ColorFilter::kB_Flag | SkTable_ColorFilter::kA_Flag;
-    return ColorTableEffect::Create(textures[GrEffectUnitTest::kAlphaTextureIdx], kAllFlags);
+const GrFragmentProcessor* ColorTableEffect::TestCreate(GrProcessorTestData* d) {
+    int flags = 0;
+    uint8_t luts[256][4];
+    do {
+        for (int i = 0; i < 4; ++i) {
+            flags |= d->fRandom->nextBool() ? (1  << i): 0;
+        }
+    } while (!flags);
+    for (int i = 0; i < 4; ++i) {
+        if (flags & (1 << i)) {
+            for (int j = 0; j < 256; ++j) {
+                luts[j][i] = SkToU8(d->fRandom->nextBits(8));
+            }
+        }
+    }
+    SkAutoTUnref<SkColorFilter> filter(SkTableColorFilter::CreateARGB(
+        (flags & (1 << 0)) ? luts[0] : nullptr,
+        (flags & (1 << 1)) ? luts[1] : nullptr,
+        (flags & (1 << 2)) ? luts[2] : nullptr,
+        (flags & (1 << 3)) ? luts[3] : nullptr
+    ));
+
+    const GrFragmentProcessor* fp = filter->asFragmentProcessor(d->fContext);
+    SkASSERT(fp);
+    return fp;
 }
 
-GrEffect* SkTable_ColorFilter::asNewEffect(GrContext* context) const {
+const GrFragmentProcessor* SkTable_ColorFilter::asFragmentProcessor(GrContext* context) const {
     SkBitmap bitmap;
-    GrEffect* effect = NULL;
     this->asComponentTable(&bitmap);
-    // passing NULL because this effect does no tiling or filtering.
-    GrTexture* texture = GrLockAndRefCachedBitmapTexture(context, bitmap, NULL);
-    if (NULL != texture) {
-        effect = ColorTableEffect::Create(texture, fFlags);
 
-        // Unlock immediately, this is not great, but we don't have a way of
-        // knowing when else to unlock it currently. TODO: Remove this when
-        // unref becomes the unlock replacement for all types of textures.
-        GrUnlockAndUnrefCachedBitmapTexture(texture);
-    }
-    return effect;
+    return ColorTableEffect::Create(context, bitmap, fFlags);
 }
 
 #endif // SK_SUPPORT_GPU
@@ -415,14 +592,14 @@ GrEffect* SkTable_ColorFilter::asNewEffect(GrContext* context) const {
 ///////////////////////////////////////////////////////////////////////////////
 
 SkColorFilter* SkTableColorFilter::Create(const uint8_t table[256]) {
-    return SkNEW_ARGS(SkTable_ColorFilter, (table, table, table, table));
+    return new SkTable_ColorFilter(table, table, table, table);
 }
 
 SkColorFilter* SkTableColorFilter::CreateARGB(const uint8_t tableA[256],
                                               const uint8_t tableR[256],
                                               const uint8_t tableG[256],
                                               const uint8_t tableB[256]) {
-    return SkNEW_ARGS(SkTable_ColorFilter, (tableA, tableR, tableG, tableB));
+    return new SkTable_ColorFilter(tableA, tableR, tableG, tableB);
 }
 
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkTableColorFilter)
diff --git a/gfx/skia/skia/src/effects/SkTableMaskFilter.cpp b/gfx/skia/skia/src/effects/SkTableMaskFilter.cpp
index 602302e503c0..88484d709126 100644
--- a/gfx/skia/skia/src/effects/SkTableMaskFilter.cpp
+++ b/gfx/skia/skia/src/effects/SkTableMaskFilter.cpp
@@ -33,7 +33,7 @@ bool SkTableMaskFilter::filterMask(SkMask* dst, const SkMask& src,
     dst->fBounds = src.fBounds;
     dst->fRowBytes = SkAlign4(dst->fBounds.width());
     dst->fFormat = SkMask::kA8_Format;
-    dst->fImage = NULL;
+    dst->fImage = nullptr;
 
     if (src.fImage) {
         dst->fImage = SkMask::AllocImage(dst->computeImageSize());
@@ -71,14 +71,15 @@ SkMask::Format SkTableMaskFilter::getFormat() const {
 }
 
 void SkTableMaskFilter::flatten(SkWriteBuffer& wb) const {
-    this->INHERITED::flatten(wb);
     wb.writeByteArray(fTable, 256);
 }
 
-SkTableMaskFilter::SkTableMaskFilter(SkReadBuffer& rb)
-        : INHERITED(rb) {
-    SkASSERT(256 == rb.getArrayCount());
-    rb.readByteArray(fTable, 256);
+SkFlattenable* SkTableMaskFilter::CreateProc(SkReadBuffer& buffer) {
+    uint8_t table[256];
+    if (!buffer.readByteArray(table, 256)) {
+        return nullptr;
+    }
+    return Create(table);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -90,7 +91,7 @@ void SkTableMaskFilter::MakeGammaTable(uint8_t table[256], SkScalar gamma) {
     float x = 0;
     for (int i = 0; i < 256; i++) {
      // float ee = powf(x, g) * 255;
-        table[i] = SkPin32(sk_float_round2int(powf(x, g) * 255), 0, 255);
+        table[i] = SkTPin(sk_float_round2int(powf(x, g) * 255), 0, 255);
         x += dx;
     }
 }
diff --git a/gfx/skia/skia/src/effects/SkTestImageFilters.cpp b/gfx/skia/skia/src/effects/SkTestImageFilters.cpp
index da88316654ab..432b576c15ae 100755
--- a/gfx/skia/skia/src/effects/SkTestImageFilters.cpp
+++ b/gfx/skia/skia/src/effects/SkTestImageFilters.cpp
@@ -1,3 +1,9 @@
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include "SkTestImageFilters.h"
 #include "SkCanvas.h"
@@ -43,13 +49,13 @@ bool SkDownSampleImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& src,
     // downsample
     {
         SkBaseDevice* dev = proxy->createDevice(dstW, dstH);
-        if (NULL == dev) {
+        if (nullptr == dev) {
             return false;
         }
         OwnDeviceCanvas canvas(dev);
         SkPaint paint;
 
-        paint.setFilterLevel(SkPaint::kLow_FilterLevel);
+        paint.setFilterQuality(kLow_SkFilterQuality);
         canvas.scale(scale, scale);
         canvas.drawBitmap(src, 0, 0, &paint);
         tmp = dev->accessBitmap(false);
@@ -58,27 +64,30 @@ bool SkDownSampleImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& src,
     // upscale
     {
         SkBaseDevice* dev = proxy->createDevice(src.width(), src.height());
-        if (NULL == dev) {
+        if (nullptr == dev) {
             return false;
         }
         OwnDeviceCanvas canvas(dev);
 
-        SkRect r = SkRect::MakeWH(SkIntToScalar(src.width()),
-                                  SkIntToScalar(src.height()));
-        canvas.drawBitmapRect(tmp, NULL, r, NULL);
+        canvas.drawBitmapRect(tmp, SkRect::MakeIWH(src.width(), src.height()), nullptr);
         *result = dev->accessBitmap(false);
     }
     return true;
 }
 
+SkFlattenable* SkDownSampleImageFilter::CreateProc(SkReadBuffer& buffer) {
+    SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
+    return Create(buffer.readScalar(), common.getInput(0));
+}
+
 void SkDownSampleImageFilter::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
-
     buffer.writeScalar(fScale);
 }
 
-SkDownSampleImageFilter::SkDownSampleImageFilter(SkReadBuffer& buffer)
-  : INHERITED(1, buffer) {
-    fScale = buffer.readScalar();
-    buffer.validate(SkScalarIsFinite(fScale));
+#ifndef SK_IGNORE_TO_STRING
+void SkDownSampleImageFilter::toString(SkString* str) const {
+    str->appendf("SkDownSampleImageFilter: (");
+    str->append(")");
 }
+#endif
diff --git a/gfx/skia/skia/src/effects/SkTileImageFilter.cpp b/gfx/skia/skia/src/effects/SkTileImageFilter.cpp
index 73c0a581e98e..52ea6a756f1c 100644
--- a/gfx/skia/skia/src/effects/SkTileImageFilter.cpp
+++ b/gfx/skia/skia/src/effects/SkTileImageFilter.cpp
@@ -16,20 +16,26 @@
 #include "SkShader.h"
 #include "SkValidationUtils.h"
 
+SkImageFilter* SkTileImageFilter::Create(const SkRect& srcRect, const SkRect& dstRect,
+                                         SkImageFilter* input) {
+    if (!SkIsValidRect(srcRect) || !SkIsValidRect(dstRect)) {
+        return nullptr;
+    }
+    return new SkTileImageFilter(srcRect, dstRect, input);
+}
+
 bool SkTileImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& src,
                                       const Context& ctx,
                                       SkBitmap* dst, SkIPoint* offset) const {
     SkBitmap source = src;
-    SkImageFilter* input = getInput(0);
     SkIPoint srcOffset = SkIPoint::Make(0, 0);
-    if (input && !input->filterImage(proxy, src, ctx, &source, &srcOffset)) {
+    if (!this->filterInput(0, proxy, src, ctx, &source, &srcOffset)) {
         return false;
     }
 
     SkRect dstRect;
     ctx.ctm().mapRect(&dstRect, fDstRect);
-    SkIRect dstIRect;
-    dstRect.roundOut(&dstIRect);
+    const SkIRect dstIRect = dstRect.roundOut();
     int w = dstIRect.width();
     int h = dstIRect.height();
     if (!fSrcRect.width() || !fSrcRect.height() || !w || !h) {
@@ -53,7 +59,7 @@ bool SkTileImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& src,
     }
 
     SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(w, h));
-    if (NULL == device.get()) {
+    if (nullptr == device.get()) {
         return false;
     }
     SkCanvas canvas(device);
@@ -86,11 +92,18 @@ bool SkTileImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm,
     return true;
 }
 
-SkTileImageFilter::SkTileImageFilter(SkReadBuffer& buffer)
-  : INHERITED(1, buffer) {
-    buffer.readRect(&fSrcRect);
-    buffer.readRect(&fDstRect);
-    buffer.validate(buffer.isValid() && SkIsValidRect(fSrcRect) && SkIsValidRect(fDstRect));
+void SkTileImageFilter::computeFastBounds(const SkRect& src, SkRect* dst) const {
+    // This is a workaround for skia:3194.
+    *dst = src;
+    dst->join(fDstRect);
+}
+
+SkFlattenable* SkTileImageFilter::CreateProc(SkReadBuffer& buffer) {
+    SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
+    SkRect src, dst;
+    buffer.readRect(&src);
+    buffer.readRect(&dst);
+    return Create(src, dst, common.getInput(0));
 }
 
 void SkTileImageFilter::flatten(SkWriteBuffer& buffer) const {
@@ -98,3 +111,19 @@ void SkTileImageFilter::flatten(SkWriteBuffer& buffer) const {
     buffer.writeRect(fSrcRect);
     buffer.writeRect(fDstRect);
 }
+
+#ifndef SK_IGNORE_TO_STRING
+void SkTileImageFilter::toString(SkString* str) const {
+    str->appendf("SkTileImageFilter: (");
+    str->appendf("src: %.2f %.2f %.2f %.2f",
+                 fSrcRect.fLeft, fSrcRect.fTop, fSrcRect.fRight, fSrcRect.fBottom);
+    str->appendf(" dst: %.2f %.2f %.2f %.2f",
+                 fDstRect.fLeft, fDstRect.fTop, fDstRect.fRight, fDstRect.fBottom);
+    if (this->getInput(0)) {
+        str->appendf("input: (");
+        this->getInput(0)->toString(str);
+        str->appendf(")");
+    }
+    str->append(")");
+}
+#endif
diff --git a/gfx/skia/skia/src/effects/SkTransparentShader.cpp b/gfx/skia/skia/src/effects/SkTransparentShader.cpp
deleted file mode 100644
index f290d0dcf8d5..000000000000
--- a/gfx/skia/skia/src/effects/SkTransparentShader.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#include "SkTransparentShader.h"
-#include "SkColorPriv.h"
-#include "SkString.h"
-
-SkShader::Context* SkTransparentShader::onCreateContext(const ContextRec& rec,
-                                                        void* storage) const {
-    return SkNEW_PLACEMENT_ARGS(storage, TransparentShaderContext, (*this, rec));
-}
-
-size_t SkTransparentShader::contextSize() const {
-    return sizeof(TransparentShaderContext);
-}
-
-SkTransparentShader::TransparentShaderContext::TransparentShaderContext(
-        const SkTransparentShader& shader, const ContextRec& rec)
-    : INHERITED(shader, rec)
-    , fDevice(rec.fDevice) {}
-
-SkTransparentShader::TransparentShaderContext::~TransparentShaderContext() {}
-
-uint32_t SkTransparentShader::TransparentShaderContext::getFlags() const {
-    uint32_t flags = this->INHERITED::getFlags();
-
-    switch (fDevice->colorType()) {
-        case kRGB_565_SkColorType:
-            flags |= kHasSpan16_Flag;
-            if (this->getPaintAlpha() == 255)
-                flags |= kOpaqueAlpha_Flag;
-            break;
-        case kN32_SkColorType:
-            if (this->getPaintAlpha() == 255 && fDevice->isOpaque())
-                flags |= kOpaqueAlpha_Flag;
-            break;
-        default:
-            break;
-    }
-    return flags;
-}
-
-void SkTransparentShader::TransparentShaderContext::shadeSpan(int x, int y, SkPMColor span[],
-                                                              int count) {
-    unsigned scale = SkAlpha255To256(this->getPaintAlpha());
-
-    switch (fDevice->colorType()) {
-        case kN32_SkColorType:
-            if (scale == 256) {
-                SkPMColor* src = fDevice->getAddr32(x, y);
-                if (src != span) {
-                    memcpy(span, src, count * sizeof(SkPMColor));
-                }
-            } else {
-                const SkPMColor* src = fDevice->getAddr32(x, y);
-                for (int i = count - 1; i >= 0; --i) {
-                    span[i] = SkAlphaMulQ(src[i], scale);
-                }
-            }
-            break;
-        case kRGB_565_SkColorType: {
-            const uint16_t* src = fDevice->getAddr16(x, y);
-            if (scale == 256) {
-                for (int i = count - 1; i >= 0; --i) {
-                    span[i] = SkPixel16ToPixel32(src[i]);
-                }
-            } else {
-                unsigned alpha = this->getPaintAlpha();
-                for (int i = count - 1; i >= 0; --i) {
-                    uint16_t c = src[i];
-                    unsigned r = SkPacked16ToR32(c);
-                    unsigned g = SkPacked16ToG32(c);
-                    unsigned b = SkPacked16ToB32(c);
-
-                    span[i] = SkPackARGB32( alpha,
-                                            SkAlphaMul(r, scale),
-                                            SkAlphaMul(g, scale),
-                                            SkAlphaMul(b, scale));
-                }
-            }
-            break;
-        }
-        case kAlpha_8_SkColorType: {
-            const uint8_t* src = fDevice->getAddr8(x, y);
-            if (scale == 256) {
-                for (int i = count - 1; i >= 0; --i) {
-                    span[i] = SkPackARGB32(src[i], 0, 0, 0);
-                }
-            } else {
-                for (int i = count - 1; i >= 0; --i) {
-                    span[i] = SkPackARGB32(SkAlphaMul(src[i], scale), 0, 0, 0);
-                }
-            }
-            break;
-        }
-        default:
-            SkDEBUGFAIL("colorType not supported as a destination device");
-            break;
-    }
-}
-
-void SkTransparentShader::TransparentShaderContext::shadeSpan16(int x, int y, uint16_t span[],
-                                                                int count) {
-    SkASSERT(fDevice->colorType() == kRGB_565_SkColorType);
-
-    uint16_t* src = fDevice->getAddr16(x, y);
-    if (src != span) {
-        memcpy(span, src, count << 1);
-    }
-}
-
-#ifndef SK_IGNORE_TO_STRING
-void SkTransparentShader::toString(SkString* str) const {
-    str->append("SkTransparentShader: (");
-
-    this->INHERITED::toString(str);
-
-    str->append(")");
-}
-#endif
diff --git a/gfx/skia/skia/src/effects/SkXfermodeImageFilter.cpp b/gfx/skia/skia/src/effects/SkXfermodeImageFilter.cpp
index cf32cf5cb046..38d1e5e6b407 100644
--- a/gfx/skia/skia/src/effects/SkXfermodeImageFilter.cpp
+++ b/gfx/skia/skia/src/effects/SkXfermodeImageFilter.cpp
@@ -14,6 +14,8 @@
 #include "SkXfermode.h"
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
+#include "GrDrawContext.h"
+#include "effects/GrTextureDomain.h"
 #include "effects/GrSimpleTextureEffect.h"
 #include "SkGr.h"
 #endif
@@ -31,9 +33,10 @@ SkXfermodeImageFilter::~SkXfermodeImageFilter() {
     SkSafeUnref(fMode);
 }
 
-SkXfermodeImageFilter::SkXfermodeImageFilter(SkReadBuffer& buffer)
-  : INHERITED(2, buffer) {
-    fMode = buffer.readXfermode();
+SkFlattenable* SkXfermodeImageFilter::CreateProc(SkReadBuffer& buffer) {
+    SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 2);
+    SkAutoTUnref<SkXfermode> mode(buffer.readXfermode());
+    return Create(mode, common.getInput(0), common.getInput(1), &common.cropRect());
 }
 
 void SkXfermodeImageFilter::flatten(SkWriteBuffer& buffer) const {
@@ -47,16 +50,12 @@ bool SkXfermodeImageFilter::onFilterImage(Proxy* proxy,
                                             SkBitmap* dst,
                                             SkIPoint* offset) const {
     SkBitmap background = src, foreground = src;
-    SkImageFilter* backgroundInput = getInput(0);
-    SkImageFilter* foregroundInput = getInput(1);
     SkIPoint backgroundOffset = SkIPoint::Make(0, 0);
-    if (backgroundInput &&
-        !backgroundInput->filterImage(proxy, src, ctx, &background, &backgroundOffset)) {
+    if (!this->filterInput(0, proxy, src, ctx, &background, &backgroundOffset)) {
         background.reset();
     }
     SkIPoint foregroundOffset = SkIPoint::Make(0, 0);
-    if (foregroundInput &&
-        !foregroundInput->filterImage(proxy, src, ctx, &foreground, &foregroundOffset)) {
+    if (!this->filterInput(1, proxy, src, ctx, &foreground, &foregroundOffset)) {
         foreground.reset();
     }
 
@@ -75,7 +74,7 @@ bool SkXfermodeImageFilter::onFilterImage(Proxy* proxy,
     }
 
     SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(), bounds.height()));
-    if (NULL == device.get()) {
+    if (nullptr == device.get()) {
         return false;
     }
     SkCanvas canvas(device);
@@ -96,10 +95,32 @@ bool SkXfermodeImageFilter::onFilterImage(Proxy* proxy,
     return true;
 }
 
+#ifndef SK_IGNORE_TO_STRING
+void SkXfermodeImageFilter::toString(SkString* str) const {
+    str->appendf("SkXfermodeImageFilter: (");
+    str->appendf("xfermode: (");
+    if (fMode) {
+        fMode->toString(str);
+    }
+    str->append(")");
+    if (this->getInput(0)) {
+        str->appendf("foreground: (");
+        this->getInput(0)->toString(str);
+        str->appendf(")");
+    }
+    if (this->getInput(1)) {
+        str->appendf("background: (");
+        this->getInput(1)->toString(str);
+        str->appendf(")");
+    }
+    str->append(")");
+}
+#endif
+
 #if SK_SUPPORT_GPU
 
 bool SkXfermodeImageFilter::canFilterImageGPU() const {
-    return fMode && fMode->asNewEffect(NULL, NULL) && !cropRectIsSet();
+    return fMode && fMode->asFragmentProcessor(nullptr, nullptr) && !cropRectIsSet();
 }
 
 bool SkXfermodeImageFilter::filterImageGPU(Proxy* proxy,
@@ -109,40 +130,49 @@ bool SkXfermodeImageFilter::filterImageGPU(Proxy* proxy,
                                            SkIPoint* offset) const {
     SkBitmap background = src;
     SkIPoint backgroundOffset = SkIPoint::Make(0, 0);
-    if (getInput(0) && !getInput(0)->getInputResultGPU(proxy, src, ctx, &background,
-                                                       &backgroundOffset)) {
-        return onFilterImage(proxy, src, ctx, result, offset);
+    if (!this->filterInputGPU(0, proxy, src, ctx, &background, &backgroundOffset)) {
+        return false;
     }
+
     GrTexture* backgroundTex = background.getTexture();
+    if (nullptr == backgroundTex) {
+        SkASSERT(false);
+        return false;
+    }
+
     SkBitmap foreground = src;
     SkIPoint foregroundOffset = SkIPoint::Make(0, 0);
-    if (getInput(1) && !getInput(1)->getInputResultGPU(proxy, src, ctx, &foreground,
-                                                       &foregroundOffset)) {
-        return onFilterImage(proxy, src, ctx, result, offset);
+    if (!this->filterInputGPU(1, proxy, src, ctx, &foreground, &foregroundOffset)) {
+        return false;
     }
     GrTexture* foregroundTex = foreground.getTexture();
     GrContext* context = foregroundTex->getContext();
 
-    GrEffect* xferEffect = NULL;
+    const GrFragmentProcessor* xferFP = nullptr;
 
-    GrTextureDesc desc;
-    desc.fFlags = kRenderTarget_GrTextureFlagBit | kNoStencil_GrTextureFlagBit;
+    GrSurfaceDesc desc;
+    desc.fFlags = kRenderTarget_GrSurfaceFlag;
     desc.fWidth = src.width();
     desc.fHeight = src.height();
     desc.fConfig = kSkia8888_GrPixelConfig;
+    auto constraint = GrTextureProvider::FromImageFilter(ctx.sizeConstraint());
+    SkAutoTUnref<GrTexture> dst(context->textureProvider()->createTexture(desc, constraint));
+    if (!dst) {
+        return false;
+    }
 
-    GrAutoScratchTexture ast(context, desc);
-    SkAutoTUnref<GrTexture> dst(ast.detach());
-
-    GrContext::AutoRenderTarget art(context, dst->asRenderTarget());
-
-    if (!fMode || !fMode->asNewEffect(&xferEffect, backgroundTex)) {
+    GrPaint paint;
+    SkMatrix bgMatrix;
+    bgMatrix.setIDiv(backgroundTex->width(), backgroundTex->height());
+    SkAutoTUnref<const GrFragmentProcessor> bgFP(
+        GrSimpleTextureEffect::Create(backgroundTex, bgMatrix));
+    if (!fMode || !fMode->asFragmentProcessor(&xferFP, bgFP)) {
         // canFilterImageGPU() should've taken care of this
         SkASSERT(false);
         return false;
     }
 
-    SkMatrix foregroundMatrix = GrEffect::MakeDivByTextureWHMatrix(foregroundTex);
+    SkMatrix foregroundMatrix = GrCoordTransform::MakeDivByTextureWHMatrix(foregroundTex);
     foregroundMatrix.preTranslate(SkIntToScalar(backgroundOffset.fX-foregroundOffset.fX),
                                   SkIntToScalar(backgroundOffset.fY-foregroundOffset.fY));
 
@@ -150,10 +180,25 @@ bool SkXfermodeImageFilter::filterImageGPU(Proxy* proxy,
     SkRect srcRect;
     src.getBounds(&srcRect);
 
-    GrPaint paint;
-    paint.addColorTextureEffect(foregroundTex, foregroundMatrix);
-    paint.addColorEffect(xferEffect)->unref();
-    context->drawRect(paint, srcRect);
+    SkAutoTUnref<const GrFragmentProcessor> foregroundDomain(GrTextureDomainEffect::Create(
+        foregroundTex, foregroundMatrix,
+        GrTextureDomain::MakeTexelDomain(foregroundTex, foreground.bounds()),
+        GrTextureDomain::kDecal_Mode,
+        GrTextureParams::kNone_FilterMode)
+    );
+
+    paint.addColorFragmentProcessor(foregroundDomain.get());
+    if (xferFP) {
+        paint.addColorFragmentProcessor(xferFP)->unref();
+    }
+    paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode);
+
+    SkAutoTUnref<GrDrawContext> drawContext(context->drawContext(dst->asRenderTarget()));
+    if (!drawContext) {
+        return false;
+    }
+
+    drawContext->drawRect(GrClip::WideOpen(), paint, SkMatrix::I(), srcRect);
 
     offset->fX = backgroundOffset.fX;
     offset->fY = backgroundOffset.fY;
@@ -162,3 +207,4 @@ bool SkXfermodeImageFilter::filterImageGPU(Proxy* proxy,
 }
 
 #endif
+
diff --git a/gfx/skia/skia/src/effects/gradients/SkClampRange.cpp b/gfx/skia/skia/src/effects/gradients/SkClampRange.cpp
index 398b02434fd5..0bf30f14eafd 100644
--- a/gfx/skia/skia/src/effects/gradients/SkClampRange.cpp
+++ b/gfx/skia/skia/src/effects/gradients/SkClampRange.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
@@ -6,14 +5,39 @@
  * found in the LICENSE file.
  */
 
-
 #include "SkClampRange.h"
+#include "SkMath.h"
+
+static int SkCLZ64(uint64_t value) {
+    int count = 0;
+    if (value >> 32) {
+        value >>= 32;
+    } else {
+        count += 32;
+    }
+    return count + SkCLZ(SkToU32(value));
+}
+
+static bool sk_64_smul_check(int64_t a, int64_t b, int64_t* result) {
+    // Do it the slow way until we have some assembly.
+    int64_t ua = SkTAbs(a);
+    int64_t ub = SkTAbs(b);
+    int zeros = SkCLZ64(ua) + SkCLZ64(ub);
+    // this is a conservative check: it may return false when in fact it would not have overflowed.
+    // Hackers Delight uses 34 as its convervative check, but that is for 32x32 multiplies.
+    // Since we are looking at 64x64 muls, we add 32 to the check.
+    if (zeros < (32 + 34)) {
+        return false;
+    }
+    *result = a * b;
+    return true;
+}
 
 /*
  *  returns [0..count] for the number of steps (<= count) for which x0 <= edge
  *  given each step is followed by x0 += dx
  */
-static int chop(int64_t x0, SkFixed edge, int64_t x1, int64_t dx, int count) {
+static int chop(int64_t x0, SkGradFixed edge, int64_t x1, int64_t dx, int count) {
     SkASSERT(dx > 0);
     SkASSERT(count >= 0);
 
@@ -29,15 +53,11 @@ static int chop(int64_t x0, SkFixed edge, int64_t x1, int64_t dx, int count) {
     return (int)n;
 }
 
-static bool overflows_fixed(int64_t x) {
-    return x < -SK_FixedMax || x > SK_FixedMax;
-}
-
-void SkClampRange::initFor1(SkFixed fx) {
+void SkClampRange::initFor1(SkGradFixed fx) {
     fCount0 = fCount1 = fCount2 = 0;
     if (fx <= 0) {
         fCount0 = 1;
-    } else if (fx < 0xFFFF) {
+    } else if (fx < kFracMax_SkGradFixed) {
         fCount1 = 1;
         fFx1 = fx;
     } else {
@@ -45,7 +65,7 @@ void SkClampRange::initFor1(SkFixed fx) {
     }
 }
 
-void SkClampRange::init(SkFixed fx0, SkFixed dx0, int count, int v0, int v1) {
+void SkClampRange::init(SkGradFixed fx0, SkGradFixed dx0, int count, int v0, int v1) {
     SkASSERT(count > 0);
 
     fV0 = v0;
@@ -60,10 +80,19 @@ void SkClampRange::init(SkFixed fx0, SkFixed dx0, int count, int v0, int v1) {
 
     int64_t fx = fx0;
     int64_t dx = dx0;
+
     // start with ex equal to the last computed value
+    int64_t count_times_dx;
+    if (!sk_64_smul_check(count - 1, dx, &count_times_dx)) {
+        // we can't represent the computed end in 32.32, so just draw something (first color)
+        fCount1 = fCount2 = 0;
+        fCount0 = count;
+        return;
+    }
+
     int64_t ex = fx + (count - 1) * dx;
 
-    if ((uint64_t)(fx | ex) <= 0xFFFF) {
+    if ((uint64_t)(fx | ex) <= kFracMax_SkGradFixed) {
         fCount0 = fCount2 = 0;
         fCount1 = count;
         fFx1 = fx0;
@@ -74,45 +103,14 @@ void SkClampRange::init(SkFixed fx0, SkFixed dx0, int count, int v0, int v1) {
         fCount0 = count;
         return;
     }
-    if (fx >= 0xFFFF && ex >= 0xFFFF) {
+    if (fx >= kFracMax_SkGradFixed && ex >= kFracMax_SkGradFixed) {
         fCount0 = fCount1 = 0;
         fCount2 = count;
         return;
     }
 
-    int extraCount = 0;
-
     // now make ex be 1 past the last computed value
     ex += dx;
-    // now check for over/under flow
-    if (overflows_fixed(ex)) {
-        int originalCount = count;
-        int64_t ccount;
-        bool swap = dx < 0;
-        if (swap) {
-            dx = -dx;
-            fx = -fx;
-        }
-        ccount = (SK_FixedMax - fx + dx - 1) / dx;
-        if (swap) {
-            dx = -dx;
-            fx = -fx;
-        }
-        SkASSERT(ccount > 0 && ccount <= SK_FixedMax);
-
-        count = (int)ccount;
-        if (0 == count) {
-            this->initFor1(fx0);
-            if (dx > 0) {
-                fCount2 += originalCount - 1;
-            } else {
-                fCount0 += originalCount - 1;
-            }
-            return;
-        }
-        extraCount = originalCount - count;
-        ex = fx + dx * count;
-    }
 
     bool doSwap = dx < 0;
 
@@ -125,11 +123,15 @@ void SkClampRange::init(SkFixed fx0, SkFixed dx0, int count, int v0, int v1) {
 
 
     fCount0 = chop(fx, 0, ex, dx, count);
+    SkASSERT(fCount0 >= 0);
+    SkASSERT(fCount0 <= count);
     count -= fCount0;
     fx += fCount0 * dx;
     SkASSERT(fx >= 0);
     SkASSERT(fCount0 == 0 || (fx - dx) < 0);
-    fCount1 = chop(fx, 0xFFFF, ex, dx, count);
+    fCount1 = chop(fx, kFracMax_SkGradFixed, ex, dx, count);
+    SkASSERT(fCount1 >= 0);
+    SkASSERT(fCount1 <= count);
     count -= fCount1;
     fCount2 = count;
 
@@ -137,9 +139,9 @@ void SkClampRange::init(SkFixed fx0, SkFixed dx0, int count, int v0, int v1) {
     fx += fCount1 * dx;
     SkASSERT(fx <= ex);
     if (fCount2 > 0) {
-        SkASSERT(fx >= 0xFFFF);
+        SkASSERT(fx >= kFracMax_SkGradFixed);
         if (fCount1 > 0) {
-            SkASSERT(fx - dx < 0xFFFF);
+            SkASSERT(fx - dx < kFracMax_SkGradFixed);
         }
     }
 #endif
@@ -151,12 +153,6 @@ void SkClampRange::init(SkFixed fx0, SkFixed dx0, int count, int v0, int v1) {
     }
 
     if (fCount1 > 0) {
-        fFx1 = fx0 + fCount0 * (int)dx;
-    }
-
-    if (dx > 0) {
-        fCount2 += extraCount;
-    } else {
-        fCount0 += extraCount;
+        fFx1 = fx0 + fCount0 * dx;
     }
 }
diff --git a/gfx/skia/skia/src/effects/gradients/SkClampRange.h b/gfx/skia/skia/src/effects/gradients/SkClampRange.h
index 09386d7e71bb..945f9a7ff183 100644
--- a/gfx/skia/skia/src/effects/gradients/SkClampRange.h
+++ b/gfx/skia/skia/src/effects/gradients/SkClampRange.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
@@ -6,14 +5,20 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkClampRange_DEFINED
 #define SkClampRange_DEFINED
 
 #include "SkFixed.h"
+#include "SkScalar.h"
+
+#define SkGradFixed             SkFixed3232
+#define SkScalarToGradFixed     SkScalarToFixed3232
+#define SkFixedToGradFixed      SkFixedToFixed3232
+#define SkGradFixedToFixed(x)   (SkFixed)((x) >> 16)
+#define kFracMax_SkGradFixed    0xFFFFFFFFLL
 
 /**
- *  Iteration fixed fx by dx, clamping as you go to [0..0xFFFF], this class
+ *  Iteration fixed fx by dx, clamping as you go to [0..kFracMax_SkGradFixed], this class
  *  computes the (up to) 3 spans there are:
  *
  *  range0: use constant value V0
@@ -24,14 +29,23 @@ struct SkClampRange {
     int fCount0;    // count for fV0
     int fCount1;    // count for interpolating (fV0...fV1)
     int fCount2;    // count for fV1
-    SkFixed fFx1;   // initial fx value for the fCount1 range.
+    SkGradFixed fFx1;   // initial fx value for the fCount1 range.
                     // only valid if fCount1 > 0
     int fV0, fV1;
 
-    void init(SkFixed fx, SkFixed dx, int count, int v0, int v1);
+    void init(SkGradFixed fx, SkGradFixed dx, int count, int v0, int v1);
+
+    void validate(int count) const {
+#ifdef SK_DEBUG
+        SkASSERT(fCount0 >= 0);
+        SkASSERT(fCount1 >= 0);
+        SkASSERT(fCount2 >= 0);
+        SkASSERT(fCount0 + fCount1 + fCount2 == count);
+#endif
+    }
 
 private:
-    void initFor1(SkFixed fx);
+    void initFor1(SkGradFixed fx);
 };
 
 #endif
diff --git a/gfx/skia/skia/src/effects/gradients/SkBitmapCache.cpp b/gfx/skia/skia/src/effects/gradients/SkGradientBitmapCache.cpp
similarity index 75%
rename from gfx/skia/skia/src/effects/gradients/SkBitmapCache.cpp
rename to gfx/skia/skia/src/effects/gradients/SkGradientBitmapCache.cpp
index 95175e4fb606..24e7f5816b35 100644
--- a/gfx/skia/skia/src/effects/gradients/SkBitmapCache.cpp
+++ b/gfx/skia/skia/src/effects/gradients/SkGradientBitmapCache.cpp
@@ -7,9 +7,9 @@
  */
 
 
-#include "SkBitmapCache.h"
+#include "SkGradientBitmapCache.h"
 
-struct SkBitmapCache::Entry {
+struct SkGradientBitmapCache::Entry {
     Entry*      fPrev;
     Entry*      fNext;
 
@@ -18,8 +18,8 @@ struct SkBitmapCache::Entry {
     SkBitmap    fBitmap;
 
     Entry(const void* buffer, size_t size, const SkBitmap& bm)
-            : fPrev(NULL),
-              fNext(NULL),
+            : fPrev(nullptr),
+              fNext(nullptr),
               fBitmap(bm) {
         fBuffer = sk_malloc_throw(size);
         fSize = size;
@@ -33,14 +33,14 @@ struct SkBitmapCache::Entry {
     }
 };
 
-SkBitmapCache::SkBitmapCache(int max) : fMaxEntries(max) {
+SkGradientBitmapCache::SkGradientBitmapCache(int max) : fMaxEntries(max) {
     fEntryCount = 0;
-    fHead = fTail = NULL;
+    fHead = fTail = nullptr;
 
     this->validate();
 }
 
-SkBitmapCache::~SkBitmapCache() {
+SkGradientBitmapCache::~SkGradientBitmapCache() {
     this->validate();
 
     Entry* entry = fHead;
@@ -51,7 +51,7 @@ SkBitmapCache::~SkBitmapCache() {
     }
 }
 
-SkBitmapCache::Entry* SkBitmapCache::detach(Entry* entry) const {
+SkGradientBitmapCache::Entry* SkGradientBitmapCache::detach(Entry* entry) const {
     if (entry->fPrev) {
         SkASSERT(fHead != entry);
         entry->fPrev->fNext = entry->fNext;
@@ -69,8 +69,8 @@ SkBitmapCache::Entry* SkBitmapCache::detach(Entry* entry) const {
     return entry;
 }
 
-void SkBitmapCache::attachToHead(Entry* entry) const {
-    entry->fPrev = NULL;
+void SkGradientBitmapCache::attachToHead(Entry* entry) const {
+    entry->fPrev = nullptr;
     entry->fNext = fHead;
     if (fHead) {
         fHead->fPrev = entry;
@@ -80,7 +80,7 @@ void SkBitmapCache::attachToHead(Entry* entry) const {
     fHead = entry;
 }
 
-bool SkBitmapCache::find(const void* buffer, size_t size, SkBitmap* bm) const {
+bool SkGradientBitmapCache::find(const void* buffer, size_t size, SkBitmap* bm) const {
     AutoValidate av(this);
 
     Entry* entry = fHead;
@@ -99,7 +99,7 @@ bool SkBitmapCache::find(const void* buffer, size_t size, SkBitmap* bm) const {
     return false;
 }
 
-void SkBitmapCache::add(const void* buffer, size_t len, const SkBitmap& bm) {
+void SkGradientBitmapCache::add(const void* buffer, size_t len, const SkBitmap& bm) {
     AutoValidate av(this);
 
     if (fEntryCount == fMaxEntries) {
@@ -108,7 +108,7 @@ void SkBitmapCache::add(const void* buffer, size_t len, const SkBitmap& bm) {
         fEntryCount -= 1;
     }
 
-    Entry* entry = SkNEW_ARGS(Entry, (buffer, len, bm));
+    Entry* entry = new Entry(buffer, len, bm);
     this->attachToHead(entry);
     fEntryCount += 1;
 }
@@ -117,12 +117,12 @@ void SkBitmapCache::add(const void* buffer, size_t len, const SkBitmap& bm) {
 
 #ifdef SK_DEBUG
 
-void SkBitmapCache::validate() const {
+void SkGradientBitmapCache::validate() const {
     SkASSERT(fEntryCount >= 0 && fEntryCount <= fMaxEntries);
 
     if (fEntryCount > 0) {
-        SkASSERT(NULL == fHead->fPrev);
-        SkASSERT(NULL == fTail->fNext);
+        SkASSERT(nullptr == fHead->fPrev);
+        SkASSERT(nullptr == fTail->fNext);
 
         if (fEntryCount == 1) {
             SkASSERT(fHead == fTail);
@@ -145,8 +145,8 @@ void SkBitmapCache::validate() const {
         }
         SkASSERT(0 == count);
     } else {
-        SkASSERT(NULL == fHead);
-        SkASSERT(NULL == fTail);
+        SkASSERT(nullptr == fHead);
+        SkASSERT(nullptr == fTail);
     }
 }
 
diff --git a/gfx/skia/skia/src/effects/gradients/SkBitmapCache.h b/gfx/skia/skia/src/effects/gradients/SkGradientBitmapCache.h
similarity index 69%
rename from gfx/skia/skia/src/effects/gradients/SkBitmapCache.h
rename to gfx/skia/skia/src/effects/gradients/SkGradientBitmapCache.h
index d2af5e136fc9..009b9561a7c4 100644
--- a/gfx/skia/skia/src/effects/gradients/SkBitmapCache.h
+++ b/gfx/skia/skia/src/effects/gradients/SkGradientBitmapCache.h
@@ -7,15 +7,15 @@
  */
 
 
-#ifndef SkBitmapCache_DEFINED
-#define SkBitmapCache_DEFINED
+#ifndef SkGradientBitmapCache_DEFINED
+#define SkGradientBitmapCache_DEFINED
 
 #include "SkBitmap.h"
 
-class SkBitmapCache : SkNoncopyable {
+class SkGradientBitmapCache : SkNoncopyable {
 public:
-    SkBitmapCache(int maxEntries);
-    ~SkBitmapCache();
+    SkGradientBitmapCache(int maxEntries);
+    ~SkGradientBitmapCache();
 
     bool find(const void* buffer, size_t len, SkBitmap*) const;
     void add(const void* buffer, size_t len, const SkBitmap&);
@@ -39,10 +39,10 @@ private:
 
     class AutoValidate : SkNoncopyable {
     public:
-        AutoValidate(const SkBitmapCache* bc) : fBC(bc) { bc->validate(); }
+        AutoValidate(const SkGradientBitmapCache* bc) : fBC(bc) { bc->validate(); }
         ~AutoValidate() { fBC->validate(); }
     private:
-        const SkBitmapCache* fBC;
+        const SkGradientBitmapCache* fBC;
     };
 };
 
diff --git a/gfx/skia/skia/src/effects/gradients/SkGradientShader.cpp b/gfx/skia/skia/src/effects/gradients/SkGradientShader.cpp
index 48904fa8fd6c..e486e08a64b9 100644
--- a/gfx/skia/skia/src/effects/gradients/SkGradientShader.cpp
+++ b/gfx/skia/skia/src/effects/gradients/SkGradientShader.cpp
@@ -8,13 +8,69 @@
 #include "SkGradientShaderPriv.h"
 #include "SkLinearGradient.h"
 #include "SkRadialGradient.h"
-#include "SkTwoPointRadialGradient.h"
 #include "SkTwoPointConicalGradient.h"
 #include "SkSweepGradient.h"
 
-SkGradientShaderBase::SkGradientShaderBase(const Descriptor& desc, const SkMatrix* localMatrix)
-    : INHERITED(localMatrix)
+void SkGradientShaderBase::Descriptor::flatten(SkWriteBuffer& buffer) const {
+    buffer.writeColorArray(fColors, fCount);
+    if (fPos) {
+        buffer.writeBool(true);
+        buffer.writeScalarArray(fPos, fCount);
+    } else {
+        buffer.writeBool(false);
+    }
+    buffer.write32(fTileMode);
+    buffer.write32(fGradFlags);
+    if (fLocalMatrix) {
+        buffer.writeBool(true);
+        buffer.writeMatrix(*fLocalMatrix);
+    } else {
+        buffer.writeBool(false);
+    }
+}
+
+bool SkGradientShaderBase::DescriptorScope::unflatten(SkReadBuffer& buffer) {
+    fCount = buffer.getArrayCount();
+    if (fCount > kStorageCount) {
+        size_t allocSize = (sizeof(SkColor) + sizeof(SkScalar)) * fCount;
+        fDynamicStorage.reset(allocSize);
+        fColors = (SkColor*)fDynamicStorage.get();
+        fPos = (SkScalar*)(fColors + fCount);
+    } else {
+        fColors = fColorStorage;
+        fPos = fPosStorage;
+    }
+
+    if (!buffer.readColorArray(const_cast<SkColor*>(fColors), fCount)) {
+        return false;
+    }
+    if (buffer.readBool()) {
+        if (!buffer.readScalarArray(const_cast<SkScalar*>(fPos), fCount)) {
+            return false;
+        }
+    } else {
+        fPos = nullptr;
+    }
+
+    fTileMode = (SkShader::TileMode)buffer.read32();
+    fGradFlags = buffer.read32();
+
+    if (buffer.readBool()) {
+        fLocalMatrix = &fLocalMatrixStorage;
+        buffer.readMatrix(&fLocalMatrixStorage);
+    } else {
+        fLocalMatrix = nullptr;
+    }
+    return buffer.isValid();
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////
+
+SkGradientShaderBase::SkGradientShaderBase(const Descriptor& desc, const SkMatrix& ptsToUnit)
+    : INHERITED(desc.fLocalMatrix)
+    , fPtsToUnit(ptsToUnit)
 {
+    fPtsToUnit.getType();  // Precache so reads are threadsafe.
     SkASSERT(desc.fCount > 1);
 
     fGradFlags = SkToU8(desc.fGradFlags);
@@ -47,6 +103,9 @@ SkGradientShaderBase::SkGradientShaderBase(const Descriptor& desc, const SkMatri
 
     if (fColorCount > kColorStorageCount) {
         size_t size = sizeof(SkColor) + sizeof(Rec);
+        if (desc.fPos) {
+            size += sizeof(SkScalar);
+        }
         fOrigColors = reinterpret_cast<SkColor*>(
                                         sk_malloc_throw(size * fColorCount));
     }
@@ -67,13 +126,23 @@ SkGradientShaderBase::SkGradientShaderBase(const Descriptor& desc, const SkMatri
         }
     }
 
-    fRecs = (Rec*)(fOrigColors + fColorCount);
+    if (desc.fPos && fColorCount) {
+        fOrigPos = (SkScalar*)(fOrigColors + fColorCount);
+        fRecs = (Rec*)(fOrigPos + fColorCount);
+    } else {
+        fOrigPos = nullptr;
+        fRecs = (Rec*)(fOrigColors + fColorCount);
+    }
+
     if (fColorCount > 2) {
         Rec* recs = fRecs;
         recs->fPos = 0;
         //  recs->fScale = 0; // unused;
         recs += 1;
         if (desc.fPos) {
+            SkScalar* origPosPtr = fOrigPos;
+            *origPosPtr++ = 0;
+
             /*  We need to convert the user's array of relative positions into
                 fixed-point positions and scale factors. We need these results
                 to be strictly monotonic (no two values equal or out of order).
@@ -81,26 +150,23 @@ SkGradientShaderBase::SkGradientShaderBase(const Descriptor& desc, const SkMatri
                 value if it sees a segment out of order, and it assures that
                 we start at 0 and end at 1.0
             */
-            SkFixed prev = 0;
+            SkScalar prev = 0;
             int startIndex = dummyFirst ? 0 : 1;
             int count = desc.fCount + dummyLast;
             for (int i = startIndex; i < count; i++) {
                 // force the last value to be 1.0
-                SkFixed curr;
+                SkScalar curr;
                 if (i == desc.fCount) {  // we're really at the dummyLast
-                    curr = SK_Fixed1;
+                    curr = 1;
                 } else {
-                    curr = SkScalarToFixed(desc.fPos[i]);
+                    curr = SkScalarPin(desc.fPos[i], 0, 1);
                 }
-                // pin curr withing range
-                if (curr < 0) {
-                    curr = 0;
-                } else if (curr > SK_Fixed1) {
-                    curr = SK_Fixed1;
-                }
-                recs->fPos = curr;
-                if (curr > prev) {
-                    recs->fScale = (1 << 24) / (curr - prev);
+                *origPosPtr++ = curr;
+
+                recs->fPos = SkScalarToFixed(curr);
+                SkFixed diff = SkScalarToFixed(curr - prev);
+                if (diff > 0) {
+                    recs->fScale = (1 << 24) / diff;
                 } else {
                     recs->fScale = 0; // ignore this segment
                 }
@@ -109,6 +175,8 @@ SkGradientShaderBase::SkGradientShaderBase(const Descriptor& desc, const SkMatri
                 recs += 1;
             }
         } else {    // assume even distribution
+            fOrigPos = nullptr;
+
             SkFixed dp = SK_Fixed1 / (desc.fCount - 1);
             SkFixed p = dp;
             SkFixed scale = (desc.fCount - 1) << 8;  // (1 << 24) / dp
@@ -121,60 +189,14 @@ SkGradientShaderBase::SkGradientShaderBase(const Descriptor& desc, const SkMatri
             recs->fPos = SK_Fixed1;
             recs->fScale = scale;
         }
-    }
-    this->initCommon();
-}
-
-static uint32_t pack_mode_flags(SkShader::TileMode mode, uint32_t flags) {
-    SkASSERT(0 == (flags >> 28));
-    SkASSERT(0 == ((uint32_t)mode >> 4));
-    return (flags << 4) | mode;
-}
-
-static SkShader::TileMode unpack_mode(uint32_t packed) {
-    return (SkShader::TileMode)(packed & 0xF);
-}
-
-static uint32_t unpack_flags(uint32_t packed) {
-    return packed >> 4;
-}
-
-SkGradientShaderBase::SkGradientShaderBase(SkReadBuffer& buffer) : INHERITED(buffer) {
-    if (buffer.isVersionLT(SkReadBuffer::kNoUnitMappers_Version)) {
-        // skip the old SkUnitMapper slot
-        buffer.skipFlattenable();
-    }
-
-    int colorCount = fColorCount = buffer.getArrayCount();
-    if (colorCount > kColorStorageCount) {
-        size_t allocSize = (sizeof(SkColor) + sizeof(SkPMColor) + sizeof(Rec)) * colorCount;
-        if (buffer.validateAvailable(allocSize)) {
-            fOrigColors = reinterpret_cast<SkColor*>(sk_malloc_throw(allocSize));
-        } else {
-            fOrigColors =  NULL;
-            colorCount = fColorCount = 0;
-        }
-    } else {
-        fOrigColors = fStorage;
-    }
-    buffer.readColorArray(fOrigColors, colorCount);
-
-    {
-        uint32_t packed = buffer.readUInt();
-        fGradFlags = SkToU8(unpack_flags(packed));
-        fTileMode = unpack_mode(packed);
-    }
-    fTileProc = gTileProcs[fTileMode];
-    fRecs = (Rec*)(fOrigColors + colorCount);
-    if (colorCount > 2) {
-        Rec* recs = fRecs;
-        recs[0].fPos = 0;
-        for (int i = 1; i < colorCount; i++) {
-            recs[i].fPos = buffer.readInt();
-            recs[i].fScale = buffer.readUInt();
+    } else if (desc.fPos) {
+        SkASSERT(2 == fColorCount);
+        fOrigPos[0] = SkScalarPin(desc.fPos[0], 0, 1);
+        fOrigPos[1] = SkScalarPin(desc.fPos[1], fOrigPos[0], 1);
+        if (0 == fOrigPos[0] && 1 == fOrigPos[1]) {
+            fOrigPos = nullptr;
         }
     }
-    buffer.readMatrix(&fPtsToUnit);
     this->initCommon();
 }
 
@@ -193,17 +215,16 @@ void SkGradientShaderBase::initCommon() {
 }
 
 void SkGradientShaderBase::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
-    buffer.writeColorArray(fOrigColors, fColorCount);
-    buffer.writeUInt(pack_mode_flags(fTileMode, fGradFlags));
-    if (fColorCount > 2) {
-        Rec* recs = fRecs;
-        for (int i = 1; i < fColorCount; i++) {
-            buffer.writeInt(recs[i].fPos);
-            buffer.writeUInt(recs[i].fScale);
-        }
-    }
-    buffer.writeMatrix(fPtsToUnit);
+    Descriptor desc;
+    desc.fColors = fOrigColors;
+    desc.fPos = fOrigPos;
+    desc.fCount = fColorCount;
+    desc.fTileMode = fTileMode;
+    desc.fGradFlags = fGradFlags;
+
+    const SkMatrix& m = this->getLocalMatrix();
+    desc.fLocalMatrix = m.isIdentity() ? nullptr : &m;
+    desc.flatten(buffer);
 }
 
 SkGradientShaderBase::GpuColorType SkGradientShaderBase::getGpuColorType(SkColor colors[3]) const {
@@ -243,18 +264,41 @@ void SkGradientShaderBase::FlipGradientColors(SkColor* colorDst, Rec* recDst,
     memcpy(colorDst, colorsTemp.get(), count * sizeof(SkColor));
 }
 
-void SkGradientShaderBase::flipGradientColors() {
-    FlipGradientColors(fOrigColors, fRecs, fOrigColors, fRecs, fColorCount);
-}
-
 bool SkGradientShaderBase::isOpaque() const {
     return fColorsAreOpaque;
 }
 
+static unsigned rounded_divide(unsigned numer, unsigned denom) {
+    return (numer + (denom >> 1)) / denom;
+}
+
+bool SkGradientShaderBase::onAsLuminanceColor(SkColor* lum) const {
+    // we just compute an average color.
+    // possibly we could weight this based on the proportional width for each color
+    //   assuming they are not evenly distributed in the fPos array.
+    int r = 0;
+    int g = 0;
+    int b = 0;
+    const int n = fColorCount;
+    for (int i = 0; i < n; ++i) {
+        SkColor c = fOrigColors[i];
+        r += SkColorGetR(c);
+        g += SkColorGetG(c);
+        b += SkColorGetB(c);
+    }
+    *lum = SkColorSetRGB(rounded_divide(r, n), rounded_divide(g, n), rounded_divide(b, n));
+    return true;
+}
+
 SkGradientShaderBase::GradientShaderBaseContext::GradientShaderBaseContext(
         const SkGradientShaderBase& shader, const ContextRec& rec)
     : INHERITED(shader, rec)
-    , fCache(shader.refCache(getPaintAlpha()))
+#ifdef SK_SUPPORT_LEGACY_GRADIENT_DITHERING
+    , fDither(true)
+#else
+    , fDither(rec.fPaint->isDither())
+#endif
+    , fCache(shader.refCache(getPaintAlpha(), fDither))
 {
     const SkMatrix& inverse = this->getTotalInverse();
 
@@ -278,17 +322,18 @@ SkGradientShaderBase::GradientShaderBaseContext::GradientShaderBaseContext(
 }
 
 SkGradientShaderBase::GradientShaderCache::GradientShaderCache(
-        U8CPU alpha, const SkGradientShaderBase& shader)
+        U8CPU alpha, bool dither, const SkGradientShaderBase& shader)
     : fCacheAlpha(alpha)
+    , fCacheDither(dither)
     , fShader(shader)
     , fCache16Inited(false)
     , fCache32Inited(false)
 {
     // Only initialize the cache in getCache16/32.
-    fCache16 = NULL;
-    fCache32 = NULL;
-    fCache16Storage = NULL;
-    fCache32PixelRef = NULL;
+    fCache16 = nullptr;
+    fCache32 = nullptr;
+    fCache16Storage = nullptr;
+    fCache32PixelRef = nullptr;
 }
 
 SkGradientShaderBase::GradientShaderCache::~GradientShaderCache() {
@@ -303,7 +348,7 @@ SkGradientShaderBase::GradientShaderCache::~GradientShaderCache() {
     paint specifies a non-opaque alpha.
 */
 void SkGradientShaderBase::GradientShaderCache::Build16bitCache(
-        uint16_t cache[], SkColor c0, SkColor c1, int count) {
+        uint16_t cache[], SkColor c0, SkColor c1, int count, bool dither) {
     SkASSERT(count > 1);
     SkASSERT(SkColorGetA(c0) == 0xFF);
     SkASSERT(SkColorGetA(c1) == 0xFF);
@@ -320,17 +365,31 @@ void SkGradientShaderBase::GradientShaderCache::Build16bitCache(
     g = SkIntToFixed(g) + 0x8000;
     b = SkIntToFixed(b) + 0x8000;
 
-    do {
-        unsigned rr = r >> 16;
-        unsigned gg = g >> 16;
-        unsigned bb = b >> 16;
-        cache[0] = SkPackRGB16(SkR32ToR16(rr), SkG32ToG16(gg), SkB32ToB16(bb));
-        cache[kCache16Count] = SkDitherPack888ToRGB16(rr, gg, bb);
-        cache += 1;
-        r += dr;
-        g += dg;
-        b += db;
-    } while (--count != 0);
+    if (dither) {
+        do {
+            unsigned rr = r >> 16;
+            unsigned gg = g >> 16;
+            unsigned bb = b >> 16;
+            cache[0] = SkPackRGB16(SkR32ToR16(rr), SkG32ToG16(gg), SkB32ToB16(bb));
+            cache[kCache16Count] = SkDitherPack888ToRGB16(rr, gg, bb);
+            cache += 1;
+            r += dr;
+            g += dg;
+            b += db;
+        } while (--count != 0);
+    } else {
+        do {
+            unsigned rr = r >> 16;
+            unsigned gg = g >> 16;
+            unsigned bb = b >> 16;
+            cache[0] = SkPackRGB16(SkR32ToR16(rr), SkG32ToG16(gg), SkB32ToB16(bb));
+            cache[kCache16Count] = cache[0];
+            cache += 1;
+            r += dr;
+            g += dg;
+            b += db;
+        } while (--count != 0);
+    }
 }
 
 /*
@@ -353,7 +412,7 @@ typedef uint32_t SkUFixed;
 
 void SkGradientShaderBase::GradientShaderCache::Build32bitCache(
         SkPMColor cache[], SkColor c0, SkColor c1,
-        int count, U8CPU paintAlpha, uint32_t gradFlags) {
+        int count, U8CPU paintAlpha, uint32_t gradFlags, bool dither) {
     SkASSERT(count > 1);
 
     // need to apply paintAlpha to our two endpoints
@@ -393,10 +452,15 @@ void SkGradientShaderBase::GradientShaderCache::Build32bitCache(
         With this trick, we can add 0 for the first (no-op) and just adjust the
         others.
      */
-    SkUFixed a = SkIntToFixed(a0) + 0x2000;
-    SkUFixed r = SkIntToFixed(r0) + 0x2000;
-    SkUFixed g = SkIntToFixed(g0) + 0x2000;
-    SkUFixed b = SkIntToFixed(b0) + 0x2000;
+    const SkUFixed bias0 = dither ? 0x2000 : 0x8000;
+    const SkUFixed bias1 = dither ? 0x8000 : 0;
+    const SkUFixed bias2 = dither ? 0xC000 : 0;
+    const SkUFixed bias3 = dither ? 0x4000 : 0;
+
+    SkUFixed a = SkIntToFixed(a0) + bias0;
+    SkUFixed r = SkIntToFixed(r0) + bias0;
+    SkUFixed g = SkIntToFixed(g0) + bias0;
+    SkUFixed b = SkIntToFixed(b0) + bias0;
 
     /*
      *  Our dither-cell (spatially) is
@@ -411,18 +475,18 @@ void SkGradientShaderBase::GradientShaderCache::Build32bitCache(
 
     if (0xFF == a0 && 0 == da) {
         do {
-            cache[kCache32Count*0] = SkPackARGB32(0xFF, (r + 0     ) >> 16,
-                                                        (g + 0     ) >> 16,
-                                                        (b + 0     ) >> 16);
-            cache[kCache32Count*1] = SkPackARGB32(0xFF, (r + 0x8000) >> 16,
-                                                        (g + 0x8000) >> 16,
-                                                        (b + 0x8000) >> 16);
-            cache[kCache32Count*2] = SkPackARGB32(0xFF, (r + 0xC000) >> 16,
-                                                        (g + 0xC000) >> 16,
-                                                        (b + 0xC000) >> 16);
-            cache[kCache32Count*3] = SkPackARGB32(0xFF, (r + 0x4000) >> 16,
-                                                        (g + 0x4000) >> 16,
-                                                        (b + 0x4000) >> 16);
+            cache[kCache32Count*0] = SkPackARGB32(0xFF, (r + 0    ) >> 16,
+                                                        (g + 0    ) >> 16,
+                                                        (b + 0    ) >> 16);
+            cache[kCache32Count*1] = SkPackARGB32(0xFF, (r + bias1) >> 16,
+                                                        (g + bias1) >> 16,
+                                                        (b + bias1) >> 16);
+            cache[kCache32Count*2] = SkPackARGB32(0xFF, (r + bias2) >> 16,
+                                                        (g + bias2) >> 16,
+                                                        (b + bias2) >> 16);
+            cache[kCache32Count*3] = SkPackARGB32(0xFF, (r + bias3) >> 16,
+                                                        (g + bias3) >> 16,
+                                                        (b + bias3) >> 16);
             cache += 1;
             r += dr;
             g += dg;
@@ -430,22 +494,22 @@ void SkGradientShaderBase::GradientShaderCache::Build32bitCache(
         } while (--count != 0);
     } else if (interpInPremul) {
         do {
-            cache[kCache32Count*0] = SkPackARGB32((a + 0     ) >> 16,
-                                                  (r + 0     ) >> 16,
-                                                  (g + 0     ) >> 16,
-                                                  (b + 0     ) >> 16);
-            cache[kCache32Count*1] = SkPackARGB32((a + 0x8000) >> 16,
-                                                  (r + 0x8000) >> 16,
-                                                  (g + 0x8000) >> 16,
-                                                  (b + 0x8000) >> 16);
-            cache[kCache32Count*2] = SkPackARGB32((a + 0xC000) >> 16,
-                                                  (r + 0xC000) >> 16,
-                                                  (g + 0xC000) >> 16,
-                                                  (b + 0xC000) >> 16);
-            cache[kCache32Count*3] = SkPackARGB32((a + 0x4000) >> 16,
-                                                  (r + 0x4000) >> 16,
-                                                  (g + 0x4000) >> 16,
-                                                  (b + 0x4000) >> 16);
+            cache[kCache32Count*0] = SkPackARGB32((a + 0    ) >> 16,
+                                                  (r + 0    ) >> 16,
+                                                  (g + 0    ) >> 16,
+                                                  (b + 0    ) >> 16);
+            cache[kCache32Count*1] = SkPackARGB32((a + bias1) >> 16,
+                                                  (r + bias1) >> 16,
+                                                  (g + bias1) >> 16,
+                                                  (b + bias1) >> 16);
+            cache[kCache32Count*2] = SkPackARGB32((a + bias2) >> 16,
+                                                  (r + bias2) >> 16,
+                                                  (g + bias2) >> 16,
+                                                  (b + bias2) >> 16);
+            cache[kCache32Count*3] = SkPackARGB32((a + bias3) >> 16,
+                                                  (r + bias3) >> 16,
+                                                  (g + bias3) >> 16,
+                                                  (b + bias3) >> 16);
             cache += 1;
             a += da;
             r += dr;
@@ -458,18 +522,18 @@ void SkGradientShaderBase::GradientShaderCache::Build32bitCache(
                                                              (r + 0     ) >> 16,
                                                              (g + 0     ) >> 16,
                                                              (b + 0     ) >> 16);
-            cache[kCache32Count*1] = SkPremultiplyARGBInline((a + 0x8000) >> 16,
-                                                             (r + 0x8000) >> 16,
-                                                             (g + 0x8000) >> 16,
-                                                             (b + 0x8000) >> 16);
-            cache[kCache32Count*2] = SkPremultiplyARGBInline((a + 0xC000) >> 16,
-                                                             (r + 0xC000) >> 16,
-                                                             (g + 0xC000) >> 16,
-                                                             (b + 0xC000) >> 16);
-            cache[kCache32Count*3] = SkPremultiplyARGBInline((a + 0x4000) >> 16,
-                                                             (r + 0x4000) >> 16,
-                                                             (g + 0x4000) >> 16,
-                                                             (b + 0x4000) >> 16);
+            cache[kCache32Count*1] = SkPremultiplyARGBInline((a + bias1) >> 16,
+                                                             (r + bias1) >> 16,
+                                                             (g + bias1) >> 16,
+                                                             (b + bias1) >> 16);
+            cache[kCache32Count*2] = SkPremultiplyARGBInline((a + bias2) >> 16,
+                                                             (r + bias2) >> 16,
+                                                             (g + bias2) >> 16,
+                                                             (b + bias2) >> 16);
+            cache[kCache32Count*3] = SkPremultiplyARGBInline((a + bias3) >> 16,
+                                                             (r + bias3) >> 16,
+                                                             (g + bias3) >> 16,
+                                                             (b + bias3) >> 16);
             cache += 1;
             a += da;
             r += dr;
@@ -496,12 +560,12 @@ void SkGradientShaderBase::GradientShaderCache::initCache16(GradientShaderCache*
     const int entryCount = kCache16Count * 2;
     const size_t allocSize = sizeof(uint16_t) * entryCount;
 
-    SkASSERT(NULL == cache->fCache16Storage);
+    SkASSERT(nullptr == cache->fCache16Storage);
     cache->fCache16Storage = (uint16_t*)sk_malloc_throw(allocSize);
     cache->fCache16 = cache->fCache16Storage;
     if (cache->fShader.fColorCount == 2) {
         Build16bitCache(cache->fCache16, cache->fShader.fOrigColors[0],
-                        cache->fShader.fOrigColors[1], kCache16Count);
+                        cache->fShader.fOrigColors[1], kCache16Count, cache->fCacheDither);
     } else {
         Rec* rec = cache->fShader.fRecs;
         int prevIndex = 0;
@@ -511,7 +575,8 @@ void SkGradientShaderBase::GradientShaderCache::initCache16(GradientShaderCache*
 
             if (nextIndex > prevIndex)
                 Build16bitCache(cache->fCache16 + prevIndex, cache->fShader.fOrigColors[i-1],
-                                cache->fShader.fOrigColors[i], nextIndex - prevIndex + 1);
+                                cache->fShader.fOrigColors[i], nextIndex - prevIndex + 1,
+                                cache->fCacheDither);
             prevIndex = nextIndex;
         }
     }
@@ -525,19 +590,16 @@ const SkPMColor* SkGradientShaderBase::GradientShaderCache::getCache32() {
 }
 
 void SkGradientShaderBase::GradientShaderCache::initCache32(GradientShaderCache* cache) {
-    SkImageInfo info;
-    info.fWidth = kCache32Count;
-    info.fHeight = 4;   // for our 4 dither rows
-    info.fAlphaType = kPremul_SkAlphaType;
-    info.fColorType = kN32_SkColorType;
+    const int kNumberOfDitherRows = 4;
+    const SkImageInfo info = SkImageInfo::MakeN32Premul(kCache32Count, kNumberOfDitherRows);
 
-    SkASSERT(NULL == cache->fCache32PixelRef);
-    cache->fCache32PixelRef = SkMallocPixelRef::NewAllocate(info, 0, NULL);
+    SkASSERT(nullptr == cache->fCache32PixelRef);
+    cache->fCache32PixelRef = SkMallocPixelRef::NewAllocate(info, 0, nullptr);
     cache->fCache32 = (SkPMColor*)cache->fCache32PixelRef->getAddr();
     if (cache->fShader.fColorCount == 2) {
         Build32bitCache(cache->fCache32, cache->fShader.fOrigColors[0],
                         cache->fShader.fOrigColors[1], kCache32Count, cache->fCacheAlpha,
-                        cache->fShader.fGradFlags);
+                        cache->fShader.fGradFlags, cache->fCacheDither);
     } else {
         Rec* rec = cache->fShader.fRecs;
         int prevIndex = 0;
@@ -548,7 +610,7 @@ void SkGradientShaderBase::GradientShaderCache::initCache32(GradientShaderCache*
             if (nextIndex > prevIndex)
                 Build32bitCache(cache->fCache32 + prevIndex, cache->fShader.fOrigColors[i-1],
                                 cache->fShader.fOrigColors[i], nextIndex - prevIndex + 1,
-                                cache->fCacheAlpha, cache->fShader.fGradFlags);
+                                cache->fCacheAlpha, cache->fShader.fGradFlags, cache->fCacheDither);
             prevIndex = nextIndex;
         }
     }
@@ -558,10 +620,11 @@ void SkGradientShaderBase::GradientShaderCache::initCache32(GradientShaderCache*
  *  The gradient holds a cache for the most recent value of alpha. Successive
  *  callers with the same alpha value will share the same cache.
  */
-SkGradientShaderBase::GradientShaderCache* SkGradientShaderBase::refCache(U8CPU alpha) const {
+SkGradientShaderBase::GradientShaderCache* SkGradientShaderBase::refCache(U8CPU alpha,
+                                                                          bool dither) const {
     SkAutoMutexAcquire ama(fCacheMutex);
-    if (!fCache || fCache->getAlpha() != alpha) {
-        fCache.reset(SkNEW_ARGS(GradientShaderCache, (alpha, *this)));
+    if (!fCache || fCache->getAlpha() != alpha || fCache->getDither() != dither) {
+        fCache.reset(new GradientShaderCache(alpha, dither, *this));
     }
     // Increment the ref counter inside the mutex to ensure the returned pointer is still valid.
     // Otherwise, the pointer may have been overwritten on a different thread before the object's
@@ -582,7 +645,7 @@ SK_DECLARE_STATIC_MUTEX(gGradientCacheMutex);
 void SkGradientShaderBase::getGradientTableBitmap(SkBitmap* bitmap) const {
     // our caller assumes no external alpha, so we ensure that our cache is
     // built with 0xFF
-    SkAutoTUnref<GradientShaderCache> cache(this->refCache(0xFF));
+    SkAutoTUnref<GradientShaderCache> cache(this->refCache(0xFF, true));
 
     // build our key: [numColors + colors[] + {positions[]} + flags ]
     int count = 1 + fColorCount + 1;
@@ -606,13 +669,13 @@ void SkGradientShaderBase::getGradientTableBitmap(SkBitmap* bitmap) const {
 
     ///////////////////////////////////
 
-    static SkBitmapCache* gCache;
+    static SkGradientBitmapCache* gCache;
     // each cache cost 1K of RAM, since each bitmap will be 1x256 at 32bpp
     static const int MAX_NUM_CACHED_GRADIENT_BITMAPS = 32;
     SkAutoMutexAcquire ama(gGradientCacheMutex);
 
-    if (NULL == gCache) {
-        gCache = SkNEW_ARGS(SkBitmapCache, (MAX_NUM_CACHED_GRADIENT_BITMAPS));
+    if (nullptr == gCache) {
+        gCache = new SkGradientBitmapCache(MAX_NUM_CACHED_GRADIENT_BITMAPS);
     }
     size_t size = count * sizeof(int32_t);
 
@@ -667,7 +730,7 @@ void SkGradientShaderBase::toString(SkString* str) const {
     str->appendf("%d colors: ", fColorCount);
 
     for (int i = 0; i < fColorCount; ++i) {
-        str->appendHex(fOrigColors[i]);
+        str->appendHex(fOrigColors[i], 8);
         if (i < fColorCount-1) {
             str->append(", ");
         }
@@ -698,6 +761,12 @@ void SkGradientShaderBase::toString(SkString* str) const {
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
+// Return true if these parameters are valid/legal/safe to construct a gradient
+//
+static bool valid_grad(const SkColor colors[], const SkScalar pos[], int count, unsigned tileMode) {
+    return nullptr != colors && count >= 1 && tileMode < (unsigned)SkShader::kTileModeCount;
+}
+
 // assumes colors is SkColor* and pos is SkScalar*
 #define EXPAND_1_COLOR(count)               \
     SkColor tmp[2];                         \
@@ -705,20 +774,20 @@ void SkGradientShaderBase::toString(SkString* str) const {
         if (1 == count) {                   \
             tmp[0] = tmp[1] = colors[0];    \
             colors = tmp;                   \
-            pos = NULL;                     \
+            pos = nullptr;                     \
             count = 2;                      \
         }                                   \
     } while (0)
 
 static void desc_init(SkGradientShaderBase::Descriptor* desc,
-                      const SkColor colors[],
-                      const SkScalar pos[], int colorCount,
-                      SkShader::TileMode mode, uint32_t flags) {
+                      const SkColor colors[], const SkScalar pos[], int colorCount,
+                      SkShader::TileMode mode, uint32_t flags, const SkMatrix* localMatrix) {
     desc->fColors       = colors;
     desc->fPos          = pos;
     desc->fCount        = colorCount;
     desc->fTileMode     = mode;
     desc->fGradFlags    = flags;
+    desc->fLocalMatrix  = localMatrix;
 }
 
 SkShader* SkGradientShader::CreateLinear(const SkPoint pts[2],
@@ -727,14 +796,17 @@ SkShader* SkGradientShader::CreateLinear(const SkPoint pts[2],
                                          SkShader::TileMode mode,
                                          uint32_t flags,
                                          const SkMatrix* localMatrix) {
-    if (NULL == pts || NULL == colors || colorCount < 1) {
-        return NULL;
+    if (!pts) {
+        return nullptr;
+    }
+    if (!valid_grad(colors, pos, colorCount, mode)) {
+        return nullptr;
     }
     EXPAND_1_COLOR(colorCount);
 
     SkGradientShaderBase::Descriptor desc;
-    desc_init(&desc, colors, pos, colorCount, mode, flags);
-    return SkNEW_ARGS(SkLinearGradient, (pts, desc, localMatrix));
+    desc_init(&desc, colors, pos, colorCount, mode, flags, localMatrix);
+    return new SkLinearGradient(pts, desc);
 }
 
 SkShader* SkGradientShader::CreateRadial(const SkPoint& center, SkScalar radius,
@@ -743,35 +815,17 @@ SkShader* SkGradientShader::CreateRadial(const SkPoint& center, SkScalar radius,
                                          SkShader::TileMode mode,
                                          uint32_t flags,
                                          const SkMatrix* localMatrix) {
-    if (radius <= 0 || NULL == colors || colorCount < 1) {
-        return NULL;
+    if (radius <= 0) {
+        return nullptr;
+    }
+    if (!valid_grad(colors, pos, colorCount, mode)) {
+        return nullptr;
     }
     EXPAND_1_COLOR(colorCount);
 
     SkGradientShaderBase::Descriptor desc;
-    desc_init(&desc, colors, pos, colorCount, mode, flags);
-    return SkNEW_ARGS(SkRadialGradient, (center, radius, desc, localMatrix));
-}
-
-SkShader* SkGradientShader::CreateTwoPointRadial(const SkPoint& start,
-                                                 SkScalar startRadius,
-                                                 const SkPoint& end,
-                                                 SkScalar endRadius,
-                                                 const SkColor colors[],
-                                                 const SkScalar pos[],
-                                                 int colorCount,
-                                                 SkShader::TileMode mode,
-                                                 uint32_t flags,
-                                                 const SkMatrix* localMatrix) {
-    if (startRadius < 0 || endRadius < 0 || NULL == colors || colorCount < 1) {
-        return NULL;
-    }
-    EXPAND_1_COLOR(colorCount);
-
-    SkGradientShaderBase::Descriptor desc;
-    desc_init(&desc, colors, pos, colorCount, mode, flags);
-    return SkNEW_ARGS(SkTwoPointRadialGradient,
-                      (start, startRadius, end, endRadius, desc, localMatrix));
+    desc_init(&desc, colors, pos, colorCount, mode, flags, localMatrix);
+    return new SkRadialGradient(center, radius, desc);
 }
 
 SkShader* SkGradientShader::CreateTwoPointConical(const SkPoint& start,
@@ -784,8 +838,11 @@ SkShader* SkGradientShader::CreateTwoPointConical(const SkPoint& start,
                                                   SkShader::TileMode mode,
                                                   uint32_t flags,
                                                   const SkMatrix* localMatrix) {
-    if (startRadius < 0 || endRadius < 0 || NULL == colors || colorCount < 1) {
-        return NULL;
+    if (startRadius < 0 || endRadius < 0) {
+        return nullptr;
+    }
+    if (!valid_grad(colors, pos, colorCount, mode)) {
+        return nullptr;
     }
     if (start == end && startRadius == endRadius) {
         return SkShader::CreateEmptyShader();
@@ -798,9 +855,9 @@ SkShader* SkGradientShader::CreateTwoPointConical(const SkPoint& start,
     SkGradientShaderBase::Descriptor desc;
 
     if (!flipGradient) {
-        desc_init(&desc, colors, pos, colorCount, mode, flags);
-        return SkNEW_ARGS(SkTwoPointConicalGradient,
-                          (start, startRadius, end, endRadius, flipGradient, desc, localMatrix));
+        desc_init(&desc, colors, pos, colorCount, mode, flags, localMatrix);
+        return new SkTwoPointConicalGradient(start, startRadius, end, endRadius, flipGradient,
+                                             desc);
     } else {
         SkAutoSTArray<8, SkColor> colorsNew(colorCount);
         SkAutoSTArray<8, SkScalar> posNew(colorCount);
@@ -812,13 +869,13 @@ SkShader* SkGradientShader::CreateTwoPointConical(const SkPoint& start,
             for (int i = 0; i < colorCount; ++i) {
                 posNew[i] = 1 - pos[colorCount - i - 1];
             }
-            desc_init(&desc, colorsNew.get(), posNew.get(), colorCount, mode, flags);
+            desc_init(&desc, colorsNew.get(), posNew.get(), colorCount, mode, flags, localMatrix);
         } else {
-            desc_init(&desc, colorsNew.get(), NULL, colorCount, mode, flags);
+            desc_init(&desc, colorsNew.get(), nullptr, colorCount, mode, flags, localMatrix);
         }
 
-        return SkNEW_ARGS(SkTwoPointConicalGradient,
-                          (end, endRadius, start, startRadius, flipGradient, desc, localMatrix));
+        return new SkTwoPointConicalGradient(end, endRadius, start, startRadius, flipGradient,
+                                             desc);
     }
 }
 
@@ -828,21 +885,20 @@ SkShader* SkGradientShader::CreateSweep(SkScalar cx, SkScalar cy,
                                         int colorCount,
                                         uint32_t flags,
                                         const SkMatrix* localMatrix) {
-    if (NULL == colors || colorCount < 1) {
-        return NULL;
+    if (!valid_grad(colors, pos, colorCount, SkShader::kClamp_TileMode)) {
+        return nullptr;
     }
     EXPAND_1_COLOR(colorCount);
 
     SkGradientShaderBase::Descriptor desc;
-    desc_init(&desc, colors, pos, colorCount, SkShader::kClamp_TileMode, flags);
-    return SkNEW_ARGS(SkSweepGradient, (cx, cy, desc, localMatrix));
+    desc_init(&desc, colors, pos, colorCount, SkShader::kClamp_TileMode, flags, localMatrix);
+    return new SkSweepGradient(cx, cy, desc);
 }
 
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkGradientShader)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLinearGradient)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkRadialGradient)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkSweepGradient)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkTwoPointRadialGradient)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkTwoPointConicalGradient)
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END
 
@@ -851,107 +907,115 @@ SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END
 #if SK_SUPPORT_GPU
 
 #include "effects/GrTextureStripAtlas.h"
-#include "GrTBackendEffectFactory.h"
-#include "gl/GrGLShaderBuilder.h"
+#include "GrInvariantOutput.h"
+#include "gl/GrGLContext.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
 #include "SkGr.h"
 
-GrGLGradientEffect::GrGLGradientEffect(const GrBackendEffectFactory& factory)
-    : INHERITED(factory)
-    , fCachedYCoord(SK_ScalarMax) {
+GrGLGradientEffect::GrGLGradientEffect()
+    : fCachedYCoord(SK_ScalarMax) {
 }
 
 GrGLGradientEffect::~GrGLGradientEffect() { }
 
-void GrGLGradientEffect::emitUniforms(GrGLShaderBuilder* builder, uint32_t baseKey) {
+void GrGLGradientEffect::emitUniforms(GrGLSLFPBuilder* builder, const GrGradientEffect& ge) {
 
-    if (SkGradientShaderBase::kTwo_GpuColorType == ColorTypeFromKey(baseKey)) { // 2 Color case
-        fColorStartUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                             kVec4f_GrSLType, "GradientStartColor");
-        fColorEndUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                           kVec4f_GrSLType, "GradientEndColor");
+    if (SkGradientShaderBase::kTwo_GpuColorType == ge.getColorType()) { // 2 Color case
+        fColorStartUni = builder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                             kVec4f_GrSLType, kDefault_GrSLPrecision,
+                                            "GradientStartColor");
+        fColorEndUni = builder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                           kVec4f_GrSLType, kDefault_GrSLPrecision,
+                                           "GradientEndColor");
 
-    } else if (SkGradientShaderBase::kThree_GpuColorType == ColorTypeFromKey(baseKey)){ // 3 Color Case
-        fColorStartUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                             kVec4f_GrSLType, "GradientStartColor");
-        fColorMidUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                           kVec4f_GrSLType, "GradientMidColor");
-        fColorEndUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                             kVec4f_GrSLType, "GradientEndColor");
+    } else if (SkGradientShaderBase::kThree_GpuColorType == ge.getColorType()) { // 3 Color Case
+        fColorStartUni = builder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                             kVec4f_GrSLType,  kDefault_GrSLPrecision,
+                                             "GradientStartColor");
+        fColorMidUni = builder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                           kVec4f_GrSLType, kDefault_GrSLPrecision,
+                                           "GradientMidColor");
+        fColorEndUni = builder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                           kVec4f_GrSLType, kDefault_GrSLPrecision,
+                                           "GradientEndColor");
 
     } else { // if not a fast case
-        fFSYUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                      kFloat_GrSLType, "GradientYCoordFS");
+        fFSYUni = builder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                      kFloat_GrSLType, kDefault_GrSLPrecision,
+                                      "GradientYCoordFS");
     }
 }
 
-static inline void set_color_uni(const GrGLUniformManager& uman,
-                                 const GrGLUniformManager::UniformHandle uni,
+static inline void set_color_uni(const GrGLSLProgramDataManager& pdman,
+                                 const GrGLSLProgramDataManager::UniformHandle uni,
                                  const SkColor* color) {
-       uman.set4f(uni,
-                  SkColorGetR(*color) / 255.f,
-                  SkColorGetG(*color) / 255.f,
-                  SkColorGetB(*color) / 255.f,
-                  SkColorGetA(*color) / 255.f);
+       pdman.set4f(uni,
+                   SkColorGetR(*color) / 255.f,
+                   SkColorGetG(*color) / 255.f,
+                   SkColorGetB(*color) / 255.f,
+                   SkColorGetA(*color) / 255.f);
 }
 
-static inline void set_mul_color_uni(const GrGLUniformManager& uman,
-                                     const GrGLUniformManager::UniformHandle uni,
+static inline void set_mul_color_uni(const GrGLSLProgramDataManager& pdman,
+                                     const GrGLSLProgramDataManager::UniformHandle uni,
                                      const SkColor* color){
        float a = SkColorGetA(*color) / 255.f;
        float aDiv255 = a / 255.f;
-       uman.set4f(uni,
-                  SkColorGetR(*color) * aDiv255,
-                  SkColorGetG(*color) * aDiv255,
-                  SkColorGetB(*color) * aDiv255,
-                  a);
+       pdman.set4f(uni,
+                   SkColorGetR(*color) * aDiv255,
+                   SkColorGetG(*color) * aDiv255,
+                   SkColorGetB(*color) * aDiv255,
+                   a);
 }
 
-void GrGLGradientEffect::setData(const GrGLUniformManager& uman,
-                                 const GrDrawEffect& drawEffect) {
+void GrGLGradientEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                                   const GrProcessor& processor) {
 
-    const GrGradientEffect& e = drawEffect.castEffect<GrGradientEffect>();
+    const GrGradientEffect& e = processor.cast<GrGradientEffect>();
 
 
     if (SkGradientShaderBase::kTwo_GpuColorType == e.getColorType()){
 
         if (GrGradientEffect::kBeforeInterp_PremulType == e.getPremulType()) {
-            set_mul_color_uni(uman, fColorStartUni, e.getColors(0));
-            set_mul_color_uni(uman, fColorEndUni,   e.getColors(1));
+            set_mul_color_uni(pdman, fColorStartUni, e.getColors(0));
+            set_mul_color_uni(pdman, fColorEndUni,   e.getColors(1));
         } else {
-            set_color_uni(uman, fColorStartUni, e.getColors(0));
-            set_color_uni(uman, fColorEndUni,   e.getColors(1));
+            set_color_uni(pdman, fColorStartUni, e.getColors(0));
+            set_color_uni(pdman, fColorEndUni,   e.getColors(1));
         }
 
     } else if (SkGradientShaderBase::kThree_GpuColorType == e.getColorType()){
 
         if (GrGradientEffect::kBeforeInterp_PremulType == e.getPremulType()) {
-            set_mul_color_uni(uman, fColorStartUni, e.getColors(0));
-            set_mul_color_uni(uman, fColorMidUni,   e.getColors(1));
-            set_mul_color_uni(uman, fColorEndUni,   e.getColors(2));
+            set_mul_color_uni(pdman, fColorStartUni, e.getColors(0));
+            set_mul_color_uni(pdman, fColorMidUni,   e.getColors(1));
+            set_mul_color_uni(pdman, fColorEndUni,   e.getColors(2));
         } else {
-            set_color_uni(uman, fColorStartUni, e.getColors(0));
-            set_color_uni(uman, fColorMidUni,   e.getColors(1));
-            set_color_uni(uman, fColorEndUni,   e.getColors(2));
+            set_color_uni(pdman, fColorStartUni, e.getColors(0));
+            set_color_uni(pdman, fColorMidUni,   e.getColors(1));
+            set_color_uni(pdman, fColorEndUni,   e.getColors(2));
         }
     } else {
 
         SkScalar yCoord = e.getYCoord();
         if (yCoord != fCachedYCoord) {
-            uman.set1f(fFSYUni, yCoord);
+            pdman.set1f(fFSYUni, yCoord);
             fCachedYCoord = yCoord;
         }
     }
 }
 
 
-uint32_t GrGLGradientEffect::GenBaseGradientKey(const GrDrawEffect& drawEffect) {
-    const GrGradientEffect& e = drawEffect.castEffect<GrGradientEffect>();
+uint32_t GrGLGradientEffect::GenBaseGradientKey(const GrProcessor& processor) {
+    const GrGradientEffect& e = processor.cast<GrGradientEffect>();
 
     uint32_t key = 0;
 
     if (SkGradientShaderBase::kTwo_GpuColorType == e.getColorType()) {
         key |= kTwoColorKey;
-    } else if (SkGradientShaderBase::kThree_GpuColorType == e.getColorType()){
+    } else if (SkGradientShaderBase::kThree_GpuColorType == e.getColorType()) {
         key |= kThreeColorKey;
     }
 
@@ -962,61 +1026,64 @@ uint32_t GrGLGradientEffect::GenBaseGradientKey(const GrDrawEffect& drawEffect)
     return key;
 }
 
-void GrGLGradientEffect::emitColor(GrGLShaderBuilder* builder,
+void GrGLGradientEffect::emitColor(GrGLSLFPBuilder* builder,
+                                   GrGLSLFragmentBuilder* fragBuilder,
+                                   const GrGLSLCaps* glslCaps,
+                                   const GrGradientEffect& ge,
                                    const char* gradientTValue,
-                                   uint32_t baseKey,
                                    const char* outputColor,
                                    const char* inputColor,
                                    const TextureSamplerArray& samplers) {
-    if (SkGradientShaderBase::kTwo_GpuColorType == ColorTypeFromKey(baseKey)){
-        builder->fsCodeAppendf("\tvec4 colorTemp = mix(%s, %s, clamp(%s, 0.0, 1.0));\n",
-                               builder->getUniformVariable(fColorStartUni).c_str(),
-                               builder->getUniformVariable(fColorEndUni).c_str(),
-                               gradientTValue);
+    if (SkGradientShaderBase::kTwo_GpuColorType == ge.getColorType()){
+        fragBuilder->codeAppendf("\tvec4 colorTemp = mix(%s, %s, clamp(%s, 0.0, 1.0));\n",
+                                 builder->getUniformVariable(fColorStartUni).c_str(),
+                                 builder->getUniformVariable(fColorEndUni).c_str(),
+                                 gradientTValue);
         // Note that we could skip this step if both colors are known to be opaque. Two
         // considerations:
         // The gradient SkShader reporting opaque is more restrictive than necessary in the two pt
         // case. Make sure the key reflects this optimization (and note that it can use the same
-        // shader as thekBeforeIterp case). This same optimization applies to the 3 color case below.
-        if (GrGradientEffect::kAfterInterp_PremulType == PremulTypeFromKey(baseKey)) {
-            builder->fsCodeAppend("\tcolorTemp.rgb *= colorTemp.a;\n");
+        // shader as thekBeforeIterp case). This same optimization applies to the 3 color case
+        // below.
+        if (GrGradientEffect::kAfterInterp_PremulType == ge.getPremulType()) {
+            fragBuilder->codeAppend("\tcolorTemp.rgb *= colorTemp.a;\n");
         }
 
-        builder->fsCodeAppendf("\t%s = %s;\n", outputColor,
-                               (GrGLSLExpr4(inputColor) * GrGLSLExpr4("colorTemp")).c_str());
-    } else if (SkGradientShaderBase::kThree_GpuColorType == ColorTypeFromKey(baseKey)){
-        builder->fsCodeAppendf("\tfloat oneMinus2t = 1.0 - (2.0 * (%s));\n",
-                               gradientTValue);
-        builder->fsCodeAppendf("\tvec4 colorTemp = clamp(oneMinus2t, 0.0, 1.0) * %s;\n",
-                               builder->getUniformVariable(fColorStartUni).c_str());
-        if (kTegra3_GrGLRenderer == builder->ctxInfo().renderer()) {
+        fragBuilder->codeAppendf("\t%s = %s;\n", outputColor,
+                                 (GrGLSLExpr4(inputColor) * GrGLSLExpr4("colorTemp")).c_str());
+    } else if (SkGradientShaderBase::kThree_GpuColorType == ge.getColorType()) {
+        fragBuilder->codeAppendf("\tfloat oneMinus2t = 1.0 - (2.0 * (%s));\n",
+                                 gradientTValue);
+        fragBuilder->codeAppendf("\tvec4 colorTemp = clamp(oneMinus2t, 0.0, 1.0) * %s;\n",
+                                 builder->getUniformVariable(fColorStartUni).c_str());
+        if (!glslCaps->canUseMinAndAbsTogether()) {
             // The Tegra3 compiler will sometimes never return if we have
             // min(abs(oneMinus2t), 1.0), or do the abs first in a separate expression.
-            builder->fsCodeAppend("\tfloat minAbs = abs(oneMinus2t);\n");
-            builder->fsCodeAppend("\tminAbs = minAbs > 1.0 ? 1.0 : minAbs;\n");
-            builder->fsCodeAppendf("\tcolorTemp += (1.0 - minAbs) * %s;\n",
-                                   builder->getUniformVariable(fColorMidUni).c_str());
+            fragBuilder->codeAppend("\tfloat minAbs = abs(oneMinus2t);\n");
+            fragBuilder->codeAppend("\tminAbs = minAbs > 1.0 ? 1.0 : minAbs;\n");
+            fragBuilder->codeAppendf("\tcolorTemp += (1.0 - minAbs) * %s;\n",
+                                     builder->getUniformVariable(fColorMidUni).c_str());
         } else {
-            builder->fsCodeAppendf("\tcolorTemp += (1.0 - min(abs(oneMinus2t), 1.0)) * %s;\n",
-                                   builder->getUniformVariable(fColorMidUni).c_str());
+            fragBuilder->codeAppendf("\tcolorTemp += (1.0 - min(abs(oneMinus2t), 1.0)) * %s;\n",
+                                     builder->getUniformVariable(fColorMidUni).c_str());
         }
-        builder->fsCodeAppendf("\tcolorTemp += clamp(-oneMinus2t, 0.0, 1.0) * %s;\n",
-                               builder->getUniformVariable(fColorEndUni).c_str());
-        if (GrGradientEffect::kAfterInterp_PremulType == PremulTypeFromKey(baseKey)) {
-            builder->fsCodeAppend("\tcolorTemp.rgb *= colorTemp.a;\n");
+        fragBuilder->codeAppendf("\tcolorTemp += clamp(-oneMinus2t, 0.0, 1.0) * %s;\n",
+                                 builder->getUniformVariable(fColorEndUni).c_str());
+        if (GrGradientEffect::kAfterInterp_PremulType == ge.getPremulType()) {
+            fragBuilder->codeAppend("\tcolorTemp.rgb *= colorTemp.a;\n");
         }
 
-        builder->fsCodeAppendf("\t%s = %s;\n", outputColor,
-                               (GrGLSLExpr4(inputColor) * GrGLSLExpr4("colorTemp")).c_str());
+        fragBuilder->codeAppendf("\t%s = %s;\n", outputColor,
+                                 (GrGLSLExpr4(inputColor) * GrGLSLExpr4("colorTemp")).c_str());
     } else {
-        builder->fsCodeAppendf("\tvec2 coord = vec2(%s, %s);\n",
-                               gradientTValue,
-                               builder->getUniformVariable(fFSYUni).c_str());
-        builder->fsCodeAppendf("\t%s = ", outputColor);
-        builder->fsAppendTextureLookupAndModulate(inputColor,
-                                                  samplers[0],
-                                                  "coord");
-        builder->fsCodeAppend(";\n");
+        fragBuilder->codeAppendf("\tvec2 coord = vec2(%s, %s);\n",
+                                 gradientTValue,
+                                 builder->getUniformVariable(fFSYUni).c_str());
+        fragBuilder->codeAppendf("\t%s = ", outputColor);
+        fragBuilder->appendTextureLookupAndModulate(inputColor,
+                                                    samplers[0],
+                                                    "coord");
+        fragBuilder->codeAppend(";\n");
     }
 }
 
@@ -1055,7 +1122,7 @@ GrGradientEffect::GrGradientEffect(GrContext* ctx,
         desc.fContext = ctx;
         desc.fConfig = SkImageInfo2GrPixelConfig(bitmap.info());
         fAtlas = GrTextureStripAtlas::GetAtlas(desc);
-        SkASSERT(NULL != fAtlas);
+        SkASSERT(fAtlas);
 
         // We always filter the gradient table. Each table is one row of a texture, always y-clamp.
         GrTextureParams params;
@@ -1064,20 +1131,17 @@ GrGradientEffect::GrGradientEffect(GrContext* ctx,
 
         fRow = fAtlas->lockRow(bitmap);
         if (-1 != fRow) {
-            fYCoord = fAtlas->getYOffset(fRow) + SK_ScalarHalf *
-            fAtlas->getVerticalScaleFactor();
-            fCoordTransform.reset(kCoordSet, matrix, fAtlas->getTexture());
+            fYCoord = fAtlas->getYOffset(fRow) + SK_ScalarHalf * fAtlas->getNormalizedTexelHeight();
+            fCoordTransform.reset(kCoordSet, matrix, fAtlas->getTexture(), params.filterMode());
             fTextureAccess.reset(fAtlas->getTexture(), params);
         } else {
-            GrTexture* texture = GrLockAndRefCachedBitmapTexture(ctx, bitmap, &params);
-            fCoordTransform.reset(kCoordSet, matrix, texture);
+            SkAutoTUnref<GrTexture> texture(GrRefCachedBitmapTexture(ctx, bitmap, params));
+            if (!texture) {
+                return;
+            }
+            fCoordTransform.reset(kCoordSet, matrix, texture, params.filterMode());
             fTextureAccess.reset(texture, params);
             fYCoord = SK_ScalarHalf;
-
-            // Unlock immediately, this is not great, but we don't have a way of
-            // knowing when else to unlock it currently, so it may get purged from
-            // the cache, but it'll still be ref'd until it's no longer being used.
-            GrUnlockAndUnrefCachedBitmapTexture(texture);
         }
         this->addTextureAccess(&fTextureAccess);
     }
@@ -1090,8 +1154,8 @@ GrGradientEffect::~GrGradientEffect() {
     }
 }
 
-bool GrGradientEffect::onIsEqual(const GrEffect& effect) const {
-    const GrGradientEffect& s = CastEffect<GrGradientEffect>(effect);
+bool GrGradientEffect::onIsEqual(const GrFragmentProcessor& processor) const {
+    const GrGradientEffect& s = processor.cast<GrGradientEffect>();
 
     if (this->fColorType == s.getColorType()){
 
@@ -1112,21 +1176,18 @@ bool GrGradientEffect::onIsEqual(const GrEffect& effect) const {
             }
         }
 
-        return fTextureAccess.getTexture() == s.fTextureAccess.getTexture()  &&
-            fTextureAccess.getParams().getTileModeX() ==
-                s.fTextureAccess.getParams().getTileModeX() &&
-            this->useAtlas() == s.useAtlas() &&
-            fCoordTransform.getMatrix().cheapEqualTo(s.fCoordTransform.getMatrix());
+        SkASSERT(this->useAtlas() == s.useAtlas());
+        return true;
     }
 
     return false;
 }
 
-void GrGradientEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
-    if (fIsOpaque && (kA_GrColorComponentFlag & *validFlags) && 0xff == GrColorUnpackA(*color)) {
-        *validFlags = kA_GrColorComponentFlag;
+void GrGradientEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const {
+    if (fIsOpaque) {
+        inout->mulByUnknownOpaqueFourComponents();
     } else {
-        *validFlags = 0;
+        inout->mulByUnknownFourComponents();
     }
 }
 
@@ -1138,13 +1199,13 @@ int GrGradientEffect::RandomGradientParams(SkRandom* random,
 
     // if one color, omit stops, otherwise randomly decide whether or not to
     if (outColors == 1 || (outColors >= 2 && random->nextBool())) {
-        *stops = NULL;
+        *stops = nullptr;
     }
 
     SkScalar stop = 0.f;
     for (int i = 0; i < outColors; ++i) {
         colors[i] = random->nextU();
-        if (NULL != *stops) {
+        if (*stops) {
             (*stops)[i] = stop;
             stop = i < outColors - 1 ? stop + random->nextUScalar1() * (1.f - stop) : 1.f;
         }
diff --git a/gfx/skia/skia/src/effects/gradients/SkGradientShaderPriv.h b/gfx/skia/skia/src/effects/gradients/SkGradientShaderPriv.h
index 61acf3c8fe80..3c19152d9029 100644
--- a/gfx/skia/skia/src/effects/gradients/SkGradientShaderPriv.h
+++ b/gfx/skia/skia/src/effects/gradients/SkGradientShaderPriv.h
@@ -8,6 +8,7 @@
 #ifndef SkGradientShaderPriv_DEFINED
 #define SkGradientShaderPriv_DEFINED
 
+#include "SkGradientBitmapCache.h"
 #include "SkGradientShader.h"
 #include "SkClampRange.h"
 #include "SkColorPriv.h"
@@ -15,8 +16,6 @@
 #include "SkWriteBuffer.h"
 #include "SkMallocPixelRef.h"
 #include "SkUtils.h"
-#include "SkTemplates.h"
-#include "SkBitmapCache.h"
 #include "SkShader.h"
 #include "SkOnce.h"
 
@@ -89,21 +88,45 @@ public:
             fTileMode = SkShader::kClamp_TileMode;
         }
 
+        const SkMatrix*     fLocalMatrix;
         const SkColor*      fColors;
         const SkScalar*     fPos;
         int                 fCount;
         SkShader::TileMode  fTileMode;
         uint32_t            fGradFlags;
+
+        void flatten(SkWriteBuffer&) const;
+    };
+
+    class DescriptorScope : public Descriptor {
+    public:
+        DescriptorScope() {}
+
+        bool unflatten(SkReadBuffer&);
+
+        // fColors and fPos always point into local memory, so they can be safely mutated
+        //
+        SkColor* mutableColors() { return const_cast<SkColor*>(fColors); }
+        SkScalar* mutablePos() { return const_cast<SkScalar*>(fPos); }
+
+    private:
+        enum {
+            kStorageCount = 16
+        };
+        SkColor fColorStorage[kStorageCount];
+        SkScalar fPosStorage[kStorageCount];
+        SkMatrix fLocalMatrixStorage;
+        SkAutoMalloc fDynamicStorage;
     };
 
 public:
-    SkGradientShaderBase(const Descriptor& desc, const SkMatrix* localMatrix);
+    SkGradientShaderBase(const Descriptor& desc, const SkMatrix& ptsToUnit);
     virtual ~SkGradientShaderBase();
 
     // The cache is initialized on-demand when getCache16/32 is called.
     class GradientShaderCache : public SkRefCnt {
     public:
-        GradientShaderCache(U8CPU alpha, const SkGradientShaderBase& shader);
+        GradientShaderCache(U8CPU alpha, bool dither, const SkGradientShaderBase& shader);
         ~GradientShaderCache();
 
         const uint16_t*     getCache16();
@@ -112,9 +135,10 @@ public:
         SkMallocPixelRef* getCache32PixelRef() const { return fCache32PixelRef; }
 
         unsigned getAlpha() const { return fCacheAlpha; }
+        bool getDither() const { return fCacheDither; }
 
     private:
-        // Working pointers. If either is NULL, we need to recompute the corresponding cache values.
+        // Working pointers. If either is nullptr, we need to recompute the corresponding cache values.
         uint16_t*   fCache16;
         SkPMColor*  fCache32;
 
@@ -123,6 +147,7 @@ public:
         const unsigned    fCacheAlpha;        // The alpha value we used when we computed the cache.
                                               // Larger than 8bits so we can store uninitialized
                                               // value.
+        const bool        fCacheDither;       // The dither flag used when we computed the cache.
 
         const SkGradientShaderBase& fShader;
 
@@ -133,22 +158,23 @@ public:
         static void initCache16(GradientShaderCache* cache);
         static void initCache32(GradientShaderCache* cache);
 
-        static void Build16bitCache(uint16_t[], SkColor c0, SkColor c1, int count);
+        static void Build16bitCache(uint16_t[], SkColor c0, SkColor c1, int count, bool dither);
         static void Build32bitCache(SkPMColor[], SkColor c0, SkColor c1, int count,
-                                    U8CPU alpha, uint32_t gradFlags);
+                                    U8CPU alpha, uint32_t gradFlags, bool dither);
     };
 
     class GradientShaderBaseContext : public SkShader::Context {
     public:
         GradientShaderBaseContext(const SkGradientShaderBase& shader, const ContextRec&);
 
-        virtual uint32_t getFlags() const SK_OVERRIDE { return fFlags; }
+        uint32_t getFlags() const override { return fFlags; }
 
     protected:
         SkMatrix    fDstToIndex;
         SkMatrix::MapXYProc fDstToIndexProc;
         uint8_t     fDstToIndexClass;
         uint8_t     fFlags;
+        bool        fDither;
 
         SkAutoTUnref<GradientShaderCache> fCache;
 
@@ -156,7 +182,7 @@ public:
         typedef SkShader::Context INHERITED;
     };
 
-    virtual bool isOpaque() const SK_OVERRIDE;
+    bool isOpaque() const override;
 
     void getGradientTableBitmap(SkBitmap*) const;
 
@@ -196,10 +222,10 @@ public:
 
 protected:
     SkGradientShaderBase(SkReadBuffer& );
-    virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer&) const override;
     SK_TO_STRING_OVERRIDE()
 
-    SkMatrix    fPtsToUnit;     // set by subclass
+    const SkMatrix fPtsToUnit;
     TileMode    fTileMode;
     TileProc    fTileProc;
     int         fColorCount;
@@ -213,6 +239,8 @@ protected:
 
     void commonAsAGradient(GradientInfo*, bool flipGrad = false) const;
 
+    bool onAsLuminanceColor(SkColor*) const override;
+
     /*
      * Takes in pointers to gradient color and Rec info as colorSrc and recSrc respectively.
      * Count is the number of colors in the gradient
@@ -224,22 +252,23 @@ protected:
                                    SkColor* colorSrc, Rec* recSrc,
                                    int count);
 
-    // V23_COMPATIBILITY_CODE
-    // Used for 2-pt conical gradients since we sort start/end cirlces by radius
-    // Assumes space has already been allocated for fOrigColors
-    void flipGradientColors();
-
 private:
     enum {
         kColorStorageCount = 4, // more than this many colors, and we'll use sk_malloc for the space
 
-        kStorageSize = kColorStorageCount * (sizeof(SkColor) + sizeof(Rec))
+        kStorageSize = kColorStorageCount * (sizeof(SkColor) + sizeof(SkScalar) + sizeof(Rec))
     };
     SkColor     fStorage[(kStorageSize + 3) >> 2];
+public:
     SkColor*    fOrigColors; // original colors, before modulation by paint in context.
+    SkScalar*   fOrigPos;   // original positions
+
+    bool colorsAreOpaque() const { return fColorsAreOpaque; }
+
+private:
     bool        fColorsAreOpaque;
 
-    GradientShaderCache* refCache(U8CPU alpha) const;
+    GradientShaderCache* refCache(U8CPU alpha, bool dither) const;
     mutable SkMutex                           fCacheMutex;
     mutable SkAutoTUnref<GradientShaderCache> fCache;
 
@@ -271,10 +300,11 @@ static inline int next_dither_toggle16(int toggle) {
 #if SK_SUPPORT_GPU
 
 #include "GrCoordTransform.h"
-#include "gl/GrGLEffect.h"
+#include "GrFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLProgramDataManager.h"
 
-class GrEffectStage;
-class GrBackendEffectFactory;
+class GrInvariantOutput;
 
 /*
  * The interpretation of the texture matrix depends on the sample mode. The
@@ -302,7 +332,7 @@ class GrBackendEffectFactory;
  class GrTextureStripAtlas;
 
 // Base class for Gr gradient effects
-class GrGradientEffect : public GrEffect {
+class GrGradientEffect : public GrFragmentProcessor {
 public:
 
     GrGradientEffect(GrContext* ctx,
@@ -315,8 +345,6 @@ public:
     bool useAtlas() const { return SkToBool(-1 != fRow); }
     SkScalar getYCoord() const { return fYCoord; };
 
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
-
     SkGradientShaderBase::GpuColorType getColorType() const { return fColorType; }
 
     enum PremulType {
@@ -338,7 +366,7 @@ protected:
         The function decides whether stop values should be used or not. The return value indicates
         the number of colors, which will be capped by kMaxRandomGradientColors. colors should be
         sized to be at least kMaxRandomGradientColors. stops is a pointer to an array of at least
-        size kMaxRandomGradientColors. It may be updated to NULL, indicating that NULL should be
+        size kMaxRandomGradientColors. It may be updated to nullptr, indicating that nullptr should be
         passed to the gradient factory rather than the array.
     */
     static const int kMaxRandomGradientColors = 4;
@@ -347,7 +375,9 @@ protected:
                                     SkScalar** stops,
                                     SkShader::TileMode* tm);
 
-    virtual bool onIsEqual(const GrEffect& effect) const SK_OVERRIDE;
+    bool onIsEqual(const GrFragmentProcessor&) const override;
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
 
     const GrCoordTransform& getCoordTransform() const { return fCoordTransform; }
 
@@ -364,19 +394,20 @@ private:
     SkColor fColors[3]; // More than 3 colors we use texture
     PremulType fPremulType; // This only changes behavior for two and three color special cases.
                             // It is already baked into to the table for texture gradients.
-    typedef GrEffect INHERITED;
+    typedef GrFragmentProcessor INHERITED;
 
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 // Base class for GL gradient effects
-class GrGLGradientEffect : public GrGLEffect {
+class GrGLGradientEffect : public GrGLSLFragmentProcessor {
 public:
-    GrGLGradientEffect(const GrBackendEffectFactory& factory);
+    GrGLGradientEffect();
     virtual ~GrGLGradientEffect();
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
 
 protected:
     /**
@@ -384,19 +415,21 @@ protected:
      * by the base class. The subclasses must stick it in their key and then pass it to the below
      * emit* functions from their emitCode function.
      */
-    static uint32_t GenBaseGradientKey(const GrDrawEffect&);
+    static uint32_t GenBaseGradientKey(const GrProcessor&);
 
     // Emits the uniform used as the y-coord to texture samples in derived classes. Subclasses
     // should call this method from their emitCode().
-    void emitUniforms(GrGLShaderBuilder* builder, uint32_t baseKey);
+    void emitUniforms(GrGLSLFPBuilder* builder, const GrGradientEffect&);
 
 
     // emit code that gets a fragment's color from an expression for t; Has branches for 3 separate
     // control flows inside -- 2 color gradients, 3 color symmetric gradients (both using
     // native GLSL mix), and 4+ color gradients that use the traditional texture lookup.
-    void emitColor(GrGLShaderBuilder* builder,
+    void emitColor(GrGLSLFPBuilder* builder,
+                   GrGLSLFragmentBuilder* fragBuilder,
+                   const GrGLSLCaps* caps,
+                   const GrGradientEffect&,
                    const char* gradientTValue,
-                   uint32_t baseKey,
                    const char* outputColor,
                    const char* inputColor,
                    const TextureSamplerArray& samplers);
@@ -418,29 +451,13 @@ private:
     };
     GR_STATIC_ASSERT(kBaseKeyBitCnt <= 32);
 
-    static SkGradientShaderBase::GpuColorType ColorTypeFromKey(uint32_t baseKey){
-        if (kTwoColorKey == (baseKey & kColorKeyMask)) {
-            return SkGradientShaderBase::kTwo_GpuColorType;
-        } else if (kThreeColorKey == (baseKey & kColorKeyMask)) {
-            return SkGradientShaderBase::kThree_GpuColorType;
-        } else {return SkGradientShaderBase::kTexture_GpuColorType;}
-    }
-
-    static GrGradientEffect::PremulType PremulTypeFromKey(uint32_t baseKey){
-        if (kPremulBeforeInterpKey == (baseKey & kPremulTypeMask)) {
-            return GrGradientEffect::kBeforeInterp_PremulType;
-        } else {
-            return GrGradientEffect::kAfterInterp_PremulType;
-        }
-    }
-
     SkScalar fCachedYCoord;
-    GrGLUniformManager::UniformHandle fFSYUni;
-    GrGLUniformManager::UniformHandle fColorStartUni;
-    GrGLUniformManager::UniformHandle fColorMidUni;
-    GrGLUniformManager::UniformHandle fColorEndUni;
+    GrGLSLProgramDataManager::UniformHandle fFSYUni;
+    GrGLSLProgramDataManager::UniformHandle fColorStartUni;
+    GrGLSLProgramDataManager::UniformHandle fColorMidUni;
+    GrGLSLProgramDataManager::UniformHandle fColorEndUni;
 
-    typedef GrGLEffect INHERITED;
+    typedef GrGLSLFragmentProcessor INHERITED;
 };
 
 #endif
diff --git a/gfx/skia/skia/src/effects/gradients/SkLinearGradient.cpp b/gfx/skia/skia/src/effects/gradients/SkLinearGradient.cpp
index 9de459125a76..272d15ecdeb3 100644
--- a/gfx/skia/skia/src/effects/gradients/SkLinearGradient.cpp
+++ b/gfx/skia/skia/src/effects/gradients/SkLinearGradient.cpp
@@ -7,6 +7,8 @@
 
 #include "SkLinearGradient.h"
 
+static const float kInv255Float = 1.0f / 255;
+
 static inline int repeat_bits(int x, const int bits) {
     return x & ((1 << bits) - 1);
 }
@@ -39,31 +41,37 @@ static inline int mirror_8bits(int x) {
 #pragma optimize("", on)
 #endif
 
-static void pts_to_unit_matrix(const SkPoint pts[2], SkMatrix* matrix) {
+static SkMatrix pts_to_unit_matrix(const SkPoint pts[2]) {
     SkVector    vec = pts[1] - pts[0];
     SkScalar    mag = vec.length();
     SkScalar    inv = mag ? SkScalarInvert(mag) : 0;
 
     vec.scale(inv);
-    matrix->setSinCos(-vec.fY, vec.fX, pts[0].fX, pts[0].fY);
-    matrix->postTranslate(-pts[0].fX, -pts[0].fY);
-    matrix->postScale(inv, inv);
+    SkMatrix matrix;
+    matrix.setSinCos(-vec.fY, vec.fX, pts[0].fX, pts[0].fY);
+    matrix.postTranslate(-pts[0].fX, -pts[0].fY);
+    matrix.postScale(inv, inv);
+    return matrix;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkLinearGradient::SkLinearGradient(const SkPoint pts[2], const Descriptor& desc,
-                                   const SkMatrix* localMatrix)
-    : SkGradientShaderBase(desc, localMatrix)
+SkLinearGradient::SkLinearGradient(const SkPoint pts[2], const Descriptor& desc)
+    : SkGradientShaderBase(desc, pts_to_unit_matrix(pts))
     , fStart(pts[0])
     , fEnd(pts[1]) {
-    pts_to_unit_matrix(pts, &fPtsToUnit);
 }
 
-SkLinearGradient::SkLinearGradient(SkReadBuffer& buffer)
-    : INHERITED(buffer)
-    , fStart(buffer.readPoint())
-    , fEnd(buffer.readPoint()) {
+SkFlattenable* SkLinearGradient::CreateProc(SkReadBuffer& buffer) {
+    DescriptorScope desc;
+    if (!desc.unflatten(buffer)) {
+        return nullptr;
+    }
+    SkPoint pts[2];
+    pts[0] = buffer.readPoint();
+    pts[1] = buffer.readPoint();
+    return SkGradientShader::CreateLinear(pts, desc.fColors, desc.fPos, desc.fCount,
+                                          desc.fTileMode, desc.fGradFlags, desc.fLocalMatrix);
 }
 
 void SkLinearGradient::flatten(SkWriteBuffer& buffer) const {
@@ -77,28 +85,94 @@ size_t SkLinearGradient::contextSize() const {
 }
 
 SkShader::Context* SkLinearGradient::onCreateContext(const ContextRec& rec, void* storage) const {
-    return SkNEW_PLACEMENT_ARGS(storage, LinearGradientContext, (*this, rec));
+    return new (storage) LinearGradientContext(*this, rec);
+}
+
+// This swizzles SkColor into the same component order as SkPMColor, but does not actually
+// "pre" multiply the color components.
+//
+// This allows us to map directly to Sk4f, and eventually scale down to bytes to output a
+// SkPMColor from the floats, without having to swizzle each time.
+//
+static uint32_t SkSwizzle_Color_to_PMColor(SkColor c) {
+    return SkPackARGB32NoCheck(SkColorGetA(c), SkColorGetR(c), SkColorGetG(c), SkColorGetB(c));
 }
 
 SkLinearGradient::LinearGradientContext::LinearGradientContext(
-        const SkLinearGradient& shader, const ContextRec& rec)
-    : INHERITED(shader, rec)
+        const SkLinearGradient& shader, const ContextRec& ctx)
+    : INHERITED(shader, ctx)
 {
     unsigned mask = SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask;
     if ((fDstToIndex.getType() & ~mask) == 0) {
         // when we dither, we are (usually) not const-in-Y
-        if ((fFlags & SkShader::kHasSpan16_Flag) && !rec.fPaint->isDither()) {
+        if ((fFlags & SkShader::kHasSpan16_Flag) && !ctx.fPaint->isDither()) {
             // only claim this if we do have a 16bit mode (i.e. none of our
             // colors have alpha), and if we are not dithering (which obviously
             // is not const in Y).
             fFlags |= SkShader::kConstInY16_Flag;
         }
     }
+
+    // setup for Sk4f
+    int count = shader.fColorCount;
+    fRecs.setCount(count);
+    Rec* rec = fRecs.begin();
+    if (shader.fOrigPos) {
+        rec[0].fPos = 0;
+        SkDEBUGCODE(rec[0].fPosScale = SK_FloatNaN;)   // should never get used
+        for (int i = 1; i < count; ++i) {
+            rec[i].fPos = SkTPin(shader.fOrigPos[i], rec[i - 1].fPos, 1.0f);
+            rec[i].fPosScale = 1.0f / (rec[i].fPos - rec[i - 1].fPos);
+        }
+        rec[count - 1].fPos = 1;    // overwrite the last value just to be sure we end at 1.0
+    } else {
+        // no pos specified, so we compute evenly spaced values
+        const float scale = float(count - 1);
+        float invScale = 1.0f / scale;
+        for (int i = 0; i < count; ++i) {
+            rec[i].fPos = i * invScale;
+            rec[i].fPosScale = scale;
+        }
+    }
+
+    fApplyAlphaAfterInterp = true;
+    if ((shader.getGradFlags() & SkGradientShader::kInterpolateColorsInPremul_Flag) ||
+        shader.colorsAreOpaque())
+    {
+        fApplyAlphaAfterInterp = false;
+    }
+
+    if (fApplyAlphaAfterInterp) {
+        // Our fColor values are in PMColor order, but are still unpremultiplied, allowing us to
+        // interpolate in unpremultiplied space first, and then scale by alpha right before we
+        // convert to SkPMColor bytes.
+        const float paintAlpha = ctx.fPaint->getAlpha() * kInv255Float;
+        const Sk4f scale(1, 1, 1, paintAlpha);
+        for (int i = 0; i < count; ++i) {
+            uint32_t c = SkSwizzle_Color_to_PMColor(shader.fOrigColors[i]);
+            rec[i].fColor = Sk4f::FromBytes((const uint8_t*)&c) * scale;
+            if (i > 0) {
+                SkASSERT(rec[i - 1].fPos <= rec[i].fPos);
+            }
+        }
+    } else {
+        // Our fColor values are premultiplied, so converting to SkPMColor is just a matter
+        // of converting the floats down to bytes.
+        unsigned alphaScale = ctx.fPaint->getAlpha() + (ctx.fPaint->getAlpha() >> 7);
+        for (int i = 0; i < count; ++i) {
+            SkPMColor pmc = SkPreMultiplyColor(shader.fOrigColors[i]);
+            pmc = SkAlphaMulQ(pmc, alphaScale);
+            rec[i].fColor = Sk4f::FromBytes((const uint8_t*)&pmc);
+            if (i > 0) {
+                SkASSERT(rec[i - 1].fPos <= rec[i].fPos);
+            }
+        }
+    }
 }
 
 #define NO_CHECK_ITER               \
     do {                            \
-    unsigned fi = fx >> SkGradientShaderBase::kCache32Shift; \
+    unsigned fi = SkGradFixedToFixed(fx) >> SkGradientShaderBase::kCache32Shift; \
     SkASSERT(fi <= 0xFF);           \
     fx += dx;                       \
     *dstC++ = cache[toggle + fi];   \
@@ -107,21 +181,21 @@ SkLinearGradient::LinearGradientContext::LinearGradientContext(
 
 namespace {
 
-typedef void (*LinearShadeProc)(TileProc proc, SkFixed dx, SkFixed fx,
+typedef void (*LinearShadeProc)(TileProc proc, SkGradFixed dx, SkGradFixed fx,
                                 SkPMColor* dstC, const SkPMColor* cache,
                                 int toggle, int count);
 
 // Linear interpolation (lerp) is unnecessary if there are no sharp
 // discontinuities in the gradient - which must be true if there are
 // only 2 colors - but it's cheap.
-void shadeSpan_linear_vertical_lerp(TileProc proc, SkFixed dx, SkFixed fx,
+void shadeSpan_linear_vertical_lerp(TileProc proc, SkGradFixed dx, SkGradFixed fx,
                                     SkPMColor* SK_RESTRICT dstC,
                                     const SkPMColor* SK_RESTRICT cache,
                                     int toggle, int count) {
     // We're a vertical gradient, so no change in a span.
     // If colors change sharply across the gradient, dithering is
     // insufficient (it subsamples the color space) and we need to lerp.
-    unsigned fullIndex = proc(fx);
+    unsigned fullIndex = proc(SkGradFixedToFixed(fx) - (SK_FixedHalf >> SkGradientShaderBase::kCache32Bits));
     unsigned fi = fullIndex >> SkGradientShaderBase::kCache32Shift;
     unsigned remainder = fullIndex & ((1 << SkGradientShaderBase::kCache32Shift) - 1);
 
@@ -137,12 +211,13 @@ void shadeSpan_linear_vertical_lerp(TileProc proc, SkFixed dx, SkFixed fx,
     sk_memset32_dither(dstC, lerp, dlerp, count);
 }
 
-void shadeSpan_linear_clamp(TileProc proc, SkFixed dx, SkFixed fx,
+void shadeSpan_linear_clamp(TileProc proc, SkGradFixed dx, SkGradFixed fx,
                             SkPMColor* SK_RESTRICT dstC,
                             const SkPMColor* SK_RESTRICT cache,
                             int toggle, int count) {
     SkClampRange range;
     range.init(fx, dx, count, 0, SkGradientShaderBase::kCache32Count - 1);
+    range.validate(count);
 
     if ((count = range.fCount0) > 0) {
         sk_memset32_dither(dstC,
@@ -174,12 +249,12 @@ void shadeSpan_linear_clamp(TileProc proc, SkFixed dx, SkFixed fx,
     }
 }
 
-void shadeSpan_linear_mirror(TileProc proc, SkFixed dx, SkFixed fx,
+void shadeSpan_linear_mirror(TileProc proc, SkGradFixed dx, SkGradFixed fx,
                              SkPMColor* SK_RESTRICT dstC,
                              const SkPMColor* SK_RESTRICT cache,
                              int toggle, int count) {
     do {
-        unsigned fi = mirror_8bits(fx >> 8);
+        unsigned fi = mirror_8bits(SkGradFixedToFixed(fx) >> 8);
         SkASSERT(fi <= 0xFF);
         fx += dx;
         *dstC++ = cache[toggle + fi];
@@ -187,12 +262,12 @@ void shadeSpan_linear_mirror(TileProc proc, SkFixed dx, SkFixed fx,
     } while (--count != 0);
 }
 
-void shadeSpan_linear_repeat(TileProc proc, SkFixed dx, SkFixed fx,
+void shadeSpan_linear_repeat(TileProc proc, SkGradFixed dx, SkGradFixed fx,
         SkPMColor* SK_RESTRICT dstC,
         const SkPMColor* SK_RESTRICT cache,
         int toggle, int count) {
     do {
-        unsigned fi = repeat_8bits(fx >> 8);
+        unsigned fi = repeat_8bits(SkGradFixedToFixed(fx) >> 8);
         SkASSERT(fi <= 0xFF);
         fx += dx;
         *dstC++ = cache[toggle + fi];
@@ -205,9 +280,17 @@ void shadeSpan_linear_repeat(TileProc proc, SkFixed dx, SkFixed fx,
 void SkLinearGradient::LinearGradientContext::shadeSpan(int x, int y, SkPMColor* SK_RESTRICT dstC,
                                                         int count) {
     SkASSERT(count > 0);
-
     const SkLinearGradient& linearGradient = static_cast<const SkLinearGradient&>(fShader);
 
+#ifndef SK_SUPPORT_LEGACY_LINEAR_GRADIENT_TABLE
+    if (SkShader::kClamp_TileMode == linearGradient.fTileMode &&
+        kLinear_MatrixClass == fDstToIndexClass)
+    {
+        this->shade4_clamp(x, y, dstC, count);
+        return;
+    }
+#endif
+
     SkPoint             srcPt;
     SkMatrix::MapXYProc dstProc = fDstToIndexProc;
     TileProc            proc = linearGradient.fTileProc;
@@ -217,15 +300,16 @@ void SkLinearGradient::LinearGradientContext::shadeSpan(int x, int y, SkPMColor*
     if (fDstToIndexClass != kPerspective_MatrixClass) {
         dstProc(fDstToIndex, SkIntToScalar(x) + SK_ScalarHalf,
                              SkIntToScalar(y) + SK_ScalarHalf, &srcPt);
-        SkFixed dx, fx = SkScalarToFixed(srcPt.fX);
+        SkGradFixed dx, fx = SkScalarToGradFixed(srcPt.fX);
 
         if (fDstToIndexClass == kFixedStepInX_MatrixClass) {
             SkFixed dxStorage[1];
-            (void)fDstToIndex.fixedStepInX(SkIntToScalar(y), dxStorage, NULL);
-            dx = dxStorage[0];
+            (void)fDstToIndex.fixedStepInX(SkIntToScalar(y), dxStorage, nullptr);
+            // todo: do we need a real/high-precision value for dx here?
+            dx = SkFixedToGradFixed(dxStorage[0]);
         } else {
             SkASSERT(fDstToIndexClass == kLinear_MatrixClass);
-            dx = SkScalarToFixed(fDstToIndex.getScaleX());
+            dx = SkScalarToGradFixed(fDstToIndex.getScaleX());
         }
 
         LinearShadeProc shadeProc = shadeSpan_linear_repeat;
@@ -253,22 +337,6 @@ void SkLinearGradient::LinearGradientContext::shadeSpan(int x, int y, SkPMColor*
     }
 }
 
-SkShader::BitmapType SkLinearGradient::asABitmap(SkBitmap* bitmap,
-                                                SkMatrix* matrix,
-                                                TileMode xy[]) const {
-    if (bitmap) {
-        this->getGradientTableBitmap(bitmap);
-    }
-    if (matrix) {
-        matrix->preConcat(fPtsToUnit);
-    }
-    if (xy) {
-        xy[0] = fTileMode;
-        xy[1] = kClamp_TileMode;
-    }
-    return kLinear_BitmapType;
-}
-
 SkShader::GradientType SkLinearGradient::asAGradient(GradientInfo* info) const {
     if (info) {
         commonAsAGradient(info);
@@ -295,7 +363,7 @@ static void dither_memset16(uint16_t dst[], uint16_t value, uint16_t other,
 
 #define NO_CHECK_ITER_16                \
     do {                                \
-    unsigned fi = fx >> SkGradientShaderBase::kCache16Shift;  \
+    unsigned fi = SkGradFixedToFixed(fx) >> SkGradientShaderBase::kCache16Shift;  \
     SkASSERT(fi < SkGradientShaderBase::kCache16Count);       \
     fx += dx;                           \
     *dstC++ = cache[toggle + fi];       \
@@ -304,27 +372,28 @@ static void dither_memset16(uint16_t dst[], uint16_t value, uint16_t other,
 
 namespace {
 
-typedef void (*LinearShade16Proc)(TileProc proc, SkFixed dx, SkFixed fx,
+typedef void (*LinearShade16Proc)(TileProc proc, SkGradFixed dx, SkGradFixed fx,
                                   uint16_t* dstC, const uint16_t* cache,
                                   int toggle, int count);
 
-void shadeSpan16_linear_vertical(TileProc proc, SkFixed dx, SkFixed fx,
+void shadeSpan16_linear_vertical(TileProc proc, SkGradFixed dx, SkGradFixed fx,
                                  uint16_t* SK_RESTRICT dstC,
                                  const uint16_t* SK_RESTRICT cache,
                                  int toggle, int count) {
     // we're a vertical gradient, so no change in a span
-    unsigned fi = proc(fx) >> SkGradientShaderBase::kCache16Shift;
+    unsigned fi = proc(SkGradFixedToFixed(fx)) >> SkGradientShaderBase::kCache16Shift;
     SkASSERT(fi < SkGradientShaderBase::kCache16Count);
     dither_memset16(dstC, cache[toggle + fi],
         cache[next_dither_toggle16(toggle) + fi], count);
 }
 
-void shadeSpan16_linear_clamp(TileProc proc, SkFixed dx, SkFixed fx,
+void shadeSpan16_linear_clamp(TileProc proc, SkGradFixed dx, SkGradFixed fx,
                               uint16_t* SK_RESTRICT dstC,
                               const uint16_t* SK_RESTRICT cache,
                               int toggle, int count) {
     SkClampRange range;
     range.init(fx, dx, count, 0, SkGradientShaderBase::kCache32Count - 1);
+    range.validate(count);
 
     if ((count = range.fCount0) > 0) {
         dither_memset16(dstC,
@@ -356,12 +425,12 @@ void shadeSpan16_linear_clamp(TileProc proc, SkFixed dx, SkFixed fx,
     }
 }
 
-void shadeSpan16_linear_mirror(TileProc proc, SkFixed dx, SkFixed fx,
+void shadeSpan16_linear_mirror(TileProc proc, SkGradFixed dx, SkGradFixed fx,
                                uint16_t* SK_RESTRICT dstC,
                                const uint16_t* SK_RESTRICT cache,
                                int toggle, int count) {
     do {
-        unsigned fi = mirror_bits(fx >> SkGradientShaderBase::kCache16Shift,
+        unsigned fi = mirror_bits(SkGradFixedToFixed(fx) >> SkGradientShaderBase::kCache16Shift,
                                         SkGradientShaderBase::kCache16Bits);
         SkASSERT(fi < SkGradientShaderBase::kCache16Count);
         fx += dx;
@@ -370,12 +439,12 @@ void shadeSpan16_linear_mirror(TileProc proc, SkFixed dx, SkFixed fx,
     } while (--count != 0);
 }
 
-void shadeSpan16_linear_repeat(TileProc proc, SkFixed dx, SkFixed fx,
+void shadeSpan16_linear_repeat(TileProc proc, SkGradFixed dx, SkGradFixed fx,
                                uint16_t* SK_RESTRICT dstC,
                                const uint16_t* SK_RESTRICT cache,
                                int toggle, int count) {
     do {
-        unsigned fi = repeat_bits(fx >> SkGradientShaderBase::kCache16Shift,
+        unsigned fi = repeat_bits(SkGradFixedToFixed(fx) >> SkGradientShaderBase::kCache16Shift,
                                   SkGradientShaderBase::kCache16Bits);
         SkASSERT(fi < SkGradientShaderBase::kCache16Count);
         fx += dx;
@@ -404,19 +473,20 @@ void SkLinearGradient::LinearGradientContext::shadeSpan16(int x, int y,
     if (fDstToIndexClass != kPerspective_MatrixClass) {
         dstProc(fDstToIndex, SkIntToScalar(x) + SK_ScalarHalf,
                              SkIntToScalar(y) + SK_ScalarHalf, &srcPt);
-        SkFixed dx, fx = SkScalarToFixed(srcPt.fX);
+        SkGradFixed dx, fx = SkScalarToGradFixed(srcPt.fX);
 
         if (fDstToIndexClass == kFixedStepInX_MatrixClass) {
             SkFixed dxStorage[1];
-            (void)fDstToIndex.fixedStepInX(SkIntToScalar(y), dxStorage, NULL);
-            dx = dxStorage[0];
+            (void)fDstToIndex.fixedStepInX(SkIntToScalar(y), dxStorage, nullptr);
+            // todo: do we need a real/high-precision value for dx here?
+            dx = SkFixedToGradFixed(dxStorage[0]);
         } else {
             SkASSERT(fDstToIndexClass == kLinear_MatrixClass);
-            dx = SkScalarToFixed(fDstToIndex.getScaleX());
+            dx = SkScalarToGradFixed(fDstToIndex.getScaleX());
         }
 
         LinearShade16Proc shadeProc = shadeSpan16_linear_repeat;
-        if (fixed_nearly_zero(dx)) {
+        if (fixed_nearly_zero(SkGradFixedToFixed(dx))) {
             shadeProc = shadeSpan16_linear_vertical;
         } else if (SkShader::kClamp_TileMode == linearGradient.fTileMode) {
             shadeProc = shadeSpan16_linear_clamp;
@@ -445,8 +515,7 @@ void SkLinearGradient::LinearGradientContext::shadeSpan16(int x, int y,
 
 #if SK_SUPPORT_GPU
 
-#include "GrTBackendEffectFactory.h"
-#include "gl/GrGLShaderBuilder.h"
+#include "gl/builders/GrGLProgramBuilder.h"
 #include "SkGr.h"
 
 /////////////////////////////////////////////////////////////////////
@@ -454,21 +523,14 @@ void SkLinearGradient::LinearGradientContext::shadeSpan16(int x, int y,
 class GrGLLinearGradient : public GrGLGradientEffect {
 public:
 
-    GrGLLinearGradient(const GrBackendEffectFactory& factory, const GrDrawEffect&)
-                       : INHERITED (factory) { }
+    GrGLLinearGradient(const GrProcessor&) {}
 
     virtual ~GrGLLinearGradient() { }
 
-    virtual void emitCode(GrGLShaderBuilder*,
-                          const GrDrawEffect&,
-                          const GrEffectKey&,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    virtual void emitCode(EmitArgs&) override;
 
-    static void GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&, GrEffectKeyBuilder* b) {
-        b->add32(GenBaseGradientKey(drawEffect));
+    static void GenKey(const GrProcessor& processor, const GrGLSLCaps&, GrProcessorKeyBuilder* b) {
+        b->add32(GenBaseGradientKey(processor));
     }
 
 private:
@@ -481,109 +543,105 @@ private:
 class GrLinearGradient : public GrGradientEffect {
 public:
 
-    static GrEffect* Create(GrContext* ctx,
-                            const SkLinearGradient& shader,
-                            const SkMatrix& matrix,
-                            SkShader::TileMode tm) {
-        return SkNEW_ARGS(GrLinearGradient, (ctx, shader, matrix, tm));
+    static GrFragmentProcessor* Create(GrContext* ctx,
+                                       const SkLinearGradient& shader,
+                                       const SkMatrix& matrix,
+                                       SkShader::TileMode tm) {
+        return new GrLinearGradient(ctx, shader, matrix, tm);
     }
 
     virtual ~GrLinearGradient() { }
 
-    static const char* Name() { return "Linear Gradient"; }
-    const GrBackendEffectFactory& getFactory() const SK_OVERRIDE {
-        return GrTBackendEffectFactory<GrLinearGradient>::getInstance();
-    }
-
-    typedef GrGLLinearGradient GLEffect;
+    const char* name() const override { return "Linear Gradient"; }
 
 private:
     GrLinearGradient(GrContext* ctx,
                      const SkLinearGradient& shader,
                      const SkMatrix& matrix,
                      SkShader::TileMode tm)
-        : INHERITED(ctx, shader, matrix, tm) { }
-    GR_DECLARE_EFFECT_TEST;
+        : INHERITED(ctx, shader, matrix, tm) {
+        this->initClassID<GrLinearGradient>();
+    }
+
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override {
+        return new GrGLLinearGradient(*this);
+    }
+
+    virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                       GrProcessorKeyBuilder* b) const override {
+        GrGLLinearGradient::GenKey(*this, caps, b);
+    }
+
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
 
     typedef GrGradientEffect INHERITED;
 };
 
 /////////////////////////////////////////////////////////////////////
 
-GR_DEFINE_EFFECT_TEST(GrLinearGradient);
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrLinearGradient);
 
-GrEffect* GrLinearGradient::TestCreate(SkRandom* random,
-                                       GrContext* context,
-                                       const GrDrawTargetCaps&,
-                                       GrTexture**) {
-    SkPoint points[] = {{random->nextUScalar1(), random->nextUScalar1()},
-                        {random->nextUScalar1(), random->nextUScalar1()}};
+const GrFragmentProcessor* GrLinearGradient::TestCreate(GrProcessorTestData* d) {
+    SkPoint points[] = {{d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1()},
+                        {d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1()}};
 
     SkColor colors[kMaxRandomGradientColors];
     SkScalar stopsArray[kMaxRandomGradientColors];
     SkScalar* stops = stopsArray;
     SkShader::TileMode tm;
-    int colorCount = RandomGradientParams(random, colors, &stops, &tm);
+    int colorCount = RandomGradientParams(d->fRandom, colors, &stops, &tm);
     SkAutoTUnref<SkShader> shader(SkGradientShader::CreateLinear(points,
                                                                  colors, stops, colorCount,
                                                                  tm));
-    SkPaint paint;
-    GrColor paintColor;
-    GrEffect* effect;
-    SkAssertResult(shader->asNewEffect(context, paint, NULL, &paintColor, &effect));
-    return effect;
+    const GrFragmentProcessor* fp = shader->asFragmentProcessor(d->fContext,
+        GrTest::TestMatrix(d->fRandom), NULL, kNone_SkFilterQuality);
+    GrAlwaysAssert(fp);
+    return fp;
 }
 
 /////////////////////////////////////////////////////////////////////
 
-void GrGLLinearGradient::emitCode(GrGLShaderBuilder* builder,
-                                  const GrDrawEffect&,
-                                  const GrEffectKey& key,
-                                  const char* outputColor,
-                                  const char* inputColor,
-                                  const TransformedCoordsArray& coords,
-                                  const TextureSamplerArray& samplers) {
-    uint32_t baseKey = key.get32(0);
-    this->emitUniforms(builder, baseKey);
-    SkString t = builder->ensureFSCoords2D(coords, 0);
+void GrGLLinearGradient::emitCode(EmitArgs& args) {
+    const GrLinearGradient& ge = args.fFp.cast<GrLinearGradient>();
+    this->emitUniforms(args.fBuilder, ge);
+    SkString t = args.fFragBuilder->ensureFSCoords2D(args.fCoords, 0);
     t.append(".x");
-    this->emitColor(builder, t.c_str(), baseKey, outputColor, inputColor, samplers);
+    this->emitColor(args.fBuilder,
+                    args.fFragBuilder,
+                    args.fGLSLCaps,
+                    ge, t.c_str(),
+                    args.fOutputColor,
+                    args.fInputColor,
+                    args.fSamplers);
 }
 
 /////////////////////////////////////////////////////////////////////
 
-bool SkLinearGradient::asNewEffect(GrContext* context, const SkPaint& paint,
-                                   const SkMatrix* localMatrix, GrColor* paintColor,
-                                   GrEffect** effect)  const {
-    SkASSERT(NULL != context);
-    
+const GrFragmentProcessor* SkLinearGradient::asFragmentProcessor(
+                                                 GrContext* context,
+                                                 const SkMatrix& viewm,
+                                                 const SkMatrix* localMatrix,
+                                                 SkFilterQuality) const {
+    SkASSERT(context);
+
     SkMatrix matrix;
     if (!this->getLocalMatrix().invert(&matrix)) {
-        return false;
+        return nullptr;
     }
     if (localMatrix) {
         SkMatrix inv;
         if (!localMatrix->invert(&inv)) {
-            return false;
+            return nullptr;
         }
         matrix.postConcat(inv);
     }
     matrix.postConcat(fPtsToUnit);
-    
-    *paintColor = SkColor2GrColorJustAlpha(paint.getColor());
-    *effect = GrLinearGradient::Create(context, *this, matrix, fTileMode);
-    
-    return true;
+
+    SkAutoTUnref<const GrFragmentProcessor> inner(
+        GrLinearGradient::Create(context, *this, matrix, fTileMode));
+    return GrFragmentProcessor::MulOutputByInputAlpha(inner);
 }
 
-#else
-
-bool SkLinearGradient::asNewEffect(GrContext* context, const SkPaint& paint,
-                                   const SkMatrix* localMatrix, GrColor* paintColor,
-                                   GrEffect** effect)  const {
-    SkDEBUGFAIL("Should not call in GPU-less build");
-    return false;
-}
 
 #endif
 
@@ -599,3 +657,273 @@ void SkLinearGradient::toString(SkString* str) const {
     str->append(")");
 }
 #endif
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#include "SkNx.h"
+
+static const SkLinearGradient::LinearGradientContext::Rec*
+find_forward(const SkLinearGradient::LinearGradientContext::Rec rec[], float tiledX) {
+    SkASSERT(tiledX >= 0 && tiledX <= 1);
+
+    SkASSERT(rec[0].fPos >= 0 && rec[0].fPos <= 1);
+    SkASSERT(rec[1].fPos >= 0 && rec[1].fPos <= 1);
+    SkASSERT(rec[0].fPos <= rec[1].fPos);
+    rec += 1;
+    while (rec->fPos < tiledX) {
+        SkASSERT(rec[0].fPos >= 0 && rec[0].fPos <= 1);
+        SkASSERT(rec[1].fPos >= 0 && rec[1].fPos <= 1);
+        SkASSERT(rec[0].fPos <= rec[1].fPos);
+        rec += 1;
+    }
+    return rec - 1;
+}
+
+static const SkLinearGradient::LinearGradientContext::Rec*
+find_backward(const SkLinearGradient::LinearGradientContext::Rec rec[], float tiledX) {
+    SkASSERT(tiledX >= 0 && tiledX <= 1);
+
+    SkASSERT(rec[0].fPos >= 0 && rec[0].fPos <= 1);
+    SkASSERT(rec[1].fPos >= 0 && rec[1].fPos <= 1);
+    SkASSERT(rec[0].fPos <= rec[1].fPos);
+    while (tiledX < rec->fPos) {
+        rec -= 1;
+        SkASSERT(rec[0].fPos >= 0 && rec[0].fPos <= 1);
+        SkASSERT(rec[1].fPos >= 0 && rec[1].fPos <= 1);
+        SkASSERT(rec[0].fPos <= rec[1].fPos);
+    }
+    return rec;
+}
+
+template <bool apply_alpha> SkPMColor trunc_from_255(const Sk4f& x) {
+    SkPMColor c;
+    x.toBytes((uint8_t*)&c);
+    if (apply_alpha) {
+        c = SkPreMultiplyARGB(SkGetPackedA32(c), SkGetPackedR32(c),
+                              SkGetPackedG32(c), SkGetPackedB32(c));
+    }
+    return c;
+}
+
+template <bool apply_alpha> void fill(SkPMColor dst[], int count,
+                                      const Sk4f& c4, const Sk4f& c4other) {
+    sk_memset32_dither(dst, trunc_from_255<apply_alpha>(c4),
+                       trunc_from_255<apply_alpha>(c4other), count);
+}
+
+template <bool apply_alpha> void fill(SkPMColor dst[], int count, const Sk4f& c4) {
+    // Assumes that c4 does not need to be dithered.
+    sk_memset32(dst, trunc_from_255<apply_alpha>(c4), count);
+}
+
+/*
+ *  TODOs
+ *
+ *  - tilemodes
+ *  - interp before or after premul
+ *  - perspective
+ *  - optimizations
+ *      - use fixed (32bit or 16bit) instead of floats?
+ */
+
+static Sk4f lerp_color(float fx, const SkLinearGradient::LinearGradientContext::Rec* rec) {
+    SkASSERT(fx >= rec[0].fPos);
+    SkASSERT(fx <= rec[1].fPos);
+
+    const float p0 = rec[0].fPos;
+    const Sk4f c0 = rec[0].fColor;
+    const Sk4f c1 = rec[1].fColor;
+    const Sk4f diffc = c1 - c0;
+    const float scale = rec[1].fPosScale;
+    const float t = (fx - p0) * scale;
+    return c0 + Sk4f(t) * diffc;
+}
+
+template <bool apply_alpha> void ramp(SkPMColor dstC[], int n, const Sk4f& c, const Sk4f& dc,
+                                      const Sk4f& dither0, const Sk4f& dither1) {
+    Sk4f dc2 = dc + dc;
+    Sk4f dc4 = dc2 + dc2;
+    Sk4f cd0 = c + dither0;
+    Sk4f cd1 = c + dc + dither1;
+    Sk4f cd2 = cd0 + dc2;
+    Sk4f cd3 = cd1 + dc2;
+    while (n >= 4) {
+        if (!apply_alpha) {
+            Sk4f::ToBytes((uint8_t*)dstC, cd0, cd1, cd2, cd3);
+            dstC += 4;
+        } else {
+            *dstC++ = trunc_from_255<apply_alpha>(cd0);
+            *dstC++ = trunc_from_255<apply_alpha>(cd1);
+            *dstC++ = trunc_from_255<apply_alpha>(cd2);
+            *dstC++ = trunc_from_255<apply_alpha>(cd3);
+        }
+        cd0 = cd0 + dc4;
+        cd1 = cd1 + dc4;
+        cd2 = cd2 + dc4;
+        cd3 = cd3 + dc4;
+        n -= 4;
+    }
+    if (n & 2) {
+        *dstC++ = trunc_from_255<apply_alpha>(cd0);
+        *dstC++ = trunc_from_255<apply_alpha>(cd1);
+        cd0 = cd0 + dc2;
+    }
+    if (n & 1) {
+        *dstC++ = trunc_from_255<apply_alpha>(cd0);
+    }
+}
+
+template <bool apply_alpha, bool dx_is_pos>
+void SkLinearGradient::LinearGradientContext::shade4_dx_clamp(SkPMColor dstC[], int count,
+                                                              float fx, float dx, float invDx,
+                                                              const float dither[2]) {
+    Sk4f dither0(dither[0]);
+    Sk4f dither1(dither[1]);
+    const Rec* rec = fRecs.begin();
+
+    const Sk4f dx4 = Sk4f(dx);
+    SkDEBUGCODE(SkPMColor* endDstC = dstC + count;)
+
+    if (dx_is_pos) {
+        if (fx < 0) {
+            int n = SkTMin(SkFloatToIntFloor(-fx * invDx) + 1, count);
+            fill<apply_alpha>(dstC, n, rec[0].fColor);
+            count -= n;
+            dstC += n;
+            fx += n * dx;
+            SkASSERT(0 == count || fx >= 0);
+            if (n & 1) {
+                SkTSwap(dither0, dither1);
+            }
+        }
+    } else { // dx < 0
+        if (fx > 1) {
+            int n = SkTMin(SkFloatToIntFloor((1 - fx) * invDx) + 1, count);
+            fill<apply_alpha>(dstC, n, rec[fRecs.count() - 1].fColor);
+            count -= n;
+            dstC += n;
+            fx += n * dx;
+            SkASSERT(0 == count || fx <= 1);
+            if (n & 1) {
+                SkTSwap(dither0, dither1);
+            }
+        }
+    }
+    SkASSERT(count >= 0);
+
+    const Rec* r;
+    if (dx_is_pos) {
+        r = fRecs.begin();                      // start at the beginning
+    } else {
+        r = fRecs.begin() + fRecs.count() - 2;  // start at the end
+    }
+
+    while (count > 0) {
+        if (dx_is_pos) {
+            if (fx >= 1) {
+                fill<apply_alpha>(dstC, count, rec[fRecs.count() - 1].fColor);
+                return;
+            }
+        } else {    // dx < 0
+            if (fx <= 0) {
+                fill<apply_alpha>(dstC, count, rec[0].fColor);
+                return;
+            }
+        }
+
+        if (dx_is_pos) {
+            r = find_forward(r, fx);
+        } else {
+            r = find_backward(r, fx);
+        }
+        SkASSERT(r >= fRecs.begin() && r < fRecs.begin() + fRecs.count() - 1);
+
+        const float p0 = r[0].fPos;
+        const Sk4f c0 = r[0].fColor;
+        const float p1 = r[1].fPos;
+        const Sk4f diffc = Sk4f(r[1].fColor) - c0;
+        const float scale = r[1].fPosScale;
+        const float t = (fx - p0) * scale;
+        const Sk4f c = c0 + Sk4f(t) * diffc;
+        const Sk4f dc = diffc * dx4 * Sk4f(scale);
+
+        int n;
+        if (dx_is_pos) {
+            n = SkTMin((int)((p1 - fx) * invDx) + 1, count);
+        } else {
+            n = SkTMin((int)((p0 - fx) * invDx) + 1, count);
+        }
+
+        fx += n * dx;
+        count -= n;
+        SkASSERT(count >= 0);
+        if (dx_is_pos) {
+            SkASSERT(0 == count || fx >= p1);
+        } else {
+            SkASSERT(0 == count || fx <= p0);
+        }
+
+        ramp<apply_alpha>(dstC, n, c, dc, dither0, dither1);
+        dstC += n;
+        SkASSERT(dstC <= endDstC);
+
+        if (n & 1) {
+            SkTSwap(dither0, dither1);
+        }
+    }
+}
+
+void SkLinearGradient::LinearGradientContext::shade4_clamp(int x, int y, SkPMColor dstC[],
+                                                           int count) {
+    SkASSERT(count > 0);
+    SkASSERT(kLinear_MatrixClass == fDstToIndexClass);
+
+    SkPoint srcPt;
+    fDstToIndexProc(fDstToIndex, x + SK_ScalarHalf, y + SK_ScalarHalf, &srcPt);
+    float fx = srcPt.x();
+    const float dx = fDstToIndex.getScaleX();
+
+    // Default our dither bias values to 1/2, (rounding), which is no dithering
+    float dither0 = 0.5f;
+    float dither1 = 0.5f;
+    if (fDither) {
+        const float ditherCell[] = {
+            1/8.0f,   5/8.0f,
+            7/8.0f,   3/8.0f,
+        };
+        const int rowIndex = (y & 1) << 1;
+        dither0 = ditherCell[rowIndex];
+        dither1 = ditherCell[rowIndex + 1];
+        if (x & 1) {
+            SkTSwap(dither0, dither1);
+        }
+    }
+    const float dither[2] = { dither0, dither1 };
+    const float invDx = 1 / dx;
+
+    if (SkScalarNearlyZero(dx * count)) { // gradient is vertical
+        const float pinFx = SkTPin(fx, 0.0f, 1.0f);
+        Sk4f c = lerp_color(pinFx, find_forward(fRecs.begin(), pinFx));
+        if (fApplyAlphaAfterInterp) {
+            fill<true>(dstC, count, c + dither0, c + dither1);
+        } else {
+            fill<false>(dstC, count, c + dither0, c + dither1);
+        }
+        return;
+    }
+
+    if (dx > 0) {
+        if (fApplyAlphaAfterInterp) {
+            this->shade4_dx_clamp<true, true>(dstC, count, fx, dx, invDx, dither);
+        } else {
+            this->shade4_dx_clamp<false, true>(dstC, count, fx, dx, invDx, dither);
+        }
+    } else {
+        if (fApplyAlphaAfterInterp) {
+            this->shade4_dx_clamp<true, false>(dstC, count, fx, dx, invDx, dither);
+        } else {
+            this->shade4_dx_clamp<false, false>(dstC, count, fx, dx, invDx, dither);
+        }
+    }
+}
+
diff --git a/gfx/skia/skia/src/effects/gradients/SkLinearGradient.h b/gfx/skia/skia/src/effects/gradients/SkLinearGradient.h
index 41d015296fb7..73efd2e778f2 100644
--- a/gfx/skia/skia/src/effects/gradients/SkLinearGradient.h
+++ b/gfx/skia/skia/src/effects/gradients/SkLinearGradient.h
@@ -9,39 +9,68 @@
 #define SkLinearGradient_DEFINED
 
 #include "SkGradientShaderPriv.h"
+#include "SkNx.h"
+
+struct Sk4fStorage {
+    float fArray[4];
+
+    operator Sk4f() const {
+        return Sk4f::Load(fArray);
+    }
+
+    Sk4fStorage& operator=(const Sk4f& src) {
+        src.store(fArray);
+        return *this;
+    }
+};
 
 class SkLinearGradient : public SkGradientShaderBase {
 public:
-    SkLinearGradient(const SkPoint pts[2], const Descriptor&, const SkMatrix* localMatrix);
+    SkLinearGradient(const SkPoint pts[2], const Descriptor&);
 
-    virtual size_t contextSize() const SK_OVERRIDE;
+    size_t contextSize() const override;
 
     class LinearGradientContext : public SkGradientShaderBase::GradientShaderBaseContext {
     public:
         LinearGradientContext(const SkLinearGradient&, const ContextRec&);
-        ~LinearGradientContext() {}
 
-        virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE;
-        virtual void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE;
+        void shadeSpan(int x, int y, SkPMColor dstC[], int count) override;
+        void shadeSpan16(int x, int y, uint16_t dstC[], int count) override;
 
+        struct Rec {
+            Sk4fStorage fColor;
+            float       fPos;
+            float       fPosScale;
+        };
     private:
+        SkTDArray<Rec>  fRecs;
+        bool            fApplyAlphaAfterInterp;
+
+        void shade4_clamp(int x, int y, SkPMColor dstC[], int count);
+        template <bool, bool> void shade4_dx_clamp(SkPMColor dstC[], int count, float fx, float dx,
+                                                   float invDx, const float dither[2]);
+
         typedef SkGradientShaderBase::GradientShaderBaseContext INHERITED;
     };
 
-    virtual BitmapType asABitmap(SkBitmap*, SkMatrix*, TileMode*) const SK_OVERRIDE;
-    virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE;
-    virtual bool asNewEffect(GrContext* context, const SkPaint& paint, const SkMatrix* localMatrix,
-                             GrColor* paintColor, GrEffect** effect) const SK_OVERRIDE;
+    GradientType asAGradient(GradientInfo* info) const override;
+#if SK_SUPPORT_GPU
+    const GrFragmentProcessor* asFragmentProcessor(GrContext*,
+                                                   const SkMatrix& viewM,
+                                                   const SkMatrix*,
+                                                   SkFilterQuality) const override;
+#endif
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLinearGradient)
 
 protected:
     SkLinearGradient(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE;
-    virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer& buffer) const override;
+    Context* onCreateContext(const ContextRec&, void* storage) const override;
 
 private:
+    friend class SkGradientShader;
     typedef SkGradientShaderBase INHERITED;
     const SkPoint fStart;
     const SkPoint fEnd;
diff --git a/gfx/skia/skia/src/effects/gradients/SkRadialGradient.cpp b/gfx/skia/skia/src/effects/gradients/SkRadialGradient.cpp
index 8a378aad09c5..7be8ed111b98 100644
--- a/gfx/skia/skia/src/effects/gradients/SkRadialGradient.cpp
+++ b/gfx/skia/skia/src/effects/gradients/SkRadialGradient.cpp
@@ -8,10 +8,13 @@
 
 #include "SkRadialGradient.h"
 #include "SkRadialGradient_Table.h"
+#include "SkNx.h"
 
 #define kSQRT_TABLE_BITS    11
 #define kSQRT_TABLE_SIZE    (1 << kSQRT_TABLE_BITS)
 
+static_assert(sizeof(gSqrt8Table) == kSQRT_TABLE_SIZE, "SqrtTableSizesMatch");
+
 #if 0
 
 #include <stdio.h>
@@ -55,12 +58,13 @@ inline SkFixed repeat_tileproc_nonstatic(SkFixed x) {
     return repeat_tileproc(x);
 }
 
-void rad_to_unit_matrix(const SkPoint& center, SkScalar radius,
-                               SkMatrix* matrix) {
+SkMatrix rad_to_unit_matrix(const SkPoint& center, SkScalar radius) {
     SkScalar    inv = SkScalarInvert(radius);
 
-    matrix->setTranslate(-center.fX, -center.fY);
-    matrix->postScale(inv, inv);
+    SkMatrix matrix;
+    matrix.setTranslate(-center.fX, -center.fY);
+    matrix.postScale(inv, inv);
+    return matrix;
 }
 
 typedef void (* RadialShade16Proc)(SkScalar sfx, SkScalar sdx,
@@ -88,10 +92,10 @@ void shadeSpan16_radial_clamp(SkScalar sfx, SkScalar sdx,
     // might perform this check for the other modes,
     // but the win will be a smaller % of the total
     if (dy == 0) {
-        fy = SkPin32(fy, -0xFFFF >> 1, 0xFFFF >> 1);
+        fy = SkTPin(fy, -0xFFFF >> 1, 0xFFFF >> 1);
         fy *= fy;
         do {
-            unsigned xx = SkPin32(fx, -0xFFFF >> 1, 0xFFFF >> 1);
+            unsigned xx = SkTPin(fx, -0xFFFF >> 1, 0xFFFF >> 1);
             unsigned fi = (xx * xx + fy) >> (14 + 16 - kSQRT_TABLE_BITS);
             fi = SkFastMin32(fi, 0xFFFF >> (16 - kSQRT_TABLE_BITS));
             fx += dx;
@@ -101,8 +105,8 @@ void shadeSpan16_radial_clamp(SkScalar sfx, SkScalar sdx,
         } while (--count != 0);
     } else {
         do {
-            unsigned xx = SkPin32(fx, -0xFFFF >> 1, 0xFFFF >> 1);
-            unsigned fi = SkPin32(fy, -0xFFFF >> 1, 0xFFFF >> 1);
+            unsigned xx = SkTPin(fx, -0xFFFF >> 1, 0xFFFF >> 1);
+            unsigned fi = SkTPin(fy, -0xFFFF >> 1, 0xFFFF >> 1);
             fi = (xx * xx + fi * fi) >> (14 + 16 - kSQRT_TABLE_BITS);
             fi = SkFastMin32(fi, 0xFFFF >> (16 - kSQRT_TABLE_BITS));
             fx += dx;
@@ -145,16 +149,10 @@ void shadeSpan16_radial_repeat(SkScalar fx, SkScalar dx, SkScalar fy, SkScalar d
 
 /////////////////////////////////////////////////////////////////////
 
-SkRadialGradient::SkRadialGradient(const SkPoint& center, SkScalar radius,
-                                   const Descriptor& desc, const SkMatrix* localMatrix)
-    : SkGradientShaderBase(desc, localMatrix),
-      fCenter(center),
-      fRadius(radius)
-{
-    // make sure our table is insync with our current #define for kSQRT_TABLE_SIZE
-    SkASSERT(sizeof(gSqrt8Table) == kSQRT_TABLE_SIZE);
-
-    rad_to_unit_matrix(center, radius, &fPtsToUnit);
+SkRadialGradient::SkRadialGradient(const SkPoint& center, SkScalar radius, const Descriptor& desc)
+    : SkGradientShaderBase(desc, rad_to_unit_matrix(center, radius))
+    , fCenter(center)
+    , fRadius(radius) {
 }
 
 size_t SkRadialGradient::contextSize() const {
@@ -162,7 +160,7 @@ size_t SkRadialGradient::contextSize() const {
 }
 
 SkShader::Context* SkRadialGradient::onCreateContext(const ContextRec& rec, void* storage) const {
-    return SkNEW_PLACEMENT_ARGS(storage, RadialGradientContext, (*this, rec));
+    return new (storage) RadialGradientContext(*this, rec);
 }
 
 SkRadialGradient::RadialGradientContext::RadialGradientContext(
@@ -227,23 +225,6 @@ void SkRadialGradient::RadialGradientContext::shadeSpan16(int x, int y, uint16_t
     }
 }
 
-SkShader::BitmapType SkRadialGradient::asABitmap(SkBitmap* bitmap,
-    SkMatrix* matrix, SkShader::TileMode* xy) const {
-    if (bitmap) {
-        this->getGradientTableBitmap(bitmap);
-    }
-    if (matrix) {
-        matrix->setScale(SkIntToScalar(kCache32Count),
-                         SkIntToScalar(kCache32Count));
-        matrix->preConcat(fPtsToUnit);
-    }
-    if (xy) {
-        xy[0] = fTileMode;
-        xy[1] = kClamp_TileMode;
-    }
-    return kRadial_BitmapType;
-}
-
 SkShader::GradientType SkRadialGradient::asAGradient(GradientInfo* info) const {
     if (info) {
         commonAsAGradient(info);
@@ -253,10 +234,15 @@ SkShader::GradientType SkRadialGradient::asAGradient(GradientInfo* info) const {
     return kRadial_GradientType;
 }
 
-SkRadialGradient::SkRadialGradient(SkReadBuffer& buffer)
-    : INHERITED(buffer),
-      fCenter(buffer.readPoint()),
-      fRadius(buffer.readScalar()) {
+SkFlattenable* SkRadialGradient::CreateProc(SkReadBuffer& buffer) {
+    DescriptorScope desc;
+    if (!desc.unflatten(buffer)) {
+        return nullptr;
+    }
+    const SkPoint center = buffer.readPoint();
+    const SkScalar radius = buffer.readScalar();
+    return SkGradientShader::CreateRadial(center, radius, desc.fColors, desc.fPos, desc.fCount,
+                                          desc.fTileMode, desc.fGradFlags, desc.fLocalMatrix);
 }
 
 void SkRadialGradient::flatten(SkWriteBuffer& buffer) const {
@@ -267,106 +253,77 @@ void SkRadialGradient::flatten(SkWriteBuffer& buffer) const {
 
 namespace {
 
-inline bool radial_completely_pinned(int fx, int dx, int fy, int dy) {
-    // fast, overly-conservative test: checks unit square instead
-    // of unit circle
-    bool xClamped = (fx >= SK_FixedHalf && dx >= 0) ||
-                    (fx <= -SK_FixedHalf && dx <= 0);
-    bool yClamped = (fy >= SK_FixedHalf && dy >= 0) ||
-                    (fy <= -SK_FixedHalf && dy <= 0);
-
+inline bool radial_completely_pinned(SkScalar fx, SkScalar dx, SkScalar fy, SkScalar dy) {
+    // fast, overly-conservative test: checks unit square instead of unit circle
+    bool xClamped = (fx >= 1 && dx >= 0) || (fx <= -1 && dx <= 0);
+    bool yClamped = (fy >= 1 && dy >= 0) || (fy <= -1 && dy <= 0);
     return xClamped || yClamped;
 }
 
-// Return true if (fx * fy) is always inside the unit circle
-// SkPin32 is expensive, but so are all the SkFixedMul in this test,
-// so it shouldn't be run if count is small.
-inline bool no_need_for_radial_pin(int fx, int dx,
-                                          int fy, int dy, int count) {
-    SkASSERT(count > 0);
-    if (SkAbs32(fx) > 0x7FFF || SkAbs32(fy) > 0x7FFF) {
-        return false;
-    }
-    if (fx*fx + fy*fy > 0x7FFF*0x7FFF) {
-        return false;
-    }
-    fx += (count - 1) * dx;
-    fy += (count - 1) * dy;
-    if (SkAbs32(fx) > 0x7FFF || SkAbs32(fy) > 0x7FFF) {
-        return false;
-    }
-    return fx*fx + fy*fy <= 0x7FFF*0x7FFF;
-}
-
-#define UNPINNED_RADIAL_STEP \
-    fi = (fx * fx + fy * fy) >> (14 + 16 - kSQRT_TABLE_BITS); \
-    *dstC++ = cache[toggle + \
-                    (sqrt_table[fi] >> SkGradientShaderBase::kSqrt32Shift)]; \
-    toggle = next_dither_toggle(toggle); \
-    fx += dx; \
-    fy += dy;
-
 typedef void (* RadialShadeProc)(SkScalar sfx, SkScalar sdx,
         SkScalar sfy, SkScalar sdy,
         SkPMColor* dstC, const SkPMColor* cache,
         int count, int toggle);
 
-// On Linux, this is faster with SkPMColor[] params than SkPMColor* SK_RESTRICT
-void shadeSpan_radial_clamp(SkScalar sfx, SkScalar sdx,
-        SkScalar sfy, SkScalar sdy,
-        SkPMColor* SK_RESTRICT dstC, const SkPMColor* SK_RESTRICT cache,
-        int count, int toggle) {
-    // Floating point seems to be slower than fixed point,
-    // even when we have float hardware.
-    const uint8_t* SK_RESTRICT sqrt_table = gSqrt8Table;
-    SkFixed fx = SkScalarToFixed(sfx) >> 1;
-    SkFixed dx = SkScalarToFixed(sdx) >> 1;
-    SkFixed fy = SkScalarToFixed(sfy) >> 1;
-    SkFixed dy = SkScalarToFixed(sdy) >> 1;
-    if ((count > 4) && radial_completely_pinned(fx, dx, fy, dy)) {
+static inline Sk4f fast_sqrt(const Sk4f& R) {
+    // R * R.rsqrt0() is much faster, but it's non-monotonic, which isn't so pretty for gradients.
+    return R * R.rsqrt1();
+}
+
+static inline Sk4f sum_squares(const Sk4f& a, const Sk4f& b) {
+    return a * a + b * b;
+}
+
+void shadeSpan_radial_clamp2(SkScalar sfx, SkScalar sdx, SkScalar sfy, SkScalar sdy,
+                             SkPMColor* SK_RESTRICT dstC, const SkPMColor* SK_RESTRICT cache,
+                             int count, int toggle) {
+    if (radial_completely_pinned(sfx, sdx, sfy, sdy)) {
         unsigned fi = SkGradientShaderBase::kCache32Count - 1;
         sk_memset32_dither(dstC,
-            cache[toggle + fi],
-            cache[next_dither_toggle(toggle) + fi],
-            count);
-    } else if ((count > 4) &&
-               no_need_for_radial_pin(fx, dx, fy, dy, count)) {
-        unsigned fi;
-        // 4x unroll appears to be no faster than 2x unroll on Linux
-        while (count > 1) {
-            UNPINNED_RADIAL_STEP;
-            UNPINNED_RADIAL_STEP;
-            count -= 2;
+                           cache[toggle + fi],
+                           cache[next_dither_toggle(toggle) + fi],
+                           count);
+    } else {
+        const Sk4f max(255);
+        const float scale = 255;
+        sfx *= scale;
+        sfy *= scale;
+        sdx *= scale;
+        sdy *= scale;
+        const Sk4f fx4(sfx, sfx + sdx, sfx + 2*sdx, sfx + 3*sdx);
+        const Sk4f fy4(sfy, sfy + sdy, sfy + 2*sdy, sfy + 3*sdy);
+        const Sk4f dx4(sdx * 4);
+        const Sk4f dy4(sdy * 4);
+
+        Sk4f tmpxy = fx4 * dx4 + fy4 * dy4;
+        Sk4f tmpdxdy = sum_squares(dx4, dy4);
+        Sk4f R = sum_squares(fx4, fy4);
+        Sk4f dR = tmpxy + tmpxy + tmpdxdy;
+        const Sk4f ddR = tmpdxdy + tmpdxdy;
+
+        for (int i = 0; i < (count >> 2); ++i) {
+            Sk4f dist = Sk4f::Min(fast_sqrt(R), max);
+            R = R + dR;
+            dR = dR + ddR;
+
+            uint8_t fi[4];
+            dist.toBytes(fi);
+
+            for (int i = 0; i < 4; i++) {
+                *dstC++ = cache[toggle + fi[i]];
+                toggle = next_dither_toggle(toggle);
+            }
         }
+        count &= 3;
         if (count) {
-            UNPINNED_RADIAL_STEP;
-        }
-    } else  {
-        // Specializing for dy == 0 gains us 25% on Skia benchmarks
-        if (dy == 0) {
-            unsigned yy = SkPin32(fy, -0xFFFF >> 1, 0xFFFF >> 1);
-            yy *= yy;
-            do {
-                unsigned xx = SkPin32(fx, -0xFFFF >> 1, 0xFFFF >> 1);
-                unsigned fi = (xx * xx + yy) >> (14 + 16 - kSQRT_TABLE_BITS);
-                fi = SkFastMin32(fi, 0xFFFF >> (16 - kSQRT_TABLE_BITS));
-                *dstC++ = cache[toggle + (sqrt_table[fi] >>
-                    SkGradientShaderBase::kSqrt32Shift)];
+            Sk4f dist = Sk4f::Min(fast_sqrt(R), max);
+
+            uint8_t fi[4];
+            dist.toBytes(fi);
+            for (int i = 0; i < count; i++) {
+                *dstC++ = cache[toggle + fi[i]];
                 toggle = next_dither_toggle(toggle);
-                fx += dx;
-            } while (--count != 0);
-        } else {
-            do {
-                unsigned xx = SkPin32(fx, -0xFFFF >> 1, 0xFFFF >> 1);
-                unsigned fi = SkPin32(fy, -0xFFFF >> 1, 0xFFFF >> 1);
-                fi = (xx * xx + fi * fi) >> (14 + 16 - kSQRT_TABLE_BITS);
-                fi = SkFastMin32(fi, 0xFFFF >> (16 - kSQRT_TABLE_BITS));
-                *dstC++ = cache[toggle + (sqrt_table[fi] >>
-                    SkGradientShaderBase::kSqrt32Shift)];
-                toggle = next_dither_toggle(toggle);
-                fx += dx;
-                fy += dy;
-            } while (--count != 0);
+            }
         }
     }
 }
@@ -433,7 +390,7 @@ void SkRadialGradient::RadialGradientContext::shadeSpan(int x, int y,
 
         RadialShadeProc shadeProc = shadeSpan_radial_repeat;
         if (SkShader::kClamp_TileMode == radialGradient.fTileMode) {
-            shadeProc = shadeSpan_radial_clamp;
+            shadeProc = shadeSpan_radial_clamp2;
         } else if (SkShader::kMirror_TileMode == radialGradient.fTileMode) {
             shadeProc = shadeSpan_radial_mirror;
         } else {
@@ -457,27 +414,19 @@ void SkRadialGradient::RadialGradientContext::shadeSpan(int x, int y,
 
 #if SK_SUPPORT_GPU
 
-#include "GrTBackendEffectFactory.h"
-#include "gl/GrGLShaderBuilder.h"
 #include "SkGr.h"
+#include "gl/builders/GrGLProgramBuilder.h"
 
 class GrGLRadialGradient : public GrGLGradientEffect {
 public:
 
-    GrGLRadialGradient(const GrBackendEffectFactory& factory,
-                       const GrDrawEffect&) : INHERITED (factory) { }
+    GrGLRadialGradient(const GrProcessor&) {}
     virtual ~GrGLRadialGradient() { }
 
-    virtual void emitCode(GrGLShaderBuilder*,
-                          const GrDrawEffect&,
-                          const GrEffectKey&,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    virtual void emitCode(EmitArgs&) override;
 
-    static void GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&, GrEffectKeyBuilder* b) {
-        b->add32(GenBaseGradientKey(drawEffect));
+    static void GenKey(const GrProcessor& processor, const GrGLSLCaps&, GrProcessorKeyBuilder* b) {
+        b->add32(GenBaseGradientKey(processor));
     }
 
 private:
@@ -490,21 +439,16 @@ private:
 
 class GrRadialGradient : public GrGradientEffect {
 public:
-    static GrEffect* Create(GrContext* ctx,
-                            const SkRadialGradient& shader,
-                            const SkMatrix& matrix,
-                            SkShader::TileMode tm) {
-        return SkNEW_ARGS(GrRadialGradient, (ctx, shader, matrix, tm));
+    static GrFragmentProcessor* Create(GrContext* ctx,
+                                       const SkRadialGradient& shader,
+                                       const SkMatrix& matrix,
+                                       SkShader::TileMode tm) {
+        return new GrRadialGradient(ctx, shader, matrix, tm);
     }
 
     virtual ~GrRadialGradient() { }
 
-    static const char* Name() { return "Radial Gradient"; }
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE {
-        return GrTBackendEffectFactory<GrRadialGradient>::getInstance();
-    }
-
-    typedef GrGLRadialGradient GLEffect;
+    const char* name() const override { return "Radial Gradient"; }
 
 private:
     GrRadialGradient(GrContext* ctx,
@@ -512,89 +456,86 @@ private:
                      const SkMatrix& matrix,
                      SkShader::TileMode tm)
         : INHERITED(ctx, shader, matrix, tm) {
+        this->initClassID<GrRadialGradient>();
     }
 
-    GR_DECLARE_EFFECT_TEST;
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override {
+        return new GrGLRadialGradient(*this);
+    }
+
+    virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                       GrProcessorKeyBuilder* b) const override {
+        GrGLRadialGradient::GenKey(*this, caps, b);
+    }
+
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
 
     typedef GrGradientEffect INHERITED;
 };
 
 /////////////////////////////////////////////////////////////////////
 
-GR_DEFINE_EFFECT_TEST(GrRadialGradient);
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrRadialGradient);
 
-GrEffect* GrRadialGradient::TestCreate(SkRandom* random,
-                                       GrContext* context,
-                                       const GrDrawTargetCaps&,
-                                       GrTexture**) {
-    SkPoint center = {random->nextUScalar1(), random->nextUScalar1()};
-    SkScalar radius = random->nextUScalar1();
+const GrFragmentProcessor* GrRadialGradient::TestCreate(GrProcessorTestData* d) {
+    SkPoint center = {d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1()};
+    SkScalar radius = d->fRandom->nextUScalar1();
 
     SkColor colors[kMaxRandomGradientColors];
     SkScalar stopsArray[kMaxRandomGradientColors];
     SkScalar* stops = stopsArray;
     SkShader::TileMode tm;
-    int colorCount = RandomGradientParams(random, colors, &stops, &tm);
+    int colorCount = RandomGradientParams(d->fRandom, colors, &stops, &tm);
     SkAutoTUnref<SkShader> shader(SkGradientShader::CreateRadial(center, radius,
                                                                  colors, stops, colorCount,
                                                                  tm));
-    SkPaint paint;
-    GrColor paintColor;
-    GrEffect* effect;
-    SkAssertResult(shader->asNewEffect(context, paint, NULL, &paintColor, &effect));
-    return effect;
+    const GrFragmentProcessor* fp = shader->asFragmentProcessor(d->fContext,
+        GrTest::TestMatrix(d->fRandom), NULL, kNone_SkFilterQuality);
+    GrAlwaysAssert(fp);
+    return fp;
 }
 
 /////////////////////////////////////////////////////////////////////
 
-void GrGLRadialGradient::emitCode(GrGLShaderBuilder* builder,
-                                  const GrDrawEffect&,
-                                  const GrEffectKey& key,
-                                  const char* outputColor,
-                                  const char* inputColor,
-                                  const TransformedCoordsArray& coords,
-                                  const TextureSamplerArray& samplers) {
-    uint32_t baseKey = key.get32(0);
-    this->emitUniforms(builder, baseKey);
+void GrGLRadialGradient::emitCode(EmitArgs& args) {
+    const GrRadialGradient& ge = args.fFp.cast<GrRadialGradient>();
+    this->emitUniforms(args.fBuilder, ge);
     SkString t("length(");
-    t.append(builder->ensureFSCoords2D(coords, 0));
+    t.append(args.fFragBuilder->ensureFSCoords2D(args.fCoords, 0));
     t.append(")");
-    this->emitColor(builder, t.c_str(), baseKey, outputColor, inputColor, samplers);
+    this->emitColor(args.fBuilder,
+                    args.fFragBuilder,
+                    args.fGLSLCaps,
+                    ge, t.c_str(),
+                    args.fOutputColor,
+                    args.fInputColor,
+                    args.fSamplers);
 }
 
 /////////////////////////////////////////////////////////////////////
 
-bool SkRadialGradient::asNewEffect(GrContext* context, const SkPaint& paint,
-                                   const SkMatrix* localMatrix, GrColor* paintColor,
-                                   GrEffect** effect) const {
-    SkASSERT(NULL != context);
-    
+const GrFragmentProcessor* SkRadialGradient::asFragmentProcessor(
+                                                 GrContext* context,
+                                                 const SkMatrix& viewM,
+                                                 const SkMatrix* localMatrix,
+                                                 SkFilterQuality) const {
+    SkASSERT(context);
+
     SkMatrix matrix;
     if (!this->getLocalMatrix().invert(&matrix)) {
-        return false;
+        return nullptr;
     }
     if (localMatrix) {
         SkMatrix inv;
         if (!localMatrix->invert(&inv)) {
-            return false;
+            return nullptr;
         }
         matrix.postConcat(inv);
     }
     matrix.postConcat(fPtsToUnit);
-    
-    *paintColor = SkColor2GrColorJustAlpha(paint.getColor());
-    *effect = GrRadialGradient::Create(context, *this, matrix, fTileMode);
-    
-    return true;
-}
-
-#else
-
-bool SkRadialGradient::asNewEffect(GrContext* context, const SkPaint& paint,
-                                   const SkMatrix* localMatrix, GrColor* paintColor,
-                                   GrEffect** effect) const {
-    SkDEBUGFAIL("Should not call in GPU-less build");
-    return false;
+        SkAutoTUnref<const GrFragmentProcessor> inner(
+            GrRadialGradient::Create(context, *this, matrix, fTileMode));
+    return GrFragmentProcessor::MulOutputByInputAlpha(inner);
 }
 
 #endif
diff --git a/gfx/skia/skia/src/effects/gradients/SkRadialGradient.h b/gfx/skia/skia/src/effects/gradients/SkRadialGradient.h
index ac79a57d52dd..afffddd22d39 100644
--- a/gfx/skia/skia/src/effects/gradients/SkRadialGradient.h
+++ b/gfx/skia/skia/src/effects/gradients/SkRadialGradient.h
@@ -13,40 +13,43 @@
 
 class SkRadialGradient : public SkGradientShaderBase {
 public:
-    SkRadialGradient(const SkPoint& center, SkScalar radius, const Descriptor&,
-                     const SkMatrix* localMatrix);
+    SkRadialGradient(const SkPoint& center, SkScalar radius, const Descriptor&);
 
-    virtual size_t contextSize() const SK_OVERRIDE;
+    size_t contextSize() const override;
 
     class RadialGradientContext : public SkGradientShaderBase::GradientShaderBaseContext {
     public:
         RadialGradientContext(const SkRadialGradient&, const ContextRec&);
 
-        virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE;
-        virtual void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE;
+        void shadeSpan(int x, int y, SkPMColor dstC[], int count) override;
+        void shadeSpan16(int x, int y, uint16_t dstC[], int count) override;
 
     private:
         typedef SkGradientShaderBase::GradientShaderBaseContext INHERITED;
     };
 
-    virtual BitmapType asABitmap(SkBitmap* bitmap,
-                                 SkMatrix* matrix,
-                                 TileMode* xy) const SK_OVERRIDE;
-    virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE;
-    virtual bool asNewEffect(GrContext*, const SkPaint&, const SkMatrix*, GrColor*, GrEffect**) const SK_OVERRIDE;
+    GradientType asAGradient(GradientInfo* info) const override;
+#if SK_SUPPORT_GPU
+    const GrFragmentProcessor* asFragmentProcessor(GrContext*,
+                                                   const SkMatrix& viewM,
+                                                   const SkMatrix*,
+                                                   SkFilterQuality) const override;
+#endif
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkRadialGradient)
 
 protected:
     SkRadialGradient(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE;
-    virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer& buffer) const override;
+    Context* onCreateContext(const ContextRec&, void* storage) const override;
 
 private:
-    typedef SkGradientShaderBase INHERITED;
     const SkPoint fCenter;
     const SkScalar fRadius;
+
+    friend class SkGradientShader;
+    typedef SkGradientShaderBase INHERITED;
 };
 
 #endif
diff --git a/gfx/skia/skia/src/effects/gradients/SkSweepGradient.cpp b/gfx/skia/skia/src/effects/gradients/SkSweepGradient.cpp
index 66e755a1bcdf..3df714433750 100644
--- a/gfx/skia/skia/src/effects/gradients/SkSweepGradient.cpp
+++ b/gfx/skia/skia/src/effects/gradients/SkSweepGradient.cpp
@@ -8,30 +8,18 @@
 
 #include "SkSweepGradient.h"
 
-SkSweepGradient::SkSweepGradient(SkScalar cx, SkScalar cy,
-                                 const Descriptor& desc, const SkMatrix* localMatrix)
-    : SkGradientShaderBase(desc, localMatrix)
-    , fCenter(SkPoint::Make(cx, cy))
-{
-    fPtsToUnit.setTranslate(-cx, -cy);
-
-    // overwrite the tilemode to a canonical value (since sweep ignores it)
-    fTileMode = SkShader::kClamp_TileMode;
+static SkMatrix translate(SkScalar dx, SkScalar dy) {
+    SkMatrix matrix;
+    matrix.setTranslate(dx, dy);
+    return matrix;
 }
 
-SkShader::BitmapType SkSweepGradient::asABitmap(SkBitmap* bitmap,
-    SkMatrix* matrix, SkShader::TileMode* xy) const {
-    if (bitmap) {
-        this->getGradientTableBitmap(bitmap);
-    }
-    if (matrix) {
-        *matrix = fPtsToUnit;
-    }
-    if (xy) {
-        xy[0] = fTileMode;
-        xy[1] = kClamp_TileMode;
-    }
-    return kSweep_BitmapType;
+SkSweepGradient::SkSweepGradient(SkScalar cx, SkScalar cy, const Descriptor& desc)
+    : SkGradientShaderBase(desc, translate(-cx, -cy))
+    , fCenter(SkPoint::Make(cx, cy))
+{
+    // overwrite the tilemode to a canonical value (since sweep ignores it)
+    fTileMode = SkShader::kClamp_TileMode;
 }
 
 SkShader::GradientType SkSweepGradient::asAGradient(GradientInfo* info) const {
@@ -42,9 +30,14 @@ SkShader::GradientType SkSweepGradient::asAGradient(GradientInfo* info) const {
     return kSweep_GradientType;
 }
 
-SkSweepGradient::SkSweepGradient(SkReadBuffer& buffer)
-    : INHERITED(buffer),
-      fCenter(buffer.readPoint()) {
+SkFlattenable* SkSweepGradient::CreateProc(SkReadBuffer& buffer) {
+    DescriptorScope desc;
+    if (!desc.unflatten(buffer)) {
+        return nullptr;
+    }
+    const SkPoint center = buffer.readPoint();
+    return SkGradientShader::CreateSweep(center.x(), center.y(), desc.fColors, desc.fPos,
+                                         desc.fCount, desc.fGradFlags, desc.fLocalMatrix);
 }
 
 void SkSweepGradient::flatten(SkWriteBuffer& buffer) const {
@@ -57,7 +50,7 @@ size_t SkSweepGradient::contextSize() const {
 }
 
 SkShader::Context* SkSweepGradient::onCreateContext(const ContextRec& rec, void* storage) const {
-    return SkNEW_PLACEMENT_ARGS(storage, SweepGradientContext, (*this, rec));
+    return new (storage) SweepGradientContext(*this, rec);
 }
 
 SkSweepGradient::SweepGradientContext::SweepGradientContext(
@@ -173,27 +166,20 @@ void SkSweepGradient::SweepGradientContext::shadeSpan16(int x, int y, uint16_t*
 
 #if SK_SUPPORT_GPU
 
-#include "GrTBackendEffectFactory.h"
-#include "gl/GrGLShaderBuilder.h"
 #include "SkGr.h"
+#include "gl/GrGLContext.h"
+#include "gl/builders/GrGLProgramBuilder.h"
 
 class GrGLSweepGradient : public GrGLGradientEffect {
 public:
 
-    GrGLSweepGradient(const GrBackendEffectFactory& factory,
-                      const GrDrawEffect&) : INHERITED (factory) { }
+    GrGLSweepGradient(const GrProcessor&) {}
     virtual ~GrGLSweepGradient() { }
 
-    virtual void emitCode(GrGLShaderBuilder*,
-                          const GrDrawEffect&,
-                          const GrEffectKey&,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    virtual void emitCode(EmitArgs&) override;
 
-    static void GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&, GrEffectKeyBuilder* b) {
-        b->add32(GenBaseGradientKey(drawEffect));
+    static void GenKey(const GrProcessor& processor, const GrGLSLCaps&, GrProcessorKeyBuilder* b) {
+        b->add32(GenBaseGradientKey(processor));
     }
 
 private:
@@ -206,111 +192,107 @@ private:
 
 class GrSweepGradient : public GrGradientEffect {
 public:
-    static GrEffect* Create(GrContext* ctx, const SkSweepGradient& shader, const SkMatrix& m) {
-        return SkNEW_ARGS(GrSweepGradient, (ctx, shader, m));
+    static GrFragmentProcessor* Create(GrContext* ctx, const SkSweepGradient& shader,
+                                       const SkMatrix& m) {
+        return new GrSweepGradient(ctx, shader, m);
     }
     virtual ~GrSweepGradient() { }
 
-    static const char* Name() { return "Sweep Gradient"; }
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE {
-        return GrTBackendEffectFactory<GrSweepGradient>::getInstance();
-    }
-
-    typedef GrGLSweepGradient GLEffect;
+    const char* name() const override { return "Sweep Gradient"; }
 
 private:
     GrSweepGradient(GrContext* ctx,
                     const SkSweepGradient& shader,
                     const SkMatrix& matrix)
-    : INHERITED(ctx, shader, matrix, SkShader::kClamp_TileMode) { }
-    GR_DECLARE_EFFECT_TEST;
+    : INHERITED(ctx, shader, matrix, SkShader::kClamp_TileMode) {
+        this->initClassID<GrSweepGradient>();
+    }
+
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override {
+        return new GrGLSweepGradient(*this);
+    }
+
+    virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                       GrProcessorKeyBuilder* b) const override {
+        GrGLSweepGradient::GenKey(*this, caps, b);
+    }
+
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
 
     typedef GrGradientEffect INHERITED;
 };
 
 /////////////////////////////////////////////////////////////////////
 
-GR_DEFINE_EFFECT_TEST(GrSweepGradient);
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrSweepGradient);
 
-GrEffect* GrSweepGradient::TestCreate(SkRandom* random,
-                                         GrContext* context,
-                                         const GrDrawTargetCaps&,
-                                         GrTexture**) {
-    SkPoint center = {random->nextUScalar1(), random->nextUScalar1()};
+const GrFragmentProcessor* GrSweepGradient::TestCreate(GrProcessorTestData* d) {
+    SkPoint center = {d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1()};
 
     SkColor colors[kMaxRandomGradientColors];
     SkScalar stopsArray[kMaxRandomGradientColors];
     SkScalar* stops = stopsArray;
     SkShader::TileMode tmIgnored;
-    int colorCount = RandomGradientParams(random, colors, &stops, &tmIgnored);
+    int colorCount = RandomGradientParams(d->fRandom, colors, &stops, &tmIgnored);
     SkAutoTUnref<SkShader> shader(SkGradientShader::CreateSweep(center.fX, center.fY,
                                                                 colors, stops, colorCount));
-    SkPaint paint;
-    GrEffect* effect;
-    GrColor paintColor;
-    SkAssertResult(shader->asNewEffect(context, paint, NULL, &paintColor, &effect));
-    return effect;
+    const GrFragmentProcessor* fp = shader->asFragmentProcessor(d->fContext,
+                                                                GrTest::TestMatrix(d->fRandom),
+                                                                NULL, kNone_SkFilterQuality);
+    GrAlwaysAssert(fp);
+    return fp;
 }
 
 /////////////////////////////////////////////////////////////////////
 
-void GrGLSweepGradient::emitCode(GrGLShaderBuilder* builder,
-                                 const GrDrawEffect&,
-                                 const GrEffectKey& key,
-                                 const char* outputColor,
-                                 const char* inputColor,
-                                 const TransformedCoordsArray& coords,
-                                 const TextureSamplerArray& samplers) {
-    uint32_t baseKey = key.get32(0);
-    this->emitUniforms(builder, baseKey);
-    SkString coords2D = builder->ensureFSCoords2D(coords, 0);
-    const GrGLContextInfo ctxInfo = builder->ctxInfo();
+void GrGLSweepGradient::emitCode(EmitArgs& args) {
+    const GrSweepGradient& ge = args.fFp.cast<GrSweepGradient>();
+    this->emitUniforms(args.fBuilder, ge);
+    SkString coords2D = args.fFragBuilder->ensureFSCoords2D(args.fCoords, 0);
     SkString t;
     // 0.1591549430918 is 1/(2*pi), used since atan returns values [-pi, pi]
     // On Intel GPU there is an issue where it reads the second arguement to atan "- %s.x" as an int
     // thus must us -1.0 * %s.x to work correctly
-    if (kIntel_GrGLVendor != ctxInfo.vendor()){
-        t.printf("atan(- %s.y, - %s.x) * 0.1591549430918 + 0.5",
-                 coords2D.c_str(), coords2D.c_str());
-    } else {
+    if (args.fGLSLCaps->mustForceNegatedAtanParamToFloat()){
         t.printf("atan(- %s.y, -1.0 * %s.x) * 0.1591549430918 + 0.5",
                  coords2D.c_str(), coords2D.c_str());
+    } else {
+        t.printf("atan(- %s.y, - %s.x) * 0.1591549430918 + 0.5",
+                 coords2D.c_str(), coords2D.c_str());
     }
-    this->emitColor(builder, t.c_str(), baseKey, outputColor, inputColor, samplers);
+    this->emitColor(args.fBuilder,
+                    args.fFragBuilder,
+                    args.fGLSLCaps,
+                    ge, t.c_str(),
+                    args.fOutputColor,
+                    args.fInputColor,
+                    args.fSamplers);
 }
 
 /////////////////////////////////////////////////////////////////////
 
-bool SkSweepGradient::asNewEffect(GrContext* context, const SkPaint& paint,
-                                  const SkMatrix* localMatrix, GrColor* paintColor,
-                                  GrEffect** effect)  const {
-    
+const GrFragmentProcessor* SkSweepGradient::asFragmentProcessor(
+                                                    GrContext* context,
+                                                    const SkMatrix& viewM,
+                                                    const SkMatrix* localMatrix,
+                                                    SkFilterQuality) const {
+
     SkMatrix matrix;
     if (!this->getLocalMatrix().invert(&matrix)) {
-        return false;
+        return nullptr;
     }
     if (localMatrix) {
         SkMatrix inv;
         if (!localMatrix->invert(&inv)) {
-            return false;
+            return nullptr;
         }
         matrix.postConcat(inv);
     }
     matrix.postConcat(fPtsToUnit);
-    
-    *effect = GrSweepGradient::Create(context, *this, matrix);
-    *paintColor = SkColor2GrColorJustAlpha(paint.getColor());
-    
-    return true;
-}
 
-#else
-
-bool SkSweepGradient::asNewEffect(GrContext* context, const SkPaint& paint,
-                                  const SkMatrix* localMatrix, GrColor* paintColor,
-                                  GrEffect** effect)  const {
-    SkDEBUGFAIL("Should not call in GPU-less build");
-    return false;
+    SkAutoTUnref<const GrFragmentProcessor> inner(
+        GrSweepGradient::Create(context, *this, matrix));
+    return GrFragmentProcessor::MulOutputByInputAlpha(inner);
 }
 
 #endif
diff --git a/gfx/skia/skia/src/effects/gradients/SkSweepGradient.h b/gfx/skia/skia/src/effects/gradients/SkSweepGradient.h
index 7404ac7436c3..728a01474b47 100644
--- a/gfx/skia/skia/src/effects/gradients/SkSweepGradient.h
+++ b/gfx/skia/skia/src/effects/gradients/SkSweepGradient.h
@@ -13,42 +13,41 @@
 
 class SkSweepGradient : public SkGradientShaderBase {
 public:
-    SkSweepGradient(SkScalar cx, SkScalar cy, const Descriptor&,
-                    const SkMatrix* localMatrix);
+    SkSweepGradient(SkScalar cx, SkScalar cy, const Descriptor&);
 
-    virtual size_t contextSize() const SK_OVERRIDE;
+    size_t contextSize() const override;
 
     class SweepGradientContext : public SkGradientShaderBase::GradientShaderBaseContext {
     public:
         SweepGradientContext(const SkSweepGradient& shader, const ContextRec&);
 
-        virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE;
-        virtual void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE;
+        void shadeSpan(int x, int y, SkPMColor dstC[], int count) override;
+        void shadeSpan16(int x, int y, uint16_t dstC[], int count) override;
 
     private:
         typedef SkGradientShaderBase::GradientShaderBaseContext INHERITED;
     };
 
-    virtual BitmapType asABitmap(SkBitmap* bitmap,
-                                 SkMatrix* matrix,
-                                 TileMode* xy) const SK_OVERRIDE;
+    GradientType asAGradient(GradientInfo* info) const override;
 
-    virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE;
-
-    virtual bool asNewEffect(GrContext*, const SkPaint&, const SkMatrix*, GrColor*, GrEffect**)
-        const SK_OVERRIDE;
+#if SK_SUPPORT_GPU
+    const GrFragmentProcessor* asFragmentProcessor(GrContext*,
+                                                   const SkMatrix& viewM,
+                                                   const SkMatrix*,
+                                                   SkFilterQuality) const override;
+#endif
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSweepGradient)
 
 protected:
-    SkSweepGradient(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE;
-    virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer& buffer) const override;
+    Context* onCreateContext(const ContextRec&, void* storage) const override;
 
 private:
     const SkPoint fCenter;
 
+    friend class SkGradientShader;
     typedef SkGradientShaderBase INHERITED;
 };
 
diff --git a/gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp b/gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp
index bb702ff8fe29..790e1153d85b 100644
--- a/gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp
+++ b/gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp
@@ -186,27 +186,22 @@ static void twopoint_mirror(TwoPtRadialContext* rec, SkPMColor* SK_RESTRICT dstC
     }
 }
 
-void SkTwoPointConicalGradient::init() {
-    fRec.init(fCenter1, fRadius1, fCenter2, fRadius2, fFlippedGrad);
-    fPtsToUnit.reset();
-}
-
 /////////////////////////////////////////////////////////////////////
 
 SkTwoPointConicalGradient::SkTwoPointConicalGradient(
         const SkPoint& start, SkScalar startRadius,
         const SkPoint& end, SkScalar endRadius,
-        bool flippedGrad, const Descriptor& desc,
-        const SkMatrix* localMatrix)
-    : SkGradientShaderBase(desc, localMatrix),
-    fCenter1(start),
-    fCenter2(end),
-    fRadius1(startRadius),
-    fRadius2(endRadius),
-    fFlippedGrad(flippedGrad) {
+        bool flippedGrad, const Descriptor& desc)
+    : SkGradientShaderBase(desc, SkMatrix::I())
+    , fCenter1(start)
+    , fCenter2(end)
+    , fRadius1(startRadius)
+    , fRadius2(endRadius)
+    , fFlippedGrad(flippedGrad)
+{
     // this is degenerate, and should be caught by our caller
     SkASSERT(fCenter1 != fCenter2 || fRadius1 != fRadius2);
-    this->init();
+    fRec.init(fCenter1, fRadius1, fCenter2, fRadius2, fFlippedGrad);
 }
 
 bool SkTwoPointConicalGradient::isOpaque() const {
@@ -222,7 +217,7 @@ size_t SkTwoPointConicalGradient::contextSize() const {
 
 SkShader::Context* SkTwoPointConicalGradient::onCreateContext(const ContextRec& rec,
                                                               void* storage) const {
-    return SkNEW_PLACEMENT_ARGS(storage, TwoPointConicalGradientContext, (*this, rec));
+    return new (storage) TwoPointConicalGradientContext(*this, rec);
 }
 
 SkTwoPointConicalGradient::TwoPointConicalGradientContext::TwoPointConicalGradientContext(
@@ -297,35 +292,6 @@ void SkTwoPointConicalGradient::TwoPointConicalGradientContext::shadeSpan(
     }
 }
 
-SkShader::BitmapType SkTwoPointConicalGradient::asABitmap(
-    SkBitmap* bitmap, SkMatrix* matrix, SkShader::TileMode* xy) const {
-    SkPoint diff = fCenter2 - fCenter1;
-    SkScalar diffLen = 0;
-
-    if (bitmap) {
-        this->getGradientTableBitmap(bitmap);
-    }
-    if (matrix) {
-        diffLen = diff.length();
-    }
-    if (matrix) {
-        if (diffLen) {
-            SkScalar invDiffLen = SkScalarInvert(diffLen);
-            // rotate to align circle centers with the x-axis
-            matrix->setSinCos(-SkScalarMul(invDiffLen, diff.fY),
-                              SkScalarMul(invDiffLen, diff.fX));
-        } else {
-            matrix->reset();
-        }
-        matrix->preTranslate(-fCenter1.fX, -fCenter1.fY);
-    }
-    if (xy) {
-        xy[0] = fTileMode;
-        xy[1] = kClamp_TileMode;
-    }
-    return kTwoPointConical_BitmapType;
-}
-
 // Returns the original non-sorted version of the gradient
 SkShader::GradientType SkTwoPointConicalGradient::asAGradient(
     GradientInfo* info) const {
@@ -343,32 +309,45 @@ SkShader::GradientType SkTwoPointConicalGradient::asAGradient(
     return kConical_GradientType;
 }
 
-SkTwoPointConicalGradient::SkTwoPointConicalGradient(
-    SkReadBuffer& buffer)
-    : INHERITED(buffer),
-    fCenter1(buffer.readPoint()),
-    fCenter2(buffer.readPoint()),
-    fRadius1(buffer.readScalar()),
-    fRadius2(buffer.readScalar()) {
-    if (buffer.isVersionLT(SkReadBuffer::kGradientFlippedFlag_Version)) {
-        // V23_COMPATIBILITY_CODE
-        // Sort gradient by radius size for old pictures
-        if (fRadius2 < fRadius1) {
-            SkTSwap(fCenter1, fCenter2);
-            SkTSwap(fRadius1, fRadius2);
-            this->flipGradientColors();
-            fFlippedGrad = true;
-        } else {
-            fFlippedGrad = false;
-        }
-    } else {
-        fFlippedGrad = buffer.readBool();
+SkFlattenable* SkTwoPointConicalGradient::CreateProc(SkReadBuffer& buffer) {
+    DescriptorScope desc;
+    if (!desc.unflatten(buffer)) {
+        return nullptr;
     }
-    this->init();
-};
+    SkPoint c1 = buffer.readPoint();
+    SkPoint c2 = buffer.readPoint();
+    SkScalar r1 = buffer.readScalar();
+    SkScalar r2 = buffer.readScalar();
 
-void SkTwoPointConicalGradient::flatten(
-    SkWriteBuffer& buffer) const {
+    if (buffer.readBool()) {    // flipped
+        SkTSwap(c1, c2);
+        SkTSwap(r1, r2);
+
+        SkColor* colors = desc.mutableColors();
+        SkScalar* pos = desc.mutablePos();
+        const int last = desc.fCount - 1;
+        const int half = desc.fCount >> 1;
+        for (int i = 0; i < half; ++i) {
+            SkTSwap(colors[i], colors[last - i]);
+            if (pos) {
+                SkScalar tmp = pos[i];
+                pos[i] = SK_Scalar1 - pos[last - i];
+                pos[last - i] = SK_Scalar1 - tmp;
+            }
+        }
+        if (pos) {
+            if (desc.fCount & 1) {
+                pos[half] = SK_Scalar1 - pos[half];
+            }
+        }
+    }
+
+    return SkGradientShader::CreateTwoPointConical(c1, r1, c2, r2, desc.fColors, desc.fPos,
+                                                   desc.fCount, desc.fTileMode, desc.fGradFlags,
+                                                   desc.fLocalMatrix);
+}
+
+void SkTwoPointConicalGradient::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
     buffer.writePoint(fCenter1);
     buffer.writePoint(fCenter2);
@@ -381,24 +360,16 @@ void SkTwoPointConicalGradient::flatten(
 
 #include "SkGr.h"
 
-bool SkTwoPointConicalGradient::asNewEffect(GrContext* context, const SkPaint& paint,
-                                             const SkMatrix* localMatrix, GrColor* paintColor,
-                                             GrEffect** effect)  const {
-    SkASSERT(NULL != context);
+const GrFragmentProcessor* SkTwoPointConicalGradient::asFragmentProcessor(
+                                                  GrContext* context,
+                                                  const SkMatrix& viewM,
+                                                  const SkMatrix* localMatrix,
+                                                  SkFilterQuality) const {
+    SkASSERT(context);
     SkASSERT(fPtsToUnit.isIdentity());
-
-    *effect = Gr2PtConicalGradientEffect::Create(context, *this, fTileMode, localMatrix);
-    *paintColor = SkColor2GrColorJustAlpha(paint.getColor());
-    return true;
-}
-
-#else
-
-bool SkTwoPointConicalGradient::asNewEffect(GrContext* context, const SkPaint& paint,
-                                            const SkMatrix* localMatrix, GrColor* paintColor,
-                                            GrEffect** effect)  const {
-    SkDEBUGFAIL("Should not call in GPU-less build");
-    return false;
+    SkAutoTUnref<const GrFragmentProcessor> inner(
+        Gr2PtConicalGradientEffect::Create(context, *this, fTileMode, localMatrix));
+    return GrFragmentProcessor::MulOutputByInputAlpha(inner);
 }
 
 #endif
diff --git a/gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient.h b/gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient.h
index 418c92dc61b2..117e6e967da0 100644
--- a/gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient.h
+++ b/gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient.h
@@ -39,35 +39,33 @@ struct TwoPtRadial {
 
 class SkTwoPointConicalGradient : public SkGradientShaderBase {
     TwoPtRadial fRec;
-    void init();
-
 public:
     SkTwoPointConicalGradient(const SkPoint& start, SkScalar startRadius,
                               const SkPoint& end, SkScalar endRadius,
-                              bool flippedGrad, const Descriptor&,
-                              const SkMatrix* localMatrix);
+                              bool flippedGrad, const Descriptor&);
 
 
-    virtual size_t contextSize() const SK_OVERRIDE;
+    size_t contextSize() const override;
 
     class TwoPointConicalGradientContext : public SkGradientShaderBase::GradientShaderBaseContext {
     public:
         TwoPointConicalGradientContext(const SkTwoPointConicalGradient&, const ContextRec&);
         ~TwoPointConicalGradientContext() {}
 
-        virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE;
+        void shadeSpan(int x, int y, SkPMColor dstC[], int count) override;
 
     private:
         typedef SkGradientShaderBase::GradientShaderBaseContext INHERITED;
     };
 
-    virtual BitmapType asABitmap(SkBitmap* bitmap,
-                                 SkMatrix* matrix,
-                                 TileMode* xy) const;
-    virtual SkShader::GradientType asAGradient(GradientInfo* info) const  SK_OVERRIDE;
-    virtual bool asNewEffect(GrContext*, const SkPaint&, const SkMatrix*, GrColor* paintColor,
-                             GrEffect**) const SK_OVERRIDE;
-    virtual bool isOpaque() const SK_OVERRIDE;
+    SkShader::GradientType asAGradient(GradientInfo* info) const  override;
+#if SK_SUPPORT_GPU
+    const GrFragmentProcessor* asFragmentProcessor(GrContext*,
+                                                   const SkMatrix&,
+                                                   const SkMatrix*,
+                                                   SkFilterQuality) const override;
+#endif
+    bool isOpaque() const override;
 
     SkScalar getCenterX1() const { return SkPoint::Distance(fCenter1, fCenter2); }
     SkScalar getStartRadius() const { return fRadius1; }
@@ -82,8 +80,8 @@ public:
 
 protected:
     SkTwoPointConicalGradient(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE;
-    virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
+    void flatten(SkWriteBuffer& buffer) const override;
+    Context* onCreateContext(const ContextRec&, void* storage) const override;
 
 private:
     SkPoint fCenter1;
@@ -92,6 +90,7 @@ private:
     SkScalar fRadius2;
     bool fFlippedGrad;
 
+    friend class SkGradientShader;
     typedef SkGradientShaderBase INHERITED;
 };
 
diff --git a/gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
index 76f9a492b8ee..31ceda4f2aed 100644
--- a/gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
+++ b/gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
@@ -11,10 +11,12 @@
 #include "SkTwoPointConicalGradient.h"
 
 #if SK_SUPPORT_GPU
-#include "GrTBackendEffectFactory.h"
-#include "gl/GrGLShaderBuilder.h"
+#include "GrPaint.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
 // For brevity
-typedef GrGLUniformManager::UniformHandle UniformHandle;
+typedef GrGLSLProgramDataManager::UniformHandle UniformHandle;
 
 static const SkScalar kErrorTol = 0.00001f;
 static const SkScalar kEdgeErrorTol = 5.f * kErrorTol;
@@ -55,33 +57,34 @@ static void set_matrix_edge_conical(const SkTwoPointConicalGradient& shader,
     }
 }
 
-class GLEdge2PtConicalEffect;
-
 class Edge2PtConicalEffect : public GrGradientEffect {
 public:
 
-    static GrEffect* Create(GrContext* ctx,
-                            const SkTwoPointConicalGradient& shader,
-                            const SkMatrix& matrix,
-                            SkShader::TileMode tm) {
-        return SkNEW_ARGS(Edge2PtConicalEffect, (ctx, shader, matrix, tm));
+    static GrFragmentProcessor* Create(GrContext* ctx,
+                                       const SkTwoPointConicalGradient& shader,
+                                       const SkMatrix& matrix,
+                                       SkShader::TileMode tm) {
+        return new Edge2PtConicalEffect(ctx, shader, matrix, tm);
     }
 
     virtual ~Edge2PtConicalEffect() {}
 
-    static const char* Name() { return "Two-Point Conical Gradient Edge Touching"; }
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
+    const char* name() const override {
+        return "Two-Point Conical Gradient Edge Touching";
+    }
 
     // The radial gradient parameters can collapse to a linear (instead of quadratic) equation.
     SkScalar center() const { return fCenterX1; }
     SkScalar diffRadius() const { return fDiffRadius; }
     SkScalar radius() const { return fRadius0; }
 
-    typedef GLEdge2PtConicalEffect GLEffect;
-
 private:
-    virtual bool onIsEqual(const GrEffect& sBase) const SK_OVERRIDE {
-        const Edge2PtConicalEffect& s = CastEffect<Edge2PtConicalEffect>(sBase);
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
+
+    bool onIsEqual(const GrFragmentProcessor& sBase) const override {
+        const Edge2PtConicalEffect& s = sBase.cast<Edge2PtConicalEffect>();
         return (INHERITED::onIsEqual(sBase) &&
                 this->fCenterX1 == s.fCenterX1 &&
                 this->fRadius0 == s.fRadius0 &&
@@ -96,11 +99,15 @@ private:
         fCenterX1(shader.getCenterX1()),
         fRadius0(shader.getStartRadius()),
         fDiffRadius(shader.getDiffRadius()){
+        this->initClassID<Edge2PtConicalEffect>();
         // We should only be calling this shader if we are degenerate case with touching circles
         // When deciding if we are in edge case, we scaled by the end radius for cases when the
-        // start radius was close to zero, otherwise we scaled by the start radius
-        SkASSERT(SkScalarAbs(SkScalarAbs(fDiffRadius) - SkScalarAbs(fCenterX1)) <
-                 kEdgeErrorTol * (fRadius0 < kErrorTol ? shader.getEndRadius() : fRadius0));
+        // start radius was close to zero, otherwise we scaled by the start radius.  In addition
+        // Our test for the edge case in set_matrix_circle_conical has a higher tolerance so we
+        // need the sqrt value below
+        SkASSERT(SkScalarAbs(SkScalarAbs(fDiffRadius) - fCenterX1) <
+                 (fRadius0 < kErrorTol ? shader.getEndRadius() * kEdgeErrorTol :
+                                         fRadius0 * sqrt(kEdgeErrorTol)));
 
         // We pass the linear part of the quadratic as a varying.
         //    float b = -2.0 * (fCenterX1 * x + fRadius0 * fDiffRadius * z)
@@ -116,7 +123,7 @@ private:
         this->addCoordTransform(&fBTransform);
     }
 
-    GR_DECLARE_EFFECT_TEST;
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
 
     // @{
     // Cache of values - these can change arbitrarily, EXCEPT
@@ -134,21 +141,16 @@ private:
 
 class GLEdge2PtConicalEffect : public GrGLGradientEffect {
 public:
-    GLEdge2PtConicalEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&);
+    GLEdge2PtConicalEffect(const GrProcessor&);
     virtual ~GLEdge2PtConicalEffect() { }
 
-    virtual void emitCode(GrGLShaderBuilder*,
-                          const GrDrawEffect&,
-                          const GrEffectKey&,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+    virtual void emitCode(EmitArgs&) override;
 
-    static void GenKey(const GrDrawEffect&, const GrGLCaps& caps, GrEffectKeyBuilder* b);
+    static void GenKey(const GrProcessor&, const GrGLSLCaps& caps, GrProcessorKeyBuilder* b);
 
 protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
+
     UniformHandle fParamUni;
 
     const char* fVSVaryingName;
@@ -167,22 +169,27 @@ private:
 
 };
 
-const GrBackendEffectFactory& Edge2PtConicalEffect::getFactory() const {
-    return GrTBackendEffectFactory<Edge2PtConicalEffect>::getInstance();
+void Edge2PtConicalEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                                 GrProcessorKeyBuilder* b) const {
+    GLEdge2PtConicalEffect::GenKey(*this, caps, b);
 }
 
-GR_DEFINE_EFFECT_TEST(Edge2PtConicalEffect);
+GrGLSLFragmentProcessor* Edge2PtConicalEffect::onCreateGLSLInstance() const {
+    return new GLEdge2PtConicalEffect(*this);
+}
 
-GrEffect* Edge2PtConicalEffect::TestCreate(SkRandom* random,
-                                           GrContext* context,
-                                           const GrDrawTargetCaps&,
-                                           GrTexture**) {
-    SkPoint center1 = {random->nextUScalar1(), random->nextUScalar1()};
-    SkScalar radius1 = random->nextUScalar1();
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(Edge2PtConicalEffect);
+
+/*
+ * All Two point conical gradient test create functions may occasionally create edge case shaders
+ */
+const GrFragmentProcessor* Edge2PtConicalEffect::TestCreate(GrProcessorTestData* d) {
+    SkPoint center1 = {d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1()};
+    SkScalar radius1 = d->fRandom->nextUScalar1();
     SkPoint center2;
     SkScalar radius2;
     do {
-        center2.set(random->nextUScalar1(), random->nextUScalar1());
+        center2.set(d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1());
         // If the circles are identical the factory will give us an empty shader.
         // This will happen if we pick identical centers
     } while (center1 == center2);
@@ -197,37 +204,29 @@ GrEffect* Edge2PtConicalEffect::TestCreate(SkRandom* random,
     SkScalar stopsArray[kMaxRandomGradientColors];
     SkScalar* stops = stopsArray;
     SkShader::TileMode tm;
-    int colorCount = RandomGradientParams(random, colors, &stops, &tm);
+    int colorCount = RandomGradientParams(d->fRandom, colors, &stops, &tm);
     SkAutoTUnref<SkShader> shader(SkGradientShader::CreateTwoPointConical(center1, radius1,
                                                                           center2, radius2,
                                                                           colors, stops, colorCount,
                                                                           tm));
-    SkPaint paint;
-    GrEffect* effect;
-    GrColor paintColor;
-    SkAssertResult(shader->asNewEffect(context, paint, NULL, &paintColor, &effect));
-    return effect;
+    const GrFragmentProcessor* fp = shader->asFragmentProcessor(d->fContext,
+        GrTest::TestMatrix(d->fRandom), NULL, kNone_SkFilterQuality);
+    GrAlwaysAssert(fp);
+    return fp;
 }
 
-GLEdge2PtConicalEffect::GLEdge2PtConicalEffect(const GrBackendEffectFactory& factory,
-                                               const GrDrawEffect& drawEffect)
-    : INHERITED(factory)
-    , fVSVaryingName(NULL)
-    , fFSVaryingName(NULL)
+GLEdge2PtConicalEffect::GLEdge2PtConicalEffect(const GrProcessor&)
+    : fVSVaryingName(nullptr)
+    , fFSVaryingName(nullptr)
     , fCachedRadius(-SK_ScalarMax)
     , fCachedDiffRadius(-SK_ScalarMax) {}
 
-void GLEdge2PtConicalEffect::emitCode(GrGLShaderBuilder* builder,
-                                      const GrDrawEffect&,
-                                      const GrEffectKey& key,
-                                      const char* outputColor,
-                                      const char* inputColor,
-                                      const TransformedCoordsArray& coords,
-                                      const TextureSamplerArray& samplers) {
-    uint32_t baseKey = key.get32(0);
-    this->emitUniforms(builder, baseKey);
-    fParamUni = builder->addUniformArray(GrGLShaderBuilder::kFragment_Visibility,
-                                         kFloat_GrSLType, "Conical2FSParams", 3);
+void GLEdge2PtConicalEffect::emitCode(EmitArgs& args) {
+    const Edge2PtConicalEffect& ge = args.fFp.cast<Edge2PtConicalEffect>();
+    this->emitUniforms(args.fBuilder, ge);
+    fParamUni = args.fBuilder->addUniformArray(GrGLSLProgramBuilder::kFragment_Visibility,
+                                         kFloat_GrSLType, kDefault_GrSLPrecision,
+                                         "Conical2FSParams", 3);
 
     SkString cName("c");
     SkString tName("t");
@@ -235,48 +234,57 @@ void GLEdge2PtConicalEffect::emitCode(GrGLShaderBuilder* builder,
     SkString p1; // start radius squared
     SkString p2; // difference in radii (r1 - r0)
 
-    builder->getUniformVariable(fParamUni).appendArrayAccess(0, &p0);
-    builder->getUniformVariable(fParamUni).appendArrayAccess(1, &p1);
-    builder->getUniformVariable(fParamUni).appendArrayAccess(2, &p2);
+    args.fBuilder->getUniformVariable(fParamUni).appendArrayAccess(0, &p0);
+    args.fBuilder->getUniformVariable(fParamUni).appendArrayAccess(1, &p1);
+    args.fBuilder->getUniformVariable(fParamUni).appendArrayAccess(2, &p2);
 
     // We interpolate the linear component in coords[1].
-    SkASSERT(coords[0].type() == coords[1].type());
+    SkASSERT(args.fCoords[0].getType() == args.fCoords[1].getType());
     const char* coords2D;
     SkString bVar;
-    if (kVec3f_GrSLType == coords[0].type()) {
-        builder->fsCodeAppendf("\tvec3 interpolants = vec3(%s.xy / %s.z, %s.x / %s.z);\n",
-                               coords[0].c_str(), coords[0].c_str(), coords[1].c_str(), coords[1].c_str());
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    if (kVec3f_GrSLType == args.fCoords[0].getType()) {
+        fragBuilder->codeAppendf("\tvec3 interpolants = vec3(%s.xy / %s.z, %s.x / %s.z);\n",
+                               args.fCoords[0].c_str(), args.fCoords[0].c_str(),
+                               args.fCoords[1].c_str(), args.fCoords[1].c_str());
         coords2D = "interpolants.xy";
         bVar = "interpolants.z";
     } else {
-        coords2D = coords[0].c_str();
-        bVar.printf("%s.x", coords[1].c_str());
+        coords2D = args.fCoords[0].c_str();
+        bVar.printf("%s.x", args.fCoords[1].c_str());
     }
 
     // output will default to transparent black (we simply won't write anything
     // else to it if invalid, instead of discarding or returning prematurely)
-    builder->fsCodeAppendf("\t%s = vec4(0.0,0.0,0.0,0.0);\n", outputColor);
+    fragBuilder->codeAppendf("\t%s = vec4(0.0,0.0,0.0,0.0);\n", args.fOutputColor);
 
     // c = (x^2)+(y^2) - params[1]
-    builder->fsCodeAppendf("\tfloat %s = dot(%s, %s) - %s;\n",
+    fragBuilder->codeAppendf("\tfloat %s = dot(%s, %s) - %s;\n",
                            cName.c_str(), coords2D, coords2D, p1.c_str());
 
     // linear case: t = -c/b
-    builder->fsCodeAppendf("\tfloat %s = -(%s / %s);\n", tName.c_str(),
+    fragBuilder->codeAppendf("\tfloat %s = -(%s / %s);\n", tName.c_str(),
                            cName.c_str(), bVar.c_str());
 
     // if r(t) > 0, then t will be the x coordinate
-    builder->fsCodeAppendf("\tif (%s * %s + %s > 0.0) {\n", tName.c_str(),
+    fragBuilder->codeAppendf("\tif (%s * %s + %s > 0.0) {\n", tName.c_str(),
                            p2.c_str(), p0.c_str());
-    builder->fsCodeAppend("\t");
-    this->emitColor(builder, tName.c_str(), baseKey, outputColor, inputColor, samplers);
-    builder->fsCodeAppend("\t}\n");
+    fragBuilder->codeAppend("\t");
+    this->emitColor(args.fBuilder,
+                    fragBuilder,
+                    args.fGLSLCaps,
+                    ge,
+                    tName.c_str(),
+                    args.fOutputColor,
+                    args.fInputColor,
+                    args.fSamplers);
+    fragBuilder->codeAppend("\t}\n");
 }
 
-void GLEdge2PtConicalEffect::setData(const GrGLUniformManager& uman,
-                                     const GrDrawEffect& drawEffect) {
-    INHERITED::setData(uman, drawEffect);
-    const Edge2PtConicalEffect& data = drawEffect.castEffect<Edge2PtConicalEffect>();
+void GLEdge2PtConicalEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                                       const GrProcessor& processor) {
+    INHERITED::onSetData(pdman, processor);
+    const Edge2PtConicalEffect& data = processor.cast<Edge2PtConicalEffect>();
     SkScalar radius0 = data.radius();
     SkScalar diffRadius = data.diffRadius();
 
@@ -289,15 +297,15 @@ void GLEdge2PtConicalEffect::setData(const GrGLUniformManager& uman,
             SkScalarToFloat(diffRadius)
         };
 
-        uman.set1fv(fParamUni, 3, values);
+        pdman.set1fv(fParamUni, 3, values);
         fCachedRadius = radius0;
         fCachedDiffRadius = diffRadius;
     }
 }
 
-void GLEdge2PtConicalEffect::GenKey(const GrDrawEffect& drawEffect,
-                                    const GrGLCaps&, GrEffectKeyBuilder* b) {
-    b->add32(GenBaseGradientKey(drawEffect));
+void GLEdge2PtConicalEffect::GenKey(const GrProcessor& processor,
+                                    const GrGLSLCaps&, GrProcessorKeyBuilder* b) {
+    b->add32(GenBaseGradientKey(processor));
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -344,7 +352,7 @@ static ConicalType set_matrix_focal_conical(const SkTwoPointConicalGradient& sha
 
     // Scale factor 1 / (1 - focalX * focalX)
     SkScalar oneMinusF2 = 1.f - SkScalarMul(*focalX, *focalX);
-    SkScalar s = SkScalarDiv(1.f, oneMinusF2);
+    SkScalar s = SkScalarInvert(oneMinusF2);
 
 
     if (s >= 0.f) {
@@ -362,32 +370,33 @@ static ConicalType set_matrix_focal_conical(const SkTwoPointConicalGradient& sha
 
 //////////////////////////////////////////////////////////////////////////////
 
-class GLFocalOutside2PtConicalEffect;
-
 class FocalOutside2PtConicalEffect : public GrGradientEffect {
 public:
 
-    static GrEffect* Create(GrContext* ctx,
-                            const SkTwoPointConicalGradient& shader,
-                            const SkMatrix& matrix,
-                            SkShader::TileMode tm,
-                            SkScalar focalX) {
-        return SkNEW_ARGS(FocalOutside2PtConicalEffect, (ctx, shader, matrix, tm, focalX));
+    static GrFragmentProcessor* Create(GrContext* ctx,
+                                       const SkTwoPointConicalGradient& shader,
+                                       const SkMatrix& matrix,
+                                       SkShader::TileMode tm,
+                                       SkScalar focalX) {
+        return new FocalOutside2PtConicalEffect(ctx, shader, matrix, tm, focalX);
     }
 
     virtual ~FocalOutside2PtConicalEffect() { }
 
-    static const char* Name() { return "Two-Point Conical Gradient Focal Outside"; }
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
+    const char* name() const override {
+        return "Two-Point Conical Gradient Focal Outside";
+    }
 
     bool isFlipped() const { return fIsFlipped; }
     SkScalar focal() const { return fFocalX; }
 
-    typedef GLFocalOutside2PtConicalEffect GLEffect;
-
 private:
-    virtual bool onIsEqual(const GrEffect& sBase) const SK_OVERRIDE {
-        const FocalOutside2PtConicalEffect& s = CastEffect<FocalOutside2PtConicalEffect>(sBase);
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
+
+    bool onIsEqual(const GrFragmentProcessor& sBase) const override {
+        const FocalOutside2PtConicalEffect& s = sBase.cast<FocalOutside2PtConicalEffect>();
         return (INHERITED::onIsEqual(sBase) &&
                 this->fFocalX == s.fFocalX &&
                 this->fIsFlipped == s.fIsFlipped);
@@ -398,9 +407,13 @@ private:
                                  const SkMatrix& matrix,
                                  SkShader::TileMode tm,
                                  SkScalar focalX)
-    : INHERITED(ctx, shader, matrix, tm), fFocalX(focalX), fIsFlipped(shader.isFlippedGrad()) {}
+    : INHERITED(ctx, shader, matrix, tm)
+    , fFocalX(focalX)
+    , fIsFlipped(shader.isFlippedGrad()) {
+        this->initClassID<FocalOutside2PtConicalEffect>();
+    }
 
-    GR_DECLARE_EFFECT_TEST;
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
 
     SkScalar         fFocalX;
     bool             fIsFlipped;
@@ -410,21 +423,16 @@ private:
 
 class GLFocalOutside2PtConicalEffect : public GrGLGradientEffect {
 public:
-    GLFocalOutside2PtConicalEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&);
+    GLFocalOutside2PtConicalEffect(const GrProcessor&);
     virtual ~GLFocalOutside2PtConicalEffect() { }
 
-    virtual void emitCode(GrGLShaderBuilder*,
-                          const GrDrawEffect&,
-                          const GrEffectKey&,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+    virtual void emitCode(EmitArgs&) override;
 
-    static void GenKey(const GrDrawEffect&, const GrGLCaps& caps, GrEffectKeyBuilder* b);
+    static void GenKey(const GrProcessor&, const GrGLSLCaps& caps, GrProcessorKeyBuilder* b);
 
 protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
+
     UniformHandle fParamUni;
 
     const char* fVSVaryingName;
@@ -444,107 +452,112 @@ private:
 
 };
 
-const GrBackendEffectFactory& FocalOutside2PtConicalEffect::getFactory() const {
-    return GrTBackendEffectFactory<FocalOutside2PtConicalEffect>::getInstance();
+void FocalOutside2PtConicalEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                                         GrProcessorKeyBuilder* b) const {
+    GLFocalOutside2PtConicalEffect::GenKey(*this, caps, b);
 }
 
-GR_DEFINE_EFFECT_TEST(FocalOutside2PtConicalEffect);
+GrGLSLFragmentProcessor* FocalOutside2PtConicalEffect::onCreateGLSLInstance() const {
+    return new GLFocalOutside2PtConicalEffect(*this);
+}
 
-GrEffect* FocalOutside2PtConicalEffect::TestCreate(SkRandom* random,
-                                                   GrContext* context,
-                                                   const GrDrawTargetCaps&,
-                                                   GrTexture**) {
-    SkPoint center1 = {random->nextUScalar1(), random->nextUScalar1()};
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(FocalOutside2PtConicalEffect);
+
+/*
+ * All Two point conical gradient test create functions may occasionally create edge case shaders
+ */
+const GrFragmentProcessor* FocalOutside2PtConicalEffect::TestCreate(GrProcessorTestData* d) {
+    SkPoint center1 = {d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1()};
     SkScalar radius1 = 0.f;
     SkPoint center2;
     SkScalar radius2;
     do {
-        center2.set(random->nextUScalar1(), random->nextUScalar1());
+        center2.set(d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1());
         // Need to make sure the centers are not the same or else focal point will be inside
     } while (center1 == center2);
         SkPoint diff = center2 - center1;
         SkScalar diffLen = diff.length();
         // Below makes sure that the focal point is not contained within circle two
-        radius2 = random->nextRangeF(0.f, diffLen);
+        radius2 = d->fRandom->nextRangeF(0.f, diffLen);
 
     SkColor colors[kMaxRandomGradientColors];
     SkScalar stopsArray[kMaxRandomGradientColors];
     SkScalar* stops = stopsArray;
     SkShader::TileMode tm;
-    int colorCount = RandomGradientParams(random, colors, &stops, &tm);
+    int colorCount = RandomGradientParams(d->fRandom, colors, &stops, &tm);
     SkAutoTUnref<SkShader> shader(SkGradientShader::CreateTwoPointConical(center1, radius1,
                                                                           center2, radius2,
                                                                           colors, stops, colorCount,
                                                                           tm));
-    SkPaint paint;
-    GrEffect* effect;
-    GrColor paintColor;
-    SkAssertResult(shader->asNewEffect(context, paint, NULL, &paintColor, &effect));
-    return effect;
+    const GrFragmentProcessor* fp = shader->asFragmentProcessor(d->fContext,
+        GrTest::TestMatrix(d->fRandom), NULL, kNone_SkFilterQuality);
+    GrAlwaysAssert(fp);
+    return fp;
 }
 
-GLFocalOutside2PtConicalEffect::GLFocalOutside2PtConicalEffect(const GrBackendEffectFactory& factory,
-                                                               const GrDrawEffect& drawEffect)
-    : INHERITED(factory)
-    , fVSVaryingName(NULL)
-    , fFSVaryingName(NULL)
+GLFocalOutside2PtConicalEffect::GLFocalOutside2PtConicalEffect(const GrProcessor& processor)
+    : fVSVaryingName(nullptr)
+    , fFSVaryingName(nullptr)
     , fCachedFocal(SK_ScalarMax) {
-    const FocalOutside2PtConicalEffect& data = drawEffect.castEffect<FocalOutside2PtConicalEffect>();
+    const FocalOutside2PtConicalEffect& data = processor.cast<FocalOutside2PtConicalEffect>();
     fIsFlipped = data.isFlipped();
 }
 
-void GLFocalOutside2PtConicalEffect::emitCode(GrGLShaderBuilder* builder,
-                                              const GrDrawEffect&,
-                                              const GrEffectKey& key,
-                                              const char* outputColor,
-                                              const char* inputColor,
-                                              const TransformedCoordsArray& coords,
-                                              const TextureSamplerArray& samplers) {
-    uint32_t baseKey = key.get32(0);
-    this->emitUniforms(builder, baseKey);
-    fParamUni = builder->addUniformArray(GrGLShaderBuilder::kFragment_Visibility,
-                                         kFloat_GrSLType, "Conical2FSParams", 2);
+void GLFocalOutside2PtConicalEffect::emitCode(EmitArgs& args) {
+    const FocalOutside2PtConicalEffect& ge = args.fFp.cast<FocalOutside2PtConicalEffect>();
+    this->emitUniforms(args.fBuilder, ge);
+    fParamUni = args.fBuilder->addUniformArray(GrGLSLProgramBuilder::kFragment_Visibility,
+                                         kFloat_GrSLType, kDefault_GrSLPrecision,
+                                         "Conical2FSParams", 2);
     SkString tName("t");
     SkString p0; // focalX
     SkString p1; // 1 - focalX * focalX
 
-    builder->getUniformVariable(fParamUni).appendArrayAccess(0, &p0);
-    builder->getUniformVariable(fParamUni).appendArrayAccess(1, &p1);
+    args.fBuilder->getUniformVariable(fParamUni).appendArrayAccess(0, &p0);
+    args.fBuilder->getUniformVariable(fParamUni).appendArrayAccess(1, &p1);
 
     // if we have a vec3 from being in perspective, convert it to a vec2 first
-    SkString coords2DString = builder->ensureFSCoords2D(coords, 0);
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    SkString coords2DString = fragBuilder->ensureFSCoords2D(args.fCoords, 0);
     const char* coords2D = coords2DString.c_str();
 
     // t = p.x * focal.x +/- sqrt(p.x^2 + (1 - focal.x^2) * p.y^2)
 
     // output will default to transparent black (we simply won't write anything
     // else to it if invalid, instead of discarding or returning prematurely)
-    builder->fsCodeAppendf("\t%s = vec4(0.0,0.0,0.0,0.0);\n", outputColor);
+    fragBuilder->codeAppendf("\t%s = vec4(0.0,0.0,0.0,0.0);\n", args.fOutputColor);
 
-    builder->fsCodeAppendf("\tfloat xs = %s.x * %s.x;\n", coords2D, coords2D);
-    builder->fsCodeAppendf("\tfloat ys = %s.y * %s.y;\n", coords2D, coords2D);
-    builder->fsCodeAppendf("\tfloat d = xs + %s * ys;\n", p1.c_str());
+    fragBuilder->codeAppendf("\tfloat xs = %s.x * %s.x;\n", coords2D, coords2D);
+    fragBuilder->codeAppendf("\tfloat ys = %s.y * %s.y;\n", coords2D, coords2D);
+    fragBuilder->codeAppendf("\tfloat d = xs + %s * ys;\n", p1.c_str());
 
     // Must check to see if we flipped the circle order (to make sure start radius < end radius)
     // If so we must also flip sign on sqrt
     if (!fIsFlipped) {
-        builder->fsCodeAppendf("\tfloat %s = %s.x * %s  + sqrt(d);\n", tName.c_str(),
-                               coords2D, p0.c_str());
+        fragBuilder->codeAppendf("\tfloat %s = %s.x * %s  + sqrt(d);\n", tName.c_str(),
+                                 coords2D, p0.c_str());
     } else {
-        builder->fsCodeAppendf("\tfloat %s = %s.x * %s  - sqrt(d);\n", tName.c_str(),
-                               coords2D, p0.c_str());
+        fragBuilder->codeAppendf("\tfloat %s = %s.x * %s  - sqrt(d);\n", tName.c_str(),
+                                 coords2D, p0.c_str());
     }
 
-    builder->fsCodeAppendf("\tif (%s >= 0.0 && d >= 0.0) {\n", tName.c_str());
-    builder->fsCodeAppend("\t\t");
-    this->emitColor(builder, tName.c_str(), baseKey, outputColor, inputColor, samplers);
-    builder->fsCodeAppend("\t}\n");
+    fragBuilder->codeAppendf("\tif (%s >= 0.0 && d >= 0.0) {\n", tName.c_str());
+    fragBuilder->codeAppend("\t\t");
+    this->emitColor(args.fBuilder,
+                    fragBuilder,
+                    args.fGLSLCaps,
+                    ge,
+                    tName.c_str(),
+                    args.fOutputColor,
+                    args.fInputColor,
+                    args.fSamplers);
+    fragBuilder->codeAppend("\t}\n");
 }
 
-void GLFocalOutside2PtConicalEffect::setData(const GrGLUniformManager& uman,
-                                             const GrDrawEffect& drawEffect) {
-    INHERITED::setData(uman, drawEffect);
-    const FocalOutside2PtConicalEffect& data = drawEffect.castEffect<FocalOutside2PtConicalEffect>();
+void GLFocalOutside2PtConicalEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                                               const GrProcessor& processor) {
+    INHERITED::onSetData(pdman, processor);
+    const FocalOutside2PtConicalEffect& data = processor.cast<FocalOutside2PtConicalEffect>();
     SkASSERT(data.isFlipped() == fIsFlipped);
     SkScalar focal = data.focal();
 
@@ -556,16 +569,16 @@ void GLFocalOutside2PtConicalEffect::setData(const GrGLUniformManager& uman,
             SkScalarToFloat(oneMinus2F),
         };
 
-        uman.set1fv(fParamUni, 2, values);
+        pdman.set1fv(fParamUni, 2, values);
         fCachedFocal = focal;
     }
 }
 
-void GLFocalOutside2PtConicalEffect::GenKey(const GrDrawEffect& drawEffect,
-                                            const GrGLCaps&, GrEffectKeyBuilder* b) {
+void GLFocalOutside2PtConicalEffect::GenKey(const GrProcessor& processor,
+                                            const GrGLSLCaps&, GrProcessorKeyBuilder* b) {
     uint32_t* key = b->add32n(2);
-    key[0] = GenBaseGradientKey(drawEffect);
-    key[1] = drawEffect.castEffect<FocalOutside2PtConicalEffect>().isFlipped();
+    key[0] = GenBaseGradientKey(processor);
+    key[1] = processor.cast<FocalOutside2PtConicalEffect>().isFlipped();
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -575,26 +588,31 @@ class GLFocalInside2PtConicalEffect;
 class FocalInside2PtConicalEffect : public GrGradientEffect {
 public:
 
-    static GrEffect* Create(GrContext* ctx,
-                            const SkTwoPointConicalGradient& shader,
-                            const SkMatrix& matrix,
-                            SkShader::TileMode tm,
-                            SkScalar focalX) {
-        return SkNEW_ARGS(FocalInside2PtConicalEffect, (ctx, shader, matrix, tm, focalX));
+    static GrFragmentProcessor* Create(GrContext* ctx,
+                                       const SkTwoPointConicalGradient& shader,
+                                       const SkMatrix& matrix,
+                                       SkShader::TileMode tm,
+                                       SkScalar focalX) {
+        return new FocalInside2PtConicalEffect(ctx, shader, matrix, tm, focalX);
     }
 
     virtual ~FocalInside2PtConicalEffect() {}
 
-    static const char* Name() { return "Two-Point Conical Gradient Focal Inside"; }
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
+    const char* name() const override {
+        return "Two-Point Conical Gradient Focal Inside";
+    }
 
     SkScalar focal() const { return fFocalX; }
 
-    typedef GLFocalInside2PtConicalEffect GLEffect;
+    typedef GLFocalInside2PtConicalEffect GLSLProcessor;
 
 private:
-    virtual bool onIsEqual(const GrEffect& sBase) const SK_OVERRIDE {
-        const FocalInside2PtConicalEffect& s = CastEffect<FocalInside2PtConicalEffect>(sBase);
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
+
+    bool onIsEqual(const GrFragmentProcessor& sBase) const override {
+        const FocalInside2PtConicalEffect& s = sBase.cast<FocalInside2PtConicalEffect>();
         return (INHERITED::onIsEqual(sBase) &&
                 this->fFocalX == s.fFocalX);
     }
@@ -604,9 +622,11 @@ private:
                                 const SkMatrix& matrix,
                                 SkShader::TileMode tm,
                                 SkScalar focalX)
-        : INHERITED(ctx, shader, matrix, tm), fFocalX(focalX) {}
+        : INHERITED(ctx, shader, matrix, tm), fFocalX(focalX) {
+        this->initClassID<FocalInside2PtConicalEffect>();
+    }
 
-    GR_DECLARE_EFFECT_TEST;
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
 
     SkScalar         fFocalX;
 
@@ -615,21 +635,16 @@ private:
 
 class GLFocalInside2PtConicalEffect : public GrGLGradientEffect {
 public:
-    GLFocalInside2PtConicalEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&);
+    GLFocalInside2PtConicalEffect(const GrProcessor&);
     virtual ~GLFocalInside2PtConicalEffect() {}
 
-    virtual void emitCode(GrGLShaderBuilder*,
-                          const GrDrawEffect&,
-                          const GrEffectKey&,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+    virtual void emitCode(EmitArgs&) override;
 
-    static void GenKey(const GrDrawEffect&, const GrGLCaps& caps, GrEffectKeyBuilder* b);
+    static void GenKey(const GrProcessor&, const GrGLSLCaps& caps, GrProcessorKeyBuilder* b);
 
 protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
+
     UniformHandle fFocalUni;
 
     const char* fVSVaryingName;
@@ -647,25 +662,30 @@ private:
 
 };
 
-const GrBackendEffectFactory& FocalInside2PtConicalEffect::getFactory() const {
-    return GrTBackendEffectFactory<FocalInside2PtConicalEffect>::getInstance();
+void FocalInside2PtConicalEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                                        GrProcessorKeyBuilder* b) const {
+    GLFocalInside2PtConicalEffect::GenKey(*this, caps, b);
 }
 
-GR_DEFINE_EFFECT_TEST(FocalInside2PtConicalEffect);
+GrGLSLFragmentProcessor* FocalInside2PtConicalEffect::onCreateGLSLInstance() const {
+    return new GLFocalInside2PtConicalEffect(*this);
+}
 
-GrEffect* FocalInside2PtConicalEffect::TestCreate(SkRandom* random,
-                                                  GrContext* context,
-                                                  const GrDrawTargetCaps&,
-                                                  GrTexture**) {
-    SkPoint center1 = {random->nextUScalar1(), random->nextUScalar1()};
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(FocalInside2PtConicalEffect);
+
+/*
+ * All Two point conical gradient test create functions may occasionally create edge case shaders
+ */
+const GrFragmentProcessor* FocalInside2PtConicalEffect::TestCreate(GrProcessorTestData* d) {
+    SkPoint center1 = {d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1()};
     SkScalar radius1 = 0.f;
     SkPoint center2;
     SkScalar radius2;
     do {
-        center2.set(random->nextUScalar1(), random->nextUScalar1());
+        center2.set(d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1());
         // Below makes sure radius2 is larger enouch such that the focal point
         // is inside the end circle
-        SkScalar increase = random->nextUScalar1();
+        SkScalar increase = d->fRandom->nextUScalar1();
         SkPoint diff = center2 - center1;
         SkScalar diffLen = diff.length();
         radius2 = diffLen + increase;
@@ -676,68 +696,68 @@ GrEffect* FocalInside2PtConicalEffect::TestCreate(SkRandom* random,
     SkScalar stopsArray[kMaxRandomGradientColors];
     SkScalar* stops = stopsArray;
     SkShader::TileMode tm;
-    int colorCount = RandomGradientParams(random, colors, &stops, &tm);
+    int colorCount = RandomGradientParams(d->fRandom, colors, &stops, &tm);
     SkAutoTUnref<SkShader> shader(SkGradientShader::CreateTwoPointConical(center1, radius1,
                                                                           center2, radius2,
                                                                           colors, stops, colorCount,
                                                                           tm));
-    SkPaint paint;
-    GrColor paintColor;
-    GrEffect* effect;
-    SkAssertResult(shader->asNewEffect(context, paint, NULL, &paintColor, &effect));
-    return effect;
+    const GrFragmentProcessor* fp = shader->asFragmentProcessor(d->fContext,
+        GrTest::TestMatrix(d->fRandom), NULL, kNone_SkFilterQuality);
+    GrAlwaysAssert(fp);
+    return fp;
 }
 
-GLFocalInside2PtConicalEffect::GLFocalInside2PtConicalEffect(const GrBackendEffectFactory& factory,
-                                                             const GrDrawEffect& drawEffect)
-    : INHERITED(factory)
-    , fVSVaryingName(NULL)
-    , fFSVaryingName(NULL)
+GLFocalInside2PtConicalEffect::GLFocalInside2PtConicalEffect(const GrProcessor&)
+    : fVSVaryingName(nullptr)
+    , fFSVaryingName(nullptr)
     , fCachedFocal(SK_ScalarMax) {}
 
-void GLFocalInside2PtConicalEffect::emitCode(GrGLShaderBuilder* builder,
-                                             const GrDrawEffect&,
-                                             const GrEffectKey& key,
-                                             const char* outputColor,
-                                             const char* inputColor,
-                                             const TransformedCoordsArray& coords,
-                                             const TextureSamplerArray& samplers) {
-    uint32_t baseKey = key.get32(0);
-    this->emitUniforms(builder, baseKey);
-    fFocalUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                    kFloat_GrSLType, "Conical2FSParams");
+void GLFocalInside2PtConicalEffect::emitCode(EmitArgs& args) {
+    const FocalInside2PtConicalEffect& ge = args.fFp.cast<FocalInside2PtConicalEffect>();
+    this->emitUniforms(args.fBuilder, ge);
+    fFocalUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                          kFloat_GrSLType, kDefault_GrSLPrecision,
+                                          "Conical2FSParams");
     SkString tName("t");
 
     // this is the distance along x-axis from the end center to focal point in
     // transformed coordinates
-    GrGLShaderVar focal = builder->getUniformVariable(fFocalUni);
+    GrGLSLShaderVar focal = args.fBuilder->getUniformVariable(fFocalUni);
 
     // if we have a vec3 from being in perspective, convert it to a vec2 first
-    SkString coords2DString = builder->ensureFSCoords2D(coords, 0);
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    SkString coords2DString = fragBuilder->ensureFSCoords2D(args.fCoords, 0);
     const char* coords2D = coords2DString.c_str();
 
     // t = p.x * focalX + length(p)
-    builder->fsCodeAppendf("\tfloat %s = %s.x * %s  + length(%s);\n", tName.c_str(),
+    fragBuilder->codeAppendf("\tfloat %s = %s.x * %s  + length(%s);\n", tName.c_str(),
                            coords2D, focal.c_str(), coords2D);
 
-    this->emitColor(builder, tName.c_str(), baseKey, outputColor, inputColor, samplers);
+    this->emitColor(args.fBuilder,
+                    fragBuilder,
+                    args.fGLSLCaps,
+                    ge,
+                    tName.c_str(),
+                    args.fOutputColor,
+                    args.fInputColor,
+                    args.fSamplers);
 }
 
-void GLFocalInside2PtConicalEffect::setData(const GrGLUniformManager& uman,
-                                            const GrDrawEffect& drawEffect) {
-    INHERITED::setData(uman, drawEffect);
-    const FocalInside2PtConicalEffect& data = drawEffect.castEffect<FocalInside2PtConicalEffect>();
+void GLFocalInside2PtConicalEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                                              const GrProcessor& processor) {
+    INHERITED::onSetData(pdman, processor);
+    const FocalInside2PtConicalEffect& data = processor.cast<FocalInside2PtConicalEffect>();
     SkScalar focal = data.focal();
 
     if (fCachedFocal != focal) {
-        uman.set1f(fFocalUni, SkScalarToFloat(focal));
+        pdman.set1f(fFocalUni, SkScalarToFloat(focal));
         fCachedFocal = focal;
     }
 }
 
-void GLFocalInside2PtConicalEffect::GenKey(const GrDrawEffect& drawEffect,
-                                           const GrGLCaps&, GrEffectKeyBuilder* b) {
-    b->add32(GenBaseGradientKey(drawEffect));
+void GLFocalInside2PtConicalEffect::GenKey(const GrProcessor& processor,
+                                           const GrGLSLCaps&, GrProcessorKeyBuilder* b) {
+    b->add32(GenBaseGradientKey(processor));
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -804,23 +824,20 @@ static ConicalType set_matrix_circle_conical(const SkTwoPointConicalGradient& sh
     return kOutside_ConicalType;
 }
 
-class GLCircleInside2PtConicalEffect;
-
 class CircleInside2PtConicalEffect : public GrGradientEffect {
 public:
 
-    static GrEffect* Create(GrContext* ctx,
-                            const SkTwoPointConicalGradient& shader,
-                            const SkMatrix& matrix,
-                            SkShader::TileMode tm,
-                            const CircleConicalInfo& info) {
-        return SkNEW_ARGS(CircleInside2PtConicalEffect, (ctx, shader, matrix, tm, info));
+    static GrFragmentProcessor* Create(GrContext* ctx,
+                                       const SkTwoPointConicalGradient& shader,
+                                       const SkMatrix& matrix,
+                                       SkShader::TileMode tm,
+                                       const CircleConicalInfo& info) {
+        return new CircleInside2PtConicalEffect(ctx, shader, matrix, tm, info);
     }
 
     virtual ~CircleInside2PtConicalEffect() {}
 
-    static const char* Name() { return "Two-Point Conical Gradient Inside"; }
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
+    const char* name() const override { return "Two-Point Conical Gradient Inside"; }
 
     SkScalar centerX() const { return fInfo.fCenterEnd.fX; }
     SkScalar centerY() const { return fInfo.fCenterEnd.fY; }
@@ -828,11 +845,14 @@ public:
     SkScalar B() const { return fInfo.fB; }
     SkScalar C() const { return fInfo.fC; }
 
-    typedef GLCircleInside2PtConicalEffect GLEffect;
-
 private:
-    virtual bool onIsEqual(const GrEffect& sBase) const SK_OVERRIDE {
-        const CircleInside2PtConicalEffect& s = CastEffect<CircleInside2PtConicalEffect>(sBase);
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
+
+    virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                       GrProcessorKeyBuilder* b) const override;
+
+    bool onIsEqual(const GrFragmentProcessor& sBase) const override {
+        const CircleInside2PtConicalEffect& s = sBase.cast<CircleInside2PtConicalEffect>();
         return (INHERITED::onIsEqual(sBase) &&
                 this->fInfo.fCenterEnd == s.fInfo.fCenterEnd &&
                 this->fInfo.fA == s.fInfo.fA &&
@@ -845,9 +865,11 @@ private:
                                  const SkMatrix& matrix,
                                  SkShader::TileMode tm,
                                  const CircleConicalInfo& info)
-        : INHERITED(ctx, shader, matrix, tm), fInfo(info) {}
+        : INHERITED(ctx, shader, matrix, tm), fInfo(info) {
+        this->initClassID<CircleInside2PtConicalEffect>();
+    }
 
-    GR_DECLARE_EFFECT_TEST;
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
 
     const CircleConicalInfo fInfo;
 
@@ -856,21 +878,16 @@ private:
 
 class GLCircleInside2PtConicalEffect : public GrGLGradientEffect {
 public:
-    GLCircleInside2PtConicalEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&);
+    GLCircleInside2PtConicalEffect(const GrProcessor&);
     virtual ~GLCircleInside2PtConicalEffect() {}
 
-    virtual void emitCode(GrGLShaderBuilder*,
-                          const GrDrawEffect&,
-                          const GrEffectKey&,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+    virtual void emitCode(EmitArgs&) override;
 
-    static void GenKey(const GrDrawEffect&, const GrGLCaps& caps, GrEffectKeyBuilder* b);
+    static void GenKey(const GrProcessor&, const GrGLSLCaps& caps, GrProcessorKeyBuilder* b);
 
 protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
+
     UniformHandle fCenterUni;
     UniformHandle fParamUni;
 
@@ -893,24 +910,29 @@ private:
 
 };
 
-const GrBackendEffectFactory& CircleInside2PtConicalEffect::getFactory() const {
-    return GrTBackendEffectFactory<CircleInside2PtConicalEffect>::getInstance();
+void CircleInside2PtConicalEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                                         GrProcessorKeyBuilder* b) const {
+    GLCircleInside2PtConicalEffect::GenKey(*this, caps, b);
 }
 
-GR_DEFINE_EFFECT_TEST(CircleInside2PtConicalEffect);
+GrGLSLFragmentProcessor* CircleInside2PtConicalEffect::onCreateGLSLInstance() const {
+    return new GLCircleInside2PtConicalEffect(*this);
+}
 
-GrEffect* CircleInside2PtConicalEffect::TestCreate(SkRandom* random,
-                                                   GrContext* context,
-                                                   const GrDrawTargetCaps&,
-                                                   GrTexture**) {
-    SkPoint center1 = {random->nextUScalar1(), random->nextUScalar1()};
-    SkScalar radius1 = random->nextUScalar1() + 0.0001f; // make sure radius1 != 0
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(CircleInside2PtConicalEffect);
+
+/*
+ * All Two point conical gradient test create functions may occasionally create edge case shaders
+ */
+const GrFragmentProcessor* CircleInside2PtConicalEffect::TestCreate(GrProcessorTestData* d) {
+    SkPoint center1 = {d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1()};
+    SkScalar radius1 = d->fRandom->nextUScalar1() + 0.0001f; // make sure radius1 != 0
     SkPoint center2;
     SkScalar radius2;
     do {
-        center2.set(random->nextUScalar1(), random->nextUScalar1());
+        center2.set(d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1());
         // Below makes sure that circle one is contained within circle two
-        SkScalar increase = random->nextUScalar1();
+        SkScalar increase = d->fRandom->nextUScalar1();
         SkPoint diff = center2 - center1;
         SkScalar diffLen = diff.length();
         radius2 = radius1 + diffLen + increase;
@@ -921,52 +943,46 @@ GrEffect* CircleInside2PtConicalEffect::TestCreate(SkRandom* random,
     SkScalar stopsArray[kMaxRandomGradientColors];
     SkScalar* stops = stopsArray;
     SkShader::TileMode tm;
-    int colorCount = RandomGradientParams(random, colors, &stops, &tm);
+    int colorCount = RandomGradientParams(d->fRandom, colors, &stops, &tm);
     SkAutoTUnref<SkShader> shader(SkGradientShader::CreateTwoPointConical(center1, radius1,
                                                                           center2, radius2,
                                                                           colors, stops, colorCount,
                                                                           tm));
-    SkPaint paint;
-    GrColor paintColor;
-    GrEffect* effect;
-    SkAssertResult(shader->asNewEffect(context, paint, NULL, &paintColor, &effect));
-    return effect;
+    const GrFragmentProcessor* fp = shader->asFragmentProcessor(d->fContext,
+        GrTest::TestMatrix(d->fRandom), NULL, kNone_SkFilterQuality);
+    GrAlwaysAssert(fp);
+    return fp;
 }
 
-GLCircleInside2PtConicalEffect::GLCircleInside2PtConicalEffect(const GrBackendEffectFactory& factory,
-                                                               const GrDrawEffect& drawEffect)
-    : INHERITED(factory)
-    , fVSVaryingName(NULL)
-    , fFSVaryingName(NULL)
+GLCircleInside2PtConicalEffect::GLCircleInside2PtConicalEffect(const GrProcessor& processor)
+    : fVSVaryingName(nullptr)
+    , fFSVaryingName(nullptr)
     , fCachedCenterX(SK_ScalarMax)
     , fCachedCenterY(SK_ScalarMax)
     , fCachedA(SK_ScalarMax)
     , fCachedB(SK_ScalarMax)
     , fCachedC(SK_ScalarMax) {}
 
-void GLCircleInside2PtConicalEffect::emitCode(GrGLShaderBuilder* builder,
-                                              const GrDrawEffect&,
-                                              const GrEffectKey& key,
-                                              const char* outputColor,
-                                              const char* inputColor,
-                                              const TransformedCoordsArray& coords,
-                                              const TextureSamplerArray& samplers) {
-    uint32_t baseKey = key.get32(0);
-    this->emitUniforms(builder, baseKey);
-    fCenterUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                     kVec2f_GrSLType, "Conical2FSCenter");
-    fParamUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                    kVec3f_GrSLType, "Conical2FSParams");
+void GLCircleInside2PtConicalEffect::emitCode(EmitArgs& args) {
+    const CircleInside2PtConicalEffect& ge = args.fFp.cast<CircleInside2PtConicalEffect>();
+    this->emitUniforms(args.fBuilder, ge);
+    fCenterUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                           kVec2f_GrSLType, kDefault_GrSLPrecision,
+                                           "Conical2FSCenter");
+    fParamUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                          kVec3f_GrSLType, kDefault_GrSLPrecision,
+                                          "Conical2FSParams");
     SkString tName("t");
 
-    GrGLShaderVar center = builder->getUniformVariable(fCenterUni);
+    GrGLSLShaderVar center = args.fBuilder->getUniformVariable(fCenterUni);
     // params.x = A
     // params.y = B
     // params.z = C
-    GrGLShaderVar params = builder->getUniformVariable(fParamUni);
+    GrGLSLShaderVar params = args.fBuilder->getUniformVariable(fParamUni);
 
     // if we have a vec3 from being in perspective, convert it to a vec2 first
-    SkString coords2DString = builder->ensureFSCoords2D(coords, 0);
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    SkString coords2DString = fragBuilder->ensureFSCoords2D(args.fCoords, 0);
     const char* coords2D = coords2DString.c_str();
 
     // p = coords2D
@@ -977,18 +993,26 @@ void GLCircleInside2PtConicalEffect::emitCode(GrGLShaderBuilder* builder,
     // C = 1 / A
     // d = dot(e, p) + B
     // t = d +/- sqrt(d^2 - A * dot(p, p) + C)
-    builder->fsCodeAppendf("\tfloat pDotp = dot(%s,  %s);\n", coords2D, coords2D);
-    builder->fsCodeAppendf("\tfloat d = dot(%s,  %s) + %s.y;\n", coords2D, center.c_str(), params.c_str());
-    builder->fsCodeAppendf("\tfloat %s = d + sqrt(d * d - %s.x * pDotp + %s.z);\n",
-                           tName.c_str(), params.c_str(), params.c_str());
+    fragBuilder->codeAppendf("\tfloat pDotp = dot(%s,  %s);\n", coords2D, coords2D);
+    fragBuilder->codeAppendf("\tfloat d = dot(%s,  %s) + %s.y;\n", coords2D, center.c_str(),
+                             params.c_str());
+    fragBuilder->codeAppendf("\tfloat %s = d + sqrt(d * d - %s.x * pDotp + %s.z);\n",
+                             tName.c_str(), params.c_str(), params.c_str());
 
-    this->emitColor(builder, tName.c_str(), baseKey, outputColor, inputColor, samplers);
+    this->emitColor(args.fBuilder,
+                    fragBuilder,
+                    args.fGLSLCaps,
+                    ge,
+                    tName.c_str(),
+                    args.fOutputColor,
+                    args.fInputColor,
+                    args.fSamplers);
 }
 
-void GLCircleInside2PtConicalEffect::setData(const GrGLUniformManager& uman,
-                                             const GrDrawEffect& drawEffect) {
-    INHERITED::setData(uman, drawEffect);
-    const CircleInside2PtConicalEffect& data = drawEffect.castEffect<CircleInside2PtConicalEffect>();
+void GLCircleInside2PtConicalEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                                               const GrProcessor& processor) {
+    INHERITED::onSetData(pdman, processor);
+    const CircleInside2PtConicalEffect& data = processor.cast<CircleInside2PtConicalEffect>();
     SkScalar centerX = data.centerX();
     SkScalar centerY = data.centerY();
     SkScalar A = data.A();
@@ -998,8 +1022,8 @@ void GLCircleInside2PtConicalEffect::setData(const GrGLUniformManager& uman,
     if (fCachedCenterX != centerX || fCachedCenterY != centerY ||
         fCachedA != A || fCachedB != B || fCachedC != C) {
 
-        uman.set2f(fCenterUni, SkScalarToFloat(centerX), SkScalarToFloat(centerY));
-        uman.set3f(fParamUni, SkScalarToFloat(A), SkScalarToFloat(B), SkScalarToFloat(C));
+        pdman.set2f(fCenterUni, SkScalarToFloat(centerX), SkScalarToFloat(centerY));
+        pdman.set3f(fParamUni, SkScalarToFloat(A), SkScalarToFloat(B), SkScalarToFloat(C));
 
         fCachedCenterX = centerX;
         fCachedCenterY = centerY;
@@ -1009,30 +1033,27 @@ void GLCircleInside2PtConicalEffect::setData(const GrGLUniformManager& uman,
     }
 }
 
-void GLCircleInside2PtConicalEffect::GenKey(const GrDrawEffect& drawEffect,
-                                            const GrGLCaps&, GrEffectKeyBuilder* b) {
-    b->add32(GenBaseGradientKey(drawEffect));
+void GLCircleInside2PtConicalEffect::GenKey(const GrProcessor& processor,
+                                            const GrGLSLCaps&, GrProcessorKeyBuilder* b) {
+    b->add32(GenBaseGradientKey(processor));
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-class GLCircleOutside2PtConicalEffect;
-
 class CircleOutside2PtConicalEffect : public GrGradientEffect {
 public:
 
-    static GrEffect* Create(GrContext* ctx,
-                            const SkTwoPointConicalGradient& shader,
-                            const SkMatrix& matrix,
-                            SkShader::TileMode tm,
-                            const CircleConicalInfo& info) {
-        return SkNEW_ARGS(CircleOutside2PtConicalEffect, (ctx, shader, matrix, tm, info));
+    static GrFragmentProcessor* Create(GrContext* ctx,
+                                       const SkTwoPointConicalGradient& shader,
+                                       const SkMatrix& matrix,
+                                       SkShader::TileMode tm,
+                                       const CircleConicalInfo& info) {
+        return new CircleOutside2PtConicalEffect(ctx, shader, matrix, tm, info);
     }
 
     virtual ~CircleOutside2PtConicalEffect() {}
 
-    static const char* Name() { return "Two-Point Conical Gradient Outside"; }
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
+    const char* name() const override { return "Two-Point Conical Gradient Outside"; }
 
     SkScalar centerX() const { return fInfo.fCenterEnd.fX; }
     SkScalar centerY() const { return fInfo.fCenterEnd.fY; }
@@ -1042,11 +1063,13 @@ public:
     SkScalar tLimit() const { return fTLimit; }
     bool isFlipped() const { return fIsFlipped; }
 
-    typedef GLCircleOutside2PtConicalEffect GLEffect;
-
 private:
-    virtual bool onIsEqual(const GrEffect& sBase) const SK_OVERRIDE {
-        const CircleOutside2PtConicalEffect& s = CastEffect<CircleOutside2PtConicalEffect>(sBase);
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
+
+    bool onIsEqual(const GrFragmentProcessor& sBase) const override {
+        const CircleOutside2PtConicalEffect& s = sBase.cast<CircleOutside2PtConicalEffect>();
         return (INHERITED::onIsEqual(sBase) &&
                 this->fInfo.fCenterEnd == s.fInfo.fCenterEnd &&
                 this->fInfo.fA == s.fInfo.fA &&
@@ -1062,8 +1085,9 @@ private:
                                   SkShader::TileMode tm,
                                   const CircleConicalInfo& info)
         : INHERITED(ctx, shader, matrix, tm), fInfo(info) {
+        this->initClassID<CircleOutside2PtConicalEffect>();
         if (shader.getStartRadius() != shader.getEndRadius()) {
-            fTLimit = SkScalarDiv(shader.getStartRadius(), (shader.getStartRadius() - shader.getEndRadius()));
+            fTLimit = shader.getStartRadius() / (shader.getStartRadius() - shader.getEndRadius());
         } else {
             fTLimit = SK_ScalarMin;
         }
@@ -1071,7 +1095,7 @@ private:
         fIsFlipped = shader.isFlippedGrad();
     }
 
-    GR_DECLARE_EFFECT_TEST;
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
 
     const CircleConicalInfo fInfo;
     SkScalar fTLimit;
@@ -1082,21 +1106,16 @@ private:
 
 class GLCircleOutside2PtConicalEffect : public GrGLGradientEffect {
 public:
-    GLCircleOutside2PtConicalEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&);
+    GLCircleOutside2PtConicalEffect(const GrProcessor&);
     virtual ~GLCircleOutside2PtConicalEffect() {}
 
-    virtual void emitCode(GrGLShaderBuilder*,
-                          const GrDrawEffect&,
-                          const GrEffectKey&,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+    virtual void emitCode(EmitArgs&) override;
 
-    static void GenKey(const GrDrawEffect&, const GrGLCaps& caps, GrEffectKeyBuilder* b);
+    static void GenKey(const GrProcessor&, const GrGLSLCaps& caps, GrProcessorKeyBuilder* b);
 
 protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
+
     UniformHandle fCenterUni;
     UniformHandle fParamUni;
 
@@ -1122,90 +1141,89 @@ private:
 
 };
 
-const GrBackendEffectFactory& CircleOutside2PtConicalEffect::getFactory() const {
-    return GrTBackendEffectFactory<CircleOutside2PtConicalEffect>::getInstance();
+void CircleOutside2PtConicalEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                                          GrProcessorKeyBuilder* b) const {
+    GLCircleOutside2PtConicalEffect::GenKey(*this, caps, b);
 }
 
-GR_DEFINE_EFFECT_TEST(CircleOutside2PtConicalEffect);
+GrGLSLFragmentProcessor* CircleOutside2PtConicalEffect::onCreateGLSLInstance() const {
+    return new GLCircleOutside2PtConicalEffect(*this);
+}
 
-GrEffect* CircleOutside2PtConicalEffect::TestCreate(SkRandom* random,
-                                                    GrContext* context,
-                                                    const GrDrawTargetCaps&,
-                                                    GrTexture**) {
-    SkPoint center1 = {random->nextUScalar1(), random->nextUScalar1()};
-    SkScalar radius1 = random->nextUScalar1() + 0.0001f; // make sure radius1 != 0
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(CircleOutside2PtConicalEffect);
+
+/*
+ * All Two point conical gradient test create functions may occasionally create edge case shaders
+ */
+const GrFragmentProcessor* CircleOutside2PtConicalEffect::TestCreate(GrProcessorTestData* d) {
+    SkPoint center1 = {d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1()};
+    SkScalar radius1 = d->fRandom->nextUScalar1() + 0.0001f; // make sure radius1 != 0
     SkPoint center2;
     SkScalar radius2;
     SkScalar diffLen;
     do {
-        center2.set(random->nextUScalar1(), random->nextUScalar1());
+        center2.set(d->fRandom->nextUScalar1(), d->fRandom->nextUScalar1());
         // If the circles share a center than we can't be in the outside case
     } while (center1 == center2);
-        SkPoint diff = center2 - center1;
-        diffLen = diff.length();
-        // Below makes sure that circle one is not contained within circle two
-        // and have radius2 >= radius to match sorting on cpu side
-        radius2 = radius1 + random->nextRangeF(0.f, diffLen);
+    SkPoint diff = center2 - center1;
+    diffLen = diff.length();
+    // Below makes sure that circle one is not contained within circle two
+    // and have radius2 >= radius to match sorting on cpu side
+    radius2 = radius1 + d->fRandom->nextRangeF(0.f, diffLen);
 
     SkColor colors[kMaxRandomGradientColors];
     SkScalar stopsArray[kMaxRandomGradientColors];
     SkScalar* stops = stopsArray;
     SkShader::TileMode tm;
-    int colorCount = RandomGradientParams(random, colors, &stops, &tm);
+    int colorCount = RandomGradientParams(d->fRandom, colors, &stops, &tm);
     SkAutoTUnref<SkShader> shader(SkGradientShader::CreateTwoPointConical(center1, radius1,
                                                                           center2, radius2,
                                                                           colors, stops, colorCount,
                                                                           tm));
-    SkPaint paint;
-    GrColor paintColor;
-    GrEffect* effect;
-    SkAssertResult(shader->asNewEffect(context, paint, NULL, &paintColor, &effect));
-    return effect;
+    const GrFragmentProcessor* fp = shader->asFragmentProcessor(
+        d->fContext,GrTest::TestMatrix(d->fRandom), NULL, kNone_SkFilterQuality);
+    GrAlwaysAssert(fp);
+    return fp;
 }
 
-GLCircleOutside2PtConicalEffect::GLCircleOutside2PtConicalEffect(const GrBackendEffectFactory& factory,
-                                                                 const GrDrawEffect& drawEffect)
-    : INHERITED(factory)
-    , fVSVaryingName(NULL)
-    , fFSVaryingName(NULL)
+GLCircleOutside2PtConicalEffect::GLCircleOutside2PtConicalEffect(const GrProcessor& processor)
+    : fVSVaryingName(nullptr)
+    , fFSVaryingName(nullptr)
     , fCachedCenterX(SK_ScalarMax)
     , fCachedCenterY(SK_ScalarMax)
     , fCachedA(SK_ScalarMax)
     , fCachedB(SK_ScalarMax)
     , fCachedC(SK_ScalarMax)
     , fCachedTLimit(SK_ScalarMax) {
-    const CircleOutside2PtConicalEffect& data = drawEffect.castEffect<CircleOutside2PtConicalEffect>();
+    const CircleOutside2PtConicalEffect& data = processor.cast<CircleOutside2PtConicalEffect>();
     fIsFlipped = data.isFlipped();
     }
 
-void GLCircleOutside2PtConicalEffect::emitCode(GrGLShaderBuilder* builder,
-                                               const GrDrawEffect&,
-                                               const GrEffectKey& key,
-                                               const char* outputColor,
-                                               const char* inputColor,
-                                               const TransformedCoordsArray& coords,
-                                               const TextureSamplerArray& samplers) {
-    uint32_t baseKey = key.get32(0);
-    this->emitUniforms(builder, baseKey);
-    fCenterUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                     kVec2f_GrSLType, "Conical2FSCenter");
-    fParamUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                    kVec4f_GrSLType, "Conical2FSParams");
+void GLCircleOutside2PtConicalEffect::emitCode(EmitArgs& args) {
+    const CircleOutside2PtConicalEffect& ge = args.fFp.cast<CircleOutside2PtConicalEffect>();
+    this->emitUniforms(args.fBuilder, ge);
+    fCenterUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                           kVec2f_GrSLType, kDefault_GrSLPrecision,
+                                           "Conical2FSCenter");
+    fParamUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                          kVec4f_GrSLType, kDefault_GrSLPrecision,
+                                          "Conical2FSParams");
     SkString tName("t");
 
-    GrGLShaderVar center = builder->getUniformVariable(fCenterUni);
+    GrGLSLShaderVar center = args.fBuilder->getUniformVariable(fCenterUni);
     // params.x = A
     // params.y = B
     // params.z = C
-    GrGLShaderVar params = builder->getUniformVariable(fParamUni);
+    GrGLSLShaderVar params = args.fBuilder->getUniformVariable(fParamUni);
 
     // if we have a vec3 from being in perspective, convert it to a vec2 first
-    SkString coords2DString = builder->ensureFSCoords2D(coords, 0);
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    SkString coords2DString = fragBuilder->ensureFSCoords2D(args.fCoords, 0);
     const char* coords2D = coords2DString.c_str();
 
     // output will default to transparent black (we simply won't write anything
     // else to it if invalid, instead of discarding or returning prematurely)
-    builder->fsCodeAppendf("\t%s = vec4(0.0,0.0,0.0,0.0);\n", outputColor);
+    fragBuilder->codeAppendf("\t%s = vec4(0.0,0.0,0.0,0.0);\n", args.fOutputColor);
 
     // p = coords2D
     // e = center end
@@ -1216,28 +1234,37 @@ void GLCircleOutside2PtConicalEffect::emitCode(GrGLShaderBuilder* builder,
     // d = dot(e, p) + B
     // t = d +/- sqrt(d^2 - A * dot(p, p) + C)
 
-    builder->fsCodeAppendf("\tfloat pDotp = dot(%s,  %s);\n", coords2D, coords2D);
-    builder->fsCodeAppendf("\tfloat d = dot(%s,  %s) + %s.y;\n", coords2D, center.c_str(), params.c_str());
-    builder->fsCodeAppendf("\tfloat deter = d * d - %s.x * pDotp + %s.z;\n", params.c_str(), params.c_str());
+    fragBuilder->codeAppendf("\tfloat pDotp = dot(%s,  %s);\n", coords2D, coords2D);
+    fragBuilder->codeAppendf("\tfloat d = dot(%s,  %s) + %s.y;\n", coords2D, center.c_str(),
+                             params.c_str());
+    fragBuilder->codeAppendf("\tfloat deter = d * d - %s.x * pDotp + %s.z;\n", params.c_str(),
+                             params.c_str());
 
     // Must check to see if we flipped the circle order (to make sure start radius < end radius)
     // If so we must also flip sign on sqrt
     if (!fIsFlipped) {
-        builder->fsCodeAppendf("\tfloat %s = d + sqrt(deter);\n", tName.c_str());
+        fragBuilder->codeAppendf("\tfloat %s = d + sqrt(deter);\n", tName.c_str());
     } else {
-        builder->fsCodeAppendf("\tfloat %s = d - sqrt(deter);\n", tName.c_str());
+        fragBuilder->codeAppendf("\tfloat %s = d - sqrt(deter);\n", tName.c_str());
     }
 
-    builder->fsCodeAppendf("\tif (%s >= %s.w && deter >= 0.0) {\n", tName.c_str(), params.c_str());
-    builder->fsCodeAppend("\t\t");
-    this->emitColor(builder, tName.c_str(), baseKey, outputColor, inputColor, samplers);
-    builder->fsCodeAppend("\t}\n");
+    fragBuilder->codeAppendf("\tif (%s >= %s.w && deter >= 0.0) {\n", tName.c_str(), params.c_str());
+    fragBuilder->codeAppend("\t\t");
+    this->emitColor(args.fBuilder,
+                    fragBuilder,
+                    args.fGLSLCaps,
+                    ge,
+                    tName.c_str(),
+                    args.fOutputColor,
+                    args.fInputColor,
+                    args.fSamplers);
+    fragBuilder->codeAppend("\t}\n");
 }
 
-void GLCircleOutside2PtConicalEffect::setData(const GrGLUniformManager& uman,
-                                              const GrDrawEffect& drawEffect) {
-    INHERITED::setData(uman, drawEffect);
-    const CircleOutside2PtConicalEffect& data = drawEffect.castEffect<CircleOutside2PtConicalEffect>();
+void GLCircleOutside2PtConicalEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                                                const GrProcessor& processor) {
+    INHERITED::onSetData(pdman, processor);
+    const CircleOutside2PtConicalEffect& data = processor.cast<CircleOutside2PtConicalEffect>();
     SkASSERT(data.isFlipped() == fIsFlipped);
     SkScalar centerX = data.centerX();
     SkScalar centerY = data.centerY();
@@ -1249,8 +1276,8 @@ void GLCircleOutside2PtConicalEffect::setData(const GrGLUniformManager& uman,
     if (fCachedCenterX != centerX || fCachedCenterY != centerY ||
         fCachedA != A || fCachedB != B || fCachedC != C || fCachedTLimit != tLimit) {
 
-        uman.set2f(fCenterUni, SkScalarToFloat(centerX), SkScalarToFloat(centerY));
-        uman.set4f(fParamUni, SkScalarToFloat(A), SkScalarToFloat(B), SkScalarToFloat(C),
+        pdman.set2f(fCenterUni, SkScalarToFloat(centerX), SkScalarToFloat(centerY));
+        pdman.set4f(fParamUni, SkScalarToFloat(A), SkScalarToFloat(B), SkScalarToFloat(C),
                    SkScalarToFloat(tLimit));
 
         fCachedCenterX = centerX;
@@ -1262,27 +1289,27 @@ void GLCircleOutside2PtConicalEffect::setData(const GrGLUniformManager& uman,
     }
 }
 
-void GLCircleOutside2PtConicalEffect::GenKey(const GrDrawEffect& drawEffect,
-                                             const GrGLCaps&, GrEffectKeyBuilder* b) {
+void GLCircleOutside2PtConicalEffect::GenKey(const GrProcessor& processor,
+                                             const GrGLSLCaps&, GrProcessorKeyBuilder* b) {
     uint32_t* key = b->add32n(2);
-    key[0] = GenBaseGradientKey(drawEffect);
-    key[1] = drawEffect.castEffect<CircleOutside2PtConicalEffect>().isFlipped();
+    key[0] = GenBaseGradientKey(processor);
+    key[1] = processor.cast<CircleOutside2PtConicalEffect>().isFlipped();
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-GrEffect* Gr2PtConicalGradientEffect::Create(GrContext* ctx,
-                                             const SkTwoPointConicalGradient& shader,
-                                             SkShader::TileMode tm,
-                                             const SkMatrix* localMatrix) {
+GrFragmentProcessor* Gr2PtConicalGradientEffect::Create(GrContext* ctx,
+                                                        const SkTwoPointConicalGradient& shader,
+                                                        SkShader::TileMode tm,
+                                                        const SkMatrix* localMatrix) {
     SkMatrix matrix;
     if (!shader.getLocalMatrix().invert(&matrix)) {
-        return NULL;
+        return nullptr;
     }
     if (localMatrix) {
         SkMatrix inv;
         if (!localMatrix->invert(&inv)) {
-            return NULL;
+            return nullptr;
         }
         matrix.postConcat(inv);
     }
diff --git a/gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.h b/gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.h
index 4471ffc89c60..601a1667c4dc 100644
--- a/gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.h
+++ b/gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.h
@@ -10,7 +10,7 @@
 
 #include "SkGradientShaderPriv.h"
 
-class GrEffect;
+class GrProcessor;
 class SkTwoPointConicalGradient;
 
 namespace Gr2PtConicalGradientEffect {
@@ -18,8 +18,8 @@ namespace Gr2PtConicalGradientEffect {
      * Creates an effect that produces a two point conical gradient based on the
      * shader passed in.
      */
-    GrEffect* Create(GrContext* ctx, const SkTwoPointConicalGradient& shader,
-                     SkShader::TileMode tm, const SkMatrix* localMatrix);
+    GrFragmentProcessor* Create(GrContext* ctx,  const SkTwoPointConicalGradient& shader,
+                                SkShader::TileMode tm, const SkMatrix* localMatrix);
 };
 
 #endif
diff --git a/gfx/skia/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp b/gfx/skia/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp
deleted file mode 100644
index 50152744137c..000000000000
--- a/gfx/skia/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp
+++ /dev/null
@@ -1,714 +0,0 @@
-
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkTwoPointRadialGradient.h"
-
-/* Two-point radial gradients are specified by two circles, each with a center
-   point and radius.  The gradient can be considered to be a series of
-   concentric circles, with the color interpolated from the start circle
-   (at t=0) to the end circle (at t=1).
-
-   For each point (x, y) in the span, we want to find the
-   interpolated circle that intersects that point.  The center
-   of the desired circle (Cx, Cy) falls at some distance t
-   along the line segment between the start point (Sx, Sy) and
-   end point (Ex, Ey):
-
-      Cx = (1 - t) * Sx + t * Ex        (0 <= t <= 1)
-      Cy = (1 - t) * Sy + t * Ey
-
-   The radius of the desired circle (r) is also a linear interpolation t
-   between the start and end radii (Sr and Er):
-
-      r = (1 - t) * Sr + t * Er
-
-   But
-
-      (x - Cx)^2 + (y - Cy)^2 = r^2
-
-   so
-
-     (x - ((1 - t) * Sx + t * Ex))^2
-   + (y - ((1 - t) * Sy + t * Ey))^2
-   = ((1 - t) * Sr + t * Er)^2
-
-   Solving for t yields
-
-     [(Sx - Ex)^2 + (Sy - Ey)^2 - (Er - Sr)^2)] * t^2
-   + [2 * (Sx - Ex)(x - Sx) + 2 * (Sy - Ey)(y - Sy) - 2 * (Er - Sr) * Sr] * t
-   + [(x - Sx)^2 + (y - Sy)^2 - Sr^2] = 0
-
-   To simplify, let Dx = Sx - Ex, Dy = Sy - Ey, Dr = Er - Sr, dx = x - Sx, dy = y - Sy
-
-     [Dx^2 + Dy^2 - Dr^2)] * t^2
-   + 2 * [Dx * dx + Dy * dy - Dr * Sr] * t
-   + [dx^2 + dy^2 - Sr^2] = 0
-
-   A quadratic in t.  The two roots of the quadratic reflect the two
-   possible circles on which the point may fall.  Solving for t yields
-   the gradient value to use.
-
-   If a<0, the start circle is entirely contained in the
-   end circle, and one of the roots will be <0 or >1 (off the line
-   segment).  If a>0, the start circle falls at least partially
-   outside the end circle (or vice versa), and the gradient
-   defines a "tube" where a point may be on one circle (on the
-   inside of the tube) or the other (outside of the tube).  We choose
-   one arbitrarily.
-
-   In order to keep the math to within the limits of fixed point,
-   we divide the entire quadratic by Dr^2, and replace
-   (x - Sx)/Dr with x' and (y - Sy)/Dr with y', giving
-
-   [Dx^2 / Dr^2 + Dy^2 / Dr^2 - 1)] * t^2
-   + 2 * [x' * Dx / Dr + y' * Dy / Dr - Sr / Dr] * t
-   + [x'^2 + y'^2 - Sr^2/Dr^2] = 0
-
-   (x' and y' are computed by appending the subtract and scale to the
-   fDstToIndex matrix in the constructor).
-
-   Since the 'A' component of the quadratic is independent of x' and y', it
-   is precomputed in the constructor.  Since the 'B' component is linear in
-   x' and y', if x and y are linear in the span, 'B' can be computed
-   incrementally with a simple delta (db below).  If it is not (e.g.,
-   a perspective projection), it must be computed in the loop.
-
-*/
-
-namespace {
-
-inline SkFixed two_point_radial(SkScalar b, SkScalar fx, SkScalar fy,
-                                SkScalar sr2d2, SkScalar foura,
-                                SkScalar oneOverTwoA, bool posRoot) {
-    SkScalar c = SkScalarSquare(fx) + SkScalarSquare(fy) - sr2d2;
-    if (0 == foura) {
-        return SkScalarToFixed(SkScalarDiv(-c, b));
-    }
-
-    SkScalar discrim = SkScalarSquare(b) - SkScalarMul(foura, c);
-    if (discrim < 0) {
-        discrim = -discrim;
-    }
-    SkScalar rootDiscrim = SkScalarSqrt(discrim);
-    SkScalar result;
-    if (posRoot) {
-        result = SkScalarMul(-b + rootDiscrim, oneOverTwoA);
-    } else {
-        result = SkScalarMul(-b - rootDiscrim, oneOverTwoA);
-    }
-    return SkScalarToFixed(result);
-}
-
-typedef void (* TwoPointRadialShadeProc)(SkScalar fx, SkScalar dx,
-        SkScalar fy, SkScalar dy,
-        SkScalar b, SkScalar db,
-        SkScalar fSr2D2, SkScalar foura, SkScalar fOneOverTwoA, bool posRoot,
-        SkPMColor* SK_RESTRICT dstC, const SkPMColor* SK_RESTRICT cache,
-        int count);
-
-void shadeSpan_twopoint_clamp(SkScalar fx, SkScalar dx,
-        SkScalar fy, SkScalar dy,
-        SkScalar b, SkScalar db,
-        SkScalar fSr2D2, SkScalar foura, SkScalar fOneOverTwoA, bool posRoot,
-        SkPMColor* SK_RESTRICT dstC, const SkPMColor* SK_RESTRICT cache,
-        int count) {
-    for (; count > 0; --count) {
-        SkFixed t = two_point_radial(b, fx, fy, fSr2D2, foura,
-                                     fOneOverTwoA, posRoot);
-        SkFixed index = SkClampMax(t, 0xFFFF);
-        SkASSERT(index <= 0xFFFF);
-        *dstC++ = cache[index >> SkGradientShaderBase::kCache32Shift];
-        fx += dx;
-        fy += dy;
-        b += db;
-    }
-}
-void shadeSpan_twopoint_mirror(SkScalar fx, SkScalar dx,
-        SkScalar fy, SkScalar dy,
-        SkScalar b, SkScalar db,
-        SkScalar fSr2D2, SkScalar foura, SkScalar fOneOverTwoA, bool posRoot,
-        SkPMColor* SK_RESTRICT dstC, const SkPMColor* SK_RESTRICT cache,
-        int count) {
-    for (; count > 0; --count) {
-        SkFixed t = two_point_radial(b, fx, fy, fSr2D2, foura,
-                                     fOneOverTwoA, posRoot);
-        SkFixed index = mirror_tileproc(t);
-        SkASSERT(index <= 0xFFFF);
-        *dstC++ = cache[index >> SkGradientShaderBase::kCache32Shift];
-        fx += dx;
-        fy += dy;
-        b += db;
-    }
-}
-
-void shadeSpan_twopoint_repeat(SkScalar fx, SkScalar dx,
-        SkScalar fy, SkScalar dy,
-        SkScalar b, SkScalar db,
-        SkScalar fSr2D2, SkScalar foura, SkScalar fOneOverTwoA, bool posRoot,
-        SkPMColor* SK_RESTRICT dstC, const SkPMColor* SK_RESTRICT cache,
-        int count) {
-    for (; count > 0; --count) {
-        SkFixed t = two_point_radial(b, fx, fy, fSr2D2, foura,
-                                     fOneOverTwoA, posRoot);
-        SkFixed index = repeat_tileproc(t);
-        SkASSERT(index <= 0xFFFF);
-        *dstC++ = cache[index >> SkGradientShaderBase::kCache32Shift];
-        fx += dx;
-        fy += dy;
-        b += db;
-    }
-}
-}
-
-/////////////////////////////////////////////////////////////////////
-
-SkTwoPointRadialGradient::SkTwoPointRadialGradient(
-    const SkPoint& start, SkScalar startRadius,
-    const SkPoint& end, SkScalar endRadius,
-    const Descriptor& desc, const SkMatrix* localMatrix)
-    : SkGradientShaderBase(desc, localMatrix),
-      fCenter1(start),
-      fCenter2(end),
-      fRadius1(startRadius),
-      fRadius2(endRadius) {
-    init();
-}
-
-SkShader::BitmapType SkTwoPointRadialGradient::asABitmap(
-    SkBitmap* bitmap,
-    SkMatrix* matrix,
-    SkShader::TileMode* xy) const {
-    if (bitmap) {
-        this->getGradientTableBitmap(bitmap);
-    }
-    SkScalar diffL = 0; // just to avoid gcc warning
-    if (matrix) {
-        diffL = SkScalarSqrt(SkScalarSquare(fDiff.fX) +
-                             SkScalarSquare(fDiff.fY));
-    }
-    if (matrix) {
-        if (diffL) {
-            SkScalar invDiffL = SkScalarInvert(diffL);
-            matrix->setSinCos(-SkScalarMul(invDiffL, fDiff.fY),
-                              SkScalarMul(invDiffL, fDiff.fX));
-        } else {
-            matrix->reset();
-        }
-        matrix->preConcat(fPtsToUnit);
-    }
-    if (xy) {
-        xy[0] = fTileMode;
-        xy[1] = kClamp_TileMode;
-    }
-    return kTwoPointRadial_BitmapType;
-}
-
-SkShader::GradientType SkTwoPointRadialGradient::asAGradient(
-    SkShader::GradientInfo* info) const {
-    if (info) {
-        commonAsAGradient(info);
-        info->fPoint[0] = fCenter1;
-        info->fPoint[1] = fCenter2;
-        info->fRadius[0] = fRadius1;
-        info->fRadius[1] = fRadius2;
-    }
-    return kRadial2_GradientType;
-}
-
-size_t SkTwoPointRadialGradient::contextSize() const {
-    return sizeof(TwoPointRadialGradientContext);
-}
-
-SkShader::Context* SkTwoPointRadialGradient::onCreateContext(const ContextRec& rec,
-                                                             void* storage) const {
-    // For now, we might have divided by zero, so detect that.
-    if (0 == fDiffRadius) {
-        return NULL;
-    }
-    return SkNEW_PLACEMENT_ARGS(storage, TwoPointRadialGradientContext, (*this, rec));
-}
-
-SkTwoPointRadialGradient::TwoPointRadialGradientContext::TwoPointRadialGradientContext(
-        const SkTwoPointRadialGradient& shader, const ContextRec& rec)
-    : INHERITED(shader, rec)
-{
-    // we don't have a span16 proc
-    fFlags &= ~kHasSpan16_Flag;
-}
-
-void SkTwoPointRadialGradient::TwoPointRadialGradientContext::shadeSpan(
-        int x, int y, SkPMColor* dstCParam, int count) {
-    SkASSERT(count > 0);
-
-    const SkTwoPointRadialGradient& twoPointRadialGradient =
-            static_cast<const SkTwoPointRadialGradient&>(fShader);
-
-    SkPMColor* SK_RESTRICT dstC = dstCParam;
-
-    // Zero difference between radii:  fill with transparent black.
-    if (twoPointRadialGradient.fDiffRadius == 0) {
-      sk_bzero(dstC, count * sizeof(*dstC));
-      return;
-    }
-    SkMatrix::MapXYProc dstProc = fDstToIndexProc;
-    TileProc            proc = twoPointRadialGradient.fTileProc;
-    const SkPMColor* SK_RESTRICT cache = fCache->getCache32();
-
-    SkScalar foura = twoPointRadialGradient.fA * 4;
-    bool posRoot = twoPointRadialGradient.fDiffRadius < 0;
-    if (fDstToIndexClass != kPerspective_MatrixClass) {
-        SkPoint srcPt;
-        dstProc(fDstToIndex, SkIntToScalar(x) + SK_ScalarHalf,
-                             SkIntToScalar(y) + SK_ScalarHalf, &srcPt);
-        SkScalar dx, fx = srcPt.fX;
-        SkScalar dy, fy = srcPt.fY;
-
-        if (fDstToIndexClass == kFixedStepInX_MatrixClass) {
-            SkFixed fixedX, fixedY;
-            (void)fDstToIndex.fixedStepInX(SkIntToScalar(y), &fixedX, &fixedY);
-            dx = SkFixedToScalar(fixedX);
-            dy = SkFixedToScalar(fixedY);
-        } else {
-            SkASSERT(fDstToIndexClass == kLinear_MatrixClass);
-            dx = fDstToIndex.getScaleX();
-            dy = fDstToIndex.getSkewY();
-        }
-        SkScalar b = (SkScalarMul(twoPointRadialGradient.fDiff.fX, fx) +
-                     SkScalarMul(twoPointRadialGradient.fDiff.fY, fy) -
-                     twoPointRadialGradient.fStartRadius) * 2;
-        SkScalar db = (SkScalarMul(twoPointRadialGradient.fDiff.fX, dx) +
-                      SkScalarMul(twoPointRadialGradient.fDiff.fY, dy)) * 2;
-
-        TwoPointRadialShadeProc shadeProc = shadeSpan_twopoint_repeat;
-        if (SkShader::kClamp_TileMode == twoPointRadialGradient.fTileMode) {
-            shadeProc = shadeSpan_twopoint_clamp;
-        } else if (SkShader::kMirror_TileMode == twoPointRadialGradient.fTileMode) {
-            shadeProc = shadeSpan_twopoint_mirror;
-        } else {
-            SkASSERT(SkShader::kRepeat_TileMode == twoPointRadialGradient.fTileMode);
-        }
-        (*shadeProc)(fx, dx, fy, dy, b, db,
-                     twoPointRadialGradient.fSr2D2, foura,
-                     twoPointRadialGradient.fOneOverTwoA, posRoot,
-                     dstC, cache, count);
-    } else {    // perspective case
-        SkScalar dstX = SkIntToScalar(x);
-        SkScalar dstY = SkIntToScalar(y);
-        for (; count > 0; --count) {
-            SkPoint             srcPt;
-            dstProc(fDstToIndex, dstX, dstY, &srcPt);
-            SkScalar fx = srcPt.fX;
-            SkScalar fy = srcPt.fY;
-            SkScalar b = (SkScalarMul(twoPointRadialGradient.fDiff.fX, fx) +
-                         SkScalarMul(twoPointRadialGradient.fDiff.fY, fy) -
-                         twoPointRadialGradient.fStartRadius) * 2;
-            SkFixed t = two_point_radial(b, fx, fy, twoPointRadialGradient.fSr2D2, foura,
-                                         twoPointRadialGradient.fOneOverTwoA, posRoot);
-            SkFixed index = proc(t);
-            SkASSERT(index <= 0xFFFF);
-            *dstC++ = cache[index >> SkGradientShaderBase::kCache32Shift];
-            dstX += SK_Scalar1;
-        }
-    }
-}
-
-#ifndef SK_IGNORE_TO_STRING
-void SkTwoPointRadialGradient::toString(SkString* str) const {
-    str->append("SkTwoPointRadialGradient: (");
-
-    str->append("center1: (");
-    str->appendScalar(fCenter1.fX);
-    str->append(", ");
-    str->appendScalar(fCenter1.fY);
-    str->append(") radius1: ");
-    str->appendScalar(fRadius1);
-    str->append(" ");
-
-    str->append("center2: (");
-    str->appendScalar(fCenter2.fX);
-    str->append(", ");
-    str->appendScalar(fCenter2.fY);
-    str->append(") radius2: ");
-    str->appendScalar(fRadius2);
-    str->append(" ");
-
-    this->INHERITED::toString(str);
-
-    str->append(")");
-}
-#endif
-
-SkTwoPointRadialGradient::SkTwoPointRadialGradient(
-    SkReadBuffer& buffer)
-    : INHERITED(buffer),
-      fCenter1(buffer.readPoint()),
-      fCenter2(buffer.readPoint()),
-      fRadius1(buffer.readScalar()),
-      fRadius2(buffer.readScalar()) {
-    init();
-};
-
-void SkTwoPointRadialGradient::flatten(
-    SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
-    buffer.writePoint(fCenter1);
-    buffer.writePoint(fCenter2);
-    buffer.writeScalar(fRadius1);
-    buffer.writeScalar(fRadius2);
-}
-
-void SkTwoPointRadialGradient::init() {
-    fDiff = fCenter1 - fCenter2;
-    fDiffRadius = fRadius2 - fRadius1;
-    // hack to avoid zero-divide for now
-    SkScalar inv = fDiffRadius ? SkScalarInvert(fDiffRadius) : 0;
-    fDiff.fX = SkScalarMul(fDiff.fX, inv);
-    fDiff.fY = SkScalarMul(fDiff.fY, inv);
-    fStartRadius = SkScalarMul(fRadius1, inv);
-    fSr2D2 = SkScalarSquare(fStartRadius);
-    fA = SkScalarSquare(fDiff.fX) + SkScalarSquare(fDiff.fY) - SK_Scalar1;
-    fOneOverTwoA = fA ? SkScalarInvert(fA * 2) : 0;
-
-    fPtsToUnit.setTranslate(-fCenter1.fX, -fCenter1.fY);
-    fPtsToUnit.postScale(inv, inv);
-}
-
-/////////////////////////////////////////////////////////////////////
-
-#if SK_SUPPORT_GPU
-
-#include "GrTBackendEffectFactory.h"
-#include "gl/GrGLShaderBuilder.h"
-#include "SkGr.h"
-
-// For brevity
-typedef GrGLUniformManager::UniformHandle UniformHandle;
-
-class GrGLRadial2Gradient : public GrGLGradientEffect {
-
-public:
-
-    GrGLRadial2Gradient(const GrBackendEffectFactory& factory, const GrDrawEffect&);
-    virtual ~GrGLRadial2Gradient() { }
-
-    virtual void emitCode(GrGLShaderBuilder*,
-                          const GrDrawEffect&,
-                          const GrEffectKey&,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
-
-    static void GenKey(const GrDrawEffect&, const GrGLCaps& caps, GrEffectKeyBuilder* b);
-
-protected:
-
-    UniformHandle fParamUni;
-
-    const char* fVSVaryingName;
-    const char* fFSVaryingName;
-
-    bool fIsDegenerate;
-
-    // @{
-    /// Values last uploaded as uniforms
-
-    SkScalar fCachedCenter;
-    SkScalar fCachedRadius;
-    bool     fCachedPosRoot;
-
-    // @}
-
-private:
-
-    typedef GrGLGradientEffect INHERITED;
-
-};
-
-/////////////////////////////////////////////////////////////////////
-
-class GrRadial2Gradient : public GrGradientEffect {
-public:
-    static GrEffect* Create(GrContext* ctx,
-                            const SkTwoPointRadialGradient& shader,
-                            const SkMatrix& matrix,
-                            SkShader::TileMode tm) {
-        return SkNEW_ARGS(GrRadial2Gradient, (ctx, shader, matrix, tm));
-    }
-
-    virtual ~GrRadial2Gradient() { }
-
-    static const char* Name() { return "Two-Point Radial Gradient"; }
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE {
-        return GrTBackendEffectFactory<GrRadial2Gradient>::getInstance();
-    }
-
-    // The radial gradient parameters can collapse to a linear (instead of quadratic) equation.
-    bool isDegenerate() const { return SK_Scalar1 == fCenterX1; }
-    SkScalar center() const { return fCenterX1; }
-    SkScalar radius() const { return fRadius0; }
-    bool isPosRoot() const { return SkToBool(fPosRoot); }
-
-    typedef GrGLRadial2Gradient GLEffect;
-
-private:
-    virtual bool onIsEqual(const GrEffect& sBase) const SK_OVERRIDE {
-        const GrRadial2Gradient& s = CastEffect<GrRadial2Gradient>(sBase);
-        return (INHERITED::onIsEqual(sBase) &&
-                this->fCenterX1 == s.fCenterX1 &&
-                this->fRadius0 == s.fRadius0 &&
-                this->fPosRoot == s.fPosRoot);
-    }
-
-    GrRadial2Gradient(GrContext* ctx,
-                      const SkTwoPointRadialGradient& shader,
-                      const SkMatrix& matrix,
-                      SkShader::TileMode tm)
-        : INHERITED(ctx, shader, matrix, tm)
-        , fCenterX1(shader.getCenterX1())
-        , fRadius0(shader.getStartRadius())
-        , fPosRoot(shader.getDiffRadius() < 0) {
-        // We pass the linear part of the quadratic as a varying.
-        //    float b = 2.0 * (fCenterX1 * x - fRadius0 * z)
-        fBTransform = this->getCoordTransform();
-        SkMatrix& bMatrix = *fBTransform.accessMatrix();
-        bMatrix[SkMatrix::kMScaleX] = 2 * (SkScalarMul(fCenterX1, bMatrix[SkMatrix::kMScaleX]) -
-                                           SkScalarMul(fRadius0, bMatrix[SkMatrix::kMPersp0]));
-        bMatrix[SkMatrix::kMSkewX] = 2 * (SkScalarMul(fCenterX1, bMatrix[SkMatrix::kMSkewX]) -
-                                          SkScalarMul(fRadius0, bMatrix[SkMatrix::kMPersp1]));
-        bMatrix[SkMatrix::kMTransX] = 2 * (SkScalarMul(fCenterX1, bMatrix[SkMatrix::kMTransX]) -
-                                           SkScalarMul(fRadius0, bMatrix[SkMatrix::kMPersp2]));
-        this->addCoordTransform(&fBTransform);
-    }
-
-    GR_DECLARE_EFFECT_TEST;
-
-    // @{
-    // Cache of values - these can change arbitrarily, EXCEPT
-    // we shouldn't change between degenerate and non-degenerate?!
-
-    GrCoordTransform fBTransform;
-    SkScalar         fCenterX1;
-    SkScalar         fRadius0;
-    SkBool8          fPosRoot;
-
-    // @}
-
-    typedef GrGradientEffect INHERITED;
-};
-
-/////////////////////////////////////////////////////////////////////
-
-GR_DEFINE_EFFECT_TEST(GrRadial2Gradient);
-
-GrEffect* GrRadial2Gradient::TestCreate(SkRandom* random,
-                                        GrContext* context,
-                                        const GrDrawTargetCaps&,
-                                        GrTexture**) {
-    SkPoint center1 = {random->nextUScalar1(), random->nextUScalar1()};
-    SkScalar radius1 = random->nextUScalar1();
-    SkPoint center2;
-    SkScalar radius2;
-    do {
-        center2.set(random->nextUScalar1(), random->nextUScalar1());
-        radius2 = random->nextUScalar1 ();
-        // There is a bug in two point radial gradients with identical radii
-    } while (radius1 == radius2);
-
-    SkColor colors[kMaxRandomGradientColors];
-    SkScalar stopsArray[kMaxRandomGradientColors];
-    SkScalar* stops = stopsArray;
-    SkShader::TileMode tm;
-    int colorCount = RandomGradientParams(random, colors, &stops, &tm);
-    SkAutoTUnref<SkShader> shader(SkGradientShader::CreateTwoPointRadial(center1, radius1,
-                                                                         center2, radius2,
-                                                                         colors, stops, colorCount,
-                                                                         tm));
-    SkPaint paint;
-    GrEffect* effect;
-    GrColor paintColor;
-    SkAssertResult(shader->asNewEffect(context, paint, NULL, &paintColor, &effect));
-    return effect;
-}
-
-/////////////////////////////////////////////////////////////////////
-
-GrGLRadial2Gradient::GrGLRadial2Gradient(const GrBackendEffectFactory& factory,
-                                         const GrDrawEffect& drawEffect)
-    : INHERITED(factory)
-    , fVSVaryingName(NULL)
-    , fFSVaryingName(NULL)
-    , fCachedCenter(SK_ScalarMax)
-    , fCachedRadius(-SK_ScalarMax)
-    , fCachedPosRoot(0) {
-
-    const GrRadial2Gradient& data = drawEffect.castEffect<GrRadial2Gradient>();
-    fIsDegenerate = data.isDegenerate();
-}
-
-void GrGLRadial2Gradient::emitCode(GrGLShaderBuilder* builder,
-                                   const GrDrawEffect& drawEffect,
-                                   const GrEffectKey& key,
-                                   const char* outputColor,
-                                   const char* inputColor,
-                                   const TransformedCoordsArray& coords,
-                                   const TextureSamplerArray& samplers) {
-    uint32_t baseKey = key.get32(0);
-    this->emitUniforms(builder, baseKey);
-    fParamUni = builder->addUniformArray(GrGLShaderBuilder::kFragment_Visibility,
-                                         kFloat_GrSLType, "Radial2FSParams", 6);
-
-    SkString cName("c");
-    SkString ac4Name("ac4");
-    SkString rootName("root");
-    SkString t;
-    SkString p0;
-    SkString p1;
-    SkString p2;
-    SkString p3;
-    SkString p4;
-    SkString p5;
-    builder->getUniformVariable(fParamUni).appendArrayAccess(0, &p0);
-    builder->getUniformVariable(fParamUni).appendArrayAccess(1, &p1);
-    builder->getUniformVariable(fParamUni).appendArrayAccess(2, &p2);
-    builder->getUniformVariable(fParamUni).appendArrayAccess(3, &p3);
-    builder->getUniformVariable(fParamUni).appendArrayAccess(4, &p4);
-    builder->getUniformVariable(fParamUni).appendArrayAccess(5, &p5);
-
-    // We interpolate the linear component in coords[1].
-    SkASSERT(coords[0].type() == coords[1].type());
-    const char* coords2D;
-    SkString bVar;
-    if (kVec3f_GrSLType == coords[0].type()) {
-        builder->fsCodeAppendf("\tvec3 interpolants = vec3(%s.xy, %s.x) / %s.z;\n",
-                               coords[0].c_str(), coords[1].c_str(), coords[0].c_str());
-        coords2D = "interpolants.xy";
-        bVar = "interpolants.z";
-    } else {
-        coords2D = coords[0].c_str();
-        bVar.printf("%s.x", coords[1].c_str());
-    }
-
-    // c = (x^2)+(y^2) - params[4]
-    builder->fsCodeAppendf("\tfloat %s = dot(%s, %s) - %s;\n",
-                           cName.c_str(), coords2D, coords2D, p4.c_str());
-
-    // If we aren't degenerate, emit some extra code, and accept a slightly
-    // more complex coord.
-    if (!fIsDegenerate) {
-
-        // ac4 = 4.0 * params[0] * c
-        builder->fsCodeAppendf("\tfloat %s = %s * 4.0 * %s;\n",
-                               ac4Name.c_str(), p0.c_str(),
-                               cName.c_str());
-
-        // root = sqrt(b^2-4ac)
-        // (abs to avoid exception due to fp precision)
-        builder->fsCodeAppendf("\tfloat %s = sqrt(abs(%s*%s - %s));\n",
-                               rootName.c_str(), bVar.c_str(), bVar.c_str(),
-                               ac4Name.c_str());
-
-        // t is: (-b + params[5] * sqrt(b^2-4ac)) * params[1]
-        t.printf("(-%s + %s * %s) * %s", bVar.c_str(), p5.c_str(),
-                 rootName.c_str(), p1.c_str());
-    } else {
-        // t is: -c/b
-        t.printf("-%s / %s", cName.c_str(), bVar.c_str());
-    }
-
-    this->emitColor(builder, t.c_str(), baseKey, outputColor, inputColor, samplers);
-}
-
-void GrGLRadial2Gradient::setData(const GrGLUniformManager& uman,
-                                  const GrDrawEffect& drawEffect) {
-    INHERITED::setData(uman, drawEffect);
-    const GrRadial2Gradient& data = drawEffect.castEffect<GrRadial2Gradient>();
-    SkASSERT(data.isDegenerate() == fIsDegenerate);
-    SkScalar centerX1 = data.center();
-    SkScalar radius0 = data.radius();
-    if (fCachedCenter != centerX1 ||
-        fCachedRadius != radius0 ||
-        fCachedPosRoot != data.isPosRoot()) {
-
-        SkScalar a = SkScalarMul(centerX1, centerX1) - SK_Scalar1;
-
-        // When we're in the degenerate (linear) case, the second
-        // value will be INF but the program doesn't read it. (We
-        // use the same 6 uniforms even though we don't need them
-        // all in the linear case just to keep the code complexity
-        // down).
-        float values[6] = {
-            SkScalarToFloat(a),
-            1 / (2.f * SkScalarToFloat(a)),
-            SkScalarToFloat(centerX1),
-            SkScalarToFloat(radius0),
-            SkScalarToFloat(SkScalarMul(radius0, radius0)),
-            data.isPosRoot() ? 1.f : -1.f
-        };
-
-        uman.set1fv(fParamUni, 6, values);
-        fCachedCenter = centerX1;
-        fCachedRadius = radius0;
-        fCachedPosRoot = data.isPosRoot();
-    }
-}
-
-void GrGLRadial2Gradient::GenKey(const GrDrawEffect& drawEffect,
-                                 const GrGLCaps&, GrEffectKeyBuilder* b) {
-    uint32_t* key = b->add32n(2);
-    key[0] = GenBaseGradientKey(drawEffect);
-    key[1] = drawEffect.castEffect<GrRadial2Gradient>().isDegenerate();
-}
-
-/////////////////////////////////////////////////////////////////////
-
-bool SkTwoPointRadialGradient::asNewEffect(GrContext* context, const SkPaint& paint,
-                                           const SkMatrix* localMatrix, GrColor* paintColor,
-                                           GrEffect** effect)  const {
-    SkASSERT(NULL != context);
-    
-    // invert the localM, translate to center1 (fPtsToUni), rotate so center2 is on x axis.
-    SkMatrix matrix;
-    if (!this->getLocalMatrix().invert(&matrix)) {
-        return false;
-    }
-    if (localMatrix) {
-        SkMatrix inv;
-        if (!localMatrix->invert(&inv)) {
-            return false;
-        }
-        matrix.postConcat(inv);
-    }
-    matrix.postConcat(fPtsToUnit);
-
-    SkScalar diffLen = fDiff.length();
-    if (0 != diffLen) {
-        SkScalar invDiffLen = SkScalarInvert(diffLen);
-        SkMatrix rot;
-        rot.setSinCos(-SkScalarMul(invDiffLen, fDiff.fY),
-                       SkScalarMul(invDiffLen, fDiff.fX));
-        matrix.postConcat(rot);
-    }
-
-    *paintColor = SkColor2GrColorJustAlpha(paint.getColor());
-    *effect = GrRadial2Gradient::Create(context, *this, matrix, fTileMode);
-    
-    return true;
-}
-
-#else
-
-bool SkTwoPointRadialGradient::asNewEffect(GrContext* context, const SkPaint& paint,
-                                           const SkMatrix* localMatrix, GrColor* paintColor,
-                                           GrEffect** effect)  const {
-    SkDEBUGFAIL("Should not call in GPU-less build");
-    return false;
-}
-
-#endif
diff --git a/gfx/skia/skia/src/effects/gradients/SkTwoPointRadialGradient.h b/gfx/skia/skia/src/effects/gradients/SkTwoPointRadialGradient.h
deleted file mode 100644
index dc3a1553a133..000000000000
--- a/gfx/skia/skia/src/effects/gradients/SkTwoPointRadialGradient.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
- #ifndef SkTwoPointRadialGradient_DEFINED
- #define SkTwoPointRadialGradient_DEFINED
-
- #include "SkGradientShaderPriv.h"
-
-class SkTwoPointRadialGradient : public SkGradientShaderBase {
-public:
-    SkTwoPointRadialGradient(const SkPoint& start, SkScalar startRadius,
-                              const SkPoint& end, SkScalar endRadius,
-                              const Descriptor&, const SkMatrix* localMatrix);
-
-    virtual BitmapType asABitmap(SkBitmap* bitmap,
-                                 SkMatrix* matrix,
-                                 TileMode* xy) const SK_OVERRIDE;
-    virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE;
-    virtual bool asNewEffect(GrContext* context, const SkPaint&, const SkMatrix*, GrColor*,
-                             GrEffect**)  const SK_OVERRIDE;
-
-    virtual size_t contextSize() const SK_OVERRIDE;
-
-    class TwoPointRadialGradientContext : public SkGradientShaderBase::GradientShaderBaseContext {
-    public:
-        TwoPointRadialGradientContext(const SkTwoPointRadialGradient&, const ContextRec&);
-
-        virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE;
-
-    private:
-        typedef SkGradientShaderBase::GradientShaderBaseContext INHERITED;
-    };
-
-    SkScalar getCenterX1() const { return fDiff.length(); }
-    SkScalar getStartRadius() const { return fStartRadius; }
-    SkScalar getDiffRadius() const { return fDiffRadius; }
-
-    SK_TO_STRING_OVERRIDE()
-    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTwoPointRadialGradient)
-
-protected:
-    SkTwoPointRadialGradient(SkReadBuffer& buffer);
-    virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE;
-    virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
-
-private:
-    const SkPoint fCenter1;
-    const SkPoint fCenter2;
-    const SkScalar fRadius1;
-    const SkScalar fRadius2;
-    SkPoint fDiff;
-    SkScalar fStartRadius, fDiffRadius, fSr2D2, fA, fOneOverTwoA;
-
-    void init();
-
-    typedef SkGradientShaderBase INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/fonts/SkFontMgr_fontconfig.cpp b/gfx/skia/skia/src/fonts/SkFontMgr_fontconfig.cpp
index a7f81281c32f..de309d311bdf 100644
--- a/gfx/skia/skia/src/fonts/SkFontMgr_fontconfig.cpp
+++ b/gfx/skia/skia/src/fonts/SkFontMgr_fontconfig.cpp
@@ -5,14 +5,14 @@
  * found in the LICENSE file.
  */
 
-#include "SkFontMgr.h"
-#include "SkFontStyle.h"
 #include "SkFontConfigInterface.h"
 #include "SkFontConfigTypeface.h"
+#include "SkFontMgr.h"
+#include "SkFontStyle.h"
 #include "SkMath.h"
+#include "SkMutex.h"
 #include "SkString.h"
 #include "SkTDArray.h"
-#include "SkThread.h"
 
 // for now we pull these in directly. eventually we will solely rely on the
 // SkFontConfigInterface instance.
@@ -60,7 +60,7 @@ static SkFontConfigInterface* RefFCI() {
 // look for the last substring after a '/' and return that, or return null.
 static const char* find_just_name(const char* str) {
     const char* last = strrchr(str, '/');
-    return last ? last + 1 : NULL;
+    return last ? last + 1 : nullptr;
 }
 
 static bool is_lower(char c) {
@@ -123,7 +123,7 @@ static FcPattern** MatchFont(FcFontSet* font_set,
     }
 
     if (iter == stop || !match_name(*iter, post_config_family)) {
-        return NULL;
+        return nullptr;
     }
 
     FcPattern** firstIter = iter++;
@@ -142,10 +142,10 @@ public:
     SkFontStyleSet_FC(FcPattern** matches, int count);
     virtual ~SkFontStyleSet_FC();
 
-    virtual int count() SK_OVERRIDE { return fRecCount; }
-    virtual void getStyle(int index, SkFontStyle*, SkString* style) SK_OVERRIDE;
-    virtual SkTypeface* createTypeface(int index) SK_OVERRIDE;
-    virtual SkTypeface* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE;
+    int count() override { return fRecCount; }
+    void getStyle(int index, SkFontStyle*, SkString* style) override;
+    SkTypeface* createTypeface(int index) override;
+    SkTypeface* matchStyle(const SkFontStyle& pattern) override;
 
 private:
     struct Rec {
@@ -180,7 +180,7 @@ static SkFontStyle make_fontconfig_style(FcPattern* match) {
 
 SkFontStyleSet_FC::SkFontStyleSet_FC(FcPattern** matches, int count) {
     fRecCount = count;
-    fRecs = SkNEW_ARRAY(Rec, count);
+    fRecs = new Rec[count];
     for (int i = 0; i < count; ++i) {
         fRecs[i].fStyleName.set(get_name(matches[i], FC_STYLE));
         fRecs[i].fFileName.set(get_name(matches[i], FC_FILE));
@@ -188,9 +188,7 @@ SkFontStyleSet_FC::SkFontStyleSet_FC(FcPattern** matches, int count) {
     }
 }
 
-SkFontStyleSet_FC::~SkFontStyleSet_FC() {
-    SkDELETE_ARRAY(fRecs);
-}
+SkFontStyleSet_FC::~SkFontStyleSet_FC() { delete[] fRecs; }
 
 void SkFontStyleSet_FC::getStyle(int index, SkFontStyle* style,
                                  SkString* styleName) {
@@ -204,17 +202,17 @@ void SkFontStyleSet_FC::getStyle(int index, SkFontStyle* style,
 }
 
 SkTypeface* SkFontStyleSet_FC::createTypeface(int index) {
-    return NULL;
+    return nullptr;
 }
 
 SkTypeface* SkFontStyleSet_FC::matchStyle(const SkFontStyle& pattern) {
-    return NULL;
+    return nullptr;
 }
 
 class SkFontMgr_fontconfig : public SkFontMgr {
     SkAutoTUnref<SkFontConfigInterface> fFCI;
     SkDataTable* fFamilyNames;
-
+    SkTypeface_FreeType::Scanner fScanner;
 
 public:
     SkFontMgr_fontconfig(SkFontConfigInterface* fci)
@@ -226,19 +224,19 @@ public:
     }
 
 protected:
-    virtual int onCountFamilies() const SK_OVERRIDE {
+    int onCountFamilies() const override {
         return fFamilyNames->count();
     }
 
-    virtual void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE {
+    void onGetFamilyName(int index, SkString* familyName) const override {
         familyName->set(fFamilyNames->atStr(index));
     }
 
-    virtual SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE {
+    SkFontStyleSet* onCreateStyleSet(int index) const override {
         return this->onMatchFamily(fFamilyNames->atStr(index));
     }
 
-    virtual SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE {
+    SkFontStyleSet* onMatchFamily(const char familyName[]) const override {
         FCLocker lock;
 
         FcPattern* pattern = FcPatternCreate();
@@ -247,7 +245,7 @@ protected:
 #if 0
         FcPatternAddBool(pattern, FC_SCALABLE, FcTrue);
 #endif
-        FcConfigSubstitute(NULL, pattern, FcMatchPattern);
+        FcConfigSubstitute(nullptr, pattern, FcMatchPattern);
         FcDefaultSubstitute(pattern);
 
         const char* post_config_family = get_name(pattern, FC_FAMILY);
@@ -256,7 +254,7 @@ protected:
         FcFontSet* font_set = FcFontSort(0, pattern, 0, 0, &result);
         if (!font_set) {
             FcPatternDestroy(pattern);
-            return NULL;
+            return nullptr;
         }
 
         int count;
@@ -264,7 +262,7 @@ protected:
         if (!match) {
             FcPatternDestroy(pattern);
             FcFontSetDestroy(font_set);
-            return NULL;
+            return nullptr;
         }
 
         FcPatternDestroy(pattern);
@@ -277,53 +275,57 @@ protected:
             }
         }
 
-        SkFontStyleSet_FC* sset = SkNEW_ARGS(SkFontStyleSet_FC,
-                                             (trimmedMatches.begin(),
-                                              trimmedMatches.count()));
+        SkFontStyleSet_FC* sset =
+                new SkFontStyleSet_FC(trimmedMatches.begin(), trimmedMatches.count());
         return sset;
     }
 
-    virtual SkTypeface* onMatchFamilyStyle(const char familyName[],
-                                           const SkFontStyle&) const SK_OVERRIDE { return NULL; }
-    virtual SkTypeface* onMatchFaceStyle(const SkTypeface*,
-                                         const SkFontStyle&) const SK_OVERRIDE { return NULL; }
+    SkTypeface* onMatchFamilyStyle(const char familyName[],
+                                   const SkFontStyle&) const override { return nullptr; }
+    SkTypeface* onMatchFamilyStyleCharacter(const char familyName[], const SkFontStyle&,
+                                            const char* bcp47[], int bcp47Count,
+                                            SkUnichar character) const override {
+        return nullptr;
+    }
+    SkTypeface* onMatchFaceStyle(const SkTypeface*,
+                                 const SkFontStyle&) const override { return nullptr; }
 
-    virtual SkTypeface* onCreateFromData(SkData*, int ttcIndex) const SK_OVERRIDE { return NULL; }
+    SkTypeface* onCreateFromData(SkData*, int ttcIndex) const override { return nullptr; }
 
-    virtual SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE {
+    SkTypeface* onCreateFromStream(SkStreamAsset* bareStream, int ttcIndex) const override {
+        SkAutoTDelete<SkStreamAsset> stream(bareStream);
         const size_t length = stream->getLength();
         if (!length) {
-            return NULL;
+            return nullptr;
         }
         if (length >= 1024 * 1024 * 1024) {
-            return NULL;  // don't accept too large fonts (>= 1GB) for safety.
+            return nullptr;  // don't accept too large fonts (>= 1GB) for safety.
         }
 
         // TODO should the caller give us the style or should we get it from freetype?
-        SkTypeface::Style style = SkTypeface::kNormal;
+        SkFontStyle style;
         bool isFixedWidth = false;
-        if (!SkTypeface_FreeType::ScanFont(stream, 0, NULL, &style, &isFixedWidth)) {
-            return NULL;
+        if (!fScanner.scanFont(stream, 0, nullptr, &style, &isFixedWidth, nullptr)) {
+            return nullptr;
         }
 
-        SkTypeface* face = FontConfigTypeface::Create(style, isFixedWidth, stream);
+        SkTypeface* face = FontConfigTypeface::Create(style, isFixedWidth, stream.detach());
         return face;
     }
 
-    virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE {
-        SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path));
-        return stream.get() ? this->createFromStream(stream, ttcIndex) : NULL;
+    SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const override {
+        SkAutoTDelete<SkStreamAsset> stream(SkStream::NewFromFile(path));
+        return stream.get() ? this->createFromStream(stream.detach(), ttcIndex) : nullptr;
     }
 
-    virtual SkTypeface* onLegacyCreateTypeface(const char familyName[],
-                                               unsigned styleBits) const SK_OVERRIDE {
+    SkTypeface* onLegacyCreateTypeface(const char familyName[],
+                                       unsigned styleBits) const override {
         FCLocker lock;
-        return FontConfigTypeface::LegacyCreateTypeface(NULL, familyName,
-                                                  (SkTypeface::Style)styleBits);
+        return FontConfigTypeface::LegacyCreateTypeface(familyName, (SkTypeface::Style)styleBits);
     }
 };
 
 SkFontMgr* SkFontMgr::Factory() {
     SkFontConfigInterface* fci = RefFCI();
-    return fci ? SkNEW_ARGS(SkFontMgr_fontconfig, (fci)) : NULL;
+    return fci ? new SkFontMgr_fontconfig(fci) : nullptr;
 }
diff --git a/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp b/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp
index 54f2de82901a..2470f8a69336 100644
--- a/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp
+++ b/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp
@@ -5,17 +5,22 @@
  * found in the LICENSE file.
  */
 
-#include "SkFontMgr_indirect.h"
-
 #include "SkDataTable.h"
+#include "SkFontMgr.h"
+#include "SkFontMgr_indirect.h"
 #include "SkFontStyle.h"
+#include "SkMutex.h"
 #include "SkOnce.h"
+#include "SkRefCnt.h"
+#include "SkRemotableFontMgr.h"
 #include "SkStream.h"
-#include "SkTSearch.h"
+#include "SkString.h"
+#include "SkTArray.h"
 #include "SkTypeface.h"
+#include "SkTypes.h"
+#include "SkTemplates.h"
 
 class SkData;
-class SkString;
 
 class SkStyleSet_Indirect : public SkFontStyleSet {
 public:
@@ -25,9 +30,9 @@ public:
         : fOwner(SkRef(owner)), fFamilyIndex(familyIndex), fData(data)
     { }
 
-    virtual int count() SK_OVERRIDE { return fData->count(); }
+    int count() override { return fData->count(); }
 
-    virtual void getStyle(int index, SkFontStyle* fs, SkString* style) SK_OVERRIDE {
+    void getStyle(int index, SkFontStyle* fs, SkString* style) override {
         if (fs) {
             *fs = fData->at(index).fFontStyle;
         }
@@ -37,112 +42,17 @@ public:
         }
     }
 
-    virtual SkTypeface* createTypeface(int index) SK_OVERRIDE {
+    SkTypeface* createTypeface(int index) override {
         return fOwner->createTypefaceFromFontId(fData->at(index));
     }
 
-    virtual SkTypeface* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE {
+    SkTypeface* matchStyle(const SkFontStyle& pattern) override {
         if (fFamilyIndex >= 0) {
             SkFontIdentity id = fOwner->fProxy->matchIndexStyle(fFamilyIndex, pattern);
             return fOwner->createTypefaceFromFontId(id);
         }
 
-        // If this SkStyleSet was created via onMatchFamily we would need a call like
-        // fOwner->fProxy->matchNameStyle(fFamilyName, pattern);
-        // but would not activate fonts (only consider fonts which would come back from matchName).
-
-        // CSS policy sounds good.
-        struct Score {
-            int score;
-            int index;
-        };
-
-        // Width has the greatest priority.
-        // If the value of pattern.width is 5 (normal) or less,
-        //    narrower width values are checked first, then wider values.
-        // If the value of pattern.width is greater than 5 (normal),
-        //    wider values are checked first, followed by narrower values.
-
-        // Italic/Oblique has the next highest priority.
-        // If italic requested and there is some italic font, use it.
-        // If oblique requested and there is some oblique font, use it.
-        // If italic requested and there is some oblique font, use it.
-        // If oblique requested and there is some italic font, use it.
-
-        // Exact match.
-        // If pattern.weight < 400, weights below pattern.weight are checked
-        //   in descending order followed by weights above pattern.weight
-        //   in ascending order until a match is found.
-        // If pattern.weight > 500, weights above pattern.weight are checked
-        //   in ascending order followed by weights below pattern.weight
-        //   in descending order until a match is found.
-        // If pattern.weight is 400, 500 is checked first
-        //   and then the rule for pattern.weight < 400 is used.
-        // If pattern.weight is 500, 400 is checked first
-        //   and then the rule for pattern.weight < 400 is used
-
-        Score maxScore = { 0, 0 };
-        for (int i = 0; i < fData->count(); ++i) {
-            const SkFontStyle& current = fData->at(i).fFontStyle;
-            Score currentScore = { 0, i };
-
-            // CSS stretch. (This is the width.)
-            // This has the highest priority.
-            if (pattern.width() <= SkFontStyle::kNormal_Width) {
-                if (current.width() <= pattern.width()) {
-                    currentScore.score += 10 - pattern.width() + current.width();
-                } else {
-                    currentScore.score += 10 - current.width();
-                }
-            } else {
-                if (current.width() > pattern.width()) {
-                    currentScore.score += 10 + pattern.width() - current.width();
-                } else {
-                    currentScore.score += current.width();
-                }
-            }
-            currentScore.score *= 1002;
-
-            // CSS style (italic/oblique)
-            // Being italic trumps all valid weights which are not italic.
-            // Note that newer specs differentiate between italic and oblique.
-            if (pattern.isItalic() && current.isItalic()) {
-                currentScore.score += 1001;
-            }
-
-            // Synthetics (weight/style) [no stretch synthetic?]
-
-            // The 'closer' to the target weight, the higher the score.
-            // 1000 is the 'heaviest' recognized weight
-            if (pattern.weight() == current.weight()) {
-                currentScore.score += 1000;
-            } else if (pattern.weight() <= 500) {
-                if (pattern.weight() >= 400 && pattern.weight() < 450) {
-                    if (current.weight() >= 450 && current.weight() <= 500) {
-                        // Artificially boost the 500 weight.
-                        // TODO: determine correct number to use.
-                        currentScore.score += 500;
-                    }
-                }
-                if (current.weight() <= pattern.weight()) {
-                    currentScore.score += 1000 - pattern.weight() + current.weight();
-                } else {
-                    currentScore.score += 1000 - current.weight();
-                }
-            } else if (pattern.weight() > 500) {
-                if (current.weight() > pattern.weight()) {
-                    currentScore.score += 1000 + pattern.weight() - current.weight();
-                } else {
-                    currentScore.score += current.weight();
-                }
-            }
-
-            if (currentScore.score > maxScore.score) {
-                maxScore = currentScore;
-            }
-        }
-
-        return this->createTypeface(maxScore.index);
+        return this->matchStyleCSS3(pattern);
     }
 private:
     SkAutoTUnref<const SkFontMgr_Indirect> fOwner;
@@ -170,19 +80,19 @@ void SkFontMgr_Indirect::onGetFamilyName(int index, SkString* familyName) const
 
 SkFontStyleSet* SkFontMgr_Indirect::onCreateStyleSet(int index) const {
     SkRemotableFontIdentitySet* set = fProxy->getIndex(index);
-    if (NULL == set) {
-        return NULL;
+    if (nullptr == set) {
+        return nullptr;
     }
-    return SkNEW_ARGS(SkStyleSet_Indirect, (this, index, set));
+    return new SkStyleSet_Indirect(this, index, set);
 }
 
 SkFontStyleSet* SkFontMgr_Indirect::onMatchFamily(const char familyName[]) const {
-    return SkNEW_ARGS(SkStyleSet_Indirect, (this, -1, fProxy->matchName(familyName)));
+    return new SkStyleSet_Indirect(this, -1, fProxy->matchName(familyName));
 }
 
 SkTypeface* SkFontMgr_Indirect::createTypefaceFromFontId(const SkFontIdentity& id) const {
     if (id.fDataId == SkFontIdentity::kInvalidDataId) {
-        return NULL;
+        return nullptr;
     }
 
     SkAutoMutexAcquire ama(fDataCacheMutex);
@@ -197,7 +107,7 @@ SkTypeface* SkFontMgr_Indirect::createTypefaceFromFontId(const SkFontIdentity& i
             {
                 return entry.fTypeface;
             }
-            if (dataTypeface.get() == NULL &&
+            if (dataTypeface.get() == nullptr &&
                 !entry.fTypeface->weak_expired() && entry.fTypeface->try_ref())
             {
                 dataTypeface.reset(entry.fTypeface);
@@ -212,22 +122,22 @@ SkTypeface* SkFontMgr_Indirect::createTypefaceFromFontId(const SkFontIdentity& i
     }
 
     // No exact match, but did find a data match.
-    if (dataTypeface.get() != NULL) {
-        SkAutoTUnref<SkStream> stream(dataTypeface->openStream(NULL));
-        if (stream.get() != NULL) {
-            return fImpl->createFromStream(stream.get(), dataTypefaceIndex);
+    if (dataTypeface.get() != nullptr) {
+        SkAutoTDelete<SkStreamAsset> stream(dataTypeface->openStream(nullptr));
+        if (stream.get() != nullptr) {
+            return fImpl->createFromStream(stream.detach(), dataTypefaceIndex);
         }
     }
 
     // No data match, request data and add entry.
-    SkAutoTUnref<SkStreamAsset> stream(fProxy->getData(id.fDataId));
-    if (stream.get() == NULL) {
-        return NULL;
+    SkAutoTDelete<SkStreamAsset> stream(fProxy->getData(id.fDataId));
+    if (stream.get() == nullptr) {
+        return nullptr;
     }
 
-    SkAutoTUnref<SkTypeface> typeface(fImpl->createFromStream(stream, id.fTtcIndex));
-    if (typeface.get() == NULL) {
-        return NULL;
+    SkAutoTUnref<SkTypeface> typeface(fImpl->createFromStream(stream.detach(), id.fTtcIndex));
+    if (typeface.get() == nullptr) {
+        return nullptr;
     }
 
     DataEntry& newEntry = fDataCache.push_back();
@@ -247,9 +157,11 @@ SkTypeface* SkFontMgr_Indirect::onMatchFamilyStyle(const char familyName[],
 
 SkTypeface* SkFontMgr_Indirect::onMatchFamilyStyleCharacter(const char familyName[],
                                                             const SkFontStyle& style,
-                                                            const char bpc47[],
-                                                            uint32_t character) const {
-    SkFontIdentity id = fProxy->matchNameStyleCharacter(familyName, style, bpc47, character);
+                                                            const char* bcp47[],
+                                                            int bcp47Count,
+                                                            SkUnichar character) const {
+    SkFontIdentity id = fProxy->matchNameStyleCharacter(familyName, style, bcp47,
+                                                        bcp47Count, character);
     return this->createTypefaceFromFontId(id);
 }
 
@@ -260,7 +172,7 @@ SkTypeface* SkFontMgr_Indirect::onMatchFaceStyle(const SkTypeface* familyMember,
     return this->matchFamilyStyle(familyName.c_str(), fontStyle);
 }
 
-SkTypeface* SkFontMgr_Indirect::onCreateFromStream(SkStream* stream, int ttcIndex) const {
+SkTypeface* SkFontMgr_Indirect::onCreateFromStream(SkStreamAsset* stream, int ttcIndex) const {
     return fImpl->createFromStream(stream, ttcIndex);
 }
 
@@ -284,11 +196,11 @@ SkTypeface* SkFontMgr_Indirect::onLegacyCreateTypeface(const char familyName[],
 
     SkAutoTUnref<SkTypeface> face(this->matchFamilyStyle(familyName, style));
 
-    if (NULL == face.get()) {
-        face.reset(this->matchFamilyStyle(NULL, style));
+    if (nullptr == face.get()) {
+        face.reset(this->matchFamilyStyle(nullptr, style));
     }
 
-    if (NULL == face.get()) {
+    if (nullptr == face.get()) {
         SkFontIdentity fontId = this->fProxy->matchIndexStyle(0, style);
         face.reset(this->createTypefaceFromFontId(fontId));
     }
diff --git a/gfx/skia/skia/src/fonts/SkGScalerContext.cpp b/gfx/skia/skia/src/fonts/SkGScalerContext.cpp
index e543fdbd0a39..d2d0cacd0e1d 100644
--- a/gfx/skia/skia/src/fonts/SkGScalerContext.cpp
+++ b/gfx/skia/skia/src/fonts/SkGScalerContext.cpp
@@ -16,13 +16,13 @@ public:
     virtual ~SkGScalerContext();
 
 protected:
-    virtual unsigned generateGlyphCount() SK_OVERRIDE;
-    virtual uint16_t generateCharToGlyph(SkUnichar) SK_OVERRIDE;
-    virtual void generateAdvance(SkGlyph*) SK_OVERRIDE;
-    virtual void generateMetrics(SkGlyph*) SK_OVERRIDE;
-    virtual void generateImage(const SkGlyph&) SK_OVERRIDE;
-    virtual void generatePath(const SkGlyph&, SkPath*) SK_OVERRIDE;
-    virtual void generateFontMetrics(SkPaint::FontMetrics*) SK_OVERRIDE;
+    unsigned generateGlyphCount() override;
+    uint16_t generateCharToGlyph(SkUnichar) override;
+    void generateAdvance(SkGlyph*) override;
+    void generateMetrics(SkGlyph*) override;
+    void generateImage(const SkGlyph&) override;
+    void generatePath(const SkGlyph&, SkPath*) override;
+    void generateFontMetrics(SkPaint::FontMetrics*) override;
 
 private:
     SkGTypeface*     fFace;
@@ -63,9 +63,7 @@ SkGScalerContext::SkGScalerContext(SkGTypeface* face, const SkDescriptor* desc)
     fMatrix.preScale(SK_Scalar1 / STD_SIZE, SK_Scalar1 / STD_SIZE);
 }
 
-SkGScalerContext::~SkGScalerContext() {
-    SkDELETE(fProxy);
-}
+SkGScalerContext::~SkGScalerContext() { delete fProxy; }
 
 unsigned SkGScalerContext::generateGlyphCount() {
     return fProxy->getGlyphCount();
@@ -158,7 +156,7 @@ void SkGScalerContext::generateFontMetrics(SkPaint::FontMetrics* metrics) {
 #include "SkTypefaceCache.h"
 
 SkGTypeface::SkGTypeface(SkTypeface* proxy, const SkPaint& paint)
-    : SkTypeface(proxy->style(), SkTypefaceCache::NewFontID(), false)
+    : SkTypeface(proxy->fontStyle(), SkTypefaceCache::NewFontID(), false)
     , fProxy(SkRef(proxy))
     , fPaint(paint) {}
 
@@ -168,7 +166,7 @@ SkGTypeface::~SkGTypeface() {
 
 SkScalerContext* SkGTypeface::onCreateScalerContext(
                                             const SkDescriptor* desc) const {
-    return SkNEW_ARGS(SkGScalerContext, (const_cast<SkGTypeface*>(this), desc));
+    return new SkGScalerContext(const_cast<SkGTypeface*>(this), desc);
 }
 
 void SkGTypeface::onFilterRec(SkScalerContextRec* rec) const {
@@ -178,13 +176,13 @@ void SkGTypeface::onFilterRec(SkScalerContextRec* rec) const {
 }
 
 SkAdvancedTypefaceMetrics* SkGTypeface::onGetAdvancedTypefaceMetrics(
-                                SkAdvancedTypefaceMetrics::PerGlyphInfo info,
+                                PerGlyphInfo info,
                                 const uint32_t* glyphIDs,
                                 uint32_t glyphIDsCount) const {
     return fProxy->getAdvancedTypefaceMetrics(info, glyphIDs, glyphIDsCount);
 }
 
-SkStream* SkGTypeface::onOpenStream(int* ttcIndex) const {
+SkStreamAsset* SkGTypeface::onOpenStream(int* ttcIndex) const {
     return fProxy->openStream(ttcIndex);
 }
 
@@ -206,6 +204,10 @@ int SkGTypeface::onGetUPEM() const {
     return fProxy->getUnitsPerEm();
 }
 
+void SkGTypeface::onGetFamilyName(SkString* familyName) const {
+    fProxy->getFamilyName(familyName);
+}
+
 SkTypeface::LocalizedStrings* SkGTypeface::onCreateFamilyNameIterator() const {
     return fProxy->createFamilyNameIterator();
 }
diff --git a/gfx/skia/skia/src/fonts/SkGScalerContext.h b/gfx/skia/skia/src/fonts/SkGScalerContext.h
index faca50ed6b1b..75f3ebedbdea 100644
--- a/gfx/skia/skia/src/fonts/SkGScalerContext.h
+++ b/gfx/skia/skia/src/fonts/SkGScalerContext.h
@@ -20,25 +20,26 @@ public:
     const SkPaint& paint() const { return fPaint; }
 
 protected:
-    virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE;
-    virtual void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE;
-    virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
-                                    SkAdvancedTypefaceMetrics::PerGlyphInfo,
-                                    const uint32_t* glyphIDs,
-                                    uint32_t glyphIDsCount) const SK_OVERRIDE;
-    virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE;
-    virtual void onGetFontDescriptor(SkFontDescriptor*, bool* isLocal) const SK_OVERRIDE;
+    SkScalerContext* onCreateScalerContext(const SkDescriptor*) const override;
+    void onFilterRec(SkScalerContextRec*) const override;
+    SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
+        PerGlyphInfo,
+        const uint32_t* glyphIDs,
+        uint32_t glyphIDsCount) const override;
+    SkStreamAsset* onOpenStream(int* ttcIndex) const override;
+    void onGetFontDescriptor(SkFontDescriptor*, bool* isLocal) const override;
 
-    virtual int onCharsToGlyphs(const void* chars, Encoding encoding,
-                                uint16_t glyphs[], int glyphCount) const SK_OVERRIDE;
-    virtual int onCountGlyphs() const SK_OVERRIDE;
-    virtual int onGetUPEM() const SK_OVERRIDE;
+    int onCharsToGlyphs(const void* chars, Encoding encoding,
+                        uint16_t glyphs[], int glyphCount) const override;
+    int onCountGlyphs() const override;
+    int onGetUPEM() const override;
 
-    virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE;
+    void onGetFamilyName(SkString* familyName) const override;
+    SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override;
 
-    virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE;
-    virtual size_t onGetTableData(SkFontTableTag, size_t offset,
-                                  size_t length, void* data) const SK_OVERRIDE;
+    int onGetTableTags(SkFontTableTag tags[]) const override;
+    size_t onGetTableData(SkFontTableTag, size_t offset,
+                          size_t length, void* data) const override;
 
 private:
     SkTypeface* fProxy;
diff --git a/gfx/skia/skia/src/fonts/SkRandomScalerContext.cpp b/gfx/skia/skia/src/fonts/SkRandomScalerContext.cpp
new file mode 100644
index 000000000000..1f6fbe041ef0
--- /dev/null
+++ b/gfx/skia/skia/src/fonts/SkRandomScalerContext.cpp
@@ -0,0 +1,256 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkRandomScalerContext.h"
+#include "SkGlyph.h"
+#include "SkPath.h"
+#include "SkCanvas.h"
+#include "SkRasterizer.h"
+
+class SkRandomScalerContext : public SkScalerContext {
+public:
+    SkRandomScalerContext(SkRandomTypeface*, const SkDescriptor*, bool fFakeIt);
+    virtual ~SkRandomScalerContext();
+
+protected:
+    unsigned generateGlyphCount() override;
+    uint16_t generateCharToGlyph(SkUnichar) override;
+    void generateAdvance(SkGlyph*) override;
+    void generateMetrics(SkGlyph*) override;
+    void generateImage(const SkGlyph&) override;
+    void generatePath(const SkGlyph&, SkPath*) override;
+    void generateFontMetrics(SkPaint::FontMetrics*) override;
+
+private:
+    SkRandomTypeface*     fFace;
+    SkScalerContext* fProxy;
+    bool fFakeIt;
+};
+
+#define STD_SIZE    1
+
+#include "SkDescriptor.h"
+
+SkRandomScalerContext::SkRandomScalerContext(SkRandomTypeface* face, const SkDescriptor* desc,
+                                             bool fakeIt)
+        : SkScalerContext(face, desc)
+        , fFace(face)
+        , fFakeIt(fakeIt) {
+    fProxy = face->proxy()->createScalerContext(desc);
+}
+
+SkRandomScalerContext::~SkRandomScalerContext() { delete fProxy; }
+
+unsigned SkRandomScalerContext::generateGlyphCount() {
+    return fProxy->getGlyphCount();
+}
+
+uint16_t SkRandomScalerContext::generateCharToGlyph(SkUnichar uni) {
+    return fProxy->charToGlyphID(uni);
+}
+
+void SkRandomScalerContext::generateAdvance(SkGlyph* glyph) {
+    fProxy->getAdvance(glyph);
+}
+
+void SkRandomScalerContext::generateMetrics(SkGlyph* glyph) {
+    // Here we will change the mask format of the glyph
+    // NOTE this is being overridden by the base class
+    SkMask::Format format;
+    switch (glyph->getGlyphID() % 4) {
+        case 0:
+            format = SkMask::kLCD16_Format;
+            break;
+        case 1:
+            format = SkMask::kA8_Format;
+            break;
+        case 2:
+            format = SkMask::kARGB32_Format;
+            break;
+        case 3:
+            format = SkMask::kBW_Format;
+            break;
+    }
+
+    fProxy->getMetrics(glyph);
+
+    glyph->fMaskFormat = format;
+    if (fFakeIt) {
+        return;
+    }
+    if (SkMask::kARGB32_Format == format) {
+        SkPath path;
+        fProxy->getPath(*glyph, &path);
+
+        SkRect storage;
+        const SkPaint& paint = fFace->paint();
+        const SkRect& newBounds = paint.doComputeFastBounds(path.getBounds(),
+                                                            &storage,
+                                                            SkPaint::kFill_Style);
+        SkIRect ibounds;
+        newBounds.roundOut(&ibounds);
+        glyph->fLeft = ibounds.fLeft;
+        glyph->fTop = ibounds.fTop;
+        glyph->fWidth = ibounds.width();
+        glyph->fHeight = ibounds.height();
+    } else {
+        SkPath      devPath, fillPath;
+        SkMatrix    fillToDevMatrix;
+
+        this->internalGetPath(*glyph, &fillPath, &devPath, &fillToDevMatrix);
+
+        // just use devPath
+        const SkIRect ir = devPath.getBounds().roundOut();
+
+        if (ir.isEmpty() || !ir.is16Bit()) {
+            glyph->fLeft    = 0;
+            glyph->fTop     = 0;
+            glyph->fWidth   = 0;
+            glyph->fHeight  = 0;
+            return;
+        }
+        glyph->fLeft    = ir.fLeft;
+        glyph->fTop     = ir.fTop;
+        glyph->fWidth   = SkToU16(ir.width());
+        glyph->fHeight  = SkToU16(ir.height());
+
+        if (glyph->fWidth > 0) {
+            switch (glyph->fMaskFormat) {
+            case SkMask::kLCD16_Format:
+                glyph->fWidth += 2;
+                glyph->fLeft -= 1;
+                break;
+            default:
+                break;
+            }
+        }
+    }
+}
+
+void SkRandomScalerContext::generateImage(const SkGlyph& glyph) {
+    SkMask::Format format = (SkMask::Format)glyph.fMaskFormat;
+    switch (glyph.getGlyphID() % 4) {
+        case 0:
+            format = SkMask::kLCD16_Format;
+            break;
+        case 1:
+            format = SkMask::kA8_Format;
+            break;
+        case 2:
+            format = SkMask::kARGB32_Format;
+            break;
+        case 3:
+            format = SkMask::kBW_Format;
+            break;
+    }
+    const_cast<SkGlyph&>(glyph).fMaskFormat = format;
+
+    // if the format is ARGB, we just draw the glyph from path ourselves.  Otherwise, we force
+    // our proxy context to generate the image from paths.
+    if (!fFakeIt) {
+        if (SkMask::kARGB32_Format == glyph.fMaskFormat) {
+            SkPath path;
+            fProxy->getPath(glyph, &path);
+
+            SkBitmap bm;
+            bm.installPixels(SkImageInfo::MakeN32Premul(glyph.fWidth, glyph.fHeight),
+                             glyph.fImage, glyph.rowBytes());
+            bm.eraseColor(0);
+
+            SkCanvas canvas(bm);
+            canvas.translate(-SkIntToScalar(glyph.fLeft),
+                             -SkIntToScalar(glyph.fTop));
+            canvas.drawPath(path, fFace->paint());
+        } else {
+            fProxy->forceGenerateImageFromPath();
+            fProxy->getImage(glyph);
+            fProxy->forceOffGenerateImageFromPath();
+        }
+    } else {
+        sk_bzero(glyph.fImage, glyph.computeImageSize());
+    }
+}
+
+void SkRandomScalerContext::generatePath(const SkGlyph& glyph, SkPath* path) {
+    fProxy->getPath(glyph, path);
+}
+
+void SkRandomScalerContext::generateFontMetrics(SkPaint::FontMetrics* metrics) {
+    fProxy->getFontMetrics(metrics);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+#include "SkTypefaceCache.h"
+
+SkRandomTypeface::SkRandomTypeface(SkTypeface* proxy, const SkPaint& paint, bool fakeIt)
+    : SkTypeface(proxy->fontStyle(), SkTypefaceCache::NewFontID(), false)
+    , fProxy(SkRef(proxy))
+    , fPaint(paint)
+    , fFakeIt(fakeIt) {}
+
+SkRandomTypeface::~SkRandomTypeface() {
+    fProxy->unref();
+}
+
+SkScalerContext* SkRandomTypeface::onCreateScalerContext(
+                                            const SkDescriptor* desc) const {
+    return new SkRandomScalerContext(const_cast<SkRandomTypeface*>(this), desc, fFakeIt);
+}
+
+void SkRandomTypeface::onFilterRec(SkScalerContextRec* rec) const {
+    fProxy->filterRec(rec);
+    rec->setHinting(SkPaint::kNo_Hinting);
+    rec->fMaskFormat = SkMask::kARGB32_Format;
+}
+
+SkAdvancedTypefaceMetrics* SkRandomTypeface::onGetAdvancedTypefaceMetrics(
+                                PerGlyphInfo info,
+                                const uint32_t* glyphIDs,
+                                uint32_t glyphIDsCount) const {
+    return fProxy->getAdvancedTypefaceMetrics(info, glyphIDs, glyphIDsCount);
+}
+
+SkStreamAsset* SkRandomTypeface::onOpenStream(int* ttcIndex) const {
+    return fProxy->openStream(ttcIndex);
+}
+
+void SkRandomTypeface::onGetFontDescriptor(SkFontDescriptor* desc,
+                                      bool* isLocal) const {
+    fProxy->getFontDescriptor(desc, isLocal);
+}
+
+int SkRandomTypeface::onCharsToGlyphs(const void* chars, Encoding encoding,
+                                 uint16_t glyphs[], int glyphCount) const {
+    return fProxy->charsToGlyphs(chars, encoding, glyphs, glyphCount);
+}
+
+int SkRandomTypeface::onCountGlyphs() const {
+    return fProxy->countGlyphs();
+}
+
+int SkRandomTypeface::onGetUPEM() const {
+    return fProxy->getUnitsPerEm();
+}
+
+void SkRandomTypeface::onGetFamilyName(SkString* familyName) const {
+    fProxy->getFamilyName(familyName);
+}
+
+SkTypeface::LocalizedStrings* SkRandomTypeface::onCreateFamilyNameIterator() const {
+    return fProxy->createFamilyNameIterator();
+}
+
+int SkRandomTypeface::onGetTableTags(SkFontTableTag tags[]) const {
+    return fProxy->getTableTags(tags);
+}
+
+size_t SkRandomTypeface::onGetTableData(SkFontTableTag tag, size_t offset,
+                                    size_t length, void* data) const {
+    return fProxy->getTableData(tag, offset, length, data);
+}
+
diff --git a/gfx/skia/skia/src/fonts/SkRandomScalerContext.h b/gfx/skia/skia/src/fonts/SkRandomScalerContext.h
new file mode 100644
index 000000000000..24b203f05c71
--- /dev/null
+++ b/gfx/skia/skia/src/fonts/SkRandomScalerContext.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkRandomScalerContext_DEFINED
+#define SkRandomScalerContext_DEFINED
+
+#include "SkScalerContext.h"
+#include "SkTypeface.h"
+
+/*
+ * This scaler context is for debug only purposes.  It will 'randomly' but deterministically return
+ * LCD / A8 / BW / RBGA masks based off of the Glyph ID
+ */
+
+class SkRandomTypeface : public SkTypeface {
+public:
+    SkRandomTypeface(SkTypeface* proxy, const SkPaint&, bool fakeit);
+    virtual ~SkRandomTypeface();
+
+    SkTypeface* proxy() const { return fProxy; }
+    const SkPaint& paint() const { return fPaint; }
+
+protected:
+    SkScalerContext* onCreateScalerContext(const SkDescriptor*) const override;
+    void onFilterRec(SkScalerContextRec*) const override;
+    SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
+        PerGlyphInfo,
+        const uint32_t* glyphIDs,
+        uint32_t glyphIDsCount) const override;
+    SkStreamAsset* onOpenStream(int* ttcIndex) const override;
+    void onGetFontDescriptor(SkFontDescriptor*, bool* isLocal) const override;
+
+    int onCharsToGlyphs(const void* chars, Encoding encoding,
+                        uint16_t glyphs[], int glyphCount) const override;
+    int onCountGlyphs() const override;
+    int onGetUPEM() const override;
+
+    void onGetFamilyName(SkString* familyName) const override;
+    SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override;
+
+    int onGetTableTags(SkFontTableTag tags[]) const override;
+    size_t onGetTableData(SkFontTableTag, size_t offset,
+                          size_t length, void* data) const override;
+
+private:
+    SkTypeface* fProxy;
+    SkPaint     fPaint;
+    bool        fFakeIt;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/fonts/SkRemotableFontMgr.cpp b/gfx/skia/skia/src/fonts/SkRemotableFontMgr.cpp
index 633e91458bbb..41e3bc3235b6 100644
--- a/gfx/skia/skia/src/fonts/SkRemotableFontMgr.cpp
+++ b/gfx/skia/skia/src/fonts/SkRemotableFontMgr.cpp
@@ -5,10 +5,9 @@
  * found in the LICENSE file.
  */
 
+#include "SkOncePtr.h"
 #include "SkRemotableFontMgr.h"
 
-#include "SkLazyPtr.h"
-
 SkRemotableFontIdentitySet::SkRemotableFontIdentitySet(int count, SkFontIdentity** data)
       : fCount(count), fData(count)
 {
@@ -16,11 +15,7 @@ SkRemotableFontIdentitySet::SkRemotableFontIdentitySet(int count, SkFontIdentity
     *data = fData;
 }
 
-SkRemotableFontIdentitySet* SkRemotableFontIdentitySet::NewEmptyImpl() {
-    return SkNEW(SkRemotableFontIdentitySet);
-}
-
+SK_DECLARE_STATIC_ONCE_PTR(SkRemotableFontIdentitySet, empty);
 SkRemotableFontIdentitySet* SkRemotableFontIdentitySet::NewEmpty() {
-    SK_DECLARE_STATIC_LAZY_PTR(SkRemotableFontIdentitySet, empty, NewEmptyImpl);
-    return SkRef(empty.get());
+    return SkRef(empty.get([]{ return new SkRemotableFontIdentitySet; }));
 }
diff --git a/gfx/skia/skia/src/fonts/SkTestScalerContext.cpp b/gfx/skia/skia/src/fonts/SkTestScalerContext.cpp
index 7d311cdbc0d9..7afe6521a3ab 100644
--- a/gfx/skia/skia/src/fonts/SkTestScalerContext.cpp
+++ b/gfx/skia/skia/src/fonts/SkTestScalerContext.cpp
@@ -5,9 +5,11 @@
  * found in the LICENSE file.
  */
 
+#include "SkAdvancedTypefaceMetrics.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkDescriptor.h"
+#include "SkFontDescriptor.h"
 #include "SkGlyph.h"
 #include "SkMask.h"
 // #include "SkOTUtils.h"
@@ -15,126 +17,166 @@
 #include "SkTestScalerContext.h"
 #include "SkTypefaceCache.h"
 
-class SkTestTypeface : public SkTypeface {
-public:
-    SkTestTypeface(SkPaint::FontMetrics (*funct)(SkTDArray<SkPath*>& , SkTDArray<SkFixed>& ),
-                   SkTypeface::Style style) 
-        : SkTypeface(style, SkTypefaceCache::NewFontID(), false) {
-        fMetrics = (*funct)(fPaths, fWidths);
+SkTestFont::SkTestFont(const SkTestFontData& fontData)
+    : INHERITED()
+    , fCharCodes(fontData.fCharCodes)
+    , fCharCodesCount(fontData.fCharCodesCount)
+    , fWidths(fontData.fWidths)
+    , fMetrics(fontData.fMetrics)
+    , fName(fontData.fName)
+    , fPaths(nullptr)
+{
+    init(fontData.fPoints, fontData.fVerbs);
+#ifdef SK_DEBUG
+    sk_bzero(fDebugBits, sizeof(fDebugBits));
+    sk_bzero(fDebugOverage, sizeof(fDebugOverage));
+#endif
+}
+
+SkTestFont::~SkTestFont() {
+    for (unsigned index = 0; index < fCharCodesCount; ++index) {
+        delete fPaths[index];
     }
+    delete[] fPaths;
+}
 
-    virtual ~SkTestTypeface() {
-        fPaths.deleteAll();
-    }
+#ifdef SK_DEBUG
 
-    void getAdvance(SkGlyph* glyph) {
-        glyph->fAdvanceX = fWidths[SkGlyph::ID2Code(glyph->fID)];
-        glyph->fAdvanceY = 0;
-    }
+#include "SkMutex.h"
+SK_DECLARE_STATIC_MUTEX(gUsedCharsMutex);
 
-    void getFontMetrics(SkPaint::FontMetrics* metrics) {
-        *metrics = fMetrics;
-    }
+#endif
 
-    void getMetrics(SkGlyph* glyph) {
-        glyph->fAdvanceX = fWidths[SkGlyph::ID2Code(glyph->fID)];
-        glyph->fAdvanceY = 0;
-    }
-
-    void getPath(const SkGlyph& glyph, SkPath* path) {
-        *path = *fPaths[SkGlyph::ID2Code(glyph.fID)];
-    }
-
-protected:
-    virtual SkScalerContext* onCreateScalerContext(const SkDescriptor* desc) const SK_OVERRIDE;
-
-    virtual void onFilterRec(SkScalerContextRec* rec) const SK_OVERRIDE {
-        rec->setHinting(SkPaint::kNo_Hinting);
-        rec->fMaskFormat = SkMask::kA8_Format;
-    }
-
-    virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
-                                    SkAdvancedTypefaceMetrics::PerGlyphInfo ,
-                                    const uint32_t* glyphIDs,
-                                    uint32_t glyphIDsCount) const SK_OVERRIDE {
-    // pdf only
-        SkAdvancedTypefaceMetrics* info = new SkAdvancedTypefaceMetrics;
-        info->fEmSize = 0;
-        info->fLastGlyphID = SkToU16(onCountGlyphs() - 1);
-        info->fStyle = 0;
-        info->fFontName.set("SkiaTest");
-        info->fType = SkAdvancedTypefaceMetrics::kOther_Font;
-        info->fItalicAngle = 0;
-        info->fAscent = 0;
-        info->fDescent = 0;
-        info->fStemV = 0;
-        info->fCapHeight = 0;
-        info->fBBox = SkIRect::MakeEmpty();
-        return info;
-    }
-
-    virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE {
-        SkASSERT(0);  // don't expect to get here
-        return NULL;
-    }
-
-    virtual void onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const SK_OVERRIDE {
-        SkASSERT(0);  // don't expect to get here
-    }
-
-    virtual int onCharsToGlyphs(const void* chars, Encoding encoding,
-                                uint16_t glyphs[], int glyphCount) const SK_OVERRIDE {
-        SkASSERT(encoding == kUTF8_Encoding);
-        for (int index = 0; index < glyphCount; ++index) {
-            int ch = ((unsigned char*) chars)[index];
-            SkASSERT(ch < 0x7F);
-            if (ch < 0x20) {
-                glyphs[index] = 0;
-            } else {
-                glyphs[index] = ch - 0x20;
+int SkTestFont::codeToIndex(SkUnichar charCode) const {
+#ifdef SK_DEBUG  // detect missing test font data
+    {
+        SkAutoMutexAcquire ac(gUsedCharsMutex);
+        if (charCode >= ' ' && charCode <= '~') {
+            int bitOffset = charCode - ' ';
+            fDebugBits[bitOffset >> 3] |= 1 << (bitOffset & 7);
+        } else {
+            int index = 0;
+            while (fDebugOverage[index] != 0 && fDebugOverage[index] != charCode
+                    && index < (int) sizeof(fDebugOverage)) {
+                ++index;
+            }
+            SkASSERT(index < (int) sizeof(fDebugOverage));
+            if (fDebugOverage[index] == 0) {
+                fDebugOverage[index] = charCode;
             }
         }
-        return glyphCount;
     }
-
-    virtual int onCountGlyphs() const SK_OVERRIDE {
-        return fPaths.count();
+#endif
+    for (unsigned index = 0; index < fCharCodesCount; ++index) {
+        if (fCharCodes[index] == (unsigned) charCode) {
+            return (int) index;
+        }
     }
+    SkDEBUGF(("missing '%c' (%d) from %s %d\n", (char) charCode, charCode,
+            fDebugName, fDebugStyle));
+    return 0;
+}
 
-    virtual int onGetUPEM() const SK_OVERRIDE {
-        SkASSERT(0);  // don't expect to get here
-        return 1;
+void SkTestFont::init(const SkScalar* pts, const unsigned char* verbs) {
+    fPaths = new SkPath* [fCharCodesCount];
+    for (unsigned index = 0; index < fCharCodesCount; ++index) {
+        SkPath* path = new SkPath;
+        SkPath::Verb verb;
+        while ((verb = (SkPath::Verb) *verbs++) != SkPath::kDone_Verb) {
+            switch (verb) {
+                case SkPath::kMove_Verb:
+                    path->moveTo(pts[0], pts[1]);
+                    pts += 2;
+                    break;
+                case SkPath::kLine_Verb:
+                    path->lineTo(pts[0], pts[1]);
+                    pts += 2;
+                    break;
+                case SkPath::kQuad_Verb:
+                    path->quadTo(pts[0], pts[1], pts[2], pts[3]);
+                    pts += 4;
+                    break;
+                case SkPath::kCubic_Verb:
+                    path->cubicTo(pts[0], pts[1], pts[2], pts[3], pts[4], pts[5]);
+                    pts += 6;
+                    break;
+                case SkPath::kClose_Verb:
+                    path->close();
+                    break;
+                default:
+                    SkDEBUGFAIL("bad verb");
+                    return;
+            }
+        }
+        // This should make SkPath::getBounds() queries threadsafe.
+        path->updateBoundsCache();
+        fPaths[index] = path;
     }
+}
 
-    virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE {
-        SkString familyName("SkiaTest");
-        SkString language("und"); //undetermined
-    SkASSERT(0);  // incomplete
-        return NULL;
-   //     return new SkOTUtils::LocalizedStrings_SingleName(familyName, language);
+SkTestTypeface::SkTestTypeface(SkTestFont* testFont, const SkFontStyle& style)
+    : SkTypeface(style, SkTypefaceCache::NewFontID(), false)
+    , fTestFont(testFont) {
+}
+
+void SkTestTypeface::getAdvance(SkGlyph* glyph) {
+    glyph->fAdvanceX = fTestFont->fWidths[glyph->getGlyphID()];
+    glyph->fAdvanceY = 0;
+}
+
+void SkTestTypeface::getFontMetrics(SkPaint::FontMetrics* metrics) {
+    *metrics = fTestFont->fMetrics;
+}
+
+void SkTestTypeface::getMetrics(SkGlyph* glyph) {
+    glyph->fAdvanceX = fTestFont->fWidths[glyph->getGlyphID()];
+    glyph->fAdvanceY = 0;
+}
+
+void SkTestTypeface::getPath(const SkGlyph& glyph, SkPath* path) {
+    *path = *fTestFont->fPaths[glyph.getGlyphID()];
+}
+
+void SkTestTypeface::onFilterRec(SkScalerContextRec* rec) const {
+    rec->setHinting(SkPaint::kNo_Hinting);
+}
+
+SkAdvancedTypefaceMetrics* SkTestTypeface::onGetAdvancedTypefaceMetrics(
+                                PerGlyphInfo ,
+                                const uint32_t* glyphIDs,
+                                uint32_t glyphIDsCount) const {
+// pdf only
+    SkAdvancedTypefaceMetrics* info = new SkAdvancedTypefaceMetrics;
+    info->fFontName.set(fTestFont->fName);
+    info->fLastGlyphID = SkToU16(onCountGlyphs() - 1);
+    return info;
+}
+
+void SkTestTypeface::onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const {
+    desc->setFamilyName(fTestFont->fName);
+    *isLocal = false;
+}
+
+int SkTestTypeface::onCharsToGlyphs(const void* chars, Encoding encoding,
+                            uint16_t glyphs[], int glyphCount) const {
+    SkASSERT(encoding == kUTF16_Encoding);
+    for (int index = 0; index < glyphCount; ++index) {
+        SkUnichar ch = ((SkUnichar*) chars)[index];
+        glyphs[index] = fTestFont->codeToIndex(ch);
     }
+    return glyphCount;
+}
 
-    virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE {
-        return 0;
-    }
+void SkTestTypeface::onGetFamilyName(SkString* familyName) const {
+    *familyName = fTestFont->fName;
+}
 
-    virtual size_t onGetTableData(SkFontTableTag tag, size_t offset,
-                                  size_t length, void* data) const SK_OVERRIDE {
-        return 0;
-    }
-
-private:
-    SkTDArray<SkPath* > fPaths;
-    SkTDArray<SkFixed> fWidths;
-    SkPaint::FontMetrics fMetrics;
-    friend class SkTestScalerContext;
-};
-
-SkTypeface* CreateTestTypeface(SkPaint::FontMetrics (*funct)(SkTDArray<SkPath*>& pathArray,
-                               SkTDArray<SkFixed>& widthArray),
-                               SkTypeface::Style style) {
-    SkTypeface* test = SkNEW_ARGS(SkTestTypeface, (funct, style));
-    return test;
+SkTypeface::LocalizedStrings* SkTestTypeface::onCreateFamilyNameIterator() const {
+    SkString familyName(fTestFont->fName);
+    SkString language("und"); //undetermined
+SkASSERT(0);  // incomplete
+    return nullptr;
+//     return new SkOTUtils::LocalizedStrings_SingleName(familyName, language);
 }
 
 class SkTestScalerContext : public SkScalerContext {
@@ -151,34 +193,30 @@ public:
     }
 
 protected:
-    virtual unsigned generateGlyphCount() SK_OVERRIDE {
+    unsigned generateGlyphCount() override {
         return fFace->onCountGlyphs();
     }
 
-    virtual uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE {
-        uint8_t ch = (uint8_t) uni;
-        SkASSERT(ch < 0x7f);
+    uint16_t generateCharToGlyph(SkUnichar uni) override {
         uint16_t glyph;
-        (void) fFace->onCharsToGlyphs((const void *) &ch, SkTypeface::kUTF8_Encoding, &glyph, 1);
+        (void) fFace->onCharsToGlyphs((const void *) &uni, SkTypeface::kUTF16_Encoding, &glyph, 1);
         return glyph;
     }
 
-    virtual void generateAdvance(SkGlyph* glyph) SK_OVERRIDE {
+    void generateAdvance(SkGlyph* glyph) override {
         fFace->getAdvance(glyph);
 
-        SkVector advance;
-        fMatrix.mapXY(SkFixedToScalar(glyph->fAdvanceX),
-                      SkFixedToScalar(glyph->fAdvanceY), &advance);
+        const SkVector advance = fMatrix.mapXY(SkFixedToScalar(glyph->fAdvanceX),
+                                               SkFixedToScalar(glyph->fAdvanceY));
         glyph->fAdvanceX = SkScalarToFixed(advance.fX);
         glyph->fAdvanceY = SkScalarToFixed(advance.fY);
     }
 
-    virtual void generateMetrics(SkGlyph* glyph) SK_OVERRIDE {
+    void generateMetrics(SkGlyph* glyph) override {
         fFace->getMetrics(glyph);
 
-        SkVector advance;
-        fMatrix.mapXY(SkFixedToScalar(glyph->fAdvanceX),
-                      SkFixedToScalar(glyph->fAdvanceY), &advance);
+        const SkVector advance = fMatrix.mapXY(SkFixedToScalar(glyph->fAdvanceX),
+                                               SkFixedToScalar(glyph->fAdvanceY));
         glyph->fAdvanceX = SkScalarToFixed(advance.fX);
         glyph->fAdvanceY = SkScalarToFixed(advance.fY);
 
@@ -197,10 +235,9 @@ protected:
         glyph->fTop = ibounds.fTop;
         glyph->fWidth = ibounds.width();
         glyph->fHeight = ibounds.height();
-        glyph->fMaskFormat = SkMask::kARGB32_Format;
     }
 
-    virtual void generateImage(const SkGlyph& glyph) SK_OVERRIDE {
+    void generateImage(const SkGlyph& glyph) override {
         SkPath path;
         fFace->getPath(glyph, &path);
 
@@ -218,12 +255,12 @@ protected:
         canvas.drawPath(path, paint);
     }
 
-    virtual void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE {
+    void generatePath(const SkGlyph& glyph, SkPath* path) override {
         fFace->getPath(glyph, path);
         path->transform(fMatrix);
     }
 
-    virtual void generateFontMetrics(SkPaint::FontMetrics* metrics) SK_OVERRIDE {
+    void generateFontMetrics(SkPaint::FontMetrics* metrics) override {
         fFace->getFontMetrics(metrics);
         if (metrics) {
             SkScalar scale = fMatrix.getScaleY();
@@ -245,5 +282,5 @@ private:
 };
 
 SkScalerContext* SkTestTypeface::onCreateScalerContext(const SkDescriptor* desc) const {
-    return SkNEW_ARGS(SkTestScalerContext, (const_cast<SkTestTypeface*>(this), desc));
+    return new SkTestScalerContext(const_cast<SkTestTypeface*>(this), desc);
 }
diff --git a/gfx/skia/skia/src/fonts/SkTestScalerContext.h b/gfx/skia/skia/src/fonts/SkTestScalerContext.h
index fa44defbfb96..fe5c8d6ffca0 100644
--- a/gfx/skia/skia/src/fonts/SkTestScalerContext.h
+++ b/gfx/skia/skia/src/fonts/SkTestScalerContext.h
@@ -10,11 +10,103 @@
 
 #include "SkPaint.h"
 #include "SkPath.h"
+#include "SkRefCnt.h"
 #include "SkTDArray.h"
 #include "SkTypeface.h"
 
-SkTypeface* CreateTestTypeface(SkPaint::FontMetrics (*funct)(SkTDArray<SkPath*>& pathArray,
-                               SkTDArray<SkFixed>& widthArray),
-                               SkTypeface::Style style);
+class SkTestFont;
+
+struct SkTestFontData {
+    const SkScalar* fPoints;
+    const unsigned char* fVerbs;
+    const unsigned* fCharCodes;
+    const size_t fCharCodesCount;
+    const SkFixed* fWidths;
+    const SkPaint::FontMetrics& fMetrics;
+    const char* fName;
+    SkTypeface::Style fStyle;
+    SkTestFont* fFontCache;
+};
+
+class SkTestFont : public SkRefCnt {
+public:
+    
+
+    SkTestFont(const SkTestFontData& );
+    virtual ~SkTestFont();
+    int codeToIndex(SkUnichar charCode) const;
+    void init(const SkScalar* pts, const unsigned char* verbs);
+#ifdef SK_DEBUG  // detect missing test font data
+    mutable unsigned char fDebugBits[16];
+    mutable SkUnichar fDebugOverage[8];
+    const char* fDebugName;
+    SkTypeface::Style fDebugStyle;
+    const char* debugFontName() const { return fName; }
+#endif
+private:
+    const unsigned* fCharCodes;
+    const size_t fCharCodesCount;
+    const SkFixed* fWidths;
+    const SkPaint::FontMetrics& fMetrics;
+    const char* fName;
+    SkPath** fPaths;
+    friend class SkTestTypeface;
+    typedef SkRefCnt INHERITED;
+};
+
+
+class SkTestTypeface : public SkTypeface {
+public:
+    SkTestTypeface(SkTestFont*, const SkFontStyle& style);
+    virtual ~SkTestTypeface() {
+        SkSafeUnref(fTestFont);
+    }
+    void getAdvance(SkGlyph* glyph);
+    void getFontMetrics(SkPaint::FontMetrics* metrics);
+    void getMetrics(SkGlyph* glyph);
+    void getPath(const SkGlyph& glyph, SkPath* path);
+protected:
+    SkScalerContext* onCreateScalerContext(const SkDescriptor* desc) const override;
+    void onFilterRec(SkScalerContextRec* rec) const override;
+    SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
+        PerGlyphInfo,
+        const uint32_t* glyphIDs,
+        uint32_t glyphIDsCount) const override;
+
+    SkStreamAsset* onOpenStream(int* ttcIndex) const override {
+        return nullptr;
+    }
+
+    void onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const override;
+
+    int onCharsToGlyphs(const void* chars, Encoding encoding,
+                        uint16_t glyphs[], int glyphCount) const override;
+
+    int onCountGlyphs() const override {
+        return (int) fTestFont->fCharCodesCount;
+    }
+
+    int onGetUPEM() const override {
+        SkASSERT(0);  // don't expect to get here
+        return 1;
+    }
+
+    void onGetFamilyName(SkString* familyName) const override;
+    SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override;
+
+    int onGetTableTags(SkFontTableTag tags[]) const override {
+        return 0;
+    }
+
+    size_t onGetTableData(SkFontTableTag tag, size_t offset,
+                          size_t length, void* data) const override {
+        return 0;
+    }
+private:
+    SkTestFont* fTestFont;
+    friend class SkTestScalerContext;
+};
+
+SkTypeface* CreateTestTypeface(const char* name, SkTypeface::Style style);
 
 #endif
diff --git a/gfx/skia/skia/src/gpu/GrAAConvexPathRenderer.cpp b/gfx/skia/skia/src/gpu/GrAAConvexPathRenderer.cpp
deleted file mode 100644
index afcb987b39e0..000000000000
--- a/gfx/skia/skia/src/gpu/GrAAConvexPathRenderer.cpp
+++ /dev/null
@@ -1,716 +0,0 @@
-
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrAAConvexPathRenderer.h"
-
-#include "GrContext.h"
-#include "GrDrawState.h"
-#include "GrDrawTargetCaps.h"
-#include "GrEffect.h"
-#include "GrPathUtils.h"
-#include "GrTBackendEffectFactory.h"
-#include "SkString.h"
-#include "SkStrokeRec.h"
-#include "SkTraceEvent.h"
-
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
-#include "gl/GrGLSL.h"
-#include "gl/GrGLVertexEffect.h"
-
-#include "effects/GrVertexEffect.h"
-
-GrAAConvexPathRenderer::GrAAConvexPathRenderer() {
-}
-
-struct Segment {
-    enum {
-        // These enum values are assumed in member functions below.
-        kLine = 0,
-        kQuad = 1,
-    } fType;
-
-    // line uses one pt, quad uses 2 pts
-    SkPoint fPts[2];
-    // normal to edge ending at each pt
-    SkVector fNorms[2];
-    // is the corner where the previous segment meets this segment
-    // sharp. If so, fMid is a normalized bisector facing outward.
-    SkVector fMid;
-
-    int countPoints() {
-        GR_STATIC_ASSERT(0 == kLine && 1 == kQuad);
-        return fType + 1;
-    }
-    const SkPoint& endPt() const {
-        GR_STATIC_ASSERT(0 == kLine && 1 == kQuad);
-        return fPts[fType];
-    };
-    const SkPoint& endNorm() const {
-        GR_STATIC_ASSERT(0 == kLine && 1 == kQuad);
-        return fNorms[fType];
-    };
-};
-
-typedef SkTArray<Segment, true> SegmentArray;
-
-static void center_of_mass(const SegmentArray& segments, SkPoint* c) {
-    SkScalar area = 0;
-    SkPoint center = {0, 0};
-    int count = segments.count();
-    SkPoint p0 = {0, 0};
-    if (count > 2) {
-        // We translate the polygon so that the first point is at the origin.
-        // This avoids some precision issues with small area polygons far away
-        // from the origin.
-        p0 = segments[0].endPt();
-        SkPoint pi;
-        SkPoint pj;
-        // the first and last iteration of the below loop would compute
-        // zeros since the starting / ending point is (0,0). So instead we start
-        // at i=1 and make the last iteration i=count-2.
-        pj = segments[1].endPt() - p0;
-        for (int i = 1; i < count - 1; ++i) {
-            pi = pj;
-            const SkPoint pj = segments[i + 1].endPt() - p0;
-
-            SkScalar t = SkScalarMul(pi.fX, pj.fY) - SkScalarMul(pj.fX, pi.fY);
-            area += t;
-            center.fX += (pi.fX + pj.fX) * t;
-            center.fY += (pi.fY + pj.fY) * t;
-
-        }
-    }
-    // If the poly has no area then we instead return the average of
-    // its points.
-    if (SkScalarNearlyZero(area)) {
-        SkPoint avg;
-        avg.set(0, 0);
-        for (int i = 0; i < count; ++i) {
-            const SkPoint& pt = segments[i].endPt();
-            avg.fX += pt.fX;
-            avg.fY += pt.fY;
-        }
-        SkScalar denom = SK_Scalar1 / count;
-        avg.scale(denom);
-        *c = avg;
-    } else {
-        area *= 3;
-        area = SkScalarDiv(SK_Scalar1, area);
-        center.fX = SkScalarMul(center.fX, area);
-        center.fY = SkScalarMul(center.fY, area);
-        // undo the translate of p0 to the origin.
-        *c = center + p0;
-    }
-    SkASSERT(!SkScalarIsNaN(c->fX) && !SkScalarIsNaN(c->fY));
-}
-
-static void compute_vectors(SegmentArray* segments,
-                            SkPoint* fanPt,
-                            SkPath::Direction dir,
-                            int* vCount,
-                            int* iCount) {
-    center_of_mass(*segments, fanPt);
-    int count = segments->count();
-
-    // Make the normals point towards the outside
-    SkPoint::Side normSide;
-    if (dir == SkPath::kCCW_Direction) {
-        normSide = SkPoint::kRight_Side;
-    } else {
-        normSide = SkPoint::kLeft_Side;
-    }
-
-    *vCount = 0;
-    *iCount = 0;
-    // compute normals at all points
-    for (int a = 0; a < count; ++a) {
-        Segment& sega = (*segments)[a];
-        int b = (a + 1) % count;
-        Segment& segb = (*segments)[b];
-
-        const SkPoint* prevPt = &sega.endPt();
-        int n = segb.countPoints();
-        for (int p = 0; p < n; ++p) {
-            segb.fNorms[p] = segb.fPts[p] - *prevPt;
-            segb.fNorms[p].normalize();
-            segb.fNorms[p].setOrthog(segb.fNorms[p], normSide);
-            prevPt = &segb.fPts[p];
-        }
-        if (Segment::kLine == segb.fType) {
-            *vCount += 5;
-            *iCount += 9;
-        } else {
-            *vCount += 6;
-            *iCount += 12;
-        }
-    }
-
-    // compute mid-vectors where segments meet. TODO: Detect shallow corners
-    // and leave out the wedges and close gaps by stitching segments together.
-    for (int a = 0; a < count; ++a) {
-        const Segment& sega = (*segments)[a];
-        int b = (a + 1) % count;
-        Segment& segb = (*segments)[b];
-        segb.fMid = segb.fNorms[0] + sega.endNorm();
-        segb.fMid.normalize();
-        // corner wedges
-        *vCount += 4;
-        *iCount += 6;
-    }
-}
-
-struct DegenerateTestData {
-    DegenerateTestData() { fStage = kInitial; }
-    bool isDegenerate() const { return kNonDegenerate != fStage; }
-    enum {
-        kInitial,
-        kPoint,
-        kLine,
-        kNonDegenerate
-    }           fStage;
-    SkPoint     fFirstPoint;
-    SkVector    fLineNormal;
-    SkScalar    fLineC;
-};
-
-static const SkScalar kClose = (SK_Scalar1 / 16);
-static const SkScalar kCloseSqd = SkScalarMul(kClose, kClose);
-
-static void update_degenerate_test(DegenerateTestData* data, const SkPoint& pt) {
-    switch (data->fStage) {
-        case DegenerateTestData::kInitial:
-            data->fFirstPoint = pt;
-            data->fStage = DegenerateTestData::kPoint;
-            break;
-        case DegenerateTestData::kPoint:
-            if (pt.distanceToSqd(data->fFirstPoint) > kCloseSqd) {
-                data->fLineNormal = pt - data->fFirstPoint;
-                data->fLineNormal.normalize();
-                data->fLineNormal.setOrthog(data->fLineNormal);
-                data->fLineC = -data->fLineNormal.dot(data->fFirstPoint);
-                data->fStage = DegenerateTestData::kLine;
-            }
-            break;
-        case DegenerateTestData::kLine:
-            if (SkScalarAbs(data->fLineNormal.dot(pt) + data->fLineC) > kClose) {
-                data->fStage = DegenerateTestData::kNonDegenerate;
-            }
-        case DegenerateTestData::kNonDegenerate:
-            break;
-        default:
-            SkFAIL("Unexpected degenerate test stage.");
-    }
-}
-
-static inline bool get_direction(const SkPath& path, const SkMatrix& m, SkPath::Direction* dir) {
-    if (!path.cheapComputeDirection(dir)) {
-        return false;
-    }
-    // check whether m reverses the orientation
-    SkASSERT(!m.hasPerspective());
-    SkScalar det2x2 = SkScalarMul(m.get(SkMatrix::kMScaleX), m.get(SkMatrix::kMScaleY)) -
-                      SkScalarMul(m.get(SkMatrix::kMSkewX), m.get(SkMatrix::kMSkewY));
-    if (det2x2 < 0) {
-        *dir = SkPath::OppositeDirection(*dir);
-    }
-    return true;
-}
-
-static inline void add_line_to_segment(const SkPoint& pt,
-                                       SegmentArray* segments,
-                                       SkRect* devBounds) {
-    segments->push_back();
-    segments->back().fType = Segment::kLine;
-    segments->back().fPts[0] = pt;
-    devBounds->growToInclude(pt.fX, pt.fY);
-}
-
-#ifdef SK_DEBUG
-static inline bool contains_inclusive(const SkRect& rect, const SkPoint& p) {
-    return p.fX >= rect.fLeft && p.fX <= rect.fRight && p.fY >= rect.fTop && p.fY <= rect.fBottom;
-}
-#endif
-
-static inline void add_quad_segment(const SkPoint pts[3],
-                                    SegmentArray* segments,
-                                    SkRect* devBounds) {
-    if (pts[0].distanceToSqd(pts[1]) < kCloseSqd || pts[1].distanceToSqd(pts[2]) < kCloseSqd) {
-        if (pts[0] != pts[2]) {
-            add_line_to_segment(pts[2], segments, devBounds);
-        }
-    } else {
-        segments->push_back();
-        segments->back().fType = Segment::kQuad;
-        segments->back().fPts[0] = pts[1];
-        segments->back().fPts[1] = pts[2];
-        SkASSERT(contains_inclusive(*devBounds, pts[0]));
-        devBounds->growToInclude(pts + 1, 2);
-    }
-}
-
-static inline void add_cubic_segments(const SkPoint pts[4],
-                                      SkPath::Direction dir,
-                                      SegmentArray* segments,
-                                      SkRect* devBounds) {
-    SkSTArray<15, SkPoint, true> quads;
-    GrPathUtils::convertCubicToQuads(pts, SK_Scalar1, true, dir, &quads);
-    int count = quads.count();
-    for (int q = 0; q < count; q += 3) {
-        add_quad_segment(&quads[q], segments, devBounds);
-    }
-}
-
-static bool get_segments(const SkPath& path,
-                         const SkMatrix& m,
-                         SegmentArray* segments,
-                         SkPoint* fanPt,
-                         int* vCount,
-                         int* iCount,
-                         SkRect* devBounds) {
-    SkPath::Iter iter(path, true);
-    // This renderer over-emphasizes very thin path regions. We use the distance
-    // to the path from the sample to compute coverage. Every pixel intersected
-    // by the path will be hit and the maximum distance is sqrt(2)/2. We don't
-    // notice that the sample may be close to a very thin area of the path and
-    // thus should be very light. This is particularly egregious for degenerate
-    // line paths. We detect paths that are very close to a line (zero area) and
-    // draw nothing.
-    DegenerateTestData degenerateData;
-    SkPath::Direction dir;
-    // get_direction can fail for some degenerate paths.
-    if (!get_direction(path, m, &dir)) {
-        return false;
-    }
-
-    for (;;) {
-        SkPoint pts[4];
-        SkPath::Verb verb = iter.next(pts);
-        switch (verb) {
-            case SkPath::kMove_Verb:
-                m.mapPoints(pts, 1);
-                update_degenerate_test(&degenerateData, pts[0]);
-                devBounds->set(pts->fX, pts->fY, pts->fX, pts->fY);
-                break;
-            case SkPath::kLine_Verb: {
-                m.mapPoints(&pts[1], 1);
-                update_degenerate_test(&degenerateData, pts[1]);
-                add_line_to_segment(pts[1], segments, devBounds);
-                break;
-            }
-            case SkPath::kQuad_Verb:
-                m.mapPoints(pts, 3);
-                update_degenerate_test(&degenerateData, pts[1]);
-                update_degenerate_test(&degenerateData, pts[2]);
-                add_quad_segment(pts, segments, devBounds);
-                break;
-            case SkPath::kCubic_Verb: {
-                m.mapPoints(pts, 4);
-                update_degenerate_test(&degenerateData, pts[1]);
-                update_degenerate_test(&degenerateData, pts[2]);
-                update_degenerate_test(&degenerateData, pts[3]);
-                add_cubic_segments(pts, dir, segments, devBounds);
-                break;
-            };
-            case SkPath::kDone_Verb:
-                if (degenerateData.isDegenerate()) {
-                    return false;
-                } else {
-                    compute_vectors(segments, fanPt, dir, vCount, iCount);
-                    return true;
-                }
-            default:
-                break;
-        }
-    }
-}
-
-struct QuadVertex {
-    SkPoint  fPos;
-    SkPoint  fUV;
-    SkScalar fD0;
-    SkScalar fD1;
-};
-
-struct Draw {
-    Draw() : fVertexCnt(0), fIndexCnt(0) {}
-    int fVertexCnt;
-    int fIndexCnt;
-};
-
-typedef SkTArray<Draw, true> DrawArray;
-
-static void create_vertices(const SegmentArray&  segments,
-                            const SkPoint& fanPt,
-                            DrawArray*     draws,
-                            QuadVertex*    verts,
-                            uint16_t*      idxs) {
-    Draw* draw = &draws->push_back();
-    // alias just to make vert/index assignments easier to read.
-    int* v = &draw->fVertexCnt;
-    int* i = &draw->fIndexCnt;
-
-    int count = segments.count();
-    for (int a = 0; a < count; ++a) {
-        const Segment& sega = segments[a];
-        int b = (a + 1) % count;
-        const Segment& segb = segments[b];
-
-        // Check whether adding the verts for this segment to the current draw would cause index
-        // values to overflow.
-        int vCount = 4;
-        if (Segment::kLine == segb.fType) {
-            vCount += 5;
-        } else {
-            vCount += 6;
-        }
-        if (draw->fVertexCnt + vCount > (1 << 16)) {
-            verts += *v;
-            idxs += *i;
-            draw = &draws->push_back();
-            v = &draw->fVertexCnt;
-            i = &draw->fIndexCnt;
-        }
-
-        // FIXME: These tris are inset in the 1 unit arc around the corner
-        verts[*v + 0].fPos = sega.endPt();
-        verts[*v + 1].fPos = verts[*v + 0].fPos + sega.endNorm();
-        verts[*v + 2].fPos = verts[*v + 0].fPos + segb.fMid;
-        verts[*v + 3].fPos = verts[*v + 0].fPos + segb.fNorms[0];
-        verts[*v + 0].fUV.set(0,0);
-        verts[*v + 1].fUV.set(0,-SK_Scalar1);
-        verts[*v + 2].fUV.set(0,-SK_Scalar1);
-        verts[*v + 3].fUV.set(0,-SK_Scalar1);
-        verts[*v + 0].fD0 = verts[*v + 0].fD1 = -SK_Scalar1;
-        verts[*v + 1].fD0 = verts[*v + 1].fD1 = -SK_Scalar1;
-        verts[*v + 2].fD0 = verts[*v + 2].fD1 = -SK_Scalar1;
-        verts[*v + 3].fD0 = verts[*v + 3].fD1 = -SK_Scalar1;
-
-        idxs[*i + 0] = *v + 0;
-        idxs[*i + 1] = *v + 2;
-        idxs[*i + 2] = *v + 1;
-        idxs[*i + 3] = *v + 0;
-        idxs[*i + 4] = *v + 3;
-        idxs[*i + 5] = *v + 2;
-
-        *v += 4;
-        *i += 6;
-
-        if (Segment::kLine == segb.fType) {
-            verts[*v + 0].fPos = fanPt;
-            verts[*v + 1].fPos = sega.endPt();
-            verts[*v + 2].fPos = segb.fPts[0];
-
-            verts[*v + 3].fPos = verts[*v + 1].fPos + segb.fNorms[0];
-            verts[*v + 4].fPos = verts[*v + 2].fPos + segb.fNorms[0];
-
-            // we draw the line edge as a degenerate quad (u is 0, v is the
-            // signed distance to the edge)
-            SkScalar dist = fanPt.distanceToLineBetween(verts[*v + 1].fPos,
-                                                        verts[*v + 2].fPos);
-            verts[*v + 0].fUV.set(0, dist);
-            verts[*v + 1].fUV.set(0, 0);
-            verts[*v + 2].fUV.set(0, 0);
-            verts[*v + 3].fUV.set(0, -SK_Scalar1);
-            verts[*v + 4].fUV.set(0, -SK_Scalar1);
-
-            verts[*v + 0].fD0 = verts[*v + 0].fD1 = -SK_Scalar1;
-            verts[*v + 1].fD0 = verts[*v + 1].fD1 = -SK_Scalar1;
-            verts[*v + 2].fD0 = verts[*v + 2].fD1 = -SK_Scalar1;
-            verts[*v + 3].fD0 = verts[*v + 3].fD1 = -SK_Scalar1;
-            verts[*v + 4].fD0 = verts[*v + 4].fD1 = -SK_Scalar1;
-
-            idxs[*i + 0] = *v + 0;
-            idxs[*i + 1] = *v + 2;
-            idxs[*i + 2] = *v + 1;
-
-            idxs[*i + 3] = *v + 3;
-            idxs[*i + 4] = *v + 1;
-            idxs[*i + 5] = *v + 2;
-
-            idxs[*i + 6] = *v + 4;
-            idxs[*i + 7] = *v + 3;
-            idxs[*i + 8] = *v + 2;
-
-            *v += 5;
-            *i += 9;
-        } else {
-            SkPoint qpts[] = {sega.endPt(), segb.fPts[0], segb.fPts[1]};
-
-            SkVector midVec = segb.fNorms[0] + segb.fNorms[1];
-            midVec.normalize();
-
-            verts[*v + 0].fPos = fanPt;
-            verts[*v + 1].fPos = qpts[0];
-            verts[*v + 2].fPos = qpts[2];
-            verts[*v + 3].fPos = qpts[0] + segb.fNorms[0];
-            verts[*v + 4].fPos = qpts[2] + segb.fNorms[1];
-            verts[*v + 5].fPos = qpts[1] + midVec;
-
-            SkScalar c = segb.fNorms[0].dot(qpts[0]);
-            verts[*v + 0].fD0 =  -segb.fNorms[0].dot(fanPt) + c;
-            verts[*v + 1].fD0 =  0.f;
-            verts[*v + 2].fD0 =  -segb.fNorms[0].dot(qpts[2]) + c;
-            verts[*v + 3].fD0 = -SK_ScalarMax/100;
-            verts[*v + 4].fD0 = -SK_ScalarMax/100;
-            verts[*v + 5].fD0 = -SK_ScalarMax/100;
-
-            c = segb.fNorms[1].dot(qpts[2]);
-            verts[*v + 0].fD1 =  -segb.fNorms[1].dot(fanPt) + c;
-            verts[*v + 1].fD1 =  -segb.fNorms[1].dot(qpts[0]) + c;
-            verts[*v + 2].fD1 =  0.f;
-            verts[*v + 3].fD1 = -SK_ScalarMax/100;
-            verts[*v + 4].fD1 = -SK_ScalarMax/100;
-            verts[*v + 5].fD1 = -SK_ScalarMax/100;
-
-            GrPathUtils::QuadUVMatrix toUV(qpts);
-            toUV.apply<6, sizeof(QuadVertex), sizeof(SkPoint)>(verts + *v);
-
-            idxs[*i + 0] = *v + 3;
-            idxs[*i + 1] = *v + 1;
-            idxs[*i + 2] = *v + 2;
-            idxs[*i + 3] = *v + 4;
-            idxs[*i + 4] = *v + 3;
-            idxs[*i + 5] = *v + 2;
-
-            idxs[*i + 6] = *v + 5;
-            idxs[*i + 7] = *v + 3;
-            idxs[*i + 8] = *v + 4;
-
-            idxs[*i +  9] = *v + 0;
-            idxs[*i + 10] = *v + 2;
-            idxs[*i + 11] = *v + 1;
-
-            *v += 6;
-            *i += 12;
-        }
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-/*
- * Quadratic specified by 0=u^2-v canonical coords. u and v are the first
- * two components of the vertex attribute. Coverage is based on signed
- * distance with negative being inside, positive outside. The edge is specified in
- * window space (y-down). If either the third or fourth component of the interpolated
- * vertex coord is > 0 then the pixel is considered outside the edge. This is used to
- * attempt to trim to a portion of the infinite quad.
- * Requires shader derivative instruction support.
- */
-
-class QuadEdgeEffect : public GrVertexEffect {
-public:
-
-    static GrEffect* Create() {
-        GR_CREATE_STATIC_EFFECT(gQuadEdgeEffect, QuadEdgeEffect, ());
-        gQuadEdgeEffect->ref();
-        return gQuadEdgeEffect;
-    }
-
-    virtual ~QuadEdgeEffect() {}
-
-    static const char* Name() { return "QuadEdge"; }
-
-    virtual void getConstantColorComponents(GrColor* color,
-                                            uint32_t* validFlags) const SK_OVERRIDE {
-        *validFlags = 0;
-    }
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE {
-        return GrTBackendEffectFactory<QuadEdgeEffect>::getInstance();
-    }
-
-    class GLEffect : public GrGLVertexEffect {
-    public:
-        GLEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&)
-            : INHERITED (factory) {}
-
-        virtual void emitCode(GrGLFullShaderBuilder* builder,
-                              const GrDrawEffect& drawEffect,
-                              const GrEffectKey& key,
-                              const char* outputColor,
-                              const char* inputColor,
-                              const TransformedCoordsArray&,
-                              const TextureSamplerArray& samplers) SK_OVERRIDE {
-            const char *vsName, *fsName;
-            const SkString* attrName =
-                builder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[0]);
-            builder->fsCodeAppendf("\t\tfloat edgeAlpha;\n");
-
-            SkAssertResult(builder->enableFeature(
-                                              GrGLShaderBuilder::kStandardDerivatives_GLSLFeature));
-            builder->addVarying(kVec4f_GrSLType, "QuadEdge", &vsName, &fsName);
-
-            // keep the derivative instructions outside the conditional
-            builder->fsCodeAppendf("\t\tvec2 duvdx = dFdx(%s.xy);\n", fsName);
-            builder->fsCodeAppendf("\t\tvec2 duvdy = dFdy(%s.xy);\n", fsName);
-            builder->fsCodeAppendf("\t\tif (%s.z > 0.0 && %s.w > 0.0) {\n", fsName, fsName);
-            // today we know z and w are in device space. We could use derivatives
-            builder->fsCodeAppendf("\t\t\tedgeAlpha = min(min(%s.z, %s.w) + 0.5, 1.0);\n", fsName,
-                                    fsName);
-            builder->fsCodeAppendf ("\t\t} else {\n");
-            builder->fsCodeAppendf("\t\t\tvec2 gF = vec2(2.0*%s.x*duvdx.x - duvdx.y,\n"
-                                   "\t\t\t               2.0*%s.x*duvdy.x - duvdy.y);\n",
-                                   fsName, fsName);
-            builder->fsCodeAppendf("\t\t\tedgeAlpha = (%s.x*%s.x - %s.y);\n", fsName, fsName,
-                                    fsName);
-            builder->fsCodeAppendf("\t\t\tedgeAlpha = "
-                                   "clamp(0.5 - edgeAlpha / length(gF), 0.0, 1.0);\n\t\t}\n");
-
-
-            builder->fsCodeAppendf("\t%s = %s;\n", outputColor,
-                                   (GrGLSLExpr4(inputColor) * GrGLSLExpr1("edgeAlpha")).c_str());
-
-            builder->vsCodeAppendf("\t%s = %s;\n", vsName, attrName->c_str());
-        }
-
-        static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*) {}
-
-        virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE {}
-
-    private:
-        typedef GrGLVertexEffect INHERITED;
-    };
-
-private:
-    QuadEdgeEffect() {
-        this->addVertexAttrib(kVec4f_GrSLType);
-    }
-
-    virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE {
-        return true;
-    }
-
-    GR_DECLARE_EFFECT_TEST;
-
-    typedef GrVertexEffect INHERITED;
-};
-
-GR_DEFINE_EFFECT_TEST(QuadEdgeEffect);
-
-GrEffect* QuadEdgeEffect::TestCreate(SkRandom* random,
-                                     GrContext*,
-                                     const GrDrawTargetCaps& caps,
-                                     GrTexture*[]) {
-    // Doesn't work without derivative instructions.
-    return caps.shaderDerivativeSupport() ? QuadEdgeEffect::Create() : NULL;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-bool GrAAConvexPathRenderer::canDrawPath(const SkPath& path,
-                                         const SkStrokeRec& stroke,
-                                         const GrDrawTarget* target,
-                                         bool antiAlias) const {
-    return (target->caps()->shaderDerivativeSupport() && antiAlias &&
-            stroke.isFillStyle() && !path.isInverseFillType() && path.isConvex());
-}
-
-namespace {
-
-// position + edge
-extern const GrVertexAttrib gPathAttribs[] = {
-    {kVec2f_GrVertexAttribType, 0,               kPosition_GrVertexAttribBinding},
-    {kVec4f_GrVertexAttribType, sizeof(SkPoint), kEffect_GrVertexAttribBinding}
-};
-
-};
-
-bool GrAAConvexPathRenderer::onDrawPath(const SkPath& origPath,
-                                        const SkStrokeRec&,
-                                        GrDrawTarget* target,
-                                        bool antiAlias) {
-
-    const SkPath* path = &origPath;
-    if (path->isEmpty()) {
-        return true;
-    }
-
-    SkMatrix viewMatrix = target->getDrawState().getViewMatrix();
-    GrDrawTarget::AutoStateRestore asr;
-    if (!asr.setIdentity(target, GrDrawTarget::kPreserve_ASRInit)) {
-        return false;
-    }
-    GrDrawState* drawState = target->drawState();
-
-    // We use the fact that SkPath::transform path does subdivision based on
-    // perspective. Otherwise, we apply the view matrix when copying to the
-    // segment representation.
-    SkPath tmpPath;
-    if (viewMatrix.hasPerspective()) {
-        origPath.transform(viewMatrix, &tmpPath);
-        path = &tmpPath;
-        viewMatrix = SkMatrix::I();
-    }
-
-    QuadVertex *verts;
-    uint16_t* idxs;
-
-    int vCount;
-    int iCount;
-    enum {
-        kPreallocSegmentCnt = 512 / sizeof(Segment),
-        kPreallocDrawCnt = 4,
-    };
-    SkSTArray<kPreallocSegmentCnt, Segment, true> segments;
-    SkPoint fanPt;
-
-    // We can't simply use the path bounds because we may degenerate cubics to quads which produces
-    // new control points outside the original convex hull.
-    SkRect devBounds;
-    if (!get_segments(*path, viewMatrix, &segments, &fanPt, &vCount, &iCount, &devBounds)) {
-        return false;
-    }
-
-    // Our computed verts should all be within one pixel of the segment control points.
-    devBounds.outset(SK_Scalar1, SK_Scalar1);
-
-    drawState->setVertexAttribs<gPathAttribs>(SK_ARRAY_COUNT(gPathAttribs));
-
-    static const int kEdgeAttrIndex = 1;
-    GrEffect* quadEffect = QuadEdgeEffect::Create();
-    drawState->addCoverageEffect(quadEffect, kEdgeAttrIndex)->unref();
-
-    GrDrawTarget::AutoReleaseGeometry arg(target, vCount, iCount);
-    if (!arg.succeeded()) {
-        return false;
-    }
-    SkASSERT(sizeof(QuadVertex) == drawState->getVertexSize());
-    verts = reinterpret_cast<QuadVertex*>(arg.vertices());
-    idxs = reinterpret_cast<uint16_t*>(arg.indices());
-
-    SkSTArray<kPreallocDrawCnt, Draw, true> draws;
-    create_vertices(segments, fanPt, &draws, verts, idxs);
-
-    // Check devBounds
-#ifdef SK_DEBUG
-    SkRect tolDevBounds = devBounds;
-    tolDevBounds.outset(SK_Scalar1 / 10000, SK_Scalar1 / 10000);
-    SkRect actualBounds;
-    actualBounds.set(verts[0].fPos, verts[1].fPos);
-    for (int i = 2; i < vCount; ++i) {
-        actualBounds.growToInclude(verts[i].fPos.fX, verts[i].fPos.fY);
-    }
-    SkASSERT(tolDevBounds.contains(actualBounds));
-#endif
-
-    int vOffset = 0;
-    for (int i = 0; i < draws.count(); ++i) {
-        const Draw& draw = draws[i];
-        target->drawIndexed(kTriangles_GrPrimitiveType,
-                            vOffset,  // start vertex
-                            0,        // start index
-                            draw.fVertexCnt,
-                            draw.fIndexCnt,
-                            &devBounds);
-        vOffset += draw.fVertexCnt;
-    }
-
-    return true;
-}
diff --git a/gfx/skia/skia/src/gpu/GrAAConvexPathRenderer.h b/gfx/skia/skia/src/gpu/GrAAConvexPathRenderer.h
deleted file mode 100644
index 4dd858509e12..000000000000
--- a/gfx/skia/skia/src/gpu/GrAAConvexPathRenderer.h
+++ /dev/null
@@ -1,30 +0,0 @@
-
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrAAConvexPathRenderer_DEFINED
-#define GrAAConvexPathRenderer_DEFINED
-
-#include "GrPathRenderer.h"
-
-class GrAAConvexPathRenderer : public GrPathRenderer {
-public:
-    GrAAConvexPathRenderer();
-
-    virtual bool canDrawPath(const SkPath& path,
-                             const SkStrokeRec& stroke,
-                             const GrDrawTarget* target,
-                             bool antiAlias) const SK_OVERRIDE;
-
-protected:
-    virtual bool onDrawPath(const SkPath& path,
-                            const SkStrokeRec& stroke,
-                            GrDrawTarget* target,
-                            bool antiAlias) SK_OVERRIDE;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/GrAAHairLinePathRenderer.cpp b/gfx/skia/skia/src/gpu/GrAAHairLinePathRenderer.cpp
deleted file mode 100644
index d5ff40d9551d..000000000000
--- a/gfx/skia/skia/src/gpu/GrAAHairLinePathRenderer.cpp
+++ /dev/null
@@ -1,1042 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrAAHairLinePathRenderer.h"
-
-#include "GrContext.h"
-#include "GrDrawState.h"
-#include "GrDrawTargetCaps.h"
-#include "GrEffect.h"
-#include "GrGpu.h"
-#include "GrIndexBuffer.h"
-#include "GrPathUtils.h"
-#include "GrTBackendEffectFactory.h"
-#include "SkGeometry.h"
-#include "SkStroke.h"
-#include "SkTemplates.h"
-
-#include "effects/GrBezierEffect.h"
-
-namespace {
-// quadratics are rendered as 5-sided polys in order to bound the
-// AA stroke around the center-curve. See comments in push_quad_index_buffer and
-// bloat_quad. Quadratics and conics share an index buffer
-static const int kVertsPerQuad = 5;
-static const int kIdxsPerQuad = 9;
-
-// lines are rendered as:
-//      *______________*
-//      |\ -_______   /|
-//      | \        \ / |
-//      |  *--------*  |
-//      | /  ______/ \ |
-//      */_-__________\*
-// For: 6 vertices and 18 indices (for 6 triangles)
-static const int kVertsPerLineSeg = 6;
-static const int kIdxsPerLineSeg = 18;
-
-static const int kNumQuadsInIdxBuffer = 256;
-static const size_t kQuadIdxSBufize = kIdxsPerQuad *
-                                      sizeof(uint16_t) *
-                                      kNumQuadsInIdxBuffer;
-
-static const int kNumLineSegsInIdxBuffer = 256;
-static const size_t kLineSegIdxSBufize = kIdxsPerLineSeg *
-                                         sizeof(uint16_t) *
-                                         kNumLineSegsInIdxBuffer;
-
-static bool push_quad_index_data(GrIndexBuffer* qIdxBuffer) {
-    uint16_t* data = (uint16_t*) qIdxBuffer->map();
-    bool tempData = NULL == data;
-    if (tempData) {
-        data = SkNEW_ARRAY(uint16_t, kNumQuadsInIdxBuffer * kIdxsPerQuad);
-    }
-    for (int i = 0; i < kNumQuadsInIdxBuffer; ++i) {
-
-        // Each quadratic is rendered as a five sided polygon. This poly bounds
-        // the quadratic's bounding triangle but has been expanded so that the
-        // 1-pixel wide area around the curve is inside the poly.
-        // If a,b,c are the original control points then the poly a0,b0,c0,c1,a1
-        // that is rendered would look like this:
-        //              b0
-        //              b
-        //
-        //     a0              c0
-        //      a            c
-        //       a1       c1
-        // Each is drawn as three triangles specified by these 9 indices:
-        int baseIdx = i * kIdxsPerQuad;
-        uint16_t baseVert = (uint16_t)(i * kVertsPerQuad);
-        data[0 + baseIdx] = baseVert + 0; // a0
-        data[1 + baseIdx] = baseVert + 1; // a1
-        data[2 + baseIdx] = baseVert + 2; // b0
-        data[3 + baseIdx] = baseVert + 2; // b0
-        data[4 + baseIdx] = baseVert + 4; // c1
-        data[5 + baseIdx] = baseVert + 3; // c0
-        data[6 + baseIdx] = baseVert + 1; // a1
-        data[7 + baseIdx] = baseVert + 4; // c1
-        data[8 + baseIdx] = baseVert + 2; // b0
-    }
-    if (tempData) {
-        bool ret = qIdxBuffer->updateData(data, kQuadIdxSBufize);
-        delete[] data;
-        return ret;
-    } else {
-        qIdxBuffer->unmap();
-        return true;
-    }
-}
-
-static bool push_line_index_data(GrIndexBuffer* lIdxBuffer) {
-    uint16_t* data = (uint16_t*) lIdxBuffer->map();
-    bool tempData = NULL == data;
-    if (tempData) {
-        data = SkNEW_ARRAY(uint16_t, kNumLineSegsInIdxBuffer * kIdxsPerLineSeg);
-    }
-    for (int i = 0; i < kNumLineSegsInIdxBuffer; ++i) {
-        // Each line segment is rendered as two quads and two triangles.
-        // p0 and p1 have alpha = 1 while all other points have alpha = 0.
-        // The four external points are offset 1 pixel perpendicular to the
-        // line and half a pixel parallel to the line.
-        //
-        // p4                  p5
-        //      p0         p1
-        // p2                  p3
-        //
-        // Each is drawn as six triangles specified by these 18 indices:
-        int baseIdx = i * kIdxsPerLineSeg;
-        uint16_t baseVert = (uint16_t)(i * kVertsPerLineSeg);
-        data[0 + baseIdx] = baseVert + 0;
-        data[1 + baseIdx] = baseVert + 1;
-        data[2 + baseIdx] = baseVert + 3;
-
-        data[3 + baseIdx] = baseVert + 0;
-        data[4 + baseIdx] = baseVert + 3;
-        data[5 + baseIdx] = baseVert + 2;
-
-        data[6 + baseIdx] = baseVert + 0;
-        data[7 + baseIdx] = baseVert + 4;
-        data[8 + baseIdx] = baseVert + 5;
-
-        data[9 + baseIdx] = baseVert + 0;
-        data[10+ baseIdx] = baseVert + 5;
-        data[11+ baseIdx] = baseVert + 1;
-
-        data[12 + baseIdx] = baseVert + 0;
-        data[13 + baseIdx] = baseVert + 2;
-        data[14 + baseIdx] = baseVert + 4;
-
-        data[15 + baseIdx] = baseVert + 1;
-        data[16 + baseIdx] = baseVert + 5;
-        data[17 + baseIdx] = baseVert + 3;
-    }
-    if (tempData) {
-        bool ret = lIdxBuffer->updateData(data, kLineSegIdxSBufize);
-        delete[] data;
-        return ret;
-    } else {
-        lIdxBuffer->unmap();
-        return true;
-    }
-}
-}
-
-GrPathRenderer* GrAAHairLinePathRenderer::Create(GrContext* context) {
-    GrGpu* gpu = context->getGpu();
-    GrIndexBuffer* qIdxBuf = gpu->createIndexBuffer(kQuadIdxSBufize, false);
-    SkAutoTUnref<GrIndexBuffer> qIdxBuffer(qIdxBuf);
-    if (NULL == qIdxBuf || !push_quad_index_data(qIdxBuf)) {
-        return NULL;
-    }
-    GrIndexBuffer* lIdxBuf = gpu->createIndexBuffer(kLineSegIdxSBufize, false);
-    SkAutoTUnref<GrIndexBuffer> lIdxBuffer(lIdxBuf);
-    if (NULL == lIdxBuf || !push_line_index_data(lIdxBuf)) {
-        return NULL;
-    }
-    return SkNEW_ARGS(GrAAHairLinePathRenderer,
-                      (context, lIdxBuf, qIdxBuf));
-}
-
-GrAAHairLinePathRenderer::GrAAHairLinePathRenderer(
-                                        const GrContext* context,
-                                        const GrIndexBuffer* linesIndexBuffer,
-                                        const GrIndexBuffer* quadsIndexBuffer) {
-    fLinesIndexBuffer = linesIndexBuffer;
-    linesIndexBuffer->ref();
-    fQuadsIndexBuffer = quadsIndexBuffer;
-    quadsIndexBuffer->ref();
-}
-
-GrAAHairLinePathRenderer::~GrAAHairLinePathRenderer() {
-    fLinesIndexBuffer->unref();
-    fQuadsIndexBuffer->unref();
-}
-
-namespace {
-
-#define PREALLOC_PTARRAY(N) SkSTArray<(N),SkPoint, true>
-
-// Takes 178th time of logf on Z600 / VC2010
-int get_float_exp(float x) {
-    GR_STATIC_ASSERT(sizeof(int) == sizeof(float));
-#ifdef SK_DEBUG
-    static bool tested;
-    if (!tested) {
-        tested = true;
-        SkASSERT(get_float_exp(0.25f) == -2);
-        SkASSERT(get_float_exp(0.3f) == -2);
-        SkASSERT(get_float_exp(0.5f) == -1);
-        SkASSERT(get_float_exp(1.f) == 0);
-        SkASSERT(get_float_exp(2.f) == 1);
-        SkASSERT(get_float_exp(2.5f) == 1);
-        SkASSERT(get_float_exp(8.f) == 3);
-        SkASSERT(get_float_exp(100.f) == 6);
-        SkASSERT(get_float_exp(1000.f) == 9);
-        SkASSERT(get_float_exp(1024.f) == 10);
-        SkASSERT(get_float_exp(3000000.f) == 21);
-    }
-#endif
-    const int* iptr = (const int*)&x;
-    return (((*iptr) & 0x7f800000) >> 23) - 127;
-}
-
-// Uses the max curvature function for quads to estimate
-// where to chop the conic. If the max curvature is not
-// found along the curve segment it will return 1 and
-// dst[0] is the original conic. If it returns 2 the dst[0]
-// and dst[1] are the two new conics.
-int split_conic(const SkPoint src[3], SkConic dst[2], const SkScalar weight) {
-    SkScalar t = SkFindQuadMaxCurvature(src);
-    if (t == 0) {
-        if (dst) {
-            dst[0].set(src, weight);
-        }
-        return 1;
-    } else {
-        if (dst) {
-            SkConic conic;
-            conic.set(src, weight);
-            conic.chopAt(t, dst);
-        }
-        return 2;
-    }
-}
-
-// Calls split_conic on the entire conic and then once more on each subsection.
-// Most cases will result in either 1 conic (chop point is not within t range)
-// or 3 points (split once and then one subsection is split again).
-int chop_conic(const SkPoint src[3], SkConic dst[4], const SkScalar weight) {
-    SkConic dstTemp[2];
-    int conicCnt = split_conic(src, dstTemp, weight);
-    if (2 == conicCnt) {
-        int conicCnt2 = split_conic(dstTemp[0].fPts, dst, dstTemp[0].fW);
-        conicCnt = conicCnt2 + split_conic(dstTemp[1].fPts, &dst[conicCnt2], dstTemp[1].fW);
-    } else {
-        dst[0] = dstTemp[0];
-    }
-    return conicCnt;
-}
-
-// returns 0 if quad/conic is degen or close to it
-// in this case approx the path with lines
-// otherwise returns 1
-int is_degen_quad_or_conic(const SkPoint p[3]) {
-    static const SkScalar gDegenerateToLineTol = SK_Scalar1;
-    static const SkScalar gDegenerateToLineTolSqd =
-        SkScalarMul(gDegenerateToLineTol, gDegenerateToLineTol);
-
-    if (p[0].distanceToSqd(p[1]) < gDegenerateToLineTolSqd ||
-        p[1].distanceToSqd(p[2]) < gDegenerateToLineTolSqd) {
-        return 1;
-    }
-
-    SkScalar dsqd = p[1].distanceToLineBetweenSqd(p[0], p[2]);
-    if (dsqd < gDegenerateToLineTolSqd) {
-        return 1;
-    }
-
-    if (p[2].distanceToLineBetweenSqd(p[1], p[0]) < gDegenerateToLineTolSqd) {
-        return 1;
-    }
-    return 0;
-}
-
-// we subdivide the quads to avoid huge overfill
-// if it returns -1 then should be drawn as lines
-int num_quad_subdivs(const SkPoint p[3]) {
-    static const SkScalar gDegenerateToLineTol = SK_Scalar1;
-    static const SkScalar gDegenerateToLineTolSqd =
-        SkScalarMul(gDegenerateToLineTol, gDegenerateToLineTol);
-
-    if (p[0].distanceToSqd(p[1]) < gDegenerateToLineTolSqd ||
-        p[1].distanceToSqd(p[2]) < gDegenerateToLineTolSqd) {
-        return -1;
-    }
-
-    SkScalar dsqd = p[1].distanceToLineBetweenSqd(p[0], p[2]);
-    if (dsqd < gDegenerateToLineTolSqd) {
-        return -1;
-    }
-
-    if (p[2].distanceToLineBetweenSqd(p[1], p[0]) < gDegenerateToLineTolSqd) {
-        return -1;
-    }
-
-    // tolerance of triangle height in pixels
-    // tuned on windows  Quadro FX 380 / Z600
-    // trade off of fill vs cpu time on verts
-    // maybe different when do this using gpu (geo or tess shaders)
-    static const SkScalar gSubdivTol = 175 * SK_Scalar1;
-
-    if (dsqd <= SkScalarMul(gSubdivTol, gSubdivTol)) {
-        return 0;
-    } else {
-        static const int kMaxSub = 4;
-        // subdividing the quad reduces d by 4. so we want x = log4(d/tol)
-        // = log4(d*d/tol*tol)/2
-        // = log2(d*d/tol*tol)
-
-        // +1 since we're ignoring the mantissa contribution.
-        int log = get_float_exp(dsqd/(gSubdivTol*gSubdivTol)) + 1;
-        log = SkTMin(SkTMax(0, log), kMaxSub);
-        return log;
-    }
-}
-
-/**
- * Generates the lines and quads to be rendered. Lines are always recorded in
- * device space. We will do a device space bloat to account for the 1pixel
- * thickness.
- * Quads are recorded in device space unless m contains
- * perspective, then in they are in src space. We do this because we will
- * subdivide large quads to reduce over-fill. This subdivision has to be
- * performed before applying the perspective matrix.
- */
-int generate_lines_and_quads(const SkPath& path,
-                             const SkMatrix& m,
-                             const SkIRect& devClipBounds,
-                             GrAAHairLinePathRenderer::PtArray* lines,
-                             GrAAHairLinePathRenderer::PtArray* quads,
-                             GrAAHairLinePathRenderer::PtArray* conics,
-                             GrAAHairLinePathRenderer::IntArray* quadSubdivCnts,
-                             GrAAHairLinePathRenderer::FloatArray* conicWeights) {
-    SkPath::Iter iter(path, false);
-
-    int totalQuadCount = 0;
-    SkRect bounds;
-    SkIRect ibounds;
-
-    bool persp = m.hasPerspective();
-
-    for (;;) {
-        SkPoint pathPts[4];
-        SkPoint devPts[4];
-        SkPath::Verb verb = iter.next(pathPts);
-        switch (verb) {
-            case SkPath::kConic_Verb: {
-                SkConic dst[4];
-                // We chop the conics to create tighter clipping to hide error
-                // that appears near max curvature of very thin conics. Thin
-                // hyperbolas with high weight still show error.
-                int conicCnt = chop_conic(pathPts, dst, iter.conicWeight());
-                for (int i = 0; i < conicCnt; ++i) {
-                    SkPoint* chopPnts = dst[i].fPts;
-                    m.mapPoints(devPts, chopPnts, 3);
-                    bounds.setBounds(devPts, 3);
-                    bounds.outset(SK_Scalar1, SK_Scalar1);
-                    bounds.roundOut(&ibounds);
-                    if (SkIRect::Intersects(devClipBounds, ibounds)) {
-                        if (is_degen_quad_or_conic(devPts)) {
-                            SkPoint* pts = lines->push_back_n(4);
-                            pts[0] = devPts[0];
-                            pts[1] = devPts[1];
-                            pts[2] = devPts[1];
-                            pts[3] = devPts[2];
-                        } else {
-                            // when in perspective keep conics in src space
-                            SkPoint* cPts = persp ? chopPnts : devPts;
-                            SkPoint* pts = conics->push_back_n(3);
-                            pts[0] = cPts[0];
-                            pts[1] = cPts[1];
-                            pts[2] = cPts[2];
-                            conicWeights->push_back() = dst[i].fW;
-                        }
-                    }
-                }
-                break;
-            }
-            case SkPath::kMove_Verb:
-                break;
-            case SkPath::kLine_Verb:
-                m.mapPoints(devPts, pathPts, 2);
-                bounds.setBounds(devPts, 2);
-                bounds.outset(SK_Scalar1, SK_Scalar1);
-                bounds.roundOut(&ibounds);
-                if (SkIRect::Intersects(devClipBounds, ibounds)) {
-                    SkPoint* pts = lines->push_back_n(2);
-                    pts[0] = devPts[0];
-                    pts[1] = devPts[1];
-                }
-                break;
-            case SkPath::kQuad_Verb: {
-                SkPoint choppedPts[5];
-                // Chopping the quad helps when the quad is either degenerate or nearly degenerate.
-                // When it is degenerate it allows the approximation with lines to work since the
-                // chop point (if there is one) will be at the parabola's vertex. In the nearly
-                // degenerate the QuadUVMatrix computed for the points is almost singular which
-                // can cause rendering artifacts.
-                int n = SkChopQuadAtMaxCurvature(pathPts, choppedPts);
-                for (int i = 0; i < n; ++i) {
-                    SkPoint* quadPts = choppedPts + i * 2;
-                    m.mapPoints(devPts, quadPts, 3);
-                    bounds.setBounds(devPts, 3);
-                    bounds.outset(SK_Scalar1, SK_Scalar1);
-                    bounds.roundOut(&ibounds);
-
-                    if (SkIRect::Intersects(devClipBounds, ibounds)) {
-                        int subdiv = num_quad_subdivs(devPts);
-                        SkASSERT(subdiv >= -1);
-                        if (-1 == subdiv) {
-                            SkPoint* pts = lines->push_back_n(4);
-                            pts[0] = devPts[0];
-                            pts[1] = devPts[1];
-                            pts[2] = devPts[1];
-                            pts[3] = devPts[2];
-                        } else {
-                            // when in perspective keep quads in src space
-                            SkPoint* qPts = persp ? quadPts : devPts;
-                            SkPoint* pts = quads->push_back_n(3);
-                            pts[0] = qPts[0];
-                            pts[1] = qPts[1];
-                            pts[2] = qPts[2];
-                            quadSubdivCnts->push_back() = subdiv;
-                            totalQuadCount += 1 << subdiv;
-                        }
-                    }
-                }
-                break;
-            }
-            case SkPath::kCubic_Verb:
-                m.mapPoints(devPts, pathPts, 4);
-                bounds.setBounds(devPts, 4);
-                bounds.outset(SK_Scalar1, SK_Scalar1);
-                bounds.roundOut(&ibounds);
-                if (SkIRect::Intersects(devClipBounds, ibounds)) {
-                    PREALLOC_PTARRAY(32) q;
-                    // we don't need a direction if we aren't constraining the subdivision
-                    static const SkPath::Direction kDummyDir = SkPath::kCCW_Direction;
-                    // We convert cubics to quadratics (for now).
-                    // In perspective have to do conversion in src space.
-                    if (persp) {
-                        SkScalar tolScale =
-                            GrPathUtils::scaleToleranceToSrc(SK_Scalar1, m,
-                                                             path.getBounds());
-                        GrPathUtils::convertCubicToQuads(pathPts, tolScale, false, kDummyDir, &q);
-                    } else {
-                        GrPathUtils::convertCubicToQuads(devPts, SK_Scalar1, false, kDummyDir, &q);
-                    }
-                    for (int i = 0; i < q.count(); i += 3) {
-                        SkPoint* qInDevSpace;
-                        // bounds has to be calculated in device space, but q is
-                        // in src space when there is perspective.
-                        if (persp) {
-                            m.mapPoints(devPts, &q[i], 3);
-                            bounds.setBounds(devPts, 3);
-                            qInDevSpace = devPts;
-                        } else {
-                            bounds.setBounds(&q[i], 3);
-                            qInDevSpace = &q[i];
-                        }
-                        bounds.outset(SK_Scalar1, SK_Scalar1);
-                        bounds.roundOut(&ibounds);
-                        if (SkIRect::Intersects(devClipBounds, ibounds)) {
-                            int subdiv = num_quad_subdivs(qInDevSpace);
-                            SkASSERT(subdiv >= -1);
-                            if (-1 == subdiv) {
-                                SkPoint* pts = lines->push_back_n(4);
-                                // lines should always be in device coords
-                                pts[0] = qInDevSpace[0];
-                                pts[1] = qInDevSpace[1];
-                                pts[2] = qInDevSpace[1];
-                                pts[3] = qInDevSpace[2];
-                            } else {
-                                SkPoint* pts = quads->push_back_n(3);
-                                // q is already in src space when there is no
-                                // perspective and dev coords otherwise.
-                                pts[0] = q[0 + i];
-                                pts[1] = q[1 + i];
-                                pts[2] = q[2 + i];
-                                quadSubdivCnts->push_back() = subdiv;
-                                totalQuadCount += 1 << subdiv;
-                            }
-                        }
-                    }
-                }
-                break;
-            case SkPath::kClose_Verb:
-                break;
-            case SkPath::kDone_Verb:
-                return totalQuadCount;
-        }
-    }
-}
-
-struct LineVertex {
-    SkPoint fPos;
-    GrColor fCoverage;
-};
-
-struct BezierVertex {
-    SkPoint fPos;
-    union {
-        struct {
-            SkScalar fK;
-            SkScalar fL;
-            SkScalar fM;
-        } fConic;
-        SkVector   fQuadCoord;
-        struct {
-            SkScalar fBogus[4];
-        };
-    };
-};
-
-GR_STATIC_ASSERT(sizeof(BezierVertex) == 3 * sizeof(SkPoint));
-
-void intersect_lines(const SkPoint& ptA, const SkVector& normA,
-                     const SkPoint& ptB, const SkVector& normB,
-                     SkPoint* result) {
-
-    SkScalar lineAW = -normA.dot(ptA);
-    SkScalar lineBW = -normB.dot(ptB);
-
-    SkScalar wInv = SkScalarMul(normA.fX, normB.fY) -
-        SkScalarMul(normA.fY, normB.fX);
-    wInv = SkScalarInvert(wInv);
-
-    result->fX = SkScalarMul(normA.fY, lineBW) - SkScalarMul(lineAW, normB.fY);
-    result->fX = SkScalarMul(result->fX, wInv);
-
-    result->fY = SkScalarMul(lineAW, normB.fX) - SkScalarMul(normA.fX, lineBW);
-    result->fY = SkScalarMul(result->fY, wInv);
-}
-
-void set_uv_quad(const SkPoint qpts[3], BezierVertex verts[kVertsPerQuad]) {
-    // this should be in the src space, not dev coords, when we have perspective
-    GrPathUtils::QuadUVMatrix DevToUV(qpts);
-    DevToUV.apply<kVertsPerQuad, sizeof(BezierVertex), sizeof(SkPoint)>(verts);
-}
-
-void bloat_quad(const SkPoint qpts[3], const SkMatrix* toDevice,
-                const SkMatrix* toSrc, BezierVertex verts[kVertsPerQuad],
-                SkRect* devBounds) {
-    SkASSERT(!toDevice == !toSrc);
-    // original quad is specified by tri a,b,c
-    SkPoint a = qpts[0];
-    SkPoint b = qpts[1];
-    SkPoint c = qpts[2];
-
-    if (toDevice) {
-        toDevice->mapPoints(&a, 1);
-        toDevice->mapPoints(&b, 1);
-        toDevice->mapPoints(&c, 1);
-    }
-    // make a new poly where we replace a and c by a 1-pixel wide edges orthog
-    // to edges ab and bc:
-    //
-    //   before       |        after
-    //                |              b0
-    //         b      |
-    //                |
-    //                |     a0            c0
-    // a         c    |        a1       c1
-    //
-    // edges a0->b0 and b0->c0 are parallel to original edges a->b and b->c,
-    // respectively.
-    BezierVertex& a0 = verts[0];
-    BezierVertex& a1 = verts[1];
-    BezierVertex& b0 = verts[2];
-    BezierVertex& c0 = verts[3];
-    BezierVertex& c1 = verts[4];
-
-    SkVector ab = b;
-    ab -= a;
-    SkVector ac = c;
-    ac -= a;
-    SkVector cb = b;
-    cb -= c;
-
-    // We should have already handled degenerates
-    SkASSERT(ab.length() > 0 && cb.length() > 0);
-
-    ab.normalize();
-    SkVector abN;
-    abN.setOrthog(ab, SkVector::kLeft_Side);
-    if (abN.dot(ac) > 0) {
-        abN.negate();
-    }
-
-    cb.normalize();
-    SkVector cbN;
-    cbN.setOrthog(cb, SkVector::kLeft_Side);
-    if (cbN.dot(ac) < 0) {
-        cbN.negate();
-    }
-
-    a0.fPos = a;
-    a0.fPos += abN;
-    a1.fPos = a;
-    a1.fPos -= abN;
-
-    c0.fPos = c;
-    c0.fPos += cbN;
-    c1.fPos = c;
-    c1.fPos -= cbN;
-
-    intersect_lines(a0.fPos, abN, c0.fPos, cbN, &b0.fPos);
-    devBounds->growToInclude(&verts[0].fPos, sizeof(BezierVertex), kVertsPerQuad);
-
-    if (toSrc) {
-        toSrc->mapPointsWithStride(&verts[0].fPos, sizeof(BezierVertex), kVertsPerQuad);
-    }
-}
-
-// Equations based off of Loop-Blinn Quadratic GPU Rendering
-// Input Parametric:
-// P(t) = (P0*(1-t)^2 + 2*w*P1*t*(1-t) + P2*t^2) / (1-t)^2 + 2*w*t*(1-t) + t^2)
-// Output Implicit:
-// f(x, y, w) = f(P) = K^2 - LM
-// K = dot(k, P), L = dot(l, P), M = dot(m, P)
-// k, l, m are calculated in function GrPathUtils::getConicKLM
-void set_conic_coeffs(const SkPoint p[3], BezierVertex verts[kVertsPerQuad],
-                      const SkScalar weight) {
-    SkScalar klm[9];
-
-    GrPathUtils::getConicKLM(p, weight, klm);
-
-    for (int i = 0; i < kVertsPerQuad; ++i) {
-        const SkPoint pnt = verts[i].fPos;
-        verts[i].fConic.fK = pnt.fX * klm[0] + pnt.fY * klm[1] + klm[2];
-        verts[i].fConic.fL = pnt.fX * klm[3] + pnt.fY * klm[4] + klm[5];
-        verts[i].fConic.fM = pnt.fX * klm[6] + pnt.fY * klm[7] + klm[8];
-    }
-}
-
-void add_conics(const SkPoint p[3],
-                const SkScalar weight,
-                const SkMatrix* toDevice,
-                const SkMatrix* toSrc,
-                BezierVertex** vert,
-                SkRect* devBounds) {
-    bloat_quad(p, toDevice, toSrc, *vert, devBounds);
-    set_conic_coeffs(p, *vert, weight);
-    *vert += kVertsPerQuad;
-}
-
-void add_quads(const SkPoint p[3],
-               int subdiv,
-               const SkMatrix* toDevice,
-               const SkMatrix* toSrc,
-               BezierVertex** vert,
-               SkRect* devBounds) {
-    SkASSERT(subdiv >= 0);
-    if (subdiv) {
-        SkPoint newP[5];
-        SkChopQuadAtHalf(p, newP);
-        add_quads(newP + 0, subdiv-1, toDevice, toSrc, vert, devBounds);
-        add_quads(newP + 2, subdiv-1, toDevice, toSrc, vert, devBounds);
-    } else {
-        bloat_quad(p, toDevice, toSrc, *vert, devBounds);
-        set_uv_quad(p, *vert);
-        *vert += kVertsPerQuad;
-    }
-}
-
-void add_line(const SkPoint p[2],
-              const SkMatrix* toSrc,
-              GrColor coverage,
-              LineVertex** vert) {
-    const SkPoint& a = p[0];
-    const SkPoint& b = p[1];
-
-    SkVector ortho, vec = b;
-    vec -= a;
-
-    if (vec.setLength(SK_ScalarHalf)) {
-        // Create a vector orthogonal to 'vec' and of unit length
-        ortho.fX = 2.0f * vec.fY;
-        ortho.fY = -2.0f * vec.fX;
-
-        (*vert)[0].fPos = a;
-        (*vert)[0].fCoverage = coverage;
-        (*vert)[1].fPos = b;
-        (*vert)[1].fCoverage = coverage;
-        (*vert)[2].fPos = a - vec + ortho;
-        (*vert)[2].fCoverage = 0;
-        (*vert)[3].fPos = b + vec + ortho;
-        (*vert)[3].fCoverage = 0;
-        (*vert)[4].fPos = a - vec - ortho;
-        (*vert)[4].fCoverage = 0;
-        (*vert)[5].fPos = b + vec - ortho;
-        (*vert)[5].fCoverage = 0;
-
-        if (NULL != toSrc) {
-            toSrc->mapPointsWithStride(&(*vert)->fPos,
-                                       sizeof(LineVertex),
-                                       kVertsPerLineSeg);
-        }
-    } else {
-        // just make it degenerate and likely offscreen
-        for (int i = 0; i < kVertsPerLineSeg; ++i) {
-            (*vert)[i].fPos.set(SK_ScalarMax, SK_ScalarMax);
-        }
-    }
-
-    *vert += kVertsPerLineSeg;
-}
-
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-namespace {
-
-// position + edge
-extern const GrVertexAttrib gHairlineBezierAttribs[] = {
-    {kVec2f_GrVertexAttribType, 0,                  kPosition_GrVertexAttribBinding},
-    {kVec4f_GrVertexAttribType, sizeof(SkPoint),    kEffect_GrVertexAttribBinding}
-};
-
-// position + coverage
-extern const GrVertexAttrib gHairlineLineAttribs[] = {
-    {kVec2f_GrVertexAttribType,  0,               kPosition_GrVertexAttribBinding},
-    {kVec4ub_GrVertexAttribType, sizeof(SkPoint), kCoverage_GrVertexAttribBinding},
-};
-
-};
-
-bool GrAAHairLinePathRenderer::createLineGeom(const SkPath& path,
-                                              GrDrawTarget* target,
-                                              const PtArray& lines,
-                                              int lineCnt,
-                                              GrDrawTarget::AutoReleaseGeometry* arg,
-                                              SkRect* devBounds) {
-    GrDrawState* drawState = target->drawState();
-
-    const SkMatrix& viewM = drawState->getViewMatrix();
-
-    int vertCnt = kVertsPerLineSeg * lineCnt;
-
-    drawState->setVertexAttribs<gHairlineLineAttribs>(SK_ARRAY_COUNT(gHairlineLineAttribs));
-    SkASSERT(sizeof(LineVertex) == drawState->getVertexSize());
-
-    if (!arg->set(target, vertCnt, 0)) {
-        return false;
-    }
-
-    LineVertex* verts = reinterpret_cast<LineVertex*>(arg->vertices());
-
-    const SkMatrix* toSrc = NULL;
-    SkMatrix ivm;
-
-    if (viewM.hasPerspective()) {
-        if (viewM.invert(&ivm)) {
-            toSrc = &ivm;
-        }
-    }
-    devBounds->set(lines.begin(), lines.count());
-    for (int i = 0; i < lineCnt; ++i) {
-        add_line(&lines[2*i], toSrc, drawState->getCoverageColor(), &verts);
-    }
-    // All the verts computed by add_line are within sqrt(1^2 + 0.5^2) of the end points.
-    static const SkScalar kSqrtOfOneAndAQuarter = 1.118f;
-    // Add a little extra to account for vector normalization precision.
-    static const SkScalar kOutset = kSqrtOfOneAndAQuarter + SK_Scalar1 / 20;
-    devBounds->outset(kOutset, kOutset);
-
-    return true;
-}
-
-bool GrAAHairLinePathRenderer::createBezierGeom(
-                                          const SkPath& path,
-                                          GrDrawTarget* target,
-                                          const PtArray& quads,
-                                          int quadCnt,
-                                          const PtArray& conics,
-                                          int conicCnt,
-                                          const IntArray& qSubdivs,
-                                          const FloatArray& cWeights,
-                                          GrDrawTarget::AutoReleaseGeometry* arg,
-                                          SkRect* devBounds) {
-    GrDrawState* drawState = target->drawState();
-
-    const SkMatrix& viewM = drawState->getViewMatrix();
-
-    int vertCnt = kVertsPerQuad * quadCnt + kVertsPerQuad * conicCnt;
-
-    target->drawState()->setVertexAttribs<gHairlineBezierAttribs>(SK_ARRAY_COUNT(gHairlineBezierAttribs));
-    SkASSERT(sizeof(BezierVertex) == target->getDrawState().getVertexSize());
-
-    if (!arg->set(target, vertCnt, 0)) {
-        return false;
-    }
-
-    BezierVertex* verts = reinterpret_cast<BezierVertex*>(arg->vertices());
-
-    const SkMatrix* toDevice = NULL;
-    const SkMatrix* toSrc = NULL;
-    SkMatrix ivm;
-
-    if (viewM.hasPerspective()) {
-        if (viewM.invert(&ivm)) {
-            toDevice = &viewM;
-            toSrc = &ivm;
-        }
-    }
-
-    // Seed the dev bounds with some pts known to be inside. Each quad and conic grows the bounding
-    // box to include its vertices.
-    SkPoint seedPts[2];
-    if (quadCnt) {
-        seedPts[0] = quads[0];
-        seedPts[1] = quads[2];
-    } else if (conicCnt) {
-        seedPts[0] = conics[0];
-        seedPts[1] = conics[2];
-    }
-    if (NULL != toDevice) {
-        toDevice->mapPoints(seedPts, 2);
-    }
-    devBounds->set(seedPts[0], seedPts[1]);
-
-    int unsubdivQuadCnt = quads.count() / 3;
-    for (int i = 0; i < unsubdivQuadCnt; ++i) {
-        SkASSERT(qSubdivs[i] >= 0);
-        add_quads(&quads[3*i], qSubdivs[i], toDevice, toSrc, &verts, devBounds);
-    }
-
-    // Start Conics
-    for (int i = 0; i < conicCnt; ++i) {
-        add_conics(&conics[3*i], cWeights[i], toDevice, toSrc, &verts, devBounds);
-    }
-    return true;
-}
-
-bool GrAAHairLinePathRenderer::canDrawPath(const SkPath& path,
-                                           const SkStrokeRec& stroke,
-                                           const GrDrawTarget* target,
-                                           bool antiAlias) const {
-    if (!antiAlias) {
-        return false;
-    }
-
-    if (!IsStrokeHairlineOrEquivalent(stroke,
-                                      target->getDrawState().getViewMatrix(),
-                                      NULL)) {
-        return false;
-    }
-
-    if (SkPath::kLine_SegmentMask == path.getSegmentMasks() ||
-        target->caps()->shaderDerivativeSupport()) {
-        return true;
-    }
-    return false;
-}
-
-template <class VertexType>
-bool check_bounds(GrDrawState* drawState, const SkRect& devBounds, void* vertices, int vCount)
-{
-    SkRect tolDevBounds = devBounds;
-    // The bounds ought to be tight, but in perspective the below code runs the verts
-    // through the view matrix to get back to dev coords, which can introduce imprecision.
-    if (drawState->getViewMatrix().hasPerspective()) {
-        tolDevBounds.outset(SK_Scalar1 / 1000, SK_Scalar1 / 1000);
-    } else {
-        // Non-persp matrices cause this path renderer to draw in device space.
-        SkASSERT(drawState->getViewMatrix().isIdentity());
-    }
-    SkRect actualBounds;
-
-    VertexType* verts = reinterpret_cast<VertexType*>(vertices);
-    bool first = true;
-    for (int i = 0; i < vCount; ++i) {
-        SkPoint pos = verts[i].fPos;
-        // This is a hack to workaround the fact that we move some degenerate segments offscreen.
-        if (SK_ScalarMax == pos.fX) {
-            continue;
-        }
-        drawState->getViewMatrix().mapPoints(&pos, 1);
-        if (first) {
-            actualBounds.set(pos.fX, pos.fY, pos.fX, pos.fY);
-            first = false;
-        } else {
-            actualBounds.growToInclude(pos.fX, pos.fY);
-        }
-    }
-    if (!first) {
-        return tolDevBounds.contains(actualBounds);
-    }
-
-    return true;
-}
-
-bool GrAAHairLinePathRenderer::onDrawPath(const SkPath& path,
-                                          const SkStrokeRec& stroke,
-                                          GrDrawTarget* target,
-                                          bool antiAlias) {
-    GrDrawState* drawState = target->drawState();
-
-    SkScalar hairlineCoverage;
-    if (IsStrokeHairlineOrEquivalent(stroke,
-                                     target->getDrawState().getViewMatrix(),
-                                     &hairlineCoverage)) {
-        uint8_t newCoverage = SkScalarRoundToInt(hairlineCoverage *
-                                                 target->getDrawState().getCoverage());
-        target->drawState()->setCoverage(newCoverage);
-    }
-
-    SkIRect devClipBounds;
-    target->getClip()->getConservativeBounds(drawState->getRenderTarget(), &devClipBounds);
-
-    int lineCnt;
-    int quadCnt;
-    int conicCnt;
-    PREALLOC_PTARRAY(128) lines;
-    PREALLOC_PTARRAY(128) quads;
-    PREALLOC_PTARRAY(128) conics;
-    IntArray qSubdivs;
-    FloatArray cWeights;
-    quadCnt = generate_lines_and_quads(path, drawState->getViewMatrix(), devClipBounds,
-                                       &lines, &quads, &conics, &qSubdivs, &cWeights);
-    lineCnt = lines.count() / 2;
-    conicCnt = conics.count() / 3;
-
-    // do lines first
-    if (lineCnt) {
-        GrDrawTarget::AutoReleaseGeometry arg;
-        SkRect devBounds;
-
-        if (!this->createLineGeom(path,
-                                  target,
-                                  lines,
-                                  lineCnt,
-                                  &arg,
-                                  &devBounds)) {
-            return false;
-        }
-
-        GrDrawTarget::AutoStateRestore asr;
-
-        // createLineGeom transforms the geometry to device space when the matrix does not have
-        // perspective.
-        if (target->getDrawState().getViewMatrix().hasPerspective()) {
-            asr.set(target, GrDrawTarget::kPreserve_ASRInit);
-        } else if (!asr.setIdentity(target, GrDrawTarget::kPreserve_ASRInit)) {
-            return false;
-        }
-        GrDrawState* drawState = target->drawState();
-
-        // Check devBounds
-        SkASSERT(check_bounds<LineVertex>(drawState, devBounds, arg.vertices(),
-                                          kVertsPerLineSeg * lineCnt));
-
-        {
-            GrDrawState::AutoRestoreEffects are(drawState);
-            target->setIndexSourceToBuffer(fLinesIndexBuffer);
-            int lines = 0;
-            while (lines < lineCnt) {
-                int n = SkTMin(lineCnt - lines, kNumLineSegsInIdxBuffer);
-                target->drawIndexed(kTriangles_GrPrimitiveType,
-                                    kVertsPerLineSeg*lines,     // startV
-                                    0,                          // startI
-                                    kVertsPerLineSeg*n,         // vCount
-                                    kIdxsPerLineSeg*n,          // iCount
-                                    &devBounds);
-                lines += n;
-            }
-        }
-    }
-
-    // then quadratics/conics
-    if (quadCnt || conicCnt) {
-        GrDrawTarget::AutoReleaseGeometry arg;
-        SkRect devBounds;
-
-        if (!this->createBezierGeom(path,
-                                    target,
-                                    quads,
-                                    quadCnt,
-                                    conics,
-                                    conicCnt,
-                                    qSubdivs,
-                                    cWeights,
-                                    &arg,
-                                    &devBounds)) {
-            return false;
-        }
-
-        GrDrawTarget::AutoStateRestore asr;
-
-        // createGeom transforms the geometry to device space when the matrix does not have
-        // perspective.
-        if (target->getDrawState().getViewMatrix().hasPerspective()) {
-            asr.set(target, GrDrawTarget::kPreserve_ASRInit);
-        } else if (!asr.setIdentity(target, GrDrawTarget::kPreserve_ASRInit)) {
-            return false;
-        }
-        GrDrawState* drawState = target->drawState();
-
-        static const int kEdgeAttrIndex = 1;
-
-        // Check devBounds
-        SkASSERT(check_bounds<BezierVertex>(drawState, devBounds, arg.vertices(),
-                                            kVertsPerQuad * quadCnt + kVertsPerQuad * conicCnt));
-
-        if (quadCnt > 0) {
-            GrEffect* hairQuadEffect = GrQuadEffect::Create(kHairlineAA_GrEffectEdgeType,
-                                                            *target->caps());
-            SkASSERT(NULL != hairQuadEffect);
-            GrDrawState::AutoRestoreEffects are(drawState);
-            target->setIndexSourceToBuffer(fQuadsIndexBuffer);
-            drawState->addCoverageEffect(hairQuadEffect, kEdgeAttrIndex)->unref();
-            int quads = 0;
-            while (quads < quadCnt) {
-                int n = SkTMin(quadCnt - quads, kNumQuadsInIdxBuffer);
-                target->drawIndexed(kTriangles_GrPrimitiveType,
-                                    kVertsPerQuad*quads,               // startV
-                                    0,                                 // startI
-                                    kVertsPerQuad*n,                   // vCount
-                                    kIdxsPerQuad*n,                    // iCount
-                                    &devBounds);
-                quads += n;
-            }
-        }
-
-        if (conicCnt > 0) {
-            GrDrawState::AutoRestoreEffects are(drawState);
-            GrEffect* hairConicEffect = GrConicEffect::Create(kHairlineAA_GrEffectEdgeType,
-                                                              *target->caps());
-            SkASSERT(NULL != hairConicEffect);
-            drawState->addCoverageEffect(hairConicEffect, 1, 2)->unref();
-            int conics = 0;
-            while (conics < conicCnt) {
-                int n = SkTMin(conicCnt - conics, kNumQuadsInIdxBuffer);
-                target->drawIndexed(kTriangles_GrPrimitiveType,
-                                    kVertsPerQuad*(quadCnt + conics),  // startV
-                                    0,                                 // startI
-                                    kVertsPerQuad*n,                   // vCount
-                                    kIdxsPerQuad*n,                    // iCount
-                                    &devBounds);
-                conics += n;
-            }
-        }
-    }
-
-    target->resetIndexSource();
-
-    return true;
-}
diff --git a/gfx/skia/skia/src/gpu/GrAAHairLinePathRenderer.h b/gfx/skia/skia/src/gpu/GrAAHairLinePathRenderer.h
deleted file mode 100644
index 22cc876eab82..000000000000
--- a/gfx/skia/skia/src/gpu/GrAAHairLinePathRenderer.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrAAHairLinePathRenderer_DEFINED
-#define GrAAHairLinePathRenderer_DEFINED
-
-#include "GrPathRenderer.h"
-
-class GrAAHairLinePathRenderer : public GrPathRenderer {
-public:
-    virtual ~GrAAHairLinePathRenderer();
-
-    static GrPathRenderer* Create(GrContext* context);
-
-    virtual bool canDrawPath(const SkPath& path,
-                             const SkStrokeRec& stroke,
-                             const GrDrawTarget* target,
-                             bool antiAlias) const SK_OVERRIDE;
-
-    typedef SkTArray<SkPoint, true> PtArray;
-    typedef SkTArray<int, true> IntArray;
-    typedef SkTArray<float, true> FloatArray;
-
-protected:
-    virtual bool onDrawPath(const SkPath& path,
-                            const SkStrokeRec& stroke,
-                            GrDrawTarget* target,
-                            bool antiAlias) SK_OVERRIDE;
-
-private:
-    GrAAHairLinePathRenderer(const GrContext* context,
-                             const GrIndexBuffer* fLinesIndexBuffer,
-                             const GrIndexBuffer* fQuadsIndexBuffer);
-
-    bool createLineGeom(const SkPath& path,
-                        GrDrawTarget* target,
-                        const PtArray& lines,
-                        int lineCnt,
-                        GrDrawTarget::AutoReleaseGeometry* arg,
-                        SkRect* devBounds);
-
-    bool createBezierGeom(const SkPath& path,
-                          GrDrawTarget* target,
-                          const PtArray& quads,
-                          int quadCnt,
-                          const PtArray& conics,
-                          int conicCnt,
-                          const IntArray& qSubdivs,
-                          const FloatArray& cWeights,
-                          GrDrawTarget::AutoReleaseGeometry* arg,
-                          SkRect* devBounds);
-
-    const GrIndexBuffer*        fLinesIndexBuffer;
-    const GrIndexBuffer*        fQuadsIndexBuffer;
-
-    typedef GrPathRenderer INHERITED;
-};
-
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/GrAARectRenderer.cpp b/gfx/skia/skia/src/gpu/GrAARectRenderer.cpp
deleted file mode 100644
index 59e9b6f810d7..000000000000
--- a/gfx/skia/skia/src/gpu/GrAARectRenderer.cpp
+++ /dev/null
@@ -1,929 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrAARectRenderer.h"
-#include "GrGpu.h"
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
-#include "gl/GrGLVertexEffect.h"
-#include "GrTBackendEffectFactory.h"
-#include "SkColorPriv.h"
-#include "effects/GrVertexEffect.h"
-
-///////////////////////////////////////////////////////////////////////////////
-class GrGLAlignedRectEffect;
-
-// Axis Aligned special case
-class GrAlignedRectEffect : public GrVertexEffect {
-public:
-    static GrEffect* Create() {
-        GR_CREATE_STATIC_EFFECT(gAlignedRectEffect, GrAlignedRectEffect, ());
-        gAlignedRectEffect->ref();
-        return gAlignedRectEffect;
-    }
-
-    virtual ~GrAlignedRectEffect() {}
-
-    static const char* Name() { return "AlignedRectEdge"; }
-
-    virtual void getConstantColorComponents(GrColor* color,
-                                            uint32_t* validFlags) const SK_OVERRIDE {
-        *validFlags = 0;
-    }
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE {
-        return GrTBackendEffectFactory<GrAlignedRectEffect>::getInstance();
-    }
-
-    class GLEffect : public GrGLVertexEffect {
-    public:
-        GLEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&)
-        : INHERITED (factory) {}
-
-        virtual void emitCode(GrGLFullShaderBuilder* builder,
-                              const GrDrawEffect& drawEffect,
-                              const GrEffectKey& key,
-                              const char* outputColor,
-                              const char* inputColor,
-                              const TransformedCoordsArray&,
-                              const TextureSamplerArray& samplers) SK_OVERRIDE {
-            // setup the varying for the Axis aligned rect effect
-            //      xy -> interpolated offset
-            //      zw -> w/2+0.5, h/2+0.5
-            const char *vsRectName, *fsRectName;
-            builder->addVarying(kVec4f_GrSLType, "Rect", &vsRectName, &fsRectName);
-            const SkString* attr0Name =
-                builder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[0]);
-            builder->vsCodeAppendf("\t%s = %s;\n", vsRectName, attr0Name->c_str());
-
-            // TODO: compute all these offsets, spans, and scales in the VS
-            builder->fsCodeAppendf("\tfloat insetW = min(1.0, %s.z) - 0.5;\n", fsRectName);
-            builder->fsCodeAppendf("\tfloat insetH = min(1.0, %s.w) - 0.5;\n", fsRectName);
-            builder->fsCodeAppend("\tfloat outset = 0.5;\n");
-            // For rects > 1 pixel wide and tall the span's are noops (i.e., 1.0). For rects
-            // < 1 pixel wide or tall they serve to normalize the < 1 ramp to a 0 .. 1 range.
-            builder->fsCodeAppend("\tfloat spanW = insetW + outset;\n");
-            builder->fsCodeAppend("\tfloat spanH = insetH + outset;\n");
-            // For rects < 1 pixel wide or tall, these scale factors are used to cap the maximum
-            // value of coverage that is used. In other words it is the coverage that is
-            // used in the interior of the rect after the ramp.
-            builder->fsCodeAppend("\tfloat scaleW = min(1.0, 2.0*insetW/spanW);\n");
-            builder->fsCodeAppend("\tfloat scaleH = min(1.0, 2.0*insetH/spanH);\n");
-
-            // Compute the coverage for the rect's width
-            builder->fsCodeAppendf(
-                "\tfloat coverage = scaleW*clamp((%s.z-abs(%s.x))/spanW, 0.0, 1.0);\n", fsRectName,
-                fsRectName);
-            // Compute the coverage for the rect's height and merge with the width
-            builder->fsCodeAppendf(
-                "\tcoverage = coverage*scaleH*clamp((%s.w-abs(%s.y))/spanH, 0.0, 1.0);\n",
-                fsRectName, fsRectName);
-
-
-            builder->fsCodeAppendf("\t%s = %s;\n", outputColor,
-                                   (GrGLSLExpr4(inputColor) * GrGLSLExpr1("coverage")).c_str());
-        }
-
-        static void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*) {}
-
-        virtual void setData(const GrGLUniformManager& uman, const GrDrawEffect&) SK_OVERRIDE {}
-
-    private:
-        typedef GrGLVertexEffect INHERITED;
-    };
-
-
-private:
-    GrAlignedRectEffect() : GrVertexEffect() {
-        this->addVertexAttrib(kVec4f_GrSLType);
-    }
-
-    virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE { return true; }
-
-    GR_DECLARE_EFFECT_TEST;
-
-    typedef GrVertexEffect INHERITED;
-};
-
-
-GR_DEFINE_EFFECT_TEST(GrAlignedRectEffect);
-
-GrEffect* GrAlignedRectEffect::TestCreate(SkRandom* random,
-                                          GrContext* context,
-                                          const GrDrawTargetCaps&,
-                                          GrTexture* textures[]) {
-    return GrAlignedRectEffect::Create();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-class GrGLRectEffect;
-
-/**
- * The output of this effect is a modulation of the input color and coverage
- * for an arbitrarily oriented rect. The rect is specified as:
- *      Center of the rect
- *      Unit vector point down the height of the rect
- *      Half width + 0.5
- *      Half height + 0.5
- * The center and vector are stored in a vec4 varying ("RectEdge") with the
- * center in the xy components and the vector in the zw components.
- * The munged width and height are stored in a vec2 varying ("WidthHeight")
- * with the width in x and the height in y.
- */
-class GrRectEffect : public GrVertexEffect {
-public:
-    static GrEffect* Create() {
-        GR_CREATE_STATIC_EFFECT(gRectEffect, GrRectEffect, ());
-        gRectEffect->ref();
-        return gRectEffect;
-    }
-
-    virtual ~GrRectEffect() {}
-
-    static const char* Name() { return "RectEdge"; }
-
-    virtual void getConstantColorComponents(GrColor* color,
-                                            uint32_t* validFlags) const SK_OVERRIDE {
-        *validFlags = 0;
-    }
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE {
-        return GrTBackendEffectFactory<GrRectEffect>::getInstance();
-    }
-
-    class GLEffect : public GrGLVertexEffect {
-    public:
-        GLEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&)
-        : INHERITED (factory) {}
-
-        virtual void emitCode(GrGLFullShaderBuilder* builder,
-                              const GrDrawEffect& drawEffect,
-                              const GrEffectKey& key,
-                              const char* outputColor,
-                              const char* inputColor,
-                              const TransformedCoordsArray&,
-                              const TextureSamplerArray& samplers) SK_OVERRIDE {
-            // setup the varying for the center point and the unit vector
-            // that points down the height of the rect
-            const char *vsRectEdgeName, *fsRectEdgeName;
-            builder->addVarying(kVec4f_GrSLType, "RectEdge",
-                                &vsRectEdgeName, &fsRectEdgeName);
-            const SkString* attr0Name =
-                builder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[0]);
-            builder->vsCodeAppendf("\t%s = %s;\n", vsRectEdgeName, attr0Name->c_str());
-
-            // setup the varying for width/2+.5 and height/2+.5
-            const char *vsWidthHeightName, *fsWidthHeightName;
-            builder->addVarying(kVec2f_GrSLType, "WidthHeight",
-                                &vsWidthHeightName, &fsWidthHeightName);
-            const SkString* attr1Name =
-                builder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[1]);
-            builder->vsCodeAppendf("\t%s = %s;\n", vsWidthHeightName, attr1Name->c_str());
-
-            // TODO: compute all these offsets, spans, and scales in the VS
-            builder->fsCodeAppendf("\tfloat insetW = min(1.0, %s.x) - 0.5;\n", fsWidthHeightName);
-            builder->fsCodeAppendf("\tfloat insetH = min(1.0, %s.y) - 0.5;\n", fsWidthHeightName);
-            builder->fsCodeAppend("\tfloat outset = 0.5;\n");
-            // For rects > 1 pixel wide and tall the span's are noops (i.e., 1.0). For rects
-            // < 1 pixel wide or tall they serve to normalize the < 1 ramp to a 0 .. 1 range.
-            builder->fsCodeAppend("\tfloat spanW = insetW + outset;\n");
-            builder->fsCodeAppend("\tfloat spanH = insetH + outset;\n");
-            // For rects < 1 pixel wide or tall, these scale factors are used to cap the maximum
-            // value of coverage that is used. In other words it is the coverage that is
-            // used in the interior of the rect after the ramp.
-            builder->fsCodeAppend("\tfloat scaleW = min(1.0, 2.0*insetW/spanW);\n");
-            builder->fsCodeAppend("\tfloat scaleH = min(1.0, 2.0*insetH/spanH);\n");
-
-            // Compute the coverage for the rect's width
-            builder->fsCodeAppendf("\tvec2 offset = %s.xy - %s.xy;\n",
-                                   builder->fragmentPosition(), fsRectEdgeName);
-            builder->fsCodeAppendf("\tfloat perpDot = abs(offset.x * %s.w - offset.y * %s.z);\n",
-                                   fsRectEdgeName, fsRectEdgeName);
-            builder->fsCodeAppendf(
-                "\tfloat coverage = scaleW*clamp((%s.x-perpDot)/spanW, 0.0, 1.0);\n",
-                fsWidthHeightName);
-
-            // Compute the coverage for the rect's height and merge with the width
-            builder->fsCodeAppendf("\tperpDot = abs(dot(offset, %s.zw));\n",
-                                   fsRectEdgeName);
-            builder->fsCodeAppendf(
-                    "\tcoverage = coverage*scaleH*clamp((%s.y-perpDot)/spanH, 0.0, 1.0);\n",
-                    fsWidthHeightName);
-
-
-            builder->fsCodeAppendf("\t%s = %s;\n", outputColor,
-                                   (GrGLSLExpr4(inputColor) * GrGLSLExpr1("coverage")).c_str());
-        }
-
-        static void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*) {}
-
-        virtual void setData(const GrGLUniformManager& uman, const GrDrawEffect&) SK_OVERRIDE {}
-
-    private:
-        typedef GrGLVertexEffect INHERITED;
-    };
-
-
-private:
-    GrRectEffect() : GrVertexEffect() {
-        this->addVertexAttrib(kVec4f_GrSLType);
-        this->addVertexAttrib(kVec2f_GrSLType);
-        this->setWillReadFragmentPosition();
-    }
-
-    virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE { return true; }
-
-    GR_DECLARE_EFFECT_TEST;
-
-    typedef GrVertexEffect INHERITED;
-};
-
-
-GR_DEFINE_EFFECT_TEST(GrRectEffect);
-
-GrEffect* GrRectEffect::TestCreate(SkRandom* random,
-                                   GrContext* context,
-                                   const GrDrawTargetCaps&,
-                                   GrTexture* textures[]) {
-    return GrRectEffect::Create();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-namespace {
-
-extern const GrVertexAttrib gAARectCoverageAttribs[] = {
-    {kVec2f_GrVertexAttribType,  0,               kPosition_GrVertexAttribBinding},
-    {kVec4ub_GrVertexAttribType, sizeof(SkPoint), kCoverage_GrVertexAttribBinding},
-};
-
-extern const GrVertexAttrib gAARectColorAttribs[] = {
-    {kVec2f_GrVertexAttribType,  0,               kPosition_GrVertexAttribBinding},
-    {kVec4ub_GrVertexAttribType, sizeof(SkPoint), kColor_GrVertexAttribBinding},
-};
-
-static void set_aa_rect_vertex_attributes(GrDrawState* drawState, bool useCoverage) {
-    if (useCoverage) {
-        drawState->setVertexAttribs<gAARectCoverageAttribs>(SK_ARRAY_COUNT(gAARectCoverageAttribs));
-    } else {
-        drawState->setVertexAttribs<gAARectColorAttribs>(SK_ARRAY_COUNT(gAARectColorAttribs));
-    }
-}
-
-static void set_inset_fan(SkPoint* pts, size_t stride,
-                          const SkRect& r, SkScalar dx, SkScalar dy) {
-    pts->setRectFan(r.fLeft + dx, r.fTop + dy,
-                    r.fRight - dx, r.fBottom - dy, stride);
-}
-
-};
-
-void GrAARectRenderer::reset() {
-    SkSafeSetNull(fAAFillRectIndexBuffer);
-    SkSafeSetNull(fAAMiterStrokeRectIndexBuffer);
-    SkSafeSetNull(fAABevelStrokeRectIndexBuffer);
-}
-
-static const uint16_t gFillAARectIdx[] = {
-    0, 1, 5, 5, 4, 0,
-    1, 2, 6, 6, 5, 1,
-    2, 3, 7, 7, 6, 2,
-    3, 0, 4, 4, 7, 3,
-    4, 5, 6, 6, 7, 4,
-};
-
-static const int kIndicesPerAAFillRect = SK_ARRAY_COUNT(gFillAARectIdx);
-static const int kVertsPerAAFillRect = 8;
-static const int kNumAAFillRectsInIndexBuffer = 256;
-
-GrIndexBuffer* GrAARectRenderer::aaFillRectIndexBuffer(GrGpu* gpu) {
-    static const size_t kAAFillRectIndexBufferSize = kIndicesPerAAFillRect *
-                                                     sizeof(uint16_t) *
-                                                     kNumAAFillRectsInIndexBuffer;
-
-    if (NULL == fAAFillRectIndexBuffer) {
-        fAAFillRectIndexBuffer = gpu->createIndexBuffer(kAAFillRectIndexBufferSize, false);
-        if (NULL != fAAFillRectIndexBuffer) {
-            uint16_t* data = (uint16_t*) fAAFillRectIndexBuffer->map();
-            bool useTempData = (NULL == data);
-            if (useTempData) {
-                data = SkNEW_ARRAY(uint16_t, kNumAAFillRectsInIndexBuffer * kIndicesPerAAFillRect);
-            }
-            for (int i = 0; i < kNumAAFillRectsInIndexBuffer; ++i) {
-                // Each AA filled rect is drawn with 8 vertices and 10 triangles (8 around
-                // the inner rect (for AA) and 2 for the inner rect.
-                int baseIdx = i * kIndicesPerAAFillRect;
-                uint16_t baseVert = (uint16_t)(i * kVertsPerAAFillRect);
-                for (int j = 0; j < kIndicesPerAAFillRect; ++j) {
-                    data[baseIdx+j] = baseVert + gFillAARectIdx[j];
-                }
-            }
-            if (useTempData) {
-                if (!fAAFillRectIndexBuffer->updateData(data, kAAFillRectIndexBufferSize)) {
-                    SkFAIL("Can't get AA Fill Rect indices into buffer!");
-                }
-                SkDELETE_ARRAY(data);
-            } else {
-                fAAFillRectIndexBuffer->unmap();
-            }
-        }
-    }
-
-    return fAAFillRectIndexBuffer;
-}
-
-static const uint16_t gMiterStrokeAARectIdx[] = {
-    0 + 0, 1 + 0, 5 + 0, 5 + 0, 4 + 0, 0 + 0,
-    1 + 0, 2 + 0, 6 + 0, 6 + 0, 5 + 0, 1 + 0,
-    2 + 0, 3 + 0, 7 + 0, 7 + 0, 6 + 0, 2 + 0,
-    3 + 0, 0 + 0, 4 + 0, 4 + 0, 7 + 0, 3 + 0,
-
-    0 + 4, 1 + 4, 5 + 4, 5 + 4, 4 + 4, 0 + 4,
-    1 + 4, 2 + 4, 6 + 4, 6 + 4, 5 + 4, 1 + 4,
-    2 + 4, 3 + 4, 7 + 4, 7 + 4, 6 + 4, 2 + 4,
-    3 + 4, 0 + 4, 4 + 4, 4 + 4, 7 + 4, 3 + 4,
-
-    0 + 8, 1 + 8, 5 + 8, 5 + 8, 4 + 8, 0 + 8,
-    1 + 8, 2 + 8, 6 + 8, 6 + 8, 5 + 8, 1 + 8,
-    2 + 8, 3 + 8, 7 + 8, 7 + 8, 6 + 8, 2 + 8,
-    3 + 8, 0 + 8, 4 + 8, 4 + 8, 7 + 8, 3 + 8,
-};
-
-/**
- * As in miter-stroke, index = a + b, and a is the current index, b is the shift
- * from the first index. The index layout:
- * outer AA line: 0~3, 4~7
- * outer edge:    8~11, 12~15
- * inner edge:    16~19
- * inner AA line: 20~23
- * Following comes a bevel-stroke rect and its indices:
- *
- *           4                                 7
- *            *********************************
- *          *   ______________________________  *
- *         *  / 12                          15 \  *
- *        *  /                                  \  *
- *     0 *  |8     16_____________________19  11 |  * 3
- *       *  |       |                    |       |  *
- *       *  |       |  ****************  |       |  *
- *       *  |       |  * 20        23 *  |       |  *
- *       *  |       |  *              *  |       |  *
- *       *  |       |  * 21        22 *  |       |  *
- *       *  |       |  ****************  |       |  *
- *       *  |       |____________________|       |  *
- *     1 *  |9    17                      18   10|  * 2
- *        *  \                                  /  *
- *         *  \13 __________________________14/  *
- *          *                                   *
- *           **********************************
- *          5                                  6
- */
-static const uint16_t gBevelStrokeAARectIdx[] = {
-    // Draw outer AA, from outer AA line to outer edge, shift is 0.
-    0 + 0, 1 + 0, 9 + 0, 9 + 0, 8 + 0, 0 + 0,
-    1 + 0, 5 + 0, 13 + 0, 13 + 0, 9 + 0, 1 + 0,
-    5 + 0, 6 + 0, 14 + 0, 14 + 0, 13 + 0, 5 + 0,
-    6 + 0, 2 + 0, 10 + 0, 10 + 0, 14 + 0, 6 + 0,
-    2 + 0, 3 + 0, 11 + 0, 11 + 0, 10 + 0, 2 + 0,
-    3 + 0, 7 + 0, 15 + 0, 15 + 0, 11 + 0, 3 + 0,
-    7 + 0, 4 + 0, 12 + 0, 12 + 0, 15 + 0, 7 + 0,
-    4 + 0, 0 + 0, 8 + 0, 8 + 0, 12 + 0, 4 + 0,
-
-    // Draw the stroke, from outer edge to inner edge, shift is 8.
-    0 + 8, 1 + 8, 9 + 8, 9 + 8, 8 + 8, 0 + 8,
-    1 + 8, 5 + 8, 9 + 8,
-    5 + 8, 6 + 8, 10 + 8, 10 + 8, 9 + 8, 5 + 8,
-    6 + 8, 2 + 8, 10 + 8,
-    2 + 8, 3 + 8, 11 + 8, 11 + 8, 10 + 8, 2 + 8,
-    3 + 8, 7 + 8, 11 + 8,
-    7 + 8, 4 + 8, 8 + 8, 8 + 8, 11 + 8, 7 + 8,
-    4 + 8, 0 + 8, 8 + 8,
-
-    // Draw the inner AA, from inner edge to inner AA line, shift is 16.
-    0 + 16, 1 + 16, 5 + 16, 5 + 16, 4 + 16, 0 + 16,
-    1 + 16, 2 + 16, 6 + 16, 6 + 16, 5 + 16, 1 + 16,
-    2 + 16, 3 + 16, 7 + 16, 7 + 16, 6 + 16, 2 + 16,
-    3 + 16, 0 + 16, 4 + 16, 4 + 16, 7 + 16, 3 + 16,
-};
-
-int GrAARectRenderer::aaStrokeRectIndexCount(bool miterStroke) {
-    return miterStroke ? SK_ARRAY_COUNT(gMiterStrokeAARectIdx) :
-                         SK_ARRAY_COUNT(gBevelStrokeAARectIdx);
-}
-
-GrIndexBuffer* GrAARectRenderer::aaStrokeRectIndexBuffer(GrGpu* gpu, bool miterStroke) {
-    if (miterStroke) {
-        if (NULL == fAAMiterStrokeRectIndexBuffer) {
-            fAAMiterStrokeRectIndexBuffer =
-                gpu->createIndexBuffer(sizeof(gMiterStrokeAARectIdx), false);
-            if (NULL != fAAMiterStrokeRectIndexBuffer) {
-#ifdef SK_DEBUG
-                bool updated =
-#endif
-                fAAMiterStrokeRectIndexBuffer->updateData(gMiterStrokeAARectIdx,
-                                                          sizeof(gMiterStrokeAARectIdx));
-                GR_DEBUGASSERT(updated);
-            }
-        }
-        return fAAMiterStrokeRectIndexBuffer;
-    } else {
-        if (NULL == fAABevelStrokeRectIndexBuffer) {
-            fAABevelStrokeRectIndexBuffer =
-                gpu->createIndexBuffer(sizeof(gBevelStrokeAARectIdx), false);
-            if (NULL != fAABevelStrokeRectIndexBuffer) {
-#ifdef SK_DEBUG
-                bool updated =
-#endif
-                fAABevelStrokeRectIndexBuffer->updateData(gBevelStrokeAARectIdx,
-                                                          sizeof(gBevelStrokeAARectIdx));
-                GR_DEBUGASSERT(updated);
-            }
-        }
-        return fAABevelStrokeRectIndexBuffer;
-    }
-}
-
-void GrAARectRenderer::geometryFillAARect(GrGpu* gpu,
-                                          GrDrawTarget* target,
-                                          const SkRect& rect,
-                                          const SkMatrix& combinedMatrix,
-                                          const SkRect& devRect,
-                                          bool useVertexCoverage) {
-    GrDrawState* drawState = target->drawState();
-
-    set_aa_rect_vertex_attributes(drawState, useVertexCoverage);
-
-    GrDrawTarget::AutoReleaseGeometry geo(target, 8, 0);
-    if (!geo.succeeded()) {
-        GrPrintf("Failed to get space for vertices!\n");
-        return;
-    }
-
-    GrIndexBuffer* indexBuffer = this->aaFillRectIndexBuffer(gpu);
-    if (NULL == indexBuffer) {
-        GrPrintf("Failed to create index buffer!\n");
-        return;
-    }
-
-    intptr_t verts = reinterpret_cast<intptr_t>(geo.vertices());
-    size_t vsize = drawState->getVertexSize();
-    SkASSERT(sizeof(SkPoint) + sizeof(GrColor) == vsize);
-
-    SkPoint* fan0Pos = reinterpret_cast<SkPoint*>(verts);
-    SkPoint* fan1Pos = reinterpret_cast<SkPoint*>(verts + 4 * vsize);
-
-    SkScalar inset = SkMinScalar(devRect.width(), SK_Scalar1);
-    inset = SK_ScalarHalf * SkMinScalar(inset, devRect.height());
-
-    if (combinedMatrix.rectStaysRect()) {
-        // Temporarily #if'ed out. We don't want to pass in the devRect but
-        // right now it is computed in GrContext::apply_aa_to_rect and we don't
-        // want to throw away the work
-#if 0
-        SkRect devRect;
-        combinedMatrix.mapRect(&devRect, rect);
-#endif
-
-        set_inset_fan(fan0Pos, vsize, devRect, -SK_ScalarHalf, -SK_ScalarHalf);
-        set_inset_fan(fan1Pos, vsize, devRect, inset,  inset);
-    } else {
-        // compute transformed (1, 0) and (0, 1) vectors
-        SkVector vec[2] = {
-          { combinedMatrix[SkMatrix::kMScaleX], combinedMatrix[SkMatrix::kMSkewY] },
-          { combinedMatrix[SkMatrix::kMSkewX],  combinedMatrix[SkMatrix::kMScaleY] }
-        };
-
-        vec[0].normalize();
-        vec[0].scale(SK_ScalarHalf);
-        vec[1].normalize();
-        vec[1].scale(SK_ScalarHalf);
-
-        // create the rotated rect
-        fan0Pos->setRectFan(rect.fLeft, rect.fTop,
-                            rect.fRight, rect.fBottom, vsize);
-        combinedMatrix.mapPointsWithStride(fan0Pos, vsize, 4);
-
-        // Now create the inset points and then outset the original
-        // rotated points
-
-        // TL
-        *((SkPoint*)((intptr_t)fan1Pos + 0 * vsize)) =
-            *((SkPoint*)((intptr_t)fan0Pos + 0 * vsize)) + vec[0] + vec[1];
-        *((SkPoint*)((intptr_t)fan0Pos + 0 * vsize)) -= vec[0] + vec[1];
-        // BL
-        *((SkPoint*)((intptr_t)fan1Pos + 1 * vsize)) =
-            *((SkPoint*)((intptr_t)fan0Pos + 1 * vsize)) + vec[0] - vec[1];
-        *((SkPoint*)((intptr_t)fan0Pos + 1 * vsize)) -= vec[0] - vec[1];
-        // BR
-        *((SkPoint*)((intptr_t)fan1Pos + 2 * vsize)) =
-            *((SkPoint*)((intptr_t)fan0Pos + 2 * vsize)) - vec[0] - vec[1];
-        *((SkPoint*)((intptr_t)fan0Pos + 2 * vsize)) += vec[0] + vec[1];
-        // TR
-        *((SkPoint*)((intptr_t)fan1Pos + 3 * vsize)) =
-            *((SkPoint*)((intptr_t)fan0Pos + 3 * vsize)) - vec[0] + vec[1];
-        *((SkPoint*)((intptr_t)fan0Pos + 3 * vsize)) += vec[0] - vec[1];
-    }
-
-    verts += sizeof(SkPoint);
-    for (int i = 0; i < 4; ++i) {
-        *reinterpret_cast<GrColor*>(verts + i * vsize) = 0;
-    }
-
-    int scale;
-    if (inset < SK_ScalarHalf) {
-        scale = SkScalarFloorToInt(512.0f * inset / (inset + SK_ScalarHalf));
-        SkASSERT(scale >= 0 && scale <= 255);
-    } else {
-        scale = 0xff;
-    }
-
-    GrColor innerColor;
-    if (useVertexCoverage) {
-        innerColor = GrColorPackRGBA(scale, scale, scale, scale);
-    } else {
-        if (0xff == scale) {
-            innerColor = target->getDrawState().getColor();
-        } else {
-            innerColor = SkAlphaMulQ(target->getDrawState().getColor(), scale);
-        }
-    }
-
-    verts += 4 * vsize;
-    for (int i = 0; i < 4; ++i) {
-        *reinterpret_cast<GrColor*>(verts + i * vsize) = innerColor;
-    }
-
-    target->setIndexSourceToBuffer(indexBuffer);
-    target->drawIndexedInstances(kTriangles_GrPrimitiveType, 1,
-                                 kVertsPerAAFillRect,
-                                 kIndicesPerAAFillRect);
-    target->resetIndexSource();
-}
-
-namespace {
-
-// Rotated
-struct RectVertex {
-    SkPoint fPos;
-    SkPoint fCenter;
-    SkPoint fDir;
-    SkPoint fWidthHeight;
-};
-
-// Rotated
-extern const GrVertexAttrib gAARectVertexAttribs[] = {
-    { kVec2f_GrVertexAttribType, 0,                 kPosition_GrVertexAttribBinding },
-    { kVec4f_GrVertexAttribType, sizeof(SkPoint),   kEffect_GrVertexAttribBinding },
-    { kVec2f_GrVertexAttribType, 3*sizeof(SkPoint), kEffect_GrVertexAttribBinding }
-};
-
-// Axis Aligned
-struct AARectVertex {
-    SkPoint fPos;
-    SkPoint fOffset;
-    SkPoint fWidthHeight;
-};
-
-// Axis Aligned
-extern const GrVertexAttrib gAAAARectVertexAttribs[] = {
-    { kVec2f_GrVertexAttribType, 0,                 kPosition_GrVertexAttribBinding },
-    { kVec4f_GrVertexAttribType, sizeof(SkPoint),   kEffect_GrVertexAttribBinding },
-};
-
-};
-
-void GrAARectRenderer::shaderFillAARect(GrGpu* gpu,
-                                        GrDrawTarget* target,
-                                        const SkRect& rect,
-                                        const SkMatrix& combinedMatrix) {
-    GrDrawState* drawState = target->drawState();
-
-    SkPoint center = SkPoint::Make(rect.centerX(), rect.centerY());
-    combinedMatrix.mapPoints(&center, 1);
-
-    // compute transformed (0, 1) vector
-    SkVector dir = { combinedMatrix[SkMatrix::kMSkewX], combinedMatrix[SkMatrix::kMScaleY] };
-    dir.normalize();
-
-    // compute transformed (width, 0) and (0, height) vectors
-    SkVector vec[2] = {
-      { combinedMatrix[SkMatrix::kMScaleX], combinedMatrix[SkMatrix::kMSkewY] },
-      { combinedMatrix[SkMatrix::kMSkewX],  combinedMatrix[SkMatrix::kMScaleY] }
-    };
-
-    SkScalar newWidth = SkScalarHalf(rect.width() * vec[0].length()) + SK_ScalarHalf;
-    SkScalar newHeight = SkScalarHalf(rect.height() * vec[1].length()) + SK_ScalarHalf;
-    drawState->setVertexAttribs<gAARectVertexAttribs>(SK_ARRAY_COUNT(gAARectVertexAttribs));
-    SkASSERT(sizeof(RectVertex) == drawState->getVertexSize());
-
-    GrDrawTarget::AutoReleaseGeometry geo(target, 4, 0);
-    if (!geo.succeeded()) {
-        GrPrintf("Failed to get space for vertices!\n");
-        return;
-    }
-
-    RectVertex* verts = reinterpret_cast<RectVertex*>(geo.vertices());
-
-    GrEffect* effect = GrRectEffect::Create();
-    static const int kRectAttrIndex = 1;
-    static const int kWidthIndex = 2;
-    drawState->addCoverageEffect(effect, kRectAttrIndex, kWidthIndex)->unref();
-
-    for (int i = 0; i < 4; ++i) {
-        verts[i].fCenter = center;
-        verts[i].fDir = dir;
-        verts[i].fWidthHeight.fX = newWidth;
-        verts[i].fWidthHeight.fY = newHeight;
-    }
-
-    SkRect devRect;
-    combinedMatrix.mapRect(&devRect, rect);
-
-    SkRect devBounds = {
-        devRect.fLeft   - SK_ScalarHalf,
-        devRect.fTop    - SK_ScalarHalf,
-        devRect.fRight  + SK_ScalarHalf,
-        devRect.fBottom + SK_ScalarHalf
-    };
-
-    verts[0].fPos = SkPoint::Make(devBounds.fLeft, devBounds.fTop);
-    verts[1].fPos = SkPoint::Make(devBounds.fLeft, devBounds.fBottom);
-    verts[2].fPos = SkPoint::Make(devBounds.fRight, devBounds.fBottom);
-    verts[3].fPos = SkPoint::Make(devBounds.fRight, devBounds.fTop);
-
-    target->setIndexSourceToBuffer(gpu->getContext()->getQuadIndexBuffer());
-    target->drawIndexedInstances(kTriangles_GrPrimitiveType, 1, 4, 6);
-    target->resetIndexSource();
-}
-
-void GrAARectRenderer::shaderFillAlignedAARect(GrGpu* gpu,
-                                               GrDrawTarget* target,
-                                               const SkRect& rect,
-                                               const SkMatrix& combinedMatrix) {
-    GrDrawState* drawState = target->drawState();
-    SkASSERT(combinedMatrix.rectStaysRect());
-
-    drawState->setVertexAttribs<gAAAARectVertexAttribs>(SK_ARRAY_COUNT(gAAAARectVertexAttribs));
-    SkASSERT(sizeof(AARectVertex) == drawState->getVertexSize());
-
-    GrDrawTarget::AutoReleaseGeometry geo(target, 4, 0);
-    if (!geo.succeeded()) {
-        GrPrintf("Failed to get space for vertices!\n");
-        return;
-    }
-
-    AARectVertex* verts = reinterpret_cast<AARectVertex*>(geo.vertices());
-
-    GrEffect* effect = GrAlignedRectEffect::Create();
-    static const int kOffsetIndex = 1;
-    drawState->addCoverageEffect(effect, kOffsetIndex)->unref();
-
-    SkRect devRect;
-    combinedMatrix.mapRect(&devRect, rect);
-
-    SkRect devBounds = {
-        devRect.fLeft   - SK_ScalarHalf,
-        devRect.fTop    - SK_ScalarHalf,
-        devRect.fRight  + SK_ScalarHalf,
-        devRect.fBottom + SK_ScalarHalf
-    };
-
-    SkPoint widthHeight = {
-        SkScalarHalf(devRect.width()) + SK_ScalarHalf,
-        SkScalarHalf(devRect.height()) + SK_ScalarHalf
-    };
-
-    verts[0].fPos = SkPoint::Make(devBounds.fLeft, devBounds.fTop);
-    verts[0].fOffset = SkPoint::Make(-widthHeight.fX, -widthHeight.fY);
-    verts[0].fWidthHeight = widthHeight;
-
-    verts[1].fPos = SkPoint::Make(devBounds.fLeft, devBounds.fBottom);
-    verts[1].fOffset = SkPoint::Make(-widthHeight.fX, widthHeight.fY);
-    verts[1].fWidthHeight = widthHeight;
-
-    verts[2].fPos = SkPoint::Make(devBounds.fRight, devBounds.fBottom);
-    verts[2].fOffset = widthHeight;
-    verts[2].fWidthHeight = widthHeight;
-
-    verts[3].fPos = SkPoint::Make(devBounds.fRight, devBounds.fTop);
-    verts[3].fOffset = SkPoint::Make(widthHeight.fX, -widthHeight.fY);
-    verts[3].fWidthHeight = widthHeight;
-
-    target->setIndexSourceToBuffer(gpu->getContext()->getQuadIndexBuffer());
-    target->drawIndexedInstances(kTriangles_GrPrimitiveType, 1, 4, 6);
-    target->resetIndexSource();
-}
-
-void GrAARectRenderer::strokeAARect(GrGpu* gpu,
-                                    GrDrawTarget* target,
-                                    const SkRect& rect,
-                                    const SkMatrix& combinedMatrix,
-                                    const SkRect& devRect,
-                                    const SkStrokeRec& stroke,
-                                    bool useVertexCoverage) {
-    SkVector devStrokeSize;
-    SkScalar width = stroke.getWidth();
-    if (width > 0) {
-        devStrokeSize.set(width, width);
-        combinedMatrix.mapVectors(&devStrokeSize, 1);
-        devStrokeSize.setAbs(devStrokeSize);
-    } else {
-        devStrokeSize.set(SK_Scalar1, SK_Scalar1);
-    }
-
-    const SkScalar dx = devStrokeSize.fX;
-    const SkScalar dy = devStrokeSize.fY;
-    const SkScalar rx = SkScalarMul(dx, SK_ScalarHalf);
-    const SkScalar ry = SkScalarMul(dy, SK_ScalarHalf);
-
-    // Temporarily #if'ed out. We don't want to pass in the devRect but
-    // right now it is computed in GrContext::apply_aa_to_rect and we don't
-    // want to throw away the work
-#if 0
-    SkRect devRect;
-    combinedMatrix.mapRect(&devRect, rect);
-#endif
-
-    SkScalar spare;
-    {
-        SkScalar w = devRect.width() - dx;
-        SkScalar h = devRect.height() - dy;
-        spare = SkTMin(w, h);
-    }
-
-    SkRect devOutside(devRect);
-    devOutside.outset(rx, ry);
-
-    bool miterStroke = true;
-    // small miter limit means right angles show bevel...
-    if (stroke.getJoin() != SkPaint::kMiter_Join || stroke.getMiter() < SK_ScalarSqrt2) {
-        miterStroke = false;
-    }
-
-    if (spare <= 0 && miterStroke) {
-        this->fillAARect(gpu, target, devOutside, SkMatrix::I(),
-                         devOutside, useVertexCoverage);
-        return;
-    }
-
-    SkRect devInside(devRect);
-    devInside.inset(rx, ry);
-
-    SkRect devOutsideAssist(devRect);
-
-    // For bevel-stroke, use 2 SkRect instances(devOutside and devOutsideAssist)
-    // to draw the outer of the rect. Because there are 8 vertices on the outer
-    // edge, while vertex number of inner edge is 4, the same as miter-stroke.
-    if (!miterStroke) {
-        devOutside.inset(0, ry);
-        devOutsideAssist.outset(0, ry);
-    }
-
-    this->geometryStrokeAARect(gpu, target, devOutside, devOutsideAssist,
-                               devInside, useVertexCoverage, miterStroke);
-}
-
-void GrAARectRenderer::geometryStrokeAARect(GrGpu* gpu,
-                                            GrDrawTarget* target,
-                                            const SkRect& devOutside,
-                                            const SkRect& devOutsideAssist,
-                                            const SkRect& devInside,
-                                            bool useVertexCoverage,
-                                            bool miterStroke) {
-    GrDrawState* drawState = target->drawState();
-
-    set_aa_rect_vertex_attributes(drawState, useVertexCoverage);
-
-    int innerVertexNum = 4;
-    int outerVertexNum = miterStroke ? 4 : 8;
-    int totalVertexNum = (outerVertexNum + innerVertexNum) * 2;
-
-    GrDrawTarget::AutoReleaseGeometry geo(target, totalVertexNum, 0);
-    if (!geo.succeeded()) {
-        GrPrintf("Failed to get space for vertices!\n");
-        return;
-    }
-    GrIndexBuffer* indexBuffer = this->aaStrokeRectIndexBuffer(gpu, miterStroke);
-    if (NULL == indexBuffer) {
-        GrPrintf("Failed to create index buffer!\n");
-        return;
-    }
-
-    intptr_t verts = reinterpret_cast<intptr_t>(geo.vertices());
-    size_t vsize = drawState->getVertexSize();
-    SkASSERT(sizeof(SkPoint) + sizeof(GrColor) == vsize);
-
-    // We create vertices for four nested rectangles. There are two ramps from 0 to full
-    // coverage, one on the exterior of the stroke and the other on the interior.
-    // The following pointers refer to the four rects, from outermost to innermost.
-    SkPoint* fan0Pos = reinterpret_cast<SkPoint*>(verts);
-    SkPoint* fan1Pos = reinterpret_cast<SkPoint*>(verts + outerVertexNum * vsize);
-    SkPoint* fan2Pos = reinterpret_cast<SkPoint*>(verts + 2 * outerVertexNum * vsize);
-    SkPoint* fan3Pos = reinterpret_cast<SkPoint*>(verts + (2 * outerVertexNum + innerVertexNum) * vsize);
-
-#ifndef SK_IGNORE_THIN_STROKED_RECT_FIX
-    // TODO: this only really works if the X & Y margins are the same all around
-    // the rect
-    SkScalar inset = SkMinScalar(SK_Scalar1, devOutside.fRight - devInside.fRight);
-    inset = SkMinScalar(inset, devInside.fLeft - devOutside.fLeft);
-    inset = SkMinScalar(inset, devInside.fTop - devOutside.fTop);
-    if (miterStroke) {
-        inset = SK_ScalarHalf * SkMinScalar(inset, devOutside.fBottom - devInside.fBottom);
-    } else {
-        inset = SK_ScalarHalf * SkMinScalar(inset, devOutsideAssist.fBottom - devInside.fBottom);
-    }
-    SkASSERT(inset >= 0);
-#else
-    SkScalar inset = SK_ScalarHalf;
-#endif
-
-    if (miterStroke) {
-        // outermost
-        set_inset_fan(fan0Pos, vsize, devOutside, -SK_ScalarHalf, -SK_ScalarHalf);
-        // inner two
-        set_inset_fan(fan1Pos, vsize, devOutside,  inset,  inset);
-        set_inset_fan(fan2Pos, vsize, devInside,  -inset, -inset);
-        // innermost
-        set_inset_fan(fan3Pos, vsize, devInside,   SK_ScalarHalf,  SK_ScalarHalf);
-    } else {
-        SkPoint* fan0AssistPos = reinterpret_cast<SkPoint*>(verts + 4 * vsize);
-        SkPoint* fan1AssistPos = reinterpret_cast<SkPoint*>(verts + (outerVertexNum + 4) * vsize);
-        // outermost
-        set_inset_fan(fan0Pos, vsize, devOutside, -SK_ScalarHalf, -SK_ScalarHalf);
-        set_inset_fan(fan0AssistPos, vsize, devOutsideAssist, -SK_ScalarHalf, -SK_ScalarHalf);
-        // outer one of the inner two
-        set_inset_fan(fan1Pos, vsize, devOutside,  inset,  inset);
-        set_inset_fan(fan1AssistPos, vsize, devOutsideAssist,  inset,  inset);
-        // inner one of the inner two
-        set_inset_fan(fan2Pos, vsize, devInside,  -inset, -inset);
-        // innermost
-        set_inset_fan(fan3Pos, vsize, devInside,   SK_ScalarHalf,  SK_ScalarHalf);
-    }
-
-    // The outermost rect has 0 coverage
-    verts += sizeof(SkPoint);
-    for (int i = 0; i < outerVertexNum; ++i) {
-        *reinterpret_cast<GrColor*>(verts + i * vsize) = 0;
-    }
-
-    int scale;
-    if (inset < SK_ScalarHalf) {
-        scale = SkScalarFloorToInt(512.0f * inset / (inset + SK_ScalarHalf));
-        SkASSERT(scale >= 0 && scale <= 255);
-    } else {
-        scale = 0xff;
-    }
-
-    // The inner two rects have full coverage
-    GrColor innerColor;
-    if (useVertexCoverage) {
-        innerColor = GrColorPackRGBA(scale, scale, scale, scale);
-    } else {
-        if (0xff == scale) {
-            innerColor = target->getDrawState().getColor();
-        } else {
-            innerColor = SkAlphaMulQ(target->getDrawState().getColor(), scale);
-        }
-    }
-
-    verts += outerVertexNum * vsize;
-    for (int i = 0; i < outerVertexNum + innerVertexNum; ++i) {
-        *reinterpret_cast<GrColor*>(verts + i * vsize) = innerColor;
-    }
-
-    // The innermost rect has 0 coverage
-    verts += (outerVertexNum + innerVertexNum) * vsize;
-    for (int i = 0; i < innerVertexNum; ++i) {
-        *reinterpret_cast<GrColor*>(verts + i * vsize) = 0;
-    }
-
-    target->setIndexSourceToBuffer(indexBuffer);
-    target->drawIndexed(kTriangles_GrPrimitiveType, 0, 0,
-                        totalVertexNum, aaStrokeRectIndexCount(miterStroke));
-}
-
-void GrAARectRenderer::fillAANestedRects(GrGpu* gpu,
-                                         GrDrawTarget* target,
-                                         const SkRect rects[2],
-                                         const SkMatrix& combinedMatrix,
-                                         bool useVertexCoverage) {
-    SkASSERT(combinedMatrix.rectStaysRect());
-    SkASSERT(!rects[1].isEmpty());
-
-    SkRect devOutside, devOutsideAssist, devInside;
-    combinedMatrix.mapRect(&devOutside, rects[0]);
-    // can't call mapRect for devInside since it calls sort
-    combinedMatrix.mapPoints((SkPoint*)&devInside, (const SkPoint*)&rects[1], 2);
-
-    if (devInside.isEmpty()) {
-        this->fillAARect(gpu, target, devOutside, SkMatrix::I(), devOutside, useVertexCoverage);
-        return;
-    }
-
-    this->geometryStrokeAARect(gpu, target, devOutside, devOutsideAssist,
-                               devInside, useVertexCoverage, true);
-}
diff --git a/gfx/skia/skia/src/gpu/GrAARectRenderer.h b/gfx/skia/skia/src/gpu/GrAARectRenderer.h
deleted file mode 100644
index faaf7e20be80..000000000000
--- a/gfx/skia/skia/src/gpu/GrAARectRenderer.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrAARectRenderer_DEFINED
-#define GrAARectRenderer_DEFINED
-
-#include "SkMatrix.h"
-#include "SkRect.h"
-#include "SkRefCnt.h"
-#include "SkStrokeRec.h"
-
-class GrGpu;
-class GrDrawTarget;
-class GrIndexBuffer;
-
-/*
- * This class wraps helper functions that draw AA rects (filled & stroked)
- */
-class GrAARectRenderer : public SkRefCnt {
-public:
-    SK_DECLARE_INST_COUNT(GrAARectRenderer)
-
-    GrAARectRenderer()
-    : fAAFillRectIndexBuffer(NULL)
-    , fAAMiterStrokeRectIndexBuffer(NULL)
-    , fAABevelStrokeRectIndexBuffer(NULL) {
-    }
-
-    void reset();
-
-    ~GrAARectRenderer() {
-        this->reset();
-    }
-
-    // TODO: potentialy fuse the fill & stroke methods and differentiate
-    // between them by passing in stroke (==NULL means fill).
-
-    void fillAARect(GrGpu* gpu,
-                    GrDrawTarget* target,
-                    const SkRect& rect,
-                    const SkMatrix& combinedMatrix,
-                    const SkRect& devRect,
-                    bool useVertexCoverage) {
-#ifdef SHADER_AA_FILL_RECT
-        if (combinedMatrix.rectStaysRect()) {
-            this->shaderFillAlignedAARect(gpu, target,
-                                          rect, combinedMatrix);
-        } else {
-            this->shaderFillAARect(gpu, target,
-                                   rect, combinedMatrix);
-        }
-#else
-        this->geometryFillAARect(gpu, target,
-                                 rect, combinedMatrix,
-                                 devRect, useVertexCoverage);
-#endif
-    }
-
-    void strokeAARect(GrGpu* gpu,
-                      GrDrawTarget* target,
-                      const SkRect& rect,
-                      const SkMatrix& combinedMatrix,
-                      const SkRect& devRect,
-                      const SkStrokeRec& stroke,
-                      bool useVertexCoverage);
-
-    // First rect is outer; second rect is inner
-    void fillAANestedRects(GrGpu* gpu,
-                           GrDrawTarget* target,
-                           const SkRect rects[2],
-                           const SkMatrix& combinedMatrix,
-                           bool useVertexCoverage);
-
-private:
-    GrIndexBuffer*              fAAFillRectIndexBuffer;
-    GrIndexBuffer*              fAAMiterStrokeRectIndexBuffer;
-    GrIndexBuffer*              fAABevelStrokeRectIndexBuffer;
-
-    GrIndexBuffer* aaFillRectIndexBuffer(GrGpu* gpu);
-
-    static int aaStrokeRectIndexCount(bool miterStroke);
-    GrIndexBuffer* aaStrokeRectIndexBuffer(GrGpu* gpu, bool miterStroke);
-
-    // TODO: Remove the useVertexCoverage boolean. Just use it all the time
-    // since we now have a coverage vertex attribute
-    void geometryFillAARect(GrGpu* gpu,
-                            GrDrawTarget* target,
-                            const SkRect& rect,
-                            const SkMatrix& combinedMatrix,
-                            const SkRect& devRect,
-                            bool useVertexCoverage);
-
-    void shaderFillAARect(GrGpu* gpu,
-                          GrDrawTarget* target,
-                          const SkRect& rect,
-                          const SkMatrix& combinedMatrix);
-
-    void shaderFillAlignedAARect(GrGpu* gpu,
-                                 GrDrawTarget* target,
-                                 const SkRect& rect,
-                                 const SkMatrix& combinedMatrix);
-
-    void geometryStrokeAARect(GrGpu* gpu,
-                              GrDrawTarget* target,
-                              const SkRect& devOutside,
-                              const SkRect& devOutsideAssist,
-                              const SkRect& devInside,
-                              bool useVertexCoverage,
-                              bool miterStroke);
-
-    typedef SkRefCnt INHERITED;
-};
-
-#endif // GrAARectRenderer_DEFINED
diff --git a/gfx/skia/skia/src/gpu/GrAddPathRenderers_default.cpp b/gfx/skia/skia/src/gpu/GrAddPathRenderers_default.cpp
deleted file mode 100644
index 4f172434dec2..000000000000
--- a/gfx/skia/skia/src/gpu/GrAddPathRenderers_default.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#include "GrStencilAndCoverPathRenderer.h"
-#include "GrAAHairLinePathRenderer.h"
-#include "GrAAConvexPathRenderer.h"
-#if GR_STROKE_PATH_RENDERING
-#include "../../experimental/StrokePathRenderer/GrStrokePathRenderer.h"
-#endif
-#if GR_ANDROID_PATH_RENDERING
-#include "../../experimental/AndroidPathRenderer/GrAndroidPathRenderer.h"
-#endif
-
-void GrPathRenderer::AddPathRenderers(GrContext* ctx, GrPathRendererChain* chain) {
-#if GR_STROKE_PATH_RENDERING
-    chain->addPathRenderer(SkNEW(GrStrokePathRenderer))->unref();
-#endif
-#if GR_ANDROID_PATH_RENDERING
-    chain->addPathRenderer(SkNEW(GrAndroidPathRenderer))->unref();
-#endif
-    if (GrPathRenderer* pr = GrStencilAndCoverPathRenderer::Create(ctx)) {
-        chain->addPathRenderer(pr)->unref();
-    }
-    if (GrPathRenderer* pr = GrAAHairLinePathRenderer::Create(ctx)) {
-        chain->addPathRenderer(pr)->unref();
-    }
-    chain->addPathRenderer(SkNEW(GrAAConvexPathRenderer))->unref();
-}
diff --git a/gfx/skia/skia/src/gpu/GrAllocPool.cpp b/gfx/skia/skia/src/gpu/GrAllocPool.cpp
deleted file mode 100644
index c92ebbd121a3..000000000000
--- a/gfx/skia/skia/src/gpu/GrAllocPool.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrAllocPool.h"
-
-#include "GrTypes.h"
-
-#define GrAllocPool_MIN_BLOCK_SIZE      ((size_t)128)
-
-struct GrAllocPool::Block {
-    Block*  fNext;
-    char*   fPtr;
-    size_t  fBytesFree;
-    size_t  fBytesTotal;
-
-    static Block* Create(size_t size, Block* next) {
-        SkASSERT(size >= GrAllocPool_MIN_BLOCK_SIZE);
-
-        Block* block = (Block*)sk_malloc_throw(sizeof(Block) + size);
-        block->fNext = next;
-        block->fPtr = (char*)block + sizeof(Block);
-        block->fBytesFree = size;
-        block->fBytesTotal = size;
-        return block;
-    }
-
-    bool canAlloc(size_t bytes) const {
-        return bytes <= fBytesFree;
-    }
-
-    void* alloc(size_t bytes) {
-        SkASSERT(bytes <= fBytesFree);
-        fBytesFree -= bytes;
-        void* ptr = fPtr;
-        fPtr += bytes;
-        return ptr;
-    }
-
-    size_t release(size_t bytes) {
-        SkASSERT(bytes > 0);
-        size_t free = SkTMin(bytes, fBytesTotal - fBytesFree);
-        fBytesFree += free;
-        fPtr -= free;
-        return bytes - free;
-    }
-
-    bool empty() const { return fBytesTotal == fBytesFree; }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
-GrAllocPool::GrAllocPool(size_t blockSize) {
-    fBlock = NULL;
-    fMinBlockSize = SkTMax(blockSize, GrAllocPool_MIN_BLOCK_SIZE);
-    SkDEBUGCODE(fBlocksAllocated = 0;)
-}
-
-GrAllocPool::~GrAllocPool() {
-    this->reset();
-}
-
-void GrAllocPool::reset() {
-    this->validate();
-
-    Block* block = fBlock;
-    while (block) {
-        Block* next = block->fNext;
-        sk_free(block);
-        block = next;
-    }
-    fBlock = NULL;
-    SkDEBUGCODE(fBlocksAllocated = 0;)
-}
-
-void* GrAllocPool::alloc(size_t size) {
-    this->validate();
-
-    if (!fBlock || !fBlock->canAlloc(size)) {
-        size_t blockSize = SkTMax(fMinBlockSize, size);
-        fBlock = Block::Create(blockSize, fBlock);
-        SkDEBUGCODE(fBlocksAllocated += 1;)
-    }
-    return fBlock->alloc(size);
-}
-
-void GrAllocPool::release(size_t bytes) {
-    this->validate();
-
-    while (bytes && NULL != fBlock) {
-        bytes = fBlock->release(bytes);
-        if (fBlock->empty()) {
-            Block* next = fBlock->fNext;
-            sk_free(fBlock);
-            fBlock = next;
-            SkDEBUGCODE(fBlocksAllocated -= 1;)
-        }
-    }
-}
-
-#ifdef SK_DEBUG
-
-void GrAllocPool::validate() const {
-    Block* block = fBlock;
-    int count = 0;
-    while (block) {
-        count += 1;
-        block = block->fNext;
-    }
-    SkASSERT(fBlocksAllocated == count);
-}
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/GrAllocPool.h b/gfx/skia/skia/src/gpu/GrAllocPool.h
deleted file mode 100644
index 4fc826569eb4..000000000000
--- a/gfx/skia/skia/src/gpu/GrAllocPool.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrAllocPool_DEFINED
-#define GrAllocPool_DEFINED
-
-#include "SkTypes.h"
-
-class GrAllocPool : SkNoncopyable {
-public:
-    GrAllocPool(size_t blockSize = 0);
-    ~GrAllocPool();
-
-    /**
-     *  Frees all blocks that have been allocated with alloc().
-     */
-    void reset();
-
-    /**
-     *  Returns a block of memory bytes size big. This address must not be
-     *  passed to realloc/free/delete or any other function that assumes the
-     *  address was allocated by malloc or new (because it hasn't).
-     */
-    void* alloc(size_t bytes);
-
-    /**
-     * Releases the most recently allocated bytes back to allocpool.
-     */
-    void release(size_t bytes);
-
-private:
-    struct Block;
-
-    Block*  fBlock;
-    size_t  fMinBlockSize;
-
-#ifdef SK_DEBUG
-    int fBlocksAllocated;
-    void validate() const;
-#else
-    void validate() const {}
-#endif
-};
-
-template <typename T> class GrTAllocPool {
-public:
-    GrTAllocPool(int count) : fPool(count * sizeof(T)) {}
-
-    void reset() { fPool.reset(); }
-    T* alloc() { return (T*)fPool.alloc(sizeof(T)); }
-
-private:
-    GrAllocPool fPool;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/GrAllocator.h b/gfx/skia/skia/src/gpu/GrAllocator.h
index 933be9f655ae..c5d2dc3d38a5 100644
--- a/gfx/skia/skia/src/gpu/GrAllocator.h
+++ b/gfx/skia/skia/src/gpu/GrAllocator.h
@@ -29,7 +29,7 @@ public:
     GrAllocator(size_t itemSize, int itemsPerBlock, void* initialBlock)
         : fItemSize(itemSize)
         , fItemsPerBlock(itemsPerBlock)
-        , fOwnFirstBlock(NULL == initialBlock)
+        , fOwnFirstBlock(nullptr == initialBlock)
         , fCount(0)
         , fInsertionIndexInBlock(0) {
         SkASSERT(itemsPerBlock > 0);
@@ -60,6 +60,24 @@ public:
         return ret;
     }
 
+    /**
+     * Remove the last item, only call if count() != 0
+     */
+    void pop_back() {
+        SkASSERT(fCount);
+        SkASSERT(fInsertionIndexInBlock > 0);
+        --fInsertionIndexInBlock;
+        --fCount;
+        if (0 == fInsertionIndexInBlock) {
+            // Never delete the first block
+            if (fBlocks.count() > 1) {
+                sk_free(fBlocks.back());
+                fBlocks.pop_back();
+                fInsertionIndexInBlock = fItemsPerBlock;
+            }
+        }
+    }
+
     /**
      * Removes all added items.
      */
@@ -109,7 +127,6 @@ public:
         return (const char*)(fBlocks.back()) + (fInsertionIndexInBlock - 1) * fItemSize;
     }
 
-
     /**
      * Iterates through the allocator. This is faster than using operator[] when walking linearly
      * through the allocator.
@@ -175,7 +192,7 @@ public:
 protected:
     /**
      * Set first block of memory to write into.  Must be called before any other methods.
-     * This requires that you have passed NULL in the constructor.
+     * This requires that you have passed nullptr in the constructor.
      *
      * @param   initialBlock    optional memory to use for the first block.
      *                          Must be at least itemSize*itemsPerBlock sized.
@@ -207,8 +224,10 @@ private:
     typedef SkNoncopyable INHERITED;
 };
 
-template <typename T>
-class GrTAllocator : SkNoncopyable {
+template <typename T> class GrTAllocator;
+template <typename T> void* operator new(size_t, GrTAllocator<T>*);
+
+template <typename T> class GrTAllocator : SkNoncopyable {
 public:
     virtual ~GrTAllocator() { this->reset(); };
 
@@ -218,7 +237,7 @@ public:
      * @param   itemsPerBlock   the number of items to allocate at once
      */
     explicit GrTAllocator(int itemsPerBlock)
-        : fAllocator(sizeof(T), itemsPerBlock, NULL) {}
+        : fAllocator(sizeof(T), itemsPerBlock, nullptr) {}
 
     /**
      * Adds an item and returns it.
@@ -227,18 +246,26 @@ public:
      */
     T& push_back() {
         void* item = fAllocator.push_back();
-        SkASSERT(NULL != item);
-        SkNEW_PLACEMENT(item, T);
+        SkASSERT(item);
+        new (item) T;
         return *(T*)item;
     }
 
     T& push_back(const T& t) {
         void* item = fAllocator.push_back();
-        SkASSERT(NULL != item);
-        SkNEW_PLACEMENT_ARGS(item, T, (t));
+        SkASSERT(item);
+        new (item) T(t);
         return *(T*)item;
     }
 
+    /**
+     * Remove the last item, only call if count() != 0
+     */
+    void pop_back() {
+        this->back().~T();
+        fAllocator.pop_back();
+    }
+
     /**
      * Removes all added items.
      */
@@ -335,6 +362,8 @@ protected:
     }
 
 private:
+    friend void* operator new<T>(size_t, GrTAllocator*);
+
     GrAllocator fAllocator;
     typedef SkNoncopyable INHERITED;
 };
@@ -352,4 +381,18 @@ private:
     SkAlignedSTStorage<N, T> fStorage;
 };
 
+template <typename T> void* operator new(size_t size, GrTAllocator<T>* allocator) {
+    return allocator->fAllocator.push_back();
+}
+
+// Skia doesn't use C++ exceptions but it may be compiled with them enabled. Having an op delete
+// to match the op new silences warnings about missing op delete when a constructor throws an
+// exception.
+template <typename T> void operator delete(void*, GrTAllocator<T>*) {
+    SK_CRASH();
+}
+
+#define GrNEW_APPEND_TO_ALLOCATOR(allocator_ptr, type_name, args) \
+    new (allocator_ptr) type_name args
+
 #endif
diff --git a/gfx/skia/skia/src/gpu/GrAtlas.cpp b/gfx/skia/skia/src/gpu/GrAtlas.cpp
deleted file mode 100644
index 353bf55f55aa..000000000000
--- a/gfx/skia/skia/src/gpu/GrAtlas.cpp
+++ /dev/null
@@ -1,293 +0,0 @@
-
-/*
- * Copyright 2010 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrAtlas.h"
-#include "GrContext.h"
-#include "GrGpu.h"
-#include "GrRectanizer.h"
-#include "GrTracing.h"
-
-///////////////////////////////////////////////////////////////////////////////
-
-// for testing
-#define FONT_CACHE_STATS 0
-#if FONT_CACHE_STATS
-static int g_UploadCount = 0;
-#endif
-
-GrPlot::GrPlot() 
-    : fDrawToken(NULL, 0)
-    , fID(-1)
-    , fTexture(NULL)
-    , fRects(NULL)
-    , fAtlas(NULL)
-    , fBytesPerPixel(1)
-    , fDirty(false)
-    , fBatchUploads(false)
-{
-    fOffset.set(0, 0);
-}
-
-GrPlot::~GrPlot() {
-    SkDELETE_ARRAY(fPlotData);
-    fPlotData = NULL;
-    delete fRects;
-}
-
-void GrPlot::init(GrAtlas* atlas, int id, int offX, int offY, int width, int height, size_t bpp,
-                  bool batchUploads) {
-    fID = id;
-    fRects = GrRectanizer::Factory(width, height);
-    fAtlas = atlas;
-    fOffset.set(offX * width, offY * height);
-    fBytesPerPixel = bpp;
-    fPlotData = NULL;
-    fDirtyRect.setEmpty();
-    fDirty = false;
-    fBatchUploads = batchUploads;
-}
-
-static inline void adjust_for_offset(SkIPoint16* loc, const SkIPoint16& offset) {
-    loc->fX += offset.fX;
-    loc->fY += offset.fY;
-}
-
-bool GrPlot::addSubImage(int width, int height, const void* image, SkIPoint16* loc) {
-    float percentFull = fRects->percentFull();
-    if (!fRects->addRect(width, height, loc)) {
-        return false;
-    }
-
-    // if batching uploads, create backing memory on first use
-    // once the plot is nearly full we will revert to uploading each subimage individually
-    int plotWidth = fRects->width();
-    int plotHeight = fRects->height();
-    if (fBatchUploads && NULL == fPlotData && 0.0f == percentFull) {
-        fPlotData = SkNEW_ARRAY(unsigned char, fBytesPerPixel*plotWidth*plotHeight);
-        memset(fPlotData, 0, fBytesPerPixel*plotWidth*plotHeight);
-    }
-
-    // if we have backing memory, copy to the memory and set for future upload
-    if (NULL != fPlotData) {
-        const unsigned char* imagePtr = (const unsigned char*) image;
-        // point ourselves at the right starting spot
-        unsigned char* dataPtr = fPlotData;
-        dataPtr += fBytesPerPixel*plotWidth*loc->fY;
-        dataPtr += fBytesPerPixel*loc->fX;
-        // copy into the data buffer
-        for (int i = 0; i < height; ++i) {
-            memcpy(dataPtr, imagePtr, fBytesPerPixel*width);
-            dataPtr += fBytesPerPixel*plotWidth;
-            imagePtr += fBytesPerPixel*width;
-        }
-
-        fDirtyRect.join(loc->fX, loc->fY, loc->fX + width, loc->fY + height);
-        adjust_for_offset(loc, fOffset);
-        fDirty = true;
-    // otherwise, just upload the image directly
-    } else if (NULL != image) {
-        adjust_for_offset(loc, fOffset);
-        GrContext* context = fTexture->getContext();
-        TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), "GrPlot::uploadToTexture");
-        context->writeTexturePixels(fTexture,
-                                    loc->fX, loc->fY, width, height,
-                                    fTexture->config(), image, 0,
-                                    GrContext::kDontFlush_PixelOpsFlag);
-    } else {
-        adjust_for_offset(loc, fOffset);
-    }
-
-#if FONT_CACHE_STATS
-    ++g_UploadCount;
-#endif
-
-    return true;
-}
-
-void GrPlot::uploadToTexture() {
-    static const float kNearlyFullTolerance = 0.85f;
-
-    // should only do this if batching is enabled
-    SkASSERT(fBatchUploads);
-
-    if (fDirty) {
-        TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), "GrPlot::uploadToTexture");
-        SkASSERT(NULL != fTexture);
-        GrContext* context = fTexture->getContext();
-        // We pass the flag that does not force a flush. We assume our caller is
-        // smart and hasn't referenced the part of the texture we're about to update
-        // since the last flush.
-        size_t rowBytes = fBytesPerPixel*fRects->width();
-        const unsigned char* dataPtr = fPlotData;
-        dataPtr += rowBytes*fDirtyRect.fTop;
-        dataPtr += fBytesPerPixel*fDirtyRect.fLeft;
-        context->writeTexturePixels(fTexture,
-                                    fOffset.fX + fDirtyRect.fLeft, fOffset.fY + fDirtyRect.fTop,
-                                    fDirtyRect.width(), fDirtyRect.height(),
-                                    fTexture->config(), dataPtr,
-                                    rowBytes,
-                                    GrContext::kDontFlush_PixelOpsFlag);
-        fDirtyRect.setEmpty();
-        fDirty = false;
-        // If the Plot is nearly full, anything else we add will probably be small and one
-        // at a time, so free up the memory and after this upload any new images directly.
-        if (fRects->percentFull() > kNearlyFullTolerance) {
-            SkDELETE_ARRAY(fPlotData);
-            fPlotData = NULL;
-        }
-    }
-}
-
-void GrPlot::resetRects() {
-    SkASSERT(NULL != fRects);
-    fRects->reset();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-GrAtlas::GrAtlas(GrGpu* gpu, GrPixelConfig config, GrTextureFlags flags,
-                 const SkISize& backingTextureSize,
-                 int numPlotsX, int numPlotsY, bool batchUploads) {
-    fGpu = SkRef(gpu);
-    fPixelConfig = config;
-    fFlags = flags;
-    fBackingTextureSize = backingTextureSize;
-    fNumPlotsX = numPlotsX;
-    fNumPlotsY = numPlotsY;
-    fBatchUploads = batchUploads;
-    fTexture = NULL;
-
-    int textureWidth = fBackingTextureSize.width();
-    int textureHeight = fBackingTextureSize.height();
-
-    int plotWidth = textureWidth / fNumPlotsX;
-    int plotHeight = textureHeight / fNumPlotsY;
-
-    SkASSERT(plotWidth * fNumPlotsX == textureWidth);
-    SkASSERT(plotHeight * fNumPlotsY == textureHeight);
-
-    // We currently do not support compressed atlases...
-    SkASSERT(!GrPixelConfigIsCompressed(config));
-
-    // set up allocated plots
-    size_t bpp = GrBytesPerPixel(fPixelConfig);
-    fPlotArray = SkNEW_ARRAY(GrPlot, (fNumPlotsX*fNumPlotsY));
-
-    GrPlot* currPlot = fPlotArray;
-    for (int y = numPlotsY-1; y >= 0; --y) {
-        for (int x = numPlotsX-1; x >= 0; --x) {
-            currPlot->init(this, y*numPlotsX+x, x, y, plotWidth, plotHeight, bpp, batchUploads);
-
-            // build LRU list
-            fPlotList.addToHead(currPlot);
-            ++currPlot;
-        }
-    }
-}
-
-GrAtlas::~GrAtlas() {
-    SkSafeUnref(fTexture);
-    SkDELETE_ARRAY(fPlotArray);
-
-    fGpu->unref();
-#if FONT_CACHE_STATS
-      GrPrintf("Num uploads: %d\n", g_UploadCount);
-#endif
-}
-
-void GrAtlas::makeMRU(GrPlot* plot) {
-    if (fPlotList.head() == plot) {
-        return;
-    }
-
-    fPlotList.remove(plot);
-    fPlotList.addToHead(plot);
-};
-
-GrPlot* GrAtlas::addToAtlas(ClientPlotUsage* usage,
-                            int width, int height, const void* image,
-                            SkIPoint16* loc) {
-    // iterate through entire plot list for this atlas, see if we can find a hole
-    // last one was most recently added and probably most empty
-    for (int i = usage->fPlots.count()-1; i >= 0; --i) {
-        GrPlot* plot = usage->fPlots[i];
-        if (plot->addSubImage(width, height, image, loc)) {
-            this->makeMRU(plot);
-            return plot;
-        }
-    }
-
-    // before we get a new plot, make sure we have a backing texture
-    if (NULL == fTexture) {
-        // TODO: Update this to use the cache rather than directly creating a texture.
-        GrTextureDesc desc;
-        desc.fFlags = fFlags | kDynamicUpdate_GrTextureFlagBit;
-        desc.fWidth = fBackingTextureSize.width();
-        desc.fHeight = fBackingTextureSize.height();
-        desc.fConfig = fPixelConfig;
-
-        fTexture = fGpu->createTexture(desc, NULL, 0);
-        if (NULL == fTexture) {
-            return NULL;
-        }
-    }
-
-    // now look through all allocated plots for one we can share, in MRU order
-    GrPlotList::Iter plotIter;
-    plotIter.init(fPlotList, GrPlotList::Iter::kHead_IterStart);
-    GrPlot* plot;
-    while (NULL != (plot = plotIter.get())) {
-        // make sure texture is set for quick lookup
-        plot->fTexture = fTexture;
-        if (plot->addSubImage(width, height, image, loc)) {
-            this->makeMRU(plot);
-            // new plot for atlas, put at end of array
-            SkASSERT(!usage->fPlots.contains(plot));
-            *(usage->fPlots.append()) = plot;
-            return plot;
-        }
-        plotIter.next();
-    }
-
-    // If the above fails, then the current plot list has no room
-    return NULL;
-}
-
-void GrAtlas::RemovePlot(ClientPlotUsage* usage, const GrPlot* plot) {
-    int index = usage->fPlots.find(const_cast<GrPlot*>(plot));
-    if (index >= 0) {
-        usage->fPlots.remove(index);
-    }
-}
-
-// get a plot that's not being used by the current draw
-GrPlot* GrAtlas::getUnusedPlot() {
-    GrPlotList::Iter plotIter;
-    plotIter.init(fPlotList, GrPlotList::Iter::kTail_IterStart);
-    GrPlot* plot;
-    while (NULL != (plot = plotIter.get())) {
-        if (plot->drawToken().isIssued()) {
-            return plot;
-        }
-        plotIter.prev();
-    }
-
-    return NULL;
-}
-
-void GrAtlas::uploadPlotsToTexture() {
-    if (fBatchUploads) {
-        GrPlotList::Iter plotIter;
-        plotIter.init(fPlotList, GrPlotList::Iter::kHead_IterStart);
-        GrPlot* plot;
-        while (NULL != (plot = plotIter.get())) {
-            plot->uploadToTexture();
-            plotIter.next();
-        }
-    }
-}
diff --git a/gfx/skia/skia/src/gpu/GrAtlas.h b/gfx/skia/skia/src/gpu/GrAtlas.h
deleted file mode 100644
index 9ccbc53bc605..000000000000
--- a/gfx/skia/skia/src/gpu/GrAtlas.h
+++ /dev/null
@@ -1,133 +0,0 @@
-
-/*
- * Copyright 2010 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrAtlas_DEFINED
-#define GrAtlas_DEFINED
-
-
-#include "GrTexture.h"
-#include "GrDrawTarget.h"
-#include "SkPoint.h"
-#include "SkTInternalLList.h"
-
-class GrGpu;
-class GrRectanizer;
-class GrAtlas;
-
-// The backing GrTexture for a set of GrAtlases is broken into a spatial grid of GrPlots. When
-// a GrAtlas needs space on the texture, it requests a GrPlot. Each GrAtlas can claim one
-// or more GrPlots. The GrPlots keep track of subimage placement via their GrRectanizer. Once a
-// GrPlot is "full" (i.e. there is no room for the new subimage according to the GrRectanizer), the
-// GrAtlas can request a new GrPlot via GrAtlas::addToAtlas().
-//
-// If all GrPlots are allocated, the replacement strategy is up to the client. The drawToken is
-// available to ensure that all draw calls are finished for that particular GrPlot.
-// GrAtlas::removeUnusedPlots() will free up any finished plots for a given GrAtlas.
-
-class GrPlot {
-public:
-    SK_DECLARE_INTERNAL_LLIST_INTERFACE(GrPlot);
-
-    // This returns a plot ID unique to each plot in a given GrAtlas. They are
-    // consecutive and start at 0.
-    int id() const { return fID; }
-
-    GrTexture* texture() const { return fTexture; }
-
-    bool addSubImage(int width, int height, const void*, SkIPoint16*);
-
-    GrDrawTarget::DrawToken drawToken() const { return fDrawToken; }
-    void setDrawToken(GrDrawTarget::DrawToken draw) { fDrawToken = draw; }
-
-    void uploadToTexture();
-
-    void resetRects();
-
-private:
-    GrPlot();
-    ~GrPlot(); // does not try to delete the fNext field
-    void init(GrAtlas* atlas, int id, int offX, int offY, int width, int height, size_t bpp,
-              bool batchUploads);
-
-    // for recycling
-    GrDrawTarget::DrawToken fDrawToken;
-
-    int                     fID;
-    unsigned char*          fPlotData;
-    GrTexture*              fTexture;
-    GrRectanizer*           fRects;
-    GrAtlas*                fAtlas;
-    SkIPoint16              fOffset;        // the offset of the plot in the backing texture
-    size_t                  fBytesPerPixel;
-    SkIRect                 fDirtyRect;
-    bool                    fDirty;
-    bool                    fBatchUploads;
-
-    friend class GrAtlas;
-};
-
-typedef SkTInternalLList<GrPlot> GrPlotList;
-
-class GrAtlas {
-public:
-    // This class allows each client to independently track the GrPlots in
-    // which its data is stored.
-    class ClientPlotUsage {
-    public:
-        bool isEmpty() const { return 0 == fPlots.count(); }
-
-    private:
-        SkTDArray<GrPlot*> fPlots;
-
-        friend class GrAtlas;
-    };
-
-    GrAtlas(GrGpu*, GrPixelConfig, GrTextureFlags flags, 
-            const SkISize& backingTextureSize,
-            int numPlotsX, int numPlotsY, bool batchUploads);
-    ~GrAtlas();
-
-    // Adds a width x height subimage to the atlas. Upon success it returns 
-    // the containing GrPlot and absolute location in the backing texture. 
-    // NULL is returned if the subimage cannot fit in the atlas.
-    // If provided, the image data will either be immediately uploaded or
-    // written to the CPU-side backing bitmap.
-    GrPlot* addToAtlas(ClientPlotUsage*, int width, int height, const void* image, SkIPoint16* loc);
-
-    // remove reference to this plot
-    static void RemovePlot(ClientPlotUsage* usage, const GrPlot* plot);
-
-    // get a plot that's not being used by the current draw
-    // this allows us to overwrite this plot without flushing
-    GrPlot* getUnusedPlot();
-
-    GrTexture* getTexture() const {
-        return fTexture;
-    }
-
-    void uploadPlotsToTexture();
-
-private:
-    void makeMRU(GrPlot* plot);
-
-    GrGpu*         fGpu;
-    GrPixelConfig  fPixelConfig;
-    GrTextureFlags fFlags;
-    GrTexture*     fTexture;
-    SkISize        fBackingTextureSize;
-    int            fNumPlotsX;
-    int            fNumPlotsY;
-    bool           fBatchUploads;
-
-    // allocated array of GrPlots
-    GrPlot*       fPlotArray;
-    // LRU list of GrPlots (MRU at head - LRU at tail)
-    GrPlotList    fPlotList;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/GrAtlasTextBlob.cpp b/gfx/skia/skia/src/gpu/GrAtlasTextBlob.cpp
new file mode 100644
index 000000000000..3fb7ac99c166
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrAtlasTextBlob.cpp
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrAtlasTextBlob.h"
+
+#ifdef CACHE_SANITY_CHECK
+void GrAtlasTextBlob::AssertEqual(const GrAtlasTextBlob& l, const GrAtlasTextBlob& r) {
+    SkASSERT(l.fSize == r.fSize);
+    SkASSERT(l.fPool == r.fPool);
+
+    SkASSERT(l.fBlurRec.fSigma == r.fBlurRec.fSigma);
+    SkASSERT(l.fBlurRec.fStyle == r.fBlurRec.fStyle);
+    SkASSERT(l.fBlurRec.fQuality == r.fBlurRec.fQuality);
+
+    SkASSERT(l.fStrokeInfo.fFrameWidth == r.fStrokeInfo.fFrameWidth);
+    SkASSERT(l.fStrokeInfo.fMiterLimit == r.fStrokeInfo.fMiterLimit);
+    SkASSERT(l.fStrokeInfo.fJoin == r.fStrokeInfo.fJoin);
+
+    SkASSERT(l.fBigGlyphs.count() == r.fBigGlyphs.count());
+    for (int i = 0; i < l.fBigGlyphs.count(); i++) {
+        const BigGlyph& lBigGlyph = l.fBigGlyphs[i];
+        const BigGlyph& rBigGlyph = r.fBigGlyphs[i];
+
+        SkASSERT(lBigGlyph.fPath == rBigGlyph.fPath);
+        // We can't assert that these have the same translations
+    }
+
+    SkASSERT(l.fKey == r.fKey);
+    SkASSERT(l.fViewMatrix.cheapEqualTo(r.fViewMatrix));
+    SkASSERT(l.fPaintColor == r.fPaintColor);
+    SkASSERT(l.fMaxMinScale == r.fMaxMinScale);
+    SkASSERT(l.fMinMaxScale == r.fMinMaxScale);
+    SkASSERT(l.fTextType == r.fTextType);
+
+    SkASSERT(l.fRunCount == r.fRunCount);
+    for (int i = 0; i < l.fRunCount; i++) {
+        const Run& lRun = l.fRuns[i];
+        const Run& rRun = r.fRuns[i];
+
+        if (lRun.fStrike.get()) {
+            SkASSERT(rRun.fStrike.get());
+            SkASSERT(GrBatchTextStrike::GetKey(*lRun.fStrike) ==
+                     GrBatchTextStrike::GetKey(*rRun.fStrike));
+
+        } else {
+            SkASSERT(!rRun.fStrike.get());
+        }
+
+        if (lRun.fTypeface.get()) {
+            SkASSERT(rRun.fTypeface.get());
+            SkASSERT(SkTypeface::Equal(lRun.fTypeface, rRun.fTypeface));
+        } else {
+            SkASSERT(!rRun.fTypeface.get());
+        }
+
+        // We offset bounds right before flush time so they will not be correct here
+        //SkASSERT(lRun.fVertexBounds == rRun.fVertexBounds);
+
+        SkASSERT(lRun.fDescriptor.getDesc());
+        SkASSERT(rRun.fDescriptor.getDesc());
+        SkASSERT(lRun.fDescriptor.getDesc()->equals(*rRun.fDescriptor.getDesc()));
+
+        if (lRun.fOverrideDescriptor.get()) {
+            SkASSERT(lRun.fOverrideDescriptor->getDesc());
+            SkASSERT(rRun.fOverrideDescriptor.get() && rRun.fOverrideDescriptor->getDesc());;
+            SkASSERT(lRun.fOverrideDescriptor->getDesc()->equals(
+                    *rRun.fOverrideDescriptor->getDesc()));
+        } else {
+            SkASSERT(!rRun.fOverrideDescriptor.get());
+        }
+
+        // color can be changed
+        //SkASSERT(lRun.fColor == rRun.fColor);
+        SkASSERT(lRun.fInitialized == rRun.fInitialized);
+        SkASSERT(lRun.fDrawAsPaths == rRun.fDrawAsPaths);
+
+        SkASSERT(lRun.fSubRunInfo.count() == rRun.fSubRunInfo.count());
+        for(int j = 0; j < lRun.fSubRunInfo.count(); j++) {
+            const Run::SubRunInfo& lSubRun = lRun.fSubRunInfo[j];
+            const Run::SubRunInfo& rSubRun = rRun.fSubRunInfo[j];
+
+            SkASSERT(lSubRun.fVertexStartIndex == rSubRun.fVertexStartIndex);
+            SkASSERT(lSubRun.fVertexEndIndex == rSubRun.fVertexEndIndex);
+            SkASSERT(lSubRun.fGlyphStartIndex == rSubRun.fGlyphStartIndex);
+            SkASSERT(lSubRun.fGlyphEndIndex == rSubRun.fGlyphEndIndex);
+            SkASSERT(lSubRun.fTextRatio == rSubRun.fTextRatio);
+            SkASSERT(lSubRun.fMaskFormat == rSubRun.fMaskFormat);
+            SkASSERT(lSubRun.fDrawAsDistanceFields == rSubRun.fDrawAsDistanceFields);
+            SkASSERT(lSubRun.fUseLCDText == rSubRun.fUseLCDText);
+
+            //We can't compare the bulk use tokens with this method
+            /*
+            SkASSERT(lSubRun.fBulkUseToken.fPlotsToUpdate.count() ==
+                     rSubRun.fBulkUseToken.fPlotsToUpdate.count());
+            SkASSERT(lSubRun.fBulkUseToken.fPlotAlreadyUpdated ==
+                     rSubRun.fBulkUseToken.fPlotAlreadyUpdated);
+            for (int k = 0; k < lSubRun.fBulkUseToken.fPlotsToUpdate.count(); k++) {
+                SkASSERT(lSubRun.fBulkUseToken.fPlotsToUpdate[k] ==
+                         rSubRun.fBulkUseToken.fPlotsToUpdate[k]);
+            }*/
+        }
+    }
+}
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrAtlasTextBlob.h b/gfx/skia/skia/src/gpu/GrAtlasTextBlob.h
new file mode 100644
index 000000000000..6ea86627001a
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrAtlasTextBlob.h
@@ -0,0 +1,250 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrAtlasTextBlob_DEFINED
+#define GrAtlasTextBlob_DEFINED
+
+#include "GrBatchAtlas.h"
+#include "GrBatchFontCache.h"
+#include "GrColor.h"
+#include "SkDescriptor.h"
+#include "SkMaskFilter.h"
+#include "GrMemoryPool.h"
+#include "SkSurfaceProps.h"
+#include "SkTInternalLList.h"
+
+// With this flag enabled, the GrAtlasTextContext will, as a sanity check, regenerate every blob
+// that comes in to verify the integrity of its cache
+//#define CACHE_SANITY_CHECK // VERY SLOW
+
+/*
+ * A GrAtlasTextBlob contains a fully processed SkTextBlob, suitable for nearly immediate drawing
+ * on the GPU.  These are initially created with valid positions and colors, but invalid
+ * texture coordinates.  The GrAtlasTextBlob itself has a few Blob-wide properties, and also
+ * consists of a number of runs.  Runs inside a blob are flushed individually so they can be
+ * reordered.
+ *
+ * The only thing(aside from a memcopy) required to flush a GrAtlasTextBlob is to ensure that
+ * the GrAtlas will not evict anything the Blob needs.
+ *
+ * Note: This struct should really be named GrCachedAtasTextBlob, but that is too verbose.
+ *
+ * *WARNING* If you add new fields to this struct, then you may need to to update AssertEqual
+ */
+struct GrAtlasTextBlob : public SkRefCnt {
+    SK_DECLARE_INTERNAL_LLIST_INTERFACE(GrAtlasTextBlob);
+
+    /*
+     * Each Run inside of the blob can have its texture coordinates regenerated if required.
+     * To determine if regeneration is necessary, fAtlasGeneration is used.  If there have been
+     * any evictions inside of the atlas, then we will simply regenerate Runs.  We could track
+     * this at a more fine grained level, but its not clear if this is worth it, as evictions
+     * should be fairly rare.
+     *
+     * One additional point, each run can contain glyphs with any of the three mask formats.
+     * We call these SubRuns.  Because a subrun must be a contiguous range, we have to create
+     * a new subrun each time the mask format changes in a run.  In theory, a run can have as
+     * many SubRuns as it has glyphs, ie if a run alternates between color emoji and A8.  In
+     * practice, the vast majority of runs have only a single subrun.
+     *
+     * Finally, for runs where the entire thing is too large for the GrAtlasTextContext to
+     * handle, we have a bit to mark the run as flusahable via rendering as paths.  It is worth
+     * pointing. It would be a bit expensive to figure out ahead of time whether or not a run
+     * can flush in this manner, so we always allocate vertices for the run, regardless of
+     * whether or not it is too large.  The benefit of this strategy is that we can always reuse
+     * a blob allocation regardless of viewmatrix changes.  We could store positions for these
+     * glyphs.  However, its not clear if this is a win because we'd still have to either go the
+     * glyph cache to get the path at flush time, or hold onto the path in the cache, which
+     * would greatly increase the memory of these cached items.
+     */
+    struct Run {
+        Run()
+            : fColor(GrColor_ILLEGAL)
+            , fInitialized(false)
+            , fDrawAsPaths(false) {
+            fVertexBounds.setLargestInverted();
+            // To ensure we always have one subrun, we push back a fresh run here
+            fSubRunInfo.push_back();
+        }
+        struct SubRunInfo {
+            SubRunInfo()
+                : fAtlasGeneration(GrBatchAtlas::kInvalidAtlasGeneration)
+                , fVertexStartIndex(0)
+                , fVertexEndIndex(0)
+                , fGlyphStartIndex(0)
+                , fGlyphEndIndex(0)
+                , fTextRatio(1.0f)
+                , fMaskFormat(kA8_GrMaskFormat)
+                , fDrawAsDistanceFields(false)
+                , fUseLCDText(false) {}
+            SubRunInfo(const SubRunInfo& that)
+                : fBulkUseToken(that.fBulkUseToken)
+                , fStrike(SkSafeRef(that.fStrike.get()))
+                , fAtlasGeneration(that.fAtlasGeneration)
+                , fVertexStartIndex(that.fVertexStartIndex)
+                , fVertexEndIndex(that.fVertexEndIndex)
+                , fGlyphStartIndex(that.fGlyphStartIndex)
+                , fGlyphEndIndex(that.fGlyphEndIndex)
+                , fTextRatio(that.fTextRatio)
+                , fMaskFormat(that.fMaskFormat)
+                , fDrawAsDistanceFields(that.fDrawAsDistanceFields)
+                , fUseLCDText(that.fUseLCDText) {
+            }
+            // Distance field text cannot draw coloremoji, and so has to fall back.  However,
+            // though the distance field text and the coloremoji may share the same run, they
+            // will have different descriptors.  If fOverrideDescriptor is non-nullptr, then it
+            // will be used in place of the run's descriptor to regen texture coords
+            // TODO we could have a descriptor cache, it would reduce the size of these blobs
+            // significantly, and then the subrun could just have a refed pointer to the
+            // correct descriptor.
+            GrBatchAtlas::BulkUseTokenUpdater fBulkUseToken;
+            SkAutoTUnref<GrBatchTextStrike> fStrike;
+            uint64_t fAtlasGeneration;
+            size_t fVertexStartIndex;
+            size_t fVertexEndIndex;
+            uint32_t fGlyphStartIndex;
+            uint32_t fGlyphEndIndex;
+            SkScalar fTextRatio; // df property
+            GrMaskFormat fMaskFormat;
+            bool fDrawAsDistanceFields; // df property
+            bool fUseLCDText; // df property
+        };
+
+        SubRunInfo& push_back() {
+            // Forward glyph / vertex information to seed the new sub run
+            SubRunInfo& newSubRun = fSubRunInfo.push_back();
+            SubRunInfo& prevSubRun = fSubRunInfo.fromBack(1);
+
+            newSubRun.fGlyphStartIndex = prevSubRun.fGlyphEndIndex;
+            newSubRun.fGlyphEndIndex = prevSubRun.fGlyphEndIndex;
+
+            newSubRun.fVertexStartIndex = prevSubRun.fVertexEndIndex;
+            newSubRun.fVertexEndIndex = prevSubRun.fVertexEndIndex;
+            return newSubRun;
+        }
+        static const int kMinSubRuns = 1;
+        SkAutoTUnref<SkTypeface> fTypeface;
+        SkRect fVertexBounds;
+        SkSTArray<kMinSubRuns, SubRunInfo> fSubRunInfo;
+        SkAutoDescriptor fDescriptor;
+        SkAutoTDelete<SkAutoDescriptor> fOverrideDescriptor; // df properties
+        GrColor fColor;
+        bool fInitialized;
+        bool fDrawAsPaths;
+    };
+
+    struct BigGlyph {
+        BigGlyph(const SkPath& path, SkScalar vx, SkScalar vy, SkScalar scale, bool applyVM)
+            : fPath(path)
+            , fVx(vx)
+            , fVy(vy)
+            , fScale(scale)
+            , fApplyVM(applyVM) {}
+        SkPath fPath;
+        SkScalar fVx;
+        SkScalar fVy;
+        SkScalar fScale;
+        bool fApplyVM;
+    };
+
+    struct Key {
+        Key() {
+            sk_bzero(this, sizeof(Key));
+        }
+        uint32_t fUniqueID;
+        // Color may affect the gamma of the mask we generate, but in a fairly limited way.
+        // Each color is assigned to on of a fixed number of buckets based on its
+        // luminance. For each luminance bucket there is a "canonical color" that
+        // represents the bucket.  This functionality is currently only supported for A8
+        SkColor fCanonicalColor;
+        SkPaint::Style fStyle;
+        SkPixelGeometry fPixelGeometry;
+        bool fHasBlur;
+
+        bool operator==(const Key& other) const {
+            return 0 == memcmp(this, &other, sizeof(Key));
+        }
+    };
+
+    struct StrokeInfo {
+        SkScalar fFrameWidth;
+        SkScalar fMiterLimit;
+        SkPaint::Join fJoin;
+    };
+
+    enum TextType {
+        kHasDistanceField_TextType = 0x1,
+        kHasBitmap_TextType = 0x2,
+    };
+
+    // all glyph / vertex offsets are into these pools.
+    unsigned char* fVertices;
+    GrGlyph** fGlyphs;
+    Run* fRuns;
+    GrMemoryPool* fPool;
+    SkMaskFilter::BlurRec fBlurRec;
+    StrokeInfo fStrokeInfo;
+    SkTArray<BigGlyph> fBigGlyphs;
+    Key fKey;
+    SkMatrix fViewMatrix;
+    GrColor fPaintColor;
+    SkScalar fX;
+    SkScalar fY;
+
+    // We can reuse distance field text, but only if the new viewmatrix would not result in
+    // a mip change.  Because there can be multiple runs in a blob, we track the overall
+    // maximum minimum scale, and minimum maximum scale, we can support before we need to regen
+    SkScalar fMaxMinScale;
+    SkScalar fMinMaxScale;
+    int fRunCount;
+    uint8_t fTextType;
+
+    GrAtlasTextBlob()
+        : fMaxMinScale(-SK_ScalarMax)
+        , fMinMaxScale(SK_ScalarMax)
+        , fTextType(0) {}
+
+    ~GrAtlasTextBlob() override {
+        for (int i = 0; i < fRunCount; i++) {
+            fRuns[i].~Run();
+        }
+    }
+
+    static const Key& GetKey(const GrAtlasTextBlob& blob) {
+        return blob.fKey;
+    }
+
+    static uint32_t Hash(const Key& key) {
+        return SkChecksum::Murmur3(&key, sizeof(Key));
+    }
+
+    void operator delete(void* p) {
+        GrAtlasTextBlob* blob = reinterpret_cast<GrAtlasTextBlob*>(p);
+        blob->fPool->release(p);
+    }
+    void* operator new(size_t) {
+        SkFAIL("All blobs are created by placement new.");
+        return sk_malloc_throw(0);
+    }
+
+    void* operator new(size_t, void* p) { return p; }
+    void operator delete(void* target, void* placement) {
+        ::operator delete(target, placement);
+    }
+
+    bool hasDistanceField() const { return SkToBool(fTextType & kHasDistanceField_TextType); }
+    bool hasBitmap() const { return SkToBool(fTextType & kHasBitmap_TextType); }
+    void setHasDistanceField() { fTextType |= kHasDistanceField_TextType; }
+    void setHasBitmap() { fTextType |= kHasBitmap_TextType; }
+
+#ifdef CACHE_SANITY_CHECK
+    static void AssertEqual(const GrAtlasTextBlob&, const GrAtlasTextBlob&);
+    size_t fSize;
+#endif
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrAtlasTextContext.cpp b/gfx/skia/skia/src/gpu/GrAtlasTextContext.cpp
new file mode 100644
index 000000000000..7d0d93684cd2
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrAtlasTextContext.cpp
@@ -0,0 +1,1398 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "GrAtlasTextContext.h"
+
+#include "GrBlurUtils.h"
+#include "GrDrawContext.h"
+#include "GrDrawTarget.h"
+#include "GrFontScaler.h"
+#include "GrStrokeInfo.h"
+#include "GrTextBlobCache.h"
+#include "GrTexturePriv.h"
+#include "GrVertexBuffer.h"
+
+#include "SkAutoKern.h"
+#include "SkColorPriv.h"
+#include "SkColorFilter.h"
+#include "SkDistanceFieldGen.h"
+#include "SkDraw.h"
+#include "SkDrawFilter.h"
+#include "SkDrawProcs.h"
+#include "SkFindAndPlaceGlyph.h"
+#include "SkGlyphCache.h"
+#include "SkGpuDevice.h"
+#include "SkGrPriv.h"
+#include "SkPath.h"
+#include "SkRTConf.h"
+#include "SkStrokeRec.h"
+#include "SkTextBlob.h"
+#include "SkTextMapStateProc.h"
+
+#include "batches/GrAtlasTextBatch.h"
+
+namespace {
+static const int kMinDFFontSize = 18;
+static const int kSmallDFFontSize = 32;
+static const int kSmallDFFontLimit = 32;
+static const int kMediumDFFontSize = 72;
+static const int kMediumDFFontLimit = 72;
+static const int kLargeDFFontSize = 162;
+#ifdef SK_BUILD_FOR_ANDROID
+static const int kLargeDFFontLimit = 384;
+#else
+static const int kLargeDFFontLimit = 2 * kLargeDFFontSize;
+#endif
+
+SkDEBUGCODE(static const int kExpectedDistanceAdjustTableSize = 8;)
+};
+
+GrAtlasTextContext::GrAtlasTextContext(GrContext* context, const SkSurfaceProps& surfaceProps)
+    : INHERITED(context, surfaceProps)
+    , fDistanceAdjustTable(new DistanceAdjustTable) {
+    // We overallocate vertices in our textblobs based on the assumption that A8 has the greatest
+    // vertexStride
+    static_assert(GrAtlasTextBatch::kGrayTextVASize >= GrAtlasTextBatch::kColorTextVASize &&
+                  GrAtlasTextBatch::kGrayTextVASize >= GrAtlasTextBatch::kLCDTextVASize,
+                  "vertex_attribute_changed");
+    fCurrStrike = nullptr;
+    fCache = context->getTextBlobCache();
+}
+
+void GrAtlasTextContext::DistanceAdjustTable::buildDistanceAdjustTable() {
+
+    // This is used for an approximation of the mask gamma hack, used by raster and bitmap
+    // text. The mask gamma hack is based off of guessing what the blend color is going to
+    // be, and adjusting the mask so that when run through the linear blend will
+    // produce the value closest to the desired result. However, in practice this means
+    // that the 'adjusted' mask is just increasing or decreasing the coverage of
+    // the mask depending on what it is thought it will blit against. For black (on
+    // assumed white) this means that coverages are decreased (on a curve). For white (on
+    // assumed black) this means that coverages are increased (on a a curve). At
+    // middle (perceptual) gray (which could be blit against anything) the coverages
+    // remain the same.
+    //
+    // The idea here is that instead of determining the initial (real) coverage and
+    // then adjusting that coverage, we determine an adjusted coverage directly by
+    // essentially manipulating the geometry (in this case, the distance to the glyph
+    // edge). So for black (on assumed white) this thins a bit; for white (on
+    // assumed black) this fake bolds the geometry a bit.
+    //
+    // The distance adjustment is calculated by determining the actual coverage value which
+    // when fed into in the mask gamma table gives us an 'adjusted coverage' value of 0.5. This
+    // actual coverage value (assuming it's between 0 and 1) corresponds to a distance from the
+    // actual edge. So by subtracting this distance adjustment and computing without the
+    // the coverage adjustment we should get 0.5 coverage at the same point.
+    //
+    // This has several implications:
+    //     For non-gray lcd smoothed text, each subpixel essentially is using a
+    //     slightly different geometry.
+    //
+    //     For black (on assumed white) this may not cover some pixels which were
+    //     previously covered; however those pixels would have been only slightly
+    //     covered and that slight coverage would have been decreased anyway. Also, some pixels
+    //     which were previously fully covered may no longer be fully covered.
+    //
+    //     For white (on assumed black) this may cover some pixels which weren't
+    //     previously covered at all.
+
+    int width, height;
+    size_t size;
+
+#ifdef SK_GAMMA_CONTRAST
+    SkScalar contrast = SK_GAMMA_CONTRAST;
+#else
+    SkScalar contrast = 0.5f;
+#endif
+    SkScalar paintGamma = SK_GAMMA_EXPONENT;
+    SkScalar deviceGamma = SK_GAMMA_EXPONENT;
+
+    size = SkScalerContext::GetGammaLUTSize(contrast, paintGamma, deviceGamma,
+        &width, &height);
+
+    SkASSERT(kExpectedDistanceAdjustTableSize == height);
+    fTable = new SkScalar[height];
+
+    SkAutoTArray<uint8_t> data((int)size);
+    SkScalerContext::GetGammaLUTData(contrast, paintGamma, deviceGamma, data.get());
+
+    // find the inverse points where we cross 0.5
+    // binsearch might be better, but we only need to do this once on creation
+    for (int row = 0; row < height; ++row) {
+        uint8_t* rowPtr = data.get() + row*width;
+        for (int col = 0; col < width - 1; ++col) {
+            if (rowPtr[col] <= 127 && rowPtr[col + 1] >= 128) {
+                // compute point where a mask value will give us a result of 0.5
+                float interp = (127.5f - rowPtr[col]) / (rowPtr[col + 1] - rowPtr[col]);
+                float borderAlpha = (col + interp) / 255.f;
+
+                // compute t value for that alpha
+                // this is an approximate inverse for smoothstep()
+                float t = borderAlpha*(borderAlpha*(4.0f*borderAlpha - 6.0f) + 5.0f) / 3.0f;
+
+                // compute distance which gives us that t value
+                const float kDistanceFieldAAFactor = 0.65f; // should match SK_DistanceFieldAAFactor
+                float d = 2.0f*kDistanceFieldAAFactor*t - kDistanceFieldAAFactor;
+
+                fTable[row] = d;
+                break;
+            }
+        }
+    }
+}
+
+GrAtlasTextContext* GrAtlasTextContext::Create(GrContext* context,
+                                               const SkSurfaceProps& surfaceProps) {
+    return new GrAtlasTextContext(context, surfaceProps);
+}
+
+bool GrAtlasTextContext::canDraw(const SkPaint& skPaint, const SkMatrix& viewMatrix) {
+    return this->canDrawAsDistanceFields(skPaint, viewMatrix) ||
+           !SkDraw::ShouldDrawTextAsPaths(skPaint, viewMatrix);
+}
+
+GrColor GrAtlasTextContext::ComputeCanonicalColor(const SkPaint& paint, bool lcd) {
+    GrColor canonicalColor = paint.computeLuminanceColor();
+    if (lcd) {
+        // This is the correct computation, but there are tons of cases where LCD can be overridden.
+        // For now we just regenerate if any run in a textblob has LCD.
+        // TODO figure out where all of these overrides are and see if we can incorporate that logic
+        // at a higher level *OR* use sRGB
+        SkASSERT(false);
+        //canonicalColor = SkMaskGamma::CanonicalColor(canonicalColor);
+    } else {
+        // A8, though can have mixed BMP text but it shouldn't matter because BMP text won't have
+        // gamma corrected masks anyways, nor color
+        U8CPU lum = SkComputeLuminance(SkColorGetR(canonicalColor),
+                                       SkColorGetG(canonicalColor),
+                                       SkColorGetB(canonicalColor));
+        // reduce to our finite number of bits
+        canonicalColor = SkMaskGamma::CanonicalColor(SkColorSetRGB(lum, lum, lum));
+    }
+    return canonicalColor;
+}
+
+// TODO if this function ever shows up in profiling, then we can compute this value when the
+// textblob is being built and cache it.  However, for the time being textblobs mostly only have 1
+// run so this is not a big deal to compute here.
+bool GrAtlasTextContext::HasLCD(const SkTextBlob* blob) {
+    SkTextBlobRunIterator it(blob);
+    for (; !it.done(); it.next()) {
+        if (it.isLCD()) {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool GrAtlasTextContext::MustRegenerateBlob(SkScalar* outTransX, SkScalar* outTransY,
+                                            const GrAtlasTextBlob& blob, const SkPaint& paint,
+                                            GrColor color, const SkMaskFilter::BlurRec& blurRec,
+                                            const SkMatrix& viewMatrix, SkScalar x, SkScalar y) {
+    // If we have LCD text then our canonical color will be set to transparent, in this case we have
+    // to regenerate the blob on any color change
+    // We use the grPaint to get any color filter effects
+    if (blob.fKey.fCanonicalColor == SK_ColorTRANSPARENT &&
+        blob.fPaintColor != color) {
+        return true;
+    }
+
+    if (blob.fViewMatrix.hasPerspective() != viewMatrix.hasPerspective()) {
+        return true;
+    }
+
+    if (blob.fViewMatrix.hasPerspective() && !blob.fViewMatrix.cheapEqualTo(viewMatrix)) {
+        return true;
+    }
+
+    // We only cache one masked version
+    if (blob.fKey.fHasBlur &&
+        (blob.fBlurRec.fSigma != blurRec.fSigma ||
+         blob.fBlurRec.fStyle != blurRec.fStyle ||
+         blob.fBlurRec.fQuality != blurRec.fQuality)) {
+        return true;
+    }
+
+    // Similarly, we only cache one version for each style
+    if (blob.fKey.fStyle != SkPaint::kFill_Style &&
+        (blob.fStrokeInfo.fFrameWidth != paint.getStrokeWidth() ||
+         blob.fStrokeInfo.fMiterLimit != paint.getStrokeMiter() ||
+         blob.fStrokeInfo.fJoin != paint.getStrokeJoin())) {
+        return true;
+    }
+
+    // Mixed blobs must be regenerated.  We could probably figure out a way to do integer scrolls
+    // for mixed blobs if this becomes an issue.
+    if (blob.hasBitmap() && blob.hasDistanceField()) {
+        // Identical viewmatrices and we can reuse in all cases
+        if (blob.fViewMatrix.cheapEqualTo(viewMatrix) && x == blob.fX && y == blob.fY) {
+            return false;
+        }
+        return true;
+    }
+
+    if (blob.hasBitmap()) {
+        if (blob.fViewMatrix.getScaleX() != viewMatrix.getScaleX() ||
+            blob.fViewMatrix.getScaleY() != viewMatrix.getScaleY() ||
+            blob.fViewMatrix.getSkewX() != viewMatrix.getSkewX() ||
+            blob.fViewMatrix.getSkewY() != viewMatrix.getSkewY()) {
+            return true;
+        }
+
+        // We can update the positions in the cachedtextblobs without regenerating the whole blob,
+        // but only for integer translations.
+        // This cool bit of math will determine the necessary translation to apply to the already
+        // generated vertex coordinates to move them to the correct position
+        SkScalar transX = viewMatrix.getTranslateX() +
+                          viewMatrix.getScaleX() * (x - blob.fX) +
+                          viewMatrix.getSkewX() * (y - blob.fY) -
+                          blob.fViewMatrix.getTranslateX();
+        SkScalar transY = viewMatrix.getTranslateY() +
+                          viewMatrix.getSkewY() * (x - blob.fX) +
+                          viewMatrix.getScaleY() * (y - blob.fY) -
+                          blob.fViewMatrix.getTranslateY();
+        if (!SkScalarIsInt(transX) || !SkScalarIsInt(transY) ) {
+            return true;
+        }
+
+        (*outTransX) = transX;
+        (*outTransY) = transY;
+    } else if (blob.hasDistanceField()) {
+        // A scale outside of [blob.fMaxMinScale, blob.fMinMaxScale] would result in a different
+        // distance field being generated, so we have to regenerate in those cases
+        SkScalar newMaxScale = viewMatrix.getMaxScale();
+        SkScalar oldMaxScale = blob.fViewMatrix.getMaxScale();
+        SkScalar scaleAdjust = newMaxScale / oldMaxScale;
+        if (scaleAdjust < blob.fMaxMinScale || scaleAdjust > blob.fMinMaxScale) {
+            return true;
+        }
+
+        (*outTransX) = x - blob.fX;
+        (*outTransY) = y - blob.fY;
+    }
+
+    // It is possible that a blob has neither distanceField nor bitmaptext.  This is in the case
+    // when all of the runs inside the blob are drawn as paths.  In this case, we always regenerate
+    // the blob anyways at flush time, so no need to regenerate explicitly
+    return false;
+}
+
+
+inline SkGlyphCache* GrAtlasTextContext::setupCache(GrAtlasTextBlob::Run* run,
+                                                    const SkPaint& skPaint,
+                                                    const SkMatrix* viewMatrix,
+                                                    bool noGamma) {
+    skPaint.getScalerContextDescriptor(&run->fDescriptor, fSurfaceProps, viewMatrix, noGamma);
+    run->fTypeface.reset(SkSafeRef(skPaint.getTypeface()));
+    return SkGlyphCache::DetachCache(run->fTypeface, run->fDescriptor.getDesc());
+}
+
+void GrAtlasTextContext::drawTextBlob(GrDrawContext* dc, GrRenderTarget* rt,
+                                      const GrClip& clip, const SkPaint& skPaint,
+                                      const SkMatrix& viewMatrix, const SkTextBlob* blob,
+                                      SkScalar x, SkScalar y,
+                                      SkDrawFilter* drawFilter, const SkIRect& clipBounds) {
+    // If we have been abandoned, then don't draw
+    if (fContext->abandoned()) {
+        return;
+    }
+
+    SkAutoTUnref<GrAtlasTextBlob> cacheBlob;
+    SkMaskFilter::BlurRec blurRec;
+    GrAtlasTextBlob::Key key;
+    // It might be worth caching these things, but its not clear at this time
+    // TODO for animated mask filters, this will fill up our cache.  We need a safeguard here
+    const SkMaskFilter* mf = skPaint.getMaskFilter();
+    bool canCache = !(skPaint.getPathEffect() ||
+                      (mf && !mf->asABlur(&blurRec)) ||
+                      drawFilter);
+
+    if (canCache) {
+        bool hasLCD = HasLCD(blob);
+
+        // We canonicalize all non-lcd draws to use kUnknown_SkPixelGeometry
+        SkPixelGeometry pixelGeometry = hasLCD ? fSurfaceProps.pixelGeometry() :
+                                                 kUnknown_SkPixelGeometry;
+
+        // TODO we want to figure out a way to be able to use the canonical color on LCD text,
+        // see the note on ComputeCanonicalColor above.  We pick a dummy value for LCD text to
+        // ensure we always match the same key
+        GrColor canonicalColor = hasLCD ? SK_ColorTRANSPARENT :
+                                          ComputeCanonicalColor(skPaint, hasLCD);
+
+        key.fPixelGeometry = pixelGeometry;
+        key.fUniqueID = blob->uniqueID();
+        key.fStyle = skPaint.getStyle();
+        key.fHasBlur = SkToBool(mf);
+        key.fCanonicalColor = canonicalColor;
+        cacheBlob.reset(SkSafeRef(fCache->find(key)));
+    }
+
+    SkScalar transX = 0.f;
+    SkScalar transY = 0.f;
+
+    // Though for the time being runs in the textblob can override the paint, they only touch font
+    // info.
+    GrPaint grPaint;
+    if (!SkPaintToGrPaint(fContext, skPaint, viewMatrix, &grPaint)) {
+        return;
+    }
+
+    if (cacheBlob) {
+        if (MustRegenerateBlob(&transX, &transY, *cacheBlob, skPaint, grPaint.getColor(), blurRec,
+                               viewMatrix, x, y)) {
+            // We have to remake the blob because changes may invalidate our masks.
+            // TODO we could probably get away reuse most of the time if the pointer is unique,
+            // but we'd have to clear the subrun information
+            fCache->remove(cacheBlob);
+            cacheBlob.reset(SkRef(fCache->createCachedBlob(blob, key, blurRec, skPaint,
+                                                           GrAtlasTextBatch::kGrayTextVASize)));
+            this->regenerateTextBlob(cacheBlob, skPaint, grPaint.getColor(), viewMatrix,
+                                     blob, x, y, drawFilter, clip);
+        } else {
+            // If we can reuse the blob, then make sure we update the blob's viewmatrix, and x/y
+            // offsets.  Note, we offset the vertex bounds right before flushing
+            cacheBlob->fViewMatrix = viewMatrix;
+            cacheBlob->fX = x;
+            cacheBlob->fY = y;
+            fCache->makeMRU(cacheBlob);
+#ifdef CACHE_SANITY_CHECK
+            {
+                int glyphCount = 0;
+                int runCount = 0;
+                GrTextBlobCache::BlobGlyphCount(&glyphCount, &runCount, blob);
+                SkAutoTUnref<GrAtlasTextBlob> sanityBlob(fCache->createBlob(glyphCount, runCount,
+                                                                            kGrayTextVASize));
+                GrTextBlobCache::SetupCacheBlobKey(sanityBlob, key, blurRec, skPaint);
+                this->regenerateTextBlob(sanityBlob, skPaint, grPaint.getColor(), viewMatrix,
+                                         blob, x, y, drawFilter, clip);
+                GrAtlasTextBlob::AssertEqual(*sanityBlob, *cacheBlob);
+            }
+
+#endif
+        }
+    } else {
+        if (canCache) {
+            cacheBlob.reset(SkRef(fCache->createCachedBlob(blob, key, blurRec, skPaint,
+                                                           GrAtlasTextBatch::kGrayTextVASize)));
+        } else {
+            cacheBlob.reset(fCache->createBlob(blob, GrAtlasTextBatch::kGrayTextVASize));
+        }
+        this->regenerateTextBlob(cacheBlob, skPaint, grPaint.getColor(), viewMatrix,
+                                 blob, x, y, drawFilter, clip);
+    }
+
+    this->flush(blob, cacheBlob, dc, rt, skPaint, grPaint, drawFilter,
+                clip, viewMatrix, clipBounds, x, y, transX, transY);
+}
+
+inline bool GrAtlasTextContext::canDrawAsDistanceFields(const SkPaint& skPaint,
+                                                        const SkMatrix& viewMatrix) {
+    // TODO: support perspective (need getMaxScale replacement)
+    if (viewMatrix.hasPerspective()) {
+        return false;
+    }
+
+    SkScalar maxScale = viewMatrix.getMaxScale();
+    SkScalar scaledTextSize = maxScale*skPaint.getTextSize();
+    // Hinted text looks far better at small resolutions
+    // Scaling up beyond 2x yields undesireable artifacts
+    if (scaledTextSize < kMinDFFontSize || scaledTextSize > kLargeDFFontLimit) {
+        return false;
+    }
+
+    bool useDFT = fSurfaceProps.isUseDeviceIndependentFonts();
+#if SK_FORCE_DISTANCE_FIELD_TEXT
+    useDFT = true;
+#endif
+
+    if (!useDFT && scaledTextSize < kLargeDFFontSize) {
+        return false;
+    }
+
+    // rasterizers and mask filters modify alpha, which doesn't
+    // translate well to distance
+    if (skPaint.getRasterizer() || skPaint.getMaskFilter() ||
+        !fContext->caps()->shaderCaps()->shaderDerivativeSupport()) {
+        return false;
+    }
+
+    // TODO: add some stroking support
+    if (skPaint.getStyle() != SkPaint::kFill_Style) {
+        return false;
+    }
+
+    return true;
+}
+
+void GrAtlasTextContext::regenerateTextBlob(GrAtlasTextBlob* cacheBlob,
+                                            const SkPaint& skPaint, GrColor color,
+                                            const SkMatrix& viewMatrix,
+                                            const SkTextBlob* blob, SkScalar x, SkScalar y,
+                                            SkDrawFilter* drawFilter,
+                                            const GrClip& clip) {
+    // The color here is the GrPaint color, and it is used to determine whether we
+    // have to regenerate LCD text blobs.
+    // We use this color vs the SkPaint color because it has the colorfilter applied.
+    cacheBlob->fPaintColor = color;
+    cacheBlob->fViewMatrix = viewMatrix;
+    cacheBlob->fX = x;
+    cacheBlob->fY = y;
+
+    // Regenerate textblob
+    SkPaint runPaint = skPaint;
+    SkTextBlobRunIterator it(blob);
+    for (int run = 0; !it.done(); it.next(), run++) {
+        int glyphCount = it.glyphCount();
+        size_t textLen = glyphCount * sizeof(uint16_t);
+        const SkPoint& offset = it.offset();
+        // applyFontToPaint() always overwrites the exact same attributes,
+        // so it is safe to not re-seed the paint for this reason.
+        it.applyFontToPaint(&runPaint);
+
+        if (drawFilter && !drawFilter->filter(&runPaint, SkDrawFilter::kText_Type)) {
+            // A false return from filter() means we should abort the current draw.
+            runPaint = skPaint;
+            continue;
+        }
+
+        runPaint.setFlags(FilterTextFlags(fSurfaceProps, runPaint));
+
+        // setup vertex / glyphIndex for the new run
+        if (run > 0) {
+            PerSubRunInfo& newRun = cacheBlob->fRuns[run].fSubRunInfo.back();
+            PerSubRunInfo& lastRun = cacheBlob->fRuns[run - 1].fSubRunInfo.back();
+
+            newRun.fVertexStartIndex = lastRun.fVertexEndIndex;
+            newRun.fVertexEndIndex = lastRun.fVertexEndIndex;
+
+            newRun.fGlyphStartIndex = lastRun.fGlyphEndIndex;
+            newRun.fGlyphEndIndex = lastRun.fGlyphEndIndex;
+        }
+
+        if (this->canDrawAsDistanceFields(runPaint, viewMatrix)) {
+            cacheBlob->setHasDistanceField();
+            SkPaint dfPaint = runPaint;
+            SkScalar textRatio;
+            this->initDistanceFieldPaint(cacheBlob, &dfPaint, &textRatio, viewMatrix);
+            Run& runIdx = cacheBlob->fRuns[run];
+            PerSubRunInfo& subRun = runIdx.fSubRunInfo.back();
+            subRun.fUseLCDText = runPaint.isLCDRenderText();
+            subRun.fDrawAsDistanceFields = true;
+
+            SkTDArray<char> fallbackTxt;
+            SkTDArray<SkScalar> fallbackPos;
+            SkPoint dfOffset;
+            int scalarsPerPosition = 2;
+            switch (it.positioning()) {
+                case SkTextBlob::kDefault_Positioning: {
+                    this->internalDrawDFText(cacheBlob, run, dfPaint, color, viewMatrix,
+                                             (const char *)it.glyphs(), textLen,
+                                             x + offset.x(), y + offset.y(), textRatio,
+                                             &fallbackTxt, &fallbackPos, &dfOffset, runPaint);
+                    break;
+                }
+                case SkTextBlob::kHorizontal_Positioning: {
+                    scalarsPerPosition = 1;
+                    dfOffset = SkPoint::Make(x, y + offset.y());
+                    this->internalDrawDFPosText(cacheBlob, run, dfPaint, color, viewMatrix,
+                                                (const char*)it.glyphs(), textLen, it.pos(),
+                                                scalarsPerPosition, dfOffset, textRatio,
+                                                &fallbackTxt, &fallbackPos);
+                    break;
+                }
+                case SkTextBlob::kFull_Positioning: {
+                    dfOffset = SkPoint::Make(x, y);
+                    this->internalDrawDFPosText(cacheBlob, run, dfPaint, color, viewMatrix,
+                                                (const char*)it.glyphs(), textLen, it.pos(),
+                                                scalarsPerPosition, dfOffset, textRatio,
+                                                &fallbackTxt, &fallbackPos);
+                    break;
+                }
+            }
+            if (fallbackTxt.count()) {
+                this->fallbackDrawPosText(cacheBlob, run, clip, color, runPaint, viewMatrix,
+                                          fallbackTxt, fallbackPos, scalarsPerPosition, dfOffset);
+            }
+        } else if (SkDraw::ShouldDrawTextAsPaths(runPaint, viewMatrix)) {
+            cacheBlob->fRuns[run].fDrawAsPaths = true;
+        } else {
+            cacheBlob->setHasBitmap();
+            SkGlyphCache* cache = this->setupCache(&cacheBlob->fRuns[run], runPaint, &viewMatrix,
+                                                   false);
+            switch (it.positioning()) {
+                case SkTextBlob::kDefault_Positioning:
+                    this->internalDrawBMPText(cacheBlob, run, cache, runPaint, color, viewMatrix,
+                                              (const char *)it.glyphs(), textLen,
+                                              x + offset.x(), y + offset.y());
+                    break;
+                case SkTextBlob::kHorizontal_Positioning:
+                    this->internalDrawBMPPosText(cacheBlob, run, cache, runPaint, color, viewMatrix,
+                                                 (const char*)it.glyphs(), textLen, it.pos(), 1,
+                                                 SkPoint::Make(x, y + offset.y()));
+                    break;
+                case SkTextBlob::kFull_Positioning:
+                    this->internalDrawBMPPosText(cacheBlob, run, cache, runPaint, color, viewMatrix,
+                                                 (const char*)it.glyphs(), textLen, it.pos(), 2,
+                                                 SkPoint::Make(x, y));
+                    break;
+            }
+            SkGlyphCache::AttachCache(cache);
+        }
+
+        if (drawFilter) {
+            // A draw filter may change the paint arbitrarily, so we must re-seed in this case.
+            runPaint = skPaint;
+        }
+    }
+}
+
+inline void GrAtlasTextContext::initDistanceFieldPaint(GrAtlasTextBlob* blob,
+                                                       SkPaint* skPaint,
+                                                       SkScalar* textRatio,
+                                                       const SkMatrix& viewMatrix) {
+    // getMaxScale doesn't support perspective, so neither do we at the moment
+    SkASSERT(!viewMatrix.hasPerspective());
+    SkScalar maxScale = viewMatrix.getMaxScale();
+    SkScalar textSize = skPaint->getTextSize();
+    SkScalar scaledTextSize = textSize;
+    // if we have non-unity scale, we need to choose our base text size
+    // based on the SkPaint's text size multiplied by the max scale factor
+    // TODO: do we need to do this if we're scaling down (i.e. maxScale < 1)?
+    if (maxScale > 0 && !SkScalarNearlyEqual(maxScale, SK_Scalar1)) {
+        scaledTextSize *= maxScale;
+    }
+
+    // We have three sizes of distance field text, and within each size 'bucket' there is a floor
+    // and ceiling.  A scale outside of this range would require regenerating the distance fields
+    SkScalar dfMaskScaleFloor;
+    SkScalar dfMaskScaleCeil;
+    if (scaledTextSize <= kSmallDFFontLimit) {
+        dfMaskScaleFloor = kMinDFFontSize;
+        dfMaskScaleCeil = kSmallDFFontLimit;
+        *textRatio = textSize / kSmallDFFontSize;
+        skPaint->setTextSize(SkIntToScalar(kSmallDFFontSize));
+    } else if (scaledTextSize <= kMediumDFFontLimit) {
+        dfMaskScaleFloor = kSmallDFFontLimit;
+        dfMaskScaleCeil = kMediumDFFontLimit;
+        *textRatio = textSize / kMediumDFFontSize;
+        skPaint->setTextSize(SkIntToScalar(kMediumDFFontSize));
+    } else {
+        dfMaskScaleFloor = kMediumDFFontLimit;
+        dfMaskScaleCeil = kLargeDFFontLimit;
+        *textRatio = textSize / kLargeDFFontSize;
+        skPaint->setTextSize(SkIntToScalar(kLargeDFFontSize));
+    }
+
+    // Because there can be multiple runs in the blob, we want the overall maxMinScale, and
+    // minMaxScale to make regeneration decisions.  Specifically, we want the maximum minimum scale
+    // we can tolerate before we'd drop to a lower mip size, and the minimum maximum scale we can
+    // tolerate before we'd have to move to a large mip size.  When we actually test these values
+    // we look at the delta in scale between the new viewmatrix and the old viewmatrix, and test
+    // against these values to decide if we can reuse or not(ie, will a given scale change our mip
+    // level)
+    SkASSERT(dfMaskScaleFloor <= scaledTextSize && scaledTextSize <= dfMaskScaleCeil);
+    blob->fMaxMinScale = SkMaxScalar(dfMaskScaleFloor / scaledTextSize, blob->fMaxMinScale);
+    blob->fMinMaxScale = SkMinScalar(dfMaskScaleCeil / scaledTextSize, blob->fMinMaxScale);
+
+    skPaint->setLCDRenderText(false);
+    skPaint->setAutohinted(false);
+    skPaint->setHinting(SkPaint::kNormal_Hinting);
+    skPaint->setSubpixelText(true);
+}
+
+inline void GrAtlasTextContext::fallbackDrawPosText(GrAtlasTextBlob* blob,
+                                                    int runIndex,
+                                                    const GrClip& clip,
+                                                    GrColor color,
+                                                    const SkPaint& skPaint,
+                                                    const SkMatrix& viewMatrix,
+                                                    const SkTDArray<char>& fallbackTxt,
+                                                    const SkTDArray<SkScalar>& fallbackPos,
+                                                    int scalarsPerPosition,
+                                                    const SkPoint& offset) {
+    SkASSERT(fallbackTxt.count());
+    blob->setHasBitmap();
+    Run& run = blob->fRuns[runIndex];
+    // Push back a new subrun to fill and set the override descriptor
+    run.push_back();
+    run.fOverrideDescriptor.reset(new SkAutoDescriptor);
+    skPaint.getScalerContextDescriptor(run.fOverrideDescriptor,
+                                       fSurfaceProps, &viewMatrix, false);
+    SkGlyphCache* cache = SkGlyphCache::DetachCache(run.fTypeface,
+                                                    run.fOverrideDescriptor->getDesc());
+    this->internalDrawBMPPosText(blob, runIndex, cache, skPaint, color, viewMatrix,
+                                 fallbackTxt.begin(), fallbackTxt.count(),
+                                 fallbackPos.begin(), scalarsPerPosition, offset);
+    SkGlyphCache::AttachCache(cache);
+}
+
+inline GrAtlasTextBlob*
+GrAtlasTextContext::setupDFBlob(int glyphCount, const SkPaint& origPaint,
+                                const SkMatrix& viewMatrix, SkPaint* dfPaint,
+                                SkScalar* textRatio) {
+    GrAtlasTextBlob* blob = fCache->createBlob(glyphCount, 1, GrAtlasTextBatch::kGrayTextVASize);
+
+    *dfPaint = origPaint;
+    this->initDistanceFieldPaint(blob, dfPaint, textRatio, viewMatrix);
+    blob->fViewMatrix = viewMatrix;
+    Run& run = blob->fRuns[0];
+    PerSubRunInfo& subRun = run.fSubRunInfo.back();
+    subRun.fUseLCDText = origPaint.isLCDRenderText();
+    subRun.fDrawAsDistanceFields = true;
+
+    return blob;
+}
+
+inline GrAtlasTextBlob*
+GrAtlasTextContext::createDrawTextBlob(const GrClip& clip,
+                                       const GrPaint& paint, const SkPaint& skPaint,
+                                       const SkMatrix& viewMatrix,
+                                       const char text[], size_t byteLength,
+                                       SkScalar x, SkScalar y, const SkIRect& regionClipBounds) {
+    int glyphCount = skPaint.countText(text, byteLength);
+
+    GrAtlasTextBlob* blob;
+    if (this->canDrawAsDistanceFields(skPaint, viewMatrix)) {
+        SkPaint dfPaint;
+        SkScalar textRatio;
+        blob = this->setupDFBlob(glyphCount, skPaint, viewMatrix, &dfPaint, &textRatio);
+
+        SkTDArray<char> fallbackTxt;
+        SkTDArray<SkScalar> fallbackPos;
+        SkPoint offset;
+        this->internalDrawDFText(blob, 0, dfPaint, paint.getColor(), viewMatrix, text,
+                                 byteLength, x, y, textRatio, &fallbackTxt, &fallbackPos,
+                                 &offset, skPaint);
+        if (fallbackTxt.count()) {
+            this->fallbackDrawPosText(blob, 0, clip, paint.getColor(), skPaint, viewMatrix,
+                                      fallbackTxt, fallbackPos, 2, offset);
+        }
+    } else {
+        blob = fCache->createBlob(glyphCount, 1, GrAtlasTextBatch::kGrayTextVASize);
+        blob->fViewMatrix = viewMatrix;
+
+        SkGlyphCache* cache = this->setupCache(&blob->fRuns[0], skPaint, &viewMatrix, false);
+        this->internalDrawBMPText(blob, 0, cache, skPaint, paint.getColor(), viewMatrix, text,
+                                  byteLength, x, y);
+        SkGlyphCache::AttachCache(cache);
+    }
+    return blob;
+}
+
+inline GrAtlasTextBlob*
+GrAtlasTextContext::createDrawPosTextBlob(const GrClip& clip,
+                                          const GrPaint& paint, const SkPaint& skPaint,
+                                          const SkMatrix& viewMatrix,
+                                          const char text[], size_t byteLength,
+                                          const SkScalar pos[], int scalarsPerPosition,
+                                          const SkPoint& offset, const SkIRect& regionClipBounds) {
+    int glyphCount = skPaint.countText(text, byteLength);
+
+    GrAtlasTextBlob* blob;
+    if (this->canDrawAsDistanceFields(skPaint, viewMatrix)) {
+        SkPaint dfPaint;
+        SkScalar textRatio;
+        blob = this->setupDFBlob(glyphCount, skPaint, viewMatrix, &dfPaint, &textRatio);
+
+        SkTDArray<char> fallbackTxt;
+        SkTDArray<SkScalar> fallbackPos;
+        this->internalDrawDFPosText(blob, 0, dfPaint, paint.getColor(), viewMatrix, text,
+                                    byteLength, pos, scalarsPerPosition, offset,
+                                    textRatio, &fallbackTxt, &fallbackPos);
+        if (fallbackTxt.count()) {
+            this->fallbackDrawPosText(blob, 0, clip, paint.getColor(), skPaint, viewMatrix,
+                                      fallbackTxt, fallbackPos, scalarsPerPosition, offset);
+        }
+    } else {
+        blob = fCache->createBlob(glyphCount, 1, GrAtlasTextBatch::kGrayTextVASize);
+        blob->fViewMatrix = viewMatrix;
+        SkGlyphCache* cache = this->setupCache(&blob->fRuns[0], skPaint, &viewMatrix, false);
+        this->internalDrawBMPPosText(blob, 0, cache, skPaint, paint.getColor(), viewMatrix, text,
+                                     byteLength, pos, scalarsPerPosition, offset);
+        SkGlyphCache::AttachCache(cache);
+    }
+    return blob;
+}
+
+void GrAtlasTextContext::onDrawText(GrDrawContext* dc, GrRenderTarget* rt,
+                                    const GrClip& clip,
+                                    const GrPaint& paint, const SkPaint& skPaint,
+                                    const SkMatrix& viewMatrix,
+                                    const char text[], size_t byteLength,
+                                    SkScalar x, SkScalar y, const SkIRect& regionClipBounds) {
+    SkAutoTUnref<GrAtlasTextBlob> blob(
+        this->createDrawTextBlob(clip, paint, skPaint, viewMatrix,
+                                 text, byteLength, x, y, regionClipBounds));
+    this->flush(blob, dc, rt, skPaint, paint, clip, regionClipBounds);
+}
+
+void GrAtlasTextContext::onDrawPosText(GrDrawContext* dc, GrRenderTarget* rt,
+                                       const GrClip& clip,
+                                       const GrPaint& paint, const SkPaint& skPaint,
+                                       const SkMatrix& viewMatrix,
+                                       const char text[], size_t byteLength,
+                                       const SkScalar pos[], int scalarsPerPosition,
+                                       const SkPoint& offset, const SkIRect& regionClipBounds) {
+    SkAutoTUnref<GrAtlasTextBlob> blob(
+        this->createDrawPosTextBlob(clip, paint, skPaint, viewMatrix,
+                                    text, byteLength,
+                                    pos, scalarsPerPosition,
+                                    offset, regionClipBounds));
+
+    this->flush(blob, dc, rt, skPaint, paint, clip, regionClipBounds);
+}
+
+void GrAtlasTextContext::internalDrawBMPText(GrAtlasTextBlob* blob, int runIndex,
+                                             SkGlyphCache* cache, const SkPaint& skPaint,
+                                             GrColor color,
+                                             const SkMatrix& viewMatrix,
+                                             const char text[], size_t byteLength,
+                                             SkScalar x, SkScalar y) {
+    SkASSERT(byteLength == 0 || text != nullptr);
+
+    // nothing to draw
+    if (text == nullptr || byteLength == 0) {
+        return;
+    }
+
+    fCurrStrike = nullptr;
+
+    // Get GrFontScaler from cache
+    GrFontScaler* fontScaler = GetGrFontScaler(cache);
+
+    SkFindAndPlaceGlyph::ProcessText(
+        skPaint.getTextEncoding(), text, byteLength,
+        {x, y}, viewMatrix, skPaint.getTextAlign(),
+        cache,
+        [&](const SkGlyph& glyph, SkPoint position, SkPoint rounding) {
+            position += rounding;
+            this->bmpAppendGlyph(
+                blob, runIndex, glyph,
+                SkScalarFloorToInt(position.fX), SkScalarFloorToInt(position.fY),
+                color, fontScaler);
+        }
+    );
+}
+
+void GrAtlasTextContext::internalDrawBMPPosText(GrAtlasTextBlob* blob, int runIndex,
+                                                SkGlyphCache* cache, const SkPaint& skPaint,
+                                                GrColor color,
+                                                const SkMatrix& viewMatrix,
+                                                const char text[], size_t byteLength,
+                                                const SkScalar pos[], int scalarsPerPosition,
+                                                const SkPoint& offset) {
+    SkASSERT(byteLength == 0 || text != nullptr);
+    SkASSERT(1 == scalarsPerPosition || 2 == scalarsPerPosition);
+
+    // nothing to draw
+    if (text == nullptr || byteLength == 0) {
+        return;
+    }
+
+    fCurrStrike = nullptr;
+
+    // Get GrFontScaler from cache
+    GrFontScaler* fontScaler = GetGrFontScaler(cache);
+
+    SkFindAndPlaceGlyph::ProcessPosText(
+        skPaint.getTextEncoding(), text, byteLength,
+        offset, viewMatrix, pos, scalarsPerPosition,
+        skPaint.getTextAlign(), cache,
+        [&](const SkGlyph& glyph, SkPoint position, SkPoint rounding) {
+            position += rounding;
+            this->bmpAppendGlyph(
+                blob, runIndex, glyph,
+                SkScalarFloorToInt(position.fX), SkScalarFloorToInt(position.fY),
+                color, fontScaler);
+        }
+    );
+}
+
+void GrAtlasTextContext::internalDrawDFText(GrAtlasTextBlob* blob, int runIndex,
+                                            const SkPaint& skPaint, GrColor color,
+                                            const SkMatrix& viewMatrix,
+                                            const char text[], size_t byteLength,
+                                            SkScalar x, SkScalar y,
+                                            SkScalar textRatio,
+                                            SkTDArray<char>* fallbackTxt,
+                                            SkTDArray<SkScalar>* fallbackPos,
+                                            SkPoint* offset,
+                                            const SkPaint& origPaint) {
+    SkASSERT(byteLength == 0 || text != nullptr);
+
+    // nothing to draw
+    if (text == nullptr || byteLength == 0) {
+        return;
+    }
+
+    SkDrawCacheProc glyphCacheProc = origPaint.getDrawCacheProc();
+    SkAutoDescriptor desc;
+    origPaint.getScalerContextDescriptor(&desc, fSurfaceProps, nullptr, true);
+    SkGlyphCache* origPaintCache = SkGlyphCache::DetachCache(origPaint.getTypeface(),
+                                                             desc.getDesc());
+
+    SkTArray<SkScalar> positions;
+
+    const char* textPtr = text;
+    SkFixed stopX = 0;
+    SkFixed stopY = 0;
+    SkFixed origin = 0;
+    switch (origPaint.getTextAlign()) {
+        case SkPaint::kRight_Align: origin = SK_Fixed1; break;
+        case SkPaint::kCenter_Align: origin = SK_FixedHalf; break;
+        case SkPaint::kLeft_Align: origin = 0; break;
+    }
+
+    SkAutoKern autokern;
+    const char* stop = text + byteLength;
+    while (textPtr < stop) {
+        // don't need x, y here, since all subpixel variants will have the
+        // same advance
+        const SkGlyph& glyph = glyphCacheProc(origPaintCache, &textPtr, 0, 0);
+
+        SkFixed width = glyph.fAdvanceX + autokern.adjust(glyph);
+        positions.push_back(SkFixedToScalar(stopX + SkFixedMul(origin, width)));
+
+        SkFixed height = glyph.fAdvanceY;
+        positions.push_back(SkFixedToScalar(stopY + SkFixedMul(origin, height)));
+
+        stopX += width;
+        stopY += height;
+    }
+    SkASSERT(textPtr == stop);
+
+    SkGlyphCache::AttachCache(origPaintCache);
+
+    // now adjust starting point depending on alignment
+    SkScalar alignX = SkFixedToScalar(stopX);
+    SkScalar alignY = SkFixedToScalar(stopY);
+    if (origPaint.getTextAlign() == SkPaint::kCenter_Align) {
+        alignX = SkScalarHalf(alignX);
+        alignY = SkScalarHalf(alignY);
+    } else if (origPaint.getTextAlign() == SkPaint::kLeft_Align) {
+        alignX = 0;
+        alignY = 0;
+    }
+    x -= alignX;
+    y -= alignY;
+    *offset = SkPoint::Make(x, y);
+
+    this->internalDrawDFPosText(blob, runIndex, skPaint, color, viewMatrix, text, byteLength,
+                                positions.begin(), 2, *offset, textRatio, fallbackTxt,
+                                fallbackPos);
+}
+
+void GrAtlasTextContext::internalDrawDFPosText(GrAtlasTextBlob* blob, int runIndex,
+                                               const SkPaint& skPaint, GrColor color,
+                                               const SkMatrix& viewMatrix,
+                                               const char text[], size_t byteLength,
+                                               const SkScalar pos[], int scalarsPerPosition,
+                                               const SkPoint& offset,
+                                               SkScalar textRatio,
+                                               SkTDArray<char>* fallbackTxt,
+                                               SkTDArray<SkScalar>* fallbackPos) {
+
+    SkASSERT(byteLength == 0 || text != nullptr);
+    SkASSERT(1 == scalarsPerPosition || 2 == scalarsPerPosition);
+
+    // nothing to draw
+    if (text == nullptr || byteLength == 0) {
+        return;
+    }
+
+    fCurrStrike = nullptr;
+
+    SkDrawCacheProc glyphCacheProc = skPaint.getDrawCacheProc();
+    SkGlyphCache* cache = this->setupCache(&blob->fRuns[runIndex], skPaint, nullptr, true);
+    GrFontScaler* fontScaler = GetGrFontScaler(cache);
+
+    const char* stop = text + byteLength;
+
+    if (SkPaint::kLeft_Align == skPaint.getTextAlign()) {
+        while (text < stop) {
+            const char* lastText = text;
+            // the last 2 parameters are ignored
+            const SkGlyph& glyph = glyphCacheProc(cache, &text, 0, 0);
+
+            if (glyph.fWidth) {
+                SkScalar x = offset.x() + pos[0];
+                SkScalar y = offset.y() + (2 == scalarsPerPosition ? pos[1] : 0);
+
+                if (!this->dfAppendGlyph(blob,
+                                         runIndex,
+                                         glyph,
+                                         x, y, color, fontScaler,
+                                         textRatio, viewMatrix)) {
+                    // couldn't append, send to fallback
+                    fallbackTxt->append(SkToInt(text-lastText), lastText);
+                    *fallbackPos->append() = pos[0];
+                    if (2 == scalarsPerPosition) {
+                        *fallbackPos->append() = pos[1];
+                    }
+                }
+            }
+            pos += scalarsPerPosition;
+        }
+    } else {
+        SkScalar alignMul = SkPaint::kCenter_Align == skPaint.getTextAlign() ? SK_ScalarHalf
+                                                                             : SK_Scalar1;
+        while (text < stop) {
+            const char* lastText = text;
+            // the last 2 parameters are ignored
+            const SkGlyph& glyph = glyphCacheProc(cache, &text, 0, 0);
+
+            if (glyph.fWidth) {
+                SkScalar x = offset.x() + pos[0];
+                SkScalar y = offset.y() + (2 == scalarsPerPosition ? pos[1] : 0);
+
+                SkScalar advanceX = SkFixedToScalar(glyph.fAdvanceX) * alignMul * textRatio;
+                SkScalar advanceY = SkFixedToScalar(glyph.fAdvanceY) * alignMul * textRatio;
+
+                if (!this->dfAppendGlyph(blob,
+                                         runIndex,
+                                         glyph,
+                                         x - advanceX, y - advanceY, color,
+                                         fontScaler,
+                                         textRatio,
+                                         viewMatrix)) {
+                    // couldn't append, send to fallback
+                    fallbackTxt->append(SkToInt(text-lastText), lastText);
+                    *fallbackPos->append() = pos[0];
+                    if (2 == scalarsPerPosition) {
+                        *fallbackPos->append() = pos[1];
+                    }
+                }
+            }
+            pos += scalarsPerPosition;
+        }
+    }
+
+    SkGlyphCache::AttachCache(cache);
+}
+
+void GrAtlasTextContext::bmpAppendGlyph(GrAtlasTextBlob* blob, int runIndex,
+                                        const SkGlyph& skGlyph,
+                                        int vx, int vy, GrColor color, GrFontScaler* scaler) {
+    Run& run = blob->fRuns[runIndex];
+    if (!fCurrStrike) {
+        fCurrStrike = fContext->getBatchFontCache()->getStrike(scaler);
+    }
+
+    GrGlyph::PackedID id = GrGlyph::Pack(skGlyph.getGlyphID(),
+                                         skGlyph.getSubXFixed(),
+                                         skGlyph.getSubYFixed(),
+                                         GrGlyph::kCoverage_MaskStyle);
+    GrGlyph* glyph = fCurrStrike->getGlyph(skGlyph, id, scaler);
+    if (!glyph) {
+        return;
+    }
+
+    int x = vx + glyph->fBounds.fLeft;
+    int y = vy + glyph->fBounds.fTop;
+
+    // keep them as ints until we've done the clip-test
+    int width = glyph->fBounds.width();
+    int height = glyph->fBounds.height();
+
+    // If the glyph is too large we fall back to paths
+    if (glyph->fTooLargeForAtlas) {
+        this->appendGlyphPath(blob, glyph, scaler, skGlyph, SkIntToScalar(vx), SkIntToScalar(vy));
+        return;
+    }
+
+    GrMaskFormat format = glyph->fMaskFormat;
+
+    PerSubRunInfo* subRun = &run.fSubRunInfo.back();
+    if (run.fInitialized && subRun->fMaskFormat != format) {
+        subRun = &run.push_back();
+        subRun->fStrike.reset(SkRef(fCurrStrike));
+    } else if (!run.fInitialized) {
+        subRun->fStrike.reset(SkRef(fCurrStrike));
+    }
+
+    run.fInitialized = true;
+
+    size_t vertexStride = GrAtlasTextBatch::GetVertexStride(format);
+
+    SkRect r;
+    r.fLeft = SkIntToScalar(x);
+    r.fTop = SkIntToScalar(y);
+    r.fRight = r.fLeft + SkIntToScalar(width);
+    r.fBottom = r.fTop + SkIntToScalar(height);
+    subRun->fMaskFormat = format;
+    this->appendGlyphCommon(blob, &run, subRun, r, color, vertexStride, kA8_GrMaskFormat == format,
+                            glyph);
+}
+
+bool GrAtlasTextContext::dfAppendGlyph(GrAtlasTextBlob* blob, int runIndex,
+                                       const SkGlyph& skGlyph,
+                                       SkScalar sx, SkScalar sy, GrColor color,
+                                       GrFontScaler* scaler,
+                                       SkScalar textRatio, const SkMatrix& viewMatrix) {
+    Run& run = blob->fRuns[runIndex];
+    if (!fCurrStrike) {
+        fCurrStrike = fContext->getBatchFontCache()->getStrike(scaler);
+    }
+
+    GrGlyph::PackedID id = GrGlyph::Pack(skGlyph.getGlyphID(),
+                                         skGlyph.getSubXFixed(),
+                                         skGlyph.getSubYFixed(),
+                                         GrGlyph::kDistance_MaskStyle);
+    GrGlyph* glyph = fCurrStrike->getGlyph(skGlyph, id, scaler);
+    if (!glyph) {
+        return true;
+    }
+
+    // fallback to color glyph support
+    if (kA8_GrMaskFormat != glyph->fMaskFormat) {
+        return false;
+    }
+
+    SkScalar dx = SkIntToScalar(glyph->fBounds.fLeft + SK_DistanceFieldInset);
+    SkScalar dy = SkIntToScalar(glyph->fBounds.fTop + SK_DistanceFieldInset);
+    SkScalar width = SkIntToScalar(glyph->fBounds.width() - 2 * SK_DistanceFieldInset);
+    SkScalar height = SkIntToScalar(glyph->fBounds.height() - 2 * SK_DistanceFieldInset);
+
+    SkScalar scale = textRatio;
+    dx *= scale;
+    dy *= scale;
+    width *= scale;
+    height *= scale;
+    sx += dx;
+    sy += dy;
+    SkRect glyphRect = SkRect::MakeXYWH(sx, sy, width, height);
+
+    // TODO combine with the above
+    // If the glyph is too large we fall back to paths
+    if (glyph->fTooLargeForAtlas) {
+        this->appendGlyphPath(blob, glyph, scaler, skGlyph, sx - dx, sy - dy, scale, true);
+        return true;
+    }
+
+    PerSubRunInfo* subRun = &run.fSubRunInfo.back();
+    if (!run.fInitialized) {
+        subRun->fStrike.reset(SkRef(fCurrStrike));
+    }
+    run.fInitialized = true;
+    SkASSERT(glyph->fMaskFormat == kA8_GrMaskFormat);
+    subRun->fMaskFormat = kA8_GrMaskFormat;
+
+    size_t vertexStride = GrAtlasTextBatch::GetVertexStrideDf(kA8_GrMaskFormat,
+                                                              subRun->fUseLCDText);
+
+    bool useColorVerts = !subRun->fUseLCDText;
+    this->appendGlyphCommon(blob, &run, subRun, glyphRect, color, vertexStride, useColorVerts,
+                            glyph);
+    return true;
+}
+
+inline void GrAtlasTextContext::appendGlyphPath(GrAtlasTextBlob* blob, GrGlyph* glyph,
+                                                GrFontScaler* scaler, const SkGlyph& skGlyph,
+                                                SkScalar x, SkScalar y, SkScalar scale,
+                                                bool applyVM) {
+    if (nullptr == glyph->fPath) {
+        const SkPath* glyphPath = scaler->getGlyphPath(skGlyph);
+        if (!glyphPath) {
+            return;
+        }
+
+        glyph->fPath = new SkPath(*glyphPath);
+    }
+    blob->fBigGlyphs.push_back(GrAtlasTextBlob::BigGlyph(*glyph->fPath, x, y, scale, applyVM));
+}
+
+inline void GrAtlasTextContext::appendGlyphCommon(GrAtlasTextBlob* blob, Run* run,
+                                                  Run::SubRunInfo* subRun,
+                                                  const SkRect& positions, GrColor color,
+                                                  size_t vertexStride, bool useVertexColor,
+                                                  GrGlyph* glyph) {
+    blob->fGlyphs[subRun->fGlyphEndIndex] = glyph;
+    run->fVertexBounds.joinNonEmptyArg(positions);
+    run->fColor = color;
+
+    intptr_t vertex = reinterpret_cast<intptr_t>(blob->fVertices + subRun->fVertexEndIndex);
+
+    if (useVertexColor) {
+        // V0
+        SkPoint* position = reinterpret_cast<SkPoint*>(vertex);
+        position->set(positions.fLeft, positions.fTop);
+        SkColor* colorPtr = reinterpret_cast<SkColor*>(vertex + sizeof(SkPoint));
+        *colorPtr = color;
+        vertex += vertexStride;
+
+        // V1
+        position = reinterpret_cast<SkPoint*>(vertex);
+        position->set(positions.fLeft, positions.fBottom);
+        colorPtr = reinterpret_cast<SkColor*>(vertex + sizeof(SkPoint));
+        *colorPtr = color;
+        vertex += vertexStride;
+
+        // V2
+        position = reinterpret_cast<SkPoint*>(vertex);
+        position->set(positions.fRight, positions.fBottom);
+        colorPtr = reinterpret_cast<SkColor*>(vertex + sizeof(SkPoint));
+        *colorPtr = color;
+        vertex += vertexStride;
+
+        // V3
+        position = reinterpret_cast<SkPoint*>(vertex);
+        position->set(positions.fRight, positions.fTop);
+        colorPtr = reinterpret_cast<SkColor*>(vertex + sizeof(SkPoint));
+        *colorPtr = color;
+    } else {
+        // V0
+        SkPoint* position = reinterpret_cast<SkPoint*>(vertex);
+        position->set(positions.fLeft, positions.fTop);
+        vertex += vertexStride;
+
+        // V1
+        position = reinterpret_cast<SkPoint*>(vertex);
+        position->set(positions.fLeft, positions.fBottom);
+        vertex += vertexStride;
+
+        // V2
+        position = reinterpret_cast<SkPoint*>(vertex);
+        position->set(positions.fRight, positions.fBottom);
+        vertex += vertexStride;
+
+        // V3
+        position = reinterpret_cast<SkPoint*>(vertex);
+        position->set(positions.fRight, positions.fTop);
+    }
+
+    subRun->fGlyphEndIndex++;
+    subRun->fVertexEndIndex += vertexStride * GrAtlasTextBatch::kVerticesPerGlyph;
+}
+
+void GrAtlasTextContext::flushRunAsPaths(GrDrawContext* dc,
+                                         const SkTextBlobRunIterator& it,
+                                         const GrClip& clip, const SkPaint& skPaint,
+                                         SkDrawFilter* drawFilter, const SkMatrix& viewMatrix,
+                                         const SkIRect& clipBounds, SkScalar x, SkScalar y) {
+    SkPaint runPaint = skPaint;
+
+    size_t textLen = it.glyphCount() * sizeof(uint16_t);
+    const SkPoint& offset = it.offset();
+
+    it.applyFontToPaint(&runPaint);
+
+    if (drawFilter && !drawFilter->filter(&runPaint, SkDrawFilter::kText_Type)) {
+        return;
+    }
+
+    runPaint.setFlags(FilterTextFlags(fSurfaceProps, runPaint));
+
+    switch (it.positioning()) {
+        case SkTextBlob::kDefault_Positioning:
+            this->drawTextAsPath(dc, clip, runPaint, viewMatrix,
+                                 (const char *)it.glyphs(),
+                                 textLen, x + offset.x(), y + offset.y(), clipBounds);
+            break;
+        case SkTextBlob::kHorizontal_Positioning:
+            this->drawPosTextAsPath(dc, clip, runPaint, viewMatrix,
+                                    (const char*)it.glyphs(),
+                                    textLen, it.pos(), 1, SkPoint::Make(x, y + offset.y()),
+                                    clipBounds);
+            break;
+        case SkTextBlob::kFull_Positioning:
+            this->drawPosTextAsPath(dc, clip, runPaint, viewMatrix,
+                                    (const char*)it.glyphs(),
+                                    textLen, it.pos(), 2, SkPoint::Make(x, y), clipBounds);
+            break;
+    }
+}
+
+inline GrDrawBatch*
+GrAtlasTextContext::createBatch(GrAtlasTextBlob* cacheBlob, const PerSubRunInfo& info,
+                                int glyphCount, int run, int subRun,
+                                GrColor color, SkScalar transX, SkScalar transY,
+                                const SkPaint& skPaint) {
+    GrMaskFormat format = info.fMaskFormat;
+    GrColor subRunColor;
+    if (kARGB_GrMaskFormat == format) {
+        uint8_t paintAlpha = skPaint.getAlpha();
+        subRunColor = SkColorSetARGB(paintAlpha, paintAlpha, paintAlpha, paintAlpha);
+    } else {
+        subRunColor = color;
+    }
+
+    GrAtlasTextBatch* batch;
+    if (info.fDrawAsDistanceFields) {
+        SkColor filteredColor;
+        SkColorFilter* colorFilter = skPaint.getColorFilter();
+        if (colorFilter) {
+            filteredColor = colorFilter->filterColor(skPaint.getColor());
+        } else {
+            filteredColor = skPaint.getColor();
+        }
+        bool useBGR = SkPixelGeometryIsBGR(fSurfaceProps.pixelGeometry());
+        batch = GrAtlasTextBatch::CreateDistanceField(glyphCount, fContext->getBatchFontCache(),
+                                                      fDistanceAdjustTable, filteredColor,
+                                                      info.fUseLCDText, useBGR);
+    } else {
+        batch = GrAtlasTextBatch::CreateBitmap(format, glyphCount, fContext->getBatchFontCache());
+    }
+    GrAtlasTextBatch::Geometry& geometry = batch->geometry();
+    geometry.fBlob = SkRef(cacheBlob);
+    geometry.fRun = run;
+    geometry.fSubRun = subRun;
+    geometry.fColor = subRunColor;
+    geometry.fTransX = transX;
+    geometry.fTransY = transY;
+    batch->init();
+
+    return batch;
+}
+
+inline void GrAtlasTextContext::flushRun(GrDrawContext* dc, GrPipelineBuilder* pipelineBuilder,
+                                         GrAtlasTextBlob* cacheBlob, int run, GrColor color,
+                                         SkScalar transX, SkScalar transY,
+                                         const SkPaint& skPaint) {
+    for (int subRun = 0; subRun < cacheBlob->fRuns[run].fSubRunInfo.count(); subRun++) {
+        const PerSubRunInfo& info = cacheBlob->fRuns[run].fSubRunInfo[subRun];
+        int glyphCount = info.fGlyphEndIndex - info.fGlyphStartIndex;
+        if (0 == glyphCount) {
+            continue;
+        }
+
+        SkAutoTUnref<GrDrawBatch> batch(this->createBatch(cacheBlob, info, glyphCount, run,
+                                                          subRun, color, transX, transY,
+                                                          skPaint));
+        dc->drawBatch(pipelineBuilder, batch);
+    }
+}
+
+inline void GrAtlasTextContext::flushBigGlyphs(GrAtlasTextBlob* cacheBlob,
+                                               GrDrawContext* dc,
+                                               const GrClip& clip, const SkPaint& skPaint,
+                                               SkScalar transX, SkScalar transY,
+                                               const SkIRect& clipBounds) {
+    if (!cacheBlob->fBigGlyphs.count()) {
+        return;
+    }
+
+    for (int i = 0; i < cacheBlob->fBigGlyphs.count(); i++) {
+        GrAtlasTextBlob::BigGlyph& bigGlyph = cacheBlob->fBigGlyphs[i];
+        bigGlyph.fVx += transX;
+        bigGlyph.fVy += transY;
+        SkMatrix ctm;
+        ctm.setScale(bigGlyph.fScale, bigGlyph.fScale);
+        ctm.postTranslate(bigGlyph.fVx, bigGlyph.fVy);
+        if (bigGlyph.fApplyVM) {
+            ctm.postConcat(cacheBlob->fViewMatrix);
+        }
+
+        GrBlurUtils::drawPathWithMaskFilter(fContext, dc, clip, bigGlyph.fPath,
+                                            skPaint, ctm, nullptr, clipBounds, false);
+    }
+}
+
+void GrAtlasTextContext::flush(const SkTextBlob* blob,
+                               GrAtlasTextBlob* cacheBlob,
+                               GrDrawContext* dc,
+                               GrRenderTarget* rt,
+                               const SkPaint& skPaint,
+                               const GrPaint& grPaint,
+                               SkDrawFilter* drawFilter,
+                               const GrClip& clip,
+                               const SkMatrix& viewMatrix,
+                               const SkIRect& clipBounds,
+                               SkScalar x, SkScalar y,
+                               SkScalar transX, SkScalar transY) {
+    // We loop through the runs of the blob, flushing each.  If any run is too large, then we flush
+    // it as paths
+    GrPipelineBuilder pipelineBuilder(grPaint, rt, clip);
+
+    GrColor color = grPaint.getColor();
+
+    SkTextBlobRunIterator it(blob);
+    for (int run = 0; !it.done(); it.next(), run++) {
+        if (cacheBlob->fRuns[run].fDrawAsPaths) {
+            this->flushRunAsPaths(dc, it, clip, skPaint,
+                                  drawFilter, viewMatrix, clipBounds, x, y);
+            continue;
+        }
+        cacheBlob->fRuns[run].fVertexBounds.offset(transX, transY);
+        this->flushRun(dc, &pipelineBuilder, cacheBlob, run, color,
+                       transX, transY, skPaint);
+    }
+
+    // Now flush big glyphs
+    this->flushBigGlyphs(cacheBlob, dc, clip, skPaint, transX, transY, clipBounds);
+}
+
+void GrAtlasTextContext::flush(GrAtlasTextBlob* cacheBlob,
+                               GrDrawContext* dc,
+                               GrRenderTarget* rt,
+                               const SkPaint& skPaint,
+                               const GrPaint& grPaint,
+                               const GrClip& clip,
+                               const SkIRect& clipBounds) {
+    GrPipelineBuilder pipelineBuilder(grPaint, rt, clip);
+
+    GrColor color = grPaint.getColor();
+    for (int run = 0; run < cacheBlob->fRunCount; run++) {
+        this->flushRun(dc, &pipelineBuilder, cacheBlob, run, color, 0, 0, skPaint);
+    }
+
+    // Now flush big glyphs
+    this->flushBigGlyphs(cacheBlob, dc, clip, skPaint, 0, 0, clipBounds);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef GR_TEST_UTILS
+
+DRAW_BATCH_TEST_DEFINE(TextBlobBatch) {
+    static uint32_t gContextID = SK_InvalidGenID;
+    static GrAtlasTextContext* gTextContext = nullptr;
+    static SkSurfaceProps gSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType);
+
+    if (context->uniqueID() != gContextID) {
+        gContextID = context->uniqueID();
+        delete gTextContext;
+
+        // We don't yet test the fall back to paths in the GrTextContext base class.  This is mostly
+        // because we don't really want to have a gpu device here.
+        // We enable distance fields by twiddling a knob on the paint
+        gTextContext = GrAtlasTextContext::Create(context, gSurfaceProps);
+    }
+
+    // Setup dummy SkPaint / GrPaint
+    GrColor color = GrRandomColor(random);
+    SkMatrix viewMatrix = GrTest::TestMatrixInvertible(random);
+    SkPaint skPaint;
+    skPaint.setColor(color);
+    skPaint.setLCDRenderText(random->nextBool());
+    skPaint.setAntiAlias(skPaint.isLCDRenderText() ? true : random->nextBool());
+    skPaint.setSubpixelText(random->nextBool());
+
+    GrPaint grPaint;
+    if (!SkPaintToGrPaint(context, skPaint, viewMatrix, &grPaint)) {
+        SkFAIL("couldn't convert paint\n");
+    }
+
+    const char* text = "The quick brown fox jumps over the lazy dog.";
+    int textLen = (int)strlen(text);
+
+    // Setup clip
+    GrClip clip;
+    SkIRect noClip = SkIRect::MakeLargest();
+
+    // right now we don't handle textblobs, nor do we handle drawPosText.  Since we only
+    // intend to test the batch with this unit test, that is okay.
+    SkAutoTUnref<GrAtlasTextBlob> blob(
+            gTextContext->createDrawTextBlob(clip, grPaint, skPaint, viewMatrix, text,
+                                             static_cast<size_t>(textLen), 0, 0, noClip));
+
+    SkScalar transX = static_cast<SkScalar>(random->nextU());
+    SkScalar transY = static_cast<SkScalar>(random->nextU());
+    const GrAtlasTextBlob::Run::SubRunInfo& info = blob->fRuns[0].fSubRunInfo[0];
+    return gTextContext->createBatch(blob, info, textLen, 0, 0, color, transX, transY, skPaint);
+}
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrAtlasTextContext.h b/gfx/skia/skia/src/gpu/GrAtlasTextContext.h
new file mode 100644
index 000000000000..2d445f35d8d4
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrAtlasTextContext.h
@@ -0,0 +1,193 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrAtlasTextContext_DEFINED
+#define GrAtlasTextContext_DEFINED
+
+#include "GrTextContext.h"
+
+#include "GrAtlasTextBlob.h"
+#include "GrGeometryProcessor.h"
+#include "SkTextBlobRunIterator.h"
+
+#ifdef GR_TEST_UTILS
+#include "GrBatchTest.h"
+#endif
+
+class GrDrawBatch;
+class GrDrawContext;
+class GrDrawTarget;
+class GrPipelineBuilder;
+class GrTextBlobCache;
+class SkGlyph;
+
+/*
+ * This class implements GrTextContext using standard bitmap fonts, and can also process textblobs.
+ */
+class GrAtlasTextContext : public GrTextContext {
+public:
+    static GrAtlasTextContext* Create(GrContext*, const SkSurfaceProps&);
+
+private:
+    GrAtlasTextContext(GrContext*, const SkSurfaceProps&);
+    ~GrAtlasTextContext() override {}
+
+    bool canDraw(const SkPaint&, const SkMatrix& viewMatrix) override;
+
+    void onDrawText(GrDrawContext*, GrRenderTarget*, const GrClip&, const GrPaint&, const SkPaint&,
+                    const SkMatrix& viewMatrix, const char text[], size_t byteLength,
+                    SkScalar x, SkScalar y, const SkIRect& regionClipBounds) override;
+    void onDrawPosText(GrDrawContext*, GrRenderTarget*, const GrClip&, const GrPaint&,
+                       const SkPaint&, const SkMatrix& viewMatrix,
+                       const char text[], size_t byteLength,
+                       const SkScalar pos[], int scalarsPerPosition,
+                       const SkPoint& offset, const SkIRect& regionClipBounds) override;
+    void drawTextBlob(GrDrawContext*, GrRenderTarget*, const GrClip&, const SkPaint&,
+                      const SkMatrix& viewMatrix, const SkTextBlob*, SkScalar x, SkScalar y,
+                      SkDrawFilter*, const SkIRect& clipBounds) override;
+
+    typedef GrAtlasTextBlob::Run Run;
+    typedef Run::SubRunInfo PerSubRunInfo;
+
+    inline bool canDrawAsDistanceFields(const SkPaint&, const SkMatrix& viewMatrix);
+    GrAtlasTextBlob* setupDFBlob(int glyphCount, const SkPaint& origPaint,
+                                 const SkMatrix& viewMatrix, SkPaint* dfPaint, 
+                                 SkScalar* textRatio);
+    void bmpAppendGlyph(GrAtlasTextBlob*, int runIndex, const SkGlyph&, int left, int top,
+                        GrColor color, GrFontScaler*);
+    bool dfAppendGlyph(GrAtlasTextBlob*, int runIndex, const SkGlyph&, SkScalar sx, SkScalar sy,
+                       GrColor color, GrFontScaler*, SkScalar textRatio,
+                       const SkMatrix& viewMatrix);
+    inline void appendGlyphPath(GrAtlasTextBlob*, GrGlyph*, GrFontScaler*, const SkGlyph&,
+                                SkScalar x, SkScalar y, SkScalar scale = 1.0f,
+                                bool applyVM = false);
+    inline void appendGlyphCommon(GrAtlasTextBlob*, Run*, Run::SubRunInfo*,
+                                  const SkRect& positions, GrColor color,
+                                  size_t vertexStride, bool useVertexColor,
+                                  GrGlyph*);
+
+    inline void flushRunAsPaths(GrDrawContext*,
+                                const SkTextBlobRunIterator&, const GrClip& clip,
+                                const SkPaint&, SkDrawFilter*,
+                                const SkMatrix& viewMatrix, const SkIRect& clipBounds, SkScalar x,
+                                SkScalar y);
+    inline GrDrawBatch* createBatch(GrAtlasTextBlob*, const PerSubRunInfo&,
+                                    int glyphCount, int run, int subRun,
+                                    GrColor, SkScalar transX, SkScalar transY,
+                                    const SkPaint&);
+    inline void flushRun(GrDrawContext*, GrPipelineBuilder*, GrAtlasTextBlob*, int run, GrColor,
+                         SkScalar transX, SkScalar transY, const SkPaint&);
+    inline void flushBigGlyphs(GrAtlasTextBlob* cacheBlob, GrDrawContext*,
+                               const GrClip& clip, const SkPaint& skPaint,
+                               SkScalar transX, SkScalar transY, const SkIRect& clipBounds);
+
+    // We have to flush SkTextBlobs differently from drawText / drawPosText
+    void flush(const SkTextBlob*, GrAtlasTextBlob*, GrDrawContext*, GrRenderTarget*,
+               const SkPaint&, const GrPaint&, SkDrawFilter*, const GrClip&,
+               const SkMatrix& viewMatrix, const SkIRect& clipBounds, SkScalar x, SkScalar y,
+               SkScalar transX, SkScalar transY);
+    void flush(GrAtlasTextBlob*, GrDrawContext*, GrRenderTarget*, const SkPaint&,
+               const GrPaint&, const GrClip&, const SkIRect& clipBounds);
+
+    // A helper for drawing BitmapText in a run of distance fields
+    inline void fallbackDrawPosText(GrAtlasTextBlob*, int runIndex,
+                                    const GrClip&, GrColor color,
+                                    const SkPaint&, const SkMatrix& viewMatrix,
+                                    const SkTDArray<char>& fallbackTxt,
+                                    const SkTDArray<SkScalar>& fallbackPos,
+                                    int scalarsPerPosition,
+                                    const SkPoint& offset);
+
+    void internalDrawBMPText(GrAtlasTextBlob*, int runIndex, SkGlyphCache*, const SkPaint&,
+                             GrColor color, const SkMatrix& viewMatrix,
+                             const char text[], size_t byteLength,
+                             SkScalar x, SkScalar y);
+    void internalDrawBMPPosText(GrAtlasTextBlob*, int runIndex, SkGlyphCache*, const SkPaint&,
+                                GrColor color, const SkMatrix& viewMatrix,
+                                const char text[], size_t byteLength,
+                                const SkScalar pos[], int scalarsPerPosition,
+                                const SkPoint& offset);
+
+    void internalDrawDFText(GrAtlasTextBlob*, int runIndex, const SkPaint&,
+                            GrColor color, const SkMatrix& viewMatrix,
+                            const char text[], size_t byteLength,
+                            SkScalar x, SkScalar y,
+                            SkScalar textRatio,
+                            SkTDArray<char>* fallbackTxt,
+                            SkTDArray<SkScalar>* fallbackPos,
+                            SkPoint* offset, const SkPaint& origPaint);
+    void internalDrawDFPosText(GrAtlasTextBlob*, int runIndex, const SkPaint&,
+                               GrColor color, const SkMatrix& viewMatrix,
+                               const char text[], size_t byteLength,
+                               const SkScalar pos[], int scalarsPerPosition,
+                               const SkPoint& offset,
+                               SkScalar textRatio,
+                               SkTDArray<char>* fallbackTxt,
+                               SkTDArray<SkScalar>* fallbackPos);
+
+    // sets up the descriptor on the blob and returns a detached cache.  Client must attach
+    inline static GrColor ComputeCanonicalColor(const SkPaint&, bool lcd);
+    inline SkGlyphCache* setupCache(Run*, const SkPaint&, const SkMatrix* viewMatrix, bool noGamma);
+    static inline bool MustRegenerateBlob(SkScalar* outTransX, SkScalar* outTransY,
+                                          const GrAtlasTextBlob&, const SkPaint&, GrColor,
+                                          const SkMaskFilter::BlurRec&,
+                                          const SkMatrix& viewMatrix, SkScalar x, SkScalar y);
+    void regenerateTextBlob(GrAtlasTextBlob* bmp, const SkPaint& skPaint, GrColor,
+                            const SkMatrix& viewMatrix,
+                            const SkTextBlob* blob, SkScalar x, SkScalar y,
+                            SkDrawFilter* drawFilter,
+                            const GrClip&);
+    inline static bool HasLCD(const SkTextBlob*);
+    inline void initDistanceFieldPaint(GrAtlasTextBlob*, SkPaint*, SkScalar* textRatio,
+                                       const SkMatrix&);
+
+    // Test methods
+    // TODO this is really ugly.  It'd be much nicer if positioning could be moved to batch
+    inline GrAtlasTextBlob* createDrawTextBlob(const GrClip&, const GrPaint&,
+                                               const SkPaint&, const SkMatrix& viewMatrix,
+                                               const char text[], size_t byteLength,
+                                               SkScalar x, SkScalar y,
+                                               const SkIRect& regionClipBounds);
+    inline GrAtlasTextBlob* createDrawPosTextBlob(const GrClip&, const GrPaint&,
+                                                  const SkPaint&, const SkMatrix& viewMatrix,
+                                                  const char text[], size_t byteLength,
+                                                  const SkScalar pos[], int scalarsPerPosition,
+                                                  const SkPoint& offset,
+                                                  const SkIRect& regionClipBounds);
+
+    // Distance field text needs this table to compute a value for use in the fragment shader.
+    // Because the GrAtlasTextContext can go out of scope before the final flush, this needs to be
+    // refcnted and malloced
+    struct DistanceAdjustTable : public SkNVRefCnt<DistanceAdjustTable> {
+        DistanceAdjustTable() { this->buildDistanceAdjustTable(); }
+        ~DistanceAdjustTable() { delete[] fTable; }
+
+        const SkScalar& operator[] (int i) const {
+            return fTable[i];
+        }
+
+    private:
+        void buildDistanceAdjustTable();
+
+        SkScalar* fTable;
+    };
+
+    GrBatchTextStrike* fCurrStrike;
+    GrTextBlobCache* fCache;
+    SkAutoTUnref<const DistanceAdjustTable> fDistanceAdjustTable;
+
+    friend class GrTextBlobCache;
+    friend class GrAtlasTextBatch;
+
+#ifdef GR_TEST_UTILS
+    DRAW_BATCH_TEST_FRIEND(TextBlobBatch);
+#endif
+
+    typedef GrTextContext INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrAutoLocaleSetter.h b/gfx/skia/skia/src/gpu/GrAutoLocaleSetter.h
new file mode 100644
index 000000000000..bcb23cfb29fd
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrAutoLocaleSetter.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrAutoLocaleSetter_DEFINED
+#define GrAutoLocaleSetter_DEFINED
+
+#include "GrTypes.h"
+
+#if !defined(SK_BUILD_FOR_ANDROID)
+#include <locale.h>
+#endif
+
+#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
+#include <xlocale.h>
+#endif
+
+/**
+ * Helper class for ensuring that we don't use the wrong locale when building shaders. Android
+ * doesn't support locale in the NDK, so this is a no-op there.
+ */
+class GrAutoLocaleSetter : public SkNoncopyable {
+public:
+    GrAutoLocaleSetter (const char* name) {
+#if defined(SK_BUILD_FOR_WIN)
+        fOldPerThreadLocale = _configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
+        fOldLocale = setlocale(LC_ALL, name);
+#elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__)
+        fLocale = newlocale(LC_ALL, name, 0);
+        if (fLocale) {
+            fOldLocale = uselocale(fLocale);
+        } else {
+            fOldLocale = static_cast<locale_t>(0);
+        }
+#else
+        (void) name; // suppress unused param warning.
+#endif
+    }
+
+    ~GrAutoLocaleSetter () {
+#if defined(SK_BUILD_FOR_WIN)
+        setlocale(LC_ALL, fOldLocale);
+        _configthreadlocale(fOldPerThreadLocale);
+#elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__)
+        if (fLocale) {
+             uselocale(fOldLocale);
+             freelocale(fLocale);
+        }
+#endif
+    }
+
+private:
+#if defined(SK_BUILD_FOR_WIN)
+    int fOldPerThreadLocale;
+    const char* fOldLocale;
+#elif !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__)
+    locale_t fOldLocale;
+    locale_t fLocale;
+#endif
+};
+
+#endif
+
diff --git a/gfx/skia/skia/src/gpu/GrBatchAtlas.cpp b/gfx/skia/skia/src/gpu/GrBatchAtlas.cpp
new file mode 100644
index 000000000000..db1b13471f4c
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrBatchAtlas.cpp
@@ -0,0 +1,264 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrBatchAtlas.h"
+#include "GrBatchFlushState.h"
+#include "GrRectanizer.h"
+#include "GrTracing.h"
+#include "GrVertexBuffer.h"
+
+////////////////////////////////////////////////////////////////////////////////
+
+GrBatchAtlas::BatchPlot::BatchPlot(int index, uint64_t genID, int offX, int offY, int width,
+                                   int height, GrPixelConfig config)
+    : fLastUpload(0)
+    , fLastUse(0)
+    , fIndex(index)
+    , fGenID(genID)
+    , fID(CreateId(fIndex, fGenID))
+    , fData(nullptr)
+    , fWidth(width)
+    , fHeight(height)
+    , fX(offX)
+    , fY(offY)
+    , fRects(nullptr)
+    , fOffset(SkIPoint16::Make(fX * fWidth, fY * fHeight))
+    , fConfig(config)
+    , fBytesPerPixel(GrBytesPerPixel(config))
+#ifdef SK_DEBUG
+    , fDirty(false)
+#endif
+{
+    fDirtyRect.setEmpty();
+}
+
+GrBatchAtlas::BatchPlot::~BatchPlot() {
+    sk_free(fData);
+    delete fRects;
+}
+
+bool GrBatchAtlas::BatchPlot::addSubImage(int width, int height, const void* image,
+                                          SkIPoint16* loc) {
+    SkASSERT(width <= fWidth && height <= fHeight);
+
+    if (!fRects) {
+        fRects = GrRectanizer::Factory(fWidth, fHeight);
+    }
+
+    if (!fRects->addRect(width, height, loc)) {
+        return false;
+    }
+
+    if (!fData) {
+        fData = reinterpret_cast<unsigned char*>(sk_calloc_throw(fBytesPerPixel * fWidth *
+                                                                 fHeight));
+    }
+    size_t rowBytes = width * fBytesPerPixel;
+    const unsigned char* imagePtr = (const unsigned char*)image;
+    // point ourselves at the right starting spot
+    unsigned char* dataPtr = fData;
+    dataPtr += fBytesPerPixel * fWidth * loc->fY;
+    dataPtr += fBytesPerPixel * loc->fX;
+    // copy into the data buffer
+    for (int i = 0; i < height; ++i) {
+        memcpy(dataPtr, imagePtr, rowBytes);
+        dataPtr += fBytesPerPixel * fWidth;
+        imagePtr += rowBytes;
+    }
+
+    fDirtyRect.join(loc->fX, loc->fY, loc->fX + width, loc->fY + height);
+
+    loc->fX += fOffset.fX;
+    loc->fY += fOffset.fY;
+    SkDEBUGCODE(fDirty = true;)
+
+    return true;
+}
+
+void GrBatchAtlas::BatchPlot::uploadToTexture(GrBatchUploader::TextureUploader* uploader,
+                                              GrTexture* texture) {
+    // We should only be issuing uploads if we are in fact dirty
+    SkASSERT(fDirty && fData && texture);
+    TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), "GrBatchPlot::uploadToTexture");
+    size_t rowBytes = fBytesPerPixel * fWidth;
+    const unsigned char* dataPtr = fData;
+    dataPtr += rowBytes * fDirtyRect.fTop;
+    dataPtr += fBytesPerPixel * fDirtyRect.fLeft;
+    uploader->writeTexturePixels(texture,
+                                 fOffset.fX + fDirtyRect.fLeft, fOffset.fY + fDirtyRect.fTop,
+                                 fDirtyRect.width(), fDirtyRect.height(),
+                                 fConfig, dataPtr, rowBytes);
+    fDirtyRect.setEmpty();
+    SkDEBUGCODE(fDirty = false;)
+}
+
+void GrBatchAtlas::BatchPlot::resetRects() {
+    if (fRects) {
+        fRects->reset();
+    }
+
+    fGenID++;
+    fID = CreateId(fIndex, fGenID);
+
+    // zero out the plot
+    if (fData) {
+        sk_bzero(fData, fBytesPerPixel * fWidth * fHeight);
+    }
+
+    fDirtyRect.setEmpty();
+    SkDEBUGCODE(fDirty = false;)
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+class GrPlotUploader : public GrBatchUploader {
+public:
+    GrPlotUploader(GrBatchAtlas::BatchPlot* plot, GrTexture* texture)
+        : INHERITED(plot->lastUploadToken())
+        , fPlot(SkRef(plot))
+        , fTexture(texture) {
+        SkASSERT(plot);
+    }
+
+    void upload(TextureUploader* uploader) override {
+        fPlot->uploadToTexture(uploader, fTexture);
+    }
+
+private:
+    SkAutoTUnref<GrBatchAtlas::BatchPlot> fPlot;
+    GrTexture* fTexture;
+
+    typedef GrBatchUploader INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+GrBatchAtlas::GrBatchAtlas(GrTexture* texture, int numPlotsX, int numPlotsY)
+    : fTexture(texture)
+    , fAtlasGeneration(kInvalidAtlasGeneration + 1) {
+
+    int plotWidth = texture->width() / numPlotsX;
+    int plotHeight = texture->height() / numPlotsY;
+    SkASSERT(numPlotsX * numPlotsY <= BulkUseTokenUpdater::kMaxPlots);
+    SkASSERT(plotWidth * numPlotsX == texture->width());
+    SkASSERT(plotHeight * numPlotsY == texture->height());
+
+    SkDEBUGCODE(fNumPlots = numPlotsX * numPlotsY;)
+
+    // We currently do not support compressed atlases...
+    SkASSERT(!GrPixelConfigIsCompressed(texture->desc().fConfig));
+
+    // set up allocated plots
+    fPlotArray = new SkAutoTUnref<BatchPlot>[numPlotsX * numPlotsY];
+
+    SkAutoTUnref<BatchPlot>* currPlot = fPlotArray;
+    for (int y = numPlotsY - 1, r = 0; y >= 0; --y, ++r) {
+        for (int x = numPlotsX - 1, c = 0; x >= 0; --x, ++c) {
+            uint32_t index = r * numPlotsX + c;
+            currPlot->reset(new BatchPlot(index, 1, x, y, plotWidth, plotHeight,
+                                          texture->desc().fConfig));
+
+            // build LRU list
+            fPlotList.addToHead(currPlot->get());
+            ++currPlot;
+        }
+    }
+}
+
+GrBatchAtlas::~GrBatchAtlas() {
+    SkSafeUnref(fTexture);
+    delete[] fPlotArray;
+}
+
+void GrBatchAtlas::processEviction(AtlasID id) {
+    for (int i = 0; i < fEvictionCallbacks.count(); i++) {
+        (*fEvictionCallbacks[i].fFunc)(id, fEvictionCallbacks[i].fData);
+    }
+}
+
+inline void GrBatchAtlas::updatePlot(GrDrawBatch::Target* target, AtlasID* id, BatchPlot* plot) {
+    this->makeMRU(plot);
+
+    // If our most recent upload has already occurred then we have to insert a new
+    // upload. Otherwise, we already have a scheduled upload that hasn't yet ocurred.
+    // This new update will piggy back on that previously scheduled update.
+    if (target->hasTokenBeenFlushed(plot->lastUploadToken())) {
+        plot->setLastUploadToken(target->asapToken());
+        SkAutoTUnref<GrPlotUploader> uploader(new GrPlotUploader(plot, fTexture));
+        target->upload(uploader);
+    }
+    *id = plot->id();
+}
+
+bool GrBatchAtlas::addToAtlas(AtlasID* id, GrDrawBatch::Target* batchTarget,
+                              int width, int height, const void* image, SkIPoint16* loc) {
+    // We should already have a texture, TODO clean this up
+    SkASSERT(fTexture);
+
+    // now look through all allocated plots for one we can share, in Most Recently Refed order
+    GrBatchPlotList::Iter plotIter;
+    plotIter.init(fPlotList, GrBatchPlotList::Iter::kHead_IterStart);
+    BatchPlot* plot;
+    while ((plot = plotIter.get())) {
+        SkASSERT(GrBytesPerPixel(fTexture->desc().fConfig) == plot->bpp());
+        if (plot->addSubImage(width, height, image, loc)) {
+            this->updatePlot(batchTarget, id, plot);
+            return true;
+        }
+        plotIter.next();
+    }
+
+    // If the above fails, then see if the least recently refed plot has already been flushed to the
+    // gpu
+    plot = fPlotList.tail();
+    SkASSERT(plot);
+    if (batchTarget->hasTokenBeenFlushed(plot->lastUseToken())) {
+        this->processEviction(plot->id());
+        plot->resetRects();
+        SkASSERT(GrBytesPerPixel(fTexture->desc().fConfig) == plot->bpp());
+        SkDEBUGCODE(bool verify = )plot->addSubImage(width, height, image, loc);
+        SkASSERT(verify);
+        this->updatePlot(batchTarget, id, plot);
+        fAtlasGeneration++;
+        return true;
+    }
+
+    // The least recently used plot hasn't been flushed to the gpu yet, however, if we have flushed
+    // it to the batch target than we can reuse it.  Our last use token is guaranteed to be less
+    // than or equal to the current token.  If its 'less than' the current token, than we can spin
+    // off the plot (ie let the batch target manage it) and create a new plot in its place in our
+    // array.  If it is equal to the currentToken, then the caller has to flush draws to the batch
+    // target so we can spin off the plot
+    if (plot->lastUseToken() == batchTarget->currentToken()) {
+        return false;
+    }
+
+    SkASSERT(plot->lastUseToken() < batchTarget->currentToken());
+    SkASSERT(!batchTarget->hasTokenBeenFlushed(batchTarget->currentToken()));
+
+    SkASSERT(!plot->unique());  // The GrPlotUpdater should have a ref too
+
+    this->processEviction(plot->id());
+    fPlotList.remove(plot);
+    SkAutoTUnref<BatchPlot>& newPlot = fPlotArray[plot->index()];
+    newPlot.reset(plot->clone());
+
+    fPlotList.addToHead(newPlot.get());
+    SkASSERT(GrBytesPerPixel(fTexture->desc().fConfig) == newPlot->bpp());
+    SkDEBUGCODE(bool verify = )newPlot->addSubImage(width, height, image, loc);
+    SkASSERT(verify);
+
+    // Note that this plot will be uploaded inline with the draws whereas the
+    // one it displaced most likely was uploaded asap.
+    newPlot->setLastUploadToken(batchTarget->currentToken());
+    SkAutoTUnref<GrPlotUploader> uploader(new GrPlotUploader(newPlot, fTexture));
+    batchTarget->upload(uploader);
+    *id = newPlot->id();
+
+    fAtlasGeneration++;
+    return true;
+}
diff --git a/gfx/skia/skia/src/gpu/GrBatchAtlas.h b/gfx/skia/skia/src/gpu/GrBatchAtlas.h
new file mode 100644
index 000000000000..bd6504030bb8
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrBatchAtlas.h
@@ -0,0 +1,265 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrBatchAtlas_DEFINED
+#define GrBatchAtlas_DEFINED
+
+#include "GrTexture.h"
+#include "batches/GrDrawBatch.h"
+#include "SkPoint.h"
+#include "SkTDArray.h"
+#include "SkTInternalLList.h"
+
+class GrRectanizer;
+
+struct GrBatchAtlasConfig {
+    int numPlotsX() const { return fWidth / fPlotWidth; }
+    int numPlotsY() const { return fHeight / fPlotWidth; }
+    int fWidth;
+    int fHeight;
+    int fPlotWidth;
+    int fPlotHeight;
+};
+
+class GrBatchAtlas {
+public:
+    // An AtlasID is an opaque handle which callers can use to determine if the atlas contains
+    // a specific piece of data
+    typedef uint64_t AtlasID;
+    static const uint32_t kInvalidAtlasID = 0;
+    static const uint64_t kInvalidAtlasGeneration = 0;
+
+    // A function pointer for use as a callback during eviction.  Whenever GrBatchAtlas evicts a
+    // specific AtlasID, it will call all of the registered listeners so they can optionally process
+    // the eviction
+    typedef void (*EvictionFunc)(GrBatchAtlas::AtlasID, void*);
+
+    GrBatchAtlas(GrTexture*, int numPlotsX, int numPlotsY);
+    ~GrBatchAtlas();
+
+    // Adds a width x height subimage to the atlas. Upon success it returns
+    // the containing GrPlot and absolute location in the backing texture.
+    // nullptr is returned if the subimage cannot fit in the atlas.
+    // If provided, the image data will be written to the CPU-side backing bitmap.
+    // NOTE: If the client intends to refer to the atlas, they should immediately call 'setUseToken'
+    // with the currentToken from the batch target, otherwise the next call to addToAtlas might
+    // cause an eviction
+    bool addToAtlas(AtlasID*, GrDrawBatch::Target*, int width, int height, const void* image,
+                    SkIPoint16* loc);
+
+    GrTexture* getTexture() const { return fTexture; }
+
+    uint64_t atlasGeneration() const { return fAtlasGeneration; }
+
+    inline bool hasID(AtlasID id) {
+        uint32_t index = GetIndexFromID(id);
+        SkASSERT(index < fNumPlots);
+        return fPlotArray[index]->genID() == GetGenerationFromID(id);
+    }
+
+    // To ensure the atlas does not evict a given entry, the client must set the last use token
+    inline void setLastUseToken(AtlasID id, GrBatchToken batchToken) {
+        SkASSERT(this->hasID(id));
+        uint32_t index = GetIndexFromID(id);
+        SkASSERT(index < fNumPlots);
+        this->makeMRU(fPlotArray[index]);
+        fPlotArray[index]->setLastUseToken(batchToken);
+    }
+
+    inline void registerEvictionCallback(EvictionFunc func, void* userData) {
+        EvictionData* data = fEvictionCallbacks.append();
+        data->fFunc = func;
+        data->fData = userData;
+    }
+
+    /*
+     * A class which can be handed back to GrBatchAtlas for updating in bulk last use tokens.  The
+     * current max number of plots the GrBatchAtlas can handle is 32, if in the future this is
+     * insufficient then we can move to a 64 bit int
+     */
+    class BulkUseTokenUpdater {
+    public:
+        BulkUseTokenUpdater() : fPlotAlreadyUpdated(0) {}
+        BulkUseTokenUpdater(const BulkUseTokenUpdater& that)
+            : fPlotsToUpdate(that.fPlotsToUpdate)
+            , fPlotAlreadyUpdated(that.fPlotAlreadyUpdated) {
+        }
+
+        void add(AtlasID id) {
+            int index = GrBatchAtlas::GetIndexFromID(id);
+            if (!this->find(index)) {
+                this->set(index);
+            }
+        }
+
+        void reset() {
+            fPlotsToUpdate.reset();
+            fPlotAlreadyUpdated = 0;
+        }
+
+    private:
+        bool find(int index) const {
+            SkASSERT(index < kMaxPlots);
+            return (fPlotAlreadyUpdated >> index) & 1;
+        }
+
+        void set(int index) {
+            SkASSERT(!this->find(index));
+            fPlotAlreadyUpdated = fPlotAlreadyUpdated | (1 << index);
+            fPlotsToUpdate.push_back(index);
+        }
+
+        static const int kMinItems = 4;
+        static const int kMaxPlots = 32;
+        SkSTArray<kMinItems, int, true> fPlotsToUpdate;
+        uint32_t fPlotAlreadyUpdated;
+
+        friend class GrBatchAtlas;
+    };
+
+    void setLastUseTokenBulk(const BulkUseTokenUpdater& updater, GrBatchToken batchToken) {
+        int count = updater.fPlotsToUpdate.count();
+        for (int i = 0; i < count; i++) {
+            BatchPlot* plot = fPlotArray[updater.fPlotsToUpdate[i]];
+            this->makeMRU(plot);
+            plot->setLastUseToken(batchToken);
+        }
+    }
+
+    static const int kGlyphMaxDim = 256;
+    static bool GlyphTooLargeForAtlas(int width, int height) {
+        return width > kGlyphMaxDim || height > kGlyphMaxDim;
+    }
+
+private:
+    // The backing GrTexture for a GrBatchAtlas is broken into a spatial grid of BatchPlots.
+    // The BatchPlots keep track of subimage placement via their GrRectanizer. A BatchPlot
+    // manages the lifetime of its data using two tokens, a last use token and a last upload token.
+    // Once a BatchPlot is "full" (i.e. there is no room for the new subimage according to the
+    // GrRectanizer), it can no longer be used unless the last use of the GrPlot has already been
+    // flushed through to the gpu.
+    class BatchPlot : public SkRefCnt {
+        SK_DECLARE_INTERNAL_LLIST_INTERFACE(BatchPlot);
+
+    public:
+        // index() is a unique id for the plot relative to the owning GrAtlas.  genID() is a
+        // monotonically incremented number which is bumped every time this plot is
+        // evicted from the cache (i.e., there is continuity in genID() across atlas spills).
+        uint32_t index() const { return fIndex; }
+        uint64_t genID() const { return fGenID; }
+        GrBatchAtlas::AtlasID id() const {
+            SkASSERT(GrBatchAtlas::kInvalidAtlasID != fID);
+            return fID;
+        }
+        SkDEBUGCODE(size_t bpp() const { return fBytesPerPixel; })
+
+        bool addSubImage(int width, int height, const void* image, SkIPoint16* loc);
+
+        // To manage the lifetime of a plot, we use two tokens.  We use the last upload token to
+        // know when we can 'piggy back' uploads, ie if the last upload hasn't been flushed to gpu,
+        // we don't need to issue a new upload even if we update the cpu backing store.  We use
+        // lastUse to determine when we can evict a plot from the cache, ie if the last use has
+        // already flushed through the gpu then we can reuse the plot.
+        GrBatchToken lastUploadToken() const { return fLastUpload; }
+        GrBatchToken lastUseToken() const { return fLastUse; }
+        void setLastUploadToken(GrBatchToken batchToken) {
+            SkASSERT(batchToken >= fLastUpload);
+            fLastUpload = batchToken;
+        }
+        void setLastUseToken(GrBatchToken batchToken) {
+            SkASSERT(batchToken >= fLastUse);
+            fLastUse = batchToken;
+        }
+
+        void uploadToTexture(GrBatchUploader::TextureUploader* uploader, GrTexture* texture);
+        void resetRects();
+
+    private:
+        BatchPlot(int index, uint64_t genID, int offX, int offY, int width, int height,
+                  GrPixelConfig config);
+
+        ~BatchPlot() override;
+
+        // Create a clone of this plot. The cloned plot will take the place of the
+        // current plot in the atlas.
+        BatchPlot* clone() const {
+            return new BatchPlot(fIndex, fGenID+1, fX, fY, fWidth, fHeight, fConfig);
+        }
+
+        static GrBatchAtlas::AtlasID CreateId(uint32_t index, uint64_t generation) {
+            SkASSERT(index < (1 << 16));
+            SkASSERT(generation < ((uint64_t)1 << 48));
+            return generation << 16 | index;
+        }
+
+        GrBatchToken          fLastUpload;
+        GrBatchToken          fLastUse;
+
+        const uint32_t        fIndex;
+        uint64_t              fGenID;
+        GrBatchAtlas::AtlasID fID;
+        unsigned char*        fData;
+        const int             fWidth;
+        const int             fHeight;
+        const int             fX;
+        const int             fY;
+        GrRectanizer*         fRects;
+        const SkIPoint16      fOffset;        // the offset of the plot in the backing texture
+        const GrPixelConfig   fConfig;
+        const size_t          fBytesPerPixel;
+        SkIRect               fDirtyRect;
+        SkDEBUGCODE(bool      fDirty;)
+
+        friend class GrBatchAtlas;
+
+        typedef SkRefCnt INHERITED;
+    };
+
+    typedef SkTInternalLList<BatchPlot> GrBatchPlotList;
+
+    static uint32_t GetIndexFromID(AtlasID id) {
+        return id & 0xffff;
+    }
+
+    // top 48 bits are reserved for the generation ID
+    static uint64_t GetGenerationFromID(AtlasID id) {
+        return (id >> 16) & 0xffffffffffff;
+    }
+
+    inline void updatePlot(GrDrawBatch::Target*, AtlasID*, BatchPlot*);
+
+    inline void makeMRU(BatchPlot* plot) {
+        if (fPlotList.head() == plot) {
+            return;
+        }
+
+        fPlotList.remove(plot);
+        fPlotList.addToHead(plot);
+    }
+
+    inline void processEviction(AtlasID);
+
+    friend class GrPlotUploader; // to access GrBatchPlot
+
+    GrTexture* fTexture;
+    SkDEBUGCODE(uint32_t fNumPlots;)
+
+    uint64_t fAtlasGeneration;
+
+    struct EvictionData {
+        EvictionFunc fFunc;
+        void* fData;
+    };
+
+    SkTDArray<EvictionData> fEvictionCallbacks;
+    // allocated array of GrBatchPlots
+    SkAutoTUnref<BatchPlot>* fPlotArray;
+    // LRU list of GrPlots (MRU at head - LRU at tail)
+    GrBatchPlotList fPlotList;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrBatchFlushState.cpp b/gfx/skia/skia/src/gpu/GrBatchFlushState.cpp
new file mode 100644
index 000000000000..52261a18397a
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrBatchFlushState.cpp
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrBatchFlushState.h"
+
+#include "GrBatchAtlas.h"
+#include "GrPipeline.h"
+
+GrBatchFlushState::GrBatchFlushState(GrGpu* gpu, GrResourceProvider* resourceProvider)
+    : fGpu(gpu)
+    , fUploader(gpu)
+    , fResourceProvider(resourceProvider)
+    , fVertexPool(gpu)
+    , fIndexPool(gpu)
+    , fCurrentToken(0)
+    , fLastFlushedToken(0) {}
+
+void* GrBatchFlushState::makeVertexSpace(size_t vertexSize, int vertexCount,
+                                         const GrVertexBuffer** buffer, int* startVertex) {
+    return fVertexPool.makeSpace(vertexSize, vertexCount, buffer, startVertex);
+}
+
+uint16_t* GrBatchFlushState::makeIndexSpace(int indexCount,
+                                            const GrIndexBuffer** buffer, int* startIndex) {
+    return reinterpret_cast<uint16_t*>(fIndexPool.makeSpace(indexCount, buffer, startIndex));
+}
diff --git a/gfx/skia/skia/src/gpu/GrBatchFlushState.h b/gfx/skia/skia/src/gpu/GrBatchFlushState.h
new file mode 100644
index 000000000000..2008fa69ebfc
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrBatchFlushState.h
@@ -0,0 +1,194 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrBatchBuffer_DEFINED
+#define GrBatchBuffer_DEFINED
+
+#include "GrBufferAllocPool.h"
+#include "batches/GrVertexBatch.h"
+
+class GrResourceProvider;
+
+/** Simple class that performs the upload on behalf of a GrBatchUploader. */
+class GrBatchUploader::TextureUploader {
+public:
+    TextureUploader(GrGpu* gpu) : fGpu(gpu) { SkASSERT(gpu); }
+
+    /**
+        * Updates the pixels in a rectangle of a texture.
+        *
+        * @param left          left edge of the rectangle to write (inclusive)
+        * @param top           top edge of the rectangle to write (inclusive)
+        * @param width         width of rectangle to write in pixels.
+        * @param height        height of rectangle to write in pixels.
+        * @param config        the pixel config of the source buffer
+        * @param buffer        memory to read pixels from
+        * @param rowBytes      number of bytes between consecutive rows. Zero
+        *                      means rows are tightly packed.
+        */
+    bool writeTexturePixels(GrTexture* texture,
+                            int left, int top, int width, int height,
+                            GrPixelConfig config, const void* buffer,
+                            size_t rowBytes) {
+        return fGpu->writePixels(texture, left, top, width, height, config, buffer, rowBytes);
+    }
+
+private:
+    GrGpu* fGpu;
+};
+
+/** Tracks the state across all the GrBatches in a GrDrawTarget flush. */
+class GrBatchFlushState {
+public:
+    GrBatchFlushState(GrGpu*, GrResourceProvider*);
+
+    ~GrBatchFlushState() { this->reset(); }
+
+    void advanceToken() { ++fCurrentToken; }
+
+    void advanceLastFlushedToken() { ++fLastFlushedToken; }
+
+    /** Inserts an upload to be executred after all batches in the flush prepared their draws
+        but before the draws are executed to the backend 3D API. */
+    void addASAPUpload(GrBatchUploader* upload) {
+        fAsapUploads.push_back().reset(SkRef(upload));
+    }
+
+    const GrCaps& caps() const { return *fGpu->caps(); }
+    GrResourceProvider* resourceProvider() const { return fResourceProvider; }
+
+    /** Has the token been flushed to the backend 3D API. */
+    bool hasTokenBeenFlushed(GrBatchToken token) const { return fLastFlushedToken >= token; }
+
+    /** The current token advances once for every contiguous set of uninterrupted draws prepared
+        by a batch. */
+    GrBatchToken currentToken() const { return fCurrentToken; }
+
+    /** The last token flushed to all the way to the backend API. */
+    GrBatchToken lastFlushedToken() const { return fLastFlushedToken; }
+
+    /** This is a magic token that can be used to indicate that an upload should occur before
+        any draws for any batch in the current flush execute. */
+    GrBatchToken asapToken() const { return fLastFlushedToken + 1; }
+
+    void* makeVertexSpace(size_t vertexSize, int vertexCount,
+                          const GrVertexBuffer** buffer, int* startVertex);
+    uint16_t* makeIndexSpace(int indexCount, const GrIndexBuffer** buffer, int* startIndex);
+
+    /** This is called after each batch has a chance to prepare its draws and before the draws
+        are issued. */
+    void preIssueDraws() {
+        fVertexPool.unmap();
+        fIndexPool.unmap();
+        int uploadCount = fAsapUploads.count();
+        for (int i = 0; i < uploadCount; i++) {
+            fAsapUploads[i]->upload(&fUploader);
+        }
+        fAsapUploads.reset();
+    }
+
+    void putBackIndices(size_t indices) { fIndexPool.putBack(indices * sizeof(uint16_t)); }
+
+    void putBackVertexSpace(size_t sizeInBytes) { fVertexPool.putBack(sizeInBytes); }
+
+    GrBatchUploader::TextureUploader* uploader() { return &fUploader; }
+
+    GrGpu* gpu() { return fGpu; }
+
+    void reset() {
+        fVertexPool.reset();
+        fIndexPool.reset();
+    }
+
+private:
+    GrGpu*                                          fGpu;
+    GrBatchUploader::TextureUploader                fUploader;
+
+    GrResourceProvider*                             fResourceProvider;
+
+    GrVertexBufferAllocPool                         fVertexPool;
+    GrIndexBufferAllocPool                          fIndexPool;
+
+    SkTArray<SkAutoTUnref<GrBatchUploader>, true>   fAsapUploads;
+
+    GrBatchToken                                    fCurrentToken;
+
+    GrBatchToken                                    fLastFlushedToken;
+};
+
+/**
+ * GrDrawBatch instances use this object to allocate space for their geometry and to issue the draws
+ * that render their batch.
+ */
+class GrDrawBatch::Target {
+public:
+    Target(GrBatchFlushState* state, GrDrawBatch* batch) : fState(state), fBatch(batch) {}
+
+    void upload(GrBatchUploader* upload) {
+        if (this->asapToken() == upload->lastUploadToken()) {
+            fState->addASAPUpload(upload);
+        } else {
+            fBatch->fInlineUploads.push_back().reset(SkRef(upload));
+        }
+    }
+
+    bool hasTokenBeenFlushed(GrBatchToken token) const {
+        return fState->hasTokenBeenFlushed(token);
+    }
+    GrBatchToken currentToken() const { return fState->currentToken(); }
+    GrBatchToken asapToken() const { return fState->asapToken(); }
+
+    const GrCaps& caps() const { return fState->caps(); }
+
+    GrResourceProvider* resourceProvider() const { return fState->resourceProvider(); }
+
+protected:
+    GrDrawBatch* batch() { return fBatch; }
+    GrBatchFlushState* state() { return fState; }
+
+private:
+    GrBatchFlushState*  fState;
+    GrDrawBatch*        fBatch;
+};
+
+/** Extension of GrDrawBatch::Target for use by GrVertexBatch. Adds the ability to create vertex
+    draws. */
+class GrVertexBatch::Target : public GrDrawBatch::Target {
+public:
+    Target(GrBatchFlushState* state, GrVertexBatch* batch) : INHERITED(state, batch) {}
+
+    void initDraw(const GrPrimitiveProcessor* primProc, const GrPipeline* pipeline) {
+        GrVertexBatch::DrawArray* draws = this->vertexBatch()->fDrawArrays.addToTail();
+        draws->fPrimitiveProcessor.reset(primProc);
+        this->state()->advanceToken();
+    }
+
+    void draw(const GrVertices& vertices) {
+        this->vertexBatch()->fDrawArrays.tail()->fDraws.push_back(vertices);
+    }
+
+    void* makeVertexSpace(size_t vertexSize, int vertexCount,
+                          const GrVertexBuffer** buffer, int* startVertex) {
+        return this->state()->makeVertexSpace(vertexSize, vertexCount, buffer, startVertex);
+    }
+
+    uint16_t* makeIndexSpace(int indexCount, const GrIndexBuffer** buffer, int* startIndex) {
+        return this->state()->makeIndexSpace(indexCount, buffer, startIndex);
+    }
+
+    /** Helpers for batches which over-allocate and then return data to the pool. */
+    void putBackIndices(int indices) { this->state()->putBackIndices(indices); }
+    void putBackVertices(int vertices, size_t vertexStride) {
+        this->state()->putBackVertexSpace(vertices * vertexStride);
+    }
+
+private:
+    GrVertexBatch* vertexBatch() { return static_cast<GrVertexBatch*>(this->batch()); }
+    typedef GrDrawBatch::Target INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrBatchFontCache.cpp b/gfx/skia/skia/src/gpu/GrBatchFontCache.cpp
new file mode 100644
index 000000000000..ad76e4d71fa1
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrBatchFontCache.cpp
@@ -0,0 +1,236 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrBatchFontCache.h"
+#include "GrContext.h"
+#include "GrGpu.h"
+#include "GrRectanizer.h"
+#include "GrResourceProvider.h"
+#include "GrSurfacePriv.h"
+#include "SkString.h"
+
+#include "SkDistanceFieldGen.h"
+
+///////////////////////////////////////////////////////////////////////////////
+
+bool GrBatchFontCache::initAtlas(GrMaskFormat format) {
+    int index = MaskFormatToAtlasIndex(format);
+    if (!fAtlases[index]) {
+        GrPixelConfig config = MaskFormatToPixelConfig(format);
+        int width = fAtlasConfigs[index].fWidth;
+        int height = fAtlasConfigs[index].fHeight;
+        int numPlotsX = fAtlasConfigs[index].numPlotsX();
+        int numPlotsY = fAtlasConfigs[index].numPlotsY();
+
+        fAtlases[index] =
+                fContext->resourceProvider()->createAtlas(config, width, height,
+                                                          numPlotsX, numPlotsY,
+                                                          &GrBatchFontCache::HandleEviction,
+                                                          (void*)this);
+        if (!fAtlases[index]) {
+            return false;
+        }
+    }
+    return true;
+}
+
+GrBatchFontCache::GrBatchFontCache(GrContext* context)
+    : fContext(context)
+    , fPreserveStrike(nullptr) {
+    for (int i = 0; i < kMaskFormatCount; ++i) {
+        fAtlases[i] = nullptr;
+    }
+
+    // setup default atlas configs
+    fAtlasConfigs[kA8_GrMaskFormat].fWidth = 2048;
+    fAtlasConfigs[kA8_GrMaskFormat].fHeight = 2048;
+    fAtlasConfigs[kA8_GrMaskFormat].fPlotWidth = 512;
+    fAtlasConfigs[kA8_GrMaskFormat].fPlotHeight = 256;
+
+    fAtlasConfigs[kA565_GrMaskFormat].fWidth = 1024;
+    fAtlasConfigs[kA565_GrMaskFormat].fHeight = 2048;
+    fAtlasConfigs[kA565_GrMaskFormat].fPlotWidth = 256;
+    fAtlasConfigs[kA565_GrMaskFormat].fPlotHeight = 256;
+
+    fAtlasConfigs[kARGB_GrMaskFormat].fWidth = 1024;
+    fAtlasConfigs[kARGB_GrMaskFormat].fHeight = 2048;
+    fAtlasConfigs[kARGB_GrMaskFormat].fPlotWidth = 256;
+    fAtlasConfigs[kARGB_GrMaskFormat].fPlotHeight = 256;
+}
+
+GrBatchFontCache::~GrBatchFontCache() {
+    SkTDynamicHash<GrBatchTextStrike, GrFontDescKey>::Iter iter(&fCache);
+    while (!iter.done()) {
+        (*iter).fIsAbandoned = true;
+        (*iter).unref();
+        ++iter;
+    }
+    for (int i = 0; i < kMaskFormatCount; ++i) {
+        delete fAtlases[i];
+    }
+}
+
+void GrBatchFontCache::freeAll() {
+    SkTDynamicHash<GrBatchTextStrike, GrFontDescKey>::Iter iter(&fCache);
+    while (!iter.done()) {
+        (*iter).fIsAbandoned = true;
+        (*iter).unref();
+        ++iter;
+    }
+    fCache.rewind();
+    for (int i = 0; i < kMaskFormatCount; ++i) {
+        delete fAtlases[i];
+        fAtlases[i] = nullptr;
+    }
+}
+
+void GrBatchFontCache::HandleEviction(GrBatchAtlas::AtlasID id, void* ptr) {
+    GrBatchFontCache* fontCache = reinterpret_cast<GrBatchFontCache*>(ptr);
+
+    SkTDynamicHash<GrBatchTextStrike, GrFontDescKey>::Iter iter(&fontCache->fCache);
+    for (; !iter.done(); ++iter) {
+        GrBatchTextStrike* strike = &*iter;
+        strike->removeID(id);
+
+        // clear out any empty strikes.  We will preserve the strike whose call to addToAtlas
+        // triggered the eviction
+        if (strike != fontCache->fPreserveStrike && 0 == strike->fAtlasedGlyphs) {
+            fontCache->fCache.remove(*(strike->fFontScalerKey));
+            strike->fIsAbandoned = true;
+            strike->unref();
+        }
+    }
+}
+
+void GrBatchFontCache::dump() const {
+    static int gDumpCount = 0;
+    for (int i = 0; i < kMaskFormatCount; ++i) {
+        if (fAtlases[i]) {
+            GrTexture* texture = fAtlases[i]->getTexture();
+            if (texture) {
+                SkString filename;
+#ifdef SK_BUILD_FOR_ANDROID
+                filename.printf("/sdcard/fontcache_%d%d.png", gDumpCount, i);
+#else
+                filename.printf("fontcache_%d%d.png", gDumpCount, i);
+#endif
+                texture->surfacePriv().savePixels(filename.c_str());
+            }
+        }
+    }
+    ++gDumpCount;
+}
+
+void GrBatchFontCache::setAtlasSizes_ForTesting(const GrBatchAtlasConfig configs[3]) {
+    // delete any old atlases, this should be safe to do as long as we are not in the middle of a
+    // flush
+    for (int i = 0; i < kMaskFormatCount; i++) {
+        if (fAtlases[i]) {
+            delete fAtlases[i];
+            fAtlases[i] = nullptr;
+        }
+    }
+    memcpy(fAtlasConfigs, configs, sizeof(fAtlasConfigs));
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+/*
+    The text strike is specific to a given font/style/matrix setup, which is
+    represented by the GrHostFontScaler object we are given in getGlyph().
+
+    We map a 32bit glyphID to a GrGlyph record, which in turn points to a
+    atlas and a position within that texture.
+ */
+
+GrBatchTextStrike::GrBatchTextStrike(GrBatchFontCache* cache, const GrFontDescKey* key)
+    : fFontScalerKey(SkRef(key))
+    , fPool(9/*start allocations at 512 bytes*/)
+    , fAtlasedGlyphs(0)
+    , fIsAbandoned(false) {
+
+    fBatchFontCache = cache;     // no need to ref, it won't go away before we do
+}
+
+GrBatchTextStrike::~GrBatchTextStrike() {
+    SkTDynamicHash<GrGlyph, GrGlyph::PackedID>::Iter iter(&fCache);
+    while (!iter.done()) {
+        (*iter).free();
+        ++iter;
+    }
+}
+
+GrGlyph* GrBatchTextStrike::generateGlyph(const SkGlyph& skGlyph, GrGlyph::PackedID packed,
+                                          GrFontScaler* scaler) {
+    SkIRect bounds;
+    if (GrGlyph::kDistance_MaskStyle == GrGlyph::UnpackMaskStyle(packed)) {
+        if (!scaler->getPackedGlyphDFBounds(skGlyph, &bounds)) {
+            return nullptr;
+        }
+    } else {
+        if (!scaler->getPackedGlyphBounds(skGlyph, &bounds)) {
+            return nullptr;
+        }
+    }
+    GrMaskFormat format = scaler->getPackedGlyphMaskFormat(skGlyph);
+
+    GrGlyph* glyph = (GrGlyph*)fPool.alloc(sizeof(GrGlyph));
+    glyph->init(packed, bounds, format);
+    fCache.add(glyph);
+    return glyph;
+}
+
+void GrBatchTextStrike::removeID(GrBatchAtlas::AtlasID id) {
+    SkTDynamicHash<GrGlyph, GrGlyph::PackedID>::Iter iter(&fCache);
+    while (!iter.done()) {
+        if (id == (*iter).fID) {
+            (*iter).fID = GrBatchAtlas::kInvalidAtlasID;
+            fAtlasedGlyphs--;
+            SkASSERT(fAtlasedGlyphs >= 0);
+        }
+        ++iter;
+    }
+}
+
+bool GrBatchTextStrike::addGlyphToAtlas(GrDrawBatch::Target* target,
+                                        GrGlyph* glyph,
+                                        GrFontScaler* scaler,
+                                        GrMaskFormat expectedMaskFormat) {
+    SkASSERT(glyph);
+    SkASSERT(scaler);
+    SkASSERT(fCache.find(glyph->fPackedID));
+
+    SkAutoUnref ar(SkSafeRef(scaler));
+
+    int bytesPerPixel = GrMaskFormatBytesPerPixel(expectedMaskFormat);
+
+    size_t size = glyph->fBounds.area() * bytesPerPixel;
+    SkAutoSMalloc<1024> storage(size);
+
+    const SkGlyph& skGlyph = scaler->grToSkGlyph(glyph->fPackedID);
+    if (GrGlyph::kDistance_MaskStyle == GrGlyph::UnpackMaskStyle(glyph->fPackedID)) {
+        if (!scaler->getPackedGlyphDFImage(skGlyph, glyph->width(), glyph->height(),
+                                           storage.get())) {
+            return false;
+        }
+    } else {
+        if (!scaler->getPackedGlyphImage(skGlyph, glyph->width(), glyph->height(),
+                                         glyph->width() * bytesPerPixel, expectedMaskFormat,
+                                         storage.get())) {
+            return false;
+        }
+    }
+
+    bool success = fBatchFontCache->addToAtlas(this, &glyph->fID, target, expectedMaskFormat,
+                                               glyph->width(), glyph->height(),
+                                               storage.get(), &glyph->fAtlasLocation);
+    if (success) {
+        SkASSERT(GrBatchAtlas::kInvalidAtlasID != glyph->fID);
+        fAtlasedGlyphs++;
+    }
+    return success;
+}
diff --git a/gfx/skia/skia/src/gpu/GrBatchFontCache.h b/gfx/skia/skia/src/gpu/GrBatchFontCache.h
new file mode 100644
index 000000000000..46ab1c82741a
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrBatchFontCache.h
@@ -0,0 +1,228 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrBatchFontCache_DEFINED
+#define GrBatchFontCache_DEFINED
+
+#include "GrBatchAtlas.h"
+#include "GrFontScaler.h"
+#include "GrGlyph.h"
+#include "SkGlyph.h"
+#include "SkTDynamicHash.h"
+#include "SkVarAlloc.h"
+
+class GrBatchFontCache;
+class GrGpu;
+
+/**
+ *  The GrBatchTextStrike manages a pool of CPU backing memory for GrGlyphs.  This backing memory
+ *  is indexed by a PackedID and GrFontScaler.  The GrFontScaler is what actually creates the mask.
+ */
+class GrBatchTextStrike : public SkNVRefCnt<GrBatchTextStrike> {
+public:
+    GrBatchTextStrike(GrBatchFontCache*, const GrFontDescKey* fontScalerKey);
+    ~GrBatchTextStrike();
+
+    const GrFontDescKey* getFontScalerKey() const { return fFontScalerKey; }
+    GrBatchFontCache* getBatchFontCache() const { return fBatchFontCache; }
+
+    inline GrGlyph* getGlyph(const SkGlyph& skGlyph, GrGlyph::PackedID packed,
+                             GrFontScaler* scaler) {
+        GrGlyph* glyph = fCache.find(packed);
+        if (nullptr == glyph) {
+            glyph = this->generateGlyph(skGlyph, packed, scaler);
+        }
+        return glyph;
+    }
+
+    // This variant of the above function is called by TextBatch.  At this point, it is possible
+    // that the maskformat of the glyph differs from what we expect.  In these cases we will just
+    // draw a clear square.
+    // skbug:4143 crbug:510931
+    inline GrGlyph* getGlyph(GrGlyph::PackedID packed,
+                             GrMaskFormat expectedMaskFormat,
+                             GrFontScaler* scaler) {
+        GrGlyph* glyph = fCache.find(packed);
+        if (nullptr == glyph) {
+            // We could return this to the caller, but in practice it adds code complexity for
+            // potentially little benefit(ie, if the glyph is not in our font cache, then its not
+            // in the atlas and we're going to be doing a texture upload anyways).
+            const SkGlyph& skGlyph = scaler->grToSkGlyph(packed);
+            glyph = this->generateGlyph(skGlyph, packed, scaler);
+            glyph->fMaskFormat = expectedMaskFormat;
+        }
+        return glyph;
+    }
+
+    // returns true if glyph successfully added to texture atlas, false otherwise.  If the glyph's
+    // mask format has changed, then addGlyphToAtlas will draw a clear box.  This will almost never
+    // happen.
+    // TODO we can handle some of these cases if we really want to, but the long term solution is to
+    // get the actual glyph image itself when we get the glyph metrics.
+    bool addGlyphToAtlas(GrDrawBatch::Target*, GrGlyph*, GrFontScaler*,
+                         GrMaskFormat expectedMaskFormat);
+
+    // testing
+    int countGlyphs() const { return fCache.count(); }
+
+    // remove any references to this plot
+    void removeID(GrBatchAtlas::AtlasID);
+
+    // If a TextStrike is abandoned by the cache, then the caller must get a new strike
+    bool isAbandoned() const { return fIsAbandoned; }
+
+    static const GrFontDescKey& GetKey(const GrBatchTextStrike& ts) {
+        return *(ts.fFontScalerKey);
+    }
+    static uint32_t Hash(const GrFontDescKey& key) {
+        return key.getHash();
+    }
+
+private:
+    SkTDynamicHash<GrGlyph, GrGlyph::PackedID> fCache;
+    SkAutoTUnref<const GrFontDescKey> fFontScalerKey;
+    SkVarAlloc fPool;
+
+    GrBatchFontCache* fBatchFontCache;
+    int fAtlasedGlyphs;
+    bool fIsAbandoned;
+
+    GrGlyph* generateGlyph(const SkGlyph&, GrGlyph::PackedID, GrFontScaler*);
+
+    friend class GrBatchFontCache;
+};
+
+/*
+ * GrBatchFontCache manages strikes which are indexed by a GrFontScaler.  These strikes can then be
+ * used to individual Glyph Masks.  The GrBatchFontCache also manages GrBatchAtlases, though this is
+ * more or less transparent to the client(aside from atlasGeneration, described below).
+ * Note - we used to initialize the backing atlas for the GrBatchFontCache at initialization time.
+ * However, this caused a regression, even when the GrBatchFontCache was unused.  We now initialize
+ * the backing atlases lazily.  Its not immediately clear why this improves the situation.
+ */
+class GrBatchFontCache {
+public:
+    GrBatchFontCache(GrContext*);
+    ~GrBatchFontCache();
+    // The user of the cache may hold a long-lived ref to the returned strike. However, actions by
+    // another client of the cache may cause the strike to be purged while it is still reffed.
+    // Therefore, the caller must check GrBatchTextStrike::isAbandoned() if there are other
+    // interactions with the cache since the strike was received.
+    inline GrBatchTextStrike* getStrike(GrFontScaler* scaler) {
+        GrBatchTextStrike* strike = fCache.find(*(scaler->getKey()));
+        if (nullptr == strike) {
+            strike = this->generateStrike(scaler);
+        }
+        return strike;
+    }
+
+    void freeAll();
+
+    // if getTexture returns nullptr, the client must not try to use other functions on the
+    // GrBatchFontCache which use the atlas.  This function *must* be called first, before other
+    // functions which use the atlas.
+    GrTexture* getTexture(GrMaskFormat format) {
+        if (this->initAtlas(format)) {
+            return this->getAtlas(format)->getTexture();
+        }
+        return nullptr;
+    }
+
+    bool hasGlyph(GrGlyph* glyph) {
+        SkASSERT(glyph);
+        return this->getAtlas(glyph->fMaskFormat)->hasID(glyph->fID);
+    }
+
+    // To ensure the GrBatchAtlas does not evict the Glyph Mask from its texture backing store,
+    // the client must pass in the current batch token along with the GrGlyph.
+    // A BulkUseTokenUpdater is used to manage bulk last use token updating in the Atlas.
+    // For convenience, this function will also set the use token for the current glyph if required
+    // NOTE: the bulk uploader is only valid if the subrun has a valid atlasGeneration
+    void addGlyphToBulkAndSetUseToken(GrBatchAtlas::BulkUseTokenUpdater* updater,
+                                      GrGlyph* glyph, GrBatchToken token) {
+        SkASSERT(glyph);
+        updater->add(glyph->fID);
+        this->getAtlas(glyph->fMaskFormat)->setLastUseToken(glyph->fID, token);
+    }
+
+    void setUseTokenBulk(const GrBatchAtlas::BulkUseTokenUpdater& updater,
+                         GrBatchToken token,
+                         GrMaskFormat format) {
+        this->getAtlas(format)->setLastUseTokenBulk(updater, token);
+    }
+
+    // add to texture atlas that matches this format
+    bool addToAtlas(GrBatchTextStrike* strike, GrBatchAtlas::AtlasID* id,
+                    GrDrawBatch::Target* target,
+                    GrMaskFormat format, int width, int height, const void* image,
+                    SkIPoint16* loc) {
+        fPreserveStrike = strike;
+        return this->getAtlas(format)->addToAtlas(id, target, width, height, image, loc);
+    }
+
+    // Some clients may wish to verify the integrity of the texture backing store of the
+    // GrBatchAtlas.  The atlasGeneration returned below is a monitonically increasing number which
+    // changes everytime something is removed from the texture backing store.
+    uint64_t atlasGeneration(GrMaskFormat format) const {
+        return this->getAtlas(format)->atlasGeneration();
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Functions intended debug only
+    void dump() const;
+
+    void setAtlasSizes_ForTesting(const GrBatchAtlasConfig configs[3]);
+
+private:
+    static GrPixelConfig MaskFormatToPixelConfig(GrMaskFormat format) {
+        static const GrPixelConfig kPixelConfigs[] = {
+            kAlpha_8_GrPixelConfig,
+            kRGB_565_GrPixelConfig,
+            kSkia8888_GrPixelConfig
+        };
+        static_assert(SK_ARRAY_COUNT(kPixelConfigs) == kMaskFormatCount, "array_size_mismatch");
+
+        return kPixelConfigs[format];
+    }
+
+    // There is a 1:1 mapping between GrMaskFormats and atlas indices
+    static int MaskFormatToAtlasIndex(GrMaskFormat format) {
+        static const int sAtlasIndices[] = {
+            kA8_GrMaskFormat,
+            kA565_GrMaskFormat,
+            kARGB_GrMaskFormat,
+        };
+        static_assert(SK_ARRAY_COUNT(sAtlasIndices) == kMaskFormatCount, "array_size_mismatch");
+
+        SkASSERT(sAtlasIndices[format] < kMaskFormatCount);
+        return sAtlasIndices[format];
+    }
+
+    bool initAtlas(GrMaskFormat);
+
+    GrBatchTextStrike* generateStrike(GrFontScaler* scaler) {
+        GrBatchTextStrike* strike = new GrBatchTextStrike(this, scaler->getKey());
+        fCache.add(strike);
+        return strike;
+    }
+
+    GrBatchAtlas* getAtlas(GrMaskFormat format) const {
+        int atlasIndex = MaskFormatToAtlasIndex(format);
+        SkASSERT(fAtlases[atlasIndex]);
+        return fAtlases[atlasIndex];
+    }
+
+    static void HandleEviction(GrBatchAtlas::AtlasID, void*);
+
+    GrContext* fContext;
+    SkTDynamicHash<GrBatchTextStrike, GrFontDescKey> fCache;
+    GrBatchAtlas* fAtlases[kMaskFormatCount];
+    GrBatchTextStrike* fPreserveStrike;
+    GrBatchAtlasConfig fAtlasConfigs[kMaskFormatCount];
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrBatchTest.cpp b/gfx/skia/skia/src/gpu/GrBatchTest.cpp
new file mode 100644
index 000000000000..344464d7170b
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrBatchTest.cpp
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrBatchTest.h"
+#include "SkRandom.h"
+#include "SkTypes.h"
+
+#ifdef GR_TEST_UTILS
+
+DRAW_BATCH_TEST_EXTERN(AAConvexPathBatch);
+DRAW_BATCH_TEST_EXTERN(AADistanceFieldPathBatch);
+DRAW_BATCH_TEST_EXTERN(AAFillRectBatch);
+DRAW_BATCH_TEST_EXTERN(AAFillRectBatchLocalMatrix);
+DRAW_BATCH_TEST_EXTERN(AAHairlineBatch);
+DRAW_BATCH_TEST_EXTERN(AAStrokeRectBatch);
+DRAW_BATCH_TEST_EXTERN(DashBatch);
+DRAW_BATCH_TEST_EXTERN(DefaultPathBatch);
+DRAW_BATCH_TEST_EXTERN(CircleBatch);
+DRAW_BATCH_TEST_EXTERN(DIEllipseBatch);
+DRAW_BATCH_TEST_EXTERN(EllipseBatch);
+DRAW_BATCH_TEST_EXTERN(GrDrawAtlasBatch);
+DRAW_BATCH_TEST_EXTERN(NonAAStrokeRectBatch);
+DRAW_BATCH_TEST_EXTERN(RRectBatch);
+DRAW_BATCH_TEST_EXTERN(TesselatingPathBatch);
+DRAW_BATCH_TEST_EXTERN(TextBlobBatch);
+DRAW_BATCH_TEST_EXTERN(VerticesBatch);
+
+static BatchTestFunc gTestBatches[] = {
+    DRAW_BATCH_TEST_ENTRY(AAConvexPathBatch),
+    DRAW_BATCH_TEST_ENTRY(AADistanceFieldPathBatch),
+    DRAW_BATCH_TEST_ENTRY(AAFillRectBatch),
+    DRAW_BATCH_TEST_ENTRY(AAFillRectBatchLocalMatrix),
+    DRAW_BATCH_TEST_ENTRY(AAHairlineBatch),
+    DRAW_BATCH_TEST_ENTRY(AAStrokeRectBatch),
+    DRAW_BATCH_TEST_ENTRY(DashBatch),
+    DRAW_BATCH_TEST_ENTRY(DefaultPathBatch),
+    DRAW_BATCH_TEST_ENTRY(CircleBatch),
+    DRAW_BATCH_TEST_ENTRY(DIEllipseBatch),
+    DRAW_BATCH_TEST_ENTRY(EllipseBatch),
+    DRAW_BATCH_TEST_ENTRY(GrDrawAtlasBatch),
+    DRAW_BATCH_TEST_ENTRY(NonAAStrokeRectBatch),
+    DRAW_BATCH_TEST_ENTRY(RRectBatch),
+    DRAW_BATCH_TEST_ENTRY(TesselatingPathBatch),
+    DRAW_BATCH_TEST_ENTRY(TextBlobBatch),
+    DRAW_BATCH_TEST_ENTRY(VerticesBatch)
+};
+
+GrDrawBatch* GrRandomDrawBatch(SkRandom* random, GrContext* context) {
+    uint32_t index = random->nextULessThan(static_cast<uint32_t>(SK_ARRAY_COUNT(gTestBatches)));
+    BatchTestFunc func = gTestBatches[index];
+    return (*func)(random, context);
+}
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrBatchTest.h b/gfx/skia/skia/src/gpu/GrBatchTest.h
new file mode 100644
index 000000000000..32e8e28930e6
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrBatchTest.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrBatchTest_DEFINED
+#define GrBatchTest_DEFINED
+
+#include "GrTestUtils.h"
+
+#ifdef GR_TEST_UTILS
+
+class GrDrawBatch;
+class GrContext;
+class SkRandom;
+
+/*
+ * This file defines some macros for testing batches, and also declares functions / objects which
+ * are generally useful for GrBatch testing
+ */
+
+// Batches should define test functions using DRAW_BATCH_TEST_DEFINE.  The other macros defined
+// below are used exclusively by the test harness.
+typedef GrDrawBatch* (*BatchTestFunc)(SkRandom* random, GrContext* context);
+#define DRAW_BATCH_TEST_DEFINE(Batch) \
+    GrDrawBatch* Batch##__Test(SkRandom* random, GrContext* context)
+#define DRAW_BATCH_TEST_EXTERN(Batch) \
+    extern GrDrawBatch* Batch##__Test(SkRandom*, GrContext* context);
+#define DRAW_BATCH_TEST_ENTRY(Batch) \
+    Batch##__Test
+#define DRAW_BATCH_TEST_FRIEND(Batch) \
+    friend GrDrawBatch* Batch##__Test(SkRandom* random, GrContext* context);
+
+GrDrawBatch* GrRandomDrawBatch(SkRandom*, GrContext*);
+
+#endif
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrBinHashKey.h b/gfx/skia/skia/src/gpu/GrBinHashKey.h
deleted file mode 100644
index 06ff93180855..000000000000
--- a/gfx/skia/skia/src/gpu/GrBinHashKey.h
+++ /dev/null
@@ -1,160 +0,0 @@
-
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#ifndef GrBinHashKey_DEFINED
-#define GrBinHashKey_DEFINED
-
-#include "SkChecksum.h"
-#include "GrTypes.h"
-
-/**
- *  GrMurmur3HashKey is a hash key class that can take a data chunk of any predetermined
- *  length. It uses the Murmur3 hash function. It is intended to be used with
- *  SkTDynamicHash (where GrBinHashKey is for GrTHashTable).
- */
-template<size_t KEY_SIZE_IN_BYTES>
-class GrMurmur3HashKey {
-public:
-    GrMurmur3HashKey() {
-        this->reset();
-    }
-
-    void reset() {
-        fHash = 0;
-#ifdef SK_DEBUG
-        fIsValid = false;
-#endif
-    }
-
-    void setKeyData(const uint32_t* data) {
-        SK_COMPILE_ASSERT(KEY_SIZE_IN_BYTES % 4 == 0, key_size_mismatch);
-        memcpy(fData, data, KEY_SIZE_IN_BYTES);
-
-        fHash = SkChecksum::Murmur3(fData, KEY_SIZE_IN_BYTES);
-#ifdef SK_DEBUG
-        fIsValid = true;
-#endif
-    }
-
-    bool operator==(const GrMurmur3HashKey& other) const {
-        if (fHash != other.fHash) {
-            return false;
-        }
-
-        return !memcmp(fData, other.fData, KEY_SIZE_IN_BYTES);
-    }
-
-    uint32_t getHash() const {
-        SkASSERT(fIsValid);
-        return fHash;
-    }
-
-    const uint8_t* getData() const {
-        SkASSERT(fIsValid);
-        return reinterpret_cast<const uint8_t*>(fData);
-    }
-
-private:
-    uint32_t fHash;
-    uint32_t fData[KEY_SIZE_IN_BYTES / sizeof(uint32_t)];  // Buffer for key storage.
-
-#ifdef SK_DEBUG
-public:
-    bool                fIsValid;
-#endif
-};
-
-/**
- *  GrBinHashKey is a hash key class that can take a data chunk of any predetermined
- *  length. The hash function used is the One-at-a-Time Hash
- *  (http://burtleburtle.net/bob/hash/doobs.html).
- */
-template<size_t KEY_SIZE>
-class GrBinHashKey {
-public:
-    enum { kKeySize = KEY_SIZE };
-
-    GrBinHashKey() {
-        this->reset();
-    }
-
-    void reset() {
-        fHash = 0;
-#ifdef SK_DEBUG
-        fIsValid = false;
-#endif
-    }
-
-    void setKeyData(const uint32_t* SK_RESTRICT data) {
-        SK_COMPILE_ASSERT(KEY_SIZE % 4 == 0, key_size_mismatch);
-        memcpy(&fData, data, KEY_SIZE);
-
-        uint32_t hash = 0;
-        size_t len = KEY_SIZE;
-        while (len >= 4) {
-            hash += *data++;
-            hash += (hash << 10);
-            hash ^= (hash >> 6);
-            len -= 4;
-        }
-        hash += (hash << 3);
-        hash ^= (hash >> 11);
-        hash += (hash << 15);
-#ifdef SK_DEBUG
-        fIsValid = true;
-#endif
-        fHash = hash;
-    }
-
-    bool operator==(const GrBinHashKey<KEY_SIZE>& key) const {
-        SkASSERT(fIsValid && key.fIsValid);
-        if (fHash != key.fHash) {
-            return false;
-        }
-        for (size_t i = 0; i < SK_ARRAY_COUNT(fData); ++i) {
-            if (fData[i] != key.fData[i]) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    bool operator<(const GrBinHashKey<KEY_SIZE>& key) const {
-        SkASSERT(fIsValid && key.fIsValid);
-        for (size_t i = 0; i < SK_ARRAY_COUNT(fData); ++i) {
-            if (fData[i] < key.fData[i]) {
-                return true;
-            } else if (fData[i] > key.fData[i]) {
-                return false;
-            }
-        }
-        return false;
-    }
-
-    uint32_t getHash() const {
-        SkASSERT(fIsValid);
-        return fHash;
-    }
-
-    const uint8_t* getData() const {
-        SkASSERT(fIsValid);
-        return reinterpret_cast<const uint8_t*>(fData);
-    }
-
-private:
-    uint32_t            fHash;
-    uint32_t            fData[KEY_SIZE / sizeof(uint32_t)];  // Buffer for key storage.
-
-#ifdef SK_DEBUG
-public:
-    bool                fIsValid;
-#endif
-};
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/GrBitmapTextContext.cpp b/gfx/skia/skia/src/gpu/GrBitmapTextContext.cpp
deleted file mode 100755
index cc657c6eaf6b..000000000000
--- a/gfx/skia/skia/src/gpu/GrBitmapTextContext.cpp
+++ /dev/null
@@ -1,594 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrBitmapTextContext.h"
-#include "GrAtlas.h"
-#include "GrDrawTarget.h"
-#include "GrFontScaler.h"
-#include "GrIndexBuffer.h"
-#include "GrStrokeInfo.h"
-#include "GrTextStrike.h"
-#include "GrTextStrike_impl.h"
-#include "SkColorPriv.h"
-#include "SkPath.h"
-#include "SkRTConf.h"
-#include "SkStrokeRec.h"
-#include "effects/GrCustomCoordsTextureEffect.h"
-
-#include "SkAutoKern.h"
-#include "SkDraw.h"
-#include "SkDrawProcs.h"
-#include "SkGlyphCache.h"
-#include "SkGpuDevice.h"
-#include "SkGr.h"
-#include "SkTextMapStateProc.h"
-
-SK_CONF_DECLARE(bool, c_DumpFontCache, "gpu.dumpFontCache", false,
-                "Dump the contents of the font cache before every purge.");
-
-static const int kGlyphCoordsNoColorAttributeIndex = 1;
-static const int kGlyphCoordsWithColorAttributeIndex = 2;
-
-namespace {
-// position + texture coord
-extern const GrVertexAttrib gTextVertexAttribs[] = {
-    {kVec2f_GrVertexAttribType, 0,               kPosition_GrVertexAttribBinding},
-    {kVec2f_GrVertexAttribType, sizeof(SkPoint) , kEffect_GrVertexAttribBinding}
-};
-
-// position + color + texture coord
-extern const GrVertexAttrib gTextVertexWithColorAttribs[] = {
-    {kVec2f_GrVertexAttribType,  0,                                 kPosition_GrVertexAttribBinding},
-    {kVec4ub_GrVertexAttribType, sizeof(SkPoint),                   kColor_GrVertexAttribBinding},
-    {kVec2f_GrVertexAttribType,  sizeof(SkPoint) + sizeof(GrColor), kEffect_GrVertexAttribBinding}
-};
-
-};
-
-GrBitmapTextContext::GrBitmapTextContext(GrContext* context,
-                                         const SkDeviceProperties& properties)
-                                       : GrTextContext(context, properties) {
-    fStrike = NULL;
-
-    fCurrVertex = 0;
-    fEffectTextureUniqueID = SK_InvalidUniqueID;
-
-    fVertices = NULL;
-
-    fVertexBounds.setLargestInverted();
-}
-
-GrBitmapTextContext::~GrBitmapTextContext() {
-    this->flushGlyphs();
-}
-
-bool GrBitmapTextContext::canDraw(const SkPaint& paint) {
-    return !SkDraw::ShouldDrawTextAsPaths(paint, fContext->getMatrix());
-}
-
-static inline GrColor skcolor_to_grcolor_nopremultiply(SkColor c) {
-    unsigned r = SkColorGetR(c);
-    unsigned g = SkColorGetG(c);
-    unsigned b = SkColorGetB(c);
-    return GrColorPackRGBA(r, g, b, 0xff);
-}
-
-void GrBitmapTextContext::flushGlyphs() {
-    if (NULL == fDrawTarget) {
-        return;
-    }
-
-    GrDrawState* drawState = fDrawTarget->drawState();
-    GrDrawState::AutoRestoreEffects are(drawState);
-    drawState->setFromPaint(fPaint, SkMatrix::I(), fContext->getRenderTarget());
-
-    if (fCurrVertex > 0) {
-        // setup our sampler state for our text texture/atlas
-        SkASSERT(SkIsAlign4(fCurrVertex));
-        GrTextureParams params(SkShader::kRepeat_TileMode, GrTextureParams::kNone_FilterMode);
-
-        GrTexture* currTexture = fStrike->getTexture();
-        SkASSERT(currTexture);
-        uint32_t textureUniqueID = currTexture->getUniqueID();
-        
-        if (textureUniqueID != fEffectTextureUniqueID) {
-            fCachedEffect.reset(GrCustomCoordsTextureEffect::Create(currTexture, params));
-            fEffectTextureUniqueID = textureUniqueID;
-        }
-
-        // This effect could be stored with one of the cache objects (atlas?)
-        int coordsIdx = drawState->hasColorVertexAttribute() ? kGlyphCoordsWithColorAttributeIndex :
-                                                               kGlyphCoordsNoColorAttributeIndex;
-        drawState->addCoverageEffect(fCachedEffect.get(), coordsIdx);
-        SkASSERT(NULL != fStrike);
-        switch (fStrike->getMaskFormat()) {
-            // Color bitmap text
-            case kARGB_GrMaskFormat:
-                SkASSERT(!drawState->hasColorVertexAttribute());
-                drawState->setBlendFunc(fPaint.getSrcBlendCoeff(), fPaint.getDstBlendCoeff());
-                drawState->setColor(0xffffffff);
-                break;
-            // LCD text
-            case kA888_GrMaskFormat:
-            case kA565_GrMaskFormat: {
-                if (kOne_GrBlendCoeff != fPaint.getSrcBlendCoeff() ||
-                    kISA_GrBlendCoeff != fPaint.getDstBlendCoeff() ||
-                    fPaint.numColorStages()) {
-                    GrPrintf("LCD Text will not draw correctly.\n");
-                }
-                SkASSERT(!drawState->hasColorVertexAttribute());
-                // We don't use the GrPaint's color in this case because it's been premultiplied by
-                // alpha. Instead we feed in a non-premultiplied color, and multiply its alpha by
-                // the mask texture color. The end result is that we get
-                //            mask*paintAlpha*paintColor + (1-mask*paintAlpha)*dstColor
-                int a = SkColorGetA(fSkPaint.getColor());
-                // paintAlpha
-                drawState->setColor(SkColorSetARGB(a, a, a, a));
-                // paintColor
-                drawState->setBlendConstant(skcolor_to_grcolor_nopremultiply(fSkPaint.getColor()));
-                drawState->setBlendFunc(kConstC_GrBlendCoeff, kISC_GrBlendCoeff);
-                break;
-            }
-            // Grayscale/BW text
-            case kA8_GrMaskFormat:
-                // set back to normal in case we took LCD path previously.
-                drawState->setBlendFunc(fPaint.getSrcBlendCoeff(), fPaint.getDstBlendCoeff());
-                //drawState->setColor(fPaint.getColor());
-                // We're using per-vertex color.
-                SkASSERT(drawState->hasColorVertexAttribute());
-                drawState->setColor(0xFFFFFFFF);
-                break;
-            default:
-                SkFAIL("Unexepected mask format.");
-        }
-        int nGlyphs = fCurrVertex / 4;
-        fDrawTarget->setIndexSourceToBuffer(fContext->getQuadIndexBuffer());
-        fDrawTarget->drawIndexedInstances(kTriangles_GrPrimitiveType,
-                                          nGlyphs,
-                                          4, 6, &fVertexBounds);
-
-        fCurrVertex = 0;
-        fVertexBounds.setLargestInverted();
-    }
-
-    fDrawTarget->resetVertexSource();
-    fVertices = NULL;
-}
-
-inline void GrBitmapTextContext::init(const GrPaint& paint, const SkPaint& skPaint) {
-    GrTextContext::init(paint, skPaint);
-
-    fStrike = NULL;
-
-    fCurrVertex = 0;
-
-    fVertices = NULL;
-}
-
-inline void GrBitmapTextContext::finish() {
-    this->flushGlyphs();
-
-    GrTextContext::finish();
-}
-
-void GrBitmapTextContext::drawText(const GrPaint& paint, const SkPaint& skPaint,
-                                   const char text[], size_t byteLength,
-                                   SkScalar x, SkScalar y) {
-    SkASSERT(byteLength == 0 || text != NULL);
-
-    // nothing to draw
-    if (text == NULL || byteLength == 0 /*|| fRC->isEmpty()*/) {
-        return;
-    }
-
-    this->init(paint, skPaint);
-
-    if (NULL == fDrawTarget) {
-        return;
-    }
-
-    SkDrawCacheProc glyphCacheProc = fSkPaint.getDrawCacheProc();
-
-    SkAutoGlyphCache    autoCache(fSkPaint, &fDeviceProperties, &fContext->getMatrix());
-    SkGlyphCache*       cache = autoCache.getCache();
-    GrFontScaler*       fontScaler = GetGrFontScaler(cache);
-    if (NULL == fStrike) {
-        fStrike = fContext->getFontCache()->getStrike(fontScaler, false);
-    }
-
-    // transform our starting point
-    {
-        SkPoint loc;
-        fContext->getMatrix().mapXY(x, y, &loc);
-        x = loc.fX;
-        y = loc.fY;
-    }
-
-    // need to measure first
-    if (fSkPaint.getTextAlign() != SkPaint::kLeft_Align) {
-        SkVector    stop;
-
-        MeasureText(cache, glyphCacheProc, text, byteLength, &stop);
-
-        SkScalar    stopX = stop.fX;
-        SkScalar    stopY = stop.fY;
-
-        if (fSkPaint.getTextAlign() == SkPaint::kCenter_Align) {
-            stopX = SkScalarHalf(stopX);
-            stopY = SkScalarHalf(stopY);
-        }
-        x -= stopX;
-        y -= stopY;
-    }
-
-    const char* stop = text + byteLength;
-
-    // allocate vertices
-    SkASSERT(NULL == fVertices);
-    bool useColorVerts = kA8_GrMaskFormat == fStrike->getMaskFormat();
-    if (useColorVerts) {
-        fDrawTarget->drawState()->setVertexAttribs<gTextVertexWithColorAttribs>(
-                                                    SK_ARRAY_COUNT(gTextVertexWithColorAttribs));
-    } else {
-        fDrawTarget->drawState()->setVertexAttribs<gTextVertexAttribs>(
-                                                    SK_ARRAY_COUNT(gTextVertexAttribs));
-    }
-    int numGlyphs = fSkPaint.textToGlyphs(text, byteLength, NULL);
-    bool success = fDrawTarget->reserveVertexAndIndexSpace(4*numGlyphs,
-                                                           0,
-                                                           &fVertices,
-                                                           NULL);
-    GrAlwaysAssert(success);
-
-    SkAutoKern autokern;
-
-    SkFixed fxMask = ~0;
-    SkFixed fyMask = ~0;
-    SkFixed halfSampleX, halfSampleY;
-    if (cache->isSubpixel()) {
-        halfSampleX = halfSampleY = (SK_FixedHalf >> SkGlyph::kSubBits);
-        SkAxisAlignment baseline = SkComputeAxisAlignmentForHText(fContext->getMatrix());
-        if (kX_SkAxisAlignment == baseline) {
-            fyMask = 0;
-            halfSampleY = SK_FixedHalf;
-        } else if (kY_SkAxisAlignment == baseline) {
-            fxMask = 0;
-            halfSampleX = SK_FixedHalf;
-        }
-    } else {
-        halfSampleX = halfSampleY = SK_FixedHalf;
-    }
-
-    SkFixed fx = SkScalarToFixed(x) + halfSampleX;
-    SkFixed fy = SkScalarToFixed(y) + halfSampleY;
-
-    GrContext::AutoMatrix  autoMatrix;
-    autoMatrix.setIdentity(fContext, &fPaint);
-
-    while (text < stop) {
-        const SkGlyph& glyph = glyphCacheProc(cache, &text, fx & fxMask, fy & fyMask);
-
-        fx += autokern.adjust(glyph);
-
-        if (glyph.fWidth) {
-            this->drawPackedGlyph(GrGlyph::Pack(glyph.getGlyphID(),
-                                          glyph.getSubXFixed(),
-                                          glyph.getSubYFixed()),
-                                  SkFixedFloorToFixed(fx),
-                                  SkFixedFloorToFixed(fy),
-                                  fontScaler);
-        }
-
-        fx += glyph.fAdvanceX;
-        fy += glyph.fAdvanceY;
-    }
-
-    this->finish();
-}
-
-void GrBitmapTextContext::drawPosText(const GrPaint& paint, const SkPaint& skPaint,
-                                      const char text[], size_t byteLength,
-                                      const SkScalar pos[], SkScalar constY,
-                                      int scalarsPerPosition) {
-    SkASSERT(byteLength == 0 || text != NULL);
-    SkASSERT(1 == scalarsPerPosition || 2 == scalarsPerPosition);
-
-    // nothing to draw
-    if (text == NULL || byteLength == 0/* || fRC->isEmpty()*/) {
-        return;
-    }
-
-    this->init(paint, skPaint);
-
-    if (NULL == fDrawTarget) {
-        return;
-    }
-
-    SkDrawCacheProc glyphCacheProc = fSkPaint.getDrawCacheProc();
-
-    SkAutoGlyphCache    autoCache(fSkPaint, &fDeviceProperties, &fContext->getMatrix());
-    SkGlyphCache*       cache = autoCache.getCache();
-    GrFontScaler*       fontScaler = GetGrFontScaler(cache);
-    
-    if (NULL == fStrike) {
-        fStrike = fContext->getFontCache()->getStrike(fontScaler, false);
-    }
-
-    // store original matrix before we reset, so we can use it to transform positions
-    SkMatrix ctm = fContext->getMatrix();
-    GrContext::AutoMatrix  autoMatrix;
-    autoMatrix.setIdentity(fContext, &fPaint);
-
-    // allocate vertices
-    SkASSERT(NULL == fVertices);
-    bool useColorVerts = kA8_GrMaskFormat == fStrike->getMaskFormat();
-    if (useColorVerts) {
-        fDrawTarget->drawState()->setVertexAttribs<gTextVertexWithColorAttribs>(
-                                                    SK_ARRAY_COUNT(gTextVertexWithColorAttribs));
-    } else {
-        fDrawTarget->drawState()->setVertexAttribs<gTextVertexAttribs>(
-                                                    SK_ARRAY_COUNT(gTextVertexAttribs));
-    }
-    int numGlyphs = fSkPaint.textToGlyphs(text, byteLength, NULL);
-    bool success = fDrawTarget->reserveVertexAndIndexSpace(4*numGlyphs,
-                                                           0,
-                                                           &fVertices,
-                                                           NULL);
-    GrAlwaysAssert(success);
-
-    const char*        stop = text + byteLength;
-    SkTextAlignProc    alignProc(fSkPaint.getTextAlign());
-    SkTextMapStateProc tmsProc(ctm, constY, scalarsPerPosition);
-    SkFixed halfSampleX = 0, halfSampleY = 0;
-
-    if (cache->isSubpixel()) {
-        // maybe we should skip the rounding if linearText is set
-        SkAxisAlignment baseline = SkComputeAxisAlignmentForHText(ctm);
-
-        SkFixed fxMask = ~0;
-        SkFixed fyMask = ~0;
-        if (kX_SkAxisAlignment == baseline) {
-            fyMask = 0;
-#ifndef SK_IGNORE_SUBPIXEL_AXIS_ALIGN_FIX
-            halfSampleY = SK_FixedHalf;
-#endif
-        } else if (kY_SkAxisAlignment == baseline) {
-            fxMask = 0;
-#ifndef SK_IGNORE_SUBPIXEL_AXIS_ALIGN_FIX
-            halfSampleX = SK_FixedHalf;
-#endif
-        }
-
-        if (SkPaint::kLeft_Align == fSkPaint.getTextAlign()) {
-            while (text < stop) {
-                SkPoint tmsLoc;
-                tmsProc(pos, &tmsLoc);
-                SkFixed fx = SkScalarToFixed(tmsLoc.fX) + halfSampleX;
-                SkFixed fy = SkScalarToFixed(tmsLoc.fY) + halfSampleY;
-
-                const SkGlyph& glyph = glyphCacheProc(cache, &text,
-                                                      fx & fxMask, fy & fyMask);
-
-                if (glyph.fWidth) {
-                    this->drawPackedGlyph(GrGlyph::Pack(glyph.getGlyphID(),
-                                                        glyph.getSubXFixed(),
-                                                        glyph.getSubYFixed()),
-                                          SkFixedFloorToFixed(fx),
-                                          SkFixedFloorToFixed(fy),
-                                          fontScaler);
-                }
-                pos += scalarsPerPosition;
-            }
-        } else {
-            while (text < stop) {
-                const char* currentText = text;
-                const SkGlyph& metricGlyph = glyphCacheProc(cache, &text, 0, 0);
-
-                if (metricGlyph.fWidth) {
-                    SkDEBUGCODE(SkFixed prevAdvX = metricGlyph.fAdvanceX;)
-                    SkDEBUGCODE(SkFixed prevAdvY = metricGlyph.fAdvanceY;)
-                    SkPoint tmsLoc;
-                    tmsProc(pos, &tmsLoc);
-                    SkIPoint fixedLoc;
-                    alignProc(tmsLoc, metricGlyph, &fixedLoc);
-
-                    SkFixed fx = fixedLoc.fX + halfSampleX;
-                    SkFixed fy = fixedLoc.fY + halfSampleY;
-
-                    // have to call again, now that we've been "aligned"
-                    const SkGlyph& glyph = glyphCacheProc(cache, &currentText,
-                                                          fx & fxMask, fy & fyMask);
-                    // the assumption is that the metrics haven't changed
-                    SkASSERT(prevAdvX == glyph.fAdvanceX);
-                    SkASSERT(prevAdvY == glyph.fAdvanceY);
-                    SkASSERT(glyph.fWidth);
-
-                    this->drawPackedGlyph(GrGlyph::Pack(glyph.getGlyphID(),
-                                                        glyph.getSubXFixed(),
-                                                        glyph.getSubYFixed()),
-                                          SkFixedFloorToFixed(fx),
-                                          SkFixedFloorToFixed(fy),
-                                          fontScaler);
-                }
-                pos += scalarsPerPosition;
-            }
-        }
-    } else {    // not subpixel
-
-        if (SkPaint::kLeft_Align == fSkPaint.getTextAlign()) {
-            while (text < stop) {
-                // the last 2 parameters are ignored
-                const SkGlyph& glyph = glyphCacheProc(cache, &text, 0, 0);
-
-                if (glyph.fWidth) {
-                    SkPoint tmsLoc;
-                    tmsProc(pos, &tmsLoc);
-
-                    SkFixed fx = SkScalarToFixed(tmsLoc.fX) + SK_FixedHalf; //halfSampleX;
-                    SkFixed fy = SkScalarToFixed(tmsLoc.fY) + SK_FixedHalf; //halfSampleY;
-                    this->drawPackedGlyph(GrGlyph::Pack(glyph.getGlyphID(),
-                                                        glyph.getSubXFixed(),
-                                                        glyph.getSubYFixed()),
-                                          SkFixedFloorToFixed(fx),
-                                          SkFixedFloorToFixed(fy),
-                                          fontScaler);
-                }
-                pos += scalarsPerPosition;
-            }
-        } else {
-            while (text < stop) {
-                // the last 2 parameters are ignored
-                const SkGlyph& glyph = glyphCacheProc(cache, &text, 0, 0);
-
-                if (glyph.fWidth) {
-                    SkPoint tmsLoc;
-                    tmsProc(pos, &tmsLoc);
-
-                    SkIPoint fixedLoc;
-                    alignProc(tmsLoc, glyph, &fixedLoc);
-
-                    SkFixed fx = fixedLoc.fX + SK_FixedHalf; //halfSampleX;
-                    SkFixed fy = fixedLoc.fY + SK_FixedHalf; //halfSampleY;
-                    this->drawPackedGlyph(GrGlyph::Pack(glyph.getGlyphID(),
-                                                        glyph.getSubXFixed(),
-                                                        glyph.getSubYFixed()),
-                                          SkFixedFloorToFixed(fx),
-                                          SkFixedFloorToFixed(fy),
-                                          fontScaler);
-                }
-                pos += scalarsPerPosition;
-            }
-        }
-    }
-
-    this->finish();
-}
-
-void GrBitmapTextContext::drawPackedGlyph(GrGlyph::PackedID packed,
-                                          SkFixed vx, SkFixed vy,
-                                          GrFontScaler* scaler) {
-    GrGlyph* glyph = fStrike->getGlyph(packed, scaler);
-    if (NULL == glyph || glyph->fBounds.isEmpty()) {
-        return;
-    }
-
-    vx += SkIntToFixed(glyph->fBounds.fLeft);
-    vy += SkIntToFixed(glyph->fBounds.fTop);
-
-    // keep them as ints until we've done the clip-test
-    SkFixed width = glyph->fBounds.width();
-    SkFixed height = glyph->fBounds.height();
-
-    // check if we clipped out
-    if (true || NULL == glyph->fPlot) {
-        int x = vx >> 16;
-        int y = vy >> 16;
-        if (fClipRect.quickReject(x, y, x + width, y + height)) {
-//            SkCLZ(3);    // so we can set a break-point in the debugger
-            return;
-        }
-    }
-
-    if (NULL == glyph->fPlot) {
-        if (fStrike->addGlyphToAtlas(glyph, scaler)) {
-            goto HAS_ATLAS;
-        }
-
-        // try to clear out an unused plot before we flush
-        if (fContext->getFontCache()->freeUnusedPlot(fStrike) &&
-            fStrike->addGlyphToAtlas(glyph, scaler)) {
-            goto HAS_ATLAS;
-        }
-
-        if (c_DumpFontCache) {
-#ifdef SK_DEVELOPER
-            fContext->getFontCache()->dump();
-#endif
-        }
-
-        // flush any accumulated draws to allow us to free up a plot
-        this->flushGlyphs();
-        fContext->flush();
-
-        // we should have an unused plot now
-        if (fContext->getFontCache()->freeUnusedPlot(fStrike) &&
-            fStrike->addGlyphToAtlas(glyph, scaler)) {
-            goto HAS_ATLAS;
-        }
-
-        if (NULL == glyph->fPath) {
-            SkPath* path = SkNEW(SkPath);
-            if (!scaler->getGlyphPath(glyph->glyphID(), path)) {
-                // flag the glyph as being dead?
-                delete path;
-                return;
-            }
-            glyph->fPath = path;
-        }
-
-        GrContext::AutoMatrix am;
-        SkMatrix translate;
-        translate.setTranslate(SkFixedToScalar(vx - SkIntToFixed(glyph->fBounds.fLeft)),
-                               SkFixedToScalar(vy - SkIntToFixed(glyph->fBounds.fTop)));
-        GrPaint tmpPaint(fPaint);
-        am.setPreConcat(fContext, translate, &tmpPaint);
-        GrStrokeInfo strokeInfo(SkStrokeRec::kFill_InitStyle);
-        fContext->drawPath(tmpPaint, *glyph->fPath, strokeInfo);
-        return;
-    }
-
-HAS_ATLAS:
-    SkASSERT(glyph->fPlot);
-    GrDrawTarget::DrawToken drawToken = fDrawTarget->getCurrentDrawToken();
-    glyph->fPlot->setDrawToken(drawToken);
-
-    // now promote them to fixed (TODO: Rethink using fixed pt).
-    width = SkIntToFixed(width);
-    height = SkIntToFixed(height);
-
-    GrTexture* texture = glyph->fPlot->texture();
-    SkASSERT(texture);
-
-    SkFixed tx = SkIntToFixed(glyph->fAtlasLocation.fX);
-    SkFixed ty = SkIntToFixed(glyph->fAtlasLocation.fY);
-
-    SkRect r;
-    r.fLeft = SkFixedToFloat(vx);
-    r.fTop = SkFixedToFloat(vy);
-    r.fRight = SkFixedToFloat(vx + width);
-    r.fBottom = SkFixedToFloat(vy + height);
-
-    fVertexBounds.growToInclude(r);
-
-    bool useColorVerts = kA8_GrMaskFormat == fStrike->getMaskFormat();
-    size_t vertSize = useColorVerts ? (2 * sizeof(SkPoint) + sizeof(GrColor)) :
-                                      (2 * sizeof(SkPoint));
-
-    SkASSERT(vertSize == fDrawTarget->getDrawState().getVertexSize());
-
-    SkPoint* positions = reinterpret_cast<SkPoint*>(
-        reinterpret_cast<intptr_t>(fVertices) + vertSize * fCurrVertex);
-    positions->setRectFan(r.fLeft, r.fTop, r.fRight, r.fBottom, vertSize);
-
-    // The texture coords are last in both the with and without color vertex layouts.
-    SkPoint* textureCoords = reinterpret_cast<SkPoint*>(
-            reinterpret_cast<intptr_t>(positions) + vertSize  - sizeof(SkPoint));
-    textureCoords->setRectFan(SkFixedToFloat(texture->normalizeFixedX(tx)),
-                              SkFixedToFloat(texture->normalizeFixedY(ty)),
-                              SkFixedToFloat(texture->normalizeFixedX(tx + width)),
-                              SkFixedToFloat(texture->normalizeFixedY(ty + height)),
-                              vertSize);
-    if (useColorVerts) {
-        // color comes after position.
-        GrColor* colors = reinterpret_cast<GrColor*>(positions + 1);
-        for (int i = 0; i < 4; ++i) {
-           *colors = fPaint.getColor();
-           colors = reinterpret_cast<GrColor*>(reinterpret_cast<intptr_t>(colors) + vertSize);
-        }
-    }
-    fCurrVertex += 4;
-}
diff --git a/gfx/skia/skia/src/gpu/GrBitmapTextContext.h b/gfx/skia/skia/src/gpu/GrBitmapTextContext.h
deleted file mode 100644
index 84b7f3771cc6..000000000000
--- a/gfx/skia/skia/src/gpu/GrBitmapTextContext.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrBitmapTextContext_DEFINED
-#define GrBitmapTextContext_DEFINED
-
-#include "GrTextContext.h"
-
-class GrTextStrike;
-
-/*
- * This class implements GrTextContext using standard bitmap fonts
- */
-class GrBitmapTextContext : public GrTextContext {
-public:
-    GrBitmapTextContext(GrContext*, const SkDeviceProperties&);
-    virtual ~GrBitmapTextContext();
-
-    virtual void drawText(const GrPaint&, const SkPaint&, const char text[], size_t byteLength,
-                          SkScalar x, SkScalar y) SK_OVERRIDE;
-    virtual void drawPosText(const GrPaint&, const SkPaint&,
-                             const char text[], size_t byteLength,
-                             const SkScalar pos[], SkScalar constY,
-                             int scalarsPerPosition) SK_OVERRIDE;
-
-    virtual bool canDraw(const SkPaint& paint) SK_OVERRIDE;
-
-private:
-    GrTextStrike*          fStrike;
-
-    void init(const GrPaint&, const SkPaint&);
-    void drawPackedGlyph(GrGlyph::PackedID, SkFixed left, SkFixed top, GrFontScaler*);
-    void flushGlyphs();                 // automatically called by destructor
-    void finish();
-
-    enum {
-        kMinRequestedGlyphs      = 1,
-        kDefaultRequestedGlyphs  = 64,
-        kMinRequestedVerts       = kMinRequestedGlyphs * 4,
-        kDefaultRequestedVerts   = kDefaultRequestedGlyphs * 4,
-    };
-
-    void*                       fVertices;
-    SkAutoTUnref<GrEffect>      fCachedEffect;
-    // Used to check whether fCachedEffect is still valid.
-    uint32_t                    fEffectTextureUniqueID;
-    int                         fCurrVertex;
-    SkRect                      fVertexBounds;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/GrBlend.cpp b/gfx/skia/skia/src/gpu/GrBlend.cpp
index c8631c42ef0d..72a89d838ddb 100644
--- a/gfx/skia/skia/src/gpu/GrBlend.cpp
+++ b/gfx/skia/skia/src/gpu/GrBlend.cpp
@@ -1,154 +1,124 @@
-
 /*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
+* Copyright 2015 Google Inc.
+*
+* Use of this source code is governed by a BSD-style license that can be
+* found in the LICENSE file.
+*/
 
 #include "GrBlend.h"
 
-static inline GrBlendCoeff swap_coeff_src_dst(GrBlendCoeff coeff) {
+/**
+ * MaskedColor is used to evaluate the color and valid color component flags through the
+ * blending equation. Could possibly extend this to be used more broadly.
+ */
+class MaskedColor {
+public:
+    MaskedColor(GrColor color, GrColorComponentFlags flags)
+        : fColor(color)
+        , fFlags(flags) {}
+
+    MaskedColor() {}
+
+    void set(GrColor color, GrColorComponentFlags flags) {
+        fColor = color;
+        fFlags = flags;
+    }
+
+    static MaskedColor Invert(const MaskedColor& in) {
+        return MaskedColor(GrInvertColor(in.fColor), in.fFlags);
+    }
+
+    static MaskedColor ExtractAlpha(const MaskedColor& in) {
+        GrColorComponentFlags flags = (in.fFlags & kA_GrColorComponentFlag) ?
+            kRGBA_GrColorComponentFlags : kNone_GrColorComponentFlags;
+        return MaskedColor(GrColorPackA4(GrColorUnpackA(in.fColor)), flags);
+    }
+
+    static MaskedColor ExtractInverseAlpha(const MaskedColor& in) {
+        GrColorComponentFlags flags = (in.fFlags & kA_GrColorComponentFlag) ?
+            kRGBA_GrColorComponentFlags : kNone_GrColorComponentFlags;
+        return MaskedColor(GrColorPackA4(0xFF - GrColorUnpackA(in.fColor)), flags);
+    }
+
+    static MaskedColor Mul(const MaskedColor& a, const MaskedColor& b) {
+        GrColorComponentFlags outFlags = (a.fFlags & b.fFlags) | a.componentsWithValue(0) |
+                                         b.componentsWithValue(0);
+        return MaskedColor(GrColorMul(a.fColor, b.fColor), outFlags);
+    }
+
+    static MaskedColor SatAdd(const MaskedColor& a, const MaskedColor& b) {
+        GrColorComponentFlags outFlags = (a.fFlags & b.fFlags) | a.componentsWithValue(0xFF) |
+                                         b.componentsWithValue(0xFF);
+        return MaskedColor(GrColorSatAdd(a.fColor, b.fColor), outFlags);
+    }
+
+    GrColor color() const { return fColor; }
+
+    GrColorComponentFlags validFlags () const { return fFlags; }
+
+private:
+    GrColorComponentFlags componentsWithValue(unsigned value) const {
+        GrColorComponentFlags flags = kNone_GrColorComponentFlags;
+        if ((kR_GrColorComponentFlag & fFlags) && value == GrColorUnpackR(fColor)) {
+            flags |= kR_GrColorComponentFlag;
+        }
+        if ((kG_GrColorComponentFlag & fFlags) && value == GrColorUnpackG(fColor)) {
+            flags |= kG_GrColorComponentFlag;
+        }
+        if ((kB_GrColorComponentFlag & fFlags) && value == GrColorUnpackB(fColor)) {
+            flags |= kB_GrColorComponentFlag;
+        }
+        if ((kA_GrColorComponentFlag & fFlags) && value == GrColorUnpackA(fColor)) {
+            flags |= kA_GrColorComponentFlag;
+        }
+        return flags;
+    }
+
+    GrColor                 fColor;
+    GrColorComponentFlags   fFlags;
+};
+
+static MaskedColor get_term(GrBlendCoeff coeff, const MaskedColor& src, const MaskedColor& dst,
+                            const MaskedColor& value) {
     switch (coeff) {
+        case kZero_GrBlendCoeff:
+            return MaskedColor(0, kRGBA_GrColorComponentFlags);
+        case kOne_GrBlendCoeff:
+            return value;
         case kDC_GrBlendCoeff:
-            return kSC_GrBlendCoeff;
+            return MaskedColor::Mul(dst, value);
         case kIDC_GrBlendCoeff:
-            return kISC_GrBlendCoeff;
+            return MaskedColor::Mul(MaskedColor::Invert(dst), value);
         case kDA_GrBlendCoeff:
-            return kSA_GrBlendCoeff;
+            return MaskedColor::Mul(MaskedColor::ExtractAlpha(dst), value);
         case kIDA_GrBlendCoeff:
-            return kISA_GrBlendCoeff;
+            return MaskedColor::Mul(MaskedColor::ExtractInverseAlpha(dst), value);
         case kSC_GrBlendCoeff:
-            return kDC_GrBlendCoeff;
+            return MaskedColor::Mul(src, value);
         case kISC_GrBlendCoeff:
-            return kIDC_GrBlendCoeff;
+            return MaskedColor::Mul(MaskedColor::Invert(src), value);
         case kSA_GrBlendCoeff:
-            return kDA_GrBlendCoeff;
+            return MaskedColor::Mul(MaskedColor::ExtractAlpha(src), value);
         case kISA_GrBlendCoeff:
-            return kIDA_GrBlendCoeff;
+            return MaskedColor::Mul(MaskedColor::ExtractInverseAlpha(src), value);
         default:
-            return coeff;
+            SkFAIL("Illegal coefficient");
+            return MaskedColor();
     }
 }
 
-static inline unsigned saturated_add(unsigned a, unsigned b) {
-    SkASSERT(a <= 255);
-    SkASSERT(b <= 255);
-    unsigned sum = a + b;
-    if (sum > 255) {
-        sum = 255;
-    }
-    return sum;
-}
-
-static GrColor add_colors(GrColor src, GrColor dst) {
-    unsigned r = saturated_add(GrColorUnpackR(src), GrColorUnpackR(dst));
-    unsigned g = saturated_add(GrColorUnpackG(src), GrColorUnpackG(dst));
-    unsigned b = saturated_add(GrColorUnpackB(src), GrColorUnpackB(dst));
-    unsigned a = saturated_add(GrColorUnpackA(src), GrColorUnpackA(dst));
-    return GrColorPackRGBA(r, g, b, a);
-}
-
-static inline bool valid_color(uint32_t compFlags) {
-     return (kRGBA_GrColorComponentFlags & compFlags) == kRGBA_GrColorComponentFlags;
-}
-
-static GrColor simplify_blend_term(GrBlendCoeff* srcCoeff,
-                                   GrColor srcColor, uint32_t srcCompFlags,
-                                   GrColor dstColor, uint32_t dstCompFlags,
-                                   GrColor constantColor) {
-
-    SkASSERT(!GrBlendCoeffRefsSrc(*srcCoeff));
-    SkASSERT(NULL != srcCoeff);
-
-    // Check whether srcCoeff can be reduced to kOne or kZero based on known color inputs.
-    // We could pick out the coeff r,g,b,a values here and use them to compute the blend term color,
-    // if possible, below but that is not implemented now.
-    switch (*srcCoeff) {
-        case kIDC_GrBlendCoeff:
-            dstColor = ~dstColor; // fallthrough
-        case kDC_GrBlendCoeff:
-            if (valid_color(dstCompFlags)) {
-                if (0xffffffff == dstColor) {
-                    *srcCoeff = kOne_GrBlendCoeff;
-                } else if (0 == dstColor) {
-                    *srcCoeff = kZero_GrBlendCoeff;
-                }
-            }
-            break;
-
-        case kIDA_GrBlendCoeff:
-            dstColor = ~dstColor; // fallthrough
-        case kDA_GrBlendCoeff:
-            if (kA_GrColorComponentFlag & dstCompFlags) {
-                if (0xff == GrColorUnpackA(dstColor)) {
-                    *srcCoeff = kOne_GrBlendCoeff;
-                } else if (0 == GrColorUnpackA(dstColor)) {
-                    *srcCoeff = kZero_GrBlendCoeff;
-                }
-            }
-            break;
-
-        case kIConstC_GrBlendCoeff:
-            constantColor = ~constantColor; // fallthrough
-        case kConstC_GrBlendCoeff:
-            if (0xffffffff == constantColor) {
-                *srcCoeff = kOne_GrBlendCoeff;
-            } else if (0 == constantColor) {
-                *srcCoeff = kZero_GrBlendCoeff;
-            }
-            break;
-
-        case kIConstA_GrBlendCoeff:
-            constantColor = ~constantColor; // fallthrough
-        case kConstA_GrBlendCoeff:
-            if (0xff == GrColorUnpackA(constantColor)) {
-                *srcCoeff = kOne_GrBlendCoeff;
-            } else if (0 == GrColorUnpackA(constantColor)) {
-                *srcCoeff = kZero_GrBlendCoeff;
-            }
-            break;
-
-        default:
-            break;
-    }
-    // We may have invalidated these above and shouldn't read them again.
-    SkDEBUGCODE(dstColor = constantColor = GrColor_ILLEGAL;)
-
-    if (kZero_GrBlendCoeff == *srcCoeff || (valid_color(srcCompFlags) && 0 == srcColor)) {
-        *srcCoeff = kZero_GrBlendCoeff;
-        return 0;
-    }
-
-    if (kOne_GrBlendCoeff == *srcCoeff && valid_color(srcCompFlags)) {
-        return srcColor;
-    } else {
-        return GrColor_ILLEGAL;
-    }
-}
-
-GrColor GrSimplifyBlend(GrBlendCoeff* srcCoeff,
-                        GrBlendCoeff* dstCoeff,
-                        GrColor srcColor, uint32_t srcCompFlags,
-                        GrColor dstColor, uint32_t dstCompFlags,
-                        GrColor constantColor) {
-    GrColor srcTermColor = simplify_blend_term(srcCoeff,
-                                               srcColor, srcCompFlags,
-                                               dstColor, dstCompFlags,
-                                               constantColor);
-
-    // We call the same function to simplify the dst blend coeff. We trick it out by swapping the
-    // src and dst.
-    GrBlendCoeff spoofedCoeff = swap_coeff_src_dst(*dstCoeff);
-    GrColor dstTermColor = simplify_blend_term(&spoofedCoeff,
-                                               dstColor, dstCompFlags,
-                                               srcColor, srcCompFlags,
-                                               constantColor);
-    *dstCoeff = swap_coeff_src_dst(spoofedCoeff);
-
-    if (GrColor_ILLEGAL != srcTermColor && GrColor_ILLEGAL != dstTermColor) {
-        return add_colors(srcTermColor, dstTermColor);
-    } else {
-        return GrColor_ILLEGAL;
-    }
+void GrGetCoeffBlendKnownComponents(GrBlendCoeff srcCoeff, GrBlendCoeff dstCoeff,
+                                    GrColor srcColor, GrColorComponentFlags srcColorFlags,
+                                    GrColor dstColor, GrColorComponentFlags dstColorFlags,
+                                    GrColor* outColor,
+                                    GrColorComponentFlags* outFlags) {
+    MaskedColor src(srcColor, srcColorFlags);
+    MaskedColor dst(dstColor, dstColorFlags);
+
+    MaskedColor srcTerm = get_term(srcCoeff, src, dst, src);
+    MaskedColor dstTerm = get_term(dstCoeff, src, dst, dst);
+
+    MaskedColor output = MaskedColor::SatAdd(srcTerm, dstTerm);
+    *outColor = output.color();
+    *outFlags = output.validFlags();
 }
diff --git a/gfx/skia/skia/src/gpu/GrBlend.h b/gfx/skia/skia/src/gpu/GrBlend.h
deleted file mode 100644
index e70d9457772c..000000000000
--- a/gfx/skia/skia/src/gpu/GrBlend.h
+++ /dev/null
@@ -1,45 +0,0 @@
-
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrTypes.h"
-#include "GrColor.h"
-
-#ifndef GrBlend_DEFINED
-#define GrBlend_DEFINED
-
-static inline bool GrBlendCoeffRefsSrc(GrBlendCoeff coeff) {
-    switch (coeff) {
-        case kSC_GrBlendCoeff:
-        case kISC_GrBlendCoeff:
-        case kSA_GrBlendCoeff:
-        case kISA_GrBlendCoeff:
-            return true;
-        default:
-            return false;
-    }
-}
-
-static inline bool GrBlendCoeffRefsDst(GrBlendCoeff coeff) {
-    switch (coeff) {
-        case kDC_GrBlendCoeff:
-        case kIDC_GrBlendCoeff:
-        case kDA_GrBlendCoeff:
-        case kIDA_GrBlendCoeff:
-            return true;
-        default:
-            return false;
-    }
-}
-
-GrColor GrSimplifyBlend(GrBlendCoeff* srcCoeff,
-                        GrBlendCoeff* dstCoeff,
-                        GrColor srcColor, uint32_t srcCompFlags,
-                        GrColor dstColor, uint32_t dstCompFlags,
-                        GrColor constantColor);
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/GrBlurUtils.cpp b/gfx/skia/skia/src/gpu/GrBlurUtils.cpp
new file mode 100644
index 000000000000..9ca445b5297a
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrBlurUtils.cpp
@@ -0,0 +1,347 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrBlurUtils.h"
+#include "GrDrawContext.h"
+#include "GrCaps.h"
+#include "GrContext.h"
+#include "effects/GrSimpleTextureEffect.h"
+#include "GrStrokeInfo.h"
+#include "GrTexture.h"
+#include "GrTextureProvider.h"
+#include "SkDraw.h"
+#include "SkGrPriv.h"
+#include "SkMaskFilter.h"
+#include "SkPaint.h"
+
+static bool clip_bounds_quick_reject(const SkIRect& clipBounds, const SkIRect& rect) {
+    return clipBounds.isEmpty() || rect.isEmpty() || !SkIRect::Intersects(clipBounds, rect);
+}
+
+// Draw a mask using the supplied paint. Since the coverage/geometry
+// is already burnt into the mask this boils down to a rect draw.
+// Return true if the mask was successfully drawn.
+static bool draw_mask(GrDrawContext* drawContext,
+                      const GrClip& clip,
+                      const SkMatrix& viewMatrix,
+                      const SkRect& maskRect,
+                      GrPaint* grp,
+                      GrTexture* mask) {
+    SkMatrix matrix;
+    matrix.setTranslate(-maskRect.fLeft, -maskRect.fTop);
+    matrix.postIDiv(mask->width(), mask->height());
+
+    grp->addCoverageFragmentProcessor(GrSimpleTextureEffect::Create(mask, matrix,
+                                                                    kDevice_GrCoordSet))->unref();
+
+    SkMatrix inverse;
+    if (!viewMatrix.invert(&inverse)) {
+        return false;
+    }
+    drawContext->fillRectWithLocalMatrix(clip, *grp, SkMatrix::I(), maskRect, inverse);
+    return true;
+}
+
+static bool sw_draw_with_mask_filter(GrDrawContext* drawContext,
+                                     GrTextureProvider* textureProvider,
+                                     const GrClip& clipData,
+                                     const SkMatrix& viewMatrix,
+                                     const SkPath& devPath,
+                                     const SkMaskFilter* filter,
+                                     const SkIRect& clipBounds,
+                                     GrPaint* grp,
+                                     SkPaint::Style style) {
+    SkMask  srcM, dstM;
+
+    if (!SkDraw::DrawToMask(devPath, &clipBounds, filter, &viewMatrix, &srcM,
+                            SkMask::kComputeBoundsAndRenderImage_CreateMode, style)) {
+        return false;
+    }
+    SkAutoMaskFreeImage autoSrc(srcM.fImage);
+
+    if (!filter->filterMask(&dstM, srcM, viewMatrix, nullptr)) {
+        return false;
+    }
+    // this will free-up dstM when we're done (allocated in filterMask())
+    SkAutoMaskFreeImage autoDst(dstM.fImage);
+
+    if (clip_bounds_quick_reject(clipBounds, dstM.fBounds)) {
+        return false;
+    }
+
+    // we now have a device-aligned 8bit mask in dstM, ready to be drawn using
+    // the current clip (and identity matrix) and GrPaint settings
+    GrSurfaceDesc desc;
+    desc.fWidth = dstM.fBounds.width();
+    desc.fHeight = dstM.fBounds.height();
+    desc.fConfig = kAlpha_8_GrPixelConfig;
+
+    SkAutoTUnref<GrTexture> texture(textureProvider->createApproxTexture(desc));
+    if (!texture) {
+        return false;
+    }
+    texture->writePixels(0, 0, desc.fWidth, desc.fHeight, desc.fConfig,
+                               dstM.fImage, dstM.fRowBytes);
+
+    SkRect maskRect = SkRect::Make(dstM.fBounds);
+
+    return draw_mask(drawContext, clipData, viewMatrix, maskRect, grp, texture);
+}
+
+// Create a mask of 'devPath' and place the result in 'mask'.
+static GrTexture* create_mask_GPU(GrContext* context,
+                                  SkRect* maskRect,
+                                  const SkPath& devPath,
+                                  const GrStrokeInfo& strokeInfo,
+                                  bool doAA,
+                                  int sampleCnt) {
+    // This mask will ultimately be drawn as a non-AA rect (see draw_mask). 
+    // Non-AA rects have a bad habit of snapping arbitrarily. Integerize here 
+    // so the mask draws in a reproducible manner.
+    *maskRect = SkRect::Make(maskRect->roundOut());
+
+    GrSurfaceDesc desc;
+    desc.fFlags = kRenderTarget_GrSurfaceFlag;
+    desc.fWidth = SkScalarCeilToInt(maskRect->width());
+    desc.fHeight = SkScalarCeilToInt(maskRect->height());
+    desc.fSampleCnt = doAA ? sampleCnt : 0;
+    // We actually only need A8, but it often isn't supported as a
+    // render target so default to RGBA_8888
+    desc.fConfig = kRGBA_8888_GrPixelConfig;
+
+    if (context->caps()->isConfigRenderable(kAlpha_8_GrPixelConfig, desc.fSampleCnt > 0)) {
+        desc.fConfig = kAlpha_8_GrPixelConfig;
+    }
+
+    GrTexture* mask = context->textureProvider()->createApproxTexture(desc);
+    if (nullptr == mask) {
+        return nullptr;
+    }
+
+    SkRect clipRect = SkRect::MakeWH(maskRect->width(), maskRect->height());
+
+    SkAutoTUnref<GrDrawContext> drawContext(context->drawContext(mask->asRenderTarget()));
+    if (!drawContext) {
+        return nullptr;
+    }
+
+    drawContext->clear(nullptr, 0x0, true);
+
+    GrPaint tempPaint;
+    tempPaint.setAntiAlias(doAA);
+    tempPaint.setCoverageSetOpXPFactory(SkRegion::kReplace_Op);
+
+    // setup new clip
+    GrClip clip(clipRect);
+
+    // Draw the mask into maskTexture with the path's integerized top-left at
+    // the origin using tempPaint.
+    SkMatrix translate;
+    translate.setTranslate(-maskRect->fLeft, -maskRect->fTop);
+    drawContext->drawPath(clip, tempPaint, translate, devPath, strokeInfo);
+    return mask;
+}
+
+static void draw_path_with_mask_filter(GrContext* context,
+                                       GrDrawContext* drawContext,
+                                       const GrClip& clip,
+                                       GrPaint* paint,
+                                       const SkMatrix& viewMatrix,
+                                       const SkMaskFilter* maskFilter,
+                                       const SkPathEffect* pathEffect,
+                                       const GrStrokeInfo& origStrokeInfo,
+                                       SkPath* pathPtr,
+                                       bool pathIsMutable) {
+    SkASSERT(maskFilter);
+
+    SkIRect clipBounds;
+    clip.getConservativeBounds(drawContext->width(), drawContext->height(), &clipBounds);
+    SkTLazy<SkPath> tmpPath;
+    GrStrokeInfo strokeInfo(origStrokeInfo);
+
+    static const SkRect* cullRect = nullptr;  // TODO: what is our bounds?
+
+    SkASSERT(strokeInfo.isDashed() || !pathEffect);
+
+    if (!strokeInfo.isHairlineStyle()) {
+        SkPath* strokedPath = pathIsMutable ? pathPtr : tmpPath.init();
+        if (strokeInfo.isDashed()) {
+            if (pathEffect->filterPath(strokedPath, *pathPtr, &strokeInfo, cullRect)) {
+                pathPtr = strokedPath;
+                pathPtr->setIsVolatile(true);
+                pathIsMutable = true;
+            }
+            strokeInfo.removeDash();
+        }
+        if (strokeInfo.applyToPath(strokedPath, *pathPtr)) {
+            // Apply the stroke to the path if there is one
+            pathPtr = strokedPath;
+            pathPtr->setIsVolatile(true);
+            pathIsMutable = true;
+            strokeInfo.setFillStyle();
+        }
+    }
+
+    // avoid possibly allocating a new path in transform if we can
+    SkPath* devPathPtr = pathIsMutable ? pathPtr : tmpPath.init();
+    if (!pathIsMutable) {
+        devPathPtr->setIsVolatile(true);
+    }
+
+    // transform the path into device space
+    pathPtr->transform(viewMatrix, devPathPtr);
+
+    SkRect maskRect;
+    if (maskFilter->canFilterMaskGPU(SkRRect::MakeRect(devPathPtr->getBounds()),
+                                     clipBounds,
+                                     viewMatrix,
+                                     &maskRect)) {
+        SkIRect finalIRect;
+        maskRect.roundOut(&finalIRect);
+        if (clip_bounds_quick_reject(clipBounds, finalIRect)) {
+            // clipped out
+            return;
+        }
+
+        if (maskFilter->directFilterMaskGPU(context->textureProvider(),
+                                            drawContext,
+                                            paint,
+                                            clip,
+                                            viewMatrix,
+                                            strokeInfo,
+                                            *devPathPtr)) {
+            // the mask filter was able to draw itself directly, so there's nothing
+            // left to do.
+            return;
+        }
+
+        SkAutoTUnref<GrTexture> mask(create_mask_GPU(context,
+                                                     &maskRect,
+                                                     *devPathPtr,
+                                                     strokeInfo,
+                                                     paint->isAntiAlias(),
+                                                     drawContext->numColorSamples()));
+        if (mask) {
+            GrTexture* filtered;
+
+            if (maskFilter->filterMaskGPU(mask, viewMatrix, maskRect, &filtered, true)) {
+                // filterMaskGPU gives us ownership of a ref to the result
+                SkAutoTUnref<GrTexture> atu(filtered);
+                if (draw_mask(drawContext, clip, viewMatrix, maskRect, paint, filtered)) {
+                    // This path is completely drawn
+                    return;
+                }
+            }
+        }
+    }
+
+    // draw the mask on the CPU - this is a fallthrough path in case the
+    // GPU path fails
+    SkPaint::Style style = strokeInfo.isHairlineStyle() ? SkPaint::kStroke_Style :
+                                                          SkPaint::kFill_Style;
+    sw_draw_with_mask_filter(drawContext, context->textureProvider(),
+                             clip, viewMatrix, *devPathPtr,
+                             maskFilter, clipBounds, paint, style);
+}
+
+void GrBlurUtils::drawPathWithMaskFilter(GrContext* context,
+                                         GrDrawContext* drawContext,
+                                         const GrClip& clip,
+                                         const SkPath& origPath,
+                                         GrPaint* paint,
+                                         const SkMatrix& viewMatrix,
+                                         const SkMaskFilter* mf,
+                                         const SkPathEffect* pathEffect,
+                                         const GrStrokeInfo& origStrokeInfo,
+                                         bool pathIsMutable) {
+    SkPath* pathPtr = const_cast<SkPath*>(&origPath);
+
+    SkTLazy<SkPath> tmpPath;
+    GrStrokeInfo strokeInfo(origStrokeInfo);
+
+    if (!strokeInfo.isDashed() && pathEffect && pathEffect->filterPath(tmpPath.init(), *pathPtr,
+                                                                       &strokeInfo, nullptr)) {
+        pathPtr = tmpPath.get();
+        pathPtr->setIsVolatile(true);
+        pathIsMutable = true;
+        pathEffect = nullptr;
+    }
+
+    draw_path_with_mask_filter(context, drawContext, clip, paint, viewMatrix, mf, pathEffect,
+                               strokeInfo, pathPtr, pathIsMutable);
+}
+
+void GrBlurUtils::drawPathWithMaskFilter(GrContext* context, 
+                                         GrDrawContext* drawContext,
+                                         const GrClip& clip,
+                                         const SkPath& origSrcPath,
+                                         const SkPaint& paint,
+                                         const SkMatrix& origViewMatrix,
+                                         const SkMatrix* prePathMatrix,
+                                         const SkIRect& clipBounds,
+                                         bool pathIsMutable) {
+    SkASSERT(!pathIsMutable || origSrcPath.isVolatile());
+
+    GrStrokeInfo strokeInfo(paint);
+
+    // If we have a prematrix, apply it to the path, optimizing for the case
+    // where the original path can in fact be modified in place (even though
+    // its parameter type is const).
+    SkPath* pathPtr = const_cast<SkPath*>(&origSrcPath);
+    SkTLazy<SkPath> tmpPath;
+    SkTLazy<SkPath> effectPath;
+    SkPathEffect* pathEffect = paint.getPathEffect();
+
+    SkMatrix viewMatrix = origViewMatrix;
+
+    if (prePathMatrix) {
+        // stroking, path effects, and blurs are supposed to be applied *after* the prePathMatrix.
+        // The pre-path-matrix also should not affect shading.
+        if (!paint.getMaskFilter() && !pathEffect && !paint.getShader() &&
+            (strokeInfo.isFillStyle() || strokeInfo.isHairlineStyle())) {
+            viewMatrix.preConcat(*prePathMatrix);
+        } else {
+            SkPath* result = pathPtr;
+
+            if (!pathIsMutable) {
+                result = tmpPath.init();
+                result->setIsVolatile(true);
+                pathIsMutable = true;
+            }
+            // should I push prePathMatrix on our MV stack temporarily, instead
+            // of applying it here? See SkDraw.cpp
+            pathPtr->transform(*prePathMatrix, result);
+            pathPtr = result;
+        }
+    }
+    // at this point we're done with prePathMatrix
+    SkDEBUGCODE(prePathMatrix = (const SkMatrix*)0x50FF8001;)
+
+    SkTLazy<SkPath> tmpPath2;
+
+    if (!strokeInfo.isDashed() && pathEffect &&
+        pathEffect->filterPath(tmpPath2.init(), *pathPtr, &strokeInfo, nullptr)) {
+        pathPtr = tmpPath2.get();
+        pathPtr->setIsVolatile(true);
+        pathIsMutable = true;
+        pathEffect = nullptr;
+    }
+
+    GrPaint grPaint;
+    if (!SkPaintToGrPaint(context, paint, viewMatrix, &grPaint)) {
+        return;
+    }
+
+    if (paint.getMaskFilter()) {
+        draw_path_with_mask_filter(context, drawContext, clip, &grPaint, viewMatrix,
+                                   paint.getMaskFilter(), pathEffect, strokeInfo,
+                                   pathPtr, pathIsMutable);
+    } else {
+        drawContext->drawPath(clip, grPaint, viewMatrix, *pathPtr, strokeInfo);
+    }
+}
+
diff --git a/gfx/skia/skia/src/gpu/GrBlurUtils.h b/gfx/skia/skia/src/gpu/GrBlurUtils.h
new file mode 100644
index 000000000000..a22239aa34fb
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrBlurUtils.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrBlurUtils_DEFINED
+#define GrBlurUtils_DEFINED
+
+class GrClip;
+class GrContext;
+class GrDrawContext;
+class GrPaint;
+class GrRenderTarget;
+class GrStrokeInfo;
+struct SkIRect;
+class SkMaskFilter;
+class SkMatrix;
+class SkPaint;
+class SkPath;
+class SkPathEffect;
+
+
+/**
+ *  Blur utilities.
+ */
+namespace GrBlurUtils {
+    /**
+     * Draw a path handling the mask filter if present.
+     */
+    void drawPathWithMaskFilter(GrContext* context,
+                                GrDrawContext* drawContext,
+                                const GrClip& clip,
+                                const SkPath& origSrcPath,
+                                const SkPaint& paint,
+                                const SkMatrix& origViewMatrix,
+                                const SkMatrix* prePathMatrix,
+                                const SkIRect& clipBounds,
+                                bool pathIsMutable);
+
+    /**
+     * Draw a path handling the mask filter. The mask filter is not optional. The path effect is
+     * optional. The GrPaint will be modified after return.
+     */
+    void drawPathWithMaskFilter(GrContext*,
+                                GrDrawContext*,
+                                const GrClip&,
+                                const SkPath& path,
+                                GrPaint*,
+                                const SkMatrix& viewMatrix,
+                                const SkMaskFilter*,
+                                const SkPathEffect*,
+                                const GrStrokeInfo&,
+                                bool pathIsMutable);
+
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrBufferAllocPool.cpp b/gfx/skia/skia/src/gpu/GrBufferAllocPool.cpp
index a197a6719f19..73b70bf86148 100644
--- a/gfx/skia/skia/src/gpu/GrBufferAllocPool.cpp
+++ b/gfx/skia/skia/src/gpu/GrBufferAllocPool.cpp
@@ -8,9 +8,11 @@
 
 
 #include "GrBufferAllocPool.h"
-#include "GrDrawTargetCaps.h"
+#include "GrCaps.h"
+#include "GrContext.h"
 #include "GrGpu.h"
 #include "GrIndexBuffer.h"
+#include "GrResourceProvider.h"
 #include "GrTypes.h"
 #include "GrVertexBuffer.h"
 
@@ -22,8 +24,11 @@
     static void VALIDATE(bool = false) {}
 #endif
 
+static const size_t MIN_VERTEX_BUFFER_SIZE = 1 << 15;
+static const size_t MIN_INDEX_BUFFER_SIZE = 1 << 12;
+
 // page size
-#define GrBufferAllocPool_MIN_BLOCK_SIZE ((size_t)1 << 12)
+#define GrBufferAllocPool_MIN_BLOCK_SIZE ((size_t)1 << 15)
 
 #define UNMAP_BUFFER(block)                                                               \
 do {                                                                                      \
@@ -37,35 +42,21 @@ do {
 
 GrBufferAllocPool::GrBufferAllocPool(GrGpu* gpu,
                                      BufferType bufferType,
-                                     bool frequentResetHint,
-                                     size_t blockSize,
-                                     int preallocBufferCnt) :
-        fBlocks(SkTMax(8, 2*preallocBufferCnt)) {
-
-    SkASSERT(NULL != gpu);
-    fGpu = gpu;
-    fGpu->ref();
-    fGpuIsReffed = true;
+                                     size_t blockSize)
+    : fBlocks(8) {
 
+    fGpu = SkRef(gpu);
+    fCpuData = nullptr;
     fBufferType = bufferType;
-    fFrequentResetHint = frequentResetHint;
-    fBufferPtr = NULL;
+    fBufferPtr = nullptr;
     fMinBlockSize = SkTMax(GrBufferAllocPool_MIN_BLOCK_SIZE, blockSize);
 
     fBytesInUse = 0;
 
-    fPreallocBuffersInUse = 0;
-    fPreallocBufferStartIdx = 0;
-    for (int i = 0; i < preallocBufferCnt; ++i) {
-        GrGeometryBuffer* buffer = this->createBuffer(fMinBlockSize);
-        if (NULL != buffer) {
-            *fPreallocBuffers.append() = buffer;
-        }
-    }
+    fGeometryBufferMapThreshold = gpu->caps()->geometryBufferMapThreshold();
 }
 
-GrBufferAllocPool::~GrBufferAllocPool() {
-    VALIDATE();
+void GrBufferAllocPool::deleteBlocks() {
     if (fBlocks.count()) {
         GrGeometryBuffer* buffer = fBlocks.back().fBuffer;
         if (buffer->isMapped()) {
@@ -73,50 +64,33 @@ GrBufferAllocPool::~GrBufferAllocPool() {
         }
     }
     while (!fBlocks.empty()) {
-        destroyBlock();
+        this->destroyBlock();
     }
-    fPreallocBuffers.unrefAll();
-    releaseGpuRef();
+    SkASSERT(!fBufferPtr);
 }
 
-void GrBufferAllocPool::releaseGpuRef() {
-    if (fGpuIsReffed) {
-        fGpu->unref();
-        fGpuIsReffed = false;
-    }
+GrBufferAllocPool::~GrBufferAllocPool() {
+    VALIDATE();
+    this->deleteBlocks();
+    sk_free(fCpuData);
+    fGpu->unref();
 }
 
 void GrBufferAllocPool::reset() {
     VALIDATE();
     fBytesInUse = 0;
-    if (fBlocks.count()) {
-        GrGeometryBuffer* buffer = fBlocks.back().fBuffer;
-        if (buffer->isMapped()) {
-            UNMAP_BUFFER(fBlocks.back());
-        }
-    }
-    // fPreallocBuffersInUse will be decremented down to zero in the while loop
-    int preallocBuffersInUse = fPreallocBuffersInUse;
-    while (!fBlocks.empty()) {
-        this->destroyBlock();
-    }
-    if (fPreallocBuffers.count()) {
-        // must set this after above loop.
-        fPreallocBufferStartIdx = (fPreallocBufferStartIdx +
-                                   preallocBuffersInUse) %
-                                  fPreallocBuffers.count();
-    }
-    // we may have created a large cpu mirror of a large VB. Reset the size
-    // to match our pre-allocated VBs.
-    fCpuData.reset(fMinBlockSize);
-    SkASSERT(0 == fPreallocBuffersInUse);
+    this->deleteBlocks();
+
+    // we may have created a large cpu mirror of a large VB. Reset the size to match our minimum.
+    this->resetCpuData(fMinBlockSize);
+
     VALIDATE();
 }
 
 void GrBufferAllocPool::unmap() {
     VALIDATE();
 
-    if (NULL != fBufferPtr) {
+    if (fBufferPtr) {
         BufferBlock& block = fBlocks.back();
         if (block.fBuffer->isMapped()) {
             UNMAP_BUFFER(block);
@@ -124,20 +98,21 @@ void GrBufferAllocPool::unmap() {
             size_t flushSize = block.fBuffer->gpuMemorySize() - block.fBytesFree;
             this->flushCpuData(fBlocks.back(), flushSize);
         }
-        fBufferPtr = NULL;
+        fBufferPtr = nullptr;
     }
     VALIDATE();
 }
 
 #ifdef SK_DEBUG
 void GrBufferAllocPool::validate(bool unusedBlockAllowed) const {
-    if (NULL != fBufferPtr) {
+    bool wasDestroyed = false;
+    if (fBufferPtr) {
         SkASSERT(!fBlocks.empty());
         if (fBlocks.back().fBuffer->isMapped()) {
             GrGeometryBuffer* buf = fBlocks.back().fBuffer;
             SkASSERT(buf->mapPtr() == fBufferPtr);
         } else {
-            SkASSERT(fCpuData.get() == fBufferPtr);
+            SkASSERT(fCpuData == fBufferPtr);
         }
     } else {
         SkASSERT(fBlocks.empty() || !fBlocks.back().fBuffer->isMapped());
@@ -146,18 +121,24 @@ void GrBufferAllocPool::validate(bool unusedBlockAllowed) const {
     for (int i = 0; i < fBlocks.count() - 1; ++i) {
         SkASSERT(!fBlocks[i].fBuffer->isMapped());
     }
-    for (int i = 0; i < fBlocks.count(); ++i) {
-        size_t bytes = fBlocks[i].fBuffer->gpuMemorySize() - fBlocks[i].fBytesFree;
-        bytesInUse += bytes;
-        SkASSERT(bytes || unusedBlockAllowed);
+    for (int i = 0; !wasDestroyed && i < fBlocks.count(); ++i) {
+        if (fBlocks[i].fBuffer->wasDestroyed()) {
+            wasDestroyed = true;
+        } else {
+            size_t bytes = fBlocks[i].fBuffer->gpuMemorySize() - fBlocks[i].fBytesFree;
+            bytesInUse += bytes;
+            SkASSERT(bytes || unusedBlockAllowed);
+        }
     }
 
-    SkASSERT(bytesInUse == fBytesInUse);
-    if (unusedBlockAllowed) {
-        SkASSERT((fBytesInUse && !fBlocks.empty()) ||
-                 (!fBytesInUse && (fBlocks.count() < 2)));
-    } else {
-        SkASSERT((0 == fBytesInUse) == fBlocks.empty());
+    if (!wasDestroyed) {
+        SkASSERT(bytesInUse == fBytesInUse);
+        if (unusedBlockAllowed) {
+            SkASSERT((fBytesInUse && !fBlocks.empty()) ||
+                     (!fBytesInUse && (fBlocks.count() < 2)));
+        } else {
+            SkASSERT((0 == fBytesInUse) == fBlocks.empty());
+        }
     }
 }
 #endif
@@ -168,15 +149,15 @@ void* GrBufferAllocPool::makeSpace(size_t size,
                                    size_t* offset) {
     VALIDATE();
 
-    SkASSERT(NULL != buffer);
-    SkASSERT(NULL != offset);
+    SkASSERT(buffer);
+    SkASSERT(offset);
 
-    if (NULL != fBufferPtr) {
+    if (fBufferPtr) {
         BufferBlock& back = fBlocks.back();
         size_t usedBytes = back.fBuffer->gpuMemorySize() - back.fBytesFree;
-        size_t pad = GrSizeAlignUpPad(usedBytes,
-                                      alignment);
+        size_t pad = GrSizeAlignUpPad(usedBytes, alignment);
         if ((size + pad) <= back.fBytesFree) {
+            memset((void*)(reinterpret_cast<intptr_t>(fBufferPtr) + usedBytes), 0, pad);
             usedBytes += pad;
             *offset = usedBytes;
             *buffer = back.fBuffer;
@@ -195,10 +176,10 @@ void* GrBufferAllocPool::makeSpace(size_t size,
     // updateData() if the amount of data passed is less than the full buffer
     // size.
 
-    if (!createBlock(size)) {
-        return NULL;
+    if (!this->createBlock(size)) {
+        return nullptr;
     }
-    SkASSERT(NULL != fBufferPtr);
+    SkASSERT(fBufferPtr);
 
     *offset = 0;
     BufferBlock& back = fBlocks.back();
@@ -209,38 +190,11 @@ void* GrBufferAllocPool::makeSpace(size_t size,
     return fBufferPtr;
 }
 
-int GrBufferAllocPool::currentBufferItems(size_t itemSize) const {
-    VALIDATE();
-    if (NULL != fBufferPtr) {
-        const BufferBlock& back = fBlocks.back();
-        size_t usedBytes = back.fBuffer->gpuMemorySize() - back.fBytesFree;
-        size_t pad = GrSizeAlignUpPad(usedBytes, itemSize);
-        return static_cast<int>((back.fBytesFree - pad) / itemSize);
-    } else if (fPreallocBuffersInUse < fPreallocBuffers.count()) {
-        return static_cast<int>(fMinBlockSize / itemSize);
-    }
-    return 0;
-}
-
-int GrBufferAllocPool::preallocatedBuffersRemaining() const {
-    return fPreallocBuffers.count() - fPreallocBuffersInUse;
-}
-
-int GrBufferAllocPool::preallocatedBufferCount() const {
-    return fPreallocBuffers.count();
-}
-
 void GrBufferAllocPool::putBack(size_t bytes) {
     VALIDATE();
 
-    // if the putBack unwinds all the preallocated buffers then we will
-    // advance the starting index. As blocks are destroyed fPreallocBuffersInUse
-    // will be decremented. I will reach zero if all blocks using preallocated
-    // buffers are released.
-    int preallocBuffersInUse = fPreallocBuffersInUse;
-
     while (bytes) {
-        // caller shouldnt try to put back more than they've taken
+        // caller shouldn't try to put back more than they've taken
         SkASSERT(!fBlocks.empty());
         BufferBlock& block = fBlocks.back();
         size_t bytesUsed = block.fBuffer->gpuMemorySize() - block.fBytesFree;
@@ -260,11 +214,7 @@ void GrBufferAllocPool::putBack(size_t bytes) {
             break;
         }
     }
-    if (!fPreallocBuffersInUse && fPreallocBuffers.count()) {
-            fPreallocBufferStartIdx = (fPreallocBufferStartIdx +
-                                       preallocBuffersInUse) %
-                                      fPreallocBuffers.count();
-    }
+
     VALIDATE();
 }
 
@@ -277,25 +227,14 @@ bool GrBufferAllocPool::createBlock(size_t requestSize) {
 
     BufferBlock& block = fBlocks.push_back();
 
-    if (size == fMinBlockSize &&
-        fPreallocBuffersInUse < fPreallocBuffers.count()) {
-
-        uint32_t nextBuffer = (fPreallocBuffersInUse +
-                               fPreallocBufferStartIdx) %
-                              fPreallocBuffers.count();
-        block.fBuffer = fPreallocBuffers[nextBuffer];
-        block.fBuffer->ref();
-        ++fPreallocBuffersInUse;
-    } else {
-        block.fBuffer = this->createBuffer(size);
-        if (NULL == block.fBuffer) {
-            fBlocks.pop_back();
-            return false;
-        }
+    block.fBuffer = this->getBuffer(size);
+    if (!block.fBuffer) {
+        fBlocks.pop_back();
+        return false;
     }
 
-    block.fBytesFree = size;
-    if (NULL != fBufferPtr) {
+    block.fBytesFree = block.fBuffer->gpuMemorySize();
+    if (fBufferPtr) {
         SkASSERT(fBlocks.count() > 1);
         BufferBlock& prev = fBlocks.fromBack(1);
         if (prev.fBuffer->isMapped()) {
@@ -303,31 +242,25 @@ bool GrBufferAllocPool::createBlock(size_t requestSize) {
         } else {
             this->flushCpuData(prev, prev.fBuffer->gpuMemorySize() - prev.fBytesFree);
         }
-        fBufferPtr = NULL;
+        fBufferPtr = nullptr;
     }
 
-    SkASSERT(NULL == fBufferPtr);
+    SkASSERT(!fBufferPtr);
 
     // If the buffer is CPU-backed we map it because it is free to do so and saves a copy.
-    // Otherwise when buffer mapping is supported:
-    //      a) If the frequently reset hint is set we only map when the requested size meets a
-    //      threshold (since we don't expect it is likely that we will see more vertex data)
-    //      b) If the hint is not set we map if the buffer size is greater than the threshold.
+    // Otherwise when buffer mapping is supported we map if the buffer size is greater than the
+    // threshold.
     bool attemptMap = block.fBuffer->isCPUBacked();
-    if (!attemptMap && GrDrawTargetCaps::kNone_MapFlags != fGpu->caps()->mapBufferFlags()) {
-        if (fFrequentResetHint) {
-            attemptMap = requestSize > GR_GEOM_BUFFER_MAP_THRESHOLD;
-        } else {
-            attemptMap = size > GR_GEOM_BUFFER_MAP_THRESHOLD;
-        }
+    if (!attemptMap && GrCaps::kNone_MapFlags != fGpu->caps()->mapBufferFlags()) {
+        attemptMap = size > fGeometryBufferMapThreshold;
     }
 
     if (attemptMap) {
         fBufferPtr = block.fBuffer->map();
     }
 
-    if (NULL == fBufferPtr) {
-        fBufferPtr = fCpuData.reset(size);
+    if (!fBufferPtr) {
+        fBufferPtr = this->resetCpuData(block.fBytesFree);
     }
 
     VALIDATE(true);
@@ -339,33 +272,40 @@ void GrBufferAllocPool::destroyBlock() {
     SkASSERT(!fBlocks.empty());
 
     BufferBlock& block = fBlocks.back();
-    if (fPreallocBuffersInUse > 0) {
-        uint32_t prevPreallocBuffer = (fPreallocBuffersInUse +
-                                       fPreallocBufferStartIdx +
-                                       (fPreallocBuffers.count() - 1)) %
-                                      fPreallocBuffers.count();
-        if (block.fBuffer == fPreallocBuffers[prevPreallocBuffer]) {
-            --fPreallocBuffersInUse;
-        }
-    }
+
     SkASSERT(!block.fBuffer->isMapped());
     block.fBuffer->unref();
     fBlocks.pop_back();
-    fBufferPtr = NULL;
+    fBufferPtr = nullptr;
 }
 
+void* GrBufferAllocPool::resetCpuData(size_t newSize) {
+    sk_free(fCpuData);
+    if (newSize) {
+        if (fGpu->caps()->mustClearUploadedBufferData()) {
+            fCpuData = sk_calloc(newSize);
+        } else {
+            fCpuData = sk_malloc_throw(newSize);
+        }
+    } else {
+        fCpuData = nullptr;
+    }
+    return fCpuData;
+}
+
+
 void GrBufferAllocPool::flushCpuData(const BufferBlock& block, size_t flushSize) {
     GrGeometryBuffer* buffer = block.fBuffer;
-    SkASSERT(NULL != buffer);
+    SkASSERT(buffer);
     SkASSERT(!buffer->isMapped());
-    SkASSERT(fCpuData.get() == fBufferPtr);
+    SkASSERT(fCpuData == fBufferPtr);
     SkASSERT(flushSize <= buffer->gpuMemorySize());
     VALIDATE(true);
 
-    if (GrDrawTargetCaps::kNone_MapFlags != fGpu->caps()->mapBufferFlags() &&
-        flushSize > GR_GEOM_BUFFER_MAP_THRESHOLD) {
+    if (GrCaps::kNone_MapFlags != fGpu->caps()->mapBufferFlags() &&
+        flushSize > fGeometryBufferMapThreshold) {
         void* data = buffer->map();
-        if (NULL != data) {
+        if (data) {
             memcpy(data, fBufferPtr, flushSize);
             UNMAP_BUFFER(block);
             return;
@@ -375,26 +315,25 @@ void GrBufferAllocPool::flushCpuData(const BufferBlock& block, size_t flushSize)
     VALIDATE(true);
 }
 
-GrGeometryBuffer* GrBufferAllocPool::createBuffer(size_t size) {
+GrGeometryBuffer* GrBufferAllocPool::getBuffer(size_t size) {
+
+    GrResourceProvider* rp = fGpu->getContext()->resourceProvider();
+
+    static const GrResourceProvider::BufferUsage kUsage = GrResourceProvider::kDynamic_BufferUsage;
+    // Shouldn't have to use this flag (https://bug.skia.org/4156)
+    static const uint32_t kFlags = GrResourceProvider::kNoPendingIO_Flag;
     if (kIndex_BufferType == fBufferType) {
-        return fGpu->createIndexBuffer(size, true);
+        return rp->createIndexBuffer(size, kUsage, kFlags);
     } else {
         SkASSERT(kVertex_BufferType == fBufferType);
-        return fGpu->createVertexBuffer(size, true);
+        return rp->createVertexBuffer(size, kUsage, kFlags);
     }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
-GrVertexBufferAllocPool::GrVertexBufferAllocPool(GrGpu* gpu,
-                                                 bool frequentResetHint,
-                                                 size_t bufferSize,
-                                                 int preallocBufferCnt)
-: GrBufferAllocPool(gpu,
-                    kVertex_BufferType,
-                    frequentResetHint,
-                    bufferSize,
-                    preallocBufferCnt) {
+GrVertexBufferAllocPool::GrVertexBufferAllocPool(GrGpu* gpu)
+    : GrBufferAllocPool(gpu, kVertex_BufferType, MIN_VERTEX_BUFFER_SIZE) {
 }
 
 void* GrVertexBufferAllocPool::makeSpace(size_t vertexSize,
@@ -403,11 +342,11 @@ void* GrVertexBufferAllocPool::makeSpace(size_t vertexSize,
                                          int* startVertex) {
 
     SkASSERT(vertexCount >= 0);
-    SkASSERT(NULL != buffer);
-    SkASSERT(NULL != startVertex);
+    SkASSERT(buffer);
+    SkASSERT(startVertex);
 
     size_t offset = 0; // assign to suppress warning
-    const GrGeometryBuffer* geomBuffer = NULL; // assign to suppress warning
+    const GrGeometryBuffer* geomBuffer = nullptr; // assign to suppress warning
     void* ptr = INHERITED::makeSpace(vertexSize * vertexCount,
                                      vertexSize,
                                      &geomBuffer,
@@ -419,41 +358,10 @@ void* GrVertexBufferAllocPool::makeSpace(size_t vertexSize,
     return ptr;
 }
 
-bool GrVertexBufferAllocPool::appendVertices(size_t vertexSize,
-                                             int vertexCount,
-                                             const void* vertices,
-                                             const GrVertexBuffer** buffer,
-                                             int* startVertex) {
-    void* space = makeSpace(vertexSize, vertexCount, buffer, startVertex);
-    if (NULL != space) {
-        memcpy(space,
-               vertices,
-               vertexSize * vertexCount);
-        return true;
-    } else {
-        return false;
-    }
-}
-
-int GrVertexBufferAllocPool::preallocatedBufferVertices(size_t vertexSize) const {
-    return static_cast<int>(INHERITED::preallocatedBufferSize() / vertexSize);
-}
-
-int GrVertexBufferAllocPool::currentBufferVertices(size_t vertexSize) const {
-    return currentBufferItems(vertexSize);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
-GrIndexBufferAllocPool::GrIndexBufferAllocPool(GrGpu* gpu,
-                                               bool frequentResetHint,
-                                               size_t bufferSize,
-                                               int preallocBufferCnt)
-: GrBufferAllocPool(gpu,
-                    kIndex_BufferType,
-                    frequentResetHint,
-                    bufferSize,
-                    preallocBufferCnt) {
+GrIndexBufferAllocPool::GrIndexBufferAllocPool(GrGpu* gpu)
+    : GrBufferAllocPool(gpu, kIndex_BufferType, MIN_INDEX_BUFFER_SIZE) {
 }
 
 void* GrIndexBufferAllocPool::makeSpace(int indexCount,
@@ -461,11 +369,11 @@ void* GrIndexBufferAllocPool::makeSpace(int indexCount,
                                         int* startIndex) {
 
     SkASSERT(indexCount >= 0);
-    SkASSERT(NULL != buffer);
-    SkASSERT(NULL != startIndex);
+    SkASSERT(buffer);
+    SkASSERT(startIndex);
 
     size_t offset = 0; // assign to suppress warning
-    const GrGeometryBuffer* geomBuffer = NULL; // assign to suppress warning
+    const GrGeometryBuffer* geomBuffer = nullptr; // assign to suppress warning
     void* ptr = INHERITED::makeSpace(indexCount * sizeof(uint16_t),
                                      sizeof(uint16_t),
                                      &geomBuffer,
@@ -476,24 +384,3 @@ void* GrIndexBufferAllocPool::makeSpace(int indexCount,
     *startIndex = static_cast<int>(offset / sizeof(uint16_t));
     return ptr;
 }
-
-bool GrIndexBufferAllocPool::appendIndices(int indexCount,
-                                           const void* indices,
-                                           const GrIndexBuffer** buffer,
-                                           int* startIndex) {
-    void* space = makeSpace(indexCount, buffer, startIndex);
-    if (NULL != space) {
-        memcpy(space, indices, sizeof(uint16_t) * indexCount);
-        return true;
-    } else {
-        return false;
-    }
-}
-
-int GrIndexBufferAllocPool::preallocatedBufferIndices() const {
-    return static_cast<int>(INHERITED::preallocatedBufferSize() / sizeof(uint16_t));
-}
-
-int GrIndexBufferAllocPool::currentBufferIndices() const {
-    return currentBufferItems(sizeof(uint16_t));
-}
diff --git a/gfx/skia/skia/src/gpu/GrBufferAllocPool.h b/gfx/skia/skia/src/gpu/GrBufferAllocPool.h
index e3d398204bd5..a3d8e4536429 100644
--- a/gfx/skia/skia/src/gpu/GrBufferAllocPool.h
+++ b/gfx/skia/skia/src/gpu/GrBufferAllocPool.h
@@ -40,26 +40,11 @@ public:
      */
     void reset();
 
-    /**
-     * Gets the number of preallocated buffers that are yet to be used.
-     */
-    int preallocatedBuffersRemaining() const;
-
-    /**
-     * gets the number of preallocated buffers
-     */
-    int preallocatedBufferCount() const;
-
     /**
      * Frees data from makeSpaces in LIFO order.
      */
     void putBack(size_t bytes);
 
-    /**
-     * Gets the GrGpu that this pool is associated with.
-     */
-    GrGpu* getGpu() { return fGpu; }
-
 protected:
     /**
      * Used to determine what type of buffers to create. We could make the
@@ -76,33 +61,15 @@ protected:
      *
      * @param gpu                   The GrGpu used to create the buffers.
      * @param bufferType            The type of buffers to create.
-     * @param frequentResetHint     A hint that indicates that the pool
-     *                              should expect frequent unmap() calls
-     *                              (as opposed to many makeSpace / acquires
-     *                              between resets).
      * @param bufferSize            The minimum size of created buffers.
      *                              This value will be clamped to some
      *                              reasonable minimum.
-     * @param preallocBufferCnt     The pool will allocate this number of
-     *                              buffers at bufferSize and keep them until it
-     *                              is destroyed.
      */
      GrBufferAllocPool(GrGpu* gpu,
                        BufferType bufferType,
-                       bool frequentResetHint,
-                       size_t   bufferSize = 0,
-                       int preallocBufferCnt = 0);
+                       size_t   bufferSize = 0);
 
-    virtual ~GrBufferAllocPool();
-
-    /**
-     * Gets the size of the preallocated buffers.
-     *
-     * @return the size of preallocated buffers.
-     */
-    size_t preallocatedBufferSize() const {
-        return fPreallocBuffers.count() ? fMinBlockSize : 0;
-    }
+     virtual ~GrBufferAllocPool();
 
     /**
      * Returns a block of memory to hold data. A buffer designated to hold the
@@ -128,26 +95,9 @@ protected:
                     const GrGeometryBuffer** buffer,
                     size_t* offset);
 
-    /**
-     * Gets the number of items of a size that can be added to the current
-     * buffer without spilling to another buffer. If the pool has been reset, or
-     * the previous makeSpace completely exhausted a buffer then the returned
-     * size will be the size of the next available preallocated buffer, or zero
-     * if no preallocated buffer remains available. It is assumed that items
-     * should be itemSize-aligned from the start of a buffer.
-     *
-     * @return the number of items that would fit in the current buffer.
-     */
-    int currentBufferItems(size_t itemSize) const;
-
-    GrGeometryBuffer* createBuffer(size_t size);
+    GrGeometryBuffer* getBuffer(size_t size);
 
 private:
-
-    // The GrGpu must be able to clear the ref of pools it creates as members
-    friend class GrGpu;
-    void releaseGpuRef();
-
     struct BufferBlock {
         size_t              fBytesFree;
         GrGeometryBuffer*   fBuffer;
@@ -155,27 +105,22 @@ private:
 
     bool createBlock(size_t requestSize);
     void destroyBlock();
+    void deleteBlocks();
     void flushCpuData(const BufferBlock& block, size_t flushSize);
+    void* resetCpuData(size_t newSize);
 #ifdef SK_DEBUG
     void validate(bool unusedBlockAllowed = false) const;
 #endif
-
     size_t                          fBytesInUse;
 
     GrGpu*                          fGpu;
-    bool                            fGpuIsReffed;
-    bool                            fFrequentResetHint;
-    SkTDArray<GrGeometryBuffer*>    fPreallocBuffers;
     size_t                          fMinBlockSize;
     BufferType                      fBufferType;
 
     SkTArray<BufferBlock>           fBlocks;
-    int                             fPreallocBuffersInUse;
-    // We attempt to cycle through the preallocated buffers rather than
-    // always starting from the first.
-    int                             fPreallocBufferStartIdx;
-    SkAutoMalloc                    fCpuData;
+    void*                           fCpuData;
     void*                           fBufferPtr;
+    size_t                          fGeometryBufferMapThreshold;
 };
 
 class GrVertexBuffer;
@@ -189,20 +134,8 @@ public:
      * Constructor
      *
      * @param gpu                   The GrGpu used to create the vertex buffers.
-     * @param frequentResetHint     A hint that indicates that the pool
-     *                              should expect frequent unmap() calls
-     *                              (as opposed to many makeSpace / acquires
-     *                              between resets).
-     * @param bufferSize            The minimum size of created VBs This value
-     *                              will be clamped to some reasonable minimum.
-     * @param preallocBufferCnt     The pool will allocate this number of VBs at
-     *                              bufferSize and keep them until it is
-     *                              destroyed.
      */
-    GrVertexBufferAllocPool(GrGpu* gpu,
-                            bool frequentResetHint,
-                            size_t bufferSize = 0,
-                            int preallocBufferCnt = 0);
+    GrVertexBufferAllocPool(GrGpu* gpu);
 
     /**
      * Returns a block of memory to hold vertices. A buffer designated to hold
@@ -230,38 +163,6 @@ public:
                     const GrVertexBuffer** buffer,
                     int* startVertex);
 
-    /**
-     * Shortcut to make space and then write verts into the made space.
-     */
-    bool appendVertices(size_t vertexSize,
-                        int vertexCount,
-                        const void* vertices,
-                        const GrVertexBuffer** buffer,
-                        int* startVertex);
-
-    /**
-     * Gets the number of vertices that can be added to the current VB without
-     * spilling to another VB. If the pool has been reset, or the previous
-     * makeSpace completely exhausted a VB then the returned number of vertices
-     * would fit in the next available preallocated buffer. If any makeSpace
-     * would force a new VB to be created the return value will be zero.
-     *
-     * @param   the size of a vertex to compute space for.
-     * @return the number of vertices that would fit in the current buffer.
-     */
-    int currentBufferVertices(size_t vertexSize) const;
-
-    /**
-     * Gets the number of vertices that can fit in a  preallocated vertex buffer.
-     * Zero if no preallocated buffers.
-     *
-     * @param   the size of a vertex to compute space for.
-     *
-     * @return number of vertices that fit in one of the preallocated vertex
-     *         buffers.
-     */
-    int preallocatedBufferVertices(size_t vertexSize) const;
-
 private:
     typedef GrBufferAllocPool INHERITED;
 };
@@ -277,20 +178,8 @@ public:
      * Constructor
      *
      * @param gpu                   The GrGpu used to create the index buffers.
-     * @param frequentResetHint     A hint that indicates that the pool
-     *                              should expect frequent unmap() calls
-     *                              (as opposed to many makeSpace / acquires
-     *                              between resets).
-     * @param bufferSize            The minimum size of created IBs This value
-     *                              will be clamped to some reasonable minimum.
-     * @param preallocBufferCnt     The pool will allocate this number of VBs at
-     *                              bufferSize and keep them until it is
-     *                              destroyed.
      */
-    GrIndexBufferAllocPool(GrGpu* gpu,
-                           bool frequentResetHint,
-                           size_t bufferSize = 0,
-                           int preallocBufferCnt = 0);
+    GrIndexBufferAllocPool(GrGpu* gpu);
 
     /**
      * Returns a block of memory to hold indices. A buffer designated to hold
@@ -314,32 +203,6 @@ public:
                     const GrIndexBuffer** buffer,
                     int* startIndex);
 
-    /**
-     * Shortcut to make space and then write indices into the made space.
-     */
-    bool appendIndices(int indexCount,
-                       const void* indices,
-                       const GrIndexBuffer** buffer,
-                       int* startIndex);
-
-    /**
-     * Gets the number of indices that can be added to the current IB without
-     * spilling to another IB. If the pool has been reset, or the previous
-     * makeSpace completely exhausted a IB then the returned number of indices
-     * would fit in the next available preallocated buffer. If any makeSpace
-     * would force a new IB to be created the return value will be zero.
-     */
-    int currentBufferIndices() const;
-
-    /**
-     * Gets the number of indices that can fit in a preallocated index buffer.
-     * Zero if no preallocated buffers.
-     *
-     * @return number of indices that fit in one of the preallocated index
-     *         buffers.
-     */
-    int preallocatedBufferIndices() const;
-
 private:
     typedef GrBufferAllocPool INHERITED;
 };
diff --git a/gfx/skia/skia/src/gpu/GrCacheID.cpp b/gfx/skia/skia/src/gpu/GrCacheID.cpp
deleted file mode 100644
index 8d0be0da5a9a..000000000000
--- a/gfx/skia/skia/src/gpu/GrCacheID.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrTypes.h"
-#include "SkThread.h"       // for sk_atomic_inc
-
-// Well, the dummy_ "fix" caused a warning on windows, so hiding all of it
-// until we can find a universal fix.
-#if 0
-// This used to be a global scope, but we got a warning about unused variable
-// so we moved it into here. We just want it to compile, so we can test the
-// static asserts.
-static inline void dummy_function_to_avoid_unused_var_warning() {
-    GrCacheID::Key kAssertKey;
-    GR_STATIC_ASSERT(sizeof(kAssertKey.fData8) == sizeof(kAssertKey.fData32));
-    GR_STATIC_ASSERT(sizeof(kAssertKey.fData8) == sizeof(kAssertKey.fData64));
-    GR_STATIC_ASSERT(sizeof(kAssertKey.fData8) == sizeof(kAssertKey));
-}
-#endif
-
-GrCacheID::Domain GrCacheID::GenerateDomain() {
-    static int32_t gNextDomain = kInvalid_Domain + 1;
-
-    int32_t domain = sk_atomic_inc(&gNextDomain);
-    if (domain >= 1 << (8 * sizeof(Domain))) {
-        SkFAIL("Too many Cache Domains");
-    }
-
-    return static_cast<Domain>(domain);
-}
diff --git a/gfx/skia/skia/src/gpu/GrCaps.cpp b/gfx/skia/skia/src/gpu/GrCaps.cpp
new file mode 100644
index 000000000000..7003cc5bfec0
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrCaps.cpp
@@ -0,0 +1,251 @@
+
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrCaps.h"
+#include "GrContextOptions.h"
+
+GrShaderCaps::GrShaderCaps() {
+    fShaderDerivativeSupport = false;
+    fGeometryShaderSupport = false;
+    fPathRenderingSupport = false;
+    fDstReadInShaderSupport = false;
+    fDualSourceBlendingSupport = false;
+    fShaderPrecisionVaries = false;
+}
+
+static const char* shader_type_to_string(GrShaderType type) {
+    switch (type) {
+    case kVertex_GrShaderType:
+        return "vertex";
+    case kGeometry_GrShaderType:
+        return "geometry";
+    case kFragment_GrShaderType:
+        return "fragment";
+    }
+    return "";
+}
+
+static const char* precision_to_string(GrSLPrecision p) {
+    switch (p) {
+    case kLow_GrSLPrecision:
+        return "low";
+    case kMedium_GrSLPrecision:
+        return "medium";
+    case kHigh_GrSLPrecision:
+        return "high";
+    }
+    return "";
+}
+
+SkString GrShaderCaps::dump() const {
+    SkString r;
+    static const char* gNY[] = { "NO", "YES" };
+    r.appendf("Shader Derivative Support          : %s\n", gNY[fShaderDerivativeSupport]);
+    r.appendf("Geometry Shader Support            : %s\n", gNY[fGeometryShaderSupport]);
+    r.appendf("Path Rendering Support             : %s\n", gNY[fPathRenderingSupport]);
+    r.appendf("Dst Read In Shader Support         : %s\n", gNY[fDstReadInShaderSupport]);
+    r.appendf("Dual Source Blending Support       : %s\n", gNY[fDualSourceBlendingSupport]);
+
+    r.appendf("Shader Float Precisions (varies: %s):\n", gNY[fShaderPrecisionVaries]);
+
+    for (int s = 0; s < kGrShaderTypeCount; ++s) {
+        GrShaderType shaderType = static_cast<GrShaderType>(s);
+        r.appendf("\t%s:\n", shader_type_to_string(shaderType));
+        for (int p = 0; p < kGrSLPrecisionCount; ++p) {
+            if (fFloatPrecisions[s][p].supported()) {
+                GrSLPrecision precision = static_cast<GrSLPrecision>(p);
+                r.appendf("\t\t%s: log_low: %d log_high: %d bits: %d\n",
+                    precision_to_string(precision),
+                    fFloatPrecisions[s][p].fLogRangeLow,
+                    fFloatPrecisions[s][p].fLogRangeHigh,
+                    fFloatPrecisions[s][p].fBits);
+            }
+        }
+    }
+
+    return r;
+}
+
+void GrShaderCaps::applyOptionsOverrides(const GrContextOptions& options) {
+    fDualSourceBlendingSupport = fDualSourceBlendingSupport && !options.fSuppressDualSourceBlending;
+    this->onApplyOptionsOverrides(options);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+GrCaps::GrCaps(const GrContextOptions& options) {
+    fMipMapSupport = false;
+    fNPOTTextureTileSupport = false;
+    fTwoSidedStencilSupport = false;
+    fStencilWrapOpsSupport = false;
+    fDiscardRenderTargetSupport = false;
+    fReuseScratchTextures = true;
+    fReuseScratchBuffers = true;
+    fGpuTracingSupport = false;
+    fCompressedTexSubImageSupport = false;
+    fOversizedStencilSupport = false;
+    fTextureBarrierSupport = false;
+    fMixedSamplesSupport = false;
+    fSupportsInstancedDraws = false;
+    fFullClearIsFree = false;
+    fMustClearUploadedBufferData = false;
+
+    fUseDrawInsteadOfClear = false;
+
+    fBlendEquationSupport = kBasic_BlendEquationSupport;
+    fAdvBlendEqBlacklist = 0;
+
+    fMapBufferFlags = kNone_MapFlags;
+
+    fMaxRenderTargetSize = 1;
+    fMaxTextureSize = 1;
+    fMaxSampleCount = 0;
+
+    memset(fConfigRenderSupport, 0, sizeof(fConfigRenderSupport));
+    memset(fConfigTextureSupport, 0, sizeof(fConfigTextureSupport));
+
+    fSuppressPrints = options.fSuppressPrints;
+    fImmediateFlush = options.fImmediateMode;
+    fDrawPathMasksToCompressedTextureSupport = options.fDrawPathToCompressedTexture;
+    fGeometryBufferMapThreshold = options.fGeometryBufferMapThreshold;
+    fUseDrawInsteadOfPartialRenderTargetWrite = options.fUseDrawInsteadOfPartialRenderTargetWrite;
+
+    fPreferVRAMUseOverFlushes = true;
+}
+
+void GrCaps::applyOptionsOverrides(const GrContextOptions& options) {
+    fMaxTextureSize = SkTMin(fMaxTextureSize, options.fMaxTextureSizeOverride);
+    // If the max tile override is zero, it means we should use the max texture size.
+    if (!options.fMaxTileSizeOverride || options.fMaxTileSizeOverride > fMaxTextureSize) {
+        fMaxTileSize = fMaxTextureSize;
+    } else {
+        fMaxTileSize = options.fMaxTileSizeOverride;
+    }
+    this->onApplyOptionsOverrides(options);
+}
+
+static SkString map_flags_to_string(uint32_t flags) {
+    SkString str;
+    if (GrCaps::kNone_MapFlags == flags) {
+        str = "none";
+    } else {
+        SkASSERT(GrCaps::kCanMap_MapFlag & flags);
+        SkDEBUGCODE(flags &= ~GrCaps::kCanMap_MapFlag);
+        str = "can_map";
+
+        if (GrCaps::kSubset_MapFlag & flags) {
+            str.append(" partial");
+        } else {
+            str.append(" full");
+        }
+        SkDEBUGCODE(flags &= ~GrCaps::kSubset_MapFlag);
+    }
+    SkASSERT(0 == flags); // Make sure we handled all the flags.
+    return str;
+}
+
+SkString GrCaps::dump() const {
+    SkString r;
+    static const char* gNY[] = {"NO", "YES"};
+    r.appendf("MIP Map Support                    : %s\n", gNY[fMipMapSupport]);
+    r.appendf("NPOT Texture Tile Support          : %s\n", gNY[fNPOTTextureTileSupport]);
+    r.appendf("Two Sided Stencil Support          : %s\n", gNY[fTwoSidedStencilSupport]);
+    r.appendf("Stencil Wrap Ops  Support          : %s\n", gNY[fStencilWrapOpsSupport]);
+    r.appendf("Discard Render Target Support      : %s\n", gNY[fDiscardRenderTargetSupport]);
+    r.appendf("Reuse Scratch Textures             : %s\n", gNY[fReuseScratchTextures]);
+    r.appendf("Reuse Scratch Buffers              : %s\n", gNY[fReuseScratchBuffers]);
+    r.appendf("Gpu Tracing Support                : %s\n", gNY[fGpuTracingSupport]);
+    r.appendf("Compressed Update Support          : %s\n", gNY[fCompressedTexSubImageSupport]);
+    r.appendf("Oversized Stencil Support          : %s\n", gNY[fOversizedStencilSupport]);
+    r.appendf("Texture Barrier Support            : %s\n", gNY[fTextureBarrierSupport]);
+    r.appendf("Mixed Samples Support              : %s\n", gNY[fMixedSamplesSupport]);
+    r.appendf("Supports instanced draws           : %s\n", gNY[fSupportsInstancedDraws]);
+    r.appendf("Full screen clear is free          : %s\n", gNY[fFullClearIsFree]);
+    r.appendf("Must clear buffer memory           : %s\n", gNY[fMustClearUploadedBufferData]);
+    r.appendf("Draw Instead of Clear [workaround] : %s\n", gNY[fUseDrawInsteadOfClear]);
+    r.appendf("Draw Instead of TexSubImage [workaround] : %s\n",
+              gNY[fUseDrawInsteadOfPartialRenderTargetWrite]);
+    r.appendf("Prefer VRAM Use over flushes [workaround] : %s\n", gNY[fPreferVRAMUseOverFlushes]);
+
+    if (this->advancedBlendEquationSupport()) {
+        r.appendf("Advanced Blend Equation Blacklist  : 0x%x\n", fAdvBlendEqBlacklist);
+    }
+
+    r.appendf("Max Texture Size                   : %d\n", fMaxTextureSize);
+    r.appendf("Max Render Target Size             : %d\n", fMaxRenderTargetSize);
+    r.appendf("Max Sample Count                   : %d\n", fMaxSampleCount);
+
+    static const char* kBlendEquationSupportNames[] = {
+        "Basic",
+        "Advanced",
+        "Advanced Coherent",
+    };
+    GR_STATIC_ASSERT(0 == kBasic_BlendEquationSupport);
+    GR_STATIC_ASSERT(1 == kAdvanced_BlendEquationSupport);
+    GR_STATIC_ASSERT(2 == kAdvancedCoherent_BlendEquationSupport);
+    GR_STATIC_ASSERT(SK_ARRAY_COUNT(kBlendEquationSupportNames) == kLast_BlendEquationSupport + 1);
+
+    r.appendf("Blend Equation Support             : %s\n",
+              kBlendEquationSupportNames[fBlendEquationSupport]);
+    r.appendf("Map Buffer Support                 : %s\n",
+              map_flags_to_string(fMapBufferFlags).c_str());
+
+    static const char* kConfigNames[] = {
+        "Unknown",  // kUnknown_GrPixelConfig
+        "Alpha8",   // kAlpha_8_GrPixelConfig,
+        "Index8",   // kIndex_8_GrPixelConfig,
+        "RGB565",   // kRGB_565_GrPixelConfig,
+        "RGBA444",  // kRGBA_4444_GrPixelConfig,
+        "RGBA8888", // kRGBA_8888_GrPixelConfig,
+        "BGRA8888", // kBGRA_8888_GrPixelConfig,
+        "SRGBA8888",// kSRGBA_8888_GrPixelConfig,
+        "ETC1",     // kETC1_GrPixelConfig,
+        "LATC",     // kLATC_GrPixelConfig,
+        "R11EAC",   // kR11_EAC_GrPixelConfig,
+        "ASTC12x12",// kASTC_12x12_GrPixelConfig,
+        "RGBAFloat",// kRGBA_float_GrPixelConfig
+        "AlphaHalf",// kAlpha_half_GrPixelConfig
+        "RGBAHalf", // kRGBA_half_GrPixelConfig
+    };
+    GR_STATIC_ASSERT(0  == kUnknown_GrPixelConfig);
+    GR_STATIC_ASSERT(1  == kAlpha_8_GrPixelConfig);
+    GR_STATIC_ASSERT(2  == kIndex_8_GrPixelConfig);
+    GR_STATIC_ASSERT(3  == kRGB_565_GrPixelConfig);
+    GR_STATIC_ASSERT(4  == kRGBA_4444_GrPixelConfig);
+    GR_STATIC_ASSERT(5  == kRGBA_8888_GrPixelConfig);
+    GR_STATIC_ASSERT(6  == kBGRA_8888_GrPixelConfig);
+    GR_STATIC_ASSERT(7  == kSRGBA_8888_GrPixelConfig);
+    GR_STATIC_ASSERT(8  == kETC1_GrPixelConfig);
+    GR_STATIC_ASSERT(9  == kLATC_GrPixelConfig);
+    GR_STATIC_ASSERT(10  == kR11_EAC_GrPixelConfig);
+    GR_STATIC_ASSERT(11 == kASTC_12x12_GrPixelConfig);
+    GR_STATIC_ASSERT(12 == kRGBA_float_GrPixelConfig);
+    GR_STATIC_ASSERT(13 == kAlpha_half_GrPixelConfig);
+    GR_STATIC_ASSERT(14 == kRGBA_half_GrPixelConfig);
+    GR_STATIC_ASSERT(SK_ARRAY_COUNT(kConfigNames) == kGrPixelConfigCnt);
+
+    SkASSERT(!fConfigRenderSupport[kUnknown_GrPixelConfig][0]);
+    SkASSERT(!fConfigRenderSupport[kUnknown_GrPixelConfig][1]);
+
+    for (size_t i = 1; i < SK_ARRAY_COUNT(kConfigNames); ++i)  {
+        r.appendf("%s is renderable: %s, with MSAA: %s\n",
+                  kConfigNames[i],
+                  gNY[fConfigRenderSupport[i][0]],
+                  gNY[fConfigRenderSupport[i][1]]);
+    }
+
+    SkASSERT(!fConfigTextureSupport[kUnknown_GrPixelConfig]);
+
+    for (size_t i = 1; i < SK_ARRAY_COUNT(kConfigNames); ++i)  {
+        r.appendf("%s is uploadable to a texture: %s\n",
+                  kConfigNames[i],
+                  gNY[fConfigTextureSupport[i]]);
+    }
+
+    return r;
+}
diff --git a/gfx/skia/skia/src/gpu/GrClip.cpp b/gfx/skia/skia/src/gpu/GrClip.cpp
new file mode 100644
index 000000000000..5c4a27ccadb0
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrClip.cpp
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrClip.h"
+
+#include "GrSurface.h"
+#include "SkRect.h"
+
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * getConservativeBounds returns the conservative bounding box of the clip
+ * in device (as opposed to canvas) coordinates. If the bounding box is
+ * the result of purely intersections of rects (with an initial replace)
+ * isIntersectionOfRects will be set to true.
+ */
+void GrClip::getConservativeBounds(int width, int height, SkIRect* devResult,
+                                   bool* isIntersectionOfRects) const {
+    switch (fClipType) {
+        case kWideOpen_ClipType: {
+            devResult->setLTRB(0, 0, width, height);
+            if (isIntersectionOfRects) {
+                *isIntersectionOfRects = true;
+            }
+        } break;
+        case kIRect_ClipType: {
+            *devResult = this->irect();
+            if (isIntersectionOfRects) {
+                *isIntersectionOfRects = true;
+            }
+        } break;
+        case kClipStack_ClipType: {
+            SkRect devBounds;
+            this->clipStack()->getConservativeBounds(-this->origin().fX,
+                                                     -this->origin().fY,
+                                                     width,
+                                                     height,
+                                                     &devBounds,
+                                                     isIntersectionOfRects);
+            devBounds.roundOut(devResult);
+        } break;
+
+    }
+}
+
+const GrClip& GrClip::WideOpen() {
+    static const GrClip clip;
+    return clip;
+}
diff --git a/gfx/skia/skia/src/gpu/GrClipData.cpp b/gfx/skia/skia/src/gpu/GrClipData.cpp
deleted file mode 100644
index 40bdec8877a7..000000000000
--- a/gfx/skia/skia/src/gpu/GrClipData.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrClipData.h"
-
-#include "GrSurface.h"
-#include "SkRect.h"
-
-///////////////////////////////////////////////////////////////////////////////
-
-/**
- * getConservativeBounds returns the conservative bounding box of the clip
- * in device (as opposed to canvas) coordinates. If the bounding box is
- * the result of purely intersections of rects (with an initial replace)
- * isIntersectionOfRects will be set to true.
- */
-void GrClipData::getConservativeBounds(int width, int height,
-                                       SkIRect* devResult,
-                                       bool* isIntersectionOfRects) const {
-    SkRect devBounds;
-
-    fClipStack->getConservativeBounds(-fOrigin.fX,
-                                      -fOrigin.fY,
-                                      width,
-                                      height,
-                                      &devBounds,
-                                      isIntersectionOfRects);
-
-    devBounds.roundOut(devResult);
-}
diff --git a/gfx/skia/skia/src/gpu/GrClipMaskCache.cpp b/gfx/skia/skia/src/gpu/GrClipMaskCache.cpp
deleted file mode 100644
index 470cc4a2561d..000000000000
--- a/gfx/skia/skia/src/gpu/GrClipMaskCache.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrClipMaskCache.h"
-
-GrClipMaskCache::GrClipMaskCache()
-    : fContext(NULL)
-    , fStack(sizeof(GrClipStackFrame)) {
-    // We need an initial frame to capture the clip state prior to
-    // any pushes
-    SkNEW_PLACEMENT(fStack.push_back(), GrClipStackFrame);
-}
-
-void GrClipMaskCache::push() {
-    SkNEW_PLACEMENT(fStack.push_back(), GrClipStackFrame);
-}
diff --git a/gfx/skia/skia/src/gpu/GrClipMaskCache.h b/gfx/skia/skia/src/gpu/GrClipMaskCache.h
deleted file mode 100644
index b332c7be9b96..000000000000
--- a/gfx/skia/skia/src/gpu/GrClipMaskCache.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrClipMaskCache_DEFINED
-#define GrClipMaskCache_DEFINED
-
-#include "GrContext.h"
-#include "SkClipStack.h"
-#include "SkTypes.h"
-
-class GrTexture;
-
-/**
- * The stencil buffer stores the last clip path - providing a single entry
- * "cache". This class provides similar functionality for AA clip paths
- */
-class GrClipMaskCache : SkNoncopyable {
-public:
-    GrClipMaskCache();
-
-    ~GrClipMaskCache() {
-
-        while (!fStack.empty()) {
-            GrClipStackFrame* temp = (GrClipStackFrame*) fStack.back();
-            temp->~GrClipStackFrame();
-            fStack.pop_back();
-        }
-    }
-
-    bool canReuse(int32_t clipGenID, const SkIRect& bounds) {
-
-        SkASSERT(clipGenID != SkClipStack::kWideOpenGenID);
-        SkASSERT(clipGenID != SkClipStack::kEmptyGenID);
-
-        GrClipStackFrame* back = (GrClipStackFrame*) fStack.back();
-
-        // We could reuse the mask if bounds is a subset of last bounds. We'd have to communicate
-        // an offset to the caller.
-        if (back->fLastMask.texture() &&
-            back->fLastBound == bounds &&
-            back->fLastClipGenID == clipGenID) {
-            return true;
-        }
-
-        return false;
-    }
-
-    void reset() {
-        if (fStack.empty()) {
-//            SkASSERT(false);
-            return;
-        }
-
-        GrClipStackFrame* back = (GrClipStackFrame*) fStack.back();
-
-        back->reset();
-    }
-
-    /**
-     * After a "push" the clip state is entirely open. Currently, the
-     * entire clip stack will be re-rendered into a new clip mask.
-     * TODO: can we take advantage of the nested nature of the clips to
-     * reduce the mask creation cost?
-     */
-    void push();
-
-    void pop() {
-        //SkASSERT(!fStack.empty());
-
-        if (!fStack.empty()) {
-            GrClipStackFrame* back = (GrClipStackFrame*) fStack.back();
-
-            back->~GrClipStackFrame();
-            fStack.pop_back();
-        }
-    }
-
-    int32_t getLastClipGenID() const {
-
-        if (fStack.empty()) {
-            return SkClipStack::kInvalidGenID;
-        }
-
-        return ((GrClipStackFrame*) fStack.back())->fLastClipGenID;
-    }
-
-    GrTexture* getLastMask() {
-
-        if (fStack.empty()) {
-            SkASSERT(false);
-            return NULL;
-        }
-
-        GrClipStackFrame* back = (GrClipStackFrame*) fStack.back();
-
-        return back->fLastMask.texture();
-    }
-
-    const GrTexture* getLastMask() const {
-
-        if (fStack.empty()) {
-            SkASSERT(false);
-            return NULL;
-        }
-
-        GrClipStackFrame* back = (GrClipStackFrame*) fStack.back();
-
-        return back->fLastMask.texture();
-    }
-
-    void acquireMask(int32_t clipGenID,
-                     const GrTextureDesc& desc,
-                     const SkIRect& bound) {
-
-        if (fStack.empty()) {
-            SkASSERT(false);
-            return;
-        }
-
-        GrClipStackFrame* back = (GrClipStackFrame*) fStack.back();
-
-        back->acquireMask(fContext, clipGenID, desc, bound);
-    }
-
-    int getLastMaskWidth() const {
-
-        if (fStack.empty()) {
-            SkASSERT(false);
-            return -1;
-        }
-
-        GrClipStackFrame* back = (GrClipStackFrame*) fStack.back();
-
-        if (NULL == back->fLastMask.texture()) {
-            return -1;
-        }
-
-        return back->fLastMask.texture()->width();
-    }
-
-    int getLastMaskHeight() const {
-
-        if (fStack.empty()) {
-            SkASSERT(false);
-            return -1;
-        }
-
-        GrClipStackFrame* back = (GrClipStackFrame*) fStack.back();
-
-        if (NULL == back->fLastMask.texture()) {
-            return -1;
-        }
-
-        return back->fLastMask.texture()->height();
-    }
-
-    void getLastBound(SkIRect* bound) const {
-
-        if (fStack.empty()) {
-            SkASSERT(false);
-            bound->setEmpty();
-            return;
-        }
-
-        GrClipStackFrame* back = (GrClipStackFrame*) fStack.back();
-
-        *bound = back->fLastBound;
-    }
-
-    void setContext(GrContext* context) {
-        fContext = context;
-    }
-
-    GrContext* getContext() {
-        return fContext;
-    }
-
-    void releaseResources() {
-
-        SkDeque::F2BIter iter(fStack);
-        for (GrClipStackFrame* frame = (GrClipStackFrame*) iter.next();
-                frame != NULL;
-                frame = (GrClipStackFrame*) iter.next()) {
-            frame->reset();
-        }
-    }
-
-private:
-    struct GrClipStackFrame {
-
-        GrClipStackFrame() {
-            this->reset();
-        }
-
-        void acquireMask(GrContext* context,
-                         int32_t clipGenID,
-                         const GrTextureDesc& desc,
-                         const SkIRect& bound) {
-
-            fLastClipGenID = clipGenID;
-
-            fLastMask.set(context, desc);
-
-            fLastBound = bound;
-        }
-
-        void reset () {
-            fLastClipGenID = SkClipStack::kInvalidGenID;
-
-            GrTextureDesc desc;
-
-            fLastMask.set(NULL, desc);
-            fLastBound.setEmpty();
-        }
-
-        int32_t                 fLastClipGenID;
-        // The mask's width & height values are used by GrClipMaskManager to correctly scale the
-        // texture coords for the geometry drawn with this mask.
-        GrAutoScratchTexture    fLastMask;
-        // fLastBound stores the bounding box of the clip mask in clip-stack space. This rect is
-        // used by GrClipMaskManager to position a rect and compute texture coords for the mask.
-        SkIRect                 fLastBound;
-    };
-
-    GrContext*   fContext;
-    SkDeque      fStack;
-
-    typedef SkNoncopyable INHERITED;
-};
-
-#endif // GrClipMaskCache_DEFINED
diff --git a/gfx/skia/skia/src/gpu/GrClipMaskManager.cpp b/gfx/skia/skia/src/gpu/GrClipMaskManager.cpp
index 704750efcaf4..9eaf415cce6d 100644
--- a/gfx/skia/skia/src/gpu/GrClipMaskManager.cpp
+++ b/gfx/skia/skia/src/gpu/GrClipMaskManager.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2012 Google Inc.
  *
@@ -7,126 +6,195 @@
  */
 
 #include "GrClipMaskManager.h"
-#include "GrAAConvexPathRenderer.h"
-#include "GrAAHairLinePathRenderer.h"
-#include "GrAARectRenderer.h"
-#include "GrDrawTargetCaps.h"
-#include "GrGpu.h"
+#include "GrCaps.h"
+#include "GrDrawingManager.h"
+#include "GrDrawContext.h"
+#include "GrDrawTarget.h"
+#include "GrGpuResourcePriv.h"
 #include "GrPaint.h"
 #include "GrPathRenderer.h"
 #include "GrRenderTarget.h"
-#include "GrStencilBuffer.h"
+#include "GrRenderTargetPriv.h"
+#include "GrResourceProvider.h"
+#include "GrStencilAttachment.h"
 #include "GrSWMaskHelper.h"
-#include "effects/GrTextureDomain.h"
-#include "effects/GrConvexPolyEffect.h"
-#include "effects/GrRRectEffect.h"
 #include "SkRasterClip.h"
-#include "SkStrokeRec.h"
 #include "SkTLazy.h"
-
-#define GR_AA_CLIP 1
+#include "effects/GrConvexPolyEffect.h"
+#include "effects/GrPorterDuffXferProcessor.h"
+#include "effects/GrRRectEffect.h"
+#include "effects/GrTextureDomain.h"
 
 typedef SkClipStack::Element Element;
 
-using namespace GrReducedClip;
-
 ////////////////////////////////////////////////////////////////////////////////
-namespace {
 // set up the draw state to enable the aa clipping mask. Besides setting up the
 // stage matrix this also alters the vertex layout
-void setup_drawstate_aaclip(GrGpu* gpu,
-                            GrTexture* result,
-                            const SkIRect &devBound) {
-    GrDrawState* drawState = gpu->drawState();
-    SkASSERT(drawState);
-
+static const GrFragmentProcessor* create_fp_for_mask(GrTexture* result, const SkIRect &devBound) {
     SkMatrix mat;
-    // We want to use device coords to compute the texture coordinates. We set our matrix to be
-    // equal to the view matrix followed by an offset to the devBound, and then a scaling matrix to
-    // normalized coords. We apply this matrix to the vertex positions rather than local coords.
+    // We use device coords to compute the texture coordinates. We set our matrix to be a
+    // translation to the devBound, and then a scaling matrix to normalized coords.
     mat.setIDiv(result->width(), result->height());
     mat.preTranslate(SkIntToScalar(-devBound.fLeft),
                      SkIntToScalar(-devBound.fTop));
-    mat.preConcat(drawState->getViewMatrix());
 
     SkIRect domainTexels = SkIRect::MakeWH(devBound.width(), devBound.height());
-    // This could be a long-lived effect that is cached with the alpha-mask.
-    drawState->addCoverageEffect(
-        GrTextureDomainEffect::Create(result,
-                                      mat,
-                                      GrTextureDomain::MakeTexelDomain(result, domainTexels),
-                                      GrTextureDomain::kDecal_Mode,
-                                      GrTextureParams::kNone_FilterMode,
-                                      kPosition_GrCoordSet))->unref();
+    return GrTextureDomainEffect::Create(result,
+                                         mat,
+                                         GrTextureDomain::MakeTexelDomain(result, domainTexels),
+                                         GrTextureDomain::kDecal_Mode,
+                                         GrTextureParams::kNone_FilterMode,
+                                         kDevice_GrCoordSet);
 }
 
-bool path_needs_SW_renderer(GrContext* context,
-                            GrGpu* gpu,
-                            const SkPath& origPath,
-                            const SkStrokeRec& stroke,
-                            bool doAA) {
-    // the gpu alpha mask will draw the inverse paths as non-inverse to a temp buffer
-    SkTCopyOnFirstWrite<SkPath> path(origPath);
-    if (path->isInverseFillType()) {
-        path.writable()->toggleInverseFillType();
+// Does the path in 'element' require SW rendering? If so, return true (and,
+// optionally, set 'prOut' to NULL. If not, return false (and, optionally, set
+// 'prOut' to the non-SW path renderer that will do the job).
+bool GrClipMaskManager::PathNeedsSWRenderer(GrContext* context,
+                                            bool isStencilDisabled,
+                                            const GrRenderTarget* rt,
+                                            const SkMatrix& viewMatrix,
+                                            const Element* element,
+                                            GrPathRenderer** prOut,
+                                            bool needsStencil) {
+    if (Element::kRect_Type == element->getType()) {
+        // rects can always be drawn directly w/o using the software path
+        // TODO: skip rrects once we're drawing them directly.
+        if (prOut) {
+            *prOut = nullptr;
+        }
+        return false;
+    } else {
+        // We shouldn't get here with an empty clip element.
+        SkASSERT(Element::kEmpty_Type != element->getType());
+
+        // the gpu alpha mask will draw the inverse paths as non-inverse to a temp buffer
+        SkPath path;
+        element->asPath(&path);
+        if (path.isInverseFillType()) {
+            path.toggleInverseFillType();
+        }
+        GrStrokeInfo stroke(SkStrokeRec::kFill_InitStyle);
+    
+        GrPathRendererChain::DrawType type;
+        
+        if (needsStencil) {
+            type = element->isAA()
+                            ? GrPathRendererChain::kStencilAndColorAntiAlias_DrawType
+                            : GrPathRendererChain::kStencilAndColor_DrawType;
+        } else {
+            type = element->isAA()
+                            ? GrPathRendererChain::kColorAntiAlias_DrawType
+                            : GrPathRendererChain::kColor_DrawType;    
+        }
+    
+        GrPathRenderer::CanDrawPathArgs canDrawArgs;
+        canDrawArgs.fShaderCaps = context->caps()->shaderCaps();
+        canDrawArgs.fViewMatrix = &viewMatrix;
+        canDrawArgs.fPath = &path;
+        canDrawArgs.fStroke = &stroke;
+        canDrawArgs.fAntiAlias = element->isAA();
+        canDrawArgs.fIsStencilDisabled = isStencilDisabled;
+        canDrawArgs.fIsStencilBufferMSAA = rt->isStencilBufferMultisampled();
+
+        // the 'false' parameter disallows use of the SW path renderer
+        GrPathRenderer* pr = context->drawingManager()->getPathRenderer(canDrawArgs, false, type);
+        if (prOut) {
+            *prOut = pr;
+        }
+        return SkToBool(!pr);
     }
-    // last (false) parameter disallows use of the SW path renderer
-    GrPathRendererChain::DrawType type = doAA ?
-                                         GrPathRendererChain::kColorAntiAlias_DrawType :
-                                         GrPathRendererChain::kColor_DrawType;
-
-    return NULL == context->getPathRenderer(*path, stroke, gpu, false, type);
 }
 
+// Determines whether it is possible to draw the element to both the stencil buffer and the
+// alpha mask simultaneously. If so and the element is a path a compatible path renderer is
+// also returned.
+GrPathRenderer* GrClipMaskManager::GetPathRenderer(GrContext* context,
+                                                   GrTexture* texture,
+                                                   const SkMatrix& viewMatrix,
+                                                   const SkClipStack::Element* element) {
+    GrPathRenderer* pr;
+    static const bool kNeedsStencil = true;
+    static const bool kStencilIsDisabled = true;
+    PathNeedsSWRenderer(context,
+                        kStencilIsDisabled,
+                        texture->asRenderTarget(),
+                        viewMatrix,
+                        element,
+                        &pr,
+                        kNeedsStencil);
+    return pr;
 }
 
+GrClipMaskManager::GrClipMaskManager(GrDrawTarget* drawTarget, bool debugClipBatchToBounds)
+    : fDrawTarget(drawTarget)
+    , fClipMode(kIgnoreClip_StencilClipMode)
+    , fDebugClipBatchToBounds(debugClipBatchToBounds) {
+}
+
+GrContext* GrClipMaskManager::getContext() {
+    return fDrawTarget->cmmAccess().context();
+}
+
+const GrCaps* GrClipMaskManager::caps() const {
+    return fDrawTarget->caps();
+}
+
+GrResourceProvider* GrClipMaskManager::resourceProvider() {
+    return fDrawTarget->cmmAccess().resourceProvider();
+}
 /*
  * This method traverses the clip stack to see if the GrSoftwarePathRenderer
  * will be used on any element. If so, it returns true to indicate that the
  * entire clip should be rendered in SW and then uploaded en masse to the gpu.
  */
-bool GrClipMaskManager::useSWOnlyPath(const ElementList& elements) {
-
+bool GrClipMaskManager::useSWOnlyPath(const GrPipelineBuilder& pipelineBuilder,
+                                      const GrRenderTarget* rt,
+                                      const SkVector& clipToMaskOffset,
+                                      const GrReducedClip::ElementList& elements) {
     // TODO: generalize this function so that when
     // a clip gets complex enough it can just be done in SW regardless
     // of whether it would invoke the GrSoftwarePathRenderer.
-    SkStrokeRec stroke(SkStrokeRec::kFill_InitStyle);
 
-    for (ElementList::Iter iter(elements.headIter()); iter.get(); iter.next()) {
+    // Set the matrix so that rendered clip elements are transformed to mask space from clip
+    // space.
+    const SkMatrix translate = SkMatrix::MakeTrans(clipToMaskOffset.fX, clipToMaskOffset.fY);
+
+    for (GrReducedClip::ElementList::Iter iter(elements.headIter()); iter.get(); iter.next()) {
         const Element* element = iter.get();
-        // rects can always be drawn directly w/o using the software path
-        // Skip rrects once we're drawing them directly.
-        if (Element::kRect_Type != element->getType()) {
-            SkPath path;
-            element->asPath(&path);
-            if (path_needs_SW_renderer(this->getContext(), fGpu, path, stroke, element->isAA())) {
-                return true;
-            }
+
+        SkRegion::Op op = element->getOp();
+        bool invert = element->isInverseFilled();
+        bool needsStencil = invert || 
+                            SkRegion::kIntersect_Op == op || SkRegion::kReverseDifference_Op == op;
+
+        if (PathNeedsSWRenderer(this->getContext(), pipelineBuilder.getStencil().isDisabled(),
+                                rt, translate, element, nullptr, needsStencil)) {
+            return true;
         }
     }
     return false;
 }
 
-bool GrClipMaskManager::installClipEffects(const ElementList& elements,
-                                           GrDrawState::AutoRestoreEffects* are,
-                                           const SkVector& clipToRTOffset,
-                                           const SkRect* drawBounds) {
-
-    GrDrawState* drawState = fGpu->drawState();
+bool GrClipMaskManager::getAnalyticClipProcessor(const GrReducedClip::ElementList& elements,
+                                                 bool abortIfAA,
+                                                 SkVector& clipToRTOffset,
+                                                 const SkRect* drawBounds,
+                                                 const GrFragmentProcessor** resultFP) {
     SkRect boundsInClipSpace;
-    if (NULL != drawBounds) {
+    if (drawBounds) {
         boundsInClipSpace = *drawBounds;
         boundsInClipSpace.offset(-clipToRTOffset.fX, -clipToRTOffset.fY);
     }
-
-    are->set(drawState);
-    GrRenderTarget* rt = drawState->getRenderTarget();
-    ElementList::Iter iter(elements);
-
-    bool setARE = false;
+    SkASSERT(elements.count() <= kMaxAnalyticElements);
+    const GrFragmentProcessor* fps[kMaxAnalyticElements];
+    for (int i = 0; i < kMaxAnalyticElements; ++i) {
+        fps[i] = nullptr;
+    }
+    int fpCnt = 0;
+    GrReducedClip::ElementList::Iter iter(elements);
     bool failed = false;
-
-    while (NULL != iter.get()) {
+    while (iter.get()) {
         SkRegion::Op op = iter.get()->getOp();
         bool invert;
         bool skip = false;
@@ -136,7 +204,7 @@ bool GrClipMaskManager::installClipEffects(const ElementList& elements,
                 // Fallthrough, handled same as intersect.
             case SkRegion::kIntersect_Op:
                 invert = false;
-                if (NULL != drawBounds && iter.get()->contains(boundsInClipSpace)) {
+                if (drawBounds && iter.get()->contains(boundsInClipSpace)) {
                     skip = true;
                 }
                 break;
@@ -152,108 +220,173 @@ bool GrClipMaskManager::installClipEffects(const ElementList& elements,
         if (failed) {
             break;
         }
-
         if (!skip) {
-            GrEffectEdgeType edgeType;
-            if (GR_AA_CLIP && iter.get()->isAA()) {
-                if (rt->isMultisampled()) {
-                    // Coverage based AA clips don't place nicely with MSAA.
+            GrPrimitiveEdgeType edgeType;
+            if (iter.get()->isAA()) {
+                if (abortIfAA) {
                     failed = true;
                     break;
                 }
-                edgeType = invert ? kInverseFillAA_GrEffectEdgeType : kFillAA_GrEffectEdgeType;
+                edgeType =
+                    invert ? kInverseFillAA_GrProcessorEdgeType : kFillAA_GrProcessorEdgeType;
             } else {
-                edgeType = invert ? kInverseFillBW_GrEffectEdgeType : kFillBW_GrEffectEdgeType;
+                edgeType =
+                    invert ? kInverseFillBW_GrProcessorEdgeType : kFillBW_GrProcessorEdgeType;
             }
-            SkAutoTUnref<GrEffect> effect;
+
             switch (iter.get()->getType()) {
                 case SkClipStack::Element::kPath_Type:
-                    effect.reset(GrConvexPolyEffect::Create(edgeType, iter.get()->getPath(),
-                        &clipToRTOffset));
+                    fps[fpCnt] = GrConvexPolyEffect::Create(edgeType, iter.get()->getPath(),
+                                                            &clipToRTOffset);
                     break;
                 case SkClipStack::Element::kRRect_Type: {
                     SkRRect rrect = iter.get()->getRRect();
                     rrect.offset(clipToRTOffset.fX, clipToRTOffset.fY);
-                    effect.reset(GrRRectEffect::Create(edgeType, rrect));
+                    fps[fpCnt] = GrRRectEffect::Create(edgeType, rrect);
                     break;
                 }
                 case SkClipStack::Element::kRect_Type: {
                     SkRect rect = iter.get()->getRect();
                     rect.offset(clipToRTOffset.fX, clipToRTOffset.fY);
-                    effect.reset(GrConvexPolyEffect::Create(edgeType, rect));
+                    fps[fpCnt] = GrConvexPolyEffect::Create(edgeType, rect);
                     break;
                 }
                 default:
                     break;
             }
-            if (effect) {
-                if (!setARE) {
-                    are->set(fGpu->drawState());
-                    setARE = true;
-                }
-                fGpu->drawState()->addCoverageEffect(effect);
-            } else {
+            if (!fps[fpCnt]) {
                 failed = true;
                 break;
             }
+            fpCnt++;
         }
         iter.next();
     }
 
-    if (failed) {
-        are->set(NULL);
+    *resultFP = nullptr;
+    if (!failed && fpCnt) {
+        *resultFP = GrFragmentProcessor::RunInSeries(fps, fpCnt);
+    }
+    for (int i = 0; i < fpCnt; ++i) {
+        fps[i]->unref();
     }
-
     return !failed;
 }
 
+static void add_rect_to_clip(const GrClip& clip, const SkRect& devRect, GrClip* out) {
+    switch (clip.clipType()) {
+        case GrClip::kClipStack_ClipType: {
+            SkClipStack* stack = new SkClipStack;
+            *stack = *clip.clipStack();
+            // The stack is actually in clip space not device space.
+            SkRect clipRect = devRect;
+            SkPoint origin = { SkIntToScalar(clip.origin().fX), SkIntToScalar(clip.origin().fY) };
+            clipRect.offset(origin);
+            SkIRect iclipRect;
+            clipRect.roundOut(&iclipRect);
+            clipRect = SkRect::Make(iclipRect);
+            stack->clipDevRect(clipRect, SkRegion::kIntersect_Op, false);
+            out->setClipStack(stack, &clip.origin());
+            break;
+        }
+        case GrClip::kWideOpen_ClipType:
+            *out = GrClip(devRect);
+            break;
+        case GrClip::kIRect_ClipType: {
+            SkIRect intersect;
+            devRect.roundOut(&intersect);
+            if (intersect.intersect(clip.irect())) {
+                *out = GrClip(intersect);
+            } else {
+                *out = clip;
+            }
+            break;
+        }
+    }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // sort out what kind of clip mask needs to be created: alpha, stencil,
 // scissor, or entirely software
-bool GrClipMaskManager::setupClipping(const GrClipData* clipDataIn,
-                                      GrDrawState::AutoRestoreEffects* are,
-                                      const SkRect* devBounds) {
-    fCurrClipMaskType = kNone_ClipMaskType;
-
-    ElementList elements(16);
-    int32_t genID;
-    InitialState initialState;
-    SkIRect clipSpaceIBounds;
-    bool requiresAA;
-
-    GrDrawState* drawState = fGpu->drawState();
-
-    const GrRenderTarget* rt = drawState->getRenderTarget();
-    // GrDrawTarget should have filtered this for us
-    SkASSERT(NULL != rt);
-
-    bool ignoreClip = !drawState->isClipState() || clipDataIn->fClipStack->isWideOpen();
-
-    if (!ignoreClip) {
-        SkIRect clipSpaceRTIBounds = SkIRect::MakeWH(rt->width(), rt->height());
-        clipSpaceRTIBounds.offset(clipDataIn->fOrigin);
-        ReduceClipStack(*clipDataIn->fClipStack,
-                        clipSpaceRTIBounds,
-                        &elements,
-                        &genID,
-                        &initialState,
-                        &clipSpaceIBounds,
-                        &requiresAA);
-        if (elements.isEmpty()) {
-            if (kAllIn_InitialState == initialState) {
-                ignoreClip = clipSpaceIBounds == clipSpaceRTIBounds;
-            } else {
-                return false;
-            }
-        }
+bool GrClipMaskManager::setupClipping(const GrPipelineBuilder& pipelineBuilder,
+                                      GrPipelineBuilder::AutoRestoreStencil* ars,
+                                      const SkRect* devBounds,
+                                      GrAppliedClip* out) {
+    if (kRespectClip_StencilClipMode == fClipMode) {
+        fClipMode = kIgnoreClip_StencilClipMode;
     }
 
-    if (ignoreClip) {
-        fGpu->disableScissor();
-        this->setGpuStencil();
+    GrReducedClip::ElementList elements;
+    int32_t genID = 0;
+    GrReducedClip::InitialState initialState = GrReducedClip::kAllIn_InitialState;
+    SkIRect clipSpaceIBounds;
+    bool requiresAA = false;
+    GrRenderTarget* rt = pipelineBuilder.getRenderTarget();
+
+    // GrDrawTarget should have filtered this for us
+    SkASSERT(rt);
+
+    SkIRect clipSpaceRTIBounds = SkIRect::MakeWH(rt->width(), rt->height());
+    GrClip devBoundsClip;
+    bool doDevBoundsClip = fDebugClipBatchToBounds && devBounds;
+    if (doDevBoundsClip) {
+        add_rect_to_clip(pipelineBuilder.clip(), *devBounds, &devBoundsClip);
+    }
+    const GrClip& clip = doDevBoundsClip ? devBoundsClip : pipelineBuilder.clip();
+
+    if (clip.isWideOpen(clipSpaceRTIBounds)) {
+        this->setPipelineBuilderStencil(pipelineBuilder, ars);
         return true;
     }
 
+    // The clip mask manager always draws with a single IRect so we special case that logic here
+    // Image filters just use a rect, so we also special case that logic
+    switch (clip.clipType()) {
+        case GrClip::kWideOpen_ClipType:
+            SkFAIL("Should have caught this with clip.isWideOpen()");
+            return true;
+        case GrClip::kIRect_ClipType: {
+            SkIRect scissor = clip.irect();
+            if (scissor.intersect(clipSpaceRTIBounds)) {
+                out->fScissorState.set(scissor);
+                this->setPipelineBuilderStencil(pipelineBuilder, ars);
+                return true;
+            }
+            return false;
+        }
+        case GrClip::kClipStack_ClipType: {
+            clipSpaceRTIBounds.offset(clip.origin());
+            SkIRect clipSpaceReduceQueryBounds;
+#define DISABLE_DEV_BOUNDS_FOR_CLIP_REDUCTION 1
+            if (devBounds && !DISABLE_DEV_BOUNDS_FOR_CLIP_REDUCTION) {
+                SkIRect devIBounds = devBounds->roundOut();
+                devIBounds.offset(clip.origin());
+                if (!clipSpaceReduceQueryBounds.intersect(clipSpaceRTIBounds, devIBounds)) {
+                    return false;
+                }
+            } else {
+                clipSpaceReduceQueryBounds = clipSpaceRTIBounds;
+            }
+            GrReducedClip::ReduceClipStack(*clip.clipStack(),
+                                            clipSpaceReduceQueryBounds,
+                                            &elements,
+                                            &genID,
+                                            &initialState,
+                                            &clipSpaceIBounds,
+                                            &requiresAA);
+            if (elements.isEmpty()) {
+                if (GrReducedClip::kAllIn_InitialState == initialState) {
+                    if (clipSpaceIBounds == clipSpaceRTIBounds) {
+                        this->setPipelineBuilderStencil(pipelineBuilder, ars);
+                        return true;
+                    }
+                } else {
+                    return false;
+                }
+            }
+        } break;
+    }
+
     // An element count of 4 was chosen because of the common pattern in Blink of:
     //   isect RR
     //   diff  RR
@@ -262,68 +395,73 @@ bool GrClipMaskManager::setupClipping(const GrClipData* clipDataIn,
     // when drawing rounded div borders. This could probably be tuned based on a
     // configuration's relative costs of switching RTs to generate a mask vs
     // longer shaders.
-    if (elements.count() <= 4) {
-        SkVector clipToRTOffset = { SkIntToScalar(-clipDataIn->fOrigin.fX),
-                                    SkIntToScalar(-clipDataIn->fOrigin.fY) };
+    if (elements.count() <= kMaxAnalyticElements) {
+        SkVector clipToRTOffset = { SkIntToScalar(-clip.origin().fX),
+                                    SkIntToScalar(-clip.origin().fY) };
+        // When there are multiple samples we want to do per-sample clipping, not compute a
+        // fractional pixel coverage.
+        bool disallowAnalyticAA = rt->isUnifiedMultisampled() || pipelineBuilder.hasMixedSamples();
+        const GrFragmentProcessor* clipFP = nullptr;
         if (elements.isEmpty() ||
-            (requiresAA && this->installClipEffects(elements, are, clipToRTOffset, devBounds))) {
+            (requiresAA &&
+             this->getAnalyticClipProcessor(elements, disallowAnalyticAA, clipToRTOffset, devBounds,
+                                            &clipFP))) {
             SkIRect scissorSpaceIBounds(clipSpaceIBounds);
-            scissorSpaceIBounds.offset(-clipDataIn->fOrigin);
-            if (NULL == devBounds ||
+            scissorSpaceIBounds.offset(-clip.origin());
+            if (nullptr == devBounds ||
                 !SkRect::Make(scissorSpaceIBounds).contains(*devBounds)) {
-                fGpu->enableScissor(scissorSpaceIBounds);
-            } else {
-                fGpu->disableScissor();
+                out->fScissorState.set(scissorSpaceIBounds);
             }
-            this->setGpuStencil();
+            this->setPipelineBuilderStencil(pipelineBuilder, ars);
+            out->fClipCoverageFP.reset(clipFP);
             return true;
         }
     }
 
-#if GR_AA_CLIP
-    // If MSAA is enabled we can do everything in the stencil buffer.
-    if (0 == rt->numSamples() && requiresAA) {
-        GrTexture* result = NULL;
+    // If the stencil buffer is multisampled we can use it to do everything.
+    if (!rt->isStencilBufferMultisampled() && requiresAA) {
+        SkAutoTUnref<GrTexture> result;
 
-        if (this->useSWOnlyPath(elements)) {
+        // The top-left of the mask corresponds to the top-left corner of the bounds.
+        SkVector clipToMaskOffset = {
+            SkIntToScalar(-clipSpaceIBounds.fLeft),
+            SkIntToScalar(-clipSpaceIBounds.fTop)
+        };
+
+        if (this->useSWOnlyPath(pipelineBuilder, rt, clipToMaskOffset, elements)) {
             // The clip geometry is complex enough that it will be more efficient to create it
             // entirely in software
-            result = this->createSoftwareClipMask(genID,
-                                                  initialState,
-                                                  elements,
-                                                  clipSpaceIBounds);
+            result.reset(this->createSoftwareClipMask(genID,
+                                                      initialState,
+                                                      elements,
+                                                      clipToMaskOffset,
+                                                      clipSpaceIBounds));
         } else {
-            result = this->createAlphaClipMask(genID,
-                                               initialState,
-                                               elements,
-                                               clipSpaceIBounds);
+            result.reset(this->createAlphaClipMask(genID,
+                                                   initialState,
+                                                   elements,
+                                                   clipToMaskOffset,
+                                                   clipSpaceIBounds));
+            // If createAlphaClipMask fails it means useSWOnlyPath has a bug
+            SkASSERT(result);
         }
 
-        if (NULL != result) {
+        if (result) {
             // The mask's top left coord should be pinned to the rounded-out top left corner of
             // clipSpace bounds. We determine the mask's position WRT to the render target here.
             SkIRect rtSpaceMaskBounds = clipSpaceIBounds;
-            rtSpaceMaskBounds.offset(-clipDataIn->fOrigin);
-            are->set(fGpu->drawState());
-            setup_drawstate_aaclip(fGpu, result, rtSpaceMaskBounds);
-            fGpu->disableScissor();
-            this->setGpuStencil();
+            rtSpaceMaskBounds.offset(-clip.origin());
+            out->fClipCoverageFP.reset(create_fp_for_mask(result, rtSpaceMaskBounds));
+            this->setPipelineBuilderStencil(pipelineBuilder, ars);
             return true;
         }
         // if alpha clip mask creation fails fall through to the non-AA code paths
     }
-#endif // GR_AA_CLIP
-
-    // Either a hard (stencil buffer) clip was explicitly requested or an anti-aliased clip couldn't
-    // be created. In either case, free up the texture in the anti-aliased mask cache.
-    // TODO: this may require more investigation. Ganesh performs a lot of utility draws (e.g.,
-    // clears, InOrderDrawBuffer playbacks) that hit the stencil buffer path. These may be
-    // "incorrectly" clearing the AA cache.
-    fAACache.reset();
 
     // use the stencil clip if we can't represent the clip as a rectangle.
-    SkIPoint clipSpaceToStencilSpaceOffset = -clipDataIn->fOrigin;
-    this->createStencilClipMask(genID,
+    SkIPoint clipSpaceToStencilSpaceOffset = -clip.origin();
+    this->createStencilClipMask(rt,
+                                genID,
                                 initialState,
                                 elements,
                                 clipSpaceIBounds,
@@ -334,62 +472,34 @@ bool GrClipMaskManager::setupClipping(const GrClipData* clipDataIn,
     // use both stencil and scissor test to the bounds for the final draw.
     SkIRect scissorSpaceIBounds(clipSpaceIBounds);
     scissorSpaceIBounds.offset(clipSpaceToStencilSpaceOffset);
-    fGpu->enableScissor(scissorSpaceIBounds);
-    this->setGpuStencil();
+    out->fScissorState.set(scissorSpaceIBounds);
+    this->setPipelineBuilderStencil(pipelineBuilder, ars);
     return true;
 }
 
-#define VISUALIZE_COMPLEX_CLIP 0
-
-#if VISUALIZE_COMPLEX_CLIP
-    #include "SkRandom.h"
-    SkRandom gRandom;
-    #define SET_RANDOM_COLOR drawState->setColor(0xff000000 | gRandom.nextU());
-#else
-    #define SET_RANDOM_COLOR
-#endif
-
 namespace {
-
 ////////////////////////////////////////////////////////////////////////////////
-// set up the OpenGL blend function to perform the specified
-// boolean operation for alpha clip mask creation
-void setup_boolean_blendcoeffs(GrDrawState* drawState, SkRegion::Op op) {
-
-    switch (op) {
-        case SkRegion::kReplace_Op:
-            drawState->setBlendFunc(kOne_GrBlendCoeff, kZero_GrBlendCoeff);
-            break;
-        case SkRegion::kIntersect_Op:
-            drawState->setBlendFunc(kDC_GrBlendCoeff, kZero_GrBlendCoeff);
-            break;
-        case SkRegion::kUnion_Op:
-            drawState->setBlendFunc(kOne_GrBlendCoeff, kISC_GrBlendCoeff);
-            break;
-        case SkRegion::kXOR_Op:
-            drawState->setBlendFunc(kIDC_GrBlendCoeff, kISC_GrBlendCoeff);
-            break;
-        case SkRegion::kDifference_Op:
-            drawState->setBlendFunc(kZero_GrBlendCoeff, kISC_GrBlendCoeff);
-            break;
-        case SkRegion::kReverseDifference_Op:
-            drawState->setBlendFunc(kIDC_GrBlendCoeff, kZero_GrBlendCoeff);
-            break;
-        default:
-            SkASSERT(false);
-            break;
-    }
+// Set a coverage drawing XPF on the pipelineBuilder for the given op and invertCoverage mode
+void set_coverage_drawing_xpf(SkRegion::Op op, bool invertCoverage,
+                              GrPipelineBuilder* pipelineBuilder) {
+    SkASSERT(op <= SkRegion::kLastOp);
+    pipelineBuilder->setCoverageSetOpXPFactory(op, invertCoverage);
 }
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool GrClipMaskManager::drawElement(GrTexture* target,
+bool GrClipMaskManager::drawElement(GrPipelineBuilder* pipelineBuilder,
+                                    const SkMatrix& viewMatrix,
+                                    GrTexture* target,
                                     const SkClipStack::Element* element,
                                     GrPathRenderer* pr) {
-    GrDrawState* drawState = fGpu->drawState();
 
-    drawState->setRenderTarget(target->asRenderTarget());
+    GrRenderTarget* rt = target->asRenderTarget();
+    pipelineBuilder->setRenderTarget(rt);
+
+    // The color we use to draw does not matter since we will always be using a GrCoverageSetOpXP
+    // which ignores color.
+    GrColor color = GrColor_WHITE;
 
     // TODO: Draw rrects directly here.
     switch (element->getType()) {
@@ -397,17 +507,17 @@ bool GrClipMaskManager::drawElement(GrTexture* target,
             SkDEBUGFAIL("Should never get here with an empty element.");
             break;
         case Element::kRect_Type:
-            // TODO: Do rects directly to the accumulator using a aa-rect GrEffect that covers the
-            // entire mask bounds and writes 0 outside the rect.
+            // TODO: Do rects directly to the accumulator using a aa-rect GrProcessor that covers
+            // the entire mask bounds and writes 0 outside the rect.
             if (element->isAA()) {
-                getContext()->getAARectRenderer()->fillAARect(fGpu,
-                                                              fGpu,
-                                                              element->getRect(),
-                                                              SkMatrix::I(),
-                                                              element->getRect(),
-                                                              false);
+                SkRect devRect = element->getRect();
+                viewMatrix.mapRect(&devRect);
+
+                fDrawTarget->drawAARect(*pipelineBuilder, color, viewMatrix,
+                                        element->getRect(), devRect);
             } else {
-                fGpu->drawSimpleRect(element->getRect(), NULL);
+                fDrawTarget->drawNonAARect(*pipelineBuilder, color, viewMatrix,
+                                           element->getRect());
             }
             return true;
         default: {
@@ -416,225 +526,139 @@ bool GrClipMaskManager::drawElement(GrTexture* target,
             if (path.isInverseFillType()) {
                 path.toggleInverseFillType();
             }
-            SkStrokeRec stroke(SkStrokeRec::kFill_InitStyle);
-            if (NULL == pr) {
+            GrStrokeInfo stroke(SkStrokeRec::kFill_InitStyle);
+            if (nullptr == pr) {
                 GrPathRendererChain::DrawType type;
                 type = element->isAA() ? GrPathRendererChain::kColorAntiAlias_DrawType :
                                          GrPathRendererChain::kColor_DrawType;
-                pr = this->getContext()->getPathRenderer(path, stroke, fGpu, false, type);
+
+                GrPathRenderer::CanDrawPathArgs canDrawArgs;
+                canDrawArgs.fShaderCaps = this->getContext()->caps()->shaderCaps();
+                canDrawArgs.fViewMatrix = &viewMatrix;
+                canDrawArgs.fPath = &path;
+                canDrawArgs.fStroke = &stroke;
+                canDrawArgs.fAntiAlias = element->isAA();;
+                canDrawArgs.fIsStencilDisabled = pipelineBuilder->getStencil().isDisabled();
+                canDrawArgs.fIsStencilBufferMSAA = rt->isStencilBufferMultisampled();
+
+                pr = this->getContext()->drawingManager()->getPathRenderer(canDrawArgs, false, type);
             }
-            if (NULL == pr) {
+            if (nullptr == pr) {
                 return false;
             }
-            pr->drawPath(path, stroke, fGpu, element->isAA());
+            GrPathRenderer::DrawPathArgs args;
+            args.fTarget = fDrawTarget;
+            args.fResourceProvider = this->getContext()->resourceProvider();
+            args.fPipelineBuilder = pipelineBuilder;
+            args.fColor = color;
+            args.fViewMatrix = &viewMatrix;
+            args.fPath = &path;
+            args.fStroke = &stroke;
+            args.fAntiAlias = element->isAA();
+            pr->drawPath(args);
             break;
         }
     }
     return true;
 }
 
-bool GrClipMaskManager::canStencilAndDrawElement(GrTexture* target,
-                                                 const SkClipStack::Element* element,
-                                                 GrPathRenderer** pr) {
-    GrDrawState* drawState = fGpu->drawState();
-    drawState->setRenderTarget(target->asRenderTarget());
-
-    if (Element::kRect_Type == element->getType()) {
-        return true;
-    } else {
-        // We shouldn't get here with an empty clip element.
-        SkASSERT(Element::kEmpty_Type != element->getType());
-        SkPath path;
-        element->asPath(&path);
-        if (path.isInverseFillType()) {
-            path.toggleInverseFillType();
-        }
-        SkStrokeRec stroke(SkStrokeRec::kFill_InitStyle);
-        GrPathRendererChain::DrawType type = element->isAA() ?
-            GrPathRendererChain::kStencilAndColorAntiAlias_DrawType :
-            GrPathRendererChain::kStencilAndColor_DrawType;
-        *pr = this->getContext()->getPathRenderer(path, stroke, fGpu, false, type);
-        return NULL != *pr;
-    }
-}
-
-void GrClipMaskManager::mergeMask(GrTexture* dstMask,
-                                  GrTexture* srcMask,
-                                  SkRegion::Op op,
-                                  const SkIRect& dstBound,
-                                  const SkIRect& srcBound) {
-    GrDrawState::AutoViewMatrixRestore avmr;
-    GrDrawState* drawState = fGpu->drawState();
-    SkAssertResult(avmr.setIdentity(drawState));
-    GrDrawState::AutoRestoreEffects are(drawState);
-
-    drawState->setRenderTarget(dstMask->asRenderTarget());
-
-    setup_boolean_blendcoeffs(drawState, op);
-
-    SkMatrix sampleM;
-    sampleM.setIDiv(srcMask->width(), srcMask->height());
-
-    drawState->addColorEffect(
-        GrTextureDomainEffect::Create(srcMask,
-                                      sampleM,
-                                      GrTextureDomain::MakeTexelDomain(srcMask, srcBound),
-                                      GrTextureDomain::kDecal_Mode,
-                                      GrTextureParams::kNone_FilterMode))->unref();
-    fGpu->drawSimpleRect(SkRect::Make(dstBound), NULL);
-}
-
-// get a texture to act as a temporary buffer for AA clip boolean operations
-// TODO: given the expense of createTexture we may want to just cache this too
-void GrClipMaskManager::getTemp(int width, int height, GrAutoScratchTexture* temp) {
-    if (NULL != temp->texture()) {
-        // we've already allocated the temp texture
-        return;
-    }
-
-    GrTextureDesc desc;
-    desc.fFlags = kRenderTarget_GrTextureFlagBit|kNoStencil_GrTextureFlagBit;
-    desc.fWidth = width;
-    desc.fHeight = height;
-    desc.fConfig = kAlpha_8_GrPixelConfig;
-
-    temp->set(this->getContext(), desc);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Return the texture currently in the cache if it exists. Otherwise, return NULL
-GrTexture* GrClipMaskManager::getCachedMaskTexture(int32_t elementsGenID,
-                                                   const SkIRect& clipSpaceIBounds) {
-    bool cached = fAACache.canReuse(elementsGenID, clipSpaceIBounds);
-    if (!cached) {
-        return NULL;
-    }
-
-    return fAACache.getLastMask();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Allocate a texture in the texture cache. This function returns the texture
-// allocated (or NULL on error).
-GrTexture* GrClipMaskManager::allocMaskTexture(int32_t elementsGenID,
-                                               const SkIRect& clipSpaceIBounds,
-                                               bool willUpload) {
-    // Since we are setting up the cache we should free up the
-    // currently cached mask so it can be reused.
-    fAACache.reset();
-
-    GrTextureDesc desc;
-    desc.fFlags = willUpload ? kNone_GrTextureFlags : kRenderTarget_GrTextureFlagBit;
-    desc.fWidth = clipSpaceIBounds.width();
-    desc.fHeight = clipSpaceIBounds.height();
-    desc.fConfig = kRGBA_8888_GrPixelConfig;
-    if (willUpload || this->getContext()->isConfigRenderable(kAlpha_8_GrPixelConfig, false)) {
-        // We would always like A8 but it isn't supported on all platforms
-        desc.fConfig = kAlpha_8_GrPixelConfig;
-    }
-
-    fAACache.acquireMask(elementsGenID, desc, clipSpaceIBounds);
-    return fAACache.getLastMask();
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // Create a 8-bit clip mask in alpha
-GrTexture* GrClipMaskManager::createAlphaClipMask(int32_t elementsGenID,
-                                                  InitialState initialState,
-                                                  const ElementList& elements,
-                                                  const SkIRect& clipSpaceIBounds) {
-    SkASSERT(kNone_ClipMaskType == fCurrClipMaskType);
 
-    // First, check for cached texture
-    GrTexture* result = this->getCachedMaskTexture(elementsGenID, clipSpaceIBounds);
-    if (NULL != result) {
-        fCurrClipMaskType = kAlpha_ClipMaskType;
-        return result;
+static void GetClipMaskKey(int32_t clipGenID, const SkIRect& bounds, GrUniqueKey* key) {
+    static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
+    GrUniqueKey::Builder builder(key, kDomain, 3);
+    builder[0] = clipGenID;
+    builder[1] = SkToU16(bounds.fLeft) | (SkToU16(bounds.fRight) << 16);
+    builder[2] = SkToU16(bounds.fTop) | (SkToU16(bounds.fBottom) << 16);
+}
+
+GrTexture* GrClipMaskManager::createCachedMask(int width, int height, const GrUniqueKey& key,
+                                               bool renderTarget) {
+    GrSurfaceDesc desc;
+    desc.fWidth = width;
+    desc.fHeight = height;
+    desc.fFlags = renderTarget ? kRenderTarget_GrSurfaceFlag : kNone_GrSurfaceFlags;
+    if (!renderTarget || this->caps()->isConfigRenderable(kAlpha_8_GrPixelConfig, false)) {
+        desc.fConfig = kAlpha_8_GrPixelConfig;
+    } else {
+        desc.fConfig = kRGBA_8888_GrPixelConfig;
+    }
+
+    GrTexture* texture = this->resourceProvider()->createApproxTexture(desc, 0);
+    if (!texture) {
+        return nullptr;
+    }
+    texture->resourcePriv().setUniqueKey(key);
+    return texture;
+}
+
+GrTexture* GrClipMaskManager::createAlphaClipMask(int32_t elementsGenID,
+                                                  GrReducedClip::InitialState initialState,
+                                                  const GrReducedClip::ElementList& elements,
+                                                  const SkVector& clipToMaskOffset,
+                                                  const SkIRect& clipSpaceIBounds) {
+    GrResourceProvider* resourceProvider = this->resourceProvider();
+    GrUniqueKey key;
+    GetClipMaskKey(elementsGenID, clipSpaceIBounds, &key);
+    if (GrTexture* texture = resourceProvider->findAndRefTextureByUniqueKey(key)) {
+        return texture;
     }
 
     // There's no texture in the cache. Let's try to allocate it then.
-    result = this->allocMaskTexture(elementsGenID, clipSpaceIBounds, false);
-    if (NULL == result) {
-        fAACache.reset();
-        return NULL;
+    SkAutoTUnref<GrTexture> texture(this->createCachedMask(
+        clipSpaceIBounds.width(), clipSpaceIBounds.height(), key, true));
+    if (!texture) {
+        return nullptr;
     }
 
-    // The top-left of the mask corresponds to the top-left corner of the bounds.
-    SkVector clipToMaskOffset = {
-        SkIntToScalar(-clipSpaceIBounds.fLeft),
-        SkIntToScalar(-clipSpaceIBounds.fTop)
-    };
+    // Set the matrix so that rendered clip elements are transformed to mask space from clip
+    // space.
+    const SkMatrix translate = SkMatrix::MakeTrans(clipToMaskOffset.fX, clipToMaskOffset.fY);
+
     // The texture may be larger than necessary, this rect represents the part of the texture
     // we populate with a rasterization of the clip.
     SkIRect maskSpaceIBounds = SkIRect::MakeWH(clipSpaceIBounds.width(), clipSpaceIBounds.height());
 
-    // Set the matrix so that rendered clip elements are transformed to mask space from clip space.
-    SkMatrix translate;
-    translate.setTranslate(clipToMaskOffset);
-    GrDrawTarget::AutoGeometryAndStatePush agasp(fGpu, GrDrawTarget::kReset_ASRInit, &translate);
-
-    GrDrawState* drawState = fGpu->drawState();
-
-    // We're drawing a coverage mask and want coverage to be run through the blend function.
-    drawState->enableState(GrDrawState::kCoverageDrawing_StateBit);
-
     // The scratch texture that we are drawing into can be substantially larger than the mask. Only
     // clear the part that we care about.
-    fGpu->clear(&maskSpaceIBounds,
-                kAllIn_InitialState == initialState ? 0xffffffff : 0x00000000,
-                true,
-                result->asRenderTarget());
+    fDrawTarget->clear(&maskSpaceIBounds,
+                       GrReducedClip::kAllIn_InitialState == initialState ? 0xffffffff : 0x00000000,
+                       true,
+                       texture->asRenderTarget());
 
     // When we use the stencil in the below loop it is important to have this clip installed.
     // The second pass that zeros the stencil buffer renders the rect maskSpaceIBounds so the first
     // pass must not set values outside of this bounds or stencil values outside the rect won't be
     // cleared.
-    GrDrawTarget::AutoClipRestore acr(fGpu, maskSpaceIBounds);
-    drawState->enableState(GrDrawState::kClip_StateBit);
+    const GrClip clip(maskSpaceIBounds);
 
-    GrAutoScratchTexture temp;
     // walk through each clip element and perform its set op
-    for (ElementList::Iter iter = elements.headIter(); iter.get(); iter.next()) {
+    for (GrReducedClip::ElementList::Iter iter = elements.headIter(); iter.get(); iter.next()) {
         const Element* element = iter.get();
         SkRegion::Op op = element->getOp();
         bool invert = element->isInverseFilled();
-
         if (invert || SkRegion::kIntersect_Op == op || SkRegion::kReverseDifference_Op == op) {
-            GrPathRenderer* pr = NULL;
-            bool useTemp = !this->canStencilAndDrawElement(result, element, &pr);
-            GrTexture* dst;
-            // This is the bounds of the clip element in the space of the alpha-mask. The temporary
-            // mask buffer can be substantially larger than the actually clip stack element. We
-            // touch the minimum number of pixels necessary and use decal mode to combine it with
-            // the accumulator.
-            SkIRect maskSpaceElementIBounds;
 
-            if (useTemp) {
-                if (invert) {
-                    maskSpaceElementIBounds = maskSpaceIBounds;
-                } else {
-                    SkRect elementBounds = element->getBounds();
-                    elementBounds.offset(clipToMaskOffset);
-                    elementBounds.roundOut(&maskSpaceElementIBounds);
-                }
+            GrPathRenderer* pr = GetPathRenderer(this->getContext(),
+                                                 texture, translate, element);
+            if (Element::kRect_Type != element->getType() && !pr) {
+                // useSWOnlyPath should now filter out all cases where gpu-side mask merging would
+                // be performed (i.e., pr would be NULL for a non-rect path). See https://bug.skia.org/4519
+                // for rationale and details.
+                SkASSERT(0);
+                continue;
+            }
 
-                this->getTemp(maskSpaceIBounds.fRight, maskSpaceIBounds.fBottom, &temp);
-                if (NULL == temp.texture()) {
-                    fAACache.reset();
-                    return NULL;
-                }
-                dst = temp.texture();
-                // clear the temp target and set blend to replace
-                fGpu->clear(&maskSpaceElementIBounds,
-                            invert ? 0xffffffff : 0x00000000,
-                            true,
-                            dst->asRenderTarget());
-                setup_boolean_blendcoeffs(drawState, SkRegion::kReplace_Op);
+            {
+                GrPipelineBuilder pipelineBuilder;
+
+                pipelineBuilder.setClip(clip);
+                pipelineBuilder.setRenderTarget(texture->asRenderTarget());
+                SkASSERT(pipelineBuilder.getStencil().isDisabled());
 
-            } else {
                 // draw directly into the result with the stencil set to make the pixels affected
                 // by the clip shape be non-zero.
-                dst = result;
                 GR_STATIC_CONST_SAME_STENCIL(kStencilInElement,
                                              kReplace_StencilOp,
                                              kReplace_StencilOp,
@@ -642,28 +666,21 @@ GrTexture* GrClipMaskManager::createAlphaClipMask(int32_t elementsGenID,
                                              0xffff,
                                              0xffff,
                                              0xffff);
-                drawState->setStencil(kStencilInElement);
-                setup_boolean_blendcoeffs(drawState, op);
+                pipelineBuilder.setStencil(kStencilInElement);
+                set_coverage_drawing_xpf(op, invert, &pipelineBuilder);
+
+                if (!this->drawElement(&pipelineBuilder, translate, texture, element, pr)) {
+                    texture->resourcePriv().removeUniqueKey();
+                    return nullptr;
+                }
             }
 
-            drawState->setAlpha(invert ? 0x00 : 0xff);
+            {
+                GrPipelineBuilder backgroundPipelineBuilder;
+                backgroundPipelineBuilder.setRenderTarget(texture->asRenderTarget());
 
-            if (!this->drawElement(dst, element, pr)) {
-                fAACache.reset();
-                return NULL;
-            }
-
-            if (useTemp) {
-                // Now draw into the accumulator using the real operation and the temp buffer as a
-                // texture
-                this->mergeMask(result,
-                                temp.texture(),
-                                op,
-                                maskSpaceIBounds,
-                                maskSpaceElementIBounds);
-            } else {
+                set_coverage_drawing_xpf(op, !invert, &backgroundPipelineBuilder);
                 // Draw to the exterior pixels (those with a zero stencil value).
-                drawState->setAlpha(invert ? 0xff : 0x00);
                 GR_STATIC_CONST_SAME_STENCIL(kDrawOutsideElement,
                                              kZero_StencilOp,
                                              kZero_StencilOp,
@@ -671,98 +688,91 @@ GrTexture* GrClipMaskManager::createAlphaClipMask(int32_t elementsGenID,
                                              0xffff,
                                              0x0000,
                                              0xffff);
-                drawState->setStencil(kDrawOutsideElement);
-                fGpu->drawSimpleRect(clipSpaceIBounds);
-                drawState->disableStencil();
+                backgroundPipelineBuilder.setStencil(kDrawOutsideElement);
+
+                // The color passed in here does not matter since the coverageSetOpXP won't read it.
+                fDrawTarget->drawNonAARect(backgroundPipelineBuilder, GrColor_WHITE, translate,
+                                           clipSpaceIBounds);
             }
         } else {
+            GrPipelineBuilder pipelineBuilder;
+
             // all the remaining ops can just be directly draw into the accumulation buffer
-            drawState->setAlpha(0xff);
-            setup_boolean_blendcoeffs(drawState, op);
-            this->drawElement(result, element);
+            set_coverage_drawing_xpf(op, false, &pipelineBuilder);
+            // The color passed in here does not matter since the coverageSetOpXP won't read it.
+            this->drawElement(&pipelineBuilder, translate, texture, element);
         }
     }
 
-    fCurrClipMaskType = kAlpha_ClipMaskType;
-    return result;
+    return texture.detach();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Create a 1-bit clip mask in the stencil buffer. 'devClipBounds' are in device
 // (as opposed to canvas) coordinates
-bool GrClipMaskManager::createStencilClipMask(int32_t elementsGenID,
-                                              InitialState initialState,
-                                              const ElementList& elements,
+bool GrClipMaskManager::createStencilClipMask(GrRenderTarget* rt,
+                                              int32_t elementsGenID,
+                                              GrReducedClip::InitialState initialState,
+                                              const GrReducedClip::ElementList& elements,
                                               const SkIRect& clipSpaceIBounds,
                                               const SkIPoint& clipSpaceToStencilOffset) {
+    SkASSERT(rt);
 
-    SkASSERT(kNone_ClipMaskType == fCurrClipMaskType);
-
-    GrDrawState* drawState = fGpu->drawState();
-    SkASSERT(drawState->isClipState());
-
-    GrRenderTarget* rt = drawState->getRenderTarget();
-    SkASSERT(NULL != rt);
-
-    // TODO: dynamically attach a SB when needed.
-    GrStencilBuffer* stencilBuffer = rt->getStencilBuffer();
-    if (NULL == stencilBuffer) {
+    GrStencilAttachment* stencilAttachment = this->resourceProvider()->attachStencilAttachment(rt);
+    if (nullptr == stencilAttachment) {
         return false;
     }
 
-    if (stencilBuffer->mustRenderClip(elementsGenID, clipSpaceIBounds, clipSpaceToStencilOffset)) {
-
-        stencilBuffer->setLastClip(elementsGenID, clipSpaceIBounds, clipSpaceToStencilOffset);
-
+    if (stencilAttachment->mustRenderClip(elementsGenID, clipSpaceIBounds, clipSpaceToStencilOffset)) {
+        stencilAttachment->setLastClip(elementsGenID, clipSpaceIBounds, clipSpaceToStencilOffset);
         // Set the matrix so that rendered clip elements are transformed from clip to stencil space.
         SkVector translate = {
             SkIntToScalar(clipSpaceToStencilOffset.fX),
             SkIntToScalar(clipSpaceToStencilOffset.fY)
         };
-        SkMatrix matrix;
-        matrix.setTranslate(translate);
-        GrDrawTarget::AutoGeometryAndStatePush agasp(fGpu, GrDrawTarget::kReset_ASRInit, &matrix);
-        drawState = fGpu->drawState();
-
-        drawState->setRenderTarget(rt);
+        SkMatrix viewMatrix;
+        viewMatrix.setTranslate(translate);
 
         // We set the current clip to the bounds so that our recursive draws are scissored to them.
         SkIRect stencilSpaceIBounds(clipSpaceIBounds);
         stencilSpaceIBounds.offset(clipSpaceToStencilOffset);
-        GrDrawTarget::AutoClipRestore acr(fGpu, stencilSpaceIBounds);
-        drawState->enableState(GrDrawState::kClip_StateBit);
+        GrClip clip(stencilSpaceIBounds);
 
-#if !VISUALIZE_COMPLEX_CLIP
-        drawState->enableState(GrDrawState::kNoColorWrites_StateBit);
-#endif
-
-        int clipBit = stencilBuffer->bits();
+        int clipBit = stencilAttachment->bits();
         SkASSERT((clipBit <= 16) && "Ganesh only handles 16b or smaller stencil buffers");
         clipBit = (1 << (clipBit-1));
 
-        fGpu->clearStencilClip(stencilSpaceIBounds, kAllIn_InitialState == initialState);
+        fDrawTarget->cmmAccess().clearStencilClip(stencilSpaceIBounds,
+            GrReducedClip::kAllIn_InitialState == initialState, rt);
 
         // walk through each clip element and perform its set op
         // with the existing clip.
-        for (ElementList::Iter iter(elements.headIter()); NULL != iter.get(); iter.next()) {
+        for (GrReducedClip::ElementList::Iter iter(elements.headIter()); iter.get(); iter.next()) {
             const Element* element = iter.get();
+
+            GrPipelineBuilder pipelineBuilder;
+            pipelineBuilder.setClip(clip);
+            pipelineBuilder.setRenderTarget(rt);
+
+            pipelineBuilder.setDisableColorXPFactory();
+
+            // if the target is MSAA then we want MSAA enabled when the clip is soft
+            if (rt->isStencilBufferMultisampled()) {
+                pipelineBuilder.setState(GrPipelineBuilder::kHWAntialias_Flag, element->isAA());
+            }
+
             bool fillInverted = false;
             // enabled at bottom of loop
-            drawState->disableState(GrGpu::kModifyStencilClip_StateBit);
-            // if the target is MSAA then we want MSAA enabled when the clip is soft
-            if (rt->isMultisampled()) {
-                drawState->setState(GrDrawState::kHWAntialias_StateBit, element->isAA());
-            }
+            fClipMode = kIgnoreClip_StencilClipMode;
 
             // This will be used to determine whether the clip shape can be rendered into the
             // stencil with arbitrary stencil settings.
             GrPathRenderer::StencilSupport stencilSupport;
 
-            SkStrokeRec stroke(SkStrokeRec::kFill_InitStyle);
-
+            GrStrokeInfo stroke(SkStrokeRec::kFill_InitStyle);
             SkRegion::Op op = element->getOp();
 
-            GrPathRenderer* pr = NULL;
+            GrPathRenderer* pr = nullptr;
             SkPath clipPath;
             if (Element::kRect_Type == element->getType()) {
                 stencilSupport = GrPathRenderer::kNoRestriction_StencilSupport;
@@ -773,13 +783,22 @@ bool GrClipMaskManager::createStencilClipMask(int32_t elementsGenID,
                 if (fillInverted) {
                     clipPath.toggleInverseFillType();
                 }
-                pr = this->getContext()->getPathRenderer(clipPath,
-                                                         stroke,
-                                                         fGpu,
-                                                         false,
-                                                         GrPathRendererChain::kStencilOnly_DrawType,
-                                                         &stencilSupport);
-                if (NULL == pr) {
+
+                SkASSERT(pipelineBuilder.getStencil().isDisabled());
+
+                GrPathRenderer::CanDrawPathArgs canDrawArgs;
+                canDrawArgs.fShaderCaps = this->getContext()->caps()->shaderCaps();
+                canDrawArgs.fViewMatrix = &viewMatrix;
+                canDrawArgs.fPath = &clipPath;
+                canDrawArgs.fStroke = &stroke;
+                canDrawArgs.fAntiAlias = false;
+                canDrawArgs.fIsStencilDisabled = pipelineBuilder.getStencil().isDisabled();
+                canDrawArgs.fIsStencilBufferMSAA = rt->isStencilBufferMultisampled();
+
+                pr = this->getContext()->drawingManager()->getPathRenderer(canDrawArgs, false,
+                                                                           GrPathRendererChain::kStencilOnly_DrawType,
+                                                                           &stencilSupport);
+                if (nullptr == pr) {
                     return false;
                 }
             }
@@ -809,17 +828,38 @@ bool GrClipMaskManager::createStencilClipMask(int32_t elementsGenID,
                                              0xffff,
                                              0x0000,
                                              0xffff);
-                SET_RANDOM_COLOR
                 if (Element::kRect_Type == element->getType()) {
-                    *drawState->stencil() = gDrawToStencil;
-                    fGpu->drawSimpleRect(element->getRect(), NULL);
+                    *pipelineBuilder.stencil() = gDrawToStencil;
+
+                    // We need this AGP until everything is in GrBatch
+                    fDrawTarget->drawNonAARect(pipelineBuilder,
+                                               GrColor_WHITE,
+                                               viewMatrix,
+                                               element->getRect());
                 } else {
                     if (!clipPath.isEmpty()) {
                         if (canRenderDirectToStencil) {
-                            *drawState->stencil() = gDrawToStencil;
-                            pr->drawPath(clipPath, stroke, fGpu, false);
+                            *pipelineBuilder.stencil() = gDrawToStencil;
+
+                            GrPathRenderer::DrawPathArgs args;
+                            args.fTarget = fDrawTarget;
+                            args.fResourceProvider = this->getContext()->resourceProvider();
+                            args.fPipelineBuilder = &pipelineBuilder;
+                            args.fColor = GrColor_WHITE;
+                            args.fViewMatrix = &viewMatrix;
+                            args.fPath = &clipPath;
+                            args.fStroke = &stroke;
+                            args.fAntiAlias = false;
+                            pr->drawPath(args);
                         } else {
-                            pr->stencilPath(clipPath, stroke, fGpu);
+                            GrPathRenderer::StencilPathArgs args;
+                            args.fTarget = fDrawTarget;
+                            args.fResourceProvider = this->getContext()->resourceProvider();
+                            args.fPipelineBuilder = &pipelineBuilder;
+                            args.fViewMatrix = &viewMatrix;
+                            args.fPath = &clipPath;
+                            args.fStroke = &stroke;
+                            pr->stencilPath(args);
                         }
                     }
                 }
@@ -827,33 +867,44 @@ bool GrClipMaskManager::createStencilClipMask(int32_t elementsGenID,
 
             // now we modify the clip bit by rendering either the clip
             // element directly or a bounding rect of the entire clip.
-            drawState->enableState(GrGpu::kModifyStencilClip_StateBit);
+            fClipMode = kModifyClip_StencilClipMode;
             for (int p = 0; p < passes; ++p) {
-                *drawState->stencil() = stencilSettings[p];
+                *pipelineBuilder.stencil() = stencilSettings[p];
+
                 if (canDrawDirectToClip) {
                     if (Element::kRect_Type == element->getType()) {
-                        SET_RANDOM_COLOR
-                        fGpu->drawSimpleRect(element->getRect(), NULL);
+                        // We need this AGP until everything is in GrBatch
+                        fDrawTarget->drawNonAARect(pipelineBuilder,
+                                                   GrColor_WHITE,
+                                                   viewMatrix,
+                                                   element->getRect());
                     } else {
-                        SET_RANDOM_COLOR
-                        pr->drawPath(clipPath, stroke, fGpu, false);
+                        GrPathRenderer::DrawPathArgs args;
+                        args.fTarget = fDrawTarget;
+                        args.fResourceProvider = this->getContext()->resourceProvider();
+                        args.fPipelineBuilder = &pipelineBuilder;
+                        args.fColor = GrColor_WHITE;
+                        args.fViewMatrix = &viewMatrix;
+                        args.fPath = &clipPath;
+                        args.fStroke = &stroke;
+                        args.fAntiAlias = false;
+                        pr->drawPath(args);
                     }
                 } else {
-                    SET_RANDOM_COLOR
                     // The view matrix is setup to do clip space -> stencil space translation, so
                     // draw rect in clip space.
-                    fGpu->drawSimpleRect(SkRect::Make(clipSpaceIBounds), NULL);
+                    fDrawTarget->drawNonAARect(pipelineBuilder,
+                                               GrColor_WHITE,
+                                               viewMatrix,
+                                               SkRect::Make(clipSpaceIBounds));
                 }
             }
         }
     }
-    // set this last because recursive draws may overwrite it back to kNone.
-    SkASSERT(kNone_ClipMaskType == fCurrClipMaskType);
-    fCurrClipMaskType = kStencil_ClipMaskType;
+    fClipMode = kRespectClip_StencilClipMode;
     return true;
 }
 
-
 // mapping of clip-respecting stencil funcs to normal stencil funcs
 // mapping depends on whether stencil-clipping is in effect.
 static const GrStencilFunc
@@ -906,55 +957,41 @@ const GrStencilSettings& basic_apply_stencil_clip_settings() {
 }
 }
 
-void GrClipMaskManager::setGpuStencil() {
+void GrClipMaskManager::setPipelineBuilderStencil(const GrPipelineBuilder& pipelineBuilder,
+                                                  GrPipelineBuilder::AutoRestoreStencil* ars) {
     // We make two copies of the StencilSettings here (except in the early
     // exit scenario. One copy from draw state to the stack var. Then another
     // from the stack var to the gpu. We could make this class hold a ptr to
     // GrGpu's fStencilSettings and eliminate the stack copy here.
 
-    const GrDrawState& drawState = fGpu->getDrawState();
-
     // use stencil for clipping if clipping is enabled and the clip
     // has been written into the stencil.
-    GrClipMaskManager::StencilClipMode clipMode;
-    if (this->isClipInStencil() && drawState.isClipState()) {
-        clipMode = GrClipMaskManager::kRespectClip_StencilClipMode;
-        // We can't be modifying the clip and respecting it at the same time.
-        SkASSERT(!drawState.isStateFlagEnabled(
-                    GrGpu::kModifyStencilClip_StateBit));
-    } else if (drawState.isStateFlagEnabled(
-                    GrGpu::kModifyStencilClip_StateBit)) {
-        clipMode = GrClipMaskManager::kModifyClip_StencilClipMode;
-    } else {
-        clipMode = GrClipMaskManager::kIgnoreClip_StencilClipMode;
-    }
-
     GrStencilSettings settings;
+
     // The GrGpu client may not be using the stencil buffer but we may need to
     // enable it in order to respect a stencil clip.
-    if (drawState.getStencil().isDisabled()) {
-        if (GrClipMaskManager::kRespectClip_StencilClipMode == clipMode) {
+    if (pipelineBuilder.getStencil().isDisabled()) {
+        if (GrClipMaskManager::kRespectClip_StencilClipMode == fClipMode) {
             settings = basic_apply_stencil_clip_settings();
         } else {
-            fGpu->disableStencil();
             return;
         }
     } else {
-        settings = drawState.getStencil();
+        settings = pipelineBuilder.getStencil();
     }
 
-    // TODO: dynamically attach a stencil buffer
     int stencilBits = 0;
-    GrStencilBuffer* stencilBuffer =
-        drawState.getRenderTarget()->getStencilBuffer();
-    if (NULL != stencilBuffer) {
-        stencilBits = stencilBuffer->bits();
+    GrRenderTarget* rt = pipelineBuilder.getRenderTarget();
+    GrStencilAttachment* stencilAttachment = this->resourceProvider()->attachStencilAttachment(rt);
+    if (stencilAttachment) {
+        stencilBits = stencilAttachment->bits();
     }
 
-    SkASSERT(fGpu->caps()->stencilWrapOpsSupport() || !settings.usesWrapOp());
-    SkASSERT(fGpu->caps()->twoSidedStencilSupport() || !settings.isTwoSided());
-    this->adjustStencilParams(&settings, clipMode, stencilBits);
-    fGpu->setStencilSettings(settings);
+    SkASSERT(this->caps()->stencilWrapOpsSupport() || !settings.usesWrapOp());
+    SkASSERT(this->caps()->twoSidedStencilSupport() || !settings.isTwoSided());
+    this->adjustStencilParams(&settings, fClipMode, stencilBits);
+    ars->set(&pipelineBuilder);
+    ars->setStencil(settings);
 }
 
 void GrClipMaskManager::adjustStencilParams(GrStencilSettings* settings,
@@ -972,7 +1009,7 @@ void GrClipMaskManager::adjustStencilParams(GrStencilSettings* settings,
     unsigned int userBits = clipBit - 1;
 
     GrStencilSettings::Face face = GrStencilSettings::kFront_Face;
-    bool twoSided = fGpu->caps()->twoSidedStencilSupport();
+    bool twoSided = this->caps()->twoSidedStencilSupport();
 
     bool finished = false;
     while (!finished) {
@@ -988,8 +1025,6 @@ void GrClipMaskManager::adjustStencilParams(GrStencilSettings* settings,
         if (func >= kBasicStencilFuncCount) {
             int respectClip = kRespectClip_StencilClipMode == mode;
             if (respectClip) {
-                // The GrGpu class should have checked this
-                SkASSERT(this->isClipInStencil());
                 switch (func) {
                     case kAlwaysIfInClip_StencilFunc:
                         funcMask = clipBit;
@@ -1042,12 +1077,13 @@ void GrClipMaskManager::adjustStencilParams(GrStencilSettings* settings,
 GrTexture* GrClipMaskManager::createSoftwareClipMask(int32_t elementsGenID,
                                                      GrReducedClip::InitialState initialState,
                                                      const GrReducedClip::ElementList& elements,
+                                                     const SkVector& clipToMaskOffset,
                                                      const SkIRect& clipSpaceIBounds) {
-    SkASSERT(kNone_ClipMaskType == fCurrClipMaskType);
-
-    GrTexture* result = this->getCachedMaskTexture(elementsGenID, clipSpaceIBounds);
-    if (NULL != result) {
-        return result;
+    GrUniqueKey key;
+    GetClipMaskKey(elementsGenID, clipSpaceIBounds, &key);
+    GrResourceProvider* resourceProvider = this->resourceProvider();
+    if (GrTexture* texture = resourceProvider->findAndRefTextureByUniqueKey(key)) {
+        return texture;
     }
 
     // The mask texture may be larger than necessary. We round out the clip space bounds and pin
@@ -1056,17 +1092,16 @@ GrTexture* GrClipMaskManager::createSoftwareClipMask(int32_t elementsGenID,
 
     GrSWMaskHelper helper(this->getContext());
 
-    SkMatrix matrix;
-    matrix.setTranslate(SkIntToScalar(-clipSpaceIBounds.fLeft),
-                        SkIntToScalar(-clipSpaceIBounds.fTop));
-    helper.init(maskSpaceIBounds, &matrix);
-
-    helper.clear(kAllIn_InitialState == initialState ? 0xFF : 0x00);
+    // Set the matrix so that rendered clip elements are transformed to mask space from clip
+    // space.
+    SkMatrix translate;
+    translate.setTranslate(clipToMaskOffset);
 
+    helper.init(maskSpaceIBounds, &translate, false);
+    helper.clear(GrReducedClip::kAllIn_InitialState == initialState ? 0xFF : 0x00);
     SkStrokeRec stroke(SkStrokeRec::kFill_InitStyle);
 
-    for (ElementList::Iter iter(elements.headIter()) ; NULL != iter.get(); iter.next()) {
-
+    for (GrReducedClip::ElementList::Iter iter(elements.headIter()) ; iter.get(); iter.next()) {
         const Element* element = iter.get();
         SkRegion::Op op = element->getOp();
 
@@ -1080,12 +1115,10 @@ GrTexture* GrClipMaskManager::createSoftwareClipMask(int32_t elementsGenID,
                 // invert the entire scene
                 helper.draw(temp, SkRegion::kXOR_Op, false, 0xFF);
             }
-
             SkPath clipPath;
             element->asPath(&clipPath);
             clipPath.toggleInverseFillType();
             helper.draw(clipPath, stroke, SkRegion::kReplace_Op, element->isAA(), 0x00);
-
             continue;
         }
 
@@ -1101,48 +1134,22 @@ GrTexture* GrClipMaskManager::createSoftwareClipMask(int32_t elementsGenID,
     }
 
     // Allocate clip mask texture
-    result = this->allocMaskTexture(elementsGenID, clipSpaceIBounds, true);
-    if (NULL == result) {
-        fAACache.reset();
-        return NULL;
+    GrTexture* result = this->createCachedMask(clipSpaceIBounds.width(), clipSpaceIBounds.height(),
+                                               key, false);
+    if (nullptr == result) {
+        return nullptr;
     }
     helper.toTexture(result);
 
-    fCurrClipMaskType = kAlpha_ClipMaskType;
     return result;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void GrClipMaskManager::releaseResources() {
-    fAACache.releaseResources();
-}
 
-void GrClipMaskManager::setGpu(GrGpu* gpu) {
-    fGpu = gpu;
-    fAACache.setContext(gpu->getContext());
-}
-
-void GrClipMaskManager::adjustPathStencilParams(GrStencilSettings* settings) {
-    const GrDrawState& drawState = fGpu->getDrawState();
-    GrClipMaskManager::StencilClipMode clipMode;
-    if (this->isClipInStencil() && drawState.isClipState()) {
-        clipMode = GrClipMaskManager::kRespectClip_StencilClipMode;
-        // We can't be modifying the clip and respecting it at the same time.
-        SkASSERT(!drawState.isStateFlagEnabled(
-                    GrGpu::kModifyStencilClip_StateBit));
-    } else if (drawState.isStateFlagEnabled(
-                    GrGpu::kModifyStencilClip_StateBit)) {
-        clipMode = GrClipMaskManager::kModifyClip_StencilClipMode;
-    } else {
-        clipMode = GrClipMaskManager::kIgnoreClip_StencilClipMode;
-    }
-
-    // TODO: dynamically attach a stencil buffer
-    int stencilBits = 0;
-    GrStencilBuffer* stencilBuffer =
-        drawState.getRenderTarget()->getStencilBuffer();
-    if (NULL != stencilBuffer) {
-        stencilBits = stencilBuffer->bits();
-        this->adjustStencilParams(settings, clipMode, stencilBits);
+void GrClipMaskManager::adjustPathStencilParams(const GrStencilAttachment* stencilAttachment,
+                                                GrStencilSettings* settings) {
+    if (stencilAttachment) {
+        int stencilBits = stencilAttachment->bits();
+        this->adjustStencilParams(settings, fClipMode, stencilBits);
     }
 }
diff --git a/gfx/skia/skia/src/gpu/GrClipMaskManager.h b/gfx/skia/skia/src/gpu/GrClipMaskManager.h
index c3a21fd8a2b1..6b9b72716113 100644
--- a/gfx/skia/skia/src/gpu/GrClipMaskManager.h
+++ b/gfx/skia/skia/src/gpu/GrClipMaskManager.h
@@ -4,17 +4,13 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-
 #ifndef GrClipMaskManager_DEFINED
 #define GrClipMaskManager_DEFINED
 
-#include "GrClipMaskCache.h"
-#include "GrContext.h"
-#include "GrDrawState.h"
+#include "GrPipelineBuilder.h"
 #include "GrReducedClip.h"
 #include "GrStencil.h"
 #include "GrTexture.h"
-
 #include "SkClipStack.h"
 #include "SkDeque.h"
 #include "SkPath.h"
@@ -22,12 +18,33 @@
 #include "SkTLList.h"
 #include "SkTypes.h"
 
-class GrGpu;
+class GrDrawTarget;
 class GrPathRenderer;
 class GrPathRendererChain;
+class GrResourceProvider;
 class GrTexture;
 class SkPath;
 
+/**
+ * Produced by GrClipMaskManager. It provides a set of modifications to the drawing state that
+ * are used to create the final GrPipeline for a GrBatch. This is a work in progress. It will
+ * eventually encapsulate all mechanisms for modifying the scissor, shaders, and stencil state
+ * to implement clipping.
+ */
+class GrAppliedClip : public SkNoncopyable {
+public:
+    GrAppliedClip() {}
+    const GrFragmentProcessor* clipCoverageFragmentProcessor() const { return fClipCoverageFP; }
+    const GrScissorState& scissorState() const { return fScissorState; }
+
+private:
+    SkAutoTUnref<const GrFragmentProcessor> fClipCoverageFP;
+    GrScissorState                          fScissorState;
+    friend class GrClipMaskManager;
+
+    typedef SkNoncopyable INHERITED;
+};
+
 /**
  * The clip mask creator handles the generation of the clip mask. If anti
  * aliasing is requested it will (in the future) generate a single channel
@@ -38,10 +55,7 @@ class SkPath;
  */
 class GrClipMaskManager : SkNoncopyable {
 public:
-    GrClipMaskManager()
-        : fGpu(NULL)
-        , fCurrClipMaskType(kNone_ClipMaskType) {
-    }
+    GrClipMaskManager(GrDrawTarget* owner, bool debugClipBatchToBounds);
 
     /**
      * Creates a clip mask if necessary as a stencil buffer or alpha texture
@@ -50,32 +64,30 @@ public:
      * the manager when it must install additional effects to implement the
      * clip. devBounds is optional but can help optimize clipping.
      */
-    bool setupClipping(const GrClipData* clipDataIn, GrDrawState::AutoRestoreEffects*,
-                       const SkRect* devBounds);
+    bool setupClipping(const GrPipelineBuilder&,
+                       GrPipelineBuilder::AutoRestoreStencil*,
+                       const SkRect* devBounds,
+                       GrAppliedClip*);
 
-    void releaseResources();
+    void adjustPathStencilParams(const GrStencilAttachment*, GrStencilSettings*);
 
-    bool isClipInStencil() const {
-        return kStencil_ClipMaskType == fCurrClipMaskType;
-    }
-    bool isClipInAlpha() const {
-        return kAlpha_ClipMaskType == fCurrClipMaskType;
-    }
-
-    void invalidateStencilMask() {
-        if (kStencil_ClipMaskType == fCurrClipMaskType) {
-            fCurrClipMaskType = kNone_ClipMaskType;
-        }
-    }
-
-    GrContext* getContext() {
-        return fAACache.getContext();
-    }
-
-    void setGpu(GrGpu* gpu);
-
-    void adjustPathStencilParams(GrStencilSettings* settings);
 private:
+    inline GrContext* getContext();
+    inline const GrCaps* caps() const;
+    inline GrResourceProvider* resourceProvider();
+
+    static bool PathNeedsSWRenderer(GrContext* context,
+                                    bool isStencilDisabled,
+                                    const GrRenderTarget* rt,
+                                    const SkMatrix& viewMatrix,
+                                    const SkClipStack::Element* element,
+                                    GrPathRenderer** prOut,
+                                    bool needsStencil);
+    static GrPathRenderer* GetPathRenderer(GrContext* context,
+                                           GrTexture* texture,
+                                           const SkMatrix& viewMatrix,
+                                           const SkClipStack::Element* element);
+
     /**
      * Informs the helper function adjustStencilParams() about how the stencil
      * buffer clip is being used.
@@ -90,86 +102,60 @@ private:
         kIgnoreClip_StencilClipMode,
     };
 
-    GrGpu* fGpu;
-
-    /**
-     * We may represent the clip as a mask in the stencil buffer or as an alpha
-     * texture. It may be neither because the scissor rect suffices or we
-     * haven't yet examined the clip.
-     */
-    enum ClipMaskType {
-        kNone_ClipMaskType,
-        kStencil_ClipMaskType,
-        kAlpha_ClipMaskType,
-    } fCurrClipMaskType;
-
-    GrClipMaskCache fAACache;       // cache for the AA path
-
     // Attempts to install a series of coverage effects to implement the clip. Return indicates
-    // whether the element list was successfully converted to effects.
-    bool installClipEffects(const GrReducedClip::ElementList&,
-                            GrDrawState::AutoRestoreEffects*,
-                            const SkVector& clipOffset,
-                            const SkRect* devBounds);
+    // whether the element list was successfully converted to processors. *fp may be nullptr even
+    // when the function succeeds because all the elements were ignored. TODO: Make clip reduction
+    // bounds-aware and stop checking bounds in this function. Similarly, we shouldn't need to pass
+    // abortIfAA, but we don't yet know if all the AA elements will be eliminated.
+    bool getAnalyticClipProcessor(const GrReducedClip::ElementList&,
+                                  bool abortIfAA,
+                                  SkVector& clipOffset,
+                                  const SkRect* devBounds,
+                                  const GrFragmentProcessor** fp);
 
     // Draws the clip into the stencil buffer
-    bool createStencilClipMask(int32_t elementsGenID,
+    bool createStencilClipMask(GrRenderTarget*,
+                               int32_t elementsGenID,
                                GrReducedClip::InitialState initialState,
                                const GrReducedClip::ElementList& elements,
                                const SkIRect& clipSpaceIBounds,
                                const SkIPoint& clipSpaceToStencilOffset);
+
     // Creates an alpha mask of the clip. The mask is a rasterization of elements through the
     // rect specified by clipSpaceIBounds.
     GrTexture* createAlphaClipMask(int32_t elementsGenID,
                                    GrReducedClip::InitialState initialState,
                                    const GrReducedClip::ElementList& elements,
+                                   const SkVector& clipToMaskOffset,
                                    const SkIRect& clipSpaceIBounds);
+
     // Similar to createAlphaClipMask but it rasterizes in SW and uploads to the result texture.
     GrTexture* createSoftwareClipMask(int32_t elementsGenID,
                                       GrReducedClip::InitialState initialState,
                                       const GrReducedClip::ElementList& elements,
+                                      const SkVector& clipToMaskOffset,
                                       const SkIRect& clipSpaceIBounds);
 
-    // Returns the cached mask texture if it matches the elementsGenID and the clipSpaceIBounds.
-    // Returns NULL if not found.
-    GrTexture* getCachedMaskTexture(int32_t elementsGenID, const SkIRect& clipSpaceIBounds);
-
-
-    // Handles allocation (if needed) of a clip alpha-mask texture for both the sw-upload
-    // or gpu-rendered cases.
-    GrTexture* allocMaskTexture(int32_t elementsGenID,
-                                const SkIRect& clipSpaceIBounds,
-                                bool willUpload);
-
-    bool useSWOnlyPath(const GrReducedClip::ElementList& elements);
+   bool useSWOnlyPath(const GrPipelineBuilder&,
+                      const GrRenderTarget* rt,
+                      const SkVector& clipToMaskOffset,
+                      const GrReducedClip::ElementList& elements);
 
     // Draws a clip element into the target alpha mask. The caller should have already setup the
     // desired blend operation. Optionally if the caller already selected a path renderer it can
     // be passed. Otherwise the function will select one if the element is a path.
-    bool drawElement(GrTexture* target, const SkClipStack::Element*, GrPathRenderer* = NULL);
-
-    // Determines whether it is possible to draw the element to both the stencil buffer and the
-    // alpha mask simultaneously. If so and the element is a path a compatible path renderer is
-    // also returned.
-    bool canStencilAndDrawElement(GrTexture* target, const SkClipStack::Element*, GrPathRenderer**);
-
-    void mergeMask(GrTexture* dstMask,
-                   GrTexture* srcMask,
-                   SkRegion::Op op,
-                   const SkIRect& dstBound,
-                   const SkIRect& srcBound);
-
-    void getTemp(int width, int height, GrAutoScratchTexture* temp);
-
-    void setupCache(const SkClipStack& clip,
-                    const SkIRect& bounds);
+    bool drawElement(GrPipelineBuilder*,
+                     const SkMatrix& viewMatrix,
+                     GrTexture* target,
+                     const SkClipStack::Element*,
+                     GrPathRenderer* pr = nullptr);
 
     /**
-     * Called prior to return control back the GrGpu in setupClipping. It
-     * updates the GrGpu with stencil settings that account stencil-based
-     * clipping.
+     * Called prior to return control back the GrGpu in setupClipping. It updates the
+     * GrPipelineBuilder with stencil settings that account for stencil-based clipping.
      */
-    void setGpuStencil();
+    void setPipelineBuilderStencil(const GrPipelineBuilder&,
+                                   GrPipelineBuilder::AutoRestoreStencil*);
 
     /**
      * Adjusts the stencil settings to account for interaction with stencil
@@ -179,7 +165,14 @@ private:
                              StencilClipMode mode,
                              int stencilBitCnt);
 
+    GrTexture* createCachedMask(int width, int height, const GrUniqueKey& key, bool renderTarget);
+
+    static const int kMaxAnalyticElements = 4;
+
+    GrDrawTarget*   fDrawTarget;    // This is our owning draw target.
+    StencilClipMode fClipMode;
+    bool            fDebugClipBatchToBounds;
+
     typedef SkNoncopyable INHERITED;
 };
-
 #endif // GrClipMaskManager_DEFINED
diff --git a/gfx/skia/skia/src/gpu/GrContext.cpp b/gfx/skia/skia/src/gpu/GrContext.cpp
old mode 100755
new mode 100644
index 540afa3c8cde..ad89672f3bad
--- a/gfx/skia/skia/src/gpu/GrContext.cpp
+++ b/gfx/skia/skia/src/gpu/GrContext.cpp
@@ -6,207 +6,134 @@
  * found in the LICENSE file.
  */
 
-
 #include "GrContext.h"
+#include "GrContextOptions.h"
+#include "GrDrawingManager.h"
+#include "GrDrawContext.h"
+#include "GrLayerCache.h"
+#include "GrResourceCache.h"
+#include "GrResourceProvider.h"
+#include "GrSoftwarePathRenderer.h"
+#include "GrSurfacePriv.h"
+#include "GrTextBlobCache.h"
+
+#include "SkConfig8888.h"
+#include "SkGrPriv.h"
 
 #include "effects/GrConfigConversionEffect.h"
-#include "effects/GrDashingEffect.h"
-#include "effects/GrSingleTextureEffect.h"
-
-#include "GrAARectRenderer.h"
-#include "GrBufferAllocPool.h"
-#include "GrGpu.h"
-#include "GrDistanceFieldTextContext.h"
-#include "GrDrawTargetCaps.h"
-#include "GrIndexBuffer.h"
-#include "GrInOrderDrawBuffer.h"
-#include "GrLayerCache.h"
-#include "GrOvalRenderer.h"
-#include "GrPathRenderer.h"
-#include "GrPathUtils.h"
-#include "GrResourceCache.h"
-#include "GrSoftwarePathRenderer.h"
-#include "GrStencilBuffer.h"
-#include "GrStencilAndCoverTextContext.h"
-#include "GrStrokeInfo.h"
-#include "GrTextStrike.h"
-#include "GrTraceMarker.h"
-#include "GrTracing.h"
-#include "SkDashPathPriv.h"
-#include "SkGr.h"
-#include "SkRTConf.h"
-#include "SkRRect.h"
-#include "SkStrokeRec.h"
-#include "SkTLazy.h"
-#include "SkTLS.h"
-#include "SkTraceEvent.h"
-
-// It can be useful to set this to false to test whether a bug is caused by using the
-// InOrderDrawBuffer, to compare performance of using/not using InOrderDrawBuffer, or to make
-// debugging simpler.
-SK_CONF_DECLARE(bool, c_Defer, "gpu.deferContext", true,
-                "Defers rendering in GrContext via GrInOrderDrawBuffer.");
-
-#define BUFFERED_DRAW (c_Defer ? kYes_BufferedDraw : kNo_BufferedDraw)
-
-#ifdef SK_DEBUG
-    // change this to a 1 to see notifications when partial coverage fails
-    #define GR_DEBUG_PARTIAL_COVERAGE_CHECK 0
-#else
-    #define GR_DEBUG_PARTIAL_COVERAGE_CHECK 0
-#endif
-
-static const size_t MAX_RESOURCE_CACHE_COUNT = GR_DEFAULT_RESOURCE_CACHE_COUNT_LIMIT;
-static const size_t MAX_RESOURCE_CACHE_BYTES = GR_DEFAULT_RESOURCE_CACHE_MB_LIMIT * 1024 * 1024;
-
-static const size_t DRAW_BUFFER_VBPOOL_BUFFER_SIZE = 1 << 15;
-static const int DRAW_BUFFER_VBPOOL_PREALLOC_BUFFERS = 4;
-
-static const size_t DRAW_BUFFER_IBPOOL_BUFFER_SIZE = 1 << 11;
-static const int DRAW_BUFFER_IBPOOL_PREALLOC_BUFFERS = 4;
 
 #define ASSERT_OWNED_RESOURCE(R) SkASSERT(!(R) || (R)->getContext() == this)
+#define RETURN_IF_ABANDONED if (fDrawingManager->abandoned()) { return; }
+#define RETURN_FALSE_IF_ABANDONED if (fDrawingManager->abandoned()) { return false; }
+#define RETURN_NULL_IF_ABANDONED if (fDrawingManager->abandoned()) { return nullptr; }
 
-// Glorified typedef to avoid including GrDrawState.h in GrContext.h
-class GrContext::AutoRestoreEffects : public GrDrawState::AutoRestoreEffects {};
-
-class GrContext::AutoCheckFlush {
-public:
-    AutoCheckFlush(GrContext* context) : fContext(context) { SkASSERT(NULL != context); }
-
-    ~AutoCheckFlush() {
-        if (fContext->fFlushToReduceCacheSize) {
-            fContext->flush();
-        }
-    }
-
-private:
-    GrContext* fContext;
-};
+////////////////////////////////////////////////////////////////////////////////
 
 GrContext* GrContext::Create(GrBackend backend, GrBackendContext backendContext) {
-    GrContext* context = SkNEW(GrContext);
-    if (context->init(backend, backendContext)) {
+    GrContextOptions defaultOptions;
+    return Create(backend, backendContext, defaultOptions);
+}
+
+GrContext* GrContext::Create(GrBackend backend, GrBackendContext backendContext,
+                             const GrContextOptions& options) {
+    GrContext* context = new GrContext;
+
+    if (context->init(backend, backendContext, options)) {
         return context;
     } else {
         context->unref();
-        return NULL;
+        return nullptr;
     }
 }
 
-GrContext::GrContext() {
-    fDrawState = NULL;
-    fGpu = NULL;
-    fClip = NULL;
-    fPathRendererChain = NULL;
-    fSoftwarePathRenderer = NULL;
-    fResourceCache = NULL;
-    fFontCache = NULL;
-    fDrawBuffer = NULL;
-    fDrawBufferVBAllocPool = NULL;
-    fDrawBufferIBAllocPool = NULL;
-    fFlushToReduceCacheSize = false;
-    fAARectRenderer = NULL;
-    fOvalRenderer = NULL;
-    fViewMatrix.reset();
-    fMaxTextureSizeOverride = 1 << 20;
-    fGpuTracingEnabled = false;
+static int32_t gNextID = 1;
+static int32_t next_id() {
+    int32_t id;
+    do {
+        id = sk_atomic_inc(&gNextID);
+    } while (id == SK_InvalidGenID);
+    return id;
 }
 
-bool GrContext::init(GrBackend backend, GrBackendContext backendContext) {
-    SkASSERT(NULL == fGpu);
+GrContext::GrContext() : fUniqueID(next_id()) {
+    fGpu = nullptr;
+    fCaps = nullptr;
+    fResourceCache = nullptr;
+    fResourceProvider = nullptr;
+    fBatchFontCache = nullptr;
+    fFlushToReduceCacheSize = false;
+}
 
-    fGpu = GrGpu::Create(backend, backendContext, this);
-    if (NULL == fGpu) {
+bool GrContext::init(GrBackend backend, GrBackendContext backendContext,
+                     const GrContextOptions& options) {
+    SkASSERT(!fGpu);
+
+    fGpu = GrGpu::Create(backend, backendContext, options, this);
+    if (!fGpu) {
         return false;
     }
-
-    fDrawState = SkNEW(GrDrawState);
-    fGpu->setDrawState(fDrawState);
-
-    fResourceCache = SkNEW_ARGS(GrResourceCache, (MAX_RESOURCE_CACHE_COUNT,
-                                                  MAX_RESOURCE_CACHE_BYTES));
-    fResourceCache->setOverbudgetCallback(OverbudgetCB, this);
-
-    fFontCache = SkNEW_ARGS(GrFontCache, (fGpu));
-
-    fLayerCache.reset(SkNEW_ARGS(GrLayerCache, (this)));
-
-    fLastDrawWasBuffered = kNo_BufferedDraw;
-
-    fAARectRenderer = SkNEW(GrAARectRenderer);
-    fOvalRenderer = SkNEW(GrOvalRenderer);
-
-    fDidTestPMConversions = false;
-
-    this->setupDrawBuffer();
-
+    this->initCommon(options);
     return true;
 }
 
+void GrContext::initCommon(const GrContextOptions& options) {
+    fCaps = SkRef(fGpu->caps());
+    fResourceCache = new GrResourceCache(fCaps);
+    fResourceCache->setOverBudgetCallback(OverBudgetCB, this);
+    fResourceProvider = new GrResourceProvider(fGpu, fResourceCache);
+
+    fLayerCache.reset(new GrLayerCache(this));
+
+    fDidTestPMConversions = false;
+
+    GrDrawTarget::Options dtOptions;
+    dtOptions.fClipBatchToBounds = options.fClipBatchToBounds;
+    fDrawingManager.reset(new GrDrawingManager(this, dtOptions));
+
+    // GrBatchFontCache will eventually replace GrFontCache
+    fBatchFontCache = new GrBatchFontCache(this);
+
+    fTextBlobCache.reset(new GrTextBlobCache(TextBlobCacheOverBudgetCB, this));
+}
+
 GrContext::~GrContext() {
-    if (NULL == fGpu) {
+    if (!fGpu) {
+        SkASSERT(!fCaps);
         return;
     }
 
     this->flush();
 
+    fDrawingManager->cleanup();
+
     for (int i = 0; i < fCleanUpData.count(); ++i) {
         (*fCleanUpData[i].fFunc)(this, fCleanUpData[i].fInfo);
     }
 
-    // Since the gpu can hold scratch textures, give it a chance to let go
-    // of them before freeing the texture cache
-    fGpu->purgeResources();
-
+    delete fResourceProvider;
     delete fResourceCache;
-    fResourceCache = NULL;
-    delete fFontCache;
-    delete fDrawBuffer;
-    delete fDrawBufferVBAllocPool;
-    delete fDrawBufferIBAllocPool;
-
-    fAARectRenderer->unref();
-    fOvalRenderer->unref();
+    delete fBatchFontCache;
 
     fGpu->unref();
-    SkSafeUnref(fPathRendererChain);
-    SkSafeUnref(fSoftwarePathRenderer);
-    fDrawState->unref();
+    fCaps->unref();
 }
 
-void GrContext::contextLost() {
-    this->contextDestroyed();
-    this->setupDrawBuffer();
-}
+void GrContext::abandonContext() {
+    fResourceProvider->abandon();
+
+    // Need to abandon the drawing manager first so all the render targets
+    // will be released/forgotten before they too are abandoned.
+    fDrawingManager->abandon();
 
-void GrContext::contextDestroyed() {
     // abandon first to so destructors
     // don't try to free the resources in the API.
-    fGpu->abandonResources();
+    fResourceCache->abandonAll();
 
-    // a path renderer may be holding onto resources that
-    // are now unusable
-    SkSafeSetNull(fPathRendererChain);
-    SkSafeSetNull(fSoftwarePathRenderer);
+    fGpu->contextAbandoned();
 
-    delete fDrawBuffer;
-    fDrawBuffer = NULL;
-
-    delete fDrawBufferVBAllocPool;
-    fDrawBufferVBAllocPool = NULL;
-
-    delete fDrawBufferIBAllocPool;
-    fDrawBufferIBAllocPool = NULL;
-
-    fAARectRenderer->reset();
-    fOvalRenderer->reset();
-
-    fResourceCache->purgeAllUnlocked();
-
-    fFontCache->freeAll();
+    fBatchFontCache->freeAll();
     fLayerCache->freeAll();
-    fGpu->markContextDirty();
+    fTextBlobCache->freeAll();
 }
 
 void GrContext::resetContext(uint32_t state) {
@@ -216,1312 +143,329 @@ void GrContext::resetContext(uint32_t state) {
 void GrContext::freeGpuResources() {
     this->flush();
 
-    fGpu->purgeResources();
+    fBatchFontCache->freeAll();
+    fLayerCache->freeAll();
 
-    fAARectRenderer->reset();
-    fOvalRenderer->reset();
+    fDrawingManager->freeGpuResources();
 
     fResourceCache->purgeAllUnlocked();
-    fFontCache->freeAll();
-    fLayerCache->freeAll();
-    // a path renderer may be holding onto resources
-    SkSafeSetNull(fPathRendererChain);
-    SkSafeSetNull(fSoftwarePathRenderer);
 }
 
 void GrContext::getResourceCacheUsage(int* resourceCount, size_t* resourceBytes) const {
-  if (NULL != resourceCount) {
-    *resourceCount = fResourceCache->getCachedResourceCount();
-  }
-  if (NULL != resourceBytes) {
-    *resourceBytes = fResourceCache->getCachedResourceBytes();
-  }
-}
-
-GrTextContext* GrContext::createTextContext(GrRenderTarget* renderTarget,
-                                            const SkDeviceProperties&
-                                            leakyProperties,
-                                            bool enableDistanceFieldFonts) {
-    if (fGpu->caps()->pathRenderingSupport()) {
-        if (renderTarget->getStencilBuffer() && renderTarget->isMultisampled()) {
-            return SkNEW_ARGS(GrStencilAndCoverTextContext, (this, leakyProperties));
-        }
+    if (resourceCount) {
+        *resourceCount = fResourceCache->getBudgetedResourceCount();
+    }
+    if (resourceBytes) {
+        *resourceBytes = fResourceCache->getBudgetedResourceBytes();
     }
-    return SkNEW_ARGS(GrDistanceFieldTextContext, (this, leakyProperties,
-                                                   enableDistanceFieldFonts));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
-GrTexture* GrContext::findAndRefTexture(const GrTextureDesc& desc,
-                                        const GrCacheID& cacheID,
-                                        const GrTextureParams* params) {
-    GrResourceKey resourceKey = GrTextureImpl::ComputeKey(fGpu, params, desc, cacheID);
-    GrGpuResource* resource = fResourceCache->find(resourceKey);
-    SkSafeRef(resource);
-    return static_cast<GrTexture*>(resource);
-}
-
-bool GrContext::isTextureInCache(const GrTextureDesc& desc,
-                                 const GrCacheID& cacheID,
-                                 const GrTextureParams* params) const {
-    GrResourceKey resourceKey = GrTextureImpl::ComputeKey(fGpu, params, desc, cacheID);
-    return fResourceCache->hasKey(resourceKey);
-}
-
-void GrContext::addStencilBuffer(GrStencilBuffer* sb) {
-    ASSERT_OWNED_RESOURCE(sb);
-
-    GrResourceKey resourceKey = GrStencilBuffer::ComputeKey(sb->width(),
-                                                            sb->height(),
-                                                            sb->numSamples());
-    fResourceCache->addResource(resourceKey, sb);
-}
-
-GrStencilBuffer* GrContext::findStencilBuffer(int width, int height,
-                                              int sampleCnt) {
-    GrResourceKey resourceKey = GrStencilBuffer::ComputeKey(width,
-                                                            height,
-                                                            sampleCnt);
-    GrGpuResource* resource = fResourceCache->find(resourceKey);
-    return static_cast<GrStencilBuffer*>(resource);
-}
-
-static void stretch_image(void* dst,
-                          int dstW,
-                          int dstH,
-                          const void* src,
-                          int srcW,
-                          int srcH,
-                          size_t bpp) {
-    SkFixed dx = (srcW << 16) / dstW;
-    SkFixed dy = (srcH << 16) / dstH;
-
-    SkFixed y = dy >> 1;
-
-    size_t dstXLimit = dstW*bpp;
-    for (int j = 0; j < dstH; ++j) {
-        SkFixed x = dx >> 1;
-        const uint8_t* srcRow = reinterpret_cast<const uint8_t *>(src) + (y>>16)*srcW*bpp;
-        uint8_t* dstRow = reinterpret_cast<uint8_t *>(dst) + j*dstW*bpp;
-        for (size_t i = 0; i < dstXLimit; i += bpp) {
-            memcpy(dstRow + i, srcRow + (x>>16)*bpp, bpp);
-            x += dx;
-        }
-        y += dy;
-    }
-}
-
-namespace {
-
-// position + local coordinate
-extern const GrVertexAttrib gVertexAttribs[] = {
-    {kVec2f_GrVertexAttribType, 0,               kPosition_GrVertexAttribBinding},
-    {kVec2f_GrVertexAttribType, sizeof(SkPoint), kLocalCoord_GrVertexAttribBinding}
-};
-
-};
-
-// The desired texture is NPOT and tiled but that isn't supported by
-// the current hardware. Resize the texture to be a POT
-GrTexture* GrContext::createResizedTexture(const GrTextureDesc& desc,
-                                           const GrCacheID& cacheID,
-                                           const void* srcData,
-                                           size_t rowBytes,
-                                           bool filter) {
-    SkAutoTUnref<GrTexture> clampedTexture(this->findAndRefTexture(desc, cacheID, NULL));
-    if (NULL == clampedTexture) {
-        clampedTexture.reset(this->createTexture(NULL, desc, cacheID, srcData, rowBytes));
-
-        if (NULL == clampedTexture) {
-            return NULL;
-        }
-    }
-
-    GrTextureDesc rtDesc = desc;
-    rtDesc.fFlags =  rtDesc.fFlags |
-                     kRenderTarget_GrTextureFlagBit |
-                     kNoStencil_GrTextureFlagBit;
-    rtDesc.fWidth  = GrNextPow2(desc.fWidth);
-    rtDesc.fHeight = GrNextPow2(desc.fHeight);
-
-    GrTexture* texture = fGpu->createTexture(rtDesc, NULL, 0);
-
-    if (NULL != texture) {
-        GrDrawTarget::AutoStateRestore asr(fGpu, GrDrawTarget::kReset_ASRInit);
-        GrDrawState* drawState = fGpu->drawState();
-        drawState->setRenderTarget(texture->asRenderTarget());
-
-        // if filtering is not desired then we want to ensure all
-        // texels in the resampled image are copies of texels from
-        // the original.
-        GrTextureParams params(SkShader::kClamp_TileMode, filter ? GrTextureParams::kBilerp_FilterMode :
-                                                                   GrTextureParams::kNone_FilterMode);
-        drawState->addColorTextureEffect(clampedTexture, SkMatrix::I(), params);
-
-        drawState->setVertexAttribs<gVertexAttribs>(SK_ARRAY_COUNT(gVertexAttribs));
-
-        GrDrawTarget::AutoReleaseGeometry arg(fGpu, 4, 0);
-
-        if (arg.succeeded()) {
-            SkPoint* verts = (SkPoint*) arg.vertices();
-            verts[0].setIRectFan(0, 0, texture->width(), texture->height(), 2 * sizeof(SkPoint));
-            verts[1].setIRectFan(0, 0, 1, 1, 2 * sizeof(SkPoint));
-            fGpu->drawNonIndexed(kTriangleFan_GrPrimitiveType, 0, 4);
-        }
-    } else {
-        // TODO: Our CPU stretch doesn't filter. But we create separate
-        // stretched textures when the texture params is either filtered or
-        // not. Either implement filtered stretch blit on CPU or just create
-        // one when FBO case fails.
-
-        rtDesc.fFlags = kNone_GrTextureFlags;
-        // no longer need to clamp at min RT size.
-        rtDesc.fWidth  = GrNextPow2(desc.fWidth);
-        rtDesc.fHeight = GrNextPow2(desc.fHeight);
-
-        // We shouldn't be resizing a compressed texture.
-        SkASSERT(!GrPixelConfigIsCompressed(desc.fConfig));
-
-        size_t bpp = GrBytesPerPixel(desc.fConfig);
-        GrAutoMalloc<128*128*4> stretchedPixels(bpp * rtDesc.fWidth * rtDesc.fHeight);
-        stretch_image(stretchedPixels.get(), rtDesc.fWidth, rtDesc.fHeight,
-                      srcData, desc.fWidth, desc.fHeight, bpp);
-
-        size_t stretchedRowBytes = rtDesc.fWidth * bpp;
-
-        texture = fGpu->createTexture(rtDesc, stretchedPixels.get(), stretchedRowBytes);
-        SkASSERT(NULL != texture);
-    }
-
-    return texture;
-}
-
-GrTexture* GrContext::createTexture(const GrTextureParams* params,
-                                    const GrTextureDesc& desc,
-                                    const GrCacheID& cacheID,
-                                    const void* srcData,
-                                    size_t rowBytes,
-                                    GrResourceKey* cacheKey) {
-    GrResourceKey resourceKey = GrTextureImpl::ComputeKey(fGpu, params, desc, cacheID);
-
-    GrTexture* texture;
-    if (GrTextureImpl::NeedsResizing(resourceKey)) {
-        // We do not know how to resize compressed textures.
-        SkASSERT(!GrPixelConfigIsCompressed(desc.fConfig));
-
-        texture = this->createResizedTexture(desc, cacheID,
-                                             srcData, rowBytes,
-                                             GrTextureImpl::NeedsBilerp(resourceKey));
-    } else {
-        texture = fGpu->createTexture(desc, srcData, rowBytes);
-    }
-
-    if (NULL != texture) {
-        // Adding a resource could put us overbudget. Try to free up the
-        // necessary space before adding it.
-        fResourceCache->purgeAsNeeded(1, texture->gpuMemorySize());
-        fResourceCache->addResource(resourceKey, texture);
-
-        if (NULL != cacheKey) {
-            *cacheKey = resourceKey;
-        }
-    }
-
-    return texture;
-}
-
-static GrTexture* create_scratch_texture(GrGpu* gpu,
-                                         GrResourceCache* resourceCache,
-                                         const GrTextureDesc& desc) {
-    GrTexture* texture = gpu->createTexture(desc, NULL, 0);
-    if (NULL != texture) {
-        GrResourceKey key = GrTextureImpl::ComputeScratchKey(texture->desc());
-        // Adding a resource could put us overbudget. Try to free up the
-        // necessary space before adding it.
-        resourceCache->purgeAsNeeded(1, texture->gpuMemorySize());
-        // Make the resource exclusive so future 'find' calls don't return it
-        resourceCache->addResource(key, texture, GrResourceCache::kHide_OwnershipFlag);
-    }
-    return texture;
-}
-
-GrTexture* GrContext::lockAndRefScratchTexture(const GrTextureDesc& inDesc, ScratchTexMatch match) {
-
-    SkASSERT((inDesc.fFlags & kRenderTarget_GrTextureFlagBit) ||
-             !(inDesc.fFlags & kNoStencil_GrTextureFlagBit));
-
-    // Renderable A8 targets are not universally supported (e.g., not on ANGLE)
-    SkASSERT(this->isConfigRenderable(kAlpha_8_GrPixelConfig, inDesc.fSampleCnt > 0) ||
-             !(inDesc.fFlags & kRenderTarget_GrTextureFlagBit) ||
-             (inDesc.fConfig != kAlpha_8_GrPixelConfig));
-
-    if (!fGpu->caps()->reuseScratchTextures() &&
-        !(inDesc.fFlags & kRenderTarget_GrTextureFlagBit)) {
-        // If we're never recycling this texture we can always make it the right size
-        return create_scratch_texture(fGpu, fResourceCache, inDesc);
-    }
-
-    GrTextureDesc desc = inDesc;
-
-    if (kApprox_ScratchTexMatch == match) {
-        // bin by pow2 with a reasonable min
-        static const int MIN_SIZE = 16;
-        desc.fWidth  = SkTMax(MIN_SIZE, GrNextPow2(desc.fWidth));
-        desc.fHeight = SkTMax(MIN_SIZE, GrNextPow2(desc.fHeight));
-    }
-
-    GrGpuResource* resource = NULL;
-    int origWidth = desc.fWidth;
-    int origHeight = desc.fHeight;
-
-    do {
-        GrResourceKey key = GrTextureImpl::ComputeScratchKey(desc);
-        // Ensure we have exclusive access to the texture so future 'find' calls don't return it
-        resource = fResourceCache->find(key, GrResourceCache::kHide_OwnershipFlag);
-        if (NULL != resource) {
-            resource->ref();
-            break;
-        }
-        if (kExact_ScratchTexMatch == match) {
-            break;
-        }
-        // We had a cache miss and we are in approx mode, relax the fit of the flags.
-
-        // We no longer try to reuse textures that were previously used as render targets in
-        // situations where no RT is needed; doing otherwise can confuse the video driver and
-        // cause significant performance problems in some cases.
-        if (desc.fFlags & kNoStencil_GrTextureFlagBit) {
-            desc.fFlags = desc.fFlags & ~kNoStencil_GrTextureFlagBit;
-        } else {
-            break;
-        }
-
-    } while (true);
-
-    if (NULL == resource) {
-        desc.fFlags = inDesc.fFlags;
-        desc.fWidth = origWidth;
-        desc.fHeight = origHeight;
-        resource = create_scratch_texture(fGpu, fResourceCache, desc);
-    }
-
-    return static_cast<GrTexture*>(resource);
-}
-
-void GrContext::addExistingTextureToCache(GrTexture* texture) {
-
-    if (NULL == texture) {
-        return;
-    }
-
-    // This texture should already have a cache entry since it was once
-    // attached
-    SkASSERT(NULL != texture->getCacheEntry());
-
-    // Conceptually, the cache entry is going to assume responsibility
-    // for the creation ref. Assert refcnt == 1.
-    SkASSERT(texture->unique());
-
-    if (fGpu->caps()->reuseScratchTextures() || NULL != texture->asRenderTarget()) {
-        // Since this texture came from an AutoScratchTexture it should
-        // still be in the exclusive pile. Recycle it.
-        fResourceCache->makeNonExclusive(texture->getCacheEntry());
-        this->purgeCache();
-    } else {
-        // When we aren't reusing textures we know this scratch texture
-        // will never be reused and would be just wasting time in the cache
-        fResourceCache->makeNonExclusive(texture->getCacheEntry());
-        fResourceCache->deleteResource(texture->getCacheEntry());
-    }
-}
-
-void GrContext::unlockScratchTexture(GrTexture* texture) {
-    ASSERT_OWNED_RESOURCE(texture);
-    SkASSERT(NULL != texture->getCacheEntry());
-
-    // If this is a scratch texture we detached it from the cache
-    // while it was locked (to avoid two callers simultaneously getting
-    // the same texture).
-    if (texture->getCacheEntry()->key().isScratch()) {
-        if (fGpu->caps()->reuseScratchTextures() || NULL != texture->asRenderTarget()) {
-            fResourceCache->makeNonExclusive(texture->getCacheEntry());
-            this->purgeCache();
-        } else if (texture->unique()) {
-            // Only the cache now knows about this texture. Since we're never
-            // reusing scratch textures (in this code path) it would just be
-            // wasting time sitting in the cache.
-            fResourceCache->makeNonExclusive(texture->getCacheEntry());
-            fResourceCache->deleteResource(texture->getCacheEntry());
-        } else {
-            // In this case (there is still a non-cache ref) but we don't really
-            // want to readd it to the cache (since it will never be reused).
-            // Instead, give up the cache's ref and leave the decision up to
-            // addExistingTextureToCache once its ref count reaches 0. For
-            // this to work we need to leave it in the exclusive list.
-            texture->impl()->setFlag((GrTextureFlags) GrTextureImpl::kReturnToCache_FlagBit);
-            // Give up the cache's ref to the texture
-            texture->unref();
-        }
-    }
-}
-
-void GrContext::purgeCache() {
-    if (NULL != fResourceCache) {
-        fResourceCache->purgeAsNeeded();
-    }
-}
-
-bool GrContext::OverbudgetCB(void* data) {
-    SkASSERT(NULL != data);
+void GrContext::OverBudgetCB(void* data) {
+    SkASSERT(data);
 
     GrContext* context = reinterpret_cast<GrContext*>(data);
 
-    // Flush the InOrderDrawBuffer to possibly free up some textures
+    // Flush the GrBufferedDrawTarget to possibly free up some textures
     context->fFlushToReduceCacheSize = true;
-
-    return true;
 }
 
-
-GrTexture* GrContext::createUncachedTexture(const GrTextureDesc& descIn,
-                                            void* srcData,
-                                            size_t rowBytes) {
-    GrTextureDesc descCopy = descIn;
-    return fGpu->createTexture(descCopy, srcData, rowBytes);
-}
-
-void GrContext::getResourceCacheLimits(int* maxTextures, size_t* maxTextureBytes) const {
-    fResourceCache->getLimits(maxTextures, maxTextureBytes);
-}
-
-void GrContext::setResourceCacheLimits(int maxTextures, size_t maxTextureBytes) {
-    fResourceCache->setLimits(maxTextures, maxTextureBytes);
-}
-
-int GrContext::getMaxTextureSize() const {
-    return SkTMin(fGpu->caps()->maxTextureSize(), fMaxTextureSizeOverride);
-}
-
-int GrContext::getMaxRenderTargetSize() const {
-    return fGpu->caps()->maxRenderTargetSize();
-}
-
-int GrContext::getMaxSampleCount() const {
-    return fGpu->caps()->maxSampleCount();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-GrTexture* GrContext::wrapBackendTexture(const GrBackendTextureDesc& desc) {
-    return fGpu->wrapBackendTexture(desc);
-}
-
-GrRenderTarget* GrContext::wrapBackendRenderTarget(const GrBackendRenderTargetDesc& desc) {
-    return fGpu->wrapBackendRenderTarget(desc);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-bool GrContext::supportsIndex8PixelConfig(const GrTextureParams* params,
-                                          int width, int height) const {
-    const GrDrawTargetCaps* caps = fGpu->caps();
-    if (!caps->isConfigTexturable(kIndex_8_GrPixelConfig)) {
-        return false;
-    }
-
-    bool isPow2 = SkIsPow2(width) && SkIsPow2(height);
-
-    if (!isPow2) {
-        bool tiled = NULL != params && params->isTiled();
-        if (tiled && !caps->npotTextureTileSupport()) {
-            return false;
-        }
-    }
-    return true;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-
-void GrContext::clear(const SkIRect* rect,
-                      const GrColor color,
-                      bool canIgnoreRect,
-                      GrRenderTarget* target) {
-    AutoRestoreEffects are;
-    AutoCheckFlush acf(this);
-    GR_CREATE_TRACE_MARKER_CONTEXT("GrContext::clear", this);
-    this->prepareToDraw(NULL, BUFFERED_DRAW, &are, &acf)->clear(rect, color,
-                                                                canIgnoreRect, target);
-}
-
-void GrContext::drawPaint(const GrPaint& origPaint) {
-    // set rect to be big enough to fill the space, but not super-huge, so we
-    // don't overflow fixed-point implementations
-    SkRect r;
-    r.setLTRB(0, 0,
-              SkIntToScalar(getRenderTarget()->width()),
-              SkIntToScalar(getRenderTarget()->height()));
-    SkMatrix inverse;
-    SkTCopyOnFirstWrite<GrPaint> paint(origPaint);
-    AutoMatrix am;
-    GR_CREATE_TRACE_MARKER_CONTEXT("GrContext::drawPaint", this);
-
-    // We attempt to map r by the inverse matrix and draw that. mapRect will
-    // map the four corners and bound them with a new rect. This will not
-    // produce a correct result for some perspective matrices.
-    if (!this->getMatrix().hasPerspective()) {
-        if (!fViewMatrix.invert(&inverse)) {
-            GrPrintf("Could not invert matrix\n");
-            return;
-        }
-        inverse.mapRect(&r);
-    } else {
-        if (!am.setIdentity(this, paint.writable())) {
-            GrPrintf("Could not invert matrix\n");
-            return;
-        }
-    }
-    // by definition this fills the entire clip, no need for AA
-    if (paint->isAntiAlias()) {
-        paint.writable()->setAntiAlias(false);
-    }
-    this->drawRect(*paint, r);
-}
-
-#ifdef SK_DEVELOPER
-void GrContext::dumpFontCache() const {
-    fFontCache->dump();
-}
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-
-/*  create a triangle strip that strokes the specified triangle. There are 8
- unique vertices, but we repreat the last 2 to close up. Alternatively we
- could use an indices array, and then only send 8 verts, but not sure that
- would be faster.
- */
-static void setStrokeRectStrip(SkPoint verts[10], SkRect rect,
-                               SkScalar width) {
-    const SkScalar rad = SkScalarHalf(width);
-    rect.sort();
-
-    verts[0].set(rect.fLeft + rad, rect.fTop + rad);
-    verts[1].set(rect.fLeft - rad, rect.fTop - rad);
-    verts[2].set(rect.fRight - rad, rect.fTop + rad);
-    verts[3].set(rect.fRight + rad, rect.fTop - rad);
-    verts[4].set(rect.fRight - rad, rect.fBottom - rad);
-    verts[5].set(rect.fRight + rad, rect.fBottom + rad);
-    verts[6].set(rect.fLeft + rad, rect.fBottom - rad);
-    verts[7].set(rect.fLeft - rad, rect.fBottom + rad);
-    verts[8] = verts[0];
-    verts[9] = verts[1];
-}
-
-static bool isIRect(const SkRect& r) {
-    return SkScalarIsInt(r.fLeft)  && SkScalarIsInt(r.fTop) &&
-           SkScalarIsInt(r.fRight) && SkScalarIsInt(r.fBottom);
-}
-
-static bool apply_aa_to_rect(GrDrawTarget* target,
-                             const SkRect& rect,
-                             SkScalar strokeWidth,
-                             const SkMatrix& combinedMatrix,
-                             SkRect* devBoundRect,
-                             bool* useVertexCoverage) {
-    // we use a simple coverage ramp to do aa on axis-aligned rects
-    // we check if the rect will be axis-aligned, and the rect won't land on
-    // integer coords.
-
-    // we are keeping around the "tweak the alpha" trick because
-    // it is our only hope for the fixed-pipe implementation.
-    // In a shader implementation we can give a separate coverage input
-    // TODO: remove this ugliness when we drop the fixed-pipe impl
-    *useVertexCoverage = false;
-    if (!target->getDrawState().canTweakAlphaForCoverage()) {
-        if (target->shouldDisableCoverageAAForBlend()) {
-#ifdef SK_DEBUG
-            //GrPrintf("Turning off AA to correctly apply blend.\n");
-#endif
-            return false;
-        } else {
-            *useVertexCoverage = true;
-        }
-    }
-    const GrDrawState& drawState = target->getDrawState();
-    if (drawState.getRenderTarget()->isMultisampled()) {
-        return false;
-    }
-
-    if (0 == strokeWidth && target->willUseHWAALines()) {
-        return false;
-    }
-
-#if defined(SHADER_AA_FILL_RECT) || !defined(IGNORE_ROT_AA_RECT_OPT)
-    if (strokeWidth >= 0) {
-#endif
-        if (!combinedMatrix.preservesAxisAlignment()) {
-            return false;
-        }
-
-#if defined(SHADER_AA_FILL_RECT) || !defined(IGNORE_ROT_AA_RECT_OPT)
-    } else {
-        if (!combinedMatrix.preservesRightAngles()) {
-            return false;
-        }
-    }
-#endif
-
-    combinedMatrix.mapRect(devBoundRect, rect);
-
-    if (strokeWidth < 0) {
-        return !isIRect(*devBoundRect);
-    } else {
-        return true;
-    }
-}
-
-static inline bool rect_contains_inclusive(const SkRect& rect, const SkPoint& point) {
-    return point.fX >= rect.fLeft && point.fX <= rect.fRight &&
-           point.fY >= rect.fTop && point.fY <= rect.fBottom;
-}
-
-void GrContext::drawRect(const GrPaint& paint,
-                         const SkRect& rect,
-                         const GrStrokeInfo* strokeInfo,
-                         const SkMatrix* matrix) {
-    if (NULL != strokeInfo && strokeInfo->isDashed()) {
-        SkPath path;
-        path.addRect(rect);
-        this->drawPath(paint, path, *strokeInfo);
-        return;
-    }
-
-    AutoRestoreEffects are;
-    AutoCheckFlush acf(this);
-    GrDrawTarget* target = this->prepareToDraw(&paint, BUFFERED_DRAW, &are, &acf);
-
-    GR_CREATE_TRACE_MARKER("GrContext::drawRect", target);
-    SkScalar width = NULL == strokeInfo ? -1 : strokeInfo->getStrokeRec().getWidth();
-    SkMatrix combinedMatrix = target->drawState()->getViewMatrix();
-    if (NULL != matrix) {
-        combinedMatrix.preConcat(*matrix);
-    }
-
-    // Check if this is a full RT draw and can be replaced with a clear. We don't bother checking
-    // cases where the RT is fully inside a stroke.
-    if (width < 0) {
-        SkRect rtRect;
-        target->getDrawState().getRenderTarget()->getBoundsRect(&rtRect);
-        SkRect clipSpaceRTRect = rtRect;
-        bool checkClip = false;
-        if (NULL != this->getClip()) {
-            checkClip = true;
-            clipSpaceRTRect.offset(SkIntToScalar(this->getClip()->fOrigin.fX),
-                                   SkIntToScalar(this->getClip()->fOrigin.fY));
-        }
-        // Does the clip contain the entire RT?
-        if (!checkClip || target->getClip()->fClipStack->quickContains(clipSpaceRTRect)) {
-            SkMatrix invM;
-            if (!combinedMatrix.invert(&invM)) {
-                return;
-            }
-            // Does the rect bound the RT?
-            SkPoint srcSpaceRTQuad[4];
-            invM.mapRectToQuad(srcSpaceRTQuad, rtRect);
-            if (rect_contains_inclusive(rect, srcSpaceRTQuad[0]) &&
-                rect_contains_inclusive(rect, srcSpaceRTQuad[1]) &&
-                rect_contains_inclusive(rect, srcSpaceRTQuad[2]) &&
-                rect_contains_inclusive(rect, srcSpaceRTQuad[3])) {
-                // Will it blend?
-                GrColor clearColor;
-                if (paint.isOpaqueAndConstantColor(&clearColor)) {
-                    target->clear(NULL, clearColor, true);
-                    return;
-                }
-            }
-        }
-    }
-
-    SkRect devBoundRect;
-    bool useVertexCoverage;
-    bool needAA = paint.isAntiAlias() &&
-                  !target->getDrawState().getRenderTarget()->isMultisampled();
-    bool doAA = needAA && apply_aa_to_rect(target, rect, width, combinedMatrix, &devBoundRect,
-                                           &useVertexCoverage);
-
-    const SkStrokeRec& strokeRec = strokeInfo->getStrokeRec();
-
-    if (doAA) {
-        GrDrawState::AutoViewMatrixRestore avmr;
-        if (!avmr.setIdentity(target->drawState())) {
-            return;
-        }
-        if (width >= 0) {
-            fAARectRenderer->strokeAARect(this->getGpu(), target, rect,
-                                          combinedMatrix, devBoundRect,
-                                          strokeRec, useVertexCoverage);
-        } else {
-            // filled AA rect
-            fAARectRenderer->fillAARect(this->getGpu(), target,
-                                        rect, combinedMatrix, devBoundRect,
-                                        useVertexCoverage);
-        }
-        return;
-    }
-
-    if (width >= 0) {
-        // TODO: consider making static vertex buffers for these cases.
-        // Hairline could be done by just adding closing vertex to
-        // unitSquareVertexBuffer()
-
-        static const int worstCaseVertCount = 10;
-        target->drawState()->setDefaultVertexAttribs();
-        GrDrawTarget::AutoReleaseGeometry geo(target, worstCaseVertCount, 0);
-
-        if (!geo.succeeded()) {
-            GrPrintf("Failed to get space for vertices!\n");
-            return;
-        }
-
-        GrPrimitiveType primType;
-        int vertCount;
-        SkPoint* vertex = geo.positions();
-
-        if (width > 0) {
-            vertCount = 10;
-            primType = kTriangleStrip_GrPrimitiveType;
-            setStrokeRectStrip(vertex, rect, width);
-        } else {
-            // hairline
-            vertCount = 5;
-            primType = kLineStrip_GrPrimitiveType;
-            vertex[0].set(rect.fLeft, rect.fTop);
-            vertex[1].set(rect.fRight, rect.fTop);
-            vertex[2].set(rect.fRight, rect.fBottom);
-            vertex[3].set(rect.fLeft, rect.fBottom);
-            vertex[4].set(rect.fLeft, rect.fTop);
-        }
-
-        GrDrawState::AutoViewMatrixRestore avmr;
-        if (NULL != matrix) {
-            GrDrawState* drawState = target->drawState();
-            avmr.set(drawState, *matrix);
-        }
-
-        target->drawNonIndexed(primType, 0, vertCount);
-    } else {
-        // filled BW rect
-        target->drawSimpleRect(rect, matrix);
-    }
-}
-
-void GrContext::drawRectToRect(const GrPaint& paint,
-                               const SkRect& dstRect,
-                               const SkRect& localRect,
-                               const SkMatrix* dstMatrix,
-                               const SkMatrix* localMatrix) {
-    AutoRestoreEffects are;
-    AutoCheckFlush acf(this);
-    GrDrawTarget* target = this->prepareToDraw(&paint, BUFFERED_DRAW, &are, &acf);
-
-    GR_CREATE_TRACE_MARKER("GrContext::drawRectToRect", target);
-
-    target->drawRect(dstRect, dstMatrix, &localRect, localMatrix);
-}
-
-namespace {
-
-extern const GrVertexAttrib gPosUVColorAttribs[] = {
-    {kVec2f_GrVertexAttribType,  0, kPosition_GrVertexAttribBinding },
-    {kVec2f_GrVertexAttribType,  sizeof(SkPoint), kLocalCoord_GrVertexAttribBinding },
-    {kVec4ub_GrVertexAttribType, 2*sizeof(SkPoint), kColor_GrVertexAttribBinding}
-};
-
-extern const GrVertexAttrib gPosColorAttribs[] = {
-    {kVec2f_GrVertexAttribType,  0, kPosition_GrVertexAttribBinding},
-    {kVec4ub_GrVertexAttribType, sizeof(SkPoint), kColor_GrVertexAttribBinding},
-};
-
-static void set_vertex_attributes(GrDrawState* drawState,
-                                  const SkPoint* texCoords,
-                                  const GrColor* colors,
-                                  int* colorOffset,
-                                  int* texOffset) {
-    *texOffset = -1;
-    *colorOffset = -1;
-
-    if (NULL != texCoords && NULL != colors) {
-        *texOffset = sizeof(SkPoint);
-        *colorOffset = 2*sizeof(SkPoint);
-        drawState->setVertexAttribs<gPosUVColorAttribs>(3);
-    } else if (NULL != texCoords) {
-        *texOffset = sizeof(SkPoint);
-        drawState->setVertexAttribs<gPosUVColorAttribs>(2);
-    } else if (NULL != colors) {
-        *colorOffset = sizeof(SkPoint);
-        drawState->setVertexAttribs<gPosColorAttribs>(2);
-    } else {
-        drawState->setVertexAttribs<gPosColorAttribs>(1);
-    }
-}
-
-};
-
-void GrContext::drawVertices(const GrPaint& paint,
-                             GrPrimitiveType primitiveType,
-                             int vertexCount,
-                             const SkPoint positions[],
-                             const SkPoint texCoords[],
-                             const GrColor colors[],
-                             const uint16_t indices[],
-                             int indexCount) {
-    AutoRestoreEffects are;
-    AutoCheckFlush acf(this);
-    GrDrawTarget::AutoReleaseGeometry geo; // must be inside AutoCheckFlush scope
-
-    GrDrawTarget* target = this->prepareToDraw(&paint, BUFFERED_DRAW, &are, &acf);
-    GrDrawState* drawState = target->drawState();
-
-    GR_CREATE_TRACE_MARKER("GrContext::drawVertices", target);
-
-    int colorOffset = -1, texOffset = -1;
-    set_vertex_attributes(drawState, texCoords, colors, &colorOffset, &texOffset);
-
-    size_t vertexSize = drawState->getVertexSize();
-    if (sizeof(SkPoint) != vertexSize) {
-        if (!geo.set(target, vertexCount, 0)) {
-            GrPrintf("Failed to get space for vertices!\n");
-            return;
-        }
-        void* curVertex = geo.vertices();
-
-        for (int i = 0; i < vertexCount; ++i) {
-            *((SkPoint*)curVertex) = positions[i];
-
-            if (texOffset >= 0) {
-                *(SkPoint*)((intptr_t)curVertex + texOffset) = texCoords[i];
-            }
-            if (colorOffset >= 0) {
-                *(GrColor*)((intptr_t)curVertex + colorOffset) = colors[i];
-            }
-            curVertex = (void*)((intptr_t)curVertex + vertexSize);
-        }
-    } else {
-        target->setVertexSourceToArray(positions, vertexCount);
-    }
-
-    // we don't currently apply offscreen AA to this path. Need improved
-    // management of GrDrawTarget's geometry to avoid copying points per-tile.
-
-    if (NULL != indices) {
-        target->setIndexSourceToArray(indices, indexCount);
-        target->drawIndexed(primitiveType, 0, 0, vertexCount, indexCount);
-        target->resetIndexSource();
-    } else {
-        target->drawNonIndexed(primitiveType, 0, vertexCount);
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-void GrContext::drawRRect(const GrPaint& paint,
-                          const SkRRect& rrect,
-                          const GrStrokeInfo& strokeInfo) {
-    if (rrect.isEmpty()) {
-       return;
-    }
-
-    if (strokeInfo.isDashed()) {
-        SkPath path;
-        path.addRRect(rrect);
-        this->drawPath(paint, path, strokeInfo);
-        return;
-    }
-
-    AutoRestoreEffects are;
-    AutoCheckFlush acf(this);
-    GrDrawTarget* target = this->prepareToDraw(&paint, BUFFERED_DRAW, &are, &acf);
-
-    GR_CREATE_TRACE_MARKER("GrContext::drawRRect", target);
-
-    const SkStrokeRec& strokeRec = strokeInfo.getStrokeRec();
-
-    if (!fOvalRenderer->drawRRect(target, this, paint.isAntiAlias(), rrect, strokeRec)) {
-        SkPath path;
-        path.addRRect(rrect);
-        this->internalDrawPath(target, paint.isAntiAlias(), path, strokeInfo);
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-void GrContext::drawDRRect(const GrPaint& paint,
-                           const SkRRect& outer,
-                           const SkRRect& inner) {
-    if (outer.isEmpty()) {
-       return;
-    }
-
-    AutoRestoreEffects are;
-    AutoCheckFlush acf(this);
-    GrDrawTarget* target = this->prepareToDraw(&paint, BUFFERED_DRAW, &are, &acf);
-
-    GR_CREATE_TRACE_MARKER("GrContext::drawDRRect", target);
-
-    if (!fOvalRenderer->drawDRRect(target, this, paint.isAntiAlias(), outer, inner)) {
-        SkPath path;
-        path.addRRect(inner);
-        path.addRRect(outer);
-        path.setFillType(SkPath::kEvenOdd_FillType);
-
-        GrStrokeInfo fillRec(SkStrokeRec::kFill_InitStyle);
-        this->internalDrawPath(target, paint.isAntiAlias(), path, fillRec);
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-void GrContext::drawOval(const GrPaint& paint,
-                         const SkRect& oval,
-                         const GrStrokeInfo& strokeInfo) {
-    if (oval.isEmpty()) {
-       return;
-    }
-
-    if (strokeInfo.isDashed()) {
-        SkPath path;
-        path.addOval(oval);
-        this->drawPath(paint, path, strokeInfo);
-        return;
-    }
-
-    AutoRestoreEffects are;
-    AutoCheckFlush acf(this);
-    GrDrawTarget* target = this->prepareToDraw(&paint, BUFFERED_DRAW, &are, &acf);
-
-    GR_CREATE_TRACE_MARKER("GrContext::drawOval", target);
-
-    const SkStrokeRec& strokeRec = strokeInfo.getStrokeRec();
-
-
-    if (!fOvalRenderer->drawOval(target, this, paint.isAntiAlias(), oval, strokeRec)) {
-        SkPath path;
-        path.addOval(oval);
-        this->internalDrawPath(target, paint.isAntiAlias(), path, strokeInfo);
-    }
-}
-
-// Can 'path' be drawn as a pair of filled nested rectangles?
-static bool is_nested_rects(GrDrawTarget* target,
-                            const SkPath& path,
-                            const SkStrokeRec& stroke,
-                            SkRect rects[2],
-                            bool* useVertexCoverage) {
-    SkASSERT(stroke.isFillStyle());
-
-    if (path.isInverseFillType()) {
-        return false;
-    }
-
-    const GrDrawState& drawState = target->getDrawState();
-
-    // TODO: this restriction could be lifted if we were willing to apply
-    // the matrix to all the points individually rather than just to the rect
-    if (!drawState.getViewMatrix().preservesAxisAlignment()) {
-        return false;
-    }
-
-    *useVertexCoverage = false;
-    if (!target->getDrawState().canTweakAlphaForCoverage()) {
-        if (target->shouldDisableCoverageAAForBlend()) {
-            return false;
-        } else {
-            *useVertexCoverage = true;
-        }
-    }
-
-    SkPath::Direction dirs[2];
-    if (!path.isNestedRects(rects, dirs)) {
-        return false;
-    }
-
-    if (SkPath::kWinding_FillType == path.getFillType() && dirs[0] == dirs[1]) {
-        // The two rects need to be wound opposite to each other
-        return false;
-    }
-
-    // Right now, nested rects where the margin is not the same width
-    // all around do not render correctly
-    const SkScalar* outer = rects[0].asScalars();
-    const SkScalar* inner = rects[1].asScalars();
-
-    SkScalar margin = SkScalarAbs(outer[0] - inner[0]);
-    for (int i = 1; i < 4; ++i) {
-        SkScalar temp = SkScalarAbs(outer[i] - inner[i]);
-        if (!SkScalarNearlyEqual(margin, temp)) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-void GrContext::drawPath(const GrPaint& paint, const SkPath& path, const GrStrokeInfo& strokeInfo) {
-
-    if (path.isEmpty()) {
-       if (path.isInverseFillType()) {
-           this->drawPaint(paint);
-       }
-       return;
-    }
-
-    if (strokeInfo.isDashed()) {
-        SkPoint pts[2];
-        if (path.isLine(pts)) {
-            AutoRestoreEffects are;
-            AutoCheckFlush acf(this);
-            GrDrawTarget* target = this->prepareToDraw(&paint, BUFFERED_DRAW, &are, &acf);
-            GrDrawState* drawState = target->drawState();
-
-            SkMatrix origViewMatrix = drawState->getViewMatrix();
-            GrDrawState::AutoViewMatrixRestore avmr;
-            if (avmr.setIdentity(target->drawState())) {
-                if (GrDashingEffect::DrawDashLine(pts, paint, strokeInfo, fGpu, target,
-                                                  origViewMatrix)) {
-                    return;
-                }
-            }
-        }
-
-        // Filter dashed path into new path with the dashing applied
-        const SkPathEffect::DashInfo& info = strokeInfo.getDashInfo();
-        SkTLazy<SkPath> effectPath;
-        GrStrokeInfo newStrokeInfo(strokeInfo, false);
-        SkStrokeRec* stroke = newStrokeInfo.getStrokeRecPtr();
-        if (SkDashPath::FilterDashPath(effectPath.init(), path, stroke, NULL, info)) {
-            this->drawPath(paint, *effectPath.get(), newStrokeInfo);
-            return;
-        }
-
-        this->drawPath(paint, path, newStrokeInfo);
-        return;
-    }
-
-    // Note that internalDrawPath may sw-rasterize the path into a scratch texture.
-    // Scratch textures can be recycled after they are returned to the texture
-    // cache. This presents a potential hazard for buffered drawing. However,
-    // the writePixels that uploads to the scratch will perform a flush so we're
-    // OK.
-    AutoRestoreEffects are;
-    AutoCheckFlush acf(this);
-    GrDrawTarget* target = this->prepareToDraw(&paint, BUFFERED_DRAW, &are, &acf);
-    GrDrawState* drawState = target->drawState();
-
-    GR_CREATE_TRACE_MARKER1("GrContext::drawPath", target, "Is Convex", path.isConvex());
-
-    const SkStrokeRec& strokeRec = strokeInfo.getStrokeRec();
-
-    bool useCoverageAA = paint.isAntiAlias() && !drawState->getRenderTarget()->isMultisampled();
-
-    if (useCoverageAA && strokeRec.getWidth() < 0 && !path.isConvex()) {
-        // Concave AA paths are expensive - try to avoid them for special cases
-        bool useVertexCoverage;
-        SkRect rects[2];
-
-        if (is_nested_rects(target, path, strokeRec, rects, &useVertexCoverage)) {
-            SkMatrix origViewMatrix = drawState->getViewMatrix();
-            GrDrawState::AutoViewMatrixRestore avmr;
-            if (!avmr.setIdentity(target->drawState())) {
-                return;
-            }
-
-            fAARectRenderer->fillAANestedRects(this->getGpu(), target,
-                                               rects,
-                                               origViewMatrix,
-                                               useVertexCoverage);
-            return;
-        }
-    }
-
-    SkRect ovalRect;
-    bool isOval = path.isOval(&ovalRect);
-
-    if (!isOval || path.isInverseFillType()
-        || !fOvalRenderer->drawOval(target, this, paint.isAntiAlias(), ovalRect, strokeRec)) {
-        this->internalDrawPath(target, paint.isAntiAlias(), path, strokeInfo);
-    }
-}
-
-void GrContext::internalDrawPath(GrDrawTarget* target, bool useAA, const SkPath& path,
-                                 const GrStrokeInfo& strokeInfo) {
-    SkASSERT(!path.isEmpty());
-
-    GR_CREATE_TRACE_MARKER("GrContext::internalDrawPath", target);
-
-
-    // An Assumption here is that path renderer would use some form of tweaking
-    // the src color (either the input alpha or in the frag shader) to implement
-    // aa. If we have some future driver-mojo path AA that can do the right
-    // thing WRT to the blend then we'll need some query on the PR.
-    bool useCoverageAA = useAA &&
-        !target->getDrawState().getRenderTarget()->isMultisampled() &&
-        !target->shouldDisableCoverageAAForBlend();
-
-
-    GrPathRendererChain::DrawType type =
-        useCoverageAA ? GrPathRendererChain::kColorAntiAlias_DrawType :
-                           GrPathRendererChain::kColor_DrawType;
-
-    const SkPath* pathPtr = &path;
-    SkTLazy<SkPath> tmpPath;
-    SkTCopyOnFirstWrite<SkStrokeRec> stroke(strokeInfo.getStrokeRec());
-
-    // Try a 1st time without stroking the path and without allowing the SW renderer
-    GrPathRenderer* pr = this->getPathRenderer(*pathPtr, *stroke, target, false, type);
-
-    if (NULL == pr) {
-        if (!GrPathRenderer::IsStrokeHairlineOrEquivalent(*stroke, this->getMatrix(), NULL)) {
-            // It didn't work the 1st time, so try again with the stroked path
-            if (stroke->applyToPath(tmpPath.init(), *pathPtr)) {
-                pathPtr = tmpPath.get();
-                stroke.writable()->setFillStyle();
-                if (pathPtr->isEmpty()) {
-                    return;
-                }
-            }
-        }
-
-        // This time, allow SW renderer
-        pr = this->getPathRenderer(*pathPtr, *stroke, target, true, type);
-    }
-
-    if (NULL == pr) {
-#ifdef SK_DEBUG
-        GrPrintf("Unable to find path renderer compatible with path.\n");
-#endif
-        return;
-    }
-
-    pr->drawPath(*pathPtr, *stroke, target, useCoverageAA);
+void GrContext::TextBlobCacheOverBudgetCB(void* data) {
+    SkASSERT(data);
+
+    // Unlike the GrResourceCache, TextBlobs are drawn at the SkGpuDevice level, therefore they
+    // cannot use fFlushTorReduceCacheSize because it uses AutoCheckFlush.  The solution is to move
+    // drawText calls to below the GrContext level, but this is not trivial because they call
+    // drawPath on SkGpuDevice
+    GrContext* context = reinterpret_cast<GrContext*>(data);
+    context->flush();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 void GrContext::flush(int flagsBitfield) {
-    if (NULL == fDrawBuffer) {
-        return;
-    }
+    RETURN_IF_ABANDONED
 
     if (kDiscard_FlushBit & flagsBitfield) {
-        fDrawBuffer->reset();
+        fDrawingManager->reset();
     } else {
-        fDrawBuffer->flush();
+        fDrawingManager->flush();
     }
+    fResourceCache->notifyFlushOccurred();
     fFlushToReduceCacheSize = false;
 }
 
-bool GrContext::writeTexturePixels(GrTexture* texture,
-                                   int left, int top, int width, int height,
-                                   GrPixelConfig config, const void* buffer, size_t rowBytes,
-                                   uint32_t flags) {
-    ASSERT_OWNED_RESOURCE(texture);
-
-    if ((kUnpremul_PixelOpsFlag & flags) || !fGpu->canWriteTexturePixels(texture, config)) {
-        if (NULL != texture->asRenderTarget()) {
-            return this->writeRenderTargetPixels(texture->asRenderTarget(),
-                                                 left, top, width, height,
-                                                 config, buffer, rowBytes, flags);
-        } else {
-            return false;
-        }
-    }
-
-    if (!(kDontFlush_PixelOpsFlag & flags)) {
-        this->flush();
-    }
-
-    return fGpu->writeTexturePixels(texture, left, top, width, height,
-                                    config, buffer, rowBytes);
-}
-
-bool GrContext::readTexturePixels(GrTexture* texture,
-                                  int left, int top, int width, int height,
-                                  GrPixelConfig config, void* buffer, size_t rowBytes,
-                                  uint32_t flags) {
-    ASSERT_OWNED_RESOURCE(texture);
-
-    GrRenderTarget* target = texture->asRenderTarget();
-    if (NULL != target) {
-        return this->readRenderTargetPixels(target,
-                                            left, top, width, height,
-                                            config, buffer, rowBytes,
-                                            flags);
-    } else {
-        // TODO: make this more efficient for cases where we're reading the entire
-        //       texture, i.e., use GetTexImage() instead
-
-        // create scratch rendertarget and read from that
-        GrAutoScratchTexture ast;
-        GrTextureDesc desc;
-        desc.fFlags = kRenderTarget_GrTextureFlagBit;
-        desc.fWidth = width;
-        desc.fHeight = height;
-        desc.fConfig = config;
-        desc.fOrigin = kTopLeft_GrSurfaceOrigin;
-        ast.set(this, desc, kExact_ScratchTexMatch);
-        GrTexture* dst = ast.texture();
-        if (NULL != dst && NULL != (target = dst->asRenderTarget())) {
-            this->copyTexture(texture, target, NULL);
-            return this->readRenderTargetPixels(target,
-                                                left, top, width, height,
-                                                config, buffer, rowBytes,
-                                                flags);
-        }
-
+bool sw_convert_to_premul(GrPixelConfig srcConfig, int width, int height, size_t inRowBytes,
+                          const void* inPixels, size_t outRowBytes, void* outPixels) {
+    SkSrcPixelInfo srcPI;
+    if (!GrPixelConfig2ColorAndProfileType(srcConfig, &srcPI.fColorType, nullptr)) {
         return false;
     }
+    srcPI.fAlphaType = kUnpremul_SkAlphaType;
+    srcPI.fPixels = inPixels;
+    srcPI.fRowBytes = inRowBytes;
+
+    SkDstPixelInfo dstPI;
+    dstPI.fColorType = srcPI.fColorType;
+    dstPI.fAlphaType = kPremul_SkAlphaType;
+    dstPI.fPixels = outPixels;
+    dstPI.fRowBytes = outRowBytes;
+
+    return srcPI.convertPixelsTo(&dstPI, width, height);
 }
 
-#include "SkConfig8888.h"
+bool GrContext::writeSurfacePixels(GrSurface* surface,
+                                   int left, int top, int width, int height,
+                                   GrPixelConfig srcConfig, const void* buffer, size_t rowBytes,
+                                   uint32_t pixelOpsFlags) {
+    RETURN_FALSE_IF_ABANDONED
+    ASSERT_OWNED_RESOURCE(surface);
+    SkASSERT(surface);
 
-// toggles between RGBA and BGRA
-static SkColorType toggle_colortype32(SkColorType ct) {
-    if (kRGBA_8888_SkColorType == ct) {
-        return kBGRA_8888_SkColorType;
-    } else {
-        SkASSERT(kBGRA_8888_SkColorType == ct);
-        return kRGBA_8888_SkColorType;
+    this->testPMConversionsIfNecessary(pixelOpsFlags);
+
+    // Trim the params here so that if we wind up making a temporary surface it can be as small as
+    // necessary and because GrGpu::getWritePixelsInfo requires it.
+    if (!GrSurfacePriv::AdjustWritePixelParams(surface->width(), surface->height(),
+                                               GrBytesPerPixel(srcConfig), &left, &top, &width,
+                                               &height, &buffer, &rowBytes)) {
+        return false;
     }
-}
 
-bool GrContext::readRenderTargetPixels(GrRenderTarget* target,
-                                       int left, int top, int width, int height,
-                                       GrPixelConfig dstConfig, void* buffer, size_t rowBytes,
-                                       uint32_t flags) {
-    ASSERT_OWNED_RESOURCE(target);
+    bool applyPremulToSrc = false;
+    if (kUnpremul_PixelOpsFlag & pixelOpsFlags) {
+        if (!GrPixelConfigIs8888(srcConfig)) {
+            return false;
+        }
+        applyPremulToSrc = true;
+    }
 
-    if (NULL == target) {
-        target = fRenderTarget.get();
-        if (NULL == target) {
+    GrGpu::DrawPreference drawPreference = GrGpu::kNoDraw_DrawPreference;
+    // Don't prefer to draw for the conversion (and thereby access a texture from the cache) when
+    // we've already determined that there isn't a roundtrip preserving conversion processor pair.
+    if (applyPremulToSrc && !this->didFailPMUPMConversionTest()) {
+        drawPreference = GrGpu::kCallerPrefersDraw_DrawPreference;
+    }
+
+    GrGpu::WritePixelTempDrawInfo tempDrawInfo;
+    if (!fGpu->getWritePixelsInfo(surface, width, height, rowBytes, srcConfig, &drawPreference,
+                                  &tempDrawInfo)) {
+        return false;
+    }
+
+    if (!(kDontFlush_PixelOpsFlag & pixelOpsFlags) && surface->surfacePriv().hasPendingIO()) {
+        this->flush();
+    }
+
+    SkAutoTUnref<GrTexture> tempTexture;
+    if (GrGpu::kNoDraw_DrawPreference != drawPreference) {
+        tempTexture.reset(
+            this->textureProvider()->createApproxTexture(tempDrawInfo.fTempSurfaceDesc));
+        if (!tempTexture && GrGpu::kRequireDraw_DrawPreference == drawPreference) {
             return false;
         }
     }
 
-    if (!(kDontFlush_PixelOpsFlag & flags)) {
-        this->flush();
+    // temp buffer for doing sw premul conversion, if needed.
+#if defined(GOOGLE3)
+    // Stack frame size is limited in GOOGLE3.
+    SkAutoSTMalloc<48 * 48, uint32_t> tmpPixels(0);
+#else
+    SkAutoSTMalloc<128 * 128, uint32_t> tmpPixels(0);
+#endif
+    if (tempTexture) {
+        SkAutoTUnref<const GrFragmentProcessor> fp;
+        SkMatrix textureMatrix;
+        textureMatrix.setIDiv(tempTexture->width(), tempTexture->height());
+        if (applyPremulToSrc) {
+            fp.reset(this->createUPMToPMEffect(tempTexture, tempDrawInfo.fSwapRAndB,
+                                               textureMatrix));
+            // If premultiplying was the only reason for the draw, fall back to a straight write.
+            if (!fp) {
+                if (GrGpu::kCallerPrefersDraw_DrawPreference == drawPreference) {
+                    tempTexture.reset(nullptr);
+                }
+            } else {
+                applyPremulToSrc = false;
+            }
+        }
+        if (tempTexture) {
+            if (!fp) {
+                fp.reset(GrConfigConversionEffect::Create(tempTexture, tempDrawInfo.fSwapRAndB,
+                    GrConfigConversionEffect::kNone_PMConversion, textureMatrix));
+                if (!fp) {
+                    return false;
+                }
+            }
+            GrRenderTarget* renderTarget = surface->asRenderTarget();
+            SkASSERT(renderTarget);
+            if (tempTexture->surfacePriv().hasPendingIO()) {
+                this->flush();
+            }
+            if (applyPremulToSrc) {
+                size_t tmpRowBytes = 4 * width;
+                tmpPixels.reset(width * height);
+                if (!sw_convert_to_premul(srcConfig, width, height, rowBytes, buffer, tmpRowBytes,
+                                          tmpPixels.get())) {
+                    return false;
+                }
+                rowBytes = tmpRowBytes;
+                buffer = tmpPixels.get();
+                applyPremulToSrc = false;
+            }
+            if (!fGpu->writePixels(tempTexture, 0, 0, width, height,
+                                   tempDrawInfo.fTempSurfaceDesc.fConfig, buffer,
+                                   rowBytes)) {
+                return false;
+            }
+            SkMatrix matrix;
+            matrix.setTranslate(SkIntToScalar(left), SkIntToScalar(top));
+            SkAutoTUnref<GrDrawContext> drawContext(this->drawContext(renderTarget));
+            if (!drawContext) {
+                return false;
+            }
+            GrPaint paint;
+            paint.addColorFragmentProcessor(fp);
+            paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode);
+            SkRect rect = SkRect::MakeWH(SkIntToScalar(width), SkIntToScalar(height));
+            drawContext->drawRect(GrClip::WideOpen(), paint, matrix, rect, nullptr);
+
+            if (kFlushWrites_PixelOp & pixelOpsFlags) {
+                this->flushSurfaceWrites(surface);
+            }
+        }
+    }
+    if (!tempTexture) {
+        if (applyPremulToSrc) {
+            size_t tmpRowBytes = 4 * width;
+            tmpPixels.reset(width * height);
+            if (!sw_convert_to_premul(srcConfig, width, height, rowBytes, buffer, tmpRowBytes,
+                                      tmpPixels.get())) {
+                return false;
+            }
+            rowBytes = tmpRowBytes;
+            buffer = tmpPixels.get();
+            applyPremulToSrc = false;
+        }
+        return fGpu->writePixels(surface, left, top, width, height, srcConfig, buffer, rowBytes);
+    }
+    return true;
+}
+
+bool GrContext::readSurfacePixels(GrSurface* src,
+                                  int left, int top, int width, int height,
+                                  GrPixelConfig dstConfig, void* buffer, size_t rowBytes,
+                                  uint32_t flags) {
+    RETURN_FALSE_IF_ABANDONED
+    ASSERT_OWNED_RESOURCE(src);
+    SkASSERT(src);
+
+    this->testPMConversionsIfNecessary(flags);
+    SkAutoMutexAcquire ama(fReadPixelsMutex);
+
+    // Adjust the params so that if we wind up using an intermediate surface we've already done
+    // all the trimming and the temporary can be the min size required.
+    if (!GrSurfacePriv::AdjustReadPixelParams(src->width(), src->height(),
+                                              GrBytesPerPixel(dstConfig), &left,
+                                              &top, &width, &height, &buffer, &rowBytes)) {
+        return false;
     }
 
-    // Determine which conversions have to be applied: flipY, swapRAnd, and/or unpremul.
-
-    // If fGpu->readPixels would incur a y-flip cost then we will read the pixels upside down. We'll
-    // either do the flipY by drawing into a scratch with a matrix or on the cpu after the read.
-    bool flipY = fGpu->readPixelsWillPayForYFlip(target, left, top,
-                                                 width, height, dstConfig,
-                                                 rowBytes);
-    // We ignore the preferred config if it is different than our config unless it is an R/B swap.
-    // In that case we'll perform an R and B swap while drawing to a scratch texture of the swapped
-    // config. Then we will call readPixels on the scratch with the swapped config. The swaps during
-    // the draw cancels out the fact that we call readPixels with a config that is R/B swapped from
-    // dstConfig.
-    GrPixelConfig readConfig = dstConfig;
-    bool swapRAndB = false;
-    if (GrPixelConfigSwapRAndB(dstConfig) ==
-        fGpu->preferredReadPixelsConfig(dstConfig, target->config())) {
-        readConfig = GrPixelConfigSwapRAndB(readConfig);
-        swapRAndB = true;
+    if (!(kDontFlush_PixelOpsFlag & flags) && src->surfacePriv().hasPendingWrite()) {
+        this->flush();
     }
 
     bool unpremul = SkToBool(kUnpremul_PixelOpsFlag & flags);
-
     if (unpremul && !GrPixelConfigIs8888(dstConfig)) {
-        // The unpremul flag is only allowed for these two configs.
+        // The unpremul flag is only allowed for 8888 configs.
         return false;
     }
 
-    // If the src is a texture and we would have to do conversions after read pixels, we instead
-    // do the conversions by drawing the src to a scratch texture. If we handle any of the
-    // conversions in the draw we set the corresponding bool to false so that we don't reapply it
-    // on the read back pixels.
-    GrTexture* src = target->asTexture();
-    GrAutoScratchTexture ast;
-    if (NULL != src && (swapRAndB || unpremul || flipY)) {
-        // Make the scratch a render target because we don't have a robust readTexturePixels as of
-        // yet. It calls this function.
-        GrTextureDesc desc;
-        desc.fFlags = kRenderTarget_GrTextureFlagBit;
-        desc.fWidth = width;
-        desc.fHeight = height;
-        desc.fConfig = readConfig;
-        desc.fOrigin = kTopLeft_GrSurfaceOrigin;
+    GrGpu::DrawPreference drawPreference = GrGpu::kNoDraw_DrawPreference;
+    // Don't prefer to draw for the conversion (and thereby access a texture from the cache) when
+    // we've already determined that there isn't a roundtrip preserving conversion processor pair.
+    if (unpremul && !this->didFailPMUPMConversionTest()) {
+        drawPreference = GrGpu::kCallerPrefersDraw_DrawPreference;
+    }
 
-        // When a full read back is faster than a partial we could always make the scratch exactly
-        // match the passed rect. However, if we see many different size rectangles we will trash
-        // our texture cache and pay the cost of creating and destroying many textures. So, we only
-        // request an exact match when the caller is reading an entire RT.
-        ScratchTexMatch match = kApprox_ScratchTexMatch;
-        if (0 == left &&
-            0 == top &&
-            target->width() == width &&
-            target->height() == height &&
-            fGpu->fullReadPixelsIsFasterThanPartial()) {
-            match = kExact_ScratchTexMatch;
+    GrGpu::ReadPixelTempDrawInfo tempDrawInfo;
+    if (!fGpu->getReadPixelsInfo(src, width, height, rowBytes, dstConfig, &drawPreference,
+                                 &tempDrawInfo)) {
+        return false;
+    }
+
+    SkAutoTUnref<GrSurface> surfaceToRead(SkRef(src));
+    bool didTempDraw = false;
+    if (GrGpu::kNoDraw_DrawPreference != drawPreference) {
+        if (tempDrawInfo.fUseExactScratch) {
+            // We only respect this when the entire src is being read. Otherwise we can trigger too
+            // many odd ball texture sizes and trash the cache.
+            if (width != src->width() || height != src->height()) {
+                tempDrawInfo.fUseExactScratch = false;
+            }
         }
-        ast.set(this, desc, match);
-        GrTexture* texture = ast.texture();
-        if (texture) {
-            // compute a matrix to perform the draw
+        SkAutoTUnref<GrTexture> temp;
+        if (tempDrawInfo.fUseExactScratch) {
+            temp.reset(this->textureProvider()->createTexture(tempDrawInfo.fTempSurfaceDesc, true));
+        } else {
+            temp.reset(this->textureProvider()->createApproxTexture(tempDrawInfo.fTempSurfaceDesc));
+        }
+        if (temp) {
             SkMatrix textureMatrix;
-            textureMatrix.setTranslate(SK_Scalar1 *left, SK_Scalar1 *top);
+            textureMatrix.setTranslate(SkIntToScalar(left), SkIntToScalar(top));
             textureMatrix.postIDiv(src->width(), src->height());
-
-            SkAutoTUnref<const GrEffect> effect;
+            SkAutoTUnref<const GrFragmentProcessor> fp;
             if (unpremul) {
-                effect.reset(this->createPMToUPMEffect(src, swapRAndB, textureMatrix));
-                if (NULL != effect) {
+                fp.reset(this->createPMToUPMEffect(src->asTexture(), tempDrawInfo.fSwapRAndB,
+                    textureMatrix));
+                if (fp) {
                     unpremul = false; // we no longer need to do this on CPU after the read back.
+                } else if (GrGpu::kCallerPrefersDraw_DrawPreference == drawPreference) {
+                    // We only wanted to do the draw in order to perform the unpremul so don't
+                    // bother.
+                    temp.reset(nullptr);
                 }
             }
-            // If we failed to create a PM->UPM effect and have no other conversions to perform then
-            // there is no longer any point to using the scratch.
-            if (NULL != effect || flipY || swapRAndB) {
-                if (!effect) {
-                    effect.reset(GrConfigConversionEffect::Create(
-                                                    src,
-                                                    swapRAndB,
-                                                    GrConfigConversionEffect::kNone_PMConversion,
-                                                    textureMatrix));
-                }
-                swapRAndB = false; // we will handle the swap in the draw.
-
-                // We protect the existing geometry here since it may not be
-                // clear to the caller that a draw operation (i.e., drawSimpleRect)
-                // can be invoked in this method
-                GrDrawTarget::AutoGeometryAndStatePush agasp(fGpu, GrDrawTarget::kReset_ASRInit);
-                GrDrawState* drawState = fGpu->drawState();
-                SkASSERT(effect);
-                drawState->addColorEffect(effect);
-
-                drawState->setRenderTarget(texture->asRenderTarget());
+            if (!fp && temp) {
+                fp.reset(GrConfigConversionEffect::Create(src->asTexture(), tempDrawInfo.fSwapRAndB,
+                    GrConfigConversionEffect::kNone_PMConversion, textureMatrix));
+            }
+            if (fp) {
+                GrPaint paint;
+                paint.addColorFragmentProcessor(fp);
+                paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode);
                 SkRect rect = SkRect::MakeWH(SkIntToScalar(width), SkIntToScalar(height));
-                fGpu->drawSimpleRect(rect, NULL);
-                // we want to read back from the scratch's origin
+                SkAutoTUnref<GrDrawContext> drawContext(this->drawContext(temp->asRenderTarget()));
+                drawContext->drawRect(GrClip::WideOpen(), paint, SkMatrix::I(), rect, nullptr);
+                surfaceToRead.reset(SkRef(temp.get()));
                 left = 0;
                 top = 0;
-                target = texture->asRenderTarget();
+                didTempDraw = true;
             }
         }
     }
-    if (!fGpu->readPixels(target,
-                          left, top, width, height,
-                          readConfig, buffer, rowBytes)) {
+
+    if (GrGpu::kRequireDraw_DrawPreference == drawPreference && !didTempDraw) {
         return false;
     }
-    // Perform any conversions we weren't able to perform using a scratch texture.
-    if (unpremul || swapRAndB) {
+    GrPixelConfig configToRead = dstConfig;
+    if (didTempDraw) {
+        this->flushSurfaceWrites(surfaceToRead);
+        // We swapped R and B while doing the temp draw. Swap back on the read.
+        if (tempDrawInfo.fSwapRAndB) {
+            configToRead = GrPixelConfigSwapRAndB(dstConfig);
+        }
+    }
+    if (!fGpu->readPixels(surfaceToRead, left, top, width, height, configToRead, buffer,
+                           rowBytes)) {
+        return false;
+    }
+
+    // Perform umpremul conversion if we weren't able to perform it as a draw.
+    if (unpremul) {
         SkDstPixelInfo dstPI;
-        if (!GrPixelConfig2ColorType(dstConfig, &dstPI.fColorType)) {
+        if (!GrPixelConfig2ColorAndProfileType(dstConfig, &dstPI.fColorType, nullptr)) {
             return false;
         }
         dstPI.fAlphaType = kUnpremul_SkAlphaType;
@@ -1529,7 +473,7 @@ bool GrContext::readRenderTargetPixels(GrRenderTarget* target,
         dstPI.fRowBytes = rowBytes;
 
         SkSrcPixelInfo srcPI;
-        srcPI.fColorType = swapRAndB ? toggle_colortype32(dstPI.fColorType) : dstPI.fColorType;
+        srcPI.fColorType = dstPI.fColorType;
         srcPI.fAlphaType = kPremul_SkAlphaType;
         srcPI.fPixels = buffer;
         srcPI.fRowBytes = rowBytes;
@@ -1539,273 +483,61 @@ bool GrContext::readRenderTargetPixels(GrRenderTarget* target,
     return true;
 }
 
-void GrContext::resolveRenderTarget(GrRenderTarget* target) {
-    SkASSERT(target);
-    ASSERT_OWNED_RESOURCE(target);
-    // In the future we may track whether there are any pending draws to this
-    // target. We don't today so we always perform a flush. We don't promise
-    // this to our clients, though.
-    this->flush();
-    fGpu->resolveRenderTarget(target);
+void GrContext::prepareSurfaceForExternalIO(GrSurface* surface) {
+    RETURN_IF_ABANDONED
+    SkASSERT(surface);
+    ASSERT_OWNED_RESOURCE(surface);
+    if (surface->surfacePriv().hasPendingIO()) {
+        this->flush();
+    }
+    GrRenderTarget* rt = surface->asRenderTarget();
+    if (fGpu && rt) {
+        fGpu->resolveRenderTarget(rt);
+    }
 }
 
-void GrContext::discardRenderTarget(GrRenderTarget* target) {
-    SkASSERT(target);
-    ASSERT_OWNED_RESOURCE(target);
-    AutoRestoreEffects are;
-    AutoCheckFlush acf(this);
-    this->prepareToDraw(NULL, BUFFERED_DRAW, &are, &acf)->discard(target);
-}
-
-void GrContext::copyTexture(GrTexture* src, GrRenderTarget* dst, const SkIPoint* topLeft) {
-    if (NULL == src || NULL == dst) {
+void GrContext::copySurface(GrSurface* dst, GrSurface* src, const SkIRect& srcRect,
+                            const SkIPoint& dstPoint, uint32_t pixelOpsFlags) {
+    RETURN_IF_ABANDONED
+    if (!src || !dst) {
         return;
     }
     ASSERT_OWNED_RESOURCE(src);
+    ASSERT_OWNED_RESOURCE(dst);
 
-    // Writes pending to the source texture are not tracked, so a flush
-    // is required to ensure that the copy captures the most recent contents
-    // of the source texture. See similar behavior in
-    // GrContext::resolveRenderTarget.
-    this->flush();
-
-    GrDrawTarget::AutoStateRestore asr(fGpu, GrDrawTarget::kReset_ASRInit);
-    GrDrawState* drawState = fGpu->drawState();
-    drawState->setRenderTarget(dst);
-    SkMatrix sampleM;
-    sampleM.setIDiv(src->width(), src->height());
-    SkIRect srcRect = SkIRect::MakeWH(dst->width(), dst->height());
-    if (NULL != topLeft) {
-        srcRect.offset(*topLeft);
-    }
-    SkIRect srcBounds = SkIRect::MakeWH(src->width(), src->height());
-    if (!srcRect.intersect(srcBounds)) {
+    // Since we're going to the draw target and not GPU, no need to check kNoFlush
+    // here.
+    if (!dst->asRenderTarget()) {
         return;
     }
-    sampleM.preTranslate(SkIntToScalar(srcRect.fLeft), SkIntToScalar(srcRect.fTop));
-    drawState->addColorTextureEffect(src, sampleM);
-    SkRect dstR = SkRect::MakeWH(SkIntToScalar(srcRect.width()), SkIntToScalar(srcRect.height()));
-    fGpu->drawSimpleRect(dstR, NULL);
+
+    SkAutoTUnref<GrDrawContext> drawContext(this->drawContext(dst->asRenderTarget()));
+    if (!drawContext) {
+        return;
+    }
+
+    drawContext->copySurface(src, srcRect, dstPoint);
+
+    if (kFlushWrites_PixelOp & pixelOpsFlags) {
+        this->flush();
+    }
 }
 
-bool GrContext::writeRenderTargetPixels(GrRenderTarget* target,
-                                        int left, int top, int width, int height,
-                                        GrPixelConfig srcConfig,
-                                        const void* buffer,
-                                        size_t rowBytes,
-                                        uint32_t flags) {
-    ASSERT_OWNED_RESOURCE(target);
-
-    if (NULL == target) {
-        target = fRenderTarget.get();
-        if (NULL == target) {
-            return false;
-        }
+void GrContext::flushSurfaceWrites(GrSurface* surface) {
+    RETURN_IF_ABANDONED
+    if (surface->surfacePriv().hasPendingWrite()) {
+        this->flush();
     }
-
-    // TODO: when underlying api has a direct way to do this we should use it (e.g. glDrawPixels on
-    // desktop GL).
-
-    // We will always call some form of writeTexturePixels and we will pass our flags on to it.
-    // Thus, we don't perform a flush here since that call will do it (if the kNoFlush flag isn't
-    // set.)
-
-    // If the RT is also a texture and we don't have to premultiply then take the texture path.
-    // We expect to be at least as fast or faster since it doesn't use an intermediate texture as
-    // we do below.
-
-#if !defined(SK_BUILD_FOR_MAC)
-    // At least some drivers on the Mac get confused when glTexImage2D is called on a texture
-    // attached to an FBO. The FBO still sees the old image. TODO: determine what OS versions and/or
-    // HW is affected.
-    if (NULL != target->asTexture() && !(kUnpremul_PixelOpsFlag & flags) &&
-        fGpu->canWriteTexturePixels(target->asTexture(), srcConfig)) {
-        return this->writeTexturePixels(target->asTexture(),
-                                        left, top, width, height,
-                                        srcConfig, buffer, rowBytes, flags);
-    }
-#endif
-
-    // We ignore the preferred config unless it is a R/B swap of the src config. In that case
-    // we will upload the original src data to a scratch texture but we will spoof it as the swapped
-    // config. This scratch will then have R and B swapped. We correct for this by swapping again
-    // when drawing the scratch to the dst using a conversion effect.
-    bool swapRAndB = false;
-    GrPixelConfig writeConfig = srcConfig;
-    if (GrPixelConfigSwapRAndB(srcConfig) ==
-        fGpu->preferredWritePixelsConfig(srcConfig, target->config())) {
-        writeConfig = GrPixelConfigSwapRAndB(srcConfig);
-        swapRAndB = true;
-    }
-
-    GrTextureDesc desc;
-    desc.fWidth = width;
-    desc.fHeight = height;
-    desc.fConfig = writeConfig;
-    GrAutoScratchTexture ast(this, desc);
-    GrTexture* texture = ast.texture();
-    if (NULL == texture) {
-        return false;
-    }
-
-    SkAutoTUnref<const GrEffect> effect;
-    SkMatrix textureMatrix;
-    textureMatrix.setIDiv(texture->width(), texture->height());
-
-    // allocate a tmp buffer and sw convert the pixels to premul
-    SkAutoSTMalloc<128 * 128, uint32_t> tmpPixels(0);
-
-    if (kUnpremul_PixelOpsFlag & flags) {
-        if (!GrPixelConfigIs8888(srcConfig)) {
-            return false;
-        }
-        effect.reset(this->createUPMToPMEffect(texture, swapRAndB, textureMatrix));
-        // handle the unpremul step on the CPU if we couldn't create an effect to do it.
-        if (NULL == effect) {
-            SkSrcPixelInfo srcPI;
-            if (!GrPixelConfig2ColorType(srcConfig, &srcPI.fColorType)) {
-                return false;
-            }
-            srcPI.fAlphaType = kUnpremul_SkAlphaType;
-            srcPI.fPixels = buffer;
-            srcPI.fRowBytes = rowBytes;
-
-            tmpPixels.reset(width * height);
-
-            SkDstPixelInfo dstPI;
-            dstPI.fColorType = srcPI.fColorType;
-            dstPI.fAlphaType = kPremul_SkAlphaType;
-            dstPI.fPixels = tmpPixels.get();
-            dstPI.fRowBytes = 4 * width;
-
-            if (!srcPI.convertPixelsTo(&dstPI, width, height)) {
-                return false;
-            }
-
-            buffer = tmpPixels.get();
-            rowBytes = 4 * width;
-        }
-    }
-    if (NULL == effect) {
-        effect.reset(GrConfigConversionEffect::Create(texture,
-                                                      swapRAndB,
-                                                      GrConfigConversionEffect::kNone_PMConversion,
-                                                      textureMatrix));
-    }
-
-    if (!this->writeTexturePixels(texture,
-                                  0, 0, width, height,
-                                  writeConfig, buffer, rowBytes,
-                                  flags & ~kUnpremul_PixelOpsFlag)) {
-        return false;
-    }
-
-    // writeRenderTargetPixels can be called in the midst of drawing another
-    // object (e.g., when uploading a SW path rendering to the gpu while
-    // drawing a rect) so preserve the current geometry.
-    SkMatrix matrix;
-    matrix.setTranslate(SkIntToScalar(left), SkIntToScalar(top));
-    GrDrawTarget::AutoGeometryAndStatePush agasp(fGpu, GrDrawTarget::kReset_ASRInit, &matrix);
-    GrDrawState* drawState = fGpu->drawState();
-    SkASSERT(effect);
-    drawState->addColorEffect(effect);
-
-    drawState->setRenderTarget(target);
-
-    fGpu->drawSimpleRect(SkRect::MakeWH(SkIntToScalar(width), SkIntToScalar(height)), NULL);
-    return true;
-}
-////////////////////////////////////////////////////////////////////////////////
-
-GrDrawTarget* GrContext::prepareToDraw(const GrPaint* paint,
-                                       BufferedDraw buffered,
-                                       AutoRestoreEffects* are,
-                                       AutoCheckFlush* acf) {
-    // All users of this draw state should be freeing up all effects when they're done.
-    // Otherwise effects that own resources may keep those resources alive indefinitely.
-    SkASSERT(0 == fDrawState->numColorStages() && 0 == fDrawState->numCoverageStages());
-
-    if (kNo_BufferedDraw == buffered && kYes_BufferedDraw == fLastDrawWasBuffered) {
-        fDrawBuffer->flush();
-        fLastDrawWasBuffered = kNo_BufferedDraw;
-    }
-    ASSERT_OWNED_RESOURCE(fRenderTarget.get());
-    if (NULL != paint) {
-        SkASSERT(NULL != are);
-        SkASSERT(NULL != acf);
-        are->set(fDrawState);
-        fDrawState->setFromPaint(*paint, fViewMatrix, fRenderTarget.get());
-#if GR_DEBUG_PARTIAL_COVERAGE_CHECK
-        if ((paint->hasMask() || 0xff != paint->fCoverage) &&
-            !fGpu->canApplyCoverage()) {
-            GrPrintf("Partial pixel coverage will be incorrectly blended.\n");
-        }
-#endif
-    } else {
-        fDrawState->reset(fViewMatrix);
-        fDrawState->setRenderTarget(fRenderTarget.get());
-    }
-    GrDrawTarget* target;
-    if (kYes_BufferedDraw == buffered) {
-        fLastDrawWasBuffered = kYes_BufferedDraw;
-        target = fDrawBuffer;
-    } else {
-        SkASSERT(kNo_BufferedDraw == buffered);
-        fLastDrawWasBuffered = kNo_BufferedDraw;
-        target = fGpu;
-    }
-    fDrawState->setState(GrDrawState::kClip_StateBit, NULL != fClip &&
-                                                     !fClip->fClipStack->isWideOpen());
-    target->setClip(fClip);
-    SkASSERT(fDrawState == target->drawState());
-    return target;
-}
-
-/*
- * This method finds a path renderer that can draw the specified path on
- * the provided target.
- * Due to its expense, the software path renderer has split out so it can
- * can be individually allowed/disallowed via the "allowSW" boolean.
- */
-GrPathRenderer* GrContext::getPathRenderer(const SkPath& path,
-                                           const SkStrokeRec& stroke,
-                                           const GrDrawTarget* target,
-                                           bool allowSW,
-                                           GrPathRendererChain::DrawType drawType,
-                                           GrPathRendererChain::StencilSupport* stencilSupport) {
-
-    if (NULL == fPathRendererChain) {
-        fPathRendererChain = SkNEW_ARGS(GrPathRendererChain, (this));
-    }
-
-    GrPathRenderer* pr = fPathRendererChain->getPathRenderer(path,
-                                                             stroke,
-                                                             target,
-                                                             drawType,
-                                                             stencilSupport);
-
-    if (NULL == pr && allowSW) {
-        if (NULL == fSoftwarePathRenderer) {
-            fSoftwarePathRenderer = SkNEW_ARGS(GrSoftwarePathRenderer, (this));
-        }
-        pr = fSoftwarePathRenderer;
-    }
-
-    return pr;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool GrContext::isConfigRenderable(GrPixelConfig config, bool withMSAA) const {
-    return fGpu->caps()->isConfigRenderable(config, withMSAA);
-}
-
 int GrContext::getRecommendedSampleCount(GrPixelConfig config,
                                          SkScalar dpi) const {
-    if (!this->isConfigRenderable(config, true)) {
+    if (!this->caps()->isConfigRenderable(config, true)) {
         return 0;
     }
     int chosenSampleCount = 0;
-    if (fGpu->caps()->pathRenderingSupport()) {
+    if (fGpu->caps()->shaderCaps()->pathRenderingSupport()) {
         if (dpi >= 250.0f) {
             chosenSampleCount = 4;
         } else {
@@ -1816,33 +548,13 @@ int GrContext::getRecommendedSampleCount(GrPixelConfig config,
         chosenSampleCount : 0;
 }
 
-void GrContext::setupDrawBuffer() {
-    SkASSERT(NULL == fDrawBuffer);
-    SkASSERT(NULL == fDrawBufferVBAllocPool);
-    SkASSERT(NULL == fDrawBufferIBAllocPool);
 
-    fDrawBufferVBAllocPool =
-        SkNEW_ARGS(GrVertexBufferAllocPool, (fGpu, false,
-                                    DRAW_BUFFER_VBPOOL_BUFFER_SIZE,
-                                    DRAW_BUFFER_VBPOOL_PREALLOC_BUFFERS));
-    fDrawBufferIBAllocPool =
-        SkNEW_ARGS(GrIndexBufferAllocPool, (fGpu, false,
-                                   DRAW_BUFFER_IBPOOL_BUFFER_SIZE,
-                                   DRAW_BUFFER_IBPOOL_PREALLOC_BUFFERS));
-
-    fDrawBuffer = SkNEW_ARGS(GrInOrderDrawBuffer, (fGpu,
-                                                   fDrawBufferVBAllocPool,
-                                                   fDrawBufferIBAllocPool));
-
-    fDrawBuffer->setDrawState(fDrawState);
+GrDrawContext* GrContext::drawContext(GrRenderTarget* rt, const SkSurfaceProps* surfaceProps) {
+    return fDrawingManager->drawContext(rt, surfaceProps);
 }
 
-GrDrawTarget* GrContext::getTextTarget() {
-    return this->prepareToDraw(NULL, BUFFERED_DRAW, NULL, NULL);
-}
-
-const GrIndexBuffer* GrContext::getQuadIndexBuffer() const {
-    return fGpu->getQuadIndexBuffer();
+bool GrContext::abandoned() const { 
+    return fDrawingManager->abandoned();
 }
 
 namespace {
@@ -1855,82 +567,68 @@ void test_pm_conversions(GrContext* ctx, int* pmToUPMValue, int* upmToPMValue) {
 }
 }
 
-const GrEffect* GrContext::createPMToUPMEffect(GrTexture* texture,
-                                               bool swapRAndB,
-                                               const SkMatrix& matrix) {
-    if (!fDidTestPMConversions) {
-        test_pm_conversions(this, &fPMToUPMConversion, &fUPMToPMConversion);
-        fDidTestPMConversions = true;
+void GrContext::testPMConversionsIfNecessary(uint32_t flags) {
+    if (SkToBool(kUnpremul_PixelOpsFlag & flags)) {
+        SkAutoMutexAcquire ama(fTestPMConversionsMutex);
+        if (!fDidTestPMConversions) {
+            test_pm_conversions(this, &fPMToUPMConversion, &fUPMToPMConversion);
+            fDidTestPMConversions = true;
+        }
     }
+}
+
+const GrFragmentProcessor* GrContext::createPMToUPMEffect(GrTexture* texture,
+                                                          bool swapRAndB,
+                                                          const SkMatrix& matrix) const {
+    // We should have already called this->testPMConversionsIfNecessary().
+    SkASSERT(fDidTestPMConversions);
     GrConfigConversionEffect::PMConversion pmToUPM =
         static_cast<GrConfigConversionEffect::PMConversion>(fPMToUPMConversion);
     if (GrConfigConversionEffect::kNone_PMConversion != pmToUPM) {
         return GrConfigConversionEffect::Create(texture, swapRAndB, pmToUPM, matrix);
     } else {
-        return NULL;
+        return nullptr;
     }
 }
 
-const GrEffect* GrContext::createUPMToPMEffect(GrTexture* texture,
-                                               bool swapRAndB,
-                                               const SkMatrix& matrix) {
-    if (!fDidTestPMConversions) {
-        test_pm_conversions(this, &fPMToUPMConversion, &fUPMToPMConversion);
-        fDidTestPMConversions = true;
-    }
+const GrFragmentProcessor* GrContext::createUPMToPMEffect(GrTexture* texture,
+                                                          bool swapRAndB,
+                                                          const SkMatrix& matrix) const {
+    // We should have already called this->testPMConversionsIfNecessary().
+    SkASSERT(fDidTestPMConversions);
     GrConfigConversionEffect::PMConversion upmToPM =
         static_cast<GrConfigConversionEffect::PMConversion>(fUPMToPMConversion);
     if (GrConfigConversionEffect::kNone_PMConversion != upmToPM) {
         return GrConfigConversionEffect::Create(texture, swapRAndB, upmToPM, matrix);
     } else {
-        return NULL;
+        return nullptr;
     }
 }
 
-GrPath* GrContext::createPath(const SkPath& inPath, const SkStrokeRec& stroke) {
-    SkASSERT(fGpu->caps()->pathRenderingSupport());
+bool GrContext::didFailPMUPMConversionTest() const {
+    // We should have already called this->testPMConversionsIfNecessary().
+    SkASSERT(fDidTestPMConversions);
+    // The PM<->UPM tests fail or succeed together so we only need to check one.
+    return GrConfigConversionEffect::kNone_PMConversion == fPMToUPMConversion;
+}
 
-    // TODO: now we add to fResourceCache. This should change to fResourceCache.
-    GrResourceKey resourceKey = GrPath::ComputeKey(inPath, stroke);
-    GrPath* path = static_cast<GrPath*>(fResourceCache->find(resourceKey));
-    if (NULL != path && path->isEqualTo(inPath, stroke)) {
-        path->ref();
-    } else {
-        path = fGpu->createPath(inPath, stroke);
-        fResourceCache->purgeAsNeeded(1, path->gpuMemorySize());
-        fResourceCache->addResource(resourceKey, path);
+//////////////////////////////////////////////////////////////////////////////
+
+void GrContext::getResourceCacheLimits(int* maxTextures, size_t* maxTextureBytes) const {
+    if (maxTextures) {
+        *maxTextures = fResourceCache->getMaxResourceCount();
     }
-    return path;
-}
-
-void GrContext::addResourceToCache(const GrResourceKey& resourceKey, GrGpuResource* resource) {
-    fResourceCache->purgeAsNeeded(1, resource->gpuMemorySize());
-    fResourceCache->addResource(resourceKey, resource);
-}
-
-GrGpuResource* GrContext::findAndRefCachedResource(const GrResourceKey& resourceKey) {
-    GrGpuResource* resource = fResourceCache->find(resourceKey);
-    SkSafeRef(resource);
-    return resource;
-}
-
-void GrContext::addGpuTraceMarker(const GrGpuTraceMarker* marker) {
-    fGpu->addGpuTraceMarker(marker);
-    if (NULL != fDrawBuffer) {
-        fDrawBuffer->addGpuTraceMarker(marker);
+    if (maxTextureBytes) {
+        *maxTextureBytes = fResourceCache->getMaxResourceBytes();
     }
 }
 
-void GrContext::removeGpuTraceMarker(const GrGpuTraceMarker* marker) {
-    fGpu->removeGpuTraceMarker(marker);
-    if (NULL != fDrawBuffer) {
-        fDrawBuffer->removeGpuTraceMarker(marker);
-    }
+void GrContext::setResourceCacheLimits(int maxTextures, size_t maxTextureBytes) {
+    fResourceCache->setLimits(maxTextures, maxTextureBytes);
 }
 
-///////////////////////////////////////////////////////////////////////////////
-#if GR_CACHE_STATS
-void GrContext::printCacheStats() const {
-    fResourceCache->printStats();
+//////////////////////////////////////////////////////////////////////////////
+
+void GrContext::dumpMemoryStatistics(SkTraceMemoryDump* traceMemoryDump) const {
+    fResourceCache->dumpMemoryStatistics(traceMemoryDump);
 }
-#endif
diff --git a/gfx/skia/skia/src/gpu/GrContextFactory.cpp b/gfx/skia/skia/src/gpu/GrContextFactory.cpp
new file mode 100755
index 000000000000..424b3fda3a86
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrContextFactory.cpp
@@ -0,0 +1,123 @@
+
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrContextFactory.h"
+
+#if SK_ANGLE
+    #include "gl/angle/SkANGLEGLContext.h"
+#endif
+#if SK_COMMAND_BUFFER
+    #include "gl/command_buffer/SkCommandBufferGLContext.h"
+#endif
+#include "gl/debug/SkDebugGLContext.h"
+#if SK_MESA
+    #include "gl/mesa/SkMesaGLContext.h"
+#endif
+#include "gl/SkGLContext.h"
+#include "gl/SkNullGLContext.h"
+#include "gl/GrGLGpu.h"
+#include "GrCaps.h"
+
+GrContextFactory::ContextInfo* GrContextFactory::getContextInfo(GLContextType type,
+                                                                GrGLStandard forcedGpuAPI) {
+    for (int i = 0; i < fContexts.count(); ++i) {
+        if (forcedGpuAPI != kNone_GrGLStandard &&
+            forcedGpuAPI != fContexts[i]->fGLContext->gl()->fStandard)
+            continue;
+
+        if (fContexts[i]->fType == type) {
+            fContexts[i]->fGLContext->makeCurrent();
+            return fContexts[i];
+        }
+    }
+    SkAutoTUnref<SkGLContext> glCtx;
+    SkAutoTUnref<GrContext> grCtx;
+    switch (type) {
+        case kNVPR_GLContextType: // fallthru
+        case kNative_GLContextType:
+            glCtx.reset(SkCreatePlatformGLContext(forcedGpuAPI));
+            break;
+#ifdef SK_ANGLE
+        case kANGLE_GLContextType:
+            glCtx.reset(SkANGLEGLContext::Create(forcedGpuAPI, false));
+            break;
+        case kANGLE_GL_GLContextType:
+            glCtx.reset(SkANGLEGLContext::Create(forcedGpuAPI, true));
+            break;
+#endif
+#ifdef SK_COMMAND_BUFFER
+        case kCommandBuffer_GLContextType:
+            glCtx.reset(SkCommandBufferGLContext::Create(forcedGpuAPI));
+            break;
+#endif
+#ifdef SK_MESA
+        case kMESA_GLContextType:
+            glCtx.reset(SkMesaGLContext::Create(forcedGpuAPI));
+            break;
+#endif
+        case kNull_GLContextType:
+            glCtx.reset(SkNullGLContext::Create(forcedGpuAPI));
+            break;
+        case kDebug_GLContextType:
+            glCtx.reset(SkDebugGLContext::Create(forcedGpuAPI));
+            break;
+    }
+    if (nullptr == glCtx.get()) {
+        return nullptr;
+    }
+
+    SkASSERT(glCtx->isValid());
+
+    // Block NVPR from non-NVPR types.
+    SkAutoTUnref<const GrGLInterface> glInterface(SkRef(glCtx->gl()));
+    if (kNVPR_GLContextType != type) {
+        glInterface.reset(GrGLInterfaceRemoveNVPR(glInterface));
+        if (!glInterface) {
+            return nullptr;
+        }
+    } else {
+        if (!glInterface->hasExtension("GL_NV_path_rendering")) {
+            return nullptr;
+        }
+    }
+
+    glCtx->makeCurrent();
+    GrBackendContext p3dctx = reinterpret_cast<GrBackendContext>(glInterface.get());
+#ifdef SK_VULKAN
+    grCtx.reset(GrContext::Create(kVulkan_GrBackend, p3dctx, fGlobalOptions));
+#else
+    grCtx.reset(GrContext::Create(kOpenGL_GrBackend, p3dctx, fGlobalOptions));
+#endif
+    if (!grCtx.get()) {
+        return nullptr;
+    }
+    // Warn if path rendering support is not available for the NVPR type.
+    if (kNVPR_GLContextType == type) {
+        if (!grCtx->caps()->shaderCaps()->pathRenderingSupport()) {
+            GrGpu* gpu = grCtx->getGpu();
+            const GrGLContext* ctx = gpu->glContextForTesting();
+            if (ctx) {
+                const GrGLubyte* verUByte;
+                GR_GL_CALL_RET(ctx->interface(), verUByte, GetString(GR_GL_VERSION));
+                const char* ver = reinterpret_cast<const char*>(verUByte);
+                SkDebugf("\nWARNING: nvprmsaa config requested, but driver path rendering "
+                         "support not available. Maybe update the driver? Your driver version "
+                         "string: \"%s\"\n", ver);
+            } else {
+                SkDebugf("\nWARNING: nvprmsaa config requested, but driver path rendering "
+                         "support not available.\n");
+            }
+        }
+    }
+
+    ContextInfo* ctx = fContexts.emplace_back(new ContextInfo);
+    ctx->fGLContext = SkRef(glCtx.get());
+    ctx->fGrContext = SkRef(grCtx.get());
+    ctx->fType = type;
+    return ctx;
+}
diff --git a/gfx/skia/skia/src/gpu/GrContextFactory.h b/gfx/skia/skia/src/gpu/GrContextFactory.h
new file mode 100644
index 000000000000..c837e74a25b2
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrContextFactory.h
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrContextFactory_DEFINED
+#define GrContextFactory_DEFINED
+
+#include "GrContext.h"
+#include "GrContextOptions.h"
+
+#include "gl/SkGLContext.h"
+#include "SkTArray.h"
+
+/**
+ * This is a simple class that is useful in test apps that use different
+ * GrContexts backed by different types of GL contexts. It manages creating the
+ * GL context and a GrContext that uses it. The GL/Gr contexts persist until the
+ * factory is destroyed (though the caller can always grab a ref on the returned
+ * Gr and GL contexts to make them outlive the factory).
+ */
+class GrContextFactory : SkNoncopyable {
+public:
+    /**
+     * Types of GL contexts supported. For historical and testing reasons the native GrContext will
+     * not use "GL_NV_path_rendering" even when the driver supports it. There is a separate context
+     * type that does not remove NVPR support and which will fail when the driver does not support
+     * the extension.
+     */
+    enum GLContextType {
+      kNative_GLContextType,
+#if SK_ANGLE
+      kANGLE_GLContextType,
+      kANGLE_GL_GLContextType,
+#endif
+#if SK_COMMAND_BUFFER
+      kCommandBuffer_GLContextType,
+#endif
+#if SK_MESA
+      kMESA_GLContextType,
+#endif
+      /** Similar to kNative but does not filter NVPR. It will fail if the GL driver does not
+          support NVPR */
+      kNVPR_GLContextType,
+      kNull_GLContextType,
+      kDebug_GLContextType,
+
+      kLastGLContextType = kDebug_GLContextType
+    };
+
+    static const int kGLContextTypeCnt = kLastGLContextType + 1;
+
+    static bool IsRenderingGLContext(GLContextType type) {
+        switch (type) {
+            case kNull_GLContextType:
+            case kDebug_GLContextType:
+                return false;
+            default:
+                return true;
+        }
+    }
+
+    static const char* GLContextTypeName(GLContextType type) {
+        switch (type) {
+            case kNative_GLContextType:
+                return "native";
+            case kNull_GLContextType:
+                return "null";
+#if SK_ANGLE
+            case kANGLE_GLContextType:
+                return "angle";
+            case kANGLE_GL_GLContextType:
+                return "angle-gl";
+#endif
+#if SK_COMMAND_BUFFER
+            case kCommandBuffer_GLContextType:
+                return "commandbuffer";
+#endif
+#if SK_MESA
+            case kMESA_GLContextType:
+                return "mesa";
+#endif
+            case kNVPR_GLContextType:
+                return "nvpr";
+            case kDebug_GLContextType:
+                return "debug";
+            default:
+                SkFAIL("Unknown GL Context type.");
+        }
+    }
+
+    explicit GrContextFactory(const GrContextOptions& opts) : fGlobalOptions(opts) { }
+    GrContextFactory() { }
+
+    ~GrContextFactory() { this->destroyContexts(); }
+
+    void destroyContexts() {
+        for (int i = 0; i < fContexts.count(); ++i) {
+            if (fContexts[i]->fGLContext) {  //  could be abandoned.
+                fContexts[i]->fGLContext->makeCurrent();
+            }
+            fContexts[i]->fGrContext->unref();
+            SkSafeUnref(fContexts[i]->fGLContext);
+        }
+        fContexts.reset();
+    }
+
+    void abandonContexts() {
+        for (int i = 0; i < fContexts.count(); ++i) {
+            if (fContexts[i]->fGLContext) {
+                fContexts[i]->fGLContext->testAbandon();
+                SkSafeSetNull(fContexts[i]->fGLContext);
+            }
+            fContexts[i]->fGrContext->abandonContext();
+        }
+    }
+
+    struct ContextInfo {
+        GLContextType             fType;
+        SkGLContext*              fGLContext;
+        GrContext*                fGrContext;
+    };
+    /**
+     * Get a context initialized with a type of GL context. It also makes the GL context current.
+     * Pointer is valid until destroyContexts() is called.
+     */
+    ContextInfo* getContextInfo(GLContextType type, GrGLStandard forcedGpuAPI = kNone_GrGLStandard);
+
+    /**
+     * Get a GrContext initialized with a type of GL context. It also makes the GL context current.
+     */
+    GrContext* get(GLContextType type, GrGLStandard forcedGpuAPI = kNone_GrGLStandard) {
+        if (ContextInfo* info = this->getContextInfo(type, forcedGpuAPI)) {
+            return info->fGrContext;
+        }
+        return nullptr;
+    }
+    const GrContextOptions& getGlobalOptions() const { return fGlobalOptions; }
+
+private:
+    SkTArray<SkAutoTDelete<ContextInfo>, true> fContexts;
+    const GrContextOptions        fGlobalOptions;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrCoordTransform.cpp b/gfx/skia/skia/src/gpu/GrCoordTransform.cpp
new file mode 100644
index 000000000000..e7d9b1ecb04c
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrCoordTransform.cpp
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrCoordTransform.h"
+#include "GrCaps.h"
+#include "GrContext.h"
+#include "GrGpu.h"
+
+void GrCoordTransform::reset(GrCoordSet sourceCoords, const SkMatrix& m, const GrTexture* texture,
+                             GrTextureParams::FilterMode filter) {
+    SkASSERT(texture);
+    SkASSERT(!fInProcessor);
+
+    fSourceCoords = sourceCoords;
+    fMatrix = m;
+    fReverseY = kBottomLeft_GrSurfaceOrigin == texture->origin();
+
+    // Always start at kDefault. Then if precisions differ we see if the precision needs to be
+    // increased. Our rule is that we want at least 4 subpixel values in the representation for
+    // coords between 0 to 1 when bi- or tri-lerping and 1 value when nearest filtering. Note that
+    // this still might not be enough when drawing with repeat or mirror-repeat modes but that case
+    // can be arbitrarily bad.
+    int subPixelThresh = filter > GrTextureParams::kNone_FilterMode ? 4 : 1;
+    fPrecision = kDefault_GrSLPrecision;
+    if (texture->getContext()) {
+        const GrShaderCaps* caps = texture->getContext()->caps()->shaderCaps();
+        if (caps->floatPrecisionVaries()) {
+            int maxD = SkTMax(texture->width(), texture->height());
+            const GrShaderCaps::PrecisionInfo* info;
+            info = &caps->getFloatShaderPrecisionInfo(kFragment_GrShaderType, fPrecision);
+            do {
+                SkASSERT(info->supported());
+                // Make sure there is at least 2 bits of subpixel precision in the range of
+                // texture coords from 0.5 to 1.0.
+                if ((2 << info->fBits) / maxD > subPixelThresh) {
+                    break;
+                }
+                if (kHigh_GrSLPrecision == fPrecision) {
+                    break;
+                }
+                GrSLPrecision nextP = static_cast<GrSLPrecision>(fPrecision + 1);
+                info = &caps->getFloatShaderPrecisionInfo(kFragment_GrShaderType, nextP);
+                if (!info->supported()) {
+                    break;
+                }
+                fPrecision = nextP;
+            } while (true);
+        }
+    }
+}
+
+void GrCoordTransform::reset(GrCoordSet sourceCoords,
+                             const SkMatrix& m,
+                             GrSLPrecision precision) {
+    SkASSERT(!fInProcessor);
+    fSourceCoords = sourceCoords;
+    fMatrix = m;
+    fReverseY = false;
+    fPrecision = precision;
+}
diff --git a/gfx/skia/skia/src/gpu/GrDefaultGeoProcFactory.cpp b/gfx/skia/skia/src/gpu/GrDefaultGeoProcFactory.cpp
new file mode 100644
index 000000000000..85339ea9b5fe
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrDefaultGeoProcFactory.cpp
@@ -0,0 +1,343 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrDefaultGeoProcFactory.h"
+
+#include "GrInvariantOutput.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLGeometryProcessor.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLVertexShaderBuilder.h"
+#include "glsl/GrGLSLVarying.h"
+#include "glsl/GrGLSLUtil.h"
+
+/*
+ * The default Geometry Processor simply takes position and multiplies it by the uniform view
+ * matrix. It also leaves coverage untouched.  Behind the scenes, we may add per vertex color or
+ * local coords.
+ */
+
+enum GPFlag {
+    kColor_GPFlag =                 0x1,
+    kLocalCoord_GPFlag =            0x2,
+    kCoverage_GPFlag=               0x4,
+    kTransformedLocalCoord_GPFlag = 0x8,
+};
+
+class DefaultGeoProc : public GrGeometryProcessor {
+public:
+    static GrGeometryProcessor* Create(uint32_t gpTypeFlags,
+                                       GrColor color,
+                                       const SkMatrix& viewMatrix,
+                                       const SkMatrix& localMatrix,
+                                       bool localCoordsWillBeRead,
+                                       bool coverageWillBeIgnored,
+                                       uint8_t coverage) {
+        return new DefaultGeoProc(gpTypeFlags, color, viewMatrix, localMatrix, coverage,
+                                  localCoordsWillBeRead, coverageWillBeIgnored);
+    }
+
+    const char* name() const override { return "DefaultGeometryProcessor"; }
+
+    const Attribute* inPosition() const { return fInPosition; }
+    const Attribute* inColor() const { return fInColor; }
+    const Attribute* inLocalCoords() const { return fInLocalCoords; }
+    const Attribute* inCoverage() const { return fInCoverage; }
+    GrColor color() const { return fColor; }
+    bool colorIgnored() const { return GrColor_ILLEGAL == fColor; }
+    bool hasVertexColor() const { return SkToBool(fInColor); }
+    const SkMatrix& viewMatrix() const { return fViewMatrix; }
+    const SkMatrix& localMatrix() const { return fLocalMatrix; }
+    bool localCoordsWillBeRead() const { return fLocalCoordsWillBeRead; }
+    uint8_t coverage() const { return fCoverage; }
+    bool coverageWillBeIgnored() const { return fCoverageWillBeIgnored; }
+    bool hasVertexCoverage() const { return SkToBool(fInCoverage); }
+
+    class GLSLProcessor : public GrGLSLGeometryProcessor {
+    public:
+        GLSLProcessor()
+            : fViewMatrix(SkMatrix::InvalidMatrix()), fColor(GrColor_ILLEGAL), fCoverage(0xff) {}
+
+        void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override {
+            const DefaultGeoProc& gp = args.fGP.cast<DefaultGeoProc>();
+            GrGLSLGPBuilder* pb = args.fPB;
+            GrGLSLVertexBuilder* vertBuilder = args.fVertBuilder;
+            GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+            GrGLSLVaryingHandler* varyingHandler = args.fVaryingHandler;
+
+            // emit attributes
+            varyingHandler->emitAttributes(gp);
+
+            // Setup pass through color
+            if (!gp.colorIgnored()) {
+                if (gp.hasVertexColor()) {
+                    varyingHandler->addPassThroughAttribute(gp.inColor(), args.fOutputColor);
+                } else {
+                    this->setupUniformColor(pb, fragBuilder, args.fOutputColor, &fColorUniform);
+                }
+            }
+
+            // Setup position
+            this->setupPosition(pb,
+                                vertBuilder,
+                                gpArgs,
+                                gp.inPosition()->fName,
+                                gp.viewMatrix(),
+                                &fViewMatrixUniform);
+
+            if (gp.hasExplicitLocalCoords()) {
+                // emit transforms with explicit local coords
+                this->emitTransforms(pb,
+                                     vertBuilder,
+                                     varyingHandler,
+                                     gpArgs->fPositionVar,
+                                     gp.inLocalCoords()->fName,
+                                     gp.localMatrix(),
+                                     args.fTransformsIn,
+                                     args.fTransformsOut);
+            } else if(gp.hasTransformedLocalCoords()) {
+                // transforms have already been applied to vertex attributes on the cpu
+                this->emitTransforms(pb,
+                                     vertBuilder,
+                                     varyingHandler,
+                                     gp.inLocalCoords()->fName,
+                                     args.fTransformsIn,
+                                     args.fTransformsOut);
+            } else {
+                // emit transforms with position
+                this->emitTransforms(pb,
+                                     vertBuilder,
+                                     varyingHandler,
+                                     gpArgs->fPositionVar,
+                                     gp.inPosition()->fName,
+                                     gp.localMatrix(),
+                                     args.fTransformsIn,
+                                     args.fTransformsOut);
+            }
+
+            // Setup coverage as pass through
+            if (!gp.coverageWillBeIgnored()) {
+                if (gp.hasVertexCoverage()) {
+                    fragBuilder->codeAppendf("float alpha = 1.0;");
+                    varyingHandler->addPassThroughAttribute(gp.inCoverage(), "alpha");
+                    fragBuilder->codeAppendf("%s = vec4(alpha);", args.fOutputCoverage);
+                } else if (gp.coverage() == 0xff) {
+                    fragBuilder->codeAppendf("%s = vec4(1);", args.fOutputCoverage);
+                } else {
+                    const char* fragCoverage;
+                    fCoverageUniform = pb->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                                      kFloat_GrSLType,
+                                                      kDefault_GrSLPrecision,
+                                                      "Coverage",
+                                                      &fragCoverage);
+                    fragBuilder->codeAppendf("%s = vec4(%s);", args.fOutputCoverage, fragCoverage);
+                }
+            }
+        }
+
+        static inline void GenKey(const GrGeometryProcessor& gp,
+                                  const GrGLSLCaps&,
+                                  GrProcessorKeyBuilder* b) {
+            const DefaultGeoProc& def = gp.cast<DefaultGeoProc>();
+            uint32_t key = def.fFlags;
+            key |= def.colorIgnored() << 8;
+            key |= def.coverageWillBeIgnored() << 9;
+            key |= def.hasVertexColor() << 10;
+            key |= def.hasVertexCoverage() << 11;
+            key |= def.coverage() == 0xff ? 0x1 << 12 : 0;
+            key |= def.localCoordsWillBeRead() && def.localMatrix().hasPerspective() ? 0x1 << 24 :
+                                                                                       0x0;
+            key |= ComputePosKey(def.viewMatrix()) << 25;
+            b->add32(key);
+        }
+
+        void setData(const GrGLSLProgramDataManager& pdman,
+                     const GrPrimitiveProcessor& gp) override {
+            const DefaultGeoProc& dgp = gp.cast<DefaultGeoProc>();
+
+            if (!dgp.viewMatrix().isIdentity() && !fViewMatrix.cheapEqualTo(dgp.viewMatrix())) {
+                fViewMatrix = dgp.viewMatrix();
+                float viewMatrix[3 * 3];
+                GrGLSLGetMatrix<3>(viewMatrix, fViewMatrix);
+                pdman.setMatrix3f(fViewMatrixUniform, viewMatrix);
+            }
+
+            if (dgp.color() != fColor && !dgp.hasVertexColor()) {
+                float c[4];
+                GrColorToRGBAFloat(dgp.color(), c);
+                pdman.set4fv(fColorUniform, 1, c);
+                fColor = dgp.color();
+            }
+
+            if (!dgp.coverageWillBeIgnored() &&
+                dgp.coverage() != fCoverage && !dgp.hasVertexCoverage()) {
+                pdman.set1f(fCoverageUniform, GrNormalizeByteToFloat(dgp.coverage()));
+                fCoverage = dgp.coverage();
+            }
+        }
+
+        void setTransformData(const GrPrimitiveProcessor& primProc,
+                              const GrGLSLProgramDataManager& pdman,
+                              int index,
+                              const SkTArray<const GrCoordTransform*, true>& transforms) override {
+            this->setTransformDataHelper<DefaultGeoProc>(primProc, pdman, index, transforms);
+        }
+
+    private:
+        SkMatrix fViewMatrix;
+        GrColor fColor;
+        uint8_t fCoverage;
+        UniformHandle fViewMatrixUniform;
+        UniformHandle fColorUniform;
+        UniformHandle fCoverageUniform;
+
+        typedef GrGLSLGeometryProcessor INHERITED;
+    };
+
+    void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {
+        GLSLProcessor::GenKey(*this, caps, b);
+    }
+
+    GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override {
+        return new GLSLProcessor();
+    }
+
+private:
+    DefaultGeoProc(uint32_t gpTypeFlags,
+                   GrColor color,
+                   const SkMatrix& viewMatrix,
+                   const SkMatrix& localMatrix,
+                   uint8_t coverage,
+                   bool localCoordsWillBeRead,
+                   bool coverageWillBeIgnored)
+        : fInPosition(nullptr)
+        , fInColor(nullptr)
+        , fInLocalCoords(nullptr)
+        , fInCoverage(nullptr)
+        , fColor(color)
+        , fViewMatrix(viewMatrix)
+        , fLocalMatrix(localMatrix)
+        , fCoverage(coverage)
+        , fFlags(gpTypeFlags)
+        , fLocalCoordsWillBeRead(localCoordsWillBeRead)
+        , fCoverageWillBeIgnored(coverageWillBeIgnored) {
+        this->initClassID<DefaultGeoProc>();
+        bool hasColor = SkToBool(gpTypeFlags & kColor_GPFlag);
+        bool hasExplicitLocalCoords = SkToBool(gpTypeFlags & kLocalCoord_GPFlag);
+        bool hasTransformedLocalCoords = SkToBool(gpTypeFlags & kTransformedLocalCoord_GPFlag);
+        bool hasLocalCoord = hasExplicitLocalCoords || hasTransformedLocalCoords;
+        bool hasCoverage = SkToBool(gpTypeFlags & kCoverage_GPFlag);
+        fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType,
+                                                       kHigh_GrSLPrecision));
+        if (hasColor) {
+            fInColor = &this->addVertexAttrib(Attribute("inColor", kVec4ub_GrVertexAttribType));
+        }
+        if (hasLocalCoord) {
+            fInLocalCoords = &this->addVertexAttrib(Attribute("inLocalCoord",
+                                                              kVec2f_GrVertexAttribType));
+            if (hasExplicitLocalCoords) {
+                this->setHasExplicitLocalCoords();
+            } else {
+                SkASSERT(hasTransformedLocalCoords);
+                this->setHasTransformedLocalCoords();
+            }
+        }
+        if (hasCoverage) {
+            fInCoverage = &this->addVertexAttrib(Attribute("inCoverage",
+                                                           kFloat_GrVertexAttribType));
+        }
+    }
+
+    const Attribute* fInPosition;
+    const Attribute* fInColor;
+    const Attribute* fInLocalCoords;
+    const Attribute* fInCoverage;
+    GrColor fColor;
+    SkMatrix fViewMatrix;
+    SkMatrix fLocalMatrix;
+    uint8_t fCoverage;
+    uint32_t fFlags;
+    bool fLocalCoordsWillBeRead;
+    bool fCoverageWillBeIgnored;
+
+    GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
+
+    typedef GrGeometryProcessor INHERITED;
+};
+
+GR_DEFINE_GEOMETRY_PROCESSOR_TEST(DefaultGeoProc);
+
+const GrGeometryProcessor* DefaultGeoProc::TestCreate(GrProcessorTestData* d) {
+    uint32_t flags = 0;
+    if (d->fRandom->nextBool()) {
+        flags |= kColor_GPFlag;
+    }
+    if (d->fRandom->nextBool()) {
+        flags |= kCoverage_GPFlag;
+    }
+    if (d->fRandom->nextBool()) {
+        flags |= kLocalCoord_GPFlag;
+    }
+    if (d->fRandom->nextBool()) {
+        flags |= kTransformedLocalCoord_GPFlag;
+    }
+
+    return DefaultGeoProc::Create(flags,
+                                  GrRandomColor(d->fRandom),
+                                  GrTest::TestMatrix(d->fRandom),
+                                  GrTest::TestMatrix(d->fRandom),
+                                  d->fRandom->nextBool(),
+                                  d->fRandom->nextBool(),
+                                  GrRandomCoverage(d->fRandom));
+}
+
+const GrGeometryProcessor* GrDefaultGeoProcFactory::Create(const Color& color,
+                                                           const Coverage& coverage,
+                                                           const LocalCoords& localCoords,
+                                                           const SkMatrix& viewMatrix) {
+    uint32_t flags = 0;
+    flags |= color.fType == Color::kAttribute_Type ? kColor_GPFlag : 0;
+    flags |= coverage.fType == Coverage::kAttribute_Type ? kCoverage_GPFlag : 0;
+    flags |= localCoords.fType == LocalCoords::kHasExplicit_Type ? kLocalCoord_GPFlag : 0;
+    flags |= localCoords.fType == LocalCoords::kHasTransformed_Type ?
+                                  kTransformedLocalCoord_GPFlag : 0;
+
+    uint8_t inCoverage = coverage.fCoverage;
+    bool coverageWillBeIgnored = coverage.fType == Coverage::kNone_Type;
+    bool localCoordsWillBeRead = localCoords.fType != LocalCoords::kUnused_Type;
+
+    GrColor inColor = color.fColor;
+    return DefaultGeoProc::Create(flags,
+                                  inColor,
+                                  viewMatrix,
+                                  localCoords.fMatrix ? *localCoords.fMatrix : SkMatrix::I(),
+                                  localCoordsWillBeRead,
+                                  coverageWillBeIgnored,
+                                  inCoverage);
+}
+
+const GrGeometryProcessor* GrDefaultGeoProcFactory::CreateForDeviceSpace(
+                                                                     const Color& color,
+                                                                     const Coverage& coverage,
+                                                                     const LocalCoords& localCoords,
+                                                                     const SkMatrix& viewMatrix) {
+    SkMatrix invert = SkMatrix::I();
+    if (LocalCoords::kUnused_Type != localCoords.fType) {
+        SkASSERT(LocalCoords::kUsePosition_Type == localCoords.fType);
+        if (!viewMatrix.isIdentity() && !viewMatrix.invert(&invert)) {
+            SkDebugf("Could not invert\n");
+            return nullptr;
+        }
+
+        if (localCoords.hasLocalMatrix()) {
+            invert.preConcat(*localCoords.fMatrix);
+        }
+    }
+
+    LocalCoords inverted(LocalCoords::kUsePosition_Type, &invert);
+    return Create(color, coverage, inverted, SkMatrix::I());
+}
diff --git a/gfx/skia/skia/src/gpu/GrDefaultGeoProcFactory.h b/gfx/skia/skia/src/gpu/GrDefaultGeoProcFactory.h
new file mode 100644
index 000000000000..bf2db40ecd03
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrDefaultGeoProcFactory.h
@@ -0,0 +1,138 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrDefaultGeoProcFactory_DEFINED
+#define GrDefaultGeoProcFactory_DEFINED
+
+#include "GrGeometryProcessor.h"
+
+class GrDrawState;
+
+/*
+ * A factory for creating default Geometry Processors which simply multiply position by the uniform
+ * view matrix and wire through color, coverage, UV coords if requested.  Right now this is only
+ * used in the creation of optimized draw states because adding default GPs to the drawstate can
+ * interfere with batching due to updating the drawstate.
+ */
+namespace GrDefaultGeoProcFactory {
+    // Structs for adding vertex attributes
+    struct PositionAttr {
+        SkPoint fPosition;
+    };
+
+    struct PositionCoverageAttr {
+        SkPoint fPosition;
+        GrColor fCoverage;
+    };
+
+    struct PositionColorAttr {
+        SkPoint fPosition;
+        SkColor fColor;
+    };
+
+    struct PositionColorCoverageAttr {
+        SkPoint fPosition;
+        SkColor fColor;
+        GrColor fCoverage;
+    };
+
+    struct PositionLocalCoordAttr {
+        SkPoint fPosition;
+        SkPoint fLocalCoord;
+    };
+
+    struct PositionLocalCoordCoverageAttr {
+        SkPoint fPosition;
+        SkPoint fLocalCoord;
+        GrColor fCoverage;
+    };
+
+    struct PositionColorLocalCoordAttr {
+        SkPoint fPosition;
+        GrColor fColor;
+        SkPoint fLocalCoord;
+    };
+
+    struct PositionColorLocalCoordCoverage {
+        SkPoint fPosition;
+        GrColor fColor;
+        SkPoint fLocalCoord;
+        GrColor fCoverage;
+    };
+
+    struct Color {
+        enum Type {
+            kNone_Type,
+            kUniform_Type,
+            kAttribute_Type,
+        };
+        Color(GrColor color) : fType(kUniform_Type), fColor(color) {}
+        Color(Type type) : fType(type), fColor(GrColor_ILLEGAL) {
+            SkASSERT(type != kUniform_Type);
+
+            // TODO This is temporary
+            if (kAttribute_Type == type) {
+                fColor = GrColor_WHITE;
+            }
+        }
+
+        Type fType;
+        GrColor fColor;
+    };
+
+    struct Coverage {
+        enum Type {
+            kNone_Type,
+            kSolid_Type,
+            kUniform_Type,
+            kAttribute_Type,
+        };
+        Coverage(uint8_t coverage) : fType(kUniform_Type), fCoverage(coverage) {}
+        Coverage(Type type) : fType(type), fCoverage(0xff) {
+            SkASSERT(type != kUniform_Type);
+        }
+
+        Type fType;
+        uint8_t fCoverage;
+    };
+
+    struct LocalCoords {
+        enum Type {
+            kUnused_Type,
+            kUsePosition_Type,
+            kHasExplicit_Type,
+            kHasTransformed_Type,
+        };
+        LocalCoords(Type type) : fType(type), fMatrix(nullptr) {}
+        LocalCoords(Type type, const SkMatrix* matrix) : fType(type), fMatrix(matrix) {
+            SkASSERT(kUnused_Type != type);
+        }
+        bool hasLocalMatrix() const { return nullptr != fMatrix; }
+
+        Type fType;
+        const SkMatrix* fMatrix;
+    };
+
+    const GrGeometryProcessor* Create(const Color&,
+                                      const Coverage&,
+                                      const LocalCoords&,
+                                      const SkMatrix& viewMatrix);
+
+    /*
+     * Use this factory to create a GrGeometryProcessor that expects a device space vertex position
+     * attribute. The view matrix must still be provided to compute correctly transformed
+     * coordinates for GrFragmentProcessors. It may fail if the view matrix is not invertible.
+     */
+    const GrGeometryProcessor* CreateForDeviceSpace(const Color&,
+                                                    const Coverage&,
+                                                    const LocalCoords&,
+                                                    const SkMatrix& viewMatrix);
+
+    inline size_t DefaultVertexStride() { return sizeof(PositionAttr); }
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrDefaultPathRenderer.cpp b/gfx/skia/skia/src/gpu/GrDefaultPathRenderer.cpp
deleted file mode 100644
index bd9b1ea16a38..000000000000
--- a/gfx/skia/skia/src/gpu/GrDefaultPathRenderer.cpp
+++ /dev/null
@@ -1,537 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrDefaultPathRenderer.h"
-
-#include "GrContext.h"
-#include "GrDrawState.h"
-#include "GrPathUtils.h"
-#include "SkString.h"
-#include "SkStrokeRec.h"
-#include "SkTLazy.h"
-#include "SkTraceEvent.h"
-
-
-GrDefaultPathRenderer::GrDefaultPathRenderer(bool separateStencilSupport,
-                                             bool stencilWrapOpsSupport)
-    : fSeparateStencil(separateStencilSupport)
-    , fStencilWrapOps(stencilWrapOpsSupport) {
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Stencil rules for paths
-
-////// Even/Odd
-
-GR_STATIC_CONST_SAME_STENCIL(gEOStencilPass,
-    kInvert_StencilOp,
-    kKeep_StencilOp,
-    kAlwaysIfInClip_StencilFunc,
-    0xffff,
-    0xffff,
-    0xffff);
-
-// ok not to check clip b/c stencil pass only wrote inside clip
-GR_STATIC_CONST_SAME_STENCIL(gEOColorPass,
-    kZero_StencilOp,
-    kZero_StencilOp,
-    kNotEqual_StencilFunc,
-    0xffff,
-    0x0000,
-    0xffff);
-
-// have to check clip b/c outside clip will always be zero.
-GR_STATIC_CONST_SAME_STENCIL(gInvEOColorPass,
-    kZero_StencilOp,
-    kZero_StencilOp,
-    kEqualIfInClip_StencilFunc,
-    0xffff,
-    0x0000,
-    0xffff);
-
-////// Winding
-
-// when we have separate stencil we increment front faces / decrement back faces
-// when we don't have wrap incr and decr we use the stencil test to simulate
-// them.
-
-GR_STATIC_CONST_STENCIL(gWindStencilSeparateWithWrap,
-    kIncWrap_StencilOp,             kDecWrap_StencilOp,
-    kKeep_StencilOp,                kKeep_StencilOp,
-    kAlwaysIfInClip_StencilFunc,    kAlwaysIfInClip_StencilFunc,
-    0xffff,                         0xffff,
-    0xffff,                         0xffff,
-    0xffff,                         0xffff);
-
-// if inc'ing the max value, invert to make 0
-// if dec'ing zero invert to make all ones.
-// we can't avoid touching the stencil on both passing and
-// failing, so we can't resctrict ourselves to the clip.
-GR_STATIC_CONST_STENCIL(gWindStencilSeparateNoWrap,
-    kInvert_StencilOp,              kInvert_StencilOp,
-    kIncClamp_StencilOp,            kDecClamp_StencilOp,
-    kEqual_StencilFunc,             kEqual_StencilFunc,
-    0xffff,                         0xffff,
-    0xffff,                         0x0000,
-    0xffff,                         0xffff);
-
-// When there are no separate faces we do two passes to setup the winding rule
-// stencil. First we draw the front faces and inc, then we draw the back faces
-// and dec. These are same as the above two split into the incrementing and
-// decrementing passes.
-GR_STATIC_CONST_SAME_STENCIL(gWindSingleStencilWithWrapInc,
-    kIncWrap_StencilOp,
-    kKeep_StencilOp,
-    kAlwaysIfInClip_StencilFunc,
-    0xffff,
-    0xffff,
-    0xffff);
-
-GR_STATIC_CONST_SAME_STENCIL(gWindSingleStencilWithWrapDec,
-    kDecWrap_StencilOp,
-    kKeep_StencilOp,
-    kAlwaysIfInClip_StencilFunc,
-    0xffff,
-    0xffff,
-    0xffff);
-
-GR_STATIC_CONST_SAME_STENCIL(gWindSingleStencilNoWrapInc,
-    kInvert_StencilOp,
-    kIncClamp_StencilOp,
-    kEqual_StencilFunc,
-    0xffff,
-    0xffff,
-    0xffff);
-
-GR_STATIC_CONST_SAME_STENCIL(gWindSingleStencilNoWrapDec,
-    kInvert_StencilOp,
-    kDecClamp_StencilOp,
-    kEqual_StencilFunc,
-    0xffff,
-    0x0000,
-    0xffff);
-
-// Color passes are the same whether we use the two-sided stencil or two passes
-
-GR_STATIC_CONST_SAME_STENCIL(gWindColorPass,
-    kZero_StencilOp,
-    kZero_StencilOp,
-    kNonZeroIfInClip_StencilFunc,
-    0xffff,
-    0x0000,
-    0xffff);
-
-GR_STATIC_CONST_SAME_STENCIL(gInvWindColorPass,
-    kZero_StencilOp,
-    kZero_StencilOp,
-    kEqualIfInClip_StencilFunc,
-    0xffff,
-    0x0000,
-    0xffff);
-
-////// Normal render to stencil
-
-// Sometimes the default path renderer can draw a path directly to the stencil
-// buffer without having to first resolve the interior / exterior.
-GR_STATIC_CONST_SAME_STENCIL(gDirectToStencil,
-    kZero_StencilOp,
-    kIncClamp_StencilOp,
-    kAlwaysIfInClip_StencilFunc,
-    0xffff,
-    0x0000,
-    0xffff);
-
-////////////////////////////////////////////////////////////////////////////////
-// Helpers for drawPath
-
-#define STENCIL_OFF     0   // Always disable stencil (even when needed)
-
-static inline bool single_pass_path(const SkPath& path, const SkStrokeRec& stroke) {
-#if STENCIL_OFF
-    return true;
-#else
-    if (!stroke.isHairlineStyle() && !path.isInverseFillType()) {
-        return path.isConvex();
-    }
-    return false;
-#endif
-}
-
-GrPathRenderer::StencilSupport GrDefaultPathRenderer::onGetStencilSupport(
-                                                            const SkPath& path,
-                                                            const SkStrokeRec& stroke,
-                                                            const GrDrawTarget*) const {
-    if (single_pass_path(path, stroke)) {
-        return GrPathRenderer::kNoRestriction_StencilSupport;
-    } else {
-        return GrPathRenderer::kStencilOnly_StencilSupport;
-    }
-}
-
-static inline void append_countour_edge_indices(bool hairLine,
-                                                uint16_t fanCenterIdx,
-                                                uint16_t edgeV0Idx,
-                                                uint16_t** indices) {
-    // when drawing lines we're appending line segments along
-    // the contour. When applying the other fill rules we're
-    // drawing triangle fans around fanCenterIdx.
-    if (!hairLine) {
-        *((*indices)++) = fanCenterIdx;
-    }
-    *((*indices)++) = edgeV0Idx;
-    *((*indices)++) = edgeV0Idx + 1;
-}
-
-bool GrDefaultPathRenderer::createGeom(const SkPath& path,
-                                       const SkStrokeRec& stroke,
-                                       SkScalar srcSpaceTol,
-                                       GrDrawTarget* target,
-                                       GrPrimitiveType* primType,
-                                       int* vertexCnt,
-                                       int* indexCnt,
-                                       GrDrawTarget::AutoReleaseGeometry* arg) {
-    {
-    SkScalar srcSpaceTolSqd = SkScalarMul(srcSpaceTol, srcSpaceTol);
-    int contourCnt;
-    int maxPts = GrPathUtils::worstCasePointCount(path, &contourCnt,
-                                                  srcSpaceTol);
-
-    if (maxPts <= 0) {
-        return false;
-    }
-    if (maxPts > ((int)SK_MaxU16 + 1)) {
-        GrPrintf("Path not rendered, too many verts (%d)\n", maxPts);
-        return false;
-    }
-
-    bool indexed = contourCnt > 1;
-
-    const bool isHairline = stroke.isHairlineStyle();
-
-    int maxIdxs = 0;
-    if (isHairline) {
-        if (indexed) {
-            maxIdxs = 2 * maxPts;
-            *primType = kLines_GrPrimitiveType;
-        } else {
-            *primType = kLineStrip_GrPrimitiveType;
-        }
-    } else {
-        if (indexed) {
-            maxIdxs = 3 * maxPts;
-            *primType = kTriangles_GrPrimitiveType;
-        } else {
-            *primType = kTriangleFan_GrPrimitiveType;
-        }
-    }
-
-    target->drawState()->setDefaultVertexAttribs();
-    if (!arg->set(target, maxPts, maxIdxs)) {
-        return false;
-    }
-
-    uint16_t* idxBase = reinterpret_cast<uint16_t*>(arg->indices());
-    uint16_t* idx = idxBase;
-    uint16_t subpathIdxStart = 0;
-
-    SkPoint* base = reinterpret_cast<SkPoint*>(arg->vertices());
-    SkASSERT(NULL != base);
-    SkPoint* vert = base;
-
-    SkPoint pts[4];
-
-    bool first = true;
-    int subpath = 0;
-
-    SkPath::Iter iter(path, false);
-
-    for (;;) {
-        SkPath::Verb verb = iter.next(pts);
-        switch (verb) {
-            case SkPath::kConic_Verb:
-                SkASSERT(0);
-                break;
-            case SkPath::kMove_Verb:
-                if (!first) {
-                    uint16_t currIdx = (uint16_t) (vert - base);
-                    subpathIdxStart = currIdx;
-                    ++subpath;
-                }
-                *vert = pts[0];
-                vert++;
-                break;
-            case SkPath::kLine_Verb:
-                if (indexed) {
-                    uint16_t prevIdx = (uint16_t)(vert - base) - 1;
-                    append_countour_edge_indices(isHairline, subpathIdxStart,
-                                                 prevIdx, &idx);
-                }
-                *(vert++) = pts[1];
-                break;
-            case SkPath::kQuad_Verb: {
-                // first pt of quad is the pt we ended on in previous step
-                uint16_t firstQPtIdx = (uint16_t)(vert - base) - 1;
-                uint16_t numPts =  (uint16_t)
-                    GrPathUtils::generateQuadraticPoints(
-                            pts[0], pts[1], pts[2],
-                            srcSpaceTolSqd, &vert,
-                            GrPathUtils::quadraticPointCount(pts, srcSpaceTol));
-                if (indexed) {
-                    for (uint16_t i = 0; i < numPts; ++i) {
-                        append_countour_edge_indices(isHairline, subpathIdxStart,
-                                                     firstQPtIdx + i, &idx);
-                    }
-                }
-                break;
-            }
-            case SkPath::kCubic_Verb: {
-                // first pt of cubic is the pt we ended on in previous step
-                uint16_t firstCPtIdx = (uint16_t)(vert - base) - 1;
-                uint16_t numPts = (uint16_t) GrPathUtils::generateCubicPoints(
-                                pts[0], pts[1], pts[2], pts[3],
-                                srcSpaceTolSqd, &vert,
-                                GrPathUtils::cubicPointCount(pts, srcSpaceTol));
-                if (indexed) {
-                    for (uint16_t i = 0; i < numPts; ++i) {
-                        append_countour_edge_indices(isHairline, subpathIdxStart,
-                                                     firstCPtIdx + i, &idx);
-                    }
-                }
-                break;
-            }
-            case SkPath::kClose_Verb:
-                break;
-            case SkPath::kDone_Verb:
-             // uint16_t currIdx = (uint16_t) (vert - base);
-                goto FINISHED;
-        }
-        first = false;
-    }
-FINISHED:
-    SkASSERT((vert - base) <= maxPts);
-    SkASSERT((idx - idxBase) <= maxIdxs);
-
-    *vertexCnt = static_cast<int>(vert - base);
-    *indexCnt = static_cast<int>(idx - idxBase);
-
-    }
-    return true;
-}
-
-bool GrDefaultPathRenderer::internalDrawPath(const SkPath& path,
-                                             const SkStrokeRec& origStroke,
-                                             GrDrawTarget* target,
-                                             bool stencilOnly) {
-
-    SkMatrix viewM = target->getDrawState().getViewMatrix();
-    SkTCopyOnFirstWrite<SkStrokeRec> stroke(origStroke);
-
-    SkScalar hairlineCoverage;
-    if (IsStrokeHairlineOrEquivalent(*stroke, target->getDrawState().getViewMatrix(),
-                                     &hairlineCoverage)) {
-        uint8_t newCoverage = SkScalarRoundToInt(hairlineCoverage *
-                                                 target->getDrawState().getCoverage());
-        target->drawState()->setCoverage(newCoverage);
-
-        if (!stroke->isHairlineStyle()) {
-            stroke.writable()->setHairlineStyle();
-        }
-    }
-
-    SkScalar tol = SK_Scalar1;
-    tol = GrPathUtils::scaleToleranceToSrc(tol, viewM, path.getBounds());
-
-    int vertexCnt;
-    int indexCnt;
-    GrPrimitiveType primType;
-    GrDrawTarget::AutoReleaseGeometry arg;
-    if (!this->createGeom(path,
-                          *stroke,
-                          tol,
-                          target,
-                          &primType,
-                          &vertexCnt,
-                          &indexCnt,
-                          &arg)) {
-        return false;
-    }
-
-    SkASSERT(NULL != target);
-    GrDrawTarget::AutoStateRestore asr(target, GrDrawTarget::kPreserve_ASRInit);
-    GrDrawState* drawState = target->drawState();
-    bool colorWritesWereDisabled = drawState->isColorWriteDisabled();
-    // face culling doesn't make sense here
-    SkASSERT(GrDrawState::kBoth_DrawFace == drawState->getDrawFace());
-
-    int                         passCount = 0;
-    const GrStencilSettings*    passes[3];
-    GrDrawState::DrawFace       drawFace[3];
-    bool                        reverse = false;
-    bool                        lastPassIsBounds;
-
-    if (stroke->isHairlineStyle()) {
-        passCount = 1;
-        if (stencilOnly) {
-            passes[0] = &gDirectToStencil;
-        } else {
-            passes[0] = NULL;
-        }
-        lastPassIsBounds = false;
-        drawFace[0] = GrDrawState::kBoth_DrawFace;
-    } else {
-        if (single_pass_path(path, *stroke)) {
-            passCount = 1;
-            if (stencilOnly) {
-                passes[0] = &gDirectToStencil;
-            } else {
-                passes[0] = NULL;
-            }
-            drawFace[0] = GrDrawState::kBoth_DrawFace;
-            lastPassIsBounds = false;
-        } else {
-            switch (path.getFillType()) {
-                case SkPath::kInverseEvenOdd_FillType:
-                    reverse = true;
-                    // fallthrough
-                case SkPath::kEvenOdd_FillType:
-                    passes[0] = &gEOStencilPass;
-                    if (stencilOnly) {
-                        passCount = 1;
-                        lastPassIsBounds = false;
-                    } else {
-                        passCount = 2;
-                        lastPassIsBounds = true;
-                        if (reverse) {
-                            passes[1] = &gInvEOColorPass;
-                        } else {
-                            passes[1] = &gEOColorPass;
-                        }
-                    }
-                    drawFace[0] = drawFace[1] = GrDrawState::kBoth_DrawFace;
-                    break;
-
-                case SkPath::kInverseWinding_FillType:
-                    reverse = true;
-                    // fallthrough
-                case SkPath::kWinding_FillType:
-                    if (fSeparateStencil) {
-                        if (fStencilWrapOps) {
-                            passes[0] = &gWindStencilSeparateWithWrap;
-                        } else {
-                            passes[0] = &gWindStencilSeparateNoWrap;
-                        }
-                        passCount = 2;
-                        drawFace[0] = GrDrawState::kBoth_DrawFace;
-                    } else {
-                        if (fStencilWrapOps) {
-                            passes[0] = &gWindSingleStencilWithWrapInc;
-                            passes[1] = &gWindSingleStencilWithWrapDec;
-                        } else {
-                            passes[0] = &gWindSingleStencilNoWrapInc;
-                            passes[1] = &gWindSingleStencilNoWrapDec;
-                        }
-                        // which is cw and which is ccw is arbitrary.
-                        drawFace[0] = GrDrawState::kCW_DrawFace;
-                        drawFace[1] = GrDrawState::kCCW_DrawFace;
-                        passCount = 3;
-                    }
-                    if (stencilOnly) {
-                        lastPassIsBounds = false;
-                        --passCount;
-                    } else {
-                        lastPassIsBounds = true;
-                        drawFace[passCount-1] = GrDrawState::kBoth_DrawFace;
-                        if (reverse) {
-                            passes[passCount-1] = &gInvWindColorPass;
-                        } else {
-                            passes[passCount-1] = &gWindColorPass;
-                        }
-                    }
-                    break;
-                default:
-                    SkDEBUGFAIL("Unknown path fFill!");
-                    return false;
-            }
-        }
-    }
-
-    SkRect devBounds;
-    GetPathDevBounds(path, drawState->getRenderTarget(), viewM, &devBounds);
-
-    for (int p = 0; p < passCount; ++p) {
-        drawState->setDrawFace(drawFace[p]);
-        if (NULL != passes[p]) {
-            *drawState->stencil() = *passes[p];
-        }
-
-        if (lastPassIsBounds && (p == passCount-1)) {
-            if (!colorWritesWereDisabled) {
-                drawState->disableState(GrDrawState::kNoColorWrites_StateBit);
-            }
-            SkRect bounds;
-            GrDrawState::AutoViewMatrixRestore avmr;
-            if (reverse) {
-                SkASSERT(NULL != drawState->getRenderTarget());
-                // draw over the dev bounds (which will be the whole dst surface for inv fill).
-                bounds = devBounds;
-                SkMatrix vmi;
-                // mapRect through persp matrix may not be correct
-                if (!drawState->getViewMatrix().hasPerspective() &&
-                    drawState->getViewInverse(&vmi)) {
-                    vmi.mapRect(&bounds);
-                } else {
-                    avmr.setIdentity(drawState);
-                }
-            } else {
-                bounds = path.getBounds();
-            }
-            GrDrawTarget::AutoGeometryAndStatePush agasp(target, GrDrawTarget::kPreserve_ASRInit);
-            target->drawSimpleRect(bounds, NULL);
-        } else {
-            if (passCount > 1) {
-                drawState->enableState(GrDrawState::kNoColorWrites_StateBit);
-            }
-            if (indexCnt) {
-                target->drawIndexed(primType, 0, 0,
-                                    vertexCnt, indexCnt, &devBounds);
-            } else {
-                target->drawNonIndexed(primType, 0, vertexCnt, &devBounds);
-            }
-        }
-    }
-    return true;
-}
-
-bool GrDefaultPathRenderer::canDrawPath(const SkPath& path,
-                                        const SkStrokeRec& stroke,
-                                        const GrDrawTarget* target,
-                                        bool antiAlias) const {
-    // this class can draw any path with any fill but doesn't do any anti-aliasing.
-
-    return !antiAlias && !(SkPath::kConic_SegmentMask & path.getSegmentMasks()) &&
-        (stroke.isFillStyle() ||
-         IsStrokeHairlineOrEquivalent(stroke, target->getDrawState().getViewMatrix(), NULL));
-}
-
-bool GrDefaultPathRenderer::onDrawPath(const SkPath& path,
-                                       const SkStrokeRec& stroke,
-                                       GrDrawTarget* target,
-                                       bool antiAlias) {
-    return this->internalDrawPath(path,
-                                  stroke,
-                                  target,
-                                  false);
-}
-
-void GrDefaultPathRenderer::onStencilPath(const SkPath& path,
-                                          const SkStrokeRec& stroke,
-                                          GrDrawTarget* target) {
-    SkASSERT(SkPath::kInverseEvenOdd_FillType != path.getFillType());
-    SkASSERT(SkPath::kInverseWinding_FillType != path.getFillType());
-    this->internalDrawPath(path, stroke, target, true);
-}
diff --git a/gfx/skia/skia/src/gpu/GrDefaultPathRenderer.h b/gfx/skia/skia/src/gpu/GrDefaultPathRenderer.h
deleted file mode 100644
index c60afccbfb6e..000000000000
--- a/gfx/skia/skia/src/gpu/GrDefaultPathRenderer.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrDefaultPathRenderer_DEFINED
-#define GrDefaultPathRenderer_DEFINED
-
-#include "GrPathRenderer.h"
-#include "SkTemplates.h"
-
-/**
- *  Subclass that renders the path using the stencil buffer to resolve fill rules
- * (e.g. winding, even-odd)
- */
-class SK_API GrDefaultPathRenderer : public GrPathRenderer {
-public:
-    GrDefaultPathRenderer(bool separateStencilSupport, bool stencilWrapOpsSupport);
-
-    virtual bool canDrawPath(const SkPath&,
-                             const SkStrokeRec&,
-                             const GrDrawTarget*,
-                             bool antiAlias) const SK_OVERRIDE;
-
-private:
-
-    virtual StencilSupport onGetStencilSupport(const SkPath&,
-                                               const SkStrokeRec&,
-                                               const GrDrawTarget*) const SK_OVERRIDE;
-
-    virtual bool onDrawPath(const SkPath&,
-                            const SkStrokeRec&,
-                            GrDrawTarget*,
-                            bool antiAlias) SK_OVERRIDE;
-
-    virtual void onStencilPath(const SkPath&,
-                               const SkStrokeRec&,
-                               GrDrawTarget*) SK_OVERRIDE;
-
-    bool internalDrawPath(const SkPath&,
-                          const SkStrokeRec&,
-                          GrDrawTarget*,
-                          bool stencilOnly);
-
-    bool createGeom(const SkPath&,
-                    const SkStrokeRec&,
-                    SkScalar srcSpaceTol,
-                    GrDrawTarget*,
-                    GrPrimitiveType*,
-                    int* vertexCnt,
-                    int* indexCnt,
-                    GrDrawTarget::AutoReleaseGeometry*);
-
-    bool    fSeparateStencil;
-    bool    fStencilWrapOps;
-
-    typedef GrPathRenderer INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/GrDistanceFieldTextContext.cpp b/gfx/skia/skia/src/gpu/GrDistanceFieldTextContext.cpp
deleted file mode 100755
index 0ef596a27ba0..000000000000
--- a/gfx/skia/skia/src/gpu/GrDistanceFieldTextContext.cpp
+++ /dev/null
@@ -1,599 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrDistanceFieldTextContext.h"
-#include "GrAtlas.h"
-#include "SkColorFilter.h"
-#include "GrDrawTarget.h"
-#include "GrDrawTargetCaps.h"
-#include "GrFontScaler.h"
-#include "SkGlyphCache.h"
-#include "GrGpu.h"
-#include "GrIndexBuffer.h"
-#include "GrStrokeInfo.h"
-#include "GrTextStrike.h"
-#include "GrTextStrike_impl.h"
-#include "SkDistanceFieldGen.h"
-#include "SkDraw.h"
-#include "SkGpuDevice.h"
-#include "SkPath.h"
-#include "SkRTConf.h"
-#include "SkStrokeRec.h"
-#include "effects/GrDistanceFieldTextureEffect.h"
-
-SK_CONF_DECLARE(bool, c_DumpFontCache, "gpu.dumpFontCache", false,
-                "Dump the contents of the font cache before every purge.");
-
-static const int kGlyphCoordsNoColorAttributeIndex = 1;
-static const int kGlyphCoordsWithColorAttributeIndex = 2;
-
-static const int kSmallDFFontSize = 32;
-static const int kSmallDFFontLimit = 32;
-static const int kMediumDFFontSize = 64;
-static const int kMediumDFFontLimit = 64;
-static const int kLargeDFFontSize = 128;
-
-namespace {
-// position + texture coord
-extern const GrVertexAttrib gTextVertexAttribs[] = {
-    {kVec2f_GrVertexAttribType, 0,                kPosition_GrVertexAttribBinding},
-    {kVec2f_GrVertexAttribType, sizeof(SkPoint) , kEffect_GrVertexAttribBinding}
-};
-
-// position + color + texture coord
-extern const GrVertexAttrib gTextVertexWithColorAttribs[] = {
-    {kVec2f_GrVertexAttribType,  0,                                 kPosition_GrVertexAttribBinding},
-    {kVec4ub_GrVertexAttribType, sizeof(SkPoint),                   kColor_GrVertexAttribBinding},
-    {kVec2f_GrVertexAttribType,  sizeof(SkPoint) + sizeof(GrColor), kEffect_GrVertexAttribBinding}
-};
-    
-};
-
-GrDistanceFieldTextContext::GrDistanceFieldTextContext(GrContext* context,
-                                                       const SkDeviceProperties& properties,
-                                                       bool enable)
-                                                    : GrTextContext(context, properties) {
-#if SK_FORCE_DISTANCEFIELD_FONTS
-    fEnableDFRendering = true;
-#else
-    fEnableDFRendering = enable;
-#endif
-    fStrike = NULL;
-    fGammaTexture = NULL;
-
-    fCurrVertex = 0;
-
-    fVertices = NULL;
-}
-
-GrDistanceFieldTextContext::~GrDistanceFieldTextContext() {
-    this->flushGlyphs();
-    SkSafeSetNull(fGammaTexture);
-}
-
-bool GrDistanceFieldTextContext::canDraw(const SkPaint& paint) {
-    if (!fEnableDFRendering && !paint.isDistanceFieldTextTEMP()) {
-        return false;
-    }
-
-    // rasterizers and mask filters modify alpha, which doesn't
-    // translate well to distance
-    if (paint.getRasterizer() || paint.getMaskFilter() ||
-        !fContext->getTextTarget()->caps()->shaderDerivativeSupport()) {
-        return false;
-    }
-
-    // TODO: add some stroking support
-    if (paint.getStyle() != SkPaint::kFill_Style) {
-        return false;
-    }
-
-    // TODO: choose an appropriate maximum scale for distance fields and
-    //       enable perspective
-    if (SkDraw::ShouldDrawTextAsPaths(paint, fContext->getMatrix())) {
-        return false;
-    }
-
-    // distance fields cannot represent color fonts
-    SkScalerContext::Rec    rec;
-    SkScalerContext::MakeRec(paint, &fDeviceProperties, NULL, &rec);
-    return rec.getFormat() != SkMask::kARGB32_Format;
-}
-
-static inline GrColor skcolor_to_grcolor_nopremultiply(SkColor c) {
-    unsigned r = SkColorGetR(c);
-    unsigned g = SkColorGetG(c);
-    unsigned b = SkColorGetB(c);
-    return GrColorPackRGBA(r, g, b, 0xff);
-}
-
-void GrDistanceFieldTextContext::flushGlyphs() {
-    if (NULL == fDrawTarget) {
-        return;
-    }
-
-    GrDrawState* drawState = fDrawTarget->drawState();
-    GrDrawState::AutoRestoreEffects are(drawState);
-    drawState->setFromPaint(fPaint, fContext->getMatrix(), fContext->getRenderTarget());
-
-    if (fCurrVertex > 0) {
-        // setup our sampler state for our text texture/atlas
-        SkASSERT(SkIsAlign4(fCurrVertex));
-        GrTexture* currTexture = fStrike->getTexture();
-        SkASSERT(currTexture);
-        GrTextureParams params(SkShader::kRepeat_TileMode, GrTextureParams::kBilerp_FilterMode);
-        GrTextureParams gammaParams(SkShader::kClamp_TileMode, GrTextureParams::kNone_FilterMode);
-
-        // Effects could be stored with one of the cache objects (atlas?)
-        int coordsIdx = drawState->hasColorVertexAttribute() ? kGlyphCoordsWithColorAttributeIndex :
-                                                               kGlyphCoordsNoColorAttributeIndex;
-        SkColor filteredColor;
-        SkColorFilter* colorFilter = fSkPaint.getColorFilter();
-        if (NULL != colorFilter) {
-            filteredColor = colorFilter->filterColor(fSkPaint.getColor());
-        } else {
-            filteredColor = fSkPaint.getColor();
-        }
-        if (fUseLCDText) {
-            GrColor colorNoPreMul = skcolor_to_grcolor_nopremultiply(filteredColor);
-            bool useBGR = SkDeviceProperties::Geometry::kBGR_Layout ==
-                                                            fDeviceProperties.fGeometry.getLayout();
-            drawState->addCoverageEffect(GrDistanceFieldLCDTextureEffect::Create(
-                                                            currTexture,
-                                                            params,
-                                                            fGammaTexture,
-                                                            gammaParams,
-                                                            colorNoPreMul,
-                                                            fContext->getMatrix().rectStaysRect() &&
-                                                            fContext->getMatrix().isSimilarity(),
-                                                            useBGR),
-                                         coordsIdx)->unref();
-
-            if (kOne_GrBlendCoeff != fPaint.getSrcBlendCoeff() ||
-                kISA_GrBlendCoeff != fPaint.getDstBlendCoeff() ||
-                fPaint.numColorStages()) {
-                GrPrintf("LCD Text will not draw correctly.\n");
-            }
-            SkASSERT(!drawState->hasColorVertexAttribute());
-            // We don't use the GrPaint's color in this case because it's been premultiplied by
-            // alpha. Instead we feed in a non-premultiplied color, and multiply its alpha by
-            // the mask texture color. The end result is that we get
-            //            mask*paintAlpha*paintColor + (1-mask*paintAlpha)*dstColor
-            int a = SkColorGetA(fSkPaint.getColor());
-            // paintAlpha
-            drawState->setColor(SkColorSetARGB(a, a, a, a));
-            // paintColor
-            drawState->setBlendConstant(colorNoPreMul);
-            drawState->setBlendFunc(kConstC_GrBlendCoeff, kISC_GrBlendCoeff);
-        } else {
-#ifdef SK_GAMMA_APPLY_TO_A8
-            U8CPU lum = SkColorSpaceLuminance::computeLuminance(fDeviceProperties.fGamma,
-                                                                filteredColor);
-            drawState->addCoverageEffect(GrDistanceFieldTextureEffect::Create(
-                                                              currTexture, params,
-                                                              fGammaTexture, gammaParams,
-                                                              lum/255.f,
-                                                              fContext->getMatrix().isSimilarity()),
-                                         coordsIdx)->unref();
-#else
-            drawState->addCoverageEffect(GrDistanceFieldTextureEffect::Create(
-                                                              currTexture, params,
-                                                              fContext->getMatrix().isSimilarity()),
-                                         coordsIdx)->unref();
-#endif
-            // set back to normal in case we took LCD path previously.
-            drawState->setBlendFunc(fPaint.getSrcBlendCoeff(), fPaint.getDstBlendCoeff());
-            //drawState->setColor(fPaint.getColor());
-            // We're using per-vertex color.
-            SkASSERT(drawState->hasColorVertexAttribute());
-            drawState->setColor(0xFFFFFFFF);
-        }
-        int nGlyphs = fCurrVertex / 4;
-        fDrawTarget->setIndexSourceToBuffer(fContext->getQuadIndexBuffer());
-        fDrawTarget->drawIndexedInstances(kTriangles_GrPrimitiveType,
-                                          nGlyphs,
-                                          4, 6);
-        fCurrVertex = 0;
-    }
-    fDrawTarget->resetVertexSource();
-    fVertices = NULL;
-}
-
-void GrDistanceFieldTextContext::drawPackedGlyph(GrGlyph::PackedID packed,
-                                                 SkFixed vx, SkFixed vy,
-                                                 GrFontScaler* scaler) {
-    GrGlyph* glyph = fStrike->getGlyph(packed, scaler);
-    if (NULL == glyph || glyph->fBounds.isEmpty()) {
-        return;
-    }
-
-    SkScalar sx = SkFixedToScalar(vx);
-    SkScalar sy = SkFixedToScalar(vy);
-/*
-    // not valid, need to find a different solution for this
-    vx += SkIntToFixed(glyph->fBounds.fLeft);
-    vy += SkIntToFixed(glyph->fBounds.fTop);
-
-    // keep them as ints until we've done the clip-test
-    GrFixed width = glyph->fBounds.width();
-    GrFixed height = glyph->fBounds.height();
-
-    // check if we clipped out
-    if (true || NULL == glyph->fPlot) {
-        int x = vx >> 16;
-        int y = vy >> 16;
-        if (fClipRect.quickReject(x, y, x + width, y + height)) {
-//            SkCLZ(3);    // so we can set a break-point in the debugger
-            return;
-        }
-    }
-*/
-    if (NULL == glyph->fPlot) {
-        if (fStrike->addGlyphToAtlas(glyph, scaler)) {
-            goto HAS_ATLAS;
-        }
-
-        // try to clear out an unused plot before we flush
-        if (fContext->getFontCache()->freeUnusedPlot(fStrike) &&
-            fStrike->addGlyphToAtlas(glyph, scaler)) {
-            goto HAS_ATLAS;
-        }
-
-        if (c_DumpFontCache) {
-#ifdef SK_DEVELOPER
-            fContext->getFontCache()->dump();
-#endif
-        }
-
-        // before we purge the cache, we must flush any accumulated draws
-        this->flushGlyphs();
-        fContext->flush();
-
-        // we should have an unused plot now
-        if (fContext->getFontCache()->freeUnusedPlot(fStrike) &&
-            fStrike->addGlyphToAtlas(glyph, scaler)) {
-            goto HAS_ATLAS;
-        }
-
-        if (NULL == glyph->fPath) {
-            SkPath* path = SkNEW(SkPath);
-            if (!scaler->getGlyphPath(glyph->glyphID(), path)) {
-                // flag the glyph as being dead?
-                delete path;
-                return;
-            }
-            glyph->fPath = path;
-        }
-
-        GrContext::AutoMatrix am;
-        SkMatrix ctm;
-        ctm.setScale(fTextRatio, fTextRatio);
-        ctm.postTranslate(sx, sy);
-        GrPaint tmpPaint(fPaint);
-        am.setPreConcat(fContext, ctm, &tmpPaint);
-        GrStrokeInfo strokeInfo(SkStrokeRec::kFill_InitStyle);
-        fContext->drawPath(tmpPaint, *glyph->fPath, strokeInfo);
-        return;
-    }
-
-HAS_ATLAS:
-    SkASSERT(glyph->fPlot);
-    GrDrawTarget::DrawToken drawToken = fDrawTarget->getCurrentDrawToken();
-    glyph->fPlot->setDrawToken(drawToken);
-
-    GrTexture* texture = glyph->fPlot->texture();
-    SkASSERT(texture);
-
-    SkScalar dx = SkIntToScalar(glyph->fBounds.fLeft + SK_DistanceFieldInset);
-    SkScalar dy = SkIntToScalar(glyph->fBounds.fTop + SK_DistanceFieldInset);
-    SkScalar width = SkIntToScalar(glyph->fBounds.width() - 2*SK_DistanceFieldInset);
-    SkScalar height = SkIntToScalar(glyph->fBounds.height() - 2*SK_DistanceFieldInset);
-
-    SkScalar scale = fTextRatio;
-    dx *= scale;
-    dy *= scale;
-    sx += dx;
-    sy += dy;
-    width *= scale;
-    height *= scale;
-
-    SkFixed tx = SkIntToFixed(glyph->fAtlasLocation.fX + SK_DistanceFieldInset);
-    SkFixed ty = SkIntToFixed(glyph->fAtlasLocation.fY + SK_DistanceFieldInset);
-    SkFixed tw = SkIntToFixed(glyph->fBounds.width() - 2*SK_DistanceFieldInset);
-    SkFixed th = SkIntToFixed(glyph->fBounds.height() - 2*SK_DistanceFieldInset);
-
-    size_t vertSize = fUseLCDText ? (2 * sizeof(SkPoint))
-                                  : (2 * sizeof(SkPoint) + sizeof(GrColor));
-    
-    SkASSERT(vertSize == fDrawTarget->getDrawState().getVertexSize());
-    
-    SkPoint* positions = reinterpret_cast<SkPoint*>(
-        reinterpret_cast<intptr_t>(fVertices) + vertSize * fCurrVertex);
-    positions->setRectFan(sx, sy, sx + width, sy + height, vertSize);
-    
-    // The texture coords are last in both the with and without color vertex layouts.
-    SkPoint* textureCoords = reinterpret_cast<SkPoint*>(
-            reinterpret_cast<intptr_t>(positions) + vertSize  - sizeof(SkPoint));
-    textureCoords->setRectFan(SkFixedToFloat(texture->normalizeFixedX(tx)),
-                              SkFixedToFloat(texture->normalizeFixedY(ty)),
-                              SkFixedToFloat(texture->normalizeFixedX(tx + tw)),
-                              SkFixedToFloat(texture->normalizeFixedY(ty + th)),
-                              vertSize);
-    if (!fUseLCDText) {
-        // color comes after position.
-        GrColor* colors = reinterpret_cast<GrColor*>(positions + 1);
-        for (int i = 0; i < 4; ++i) {
-            *colors = fPaint.getColor();
-            colors = reinterpret_cast<GrColor*>(reinterpret_cast<intptr_t>(colors) + vertSize);
-        }
-    }
-    
-    fCurrVertex += 4;
-}
-
-inline void GrDistanceFieldTextContext::init(const GrPaint& paint, const SkPaint& skPaint) {
-    GrTextContext::init(paint, skPaint);
-
-    fStrike = NULL;
-
-    fCurrVertex = 0;
-
-    fVertices = NULL;
-
-    if (fSkPaint.getTextSize() <= kSmallDFFontLimit) {
-        fTextRatio = fSkPaint.getTextSize()/kSmallDFFontSize;
-        fSkPaint.setTextSize(SkIntToScalar(kSmallDFFontSize));
-    } else if (fSkPaint.getTextSize() <= kMediumDFFontLimit) {
-        fTextRatio = fSkPaint.getTextSize()/kMediumDFFontSize;
-        fSkPaint.setTextSize(SkIntToScalar(kMediumDFFontSize));
-    } else {
-        fTextRatio = fSkPaint.getTextSize()/kLargeDFFontSize;
-        fSkPaint.setTextSize(SkIntToScalar(kLargeDFFontSize));
-    }
-
-    fUseLCDText = fSkPaint.isLCDRenderText();
-
-    fSkPaint.setLCDRenderText(false);
-    fSkPaint.setAutohinted(false);
-    fSkPaint.setHinting(SkPaint::kNormal_Hinting);
-    fSkPaint.setSubpixelText(true);
-
-}
-
-inline void GrDistanceFieldTextContext::finish() {
-    this->flushGlyphs();
-
-    GrTextContext::finish();
-}
-
-static void setup_gamma_texture(GrContext* context, const SkGlyphCache* cache,
-                                const SkDeviceProperties& deviceProperties,
-                                GrTexture** gammaTexture) {
-    if (NULL == *gammaTexture) {
-        int width, height;
-        size_t size;
-
-#ifdef SK_GAMMA_CONTRAST
-        SkScalar contrast = SK_GAMMA_CONTRAST;
-#else
-        SkScalar contrast = 0.5f;
-#endif
-        SkScalar paintGamma = deviceProperties.fGamma;
-        SkScalar deviceGamma = deviceProperties.fGamma;
-
-        size = SkScalerContext::GetGammaLUTSize(contrast, paintGamma, deviceGamma,
-                                                &width, &height);
-
-        SkAutoTArray<uint8_t> data((int)size);
-        SkScalerContext::GetGammaLUTData(contrast, paintGamma, deviceGamma, data.get());
-
-        // TODO: Update this to use the cache rather than directly creating a texture.
-        GrTextureDesc desc;
-        desc.fFlags = kDynamicUpdate_GrTextureFlagBit;
-        desc.fWidth = width;
-        desc.fHeight = height;
-        desc.fConfig = kAlpha_8_GrPixelConfig;
-
-        *gammaTexture = context->getGpu()->createTexture(desc, NULL, 0);
-        if (NULL == *gammaTexture) {
-            return;
-        }
-
-        context->writeTexturePixels(*gammaTexture,
-                                    0, 0, width, height,
-                                    (*gammaTexture)->config(), data.get(), 0,
-                                    GrContext::kDontFlush_PixelOpsFlag);
-    }
-}
-
-void GrDistanceFieldTextContext::drawText(const GrPaint& paint, const SkPaint& skPaint,
-                                          const char text[], size_t byteLength,
-                                          SkScalar x, SkScalar y) {
-    SkASSERT(byteLength == 0 || text != NULL);
-
-    // nothing to draw or can't draw
-    if (text == NULL || byteLength == 0 /* no raster clip? || fRC->isEmpty()*/
-        || fSkPaint.getRasterizer()) {
-        return;
-    }
-
-    this->init(paint, skPaint);
-
-    if (NULL == fDrawTarget) {
-        return;
-    }
-
-    SkScalar sizeRatio = fTextRatio;
-
-    SkDrawCacheProc glyphCacheProc = fSkPaint.getDrawCacheProc();
-
-    SkAutoGlyphCacheNoGamma    autoCache(fSkPaint, &fDeviceProperties, NULL);
-    SkGlyphCache*              cache = autoCache.getCache();
-    GrFontScaler*              fontScaler = GetGrFontScaler(cache);
-    if (NULL == fStrike) {
-        fStrike = fContext->getFontCache()->getStrike(fontScaler, true);
-    }
-
-    setup_gamma_texture(fContext, cache, fDeviceProperties, &fGammaTexture);
-
-    // allocate vertices
-    SkASSERT(NULL == fVertices);
-    if (!fUseLCDText) {
-        fDrawTarget->drawState()->setVertexAttribs<gTextVertexWithColorAttribs>(
-                                                       SK_ARRAY_COUNT(gTextVertexWithColorAttribs));
-    } else {
-        fDrawTarget->drawState()->setVertexAttribs<gTextVertexAttribs>(
-                                                       SK_ARRAY_COUNT(gTextVertexAttribs));
-    }
-    int numGlyphs = fSkPaint.textToGlyphs(text, byteLength, NULL);
-    bool success = fDrawTarget->reserveVertexAndIndexSpace(4*numGlyphs,
-                                                           0,
-                                                           &fVertices,
-                                                           NULL);
-    GrAlwaysAssert(success);
-
-    // need to measure first
-    // TODO - generate positions and pre-load cache as well?
-    const char* stop = text + byteLength;
-    if (fSkPaint.getTextAlign() != SkPaint::kLeft_Align) {
-        SkFixed    stopX = 0;
-        SkFixed    stopY = 0;
-
-        const char* textPtr = text;
-        while (textPtr < stop) {
-            // don't need x, y here, since all subpixel variants will have the
-            // same advance
-            const SkGlyph& glyph = glyphCacheProc(cache, &textPtr, 0, 0);
-
-            stopX += glyph.fAdvanceX;
-            stopY += glyph.fAdvanceY;
-        }
-        SkASSERT(textPtr == stop);
-
-        SkScalar alignX = SkFixedToScalar(stopX)*sizeRatio;
-        SkScalar alignY = SkFixedToScalar(stopY)*sizeRatio;
-
-        if (fSkPaint.getTextAlign() == SkPaint::kCenter_Align) {
-            alignX = SkScalarHalf(alignX);
-            alignY = SkScalarHalf(alignY);
-        }
-
-        x -= alignX;
-        y -= alignY;
-    }
-
-    SkFixed fx = SkScalarToFixed(x);
-    SkFixed fy = SkScalarToFixed(y);
-    SkFixed fixedScale = SkScalarToFixed(sizeRatio);
-    while (text < stop) {
-        const SkGlyph& glyph = glyphCacheProc(cache, &text, 0, 0);
-
-        if (glyph.fWidth) {
-            this->drawPackedGlyph(GrGlyph::Pack(glyph.getGlyphID(),
-                                                glyph.getSubXFixed(),
-                                                glyph.getSubYFixed()),
-                                  fx,
-                                  fy,
-                                  fontScaler);
-        }
-
-        fx += SkFixedMul_portable(glyph.fAdvanceX, fixedScale);
-        fy += SkFixedMul_portable(glyph.fAdvanceY, fixedScale);
-    }
-
-    this->finish();
-}
-
-void GrDistanceFieldTextContext::drawPosText(const GrPaint& paint, const SkPaint& skPaint,
-                                             const char text[], size_t byteLength,
-                                             const SkScalar pos[], SkScalar constY,
-                                             int scalarsPerPosition) {
-
-    SkASSERT(byteLength == 0 || text != NULL);
-    SkASSERT(1 == scalarsPerPosition || 2 == scalarsPerPosition);
-
-    // nothing to draw
-    if (text == NULL || byteLength == 0 /* no raster clip? || fRC->isEmpty()*/) {
-        return;
-    }
-
-    this->init(paint, skPaint);
-
-    if (NULL == fDrawTarget) {
-        return;
-    }
-
-    SkDrawCacheProc glyphCacheProc = fSkPaint.getDrawCacheProc();
-
-    SkAutoGlyphCacheNoGamma    autoCache(fSkPaint, &fDeviceProperties, NULL);
-    SkGlyphCache*              cache = autoCache.getCache();
-    GrFontScaler*              fontScaler = GetGrFontScaler(cache);
-    if (NULL == fStrike) {
-        fStrike = fContext->getFontCache()->getStrike(fontScaler, true);
-    }
-
-    // allocate vertices
-    SkASSERT(NULL == fVertices);
-    if (!fUseLCDText) {
-        fDrawTarget->drawState()->setVertexAttribs<gTextVertexWithColorAttribs>(
-                                                       SK_ARRAY_COUNT(gTextVertexWithColorAttribs));
-    } else {
-        fDrawTarget->drawState()->setVertexAttribs<gTextVertexAttribs>(
-                                                       SK_ARRAY_COUNT(gTextVertexAttribs));
-    }
-    int numGlyphs = fSkPaint.textToGlyphs(text, byteLength, NULL);
-    bool success = fDrawTarget->reserveVertexAndIndexSpace(4*numGlyphs,
-                                                           0,
-                                                           &fVertices,
-                                                           NULL);
-    GrAlwaysAssert(success);
-
-    setup_gamma_texture(fContext, cache, fDeviceProperties, &fGammaTexture);
-
-    const char*        stop = text + byteLength;
-
-    if (SkPaint::kLeft_Align == fSkPaint.getTextAlign()) {
-        while (text < stop) {
-            // the last 2 parameters are ignored
-            const SkGlyph& glyph = glyphCacheProc(cache, &text, 0, 0);
-
-            if (glyph.fWidth) {
-                SkScalar x = pos[0];
-                SkScalar y = scalarsPerPosition == 1 ? constY : pos[1];
-
-                this->drawPackedGlyph(GrGlyph::Pack(glyph.getGlyphID(),
-                                                    glyph.getSubXFixed(),
-                                                    glyph.getSubYFixed()),
-                                      SkScalarToFixed(x),
-                                      SkScalarToFixed(y),
-                                      fontScaler);
-            }
-            pos += scalarsPerPosition;
-        }
-    } else {
-        int alignShift = SkPaint::kCenter_Align == fSkPaint.getTextAlign() ? 1 : 0;
-        while (text < stop) {
-            // the last 2 parameters are ignored
-            const SkGlyph& glyph = glyphCacheProc(cache, &text, 0, 0);
-
-            if (glyph.fWidth) {
-                SkScalar x = pos[0];
-                SkScalar y = scalarsPerPosition == 1 ? constY : pos[1];
-
-                this->drawPackedGlyph(GrGlyph::Pack(glyph.getGlyphID(),
-                                                    glyph.getSubXFixed(),
-                                                    glyph.getSubYFixed()),
-                                      SkScalarToFixed(x) - (glyph.fAdvanceX >> alignShift),
-                                      SkScalarToFixed(y) - (glyph.fAdvanceY >> alignShift),
-                                      fontScaler);
-            }
-            pos += scalarsPerPosition;
-        }
-    }
-
-    this->finish();
-}
diff --git a/gfx/skia/skia/src/gpu/GrDistanceFieldTextContext.h b/gfx/skia/skia/src/gpu/GrDistanceFieldTextContext.h
deleted file mode 100644
index 7676fc16482b..000000000000
--- a/gfx/skia/skia/src/gpu/GrDistanceFieldTextContext.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrDistanceFieldTextContext_DEFINED
-#define GrDistanceFieldTextContext_DEFINED
-
-#include "GrTextContext.h"
-
-class GrTextStrike;
-
-/*
- * This class implements GrTextContext using distance field fonts
- */
-class GrDistanceFieldTextContext : public GrTextContext {
-public:
-    GrDistanceFieldTextContext(GrContext*, const SkDeviceProperties&, bool enable);
-    virtual ~GrDistanceFieldTextContext();
-
-    virtual void drawText(const GrPaint&, const SkPaint&, const char text[], size_t byteLength,
-                          SkScalar x, SkScalar y) SK_OVERRIDE;
-    virtual void drawPosText(const GrPaint&, const SkPaint&,
-                             const char text[], size_t byteLength,
-                             const SkScalar pos[], SkScalar constY,
-                             int scalarsPerPosition) SK_OVERRIDE;
-
-    virtual bool canDraw(const SkPaint& paint) SK_OVERRIDE;
-
-private:
-    GrTextStrike*           fStrike;
-    SkScalar                fTextRatio;
-    bool                    fUseLCDText;
-    bool                    fEnableDFRendering;
-    GrTexture*              fGammaTexture;
-
-    void init(const GrPaint&, const SkPaint&);
-    void drawPackedGlyph(GrGlyph::PackedID, SkFixed left, SkFixed top, GrFontScaler*);
-    void flushGlyphs();                 // automatically called by destructor
-    void finish();
-
-    enum {
-        kMinRequestedGlyphs      = 1,
-        kDefaultRequestedGlyphs  = 64,
-        kMinRequestedVerts       = kMinRequestedGlyphs * 4,
-        kDefaultRequestedVerts   = kDefaultRequestedGlyphs * 4,
-    };
-
-    void*                   fVertices;
-    int                     fCurrVertex;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/GrDrawContext.cpp b/gfx/skia/skia/src/gpu/GrDrawContext.cpp
new file mode 100644
index 000000000000..c07b0602ea6b
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrDrawContext.cpp
@@ -0,0 +1,806 @@
+
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrAtlasTextContext.h"
+#include "GrBatchTest.h"
+#include "GrColor.h"
+#include "GrDrawContext.h"
+#include "GrDrawingManager.h"
+#include "GrOvalRenderer.h"
+#include "GrPathRenderer.h"
+#include "GrRenderTarget.h"
+#include "GrRenderTargetPriv.h"
+#include "GrResourceProvider.h"
+#include "GrStencilAndCoverTextContext.h"
+#include "SkSurfacePriv.h"
+
+#include "batches/GrBatch.h"
+#include "batches/GrDrawAtlasBatch.h"
+#include "batches/GrDrawVerticesBatch.h"
+#include "batches/GrRectBatchFactory.h"
+#include "batches/GrNinePatch.h" // TODO Factory
+
+#define ASSERT_OWNED_RESOURCE(R) SkASSERT(!(R) || (R)->getContext() == fDrawingManager->getContext())
+#define RETURN_IF_ABANDONED        if (fDrawingManager->abandoned()) { return; }
+#define RETURN_FALSE_IF_ABANDONED  if (fDrawingManager->abandoned()) { return false; }
+#define RETURN_NULL_IF_ABANDONED   if (fDrawingManager->abandoned()) { return nullptr; }
+
+class AutoCheckFlush {
+public:
+    AutoCheckFlush(GrDrawingManager* drawingManager) : fDrawingManager(drawingManager) { 
+        SkASSERT(fDrawingManager);
+    }
+    ~AutoCheckFlush() { fDrawingManager->getContext()->flushIfNecessary(); }
+
+private:
+    GrDrawingManager* fDrawingManager;
+};
+
+// In MDB mode the reffing of the 'getLastDrawTarget' call's result allows in-progress
+// drawTargets to be picked up and added to by drawContexts lower in the call
+// stack. When this occurs with a closed drawTarget, a new one will be allocated
+// when the drawContext attempts to use it (via getDrawTarget).
+GrDrawContext::GrDrawContext(GrDrawingManager* drawingMgr,
+                             GrRenderTarget* rt,
+                             const SkSurfaceProps* surfaceProps)
+    : fDrawingManager(drawingMgr)
+    , fRenderTarget(rt)
+    , fDrawTarget(SkSafeRef(rt->getLastDrawTarget()))
+    , fTextContext(nullptr)
+    , fSurfaceProps(SkSurfacePropsCopyOrDefault(surfaceProps)) {
+    SkDEBUGCODE(this->validate();)
+}
+
+#ifdef SK_DEBUG
+void GrDrawContext::validate() const {
+    SkASSERT(fRenderTarget);
+    ASSERT_OWNED_RESOURCE(fRenderTarget);
+
+    if (fDrawTarget && !fDrawTarget->isClosed()) {
+        SkASSERT(fRenderTarget->getLastDrawTarget() == fDrawTarget);
+    }
+}
+#endif
+
+GrDrawContext::~GrDrawContext() {
+    SkSafeUnref(fDrawTarget);
+}
+
+GrDrawTarget* GrDrawContext::getDrawTarget() {
+    SkDEBUGCODE(this->validate();)
+
+    if (!fDrawTarget || fDrawTarget->isClosed()) {
+        fDrawTarget = fDrawingManager->newDrawTarget(fRenderTarget);
+    }
+
+    return fDrawTarget;
+}
+
+void GrDrawContext::copySurface(GrSurface* src, const SkIRect& srcRect, const SkIPoint& dstPoint) {
+    RETURN_IF_ABANDONED
+    SkDEBUGCODE(this->validate();)
+
+    this->getDrawTarget()->copySurface(fRenderTarget, src, srcRect, dstPoint);
+}
+
+void GrDrawContext::drawText(const GrClip& clip, const GrPaint& grPaint,
+                             const SkPaint& skPaint,
+                             const SkMatrix& viewMatrix,
+                             const char text[], size_t byteLength,
+                             SkScalar x, SkScalar y, const SkIRect& clipBounds) {
+    RETURN_IF_ABANDONED
+    SkDEBUGCODE(this->validate();)
+
+    if (!fTextContext) {
+        fTextContext = fDrawingManager->textContext(fSurfaceProps, fRenderTarget);
+    }
+
+    fTextContext->drawText(this, fRenderTarget, clip, grPaint, skPaint, viewMatrix,
+                           text, byteLength, x, y, clipBounds);
+}
+
+void GrDrawContext::drawPosText(const GrClip& clip, const GrPaint& grPaint,
+                                const SkPaint& skPaint,
+                                const SkMatrix& viewMatrix,
+                                const char text[], size_t byteLength,
+                                const SkScalar pos[], int scalarsPerPosition,
+                                const SkPoint& offset, const SkIRect& clipBounds) {
+    RETURN_IF_ABANDONED
+    SkDEBUGCODE(this->validate();)
+
+    if (!fTextContext) {
+        fTextContext = fDrawingManager->textContext(fSurfaceProps, fRenderTarget);
+    }
+
+    fTextContext->drawPosText(this, fRenderTarget, clip, grPaint, skPaint, viewMatrix, text, byteLength,
+                              pos, scalarsPerPosition, offset, clipBounds);
+
+}
+
+void GrDrawContext::drawTextBlob(const GrClip& clip, const SkPaint& skPaint,
+                                 const SkMatrix& viewMatrix, const SkTextBlob* blob,
+                                 SkScalar x, SkScalar y,
+                                 SkDrawFilter* filter, const SkIRect& clipBounds) {
+    RETURN_IF_ABANDONED
+    SkDEBUGCODE(this->validate();)
+
+    if (!fTextContext) {
+        fTextContext = fDrawingManager->textContext(fSurfaceProps, fRenderTarget);
+    }
+
+    fTextContext->drawTextBlob(this, fRenderTarget,
+                               clip, skPaint, viewMatrix, blob, x, y, filter, clipBounds);
+}
+
+void GrDrawContext::drawPathsFromRange(const GrPipelineBuilder* pipelineBuilder,
+                                       const SkMatrix& viewMatrix,
+                                       const SkMatrix& localMatrix,
+                                       GrColor color,
+                                       GrPathRange* range,
+                                       GrPathRangeDraw* draw,
+                                       int /*GrPathRendering::FillType*/ fill,
+                                       const SkRect& bounds) {
+    RETURN_IF_ABANDONED
+    SkDEBUGCODE(this->validate();)
+
+    this->getDrawTarget()->drawPathsFromRange(*pipelineBuilder, viewMatrix, localMatrix, color,
+                                              range, draw, (GrPathRendering::FillType) fill,
+                                              bounds);
+}
+
+void GrDrawContext::discard() {
+    RETURN_IF_ABANDONED
+    SkDEBUGCODE(this->validate();)
+
+    AutoCheckFlush acf(fDrawingManager);
+    this->getDrawTarget()->discard(fRenderTarget);
+}
+
+void GrDrawContext::clear(const SkIRect* rect,
+                          const GrColor color,
+                          bool canIgnoreRect) {
+    RETURN_IF_ABANDONED
+    SkDEBUGCODE(this->validate();)
+
+    AutoCheckFlush acf(fDrawingManager);
+    this->getDrawTarget()->clear(rect, color, canIgnoreRect, fRenderTarget);
+}
+
+
+void GrDrawContext::drawPaint(const GrClip& clip,
+                              const GrPaint& origPaint,
+                              const SkMatrix& viewMatrix) {
+    RETURN_IF_ABANDONED
+    SkDEBUGCODE(this->validate();)
+
+    // set rect to be big enough to fill the space, but not super-huge, so we
+    // don't overflow fixed-point implementations
+    SkRect r;
+    r.setLTRB(0, 0,
+              SkIntToScalar(fRenderTarget->width()),
+              SkIntToScalar(fRenderTarget->height()));
+    SkTCopyOnFirstWrite<GrPaint> paint(origPaint);
+
+    // by definition this fills the entire clip, no need for AA
+    if (paint->isAntiAlias()) {
+        paint.writable()->setAntiAlias(false);
+    }
+
+    bool isPerspective = viewMatrix.hasPerspective();
+
+    // We attempt to map r by the inverse matrix and draw that. mapRect will
+    // map the four corners and bound them with a new rect. This will not
+    // produce a correct result for some perspective matrices.
+    if (!isPerspective) {
+        SkMatrix inverse;
+        if (!viewMatrix.invert(&inverse)) {
+            SkDebugf("Could not invert matrix\n");
+            return;
+        }
+        inverse.mapRect(&r);
+        this->drawRect(clip, *paint, viewMatrix, r);
+    } else {
+        SkMatrix localMatrix;
+        if (!viewMatrix.invert(&localMatrix)) {
+            SkDebugf("Could not invert matrix\n");
+            return;
+        }
+
+        AutoCheckFlush acf(fDrawingManager);
+
+        GrPipelineBuilder pipelineBuilder(*paint, fRenderTarget, clip);
+        this->getDrawTarget()->drawNonAARect(pipelineBuilder,
+                                             paint->getColor(),
+                                             SkMatrix::I(),
+                                             r,
+                                             localMatrix);
+    }
+}
+
+static inline bool rect_contains_inclusive(const SkRect& rect, const SkPoint& point) {
+    return point.fX >= rect.fLeft && point.fX <= rect.fRight &&
+           point.fY >= rect.fTop && point.fY <= rect.fBottom;
+}
+
+static bool view_matrix_ok_for_aa_fill_rect(const SkMatrix& viewMatrix) {
+    return viewMatrix.preservesRightAngles();
+}
+
+static bool should_apply_coverage_aa(const GrPaint& paint, GrRenderTarget* rt) {
+    return paint.isAntiAlias() && !rt->isUnifiedMultisampled();
+}
+
+void GrDrawContext::drawRect(const GrClip& clip,
+                             const GrPaint& paint,
+                             const SkMatrix& viewMatrix,
+                             const SkRect& rect,
+                             const GrStrokeInfo* strokeInfo) {
+    RETURN_IF_ABANDONED
+    SkDEBUGCODE(this->validate();)
+
+    // Dashing should've been devolved to a path in SkGpuDevice
+    SkASSERT(!strokeInfo || !strokeInfo->isDashed());
+
+    AutoCheckFlush acf(fDrawingManager);
+
+    SkScalar width = nullptr == strokeInfo ? -1 : strokeInfo->getWidth();
+
+    // Check if this is a full RT draw and can be replaced with a clear. We don't bother checking
+    // cases where the RT is fully inside a stroke.
+    if (width < 0) {
+        SkRect rtRect;
+        fRenderTarget->getBoundsRect(&rtRect);
+        SkRect clipSpaceRTRect = rtRect;
+        bool checkClip = GrClip::kWideOpen_ClipType != clip.clipType();
+        if (checkClip) {
+            clipSpaceRTRect.offset(SkIntToScalar(clip.origin().fX),
+                                   SkIntToScalar(clip.origin().fY));
+        }
+        // Does the clip contain the entire RT?
+        if (!checkClip || clip.quickContains(clipSpaceRTRect)) {
+            SkMatrix invM;
+            if (!viewMatrix.invert(&invM)) {
+                return;
+            }
+            // Does the rect bound the RT?
+            SkPoint srcSpaceRTQuad[4];
+            invM.mapRectToQuad(srcSpaceRTQuad, rtRect);
+            if (rect_contains_inclusive(rect, srcSpaceRTQuad[0]) &&
+                rect_contains_inclusive(rect, srcSpaceRTQuad[1]) &&
+                rect_contains_inclusive(rect, srcSpaceRTQuad[2]) &&
+                rect_contains_inclusive(rect, srcSpaceRTQuad[3])) {
+                // Will it blend?
+                GrColor clearColor;
+                if (paint.isConstantBlendedColor(&clearColor)) {
+                    this->getDrawTarget()->clear(nullptr, clearColor, true, fRenderTarget);
+                    return;
+                }
+            }
+        }
+    }
+
+    GrColor color = paint.getColor();
+    bool needAA = should_apply_coverage_aa(paint, fRenderTarget);
+
+    // The fill path can handle rotation but not skew
+    // The stroke path needs the rect to remain axis aligned (no rotation or skew)
+    // None of our AA draw rect calls can handle perspective yet
+    bool canApplyAA = width >=0 ? viewMatrix.rectStaysRect() :
+                                  view_matrix_ok_for_aa_fill_rect(viewMatrix);
+
+    GrPipelineBuilder pipelineBuilder(paint, fRenderTarget, clip);
+
+    if (needAA && canApplyAA) {
+        SkASSERT(!viewMatrix.hasPerspective());
+        SkAutoTUnref<GrDrawBatch> batch;
+        if (width >= 0) {
+            batch.reset(GrRectBatchFactory::CreateAAStroke(color, viewMatrix, rect, *strokeInfo));
+        } else {
+            SkRect devBoundRect;
+            viewMatrix.mapRect(&devBoundRect, rect);
+            batch.reset(GrRectBatchFactory::CreateAAFill(color, viewMatrix, rect, devBoundRect));
+        }
+        this->getDrawTarget()->drawBatch(pipelineBuilder, batch);
+        return;
+    }
+
+    if (width >= 0) {
+        // Non-AA hairlines are snapped to pixel centers to make which pixels are hit deterministic
+        bool snapToPixelCenters = (0 == width && !fRenderTarget->isUnifiedMultisampled());
+        SkAutoTUnref<GrDrawBatch> batch(GrRectBatchFactory::CreateNonAAStroke(
+                                        color, viewMatrix, rect, width, snapToPixelCenters));
+
+        // Depending on sub-pixel coordinates and the particular GPU, we may lose a corner of
+        // hairline rects. We jam all the vertices to pixel centers to avoid this, but not when MSAA
+        // is enabled because it can cause ugly artifacts.
+        pipelineBuilder.setState(GrPipelineBuilder::kSnapVerticesToPixelCenters_Flag,
+                                 snapToPixelCenters);
+        this->getDrawTarget()->drawBatch(pipelineBuilder, batch);
+    } else {
+        // filled BW rect
+        this->getDrawTarget()->drawNonAARect(pipelineBuilder, color, viewMatrix, rect);
+    }
+}
+
+void GrDrawContext::fillRectToRect(const GrClip& clip,
+                                   const GrPaint& paint,
+                                   const SkMatrix& viewMatrix,
+                                   const SkRect& rectToDraw,
+                                   const SkRect& localRect) {
+    RETURN_IF_ABANDONED
+    SkDEBUGCODE(this->validate();)
+
+    AutoCheckFlush acf(fDrawingManager);
+
+    GrPipelineBuilder pipelineBuilder(paint, fRenderTarget, clip);
+    if (should_apply_coverage_aa(paint, fRenderTarget) &&
+        view_matrix_ok_for_aa_fill_rect(viewMatrix)) {
+        SkAutoTUnref<GrDrawBatch> batch(GrAAFillRectBatch::CreateWithLocalRect(
+            paint.getColor(), viewMatrix, rectToDraw, localRect));
+        if (batch) {
+            this->drawBatch(&pipelineBuilder, batch);
+        }
+    } else {
+        this->getDrawTarget()->drawNonAARect(pipelineBuilder,
+                                             paint.getColor(),
+                                             viewMatrix,
+                                             rectToDraw,
+                                             localRect);
+    }
+}
+
+void GrDrawContext::fillRectWithLocalMatrix(const GrClip& clip,
+                                            const GrPaint& paint,
+                                            const SkMatrix& viewMatrix,
+                                            const SkRect& rectToDraw,
+                                            const SkMatrix& localMatrix) {
+    RETURN_IF_ABANDONED
+    SkDEBUGCODE(this->validate();)
+
+    AutoCheckFlush acf(fDrawingManager);
+
+    GrPipelineBuilder pipelineBuilder(paint, fRenderTarget, clip);
+
+    if (should_apply_coverage_aa(paint, fRenderTarget) &&
+        view_matrix_ok_for_aa_fill_rect(viewMatrix)) {
+        SkAutoTUnref<GrDrawBatch> batch(GrAAFillRectBatch::Create(
+            paint.getColor(), viewMatrix, localMatrix, rectToDraw));
+        this->drawBatch(&pipelineBuilder, batch);
+    } else {
+        this->getDrawTarget()->drawNonAARect(pipelineBuilder,
+                                             paint.getColor(),
+                                             viewMatrix,
+                                             rectToDraw,
+                                             localMatrix);
+    }
+}
+
+void GrDrawContext::drawVertices(const GrClip& clip,
+                                 const GrPaint& paint,
+                                 const SkMatrix& viewMatrix,
+                                 GrPrimitiveType primitiveType,
+                                 int vertexCount,
+                                 const SkPoint positions[],
+                                 const SkPoint texCoords[],
+                                 const GrColor colors[],
+                                 const uint16_t indices[],
+                                 int indexCount) {
+    RETURN_IF_ABANDONED
+    SkDEBUGCODE(this->validate();)
+
+    AutoCheckFlush acf(fDrawingManager);
+
+    GrPipelineBuilder pipelineBuilder(paint, fRenderTarget, clip);
+
+    // TODO clients should give us bounds
+    SkRect bounds;
+    if (!bounds.setBoundsCheck(positions, vertexCount)) {
+        SkDebugf("drawVertices call empty bounds\n");
+        return;
+    }
+
+    viewMatrix.mapRect(&bounds);
+
+    // If we don't have AA then we outset for a half pixel in each direction to account for
+    // snapping. We also do this for the "hair" primitive types: lines and points since they have
+    // a 1 pixel thickness in device space.
+    if (!paint.isAntiAlias() || GrIsPrimTypeLines(primitiveType) ||
+        kPoints_GrPrimitiveType == primitiveType) {
+        bounds.outset(0.5f, 0.5f);
+    }
+
+    GrDrawVerticesBatch::Geometry geometry;
+    geometry.fColor = paint.getColor();
+    SkAutoTUnref<GrDrawBatch> batch(GrDrawVerticesBatch::Create(geometry, primitiveType, viewMatrix,
+                                                                positions, vertexCount, indices,
+                                                                indexCount, colors, texCoords,
+                                                                bounds));
+
+    this->getDrawTarget()->drawBatch(pipelineBuilder, batch);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+void GrDrawContext::drawAtlas(const GrClip& clip,
+                              const GrPaint& paint,
+                              const SkMatrix& viewMatrix,
+                              int spriteCount,
+                              const SkRSXform xform[],
+                              const SkRect texRect[],
+                              const SkColor colors[]) {
+    RETURN_IF_ABANDONED
+    SkDEBUGCODE(this->validate();)
+
+    AutoCheckFlush acf(fDrawingManager);
+    
+    GrPipelineBuilder pipelineBuilder(paint, fRenderTarget, clip);
+    
+    GrDrawAtlasBatch::Geometry geometry;
+    geometry.fColor = paint.getColor();
+    SkAutoTUnref<GrDrawBatch> batch(GrDrawAtlasBatch::Create(geometry, viewMatrix, spriteCount,
+                                                             xform, texRect, colors));
+    
+    this->getDrawTarget()->drawBatch(pipelineBuilder, batch);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+void GrDrawContext::drawRRect(const GrClip& clip,
+                              const GrPaint& paint,
+                              const SkMatrix& viewMatrix,
+                              const SkRRect& rrect,
+                              const GrStrokeInfo& strokeInfo) {
+    RETURN_IF_ABANDONED
+    SkDEBUGCODE(this->validate();)
+
+    if (rrect.isEmpty()) {
+       return;
+    }
+
+    SkASSERT(!strokeInfo.isDashed()); // this should've been devolved to a path in SkGpuDevice
+
+    AutoCheckFlush acf(fDrawingManager);
+
+    GrPipelineBuilder pipelineBuilder(paint, fRenderTarget, clip);
+    GrColor color = paint.getColor();
+
+    if (!GrOvalRenderer::DrawRRect(this->getDrawTarget(),
+                                   pipelineBuilder,
+                                   color,
+                                   viewMatrix,
+                                   paint.isAntiAlias(),
+                                   rrect,
+                                   strokeInfo)) {
+        SkPath path;
+        path.setIsVolatile(true);
+        path.addRRect(rrect);
+        this->internalDrawPath(&pipelineBuilder, viewMatrix, color,
+                               paint.isAntiAlias(), path, strokeInfo);
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+void GrDrawContext::drawDRRect(const GrClip& clip,
+                               const GrPaint& paint,
+                               const SkMatrix& viewMatrix,
+                               const SkRRect& outer,
+                               const SkRRect& inner) {
+    RETURN_IF_ABANDONED
+    SkDEBUGCODE(this->validate();)
+
+    if (outer.isEmpty()) {
+       return;
+    }
+
+    AutoCheckFlush acf(fDrawingManager);
+
+    GrPipelineBuilder pipelineBuilder(paint, fRenderTarget, clip);
+    GrColor color = paint.getColor();
+    if (!GrOvalRenderer::DrawDRRect(this->getDrawTarget(),
+                                    pipelineBuilder,
+                                    color,
+                                    viewMatrix,
+                                    paint.isAntiAlias(),
+                                    outer,
+                                    inner)) {
+        SkPath path;
+        path.setIsVolatile(true);
+        path.addRRect(inner);
+        path.addRRect(outer);
+        path.setFillType(SkPath::kEvenOdd_FillType);
+
+        GrStrokeInfo fillRec(SkStrokeRec::kFill_InitStyle);
+        this->internalDrawPath(&pipelineBuilder, viewMatrix, color,
+                               paint.isAntiAlias(), path, fillRec);
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+void GrDrawContext::drawOval(const GrClip& clip,
+                             const GrPaint& paint,
+                             const SkMatrix& viewMatrix,
+                             const SkRect& oval,
+                             const GrStrokeInfo& strokeInfo) {
+    RETURN_IF_ABANDONED
+    SkDEBUGCODE(this->validate();)
+
+    if (oval.isEmpty()) {
+       return;
+    }
+
+    SkASSERT(!strokeInfo.isDashed()); // this should've been devolved to a path in SkGpuDevice
+
+    AutoCheckFlush acf(fDrawingManager);
+
+    GrPipelineBuilder pipelineBuilder(paint, fRenderTarget, clip);
+    GrColor color = paint.getColor();
+
+    if (!GrOvalRenderer::DrawOval(this->getDrawTarget(),
+                                  pipelineBuilder,
+                                  color,
+                                  viewMatrix,
+                                  paint.isAntiAlias(),
+                                  oval,
+                                  strokeInfo)) {
+        SkPath path;
+        path.setIsVolatile(true);
+        path.addOval(oval);
+        this->internalDrawPath(&pipelineBuilder, viewMatrix, color,
+                               paint.isAntiAlias(), path, strokeInfo);
+    }
+}
+
+void GrDrawContext::drawImageNine(const GrClip& clip,
+                                  const GrPaint& paint,
+                                  const SkMatrix& viewMatrix,
+                                  int imageWidth,
+                                  int imageHeight,
+                                  const SkIRect& center,
+                                  const SkRect& dst) {
+    RETURN_IF_ABANDONED
+    SkDEBUGCODE(this->validate();)
+
+    AutoCheckFlush acf(fDrawingManager);
+
+    SkAutoTUnref<GrDrawBatch> batch(GrNinePatch::CreateNonAA(paint.getColor(), viewMatrix,
+                                                             imageWidth, imageHeight,
+                                                             center, dst));
+
+    GrPipelineBuilder pipelineBuilder(paint, fRenderTarget, clip);
+    this->getDrawTarget()->drawBatch(pipelineBuilder, batch);
+}
+
+
+// Can 'path' be drawn as a pair of filled nested rectangles?
+static bool is_nested_rects(const SkMatrix& viewMatrix,
+                            const SkPath& path,
+                            const SkStrokeRec& stroke,
+                            SkRect rects[2]) {
+    SkASSERT(stroke.isFillStyle());
+
+    if (path.isInverseFillType()) {
+        return false;
+    }
+
+    // TODO: this restriction could be lifted if we were willing to apply
+    // the matrix to all the points individually rather than just to the rect
+    if (!viewMatrix.rectStaysRect()) {
+        return false;
+    }
+
+    SkPath::Direction dirs[2];
+    if (!path.isNestedFillRects(rects, dirs)) {
+        return false;
+    }
+
+    if (SkPath::kWinding_FillType == path.getFillType() && dirs[0] == dirs[1]) {
+        // The two rects need to be wound opposite to each other
+        return false;
+    }
+
+    // Right now, nested rects where the margin is not the same width
+    // all around do not render correctly
+    const SkScalar* outer = rects[0].asScalars();
+    const SkScalar* inner = rects[1].asScalars();
+
+    bool allEq = true;
+
+    SkScalar margin = SkScalarAbs(outer[0] - inner[0]);
+    bool allGoE1 = margin >= SK_Scalar1;
+
+    for (int i = 1; i < 4; ++i) {
+        SkScalar temp = SkScalarAbs(outer[i] - inner[i]);
+        if (temp < SK_Scalar1) {
+            allGoE1 = false;
+        }
+        if (!SkScalarNearlyEqual(margin, temp)) {
+            allEq = false;
+        }
+    }
+
+    return allEq || allGoE1;
+}
+
+void GrDrawContext::drawBatch(const GrClip& clip,
+                              const GrPaint& paint, GrDrawBatch* batch) {
+    RETURN_IF_ABANDONED
+    SkDEBUGCODE(this->validate();)
+
+    AutoCheckFlush acf(fDrawingManager);
+
+    GrPipelineBuilder pipelineBuilder(paint, fRenderTarget, clip);
+    this->getDrawTarget()->drawBatch(pipelineBuilder, batch);
+}
+
+void GrDrawContext::drawPath(const GrClip& clip,
+                             const GrPaint& paint,
+                             const SkMatrix& viewMatrix,
+                             const SkPath& path,
+                             const GrStrokeInfo& strokeInfo) {
+    RETURN_IF_ABANDONED
+    SkDEBUGCODE(this->validate();)
+
+    if (path.isEmpty()) {
+       if (path.isInverseFillType()) {
+           this->drawPaint(clip, paint, viewMatrix);
+       }
+       return;
+    }
+
+    GrColor color = paint.getColor();
+
+    // Note that internalDrawPath may sw-rasterize the path into a scratch texture.
+    // Scratch textures can be recycled after they are returned to the texture
+    // cache. This presents a potential hazard for buffered drawing. However,
+    // the writePixels that uploads to the scratch will perform a flush so we're
+    // OK.
+    AutoCheckFlush acf(fDrawingManager);
+
+    GrPipelineBuilder pipelineBuilder(paint, fRenderTarget, clip);
+    if (!strokeInfo.isDashed()) {
+        bool useCoverageAA = should_apply_coverage_aa(paint, pipelineBuilder.getRenderTarget());
+
+        if (useCoverageAA && strokeInfo.getWidth() < 0 && !path.isConvex()) {
+            // Concave AA paths are expensive - try to avoid them for special cases
+            SkRect rects[2];
+
+            if (is_nested_rects(viewMatrix, path, strokeInfo, rects)) {
+                SkAutoTUnref<GrDrawBatch> batch(GrRectBatchFactory::CreateAAFillNestedRects(
+                    color, viewMatrix, rects));
+                this->getDrawTarget()->drawBatch(pipelineBuilder, batch);
+                return;
+            }
+        }
+        SkRect ovalRect;
+        bool isOval = path.isOval(&ovalRect);
+
+        if (isOval && !path.isInverseFillType()) {
+            if (GrOvalRenderer::DrawOval(this->getDrawTarget(),
+                                         pipelineBuilder,
+                                         color,
+                                         viewMatrix,
+                                         paint.isAntiAlias(),
+                                         ovalRect,
+                                         strokeInfo)) {
+                return;
+            }
+        }
+    }
+    this->internalDrawPath(&pipelineBuilder, viewMatrix, color,
+                           paint.isAntiAlias(), path, strokeInfo);
+}
+
+void GrDrawContext::internalDrawPath(GrPipelineBuilder* pipelineBuilder,
+                                     const SkMatrix& viewMatrix,
+                                     GrColor color,
+                                     bool useAA,
+                                     const SkPath& path,
+                                     const GrStrokeInfo& strokeInfo) {
+    RETURN_IF_ABANDONED
+    SkASSERT(!path.isEmpty());
+
+    // An Assumption here is that path renderer would use some form of tweaking
+    // the src color (either the input alpha or in the frag shader) to implement
+    // aa. If we have some future driver-mojo path AA that can do the right
+    // thing WRT to the blend then we'll need some query on the PR.
+    bool useCoverageAA = useAA &&
+        !pipelineBuilder->getRenderTarget()->isUnifiedMultisampled();
+    bool isStencilDisabled = pipelineBuilder->getStencil().isDisabled();
+    bool isStencilBufferMSAA = pipelineBuilder->getRenderTarget()->isStencilBufferMultisampled();
+
+    const GrPathRendererChain::DrawType type =
+        useCoverageAA ? GrPathRendererChain::kColorAntiAlias_DrawType
+                      : GrPathRendererChain::kColor_DrawType;
+
+    const SkPath* pathPtr = &path;
+    SkTLazy<SkPath> tmpPath;
+    const GrStrokeInfo* strokeInfoPtr = &strokeInfo;
+
+    GrPathRenderer::CanDrawPathArgs canDrawArgs;
+    canDrawArgs.fShaderCaps = fDrawingManager->getContext()->caps()->shaderCaps();
+    canDrawArgs.fViewMatrix = &viewMatrix;
+    canDrawArgs.fPath = pathPtr;
+    canDrawArgs.fStroke = strokeInfoPtr;
+    canDrawArgs.fAntiAlias = useCoverageAA;
+    canDrawArgs.fIsStencilDisabled = isStencilDisabled;
+    canDrawArgs.fIsStencilBufferMSAA = isStencilBufferMSAA;
+
+    // Try a 1st time without stroking the path and without allowing the SW renderer
+    GrPathRenderer* pr = fDrawingManager->getPathRenderer(canDrawArgs, false, type);
+
+    GrStrokeInfo dashlessStrokeInfo(strokeInfo, false);
+    if (nullptr == pr && strokeInfo.isDashed()) {
+        // It didn't work above, so try again with dashed stroke converted to a dashless stroke.
+        if (!strokeInfo.applyDashToPath(tmpPath.init(), &dashlessStrokeInfo, *pathPtr)) {
+            return;
+        }
+        pathPtr = tmpPath.get();
+        if (pathPtr->isEmpty()) {
+            return;
+        }
+        strokeInfoPtr = &dashlessStrokeInfo;
+
+        canDrawArgs.fPath = pathPtr;
+        canDrawArgs.fStroke = strokeInfoPtr;
+
+        pr = fDrawingManager->getPathRenderer(canDrawArgs, false, type);
+    }
+
+    if (nullptr == pr) {
+        if (!GrPathRenderer::IsStrokeHairlineOrEquivalent(*strokeInfoPtr, viewMatrix, nullptr) &&
+            !strokeInfoPtr->isFillStyle()) {
+            // It didn't work above, so try again with stroke converted to a fill.
+            if (!tmpPath.isValid()) {
+                tmpPath.init();
+            }
+            dashlessStrokeInfo.setResScale(SkScalarAbs(viewMatrix.getMaxScale()));
+            if (!dashlessStrokeInfo.applyToPath(tmpPath.get(), *pathPtr)) {
+                return;
+            }
+            pathPtr = tmpPath.get();
+            if (pathPtr->isEmpty()) {
+                return;
+            }
+            dashlessStrokeInfo.setFillStyle();
+            strokeInfoPtr = &dashlessStrokeInfo;
+        }
+
+        canDrawArgs.fPath = pathPtr;
+        canDrawArgs.fStroke = strokeInfoPtr;
+
+        // This time, allow SW renderer
+        pr = fDrawingManager->getPathRenderer(canDrawArgs, true, type);
+    }
+
+    if (nullptr == pr) {
+#ifdef SK_DEBUG
+        SkDebugf("Unable to find path renderer compatible with path.\n");
+#endif
+        return;
+    }
+
+    GrPathRenderer::DrawPathArgs args;
+    args.fTarget = this->getDrawTarget();
+    args.fResourceProvider = fDrawingManager->getContext()->resourceProvider();
+    args.fPipelineBuilder = pipelineBuilder;
+    args.fColor = color;
+    args.fViewMatrix = &viewMatrix;
+    args.fPath = pathPtr;
+    args.fStroke = strokeInfoPtr;
+    args.fAntiAlias = useCoverageAA;
+    pr->drawPath(args);
+}
+
+void GrDrawContext::drawBatch(GrPipelineBuilder* pipelineBuilder, GrDrawBatch* batch) {
+    RETURN_IF_ABANDONED
+    SkDEBUGCODE(this->validate();)
+
+    this->getDrawTarget()->drawBatch(*pipelineBuilder, batch);
+}
diff --git a/gfx/skia/skia/src/gpu/GrDrawState.cpp b/gfx/skia/skia/src/gpu/GrDrawState.cpp
deleted file mode 100644
index 02c7920f5d07..000000000000
--- a/gfx/skia/skia/src/gpu/GrDrawState.cpp
+++ /dev/null
@@ -1,506 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrDrawState.h"
-#include "GrPaint.h"
-
-bool GrDrawState::setIdentityViewMatrix()  {
-    if (fColorStages.count() || fCoverageStages.count()) {
-        SkMatrix invVM;
-        if (!fViewMatrix.invert(&invVM)) {
-            // sad trombone sound
-            return false;
-        }
-        for (int s = 0; s < fColorStages.count(); ++s) {
-            fColorStages[s].localCoordChange(invVM);
-        }
-        for (int s = 0; s < fCoverageStages.count(); ++s) {
-            fCoverageStages[s].localCoordChange(invVM);
-        }
-    }
-    fViewMatrix.reset();
-    return true;
-}
-
-void GrDrawState::setFromPaint(const GrPaint& paint, const SkMatrix& vm, GrRenderTarget* rt) {
-    SkASSERT(0 == fBlockEffectRemovalCnt || 0 == this->numTotalStages());
-
-    fColorStages.reset();
-    fCoverageStages.reset();
-
-    for (int i = 0; i < paint.numColorStages(); ++i) {
-        fColorStages.push_back(paint.getColorStage(i));
-    }
-
-    for (int i = 0; i < paint.numCoverageStages(); ++i) {
-        fCoverageStages.push_back(paint.getCoverageStage(i));
-    }
-
-    this->setRenderTarget(rt);
-
-    fViewMatrix = vm;
-
-    // These have no equivalent in GrPaint, set them to defaults
-    fBlendConstant = 0x0;
-    fDrawFace = kBoth_DrawFace;
-    fStencilSettings.setDisabled();
-    this->resetStateFlags();
-
-    // Enable the clip bit
-    this->enableState(GrDrawState::kClip_StateBit);
-
-    this->setColor(paint.getColor());
-    this->setState(GrDrawState::kDither_StateBit, paint.isDither());
-    this->setState(GrDrawState::kHWAntialias_StateBit, paint.isAntiAlias());
-
-    this->setBlendFunc(paint.getSrcBlendCoeff(), paint.getDstBlendCoeff());
-    this->setCoverage(paint.getCoverage());
-    this->invalidateBlendOptFlags();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-static size_t vertex_size(const GrVertexAttrib* attribs, int count) {
-    // this works as long as we're 4 byte-aligned
-#ifdef SK_DEBUG
-    uint32_t overlapCheck = 0;
-#endif
-    SkASSERT(count <= GrDrawState::kMaxVertexAttribCnt);
-    size_t size = 0;
-    for (int index = 0; index < count; ++index) {
-        size_t attribSize = GrVertexAttribTypeSize(attribs[index].fType);
-        size += attribSize;
-#ifdef SK_DEBUG
-        size_t dwordCount = attribSize >> 2;
-        uint32_t mask = (1 << dwordCount)-1;
-        size_t offsetShift = attribs[index].fOffset >> 2;
-        SkASSERT(!(overlapCheck & (mask << offsetShift)));
-        overlapCheck |= (mask << offsetShift);
-#endif
-    }
-    return size;
-}
-
-size_t GrDrawState::getVertexSize() const {
-    return vertex_size(fVAPtr, fVACount);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-void GrDrawState::setVertexAttribs(const GrVertexAttrib* attribs, int count) {
-    SkASSERT(count <= kMaxVertexAttribCnt);
-
-    fVAPtr = attribs;
-    fVACount = count;
-
-    // Set all the indices to -1
-    memset(fFixedFunctionVertexAttribIndices,
-           0xff,
-           sizeof(fFixedFunctionVertexAttribIndices));
-#ifdef SK_DEBUG
-    uint32_t overlapCheck = 0;
-#endif
-    for (int i = 0; i < count; ++i) {
-        if (attribs[i].fBinding < kGrFixedFunctionVertexAttribBindingCnt) {
-            // The fixed function attribs can only be specified once
-            SkASSERT(-1 == fFixedFunctionVertexAttribIndices[attribs[i].fBinding]);
-            SkASSERT(GrFixedFunctionVertexAttribVectorCount(attribs[i].fBinding) ==
-                     GrVertexAttribTypeVectorCount(attribs[i].fType));
-            fFixedFunctionVertexAttribIndices[attribs[i].fBinding] = i;
-        }
-#ifdef SK_DEBUG
-        size_t dwordCount = GrVertexAttribTypeSize(attribs[i].fType) >> 2;
-        uint32_t mask = (1 << dwordCount)-1;
-        size_t offsetShift = attribs[i].fOffset >> 2;
-        SkASSERT(!(overlapCheck & (mask << offsetShift)));
-        overlapCheck |= (mask << offsetShift);
-#endif
-    }
-    this->invalidateBlendOptFlags();
-    // Positions must be specified.
-    SkASSERT(-1 != fFixedFunctionVertexAttribIndices[kPosition_GrVertexAttribBinding]);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-void GrDrawState::setDefaultVertexAttribs() {
-    static const GrVertexAttrib kPositionAttrib =
-        {kVec2f_GrVertexAttribType, 0, kPosition_GrVertexAttribBinding};
-
-    fVAPtr = &kPositionAttrib;
-    fVACount = 1;
-
-    // set all the fixed function indices to -1 except position.
-    memset(fFixedFunctionVertexAttribIndices,
-           0xff,
-           sizeof(fFixedFunctionVertexAttribIndices));
-    fFixedFunctionVertexAttribIndices[kPosition_GrVertexAttribBinding] = 0;
-    this->invalidateBlendOptFlags();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-bool GrDrawState::validateVertexAttribs() const {
-    // check consistency of effects and attributes
-    GrSLType slTypes[kMaxVertexAttribCnt];
-    for (int i = 0; i < kMaxVertexAttribCnt; ++i) {
-        slTypes[i] = static_cast<GrSLType>(-1);
-    }
-    int totalStages = fColorStages.count() + fCoverageStages.count();
-    for (int s = 0; s < totalStages; ++s) {
-        int covIdx = s - fColorStages.count();
-        const GrEffectStage& stage = covIdx < 0 ? fColorStages[s] : fCoverageStages[covIdx];
-        const GrEffect* effect = stage.getEffect();
-        SkASSERT(NULL != effect);
-        // make sure that any attribute indices have the correct binding type, that the attrib
-        // type and effect's shader lang type are compatible, and that attributes shared by
-        // multiple effects use the same shader lang type.
-        const int* attributeIndices = stage.getVertexAttribIndices();
-        int numAttributes = stage.getVertexAttribIndexCount();
-        for (int i = 0; i < numAttributes; ++i) {
-            int attribIndex = attributeIndices[i];
-            if (attribIndex >= fVACount ||
-                kEffect_GrVertexAttribBinding != fVAPtr[attribIndex].fBinding) {
-                return false;
-            }
-
-            GrSLType effectSLType = effect->vertexAttribType(i);
-            GrVertexAttribType attribType = fVAPtr[attribIndex].fType;
-            int slVecCount = GrSLTypeVectorCount(effectSLType);
-            int attribVecCount = GrVertexAttribTypeVectorCount(attribType);
-            if (slVecCount != attribVecCount ||
-                (static_cast<GrSLType>(-1) != slTypes[attribIndex] &&
-                    slTypes[attribIndex] != effectSLType)) {
-                return false;
-            }
-            slTypes[attribIndex] = effectSLType;
-        }
-    }
-
-    return true;
-}
-
-bool GrDrawState::willEffectReadDstColor() const {
-    if (!this->isColorWriteDisabled()) {
-        for (int s = 0; s < fColorStages.count(); ++s) {
-            if (fColorStages[s].getEffect()->willReadDstColor()) {
-                return true;
-            }
-        }
-    }
-    for (int s = 0; s < fCoverageStages.count(); ++s) {
-        if (fCoverageStages[s].getEffect()->willReadDstColor()) {
-            return true;
-        }
-    }
-    return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-bool GrDrawState::srcAlphaWillBeOne() const {
-    uint32_t validComponentFlags;
-    GrColor color;
-    // Check if per-vertex or constant color may have partial alpha
-    if (this->hasColorVertexAttribute()) {
-        validComponentFlags = 0;
-        color = 0; // not strictly necessary but we get false alarms from tools about uninit.
-    } else {
-        validComponentFlags = kRGBA_GrColorComponentFlags;
-        color = this->getColor();
-    }
-
-    // Run through the color stages
-    for (int s = 0; s < fColorStages.count(); ++s) {
-        const GrEffect* effect = fColorStages[s].getEffect();
-        effect->getConstantColorComponents(&color, &validComponentFlags);
-    }
-
-    // Check whether coverage is treated as color. If so we run through the coverage computation.
-    if (this->isCoverageDrawing()) {
-        GrColor coverageColor = this->getCoverageColor();
-        GrColor oldColor = color;
-        color = 0;
-        for (int c = 0; c < 4; ++c) {
-            if (validComponentFlags & (1 << c)) {
-                U8CPU a = (oldColor >> (c * 8)) & 0xff;
-                U8CPU b = (coverageColor >> (c * 8)) & 0xff;
-                color |= (SkMulDiv255Round(a, b) << (c * 8));
-            }
-        }
-        for (int s = 0; s < fCoverageStages.count(); ++s) {
-            const GrEffect* effect = fCoverageStages[s].getEffect();
-            effect->getConstantColorComponents(&color, &validComponentFlags);
-        }
-    }
-    return (kA_GrColorComponentFlag & validComponentFlags) && 0xff == GrColorUnpackA(color);
-}
-
-bool GrDrawState::hasSolidCoverage() const {
-    // If we're drawing coverage directly then coverage is effectively treated as color.
-    if (this->isCoverageDrawing()) {
-        return true;
-    }
-
-    GrColor coverage;
-    uint32_t validComponentFlags;
-    // Initialize to an unknown starting coverage if per-vertex coverage is specified.
-    if (this->hasCoverageVertexAttribute()) {
-        validComponentFlags = 0;
-    } else {
-        coverage = fCoverage;
-        validComponentFlags = kRGBA_GrColorComponentFlags;
-    }
-
-    // Run through the coverage stages and see if the coverage will be all ones at the end.
-    for (int s = 0; s < fCoverageStages.count(); ++s) {
-        const GrEffect* effect = fCoverageStages[s].getEffect();
-        effect->getConstantColorComponents(&coverage, &validComponentFlags);
-    }
-    return (kRGBA_GrColorComponentFlags == validComponentFlags) && (0xffffffff == coverage);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-// Some blend modes allow folding a fractional coverage value into the color's alpha channel, while
-// others will blend incorrectly.
-bool GrDrawState::canTweakAlphaForCoverage() const {
-    /*
-     The fractional coverage is f.
-     The src and dst coeffs are Cs and Cd.
-     The dst and src colors are S and D.
-     We want the blend to compute: f*Cs*S + (f*Cd + (1-f))D. By tweaking the source color's alpha
-     we're replacing S with S'=fS. It's obvious that that first term will always be ok. The second
-     term can be rearranged as [1-(1-Cd)f]D. By substituting in the various possibilities for Cd we
-     find that only 1, ISA, and ISC produce the correct destination when applied to S' and D.
-     Also, if we're directly rendering coverage (isCoverageDrawing) then coverage is treated as
-     color by definition.
-     */
-    return kOne_GrBlendCoeff == fDstBlend ||
-           kISA_GrBlendCoeff == fDstBlend ||
-           kISC_GrBlendCoeff == fDstBlend ||
-           this->isCoverageDrawing();
-}
-
-GrDrawState::BlendOptFlags GrDrawState::getBlendOpts(bool forceCoverage,
-                                                     GrBlendCoeff* srcCoeff,
-                                                     GrBlendCoeff* dstCoeff) const {
-    GrBlendCoeff bogusSrcCoeff, bogusDstCoeff;
-    if (NULL == srcCoeff) {
-        srcCoeff = &bogusSrcCoeff;
-    }
-    if (NULL == dstCoeff) {
-        dstCoeff = &bogusDstCoeff;
-    }
-
-    if (forceCoverage) {
-        return this->calcBlendOpts(true, srcCoeff, dstCoeff);
-    }
-
-    if (0 == (fBlendOptFlags & kInvalid_BlendOptFlag)) {
-        *srcCoeff = fOptSrcBlend;
-        *dstCoeff = fOptDstBlend;
-        return fBlendOptFlags;
-    }
-
-    fBlendOptFlags = this->calcBlendOpts(forceCoverage, srcCoeff, dstCoeff);
-    fOptSrcBlend = *srcCoeff;
-    fOptDstBlend = *dstCoeff;
-
-    return fBlendOptFlags;
-}
-
-GrDrawState::BlendOptFlags GrDrawState::calcBlendOpts(bool forceCoverage,
-                                                      GrBlendCoeff* srcCoeff,
-                                                      GrBlendCoeff* dstCoeff) const {
-    *srcCoeff = this->getSrcBlendCoeff();
-    *dstCoeff = this->getDstBlendCoeff();
-
-    if (this->isColorWriteDisabled()) {
-        *srcCoeff = kZero_GrBlendCoeff;
-        *dstCoeff = kOne_GrBlendCoeff;
-    }
-
-    bool srcAIsOne = this->srcAlphaWillBeOne();
-    bool dstCoeffIsOne = kOne_GrBlendCoeff == *dstCoeff ||
-                         (kSA_GrBlendCoeff == *dstCoeff && srcAIsOne);
-    bool dstCoeffIsZero = kZero_GrBlendCoeff == *dstCoeff ||
-                         (kISA_GrBlendCoeff == *dstCoeff && srcAIsOne);
-
-    bool covIsZero = !this->isCoverageDrawing() &&
-                     !this->hasCoverageVertexAttribute() &&
-                     0 == this->getCoverageColor();
-    // When coeffs are (0,1) there is no reason to draw at all, unless
-    // stenciling is enabled. Having color writes disabled is effectively
-    // (0,1). The same applies when coverage is known to be 0.
-    if ((kZero_GrBlendCoeff == *srcCoeff && dstCoeffIsOne) || covIsZero) {
-        if (this->getStencil().doesWrite()) {
-            return kDisableBlend_BlendOptFlag |
-                   kEmitCoverage_BlendOptFlag;
-        } else {
-            return kSkipDraw_BlendOptFlag;
-        }
-    }
-
-    // check for coverage due to constant coverage, per-vertex coverage, or coverage stage
-    bool hasCoverage = forceCoverage ||
-                       0xffffffff != this->getCoverageColor() ||
-                       this->hasCoverageVertexAttribute() ||
-                       fCoverageStages.count() > 0;
-
-    // if we don't have coverage we can check whether the dst
-    // has to read at all. If not, we'll disable blending.
-    if (!hasCoverage) {
-        if (dstCoeffIsZero) {
-            if (kOne_GrBlendCoeff == *srcCoeff) {
-                // if there is no coverage and coeffs are (1,0) then we
-                // won't need to read the dst at all, it gets replaced by src
-                return kDisableBlend_BlendOptFlag;
-            } else if (kZero_GrBlendCoeff == *srcCoeff) {
-                // if the op is "clear" then we don't need to emit a color
-                // or blend, just write transparent black into the dst.
-                *srcCoeff = kOne_GrBlendCoeff;
-                *dstCoeff = kZero_GrBlendCoeff;
-                return kDisableBlend_BlendOptFlag | kEmitTransBlack_BlendOptFlag;
-            }
-        }
-    } else if (this->isCoverageDrawing()) {
-        // we have coverage but we aren't distinguishing it from alpha by request.
-        return kCoverageAsAlpha_BlendOptFlag;
-    } else {
-        // check whether coverage can be safely rolled into alpha
-        // of if we can skip color computation and just emit coverage
-        if (this->canTweakAlphaForCoverage()) {
-            return kCoverageAsAlpha_BlendOptFlag;
-        }
-        if (dstCoeffIsZero) {
-            if (kZero_GrBlendCoeff == *srcCoeff) {
-                // the source color is not included in the blend
-                // the dst coeff is effectively zero so blend works out to:
-                // (c)(0)D + (1-c)D = (1-c)D.
-                *dstCoeff = kISA_GrBlendCoeff;
-                return  kEmitCoverage_BlendOptFlag;
-            } else if (srcAIsOne) {
-                // the dst coeff is effectively zero so blend works out to:
-                // cS + (c)(0)D + (1-c)D = cS + (1-c)D.
-                // If Sa is 1 then we can replace Sa with c
-                // and set dst coeff to 1-Sa.
-                *dstCoeff = kISA_GrBlendCoeff;
-                return  kCoverageAsAlpha_BlendOptFlag;
-            }
-        } else if (dstCoeffIsOne) {
-            // the dst coeff is effectively one so blend works out to:
-            // cS + (c)(1)D + (1-c)D = cS + D.
-            *dstCoeff = kOne_GrBlendCoeff;
-            return  kCoverageAsAlpha_BlendOptFlag;
-        }
-    }
-    if (kOne_GrBlendCoeff == *srcCoeff &&
-        kZero_GrBlendCoeff == *dstCoeff &&
-        this->willEffectReadDstColor()) {
-        // In this case the shader will fully resolve the color, coverage, and dst and we don't
-        // need blending.
-        return kDisableBlend_BlendOptFlag;
-    }
-    return kNone_BlendOpt;
-}
-
-bool GrDrawState::canIgnoreColorAttribute() const {
-    if (fBlendOptFlags & kInvalid_BlendOptFlag) {
-        this->getBlendOpts();
-    }
-    return SkToBool(fBlendOptFlags & (GrDrawState::kEmitTransBlack_BlendOptFlag |
-                                      GrDrawState::kEmitCoverage_BlendOptFlag));
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-
-void GrDrawState::AutoViewMatrixRestore::restore() {
-    if (NULL != fDrawState) {
-        SkDEBUGCODE(--fDrawState->fBlockEffectRemovalCnt;)
-        fDrawState->fViewMatrix = fViewMatrix;
-        SkASSERT(fDrawState->numColorStages() >= fNumColorStages);
-        int numCoverageStages = fSavedCoordChanges.count() - fNumColorStages;
-        SkASSERT(fDrawState->numCoverageStages() >= numCoverageStages);
-
-        int i = 0;
-        for (int s = 0; s < fNumColorStages; ++s, ++i) {
-            fDrawState->fColorStages[s].restoreCoordChange(fSavedCoordChanges[i]);
-        }
-        for (int s = 0; s < numCoverageStages; ++s, ++i) {
-            fDrawState->fCoverageStages[s].restoreCoordChange(fSavedCoordChanges[i]);
-        }
-        fDrawState = NULL;
-    }
-}
-
-void GrDrawState::AutoViewMatrixRestore::set(GrDrawState* drawState,
-                                             const SkMatrix& preconcatMatrix) {
-    this->restore();
-
-    SkASSERT(NULL == fDrawState);
-    if (NULL == drawState || preconcatMatrix.isIdentity()) {
-        return;
-    }
-    fDrawState = drawState;
-
-    fViewMatrix = drawState->getViewMatrix();
-    drawState->fViewMatrix.preConcat(preconcatMatrix);
-
-    this->doEffectCoordChanges(preconcatMatrix);
-    SkDEBUGCODE(++fDrawState->fBlockEffectRemovalCnt;)
-}
-
-bool GrDrawState::AutoViewMatrixRestore::setIdentity(GrDrawState* drawState) {
-    this->restore();
-
-    if (NULL == drawState) {
-        return false;
-    }
-
-    if (drawState->getViewMatrix().isIdentity()) {
-        return true;
-    }
-
-    fViewMatrix = drawState->getViewMatrix();
-    if (0 == drawState->numTotalStages()) {
-        drawState->fViewMatrix.reset();
-        fDrawState = drawState;
-        fNumColorStages = 0;
-        fSavedCoordChanges.reset(0);
-        SkDEBUGCODE(++fDrawState->fBlockEffectRemovalCnt;)
-        return true;
-    } else {
-        SkMatrix inv;
-        if (!fViewMatrix.invert(&inv)) {
-            return false;
-        }
-        drawState->fViewMatrix.reset();
-        fDrawState = drawState;
-        this->doEffectCoordChanges(inv);
-        SkDEBUGCODE(++fDrawState->fBlockEffectRemovalCnt;)
-        return true;
-    }
-}
-
-void GrDrawState::AutoViewMatrixRestore::doEffectCoordChanges(const SkMatrix& coordChangeMatrix) {
-    fSavedCoordChanges.reset(fDrawState->numTotalStages());
-    int i = 0;
-
-    fNumColorStages = fDrawState->numColorStages();
-    for (int s = 0; s < fNumColorStages; ++s, ++i) {
-        fDrawState->fColorStages[s].saveCoordChange(&fSavedCoordChanges[i]);
-        fDrawState->fColorStages[s].localCoordChange(coordChangeMatrix);
-    }
-
-    int numCoverageStages = fDrawState->numCoverageStages();
-    for (int s = 0; s < numCoverageStages; ++s, ++i) {
-        fDrawState->fCoverageStages[s].saveCoordChange(&fSavedCoordChanges[i]);
-        fDrawState->fCoverageStages[s].localCoordChange(coordChangeMatrix);
-    }
-}
diff --git a/gfx/skia/skia/src/gpu/GrDrawState.h b/gfx/skia/skia/src/gpu/GrDrawState.h
deleted file mode 100644
index c1dd9dcd36f6..000000000000
--- a/gfx/skia/skia/src/gpu/GrDrawState.h
+++ /dev/null
@@ -1,1018 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrDrawState_DEFINED
-#define GrDrawState_DEFINED
-
-#include "GrBackendEffectFactory.h"
-#include "GrBlend.h"
-#include "GrColor.h"
-#include "GrEffectStage.h"
-#include "GrPaint.h"
-#include "GrRenderTarget.h"
-#include "GrStencil.h"
-#include "GrTemplates.h"
-#include "GrTexture.h"
-#include "GrTypesPriv.h"
-#include "effects/GrSimpleTextureEffect.h"
-
-#include "SkMatrix.h"
-#include "SkTypes.h"
-#include "SkXfermode.h"
-
-class GrDrawState : public SkRefCnt {
-public:
-    SK_DECLARE_INST_COUNT(GrDrawState)
-
-    GrDrawState() {
-        SkDEBUGCODE(fBlockEffectRemovalCnt = 0;)
-        this->reset();
-    }
-
-    GrDrawState(const SkMatrix& initialViewMatrix) {
-        SkDEBUGCODE(fBlockEffectRemovalCnt = 0;)
-        this->reset(initialViewMatrix);
-    }
-
-    /**
-     * Copies another draw state.
-     **/
-    GrDrawState(const GrDrawState& state) : INHERITED() {
-        SkDEBUGCODE(fBlockEffectRemovalCnt = 0;)
-        *this = state;
-    }
-
-    /**
-     * Copies another draw state with a preconcat to the view matrix.
-     **/
-    GrDrawState(const GrDrawState& state, const SkMatrix& preConcatMatrix) {
-        SkDEBUGCODE(fBlockEffectRemovalCnt = 0;)
-        *this = state;
-        if (!preConcatMatrix.isIdentity()) {
-            for (int i = 0; i < fColorStages.count(); ++i) {
-                fColorStages[i].localCoordChange(preConcatMatrix);
-            }
-            for (int i = 0; i < fCoverageStages.count(); ++i) {
-                fCoverageStages[i].localCoordChange(preConcatMatrix);
-            }
-            this->invalidateBlendOptFlags();
-        }
-    }
-
-    virtual ~GrDrawState() { SkASSERT(0 == fBlockEffectRemovalCnt); }
-
-    /**
-     * Resets to the default state. GrEffects will be removed from all stages.
-     */
-    void reset() { this->onReset(NULL); }
-
-    void reset(const SkMatrix& initialViewMatrix) { this->onReset(&initialViewMatrix); }
-
-    /**
-     * Initializes the GrDrawState based on a GrPaint, view matrix and render target. Note that
-     * GrDrawState encompasses more than GrPaint. Aspects of GrDrawState that have no GrPaint
-     * equivalents are set to default values. Clipping will be enabled.
-     */
-    void setFromPaint(const GrPaint& , const SkMatrix& viewMatrix, GrRenderTarget*);
-
-    ///////////////////////////////////////////////////////////////////////////
-    /// @name Vertex Attributes
-    ////
-
-    enum {
-        kMaxVertexAttribCnt = kLast_GrVertexAttribBinding + 4,
-    };
-
-   /**
-     * The format of vertices is represented as an array of GrVertexAttribs, with each representing
-     * the type of the attribute, its offset, and semantic binding (see GrVertexAttrib in
-     * GrTypesPriv.h).
-     *
-     * The mapping of attributes with kEffect bindings to GrEffect inputs is specified when
-     * setEffect is called.
-     */
-
-    /**
-     *  Sets vertex attributes for next draw. The object driving the templatization
-     *  should be a global GrVertexAttrib array that is never changed.
-     */
-    template <const GrVertexAttrib A[]> void setVertexAttribs(int count) {
-        this->setVertexAttribs(A, count);
-    }
-
-    const GrVertexAttrib* getVertexAttribs() const { return fVAPtr; }
-    int getVertexAttribCount() const { return fVACount; }
-
-    size_t getVertexSize() const;
-
-    /**
-     *  Sets default vertex attributes for next draw. The default is a single attribute:
-     *  {kVec2f_GrVertexAttribType, 0, kPosition_GrVertexAttribType}
-     */
-    void setDefaultVertexAttribs();
-
-    /**
-     * Getters for index into getVertexAttribs() for particular bindings. -1 is returned if the
-     * binding does not appear in the current attribs. These bindings should appear only once in
-     * the attrib array.
-     */
-
-    int positionAttributeIndex() const {
-        return fFixedFunctionVertexAttribIndices[kPosition_GrVertexAttribBinding];
-    }
-    int localCoordAttributeIndex() const {
-        return fFixedFunctionVertexAttribIndices[kLocalCoord_GrVertexAttribBinding];
-    }
-    int colorVertexAttributeIndex() const {
-        return fFixedFunctionVertexAttribIndices[kColor_GrVertexAttribBinding];
-    }
-    int coverageVertexAttributeIndex() const {
-        return fFixedFunctionVertexAttribIndices[kCoverage_GrVertexAttribBinding];
-    }
-
-    bool hasLocalCoordAttribute() const {
-        return -1 != fFixedFunctionVertexAttribIndices[kLocalCoord_GrVertexAttribBinding];
-    }
-    bool hasColorVertexAttribute() const {
-        return -1 != fFixedFunctionVertexAttribIndices[kColor_GrVertexAttribBinding];
-    }
-    bool hasCoverageVertexAttribute() const {
-        return -1 != fFixedFunctionVertexAttribIndices[kCoverage_GrVertexAttribBinding];
-    }
-
-    bool validateVertexAttribs() const;
-
-    /**
-     * Helper to save/restore vertex attribs
-     */
-     class AutoVertexAttribRestore {
-     public:
-         AutoVertexAttribRestore(GrDrawState* drawState) {
-             SkASSERT(NULL != drawState);
-             fDrawState = drawState;
-             fVAPtr = drawState->fVAPtr;
-             fVACount = drawState->fVACount;
-             fDrawState->setDefaultVertexAttribs();
-         }
-
-         ~AutoVertexAttribRestore(){
-             fDrawState->setVertexAttribs(fVAPtr, fVACount);
-         }
-
-     private:
-         GrDrawState*          fDrawState;
-         const GrVertexAttrib* fVAPtr;
-         int                   fVACount;
-     };
-
-    /**
-     * Accessing positions, local coords, or colors, of a vertex within an array is a hassle
-     * involving casts and simple math. These helpers exist to keep GrDrawTarget clients' code a bit
-     * nicer looking.
-     */
-
-    /**
-     * Gets a pointer to a GrPoint of a vertex's position or texture
-     * coordinate.
-     * @param vertices      the vertex array
-     * @param vertexIndex   the index of the vertex in the array
-     * @param vertexSize    the size of each vertex in the array
-     * @param offset        the offset in bytes of the vertex component.
-     *                      Defaults to zero (corresponding to vertex position)
-     * @return pointer to the vertex component as a GrPoint
-     */
-    static SkPoint* GetVertexPoint(void* vertices,
-                                   int vertexIndex,
-                                   int vertexSize,
-                                   int offset = 0) {
-        intptr_t start = GrTCast<intptr_t>(vertices);
-        return GrTCast<SkPoint*>(start + offset +
-                                 vertexIndex * vertexSize);
-    }
-    static const SkPoint* GetVertexPoint(const void* vertices,
-                                         int vertexIndex,
-                                         int vertexSize,
-                                         int offset = 0) {
-        intptr_t start = GrTCast<intptr_t>(vertices);
-        return GrTCast<const SkPoint*>(start + offset +
-                                       vertexIndex * vertexSize);
-    }
-
-    /**
-     * Gets a pointer to a GrColor inside a vertex within a vertex array.
-     * @param vertices      the vetex array
-     * @param vertexIndex   the index of the vertex in the array
-     * @param vertexSize    the size of each vertex in the array
-     * @param offset        the offset in bytes of the vertex color
-     * @return pointer to the vertex component as a GrColor
-     */
-    static GrColor* GetVertexColor(void* vertices,
-                                   int vertexIndex,
-                                   int vertexSize,
-                                   int offset) {
-        intptr_t start = GrTCast<intptr_t>(vertices);
-        return GrTCast<GrColor*>(start + offset +
-                                 vertexIndex * vertexSize);
-    }
-    static const GrColor* GetVertexColor(const void* vertices,
-                                         int vertexIndex,
-                                         int vertexSize,
-                                         int offset) {
-        const intptr_t start = GrTCast<intptr_t>(vertices);
-        return GrTCast<const GrColor*>(start + offset +
-                                       vertexIndex * vertexSize);
-    }
-
-    /// @}
-
-    /**
-     * Determines whether src alpha is guaranteed to be one for all src pixels
-     */
-    bool srcAlphaWillBeOne() const;
-
-    /**
-     * Determines whether the output coverage is guaranteed to be one for all pixels hit by a draw.
-     */
-    bool hasSolidCoverage() const;
-
-    /// @}
-
-    ///////////////////////////////////////////////////////////////////////////
-    /// @name Color
-    ////
-
-    /**
-     *  Sets color for next draw to a premultiplied-alpha color.
-     *
-     *  @param color    the color to set.
-     */
-    void setColor(GrColor color) {
-        fColor = color;
-        this->invalidateBlendOptFlags();
-    }
-
-    GrColor getColor() const { return fColor; }
-
-    /**
-     *  Sets the color to be used for the next draw to be
-     *  (r,g,b,a) = (alpha, alpha, alpha, alpha).
-     *
-     *  @param alpha The alpha value to set as the color.
-     */
-    void setAlpha(uint8_t a) {
-        this->setColor((a << 24) | (a << 16) | (a << 8) | a);
-    }
-
-    /**
-     * Constructor sets the color to be 'color' which is undone by the destructor.
-     */
-    class AutoColorRestore : public ::SkNoncopyable {
-    public:
-        AutoColorRestore() : fDrawState(NULL), fOldColor(0) {}
-
-        AutoColorRestore(GrDrawState* drawState, GrColor color) {
-            fDrawState = NULL;
-            this->set(drawState, color);
-        }
-
-        void reset() {
-            if (NULL != fDrawState) {
-                fDrawState->setColor(fOldColor);
-                fDrawState = NULL;
-            }
-        }
-
-        void set(GrDrawState* drawState, GrColor color) {
-            this->reset();
-            fDrawState = drawState;
-            fOldColor = fDrawState->getColor();
-            fDrawState->setColor(color);
-        }
-
-        ~AutoColorRestore() { this->reset(); }
-    private:
-        GrDrawState*    fDrawState;
-        GrColor         fOldColor;
-    };
-
-    /// @}
-
-    ///////////////////////////////////////////////////////////////////////////
-    /// @name Coverage
-    ////
-
-    /**
-     * Sets a constant fractional coverage to be applied to the draw. The
-     * initial value (after construction or reset()) is 0xff. The constant
-     * coverage is ignored when per-vertex coverage is provided.
-     */
-    void setCoverage(uint8_t coverage) {
-        fCoverage = GrColorPackRGBA(coverage, coverage, coverage, coverage);
-        this->invalidateBlendOptFlags();
-    }
-
-    uint8_t getCoverage() const {
-        return GrColorUnpackR(fCoverage);
-    }
-
-    GrColor getCoverageColor() const {
-        return fCoverage;
-    }
-
-    /// @}
-
-    ///////////////////////////////////////////////////////////////////////////
-    /// @name Effect Stages
-    /// Each stage hosts a GrEffect. The effect produces an output color or coverage in the fragment
-    /// shader. Its inputs are the output from the previous stage as well as some variables
-    /// available to it in the fragment and vertex shader (e.g. the vertex position, the dst color,
-    /// the fragment position, local coordinates).
-    ///
-    /// The stages are divided into two sets, color-computing and coverage-computing. The final
-    /// color stage produces the final pixel color. The coverage-computing stages function exactly
-    /// as the color-computing but the output of the final coverage stage is treated as a fractional
-    /// pixel coverage rather than as input to the src/dst color blend step.
-    ///
-    /// The input color to the first color-stage is either the constant color or interpolated
-    /// per-vertex colors. The input to the first coverage stage is either a constant coverage
-    /// (usually full-coverage) or interpolated per-vertex coverage.
-    ///
-    /// See the documentation of kCoverageDrawing_StateBit for information about disabling the
-    /// the color / coverage distinction.
-    ////
-
-    const GrEffect* addColorEffect(const GrEffect* effect, int attr0 = -1, int attr1 = -1) {
-        SkASSERT(NULL != effect);
-        SkNEW_APPEND_TO_TARRAY(&fColorStages, GrEffectStage, (effect, attr0, attr1));
-        this->invalidateBlendOptFlags();
-        return effect;
-    }
-
-    const GrEffect* addCoverageEffect(const GrEffect* effect, int attr0 = -1, int attr1 = -1) {
-        SkASSERT(NULL != effect);
-        SkNEW_APPEND_TO_TARRAY(&fCoverageStages, GrEffectStage, (effect, attr0, attr1));
-        this->invalidateBlendOptFlags();
-        return effect;
-    }
-
-    /**
-     * Creates a GrSimpleTextureEffect that uses local coords as texture coordinates.
-     */
-    void addColorTextureEffect(GrTexture* texture, const SkMatrix& matrix) {
-        this->addColorEffect(GrSimpleTextureEffect::Create(texture, matrix))->unref();
-    }
-
-    void addCoverageTextureEffect(GrTexture* texture, const SkMatrix& matrix) {
-        this->addCoverageEffect(GrSimpleTextureEffect::Create(texture, matrix))->unref();
-    }
-
-    void addColorTextureEffect(GrTexture* texture,
-                               const SkMatrix& matrix,
-                               const GrTextureParams& params) {
-        this->addColorEffect(GrSimpleTextureEffect::Create(texture, matrix, params))->unref();
-    }
-
-    void addCoverageTextureEffect(GrTexture* texture,
-                                  const SkMatrix& matrix,
-                                  const GrTextureParams& params) {
-        this->addCoverageEffect(GrSimpleTextureEffect::Create(texture, matrix, params))->unref();
-    }
-
-    /**
-     * When this object is destroyed it will remove any effects from the draw state that were added
-     * after its constructor.
-     */
-    class AutoRestoreEffects : public ::SkNoncopyable {
-    public:
-        AutoRestoreEffects() : fDrawState(NULL), fColorEffectCnt(0), fCoverageEffectCnt(0) {}
-
-        AutoRestoreEffects(GrDrawState* ds) : fDrawState(NULL), fColorEffectCnt(0), fCoverageEffectCnt(0) {
-            this->set(ds);
-        }
-
-        ~AutoRestoreEffects() { this->set(NULL); }
-
-        void set(GrDrawState* ds) {
-            if (NULL != fDrawState) {
-                int m = fDrawState->fColorStages.count() - fColorEffectCnt;
-                SkASSERT(m >= 0);
-                fDrawState->fColorStages.pop_back_n(m);
-
-                int n = fDrawState->fCoverageStages.count() - fCoverageEffectCnt;
-                SkASSERT(n >= 0);
-                fDrawState->fCoverageStages.pop_back_n(n);
-                if (m + n > 0) {
-                    fDrawState->invalidateBlendOptFlags();
-                }
-                SkDEBUGCODE(--fDrawState->fBlockEffectRemovalCnt;)
-            }
-            fDrawState = ds;
-            if (NULL != ds) {
-                fColorEffectCnt = ds->fColorStages.count();
-                fCoverageEffectCnt = ds->fCoverageStages.count();
-                SkDEBUGCODE(++ds->fBlockEffectRemovalCnt;)
-            }
-        }
-
-        bool isSet() const { return NULL != fDrawState; }
-
-    private:
-        GrDrawState* fDrawState;
-        int fColorEffectCnt;
-        int fCoverageEffectCnt;
-    };
-
-    int numColorStages() const { return fColorStages.count(); }
-    int numCoverageStages() const { return fCoverageStages.count(); }
-    int numTotalStages() const { return this->numColorStages() + this->numCoverageStages(); }
-
-    const GrEffectStage& getColorStage(int stageIdx) const { return fColorStages[stageIdx]; }
-    const GrEffectStage& getCoverageStage(int stageIdx) const { return fCoverageStages[stageIdx]; }
-
-    /**
-     * Checks whether any of the effects will read the dst pixel color.
-     */
-    bool willEffectReadDstColor() const;
-
-    /// @}
-
-    ///////////////////////////////////////////////////////////////////////////
-    /// @name Blending
-    ////
-
-    /**
-     * Sets the blending function coefficients.
-     *
-     * The blend function will be:
-     *    D' = sat(S*srcCoef + D*dstCoef)
-     *
-     *   where D is the existing destination color, S is the incoming source
-     *   color, and D' is the new destination color that will be written. sat()
-     *   is the saturation function.
-     *
-     * @param srcCoef coefficient applied to the src color.
-     * @param dstCoef coefficient applied to the dst color.
-     */
-    void setBlendFunc(GrBlendCoeff srcCoeff, GrBlendCoeff dstCoeff) {
-        fSrcBlend = srcCoeff;
-        fDstBlend = dstCoeff;
-        this->invalidateBlendOptFlags();
-    #ifdef SK_DEBUG
-        if (GrBlendCoeffRefsDst(dstCoeff)) {
-            GrPrintf("Unexpected dst blend coeff. Won't work correctly with coverage stages.\n");
-        }
-        if (GrBlendCoeffRefsSrc(srcCoeff)) {
-            GrPrintf("Unexpected src blend coeff. Won't work correctly with coverage stages.\n");
-        }
-    #endif
-    }
-
-    GrBlendCoeff getSrcBlendCoeff() const { return fSrcBlend; }
-    GrBlendCoeff getDstBlendCoeff() const { return fDstBlend; }
-
-    void getDstBlendCoeff(GrBlendCoeff* srcBlendCoeff,
-                          GrBlendCoeff* dstBlendCoeff) const {
-        *srcBlendCoeff = fSrcBlend;
-        *dstBlendCoeff = fDstBlend;
-    }
-
-    /**
-     * Sets the blending function constant referenced by the following blending
-     * coefficients:
-     *      kConstC_GrBlendCoeff
-     *      kIConstC_GrBlendCoeff
-     *      kConstA_GrBlendCoeff
-     *      kIConstA_GrBlendCoeff
-     *
-     * @param constant the constant to set
-     */
-    void setBlendConstant(GrColor constant) {
-        fBlendConstant = constant;
-        this->invalidateBlendOptFlags();
-    }
-
-    /**
-     * Retrieves the last value set by setBlendConstant()
-     * @return the blending constant value
-     */
-    GrColor getBlendConstant() const { return fBlendConstant; }
-
-    /**
-     * Determines whether multiplying the computed per-pixel color by the pixel's fractional
-     * coverage before the blend will give the correct final destination color. In general it
-     * will not as coverage is applied after blending.
-     */
-    bool canTweakAlphaForCoverage() const;
-
-    /**
-     * Optimizations for blending / coverage to that can be applied based on the current state.
-     */
-    enum BlendOptFlags {
-        /**
-         * No optimization
-         */
-        kNone_BlendOpt                  = 0,
-        /**
-         * Don't draw at all
-         */
-        kSkipDraw_BlendOptFlag          = 0x1,
-        /**
-         * Emit the src color, disable HW blending (replace dst with src)
-         */
-        kDisableBlend_BlendOptFlag      = 0x2,
-        /**
-         * The coverage value does not have to be computed separately from alpha, the the output
-         * color can be the modulation of the two.
-         */
-        kCoverageAsAlpha_BlendOptFlag   = 0x4,
-        /**
-         * Instead of emitting a src color, emit coverage in the alpha channel and r,g,b are
-         * "don't cares".
-         */
-        kEmitCoverage_BlendOptFlag      = 0x8,
-        /**
-         * Emit transparent black instead of the src color, no need to compute coverage.
-         */
-        kEmitTransBlack_BlendOptFlag    = 0x10,
-        /**
-         * Flag used to invalidate the cached BlendOptFlags, OptSrcCoeff, and OptDstCoeff cached by
-         * the get BlendOpts function. 
-         */
-        kInvalid_BlendOptFlag        = 0x20,
-    };
-    GR_DECL_BITFIELD_OPS_FRIENDS(BlendOptFlags);
-
-    void invalidateBlendOptFlags() {
-        fBlendOptFlags = kInvalid_BlendOptFlag;
-    }
-
-    /**
-     * We don't use suplied vertex color attributes if our blend mode is EmitCoverage or
-     * EmitTransBlack
-     */
-    bool canIgnoreColorAttribute() const;
-
-    /**
-     * Determines what optimizations can be applied based on the blend. The coefficients may have
-     * to be tweaked in order for the optimization to work. srcCoeff and dstCoeff are optional
-     * params that receive the tweaked coefficients. Normally the function looks at the current
-     * state to see if coverage is enabled. By setting forceCoverage the caller can speculatively
-     * determine the blend optimizations that would be used if there was partial pixel coverage.
-     *
-     * Subclasses of GrDrawTarget that actually draw (as opposed to those that just buffer for
-     * playback) must call this function and respect the flags that replace the output color.
-     *
-     * If the cached BlendOptFlags does not have the invalidate bit set, then getBlendOpts will
-     * simply returned the cached flags and coefficients. Otherwise it will calculate the values. 
-     */
-    BlendOptFlags getBlendOpts(bool forceCoverage = false,
-                               GrBlendCoeff* srcCoeff = NULL,
-                               GrBlendCoeff* dstCoeff = NULL) const;
-
-    /// @}
-
-    ///////////////////////////////////////////////////////////////////////////
-    /// @name View Matrix
-    ////
-
-    /**
-     * Sets the view matrix to identity and updates any installed effects to compensate for the
-     * coord system change.
-     */
-    bool setIdentityViewMatrix();
-
-    /**
-     * Retrieves the current view matrix
-     * @return the current view matrix.
-     */
-    const SkMatrix& getViewMatrix() const { return fViewMatrix; }
-
-    /**
-     *  Retrieves the inverse of the current view matrix.
-     *
-     *  If the current view matrix is invertible, return true, and if matrix
-     *  is non-null, copy the inverse into it. If the current view matrix is
-     *  non-invertible, return false and ignore the matrix parameter.
-     *
-     * @param matrix if not null, will receive a copy of the current inverse.
-     */
-    bool getViewInverse(SkMatrix* matrix) const {
-        // TODO: determine whether we really need to leave matrix unmodified
-        // at call sites when inversion fails.
-        SkMatrix inverse;
-        if (fViewMatrix.invert(&inverse)) {
-            if (matrix) {
-                *matrix = inverse;
-            }
-            return true;
-        }
-        return false;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Preconcats the current view matrix and restores the previous view matrix in the destructor.
-     * Effect matrices are automatically adjusted to compensate and adjusted back in the destructor.
-     */
-    class AutoViewMatrixRestore : public ::SkNoncopyable {
-    public:
-        AutoViewMatrixRestore() : fDrawState(NULL) {}
-
-        AutoViewMatrixRestore(GrDrawState* ds, const SkMatrix& preconcatMatrix) {
-            fDrawState = NULL;
-            this->set(ds, preconcatMatrix);
-        }
-
-        ~AutoViewMatrixRestore() { this->restore(); }
-
-        /**
-         * Can be called prior to destructor to restore the original matrix.
-         */
-        void restore();
-
-        void set(GrDrawState* drawState, const SkMatrix& preconcatMatrix);
-
-        /** Sets the draw state's matrix to identity. This can fail because the current view matrix
-            is not invertible. */
-        bool setIdentity(GrDrawState* drawState);
-
-    private:
-        void doEffectCoordChanges(const SkMatrix& coordChangeMatrix);
-
-        GrDrawState*                                        fDrawState;
-        SkMatrix                                            fViewMatrix;
-        int                                                 fNumColorStages;
-        SkAutoSTArray<8, GrEffectStage::SavedCoordChange>   fSavedCoordChanges;
-    };
-
-    /// @}
-
-    ///////////////////////////////////////////////////////////////////////////
-    /// @name Render Target
-    ////
-
-    /**
-     * Sets the render-target used at the next drawing call
-     *
-     * @param target  The render target to set.
-     */
-    void setRenderTarget(GrRenderTarget* target) {
-        fRenderTarget.reset(SkSafeRef(target));
-    }
-
-    /**
-     * Retrieves the currently set render-target.
-     *
-     * @return    The currently set render target.
-     */
-    const GrRenderTarget* getRenderTarget() const { return fRenderTarget.get(); }
-    GrRenderTarget* getRenderTarget() { return fRenderTarget.get(); }
-
-    class AutoRenderTargetRestore : public ::SkNoncopyable {
-    public:
-        AutoRenderTargetRestore() : fDrawState(NULL), fSavedTarget(NULL) {}
-        AutoRenderTargetRestore(GrDrawState* ds, GrRenderTarget* newTarget) {
-            fDrawState = NULL;
-            fSavedTarget = NULL;
-            this->set(ds, newTarget);
-        }
-        ~AutoRenderTargetRestore() { this->restore(); }
-
-        void restore() {
-            if (NULL != fDrawState) {
-                fDrawState->setRenderTarget(fSavedTarget);
-                fDrawState = NULL;
-            }
-            SkSafeSetNull(fSavedTarget);
-        }
-
-        void set(GrDrawState* ds, GrRenderTarget* newTarget) {
-            this->restore();
-
-            if (NULL != ds) {
-                SkASSERT(NULL == fSavedTarget);
-                fSavedTarget = ds->getRenderTarget();
-                SkSafeRef(fSavedTarget);
-                ds->setRenderTarget(newTarget);
-                fDrawState = ds;
-            }
-        }
-    private:
-        GrDrawState* fDrawState;
-        GrRenderTarget* fSavedTarget;
-    };
-
-    /// @}
-
-    ///////////////////////////////////////////////////////////////////////////
-    /// @name Stencil
-    ////
-
-    /**
-     * Sets the stencil settings to use for the next draw.
-     * Changing the clip has the side-effect of possibly zeroing
-     * out the client settable stencil bits. So multipass algorithms
-     * using stencil should not change the clip between passes.
-     * @param settings  the stencil settings to use.
-     */
-    void setStencil(const GrStencilSettings& settings) {
-        fStencilSettings = settings;
-        this->invalidateBlendOptFlags();
-    }
-
-    /**
-     * Shortcut to disable stencil testing and ops.
-     */
-    void disableStencil() {
-        fStencilSettings.setDisabled();
-        this->invalidateBlendOptFlags();
-    }
-
-    const GrStencilSettings& getStencil() const { return fStencilSettings; }
-
-    GrStencilSettings* stencil() { return &fStencilSettings; }
-
-    /// @}
-
-    ///////////////////////////////////////////////////////////////////////////
-    /// @name State Flags
-    ////
-
-    /**
-     *  Flags that affect rendering. Controlled using enable/disableState(). All
-     *  default to disabled.
-     */
-    enum StateBits {
-        /**
-         * Perform dithering. TODO: Re-evaluate whether we need this bit
-         */
-        kDither_StateBit        = 0x01,
-        /**
-         * Perform HW anti-aliasing. This means either HW FSAA, if supported by the render target,
-         * or smooth-line rendering if a line primitive is drawn and line smoothing is supported by
-         * the 3D API.
-         */
-        kHWAntialias_StateBit   = 0x02,
-        /**
-         * Draws will respect the clip, otherwise the clip is ignored.
-         */
-        kClip_StateBit          = 0x04,
-        /**
-         * Disables writing to the color buffer. Useful when performing stencil
-         * operations.
-         */
-        kNoColorWrites_StateBit = 0x08,
-
-        /**
-         * Usually coverage is applied after color blending. The color is blended using the coeffs
-         * specified by setBlendFunc(). The blended color is then combined with dst using coeffs
-         * of src_coverage, 1-src_coverage. Sometimes we are explicitly drawing a coverage mask. In
-         * this case there is no distinction between coverage and color and the caller needs direct
-         * control over the blend coeffs. When set, there will be a single blend step controlled by
-         * setBlendFunc() which will use coverage*color as the src color.
-         */
-         kCoverageDrawing_StateBit = 0x10,
-
-        // Users of the class may add additional bits to the vector
-        kDummyStateBit,
-        kLastPublicStateBit = kDummyStateBit-1,
-    };
-
-    void resetStateFlags() {
-        fFlagBits = 0;
-        this->invalidateBlendOptFlags();
-    }
-
-    /**
-     * Enable render state settings.
-     *
-     * @param stateBits bitfield of StateBits specifying the states to enable
-     */
-    void enableState(uint32_t stateBits) {
-        fFlagBits |= stateBits;
-        this->invalidateBlendOptFlags();
-    }
-
-    /**
-     * Disable render state settings.
-     *
-     * @param stateBits bitfield of StateBits specifying the states to disable
-     */
-    void disableState(uint32_t stateBits) {
-        fFlagBits &= ~(stateBits);
-        this->invalidateBlendOptFlags();
-    }
-
-    /**
-     * Enable or disable stateBits based on a boolean.
-     *
-     * @param stateBits bitfield of StateBits to enable or disable
-     * @param enable    if true enable stateBits, otherwise disable
-     */
-    void setState(uint32_t stateBits, bool enable) {
-        if (enable) {
-            this->enableState(stateBits);
-        } else {
-            this->disableState(stateBits);
-        }
-    }
-
-    bool isDitherState() const {
-        return 0 != (fFlagBits & kDither_StateBit);
-    }
-
-    bool isHWAntialiasState() const {
-        return 0 != (fFlagBits & kHWAntialias_StateBit);
-    }
-
-    bool isClipState() const {
-        return 0 != (fFlagBits & kClip_StateBit);
-    }
-
-    bool isColorWriteDisabled() const {
-        return 0 != (fFlagBits & kNoColorWrites_StateBit);
-    }
-
-    bool isCoverageDrawing() const {
-        return 0 != (fFlagBits & kCoverageDrawing_StateBit);
-    }
-
-    bool isStateFlagEnabled(uint32_t stateBit) const {
-        return 0 != (stateBit & fFlagBits);
-    }
-
-    /// @}
-
-    ///////////////////////////////////////////////////////////////////////////
-    /// @name Face Culling
-    ////
-
-    enum DrawFace {
-        kInvalid_DrawFace = -1,
-
-        kBoth_DrawFace,
-        kCCW_DrawFace,
-        kCW_DrawFace,
-    };
-
-    /**
-     * Controls whether clockwise, counterclockwise, or both faces are drawn.
-     * @param face  the face(s) to draw.
-     */
-    void setDrawFace(DrawFace face) {
-        SkASSERT(kInvalid_DrawFace != face);
-        fDrawFace = face;
-    }
-
-    /**
-     * Gets whether the target is drawing clockwise, counterclockwise,
-     * or both faces.
-     * @return the current draw face(s).
-     */
-    DrawFace getDrawFace() const { return fDrawFace; }
-
-    /// @}
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    bool operator ==(const GrDrawState& that) const {
-        if (fRenderTarget.get() != that.fRenderTarget.get() ||
-            fColorStages.count() != that.fColorStages.count() ||
-            fCoverageStages.count() != that.fCoverageStages.count() ||
-            fColor != that.fColor ||
-            !fViewMatrix.cheapEqualTo(that.fViewMatrix) ||
-            fSrcBlend != that.fSrcBlend ||
-            fDstBlend != that.fDstBlend ||
-            fBlendConstant != that.fBlendConstant ||
-            fFlagBits != that.fFlagBits ||
-            fVACount != that.fVACount ||
-            memcmp(fVAPtr, that.fVAPtr, fVACount * sizeof(GrVertexAttrib)) ||
-            fStencilSettings != that.fStencilSettings ||
-            fCoverage != that.fCoverage ||
-            fDrawFace != that.fDrawFace) {
-            return false;
-        }
-        for (int i = 0; i < fColorStages.count(); i++) {
-            if (fColorStages[i] != that.fColorStages[i]) {
-                return false;
-            }
-        }
-        for (int i = 0; i < fCoverageStages.count(); i++) {
-            if (fCoverageStages[i] != that.fCoverageStages[i]) {
-                return false;
-            }
-        }
-        SkASSERT(0 == memcmp(fFixedFunctionVertexAttribIndices,
-                             that.fFixedFunctionVertexAttribIndices,
-                             sizeof(fFixedFunctionVertexAttribIndices)));
-        return true;
-    }
-    bool operator !=(const GrDrawState& s) const { return !(*this == s); }
-
-    GrDrawState& operator= (const GrDrawState& that) {
-        SkASSERT(0 == fBlockEffectRemovalCnt || 0 == this->numTotalStages());
-        this->setRenderTarget(that.fRenderTarget.get());
-        fColor = that.fColor;
-        fViewMatrix = that.fViewMatrix;
-        fSrcBlend = that.fSrcBlend;
-        fDstBlend = that.fDstBlend;
-        fBlendConstant = that.fBlendConstant;
-        fFlagBits = that.fFlagBits;
-        fVACount = that.fVACount;
-        fVAPtr = that.fVAPtr;
-        fStencilSettings = that.fStencilSettings;
-        fCoverage = that.fCoverage;
-        fDrawFace = that.fDrawFace;
-        fColorStages = that.fColorStages;
-        fCoverageStages = that.fCoverageStages;
-        fOptSrcBlend = that.fOptSrcBlend;
-        fOptDstBlend = that.fOptDstBlend;
-        fBlendOptFlags = that.fBlendOptFlags;
-
-        memcpy(fFixedFunctionVertexAttribIndices,
-               that.fFixedFunctionVertexAttribIndices,
-               sizeof(fFixedFunctionVertexAttribIndices));
-        return *this;
-    }
-
-private:
-
-    void onReset(const SkMatrix* initialViewMatrix) {
-        SkASSERT(0 == fBlockEffectRemovalCnt || 0 == this->numTotalStages());
-        fColorStages.reset();
-        fCoverageStages.reset();
-
-        fRenderTarget.reset(NULL);
-
-        this->setDefaultVertexAttribs();
-
-        fColor = 0xffffffff;
-        if (NULL == initialViewMatrix) {
-            fViewMatrix.reset();
-        } else {
-            fViewMatrix = *initialViewMatrix;
-        }
-        fSrcBlend = kOne_GrBlendCoeff;
-        fDstBlend = kZero_GrBlendCoeff;
-        fBlendConstant = 0x0;
-        fFlagBits = 0x0;
-        fStencilSettings.setDisabled();
-        fCoverage = 0xffffffff;
-        fDrawFace = kBoth_DrawFace;
-
-        this->invalidateBlendOptFlags();
-    }
-
-    BlendOptFlags calcBlendOpts(bool forceCoverage = false,
-                               GrBlendCoeff* srcCoeff = NULL,
-                               GrBlendCoeff* dstCoeff = NULL) const;
-
-    // These fields are roughly sorted by decreasing likelihood of being different in op==
-    SkAutoTUnref<GrRenderTarget>        fRenderTarget;
-    GrColor                             fColor;
-    SkMatrix                            fViewMatrix;
-    GrBlendCoeff                        fSrcBlend;
-    GrBlendCoeff                        fDstBlend;
-    GrColor                             fBlendConstant;
-    uint32_t                            fFlagBits;
-    const GrVertexAttrib*               fVAPtr;
-    int                                 fVACount;
-    GrStencilSettings                   fStencilSettings;
-    GrColor                             fCoverage;
-    DrawFace                            fDrawFace;
-
-    typedef SkSTArray<4, GrEffectStage> EffectStageArray;
-    EffectStageArray                    fColorStages;
-    EffectStageArray                    fCoverageStages;
-    
-    mutable GrBlendCoeff                        fOptSrcBlend;
-    mutable GrBlendCoeff                        fOptDstBlend;
-    mutable BlendOptFlags                       fBlendOptFlags;
-
-    // This is simply a different representation of info in fVertexAttribs and thus does
-    // not need to be compared in op==.
-    int fFixedFunctionVertexAttribIndices[kGrFixedFunctionVertexAttribBindingCnt];
-
-    // Some of the auto restore objects assume that no effects are removed during their lifetime.
-    // This is used to assert that this condition holds.
-    SkDEBUGCODE(int fBlockEffectRemovalCnt;)
-
-    /**
-     *  Sets vertex attributes for next draw.
-     *
-     *  @param attribs    the array of vertex attributes to set.
-     *  @param count      the number of attributes being set, limited to kMaxVertexAttribCnt.
-     */
-    void setVertexAttribs(const GrVertexAttrib attribs[], int count);
-
-    typedef SkRefCnt INHERITED;
-};
-
-GR_MAKE_BITFIELD_OPS(GrDrawState::BlendOptFlags);
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/GrDrawTarget.cpp b/gfx/skia/skia/src/gpu/GrDrawTarget.cpp
index 72204fa14bfe..9b7fa31ab03c 100644
--- a/gfx/skia/skia/src/gpu/GrDrawTarget.cpp
+++ b/gfx/skia/skia/src/gpu/GrDrawTarget.cpp
@@ -6,1160 +6,559 @@
  * found in the LICENSE file.
  */
 
-
-
 #include "GrDrawTarget.h"
-#include "GrContext.h"
-#include "GrDrawTargetCaps.h"
+
+#include "GrCaps.h"
+#include "GrGpu.h"
 #include "GrPath.h"
+#include "GrPipeline.h"
+#include "GrMemoryPool.h"
 #include "GrRenderTarget.h"
+#include "GrResourceProvider.h"
+#include "GrRenderTargetPriv.h"
+#include "GrSurfacePriv.h"
 #include "GrTexture.h"
 #include "GrVertexBuffer.h"
 
+#include "batches/GrClearBatch.h"
+#include "batches/GrCopySurfaceBatch.h"
+#include "batches/GrDiscardBatch.h"
+#include "batches/GrDrawBatch.h"
+#include "batches/GrDrawPathBatch.h"
+#include "batches/GrRectBatchFactory.h"
+#include "batches/GrStencilPathBatch.h"
+
 #include "SkStrokeRec.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
-GrDrawTarget::DrawInfo& GrDrawTarget::DrawInfo::operator =(const DrawInfo& di) {
-    fPrimitiveType  = di.fPrimitiveType;
-    fStartVertex    = di.fStartVertex;
-    fStartIndex     = di.fStartIndex;
-    fVertexCount    = di.fVertexCount;
-    fIndexCount     = di.fIndexCount;
+GrDrawTarget::GrDrawTarget(GrRenderTarget* rt, GrGpu* gpu, GrResourceProvider* resourceProvider,
+                           const Options& options)
+    : fGpu(SkRef(gpu))
+    , fResourceProvider(resourceProvider)
+    , fFlushing(false)
+    , fFlags(0)
+    , fRenderTarget(rt) {
+    // TODO: Stop extracting the context (currently needed by GrClipMaskManager)
+    fContext = fGpu->getContext();
+    fClipMaskManager.reset(new GrClipMaskManager(this, options.fClipBatchToBounds));
 
-    fInstanceCount          = di.fInstanceCount;
-    fVerticesPerInstance    = di.fVerticesPerInstance;
-    fIndicesPerInstance     = di.fIndicesPerInstance;
-
-    if (NULL != di.fDevBounds) {
-        SkASSERT(di.fDevBounds == &di.fDevBoundsStorage);
-        fDevBoundsStorage = di.fDevBoundsStorage;
-        fDevBounds = &fDevBoundsStorage;
-    } else {
-        fDevBounds = NULL;
-    }
-
-    fDstCopy = di.fDstCopy;
-
-    return *this;
-}
+    rt->setLastDrawTarget(this);
 
 #ifdef SK_DEBUG
-bool GrDrawTarget::DrawInfo::isInstanced() const {
-    if (fInstanceCount > 0) {
-        SkASSERT(0 == fIndexCount % fIndicesPerInstance);
-        SkASSERT(0 == fVertexCount % fVerticesPerInstance);
-        SkASSERT(fIndexCount / fIndicesPerInstance == fInstanceCount);
-        SkASSERT(fVertexCount / fVerticesPerInstance == fInstanceCount);
-        // there is no way to specify a non-zero start index to drawIndexedInstances().
-        SkASSERT(0 == fStartIndex);
-        return true;
-    } else {
-        SkASSERT(!fVerticesPerInstance);
-        SkASSERT(!fIndicesPerInstance);
-        return false;
-    }
-}
+    static int debugID = 0;
+    fDebugID = debugID++;
 #endif
-
-void GrDrawTarget::DrawInfo::adjustInstanceCount(int instanceOffset) {
-    SkASSERT(this->isInstanced());
-    SkASSERT(instanceOffset + fInstanceCount >= 0);
-    fInstanceCount += instanceOffset;
-    fVertexCount = fVerticesPerInstance * fInstanceCount;
-    fIndexCount = fIndicesPerInstance * fInstanceCount;
-}
-
-void GrDrawTarget::DrawInfo::adjustStartVertex(int vertexOffset) {
-    fStartVertex += vertexOffset;
-    SkASSERT(fStartVertex >= 0);
-}
-
-void GrDrawTarget::DrawInfo::adjustStartIndex(int indexOffset) {
-    SkASSERT(this->isIndexed());
-    fStartIndex += indexOffset;
-    SkASSERT(fStartIndex >= 0);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-#define DEBUG_INVAL_BUFFER 0xdeadcafe
-#define DEBUG_INVAL_START_IDX -1
-
-GrDrawTarget::GrDrawTarget(GrContext* context)
-    : fClip(NULL)
-    , fContext(context)
-    , fGpuTraceMarkerCount(0) {
-    SkASSERT(NULL != context);
-
-    fDrawState = &fDefaultDrawState;
-    // We assume that fDrawState always owns a ref to the object it points at.
-    fDefaultDrawState.ref();
-    GeometrySrcState& geoSrc = fGeoSrcStateStack.push_back();
-#ifdef SK_DEBUG
-    geoSrc.fVertexCount = DEBUG_INVAL_START_IDX;
-    geoSrc.fVertexBuffer = (GrVertexBuffer*)DEBUG_INVAL_BUFFER;
-    geoSrc.fIndexCount = DEBUG_INVAL_START_IDX;
-    geoSrc.fIndexBuffer = (GrIndexBuffer*)DEBUG_INVAL_BUFFER;
-#endif
-    geoSrc.fVertexSrc = kNone_GeometrySrcType;
-    geoSrc.fIndexSrc  = kNone_GeometrySrcType;
 }
 
 GrDrawTarget::~GrDrawTarget() {
-    SkASSERT(1 == fGeoSrcStateStack.count());
-    SkDEBUGCODE(GeometrySrcState& geoSrc = fGeoSrcStateStack.back());
-    SkASSERT(kNone_GeometrySrcType == geoSrc.fIndexSrc);
-    SkASSERT(kNone_GeometrySrcType == geoSrc.fVertexSrc);
-    fDrawState->unref();
-}
-
-void GrDrawTarget::releaseGeometry() {
-    int popCnt = fGeoSrcStateStack.count() - 1;
-    while (popCnt) {
-        this->popGeometrySource();
-        --popCnt;
+    if (fRenderTarget && this == fRenderTarget->getLastDrawTarget()) {
+        fRenderTarget->setLastDrawTarget(nullptr);
     }
-    this->resetVertexSource();
-    this->resetIndexSource();
-}
 
-void GrDrawTarget::setClip(const GrClipData* clip) {
-    clipWillBeSet(clip);
-    fClip = clip;
-}
-
-const GrClipData* GrDrawTarget::getClip() const {
-    return fClip;
-}
-
-void GrDrawTarget::setDrawState(GrDrawState*  drawState) {
-    SkASSERT(NULL != fDrawState);
-    if (NULL == drawState) {
-        drawState = &fDefaultDrawState;
-    }
-    if (fDrawState != drawState) {
-        fDrawState->unref();
-        drawState->ref();
-        fDrawState = drawState;
-    }
-}
-
-bool GrDrawTarget::reserveVertexSpace(size_t vertexSize,
-                                      int vertexCount,
-                                      void** vertices) {
-    GeometrySrcState& geoSrc = fGeoSrcStateStack.back();
-    bool acquired = false;
-    if (vertexCount > 0) {
-        SkASSERT(NULL != vertices);
-        this->releasePreviousVertexSource();
-        geoSrc.fVertexSrc = kNone_GeometrySrcType;
-
-        acquired = this->onReserveVertexSpace(vertexSize,
-                                              vertexCount,
-                                              vertices);
-    }
-    if (acquired) {
-        geoSrc.fVertexSrc = kReserved_GeometrySrcType;
-        geoSrc.fVertexCount = vertexCount;
-        geoSrc.fVertexSize = vertexSize;
-    } else if (NULL != vertices) {
-        *vertices = NULL;
-    }
-    return acquired;
-}
-
-bool GrDrawTarget::reserveIndexSpace(int indexCount,
-                                     void** indices) {
-    GeometrySrcState& geoSrc = fGeoSrcStateStack.back();
-    bool acquired = false;
-    if (indexCount > 0) {
-        SkASSERT(NULL != indices);
-        this->releasePreviousIndexSource();
-        geoSrc.fIndexSrc = kNone_GeometrySrcType;
-
-        acquired = this->onReserveIndexSpace(indexCount, indices);
-    }
-    if (acquired) {
-        geoSrc.fIndexSrc = kReserved_GeometrySrcType;
-        geoSrc.fIndexCount = indexCount;
-    } else if (NULL != indices) {
-        *indices = NULL;
-    }
-    return acquired;
-
-}
-
-bool GrDrawTarget::reserveVertexAndIndexSpace(int vertexCount,
-                                              int indexCount,
-                                              void** vertices,
-                                              void** indices) {
-    size_t vertexSize = this->drawState()->getVertexSize();
-    this->willReserveVertexAndIndexSpace(vertexCount, indexCount);
-    if (vertexCount) {
-        if (!this->reserveVertexSpace(vertexSize, vertexCount, vertices)) {
-            if (indexCount) {
-                this->resetIndexSource();
-            }
-            return false;
-        }
-    }
-    if (indexCount) {
-        if (!this->reserveIndexSpace(indexCount, indices)) {
-            if (vertexCount) {
-                this->resetVertexSource();
-            }
-            return false;
-        }
-    }
-    return true;
-}
-
-bool GrDrawTarget::geometryHints(int32_t* vertexCount,
-                                 int32_t* indexCount) const {
-    if (NULL != vertexCount) {
-        *vertexCount = -1;
-    }
-    if (NULL != indexCount) {
-        *indexCount = -1;
-    }
-    return false;
-}
-
-void GrDrawTarget::releasePreviousVertexSource() {
-    GeometrySrcState& geoSrc = fGeoSrcStateStack.back();
-    switch (geoSrc.fVertexSrc) {
-        case kNone_GeometrySrcType:
-            break;
-        case kArray_GeometrySrcType:
-            this->releaseVertexArray();
-            break;
-        case kReserved_GeometrySrcType:
-            this->releaseReservedVertexSpace();
-            break;
-        case kBuffer_GeometrySrcType:
-            geoSrc.fVertexBuffer->unref();
-#ifdef SK_DEBUG
-            geoSrc.fVertexBuffer = (GrVertexBuffer*)DEBUG_INVAL_BUFFER;
-#endif
-            break;
-        default:
-            SkFAIL("Unknown Vertex Source Type.");
-            break;
-    }
-}
-
-void GrDrawTarget::releasePreviousIndexSource() {
-    GeometrySrcState& geoSrc = fGeoSrcStateStack.back();
-    switch (geoSrc.fIndexSrc) {
-        case kNone_GeometrySrcType:   // these two don't require
-            break;
-        case kArray_GeometrySrcType:
-            this->releaseIndexArray();
-            break;
-        case kReserved_GeometrySrcType:
-            this->releaseReservedIndexSpace();
-            break;
-        case kBuffer_GeometrySrcType:
-            geoSrc.fIndexBuffer->unref();
-#ifdef SK_DEBUG
-            geoSrc.fIndexBuffer = (GrIndexBuffer*)DEBUG_INVAL_BUFFER;
-#endif
-            break;
-        default:
-            SkFAIL("Unknown Index Source Type.");
-            break;
-    }
-}
-
-void GrDrawTarget::setVertexSourceToArray(const void* vertexArray,
-                                          int vertexCount) {
-    this->releasePreviousVertexSource();
-    GeometrySrcState& geoSrc = fGeoSrcStateStack.back();
-    geoSrc.fVertexSrc = kArray_GeometrySrcType;
-    geoSrc.fVertexSize = this->drawState()->getVertexSize();
-    geoSrc.fVertexCount = vertexCount;
-    this->onSetVertexSourceToArray(vertexArray, vertexCount);
-}
-
-void GrDrawTarget::setIndexSourceToArray(const void* indexArray,
-                                         int indexCount) {
-    this->releasePreviousIndexSource();
-    GeometrySrcState& geoSrc = fGeoSrcStateStack.back();
-    geoSrc.fIndexSrc = kArray_GeometrySrcType;
-    geoSrc.fIndexCount = indexCount;
-    this->onSetIndexSourceToArray(indexArray, indexCount);
-}
-
-void GrDrawTarget::setVertexSourceToBuffer(const GrVertexBuffer* buffer) {
-    this->releasePreviousVertexSource();
-    GeometrySrcState& geoSrc = fGeoSrcStateStack.back();
-    geoSrc.fVertexSrc    = kBuffer_GeometrySrcType;
-    geoSrc.fVertexBuffer = buffer;
-    buffer->ref();
-    geoSrc.fVertexSize = this->drawState()->getVertexSize();
-}
-
-void GrDrawTarget::setIndexSourceToBuffer(const GrIndexBuffer* buffer) {
-    this->releasePreviousIndexSource();
-    GeometrySrcState& geoSrc = fGeoSrcStateStack.back();
-    geoSrc.fIndexSrc     = kBuffer_GeometrySrcType;
-    geoSrc.fIndexBuffer  = buffer;
-    buffer->ref();
-}
-
-void GrDrawTarget::resetVertexSource() {
-    this->releasePreviousVertexSource();
-    GeometrySrcState& geoSrc = fGeoSrcStateStack.back();
-    geoSrc.fVertexSrc = kNone_GeometrySrcType;
-}
-
-void GrDrawTarget::resetIndexSource() {
-    this->releasePreviousIndexSource();
-    GeometrySrcState& geoSrc = fGeoSrcStateStack.back();
-    geoSrc.fIndexSrc = kNone_GeometrySrcType;
-}
-
-void GrDrawTarget::pushGeometrySource() {
-    this->geometrySourceWillPush();
-    GeometrySrcState& newState = fGeoSrcStateStack.push_back();
-    newState.fIndexSrc = kNone_GeometrySrcType;
-    newState.fVertexSrc = kNone_GeometrySrcType;
-#ifdef SK_DEBUG
-    newState.fVertexCount  = ~0;
-    newState.fVertexBuffer = (GrVertexBuffer*)~0;
-    newState.fIndexCount   = ~0;
-    newState.fIndexBuffer = (GrIndexBuffer*)~0;
-#endif
-}
-
-void GrDrawTarget::popGeometrySource() {
-    // if popping last element then pops are unbalanced with pushes
-    SkASSERT(fGeoSrcStateStack.count() > 1);
-
-    this->geometrySourceWillPop(fGeoSrcStateStack.fromBack(1));
-    this->releasePreviousVertexSource();
-    this->releasePreviousIndexSource();
-    fGeoSrcStateStack.pop_back();
+    fGpu->unref();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
-bool GrDrawTarget::checkDraw(GrPrimitiveType type, int startVertex,
-                             int startIndex, int vertexCount,
-                             int indexCount) const {
-    const GrDrawState& drawState = this->getDrawState();
-#ifdef SK_DEBUG
-    const GeometrySrcState& geoSrc = fGeoSrcStateStack.back();
-    int maxVertex = startVertex + vertexCount;
-    int maxValidVertex;
-    switch (geoSrc.fVertexSrc) {
-        case kNone_GeometrySrcType:
-            SkFAIL("Attempting to draw without vertex src.");
-        case kReserved_GeometrySrcType: // fallthrough
-        case kArray_GeometrySrcType:
-            maxValidVertex = geoSrc.fVertexCount;
-            break;
-        case kBuffer_GeometrySrcType:
-            maxValidVertex = static_cast<int>(geoSrc.fVertexBuffer->gpuMemorySize() / geoSrc.fVertexSize);
-            break;
-    }
-    if (maxVertex > maxValidVertex) {
-        SkFAIL("Drawing outside valid vertex range.");
-    }
-    if (indexCount > 0) {
-        int maxIndex = startIndex + indexCount;
-        int maxValidIndex;
-        switch (geoSrc.fIndexSrc) {
-            case kNone_GeometrySrcType:
-                SkFAIL("Attempting to draw indexed geom without index src.");
-            case kReserved_GeometrySrcType: // fallthrough
-            case kArray_GeometrySrcType:
-                maxValidIndex = geoSrc.fIndexCount;
-                break;
-            case kBuffer_GeometrySrcType:
-                maxValidIndex = static_cast<int>(geoSrc.fIndexBuffer->gpuMemorySize() / sizeof(uint16_t));
-                break;
-        }
-        if (maxIndex > maxValidIndex) {
-            SkFAIL("Index reads outside valid index range.");
-        }
+// Add a GrDrawTarget-based dependency
+void GrDrawTarget::addDependency(GrDrawTarget* dependedOn) {
+    SkASSERT(!dependedOn->dependsOn(this));  // loops are bad
+
+    if (this->dependsOn(dependedOn)) {
+        return;  // don't add duplicate dependencies
     }
 
-    SkASSERT(NULL != drawState.getRenderTarget());
-
-    for (int s = 0; s < drawState.numColorStages(); ++s) {
-        const GrEffect* effect = drawState.getColorStage(s).getEffect();
-        int numTextures = effect->numTextures();
-        for (int t = 0; t < numTextures; ++t) {
-            GrTexture* texture = effect->texture(t);
-            SkASSERT(texture->asRenderTarget() != drawState.getRenderTarget());
-        }
-    }
-    for (int s = 0; s < drawState.numCoverageStages(); ++s) {
-        const GrEffect* effect = drawState.getCoverageStage(s).getEffect();
-        int numTextures = effect->numTextures();
-        for (int t = 0; t < numTextures; ++t) {
-            GrTexture* texture = effect->texture(t);
-            SkASSERT(texture->asRenderTarget() != drawState.getRenderTarget());
-        }
-    }
-
-    SkASSERT(drawState.validateVertexAttribs());
-#endif
-    if (NULL == drawState.getRenderTarget()) {
-        return false;
-    }
-    return true;
+    *fDependencies.push() = dependedOn;
 }
 
-bool GrDrawTarget::setupDstReadIfNecessary(GrDeviceCoordTexture* dstCopy, const SkRect* drawBounds) {
-    if (this->caps()->dstReadInShaderSupport() || !this->getDrawState().willEffectReadDstColor()) {
+// Convert from a GrSurface-based dependency to a GrDrawTarget one
+void GrDrawTarget::addDependency(GrSurface* dependedOn) {
+    if (dependedOn->asRenderTarget() && dependedOn->asRenderTarget()->getLastDrawTarget()) {
+        // If it is still receiving dependencies, this DT shouldn't be closed
+        SkASSERT(!this->isClosed());
+
+        GrDrawTarget* dt = dependedOn->asRenderTarget()->getLastDrawTarget();
+        if (dt == this) {
+            // self-read - presumably for dst reads
+        } else {
+            this->addDependency(dt);
+
+            // Can't make it closed in the self-read case
+            dt->makeClosed();
+        }
+    }
+}
+
+#ifdef SK_DEBUG
+void GrDrawTarget::dump() const {
+    SkDebugf("--------------------------------------------------------------\n");
+    SkDebugf("node: %d -> RT: %d\n", fDebugID, fRenderTarget ? fRenderTarget->getUniqueID() : -1);
+    SkDebugf("relies On (%d): ", fDependencies.count());
+    for (int i = 0; i < fDependencies.count(); ++i) {
+        SkDebugf("%d, ", fDependencies[i]->fDebugID);
+    }
+    SkDebugf("\n");
+    SkDebugf("batches (%d):\n", fBatches.count());
+    for (int i = 0; i < fBatches.count(); ++i) {
+#if 0
+        SkDebugf("*******************************\n");
+#endif
+        SkDebugf("%d: %s\n", i, fBatches[i]->name());
+#if 0
+        SkString str = fBatches[i]->dumpInfo();
+        SkDebugf("%s\n", str.c_str());
+#endif
+    }
+}
+#endif
+
+bool GrDrawTarget::setupDstReadIfNecessary(const GrPipelineBuilder& pipelineBuilder,
+                                           const GrPipelineOptimizations& optimizations,
+                                           GrXferProcessor::DstTexture* dstTexture,
+                                           const SkRect& batchBounds) {
+    SkRect bounds = batchBounds;
+    bounds.outset(0.5f, 0.5f);
+
+    if (!pipelineBuilder.willXPNeedDstTexture(*this->caps(), optimizations)) {
         return true;
     }
-    GrRenderTarget* rt = this->drawState()->getRenderTarget();
-    SkIRect copyRect;
-    const GrClipData* clip = this->getClip();
-    clip->getConservativeBounds(rt, &copyRect);
 
-    if (NULL != drawBounds) {
-        SkIRect drawIBounds;
-        drawBounds->roundOut(&drawIBounds);
-        if (!copyRect.intersect(drawIBounds)) {
-#ifdef SK_DEBUG
-            GrPrintf("Missed an early reject. Bailing on draw from setupDstReadIfNecessary.\n");
-#endif
-            return false;
+    GrRenderTarget* rt = pipelineBuilder.getRenderTarget();
+
+    if (this->caps()->textureBarrierSupport()) {
+        if (GrTexture* rtTex = rt->asTexture()) {
+            // The render target is a texture, so we can read from it directly in the shader. The XP
+            // will be responsible to detect this situation and request a texture barrier.
+            dstTexture->setTexture(rtTex);
+            dstTexture->setOffset(0, 0);
+            return true;
         }
-    } else {
+    }
+
+    SkIRect copyRect;
+    pipelineBuilder.clip().getConservativeBounds(rt->width(), rt->height(), &copyRect);
+
+    SkIRect drawIBounds;
+    bounds.roundOut(&drawIBounds);
+    if (!copyRect.intersect(drawIBounds)) {
 #ifdef SK_DEBUG
-        //GrPrintf("No dev bounds when dst copy is made.\n");
+        GrCapsDebugf(this->caps(), "Missed an early reject. "
+                                   "Bailing on draw from setupDstReadIfNecessary.\n");
 #endif
+        return false;
     }
 
     // MSAA consideration: When there is support for reading MSAA samples in the shader we could
     // have per-sample dst values by making the copy multisampled.
-    GrTextureDesc desc;
-    this->initCopySurfaceDstDesc(rt, &desc);
+    GrSurfaceDesc desc;
+    if (!fGpu->initCopySurfaceDstDesc(rt, &desc)) {
+        desc.fOrigin = kDefault_GrSurfaceOrigin;
+        desc.fFlags = kRenderTarget_GrSurfaceFlag;
+        desc.fConfig = rt->config();
+    }
+
     desc.fWidth = copyRect.width();
     desc.fHeight = copyRect.height();
 
-    GrAutoScratchTexture ast(fContext, desc, GrContext::kApprox_ScratchTexMatch);
+    static const uint32_t kFlags = 0;
+    SkAutoTUnref<GrTexture> copy(fResourceProvider->createApproxTexture(desc, kFlags));
 
-    if (NULL == ast.texture()) {
-        GrPrintf("Failed to create temporary copy of destination texture.\n");
+    if (!copy) {
+        SkDebugf("Failed to create temporary copy of destination texture.\n");
         return false;
     }
     SkIPoint dstPoint = {0, 0};
-    if (this->copySurface(ast.texture(), rt, copyRect, dstPoint)) {
-        dstCopy->setTexture(ast.texture());
-        dstCopy->setOffset(copyRect.fLeft, copyRect.fTop);
-        return true;
-    } else {
-        return false;
-    }
-}
-
-void GrDrawTarget::drawIndexed(GrPrimitiveType type,
-                               int startVertex,
-                               int startIndex,
-                               int vertexCount,
-                               int indexCount,
-                               const SkRect* devBounds) {
-    if (indexCount > 0 && this->checkDraw(type, startVertex, startIndex, vertexCount, indexCount)) {
-        DrawInfo info;
-        info.fPrimitiveType = type;
-        info.fStartVertex   = startVertex;
-        info.fStartIndex    = startIndex;
-        info.fVertexCount   = vertexCount;
-        info.fIndexCount    = indexCount;
-
-        info.fInstanceCount         = 0;
-        info.fVerticesPerInstance   = 0;
-        info.fIndicesPerInstance    = 0;
-
-        if (NULL != devBounds) {
-            info.setDevBounds(*devBounds);
-        }
-        // TODO: We should continue with incorrect blending.
-        if (!this->setupDstReadIfNecessary(&info)) {
-            return;
-        }
-        this->onDraw(info);
-    }
-}
-
-void GrDrawTarget::drawNonIndexed(GrPrimitiveType type,
-                                  int startVertex,
-                                  int vertexCount,
-                                  const SkRect* devBounds) {
-    if (vertexCount > 0 && this->checkDraw(type, startVertex, -1, vertexCount, -1)) {
-        DrawInfo info;
-        info.fPrimitiveType = type;
-        info.fStartVertex   = startVertex;
-        info.fStartIndex    = 0;
-        info.fVertexCount   = vertexCount;
-        info.fIndexCount    = 0;
-
-        info.fInstanceCount         = 0;
-        info.fVerticesPerInstance   = 0;
-        info.fIndicesPerInstance    = 0;
-
-        if (NULL != devBounds) {
-            info.setDevBounds(*devBounds);
-        }
-        // TODO: We should continue with incorrect blending.
-        if (!this->setupDstReadIfNecessary(&info)) {
-            return;
-        }
-        this->onDraw(info);
-    }
-}
-
-void GrDrawTarget::stencilPath(const GrPath* path, SkPath::FillType fill) {
-    // TODO: extract portions of checkDraw that are relevant to path stenciling.
-    SkASSERT(NULL != path);
-    SkASSERT(this->caps()->pathRenderingSupport());
-    SkASSERT(!SkPath::IsInverseFillType(fill));
-    this->onStencilPath(path, fill);
-}
-
-void GrDrawTarget::drawPath(const GrPath* path, SkPath::FillType fill) {
-    // TODO: extract portions of checkDraw that are relevant to path rendering.
-    SkASSERT(NULL != path);
-    SkASSERT(this->caps()->pathRenderingSupport());
-    const GrDrawState* drawState = &getDrawState();
-
-    SkRect devBounds;
-    if (SkPath::IsInverseFillType(fill)) {
-        devBounds = SkRect::MakeWH(SkIntToScalar(drawState->getRenderTarget()->width()),
-                                   SkIntToScalar(drawState->getRenderTarget()->height()));
-    } else {
-        devBounds = path->getBounds();
-    }
-    SkMatrix viewM = drawState->getViewMatrix();
-    viewM.mapRect(&devBounds);
-
-    GrDeviceCoordTexture dstCopy;
-    if (!this->setupDstReadIfNecessary(&dstCopy, &devBounds)) {
-        return;
-    }
-
-    this->onDrawPath(path, fill, dstCopy.texture() ? &dstCopy : NULL);
-}
-
-void GrDrawTarget::drawPaths(const GrPathRange* pathRange,
-                             const uint32_t indices[], int count,
-                             const float transforms[], PathTransformType transformsType,
-                             SkPath::FillType fill) {
-    SkASSERT(this->caps()->pathRenderingSupport());
-    SkASSERT(NULL != pathRange);
-    SkASSERT(NULL != indices);
-    SkASSERT(NULL != transforms);
-
-    // Don't compute a bounding box for setupDstReadIfNecessary(), we'll opt
-    // instead for it to just copy the entire dst. Realistically this is a moot
-    // point, because any context that supports NV_path_rendering will also
-    // support NV_blend_equation_advanced.
-    GrDeviceCoordTexture dstCopy;
-    if (!this->setupDstReadIfNecessary(&dstCopy, NULL)) {
-        return;
-    }
-
-    this->onDrawPaths(pathRange, indices, count, transforms, transformsType, fill,
-                      dstCopy.texture() ? &dstCopy : NULL);
-}
-
-typedef GrTraceMarkerSet::Iter TMIter;
-void GrDrawTarget::saveActiveTraceMarkers() {
-    if (this->caps()->gpuTracingSupport()) {
-        SkASSERT(0 == fStoredTraceMarkers.count());
-        fStoredTraceMarkers.addSet(fActiveTraceMarkers);
-        for (TMIter iter = fStoredTraceMarkers.begin(); iter != fStoredTraceMarkers.end(); ++iter) {
-            this->removeGpuTraceMarker(&(*iter));
-        }
-    }
-}
-
-void GrDrawTarget::restoreActiveTraceMarkers() {
-    if (this->caps()->gpuTracingSupport()) {
-        SkASSERT(0 == fActiveTraceMarkers.count());
-        for (TMIter iter = fStoredTraceMarkers.begin(); iter != fStoredTraceMarkers.end(); ++iter) {
-            this->addGpuTraceMarker(&(*iter));
-        }
-        for (TMIter iter = fActiveTraceMarkers.begin(); iter != fActiveTraceMarkers.end(); ++iter) {
-            this->fStoredTraceMarkers.remove(*iter);
-        }
-    }
-}
-
-void GrDrawTarget::addGpuTraceMarker(const GrGpuTraceMarker* marker) {
-    if (this->caps()->gpuTracingSupport()) {
-        SkASSERT(fGpuTraceMarkerCount >= 0);
-        this->fActiveTraceMarkers.add(*marker);
-        this->didAddGpuTraceMarker();
-        ++fGpuTraceMarkerCount;
-    }
-}
-
-void GrDrawTarget::removeGpuTraceMarker(const GrGpuTraceMarker* marker) {
-    if (this->caps()->gpuTracingSupport()) {
-        SkASSERT(fGpuTraceMarkerCount >= 1);
-        this->fActiveTraceMarkers.remove(*marker);
-        this->didRemoveGpuTraceMarker();
-        --fGpuTraceMarkerCount;
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-bool GrDrawTarget::willUseHWAALines() const {
-    // There is a conflict between using smooth lines and our use of premultiplied alpha. Smooth
-    // lines tweak the incoming alpha value but not in a premul-alpha way. So we only use them when
-    // our alpha is 0xff and tweaking the color for partial coverage is OK
-    if (!this->caps()->hwAALineSupport() ||
-        !this->getDrawState().isHWAntialiasState()) {
-        return false;
-    }
-    GrDrawState::BlendOptFlags opts = this->getDrawState().getBlendOpts();
-    return (GrDrawState::kDisableBlend_BlendOptFlag & opts) &&
-           (GrDrawState::kCoverageAsAlpha_BlendOptFlag & opts);
-}
-
-bool GrDrawTarget::canApplyCoverage() const {
-    // we can correctly apply coverage if a) we have dual source blending
-    // or b) one of our blend optimizations applies.
-    return this->caps()->dualSourceBlendingSupport() ||
-           GrDrawState::kNone_BlendOpt != this->getDrawState().getBlendOpts(true);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-void GrDrawTarget::drawIndexedInstances(GrPrimitiveType type,
-                                        int instanceCount,
-                                        int verticesPerInstance,
-                                        int indicesPerInstance,
-                                        const SkRect* devBounds) {
-    if (!verticesPerInstance || !indicesPerInstance) {
-        return;
-    }
-
-    int maxInstancesPerDraw = this->indexCountInCurrentSource() / indicesPerInstance;
-    if (!maxInstancesPerDraw) {
-        return;
-    }
-
-    DrawInfo info;
-    info.fPrimitiveType = type;
-    info.fStartIndex = 0;
-    info.fStartVertex = 0;
-    info.fIndicesPerInstance = indicesPerInstance;
-    info.fVerticesPerInstance = verticesPerInstance;
-
-    // Set the same bounds for all the draws.
-    if (NULL != devBounds) {
-        info.setDevBounds(*devBounds);
-    }
-    // TODO: We should continue with incorrect blending.
-    if (!this->setupDstReadIfNecessary(&info)) {
-        return;
-    }
-
-    while (instanceCount) {
-        info.fInstanceCount = SkTMin(instanceCount, maxInstancesPerDraw);
-        info.fVertexCount = info.fInstanceCount * verticesPerInstance;
-        info.fIndexCount = info.fInstanceCount * indicesPerInstance;
-
-        if (this->checkDraw(type,
-                            info.fStartVertex,
-                            info.fStartIndex,
-                            info.fVertexCount,
-                            info.fIndexCount)) {
-            this->onDraw(info);
-        }
-        info.fStartVertex += info.fVertexCount;
-        instanceCount -= info.fInstanceCount;
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-namespace {
-
-// position + (optional) texture coord
-extern const GrVertexAttrib gBWRectPosUVAttribs[] = {
-    {kVec2f_GrVertexAttribType, 0,               kPosition_GrVertexAttribBinding},
-    {kVec2f_GrVertexAttribType, sizeof(SkPoint), kLocalCoord_GrVertexAttribBinding}
-};
-
-void set_vertex_attributes(GrDrawState* drawState, bool hasUVs) {
-    if (hasUVs) {
-        drawState->setVertexAttribs<gBWRectPosUVAttribs>(2);
-    } else {
-        drawState->setVertexAttribs<gBWRectPosUVAttribs>(1);
-    }
-}
-
-};
-
-void GrDrawTarget::onDrawRect(const SkRect& rect,
-                              const SkMatrix* matrix,
-                              const SkRect* localRect,
-                              const SkMatrix* localMatrix) {
-
-    GrDrawState::AutoViewMatrixRestore avmr;
-    if (NULL != matrix) {
-        avmr.set(this->drawState(), *matrix);
-    }
-
-    set_vertex_attributes(this->drawState(), NULL != localRect);
-
-    AutoReleaseGeometry geo(this, 4, 0);
-    if (!geo.succeeded()) {
-        GrPrintf("Failed to get space for vertices!\n");
-        return;
-    }
-
-    size_t vsize = this->drawState()->getVertexSize();
-    geo.positions()->setRectFan(rect.fLeft, rect.fTop, rect.fRight, rect.fBottom, vsize);
-    if (NULL != localRect) {
-        SkPoint* coords = GrTCast<SkPoint*>(GrTCast<intptr_t>(geo.vertices()) +
-                                            sizeof(SkPoint));
-        coords->setRectFan(localRect->fLeft, localRect->fTop,
-                           localRect->fRight, localRect->fBottom,
-                           vsize);
-        if (NULL != localMatrix) {
-            localMatrix->mapPointsWithStride(coords, vsize, 4);
-        }
-    }
-    SkRect bounds;
-    this->getDrawState().getViewMatrix().mapRect(&bounds, rect);
-
-    this->drawNonIndexed(kTriangleFan_GrPrimitiveType, 0, 4, &bounds);
-}
-
-void GrDrawTarget::clipWillBeSet(const GrClipData* clipData) {
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-GrDrawTarget::AutoStateRestore::AutoStateRestore() {
-    fDrawTarget = NULL;
-}
-
-GrDrawTarget::AutoStateRestore::AutoStateRestore(GrDrawTarget* target,
-                                                 ASRInit init,
-                                                 const SkMatrix* vm) {
-    fDrawTarget = NULL;
-    this->set(target, init, vm);
-}
-
-GrDrawTarget::AutoStateRestore::~AutoStateRestore() {
-    if (NULL != fDrawTarget) {
-        fDrawTarget->setDrawState(fSavedState);
-        fSavedState->unref();
-    }
-}
-
-void GrDrawTarget::AutoStateRestore::set(GrDrawTarget* target, ASRInit init, const SkMatrix* vm) {
-    SkASSERT(NULL == fDrawTarget);
-    fDrawTarget = target;
-    fSavedState = target->drawState();
-    SkASSERT(fSavedState);
-    fSavedState->ref();
-    if (kReset_ASRInit == init) {
-        if (NULL == vm) {
-            // calls the default cons
-            fTempState.init();
-        } else {
-            SkNEW_IN_TLAZY(&fTempState, GrDrawState, (*vm));
-        }
-    } else {
-        SkASSERT(kPreserve_ASRInit == init);
-        if (NULL == vm) {
-            fTempState.set(*fSavedState);
-        } else {
-            SkNEW_IN_TLAZY(&fTempState, GrDrawState, (*fSavedState, *vm));
-        }
-    }
-    target->setDrawState(fTempState.get());
-}
-
-bool GrDrawTarget::AutoStateRestore::setIdentity(GrDrawTarget* target, ASRInit init) {
-    SkASSERT(NULL == fDrawTarget);
-    fDrawTarget = target;
-    fSavedState = target->drawState();
-    SkASSERT(fSavedState);
-    fSavedState->ref();
-    if (kReset_ASRInit == init) {
-        // calls the default cons
-        fTempState.init();
-    } else {
-        SkASSERT(kPreserve_ASRInit == init);
-        // calls the copy cons
-        fTempState.set(*fSavedState);
-        if (!fTempState.get()->setIdentityViewMatrix()) {
-            // let go of any resources held by the temp
-            fTempState.get()->reset();
-            fDrawTarget = NULL;
-            fSavedState->unref();
-            fSavedState = NULL;
-            return false;
-        }
-    }
-    target->setDrawState(fTempState.get());
+    this->copySurface(copy, rt, copyRect, dstPoint);
+    dstTexture->setTexture(copy);
+    dstTexture->setOffset(copyRect.fLeft, copyRect.fTop);
     return true;
 }
 
+void GrDrawTarget::prepareBatches(GrBatchFlushState* flushState) {
+    if (fFlushing) {
+        return;
+    }
+    fFlushing = true;
+
+    // Semi-usually the drawTargets are already closed at this point, but sometimes Ganesh
+    // needs to flush mid-draw. In that case, the SkGpuDevice's drawTargets won't be closed
+    // but need to be flushed anyway. Closing such drawTargets here will mean new
+    // drawTargets will be created to replace them if the SkGpuDevice(s) write to them again.
+    this->makeClosed();
+
+    // Loop over the batches that haven't yet generated their geometry
+    for (int i = 0; i < fBatches.count(); ++i) {
+        fBatches[i]->prepare(flushState);
+    }
+}
+
+void GrDrawTarget::drawBatches(GrBatchFlushState* flushState) {
+    // Draw all the generated geometry.
+    for (int i = 0; i < fBatches.count(); ++i) {
+        fBatches[i]->draw(flushState);
+    }
+
+    fFlushing = false;
+}
+
+void GrDrawTarget::reset() {
+    fBatches.reset();
+}
+
+void GrDrawTarget::drawBatch(const GrPipelineBuilder& pipelineBuilder, GrDrawBatch* batch) {
+    // Setup clip
+    GrPipelineBuilder::AutoRestoreStencil ars;
+    GrAppliedClip clip;
+    if (!fClipMaskManager->setupClipping(pipelineBuilder, &ars, &batch->bounds(), &clip)) {
+        return;
+    }
+    GrPipelineBuilder::AutoRestoreFragmentProcessorState arfps;
+    if (clip.clipCoverageFragmentProcessor()) {
+        arfps.set(&pipelineBuilder);
+        arfps.addCoverageFragmentProcessor(clip.clipCoverageFragmentProcessor());
+    }
+
+    GrPipeline::CreateArgs args;
+    if (!this->installPipelineInDrawBatch(&pipelineBuilder, &clip.scissorState(), batch)) {
+        return;
+    }
+
+#ifdef ENABLE_MDB
+    SkASSERT(fRenderTarget);
+    batch->pipeline()->addDependenciesTo(fRenderTarget);
+#endif
+
+    this->recordBatch(batch);
+}
+
+static const GrStencilSettings& winding_path_stencil_settings() {
+    GR_STATIC_CONST_SAME_STENCIL_STRUCT(gSettings,
+        kIncClamp_StencilOp,
+        kIncClamp_StencilOp,
+        kAlwaysIfInClip_StencilFunc,
+        0xFFFF, 0xFFFF, 0xFFFF);
+    return *GR_CONST_STENCIL_SETTINGS_PTR_FROM_STRUCT_PTR(&gSettings);
+}
+
+static const GrStencilSettings& even_odd_path_stencil_settings() {
+    GR_STATIC_CONST_SAME_STENCIL_STRUCT(gSettings,
+        kInvert_StencilOp,
+        kInvert_StencilOp,
+        kAlwaysIfInClip_StencilFunc,
+        0xFFFF, 0xFFFF, 0xFFFF);
+    return *GR_CONST_STENCIL_SETTINGS_PTR_FROM_STRUCT_PTR(&gSettings);
+}
+
+void GrDrawTarget::getPathStencilSettingsForFilltype(GrPathRendering::FillType fill,
+                                                     const GrStencilAttachment* sb,
+                                                     GrStencilSettings* outStencilSettings) {
+
+    switch (fill) {
+        default:
+            SkFAIL("Unexpected path fill.");
+        case GrPathRendering::kWinding_FillType:
+            *outStencilSettings = winding_path_stencil_settings();
+            break;
+        case GrPathRendering::kEvenOdd_FillType:
+            *outStencilSettings = even_odd_path_stencil_settings();
+            break;
+    }
+    fClipMaskManager->adjustPathStencilParams(sb, outStencilSettings);
+}
+
+void GrDrawTarget::stencilPath(const GrPipelineBuilder& pipelineBuilder,
+                               const SkMatrix& viewMatrix,
+                               const GrPath* path,
+                               GrPathRendering::FillType fill) {
+    // TODO: extract portions of checkDraw that are relevant to path stenciling.
+    SkASSERT(path);
+    SkASSERT(this->caps()->shaderCaps()->pathRenderingSupport());
+
+    // Setup clip
+    GrPipelineBuilder::AutoRestoreStencil ars;
+    GrAppliedClip clip;
+    if (!fClipMaskManager->setupClipping(pipelineBuilder, &ars, nullptr, &clip)) {
+        return;
+    }
+
+    GrPipelineBuilder::AutoRestoreFragmentProcessorState arfps;
+    if (clip.clipCoverageFragmentProcessor()) {
+        arfps.set(&pipelineBuilder);
+        arfps.addCoverageFragmentProcessor(clip.clipCoverageFragmentProcessor());
+    }
+
+    // set stencil settings for path
+    GrStencilSettings stencilSettings;
+    GrRenderTarget* rt = pipelineBuilder.getRenderTarget();
+    GrStencilAttachment* sb = fResourceProvider->attachStencilAttachment(rt);
+    this->getPathStencilSettingsForFilltype(fill, sb, &stencilSettings);
+
+    GrBatch* batch = GrStencilPathBatch::Create(viewMatrix,
+                                                pipelineBuilder.isHWAntialias(),
+                                                stencilSettings, clip.scissorState(),
+                                                pipelineBuilder.getRenderTarget(),
+                                                path);
+    this->recordBatch(batch);
+    batch->unref();
+}
+
+void GrDrawTarget::drawPath(const GrPipelineBuilder& pipelineBuilder,
+                            const SkMatrix& viewMatrix,
+                            GrColor color,
+                            const GrPath* path,
+                            GrPathRendering::FillType fill) {
+    SkASSERT(path);
+    SkASSERT(this->caps()->shaderCaps()->pathRenderingSupport());
+
+    GrDrawPathBatchBase* batch = GrDrawPathBatch::Create(viewMatrix, color, path);
+    this->drawPathBatch(pipelineBuilder, batch, fill);
+    batch->unref();
+}
+
+void GrDrawTarget::drawPathsFromRange(const GrPipelineBuilder& pipelineBuilder,
+                                      const SkMatrix& viewMatrix,
+                                      const SkMatrix& localMatrix,
+                                      GrColor color,
+                                      GrPathRange* range,
+                                      GrPathRangeDraw* draw,
+                                      GrPathRendering::FillType fill, 
+                                      const SkRect& bounds) {
+    GrDrawPathBatchBase* batch = GrDrawPathRangeBatch::Create(viewMatrix, localMatrix, color,
+                                                              range, draw, bounds);
+    this->drawPathBatch(pipelineBuilder, batch, fill);
+    batch->unref();
+}
+
+void GrDrawTarget::drawPathBatch(const GrPipelineBuilder& pipelineBuilder,
+                                 GrDrawPathBatchBase* batch,
+                                 GrPathRendering::FillType fill) {
+    // This looks like drawBatch() but there is an added wrinkle that stencil settings get inserted
+    // after setting up clipping but before onDrawBatch(). TODO: Figure out a better model for
+    // handling stencil settings WRT interactions between pipeline(builder), clipmaskmanager, and
+    // batches.
+
+    GrPipelineBuilder::AutoRestoreStencil ars;
+    GrAppliedClip clip;
+    if (!fClipMaskManager->setupClipping(pipelineBuilder, &ars, &batch->bounds(), &clip)) {
+        return;
+    }
+
+    GrPipelineBuilder::AutoRestoreFragmentProcessorState arfps;
+    if (clip.clipCoverageFragmentProcessor()) {
+        arfps.set(&pipelineBuilder);
+        arfps.addCoverageFragmentProcessor(clip.clipCoverageFragmentProcessor());
+    }
+
+    // Ensure the render target has a stencil buffer and get the stencil settings.
+    GrStencilSettings stencilSettings;
+    GrRenderTarget* rt = pipelineBuilder.getRenderTarget();
+    GrStencilAttachment* sb = fResourceProvider->attachStencilAttachment(rt);
+    this->getPathStencilSettingsForFilltype(fill, sb, &stencilSettings);
+    batch->setStencilSettings(stencilSettings);
+
+    GrPipeline::CreateArgs args;
+    if (!this->installPipelineInDrawBatch(&pipelineBuilder, &clip.scissorState(), batch)) {
+        return;
+    }
+
+    this->recordBatch(batch);
+}
+
+void GrDrawTarget::drawNonAARect(const GrPipelineBuilder& pipelineBuilder,
+                              GrColor color,
+                              const SkMatrix& viewMatrix,
+                              const SkRect& rect) {
+   SkAutoTUnref<GrDrawBatch> batch(GrRectBatchFactory::CreateNonAAFill(color, viewMatrix, rect,
+                                                                       nullptr, nullptr));
+   this->drawBatch(pipelineBuilder, batch);
+}
+
+void GrDrawTarget::drawNonAARect(const GrPipelineBuilder& pipelineBuilder,
+                              GrColor color,
+                              const SkMatrix& viewMatrix,
+                              const SkRect& rect,
+                              const SkMatrix& localMatrix) {
+   SkAutoTUnref<GrDrawBatch> batch(GrRectBatchFactory::CreateNonAAFill(color, viewMatrix, rect,
+                                                                       nullptr, &localMatrix));
+   this->drawBatch(pipelineBuilder, batch);
+}
+
+void GrDrawTarget::drawNonAARect(const GrPipelineBuilder& pipelineBuilder,
+                              GrColor color,
+                              const SkMatrix& viewMatrix,
+                              const SkRect& rect,
+                              const SkRect& localRect) {
+   SkAutoTUnref<GrDrawBatch> batch(GrRectBatchFactory::CreateNonAAFill(color, viewMatrix, rect,
+                                                                       &localRect, nullptr));
+   this->drawBatch(pipelineBuilder, batch);
+}
+
+
+void GrDrawTarget::drawAARect(const GrPipelineBuilder& pipelineBuilder,
+                              GrColor color,
+                              const SkMatrix& viewMatrix,
+                              const SkRect& rect,
+                              const SkRect& devRect) {
+    SkAutoTUnref<GrDrawBatch> batch(GrRectBatchFactory::CreateAAFill(color, viewMatrix, rect,
+                                                                     devRect));
+    this->drawBatch(pipelineBuilder, batch);
+}
+
+void GrDrawTarget::clear(const SkIRect* rect,
+                         GrColor color,
+                         bool canIgnoreRect,
+                         GrRenderTarget* renderTarget) {
+    SkIRect rtRect = SkIRect::MakeWH(renderTarget->width(), renderTarget->height());
+    SkIRect clippedRect;
+    if (!rect ||
+        (canIgnoreRect && this->caps()->fullClearIsFree()) ||
+        rect->contains(rtRect)) {
+        rect = &rtRect;
+    } else {
+        clippedRect = *rect;
+        if (!clippedRect.intersect(rtRect)) {
+            return;
+        }
+        rect = &clippedRect;
+    }
+
+    if (this->caps()->useDrawInsteadOfClear()) {
+        // This works around a driver bug with clear by drawing a rect instead.
+        // The driver will ignore a clear if it is the only thing rendered to a
+        // target before the target is read.
+        if (rect == &rtRect) {
+            this->discard(renderTarget);
+        }
+
+        GrPipelineBuilder pipelineBuilder;
+        pipelineBuilder.setXPFactory(
+            GrPorterDuffXPFactory::Create(SkXfermode::kSrc_Mode))->unref();
+        pipelineBuilder.setRenderTarget(renderTarget);
+
+        this->drawNonAARect(pipelineBuilder, color, SkMatrix::I(), *rect);
+    } else {
+        GrBatch* batch = new GrClearBatch(*rect, color, renderTarget);
+        this->recordBatch(batch);
+        batch->unref();
+    }
+}
+
+void GrDrawTarget::discard(GrRenderTarget* renderTarget) {
+    if (this->caps()->discardRenderTargetSupport()) {
+        GrBatch* batch = new GrDiscardBatch(renderTarget);
+        this->recordBatch(batch);
+        batch->unref();
+    }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
-GrDrawTarget::AutoReleaseGeometry::AutoReleaseGeometry(
-                                         GrDrawTarget*  target,
-                                         int vertexCount,
-                                         int indexCount) {
-    fTarget = NULL;
-    this->set(target, vertexCount, indexCount);
-}
-
-GrDrawTarget::AutoReleaseGeometry::AutoReleaseGeometry() {
-    fTarget = NULL;
-}
-
-GrDrawTarget::AutoReleaseGeometry::~AutoReleaseGeometry() {
-    this->reset();
-}
-
-bool GrDrawTarget::AutoReleaseGeometry::set(GrDrawTarget*  target,
-                                            int vertexCount,
-                                            int indexCount) {
-    this->reset();
-    fTarget = target;
-    bool success = true;
-    if (NULL != fTarget) {
-        fTarget = target;
-        success = target->reserveVertexAndIndexSpace(vertexCount,
-                                                     indexCount,
-                                                     &fVertices,
-                                                     &fIndices);
-        if (!success) {
-            fTarget = NULL;
-            this->reset();
-        }
-    }
-    SkASSERT(success == (NULL != fTarget));
-    return success;
-}
-
-void GrDrawTarget::AutoReleaseGeometry::reset() {
-    if (NULL != fTarget) {
-        if (NULL != fVertices) {
-            fTarget->resetVertexSource();
-        }
-        if (NULL != fIndices) {
-            fTarget->resetIndexSource();
-        }
-        fTarget = NULL;
-    }
-    fVertices = NULL;
-    fIndices = NULL;
-}
-
-GrDrawTarget::AutoClipRestore::AutoClipRestore(GrDrawTarget* target, const SkIRect& newClip) {
-    fTarget = target;
-    fClip = fTarget->getClip();
-    fStack.init();
-    fStack.get()->clipDevRect(newClip, SkRegion::kReplace_Op);
-    fReplacementClip.fClipStack = fStack.get();
-    target->setClip(&fReplacementClip);
-}
-
-namespace {
-// returns true if the read/written rect intersects the src/dst and false if not.
-bool clip_srcrect_and_dstpoint(const GrSurface* dst,
-                               const GrSurface* src,
-                               const SkIRect& srcRect,
-                               const SkIPoint& dstPoint,
-                               SkIRect* clippedSrcRect,
-                               SkIPoint* clippedDstPoint) {
-    *clippedSrcRect = srcRect;
-    *clippedDstPoint = dstPoint;
-
-    // clip the left edge to src and dst bounds, adjusting dstPoint if necessary
-    if (clippedSrcRect->fLeft < 0) {
-        clippedDstPoint->fX -= clippedSrcRect->fLeft;
-        clippedSrcRect->fLeft = 0;
-    }
-    if (clippedDstPoint->fX < 0) {
-        clippedSrcRect->fLeft -= clippedDstPoint->fX;
-        clippedDstPoint->fX = 0;
-    }
-
-    // clip the top edge to src and dst bounds, adjusting dstPoint if necessary
-    if (clippedSrcRect->fTop < 0) {
-        clippedDstPoint->fY -= clippedSrcRect->fTop;
-        clippedSrcRect->fTop = 0;
-    }
-    if (clippedDstPoint->fY < 0) {
-        clippedSrcRect->fTop -= clippedDstPoint->fY;
-        clippedDstPoint->fY = 0;
-    }
-
-    // clip the right edge to the src and dst bounds.
-    if (clippedSrcRect->fRight > src->width()) {
-        clippedSrcRect->fRight = src->width();
-    }
-    if (clippedDstPoint->fX + clippedSrcRect->width() > dst->width()) {
-        clippedSrcRect->fRight = clippedSrcRect->fLeft + dst->width() - clippedDstPoint->fX;
-    }
-
-    // clip the bottom edge to the src and dst bounds.
-    if (clippedSrcRect->fBottom > src->height()) {
-        clippedSrcRect->fBottom = src->height();
-    }
-    if (clippedDstPoint->fY + clippedSrcRect->height() > dst->height()) {
-        clippedSrcRect->fBottom = clippedSrcRect->fTop + dst->height() - clippedDstPoint->fY;
-    }
-
-    // The above clipping steps may have inverted the rect if it didn't intersect either the src or
-    // dst bounds.
-    return !clippedSrcRect->isEmpty();
-}
-}
-
-bool GrDrawTarget::copySurface(GrSurface* dst,
+void GrDrawTarget::copySurface(GrSurface* dst,
                                GrSurface* src,
                                const SkIRect& srcRect,
                                const SkIPoint& dstPoint) {
-    SkASSERT(NULL != dst);
-    SkASSERT(NULL != src);
+    GrBatch* batch = GrCopySurfaceBatch::Create(dst, src, srcRect, dstPoint);
+    if (batch) {
+#ifdef ENABLE_MDB
+        this->addDependency(src);
+#endif
 
-    SkIRect clippedSrcRect;
-    SkIPoint clippedDstPoint;
-    // If the rect is outside the src or dst then we've already succeeded.
-    if (!clip_srcrect_and_dstpoint(dst,
-                                   src,
-                                   srcRect,
-                                   dstPoint,
-                                   &clippedSrcRect,
-                                   &clippedDstPoint)) {
-        SkASSERT(this->canCopySurface(dst, src, srcRect, dstPoint));
-        return true;
+        this->recordBatch(batch);
+        batch->unref();
     }
-
-    bool result = this->onCopySurface(dst, src, clippedSrcRect, clippedDstPoint);
-    SkASSERT(result == this->canCopySurface(dst, src, clippedSrcRect, clippedDstPoint));
-    return result;
 }
 
-bool GrDrawTarget::canCopySurface(GrSurface* dst,
-                                  GrSurface* src,
-                                  const SkIRect& srcRect,
-                                  const SkIPoint& dstPoint) {
-    SkASSERT(NULL != dst);
-    SkASSERT(NULL != src);
+template <class Left, class Right> static bool intersect(const Left& a, const Right& b) {
+    SkASSERT(a.fLeft <= a.fRight && a.fTop <= a.fBottom &&
+             b.fLeft <= b.fRight && b.fTop <= b.fBottom);
+    return a.fLeft < b.fRight && b.fLeft < a.fRight && a.fTop < b.fBottom && b.fTop < a.fBottom;
+}
 
-    SkIRect clippedSrcRect;
-    SkIPoint clippedDstPoint;
-    // If the rect is outside the src or dst then we're guaranteed success
-    if (!clip_srcrect_and_dstpoint(dst,
-                                   src,
-                                   srcRect,
-                                   dstPoint,
-                                   &clippedSrcRect,
-                                   &clippedDstPoint)) {
-        return true;
+void GrDrawTarget::recordBatch(GrBatch* batch) {
+    // A closed drawTarget should never receive new/more batches
+    SkASSERT(!this->isClosed());
+
+    // Check if there is a Batch Draw we can batch with by linearly searching back until we either
+    // 1) check every draw
+    // 2) intersect with something
+    // 3) find a 'blocker'
+    // Experimentally we have found that most batching occurs within the first 10 comparisons.
+    static const int kMaxLookback = 10;
+
+    GrBATCH_INFO("Re-Recording (%s, B%u)\n"
+        "\tBounds LRTB (%f, %f, %f, %f)\n",
+        batch->name(),
+        batch->uniqueID(),
+        batch->bounds().fLeft, batch->bounds().fRight,
+        batch->bounds().fTop, batch->bounds().fBottom);
+    GrBATCH_INFO(SkTabString(batch->dumpInfo(), 1).c_str());
+    GrBATCH_INFO("\tOutcome:\n");    
+    int maxCandidates = SkTMin(kMaxLookback, fBatches.count());
+    if (maxCandidates) {
+        int i = 0;
+        while (true) {
+            GrBatch* candidate = fBatches.fromBack(i);
+            // We cannot continue to search backwards if the render target changes
+            if (candidate->renderTargetUniqueID() != batch->renderTargetUniqueID()) {
+                GrBATCH_INFO("\t\tBreaking because of (%s, B%u) Rendertarget\n",
+                    candidate->name(), candidate->uniqueID());
+                break;
+            }
+            if (candidate->combineIfPossible(batch, *this->caps())) {
+                GrBATCH_INFO("\t\tCombining with (%s, B%u)\n", candidate->name(),
+                    candidate->uniqueID());
+                return;
+            }
+            // Stop going backwards if we would cause a painter's order violation.
+            // TODO: The bounds used here do not fully consider the clip. It may be advantageous
+            // to clip each batch's bounds to the clip.
+            if (intersect(candidate->bounds(), batch->bounds())) {
+                GrBATCH_INFO("\t\tIntersects with (%s, B%u)\n", candidate->name(),
+                    candidate->uniqueID());
+                break;
+            }
+            ++i;
+            if (i == maxCandidates) {
+                GrBATCH_INFO("\t\tReached max lookback or beginning of batch array %d\n", i);
+                break;
+            }
+        }
+    } else {
+        GrBATCH_INFO("\t\tFirstBatch\n");
     }
-    return this->onCanCopySurface(dst, src, clippedSrcRect, clippedDstPoint);
-}
-
-bool GrDrawTarget::onCanCopySurface(GrSurface* dst,
-                                    GrSurface* src,
-                                    const SkIRect& srcRect,
-                                    const SkIPoint& dstPoint) {
-    // Check that the read/write rects are contained within the src/dst bounds.
-    SkASSERT(!srcRect.isEmpty());
-    SkASSERT(SkIRect::MakeWH(src->width(), src->height()).contains(srcRect));
-    SkASSERT(dstPoint.fX >= 0 && dstPoint.fY >= 0);
-    SkASSERT(dstPoint.fX + srcRect.width() <= dst->width() &&
-             dstPoint.fY + srcRect.height() <= dst->height());
-
-    return !dst->isSameAs(src) && NULL != dst->asRenderTarget() && NULL != src->asTexture();
-}
-
-bool GrDrawTarget::onCopySurface(GrSurface* dst,
-                                 GrSurface* src,
-                                 const SkIRect& srcRect,
-                                 const SkIPoint& dstPoint) {
-    if (!GrDrawTarget::onCanCopySurface(dst, src, srcRect, dstPoint)) {
-        return false;
-    }
-
-    GrRenderTarget* rt = dst->asRenderTarget();
-    GrTexture* tex = src->asTexture();
-
-    GrDrawTarget::AutoStateRestore asr(this, kReset_ASRInit);
-    this->drawState()->setRenderTarget(rt);
-    SkMatrix matrix;
-    matrix.setTranslate(SkIntToScalar(srcRect.fLeft - dstPoint.fX),
-                        SkIntToScalar(srcRect.fTop - dstPoint.fY));
-    matrix.postIDiv(tex->width(), tex->height());
-    this->drawState()->addColorTextureEffect(tex, matrix);
-    SkIRect dstRect = SkIRect::MakeXYWH(dstPoint.fX,
-                                        dstPoint.fY,
-                                        srcRect.width(),
-                                        srcRect.height());
-    this->drawSimpleRect(dstRect);
-    return true;
-}
-
-void GrDrawTarget::initCopySurfaceDstDesc(const GrSurface* src, GrTextureDesc* desc) {
-    // Make the dst of the copy be a render target because the default copySurface draws to the dst.
-    desc->fOrigin = kDefault_GrSurfaceOrigin;
-    desc->fFlags = kRenderTarget_GrTextureFlagBit | kNoStencil_GrTextureFlagBit;
-    desc->fConfig = src->config();
+    fBatches.push_back().reset(SkRef(batch));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void GrDrawTargetCaps::reset() {
-    fMipMapSupport = false;
-    fNPOTTextureTileSupport = false;
-    fTwoSidedStencilSupport = false;
-    fStencilWrapOpsSupport = false;
-    fHWAALineSupport = false;
-    fShaderDerivativeSupport = false;
-    fGeometryShaderSupport = false;
-    fDualSourceBlendingSupport = false;
-    fPathRenderingSupport = false;
-    fDstReadInShaderSupport = false;
-    fDiscardRenderTargetSupport = false;
-    fReuseScratchTextures = true;
-    fGpuTracingSupport = false;
-
-    fMapBufferFlags = kNone_MapFlags;
-
-    fMaxRenderTargetSize = 0;
-    fMaxTextureSize = 0;
-    fMaxSampleCount = 0;
-
-    memset(fConfigRenderSupport, 0, sizeof(fConfigRenderSupport));
-    memset(fConfigTextureSupport, 0, sizeof(fConfigTextureSupport));
-}
-
-GrDrawTargetCaps& GrDrawTargetCaps::operator=(const GrDrawTargetCaps& other) {
-    fMipMapSupport = other.fMipMapSupport;
-    fNPOTTextureTileSupport = other.fNPOTTextureTileSupport;
-    fTwoSidedStencilSupport = other.fTwoSidedStencilSupport;
-    fStencilWrapOpsSupport = other.fStencilWrapOpsSupport;
-    fHWAALineSupport = other.fHWAALineSupport;
-    fShaderDerivativeSupport = other.fShaderDerivativeSupport;
-    fGeometryShaderSupport = other.fGeometryShaderSupport;
-    fDualSourceBlendingSupport = other.fDualSourceBlendingSupport;
-    fPathRenderingSupport = other.fPathRenderingSupport;
-    fDstReadInShaderSupport = other.fDstReadInShaderSupport;
-    fDiscardRenderTargetSupport = other.fDiscardRenderTargetSupport;
-    fReuseScratchTextures = other.fReuseScratchTextures;
-    fGpuTracingSupport = other.fGpuTracingSupport;
-
-    fMapBufferFlags = other.fMapBufferFlags;
-
-    fMaxRenderTargetSize = other.fMaxRenderTargetSize;
-    fMaxTextureSize = other.fMaxTextureSize;
-    fMaxSampleCount = other.fMaxSampleCount;
-
-    memcpy(fConfigRenderSupport, other.fConfigRenderSupport, sizeof(fConfigRenderSupport));
-    memcpy(fConfigTextureSupport, other.fConfigTextureSupport, sizeof(fConfigTextureSupport));
-
-    return *this;
-}
-
-static SkString map_flags_to_string(uint32_t flags) {
-    SkString str;
-    if (GrDrawTargetCaps::kNone_MapFlags == flags) {
-        str = "none";
-    } else {
-        SkASSERT(GrDrawTargetCaps::kCanMap_MapFlag & flags);
-        SkDEBUGCODE(flags &= ~GrDrawTargetCaps::kCanMap_MapFlag);
-        str = "can_map";
-
-        if (GrDrawTargetCaps::kSubset_MapFlag & flags) {
-            str.append(" partial");
-        } else {
-            str.append(" full");
-        }
-        SkDEBUGCODE(flags &= ~GrDrawTargetCaps::kSubset_MapFlag);
-    }
-    SkASSERT(0 == flags); // Make sure we handled all the flags.
-    return str;
-}
-
-SkString GrDrawTargetCaps::dump() const {
-    SkString r;
-    static const char* gNY[] = {"NO", "YES"};
-    r.appendf("MIP Map Support              : %s\n", gNY[fMipMapSupport]);
-    r.appendf("NPOT Texture Tile Support    : %s\n", gNY[fNPOTTextureTileSupport]);
-    r.appendf("Two Sided Stencil Support    : %s\n", gNY[fTwoSidedStencilSupport]);
-    r.appendf("Stencil Wrap Ops  Support    : %s\n", gNY[fStencilWrapOpsSupport]);
-    r.appendf("HW AA Lines Support          : %s\n", gNY[fHWAALineSupport]);
-    r.appendf("Shader Derivative Support    : %s\n", gNY[fShaderDerivativeSupport]);
-    r.appendf("Geometry Shader Support      : %s\n", gNY[fGeometryShaderSupport]);
-    r.appendf("Dual Source Blending Support : %s\n", gNY[fDualSourceBlendingSupport]);
-    r.appendf("Path Rendering Support       : %s\n", gNY[fPathRenderingSupport]);
-    r.appendf("Dst Read In Shader Support   : %s\n", gNY[fDstReadInShaderSupport]);
-    r.appendf("Discard Render Target Support: %s\n", gNY[fDiscardRenderTargetSupport]);
-    r.appendf("Reuse Scratch Textures       : %s\n", gNY[fReuseScratchTextures]);
-    r.appendf("Gpu Tracing Support          : %s\n", gNY[fGpuTracingSupport]);
-    r.appendf("Max Texture Size             : %d\n", fMaxTextureSize);
-    r.appendf("Max Render Target Size       : %d\n", fMaxRenderTargetSize);
-    r.appendf("Max Sample Count             : %d\n", fMaxSampleCount);
-
-    r.appendf("Map Buffer Support           : %s\n", map_flags_to_string(fMapBufferFlags).c_str());
-
-    static const char* kConfigNames[] = {
-        "Unknown",  // kUnknown_GrPixelConfig
-        "Alpha8",   // kAlpha_8_GrPixelConfig,
-        "Index8",   // kIndex_8_GrPixelConfig,
-        "RGB565",   // kRGB_565_GrPixelConfig,
-        "RGBA444",  // kRGBA_4444_GrPixelConfig,
-        "RGBA8888", // kRGBA_8888_GrPixelConfig,
-        "BGRA8888", // kBGRA_8888_GrPixelConfig,
-        "ETC1",     // kETC1_GrPixelConfig,
-        "LATC",     // kLATC_GrPixelConfig,
-        "R11EAC",   // kR11_EAC_GrPixelConfig,
-        "ASTC12x12",// kASTC_12x12_GrPixelConfig,
-        "RGBAFloat",  // kRGBA_float_GrPixelConfig
-    };
-    GR_STATIC_ASSERT(0  == kUnknown_GrPixelConfig);
-    GR_STATIC_ASSERT(1  == kAlpha_8_GrPixelConfig);
-    GR_STATIC_ASSERT(2  == kIndex_8_GrPixelConfig);
-    GR_STATIC_ASSERT(3  == kRGB_565_GrPixelConfig);
-    GR_STATIC_ASSERT(4  == kRGBA_4444_GrPixelConfig);
-    GR_STATIC_ASSERT(5  == kRGBA_8888_GrPixelConfig);
-    GR_STATIC_ASSERT(6  == kBGRA_8888_GrPixelConfig);
-    GR_STATIC_ASSERT(7  == kETC1_GrPixelConfig);
-    GR_STATIC_ASSERT(8  == kLATC_GrPixelConfig);
-    GR_STATIC_ASSERT(9  == kR11_EAC_GrPixelConfig);
-    GR_STATIC_ASSERT(10 == kASTC_12x12_GrPixelConfig);
-    GR_STATIC_ASSERT(11 == kRGBA_float_GrPixelConfig);
-    GR_STATIC_ASSERT(SK_ARRAY_COUNT(kConfigNames) == kGrPixelConfigCnt);
-
-    SkASSERT(!fConfigRenderSupport[kUnknown_GrPixelConfig][0]);
-    SkASSERT(!fConfigRenderSupport[kUnknown_GrPixelConfig][1]);
-
-    for (size_t i = 1; i < SK_ARRAY_COUNT(kConfigNames); ++i)  {
-        r.appendf("%s is renderable: %s, with MSAA: %s\n",
-                  kConfigNames[i],
-                  gNY[fConfigRenderSupport[i][0]],
-                  gNY[fConfigRenderSupport[i][1]]);
+bool GrDrawTarget::installPipelineInDrawBatch(const GrPipelineBuilder* pipelineBuilder,
+                                              const GrScissorState* scissor,
+                                              GrDrawBatch* batch) {
+    GrPipeline::CreateArgs args;
+    args.fPipelineBuilder = pipelineBuilder;
+    args.fCaps = this->caps();
+    args.fScissor = scissor;
+    batch->getPipelineOptimizations(&args.fOpts);
+    args.fOpts.fColorPOI.completeCalculations(pipelineBuilder->fColorFragmentProcessors.begin(),
+                                              pipelineBuilder->numColorFragmentProcessors());
+    args.fOpts.fCoveragePOI.completeCalculations(
+                                               pipelineBuilder->fCoverageFragmentProcessors.begin(),
+                                               pipelineBuilder->numCoverageFragmentProcessors());
+    if (!this->setupDstReadIfNecessary(*pipelineBuilder, args.fOpts, &args.fDstTexture,
+                                       batch->bounds())) {
+        return false;
     }
 
-    SkASSERT(!fConfigTextureSupport[kUnknown_GrPixelConfig]);
-
-    for (size_t i = 1; i < SK_ARRAY_COUNT(kConfigNames); ++i)  {
-        r.appendf("%s is uploadable to a texture: %s\n",
-                  kConfigNames[i],
-                  gNY[fConfigTextureSupport[i]]);
+    if (!batch->installPipeline(args)) {
+        return false;
     }
 
-    return r;
+    return true;
+}
+
+void GrDrawTarget::clearStencilClip(const SkIRect& rect, bool insideClip, GrRenderTarget* rt) {
+    GrBatch* batch = new GrClearStencilClipBatch(rect, insideClip, rt);
+    this->recordBatch(batch);
+    batch->unref();
 }
diff --git a/gfx/skia/skia/src/gpu/GrDrawTarget.h b/gfx/skia/skia/src/gpu/GrDrawTarget.h
index c868e56aa79a..7b0159e5d583 100644
--- a/gfx/skia/skia/src/gpu/GrDrawTarget.h
+++ b/gfx/skia/skia/src/gpu/GrDrawTarget.h
@@ -8,491 +8,192 @@
 #ifndef GrDrawTarget_DEFINED
 #define GrDrawTarget_DEFINED
 
-#include "GrClipData.h"
+#include "GrClip.h"
+#include "GrClipMaskManager.h"
 #include "GrContext.h"
-#include "GrDrawState.h"
+#include "GrPathProcessor.h"
+#include "GrPrimitiveProcessor.h"
 #include "GrIndexBuffer.h"
-#include "GrTraceMarker.h"
+#include "GrPathRendering.h"
+#include "GrPipelineBuilder.h"
+#include "GrPipeline.h"
+#include "GrVertexBuffer.h"
+#include "GrXferProcessor.h"
+
+#include "batches/GrDrawBatch.h"
 
 #include "SkClipStack.h"
 #include "SkMatrix.h"
 #include "SkPath.h"
+#include "SkStringUtils.h"
 #include "SkStrokeRec.h"
 #include "SkTArray.h"
 #include "SkTLazy.h"
 #include "SkTypes.h"
 #include "SkXfermode.h"
 
-class GrClipData;
-class GrDrawTargetCaps;
+//#define ENABLE_MDB 1
+
+class GrBatch;
+class GrClip;
+class GrCaps;
 class GrPath;
-class GrPathRange;
-class GrVertexBuffer;
-
-class GrDrawTarget : public SkRefCnt {
-protected:
-    class DrawInfo;
+class GrDrawPathBatchBase;
+class GrPathRangeDraw;
 
+class GrDrawTarget final : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(GrDrawTarget)
+    /** Options for GrDrawTarget behavior. */
+    struct Options {
+        Options () : fClipBatchToBounds(false) {}
+        bool fClipBatchToBounds;
+    };
 
-    ///////////////////////////////////////////////////////////////////////////
+    GrDrawTarget(GrRenderTarget*, GrGpu*, GrResourceProvider*, const Options&);
 
-    // The context may not be fully constructed and should not be used during GrDrawTarget
-    // construction.
-    GrDrawTarget(GrContext* context);
-    virtual ~GrDrawTarget();
+    ~GrDrawTarget() override;
+
+    void makeClosed() {
+        // We only close drawTargets When MDB is enabled. When MDB is disabled there is only
+        // ever one drawTarget and all calls will be funnelled into it.
+#ifdef ENABLE_MDB
+        this->setFlag(kClosed_Flag);
+#endif
+    }
+    bool isClosed() const { return this->isSetFlag(kClosed_Flag); }
+
+    // TODO: this entry point is only needed in the non-MDB world. Remove when
+    // we make the switch to MDB
+    void clearRT() { fRenderTarget = nullptr; }
+
+    /*
+     * Notify this drawTarget that it relies on the contents of 'dependedOn'
+     */
+    void addDependency(GrSurface* dependedOn);
+
+    /*
+     * Does this drawTarget depend on 'dependedOn'?
+     */
+    bool dependsOn(GrDrawTarget* dependedOn) const {
+        return fDependencies.find(dependedOn) >= 0;
+    }
+
+    /*
+     * Dump out the drawTarget dependency DAG
+     */
+    SkDEBUGCODE(void dump() const;)
+
+    /**
+     * Empties the draw buffer of any queued up draws.
+     */
+    void reset();
+
+    /**
+     * Together these two functions flush all queued up draws to the Gpu.
+     */
+    void prepareBatches(GrBatchFlushState* flushState);
+    void drawBatches(GrBatchFlushState* flushState);
 
     /**
      * Gets the capabilities of the draw target.
      */
-    const GrDrawTargetCaps* caps() const { return fCaps.get(); }
+    const GrCaps* caps() const { return fGpu->caps(); }
 
-    /**
-     * Sets the current clip to the region specified by clip. All draws will be
-     * clipped against this clip if kClip_StateBit is enabled.
-     *
-     * Setting the clip may (or may not) zero out the client's stencil bits.
-     *
-     * @param description of the clipping region
-     */
-    void setClip(const GrClipData* clip);
-
-    /**
-     * Gets the current clip.
-     *
-     * @return the clip.
-     */
-    const GrClipData* getClip() const;
-
-    /**
-     * Sets the draw state object for the draw target. Note that this does not
-     * make a copy. The GrDrawTarget will take a reference to passed object.
-     * Passing NULL will cause the GrDrawTarget to use its own internal draw
-     * state object rather than an externally provided one.
-     */
-    void setDrawState(GrDrawState*  drawState);
-
-    /**
-     * Read-only access to the GrDrawTarget's current draw state.
-     */
-    const GrDrawState& getDrawState() const { return *fDrawState; }
-
-    /**
-     * Read-write access to the GrDrawTarget's current draw state. Note that
-     * this doesn't ref.
-     */
-    GrDrawState* drawState() { return fDrawState; }
-
-    /**
-     * Color alpha and coverage are two inputs to the drawing pipeline. For some
-     * blend modes it is safe to fold the coverage into constant or per-vertex
-     * color alpha value. For other blend modes they must be handled separately.
-     * Depending on features available in the underlying 3D API this may or may
-     * not be possible.
-     *
-     * This function considers the current draw state and the draw target's
-     * capabilities to determine whether coverage can be handled correctly. The
-     * following assumptions are made:
-     *    1. The caller intends to somehow specify coverage. This can be
-     *       specified either by enabling a coverage stage on the GrDrawState or
-     *       via the vertex layout.
-     *    2. Other than enabling coverage stages or enabling coverage in the
-     *       layout, the current configuration of the target's GrDrawState is as
-     *       it will be at draw time.
-     */
-    bool canApplyCoverage() const;
-
-    /** When we're using coverage AA but the blend is incompatible (given gpu
-     * limitations) we should disable AA. */
-    bool shouldDisableCoverageAAForBlend() {
-        // Enable below if we should draw with AA even when it produces
-        // incorrect blending.
-        // return false;
-        return !this->canApplyCoverage();
-    }
-
-    /**
-     * Given the current draw state and hw support, will HW AA lines be used (if
-     * a line primitive type is drawn)?
-     */
-    bool willUseHWAALines() const;
-
-    /**
-     * There are three types of "sources" of geometry (vertices and indices) for
-     * draw calls made on the target. When performing an indexed draw, the
-     * indices and vertices can use different source types. Once a source is
-     * specified it can be used for multiple draws. However, the time at which
-     * the geometry data is no longer editable depends on the source type.
-     *
-     * Sometimes it is necessary to perform a draw while upstack code has
-     * already specified geometry that it isn't finished with. So there are push
-     * and pop methods. This allows the client to push the sources, draw
-     * something using alternate sources, and then pop to restore the original
-     * sources.
-     *
-     * Aside from pushes and pops, a source remains valid until another source
-     * is set or resetVertexSource / resetIndexSource is called. Drawing from
-     * a reset source is an error.
-     *
-     * The three types of sources are:
-     *
-     * 1. A cpu array (set*SourceToArray). This is useful when the caller
-     *    already provided vertex data in a format compatible with a
-     *    GrVertexLayout. The data in the array is consumed at the time that
-     *    set*SourceToArray is called and subsequent edits to the array will not
-     *    be reflected in draws.
-     *
-     * 2. Reserve. This is most useful when the caller has data it must
-     *    transform before drawing and is not long-lived. The caller requests
-     *    that the draw target make room for some amount of vertex and/or index
-     *    data. The target provides ptrs to hold the vertex and/or index data.
-     *
-     *    The data is writable up until the next drawIndexed, drawNonIndexed,
-     *    drawIndexedInstances, drawRect, copySurface, or pushGeometrySource. At
-     *    this point the data is frozen and the ptrs are no longer valid.
-     *
-     *    Where the space is allocated and how it is uploaded to the GPU is
-     *    subclass-dependent.
-     *
-     * 3. Vertex and Index Buffers. This is most useful for geometry that will
-     *    is long-lived. When the data in the buffer is consumed depends on the
-     *    GrDrawTarget subclass. For deferred subclasses the caller has to
-     *    guarantee that the data is still available in the buffers at playback.
-     *    (TODO: Make this more automatic as we have done for read/write pixels)
-     *
-     * The size of each vertex is determined by querying the current GrDrawState.
-     */
-
-    /**
-     * Reserves space for vertices and/or indices. Zero can be specifed as
-     * either the vertex or index count if the caller desires to only reserve
-     * space for only indices or only vertices. If zero is specifed for
-     * vertexCount then the vertex source will be unmodified and likewise for
-     * indexCount.
-     *
-     * If the function returns true then the reserve suceeded and the vertices
-     * and indices pointers will point to the space created.
-     *
-     * If the target cannot make space for the request then this function will
-     * return false. If vertexCount was non-zero then upon failure the vertex
-     * source is reset and likewise for indexCount.
-     *
-     * The pointers to the space allocated for vertices and indices remain valid
-     * until a drawIndexed, drawNonIndexed, drawIndexedInstances, drawRect,
-     * copySurface, or push/popGeomtrySource is called. At that point logically a
-     * snapshot of the data is made and the pointers are invalid.
-     *
-     * @param vertexCount  the number of vertices to reserve space for. Can be
-     *                     0. Vertex size is queried from the current GrDrawState.
-     * @param indexCount   the number of indices to reserve space for. Can be 0.
-     * @param vertices     will point to reserved vertex space if vertexCount is
-     *                     non-zero. Illegal to pass NULL if vertexCount > 0.
-     * @param indices      will point to reserved index space if indexCount is
-     *                     non-zero. Illegal to pass NULL if indexCount > 0.
-     */
-     bool reserveVertexAndIndexSpace(int vertexCount,
-                                     int indexCount,
-                                     void** vertices,
-                                     void** indices);
-
-    /**
-     * Provides hints to caller about the number of vertices and indices
-     * that can be allocated cheaply. This can be useful if caller is reserving
-     * space but doesn't know exactly how much geometry is needed.
-     *
-     * Also may hint whether the draw target should be flushed first. This is
-     * useful for deferred targets.
-     *
-     * @param vertexCount  in: hint about how many vertices the caller would
-     *                     like to allocate. Vertex size is queried from the
-     *                     current GrDrawState.
-     *                     out: a hint about the number of vertices that can be
-     *                     allocated cheaply. Negative means no hint.
-     *                     Ignored if NULL.
-     * @param indexCount   in: hint about how many indices the caller would
-     *                     like to allocate.
-     *                     out: a hint about the number of indices that can be
-     *                     allocated cheaply. Negative means no hint.
-     *                     Ignored if NULL.
-     *
-     * @return  true if target should be flushed based on the input values.
-     */
-    virtual bool geometryHints(int* vertexCount,
-                               int* indexCount) const;
-
-    /**
-     * Sets source of vertex data for the next draw. Array must contain
-     * the vertex data when this is called.
-     *
-     * @param vertexArray   cpu array containing vertex data.
-     * @param vertexCount   the number of vertices in the array. Vertex size is
-     *                      queried from the current GrDrawState.
-     */
-    void setVertexSourceToArray(const void* vertexArray, int vertexCount);
-
-    /**
-     * Sets source of index data for the next indexed draw. Array must contain
-     * the indices when this is called.
-     *
-     * @param indexArray    cpu array containing index data.
-     * @param indexCount    the number of indices in the array.
-     */
-    void setIndexSourceToArray(const void* indexArray, int indexCount);
-
-    /**
-     * Sets source of vertex data for the next draw. Data does not have to be
-     * in the buffer until drawIndexed, drawNonIndexed, or drawIndexedInstances.
-     *
-     * @param buffer        vertex buffer containing vertex data. Must be
-     *                      unlocked before draw call. Vertex size is queried
-     *                      from current GrDrawState.
-     */
-    void setVertexSourceToBuffer(const GrVertexBuffer* buffer);
-
-    /**
-     * Sets source of index data for the next indexed draw. Data does not have
-     * to be in the buffer until drawIndexed.
-     *
-     * @param buffer index buffer containing indices. Must be unlocked
-     *               before indexed draw call.
-     */
-    void setIndexSourceToBuffer(const GrIndexBuffer* buffer);
-
-    /**
-     * Resets vertex source. Drawing from reset vertices is illegal. Set vertex
-     * source to reserved, array, or buffer before next draw. May be able to free
-     * up temporary storage allocated by setVertexSourceToArray or
-     * reserveVertexSpace.
-     */
-    void resetVertexSource();
-
-    /**
-     * Resets index source. Indexed Drawing from reset indices is illegal. Set
-     * index source to reserved, array, or buffer before next indexed draw. May
-     * be able to free up temporary storage allocated by setIndexSourceToArray
-     * or reserveIndexSpace.
-     */
-    void resetIndexSource();
-
-    /**
-     * Query to find out if the vertex or index source is reserved.
-     */
-    bool hasReservedVerticesOrIndices() const {
-        return kReserved_GeometrySrcType == this->getGeomSrc().fVertexSrc ||
-        kReserved_GeometrySrcType == this->getGeomSrc().fIndexSrc;
-    }
-
-    /**
-     * Pushes and resets the vertex/index sources. Any reserved vertex / index
-     * data is finalized (i.e. cannot be updated after the matching pop but can
-     * be drawn from). Must be balanced by a pop.
-     */
-    void pushGeometrySource();
-
-    /**
-     * Pops the vertex / index sources from the matching push.
-     */
-    void popGeometrySource();
-
-    /**
-     * Draws indexed geometry using the current state and current vertex / index
-     * sources.
-     *
-     * @param type         The type of primitives to draw.
-     * @param startVertex  the vertex in the vertex array/buffer corresponding
-     *                     to index 0
-     * @param startIndex   first index to read from index src.
-     * @param vertexCount  one greater than the max index.
-     * @param indexCount   the number of index elements to read. The index count
-     *                     is effectively trimmed to the last completely
-     *                     specified primitive.
-     * @param devBounds    optional bounds hint. This is a promise from the caller,
-     *                     not a request for clipping.
-     */
-    void drawIndexed(GrPrimitiveType type,
-                     int startVertex,
-                     int startIndex,
-                     int vertexCount,
-                     int indexCount,
-                     const SkRect* devBounds = NULL);
-
-    /**
-     * Draws non-indexed geometry using the current state and current vertex
-     * sources.
-     *
-     * @param type         The type of primitives to draw.
-     * @param startVertex  the vertex in the vertex array/buffer corresponding
-     *                     to index 0
-     * @param vertexCount  one greater than the max index.
-     * @param devBounds    optional bounds hint. This is a promise from the caller,
-     *                     not a request for clipping.
-     */
-    void drawNonIndexed(GrPrimitiveType type,
-                        int startVertex,
-                        int vertexCount,
-                        const SkRect* devBounds = NULL);
+    void drawBatch(const GrPipelineBuilder&, GrDrawBatch*);
 
     /**
      * Draws path into the stencil buffer. The fill must be either even/odd or
      * winding (not inverse or hairline). It will respect the HW antialias flag
-     * on the draw state (if possible in the 3D API).
+     * on the GrPipelineBuilder (if possible in the 3D API).  Note, we will never have an inverse
+     * fill with stencil path
      */
-    void stencilPath(const GrPath*, SkPath::FillType fill);
+    void stencilPath(const GrPipelineBuilder&, const SkMatrix& viewMatrix, const GrPath*,
+                     GrPathRendering::FillType);
 
     /**
      * Draws a path. Fill must not be a hairline. It will respect the HW
-     * antialias flag on the draw state (if possible in the 3D API).
+     * antialias flag on the GrPipelineBuilder (if possible in the 3D API).
+     *
+     * TODO: Remove this function and construct the batch outside GrDrawTarget.
      */
-    void drawPath(const GrPath*, SkPath::FillType fill);
+    void drawPath(const GrPipelineBuilder&, const SkMatrix& viewMatrix, GrColor color,
+                  const GrPath*, GrPathRendering::FillType);
 
     /**
-     * Draws many paths. It will respect the HW
-     * antialias flag on the draw state (if possible in the 3D API).
+     * Draws the aggregate path from combining multiple. Note that this will not
+     * always be equivalent to back-to-back calls to drawPath(). It will respect
+     * the HW antialias flag on the GrPipelineBuilder (if possible in the 3D API).
      *
-     * @param pathRange       Source of paths to draw from
-     * @param indices         Array of indices into the the pathRange
-     * @param count           Number of paths to draw (length of indices array)
-     * @param transforms      Array of individual transforms, one for each path
-     * @param transformsType  Type of transformations in the array. Array contains
-                              PathTransformSize(transformsType) × count elements
+     * TODO: Remove this function and construct the batch outside GrDrawTarget.
+     *
+     * @param draw            The transforms and indices for the draw.
+     *                        This object must only be drawn once. The draw
+     *                        may modify its contents.
      * @param fill            Fill type for drawing all the paths
      */
-    enum PathTransformType {
-        kNone_PathTransformType,        //!< []
-        kTranslateX_PathTransformType,  //!< [kMTransX]
-        kTranslateY_PathTransformType,  //!< [kMTransY]
-        kTranslate_PathTransformType,   //!< [kMTransX, kMTransY]
-        kAffine_PathTransformType,      //!< [kMScaleX, kMSkewX, kMTransX, kMSkewY, kMScaleY, kMTransY]
-
-        kLast_PathTransformType = kAffine_PathTransformType
-    };
-    void drawPaths(const GrPathRange* pathRange,
-                   const uint32_t indices[], int count,
-                   const float transforms[], PathTransformType transformsType,
-                   SkPath::FillType fill);
-
-    static inline int PathTransformSize(PathTransformType type) {
-        switch (type) {
-            case kNone_PathTransformType:
-                return 0;
-            case kTranslateX_PathTransformType:
-            case kTranslateY_PathTransformType:
-                return 1;
-            case kTranslate_PathTransformType:
-                return 2;
-            case kAffine_PathTransformType:
-                return 6;
-
-            default:
-                SkFAIL("Unknown path transform type");
-                return 0;
-        }
-    }
+    void drawPathsFromRange(const GrPipelineBuilder&,
+                            const SkMatrix& viewMatrix,
+                            const SkMatrix& localMatrix,
+                            GrColor color,
+                            GrPathRange* range,
+                            GrPathRangeDraw* draw,
+                            GrPathRendering::FillType fill,
+                            const SkRect& bounds);
 
     /**
-     * Helper function for drawing rects. It performs a geometry src push and pop
-     * and thus will finalize any reserved geometry.
+     * Helper function for drawing rects.
      *
      * @param rect        the rect to draw
-     * @param matrix      optional matrix applied to rect (before viewMatrix)
      * @param localRect   optional rect that specifies local coords to map onto
-     *                    rect. If NULL then rect serves as the local coords.
-     * @param localMatrix optional matrix applied to localRect. If
-     *                    srcRect is non-NULL and srcMatrix is non-NULL
-     *                    then srcRect will be transformed by srcMatrix.
-     *                    srcMatrix can be NULL when no srcMatrix is desired.
+     *                    rect. If nullptr then rect serves as the local coords.
+     * @param localMatrix Optional local matrix. The local coordinates are specified by localRect,
+     *                    or if it is nullptr by rect. This matrix applies to the coordinate implied by
+     *                    that rectangle before it is input to GrCoordTransforms that read local
+     *                    coordinates
      */
-    void drawRect(const SkRect& rect,
-                  const SkMatrix* matrix,
-                  const SkRect* localRect,
-                  const SkMatrix* localMatrix) {
-        AutoGeometryPush agp(this);
-        this->onDrawRect(rect, matrix, localRect, localMatrix);
-    }
-
-    /**
-     * Helper for drawRect when the caller doesn't need separate local rects or matrices.
-     */
-    void drawSimpleRect(const SkRect& rect, const SkMatrix* matrix = NULL) {
-        this->drawRect(rect, matrix, NULL, NULL);
-    }
-    void drawSimpleRect(const SkIRect& irect, const SkMatrix* matrix = NULL) {
-        SkRect rect = SkRect::Make(irect);
-        this->drawRect(rect, matrix, NULL, NULL);
-    }
-
-    /**
-     * This call is used to draw multiple instances of some geometry with a
-     * given number of vertices (V) and indices (I) per-instance. The indices in
-     * the index source must have the form i[k+I] == i[k] + V. Also, all indices
-     * i[kI] ... i[(k+1)I-1] must be elements of the range kV ... (k+1)V-1. As a
-     * concrete example, the following index buffer for drawing a series of
-     * quads each as two triangles each satisfies these conditions with V=4 and
-     * I=6:
-     *      (0,1,2,0,2,3, 4,5,6,4,6,7, 8,9,10,8,10,11, ...)
-     *
-     * The call assumes that the pattern of indices fills the entire index
-     * source. The size of the index buffer limits the number of instances that
-     * can be drawn by the GPU in a single draw. However, the caller may specify
-     * any (positive) number for instanceCount and if necessary multiple GPU
-     * draws will be issued. Moreover, when drawIndexedInstances is called
-     * multiple times it may be possible for GrDrawTarget to group them into a
-     * single GPU draw.
-     *
-     * @param type          the type of primitives to draw
-     * @param instanceCount the number of instances to draw. Each instance
-     *                      consists of verticesPerInstance vertices indexed by
-     *                      indicesPerInstance indices drawn as the primitive
-     *                      type specified by type.
-     * @param verticesPerInstance   The number of vertices in each instance (V
-     *                              in the above description).
-     * @param indicesPerInstance    The number of indices in each instance (I
-     *                              in the above description).
-     * @param devBounds    optional bounds hint. This is a promise from the caller,
-     *                     not a request for clipping.
-     */
-    void drawIndexedInstances(GrPrimitiveType type,
-                              int instanceCount,
-                              int verticesPerInstance,
-                              int indicesPerInstance,
-                              const SkRect* devBounds = NULL);
-
-    /**
-     * Clear the current render target if one isn't passed in. Ignores the
-     * clip and all other draw state (blend mode, stages, etc). Clears the
-     * whole thing if rect is NULL, otherwise just the rect. If canIgnoreRect
-     * is set then the entire render target can be optionally cleared.
-     */
-    virtual void clear(const SkIRect* rect,
+    void drawNonAARect(const GrPipelineBuilder& pipelineBuilder,
                        GrColor color,
-                       bool canIgnoreRect,
-                       GrRenderTarget* renderTarget = NULL) = 0;
+                       const SkMatrix& viewMatrix,
+                       const SkRect& rect);
+
+    void drawNonAARect(const GrPipelineBuilder& pipelineBuilder,
+                       GrColor color,
+                       const SkMatrix& viewMatrix,
+                       const SkRect& rect,
+                       const SkMatrix& localMatrix);
+
+    void drawNonAARect(const GrPipelineBuilder& pipelineBuilder,
+                       GrColor color,
+                       const SkMatrix& viewMatrix,
+                       const SkRect& rect,
+                       const SkRect& localRect);
+
+    void drawNonAARect(const GrPipelineBuilder& ds,
+                       GrColor color,
+                       const SkMatrix& viewM,
+                       const SkIRect& irect) {
+        SkRect rect = SkRect::Make(irect);
+        this->drawNonAARect(ds, color, viewM, rect);
+    }
+
+    void drawAARect(const GrPipelineBuilder& pipelineBuilder,
+                    GrColor color,
+                    const SkMatrix& viewMatrix,
+                    const SkRect& rect,
+                    const SkRect& devRect);
 
     /**
-     * Discards the contents render target. NULL indicates that the current render target should
-     * be discarded.
-     **/
-    virtual void discard(GrRenderTarget* = NULL) = 0;
-
-    /**
-     * Called at start and end of gpu trace marking
-     * GR_CREATE_GPU_TRACE_MARKER(marker_str, target) will automatically call these at the start
-     * and end of a code block respectively
+     * Clear the passed in render target. Ignores the GrPipelineBuilder and clip. Clears the whole
+     * thing if rect is nullptr, otherwise just the rect. If canIgnoreRect is set then the entire
+     * render target can be optionally cleared.
      */
-    void addGpuTraceMarker(const GrGpuTraceMarker* marker);
-    void removeGpuTraceMarker(const GrGpuTraceMarker* marker);
+    void clear(const SkIRect* rect,
+               GrColor color,
+               bool canIgnoreRect,
+               GrRenderTarget* renderTarget);
 
-    /**
-     * Takes the current active set of markers and stores them for later use. Any current marker
-     * in the active set is removed from the active set and the targets remove function is called.
-     * These functions do not work as a stack so you cannot call save a second time before calling
-     * restore. Also, it is assumed that when restore is called the current active set of markers
-     * is empty. When the stored markers are added back into the active set, the targets add marker
-     * is called.
-     */
-    void saveActiveTraceMarkers();
-    void restoreActiveTraceMarkers();
+    /** Discards the contents render target. */
+    void discard(GrRenderTarget*);
 
     /**
      * Copies a pixel rectangle from one surface to another. This call may finalize
@@ -500,494 +201,123 @@ public:
      * copied are specified by srcRect. They are copied to a rect of the same
      * size in dst with top left at dstPoint. If the src rect is clipped by the
      * src bounds then  pixel values in the dst rect corresponding to area clipped
-     * by the src rect are not overwritten. This method can fail and return false
+     * by the src rect are not overwritten. This method is not guaranteed to succeed
      * depending on the type of surface, configs, etc, and the backend-specific
-     * limitations. If rect is clipped out entirely by the src or dst bounds then
-     * true is returned since there is no actual copy necessary to succeed.
+     * limitations.
      */
-    bool copySurface(GrSurface* dst,
+    void copySurface(GrSurface* dst,
                      GrSurface* src,
                      const SkIRect& srcRect,
                      const SkIPoint& dstPoint);
-    /**
-     * Function that determines whether a copySurface call would succeed without
-     * performing the copy.
-     */
-    bool canCopySurface(GrSurface* dst,
-                        GrSurface* src,
-                        const SkIRect& srcRect,
-                        const SkIPoint& dstPoint);
 
-    /**
-     * This is can be called before allocating a texture to be a dst for copySurface. It will
-     * populate the origin, config, and flags fields of the desc such that copySurface is more
-     * likely to succeed and be efficient.
-     */
-    virtual void initCopySurfaceDstDesc(const GrSurface* src, GrTextureDesc* desc);
-
-
-    /**
-     * Release any resources that are cached but not currently in use. This
-     * is intended to give an application some recourse when resources are low.
-     */
-    virtual void purgeResources() {};
-
-    /**
-     * For subclass internal use to invoke a call to onDraw(). See DrawInfo below.
-     */
-    void executeDraw(const DrawInfo& info) { this->onDraw(info); }
-
-    /**
-     * For subclass internal use to invoke a call to onDrawPath().
-     */
-    void executeDrawPath(const GrPath* path, SkPath::FillType fill,
-                         const GrDeviceCoordTexture* dstCopy) {
-        this->onDrawPath(path, fill, dstCopy);
-    }
-
-    /**
-     * For subclass internal use to invoke a call to onDrawPaths().
-     */
-    void executeDrawPaths(const GrPathRange* pathRange,
-                          const uint32_t indices[], int count,
-                          const float transforms[], PathTransformType transformsType,
-                          SkPath::FillType fill,
-                          const GrDeviceCoordTexture* dstCopy) {
-        this->onDrawPaths(pathRange, indices, count, transforms, transformsType, fill, dstCopy);
-    }
-
-    inline bool isGpuTracingEnabled() const {
-        return this->getContext()->isGpuTracingEnabled();
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * See AutoStateRestore below.
-     */
-    enum ASRInit {
-        kPreserve_ASRInit,
-        kReset_ASRInit
-    };
-
-    /**
-     * Saves off the current state and restores it in the destructor. It will
-     * install a new GrDrawState object on the target (setDrawState) and restore
-     * the previous one in the destructor. The caller should call drawState() to
-     * get the new draw state after the ASR is installed.
-     *
-     * GrDrawState* state = target->drawState();
-     * AutoStateRestore asr(target, GrDrawTarget::kReset_ASRInit).
-     * state->setRenderTarget(rt); // state refers to the GrDrawState set on
-     *                             // target before asr was initialized.
-     *                             // Therefore, rt is set on the GrDrawState
-     *                             // that will be restored after asr's
-     *                             // destructor rather than target's current
-     *                             // GrDrawState.
-     */
-    class AutoStateRestore : public ::SkNoncopyable {
+    /** Provides access to internal functions to GrClipMaskManager without friending all of
+        GrDrawTarget to CMM. */
+    class CMMAccess {
     public:
-        /**
-         * Default ASR will have no effect unless set() is subsequently called.
-         */
-        AutoStateRestore();
-
-        /**
-         * Saves the state on target. The state will be restored when the ASR
-         * is destroyed. If this constructor is used do not call set().
-         *
-         * @param init  Should the newly installed GrDrawState be a copy of the
-         *              previous state or a default-initialized GrDrawState.
-         * @param viewMatrix Optional view matrix. If init = kPreserve then the draw state's
-         *                   matrix will be preconcat'ed with the param. All stages will be
-                             updated to compensate for the matrix change. If init == kReset
-                             then the draw state's matrix will be this matrix.
-         */
-        AutoStateRestore(GrDrawTarget* target, ASRInit init, const SkMatrix* viewMatrix = NULL);
-
-        ~AutoStateRestore();
-
-        /**
-         * Saves the state on target. The state will be restored when the ASR
-         * is destroyed. This should only be called once per ASR object and only
-         * when the default constructor was used. For nested saves use multiple
-         * ASR objects.
-         *
-         * @param init  Should the newly installed GrDrawState be a copy of the
-         *              previous state or a default-initialized GrDrawState.
-         * @param viewMatrix Optional view matrix. If init = kPreserve then the draw state's
-         *                   matrix will be preconcat'ed with the param. All stages will be
-                             updated to compensate for the matrix change. If init == kReset
-                             then the draw state's matrix will be this matrix.
-         */
-        void set(GrDrawTarget* target, ASRInit init, const SkMatrix* viewMatrix = NULL);
-
-        /**
-         * Like set() but makes the view matrix identity. When init is kReset it is as though
-         * NULL was passed to set's viewMatrix param. When init is kPreserve it is as though
-         * the inverse view matrix was passed. If kPreserve is passed and the draw state's matrix
-         * is not invertible then this may fail.
-         */
-        bool setIdentity(GrDrawTarget* target, ASRInit init);
-
+        CMMAccess(GrDrawTarget* drawTarget) : fDrawTarget(drawTarget) {}
     private:
-        GrDrawTarget*                       fDrawTarget;
-        SkTLazy<GrDrawState>                fTempState;
-        GrDrawState*                        fSavedState;
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-
-    class AutoReleaseGeometry : public ::SkNoncopyable {
-    public:
-        AutoReleaseGeometry(GrDrawTarget*  target,
-                            int            vertexCount,
-                            int            indexCount);
-        AutoReleaseGeometry();
-        ~AutoReleaseGeometry();
-        bool set(GrDrawTarget*  target,
-                 int            vertexCount,
-                 int            indexCount);
-        bool succeeded() const { return NULL != fTarget; }
-        void* vertices() const { SkASSERT(this->succeeded()); return fVertices; }
-        void* indices() const { SkASSERT(this->succeeded()); return fIndices; }
-        SkPoint* positions() const {
-            return static_cast<SkPoint*>(this->vertices());
+        void clearStencilClip(const SkIRect& rect, bool insideClip, GrRenderTarget* rt) const {
+            fDrawTarget->clearStencilClip(rect, insideClip, rt);
         }
 
-    private:
-        void reset();
-
-        GrDrawTarget* fTarget;
-        void*         fVertices;
-        void*         fIndices;
+        GrContext* context() const { return fDrawTarget->fContext; }
+        GrResourceProvider* resourceProvider() const { return fDrawTarget->fResourceProvider; }
+        GrDrawTarget* fDrawTarget;
+        friend class GrClipMaskManager;
     };
 
-    ////////////////////////////////////////////////////////////////////////////
-
-    class AutoClipRestore : public ::SkNoncopyable {
-    public:
-        AutoClipRestore(GrDrawTarget* target) {
-            fTarget = target;
-            fClip = fTarget->getClip();
-        }
-
-        AutoClipRestore(GrDrawTarget* target, const SkIRect& newClip);
-
-        ~AutoClipRestore() {
-            fTarget->setClip(fClip);
-        }
-    private:
-        GrDrawTarget*           fTarget;
-        const GrClipData*       fClip;
-        SkTLazy<SkClipStack>    fStack;
-        GrClipData              fReplacementClip;
-    };
-
-    ////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Saves the geometry src state at construction and restores in the destructor. It also saves
-     * and then restores the vertex attrib state.
-     */
-    class AutoGeometryPush : public ::SkNoncopyable {
-    public:
-        AutoGeometryPush(GrDrawTarget* target)
-            : fAttribRestore(target->drawState()) {
-            SkASSERT(NULL != target);
-            fTarget = target;
-            target->pushGeometrySource();
-        }
-
-        ~AutoGeometryPush() { fTarget->popGeometrySource(); }
-
-    private:
-        GrDrawTarget*                           fTarget;
-        GrDrawState::AutoVertexAttribRestore    fAttribRestore;
-    };
-
-    /**
-     * Combination of AutoGeometryPush and AutoStateRestore. The vertex attribs will be in default
-     * state regardless of ASRInit value.
-     */
-    class AutoGeometryAndStatePush : public ::SkNoncopyable {
-    public:
-        AutoGeometryAndStatePush(GrDrawTarget* target,
-                                 ASRInit init,
-                                 const SkMatrix* viewMatrix = NULL)
-            : fState(target, init, viewMatrix) {
-            SkASSERT(NULL != target);
-            fTarget = target;
-            target->pushGeometrySource();
-            if (kPreserve_ASRInit == init) {
-                target->drawState()->setDefaultVertexAttribs();
-            }
-        }
-
-        ~AutoGeometryAndStatePush() { fTarget->popGeometrySource(); }
-
-    private:
-        AutoStateRestore fState;
-        GrDrawTarget*    fTarget;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Draw execution tracking (for font atlases and other resources)
-    class DrawToken {
-    public:
-        DrawToken(GrDrawTarget* drawTarget, uint32_t drawID) :
-                  fDrawTarget(drawTarget), fDrawID(drawID) {}
-
-        bool isIssued() { return NULL != fDrawTarget && fDrawTarget->isIssued(fDrawID); }
-
-    private:
-        GrDrawTarget*  fDrawTarget;
-        uint32_t       fDrawID;   // this may wrap, but we're doing direct comparison
-                                  // so that should be okay
-    };
-
-    virtual DrawToken getCurrentDrawToken() { return DrawToken(this, 0); }
-
-protected:
-
-    enum GeometrySrcType {
-        kNone_GeometrySrcType,     //<! src has not been specified
-        kReserved_GeometrySrcType, //<! src was set using reserve*Space
-        kArray_GeometrySrcType,    //<! src was set using set*SourceToArray
-        kBuffer_GeometrySrcType    //<! src was set using set*SourceToBuffer
-    };
-
-    struct GeometrySrcState {
-        GeometrySrcType         fVertexSrc;
-        union {
-            // valid if src type is buffer
-            const GrVertexBuffer*   fVertexBuffer;
-            // valid if src type is reserved or array
-            int                     fVertexCount;
-        };
-
-        GeometrySrcType         fIndexSrc;
-        union {
-            // valid if src type is buffer
-            const GrIndexBuffer*    fIndexBuffer;
-            // valid if src type is reserved or array
-            int                     fIndexCount;
-        };
-
-        size_t                  fVertexSize;
-    };
-
-    int indexCountInCurrentSource() const {
-        const GeometrySrcState& src = this->getGeomSrc();
-        switch (src.fIndexSrc) {
-            case kNone_GeometrySrcType:
-                return 0;
-            case kReserved_GeometrySrcType:
-            case kArray_GeometrySrcType:
-                return src.fIndexCount;
-            case kBuffer_GeometrySrcType:
-                return static_cast<int>(src.fIndexBuffer->gpuMemorySize() / sizeof(uint16_t));
-            default:
-                SkFAIL("Unexpected Index Source.");
-                return 0;
-        }
-    }
-
-    // This method is called by copySurface  The srcRect is guaranteed to be entirely within the
-    // src bounds. Likewise, the dst rect implied by dstPoint and srcRect's width and height falls
-    // entirely within the dst. The default implementation will draw a rect from the src to the
-    // dst if the src is a texture and the dst is a render target and fail otherwise.
-    virtual bool onCopySurface(GrSurface* dst,
-                               GrSurface* src,
-                               const SkIRect& srcRect,
-                               const SkIPoint& dstPoint);
-
-    // Called to determine whether an onCopySurface call would succeed or not. This is useful for
-    // proxy subclasses to test whether the copy would succeed without executing it yet. Derived
-    // classes must keep this consistent with their implementation of onCopySurface(). The inputs
-    // are the same as onCopySurface(), i.e. srcRect and dstPoint are clipped to be inside the src
-    // and dst bounds.
-    virtual bool onCanCopySurface(GrSurface* dst,
-                                  GrSurface* src,
-                                  const SkIRect& srcRect,
-                                  const SkIPoint& dstPoint);
-
-    GrContext* getContext() { return fContext; }
-    const GrContext* getContext() const { return fContext; }
-
-    // A subclass may override this function if it wishes to be notified when the clip is changed.
-    // The override should call INHERITED::clipWillBeSet().
-    virtual void clipWillBeSet(const GrClipData* clipData);
-
-    // subclasses must call this in their destructors to ensure all vertex
-    // and index sources have been released (including those held by
-    // pushGeometrySource())
-    void releaseGeometry();
-
-    // accessors for derived classes
-    const GeometrySrcState& getGeomSrc() const { return fGeoSrcStateStack.back(); }
-    // it is preferable to call this rather than getGeomSrc()->fVertexSize because of the assert.
-    size_t getVertexSize() const {
-        // the vertex layout is only valid if a vertex source has been specified.
-        SkASSERT(this->getGeomSrc().fVertexSrc != kNone_GeometrySrcType);
-        return this->getGeomSrc().fVertexSize;
-    }
-
-    // Subclass must initialize this in its constructor.
-    SkAutoTUnref<const GrDrawTargetCaps> fCaps;
-
-    const GrTraceMarkerSet& getActiveTraceMarkers() { return fActiveTraceMarkers; }
-
-    /**
-     * Used to communicate draws to subclass's onDraw function.
-     */
-    class DrawInfo {
-    public:
-        DrawInfo(const DrawInfo& di) { (*this) = di; }
-        DrawInfo& operator =(const DrawInfo& di);
-
-        GrPrimitiveType primitiveType() const { return fPrimitiveType; }
-        int startVertex() const { return fStartVertex; }
-        int startIndex() const { return fStartIndex; }
-        int vertexCount() const { return fVertexCount; }
-        int indexCount() const { return fIndexCount; }
-        int verticesPerInstance() const { return fVerticesPerInstance; }
-        int indicesPerInstance() const { return fIndicesPerInstance; }
-        int instanceCount() const { return fInstanceCount; }
-
-        bool isIndexed() const { return fIndexCount > 0; }
-#ifdef SK_DEBUG
-        bool isInstanced() const; // this version is longer because of asserts
-#else
-        bool isInstanced() const { return fInstanceCount > 0; }
-#endif
-
-        // adds or remove instances
-        void adjustInstanceCount(int instanceOffset);
-        // shifts the start vertex
-        void adjustStartVertex(int vertexOffset);
-        // shifts the start index
-        void adjustStartIndex(int indexOffset);
-
-        void setDevBounds(const SkRect& bounds) {
-            fDevBoundsStorage = bounds;
-            fDevBounds = &fDevBoundsStorage;
-        }
-        const SkRect* getDevBounds() const { return fDevBounds; }
-
-        // NULL if no copy of the dst is needed for the draw.
-        const GrDeviceCoordTexture* getDstCopy() const {
-            if (NULL != fDstCopy.texture()) {
-                return &fDstCopy;
-            } else {
-                return NULL;
-            }
-        }
-
-    private:
-        DrawInfo() { fDevBounds = NULL; }
-
-        friend class GrDrawTarget;
-
-        GrPrimitiveType         fPrimitiveType;
-
-        int                     fStartVertex;
-        int                     fStartIndex;
-        int                     fVertexCount;
-        int                     fIndexCount;
-
-        int                     fInstanceCount;
-        int                     fVerticesPerInstance;
-        int                     fIndicesPerInstance;
-
-        SkRect                  fDevBoundsStorage;
-        SkRect*                 fDevBounds;
-
-        GrDeviceCoordTexture    fDstCopy;
-    };
+    const CMMAccess cmmAccess() { return CMMAccess(this); }
 
 private:
-    // A subclass can optionally overload this function to be notified before
-    // vertex and index space is reserved.
-    virtual void willReserveVertexAndIndexSpace(int vertexCount, int indexCount) {}
+    friend class GrDrawingManager; // for resetFlag & TopoSortTraits
 
-    // implemented by subclass to allocate space for reserved geom
-    virtual bool onReserveVertexSpace(size_t vertexSize, int vertexCount, void** vertices) = 0;
-    virtual bool onReserveIndexSpace(int indexCount, void** indices) = 0;
-    // implemented by subclass to handle release of reserved geom space
-    virtual void releaseReservedVertexSpace() = 0;
-    virtual void releaseReservedIndexSpace() = 0;
-    // subclass must consume array contents when set
-    virtual void onSetVertexSourceToArray(const void* vertexArray, int vertexCount) = 0;
-    virtual void onSetIndexSourceToArray(const void* indexArray, int indexCount) = 0;
-    // subclass is notified that geom source will be set away from an array
-    virtual void releaseVertexArray() = 0;
-    virtual void releaseIndexArray() = 0;
-    // subclass overrides to be notified just before geo src state is pushed/popped.
-    virtual void geometrySourceWillPush() = 0;
-    virtual void geometrySourceWillPop(const GeometrySrcState& restoredState) = 0;
-    // subclass called to perform drawing
-    virtual void onDraw(const DrawInfo&) = 0;
-    // Implementation of drawRect. The geometry src and vertex attribs will already
-    // be saved before this is called and restored afterwards. A subclass may override
-    // this to perform more optimal rect rendering. Its draws should be funneled through
-    // one of the public GrDrawTarget draw methods (e.g. drawNonIndexed,
-    // drawIndexedInstances, ...). The base class draws a two triangle fan using
-    // drawNonIndexed from reserved vertex space.
-    virtual void onDrawRect(const SkRect& rect,
-                            const SkMatrix* matrix,
-                            const SkRect* localRect,
-                            const SkMatrix* localMatrix);
+    enum Flags {
+        kClosed_Flag    = 0x01,   //!< This drawTarget can't accept any more batches
 
-    virtual void onStencilPath(const GrPath*, SkPath::FillType) = 0;
-    virtual void onDrawPath(const GrPath*, SkPath::FillType,
-                            const GrDeviceCoordTexture* dstCopy) = 0;
-    virtual void onDrawPaths(const GrPathRange*,
-                             const uint32_t indices[], int count,
-                             const float transforms[], PathTransformType,
-                             SkPath::FillType, const GrDeviceCoordTexture*) = 0;
+        kWasOutput_Flag = 0x02,   //!< Flag for topological sorting
+        kTempMark_Flag  = 0x04,   //!< Flag for topological sorting
+    };
 
-    virtual void didAddGpuTraceMarker() = 0;
-    virtual void didRemoveGpuTraceMarker() = 0;
+    void setFlag(uint32_t flag) {
+        fFlags |= flag;
+    }
 
-    // helpers for reserving vertex and index space.
-    bool reserveVertexSpace(size_t vertexSize,
-                            int vertexCount,
-                            void** vertices);
-    bool reserveIndexSpace(int indexCount, void** indices);
+    void resetFlag(uint32_t flag) {
+        fFlags &= ~flag;
+    }
 
-    // called by drawIndexed and drawNonIndexed. Use a negative indexCount to
-    // indicate non-indexed drawing.
-    bool checkDraw(GrPrimitiveType type, int startVertex,
-                   int startIndex, int vertexCount,
-                   int indexCount) const;
-    // called when setting a new vert/idx source to unref prev vb/ib
-    void releasePreviousVertexSource();
-    void releasePreviousIndexSource();
+    bool isSetFlag(uint32_t flag) const {
+        return SkToBool(fFlags & flag);
+    }
+
+    struct TopoSortTraits {
+        static void Output(GrDrawTarget* dt, int /* index */) {
+            dt->setFlag(GrDrawTarget::kWasOutput_Flag);
+        }
+        static bool WasOutput(const GrDrawTarget* dt) {
+            return dt->isSetFlag(GrDrawTarget::kWasOutput_Flag);
+        }
+        static void SetTempMark(GrDrawTarget* dt) {
+            dt->setFlag(GrDrawTarget::kTempMark_Flag);
+        }
+        static void ResetTempMark(GrDrawTarget* dt) {
+            dt->resetFlag(GrDrawTarget::kTempMark_Flag);
+        }
+        static bool IsTempMarked(const GrDrawTarget* dt) {
+            return dt->isSetFlag(GrDrawTarget::kTempMark_Flag);
+        }
+        static int NumDependencies(const GrDrawTarget* dt) {
+            return dt->fDependencies.count();
+        }
+        static GrDrawTarget* Dependency(GrDrawTarget* dt, int index) {
+            return dt->fDependencies[index];
+        }
+    };
+
+    void recordBatch(GrBatch*);
+    bool installPipelineInDrawBatch(const GrPipelineBuilder* pipelineBuilder,
+                                    const GrScissorState* scissor,
+                                    GrDrawBatch* batch);
 
     // Makes a copy of the dst if it is necessary for the draw. Returns false if a copy is required
-    // but couldn't be made. Otherwise, returns true.
-    bool setupDstReadIfNecessary(DrawInfo* info) {
-        return this->setupDstReadIfNecessary(&info->fDstCopy, info->getDevBounds());
-    }
-    bool setupDstReadIfNecessary(GrDeviceCoordTexture* dstCopy, const SkRect* drawBounds);
+    // but couldn't be made. Otherwise, returns true.  This method needs to be protected because it
+    // needs to be accessed by GLPrograms to setup a correct drawstate
+    bool setupDstReadIfNecessary(const GrPipelineBuilder&,
+        const GrPipelineOptimizations& optimizations,
+        GrXferProcessor::DstTexture*,
+        const SkRect& batchBounds);
 
+    void drawPathBatch(const GrPipelineBuilder& pipelineBuilder, GrDrawPathBatchBase* batch,
+                       GrPathRendering::FillType fill);
     // Check to see if this set of draw commands has been sent out
-    virtual bool       isIssued(uint32_t drawID) { return true; }
+    void getPathStencilSettingsForFilltype(GrPathRendering::FillType,
+                                           const GrStencilAttachment*,
+                                           GrStencilSettings*);
+    bool setupClip(const GrPipelineBuilder&,
+                           GrPipelineBuilder::AutoRestoreFragmentProcessorState*,
+                           GrPipelineBuilder::AutoRestoreStencil*,
+                           GrScissorState*,
+                           const SkRect* devBounds);
 
-    enum {
-        kPreallocGeoSrcStateStackCnt = 4,
-    };
-    SkSTArray<kPreallocGeoSrcStateStackCnt, GeometrySrcState, true> fGeoSrcStateStack;
-    const GrClipData*                                               fClip;
-    GrDrawState*                                                    fDrawState;
-    GrDrawState                                                     fDefaultDrawState;
-    // The context owns us, not vice-versa, so this ptr is not ref'ed by DrawTarget.
-    GrContext*                                                      fContext;
-    // To keep track that we always have at least as many debug marker adds as removes
-    int                                                             fGpuTraceMarkerCount;
-    GrTraceMarkerSet                                                fActiveTraceMarkers;
-    GrTraceMarkerSet                                                fStoredTraceMarkers;
+    void addDependency(GrDrawTarget* dependedOn);
+
+    // Used only by CMM.
+    void clearStencilClip(const SkIRect&, bool insideClip, GrRenderTarget*);
+
+    SkSTArray<256, SkAutoTUnref<GrBatch>, true> fBatches;
+    SkAutoTDelete<GrClipMaskManager>            fClipMaskManager;
+    // The context is only in service of the clip mask manager, remove once CMM doesn't need this.
+    GrContext*                                  fContext;
+    GrGpu*                                      fGpu;
+    GrResourceProvider*                         fResourceProvider;
+    bool                                        fFlushing;
+
+    SkDEBUGCODE(int                             fDebugID;)
+    uint32_t                                    fFlags;
+
+    // 'this' drawTarget relies on the output of the drawTargets in 'fDependencies'
+    SkTDArray<GrDrawTarget*>                    fDependencies;
+    GrRenderTarget*                             fRenderTarget;
 
     typedef SkRefCnt INHERITED;
 };
diff --git a/gfx/skia/skia/src/gpu/GrDrawTargetCaps.h b/gfx/skia/skia/src/gpu/GrDrawTargetCaps.h
deleted file mode 100644
index b979b534c405..000000000000
--- a/gfx/skia/skia/src/gpu/GrDrawTargetCaps.h
+++ /dev/null
@@ -1,107 +0,0 @@
-
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#ifndef GrDrawTargetCaps_DEFINED
-#define GrDrawTargetCaps_DEFINED
-
-#include "GrTypes.h"
-#include "SkRefCnt.h"
-#include "SkString.h"
-
-/**
- * Represents the draw target capabilities.
- */
-class GrDrawTargetCaps : public SkRefCnt {
-public:
-    SK_DECLARE_INST_COUNT(GrDrawTargetCaps)
-
-    GrDrawTargetCaps() { this->reset(); }
-    GrDrawTargetCaps(const GrDrawTargetCaps& other) : INHERITED() { *this = other; }
-    GrDrawTargetCaps& operator= (const GrDrawTargetCaps&);
-
-    virtual void reset();
-    virtual SkString dump() const;
-
-    bool npotTextureTileSupport() const { return fNPOTTextureTileSupport; }
-    /** To avoid as-yet-unnecessary complexity we don't allow any partial support of MIP Maps (e.g.
-        only for POT textures) */
-    bool mipMapSupport() const { return fMipMapSupport; }
-    bool twoSidedStencilSupport() const { return fTwoSidedStencilSupport; }
-    bool stencilWrapOpsSupport() const { return  fStencilWrapOpsSupport; }
-    bool hwAALineSupport() const { return fHWAALineSupport; }
-    bool shaderDerivativeSupport() const { return fShaderDerivativeSupport; }
-    bool geometryShaderSupport() const { return fGeometryShaderSupport; }
-    bool dualSourceBlendingSupport() const { return fDualSourceBlendingSupport; }
-    bool pathRenderingSupport() const { return fPathRenderingSupport; }
-    bool dstReadInShaderSupport() const { return fDstReadInShaderSupport; }
-    bool discardRenderTargetSupport() const { return fDiscardRenderTargetSupport; }
-    bool gpuTracingSupport() const { return fGpuTracingSupport; }
-
-    /**
-     * Indicates whether GPU->CPU memory mapping for GPU resources such as vertex buffers and
-     * textures allows partial mappings or full mappings.
-     */
-    enum MapFlags {
-        kNone_MapFlags   = 0x0,       //<! Cannot map the resource.
-
-        kCanMap_MapFlag  = 0x1,       //<! The resource can be mapped. Must be set for any of
-                                      //   the other flags to have meaning.k
-        kSubset_MapFlag  = 0x2,       //<! The resource can be partially mapped.
-    };
-
-    uint32_t mapBufferFlags() const { return fMapBufferFlags; }
-
-    // Scratch textures not being reused means that those scratch textures
-    // that we upload to (i.e., don't have a render target) will not be
-    // recycled in the texture cache. This is to prevent ghosting by drivers
-    // (in particular for deferred architectures).
-    bool reuseScratchTextures() const { return fReuseScratchTextures; }
-
-    int maxRenderTargetSize() const { return fMaxRenderTargetSize; }
-    int maxTextureSize() const { return fMaxTextureSize; }
-    // Will be 0 if MSAA is not supported
-    int maxSampleCount() const { return fMaxSampleCount; }
-
-    bool isConfigRenderable(GrPixelConfig config, bool withMSAA) const {
-        SkASSERT(kGrPixelConfigCnt > config);
-        return fConfigRenderSupport[config][withMSAA];
-    }
-
-    bool isConfigTexturable(GrPixelConfig config) const {
-        SkASSERT(kGrPixelConfigCnt > config);
-        return fConfigTextureSupport[config];
-    }
-
-protected:
-    bool fNPOTTextureTileSupport    : 1;
-    bool fMipMapSupport             : 1;
-    bool fTwoSidedStencilSupport    : 1;
-    bool fStencilWrapOpsSupport     : 1;
-    bool fHWAALineSupport           : 1;
-    bool fShaderDerivativeSupport   : 1;
-    bool fGeometryShaderSupport     : 1;
-    bool fDualSourceBlendingSupport : 1;
-    bool fPathRenderingSupport      : 1;
-    bool fDstReadInShaderSupport    : 1;
-    bool fDiscardRenderTargetSupport: 1;
-    bool fReuseScratchTextures      : 1;
-    bool fGpuTracingSupport         : 1;
-
-    uint32_t fMapBufferFlags;
-
-    int fMaxRenderTargetSize;
-    int fMaxTextureSize;
-    int fMaxSampleCount;
-
-    // The first entry for each config is without msaa and the second is with.
-    bool fConfigRenderSupport[kGrPixelConfigCnt][2];
-    bool fConfigTextureSupport[kGrPixelConfigCnt];
-
-    typedef SkRefCnt INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/GrDrawingManager.cpp b/gfx/skia/skia/src/gpu/GrDrawingManager.cpp
new file mode 100644
index 000000000000..13167d4642dc
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrDrawingManager.cpp
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrAtlasTextContext.h"
+#include "GrDrawContext.h"
+#include "GrDrawingManager.h"
+#include "GrDrawTarget.h"
+#include "GrResourceProvider.h"
+#include "GrSoftwarePathRenderer.h"
+#include "GrStencilAndCoverTextContext.h"
+#include "SkTTopoSort.h"
+
+
+void GrDrawingManager::cleanup() {
+    for (int i = 0; i < fDrawTargets.count(); ++i) {
+        fDrawTargets[i]->makeClosed();  // no drawTarget should receive a new command after this
+        fDrawTargets[i]->clearRT();
+
+        fDrawTargets[i]->unref();
+    }
+
+    fDrawTargets.reset();
+
+    delete fNVPRTextContext;
+    fNVPRTextContext = nullptr;
+
+    for (int i = 0; i < kNumPixelGeometries; ++i) {
+        delete fTextContexts[i][0];
+        fTextContexts[i][0] = nullptr;
+        delete fTextContexts[i][1];
+        fTextContexts[i][1] = nullptr;
+    }
+
+    delete fPathRendererChain;
+    fPathRendererChain = nullptr;
+    SkSafeSetNull(fSoftwarePathRenderer);
+}
+
+GrDrawingManager::~GrDrawingManager() {
+    this->cleanup();
+}
+
+void GrDrawingManager::abandon() {
+    fAbandoned = true;
+    this->cleanup();
+}
+
+void GrDrawingManager::freeGpuResources() {
+    // a path renderer may be holding onto resources
+    delete fPathRendererChain;
+    fPathRendererChain = nullptr;
+    SkSafeSetNull(fSoftwarePathRenderer);
+}
+
+void GrDrawingManager::reset() {
+    for (int i = 0; i < fDrawTargets.count(); ++i) {
+        fDrawTargets[i]->reset();
+    }
+    fFlushState.reset();
+}
+
+void GrDrawingManager::flush() {
+    SkDEBUGCODE(bool result =) 
+                        SkTTopoSort<GrDrawTarget, GrDrawTarget::TopoSortTraits>(&fDrawTargets);
+    SkASSERT(result);
+
+#if 0
+    for (int i = 0; i < fDrawTargets.count(); ++i) {
+        SkDEBUGCODE(fDrawTargets[i]->dump();)
+    }
+#endif
+
+    for (int i = 0; i < fDrawTargets.count(); ++i) {
+        fDrawTargets[i]->prepareBatches(&fFlushState);
+    }
+
+    // Upload all data to the GPU
+    fFlushState.preIssueDraws();
+
+    for (int i = 0; i < fDrawTargets.count(); ++i) {
+        fDrawTargets[i]->drawBatches(&fFlushState);
+    }
+
+    SkASSERT(fFlushState.lastFlushedToken() == fFlushState.currentToken());
+
+    for (int i = 0; i < fDrawTargets.count(); ++i) {
+        fDrawTargets[i]->reset();
+#ifdef ENABLE_MDB
+        fDrawTargets[i]->unref();
+#endif
+    }
+
+#ifndef ENABLE_MDB
+    // When MDB is disabled we keep reusing the same drawTarget
+    if (fDrawTargets.count()) {
+        SkASSERT(fDrawTargets.count() == 1);
+        // Clear out this flag so the topological sort's SkTTopoSort_CheckAllUnmarked check
+        // won't bark
+        fDrawTargets[0]->resetFlag(GrDrawTarget::kWasOutput_Flag);
+    }
+#else
+    fDrawTargets.reset();
+#endif
+
+    fFlushState.reset();
+}
+
+GrTextContext* GrDrawingManager::textContext(const SkSurfaceProps& props,
+                                             GrRenderTarget* rt) {
+    if (this->abandoned()) {
+        return nullptr;
+    }
+
+    SkASSERT(props.pixelGeometry() < kNumPixelGeometries);
+    bool useDIF = props.isUseDeviceIndependentFonts();
+
+    if (useDIF && fContext->caps()->shaderCaps()->pathRenderingSupport() &&
+        rt->isStencilBufferMultisampled()) {
+        GrStencilAttachment* sb = fContext->resourceProvider()->attachStencilAttachment(rt);
+        if (sb) {
+            if (!fNVPRTextContext) {
+                fNVPRTextContext = GrStencilAndCoverTextContext::Create(fContext, props);
+            }
+
+            return fNVPRTextContext;
+        }
+    }
+
+    if (!fTextContexts[props.pixelGeometry()][useDIF]) {
+        fTextContexts[props.pixelGeometry()][useDIF] = GrAtlasTextContext::Create(fContext, props);
+    }
+
+    return fTextContexts[props.pixelGeometry()][useDIF];
+}
+
+GrDrawTarget* GrDrawingManager::newDrawTarget(GrRenderTarget* rt) {
+    SkASSERT(fContext);
+
+#ifndef ENABLE_MDB
+    // When MDB is disabled we always just return the single drawTarget
+    if (fDrawTargets.count()) {
+        SkASSERT(fDrawTargets.count() == 1);
+        // In the non-MDB-world the same drawTarget gets reused for multiple render targets.
+        // Update this pointer so all the asserts are happy
+        rt->setLastDrawTarget(fDrawTargets[0]);
+        // DrawingManager gets the creation ref - this ref is for the caller
+        return SkRef(fDrawTargets[0]);
+    }
+#endif
+
+    GrDrawTarget* dt = new GrDrawTarget(rt, fContext->getGpu(), fContext->resourceProvider(),
+                                        fOptionsForDrawTargets);
+
+    *fDrawTargets.append() = dt;
+
+    // DrawingManager gets the creation ref - this ref is for the caller 
+    return SkRef(dt);
+}
+
+/*
+ * This method finds a path renderer that can draw the specified path on
+ * the provided target.
+ * Due to its expense, the software path renderer has split out so it can
+ * can be individually allowed/disallowed via the "allowSW" boolean.
+ */
+GrPathRenderer* GrDrawingManager::getPathRenderer(const GrPathRenderer::CanDrawPathArgs& args,
+                                                  bool allowSW,
+                                                  GrPathRendererChain::DrawType drawType,
+                                                  GrPathRenderer::StencilSupport* stencilSupport) {
+
+    if (!fPathRendererChain) {
+        fPathRendererChain = new GrPathRendererChain(fContext);
+    }
+
+    GrPathRenderer* pr = fPathRendererChain->getPathRenderer(args, drawType, stencilSupport);
+    if (!pr && allowSW) {
+        if (!fSoftwarePathRenderer) {
+            fSoftwarePathRenderer = new GrSoftwarePathRenderer(fContext);
+        }
+        pr = fSoftwarePathRenderer;
+    }
+
+    return pr;
+}
+
+GrDrawContext* GrDrawingManager::drawContext(GrRenderTarget* rt,
+                                             const SkSurfaceProps* surfaceProps) {
+    if (this->abandoned()) {
+        return nullptr;
+    }
+
+    return new GrDrawContext(this, rt, surfaceProps);
+}
diff --git a/gfx/skia/skia/src/gpu/GrDrawingManager.h b/gfx/skia/skia/src/gpu/GrDrawingManager.h
new file mode 100644
index 000000000000..672f7b08da71
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrDrawingManager.h
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrDrawingManager_DEFINED
+#define GrDrawingManager_DEFINED
+
+#include "GrDrawTarget.h"
+#include "GrBatchFlushState.h"
+#include "GrPathRendererChain.h"
+#include "GrPathRenderer.h"
+#include "SkTDArray.h"
+
+class GrContext;
+class GrDrawContext;
+class GrSoftwarePathRenderer;
+class GrTextContext;
+
+// Currently the DrawingManager creates a separate GrTextContext for each
+// combination of text drawing options (pixel geometry x DFT use)
+// and hands the appropriate one back given the DrawContext's request.
+//
+// It allocates a new GrDrawContext for each GrRenderTarget
+// but all of them still land in the same GrDrawTarget!
+//
+// In the future this class will allocate a new GrDrawContext for
+// each GrRenderTarget/GrDrawTarget and manage the DAG.
+class GrDrawingManager {
+public:
+    ~GrDrawingManager();
+
+    bool abandoned() const { return fAbandoned; }
+    void freeGpuResources();
+
+    GrDrawContext* drawContext(GrRenderTarget* rt, const SkSurfaceProps* surfaceProps);
+
+    GrTextContext* textContext(const SkSurfaceProps& props, GrRenderTarget* rt);
+
+    // The caller automatically gets a ref on the returned drawTarget. It must 
+    // be balanced by an unref call.
+    GrDrawTarget* newDrawTarget(GrRenderTarget* rt);
+
+    GrContext* getContext() { return fContext; }
+
+    GrPathRenderer* getPathRenderer(const GrPathRenderer::CanDrawPathArgs& args,
+                                    bool allowSW,
+                                    GrPathRendererChain::DrawType drawType,
+                                    GrPathRenderer::StencilSupport* stencilSupport = NULL);
+
+    static bool ProgramUnitTest(GrContext* context, int maxStages);
+
+private:
+    GrDrawingManager(GrContext* context, const GrDrawTarget::Options& optionsForDrawTargets)
+        : fContext(context)
+        , fOptionsForDrawTargets(optionsForDrawTargets)
+        , fAbandoned(false)
+        , fNVPRTextContext(nullptr)
+        , fPathRendererChain(nullptr)
+        , fSoftwarePathRenderer(nullptr)
+        , fFlushState(context->getGpu(), context->resourceProvider()) {
+        sk_bzero(fTextContexts, sizeof(fTextContexts));
+    }
+
+    void abandon();
+    void cleanup();
+    void reset();
+    void flush();
+
+    friend class GrContext;  // for access to: ctor, abandon, reset & flush
+
+    static const int kNumPixelGeometries = 5; // The different pixel geometries
+    static const int kNumDFTOptions = 2;      // DFT or no DFT
+
+    GrContext*                  fContext;
+    GrDrawTarget::Options       fOptionsForDrawTargets;
+
+    bool                        fAbandoned;
+    SkTDArray<GrDrawTarget*>    fDrawTargets;
+
+    GrTextContext*              fNVPRTextContext;
+    GrTextContext*              fTextContexts[kNumPixelGeometries][kNumDFTOptions];
+
+    GrPathRendererChain*        fPathRendererChain;
+    GrSoftwarePathRenderer*     fSoftwarePathRenderer;
+
+    GrBatchFlushState           fFlushState;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrEffect.cpp b/gfx/skia/skia/src/gpu/GrEffect.cpp
deleted file mode 100644
index f95248356276..000000000000
--- a/gfx/skia/skia/src/gpu/GrEffect.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrEffect.h"
-#include "GrBackendEffectFactory.h"
-#include "GrContext.h"
-#include "GrCoordTransform.h"
-#include "GrMemoryPool.h"
-#include "SkTLS.h"
-
-#if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
-SkTArray<GrEffectTestFactory*, true>* GrEffectTestFactory::GetFactories() {
-    static SkTArray<GrEffectTestFactory*, true> gFactories;
-    return &gFactories;
-}
-#endif
-
-namespace GrEffectUnitTest {
-const SkMatrix& TestMatrix(SkRandom* random) {
-    static SkMatrix gMatrices[5];
-    static bool gOnce;
-    if (!gOnce) {
-        gMatrices[0].reset();
-        gMatrices[1].setTranslate(SkIntToScalar(-100), SkIntToScalar(100));
-        gMatrices[2].setRotate(SkIntToScalar(17));
-        gMatrices[3].setRotate(SkIntToScalar(185));
-        gMatrices[3].postTranslate(SkIntToScalar(66), SkIntToScalar(-33));
-        gMatrices[3].postScale(SkIntToScalar(2), SK_ScalarHalf);
-        gMatrices[4].setRotate(SkIntToScalar(215));
-        gMatrices[4].set(SkMatrix::kMPersp0, 0.00013f);
-        gMatrices[4].set(SkMatrix::kMPersp1, -0.000039f);
-        gOnce = true;
-    }
-    return gMatrices[random->nextULessThan(static_cast<uint32_t>(SK_ARRAY_COUNT(gMatrices)))];
-}
-}
-
-class GrEffect_Globals {
-public:
-    static GrMemoryPool* GetTLS() {
-        return (GrMemoryPool*)SkTLS::Get(CreateTLS, DeleteTLS);
-    }
-
-private:
-    static void* CreateTLS() {
-        return SkNEW_ARGS(GrMemoryPool, (4096, 4096));
-    }
-
-    static void DeleteTLS(void* pool) {
-        SkDELETE(reinterpret_cast<GrMemoryPool*>(pool));
-    }
-};
-
-int32_t GrBackendEffectFactory::fCurrEffectClassID = GrBackendEffectFactory::kIllegalEffectClassID;
-
-///////////////////////////////////////////////////////////////////////////////
-
-GrEffect::~GrEffect() {}
-
-const char* GrEffect::name() const {
-    return this->getFactory().name();
-}
-
-void GrEffect::addCoordTransform(const GrCoordTransform* transform) {
-    fCoordTransforms.push_back(transform);
-    SkDEBUGCODE(transform->setInEffect();)
-}
-
-void GrEffect::addTextureAccess(const GrTextureAccess* access) {
-    fTextureAccesses.push_back(access);
-}
-
-void* GrEffect::operator new(size_t size) {
-    return GrEffect_Globals::GetTLS()->allocate(size);
-}
-
-void GrEffect::operator delete(void* target) {
-    GrEffect_Globals::GetTLS()->release(target);
-}
-
-#ifdef SK_DEBUG
-void GrEffect::assertEquality(const GrEffect& other) const {
-    SkASSERT(this->numTransforms() == other.numTransforms());
-    for (int i = 0; i < this->numTransforms(); ++i) {
-        SkASSERT(this->coordTransform(i) == other.coordTransform(i));
-    }
-    SkASSERT(this->numTextures() == other.numTextures());
-    for (int i = 0; i < this->numTextures(); ++i) {
-        SkASSERT(this->textureAccess(i) == other.textureAccess(i));
-    }
-}
-#endif
diff --git a/gfx/skia/skia/src/gpu/GrFontScaler.cpp b/gfx/skia/skia/src/gpu/GrFontScaler.cpp
index 164768f3b08b..c8412027c04d 100644
--- a/gfx/skia/skia/src/gpu/GrFontScaler.cpp
+++ b/gfx/skia/skia/src/gpu/GrFontScaler.cpp
@@ -6,8 +6,6 @@
  * found in the LICENSE file.
  */
 
-
-#include "GrTemplates.h"
 #include "GrFontScaler.h"
 #include "SkDescriptor.h"
 #include "SkDistanceFieldGen.h"
@@ -15,51 +13,16 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-GrFontDescKey::GrFontDescKey(const SkDescriptor& desc) : fHash(desc.getChecksum()) {
-    size_t size = desc.getLength();
-    if (size <= sizeof(fStorage)) {
-        fDesc = GrTCast<SkDescriptor*>(fStorage);
-    } else {
-        fDesc = SkDescriptor::Alloc(size);
-    }
-    memcpy(fDesc, &desc, size);
-}
-
-GrFontDescKey::~GrFontDescKey() {
-    if (fDesc != GrTCast<SkDescriptor*>(fStorage)) {
-        SkDescriptor::Free(fDesc);
-    }
-}
-
-bool GrFontDescKey::lt(const GrFontDescKey& rh) const {
-    const SkDescriptor* srcDesc = (&rh)->fDesc;
-    size_t lenLH = fDesc->getLength();
-    size_t lenRH = srcDesc->getLength();
-    int cmp = memcmp(fDesc, srcDesc, SkTMin<size_t>(lenLH, lenRH));
-    if (0 == cmp) {
-        return lenLH < lenRH;
-    } else {
-        return cmp < 0;
-    }
-}
-
-bool GrFontDescKey::eq(const GrFontDescKey& rh) const {
-    const SkDescriptor* srcDesc = (&rh)->fDesc;
-    return fDesc->equals(*srcDesc);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
 GrFontScaler::GrFontScaler(SkGlyphCache* strike) {
     fStrike = strike;
-    fKey = NULL;
+    fKey = nullptr;
 }
 
 GrFontScaler::~GrFontScaler() {
     SkSafeUnref(fKey);
 }
 
-GrMaskFormat GrFontScaler::getMaskFormat() {
+GrMaskFormat GrFontScaler::getMaskFormat() const {
     SkMask::Format format = fStrike->getMaskFormat();
     switch (format) {
         case SkMask::kBW_Format:
@@ -68,8 +31,6 @@ GrMaskFormat GrFontScaler::getMaskFormat() {
             return kA8_GrMaskFormat;
         case SkMask::kLCD16_Format:
             return kA565_GrMaskFormat;
-        case SkMask::kLCD32_Format:
-            return kA888_GrMaskFormat;
         case SkMask::kARGB32_Format:
             return kARGB_GrMaskFormat;
         default:
@@ -79,25 +40,46 @@ GrMaskFormat GrFontScaler::getMaskFormat() {
 }
 
 const GrFontDescKey* GrFontScaler::getKey() {
-    if (NULL == fKey) {
-        fKey = SkNEW_ARGS(GrFontDescKey, (fStrike->getDescriptor()));
+    if (nullptr == fKey) {
+        fKey = new GrFontDescKey(fStrike->getDescriptor());
     }
     return fKey;
 }
 
-bool GrFontScaler::getPackedGlyphBounds(GrGlyph::PackedID packed, SkIRect* bounds) {
-    const SkGlyph& glyph = fStrike->getGlyphIDMetrics(GrGlyph::UnpackID(packed),
-                                                      GrGlyph::UnpackFixedX(packed),
-                                                      GrGlyph::UnpackFixedY(packed));
+GrMaskFormat GrFontScaler::getPackedGlyphMaskFormat(const SkGlyph& glyph) const {
+    SkMask::Format format = static_cast<SkMask::Format>(glyph.fMaskFormat);
+    switch (format) {
+        case SkMask::kBW_Format:
+            // fall through to kA8 -- we store BW glyphs in our 8-bit cache
+        case SkMask::kA8_Format:
+            return kA8_GrMaskFormat;
+        case SkMask::kLCD16_Format:
+            return kA565_GrMaskFormat;
+        case SkMask::kARGB32_Format:
+            return kARGB_GrMaskFormat;
+        default:
+            SkDEBUGFAIL("unsupported SkMask::Format");
+            return kA8_GrMaskFormat;
+    }
+}
+
+bool GrFontScaler::getPackedGlyphBounds(const SkGlyph& glyph, SkIRect* bounds) {
+#if 1
+    // crbug:510931
+    // Retrieving the image from the cache can actually change the mask format.
+    fStrike->findImage(glyph);
+#endif
     bounds->setXYWH(glyph.fLeft, glyph.fTop, glyph.fWidth, glyph.fHeight);
 
     return true;
 }
 
-bool GrFontScaler::getPackedGlyphDFBounds(GrGlyph::PackedID packed, SkIRect* bounds) {
-    const SkGlyph& glyph = fStrike->getGlyphIDMetrics(GrGlyph::UnpackID(packed),
-                                                      GrGlyph::UnpackFixedX(packed),
-                                                      GrGlyph::UnpackFixedY(packed));
+bool GrFontScaler::getPackedGlyphDFBounds(const SkGlyph& glyph, SkIRect* bounds) {
+#if 1
+    // crbug:510931
+    // Retrieving the image from the cache can actually change the mask format.
+    fStrike->findImage(glyph);
+#endif
     bounds->setXYWH(glyph.fLeft, glyph.fTop, glyph.fWidth, glyph.fHeight);
     bounds->outset(SK_DistanceFieldPad, SK_DistanceFieldPad);
 
@@ -130,19 +112,27 @@ void expand_bits(INT_TYPE* dst,
 }
 }
 
-bool GrFontScaler::getPackedGlyphImage(GrGlyph::PackedID packed,
-                                         int width, int height,
-                                         int dstRB, void* dst) {
-    const SkGlyph& glyph = fStrike->getGlyphIDMetrics(GrGlyph::UnpackID(packed),
-                                                      GrGlyph::UnpackFixedX(packed),
-                                                      GrGlyph::UnpackFixedY(packed));
+bool GrFontScaler::getPackedGlyphImage(const SkGlyph& glyph, int width, int height, int dstRB,
+                                       GrMaskFormat expectedMaskFormat, void* dst) {
     SkASSERT(glyph.fWidth == width);
     SkASSERT(glyph.fHeight == height);
     const void* src = fStrike->findImage(glyph);
-    if (NULL == src) {
+    if (nullptr == src) {
         return false;
     }
 
+    // crbug:510931
+    // Retrieving the image from the cache can actually change the mask format.  This case is very
+    // uncommon so for now we just draw a clear box for these glyphs.
+    if (getPackedGlyphMaskFormat(glyph) != expectedMaskFormat) {
+        const int bpp = GrMaskFormatBytesPerPixel(expectedMaskFormat);
+        for (int y = 0; y < height; y++) {
+            sk_bzero(dst, width * bpp);
+            dst = (char*)dst + dstRB;
+        }
+        return true;
+    }
+
     int srcRB = glyph.rowBytes();
     // The windows font host sometimes has BW glyphs in a non-BW strike. So it is important here to
     // check the glyph's format, not the strike's format, and to be able to convert to any of the
@@ -150,7 +140,7 @@ bool GrFontScaler::getPackedGlyphImage(GrGlyph::PackedID packed,
     if (SkMask::kBW_Format == glyph.fMaskFormat) {
         // expand bits to our mask type
         const uint8_t* bits = reinterpret_cast<const uint8_t*>(src);
-        switch (this->getMaskFormat()) {
+        switch (expectedMaskFormat) {
             case kA8_GrMaskFormat:{
                 uint8_t* bytes = reinterpret_cast<uint8_t*>(dst);
                 expand_bits(bytes, bits, width, height, dstRB, srcRB);
@@ -161,18 +151,13 @@ bool GrFontScaler::getPackedGlyphImage(GrGlyph::PackedID packed,
                 expand_bits(rgb565, bits, width, height, dstRB, srcRB);
                 break;
             }
-            case kA888_GrMaskFormat: {
-                uint32_t* rgba8888 = reinterpret_cast<uint32_t*>(dst);
-                expand_bits(rgba8888, bits, width, height, dstRB, srcRB);
-                break;
-            }
             default:
                 SkFAIL("Invalid GrMaskFormat");
         }
     } else if (srcRB == dstRB) {
         memcpy(dst, src, dstRB * height);
     } else {
-        const int bbp = GrMaskFormatBytesPerPixel(this->getMaskFormat());
+        const int bbp = GrMaskFormatBytesPerPixel(expectedMaskFormat);
         for (int y = 0; y < height; y++) {
             memcpy(dst, src, width * bbp);
             src = (const char*)src + srcRB;
@@ -182,32 +167,41 @@ bool GrFontScaler::getPackedGlyphImage(GrGlyph::PackedID packed,
     return true;
 }
 
-bool GrFontScaler::getPackedGlyphDFImage(GrGlyph::PackedID packed,
-                                           int width, int height,
-                                           void* dst) {
-    const SkGlyph& glyph = fStrike->getGlyphIDMetrics(GrGlyph::UnpackID(packed),
-                                                      GrGlyph::UnpackFixedX(packed),
-                                                      GrGlyph::UnpackFixedY(packed));
+bool GrFontScaler::getPackedGlyphDFImage(const SkGlyph& glyph, int width, int height, void* dst) {
     SkASSERT(glyph.fWidth + 2*SK_DistanceFieldPad == width);
     SkASSERT(glyph.fHeight + 2*SK_DistanceFieldPad == height);
-    const void* src = fStrike->findDistanceField(glyph);
-    if (NULL == src) {
+    const void* image = fStrike->findImage(glyph);
+    if (nullptr == image) {
+        return false;
+    }
+    // now generate the distance field
+    SkASSERT(dst);
+    SkMask::Format maskFormat = static_cast<SkMask::Format>(glyph.fMaskFormat);
+    if (SkMask::kA8_Format == maskFormat) {
+        // make the distance field from the image
+        SkGenerateDistanceFieldFromA8Image((unsigned char*)dst,
+                                           (unsigned char*)image,
+                                           glyph.fWidth, glyph.fHeight,
+                                           glyph.rowBytes());
+    } else if (SkMask::kBW_Format == maskFormat) {
+        // make the distance field from the image
+        SkGenerateDistanceFieldFromBWImage((unsigned char*)dst,
+                                           (unsigned char*)image,
+                                           glyph.fWidth, glyph.fHeight,
+                                           glyph.rowBytes());
+    } else {
         return false;
     }
-
-    memcpy(dst, src, width * height);
 
     return true;
 }
 
-// we should just return const SkPath* (NULL means false)
-bool GrFontScaler::getGlyphPath(uint16_t glyphID, SkPath* path) {
-
-    const SkGlyph& glyph = fStrike->getGlyphIDMetrics(glyphID);
-    const SkPath* skPath = fStrike->findPath(glyph);
-    if (skPath) {
-        *path = *skPath;
-        return true;
-    }
-    return false;
+const SkPath* GrFontScaler::getGlyphPath(const SkGlyph& glyph) {
+    return fStrike->findPath(glyph);
+}
+
+const SkGlyph& GrFontScaler::grToSkGlyph(GrGlyph::PackedID id) {
+    return fStrike->getGlyphIDMetrics(GrGlyph::UnpackID(id),
+                                      GrGlyph::UnpackFixedX(id),
+                                      GrGlyph::UnpackFixedY(id));
 }
diff --git a/gfx/skia/skia/src/gpu/GrFontScaler.h b/gfx/skia/skia/src/gpu/GrFontScaler.h
new file mode 100644
index 000000000000..e42c7a1da007
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrFontScaler.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrFontScaler_DEFINED
+#define GrFontScaler_DEFINED
+
+#include "GrGlyph.h"
+#include "GrTypes.h"
+
+#include "SkDescriptor.h"
+
+class SkGlyph;
+class SkPath;
+
+/*
+ *  Wrapper class to turn a font cache descriptor into a key 
+ *  for GrFontScaler-related lookups
+ */
+class GrFontDescKey : public SkRefCnt {
+public:
+    explicit GrFontDescKey(const SkDescriptor& desc) : fDesc(desc), fHash(desc.getChecksum()) {}
+    
+    uint32_t getHash() const { return fHash; }
+
+    bool operator==(const GrFontDescKey& rh) const {
+        return fHash == rh.fHash && fDesc.getDesc()->equals(*rh.fDesc.getDesc());
+    }
+    
+private:
+    SkAutoDescriptor fDesc;
+    uint32_t fHash;
+    
+    typedef SkRefCnt INHERITED;
+};
+
+/*
+ *  This is Gr's interface to the host platform's font scaler.
+ *
+ *  The client is responsible for instantiating this. The instance is created 
+ *  for a specific font+size+matrix.
+ */
+class GrFontScaler : public SkRefCnt {
+public:
+    explicit GrFontScaler(SkGlyphCache* strike);
+    virtual ~GrFontScaler();
+    
+    const GrFontDescKey* getKey();
+    GrMaskFormat getMaskFormat() const;
+    GrMaskFormat getPackedGlyphMaskFormat(const SkGlyph&) const;
+    bool getPackedGlyphBounds(const SkGlyph&, SkIRect* bounds);
+    bool getPackedGlyphImage(const SkGlyph&, int width, int height, int rowBytes,
+                             GrMaskFormat expectedMaskFormat, void* image);
+    bool getPackedGlyphDFBounds(const SkGlyph&, SkIRect* bounds);
+    bool getPackedGlyphDFImage(const SkGlyph&, int width, int height, void* image);
+    const SkPath* getGlyphPath(const SkGlyph&);
+    const SkGlyph& grToSkGlyph(GrGlyph::PackedID);
+    
+private:
+    SkGlyphCache*  fStrike;
+    GrFontDescKey* fKey;
+    
+    typedef SkRefCnt INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrFragmentProcessor.cpp b/gfx/skia/skia/src/gpu/GrFragmentProcessor.cpp
new file mode 100644
index 000000000000..4cf2e73099a2
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrFragmentProcessor.cpp
@@ -0,0 +1,378 @@
+
+/*
+* Copyright 2015 Google Inc.
+*
+* Use of this source code is governed by a BSD-style license that can be
+* found in the LICENSE file.
+*/
+
+#include "GrFragmentProcessor.h"
+#include "GrCoordTransform.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+#include "effects/GrConstColorProcessor.h"
+#include "effects/GrXfermodeFragmentProcessor.h"
+
+GrFragmentProcessor::~GrFragmentProcessor() {
+    // If we got here then our ref count must have reached zero, so we will have converted refs
+    // to pending executions for all children.
+    for (int i = 0; i < fChildProcessors.count(); ++i) {
+        fChildProcessors[i]->completedExecution();
+    }
+}
+
+bool GrFragmentProcessor::isEqual(const GrFragmentProcessor& that,
+                                  bool ignoreCoordTransforms) const {
+    if (this->classID() != that.classID() ||
+        !this->hasSameTextureAccesses(that)) {
+        return false;
+    }
+    if (ignoreCoordTransforms) {
+        if (this->numTransforms() != that.numTransforms()) {
+            return false;
+        }
+    } else if (!this->hasSameTransforms(that)) {
+        return false;
+    }
+    if (!this->onIsEqual(that)) {
+        return false;
+    }
+    if (this->numChildProcessors() != that.numChildProcessors()) {
+        return false;
+    }
+    for (int i = 0; i < this->numChildProcessors(); ++i) {
+        if (!this->childProcessor(i).isEqual(that.childProcessor(i), ignoreCoordTransforms)) {
+            return false;
+        }
+    }
+    return true;
+}
+
+GrGLSLFragmentProcessor* GrFragmentProcessor::createGLSLInstance() const {
+    GrGLSLFragmentProcessor* glFragProc = this->onCreateGLSLInstance();
+    glFragProc->fChildProcessors.push_back_n(fChildProcessors.count());
+    for (int i = 0; i < fChildProcessors.count(); ++i) {
+        glFragProc->fChildProcessors[i] = fChildProcessors[i]->createGLSLInstance();
+    }
+    return glFragProc;
+}
+
+void GrFragmentProcessor::addTextureAccess(const GrTextureAccess* textureAccess) {
+    // Can't add texture accesses after registering any children since their texture accesses have
+    // already been bubbled up into our fTextureAccesses array
+    SkASSERT(fChildProcessors.empty());
+
+    INHERITED::addTextureAccess(textureAccess);
+    fNumTexturesExclChildren++;
+}
+
+void GrFragmentProcessor::addCoordTransform(const GrCoordTransform* transform) {
+    // Can't add transforms after registering any children since their transforms have already been
+    // bubbled up into our fCoordTransforms array
+    SkASSERT(fChildProcessors.empty());
+
+    fCoordTransforms.push_back(transform);
+    fUsesLocalCoords = fUsesLocalCoords || transform->sourceCoords() == kLocal_GrCoordSet;
+    SkDEBUGCODE(transform->setInProcessor();)
+    fNumTransformsExclChildren++;
+}
+
+int GrFragmentProcessor::registerChildProcessor(const GrFragmentProcessor* child) {
+    // Append the child's transforms to our transforms array and the child's textures array to our
+    // textures array
+    if (!child->fCoordTransforms.empty()) {
+        fCoordTransforms.push_back_n(child->fCoordTransforms.count(),
+                                     child->fCoordTransforms.begin());
+    }
+    if (!child->fTextureAccesses.empty()) {
+        fTextureAccesses.push_back_n(child->fTextureAccesses.count(),
+                                     child->fTextureAccesses.begin());
+    }
+
+    int index = fChildProcessors.count();
+    fChildProcessors.push_back(SkRef(child));
+
+    if (child->willReadFragmentPosition()) {
+        this->setWillReadFragmentPosition();
+    }
+
+    if (child->usesLocalCoords()) {
+        fUsesLocalCoords = true;
+    }
+
+    return index;
+}
+
+void GrFragmentProcessor::notifyRefCntIsZero() const {
+    // See comment above GrProgramElement for a detailed explanation of why we do this.
+    for (int i = 0; i < fChildProcessors.count(); ++i) {
+        fChildProcessors[i]->addPendingExecution();
+        fChildProcessors[i]->unref();
+    }
+}
+
+bool GrFragmentProcessor::hasSameTransforms(const GrFragmentProcessor& that) const {
+    if (this->numTransforms() != that.numTransforms()) {
+        return false;
+    }
+    int count = this->numTransforms();
+    for (int i = 0; i < count; ++i) {
+        if (this->coordTransform(i) != that.coordTransform(i)) {
+            return false;
+        }
+    }
+    return true;
+}
+
+const GrFragmentProcessor* GrFragmentProcessor::MulOutputByInputAlpha(
+    const GrFragmentProcessor* fp) {
+    if (!fp) {
+        return nullptr;
+    }
+    return GrXfermodeFragmentProcessor::CreateFromDstProcessor(fp, SkXfermode::kDstIn_Mode);
+}
+
+const GrFragmentProcessor* GrFragmentProcessor::MulOutputByInputUnpremulColor(
+    const GrFragmentProcessor* fp) {
+
+    class PremulFragmentProcessor : public GrFragmentProcessor {
+    public:
+        PremulFragmentProcessor(const GrFragmentProcessor* processor) {
+            this->initClassID<PremulFragmentProcessor>();
+            this->registerChildProcessor(processor);
+        }
+
+        const char* name() const override { return "Premultiply"; }
+
+    private:
+        GrGLSLFragmentProcessor* onCreateGLSLInstance() const override {
+            class GLFP : public GrGLSLFragmentProcessor {
+            public:
+                GLFP() {}
+
+                void emitCode(EmitArgs& args) override {
+                    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+                    this->emitChild(0, nullptr, args);
+                    fragBuilder->codeAppendf("%s.rgb *= %s.rgb;", args.fOutputColor,
+                                                                args.fInputColor);
+                    fragBuilder->codeAppendf("%s *= %s.a;", args.fOutputColor, args.fInputColor);
+                }
+            };
+            return new GLFP;
+        }
+
+        void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override {}
+
+        bool onIsEqual(const GrFragmentProcessor&) const override { return true; }
+
+        void onComputeInvariantOutput(GrInvariantOutput* inout) const override {
+            // TODO: Add a helper to GrInvariantOutput that handles multiplying by color with flags?
+            if (!(inout->validFlags() & kA_GrColorComponentFlag)) {
+                inout->setToUnknown(GrInvariantOutput::kWill_ReadInput);
+                return;
+            }
+
+            GrInvariantOutput childOutput(GrColor_WHITE, kRGBA_GrColorComponentFlags, false);
+            this->childProcessor(0).computeInvariantOutput(&childOutput);
+
+            if (0 == GrColorUnpackA(inout->color()) || 0 == GrColorUnpackA(childOutput.color())) {
+                inout->mulByKnownFourComponents(0x0);
+                return;
+            }
+            GrColorComponentFlags commonFlags = childOutput.validFlags() & inout->validFlags();
+            GrColor c0 = GrPremulColor(inout->color());
+            GrColor c1 = childOutput.color();
+            GrColor color = 0x0;
+            if (commonFlags & kR_GrColorComponentFlag) {
+                color |= SkMulDiv255Round(GrColorUnpackR(c0), GrColorUnpackR(c1)) <<
+                    GrColor_SHIFT_R;
+            }
+            if (commonFlags & kG_GrColorComponentFlag) {
+                color |= SkMulDiv255Round(GrColorUnpackG(c0), GrColorUnpackG(c1)) <<
+                    GrColor_SHIFT_G;
+            }
+            if (commonFlags & kB_GrColorComponentFlag) {
+                color |= SkMulDiv255Round(GrColorUnpackB(c0), GrColorUnpackB(c1)) <<
+                    GrColor_SHIFT_B;
+            }
+            inout->setToOther(commonFlags, color, GrInvariantOutput::kWill_ReadInput);
+        }
+    };
+    if (!fp) {
+        return nullptr;
+    }
+    return new PremulFragmentProcessor(fp);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+const GrFragmentProcessor* GrFragmentProcessor::OverrideInput(const GrFragmentProcessor* fp,
+                                                              GrColor color) {
+    class ReplaceInputFragmentProcessor : public GrFragmentProcessor {
+    public:
+        ReplaceInputFragmentProcessor(const GrFragmentProcessor* child, GrColor color)
+            : fColor(color) {
+            this->initClassID<ReplaceInputFragmentProcessor>();
+            this->registerChildProcessor(child);
+        }
+
+        const char* name() const override { return "Replace Color"; }
+
+        GrGLSLFragmentProcessor* onCreateGLSLInstance() const override {
+            class GLFP : public GrGLSLFragmentProcessor {
+            public:
+                GLFP() : fHaveSetColor(false) {}
+                void emitCode(EmitArgs& args) override {
+                    const char* colorName;
+                    fColorUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                                          kVec4f_GrSLType, kDefault_GrSLPrecision,
+                                                          "Color", &colorName);
+                    this->emitChild(0, colorName, args);
+                }
+
+            private:
+                void onSetData(const GrGLSLProgramDataManager& pdman,
+                               const GrProcessor& fp) override {
+                    GrColor color = fp.cast<ReplaceInputFragmentProcessor>().fColor;
+                    if (!fHaveSetColor || color != fPreviousColor) {
+                        static const float scale = 1.f / 255.f;
+                        float floatColor[4] = {
+                            GrColorUnpackR(color) * scale,
+                            GrColorUnpackG(color) * scale,
+                            GrColorUnpackB(color) * scale,
+                            GrColorUnpackA(color) * scale,
+                        };
+                        pdman.set4fv(fColorUni, 1, floatColor);
+                        fPreviousColor = color;
+                        fHaveSetColor = true;
+                    }
+                }
+
+                GrGLSLProgramDataManager::UniformHandle fColorUni;
+                bool    fHaveSetColor;
+                GrColor fPreviousColor;
+            };
+
+            return new GLFP;
+        }
+
+    private:
+        void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override
+        {}
+
+        bool onIsEqual(const GrFragmentProcessor& that) const override {
+            return fColor == that.cast<ReplaceInputFragmentProcessor>().fColor;
+        }
+
+        void onComputeInvariantOutput(GrInvariantOutput* inout) const override {
+            inout->setToOther(kRGBA_GrColorComponentFlags, fColor,
+                              GrInvariantOutput::kWillNot_ReadInput);
+            this->childProcessor(0).computeInvariantOutput(inout);
+        }
+
+        GrColor fColor;
+    };
+
+    GrInvariantOutput childOut(0x0, kNone_GrColorComponentFlags, false);
+    fp->computeInvariantOutput(&childOut);
+    if (childOut.willUseInputColor()) {
+        return new ReplaceInputFragmentProcessor(fp, color);
+    } else {
+        return SkRef(fp);
+    }
+}
+
+const GrFragmentProcessor* GrFragmentProcessor::RunInSeries(const GrFragmentProcessor* series[],
+                                                            int cnt) {
+    class SeriesFragmentProcessor : public GrFragmentProcessor {
+    public:
+        SeriesFragmentProcessor(const GrFragmentProcessor* children[], int cnt){
+            SkASSERT(cnt > 1);
+            this->initClassID<SeriesFragmentProcessor>();
+            for (int i = 0; i < cnt; ++i) {
+                this->registerChildProcessor(children[i]);
+            }
+        }
+
+        const char* name() const override { return "Series"; }
+
+        GrGLSLFragmentProcessor* onCreateGLSLInstance() const override {
+            class GLFP : public GrGLSLFragmentProcessor {
+            public:
+                GLFP() {}
+                void emitCode(EmitArgs& args) override {
+                    SkString input(args.fInputColor);
+                    for (int i = 0; i < this->numChildProcessors() - 1; ++i) {
+                        SkString temp;
+                        temp.printf("out%d", i);
+                        this->emitChild(i, input.c_str(), &temp, args);
+                        input = temp;
+                    }
+                    // Last guy writes to our output variable.
+                    this->emitChild(this->numChildProcessors() - 1, input.c_str(), args);
+                }
+            };
+            return new GLFP;
+        }
+
+    private:
+        void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override {}
+
+        bool onIsEqual(const GrFragmentProcessor&) const override { return true; }
+
+        void onComputeInvariantOutput(GrInvariantOutput* inout) const override {
+            GrProcOptInfo info;
+            SkTDArray<const GrFragmentProcessor*> children;
+            children.setCount(this->numChildProcessors());
+            for (int i = 0; i < children.count(); ++i) {
+                children[i] = &this->childProcessor(i);
+            }
+            info.calcWithInitialValues(children.begin(), children.count(), inout->color(),
+                                       inout->validFlags(), false, false);
+            for (int i = 0; i < this->numChildProcessors(); ++i) {
+                this->childProcessor(i).computeInvariantOutput(inout);
+            }
+        }
+    };
+
+    if (!cnt) {
+        return nullptr;
+    }
+
+    // Run the through the series, do the invariant output processing, and look for eliminations.
+    SkTDArray<const GrFragmentProcessor*> replacementSeries;
+    SkAutoTUnref<const GrFragmentProcessor> colorFP;
+    GrProcOptInfo info;
+
+    info.calcWithInitialValues(series, cnt, 0x0, kNone_GrColorComponentFlags, false, false);
+    if (kRGBA_GrColorComponentFlags == info.validFlags()) {
+        return GrConstColorProcessor::Create(info.color(),
+                                             GrConstColorProcessor::kIgnore_InputMode);
+    } else {
+        int firstIdx = info.firstEffectiveProcessorIndex();
+        cnt -= firstIdx;
+        if (firstIdx > 0 && info.inputColorIsUsed()) {
+            colorFP.reset(GrConstColorProcessor::Create(info.inputColorToFirstEffectiveProccesor(),
+                                                        GrConstColorProcessor::kIgnore_InputMode));
+            cnt += 1;
+            replacementSeries.setCount(cnt);
+            replacementSeries[0] = colorFP;
+            for (int i = 0; i < cnt - 1; ++i) {
+                replacementSeries[i + 1] = series[firstIdx + i];
+            }
+            series = replacementSeries.begin();
+        } else {
+            series += firstIdx;
+            cnt -= firstIdx;
+        }
+    }
+
+    if (1 == cnt) {
+        return SkRef(series[0]);
+    } else {
+        return new SeriesFragmentProcessor(series, cnt);
+    }
+}
+
diff --git a/gfx/skia/skia/src/gpu/GrGeometryBuffer.h b/gfx/skia/skia/src/gpu/GrGeometryBuffer.h
index 3d57f1dbec5e..56a6cae3fb08 100644
--- a/gfx/skia/skia/src/gpu/GrGeometryBuffer.h
+++ b/gfx/skia/skia/src/gpu/GrGeometryBuffer.h
@@ -19,7 +19,7 @@ class GrGpu;
  */
 class GrGeometryBuffer : public GrGpuResource {
 public:
-    SK_DECLARE_INST_COUNT(GrGeometryBuffer);
+    
 
     /**
      *Retrieves whether the buffer was created with the dynamic flag
@@ -48,7 +48,7 @@ public:
      * Note that buffer mapping does not go through GrContext and therefore is
      * not serialized with other operations.
      *
-     * @return a pointer to the data or NULL if the map fails.
+     * @return a pointer to the data or nullptr if the map fails.
      */
      void* map() { return (fMapPtr = this->onMap()); }
 
@@ -58,16 +58,16 @@ public:
      * The pointer returned by the previous map call will no longer be valid.
      */
      void unmap() {
-         SkASSERT(NULL != fMapPtr);
+         SkASSERT(fMapPtr);
          this->onUnmap();
-         fMapPtr = NULL;
+         fMapPtr = nullptr;
      }
 
     /**
-     * Returns the same ptr that map() returned at time of map or NULL if the
+     * Returns the same ptr that map() returned at time of map or nullptr if the
      * is not mapped.
      *
-     * @return ptr to mapped buffer data or NULL if buffer is not mapped.
+     * @return ptr to mapped buffer data or nullptr if buffer is not mapped.
      */
      void* mapPtr() const { return fMapPtr; }
 
@@ -76,7 +76,7 @@ public:
 
      @return true if the buffer is mapped, false otherwise.
      */
-     bool isMapped() const { return NULL != fMapPtr; }
+     bool isMapped() const { return SkToBool(fMapPtr); }
 
     /**
      * Updates the buffer data.
@@ -98,18 +98,17 @@ public:
         return this->onUpdateData(src, srcSizeInBytes);
     }
 
-    // GrGpuResource overrides
-    virtual size_t gpuMemorySize() const { return fGpuMemorySize; }
-
 protected:
-    GrGeometryBuffer(GrGpu* gpu, bool isWrapped, size_t gpuMemorySize, bool dynamic, bool cpuBacked)
-        : INHERITED(gpu, isWrapped)
-        , fMapPtr(NULL)
+    GrGeometryBuffer(GrGpu* gpu, size_t gpuMemorySize, bool dynamic, bool cpuBacked)
+        : INHERITED(gpu, kCached_LifeCycle)
+        , fMapPtr(nullptr)
         , fGpuMemorySize(gpuMemorySize)
         , fDynamic(dynamic)
         , fCPUBacked(cpuBacked) {}
 
 private:
+    virtual size_t onGpuMemorySize() const { return fGpuMemorySize; }
+
     virtual void* onMap() = 0;
     virtual void onUnmap() = 0;
     virtual bool onUpdateData(const void* src, size_t srcSizeInBytes) = 0;
diff --git a/gfx/skia/skia/src/gpu/GrGeometryProcessor.h b/gfx/skia/skia/src/gpu/GrGeometryProcessor.h
new file mode 100644
index 000000000000..4d041d64bc91
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrGeometryProcessor.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGeometryProcessor_DEFINED
+#define GrGeometryProcessor_DEFINED
+
+#include "GrPrimitiveProcessor.h"
+
+/**
+ * A GrGeometryProcessor is a flexible method for rendering a primitive.  The GrGeometryProcessor
+ * has complete control over vertex attributes and uniforms(aside from the render target) but it
+ * must obey the same contract as any GrPrimitiveProcessor, specifically it must emit a color and
+ * coverage into the fragment shader.  Where this color and coverage come from is completely the
+ * responsibility of the GrGeometryProcessor.
+ */
+class GrGeometryProcessor : public GrPrimitiveProcessor {
+public:
+    GrGeometryProcessor()
+        : INHERITED(false)
+        , fWillUseGeoShader(false)
+        , fLocalCoordsType(kUnused_LocalCoordsType) {}
+
+    bool willUseGeoShader() const override { return fWillUseGeoShader; }
+
+    bool hasTransformedLocalCoords() const override {
+        return kHasTransformed_LocalCoordsType == fLocalCoordsType;
+    }
+
+    bool hasExplicitLocalCoords() const override {
+        return kHasExplicit_LocalCoordsType == fLocalCoordsType;
+    }
+
+protected:
+    /**
+     * Subclasses call this from their constructor to register vertex attributes.  Attributes
+     * will be padded to the nearest 4 bytes for performance reasons.
+     * TODO After deferred geometry, we should do all of this inline in GenerateGeometry alongside
+     * the struct used to actually populate the attributes.  This is all extremely fragile, vertex
+     * attributes have to be added in the order they will appear in the struct which maps memory.
+     * The processor key should reflect the vertex attributes, or there lack thereof in the
+     * GrGeometryProcessor.
+     */
+    const Attribute& addVertexAttrib(const Attribute& attribute) {
+        SkASSERT(fNumAttribs < kMaxVertexAttribs);
+        fVertexStride += attribute.fOffset;
+        fAttribs[fNumAttribs] = attribute;
+        return fAttribs[fNumAttribs++];
+    }
+
+    void setWillUseGeoShader() { fWillUseGeoShader = true; }
+
+    /**
+     * If a GrFragmentProcessor in the GrPipeline needs localCoods, we will provide them in one of
+     * three ways
+     * 1) LocalCoordTransform * Position - in Shader
+     * 2) LocalCoordTransform * ExplicitLocalCoords- in Shader
+     * 3) A transformation on the CPU uploaded via vertex attribute
+     * TODO make this GrBatches responsibility
+     */
+    enum LocalCoordsType {
+        kUnused_LocalCoordsType,
+        kHasExplicit_LocalCoordsType,
+        kHasTransformed_LocalCoordsType
+    };
+
+    void setHasExplicitLocalCoords() {
+        SkASSERT(kUnused_LocalCoordsType == fLocalCoordsType);
+        fLocalCoordsType = kHasExplicit_LocalCoordsType;
+    }
+    void setHasTransformedLocalCoords() {
+        SkASSERT(kUnused_LocalCoordsType == fLocalCoordsType);
+        fLocalCoordsType = kHasTransformed_LocalCoordsType;
+    }
+
+private:
+    bool fWillUseGeoShader;
+    LocalCoordsType fLocalCoordsType;
+
+    typedef GrPrimitiveProcessor INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/include/gpu/GrGlyph.h b/gfx/skia/skia/src/gpu/GrGlyph.h
similarity index 62%
rename from gfx/skia/skia/include/gpu/GrGlyph.h
rename to gfx/skia/skia/src/gpu/GrGlyph.h
index a379144a4289..55e925f09d12 100644
--- a/gfx/skia/skia/include/gpu/GrGlyph.h
+++ b/gfx/skia/skia/src/gpu/GrGlyph.h
@@ -8,9 +8,12 @@
 #ifndef GrGlyph_DEFINED
 #define GrGlyph_DEFINED
 
+#include "GrBatchAtlas.h"
 #include "GrRect.h"
-#include "SkPath.h"
+#include "GrTypes.h"
+
 #include "SkChecksum.h"
+#include "SkPath.h"
 
 class GrPlot;
 
@@ -21,26 +24,35 @@ class GrPlot;
     - failed to get metrics
  */
 struct GrGlyph {
+    enum MaskStyle {
+        kCoverage_MaskStyle,
+        kDistance_MaskStyle
+    };
+    
     typedef uint32_t PackedID;
 
-    GrPlot*     fPlot;
-    SkPath*     fPath;
-    PackedID    fPackedID;
-    GrIRect16   fBounds;
-    SkIPoint16  fAtlasLocation;
+    GrBatchAtlas::AtlasID fID;
+    SkPath*               fPath;
+    PackedID              fPackedID;
+    GrMaskFormat          fMaskFormat;
+    GrIRect16             fBounds;
+    SkIPoint16            fAtlasLocation;
+    bool                  fTooLargeForAtlas;
 
-    void init(GrGlyph::PackedID packed, const SkIRect& bounds) {
-        fPlot = NULL;
-        fPath = NULL;
+    void init(GrGlyph::PackedID packed, const SkIRect& bounds, GrMaskFormat format) {
+        fID = GrBatchAtlas::kInvalidAtlasID;
+        fPath = nullptr;
         fPackedID = packed;
         fBounds.set(bounds);
+        fMaskFormat = format;
         fAtlasLocation.set(0, 0);
+        fTooLargeForAtlas = GrBatchAtlas::GlyphTooLargeForAtlas(bounds.width(), bounds.height());
     }
 
     void free() {
         if (fPath) {
             delete fPath;
-            fPath = NULL;
+            fPath = nullptr;
         }
     }
 
@@ -56,10 +68,11 @@ struct GrGlyph {
         return (pos >> 14) & 3;
     }
 
-    static inline PackedID Pack(uint16_t glyphID, SkFixed x, SkFixed y) {
+    static inline PackedID Pack(uint16_t glyphID, SkFixed x, SkFixed y, MaskStyle ms) {
         x = ExtractSubPixelBitsFromFixed(x);
         y = ExtractSubPixelBitsFromFixed(y);
-        return (x << 18) | (y << 16) | glyphID;
+        int dfFlag = (ms == kDistance_MaskStyle) ? 0x1 : 0x0;
+        return (dfFlag << 20) | (x << 18) | (y << 16) | glyphID;
     }
 
     static inline SkFixed UnpackFixedX(PackedID packed) {
@@ -70,6 +83,10 @@ struct GrGlyph {
         return ((packed >> 16) & 3) << 14;
     }
 
+    static inline MaskStyle UnpackMaskStyle(PackedID packed) {
+        return ((packed >> 20) & 1) ? kDistance_MaskStyle : kCoverage_MaskStyle;
+    }
+    
     static inline uint16_t UnpackID(PackedID packed) {
         return (uint16_t)packed;
     }
@@ -79,7 +96,7 @@ struct GrGlyph {
     }
 
     static inline uint32_t Hash(GrGlyph::PackedID key) {
-        return SkChecksum::Murmur3(&key, sizeof(key));
+        return SkChecksum::Mix(key);
     }
 };
 
diff --git a/gfx/skia/skia/src/gpu/GrGpu.cpp b/gfx/skia/skia/src/gpu/GrGpu.cpp
index 0b49e7445ab8..439fe1b70fa9 100644
--- a/gfx/skia/skia/src/gpu/GrGpu.cpp
+++ b/gfx/skia/skia/src/gpu/GrGpu.cpp
@@ -9,253 +9,324 @@
 
 #include "GrGpu.h"
 
-#include "GrBufferAllocPool.h"
+#include "GrCaps.h"
 #include "GrContext.h"
-#include "GrDrawTargetCaps.h"
+#include "GrGpuResourcePriv.h"
 #include "GrIndexBuffer.h"
-#include "GrStencilBuffer.h"
+#include "GrPathRendering.h"
+#include "GrPipeline.h"
+#include "GrResourceCache.h"
+#include "GrResourceProvider.h"
+#include "GrRenderTargetPriv.h"
+#include "GrStencilAttachment.h"
+#include "GrSurfacePriv.h"
 #include "GrVertexBuffer.h"
+#include "GrVertices.h"
 
-// probably makes no sense for this to be less than a page
-static const size_t VERTEX_POOL_VB_SIZE = 1 << 18;
-static const int VERTEX_POOL_VB_COUNT = 4;
-static const size_t INDEX_POOL_IB_SIZE = 1 << 16;
-static const int INDEX_POOL_IB_COUNT = 4;
+GrVertices& GrVertices::operator =(const GrVertices& di) {
+    fPrimitiveType  = di.fPrimitiveType;
+    fStartVertex    = di.fStartVertex;
+    fStartIndex     = di.fStartIndex;
+    fVertexCount    = di.fVertexCount;
+    fIndexCount     = di.fIndexCount;
+
+    fInstanceCount          = di.fInstanceCount;
+    fVerticesPerInstance    = di.fVerticesPerInstance;
+    fIndicesPerInstance     = di.fIndicesPerInstance;
+    fMaxInstancesPerDraw    = di.fMaxInstancesPerDraw;
+
+    fVertexBuffer.reset(di.vertexBuffer());
+    fIndexBuffer.reset(di.indexBuffer());
+
+    return *this;
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#define DEBUG_INVAL_BUFFER    0xdeadcafe
-#define DEBUG_INVAL_START_IDX -1
-
 GrGpu::GrGpu(GrContext* context)
-    : GrDrawTarget(context)
-    , fResetTimestamp(kExpiredTimestamp+1)
+    : fResetTimestamp(kExpiredTimestamp+1)
     , fResetBits(kAll_GrBackendState)
-    , fVertexPool(NULL)
-    , fIndexPool(NULL)
-    , fVertexPoolUseCnt(0)
-    , fIndexPoolUseCnt(0)
-    , fQuadIndexBuffer(NULL) {
-
-    fClipMaskManager.setGpu(this);
-
-    fGeomPoolStateStack.push_back();
-#ifdef SK_DEBUG
-    GeometryPoolState& poolState = fGeomPoolStateStack.back();
-    poolState.fPoolVertexBuffer = (GrVertexBuffer*)DEBUG_INVAL_BUFFER;
-    poolState.fPoolStartVertex = DEBUG_INVAL_START_IDX;
-    poolState.fPoolIndexBuffer = (GrIndexBuffer*)DEBUG_INVAL_BUFFER;
-    poolState.fPoolStartIndex = DEBUG_INVAL_START_IDX;
-#endif
+    , fContext(context) {
 }
 
-GrGpu::~GrGpu() {
-    this->releaseResources();
-}
+GrGpu::~GrGpu() {}
 
-void GrGpu::abandonResources() {
-
-    fClipMaskManager.releaseResources();
-
-    while (NULL != fObjectList.head()) {
-        fObjectList.head()->abandon();
-    }
-
-    SkASSERT(NULL == fQuadIndexBuffer || fQuadIndexBuffer->wasDestroyed());
-    SkSafeSetNull(fQuadIndexBuffer);
-    delete fVertexPool;
-    fVertexPool = NULL;
-    delete fIndexPool;
-    fIndexPool = NULL;
-}
-
-void GrGpu::releaseResources() {
-
-    fClipMaskManager.releaseResources();
-
-    while (NULL != fObjectList.head()) {
-        fObjectList.head()->release();
-    }
-
-    SkASSERT(NULL == fQuadIndexBuffer || fQuadIndexBuffer->wasDestroyed());
-    SkSafeSetNull(fQuadIndexBuffer);
-    delete fVertexPool;
-    fVertexPool = NULL;
-    delete fIndexPool;
-    fIndexPool = NULL;
-}
-
-void GrGpu::insertObject(GrGpuResource* object) {
-    SkASSERT(NULL != object);
-    SkASSERT(this == object->getGpu());
-
-    fObjectList.addToHead(object);
-}
-
-void GrGpu::removeObject(GrGpuResource* object) {
-    SkASSERT(NULL != object);
-    SkASSERT(this == object->getGpu());
-
-    fObjectList.remove(object);
-}
-
-
-void GrGpu::unimpl(const char msg[]) {
-#ifdef SK_DEBUG
-    GrPrintf("--- GrGpu unimplemented(\"%s\")\n", msg);
-#endif
-}
+void GrGpu::contextAbandoned() {}
 
 ////////////////////////////////////////////////////////////////////////////////
 
-GrTexture* GrGpu::createTexture(const GrTextureDesc& desc,
+bool GrGpu::makeCopyForTextureParams(int width, int height, const GrTextureParams& textureParams,
+                                     GrTextureProducer::CopyParams* copyParams) const {
+    const GrCaps& caps = *this->caps();
+    if (textureParams.isTiled() && !caps.npotTextureTileSupport() &&
+        (!SkIsPow2(width) || !SkIsPow2(height))) {
+        copyParams->fWidth = GrNextPow2(width);
+        copyParams->fHeight = GrNextPow2(height);
+        switch (textureParams.filterMode()) {
+            case GrTextureParams::kNone_FilterMode:
+                copyParams->fFilter = GrTextureParams::kNone_FilterMode;
+                break;
+            case GrTextureParams::kBilerp_FilterMode:
+            case GrTextureParams::kMipMap_FilterMode:
+                // We are only ever scaling up so no reason to ever indicate kMipMap.
+                copyParams->fFilter = GrTextureParams::kBilerp_FilterMode;
+                break;
+        }
+        return true;
+    }
+    return false;
+}
+
+static GrSurfaceOrigin resolve_origin(GrSurfaceOrigin origin, bool renderTarget) {
+    // By default, GrRenderTargets are GL's normal orientation so that they
+    // can be drawn to by the outside world without the client having
+    // to render upside down.
+    if (kDefault_GrSurfaceOrigin == origin) {
+        return renderTarget ? kBottomLeft_GrSurfaceOrigin : kTopLeft_GrSurfaceOrigin;
+    } else {
+        return origin;
+    }
+}
+
+GrTexture* GrGpu::createTexture(const GrSurfaceDesc& origDesc, bool budgeted,
                                 const void* srcData, size_t rowBytes) {
+    GrSurfaceDesc desc = origDesc;
+
     if (!this->caps()->isConfigTexturable(desc.fConfig)) {
-        return NULL;
+        return nullptr;
     }
 
-    if ((desc.fFlags & kRenderTarget_GrTextureFlagBit) &&
-        !this->caps()->isConfigRenderable(desc.fConfig, desc.fSampleCnt > 0)) {
-        return NULL;
+    bool isRT = SkToBool(desc.fFlags & kRenderTarget_GrSurfaceFlag);
+    if (isRT && !this->caps()->isConfigRenderable(desc.fConfig, desc.fSampleCnt > 0)) {
+        return nullptr;
     }
 
-    GrTexture *tex = NULL;
+    // We currently do not support multisampled textures
+    if (!isRT && desc.fSampleCnt > 0) {
+        return nullptr;
+    }
+
+    GrTexture *tex = nullptr;
+
+    if (isRT) {
+        int maxRTSize = this->caps()->maxRenderTargetSize();
+        if (desc.fWidth > maxRTSize || desc.fHeight > maxRTSize) {
+            return nullptr;
+        }
+    } else {
+        int maxSize = this->caps()->maxTextureSize();
+        if (desc.fWidth > maxSize || desc.fHeight > maxSize) {
+            return nullptr;
+        }
+    }
+
+    GrGpuResource::LifeCycle lifeCycle = budgeted ? GrGpuResource::kCached_LifeCycle :
+                                                    GrGpuResource::kUncached_LifeCycle;
+
+    desc.fSampleCnt = SkTMin(desc.fSampleCnt, this->caps()->maxSampleCount());
+    // Attempt to catch un- or wrongly initialized sample counts;
+    SkASSERT(desc.fSampleCnt >= 0 && desc.fSampleCnt <= 64);
+
+    desc.fOrigin = resolve_origin(desc.fOrigin, isRT);
+
     if (GrPixelConfigIsCompressed(desc.fConfig)) {
         // We shouldn't be rendering into this
-        SkASSERT((desc.fFlags & kRenderTarget_GrTextureFlagBit) == 0);
+        SkASSERT(!isRT);
+        SkASSERT(0 == desc.fSampleCnt);
 
         if (!this->caps()->npotTextureTileSupport() &&
             (!SkIsPow2(desc.fWidth) || !SkIsPow2(desc.fHeight))) {
-            return NULL;
+            return nullptr;
         }
 
         this->handleDirtyContext();
-        tex = this->onCreateCompressedTexture(desc, srcData);
+        tex = this->onCreateCompressedTexture(desc, lifeCycle, srcData);
     } else {
         this->handleDirtyContext();
-        tex = this->onCreateTexture(desc, srcData, rowBytes);
-        if (NULL != tex &&
-            (kRenderTarget_GrTextureFlagBit & desc.fFlags) &&
-            !(kNoStencil_GrTextureFlagBit & desc.fFlags)) {
-            SkASSERT(NULL != tex->asRenderTarget());
-            // TODO: defer this and attach dynamically
-            if (!this->attachStencilBufferToRenderTarget(tex->asRenderTarget())) {
-                tex->unref();
-                return NULL;
-            }
+        tex = this->onCreateTexture(desc, lifeCycle, srcData, rowBytes);
+    }
+    if (!this->caps()->reuseScratchTextures() && !isRT) {
+        tex->resourcePriv().removeScratchKey();
+    }
+    if (tex) {
+        fStats.incTextureCreates();
+        if (srcData) {
+            fStats.incTextureUploads();
         }
     }
     return tex;
 }
 
-bool GrGpu::attachStencilBufferToRenderTarget(GrRenderTarget* rt) {
-    SkASSERT(NULL == rt->getStencilBuffer());
-    GrStencilBuffer* sb =
-        this->getContext()->findStencilBuffer(rt->width(),
-                                              rt->height(),
-                                              rt->numSamples());
-    if (NULL != sb) {
-        rt->setStencilBuffer(sb);
-        bool attached = this->attachStencilBufferToRenderTarget(sb, rt);
-        if (!attached) {
-            rt->setStencilBuffer(NULL);
-        }
-        return attached;
-    }
-    if (this->createStencilBufferForRenderTarget(rt,
-                                                 rt->width(), rt->height())) {
-        // Right now we're clearing the stencil buffer here after it is
-        // attached to an RT for the first time. When we start matching
-        // stencil buffers with smaller color targets this will no longer
-        // be correct because it won't be guaranteed to clear the entire
-        // sb.
-        // We used to clear down in the GL subclass using a special purpose
-        // FBO. But iOS doesn't allow a stencil-only FBO. It reports unsupported
-        // FBO status.
-        GrDrawState::AutoRenderTargetRestore artr(this->drawState(), rt);
-        this->clearStencil();
-        return true;
-    } else {
-        return false;
-    }
-}
-
-GrTexture* GrGpu::wrapBackendTexture(const GrBackendTextureDesc& desc) {
+GrTexture* GrGpu::wrapBackendTexture(const GrBackendTextureDesc& desc, GrWrapOwnership ownership) {
     this->handleDirtyContext();
-    GrTexture* tex = this->onWrapBackendTexture(desc);
-    if (NULL == tex) {
-        return NULL;
+    GrTexture* tex = this->onWrapBackendTexture(desc, ownership);
+    if (nullptr == tex) {
+        return nullptr;
     }
     // TODO: defer this and attach dynamically
     GrRenderTarget* tgt = tex->asRenderTarget();
-    if (NULL != tgt &&
-        !this->attachStencilBufferToRenderTarget(tgt)) {
+    if (tgt && !fContext->resourceProvider()->attachStencilAttachment(tgt)) {
         tex->unref();
-        return NULL;
+        return nullptr;
     } else {
         return tex;
     }
 }
 
-GrRenderTarget* GrGpu::wrapBackendRenderTarget(const GrBackendRenderTargetDesc& desc) {
+GrRenderTarget* GrGpu::wrapBackendRenderTarget(const GrBackendRenderTargetDesc& desc,
+                                               GrWrapOwnership ownership) {
     this->handleDirtyContext();
-    return this->onWrapBackendRenderTarget(desc);
+    return this->onWrapBackendRenderTarget(desc, ownership);
 }
 
 GrVertexBuffer* GrGpu::createVertexBuffer(size_t size, bool dynamic) {
     this->handleDirtyContext();
-    return this->onCreateVertexBuffer(size, dynamic);
+    GrVertexBuffer* vb = this->onCreateVertexBuffer(size, dynamic);
+    if (!this->caps()->reuseScratchBuffers()) {
+        vb->resourcePriv().removeScratchKey();
+    }
+    return vb;
 }
 
 GrIndexBuffer* GrGpu::createIndexBuffer(size_t size, bool dynamic) {
     this->handleDirtyContext();
-    return this->onCreateIndexBuffer(size, dynamic);
+    GrIndexBuffer* ib = this->onCreateIndexBuffer(size, dynamic);
+    if (!this->caps()->reuseScratchBuffers()) {
+        ib->resourcePriv().removeScratchKey();
+    }
+    return ib;
 }
 
-GrPath* GrGpu::createPath(const SkPath& path, const SkStrokeRec& stroke) {
-    SkASSERT(this->caps()->pathRenderingSupport());
-    this->handleDirtyContext();
-    return this->onCreatePath(path, stroke);
-}
-
-GrPathRange* GrGpu::createPathRange(size_t size, const SkStrokeRec& stroke) {
-    SkASSERT(this->caps()->pathRenderingSupport());
-    this->handleDirtyContext();
-    return this->onCreatePathRange(size, stroke);
-}
-
-void GrGpu::clear(const SkIRect* rect,
+void GrGpu::clear(const SkIRect& rect,
                   GrColor color,
-                  bool canIgnoreRect,
                   GrRenderTarget* renderTarget) {
-    GrDrawState::AutoRenderTargetRestore art;
-    if (NULL != renderTarget) {
-        art.set(this->drawState(), renderTarget);
-    }
-    if (NULL == this->getDrawState().getRenderTarget()) {
-        SkASSERT(0);
-        return;
-    }
+    SkASSERT(renderTarget);
+    SkASSERT(SkIRect::MakeWH(renderTarget->width(), renderTarget->height()).contains(rect));
     this->handleDirtyContext();
-    this->onClear(rect, color, canIgnoreRect);
+    this->onClear(renderTarget, rect, color);
 }
 
-bool GrGpu::readPixels(GrRenderTarget* target,
+void GrGpu::clearStencilClip(const SkIRect& rect,
+                             bool insideClip,
+                             GrRenderTarget* renderTarget) {
+    SkASSERT(renderTarget);
+    this->handleDirtyContext();
+    this->onClearStencilClip(renderTarget, rect, insideClip);
+}
+
+bool GrGpu::copySurface(GrSurface* dst,
+                        GrSurface* src,
+                        const SkIRect& srcRect,
+                        const SkIPoint& dstPoint) {
+    SkASSERT(dst && src);
+    this->handleDirtyContext();
+    return this->onCopySurface(dst, src, srcRect, dstPoint);
+}
+
+bool GrGpu::getReadPixelsInfo(GrSurface* srcSurface, int width, int height, size_t rowBytes,
+                              GrPixelConfig readConfig, DrawPreference* drawPreference,
+                              ReadPixelTempDrawInfo* tempDrawInfo) {
+    SkASSERT(drawPreference);
+    SkASSERT(tempDrawInfo);
+    SkASSERT(kGpuPrefersDraw_DrawPreference != *drawPreference);
+
+    // We currently do not support reading into a compressed buffer
+    if (GrPixelConfigIsCompressed(readConfig)) {
+        return false;
+    }
+
+    if (!this->onGetReadPixelsInfo(srcSurface, width, height, rowBytes, readConfig, drawPreference,
+                                   tempDrawInfo)) {
+        return false;
+    }
+
+    // Check to see if we're going to request that the caller draw when drawing is not possible.
+    if (!srcSurface->asTexture() ||
+        !this->caps()->isConfigRenderable(tempDrawInfo->fTempSurfaceDesc.fConfig, false)) {
+        // If we don't have a fallback to a straight read then fail.
+        if (kRequireDraw_DrawPreference == *drawPreference) {
+            return false;
+        }
+        *drawPreference = kNoDraw_DrawPreference;
+    }
+
+    return true;
+}
+bool GrGpu::getWritePixelsInfo(GrSurface* dstSurface, int width, int height, size_t rowBytes,
+                               GrPixelConfig srcConfig, DrawPreference* drawPreference,
+                               WritePixelTempDrawInfo* tempDrawInfo) {
+    SkASSERT(drawPreference);
+    SkASSERT(tempDrawInfo);
+    SkASSERT(kGpuPrefersDraw_DrawPreference != *drawPreference);
+
+    if (GrPixelConfigIsCompressed(dstSurface->desc().fConfig) &&
+        dstSurface->desc().fConfig != srcConfig) {
+        return false;
+    }
+
+    if (this->caps()->useDrawInsteadOfPartialRenderTargetWrite() &&
+        SkToBool(dstSurface->asRenderTarget()) &&
+        (width < dstSurface->width() || height < dstSurface->height())) {
+        ElevateDrawPreference(drawPreference, kRequireDraw_DrawPreference);
+    }
+
+    if (!this->onGetWritePixelsInfo(dstSurface, width, height, rowBytes, srcConfig, drawPreference,
+                                    tempDrawInfo)) {
+        return false;
+    }
+
+    // Check to see if we're going to request that the caller draw when drawing is not possible.
+    if (!dstSurface->asRenderTarget() ||
+        !this->caps()->isConfigTexturable(tempDrawInfo->fTempSurfaceDesc.fConfig)) {
+        // If we don't have a fallback to a straight upload then fail.
+        if (kRequireDraw_DrawPreference == *drawPreference ||
+            !this->caps()->isConfigTexturable(srcConfig)) {
+            return false;
+        }
+        *drawPreference = kNoDraw_DrawPreference;
+    }
+    return true;
+}
+
+bool GrGpu::readPixels(GrSurface* surface,
                        int left, int top, int width, int height,
                        GrPixelConfig config, void* buffer,
                        size_t rowBytes) {
     this->handleDirtyContext();
-    return this->onReadPixels(target, left, top, width, height,
-                              config, buffer, rowBytes);
+
+    // We cannot read pixels into a compressed buffer
+    if (GrPixelConfigIsCompressed(config)) {
+        return false;
+    }
+
+    size_t bpp = GrBytesPerPixel(config);
+    if (!GrSurfacePriv::AdjustReadPixelParams(surface->width(), surface->height(), bpp,
+                                              &left, &top, &width, &height,
+                                              &buffer,
+                                              &rowBytes)) {
+        return false;
+    }
+
+    return this->onReadPixels(surface,
+                              left, top, width, height,
+                              config, buffer,
+                              rowBytes);
 }
 
-bool GrGpu::writeTexturePixels(GrTexture* texture,
-                               int left, int top, int width, int height,
-                               GrPixelConfig config, const void* buffer,
-                               size_t rowBytes) {
+bool GrGpu::writePixels(GrSurface* surface,
+                        int left, int top, int width, int height,
+                        GrPixelConfig config, const void* buffer,
+                        size_t rowBytes) {
+    if (!buffer) {
+        return false;
+    }
+
     this->handleDirtyContext();
-    return this->onWriteTexturePixels(texture, left, top, width, height,
-                                      config, buffer, rowBytes);
+    if (this->onWritePixels(surface, left, top, width, height, config, buffer, rowBytes)) {
+        fStats.incTextureUploads();
+        return true;
+    }
+    return false;
 }
 
 void GrGpu::resolveRenderTarget(GrRenderTarget* target) {
@@ -264,317 +335,18 @@ void GrGpu::resolveRenderTarget(GrRenderTarget* target) {
     this->onResolveRenderTarget(target);
 }
 
-static const GrStencilSettings& winding_path_stencil_settings() {
-    GR_STATIC_CONST_SAME_STENCIL_STRUCT(gSettings,
-        kIncClamp_StencilOp,
-        kIncClamp_StencilOp,
-        kAlwaysIfInClip_StencilFunc,
-        0xFFFF, 0xFFFF, 0xFFFF);
-    return *GR_CONST_STENCIL_SETTINGS_PTR_FROM_STRUCT_PTR(&gSettings);
-}
-
-static const GrStencilSettings& even_odd_path_stencil_settings() {
-    GR_STATIC_CONST_SAME_STENCIL_STRUCT(gSettings,
-        kInvert_StencilOp,
-        kInvert_StencilOp,
-        kAlwaysIfInClip_StencilFunc,
-        0xFFFF, 0xFFFF, 0xFFFF);
-    return *GR_CONST_STENCIL_SETTINGS_PTR_FROM_STRUCT_PTR(&gSettings);
-}
-
-void GrGpu::getPathStencilSettingsForFillType(SkPath::FillType fill, GrStencilSettings* outStencilSettings) {
-
-    switch (fill) {
-        default:
-            SkFAIL("Unexpected path fill.");
-            /* fallthrough */;
-        case SkPath::kWinding_FillType:
-        case SkPath::kInverseWinding_FillType:
-            *outStencilSettings = winding_path_stencil_settings();
-            break;
-        case SkPath::kEvenOdd_FillType:
-        case SkPath::kInverseEvenOdd_FillType:
-            *outStencilSettings = even_odd_path_stencil_settings();
-            break;
-    }
-    fClipMaskManager.adjustPathStencilParams(outStencilSettings);
-}
-
-
 ////////////////////////////////////////////////////////////////////////////////
 
-static const int MAX_QUADS = 1 << 12; // max possible: (1 << 14) - 1;
-
-GR_STATIC_ASSERT(4 * MAX_QUADS <= 65535);
-
-static inline void fill_indices(uint16_t* indices, int quadCount) {
-    for (int i = 0; i < quadCount; ++i) {
-        indices[6 * i + 0] = 4 * i + 0;
-        indices[6 * i + 1] = 4 * i + 1;
-        indices[6 * i + 2] = 4 * i + 2;
-        indices[6 * i + 3] = 4 * i + 0;
-        indices[6 * i + 4] = 4 * i + 2;
-        indices[6 * i + 5] = 4 * i + 3;
-    }
-}
-
-const GrIndexBuffer* GrGpu::getQuadIndexBuffer() const {
-    if (NULL == fQuadIndexBuffer) {
-        static const int SIZE = sizeof(uint16_t) * 6 * MAX_QUADS;
-        GrGpu* me = const_cast<GrGpu*>(this);
-        fQuadIndexBuffer = me->createIndexBuffer(SIZE, false);
-        if (NULL != fQuadIndexBuffer) {
-            uint16_t* indices = (uint16_t*)fQuadIndexBuffer->map();
-            if (NULL != indices) {
-                fill_indices(indices, MAX_QUADS);
-                fQuadIndexBuffer->unmap();
-            } else {
-                indices = (uint16_t*)sk_malloc_throw(SIZE);
-                fill_indices(indices, MAX_QUADS);
-                if (!fQuadIndexBuffer->updateData(indices, SIZE)) {
-                    fQuadIndexBuffer->unref();
-                    fQuadIndexBuffer = NULL;
-                    SkFAIL("Can't get indices into buffer!");
-                }
-                sk_free(indices);
-            }
-        }
-    }
-
-    return fQuadIndexBuffer;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-bool GrGpu::setupClipAndFlushState(DrawType type, const GrDeviceCoordTexture* dstCopy,
-                                   GrDrawState::AutoRestoreEffects* are,
-                                   const SkRect* devBounds) {
-    if (!fClipMaskManager.setupClipping(this->getClip(), are, devBounds)) {
-        return false;
-    }
-
-    if (!this->flushGraphicsState(type, dstCopy)) {
-        return false;
-    }
-
-    return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-void GrGpu::geometrySourceWillPush() {
-    const GeometrySrcState& geoSrc = this->getGeomSrc();
-    if (kArray_GeometrySrcType == geoSrc.fVertexSrc ||
-        kReserved_GeometrySrcType == geoSrc.fVertexSrc) {
-        this->finalizeReservedVertices();
-    }
-    if (kArray_GeometrySrcType == geoSrc.fIndexSrc ||
-        kReserved_GeometrySrcType == geoSrc.fIndexSrc) {
-        this->finalizeReservedIndices();
-    }
-    GeometryPoolState& newState = fGeomPoolStateStack.push_back();
-#ifdef SK_DEBUG
-    newState.fPoolVertexBuffer = (GrVertexBuffer*)DEBUG_INVAL_BUFFER;
-    newState.fPoolStartVertex = DEBUG_INVAL_START_IDX;
-    newState.fPoolIndexBuffer = (GrIndexBuffer*)DEBUG_INVAL_BUFFER;
-    newState.fPoolStartIndex = DEBUG_INVAL_START_IDX;
-#else
-    (void) newState; // silence compiler warning
-#endif
-}
-
-void GrGpu::geometrySourceWillPop(const GeometrySrcState& restoredState) {
-    // if popping last entry then pops are unbalanced with pushes
-    SkASSERT(fGeomPoolStateStack.count() > 1);
-    fGeomPoolStateStack.pop_back();
-}
-
-void GrGpu::onDraw(const DrawInfo& info) {
+void GrGpu::draw(const DrawArgs& args, const GrVertices& vertices) {
     this->handleDirtyContext();
-    GrDrawState::AutoRestoreEffects are;
-    if (!this->setupClipAndFlushState(PrimTypeToDrawType(info.primitiveType()),
-                                      info.getDstCopy(), &are, info.getDevBounds())) {
-        return;
-    }
-    this->onGpuDraw(info);
-}
-
-void GrGpu::onStencilPath(const GrPath* path, SkPath::FillType fill) {
-    this->handleDirtyContext();
-
-    GrDrawState::AutoRestoreEffects are;
-    if (!this->setupClipAndFlushState(kStencilPath_DrawType, NULL, &are, NULL)) {
-        return;
+    if (GrXferBarrierType barrierType = args.fPipeline->xferBarrierType(*this->caps())) {
+        this->xferBarrier(args.fPipeline->getRenderTarget(), barrierType);
     }
 
-    this->onGpuStencilPath(path, fill);
-}
-
-
-void GrGpu::onDrawPath(const GrPath* path, SkPath::FillType fill,
-                       const GrDeviceCoordTexture* dstCopy) {
-    this->handleDirtyContext();
-
-    drawState()->setDefaultVertexAttribs();
-
-    GrDrawState::AutoRestoreEffects are;
-    if (!this->setupClipAndFlushState(kDrawPath_DrawType, dstCopy, &are, NULL)) {
-        return;
-    }
-
-    this->onGpuDrawPath(path, fill);
-}
-
-void GrGpu::onDrawPaths(const GrPathRange* pathRange,
-                        const uint32_t indices[], int count,
-                        const float transforms[], PathTransformType transformsType,
-                        SkPath::FillType fill, const GrDeviceCoordTexture* dstCopy) {
-    this->handleDirtyContext();
-
-    drawState()->setDefaultVertexAttribs();
-
-    GrDrawState::AutoRestoreEffects are;
-    if (!this->setupClipAndFlushState(kDrawPaths_DrawType, dstCopy, &are, NULL)) {
-        return;
-    }
-
-    this->onGpuDrawPaths(pathRange, indices, count, transforms, transformsType, fill);
-}
-
-void GrGpu::finalizeReservedVertices() {
-    SkASSERT(NULL != fVertexPool);
-    fVertexPool->unmap();
-}
-
-void GrGpu::finalizeReservedIndices() {
-    SkASSERT(NULL != fIndexPool);
-    fIndexPool->unmap();
-}
-
-void GrGpu::prepareVertexPool() {
-    if (NULL == fVertexPool) {
-        SkASSERT(0 == fVertexPoolUseCnt);
-        fVertexPool = SkNEW_ARGS(GrVertexBufferAllocPool, (this, true,
-                                                  VERTEX_POOL_VB_SIZE,
-                                                  VERTEX_POOL_VB_COUNT));
-        fVertexPool->releaseGpuRef();
-    } else if (!fVertexPoolUseCnt) {
-        // the client doesn't have valid data in the pool
-        fVertexPool->reset();
-    }
-}
-
-void GrGpu::prepareIndexPool() {
-    if (NULL == fIndexPool) {
-        SkASSERT(0 == fIndexPoolUseCnt);
-        fIndexPool = SkNEW_ARGS(GrIndexBufferAllocPool, (this, true,
-                                                INDEX_POOL_IB_SIZE,
-                                                INDEX_POOL_IB_COUNT));
-        fIndexPool->releaseGpuRef();
-    } else if (!fIndexPoolUseCnt) {
-        // the client doesn't have valid data in the pool
-        fIndexPool->reset();
-    }
-}
-
-bool GrGpu::onReserveVertexSpace(size_t vertexSize,
-                                 int vertexCount,
-                                 void** vertices) {
-    GeometryPoolState& geomPoolState = fGeomPoolStateStack.back();
-
-    SkASSERT(vertexCount > 0);
-    SkASSERT(NULL != vertices);
-
-    this->prepareVertexPool();
-
-    *vertices = fVertexPool->makeSpace(vertexSize,
-                                       vertexCount,
-                                       &geomPoolState.fPoolVertexBuffer,
-                                       &geomPoolState.fPoolStartVertex);
-    if (NULL == *vertices) {
-        return false;
-    }
-    ++fVertexPoolUseCnt;
-    return true;
-}
-
-bool GrGpu::onReserveIndexSpace(int indexCount, void** indices) {
-    GeometryPoolState& geomPoolState = fGeomPoolStateStack.back();
-
-    SkASSERT(indexCount > 0);
-    SkASSERT(NULL != indices);
-
-    this->prepareIndexPool();
-
-    *indices = fIndexPool->makeSpace(indexCount,
-                                     &geomPoolState.fPoolIndexBuffer,
-                                     &geomPoolState.fPoolStartIndex);
-    if (NULL == *indices) {
-        return false;
-    }
-    ++fIndexPoolUseCnt;
-    return true;
-}
-
-void GrGpu::releaseReservedVertexSpace() {
-    const GeometrySrcState& geoSrc = this->getGeomSrc();
-    SkASSERT(kReserved_GeometrySrcType == geoSrc.fVertexSrc);
-    size_t bytes = geoSrc.fVertexCount * geoSrc.fVertexSize;
-    fVertexPool->putBack(bytes);
-    --fVertexPoolUseCnt;
-}
-
-void GrGpu::releaseReservedIndexSpace() {
-    const GeometrySrcState& geoSrc = this->getGeomSrc();
-    SkASSERT(kReserved_GeometrySrcType == geoSrc.fIndexSrc);
-    size_t bytes = geoSrc.fIndexCount * sizeof(uint16_t);
-    fIndexPool->putBack(bytes);
-    --fIndexPoolUseCnt;
-}
-
-void GrGpu::onSetVertexSourceToArray(const void* vertexArray, int vertexCount) {
-    this->prepareVertexPool();
-    GeometryPoolState& geomPoolState = fGeomPoolStateStack.back();
-#ifdef SK_DEBUG
-    bool success =
-#endif
-    fVertexPool->appendVertices(this->getVertexSize(),
-                                vertexCount,
-                                vertexArray,
-                                &geomPoolState.fPoolVertexBuffer,
-                                &geomPoolState.fPoolStartVertex);
-    ++fVertexPoolUseCnt;
-    GR_DEBUGASSERT(success);
-}
-
-void GrGpu::onSetIndexSourceToArray(const void* indexArray, int indexCount) {
-    this->prepareIndexPool();
-    GeometryPoolState& geomPoolState = fGeomPoolStateStack.back();
-#ifdef SK_DEBUG
-    bool success =
-#endif
-    fIndexPool->appendIndices(indexCount,
-                              indexArray,
-                              &geomPoolState.fPoolIndexBuffer,
-                              &geomPoolState.fPoolStartIndex);
-    ++fIndexPoolUseCnt;
-    GR_DEBUGASSERT(success);
-}
-
-void GrGpu::releaseVertexArray() {
-    // if vertex source was array, we stowed data in the pool
-    const GeometrySrcState& geoSrc = this->getGeomSrc();
-    SkASSERT(kArray_GeometrySrcType == geoSrc.fVertexSrc);
-    size_t bytes = geoSrc.fVertexCount * geoSrc.fVertexSize;
-    fVertexPool->putBack(bytes);
-    --fVertexPoolUseCnt;
-}
-
-void GrGpu::releaseIndexArray() {
-    // if index source was array, we stowed data in the pool
-    const GeometrySrcState& geoSrc = this->getGeomSrc();
-    SkASSERT(kArray_GeometrySrcType == geoSrc.fIndexSrc);
-    size_t bytes = geoSrc.fIndexCount * sizeof(uint16_t);
-    fIndexPool->putBack(bytes);
-    --fIndexPoolUseCnt;
+    GrVertices::Iterator iter;
+    const GrNonInstancedVertices* verts = iter.init(vertices);
+    do {
+        this->onDraw(args, *verts);
+        fStats.incNumDraws();
+    } while ((verts = iter.next()));
 }
diff --git a/gfx/skia/skia/src/gpu/GrGpu.h b/gfx/skia/skia/src/gpu/GrGpu.h
index b752f7c09cac..aeaa595f8b69 100644
--- a/gfx/skia/skia/src/gpu/GrGpu.h
+++ b/gfx/skia/skia/src/gpu/GrGpu.h
@@ -8,51 +8,61 @@
 #ifndef GrGpu_DEFINED
 #define GrGpu_DEFINED
 
-#include "GrDrawTarget.h"
-#include "GrClipMaskManager.h"
+#include "GrPipelineBuilder.h"
+#include "GrProgramDesc.h"
+#include "GrStencil.h"
+#include "GrTextureParamsAdjuster.h"
+#include "GrXferProcessor.h"
 #include "SkPath.h"
 
+class GrBatchTracker;
 class GrContext;
-class GrIndexBufferAllocPool;
+class GrGLContext;
+class GrIndexBuffer;
+class GrNonInstancedVertices;
 class GrPath;
 class GrPathRange;
 class GrPathRenderer;
 class GrPathRendererChain;
-class GrStencilBuffer;
-class GrVertexBufferAllocPool;
+class GrPathRendering;
+class GrPipeline;
+class GrPrimitiveProcessor;
+class GrRenderTarget;
+class GrStencilAttachment;
+class GrSurface;
+class GrTexture;
+class GrVertexBuffer;
+class GrVertices;
 
-class GrGpu : public GrDrawTarget {
+class GrGpu : public SkRefCnt {
 public:
-
-    /**
-     * Additional blend coefficients for dual source blending, not exposed
-     * through GrPaint/GrContext.
-     */
-    enum ExtendedBlendCoeffs {
-        // source 2 refers to second output color when
-        // using dual source blending.
-        kS2C_GrBlendCoeff = kPublicGrBlendCoeffCount,
-        kIS2C_GrBlendCoeff,
-        kS2A_GrBlendCoeff,
-        kIS2A_GrBlendCoeff,
-
-        kTotalGrBlendCoeffCount
-    };
-
     /**
      * Create an instance of GrGpu that matches the specified backend. If the requested backend is
-     * not supported (at compile-time or run-time) this returns NULL. The context will not be
+     * not supported (at compile-time or run-time) this returns nullptr. The context will not be
      * fully constructed and should not be used by GrGpu until after this function returns.
      */
-    static GrGpu* Create(GrBackend, GrBackendContext, GrContext* context);
+    static GrGpu* Create(GrBackend, GrBackendContext, const GrContextOptions&, GrContext* context);
 
     ////////////////////////////////////////////////////////////////////////////
 
     GrGpu(GrContext* context);
-    virtual ~GrGpu();
+    ~GrGpu() override;
 
-    GrContext* getContext() { return this->INHERITED::getContext(); }
-    const GrContext* getContext() const { return this->INHERITED::getContext(); }
+    GrContext* getContext() { return fContext; }
+    const GrContext* getContext() const { return fContext; }
+
+    /**
+     * Gets the capabilities of the draw target.
+     */
+    const GrCaps* caps() const { return fCaps.get(); }
+
+    GrPathRendering* pathRendering() { return fPathRendering.get();  }
+
+    // Called by GrContext when the underlying backend context has been destroyed.
+    // GrGpu should use this to ensure that no backend API calls will be made from
+    // here onward, including in its destructor. Subclasses should call
+    // INHERITED::contextAbandoned() if they override this.
+    virtual void contextAbandoned();
 
     /**
      * The GrGpu object normally assumes that no outsider is setting state
@@ -60,52 +70,39 @@ public:
      * the GrGpu that the state was modified and it shouldn't make assumptions
      * about the state.
      */
-    void markContextDirty(uint32_t state = kAll_GrBackendState) {
-        fResetBits |= state;
-    }
-
-    void unimpl(const char[]);
+    void markContextDirty(uint32_t state = kAll_GrBackendState) { fResetBits |= state; }
 
     /**
-     * Creates a texture object. If desc width or height is not a power of
-     * two but underlying API requires a power of two texture then srcData
-     * will be embedded in a power of two texture. The extra width and height
-     * is filled as though srcData were rendered clamped into the texture.
-     * The exception is when using compressed data formats. In this case, the
-     * desc width and height must be a multiple of the compressed format block
-     * size otherwise this function returns NULL. Similarly, if the underlying
-     * API requires a power of two texture and the source width and height are not
-     * a power of two, then this function returns NULL.
-     *
-     * If kRenderTarget_TextureFlag is specified the GrRenderTarget is
-     * accessible via GrTexture::asRenderTarget(). The texture will hold a ref
-     * on the render target until the texture is destroyed. Compressed textures
-     * cannot have the kRenderTarget_TextureFlag set.
+     * Creates a texture object. If kRenderTarget_GrSurfaceFlag the texture can
+     * be used as a render target by calling GrTexture::asRenderTarget(). Not all
+     * pixel configs can be used as render targets. Support for configs as textures
+     * or render targets can be checked using GrCaps.
      *
      * @param desc        describes the texture to be created.
+     * @param budgeted    does this texture count against the resource cache budget?
      * @param srcData     texel data to load texture. Begins with full-size
      *                    palette data for paletted textures. For compressed
      *                    formats it contains the compressed pixel data. Otherwise,
-     *                    it contains width*height texels. If NULL texture data
+     *                    it contains width*height texels. If nullptr texture data
      *                    is uninitialized.
      * @param rowBytes    the number of bytes between consecutive rows. Zero
      *                    means rows are tightly packed. This field is ignored
      *                    for compressed formats.
      *
-     * @return    The texture object if successful, otherwise NULL.
+     * @return    The texture object if successful, otherwise nullptr.
      */
-    GrTexture* createTexture(const GrTextureDesc& desc,
+    GrTexture* createTexture(const GrSurfaceDesc& desc, bool budgeted,
                              const void* srcData, size_t rowBytes);
 
     /**
      * Implements GrContext::wrapBackendTexture
      */
-    GrTexture* wrapBackendTexture(const GrBackendTextureDesc&);
+    GrTexture* wrapBackendTexture(const GrBackendTextureDesc&, GrWrapOwnership);
 
     /**
      * Implements GrContext::wrapBackendTexture
      */
-    GrRenderTarget* wrapBackendRenderTarget(const GrBackendRenderTargetDesc&);
+    GrRenderTarget* wrapBackendRenderTarget(const GrBackendRenderTargetDesc&, GrWrapOwnership);
 
     /**
      * Creates a vertex buffer.
@@ -115,7 +112,7 @@ public:
      *                by either GrVertexBuffer::map() or
      *                GrVertexBuffer::updateData().
      *
-     * @return    The vertex buffer if successful, otherwise NULL.
+     * @return    The vertex buffer if successful, otherwise nullptr.
      */
     GrVertexBuffer* createVertexBuffer(size_t size, bool dynamic);
 
@@ -127,91 +124,93 @@ public:
      *                by either GrIndexBuffer::map() or
      *                GrIndexBuffer::updateData().
      *
-     * @return The index buffer if successful, otherwise NULL.
+     * @return The index buffer if successful, otherwise nullptr.
      */
     GrIndexBuffer* createIndexBuffer(size_t size, bool dynamic);
 
-    /**
-     * Creates a path object that can be stenciled using stencilPath(). It is
-     * only legal to call this if the caps report support for path stenciling.
-     */
-    GrPath* createPath(const SkPath& path, const SkStrokeRec& stroke);
-
-    /**
-     * Creates a path range object that can be used to draw multiple paths via
-     * drawPaths(). It is only legal to call this if the caps report support for
-     * path rendering.
-     */
-    GrPathRange* createPathRange(size_t size, const SkStrokeRec&);
-
-    /**
-     * Returns an index buffer that can be used to render quads.
-     * Six indices per quad: 0, 1, 2, 0, 2, 3, etc.
-     * The max number of quads can be queried using GrIndexBuffer::maxQuads().
-     * Draw with kTriangles_GrPrimitiveType
-     * @ return the quad index buffer
-     */
-    const GrIndexBuffer* getQuadIndexBuffer() const;
-
     /**
      * Resolves MSAA.
      */
     void resolveRenderTarget(GrRenderTarget* target);
 
-    /**
-     * Gets a preferred 8888 config to use for writing/reading pixel data to/from a surface with
-     * config surfaceConfig. The returned config must have at least as many bits per channel as the
-     * readConfig or writeConfig param.
-     */
-    virtual GrPixelConfig preferredReadPixelsConfig(GrPixelConfig readConfig,
-                                                    GrPixelConfig surfaceConfig) const {
-        return readConfig;
-    }
-    virtual GrPixelConfig preferredWritePixelsConfig(GrPixelConfig writeConfig,
-                                                     GrPixelConfig surfaceConfig) const {
-        return writeConfig;
-    }
+    /** Info struct returned by getReadPixelsInfo about performing intermediate draws before
+        reading pixels for performance or correctness. */
+    struct ReadPixelTempDrawInfo {
+        /** If the GrGpu is requesting that the caller do a draw to an intermediate surface then
+            this is descriptor for the temp surface. The draw should always be a rect with
+            dst 0,0,w,h. */
+        GrSurfaceDesc   fTempSurfaceDesc;
+        /** Indicates whether there is a performance advantage to using an exact match texture
+            (in terms of width and height) for the intermediate texture instead of approximate. */
+        bool            fUseExactScratch;
+        /** The caller should swap the R and B channel in the temp draw and then instead of reading
+            the desired config back it should read GrPixelConfigSwapRAndB(readConfig). The swap
+            during the draw and the swap at readback time cancel and the client gets the correct
+            data. The swapped read back is either faster for or required by the underlying backend
+            3D API. */
+        bool            fSwapRAndB;
+    };
+    /** Describes why an intermediate draw must/should be performed before readPixels. */
+    enum DrawPreference {
+        /** On input means that the caller would proceed without draw if the GrGpu doesn't request
+            one.
+            On output means that the GrGpu is not requesting a draw. */
+        kNoDraw_DrawPreference,
+        /** Means that the client would prefer a draw for performance of the readback but
+            can satisfy a straight readPixels call on the inputs without an intermediate draw.
+            getReadPixelsInfo will never set the draw preference to this value but may leave
+            it set. */
+        kCallerPrefersDraw_DrawPreference,
+        /** On output means that GrGpu would prefer a draw for performance of the readback but
+            can satisfy a straight readPixels call on the inputs without an intermediate draw. The
+            caller of getReadPixelsInfo should never specify this on intput. */
+        kGpuPrefersDraw_DrawPreference,
+        /** On input means that the caller requires a draw to do a transformation and there is no
+            CPU fallback.
+            On output means that GrGpu can only satisfy the readPixels request if the intermediate
+            draw is performed.
+          */
+        kRequireDraw_DrawPreference
+    };
 
     /**
-     * Called before uploading writing pixels to a GrTexture when the src pixel config doesn't
-     * match the texture's config.
+     * Used to negotiate whether and how an intermediate draw should or must be performed before
+     * a readPixels call. If this returns false then GrGpu could not deduce an intermediate draw
+     * that would allow a successful readPixels call. The passed width, height, and rowBytes,
+     * must be non-zero and already reflect clipping to the src bounds.
      */
-    virtual bool canWriteTexturePixels(const GrTexture*, GrPixelConfig srcConfig) const = 0;
+    bool getReadPixelsInfo(GrSurface* srcSurface, int readWidth, int readHeight, size_t rowBytes,
+                           GrPixelConfig readConfig, DrawPreference*, ReadPixelTempDrawInfo*);
+
+    /** Info struct returned by getWritePixelsInfo about performing an intermediate draw in order 
+        to write pixels to a GrSurface for either performance or correctness reasons. */
+    struct WritePixelTempDrawInfo {
+        /** If the GrGpu is requesting that the caller upload to an intermediate surface and draw
+            that to the dst then this is the descriptor for the intermediate surface. The caller
+            should upload the pixels such that the upper left pixel of the upload rect is at 0,0 in
+            the intermediate surface.*/
+        GrSurfaceDesc   fTempSurfaceDesc;
+        /** If set, fTempSurfaceDesc's config will be a R/B swap of the src pixel config. The caller
+            should upload the pixels as is such that R and B will be swapped in the intermediate
+            surface. When the intermediate is drawn to the dst the shader should swap R/B again
+            such that the correct swizzle results in the dst. This is done to work around either
+            performance or API restrictions in the backend 3D API implementation. */
+        bool            fSwapRAndB;
+    };
 
     /**
-     * OpenGL's readPixels returns the result bottom-to-top while the skia
-     * API is top-to-bottom. Thus we have to do a y-axis flip. The obvious
-     * solution is to have the subclass do the flip using either the CPU or GPU.
-     * However, the caller (GrContext) may have transformations to apply and can
-     * simply fold in the y-flip for free. On the other hand, the subclass may
-     * be able to do it for free itself. For example, the subclass may have to
-     * do memcpys to handle rowBytes that aren't tight. It could do the y-flip
-     * concurrently.
-     *
-     * This function returns true if a y-flip is required to put the pixels in
-     * top-to-bottom order and the subclass cannot do it for free.
-     *
-     * See read pixels for the params
-     * @return true if calling readPixels with the same set of params will
-     *              produce bottom-to-top data
+     * Used to negotiate whether and how an intermediate surface should be used to write pixels to
+     * a GrSurface. If this returns false then GrGpu could not deduce an intermediate draw
+     * that would allow a successful transfer of the src pixels to the dst. The passed width,
+     * height, and rowBytes, must be non-zero and already reflect clipping to the dst bounds.
      */
-     virtual bool readPixelsWillPayForYFlip(GrRenderTarget* renderTarget,
-                                            int left, int top,
-                                            int width, int height,
-                                            GrPixelConfig config,
-                                            size_t rowBytes) const = 0;
-     /**
-      * This should return true if reading a NxM rectangle of pixels from a
-      * render target is faster if the target has dimensons N and M and the read
-      * rectangle has its top-left at 0,0.
-      */
-     virtual bool fullReadPixelsIsFasterThanPartial() const { return false; };
+    bool getWritePixelsInfo(GrSurface* dstSurface, int width, int height, size_t rowBytes,
+                            GrPixelConfig srcConfig, DrawPreference*, WritePixelTempDrawInfo*);
 
     /**
      * Reads a rectangle of pixels from a render target.
      *
-     * @param renderTarget  the render target to read from. NULL means the
-     *                      current render target.
+     * @param surface       The surface to read from
      * @param left          left edge of the rectangle to read (inclusive)
      * @param top           top edge of the rectangle to read (inclusive)
      * @param width         width of rectangle to read in pixels.
@@ -227,13 +226,14 @@ public:
      *              because of a unsupported pixel config or because no render
      *              target is currently set.
      */
-    bool readPixels(GrRenderTarget* renderTarget,
+    bool readPixels(GrSurface* surface,
                     int left, int top, int width, int height,
                     GrPixelConfig config, void* buffer, size_t rowBytes);
 
     /**
-     * Updates the pixels in a rectangle of a texture.
+     * Updates the pixels in a rectangle of a surface.
      *
+     * @param surface       The surface to write to.
      * @param left          left edge of the rectangle to write (inclusive)
      * @param top           top edge of the rectangle to write (inclusive)
      * @param width         width of rectangle to write in pixels.
@@ -243,46 +243,32 @@ public:
      * @param rowBytes      number of bytes between consecutive rows. Zero
      *                      means rows are tightly packed.
      */
-    bool writeTexturePixels(GrTexture* texture,
-                            int left, int top, int width, int height,
-                            GrPixelConfig config, const void* buffer,
-                            size_t rowBytes);
+    bool writePixels(GrSurface* surface,
+                     int left, int top, int width, int height,
+                     GrPixelConfig config, const void* buffer,
+                     size_t rowBytes);
 
     /**
-     * Called to tell GrGpu that all GrGpuResources have been lost and should
-     * be abandoned. Overrides must call INHERITED::abandonResources().
+     * Clear the passed in render target. Ignores the draw state and clip.
      */
-    virtual void abandonResources();
+    void clear(const SkIRect& rect, GrColor color, GrRenderTarget* renderTarget);
+
+
+    void clearStencilClip(const SkIRect& rect, bool insideClip, GrRenderTarget* renderTarget);
 
     /**
-     * Called to tell GrGpu to release all GrGpuResources. Overrides must call
-     * INHERITED::releaseResources().
-     */
-    void releaseResources();
+     * Discards the contents render target. nullptr indicates that the current render target should
+     * be discarded.
+     **/
+    virtual void discard(GrRenderTarget* = nullptr) = 0;
 
     /**
-     * Add object to list of objects. Should only be called by GrGpuResource.
-     * @param resource  the resource to add.
+     * This is can be called before allocating a texture to be a dst for copySurface. It will
+     * populate the origin, config, and flags fields of the desc such that copySurface can
+     * efficiently succeed. It should only succeed if it can allow copySurface to perform a copy
+     * that would be more effecient than drawing the src to a dst render target.
      */
-    void insertObject(GrGpuResource* object);
-
-    /**
-     * Remove object from list of objects. Should only be called by GrGpuResource.
-     * @param resource  the resource to remove.
-     */
-    void removeObject(GrGpuResource* object);
-
-    // GrDrawTarget overrides
-    virtual void clear(const SkIRect* rect,
-                       GrColor color,
-                       bool canIgnoreRect,
-                       GrRenderTarget* renderTarget = NULL) SK_OVERRIDE;
-
-    virtual void purgeResources() SK_OVERRIDE {
-        // The clip mask manager can rebuild all its clip masks so just
-        // get rid of them all.
-        fClipMaskManager.releaseResources();
-    }
+    virtual bool initCopySurfaceDstDesc(const GrSurface* src, GrSurfaceDesc* desc) const = 0;
 
     // After the client interacts directly with the 3D context state the GrGpu
     // must resync its internal state and assumptions about 3D context state.
@@ -297,82 +283,124 @@ public:
     // Returns a timestamp based on the number of times the context was reset.
     // This timestamp can be used to lazily detect when cached 3D context state
     // is dirty.
-    ResetTimestamp getResetTimestamp() const {
-        return fResetTimestamp;
-    }
+    ResetTimestamp getResetTimestamp() const { return fResetTimestamp; }
 
-    /**
-     * These methods are called by the clip manager's setupClipping function
-     * which (called as part of GrGpu's implementation of onDraw and
-     * onStencilPath member functions.) The GrGpu subclass should flush the
-     * stencil state to the 3D API in its implementation of flushGraphicsState.
-     */
-    void enableScissor(const SkIRect& rect) {
-        fScissorState.fEnabled = true;
-        fScissorState.fRect = rect;
-    }
-    void disableScissor() { fScissorState.fEnabled = false; }
+    virtual void buildProgramDesc(GrProgramDesc*,
+                                  const GrPrimitiveProcessor&,
+                                  const GrPipeline&) const = 0;
 
-    /**
-     * Like the scissor methods above this is called by setupClipping and
-     * should be flushed by the GrGpu subclass in flushGraphicsState. These
-     * stencil settings should be used in place of those on the GrDrawState.
-     * They have been adjusted to account for any interactions between the
-     * GrDrawState's stencil settings and stencil clipping.
-     */
-    void setStencilSettings(const GrStencilSettings& settings) {
-        fStencilSettings = settings;
-    }
-    void disableStencil() { fStencilSettings.setDisabled(); }
+    // Called to perform a surface to surface copy. Fallbacks to issuing a draw from the src to dst
+    // take place at the GrDrawTarget level and this function implement faster copy paths. The rect
+    // and point are pre-clipped. The src rect and implied dst rect are guaranteed to be within the
+    // src/dst bounds and non-empty.
+    bool copySurface(GrSurface* dst,
+                     GrSurface* src,
+                     const SkIRect& srcRect,
+                     const SkIPoint& dstPoint);
 
-    // GrGpu subclass sets clip bit in the stencil buffer. The subclass is
-    // free to clear the remaining bits to zero if masked clears are more
-    // expensive than clearing all bits.
-    virtual void clearStencilClip(const SkIRect& rect, bool insideClip) = 0;
-
-    enum PrivateDrawStateStateBits {
-        kFirstBit = (GrDrawState::kLastPublicStateBit << 1),
-
-        kModifyStencilClip_StateBit = kFirstBit, // allows draws to modify
-                                                 // stencil bits used for
-                                                 // clipping.
+    struct DrawArgs {
+        DrawArgs(const GrPrimitiveProcessor* primProc,
+                 const GrPipeline* pipeline,
+                 const GrProgramDesc* desc)
+            : fPrimitiveProcessor(primProc)
+            , fPipeline(pipeline)
+            , fDesc(desc) {
+            SkASSERT(primProc && pipeline && desc);
+        }
+        const GrPrimitiveProcessor* fPrimitiveProcessor;
+        const GrPipeline* fPipeline;
+        const GrProgramDesc* fDesc;
     };
 
-    void getPathStencilSettingsForFillType(SkPath::FillType fill, GrStencilSettings* outStencilSettings);
+    void draw(const DrawArgs&, const GrVertices&);
 
-    enum DrawType {
-        kDrawPoints_DrawType,
-        kDrawLines_DrawType,
-        kDrawTriangles_DrawType,
-        kStencilPath_DrawType,
-        kDrawPath_DrawType,
-        kDrawPaths_DrawType,
+    ///////////////////////////////////////////////////////////////////////////
+    // Debugging and Stats
+
+    class Stats {
+    public:
+#if GR_GPU_STATS
+        Stats() { this->reset(); }
+
+        void reset() {
+            fRenderTargetBinds = 0;
+            fShaderCompilations = 0;
+            fTextureCreates = 0;
+            fTextureUploads = 0;
+            fStencilAttachmentCreates = 0;
+            fNumDraws = 0;
+        }
+
+        int renderTargetBinds() const { return fRenderTargetBinds; }
+        void incRenderTargetBinds() { fRenderTargetBinds++; }
+        int shaderCompilations() const { return fShaderCompilations; }
+        void incShaderCompilations() { fShaderCompilations++; }
+        int textureCreates() const { return fTextureCreates; }
+        void incTextureCreates() { fTextureCreates++; }
+        int textureUploads() const { return fTextureUploads; }
+        void incTextureUploads() { fTextureUploads++; }
+        void incStencilAttachmentCreates() { fStencilAttachmentCreates++; }
+        void incNumDraws() { fNumDraws++; }
+        void dump(SkString*);
+        void dumpKeyValuePairs(SkTArray<SkString>* keys, SkTArray<double>* values);
+
+    private:
+        int fRenderTargetBinds;
+        int fShaderCompilations;
+        int fTextureCreates;
+        int fTextureUploads;
+        int fStencilAttachmentCreates;
+        int fNumDraws;
+#else
+        void dump(SkString*) {}
+        void dumpKeyValuePairs(SkTArray<SkString>*, SkTArray<double>*) {}
+        void incRenderTargetBinds() {}
+        void incShaderCompilations() {}
+        void incTextureCreates() {}
+        void incTextureUploads() {}
+        void incStencilAttachmentCreates() {}
+        void incNumDraws() {}
+#endif
     };
 
+    Stats* stats() { return &fStats; }
+
+    /** Creates a texture directly in the backend API without wrapping it in a GrTexture. This is
+        only to be used for testing (particularly for testing the methods that import an externally
+        created texture into Skia. Must be matched with a call to deleteTestingOnlyTexture(). */
+    virtual GrBackendObject createTestingOnlyBackendTexture(void* pixels, int w, int h,
+                                                            GrPixelConfig config) const = 0;
+    /** Check a handle represents an actual texture in the backend API that has not been freed. */
+    virtual bool isTestingOnlyBackendTexture(GrBackendObject) const = 0;
+    /** If ownership of the backend texture has been transferred pass true for abandonTexture. This
+        will do any necessary cleanup of the handle without freeing the texture in the backend
+        API. */
+    virtual void deleteTestingOnlyBackendTexture(GrBackendObject,
+                                                 bool abandonTexture = false) const = 0;
+
+    // width and height may be larger than rt (if underlying API allows it).
+    // Returns nullptr if compatible sb could not be created, otherwise the caller owns the ref on
+    // the GrStencilAttachment.
+    virtual GrStencilAttachment* createStencilAttachmentForRenderTarget(const GrRenderTarget*,
+                                                                        int width,
+                                                                        int height) = 0;
+    // clears target's entire stencil buffer to 0
+    virtual void clearStencil(GrRenderTarget* target) = 0;
+
+
+    // Determines whether a copy of a texture must be made in order to be compatible with
+    // a given GrTextureParams. If so, the width, height and filter used for the copy are
+    // output via the CopyParams.
+    bool makeCopyForTextureParams(int width, int height, const GrTextureParams&,
+                                  GrTextureProducer::CopyParams*) const;
+
+    // This is only to be used in GL-specific tests.
+    virtual const GrGLContext* glContextForTesting() const { return nullptr; }
+
+    // This is only to be used by testing code
+    virtual void resetShaderCacheForTesting() const {}
+
 protected:
-    DrawType PrimTypeToDrawType(GrPrimitiveType type) {
-        switch (type) {
-            case kTriangles_GrPrimitiveType:
-            case kTriangleStrip_GrPrimitiveType:
-            case kTriangleFan_GrPrimitiveType:
-                return kDrawTriangles_DrawType;
-            case kPoints_GrPrimitiveType:
-                return kDrawPoints_DrawType;
-            case kLines_GrPrimitiveType:
-            case kLineStrip_GrPrimitiveType:
-                return kDrawLines_DrawType;
-            default:
-                SkFAIL("Unexpected primitive type");
-                return kDrawTriangles_DrawType;
-        }
-    }
-
-    // prepares clip flushes gpu state before a draw
-    bool setupClipAndFlushState(DrawType,
-                                const GrDeviceCoordTexture* dstCopy,
-                                GrDrawState::AutoRestoreEffects* are,
-                                const SkRect* devBounds);
-
     // Functions used to map clip-respecting stencil tests into normal
     // stencil funcs supported by GPUs.
     static GrStencilFunc ConvertStencilFunc(bool stencilInClip,
@@ -384,137 +412,14 @@ protected:
                                           unsigned int* ref,
                                           unsigned int* mask);
 
-    GrClipMaskManager           fClipMaskManager;
-
-    struct GeometryPoolState {
-        const GrVertexBuffer* fPoolVertexBuffer;
-        int                   fPoolStartVertex;
-
-        const GrIndexBuffer*  fPoolIndexBuffer;
-        int                   fPoolStartIndex;
-    };
-    const GeometryPoolState& getGeomPoolState() {
-        return fGeomPoolStateStack.back();
-    }
-
-    // The state of the scissor is controlled by the clip manager
-    struct ScissorState {
-        bool    fEnabled;
-        SkIRect fRect;
-    } fScissorState;
-
-    // The final stencil settings to use as determined by the clip manager.
-    GrStencilSettings fStencilSettings;
-
-    // Helpers for setting up geometry state
-    void finalizeReservedVertices();
-    void finalizeReservedIndices();
-
-private:
-    // GrDrawTarget overrides
-    virtual bool onReserveVertexSpace(size_t vertexSize, int vertexCount, void** vertices) SK_OVERRIDE;
-    virtual bool onReserveIndexSpace(int indexCount, void** indices) SK_OVERRIDE;
-    virtual void releaseReservedVertexSpace() SK_OVERRIDE;
-    virtual void releaseReservedIndexSpace() SK_OVERRIDE;
-    virtual void onSetVertexSourceToArray(const void* vertexArray, int vertexCount) SK_OVERRIDE;
-    virtual void onSetIndexSourceToArray(const void* indexArray, int indexCount) SK_OVERRIDE;
-    virtual void releaseVertexArray() SK_OVERRIDE;
-    virtual void releaseIndexArray() SK_OVERRIDE;
-    virtual void geometrySourceWillPush() SK_OVERRIDE;
-    virtual void geometrySourceWillPop(const GeometrySrcState& restoredState) SK_OVERRIDE;
-
-
-    // called when the 3D context state is unknown. Subclass should emit any
-    // assumed 3D context state and dirty any state cache.
-    virtual void onResetContext(uint32_t resetBits) = 0;
-
-    // overridden by backend-specific derived class to create objects.
-    virtual GrTexture* onCreateTexture(const GrTextureDesc& desc,
-                                       const void* srcData,
-                                       size_t rowBytes) = 0;
-    virtual GrTexture* onCreateCompressedTexture(const GrTextureDesc& desc,
-                                                 const void* srcData) = 0;
-    virtual GrTexture* onWrapBackendTexture(const GrBackendTextureDesc&) = 0;
-    virtual GrRenderTarget* onWrapBackendRenderTarget(const GrBackendRenderTargetDesc&) = 0;
-    virtual GrVertexBuffer* onCreateVertexBuffer(size_t size, bool dynamic) = 0;
-    virtual GrIndexBuffer* onCreateIndexBuffer(size_t size, bool dynamic) = 0;
-    virtual GrPath* onCreatePath(const SkPath& path, const SkStrokeRec&) = 0;
-    virtual GrPathRange* onCreatePathRange(size_t size, const SkStrokeRec&) = 0;
-
-    // overridden by backend-specific derived class to perform the clear and
-    // clearRect. NULL rect means clear whole target. If canIgnoreRect is
-    // true, it is okay to perform a full clear instead of a partial clear
-    virtual void onClear(const SkIRect* rect, GrColor color, bool canIgnoreRect) = 0;
-
-    // overridden by backend-specific derived class to perform the draw call.
-    virtual void onGpuDraw(const DrawInfo&) = 0;
-
-    // overridden by backend-specific derived class to perform the path stenciling.
-    virtual void onGpuStencilPath(const GrPath*, SkPath::FillType) = 0;
-    virtual void onGpuDrawPath(const GrPath*, SkPath::FillType) = 0;
-    virtual void onGpuDrawPaths(const GrPathRange*,
-                                const uint32_t indices[], int count,
-                                const float transforms[], PathTransformType,
-                                SkPath::FillType) = 0;
-
-    // overridden by backend-specific derived class to perform the read pixels.
-    virtual bool onReadPixels(GrRenderTarget* target,
-                              int left, int top, int width, int height,
-                              GrPixelConfig,
-                              void* buffer,
-                              size_t rowBytes) = 0;
-
-    // overridden by backend-specific derived class to perform the texture update
-    virtual bool onWriteTexturePixels(GrTexture* texture,
-                                      int left, int top, int width, int height,
-                                      GrPixelConfig config, const void* buffer,
-                                      size_t rowBytes) = 0;
-
-    // overridden by backend-specific derived class to perform the resolve
-    virtual void onResolveRenderTarget(GrRenderTarget* target) = 0;
-
-    // width and height may be larger than rt (if underlying API allows it).
-    // Should attach the SB to the RT. Returns false if compatible sb could
-    // not be created.
-    virtual bool createStencilBufferForRenderTarget(GrRenderTarget*, int width, int height) = 0;
-
-    // attaches an existing SB to an existing RT.
-    virtual bool attachStencilBufferToRenderTarget(GrStencilBuffer*, GrRenderTarget*) = 0;
-
-    // The GrGpu typically records the clients requested state and then flushes
-    // deltas from previous state at draw time. This function does the
-    // backend-specific flush of the state.
-    // returns false if current state is unsupported.
-    virtual bool flushGraphicsState(DrawType, const GrDeviceCoordTexture* dstCopy) = 0;
-
-    // clears the entire stencil buffer to 0
-    virtual void clearStencil() = 0;
-
-    // Given a rt, find or create a stencil buffer and attach it
-    bool attachStencilBufferToRenderTarget(GrRenderTarget* target);
-
-    // GrDrawTarget overrides
-    virtual void onDraw(const DrawInfo&) SK_OVERRIDE;
-    virtual void onStencilPath(const GrPath*, SkPath::FillType) SK_OVERRIDE;
-    virtual void onDrawPath(const GrPath*, SkPath::FillType,
-                            const GrDeviceCoordTexture* dstCopy) SK_OVERRIDE;
-    virtual void onDrawPaths(const GrPathRange*,
-                             const uint32_t indices[], int count,
-                             const float transforms[], PathTransformType,
-                             SkPath::FillType, const GrDeviceCoordTexture*) SK_OVERRIDE;
-
-    // readies the pools to provide vertex/index data.
-    void prepareVertexPool();
-    void prepareIndexPool();
-
-    void resetContext() {
-        // We call this because the client may have messed with the
-        // stencil buffer. Perhaps we should detect whether it is a
-        // internally created stencil buffer and if so skip the invalidate.
-        fClipMaskManager.invalidateStencilMask();
-        this->onResetContext(fResetBits);
-        fResetBits = 0;
-        ++fResetTimestamp;
+    static void ElevateDrawPreference(GrGpu::DrawPreference* preference,
+                                      GrGpu::DrawPreference elevation) {
+        GR_STATIC_ASSERT(GrGpu::kCallerPrefersDraw_DrawPreference > GrGpu::kNoDraw_DrawPreference);
+        GR_STATIC_ASSERT(GrGpu::kGpuPrefersDraw_DrawPreference >
+                         GrGpu::kCallerPrefersDraw_DrawPreference);
+        GR_STATIC_ASSERT(GrGpu::kRequireDraw_DrawPreference >
+                         GrGpu::kGpuPrefersDraw_DrawPreference);
+        *preference = SkTMax(*preference, elevation);
     }
 
     void handleDirtyContext() {
@@ -523,25 +428,88 @@ private:
         }
     }
 
-    enum {
-        kPreallocGeomPoolStateStackCnt = 4,
-    };
-    typedef SkTInternalLList<GrGpuResource> ObjectList;
-    SkSTArray<kPreallocGeomPoolStateStackCnt, GeometryPoolState, true>  fGeomPoolStateStack;
+    Stats                                   fStats;
+    SkAutoTDelete<GrPathRendering>          fPathRendering;
+    // Subclass must initialize this in its constructor.
+    SkAutoTUnref<const GrCaps>    fCaps;
+
+private:
+    // called when the 3D context state is unknown. Subclass should emit any
+    // assumed 3D context state and dirty any state cache.
+    virtual void onResetContext(uint32_t resetBits) = 0;
+
+    // Called before certain draws in order to guarantee coherent results from dst reads.
+    virtual void xferBarrier(GrRenderTarget*, GrXferBarrierType) = 0;
+
+    // overridden by backend-specific derived class to create objects.
+    // Texture size and sample size will have already been validated in base class before
+    // onCreateTexture/CompressedTexture are called.
+    virtual GrTexture* onCreateTexture(const GrSurfaceDesc& desc,
+                                       GrGpuResource::LifeCycle lifeCycle,
+                                       const void* srcData, size_t rowBytes) = 0;
+    virtual GrTexture* onCreateCompressedTexture(const GrSurfaceDesc& desc,
+                                                 GrGpuResource::LifeCycle lifeCycle,
+                                                 const void* srcData) = 0;
+    virtual GrTexture* onWrapBackendTexture(const GrBackendTextureDesc&, GrWrapOwnership) = 0;
+    virtual GrRenderTarget* onWrapBackendRenderTarget(const GrBackendRenderTargetDesc&,
+                                                      GrWrapOwnership) = 0;
+    virtual GrVertexBuffer* onCreateVertexBuffer(size_t size, bool dynamic) = 0;
+    virtual GrIndexBuffer* onCreateIndexBuffer(size_t size, bool dynamic) = 0;
+
+    // overridden by backend-specific derived class to perform the clear.
+    virtual void onClear(GrRenderTarget*, const SkIRect& rect, GrColor color) = 0;
+
+
+    // Overridden by backend specific classes to perform a clear of the stencil clip bits.  This is
+    // ONLY used by the the clip target
+    virtual void onClearStencilClip(GrRenderTarget*, const SkIRect& rect, bool insideClip) = 0;
+
+    // overridden by backend-specific derived class to perform the draw call.
+    virtual void onDraw(const DrawArgs&, const GrNonInstancedVertices&) = 0;
+
+    virtual bool onGetReadPixelsInfo(GrSurface* srcSurface, int readWidth, int readHeight,
+                                     size_t rowBytes, GrPixelConfig readConfig, DrawPreference*,
+                                     ReadPixelTempDrawInfo*) = 0;
+    virtual bool onGetWritePixelsInfo(GrSurface* dstSurface, int width, int height, size_t rowBytes,
+                                      GrPixelConfig srcConfig, DrawPreference*,
+                                      WritePixelTempDrawInfo*) = 0;
+
+    // overridden by backend-specific derived class to perform the surface read
+    virtual bool onReadPixels(GrSurface*,
+                              int left, int top,
+                              int width, int height,
+                              GrPixelConfig,
+                              void* buffer,
+                              size_t rowBytes) = 0;
+
+    // overridden by backend-specific derived class to perform the surface write
+    virtual bool onWritePixels(GrSurface*,
+                               int left, int top, int width, int height,
+                               GrPixelConfig config, const void* buffer,
+                               size_t rowBytes) = 0;
+
+    // overridden by backend-specific derived class to perform the resolve
+    virtual void onResolveRenderTarget(GrRenderTarget* target) = 0;
+
+    // overridden by backend specific derived class to perform the copy surface
+    virtual bool onCopySurface(GrSurface* dst,
+                               GrSurface* src,
+                               const SkIRect& srcRect,
+                               const SkIPoint& dstPoint) = 0;
+
+    void resetContext() {
+        this->onResetContext(fResetBits);
+        fResetBits = 0;
+        ++fResetTimestamp;
+    }
+
     ResetTimestamp                                                      fResetTimestamp;
     uint32_t                                                            fResetBits;
-    GrVertexBufferAllocPool*                                            fVertexPool;
-    GrIndexBufferAllocPool*                                             fIndexPool;
-    // counts number of uses of vertex/index pool in the geometry stack
-    int                                                                 fVertexPoolUseCnt;
-    int                                                                 fIndexPoolUseCnt;
-    // these are mutable so they can be created on-demand
-    mutable GrIndexBuffer*                                              fQuadIndexBuffer;
-    // Used to abandon/release all resources created by this GrGpu. TODO: Move this
-    // functionality to GrResourceCache.
-    ObjectList                                                          fObjectList;
+    // The context owns us, not vice-versa, so this ptr is not ref'ed by Gpu.
+    GrContext*                                                          fContext;
 
-    typedef GrDrawTarget INHERITED;
+    friend class GrPathRendering;
+    typedef SkRefCnt INHERITED;
 };
 
 #endif
diff --git a/gfx/skia/skia/src/gpu/GrGpuFactory.cpp b/gfx/skia/skia/src/gpu/GrGpuFactory.cpp
index 16405b488d63..f769ce4c578c 100644
--- a/gfx/skia/skia/src/gpu/GrGpuFactory.cpp
+++ b/gfx/skia/skia/src/gpu/GrGpuFactory.cpp
@@ -7,37 +7,31 @@
  */
 
 
-#include "GrTypes.h"
-
-#include "gl/GrGLConfig.h"
+#include "GrGpuFactory.h"
 
 #include "GrGpu.h"
-#include "gl/GrGpuGL.h"
+#include "gl/GrGLConfig.h"
+#include "gl/GrGLGpu.h"
 
-GrGpu* GrGpu::Create(GrBackend backend, GrBackendContext backendContext, GrContext* context) {
+static CreateGpuProc gGpuFactories[kBackendCount] = { GrGLGpu::Create, nullptr };
 
-    const GrGLInterface* glInterface = NULL;
-    SkAutoTUnref<const GrGLInterface> glInterfaceUnref;
-
-    if (kOpenGL_GrBackend == backend) {
-        glInterface = reinterpret_cast<const GrGLInterface*>(backendContext);
-        if (NULL == glInterface) {
-            glInterface = GrGLDefaultInterface();
-            // By calling GrGLDefaultInterface we've taken a ref on the
-            // returned object. We only want to hold that ref until after
-            // the GrGpu is constructed and has taken ownership.
-            glInterfaceUnref.reset(glInterface);
-        }
-        if (NULL == glInterface) {
-#ifdef SK_DEBUG
-            GrPrintf("No GL interface provided!\n");
+#ifdef SK_VULKAN
+extern GrGpu* vk_gpu_create(GrBackendContext backendContext, const GrContextOptions& options,
+                            GrContext* context);
+GrGpuFactoryRegistrar gVkGpuFactoryProc(kVulkan_GrBackend, vk_gpu_create);
 #endif
-            return NULL;
-        }
-        GrGLContext ctx(glInterface);
-        if (ctx.isInitialized()) {
-            return SkNEW_ARGS(GrGpuGL, (ctx, context));
-        }
-    }
-    return NULL;
+
+GrGpuFactoryRegistrar::GrGpuFactoryRegistrar(int i, CreateGpuProc proc) {
+    gGpuFactories[i] = proc;
+}
+
+GrGpu* GrGpu::Create(GrBackend backend,
+                     GrBackendContext backendContext,
+                     const GrContextOptions& options,
+                     GrContext* context) {
+    SkASSERT((int)backend < kBackendCount);
+    if (!gGpuFactories[backend]) {
+        return nullptr;
+    }
+    return (gGpuFactories[backend])(backendContext, options, context);
 }
diff --git a/gfx/skia/skia/src/gpu/GrGpuFactory.h b/gfx/skia/skia/src/gpu/GrGpuFactory.h
new file mode 100644
index 000000000000..aecc2c17050b
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrGpuFactory.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGpuFactory_DEFINED
+#define GrGpuFactory_DEFINED
+
+#include "GrTypes.h"
+
+class GrGpu;
+class GrContext;
+struct GrContextOptions;
+
+typedef GrGpu* (*CreateGpuProc)(GrBackendContext, const GrContextOptions& options, GrContext*);
+
+class GrGpuFactoryRegistrar {
+public:
+    GrGpuFactoryRegistrar(int i, CreateGpuProc proc);
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrGpuResource.cpp b/gfx/skia/skia/src/gpu/GrGpuResource.cpp
index 8c2dc4508009..a227fd2c0f5a 100644
--- a/gfx/skia/skia/src/gpu/GrGpuResource.cpp
+++ b/gfx/skia/skia/src/gpu/GrGpuResource.cpp
@@ -6,58 +6,194 @@
  * found in the LICENSE file.
  */
 
-
 #include "GrGpuResource.h"
+#include "GrContext.h"
+#include "GrResourceCache.h"
 #include "GrGpu.h"
+#include "GrGpuResourcePriv.h"
+#include "SkTraceMemoryDump.h"
 
-GrGpuResource::GrGpuResource(GrGpu* gpu, bool isWrapped)
-    : fRefCnt(1)
-    , fCacheEntry(NULL)
+static inline GrResourceCache* get_resource_cache(GrGpu* gpu) {
+    SkASSERT(gpu);
+    SkASSERT(gpu->getContext());
+    SkASSERT(gpu->getContext()->getResourceCache());
+    return gpu->getContext()->getResourceCache();
+}
+
+GrGpuResource::GrGpuResource(GrGpu* gpu, LifeCycle lifeCycle)
+    : fGpu(gpu)
+    , fGpuMemorySize(kInvalidGpuMemorySize)
+    , fLifeCycle(lifeCycle)
     , fUniqueID(CreateUniqueID()) {
-    fGpu              = gpu;
-    if (isWrapped) {
-        fFlags = kWrapped_FlagBit;
-    } else {
-        fFlags = 0;
-    }
-    fGpu->insertObject(this);
+    SkDEBUGCODE(fCacheArrayIndex = -1);
+}
+
+void GrGpuResource::registerWithCache() {
+    get_resource_cache(fGpu)->resourceAccess().insertResource(this);
 }
 
 GrGpuResource::~GrGpuResource() {
-    SkASSERT(0 == fRefCnt);
-    // subclass should have released this.
+    // The cache should have released or destroyed this resource.
     SkASSERT(this->wasDestroyed());
 }
 
-void GrGpuResource::release() {
-    if (NULL != fGpu) {
-        this->onRelease();
-        fGpu->removeObject(this);
-        fGpu = NULL;
-    }
+void GrGpuResource::release() { 
+    SkASSERT(fGpu);
+    this->onRelease();
+    get_resource_cache(fGpu)->resourceAccess().removeResource(this);
+    fGpu = nullptr;
+    fGpuMemorySize = 0;
 }
 
 void GrGpuResource::abandon() {
-    if (NULL != fGpu) {
-        this->onAbandon();
-        fGpu->removeObject(this);
-        fGpu = NULL;
+    if (this->wasDestroyed()) {
+        return;
     }
+    SkASSERT(fGpu);
+    this->onAbandon();
+    get_resource_cache(fGpu)->resourceAccess().removeResource(this);
+    fGpu = nullptr;
+    fGpuMemorySize = 0;
+}
+
+void GrGpuResource::dumpMemoryStatistics(SkTraceMemoryDump* traceMemoryDump) const {
+    // Dump resource as "skia/gpu_resources/resource_#".
+    SkString dumpName("skia/gpu_resources/resource_");
+    dumpName.appendS32(this->getUniqueID());
+
+    traceMemoryDump->dumpNumericValue(dumpName.c_str(), "size", "bytes", this->gpuMemorySize());
+
+    if (this->isPurgeable()) {
+        traceMemoryDump->dumpNumericValue(dumpName.c_str(), "purgeable_size", "bytes",
+                                          this->gpuMemorySize());
+    }
+
+    // Call setMemoryBacking to allow sub-classes with implementation specific backings (such as GL
+    // objects) to provide additional information.
+    this->setMemoryBacking(traceMemoryDump, dumpName);
+}
+
+const SkData* GrGpuResource::setCustomData(const SkData* data) {
+    SkSafeRef(data);
+    fData.reset(data);
+    return data;
 }
 
 const GrContext* GrGpuResource::getContext() const {
-    if (NULL != fGpu) {
+    if (fGpu) {
         return fGpu->getContext();
     } else {
-        return NULL;
+        return nullptr;
     }
 }
 
 GrContext* GrGpuResource::getContext() {
-    if (NULL != fGpu) {
+    if (fGpu) {
         return fGpu->getContext();
     } else {
-        return NULL;
+        return nullptr;
+    }
+}
+
+void GrGpuResource::didChangeGpuMemorySize() const {
+    if (this->wasDestroyed()) {
+        return;
+    }
+
+    size_t oldSize = fGpuMemorySize;
+    SkASSERT(kInvalidGpuMemorySize != oldSize);
+    fGpuMemorySize = kInvalidGpuMemorySize;
+    get_resource_cache(fGpu)->resourceAccess().didChangeGpuMemorySize(this, oldSize);
+}
+
+void GrGpuResource::removeUniqueKey() {
+    if (this->wasDestroyed()) {
+        return;
+    }
+    SkASSERT(fUniqueKey.isValid());
+    get_resource_cache(fGpu)->resourceAccess().removeUniqueKey(this);
+}
+
+void GrGpuResource::setUniqueKey(const GrUniqueKey& key) {
+    SkASSERT(this->internalHasRef());
+    SkASSERT(key.isValid());
+
+    // Wrapped and uncached resources can never have a unique key.
+    if (!this->resourcePriv().isBudgeted()) {
+        return;
+    }
+
+    if (this->wasDestroyed()) {
+        return;
+    }
+
+    get_resource_cache(fGpu)->resourceAccess().changeUniqueKey(this, key);
+}
+
+void GrGpuResource::notifyAllCntsAreZero(CntType lastCntTypeToReachZero) const {
+    if (this->wasDestroyed()) {
+        // We've already been removed from the cache. Goodbye cruel world!
+        delete this;
+        return;
+    }
+
+    // We should have already handled this fully in notifyRefCntIsZero().
+    SkASSERT(kRef_CntType != lastCntTypeToReachZero);
+
+    GrGpuResource* mutableThis = const_cast<GrGpuResource*>(this);
+    static const uint32_t kFlag =
+        GrResourceCache::ResourceAccess::kAllCntsReachedZero_RefNotificationFlag;
+    get_resource_cache(fGpu)->resourceAccess().notifyCntReachedZero(mutableThis, kFlag);
+}
+
+bool GrGpuResource::notifyRefCountIsZero() const {
+    if (this->wasDestroyed()) {
+        // handle this in notifyAllCntsAreZero().
+        return true;
+    }
+
+    GrGpuResource* mutableThis = const_cast<GrGpuResource*>(this);
+    uint32_t flags =
+        GrResourceCache::ResourceAccess::kRefCntReachedZero_RefNotificationFlag;
+    if (!this->internalHasPendingIO()) {
+        flags |= GrResourceCache::ResourceAccess::kAllCntsReachedZero_RefNotificationFlag;
+    }
+    get_resource_cache(fGpu)->resourceAccess().notifyCntReachedZero(mutableThis, flags);
+
+    // There is no need to call our notifyAllCntsAreZero function at this point since we already
+    // told the cache about the state of cnts.
+    return false;
+}
+
+void GrGpuResource::setScratchKey(const GrScratchKey& scratchKey) {
+    SkASSERT(!fScratchKey.isValid());
+    SkASSERT(scratchKey.isValid());
+    // Wrapped resources can never have a scratch key.
+    if (this->cacheAccess().isExternal()) {
+        return;
+    }
+    fScratchKey = scratchKey;
+}
+
+void GrGpuResource::removeScratchKey() {
+    if (!this->wasDestroyed() && fScratchKey.isValid()) {
+        get_resource_cache(fGpu)->resourceAccess().willRemoveScratchKey(this);
+        fScratchKey.reset();
+    }
+}
+
+void GrGpuResource::makeBudgeted() {
+    if (!this->wasDestroyed() && GrGpuResource::kUncached_LifeCycle == fLifeCycle) {
+        fLifeCycle = kCached_LifeCycle;
+        get_resource_cache(fGpu)->resourceAccess().didChangeBudgetStatus(this);
+    }
+}
+
+void GrGpuResource::makeUnbudgeted() {
+    if (!this->wasDestroyed() && GrGpuResource::kCached_LifeCycle == fLifeCycle &&
+        !fUniqueKey.isValid()) {
+        fLifeCycle = kUncached_LifeCycle;
+        get_resource_cache(fGpu)->resourceAccess().didChangeBudgetStatus(this);
     }
 }
 
diff --git a/gfx/skia/skia/src/gpu/GrGpuResourceCacheAccess.h b/gfx/skia/skia/src/gpu/GrGpuResourceCacheAccess.h
new file mode 100644
index 000000000000..8c272420a718
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrGpuResourceCacheAccess.h
@@ -0,0 +1,102 @@
+
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGpuResourceCacheAccess_DEFINED
+#define GrGpuResourceCacheAccess_DEFINED
+
+#include "GrGpuResource.h"
+#include "GrGpuResourcePriv.h"
+
+namespace skiatest {
+    class Reporter;
+}
+
+/**
+ * This class allows GrResourceCache increased privileged access to GrGpuResource objects.
+ */
+class GrGpuResource::CacheAccess {
+private:
+    /**
+     * Is the resource currently cached as scratch? This means it is cached, has a valid scratch
+     * key, and does not have a unique key.
+     */
+    bool isScratch() const {
+        return !fResource->getUniqueKey().isValid() && fResource->fScratchKey.isValid() &&
+                fResource->resourcePriv().isBudgeted();
+    }
+
+    /**
+     * Is the resource object wrapping an externally allocated GPU resource?
+     */
+    bool isExternal() const { return fResource->isExternal(); }
+
+    /**
+     * Is the resource object wrapping an externally allocated GPU resource that Skia has not taken
+     * ownership of.
+     */
+    bool isBorrowed() const { return GrGpuResource::kBorrowed_LifeCycle == fResource->fLifeCycle; }
+
+    /**
+     * Is the resource object wrapping an externally allocated GPU resource that Skia has taken
+     * ownership of.
+     */
+    bool isAdopted() const { return GrGpuResource::kAdopted_LifeCycle == fResource->fLifeCycle; }
+ 
+    /**
+     * Called by the cache to delete the resource under normal circumstances.
+     */
+    void release() {
+        fResource->release();
+        if (fResource->isPurgeable()) {
+            delete fResource;
+        }
+    }
+
+    /**
+     * Called by the cache to delete the resource when the backend 3D context is no longer valid.
+     */
+    void abandon() {
+        fResource->abandon();
+        if (fResource->isPurgeable()) {
+            delete fResource;
+        }
+    }
+
+    /** Called by the cache to assign a new unique key. */
+    void setUniqueKey(const GrUniqueKey& key) { fResource->fUniqueKey = key; }
+
+    /** Called by the cache to make the unique key invalid. */
+    void removeUniqueKey() { fResource->fUniqueKey.reset(); }
+
+    uint32_t timestamp() const { return fResource->fTimestamp; }
+    void setTimestamp(uint32_t ts) { fResource->fTimestamp = ts; }
+
+    int* accessCacheIndex() const { return &fResource->fCacheArrayIndex; }
+
+    CacheAccess(GrGpuResource* resource) : fResource(resource) {}
+    CacheAccess(const CacheAccess& that) : fResource(that.fResource) {}
+    CacheAccess& operator=(const CacheAccess&); // unimpl
+
+    // No taking addresses of this type.
+    const CacheAccess* operator&() const;
+    CacheAccess* operator&();
+
+    GrGpuResource* fResource;
+
+    friend class GrGpuResource; // to construct/copy this type.
+    friend class GrResourceCache; // to use this type
+    friend void test_unbudgeted_to_scratch(skiatest::Reporter* reporter); // for unit testing
+};
+
+inline GrGpuResource::CacheAccess GrGpuResource::cacheAccess() { return CacheAccess(this); }
+
+inline const GrGpuResource::CacheAccess GrGpuResource::cacheAccess() const {
+    return CacheAccess(const_cast<GrGpuResource*>(this));
+}
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrGpuResourcePriv.h b/gfx/skia/skia/src/gpu/GrGpuResourcePriv.h
new file mode 100644
index 000000000000..5324dccc22ad
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrGpuResourcePriv.h
@@ -0,0 +1,86 @@
+
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGpuResourcePriv_DEFINED
+#define GrGpuResourcePriv_DEFINED
+
+#include "GrGpuResource.h"
+
+/**
+ * This class allows code internal to Skia privileged access to manage the cache keys and budget
+ * status of a GrGpuResource object.
+ */
+class GrGpuResource::ResourcePriv {
+public:
+    /**
+     * Sets a unique key for the resource. If the resource was previously cached as scratch it will
+     * be converted to a uniquely-keyed resource. If the key is invalid then this is equivalent to
+     * removeUniqueKey(). If another resource is using the key then its unique key is removed and
+     * this resource takes over the key.
+     */
+    void setUniqueKey(const GrUniqueKey& key) { fResource->setUniqueKey(key); }
+
+    /** Removes the unique key from a resource. If the resource has a scratch key, it may be
+        preserved for recycling as scratch. */
+    void removeUniqueKey() { fResource->removeUniqueKey(); }
+
+    /**
+     * If the resource is uncached make it cached. Has no effect on resources that are wrapped or
+     * already cached.
+     */
+    void makeBudgeted() { fResource->makeBudgeted(); }
+
+    /**
+     * If the resource is cached make it uncached. Has no effect on resources that are wrapped or
+     * already uncached. Furthermore, resources with unique keys cannot be made unbudgeted.
+     */
+    void makeUnbudgeted() { fResource->makeUnbudgeted(); }
+
+    /**
+     * Does the resource count against the resource budget?
+     */
+    bool isBudgeted() const {
+        bool ret = GrGpuResource::kCached_LifeCycle == fResource->fLifeCycle;
+        SkASSERT(ret || !fResource->getUniqueKey().isValid());
+        return ret;
+    }
+
+    /** 
+     * If this resource can be used as a scratch resource this returns a valid scratch key.
+     * Otherwise it returns a key for which isNullScratch is true. The resource may currently be
+     * used as a uniquely keyed resource rather than scratch. Check isScratch().
+     */
+    const GrScratchKey& getScratchKey() const { return fResource->fScratchKey; }
+
+    /**
+     * If the resource has a scratch key, the key will be removed. Since scratch keys are installed
+     * at resource creation time, this means the resource will never again be used as scratch.
+     */
+    void removeScratchKey() const { fResource->removeScratchKey();  }
+
+protected:
+    ResourcePriv(GrGpuResource* resource) : fResource(resource) {   }
+    ResourcePriv(const ResourcePriv& that) : fResource(that.fResource) {}
+    ResourcePriv& operator=(const CacheAccess&); // unimpl
+
+    // No taking addresses of this type.
+    const ResourcePriv* operator&() const;
+    ResourcePriv* operator&();
+
+    GrGpuResource* fResource;
+
+    friend class GrGpuResource; // to construct/copy this type.
+};
+
+inline GrGpuResource::ResourcePriv GrGpuResource::resourcePriv() { return ResourcePriv(this); }
+
+inline const GrGpuResource::ResourcePriv GrGpuResource::resourcePriv() const {
+    return ResourcePriv(const_cast<GrGpuResource*>(this));
+}
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrGpuResourceRef.cpp b/gfx/skia/skia/src/gpu/GrGpuResourceRef.cpp
new file mode 100644
index 000000000000..405679d4f17d
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrGpuResourceRef.cpp
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrGpuResourceRef.h"
+
+GrGpuResourceRef::GrGpuResourceRef() {
+    fResource = nullptr;
+    fOwnRef = false;
+    fPendingIO = false;
+}
+
+GrGpuResourceRef::GrGpuResourceRef(GrGpuResource* resource, GrIOType ioType) {
+    fResource = nullptr;
+    fOwnRef = false;
+    fPendingIO = false;
+    this->setResource(resource, ioType);
+}
+
+GrGpuResourceRef::~GrGpuResourceRef() {
+    if (fOwnRef) {
+        SkASSERT(fResource);
+        fResource->unref();
+    }
+    if (fPendingIO) {
+        switch (fIOType) {
+            case kRead_GrIOType:
+                fResource->completedRead();
+                break;
+            case kWrite_GrIOType:
+                fResource->completedWrite();
+                break;
+            case kRW_GrIOType:
+                fResource->completedRead();
+                fResource->completedWrite();
+                break;
+        }
+    }
+}
+
+void GrGpuResourceRef::reset() {
+    SkASSERT(!fPendingIO);
+    SkASSERT(SkToBool(fResource) == fOwnRef);
+    if (fOwnRef) {
+        fResource->unref();
+        fOwnRef = false;
+        fResource = nullptr;
+    }
+}
+
+void GrGpuResourceRef::setResource(GrGpuResource* resource, GrIOType ioType) {
+    SkASSERT(!fPendingIO);
+    SkASSERT(SkToBool(fResource) == fOwnRef);
+    SkSafeUnref(fResource);
+    if (nullptr == resource) {
+        fResource = nullptr;
+        fOwnRef = false;
+    } else {
+        fResource = resource;
+        fOwnRef = true;
+        fIOType = ioType;
+    }
+}
+
+void GrGpuResourceRef::markPendingIO() const {
+    // This should only be called when the owning GrProgramElement gets its first
+    // pendingExecution ref.
+    SkASSERT(!fPendingIO);
+    SkASSERT(fResource);
+    fPendingIO = true;
+    switch (fIOType) {
+        case kRead_GrIOType:
+            fResource->addPendingRead();
+            break;
+        case kWrite_GrIOType:
+            fResource->addPendingWrite();
+            break;
+        case kRW_GrIOType:
+            fResource->addPendingRead();
+            fResource->addPendingWrite();
+            break;
+    }
+}
+
+void GrGpuResourceRef::pendingIOComplete() const {
+    // This should only be called when the owner's pending executions have ocurred but it is still
+    // reffed.
+    SkASSERT(fOwnRef);
+    SkASSERT(fPendingIO);
+    switch (fIOType) {
+        case kRead_GrIOType:
+            fResource->completedRead();
+            break;
+        case kWrite_GrIOType:
+            fResource->completedWrite();
+            break;
+        case kRW_GrIOType:
+            fResource->completedRead();
+            fResource->completedWrite();
+            break;
+
+    }
+    fPendingIO = false;
+}
+
+void GrGpuResourceRef::removeRef() const {
+    // This should only be called once, when the owners last ref goes away and
+    // there is a pending execution.
+    SkASSERT(fOwnRef);
+    SkASSERT(fPendingIO);
+    SkASSERT(fResource);
+    fResource->unref();
+    fOwnRef = false;
+}
diff --git a/gfx/skia/skia/src/gpu/GrImageIDTextureAdjuster.cpp b/gfx/skia/skia/src/gpu/GrImageIDTextureAdjuster.cpp
new file mode 100644
index 000000000000..c37c02277589
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrImageIDTextureAdjuster.cpp
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrImageIDTextureAdjuster.h"
+
+#include "GrContext.h"
+#include "GrGpuResourcePriv.h"
+#include "SkBitmap.h"
+#include "SkGrPriv.h"
+#include "SkImage_Base.h"
+#include "SkPixelRef.h"
+
+GrBitmapTextureAdjuster::GrBitmapTextureAdjuster(const SkBitmap* bmp)
+    : INHERITED(bmp->getTexture(), SkIRect::MakeWH(bmp->width(), bmp->height()))
+    , fBmp(bmp) {}
+
+void GrBitmapTextureAdjuster::makeCopyKey(const CopyParams& params, GrUniqueKey* copyKey) {
+    if (fBmp->isVolatile()) {
+        return;
+    }
+    // The content area must represent the whole bitmap. Texture-backed bitmaps don't support
+    // extractSubset(). Therefore, either the bitmap and the texture are the same size or the
+    // content's dimensions are the bitmap's dimensions which is pinned to the upper left
+    // of the texture.
+    GrUniqueKey baseKey;
+    GrMakeKeyFromImageID(&baseKey, fBmp->getGenerationID(),
+                         SkIRect::MakeWH(fBmp->width(), fBmp->height()));
+    MakeCopyKeyFromOrigKey(baseKey, params, copyKey);
+}
+
+void GrBitmapTextureAdjuster::didCacheCopy(const GrUniqueKey& copyKey) {
+    GrInstallBitmapUniqueKeyInvalidator(copyKey, fBmp->pixelRef());
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+GrImageTextureAdjuster::GrImageTextureAdjuster(const SkImage_Base* img)
+    : INHERITED(img->peekTexture(), SkIRect::MakeWH(img->width(), img->height()))
+    , fImageBase(img) {}
+
+void GrImageTextureAdjuster::makeCopyKey(const CopyParams& params, GrUniqueKey* copyKey) {
+    // By construction this texture adjuster always represents an entire SkImage, so use the
+    // image's width and height for the key's rectangle.
+    GrUniqueKey baseKey;
+    GrMakeKeyFromImageID(&baseKey, fImageBase->uniqueID(),
+                         SkIRect::MakeWH(fImageBase->width(), fImageBase->height()));
+    MakeCopyKeyFromOrigKey(baseKey, params, copyKey);
+}
+
+void GrImageTextureAdjuster::didCacheCopy(const GrUniqueKey& copyKey) {
+    // We don't currently have a mechanism for notifications on Images!
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+GrBitmapTextureMaker::GrBitmapTextureMaker(GrContext* context, const SkBitmap& bitmap)
+    : INHERITED(context, bitmap.width(), bitmap.height())
+    , fBitmap(bitmap) {
+    SkASSERT(!bitmap.getTexture());
+    if (!bitmap.isVolatile()) {
+        SkIPoint origin = bitmap.pixelRefOrigin();
+        SkIRect subset = SkIRect::MakeXYWH(origin.fX, origin.fY, bitmap.width(),
+                                           bitmap.height());
+        GrMakeKeyFromImageID(&fOriginalKey, bitmap.pixelRef()->getGenerationID(), subset);
+    }
+}
+
+GrTexture* GrBitmapTextureMaker::refOriginalTexture() {
+    GrTexture* tex;
+
+    if (fOriginalKey.isValid()) {
+        tex = this->context()->textureProvider()->findAndRefTextureByUniqueKey(fOriginalKey);
+        if (tex) {
+            return tex;
+        }
+    }
+
+    tex = GrUploadBitmapToTexture(this->context(), fBitmap);
+    if (tex && fOriginalKey.isValid()) {
+        tex->resourcePriv().setUniqueKey(fOriginalKey);
+        GrInstallBitmapUniqueKeyInvalidator(fOriginalKey, fBitmap.pixelRef());
+    }
+    return tex;
+}
+
+void GrBitmapTextureMaker::makeCopyKey(const CopyParams& copyParams, GrUniqueKey* copyKey) {
+    if (fOriginalKey.isValid()) {
+        MakeCopyKeyFromOrigKey(fOriginalKey, copyParams, copyKey);
+    }
+}
+
+void GrBitmapTextureMaker::didCacheCopy(const GrUniqueKey& copyKey) {
+    GrInstallBitmapUniqueKeyInvalidator(copyKey, fBitmap.pixelRef());
+}
diff --git a/gfx/skia/skia/src/gpu/GrImageIDTextureAdjuster.h b/gfx/skia/skia/src/gpu/GrImageIDTextureAdjuster.h
new file mode 100644
index 000000000000..a20902ed581f
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrImageIDTextureAdjuster.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrImageIDTextureAdjuster_DEFINED
+#define GrImageIDTextureAdjuster_DEFINED
+
+#include "GrTextureParamsAdjuster.h"
+
+class SkBitmap;
+class SkImage_Base;
+
+/** Implementation for texture-backed SkBitmaps. The bitmap must stay in scope and unmodified 
+    while this object exists. */
+class GrBitmapTextureAdjuster : public GrTextureAdjuster {
+public:
+    explicit GrBitmapTextureAdjuster(const SkBitmap* bmp);
+
+private:
+    void makeCopyKey(const CopyParams& params, GrUniqueKey* copyKey) override;
+
+    void didCacheCopy(const GrUniqueKey& copyKey) override;
+
+    const SkBitmap* fBmp;
+
+    typedef GrTextureAdjuster INHERITED;
+};
+
+/** Implementation for texture-backed SkImages. The image must stay in scope and unmodified while
+    this object exists. */
+class GrImageTextureAdjuster : public GrTextureAdjuster {
+public:
+    explicit GrImageTextureAdjuster(const SkImage_Base* img);
+
+private:
+    void makeCopyKey(const CopyParams& params, GrUniqueKey* copyKey) override;
+
+    void didCacheCopy(const GrUniqueKey& copyKey) override;
+
+    const SkImage_Base* fImageBase;
+
+    typedef GrTextureAdjuster INHERITED;
+};
+
+/** This class manages the conversion of SW-backed bitmaps to GrTextures. If the input bitmap is
+    non-volatile the texture is cached using a key created from the pixels' image id and the
+    subset of the pixelref specified by the bitmap. */
+class GrBitmapTextureMaker : public GrTextureMaker {
+public:
+    GrBitmapTextureMaker(GrContext* context, const SkBitmap& bitmap);
+
+protected:
+    GrTexture* refOriginalTexture() override;
+
+    void makeCopyKey(const CopyParams& copyParams, GrUniqueKey* copyKey) override;
+
+    void didCacheCopy(const GrUniqueKey& copyKey) override;
+
+private:
+    const SkBitmap  fBitmap;
+    GrUniqueKey     fOriginalKey;
+
+    typedef GrTextureMaker INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrInOrderDrawBuffer.cpp b/gfx/skia/skia/src/gpu/GrInOrderDrawBuffer.cpp
deleted file mode 100644
index 26b54522b52a..000000000000
--- a/gfx/skia/skia/src/gpu/GrInOrderDrawBuffer.cpp
+++ /dev/null
@@ -1,1001 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrInOrderDrawBuffer.h"
-
-#include "GrBufferAllocPool.h"
-#include "GrDrawTargetCaps.h"
-#include "GrTextStrike.h"
-#include "GrGpu.h"
-#include "GrIndexBuffer.h"
-#include "GrPath.h"
-#include "GrPathRange.h"
-#include "GrRenderTarget.h"
-#include "GrTemplates.h"
-#include "GrTexture.h"
-#include "GrVertexBuffer.h"
-
-GrInOrderDrawBuffer::GrInOrderDrawBuffer(GrGpu* gpu,
-                                         GrVertexBufferAllocPool* vertexPool,
-                                         GrIndexBufferAllocPool* indexPool)
-    : GrDrawTarget(gpu->getContext())
-    , fDstGpu(gpu)
-    , fClipSet(true)
-    , fClipProxyState(kUnknown_ClipProxyState)
-    , fVertexPool(*vertexPool)
-    , fIndexPool(*indexPool)
-    , fFlushing(false)
-    , fDrawID(0) {
-
-    fDstGpu->ref();
-    fCaps.reset(SkRef(fDstGpu->caps()));
-
-    SkASSERT(NULL != vertexPool);
-    SkASSERT(NULL != indexPool);
-
-    GeometryPoolState& poolState = fGeoPoolStateStack.push_back();
-    poolState.fUsedPoolVertexBytes = 0;
-    poolState.fUsedPoolIndexBytes = 0;
-#ifdef SK_DEBUG
-    poolState.fPoolVertexBuffer = (GrVertexBuffer*)~0;
-    poolState.fPoolStartVertex = ~0;
-    poolState.fPoolIndexBuffer = (GrIndexBuffer*)~0;
-    poolState.fPoolStartIndex = ~0;
-#endif
-    this->reset();
-}
-
-GrInOrderDrawBuffer::~GrInOrderDrawBuffer() {
-    this->reset();
-    // This must be called by before the GrDrawTarget destructor
-    this->releaseGeometry();
-    fDstGpu->unref();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-namespace {
-void get_vertex_bounds(const void* vertices,
-                       size_t vertexSize,
-                       int vertexCount,
-                       SkRect* bounds) {
-    SkASSERT(vertexSize >= sizeof(SkPoint));
-    SkASSERT(vertexCount > 0);
-    const SkPoint* point = static_cast<const SkPoint*>(vertices);
-    bounds->fLeft = bounds->fRight = point->fX;
-    bounds->fTop = bounds->fBottom = point->fY;
-    for (int i = 1; i < vertexCount; ++i) {
-        point = reinterpret_cast<SkPoint*>(reinterpret_cast<intptr_t>(point) + vertexSize);
-        bounds->growToInclude(point->fX, point->fY);
-    }
-}
-}
-
-
-namespace {
-
-extern const GrVertexAttrib kRectPosColorUVAttribs[] = {
-    {kVec2f_GrVertexAttribType,  0,               kPosition_GrVertexAttribBinding},
-    {kVec4ub_GrVertexAttribType, sizeof(SkPoint), kColor_GrVertexAttribBinding},
-    {kVec2f_GrVertexAttribType,  sizeof(SkPoint)+sizeof(GrColor),
-                                                  kLocalCoord_GrVertexAttribBinding},
-};
-
-extern const GrVertexAttrib kRectPosUVAttribs[] = {
-    {kVec2f_GrVertexAttribType,  0,              kPosition_GrVertexAttribBinding},
-    {kVec2f_GrVertexAttribType, sizeof(SkPoint), kLocalCoord_GrVertexAttribBinding},
-};
-
-static void set_vertex_attributes(GrDrawState* drawState,
-                                  bool hasColor, bool hasUVs,
-                                  int* colorOffset, int* localOffset) {
-    *colorOffset = -1;
-    *localOffset = -1;
-
-    // Using per-vertex colors allows batching across colors. (A lot of rects in a row differing
-    // only in color is a common occurrence in tables). However, having per-vertex colors disables
-    // blending optimizations because we don't know if the color will be solid or not. These
-    // optimizations help determine whether coverage and color can be blended correctly when
-    // dual-source blending isn't available. This comes into play when there is coverage. If colors
-    // were a stage it could take a hint that every vertex's color will be opaque.
-    if (hasColor && hasUVs) {
-        *colorOffset = sizeof(SkPoint);
-        *localOffset = sizeof(SkPoint) + sizeof(GrColor);
-        drawState->setVertexAttribs<kRectPosColorUVAttribs>(3);
-    } else if (hasColor) {
-        *colorOffset = sizeof(SkPoint);
-        drawState->setVertexAttribs<kRectPosColorUVAttribs>(2);
-    } else if (hasUVs) {
-        *localOffset = sizeof(SkPoint);
-        drawState->setVertexAttribs<kRectPosUVAttribs>(2);
-    } else {
-        drawState->setVertexAttribs<kRectPosUVAttribs>(1);
-    }
-}
-
-};
-
-enum {
-    kTraceCmdBit = 0x80,
-    kCmdMask = 0x7f,
-};
-
-static uint8_t add_trace_bit(uint8_t cmd) {
-    return cmd | kTraceCmdBit;
-}
-
-static uint8_t strip_trace_bit(uint8_t cmd) {
-    return cmd & kCmdMask;
-}
-
-static bool cmd_has_trace_marker(uint8_t cmd) {
-    return SkToBool(cmd & kTraceCmdBit);
-}
-
-void GrInOrderDrawBuffer::onDrawRect(const SkRect& rect,
-                                     const SkMatrix* matrix,
-                                     const SkRect* localRect,
-                                     const SkMatrix* localMatrix) {
-    GrDrawState::AutoColorRestore acr;
-
-    GrDrawState* drawState = this->drawState();
-
-    GrColor color = drawState->getColor();
-
-    int colorOffset, localOffset;
-    set_vertex_attributes(drawState,
-                   this->caps()->dualSourceBlendingSupport() || drawState->hasSolidCoverage(),
-                   NULL != localRect,
-                   &colorOffset, &localOffset);
-    if (colorOffset >= 0) {
-        // We set the draw state's color to white here. This is done so that any batching performed
-        // in our subclass's onDraw() won't get a false from GrDrawState::op== due to a color
-        // mismatch. TODO: Once vertex layout is owned by GrDrawState it should skip comparing the
-        // constant color in its op== when the kColor layout bit is set and then we can remove
-        // this.
-        acr.set(drawState, 0xFFFFFFFF);
-    }
-
-    AutoReleaseGeometry geo(this, 4, 0);
-    if (!geo.succeeded()) {
-        GrPrintf("Failed to get space for vertices!\n");
-        return;
-    }
-
-    // Go to device coords to allow batching across matrix changes
-    SkMatrix combinedMatrix;
-    if (NULL != matrix) {
-        combinedMatrix = *matrix;
-    } else {
-        combinedMatrix.reset();
-    }
-    combinedMatrix.postConcat(drawState->getViewMatrix());
-    // When the caller has provided an explicit source rect for a stage then we don't want to
-    // modify that stage's matrix. Otherwise if the effect is generating its source rect from
-    // the vertex positions then we have to account for the view matrix change.
-    GrDrawState::AutoViewMatrixRestore avmr;
-    if (!avmr.setIdentity(drawState)) {
-        return;
-    }
-
-    size_t vsize = drawState->getVertexSize();
-
-    geo.positions()->setRectFan(rect.fLeft, rect.fTop, rect.fRight, rect.fBottom, vsize);
-    combinedMatrix.mapPointsWithStride(geo.positions(), vsize, 4);
-
-    SkRect devBounds;
-    // since we already computed the dev verts, set the bounds hint. This will help us avoid
-    // unnecessary clipping in our onDraw().
-    get_vertex_bounds(geo.vertices(), vsize, 4, &devBounds);
-
-    if (localOffset >= 0) {
-        SkPoint* coords = GrTCast<SkPoint*>(GrTCast<intptr_t>(geo.vertices()) + localOffset);
-        coords->setRectFan(localRect->fLeft, localRect->fTop,
-                           localRect->fRight, localRect->fBottom,
-                            vsize);
-        if (NULL != localMatrix) {
-            localMatrix->mapPointsWithStride(coords, vsize, 4);
-        }
-    }
-
-    if (colorOffset >= 0) {
-        GrColor* vertColor = GrTCast<GrColor*>(GrTCast<intptr_t>(geo.vertices()) + colorOffset);
-        for (int i = 0; i < 4; ++i) {
-            *vertColor = color;
-            vertColor = (GrColor*) ((intptr_t) vertColor + vsize);
-        }
-    }
-
-    this->setIndexSourceToBuffer(this->getContext()->getQuadIndexBuffer());
-    this->drawIndexedInstances(kTriangles_GrPrimitiveType, 1, 4, 6, &devBounds);
-
-    // to ensure that stashing the drawState ptr is valid
-    SkASSERT(this->drawState() == drawState);
-}
-
-bool GrInOrderDrawBuffer::quickInsideClip(const SkRect& devBounds) {
-    if (!this->getDrawState().isClipState()) {
-        return true;
-    }
-    if (kUnknown_ClipProxyState == fClipProxyState) {
-        SkIRect rect;
-        bool iior;
-        this->getClip()->getConservativeBounds(this->getDrawState().getRenderTarget(), &rect, &iior);
-        if (iior) {
-            // The clip is a rect. We will remember that in fProxyClip. It is common for an edge (or
-            // all edges) of the clip to be at the edge of the RT. However, we get that clipping for
-            // free via the viewport. We don't want to think that clipping must be enabled in this
-            // case. So we extend the clip outward from the edge to avoid these false negatives.
-            fClipProxyState = kValid_ClipProxyState;
-            fClipProxy = SkRect::Make(rect);
-
-            if (fClipProxy.fLeft <= 0) {
-                fClipProxy.fLeft = SK_ScalarMin;
-            }
-            if (fClipProxy.fTop <= 0) {
-                fClipProxy.fTop = SK_ScalarMin;
-            }
-            if (fClipProxy.fRight >= this->getDrawState().getRenderTarget()->width()) {
-                fClipProxy.fRight = SK_ScalarMax;
-            }
-            if (fClipProxy.fBottom >= this->getDrawState().getRenderTarget()->height()) {
-                fClipProxy.fBottom = SK_ScalarMax;
-            }
-        } else {
-            fClipProxyState = kInvalid_ClipProxyState;
-        }
-    }
-    if (kValid_ClipProxyState == fClipProxyState) {
-        return fClipProxy.contains(devBounds);
-    }
-    SkPoint originOffset = {SkIntToScalar(this->getClip()->fOrigin.fX),
-                            SkIntToScalar(this->getClip()->fOrigin.fY)};
-    SkRect clipSpaceBounds = devBounds;
-    clipSpaceBounds.offset(originOffset);
-    return this->getClip()->fClipStack->quickContains(clipSpaceBounds);
-}
-
-int GrInOrderDrawBuffer::concatInstancedDraw(const DrawInfo& info) {
-    SkASSERT(info.isInstanced());
-
-    const GeometrySrcState& geomSrc = this->getGeomSrc();
-    const GrDrawState& drawState = this->getDrawState();
-
-    // we only attempt to concat the case when reserved verts are used with a client-specified index
-    // buffer. To make this work with client-specified VBs we'd need to know if the VB was updated
-    // between draws.
-    if (kReserved_GeometrySrcType != geomSrc.fVertexSrc ||
-        kBuffer_GeometrySrcType != geomSrc.fIndexSrc) {
-        return 0;
-    }
-    // Check if there is a draw info that is compatible that uses the same VB from the pool and
-    // the same IB
-    if (kDraw_Cmd != strip_trace_bit(fCmds.back())) {
-        return 0;
-    }
-
-    DrawRecord* draw = &fDraws.back();
-    GeometryPoolState& poolState = fGeoPoolStateStack.back();
-    const GrVertexBuffer* vertexBuffer = poolState.fPoolVertexBuffer;
-
-    if (!draw->isInstanced() ||
-        draw->verticesPerInstance() != info.verticesPerInstance() ||
-        draw->indicesPerInstance() != info.indicesPerInstance() ||
-        draw->fVertexBuffer != vertexBuffer ||
-        draw->fIndexBuffer != geomSrc.fIndexBuffer) {
-        return 0;
-    }
-    // info does not yet account for the offset from the start of the pool's VB while the previous
-    // draw record does.
-    int adjustedStartVertex = poolState.fPoolStartVertex + info.startVertex();
-    if (draw->startVertex() + draw->vertexCount() != adjustedStartVertex) {
-        return 0;
-    }
-
-    SkASSERT(poolState.fPoolStartVertex == draw->startVertex() + draw->vertexCount());
-
-    // how many instances can be concat'ed onto draw given the size of the index buffer
-    int instancesToConcat = this->indexCountInCurrentSource() / info.indicesPerInstance();
-    instancesToConcat -= draw->instanceCount();
-    instancesToConcat = SkTMin(instancesToConcat, info.instanceCount());
-
-    // update the amount of reserved vertex data actually referenced in draws
-    size_t vertexBytes = instancesToConcat * info.verticesPerInstance() *
-                         drawState.getVertexSize();
-    poolState.fUsedPoolVertexBytes = SkTMax(poolState.fUsedPoolVertexBytes, vertexBytes);
-
-    draw->adjustInstanceCount(instancesToConcat);
-
-    // update last fGpuCmdMarkers to include any additional trace markers that have been added
-    if (this->getActiveTraceMarkers().count() > 0) {
-        if (cmd_has_trace_marker(fCmds.back())) {
-            fGpuCmdMarkers.back().addSet(this->getActiveTraceMarkers());
-        } else {
-            fGpuCmdMarkers.push_back(this->getActiveTraceMarkers());
-            fCmds.back() = add_trace_bit(fCmds.back());
-        }
-    }
-
-    return instancesToConcat;
-}
-
-class AutoClipReenable {
-public:
-    AutoClipReenable() : fDrawState(NULL) {}
-    ~AutoClipReenable() {
-        if (NULL != fDrawState) {
-            fDrawState->enableState(GrDrawState::kClip_StateBit);
-        }
-    }
-    void set(GrDrawState* drawState) {
-        if (drawState->isClipState()) {
-            fDrawState = drawState;
-            drawState->disableState(GrDrawState::kClip_StateBit);
-        }
-    }
-private:
-    GrDrawState*    fDrawState;
-};
-
-void GrInOrderDrawBuffer::onDraw(const DrawInfo& info) {
-
-    GeometryPoolState& poolState = fGeoPoolStateStack.back();
-    const GrDrawState& drawState = this->getDrawState();
-    AutoClipReenable acr;
-
-    if (drawState.isClipState() &&
-        NULL != info.getDevBounds() &&
-        this->quickInsideClip(*info.getDevBounds())) {
-        acr.set(this->drawState());
-    }
-
-    if (this->needsNewClip()) {
-       this->recordClip();
-    }
-    if (this->needsNewState()) {
-        this->recordState();
-    }
-
-    DrawRecord* draw;
-    if (info.isInstanced()) {
-        int instancesConcated = this->concatInstancedDraw(info);
-        if (info.instanceCount() > instancesConcated) {
-            draw = this->recordDraw(info);
-            draw->adjustInstanceCount(-instancesConcated);
-        } else {
-            return;
-        }
-    } else {
-        draw = this->recordDraw(info);
-    }
-
-    switch (this->getGeomSrc().fVertexSrc) {
-        case kBuffer_GeometrySrcType:
-            draw->fVertexBuffer = this->getGeomSrc().fVertexBuffer;
-            break;
-        case kReserved_GeometrySrcType: // fallthrough
-        case kArray_GeometrySrcType: {
-            size_t vertexBytes = (info.vertexCount() + info.startVertex()) *
-                                 drawState.getVertexSize();
-            poolState.fUsedPoolVertexBytes = SkTMax(poolState.fUsedPoolVertexBytes, vertexBytes);
-            draw->fVertexBuffer = poolState.fPoolVertexBuffer;
-            draw->adjustStartVertex(poolState.fPoolStartVertex);
-            break;
-        }
-        default:
-            SkFAIL("unknown geom src type");
-    }
-    draw->fVertexBuffer->ref();
-
-    if (info.isIndexed()) {
-        switch (this->getGeomSrc().fIndexSrc) {
-            case kBuffer_GeometrySrcType:
-                draw->fIndexBuffer = this->getGeomSrc().fIndexBuffer;
-                break;
-            case kReserved_GeometrySrcType: // fallthrough
-            case kArray_GeometrySrcType: {
-                size_t indexBytes = (info.indexCount() + info.startIndex()) * sizeof(uint16_t);
-                poolState.fUsedPoolIndexBytes = SkTMax(poolState.fUsedPoolIndexBytes, indexBytes);
-                draw->fIndexBuffer = poolState.fPoolIndexBuffer;
-                draw->adjustStartIndex(poolState.fPoolStartIndex);
-                break;
-            }
-            default:
-                SkFAIL("unknown geom src type");
-        }
-        draw->fIndexBuffer->ref();
-    } else {
-        draw->fIndexBuffer = NULL;
-    }
-}
-
-GrInOrderDrawBuffer::StencilPath::StencilPath() {}
-GrInOrderDrawBuffer::DrawPath::DrawPath() {}
-GrInOrderDrawBuffer::DrawPaths::DrawPaths() {}
-GrInOrderDrawBuffer::DrawPaths::~DrawPaths() {
-    if (fTransforms) {
-        SkDELETE_ARRAY(fTransforms);
-    }
-    if (fIndices) {
-        SkDELETE_ARRAY(fIndices);
-    }
-}
-
-void GrInOrderDrawBuffer::onStencilPath(const GrPath* path, SkPath::FillType fill) {
-    if (this->needsNewClip()) {
-        this->recordClip();
-    }
-    // Only compare the subset of GrDrawState relevant to path stenciling?
-    if (this->needsNewState()) {
-        this->recordState();
-    }
-    StencilPath* sp = this->recordStencilPath();
-    sp->fPath.reset(path);
-    path->ref();
-    sp->fFill = fill;
-}
-
-void GrInOrderDrawBuffer::onDrawPath(const GrPath* path,
-                                     SkPath::FillType fill, const GrDeviceCoordTexture* dstCopy) {
-    if (this->needsNewClip()) {
-        this->recordClip();
-    }
-    // TODO: Only compare the subset of GrDrawState relevant to path covering?
-    if (this->needsNewState()) {
-        this->recordState();
-    }
-    DrawPath* cp = this->recordDrawPath();
-    cp->fPath.reset(path);
-    path->ref();
-    cp->fFill = fill;
-    if (NULL != dstCopy) {
-        cp->fDstCopy = *dstCopy;
-    }
-}
-
-void GrInOrderDrawBuffer::onDrawPaths(const GrPathRange* pathRange,
-                                      const uint32_t indices[], int count,
-                                      const float transforms[], PathTransformType transformsType,
-                                      SkPath::FillType fill, const GrDeviceCoordTexture* dstCopy) {
-    SkASSERT(NULL != pathRange);
-    SkASSERT(NULL != indices);
-    SkASSERT(NULL != transforms);
-
-    if (this->needsNewClip()) {
-        this->recordClip();
-    }
-    if (this->needsNewState()) {
-        this->recordState();
-    }
-    DrawPaths* dp = this->recordDrawPaths();
-    dp->fPathRange.reset(SkRef(pathRange));
-    dp->fIndices = SkNEW_ARRAY(uint32_t, count); // TODO: Accomplish this without a malloc
-    memcpy(dp->fIndices, indices, sizeof(uint32_t) * count);
-    dp->fCount = count;
-
-    const int transformsLength = PathTransformSize(transformsType) * count;
-    dp->fTransforms = SkNEW_ARRAY(float, transformsLength);
-    memcpy(dp->fTransforms, transforms, sizeof(float) * transformsLength);
-    dp->fTransformsType = transformsType;
-
-    dp->fFill = fill;
-
-    if (NULL != dstCopy) {
-        dp->fDstCopy = *dstCopy;
-    }
-}
-
-void GrInOrderDrawBuffer::clear(const SkIRect* rect, GrColor color,
-                                bool canIgnoreRect, GrRenderTarget* renderTarget) {
-    SkIRect r;
-    if (NULL == renderTarget) {
-        renderTarget = this->drawState()->getRenderTarget();
-        SkASSERT(NULL != renderTarget);
-    }
-    if (NULL == rect) {
-        // We could do something smart and remove previous draws and clears to
-        // the current render target. If we get that smart we have to make sure
-        // those draws aren't read before this clear (render-to-texture).
-        r.setLTRB(0, 0, renderTarget->width(), renderTarget->height());
-        rect = &r;
-    }
-    Clear* clr = this->recordClear();
-    GrColorIsPMAssert(color);
-    clr->fColor = color;
-    clr->fRect = *rect;
-    clr->fCanIgnoreRect = canIgnoreRect;
-    clr->fRenderTarget = renderTarget;
-    renderTarget->ref();
-}
-
-void GrInOrderDrawBuffer::discard(GrRenderTarget* renderTarget) {
-    if (!this->caps()->discardRenderTargetSupport()) {
-        return;
-    }
-    if (NULL == renderTarget) {
-        renderTarget = this->drawState()->getRenderTarget();
-        SkASSERT(NULL != renderTarget);
-    }
-    Clear* clr = this->recordClear();
-    clr->fColor = GrColor_ILLEGAL;
-    clr->fRenderTarget = renderTarget;
-    renderTarget->ref();
-}
-
-void GrInOrderDrawBuffer::reset() {
-    SkASSERT(1 == fGeoPoolStateStack.count());
-    this->resetVertexSource();
-    this->resetIndexSource();
-        
-    DrawAllocator::Iter drawIter(&fDraws);
-    while (drawIter.next()) {
-        // we always have a VB, but not always an IB
-        SkASSERT(NULL != drawIter->fVertexBuffer);
-        drawIter->fVertexBuffer->unref();
-        SkSafeUnref(drawIter->fIndexBuffer);
-    }
-    fCmds.reset();
-    fDraws.reset();
-    fStencilPaths.reset();
-    fDrawPath.reset();
-    fDrawPaths.reset();
-    fStates.reset();
-    fClears.reset();
-    fVertexPool.reset();
-    fIndexPool.reset();
-    fClips.reset();
-    fCopySurfaces.reset();
-    fGpuCmdMarkers.reset();
-    fClipSet = true;
-}
-
-void GrInOrderDrawBuffer::flush() {
-    if (fFlushing) {
-        return;
-    }
-
-    this->getContext()->getFontCache()->updateTextures();
-
-    SkASSERT(kReserved_GeometrySrcType != this->getGeomSrc().fVertexSrc);
-    SkASSERT(kReserved_GeometrySrcType != this->getGeomSrc().fIndexSrc);
-
-    int numCmds = fCmds.count();
-    if (0 == numCmds) {
-        return;
-    }
-
-    GrAutoTRestore<bool> flushRestore(&fFlushing);
-    fFlushing = true;
-
-    fVertexPool.unmap();
-    fIndexPool.unmap();
-
-    GrDrawTarget::AutoClipRestore acr(fDstGpu);
-    AutoGeometryAndStatePush agasp(fDstGpu, kPreserve_ASRInit);
-
-    GrDrawState* prevDrawState = SkRef(fDstGpu->drawState());
-
-    GrClipData clipData;
-
-    StateAllocator::Iter stateIter(&fStates);
-    ClipAllocator::Iter clipIter(&fClips);
-    ClearAllocator::Iter clearIter(&fClears);
-    DrawAllocator::Iter drawIter(&fDraws);
-    StencilPathAllocator::Iter stencilPathIter(&fStencilPaths);
-    DrawPathAllocator::Iter drawPathIter(&fDrawPath);
-    DrawPathsAllocator::Iter drawPathsIter(&fDrawPaths);
-    CopySurfaceAllocator::Iter copySurfaceIter(&fCopySurfaces);
-
-    int currCmdMarker   = 0;
-
-    fDstGpu->saveActiveTraceMarkers();
-    for (int c = 0; c < numCmds; ++c) {
-        GrGpuTraceMarker newMarker("", -1);
-        SkString traceString;
-        if (cmd_has_trace_marker(fCmds[c])) {
-            traceString = fGpuCmdMarkers[currCmdMarker].toString();
-            newMarker.fMarker = traceString.c_str();
-            fDstGpu->addGpuTraceMarker(&newMarker);
-            ++currCmdMarker;
-        }
-        switch (strip_trace_bit(fCmds[c])) {
-            case kDraw_Cmd: {
-                SkASSERT(fDstGpu->drawState() != prevDrawState);
-                SkAssertResult(drawIter.next());
-                fDstGpu->setVertexSourceToBuffer(drawIter->fVertexBuffer);
-                if (drawIter->isIndexed()) {
-                    fDstGpu->setIndexSourceToBuffer(drawIter->fIndexBuffer);
-                }
-                fDstGpu->executeDraw(*drawIter);
-                break;
-            }
-            case kStencilPath_Cmd: {
-                SkASSERT(fDstGpu->drawState() != prevDrawState);
-                SkAssertResult(stencilPathIter.next());
-                fDstGpu->stencilPath(stencilPathIter->fPath.get(), stencilPathIter->fFill);
-                break;
-            }
-            case kDrawPath_Cmd: {
-                SkASSERT(fDstGpu->drawState() != prevDrawState);
-                SkAssertResult(drawPathIter.next());
-                fDstGpu->executeDrawPath(drawPathIter->fPath.get(), drawPathIter->fFill,
-                                         NULL != drawPathIter->fDstCopy.texture() ?
-                                            &drawPathIter->fDstCopy :
-                                            NULL);
-                break;
-            }
-            case kDrawPaths_Cmd: {
-                SkASSERT(fDstGpu->drawState() != prevDrawState);
-                SkAssertResult(drawPathsIter.next());
-                const GrDeviceCoordTexture* dstCopy =
-                    NULL !=drawPathsIter->fDstCopy.texture() ? &drawPathsIter->fDstCopy : NULL;
-                fDstGpu->executeDrawPaths(drawPathsIter->fPathRange.get(),
-                                          drawPathsIter->fIndices,
-                                          drawPathsIter->fCount,
-                                          drawPathsIter->fTransforms,
-                                          drawPathsIter->fTransformsType,
-                                          drawPathsIter->fFill,
-                                          dstCopy);
-                break;
-            }
-            case kSetState_Cmd:
-                SkAssertResult(stateIter.next());
-                fDstGpu->setDrawState(stateIter.get());
-                break;
-            case kSetClip_Cmd:
-                SkAssertResult(clipIter.next());
-                clipData.fClipStack = &clipIter->fStack;
-                clipData.fOrigin = clipIter->fOrigin;
-                fDstGpu->setClip(&clipData);
-                break;
-            case kClear_Cmd:
-                SkAssertResult(clearIter.next());
-                if (GrColor_ILLEGAL == clearIter->fColor) {
-                    fDstGpu->discard(clearIter->fRenderTarget);
-                } else {
-                    fDstGpu->clear(&clearIter->fRect,
-                                   clearIter->fColor,
-                                   clearIter->fCanIgnoreRect,
-                                   clearIter->fRenderTarget);
-                }
-                break;
-            case kCopySurface_Cmd:
-                SkAssertResult(copySurfaceIter.next());
-                fDstGpu->copySurface(copySurfaceIter->fDst.get(),
-                                     copySurfaceIter->fSrc.get(),
-                                     copySurfaceIter->fSrcRect,
-                                     copySurfaceIter->fDstPoint);
-                break;
-        }
-        if (cmd_has_trace_marker(fCmds[c])) {
-            fDstGpu->removeGpuTraceMarker(&newMarker);
-        }
-    }
-    fDstGpu->restoreActiveTraceMarkers();
-    // we should have consumed all the states, clips, etc.
-    SkASSERT(!stateIter.next());
-    SkASSERT(!clipIter.next());
-    SkASSERT(!clearIter.next());
-    SkASSERT(!drawIter.next());
-    SkASSERT(!copySurfaceIter.next());
-    SkASSERT(!stencilPathIter.next());
-    SkASSERT(!drawPathIter.next());
-    SkASSERT(!drawPathsIter.next());
-
-    SkASSERT(fGpuCmdMarkers.count() == currCmdMarker);
-
-    fDstGpu->setDrawState(prevDrawState);
-    prevDrawState->unref();
-    this->reset();
-    ++fDrawID;
-}
-
-bool GrInOrderDrawBuffer::onCopySurface(GrSurface* dst,
-                                        GrSurface* src,
-                                        const SkIRect& srcRect,
-                                        const SkIPoint& dstPoint) {
-    if (fDstGpu->canCopySurface(dst, src, srcRect, dstPoint)) {
-        CopySurface* cs = this->recordCopySurface();
-        cs->fDst.reset(SkRef(dst));
-        cs->fSrc.reset(SkRef(src));
-        cs->fSrcRect = srcRect;
-        cs->fDstPoint = dstPoint;
-        return true;
-    } else {
-        return false;
-    }
-}
-
-bool GrInOrderDrawBuffer::onCanCopySurface(GrSurface* dst,
-                                           GrSurface* src,
-                                           const SkIRect& srcRect,
-                                           const SkIPoint& dstPoint) {
-    return fDstGpu->canCopySurface(dst, src, srcRect, dstPoint);
-}
-
-void GrInOrderDrawBuffer::initCopySurfaceDstDesc(const GrSurface* src, GrTextureDesc* desc) {
-    fDstGpu->initCopySurfaceDstDesc(src, desc);
-}
-
-void GrInOrderDrawBuffer::willReserveVertexAndIndexSpace(int vertexCount,
-                                                         int indexCount) {
-    // We use geometryHints() to know whether to flush the draw buffer. We
-    // can't flush if we are inside an unbalanced pushGeometrySource.
-    // Moreover, flushing blows away vertex and index data that was
-    // previously reserved. So if the vertex or index data is pulled from
-    // reserved space and won't be released by this request then we can't
-    // flush.
-    bool insideGeoPush = fGeoPoolStateStack.count() > 1;
-
-    bool unreleasedVertexSpace =
-        !vertexCount &&
-        kReserved_GeometrySrcType == this->getGeomSrc().fVertexSrc;
-
-    bool unreleasedIndexSpace =
-        !indexCount &&
-        kReserved_GeometrySrcType == this->getGeomSrc().fIndexSrc;
-
-    // we don't want to finalize any reserved geom on the target since
-    // we don't know that the client has finished writing to it.
-    bool targetHasReservedGeom = fDstGpu->hasReservedVerticesOrIndices();
-
-    int vcount = vertexCount;
-    int icount = indexCount;
-
-    if (!insideGeoPush &&
-        !unreleasedVertexSpace &&
-        !unreleasedIndexSpace &&
-        !targetHasReservedGeom &&
-        this->geometryHints(&vcount, &icount)) {
-
-        this->flush();
-    }
-}
-
-bool GrInOrderDrawBuffer::geometryHints(int* vertexCount,
-                                        int* indexCount) const {
-    // we will recommend a flush if the data could fit in a single
-    // preallocated buffer but none are left and it can't fit
-    // in the current buffer (which may not be prealloced).
-    bool flush = false;
-    if (NULL != indexCount) {
-        int32_t currIndices = fIndexPool.currentBufferIndices();
-        if (*indexCount > currIndices &&
-            (!fIndexPool.preallocatedBuffersRemaining() &&
-             *indexCount <= fIndexPool.preallocatedBufferIndices())) {
-
-            flush = true;
-        }
-        *indexCount = currIndices;
-    }
-    if (NULL != vertexCount) {
-        size_t vertexSize = this->getDrawState().getVertexSize();
-        int32_t currVertices = fVertexPool.currentBufferVertices(vertexSize);
-        if (*vertexCount > currVertices &&
-            (!fVertexPool.preallocatedBuffersRemaining() &&
-             *vertexCount <= fVertexPool.preallocatedBufferVertices(vertexSize))) {
-
-            flush = true;
-        }
-        *vertexCount = currVertices;
-    }
-    return flush;
-}
-
-bool GrInOrderDrawBuffer::onReserveVertexSpace(size_t vertexSize,
-                                               int vertexCount,
-                                               void** vertices) {
-    GeometryPoolState& poolState = fGeoPoolStateStack.back();
-    SkASSERT(vertexCount > 0);
-    SkASSERT(NULL != vertices);
-    SkASSERT(0 == poolState.fUsedPoolVertexBytes);
-
-    *vertices = fVertexPool.makeSpace(vertexSize,
-                                      vertexCount,
-                                      &poolState.fPoolVertexBuffer,
-                                      &poolState.fPoolStartVertex);
-    return NULL != *vertices;
-}
-
-bool GrInOrderDrawBuffer::onReserveIndexSpace(int indexCount, void** indices) {
-    GeometryPoolState& poolState = fGeoPoolStateStack.back();
-    SkASSERT(indexCount > 0);
-    SkASSERT(NULL != indices);
-    SkASSERT(0 == poolState.fUsedPoolIndexBytes);
-
-    *indices = fIndexPool.makeSpace(indexCount,
-                                    &poolState.fPoolIndexBuffer,
-                                    &poolState.fPoolStartIndex);
-    return NULL != *indices;
-}
-
-void GrInOrderDrawBuffer::releaseReservedVertexSpace() {
-    GeometryPoolState& poolState = fGeoPoolStateStack.back();
-    const GeometrySrcState& geoSrc = this->getGeomSrc();
-
-    // If we get a release vertex space call then our current source should either be reserved
-    // or array (which we copied into reserved space).
-    SkASSERT(kReserved_GeometrySrcType == geoSrc.fVertexSrc ||
-             kArray_GeometrySrcType == geoSrc.fVertexSrc);
-
-    // When the caller reserved vertex buffer space we gave it back a pointer
-    // provided by the vertex buffer pool. At each draw we tracked the largest
-    // offset into the pool's pointer that was referenced. Now we return to the
-    // pool any portion at the tail of the allocation that no draw referenced.
-    size_t reservedVertexBytes = geoSrc.fVertexSize * geoSrc.fVertexCount;
-    fVertexPool.putBack(reservedVertexBytes -
-                        poolState.fUsedPoolVertexBytes);
-    poolState.fUsedPoolVertexBytes = 0;
-    poolState.fPoolVertexBuffer = NULL;
-    poolState.fPoolStartVertex = 0;
-}
-
-void GrInOrderDrawBuffer::releaseReservedIndexSpace() {
-    GeometryPoolState& poolState = fGeoPoolStateStack.back();
-    const GeometrySrcState& geoSrc = this->getGeomSrc();
-
-    // If we get a release index space call then our current source should either be reserved
-    // or array (which we copied into reserved space).
-    SkASSERT(kReserved_GeometrySrcType == geoSrc.fIndexSrc ||
-             kArray_GeometrySrcType == geoSrc.fIndexSrc);
-
-    // Similar to releaseReservedVertexSpace we return any unused portion at
-    // the tail
-    size_t reservedIndexBytes = sizeof(uint16_t) * geoSrc.fIndexCount;
-    fIndexPool.putBack(reservedIndexBytes - poolState.fUsedPoolIndexBytes);
-    poolState.fUsedPoolIndexBytes = 0;
-    poolState.fPoolIndexBuffer = NULL;
-    poolState.fPoolStartIndex = 0;
-}
-
-void GrInOrderDrawBuffer::onSetVertexSourceToArray(const void* vertexArray,
-                                                   int vertexCount) {
-
-    GeometryPoolState& poolState = fGeoPoolStateStack.back();
-    SkASSERT(0 == poolState.fUsedPoolVertexBytes);
-#ifdef SK_DEBUG
-    bool success =
-#endif
-    fVertexPool.appendVertices(this->getVertexSize(),
-                               vertexCount,
-                               vertexArray,
-                               &poolState.fPoolVertexBuffer,
-                               &poolState.fPoolStartVertex);
-    GR_DEBUGASSERT(success);
-}
-
-void GrInOrderDrawBuffer::onSetIndexSourceToArray(const void* indexArray,
-                                                  int indexCount) {
-    GeometryPoolState& poolState = fGeoPoolStateStack.back();
-    SkASSERT(0 == poolState.fUsedPoolIndexBytes);
-#ifdef SK_DEBUG
-    bool success =
-#endif
-    fIndexPool.appendIndices(indexCount,
-                             indexArray,
-                             &poolState.fPoolIndexBuffer,
-                             &poolState.fPoolStartIndex);
-    GR_DEBUGASSERT(success);
-}
-
-void GrInOrderDrawBuffer::releaseVertexArray() {
-    // When the client provides an array as the vertex source we handled it
-    // by copying their array into reserved space.
-    this->GrInOrderDrawBuffer::releaseReservedVertexSpace();
-}
-
-void GrInOrderDrawBuffer::releaseIndexArray() {
-    // When the client provides an array as the index source we handled it
-    // by copying their array into reserved space.
-    this->GrInOrderDrawBuffer::releaseReservedIndexSpace();
-}
-
-void GrInOrderDrawBuffer::geometrySourceWillPush() {
-    GeometryPoolState& poolState = fGeoPoolStateStack.push_back();
-    poolState.fUsedPoolVertexBytes = 0;
-    poolState.fUsedPoolIndexBytes = 0;
-#ifdef SK_DEBUG
-    poolState.fPoolVertexBuffer = (GrVertexBuffer*)~0;
-    poolState.fPoolStartVertex = ~0;
-    poolState.fPoolIndexBuffer = (GrIndexBuffer*)~0;
-    poolState.fPoolStartIndex = ~0;
-#endif
-}
-
-void GrInOrderDrawBuffer::geometrySourceWillPop(
-                                        const GeometrySrcState& restoredState) {
-    SkASSERT(fGeoPoolStateStack.count() > 1);
-    fGeoPoolStateStack.pop_back();
-    GeometryPoolState& poolState = fGeoPoolStateStack.back();
-    // we have to assume that any slack we had in our vertex/index data
-    // is now unreleasable because data may have been appended later in the
-    // pool.
-    if (kReserved_GeometrySrcType == restoredState.fVertexSrc ||
-        kArray_GeometrySrcType == restoredState.fVertexSrc) {
-        poolState.fUsedPoolVertexBytes = restoredState.fVertexSize * restoredState.fVertexCount;
-    }
-    if (kReserved_GeometrySrcType == restoredState.fIndexSrc ||
-        kArray_GeometrySrcType == restoredState.fIndexSrc) {
-        poolState.fUsedPoolIndexBytes = sizeof(uint16_t) *
-                                         restoredState.fIndexCount;
-    }
-}
-
-bool GrInOrderDrawBuffer::needsNewState() const {
-    return fStates.empty() || fStates.back() != this->getDrawState();
-}
-
-bool GrInOrderDrawBuffer::needsNewClip() const {
-    if (this->getDrawState().isClipState()) {
-       if (fClipSet &&
-           (fClips.empty() ||
-            fClips.back().fStack != *this->getClip()->fClipStack ||
-            fClips.back().fOrigin != this->getClip()->fOrigin)) {
-           return true;
-       }
-    }
-    return false;
-}
-
-void GrInOrderDrawBuffer::addToCmdBuffer(uint8_t cmd) {
-    SkASSERT(!cmd_has_trace_marker(cmd));
-    const GrTraceMarkerSet& activeTraceMarkers = this->getActiveTraceMarkers();
-    if (activeTraceMarkers.count() > 0) {
-        fCmds.push_back(add_trace_bit(cmd));
-        fGpuCmdMarkers.push_back(activeTraceMarkers);
-    } else {
-        fCmds.push_back(cmd);
-    }
-}
-
-void GrInOrderDrawBuffer::recordClip() {
-    fClips.push_back().fStack = *this->getClip()->fClipStack;
-    fClips.back().fOrigin = this->getClip()->fOrigin;
-    fClipSet = false;
-    this->addToCmdBuffer(kSetClip_Cmd);
-}
-
-void GrInOrderDrawBuffer::recordState() {
-    fStates.push_back() = this->getDrawState();
-    this->addToCmdBuffer(kSetState_Cmd);
-}
-
-GrInOrderDrawBuffer::DrawRecord* GrInOrderDrawBuffer::recordDraw(const DrawInfo& info) {
-    this->addToCmdBuffer(kDraw_Cmd);
-    return &fDraws.push_back(info);
-}
-
-GrInOrderDrawBuffer::StencilPath* GrInOrderDrawBuffer::recordStencilPath() {
-    this->addToCmdBuffer(kStencilPath_Cmd);
-    return &fStencilPaths.push_back();
-}
-
-GrInOrderDrawBuffer::DrawPath* GrInOrderDrawBuffer::recordDrawPath() {
-    this->addToCmdBuffer(kDrawPath_Cmd);
-    return &fDrawPath.push_back();
-}
-
-GrInOrderDrawBuffer::DrawPaths* GrInOrderDrawBuffer::recordDrawPaths() {
-    this->addToCmdBuffer(kDrawPaths_Cmd);
-    return &fDrawPaths.push_back();
-}
-
-GrInOrderDrawBuffer::Clear* GrInOrderDrawBuffer::recordClear() {
-    this->addToCmdBuffer(kClear_Cmd);
-    return &fClears.push_back();
-}
-
-GrInOrderDrawBuffer::CopySurface* GrInOrderDrawBuffer::recordCopySurface() {
-    this->addToCmdBuffer(kCopySurface_Cmd);
-    return &fCopySurfaces.push_back();
-}
-
-void GrInOrderDrawBuffer::clipWillBeSet(const GrClipData* newClipData) {
-    INHERITED::clipWillBeSet(newClipData);
-    fClipSet = true;
-    fClipProxyState = kUnknown_ClipProxyState;
-}
diff --git a/gfx/skia/skia/src/gpu/GrInOrderDrawBuffer.h b/gfx/skia/skia/src/gpu/GrInOrderDrawBuffer.h
deleted file mode 100644
index b18112efae48..000000000000
--- a/gfx/skia/skia/src/gpu/GrInOrderDrawBuffer.h
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrInOrderDrawBuffer_DEFINED
-#define GrInOrderDrawBuffer_DEFINED
-
-#include "GrDrawTarget.h"
-#include "GrAllocPool.h"
-#include "GrAllocator.h"
-#include "GrPath.h"
-
-#include "SkClipStack.h"
-#include "SkTemplates.h"
-#include "SkTypes.h"
-
-class GrGpu;
-class GrIndexBufferAllocPool;
-class GrPathRange;
-class GrVertexBufferAllocPool;
-
-/**
- * GrInOrderDrawBuffer is an implementation of GrDrawTarget that queues up draws for eventual
- * playback into a GrGpu. In theory one draw buffer could playback into another. When index or
- * vertex buffers are used as geometry sources it is the callers the draw buffer only holds
- * references to the buffers. It is the callers responsibility to ensure that the data is still
- * valid when the draw buffer is played back into a GrGpu. Similarly, it is the caller's
- * responsibility to ensure that all referenced textures, buffers, and render-targets are associated
- * in the GrGpu object that the buffer is played back into. The buffer requires VB and IB pools to
- * store geometry.
- */
-class GrInOrderDrawBuffer : public GrDrawTarget {
-public:
-
-    /**
-     * Creates a GrInOrderDrawBuffer
-     *
-     * @param gpu        the gpu object that this draw buffer flushes to.
-     * @param vertexPool pool where vertices for queued draws will be saved when
-     *                   the vertex source is either reserved or array.
-     * @param indexPool  pool where indices for queued draws will be saved when
-     *                   the index source is either reserved or array.
-     */
-    GrInOrderDrawBuffer(GrGpu* gpu,
-                        GrVertexBufferAllocPool* vertexPool,
-                        GrIndexBufferAllocPool* indexPool);
-
-    virtual ~GrInOrderDrawBuffer();
-
-    /**
-     * Empties the draw buffer of any queued up draws. This must not be called while inside an
-     * unbalanced pushGeometrySource(). The current draw state and clip are preserved.
-     */
-    void reset();
-
-    /**
-     * This plays the queued up draws to its GrGpu target. It also resets this object (i.e. flushing
-     * is destructive). This buffer must not have an active reserved vertex or index source. Any
-     * reserved geometry on the target will be finalized because it's geometry source will be pushed
-     * before flushing and popped afterwards.
-     */
-    void flush();
-
-    // tracking for draws
-    virtual DrawToken getCurrentDrawToken() { return DrawToken(this, fDrawID); }
-
-    // overrides from GrDrawTarget
-    virtual bool geometryHints(int* vertexCount,
-                               int* indexCount) const SK_OVERRIDE;
-    virtual void clear(const SkIRect* rect,
-                       GrColor color,
-                       bool canIgnoreRect,
-                       GrRenderTarget* renderTarget) SK_OVERRIDE;
-
-    virtual void discard(GrRenderTarget*) SK_OVERRIDE;
-
-    virtual void initCopySurfaceDstDesc(const GrSurface* src, GrTextureDesc* desc) SK_OVERRIDE;
-
-protected:
-    virtual void clipWillBeSet(const GrClipData* newClip) SK_OVERRIDE;
-
-private:
-    enum Cmd {
-        kDraw_Cmd           = 1,
-        kStencilPath_Cmd    = 2,
-        kSetState_Cmd       = 3,
-        kSetClip_Cmd        = 4,
-        kClear_Cmd          = 5,
-        kCopySurface_Cmd    = 6,
-        kDrawPath_Cmd       = 7,
-        kDrawPaths_Cmd      = 8,
-    };
-
-    class DrawRecord : public DrawInfo {
-    public:
-        DrawRecord(const DrawInfo& info) : DrawInfo(info) {}
-        const GrVertexBuffer*   fVertexBuffer;
-        const GrIndexBuffer*    fIndexBuffer;
-    };
-
-    struct StencilPath : public ::SkNoncopyable {
-        StencilPath();
-
-        SkAutoTUnref<const GrPath>  fPath;
-        SkPath::FillType            fFill;
-    };
-
-    struct DrawPath : public ::SkNoncopyable {
-        DrawPath();
-
-        SkAutoTUnref<const GrPath>  fPath;
-        SkPath::FillType            fFill;
-        GrDeviceCoordTexture        fDstCopy;
-    };
-
-    struct DrawPaths : public ::SkNoncopyable {
-        DrawPaths();
-        ~DrawPaths();
-
-        SkAutoTUnref<const GrPathRange> fPathRange;
-        uint32_t* fIndices;
-        size_t fCount;
-        float* fTransforms;
-        PathTransformType fTransformsType;
-        SkPath::FillType fFill;
-        GrDeviceCoordTexture fDstCopy;
-    };
-
-    // This is also used to record a discard by setting the color to GrColor_ILLEGAL
-    struct Clear : public ::SkNoncopyable {
-        Clear() : fRenderTarget(NULL) {}
-        ~Clear() { SkSafeUnref(fRenderTarget); }
-
-        SkIRect         fRect;
-        GrColor         fColor;
-        bool            fCanIgnoreRect;
-        GrRenderTarget* fRenderTarget;
-    };
-
-    struct CopySurface : public ::SkNoncopyable {
-        SkAutoTUnref<GrSurface> fDst;
-        SkAutoTUnref<GrSurface> fSrc;
-        SkIRect                 fSrcRect;
-        SkIPoint                fDstPoint;
-    };
-
-    struct Clip : public ::SkNoncopyable {
-        SkClipStack fStack;
-        SkIPoint    fOrigin;
-    };
-
-    // overrides from GrDrawTarget
-    virtual void onDraw(const DrawInfo&) SK_OVERRIDE;
-    virtual void onDrawRect(const SkRect& rect,
-                            const SkMatrix* matrix,
-                            const SkRect* localRect,
-                            const SkMatrix* localMatrix) SK_OVERRIDE;
-
-    virtual void onStencilPath(const GrPath*, SkPath::FillType) SK_OVERRIDE;
-    virtual void onDrawPath(const GrPath*, SkPath::FillType,
-                            const GrDeviceCoordTexture* dstCopy) SK_OVERRIDE;
-    virtual void onDrawPaths(const GrPathRange*,
-                             const uint32_t indices[], int count,
-                             const float transforms[], PathTransformType,
-                             SkPath::FillType, const GrDeviceCoordTexture*) SK_OVERRIDE;
-
-    virtual bool onReserveVertexSpace(size_t vertexSize,
-                                      int vertexCount,
-                                      void** vertices) SK_OVERRIDE;
-    virtual bool onReserveIndexSpace(int indexCount,
-                                     void** indices) SK_OVERRIDE;
-    virtual void releaseReservedVertexSpace() SK_OVERRIDE;
-    virtual void releaseReservedIndexSpace() SK_OVERRIDE;
-    virtual void onSetVertexSourceToArray(const void* vertexArray,
-                                          int vertexCount) SK_OVERRIDE;
-    virtual void onSetIndexSourceToArray(const void* indexArray,
-                                         int indexCount) SK_OVERRIDE;
-    virtual void releaseVertexArray() SK_OVERRIDE;
-    virtual void releaseIndexArray() SK_OVERRIDE;
-    virtual void geometrySourceWillPush() SK_OVERRIDE;
-    virtual void geometrySourceWillPop(const GeometrySrcState& restoredState) SK_OVERRIDE;
-    virtual void willReserveVertexAndIndexSpace(int vertexCount,
-                                                int indexCount) SK_OVERRIDE;
-    virtual bool onCopySurface(GrSurface* dst,
-                               GrSurface* src,
-                               const SkIRect& srcRect,
-                               const SkIPoint& dstPoint)  SK_OVERRIDE;
-    virtual bool onCanCopySurface(GrSurface* dst,
-                                  GrSurface* src,
-                                  const SkIRect& srcRect,
-                                  const SkIPoint& dstPoint) SK_OVERRIDE;
-
-    bool quickInsideClip(const SkRect& devBounds);
-
-    virtual void didAddGpuTraceMarker() SK_OVERRIDE {}
-    virtual void didRemoveGpuTraceMarker() SK_OVERRIDE {}
-
-    // Attempts to concat instances from info onto the previous draw. info must represent an
-    // instanced draw. The caller must have already recorded a new draw state and clip if necessary.
-    int concatInstancedDraw(const DrawInfo& info);
-
-    // we lazily record state and clip changes in order to skip clips and states that have no
-    // effect.
-    bool needsNewState() const;
-    bool needsNewClip() const;
-
-    // these functions record a command
-    void            recordState();
-    void            recordClip();
-    DrawRecord*     recordDraw(const DrawInfo&);
-    StencilPath*    recordStencilPath();
-    DrawPath*       recordDrawPath();
-    DrawPaths*      recordDrawPaths();
-    Clear*          recordClear();
-    CopySurface*    recordCopySurface();
-
-    // TODO: Use a single allocator for commands and records
-    enum {
-        kCmdPreallocCnt          = 32,
-        kDrawPreallocCnt         = 16,
-        kStencilPathPreallocCnt  = 8,
-        kDrawPathPreallocCnt     = 8,
-        kDrawPathsPreallocCnt    = 8,
-        kStatePreallocCnt        = 8,
-        kClipPreallocCnt         = 8,
-        kClearPreallocCnt        = 8,
-        kGeoPoolStatePreAllocCnt = 4,
-        kCopySurfacePreallocCnt  = 4,
-    };
-
-    typedef GrTAllocator<DrawRecord>                        DrawAllocator;
-    typedef GrTAllocator<StencilPath>                       StencilPathAllocator;
-    typedef GrTAllocator<DrawPath>                          DrawPathAllocator;
-    typedef GrTAllocator<DrawPaths>                         DrawPathsAllocator;
-    typedef GrTAllocator<GrDrawState>                       StateAllocator;
-    typedef GrTAllocator<Clear>                             ClearAllocator;
-    typedef GrTAllocator<CopySurface>                       CopySurfaceAllocator;
-    typedef GrTAllocator<Clip>                              ClipAllocator;
-
-    GrSTAllocator<kDrawPreallocCnt, DrawRecord>                        fDraws;
-    GrSTAllocator<kStencilPathPreallocCnt, StencilPath>                fStencilPaths;
-    GrSTAllocator<kDrawPathPreallocCnt, DrawPath>                      fDrawPath;
-    GrSTAllocator<kDrawPathsPreallocCnt, DrawPaths>                    fDrawPaths;
-    GrSTAllocator<kStatePreallocCnt, GrDrawState>                      fStates;
-    GrSTAllocator<kClearPreallocCnt, Clear>                            fClears;
-    GrSTAllocator<kCopySurfacePreallocCnt, CopySurface>                fCopySurfaces;
-    GrSTAllocator<kClipPreallocCnt, Clip>                              fClips;
-
-    SkTArray<GrTraceMarkerSet, false>                                  fGpuCmdMarkers;
-
-    SkSTArray<kCmdPreallocCnt, uint8_t, true>                          fCmds;
-
-    GrDrawTarget*                   fDstGpu;
-
-    bool                            fClipSet;
-
-    enum ClipProxyState {
-        kUnknown_ClipProxyState,
-        kValid_ClipProxyState,
-        kInvalid_ClipProxyState
-    };
-    ClipProxyState                  fClipProxyState;
-    SkRect                          fClipProxy;
-
-    GrVertexBufferAllocPool&        fVertexPool;
-
-    GrIndexBufferAllocPool&         fIndexPool;
-
-    struct GeometryPoolState {
-        const GrVertexBuffer*           fPoolVertexBuffer;
-        int                             fPoolStartVertex;
-        const GrIndexBuffer*            fPoolIndexBuffer;
-        int                             fPoolStartIndex;
-        // caller may conservatively over reserve vertices / indices.
-        // we release unused space back to allocator if possible
-        // can only do this if there isn't an intervening pushGeometrySource()
-        size_t                          fUsedPoolVertexBytes;
-        size_t                          fUsedPoolIndexBytes;
-    };
-    SkSTArray<kGeoPoolStatePreAllocCnt, GeometryPoolState> fGeoPoolStateStack;
-
-    virtual bool       isIssued(uint32_t drawID) { return drawID != fDrawID; }
-
-    void addToCmdBuffer(uint8_t cmd);
-
-    bool                            fFlushing;
-    uint32_t                        fDrawID;
-
-    typedef GrDrawTarget INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/GrIndexBuffer.h b/gfx/skia/skia/src/gpu/GrIndexBuffer.h
index 113b89d30705..2e3b437adfc3 100644
--- a/gfx/skia/skia/src/gpu/GrIndexBuffer.h
+++ b/gfx/skia/skia/src/gpu/GrIndexBuffer.h
@@ -13,8 +13,18 @@
 
 #include "GrGeometryBuffer.h"
 
+
 class GrIndexBuffer : public GrGeometryBuffer {
 public:
+    static void ComputeScratchKey(size_t size, bool dynamic, GrScratchKey* key) {
+        static const GrScratchKey::ResourceType kType = GrScratchKey::GenerateResourceType();
+
+        GrScratchKey::Builder builder(key, kType, 2);
+
+        builder[0] = SkToUInt(size);
+        builder[1] = dynamic ? 1 : 0;
+    }
+
     /**
      * Retrieves the maximum number of quads that could be rendered
      * from the index buffer (using kTriangles_GrPrimitiveType).
@@ -24,8 +34,16 @@ public:
         return static_cast<int>(this->gpuMemorySize() / (sizeof(uint16_t) * 6));
     }
 protected:
-    GrIndexBuffer(GrGpu* gpu, bool isWrapped, size_t gpuMemorySize, bool dynamic, bool cpuBacked)
-        : INHERITED(gpu, isWrapped, gpuMemorySize, dynamic, cpuBacked) {}
+    GrIndexBuffer(GrGpu* gpu, size_t gpuMemorySize, bool dynamic, bool cpuBacked)
+        : INHERITED(gpu, gpuMemorySize, dynamic, cpuBacked) {
+        // We currently only make buffers scratch if they're both pow2 sized and not cpuBacked.
+        if (!cpuBacked && SkIsPow2(gpuMemorySize)) {
+            GrScratchKey key;
+            ComputeScratchKey(gpuMemorySize, dynamic, &key);
+            this->setScratchKey(key);
+        }
+    }
+
 private:
     typedef GrGeometryBuffer INHERITED;
 };
diff --git a/gfx/skia/skia/src/gpu/GrInvariantOutput.cpp b/gfx/skia/skia/src/gpu/GrInvariantOutput.cpp
new file mode 100644
index 000000000000..8de5817054e6
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrInvariantOutput.cpp
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrInvariantOutput.h"
+
+#ifdef SK_DEBUG
+
+void GrInvariantOutput::validate() const {
+    if (fIsSingleComponent) {
+        SkASSERT(0 == fValidFlags || kRGBA_GrColorComponentFlags == fValidFlags);
+        if (kRGBA_GrColorComponentFlags == fValidFlags) {
+            SkASSERT(this->colorComponentsAllEqual());
+        }
+    }
+
+    // If we claim that we are not using the input color we must not be modulating the input.
+    SkASSERT(fNonMulStageFound || fWillUseInputColor);
+}
+
+bool GrInvariantOutput::colorComponentsAllEqual() const {
+    unsigned colorA = GrColorUnpackA(fColor);
+    return(GrColorUnpackR(fColor) == colorA &&
+           GrColorUnpackG(fColor) == colorA &&
+           GrColorUnpackB(fColor) == colorA);
+}
+
+#endif // end DEBUG
+
diff --git a/gfx/skia/skia/src/gpu/GrLayerAtlas.cpp b/gfx/skia/skia/src/gpu/GrLayerAtlas.cpp
new file mode 100644
index 000000000000..9beb509f86eb
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrLayerAtlas.cpp
@@ -0,0 +1,170 @@
+
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrGpuResourcePriv.h"
+#include "GrLayerAtlas.h"
+#include "GrRectanizer.h"
+#include "GrTextureProvider.h"
+
+///////////////////////////////////////////////////////////////////////////////
+GrLayerAtlas::Plot::Plot() 
+    : fID(-1)
+    , fRects(nullptr) {
+    fOffset.set(0, 0);
+}
+
+GrLayerAtlas::Plot::~Plot() {
+    delete fRects;
+}
+
+void GrLayerAtlas::Plot::init(int id, int offX, int offY, int width, int height) {
+    fID = id;
+    fRects = GrRectanizer::Factory(width, height);
+    fOffset.set(offX * width, offY * height);
+}
+
+bool GrLayerAtlas::Plot::allocateRect(int width, int height, SkIPoint16* loc) {
+    if (!fRects->addRect(width, height, loc)) {
+        return false;
+    }
+
+    loc->fX += fOffset.fX;
+    loc->fY += fOffset.fY;
+    return true;
+}
+
+void GrLayerAtlas::Plot::reset() {
+    SkASSERT(fRects);
+    fRects->reset();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+GR_DECLARE_STATIC_UNIQUE_KEY(gLayerAtlasKey);
+static const GrUniqueKey& get_layer_atlas_key() {
+    GR_DEFINE_STATIC_UNIQUE_KEY(gLayerAtlasKey);
+    return gLayerAtlasKey;
+}
+
+bool GrLayerAtlas::reattachBackingTexture() {
+    SkASSERT(!fTexture);
+
+    fTexture.reset(fTexProvider->findAndRefTextureByUniqueKey(get_layer_atlas_key()));
+    return SkToBool(fTexture);
+}
+
+void GrLayerAtlas::createBackingTexture() {
+    SkASSERT(!fTexture);
+
+    GrSurfaceDesc desc;
+    desc.fFlags = fFlags;
+    desc.fWidth = fBackingTextureSize.width();
+    desc.fHeight = fBackingTextureSize.height();
+    desc.fConfig = fPixelConfig;
+
+    fTexture.reset(fTexProvider->createTexture(desc, true, nullptr, 0));
+
+    fTexture->resourcePriv().setUniqueKey(get_layer_atlas_key());
+}
+
+GrLayerAtlas::GrLayerAtlas(GrTextureProvider* texProvider, GrPixelConfig config, 
+                           GrSurfaceFlags flags,
+                           const SkISize& backingTextureSize,
+                           int numPlotsX, int numPlotsY) {
+    fTexProvider = texProvider;
+    fPixelConfig = config;
+    fFlags = flags;
+    fBackingTextureSize = backingTextureSize;
+
+    int textureWidth = fBackingTextureSize.width();
+    int textureHeight = fBackingTextureSize.height();
+
+    int plotWidth = textureWidth / numPlotsX;
+    int plotHeight = textureHeight / numPlotsY;
+
+    SkASSERT(plotWidth * numPlotsX == textureWidth);
+    SkASSERT(plotHeight * numPlotsY == textureHeight);
+
+    // We currently do not support compressed atlases...
+    SkASSERT(!GrPixelConfigIsCompressed(config));
+
+    // set up allocated plots
+    fPlotArray = new Plot[numPlotsX * numPlotsY];
+
+    Plot* currPlot = fPlotArray;
+    for (int y = numPlotsY-1; y >= 0; --y) {
+        for (int x = numPlotsX-1; x >= 0; --x) {
+            currPlot->init(y*numPlotsX+x, x, y, plotWidth, plotHeight);
+
+            // build LRU list
+            fPlotList.addToHead(currPlot);
+            ++currPlot;
+        }
+    }
+}
+
+void GrLayerAtlas::resetPlots() {
+    PlotIter iter;
+    for (Plot* plot = iter.init(fPlotList, PlotIter::kHead_IterStart); plot; plot = iter.next()) {
+        plot->reset();
+    }
+}
+
+GrLayerAtlas::~GrLayerAtlas() {
+    delete[] fPlotArray;
+}
+
+void GrLayerAtlas::makeMRU(Plot* plot) {
+    if (fPlotList.head() == plot) {
+        return;
+    }
+
+    fPlotList.remove(plot);
+    fPlotList.addToHead(plot);
+};
+
+GrLayerAtlas::Plot* GrLayerAtlas::addToAtlas(ClientPlotUsage* usage,
+                                             int width, int height, SkIPoint16* loc) {
+    // Iterate through the plots currently being used by this client and see if we can find a hole.
+    // The last one was most recently added and probably most empty.
+    // We want to consolidate the uses from individual clients to the same plot(s) so that
+    // when a specific client goes away they are more likely to completely empty a plot.
+    for (int i = usage->numPlots()-1; i >= 0; --i) {
+        Plot* plot = usage->plot(i);
+        if (plot->allocateRect(width, height, loc)) {
+            this->makeMRU(plot);
+            return plot;
+        }
+    }
+
+    // before we get a new plot, make sure we have a backing texture
+    if (nullptr == fTexture) {
+        this->createBackingTexture();
+        if (nullptr == fTexture) {
+            return nullptr;
+        }
+    }
+
+    // Now look through all allocated plots for one we can share, in MRU order
+    // TODO: its seems like traversing from emptiest to fullest would make more sense
+    PlotList::Iter plotIter;
+    plotIter.init(fPlotList, PlotList::Iter::kHead_IterStart);
+    Plot* plot;
+    while ((plot = plotIter.get())) {
+        if (plot->allocateRect(width, height, loc)) {
+            this->makeMRU(plot);
+            // new plot for atlas, put at end of array
+            usage->appendPlot(plot);
+            return plot;
+        }
+        plotIter.next();
+    }
+
+    // If the above fails, then the current plot list has no room
+    return nullptr;
+}
+
diff --git a/gfx/skia/skia/src/gpu/GrLayerAtlas.h b/gfx/skia/skia/src/gpu/GrLayerAtlas.h
new file mode 100644
index 000000000000..e84667b5ea02
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrLayerAtlas.h
@@ -0,0 +1,158 @@
+
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrLayerAtlas_DEFINED
+#define GrLayerAtlas_DEFINED
+
+#include "GrTexture.h"
+
+#include "SkPoint.h"
+#include "SkTDArray.h"
+#include "SkTInternalLList.h"
+
+class GrLayerAtlas;
+class GrTextureProvider;
+class GrRectanizer;
+
+// The backing GrTexture for a GrLayerAtlas is broken into a spatial grid of Plots. When
+// the atlas needs space on the texture (i.e., in response to an addToAtlas call), it 
+// iterates through the plots in use by the requesting client looking for space and, 
+// if no space is found, opens up a new Plot for that client. The Plots keep track of 
+// subimage placement via their GrRectanizer. 
+//
+// If all Plots are full, the replacement strategy is up to the client. The Plot::reset
+// call will remove a Plot's knowledge of any allocated rects - freeing its space for reuse.
+
+class GrLayerAtlas {
+public:
+    class Plot {
+        SK_DECLARE_INTERNAL_LLIST_INTERFACE(Plot); // In an MRU llist
+
+    public:
+        // This returns a plot ID unique to each plot in the atlas. They are
+        // consecutive and start at 0.
+        int id() const { return fID; }
+
+        void reset();
+
+    private:
+        friend class GrLayerAtlas;
+
+        Plot();
+        ~Plot(); // does not try to delete the fNext field
+
+        void init(int id, int offX, int offY, int width, int height);
+
+        bool allocateRect(int width, int height, SkIPoint16*);
+
+        int                     fID;
+        GrRectanizer*           fRects;
+        SkIPoint16              fOffset;        // the offset of the plot in the backing texture
+    };
+
+    // This class allows each client to independently track the Plots in
+    // which its data is stored.
+    // For example, multiple pictures may simultaneously store their layers in the 
+    // layer atlas. When a picture goes away it can use the ClientPlotUsage to remove itself
+    // from those plots.
+    class ClientPlotUsage {
+    public:
+        ClientPlotUsage(int maxPlots)
+            SkDEBUGCODE(: fMaxPlots(maxPlots)) {
+            fPlots.setReserve(maxPlots);
+        }
+
+        bool isEmpty() const { return 0 == fPlots.count(); }
+
+        int numPlots() const { return fPlots.count(); }
+        Plot* plot(int index) { return fPlots[index]; }
+
+        void appendPlot(Plot* plot) {
+            SkASSERT(fPlots.count() <= fMaxPlots);
+            SkASSERT(!fPlots.contains(plot));
+            *fPlots.append() = plot;
+        }
+
+        // remove reference to 'plot'
+        void removePlot(const Plot* plot) {
+            int index = fPlots.find(const_cast<Plot*>(plot));
+            if (index >= 0) {
+                fPlots.remove(index);
+            }
+        }
+
+#ifdef SK_DEBUG
+        bool contains(const Plot* plot) const { 
+            return fPlots.contains(const_cast<Plot*>(plot)); 
+        }
+#endif
+
+    private:
+        SkTDArray<Plot*> fPlots;
+        SkDEBUGCODE(int fMaxPlots;)
+    };
+
+    GrLayerAtlas(GrTextureProvider*, GrPixelConfig, GrSurfaceFlags flags, 
+                 const SkISize& backingTextureSize,
+                 int numPlotsX, int numPlotsY);
+    ~GrLayerAtlas();
+
+    // Requests a width x height block in the atlas. Upon success it returns 
+    // the containing Plot and absolute location in the backing texture. 
+    // nullptr is returned if there is no more space in the atlas.
+    Plot* addToAtlas(ClientPlotUsage*, int width, int height, SkIPoint16* loc);
+
+    GrTexture* getTextureOrNull() const {
+        return fTexture;
+    }
+
+    GrTexture* getTexture() const {
+        SkASSERT(fTexture);
+        return fTexture;
+    }
+
+    bool reattachBackingTexture();
+
+    void detachBackingTexture() {
+        fTexture.reset(nullptr);
+    }
+
+    void resetPlots();
+
+    enum IterOrder {
+        kLRUFirst_IterOrder,
+        kMRUFirst_IterOrder
+    };
+
+    typedef SkTInternalLList<Plot> PlotList;
+    typedef PlotList::Iter PlotIter;
+    Plot* iterInit(PlotIter* iter, IterOrder order) {
+        return iter->init(fPlotList, kLRUFirst_IterOrder == order
+                                                       ? PlotList::Iter::kTail_IterStart
+                                                       : PlotList::Iter::kHead_IterStart);
+    }
+
+private:
+    void createBackingTexture();
+
+    void makeMRU(Plot* plot);
+
+    GrTextureProvider* fTexProvider;
+    GrPixelConfig      fPixelConfig;
+    GrSurfaceFlags     fFlags;
+    SkAutoTUnref<GrTexture> fTexture;
+
+    SkISize            fBackingTextureSize;
+
+    // allocated array of Plots
+    Plot*              fPlotArray;
+    // LRU list of Plots (MRU at head - LRU at tail)
+    PlotList           fPlotList;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrLayerCache.cpp b/gfx/skia/skia/src/gpu/GrLayerCache.cpp
index 32f5a5b6c44b..105ee04e53cd 100644
--- a/gfx/skia/skia/src/gpu/GrLayerCache.cpp
+++ b/gfx/skia/skia/src/gpu/GrLayerCache.cpp
@@ -5,19 +5,18 @@
  * found in the LICENSE file.
  */
 
-#include "GrAtlas.h"
+#include "GrLayerAtlas.h"
+#include "GrContext.h"
+#include "GrDrawContext.h"
 #include "GrGpu.h"
 #include "GrLayerCache.h"
-
-DECLARE_SKMESSAGEBUS_MESSAGE(GrPictureDeletedMessage);
+#include "GrSurfacePriv.h"
 
 #ifdef SK_DEBUG
 void GrCachedLayer::validate(const GrTexture* backingTexture) const {
-    SkASSERT(SK_InvalidGenID != fKey.getPictureID());
-    SkASSERT(-1 != fKey.getLayerID());
+    SkASSERT(SK_InvalidGenID != fKey.pictureID());
 
-
-    if (NULL != fTexture) {
+    if (fTexture) {
         // If the layer is in some texture then it must occupy some rectangle
         SkASSERT(!fRect.isEmpty());
         if (!this->isAtlased()) {
@@ -26,33 +25,52 @@ void GrCachedLayer::validate(const GrTexture* backingTexture) const {
         }
     } else {
         SkASSERT(fRect.isEmpty());
-        SkASSERT(NULL == fPlot);
+        SkASSERT(nullptr == fPlot);
+        SkASSERT(!fLocked);     // layers without a texture cannot be locked
+        SkASSERT(!fAtlased);    // can't be atlased if it doesn't have a texture
     }
 
-    if (NULL != fPlot) {
+    if (fPlot) {
+        SkASSERT(fAtlased);
         // If a layer has a plot (i.e., is atlased) then it must point to
         // the backing texture. Additionally, its rect should be non-empty.
-        SkASSERT(NULL != fTexture && backingTexture == fTexture);
+        SkASSERT(fTexture && backingTexture == fTexture);
         SkASSERT(!fRect.isEmpty());
     }
+
+    if (fLocked) {
+        // If a layer is locked it must have a texture (though it need not be
+        // the atlas-backing texture) and occupy some space.
+        SkASSERT(fTexture);
+        SkASSERT(!fRect.isEmpty());
+    }
+
+    // Unfortunately there is a brief time where a layer can be locked
+    // but not used, so we can only check the "used implies locked"
+    // invariant.
+    if (fUses > 0) {
+        SkASSERT(fLocked);
+    } else {
+        SkASSERT(0 == fUses);
+    }
 }
 
 class GrAutoValidateLayer : ::SkNoncopyable {
 public:
-    GrAutoValidateLayer(GrTexture* backingTexture, const GrCachedLayer* layer) 
+    GrAutoValidateLayer(GrTexture* backingTexture, const GrCachedLayer* layer)
         : fBackingTexture(backingTexture)
         , fLayer(layer) {
-        if (NULL != fLayer) {
+        if (fLayer) {
             fLayer->validate(backingTexture);
         }
     }
     ~GrAutoValidateLayer() {
-        if (NULL != fLayer) {
+        if (fLayer) {
             fLayer->validate(fBackingTexture);
         }
     }
     void setBackingTexture(GrTexture* backingTexture) {
-        SkASSERT(NULL == fBackingTexture || fBackingTexture == backingTexture);
+        SkASSERT(nullptr == fBackingTexture || fBackingTexture == backingTexture);
         fBackingTexture = backingTexture;
     }
 
@@ -64,7 +82,7 @@ private:
 
 GrLayerCache::GrLayerCache(GrContext* context)
     : fContext(context) {
-    this->initAtlas();
+    memset(fPlotLocks, 0, sizeof(fPlotLocks));
 }
 
 GrLayerCache::~GrLayerCache() {
@@ -72,25 +90,25 @@ GrLayerCache::~GrLayerCache() {
     SkTDynamicHash<GrCachedLayer, GrCachedLayer::Key>::Iter iter(&fLayerHash);
     for (; !iter.done(); ++iter) {
         GrCachedLayer* layer = &(*iter);
+        SkASSERT(0 == layer->uses());
         this->unlock(layer);
-        SkDELETE(layer);
+        delete layer;
     }
 
-    // The atlas only lets go of its texture when the atlas is deleted. 
-    fAtlas.free();    
+    SkASSERT(0 == fPictureHash.count());
+
+    // The atlas only lets go of its texture when the atlas is deleted.
+    fAtlas.free();
 }
 
 void GrLayerCache::initAtlas() {
-    static const int kAtlasTextureWidth = 1024;
-    static const int kAtlasTextureHeight = 1024;
+    SkASSERT(nullptr == fAtlas.get());
+    GR_STATIC_ASSERT(kNumPlotsX*kNumPlotsX == GrPictureInfo::kNumPlots);
 
-    SkASSERT(NULL == fAtlas.get());
-
-    // The layer cache only gets 1 plot
     SkISize textureSize = SkISize::Make(kAtlasTextureWidth, kAtlasTextureHeight);
-    fAtlas.reset(SkNEW_ARGS(GrAtlas, (fContext->getGpu(), kSkia8888_GrPixelConfig,
-                                      kRenderTarget_GrTextureFlagBit,
-                                      textureSize, kNumPlotsX, kNumPlotsY, false)));
+    fAtlas.reset(new GrLayerAtlas(fContext->textureProvider(), kSkia8888_GrPixelConfig,
+                                  kRenderTarget_GrSurfaceFlag, textureSize,
+                                  kNumPlotsX, kNumPlotsY));
 }
 
 void GrLayerCache::freeAll() {
@@ -99,115 +117,237 @@ void GrLayerCache::freeAll() {
     for (; !iter.done(); ++iter) {
         GrCachedLayer* layer = &(*iter);
         this->unlock(layer);
-        SkDELETE(layer);
+        delete layer;
     }
     fLayerHash.rewind();
 
-    // The atlas only lets go of its texture when the atlas is deleted. 
-    fAtlas.free();
-    // GrLayerCache always assumes an atlas exists so recreate it. The atlas 
-    // lazily allocates a replacement texture so reallocating a new 
-    // atlas here won't disrupt a GrContext::contextDestroyed or freeGpuResources.
-    // TODO: Make GrLayerCache lazily allocate the atlas manager?
-    this->initAtlas();
+    if (fAtlas) {
+        fAtlas->resetPlots();
+        fAtlas->detachBackingTexture();
+    }
 }
 
-GrCachedLayer* GrLayerCache::createLayer(const SkPicture* picture, int layerID) {
-    SkASSERT(picture->uniqueID() != SK_InvalidGenID && layerID >= 0);
+GrCachedLayer* GrLayerCache::createLayer(uint32_t pictureID,
+                                         int start, int stop,
+                                         const SkIRect& srcIR,
+                                         const SkIRect& dstIR,
+                                         const SkMatrix& initialMat,
+                                         const int* key,
+                                         int keySize,
+                                         const SkPaint* paint) {
+    SkASSERT(pictureID != SK_InvalidGenID && start >= 0 && stop > 0);
 
-    GrCachedLayer* layer = SkNEW_ARGS(GrCachedLayer, (picture->uniqueID(), layerID));
+    GrCachedLayer* layer = new GrCachedLayer(pictureID, start, stop, srcIR, dstIR, initialMat, key,
+                                             keySize, paint);
     fLayerHash.add(layer);
     return layer;
 }
 
-GrCachedLayer* GrLayerCache::findLayer(const SkPicture* picture, int layerID) {
-    SkASSERT(picture->uniqueID() != SK_InvalidGenID && layerID >= 0);
-    return fLayerHash.find(GrCachedLayer::Key(picture->uniqueID(), layerID));
+GrCachedLayer* GrLayerCache::findLayer(uint32_t pictureID, const SkMatrix& initialMat,
+                                       const int* key, int keySize) {
+    SkASSERT(pictureID != SK_InvalidGenID);
+    return fLayerHash.find(GrCachedLayer::Key(pictureID, initialMat, key, keySize));
 }
 
-GrCachedLayer* GrLayerCache::findLayerOrCreate(const SkPicture* picture, int layerID) {
-    SkASSERT(picture->uniqueID() != SK_InvalidGenID && layerID >= 0);
-    GrCachedLayer* layer = fLayerHash.find(GrCachedLayer::Key(picture->uniqueID(), layerID));
-    if (NULL == layer) {
-        layer = this->createLayer(picture, layerID);
+GrCachedLayer* GrLayerCache::findLayerOrCreate(uint32_t pictureID,
+                                               int start, int stop,
+                                               const SkIRect& srcIR,
+                                               const SkIRect& dstIR,
+                                               const SkMatrix& initialMat,
+                                               const int* key,
+                                               int keySize,
+                                               const SkPaint* paint) {
+    SkASSERT(pictureID != SK_InvalidGenID && start >= 0 && stop > 0);
+    GrCachedLayer* layer = fLayerHash.find(GrCachedLayer::Key(pictureID, initialMat, key, keySize));
+    if (nullptr == layer) {
+        layer = this->createLayer(pictureID, start, stop,
+                                  srcIR, dstIR, initialMat,
+                                  key, keySize, paint);
     }
 
     return layer;
 }
 
-bool GrLayerCache::lock(GrCachedLayer* layer, const GrTextureDesc& desc) {
-    SkDEBUGCODE(GrAutoValidateLayer avl(fAtlas->getTexture(), layer);)
+bool GrLayerCache::tryToAtlas(GrCachedLayer* layer,
+                              const GrSurfaceDesc& desc,
+                              bool* needsRendering) {
+    SkDEBUGCODE(GrAutoValidateLayer avl(fAtlas ? fAtlas->getTextureOrNull() : nullptr, layer);)
 
-    if (NULL != layer->texture()) {
+    SkASSERT(PlausiblyAtlasable(desc.fWidth, desc.fHeight));
+    SkASSERT(0 == desc.fSampleCnt);
+
+    if (layer->locked()) {
         // This layer is already locked
-#ifdef SK_DEBUG
-        if (layer->isAtlased()) {
-            // It claims to be atlased
-            SkASSERT(layer->rect().width() == desc.fWidth);
-            SkASSERT(layer->rect().height() == desc.fHeight);
-        }
-#endif
+        SkASSERT(fAtlas);
+        SkASSERT(layer->isAtlased());
+        SkASSERT(layer->rect().width() == desc.fWidth);
+        SkASSERT(layer->rect().height() == desc.fHeight);
+        *needsRendering = false;
         return true;
     }
 
-#if USE_ATLAS
-    {
+    if (layer->isAtlased()) {
+        SkASSERT(fAtlas);
+        // Hooray it is still in the atlas - make sure it stays there
+        layer->setLocked(true);
+        this->incPlotLock(layer->plot()->id());
+        *needsRendering = false;
+        return true;
+    } else {
+        if (!fAtlas) {
+            this->initAtlas();
+            if (!fAtlas) {
+                return false;
+            }
+        }
+        // Not in the atlas - will it fit?
         GrPictureInfo* pictInfo = fPictureHash.find(layer->pictureID());
-        if (NULL == pictInfo) {
-            pictInfo = SkNEW_ARGS(GrPictureInfo, (layer->pictureID()));
+        if (nullptr == pictInfo) {
+            pictInfo = new GrPictureInfo(layer->pictureID());
             fPictureHash.add(pictInfo);
         }
 
         SkIPoint16 loc;
-        GrPlot* plot = fAtlas->addToAtlas(&pictInfo->fPlotUsage, 
-                                          desc.fWidth, desc.fHeight, 
-                                          NULL, &loc);
-        // addToAtlas can allocate the backing texture
-        SkDEBUGCODE(avl.setBackingTexture(fAtlas->getTexture()));
-        if (NULL != plot) {
-            GrIRect16 bounds = GrIRect16::MakeXYWH(loc.fX, loc.fY,
-                                                   SkToS16(desc.fWidth), SkToS16(desc.fHeight));
-            layer->setTexture(fAtlas->getTexture(), bounds);
-            layer->setPlot(plot);
-            return false;
+        for (int i = 0; i < 2; ++i) { // extra pass in case we fail to add but are able to purge
+            GrLayerAtlas::Plot* plot = fAtlas->addToAtlas(&pictInfo->fPlotUsage,
+                                                          desc.fWidth, desc.fHeight,
+                                                          &loc);
+            // addToAtlas can allocate the backing texture
+            SkDEBUGCODE(avl.setBackingTexture(fAtlas->getTexture()));
+            if (plot) {
+#if !GR_CACHE_HOISTED_LAYERS
+                pictInfo->incPlotUsage(plot->id());
+#endif
+                // The layer was successfully added to the atlas
+                const SkIRect bounds = SkIRect::MakeXYWH(loc.fX, loc.fY,
+                                                         desc.fWidth, desc.fHeight);
+                layer->setTexture(fAtlas->getTexture(), bounds, true);
+                layer->setPlot(plot);
+                layer->setLocked(true);
+                this->incPlotLock(layer->plot()->id());
+                *needsRendering = true;
+                return true;
+            }
+
+            // The layer was rejected by the atlas (even though we know it is
+            // plausibly atlas-able). See if a plot can be purged and try again.
+            if (!this->purgePlots(true)) {
+                break;  // We weren't able to purge any plots
+            }
+        }
+
+        if (pictInfo->fPlotUsage.isEmpty()) {
+            fPictureHash.remove(pictInfo->fPictureID);
+            delete pictInfo;
         }
     }
-#endif
 
-    // The texture wouldn't fit in the cache - give it it's own texture.
-    // This path always uses a new scratch texture and (thus) doesn't cache anything.
-    // This can yield a lot of re-rendering
-    layer->setTexture(fContext->lockAndRefScratchTexture(desc, GrContext::kApprox_ScratchTexMatch),
-                      GrIRect16::MakeWH(SkToS16(desc.fWidth), SkToS16(desc.fHeight)));
     return false;
 }
 
-void GrLayerCache::unlock(GrCachedLayer* layer) {
-    SkDEBUGCODE(GrAutoValidateLayer avl(fAtlas->getTexture(), layer);)
+bool GrLayerCache::lock(GrCachedLayer* layer, const GrSurfaceDesc& desc, bool* needsRendering) {
+    if (layer->locked()) {
+        // This layer is already locked
+        *needsRendering = false;
+        return true;
+    }
 
-    if (NULL == layer || NULL == layer->texture()) {
+    // TODO: make the test for exact match depend on the image filters themselves
+    SkAutoTUnref<GrTexture> tex;
+    if (layer->fFilter) {
+        tex.reset(fContext->textureProvider()->createTexture(desc, true));
+    } else {
+        tex.reset(fContext->textureProvider()->createApproxTexture(desc));
+    }
+
+    if (!tex) {
+        return false;
+    }
+
+    layer->setTexture(tex, SkIRect::MakeWH(desc.fWidth, desc.fHeight), false);
+    layer->setLocked(true);
+    *needsRendering = true;
+    return true;
+}
+
+void GrLayerCache::unlock(GrCachedLayer* layer) {
+    SkDEBUGCODE(GrAutoValidateLayer avl(fAtlas ? fAtlas->getTextureOrNull() : nullptr, layer);)
+
+    if (nullptr == layer || !layer->locked()) {
+        // invalid or not locked
         return;
     }
 
     if (layer->isAtlased()) {
-        SkASSERT(layer->texture() == fAtlas->getTexture());
+        const int plotID = layer->plot()->id();
 
+        this->decPlotLock(plotID);
+        // At this point we could aggressively clear out un-locked plots but
+        // by delaying we may be able to reuse some of the atlased layers later.
+#if !GR_CACHE_HOISTED_LAYERS
+        // This testing code aggressively removes the atlased layers. This
+        // can be used to separate the performance contribution of less
+        // render target pingponging from that due to the re-use of cached layers
         GrPictureInfo* pictInfo = fPictureHash.find(layer->pictureID());
-        SkASSERT(NULL != pictInfo);
-        pictInfo->fPlotUsage.isEmpty(); // just to silence compiler warnings for the time being
+        SkASSERT(pictInfo);
+
+        pictInfo->decPlotUsage(plotID);
+
+        if (0 == pictInfo->plotUsage(plotID)) {
+            pictInfo->fPlotUsage.removePlot(layer->plot());
+
+            if (pictInfo->fPlotUsage.isEmpty()) {
+                fPictureHash.remove(pictInfo->fPictureID);
+                delete pictInfo;
+            }
+        }
+
+        layer->setPlot(nullptr);
+        layer->setTexture(nullptr, SkIRect::MakeEmpty(), false);
+#endif
 
-        // TODO: purging from atlas goes here
     } else {
-        fContext->unlockScratchTexture(layer->texture());
-        layer->setTexture(NULL, GrIRect16::MakeEmpty());
+        layer->setTexture(nullptr, SkIRect::MakeEmpty(), false);
     }
+
+    layer->setLocked(false);
 }
 
 #ifdef SK_DEBUG
 void GrLayerCache::validate() const {
+    int plotLocks[kNumPlotsX * kNumPlotsY];
+    memset(plotLocks, 0, sizeof(plotLocks));
+
     SkTDynamicHash<GrCachedLayer, GrCachedLayer::Key>::ConstIter iter(&fLayerHash);
     for (; !iter.done(); ++iter) {
-        (*iter).validate(fAtlas->getTexture());
+        const GrCachedLayer* layer = &(*iter);
+
+        layer->validate(fAtlas.get() ? fAtlas->getTextureOrNull() : nullptr);
+
+        const GrPictureInfo* pictInfo = fPictureHash.find(layer->pictureID());
+        if (!pictInfo) {
+            // If there is no picture info for this picture then all of its
+            // layers should be non-atlased.
+            SkASSERT(!layer->isAtlased());
+        }
+
+        if (layer->plot()) {
+            SkASSERT(pictInfo);
+            SkASSERT(pictInfo->fPictureID == layer->pictureID());
+
+            SkASSERT(pictInfo->fPlotUsage.contains(layer->plot()));
+#if !GR_CACHE_HOISTED_LAYERS
+            SkASSERT(pictInfo->plotUsage(layer->plot()->id()) > 0);
+#endif
+
+            if (layer->locked()) {
+                plotLocks[layer->plot()->id()]++;
+            }
+        }
+    }
+
+    for (int i = 0; i < kNumPlotsX*kNumPlotsY; ++i) {
+        SkASSERT(plotLocks[i] == fPlotLocks[i]);
     }
 }
 
@@ -240,39 +380,178 @@ void GrLayerCache::purge(uint32_t pictureID) {
     }
 
     for (int i = 0; i < toBeRemoved.count(); ++i) {
+        SkASSERT(0 == toBeRemoved[i]->uses());
         this->unlock(toBeRemoved[i]);
         fLayerHash.remove(GrCachedLayer::GetKey(*toBeRemoved[i]));
-        SkDELETE(toBeRemoved[i]);
+        delete toBeRemoved[i];
     }
 
     GrPictureInfo* pictInfo = fPictureHash.find(pictureID);
-    if (NULL != pictInfo) {
+    if (pictInfo) {
         fPictureHash.remove(pictureID);
-        SkDELETE(pictInfo);
+        delete pictInfo;
     }
 }
 
-class GrPictureDeletionListener : public SkPicture::DeletionListener {
-    virtual void onDeletion(uint32_t pictureID) SK_OVERRIDE{
-        const GrPictureDeletedMessage message = { pictureID };
-        SkMessageBus<GrPictureDeletedMessage>::Post(message);
-    }
-};
+bool GrLayerCache::purgePlots(bool justOne) {
+    SkDEBUGCODE(GrAutoValidateCache avc(this);)
+    SkASSERT(fAtlas);
 
-void GrLayerCache::trackPicture(const SkPicture* picture) {
-    if (NULL == fDeletionListener) {
-        fDeletionListener.reset(SkNEW(GrPictureDeletionListener));
+    bool anyPurged = false;
+    GrLayerAtlas::PlotIter iter;
+    GrLayerAtlas::Plot* plot;
+    for (plot = fAtlas->iterInit(&iter, GrLayerAtlas::kLRUFirst_IterOrder);
+         plot;
+         plot = iter.prev()) {
+        if (fPlotLocks[plot->id()] > 0) {
+            continue;
+        }
+
+        anyPurged = true;
+        this->purgePlot(plot);
+        if (justOne) {
+            break;
+        }
     }
 
-    picture->addDeletionListener(fDeletionListener);
+    return anyPurged;
+}
+
+void GrLayerCache::purgePlot(GrLayerAtlas::Plot* plot) {
+    SkASSERT(0 == fPlotLocks[plot->id()]);
+
+    // We need to find all the layers in 'plot' and remove them.
+    SkTDArray<GrCachedLayer*> toBeRemoved;
+
+    SkTDynamicHash<GrCachedLayer, GrCachedLayer::Key>::Iter iter(&fLayerHash);
+    for (; !iter.done(); ++iter) {
+        if (plot == (*iter).plot()) {
+            *toBeRemoved.append() = &(*iter);
+        }
+    }
+
+    for (int i = 0; i < toBeRemoved.count(); ++i) {
+        SkASSERT(0 == toBeRemoved[i]->uses());
+        SkASSERT(!toBeRemoved[i]->locked());
+
+        uint32_t pictureIDToRemove = toBeRemoved[i]->pictureID();
+
+        // Aggressively remove layers and, if it becomes totally uncached, delete the picture info
+        fLayerHash.remove(GrCachedLayer::GetKey(*toBeRemoved[i]));
+        delete toBeRemoved[i];
+
+        GrPictureInfo* pictInfo = fPictureHash.find(pictureIDToRemove);
+        if (pictInfo) {
+#if !GR_CACHE_HOISTED_LAYERS
+            SkASSERT(0 == pictInfo->plotUsage(plot->id()));
+#endif
+            pictInfo->fPlotUsage.removePlot(plot);
+
+            if (pictInfo->fPlotUsage.isEmpty()) {
+                fPictureHash.remove(pictInfo->fPictureID);
+                delete pictInfo;
+            }
+        }
+    }
+
+    plot->reset();
+}
+
+#if !GR_CACHE_HOISTED_LAYERS
+void GrLayerCache::purgeAll() {
+    if (!fAtlas) {
+        return;
+    }
+
+    this->purgePlots(false); // clear them all out
+
+    SkASSERT(0 == fPictureHash.count());
+
+    if (fAtlas->getTextureOrNull()) {
+        SkAutoTUnref<GrDrawContext> drawContext(
+                                    fContext->drawContext(fAtlas->getTexture()->asRenderTarget()));
+
+        if (drawContext) {
+            drawContext->discard();
+        }
+    }
+}
+#endif
+
+void GrLayerCache::begin() {
+    if (!fAtlas) {
+        return;
+    }
+
+    if (!fAtlas->reattachBackingTexture()) {
+        // We weren't able to re-attach. Clear out all the atlased layers.
+        this->purgePlots(false);
+        SkASSERT(0 == fPictureHash.count());
+    }
+#ifdef SK_DEBUG
+    else {
+        // we've reattached - everything had better make sense
+        SkTDynamicHash<GrCachedLayer, GrCachedLayer::Key>::Iter iter(&fLayerHash);
+        for (; !iter.done(); ++iter) {
+            GrCachedLayer* layer = &(*iter);
+
+            if (layer->isAtlased()) {
+                SkASSERT(fAtlas->getTexture() == layer->texture());
+            }
+        }
+    }
+#endif
+}
+
+void GrLayerCache::end() {
+    if (!fAtlas) {
+        return;
+    }
+
+    // Adding this call will clear out all the layers in the atlas
+    //this->purgePlots(false);
+
+    fAtlas->detachBackingTexture();
 }
 
 void GrLayerCache::processDeletedPictures() {
-    SkTDArray<GrPictureDeletedMessage> deletedPictures;
+    SkTArray<SkPicture::DeletionMessage> deletedPictures;
     fPictDeletionInbox.poll(&deletedPictures);
 
     for (int i = 0; i < deletedPictures.count(); i++) {
-        this->purge(deletedPictures[i].pictureID);
+        this->purge(deletedPictures[i].fUniqueID);
     }
 }
 
+#ifdef SK_DEVELOPER
+void GrLayerCache::writeLayersToDisk(const SkString& dirName) {
+
+    if (fAtlas) {
+        GrTexture* atlasTexture = fAtlas->getTextureOrNull();
+        if (nullptr != atlasTexture) {
+            SkString fileName(dirName);
+            fileName.append("\\atlas.png");
+
+            atlasTexture->surfacePriv().savePixels(fileName.c_str());
+        }
+    }
+
+    SkTDynamicHash<GrCachedLayer, GrCachedLayer::Key>::Iter iter(&fLayerHash);
+    for (; !iter.done(); ++iter) {
+        GrCachedLayer* layer = &(*iter);
+
+        if (layer->isAtlased() || !layer->texture()) {
+            continue;
+        }
+
+        SkString fileName(dirName);
+        fileName.appendf("\\%d", layer->fKey.pictureID());
+        for (int i = 0; i < layer->fKey.keySize(); ++i) {
+            fileName.appendf("-%d", layer->fKey.key()[i]);
+        }
+        fileName.appendf(".png");
+
+        layer->texture()->surfacePriv().savePixels(fileName.c_str());
+    }
+}
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrLayerCache.h b/gfx/skia/skia/src/gpu/GrLayerCache.h
index 0fdd6c97b60b..a60668189662 100644
--- a/gfx/skia/skia/src/gpu/GrLayerCache.h
+++ b/gfx/skia/skia/src/gpu/GrLayerCache.h
@@ -8,129 +8,300 @@
 #ifndef GrLayerCache_DEFINED
 #define GrLayerCache_DEFINED
 
-#define USE_ATLAS 0
 
-#include "GrAllocPool.h"
-#include "GrAtlas.h"
-#include "GrPictureUtils.h"
+#include "GrLayerAtlas.h"
+#include "GrTexture.h"
 #include "GrRect.h"
+
 #include "SkChecksum.h"
-#include "SkTDynamicHash.h"
+#include "SkImageFilter.h"
 #include "SkMessageBus.h"
+#include "SkPicture.h"
+#include "SkTDynamicHash.h"
 
-class SkPicture;
+// Set to 0 to disable caching of hoisted layers
+#define GR_CACHE_HOISTED_LAYERS 0
 
-// The layer cache listens for these messages to purge picture-related resources.
-struct GrPictureDeletedMessage {
-    uint32_t pictureID;
-};
-
-// GrPictureInfo stores the atlas plots used by a single picture. A single 
+// GrPictureInfo stores the atlas plots used by a single picture. A single
 // plot may be used to store layers from multiple pictures.
 struct GrPictureInfo {
 public:
+    static const int kNumPlots = 4;
+
     // for SkTDynamicHash - just use the pictureID as the hash key
     static const uint32_t& GetKey(const GrPictureInfo& pictInfo) { return pictInfo.fPictureID; }
     static uint32_t Hash(const uint32_t& key) { return SkChecksum::Mix(key); }
 
     // GrPictureInfo proper
-    GrPictureInfo(uint32_t pictureID) : fPictureID(pictureID) { }
+    GrPictureInfo(uint32_t pictureID) 
+        : fPictureID(pictureID)
+        , fPlotUsage(kNumPlots) {
+#if !GR_CACHE_HOISTED_LAYERS
+        memset(fPlotUses, 0, sizeof(fPlotUses));
+#endif
+    }
+
+#if !GR_CACHE_HOISTED_LAYERS
+    void incPlotUsage(int plotID) {
+        SkASSERT(plotID < kNumPlots);
+        fPlotUses[plotID]++;
+    }
+
+    void decPlotUsage(int plotID) {
+        SkASSERT(plotID < kNumPlots);
+        SkASSERT(fPlotUses[plotID] > 0);
+        fPlotUses[plotID]--;
+    }
+
+    int plotUsage(int plotID) const {
+        SkASSERT(plotID < kNumPlots);
+        return fPlotUses[plotID];
+    }
+#endif
 
     const uint32_t fPictureID;
+    GrLayerAtlas::ClientPlotUsage  fPlotUsage;
 
-    GrAtlas::ClientPlotUsage  fPlotUsage;
+#if !GR_CACHE_HOISTED_LAYERS
+private:
+    int fPlotUses[kNumPlots];
+#endif
 };
 
 // GrCachedLayer encapsulates the caching information for a single saveLayer.
 //
 // Atlased layers get a ref to the backing GrTexture while non-atlased layers
-// get a ref to the GrTexture in which they reside. In both cases 'fRect' 
+// get a ref to the GrTexture in which they reside. In both cases 'fRect'
 // contains the layer's extent in its texture.
 // Atlased layers also get a pointer to the plot in which they reside.
+// For non-atlased layers, the lock field just corresponds to locking in
+// the resource cache. For atlased layers, it implements an additional level
+// of locking to allow atlased layers to be reused multiple times.
 struct GrCachedLayer {
 public:
     // For SkTDynamicHash
     struct Key {
-        Key(uint32_t pictureID, int layerID) : fPictureID(pictureID) , fLayerID(layerID) {}
+        Key(uint32_t pictureID, const SkMatrix& initialMat,
+            const int* key, int keySize, bool copyKey = false)
+        : fKeySize(keySize)
+        , fFreeKey(copyKey) {
+            fIDMatrix.fPictureID = pictureID;
+            fIDMatrix.fInitialMat = initialMat;
+            fIDMatrix.fInitialMat.getType(); // force initialization of type so hashes match
 
-        bool operator==(const Key& other) const {
-            return fPictureID == other.fPictureID && fLayerID == other.fLayerID;
+            if (copyKey) {
+                int* tempKey = new int[keySize];
+                memcpy(tempKey, key, keySize*sizeof(int));
+                fKey = tempKey;
+            } else {
+                fKey = key;
+            }
+
+            // The pictureID/matrix portion needs to be tightly packed.
+            GR_STATIC_ASSERT(sizeof(IDMatrix) == sizeof(uint32_t)+                     // pictureID
+                                             9 * sizeof(SkScalar) + sizeof(uint32_t)); // matrix
         }
 
-        uint32_t getPictureID() const { return fPictureID; }
-        int      getLayerID() const { return fLayerID; }
+        ~Key() {
+            if (fFreeKey) {
+                delete[] fKey;
+            }
+        }
+
+        bool operator==(const Key& other) const {
+            if (fKeySize != other.fKeySize) {
+                return false;
+            }
+            return fIDMatrix.fPictureID == other.fIDMatrix.fPictureID &&
+                   fIDMatrix.fInitialMat.cheapEqualTo(other.fIDMatrix.fInitialMat) &&
+                   !memcmp(fKey, other.fKey, fKeySize * sizeof(int));
+        }
+
+        uint32_t pictureID() const { return fIDMatrix.fPictureID; }
+
+        // TODO: remove these when GrCachedLayer & ReplacementInfo fuse
+        const int* key() const { SkASSERT(fFreeKey);  return fKey; }
+        int keySize() const { SkASSERT(fFreeKey); return fKeySize; }
+
+        uint32_t hash() const {
+            uint32_t hash = SkChecksum::Murmur3(reinterpret_cast<const uint32_t*>(fKey),
+                                                fKeySize * sizeof(int));
+            return SkChecksum::Murmur3(reinterpret_cast<const uint32_t*>(&fIDMatrix),
+                                       sizeof(IDMatrix), hash);
+        }
 
     private:
-        // ID of the picture of which this layer is a part
-        const uint32_t fPictureID;
-        // fLayerID is the index of this layer in the picture (one of 0 .. #layers).
-        const int      fLayerID;
+        struct IDMatrix {
+            // ID of the picture of which this layer is a part
+            uint32_t fPictureID;
+            // The initial matrix passed into drawPicture
+            SkMatrix fInitialMat;
+        }              fIDMatrix;
+
+        const int* fKey;
+        const int  fKeySize;
+        bool       fFreeKey;
     };
 
     static const Key& GetKey(const GrCachedLayer& layer) { return layer.fKey; }
-    static uint32_t Hash(const Key& key) { 
-        return SkChecksum::Mix((key.getPictureID() << 16) | key.getLayerID());
-    }
+    static uint32_t Hash(const Key& key) { return key.hash(); }
 
     // GrCachedLayer proper
-    GrCachedLayer(uint32_t pictureID, int layerID) 
-        : fKey(pictureID, layerID)
-        , fTexture(NULL)
-        , fRect(GrIRect16::MakeEmpty())
-        , fPlot(NULL) {
-        SkASSERT(SK_InvalidGenID != pictureID && layerID >= 0);
+    GrCachedLayer(uint32_t pictureID,
+                  int start,
+                  int stop,
+                  const SkIRect& srcIR,
+                  const SkIRect& dstIR,
+                  const SkMatrix& ctm,
+                  const int* key,
+                  int keySize,
+                  const SkPaint* paint)
+        : fKey(pictureID, ctm, key, keySize, true)
+        , fStart(start)
+        , fStop(stop)
+        , fSrcIR(srcIR)
+        , fDstIR(dstIR)
+        , fOffset(SkIPoint::Make(0, 0))
+        , fPaint(paint ? new SkPaint(*paint) : nullptr)
+        , fFilter(nullptr)
+        , fTexture(nullptr)
+        , fAtlased(false)
+        , fRect(SkIRect::MakeEmpty())
+        , fPlot(nullptr)
+        , fUses(0)
+        , fLocked(false) {
+        SkASSERT(SK_InvalidGenID != pictureID);
+
+        if (fPaint) {
+            if (fPaint->getImageFilter()) {
+                fFilter = SkSafeRef(fPaint->getImageFilter());
+                fPaint->setImageFilter(nullptr);
+            }
+        }
     }
 
-    uint32_t pictureID() const { return fKey.getPictureID(); }
-    int layerID() const { return fKey.getLayerID(); }
-
-    // This call takes over the caller's ref
-    void setTexture(GrTexture* texture, const GrIRect16& rect) {
-        if (NULL != fTexture) {
-            fTexture->unref();
+    ~GrCachedLayer() {
+        if (!fAtlased) {
+            SkSafeUnref(fTexture);
         }
+        SkSafeUnref(fFilter);
+        delete fPaint;
+    }
 
-        fTexture = texture; // just take over caller's ref
+    uint32_t pictureID() const { return fKey.pictureID(); }
+    // TODO: remove these when GrCachedLayer & ReplacementInfo fuse
+    const int* key() const { return fKey.key(); }
+    int keySize() const { return fKey.keySize(); }
+
+    int start() const { return fStart; }
+    // TODO: make bound debug only
+    const SkIRect& srcIR() const { return fSrcIR; }
+    const SkIRect& dstIR() const { return fDstIR; }
+    int stop() const { return fStop; }
+    void setTexture(GrTexture* texture, const SkIRect& rect, bool atlased) {
+        if (texture && !atlased) {
+            texture->ref();  // non-atlased textures carry a ref
+        }
+        if (fTexture && !fAtlased) {
+            fTexture->unref();  // non-atlased textures carry a ref
+        }
+        fTexture = texture;
+        fAtlased = atlased;
         fRect = rect;
+        if (!fTexture) {
+            fLocked = false;
+        }
     }
     GrTexture* texture() { return fTexture; }
-    const GrIRect16& rect() const { return fRect; }
+    const SkPaint* paint() const { return fPaint; }
+    const SkImageFilter* filter() const { return fFilter; }
+    const SkIRect& rect() const { return fRect; }
 
-    void setPlot(GrPlot* plot) {
-        SkASSERT(NULL == fPlot);
+    void setOffset(const SkIPoint& offset) { fOffset = offset; }
+    const SkIPoint& offset() const { return fOffset; }
+
+    void setPlot(GrLayerAtlas::Plot* plot) {
+        SkASSERT(nullptr == plot || nullptr == fPlot);
         fPlot = plot;
     }
-    GrPlot* plot() { return fPlot; }
+    GrLayerAtlas::Plot* plot() { return fPlot; }
 
-    bool isAtlased() const { return NULL != fPlot; }
+    bool isAtlased() const { SkASSERT(fAtlased == SkToBool(fPlot)); return fAtlased; }
 
+    void setLocked(bool locked) { fLocked = locked; }
+    bool locked() const { return fLocked; }
+
+    SkDEBUGCODE(const GrLayerAtlas::Plot* plot() const { return fPlot; })
     SkDEBUGCODE(void validate(const GrTexture* backingTexture) const;)
 
 private:
     const Key       fKey;
 
+    // The "saveLayer" operation index of the cached layer
+    const int  fStart;
+    // The final "restore" operation index of the cached layer
+    const int  fStop;
+
+    // The layer's src rect (i.e., the portion of the source scene required
+    // for filtering).
+    const SkIRect   fSrcIR;
+    // The layer's dest rect (i.e., where it will land in device space)
+    const SkIRect   fDstIR;
+    // Offset sometimes required by image filters
+    SkIPoint        fOffset;
+
+    // The paint used when dropping the layer down into the owning canvas.
+    // Can be nullptr. This class makes a copy for itself.
+    SkPaint*  fPaint;
+
+    // The imagefilter that needs to be applied to the layer prior to it being
+    // composited with the rest of the scene.
+    const SkImageFilter* fFilter;
+
     // fTexture is a ref on the atlasing texture for atlased layers and a
-    // ref on a GrTexture for non-atlased textures. In both cases, if this is
-    // non-NULL, that means that the texture is locked in the texture cache.
+    // ref on a GrTexture for non-atlased textures.
     GrTexture*      fTexture;
 
+    // true if this layer is in the atlas (and 'fTexture' doesn't carry a ref)
+    // and false if the layer is a free floater (and carries a ref).
+    bool            fAtlased;
+
     // For both atlased and non-atlased layers 'fRect' contains the  bound of
     // the layer in whichever texture it resides. It is empty when 'fTexture'
-    // is NULL.
-    GrIRect16       fRect;
+    // is nullptr.
+    SkIRect         fRect;
 
     // For atlased layers, fPlot stores the atlas plot in which the layer rests.
-    // It is always NULL for non-atlased layers.
-    GrPlot*         fPlot;
+    // It is always nullptr for non-atlased layers.
+    GrLayerAtlas::Plot* fPlot;
+
+    // The number of actively hoisted layers using this cached image (e.g.,
+    // extant GrHoistedLayers pointing at this object). This object will
+    // be unlocked when the use count reaches 0.
+    int             fUses;
+
+    // For non-atlased layers 'fLocked' should always match "fTexture".
+    // (i.e., if there is a texture it is locked).
+    // For atlased layers, 'fLocked' is true if the layer is in a plot and
+    // actively required for rendering. If the layer is in a plot but not
+    // actively required for rendering, then 'fLocked' is false. If the
+    // layer isn't in a plot then is can never be locked.
+    bool            fLocked;
+
+    void addUse()     { ++fUses; }
+    void removeUse()  { SkASSERT(fUses > 0); --fUses; }
+    int uses() const { return fUses; }
+
+    friend class GrLayerCache;  // for access to usage methods
+    friend class TestingAccess; // for testing
 };
 
 // The GrLayerCache caches pre-computed saveLayers for later rendering.
 // Non-atlased layers are stored in their own GrTexture while the atlased
 // layers share a single GrTexture.
-// Unlike the GrFontCache, the GrTexture atlas only has one GrAtlas (for 8888)
-// and one GrPlot (for the entire atlas). As such, the GrLayerCache
-// roughly combines the functionality of the GrFontCache and GrTextStrike
-// classes.
+// Unlike the GrFontCache, the GrLayerCache only has one atlas (for 8888).
+// As such, the GrLayerCache roughly combines the functionality of the
+// GrFontCache and GrTextStrike classes.
 class GrLayerCache {
 public:
     GrLayerCache(GrContext*);
@@ -140,52 +311,118 @@ public:
     // elements by the GrContext
     void freeAll();
 
-    GrCachedLayer* findLayer(const SkPicture* picture, int layerID);
-    GrCachedLayer* findLayerOrCreate(const SkPicture* picture, int layerID);
-    
-    // Inform the cache that layer's cached image is now required. Return true
-    // if it was found in the ResourceCache and doesn't need to be regenerated.
-    // If false is returned the caller should (re)render the layer into the
-    // newly acquired texture.
-    bool lock(GrCachedLayer* layer, const GrTextureDesc& desc);
+    GrCachedLayer* findLayer(uint32_t pictureID, const SkMatrix& ctm,
+                             const int* key, int keySize);
+    GrCachedLayer* findLayerOrCreate(uint32_t pictureID,
+                                     int start, int stop,
+                                     const SkIRect& srcIR,
+                                     const SkIRect& dstIR,
+                                     const SkMatrix& initialMat,
+                                     const int* key, int keySize,
+                                     const SkPaint* paint);
 
-    // Inform the cache that layer's cached image is not currently required
-    void unlock(GrCachedLayer* layer);
+    // Attempt to place 'layer' in the atlas. Return true on success; false on failure.
+    // When true is returned, 'needsRendering' will indicate if the layer must be (re)drawn.
+    // Additionally, the GPU resources will be locked.
+    bool tryToAtlas(GrCachedLayer* layer, const GrSurfaceDesc& desc, bool* needsRendering);
 
-    // Setup to be notified when 'picture' is deleted
-    void trackPicture(const SkPicture* picture);
+    // Attempt to lock the GPU resources required for a layer. Return true on success;
+    // false on failure. When true is returned 'needsRendering' will indicate if the
+    // layer must be (re)drawn.
+    // Note that atlased layers should already have been locked and rendered so only
+    // free floating layers will have 'needsRendering' set.
+    // Currently, this path always uses a new scratch texture for non-Atlased layers
+    // and (thus) doesn't cache anything. This can yield a lot of re-rendering.
+    // TODO: allow rediscovery of free-floating layers that are still in the resource cache.
+    bool lock(GrCachedLayer* layer, const GrSurfaceDesc& desc, bool* needsRendering);
+
+    // addUse is just here to keep the API symmetric
+    void addUse(GrCachedLayer* layer) { layer->addUse(); }
+    void removeUse(GrCachedLayer* layer) {
+        layer->removeUse();
+        if (layer->uses() == 0) {
+            // If no one cares about the layer allow it to be recycled.
+            this->unlock(layer);
+        }
+    }
 
     // Cleanup after any SkPicture deletions
     void processDeletedPictures();
 
     SkDEBUGCODE(void validate() const;)
 
+#ifdef SK_DEVELOPER
+    void writeLayersToDisk(const SkString& dirName);
+#endif
+
+    static bool PlausiblyAtlasable(int width, int height) {
+        return width <= kPlotWidth && height <= kPlotHeight;
+    }
+
+    void begin();
+    void end();
+
+#if !GR_CACHE_HOISTED_LAYERS
+    void purgeAll();
+#endif
+
 private:
+    static const int kAtlasTextureWidth = 1024;
+    static const int kAtlasTextureHeight = 1024;
+
     static const int kNumPlotsX = 2;
     static const int kNumPlotsY = 2;
 
-    GrContext*                fContext;  // pointer back to owning context
-    SkAutoTDelete<GrAtlas>    fAtlas;    // TODO: could lazily allocate
+    static const int kPlotWidth = kAtlasTextureWidth / kNumPlotsX;
+    static const int kPlotHeight = kAtlasTextureHeight / kNumPlotsY;
+
+    GrContext*                  fContext;  // pointer back to owning context
+    SkAutoTDelete<GrLayerAtlas> fAtlas;    // lazily allocated
 
     // We cache this information here (rather then, say, on the owning picture)
     // because we want to be able to clean it up as needed (e.g., if a picture
-    // is leaked and never cleans itself up we still want to be able to 
+    // is leaked and never cleans itself up we still want to be able to
     // remove the GrPictureInfo once its layers are purged from all the atlas
     // plots).
     SkTDynamicHash<GrPictureInfo, uint32_t> fPictureHash;
 
     SkTDynamicHash<GrCachedLayer, GrCachedLayer::Key> fLayerHash;
 
-    SkMessageBus<GrPictureDeletedMessage>::Inbox fPictDeletionInbox;
+    SkMessageBus<SkPicture::DeletionMessage>::Inbox fPictDeletionInbox;
 
-    SkAutoTUnref<SkPicture::DeletionListener> fDeletionListener;
+    // This implements a plot-centric locking mechanism (since the atlas
+    // backing texture is always locked). Each layer that is locked (i.e.,
+    // needed for the current rendering) in a plot increments the plot lock
+    // count for that plot. Similarly, once a rendering is complete all the
+    // layers used in it decrement the lock count for the used plots.
+    // Plots with a 0 lock count are open for recycling/purging.
+    int fPlotLocks[kNumPlotsX * kNumPlotsY];
+
+    // Inform the cache that layer's cached image is not currently required
+    void unlock(GrCachedLayer* layer);
 
     void initAtlas();
-    GrCachedLayer* createLayer(const SkPicture* picture, int layerID);
+    GrCachedLayer* createLayer(uint32_t pictureID, int start, int stop,
+                               const SkIRect& srcIR, const SkIRect& dstIR,
+                               const SkMatrix& initialMat,
+                               const int* key, int keySize,
+                               const SkPaint* paint);
 
     // Remove all the layers (and unlock any resources) associated with 'pictureID'
     void purge(uint32_t pictureID);
 
+    void purgePlot(GrLayerAtlas::Plot* plot);
+
+    // Either purge all un-locked plots or just one. Return true if >= 1 plot
+    // was purged; false otherwise.
+    bool purgePlots(bool justOne);
+
+    void incPlotLock(int plotIdx) { ++fPlotLocks[plotIdx]; }
+    void decPlotLock(int plotIdx) {
+        SkASSERT(fPlotLocks[plotIdx] > 0);
+        --fPlotLocks[plotIdx];
+    }
+
     // for testing
     friend class TestingAccess;
     int numLayers() const { return fLayerHash.count(); }
diff --git a/gfx/skia/skia/src/gpu/GrLayerHoister.cpp b/gfx/skia/skia/src/gpu/GrLayerHoister.cpp
new file mode 100644
index 000000000000..004e4d0e6eb3
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrLayerHoister.cpp
@@ -0,0 +1,401 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrLayerCache.h"
+#include "GrLayerHoister.h"
+#include "GrRecordReplaceDraw.h"
+
+#include "SkBigPicture.h"
+#include "SkCanvas.h"
+#include "SkGpuDevice.h"
+#include "SkGrPixelRef.h"
+#include "SkLayerInfo.h"
+#include "SkRecordDraw.h"
+#include "SkSurface.h"
+#include "SkSurface_Gpu.h"
+
+// Create the layer information for the hoisted layer and secure the
+// required texture/render target resources.
+static void prepare_for_hoisting(GrLayerCache* layerCache,
+                                 const SkPicture* topLevelPicture,
+                                 const SkMatrix& initialMat,
+                                 const SkLayerInfo::BlockInfo& info,
+                                 const SkIRect& srcIR,
+                                 const SkIRect& dstIR,
+                                 SkTDArray<GrHoistedLayer>* needRendering,
+                                 SkTDArray<GrHoistedLayer>* recycled,
+                                 bool attemptToAtlas,
+                                 int numSamples) {
+    const SkPicture* pict = info.fPicture ? info.fPicture : topLevelPicture;
+
+    GrCachedLayer* layer = layerCache->findLayerOrCreate(topLevelPicture->uniqueID(),
+                                                         SkToInt(info.fSaveLayerOpID),
+                                                         SkToInt(info.fRestoreOpID),
+                                                         srcIR,
+                                                         dstIR,
+                                                         initialMat,
+                                                         info.fKey,
+                                                         info.fKeySize,
+                                                         info.fPaint);
+    GrSurfaceDesc desc;
+    desc.fFlags = kRenderTarget_GrSurfaceFlag;
+    desc.fWidth = srcIR.width();
+    desc.fHeight = srcIR.height();
+    desc.fConfig = kSkia8888_GrPixelConfig;
+    desc.fSampleCnt = numSamples;
+
+    bool locked, needsRendering;
+    if (attemptToAtlas) {
+        locked = layerCache->tryToAtlas(layer, desc, &needsRendering);
+    } else {
+        locked = layerCache->lock(layer, desc, &needsRendering);
+    }
+    if (!locked) {
+        // GPU resources could not be secured for the hoisting of this layer
+        return;
+    }
+
+    if (attemptToAtlas) {
+        SkASSERT(layer->isAtlased());
+    }
+
+    GrHoistedLayer* hl;
+
+    if (needsRendering) {
+        if (!attemptToAtlas) {
+            SkASSERT(!layer->isAtlased());
+        }
+        hl = needRendering->append();
+    } else {
+        hl = recycled->append();
+    }
+
+    layerCache->addUse(layer);
+    hl->fLayer = layer;
+    hl->fPicture = pict;
+    hl->fLocalMat = info.fLocalMat;
+    hl->fInitialMat = initialMat;
+    hl->fPreMat = initialMat;
+    hl->fPreMat.preConcat(info.fPreMat);
+}
+
+// Compute the source rect and return false if it is empty.
+static bool compute_source_rect(const SkLayerInfo::BlockInfo& info, const SkMatrix& initialMat,
+                                const SkIRect& dstIR, SkIRect* srcIR) {
+    SkIRect clipBounds = dstIR;
+
+    SkMatrix totMat = initialMat;
+    totMat.preConcat(info.fPreMat);
+    totMat.preConcat(info.fLocalMat);
+
+    if (info.fPaint && info.fPaint->getImageFilter()) {
+        info.fPaint->getImageFilter()->filterBounds(clipBounds, totMat, &clipBounds);
+    }
+
+    if (!info.fSrcBounds.isEmpty()) {
+        SkRect r;
+
+        totMat.mapRect(&r, info.fSrcBounds);
+        r.roundOut(srcIR);
+
+        if (!srcIR->intersect(clipBounds)) {
+            return false;
+        }
+    } else {
+        *srcIR = clipBounds;
+    }
+
+    return true;
+}
+
+// Atlased layers must be small enough to fit in the atlas, not have a
+// paint with an image filter and be neither nested nor nesting.
+// TODO: allow leaf nested layers to appear in the atlas.
+void GrLayerHoister::FindLayersToAtlas(GrContext* context,
+                                       const SkPicture* topLevelPicture,
+                                       const SkMatrix& initialMat,
+                                       const SkRect& query,
+                                       SkTDArray<GrHoistedLayer>* atlased,
+                                       SkTDArray<GrHoistedLayer>* recycled,
+                                       int numSamples) {
+    if (0 != numSamples) {
+        // MSAA layers are currently never atlased
+        return;
+    }
+
+    GrLayerCache* layerCache = context->getLayerCache();
+    layerCache->processDeletedPictures();
+
+    const SkBigPicture::AccelData* topLevelData = nullptr;
+    if (const SkBigPicture* bp = topLevelPicture->asSkBigPicture()) {
+        topLevelData = bp->accelData();
+    }
+    if (!topLevelData) {
+        return;
+    }
+
+    const SkLayerInfo *topLevelGPUData = static_cast<const SkLayerInfo*>(topLevelData);
+    if (0 == topLevelGPUData->numBlocks()) {
+        return;
+    }
+
+    atlased->setReserve(atlased->count() + topLevelGPUData->numBlocks());
+
+    for (int i = 0; i < topLevelGPUData->numBlocks(); ++i) {
+        const SkLayerInfo::BlockInfo& info = topLevelGPUData->block(i);
+
+        // TODO: ignore perspective projected layers here?
+        bool disallowAtlasing = info.fHasNestedLayers || info.fIsNested ||
+                                (info.fPaint && info.fPaint->getImageFilter());
+
+        if (disallowAtlasing) {
+            continue;
+        }
+
+        SkRect layerRect;
+        initialMat.mapRect(&layerRect, info.fBounds);
+        if (!layerRect.intersect(query)) {
+            continue;
+        }
+
+        const SkIRect dstIR = layerRect.roundOut();
+
+        SkIRect srcIR;
+
+        if (!compute_source_rect(info, initialMat, dstIR, &srcIR) ||
+            !GrLayerCache::PlausiblyAtlasable(srcIR.width(), srcIR.height())) {
+            continue;
+        }
+
+        prepare_for_hoisting(layerCache, topLevelPicture, initialMat,
+                             info, srcIR, dstIR, atlased, recycled, true, 0);
+    }
+
+}
+
+void GrLayerHoister::FindLayersToHoist(GrContext* context,
+                                       const SkPicture* topLevelPicture,
+                                       const SkMatrix& initialMat,
+                                       const SkRect& query,
+                                       SkTDArray<GrHoistedLayer>* needRendering,
+                                       SkTDArray<GrHoistedLayer>* recycled,
+                                       int numSamples) {
+    GrLayerCache* layerCache = context->getLayerCache();
+
+    layerCache->processDeletedPictures();
+
+    const SkBigPicture::AccelData* topLevelData = nullptr;
+    if (const SkBigPicture* bp = topLevelPicture->asSkBigPicture()) {
+        topLevelData = bp->accelData();
+    }
+    if (!topLevelData) {
+        return;
+    }
+
+    const SkLayerInfo *topLevelGPUData = static_cast<const SkLayerInfo*>(topLevelData);
+    if (0 == topLevelGPUData->numBlocks()) {
+        return;
+    }
+
+    // Find and prepare for hoisting all the layers that intersect the query rect
+    for (int i = 0; i < topLevelGPUData->numBlocks(); ++i) {
+        const SkLayerInfo::BlockInfo& info = topLevelGPUData->block(i);
+        if (info.fIsNested) {
+            // Parent layers are currently hoisted while nested layers are not.
+            continue;
+        }
+
+        SkRect layerRect;
+        initialMat.mapRect(&layerRect, info.fBounds);
+        if (!layerRect.intersect(query)) {
+            continue;
+        }
+
+        const SkIRect dstIR = layerRect.roundOut();
+
+        SkIRect srcIR;
+        if (!compute_source_rect(info, initialMat, dstIR, &srcIR)) {
+            continue;
+        }
+
+        prepare_for_hoisting(layerCache, topLevelPicture, initialMat, info, srcIR, dstIR,
+                             needRendering, recycled, false, numSamples);
+    }
+}
+
+void GrLayerHoister::DrawLayersToAtlas(GrContext* context,
+                                       const SkTDArray<GrHoistedLayer>& atlased) {
+    if (atlased.count() > 0) {
+        // All the atlased layers are rendered into the same GrTexture
+        SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
+        SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTargetDirect(
+                                        atlased[0].fLayer->texture()->asRenderTarget(), &props));
+
+        SkCanvas* atlasCanvas = surface->getCanvas();
+
+        for (int i = 0; i < atlased.count(); ++i) {
+            const GrCachedLayer* layer = atlased[i].fLayer;
+            const SkBigPicture* pict = atlased[i].fPicture->asSkBigPicture();
+            if (!pict) {
+                // TODO: can we assume / assert this?
+                continue;
+            }
+            const SkIPoint offset = SkIPoint::Make(layer->srcIR().fLeft, layer->srcIR().fTop);
+            SkDEBUGCODE(const SkPaint* layerPaint = layer->paint();)
+
+            SkASSERT(!layerPaint || !layerPaint->getImageFilter());
+            SkASSERT(!layer->filter());
+
+            atlasCanvas->save();
+
+            // Add a rect clip to make sure the rendering doesn't
+            // extend beyond the boundaries of the atlased sub-rect
+            const SkRect bound = SkRect::Make(layer->rect());
+            atlasCanvas->clipRect(bound);
+            atlasCanvas->clear(0);
+
+            // '-offset' maps the layer's top/left to the origin.
+            // Since this layer is atlased, the top/left corner needs
+            // to be offset to the correct location in the backing texture.
+            SkMatrix initialCTM;
+            initialCTM.setTranslate(SkIntToScalar(-offset.fX), SkIntToScalar(-offset.fY));
+            initialCTM.preTranslate(bound.fLeft, bound.fTop);
+            initialCTM.preConcat(atlased[i].fPreMat);
+
+            atlasCanvas->setMatrix(initialCTM);
+            atlasCanvas->concat(atlased[i].fLocalMat);
+
+            pict->partialPlayback(atlasCanvas, layer->start() + 1, layer->stop(), initialCTM);
+            atlasCanvas->restore();
+        }
+
+        atlasCanvas->flush();
+    }
+}
+
+SkBitmap wrap_texture(GrTexture* texture) {
+    SkASSERT(texture);
+
+    SkBitmap result;
+    result.setInfo(texture->surfacePriv().info(kPremul_SkAlphaType));
+    result.setPixelRef(new SkGrPixelRef(result.info(), texture))->unref();
+    return result;
+}
+
+void GrLayerHoister::FilterLayer(GrContext* context,
+                                 SkGpuDevice* device,
+                                 const GrHoistedLayer& info) {
+    GrCachedLayer* layer = info.fLayer;
+
+    SkASSERT(layer->filter());
+
+    static const int kDefaultCacheSize = 32 * 1024 * 1024;
+
+    SkBitmap filteredBitmap;
+    SkIPoint offset = SkIPoint::Make(0, 0);
+
+    const SkIPoint filterOffset = SkIPoint::Make(layer->srcIR().fLeft, layer->srcIR().fTop);
+
+    SkMatrix totMat = SkMatrix::I();
+    totMat.preConcat(info.fPreMat);
+    totMat.preConcat(info.fLocalMat);
+    totMat.postTranslate(-SkIntToScalar(filterOffset.fX), -SkIntToScalar(filterOffset.fY));
+
+    SkASSERT(0 == layer->rect().fLeft && 0 == layer->rect().fTop);
+    SkIRect clipBounds = layer->rect();
+
+    // This cache is transient, and is freed (along with all its contained
+    // textures) when it goes out of scope.
+    SkAutoTUnref<SkImageFilter::Cache> cache(SkImageFilter::Cache::Create(kDefaultCacheSize));
+    SkImageFilter::Context filterContext(totMat, clipBounds, cache, SkImageFilter::kApprox_SizeConstraint);
+
+    SkImageFilter::DeviceProxy proxy(device);
+    const SkBitmap src = wrap_texture(layer->texture());
+
+    if (!layer->filter()->filterImage(&proxy, src, filterContext, &filteredBitmap, &offset)) {
+        // Filtering failed. Press on with the unfiltered version.
+        return;
+    }
+
+    SkIRect newRect = SkIRect::MakeWH(filteredBitmap.width(), filteredBitmap.height());
+    layer->setTexture(filteredBitmap.getTexture(), newRect, false);
+    layer->setOffset(offset);
+}
+
+void GrLayerHoister::DrawLayers(GrContext* context, const SkTDArray<GrHoistedLayer>& layers) {
+    for (int i = 0; i < layers.count(); ++i) {
+        GrCachedLayer* layer = layers[i].fLayer;
+        const SkBigPicture* pict = layers[i].fPicture->asSkBigPicture();
+        if (!pict) {
+            // TODO: can we assume / assert this?
+            continue;
+        }
+        const SkIPoint offset = SkIPoint::Make(layer->srcIR().fLeft, layer->srcIR().fTop);
+
+        // Each non-atlased layer has its own GrTexture
+        SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
+        SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTargetDirect(
+                                        layer->texture()->asRenderTarget(), &props));
+
+        SkCanvas* layerCanvas = surface->getCanvas();
+
+        SkASSERT(0 == layer->rect().fLeft && 0 == layer->rect().fTop);
+
+        // Add a rect clip to make sure the rendering doesn't
+        // extend beyond the boundaries of the layer
+        const SkRect bound = SkRect::Make(layer->rect());
+        layerCanvas->clipRect(bound);
+        layerCanvas->clear(SK_ColorTRANSPARENT);
+
+        SkMatrix initialCTM;
+        initialCTM.setTranslate(SkIntToScalar(-offset.fX), SkIntToScalar(-offset.fY));
+        initialCTM.preConcat(layers[i].fPreMat);
+
+        layerCanvas->setMatrix(initialCTM);
+        layerCanvas->concat(layers[i].fLocalMat);
+
+        pict->partialPlayback(layerCanvas, layer->start()+1, layer->stop(), initialCTM);
+        layerCanvas->flush();
+
+        if (layer->filter()) {
+            SkSurface_Gpu* gpuSurf = static_cast<SkSurface_Gpu*>(surface.get());
+
+            FilterLayer(context, gpuSurf->getDevice(), layers[i]);
+        }
+    }
+}
+
+void GrLayerHoister::UnlockLayers(GrContext* context,
+                                  const SkTDArray<GrHoistedLayer>& layers) {
+    GrLayerCache* layerCache = context->getLayerCache();
+
+    for (int i = 0; i < layers.count(); ++i) {
+        layerCache->removeUse(layers[i].fLayer);
+    }
+
+    SkDEBUGCODE(layerCache->validate();)
+}
+
+void GrLayerHoister::Begin(GrContext* context) {
+    GrLayerCache* layerCache = context->getLayerCache();
+
+    layerCache->begin();
+}
+
+void GrLayerHoister::End(GrContext* context) {
+    GrLayerCache* layerCache = context->getLayerCache();
+
+#if !GR_CACHE_HOISTED_LAYERS
+
+    // This code completely clears out the atlas. It is required when
+    // caching is disabled so the atlas doesn't fill up and force more
+    // free floating layers
+    layerCache->purgeAll();
+#endif
+
+    layerCache->end();
+}
diff --git a/gfx/skia/skia/src/gpu/GrLayerHoister.h b/gfx/skia/skia/src/gpu/GrLayerHoister.h
new file mode 100644
index 000000000000..13cac5173ab9
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrLayerHoister.h
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrLayerHoister_DEFINED
+#define GrLayerHoister_DEFINED
+
+#include "SkPicture.h"
+#include "SkTDArray.h"
+
+struct GrCachedLayer;
+class GrReplacements;
+class SkGpuDevice;
+struct SkRect;
+
+class GrHoistedLayer {
+public:
+    const SkPicture* fPicture;  // the picture that actually contains the layer
+                                // (not necessarily the top-most picture)
+    GrCachedLayer*   fLayer;
+    SkMatrix         fInitialMat;
+    SkMatrix         fPreMat;
+    SkMatrix         fLocalMat;
+};
+
+// This class collects the layer hoisting functionality in one place.
+// For each picture rendering:
+//  FindLayersToHoist should be called once to collect the required layers
+//  DrawLayers should be called once to render them
+//  UnlockLayers should be called once to allow the texture resources to be recycled
+class GrLayerHoister {
+public:
+    /** Attempt to reattach layers that may have been atlased in the past
+     */
+    static void Begin(GrContext* context);
+
+    /** Release cache resources
+     */
+    static void End(GrContext* context);
+
+    /** Find the layers in 'topLevelPicture' that can be atlased. Note that the discovered
+        layers can be inside nested sub-pictures.
+        @param context    Owner of the layer cache (the source of new layers)
+        @param topLevelPicture The top-level picture that is about to be rendered
+        @param initialMat  The CTM of the canvas into which the layers will be drawn
+        @param query       The rectangle that is about to be drawn.
+        @param atlasedNeedRendering Out parameter storing the layers that 
+                                    should be hoisted to the atlas
+        @param recycled    Out parameter storing layers that are atlased but do not need rendering
+        @param numSamples  The number if MSAA samples required
+        */
+    static void FindLayersToAtlas(GrContext* context,
+                                  const SkPicture* topLevelPicture,
+                                  const SkMatrix& initialMat,
+                                  const SkRect& query,
+                                  SkTDArray<GrHoistedLayer>* atlasedNeedRendering,
+                                  SkTDArray<GrHoistedLayer>* recycled,
+                                  int numSamples);
+
+    /** Find the layers in 'topLevelPicture' that need hoisting. Note that the discovered
+        layers can be inside nested sub-pictures.
+        @param context    Owner of the layer cache (the source of new layers)
+        @param topLevelPicture The top-level picture that is about to be rendered
+        @param initialMat  The CTM of the canvas into which the layers will be drawn
+        @param query       The rectangle that is about to be drawn.
+        @param needRendering Out parameter storing the layers that need rendering.
+                             This should never include atlased layers.
+        @param recycled    Out parameter storing layers that need hoisting but not rendering
+        @param numSamples  The number if MSAA samples required
+    */
+    static void FindLayersToHoist(GrContext* context,
+                                  const SkPicture* topLevelPicture,
+                                  const SkMatrix& initialMat,
+                                  const SkRect& query,
+                                  SkTDArray<GrHoistedLayer>* needRendering,
+                                  SkTDArray<GrHoistedLayer>* recycled,
+                                  int numSamples);
+
+    /** Draw the specified layers into the atlas.
+        @param context      Owner of the layer cache (and thus the layers)
+        @param layers       The layers to be drawn into the atlas
+    */
+    static void DrawLayersToAtlas(GrContext* context, const SkTDArray<GrHoistedLayer>& layers);
+
+    /** Draw the specified layers into their own individual textures.
+        @param context      Owner of the layer cache (and thus the layers)
+        @param layers       The layers to be drawn
+    */
+    static void DrawLayers(GrContext* context, const SkTDArray<GrHoistedLayer>& layers);
+
+    /** Convert all the layers in 'layers' into replacement objects in 'replacements'.
+        @param layers       The hoisted layers
+        @param replacements Replacement object that will be used for a replacement draw
+    */
+    static void ConvertLayersToReplacements(const SkPicture* topLevelPicture, 
+                                            const SkTDArray<GrHoistedLayer>& layers,
+                                            GrReplacements* replacements);
+
+    /** Unlock a group of layers in the layer cache.
+        @param context    Owner of the layer cache (and thus the layers)
+        @param layers     Unneeded layers in the atlas
+    */
+    static void UnlockLayers(GrContext* context, const SkTDArray<GrHoistedLayer>& layers);
+
+    /** Forceably remove all cached layers and release the atlas. Useful for debugging and timing.
+        This is only functional when GR_CACHE_HOISTED_LAYERS is set to 1 in GrLayerCache.h
+        @param context    Owner of the layer cache (and thus the layers)
+     */
+    static void PurgeCache(GrContext* context);
+
+private:
+    /** Update the GrTexture in 'layer' with its filtered version
+        @param context    Owner of the layer cache (and thus the layers)
+        @param device     Required by the filtering code
+        @param info       Layer info for a layer needing filtering prior to being composited
+     */
+    static void FilterLayer(GrContext* context, SkGpuDevice* device, const GrHoistedLayer& info);
+
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrMemoryPool.cpp b/gfx/skia/skia/src/gpu/GrMemoryPool.cpp
index 8839c66d07c9..cc26452c19cc 100644
--- a/gfx/skia/skia/src/gpu/GrMemoryPool.cpp
+++ b/gfx/skia/skia/src/gpu/GrMemoryPool.cpp
@@ -15,16 +15,18 @@
 
 GrMemoryPool::GrMemoryPool(size_t preallocSize, size_t minAllocSize) {
     SkDEBUGCODE(fAllocationCnt = 0);
+    SkDEBUGCODE(fAllocBlockCnt = 0);
 
     minAllocSize = SkTMax<size_t>(minAllocSize, 1 << 10);
     fMinAllocSize = GrSizeAlignUp(minAllocSize + kPerAllocPad, kAlignment),
     fPreallocSize = GrSizeAlignUp(preallocSize + kPerAllocPad, kAlignment);
     fPreallocSize = SkTMax(fPreallocSize, fMinAllocSize);
+    fSize = fPreallocSize;
 
     fHead = CreateBlock(fPreallocSize);
     fTail = fHead;
-    fHead->fNext = NULL;
-    fHead->fPrev = NULL;
+    fHead->fNext = nullptr;
+    fHead->fPrev = nullptr;
     VALIDATE;
 };
 
@@ -46,10 +48,12 @@ void* GrMemoryPool::allocate(size_t size) {
         BlockHeader* block = CreateBlock(blockSize);
 
         block->fPrev = fTail;
-        block->fNext = NULL;
-        SkASSERT(NULL == fTail->fNext);
+        block->fNext = nullptr;
+        SkASSERT(nullptr == fTail->fNext);
         fTail->fNext = block;
         fTail = block;
+        fSize += block->fSize;
+        SkDEBUGCODE(++fAllocBlockCnt);
     }
     SkASSERT(fTail->fFreeSize >= size);
     intptr_t ptr = fTail->fCurrPtr;
@@ -61,6 +65,7 @@ void* GrMemoryPool::allocate(size_t size) {
     fTail->fCurrPtr += size;
     fTail->fFreeSize -= size;
     fTail->fLiveCount += 1;
+
     SkDEBUGCODE(++fAllocationCnt);
     VALIDATE;
     return reinterpret_cast<void*>(ptr);
@@ -73,8 +78,7 @@ void GrMemoryPool::release(void* p) {
     if (1 == block->fLiveCount) {
         // the head block is special, it is reset rather than deleted
         if (fHead == block) {
-            fHead->fCurrPtr = reinterpret_cast<intptr_t>(fHead) +
-                                kHeaderSize;
+            fHead->fCurrPtr = reinterpret_cast<intptr_t>(fHead) + kHeaderSize;
             fHead->fLiveCount = 0;
             fHead->fFreeSize = fPreallocSize;
         } else {
@@ -88,7 +92,9 @@ void GrMemoryPool::release(void* p) {
                 SkASSERT(fTail == block);
                 fTail = prev;
             }
+            fSize -= block->fSize;
             DeleteBlock(block);
+            SkDEBUGCODE(fAllocBlockCnt--);
         }
     } else {
         --block->fLiveCount;
@@ -103,14 +109,16 @@ void GrMemoryPool::release(void* p) {
 }
 
 GrMemoryPool::BlockHeader* GrMemoryPool::CreateBlock(size_t size) {
+    size_t paddedSize = size + kHeaderSize;
     BlockHeader* block =
-        reinterpret_cast<BlockHeader*>(sk_malloc_throw(size + kHeaderSize));
+        reinterpret_cast<BlockHeader*>(sk_malloc_throw(paddedSize));
     // we assume malloc gives us aligned memory
     SkASSERT(!(reinterpret_cast<intptr_t>(block) % kAlignment));
     block->fLiveCount = 0;
     block->fFreeSize = size;
     block->fCurrPtr = reinterpret_cast<intptr_t>(block) + kHeaderSize;
-    block->fPrevPtr = 0; // gcc warns on assigning NULL to an intptr_t.
+    block->fPrevPtr = 0; // gcc warns on assigning nullptr to an intptr_t.
+    block->fSize = paddedSize;
     return block;
 }
 
@@ -121,13 +129,13 @@ void GrMemoryPool::DeleteBlock(BlockHeader* block) {
 void GrMemoryPool::validate() {
 #ifdef SK_DEBUG
     BlockHeader* block = fHead;
-    BlockHeader* prev = NULL;
+    BlockHeader* prev = nullptr;
     SkASSERT(block);
     int allocCount = 0;
     do {
         allocCount += block->fLiveCount;
         SkASSERT(prev == block->fPrev);
-        if (NULL != prev) {
+        if (prev) {
             SkASSERT(prev->fNext == block);
         }
 
@@ -157,5 +165,6 @@ void GrMemoryPool::validate() {
     } while ((block = block->fNext));
     SkASSERT(allocCount == fAllocationCnt);
     SkASSERT(prev == fTail);
+    SkASSERT(fAllocBlockCnt != 0 || fSize == fPreallocSize);
 #endif
 }
diff --git a/gfx/skia/skia/src/gpu/GrMemoryPool.h b/gfx/skia/skia/src/gpu/GrMemoryPool.h
index 5ab8958a8a25..4de641d9fcb3 100644
--- a/gfx/skia/skia/src/gpu/GrMemoryPool.h
+++ b/gfx/skia/skia/src/gpu/GrMemoryPool.h
@@ -43,6 +43,11 @@ public:
      */
     bool isEmpty() const { return fTail == fHead && !fHead->fLiveCount; }
 
+    /**
+     * Returns the total allocated size of the GrMemoryPool
+     */
+    size_t size() const { return fSize; }
+
 private:
     struct BlockHeader;
 
@@ -60,6 +65,7 @@ private:
         intptr_t     fCurrPtr;   ///< ptr to the start of blocks free space.
         intptr_t     fPrevPtr;   ///< ptr to the last allocation made
         size_t       fFreeSize;  ///< amount of free space left in the block.
+        size_t       fSize;      ///< total allocated size of the block
     };
 
     enum {
@@ -68,12 +74,14 @@ private:
         kHeaderSize   = GR_CT_ALIGN_UP(sizeof(BlockHeader), kAlignment),
         kPerAllocPad  = GR_CT_ALIGN_UP(sizeof(BlockHeader*), kAlignment),
     };
+    size_t                            fSize;
     size_t                            fPreallocSize;
     size_t                            fMinAllocSize;
     BlockHeader*                      fHead;
     BlockHeader*                      fTail;
 #ifdef SK_DEBUG
     int                               fAllocationCnt;
+    int                               fAllocBlockCnt;
 #endif
 };
 
diff --git a/gfx/skia/skia/src/gpu/GrNonAtomicRef.h b/gfx/skia/skia/src/gpu/GrNonAtomicRef.h
new file mode 100644
index 000000000000..efa2881c5f49
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrNonAtomicRef.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrNonAtomicRef_DEFINED
+#define GrNonAtomicRef_DEFINED
+
+#include "SkRefCnt.h"
+#include "SkTArray.h"
+
+/**
+ * A simple non-atomic ref used in the GrBackend when we don't want to pay for the overhead of a
+ * threadsafe ref counted object
+ */
+class GrNonAtomicRef : public SkNoncopyable {
+public:
+    GrNonAtomicRef() : fRefCnt(1) {}
+    virtual ~GrNonAtomicRef() {
+        // fRefCnt can be one when a subclass is created statically
+        SkASSERT((0 == fRefCnt || 1 == fRefCnt));
+        // Set to invalid values.
+        SkDEBUGCODE(fRefCnt = -10;)
+    }
+
+    void ref() const {
+        // Once the ref cnt reaches zero it should never be ref'ed again.
+        SkASSERT(fRefCnt > 0);
+        ++fRefCnt;
+    }
+
+    void unref() const {
+        SkASSERT(fRefCnt > 0);
+        --fRefCnt;
+        if (0 == fRefCnt) {
+            delete this;
+            return;
+        }
+    }
+
+private:
+    mutable int32_t fRefCnt;
+
+    typedef SkNoncopyable INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrOrderedSet.h b/gfx/skia/skia/src/gpu/GrOrderedSet.h
deleted file mode 100644
index 23b9353a516d..000000000000
--- a/gfx/skia/skia/src/gpu/GrOrderedSet.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrOrderedSet_DEFINED
-#define GrOrderedSet_DEFINED
-
-#include "GrRedBlackTree.h"
-
-template <typename T, typename C = GrLess<T> >
-class GrOrderedSet : SkNoncopyable {
-public:
-    /**
-     * Creates an empty set
-     */
-    GrOrderedSet() : fComp() {}
-    ~GrOrderedSet() {}
-
-    class Iter;
-
-    /**
-     * @return true if there are no items in the set, false otherwise.
-     */
-    bool empty() const { return fRBTree.empty(); }
-
-    /**
-     * @return the number of items in the set.
-     */
-    int count() const { return fRBTree.count(); }
-
-    /**
-     * Removes all items in the set
-     */
-    void reset() { fRBTree.reset(); }
-
-    /**
-     * Adds an element to set if it does not already exists in the set.
-     * @param t  the item to add
-     * @return an iterator to added element or matching element already in set
-     */
-    Iter insert(const T& t);
-
-    /**
-     * Removes the item indicated by an iterator. The iterator will not be valid
-     * afterwards.
-     * @param iter      iterator of item to remove. Must be valid (not end()).
-     */
-    void remove(const Iter& iter);
-
-    /**
-     * @return  an iterator to the first item in sorted order, or end() if empty
-     */
-    Iter begin();
-
-    /**
-     * Gets the last valid iterator. This is always valid, even on an empty.
-     * However, it can never be dereferenced. Useful as a loop terminator.
-     * @return  an iterator that is just beyond the last item in sorted order.
-     */
-    Iter end();
-
-    /**
-     * @return  an iterator that to the last item in sorted order, or end() if
-     * empty.
-     */
-    Iter last();
-
-    /**
-     * Finds an occurrence of an item.
-     * @param t     the item to find.
-     * @return an iterator to a set element equal to t or end() if none exists.
-     */
-    Iter find(const T& t);
-
-private:
-    GrRedBlackTree<T, C> fRBTree;
-
-    const C fComp;
-};
-
-template <typename T, typename C>
-class GrOrderedSet<T,C>::Iter {
-public:
-    Iter() {}
-    Iter(const Iter& i) { fTreeIter = i.fTreeIter; }
-    Iter& operator =(const Iter& i) {
-        fTreeIter = i.fTreeIter;
-        return *this;
-    }
-    const T& operator *() const { return *fTreeIter; }
-    bool operator ==(const Iter& i) const {
-        return fTreeIter == i.fTreeIter;
-    }
-    bool operator !=(const Iter& i) const { return !(*this == i); }
-    Iter& operator ++() {
-        ++fTreeIter;
-        return *this;
-    }
-    Iter& operator --() {
-        --fTreeIter;
-        return *this;
-    }
-    const typename GrRedBlackTree<T,C>::Iter& getTreeIter() const {
-        return fTreeIter;
-    }
-
-private:
-    friend class GrOrderedSet;
-    explicit Iter(typename GrRedBlackTree<T, C>::Iter iter) {
-        fTreeIter = iter;
-    }
-    typename GrRedBlackTree<T,C>::Iter fTreeIter;
-};
-
-template <typename T, typename C>
-typename GrOrderedSet<T,C>::Iter GrOrderedSet<T,C>::begin() {
-    return Iter(fRBTree.begin());
-}
-
-template <typename T, typename C>
-typename GrOrderedSet<T,C>::Iter GrOrderedSet<T,C>::end() {
-    return Iter(fRBTree.end());
-}
-
-template <typename T, typename C>
-typename GrOrderedSet<T,C>::Iter GrOrderedSet<T,C>::last() {
-    return Iter(fRBTree.last());
-}
-
-template <typename T, typename C>
-typename GrOrderedSet<T,C>::Iter GrOrderedSet<T,C>::find(const T& t) {
-    return Iter(fRBTree.find(t));
-}
-
-template <typename T, typename C>
-typename GrOrderedSet<T,C>::Iter GrOrderedSet<T,C>::insert(const T& t) {
-    if (fRBTree.find(t) == fRBTree.end()) {
-        return Iter(fRBTree.insert(t));
-    } else {
-        return Iter(fRBTree.find(t));
-    }
-}
-
-template <typename T, typename C>
-void GrOrderedSet<T,C>::remove(const typename GrOrderedSet<T,C>::Iter& iter) {
-    if (this->end() != iter) {
-        fRBTree.remove(iter.getTreeIter());
-    }
-}
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/GrOvalRenderer.cpp b/gfx/skia/skia/src/gpu/GrOvalRenderer.cpp
index b604f021578b..e13c0d11e4e5 100644
--- a/gfx/skia/skia/src/gpu/GrOvalRenderer.cpp
+++ b/gfx/skia/skia/src/gpu/GrOvalRenderer.cpp
@@ -7,26 +7,32 @@
 
 #include "GrOvalRenderer.h"
 
-#include "GrEffect.h"
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLSL.h"
-#include "gl/GrGLShaderBuilder.h"
-#include "gl/GrGLVertexEffect.h"
-#include "GrTBackendEffectFactory.h"
-
-#include "GrDrawState.h"
+#include "GrBatchFlushState.h"
+#include "GrBatchTest.h"
 #include "GrDrawTarget.h"
-#include "GrGpu.h"
-
+#include "GrGeometryProcessor.h"
+#include "GrInvariantOutput.h"
+#include "GrPipelineBuilder.h"
+#include "GrProcessor.h"
+#include "GrResourceProvider.h"
+#include "GrVertexBuffer.h"
 #include "SkRRect.h"
 #include "SkStrokeRec.h"
 #include "SkTLazy.h"
-
-#include "effects/GrVertexEffect.h"
+#include "batches/GrVertexBatch.h"
 #include "effects/GrRRectEffect.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLGeometryProcessor.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+#include "glsl/GrGLSLVarying.h"
+#include "glsl/GrGLSLVertexShaderBuilder.h"
+#include "glsl/GrGLSLUtil.h"
+
+// TODO(joshualitt) - Break this file up during GrBatch post implementation cleanup
 
 namespace {
-
+// TODO(joshualitt) add per vertex colors
 struct CircleVertex {
     SkPoint  fPos;
     SkPoint  fOffset;
@@ -56,109 +62,158 @@ inline bool circle_stays_circle(const SkMatrix& m) {
 ///////////////////////////////////////////////////////////////////////////////
 
 /**
- * The output of this effect is a modulation of the input color and coverage for a circle,
- * specified as offset_x, offset_y (both from center point), outer radius and inner radius.
+ * The output of this effect is a modulation of the input color and coverage for a circle. It
+ * operates in a space normalized by the circle radius (outer radius in the case of a stroke)
+ * with origin at the circle center. Two   vertex attributes are used:
+ *    vec2f : position in device space of the bounding geometry vertices
+ *    vec4f : (p.xy, outerRad, innerRad)
+ *             p is the position in the normalized space.
+ *             outerRad is the outerRadius in device space.
+ *             innerRad is the innerRadius in normalized space (ignored if not stroking).
  */
 
-class CircleEdgeEffect : public GrVertexEffect {
+class CircleEdgeEffect : public GrGeometryProcessor {
 public:
-    static GrEffect* Create(bool stroke) {
-        GR_CREATE_STATIC_EFFECT(gCircleStrokeEdge, CircleEdgeEffect, (true));
-        GR_CREATE_STATIC_EFFECT(gCircleFillEdge, CircleEdgeEffect, (false));
-
-        if (stroke) {
-            gCircleStrokeEdge->ref();
-            return gCircleStrokeEdge;
-        } else {
-            gCircleFillEdge->ref();
-            return gCircleFillEdge;
-        }
-    }
-
-    virtual void getConstantColorComponents(GrColor* color,
-                                            uint32_t* validFlags) const SK_OVERRIDE {
-        *validFlags = 0;
-    }
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE {
-        return GrTBackendEffectFactory<CircleEdgeEffect>::getInstance();
+    static GrGeometryProcessor* Create(GrColor color, bool stroke, const SkMatrix& localMatrix,
+                                       bool usesLocalCoords) {
+        return new CircleEdgeEffect(color, stroke, localMatrix, usesLocalCoords);
     }
 
+    const Attribute* inPosition() const { return fInPosition; }
+    const Attribute* inCircleEdge() const { return fInCircleEdge; }
+    GrColor color() const { return fColor; }
+    bool colorIgnored() const { return GrColor_ILLEGAL == fColor; }
+    const SkMatrix& localMatrix() const { return fLocalMatrix; }
+    bool usesLocalCoords() const { return fUsesLocalCoords; }
     virtual ~CircleEdgeEffect() {}
 
-    static const char* Name() { return "CircleEdge"; }
+    const char* name() const override { return "CircleEdge"; }
 
     inline bool isStroked() const { return fStroke; }
 
-    class GLEffect : public GrGLVertexEffect {
+    class GLSLProcessor : public GrGLSLGeometryProcessor {
     public:
-        GLEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&)
-        : INHERITED (factory) {}
+        GLSLProcessor()
+            : fColor(GrColor_ILLEGAL) {}
 
-        virtual void emitCode(GrGLFullShaderBuilder* builder,
-                              const GrDrawEffect& drawEffect,
-                              const GrEffectKey& key,
-                              const char* outputColor,
-                              const char* inputColor,
-                              const TransformedCoordsArray&,
-                              const TextureSamplerArray& samplers) SK_OVERRIDE {
-            const CircleEdgeEffect& circleEffect = drawEffect.castEffect<CircleEdgeEffect>();
-            const char *vsName, *fsName;
-            builder->addVarying(kVec4f_GrSLType, "CircleEdge", &vsName, &fsName);
+        void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override{
+            const CircleEdgeEffect& ce = args.fGP.cast<CircleEdgeEffect>();
+            GrGLSLGPBuilder* pb = args.fPB;
+            GrGLSLVertexBuilder* vertBuilder = args.fVertBuilder;
+            GrGLSLVaryingHandler* varyingHandler = args.fVaryingHandler;
 
-            const SkString* attrName =
-                builder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[0]);
-            builder->vsCodeAppendf("\t%s = %s;\n", vsName, attrName->c_str());
+            // emit attributes
+            varyingHandler->emitAttributes(ce);
 
-            builder->fsCodeAppendf("\tfloat d = length(%s.xy);\n", fsName);
-            builder->fsCodeAppendf("\tfloat edgeAlpha = clamp(%s.z - d, 0.0, 1.0);\n", fsName);
-            if (circleEffect.isStroked()) {
-                builder->fsCodeAppendf("\tfloat innerAlpha = clamp(d - %s.w, 0.0, 1.0);\n", fsName);
-                builder->fsCodeAppend("\tedgeAlpha *= innerAlpha;\n");
+            GrGLSLVertToFrag v(kVec4f_GrSLType);
+            varyingHandler->addVarying("CircleEdge", &v);
+            vertBuilder->codeAppendf("%s = %s;", v.vsOut(), ce.inCircleEdge()->fName);
+
+            GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+            // setup pass through color
+            if (!ce.colorIgnored()) {
+                this->setupUniformColor(pb, fragBuilder, args.fOutputColor, &fColorUniform);
             }
 
-            builder->fsCodeAppendf("\t%s = %s;\n", outputColor,
-                                   (GrGLSLExpr4(inputColor) * GrGLSLExpr1("edgeAlpha")).c_str());
+            // Setup position
+            this->setupPosition(pb, vertBuilder, gpArgs, ce.inPosition()->fName);
+
+            // emit transforms
+            this->emitTransforms(args.fPB,
+                                 vertBuilder,
+                                 varyingHandler,
+                                 gpArgs->fPositionVar,
+                                 ce.inPosition()->fName,
+                                 ce.localMatrix(),
+                                 args.fTransformsIn,
+                                 args.fTransformsOut);
+
+            fragBuilder->codeAppendf("float d = length(%s.xy);", v.fsIn());
+            fragBuilder->codeAppendf("float edgeAlpha = clamp(%s.z * (1.0 - d), 0.0, 1.0);",
+                                     v.fsIn());
+            if (ce.isStroked()) {
+                fragBuilder->codeAppendf("float innerAlpha = clamp(%s.z * (d - %s.w), 0.0, 1.0);",
+                                         v.fsIn(), v.fsIn());
+                fragBuilder->codeAppend("edgeAlpha *= innerAlpha;");
+            }
+
+            fragBuilder->codeAppendf("%s = vec4(edgeAlpha);", args.fOutputCoverage);
         }
 
-        static void GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
-                           GrEffectKeyBuilder* b) {
-            const CircleEdgeEffect& circleEffect = drawEffect.castEffect<CircleEdgeEffect>();
-            b->add32(circleEffect.isStroked());
+        static void GenKey(const GrGeometryProcessor& gp,
+                           const GrGLSLCaps&,
+                           GrProcessorKeyBuilder* b) {
+            const CircleEdgeEffect& ce = gp.cast<CircleEdgeEffect>();
+            uint16_t key = ce.isStroked() ? 0x1 : 0x0;
+            key |= ce.usesLocalCoords() && ce.localMatrix().hasPerspective() ? 0x2 : 0x0;
+            key |= ce.colorIgnored() ? 0x4 : 0x0;
+            b->add32(key);
         }
 
-        virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE {}
+        void setData(const GrGLSLProgramDataManager& pdman,
+                     const GrPrimitiveProcessor& gp) override {
+            const CircleEdgeEffect& ce = gp.cast<CircleEdgeEffect>();
+            if (ce.color() != fColor) {
+                float c[4];
+                GrColorToRGBAFloat(ce.color(), c);
+                pdman.set4fv(fColorUniform, 1, c);
+                fColor = ce.color();
+            }
+        }
+
+        void setTransformData(const GrPrimitiveProcessor& primProc,
+                              const GrGLSLProgramDataManager& pdman,
+                              int index,
+                              const SkTArray<const GrCoordTransform*, true>& transforms) override {
+            this->setTransformDataHelper<CircleEdgeEffect>(primProc, pdman, index, transforms);
+        }
 
     private:
-        typedef GrGLVertexEffect INHERITED;
+        GrColor fColor;
+        UniformHandle fColorUniform;
+        typedef GrGLSLGeometryProcessor INHERITED;
     };
 
+    void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {
+        GLSLProcessor::GenKey(*this, caps, b);
+    }
+
+    GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override {
+        return new GLSLProcessor();
+    }
 
 private:
-    CircleEdgeEffect(bool stroke) : GrVertexEffect() {
-        this->addVertexAttrib(kVec4f_GrSLType);
+    CircleEdgeEffect(GrColor color, bool stroke, const SkMatrix& localMatrix, bool usesLocalCoords)
+        : fColor(color)
+        , fLocalMatrix(localMatrix)
+        , fUsesLocalCoords(usesLocalCoords) {
+        this->initClassID<CircleEdgeEffect>();
+        fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType,
+                                                       kHigh_GrSLPrecision));
+        fInCircleEdge = &this->addVertexAttrib(Attribute("inCircleEdge",
+                                                           kVec4f_GrVertexAttribType));
         fStroke = stroke;
     }
 
-    virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE {
-        const CircleEdgeEffect& cee = CastEffect<CircleEdgeEffect>(other);
-        return cee.fStroke == fStroke;
-    }
-
+    GrColor fColor;
+    SkMatrix fLocalMatrix;
+    const Attribute* fInPosition;
+    const Attribute* fInCircleEdge;
     bool fStroke;
+    bool fUsesLocalCoords;
 
-    GR_DECLARE_EFFECT_TEST;
+    GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
 
-    typedef GrVertexEffect INHERITED;
+    typedef GrGeometryProcessor INHERITED;
 };
 
-GR_DEFINE_EFFECT_TEST(CircleEdgeEffect);
+GR_DEFINE_GEOMETRY_PROCESSOR_TEST(CircleEdgeEffect);
 
-GrEffect* CircleEdgeEffect::TestCreate(SkRandom* random,
-                                       GrContext* context,
-                                       const GrDrawTargetCaps&,
-                                       GrTexture* textures[]) {
-    return CircleEdgeEffect::Create(random->nextBool());
+const GrGeometryProcessor* CircleEdgeEffect::TestCreate(GrProcessorTestData* d) {
+    return CircleEdgeEffect::Create(GrRandomColor(d->fRandom),
+                                    d->fRandom->nextBool(),
+                                    GrTest::TestMatrix(d->fRandom),
+                                    d->fRandom->nextBool());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -171,125 +226,173 @@ GrEffect* CircleEdgeEffect::TestCreate(SkRandom* random,
  * We are using an implicit function of x^2/a^2 + y^2/b^2 - 1 = 0.
  */
 
-class EllipseEdgeEffect : public GrVertexEffect {
+class EllipseEdgeEffect : public GrGeometryProcessor {
 public:
-    static GrEffect* Create(bool stroke) {
-        GR_CREATE_STATIC_EFFECT(gEllipseStrokeEdge, EllipseEdgeEffect, (true));
-        GR_CREATE_STATIC_EFFECT(gEllipseFillEdge, EllipseEdgeEffect, (false));
-
-        if (stroke) {
-            gEllipseStrokeEdge->ref();
-            return gEllipseStrokeEdge;
-        } else {
-            gEllipseFillEdge->ref();
-            return gEllipseFillEdge;
-        }
-    }
-
-    virtual void getConstantColorComponents(GrColor* color,
-                                            uint32_t* validFlags) const SK_OVERRIDE {
-        *validFlags = 0;
-    }
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE {
-        return GrTBackendEffectFactory<EllipseEdgeEffect>::getInstance();
+    static GrGeometryProcessor* Create(GrColor color, bool stroke, const SkMatrix& localMatrix,
+                                       bool usesLocalCoords) {
+        return new EllipseEdgeEffect(color, stroke, localMatrix, usesLocalCoords);
     }
 
     virtual ~EllipseEdgeEffect() {}
 
-    static const char* Name() { return "EllipseEdge"; }
+    const char* name() const override { return "EllipseEdge"; }
+
+    const Attribute* inPosition() const { return fInPosition; }
+    const Attribute* inEllipseOffset() const { return fInEllipseOffset; }
+    const Attribute* inEllipseRadii() const { return fInEllipseRadii; }
+    GrColor color() const { return fColor; }
+    bool colorIgnored() const { return GrColor_ILLEGAL == fColor; }
+    const SkMatrix& localMatrix() const { return fLocalMatrix; }
+    bool usesLocalCoords() const { return fUsesLocalCoords; }
 
     inline bool isStroked() const { return fStroke; }
 
-    class GLEffect : public GrGLVertexEffect {
+    class GLSLProcessor : public GrGLSLGeometryProcessor {
     public:
-        GLEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&)
-        : INHERITED (factory) {}
+        GLSLProcessor()
+            : fColor(GrColor_ILLEGAL) {}
 
-        virtual void emitCode(GrGLFullShaderBuilder* builder,
-                              const GrDrawEffect& drawEffect,
-                              const GrEffectKey& key,
-                              const char* outputColor,
-                              const char* inputColor,
-                              const TransformedCoordsArray&,
-                              const TextureSamplerArray& samplers) SK_OVERRIDE {
-            const EllipseEdgeEffect& ellipseEffect = drawEffect.castEffect<EllipseEdgeEffect>();
+        void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override{
+            const EllipseEdgeEffect& ee = args.fGP.cast<EllipseEdgeEffect>();
+            GrGLSLGPBuilder* pb = args.fPB;
+            GrGLSLVertexBuilder* vertBuilder = args.fVertBuilder;
+            GrGLSLVaryingHandler* varyingHandler = args.fVaryingHandler;
 
-            const char *vsOffsetName, *fsOffsetName;
-            const char *vsRadiiName, *fsRadiiName;
+            // emit attributes
+            varyingHandler->emitAttributes(ee);
 
-            builder->addVarying(kVec2f_GrSLType, "EllipseOffsets", &vsOffsetName, &fsOffsetName);
-            const SkString* attr0Name =
-                builder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[0]);
-            builder->vsCodeAppendf("\t%s = %s;\n", vsOffsetName, attr0Name->c_str());
+            GrGLSLVertToFrag ellipseOffsets(kVec2f_GrSLType);
+            varyingHandler->addVarying("EllipseOffsets", &ellipseOffsets);
+            vertBuilder->codeAppendf("%s = %s;", ellipseOffsets.vsOut(),
+                                   ee.inEllipseOffset()->fName);
 
-            builder->addVarying(kVec4f_GrSLType, "EllipseRadii", &vsRadiiName, &fsRadiiName);
-            const SkString* attr1Name =
-                builder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[1]);
-            builder->vsCodeAppendf("\t%s = %s;\n", vsRadiiName, attr1Name->c_str());
+            GrGLSLVertToFrag ellipseRadii(kVec4f_GrSLType);
+            varyingHandler->addVarying("EllipseRadii", &ellipseRadii);
+            vertBuilder->codeAppendf("%s = %s;", ellipseRadii.vsOut(),
+                                   ee.inEllipseRadii()->fName);
 
-            // for outer curve
-            builder->fsCodeAppendf("\tvec2 scaledOffset = %s*%s.xy;\n", fsOffsetName, fsRadiiName);
-            builder->fsCodeAppend("\tfloat test = dot(scaledOffset, scaledOffset) - 1.0;\n");
-            builder->fsCodeAppendf("\tvec2 grad = 2.0*scaledOffset*%s.xy;\n", fsRadiiName);
-            builder->fsCodeAppend("\tfloat grad_dot = dot(grad, grad);\n");
-            // avoid calling inversesqrt on zero.
-            builder->fsCodeAppend("\tgrad_dot = max(grad_dot, 1.0e-4);\n");
-            builder->fsCodeAppend("\tfloat invlen = inversesqrt(grad_dot);\n");
-            builder->fsCodeAppend("\tfloat edgeAlpha = clamp(0.5-test*invlen, 0.0, 1.0);\n");
-
-            // for inner curve
-            if (ellipseEffect.isStroked()) {
-                builder->fsCodeAppendf("\tscaledOffset = %s*%s.zw;\n", fsOffsetName, fsRadiiName);
-                builder->fsCodeAppend("\ttest = dot(scaledOffset, scaledOffset) - 1.0;\n");
-                builder->fsCodeAppendf("\tgrad = 2.0*scaledOffset*%s.zw;\n", fsRadiiName);
-                builder->fsCodeAppend("\tinvlen = inversesqrt(dot(grad, grad));\n");
-                builder->fsCodeAppend("\tedgeAlpha *= clamp(0.5+test*invlen, 0.0, 1.0);\n");
+            GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+            // setup pass through color
+            if (!ee.colorIgnored()) {
+                this->setupUniformColor(pb, fragBuilder, args.fOutputColor, &fColorUniform);
             }
 
-            builder->fsCodeAppendf("\t%s = %s;\n", outputColor,
-                                   (GrGLSLExpr4(inputColor) * GrGLSLExpr1("edgeAlpha")).c_str());
+            // Setup position
+            this->setupPosition(pb, vertBuilder, gpArgs, ee.inPosition()->fName);
+
+            // emit transforms
+            this->emitTransforms(args.fPB,
+                                 vertBuilder,
+                                 varyingHandler,
+                                 gpArgs->fPositionVar,
+                                 ee.inPosition()->fName,
+                                 ee.localMatrix(),
+                                 args.fTransformsIn,
+                                 args.fTransformsOut);
+
+            // for outer curve
+            fragBuilder->codeAppendf("vec2 scaledOffset = %s*%s.xy;", ellipseOffsets.fsIn(),
+                                     ellipseRadii.fsIn());
+            fragBuilder->codeAppend("float test = dot(scaledOffset, scaledOffset) - 1.0;");
+            fragBuilder->codeAppendf("vec2 grad = 2.0*scaledOffset*%s.xy;", ellipseRadii.fsIn());
+            fragBuilder->codeAppend("float grad_dot = dot(grad, grad);");
+
+            // avoid calling inversesqrt on zero.
+            fragBuilder->codeAppend("grad_dot = max(grad_dot, 1.0e-4);");
+            fragBuilder->codeAppend("float invlen = inversesqrt(grad_dot);");
+            fragBuilder->codeAppend("float edgeAlpha = clamp(0.5-test*invlen, 0.0, 1.0);");
+
+            // for inner curve
+            if (ee.isStroked()) {
+                fragBuilder->codeAppendf("scaledOffset = %s*%s.zw;",
+                                         ellipseOffsets.fsIn(), ellipseRadii.fsIn());
+                fragBuilder->codeAppend("test = dot(scaledOffset, scaledOffset) - 1.0;");
+                fragBuilder->codeAppendf("grad = 2.0*scaledOffset*%s.zw;",
+                                         ellipseRadii.fsIn());
+                fragBuilder->codeAppend("invlen = inversesqrt(dot(grad, grad));");
+                fragBuilder->codeAppend("edgeAlpha *= clamp(0.5+test*invlen, 0.0, 1.0);");
+            }
+
+            fragBuilder->codeAppendf("%s = vec4(edgeAlpha);", args.fOutputCoverage);
         }
 
-        static void GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
-                           GrEffectKeyBuilder* b) {
-            const EllipseEdgeEffect& ellipseEffect = drawEffect.castEffect<EllipseEdgeEffect>();
-            b->add32(ellipseEffect.isStroked());
+        static void GenKey(const GrGeometryProcessor& gp,
+                           const GrGLSLCaps&,
+                           GrProcessorKeyBuilder* b) {
+            const EllipseEdgeEffect& ee = gp.cast<EllipseEdgeEffect>();
+            uint16_t key = ee.isStroked() ? 0x1 : 0x0;
+            key |= ee.usesLocalCoords() && ee.localMatrix().hasPerspective() ? 0x2 : 0x0;
+            key |= ee.colorIgnored() ? 0x4 : 0x0;
+            b->add32(key);
         }
 
-        virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE {
+        void setData(const GrGLSLProgramDataManager& pdman, const GrPrimitiveProcessor& gp) override {
+            const EllipseEdgeEffect& ee = gp.cast<EllipseEdgeEffect>();
+            if (ee.color() != fColor) {
+                float c[4];
+                GrColorToRGBAFloat(ee.color(), c);
+                pdman.set4fv(fColorUniform, 1, c);
+                fColor = ee.color();
+            }
+        }
+
+        void setTransformData(const GrPrimitiveProcessor& primProc,
+                              const GrGLSLProgramDataManager& pdman,
+                              int index,
+                              const SkTArray<const GrCoordTransform*, true>& transforms) override {
+            this->setTransformDataHelper<EllipseEdgeEffect>(primProc, pdman, index, transforms);
         }
 
     private:
-        typedef GrGLVertexEffect INHERITED;
+        GrColor fColor;
+        UniformHandle fColorUniform;
+
+        typedef GrGLSLGeometryProcessor INHERITED;
     };
 
+    void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {
+        GLSLProcessor::GenKey(*this, caps, b);
+    }
+
+    GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override {
+        return new GLSLProcessor();
+    }
+
 private:
-    EllipseEdgeEffect(bool stroke) : GrVertexEffect() {
-        this->addVertexAttrib(kVec2f_GrSLType);
-        this->addVertexAttrib(kVec4f_GrSLType);
+    EllipseEdgeEffect(GrColor color, bool stroke, const SkMatrix& localMatrix,
+                      bool usesLocalCoords)
+        : fColor(color)
+        , fLocalMatrix(localMatrix)
+        , fUsesLocalCoords(usesLocalCoords) {
+        this->initClassID<EllipseEdgeEffect>();
+        fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType));
+        fInEllipseOffset = &this->addVertexAttrib(Attribute("inEllipseOffset",
+                                                            kVec2f_GrVertexAttribType));
+        fInEllipseRadii = &this->addVertexAttrib(Attribute("inEllipseRadii",
+                                                           kVec4f_GrVertexAttribType));
         fStroke = stroke;
     }
 
-    virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE {
-        const EllipseEdgeEffect& eee = CastEffect<EllipseEdgeEffect>(other);
-        return eee.fStroke == fStroke;
-    }
-
+    const Attribute* fInPosition;
+    const Attribute* fInEllipseOffset;
+    const Attribute* fInEllipseRadii;
+    GrColor fColor;
+    SkMatrix fLocalMatrix;
     bool fStroke;
+    bool fUsesLocalCoords;
 
-    GR_DECLARE_EFFECT_TEST;
+    GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
 
-    typedef GrVertexEffect INHERITED;
+    typedef GrGeometryProcessor INHERITED;
 };
 
-GR_DEFINE_EFFECT_TEST(EllipseEdgeEffect);
+GR_DEFINE_GEOMETRY_PROCESSOR_TEST(EllipseEdgeEffect);
 
-GrEffect* EllipseEdgeEffect::TestCreate(SkRandom* random,
-                                        GrContext* context,
-                                        const GrDrawTargetCaps&,
-                                        GrTexture* textures[]) {
-    return EllipseEdgeEffect::Create(random->nextBool());
+const GrGeometryProcessor* EllipseEdgeEffect::TestCreate(GrProcessorTestData* d) {
+    return EllipseEdgeEffect::Create(GrRandomColor(d->fRandom),
+                                     d->fRandom->nextBool(),
+                                     GrTest::TestMatrix(d->fRandom),
+                                     d->fRandom->nextBool());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -303,182 +406,226 @@ GrEffect* EllipseEdgeEffect::TestCreate(SkRandom* random,
  * The result is device-independent and can be used with any affine matrix.
  */
 
-class DIEllipseEdgeEffect : public GrVertexEffect {
+class DIEllipseEdgeEffect : public GrGeometryProcessor {
 public:
     enum Mode { kStroke = 0, kHairline, kFill };
 
-    static GrEffect* Create(Mode mode) {
-        GR_CREATE_STATIC_EFFECT(gEllipseStrokeEdge, DIEllipseEdgeEffect, (kStroke));
-        GR_CREATE_STATIC_EFFECT(gEllipseHairlineEdge, DIEllipseEdgeEffect, (kHairline));
-        GR_CREATE_STATIC_EFFECT(gEllipseFillEdge, DIEllipseEdgeEffect, (kFill));
-
-        if (kStroke == mode) {
-            gEllipseStrokeEdge->ref();
-            return gEllipseStrokeEdge;
-        } else if (kHairline == mode) {
-            gEllipseHairlineEdge->ref();
-            return gEllipseHairlineEdge;
-        } else {
-            gEllipseFillEdge->ref();
-            return gEllipseFillEdge;
-        }
-    }
-
-    virtual void getConstantColorComponents(GrColor* color,
-                                            uint32_t* validFlags) const SK_OVERRIDE {
-        *validFlags = 0;
-    }
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE {
-        return GrTBackendEffectFactory<DIEllipseEdgeEffect>::getInstance();
+    static GrGeometryProcessor* Create(GrColor color, const SkMatrix& viewMatrix, Mode mode,
+                                       bool usesLocalCoords) {
+        return new DIEllipseEdgeEffect(color, viewMatrix, mode, usesLocalCoords);
     }
 
     virtual ~DIEllipseEdgeEffect() {}
 
-    static const char* Name() { return "DIEllipseEdge"; }
+    const char* name() const override { return "DIEllipseEdge"; }
+
+    const Attribute* inPosition() const { return fInPosition; }
+    const Attribute* inEllipseOffsets0() const { return fInEllipseOffsets0; }
+    const Attribute* inEllipseOffsets1() const { return fInEllipseOffsets1; }
+    GrColor color() const { return fColor; }
+    bool colorIgnored() const { return GrColor_ILLEGAL == fColor; }
+    const SkMatrix& viewMatrix() const { return fViewMatrix; }
+    bool usesLocalCoords() const { return fUsesLocalCoords; }
 
     inline Mode getMode() const { return fMode; }
 
-    class GLEffect : public GrGLVertexEffect {
+    class GLSLProcessor : public GrGLSLGeometryProcessor {
     public:
-        GLEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&)
-        : INHERITED (factory) {}
+        GLSLProcessor()
+            : fViewMatrix(SkMatrix::InvalidMatrix()), fColor(GrColor_ILLEGAL) {}
 
-        virtual void emitCode(GrGLFullShaderBuilder* builder,
-                              const GrDrawEffect& drawEffect,
-                              const GrEffectKey& key,
-                              const char* outputColor,
-                              const char* inputColor,
-                              const TransformedCoordsArray&,
-                              const TextureSamplerArray& samplers) SK_OVERRIDE {
-            const DIEllipseEdgeEffect& ellipseEffect = drawEffect.castEffect<DIEllipseEdgeEffect>();
+        void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override {
+            const DIEllipseEdgeEffect& ee = args.fGP.cast<DIEllipseEdgeEffect>();
+            GrGLSLGPBuilder* pb = args.fPB;
+            GrGLSLVertexBuilder* vertBuilder = args.fVertBuilder;
+            GrGLSLVaryingHandler* varyingHandler = args.fVaryingHandler;
 
-            SkAssertResult(builder->enableFeature(
-                                              GrGLShaderBuilder::kStandardDerivatives_GLSLFeature));
+            // emit attributes
+            varyingHandler->emitAttributes(ee);
 
-            const char *vsOffsetName0, *fsOffsetName0;
-            builder->addVarying(kVec2f_GrSLType, "EllipseOffsets0",
-                                      &vsOffsetName0, &fsOffsetName0);
-            const SkString* attr0Name =
-                builder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[0]);
-            builder->vsCodeAppendf("\t%s = %s;\n", vsOffsetName0, attr0Name->c_str());
-            const char *vsOffsetName1, *fsOffsetName1;
-            builder->addVarying(kVec2f_GrSLType, "EllipseOffsets1",
-                                      &vsOffsetName1, &fsOffsetName1);
-            const SkString* attr1Name =
-                builder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[1]);
-            builder->vsCodeAppendf("\t%s = %s;\n", vsOffsetName1, attr1Name->c_str());
+            GrGLSLVertToFrag offsets0(kVec2f_GrSLType);
+            varyingHandler->addVarying("EllipseOffsets0", &offsets0);
+            vertBuilder->codeAppendf("%s = %s;", offsets0.vsOut(),
+                                   ee.inEllipseOffsets0()->fName);
 
+            GrGLSLVertToFrag offsets1(kVec2f_GrSLType);
+            varyingHandler->addVarying("EllipseOffsets1", &offsets1);
+            vertBuilder->codeAppendf("%s = %s;", offsets1.vsOut(),
+                                   ee.inEllipseOffsets1()->fName);
+
+            GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+            // setup pass through color
+            if (!ee.colorIgnored()) {
+                this->setupUniformColor(pb, fragBuilder, args.fOutputColor, &fColorUniform);
+            }
+
+            // Setup position
+            this->setupPosition(pb,
+                                vertBuilder,
+                                gpArgs,
+                                ee.inPosition()->fName,
+                                ee.viewMatrix(),
+                                &fViewMatrixUniform);
+
+            // emit transforms
+            this->emitTransforms(args.fPB,
+                                 vertBuilder,
+                                 varyingHandler,
+                                 gpArgs->fPositionVar,
+                                 ee.inPosition()->fName,
+                                 args.fTransformsIn,
+                                 args.fTransformsOut);
+
+            SkAssertResult(fragBuilder->enableFeature(
+                    GrGLSLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));
             // for outer curve
-            builder->fsCodeAppendf("\tvec2 scaledOffset = %s.xy;\n", fsOffsetName0);
-            builder->fsCodeAppend("\tfloat test = dot(scaledOffset, scaledOffset) - 1.0;\n");
-            builder->fsCodeAppendf("\tvec2 duvdx = dFdx(%s);\n", fsOffsetName0);
-            builder->fsCodeAppendf("\tvec2 duvdy = dFdy(%s);\n", fsOffsetName0);
-            builder->fsCodeAppendf("\tvec2 grad = vec2(2.0*%s.x*duvdx.x + 2.0*%s.y*duvdx.y,\n"
-                                   "\t                 2.0*%s.x*duvdy.x + 2.0*%s.y*duvdy.y);\n",
-                                   fsOffsetName0, fsOffsetName0, fsOffsetName0, fsOffsetName0);
+            fragBuilder->codeAppendf("vec2 scaledOffset = %s.xy;", offsets0.fsIn());
+            fragBuilder->codeAppend("float test = dot(scaledOffset, scaledOffset) - 1.0;");
+            fragBuilder->codeAppendf("vec2 duvdx = dFdx(%s);", offsets0.fsIn());
+            fragBuilder->codeAppendf("vec2 duvdy = dFdy(%s);", offsets0.fsIn());
+            fragBuilder->codeAppendf("vec2 grad = vec2(2.0*%s.x*duvdx.x + 2.0*%s.y*duvdx.y,"
+                                     "                 2.0*%s.x*duvdy.x + 2.0*%s.y*duvdy.y);",
+                                     offsets0.fsIn(), offsets0.fsIn(), offsets0.fsIn(), offsets0.fsIn());
 
-            builder->fsCodeAppend("\tfloat grad_dot = dot(grad, grad);\n");
+            fragBuilder->codeAppend("float grad_dot = dot(grad, grad);");
             // avoid calling inversesqrt on zero.
-            builder->fsCodeAppend("\tgrad_dot = max(grad_dot, 1.0e-4);\n");
-            builder->fsCodeAppend("\tfloat invlen = inversesqrt(grad_dot);\n");
-            if (kHairline == ellipseEffect.getMode()) {
+            fragBuilder->codeAppend("grad_dot = max(grad_dot, 1.0e-4);");
+            fragBuilder->codeAppend("float invlen = inversesqrt(grad_dot);");
+            if (kHairline == ee.getMode()) {
                 // can probably do this with one step
-                builder->fsCodeAppend("\tfloat edgeAlpha = clamp(1.0-test*invlen, 0.0, 1.0);\n");
-                builder->fsCodeAppend("\tedgeAlpha *= clamp(1.0+test*invlen, 0.0, 1.0);\n");
+                fragBuilder->codeAppend("float edgeAlpha = clamp(1.0-test*invlen, 0.0, 1.0);");
+                fragBuilder->codeAppend("edgeAlpha *= clamp(1.0+test*invlen, 0.0, 1.0);");
             } else {
-                builder->fsCodeAppend("\tfloat edgeAlpha = clamp(0.5-test*invlen, 0.0, 1.0);\n");
+                fragBuilder->codeAppend("float edgeAlpha = clamp(0.5-test*invlen, 0.0, 1.0);");
             }
 
             // for inner curve
-            if (kStroke == ellipseEffect.getMode()) {
-                builder->fsCodeAppendf("\tscaledOffset = %s.xy;\n", fsOffsetName1);
-                builder->fsCodeAppend("\ttest = dot(scaledOffset, scaledOffset) - 1.0;\n");
-                builder->fsCodeAppendf("\tduvdx = dFdx(%s);\n", fsOffsetName1);
-                builder->fsCodeAppendf("\tduvdy = dFdy(%s);\n", fsOffsetName1);
-                builder->fsCodeAppendf("\tgrad = vec2(2.0*%s.x*duvdx.x + 2.0*%s.y*duvdx.y,\n"
-                                       "\t            2.0*%s.x*duvdy.x + 2.0*%s.y*duvdy.y);\n",
-                                       fsOffsetName1, fsOffsetName1, fsOffsetName1, fsOffsetName1);
-                builder->fsCodeAppend("\tinvlen = inversesqrt(dot(grad, grad));\n");
-                builder->fsCodeAppend("\tedgeAlpha *= clamp(0.5+test*invlen, 0.0, 1.0);\n");
+            if (kStroke == ee.getMode()) {
+                fragBuilder->codeAppendf("scaledOffset = %s.xy;", offsets1.fsIn());
+                fragBuilder->codeAppend("test = dot(scaledOffset, scaledOffset) - 1.0;");
+                fragBuilder->codeAppendf("duvdx = dFdx(%s);", offsets1.fsIn());
+                fragBuilder->codeAppendf("duvdy = dFdy(%s);", offsets1.fsIn());
+                fragBuilder->codeAppendf("grad = vec2(2.0*%s.x*duvdx.x + 2.0*%s.y*duvdx.y,"
+                                         "            2.0*%s.x*duvdy.x + 2.0*%s.y*duvdy.y);",
+                                         offsets1.fsIn(), offsets1.fsIn(), offsets1.fsIn(),
+                                         offsets1.fsIn());
+                fragBuilder->codeAppend("invlen = inversesqrt(dot(grad, grad));");
+                fragBuilder->codeAppend("edgeAlpha *= clamp(0.5+test*invlen, 0.0, 1.0);");
             }
 
-            builder->fsCodeAppendf("\t%s = %s;\n", outputColor,
-                                   (GrGLSLExpr4(inputColor) * GrGLSLExpr1("edgeAlpha")).c_str());
+            fragBuilder->codeAppendf("%s = vec4(edgeAlpha);", args.fOutputCoverage);
         }
 
-        static void GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
-                           GrEffectKeyBuilder* b) {
-            const DIEllipseEdgeEffect& ellipseEffect =
-                drawEffect.castEffect<DIEllipseEdgeEffect>();
-
-            b->add32(ellipseEffect.getMode());
+        static void GenKey(const GrGeometryProcessor& gp,
+                           const GrGLSLCaps&,
+                           GrProcessorKeyBuilder* b) {
+            const DIEllipseEdgeEffect& ellipseEffect = gp.cast<DIEllipseEdgeEffect>();
+            uint16_t key = ellipseEffect.getMode();
+            key |= ellipseEffect.colorIgnored() << 9;
+            key |= ComputePosKey(ellipseEffect.viewMatrix()) << 10;
+            b->add32(key);
         }
 
-        virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE {
+        void setData(const GrGLSLProgramDataManager& pdman,
+                     const GrPrimitiveProcessor& gp) override {
+            const DIEllipseEdgeEffect& dee = gp.cast<DIEllipseEdgeEffect>();
+
+            if (!dee.viewMatrix().isIdentity() && !fViewMatrix.cheapEqualTo(dee.viewMatrix())) {
+                fViewMatrix = dee.viewMatrix();
+                float viewMatrix[3 * 3];
+                GrGLSLGetMatrix<3>(viewMatrix, fViewMatrix);
+                pdman.setMatrix3f(fViewMatrixUniform, viewMatrix);
+            }
+
+            if (dee.color() != fColor) {
+                float c[4];
+                GrColorToRGBAFloat(dee.color(), c);
+                pdman.set4fv(fColorUniform, 1, c);
+                fColor = dee.color();
+            }
         }
 
     private:
-        typedef GrGLVertexEffect INHERITED;
+        SkMatrix fViewMatrix;
+        GrColor fColor;
+        UniformHandle fColorUniform;
+        UniformHandle fViewMatrixUniform;
+
+        typedef GrGLSLGeometryProcessor INHERITED;
     };
 
+    void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {
+        GLSLProcessor::GenKey(*this, caps, b);
+    }
+
+    GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override {
+        return new GLSLProcessor();
+    }
+
 private:
-    DIEllipseEdgeEffect(Mode mode) : GrVertexEffect() {
-        this->addVertexAttrib(kVec2f_GrSLType);
-        this->addVertexAttrib(kVec2f_GrSLType);
+    DIEllipseEdgeEffect(GrColor color, const SkMatrix& viewMatrix, Mode mode,
+                        bool usesLocalCoords)
+        : fColor(color)
+        , fViewMatrix(viewMatrix)
+        , fUsesLocalCoords(usesLocalCoords) {
+        this->initClassID<DIEllipseEdgeEffect>();
+        fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType,
+                                                       kHigh_GrSLPrecision));
+        fInEllipseOffsets0 = &this->addVertexAttrib(Attribute("inEllipseOffsets0",
+                                                              kVec2f_GrVertexAttribType));
+        fInEllipseOffsets1 = &this->addVertexAttrib(Attribute("inEllipseOffsets1",
+                                                              kVec2f_GrVertexAttribType));
         fMode = mode;
     }
 
-    virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE {
-        const DIEllipseEdgeEffect& eee = CastEffect<DIEllipseEdgeEffect>(other);
-        return eee.fMode == fMode;
-    }
-
+    const Attribute* fInPosition;
+    const Attribute* fInEllipseOffsets0;
+    const Attribute* fInEllipseOffsets1;
+    GrColor fColor;
+    SkMatrix fViewMatrix;
     Mode fMode;
+    bool fUsesLocalCoords;
 
-    GR_DECLARE_EFFECT_TEST;
+    GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
 
-    typedef GrVertexEffect INHERITED;
+    typedef GrGeometryProcessor INHERITED;
 };
 
-GR_DEFINE_EFFECT_TEST(DIEllipseEdgeEffect);
+GR_DEFINE_GEOMETRY_PROCESSOR_TEST(DIEllipseEdgeEffect);
 
-GrEffect* DIEllipseEdgeEffect::TestCreate(SkRandom* random,
-                                          GrContext* context,
-                                          const GrDrawTargetCaps&,
-                                          GrTexture* textures[]) {
-    return DIEllipseEdgeEffect::Create((Mode)(random->nextRangeU(0,2)));
+const GrGeometryProcessor* DIEllipseEdgeEffect::TestCreate(GrProcessorTestData* d) {
+    return DIEllipseEdgeEffect::Create(GrRandomColor(d->fRandom),
+                                       GrTest::TestMatrix(d->fRandom),
+                                       (Mode)(d->fRandom->nextRangeU(0,2)),
+                                       d->fRandom->nextBool());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void GrOvalRenderer::reset() {
-    SkSafeSetNull(fRRectIndexBuffer);
-}
-
-bool GrOvalRenderer::drawOval(GrDrawTarget* target, const GrContext* context, bool useAA,
-                              const SkRect& oval, const SkStrokeRec& stroke)
-{
-    bool useCoverageAA = useAA &&
-        !target->getDrawState().getRenderTarget()->isMultisampled() &&
-        !target->shouldDisableCoverageAAForBlend();
+bool GrOvalRenderer::DrawOval(GrDrawTarget* target,
+                              const GrPipelineBuilder& pipelineBuilder,
+                              GrColor color,
+                              const SkMatrix& viewMatrix,
+                              bool useAA,
+                              const SkRect& oval,
+                              const SkStrokeRec& stroke) {
+    bool useCoverageAA = useAA && !pipelineBuilder.getRenderTarget()->isUnifiedMultisampled();
 
     if (!useCoverageAA) {
         return false;
     }
 
-    const SkMatrix& vm = context->getMatrix();
-
     // we can draw circles
-    if (SkScalarNearlyEqual(oval.width(), oval.height())
-        && circle_stays_circle(vm)) {
-        this->drawCircle(target, useCoverageAA, oval, stroke);
+    if (SkScalarNearlyEqual(oval.width(), oval.height()) && circle_stays_circle(viewMatrix)) {
+        DrawCircle(target, pipelineBuilder, color, viewMatrix, useCoverageAA, oval, stroke);
     // if we have shader derivative support, render as device-independent
-    } else if (target->caps()->shaderDerivativeSupport()) {
-        return this->drawDIEllipse(target, useCoverageAA, oval, stroke);
+    } else if (target->caps()->shaderCaps()->shaderDerivativeSupport()) {
+        return DrawDIEllipse(target, pipelineBuilder, color, viewMatrix, useCoverageAA, oval,
+                             stroke);
     // otherwise axis-aligned ellipses only
-    } else if (vm.rectStaysRect()) {
-        return this->drawEllipse(target, useCoverageAA, oval, stroke);
+    } else if (viewMatrix.rectStaysRect()) {
+        return DrawEllipse(target, pipelineBuilder, color, viewMatrix, useCoverageAA, oval,
+                           stroke);
     } else {
         return false;
     }
@@ -488,40 +635,184 @@ bool GrOvalRenderer::drawOval(GrDrawTarget* target, const GrContext* context, bo
 
 ///////////////////////////////////////////////////////////////////////////////
 
-// position + edge
-extern const GrVertexAttrib gCircleVertexAttribs[] = {
-    {kVec2f_GrVertexAttribType, 0,               kPosition_GrVertexAttribBinding},
-    {kVec4f_GrVertexAttribType, sizeof(SkPoint), kEffect_GrVertexAttribBinding}
+class CircleBatch : public GrVertexBatch {
+public:
+    DEFINE_BATCH_CLASS_ID
+
+    struct Geometry {
+        SkMatrix fViewMatrix;
+        SkRect fDevBounds;
+        SkScalar fInnerRadius;
+        SkScalar fOuterRadius;
+        GrColor fColor;
+        bool fStroke;
+    };
+
+    static GrDrawBatch* Create(const Geometry& geometry) { return new CircleBatch(geometry); }
+
+    const char* name() const override { return "CircleBatch"; }
+
+    SkString dumpInfo() const override {
+        SkString string;
+        for (int i = 0; i < fGeoData.count(); ++i) {
+            string.appendf("Color: 0x%08x Rect [L: %.2f, T: %.2f, R: %.2f, B: %.2f],"
+                           "InnerRad: %.2f, OuterRad: %.2f\n",
+                           fGeoData[i].fColor,
+                           fGeoData[i].fDevBounds.fLeft, fGeoData[i].fDevBounds.fTop,
+                           fGeoData[i].fDevBounds.fRight, fGeoData[i].fDevBounds.fBottom,
+                           fGeoData[i].fInnerRadius,
+                           fGeoData[i].fOuterRadius);
+        }
+        string.append(INHERITED::dumpInfo());
+        return string;
+    }
+
+    void computePipelineOptimizations(GrInitInvariantOutput* color, 
+                                      GrInitInvariantOutput* coverage,
+                                      GrBatchToXPOverrides* overrides) const override {
+        // When this is called on a batch, there is only one geometry bundle
+        color->setKnownFourComponents(fGeoData[0].fColor);
+        coverage->setUnknownSingleComponent();
+        overrides->fUsePLSDstRead = false;
+    }
+
+private:
+    void initBatchTracker(const GrXPOverridesForBatch& overrides) override {
+        // Handle any color overrides
+        if (!overrides.readsColor()) {
+            fGeoData[0].fColor = GrColor_ILLEGAL;
+        }
+        overrides.getOverrideColorIfSet(&fGeoData[0].fColor);
+
+        // setup batch properties
+        fBatch.fColorIgnored = !overrides.readsColor();
+        fBatch.fColor = fGeoData[0].fColor;
+        fBatch.fStroke = fGeoData[0].fStroke;
+        fBatch.fUsesLocalCoords = overrides.readsLocalCoords();
+        fBatch.fCoverageIgnored = !overrides.readsCoverage();
+    }
+
+    void onPrepareDraws(Target* target) const override {
+        SkMatrix invert;
+        if (!this->viewMatrix().invert(&invert)) {
+            return;
+        }
+
+        // Setup geometry processor
+        SkAutoTUnref<GrGeometryProcessor> gp(CircleEdgeEffect::Create(this->color(),
+                                                                      this->stroke(),
+                                                                      invert,
+                                                                      this->usesLocalCoords()));
+
+        target->initDraw(gp, this->pipeline());
+
+        int instanceCount = fGeoData.count();
+        size_t vertexStride = gp->getVertexStride();
+        SkASSERT(vertexStride == sizeof(CircleVertex));
+        QuadHelper helper;
+        CircleVertex* verts = reinterpret_cast<CircleVertex*>(helper.init(target, vertexStride,
+                                                                          instanceCount));
+        if (!verts) {
+            return;
+        }
+
+        for (int i = 0; i < instanceCount; i++) {
+            const Geometry& geom = fGeoData[i];
+
+            SkScalar innerRadius = geom.fInnerRadius;
+            SkScalar outerRadius = geom.fOuterRadius;
+
+            const SkRect& bounds = geom.fDevBounds;
+
+            // The inner radius in the vertex data must be specified in normalized space.
+            innerRadius = innerRadius / outerRadius;
+            verts[0].fPos = SkPoint::Make(bounds.fLeft,  bounds.fTop);
+            verts[0].fOffset = SkPoint::Make(-1, -1);
+            verts[0].fOuterRadius = outerRadius;
+            verts[0].fInnerRadius = innerRadius;
+
+            verts[1].fPos = SkPoint::Make(bounds.fLeft,  bounds.fBottom);
+            verts[1].fOffset = SkPoint::Make(-1, 1);
+            verts[1].fOuterRadius = outerRadius;
+            verts[1].fInnerRadius = innerRadius;
+
+            verts[2].fPos = SkPoint::Make(bounds.fRight, bounds.fBottom);
+            verts[2].fOffset = SkPoint::Make(1, 1);
+            verts[2].fOuterRadius = outerRadius;
+            verts[2].fInnerRadius = innerRadius;
+
+            verts[3].fPos = SkPoint::Make(bounds.fRight, bounds.fTop);
+            verts[3].fOffset = SkPoint::Make(1, -1);
+            verts[3].fOuterRadius = outerRadius;
+            verts[3].fInnerRadius = innerRadius;
+
+            verts += kVerticesPerQuad;
+        }
+        helper.recordDraw(target);
+    }
+
+    SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
+
+    CircleBatch(const Geometry& geometry) : INHERITED(ClassID()) {
+        fGeoData.push_back(geometry);
+
+        this->setBounds(geometry.fDevBounds);
+    }
+
+    bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override {
+        CircleBatch* that = t->cast<CircleBatch>();
+        if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *that->pipeline(),
+                                    that->bounds(), caps)) {
+            return false;
+        }
+
+        // TODO use vertex color to avoid breaking batches
+        if (this->color() != that->color()) {
+            return false;
+        }
+
+        if (this->stroke() != that->stroke()) {
+            return false;
+        }
+
+        SkASSERT(this->usesLocalCoords() == that->usesLocalCoords());
+        if (this->usesLocalCoords() && !this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
+            return false;
+        }
+
+        fGeoData.push_back_n(that->geoData()->count(), that->geoData()->begin());
+        this->joinBounds(that->bounds());
+        return true;
+    }
+
+    GrColor color() const { return fBatch.fColor; }
+    bool usesLocalCoords() const { return fBatch.fUsesLocalCoords; }
+    const SkMatrix& viewMatrix() const { return fGeoData[0].fViewMatrix; }
+    bool stroke() const { return fBatch.fStroke; }
+
+    struct BatchTracker {
+        GrColor fColor;
+        bool fStroke;
+        bool fUsesLocalCoords;
+        bool fColorIgnored;
+        bool fCoverageIgnored;
+    };
+
+    BatchTracker fBatch;
+    SkSTArray<1, Geometry, true> fGeoData;
+
+    typedef GrVertexBatch INHERITED;
 };
 
-void GrOvalRenderer::drawCircle(GrDrawTarget* target,
-                                bool useCoverageAA,
-                                const SkRect& circle,
-                                const SkStrokeRec& stroke)
-{
-    GrDrawState* drawState = target->drawState();
-
-    const SkMatrix& vm = drawState->getViewMatrix();
+static GrDrawBatch* create_circle_batch(GrColor color,
+                                        const SkMatrix& viewMatrix,
+                                        bool useCoverageAA,
+                                        const SkRect& circle,
+                                        const SkStrokeRec& stroke) {
     SkPoint center = SkPoint::Make(circle.centerX(), circle.centerY());
-    vm.mapPoints(&center, 1);
-    SkScalar radius = vm.mapRadius(SkScalarHalf(circle.width()));
-    SkScalar strokeWidth = vm.mapRadius(stroke.getWidth());
-
-    GrDrawState::AutoViewMatrixRestore avmr;
-    if (!avmr.setIdentity(drawState)) {
-        return;
-    }
-
-    drawState->setVertexAttribs<gCircleVertexAttribs>(SK_ARRAY_COUNT(gCircleVertexAttribs));
-    SkASSERT(sizeof(CircleVertex) == drawState->getVertexSize());
-
-    GrDrawTarget::AutoReleaseGeometry geo(target, 4, 0);
-    if (!geo.succeeded()) {
-        GrPrintf("Failed to get space for vertices!\n");
-        return;
-    }
-
-    CircleVertex* verts = reinterpret_cast<CircleVertex*>(geo.vertices());
+    viewMatrix.mapPoints(&center, 1);
+    SkScalar radius = viewMatrix.mapRadius(SkScalarHalf(circle.width()));
+    SkScalar strokeWidth = viewMatrix.mapRadius(stroke.getWidth());
 
     SkStrokeRec::Style style = stroke.getStyle();
     bool isStrokeOnly = SkStrokeRec::kStroke_Style == style ||
@@ -544,93 +835,231 @@ void GrOvalRenderer::drawCircle(GrDrawTarget* target,
         }
     }
 
-    GrEffect* effect = CircleEdgeEffect::Create(isStrokeOnly && innerRadius > 0);
-    static const int kCircleEdgeAttrIndex = 1;
-    drawState->addCoverageEffect(effect, kCircleEdgeAttrIndex)->unref();
-
-    // The radii are outset for two reasons. First, it allows the shader to simply perform
-    // clamp(distance-to-center - radius, 0, 1). Second, the outer radius is used to compute the
-    // verts of the bounding box that is rendered and the outset ensures the box will cover all
-    // pixels partially covered by the circle.
+    // The radii are outset for two reasons. First, it allows the shader to simply perform simpler
+    // computation because the computed alpha is zero, rather than 50%, at the radius.
+    // Second, the outer radius is used to compute the verts of the bounding box that is rendered
+    // and the outset ensures the box will cover all partially covered by the circle.
     outerRadius += SK_ScalarHalf;
     innerRadius -= SK_ScalarHalf;
 
-    SkRect bounds = SkRect::MakeLTRB(
-        center.fX - outerRadius,
-        center.fY - outerRadius,
-        center.fX + outerRadius,
-        center.fY + outerRadius
-    );
+    CircleBatch::Geometry geometry;
+    geometry.fViewMatrix = viewMatrix;
+    geometry.fColor = color;
+    geometry.fInnerRadius = innerRadius;
+    geometry.fOuterRadius = outerRadius;
+    geometry.fStroke = isStrokeOnly && innerRadius > 0;
+    geometry.fDevBounds = SkRect::MakeLTRB(center.fX - outerRadius, center.fY - outerRadius,
+                                           center.fX + outerRadius, center.fY + outerRadius);
 
-    verts[0].fPos = SkPoint::Make(bounds.fLeft,  bounds.fTop);
-    verts[0].fOffset = SkPoint::Make(-outerRadius, -outerRadius);
-    verts[0].fOuterRadius = outerRadius;
-    verts[0].fInnerRadius = innerRadius;
+    return CircleBatch::Create(geometry);
+}
 
-    verts[1].fPos = SkPoint::Make(bounds.fRight, bounds.fTop);
-    verts[1].fOffset = SkPoint::Make(outerRadius, -outerRadius);
-    verts[1].fOuterRadius = outerRadius;
-    verts[1].fInnerRadius = innerRadius;
-
-    verts[2].fPos = SkPoint::Make(bounds.fLeft,  bounds.fBottom);
-    verts[2].fOffset = SkPoint::Make(-outerRadius, outerRadius);
-    verts[2].fOuterRadius = outerRadius;
-    verts[2].fInnerRadius = innerRadius;
-
-    verts[3].fPos = SkPoint::Make(bounds.fRight, bounds.fBottom);
-    verts[3].fOffset = SkPoint::Make(outerRadius, outerRadius);
-    verts[3].fOuterRadius = outerRadius;
-    verts[3].fInnerRadius = innerRadius;
-
-    target->drawNonIndexed(kTriangleStrip_GrPrimitiveType, 0, 4, &bounds);
+void GrOvalRenderer::DrawCircle(GrDrawTarget* target,
+                                const GrPipelineBuilder& pipelineBuilder,
+                                GrColor color,
+                                const SkMatrix& viewMatrix,
+                                bool useCoverageAA,
+                                const SkRect& circle,
+                                const SkStrokeRec& stroke) {
+    SkAutoTUnref<GrDrawBatch> batch(create_circle_batch(color, viewMatrix, useCoverageAA, circle,
+                                                        stroke));
+    target->drawBatch(pipelineBuilder, batch);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-// position + offset + 1/radii
-extern const GrVertexAttrib gEllipseVertexAttribs[] = {
-    {kVec2f_GrVertexAttribType, 0,                 kPosition_GrVertexAttribBinding},
-    {kVec2f_GrVertexAttribType, sizeof(SkPoint),   kEffect_GrVertexAttribBinding},
-    {kVec4f_GrVertexAttribType, 2*sizeof(SkPoint), kEffect_GrVertexAttribBinding}
+class EllipseBatch : public GrVertexBatch {
+public:
+    DEFINE_BATCH_CLASS_ID
+
+    struct Geometry {
+        SkMatrix fViewMatrix;
+        SkRect fDevBounds;
+        SkScalar fXRadius;
+        SkScalar fYRadius;
+        SkScalar fInnerXRadius;
+        SkScalar fInnerYRadius;
+        GrColor fColor;
+        bool fStroke;
+    };
+
+    static GrDrawBatch* Create(const Geometry& geometry) { return new EllipseBatch(geometry); }
+
+    const char* name() const override { return "EllipseBatch"; }
+
+    void computePipelineOptimizations(GrInitInvariantOutput* color, 
+                                      GrInitInvariantOutput* coverage,
+                                      GrBatchToXPOverrides* overrides) const override {
+        // When this is called on a batch, there is only one geometry bundle
+        color->setKnownFourComponents(fGeoData[0].fColor);
+        coverage->setUnknownSingleComponent();
+        overrides->fUsePLSDstRead = false;
+    }
+
+private:
+    void initBatchTracker(const GrXPOverridesForBatch& overrides) override {
+        // Handle any color overrides
+        if (!overrides.readsCoverage()) {
+            fGeoData[0].fColor = GrColor_ILLEGAL;
+        }
+        overrides.getOverrideColorIfSet(&fGeoData[0].fColor);
+
+        // setup batch properties
+        fBatch.fColorIgnored = !overrides.readsColor();
+        fBatch.fColor = fGeoData[0].fColor;
+        fBatch.fStroke = fGeoData[0].fStroke;
+        fBatch.fUsesLocalCoords = overrides.readsLocalCoords();
+        fBatch.fCoverageIgnored = !overrides.readsCoverage();
+    }
+
+    void onPrepareDraws(Target* target) const override {
+        SkMatrix invert;
+        if (!this->viewMatrix().invert(&invert)) {
+            return;
+        }
+
+        // Setup geometry processor
+        SkAutoTUnref<GrGeometryProcessor> gp(EllipseEdgeEffect::Create(this->color(),
+                                                                       this->stroke(),
+                                                                       invert,
+                                                                       this->usesLocalCoords()));
+
+        target->initDraw(gp, this->pipeline());
+
+        int instanceCount = fGeoData.count();
+        QuadHelper helper;
+        size_t vertexStride = gp->getVertexStride();
+        SkASSERT(vertexStride == sizeof(EllipseVertex));
+        EllipseVertex* verts = reinterpret_cast<EllipseVertex*>(
+            helper.init(target, vertexStride, instanceCount));
+        if (!verts) {
+            return;
+        }
+
+        for (int i = 0; i < instanceCount; i++) {
+            const Geometry& geom = fGeoData[i];
+
+            SkScalar xRadius = geom.fXRadius;
+            SkScalar yRadius = geom.fYRadius;
+
+            // Compute the reciprocals of the radii here to save time in the shader
+            SkScalar xRadRecip = SkScalarInvert(xRadius);
+            SkScalar yRadRecip = SkScalarInvert(yRadius);
+            SkScalar xInnerRadRecip = SkScalarInvert(geom.fInnerXRadius);
+            SkScalar yInnerRadRecip = SkScalarInvert(geom.fInnerYRadius);
+
+            const SkRect& bounds = geom.fDevBounds;
+
+            // The inner radius in the vertex data must be specified in normalized space.
+            verts[0].fPos = SkPoint::Make(bounds.fLeft,  bounds.fTop);
+            verts[0].fOffset = SkPoint::Make(-xRadius, -yRadius);
+            verts[0].fOuterRadii = SkPoint::Make(xRadRecip, yRadRecip);
+            verts[0].fInnerRadii = SkPoint::Make(xInnerRadRecip, yInnerRadRecip);
+
+            verts[1].fPos = SkPoint::Make(bounds.fLeft,  bounds.fBottom);
+            verts[1].fOffset = SkPoint::Make(-xRadius, yRadius);
+            verts[1].fOuterRadii = SkPoint::Make(xRadRecip, yRadRecip);
+            verts[1].fInnerRadii = SkPoint::Make(xInnerRadRecip, yInnerRadRecip);
+
+            verts[2].fPos = SkPoint::Make(bounds.fRight, bounds.fBottom);
+            verts[2].fOffset = SkPoint::Make(xRadius, yRadius);
+            verts[2].fOuterRadii = SkPoint::Make(xRadRecip, yRadRecip);
+            verts[2].fInnerRadii = SkPoint::Make(xInnerRadRecip, yInnerRadRecip);
+
+            verts[3].fPos = SkPoint::Make(bounds.fRight, bounds.fTop);
+            verts[3].fOffset = SkPoint::Make(xRadius, -yRadius);
+            verts[3].fOuterRadii = SkPoint::Make(xRadRecip, yRadRecip);
+            verts[3].fInnerRadii = SkPoint::Make(xInnerRadRecip, yInnerRadRecip);
+
+            verts += kVerticesPerQuad;
+        }
+        helper.recordDraw(target);
+    }
+
+    SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
+
+    EllipseBatch(const Geometry& geometry) : INHERITED(ClassID()) {
+        fGeoData.push_back(geometry);
+
+        this->setBounds(geometry.fDevBounds);
+    }
+
+    bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override {
+        EllipseBatch* that = t->cast<EllipseBatch>();
+
+        if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *that->pipeline(),
+                                    that->bounds(), caps)) {
+            return false;
+        }
+
+        // TODO use vertex color to avoid breaking batches
+        if (this->color() != that->color()) {
+            return false;
+        }
+
+        if (this->stroke() != that->stroke()) {
+            return false;
+        }
+
+        SkASSERT(this->usesLocalCoords() == that->usesLocalCoords());
+        if (this->usesLocalCoords() && !this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
+            return false;
+        }
+
+        fGeoData.push_back_n(that->geoData()->count(), that->geoData()->begin());
+        this->joinBounds(that->bounds());
+        return true;
+    }
+
+    GrColor color() const { return fBatch.fColor; }
+    bool usesLocalCoords() const { return fBatch.fUsesLocalCoords; }
+    const SkMatrix& viewMatrix() const { return fGeoData[0].fViewMatrix; }
+    bool stroke() const { return fBatch.fStroke; }
+
+    struct BatchTracker {
+        GrColor fColor;
+        bool fStroke;
+        bool fUsesLocalCoords;
+        bool fColorIgnored;
+        bool fCoverageIgnored;
+    };
+
+    BatchTracker fBatch;
+    SkSTArray<1, Geometry, true> fGeoData;
+
+    typedef GrVertexBatch INHERITED;
 };
 
-// position + offsets
-extern const GrVertexAttrib gDIEllipseVertexAttribs[] = {
-    {kVec2f_GrVertexAttribType, 0,                 kPosition_GrVertexAttribBinding},
-    {kVec2f_GrVertexAttribType, sizeof(SkPoint),   kEffect_GrVertexAttribBinding},
-    {kVec2f_GrVertexAttribType, 2*sizeof(SkPoint), kEffect_GrVertexAttribBinding},
-};
-
-bool GrOvalRenderer::drawEllipse(GrDrawTarget* target,
-                                 bool useCoverageAA,
-                                 const SkRect& ellipse,
-                                 const SkStrokeRec& stroke)
-{
-    GrDrawState* drawState = target->drawState();
+static GrDrawBatch* create_ellipse_batch(GrColor color,
+                                         const SkMatrix& viewMatrix,
+                                         bool useCoverageAA,
+                                         const SkRect& ellipse,
+                                         const SkStrokeRec& stroke) {
 #ifdef SK_DEBUG
     {
         // we should have checked for this previously
-        bool isAxisAlignedEllipse = drawState->getViewMatrix().rectStaysRect();
+        bool isAxisAlignedEllipse = viewMatrix.rectStaysRect();
         SkASSERT(useCoverageAA && isAxisAlignedEllipse);
     }
 #endif
 
     // do any matrix crunching before we reset the draw state for device coords
-    const SkMatrix& vm = drawState->getViewMatrix();
     SkPoint center = SkPoint::Make(ellipse.centerX(), ellipse.centerY());
-    vm.mapPoints(&center, 1);
+    viewMatrix.mapPoints(&center, 1);
     SkScalar ellipseXRadius = SkScalarHalf(ellipse.width());
     SkScalar ellipseYRadius = SkScalarHalf(ellipse.height());
-    SkScalar xRadius = SkScalarAbs(vm[SkMatrix::kMScaleX]*ellipseXRadius +
-                                   vm[SkMatrix::kMSkewY]*ellipseYRadius);
-    SkScalar yRadius = SkScalarAbs(vm[SkMatrix::kMSkewX]*ellipseXRadius +
-                                   vm[SkMatrix::kMScaleY]*ellipseYRadius);
+    SkScalar xRadius = SkScalarAbs(viewMatrix[SkMatrix::kMScaleX]*ellipseXRadius +
+                                   viewMatrix[SkMatrix::kMSkewY]*ellipseYRadius);
+    SkScalar yRadius = SkScalarAbs(viewMatrix[SkMatrix::kMSkewX]*ellipseXRadius +
+                                   viewMatrix[SkMatrix::kMScaleY]*ellipseYRadius);
 
     // do (potentially) anisotropic mapping of stroke
     SkVector scaledStroke;
     SkScalar strokeWidth = stroke.getWidth();
-    scaledStroke.fX = SkScalarAbs(strokeWidth*(vm[SkMatrix::kMScaleX] + vm[SkMatrix::kMSkewY]));
-    scaledStroke.fY = SkScalarAbs(strokeWidth*(vm[SkMatrix::kMSkewX] + vm[SkMatrix::kMScaleY]));
+    scaledStroke.fX = SkScalarAbs(strokeWidth*(viewMatrix[SkMatrix::kMScaleX] +
+                                               viewMatrix[SkMatrix::kMSkewY]));
+    scaledStroke.fY = SkScalarAbs(strokeWidth*(viewMatrix[SkMatrix::kMSkewX] +
+                                               viewMatrix[SkMatrix::kMScaleY]));
 
     SkStrokeRec::Style style = stroke.getStyle();
     bool isStrokeOnly = SkStrokeRec::kStroke_Style == style ||
@@ -649,13 +1078,13 @@ bool GrOvalRenderer::drawEllipse(GrDrawTarget* target,
         // we only handle thick strokes for near-circular ellipses
         if (scaledStroke.length() > SK_ScalarHalf &&
             (SK_ScalarHalf*xRadius > yRadius || SK_ScalarHalf*yRadius > xRadius)) {
-            return false;
+            return nullptr;
         }
 
         // we don't handle it if curvature of the stroke is less than curvature of the ellipse
         if (scaledStroke.fX*(yRadius*yRadius) < (scaledStroke.fY*scaledStroke.fY)*xRadius ||
             scaledStroke.fY*(xRadius*xRadius) < (scaledStroke.fX*scaledStroke.fX)*yRadius) {
-            return false;
+            return nullptr;
         }
 
         // this is legit only if scale & translation (which should be the case at the moment)
@@ -668,81 +1097,207 @@ bool GrOvalRenderer::drawEllipse(GrDrawTarget* target,
         yRadius += scaledStroke.fY;
     }
 
-    GrDrawState::AutoViewMatrixRestore avmr;
-    if (!avmr.setIdentity(drawState)) {
-        return false;
-    }
-
-    drawState->setVertexAttribs<gEllipseVertexAttribs>(SK_ARRAY_COUNT(gEllipseVertexAttribs));
-    SkASSERT(sizeof(EllipseVertex) == drawState->getVertexSize());
-
-    GrDrawTarget::AutoReleaseGeometry geo(target, 4, 0);
-    if (!geo.succeeded()) {
-        GrPrintf("Failed to get space for vertices!\n");
-        return false;
-    }
-
-    EllipseVertex* verts = reinterpret_cast<EllipseVertex*>(geo.vertices());
-
-    GrEffect* effect = EllipseEdgeEffect::Create(isStrokeOnly &&
-                                                 innerXRadius > 0 && innerYRadius > 0);
-
-    static const int kEllipseCenterAttrIndex = 1;
-    static const int kEllipseEdgeAttrIndex = 2;
-    drawState->addCoverageEffect(effect, kEllipseCenterAttrIndex, kEllipseEdgeAttrIndex)->unref();
-
-    // Compute the reciprocals of the radii here to save time in the shader
-    SkScalar xRadRecip = SkScalarInvert(xRadius);
-    SkScalar yRadRecip = SkScalarInvert(yRadius);
-    SkScalar xInnerRadRecip = SkScalarInvert(innerXRadius);
-    SkScalar yInnerRadRecip = SkScalarInvert(innerYRadius);
-
     // We've extended the outer x radius out half a pixel to antialias.
     // This will also expand the rect so all the pixels will be captured.
     // TODO: Consider if we should use sqrt(2)/2 instead
     xRadius += SK_ScalarHalf;
     yRadius += SK_ScalarHalf;
 
-    SkRect bounds = SkRect::MakeLTRB(
-        center.fX - xRadius,
-        center.fY - yRadius,
-        center.fX + xRadius,
-        center.fY + yRadius
-    );
+    EllipseBatch::Geometry geometry;
+    geometry.fViewMatrix = viewMatrix;
+    geometry.fColor = color;
+    geometry.fXRadius = xRadius;
+    geometry.fYRadius = yRadius;
+    geometry.fInnerXRadius = innerXRadius;
+    geometry.fInnerYRadius = innerYRadius;
+    geometry.fStroke = isStrokeOnly && innerXRadius > 0 && innerYRadius > 0;
+    geometry.fDevBounds = SkRect::MakeLTRB(center.fX - xRadius, center.fY - yRadius,
+                                           center.fX + xRadius, center.fY + yRadius);
 
-    verts[0].fPos = SkPoint::Make(bounds.fLeft,  bounds.fTop);
-    verts[0].fOffset = SkPoint::Make(-xRadius, -yRadius);
-    verts[0].fOuterRadii = SkPoint::Make(xRadRecip, yRadRecip);
-    verts[0].fInnerRadii = SkPoint::Make(xInnerRadRecip, yInnerRadRecip);
+    return EllipseBatch::Create(geometry);
+}
 
-    verts[1].fPos = SkPoint::Make(bounds.fRight, bounds.fTop);
-    verts[1].fOffset = SkPoint::Make(xRadius, -yRadius);
-    verts[1].fOuterRadii = SkPoint::Make(xRadRecip, yRadRecip);
-    verts[1].fInnerRadii = SkPoint::Make(xInnerRadRecip, yInnerRadRecip);
-
-    verts[2].fPos = SkPoint::Make(bounds.fLeft,  bounds.fBottom);
-    verts[2].fOffset = SkPoint::Make(-xRadius, yRadius);
-    verts[2].fOuterRadii = SkPoint::Make(xRadRecip, yRadRecip);
-    verts[2].fInnerRadii = SkPoint::Make(xInnerRadRecip, yInnerRadRecip);
-
-    verts[3].fPos = SkPoint::Make(bounds.fRight, bounds.fBottom);
-    verts[3].fOffset = SkPoint::Make(xRadius, yRadius);
-    verts[3].fOuterRadii = SkPoint::Make(xRadRecip, yRadRecip);
-    verts[3].fInnerRadii = SkPoint::Make(xInnerRadRecip, yInnerRadRecip);
-
-    target->drawNonIndexed(kTriangleStrip_GrPrimitiveType, 0, 4, &bounds);
+bool GrOvalRenderer::DrawEllipse(GrDrawTarget* target,
+                                 const GrPipelineBuilder& pipelineBuilder,
+                                 GrColor color,
+                                 const SkMatrix& viewMatrix,
+                                 bool useCoverageAA,
+                                 const SkRect& ellipse,
+                                 const SkStrokeRec& stroke) {
+    SkAutoTUnref<GrDrawBatch> batch(create_ellipse_batch(color, viewMatrix, useCoverageAA, ellipse,
+                                                         stroke));
+    if (!batch) {
+        return false;
+    }
 
+    target->drawBatch(pipelineBuilder, batch);
     return true;
 }
 
-bool GrOvalRenderer::drawDIEllipse(GrDrawTarget* target,
-                                   bool useCoverageAA,
-                                   const SkRect& ellipse,
-                                   const SkStrokeRec& stroke)
-{
-    GrDrawState* drawState = target->drawState();
-    const SkMatrix& vm = drawState->getViewMatrix();
+/////////////////////////////////////////////////////////////////////////////////////////////////
 
+class DIEllipseBatch : public GrVertexBatch {
+public:
+    DEFINE_BATCH_CLASS_ID
+
+    struct Geometry {
+        SkMatrix fViewMatrix;
+        SkRect fBounds;
+        SkScalar fXRadius;
+        SkScalar fYRadius;
+        SkScalar fInnerXRadius;
+        SkScalar fInnerYRadius;
+        SkScalar fGeoDx;
+        SkScalar fGeoDy;
+        GrColor fColor;
+        DIEllipseEdgeEffect::Mode fMode;
+    };
+
+    static GrDrawBatch* Create(const Geometry& geometry, const SkRect& bounds) {
+        return new DIEllipseBatch(geometry, bounds);
+    }
+
+    const char* name() const override { return "DIEllipseBatch"; }
+
+    void computePipelineOptimizations(GrInitInvariantOutput* color, 
+                                      GrInitInvariantOutput* coverage,
+                                      GrBatchToXPOverrides* overrides) const override {
+        // When this is called on a batch, there is only one geometry bundle
+        color->setKnownFourComponents(fGeoData[0].fColor);
+        coverage->setUnknownSingleComponent();
+        overrides->fUsePLSDstRead = false;
+    }
+
+private:
+
+    void initBatchTracker(const GrXPOverridesForBatch& overrides) override {
+        // Handle any color overrides
+        if (!overrides.readsColor()) {
+            fGeoData[0].fColor = GrColor_ILLEGAL;
+        }
+        overrides.getOverrideColorIfSet(&fGeoData[0].fColor);
+
+        // setup batch properties
+        fBatch.fColorIgnored = !overrides.readsColor();
+        fBatch.fColor = fGeoData[0].fColor;
+        fBatch.fMode = fGeoData[0].fMode;
+        fBatch.fUsesLocalCoords = overrides.readsLocalCoords();
+        fBatch.fCoverageIgnored = !overrides.readsCoverage();
+    }
+
+    void onPrepareDraws(Target* target) const override {
+        // Setup geometry processor
+        SkAutoTUnref<GrGeometryProcessor> gp(DIEllipseEdgeEffect::Create(this->color(),
+                                                                         this->viewMatrix(),
+                                                                         this->mode(),
+                                                                         this->usesLocalCoords()));
+
+        target->initDraw(gp, this->pipeline());
+
+        int instanceCount = fGeoData.count();
+        size_t vertexStride = gp->getVertexStride();
+        SkASSERT(vertexStride == sizeof(DIEllipseVertex));
+        QuadHelper helper;
+        DIEllipseVertex* verts = reinterpret_cast<DIEllipseVertex*>(
+            helper.init(target, vertexStride, instanceCount));
+        if (!verts) {
+            return;
+        }
+
+        for (int i = 0; i < instanceCount; i++) {
+            const Geometry& geom = fGeoData[i];
+
+            SkScalar xRadius = geom.fXRadius;
+            SkScalar yRadius = geom.fYRadius;
+
+            const SkRect& bounds = geom.fBounds;
+
+            // This adjusts the "radius" to include the half-pixel border
+            SkScalar offsetDx = geom.fGeoDx / xRadius;
+            SkScalar offsetDy = geom.fGeoDy / yRadius;
+
+            SkScalar innerRatioX = xRadius / geom.fInnerXRadius;
+            SkScalar innerRatioY = yRadius / geom.fInnerYRadius;
+
+            verts[0].fPos = SkPoint::Make(bounds.fLeft, bounds.fTop);
+            verts[0].fOuterOffset = SkPoint::Make(-1.0f - offsetDx, -1.0f - offsetDy);
+            verts[0].fInnerOffset = SkPoint::Make(-innerRatioX - offsetDx, -innerRatioY - offsetDy);
+
+            verts[1].fPos = SkPoint::Make(bounds.fLeft,  bounds.fBottom);
+            verts[1].fOuterOffset = SkPoint::Make(-1.0f - offsetDx, 1.0f + offsetDy);
+            verts[1].fInnerOffset = SkPoint::Make(-innerRatioX - offsetDx, innerRatioY + offsetDy);
+
+            verts[2].fPos = SkPoint::Make(bounds.fRight, bounds.fBottom);
+            verts[2].fOuterOffset = SkPoint::Make(1.0f + offsetDx, 1.0f + offsetDy);
+            verts[2].fInnerOffset = SkPoint::Make(innerRatioX + offsetDx, innerRatioY + offsetDy);
+
+            verts[3].fPos = SkPoint::Make(bounds.fRight, bounds.fTop);
+            verts[3].fOuterOffset = SkPoint::Make(1.0f + offsetDx, -1.0f - offsetDy);
+            verts[3].fInnerOffset = SkPoint::Make(innerRatioX + offsetDx, -innerRatioY - offsetDy);
+
+            verts += kVerticesPerQuad;
+        }
+        helper.recordDraw(target);
+    }
+
+    SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
+
+    DIEllipseBatch(const Geometry& geometry, const SkRect& bounds) : INHERITED(ClassID()) {
+        fGeoData.push_back(geometry);
+
+        this->setBounds(bounds);
+    }
+
+    bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override {
+        DIEllipseBatch* that = t->cast<DIEllipseBatch>();
+        if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *that->pipeline(),
+                                    that->bounds(), caps)) {
+            return false;
+        }
+
+        // TODO use vertex color to avoid breaking batches
+        if (this->color() != that->color()) {
+            return false;
+        }
+
+        if (this->mode() != that->mode()) {
+            return false;
+        }
+
+        // TODO rewrite to allow positioning on CPU
+        if (!this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
+            return false;
+        }
+
+        fGeoData.push_back_n(that->geoData()->count(), that->geoData()->begin());
+        this->joinBounds(that->bounds());
+        return true;
+    }
+
+    GrColor color() const { return fBatch.fColor; }
+    bool usesLocalCoords() const { return fBatch.fUsesLocalCoords; }
+    const SkMatrix& viewMatrix() const { return fGeoData[0].fViewMatrix; }
+    DIEllipseEdgeEffect::Mode mode() const { return fBatch.fMode; }
+
+    struct BatchTracker {
+        GrColor fColor;
+        DIEllipseEdgeEffect::Mode fMode;
+        bool fUsesLocalCoords;
+        bool fColorIgnored;
+        bool fCoverageIgnored;
+    };
+
+    BatchTracker fBatch;
+    SkSTArray<1, Geometry, true> fGeoData;
+
+    typedef GrVertexBatch INHERITED;
+};
+
+static GrDrawBatch* create_diellipse_batch(GrColor color,
+                                           const SkMatrix& viewMatrix,
+                                           bool useCoverageAA,
+                                           const SkRect& ellipse,
+                                           const SkStrokeRec& stroke) {
     SkPoint center = SkPoint::Make(ellipse.centerX(), ellipse.centerY());
     SkScalar xRadius = SkScalarHalf(ellipse.width());
     SkScalar yRadius = SkScalarHalf(ellipse.height());
@@ -767,13 +1322,13 @@ bool GrOvalRenderer::drawDIEllipse(GrDrawTarget* target,
         // we only handle thick strokes for near-circular ellipses
         if (strokeWidth > SK_ScalarHalf &&
             (SK_ScalarHalf*xRadius > yRadius || SK_ScalarHalf*yRadius > xRadius)) {
-            return false;
+            return nullptr;
         }
 
         // we don't handle it if curvature of the stroke is less than curvature of the ellipse
         if (strokeWidth*(yRadius*yRadius) < (strokeWidth*strokeWidth)*xRadius ||
             strokeWidth*(xRadius*xRadius) < (strokeWidth*strokeWidth)*yRadius) {
-            return false;
+            return nullptr;
         }
 
         // set inner radius (if needed)
@@ -789,63 +1344,46 @@ bool GrOvalRenderer::drawDIEllipse(GrDrawTarget* target,
         mode = (innerXRadius > 0 && innerYRadius > 0) ? DIEllipseEdgeEffect::kStroke :
                                                         DIEllipseEdgeEffect::kFill;
     }
-    SkScalar innerRatioX = SkScalarDiv(xRadius, innerXRadius);
-    SkScalar innerRatioY = SkScalarDiv(yRadius, innerYRadius);
-
-    drawState->setVertexAttribs<gDIEllipseVertexAttribs>(SK_ARRAY_COUNT(gDIEllipseVertexAttribs));
-    SkASSERT(sizeof(DIEllipseVertex) == drawState->getVertexSize());
-
-    GrDrawTarget::AutoReleaseGeometry geo(target, 4, 0);
-    if (!geo.succeeded()) {
-        GrPrintf("Failed to get space for vertices!\n");
-        return false;
-    }
-
-    DIEllipseVertex* verts = reinterpret_cast<DIEllipseVertex*>(geo.vertices());
-
-    GrEffect* effect = DIEllipseEdgeEffect::Create(mode);
-
-    static const int kEllipseOuterOffsetAttrIndex = 1;
-    static const int kEllipseInnerOffsetAttrIndex = 2;
-    drawState->addCoverageEffect(effect, kEllipseOuterOffsetAttrIndex,
-                                         kEllipseInnerOffsetAttrIndex)->unref();
 
     // This expands the outer rect so that after CTM we end up with a half-pixel border
-    SkScalar a = vm[SkMatrix::kMScaleX];
-    SkScalar b = vm[SkMatrix::kMSkewX];
-    SkScalar c = vm[SkMatrix::kMSkewY];
-    SkScalar d = vm[SkMatrix::kMScaleY];
-    SkScalar geoDx = SkScalarDiv(SK_ScalarHalf, SkScalarSqrt(a*a + c*c));
-    SkScalar geoDy = SkScalarDiv(SK_ScalarHalf, SkScalarSqrt(b*b + d*d));
-    // This adjusts the "radius" to include the half-pixel border
-    SkScalar offsetDx = SkScalarDiv(geoDx, xRadius);
-    SkScalar offsetDy = SkScalarDiv(geoDy, yRadius);
+    SkScalar a = viewMatrix[SkMatrix::kMScaleX];
+    SkScalar b = viewMatrix[SkMatrix::kMSkewX];
+    SkScalar c = viewMatrix[SkMatrix::kMSkewY];
+    SkScalar d = viewMatrix[SkMatrix::kMScaleY];
+    SkScalar geoDx = SK_ScalarHalf / SkScalarSqrt(a*a + c*c);
+    SkScalar geoDy = SK_ScalarHalf / SkScalarSqrt(b*b + d*d);
 
-    SkRect bounds = SkRect::MakeLTRB(
-        center.fX - xRadius - geoDx,
-        center.fY - yRadius - geoDy,
-        center.fX + xRadius + geoDx,
-        center.fY + yRadius + geoDy
-    );
+    DIEllipseBatch::Geometry geometry;
+    geometry.fViewMatrix = viewMatrix;
+    geometry.fColor = color;
+    geometry.fXRadius = xRadius;
+    geometry.fYRadius = yRadius;
+    geometry.fInnerXRadius = innerXRadius;
+    geometry.fInnerYRadius = innerYRadius;
+    geometry.fGeoDx = geoDx;
+    geometry.fGeoDy = geoDy;
+    geometry.fMode = mode;
+    geometry.fBounds = SkRect::MakeLTRB(center.fX - xRadius - geoDx, center.fY - yRadius - geoDy,
+                                        center.fX + xRadius + geoDx, center.fY + yRadius + geoDy);
 
-    verts[0].fPos = SkPoint::Make(bounds.fLeft, bounds.fTop);
-    verts[0].fOuterOffset = SkPoint::Make(-1.0f - offsetDx, -1.0f - offsetDy);
-    verts[0].fInnerOffset = SkPoint::Make(-innerRatioX - offsetDx, -innerRatioY - offsetDy);
-
-    verts[1].fPos = SkPoint::Make(bounds.fRight, bounds.fTop);
-    verts[1].fOuterOffset = SkPoint::Make(1.0f + offsetDx, -1.0f - offsetDy);
-    verts[1].fInnerOffset = SkPoint::Make(innerRatioX + offsetDx, -innerRatioY - offsetDy);
-
-    verts[2].fPos = SkPoint::Make(bounds.fLeft,  bounds.fBottom);
-    verts[2].fOuterOffset = SkPoint::Make(-1.0f - offsetDx, 1.0f + offsetDy);
-    verts[2].fInnerOffset = SkPoint::Make(-innerRatioX - offsetDx, innerRatioY + offsetDy);
-
-    verts[3].fPos = SkPoint::Make(bounds.fRight, bounds.fBottom);
-    verts[3].fOuterOffset = SkPoint::Make(1.0f + offsetDx, 1.0f + offsetDy);
-    verts[3].fInnerOffset = SkPoint::Make(innerRatioX + offsetDx, innerRatioY + offsetDy);
-
-    target->drawNonIndexed(kTriangleStrip_GrPrimitiveType, 0, 4, &bounds);
+    SkRect devBounds = geometry.fBounds;
+    viewMatrix.mapRect(&devBounds);
+    return DIEllipseBatch::Create(geometry, devBounds);
+}
 
+bool GrOvalRenderer::DrawDIEllipse(GrDrawTarget* target,
+                                   const GrPipelineBuilder& pipelineBuilder,
+                                   GrColor color,
+                                   const SkMatrix& viewMatrix,
+                                   bool useCoverageAA,
+                                   const SkRect& ellipse,
+                                   const SkStrokeRec& stroke) {
+    SkAutoTUnref<GrDrawBatch> batch(create_diellipse_batch(color, viewMatrix, useCoverageAA,
+                                                           ellipse, stroke));
+    if (!batch) {
+        return false;
+    }
+    target->drawBatch(pipelineBuilder, batch);
     return true;
 }
 
@@ -869,111 +1407,483 @@ static const uint16_t gRRectIndices[] = {
     5, 6, 10, 5, 10, 9
 };
 
+static const int kIndicesPerStrokeRRect = SK_ARRAY_COUNT(gRRectIndices) - 6;
+static const int kIndicesPerRRect = SK_ARRAY_COUNT(gRRectIndices);
+static const int kVertsPerRRect = 16;
+static const int kNumRRectsInIndexBuffer = 256;
+
+GR_DECLARE_STATIC_UNIQUE_KEY(gStrokeRRectOnlyIndexBufferKey);
+GR_DECLARE_STATIC_UNIQUE_KEY(gRRectOnlyIndexBufferKey);
+static const GrIndexBuffer* ref_rrect_index_buffer(bool strokeOnly,
+                                                   GrResourceProvider* resourceProvider) {
+    GR_DEFINE_STATIC_UNIQUE_KEY(gStrokeRRectOnlyIndexBufferKey);
+    GR_DEFINE_STATIC_UNIQUE_KEY(gRRectOnlyIndexBufferKey);
+    if (strokeOnly) {
+        return resourceProvider->findOrCreateInstancedIndexBuffer(
+            gRRectIndices, kIndicesPerStrokeRRect, kNumRRectsInIndexBuffer, kVertsPerRRect,
+            gStrokeRRectOnlyIndexBufferKey);
+    } else {
+        return resourceProvider->findOrCreateInstancedIndexBuffer(
+            gRRectIndices, kIndicesPerRRect, kNumRRectsInIndexBuffer, kVertsPerRRect,
+            gRRectOnlyIndexBufferKey);
 
-GrIndexBuffer* GrOvalRenderer::rRectIndexBuffer(GrGpu* gpu) {
-    if (NULL == fRRectIndexBuffer) {
-        fRRectIndexBuffer =
-        gpu->createIndexBuffer(sizeof(gRRectIndices), false);
-        if (NULL != fRRectIndexBuffer) {
-#ifdef SK_DEBUG
-            bool updated =
-#endif
-            fRRectIndexBuffer->updateData(gRRectIndices,
-                                          sizeof(gRRectIndices));
-            GR_DEBUGASSERT(updated);
-        }
     }
-    return fRRectIndexBuffer;
 }
 
-bool GrOvalRenderer::drawDRRect(GrDrawTarget* target, GrContext* context, bool useAA,
-                                const SkRRect& origOuter, const SkRRect& origInner) {
-    bool applyAA = useAA &&
-                   !target->getDrawState().getRenderTarget()->isMultisampled() &&
-                   !target->shouldDisableCoverageAAForBlend();
-    GrDrawState::AutoRestoreEffects are;
+bool GrOvalRenderer::DrawDRRect(GrDrawTarget* target,
+                                const GrPipelineBuilder& pipelineBuilder,
+                                GrColor color,
+                                const SkMatrix& viewMatrix,
+                                bool useAA,
+                                const SkRRect& origOuter,
+                                const SkRRect& origInner) {
+    bool applyAA = useAA && !pipelineBuilder.getRenderTarget()->isUnifiedMultisampled();
+    GrPipelineBuilder::AutoRestoreFragmentProcessorState arfps;
     if (!origInner.isEmpty()) {
         SkTCopyOnFirstWrite<SkRRect> inner(origInner);
-        if (!context->getMatrix().isIdentity()) {
-            if (!origInner.transform(context->getMatrix(), inner.writable())) {
+        if (!viewMatrix.isIdentity()) {
+            if (!origInner.transform(viewMatrix, inner.writable())) {
                 return false;
             }
         }
-        GrEffectEdgeType edgeType = applyAA ? kInverseFillAA_GrEffectEdgeType :
-                                              kInverseFillBW_GrEffectEdgeType;
-        GrEffect* effect = GrRRectEffect::Create(edgeType, *inner);
-        if (NULL == effect) {
+        GrPrimitiveEdgeType edgeType = applyAA ?
+                kInverseFillAA_GrProcessorEdgeType :
+                kInverseFillBW_GrProcessorEdgeType;
+        // TODO this needs to be a geometry processor
+        GrFragmentProcessor* fp = GrRRectEffect::Create(edgeType, *inner);
+        if (nullptr == fp) {
             return false;
         }
-        are.set(target->drawState());
-        target->drawState()->addCoverageEffect(effect)->unref();
+        arfps.set(&pipelineBuilder);
+        arfps.addCoverageFragmentProcessor(fp)->unref();
     }
 
     SkStrokeRec fillRec(SkStrokeRec::kFill_InitStyle);
-    if (this->drawRRect(target, context, useAA, origOuter, fillRec)) {
+    if (DrawRRect(target, pipelineBuilder, color, viewMatrix, useAA, origOuter, fillRec)) {
         return true;
     }
 
     SkASSERT(!origOuter.isEmpty());
     SkTCopyOnFirstWrite<SkRRect> outer(origOuter);
-    if (!context->getMatrix().isIdentity()) {
-        if (!origOuter.transform(context->getMatrix(), outer.writable())) {
+    if (!viewMatrix.isIdentity()) {
+        if (!origOuter.transform(viewMatrix, outer.writable())) {
             return false;
         }
     }
-    GrEffectEdgeType edgeType = applyAA ? kFillAA_GrEffectEdgeType :
-                                          kFillBW_GrEffectEdgeType;
-    GrEffect* effect = GrRRectEffect::Create(edgeType, *outer);
-    if (NULL == effect) {
+    GrPrimitiveEdgeType edgeType = applyAA ? kFillAA_GrProcessorEdgeType :
+                                             kFillBW_GrProcessorEdgeType;
+    GrFragmentProcessor* effect = GrRRectEffect::Create(edgeType, *outer);
+    if (nullptr == effect) {
         return false;
     }
-    if (!are.isSet()) {
-        are.set(target->drawState());
+    if (!arfps.isSet()) {
+        arfps.set(&pipelineBuilder);
     }
-    GrDrawState::AutoViewMatrixRestore avmr;
-    if (!avmr.setIdentity(target->drawState())) {
+
+    SkMatrix invert;
+    if (!viewMatrix.invert(&invert)) {
         return false;
     }
-    target->drawState()->addCoverageEffect(effect)->unref();
+
+    arfps.addCoverageFragmentProcessor(effect)->unref();
     SkRect bounds = outer->getBounds();
     if (applyAA) {
         bounds.outset(SK_ScalarHalf, SK_ScalarHalf);
     }
-    target->drawRect(bounds, NULL, NULL, NULL);
+    target->drawNonAARect(pipelineBuilder, color, SkMatrix::I(), bounds, invert);
     return true;
 }
 
-bool GrOvalRenderer::drawRRect(GrDrawTarget* target, GrContext* context, bool useAA,
-                               const SkRRect& rrect, const SkStrokeRec& stroke) {
-    if (rrect.isOval()) {
-        return this->drawOval(target, context, useAA, rrect.getBounds(), stroke);
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+class RRectCircleRendererBatch : public GrVertexBatch {
+public:
+    DEFINE_BATCH_CLASS_ID
+
+    struct Geometry {
+        SkMatrix fViewMatrix;
+        SkRect fDevBounds;
+        SkScalar fInnerRadius;
+        SkScalar fOuterRadius;
+        GrColor fColor;
+        bool fStroke;
+    };
+
+    static GrDrawBatch* Create(const Geometry& geometry) {
+        return new RRectCircleRendererBatch(geometry);
     }
 
-    bool useCoverageAA = useAA &&
-        !target->getDrawState().getRenderTarget()->isMultisampled() &&
-        !target->shouldDisableCoverageAAForBlend();
+    const char* name() const override { return "RRectCircleBatch"; }
 
-    // only anti-aliased rrects for now
-    if (!useCoverageAA) {
-        return false;
+    void computePipelineOptimizations(GrInitInvariantOutput* color, 
+                                      GrInitInvariantOutput* coverage,
+                                      GrBatchToXPOverrides* overrides) const override {
+        // When this is called on a batch, there is only one geometry bundle
+        color->setKnownFourComponents(fGeoData[0].fColor);
+        coverage->setUnknownSingleComponent();
+        overrides->fUsePLSDstRead = false;
     }
 
-    const SkMatrix& vm = context->getMatrix();
+private:
+    void initBatchTracker(const GrXPOverridesForBatch& overrides) override {
+        // Handle any color overrides
+        if (!overrides.readsColor()) {
+            fGeoData[0].fColor = GrColor_ILLEGAL;
+        }
+        overrides.getOverrideColorIfSet(&fGeoData[0].fColor);
 
-    if (!vm.rectStaysRect() || !rrect.isSimple()) {
-        return false;
+        // setup batch properties
+        fBatch.fColorIgnored = !overrides.readsColor();
+        fBatch.fColor = fGeoData[0].fColor;
+        fBatch.fStroke = fGeoData[0].fStroke;
+        fBatch.fUsesLocalCoords = overrides.readsLocalCoords();
+        fBatch.fCoverageIgnored = !overrides.readsCoverage();
     }
 
+    void onPrepareDraws(Target* target) const override {
+        // reset to device coordinates
+        SkMatrix invert;
+        if (!this->viewMatrix().invert(&invert)) {
+            SkDebugf("Failed to invert\n");
+            return;
+        }
+
+        // Setup geometry processor
+        SkAutoTUnref<GrGeometryProcessor> gp(CircleEdgeEffect::Create(this->color(),
+                                                                      this->stroke(),
+                                                                      invert,
+                                                                      this->usesLocalCoords()));
+
+        target->initDraw(gp, this->pipeline());
+
+        int instanceCount = fGeoData.count();
+        size_t vertexStride = gp->getVertexStride();
+        SkASSERT(vertexStride == sizeof(CircleVertex));
+
+        // drop out the middle quad if we're stroked
+        int indicesPerInstance = this->stroke() ? kIndicesPerStrokeRRect : kIndicesPerRRect;
+        SkAutoTUnref<const GrIndexBuffer> indexBuffer(
+            ref_rrect_index_buffer(this->stroke(), target->resourceProvider()));
+
+        InstancedHelper helper;
+        CircleVertex* verts = reinterpret_cast<CircleVertex*>(helper.init(target,
+            kTriangles_GrPrimitiveType, vertexStride, indexBuffer, kVertsPerRRect,
+            indicesPerInstance, instanceCount));
+        if (!verts || !indexBuffer) {
+            SkDebugf("Could not allocate vertices\n");
+            return;
+        }
+
+        for (int i = 0; i < instanceCount; i++) {
+            const Geometry& args = fGeoData[i];
+
+            SkScalar outerRadius = args.fOuterRadius;
+
+            const SkRect& bounds = args.fDevBounds;
+
+            SkScalar yCoords[4] = {
+                bounds.fTop,
+                bounds.fTop + outerRadius,
+                bounds.fBottom - outerRadius,
+                bounds.fBottom
+            };
+
+            SkScalar yOuterRadii[4] = {-1, 0, 0, 1 };
+            // The inner radius in the vertex data must be specified in normalized space.
+            SkScalar innerRadius = args.fInnerRadius / args.fOuterRadius;
+            for (int i = 0; i < 4; ++i) {
+                verts->fPos = SkPoint::Make(bounds.fLeft, yCoords[i]);
+                verts->fOffset = SkPoint::Make(-1, yOuterRadii[i]);
+                verts->fOuterRadius = outerRadius;
+                verts->fInnerRadius = innerRadius;
+                verts++;
+
+                verts->fPos = SkPoint::Make(bounds.fLeft + outerRadius, yCoords[i]);
+                verts->fOffset = SkPoint::Make(0, yOuterRadii[i]);
+                verts->fOuterRadius = outerRadius;
+                verts->fInnerRadius = innerRadius;
+                verts++;
+
+                verts->fPos = SkPoint::Make(bounds.fRight - outerRadius, yCoords[i]);
+                verts->fOffset = SkPoint::Make(0, yOuterRadii[i]);
+                verts->fOuterRadius = outerRadius;
+                verts->fInnerRadius = innerRadius;
+                verts++;
+
+                verts->fPos = SkPoint::Make(bounds.fRight, yCoords[i]);
+                verts->fOffset = SkPoint::Make(1, yOuterRadii[i]);
+                verts->fOuterRadius = outerRadius;
+                verts->fInnerRadius = innerRadius;
+                verts++;
+            }
+        }
+
+        helper.recordDraw(target);
+    }
+
+    SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
+
+    RRectCircleRendererBatch(const Geometry& geometry) : INHERITED(ClassID()) {
+        fGeoData.push_back(geometry);
+
+        this->setBounds(geometry.fDevBounds);
+    }
+
+    bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override {
+        RRectCircleRendererBatch* that = t->cast<RRectCircleRendererBatch>();
+        if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *that->pipeline(),
+                                    that->bounds(), caps)) {
+            return false;
+        }
+
+        // TODO use vertex color to avoid breaking batches
+        if (this->color() != that->color()) {
+            return false;
+        }
+
+        if (this->stroke() != that->stroke()) {
+            return false;
+        }
+
+        SkASSERT(this->usesLocalCoords() == that->usesLocalCoords());
+        if (this->usesLocalCoords() && !this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
+            return false;
+        }
+
+        fGeoData.push_back_n(that->geoData()->count(), that->geoData()->begin());
+        this->joinBounds(that->bounds());
+        return true;
+    }
+
+    GrColor color() const { return fBatch.fColor; }
+    bool usesLocalCoords() const { return fBatch.fUsesLocalCoords; }
+    const SkMatrix& viewMatrix() const { return fGeoData[0].fViewMatrix; }
+    bool stroke() const { return fBatch.fStroke; }
+
+    struct BatchTracker {
+        GrColor fColor;
+        bool fStroke;
+        bool fUsesLocalCoords;
+        bool fColorIgnored;
+        bool fCoverageIgnored;
+    };
+
+    BatchTracker fBatch;
+    SkSTArray<1, Geometry, true> fGeoData;
+
+    typedef GrVertexBatch INHERITED;
+};
+
+class RRectEllipseRendererBatch : public GrVertexBatch {
+public:
+    DEFINE_BATCH_CLASS_ID
+
+    struct Geometry {
+        SkMatrix fViewMatrix;
+        SkRect fDevBounds;
+        SkScalar fXRadius;
+        SkScalar fYRadius;
+        SkScalar fInnerXRadius;
+        SkScalar fInnerYRadius;
+        GrColor fColor;
+        bool fStroke;
+    };
+
+    static GrDrawBatch* Create(const Geometry& geometry) {
+        return new RRectEllipseRendererBatch(geometry);
+    }
+
+    const char* name() const override { return "RRectEllipseRendererBatch"; }
+
+    void computePipelineOptimizations(GrInitInvariantOutput* color, 
+                                      GrInitInvariantOutput* coverage,
+                                      GrBatchToXPOverrides* overrides) const override {
+        // When this is called on a batch, there is only one geometry bundle
+        color->setKnownFourComponents(fGeoData[0].fColor);
+        coverage->setUnknownSingleComponent();
+        overrides->fUsePLSDstRead = false;
+    }
+
+private:
+    void initBatchTracker(const GrXPOverridesForBatch& overrides) override {
+        // Handle any color overrides
+        if (!overrides.readsColor()) {
+            fGeoData[0].fColor = GrColor_ILLEGAL;
+        }
+        overrides.getOverrideColorIfSet(&fGeoData[0].fColor);
+
+        // setup batch properties
+        fBatch.fColorIgnored = !overrides.readsColor();
+        fBatch.fColor = fGeoData[0].fColor;
+        fBatch.fStroke = fGeoData[0].fStroke;
+        fBatch.fUsesLocalCoords = overrides.readsLocalCoords();
+        fBatch.fCoverageIgnored = !overrides.readsCoverage();
+    }
+
+    void onPrepareDraws(Target* target) const override {
+        // reset to device coordinates
+        SkMatrix invert;
+        if (!this->viewMatrix().invert(&invert)) {
+            SkDebugf("Failed to invert\n");
+            return;
+        }
+
+        // Setup geometry processor
+        SkAutoTUnref<GrGeometryProcessor> gp(EllipseEdgeEffect::Create(this->color(),
+                                                                       this->stroke(),
+                                                                       invert,
+                                                                       this->usesLocalCoords()));
+
+        target->initDraw(gp, this->pipeline());
+
+        int instanceCount = fGeoData.count();
+        size_t vertexStride = gp->getVertexStride();
+        SkASSERT(vertexStride == sizeof(EllipseVertex));
+
+        // drop out the middle quad if we're stroked
+        int indicesPerInstance = this->stroke() ? kIndicesPerStrokeRRect : kIndicesPerRRect;
+        SkAutoTUnref<const GrIndexBuffer> indexBuffer(
+            ref_rrect_index_buffer(this->stroke(), target->resourceProvider()));
+
+        InstancedHelper helper;
+        EllipseVertex* verts = reinterpret_cast<EllipseVertex*>(
+            helper.init(target, kTriangles_GrPrimitiveType, vertexStride, indexBuffer,
+            kVertsPerRRect, indicesPerInstance, instanceCount));
+        if (!verts || !indexBuffer) {
+            SkDebugf("Could not allocate vertices\n");
+            return;
+        }
+
+        for (int i = 0; i < instanceCount; i++) {
+            const Geometry& args = fGeoData[i];
+
+            // Compute the reciprocals of the radii here to save time in the shader
+            SkScalar xRadRecip = SkScalarInvert(args.fXRadius);
+            SkScalar yRadRecip = SkScalarInvert(args.fYRadius);
+            SkScalar xInnerRadRecip = SkScalarInvert(args.fInnerXRadius);
+            SkScalar yInnerRadRecip = SkScalarInvert(args.fInnerYRadius);
+
+            // Extend the radii out half a pixel to antialias.
+            SkScalar xOuterRadius = args.fXRadius + SK_ScalarHalf;
+            SkScalar yOuterRadius = args.fYRadius + SK_ScalarHalf;
+
+            const SkRect& bounds = args.fDevBounds;
+
+            SkScalar yCoords[4] = {
+                bounds.fTop,
+                bounds.fTop + yOuterRadius,
+                bounds.fBottom - yOuterRadius,
+                bounds.fBottom
+            };
+            SkScalar yOuterOffsets[4] = {
+                yOuterRadius,
+                SK_ScalarNearlyZero, // we're using inversesqrt() in shader, so can't be exactly 0
+                SK_ScalarNearlyZero,
+                yOuterRadius
+            };
+
+            for (int i = 0; i < 4; ++i) {
+                verts->fPos = SkPoint::Make(bounds.fLeft, yCoords[i]);
+                verts->fOffset = SkPoint::Make(xOuterRadius, yOuterOffsets[i]);
+                verts->fOuterRadii = SkPoint::Make(xRadRecip, yRadRecip);
+                verts->fInnerRadii = SkPoint::Make(xInnerRadRecip, yInnerRadRecip);
+                verts++;
+
+                verts->fPos = SkPoint::Make(bounds.fLeft + xOuterRadius, yCoords[i]);
+                verts->fOffset = SkPoint::Make(SK_ScalarNearlyZero, yOuterOffsets[i]);
+                verts->fOuterRadii = SkPoint::Make(xRadRecip, yRadRecip);
+                verts->fInnerRadii = SkPoint::Make(xInnerRadRecip, yInnerRadRecip);
+                verts++;
+
+                verts->fPos = SkPoint::Make(bounds.fRight - xOuterRadius, yCoords[i]);
+                verts->fOffset = SkPoint::Make(SK_ScalarNearlyZero, yOuterOffsets[i]);
+                verts->fOuterRadii = SkPoint::Make(xRadRecip, yRadRecip);
+                verts->fInnerRadii = SkPoint::Make(xInnerRadRecip, yInnerRadRecip);
+                verts++;
+
+                verts->fPos = SkPoint::Make(bounds.fRight, yCoords[i]);
+                verts->fOffset = SkPoint::Make(xOuterRadius, yOuterOffsets[i]);
+                verts->fOuterRadii = SkPoint::Make(xRadRecip, yRadRecip);
+                verts->fInnerRadii = SkPoint::Make(xInnerRadRecip, yInnerRadRecip);
+                verts++;
+            }
+        }
+        helper.recordDraw(target);
+    }
+
+    SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
+
+    RRectEllipseRendererBatch(const Geometry& geometry) : INHERITED(ClassID()) {
+        fGeoData.push_back(geometry);
+
+        this->setBounds(geometry.fDevBounds);
+    }
+
+    bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override {
+        RRectEllipseRendererBatch* that = t->cast<RRectEllipseRendererBatch>();
+
+        if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *that->pipeline(),
+                                    that->bounds(), caps)) {
+            return false;
+        }
+
+        // TODO use vertex color to avoid breaking batches
+        if (this->color() != that->color()) {
+            return false;
+        }
+
+        if (this->stroke() != that->stroke()) {
+            return false;
+        }
+
+        SkASSERT(this->usesLocalCoords() == that->usesLocalCoords());
+        if (this->usesLocalCoords() && !this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
+            return false;
+        }
+
+        fGeoData.push_back_n(that->geoData()->count(), that->geoData()->begin());
+        this->joinBounds(that->bounds());
+        return true;
+    }
+
+    GrColor color() const { return fBatch.fColor; }
+    bool usesLocalCoords() const { return fBatch.fUsesLocalCoords; }
+    const SkMatrix& viewMatrix() const { return fGeoData[0].fViewMatrix; }
+    bool stroke() const { return fBatch.fStroke; }
+
+    struct BatchTracker {
+        GrColor fColor;
+        bool fStroke;
+        bool fUsesLocalCoords;
+        bool fColorIgnored;
+        bool fCoverageIgnored;
+    };
+
+    BatchTracker fBatch;
+    SkSTArray<1, Geometry, true> fGeoData;
+
+    typedef GrVertexBatch INHERITED;
+};
+
+static GrDrawBatch* create_rrect_batch(GrColor color,
+                                       const SkMatrix& viewMatrix,
+                                       const SkRRect& rrect,
+                                       const SkStrokeRec& stroke) {
+    SkASSERT(viewMatrix.rectStaysRect());
+    SkASSERT(rrect.isSimple());
+    SkASSERT(!rrect.isOval());
+
+    // RRect batchs only handle simple, but not too simple, rrects
     // do any matrix crunching before we reset the draw state for device coords
     const SkRect& rrectBounds = rrect.getBounds();
     SkRect bounds;
-    vm.mapRect(&bounds, rrectBounds);
+    viewMatrix.mapRect(&bounds, rrectBounds);
 
     SkVector radii = rrect.getSimpleRadii();
-    SkScalar xRadius = SkScalarAbs(vm[SkMatrix::kMScaleX]*radii.fX +
-                                   vm[SkMatrix::kMSkewY]*radii.fY);
-    SkScalar yRadius = SkScalarAbs(vm[SkMatrix::kMSkewX]*radii.fX +
-                                   vm[SkMatrix::kMScaleY]*radii.fY);
+    SkScalar xRadius = SkScalarAbs(viewMatrix[SkMatrix::kMScaleX]*radii.fX +
+                                   viewMatrix[SkMatrix::kMSkewY]*radii.fY);
+    SkScalar yRadius = SkScalarAbs(viewMatrix[SkMatrix::kMSkewX]*radii.fX +
+                                   viewMatrix[SkMatrix::kMScaleY]*radii.fY);
 
     SkStrokeRec::Style style = stroke.getStyle();
 
@@ -989,15 +1899,15 @@ bool GrOvalRenderer::drawRRect(GrDrawTarget* target, GrContext* context, bool us
         if (SkStrokeRec::kHairline_Style == style) {
             scaledStroke.set(1, 1);
         } else {
-            scaledStroke.fX = SkScalarAbs(strokeWidth*(vm[SkMatrix::kMScaleX] +
-                                                       vm[SkMatrix::kMSkewY]));
-            scaledStroke.fY = SkScalarAbs(strokeWidth*(vm[SkMatrix::kMSkewX] +
-                                                       vm[SkMatrix::kMScaleY]));
+            scaledStroke.fX = SkScalarAbs(strokeWidth*(viewMatrix[SkMatrix::kMScaleX] +
+                                                       viewMatrix[SkMatrix::kMSkewY]));
+            scaledStroke.fY = SkScalarAbs(strokeWidth*(viewMatrix[SkMatrix::kMSkewX] +
+                                                       viewMatrix[SkMatrix::kMScaleY]));
         }
 
         // if half of strokewidth is greater than radius, we don't handle that right now
         if (SK_ScalarHalf*scaledStroke.fX > xRadius || SK_ScalarHalf*scaledStroke.fY > yRadius) {
-            return false;
+            return nullptr;
         }
     }
 
@@ -1007,34 +1917,11 @@ bool GrOvalRenderer::drawRRect(GrDrawTarget* target, GrContext* context, bool us
     // We could consider falling back to rect rendering here, since a tiny radius is
     // indistinguishable from a square corner.
     if (!isStrokeOnly && (SK_ScalarHalf > xRadius || SK_ScalarHalf > yRadius)) {
-        return false;
-    }
-
-    // reset to device coordinates
-    GrDrawState* drawState = target->drawState();
-    GrDrawState::AutoViewMatrixRestore avmr;
-    if (!avmr.setIdentity(drawState)) {
-        return false;
-    }
-
-    GrIndexBuffer* indexBuffer = this->rRectIndexBuffer(context->getGpu());
-    if (NULL == indexBuffer) {
-        GrPrintf("Failed to create index buffer!\n");
-        return false;
+        return nullptr;
     }
 
     // if the corners are circles, use the circle renderer
     if ((!hasStroke || scaledStroke.fX == scaledStroke.fY) && xRadius == yRadius) {
-        drawState->setVertexAttribs<gCircleVertexAttribs>(SK_ARRAY_COUNT(gCircleVertexAttribs));
-        SkASSERT(sizeof(CircleVertex) == drawState->getVertexSize());
-
-        GrDrawTarget::AutoReleaseGeometry geo(target, 16, 0);
-        if (!geo.succeeded()) {
-            GrPrintf("Failed to get space for vertices!\n");
-            return false;
-        }
-        CircleVertex* verts = reinterpret_cast<CircleVertex*>(geo.vertices());
-
         SkScalar innerRadius = 0.0f;
         SkScalar outerRadius = xRadius;
         SkScalar halfWidth = 0;
@@ -1054,69 +1941,28 @@ bool GrOvalRenderer::drawRRect(GrDrawTarget* target, GrContext* context, bool us
 
         isStrokeOnly = (isStrokeOnly && innerRadius >= 0);
 
-        GrEffect* effect = CircleEdgeEffect::Create(isStrokeOnly);
-        static const int kCircleEdgeAttrIndex = 1;
-        drawState->addCoverageEffect(effect, kCircleEdgeAttrIndex)->unref();
-
         // The radii are outset for two reasons. First, it allows the shader to simply perform
-        // clamp(distance-to-center - radius, 0, 1). Second, the outer radius is used to compute the
-        // verts of the bounding box that is rendered and the outset ensures the box will cover all
-        // pixels partially covered by the circle.
+        // simpler computation because the computed alpha is zero, rather than 50%, at the radius.
+        // Second, the outer radius is used to compute the verts of the bounding box that is
+        // rendered and the outset ensures the box will cover all partially covered by the rrect
+        // corners.
         outerRadius += SK_ScalarHalf;
         innerRadius -= SK_ScalarHalf;
 
         // Expand the rect so all the pixels will be captured.
         bounds.outset(SK_ScalarHalf, SK_ScalarHalf);
 
-        SkScalar yCoords[4] = {
-            bounds.fTop,
-            bounds.fTop + outerRadius,
-            bounds.fBottom - outerRadius,
-            bounds.fBottom
-        };
-        SkScalar yOuterRadii[4] = {
-            -outerRadius,
-            0,
-            0,
-            outerRadius
-        };
-        for (int i = 0; i < 4; ++i) {
-            verts->fPos = SkPoint::Make(bounds.fLeft, yCoords[i]);
-            verts->fOffset = SkPoint::Make(-outerRadius, yOuterRadii[i]);
-            verts->fOuterRadius = outerRadius;
-            verts->fInnerRadius = innerRadius;
-            verts++;
-
-            verts->fPos = SkPoint::Make(bounds.fLeft + outerRadius, yCoords[i]);
-            verts->fOffset = SkPoint::Make(0, yOuterRadii[i]);
-            verts->fOuterRadius = outerRadius;
-            verts->fInnerRadius = innerRadius;
-            verts++;
-
-            verts->fPos = SkPoint::Make(bounds.fRight - outerRadius, yCoords[i]);
-            verts->fOffset = SkPoint::Make(0, yOuterRadii[i]);
-            verts->fOuterRadius = outerRadius;
-            verts->fInnerRadius = innerRadius;
-            verts++;
-
-            verts->fPos = SkPoint::Make(bounds.fRight, yCoords[i]);
-            verts->fOffset = SkPoint::Make(outerRadius, yOuterRadii[i]);
-            verts->fOuterRadius = outerRadius;
-            verts->fInnerRadius = innerRadius;
-            verts++;
-        }
-
-        // drop out the middle quad if we're stroked
-        int indexCnt = isStrokeOnly ? SK_ARRAY_COUNT(gRRectIndices) - 6 :
-                                      SK_ARRAY_COUNT(gRRectIndices);
-        target->setIndexSourceToBuffer(indexBuffer);
-        target->drawIndexed(kTriangles_GrPrimitiveType, 0, 0, 16, indexCnt, &bounds);
+        RRectCircleRendererBatch::Geometry geometry;
+        geometry.fViewMatrix = viewMatrix;
+        geometry.fColor = color;
+        geometry.fInnerRadius = innerRadius;
+        geometry.fOuterRadius = outerRadius;
+        geometry.fStroke = isStrokeOnly;
+        geometry.fDevBounds = bounds;
 
+        return RRectCircleRendererBatch::Create(geometry);
     // otherwise we use the ellipse renderer
     } else {
-        drawState->setVertexAttribs<gEllipseVertexAttribs>(SK_ARRAY_COUNT(gEllipseVertexAttribs));
-        SkASSERT(sizeof(EllipseVertex) == drawState->getVertexSize());
-
         SkScalar innerXRadius = 0.0f;
         SkScalar innerYRadius = 0.0f;
         if (hasStroke) {
@@ -1129,13 +1975,13 @@ bool GrOvalRenderer::drawRRect(GrDrawTarget* target, GrContext* context, bool us
             // we only handle thick strokes for near-circular ellipses
             if (scaledStroke.length() > SK_ScalarHalf &&
                 (SK_ScalarHalf*xRadius > yRadius || SK_ScalarHalf*yRadius > xRadius)) {
-                return false;
+                return nullptr;
             }
 
             // we don't handle it if curvature of the stroke is less than curvature of the ellipse
             if (scaledStroke.fX*(yRadius*yRadius) < (scaledStroke.fY*scaledStroke.fY)*xRadius ||
                 scaledStroke.fY*(xRadius*xRadius) < (scaledStroke.fX*scaledStroke.fX)*yRadius) {
-                return false;
+                return nullptr;
             }
 
             // this is legit only if scale & translation (which should be the case at the moment)
@@ -1151,77 +1997,90 @@ bool GrOvalRenderer::drawRRect(GrDrawTarget* target, GrContext* context, bool us
 
         isStrokeOnly = (isStrokeOnly && innerXRadius >= 0 && innerYRadius >= 0);
 
-        GrDrawTarget::AutoReleaseGeometry geo(target, 16, 0);
-        if (!geo.succeeded()) {
-            GrPrintf("Failed to get space for vertices!\n");
-            return false;
-        }
-        EllipseVertex* verts = reinterpret_cast<EllipseVertex*>(geo.vertices());
-
-        GrEffect* effect = EllipseEdgeEffect::Create(isStrokeOnly);
-        static const int kEllipseOffsetAttrIndex = 1;
-        static const int kEllipseRadiiAttrIndex = 2;
-        drawState->addCoverageEffect(effect,
-                                     kEllipseOffsetAttrIndex, kEllipseRadiiAttrIndex)->unref();
-
-        // Compute the reciprocals of the radii here to save time in the shader
-        SkScalar xRadRecip = SkScalarInvert(xRadius);
-        SkScalar yRadRecip = SkScalarInvert(yRadius);
-        SkScalar xInnerRadRecip = SkScalarInvert(innerXRadius);
-        SkScalar yInnerRadRecip = SkScalarInvert(innerYRadius);
-
-        // Extend the radii out half a pixel to antialias.
-        SkScalar xOuterRadius = xRadius + SK_ScalarHalf;
-        SkScalar yOuterRadius = yRadius + SK_ScalarHalf;
-
         // Expand the rect so all the pixels will be captured.
         bounds.outset(SK_ScalarHalf, SK_ScalarHalf);
 
-        SkScalar yCoords[4] = {
-            bounds.fTop,
-            bounds.fTop + yOuterRadius,
-            bounds.fBottom - yOuterRadius,
-            bounds.fBottom
-        };
-        SkScalar yOuterOffsets[4] = {
-            yOuterRadius,
-            SK_ScalarNearlyZero, // we're using inversesqrt() in the shader, so can't be exactly 0
-            SK_ScalarNearlyZero,
-            yOuterRadius
-        };
+        RRectEllipseRendererBatch::Geometry geometry;
+        geometry.fViewMatrix = viewMatrix;
+        geometry.fColor = color;
+        geometry.fXRadius = xRadius;
+        geometry.fYRadius = yRadius;
+        geometry.fInnerXRadius = innerXRadius;
+        geometry.fInnerYRadius = innerYRadius;
+        geometry.fStroke = isStrokeOnly;
+        geometry.fDevBounds = bounds;
 
-        for (int i = 0; i < 4; ++i) {
-            verts->fPos = SkPoint::Make(bounds.fLeft, yCoords[i]);
-            verts->fOffset = SkPoint::Make(xOuterRadius, yOuterOffsets[i]);
-            verts->fOuterRadii = SkPoint::Make(xRadRecip, yRadRecip);
-            verts->fInnerRadii = SkPoint::Make(xInnerRadRecip, yInnerRadRecip);
-            verts++;
+        return RRectEllipseRendererBatch::Create(geometry);
+    }
+}
 
-            verts->fPos = SkPoint::Make(bounds.fLeft + xOuterRadius, yCoords[i]);
-            verts->fOffset = SkPoint::Make(SK_ScalarNearlyZero, yOuterOffsets[i]);
-            verts->fOuterRadii = SkPoint::Make(xRadRecip, yRadRecip);
-            verts->fInnerRadii = SkPoint::Make(xInnerRadRecip, yInnerRadRecip);
-            verts++;
-
-            verts->fPos = SkPoint::Make(bounds.fRight - xOuterRadius, yCoords[i]);
-            verts->fOffset = SkPoint::Make(SK_ScalarNearlyZero, yOuterOffsets[i]);
-            verts->fOuterRadii = SkPoint::Make(xRadRecip, yRadRecip);
-            verts->fInnerRadii = SkPoint::Make(xInnerRadRecip, yInnerRadRecip);
-            verts++;
-
-            verts->fPos = SkPoint::Make(bounds.fRight, yCoords[i]);
-            verts->fOffset = SkPoint::Make(xOuterRadius, yOuterOffsets[i]);
-            verts->fOuterRadii = SkPoint::Make(xRadRecip, yRadRecip);
-            verts->fInnerRadii = SkPoint::Make(xInnerRadRecip, yInnerRadRecip);
-            verts++;
-        }
-
-        // drop out the middle quad if we're stroked
-        int indexCnt = isStrokeOnly ? SK_ARRAY_COUNT(gRRectIndices) - 6 :
-                                      SK_ARRAY_COUNT(gRRectIndices);
-        target->setIndexSourceToBuffer(indexBuffer);
-        target->drawIndexed(kTriangles_GrPrimitiveType, 0, 0, 16, indexCnt, &bounds);
+bool GrOvalRenderer::DrawRRect(GrDrawTarget* target,
+                               const GrPipelineBuilder& pipelineBuilder,
+                               GrColor color,
+                               const SkMatrix& viewMatrix,
+                               bool useAA,
+                               const SkRRect& rrect,
+                               const SkStrokeRec& stroke) {
+    if (rrect.isOval()) {
+        return DrawOval(target, pipelineBuilder, color, viewMatrix, useAA, rrect.getBounds(),
+                        stroke);
     }
 
+    bool useCoverageAA = useAA && !pipelineBuilder.getRenderTarget()->isUnifiedMultisampled();
+
+    // only anti-aliased rrects for now
+    if (!useCoverageAA) {
+        return false;
+    }
+
+    if (!viewMatrix.rectStaysRect() || !rrect.isSimple()) {
+        return false;
+    }
+
+    SkAutoTUnref<GrDrawBatch> batch(create_rrect_batch(color, viewMatrix, rrect, stroke));
+    if (!batch) {
+        return false;
+    }
+
+    target->drawBatch(pipelineBuilder, batch);
     return true;
 }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef GR_TEST_UTILS
+
+DRAW_BATCH_TEST_DEFINE(CircleBatch) {
+    SkMatrix viewMatrix = GrTest::TestMatrix(random);
+    GrColor color = GrRandomColor(random);
+    bool useCoverageAA = random->nextBool();
+    SkRect circle = GrTest::TestSquare(random);
+    return create_circle_batch(color, viewMatrix, useCoverageAA, circle,
+                               GrTest::TestStrokeRec(random));
+}
+
+DRAW_BATCH_TEST_DEFINE(EllipseBatch) {
+    SkMatrix viewMatrix = GrTest::TestMatrixRectStaysRect(random);
+    GrColor color = GrRandomColor(random);
+    SkRect ellipse = GrTest::TestSquare(random);
+    return create_ellipse_batch(color, viewMatrix, true, ellipse,
+                                GrTest::TestStrokeRec(random));
+}
+
+DRAW_BATCH_TEST_DEFINE(DIEllipseBatch) {
+    SkMatrix viewMatrix = GrTest::TestMatrix(random);
+    GrColor color = GrRandomColor(random);
+    bool useCoverageAA = random->nextBool();
+    SkRect ellipse = GrTest::TestSquare(random);
+    return create_diellipse_batch(color, viewMatrix, useCoverageAA, ellipse,
+                                  GrTest::TestStrokeRec(random));
+}
+
+DRAW_BATCH_TEST_DEFINE(RRectBatch) {
+    SkMatrix viewMatrix = GrTest::TestMatrixRectStaysRect(random);
+    GrColor color = GrRandomColor(random);
+    const SkRRect& rrect = GrTest::TestRRectSimple(random);
+    return create_rrect_batch(color, viewMatrix, rrect, GrTest::TestStrokeRec(random));
+}
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrOvalRenderer.h b/gfx/skia/skia/src/gpu/GrOvalRenderer.h
index 92f6ff0cdf20..d591ffeed38d 100644
--- a/gfx/skia/skia/src/gpu/GrOvalRenderer.h
+++ b/gfx/skia/skia/src/gpu/GrOvalRenderer.h
@@ -8,52 +8,64 @@
 #ifndef GrOvalRenderer_DEFINED
 #define GrOvalRenderer_DEFINED
 
-#include "GrContext.h"
 #include "GrPaint.h"
 
-class GrContext;
 class GrDrawTarget;
-class GrPaint;
+class GrPipelineBuilder;
 struct SkRect;
 class SkStrokeRec;
 
 /*
  * This class wraps helper functions that draw ovals and roundrects (filled & stroked)
  */
-class GrOvalRenderer : public SkRefCnt {
+class GrOvalRenderer {
 public:
-    SK_DECLARE_INST_COUNT(GrOvalRenderer)
-
-    GrOvalRenderer() : fRRectIndexBuffer(NULL) {}
-    ~GrOvalRenderer() {
-        this->reset();
-    }
-
-    void reset();
-
-    bool drawOval(GrDrawTarget* target, const GrContext* context, bool useAA,
-                  const SkRect& oval, const SkStrokeRec& stroke);
-    bool drawRRect(GrDrawTarget* target, GrContext* context, bool useAA,
-                   const SkRRect& rrect, const SkStrokeRec& stroke);
-    bool drawDRRect(GrDrawTarget* target, GrContext* context, bool useAA,
-                    const SkRRect& outer, const SkRRect& inner);
+    static bool DrawOval(GrDrawTarget*,
+                         const GrPipelineBuilder&,
+                         GrColor,
+                         const SkMatrix& viewMatrix,
+                         bool useAA,
+                         const SkRect& oval,
+                         const SkStrokeRec& stroke);
+    static bool DrawRRect(GrDrawTarget*,
+                          const GrPipelineBuilder&,
+                          GrColor,
+                          const SkMatrix& viewMatrix,
+                          bool useAA,
+                          const SkRRect& rrect,
+                          const SkStrokeRec& stroke);
+    static bool DrawDRRect(GrDrawTarget* target,
+                           const GrPipelineBuilder&,
+                           GrColor,
+                           const SkMatrix& viewMatrix,
+                           bool useAA,
+                           const SkRRect& outer,
+                           const SkRRect& inner);
 
 private:
-    bool drawEllipse(GrDrawTarget* target, bool useCoverageAA,
-                     const SkRect& ellipse,
-                     const SkStrokeRec& stroke);
-    bool drawDIEllipse(GrDrawTarget* target, bool useCoverageAA,
-                       const SkRect& ellipse,
-                       const SkStrokeRec& stroke);
-    void drawCircle(GrDrawTarget* target, bool useCoverageAA,
-                    const SkRect& circle,
-                    const SkStrokeRec& stroke);
+    GrOvalRenderer();
 
-    GrIndexBuffer* rRectIndexBuffer(GrGpu* gpu);
-
-    GrIndexBuffer* fRRectIndexBuffer;
-
-    typedef SkRefCnt INHERITED;
+    static bool DrawEllipse(GrDrawTarget* target,
+                            const GrPipelineBuilder&,
+                            GrColor,
+                            const SkMatrix& viewMatrix,
+                            bool useCoverageAA,
+                            const SkRect& ellipse,
+                            const SkStrokeRec& stroke);
+    static bool DrawDIEllipse(GrDrawTarget* target,
+                              const GrPipelineBuilder&,
+                              GrColor,
+                              const SkMatrix& viewMatrix,
+                              bool useCoverageAA,
+                              const SkRect& ellipse,
+                              const SkStrokeRec& stroke);
+    static void DrawCircle(GrDrawTarget* target,
+                           const GrPipelineBuilder&,
+                           GrColor,
+                           const SkMatrix& viewMatrix,
+                           bool useCoverageAA,
+                           const SkRect& circle,
+                           const SkStrokeRec& stroke);
 };
 
 #endif // GrOvalRenderer_DEFINED
diff --git a/gfx/skia/skia/src/gpu/GrPaint.cpp b/gfx/skia/skia/src/gpu/GrPaint.cpp
index 328484bd2d6a..1ec8e502be2a 100644
--- a/gfx/skia/skia/src/gpu/GrPaint.cpp
+++ b/gfx/skia/skia/src/gpu/GrPaint.cpp
@@ -8,112 +8,60 @@
 
 #include "GrPaint.h"
 
-#include "GrBlend.h"
+#include "GrProcOptInfo.h"
+#include "effects/GrCoverageSetOpXP.h"
+#include "effects/GrPorterDuffXferProcessor.h"
 #include "effects/GrSimpleTextureEffect.h"
 
-void GrPaint::addColorTextureEffect(GrTexture* texture, const SkMatrix& matrix) {
-    this->addColorEffect(GrSimpleTextureEffect::Create(texture, matrix))->unref();
+GrPaint::GrPaint()
+    : fAntiAlias(false)
+    , fColor(GrColor_WHITE) {}
+
+void GrPaint::setCoverageSetOpXPFactory(SkRegion::Op regionOp, bool invertCoverage) {
+    fXPFactory.reset(GrCoverageSetOpXPFactory::Create(regionOp, invertCoverage));
 }
 
-void GrPaint::addCoverageTextureEffect(GrTexture* texture, const SkMatrix& matrix) {
-    this->addCoverageEffect(GrSimpleTextureEffect::Create(texture, matrix))->unref();
+void GrPaint::addColorTextureProcessor(GrTexture* texture, const SkMatrix& matrix) {
+    this->addColorFragmentProcessor(GrSimpleTextureEffect::Create(texture, matrix))->unref();
 }
 
-void GrPaint::addColorTextureEffect(GrTexture* texture,
-                                    const SkMatrix& matrix,
-                                    const GrTextureParams& params) {
-    this->addColorEffect(GrSimpleTextureEffect::Create(texture, matrix, params))->unref();
+void GrPaint::addCoverageTextureProcessor(GrTexture* texture, const SkMatrix& matrix) {
+    this->addCoverageFragmentProcessor(GrSimpleTextureEffect::Create(texture, matrix))->unref();
 }
 
-void GrPaint::addCoverageTextureEffect(GrTexture* texture,
+void GrPaint::addColorTextureProcessor(GrTexture* texture,
                                        const SkMatrix& matrix,
                                        const GrTextureParams& params) {
-    this->addCoverageEffect(GrSimpleTextureEffect::Create(texture, matrix, params))->unref();
+    this->addColorFragmentProcessor(GrSimpleTextureEffect::Create(texture,
+                                                                  matrix, params))->unref();
 }
 
-bool GrPaint::isOpaque() const {
-    return this->getOpaqueAndKnownColor(NULL, NULL);
+void GrPaint::addCoverageTextureProcessor(GrTexture* texture,
+                                          const SkMatrix& matrix,
+                                          const GrTextureParams& params) {
+    this->addCoverageFragmentProcessor(GrSimpleTextureEffect::Create(texture,
+                                                                     matrix, params))->unref();
 }
 
-bool GrPaint::isOpaqueAndConstantColor(GrColor* color) const {
-    GrColor tempColor;
-    uint32_t colorComps;
-    if (this->getOpaqueAndKnownColor(&tempColor, &colorComps)) {
-        if (kRGBA_GrColorComponentFlags == colorComps) {
-            *color = tempColor;
-            return true;
-        }
+bool GrPaint::isConstantBlendedColor(GrColor* color) const {
+    GrProcOptInfo colorProcInfo;
+    colorProcInfo.calcWithInitialValues(fColorFragmentProcessors.begin(),
+                                        this->numColorFragmentProcessors(), fColor,
+                                        kRGBA_GrColorComponentFlags, false);
+
+    GrXPFactory::InvariantBlendedColor blendedColor;
+    if (fXPFactory) {
+        fXPFactory->getInvariantBlendedColor(colorProcInfo, &blendedColor);
+    } else {
+        GrPorterDuffXPFactory::SrcOverInvariantBlendedColor(colorProcInfo.color(),
+                                                            colorProcInfo.validFlags(),
+                                                            colorProcInfo.isOpaque(),
+                                                            &blendedColor); 
+    }
+
+    if (kRGBA_GrColorComponentFlags == blendedColor.fKnownColorFlags) {
+        *color = blendedColor.fKnownColor;
+        return true;
     }
     return false;
 }
-
-bool GrPaint::getOpaqueAndKnownColor(GrColor* solidColor,
-                                     uint32_t* solidColorKnownComponents) const {
-
-    // TODO: Share this implementation with GrDrawState
-
-    GrColor coverage = GrColorPackRGBA(fCoverage, fCoverage, fCoverage, fCoverage);
-    uint32_t coverageComps = kRGBA_GrColorComponentFlags;
-    int count = fCoverageStages.count();
-    for (int i = 0; i < count; ++i) {
-        fCoverageStages[i].getEffect()->getConstantColorComponents(&coverage, &coverageComps);
-    }
-    if (kRGBA_GrColorComponentFlags != coverageComps || 0xffffffff != coverage) {
-        return false;
-    }
-
-    GrColor color = fColor;
-    uint32_t colorComps = kRGBA_GrColorComponentFlags;
-    count = fColorStages.count();
-    for (int i = 0; i < count; ++i) {
-        fColorStages[i].getEffect()->getConstantColorComponents(&color, &colorComps);
-    }
-
-    SkASSERT((NULL == solidColor) == (NULL == solidColorKnownComponents));
-
-    GrBlendCoeff srcCoeff = fSrcBlendCoeff;
-    GrBlendCoeff dstCoeff = fDstBlendCoeff;
-    GrSimplifyBlend(&srcCoeff, &dstCoeff, color, colorComps, 0, 0, 0);
-
-    bool opaque = kZero_GrBlendCoeff == dstCoeff && !GrBlendCoeffRefsDst(srcCoeff);
-    if (NULL != solidColor) {
-        if (opaque) {
-            switch (srcCoeff) {
-                case kZero_GrBlendCoeff:
-                    *solidColor = 0;
-                    *solidColorKnownComponents = kRGBA_GrColorComponentFlags;
-                    break;
-
-                case kOne_GrBlendCoeff:
-                    *solidColor = color;
-                    *solidColorKnownComponents = colorComps;
-                    break;
-
-                // The src coeff should never refer to the src and if it refers to dst then opaque
-                // should have been false.
-                case kSC_GrBlendCoeff:
-                case kISC_GrBlendCoeff:
-                case kDC_GrBlendCoeff:
-                case kIDC_GrBlendCoeff:
-                case kSA_GrBlendCoeff:
-                case kISA_GrBlendCoeff:
-                case kDA_GrBlendCoeff:
-                case kIDA_GrBlendCoeff:
-                default:
-                    SkFAIL("srcCoeff should not refer to src or dst.");
-                    break;
-
-                // TODO: update this once GrPaint actually has a const color.
-                case kConstC_GrBlendCoeff:
-                case kIConstC_GrBlendCoeff:
-                case kConstA_GrBlendCoeff:
-                case kIConstA_GrBlendCoeff:
-                    *solidColorKnownComponents = 0;
-                    break;
-            }
-        } else {
-            solidColorKnownComponents = 0;
-        }
-    }
-    return opaque;
-}
diff --git a/gfx/skia/skia/src/gpu/GrPath.cpp b/gfx/skia/skia/src/gpu/GrPath.cpp
index 5426e498f0cd..71c13af30656 100644
--- a/gfx/skia/skia/src/gpu/GrPath.cpp
+++ b/gfx/skia/skia/src/gpu/GrPath.cpp
@@ -7,54 +7,208 @@
 
 #include "GrPath.h"
 
-template<int NumBits> static uint64_t get_top_n_float_bits(float f) {
-    char* floatData = reinterpret_cast<char*>(&f);
-    uint32_t floatBits = *reinterpret_cast<uint32_t*>(floatData);
-    return floatBits >> (32 - NumBits);
+namespace {
+// Verb count limit for generating path key from content of a volatile path.
+// The value should accomodate at least simple rects and rrects.
+static const int kSimpleVolatilePathVerbLimit = 10;
+
+inline static bool compute_key_for_line_path(const SkPath& path, const GrStrokeInfo& stroke,
+                                             GrUniqueKey* key) {
+    SkPoint pts[2];
+    if (!path.isLine(pts)) {
+        return false;
+    }
+    static_assert((sizeof(pts) % sizeof(uint32_t)) == 0 && sizeof(pts) > sizeof(uint32_t),
+                  "pts_needs_padding");
+
+    const int kBaseData32Cnt = 1 + sizeof(pts) / sizeof(uint32_t);
+    int strokeDataCnt = stroke.computeUniqueKeyFragmentData32Cnt();
+    static const GrUniqueKey::Domain kOvalPathDomain = GrUniqueKey::GenerateDomain();
+    GrUniqueKey::Builder builder(key, kOvalPathDomain, kBaseData32Cnt + strokeDataCnt);
+    builder[0] = path.getFillType();
+    memcpy(&builder[1], &pts, sizeof(pts));
+    if (strokeDataCnt > 0) {
+        stroke.asUniqueKeyFragment(&builder[kBaseData32Cnt]);
+    }
+    return true;
 }
 
-GrResourceKey GrPath::ComputeKey(const SkPath& path, const SkStrokeRec& stroke) {
-    static const GrResourceKey::ResourceType gPathResourceType = GrResourceKey::GenerateResourceType();
-    static const GrCacheID::Domain gPathDomain = GrCacheID::GenerateDomain();
+inline static bool compute_key_for_oval_path(const SkPath& path, const GrStrokeInfo& stroke,
+                                             GrUniqueKey* key) {
+    SkRect rect;
+    // Point order is significant when dashing, so we cannot devolve to a rect key.
+    if (stroke.isDashed() || !path.isOval(&rect)) {
+        return false;
+    }
+    static_assert((sizeof(rect) % sizeof(uint32_t)) == 0 && sizeof(rect) > sizeof(uint32_t),
+                  "rect_needs_padding");
 
-    GrCacheID::Key key;
-    uint64_t* keyData = key.fData64;
-    keyData[0] = path.getGenerationID();
-    keyData[1] = ComputeStrokeKey(stroke);
-
-    return GrResourceKey(GrCacheID(gPathDomain, key), gPathResourceType, 0);
+    const int kBaseData32Cnt = 1 + sizeof(rect) / sizeof(uint32_t);
+    int strokeDataCnt = stroke.computeUniqueKeyFragmentData32Cnt();
+    static const GrUniqueKey::Domain kOvalPathDomain = GrUniqueKey::GenerateDomain();
+    GrUniqueKey::Builder builder(key, kOvalPathDomain, kBaseData32Cnt + strokeDataCnt);
+    builder[0] = path.getFillType();
+    memcpy(&builder[1], &rect, sizeof(rect));
+    if (strokeDataCnt > 0) {
+        stroke.asUniqueKeyFragment(&builder[kBaseData32Cnt]);
+    }
+    return true;
 }
 
-uint64_t GrPath::ComputeStrokeKey(const SkStrokeRec& stroke) {
-    enum {
-        kStyleBits = 2,
-        kJoinBits = 2,
-        kCapBits = 2,
-        kWidthBits = 29,
-        kMiterBits = 29,
-
-        kJoinShift = kStyleBits,
-        kCapShift = kJoinShift + kJoinBits,
-        kWidthShift = kCapShift + kCapBits,
-        kMiterShift = kWidthShift + kWidthBits,
-
-        kBitCount = kMiterShift + kMiterBits
-    };
-
-    SK_COMPILE_ASSERT(SkStrokeRec::kStyleCount <= (1 << kStyleBits), style_shift_will_be_wrong);
-    SK_COMPILE_ASSERT(SkPaint::kJoinCount <= (1 << kJoinBits), cap_shift_will_be_wrong);
-    SK_COMPILE_ASSERT(SkPaint::kCapCount <= (1 << kCapBits), miter_shift_will_be_wrong);
-    SK_COMPILE_ASSERT(kBitCount == 64, wrong_stroke_key_size);
-
-    if (!stroke.needToApply()) {
-        return SkStrokeRec::kFill_Style;
+// Encodes the full path data to the unique key for very small, volatile paths. This is typically
+// hit when clipping stencils the clip stack. Intention is that this handles rects too, since
+// SkPath::isRect seems to do non-trivial amount of work.
+inline static bool compute_key_for_simple_path(const SkPath& path, const GrStrokeInfo& stroke,
+                                               GrUniqueKey* key) {
+    if (!path.isVolatile()) {
+        return false;
+    }
+    // The check below should take care of negative values casted positive.
+    const int verbCnt = path.countVerbs();
+    if (verbCnt > kSimpleVolatilePathVerbLimit) {
+        return false;
     }
 
-    uint64_t key = stroke.getStyle();
-    key |= stroke.getJoin() << kJoinShift;
-    key |= stroke.getCap() << kCapShift;
-    key |= get_top_n_float_bits<kWidthBits>(stroke.getWidth()) << kWidthShift;
-    key |= get_top_n_float_bits<kMiterBits>(stroke.getMiter()) << kMiterShift;
+    // If somebody goes wild with the constant, it might cause an overflow.
+    static_assert(kSimpleVolatilePathVerbLimit <= 100,
+                  "big_simple_volatile_path_verb_limit_may_cause_overflow");
 
-    return key;
+    const int pointCnt = path.countPoints();
+    if (pointCnt < 0) {
+        SkASSERT(false);
+        return false;
+    }
+    SkSTArray<16, SkScalar, true> conicWeights(16);
+    if ((path.getSegmentMasks() & SkPath::kConic_SegmentMask) != 0) {
+        SkPath::RawIter iter(path);
+        SkPath::Verb verb;
+        SkPoint points[4];
+        while ((verb = iter.next(points)) != SkPath::kDone_Verb) {
+            if (verb == SkPath::kConic_Verb) {
+                conicWeights.push_back(iter.conicWeight());
+            }
+        }
+    }
+
+    const int conicWeightCnt = conicWeights.count();
+
+    // Construct counts that align as uint32_t counts.
+#define ARRAY_DATA32_COUNT(array_type, count) \
+    static_cast<int>((((count) * sizeof(array_type) + sizeof(uint32_t) - 1) / sizeof(uint32_t)))
+
+    const int verbData32Cnt = ARRAY_DATA32_COUNT(uint8_t, verbCnt);
+    const int pointData32Cnt = ARRAY_DATA32_COUNT(SkPoint, pointCnt);
+    const int conicWeightData32Cnt = ARRAY_DATA32_COUNT(SkScalar, conicWeightCnt);
+
+#undef ARRAY_DATA32_COUNT
+
+    // The unique key data is a "message" with following fragments:
+    // 0) domain, key length, uint32_t for fill type and uint32_t for verbCnt
+    //   (fragment 0, fixed size)
+    // 1) verb, point data and conic weights (varying size)
+    // 2) stroke data (varying size)
+
+    const int baseData32Cnt = 2 + verbData32Cnt + pointData32Cnt + conicWeightData32Cnt;
+    const int strokeDataCnt = stroke.computeUniqueKeyFragmentData32Cnt();
+    static const GrUniqueKey::Domain kSimpleVolatilePathDomain = GrUniqueKey::GenerateDomain();
+    GrUniqueKey::Builder builder(key, kSimpleVolatilePathDomain, baseData32Cnt + strokeDataCnt);
+    int i = 0;
+    builder[i++] = path.getFillType();
+
+    // Serialize the verbCnt to make the whole message unambiguous.
+    // We serialize two variable length fragments to the message:
+    // * verbs, point data and conic weights (fragment 1)
+    // * stroke data (fragment 2)
+    // "Proof:"
+    // Verb count establishes unambiguous verb data.
+    // Verbs encode also point data size and conic weight size.
+    // Thus the fragment 1 is unambiguous.
+    // Unambiguous fragment 1 establishes unambiguous fragment 2, since the length of the message
+    // has been established.
+
+    builder[i++] = SkToU32(verbCnt); // The path limit is compile-asserted above, so the cast is ok.
+
+    // Fill the last uint32_t with 0 first, since the last uint8_ts of the uint32_t may be
+    // uninitialized. This does not produce ambiguous verb data, since we have serialized the exact
+    // verb count.
+    if (verbData32Cnt != static_cast<int>((verbCnt * sizeof(uint8_t) / sizeof(uint32_t)))) {
+        builder[i + verbData32Cnt - 1] = 0;
+    }
+    path.getVerbs(reinterpret_cast<uint8_t*>(&builder[i]), verbCnt);
+    i += verbData32Cnt;
+
+    static_assert(((sizeof(SkPoint) % sizeof(uint32_t)) == 0) && sizeof(SkPoint) > sizeof(uint32_t),
+                  "skpoint_array_needs_padding");
+
+    // Here we assume getPoints does a memcpy, so that we do not need to worry about the alignment.
+    path.getPoints(reinterpret_cast<SkPoint*>(&builder[i]), pointCnt);
+    i += pointData32Cnt;
+
+    if (conicWeightCnt > 0) {
+        if (conicWeightData32Cnt != static_cast<int>(
+                (conicWeightCnt * sizeof(SkScalar) / sizeof(uint32_t)))) {
+            builder[i + conicWeightData32Cnt - 1] = 0;
+        }
+        memcpy(&builder[i], conicWeights.begin(), conicWeightCnt * sizeof(SkScalar));
+        SkDEBUGCODE(i += conicWeightData32Cnt);
+    }
+    SkASSERT(i == baseData32Cnt);
+    if (strokeDataCnt > 0) {
+        stroke.asUniqueKeyFragment(&builder[baseData32Cnt]);
+    }
+    return true;
 }
+
+inline static void compute_key_for_general_path(const SkPath& path, const GrStrokeInfo& stroke,
+                                                GrUniqueKey* key) {
+    const int kBaseData32Cnt = 2;
+    int strokeDataCnt = stroke.computeUniqueKeyFragmentData32Cnt();
+    static const GrUniqueKey::Domain kGeneralPathDomain = GrUniqueKey::GenerateDomain();
+    GrUniqueKey::Builder builder(key, kGeneralPathDomain, kBaseData32Cnt + strokeDataCnt);
+    builder[0] = path.getGenerationID();
+    builder[1] = path.getFillType();
+    if (strokeDataCnt > 0) {
+        stroke.asUniqueKeyFragment(&builder[kBaseData32Cnt]);
+    }
+}
+
+}
+
+void GrPath::ComputeKey(const SkPath& path, const GrStrokeInfo& stroke, GrUniqueKey* key,
+                        bool* outIsVolatile) {
+    if (compute_key_for_line_path(path, stroke, key)) {
+        *outIsVolatile = false;
+        return;
+    }
+
+    if (compute_key_for_oval_path(path, stroke, key)) {
+        *outIsVolatile = false;
+        return;
+    }
+
+    if (compute_key_for_simple_path(path, stroke, key)) {
+        *outIsVolatile = false;
+        return;
+    }
+
+    compute_key_for_general_path(path, stroke, key);
+    *outIsVolatile = path.isVolatile();
+}
+
+#ifdef SK_DEBUG
+bool GrPath::isEqualTo(const SkPath& path, const GrStrokeInfo& stroke) const {
+    if (!fStroke.hasEqualEffect(stroke)) {
+        return false;
+    }
+
+    // We treat same-rect ovals as identical - but only when not dashing.
+    SkRect ovalBounds;
+    if (!fStroke.isDashed() && fSkPath.isOval(&ovalBounds)) {
+        SkRect otherOvalBounds;
+        return path.isOval(&otherOvalBounds) && ovalBounds == otherOvalBounds;
+    }
+
+    return fSkPath == path;
+}
+#endif
+
diff --git a/gfx/skia/skia/src/gpu/GrPath.h b/gfx/skia/skia/src/gpu/GrPath.h
index a5719353905e..2edfd4cb5e60 100644
--- a/gfx/skia/skia/src/gpu/GrPath.h
+++ b/gfx/skia/skia/src/gpu/GrPath.h
@@ -9,40 +9,42 @@
 #define GrPath_DEFINED
 
 #include "GrGpuResource.h"
-#include "GrResourceCache.h"
+#include "GrStrokeInfo.h"
 #include "SkPath.h"
 #include "SkRect.h"
-#include "SkStrokeRec.h"
 
 class GrPath : public GrGpuResource {
 public:
-    SK_DECLARE_INST_COUNT(GrPath);
+    
 
     /**
      * Initialize to a path with a fixed stroke. Stroke must not be hairline.
      */
-    GrPath(GrGpu* gpu, bool isWrapped, const SkPath& skPath, const SkStrokeRec& stroke)
-        : INHERITED(gpu, isWrapped),
-          fSkPath(skPath),
-          fStroke(stroke),
-          fBounds(skPath.getBounds()) {
+    GrPath(GrGpu* gpu, const SkPath& skPath, const GrStrokeInfo& stroke)
+        : INHERITED(gpu, kCached_LifeCycle)
+        , fBounds(skPath.getBounds())
+#ifdef SK_DEBUG
+        , fSkPath(skPath)
+        , fStroke(stroke)
+#endif
+    {
     }
 
-    static GrResourceKey ComputeKey(const SkPath& path, const SkStrokeRec& stroke);
-    static uint64_t ComputeStrokeKey(const SkStrokeRec&);
-
-    bool isEqualTo(const SkPath& path, const SkStrokeRec& stroke) {
-        return fSkPath == path && fStroke == stroke;
-    }
+    static void ComputeKey(const SkPath& path, const GrStrokeInfo& stroke, GrUniqueKey* key,
+                           bool* outIsVolatile);
 
     const SkRect& getBounds() const { return fBounds; }
 
-    const SkStrokeRec& getStroke() const { return fStroke; }
+#ifdef SK_DEBUG
+    bool isEqualTo(const SkPath& path, const GrStrokeInfo& stroke) const;
+#endif
 
 protected:
-    SkPath fSkPath;
-    SkStrokeRec fStroke;
     SkRect fBounds;
+#ifdef SK_DEBUG
+    SkPath fSkPath;
+    GrStrokeInfo fStroke;
+#endif
 
 private:
     typedef GrGpuResource INHERITED;
diff --git a/gfx/skia/skia/src/gpu/GrPathProcessor.cpp b/gfx/skia/skia/src/gpu/GrPathProcessor.cpp
new file mode 100644
index 000000000000..66f94eaaab5c
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrPathProcessor.cpp
@@ -0,0 +1,142 @@
+/*
+* Copyright 2013 Google Inc.
+*
+* Use of this source code is governed by a BSD-style license that can be
+* found in the LICENSE file.
+*/
+
+#include "GrPathProcessor.h"
+
+#include "gl/GrGLGpu.h"
+#include "glsl/GrGLSLCaps.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProcessorTypes.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLVarying.h"
+
+class GrGLPathProcessor : public GrGLSLPrimitiveProcessor {
+public:
+    GrGLPathProcessor() : fColor(GrColor_ILLEGAL) {}
+
+    static void GenKey(const GrPathProcessor& pathProc,
+                       const GrGLSLCaps&,
+                       GrProcessorKeyBuilder* b) {
+        b->add32(SkToInt(pathProc.overrides().readsColor()) |
+                 SkToInt(pathProc.overrides().readsCoverage()) << 16);
+    }
+
+    void emitCode(EmitArgs& args) override {
+        GrGLSLGPBuilder* pb = args.fPB;
+        GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+        const GrPathProcessor& pathProc = args.fGP.cast<GrPathProcessor>();
+
+        // emit transforms
+        this->emitTransforms(args.fVaryingHandler, args.fTransformsIn, args.fTransformsOut);
+
+        // Setup uniform color
+        if (pathProc.overrides().readsColor()) {
+            const char* stagedLocalVarName;
+            fColorUniform = pb->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                           kVec4f_GrSLType,
+                                           kDefault_GrSLPrecision,
+                                           "Color",
+                                           &stagedLocalVarName);
+            fragBuilder->codeAppendf("%s = %s;", args.fOutputColor, stagedLocalVarName);
+        }
+
+        // setup constant solid coverage
+        if (pathProc.overrides().readsCoverage()) {
+            fragBuilder->codeAppendf("%s = vec4(1);", args.fOutputCoverage);
+        }
+    }
+
+    void emitTransforms(GrGLSLVaryingHandler* varyingHandler,
+                        const TransformsIn& tin,
+                        TransformsOut* tout) {
+        tout->push_back_n(tin.count());
+        fInstalledTransforms.push_back_n(tin.count());
+        for (int i = 0; i < tin.count(); i++) {
+            const ProcCoords& coordTransforms = tin[i];
+            fInstalledTransforms[i].push_back_n(coordTransforms.count());
+            for (int t = 0; t < coordTransforms.count(); t++) {
+                GrSLType varyingType =
+                        coordTransforms[t]->getMatrix().hasPerspective() ? kVec3f_GrSLType :
+                                                                           kVec2f_GrSLType;
+
+                SkString strVaryingName("MatrixCoord");
+                strVaryingName.appendf("_%i_%i", i, t);
+                GrGLSLVertToFrag v(varyingType);
+                GrGLVaryingHandler* glVaryingHandler = (GrGLVaryingHandler*) varyingHandler;
+                fInstalledTransforms[i][t].fHandle =
+                        glVaryingHandler->addPathProcessingVarying(strVaryingName.c_str(),
+                                                                   &v).toIndex();
+                fInstalledTransforms[i][t].fType = varyingType;
+
+                SkNEW_APPEND_TO_TARRAY(&(*tout)[i], GrGLSLTransformedCoords,
+                                       (SkString(v.fsIn()), varyingType));
+            }
+        }
+    }
+
+    void setData(const GrGLSLProgramDataManager& pd,
+                 const GrPrimitiveProcessor& primProc) override {
+        const GrPathProcessor& pathProc = primProc.cast<GrPathProcessor>();
+        if (pathProc.overrides().readsColor() && pathProc.color() != fColor) {
+            float c[4];
+            GrColorToRGBAFloat(pathProc.color(), c);
+            pd.set4fv(fColorUniform, 1, c);
+            fColor = pathProc.color();
+        }
+    }
+
+    void setTransformData(const GrPrimitiveProcessor& primProc,
+                          const GrGLSLProgramDataManager& pdman,
+                          int index,
+                          const SkTArray<const GrCoordTransform*, true>& coordTransforms) override {
+        const GrPathProcessor& pathProc = primProc.cast<GrPathProcessor>();
+        SkSTArray<2, Transform, true>& transforms = fInstalledTransforms[index];
+        int numTransforms = transforms.count();
+        for (int t = 0; t < numTransforms; ++t) {
+            SkASSERT(transforms[t].fHandle.isValid());
+            const SkMatrix& transform = GetTransformMatrix(pathProc.localMatrix(),
+                                                           *coordTransforms[t]);
+            if (transforms[t].fCurrentValue.cheapEqualTo(transform)) {
+                continue;
+            }
+            transforms[t].fCurrentValue = transform;
+
+            SkASSERT(transforms[t].fType == kVec2f_GrSLType ||
+                     transforms[t].fType == kVec3f_GrSLType);
+            unsigned components = transforms[t].fType == kVec2f_GrSLType ? 2 : 3;
+            pdman.setPathFragmentInputTransform(transforms[t].fHandle, components, transform);
+        }
+    }
+
+private:
+    UniformHandle fColorUniform;
+    GrColor fColor;
+
+    typedef GrGLSLPrimitiveProcessor INHERITED;
+};
+
+GrPathProcessor::GrPathProcessor(GrColor color,
+                                 const GrXPOverridesForBatch& overrides,
+                                 const SkMatrix& viewMatrix,
+                                 const SkMatrix& localMatrix)
+    : INHERITED(true)
+    , fColor(color)
+    , fViewMatrix(viewMatrix)
+    , fLocalMatrix(localMatrix)
+    , fOverrides(overrides) {
+    this->initClassID<GrPathProcessor>();
+}
+
+void GrPathProcessor::getGLSLProcessorKey(const GrGLSLCaps& caps,
+                                          GrProcessorKeyBuilder* b) const {
+    GrGLPathProcessor::GenKey(*this, caps, b);
+}
+
+GrGLSLPrimitiveProcessor* GrPathProcessor::createGLSLInstance(const GrGLSLCaps& caps) const {
+    SkASSERT(caps.pathRenderingSupport());
+    return new GrGLPathProcessor();
+}
diff --git a/gfx/skia/skia/src/gpu/GrPathProcessor.h b/gfx/skia/skia/src/gpu/GrPathProcessor.h
new file mode 100644
index 000000000000..831770cc9bd9
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrPathProcessor.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrPathProcessor_DEFINED
+#define GrPathProcessor_DEFINED
+
+#include "GrPrimitiveProcessor.h"
+
+/*
+ * The path equivalent of the GP.  For now this just manages color. In the long term we plan on
+ * extending this class to handle all nvpr uniform / varying / program work.
+ */
+class GrPathProcessor : public GrPrimitiveProcessor {
+public:
+    static GrPathProcessor* Create(GrColor color,
+                                   const GrXPOverridesForBatch& overrides,
+                                   const SkMatrix& viewMatrix = SkMatrix::I(),
+                                   const SkMatrix& localMatrix = SkMatrix::I()) {
+        return new GrPathProcessor(color, overrides, viewMatrix, localMatrix);
+    }
+
+    const char* name() const override { return "PathProcessor"; }
+
+    GrColor color() const { return fColor; }
+    const SkMatrix& viewMatrix() const { return fViewMatrix; }
+    const SkMatrix& localMatrix() const { return fLocalMatrix; }
+
+    bool willUseGeoShader() const override { return false; }
+
+    virtual void getGLSLProcessorKey(const GrGLSLCaps& caps,
+                                     GrProcessorKeyBuilder* b) const override;
+
+    virtual GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps& caps) const override;
+
+    bool hasTransformedLocalCoords() const override { return false; }
+
+    const GrXPOverridesForBatch& overrides() const { return fOverrides; }
+
+private:
+    GrPathProcessor(GrColor color, const GrXPOverridesForBatch& overrides,
+                    const SkMatrix& viewMatrix, const SkMatrix& localMatrix);
+
+    bool hasExplicitLocalCoords() const override { return false; }
+
+    GrColor fColor;
+    const SkMatrix fViewMatrix;
+    const SkMatrix fLocalMatrix;
+    GrXPOverridesForBatch fOverrides;
+
+    typedef GrPrimitiveProcessor INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrPathRange.cpp b/gfx/skia/skia/src/gpu/GrPathRange.cpp
new file mode 100644
index 000000000000..754aca0ae652
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrPathRange.cpp
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrPathRange.h"
+#include "SkPath.h"
+
+GrPathRange::GrPathRange(GrGpu* gpu,
+                         PathGenerator* pathGenerator)
+    : INHERITED(gpu, kCached_LifeCycle),
+      fPathGenerator(SkRef(pathGenerator)),
+      fNumPaths(fPathGenerator->getNumPaths()) {
+    const int numGroups = (fNumPaths + kPathsPerGroup - 1) / kPathsPerGroup;
+    fGeneratedPaths.reset((numGroups + 7) / 8); // 1 bit per path group.
+    memset(&fGeneratedPaths.front(), 0, fGeneratedPaths.count());
+}
+
+GrPathRange::GrPathRange(GrGpu* gpu,
+                         int numPaths)
+    : INHERITED(gpu, kCached_LifeCycle),
+      fNumPaths(numPaths) {
+}
+
+void GrPathRange::loadPathsIfNeeded(const void* indices, PathIndexType indexType, int count) const {
+    switch (indexType) {
+        case kU8_PathIndexType:
+            return this->loadPathsIfNeeded(reinterpret_cast<const uint8_t*>(indices), count);
+        case kU16_PathIndexType:
+            return this->loadPathsIfNeeded(reinterpret_cast<const uint16_t*>(indices), count);
+        case kU32_PathIndexType:
+            return this->loadPathsIfNeeded(reinterpret_cast<const uint32_t*>(indices), count);
+        default:
+            SkFAIL("Unknown path index type");
+    }
+}
+
+#ifdef SK_DEBUG
+
+void GrPathRange::assertPathsLoaded(const void* indices, PathIndexType indexType, int count) const {
+    switch (indexType) {
+        case kU8_PathIndexType:
+            return this->assertPathsLoaded(reinterpret_cast<const uint8_t*>(indices), count);
+        case kU16_PathIndexType:
+            return this->assertPathsLoaded(reinterpret_cast<const uint16_t*>(indices), count);
+        case kU32_PathIndexType:
+            return this->assertPathsLoaded(reinterpret_cast<const uint32_t*>(indices), count);
+        default:
+            SkFAIL("Unknown path index type");
+    }
+}
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrPathRange.h b/gfx/skia/skia/src/gpu/GrPathRange.h
index c53b9873823b..00165d198e18 100644
--- a/gfx/skia/skia/src/gpu/GrPathRange.h
+++ b/gfx/skia/skia/src/gpu/GrPathRange.h
@@ -9,51 +9,144 @@
 #define GrPathRange_DEFINED
 
 #include "GrGpuResource.h"
-#include "GrResourceCache.h"
-#include "SkStrokeRec.h"
+#include "SkPath.h"
+#include "SkRefCnt.h"
+#include "SkTArray.h"
 
-class SkPath;
+class SkDescriptor;
 
 /**
- * Represents a contiguous range of GPU path objects with a common stroke. The
- * path range is immutable with the exception that individual paths can be
- * initialized lazily. Unititialized paths are silently ignored by drawing
- * functions.
+ * Represents a contiguous range of GPU path objects.
+ * This object is immutable with the exception that individual paths may be
+ * initialized lazily.
  */
+
 class GrPathRange : public GrGpuResource {
 public:
-    SK_DECLARE_INST_COUNT(GrPathRange);
+    
 
-    static const bool kIsWrapped = false;
+    enum PathIndexType {
+        kU8_PathIndexType,   //!< uint8_t
+        kU16_PathIndexType,  //!< uint16_t
+        kU32_PathIndexType,  //!< uint32_t
 
-    static GrResourceKey::ResourceType resourceType() {
-        static const GrResourceKey::ResourceType type = GrResourceKey::GenerateResourceType();
-        return type;
+        kLast_PathIndexType = kU32_PathIndexType
+    };
+
+    static inline int PathIndexSizeInBytes(PathIndexType type) {
+        GR_STATIC_ASSERT(0 == kU8_PathIndexType);
+        GR_STATIC_ASSERT(1 == kU16_PathIndexType);
+        GR_STATIC_ASSERT(2 == kU32_PathIndexType);
+        GR_STATIC_ASSERT(kU32_PathIndexType == kLast_PathIndexType);
+
+        return 1 << type;
     }
 
     /**
-     * Initialize to a range with a fixed size and stroke. Stroke must not be hairline.
+     * Class that generates the paths for a specific range.
      */
-    GrPathRange(GrGpu* gpu, size_t size, const SkStrokeRec& stroke)
-        : INHERITED(gpu, kIsWrapped),
-          fSize(size),
-          fStroke(stroke) {
-    }
-
-    size_t getSize() const { return fSize; }
-    const SkStrokeRec& getStroke() const { return fStroke; }
+    class PathGenerator : public SkRefCnt {
+    public:
+        virtual int getNumPaths() = 0;
+        virtual void generatePath(int index, SkPath* out) = 0;
+#ifdef SK_DEBUG
+        virtual bool isEqualTo(const SkDescriptor&) const { return false; }
+#endif
+        virtual ~PathGenerator() {}
+    };
 
     /**
-     * Initialize a path in the range. It is invalid to call this method for a
-     * path that has already been initialized.
+     * Initialize a lazy-loaded path range. This class will generate an SkPath and call
+     * onInitPath() for each path within the range before it is drawn for the first time.
      */
-    virtual void initAt(size_t index, const SkPath&) = 0;
+    GrPathRange(GrGpu*, PathGenerator*);
 
+    /**
+     * Initialize an eager-loaded path range. The subclass is responsible for ensuring all
+     * the paths are initialized up front.
+     */
+    GrPathRange(GrGpu*, int numPaths);
+
+    int getNumPaths() const { return fNumPaths; }
+    const PathGenerator* getPathGenerator() const { return fPathGenerator.get(); }
+
+    void loadPathsIfNeeded(const void* indices, PathIndexType, int count) const;
+
+    template<typename IndexType> void loadPathsIfNeeded(const IndexType* indices, int count) const {
+        if (!fPathGenerator) {
+            return;
+        }
+
+        bool didLoadPaths = false;
+
+        for (int i = 0; i < count; ++i) {
+            SkASSERT(indices[i] < static_cast<uint32_t>(fNumPaths));
+
+            const int groupIndex = indices[i] / kPathsPerGroup;
+            const int groupByte = groupIndex / 8;
+            const uint8_t groupBit = 1 << (groupIndex % 8);
+
+            const bool hasPath = SkToBool(fGeneratedPaths[groupByte] & groupBit);
+            if (!hasPath) {
+                // We track which paths are loaded in groups of kPathsPerGroup. To
+                // mark a path as loaded we need to load the entire group.
+                const int groupFirstPath = groupIndex * kPathsPerGroup;
+                const int groupLastPath = SkTMin(groupFirstPath + kPathsPerGroup, fNumPaths) - 1;
+
+                SkPath path;
+                for (int pathIdx = groupFirstPath; pathIdx <= groupLastPath; ++pathIdx) {
+                    fPathGenerator->generatePath(pathIdx, &path);
+                    this->onInitPath(pathIdx, path);
+                }
+
+                fGeneratedPaths[groupByte] |= groupBit;
+                didLoadPaths = true;
+            }
+        }
+
+        if (didLoadPaths) {
+            this->didChangeGpuMemorySize();
+        }
+    }
+
+#ifdef SK_DEBUG
+    void assertPathsLoaded(const void* indices, PathIndexType, int count) const;
+
+    template<typename IndexType> void assertPathsLoaded(const IndexType* indices, int count) const {
+        if (!fPathGenerator) {
+            return;
+        }
+
+        for (int i = 0; i < count; ++i) {
+            SkASSERT(indices[i] < static_cast<uint32_t>(fNumPaths));
+
+            const int groupIndex = indices[i] / kPathsPerGroup;
+            const int groupByte = groupIndex / 8;
+            const uint8_t groupBit = 1 << (groupIndex % 8);
+
+            SkASSERT(fGeneratedPaths[groupByte] & groupBit);
+        }
+    }
+
+    virtual bool isEqualTo(const SkDescriptor& desc) const {
+        return nullptr != fPathGenerator.get() && fPathGenerator->isEqualTo(desc);
+    }
+#endif
 protected:
-    size_t fSize;
-    SkStrokeRec fStroke;
+    // Initialize a path in the range before drawing. This is only called when
+    // fPathGenerator is non-null. The child class need not call didChangeGpuMemorySize(),
+    // GrPathRange will take care of that after the call is complete.
+    virtual void onInitPath(int index, const SkPath&) const = 0;
 
 private:
+    enum {
+        kPathsPerGroup = 16 // Paths get tracked in groups of 16 for lazy loading.
+    };
+
+    mutable SkAutoTUnref<PathGenerator> fPathGenerator;
+    mutable SkTArray<uint8_t, true /*MEM_COPY*/> fGeneratedPaths;
+    const int fNumPaths;
+
     typedef GrGpuResource INHERITED;
 };
 
diff --git a/gfx/skia/skia/src/gpu/GrPathRenderer.h b/gfx/skia/skia/src/gpu/GrPathRenderer.h
index 88665c1d423e..7ada6d10f79a 100644
--- a/gfx/skia/skia/src/gpu/GrPathRenderer.h
+++ b/gfx/skia/skia/src/gpu/GrPathRenderer.h
@@ -10,11 +10,10 @@
 #define GrPathRenderer_DEFINED
 
 #include "GrDrawTarget.h"
-#include "GrPathRendererChain.h"
 #include "GrStencil.h"
+#include "GrStrokeInfo.h"
 
 #include "SkDrawProcs.h"
-#include "SkStrokeRec.h"
 #include "SkTArray.h"
 
 class SkPath;
@@ -24,37 +23,23 @@ struct GrPoint;
 /**
  *  Base class for drawing paths into a GrDrawTarget.
  *
- *  Derived classes can use stages GrPaint::kTotalStages through GrDrawState::kNumStages-1. The
- *  stages before GrPaint::kTotalStages are reserved for setting up the draw (i.e., textures and
+ *  Derived classes can use stages GrPaint::kTotalStages through GrPipelineBuilder::kNumStages-1.
+ *  The stages before GrPaint::kTotalStages are reserved for setting up the draw (i.e., textures and
  *  filter masks).
  */
 class SK_API GrPathRenderer : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(GrPathRenderer)
-
-    /**
-     * This is called to install custom path renderers in every GrContext at create time. The
-     * default implementation in GrCreatePathRenderer_none.cpp does not add any additional
-     * renderers. Link against another implementation to install your own. The first added is the
-     * most preferred path renderer, second is second most preferred, etc.
-     *
-     * @param context   the context that will use the path renderer
-     * @param prChain   the chain to add path renderers to.
-     */
-    static void AddPathRenderers(GrContext* context, GrPathRendererChain* prChain);
-
-
     GrPathRenderer();
 
     /**
      * A caller may wish to use a path renderer to draw a path into the stencil buffer. However,
      * the path renderer itself may require use of the stencil buffer. Also a path renderer may
-     * use a GrEffect coverage stage that sets coverage to zero to eliminate pixels that are covered
-     * by bounding geometry but outside the path. These exterior pixels would still be rendered into
-     * the stencil.
+     * use a GrProcessor coverage stage that sets coverage to zero to eliminate pixels that are
+     * covered by bounding geometry but outside the path. These exterior pixels would still be
+     * rendered into the stencil.
      *
      * A GrPathRenderer can provide three levels of support for stenciling paths:
-     * 1) kNoRestriction: This is the most general. The caller sets up the GrDrawState on the target
+     * 1) kNoRestriction: This is the most general. The caller sets up the GrPipelineBuilder on the target
      *                    and calls drawPath(). The path is rendered exactly as the draw state
      *                    indicates including support for simultaneous color and stenciling with
      *                    arbitrary stenciling rules. Pixels partially covered by AA paths are
@@ -65,85 +50,172 @@ public:
      *                  covered by the path.
      * 3) kNoSupport: This path renderer cannot be used to stencil the path.
      */
-    typedef GrPathRendererChain::StencilSupport StencilSupport;
-    static const StencilSupport kNoSupport_StencilSupport =
-        GrPathRendererChain::kNoSupport_StencilSupport;
-    static const StencilSupport kStencilOnly_StencilSupport =
-        GrPathRendererChain::kStencilOnly_StencilSupport;
-    static const StencilSupport kNoRestriction_StencilSupport =
-        GrPathRendererChain::kNoRestriction_StencilSupport;
+    enum StencilSupport {
+        kNoSupport_StencilSupport,
+        kStencilOnly_StencilSupport,
+        kNoRestriction_StencilSupport,
+    };
 
     /**
      * This function is to get the stencil support for a particular path. The path's fill must
      * not be an inverse type.
      *
-     * @param target    target that the path will be rendered to
      * @param path      the path that will be drawn
      * @param stroke    the stroke information (width, join, cap).
      */
-    StencilSupport getStencilSupport(const SkPath& path,
-                                     const SkStrokeRec& stroke,
-                                     const GrDrawTarget* target) const {
+    StencilSupport getStencilSupport(const SkPath& path, const GrStrokeInfo& stroke) const {
         SkASSERT(!path.isInverseFillType());
-        return this->onGetStencilSupport(path, stroke, target);
+        return this->onGetStencilSupport(path, stroke);
     }
 
+    /** Args to canDrawPath()
+     *
+     * fShaderCaps       The shader caps
+     * fPipelineBuilder  The pipelineBuilder
+     * fViewMatrix       The viewMatrix
+     * fPath             The path to draw
+     * fStroke           The stroke information (width, join, cap)
+     * fAntiAlias        True if anti-aliasing is required.
+     */
+    struct CanDrawPathArgs {
+        const GrShaderCaps*         fShaderCaps;
+        const SkMatrix*             fViewMatrix;
+        const SkPath*               fPath;
+        const GrStrokeInfo*         fStroke;
+        bool                        fAntiAlias;
+
+        // These next two are only used by GrStencilAndCoverPathRenderer
+        bool                        fIsStencilDisabled;
+        bool                        fIsStencilBufferMSAA;
+
+        void validate() const {
+            SkASSERT(fShaderCaps);
+            SkASSERT(fViewMatrix);
+            SkASSERT(fPath);
+            SkASSERT(fStroke);
+            SkASSERT(!fPath->isEmpty());
+        }
+    };
+
     /**
      * Returns true if this path renderer is able to render the path. Returning false allows the
      * caller to fallback to another path renderer This function is called when searching for a path
      * renderer capable of rendering a path.
      *
-     * @param path       The path to draw
-     * @param stroke     The stroke information (width, join, cap)
-     * @param target     The target that the path will be rendered to
-     * @param antiAlias  True if anti-aliasing is required.
-     *
      * @return  true if the path can be drawn by this object, false otherwise.
      */
-    virtual bool canDrawPath(const SkPath& path,
-                             const SkStrokeRec& rec,
-                             const GrDrawTarget* target,
-                             bool antiAlias) const = 0;
+    bool canDrawPath(const CanDrawPathArgs& args) const {
+        SkDEBUGCODE(args.validate();)
+        return this->onCanDrawPath(args);
+    }
+
+    /**
+     * Args to drawPath()
+     *
+     * fTarget                The target that the path will be rendered to
+     * fResourceProvider      The resource provider for creating gpu resources to render the path
+     * fPipelineBuilder       The pipelineBuilder
+     * fColor                 Color to render with
+     * fViewMatrix            The viewMatrix
+     * fPath                  the path to draw.
+     * fStroke                the stroke information (width, join, cap)
+     * fAntiAlias             true if anti-aliasing is required.
+     */
+    struct DrawPathArgs {
+        GrDrawTarget*               fTarget;
+        GrResourceProvider*         fResourceProvider;
+        GrPipelineBuilder*          fPipelineBuilder;
+        GrColor                     fColor;
+        const SkMatrix*             fViewMatrix;
+        const SkPath*               fPath;
+        const GrStrokeInfo*         fStroke;
+        bool                        fAntiAlias;
+
+        void validate() const {
+            SkASSERT(fTarget);
+            SkASSERT(fResourceProvider);
+            SkASSERT(fPipelineBuilder);
+            SkASSERT(fViewMatrix);
+            SkASSERT(fPath);
+            SkASSERT(fStroke);
+            SkASSERT(!fPath->isEmpty());
+        }
+    };
+
     /**
      * Draws the path into the draw target. If getStencilSupport() would return kNoRestriction then
-     * the subclass must respect the stencil settings of the target's draw state.
-     *
-     * @param path                  the path to draw.
-     * @param stroke                the stroke information (width, join, cap)
-     * @param target                target that the path will be rendered to
-     * @param antiAlias             true if anti-aliasing is required.
+     * the subclass must respect the stencil settings of the GrPipelineBuilder.
      */
-    bool drawPath(const SkPath& path,
-                  const SkStrokeRec& stroke,
-                  GrDrawTarget* target,
-                  bool antiAlias) {
-        SkASSERT(!path.isEmpty());
-        SkASSERT(this->canDrawPath(path, stroke, target, antiAlias));
-        SkASSERT(target->drawState()->getStencil().isDisabled() ||
-                 kNoRestriction_StencilSupport == this->getStencilSupport(path, stroke, target));
-        return this->onDrawPath(path, stroke, target, antiAlias);
+    bool drawPath(const DrawPathArgs& args) {
+        SkDEBUGCODE(args.validate();)
+#ifdef SK_DEBUG
+        CanDrawPathArgs canArgs;
+        canArgs.fShaderCaps = args.fTarget->caps()->shaderCaps();
+        canArgs.fViewMatrix = args.fViewMatrix;
+        canArgs.fPath = args.fPath;
+        canArgs.fStroke = args.fStroke;
+        canArgs.fAntiAlias = args.fAntiAlias;
+
+        canArgs.fIsStencilDisabled = args.fPipelineBuilder->getStencil().isDisabled();
+        canArgs.fIsStencilBufferMSAA = 
+                          args.fPipelineBuilder->getRenderTarget()->isStencilBufferMultisampled();
+        SkASSERT(this->canDrawPath(canArgs));
+        SkASSERT(args.fPipelineBuilder->getStencil().isDisabled() ||
+                 kNoRestriction_StencilSupport == this->getStencilSupport(*args.fPath,
+                                                                          *args.fStroke));
+#endif
+        return this->onDrawPath(args);
     }
 
+    /* Args to stencilPath().
+     *
+     * fTarget                The target that the path will be rendered to.
+     * fResourceProvider      The resource provider for creating gpu resources to render the path
+     * fPipelineBuilder       The pipeline builder.
+     * fViewMatrix            Matrix applied to the path.
+     * fPath                  The path to draw.
+     * fStroke                The stroke information (width, join, cap)
+     */
+    struct StencilPathArgs {
+        GrDrawTarget*       fTarget;
+        GrResourceProvider* fResourceProvider;
+        GrPipelineBuilder*  fPipelineBuilder;
+        const SkMatrix*     fViewMatrix;
+        const SkPath*       fPath;
+        const GrStrokeInfo* fStroke;
+
+        void validate() const {
+            SkASSERT(fTarget);
+            SkASSERT(fResourceProvider);
+            SkASSERT(fPipelineBuilder);
+            SkASSERT(fViewMatrix);
+            SkASSERT(fPath);
+            SkASSERT(fStroke);
+            SkASSERT(!fPath->isEmpty());
+        }
+    };
+
     /**
      * Draws the path to the stencil buffer. Assume the writable stencil bits are already
      * initialized to zero. The pixels inside the path will have non-zero stencil values afterwards.
      *
-     * @param path                  the path to draw.
-     * @param stroke                the stroke information (width, join, cap)
-     * @param target                target that the path will be rendered to
      */
-    void stencilPath(const SkPath& path, const SkStrokeRec& stroke, GrDrawTarget* target) {
-        SkASSERT(!path.isEmpty());
-        SkASSERT(kNoSupport_StencilSupport != this->getStencilSupport(path, stroke, target));
-        this->onStencilPath(path, stroke, target);
+    void stencilPath(const StencilPathArgs& args) {
+        SkDEBUGCODE(args.validate();)
+        SkASSERT(kNoSupport_StencilSupport != this->getStencilSupport(*args.fPath, *args.fStroke));
+
+        this->onStencilPath(args);
     }
 
     // Helper for determining if we can treat a thin stroke as a hairline w/ coverage.
     // If we can, we draw lots faster (raster device does this same test).
-    static bool IsStrokeHairlineOrEquivalent(const SkStrokeRec& stroke, const SkMatrix& matrix,
+    static bool IsStrokeHairlineOrEquivalent(const GrStrokeInfo& stroke, const SkMatrix& matrix,
                                              SkScalar* outCoverage) {
+        if (stroke.isDashed()) {
+            return false;
+        }
         if (stroke.isHairlineStyle()) {
-            if (NULL != outCoverage) {
+            if (outCoverage) {
                 *outCoverage = SK_Scalar1;
             }
             return true;
@@ -153,42 +225,6 @@ public:
     }
 
 protected:
-    /**
-     * Subclass overrides if it has any limitations of stenciling support.
-     */
-    virtual StencilSupport onGetStencilSupport(const SkPath&,
-                                               const SkStrokeRec&,
-                                               const GrDrawTarget*) const {
-        return kNoRestriction_StencilSupport;
-    }
-
-    /**
-     * Subclass implementation of drawPath()
-     */
-    virtual bool onDrawPath(const SkPath& path,
-                            const SkStrokeRec& stroke,
-                            GrDrawTarget* target,
-                            bool antiAlias) = 0;
-
-    /**
-     * Subclass implementation of stencilPath(). Subclass must override iff it ever returns
-     * kStencilOnly in onGetStencilSupport().
-     */
-    virtual void onStencilPath(const SkPath& path,  const SkStrokeRec& stroke, GrDrawTarget* target) {
-        GrDrawTarget::AutoStateRestore asr(target, GrDrawTarget::kPreserve_ASRInit);
-        GrDrawState* drawState = target->drawState();
-        GR_STATIC_CONST_SAME_STENCIL(kIncrementStencil,
-                                     kReplace_StencilOp,
-                                     kReplace_StencilOp,
-                                     kAlways_StencilFunc,
-                                     0xffff,
-                                     0xffff,
-                                     0xffff);
-        drawState->setStencil(kIncrementStencil);
-        drawState->enableState(GrDrawState::kNoColorWrites_StateBit);
-        this->drawPath(path, stroke, target, false);
-    }
-
     // Helper for getting the device bounds of a path. Inverse filled paths will have bounds set
     // by devSize. Non-inverse path bounds will not necessarily be clipped to devSize.
     static void GetPathDevBounds(const SkPath& path,
@@ -206,6 +242,49 @@ protected:
     }
 
 private:
+    /**
+     * Subclass overrides if it has any limitations of stenciling support.
+     */
+    virtual StencilSupport onGetStencilSupport(const SkPath&, const GrStrokeInfo&) const {
+        return kNoRestriction_StencilSupport;
+    }
+
+    /**
+     * Subclass implementation of drawPath()
+     */
+    virtual bool onDrawPath(const DrawPathArgs& args) = 0;
+
+    /**
+     * Subclass implementation of canDrawPath()
+     */
+    virtual bool onCanDrawPath(const CanDrawPathArgs& args) const = 0;
+
+    /**
+     * Subclass implementation of stencilPath(). Subclass must override iff it ever returns
+     * kStencilOnly in onGetStencilSupport().
+     */
+    virtual void onStencilPath(const StencilPathArgs& args) {
+        GR_STATIC_CONST_SAME_STENCIL(kIncrementStencil,
+                                     kReplace_StencilOp,
+                                     kReplace_StencilOp,
+                                     kAlways_StencilFunc,
+                                     0xffff,
+                                     0xffff,
+                                     0xffff);
+        args.fPipelineBuilder->setStencil(kIncrementStencil);
+        args.fPipelineBuilder->setDisableColorXPFactory();
+        DrawPathArgs drawArgs;
+        drawArgs.fTarget = args.fTarget;
+        drawArgs.fResourceProvider = args.fResourceProvider;
+        drawArgs.fPipelineBuilder = args.fPipelineBuilder;
+        drawArgs.fColor = 0xFFFFFFFF;
+        drawArgs.fViewMatrix = args.fViewMatrix;
+        drawArgs.fPath = args.fPath;
+        drawArgs.fStroke = args.fStroke;
+        drawArgs.fAntiAlias = false;
+        this->drawPath(drawArgs);
+    }
+
 
     typedef SkRefCnt INHERITED;
 };
diff --git a/gfx/skia/skia/src/gpu/GrPathRendererChain.cpp b/gfx/skia/skia/src/gpu/GrPathRendererChain.cpp
index cac0475bbf77..e13e6c658488 100644
--- a/gfx/skia/skia/src/gpu/GrPathRendererChain.cpp
+++ b/gfx/skia/skia/src/gpu/GrPathRendererChain.cpp
@@ -9,14 +9,34 @@
 
 #include "GrPathRendererChain.h"
 
+#include "GrCaps.h"
 #include "GrContext.h"
-#include "GrDefaultPathRenderer.h"
-#include "GrDrawTargetCaps.h"
 #include "GrGpu.h"
 
-GrPathRendererChain::GrPathRendererChain(GrContext* context)
-    : fInit(false)
-    , fOwner(context) {
+#include "batches/GrAAConvexPathRenderer.h"
+#include "batches/GrAADistanceFieldPathRenderer.h"
+#include "batches/GrAAHairLinePathRenderer.h"
+#include "batches/GrAALinearizingConvexPathRenderer.h"
+#include "batches/GrDashLinePathRenderer.h"
+#include "batches/GrDefaultPathRenderer.h"
+#include "batches/GrStencilAndCoverPathRenderer.h"
+#include "batches/GrTessellatingPathRenderer.h"
+
+GrPathRendererChain::GrPathRendererChain(GrContext* context) {
+    const GrCaps& caps = *context->caps();
+    this->addPathRenderer(new GrDashLinePathRenderer)->unref();
+
+    if (GrPathRenderer* pr = GrStencilAndCoverPathRenderer::Create(context->resourceProvider(),
+                                                                   caps)) {
+        this->addPathRenderer(pr)->unref();
+    }
+    this->addPathRenderer(new GrTessellatingPathRenderer)->unref();
+    this->addPathRenderer(new GrAAHairLinePathRenderer)->unref();
+    this->addPathRenderer(new GrAAConvexPathRenderer)->unref();
+    this->addPathRenderer(new GrAALinearizingConvexPathRenderer)->unref();
+    this->addPathRenderer(new GrAADistanceFieldPathRenderer)->unref();
+    this->addPathRenderer(new GrDefaultPathRenderer(caps.twoSidedStencilSupport(),
+                                                    caps.stencilWrapOpsSupport()))->unref();
 }
 
 GrPathRendererChain::~GrPathRendererChain() {
@@ -31,17 +51,9 @@ GrPathRenderer* GrPathRendererChain::addPathRenderer(GrPathRenderer* pr) {
     return pr;
 }
 
-GrPathRenderer* GrPathRendererChain::getPathRenderer(const SkPath& path,
-                                                     const SkStrokeRec& stroke,
-                                                     const GrDrawTarget* target,
+GrPathRenderer* GrPathRendererChain::getPathRenderer(const GrPathRenderer::CanDrawPathArgs& args,
                                                      DrawType drawType,
-                                                     StencilSupport* stencilSupport) {
-    if (!fInit) {
-        this->init();
-    }
-    bool antiAlias = (kColorAntiAlias_DrawType == drawType ||
-                      kStencilAndColorAntiAlias_DrawType == drawType);
-
+                                                     GrPathRenderer::StencilSupport* stencilSupport) {
     GR_STATIC_ASSERT(GrPathRenderer::kNoSupport_StencilSupport <
                      GrPathRenderer::kStencilOnly_StencilSupport);
     GR_STATIC_ASSERT(GrPathRenderer::kStencilOnly_StencilSupport <
@@ -56,32 +68,19 @@ GrPathRenderer* GrPathRendererChain::getPathRenderer(const SkPath& path,
         minStencilSupport = GrPathRenderer::kNoSupport_StencilSupport;
     }
 
-
     for (int i = 0; i < fChain.count(); ++i) {
-        if (fChain[i]->canDrawPath(path, stroke, target, antiAlias)) {
+        if (fChain[i]->canDrawPath(args)) {
             if (GrPathRenderer::kNoSupport_StencilSupport != minStencilSupport) {
-                GrPathRenderer::StencilSupport support = fChain[i]->getStencilSupport(path,
-                                                                                      stroke,
-                                                                                      target);
+                GrPathRenderer::StencilSupport support =
+                                        fChain[i]->getStencilSupport(*args.fPath, *args.fStroke);
                 if (support < minStencilSupport) {
                     continue;
-                } else if (NULL != stencilSupport) {
+                } else if (stencilSupport) {
                     *stencilSupport = support;
                 }
             }
             return fChain[i];
         }
     }
-    return NULL;
-}
-
-void GrPathRendererChain::init() {
-    SkASSERT(!fInit);
-    GrGpu* gpu = fOwner->getGpu();
-    bool twoSided = gpu->caps()->twoSidedStencilSupport();
-    bool wrapOp = gpu->caps()->stencilWrapOpsSupport();
-    GrPathRenderer::AddPathRenderers(fOwner, this);
-    this->addPathRenderer(SkNEW_ARGS(GrDefaultPathRenderer,
-                                     (twoSided, wrapOp)))->unref();
-    fInit = true;
+    return nullptr;
 }
diff --git a/gfx/skia/skia/include/gpu/GrPathRendererChain.h b/gfx/skia/skia/src/gpu/GrPathRendererChain.h
similarity index 70%
rename from gfx/skia/skia/include/gpu/GrPathRendererChain.h
rename to gfx/skia/skia/src/gpu/GrPathRendererChain.h
index ca8c35bdeb37..ade30551ae50 100644
--- a/gfx/skia/skia/include/gpu/GrPathRendererChain.h
+++ b/gfx/skia/skia/src/gpu/GrPathRendererChain.h
@@ -8,14 +8,12 @@
 #ifndef GrPathRendererChain_DEFINED
 #define GrPathRendererChain_DEFINED
 
-#include "SkRefCnt.h"
+#include "GrPathRenderer.h"
+
+#include "SkTypes.h"
 #include "SkTArray.h"
 
 class GrContext;
-class GrDrawTarget;
-class GrPathRenderer;
-class SkPath;
-class SkStrokeRec;
 
 /**
  * Keeps track of an ordered list of path renderers. When a path needs to be
@@ -23,24 +21,12 @@ class SkStrokeRec;
  * path renderer to the list implement the GrPathRenderer::AddPathRenderers
  * function.
  */
-class GrPathRendererChain : public SkRefCnt {
+class GrPathRendererChain : public SkNoncopyable {
 public:
-    // See comments in GrPathRenderer.h
-    enum StencilSupport {
-        kNoSupport_StencilSupport,
-        kStencilOnly_StencilSupport,
-        kNoRestriction_StencilSupport,
-    };
-
-    SK_DECLARE_INST_COUNT(GrPathRendererChain)
-
     GrPathRendererChain(GrContext* context);
 
     ~GrPathRendererChain();
 
-    // takes a ref and unrefs in destructor
-    GrPathRenderer* addPathRenderer(GrPathRenderer* pr);
-
     /** Documents how the caller plans to use a GrPathRenderer to draw a path. It affects the PR
         returned by getPathRenderer */
     enum DrawType {
@@ -51,29 +37,23 @@ public:
         kStencilAndColorAntiAlias_DrawType  // draw the stencil and color buffer, with partial
                                             // coverage AA.
     };
+
     /** Returns a GrPathRenderer compatible with the request if one is available. If the caller
         is drawing the path to the stencil buffer then stencilSupport can be used to determine
         whether the path can be rendered with arbitrary stencil rules or not. See comments on
         StencilSupport in GrPathRenderer.h. */
-    GrPathRenderer* getPathRenderer(const SkPath& path,
-                                    const SkStrokeRec& rec,
-                                    const GrDrawTarget* target,
+    GrPathRenderer* getPathRenderer(const GrPathRenderer::CanDrawPathArgs& args,
                                     DrawType drawType,
-                                    StencilSupport* stencilSupport);
+                                    GrPathRenderer::StencilSupport* stencilSupport);
 
 private:
-    GrPathRendererChain();
-
-    void init();
+    // takes a ref and unrefs in destructor
+    GrPathRenderer* addPathRenderer(GrPathRenderer* pr);
 
     enum {
         kPreAllocCount = 8,
     };
-    bool fInit;
-    GrContext*                                          fOwner;
     SkSTArray<kPreAllocCount, GrPathRenderer*, true>    fChain;
-
-    typedef SkRefCnt INHERITED;
 };
 
 #endif
diff --git a/gfx/skia/skia/src/gpu/GrPathRendering.cpp b/gfx/skia/skia/src/gpu/GrPathRendering.cpp
new file mode 100644
index 000000000000..0287eb08aa82
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrPathRendering.cpp
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrPathRendering.h"
+#include "SkDescriptor.h"
+#include "SkGlyph.h"
+#include "SkMatrix.h"
+#include "SkTypeface.h"
+#include "GrPathRange.h"
+
+class GlyphGenerator : public GrPathRange::PathGenerator {
+public:
+    GlyphGenerator(const SkTypeface& typeface, const SkDescriptor& desc)
+        : fScalerContext(typeface.createScalerContext(&desc))
+#ifdef SK_DEBUG
+        , fDesc(desc.copy())
+#endif
+    {}
+
+    virtual ~GlyphGenerator() {
+#ifdef SK_DEBUG
+        SkDescriptor::Free(fDesc);
+#endif
+    }
+
+    int getNumPaths() override {
+        return fScalerContext->getGlyphCount();
+    }
+
+    void generatePath(int glyphID, SkPath* out) override {
+        SkGlyph skGlyph;
+        skGlyph.initWithGlyphID(glyphID);
+        fScalerContext->getMetrics(&skGlyph);
+
+        fScalerContext->getPath(skGlyph, out);
+    }
+#ifdef SK_DEBUG
+    bool isEqualTo(const SkDescriptor& desc) const override {
+        return fDesc->equals(desc);
+    }
+#endif
+private:
+    const SkAutoTDelete<SkScalerContext> fScalerContext;
+#ifdef SK_DEBUG
+    SkDescriptor* const fDesc;
+#endif
+};
+
+GrPathRange* GrPathRendering::createGlyphs(const SkTypeface* typeface,
+                                           const SkDescriptor* desc,
+                                           const GrStrokeInfo& stroke) {
+    if (nullptr == typeface) {
+        typeface = SkTypeface::GetDefaultTypeface();
+        SkASSERT(nullptr != typeface);
+    }
+
+    if (desc) {
+        SkAutoTUnref<GlyphGenerator> generator(new GlyphGenerator(*typeface, *desc));
+        return this->createPathRange(generator, stroke);
+    }
+
+    SkScalerContextRec rec;
+    memset(&rec, 0, sizeof(rec));
+    rec.fFontID = typeface->uniqueID();
+    rec.fTextSize = SkPaint::kCanonicalTextSizeForPaths;
+    rec.fPreScaleX = rec.fPost2x2[0][0] = rec.fPost2x2[1][1] = SK_Scalar1;
+    // Don't bake stroke information into the glyphs, we'll let the GPU do the stroking.
+
+    SkAutoDescriptor ad(sizeof(rec) + SkDescriptor::ComputeOverhead(1));
+    SkDescriptor*    genericDesc = ad.getDesc();
+
+    genericDesc->init();
+    genericDesc->addEntry(kRec_SkDescriptorTag, sizeof(rec), &rec);
+    genericDesc->computeChecksum();
+
+    SkAutoTUnref<GlyphGenerator> generator(new GlyphGenerator(*typeface, *genericDesc));
+    return this->createPathRange(generator, stroke);
+}
diff --git a/gfx/skia/skia/src/gpu/GrPathRendering.h b/gfx/skia/skia/src/gpu/GrPathRendering.h
new file mode 100644
index 000000000000..a2e9c0295b86
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrPathRendering.h
@@ -0,0 +1,203 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrPathRendering_DEFINED
+#define GrPathRendering_DEFINED
+
+#include "SkPath.h"
+#include "GrGpu.h"
+#include "GrPathRange.h"
+#include "GrPipeline.h"
+
+class SkDescriptor;
+class SkTypeface;
+class GrPath;
+class GrStencilSettings;
+class GrStrokeInfo;
+
+/**
+ * Abstract class wrapping HW path rendering API.
+ *
+ * The subclasses of this class use the possible HW API to render paths (as opposed to path
+ * rendering implemented in Skia on top of a "3d" HW API).
+ * The subclasses hold the global state needed to render paths, including shadow of the global HW
+ * API state. Similar to GrGpu.
+ *
+ * It is expected that the lifetimes of GrGpuXX and GrXXPathRendering are the same. The call context
+ * interface (eg.  * the concrete instance of GrGpu subclass) should be provided to the instance
+ * during construction.
+ */
+class GrPathRendering {
+public:
+    virtual ~GrPathRendering() { }
+
+    typedef GrPathRange::PathIndexType PathIndexType;
+
+    enum PathTransformType {
+        kNone_PathTransformType,        //!< []
+        kTranslateX_PathTransformType,  //!< [kMTransX]
+        kTranslateY_PathTransformType,  //!< [kMTransY]
+        kTranslate_PathTransformType,   //!< [kMTransX, kMTransY]
+        kAffine_PathTransformType,      //!< [kMScaleX, kMSkewX, kMTransX, kMSkewY, kMScaleY, kMTransY]
+
+        kLast_PathTransformType = kAffine_PathTransformType
+    };
+
+    static inline int PathTransformSize(PathTransformType type) {
+        switch (type) {
+            case kNone_PathTransformType:
+                return 0;
+            case kTranslateX_PathTransformType:
+            case kTranslateY_PathTransformType:
+                return 1;
+            case kTranslate_PathTransformType:
+                return 2;
+            case kAffine_PathTransformType:
+                return 6;
+
+            default:
+                SkFAIL("Unknown path transform type");
+                return 0;
+        }
+    }
+
+    // No native support for inverse at this time
+    enum FillType {
+        /** Specifies that "inside" is computed by a non-zero sum of signed
+            edge crossings
+        */
+        kWinding_FillType,
+        /** Specifies that "inside" is computed by an odd number of edge
+            crossings
+        */
+        kEvenOdd_FillType,
+    };
+
+    /**
+     * Creates a new gpu path, based on the specified path and stroke and returns it.
+     * The caller owns a ref on the returned path which must be balanced by a call to unref.
+     *
+     * @param skPath the path geometry.
+     * @param stroke the path stroke.
+     * @return a new path.
+     */
+    virtual GrPath* createPath(const SkPath&, const GrStrokeInfo&) = 0;
+
+    /**
+     * Creates a range of gpu paths with a common stroke. The caller owns a ref on the
+     * returned path range which must be balanced by a call to unref.
+     *
+     * @param PathGenerator class that generates SkPath objects for each path in the range.
+     * @param GrStrokeInfo   the common stroke applied to each path in the range.
+     * @return a new path range.
+     */
+    virtual GrPathRange* createPathRange(GrPathRange::PathGenerator*, const GrStrokeInfo&) = 0;
+
+    /**
+     * Creates a range of glyph paths, indexed by glyph id. The glyphs will have an
+     * inverted y-direction in order to match the raw font path data. The caller owns
+     * a ref on the returned path range which must be balanced by a call to unref.
+     *
+     * @param SkTypeface   Typeface that defines the glyphs.
+     *                     If null, the default typeface will be used.
+     *
+     * @param SkDescriptor Additional font configuration that specifies the font's size,
+     *                     stroke, and other flags. This will generally come from an
+     *                     SkGlyphCache.
+     *
+     *                     It is recommended to leave this value null when possible, in
+     *                     which case the glyphs will be loaded directly from the font's
+     *                     raw path data and sized at SkPaint::kCanonicalTextSizeForPaths.
+     *                     This will result in less memory usage and more efficient paths.
+     *
+     *                     If non-null, the glyph paths will match the font descriptor,
+     *                     including with the stroke information baked directly into
+     *                     the outlines.
+     *
+     * @param GrStrokeInfo Common stroke that the GPU will apply to every path. Note that
+     *                     if the glyph outlines contain baked-in strokes from the font
+     *                     descriptor, the GPU stroke will be applied on top of those
+     *                     outlines.
+     *
+     * @return a new path range populated with glyphs.
+     */
+    GrPathRange* createGlyphs(const SkTypeface*, const SkDescriptor*, const GrStrokeInfo&);
+
+    /** None of these params are optional, pointers used just to avoid making copies. */
+    struct StencilPathArgs {
+        StencilPathArgs(bool useHWAA,
+                        GrRenderTarget* renderTarget,
+                        const SkMatrix* viewMatrix,
+                        const GrScissorState* scissor,
+                        const GrStencilSettings* stencil)
+            : fUseHWAA(useHWAA)
+            , fRenderTarget(renderTarget)
+            , fViewMatrix(viewMatrix)
+            , fScissor(scissor)
+            , fStencil(stencil) {
+        }
+        bool fUseHWAA;
+        GrRenderTarget* fRenderTarget;
+        const SkMatrix* fViewMatrix;
+        const GrScissorState* fScissor;
+        const GrStencilSettings* fStencil;
+    };
+
+    void stencilPath(const StencilPathArgs& args, const GrPath* path) {
+        fGpu->handleDirtyContext();
+        this->onStencilPath(args, path);
+    }
+
+    struct DrawPathArgs : public GrGpu::DrawArgs {
+        DrawPathArgs(const GrPrimitiveProcessor* primProc,
+                     const GrPipeline* pipeline,
+                     const GrProgramDesc* desc,
+                     const GrStencilSettings* stencil)
+            : DrawArgs(primProc, pipeline, desc)
+            , fStencil(stencil) {
+        }
+
+        const GrStencilSettings* fStencil;
+    };
+
+    void drawPath(const DrawPathArgs& args, const GrPath* path) {
+        fGpu->handleDirtyContext();
+        if (GrXferBarrierType barrierType = args.fPipeline->xferBarrierType(*fGpu->caps())) {
+            fGpu->xferBarrier(args.fPipeline->getRenderTarget(), barrierType);
+        }
+        this->onDrawPath(args, path);
+    }
+
+    void drawPaths(const DrawPathArgs& args, const GrPathRange* pathRange, const void* indices,
+                   PathIndexType indexType, const float transformValues[],
+                   PathTransformType transformType, int count) {
+        fGpu->handleDirtyContext();
+        if (GrXferBarrierType barrierType = args.fPipeline->xferBarrierType(*fGpu->caps())) {
+            fGpu->xferBarrier(args.fPipeline->getRenderTarget(), barrierType);
+        }
+#ifdef SK_DEBUG
+        pathRange->assertPathsLoaded(indices, indexType, count);
+#endif
+        this->onDrawPaths(args, pathRange, indices, indexType, transformValues, transformType,
+                          count);
+    }
+
+protected:
+    GrPathRendering(GrGpu* gpu)
+        : fGpu(gpu) {
+    }
+    virtual void onStencilPath(const StencilPathArgs&, const GrPath*) = 0;
+    virtual void onDrawPath(const DrawPathArgs&, const GrPath*) = 0;
+    virtual void onDrawPaths(const DrawPathArgs&, const GrPathRange*, const void*, PathIndexType,
+                             const float[], PathTransformType, int) = 0;
+
+    GrGpu* fGpu;
+private:
+    GrPathRendering& operator=(const GrPathRendering&);
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrPathUtils.cpp b/gfx/skia/skia/src/gpu/GrPathUtils.cpp
index 464231a8dc36..21d115569b49 100644
--- a/gfx/skia/skia/src/gpu/GrPathUtils.cpp
+++ b/gfx/skia/skia/src/gpu/GrPathUtils.cpp
@@ -29,8 +29,7 @@ SkScalar GrPathUtils::scaleToleranceToSrc(SkScalar devTol,
             stretch = SkMaxScalar(stretch, mat.mapRadius(SK_Scalar1));
         }
     }
-    srcTol = SkScalarDiv(srcTol, stretch);
-    return srcTol;
+    return srcTol / stretch;
 }
 
 static const int MAX_POINTS_PER_CURVE = 1 << 10;
@@ -51,15 +50,20 @@ uint32_t GrPathUtils::quadraticPointCount(const SkPoint points[],
         // subdivide x = log4(d/tol) times. x subdivisions creates 2^(x)
         // points.
         // 2^(log4(x)) = sqrt(x);
-        int temp = SkScalarCeilToInt(SkScalarSqrt(SkScalarDiv(d, tol)));
-        int pow2 = GrNextPow2(temp);
-        // Because of NaNs & INFs we can wind up with a degenerate temp
-        // such that pow2 comes out negative. Also, our point generator
-        // will always output at least one pt.
-        if (pow2 < 1) {
-            pow2 = 1;
+        SkScalar divSqrt = SkScalarSqrt(d / tol);
+        if (((SkScalar)SK_MaxS32) <= divSqrt) {
+            return MAX_POINTS_PER_CURVE;
+        } else {
+            int temp = SkScalarCeilToInt(divSqrt);
+            int pow2 = GrNextPow2(temp);
+            // Because of NaNs & INFs we can wind up with a degenerate temp
+            // such that pow2 comes out negative. Also, our point generator
+            // will always output at least one pt.
+            if (pow2 < 1) {
+                pow2 = 1;
+            }
+            return SkTMin(pow2, MAX_POINTS_PER_CURVE);
         }
-        return SkTMin(pow2, MAX_POINTS_PER_CURVE);
     }
 }
 
@@ -102,15 +106,20 @@ uint32_t GrPathUtils::cubicPointCount(const SkPoint points[],
     if (d <= tol) {
         return 1;
     } else {
-        int temp = SkScalarCeilToInt(SkScalarSqrt(SkScalarDiv(d, tol)));
-        int pow2 = GrNextPow2(temp);
-        // Because of NaNs & INFs we can wind up with a degenerate temp
-        // such that pow2 comes out negative. Also, our point generator
-        // will always output at least one pt.
-        if (pow2 < 1) {
-            pow2 = 1;
+        SkScalar divSqrt = SkScalarSqrt(d / tol);
+        if (((SkScalar)SK_MaxS32) <= divSqrt) {
+            return MAX_POINTS_PER_CURVE;
+        } else {
+            int temp = SkScalarCeilToInt(SkScalarSqrt(d / tol));
+            int pow2 = GrNextPow2(temp);
+            // Because of NaNs & INFs we can wind up with a degenerate temp
+            // such that pow2 comes out negative. Also, our point generator
+            // will always output at least one pt.
+            if (pow2 < 1) {
+                pow2 = 1;
+            }
+            return SkTMin(pow2, MAX_POINTS_PER_CURVE);
         }
-        return SkTMin(pow2, MAX_POINTS_PER_CURVE);
     }
 }
 
@@ -166,6 +175,14 @@ int GrPathUtils::worstCasePointCount(const SkPath& path, int* subpaths,
             case SkPath::kLine_Verb:
                 pointCount += 1;
                 break;
+            case SkPath::kConic_Verb: {
+                SkScalar weight = iter.conicWeight();
+                SkAutoConicToQuads converter;
+                const SkPoint* quadPts = converter.computeQuads(pts, weight, 0.25f);
+                for (int i = 0; i < converter.countQuads(); ++i) {
+                    pointCount += quadraticPointCount(quadPts + 2*i, tol);
+                }
+            }
             case SkPath::kQuad_Verb:
                 pointCount += quadraticPointCount(pts, tol);
                 break;
@@ -348,16 +365,16 @@ bool is_point_within_cubic_tangents(const SkPoint& a,
                                     const SkVector& ab,
                                     const SkVector& dc,
                                     const SkPoint& d,
-                                    SkPath::Direction dir,
+                                    SkPathPriv::FirstDirection dir,
                                     const SkPoint p) {
     SkVector ap = p - a;
     SkScalar apXab = ap.cross(ab);
-    if (SkPath::kCW_Direction == dir) {
+    if (SkPathPriv::kCW_FirstDirection == dir) {
         if (apXab > 0) {
             return false;
         }
     } else {
-        SkASSERT(SkPath::kCCW_Direction == dir);
+        SkASSERT(SkPathPriv::kCCW_FirstDirection == dir);
         if (apXab < 0) {
             return false;
         }
@@ -365,12 +382,12 @@ bool is_point_within_cubic_tangents(const SkPoint& a,
 
     SkVector dp = p - d;
     SkScalar dpXdc = dp.cross(dc);
-    if (SkPath::kCW_Direction == dir) {
+    if (SkPathPriv::kCW_FirstDirection == dir) {
         if (dpXdc < 0) {
             return false;
         }
     } else {
-        SkASSERT(SkPath::kCCW_Direction == dir);
+        SkASSERT(SkPathPriv::kCCW_FirstDirection == dir);
         if (dpXdc > 0) {
             return false;
         }
@@ -381,7 +398,7 @@ bool is_point_within_cubic_tangents(const SkPoint& a,
 void convert_noninflect_cubic_to_quads(const SkPoint p[4],
                                        SkScalar toleranceSqd,
                                        bool constrainWithinTangents,
-                                       SkPath::Direction dir,
+                                       SkPathPriv::FirstDirection dir,
                                        SkTArray<SkPoint, true>* quads,
                                        int sublevel = 0) {
 
@@ -529,7 +546,7 @@ void convert_noninflect_cubic_to_quads(const SkPoint p[4],
 void GrPathUtils::convertCubicToQuads(const SkPoint p[4],
                                       SkScalar tolScale,
                                       bool constrainWithinTangents,
-                                      SkPath::Direction dir,
+                                      SkPathPriv::FirstDirection dir,
                                       SkTArray<SkPoint, true>* quads) {
     SkPoint chopped[10];
     int count = SkChopCubicAtInflections(p, chopped);
@@ -547,50 +564,6 @@ void GrPathUtils::convertCubicToQuads(const SkPoint p[4],
 
 ////////////////////////////////////////////////////////////////////////////////
 
-enum CubicType {
-    kSerpentine_CubicType,
-    kCusp_CubicType,
-    kLoop_CubicType,
-    kQuadratic_CubicType,
-    kLine_CubicType,
-    kPoint_CubicType
-};
-
-// discr(I) = d0^2 * (3*d1^2 - 4*d0*d2)
-// Classification:
-// discr(I) > 0        Serpentine
-// discr(I) = 0        Cusp
-// discr(I) < 0        Loop
-// d0 = d1 = 0         Quadratic
-// d0 = d1 = d2 = 0    Line
-// p0 = p1 = p2 = p3   Point
-static CubicType classify_cubic(const SkPoint p[4], const SkScalar d[3]) {
-    if (p[0] == p[1] && p[0] == p[2] && p[0] == p[3]) {
-        return kPoint_CubicType;
-    }
-    const SkScalar discr = d[0] * d[0] * (3.f * d[1] * d[1] - 4.f * d[0] * d[2]);
-    if (discr > SK_ScalarNearlyZero) {
-        return kSerpentine_CubicType;
-    } else if (discr < -SK_ScalarNearlyZero) {
-        return kLoop_CubicType;
-    } else {
-        if (0.f == d[0] && 0.f == d[1]) {
-            return (0.f == d[2] ? kLine_CubicType : kQuadratic_CubicType);
-        } else {
-            return kCusp_CubicType;
-        }
-    }
-}
-
-// Assumes the third component of points is 1.
-// Calcs p0 . (p1 x p2)
-static SkScalar calc_dot_cross_cubic(const SkPoint& p0, const SkPoint& p1, const SkPoint& p2) {
-    const SkScalar xComp = p0.fX * (p1.fY - p2.fY);
-    const SkScalar yComp = p0.fY * (p2.fX - p1.fX);
-    const SkScalar wComp = p1.fX * p2.fY - p1.fY * p2.fX;
-    return (xComp + yComp + wComp);
-}
-
 // Solves linear system to extract klm
 // P.K = k (similarly for l, m)
 // Where P is matrix of control points
@@ -735,34 +708,6 @@ static void set_quadratic_klm(const SkScalar d[3], SkScalar k[4], SkScalar l[4],
     }
 }
 
-// Calc coefficients of I(s,t) where roots of I are inflection points of curve
-// I(s,t) = t*(3*d0*s^2 - 3*d1*s*t + d2*t^2)
-// d0 = a1 - 2*a2+3*a3
-// d1 = -a2 + 3*a3
-// d2 = 3*a3
-// a1 = p0 . (p3 x p2)
-// a2 = p1 . (p0 x p3)
-// a3 = p2 . (p1 x p0)
-// Places the values of d1, d2, d3 in array d passed in
-static void calc_cubic_inflection_func(const SkPoint p[4], SkScalar d[3]) {
-    SkScalar a1 = calc_dot_cross_cubic(p[0], p[3], p[2]);
-    SkScalar a2 = calc_dot_cross_cubic(p[1], p[0], p[3]);
-    SkScalar a3 = calc_dot_cross_cubic(p[2], p[1], p[0]);
-
-    // need to scale a's or values in later calculations will grow to high
-    SkScalar max = SkScalarAbs(a1);
-    max = SkMaxScalar(max, SkScalarAbs(a2));
-    max = SkMaxScalar(max, SkScalarAbs(a3));
-    max = 1.f/max;
-    a1 = a1 * max;
-    a2 = a2 * max;
-    a3 = a3 * max;
-
-    d[2] = 3.f * a3;
-    d[1] = d[2] - a2;
-    d[0] = d[1] - a2 + a1;
-}
-
 int GrPathUtils::chopCubicAtLoopIntersection(const SkPoint src[4], SkPoint dst[10], SkScalar klm[9],
                                              SkScalar klm_rev[3]) {
     // Variable to store the two parametric values at the loop double point
@@ -770,12 +715,10 @@ int GrPathUtils::chopCubicAtLoopIntersection(const SkPoint src[4], SkPoint dst[1
     SkScalar largeS = 0.f;
 
     SkScalar d[3];
-    calc_cubic_inflection_func(src, d);
-
-    CubicType cType = classify_cubic(src, d);
+    SkCubicType cType = SkClassifyCubic(src, d);
 
     int chop_count = 0;
-    if (kLoop_CubicType == cType) {
+    if (kLoop_SkCubicType == cType) {
         SkScalar tempSqrt = SkScalarSqrt(4.f * d[0] * d[2] - 3.f * d[1] * d[1]);
         SkScalar ls = d[1] - tempSqrt;
         SkScalar lt = 2.f * d[0];
@@ -834,14 +777,14 @@ int GrPathUtils::chopCubicAtLoopIntersection(const SkPoint src[4], SkPoint dst[1
         SkScalar controlL[4];
         SkScalar controlM[4];
 
-        if (kSerpentine_CubicType == cType || (kCusp_CubicType == cType && 0.f != d[0])) {
+        if (kSerpentine_SkCubicType == cType || (kCusp_SkCubicType == cType && 0.f != d[0])) {
             set_serp_klm(d, controlK, controlL, controlM);
-        } else if (kLoop_CubicType == cType) {
+        } else if (kLoop_SkCubicType == cType) {
             set_loop_klm(d, controlK, controlL, controlM);
-        } else if (kCusp_CubicType == cType) {
+        } else if (kCusp_SkCubicType == cType) {
             SkASSERT(0.f == d[0]);
             set_cusp_klm(d, controlK, controlL, controlM);
-        } else if (kQuadratic_CubicType == cType) {
+        } else if (kQuadratic_SkCubicType == cType) {
             set_quadratic_klm(d, controlK, controlL, controlM);
         }
 
@@ -852,22 +795,20 @@ int GrPathUtils::chopCubicAtLoopIntersection(const SkPoint src[4], SkPoint dst[1
 
 void GrPathUtils::getCubicKLM(const SkPoint p[4], SkScalar klm[9]) {
     SkScalar d[3];
-    calc_cubic_inflection_func(p, d);
-
-    CubicType cType = classify_cubic(p, d);
+    SkCubicType cType = SkClassifyCubic(p, d);
 
     SkScalar controlK[4];
     SkScalar controlL[4];
     SkScalar controlM[4];
 
-    if (kSerpentine_CubicType == cType || (kCusp_CubicType == cType && 0.f != d[0])) {
+    if (kSerpentine_SkCubicType == cType || (kCusp_SkCubicType == cType && 0.f != d[0])) {
         set_serp_klm(d, controlK, controlL, controlM);
-    } else if (kLoop_CubicType == cType) {
+    } else if (kLoop_SkCubicType == cType) {
         set_loop_klm(d, controlK, controlL, controlM);
-    } else if (kCusp_CubicType == cType) {
+    } else if (kCusp_SkCubicType == cType) {
         SkASSERT(0.f == d[0]);
         set_cusp_klm(d, controlK, controlL, controlM);
-    } else if (kQuadratic_CubicType == cType) {
+    } else if (kQuadratic_SkCubicType == cType) {
         set_quadratic_klm(d, controlK, controlL, controlM);
     }
 
diff --git a/gfx/skia/skia/src/gpu/GrPathUtils.h b/gfx/skia/skia/src/gpu/GrPathUtils.h
index c15fd7ae1032..4874fa2aef08 100644
--- a/gfx/skia/skia/src/gpu/GrPathUtils.h
+++ b/gfx/skia/skia/src/gpu/GrPathUtils.h
@@ -9,7 +9,7 @@
 #define GrPathUtils_DEFINED
 
 #include "SkRect.h"
-#include "SkPath.h"
+#include "SkPathPriv.h"
 #include "SkTArray.h"
 
 class SkMatrix;
@@ -74,7 +74,7 @@ namespace GrPathUtils {
          * vertices is a pointer to the first vertex.
          */
         template <int N, size_t STRIDE, size_t UV_OFFSET>
-        void apply(const void* vertices) {
+        void apply(const void* vertices) const {
             intptr_t xyPtr = reinterpret_cast<intptr_t>(vertices);
             intptr_t uvPtr = reinterpret_cast<intptr_t>(vertices) + UV_OFFSET;
             float sx = fM[0];
@@ -121,7 +121,7 @@ namespace GrPathUtils {
     void convertCubicToQuads(const SkPoint p[4],
                              SkScalar tolScale,
                              bool constrainWithinTangents,
-                             SkPath::Direction dir,
+                             SkPathPriv::FirstDirection dir,
                              SkTArray<SkPoint, true>* quads);
 
     // Chops the cubic bezier passed in by src, at the double point (intersection point)
@@ -129,11 +129,11 @@ namespace GrPathUtils {
     // the double point: ls and ms. We chop the cubic at these values if they are between 0 and 1.
     // Return value:
     // Value of 3: ls and ms are both between (0,1), and dst will contain the three cubics,
-    //             dst[0..3], dst[3..6], and dst[6..9] if dst is not NULL
+    //             dst[0..3], dst[3..6], and dst[6..9] if dst is not nullptr
     // Value of 2: Only one of ls and ms are between (0,1), and dst will contain the two cubics,
-    //             dst[0..3] and dst[3..6] if dst is not NULL
+    //             dst[0..3] and dst[3..6] if dst is not nullptr
     // Value of 1: Neither ls or ms are between (0,1), and dst will contain the one original cubic,
-    //             dst[0..3] if dst is not NULL
+    //             dst[0..3] if dst is not nullptr
     //
     // Optional KLM Calculation:
     // The function can also return the KLM linear functionals for the chopped cubic implicit form
@@ -153,8 +153,8 @@ namespace GrPathUtils {
     // Notice that the klm lines are calculated in the same space as the input control points.
     // If you transform the points the lines will also need to be transformed. This can be done
     // by mapping the lines with the inverse-transpose of the matrix used to map the points.
-    int chopCubicAtLoopIntersection(const SkPoint src[4], SkPoint dst[10] = NULL,
-                                    SkScalar klm[9] = NULL, SkScalar klm_rev[3] = NULL);
+    int chopCubicAtLoopIntersection(const SkPoint src[4], SkPoint dst[10] = nullptr,
+                                    SkScalar klm[9] = nullptr, SkScalar klm_rev[3] = nullptr);
 
     // Input is p which holds the 4 control points of a non-rational cubic Bezier curve.
     // Output is the coefficients of the three linear functionals K, L, & M which
@@ -168,5 +168,12 @@ namespace GrPathUtils {
     // If you transform the points the lines will also need to be transformed. This can be done
     // by mapping the lines with the inverse-transpose of the matrix used to map the points.
     void getCubicKLM(const SkPoint p[4], SkScalar klm[9]);
+
+    // When tessellating curved paths into linear segments, this defines the maximum distance
+    // in screen space which a segment may deviate from the mathmatically correct value.
+    // Above this value, the segment will be subdivided.
+    // This value was chosen to approximate the supersampling accuracy of the raster path (16
+    // samples, or one quarter pixel).
+    static const SkScalar kDefaultTolerance = SkDoubleToScalar(0.25);
 };
 #endif
diff --git a/gfx/skia/skia/src/gpu/GrPendingProgramElement.h b/gfx/skia/skia/src/gpu/GrPendingProgramElement.h
new file mode 100644
index 000000000000..69e459f08ef7
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrPendingProgramElement.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrPendingProgramElement_DEFINED
+#define GrPendingProgramElement_DEFINED
+
+#include "SkRefCnt.h"
+#include "GrTypes.h"
+
+/**
+ * Helper for owning a pending execution on a GrProgramElement. Using this rather than ref allows
+ * resources that are owned by the program element to be correctly tracked as having pending reads
+ * and writes rather than refs.
+ */
+template <typename T> class GrPendingProgramElement : SkNoncopyable {
+public:
+    GrPendingProgramElement() : fObj(nullptr) { };
+
+    // Adds a pending execution on obj.
+    explicit GrPendingProgramElement(T* obj) : fObj(obj)  {
+        if (obj) {
+            obj->addPendingExecution();
+        }
+    }
+
+    void reset(T* obj) {
+        if (obj) {
+            obj->addPendingExecution();
+        }
+        if (fObj) {
+            fObj->completedExecution();
+        }
+        fObj = obj;
+    }
+
+    T* get() const { return fObj; }
+    operator T*() { return fObj; }
+
+    T *operator->() const { return fObj; }
+
+    ~GrPendingProgramElement() {
+        if (fObj) {
+            fObj->completedExecution();
+        }
+    }
+
+private:
+    T*   fObj;
+
+    typedef SkNoncopyable INHERITED;
+};
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrPictureUtils.cpp b/gfx/skia/skia/src/gpu/GrPictureUtils.cpp
deleted file mode 100644
index 0bcd927e5788..000000000000
--- a/gfx/skia/skia/src/gpu/GrPictureUtils.cpp
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrPictureUtils.h"
-#include "SkDevice.h"
-#include "SkDraw.h"
-#include "SkPaintPriv.h"
-#include "SkPictureData.h"
-#include "SkPicturePlayback.h"
-
-SkPicture::AccelData::Key GPUAccelData::ComputeAccelDataKey() {
-    static const SkPicture::AccelData::Key gGPUID = SkPicture::AccelData::GenerateDomain();
-
-    return gGPUID;
-}
-
-// The GrGather device performs GPU-backend-specific preprocessing on
-// a picture. The results are stored in a GPUAccelData.
-//
-// Currently the only interesting work is done in drawDevice (i.e., when a
-// saveLayer is collapsed back into its parent) and, maybe, in onCreateDevice.
-// All the current work could be done much more efficiently by just traversing the
-// raw op codes in the SkPicture (although we would still need to replay all the
-// clip calls).
-class GrGatherDevice : public SkBaseDevice {
-public:
-    SK_DECLARE_INST_COUNT(GrGatherDevice)
-
-    GrGatherDevice(int width, int height, SkPicturePlayback* playback, GPUAccelData* accelData,
-                   int saveLayerDepth) {
-        fPlayback = playback;
-        fSaveLayerDepth = saveLayerDepth;
-        fInfo.fValid = true;
-        fInfo.fSize.set(width, height);
-        fInfo.fPaint = NULL;
-        fInfo.fSaveLayerOpID = fPlayback->curOpID();
-        fInfo.fRestoreOpID = 0;
-        fInfo.fHasNestedLayers = false;
-        fInfo.fIsNested = (2 == fSaveLayerDepth);
-
-        fEmptyBitmap.setInfo(SkImageInfo::MakeUnknown(fInfo.fSize.fWidth, fInfo.fSize.fHeight));
-        fAccelData = accelData;
-        fAlreadyDrawn = false;
-    }
-
-    virtual ~GrGatherDevice() { }
-
-    virtual SkImageInfo imageInfo() const SK_OVERRIDE {
-        return fEmptyBitmap.info();
-    }
-
-#ifdef SK_SUPPORT_LEGACY_WRITEPIXELSCONFIG
-    virtual void writePixels(const SkBitmap& bitmap, int x, int y,
-                             SkCanvas::Config8888 config8888) SK_OVERRIDE {
-        NotSupported();
-    }
-#endif
-    virtual GrRenderTarget* accessRenderTarget() SK_OVERRIDE { return NULL; }
-
-protected:
-    virtual bool filterTextFlags(const SkPaint& paint, TextFlags*) SK_OVERRIDE {
-        return false;
-    }
-    virtual void clear(SkColor color) SK_OVERRIDE {
-        NothingToDo();
-    }
-    virtual void drawPaint(const SkDraw& draw, const SkPaint& paint) SK_OVERRIDE {
-    }
-    virtual void drawPoints(const SkDraw& draw, SkCanvas::PointMode mode, size_t count,
-                            const SkPoint points[], const SkPaint& paint) SK_OVERRIDE {
-    }
-    virtual void drawRect(const SkDraw& draw, const SkRect& rect,
-                          const SkPaint& paint) SK_OVERRIDE {
-    }
-    virtual void drawOval(const SkDraw& draw, const SkRect& rect,
-                          const SkPaint& paint) SK_OVERRIDE {
-    }
-    virtual void drawRRect(const SkDraw& draw, const SkRRect& rrect,
-                           const SkPaint& paint) SK_OVERRIDE {
-    }
-    virtual void drawPath(const SkDraw& draw, const SkPath& path,
-                          const SkPaint& paint, const SkMatrix* prePathMatrix,
-                          bool pathIsMutable) SK_OVERRIDE {
-    }
-    virtual void drawBitmap(const SkDraw& draw, const SkBitmap& bitmap,
-                            const SkMatrix& matrix, const SkPaint& paint) SK_OVERRIDE {
-    }
-    virtual void drawSprite(const SkDraw&, const SkBitmap& bitmap,
-                            int x, int y, const SkPaint& paint) SK_OVERRIDE {
-    }
-    virtual void drawBitmapRect(const SkDraw& draw, const SkBitmap& bitmap,
-                                const SkRect* srcOrNull, const SkRect& dst,
-                                const SkPaint& paint,
-                                SkCanvas::DrawBitmapRectFlags flags) SK_OVERRIDE {
-    }
-    virtual void drawText(const SkDraw& draw, const void* text, size_t len,
-                          SkScalar x, SkScalar y,
-                          const SkPaint& paint) SK_OVERRIDE {
-    }
-    virtual void drawPosText(const SkDraw& draw, const void* text, size_t len,
-                             const SkScalar pos[], SkScalar constY,
-                             int scalarsPerPos, const SkPaint& paint) SK_OVERRIDE {
-    }
-    virtual void drawTextOnPath(const SkDraw& draw, const void* text, size_t len,
-                                const SkPath& path, const SkMatrix* matrix,
-                                const SkPaint& paint) SK_OVERRIDE {
-    }
-    virtual void drawVertices(const SkDraw& draw, SkCanvas::VertexMode, int vertexCount,
-                              const SkPoint verts[], const SkPoint texs[],
-                              const SkColor colors[], SkXfermode* xmode,
-                              const uint16_t indices[], int indexCount,
-                              const SkPaint& paint) SK_OVERRIDE {
-    }
-    virtual void drawDevice(const SkDraw& draw, SkBaseDevice* deviceIn, int x, int y,
-                            const SkPaint& paint) SK_OVERRIDE {
-        // deviceIn is the one that is being "restored" back to its parent
-        GrGatherDevice* device = static_cast<GrGatherDevice*>(deviceIn);
-
-        if (device->fAlreadyDrawn) {
-            return;
-        }
-
-        device->fInfo.fRestoreOpID = fPlayback->curOpID();
-        device->fInfo.fCTM = *draw.fMatrix;
-        device->fInfo.fCTM.postTranslate(SkIntToScalar(-device->getOrigin().fX),
-                                         SkIntToScalar(-device->getOrigin().fY));
-
-        device->fInfo.fOffset = device->getOrigin();
-
-        if (NeedsDeepCopy(paint)) {
-            // This NULL acts as a signal that the paint was uncopyable (for now)
-            device->fInfo.fPaint = NULL;
-            device->fInfo.fValid = false;
-        } else {
-            device->fInfo.fPaint = SkNEW_ARGS(SkPaint, (paint));
-        }
-
-        fAccelData->addSaveLayerInfo(device->fInfo);
-        device->fAlreadyDrawn = true;
-    }
-    // TODO: allow this call to return failure, or move to SkBitmapDevice only.
-    virtual const SkBitmap& onAccessBitmap() SK_OVERRIDE {
-        return fEmptyBitmap;
-    }
-#ifdef SK_SUPPORT_LEGACY_READPIXELSCONFIG
-    virtual bool onReadPixels(const SkBitmap& bitmap,
-                              int x, int y,
-                              SkCanvas::Config8888 config8888) SK_OVERRIDE {
-        NotSupported();
-        return false;
-    }
-#endif
-    virtual void lockPixels() SK_OVERRIDE { NothingToDo(); }
-    virtual void unlockPixels() SK_OVERRIDE { NothingToDo(); }
-    virtual bool allowImageFilter(const SkImageFilter*) SK_OVERRIDE { return false; }
-    virtual bool canHandleImageFilter(const SkImageFilter*) SK_OVERRIDE { return false; }
-    virtual bool filterImage(const SkImageFilter*, const SkBitmap&, const SkImageFilter::Context&,
-                             SkBitmap* result, SkIPoint* offset) SK_OVERRIDE {
-        return false;
-    }
-
-private:
-    // The playback object driving this rendering
-    SkPicturePlayback *fPlayback;
-
-    SkBitmap fEmptyBitmap; // legacy -- need to remove
-
-    // All information gathered during the gather process is stored here
-    GPUAccelData* fAccelData;
-
-    // true if this device has already been drawn back to its parent(s) at least
-    // once.
-    bool   fAlreadyDrawn;
-
-    // The information regarding the saveLayer call this device represents.
-    GPUAccelData::SaveLayerInfo fInfo;
-
-    // The depth of this device in the saveLayer stack
-    int fSaveLayerDepth;
-
-    virtual void replaceBitmapBackendForRasterSurface(const SkBitmap&) SK_OVERRIDE {
-        NotSupported();
-    }
-
-    virtual SkBaseDevice* onCreateDevice(const SkImageInfo& info, Usage usage) SK_OVERRIDE {
-        // we expect to only get called via savelayer, in which case it is fine.
-        SkASSERT(kSaveLayer_Usage == usage);
-
-        fInfo.fHasNestedLayers = true;
-        return SkNEW_ARGS(GrGatherDevice, (info.width(), info.height(), fPlayback,
-                                           fAccelData, fSaveLayerDepth+1));
-    }
-
-    virtual void flush() SK_OVERRIDE {}
-
-    static void NotSupported() {
-        SkDEBUGFAIL("this method should never be called");
-    }
-
-    static void NothingToDo() {}
-
-    typedef SkBaseDevice INHERITED;
-};
-
-// The GrGatherCanvas allows saveLayers but simplifies clipping. It is really
-// only intended to be used as:
-//
-//      GrGatherDevice dev(w, h, picture, accelData);
-//      GrGatherCanvas canvas(..., picture);
-//      canvas.gather();
-//
-// which is all just to fill in 'accelData'
-class SK_API GrGatherCanvas : public SkCanvas {
-public:
-    GrGatherCanvas(GrGatherDevice* device) : INHERITED(device) {}
-
-protected:
-    // disable aa for speed
-    virtual void onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle) SK_OVERRIDE {
-        this->INHERITED::onClipRect(rect, op, kHard_ClipEdgeStyle);
-    }
-
-    // for speed, just respect the bounds, and disable AA. May give us a few
-    // false positives and negatives.
-    virtual void onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle) SK_OVERRIDE {
-        this->updateClipConservativelyUsingBounds(path.getBounds(), op,
-                                                  path.isInverseFillType());
-    }
-    virtual void onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle) SK_OVERRIDE {
-        this->updateClipConservativelyUsingBounds(rrect.getBounds(), op, false);
-    }
-
-    virtual void onDrawPicture(const SkPicture* picture) SK_OVERRIDE {
-        if (NULL != picture->fData.get()) {
-            // Disable the BBH for the old path so all the draw calls
-            // will be seen. The stock SkPicture::draw method can't be
-            // invoked since it just uses a vanilla SkPicturePlayback.
-            SkPicturePlayback playback(picture);
-            playback.setUseBBH(false);
-            playback.draw(this, NULL);
-        } else {
-            // Since we know this is the SkRecord path we can just call
-            // SkPicture::draw.
-            picture->draw(this);
-        }
-    }
-
-private:
-    typedef SkCanvas INHERITED;
-};
-
-// GatherGPUInfo is only intended to be called within the context of SkGpuDevice's
-// EXPERIMENTAL_optimize method.
-void GatherGPUInfo(const SkPicture* pict, GPUAccelData* accelData) {
-    if (NULL == pict || 0 == pict->width() || 0 == pict->height()) {
-        return ;
-    }
-
-    // BBH-based rendering doesn't re-issue many of the operations the gather
-    // process cares about (e.g., saves and restores) so it must be disabled.
-    SkPicturePlayback playback(pict);
-    playback.setUseBBH(false);
-
-    GrGatherDevice device(pict->width(), pict->height(), &playback, accelData, 0);
-    GrGatherCanvas canvas(&device);
-
-    canvas.clipRect(SkRect::MakeWH(SkIntToScalar(pict->width()),
-                                   SkIntToScalar(pict->height())),
-                    SkRegion::kIntersect_Op, false);
-    playback.draw(&canvas, NULL);
-}
diff --git a/gfx/skia/skia/src/gpu/GrPictureUtils.h b/gfx/skia/skia/src/gpu/GrPictureUtils.h
deleted file mode 100644
index a730697d62d5..000000000000
--- a/gfx/skia/skia/src/gpu/GrPictureUtils.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrPictureUtils_DEFINED
-#define GrPictureUtils_DEFINED
-
-#include "SkPicture.h"
-#include "SkTDArray.h"
-
-// This class encapsulates the GPU-backend-specific acceleration data
-// for a single SkPicture
-class GPUAccelData : public SkPicture::AccelData {
-public:
-    // Information about a given saveLayer in an SkPicture
-    struct SaveLayerInfo {
-        // True if the SaveLayerInfo is valid. False if either 'fOffset' is
-        // invalid (due to a non-invertible CTM) or 'fPaint' is NULL (due
-        // to a non-copyable paint).
-        bool fValid;
-        // The size of the saveLayer
-        SkISize fSize;
-        // The CTM in which this layer's draws must occur. It already incorporates
-        // the translation needed to map the layer's top-left point to the origin.
-        SkMatrix fCTM;
-        // The offset that needs to be passed to drawBitmap to correctly
-        // position the pre-rendered layer. It is in device space.
-        SkIPoint fOffset;
-        // The paint to use on restore. NULL if the paint was not copyable (and
-        // thus that this layer should not be pulled forward).
-        const SkPaint* fPaint;
-        // The ID of this saveLayer in the picture. 0 is an invalid ID.
-        size_t  fSaveLayerOpID;
-        // The ID of the matching restore in the picture. 0 is an invalid ID.
-        size_t  fRestoreOpID;
-        // True if this saveLayer has at least one other saveLayer nested within it.
-        // False otherwise.
-        bool    fHasNestedLayers;
-        // True if this saveLayer is nested within another. False otherwise.
-        bool    fIsNested;
-    };
-
-    GPUAccelData(Key key) : INHERITED(key) { }
-
-    virtual ~GPUAccelData() {
-        for (int i = 0; i < fSaveLayerInfo.count(); ++i) {
-            SkDELETE(fSaveLayerInfo[i].fPaint);
-        }
-    }
-
-    void addSaveLayerInfo(const SaveLayerInfo& info) {
-        SkASSERT(info.fSaveLayerOpID < info.fRestoreOpID);
-        *fSaveLayerInfo.push() = info;
-    }
-
-    int numSaveLayers() const { return fSaveLayerInfo.count(); }
-
-    const SaveLayerInfo& saveLayerInfo(int index) const {
-        SkASSERT(index < fSaveLayerInfo.count());
-
-        return fSaveLayerInfo[index];
-    }
-
-    // We may, in the future, need to pass in the GPUDevice in order to
-    // incorporate the clip and matrix state into the key
-    static SkPicture::AccelData::Key ComputeAccelDataKey();
-
-private:
-    SkTDArray<SaveLayerInfo> fSaveLayerInfo;
-
-    typedef SkPicture::AccelData INHERITED;
-};
-
-void GatherGPUInfo(const SkPicture* pict, GPUAccelData* accelData);
-
-#endif // GrPictureUtils_DEFINED
diff --git a/gfx/skia/skia/src/gpu/GrPipeline.cpp b/gfx/skia/skia/src/gpu/GrPipeline.cpp
new file mode 100644
index 000000000000..02edd4201e19
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrPipeline.cpp
@@ -0,0 +1,235 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrPipeline.h"
+
+#include "GrCaps.h"
+#include "GrDrawTarget.h"
+#include "GrGpu.h"
+#include "GrPipelineBuilder.h"
+#include "GrProcOptInfo.h"
+#include "GrXferProcessor.h"
+
+#include "batches/GrBatch.h"
+
+GrPipeline* GrPipeline::CreateAt(void* memory, const CreateArgs& args,
+                                 GrXPOverridesForBatch* overrides) {
+    const GrPipelineBuilder& builder = *args.fPipelineBuilder;
+
+    // Create XferProcessor from DS's XPFactory
+    const GrXPFactory* xpFactory = builder.getXPFactory();
+    SkAutoTUnref<GrXferProcessor> xferProcessor;
+    if (xpFactory) {
+        xferProcessor.reset(xpFactory->createXferProcessor(args.fOpts,
+                                                           builder.hasMixedSamples(),
+                                                           &args.fDstTexture,
+                                                           *args.fCaps));
+    } else {
+        xferProcessor.reset(GrPorterDuffXPFactory::CreateSrcOverXferProcessor(
+                                                                        *args.fCaps,
+                                                                        args.fOpts,
+                                                                        builder.hasMixedSamples(),
+                                                                        &args.fDstTexture));
+    }
+
+    if (!xferProcessor) {
+        return nullptr;
+    }
+
+    GrColor overrideColor = GrColor_ILLEGAL;
+    if (args.fOpts.fColorPOI.firstEffectiveProcessorIndex() != 0) {
+        overrideColor = args.fOpts.fColorPOI.inputColorToFirstEffectiveProccesor();
+    }
+
+    GrXferProcessor::OptFlags optFlags = GrXferProcessor::kNone_OptFlags;
+
+    optFlags = xferProcessor->getOptimizations(args.fOpts,
+                                               builder.getStencil().doesWrite(),
+                                               &overrideColor,
+                                               *args.fCaps);
+
+    // When path rendering the stencil settings are not always set on the GrPipelineBuilder
+    // so we must check the draw type. In cases where we will skip drawing we simply return a
+    // null GrPipeline.
+    if (GrXferProcessor::kSkipDraw_OptFlag & optFlags) {
+        return nullptr;
+    }
+
+    // No need to have an override color if it isn't even going to be used.
+    if (SkToBool(GrXferProcessor::kIgnoreColor_OptFlag & optFlags)) {
+        overrideColor = GrColor_ILLEGAL;
+    }
+
+    GrPipeline* pipeline = new (memory) GrPipeline;
+    pipeline->fXferProcessor.reset(xferProcessor);
+
+    pipeline->fRenderTarget.reset(builder.fRenderTarget.get());
+    SkASSERT(pipeline->fRenderTarget);
+    pipeline->fScissorState = *args.fScissor;
+    pipeline->fStencilSettings = builder.getStencil();
+    pipeline->fDrawFace = builder.getDrawFace();
+
+    pipeline->fFlags = 0;
+    if (builder.isHWAntialias()) {
+        pipeline->fFlags |= kHWAA_Flag;
+    }
+    if (builder.snapVerticesToPixelCenters()) {
+        pipeline->fFlags |= kSnapVertices_Flag;
+    }
+
+    int firstColorProcessorIdx = args.fOpts.fColorPOI.firstEffectiveProcessorIndex();
+
+    // TODO: Once we can handle single or four channel input into coverage GrFragmentProcessors
+    // then we can use GrPipelineBuilder's coverageProcInfo (like color above) to set this initial
+    // information.
+    int firstCoverageProcessorIdx = 0;
+
+    pipeline->adjustProgramFromOptimizations(builder, optFlags, args.fOpts.fColorPOI, 
+                                             args.fOpts.fCoveragePOI, &firstColorProcessorIdx, 
+                                             &firstCoverageProcessorIdx);
+
+    bool usesLocalCoords = false;
+
+    // Copy GrFragmentProcessors from GrPipelineBuilder to Pipeline
+    pipeline->fNumColorProcessors = builder.numColorFragmentProcessors() - firstColorProcessorIdx;
+    int numTotalProcessors = pipeline->fNumColorProcessors +
+                             builder.numCoverageFragmentProcessors() - firstCoverageProcessorIdx;
+    pipeline->fFragmentProcessors.reset(numTotalProcessors);
+    int currFPIdx = 0;
+    for (int i = firstColorProcessorIdx; i < builder.numColorFragmentProcessors();
+         ++i, ++currFPIdx) {
+        const GrFragmentProcessor* fp = builder.getColorFragmentProcessor(i);
+        pipeline->fFragmentProcessors[currFPIdx].reset(fp);
+        usesLocalCoords = usesLocalCoords || fp->usesLocalCoords();
+    }
+
+    for (int i = firstCoverageProcessorIdx; i < builder.numCoverageFragmentProcessors();
+         ++i, ++currFPIdx) {
+        const GrFragmentProcessor* fp = builder.getCoverageFragmentProcessor(i);
+        pipeline->fFragmentProcessors[currFPIdx].reset(fp);
+        usesLocalCoords = usesLocalCoords || fp->usesLocalCoords();
+    }
+
+    // Setup info we need to pass to GrPrimitiveProcessors that are used with this GrPipeline.
+    overrides->fFlags = 0;
+    if (!SkToBool(optFlags & GrXferProcessor::kIgnoreColor_OptFlag)) {
+        overrides->fFlags |= GrXPOverridesForBatch::kReadsColor_Flag;
+    }
+    if (GrColor_ILLEGAL != overrideColor) {
+        overrides->fFlags |= GrXPOverridesForBatch::kUseOverrideColor_Flag;
+        overrides->fOverrideColor = overrideColor;
+    }
+    if (!SkToBool(optFlags & GrXferProcessor::kIgnoreCoverage_OptFlag)) {
+        overrides->fFlags |= GrXPOverridesForBatch::kReadsCoverage_Flag;
+    }
+    if (usesLocalCoords) {
+        overrides->fFlags |= GrXPOverridesForBatch::kReadsLocalCoords_Flag;
+    }
+    if (SkToBool(optFlags & GrXferProcessor::kCanTweakAlphaForCoverage_OptFlag)) {
+        overrides->fFlags |= GrXPOverridesForBatch::kCanTweakAlphaForCoverage_Flag; 
+    }
+
+    GrXPFactory::InvariantBlendedColor blendedColor;
+    if (xpFactory) {
+        xpFactory->getInvariantBlendedColor(args.fOpts.fColorPOI, &blendedColor);
+    } else {
+        GrPorterDuffXPFactory::SrcOverInvariantBlendedColor(args.fOpts.fColorPOI.color(),
+                                                            args.fOpts.fColorPOI.validFlags(),
+                                                            args.fOpts.fColorPOI.isOpaque(),
+                                                            &blendedColor); 
+    }
+    if (blendedColor.fWillBlendWithDst) {
+        overrides->fFlags |= GrXPOverridesForBatch::kWillColorBlendWithDst_Flag;
+    }
+
+    return pipeline;
+}
+
+static void add_dependencies_for_processor(const GrFragmentProcessor* proc, GrRenderTarget* rt) {
+    for (int i = 0; i < proc->numChildProcessors(); ++i) {
+        // need to recurse
+        add_dependencies_for_processor(&proc->childProcessor(i), rt);
+    }
+
+    for (int i = 0; i < proc->numTextures(); ++i) {
+        GrTexture* texture = proc->textureAccess(i).getTexture();
+        SkASSERT(rt->getLastDrawTarget());
+        rt->getLastDrawTarget()->addDependency(texture);
+    }
+}
+
+void GrPipeline::addDependenciesTo(GrRenderTarget* rt) const {
+    for (int i = 0; i < fFragmentProcessors.count(); ++i) {
+        add_dependencies_for_processor(fFragmentProcessors[i].get(), rt);
+    }
+
+    if (fXferProcessor.get()) {
+        const GrXferProcessor* xfer = fXferProcessor.get();
+
+        for (int i = 0; i < xfer->numTextures(); ++i) {
+            GrTexture* texture = xfer->textureAccess(i).getTexture();   
+            SkASSERT(rt->getLastDrawTarget());
+            rt->getLastDrawTarget()->addDependency(texture);
+        }
+    }
+}
+
+void GrPipeline::adjustProgramFromOptimizations(const GrPipelineBuilder& pipelineBuilder,
+                                                GrXferProcessor::OptFlags flags,
+                                                const GrProcOptInfo& colorPOI,
+                                                const GrProcOptInfo& coveragePOI,
+                                                int* firstColorProcessorIdx,
+                                                int* firstCoverageProcessorIdx) {
+    fIgnoresCoverage = SkToBool(flags & GrXferProcessor::kIgnoreCoverage_OptFlag);
+    fReadsFragPosition = fXferProcessor->willReadFragmentPosition();
+
+    if ((flags & GrXferProcessor::kIgnoreColor_OptFlag) ||
+        (flags & GrXferProcessor::kOverrideColor_OptFlag)) {
+        *firstColorProcessorIdx = pipelineBuilder.numColorFragmentProcessors();
+    } else {
+        if (colorPOI.readsFragPosition()) {
+            fReadsFragPosition = true;
+        }
+    }
+
+    if (flags & GrXferProcessor::kIgnoreCoverage_OptFlag) {
+        *firstCoverageProcessorIdx = pipelineBuilder.numCoverageFragmentProcessors();
+    } else {
+        if (coveragePOI.readsFragPosition()) {
+            fReadsFragPosition = true;
+        }
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+bool GrPipeline::AreEqual(const GrPipeline& a, const GrPipeline& b,
+                          bool ignoreCoordTransforms) {
+    SkASSERT(&a != &b);
+
+    if (a.getRenderTarget() != b.getRenderTarget() ||
+        a.fFragmentProcessors.count() != b.fFragmentProcessors.count() ||
+        a.fNumColorProcessors != b.fNumColorProcessors ||
+        a.fScissorState != b.fScissorState ||
+        a.fFlags != b.fFlags ||
+        a.fStencilSettings != b.fStencilSettings ||
+        a.fDrawFace != b.fDrawFace) {
+        return false;
+    }
+
+    if (!a.getXferProcessor()->isEqual(*b.getXferProcessor())) {
+        return false;
+    }
+
+    for (int i = 0; i < a.numFragmentProcessors(); i++) {
+        if (!a.getFragmentProcessor(i).isEqual(b.getFragmentProcessor(i), ignoreCoordTransforms)) {
+            return false;
+        }
+    }
+    return true;
+}
+
diff --git a/gfx/skia/skia/src/gpu/GrPipeline.h b/gfx/skia/skia/src/gpu/GrPipeline.h
new file mode 100644
index 000000000000..fbfe119ac0de
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrPipeline.h
@@ -0,0 +1,201 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrPipeline_DEFINED
+#define GrPipeline_DEFINED
+
+#include "GrColor.h"
+#include "GrFragmentProcessor.h"
+#include "GrGpu.h"
+#include "GrNonAtomicRef.h"
+#include "GrPendingProgramElement.h"
+#include "GrPrimitiveProcessor.h"
+#include "GrProgramDesc.h"
+#include "GrStencil.h"
+#include "GrTypesPriv.h"
+#include "SkMatrix.h"
+#include "SkRefCnt.h"
+
+class GrBatch;
+class GrDeviceCoordTexture;
+class GrPipelineBuilder;
+
+struct GrBatchToXPOverrides {
+    bool fUsePLSDstRead;
+};
+
+struct GrPipelineOptimizations {
+    GrProcOptInfo fColorPOI;
+    GrProcOptInfo fCoveragePOI;
+    GrBatchToXPOverrides fOverrides;
+};
+
+/**
+ * Class that holds an optimized version of a GrPipelineBuilder. It is meant to be an immutable
+ * class, and contains all data needed to set the state for a gpu draw.
+ */
+class GrPipeline : public GrNonAtomicRef {
+public:
+    ///////////////////////////////////////////////////////////////////////////
+    /// @name Creation
+
+    struct CreateArgs {
+        const GrPipelineBuilder*    fPipelineBuilder;
+        const GrCaps*               fCaps;
+        GrPipelineOptimizations     fOpts;
+        const GrScissorState*       fScissor;
+        GrXferProcessor::DstTexture fDstTexture;
+    };
+
+    /** Creates a pipeline into a pre-allocated buffer */
+    static GrPipeline* CreateAt(void* memory, const CreateArgs&, GrXPOverridesForBatch*);
+
+    /// @}
+
+    ///////////////////////////////////////////////////////////////////////////
+    /// @name Comparisons
+
+    /**
+     * Returns true if these pipelines are equivalent.  Coord transforms may be applied either on
+     * the GPU or the CPU. When we apply them on the CPU then the matrices need not agree in order
+     * to combine draws. Therefore we take a param that indicates whether coord transforms should be
+     * compared."
+     */
+    static bool AreEqual(const GrPipeline& a, const GrPipeline& b, bool ignoreCoordTransforms);
+
+    /**
+     * Allows a GrBatch subclass to determine whether two GrBatches can combine. This is a stricter
+     * test than isEqual because it also considers blend barriers when the two batches' bounds
+     * overlap
+     */
+    static bool CanCombine(const GrPipeline& a, const SkRect& aBounds,
+                           const GrPipeline& b, const SkRect& bBounds,
+                           const GrCaps& caps,
+                           bool ignoreCoordTransforms = false)  {
+        if (!AreEqual(a, b, ignoreCoordTransforms)) {
+            return false;
+        }
+        if (a.xferBarrierType(caps)) {
+            return aBounds.fRight <= bBounds.fLeft ||
+                   aBounds.fBottom <= bBounds.fTop ||
+                   bBounds.fRight <= aBounds.fLeft ||
+                   bBounds.fBottom <= aBounds.fTop;
+        }
+        return true;
+    }
+
+    /// @}
+
+    ///////////////////////////////////////////////////////////////////////////
+    /// @name GrFragmentProcessors
+
+    // Make the renderTarget's drawTarget (if it exists) be dependent on any
+    // drawTargets in this pipeline
+    void addDependenciesTo(GrRenderTarget* rt) const;
+
+    int numColorFragmentProcessors() const { return fNumColorProcessors; }
+    int numCoverageFragmentProcessors() const {
+        return fFragmentProcessors.count() - fNumColorProcessors;
+    }
+    int numFragmentProcessors() const { return fFragmentProcessors.count(); }
+
+    const GrXferProcessor* getXferProcessor() const { return fXferProcessor.get(); }
+
+    const GrFragmentProcessor& getColorFragmentProcessor(int idx) const {
+        SkASSERT(idx < this->numColorFragmentProcessors());
+        return *fFragmentProcessors[idx].get();
+    }
+
+    const GrFragmentProcessor& getCoverageFragmentProcessor(int idx) const {
+        SkASSERT(idx < this->numCoverageFragmentProcessors());
+        return *fFragmentProcessors[fNumColorProcessors + idx].get();
+    }
+
+    const GrFragmentProcessor& getFragmentProcessor(int idx) const {
+        return *fFragmentProcessors[idx].get();
+    }
+
+    /// @}
+
+    /**
+     * Retrieves the currently set render-target.
+     *
+     * @return    The currently set render target.
+     */
+    GrRenderTarget* getRenderTarget() const { return fRenderTarget.get(); }
+
+    const GrStencilSettings& getStencil() const { return fStencilSettings; }
+
+    const GrScissorState& getScissorState() const { return fScissorState; }
+
+    bool isHWAntialiasState() const { return SkToBool(fFlags & kHWAA_Flag); }
+    bool snapVerticesToPixelCenters() const { return SkToBool(fFlags & kSnapVertices_Flag); }
+
+    GrXferBarrierType xferBarrierType(const GrCaps& caps) const {
+        return fXferProcessor->xferBarrierType(fRenderTarget.get(), caps);
+    }
+
+    /**
+     * Gets whether the target is drawing clockwise, counterclockwise,
+     * or both faces.
+     * @return the current draw face(s).
+     */
+    GrPipelineBuilder::DrawFace getDrawFace() const { return fDrawFace; }
+
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    bool readsFragPosition() const { return fReadsFragPosition; }
+    bool ignoresCoverage() const { return fIgnoresCoverage; }
+
+private:
+    GrPipeline() { /** Initialized in factory function*/ }
+
+    /**
+     * Alter the program desc and inputs (attribs and processors) based on the blend optimization.
+     */
+    void adjustProgramFromOptimizations(const GrPipelineBuilder& ds,
+                                        GrXferProcessor::OptFlags,
+                                        const GrProcOptInfo& colorPOI,
+                                        const GrProcOptInfo& coveragePOI,
+                                        int* firstColorProcessorIdx,
+                                        int* firstCoverageProcessorIdx);
+
+    /**
+     * Calculates the primary and secondary output types of the shader. For certain output types
+     * the function may adjust the blend coefficients. After this function is called the src and dst
+     * blend coeffs will represent those used by backend API.
+     */
+    void setOutputStateInfo(const GrPipelineBuilder& ds, GrXferProcessor::OptFlags,
+                            const GrCaps&);
+
+    enum Flags {
+        kHWAA_Flag              = 0x1,
+        kSnapVertices_Flag      = 0x2,
+    };
+
+    typedef GrPendingIOResource<GrRenderTarget, kWrite_GrIOType> RenderTarget;
+    typedef GrPendingProgramElement<const GrFragmentProcessor> PendingFragmentProcessor;
+    typedef SkAutoSTArray<8, PendingFragmentProcessor> FragmentProcessorArray;
+    typedef GrPendingProgramElement<const GrXferProcessor> ProgramXferProcessor;
+    RenderTarget                        fRenderTarget;
+    GrScissorState                      fScissorState;
+    GrStencilSettings                   fStencilSettings;
+    GrPipelineBuilder::DrawFace         fDrawFace;
+    uint32_t                            fFlags;
+    ProgramXferProcessor                fXferProcessor;
+    FragmentProcessorArray              fFragmentProcessors;
+    bool                                fReadsFragPosition;
+    bool                                fIgnoresCoverage;
+
+    // This value is also the index in fFragmentProcessors where coverage processors begin.
+    int                                 fNumColorProcessors;
+
+    typedef SkRefCnt INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrPipelineBuilder.cpp b/gfx/skia/skia/src/gpu/GrPipelineBuilder.cpp
new file mode 100644
index 000000000000..f1d5c26168c8
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrPipelineBuilder.cpp
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrPipelineBuilder.h"
+
+#include "GrBlend.h"
+#include "GrPaint.h"
+#include "GrPipeline.h"
+#include "GrProcOptInfo.h"
+#include "GrXferProcessor.h"
+#include "batches/GrBatch.h"
+#include "effects/GrPorterDuffXferProcessor.h"
+
+GrPipelineBuilder::GrPipelineBuilder()
+    : fFlags(0x0), fDrawFace(kBoth_DrawFace) {
+    SkDEBUGCODE(fBlockEffectRemovalCnt = 0;)
+}
+
+GrPipelineBuilder::GrPipelineBuilder(const GrPaint& paint, GrRenderTarget* rt, const GrClip& clip) {
+    SkDEBUGCODE(fBlockEffectRemovalCnt = 0;)
+
+    for (int i = 0; i < paint.numColorFragmentProcessors(); ++i) {
+        fColorFragmentProcessors.push_back(SkRef(paint.getColorFragmentProcessor(i)));
+    }
+
+    for (int i = 0; i < paint.numCoverageFragmentProcessors(); ++i) {
+        fCoverageFragmentProcessors.push_back(SkRef(paint.getCoverageFragmentProcessor(i)));
+    }
+
+    fXPFactory.reset(SkSafeRef(paint.getXPFactory()));
+
+    this->setRenderTarget(rt);
+
+    // These have no equivalent in GrPaint, set them to defaults
+    fDrawFace = kBoth_DrawFace;
+    fStencilSettings.setDisabled();
+    fFlags = 0;
+
+    fClip = clip;
+
+    this->setState(GrPipelineBuilder::kHWAntialias_Flag,
+                   rt->isUnifiedMultisampled() && paint.isAntiAlias());
+}
+
+//////////////////////////////////////////////////////////////////////////////s
+
+bool GrPipelineBuilder::willXPNeedDstTexture(const GrCaps& caps,
+                                             const GrPipelineOptimizations& optimizations) const {
+    if (this->getXPFactory()) {
+        return this->getXPFactory()->willNeedDstTexture(caps, optimizations, 
+                                                        this->hasMixedSamples());
+    }
+    return GrPorterDuffXPFactory::SrcOverWillNeedDstTexture(caps, optimizations,
+                                                            this->hasMixedSamples());
+}
+
+void GrPipelineBuilder::AutoRestoreFragmentProcessorState::set(
+                                                         const GrPipelineBuilder* pipelineBuilder) {
+    if (fPipelineBuilder) {
+        int m = fPipelineBuilder->numColorFragmentProcessors() - fColorEffectCnt;
+        SkASSERT(m >= 0);
+        for (int i = 0; i < m; ++i) {
+            fPipelineBuilder->fColorFragmentProcessors.fromBack(i)->unref();
+        }
+        fPipelineBuilder->fColorFragmentProcessors.pop_back_n(m);
+
+        int n = fPipelineBuilder->numCoverageFragmentProcessors() - fCoverageEffectCnt;
+        SkASSERT(n >= 0);
+        for (int i = 0; i < n; ++i) {
+            fPipelineBuilder->fCoverageFragmentProcessors.fromBack(i)->unref();
+        }
+        fPipelineBuilder->fCoverageFragmentProcessors.pop_back_n(n);
+        SkDEBUGCODE(--fPipelineBuilder->fBlockEffectRemovalCnt;)
+    }
+    fPipelineBuilder = const_cast<GrPipelineBuilder*>(pipelineBuilder);
+    if (nullptr != pipelineBuilder) {
+        fColorEffectCnt = pipelineBuilder->numColorFragmentProcessors();
+        fCoverageEffectCnt = pipelineBuilder->numCoverageFragmentProcessors();
+        SkDEBUGCODE(++pipelineBuilder->fBlockEffectRemovalCnt;)
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+GrPipelineBuilder::~GrPipelineBuilder() {
+    SkASSERT(0 == fBlockEffectRemovalCnt);
+    for (int i = 0; i < fColorFragmentProcessors.count(); ++i) {
+        fColorFragmentProcessors[i]->unref();
+    }
+    for (int i = 0; i < fCoverageFragmentProcessors.count(); ++i) {
+        fCoverageFragmentProcessors[i]->unref();
+    }
+}
diff --git a/gfx/skia/skia/src/gpu/GrPipelineBuilder.h b/gfx/skia/skia/src/gpu/GrPipelineBuilder.h
new file mode 100644
index 000000000000..f5fe9f80dc38
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrPipelineBuilder.h
@@ -0,0 +1,388 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrPipelineBuilder_DEFINED
+#define GrPipelineBuilder_DEFINED
+
+#include "GrBlend.h"
+#include "GrCaps.h"
+#include "GrClip.h"
+#include "GrGpuResourceRef.h"
+#include "GrProcOptInfo.h"
+#include "GrRenderTarget.h"
+#include "GrStencil.h"
+#include "GrXferProcessor.h"
+#include "SkMatrix.h"
+#include "effects/GrCoverageSetOpXP.h"
+#include "effects/GrDisableColorXP.h"
+#include "effects/GrPorterDuffXferProcessor.h"
+#include "effects/GrSimpleTextureEffect.h"
+
+class GrDrawBatch;
+class GrCaps;
+class GrPaint;
+class GrTexture;
+
+class GrPipelineBuilder : public SkNoncopyable {
+public:
+    GrPipelineBuilder();
+
+    /**
+     * Initializes the GrPipelineBuilder based on a GrPaint, render target, and clip. Note
+     * that GrPipelineBuilder encompasses more than GrPaint. Aspects of GrPipelineBuilder that have
+     * no GrPaint equivalents are set to default values with the exception of vertex attribute state
+     * which is unmodified by this function and clipping which will be enabled.
+     */
+    GrPipelineBuilder(const GrPaint&, GrRenderTarget*, const GrClip&);
+
+    virtual ~GrPipelineBuilder();
+
+    ///////////////////////////////////////////////////////////////////////////
+    /// @name Fragment Processors
+    ///
+    /// GrFragmentProcessors are used to compute per-pixel color and per-pixel fractional coverage.
+    /// There are two chains of FPs, one for color and one for coverage. The first FP in each
+    /// chain gets the initial color/coverage from the GrPrimitiveProcessor. It computes an output
+    /// color/coverage which is fed to the next FP in the chain. The last color and coverage FPs
+    /// feed their output to the GrXferProcessor which controls blending.
+    ////
+
+    int numColorFragmentProcessors() const { return fColorFragmentProcessors.count(); }
+    int numCoverageFragmentProcessors() const { return fCoverageFragmentProcessors.count(); }
+    int numFragmentProcessors() const { return this->numColorFragmentProcessors() +
+                                               this->numCoverageFragmentProcessors(); }
+
+    const GrFragmentProcessor* getColorFragmentProcessor(int idx) const {
+        return fColorFragmentProcessors[idx];
+    }
+    const GrFragmentProcessor* getCoverageFragmentProcessor(int idx) const {
+        return fCoverageFragmentProcessors[idx];
+    }
+
+    const GrFragmentProcessor* addColorFragmentProcessor(const GrFragmentProcessor* processor) {
+        SkASSERT(processor);
+        fColorFragmentProcessors.push_back(SkRef(processor));
+        return processor;
+    }
+
+    const GrFragmentProcessor* addCoverageFragmentProcessor(const GrFragmentProcessor* processor) {
+        SkASSERT(processor);
+        fCoverageFragmentProcessors.push_back(SkRef(processor));
+        return processor;
+    }
+
+    /**
+     * Creates a GrSimpleTextureEffect that uses local coords as texture coordinates.
+     */
+    void addColorTextureProcessor(GrTexture* texture, const SkMatrix& matrix) {
+        this->addColorFragmentProcessor(GrSimpleTextureEffect::Create(texture, matrix))->unref();
+    }
+
+    void addCoverageTextureProcessor(GrTexture* texture, const SkMatrix& matrix) {
+        this->addCoverageFragmentProcessor(GrSimpleTextureEffect::Create(texture, matrix))->unref();
+    }
+
+    void addColorTextureProcessor(GrTexture* texture,
+                                  const SkMatrix& matrix,
+                                  const GrTextureParams& params) {
+        this->addColorFragmentProcessor(GrSimpleTextureEffect::Create(texture, matrix,
+                                                                      params))->unref();
+    }
+
+    void addCoverageTextureProcessor(GrTexture* texture,
+                                     const SkMatrix& matrix,
+                                     const GrTextureParams& params) {
+        this->addCoverageFragmentProcessor(GrSimpleTextureEffect::Create(texture, matrix,
+                                                                         params))->unref();
+    }
+
+    /**
+     * When this object is destroyed it will remove any color/coverage FPs from the pipeline builder
+     * that were added after its constructor.
+     * This class can transiently modify its "const" GrPipelineBuilder object but will restore it
+     * when done - so it is notionally "const" correct.
+     */
+    class AutoRestoreFragmentProcessorState : public ::SkNoncopyable {
+    public:
+        AutoRestoreFragmentProcessorState() 
+            : fPipelineBuilder(nullptr)
+            , fColorEffectCnt(0)
+            , fCoverageEffectCnt(0) {}
+
+        AutoRestoreFragmentProcessorState(const GrPipelineBuilder& ds)
+            : fPipelineBuilder(nullptr)
+            , fColorEffectCnt(0)
+            , fCoverageEffectCnt(0) {
+            this->set(&ds);
+        }
+
+        ~AutoRestoreFragmentProcessorState() { this->set(nullptr); }
+
+        void set(const GrPipelineBuilder* ds);
+
+        bool isSet() const { return SkToBool(fPipelineBuilder); }
+
+        const GrFragmentProcessor* addCoverageFragmentProcessor(
+            const GrFragmentProcessor* processor) {
+            SkASSERT(this->isSet());
+            return fPipelineBuilder->addCoverageFragmentProcessor(processor);
+        }
+
+    private:
+        // notionally const (as marginalia)
+        GrPipelineBuilder*    fPipelineBuilder;
+        int                   fColorEffectCnt;
+        int                   fCoverageEffectCnt;
+    };
+
+    /// @}
+
+    ///////////////////////////////////////////////////////////////////////////
+    /// @name Blending
+    ////
+
+    /**
+     * Installs a GrXPFactory. This object controls how src color, fractional pixel coverage,
+     * and the dst color are blended.
+     */
+    const GrXPFactory* setXPFactory(const GrXPFactory* xpFactory) {
+        fXPFactory.reset(SkSafeRef(xpFactory));
+        return xpFactory;
+    }
+
+    /**
+     * Sets a GrXPFactory that will ignore src color and perform a set operation between the draws
+     * output coverage and the destination. This is useful to render coverage masks as CSG.
+     */
+    void setCoverageSetOpXPFactory(SkRegion::Op regionOp, bool invertCoverage = false) {
+        fXPFactory.reset(GrCoverageSetOpXPFactory::Create(regionOp, invertCoverage));
+    }
+
+    /**
+     * Sets a GrXPFactory that disables color writes to the destination. This is useful when
+     * rendering to the stencil buffer.
+     */
+    void setDisableColorXPFactory() {
+        fXPFactory.reset(GrDisableColorXPFactory::Create());
+    }
+
+    const GrXPFactory* getXPFactory() const {
+        return fXPFactory;
+    }
+
+    /**
+     * Checks whether the xp will need destination in a texture to correctly blend.
+     */
+    bool willXPNeedDstTexture(const GrCaps& caps, 
+                              const GrPipelineOptimizations& optimizations) const;
+
+    /// @}
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    /// @name Render Target
+    ////
+
+    /**
+     * Retrieves the currently set render-target.
+     *
+     * @return    The currently set render target.
+     */
+    GrRenderTarget* getRenderTarget() const { return fRenderTarget.get(); }
+
+    /**
+     * Sets the render-target used at the next drawing call
+     *
+     * @param target  The render target to set.
+     */
+    void setRenderTarget(GrRenderTarget* target) { fRenderTarget.reset(SkSafeRef(target)); }
+
+    /**
+     * Returns whether the rasterizer and stencil test (if any) will run at a higher sample rate
+     * than the color buffer. In is scenario, the higher sample rate is resolved during blending.
+     */
+    bool hasMixedSamples() const {
+        return fRenderTarget->hasMixedSamples() &&
+               (this->isHWAntialias() || !fStencilSettings.isDisabled());
+    }
+
+    /// @}
+
+    ///////////////////////////////////////////////////////////////////////////
+    /// @name Stencil
+    ////
+
+    const GrStencilSettings& getStencil() const { return fStencilSettings; }
+
+    /**
+     * Sets the stencil settings to use for the next draw.
+     * Changing the clip has the side-effect of possibly zeroing
+     * out the client settable stencil bits. So multipass algorithms
+     * using stencil should not change the clip between passes.
+     * @param settings  the stencil settings to use.
+     */
+    void setStencil(const GrStencilSettings& settings) { fStencilSettings = settings; }
+
+    GrStencilSettings* stencil() { return &fStencilSettings; }
+
+    /**
+     * AutoRestoreStencil
+     *
+     * This simple struct saves and restores the stencil settings
+     * This class can transiently modify its "const" GrPipelineBuilder object but will restore it
+     * when done - so it is notionally "const" correct.
+     */
+    class AutoRestoreStencil : public ::SkNoncopyable {
+    public:
+        AutoRestoreStencil() : fPipelineBuilder(nullptr) {}
+
+        AutoRestoreStencil(const GrPipelineBuilder& ds) : fPipelineBuilder(nullptr) { this->set(&ds); }
+
+        ~AutoRestoreStencil() { this->set(nullptr); }
+
+        void set(const GrPipelineBuilder* ds) {
+            if (fPipelineBuilder) {
+                fPipelineBuilder->setStencil(fStencilSettings);
+            }
+            fPipelineBuilder = const_cast<GrPipelineBuilder*>(ds);
+            if (ds) {
+                fStencilSettings = ds->getStencil();
+            }
+        }
+
+        bool isSet() const { return SkToBool(fPipelineBuilder); }
+
+        void setStencil(const GrStencilSettings& settings) {
+            SkASSERT(this->isSet());
+            fPipelineBuilder->setStencil(settings);
+        }
+
+    private:
+        // notionally const (as marginalia)
+        GrPipelineBuilder*  fPipelineBuilder;
+        GrStencilSettings   fStencilSettings;
+    };
+
+
+    /// @}
+
+    ///////////////////////////////////////////////////////////////////////////
+    /// @name State Flags
+    ////
+
+    /**
+     *  Flags that affect rendering. Controlled using enable/disableState(). All
+     *  default to disabled.
+     */
+    enum Flags {
+        /**
+         * Perform HW anti-aliasing. This means either HW FSAA, if supported by the render target,
+         * or smooth-line rendering if a line primitive is drawn and line smoothing is supported by
+         * the 3D API.
+         */
+        kHWAntialias_Flag   = 0x01,
+
+        /**
+         * Modifies the vertex shader so that vertices will be positioned at pixel centers.
+         */
+        kSnapVerticesToPixelCenters_Flag = 0x02,
+
+        kLast_Flag = kSnapVerticesToPixelCenters_Flag,
+    };
+
+    bool isHWAntialias() const { return SkToBool(fFlags & kHWAntialias_Flag); }
+    bool snapVerticesToPixelCenters() const {
+        return SkToBool(fFlags & kSnapVerticesToPixelCenters_Flag); }
+
+    /**
+     * Enable render state settings.
+     *
+     * @param flags bitfield of Flags specifying the states to enable
+     */
+    void enableState(uint32_t flags) { fFlags |= flags; }
+        
+    /**
+     * Disable render state settings.
+     *
+     * @param flags bitfield of Flags specifying the states to disable
+     */
+    void disableState(uint32_t flags) { fFlags &= ~(flags); }
+
+    /**
+     * Enable or disable flags based on a boolean.
+     *
+     * @param flags bitfield of Flags to enable or disable
+     * @param enable    if true enable stateBits, otherwise disable
+     */
+    void setState(uint32_t flags, bool enable) {
+        if (enable) {
+            this->enableState(flags);
+        } else {
+            this->disableState(flags);
+        }
+    }
+
+    /// @}
+
+    ///////////////////////////////////////////////////////////////////////////
+    /// @name Face Culling
+    ////
+
+    enum DrawFace {
+        kInvalid_DrawFace = -1,
+
+        kBoth_DrawFace,
+        kCCW_DrawFace,
+        kCW_DrawFace,
+    };
+
+    /**
+     * Gets whether the target is drawing clockwise, counterclockwise,
+     * or both faces.
+     * @return the current draw face(s).
+     */
+    DrawFace getDrawFace() const { return fDrawFace; }
+
+    /**
+     * Controls whether clockwise, counterclockwise, or both faces are drawn.
+     * @param face  the face(s) to draw.
+     */
+    void setDrawFace(DrawFace face) {
+        SkASSERT(kInvalid_DrawFace != face);
+        fDrawFace = face;
+    }
+
+    /// @}
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    bool usePLSDstRead(const GrDrawBatch* batch) const;
+
+    void setClip(const GrClip& clip) { fClip = clip; }
+    const GrClip& clip() const { return fClip; }
+
+private:
+    // Some of the auto restore objects assume that no effects are removed during their lifetime.
+    // This is used to assert that this condition holds.
+    SkDEBUGCODE(mutable int fBlockEffectRemovalCnt;)
+
+    typedef SkSTArray<4, const GrFragmentProcessor*, true> FragmentProcessorArray;
+
+    SkAutoTUnref<GrRenderTarget>            fRenderTarget;
+    uint32_t                                fFlags;
+    GrStencilSettings                       fStencilSettings;
+    DrawFace                                fDrawFace;
+    mutable SkAutoTUnref<const GrXPFactory> fXPFactory;
+    FragmentProcessorArray                  fColorFragmentProcessors;
+    FragmentProcessorArray                  fCoverageFragmentProcessors;
+    GrClip                                  fClip;
+
+    friend class GrPipeline;
+    friend class GrDrawTarget;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrPlotMgr.h b/gfx/skia/skia/src/gpu/GrPlotMgr.h
deleted file mode 100644
index 144161132740..000000000000
--- a/gfx/skia/skia/src/gpu/GrPlotMgr.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrPlotMgr_DEFINED
-#define GrPlotMgr_DEFINED
-
-#include "GrTypes.h"
-#include "SkTypes.h"
-
-class GrPlotMgr : SkNoncopyable {
-public:
-    GrPlotMgr(int width, int height) {
-        fDim.set(width, height);
-        size_t needed = width * height;
-        if (needed <= sizeof(fStorage)) {
-            fBusy = fStorage;
-        } else {
-            fBusy = SkNEW_ARRAY(char, needed);
-        }
-        this->reset();
-    }
-
-    ~GrPlotMgr() {
-        if (fBusy != fStorage) {
-            delete[] fBusy;
-        }
-    }
-
-    void reset() {
-        sk_bzero(fBusy, fDim.fX * fDim.fY);
-    }
-
-    bool newPlot(SkIPoint16* loc) {
-        char* busy = fBusy;
-        for (int y = 0; y < fDim.fY; y++) {
-            for (int x = 0; x < fDim.fX; x++) {
-                if (!*busy) {
-                    *busy = true;
-                    loc->set(x, y);
-                    return true;
-                }
-                busy++;
-            }
-        }
-        return false;
-    }
-
-    bool isBusy(int x, int y) const {
-        SkASSERT((unsigned)x < (unsigned)fDim.fX);
-        SkASSERT((unsigned)y < (unsigned)fDim.fY);
-        return fBusy[y * fDim.fX + x] != 0;
-    }
-
-    void freePlot(int x, int y) {
-        SkASSERT((unsigned)x < (unsigned)fDim.fX);
-        SkASSERT((unsigned)y < (unsigned)fDim.fY);
-        fBusy[y * fDim.fX + x] = false;
-    }
-
-private:
-    enum {
-        STORAGE = 64
-    };
-    char fStorage[STORAGE];
-    char* fBusy;
-    SkIPoint16  fDim;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/GrPrimitiveProcessor.cpp b/gfx/skia/skia/src/gpu/GrPrimitiveProcessor.cpp
new file mode 100644
index 000000000000..180217e26166
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrPrimitiveProcessor.cpp
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrPrimitiveProcessor.h"
+
+#include "GrCoordTransform.h"
+
+/**
+ * The key for an individual coord transform is made up of a matrix type, a precision, and a bit
+ * that indicates the source of the input coords.
+ */
+enum {
+    kMatrixTypeKeyBits   = 1,
+    kMatrixTypeKeyMask   = (1 << kMatrixTypeKeyBits) - 1,
+
+    kPrecisionBits       = 2,
+    kPrecisionShift      = kMatrixTypeKeyBits,
+
+    kPositionCoords_Flag = (1 << (kPrecisionShift + kPrecisionBits)),
+    kDeviceCoords_Flag   = kPositionCoords_Flag + kPositionCoords_Flag,
+
+    kTransformKeyBits    = kMatrixTypeKeyBits + kPrecisionBits + 2,
+};
+
+GR_STATIC_ASSERT(kHigh_GrSLPrecision < (1 << kPrecisionBits));
+
+/**
+ * We specialize the vertex code for each of these matrix types.
+ */
+enum MatrixType {
+    kNoPersp_MatrixType  = 0,
+    kGeneral_MatrixType  = 1,
+};
+
+uint32_t
+GrPrimitiveProcessor::getTransformKey(const SkTArray<const GrCoordTransform*, true>& coords,
+                                      int numCoords) const {
+    uint32_t totalKey = 0;
+    for (int t = 0; t < numCoords; ++t) {
+        uint32_t key = 0;
+        const GrCoordTransform* coordTransform = coords[t];
+        if (coordTransform->getMatrix().hasPerspective()) {
+            key |= kGeneral_MatrixType;
+        } else {
+            key |= kNoPersp_MatrixType;
+        }
+
+        if (kLocal_GrCoordSet == coordTransform->sourceCoords() &&
+            !this->hasExplicitLocalCoords()) {
+            key |= kPositionCoords_Flag;
+        } else if (kDevice_GrCoordSet == coordTransform->sourceCoords()) {
+            key |= kDeviceCoords_Flag;
+        }
+
+        GR_STATIC_ASSERT(kGrSLPrecisionCount <= (1 << kPrecisionBits));
+        key |= (coordTransform->precision() << kPrecisionShift);
+
+        key <<= kTransformKeyBits * t;
+
+        SkASSERT(0 == (totalKey & key)); // keys for each transform ought not to overlap
+        totalKey |= key;
+    }
+    return totalKey;
+}
diff --git a/gfx/skia/skia/src/gpu/GrPrimitiveProcessor.h b/gfx/skia/skia/src/gpu/GrPrimitiveProcessor.h
new file mode 100644
index 000000000000..467200a86d09
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrPrimitiveProcessor.h
@@ -0,0 +1,229 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrPrimitiveProcessor_DEFINED
+#define GrPrimitiveProcessor_DEFINED
+
+#include "GrColor.h"
+#include "GrProcessor.h"
+#include "GrShaderVar.h"
+
+/*
+ * The GrPrimitiveProcessor represents some kind of geometric primitive.  This includes the shape
+ * of the primitive and the inherent color of the primitive.  The GrPrimitiveProcessor is
+ * responsible for providing a color and coverage input into the Ganesh rendering pipeline.  Through
+ * optimization, Ganesh may decide a different color, no color, and / or no coverage are required
+ * from the GrPrimitiveProcessor, so the GrPrimitiveProcessor must be able to support this
+ * functionality.  We also use the GrPrimitiveProcessor to make batching decisions.
+ *
+ * There are two feedback loops between the GrFragmentProcessors, the GrXferProcessor, and the
+ * GrPrimitiveProcessor.  These loops run on the CPU and compute any invariant components which
+ * might be useful for correctness / optimization decisions.  The GrPrimitiveProcessor seeds these
+ * loops, one with initial color and one with initial coverage, in its
+ * onComputeInvariantColor / Coverage calls.  These seed values are processed by the subsequent
+ * stages of the rendering pipeline and the output is then fed back into the GrPrimitiveProcessor in
+ * the initBatchTracker call, where the GrPrimitiveProcessor can then initialize the GrBatchTracker
+ * struct with the appropriate values.
+ *
+ * We are evolving this system to move towards generating geometric meshes and their associated
+ * vertex data after we have batched and reordered draws.  This system, known as 'deferred geometry'
+ * will allow the GrPrimitiveProcessor much greater control over how data is transmitted to shaders.
+ *
+ * In a deferred geometry world, the GrPrimitiveProcessor can always 'batch'  To do this, each
+ * primitive type is associated with one GrPrimitiveProcessor, who has complete control of how
+ * it draws.  Each primitive draw will bundle all required data to perform the draw, and these
+ * bundles of data will be owned by an instance of the associated GrPrimitiveProcessor.  Bundles
+ * can be updated alongside the GrBatchTracker struct itself, ultimately allowing the
+ * GrPrimitiveProcessor complete control of how it gets data into the fragment shader as long as
+ * it emits the appropriate color, or none at all, as directed.
+ */
+
+class GrGLSLCaps;
+class GrGLSLPrimitiveProcessor;
+
+struct GrInitInvariantOutput;
+
+/*
+ * This class allows the GrPipeline to communicate information about the pipeline to a
+ * GrBatch which should be forwarded to the GrPrimitiveProcessor(s) created by the batch.
+ * These are not properly part of the pipeline because they assume the specific inputs
+ * that the batch provided when it created the pipeline. Identical pipelines may be
+ * created by different batches with different input assumptions and therefore different
+ * computed optimizations. It is the batch-specific optimizations that allow the pipelines
+ * to be equal.
+ */
+class GrXPOverridesForBatch {
+public:
+    /** Does the pipeline require the GrPrimitiveProcessor's color? */
+    bool readsColor() const { return SkToBool(kReadsColor_Flag & fFlags); }
+
+    /** Does the pipeline require the GrPrimitiveProcessor's coverage? */
+    bool readsCoverage() const { return
+        SkToBool(kReadsCoverage_Flag & fFlags); }
+
+    /** Does the pipeline require access to (implicit or explicit) local coordinates? */
+    bool readsLocalCoords() const {
+        return SkToBool(kReadsLocalCoords_Flag & fFlags);
+    }
+
+    /** Does the pipeline allow the GrPrimitiveProcessor to combine color and coverage into one
+        color output ? */
+    bool canTweakAlphaForCoverage() const {
+        return SkToBool(kCanTweakAlphaForCoverage_Flag & fFlags);
+    }
+
+    /** Does the pipeline require the GrPrimitiveProcessor to specify a specific color (and if
+        so get the color)? */
+    bool getOverrideColorIfSet(GrColor* overrideColor) const {
+        if (SkToBool(kUseOverrideColor_Flag & fFlags)) {
+            SkASSERT(SkToBool(kReadsColor_Flag & fFlags));
+            if (overrideColor) {
+                *overrideColor = fOverrideColor;
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Returns true if the pipeline's color output will be affected by the existing render target
+     * destination pixel values (meaning we need to be careful with overlapping draws). Note that we
+     * can conflate coverage and color, so the destination color may still bleed into pixels that
+     * have partial coverage, even if this function returns false.
+     *
+     * The above comment seems incorrect for the use case. This funciton is used to turn two
+     * overlapping draws into a single draw (really to stencil multiple paths and do a single
+     * cover). It seems that what really matters is whether the dst is read for color OR for
+     * coverage.
+     */
+    bool willColorBlendWithDst() const { return SkToBool(kWillColorBlendWithDst_Flag & fFlags); }
+
+private:
+    enum {
+        // If this is not set the primitive processor need not produce a color output
+        kReadsColor_Flag                = 0x1,
+
+        // If this is not set the primitive processor need not produce a coverage output
+        kReadsCoverage_Flag             = 0x2,
+
+        // If this is not set the primitive processor need not produce local coordinates
+        kReadsLocalCoords_Flag          = 0x4,
+
+        // If this flag is set then the primitive processor may produce color*coverage as
+        // its color output (and not output a separate coverage).
+        kCanTweakAlphaForCoverage_Flag  = 0x8,
+
+        // If this flag is set the GrPrimitiveProcessor must produce fOverrideColor as its
+        // output color. If not set fOverrideColor is to be ignored.
+        kUseOverrideColor_Flag          = 0x10,
+
+        kWillColorBlendWithDst_Flag     = 0x20,
+    };
+
+    uint32_t    fFlags;
+    GrColor     fOverrideColor;
+
+    friend class GrPipeline; // To initialize this
+};
+
+/*
+ * GrPrimitiveProcessor defines an interface which all subclasses must implement.  All
+ * GrPrimitiveProcessors must proivide seed color and coverage for the Ganesh color / coverage
+ * pipelines, and they must provide some notion of equality
+ */
+class GrPrimitiveProcessor : public GrProcessor {
+public:
+    // Only the GrGeometryProcessor subclass actually has a geo shader or vertex attributes, but
+    // we put these calls on the base class to prevent having to cast
+    virtual bool willUseGeoShader() const = 0;
+
+    /*
+     * This is a safeguard to prevent GrPrimitiveProcessor's from going beyond platform specific
+     * attribute limits. This number can almost certainly be raised if required.
+     */
+    static const int kMaxVertexAttribs = 6;
+
+    struct Attribute {
+        Attribute()
+            : fName(nullptr)
+            , fType(kFloat_GrVertexAttribType)
+            , fOffset(0) {}
+        Attribute(const char* name, GrVertexAttribType type,
+                  GrSLPrecision precision = kDefault_GrSLPrecision)
+            : fName(name)
+            , fType(type)
+            , fOffset(SkAlign4(GrVertexAttribTypeSize(type)))
+            , fPrecision(precision) {}
+        const char* fName;
+        GrVertexAttribType fType;
+        size_t fOffset;
+        GrSLPrecision fPrecision;
+    };
+
+    int numAttribs() const { return fNumAttribs; }
+    const Attribute& getAttrib(int index) const {
+        SkASSERT(index < fNumAttribs);
+        return fAttribs[index];
+    }
+
+    // Returns the vertex stride of the GP.  A common use case is to request geometry from a
+    // drawtarget based off of the stride, and to populate this memory using an implicit array of
+    // structs.  In this case, it is best to assert the vertexstride == sizeof(VertexStruct).
+    size_t getVertexStride() const { return fVertexStride; }
+
+    /**
+     * Computes a transformKey from an array of coord transforms. Will only look at the first
+     * <numCoords> transforms in the array.
+     *
+     * TODO: A better name for this function  would be "compute" instead of "get".
+     */
+    uint32_t getTransformKey(const SkTArray<const GrCoordTransform*, true>& coords,
+                             int numCoords) const;
+
+    /**
+     * Sets a unique key on the GrProcessorKeyBuilder that is directly associated with this geometry
+     * processor's GL backend implementation.
+     *
+     * TODO: A better name for this function  would be "compute" instead of "get".
+     */
+    virtual void getGLSLProcessorKey(const GrGLSLCaps& caps,
+                                     GrProcessorKeyBuilder* b) const = 0;
+
+
+    /** Returns a new instance of the appropriate *GL* implementation class
+        for the given GrProcessor; caller is responsible for deleting
+        the object. */
+    virtual GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps& caps) const = 0;
+
+    bool isPathRendering() const { return fIsPathRendering; }
+
+    /**
+     * No Local Coord Transformation is needed in the shader, instead transformed local coords will
+     * be provided via vertex attribute.
+     */
+    virtual bool hasTransformedLocalCoords() const = 0;
+
+protected:
+    GrPrimitiveProcessor(bool isPathRendering)
+        : fNumAttribs(0)
+        , fVertexStride(0)
+        , fIsPathRendering(isPathRendering) {}
+
+    Attribute fAttribs[kMaxVertexAttribs];
+    int fNumAttribs;
+    size_t fVertexStride;
+
+private:
+    void notifyRefCntIsZero() const final {};
+    virtual bool hasExplicitLocalCoords() const = 0;
+
+    bool fIsPathRendering;
+
+    typedef GrProcessor INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrProcOptInfo.cpp b/gfx/skia/skia/src/gpu/GrProcOptInfo.cpp
new file mode 100644
index 000000000000..bfd9e9ec8cea
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrProcOptInfo.cpp
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrProcOptInfo.h"
+
+#include "GrGeometryProcessor.h"
+
+#include "batches/GrDrawBatch.h"
+
+void GrProcOptInfo::calcWithInitialValues(const GrFragmentProcessor * const processors[],
+                                          int cnt,
+                                          GrColor startColor,
+                                          GrColorComponentFlags flags,
+                                          bool areCoverageStages,
+                                          bool isLCD) {
+    GrInitInvariantOutput out;
+    out.fIsSingleComponent = areCoverageStages;
+    out.fColor = startColor;
+    out.fValidFlags = flags;
+    out.fIsLCDCoverage = isLCD;
+    fInOut.reset(out);
+    this->internalCalc(processors, cnt, false);
+}
+
+void GrProcOptInfo::initUsingInvariantOutput(GrInitInvariantOutput invOutput) {
+    fInOut.reset(invOutput);
+}
+
+void GrProcOptInfo::completeCalculations(const GrFragmentProcessor * const processors[], int cnt) {
+    this->internalCalc(processors, cnt, false);
+}
+
+void GrProcOptInfo::internalCalc(const GrFragmentProcessor* const processors[],
+                                 int cnt,
+                                 bool initWillReadFragmentPosition) {
+    fFirstEffectiveProcessorIndex = 0;
+    fInputColorIsUsed = true;
+    fInputColor = fInOut.color();
+    fReadsFragPosition = initWillReadFragmentPosition;
+
+    for (int i = 0; i < cnt; ++i) {
+        const GrFragmentProcessor* processor = processors[i];
+        fInOut.resetWillUseInputColor();
+        processor->computeInvariantOutput(&fInOut);
+        SkDEBUGCODE(fInOut.validate());
+        if (!fInOut.willUseInputColor()) {
+            fFirstEffectiveProcessorIndex = i;
+            fInputColorIsUsed = false;
+            // Reset these since we don't care if previous stages read these values
+            fReadsFragPosition = initWillReadFragmentPosition;
+        }
+        if (processor->willReadFragmentPosition()) {
+            fReadsFragPosition = true;
+        }
+        if (kRGBA_GrColorComponentFlags == fInOut.validFlags()) {
+            fFirstEffectiveProcessorIndex = i + 1;
+            fInputColor = fInOut.color();
+            fInputColorIsUsed = true;
+            // Since we are clearing all previous color stages we are in a state where we have found
+            // zero stages that don't multiply the inputColor.
+            fInOut.resetNonMulStageFound();
+            // Reset these since we don't care if previous stages read these values
+            fReadsFragPosition = initWillReadFragmentPosition;
+        }
+    }
+}
diff --git a/gfx/skia/skia/src/gpu/GrProcOptInfo.h b/gfx/skia/skia/src/gpu/GrProcOptInfo.h
new file mode 100644
index 000000000000..19f01a282165
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrProcOptInfo.h
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrProcOptInfo_DEFINED
+#define GrProcOptInfo_DEFINED
+
+#include "GrColor.h"
+#include "GrInvariantOutput.h"
+
+class GrDrawBatch;
+class GrFragmentProcessor;
+class GrPrimitiveProcessor;
+class GrProcessor;
+
+/**
+ * GrProcOptInfo gathers invariant data from a set of processor stages.It is used to recognize
+ * optimizations related to eliminating stages and vertex attributes that aren't necessary for a
+ * draw.
+ */
+class GrProcOptInfo {
+public:
+    GrProcOptInfo()
+        : fInOut(0, static_cast<GrColorComponentFlags>(0), false)
+        , fFirstEffectiveProcessorIndex(0)
+        , fInputColorIsUsed(true)
+        , fInputColor(0)
+        , fReadsFragPosition(false) {}
+
+    void calcWithInitialValues(const GrFragmentProcessor* const *, int cnt, GrColor startColor,
+                               GrColorComponentFlags, bool areCoverageStages, bool isLCD = false);
+    void initUsingInvariantOutput(GrInitInvariantOutput invOutput);
+    void completeCalculations(const GrFragmentProcessor * const processors[], int cnt);
+    
+    bool isSolidWhite() const { return fInOut.isSolidWhite(); }
+    bool isOpaque() const { return fInOut.isOpaque(); }
+    bool isSingleComponent() const { return fInOut.isSingleComponent(); }
+    bool allStagesMultiplyInput() const { return fInOut.allStagesMulInput(); }
+
+    // TODO: Once texture pixel configs quaries are updated, we no longer need this function.
+    // For now this function will correctly tell us if we are using LCD text or not and should only
+    // be called when looking at the coverage output.
+    bool isFourChannelOutput() const { return !fInOut.isSingleComponent() &&
+                                               fInOut.isLCDCoverage(); }
+
+    GrColor color() const { return fInOut.color(); }
+
+    GrColorComponentFlags validFlags() const {
+        return fInOut.validFlags();
+    }
+
+    /**
+     * Returns the index of the first effective color processor. If an intermediate processor
+     * doesn't read its input or has a known output, then we can ignore all earlier processors
+     * since they will not affect the final output. Thus the first effective processors index is
+     * the index to the first processor that will have an effect on the final output.
+     *
+     * If processors before the firstEffectiveProcessorIndex() are removed, corresponding values
+     * from inputColorIsUsed(), inputColorToEffectiveProcessor(), removeVertexAttribs(), and
+     * readsDst() must be used when setting up the draw to ensure correct drawing.
+     */
+    int firstEffectiveProcessorIndex() const { return fFirstEffectiveProcessorIndex; }
+
+    /**
+     * True if the first effective processor reads its input, false otherwise.
+     */
+    bool inputColorIsUsed() const { return fInputColorIsUsed; }
+
+    /**
+     * If input color is used and per-vertex colors are not used, this is the input color to the
+     * first effective processor.
+     */
+    GrColor inputColorToFirstEffectiveProccesor() const { return fInputColor; }
+
+    /**
+     * Returns true if any of the processor preserved by GrProcOptInfo read the frag position.
+     */
+    bool readsFragPosition() const { return fReadsFragPosition; }
+
+private:
+    void internalCalc(const GrFragmentProcessor* const[], int cnt, bool initWillReadFragPosition);
+
+    GrInvariantOutput fInOut;
+    int fFirstEffectiveProcessorIndex;
+    bool fInputColorIsUsed;
+    GrColor fInputColor;
+    bool fReadsFragPosition;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrProcessor.cpp b/gfx/skia/skia/src/gpu/GrProcessor.cpp
new file mode 100644
index 000000000000..1db9d76fda34
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrProcessor.cpp
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrProcessor.h"
+#include "GrContext.h"
+#include "GrGeometryProcessor.h"
+#include "GrInvariantOutput.h"
+#include "GrMemoryPool.h"
+#include "GrXferProcessor.h"
+#include "SkSpinlock.h"
+
+#if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
+
+class GrFragmentProcessor;
+class GrGeometryProcessor;
+
+/*
+ * Originally these were both in the processor unit test header, but then it seemed to cause linker
+ * problems on android.
+ */
+template<>
+SkTArray<GrProcessorTestFactory<GrFragmentProcessor>*, true>*
+GrProcessorTestFactory<GrFragmentProcessor>::GetFactories() {
+    static SkTArray<GrProcessorTestFactory<GrFragmentProcessor>*, true> gFactories;
+    return &gFactories;
+}
+
+template<>
+SkTArray<GrProcessorTestFactory<GrXPFactory>*, true>*
+GrProcessorTestFactory<GrXPFactory>::GetFactories() {
+    static SkTArray<GrProcessorTestFactory<GrXPFactory>*, true> gFactories;
+    return &gFactories;
+}
+
+template<>
+SkTArray<GrProcessorTestFactory<GrGeometryProcessor>*, true>*
+GrProcessorTestFactory<GrGeometryProcessor>::GetFactories() {
+    static SkTArray<GrProcessorTestFactory<GrGeometryProcessor>*, true> gFactories;
+    return &gFactories;
+}
+
+/*
+ * To ensure we always have successful static initialization, before creating from the factories
+ * we verify the count is as expected.  If a new factory is added, then these numbers must be
+ * manually adjusted.
+ */
+static const int kFPFactoryCount = 38;
+static const int kGPFactoryCount = 14;
+static const int kXPFactoryCount = 5;
+
+template<>
+void GrProcessorTestFactory<GrFragmentProcessor>::VerifyFactoryCount() {
+    if (kFPFactoryCount != GetFactories()->count()) {
+        SkFAIL("Wrong number of fragment processor factories!");
+    }
+}
+
+template<>
+void GrProcessorTestFactory<GrGeometryProcessor>::VerifyFactoryCount() {
+    if (kGPFactoryCount != GetFactories()->count()) {
+        SkFAIL("Wrong number of geometry processor factories!");
+    }
+}
+
+template<>
+void GrProcessorTestFactory<GrXPFactory>::VerifyFactoryCount() {
+    if (kXPFactoryCount != GetFactories()->count()) {
+        SkFAIL("Wrong number of xp factory factories!");
+    }
+}
+
+#endif
+
+
+// We use a global pool protected by a mutex(spinlock). Chrome may use the same GrContext on
+// different threads. The GrContext is not used concurrently on different threads and there is a
+// memory barrier between accesses of a context on different threads. Also, there may be multiple
+// GrContexts and those contexts may be in use concurrently on different threads.
+namespace {
+SK_DECLARE_STATIC_SPINLOCK(gProcessorSpinlock);
+class MemoryPoolAccessor {
+public:
+    MemoryPoolAccessor() { gProcessorSpinlock.acquire(); }
+
+    ~MemoryPoolAccessor() { gProcessorSpinlock.release(); }
+
+    GrMemoryPool* pool() const {
+        static GrMemoryPool gPool(4096, 4096);
+        return &gPool;
+    }
+};
+}
+
+int32_t GrProcessor::gCurrProcessorClassID = GrProcessor::kIllegalProcessorClassID;
+
+///////////////////////////////////////////////////////////////////////////////
+
+GrProcessor::~GrProcessor() {}
+
+void GrProcessor::addTextureAccess(const GrTextureAccess* access) {
+    fTextureAccesses.push_back(access);
+    this->addGpuResource(access->getProgramTexture());
+}
+
+void* GrProcessor::operator new(size_t size) {
+    return MemoryPoolAccessor().pool()->allocate(size);
+}
+
+void GrProcessor::operator delete(void* target) {
+    return MemoryPoolAccessor().pool()->release(target);
+}
+
+bool GrProcessor::hasSameTextureAccesses(const GrProcessor& that) const {
+    if (this->numTextures() != that.numTextures()) {
+        return false;
+    }
+    for (int i = 0; i < this->numTextures(); ++i) {
+        if (this->textureAccess(i) != that.textureAccess(i)) {
+            return false;
+        }
+    }
+    return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+// Initial static variable from GrXPFactory
+int32_t GrXPFactory::gCurrXPFClassID =
+        GrXPFactory::kIllegalXPFClassID;
diff --git a/gfx/skia/skia/src/gpu/GrProcessorUnitTest.cpp b/gfx/skia/skia/src/gpu/GrProcessorUnitTest.cpp
new file mode 100644
index 000000000000..bdc602c9bfe9
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrProcessorUnitTest.cpp
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrProcessorUnitTest.h"
+#include "GrFragmentProcessor.h"
+
+const GrFragmentProcessor* GrProcessorUnitTest::CreateChildFP(GrProcessorTestData* data) {
+#if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
+    SkAutoTUnref<const GrFragmentProcessor> fp;
+    do {
+        fp.reset(GrProcessorTestFactory<GrFragmentProcessor>::Create(data));
+        SkASSERT(fp);
+    } while (fp->numChildProcessors() != 0);
+    return SkRef(fp.get());
+#else
+    SkFAIL("Should not be called if !SK_ALLOW_STATIC_GLOBAL_INITIALIZERS");
+    return nullptr;
+#endif
+}
diff --git a/gfx/skia/skia/src/gpu/GrProgramDesc.h b/gfx/skia/skia/src/gpu/GrProgramDesc.h
new file mode 100644
index 000000000000..13dd14935d8d
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrProgramDesc.h
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrProgramDesc_DEFINED
+#define GrProgramDesc_DEFINED
+
+#include "GrColor.h"
+#include "GrTypesPriv.h"
+#include "SkChecksum.h"
+
+/** This class describes a program to generate. It also serves as a program cache key. Very little
+    of this is GL-specific. The GL-specific parts could be factored out into a subclass. */
+class GrProgramDesc {
+public:
+    // Creates an uninitialized key that must be populated by GrGpu::buildProgramDesc()
+    GrProgramDesc() {}
+
+    // Returns this as a uint32_t array to be used as a key in the program cache.
+    const uint32_t* asKey() const {
+        return reinterpret_cast<const uint32_t*>(fKey.begin());
+    }
+
+    // Gets the number of bytes in asKey(). It will be a 4-byte aligned value. When comparing two
+    // keys the size of either key can be used with memcmp() since the lengths themselves begin the
+    // keys and thus the memcmp will exit early if the keys are of different lengths.
+    uint32_t keyLength() const { return *this->atOffset<uint32_t, kLengthOffset>(); }
+
+    // Gets the a checksum of the key. Can be used as a hash value for a fast lookup in a cache.
+    uint32_t getChecksum() const { return *this->atOffset<uint32_t, kChecksumOffset>(); }
+
+    GrProgramDesc& operator= (const GrProgramDesc& other) {
+        uint32_t keyLength = other.keyLength();
+        fKey.reset(SkToInt(keyLength));
+        memcpy(fKey.begin(), other.fKey.begin(), keyLength);
+        return *this;
+    }
+
+    bool operator== (const GrProgramDesc& that) const {
+        SkASSERT(SkIsAlign4(this->keyLength()));
+        int l = this->keyLength() >> 2;
+        const uint32_t* aKey = this->asKey();
+        const uint32_t* bKey = that.asKey();
+        for (int i = 0; i < l; ++i) {
+            if (aKey[i] != bKey[i]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    bool operator!= (const GrProgramDesc& other) const {
+        return !(*this == other);
+    }
+
+    static bool Less(const GrProgramDesc& a, const GrProgramDesc& b) {
+        SkASSERT(SkIsAlign4(a.keyLength()));
+        int l = a.keyLength() >> 2;
+        const uint32_t* aKey = a.asKey();
+        const uint32_t* bKey = b.asKey();
+        for (int i = 0; i < l; ++i) {
+            if (aKey[i] != bKey[i]) {
+                return aKey[i] < bKey[i] ? true : false;
+            }
+        }
+        return false;
+    }
+
+    struct KeyHeader {
+        uint8_t                     fFragPosKey;   // set by GrGLShaderBuilder if there are
+                                                   // effects that read the fragment position.
+                                                   // Otherwise, 0.
+        uint8_t                     fSnapVerticesToPixelCenters;
+        int8_t                      fColorEffectCnt;
+        int8_t                      fCoverageEffectCnt;
+        uint8_t                     fIgnoresCoverage;
+    };
+    GR_STATIC_ASSERT(sizeof(KeyHeader) == 5);
+
+    int numColorEffects() const {
+        return this->header().fColorEffectCnt;
+    }
+
+    int numCoverageEffects() const {
+        return this->header().fCoverageEffectCnt;
+    }
+
+    int numTotalEffects() const { return this->numColorEffects() + this->numCoverageEffects(); }
+
+    // This should really only be used internally, base classes should return their own headers
+    const KeyHeader& header() const { return *this->atOffset<KeyHeader, kHeaderOffset>(); }
+
+protected:
+    template<typename T, size_t OFFSET> T* atOffset() {
+        return reinterpret_cast<T*>(reinterpret_cast<intptr_t>(fKey.begin()) + OFFSET);
+    }
+
+    template<typename T, size_t OFFSET> const T* atOffset() const {
+        return reinterpret_cast<const T*>(reinterpret_cast<intptr_t>(fKey.begin()) + OFFSET);
+    }
+
+    void finalize() {
+        int keyLength = fKey.count();
+        SkASSERT(0 == (keyLength % 4));
+        *(this->atOffset<uint32_t, GrProgramDesc::kLengthOffset>()) = SkToU32(keyLength);
+
+        uint32_t* checksum = this->atOffset<uint32_t, GrProgramDesc::kChecksumOffset>();
+        *checksum = 0;  // We'll hash through these bytes, so make sure they're initialized.
+        *checksum = SkChecksum::Murmur3(fKey.begin(), keyLength);
+    }
+
+    // The key, stored in fKey, is composed of four parts:
+    // 1. uint32_t for total key length.
+    // 2. uint32_t for a checksum.
+    // 3. Header struct defined above.  Also room for extensions to the header
+    // 4. A Backend specific payload.  Room is preallocated for this
+    enum KeyOffsets {
+        // Part 1.
+        kLengthOffset = 0,
+        // Part 2.
+        kChecksumOffset = kLengthOffset + sizeof(uint32_t),
+        // Part 3.
+        kHeaderOffset = kChecksumOffset + sizeof(uint32_t),
+        kHeaderSize = SkAlign4(2 * sizeof(KeyHeader)),
+    };
+
+    enum {
+        kMaxPreallocProcessors = 8,
+        kIntsPerProcessor      = 4,    // This is an overestimate of the average effect key size.
+        kPreAllocSize = kHeaderOffset + kHeaderSize +
+                        kMaxPreallocProcessors * sizeof(uint32_t) * kIntsPerProcessor,
+    };
+
+    SkSTArray<kPreAllocSize, uint8_t, true>& key() { return fKey; }
+    const SkSTArray<kPreAllocSize, uint8_t, true>& key() const { return fKey; }
+
+private:
+    SkSTArray<kPreAllocSize, uint8_t, true> fKey;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrProgramElement.cpp b/gfx/skia/skia/src/gpu/GrProgramElement.cpp
new file mode 100644
index 000000000000..6611234e8a99
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrProgramElement.cpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrProgramElement.h"
+#include "GrGpuResourceRef.h"
+
+uint32_t GrProgramElement::CreateUniqueID() {
+    static int32_t gUniqueID = SK_InvalidUniqueID;
+    uint32_t id;
+    do {
+        id = static_cast<uint32_t>(sk_atomic_inc(&gUniqueID) + 1);
+    } while (id == SK_InvalidUniqueID);
+    return id;
+}
+
+void GrProgramElement::addPendingIOs() const {
+    for (int i = 0; i < fGpuResources.count(); ++i) {
+        fGpuResources[i]->markPendingIO();
+    }
+}
+
+void GrProgramElement::removeRefs() const {
+    for (int i = 0; i < fGpuResources.count(); ++i) {
+        fGpuResources[i]->removeRef();
+    }
+}
+
+void GrProgramElement::pendingIOComplete() const {
+    for (int i = 0; i < fGpuResources.count(); ++i) {
+        fGpuResources[i]->pendingIOComplete();
+    }
+}
+
diff --git a/gfx/skia/skia/src/gpu/GrQuad.h b/gfx/skia/skia/src/gpu/GrQuad.h
new file mode 100644
index 000000000000..9a8d1f3a4a37
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrQuad.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrQuad_DEFINED
+#define GrQuad_DEFINED
+
+#include "SkPoint.h"
+#include "SkMatrix.h"
+
+/**
+ * GrQuad is a collection of 4 points which can be used to represent an arbitrary quadrilateral
+ */
+class GrQuad {
+public:
+    GrQuad() {}
+
+    GrQuad(const GrQuad& that) {
+        *this = that;
+    }
+
+    explicit GrQuad(const SkRect& rect) {
+        this->set(rect);
+    }
+
+    void set(const SkRect& rect) {
+        fPoints->setRectFan(rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
+    }
+
+    void map(const SkMatrix& matrix) {
+        matrix.mapPoints(fPoints, kNumPoints);
+    }
+
+    void setFromMappedRect(const SkRect& rect, const SkMatrix& matrix) {
+        this->set(rect);
+        matrix.mapPoints(fPoints, kNumPoints);
+    }
+
+    const GrQuad& operator=(const GrQuad& that) {
+        memcpy(fPoints, that.fPoints, sizeof(SkPoint) * kNumPoints);
+        return *this;
+    }
+
+    SkPoint* points() {
+        return fPoints;
+    }
+
+    const SkPoint* points() const {
+        return fPoints;
+    }
+
+    const SkPoint& point(int i) const {
+        SkASSERT(i < kNumPoints);
+        return fPoints[i];
+    }
+
+private:
+    static const int kNumPoints = 4;
+    SkPoint fPoints[kNumPoints];
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrRecordReplaceDraw.cpp b/gfx/skia/skia/src/gpu/GrRecordReplaceDraw.cpp
new file mode 100644
index 000000000000..28f27dfc1c78
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrRecordReplaceDraw.cpp
@@ -0,0 +1,230 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrContext.h"
+#include "GrLayerCache.h"
+#include "GrRecordReplaceDraw.h"
+#include "SkBigPicture.h"
+#include "SkCanvasPriv.h"
+#include "SkGrPixelRef.h"
+#include "SkImage.h"
+#include "SkRecordDraw.h"
+#include "SkRecords.h"
+
+static inline void wrap_texture(GrTexture* texture, int width, int height, SkBitmap* result) {
+    SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
+    result->setInfo(info);
+    result->setPixelRef(new SkGrPixelRef(info, texture))->unref();
+}
+
+static inline void draw_replacement_bitmap(GrCachedLayer* layer, SkCanvas* canvas) {
+
+    // Some image filter can totally filter away a layer (e.g., SkPictureImageFilter's with
+    // no picture).
+    if (!layer->texture()) {
+        return;
+    }
+
+    SkBitmap bm;
+    wrap_texture(layer->texture(),
+                 !layer->isAtlased() ? layer->rect().width()  : layer->texture()->width(),
+                 !layer->isAtlased() ? layer->rect().height() : layer->texture()->height(),
+                 &bm);
+
+    canvas->save();
+    canvas->setMatrix(SkMatrix::I());
+    if (layer->isAtlased()) {
+        const SkRect src = SkRect::Make(layer->rect());
+        const SkRect dst = SkRect::Make(layer->srcIR());
+
+        SkASSERT(layer->offset().isZero());
+
+        canvas->drawBitmapRect(bm, src, dst, layer->paint(), SkCanvas::kStrict_SrcRectConstraint);
+    } else {
+        canvas->drawBitmap(bm,
+                           SkIntToScalar(layer->srcIR().fLeft + layer->offset().fX),
+                           SkIntToScalar(layer->srcIR().fTop + layer->offset().fY),
+                           layer->paint());
+    }
+    canvas->restore();
+}
+
+// Used by GrRecordReplaceDraw. It intercepts nested drawPicture calls and
+// also draws them with replaced layers.
+class ReplaceDraw : public SkRecords::Draw {
+public:
+    ReplaceDraw(SkCanvas* canvas, GrLayerCache* layerCache,
+                SkPicture const* const drawablePicts[], int drawableCount,
+                const SkPicture* topLevelPicture,
+                const SkBigPicture* picture,
+                const SkMatrix& initialMatrix,
+                SkPicture::AbortCallback* callback,
+                const int* opIndices, int numIndices)
+        : INHERITED(canvas, drawablePicts, nullptr, drawableCount)
+        , fCanvas(canvas)
+        , fLayerCache(layerCache)
+        , fTopLevelPicture(topLevelPicture)
+        , fPicture(picture)
+        , fInitialMatrix(initialMatrix)
+        , fCallback(callback)
+        , fIndex(0)
+        , fNumReplaced(0) {
+        fOpIndexStack.append(numIndices, opIndices);
+    }
+
+    int draw() {
+        const SkBBoxHierarchy* bbh = fPicture->bbh();
+        const SkRecord* record = fPicture->record();
+        if (nullptr == record) {
+            return 0;
+        }
+
+        fNumReplaced = 0;
+
+        fOps.rewind();
+
+        if (bbh) {
+            // Draw only ops that affect pixels in the canvas's current clip.
+            // The SkRecord and BBH were recorded in identity space.  This canvas
+            // is not necessarily in that same space.  getClipBounds() returns us
+            // this canvas' clip bounds transformed back into identity space, which
+            // lets us query the BBH.
+            SkRect query = { 0, 0, 0, 0 };
+            (void)fCanvas->getClipBounds(&query);
+
+            bbh->search(query, &fOps);
+
+            for (fIndex = 0; fIndex < fOps.count(); ++fIndex) {
+                if (fCallback && fCallback->abort()) {
+                    return fNumReplaced;
+                }
+
+                record->visit<void>(fOps[fIndex], *this);
+            }
+
+        } else {
+            for (fIndex = 0; fIndex < (int) record->count(); ++fIndex) {
+                if (fCallback && fCallback->abort()) {
+                    return fNumReplaced;
+                }
+
+                record->visit<void>(fIndex, *this);
+            }
+        }
+
+        return fNumReplaced;
+    }
+
+    // Same as Draw for all ops except DrawPicture and SaveLayer.
+    template <typename T> void operator()(const T& r) {
+        this->INHERITED::operator()(r);
+    }
+    void operator()(const SkRecords::DrawPicture& dp) {
+
+        int drawPictureOffset;
+        if (fOps.count()) {
+            drawPictureOffset = fOps[fIndex];
+        } else {
+            drawPictureOffset = fIndex;
+        }
+
+        fOpIndexStack.push(drawPictureOffset);
+
+        SkAutoCanvasMatrixPaint acmp(fCanvas, &dp.matrix, dp.paint, dp.picture->cullRect());
+
+        if (const SkBigPicture* bp = dp.picture->asSkBigPicture()) {
+            // Draw sub-pictures with the same replacement list but a different picture
+            ReplaceDraw draw(fCanvas, fLayerCache,
+                             this->drawablePicts(), this->drawableCount(),
+                             fTopLevelPicture, bp, fInitialMatrix, fCallback,
+                             fOpIndexStack.begin(), fOpIndexStack.count());
+            fNumReplaced += draw.draw();
+        } else {
+            // TODO: can we assume / assert this doesn't happen?
+            dp.picture->playback(fCanvas, fCallback);
+        }
+
+        fOpIndexStack.pop();
+    }
+    void operator()(const SkRecords::SaveLayer& sl) {
+
+        // For a saveLayer command, check if it can be replaced by a drawBitmap
+        // call and, if so, draw it and then update the current op index accordingly.
+        int startOffset;
+        if (fOps.count()) {
+            startOffset = fOps[fIndex];
+        } else {
+            startOffset = fIndex;
+        }
+
+        fOpIndexStack.push(startOffset);
+
+        GrCachedLayer* layer = fLayerCache->findLayer(fTopLevelPicture->uniqueID(),
+                                                      fInitialMatrix,
+                                                      fOpIndexStack.begin(),
+                                                      fOpIndexStack.count());
+
+        if (layer) {
+            fNumReplaced++;
+
+            draw_replacement_bitmap(layer, fCanvas);
+
+            if (fPicture->bbh()) {
+                while (fOps[fIndex] < layer->stop()) {
+                    ++fIndex;
+                }
+                SkASSERT(fOps[fIndex] == layer->stop());
+            } else {
+                fIndex = layer->stop();
+            }
+            fOpIndexStack.pop();
+            return;
+        }
+
+        // This is a fail for layer hoisting
+        this->INHERITED::operator()(sl);
+
+        fOpIndexStack.pop();
+    }
+
+private:
+    SkCanvas*                 fCanvas;
+    GrLayerCache*             fLayerCache;
+    const SkPicture*          fTopLevelPicture;
+    const SkBigPicture*       fPicture;
+    const SkMatrix            fInitialMatrix;
+    SkPicture::AbortCallback* fCallback;
+
+    SkTDArray<int>            fOps;
+    int                       fIndex;
+    int                       fNumReplaced;
+
+    // The op code indices of all the enclosing drawPicture and saveLayer calls
+    SkTDArray<int>            fOpIndexStack;
+
+    typedef Draw INHERITED;
+};
+
+int GrRecordReplaceDraw(const SkPicture* picture,
+                        SkCanvas* canvas,
+                        GrLayerCache* layerCache,
+                        const SkMatrix& initialMatrix,
+                        SkPicture::AbortCallback* callback) {
+    SkAutoCanvasRestore saveRestore(canvas, true /*save now, restore at exit*/);
+
+    if (const SkBigPicture* bp = picture->asSkBigPicture()) {
+        // TODO: drawablePicts?
+        ReplaceDraw draw(canvas, layerCache, nullptr, 0,
+                         bp, bp,
+                         initialMatrix, callback, nullptr, 0);
+        return draw.draw();
+    } else {
+        // TODO: can we assume / assert this doesn't happen?
+        picture->playback(canvas, callback);
+        return 0;
+    }
+}
diff --git a/gfx/skia/skia/src/gpu/GrRecordReplaceDraw.h b/gfx/skia/skia/src/gpu/GrRecordReplaceDraw.h
new file mode 100644
index 000000000000..0dadcfa0cb1d
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrRecordReplaceDraw.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrRecordReplaceDraw_DEFINED
+#define GrRecordReplaceDraw_DEFINED
+
+#include "SkPicture.h"
+
+class GrLayerCache;
+class SkCanvas;
+class SkMatrix;
+
+// Draw an SkPicture into an SkCanvas replacing saveLayer/restore blocks with
+// drawBitmap calls.  A convenience wrapper around SkRecords::Draw.
+// It returns the number of saveLayer/restore blocks replaced with drawBitmap calls.
+int GrRecordReplaceDraw(const SkPicture*,
+                        SkCanvas*,
+                        GrLayerCache* layerCache,
+                        const SkMatrix& initialMatrix,
+                        SkPicture::AbortCallback*);
+
+#endif // GrRecordReplaceDraw_DEFINED
diff --git a/gfx/skia/skia/src/gpu/GrRectanizer_pow2.cpp b/gfx/skia/skia/src/gpu/GrRectanizer_pow2.cpp
index 2d443cab8c66..7091a57db1c4 100644
--- a/gfx/skia/skia/src/gpu/GrRectanizer_pow2.cpp
+++ b/gfx/skia/skia/src/gpu/GrRectanizer_pow2.cpp
@@ -56,5 +56,5 @@ bool GrRectanizerPow2::addRect(int width, int height, SkIPoint16* loc) {
 
 // factory is now in GrRectanizer_skyline.cpp
 //GrRectanizer* GrRectanizer::Factory(int width, int height) {
-//    return SkNEW_ARGS(GrRectanizerPow2, (width, height));
+//    return new GrRectanizerPow2  (width, height);
 //}
diff --git a/gfx/skia/skia/src/gpu/GrRectanizer_pow2.h b/gfx/skia/skia/src/gpu/GrRectanizer_pow2.h
index 7bf2b868c054..451589db0a97 100644
--- a/gfx/skia/skia/src/gpu/GrRectanizer_pow2.h
+++ b/gfx/skia/skia/src/gpu/GrRectanizer_pow2.h
@@ -24,15 +24,15 @@ public:
 
     virtual ~GrRectanizerPow2() { }
 
-    virtual void reset() SK_OVERRIDE {
+    void reset() override {
         fNextStripY = 0;
         fAreaSoFar = 0;
         sk_bzero(fRows, sizeof(fRows));
     }
 
-    virtual bool addRect(int w, int h, SkIPoint16* loc) SK_OVERRIDE;
+    bool addRect(int w, int h, SkIPoint16* loc) override;
 
-    virtual float percentFull() const SK_OVERRIDE {
+    float percentFull() const override {
         return fAreaSoFar / ((float)this->width() * this->height());
     }
 
diff --git a/gfx/skia/skia/src/gpu/GrRectanizer_skyline.cpp b/gfx/skia/skia/src/gpu/GrRectanizer_skyline.cpp
old mode 100755
new mode 100644
index 44da1c326a12..32fd41086275
--- a/gfx/skia/skia/src/gpu/GrRectanizer_skyline.cpp
+++ b/gfx/skia/skia/src/gpu/GrRectanizer_skyline.cpp
@@ -118,5 +118,5 @@ void GrRectanizerSkyline::addSkylineLevel(int skylineIndex, int x, int y, int wi
 ///////////////////////////////////////////////////////////////////////////////
 
 GrRectanizer* GrRectanizer::Factory(int width, int height) {
-    return SkNEW_ARGS(GrRectanizerSkyline, (width, height));
+    return new GrRectanizerSkyline(width, height);
 }
diff --git a/gfx/skia/skia/src/gpu/GrRectanizer_skyline.h b/gfx/skia/skia/src/gpu/GrRectanizer_skyline.h
index 21043c0b6d18..576b1fc62a51 100644
--- a/gfx/skia/skia/src/gpu/GrRectanizer_skyline.h
+++ b/gfx/skia/skia/src/gpu/GrRectanizer_skyline.h
@@ -19,9 +19,9 @@ public:
         this->reset();
     }
 
-    virtual ~GrRectanizerSkyline() { }
+    ~GrRectanizerSkyline() override { }
 
-    virtual void reset() SK_OVERRIDE{
+    void reset() override {
         fAreaSoFar = 0;
         fSkyline.reset();
         SkylineSegment* seg = fSkyline.append(1);
@@ -30,9 +30,9 @@ public:
         seg->fWidth = this->width();
     }
 
-    virtual bool addRect(int w, int h, SkIPoint16* loc) SK_OVERRIDE;
+    bool addRect(int w, int h, SkIPoint16* loc) override;
 
-    virtual float percentFull() const SK_OVERRIDE {
+    float percentFull() const override {
         return fAreaSoFar / ((float)this->width() * this->height());
     }
 
diff --git a/gfx/skia/skia/src/gpu/GrRedBlackTree.h b/gfx/skia/skia/src/gpu/GrRedBlackTree.h
deleted file mode 100644
index d9b1a049bd8f..000000000000
--- a/gfx/skia/skia/src/gpu/GrRedBlackTree.h
+++ /dev/null
@@ -1,948 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrRedBlackTree_DEFINED
-#define GrRedBlackTree_DEFINED
-
-#include "GrConfig.h"
-#include "SkTypes.h"
-
-template <typename T>
-class GrLess {
-public:
-    bool operator()(const T& a, const T& b) const { return a < b; }
-};
-
-template <typename T>
-class GrLess<T*> {
-public:
-    bool operator()(const T* a, const T* b) const { return *a < *b; }
-};
-
-class GrStrLess {
-public:
-    bool operator()(const char* a, const char* b) const { return strcmp(a,b) < 0; }
-};
-
-/**
- * In debug build this will cause full traversals of the tree when the validate
- * is called on insert and remove. Useful for debugging but very slow.
- */
-#define DEEP_VALIDATE 0
-
-/**
- * A sorted tree that uses the red-black tree algorithm. Allows duplicate
- * entries. Data is of type T and is compared using functor C. A single C object
- * will be created and used for all comparisons.
- */
-template <typename T, typename C = GrLess<T> >
-class GrRedBlackTree : SkNoncopyable {
-public:
-    /**
-     * Creates an empty tree.
-     */
-    GrRedBlackTree();
-    virtual ~GrRedBlackTree();
-
-    /**
-     * Class used to iterater through the tree. The valid range of the tree
-     * is given by [begin(), end()). It is legal to dereference begin() but not
-     * end(). The iterator has preincrement and predecrement operators, it is
-     * legal to decerement end() if the tree is not empty to get the last
-     * element. However, a last() helper is provided.
-     */
-    class Iter;
-
-    /**
-     * Add an element to the tree. Duplicates are allowed.
-     * @param t     the item to add.
-     * @return  an iterator to the item.
-     */
-    Iter insert(const T& t);
-
-    /**
-     * Removes all items in the tree.
-     */
-    void reset();
-
-    /**
-     * @return true if there are no items in the tree, false otherwise.
-     */
-    bool empty() const {return 0 == fCount;}
-
-    /**
-     * @return the number of items in the tree.
-     */
-    int  count() const {return fCount;}
-
-    /**
-     * @return  an iterator to the first item in sorted order, or end() if empty
-     */
-    Iter begin();
-    /**
-     * Gets the last valid iterator. This is always valid, even on an empty.
-     * However, it can never be dereferenced. Useful as a loop terminator.
-     * @return  an iterator that is just beyond the last item in sorted order.
-     */
-    Iter end();
-    /**
-     * @return  an iterator that to the last item in sorted order, or end() if
-     * empty.
-     */
-    Iter last();
-
-    /**
-     * Finds an occurrence of an item.
-     * @param t     the item to find.
-     * @return an iterator to a tree element equal to t or end() if none exists.
-     */
-    Iter find(const T& t);
-    /**
-     * Finds the first of an item in iterator order.
-     * @param t     the item to find.
-     * @return  an iterator to the first element equal to t or end() if
-     *          none exists.
-     */
-    Iter findFirst(const T& t);
-    /**
-     * Finds the last of an item in iterator order.
-     * @param t     the item to find.
-     * @return  an iterator to the last element equal to t or end() if
-     *          none exists.
-     */
-    Iter findLast(const T& t);
-    /**
-     * Gets the number of items in the tree equal to t.
-     * @param t     the item to count.
-     * @return  number of items equal to t in the tree
-     */
-    int countOf(const T& t) const;
-
-    /**
-     * Removes the item indicated by an iterator. The iterator will not be valid
-     * afterwards.
-     *
-     * @param iter      iterator of item to remove. Must be valid (not end()).
-     */
-    void remove(const Iter& iter) { deleteAtNode(iter.fN); }
-
-private:
-    enum Color {
-        kRed_Color,
-        kBlack_Color
-    };
-
-    enum Child {
-        kLeft_Child  = 0,
-        kRight_Child = 1
-    };
-
-    struct Node {
-        T       fItem;
-        Color   fColor;
-
-        Node*   fParent;
-        Node*   fChildren[2];
-    };
-
-    void rotateRight(Node* n);
-    void rotateLeft(Node* n);
-
-    static Node* SuccessorNode(Node* x);
-    static Node* PredecessorNode(Node* x);
-
-    void deleteAtNode(Node* x);
-    static void RecursiveDelete(Node* x);
-
-    int onCountOf(const Node* n, const T& t) const;
-
-#ifdef SK_DEBUG
-    void validate() const;
-    int checkNode(Node* n, int* blackHeight) const;
-    // checks relationship between a node and its children. allowRedRed means
-    // node may be in an intermediate state where a red parent has a red child.
-    bool validateChildRelations(const Node* n, bool allowRedRed) const;
-    // place to stick break point if validateChildRelations is failing.
-    bool validateChildRelationsFailed() const { return false; }
-#else
-    void validate() const {}
-#endif
-
-    int     fCount;
-    Node*   fRoot;
-    Node*   fFirst;
-    Node*   fLast;
-
-    const C fComp;
-};
-
-template <typename T, typename C>
-class GrRedBlackTree<T,C>::Iter {
-public:
-    Iter() {};
-    Iter(const Iter& i) {fN = i.fN; fTree = i.fTree;}
-    Iter& operator =(const Iter& i) {
-        fN = i.fN;
-        fTree = i.fTree;
-        return *this;
-    }
-    // altering the sort value of the item using this method will cause
-    // errors.
-    T& operator *() const { return fN->fItem; }
-    bool operator ==(const Iter& i) const {
-        return fN == i.fN && fTree == i.fTree;
-    }
-    bool operator !=(const Iter& i) const { return !(*this == i); }
-    Iter& operator ++() {
-        SkASSERT(*this != fTree->end());
-        fN = SuccessorNode(fN);
-        return *this;
-    }
-    Iter& operator --() {
-        SkASSERT(*this != fTree->begin());
-        if (NULL != fN) {
-            fN = PredecessorNode(fN);
-        } else {
-            *this = fTree->last();
-        }
-        return *this;
-    }
-
-private:
-    friend class GrRedBlackTree;
-    explicit Iter(Node* n, GrRedBlackTree* tree) {
-        fN = n;
-        fTree = tree;
-    }
-    Node* fN;
-    GrRedBlackTree* fTree;
-};
-
-template <typename T, typename C>
-GrRedBlackTree<T,C>::GrRedBlackTree() : fComp() {
-    fRoot = NULL;
-    fFirst = NULL;
-    fLast = NULL;
-    fCount = 0;
-    validate();
-}
-
-template <typename T, typename C>
-GrRedBlackTree<T,C>::~GrRedBlackTree() {
-    RecursiveDelete(fRoot);
-}
-
-template <typename T, typename C>
-typename GrRedBlackTree<T,C>::Iter GrRedBlackTree<T,C>::begin() {
-    return Iter(fFirst, this);
-}
-
-template <typename T, typename C>
-typename GrRedBlackTree<T,C>::Iter GrRedBlackTree<T,C>::end() {
-    return Iter(NULL, this);
-}
-
-template <typename T, typename C>
-typename GrRedBlackTree<T,C>::Iter GrRedBlackTree<T,C>::last() {
-    return Iter(fLast, this);
-}
-
-template <typename T, typename C>
-typename GrRedBlackTree<T,C>::Iter GrRedBlackTree<T,C>::find(const T& t) {
-    Node* n = fRoot;
-    while (NULL != n) {
-        if (fComp(t, n->fItem)) {
-            n = n->fChildren[kLeft_Child];
-        } else {
-            if (!fComp(n->fItem, t)) {
-                return Iter(n, this);
-            }
-            n = n->fChildren[kRight_Child];
-        }
-    }
-    return end();
-}
-
-template <typename T, typename C>
-typename GrRedBlackTree<T,C>::Iter GrRedBlackTree<T,C>::findFirst(const T& t) {
-    Node* n = fRoot;
-    Node* leftMost = NULL;
-    while (NULL != n) {
-        if (fComp(t, n->fItem)) {
-            n = n->fChildren[kLeft_Child];
-        } else {
-            if (!fComp(n->fItem, t)) {
-                // found one. check if another in left subtree.
-                leftMost = n;
-                n = n->fChildren[kLeft_Child];
-            } else {
-                n = n->fChildren[kRight_Child];
-            }
-        }
-    }
-    return Iter(leftMost, this);
-}
-
-template <typename T, typename C>
-typename GrRedBlackTree<T,C>::Iter GrRedBlackTree<T,C>::findLast(const T& t) {
-    Node* n = fRoot;
-    Node* rightMost = NULL;
-    while (NULL != n) {
-        if (fComp(t, n->fItem)) {
-            n = n->fChildren[kLeft_Child];
-        } else {
-            if (!fComp(n->fItem, t)) {
-                // found one. check if another in right subtree.
-                rightMost = n;
-            }
-            n = n->fChildren[kRight_Child];
-        }
-    }
-    return Iter(rightMost, this);
-}
-
-template <typename T, typename C>
-int GrRedBlackTree<T,C>::countOf(const T& t) const {
-    return onCountOf(fRoot, t);
-}
-
-template <typename T, typename C>
-int GrRedBlackTree<T,C>::onCountOf(const Node* n, const T& t) const {
-    // this is count*log(n) :(
-    while (NULL != n) {
-        if (fComp(t, n->fItem)) {
-            n = n->fChildren[kLeft_Child];
-        } else {
-            if (!fComp(n->fItem, t)) {
-                int count = 1;
-                count += onCountOf(n->fChildren[kLeft_Child], t);
-                count += onCountOf(n->fChildren[kRight_Child], t);
-                return count;
-            }
-            n = n->fChildren[kRight_Child];
-        }
-    }
-    return 0;
-
-}
-
-template <typename T, typename C>
-void GrRedBlackTree<T,C>::reset() {
-    RecursiveDelete(fRoot);
-    fRoot = NULL;
-    fFirst = NULL;
-    fLast = NULL;
-    fCount = 0;
-}
-
-template <typename T, typename C>
-typename GrRedBlackTree<T,C>::Iter GrRedBlackTree<T,C>::insert(const T& t) {
-    validate();
-
-    ++fCount;
-
-    Node* x = SkNEW(Node);
-    x->fChildren[kLeft_Child] = NULL;
-    x->fChildren[kRight_Child] = NULL;
-    x->fItem = t;
-
-    Node* returnNode = x;
-
-    Node* gp = NULL;
-    Node* p = NULL;
-    Node* n = fRoot;
-    Child pc = kLeft_Child; // suppress uninit warning
-    Child gpc = kLeft_Child;
-
-    bool first = true;
-    bool last = true;
-    while (NULL != n) {
-        gpc = pc;
-        pc = fComp(x->fItem, n->fItem) ? kLeft_Child : kRight_Child;
-        first = first && kLeft_Child == pc;
-        last = last && kRight_Child == pc;
-        gp = p;
-        p = n;
-        n = p->fChildren[pc];
-    }
-    if (last) {
-        fLast = x;
-    }
-    if (first) {
-        fFirst = x;
-    }
-
-    if (NULL == p) {
-        fRoot = x;
-        x->fColor = kBlack_Color;
-        x->fParent = NULL;
-        SkASSERT(1 == fCount);
-        return Iter(returnNode, this);
-    }
-    p->fChildren[pc] = x;
-    x->fColor = kRed_Color;
-    x->fParent = p;
-
-    do {
-        // assumptions at loop start.
-        SkASSERT(NULL != x);
-        SkASSERT(kRed_Color == x->fColor);
-        // can't have a grandparent but no parent.
-        SkASSERT(!(NULL != gp && NULL == p));
-        // make sure pc and gpc are correct
-        SkASSERT(NULL == p  || p->fChildren[pc] == x);
-        SkASSERT(NULL == gp || gp->fChildren[gpc] == p);
-
-        // if x's parent is black then we didn't violate any of the
-        // red/black properties when we added x as red.
-        if (kBlack_Color == p->fColor) {
-            return Iter(returnNode, this);
-        }
-        // gp must be valid because if p was the root then it is black
-        SkASSERT(NULL != gp);
-        // gp must be black since it's child, p, is red.
-        SkASSERT(kBlack_Color == gp->fColor);
-
-
-        // x and its parent are red, violating red-black property.
-        Node* u = gp->fChildren[1-gpc];
-        // if x's uncle (p's sibling) is also red then we can flip
-        // p and u to black and make gp red. But then we have to recurse
-        // up to gp since it's parent may also be red.
-        if (NULL != u && kRed_Color == u->fColor) {
-            p->fColor = kBlack_Color;
-            u->fColor = kBlack_Color;
-            gp->fColor = kRed_Color;
-            x = gp;
-            p = x->fParent;
-            if (NULL == p) {
-                // x (prev gp) is the root, color it black and be done.
-                SkASSERT(fRoot == x);
-                x->fColor = kBlack_Color;
-                validate();
-                return Iter(returnNode, this);
-            }
-            gp = p->fParent;
-            pc = (p->fChildren[kLeft_Child] == x) ? kLeft_Child :
-                                                    kRight_Child;
-            if (NULL != gp) {
-                gpc = (gp->fChildren[kLeft_Child] == p) ? kLeft_Child :
-                                                          kRight_Child;
-            }
-            continue;
-        } break;
-    } while (true);
-    // Here p is red but u is black and we still have to resolve the fact
-    // that x and p are both red.
-    SkASSERT(NULL == gp->fChildren[1-gpc] || kBlack_Color == gp->fChildren[1-gpc]->fColor);
-    SkASSERT(kRed_Color == x->fColor);
-    SkASSERT(kRed_Color == p->fColor);
-    SkASSERT(kBlack_Color == gp->fColor);
-
-    // make x be on the same side of p as p is of gp. If it isn't already
-    // the case then rotate x up to p and swap their labels.
-    if (pc != gpc) {
-        if (kRight_Child == pc) {
-            rotateLeft(p);
-            Node* temp = p;
-            p = x;
-            x = temp;
-            pc = kLeft_Child;
-        } else {
-            rotateRight(p);
-            Node* temp = p;
-            p = x;
-            x = temp;
-            pc = kRight_Child;
-        }
-    }
-    // we now rotate gp down, pulling up p to be it's new parent.
-    // gp's child, u, that is not affected we know to be black. gp's new
-    // child is p's previous child (x's pre-rotation sibling) which must be
-    // black since p is red.
-    SkASSERT(NULL == p->fChildren[1-pc] ||
-             kBlack_Color == p->fChildren[1-pc]->fColor);
-    // Since gp's two children are black it can become red if p is made
-    // black. This leaves the black-height of both of p's new subtrees
-    // preserved and removes the red/red parent child relationship.
-    p->fColor = kBlack_Color;
-    gp->fColor = kRed_Color;
-    if (kLeft_Child == pc) {
-        rotateRight(gp);
-    } else {
-        rotateLeft(gp);
-    }
-    validate();
-    return Iter(returnNode, this);
-}
-
-
-template <typename T, typename C>
-void GrRedBlackTree<T,C>::rotateRight(Node* n) {
-    /*            d?              d?
-     *           /               /
-     *          n               s
-     *         / \     --->    / \
-     *        s   a?          c?  n
-     *       / \                 / \
-     *      c?  b?              b?  a?
-     */
-    Node* d = n->fParent;
-    Node* s = n->fChildren[kLeft_Child];
-    SkASSERT(NULL != s);
-    Node* b = s->fChildren[kRight_Child];
-
-    if (NULL != d) {
-        Child c = d->fChildren[kLeft_Child] == n ? kLeft_Child :
-                                             kRight_Child;
-        d->fChildren[c] = s;
-    } else {
-        SkASSERT(fRoot == n);
-        fRoot = s;
-    }
-    s->fParent = d;
-    s->fChildren[kRight_Child] = n;
-    n->fParent = s;
-    n->fChildren[kLeft_Child] = b;
-    if (NULL != b) {
-        b->fParent = n;
-    }
-
-    GR_DEBUGASSERT(validateChildRelations(d, true));
-    GR_DEBUGASSERT(validateChildRelations(s, true));
-    GR_DEBUGASSERT(validateChildRelations(n, false));
-    GR_DEBUGASSERT(validateChildRelations(n->fChildren[kRight_Child], true));
-    GR_DEBUGASSERT(validateChildRelations(b, true));
-    GR_DEBUGASSERT(validateChildRelations(s->fChildren[kLeft_Child], true));
-}
-
-template <typename T, typename C>
-void GrRedBlackTree<T,C>::rotateLeft(Node* n) {
-
-    Node* d = n->fParent;
-    Node* s = n->fChildren[kRight_Child];
-    SkASSERT(NULL != s);
-    Node* b = s->fChildren[kLeft_Child];
-
-    if (NULL != d) {
-        Child c = d->fChildren[kRight_Child] == n ? kRight_Child :
-                                                   kLeft_Child;
-        d->fChildren[c] = s;
-    } else {
-        SkASSERT(fRoot == n);
-        fRoot = s;
-    }
-    s->fParent = d;
-    s->fChildren[kLeft_Child] = n;
-    n->fParent = s;
-    n->fChildren[kRight_Child] = b;
-    if (NULL != b) {
-        b->fParent = n;
-    }
-
-    GR_DEBUGASSERT(validateChildRelations(d, true));
-    GR_DEBUGASSERT(validateChildRelations(s, true));
-    GR_DEBUGASSERT(validateChildRelations(n, true));
-    GR_DEBUGASSERT(validateChildRelations(n->fChildren[kLeft_Child], true));
-    GR_DEBUGASSERT(validateChildRelations(b, true));
-    GR_DEBUGASSERT(validateChildRelations(s->fChildren[kRight_Child], true));
-}
-
-template <typename T, typename C>
-typename GrRedBlackTree<T,C>::Node* GrRedBlackTree<T,C>::SuccessorNode(Node* x) {
-    SkASSERT(NULL != x);
-    if (NULL != x->fChildren[kRight_Child]) {
-        x = x->fChildren[kRight_Child];
-        while (NULL != x->fChildren[kLeft_Child]) {
-            x = x->fChildren[kLeft_Child];
-        }
-        return x;
-    }
-    while (NULL != x->fParent && x == x->fParent->fChildren[kRight_Child]) {
-        x = x->fParent;
-    }
-    return x->fParent;
-}
-
-template <typename T, typename C>
-typename GrRedBlackTree<T,C>::Node* GrRedBlackTree<T,C>::PredecessorNode(Node* x) {
-    SkASSERT(NULL != x);
-    if (NULL != x->fChildren[kLeft_Child]) {
-        x = x->fChildren[kLeft_Child];
-        while (NULL != x->fChildren[kRight_Child]) {
-            x = x->fChildren[kRight_Child];
-        }
-        return x;
-    }
-    while (NULL != x->fParent && x == x->fParent->fChildren[kLeft_Child]) {
-        x = x->fParent;
-    }
-    return x->fParent;
-}
-
-template <typename T, typename C>
-void GrRedBlackTree<T,C>::deleteAtNode(Node* x) {
-    SkASSERT(NULL != x);
-    validate();
-    --fCount;
-
-    bool hasLeft =  NULL != x->fChildren[kLeft_Child];
-    bool hasRight = NULL != x->fChildren[kRight_Child];
-    Child c = hasLeft ? kLeft_Child : kRight_Child;
-
-    if (hasLeft && hasRight) {
-        // first and last can't have two children.
-        SkASSERT(fFirst != x);
-        SkASSERT(fLast != x);
-        // if x is an interior node then we find it's successor
-        // and swap them.
-        Node* s = x->fChildren[kRight_Child];
-        while (NULL != s->fChildren[kLeft_Child]) {
-            s = s->fChildren[kLeft_Child];
-        }
-        SkASSERT(NULL != s);
-        // this might be expensive relative to swapping node ptrs around.
-        // depends on T.
-        x->fItem = s->fItem;
-        x = s;
-        c = kRight_Child;
-    } else if (NULL == x->fParent) {
-        // if x was the root we just replace it with its child and make
-        // the new root (if the tree is not empty) black.
-        SkASSERT(fRoot == x);
-        fRoot = x->fChildren[c];
-        if (NULL != fRoot) {
-            fRoot->fParent = NULL;
-            fRoot->fColor = kBlack_Color;
-            if (x == fLast) {
-                SkASSERT(c == kLeft_Child);
-                fLast = fRoot;
-            } else if (x == fFirst) {
-                SkASSERT(c == kRight_Child);
-                fFirst = fRoot;
-            }
-        } else {
-            SkASSERT(fFirst == fLast && x == fFirst);
-            fFirst = NULL;
-            fLast = NULL;
-            SkASSERT(0 == fCount);
-        }
-        delete x;
-        validate();
-        return;
-    }
-
-    Child pc;
-    Node* p = x->fParent;
-    pc = p->fChildren[kLeft_Child] == x ? kLeft_Child : kRight_Child;
-
-    if (NULL == x->fChildren[c]) {
-        if (fLast == x) {
-            fLast = p;
-            SkASSERT(p == PredecessorNode(x));
-        } else if (fFirst == x) {
-            fFirst = p;
-            SkASSERT(p == SuccessorNode(x));
-        }
-        // x has two implicit black children.
-        Color xcolor = x->fColor;
-        p->fChildren[pc] = NULL;
-        delete x;
-        x = NULL;
-        // when x is red it can be with an implicit black leaf without
-        // violating any of the red-black tree properties.
-        if (kRed_Color == xcolor) {
-            validate();
-            return;
-        }
-        // s is p's other child (x's sibling)
-        Node* s = p->fChildren[1-pc];
-
-        //s cannot be an implicit black node because the original
-        // black-height at x was >= 2 and s's black-height must equal the
-        // initial black height of x.
-        SkASSERT(NULL != s);
-        SkASSERT(p == s->fParent);
-
-        // assigned in loop
-        Node* sl;
-        Node* sr;
-        bool slRed;
-        bool srRed;
-
-        do {
-            // When we start this loop x may already be deleted it is/was
-            // p's child on its pc side. x's children are/were black. The
-            // first time through the loop they are implict children.
-            // On later passes we will be walking up the tree and they will
-            // be real nodes.
-            // The x side of p has a black-height that is one less than the
-            // s side. It must be rebalanced.
-            SkASSERT(NULL != s);
-            SkASSERT(p == s->fParent);
-            SkASSERT(NULL == x || x->fParent == p);
-
-            //sl and sr are s's children, which may be implicit.
-            sl = s->fChildren[kLeft_Child];
-            sr = s->fChildren[kRight_Child];
-
-            // if the s is red we will rotate s and p, swap their colors so
-            // that x's new sibling is black
-            if (kRed_Color == s->fColor) {
-                // if s is red then it's parent must be black.
-                SkASSERT(kBlack_Color == p->fColor);
-                // s's children must also be black since s is red. They can't
-                // be implicit since s is red and it's black-height is >= 2.
-                SkASSERT(NULL != sl && kBlack_Color == sl->fColor);
-                SkASSERT(NULL != sr && kBlack_Color == sr->fColor);
-                p->fColor = kRed_Color;
-                s->fColor = kBlack_Color;
-                if (kLeft_Child == pc) {
-                    rotateLeft(p);
-                    s = sl;
-                } else {
-                    rotateRight(p);
-                    s = sr;
-                }
-                sl = s->fChildren[kLeft_Child];
-                sr = s->fChildren[kRight_Child];
-            }
-            // x and s are now both black.
-            SkASSERT(kBlack_Color == s->fColor);
-            SkASSERT(NULL == x || kBlack_Color == x->fColor);
-            SkASSERT(p == s->fParent);
-            SkASSERT(NULL == x || p == x->fParent);
-
-            // when x is deleted its subtree will have reduced black-height.
-            slRed = (NULL != sl && kRed_Color == sl->fColor);
-            srRed = (NULL != sr && kRed_Color == sr->fColor);
-            if (!slRed && !srRed) {
-                // if s can be made red that will balance out x's removal
-                // to make both subtrees of p have the same black-height.
-                if (kBlack_Color == p->fColor) {
-                    s->fColor = kRed_Color;
-                    // now subtree at p has black-height of one less than
-                    // p's parent's other child's subtree. We move x up to
-                    // p and go through the loop again. At the top of loop
-                    // we assumed x and x's children are black, which holds
-                    // by above ifs.
-                    // if p is the root there is no other subtree to balance
-                    // against.
-                    x = p;
-                    p = x->fParent;
-                    if (NULL == p) {
-                        SkASSERT(fRoot == x);
-                        validate();
-                        return;
-                    } else {
-                        pc = p->fChildren[kLeft_Child] == x ? kLeft_Child :
-                                                              kRight_Child;
-
-                    }
-                    s = p->fChildren[1-pc];
-                    SkASSERT(NULL != s);
-                    SkASSERT(p == s->fParent);
-                    continue;
-                } else if (kRed_Color == p->fColor) {
-                    // we can make p black and s red. This balance out p's
-                    // two subtrees and keep the same black-height as it was
-                    // before the delete.
-                    s->fColor = kRed_Color;
-                    p->fColor = kBlack_Color;
-                    validate();
-                    return;
-                }
-            }
-            break;
-        } while (true);
-        // if we made it here one or both of sl and sr is red.
-        // s and x are black. We make sure that a red child is on
-        // the same side of s as s is of p.
-        SkASSERT(slRed || srRed);
-        if (kLeft_Child == pc && !srRed) {
-            s->fColor = kRed_Color;
-            sl->fColor = kBlack_Color;
-            rotateRight(s);
-            sr = s;
-            s = sl;
-            //sl = s->fChildren[kLeft_Child]; don't need this
-        } else if (kRight_Child == pc && !slRed) {
-            s->fColor = kRed_Color;
-            sr->fColor = kBlack_Color;
-            rotateLeft(s);
-            sl = s;
-            s = sr;
-            //sr = s->fChildren[kRight_Child]; don't need this
-        }
-        // now p is either red or black, x and s are red and s's 1-pc
-        // child is red.
-        // We rotate p towards x, pulling s up to replace p. We make
-        // p be black and s takes p's old color.
-        // Whether p was red or black, we've increased its pc subtree
-        // rooted at x by 1 (balancing the imbalance at the start) and
-        // we've also its subtree rooted at s's black-height by 1. This
-        // can be balanced by making s's red child be black.
-        s->fColor = p->fColor;
-        p->fColor = kBlack_Color;
-        if (kLeft_Child == pc) {
-            SkASSERT(NULL != sr && kRed_Color == sr->fColor);
-            sr->fColor = kBlack_Color;
-            rotateLeft(p);
-        } else {
-            SkASSERT(NULL != sl && kRed_Color == sl->fColor);
-            sl->fColor = kBlack_Color;
-            rotateRight(p);
-        }
-    }
-    else {
-        // x has exactly one implicit black child. x cannot be red.
-        // Proof by contradiction: Assume X is red. Let c0 be x's implicit
-        // child and c1 be its non-implicit child. c1 must be black because
-        // red nodes always have two black children. Then the two subtrees
-        // of x rooted at c0 and c1 will have different black-heights.
-        SkASSERT(kBlack_Color == x->fColor);
-        // So we know x is black and has one implicit black child, c0. c1
-        // must be red, otherwise the subtree at c1 will have a different
-        // black-height than the subtree rooted at c0.
-        SkASSERT(kRed_Color == x->fChildren[c]->fColor);
-        // replace x with c1, making c1 black, preserves all red-black tree
-        // props.
-        Node* c1 = x->fChildren[c];
-        if (x == fFirst) {
-            SkASSERT(c == kRight_Child);
-            fFirst = c1;
-            while (NULL != fFirst->fChildren[kLeft_Child]) {
-                fFirst = fFirst->fChildren[kLeft_Child];
-            }
-            SkASSERT(fFirst == SuccessorNode(x));
-        } else if (x == fLast) {
-            SkASSERT(c == kLeft_Child);
-            fLast = c1;
-            while (NULL != fLast->fChildren[kRight_Child]) {
-                fLast = fLast->fChildren[kRight_Child];
-            }
-            SkASSERT(fLast == PredecessorNode(x));
-        }
-        c1->fParent = p;
-        p->fChildren[pc] = c1;
-        c1->fColor = kBlack_Color;
-        delete x;
-        validate();
-    }
-    validate();
-}
-
-template <typename T, typename C>
-void GrRedBlackTree<T,C>::RecursiveDelete(Node* x) {
-    if (NULL != x) {
-        RecursiveDelete(x->fChildren[kLeft_Child]);
-        RecursiveDelete(x->fChildren[kRight_Child]);
-        delete x;
-    }
-}
-
-#ifdef SK_DEBUG
-template <typename T, typename C>
-void GrRedBlackTree<T,C>::validate() const {
-    if (fCount) {
-        SkASSERT(NULL == fRoot->fParent);
-        SkASSERT(NULL != fFirst);
-        SkASSERT(NULL != fLast);
-
-        SkASSERT(kBlack_Color == fRoot->fColor);
-        if (1 == fCount) {
-            SkASSERT(fFirst == fRoot);
-            SkASSERT(fLast == fRoot);
-            SkASSERT(0 == fRoot->fChildren[kLeft_Child]);
-            SkASSERT(0 == fRoot->fChildren[kRight_Child]);
-        }
-    } else {
-        SkASSERT(NULL == fRoot);
-        SkASSERT(NULL == fFirst);
-        SkASSERT(NULL == fLast);
-    }
-#if DEEP_VALIDATE
-    int bh;
-    int count = checkNode(fRoot, &bh);
-    SkASSERT(count == fCount);
-#endif
-}
-
-template <typename T, typename C>
-int GrRedBlackTree<T,C>::checkNode(Node* n, int* bh) const {
-    if (NULL != n) {
-        SkASSERT(validateChildRelations(n, false));
-        if (kBlack_Color == n->fColor) {
-            *bh += 1;
-        }
-        SkASSERT(!fComp(n->fItem, fFirst->fItem));
-        SkASSERT(!fComp(fLast->fItem, n->fItem));
-        int leftBh = *bh;
-        int rightBh = *bh;
-        int cl = checkNode(n->fChildren[kLeft_Child], &leftBh);
-        int cr = checkNode(n->fChildren[kRight_Child], &rightBh);
-        SkASSERT(leftBh == rightBh);
-        *bh = leftBh;
-        return 1 + cl + cr;
-    }
-    return 0;
-}
-
-template <typename T, typename C>
-bool GrRedBlackTree<T,C>::validateChildRelations(const Node* n,
-                                                 bool allowRedRed) const {
-    if (NULL != n) {
-        if (NULL != n->fChildren[kLeft_Child] ||
-            NULL != n->fChildren[kRight_Child]) {
-            if (n->fChildren[kLeft_Child] == n->fChildren[kRight_Child]) {
-                return validateChildRelationsFailed();
-            }
-            if (n->fChildren[kLeft_Child] == n->fParent &&
-                NULL != n->fParent) {
-                return validateChildRelationsFailed();
-            }
-            if (n->fChildren[kRight_Child] == n->fParent &&
-                NULL != n->fParent) {
-                return validateChildRelationsFailed();
-            }
-            if (NULL != n->fChildren[kLeft_Child]) {
-                if (!allowRedRed &&
-                    kRed_Color == n->fChildren[kLeft_Child]->fColor &&
-                    kRed_Color == n->fColor) {
-                    return validateChildRelationsFailed();
-                }
-                if (n->fChildren[kLeft_Child]->fParent != n) {
-                    return validateChildRelationsFailed();
-                }
-                if (!(fComp(n->fChildren[kLeft_Child]->fItem, n->fItem) ||
-                      (!fComp(n->fChildren[kLeft_Child]->fItem, n->fItem) &&
-                       !fComp(n->fItem, n->fChildren[kLeft_Child]->fItem)))) {
-                    return validateChildRelationsFailed();
-                }
-            }
-            if (NULL != n->fChildren[kRight_Child]) {
-                if (!allowRedRed &&
-                    kRed_Color == n->fChildren[kRight_Child]->fColor &&
-                    kRed_Color == n->fColor) {
-                    return validateChildRelationsFailed();
-                }
-                if (n->fChildren[kRight_Child]->fParent != n) {
-                    return validateChildRelationsFailed();
-                }
-                if (!(fComp(n->fItem, n->fChildren[kRight_Child]->fItem) ||
-                      (!fComp(n->fChildren[kRight_Child]->fItem, n->fItem) &&
-                       !fComp(n->fItem, n->fChildren[kRight_Child]->fItem)))) {
-                    return validateChildRelationsFailed();
-                }
-            }
-        }
-    }
-    return true;
-}
-#endif
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/GrReducedClip.cpp b/gfx/skia/skia/src/gpu/GrReducedClip.cpp
index 6ad9cc6d8b84..cbfd89600293 100644
--- a/gfx/skia/skia/src/gpu/GrReducedClip.cpp
+++ b/gfx/skia/skia/src/gpu/GrReducedClip.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2012 Google Inc.
  *
@@ -9,151 +8,21 @@
 #include "GrReducedClip.h"
 
 typedef SkClipStack::Element Element;
-////////////////////////////////////////////////////////////////////////////////
 
-namespace GrReducedClip {
-
-// helper function
-void reduced_stack_walker(const SkClipStack& stack,
-                          const SkRect& queryBounds,
-                          ElementList* result,
-                          int32_t* resultGenID,
-                          InitialState* initialState,
-                          bool* requiresAA);
-
-/*
-There are plenty of optimizations that could be added here. Maybe flips could be folded into
-earlier operations. Or would inserting flips and reversing earlier ops ever be a win? Perhaps
-for the case where the bounds are kInsideOut_BoundsType. We could restrict earlier operations
-based on later intersect operations, and perhaps remove intersect-rects. We could optionally
-take a rect in case the caller knows a bound on what is to be drawn through this clip.
-*/
-void ReduceClipStack(const SkClipStack& stack,
-                     const SkIRect& queryBounds,
-                     ElementList* result,
-                     int32_t* resultGenID,
-                     InitialState* initialState,
-                     SkIRect* tighterBounds,
-                     bool* requiresAA) {
-    result->reset();
-
-    // The clip established by the element list might be cached based on the last
-    // generation id. When we make early returns, we do not know what was the generation
-    // id that lead to the state. Make a conservative guess.
-    *resultGenID = stack.getTopmostGenID();
-
-    if (stack.isWideOpen()) {
-        *initialState = kAllIn_InitialState;
-        return;
-    }
-
-
-    // We initially look at whether the bounds alone is sufficient. We also use the stack bounds to
-    // attempt to compute the tighterBounds.
-
-    SkClipStack::BoundsType stackBoundsType;
-    SkRect stackBounds;
-    bool iior;
-    stack.getBounds(&stackBounds, &stackBoundsType, &iior);
-
-    const SkIRect* bounds = &queryBounds;
-
-    SkRect scalarQueryBounds = SkRect::Make(queryBounds);
-
-    if (iior) {
-        SkASSERT(SkClipStack::kNormal_BoundsType == stackBoundsType);
-        SkRect isectRect;
-        if (stackBounds.contains(scalarQueryBounds)) {
-            *initialState = kAllIn_InitialState;
-            if (NULL != tighterBounds) {
-                *tighterBounds = queryBounds;
-            }
-            if (NULL != requiresAA) {
-               *requiresAA = false;
-            }
-        } else if (isectRect.intersect(stackBounds, scalarQueryBounds)) {
-            // If the caller asked for tighter integer bounds we may be able to
-            // return kAllIn and give the bounds with no elements
-            if (NULL != tighterBounds) {
-                isectRect.roundOut(tighterBounds);
-                SkRect scalarTighterBounds = SkRect::Make(*tighterBounds);
-                if (scalarTighterBounds == isectRect) {
-                    // the round-out didn't add any area outside the clip rect.
-                    if (NULL != requiresAA) {
-                        *requiresAA = false;
-                    }
-                    *initialState = kAllIn_InitialState;
-                    return;
-                }
-            }
-            *initialState = kAllOut_InitialState;
-            // iior should only be true if aa/non-aa status matches among all elements.
-            SkClipStack::Iter iter(stack, SkClipStack::Iter::kTop_IterStart);
-            bool doAA = iter.prev()->isAA();
-            SkNEW_INSERT_AT_LLIST_HEAD(result, Element, (isectRect, SkRegion::kReplace_Op, doAA));
-            if (NULL != requiresAA) {
-                *requiresAA = doAA;
-            }
-        } else {
-            *initialState = kAllOut_InitialState;
-             if (NULL != requiresAA) {
-                *requiresAA = false;
-             }
-        }
-        return;
-    } else {
-        if (SkClipStack::kNormal_BoundsType == stackBoundsType) {
-            if (!SkRect::Intersects(stackBounds, scalarQueryBounds)) {
-                *initialState = kAllOut_InitialState;
-                if (NULL != requiresAA) {
-                   *requiresAA = false;
-                }
-                return;
-            }
-            if (NULL != tighterBounds) {
-                SkIRect stackIBounds;
-                stackBounds.roundOut(&stackIBounds);
-                tighterBounds->intersect(queryBounds, stackIBounds);
-                bounds = tighterBounds;
-            }
-        } else {
-            if (stackBounds.contains(scalarQueryBounds)) {
-                *initialState = kAllOut_InitialState;
-                if (NULL != requiresAA) {
-                   *requiresAA = false;
-                }
-                return;
-            }
-            if (NULL != tighterBounds) {
-                *tighterBounds = queryBounds;
-            }
-        }
-    }
-
-    SkRect scalarBounds = SkRect::Make(*bounds);
-
-    // Now that we have determined the bounds to use and filtered out the trivial cases, call the
-    // helper that actually walks the stack.
-    reduced_stack_walker(stack, scalarBounds, result, resultGenID, initialState, requiresAA);
-
-    // The list that was computed in this function may be cached based on the gen id of the last
-    // element.
-    SkASSERT(SkClipStack::kInvalidGenID != *resultGenID);
-}
-
-void reduced_stack_walker(const SkClipStack& stack,
-                          const SkRect& queryBounds,
-                          ElementList* result,
-                          int32_t* resultGenID,
-                          InitialState* initialState,
-                          bool* requiresAA) {
+static void reduced_stack_walker(const SkClipStack& stack,
+                                 const SkRect& queryBounds,
+                                 GrReducedClip::ElementList* result,
+                                 int32_t* resultGenID,
+                                 GrReducedClip::InitialState* initialState,
+                                 bool* requiresAA) {
 
     // walk backwards until we get to:
     //  a) the beginning
     //  b) an operation that is known to make the bounds all inside/outside
     //  c) a replace operation
 
-    static const InitialState kUnknown_InitialState = static_cast<InitialState>(-1);
+    static const GrReducedClip::InitialState kUnknown_InitialState =
+        static_cast<GrReducedClip::InitialState>(-1);
     *initialState = kUnknown_InitialState;
 
     // During our backwards walk, track whether we've seen ops that either grow or shrink the clip.
@@ -165,16 +34,16 @@ void reduced_stack_walker(const SkClipStack& stack,
     int numAAElements = 0;
     while ((kUnknown_InitialState == *initialState)) {
         const Element* element = iter.prev();
-        if (NULL == element) {
-            *initialState = kAllIn_InitialState;
+        if (nullptr == element) {
+            *initialState = GrReducedClip::kAllIn_InitialState;
             break;
         }
         if (SkClipStack::kEmptyGenID == element->getGenID()) {
-            *initialState = kAllOut_InitialState;
+            *initialState = GrReducedClip::kAllOut_InitialState;
             break;
         }
         if (SkClipStack::kWideOpenGenID == element->getGenID()) {
-            *initialState = kAllIn_InitialState;
+            *initialState = GrReducedClip::kAllIn_InitialState;
             break;
         }
 
@@ -189,12 +58,12 @@ void reduced_stack_walker(const SkClipStack& stack,
                     if (element->contains(queryBounds)) {
                         skippable = true;
                     } else if (!SkRect::Intersects(element->getBounds(), queryBounds)) {
-                        *initialState = kAllOut_InitialState;
+                        *initialState = GrReducedClip::kAllOut_InitialState;
                         skippable = true;
                     }
                 } else {
                     if (element->contains(queryBounds)) {
-                        *initialState = kAllOut_InitialState;
+                        *initialState = GrReducedClip::kAllOut_InitialState;
                         skippable = true;
                     } else if (!SkRect::Intersects(element->getBounds(), queryBounds)) {
                         skippable = true;
@@ -210,7 +79,7 @@ void reduced_stack_walker(const SkClipStack& stack,
                 // empty.
                 if (element->isInverseFilled()) {
                     if (element->contains(queryBounds)) {
-                        *initialState = kAllOut_InitialState;
+                        *initialState = GrReducedClip::kAllOut_InitialState;
                         skippable = true;
                     } else if (!SkRect::Intersects(element->getBounds(), queryBounds)) {
                         skippable = true;
@@ -219,7 +88,7 @@ void reduced_stack_walker(const SkClipStack& stack,
                     if (element->contains(queryBounds)) {
                         skippable = true;
                     } else if (!SkRect::Intersects(element->getBounds(), queryBounds)) {
-                        *initialState = kAllOut_InitialState;
+                        *initialState = GrReducedClip::kAllOut_InitialState;
                         skippable = true;
                     }
                 }
@@ -235,12 +104,12 @@ void reduced_stack_walker(const SkClipStack& stack,
                     if (element->contains(queryBounds)) {
                         skippable = true;
                     } else if (!SkRect::Intersects(element->getBounds(), queryBounds)) {
-                        *initialState = kAllIn_InitialState;
+                        *initialState = GrReducedClip::kAllIn_InitialState;
                         skippable = true;
                     }
                 } else {
                     if (element->contains(queryBounds)) {
-                        *initialState = kAllIn_InitialState;
+                        *initialState = GrReducedClip::kAllIn_InitialState;
                         skippable = true;
                     } else if (!SkRect::Intersects(element->getBounds(), queryBounds)) {
                         skippable = true;
@@ -279,7 +148,7 @@ void reduced_stack_walker(const SkClipStack& stack,
                 // all outside the current clip.B
                 if (element->isInverseFilled()) {
                     if (element->contains(queryBounds)) {
-                        *initialState = kAllOut_InitialState;
+                        *initialState = GrReducedClip::kAllOut_InitialState;
                         skippable = true;
                     } else if (!SkRect::Intersects(element->getBounds(), queryBounds)) {
                         isFlip = true;
@@ -288,7 +157,7 @@ void reduced_stack_walker(const SkClipStack& stack,
                     if (element->contains(queryBounds)) {
                         isFlip = true;
                     } else if (!SkRect::Intersects(element->getBounds(), queryBounds)) {
-                        *initialState = kAllOut_InitialState;
+                        *initialState = GrReducedClip::kAllOut_InitialState;
                         skippable = true;
                     }
                 }
@@ -303,23 +172,23 @@ void reduced_stack_walker(const SkClipStack& stack,
                 // setting the correct value for initialState.
                 if (element->isInverseFilled()) {
                     if (element->contains(queryBounds)) {
-                        *initialState = kAllOut_InitialState;
+                        *initialState = GrReducedClip::kAllOut_InitialState;
                         skippable = true;
                     } else if (!SkRect::Intersects(element->getBounds(), queryBounds)) {
-                        *initialState = kAllIn_InitialState;
+                        *initialState = GrReducedClip::kAllIn_InitialState;
                         skippable = true;
                     }
                 } else {
                     if (element->contains(queryBounds)) {
-                        *initialState = kAllIn_InitialState;
+                        *initialState = GrReducedClip::kAllIn_InitialState;
                         skippable = true;
                     } else if (!SkRect::Intersects(element->getBounds(), queryBounds)) {
-                        *initialState = kAllOut_InitialState;
+                        *initialState = GrReducedClip::kAllOut_InitialState;
                         skippable = true;
                     }
                 }
                 if (!skippable) {
-                    *initialState = kAllOut_InitialState;
+                    *initialState = GrReducedClip::kAllOut_InitialState;
                     embiggens = emsmallens = true;
                 }
                 break;
@@ -337,9 +206,7 @@ void reduced_stack_walker(const SkClipStack& stack,
             if (isFlip) {
                 SkASSERT(SkRegion::kXOR_Op == element->getOp() ||
                          SkRegion::kReverseDifference_Op == element->getOp());
-                SkNEW_INSERT_AT_LLIST_HEAD(result,
-                                           Element,
-                                           (queryBounds, SkRegion::kReverseDifference_Op, false));
+                result->addToHead(queryBounds, SkRegion::kReverseDifference_Op, false);
             } else {
                 Element* newElement = result->addToHead(*element);
                 if (newElement->isAA()) {
@@ -354,38 +221,38 @@ void reduced_stack_walker(const SkClipStack& stack,
                     newElement->invertShapeFillType();
                     newElement->setOp(SkRegion::kDifference_Op);
                     if (isReplace) {
-                        SkASSERT(kAllOut_InitialState == *initialState);
-                        *initialState = kAllIn_InitialState;
+                        SkASSERT(GrReducedClip::kAllOut_InitialState == *initialState);
+                        *initialState = GrReducedClip::kAllIn_InitialState;
                     }
                 }
             }
         }
     }
 
-    if ((kAllOut_InitialState == *initialState && !embiggens) ||
-        (kAllIn_InitialState == *initialState && !emsmallens)) {
+    if ((GrReducedClip::kAllOut_InitialState == *initialState && !embiggens) ||
+        (GrReducedClip::kAllIn_InitialState == *initialState && !emsmallens)) {
         result->reset();
     } else {
         Element* element = result->headIter().get();
-        while (NULL != element) {
+        while (element) {
             bool skippable = false;
             switch (element->getOp()) {
                 case SkRegion::kDifference_Op:
                     // subtracting from the empty set yields the empty set.
-                    skippable = kAllOut_InitialState == *initialState;
+                    skippable = GrReducedClip::kAllOut_InitialState == *initialState;
                     break;
                 case SkRegion::kIntersect_Op:
                     // intersecting with the empty set yields the empty set
-                    if (kAllOut_InitialState == *initialState) {
+                    if (GrReducedClip::kAllOut_InitialState == *initialState) {
                         skippable = true;
                     } else {
                         // We can clear to zero and then simply draw the clip element.
-                        *initialState = kAllOut_InitialState;
+                        *initialState = GrReducedClip::kAllOut_InitialState;
                         element->setOp(SkRegion::kReplace_Op);
                     }
                     break;
                 case SkRegion::kUnion_Op:
-                    if (kAllIn_InitialState == *initialState) {
+                    if (GrReducedClip::kAllIn_InitialState == *initialState) {
                         // unioning the infinite plane with anything is a no-op.
                         skippable = true;
                     } else {
@@ -394,23 +261,23 @@ void reduced_stack_walker(const SkClipStack& stack,
                     }
                     break;
                 case SkRegion::kXOR_Op:
-                    if (kAllOut_InitialState == *initialState) {
+                    if (GrReducedClip::kAllOut_InitialState == *initialState) {
                         // xor could be changed to diff in the kAllIn case, not sure it's a win.
                         element->setOp(SkRegion::kReplace_Op);
                     }
                     break;
                 case SkRegion::kReverseDifference_Op:
-                    if (kAllIn_InitialState == *initialState) {
+                    if (GrReducedClip::kAllIn_InitialState == *initialState) {
                         // subtracting the whole plane will yield the empty set.
                         skippable = true;
-                        *initialState = kAllOut_InitialState;
+                        *initialState = GrReducedClip::kAllOut_InitialState;
                     } else {
                         // this picks up flips inserted in the backwards pass.
                         skippable = element->isInverseFilled() ?
                             !SkRect::Intersects(element->getBounds(), queryBounds) :
                             element->contains(queryBounds);
                         if (skippable) {
-                            *initialState = kAllIn_InitialState;
+                            *initialState = GrReducedClip::kAllIn_InitialState;
                         } else {
                             element->setOp(SkRegion::kReplace_Op);
                         }
@@ -435,16 +302,137 @@ void reduced_stack_walker(const SkClipStack& stack,
             }
         }
     }
-    if (NULL != requiresAA) {
+    if (requiresAA) {
         *requiresAA = numAAElements > 0;
     }
 
     if (0 == result->count()) {
-        if (*initialState == kAllIn_InitialState) {
+        if (*initialState == GrReducedClip::kAllIn_InitialState) {
             *resultGenID = SkClipStack::kWideOpenGenID;
         } else {
             *resultGenID = SkClipStack::kEmptyGenID;
         }
     }
 }
-} // namespace GrReducedClip
+
+/*
+There are plenty of optimizations that could be added here. Maybe flips could be folded into
+earlier operations. Or would inserting flips and reversing earlier ops ever be a win? Perhaps
+for the case where the bounds are kInsideOut_BoundsType. We could restrict earlier operations
+based on later intersect operations, and perhaps remove intersect-rects. We could optionally
+take a rect in case the caller knows a bound on what is to be drawn through this clip.
+*/
+void GrReducedClip::ReduceClipStack(const SkClipStack& stack,
+                                    const SkIRect& queryBounds,
+                                    ElementList* result,
+                                    int32_t* resultGenID,
+                                    InitialState* initialState,
+                                    SkIRect* tighterBounds,
+                                    bool* requiresAA) {
+    result->reset();
+
+    // The clip established by the element list might be cached based on the last
+    // generation id. When we make early returns, we do not know what was the generation
+    // id that lead to the state. Make a conservative guess.
+    *resultGenID = stack.getTopmostGenID();
+
+    if (stack.isWideOpen()) {
+        *initialState = kAllIn_InitialState;
+        return;
+    }
+
+
+    // We initially look at whether the bounds alone is sufficient. We also use the stack bounds to
+    // attempt to compute the tighterBounds.
+
+    SkClipStack::BoundsType stackBoundsType;
+    SkRect stackBounds;
+    bool iior;
+    stack.getBounds(&stackBounds, &stackBoundsType, &iior);
+
+    const SkIRect* bounds = &queryBounds;
+
+    SkRect scalarQueryBounds = SkRect::Make(queryBounds);
+
+    if (iior) {
+        SkASSERT(SkClipStack::kNormal_BoundsType == stackBoundsType);
+        SkRect isectRect;
+        if (stackBounds.contains(scalarQueryBounds)) {
+            *initialState = GrReducedClip::kAllIn_InitialState;
+            if (tighterBounds) {
+                *tighterBounds = queryBounds;
+            }
+            if (requiresAA) {
+               *requiresAA = false;
+            }
+        } else if (isectRect.intersect(stackBounds, scalarQueryBounds)) {
+            // If the caller asked for tighter integer bounds we may be able to
+            // return kAllIn and give the bounds with no elements
+            if (tighterBounds) {
+                isectRect.roundOut(tighterBounds);
+                SkRect scalarTighterBounds = SkRect::Make(*tighterBounds);
+                if (scalarTighterBounds == isectRect) {
+                    // the round-out didn't add any area outside the clip rect.
+                    if (requiresAA) {
+                        *requiresAA = false;
+                    }
+                    *initialState = GrReducedClip::kAllIn_InitialState;
+                    return;
+                }
+            }
+            *initialState = kAllOut_InitialState;
+            // iior should only be true if aa/non-aa status matches among all elements.
+            SkClipStack::Iter iter(stack, SkClipStack::Iter::kTop_IterStart);
+            bool doAA = iter.prev()->isAA();
+            result->addToHead(isectRect, SkRegion::kReplace_Op, doAA);
+            if (requiresAA) {
+                *requiresAA = doAA;
+            }
+        } else {
+            *initialState = kAllOut_InitialState;
+             if (requiresAA) {
+                *requiresAA = false;
+             }
+        }
+        return;
+    } else {
+        if (SkClipStack::kNormal_BoundsType == stackBoundsType) {
+            if (!SkRect::Intersects(stackBounds, scalarQueryBounds)) {
+                *initialState = kAllOut_InitialState;
+                if (requiresAA) {
+                   *requiresAA = false;
+                }
+                return;
+            }
+            if (tighterBounds) {
+                SkIRect stackIBounds;
+                stackBounds.roundOut(&stackIBounds);
+                if (!tighterBounds->intersect(queryBounds, stackIBounds)) {
+                    SkASSERT(0);
+                    tighterBounds->setEmpty();
+                }
+                bounds = tighterBounds;
+            }
+        } else {
+            if (stackBounds.contains(scalarQueryBounds)) {
+                *initialState = kAllOut_InitialState;
+                // We know that the bounding box contains all the pixels that are outside the clip,
+                // but we don't know that *all* the pixels in the box are outside the clip. So
+                // proceed to walking the stack.
+            }
+            if (tighterBounds) {
+                *tighterBounds = queryBounds;
+            }
+        }
+    }
+
+    SkRect scalarBounds = SkRect::Make(*bounds);
+
+    // Now that we have determined the bounds to use and filtered out the trivial cases, call the
+    // helper that actually walks the stack.
+    reduced_stack_walker(stack, scalarBounds, result, resultGenID, initialState, requiresAA);
+
+    // The list that was computed in this function may be cached based on the gen id of the last
+    // element.
+    SkASSERT(SkClipStack::kInvalidGenID != *resultGenID);
+}
diff --git a/gfx/skia/skia/src/gpu/GrReducedClip.h b/gfx/skia/skia/src/gpu/GrReducedClip.h
index e3a28cc0c573..3a7c173d5ec0 100644
--- a/gfx/skia/skia/src/gpu/GrReducedClip.h
+++ b/gfx/skia/skia/src/gpu/GrReducedClip.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2012 Google Inc.
  *
@@ -12,37 +11,39 @@
 #include "SkClipStack.h"
 #include "SkTLList.h"
 
-namespace GrReducedClip {
+class SK_API GrReducedClip {
+public:
+    typedef SkTLList<SkClipStack::Element, 16> ElementList;
 
-typedef SkTLList<SkClipStack::Element> ElementList;
+    enum InitialState {
+        kAllIn_InitialState,
+        kAllOut_InitialState,
+    };
 
-enum InitialState {
-    kAllIn_InitialState,
-    kAllOut_InitialState,
+    /**
+     * This function takes a clip stack and a query rectangle and it produces a
+     * reduced set of SkClipStack::Elements that are equivalent to applying the
+     * full stack to the rectangle. The clip stack generation id that represents
+     * the list of elements is returned in resultGenID. The initial state of the
+     * query rectangle before the first clip element is applied is returned via
+     * initialState. Optionally, the caller can request a tighter bounds on the
+     * clip be returned via tighterBounds. If not nullptr, tighterBounds will
+     * always be contained by queryBounds after return. If tighterBounds is
+     * specified then it is assumed that the caller will implicitly clip against
+     * it. If the caller specifies non-nullptr for requiresAA then it will indicate
+     * whether anti-aliasing is required to process any of the elements in the
+     * result.
+     *
+     * This may become a member function of SkClipStack when its interface is
+     * determined to be stable.
+     */
+    static void ReduceClipStack(const SkClipStack& stack,
+                                const SkIRect& queryBounds,
+                                ElementList* result,
+                                int32_t* resultGenID,
+                                InitialState* initialState,
+                                SkIRect* tighterBounds = nullptr,
+                                bool* requiresAA = nullptr);
 };
 
-/**
- * This function takes a clip stack and a query rectangle and it produces a reduced set of
- * SkClipStack::Elements that are equivalent to applying the full stack to the rectangle. The clip
- * stack generation id that represents the list of elements is returned in resultGenID. The
- * initial state of the query rectangle before the first clip element is applied is returned via
- * initialState. Optionally, the caller can request a tighter bounds on the clip be returned via
- * tighterBounds. If not NULL, tighterBounds will always be contained by queryBounds after return.
- * If tighterBounds is specified then it is assumed that the caller will implicitly clip against it.
- * If the caller specifies non-NULL for requiresAA then it will indicate whether anti-aliasing is
- * required to process any of the elements in the result.
- *
- * This may become a member function of SkClipStack when its interface is determined to be stable.
- * Marked SK_API so that SkLua can call this in a shared library build.
- */
-SK_API void ReduceClipStack(const SkClipStack& stack,
-                            const SkIRect& queryBounds,
-                            ElementList* result,
-                            int32_t* resultGenID,
-                            InitialState* initialState,
-                            SkIRect* tighterBounds = NULL,
-                            bool* requiresAA = NULL);
-
-} // namespace GrReducedClip
-
 #endif
diff --git a/gfx/skia/skia/src/gpu/GrRenderTarget.cpp b/gfx/skia/skia/src/gpu/GrRenderTarget.cpp
index 505cc78dceb9..e54702122772 100644
--- a/gfx/skia/skia/src/gpu/GrRenderTarget.cpp
+++ b/gfx/skia/skia/src/gpu/GrRenderTarget.cpp
@@ -10,76 +10,37 @@
 #include "GrRenderTarget.h"
 
 #include "GrContext.h"
+#include "GrDrawContext.h"
+#include "GrDrawTarget.h"
 #include "GrGpu.h"
-#include "GrStencilBuffer.h"
+#include "GrRenderTargetPriv.h"
+#include "GrStencilAttachment.h"
 
-bool GrRenderTarget::readPixels(int left, int top, int width, int height,
-                                GrPixelConfig config,
-                                void* buffer,
-                                size_t rowBytes,
-                                uint32_t pixelOpsFlags) {
-    // go through context so that all necessary flushing occurs
-    GrContext* context = this->getContext();
-    if (NULL == context) {
-        return false;
+GrRenderTarget::~GrRenderTarget() {
+    if (fLastDrawTarget) {
+        fLastDrawTarget->clearRT();
     }
-    return context->readRenderTargetPixels(this,
-                                           left, top, width, height,
-                                           config, buffer, rowBytes,
-                                           pixelOpsFlags);
-}
-
-void GrRenderTarget::writePixels(int left, int top, int width, int height,
-                                 GrPixelConfig config,
-                                 const void* buffer,
-                                 size_t rowBytes,
-                                 uint32_t pixelOpsFlags) {
-    // go through context so that all necessary flushing occurs
-    GrContext* context = this->getContext();
-    if (NULL == context) {
-        return;
-    }
-    context->writeRenderTargetPixels(this,
-                                     left, top, width, height,
-                                     config, buffer, rowBytes,
-                                     pixelOpsFlags);
-}
-
-void GrRenderTarget::resolve() {
-    // go through context so that all necessary flushing occurs
-    GrContext* context = this->getContext();
-    if (NULL == context) {
-        return;
-    }
-    context->resolveRenderTarget(this);
+    SkSafeUnref(fLastDrawTarget);
 }
 
 void GrRenderTarget::discard() {
     // go through context so that all necessary flushing occurs
     GrContext* context = this->getContext();
-    if (NULL == context) {
+    if (!context) {
         return;
     }
-    context->discardRenderTarget(this);
-}
 
-size_t GrRenderTarget::gpuMemorySize() const {
-    size_t colorBits;
-    if (kUnknown_GrPixelConfig == fDesc.fConfig) {
-        colorBits = 32; // don't know, make a guess
-    } else {
-        colorBits = GrBytesPerPixel(fDesc.fConfig) * 8;
+    SkAutoTUnref<GrDrawContext> drawContext(context->drawContext(this));
+    if (!drawContext) {
+        return;
     }
-    uint64_t size = fDesc.fWidth;
-    size *= fDesc.fHeight;
-    size *= colorBits;
-    size *= SkTMax(1, fDesc.fSampleCnt);
-    return (size_t)(size / 8);
+
+    drawContext->discard();
 }
 
 void GrRenderTarget::flagAsNeedingResolve(const SkIRect* rect) {
     if (kCanResolve_ResolveType == getResolveType()) {
-        if (NULL != rect) {
+        if (rect) {
             fResolveRect.join(*rect);
             if (!fResolveRect.intersect(0, 0, this->width(), this->height())) {
                 fResolveRect.setEmpty();
@@ -101,18 +62,46 @@ void GrRenderTarget::overrideResolveRect(const SkIRect rect) {
     }
 }
 
-void GrRenderTarget::setStencilBuffer(GrStencilBuffer* stencilBuffer) {
-    SkRefCnt_SafeAssign(fStencilBuffer, stencilBuffer);
-}
-
 void GrRenderTarget::onRelease() {
-    this->setStencilBuffer(NULL);
+    SkSafeSetNull(fStencilAttachment);
 
     INHERITED::onRelease();
 }
 
 void GrRenderTarget::onAbandon() {
-    this->setStencilBuffer(NULL);
+    SkSafeSetNull(fStencilAttachment);
+
+    // The contents of this renderTarget are gone/invalid. It isn't useful to point back
+    // the creating drawTarget.
+    this->setLastDrawTarget(nullptr);
 
     INHERITED::onAbandon();
 }
+
+void GrRenderTarget::setLastDrawTarget(GrDrawTarget* dt) {
+    if (fLastDrawTarget) {
+        // The non-MDB world never closes so we can't check this condition
+#ifdef ENABLE_MDB
+        SkASSERT(fLastDrawTarget->isClosed());
+#endif
+        fLastDrawTarget->clearRT();
+    }
+
+    SkRefCnt_SafeAssign(fLastDrawTarget, dt);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+bool GrRenderTargetPriv::attachStencilAttachment(GrStencilAttachment* stencil) {
+    if (!stencil && !fRenderTarget->fStencilAttachment) {
+        // No need to do any work since we currently don't have a stencil attachment and
+        // we're not acctually adding one.
+        return true;
+    }
+    fRenderTarget->fStencilAttachment = stencil;
+    if (!fRenderTarget->completeStencilAttachment()) {
+        SkSafeSetNull(fRenderTarget->fStencilAttachment);
+        return false;
+    } 
+    return true;
+}
diff --git a/gfx/skia/skia/src/gpu/GrRenderTargetPriv.h b/gfx/skia/skia/src/gpu/GrRenderTargetPriv.h
new file mode 100644
index 000000000000..f4931db1db74
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrRenderTargetPriv.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrRenderTargetPriv_DEFINED
+#define GrRenderTargetPriv_DEFINED
+
+#include "GrRenderTarget.h"
+
+/** Class that adds methods to GrRenderTarget that are only intended for use internal to Skia.
+    This class is purely a privileged window into GrRenderTarget. It should never have additional
+    data members or virtual methods. */
+class GrRenderTargetPriv {
+public:
+    /**
+     * GrStencilAttachment is not part of the public API.
+     */
+    GrStencilAttachment* getStencilAttachment() const { return fRenderTarget->fStencilAttachment; }
+
+    /**
+     * Attaches the GrStencilAttachment onto the render target. If stencil is a nullptr then the
+     * currently attached GrStencilAttachment will be removed if one was previously attached. This
+     * function returns false if there were any failure in attaching the GrStencilAttachment.
+     */
+    bool attachStencilAttachment(GrStencilAttachment* stencil);
+
+private:
+    explicit GrRenderTargetPriv(GrRenderTarget* renderTarget) : fRenderTarget(renderTarget) {}
+    GrRenderTargetPriv(const GrRenderTargetPriv&) {} // unimpl
+    GrRenderTargetPriv& operator=(const GrRenderTargetPriv&); // unimpl
+
+    // No taking addresses of this type.
+    const GrRenderTargetPriv* operator&() const;
+    GrRenderTargetPriv* operator&();
+
+    GrRenderTarget* fRenderTarget;
+        
+    friend class GrRenderTarget; // to construct/copy this type.
+};
+
+inline GrRenderTargetPriv GrRenderTarget::renderTargetPriv() { return GrRenderTargetPriv(this); }
+
+inline const GrRenderTargetPriv GrRenderTarget::renderTargetPriv () const {
+    return GrRenderTargetPriv(const_cast<GrRenderTarget*>(this));
+}
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrResourceCache.cpp b/gfx/skia/skia/src/gpu/GrResourceCache.cpp
index e3a17f05c5fa..4a0c9b2b369b 100644
--- a/gfx/skia/skia/src/gpu/GrResourceCache.cpp
+++ b/gfx/skia/skia/src/gpu/GrResourceCache.cpp
@@ -1,545 +1,742 @@
 
 /*
- * Copyright 2010 Google Inc.
+ * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
-
 #include "GrResourceCache.h"
-#include "GrGpuResource.h"
+#include "GrGpuResourceCacheAccess.h"
+#include "GrTracing.h"
+#include "SkChecksum.h"
+#include "SkGr.h"
+#include "SkMessageBus.h"
+#include "SkTSort.h"
 
-DECLARE_SKMESSAGEBUS_MESSAGE(GrResourceInvalidatedMessage);
+DECLARE_SKMESSAGEBUS_MESSAGE(GrUniqueKeyInvalidatedMessage);
 
-///////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
 
-void GrGpuResource::didChangeGpuMemorySize() const {
-    if (this->isInCache()) {
-        fCacheEntry->didChangeResourceSize();
-    }
-}
+GrScratchKey::ResourceType GrScratchKey::GenerateResourceType() {
+    static int32_t gType = INHERITED::kInvalidDomain + 1;
 
-///////////////////////////////////////////////////////////////////////////////
-
-GrResourceKey::ResourceType GrResourceKey::GenerateResourceType() {
-    static int32_t gNextType = 0;
-
-    int32_t type = sk_atomic_inc(&gNextType);
-    if (type >= (1 << 8 * sizeof(ResourceType))) {
+    int32_t type = sk_atomic_inc(&gType);
+    if (type > SK_MaxU16) {
         SkFAIL("Too many Resource Types");
     }
 
     return static_cast<ResourceType>(type);
 }
 
-///////////////////////////////////////////////////////////////////////////////
+GrUniqueKey::Domain GrUniqueKey::GenerateDomain() {
+    static int32_t gDomain = INHERITED::kInvalidDomain + 1;
 
-GrResourceCacheEntry::GrResourceCacheEntry(GrResourceCache* resourceCache,
-                                           const GrResourceKey& key,
-                                           GrGpuResource* resource)
-        : fResourceCache(resourceCache),
-          fKey(key),
-          fResource(resource),
-          fCachedSize(resource->gpuMemorySize()),
-          fIsExclusive(false) {
-    // we assume ownership of the resource, and will unref it when we die
-    SkASSERT(resource);
-    resource->ref();
-}
-
-GrResourceCacheEntry::~GrResourceCacheEntry() {
-    fResource->setCacheEntry(NULL);
-    fResource->unref();
-}
-
-#ifdef SK_DEBUG
-void GrResourceCacheEntry::validate() const {
-    SkASSERT(fResourceCache);
-    SkASSERT(fResource);
-    SkASSERT(fResource->getCacheEntry() == this);
-    SkASSERT(fResource->gpuMemorySize() == fCachedSize);
-    fResource->validate();
-}
-#endif
-
-void GrResourceCacheEntry::didChangeResourceSize() {
-    size_t oldSize = fCachedSize;
-    fCachedSize = fResource->gpuMemorySize();
-    if (fCachedSize > oldSize) {
-        fResourceCache->didIncreaseResourceSize(this, fCachedSize - oldSize);
-    } else if (fCachedSize < oldSize) {
-        fResourceCache->didDecreaseResourceSize(this, oldSize - fCachedSize);
+    int32_t domain = sk_atomic_inc(&gDomain);
+    if (domain > SK_MaxU16) {
+        SkFAIL("Too many GrUniqueKey Domains");
     }
+
+    return static_cast<Domain>(domain);
 }
 
-///////////////////////////////////////////////////////////////////////////////
+uint32_t GrResourceKeyHash(const uint32_t* data, size_t size) {
+    return SkChecksum::Murmur3(data, size);
+}
 
-GrResourceCache::GrResourceCache(int maxCount, size_t maxBytes) :
-        fMaxCount(maxCount),
-        fMaxBytes(maxBytes) {
+//////////////////////////////////////////////////////////////////////////////
+
+class GrResourceCache::AutoValidate : ::SkNoncopyable {
+public:
+    AutoValidate(GrResourceCache* cache) : fCache(cache) { cache->validate(); }
+    ~AutoValidate() { fCache->validate(); }
+private:
+    GrResourceCache* fCache;
+};
+
+ //////////////////////////////////////////////////////////////////////////////
+
+
+GrResourceCache::GrResourceCache(const GrCaps* caps)
+    : fTimestamp(0)
+    , fMaxCount(kDefaultMaxCount)
+    , fMaxBytes(kDefaultMaxSize)
+    , fMaxUnusedFlushes(kDefaultMaxUnusedFlushes)
 #if GR_CACHE_STATS
-    fHighWaterEntryCount          = 0;
-    fHighWaterEntryBytes          = 0;
-    fHighWaterClientDetachedCount = 0;
-    fHighWaterClientDetachedBytes = 0;
+    , fHighWaterCount(0)
+    , fHighWaterBytes(0)
+    , fBudgetedHighWaterCount(0)
+    , fBudgetedHighWaterBytes(0)
 #endif
-
-    fEntryCount                   = 0;
-    fEntryBytes                   = 0;
-    fClientDetachedCount          = 0;
-    fClientDetachedBytes          = 0;
-
-    fPurging                      = false;
-
-    fOverbudgetCB                 = NULL;
-    fOverbudgetData               = NULL;
+    , fBytes(0)
+    , fBudgetedCount(0)
+    , fBudgetedBytes(0)
+    , fOverBudgetCB(nullptr)
+    , fOverBudgetData(nullptr)
+    , fFlushTimestamps(nullptr)
+    , fLastFlushTimestampIndex(0)
+    , fPreferVRAMUseOverFlushes(caps->preferVRAMUseOverFlushes()) {
+    SkDEBUGCODE(fCount = 0;)
+    SkDEBUGCODE(fNewlyPurgeableResourceForValidation = nullptr;)
+    this->resetFlushTimestamps();
 }
 
 GrResourceCache::~GrResourceCache() {
-    GrAutoResourceCacheValidate atcv(this);
+    this->releaseAll();
+    delete[] fFlushTimestamps;
+}
 
-    EntryList::Iter iter;
+void GrResourceCache::setLimits(int count, size_t bytes, int maxUnusedFlushes) {
+    fMaxCount = count;
+    fMaxBytes = bytes;
+    fMaxUnusedFlushes = maxUnusedFlushes;
+    this->resetFlushTimestamps();
+    this->purgeAsNeeded();
+}
 
-    // Unlike the removeAll, here we really remove everything, including locked resources.
-    while (GrResourceCacheEntry* entry = fList.head()) {
-        GrAutoResourceCacheValidate atcv(this);
+void GrResourceCache::resetFlushTimestamps() {
+    delete[] fFlushTimestamps;
 
-        // remove from our cache
-        fCache.remove(entry->fKey, entry);
+    // We assume this number is a power of two when wrapping indices into the timestamp array.
+    fMaxUnusedFlushes = SkNextPow2(fMaxUnusedFlushes);
 
-        // remove from our llist
-        this->internalDetach(entry);
+    // Since our implementation is to store the timestamps of the last fMaxUnusedFlushes flush calls
+    // we just turn the feature off if that array would be large.
+    static const int kMaxSupportedTimestampHistory = 128;
 
-        delete entry;
+    if (fMaxUnusedFlushes > kMaxSupportedTimestampHistory) {
+        fFlushTimestamps = nullptr;
+        return;
+    }
+
+    fFlushTimestamps = new uint32_t[fMaxUnusedFlushes];
+    fLastFlushTimestampIndex = 0;
+    // Set all the historical flush timestamps to initially be at the beginning of time (timestamp
+    // 0).
+    sk_bzero(fFlushTimestamps, fMaxUnusedFlushes * sizeof(uint32_t));
+}
+
+void GrResourceCache::insertResource(GrGpuResource* resource) {
+    SkASSERT(resource);
+    SkASSERT(!this->isInCache(resource));
+    SkASSERT(!resource->wasDestroyed());
+    SkASSERT(!resource->isPurgeable());
+
+    // We must set the timestamp before adding to the array in case the timestamp wraps and we wind
+    // up iterating over all the resources that already have timestamps.
+    resource->cacheAccess().setTimestamp(this->getNextTimestamp());
+
+    this->addToNonpurgeableArray(resource);
+
+    size_t size = resource->gpuMemorySize();
+    SkDEBUGCODE(++fCount;)
+    fBytes += size;
+#if GR_CACHE_STATS
+    fHighWaterCount = SkTMax(this->getResourceCount(), fHighWaterCount);
+    fHighWaterBytes = SkTMax(fBytes, fHighWaterBytes);
+#endif
+    if (resource->resourcePriv().isBudgeted()) {
+        ++fBudgetedCount;
+        fBudgetedBytes += size;
+        TRACE_COUNTER2(TRACE_DISABLED_BY_DEFAULT("skia.gpu.cache"), "skia budget", "used",
+                       fBudgetedBytes, "free", fMaxBytes - fBudgetedBytes);
+#if GR_CACHE_STATS
+        fBudgetedHighWaterCount = SkTMax(fBudgetedCount, fBudgetedHighWaterCount);
+        fBudgetedHighWaterBytes = SkTMax(fBudgetedBytes, fBudgetedHighWaterBytes);
+#endif
+    }
+    if (resource->resourcePriv().getScratchKey().isValid()) {
+        SkASSERT(!resource->cacheAccess().isExternal());
+        fScratchMap.insert(resource->resourcePriv().getScratchKey(), resource);
+    }
+
+    this->purgeAsNeeded();
+}
+
+void GrResourceCache::removeResource(GrGpuResource* resource) {
+    this->validate();
+    SkASSERT(this->isInCache(resource));
+
+    if (resource->isPurgeable()) {
+        fPurgeableQueue.remove(resource);
+    } else {
+        this->removeFromNonpurgeableArray(resource);
+    }
+
+    size_t size = resource->gpuMemorySize();
+    SkDEBUGCODE(--fCount;)
+    fBytes -= size;
+    if (resource->resourcePriv().isBudgeted()) {
+        --fBudgetedCount;
+        fBudgetedBytes -= size;
+        TRACE_COUNTER2(TRACE_DISABLED_BY_DEFAULT("skia.gpu.cache"), "skia budget", "used",
+                       fBudgetedBytes, "free", fMaxBytes - fBudgetedBytes);
+    }
+
+    if (resource->resourcePriv().getScratchKey().isValid()) {
+        fScratchMap.remove(resource->resourcePriv().getScratchKey(), resource);
+    }
+    if (resource->getUniqueKey().isValid()) {
+        fUniqueHash.remove(resource->getUniqueKey());
+    }
+    this->validate();
+}
+
+void GrResourceCache::abandonAll() {
+    AutoValidate av(this);
+
+    while (fNonpurgeableResources.count()) {
+        GrGpuResource* back = *(fNonpurgeableResources.end() - 1);
+        SkASSERT(!back->wasDestroyed());
+        back->cacheAccess().abandon();
+    }
+
+    while (fPurgeableQueue.count()) {
+        GrGpuResource* top = fPurgeableQueue.peek();
+        SkASSERT(!top->wasDestroyed());
+        top->cacheAccess().abandon();
+    }
+
+    SkASSERT(!fScratchMap.count());
+    SkASSERT(!fUniqueHash.count());
+    SkASSERT(!fCount);
+    SkASSERT(!this->getResourceCount());
+    SkASSERT(!fBytes);
+    SkASSERT(!fBudgetedCount);
+    SkASSERT(!fBudgetedBytes);
+}
+
+void GrResourceCache::releaseAll() {
+    AutoValidate av(this);
+
+    while(fNonpurgeableResources.count()) {
+        GrGpuResource* back = *(fNonpurgeableResources.end() - 1);
+        SkASSERT(!back->wasDestroyed());
+        back->cacheAccess().release();
+    }
+
+    while (fPurgeableQueue.count()) {
+        GrGpuResource* top = fPurgeableQueue.peek();
+        SkASSERT(!top->wasDestroyed());
+        top->cacheAccess().release();
+    }
+
+    SkASSERT(!fScratchMap.count());
+    SkASSERT(!fUniqueHash.count());
+    SkASSERT(!fCount);
+    SkASSERT(!this->getResourceCount());
+    SkASSERT(!fBytes);
+    SkASSERT(!fBudgetedCount);
+    SkASSERT(!fBudgetedBytes);
+}
+
+class GrResourceCache::AvailableForScratchUse {
+public:
+    AvailableForScratchUse(bool rejectPendingIO) : fRejectPendingIO(rejectPendingIO) { }
+
+    bool operator()(const GrGpuResource* resource) const {
+        if (resource->internalHasRef() || !resource->cacheAccess().isScratch()) {
+            return false;
+        }
+        return !fRejectPendingIO || !resource->internalHasPendingIO();
+    }
+
+private:
+    bool fRejectPendingIO;
+};
+
+GrGpuResource* GrResourceCache::findAndRefScratchResource(const GrScratchKey& scratchKey,
+                                                          size_t resourceSize,
+                                                          uint32_t flags) {
+    SkASSERT(scratchKey.isValid());
+
+    GrGpuResource* resource;
+    if (flags & (kPreferNoPendingIO_ScratchFlag | kRequireNoPendingIO_ScratchFlag)) {
+        resource = fScratchMap.find(scratchKey, AvailableForScratchUse(true));
+        if (resource) {
+            this->refAndMakeResourceMRU(resource);
+            this->validate();
+            return resource;
+        } else if (flags & kRequireNoPendingIO_ScratchFlag) {
+            return nullptr;
+        }
+        // We would prefer to consume more available VRAM rather than flushing
+        // immediately, but on ANGLE this can lead to starving of the GPU.
+        if (fPreferVRAMUseOverFlushes && this->wouldFit(resourceSize)) {
+            // kPrefer is specified, we didn't find a resource without pending io,
+            // but there is still space in our budget for the resource so force
+            // the caller to allocate a new resource.
+            return nullptr;
+        }
+    }
+    resource = fScratchMap.find(scratchKey, AvailableForScratchUse(false));
+    if (resource) {
+        this->refAndMakeResourceMRU(resource);
+        this->validate();
+    }
+    return resource;
+}
+
+void GrResourceCache::willRemoveScratchKey(const GrGpuResource* resource) {
+    SkASSERT(resource->resourcePriv().getScratchKey().isValid());
+    fScratchMap.remove(resource->resourcePriv().getScratchKey(), resource);
+}
+
+void GrResourceCache::removeUniqueKey(GrGpuResource* resource) {
+    // Someone has a ref to this resource in order to have removed the key. When the ref count
+    // reaches zero we will get a ref cnt notification and figure out what to do with it.
+    if (resource->getUniqueKey().isValid()) {
+        SkASSERT(resource == fUniqueHash.find(resource->getUniqueKey()));
+        fUniqueHash.remove(resource->getUniqueKey());
+    }
+    resource->cacheAccess().removeUniqueKey();
+    this->validate();
+}
+
+void GrResourceCache::changeUniqueKey(GrGpuResource* resource, const GrUniqueKey& newKey) {
+    SkASSERT(resource);
+    SkASSERT(this->isInCache(resource));
+
+    // Remove the entry for this resource if it already has a unique key.
+    if (resource->getUniqueKey().isValid()) {
+        SkASSERT(resource == fUniqueHash.find(resource->getUniqueKey()));
+        fUniqueHash.remove(resource->getUniqueKey());
+        SkASSERT(nullptr == fUniqueHash.find(resource->getUniqueKey()));
+    }
+
+    // If another resource has the new key, remove its key then install the key on this resource.
+    if (newKey.isValid()) {
+        if (GrGpuResource* old = fUniqueHash.find(newKey)) {
+            // If the old resource using the key is purgeable and is unreachable, then remove it.
+            if (!old->resourcePriv().getScratchKey().isValid() && old->isPurgeable()) {
+                // release may call validate() which will assert that resource is in fUniqueHash
+                // if it has a valid key. So in debug reset the key here before we assign it.
+                SkDEBUGCODE(resource->cacheAccess().removeUniqueKey();)
+                old->cacheAccess().release();
+            } else {
+                fUniqueHash.remove(newKey);
+                old->cacheAccess().removeUniqueKey();
+            }
+        }
+        SkASSERT(nullptr == fUniqueHash.find(newKey));
+        resource->cacheAccess().setUniqueKey(newKey);
+        fUniqueHash.add(resource);
+    } else {
+        resource->cacheAccess().removeUniqueKey();
+    }
+
+    this->validate();
+}
+
+void GrResourceCache::refAndMakeResourceMRU(GrGpuResource* resource) {
+    SkASSERT(resource);
+    SkASSERT(this->isInCache(resource));
+
+    if (resource->isPurgeable()) {
+        // It's about to become unpurgeable.
+        fPurgeableQueue.remove(resource);
+        this->addToNonpurgeableArray(resource);
+    }
+    resource->ref();
+
+    resource->cacheAccess().setTimestamp(this->getNextTimestamp());
+    this->validate();
+}
+
+void GrResourceCache::notifyCntReachedZero(GrGpuResource* resource, uint32_t flags) {
+    SkASSERT(resource);
+    SkASSERT(!resource->wasDestroyed());
+    SkASSERT(flags);
+    SkASSERT(this->isInCache(resource));
+    // This resource should always be in the nonpurgeable array when this function is called. It
+    // will be moved to the queue if it is newly purgeable.
+    SkASSERT(fNonpurgeableResources[*resource->cacheAccess().accessCacheIndex()] == resource);
+
+    if (SkToBool(ResourceAccess::kRefCntReachedZero_RefNotificationFlag & flags)) {
+#ifdef SK_DEBUG
+        // When the timestamp overflows validate() is called. validate() checks that resources in
+        // the nonpurgeable array are indeed not purgeable. However, the movement from the array to
+        // the purgeable queue happens just below in this function. So we mark it as an exception.
+        if (resource->isPurgeable()) {
+            fNewlyPurgeableResourceForValidation = resource;
+        }
+#endif
+        resource->cacheAccess().setTimestamp(this->getNextTimestamp());
+        SkDEBUGCODE(fNewlyPurgeableResourceForValidation = nullptr);
+    }
+
+    if (!SkToBool(ResourceAccess::kAllCntsReachedZero_RefNotificationFlag & flags)) {
+        SkASSERT(!resource->isPurgeable());
+        return;
+    }
+
+    SkASSERT(resource->isPurgeable());
+    this->removeFromNonpurgeableArray(resource);
+    fPurgeableQueue.insert(resource);
+
+    if (!resource->resourcePriv().isBudgeted()) {
+        // Check whether this resource could still be used as a scratch resource.
+        if (!resource->cacheAccess().isExternal() &&
+            resource->resourcePriv().getScratchKey().isValid()) {
+            // We won't purge an existing resource to make room for this one.
+            if (fBudgetedCount < fMaxCount &&
+                fBudgetedBytes + resource->gpuMemorySize() <= fMaxBytes) {
+                resource->resourcePriv().makeBudgeted();
+                return;
+            }
+        }
+    } else {
+        // Purge the resource immediately if we're over budget
+        // Also purge if the resource has neither a valid scratch key nor a unique key.
+        bool noKey = !resource->resourcePriv().getScratchKey().isValid() &&
+                     !resource->getUniqueKey().isValid();
+        if (!this->overBudget() && !noKey) {
+            return;
+        }
+    }
+
+    SkDEBUGCODE(int beforeCount = this->getResourceCount();)
+    resource->cacheAccess().release();
+    // We should at least free this resource, perhaps dependent resources as well.
+    SkASSERT(this->getResourceCount() < beforeCount);
+    this->validate();
+}
+
+void GrResourceCache::didChangeGpuMemorySize(const GrGpuResource* resource, size_t oldSize) {
+    // SkASSERT(!fPurging); GrPathRange increases size during flush. :(
+    SkASSERT(resource);
+    SkASSERT(this->isInCache(resource));
+
+    ptrdiff_t delta = resource->gpuMemorySize() - oldSize;
+
+    fBytes += delta;
+#if GR_CACHE_STATS
+    fHighWaterBytes = SkTMax(fBytes, fHighWaterBytes);
+#endif
+    if (resource->resourcePriv().isBudgeted()) {
+        fBudgetedBytes += delta;
+        TRACE_COUNTER2(TRACE_DISABLED_BY_DEFAULT("skia.gpu.cache"), "skia budget", "used",
+                       fBudgetedBytes, "free", fMaxBytes - fBudgetedBytes);
+#if GR_CACHE_STATS
+        fBudgetedHighWaterBytes = SkTMax(fBudgetedBytes, fBudgetedHighWaterBytes);
+#endif
+    }
+
+    this->purgeAsNeeded();
+    this->validate();
+}
+
+void GrResourceCache::didChangeBudgetStatus(GrGpuResource* resource) {
+    SkASSERT(resource);
+    SkASSERT(this->isInCache(resource));
+
+    size_t size = resource->gpuMemorySize();
+
+    if (resource->resourcePriv().isBudgeted()) {
+        ++fBudgetedCount;
+        fBudgetedBytes += size;
+#if GR_CACHE_STATS
+        fBudgetedHighWaterBytes = SkTMax(fBudgetedBytes, fBudgetedHighWaterBytes);
+        fBudgetedHighWaterCount = SkTMax(fBudgetedCount, fBudgetedHighWaterCount);
+#endif
+        this->purgeAsNeeded();
+    } else {
+        --fBudgetedCount;
+        fBudgetedBytes -= size;
+    }
+    TRACE_COUNTER2(TRACE_DISABLED_BY_DEFAULT("skia.gpu.cache"), "skia budget", "used",
+                   fBudgetedBytes, "free", fMaxBytes - fBudgetedBytes);
+
+    this->validate();
+}
+
+void GrResourceCache::purgeAsNeeded() {
+    SkTArray<GrUniqueKeyInvalidatedMessage> invalidKeyMsgs;
+    fInvalidUniqueKeyInbox.poll(&invalidKeyMsgs);
+    if (invalidKeyMsgs.count()) {
+        this->processInvalidUniqueKeys(invalidKeyMsgs);
+    }
+
+    if (fFlushTimestamps) {
+        // Assuming kNumFlushesToDeleteUnusedResource is a power of 2.
+        SkASSERT(SkIsPow2(fMaxUnusedFlushes));
+        int oldestFlushIndex = (fLastFlushTimestampIndex + 1) & (fMaxUnusedFlushes - 1);
+
+        uint32_t oldestAllowedTimestamp = fFlushTimestamps[oldestFlushIndex];
+        while (fPurgeableQueue.count()) {
+            uint32_t oldestResourceTimestamp = fPurgeableQueue.peek()->cacheAccess().timestamp();
+            if (oldestAllowedTimestamp < oldestResourceTimestamp) {
+                break;
+            }
+            GrGpuResource* resource = fPurgeableQueue.peek();
+            SkASSERT(resource->isPurgeable());
+            resource->cacheAccess().release();
+        }
+    }
+
+    bool stillOverbudget = this->overBudget();
+    while (stillOverbudget && fPurgeableQueue.count()) {
+        GrGpuResource* resource = fPurgeableQueue.peek();
+        SkASSERT(resource->isPurgeable());
+        resource->cacheAccess().release();
+        stillOverbudget = this->overBudget();
+    }
+
+    this->validate();
+
+    if (stillOverbudget) {
+        // Despite the purge we're still over budget. Call our over budget callback. If this frees
+        // any resources then we'll get notified and take appropriate action.
+        (*fOverBudgetCB)(fOverBudgetData);
+        this->validate();
     }
 }
 
-void GrResourceCache::getLimits(int* maxResources, size_t* maxResourceBytes) const{
-    if (NULL != maxResources) {
-        *maxResources = fMaxCount;
+void GrResourceCache::purgeAllUnlocked() {
+    // We could disable maintaining the heap property here, but it would add a lot of complexity.
+    // Moreover, this is rarely called.
+    while (fPurgeableQueue.count()) {
+        GrGpuResource* resource = fPurgeableQueue.peek();
+        SkASSERT(resource->isPurgeable());
+        resource->cacheAccess().release();
     }
-    if (NULL != maxResourceBytes) {
-        *maxResourceBytes = fMaxBytes;
+
+    this->validate();
+}
+
+void GrResourceCache::processInvalidUniqueKeys(
+    const SkTArray<GrUniqueKeyInvalidatedMessage>& msgs) {
+    for (int i = 0; i < msgs.count(); ++i) {
+        GrGpuResource* resource = this->findAndRefUniqueResource(msgs[i].key());
+        if (resource) {
+            resource->resourcePriv().removeUniqueKey();
+            resource->unref(); // If this resource is now purgeable, the cache will be notified.
+        }
     }
 }
 
-void GrResourceCache::setLimits(int maxResources, size_t maxResourceBytes) {
-    bool smaller = (maxResources < fMaxCount) || (maxResourceBytes < fMaxBytes);
+void GrResourceCache::addToNonpurgeableArray(GrGpuResource* resource) {
+    int index = fNonpurgeableResources.count();
+    *fNonpurgeableResources.append() = resource;
+    *resource->cacheAccess().accessCacheIndex() = index;
+}
 
-    fMaxCount = maxResources;
-    fMaxBytes = maxResourceBytes;
+void GrResourceCache::removeFromNonpurgeableArray(GrGpuResource* resource) {
+    int* index = resource->cacheAccess().accessCacheIndex();
+    // Fill the whole we will create in the array with the tail object, adjust its index, and
+    // then pop the array
+    GrGpuResource* tail = *(fNonpurgeableResources.end() - 1);
+    SkASSERT(fNonpurgeableResources[*index] == resource);
+    fNonpurgeableResources[*index] = tail;
+    *tail->cacheAccess().accessCacheIndex() = *index;
+    fNonpurgeableResources.pop();
+    SkDEBUGCODE(*index = -1);
+}
 
-    if (smaller) {
+uint32_t GrResourceCache::getNextTimestamp() {
+    // If we wrap then all the existing resources will appear older than any resources that get
+    // a timestamp after the wrap.
+    if (0 == fTimestamp) {
+        int count = this->getResourceCount();
+        if (count) {
+            // Reset all the timestamps. We sort the resources by timestamp and then assign
+            // sequential timestamps beginning with 0. This is O(n*lg(n)) but it should be extremely
+            // rare.
+            SkTDArray<GrGpuResource*> sortedPurgeableResources;
+            sortedPurgeableResources.setReserve(fPurgeableQueue.count());
+
+            while (fPurgeableQueue.count()) {
+                *sortedPurgeableResources.append() = fPurgeableQueue.peek();
+                fPurgeableQueue.pop();
+            }
+
+            struct Less {
+                bool operator()(GrGpuResource* a, GrGpuResource* b) {
+                    return CompareTimestamp(a,b);
+                }
+            };
+            Less less;
+            SkTQSort(fNonpurgeableResources.begin(), fNonpurgeableResources.end() - 1, less);
+
+            // Pick resources out of the purgeable and non-purgeable arrays based on lowest
+            // timestamp and assign new timestamps.
+            int currP = 0;
+            int currNP = 0;
+            while (currP < sortedPurgeableResources.count() &&
+                   currNP < fNonpurgeableResources.count()) {
+                uint32_t tsP = sortedPurgeableResources[currP]->cacheAccess().timestamp();
+                uint32_t tsNP = fNonpurgeableResources[currNP]->cacheAccess().timestamp();
+                SkASSERT(tsP != tsNP);
+                if (tsP < tsNP) {
+                    sortedPurgeableResources[currP++]->cacheAccess().setTimestamp(fTimestamp++);
+                } else {
+                    // Correct the index in the nonpurgeable array stored on the resource post-sort.
+                    *fNonpurgeableResources[currNP]->cacheAccess().accessCacheIndex() = currNP;
+                    fNonpurgeableResources[currNP++]->cacheAccess().setTimestamp(fTimestamp++);
+                }
+            }
+
+            // The above loop ended when we hit the end of one array. Finish the other one.
+            while (currP < sortedPurgeableResources.count()) {
+                sortedPurgeableResources[currP++]->cacheAccess().setTimestamp(fTimestamp++);
+            }
+            while (currNP < fNonpurgeableResources.count()) {
+                *fNonpurgeableResources[currNP]->cacheAccess().accessCacheIndex() = currNP;
+                fNonpurgeableResources[currNP++]->cacheAccess().setTimestamp(fTimestamp++);
+            }
+
+            // Rebuild the queue.
+            for (int i = 0; i < sortedPurgeableResources.count(); ++i) {
+                fPurgeableQueue.insert(sortedPurgeableResources[i]);
+            }
+
+            this->validate();
+            SkASSERT(count == this->getResourceCount());
+
+            // count should be the next timestamp we return.
+            SkASSERT(fTimestamp == SkToU32(count));
+
+            // The historical timestamps of flushes are now invalid.
+            this->resetFlushTimestamps();
+        }
+    }
+    return fTimestamp++;
+}
+
+void GrResourceCache::notifyFlushOccurred() {
+    if (fFlushTimestamps) {
+        SkASSERT(SkIsPow2(fMaxUnusedFlushes));
+        fLastFlushTimestampIndex = (fLastFlushTimestampIndex + 1) & (fMaxUnusedFlushes - 1);
+        // get the timestamp before accessing fFlushTimestamps because getNextTimestamp will
+        // reallocate fFlushTimestamps on timestamp overflow.
+        uint32_t timestamp = this->getNextTimestamp();
+        fFlushTimestamps[fLastFlushTimestampIndex] = timestamp;
         this->purgeAsNeeded();
     }
 }
 
-void GrResourceCache::internalDetach(GrResourceCacheEntry* entry,
-                                     BudgetBehaviors behavior) {
-    fList.remove(entry);
-
-    // update our stats
-    if (kIgnore_BudgetBehavior == behavior) {
-        fClientDetachedCount += 1;
-        fClientDetachedBytes += entry->fCachedSize;
-
-#if GR_CACHE_STATS
-        if (fHighWaterClientDetachedCount < fClientDetachedCount) {
-            fHighWaterClientDetachedCount = fClientDetachedCount;
-        }
-        if (fHighWaterClientDetachedBytes < fClientDetachedBytes) {
-            fHighWaterClientDetachedBytes = fClientDetachedBytes;
-        }
-#endif
-
-    } else {
-        SkASSERT(kAccountFor_BudgetBehavior == behavior);
-
-        fEntryCount -= 1;
-        fEntryBytes -= entry->fCachedSize;
+void GrResourceCache::dumpMemoryStatistics(SkTraceMemoryDump* traceMemoryDump) const {
+    for (int i = 0; i < fNonpurgeableResources.count(); ++i) {
+        fNonpurgeableResources[i]->dumpMemoryStatistics(traceMemoryDump);
+    }
+    for (int i = 0; i < fPurgeableQueue.count(); ++i) {
+        fPurgeableQueue.at(i)->dumpMemoryStatistics(traceMemoryDump);
     }
 }
 
-void GrResourceCache::attachToHead(GrResourceCacheEntry* entry,
-                                   BudgetBehaviors behavior) {
-    fList.addToHead(entry);
-
-    // update our stats
-    if (kIgnore_BudgetBehavior == behavior) {
-        fClientDetachedCount -= 1;
-        fClientDetachedBytes -= entry->fCachedSize;
-    } else {
-        SkASSERT(kAccountFor_BudgetBehavior == behavior);
-
-        fEntryCount += 1;
-        fEntryBytes += entry->fCachedSize;
-
-#if GR_CACHE_STATS
-        if (fHighWaterEntryCount < fEntryCount) {
-            fHighWaterEntryCount = fEntryCount;
-        }
-        if (fHighWaterEntryBytes < fEntryBytes) {
-            fHighWaterEntryBytes = fEntryBytes;
-        }
-#endif
-    }
-}
-
-// This functor just searches for an entry with only a single ref (from
-// the texture cache itself). Presumably in this situation no one else
-// is relying on the texture.
-class GrTFindUnreffedFunctor {
-public:
-    bool operator()(const GrResourceCacheEntry* entry) const {
-        return entry->resource()->unique();
-    }
-};
-
-GrGpuResource* GrResourceCache::find(const GrResourceKey& key, uint32_t ownershipFlags) {
-    GrAutoResourceCacheValidate atcv(this);
-
-    GrResourceCacheEntry* entry = NULL;
-
-    if (ownershipFlags & kNoOtherOwners_OwnershipFlag) {
-        GrTFindUnreffedFunctor functor;
-
-        entry = fCache.find<GrTFindUnreffedFunctor>(key, functor);
-    } else {
-        entry = fCache.find(key);
-    }
-
-    if (NULL == entry) {
-        return NULL;
-    }
-
-    if (ownershipFlags & kHide_OwnershipFlag) {
-        this->makeExclusive(entry);
-    } else {
-        // Make this resource MRU
-        this->internalDetach(entry);
-        this->attachToHead(entry);
-    }
-
-    return entry->fResource;
-}
-
-void GrResourceCache::addResource(const GrResourceKey& key,
-                                  GrGpuResource* resource,
-                                  uint32_t ownershipFlags) {
-    SkASSERT(NULL == resource->getCacheEntry());
-    // we don't expect to create new resources during a purge. In theory
-    // this could cause purgeAsNeeded() into an infinite loop (e.g.
-    // each resource destroyed creates and locks 2 resources and
-    // unlocks 1 thereby causing a new purge).
-    SkASSERT(!fPurging);
-    GrAutoResourceCacheValidate atcv(this);
-
-    GrResourceCacheEntry* entry = SkNEW_ARGS(GrResourceCacheEntry, (this, key, resource));
-    resource->setCacheEntry(entry);
-
-    this->attachToHead(entry);
-    fCache.insert(key, entry);
-
-    if (ownershipFlags & kHide_OwnershipFlag) {
-        this->makeExclusive(entry);
-    }
-
-}
-
-void GrResourceCache::makeExclusive(GrResourceCacheEntry* entry) {
-    GrAutoResourceCacheValidate atcv(this);
-
-    SkASSERT(!entry->fIsExclusive);
-    entry->fIsExclusive = true;
-
-    // When scratch textures are detached (to hide them from future finds) they
-    // still count against the resource budget
-    this->internalDetach(entry, kIgnore_BudgetBehavior);
-    fCache.remove(entry->key(), entry);
-
 #ifdef SK_DEBUG
-    fExclusiveList.addToHead(entry);
-#endif
-}
-
-void GrResourceCache::removeInvalidResource(GrResourceCacheEntry* entry) {
-    // If the resource went invalid while it was detached then purge it
-    // This can happen when a 3D context was lost,
-    // the client called GrContext::contextDestroyed() to notify Gr,
-    // and then later an SkGpuDevice's destructor releases its backing
-    // texture (which was invalidated at contextDestroyed time).
-    // TODO: Safely delete the GrResourceCacheEntry as well.
-    fClientDetachedCount -= 1;
-    fEntryCount -= 1;
-    fClientDetachedBytes -= entry->fCachedSize;
-    fEntryBytes -= entry->fCachedSize;
-    entry->fCachedSize = 0;
-}
-
-void GrResourceCache::makeNonExclusive(GrResourceCacheEntry* entry) {
-    GrAutoResourceCacheValidate atcv(this);
-
-#ifdef SK_DEBUG
-    fExclusiveList.remove(entry);
-#endif
-
-    if (!entry->resource()->wasDestroyed()) {
-        // Since scratch textures still count against the cache budget even
-        // when they have been removed from the cache, re-adding them doesn't
-        // alter the budget information.
-        attachToHead(entry, kIgnore_BudgetBehavior);
-        fCache.insert(entry->key(), entry);
-
-        SkASSERT(entry->fIsExclusive);
-        entry->fIsExclusive = false;
-    } else {
-        this->removeInvalidResource(entry);
-    }
-}
-
-void GrResourceCache::didIncreaseResourceSize(const GrResourceCacheEntry* entry, size_t amountInc) {
-    fEntryBytes += amountInc;
-    if (entry->fIsExclusive) {
-        fClientDetachedBytes += amountInc;
-    }
-    this->purgeAsNeeded();
-}
-
-void GrResourceCache::didDecreaseResourceSize(const GrResourceCacheEntry* entry, size_t amountDec) {
-    fEntryBytes -= amountDec;
-    if (entry->fIsExclusive) {
-        fClientDetachedBytes -= amountDec;
-    }
-#ifdef SK_DEBUG
-    this->validate();
-#endif
-}
-
-/**
- * Destroying a resource may potentially trigger the unlock of additional
- * resources which in turn will trigger a nested purge. We block the nested
- * purge using the fPurging variable. However, the initial purge will keep
- * looping until either all resources in the cache are unlocked or we've met
- * the budget. There is an assertion in createAndLock to check against a
- * resource's destructor inserting new resources into the cache. If these
- * new resources were unlocked before purgeAsNeeded completed it could
- * potentially make purgeAsNeeded loop infinitely.
- *
- * extraCount and extraBytes are added to the current resource totals to account
- * for incoming resources (e.g., GrContext is about to add 10MB split between
- * 10 textures).
- */
-void GrResourceCache::purgeAsNeeded(int extraCount, size_t extraBytes) {
-    if (fPurging) {
+void GrResourceCache::validate() const {
+    // Reduce the frequency of validations for large resource counts.
+    static SkRandom gRandom;
+    int mask = (SkNextPow2(fCount + 1) >> 5) - 1;
+    if (~mask && (gRandom.nextU() & mask)) {
         return;
     }
 
-    fPurging = true;
+    struct Stats {
+        size_t fBytes;
+        int fBudgetedCount;
+        size_t fBudgetedBytes;
+        int fLocked;
+        int fScratch;
+        int fCouldBeScratch;
+        int fContent;
+        const ScratchMap* fScratchMap;
+        const UniqueHash* fUniqueHash;
 
-    this->purgeInvalidated();
-
-    this->internalPurge(extraCount, extraBytes);
-    if (((fEntryCount+extraCount) > fMaxCount ||
-        (fEntryBytes+extraBytes) > fMaxBytes) &&
-        NULL != fOverbudgetCB) {
-        // Despite the purge we're still over budget. See if Ganesh can
-        // release some resources and purge again.
-        if ((*fOverbudgetCB)(fOverbudgetData)) {
-            this->internalPurge(extraCount, extraBytes);
+        Stats(const GrResourceCache* cache) {
+            memset(this, 0, sizeof(*this));
+            fScratchMap = &cache->fScratchMap;
+            fUniqueHash = &cache->fUniqueHash;
         }
-    }
 
-    fPurging = false;
-}
+        void update(GrGpuResource* resource) {
+            fBytes += resource->gpuMemorySize();
 
-void GrResourceCache::purgeInvalidated() {
-    SkTDArray<GrResourceInvalidatedMessage> invalidated;
-    fInvalidationInbox.poll(&invalidated);
-
-    for (int i = 0; i < invalidated.count(); i++) {
-        // We're somewhat missing an opportunity here.  We could use the
-        // default find functor that gives us back resources whether we own
-        // them exclusively or not, and when they're not exclusively owned mark
-        // them for purging later when they do become exclusively owned.
-        //
-        // This is complicated and confusing.  May try this in the future.  For
-        // now, these resources are just LRU'd as if we never got the message.
-        while (GrResourceCacheEntry* entry = fCache.find(invalidated[i].key, GrTFindUnreffedFunctor())) {
-            this->deleteResource(entry);
-        }
-    }
-}
-
-void GrResourceCache::deleteResource(GrResourceCacheEntry* entry) {
-    SkASSERT(entry->fResource->unique());
-
-    // remove from our cache
-    fCache.remove(entry->key(), entry);
-
-    // remove from our llist
-    this->internalDetach(entry);
-    delete entry;
-}
-
-void GrResourceCache::internalPurge(int extraCount, size_t extraBytes) {
-    SkASSERT(fPurging);
-
-    bool withinBudget = false;
-    bool changed = false;
-
-    // The purging process is repeated several times since one pass
-    // may free up other resources
-    do {
-        EntryList::Iter iter;
-
-        changed = false;
-
-        // Note: the following code relies on the fact that the
-        // doubly linked list doesn't invalidate its data/pointers
-        // outside of the specific area where a deletion occurs (e.g.,
-        // in internalDetach)
-        GrResourceCacheEntry* entry = iter.init(fList, EntryList::Iter::kTail_IterStart);
-
-        while (NULL != entry) {
-            GrAutoResourceCacheValidate atcv(this);
-
-            if ((fEntryCount+extraCount) <= fMaxCount &&
-                (fEntryBytes+extraBytes) <= fMaxBytes) {
-                withinBudget = true;
-                break;
+            if (!resource->isPurgeable()) {
+                ++fLocked;
             }
 
-            GrResourceCacheEntry* prev = iter.prev();
-            if (entry->fResource->unique()) {
-                changed = true;
-                this->deleteResource(entry);
+            if (resource->cacheAccess().isScratch()) {
+                SkASSERT(!resource->getUniqueKey().isValid());
+                ++fScratch;
+                SkASSERT(fScratchMap->countForKey(resource->resourcePriv().getScratchKey()));
+                SkASSERT(!resource->cacheAccess().isExternal());
+            } else if (resource->resourcePriv().getScratchKey().isValid()) {
+                SkASSERT(!resource->resourcePriv().isBudgeted() ||
+                         resource->getUniqueKey().isValid());
+                ++fCouldBeScratch;
+                SkASSERT(fScratchMap->countForKey(resource->resourcePriv().getScratchKey()));
+                SkASSERT(!resource->cacheAccess().isExternal());
+            }
+            const GrUniqueKey& uniqueKey = resource->getUniqueKey();
+            if (uniqueKey.isValid()) {
+                ++fContent;
+                SkASSERT(fUniqueHash->find(uniqueKey) == resource);
+                SkASSERT(!resource->cacheAccess().isExternal());
+                SkASSERT(resource->resourcePriv().isBudgeted());
+            }
+
+            if (resource->resourcePriv().isBudgeted()) {
+                ++fBudgetedCount;
+                fBudgetedBytes += resource->gpuMemorySize();
             }
-            entry = prev;
         }
-    } while (!withinBudget && changed);
-}
+    };
 
-void GrResourceCache::purgeAllUnlocked() {
-    GrAutoResourceCacheValidate atcv(this);
+    Stats stats(this);
 
-    // we can have one GrCacheable holding a lock on another
-    // so we don't want to just do a simple loop kicking each
-    // entry out. Instead change the budget and purge.
-
-    size_t savedMaxBytes = fMaxBytes;
-    int savedMaxCount = fMaxCount;
-    fMaxBytes = (size_t) -1;
-    fMaxCount = 0;
-    this->purgeAsNeeded();
-
-#ifdef SK_DEBUG
-    SkASSERT(fExclusiveList.countEntries() == fClientDetachedCount);
-    SkASSERT(countBytes(fExclusiveList) == fClientDetachedBytes);
-    if (!fCache.count()) {
-        // Items may have been detached from the cache (such as the backing
-        // texture for an SkGpuDevice). The above purge would not have removed
-        // them.
-        SkASSERT(fEntryCount == fClientDetachedCount);
-        SkASSERT(fEntryBytes == fClientDetachedBytes);
-        SkASSERT(fList.isEmpty());
+    for (int i = 0; i < fNonpurgeableResources.count(); ++i) {
+        SkASSERT(!fNonpurgeableResources[i]->isPurgeable() ||
+                 fNewlyPurgeableResourceForValidation == fNonpurgeableResources[i]);
+        SkASSERT(*fNonpurgeableResources[i]->cacheAccess().accessCacheIndex() == i);
+        SkASSERT(!fNonpurgeableResources[i]->wasDestroyed());
+        stats.update(fNonpurgeableResources[i]);
     }
-#endif
-
-    fMaxBytes = savedMaxBytes;
-    fMaxCount = savedMaxCount;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-#ifdef SK_DEBUG
-size_t GrResourceCache::countBytes(const EntryList& list) {
-    size_t bytes = 0;
-
-    EntryList::Iter iter;
-
-    const GrResourceCacheEntry* entry = iter.init(const_cast<EntryList&>(list),
-                                                  EntryList::Iter::kTail_IterStart);
-
-    for ( ; NULL != entry; entry = iter.prev()) {
-        bytes += entry->resource()->gpuMemorySize();
-    }
-    return bytes;
-}
-
-static bool both_zero_or_nonzero(int count, size_t bytes) {
-    return (count == 0 && bytes == 0) || (count > 0 && bytes > 0);
-}
-
-void GrResourceCache::validate() const {
-    fList.validate();
-    fExclusiveList.validate();
-    SkASSERT(both_zero_or_nonzero(fEntryCount, fEntryBytes));
-    SkASSERT(both_zero_or_nonzero(fClientDetachedCount, fClientDetachedBytes));
-    SkASSERT(fClientDetachedBytes <= fEntryBytes);
-    SkASSERT(fClientDetachedCount <= fEntryCount);
-    SkASSERT((fEntryCount - fClientDetachedCount) == fCache.count());
-
-    EntryList::Iter iter;
-
-    // check that the exclusively held entries are okay
-    const GrResourceCacheEntry* entry = iter.init(const_cast<EntryList&>(fExclusiveList),
-                                                  EntryList::Iter::kHead_IterStart);
-
-    for ( ; NULL != entry; entry = iter.next()) {
-        entry->validate();
+    for (int i = 0; i < fPurgeableQueue.count(); ++i) {
+        SkASSERT(fPurgeableQueue.at(i)->isPurgeable());
+        SkASSERT(*fPurgeableQueue.at(i)->cacheAccess().accessCacheIndex() == i);
+        SkASSERT(!fPurgeableQueue.at(i)->wasDestroyed());
+        stats.update(fPurgeableQueue.at(i));
     }
 
-    // check that the shareable entries are okay
-    entry = iter.init(const_cast<EntryList&>(fList), EntryList::Iter::kHead_IterStart);
-
-    int count = 0;
-    for ( ; NULL != entry; entry = iter.next()) {
-        entry->validate();
-        SkASSERT(fCache.find(entry->key()));
-        count += 1;
-    }
-    SkASSERT(count == fEntryCount - fClientDetachedCount);
-
-    size_t bytes = countBytes(fList);
-    SkASSERT(bytes == fEntryBytes  - fClientDetachedBytes);
-
-    bytes = countBytes(fExclusiveList);
-    SkASSERT(bytes == fClientDetachedBytes);
-
-    SkASSERT(fList.countEntries() == fEntryCount - fClientDetachedCount);
-
-    SkASSERT(fExclusiveList.countEntries() == fClientDetachedCount);
-}
-#endif // SK_DEBUG
-
+    SkASSERT(fCount == this->getResourceCount());
+    SkASSERT(fBudgetedCount <= fCount);
+    SkASSERT(fBudgetedBytes <= fBytes);
+    SkASSERT(stats.fBytes == fBytes);
+    SkASSERT(stats.fBudgetedBytes == fBudgetedBytes);
+    SkASSERT(stats.fBudgetedCount == fBudgetedCount);
 #if GR_CACHE_STATS
+    SkASSERT(fBudgetedHighWaterCount <= fHighWaterCount);
+    SkASSERT(fBudgetedHighWaterBytes <= fHighWaterBytes);
+    SkASSERT(fBytes <= fHighWaterBytes);
+    SkASSERT(fCount <= fHighWaterCount);
+    SkASSERT(fBudgetedBytes <= fBudgetedHighWaterBytes);
+    SkASSERT(fBudgetedCount <= fBudgetedHighWaterCount);
+#endif
+    SkASSERT(stats.fContent == fUniqueHash.count());
+    SkASSERT(stats.fScratch + stats.fCouldBeScratch == fScratchMap.count());
 
-void GrResourceCache::printStats() {
-    int locked = 0;
+    // This assertion is not currently valid because we can be in recursive notifyCntReachedZero()
+    // calls. This will be fixed when subresource registration is explicit.
+    // bool overBudget = budgetedBytes > fMaxBytes || budgetedCount > fMaxCount;
+    // SkASSERT(!overBudget || locked == count || fPurging);
+}
 
-    EntryList::Iter iter;
-
-    GrResourceCacheEntry* entry = iter.init(fList, EntryList::Iter::kTail_IterStart);
-
-    for ( ; NULL != entry; entry = iter.prev()) {
-        if (entry->fResource->getRefCnt() > 1) {
-            ++locked;
-        }
+bool GrResourceCache::isInCache(const GrGpuResource* resource) const {
+    int index = *resource->cacheAccess().accessCacheIndex();
+    if (index < 0) {
+        return false;
     }
-
-    SkDebugf("Budget: %d items %d bytes\n", fMaxCount, fMaxBytes);
-    SkDebugf("\t\tEntry Count: current %d (%d locked) high %d\n",
-                fEntryCount, locked, fHighWaterEntryCount);
-    SkDebugf("\t\tEntry Bytes: current %d high %d\n",
-                fEntryBytes, fHighWaterEntryBytes);
-    SkDebugf("\t\tDetached Entry Count: current %d high %d\n",
-                fClientDetachedCount, fHighWaterClientDetachedCount);
-    SkDebugf("\t\tDetached Bytes: current %d high %d\n",
-                fClientDetachedBytes, fHighWaterClientDetachedBytes);
+    if (index < fPurgeableQueue.count() && fPurgeableQueue.at(index) == resource) {
+        return true;
+    }
+    if (index < fNonpurgeableResources.count() && fNonpurgeableResources[index] == resource) {
+        return true;
+    }
+    SkDEBUGFAIL("Resource index should be -1 or the resource should be in the cache.");
+    return false;
 }
 
 #endif
-
-///////////////////////////////////////////////////////////////////////////////
diff --git a/gfx/skia/skia/src/gpu/GrResourceCache.h b/gfx/skia/skia/src/gpu/GrResourceCache.h
index 235b11a394b7..a495f565b299 100644
--- a/gfx/skia/skia/src/gpu/GrResourceCache.h
+++ b/gfx/skia/skia/src/gpu/GrResourceCache.h
@@ -1,403 +1,440 @@
 
 /*
- * Copyright 2011 Google Inc.
+ * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
-
-
 #ifndef GrResourceCache_DEFINED
 #define GrResourceCache_DEFINED
 
-#include "GrConfig.h"
-#include "GrTypes.h"
-#include "SkTMultiMap.h"
-#include "GrBinHashKey.h"
+#include "GrGpuResource.h"
+#include "GrGpuResourceCacheAccess.h"
+#include "GrGpuResourcePriv.h"
+#include "GrResourceKey.h"
 #include "SkMessageBus.h"
+#include "SkRefCnt.h"
+#include "SkTArray.h"
+#include "SkTDPQueue.h"
 #include "SkTInternalLList.h"
+#include "SkTMultiMap.h"
 
-class GrGpuResource;
-class GrResourceCache;
-class GrResourceCacheEntry;
-
-class GrResourceKey {
-public:
-    static GrCacheID::Domain ScratchDomain() {
-        static const GrCacheID::Domain gDomain = GrCacheID::GenerateDomain();
-        return gDomain;
-    }
-
-    /** Uniquely identifies the GrGpuResource subclass in the key to avoid collisions
-        across resource types. */
-    typedef uint8_t ResourceType;
-
-    /** Flags set by the GrGpuResource subclass. */
-    typedef uint8_t ResourceFlags;
-
-    /** Generate a unique ResourceType */
-    static ResourceType GenerateResourceType();
-
-    /** Creates a key for resource */
-    GrResourceKey(const GrCacheID& id, ResourceType type, ResourceFlags flags) {
-        this->init(id.getDomain(), id.getKey(), type, flags);
-    };
-
-    GrResourceKey(const GrResourceKey& src) {
-        fKey = src.fKey;
-    }
-
-    GrResourceKey() {
-        fKey.reset();
-    }
-
-    void reset(const GrCacheID& id, ResourceType type, ResourceFlags flags) {
-        this->init(id.getDomain(), id.getKey(), type, flags);
-    }
-
-    uint32_t getHash() const {
-        return fKey.getHash();
-    }
-
-    bool isScratch() const {
-        return ScratchDomain() ==
-            *reinterpret_cast<const GrCacheID::Domain*>(fKey.getData() +
-                                                        kCacheIDDomainOffset);
-    }
-
-    ResourceType getResourceType() const {
-        return *reinterpret_cast<const ResourceType*>(fKey.getData() +
-                                                      kResourceTypeOffset);
-    }
-
-    ResourceFlags getResourceFlags() const {
-        return *reinterpret_cast<const ResourceFlags*>(fKey.getData() +
-                                                       kResourceFlagsOffset);
-    }
-
-    bool operator==(const GrResourceKey& other) const { return fKey == other.fKey; }
-
-private:
-    enum {
-        kCacheIDKeyOffset = 0,
-        kCacheIDDomainOffset = kCacheIDKeyOffset + sizeof(GrCacheID::Key),
-        kResourceTypeOffset = kCacheIDDomainOffset + sizeof(GrCacheID::Domain),
-        kResourceFlagsOffset = kResourceTypeOffset + sizeof(ResourceType),
-        kPadOffset = kResourceFlagsOffset + sizeof(ResourceFlags),
-        kKeySize = SkAlign4(kPadOffset),
-        kPadSize = kKeySize - kPadOffset
-    };
-
-    void init(const GrCacheID::Domain domain,
-              const GrCacheID::Key& key,
-              ResourceType type,
-              ResourceFlags flags) {
-        union {
-            uint8_t  fKey8[kKeySize];
-            uint32_t fKey32[kKeySize / 4];
-        } keyData;
-
-        uint8_t* k = keyData.fKey8;
-        memcpy(k + kCacheIDKeyOffset, key.fData8, sizeof(GrCacheID::Key));
-        memcpy(k + kCacheIDDomainOffset, &domain, sizeof(GrCacheID::Domain));
-        memcpy(k + kResourceTypeOffset, &type, sizeof(ResourceType));
-        memcpy(k + kResourceFlagsOffset, &flags, sizeof(ResourceFlags));
-        memset(k + kPadOffset, 0, kPadSize);
-        fKey.setKeyData(keyData.fKey32);
-    }
-    GrBinHashKey<kKeySize> fKey;
-};
-
-// The cache listens for these messages to purge junk resources proactively.
-struct GrResourceInvalidatedMessage {
-    GrResourceKey key;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
-class GrResourceCacheEntry {
-public:
-    GrGpuResource* resource() const { return fResource; }
-    const GrResourceKey& key() const { return fKey; }
-
-    static const GrResourceKey& GetKey(const GrResourceCacheEntry& e) { return e.key(); }
-    static uint32_t Hash(const GrResourceKey& key) { return key.getHash(); }
-#ifdef SK_DEBUG
-    void validate() const;
-#else
-    void validate() const {}
-#endif
-
-    /**
-     *  Update the cached size for this entry and inform the resource cache that
-     *  it has changed. Usually invoked from GrGpuResource::didChangeGpuMemorySize,
-     *  not directly from here.
-     */
-    void didChangeResourceSize();
-
-private:
-    GrResourceCacheEntry(GrResourceCache* resourceCache,
-                         const GrResourceKey& key,
-                         GrGpuResource* resource);
-    ~GrResourceCacheEntry();
-
-    GrResourceCache* fResourceCache;
-    GrResourceKey    fKey;
-    GrGpuResource*   fResource;
-    size_t           fCachedSize;
-    bool             fIsExclusive;
-
-    // Linked list for the LRU ordering.
-    SK_DECLARE_INTERNAL_LLIST_INTERFACE(GrResourceCacheEntry);
-
-    friend class GrResourceCache;
-};
-
-///////////////////////////////////////////////////////////////////////////////
+class GrCaps;
+class SkString;
+class SkTraceMemoryDump;
 
 /**
- *  Cache of GrGpuResource objects.
+ * Manages the lifetime of all GrGpuResource instances.
  *
- *  These have a corresponding GrResourceKey, built from 128bits identifying the
- *  resource. Multiple resources can map to same GrResourceKey.
+ * Resources may have optionally have two types of keys:
+ *      1) A scratch key. This is for resources whose allocations are cached but not their contents.
+ *         Multiple resources can share the same scratch key. This is so a caller can have two
+ *         resource instances with the same properties (e.g. multipass rendering that ping-pongs
+ *         between two temporary surfaces). The scratch key is set at resource creation time and
+ *         should never change. Resources need not have a scratch key.
+ *      2) A unique key. This key's meaning is specific to the domain that created the key. Only one
+ *         resource may have a given unique key. The unique key can be set, cleared, or changed
+ *         anytime after resource creation.
  *
- *  The cache stores the entries in a double-linked list, which is its LRU.
- *  When an entry is "locked" (i.e. given to the caller), it is moved to the
- *  head of the list. If/when we must purge some of the entries, we walk the
- *  list backwards from the tail, since those are the least recently used.
+ * A unique key always takes precedence over a scratch key when a resource has both types of keys.
+ * If a resource has neither key type then it will be deleted as soon as the last reference to it
+ * is dropped.
  *
- *  For fast searches, we maintain a hash map based on the GrResourceKey.
- *
- *  It is a goal to make the GrResourceCache the central repository and bookkeeper
- *  of all resources. It should replace the linked list of GrGpuResources that
- *  GrGpu uses to call abandon/release.
+ * When proactive purging is enabled, on every flush, the timestamp of that flush is stored in a
+ * n-sized ring buffer. When purging occurs each purgeable resource's timestamp is compared to the
+ * timestamp of the n-th prior flush. If the resource's last use timestamp is older than the old
+ * flush then the resource is proactively purged even when the cache is under budget. By default
+ * this feature is disabled, though it can be enabled by calling GrResourceCache::setLimits.
  */
 class GrResourceCache {
 public:
-    GrResourceCache(int maxCount, size_t maxBytes);
+    GrResourceCache(const GrCaps* caps);
     ~GrResourceCache();
 
-    /**
-     *  Return the current resource cache limits.
-     *
-     *  @param maxResource If non-null, returns maximum number of resources
-     *                     that can be held in the cache.
-     *  @param maxBytes    If non-null, returns maximum number of bytes of
-     *                     gpu memory that can be held in the cache.
-     */
-    void getLimits(int* maxResources, size_t* maxBytes) const;
+    // Default maximum number of budgeted resources in the cache.
+    static const int    kDefaultMaxCount            = 2 * (1 << 12);
+    // Default maximum number of bytes of gpu memory of budgeted resources in the cache.
+    static const size_t kDefaultMaxSize             = 96 * (1 << 20);
+    // Default number of flushes a budgeted resources can go unused in the cache before it is
+    // purged. Large values disable the feature (as the ring buffer of flush timestamps would be
+    // large). This is currently the default until we decide to enable this feature
+    // of the cache by default.
+    static const int    kDefaultMaxUnusedFlushes    = 1024;
+
+    /** Used to access functionality needed by GrGpuResource for lifetime management. */
+    class ResourceAccess;
+    ResourceAccess resourceAccess();
 
     /**
-     *  Specify the resource cache limits. If the current cache exceeds either
-     *  of these, it will be purged (LRU) to keep the cache within these limits.
-     *
-     *  @param maxResources The maximum number of resources that can be held in
-     *                      the cache.
-     *  @param maxBytes     The maximum number of bytes of resource memory that
-     *                      can be held in the cache.
+     * Sets the cache limits in terms of number of resources, max gpu memory byte size, and number
+     * of GrContext flushes that a resource can be unused before it is evicted. The latter value is
+     * a suggestion and there is no promise that a resource will be purged immediately after it
+     * hasn't been used in maxUnusedFlushes flushes.
      */
-    void setLimits(int maxResources, size_t maxResourceBytes);
+    void setLimits(int count, size_t bytes, int maxUnusedFlushes = kDefaultMaxUnusedFlushes);
 
     /**
-     *  The callback function used by the cache when it is still over budget
-     *  after a purge. The passed in 'data' is the same 'data' handed to
-     *  setOverbudgetCallback. The callback returns true if some resources
-     *  have been freed.
+     * Returns the number of resources.
      */
-    typedef bool (*PFOverbudgetCB)(void* data);
-
-    /**
-     *  Set the callback the cache should use when it is still over budget
-     *  after a purge. The 'data' provided here will be passed back to the
-     *  callback. Note that the cache will attempt to purge any resources newly
-     *  freed by the callback.
-     */
-    void setOverbudgetCallback(PFOverbudgetCB overbudgetCB, void* data) {
-        fOverbudgetCB = overbudgetCB;
-        fOverbudgetData = data;
+    int getResourceCount() const {
+        return fPurgeableQueue.count() + fNonpurgeableResources.count();
     }
 
+    /**
+     * Returns the number of resources that count against the budget.
+     */
+    int getBudgetedResourceCount() const { return fBudgetedCount; }
+
+    /**
+     * Returns the number of bytes consumed by resources.
+     */
+    size_t getResourceBytes() const { return fBytes; }
+
+    /**
+     * Returns the number of bytes consumed by budgeted resources.
+     */
+    size_t getBudgetedResourceBytes() const { return fBudgetedBytes; }
+
+    /**
+     * Returns the cached resources count budget.
+     */
+    int getMaxResourceCount() const { return fMaxCount; }
+
     /**
      * Returns the number of bytes consumed by cached resources.
      */
-    size_t getCachedResourceBytes() const { return fEntryBytes; }
+    size_t getMaxResourceBytes() const { return fMaxBytes; }
 
     /**
-     * Returns the number of cached resources.
+     * Abandons the backend API resources owned by all GrGpuResource objects and removes them from
+     * the cache.
      */
-    int getCachedResourceCount() const { return fEntryCount; }
+    void abandonAll();
 
-    // For a found or added resource to be completely exclusive to the caller
-    // both the kNoOtherOwners and kHide flags need to be specified
-    enum OwnershipFlags {
-        kNoOtherOwners_OwnershipFlag = 0x1, // found/added resource has no other owners
-        kHide_OwnershipFlag = 0x2  // found/added resource is hidden from future 'find's
+    /**
+     * Releases the backend API resources owned by all GrGpuResource objects and removes them from
+     * the cache.
+     */
+    void releaseAll();
+
+    enum {
+        /** Preferentially returns scratch resources with no pending IO. */
+        kPreferNoPendingIO_ScratchFlag = 0x1,
+        /** Will not return any resources that match but have pending IO. */
+        kRequireNoPendingIO_ScratchFlag = 0x2,
     };
 
     /**
-     *  Search for an entry with the same Key. If found, return it.
-     *  If not found, return null.
-     *  If ownershipFlags includes kNoOtherOwners and a resource is returned
-     *  then that resource has no other refs to it.
-     *  If ownershipFlags includes kHide and a resource is returned then that
-     *  resource will not be returned from future 'find' calls until it is
-     *  'freed' (and recycled) or makeNonExclusive is called.
-     *  For a resource to be completely exclusive to a caller both kNoOtherOwners
-     *  and kHide must be specified.
+     * Find a resource that matches a scratch key.
      */
-    GrGpuResource* find(const GrResourceKey& key,
-                        uint32_t ownershipFlags = 0);
+    GrGpuResource* findAndRefScratchResource(const GrScratchKey& scratchKey,
+                                             size_t resourceSize,
+                                             uint32_t flags);
+    
+#ifdef SK_DEBUG
+    // This is not particularly fast and only used for validation, so debug only.
+    int countScratchEntriesForKey(const GrScratchKey& scratchKey) const {
+        return fScratchMap.countForKey(scratchKey);
+    }
+#endif
 
     /**
-     *  Add the new resource to the cache (by creating a new cache entry based
-     *  on the provided key and resource).
-     *
-     *  Ownership of the resource is transferred to the resource cache,
-     *  which will unref() it when it is purged or deleted.
-     *
-     *  If ownershipFlags includes kHide, subsequent calls to 'find' will not
-     *  return 'resource' until it is 'freed' (and recycled) or makeNonExclusive
-     *  is called.
+     * Find a resource that matches a unique key.
      */
-    void addResource(const GrResourceKey& key,
-                     GrGpuResource* resource,
-                     uint32_t ownershipFlags = 0);
+    GrGpuResource* findAndRefUniqueResource(const GrUniqueKey& key) {
+        GrGpuResource* resource = fUniqueHash.find(key);
+        if (resource) {
+            this->refAndMakeResourceMRU(resource);
+        }
+        return resource;
+    }
 
     /**
-     * Determines if the cache contains an entry matching a key. If a matching
-     * entry exists but was detached then it will not be found.
+     * Query whether a unique key exists in the cache.
      */
-    bool hasKey(const GrResourceKey& key) const { return NULL != fCache.find(key); }
+    bool hasUniqueKey(const GrUniqueKey& key) const {
+        return SkToBool(fUniqueHash.find(key));
+    }
 
-    /**
-     * Hide 'entry' so that future searches will not find it. Such
-     * hidden entries will not be purged. The entry still counts against
-     * the cache's budget and should be made non-exclusive when exclusive access
-     * is no longer needed.
-     */
-    void makeExclusive(GrResourceCacheEntry* entry);
+    /** Purges resources to become under budget and processes resources with invalidated unique
+        keys. */
+    void purgeAsNeeded();
 
-    /**
-     * Restore 'entry' so that it can be found by future searches. 'entry'
-     * will also be purgeable (provided its lock count is now 0.)
-     */
-    void makeNonExclusive(GrResourceCacheEntry* entry);
-
-    /**
-     * Notify the cache that the size of a resource has changed.
-     */
-    void didIncreaseResourceSize(const GrResourceCacheEntry*, size_t amountInc);
-    void didDecreaseResourceSize(const GrResourceCacheEntry*, size_t amountDec);
-
-    /**
-     * Remove a resource from the cache and delete it!
-     */
-    void deleteResource(GrResourceCacheEntry* entry);
-
-    /**
-     * Removes every resource in the cache that isn't locked.
-     */
+    /** Purges all resources that don't have external owners. */
     void purgeAllUnlocked();
 
     /**
-     * Allow cache to purge unused resources to obey resource limitations
-     * Note: this entry point will be hidden (again) once totally ref-driven
-     * cache maintenance is implemented. Note that the overbudget callback
-     * will be called if the initial purge doesn't get the cache under
-     * its budget.
-     *
-     * extraCount and extraBytes are added to the current resource allocation
-     * to make sure enough room is available for future additions (e.g,
-     * 10MB across 10 textures is about to be added).
+     * The callback function used by the cache when it is still over budget after a purge. The
+     * passed in 'data' is the same 'data' handed to setOverbudgetCallback.
      */
-    void purgeAsNeeded(int extraCount = 0, size_t extraBytes = 0);
+    typedef void (*PFOverBudgetCB)(void* data);
+
+    /**
+     * Set the callback the cache should use when it is still over budget after a purge. The 'data'
+     * provided here will be passed back to the callback. Note that the cache will attempt to purge
+     * any resources newly freed by the callback.
+     */
+    void setOverBudgetCallback(PFOverBudgetCB overBudgetCB, void* data) {
+        fOverBudgetCB = overBudgetCB;
+        fOverBudgetData = data;
+    }
+
+    void notifyFlushOccurred();
+
+#if GR_CACHE_STATS
+    struct Stats {
+        int fTotal;
+        int fNumPurgeable;
+        int fNumNonPurgeable;
+
+        int fScratch;
+        int fExternal;
+        int fBorrowed;
+        int fAdopted;
+        size_t fUnbudgetedSize;
+
+        Stats() { this->reset(); }
+
+        void reset() {
+            fTotal = 0;
+            fNumPurgeable = 0;
+            fNumNonPurgeable = 0;
+            fScratch = 0;
+            fExternal = 0;
+            fBorrowed = 0;
+            fAdopted = 0;
+            fUnbudgetedSize = 0;
+        }
+
+        void update(GrGpuResource* resource) {
+            if (resource->cacheAccess().isScratch()) {
+                ++fScratch;
+            }
+            if (resource->cacheAccess().isExternal()) {
+                ++fExternal;
+            }
+            if (resource->cacheAccess().isBorrowed()) {
+                ++fBorrowed;
+            }
+            if (resource->cacheAccess().isAdopted()) {
+                ++fAdopted;
+            }
+            if (!resource->resourcePriv().isBudgeted()) {
+                fUnbudgetedSize += resource->gpuMemorySize();
+            }
+        }
+    };
+
+    void getStats(Stats*) const;
+
+    void dumpStats(SkString*) const;
+
+    void dumpStatsKeyValuePairs(SkTArray<SkString>* keys, SkTArray<double>* value) const;
+#endif
+
+    // This function is for unit testing and is only defined in test tools.
+    void changeTimestamp(uint32_t newTimestamp);
+
+    // Enumerates all cached resources and dumps their details to traceMemoryDump.
+    void dumpMemoryStatistics(SkTraceMemoryDump* traceMemoryDump) const;
+
+private:
+    ///////////////////////////////////////////////////////////////////////////
+    /// @name Methods accessible via ResourceAccess
+    ////
+    void insertResource(GrGpuResource*);
+    void removeResource(GrGpuResource*);
+    void notifyCntReachedZero(GrGpuResource*, uint32_t flags);
+    void didChangeGpuMemorySize(const GrGpuResource*, size_t oldSize);
+    void changeUniqueKey(GrGpuResource*, const GrUniqueKey&);
+    void removeUniqueKey(GrGpuResource*);
+    void willRemoveScratchKey(const GrGpuResource*);
+    void didChangeBudgetStatus(GrGpuResource*);
+    void refAndMakeResourceMRU(GrGpuResource*);
+    /// @}
+
+    void resetFlushTimestamps();
+    void processInvalidUniqueKeys(const SkTArray<GrUniqueKeyInvalidatedMessage>&);
+    void addToNonpurgeableArray(GrGpuResource*);
+    void removeFromNonpurgeableArray(GrGpuResource*);
+    bool overBudget() const { return fBudgetedBytes > fMaxBytes || fBudgetedCount > fMaxCount; }
+
+    bool wouldFit(size_t bytes) {
+        return fBudgetedBytes+bytes <= fMaxBytes && fBudgetedCount+1 <= fMaxCount;    
+    }
+
+    uint32_t getNextTimestamp();
 
 #ifdef SK_DEBUG
+    bool isInCache(const GrGpuResource* r) const;
     void validate() const;
 #else
     void validate() const {}
 #endif
 
-#if GR_CACHE_STATS
-    void printStats();
-#endif
+    class AutoValidate;
 
-private:
-    enum BudgetBehaviors {
-        kAccountFor_BudgetBehavior,
-        kIgnore_BudgetBehavior
+    class AvailableForScratchUse;
+
+    struct ScratchMapTraits {
+        static const GrScratchKey& GetKey(const GrGpuResource& r) {
+            return r.resourcePriv().getScratchKey();
+        }
+
+        static uint32_t Hash(const GrScratchKey& key) { return key.hash(); }
     };
+    typedef SkTMultiMap<GrGpuResource, GrScratchKey, ScratchMapTraits> ScratchMap;
 
-    void internalDetach(GrResourceCacheEntry*, BudgetBehaviors behavior = kAccountFor_BudgetBehavior);
-    void attachToHead(GrResourceCacheEntry*, BudgetBehaviors behavior = kAccountFor_BudgetBehavior);
+    struct UniqueHashTraits {
+        static const GrUniqueKey& GetKey(const GrGpuResource& r) { return r.getUniqueKey(); }
 
-    void removeInvalidResource(GrResourceCacheEntry* entry);
+        static uint32_t Hash(const GrUniqueKey& key) { return key.hash(); }
+    };
+    typedef SkTDynamicHash<GrGpuResource, GrUniqueKey, UniqueHashTraits> UniqueHash;
 
-    SkTMultiMap<GrResourceCacheEntry, GrResourceKey> fCache;
+    static bool CompareTimestamp(GrGpuResource* const& a, GrGpuResource* const& b) {
+        return a->cacheAccess().timestamp() < b->cacheAccess().timestamp();
+    }
 
-    // We're an internal doubly linked list
-    typedef SkTInternalLList<GrResourceCacheEntry> EntryList;
-    EntryList      fList;
+    static int* AccessResourceIndex(GrGpuResource* const& res) {
+        return res->cacheAccess().accessCacheIndex();
+    }
 
-#ifdef SK_DEBUG
-    // These objects cannot be returned by a search
-    EntryList      fExclusiveList;
-#endif
+    typedef SkMessageBus<GrUniqueKeyInvalidatedMessage>::Inbox InvalidUniqueKeyInbox;
+    typedef SkTDPQueue<GrGpuResource*, CompareTimestamp, AccessResourceIndex> PurgeableQueue;
+    typedef SkTDArray<GrGpuResource*> ResourceArray;
+
+    // Whenever a resource is added to the cache or the result of a cache lookup, fTimestamp is
+    // assigned as the resource's timestamp and then incremented. fPurgeableQueue orders the
+    // purgeable resources by this value, and thus is used to purge resources in LRU order.
+    uint32_t                            fTimestamp;
+    PurgeableQueue                      fPurgeableQueue;
+    ResourceArray                       fNonpurgeableResources;
+
+    // This map holds all resources that can be used as scratch resources.
+    ScratchMap                          fScratchMap;
+    // This holds all resources that have unique keys.
+    UniqueHash                          fUniqueHash;
 
     // our budget, used in purgeAsNeeded()
-    int            fMaxCount;
-    size_t         fMaxBytes;
+    int                                 fMaxCount;
+    size_t                              fMaxBytes;
+    int                                 fMaxUnusedFlushes;
 
-    // our current stats, related to our budget
 #if GR_CACHE_STATS
-    int            fHighWaterEntryCount;
-    size_t         fHighWaterEntryBytes;
-    int            fHighWaterClientDetachedCount;
-    size_t         fHighWaterClientDetachedBytes;
+    int                                 fHighWaterCount;
+    size_t                              fHighWaterBytes;
+    int                                 fBudgetedHighWaterCount;
+    size_t                              fBudgetedHighWaterBytes;
 #endif
 
-    int            fEntryCount;
-    size_t         fEntryBytes;
-    int            fClientDetachedCount;
-    size_t         fClientDetachedBytes;
+    // our current stats for all resources
+    SkDEBUGCODE(int                     fCount;)
+    size_t                              fBytes;
 
-    // prevents recursive purging
-    bool           fPurging;
+    // our current stats for resources that count against the budget
+    int                                 fBudgetedCount;
+    size_t                              fBudgetedBytes;
 
-    PFOverbudgetCB fOverbudgetCB;
-    void*          fOverbudgetData;
+    PFOverBudgetCB                      fOverBudgetCB;
+    void*                               fOverBudgetData;
 
-    void internalPurge(int extraCount, size_t extraBytes);
+    // We keep track of the "timestamps" of the last n flushes. If a resource hasn't been used in
+    // that time then we well preemptively purge it to reduce memory usage.
+    uint32_t*                           fFlushTimestamps;
+    int                                 fLastFlushTimestampIndex;
 
-    // Listen for messages that a resource has been invalidated and purge cached junk proactively.
-    SkMessageBus<GrResourceInvalidatedMessage>::Inbox fInvalidationInbox;
-    void purgeInvalidated();
+    InvalidUniqueKeyInbox               fInvalidUniqueKeyInbox;
 
-#ifdef SK_DEBUG
-    static size_t countBytes(const SkTInternalLList<GrResourceCacheEntry>& list);
-#endif
+    // This resource is allowed to be in the nonpurgeable array for the sake of validate() because
+    // we're in the midst of converting it to purgeable status.
+    SkDEBUGCODE(GrGpuResource*          fNewlyPurgeableResourceForValidation;)
+
+    bool                                fPreferVRAMUseOverFlushes;
 };
 
-///////////////////////////////////////////////////////////////////////////////
+class GrResourceCache::ResourceAccess {
+private:
+    ResourceAccess(GrResourceCache* cache) : fCache(cache) { }
+    ResourceAccess(const ResourceAccess& that) : fCache(that.fCache) { }
+    ResourceAccess& operator=(const ResourceAccess&); // unimpl
 
-#ifdef SK_DEBUG
-    class GrAutoResourceCacheValidate {
-    public:
-        GrAutoResourceCacheValidate(GrResourceCache* cache) : fCache(cache) {
-            cache->validate();
-        }
-        ~GrAutoResourceCacheValidate() {
-            fCache->validate();
-        }
-    private:
-        GrResourceCache* fCache;
+    /**
+     * Insert a resource into the cache.
+     */
+    void insertResource(GrGpuResource* resource) { fCache->insertResource(resource); }
+
+    /**
+     * Removes a resource from the cache.
+     */
+    void removeResource(GrGpuResource* resource) { fCache->removeResource(resource); }
+
+    /**
+     * Notifications that should be sent to the cache when the ref/io cnt status of resources
+     * changes.
+     */
+    enum RefNotificationFlags {
+        /** All types of refs on the resource have reached zero. */
+        kAllCntsReachedZero_RefNotificationFlag = 0x1,
+        /** The normal (not pending IO type) ref cnt has reached zero. */
+        kRefCntReachedZero_RefNotificationFlag  = 0x2,
     };
-#else
-    class GrAutoResourceCacheValidate {
-    public:
-        GrAutoResourceCacheValidate(GrResourceCache*) {}
-    };
-#endif
+    /**
+     * Called by GrGpuResources when they detect that their ref/io cnts have reached zero. When the
+     * normal ref cnt reaches zero the flags that are set should be:
+     *     a) kRefCntReachedZero if a pending IO cnt is still non-zero.
+     *     b) (kRefCntReachedZero | kAllCntsReachedZero) when all pending IO cnts are also zero.
+     * kAllCntsReachedZero is set by itself if a pending IO cnt is decremented to zero and all the
+     * the other cnts are already zero.
+     */
+    void notifyCntReachedZero(GrGpuResource* resource, uint32_t flags) {
+        fCache->notifyCntReachedZero(resource, flags);
+    }
+
+    /**
+     * Called by GrGpuResources when their sizes change.
+     */
+    void didChangeGpuMemorySize(const GrGpuResource* resource, size_t oldSize) {
+        fCache->didChangeGpuMemorySize(resource, oldSize);
+    }
+
+    /**
+     * Called by GrGpuResources to change their unique keys.
+     */
+    void changeUniqueKey(GrGpuResource* resource, const GrUniqueKey& newKey) {
+         fCache->changeUniqueKey(resource, newKey);
+    }
+
+    /**
+     * Called by a GrGpuResource to remove its unique key.
+     */
+    void removeUniqueKey(GrGpuResource* resource) { fCache->removeUniqueKey(resource); }
+
+    /**
+     * Called by a GrGpuResource when it removes its scratch key.
+     */
+    void willRemoveScratchKey(const GrGpuResource* resource) {
+        fCache->willRemoveScratchKey(resource);
+    }
+
+    /**
+     * Called by GrGpuResources when they change from budgeted to unbudgeted or vice versa.
+     */
+    void didChangeBudgetStatus(GrGpuResource* resource) { fCache->didChangeBudgetStatus(resource); }
+
+    // No taking addresses of this type.
+    const ResourceAccess* operator&() const;
+    ResourceAccess* operator&();
+
+    GrResourceCache* fCache;
+
+    friend class GrGpuResource; // To access all the proxy inline methods.
+    friend class GrResourceCache; // To create this type.
+};
+
+inline GrResourceCache::ResourceAccess GrResourceCache::resourceAccess() {
+    return ResourceAccess(this);
+}
 
 #endif
diff --git a/gfx/skia/skia/src/gpu/GrResourceProvider.cpp b/gfx/skia/skia/src/gpu/GrResourceProvider.cpp
new file mode 100644
index 000000000000..38213e626633
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrResourceProvider.cpp
@@ -0,0 +1,219 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrResourceProvider.h"
+
+#include "GrGpu.h"
+#include "GrIndexBuffer.h"
+#include "GrPathRendering.h"
+#include "GrRenderTarget.h"
+#include "GrRenderTargetPriv.h"
+#include "GrResourceCache.h"
+#include "GrResourceKey.h"
+#include "GrStencilAttachment.h"
+#include "GrVertexBuffer.h"
+
+GR_DECLARE_STATIC_UNIQUE_KEY(gQuadIndexBufferKey);
+
+GrResourceProvider::GrResourceProvider(GrGpu* gpu, GrResourceCache* cache) : INHERITED(gpu, cache) {
+    GR_DEFINE_STATIC_UNIQUE_KEY(gQuadIndexBufferKey);
+    fQuadIndexBufferKey = gQuadIndexBufferKey;
+}
+
+const GrIndexBuffer* GrResourceProvider::createInstancedIndexBuffer(const uint16_t* pattern,
+                                                                    int patternSize,
+                                                                    int reps,
+                                                                    int vertCount,
+                                                                    const GrUniqueKey& key) {
+    size_t bufferSize = patternSize * reps * sizeof(uint16_t);
+
+    // This is typically used in GrBatchs, so we assume kNoPendingIO.
+    GrIndexBuffer* buffer = this->createIndexBuffer(bufferSize, kStatic_BufferUsage,
+                                                    kNoPendingIO_Flag);
+    if (!buffer) {
+        return nullptr;
+    }
+    uint16_t* data = (uint16_t*) buffer->map();
+    bool useTempData = (nullptr == data);
+    if (useTempData) {
+        data = new uint16_t[reps * patternSize];
+    }
+    for (int i = 0; i < reps; ++i) {
+        int baseIdx = i * patternSize;
+        uint16_t baseVert = (uint16_t)(i * vertCount);
+        for (int j = 0; j < patternSize; ++j) {
+            data[baseIdx+j] = baseVert + pattern[j];
+        }
+    }
+    if (useTempData) {
+        if (!buffer->updateData(data, bufferSize)) {
+            buffer->unref();
+            return nullptr;
+        }
+        delete[] data;
+    } else {
+        buffer->unmap();
+    }
+    this->assignUniqueKeyToResource(key, buffer);
+    return buffer;
+}
+
+const GrIndexBuffer* GrResourceProvider::createQuadIndexBuffer() {
+    static const int kMaxQuads = 1 << 12; // max possible: (1 << 14) - 1;
+    GR_STATIC_ASSERT(4 * kMaxQuads <= 65535);
+    static const uint16_t kPattern[] = { 0, 1, 2, 0, 2, 3 };
+
+    return this->createInstancedIndexBuffer(kPattern, 6, kMaxQuads, 4, fQuadIndexBufferKey);
+}
+
+GrPath* GrResourceProvider::createPath(const SkPath& path, const GrStrokeInfo& stroke) {
+    SkASSERT(this->gpu()->pathRendering());
+    return this->gpu()->pathRendering()->createPath(path, stroke);
+}
+
+GrPathRange* GrResourceProvider::createPathRange(GrPathRange::PathGenerator* gen,
+                                                 const GrStrokeInfo& stroke) {
+    SkASSERT(this->gpu()->pathRendering());
+    return this->gpu()->pathRendering()->createPathRange(gen, stroke);
+}
+
+GrPathRange* GrResourceProvider::createGlyphs(const SkTypeface* tf, const SkDescriptor* desc,
+                                              const GrStrokeInfo& stroke) {
+
+    SkASSERT(this->gpu()->pathRendering());
+    return this->gpu()->pathRendering()->createGlyphs(tf, desc, stroke);
+}
+
+GrIndexBuffer* GrResourceProvider::createIndexBuffer(size_t size, BufferUsage usage,
+                                                     uint32_t flags) {
+    if (this->isAbandoned()) {
+        return nullptr;
+    }
+
+    bool noPendingIO = SkToBool(flags & kNoPendingIO_Flag);
+    bool dynamic = kDynamic_BufferUsage == usage;
+    if (dynamic) {
+        // bin by pow2 with a reasonable min
+        static const uint32_t MIN_SIZE = 1 << 12;
+        size = SkTMax(MIN_SIZE, GrNextPow2(SkToUInt(size)));
+
+        GrScratchKey key;
+        GrIndexBuffer::ComputeScratchKey(size, true, &key);
+        uint32_t scratchFlags = 0;
+        if (noPendingIO) {
+            scratchFlags = GrResourceCache::kRequireNoPendingIO_ScratchFlag;
+        } else {
+            scratchFlags = GrResourceCache::kPreferNoPendingIO_ScratchFlag;
+        }
+        GrGpuResource* resource = this->cache()->findAndRefScratchResource(key, size, scratchFlags);
+        if (resource) {
+            return static_cast<GrIndexBuffer*>(resource);
+        }
+    }
+    return this->gpu()->createIndexBuffer(size, dynamic);
+}
+
+GrVertexBuffer* GrResourceProvider::createVertexBuffer(size_t size, BufferUsage usage,
+                                                       uint32_t flags) {
+    if (this->isAbandoned()) {
+        return nullptr;
+    }
+
+    bool noPendingIO = SkToBool(flags & kNoPendingIO_Flag);
+    bool dynamic = kDynamic_BufferUsage == usage;
+    if (dynamic) {
+        // bin by pow2 with a reasonable min
+        static const uint32_t MIN_SIZE = 1 << 12;
+        size = SkTMax(MIN_SIZE, GrNextPow2(SkToUInt(size)));
+
+        GrScratchKey key;
+        GrVertexBuffer::ComputeScratchKey(size, true, &key);
+        uint32_t scratchFlags = 0;
+        if (noPendingIO) {
+            scratchFlags = GrResourceCache::kRequireNoPendingIO_ScratchFlag;
+        } else {
+            scratchFlags = GrResourceCache::kPreferNoPendingIO_ScratchFlag;
+        }
+        GrGpuResource* resource = this->cache()->findAndRefScratchResource(key, size, scratchFlags);
+        if (resource) {
+            return static_cast<GrVertexBuffer*>(resource);
+        }
+    }
+    return this->gpu()->createVertexBuffer(size, dynamic);
+}
+
+GrBatchAtlas* GrResourceProvider::createAtlas(GrPixelConfig config,
+                                              int width, int height,
+                                              int numPlotsX, int numPlotsY,
+                                              GrBatchAtlas::EvictionFunc func, void* data) {
+    GrSurfaceDesc desc;
+    desc.fFlags = kNone_GrSurfaceFlags;
+    desc.fWidth = width;
+    desc.fHeight = height;
+    desc.fConfig = config;
+
+    // We don't want to flush the context so we claim we're in the middle of flushing so as to
+    // guarantee we do not recieve a texture with pending IO
+    // TODO: Determine how to avoid having to do this. (https://bug.skia.org/4156)
+    static const uint32_t kFlags = GrResourceProvider::kNoPendingIO_Flag;
+    GrTexture* texture = this->createApproxTexture(desc, kFlags);
+    if (!texture) {
+        return nullptr;
+    }
+    GrBatchAtlas* atlas = new GrBatchAtlas(texture, numPlotsX, numPlotsY);
+    atlas->registerEvictionCallback(func, data);
+    return atlas;
+}
+
+GrStencilAttachment* GrResourceProvider::attachStencilAttachment(GrRenderTarget* rt) {
+    SkASSERT(rt);
+    if (rt->renderTargetPriv().getStencilAttachment()) {
+        return rt->renderTargetPriv().getStencilAttachment();
+    }
+
+    if (!rt->wasDestroyed() && rt->canAttemptStencilAttachment()) {
+        GrUniqueKey sbKey;
+
+        int width = rt->width();
+        int height = rt->height();
+#if 0
+        if (this->caps()->oversizedStencilSupport()) {
+            width  = SkNextPow2(width);
+            height = SkNextPow2(height);
+        }
+#endif
+        bool newStencil = false;
+        GrStencilAttachment::ComputeSharedStencilAttachmentKey(width, height,
+                                                               rt->numStencilSamples(), &sbKey);
+        GrStencilAttachment* stencil = static_cast<GrStencilAttachment*>(
+            this->findAndRefResourceByUniqueKey(sbKey));
+        if (!stencil) {
+            // Need to try and create a new stencil
+            stencil = this->gpu()->createStencilAttachmentForRenderTarget(rt, width, height);
+            if (stencil) {
+                stencil->resourcePriv().setUniqueKey(sbKey);
+                newStencil = true;
+            }
+        }
+        if (rt->renderTargetPriv().attachStencilAttachment(stencil)) {
+            if (newStencil) {
+                // Right now we're clearing the stencil attachment here after it is
+                // attached to a RT for the first time. When we start matching
+                // stencil buffers with smaller color targets this will no longer
+                // be correct because it won't be guaranteed to clear the entire
+                // sb.
+                // We used to clear down in the GL subclass using a special purpose
+                // FBO. But iOS doesn't allow a stencil-only FBO. It reports unsupported
+                // FBO status.
+                this->gpu()->clearStencil(rt);
+            }
+        }
+    }
+    return rt->renderTargetPriv().getStencilAttachment();
+}
+
+
diff --git a/gfx/skia/skia/src/gpu/GrResourceProvider.h b/gfx/skia/skia/src/gpu/GrResourceProvider.h
new file mode 100644
index 000000000000..6c5737191b8b
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrResourceProvider.h
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrResourceProvider_DEFINED
+#define GrResourceProvider_DEFINED
+
+#include "GrBatchAtlas.h"
+#include "GrIndexBuffer.h"
+#include "GrTextureProvider.h"
+#include "GrPathRange.h"
+
+class GrBatchAtlas;
+class GrIndexBuffer;
+class GrPath;
+class GrRenderTarget;
+class GrStencilAttachment;
+class GrStrokeInfo;
+class GrVertexBuffer;
+class SkDescriptor;
+class SkPath;
+class SkTypeface;
+
+/**
+ * An extension of the texture provider for arbitrary resource types. This class is intended for
+ * use within the Gr code base, not by clients or extensions (e.g. third party GrProcessor
+ * derivatives).
+ *
+ * This currently inherits from GrTextureProvider non-publically to force callers to provider
+ * make a flags (pendingIO) decision and not use the GrTP methods that don't take flags. This
+ * can be relaxed once https://bug.skia.org/4156 is fixed.
+ */
+class GrResourceProvider : protected GrTextureProvider {
+public:
+    GrResourceProvider(GrGpu* gpu, GrResourceCache* cache);
+
+    template <typename T> T* findAndRefTByUniqueKey(const GrUniqueKey& key) {
+        return static_cast<T*>(this->findAndRefResourceByUniqueKey(key));
+    }
+
+    /**
+     * Either finds and refs, or creates an index buffer for instanced drawing with a specific
+     * pattern if the index buffer is not found. If the return is non-null, the caller owns
+     * a ref on the returned GrIndexBuffer.
+     *
+     * @param pattern     the pattern of indices to repeat
+     * @param patternSize size in bytes of the pattern
+     * @param reps        number of times to repeat the pattern
+     * @param vertCount   number of vertices the pattern references
+     * @param key         Key to be assigned to the index buffer.
+     *
+     * @return The index buffer if successful, otherwise nullptr.
+     */
+    const GrIndexBuffer* findOrCreateInstancedIndexBuffer(const uint16_t* pattern,
+                                                          int patternSize,
+                                                          int reps,
+                                                          int vertCount,
+                                                          const GrUniqueKey& key) {
+        if (GrIndexBuffer* buffer = this->findAndRefTByUniqueKey<GrIndexBuffer>(key)) {
+            return buffer;
+        }
+        return this->createInstancedIndexBuffer(pattern, patternSize, reps, vertCount, key);
+    }
+
+    /**
+     * Returns an index buffer that can be used to render quads.
+     * Six indices per quad: 0, 1, 2, 0, 2, 3, etc.
+     * The max number of quads can be queried using GrIndexBuffer::maxQuads().
+     * Draw with kTriangles_GrPrimitiveType
+     * @ return the quad index buffer
+     */
+    const GrIndexBuffer* refQuadIndexBuffer() {
+        if (GrIndexBuffer* buffer =
+            this->findAndRefTByUniqueKey<GrIndexBuffer>(fQuadIndexBufferKey)) {
+            return buffer;
+        }
+        return this->createQuadIndexBuffer();
+    }
+
+    /**
+     * Factories for GrPath and GrPathRange objects. It's an error to call these if path rendering
+     * is not supported.
+     */
+    GrPath* createPath(const SkPath&, const GrStrokeInfo&);
+    GrPathRange* createPathRange(GrPathRange::PathGenerator*, const GrStrokeInfo&);
+    GrPathRange* createGlyphs(const SkTypeface*, const SkDescriptor*, const GrStrokeInfo&);
+
+    using GrTextureProvider::assignUniqueKeyToResource;
+    using GrTextureProvider::findAndRefResourceByUniqueKey;
+    using GrTextureProvider::findAndRefTextureByUniqueKey;
+    using GrTextureProvider::abandon;
+
+    enum Flags {
+        /** If the caller intends to do direct reads/writes to/from the CPU then this flag must be
+         *  set when accessing resources during a GrDrawTarget flush. This includes the execution of
+         *  GrBatch objects. The reason is that these memory operations are done immediately and
+         *  will occur out of order WRT the operations being flushed.
+         *  Make this automatic: https://bug.skia.org/4156
+         */
+        kNoPendingIO_Flag = kNoPendingIO_ScratchTextureFlag,
+    };
+
+    enum BufferUsage {
+        /** Caller intends to specify the buffer data rarely with respect to the number of draws
+            that read the data. */
+        kStatic_BufferUsage,
+        /** Caller intends to respecify the buffer data frequently between draws. */
+        kDynamic_BufferUsage,
+    };
+    GrIndexBuffer* createIndexBuffer(size_t size, BufferUsage, uint32_t flags);
+    GrVertexBuffer* createVertexBuffer(size_t size, BufferUsage, uint32_t flags);
+
+    GrTexture* createApproxTexture(const GrSurfaceDesc& desc, uint32_t flags) {
+        SkASSERT(0 == flags || kNoPendingIO_Flag == flags);
+        return this->internalCreateApproxTexture(desc, flags);
+    }
+
+    /**  Returns a GrBatchAtlas. This function can be called anywhere, but the returned atlas should
+     *   only be used inside of GrBatch::generateGeometry
+     *   @param GrPixelConfig    The pixel config which this atlas will store
+     *   @param width            width in pixels of the atlas
+     *   @param height           height in pixels of the atlas
+     *   @param numPlotsX        The number of plots the atlas should be broken up into in the X
+     *                           direction
+     *   @param numPlotsY        The number of plots the atlas should be broken up into in the Y
+     *                           direction
+     *   @param func             An eviction function which will be called whenever the atlas has to
+     *                           evict data
+     *   @param data             User supplied data which will be passed into func whenver an
+     *                           eviction occurs
+     *
+     *   @return                 An initialized GrBatchAtlas, or nullptr if creation fails
+     */
+    GrBatchAtlas* createAtlas(GrPixelConfig, int width, int height, int numPlotsX, int numPlotsY,
+                              GrBatchAtlas::EvictionFunc func, void* data);
+
+    /**
+     * If passed in render target already has a stencil buffer, return it. Otherwise attempt to
+     * attach one.
+     */
+    GrStencilAttachment* attachStencilAttachment(GrRenderTarget* rt);
+
+    const GrCaps* caps() { return this->gpu()->caps(); }
+
+private:
+    const GrIndexBuffer* createInstancedIndexBuffer(const uint16_t* pattern,
+                                                    int patternSize,
+                                                    int reps,
+                                                    int vertCount,
+                                                    const GrUniqueKey& key);
+
+    const GrIndexBuffer* createQuadIndexBuffer();
+
+    GrUniqueKey fQuadIndexBufferKey;
+
+    typedef GrTextureProvider INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrSWMaskHelper.cpp b/gfx/skia/skia/src/gpu/GrSWMaskHelper.cpp
index 547a05e79be8..6692e3d8333e 100644
--- a/gfx/skia/skia/src/gpu/GrSWMaskHelper.cpp
+++ b/gfx/skia/skia/src/gpu/GrSWMaskHelper.cpp
@@ -7,13 +7,14 @@
 
 #include "GrSWMaskHelper.h"
 
-#include "GrDrawState.h"
-#include "GrDrawTargetCaps.h"
+#include "GrPipelineBuilder.h"
+#include "GrCaps.h"
+#include "GrDrawTarget.h"
 #include "GrGpu.h"
 
 #include "SkData.h"
+#include "SkDistanceFieldGen.h"
 #include "SkStrokeRec.h"
-#include "SkTextureCompressor.h"
 
 // TODO: try to remove this #include
 #include "GrContext.h"
@@ -37,6 +38,65 @@ SkXfermode::Mode op_to_mode(SkRegion::Op op) {
     return modeMap[op];
 }
 
+static inline GrPixelConfig fmt_to_config(SkTextureCompressor::Format fmt) {
+
+    GrPixelConfig config;
+    switch (fmt) {
+        case SkTextureCompressor::kLATC_Format:
+            config = kLATC_GrPixelConfig;
+            break;
+
+        case SkTextureCompressor::kR11_EAC_Format:
+            config = kR11_EAC_GrPixelConfig;
+            break;
+
+        case SkTextureCompressor::kASTC_12x12_Format:
+            config = kASTC_12x12_GrPixelConfig;
+            break;
+
+        case SkTextureCompressor::kETC1_Format:
+            config = kETC1_GrPixelConfig;
+            break;
+
+        default:
+            SkDEBUGFAIL("No GrPixelConfig for compression format!");
+            // Best guess
+            config = kAlpha_8_GrPixelConfig;
+            break;
+    }
+
+    return config;
+}
+
+static bool choose_compressed_fmt(const GrCaps* caps,
+                                  SkTextureCompressor::Format *fmt) {
+    if (nullptr == fmt) {
+        return false;
+    }
+
+    // We can't use scratch textures without the ability to update
+    // compressed textures...
+    if (!(caps->compressedTexSubImageSupport())) {
+        return false;
+    }
+
+    // Figure out what our preferred texture type is. If ASTC is available, that always
+    // gives the biggest win. Otherwise, in terms of compression speed and accuracy,
+    // LATC has a slight edge over R11 EAC.
+    if (caps->isConfigTexturable(kASTC_12x12_GrPixelConfig)) {
+        *fmt = SkTextureCompressor::kASTC_12x12_Format;
+        return true;
+    } else if (caps->isConfigTexturable(kLATC_GrPixelConfig)) {
+        *fmt = SkTextureCompressor::kLATC_Format;
+        return true;
+    } else if (caps->isConfigTexturable(kR11_EAC_GrPixelConfig)) {
+        *fmt = SkTextureCompressor::kR11_EAC_Format;
+        return true;
+    }
+
+    return false;
+}
+
 }
 
 /**
@@ -48,6 +108,8 @@ void GrSWMaskHelper::draw(const SkRect& rect, SkRegion::Op op,
 
     SkXfermode* mode = SkXfermode::Create(op_to_mode(op));
 
+    SkASSERT(kNone_CompressionMode == fCompressionMode);
+
     paint.setXfermode(mode);
     paint.setAntiAlias(antiAlias);
     paint.setColor(SkColorSetARGB(alpha, alpha, alpha, alpha));
@@ -79,19 +141,29 @@ void GrSWMaskHelper::draw(const SkPath& path, const SkStrokeRec& stroke, SkRegio
     }
     paint.setAntiAlias(antiAlias);
 
+    SkTBlitterAllocator allocator;
+    SkBlitter* blitter = nullptr;
+    if (kBlitter_CompressionMode == fCompressionMode) {
+        SkASSERT(fCompressedBuffer.get());
+        blitter = SkTextureCompressor::CreateBlitterForFormat(
+            fPixels.width(), fPixels.height(), fCompressedBuffer.get(), &allocator,
+                                                              fCompressedFormat);
+    }
+
     if (SkRegion::kReplace_Op == op && 0xFF == alpha) {
         SkASSERT(0xFF == paint.getAlpha());
-        fDraw.drawPathCoverage(path, paint);
+        fDraw.drawPathCoverage(path, paint, blitter);
     } else {
         paint.setXfermodeMode(op_to_mode(op));
         paint.setColor(SkColorSetARGB(alpha, alpha, alpha, alpha));
-        fDraw.drawPath(path, paint);
+        fDraw.drawPath(path, paint, blitter);
     }
 }
 
 bool GrSWMaskHelper::init(const SkIRect& resultBounds,
-                          const SkMatrix* matrix) {
-    if (NULL != matrix) {
+                          const SkMatrix* matrix,
+                          bool allowCompression) {
+    if (matrix) {
         fMatrix = *matrix;
     } else {
         fMatrix.setIdentity();
@@ -102,96 +174,106 @@ bool GrSWMaskHelper::init(const SkIRect& resultBounds,
                           -resultBounds.fTop * SK_Scalar1);
     SkIRect bounds = SkIRect::MakeWH(resultBounds.width(),
                                      resultBounds.height());
-#if GR_COMPRESS_ALPHA_MASK
-    // Make sure that the width is a multiple of 16 so that we can use
-    // specialized SIMD instructions that compress 4 blocks at a time.
-    const int cmpWidth = (bounds.fRight + 15) & ~15;
-    const int cmpHeight = (bounds.fBottom + 3) & ~3;
-#else
-    const int cmpWidth = bounds.fRight;
-    const int cmpHeight = bounds.fBottom;
-#endif
 
-    if (!fBM.allocPixels(SkImageInfo::MakeA8(cmpWidth, cmpHeight))) {
-        return false;
+    if (allowCompression &&
+        fContext->caps()->drawPathMasksToCompressedTexturesSupport() &&
+        choose_compressed_fmt(fContext->caps(), &fCompressedFormat)) {
+        fCompressionMode = kCompress_CompressionMode;
     }
 
-    sk_bzero(fBM.getPixels(), fBM.getSafeSize());
+    // Make sure that the width is a multiple of the desired block dimensions
+    // to allow for specialized SIMD instructions that compress multiple blocks at a time.
+    int cmpWidth = bounds.fRight;
+    int cmpHeight = bounds.fBottom;
+    if (kCompress_CompressionMode == fCompressionMode) {
+        int dimX, dimY;
+        SkTextureCompressor::GetBlockDimensions(fCompressedFormat, &dimX, &dimY);
+        cmpWidth = dimX * ((cmpWidth + (dimX - 1)) / dimX);
+        cmpHeight = dimY * ((cmpHeight + (dimY - 1)) / dimY);
+
+        // Can we create a blitter?
+        if (SkTextureCompressor::ExistsBlitterForFormat(fCompressedFormat)) {
+            int cmpSz = SkTextureCompressor::GetCompressedDataSize(
+                fCompressedFormat, cmpWidth, cmpHeight);
+
+            SkASSERT(cmpSz > 0);
+            SkASSERT(nullptr == fCompressedBuffer.get());
+            fCompressedBuffer.reset(cmpSz);
+            fCompressionMode = kBlitter_CompressionMode;
+        }
+    } 
 
     sk_bzero(&fDraw, sizeof(fDraw));
+
+    // If we don't have a custom blitter, then we either need a bitmap to compress
+    // from or a bitmap that we're going to use as a texture. In any case, we should
+    // allocate the pixels for a bitmap
+    const SkImageInfo bmImageInfo = SkImageInfo::MakeA8(cmpWidth, cmpHeight);
+    if (kBlitter_CompressionMode != fCompressionMode) {
+        if (!fPixels.tryAlloc(bmImageInfo)) {
+            return false;
+        }
+        fPixels.erase(0);
+    } else {
+        // Otherwise, we just need to remember how big the buffer is...
+        fPixels.reset(bmImageInfo);
+    }
+    fDraw.fDst      = fPixels;
     fRasterClip.setRect(bounds);
-    fDraw.fRC    = &fRasterClip;
-    fDraw.fClip  = &fRasterClip.bwRgn();
-    fDraw.fMatrix = &fMatrix;
-    fDraw.fBitmap = &fBM;
+    fDraw.fRC       = &fRasterClip;
+    fDraw.fClip     = &fRasterClip.bwRgn();
+    fDraw.fMatrix   = &fMatrix;
     return true;
 }
 
 /**
  * Get a texture (from the texture cache) of the correct size & format.
- * Return true on success; false on failure.
  */
-bool GrSWMaskHelper::getTexture(GrAutoScratchTexture* texture) {
-    GrTextureDesc desc;
-    desc.fWidth = fBM.width();
-    desc.fHeight = fBM.height();
+GrTexture* GrSWMaskHelper::createTexture() {
+    GrSurfaceDesc desc;
+    desc.fWidth = fPixels.width();
+    desc.fHeight = fPixels.height();
     desc.fConfig = kAlpha_8_GrPixelConfig;
 
-#if GR_COMPRESS_ALPHA_MASK
-    static const int kCompressedBlockSize = 4;
-    static const GrPixelConfig kCompressedConfig = kR11_EAC_GrPixelConfig;
+    if (kNone_CompressionMode != fCompressionMode) {
 
-    if (desc.fWidth % kCompressedBlockSize == 0 &&
-        desc.fHeight % kCompressedBlockSize == 0) {
-        desc.fConfig = kCompressedConfig;
-    }
-
-    // If this config isn't supported then we should fall back to A8
-    if (!(fContext->getGpu()->caps()->isConfigTexturable(desc.fConfig))) {
-        desc.fConfig = kAlpha_8_GrPixelConfig;
-    }
+#ifdef SK_DEBUG
+        int dimX, dimY;
+        SkTextureCompressor::GetBlockDimensions(fCompressedFormat, &dimX, &dimY);
+        SkASSERT((desc.fWidth % dimX) == 0);
+        SkASSERT((desc.fHeight % dimY) == 0);
 #endif
 
-    texture->set(fContext, desc);
-    return NULL != texture->texture();
+        desc.fConfig = fmt_to_config(fCompressedFormat);
+        SkASSERT(fContext->caps()->isConfigTexturable(desc.fConfig));
+    }
+
+    return fContext->textureProvider()->createApproxTexture(desc);
 }
 
-void GrSWMaskHelper::sendTextureData(GrTexture *texture, const GrTextureDesc& desc,
-                                     const void *data, int rowbytes) {
+void GrSWMaskHelper::sendTextureData(GrTexture *texture, const GrSurfaceDesc& desc,
+                                     const void *data, size_t rowbytes) {
     // If we aren't reusing scratch textures we don't need to flush before
     // writing since no one else will be using 'texture'
-    bool reuseScratch = fContext->getGpu()->caps()->reuseScratchTextures();
+    bool reuseScratch = fContext->caps()->reuseScratchTextures();
 
     // Since we're uploading to it, and it's compressed, 'texture' shouldn't
     // have a render target.
-    SkASSERT(NULL == texture->asRenderTarget());
+    SkASSERT(nullptr == texture->asRenderTarget());
 
     texture->writePixels(0, 0, desc.fWidth, desc.fHeight,
                          desc.fConfig, data, rowbytes,
                          reuseScratch ? 0 : GrContext::kDontFlush_PixelOpsFlag);
 }
 
-void GrSWMaskHelper::compressTextureData(GrTexture *texture, const GrTextureDesc& desc) {
+void GrSWMaskHelper::compressTextureData(GrTexture *texture, const GrSurfaceDesc& desc) {
 
     SkASSERT(GrPixelConfigIsCompressed(desc.fConfig));
+    SkASSERT(fmt_to_config(fCompressedFormat) == desc.fConfig);
 
-    SkTextureCompressor::Format format = SkTextureCompressor::kLATC_Format;
-
-    // Choose the format required by the texture descriptor.
-    switch(desc.fConfig) {
-        case kLATC_GrPixelConfig:
-            format = SkTextureCompressor::kLATC_Format;
-            break;
-        case kR11_EAC_GrPixelConfig:
-            format = SkTextureCompressor::kR11_EAC_Format;
-            break;
-        default:
-            SkFAIL("Unrecognized texture compression format.");
-            break;
-    }
-
-    SkAutoDataUnref cmpData(SkTextureCompressor::CompressBitmapToFormat(fBM, format));
-    SkASSERT(NULL != cmpData);
+    SkAutoDataUnref cmpData(SkTextureCompressor::CompressBitmapToFormat(fPixels,
+                                                                        fCompressedFormat));
+    SkASSERT(cmpData);
 
     this->sendTextureData(texture, desc, cmpData->data(), 0);
 }
@@ -200,82 +282,95 @@ void GrSWMaskHelper::compressTextureData(GrTexture *texture, const GrTextureDesc
  * Move the result of the software mask generation back to the gpu
  */
 void GrSWMaskHelper::toTexture(GrTexture *texture) {
-    SkAutoLockPixels alp(fBM);
-
-    GrTextureDesc desc;
-    desc.fWidth = fBM.width();
-    desc.fHeight = fBM.height();
+    GrSurfaceDesc desc;
+    desc.fWidth = fPixels.width();
+    desc.fHeight = fPixels.height();
     desc.fConfig = texture->config();
         
     // First see if we should compress this texture before uploading.
-    if (GrPixelConfigIsCompressed(texture->config())) {
-        this->compressTextureData(texture, desc);
-    } else {
-        // Looks like we have to send a full A8 texture. 
-        this->sendTextureData(texture, desc, fBM.getPixels(), fBM.rowBytes());
+    switch (fCompressionMode) {
+        case kNone_CompressionMode:
+            this->sendTextureData(texture, desc, fPixels.addr(), fPixels.rowBytes());
+            break;
+
+        case kCompress_CompressionMode:
+            this->compressTextureData(texture, desc);
+            break;
+
+        case kBlitter_CompressionMode:
+            SkASSERT(fCompressedBuffer.get());
+            this->sendTextureData(texture, desc, fCompressedBuffer.get(), 0);
+            break;
     }
 }
 
+/**
+ * Convert mask generation results to a signed distance field
+ */
+void GrSWMaskHelper::toSDF(unsigned char* sdf) {
+    SkGenerateDistanceFieldFromA8Image(sdf, (const unsigned char*)fPixels.addr(),
+                                       fPixels.width(), fPixels.height(), fPixels.rowBytes());
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 /**
  * Software rasterizes path to A8 mask (possibly using the context's matrix)
  * and uploads the result to a scratch texture. Returns the resulting
- * texture on success; NULL on failure.
+ * texture on success; nullptr on failure.
  */
 GrTexture* GrSWMaskHelper::DrawPathMaskToTexture(GrContext* context,
                                                  const SkPath& path,
                                                  const SkStrokeRec& stroke,
                                                  const SkIRect& resultBounds,
                                                  bool antiAlias,
-                                                 SkMatrix* matrix) {
+                                                 const SkMatrix* matrix) {
     GrSWMaskHelper helper(context);
 
     if (!helper.init(resultBounds, matrix)) {
-        return NULL;
+        return nullptr;
     }
 
     helper.draw(path, stroke, SkRegion::kReplace_Op, antiAlias, 0xFF);
 
-    GrAutoScratchTexture ast;
-    if (!helper.getTexture(&ast)) {
-        return NULL;
+    GrTexture* texture(helper.createTexture());
+    if (!texture) {
+        return nullptr;
     }
 
-    helper.toTexture(ast.texture());
+    helper.toTexture(texture);
 
-    return ast.detach();
+    return texture;
 }
 
 void GrSWMaskHelper::DrawToTargetWithPathMask(GrTexture* texture,
                                               GrDrawTarget* target,
+                                              GrPipelineBuilder* pipelineBuilder,
+                                              GrColor color,
+                                              const SkMatrix& viewMatrix,
                                               const SkIRect& rect) {
-    GrDrawState* drawState = target->drawState();
-
-    GrDrawState::AutoViewMatrixRestore avmr;
-    if (!avmr.setIdentity(drawState)) {
+    SkMatrix invert;
+    if (!viewMatrix.invert(&invert)) {
         return;
     }
-    GrDrawState::AutoRestoreEffects are(drawState);
+    GrPipelineBuilder::AutoRestoreFragmentProcessorState arfps(*pipelineBuilder);
 
     SkRect dstRect = SkRect::MakeLTRB(SK_Scalar1 * rect.fLeft,
                                       SK_Scalar1 * rect.fTop,
                                       SK_Scalar1 * rect.fRight,
                                       SK_Scalar1 * rect.fBottom);
 
-    // We want to use device coords to compute the texture coordinates. We set our matrix to be
-    // equal to the view matrix followed by a translation so that the top-left of the device bounds
-    // maps to 0,0, and then a scaling matrix to normalized coords. We apply this matrix to the
-    // vertex positions rather than local coords.
+    // We use device coords to compute the texture coordinates. We take the device coords and apply
+    // a translation so that the top-left of the device bounds maps to 0,0, and then a scaling
+    // matrix to normalized coords.
     SkMatrix maskMatrix;
     maskMatrix.setIDiv(texture->width(), texture->height());
     maskMatrix.preTranslate(SkIntToScalar(-rect.fLeft), SkIntToScalar(-rect.fTop));
-    maskMatrix.preConcat(drawState->getViewMatrix());
 
-    drawState->addCoverageEffect(
+    pipelineBuilder->addCoverageFragmentProcessor(
                          GrSimpleTextureEffect::Create(texture,
                                                        maskMatrix,
                                                        GrTextureParams::kNone_FilterMode,
-                                                       kPosition_GrCoordSet))->unref();
+                                                       kDevice_GrCoordSet))->unref();
 
-    target->drawSimpleRect(dstRect);
+    target->drawNonAARect(*pipelineBuilder, color, SkMatrix::I(), dstRect, invert);
 }
diff --git a/gfx/skia/skia/src/gpu/GrSWMaskHelper.h b/gfx/skia/skia/src/gpu/GrSWMaskHelper.h
index 340b1a382970..b90205b1a1e9 100644
--- a/gfx/skia/skia/src/gpu/GrSWMaskHelper.h
+++ b/gfx/skia/skia/src/gpu/GrSWMaskHelper.h
@@ -9,15 +9,16 @@
 #define GrSWMaskHelper_DEFINED
 
 #include "GrColor.h"
-#include "GrDrawState.h"
+#include "GrPipelineBuilder.h"
 #include "SkBitmap.h"
 #include "SkDraw.h"
 #include "SkMatrix.h"
 #include "SkRasterClip.h"
 #include "SkRegion.h"
+#include "SkTextureCompressor.h"
 #include "SkTypes.h"
 
-class GrAutoScratchTexture;
+class GrClip;
 class GrContext;
 class GrTexture;
 class SkPath;
@@ -41,14 +42,16 @@ class GrDrawTarget;
 class GrSWMaskHelper : SkNoncopyable {
 public:
     GrSWMaskHelper(GrContext* context)
-    : fContext(context) {
+    : fContext(context)
+    , fCompressionMode(kNone_CompressionMode) {
     }
 
     // set up the internal state in preparation for draws. Since many masks
     // may be accumulated in the helper during creation, "resultBounds"
     // allows the caller to specify the region of interest - to limit the
-    // amount of work.
-    bool init(const SkIRect& resultBounds, const SkMatrix* matrix);
+    // amount of work. allowCompression should be set to false if you plan on using
+    // your own texture to draw into, and not a scratch texture via getTexture().
+    bool init(const SkIRect& resultBounds, const SkMatrix* matrix, bool allowCompression = true);
 
     // Draw a single rect into the accumulation bitmap using the specified op
     void draw(const SkRect& rect, SkRegion::Op op,
@@ -58,26 +61,25 @@ public:
     void draw(const SkPath& path, const SkStrokeRec& stroke, SkRegion::Op op,
               bool antiAlias, uint8_t alpha);
 
-    // Helper function to get a scratch texture suitable for capturing the
-    // result (i.e., right size & format)
-    bool getTexture(GrAutoScratchTexture* texture);
-
     // Move the mask generation results from the internal bitmap to the gpu.
     void toTexture(GrTexture* texture);
 
+    // Convert mask generation results to a signed distance field
+    void toSDF(unsigned char* sdf);
+    
     // Reset the internal bitmap
     void clear(uint8_t alpha) {
-        fBM.eraseColor(SkColorSetARGB(alpha, alpha, alpha, alpha));
+        fPixels.erase(SkColorSetARGB(alpha, 0xFF, 0xFF, 0xFF));
     }
 
     // Canonical usage utility that draws a single path and uploads it
-    // to the GPU. The result is returned in "result".
+    // to the GPU. The result is returned.
     static GrTexture* DrawPathMaskToTexture(GrContext* context,
                                             const SkPath& path,
                                             const SkStrokeRec& stroke,
                                             const SkIRect& resultBounds,
                                             bool antiAlias,
-                                            SkMatrix* matrix);
+                                            const SkMatrix* matrix);
 
     // This utility routine is used to add a path's mask to some other draw.
     // The ClipMaskManager uses it to accumulate clip masks while the
@@ -91,24 +93,48 @@ public:
     // output of DrawPathMaskToTexture.
     static void DrawToTargetWithPathMask(GrTexture* texture,
                                          GrDrawTarget* target,
+                                         GrPipelineBuilder* pipelineBuilder,
+                                         GrColor,
+                                         const SkMatrix& viewMatrix,
                                          const SkIRect& rect);
 
-protected:
 private:
+    // Helper function to get a scratch texture suitable for capturing the
+    // result (i.e., right size & format)
+    GrTexture* createTexture();
+
     GrContext*      fContext;
     SkMatrix        fMatrix;
-    SkBitmap        fBM;
+    SkAutoPixmapStorage fPixels;
     SkDraw          fDraw;
     SkRasterClip    fRasterClip;
 
+    // This enum says whether or not we should compress the mask:
+    // kNone_CompressionMode: compression is not supported on this device.
+    // kCompress_CompressionMode: compress the bitmap before it gets sent to the gpu
+    // kBlitter_CompressionMode: write to the bitmap using a special compressed blitter.
+    enum CompressionMode {
+        kNone_CompressionMode,
+        kCompress_CompressionMode,
+        kBlitter_CompressionMode,
+    } fCompressionMode;
+
+    // This is the buffer into which we store our compressed data. This buffer is
+    // only allocated (non-null) if fCompressionMode is kBlitter_CompressionMode
+    SkAutoMalloc fCompressedBuffer;
+
+    // This is the desired format within which to compress the
+    // texture. This value is only valid if fCompressionMode is not kNone_CompressionMode.
+    SkTextureCompressor::Format fCompressedFormat;
+
     // Actually sends the texture data to the GPU. This is called from
     // toTexture with the data filled in depending on the texture config.
-    void sendTextureData(GrTexture *texture, const GrTextureDesc& desc,
-                         const void *data, int rowbytes);
+    void sendTextureData(GrTexture *texture, const GrSurfaceDesc& desc,
+                         const void *data, size_t rowbytes);
 
     // Compresses the bitmap stored in fBM and sends the compressed data
     // to the GPU to be stored in 'texture' using sendTextureData.
-    void compressTextureData(GrTexture *texture, const GrTextureDesc& desc);
+    void compressTextureData(GrTexture *texture, const GrSurfaceDesc& desc);
 
     typedef SkNoncopyable INHERITED;
 };
diff --git a/gfx/skia/skia/src/gpu/GrSoftwarePathRenderer.cpp b/gfx/skia/skia/src/gpu/GrSoftwarePathRenderer.cpp
index bca2c66b37f8..a136886a6400 100644
--- a/gfx/skia/skia/src/gpu/GrSoftwarePathRenderer.cpp
+++ b/gfx/skia/skia/src/gpu/GrSoftwarePathRenderer.cpp
@@ -9,49 +9,40 @@
 #include "GrSoftwarePathRenderer.h"
 #include "GrContext.h"
 #include "GrSWMaskHelper.h"
+#include "GrVertexBuffer.h"
 
 ////////////////////////////////////////////////////////////////////////////////
-bool GrSoftwarePathRenderer::canDrawPath(const SkPath&,
-                                         const SkStrokeRec&,
-                                         const GrDrawTarget*,
-                                         bool antiAlias) const {
-    if (NULL == fContext) {
+bool GrSoftwarePathRenderer::onCanDrawPath(const CanDrawPathArgs& args) const {
+    if (nullptr == fContext) {
+        return false;
+    }
+    if (args.fStroke->isDashed()) {
         return false;
     }
-
     return true;
 }
 
-GrPathRenderer::StencilSupport GrSoftwarePathRenderer::onGetStencilSupport(
-    const SkPath&,
-    const SkStrokeRec&,
-    const GrDrawTarget*) const {
-    return GrPathRenderer::kNoSupport_StencilSupport;
-}
-
 namespace {
 
 ////////////////////////////////////////////////////////////////////////////////
 // gets device coord bounds of path (not considering the fill) and clip. The
 // path bounds will be a subset of the clip bounds. returns false if
 // path bounds would be empty.
-bool get_path_and_clip_bounds(const GrDrawTarget* target,
+bool get_path_and_clip_bounds(const GrPipelineBuilder* pipelineBuilder,
                               const SkPath& path,
                               const SkMatrix& matrix,
                               SkIRect* devPathBounds,
                               SkIRect* devClipBounds) {
     // compute bounds as intersection of rt size, clip, and path
-    const GrRenderTarget* rt = target->getDrawState().getRenderTarget();
-    if (NULL == rt) {
+    const GrRenderTarget* rt = pipelineBuilder->getRenderTarget();
+    if (nullptr == rt) {
         return false;
     }
-    *devPathBounds = SkIRect::MakeWH(rt->width(), rt->height());
 
-    target->getClip()->getConservativeBounds(rt, devClipBounds);
+    pipelineBuilder->clip().getConservativeBounds(rt->width(), rt->height(), devClipBounds);
 
-    // TODO: getConservativeBounds already intersects with the
-    // render target's bounding box. Remove this next line
-    if (!devPathBounds->intersect(*devClipBounds)) {
+    if (devClipBounds->isEmpty()) {
+        *devPathBounds = SkIRect::MakeWH(rt->width(), rt->height());
         return false;
     }
 
@@ -60,6 +51,7 @@ bool get_path_and_clip_bounds(const GrDrawTarget* target,
         matrix.mapRect(&pathSBounds, path.getBounds());
         SkIRect pathIBounds;
         pathSBounds.roundOut(&pathIBounds);
+        *devPathBounds = *devClipBounds;
         if (!devPathBounds->intersect(pathIBounds)) {
             // set the correct path bounds, as this would be used later.
             *devPathBounds = pathIBounds;
@@ -74,32 +66,36 @@ bool get_path_and_clip_bounds(const GrDrawTarget* target,
 
 ////////////////////////////////////////////////////////////////////////////////
 void draw_around_inv_path(GrDrawTarget* target,
+                          GrPipelineBuilder* pipelineBuilder,
+                          GrColor color,
+                          const SkMatrix& viewMatrix,
                           const SkIRect& devClipBounds,
                           const SkIRect& devPathBounds) {
-    GrDrawState::AutoViewMatrixRestore avmr;
-    if (!avmr.setIdentity(target->drawState())) {
+    SkMatrix invert;
+    if (!viewMatrix.invert(&invert)) {
         return;
     }
+
     SkRect rect;
     if (devClipBounds.fTop < devPathBounds.fTop) {
         rect.iset(devClipBounds.fLeft, devClipBounds.fTop,
                   devClipBounds.fRight, devPathBounds.fTop);
-        target->drawSimpleRect(rect, NULL);
+        target->drawNonAARect(*pipelineBuilder, color, SkMatrix::I(), rect, invert);
     }
     if (devClipBounds.fLeft < devPathBounds.fLeft) {
         rect.iset(devClipBounds.fLeft, devPathBounds.fTop,
                   devPathBounds.fLeft, devPathBounds.fBottom);
-        target->drawSimpleRect(rect, NULL);
+        target->drawNonAARect(*pipelineBuilder, color, SkMatrix::I(), rect, invert);
     }
     if (devClipBounds.fRight > devPathBounds.fRight) {
         rect.iset(devPathBounds.fRight, devPathBounds.fTop,
                   devClipBounds.fRight, devPathBounds.fBottom);
-        target->drawSimpleRect(rect, NULL);
+        target->drawNonAARect(*pipelineBuilder, color, SkMatrix::I(), rect, invert);
     }
     if (devClipBounds.fBottom > devPathBounds.fBottom) {
         rect.iset(devClipBounds.fLeft, devPathBounds.fBottom,
                   devClipBounds.fRight, devClipBounds.fBottom);
-        target->drawSimpleRect(rect, NULL);
+        target->drawNonAARect(*pipelineBuilder, color, SkMatrix::I(), rect, invert);
     }
 }
 
@@ -107,40 +103,35 @@ void draw_around_inv_path(GrDrawTarget* target,
 
 ////////////////////////////////////////////////////////////////////////////////
 // return true on success; false on failure
-bool GrSoftwarePathRenderer::onDrawPath(const SkPath& path,
-                                        const SkStrokeRec& stroke,
-                                        GrDrawTarget* target,
-                                        bool antiAlias) {
-
-    if (NULL == fContext) {
+bool GrSoftwarePathRenderer::onDrawPath(const DrawPathArgs& args) {
+    if (nullptr == fContext) {
         return false;
     }
 
-    GrDrawState* drawState = target->drawState();
-
-    SkMatrix vm = drawState->getViewMatrix();
-
     SkIRect devPathBounds, devClipBounds;
-    if (!get_path_and_clip_bounds(target, path, vm,
-                                  &devPathBounds, &devClipBounds)) {
-        if (path.isInverseFillType()) {
-            draw_around_inv_path(target, devClipBounds, devPathBounds);
+    if (!get_path_and_clip_bounds(args.fPipelineBuilder, *args.fPath,
+                                  *args.fViewMatrix, &devPathBounds, &devClipBounds)) {
+        if (args.fPath->isInverseFillType()) {
+            draw_around_inv_path(args.fTarget, args.fPipelineBuilder, args.fColor,
+                                 *args.fViewMatrix, devClipBounds, devPathBounds);
         }
         return true;
     }
 
     SkAutoTUnref<GrTexture> texture(
-            GrSWMaskHelper::DrawPathMaskToTexture(fContext, path, stroke,
+            GrSWMaskHelper::DrawPathMaskToTexture(fContext, *args.fPath, *args.fStroke,
                                                   devPathBounds,
-                                                  antiAlias, &vm));
-    if (NULL == texture) {
+                                                  args.fAntiAlias, args.fViewMatrix));
+    if (nullptr == texture) {
         return false;
     }
 
-    GrSWMaskHelper::DrawToTargetWithPathMask(texture, target, devPathBounds);
+    GrSWMaskHelper::DrawToTargetWithPathMask(texture, args.fTarget, args.fPipelineBuilder,
+                                             args.fColor, *args.fViewMatrix, devPathBounds);
 
-    if (path.isInverseFillType()) {
-        draw_around_inv_path(target, devClipBounds, devPathBounds);
+    if (args.fPath->isInverseFillType()) {
+        draw_around_inv_path(args.fTarget, args.fPipelineBuilder, args.fColor, *args.fViewMatrix,
+                             devClipBounds, devPathBounds);
     }
 
     return true;
diff --git a/gfx/skia/skia/src/gpu/GrSoftwarePathRenderer.h b/gfx/skia/skia/src/gpu/GrSoftwarePathRenderer.h
index f8c5620f49a4..72a95152e29b 100644
--- a/gfx/skia/skia/src/gpu/GrSoftwarePathRenderer.h
+++ b/gfx/skia/skia/src/gpu/GrSoftwarePathRenderer.h
@@ -12,7 +12,6 @@
 #include "GrPathRenderer.h"
 
 class GrContext;
-class GrAutoScratchTexture;
 
 /**
  * This class uses the software side to render a path to an SkBitmap and
@@ -23,20 +22,14 @@ public:
     GrSoftwarePathRenderer(GrContext* context)
         : fContext(context) {
     }
+private:
+    StencilSupport onGetStencilSupport(const SkPath&, const GrStrokeInfo&) const override {
+        return GrPathRenderer::kNoSupport_StencilSupport;
+    }
+    
+    bool onCanDrawPath(const CanDrawPathArgs&) const override;
 
-    virtual bool canDrawPath(const SkPath&,
-                             const SkStrokeRec&,
-                             const GrDrawTarget*,
-                             bool antiAlias) const SK_OVERRIDE;
-protected:
-    virtual StencilSupport onGetStencilSupport(const SkPath&,
-                                               const SkStrokeRec&,
-                                               const GrDrawTarget*) const SK_OVERRIDE;
-
-    virtual bool onDrawPath(const SkPath&,
-                            const SkStrokeRec&,
-                            GrDrawTarget*,
-                            bool antiAlias) SK_OVERRIDE;
+    bool onDrawPath(const DrawPathArgs&) override;
 
 private:
     GrContext*     fContext;
diff --git a/gfx/skia/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp b/gfx/skia/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp
deleted file mode 100644
index 273c01b8618c..000000000000
--- a/gfx/skia/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#include "GrStencilAndCoverPathRenderer.h"
-#include "GrContext.h"
-#include "GrDrawTargetCaps.h"
-#include "GrGpu.h"
-#include "GrPath.h"
-#include "SkStrokeRec.h"
-
-GrPathRenderer* GrStencilAndCoverPathRenderer::Create(GrContext* context) {
-    SkASSERT(NULL != context);
-    SkASSERT(NULL != context->getGpu());
-    if (context->getGpu()->caps()->pathRenderingSupport()) {
-        return SkNEW_ARGS(GrStencilAndCoverPathRenderer, (context->getGpu()));
-    } else {
-        return NULL;
-    }
-}
-
-GrStencilAndCoverPathRenderer::GrStencilAndCoverPathRenderer(GrGpu* gpu) {
-    SkASSERT(gpu->caps()->pathRenderingSupport());
-    fGpu = gpu;
-    gpu->ref();
-}
-
-GrStencilAndCoverPathRenderer::~GrStencilAndCoverPathRenderer() {
-    fGpu->unref();
-}
-
-bool GrStencilAndCoverPathRenderer::canDrawPath(const SkPath& path,
-                                                const SkStrokeRec& stroke,
-                                                const GrDrawTarget* target,
-                                                bool antiAlias) const {
-    return !stroke.isHairlineStyle() &&
-           !antiAlias && // doesn't do per-path AA, relies on the target having MSAA
-           NULL != target->getDrawState().getRenderTarget()->getStencilBuffer() &&
-           target->getDrawState().getStencil().isDisabled();
-}
-
-GrPathRenderer::StencilSupport GrStencilAndCoverPathRenderer::onGetStencilSupport(
-                                                        const SkPath&,
-                                                        const SkStrokeRec& ,
-                                                        const GrDrawTarget*) const {
-    return GrPathRenderer::kStencilOnly_StencilSupport;
-}
-
-void GrStencilAndCoverPathRenderer::onStencilPath(const SkPath& path,
-                                                  const SkStrokeRec& stroke,
-                                                  GrDrawTarget* target) {
-    SkASSERT(!path.isInverseFillType());
-    SkAutoTUnref<GrPath> p(fGpu->getContext()->createPath(path, stroke));
-    target->stencilPath(p, path.getFillType());
-}
-
-bool GrStencilAndCoverPathRenderer::onDrawPath(const SkPath& path,
-                                               const SkStrokeRec& stroke,
-                                               GrDrawTarget* target,
-                                               bool antiAlias) {
-    SkASSERT(!antiAlias);
-    SkASSERT(!stroke.isHairlineStyle());
-
-    GrDrawState* drawState = target->drawState();
-    SkASSERT(drawState->getStencil().isDisabled());
-
-    SkAutoTUnref<GrPath> p(fGpu->getContext()->createPath(path, stroke));
-
-    if (path.isInverseFillType()) {
-        GR_STATIC_CONST_SAME_STENCIL(kInvertedStencilPass,
-            kZero_StencilOp,
-            kZero_StencilOp,
-            // We know our rect will hit pixels outside the clip and the user bits will be 0
-            // outside the clip. So we can't just fill where the user bits are 0. We also need to
-            // check that the clip bit is set.
-            kEqualIfInClip_StencilFunc,
-            0xffff,
-            0x0000,
-            0xffff);
-
-        *drawState->stencil() = kInvertedStencilPass;
-    } else {
-        GR_STATIC_CONST_SAME_STENCIL(kStencilPass,
-            kZero_StencilOp,
-            kZero_StencilOp,
-            kNotEqual_StencilFunc,
-            0xffff,
-            0x0000,
-            0xffff);
-
-        *drawState->stencil() = kStencilPass;
-    }
-
-    target->drawPath(p, path.getFillType());
-
-    target->drawState()->stencil()->setDisabled();
-    return true;
-}
diff --git a/gfx/skia/skia/src/gpu/GrStencilAndCoverPathRenderer.h b/gfx/skia/skia/src/gpu/GrStencilAndCoverPathRenderer.h
deleted file mode 100644
index 9ebcec985823..000000000000
--- a/gfx/skia/skia/src/gpu/GrStencilAndCoverPathRenderer.h
+++ /dev/null
@@ -1,55 +0,0 @@
-
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrBuiltInPathRenderer_DEFINED
-#define GrBuiltInPathRenderer_DEFINED
-
-#include "GrPathRenderer.h"
-
-class GrContext;
-class GrGpu;
-
-/**
- * Uses GrGpu::stencilPath followed by a cover rectangle. This subclass doesn't apply AA; it relies
- * on the target having MSAA if AA is desired.
- */
-class GrStencilAndCoverPathRenderer : public GrPathRenderer {
-public:
-
-    static GrPathRenderer* Create(GrContext*);
-
-    virtual ~GrStencilAndCoverPathRenderer();
-
-    virtual bool canDrawPath(const SkPath&,
-                             const SkStrokeRec&,
-                             const GrDrawTarget*,
-                             bool antiAlias) const SK_OVERRIDE;
-
-protected:
-    virtual StencilSupport onGetStencilSupport(const SkPath&,
-                                               const SkStrokeRec&,
-                                               const GrDrawTarget*) const SK_OVERRIDE;
-
-    virtual bool onDrawPath(const SkPath&,
-                            const SkStrokeRec&,
-                            GrDrawTarget*,
-                            bool antiAlias) SK_OVERRIDE;
-
-    virtual void onStencilPath(const SkPath&,
-                               const SkStrokeRec&,
-                               GrDrawTarget*) SK_OVERRIDE;
-
-private:
-    GrStencilAndCoverPathRenderer(GrGpu*);
-
-    GrGpu* fGpu;
-
-    typedef GrPathRenderer INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/GrStencilAndCoverTextContext.cpp b/gfx/skia/skia/src/gpu/GrStencilAndCoverTextContext.cpp
index d3d711fa020b..bab0b32ce6a8 100644
--- a/gfx/skia/skia/src/gpu/GrStencilAndCoverTextContext.cpp
+++ b/gfx/skia/skia/src/gpu/GrStencilAndCoverTextContext.cpp
@@ -6,173 +6,362 @@
  */
 
 #include "GrStencilAndCoverTextContext.h"
+#include "GrAtlasTextContext.h"
+#include "GrDrawContext.h"
 #include "GrDrawTarget.h"
-#include "GrGpu.h"
 #include "GrPath.h"
 #include "GrPathRange.h"
+#include "GrResourceProvider.h"
 #include "SkAutoKern.h"
 #include "SkDraw.h"
 #include "SkDrawProcs.h"
 #include "SkGlyphCache.h"
 #include "SkGpuDevice.h"
+#include "SkGrPriv.h"
 #include "SkPath.h"
+#include "SkTextBlobRunIterator.h"
 #include "SkTextMapStateProc.h"
+#include "SkTextFormatParams.h"
 
-class GrStencilAndCoverTextContext::GlyphPathRange : public GrGpuResource {
-    static const int kMaxGlyphCount = 1 << 16; // Glyph IDs are uint16_t's
-    static const int kGlyphGroupSize = 16; // Glyphs get tracked in groups of 16
+#include "batches/GrDrawPathBatch.h"
 
-public:
-    static GlyphPathRange* Create(GrContext* context,
-                                  SkGlyphCache* cache,
-                                  const SkStrokeRec& stroke) {
-        static const GrCacheID::Domain gGlyphPathRangeDomain = GrCacheID::GenerateDomain();
+template<typename Key, typename Val> static void delete_hash_map_entry(const Key&, Val* val) {
+    SkASSERT(*val);
+    delete *val;
+}
 
-        GrCacheID::Key key;
-        key.fData32[0] = cache->getDescriptor().getChecksum();
-        key.fData32[1] = cache->getScalerContext()->getTypeface()->uniqueID();
-        key.fData64[1] = GrPath::ComputeStrokeKey(stroke);
+template<typename T> static void delete_hash_table_entry(T* val) {
+    SkASSERT(*val);
+    delete *val;
+}
 
-        GrResourceKey resourceKey(GrCacheID(gGlyphPathRangeDomain, key),
-                                  GrPathRange::resourceType(), 0);
-        SkAutoTUnref<GlyphPathRange> glyphs(
-            static_cast<GlyphPathRange*>(context->findAndRefCachedResource(resourceKey)));
+GrStencilAndCoverTextContext::GrStencilAndCoverTextContext(GrContext* context,
+                                                           const SkSurfaceProps& surfaceProps)
+    : INHERITED(context, surfaceProps),
+      fCacheSize(0) {
+}
 
-        if (NULL == glyphs ||
-            !glyphs->fDesc->equals(cache->getDescriptor() /*checksum collision*/)) {
-            glyphs.reset(SkNEW_ARGS(GlyphPathRange, (context, cache->getDescriptor(), stroke)));
-            context->addResourceToCache(resourceKey, glyphs);
-        }
+GrStencilAndCoverTextContext*
+GrStencilAndCoverTextContext::Create(GrContext* context, const SkSurfaceProps& surfaceProps) {
+    GrStencilAndCoverTextContext* textContext = 
+        new GrStencilAndCoverTextContext(context, surfaceProps);
+    textContext->fFallbackTextContext = GrAtlasTextContext::Create(context, surfaceProps);
 
-        return glyphs.detach();
-    }
-
-    const GrPathRange* pathRange() const { return fPathRange.get(); }
-
-    void preloadGlyph(uint16_t glyphID, SkGlyphCache* cache) {
-        const uint16_t groupIndex = glyphID / kGlyphGroupSize;
-        const uint16_t groupByte = groupIndex >> 3;
-        const uint8_t groupBit = 1 << (groupIndex & 7);
-
-        const bool hasGlyph = 0 != (fLoadedGlyphs[groupByte] & groupBit);
-        if (hasGlyph) {
-            return;
-        }
-
-        // We track which glyphs are loaded in groups of kGlyphGroupSize. To
-        // mark a glyph loaded we need to load the entire group.
-        const uint16_t groupFirstID = groupIndex * kGlyphGroupSize;
-        const uint16_t groupLastID = groupFirstID + kGlyphGroupSize - 1;
-        SkPath skPath;
-        for (int id = groupFirstID; id <= groupLastID; ++id) {
-            const SkGlyph& skGlyph = cache->getGlyphIDMetrics(id);
-            if (const SkPath* skPath = cache->findPath(skGlyph)) {
-                fPathRange->initAt(id, *skPath);
-            } // GrGpu::drawPaths will silently ignore undefined paths.
-        }
-
-        fLoadedGlyphs[groupByte] |= groupBit;
-        this->didChangeGpuMemorySize();
-    }
-
-    // GrGpuResource overrides
-    virtual size_t gpuMemorySize() const SK_OVERRIDE { return fPathRange->gpuMemorySize(); }
-
-private:
-    GlyphPathRange(GrContext* context, const SkDescriptor& desc, const SkStrokeRec& stroke)
-        : INHERITED(context->getGpu(), false)
-        , fDesc(desc.copy())
-        // We reserve a range of kMaxGlyphCount paths because of fallbacks fonts. We
-        // can't know exactly how many glyphs we might need without preloading every
-        // fallback, which we don't want to do at this point.
-        , fPathRange(context->getGpu()->createPathRange(kMaxGlyphCount, stroke)) {
-        memset(fLoadedGlyphs, 0, sizeof(fLoadedGlyphs));
-    }
-
-    ~GlyphPathRange() {
-        this->release();
-        SkDescriptor::Free(fDesc);
-    }
-
-    virtual void onRelease() SK_OVERRIDE {
-        INHERITED::onRelease();
-        fPathRange.reset(NULL);
-    }
-
-    virtual void onAbandon() SK_OVERRIDE {
-        INHERITED::onAbandon();
-        fPathRange->abandon();
-        fPathRange.reset(NULL);
-    }
-
-
-    static const int kMaxGroupCount = (kMaxGlyphCount + (kGlyphGroupSize - 1)) / kGlyphGroupSize;
-    SkDescriptor* const fDesc;
-    uint8_t fLoadedGlyphs[(kMaxGroupCount + 7) >> 3]; // One bit per glyph group
-    SkAutoTUnref<GrPathRange> fPathRange;
-
-    typedef GrGpuResource INHERITED;
-};
-
-
-GrStencilAndCoverTextContext::GrStencilAndCoverTextContext(
-    GrContext* context, const SkDeviceProperties& properties)
-    : GrTextContext(context, properties)
-    , fStroke(SkStrokeRec::kFill_InitStyle)
-    , fPendingGlyphCount(0) {
+    return textContext;
 }
 
 GrStencilAndCoverTextContext::~GrStencilAndCoverTextContext() {
+    fBlobIdCache.foreach(delete_hash_map_entry<uint32_t, TextBlob*>);
+    fBlobKeyCache.foreach(delete_hash_table_entry<TextBlob*>);
 }
 
-void GrStencilAndCoverTextContext::drawText(const GrPaint& paint,
-                                            const SkPaint& skPaint,
-                                            const char text[],
-                                            size_t byteLength,
-                                            SkScalar x, SkScalar y) {
-    SkASSERT(byteLength == 0 || text != NULL);
+bool GrStencilAndCoverTextContext::internalCanDraw(const SkPaint& skPaint) {
+    if (skPaint.getRasterizer()) {
+        return false;
+    }
+    if (skPaint.getMaskFilter()) {
+        return false;
+    }
+    if (SkPathEffect* pe = skPaint.getPathEffect()) {
+        if (pe->asADash(nullptr) != SkPathEffect::kDash_DashType) {
+            return false;
+        }
+    }
+    // No hairlines. They would require new paths with customized strokes for every new draw matrix.
+    return SkPaint::kStroke_Style != skPaint.getStyle() || 0 != skPaint.getStrokeWidth();
+}
 
-    if (text == NULL || byteLength == 0 /*|| fRC->isEmpty()*/) {
+void GrStencilAndCoverTextContext::onDrawText(GrDrawContext* dc, GrRenderTarget* rt,
+                                              const GrClip& clip,
+                                              const GrPaint& paint,
+                                              const SkPaint& skPaint,
+                                              const SkMatrix& viewMatrix,
+                                              const char text[],
+                                              size_t byteLength,
+                                              SkScalar x, SkScalar y,
+                                              const SkIRect& clipBounds) {
+    TextRun run(skPaint);
+    GrPipelineBuilder pipelineBuilder(paint, rt, clip);
+    run.setText(text, byteLength, x, y);
+    run.draw(fContext, dc, &pipelineBuilder, paint.getColor(), viewMatrix, 0, 0, clipBounds,
+             fFallbackTextContext, skPaint);
+}
+
+void GrStencilAndCoverTextContext::onDrawPosText(GrDrawContext* dc, GrRenderTarget* rt,
+                                                 const GrClip& clip,
+                                                 const GrPaint& paint,
+                                                 const SkPaint& skPaint,
+                                                 const SkMatrix& viewMatrix,
+                                                 const char text[],
+                                                 size_t byteLength,
+                                                 const SkScalar pos[],
+                                                 int scalarsPerPosition,
+                                                 const SkPoint& offset,
+                                                 const SkIRect& clipBounds) {
+    TextRun run(skPaint);
+    GrPipelineBuilder pipelineBuilder(paint, rt, clip);
+    run.setPosText(text, byteLength, pos, scalarsPerPosition, offset);
+    run.draw(fContext, dc, &pipelineBuilder, paint.getColor(), viewMatrix, 0, 0, clipBounds,
+             fFallbackTextContext, skPaint);
+}
+
+void GrStencilAndCoverTextContext::drawTextBlob(GrDrawContext* dc, GrRenderTarget* rt,
+                                                const GrClip& clip, const SkPaint& skPaint,
+                                                const SkMatrix& viewMatrix,
+                                                const SkTextBlob* skBlob, SkScalar x, SkScalar y,
+                                                SkDrawFilter* drawFilter,
+                                                const SkIRect& clipBounds) {
+    if (!this->internalCanDraw(skPaint)) {
+        fFallbackTextContext->drawTextBlob(dc, rt, clip, skPaint, viewMatrix, skBlob, x, y,
+                                           drawFilter, clipBounds);
         return;
     }
 
-    // This is the slow path, mainly used by Skia unit tests.  The other
-    // backends (8888, gpu, ...) use device-space dependent glyph caches. In
-    // order to match the glyph positions that the other code paths produce, we
-    // must also use device-space dependent glyph cache. This has the
-    // side-effect that the glyph shape outline will be in device-space,
-    // too. This in turn has the side-effect that NVPR can not stroke the paths,
-    // as the stroke in NVPR is defined in object-space.
-    // NOTE: here we have following coincidence that works at the moment:
-    // - When using the device-space glyphs, the transforms we pass to NVPR
-    // instanced drawing are the global transforms, and the view transform is
-    // identity. NVPR can not use non-affine transforms in the instanced
-    // drawing. This is taken care of by SkDraw::ShouldDrawTextAsPaths since it
-    // will turn off the use of device-space glyphs when perspective transforms
-    // are in use.
-
-    this->init(paint, skPaint, byteLength, kUseIfNeeded_DeviceSpaceGlyphsBehavior);
-
-    SkMatrix* glyphCacheTransform = NULL;
-    // Transform our starting point.
-    if (fNeedsDeviceSpaceGlyphs) {
-        SkPoint loc;
-        fContextInitialMatrix.mapXY(x, y, &loc);
-        x = loc.fX;
-        y = loc.fY;
-        glyphCacheTransform = &fContextInitialMatrix;
+    if (drawFilter || skPaint.getPathEffect()) {
+        // This draw can't be cached.
+        INHERITED::drawTextBlob(dc, rt, clip, skPaint, viewMatrix, skBlob, x, y, drawFilter,
+                                clipBounds);
+        return;
     }
 
-    SkDrawCacheProc glyphCacheProc = fSkPaint.getDrawCacheProc();
-    SkAutoGlyphCache autoCache(fSkPaint, &fDeviceProperties, glyphCacheTransform);
-    fGlyphCache = autoCache.getCache();
-    fGlyphs = GlyphPathRange::Create(fContext, fGlyphCache, fStroke);
-    fTransformType = GrDrawTarget::kTranslate_PathTransformType;
+    if (fContext->abandoned()) {
+        return;
+    }
+
+    GrPaint paint;
+    if (!SkPaintToGrPaint(fContext, skPaint, viewMatrix, &paint)) {
+        return;
+    }
+
+    const TextBlob& blob = this->findOrCreateTextBlob(skBlob, skPaint);
+    GrPipelineBuilder pipelineBuilder(paint, rt, clip);
+
+    TextBlob::Iter iter(blob);
+    for (TextRun* run = iter.get(); run; run = iter.next()) {
+        run->draw(fContext, dc, &pipelineBuilder, paint.getColor(), viewMatrix, x, y, clipBounds,
+                  fFallbackTextContext, skPaint);
+        run->releaseGlyphCache();
+    }
+}
+
+const GrStencilAndCoverTextContext::TextBlob&
+GrStencilAndCoverTextContext::findOrCreateTextBlob(const SkTextBlob* skBlob,
+                                                   const SkPaint& skPaint) {
+    // The font-related parameters are baked into the text blob and will override this skPaint, so
+    // the only remaining properties that can affect a TextBlob are the ones related to stroke.
+    if (SkPaint::kFill_Style == skPaint.getStyle()) { // Fast path.
+        if (TextBlob** found = fBlobIdCache.find(skBlob->uniqueID())) {
+            fLRUList.remove(*found);
+            fLRUList.addToTail(*found);
+            return **found;
+        }
+        TextBlob* blob = new TextBlob(skBlob->uniqueID(), skBlob, skPaint);
+        this->purgeToFit(*blob);
+        fBlobIdCache.set(skBlob->uniqueID(), blob);
+        fLRUList.addToTail(blob);
+        fCacheSize += blob->cpuMemorySize();
+        return *blob;
+    } else {
+        GrStrokeInfo stroke(skPaint);
+        SkSTArray<4, uint32_t, true> key;
+        key.reset(1 + stroke.computeUniqueKeyFragmentData32Cnt());
+        key[0] = skBlob->uniqueID();
+        stroke.asUniqueKeyFragment(&key[1]);
+        if (TextBlob** found = fBlobKeyCache.find(key)) {
+            fLRUList.remove(*found);
+            fLRUList.addToTail(*found);
+            return **found;
+        }
+        TextBlob* blob = new TextBlob(key, skBlob, skPaint);
+        this->purgeToFit(*blob);
+        fBlobKeyCache.set(blob);
+        fLRUList.addToTail(blob);
+        fCacheSize += blob->cpuMemorySize();
+        return *blob;
+    }
+}
+
+void GrStencilAndCoverTextContext::purgeToFit(const TextBlob& blob) {
+    static const size_t maxCacheSize = 4 * 1024 * 1024; // Allow up to 4 MB for caching text blobs.
+
+    size_t maxSizeForNewBlob = maxCacheSize - blob.cpuMemorySize();
+    while (fCacheSize && fCacheSize > maxSizeForNewBlob) {
+        TextBlob* lru = fLRUList.head();
+        if (1 == lru->key().count()) {
+            // 1-length keys are unterstood to be the blob id.
+            fBlobIdCache.remove(lru->key()[0]);
+        } else {
+            fBlobKeyCache.remove(lru->key());
+        }
+        fLRUList.remove(lru);
+        fCacheSize -= lru->cpuMemorySize();
+        delete lru;
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+void GrStencilAndCoverTextContext::TextBlob::init(const SkTextBlob* skBlob,
+                                                  const SkPaint& skPaint) {
+    fCpuMemorySize = sizeof(TextBlob);
+    SkPaint runPaint(skPaint);
+    for (SkTextBlobRunIterator iter(skBlob); !iter.done(); iter.next()) {
+        iter.applyFontToPaint(&runPaint); // No need to re-seed the paint.
+        TextRun* run = this->addToTail(runPaint);
+
+        const char* text = reinterpret_cast<const char*>(iter.glyphs());
+        size_t byteLength = sizeof(uint16_t) * iter.glyphCount();
+        const SkPoint& runOffset = iter.offset();
+
+        switch (iter.positioning()) {
+            case SkTextBlob::kDefault_Positioning:
+                run->setText(text, byteLength, runOffset.fX, runOffset.fY);
+                break;
+            case SkTextBlob::kHorizontal_Positioning:
+                run->setPosText(text, byteLength, iter.pos(), 1, SkPoint::Make(0, runOffset.fY));
+                break;
+            case SkTextBlob::kFull_Positioning:
+                run->setPosText(text, byteLength, iter.pos(), 2, SkPoint::Make(0, 0));
+                break;
+        }
+
+        fCpuMemorySize += run->computeSizeInCache();
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+class GrStencilAndCoverTextContext::FallbackBlobBuilder {
+public:
+    FallbackBlobBuilder() : fBuffIdx(0) {}
+
+    bool isInitialized() const { return SkToBool(fBuilder); }
+
+    void init(const SkPaint& font, SkScalar textRatio);
+
+    void appendGlyph(uint16_t glyphId, const SkPoint& pos);
+
+    const SkTextBlob* buildIfInitialized();
+
+private:
+    enum { kWriteBufferSize = 1024 };
+
+    void flush();
+
+    SkAutoTDelete<SkTextBlobBuilder>   fBuilder;
+    SkPaint                            fFont;
+    int                                fBuffIdx;
+    uint16_t                           fGlyphIds[kWriteBufferSize];
+    SkPoint                            fPositions[kWriteBufferSize];
+};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+GrStencilAndCoverTextContext::TextRun::TextRun(const SkPaint& fontAndStroke)
+    : fStroke(fontAndStroke),
+      fFont(fontAndStroke),
+      fTotalGlyphCount(0),
+      fDetachedGlyphCache(nullptr),
+      fLastDrawnGlyphsID(SK_InvalidUniqueID) {
+    SkASSERT(!fStroke.isHairlineStyle()); // Hairlines are not supported.
+
+    // Setting to "fill" ensures that no strokes get baked into font outlines. (We use the GPU path
+    // rendering API for stroking).
+    fFont.setStyle(SkPaint::kFill_Style);
+
+    if (fFont.isFakeBoldText() && SkStrokeRec::kStroke_Style != fStroke.getStyle()) {
+        // Instead of letting fake bold get baked into the glyph outlines, do it with GPU stroke.
+        SkScalar fakeBoldScale = SkScalarInterpFunc(fFont.getTextSize(),
+                                                    kStdFakeBoldInterpKeys,
+                                                    kStdFakeBoldInterpValues,
+                                                    kStdFakeBoldInterpLength);
+        SkScalar extra = SkScalarMul(fFont.getTextSize(), fakeBoldScale);
+        fStroke.setStrokeStyle(fStroke.needToApply() ? fStroke.getWidth() + extra : extra,
+                               true /*strokeAndFill*/);
+
+        fFont.setFakeBoldText(false);
+    }
+
+    if (!fFont.getPathEffect() && !fStroke.isDashed()) {
+        // We can draw the glyphs from canonically sized paths.
+        fTextRatio = fFont.getTextSize() / SkPaint::kCanonicalTextSizeForPaths;
+        fTextInverseRatio = SkPaint::kCanonicalTextSizeForPaths / fFont.getTextSize();
+
+        // Compensate for the glyphs being scaled by fTextRatio.
+        if (!fStroke.isFillStyle()) {
+            fStroke.setStrokeStyle(fStroke.getWidth() / fTextRatio,
+                                   SkStrokeRec::kStrokeAndFill_Style == fStroke.getStyle());
+        }
+
+        fFont.setLinearText(true);
+        fFont.setLCDRenderText(false);
+        fFont.setAutohinted(false);
+        fFont.setHinting(SkPaint::kNo_Hinting);
+        fFont.setSubpixelText(true);
+        fFont.setTextSize(SkIntToScalar(SkPaint::kCanonicalTextSizeForPaths));
+
+        fUsingRawGlyphPaths = SK_Scalar1 == fFont.getTextScaleX() &&
+                              0 == fFont.getTextSkewX() &&
+                              !fFont.isFakeBoldText() &&
+                              !fFont.isVerticalText();
+    } else {
+        fTextRatio = fTextInverseRatio = 1.0f;
+        fUsingRawGlyphPaths = false;
+    }
+
+    // Generate the key that will be used to cache the GPU glyph path objects.
+    if (fUsingRawGlyphPaths && fStroke.isFillStyle()) {
+        static const GrUniqueKey::Domain kRawFillPathGlyphDomain = GrUniqueKey::GenerateDomain();
+
+        const SkTypeface* typeface = fFont.getTypeface();
+        GrUniqueKey::Builder builder(&fGlyphPathsKey, kRawFillPathGlyphDomain, 1);
+        reinterpret_cast<uint32_t&>(builder[0]) = typeface ? typeface->uniqueID() : 0;
+    } else {
+        static const GrUniqueKey::Domain kPathGlyphDomain = GrUniqueKey::GenerateDomain();
+
+        int strokeDataCount = fStroke.computeUniqueKeyFragmentData32Cnt();
+        if (fUsingRawGlyphPaths) {
+            const SkTypeface* typeface = fFont.getTypeface();
+            GrUniqueKey::Builder builder(&fGlyphPathsKey, kPathGlyphDomain, 2 + strokeDataCount);
+            reinterpret_cast<uint32_t&>(builder[0]) = typeface ? typeface->uniqueID() : 0;
+            reinterpret_cast<uint32_t&>(builder[1]) = strokeDataCount;
+            fStroke.asUniqueKeyFragment(&builder[2]);
+        } else {
+            SkGlyphCache* glyphCache = this->getGlyphCache();
+            const SkTypeface* typeface = glyphCache->getScalerContext()->getTypeface();
+            const SkDescriptor* desc = &glyphCache->getDescriptor();
+            int descDataCount = (desc->getLength() + 3) / 4;
+            GrUniqueKey::Builder builder(&fGlyphPathsKey, kPathGlyphDomain,
+                                         2 + strokeDataCount + descDataCount);
+            reinterpret_cast<uint32_t&>(builder[0]) = typeface ? typeface->uniqueID() : 0;
+            reinterpret_cast<uint32_t&>(builder[1]) = strokeDataCount | (descDataCount << 16);
+            fStroke.asUniqueKeyFragment(&builder[2]);
+            memcpy(&builder[2 + strokeDataCount], desc, desc->getLength());
+        }
+    }
+
+    // When drawing from canonically sized paths, the actual local coords are fTextRatio * coords.
+    fLocalMatrixTemplate.setScale(fTextRatio, fTextRatio);
+}
+
+GrStencilAndCoverTextContext::TextRun::~TextRun() {
+    this->releaseGlyphCache();
+}
+
+void GrStencilAndCoverTextContext::TextRun::setText(const char text[], size_t byteLength,
+                                                    SkScalar x, SkScalar y) {
+    SkASSERT(byteLength == 0 || text != nullptr);
+
+    SkGlyphCache* glyphCache = this->getGlyphCache();
+    SkDrawCacheProc glyphCacheProc = fFont.getDrawCacheProc();
+
+    fDraw.reset(GrPathRangeDraw::Create(GrPathRendering::kTranslate_PathTransformType,
+                                        fTotalGlyphCount = fFont.countText(text, byteLength)));
 
     const char* stop = text + byteLength;
 
     // Measure first if needed.
-    if (fSkPaint.getTextAlign() != SkPaint::kLeft_Align) {
+    if (fFont.getTextAlign() != SkPaint::kLeft_Align) {
         SkFixed    stopX = 0;
         SkFixed    stopY = 0;
 
@@ -180,7 +369,7 @@ void GrStencilAndCoverTextContext::drawText(const GrPaint& paint,
         while (textPtr < stop) {
             // We don't need x, y here, since all subpixel variants will have the
             // same advance.
-            const SkGlyph& glyph = glyphCacheProc(fGlyphCache, &textPtr, 0, 0);
+            const SkGlyph& glyph = glyphCacheProc(glyphCache, &textPtr, 0, 0);
 
             stopX += glyph.fAdvanceX;
             stopY += glyph.fAdvanceY;
@@ -190,7 +379,7 @@ void GrStencilAndCoverTextContext::drawText(const GrPaint& paint,
         SkScalar alignX = SkFixedToScalar(stopX) * fTextRatio;
         SkScalar alignY = SkFixedToScalar(stopY) * fTextRatio;
 
-        if (fSkPaint.getTextAlign() == SkPaint::kCenter_Align) {
+        if (fFont.getTextAlign() == SkPaint::kCenter_Align) {
             alignX = SkScalarHalf(alignX);
             alignY = SkScalarHalf(alignY);
         }
@@ -205,260 +394,225 @@ void GrStencilAndCoverTextContext::drawText(const GrPaint& paint,
 
     SkFixed fx = SkScalarToFixed(x);
     SkFixed fy = SkScalarToFixed(y);
+    FallbackBlobBuilder fallback;
     while (text < stop) {
-        const SkGlyph& glyph = glyphCacheProc(fGlyphCache, &text, 0, 0);
-        fx += SkFixedMul_portable(autokern.adjust(glyph), fixedSizeRatio);
+        const SkGlyph& glyph = glyphCacheProc(glyphCache, &text, 0, 0);
+        fx += SkFixedMul(autokern.adjust(glyph), fixedSizeRatio);
         if (glyph.fWidth) {
-            this->appendGlyph(glyph.getGlyphID(), SkFixedToScalar(fx), SkFixedToScalar(fy));
+            this->appendGlyph(glyph, SkPoint::Make(SkFixedToScalar(fx), SkFixedToScalar(fy)),
+                              &fallback);
         }
 
-        fx += SkFixedMul_portable(glyph.fAdvanceX, fixedSizeRatio);
-        fy += SkFixedMul_portable(glyph.fAdvanceY, fixedSizeRatio);
+        fx += SkFixedMul(glyph.fAdvanceX, fixedSizeRatio);
+        fy += SkFixedMul(glyph.fAdvanceY, fixedSizeRatio);
     }
 
-    this->finish();
+    fFallbackTextBlob.reset(fallback.buildIfInitialized());
 }
 
-void GrStencilAndCoverTextContext::drawPosText(const GrPaint& paint,
-                                               const SkPaint& skPaint,
-                                               const char text[],
-                                               size_t byteLength,
-                                               const SkScalar pos[],
-                                               SkScalar constY,
-                                               int scalarsPerPosition) {
-    SkASSERT(byteLength == 0 || text != NULL);
+void GrStencilAndCoverTextContext::TextRun::setPosText(const char text[], size_t byteLength,
+                                                       const SkScalar pos[], int scalarsPerPosition,
+                                                       const SkPoint& offset) {
+    SkASSERT(byteLength == 0 || text != nullptr);
     SkASSERT(1 == scalarsPerPosition || 2 == scalarsPerPosition);
 
-    // nothing to draw
-    if (text == NULL || byteLength == 0/* || fRC->isEmpty()*/) {
-        return;
-    }
+    SkGlyphCache* glyphCache = this->getGlyphCache();
+    SkDrawCacheProc glyphCacheProc = fFont.getDrawCacheProc();
 
-    // This is the fast path.  Here we do not bake in the device-transform to
-    // the glyph outline or the advances. This is because we do not need to
-    // position the glyphs at all, since the caller has done the positioning.
-    // The positioning is based on SkPaint::measureText of individual
-    // glyphs. That already uses glyph cache without device transforms. Device
-    // transform is not part of SkPaint::measureText API, and thus we use the
-    // same glyphs as what were measured.
-
-    const float textTranslateY = (1 == scalarsPerPosition ? constY : 0);
-    this->init(paint, skPaint, byteLength, kDoNotUse_DeviceSpaceGlyphsBehavior, textTranslateY);
-
-    SkDrawCacheProc glyphCacheProc = fSkPaint.getDrawCacheProc();
-
-    SkAutoGlyphCache autoCache(fSkPaint, &fDeviceProperties, NULL);
-    fGlyphCache = autoCache.getCache();
-    fGlyphs = GlyphPathRange::Create(fContext, fGlyphCache, fStroke);
+    fDraw.reset(GrPathRangeDraw::Create(GrPathRendering::kTranslate_PathTransformType,
+                                        fTotalGlyphCount = fFont.countText(text, byteLength)));
 
     const char* stop = text + byteLength;
 
-    if (SkPaint::kLeft_Align == fSkPaint.getTextAlign()) {
-        if (1 == scalarsPerPosition) {
-            fTransformType = GrDrawTarget::kTranslateX_PathTransformType;
-            while (text < stop) {
-                const SkGlyph& glyph = glyphCacheProc(fGlyphCache, &text, 0, 0);
-                if (glyph.fWidth) {
-                    this->appendGlyph(glyph.getGlyphID(), *pos);
-                }
-                pos++;
-            }
+    SkTextMapStateProc tmsProc(SkMatrix::I(), offset, scalarsPerPosition);
+    SkTextAlignProc alignProc(fFont.getTextAlign());
+    FallbackBlobBuilder fallback;
+    while (text < stop) {
+        const SkGlyph& glyph = glyphCacheProc(glyphCache, &text, 0, 0);
+        if (glyph.fWidth) {
+            SkPoint tmsLoc;
+            tmsProc(pos, &tmsLoc);
+            SkPoint loc;
+            alignProc(tmsLoc, glyph, &loc);
+
+            this->appendGlyph(glyph, loc, &fallback);
+        }
+        pos += scalarsPerPosition;
+    }
+
+    fFallbackTextBlob.reset(fallback.buildIfInitialized());
+}
+
+GrPathRange* GrStencilAndCoverTextContext::TextRun::createGlyphs(GrContext* ctx) const {
+    GrPathRange* glyphs = static_cast<GrPathRange*>(
+            ctx->resourceProvider()->findAndRefResourceByUniqueKey(fGlyphPathsKey));
+    if (nullptr == glyphs) {
+        if (fUsingRawGlyphPaths) {
+            glyphs = ctx->resourceProvider()->createGlyphs(fFont.getTypeface(), nullptr, fStroke);
         } else {
-            SkASSERT(2 == scalarsPerPosition);
-            fTransformType = GrDrawTarget::kTranslate_PathTransformType;
-            while (text < stop) {
-                const SkGlyph& glyph = glyphCacheProc(fGlyphCache, &text, 0, 0);
-                if (glyph.fWidth) {
-                    this->appendGlyph(glyph.getGlyphID(), pos[0], pos[1]);
-                }
-                pos += 2;
-            }
-        }
-    } else {
-        fTransformType = GrDrawTarget::kTranslate_PathTransformType;
-        SkTextMapStateProc tmsProc(SkMatrix::I(), 0, scalarsPerPosition);
-        SkTextAlignProcScalar alignProc(fSkPaint.getTextAlign());
-        while (text < stop) {
-            const SkGlyph& glyph = glyphCacheProc(fGlyphCache, &text, 0, 0);
-            if (glyph.fWidth) {
-                SkPoint tmsLoc;
-                tmsProc(pos, &tmsLoc);
-                SkPoint loc;
-                alignProc(tmsLoc, glyph, &loc);
-
-                this->appendGlyph(glyph.getGlyphID(), loc.x(), loc.y());
-            }
-            pos += scalarsPerPosition;
+            SkGlyphCache* cache = this->getGlyphCache();
+            glyphs = ctx->resourceProvider()->createGlyphs(cache->getScalerContext()->getTypeface(),
+                                                           &cache->getDescriptor(),
+                                                           fStroke);
         }
+        ctx->resourceProvider()->assignUniqueKeyToResource(fGlyphPathsKey, glyphs);
     }
-
-    this->finish();
+    return glyphs;
 }
 
-bool GrStencilAndCoverTextContext::canDraw(const SkPaint& paint) {
-    if (paint.getRasterizer()) {
-        return false;
+inline void GrStencilAndCoverTextContext::TextRun::appendGlyph(const SkGlyph& glyph,
+                                                               const SkPoint& pos,
+                                                               FallbackBlobBuilder* fallback) {
+    // Stick the glyphs we can't draw into the fallback text blob.
+    if (SkMask::kARGB32_Format == glyph.fMaskFormat) {
+        if (!fallback->isInitialized()) {
+            fallback->init(fFont, fTextRatio);
+        }
+        fallback->appendGlyph(glyph.getGlyphID(), pos);
+    } else {
+        float translate[] = { fTextInverseRatio * pos.x(), fTextInverseRatio * pos.y() };
+        fDraw->append(glyph.getGlyphID(), translate);
     }
-    if (paint.getMaskFilter()) {
-        return false;
-    }
-    if (paint.getPathEffect()) {
-        return false;
-    }
-
-    // No hairlines unless we can map the 1 px width to the object space.
-    if (paint.getStyle() == SkPaint::kStroke_Style
-        && paint.getStrokeWidth() == 0
-        && fContext->getMatrix().hasPerspective()) {
-        return false;
-    }
-
-    // No color bitmap fonts.
-    SkScalerContext::Rec    rec;
-    SkScalerContext::MakeRec(paint, &fDeviceProperties, NULL, &rec);
-    return rec.getFormat() != SkMask::kARGB32_Format;
 }
 
-void GrStencilAndCoverTextContext::init(const GrPaint& paint,
-                                        const SkPaint& skPaint,
-                                        size_t textByteLength,
-                                        DeviceSpaceGlyphsBehavior deviceSpaceGlyphsBehavior,
-                                        SkScalar textTranslateY) {
-    GrTextContext::init(paint, skPaint);
+void GrStencilAndCoverTextContext::TextRun::draw(GrContext* ctx,
+                                                 GrDrawContext* dc,
+                                                 GrPipelineBuilder* pipelineBuilder,
+                                                 GrColor color,
+                                                 const SkMatrix& viewMatrix,
+                                                 SkScalar x, SkScalar y,
+                                                 const SkIRect& clipBounds,
+                                                 GrTextContext* fallbackTextContext,
+                                                 const SkPaint& originalSkPaint) const {
+    SkASSERT(fDraw);
+    SkASSERT(pipelineBuilder->getRenderTarget()->isStencilBufferMultisampled() ||
+             !fFont.isAntiAlias());
 
-    fContextInitialMatrix = fContext->getMatrix();
+    if (fDraw->count()) {
+        pipelineBuilder->setState(GrPipelineBuilder::kHWAntialias_Flag, fFont.isAntiAlias());
 
-    bool otherBackendsWillDrawAsPaths =
-        SkDraw::ShouldDrawTextAsPaths(skPaint, fContextInitialMatrix);
+        GR_STATIC_CONST_SAME_STENCIL(kStencilPass,
+                                     kZero_StencilOp,
+                                     kKeep_StencilOp,
+                                     kNotEqual_StencilFunc,
+                                     0xffff,
+                                     0x0000,
+                                     0xffff);
 
-    if (otherBackendsWillDrawAsPaths) {
-        // This is to reproduce SkDraw::drawText_asPaths glyph positions.
-        fSkPaint.setLinearText(true);
-        fTextRatio = fSkPaint.getTextSize() / SkPaint::kCanonicalTextSizeForPaths;
-        fTextInverseRatio = SkPaint::kCanonicalTextSizeForPaths / fSkPaint.getTextSize();
-        fSkPaint.setTextSize(SkIntToScalar(SkPaint::kCanonicalTextSizeForPaths));
-        if (fSkPaint.getStyle() != SkPaint::kFill_Style) {
-            // Compensate the glyphs being scaled up by fTextRatio by scaling the
-            // stroke down.
-            fSkPaint.setStrokeWidth(fSkPaint.getStrokeWidth() / fTextRatio);
+        *pipelineBuilder->stencil() = kStencilPass;
+
+        SkAutoTUnref<GrPathRange> glyphs(this->createGlyphs(ctx));
+        if (fLastDrawnGlyphsID != glyphs->getUniqueID()) {
+            // Either this is the first draw or the glyphs object was purged since last draw.
+            glyphs->loadPathsIfNeeded(fDraw->indices(), fDraw->count());
+            fLastDrawnGlyphsID = glyphs->getUniqueID();
         }
-        fNeedsDeviceSpaceGlyphs = false;
-    } else {
-        fTextRatio = fTextInverseRatio = 1.0f;
-        fNeedsDeviceSpaceGlyphs =
-            kUseIfNeeded_DeviceSpaceGlyphsBehavior == deviceSpaceGlyphsBehavior &&
-            (fContextInitialMatrix.getType() &
-                (SkMatrix::kScale_Mask | SkMatrix::kAffine_Mask)) != 0;
-        // SkDraw::ShouldDrawTextAsPaths takes care of perspective transforms.
-        SkASSERT(!fContextInitialMatrix.hasPerspective());
+
+        SkMatrix drawMatrix(viewMatrix);
+        drawMatrix.preTranslate(x, y);
+        drawMatrix.preScale(fTextRatio, fTextRatio);
+
+        SkMatrix& localMatrix = fLocalMatrixTemplate;
+        localMatrix.setTranslateX(x);
+        localMatrix.setTranslateY(y);
+
+        // Don't compute a bounding box. For dst copy texture, we'll opt instead for it to just copy
+        // the entire dst. Realistically this is a moot point, because any context that supports
+        // NV_path_rendering will also support NV_blend_equation_advanced.
+        // For clipping we'll just skip any optimizations based on the bounds. This does, however,
+        // hurt batching.
+        SkRect bounds = SkRect::MakeIWH(pipelineBuilder->getRenderTarget()->width(),
+                                        pipelineBuilder->getRenderTarget()->height());
+
+        dc->drawPathsFromRange(pipelineBuilder, drawMatrix, localMatrix, color, glyphs, fDraw,
+                               GrPathRendering::kWinding_FillType, bounds);
     }
 
-    fStroke = SkStrokeRec(fSkPaint);
-
-    if (fNeedsDeviceSpaceGlyphs) {
-        SkASSERT(1.0f == fTextRatio);
-        SkASSERT(0.0f == textTranslateY);
-        fPaint.localCoordChangeInverse(fContextInitialMatrix);
-        fContext->setIdentityMatrix();
-
-        // The whole shape is baked into the glyph. Make NVPR just fill the
-        // baked shape.
-        fStroke.setStrokeStyle(-1, false);
-    } else {
-        if (1.0f != fTextRatio || 0.0f != textTranslateY) {
-            SkMatrix textMatrix;
-            textMatrix.setTranslate(0, textTranslateY);
-            textMatrix.preScale(fTextRatio, fTextRatio);
-            fPaint.localCoordChange(textMatrix);
-            fContext->concatMatrix(textMatrix);
+    if (fFallbackTextBlob) {
+        SkPaint fallbackSkPaint(originalSkPaint);
+        fStroke.applyToPaint(&fallbackSkPaint);
+        if (!fStroke.isFillStyle()) {
+            fallbackSkPaint.setStrokeWidth(fStroke.getWidth() * fTextRatio);
         }
 
-        if (fSkPaint.getStrokeWidth() == 0.0f) {
-            if (fSkPaint.getStyle() == SkPaint::kStrokeAndFill_Style) {
-                fStroke.setStrokeStyle(-1, false);
-            } else if (fSkPaint.getStyle() == SkPaint::kStroke_Style) {
-                // Approximate hairline stroke.
-                const SkMatrix& ctm = fContext->getMatrix();
-                SkScalar strokeWidth = SK_Scalar1 /
-                    (SkVector::Make(ctm.getScaleX(), ctm.getSkewY()).length());
-                fStroke.setStrokeStyle(strokeWidth, false);
-            }
-        }
-
-        // Make glyph cache produce paths geometry for fill. We will stroke them
-        // by passing fStroke to drawPath. This is the fast path.
-        fSkPaint.setStyle(SkPaint::kFill_Style);
+        fallbackTextContext->drawTextBlob(dc, pipelineBuilder->getRenderTarget(),
+                                          pipelineBuilder->clip(), fallbackSkPaint, viewMatrix,
+                                          fFallbackTextBlob, x, y, nullptr, clipBounds);
     }
-    fStateRestore.set(fDrawTarget->drawState());
-
-    fDrawTarget->drawState()->setFromPaint(fPaint, fContext->getMatrix(),
-                                           fContext->getRenderTarget());
-
-    GR_STATIC_CONST_SAME_STENCIL(kStencilPass,
-                                 kZero_StencilOp,
-                                 kZero_StencilOp,
-                                 kNotEqual_StencilFunc,
-                                 0xffff,
-                                 0x0000,
-                                 0xffff);
-
-    *fDrawTarget->drawState()->stencil() = kStencilPass;
-
-    SkASSERT(0 == fPendingGlyphCount);
 }
 
-inline void GrStencilAndCoverTextContext::appendGlyph(uint16_t glyphID, float x) {
-    SkASSERT(GrDrawTarget::kTranslateX_PathTransformType == fTransformType);
+SkGlyphCache* GrStencilAndCoverTextContext::TextRun::getGlyphCache() const {
+    if (!fDetachedGlyphCache) {
+        fDetachedGlyphCache = fFont.detachCache(nullptr, nullptr, true /*ignoreGamma*/);
+    }
+    return fDetachedGlyphCache;
+}
 
-    if (fPendingGlyphCount >= kGlyphBufferSize) {
+
+void GrStencilAndCoverTextContext::TextRun::releaseGlyphCache() const {
+    if (fDetachedGlyphCache) {
+        SkGlyphCache::AttachCache(fDetachedGlyphCache);
+        fDetachedGlyphCache = nullptr;
+    }
+}
+
+size_t GrStencilAndCoverTextContext::TextRun::computeSizeInCache() const {
+    size_t size = sizeof(TextRun) +
+               fGlyphPathsKey.size() +
+               fTotalGlyphCount * (sizeof(uint16_t) + 2 * sizeof(float));
+    if (fDraw) {
+        size += sizeof(GrPathRangeDraw);
+    }
+    if (fFallbackTextBlob) {
+        size += sizeof(SkTextBlob);
+    }
+    return size;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+void GrStencilAndCoverTextContext::FallbackBlobBuilder::init(const SkPaint& font,
+                                                             SkScalar textRatio) {
+    SkASSERT(!this->isInitialized());
+    fBuilder.reset(new SkTextBlobBuilder);
+    fFont = font;
+    fFont.setTextAlign(SkPaint::kLeft_Align); // The glyph positions will already account for align.
+    fFont.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
+    // No need for subpixel positioning with bitmap glyphs. TODO: revisit if non-bitmap color glyphs
+    // show up and https://code.google.com/p/skia/issues/detail?id=4408 gets resolved.
+    fFont.setSubpixelText(false);
+    fFont.setTextSize(fFont.getTextSize() * textRatio);
+    fBuffIdx = 0;
+}
+
+void GrStencilAndCoverTextContext::FallbackBlobBuilder::appendGlyph(uint16_t glyphId,
+                                                                    const SkPoint& pos) {
+    SkASSERT(this->isInitialized());
+    if (fBuffIdx >= kWriteBufferSize) {
         this->flush();
     }
-
-    fGlyphs->preloadGlyph(glyphID, fGlyphCache);
-
-    fIndexBuffer[fPendingGlyphCount] = glyphID;
-    fTransformBuffer[fPendingGlyphCount] = fTextInverseRatio * x;
-
-    ++fPendingGlyphCount;
+    fGlyphIds[fBuffIdx] = glyphId;
+    fPositions[fBuffIdx] = pos;
+    fBuffIdx++;
 }
 
-inline void GrStencilAndCoverTextContext::appendGlyph(uint16_t glyphID, float x, float y) {
-    SkASSERT(GrDrawTarget::kTranslate_PathTransformType == fTransformType);
-
-    if (fPendingGlyphCount >= kGlyphBufferSize) {
-        this->flush();
-    }
-
-    fGlyphs->preloadGlyph(glyphID, fGlyphCache);
-
-    fIndexBuffer[fPendingGlyphCount] = glyphID;
-    fTransformBuffer[2 * fPendingGlyphCount] = fTextInverseRatio * x;
-    fTransformBuffer[2 * fPendingGlyphCount + 1] = fTextInverseRatio * y;
-
-    ++fPendingGlyphCount;
-}
-
-void GrStencilAndCoverTextContext::flush() {
-    if (0 == fPendingGlyphCount) {
+void GrStencilAndCoverTextContext::FallbackBlobBuilder::flush() {
+    SkASSERT(this->isInitialized());
+    SkASSERT(fBuffIdx <= kWriteBufferSize);
+    if (!fBuffIdx) {
         return;
     }
-
-    fDrawTarget->drawPaths(fGlyphs->pathRange(), fIndexBuffer, fPendingGlyphCount,
-                           fTransformBuffer, fTransformType, SkPath::kWinding_FillType);
-
-    fPendingGlyphCount = 0;
+    // This will automatically merge with previous runs since we use the same font.
+    const SkTextBlobBuilder::RunBuffer& buff = fBuilder->allocRunPos(fFont, fBuffIdx);
+    memcpy(buff.glyphs, fGlyphIds, fBuffIdx * sizeof(uint16_t));
+    memcpy(buff.pos, fPositions[0].asScalars(), fBuffIdx * 2 * sizeof(SkScalar));
+    fBuffIdx = 0;
 }
 
-void GrStencilAndCoverTextContext::finish() {
+const SkTextBlob* GrStencilAndCoverTextContext::FallbackBlobBuilder::buildIfInitialized() {
+    if (!this->isInitialized()) {
+        return nullptr;
+    }
     this->flush();
-
-    SkSafeUnref(fGlyphs);
-    fGlyphs = NULL;
-    fGlyphCache = NULL;
-
-    fDrawTarget->drawState()->stencil()->setDisabled();
-    fStateRestore.set(NULL);
-    fContext->setMatrix(fContextInitialMatrix);
-    GrTextContext::finish();
+    return fBuilder->build();
 }
-
diff --git a/gfx/skia/skia/src/gpu/GrStencilAndCoverTextContext.h b/gfx/skia/skia/src/gpu/GrStencilAndCoverTextContext.h
index 08d7526b7e39..af1403825aba 100644
--- a/gfx/skia/skia/src/gpu/GrStencilAndCoverTextContext.h
+++ b/gfx/skia/skia/src/gpu/GrStencilAndCoverTextContext.h
@@ -9,12 +9,15 @@
 #define GrStencilAndCoverTextContext_DEFINED
 
 #include "GrTextContext.h"
-#include "GrDrawState.h"
 #include "GrDrawTarget.h"
-#include "SkStrokeRec.h"
+#include "GrStrokeInfo.h"
+#include "SkTHash.h"
+#include "SkTInternalLList.h"
+#include "SkTLList.h"
 
 class GrTextStrike;
 class GrPath;
+class SkSurfaceProps;
 
 /*
  * This class implements text rendering using stencil and cover path rendering
@@ -23,47 +26,117 @@ class GrPath;
  */
 class GrStencilAndCoverTextContext : public GrTextContext {
 public:
-    GrStencilAndCoverTextContext(GrContext*, const SkDeviceProperties&);
+    static GrStencilAndCoverTextContext* Create(GrContext*, const SkSurfaceProps&);
+
     virtual ~GrStencilAndCoverTextContext();
 
-    virtual void drawText(const GrPaint&, const SkPaint&, const char text[],
-                          size_t byteLength,
-                          SkScalar x, SkScalar y) SK_OVERRIDE;
-    virtual void drawPosText(const GrPaint&, const SkPaint&,
-                             const char text[], size_t byteLength,
-                             const SkScalar pos[], SkScalar constY,
-                             int scalarsPerPosition) SK_OVERRIDE;
-
-    virtual bool canDraw(const SkPaint& paint) SK_OVERRIDE;
-
 private:
-    class GlyphPathRange;
-    static const int kGlyphBufferSize = 1024;
+    GrStencilAndCoverTextContext(GrContext*, const SkSurfaceProps&);
 
-    enum DeviceSpaceGlyphsBehavior {
-        kUseIfNeeded_DeviceSpaceGlyphsBehavior,
-        kDoNotUse_DeviceSpaceGlyphsBehavior,
+    bool canDraw(const SkPaint& skPaint, const SkMatrix&) override {
+        return this->internalCanDraw(skPaint);
+    }
+
+    bool internalCanDraw(const SkPaint&);
+
+    void onDrawText(GrDrawContext*, GrRenderTarget*, const GrClip&, const GrPaint&, const SkPaint&,
+                    const SkMatrix& viewMatrix,
+                    const char text[], size_t byteLength,
+                    SkScalar x, SkScalar y, const SkIRect& clipBounds) override;
+    void onDrawPosText(GrDrawContext*, GrRenderTarget*,
+                       const GrClip&, const GrPaint&, const SkPaint&,
+                       const SkMatrix& viewMatrix,
+                       const char text[], size_t byteLength,
+                       const SkScalar pos[], int scalarsPerPosition,
+                       const SkPoint& offset, const SkIRect& clipBounds) override;
+    void drawTextBlob(GrDrawContext*, GrRenderTarget*, const GrClip&, const SkPaint&,
+                      const SkMatrix& viewMatrix, const SkTextBlob*, SkScalar x, SkScalar y,
+                      SkDrawFilter*, const SkIRect& clipBounds) override;
+
+    class FallbackBlobBuilder;
+
+    class TextRun {
+    public:
+        TextRun(const SkPaint& fontAndStroke);
+        ~TextRun();
+
+        void setText(const char text[], size_t byteLength, SkScalar x, SkScalar y);
+
+        void setPosText(const char text[], size_t byteLength, const SkScalar pos[],
+                        int scalarsPerPosition, const SkPoint& offset);
+
+        void draw(GrContext*, GrDrawContext*, GrPipelineBuilder*, GrColor, const SkMatrix&,
+                  SkScalar x, SkScalar y, const SkIRect& clipBounds,
+                  GrTextContext* fallbackTextContext, const SkPaint& originalSkPaint) const;
+
+        void releaseGlyphCache() const;
+
+        size_t computeSizeInCache() const;
+
+    private:
+        SkGlyphCache* getGlyphCache() const;
+        GrPathRange* createGlyphs(GrContext*) const;
+        void appendGlyph(const SkGlyph&, const SkPoint&, FallbackBlobBuilder*);
+
+        GrStrokeInfo                     fStroke;
+        SkPaint                          fFont;
+        SkScalar                         fTextRatio;
+        float                            fTextInverseRatio;
+        bool                             fUsingRawGlyphPaths;
+        GrUniqueKey                      fGlyphPathsKey;
+        int                              fTotalGlyphCount;
+        SkAutoTUnref<GrPathRangeDraw>    fDraw;
+        SkAutoTUnref<const SkTextBlob>   fFallbackTextBlob;
+        mutable SkGlyphCache*            fDetachedGlyphCache;
+        mutable uint32_t                 fLastDrawnGlyphsID;
+        mutable SkMatrix                 fLocalMatrixTemplate;
     };
-    void init(const GrPaint&, const SkPaint&, size_t textByteLength,
-              DeviceSpaceGlyphsBehavior, SkScalar textTranslateY = 0);
-    void initGlyphs(SkGlyphCache* cache);
-    void appendGlyph(uint16_t glyphID, float x);
-    void appendGlyph(uint16_t glyphID, float x, float y);
-    void flush();
-    void finish();
 
-    GrDrawState::AutoRestoreEffects fStateRestore;
-    SkScalar fTextRatio;
-    float fTextInverseRatio;
-    SkStrokeRec fStroke;
-    SkGlyphCache* fGlyphCache;
-    GlyphPathRange* fGlyphs;
-    uint32_t fIndexBuffer[kGlyphBufferSize];
-    float fTransformBuffer[2 * kGlyphBufferSize];
-    GrDrawTarget::PathTransformType fTransformType;
-    int fPendingGlyphCount;
-    SkMatrix fContextInitialMatrix;
-    bool fNeedsDeviceSpaceGlyphs;
+    // Text blobs/caches.
+
+    class TextBlob : public SkTLList<TextRun, 1> {
+    public:
+        typedef SkTArray<uint32_t, true> Key;
+
+        static const Key& GetKey(const TextBlob* blob) { return blob->key(); }
+
+        static uint32_t Hash(const Key& key) {
+            SkASSERT(key.count() > 1); // 1-length keys should be using the blob-id hash map.
+            return SkChecksum::Murmur3(key.begin(), sizeof(uint32_t) * key.count());
+        }
+
+        TextBlob(uint32_t blobId, const SkTextBlob* skBlob, const SkPaint& skPaint)
+            : fKey(&blobId, 1) { this->init(skBlob, skPaint); }
+
+        TextBlob(const Key& key, const SkTextBlob* skBlob, const SkPaint& skPaint)
+            : fKey(key) {
+            // 1-length keys are unterstood to be the blob id and must use the other constructor.
+            SkASSERT(fKey.count() > 1);
+            this->init(skBlob, skPaint);
+        }
+
+        const Key& key() const { return fKey; }
+
+        size_t cpuMemorySize() const { return fCpuMemorySize; }
+
+    private:
+        void init(const SkTextBlob*, const SkPaint&);
+
+        const SkSTArray<1, uint32_t, true>   fKey;
+        size_t                               fCpuMemorySize;
+
+        SK_DECLARE_INTERNAL_LLIST_INTERFACE(TextBlob);
+    };
+
+    const TextBlob& findOrCreateTextBlob(const SkTextBlob*, const SkPaint&);
+    void purgeToFit(const TextBlob&);
+
+    SkTHashMap<uint32_t, TextBlob*>                           fBlobIdCache;
+    SkTHashTable<TextBlob*, const TextBlob::Key&, TextBlob>   fBlobKeyCache;
+    SkTInternalLList<TextBlob>                                fLRUList;
+    size_t                                                    fCacheSize;
+
+    typedef GrTextContext INHERITED;
 };
 
 #endif
diff --git a/gfx/skia/skia/src/gpu/GrStencilAttachment.cpp b/gfx/skia/skia/src/gpu/GrStencilAttachment.cpp
new file mode 100644
index 000000000000..9b07070b0f73
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrStencilAttachment.cpp
@@ -0,0 +1,19 @@
+
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrStencilAttachment.h"
+#include "GrResourceKey.h"
+
+void GrStencilAttachment::ComputeSharedStencilAttachmentKey(int width, int height, int sampleCnt,
+                                                            GrUniqueKey* key) {
+    static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
+    GrUniqueKey::Builder builder(key, kDomain, 3);
+    builder[0] = width;
+    builder[1] = height;
+    builder[2] = sampleCnt;
+}
diff --git a/gfx/skia/skia/src/gpu/GrStencilBuffer.h b/gfx/skia/skia/src/gpu/GrStencilAttachment.h
similarity index 72%
rename from gfx/skia/skia/src/gpu/GrStencilBuffer.h
rename to gfx/skia/skia/src/gpu/GrStencilAttachment.h
index 86fef50225b4..2aa8e8ce55b8 100644
--- a/gfx/skia/skia/src/gpu/GrStencilBuffer.h
+++ b/gfx/skia/skia/src/gpu/GrStencilAttachment.h
@@ -7,20 +7,20 @@
  */
 
 
-#ifndef GrStencilBuffer_DEFINED
-#define GrStencilBuffer_DEFINED
+#ifndef GrStencilAttachment_DEFINED
+#define GrStencilAttachment_DEFINED
 
-#include "GrClipData.h"
+#include "GrClip.h"
 #include "GrGpuResource.h"
 
 class GrRenderTarget;
 class GrResourceKey;
 
-class GrStencilBuffer : public GrGpuResource {
+class GrStencilAttachment : public GrGpuResource {
 public:
-    SK_DECLARE_INST_COUNT(GrStencilBuffer);
+    
 
-    virtual ~GrStencilBuffer() {
+    virtual ~GrStencilAttachment() {
         // TODO: allow SB to be purged and detach itself from rts
     }
 
@@ -47,14 +47,15 @@ public:
                !fLastClipStackRect.contains(clipSpaceRect);
     }
 
-    // Places the sb in the cache. The cache takes a ref of the stencil buffer.
-    void transferToCache();
-
-    static GrResourceKey ComputeKey(int width, int height, int sampleCnt);
+    // We create a unique stencil buffer at each width, height and sampleCnt and share it for
+    // all render targets that require a stencil with those params.
+    static void ComputeSharedStencilAttachmentKey(int width, int height, int sampleCnt,
+                                                  GrUniqueKey* key);
 
 protected:
-    GrStencilBuffer(GrGpu* gpu, bool isWrapped, int width, int height, int bits, int sampleCnt)
-        : GrGpuResource(gpu, isWrapped)
+    GrStencilAttachment(GrGpu* gpu, LifeCycle lifeCycle, int width, int height, int bits,
+                        int sampleCnt)
+        : GrGpuResource(gpu, lifeCycle)
         , fWidth(width)
         , fHeight(height)
         , fBits(bits)
diff --git a/gfx/skia/skia/src/gpu/GrStencilBuffer.cpp b/gfx/skia/skia/src/gpu/GrStencilBuffer.cpp
deleted file mode 100644
index ea7b4fa157a6..000000000000
--- a/gfx/skia/skia/src/gpu/GrStencilBuffer.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrStencilBuffer.h"
-
-#include "GrContext.h"
-#include "GrGpu.h"
-#include "GrResourceCache.h"
-
-void GrStencilBuffer::transferToCache() {
-    SkASSERT(NULL == this->getCacheEntry());
-
-    this->getGpu()->getContext()->addStencilBuffer(this);
-}
-
-namespace {
-// we should never have more than one stencil buffer with same combo of (width,height,samplecount)
-void gen_cache_id(int width, int height, int sampleCnt, GrCacheID* cacheID) {
-    static const GrCacheID::Domain gStencilBufferDomain = GrCacheID::GenerateDomain();
-    GrCacheID::Key key;
-    uint32_t* keyData = key.fData32;
-    keyData[0] = width;
-    keyData[1] = height;
-    keyData[2] = sampleCnt;
-    memset(keyData + 3, 0, sizeof(key) - 3 * sizeof(uint32_t));
-    GR_STATIC_ASSERT(sizeof(key) >= 3 * sizeof(uint32_t));
-    cacheID->reset(gStencilBufferDomain, key);
-}
-}
-
-GrResourceKey GrStencilBuffer::ComputeKey(int width,
-                                          int height,
-                                          int sampleCnt) {
-    // All SBs are created internally to attach to RTs so they all use the same domain.
-    static const GrResourceKey::ResourceType gStencilBufferResourceType =
-        GrResourceKey::GenerateResourceType();
-    GrCacheID id;
-    gen_cache_id(width, height, sampleCnt, &id);
-
-    // we don't use any flags for SBs currently.
-    return GrResourceKey(id, gStencilBufferResourceType, 0);
-}
diff --git a/gfx/skia/skia/src/gpu/GrStrokeInfo.cpp b/gfx/skia/skia/src/gpu/GrStrokeInfo.cpp
new file mode 100644
index 000000000000..3b8ecb660bd0
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrStrokeInfo.cpp
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrStrokeInfo.h"
+#include "GrResourceKey.h"
+#include "SkDashPathPriv.h"
+
+bool all_dash_intervals_zero(const SkScalar* intervals, int count) {
+    for (int i = 0 ; i < count; ++i) {
+        if (intervals[i] != 0) {
+            return false;
+        }
+    }
+    return true;
+}
+
+bool GrStrokeInfo::applyDashToPath(SkPath* dst, GrStrokeInfo* dstStrokeInfo,
+                                   const SkPath& src) const {
+    if (this->isDashed()) {
+        SkPathEffect::DashInfo info;
+        info.fIntervals = fIntervals.get();
+        info.fCount = fIntervals.count();
+        info.fPhase = fDashPhase;
+        GrStrokeInfo filteredStroke(*this, false);
+        // Handle the case where all intervals are 0 and we simply drop the dash effect
+        if (all_dash_intervals_zero(fIntervals.get(), fIntervals.count())) {
+            *dstStrokeInfo = filteredStroke;
+            *dst = src;
+            return true;
+        }
+        // See if we can filter the dash into a path on cpu
+        if (SkDashPath::FilterDashPath(dst, src, &filteredStroke, nullptr, info)) {
+            *dstStrokeInfo = filteredStroke;
+            return true;
+        }
+    }
+    return false;
+}
+
+void GrStrokeInfo::asUniqueKeyFragment(uint32_t* data) const {
+    const int kSkScalarData32Cnt = sizeof(SkScalar) / sizeof(uint32_t);
+    enum {
+        kStyleBits = 2,
+        kJoinBits = 2,
+        kCapBits = 32 - kStyleBits - kJoinBits,
+
+        kJoinShift = kStyleBits,
+        kCapShift = kJoinShift + kJoinBits,
+    };
+
+    static_assert(SkStrokeRec::kStyleCount <= (1 << kStyleBits), "style_shift_will_be_wrong");
+    static_assert(SkPaint::kJoinCount <= (1 << kJoinBits), "cap_shift_will_be_wrong");
+    static_assert(SkPaint::kCapCount <= (1 << kCapBits), "cap_does_not_fit");
+    uint32_t styleKey = this->getStyle();
+    if (this->needToApply()) {
+        styleKey |= this->getJoin() << kJoinShift;
+        styleKey |= this->getCap() << kCapShift;
+    }
+    int i = 0;
+    data[i++] = styleKey;
+
+    // Memcpy the scalar fields. Does not "reinterpret_cast<SkScalar&>(data[i]) = ..." due to
+    // scalars having more strict alignment requirements than what data can guarantee. The
+    // compiler should optimize memcpys to assignments.
+    SkScalar scalar;
+    scalar = this->getMiter();
+    memcpy(&data[i], &scalar, sizeof(scalar));
+    i += kSkScalarData32Cnt;
+
+    scalar = this->getWidth();
+    memcpy(&data[i], &scalar, sizeof(scalar));
+    i += kSkScalarData32Cnt;
+
+    if (this->isDashed()) {
+        SkScalar phase = this->getDashPhase();
+        memcpy(&data[i], &phase, sizeof(phase));
+        i += kSkScalarData32Cnt;
+
+        int32_t count = this->getDashCount() & static_cast<int32_t>(~1);
+        SkASSERT(count == this->getDashCount());
+        const SkScalar* intervals = this->getDashIntervals();
+        int intervalByteCnt = count * sizeof(SkScalar);
+        memcpy(&data[i], intervals, intervalByteCnt);
+        // Enable the line below if fields are added after dashing.
+        SkDEBUGCODE(i += kSkScalarData32Cnt * count);
+    }
+
+    SkASSERT(this->computeUniqueKeyFragmentData32Cnt() == i);
+}
+
diff --git a/gfx/skia/skia/src/gpu/GrStrokeInfo.h b/gfx/skia/skia/src/gpu/GrStrokeInfo.h
index b9ba5eada1a1..9cf7d8302f13 100644
--- a/gfx/skia/skia/src/gpu/GrStrokeInfo.h
+++ b/gfx/skia/skia/src/gpu/GrStrokeInfo.h
@@ -8,92 +8,184 @@
 #ifndef GrStrokeInfo_DEFINED
 #define GrStrokeInfo_DEFINED
 
-#include "SkStrokeRec.h"
 #include "SkPathEffect.h"
+#include "SkStrokeRec.h"
+#include "SkTemplates.h"
+
+class GrUniqueKey;
 
 /*
- * GrStrokeInfo encapsulates the data objects that hold all the pertinent infomation
- * regarding the stroke. The two objects are SkStrokeRec which holds information on fill style,
- * width, miter, cap, and join. The second object is DashInfo. This holds information about the
- * dash like intervals, count, and phase.
+ * GrStrokeInfo encapsulates all the pertinent infomation regarding the stroke. The SkStrokeRec
+ * which holds information on fill style, width, miter, cap, and join. It also holds information
+ * about the dash like intervals, count, and phase.
  */
-class GrStrokeInfo {
-public: 
-    GrStrokeInfo(SkStrokeRec::InitStyle style) :
-        fStroke(style), fDashType(SkPathEffect::kNone_DashType) {}
+class GrStrokeInfo : public SkStrokeRec {
+public:
+    static const GrStrokeInfo& FillInfo() {
+        static const GrStrokeInfo gFill(kFill_InitStyle);
+        return gFill;
+    }
 
-    GrStrokeInfo(const GrStrokeInfo& src, bool includeDash = true) : fStroke(src.fStroke) {
-        if (includeDash) {
-            fDashInfo = src.fDashInfo;
+    GrStrokeInfo(SkStrokeRec::InitStyle style)
+        : INHERITED(style)
+        , fDashType(SkPathEffect::kNone_DashType) {
+    }
+
+    GrStrokeInfo(const GrStrokeInfo& src, bool includeDash = true)
+        : INHERITED(src) {
+        if (includeDash && src.isDashed()) {
             fDashType = src.fDashType;
-            fIntervals.reset(src.dashCount());
-            memcpy(fIntervals.get(), src.fIntervals.get(), src.dashCount() * sizeof(SkScalar));
+            fDashPhase = src.fDashPhase;
+            fIntervals.reset(src.getDashCount());
+            memcpy(fIntervals.get(), src.fIntervals.get(), fIntervals.count() * sizeof(SkScalar));
         } else {
             fDashType = SkPathEffect::kNone_DashType;
         }
     }
 
-    GrStrokeInfo(const SkPaint& paint, SkPaint::Style styleOverride) :
-        fStroke(paint, styleOverride), fDashType(SkPathEffect::kNone_DashType) {
+    GrStrokeInfo(const SkPaint& paint, SkPaint::Style styleOverride)
+        : INHERITED(paint, styleOverride)
+        , fDashType(SkPathEffect::kNone_DashType) {
         this->init(paint);
     }
 
-
-    explicit GrStrokeInfo(const SkPaint& paint) :
-        fStroke(paint), fDashType(SkPathEffect::kNone_DashType) {
+    explicit GrStrokeInfo(const SkPaint& paint)
+        : INHERITED(paint)
+        , fDashType(SkPathEffect::kNone_DashType) {
         this->init(paint);
     }
 
-    const SkStrokeRec& getStrokeRec() const { return fStroke; }
+    GrStrokeInfo& operator=(const GrStrokeInfo& other) {
+        if (other.isDashed()) {
+            fDashType = other.fDashType;
+            fDashPhase = other.fDashPhase;
+            fIntervals.reset(other.getDashCount());
+            memcpy(fIntervals.get(), other.fIntervals.get(), fIntervals.count() * sizeof(SkScalar));
+        } else {
+            this->removeDash();
+        }
+        this->INHERITED::operator=(other);
+        return *this;
+    }
 
-    SkStrokeRec* getStrokeRecPtr() { return &fStroke; }
-
-    void setFillStyle() { fStroke.setFillStyle(); }
+    bool hasEqualEffect(const GrStrokeInfo& other) const {
+        if (this->isDashed() != other.isDashed()) {
+            return false;
+        }
+        if (this->isDashed()) {
+            if (fDashPhase != other.fDashPhase ||
+                fIntervals.count() != other.fIntervals.count() ||
+                memcmp(fIntervals.get(), other.fIntervals.get(),
+                       fIntervals.count() * sizeof(SkScalar)) != 0) {
+                return false;
+            }
+        }
+        return this->INHERITED::hasEqualEffect(other);
+    }
 
     /*
-     * This functions takes in a patheffect and fills in fDashInfo with the various dashing
-     * information if the path effect is a Dash type. Returns true if the path effect is a
-     * dashed effect and we are stroking, otherwise it retruns false.
+     * This functions takes in a patheffect and updates the dashing information if the path effect
+     * is a Dash type. Returns true if the path effect is a dashed effect and we are stroking,
+     * otherwise it returns false.
      */
     bool setDashInfo(const SkPathEffect* pe) {
-        if (NULL != pe && !fStroke.isFillStyle()) {
-            fDashInfo.fIntervals = NULL;
-            fDashType = pe->asADash(&fDashInfo);
+        if (pe && !this->isFillStyle()) {
+            SkPathEffect::DashInfo dashInfo;
+            fDashType = pe->asADash(&dashInfo);
             if (SkPathEffect::kDash_DashType == fDashType) {
-                fIntervals.reset(fDashInfo.fCount);
-                fDashInfo.fIntervals = fIntervals.get();
-                pe->asADash(&fDashInfo);
+                fIntervals.reset(dashInfo.fCount);
+                dashInfo.fIntervals = fIntervals.get();
+                pe->asADash(&dashInfo);
+                fDashPhase = dashInfo.fPhase;
                 return true;
             }
         }
         return false;
     }
 
-    bool isDashed() const {
-        return (!fStroke.isFillStyle() && SkPathEffect::kDash_DashType == fDashType);
+    /*
+     * Like the above, but sets with an explicit SkPathEffect::DashInfo
+     */
+    bool setDashInfo(const SkPathEffect::DashInfo& info) {
+        if (!this->isFillStyle()) {
+            fDashType = SkPathEffect::kDash_DashType;
+            fDashPhase = info.fPhase;
+            fIntervals.reset(info.fCount);
+            for (int i = 0; i < fIntervals.count(); i++) {
+                fIntervals[i] = info.fIntervals[i];
+            }
+            return true;
+        }
+        return false;
     }
 
-    int32_t dashCount() const {
-        return fDashInfo.fCount;
+    bool isDashed() const {
+        return (!this->isFillStyle() && SkPathEffect::kDash_DashType == fDashType);
+    }
+
+    int32_t getDashCount() const {
+        SkASSERT(this->isDashed());
+        return fIntervals.count();
+    }
+
+    SkScalar getDashPhase() const {
+        SkASSERT(this->isDashed());
+        return fDashPhase;
+    }
+
+    const SkScalar* getDashIntervals() const {
+        SkASSERT(this->isDashed());
+        return fIntervals.get();
     }
 
     void removeDash() {
         fDashType = SkPathEffect::kNone_DashType;
     }
-    
-    const SkPathEffect::DashInfo& getDashInfo() const { return fDashInfo; }
+
+    /** Applies the dash to a path, if the stroke info has dashing.
+     * @return true if the dashing was applied (dst and dstStrokeInfo will be modified).
+     *         false if the stroke info did not have dashing. The dst and dstStrokeInfo
+     *               will be unmodified. The stroking in the SkStrokeRec might still
+     *               be applicable.
+     */
+    bool applyDashToPath(SkPath* dst, GrStrokeInfo* dstStrokeInfo, const SkPath& src) const;
+
+    /**
+     * Computes the length of the data that will be written by asUniqueKeyFragment() function.
+     */
+    int computeUniqueKeyFragmentData32Cnt() const {
+        const int kSkScalarData32Cnt = sizeof(SkScalar) / sizeof(uint32_t);
+        // SkStrokeRec data: 32 bits for style+join+cap and 2 scalars for miter and width.
+        int strokeKeyData32Cnt = 1 + 2 * kSkScalarData32Cnt;
+
+        if (this->isDashed()) {
+            // One scalar for dash phase and one for each dash value.
+            strokeKeyData32Cnt += (1 + this->getDashCount()) * kSkScalarData32Cnt;
+        }
+        return strokeKeyData32Cnt;
+    }
+
+    /**
+     * Writes the object contents as uint32_t data, to be used with GrUniqueKey.
+     * Note: the data written does not encode the length, so care must be taken to ensure
+     * that the full unique key data is encoded properly. For example, GrStrokeInfo
+     * fragment can be placed last in the sequence, at fixed index.
+     */
+    void asUniqueKeyFragment(uint32_t*) const;
 
 private:
+    // Prevent accidental usage, should use GrStrokeInfo::hasEqualEffect.
+    bool hasEqualEffect(const SkStrokeRec& other) const;
 
     void init(const SkPaint& paint) {
         const SkPathEffect* pe = paint.getPathEffect();
         this->setDashInfo(pe);
     }
 
-    SkStrokeRec            fStroke;
     SkPathEffect::DashType fDashType;
-    SkPathEffect::DashInfo fDashInfo;
+    SkScalar               fDashPhase;
     SkAutoSTArray<2, SkScalar> fIntervals;
+    typedef SkStrokeRec INHERITED;
 };
 
 #endif
diff --git a/gfx/skia/skia/src/gpu/GrSurface.cpp b/gfx/skia/skia/src/gpu/GrSurface.cpp
index a07fe67ae458..382550e41fc4 100644
--- a/gfx/skia/skia/src/gpu/GrSurface.cpp
+++ b/gfx/skia/skia/src/gpu/GrSurface.cpp
@@ -6,32 +6,136 @@
  */
 
 #include "GrSurface.h"
+#include "GrContext.h"
+#include "GrSurfacePriv.h"
 
 #include "SkBitmap.h"
-#include "SkGr.h"
+#include "SkGrPriv.h"
 #include "SkImageEncoder.h"
 #include <stdio.h>
 
-SkImageInfo GrSurface::info() const {
-    SkImageInfo info;
-    if (!GrPixelConfig2ColorType(this->config(), &info.fColorType)) {
-        sk_throw();
+size_t GrSurface::WorseCaseSize(const GrSurfaceDesc& desc) {
+    size_t size;
+
+    bool isRenderTarget = SkToBool(desc.fFlags & kRenderTarget_GrSurfaceFlag);
+    if (isRenderTarget) {
+        // We own one color value for each MSAA sample.
+        int colorValuesPerPixel = SkTMax(1, desc.fSampleCnt);
+        if (desc.fSampleCnt) {
+            // Worse case, we own the resolve buffer so that is one more sample per pixel.
+            colorValuesPerPixel += 1;
+        }
+        SkASSERT(kUnknown_GrPixelConfig != desc.fConfig);
+        SkASSERT(!GrPixelConfigIsCompressed(desc.fConfig));
+        size_t colorBytes = GrBytesPerPixel(desc.fConfig);
+        SkASSERT(colorBytes > 0);
+        size = colorValuesPerPixel * desc.fWidth * desc.fHeight * colorBytes;
+    } else {
+        if (GrPixelConfigIsCompressed(desc.fConfig)) {
+            size = GrCompressedFormatDataSize(desc.fConfig, desc.fWidth, desc.fHeight);
+        } else {
+            size = (size_t) desc.fWidth * desc.fHeight * GrBytesPerPixel(desc.fConfig);
+        }
+
+        size += size/3;  // in case we have to mipmap
     }
-    info.fWidth = this->width();
-    info.fHeight = this->height();
-    info.fAlphaType = kPremul_SkAlphaType;
-    return info;
+
+    return size;
 }
 
+template<typename T> static bool adjust_params(int surfaceWidth,
+                                               int surfaceHeight,
+                                               size_t bpp,
+                                               int* left, int* top, int* width, int* height,
+                                               T** data,
+                                               size_t* rowBytes) {
+    if (!*rowBytes) {
+        *rowBytes = *width * bpp;
+    }
+
+    SkIRect subRect = SkIRect::MakeXYWH(*left, *top, *width, *height);
+    SkIRect bounds = SkIRect::MakeWH(surfaceWidth, surfaceHeight);
+
+    if (!subRect.intersect(bounds)) {
+        return false;
+    }
+    *data = reinterpret_cast<void*>(reinterpret_cast<intptr_t>(*data) +
+            (subRect.fTop - *top) * *rowBytes + (subRect.fLeft - *left) * bpp);
+
+    *left = subRect.fLeft;
+    *top = subRect.fTop;
+    *width = subRect.width();
+    *height = subRect.height();
+    return true;
+}
+
+bool GrSurfacePriv::AdjustReadPixelParams(int surfaceWidth,
+                                          int surfaceHeight,
+                                          size_t bpp,
+                                          int* left, int* top, int* width, int* height,
+                                          void** data,
+                                          size_t* rowBytes) {
+    return adjust_params<void>(surfaceWidth, surfaceHeight, bpp, left, top, width, height, data,
+                               rowBytes);
+}
+
+bool GrSurfacePriv::AdjustWritePixelParams(int surfaceWidth,
+                                           int surfaceHeight,
+                                           size_t bpp,
+                                           int* left, int* top, int* width, int* height,
+                                           const void** data,
+                                           size_t* rowBytes) {
+    return adjust_params<const void>(surfaceWidth, surfaceHeight, bpp, left, top, width, height,
+                                     data, rowBytes);
+}
+
+
+//////////////////////////////////////////////////////////////////////////////
+
+bool GrSurface::writePixels(int left, int top, int width, int height,
+                            GrPixelConfig config, const void* buffer, size_t rowBytes,
+                            uint32_t pixelOpsFlags) {
+    // go through context so that all necessary flushing occurs
+    GrContext* context = this->getContext();
+    if (nullptr == context) {
+        return false;
+    }
+    return context->writeSurfacePixels(this, left, top, width, height, config, buffer, rowBytes,
+                                       pixelOpsFlags);
+}
+
+bool GrSurface::readPixels(int left, int top, int width, int height,
+                           GrPixelConfig config, void* buffer, size_t rowBytes,
+                           uint32_t pixelOpsFlags) {
+    // go through context so that all necessary flushing occurs
+    GrContext* context = this->getContext();
+    if (nullptr == context) {
+        return false;
+    }
+    return context->readSurfacePixels(this, left, top, width, height, config, buffer,
+                                      rowBytes, pixelOpsFlags);
+}
+
+SkImageInfo GrSurface::info(SkAlphaType alphaType) const {
+    SkColorType colorType;
+    SkColorProfileType profileType;
+    if (!GrPixelConfig2ColorAndProfileType(this->config(), &colorType, &profileType)) {
+        sk_throw();
+    }
+    return SkImageInfo::Make(this->width(), this->height(), colorType, alphaType,
+                             profileType);
+}
+
+// TODO: This should probably be a non-member helper function. It might only be needed in
+// debug or developer builds.
 bool GrSurface::savePixels(const char* filename) {
     SkBitmap bm;
-    if (!bm.allocPixels(SkImageInfo::MakeN32Premul(this->width(),
-                                                   this->height()))) {
+    if (!bm.tryAllocPixels(SkImageInfo::MakeN32Premul(this->width(), this->height()))) {
         return false;
     }
 
-    bool result = readPixels(0, 0, this->width(), this->height(), kSkia8888_GrPixelConfig,
-                             bm.getPixels());
+    bool result = this->readPixels(0, 0, this->width(), this->height(), kSkia8888_GrPixelConfig,
+                                   bm.getPixels());
     if (!result) {
         SkDebugf("------ failed to read pixels for %s\n", filename);
         return false;
@@ -48,3 +152,61 @@ bool GrSurface::savePixels(const char* filename) {
 
     return true;
 }
+
+void GrSurface::flushWrites() {
+    if (!this->wasDestroyed()) {
+        this->getContext()->flushSurfaceWrites(this);
+    }
+}
+
+void GrSurface::prepareForExternalIO() {
+    if (!this->wasDestroyed()) {
+        this->getContext()->prepareSurfaceForExternalIO(this);
+    }
+}
+
+bool GrSurface::hasPendingRead() const {
+    const GrTexture* thisTex = this->asTexture();
+    if (thisTex && thisTex->internalHasPendingRead()) {
+        return true;
+    }
+    const GrRenderTarget* thisRT = this->asRenderTarget();
+    if (thisRT && thisRT->internalHasPendingRead()) {
+        return true;
+    }
+    return false;
+}
+
+bool GrSurface::hasPendingWrite() const {
+    const GrTexture* thisTex = this->asTexture();
+    if (thisTex && thisTex->internalHasPendingWrite()) {
+        return true;
+    }
+    const GrRenderTarget* thisRT = this->asRenderTarget();
+    if (thisRT && thisRT->internalHasPendingWrite()) {
+        return true;
+    }
+    return false;
+}
+
+bool GrSurface::hasPendingIO() const {
+    const GrTexture* thisTex = this->asTexture();
+    if (thisTex && thisTex->internalHasPendingIO()) {
+        return true;
+    }
+    const GrRenderTarget* thisRT = this->asRenderTarget();
+    if (thisRT && thisRT->internalHasPendingIO()) {
+        return true;
+    }
+    return false;
+}
+
+void GrSurface::onRelease() {
+    this->invokeReleaseProc();
+    this->INHERITED::onRelease();
+}
+
+void GrSurface::onAbandon() {
+    this->invokeReleaseProc();
+    this->INHERITED::onAbandon();
+}
diff --git a/gfx/skia/skia/src/gpu/GrSurfacePriv.h b/gfx/skia/skia/src/gpu/GrSurfacePriv.h
new file mode 100644
index 000000000000..bff411edf3e0
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrSurfacePriv.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrSurfacePriv_DEFINED
+#define GrSurfacePriv_DEFINED
+
+#include "GrSurface.h"
+
+/** Class that adds methods to GrSurface that are only intended for use internal to Skia.
+    This class is purely a privileged window into GrSurface. It should never have additional data
+    members or virtual methods.
+    Non-static methods that are not trivial inlines should be spring-boarded (e.g. declared and
+    implemented privately in GrSurface with a inline public method here). */
+class GrSurfacePriv {
+public:
+    /** Helpers used in read/write pixels implementations. The paramters are adjusted so that the
+        read/write respects the bounds of a surface. If the input *rowBytes is 0 it will be
+        the tight row bytes (based on width and bpp) on output. */
+    static bool AdjustReadPixelParams(int surfaceWidth,
+                                      int surfaceHeight,
+                                      size_t bpp,
+                                      int* left, int* top, int* width, int* height,
+                                      void** data,
+                                      size_t* rowBytes);
+    static bool AdjustWritePixelParams(int surfaceWidth,
+                                      int surfaceHeight,
+                                      size_t bpp,
+                                      int* left, int* top, int* width, int* height,
+                                      const void** data,
+                                      size_t* rowBytes);
+    /**
+     * Derive a SkImageInfo from the surface's descriptor. The caller must provide the alpha type as
+     * GrSurface has no equivalent.
+     */
+    SkImageInfo info(SkAlphaType alphaType) const { return fSurface->info(alphaType); }
+
+    /**
+     * Write the contents of the surface to a PNG. Returns true if successful.
+     * @param filename      Full path to desired file
+     */
+    bool savePixels(const char* filename) { return fSurface->savePixels(filename); }
+
+    bool hasPendingRead() const { return fSurface->hasPendingRead(); }
+    bool hasPendingWrite() const { return fSurface->hasPendingWrite(); }
+    bool hasPendingIO() const { return fSurface->hasPendingIO(); }
+
+private:
+    explicit GrSurfacePriv(GrSurface* surface) : fSurface(surface) {}
+    GrSurfacePriv(const GrSurfacePriv&); // unimpl
+    GrSurfacePriv& operator=(const GrSurfacePriv&); // unimpl
+
+    // No taking addresses of this type.
+    const GrSurfacePriv* operator&() const;
+    GrSurfacePriv* operator&();
+
+    GrSurface* fSurface;
+
+    friend class GrSurface; // to construct/copy this type.
+};
+
+inline GrSurfacePriv GrSurface::surfacePriv() { return GrSurfacePriv(this); }
+
+inline const GrSurfacePriv GrSurface::surfacePriv() const {
+    return GrSurfacePriv(const_cast<GrSurface*>(this));
+}
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrTBSearch.h b/gfx/skia/skia/src/gpu/GrTBSearch.h
deleted file mode 100644
index 01e97440a651..000000000000
--- a/gfx/skia/skia/src/gpu/GrTBSearch.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrTBSearch_DEFINED
-#define GrTBSearch_DEFINED
-
-#include "SkTypes.h"
-
-template <typename ELEM, typename KEY>
-int GrTBSearch(const ELEM array[], int count, KEY target) {
-    SkASSERT(count >= 0);
-    if (0 == count) {
-        // we should insert it at 0
-        return ~0;
-    }
-
-    int high = count - 1;
-    int low = 0;
-    while (high > low) {
-        int index = (low + high) >> 1;
-        if (LT(array[index], target)) {
-            low = index + 1;
-        } else {
-            high = index;
-        }
-    }
-
-    // check if we found it
-    if (EQ(array[high], target)) {
-        return high;
-    }
-
-    // now return the ~ of where we should insert it
-    if (LT(array[high], target)) {
-        high += 1;
-    }
-    return ~high;
-}
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/GrTHashTable.h b/gfx/skia/skia/src/gpu/GrTHashTable.h
deleted file mode 100644
index 9da4b06debe9..000000000000
--- a/gfx/skia/skia/src/gpu/GrTHashTable.h
+++ /dev/null
@@ -1,215 +0,0 @@
-
-/*
- * Copyright 2010 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-
-#ifndef GrTHashTable_DEFINED
-#define GrTHashTable_DEFINED
-
-#include "GrTypes.h"
-#include "SkTDArray.h"
-
-/**
- *  Key needs
- *      static bool Equals(const Entry&, const Key&);
- *      static bool LessThan(const Entry&, const Key&);
- *      static bool Equals(const Entry&, const Entry&); for SK_DEBUG if GrTHashTable::validate() is called
- *      static bool LessThan(const Entry&, const Entry&); for SK_DEBUG if GrTHashTable::validate() is called
- *      uint32_t getHash() const;
- *
- *  Allows duplicate key entries but on find you may get
- *  any of the duplicate entries returned.
- */
-template <typename T, typename Key, size_t kHashBits> class GrTHashTable {
-public:
-    GrTHashTable() { this->clearHash(); }
-    ~GrTHashTable() {}
-
-    int count() const { return fSorted.count(); }
-
-    struct Any {
-        // Return the first resource that matches the key.
-        bool operator()(const T*) const { return true; }
-    };
-
-    T* find(const Key& key) const { return this->find(key, Any()); }
-    template <typename Filter> T* find(const Key&, Filter filter) const;
-
-    // return true if key was unique when inserted.
-    bool insert(const Key&, T*);
-    void remove(const Key&, const T*);
-
-    void deleteAll();
-
-#ifdef SK_DEBUG
-    void validate() const;
-    bool contains(T*) const;
-#endif
-
-    // testing
-    const SkTDArray<T*>& getArray() const { return fSorted; }
-    SkTDArray<T*>& getArray() { return fSorted; }
-private:
-    void clearHash() { sk_bzero(fHash, sizeof(fHash)); }
-
-    enum {
-        kHashCount = 1 << kHashBits,
-        kHashMask  = kHashCount - 1
-    };
-    static unsigned hash2Index(intptr_t hash) {
-#if 0
-        if (sizeof(hash) == 8) {
-            hash ^= hash >> 32;
-        }
-#endif
-        hash ^= hash >> 16;
-        if (kHashBits <= 8) {
-            hash ^= hash >> 8;
-        }
-        return hash & kHashMask;
-    }
-
-    mutable T* fHash[kHashCount];
-    SkTDArray<T*> fSorted;
-
-    // search fSorted, and return the found index, or ~index of where it
-    // should be inserted
-    int searchArray(const Key&) const;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
-template <typename T, typename Key, size_t kHashBits>
-int GrTHashTable<T, Key, kHashBits>::searchArray(const Key& key) const {
-    int count = fSorted.count();
-    if (0 == count) {
-        // we should insert it at 0
-        return ~0;
-    }
-
-    const T* const* array = fSorted.begin();
-    int high = count - 1;
-    int low = 0;
-    while (high > low) {
-        int index = (low + high) >> 1;
-        if (Key::LessThan(*array[index], key)) {
-            low = index + 1;
-        } else {
-            high = index;
-        }
-    }
-
-    // check if we found it
-    if (Key::Equals(*array[high], key)) {
-        // above search should have found the first occurrence if there
-        // are multiple.
-        SkASSERT(0 == high || Key::LessThan(*array[high - 1], key));
-        return high;
-    }
-
-    // now return the ~ of where we should insert it
-    if (Key::LessThan(*array[high], key)) {
-        high += 1;
-    }
-    return ~high;
-}
-
-template <typename T, typename Key, size_t kHashBits>
-template <typename Filter>
-T* GrTHashTable<T, Key, kHashBits>::find(const Key& key, Filter filter) const {
-
-    int hashIndex = hash2Index(key.getHash());
-    T* elem = fHash[hashIndex];
-
-    if (NULL != elem && Key::Equals(*elem, key) && filter(elem)) {
-        return elem;
-    }
-
-    // bsearch for the key in our sorted array
-    int index = this->searchArray(key);
-    if (index < 0) {
-        return NULL;
-    }
-
-    const T* const* array = fSorted.begin();
-
-    // above search should have found the first occurrence if there
-    // are multiple.
-    SkASSERT(0 == index || Key::LessThan(*array[index - 1], key));
-
-    for ( ; index < count() && Key::Equals(*array[index], key); ++index) {
-        if (filter(fSorted[index])) {
-            // update the hash
-            fHash[hashIndex] = fSorted[index];
-            return fSorted[index];
-        }
-    }
-
-    return NULL;
-}
-
-template <typename T, typename Key, size_t kHashBits>
-bool GrTHashTable<T, Key, kHashBits>::insert(const Key& key, T* elem) {
-    int index = this->searchArray(key);
-    bool first = index < 0;
-    if (first) {
-        // turn it into the actual index
-        index = ~index;
-    }
-    // add it to our array
-    *fSorted.insert(index) = elem;
-    // update our hash table (overwrites any dupe's position in the hash)
-    fHash[hash2Index(key.getHash())] = elem;
-    return first;
-}
-
-template <typename T, typename Key, size_t kHashBits>
-void GrTHashTable<T, Key, kHashBits>::remove(const Key& key, const T* elem) {
-    int index = hash2Index(key.getHash());
-    if (fHash[index] == elem) {
-        fHash[index] = NULL;
-    }
-
-    // remove from our sorted array
-    index = this->searchArray(key);
-    SkASSERT(index >= 0);
-    // if there are multiple matches searchArray will give us the first match
-    // march forward until we find elem.
-    while (elem != fSorted[index]) {
-        ++index;
-        SkASSERT(index < fSorted.count());
-    }
-    SkASSERT(elem == fSorted[index]);
-    fSorted.remove(index);
-}
-
-template <typename T, typename Key, size_t kHashBits>
-void GrTHashTable<T, Key, kHashBits>::deleteAll() {
-    fSorted.deleteAll();
-    this->clearHash();
-}
-
-#ifdef SK_DEBUG
-template <typename T, typename Key, size_t kHashBits>
-void GrTHashTable<T, Key, kHashBits>::validate() const {
-    int count = fSorted.count();
-    for (int i = 1; i < count; i++) {
-        SkASSERT(Key::LessThan(*fSorted[i - 1], *fSorted[i]) ||
-                 Key::Equals(*fSorted[i - 1], *fSorted[i]));
-    }
-}
-
-template <typename T, typename Key, size_t kHashBits>
-bool GrTHashTable<T, Key, kHashBits>::contains(T* elem) const {
-    int index = fSorted.find(elem);
-    return index >= 0;
-}
-
-#endif
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/GrTRecorder.h b/gfx/skia/skia/src/gpu/GrTRecorder.h
new file mode 100644
index 000000000000..a838ad2955b9
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrTRecorder.h
@@ -0,0 +1,390 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrTRecorder_DEFINED
+#define GrTRecorder_DEFINED
+
+#include "SkTypes.h"
+
+template<typename TBase, typename TAlign> class GrTRecorder;
+template<typename TItem> struct GrTRecorderAllocWrapper;
+
+/**
+ * Records a list of items with a common base type, optional associated data, and
+ * permanent memory addresses.
+ *
+ * This class preallocates its own chunks of memory for hosting objects, so new items can
+ * be created without excessive calls to malloc().
+ *
+ * To create a new item and append it to the back of the list, use the following macros:
+ *
+ *     GrNEW_APPEND_TO_RECORDER(recorder, SubclassName, (args))
+ *     GrNEW_APPEND_WITH_DATA_TO_RECORDER(recorder, SubclassName, (args), sizeOfData)
+ *
+ * Upon reset or delete, the items are destructed in the same order they were received,
+ * not reverse (stack) order.
+ *
+ * @param TBase   Common base type of items in the list. If TBase is not a class with a
+ *                virtual destructor, the client is responsible for invoking any necessary
+ *                destructors.
+ *
+ *                For now, any subclass used in the list must have the same start address
+ *                as TBase (or in other words, the types must be convertible via
+ *                reinterpret_cast<>). Classes with multiple inheritance (or any subclass
+ *                on an obscure compiler) may not be compatible. This is runtime asserted
+ *                in debug builds.
+ *
+ * @param TAlign  A type whose size is the desired memory alignment for object allocations.
+ *                This should be the largest known alignment requirement for all objects
+ *                that may be stored in the list.
+ */
+template<typename TBase, typename TAlign> class GrTRecorder : SkNoncopyable {
+public:
+    class Iter;
+    class ReverseIter;
+
+    /**
+     * Create a recorder.
+     *
+     * @param initialSizeInBytes  The amount of memory reserved by the recorder initially,
+                                  and after calls to reset().
+     */
+    GrTRecorder(int initialSizeInBytes)
+        : fHeadBlock(MemBlock::Alloc(LengthOf(initialSizeInBytes), nullptr)),
+          fTailBlock(fHeadBlock),
+          fLastItem(nullptr) {}
+
+    ~GrTRecorder() {
+        this->reset();
+        MemBlock::Free(fHeadBlock);
+    }
+
+    bool empty() { return !fLastItem; }
+
+    TBase& back() {
+        SkASSERT(!this->empty());
+        return *reinterpret_cast<TBase*>(fLastItem);
+    }
+
+    /**
+     * Removes and destroys the last block added to the recorder. It may not be called when the
+     * recorder is empty.
+     */
+    void pop_back();
+
+    /**
+     * Destruct all items in the list and reset to empty.
+     */
+    void reset();
+
+    /**
+     * Retrieve the extra data associated with an item that was allocated using
+     * GrNEW_APPEND_WITH_DATA_TO_RECORDER().
+     *
+     * @param item  The item whose data to retrieve. The pointer must be of the same type
+     *              that was allocated initally; it can't be a pointer to a base class.
+     *
+     * @return The item's associated data.
+     */
+    template<typename TItem> static const void* GetDataForItem(const TItem* item) {
+        const TAlign* ptr = reinterpret_cast<const TAlign*>(item);
+        return &ptr[length_of<TItem>::kValue];
+    }
+    template<typename TItem> static void* GetDataForItem(TItem* item) {
+        TAlign* ptr = reinterpret_cast<TAlign*>(item);
+        return &ptr[length_of<TItem>::kValue];
+    }
+
+private:
+    template<typename TItem> struct length_of {
+        enum { kValue = (sizeof(TItem) + sizeof(TAlign) - 1) / sizeof(TAlign) };
+    };
+    static int LengthOf(int bytes) { return (bytes + sizeof(TAlign) - 1) / sizeof(TAlign); }
+
+    struct Header {
+        int fTotalLength; // The length of an entry including header, item, and data in TAligns.
+        int fPrevLength;  // Same but for the previous entry. Used for iterating backwards.
+    };
+    template<typename TItem> void* alloc_back(int dataLength);
+
+    struct MemBlock : SkNoncopyable {
+        /** Allocates a new block and appends it to prev if not nullptr. The length param is in units
+            of TAlign. */
+        static MemBlock* Alloc(int length, MemBlock* prev) {
+            MemBlock* block = reinterpret_cast<MemBlock*>(
+                sk_malloc_throw(sizeof(TAlign) * (length_of<MemBlock>::kValue + length)));
+            block->fLength = length;
+            block->fBack = 0;
+            block->fNext = nullptr;
+            block->fPrev = prev;
+            if (prev) {
+                SkASSERT(nullptr == prev->fNext);
+                prev->fNext = block;
+            }
+            return block;
+        }
+
+        // Frees from this block forward. Also adjusts prev block's next ptr.
+        static void Free(MemBlock* block) {
+            if (block && block->fPrev) {
+                SkASSERT(block->fPrev->fNext == block);
+                block->fPrev->fNext = nullptr;
+            }
+            while (block) {
+                MemBlock* next = block->fNext;
+                sk_free(block);
+                block = next;
+            }
+        }
+
+        TAlign& operator [](int i) {
+            return reinterpret_cast<TAlign*>(this)[length_of<MemBlock>::kValue + i];
+        }
+
+        int       fLength; // Length in units of TAlign of the block.
+        int       fBack;   // Offset, in TAligns, to unused portion of the memory block.
+        MemBlock* fNext;
+        MemBlock* fPrev;
+    };
+    MemBlock* const fHeadBlock;
+    MemBlock* fTailBlock;
+
+    void*    fLastItem; // really a ptr to TBase
+
+    template<typename TItem> friend struct GrTRecorderAllocWrapper;
+
+    template <typename UBase, typename UAlign, typename UItem>
+    friend void* operator new(size_t, GrTRecorder<UBase, UAlign>&,
+                              const GrTRecorderAllocWrapper<UItem>&);
+
+    friend class Iter;
+    friend class ReverseIter;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+
+template<typename TBase, typename TAlign>
+void GrTRecorder<TBase, TAlign>::pop_back() {
+    SkASSERT(fLastItem);
+    Header* header = reinterpret_cast<Header*>(
+        reinterpret_cast<TAlign*>(fLastItem) - length_of<Header>::kValue);
+    fTailBlock->fBack -= header->fTotalLength;
+    reinterpret_cast<TBase*>(fLastItem)->~TBase();
+
+    int lastItemLength = header->fPrevLength;
+
+    if (!header->fPrevLength) {
+        // We popped the first entry in the recorder.
+        SkASSERT(0 == fTailBlock->fBack);
+        fLastItem = nullptr;
+        return;
+    }
+    while (!fTailBlock->fBack) {
+        // We popped the last entry in a block that isn't the head block. Move back a block but
+        // don't free it since we'll probably grow into it shortly.
+        fTailBlock = fTailBlock->fPrev;
+        SkASSERT(fTailBlock);
+    }
+    fLastItem = &(*fTailBlock)[fTailBlock->fBack - lastItemLength + length_of<Header>::kValue];
+}
+
+template<typename TBase, typename TAlign>
+template<typename TItem>
+void* GrTRecorder<TBase, TAlign>::alloc_back(int dataLength) {
+    // Find the header of the previous entry and get its length. We need to store that in the new
+    // header for backwards iteration (pop_back()).
+    int prevLength = 0;
+    if (fLastItem) {
+        Header* lastHeader = reinterpret_cast<Header*>(
+            reinterpret_cast<TAlign*>(fLastItem) - length_of<Header>::kValue);
+        prevLength = lastHeader->fTotalLength;
+    }
+
+    const int totalLength = length_of<Header>::kValue + length_of<TItem>::kValue + dataLength;
+
+    // Check if there is room in the current block and if not walk to next (allocating if
+    // necessary). Note that pop_back() and reset() can leave the recorder in a state where it
+    // has preallocated blocks hanging off the tail that are currently unused.
+    while (fTailBlock->fBack + totalLength > fTailBlock->fLength) {
+        if (!fTailBlock->fNext) {
+            fTailBlock = MemBlock::Alloc(SkTMax(2 * fTailBlock->fLength, totalLength), fTailBlock);
+        } else {
+            fTailBlock = fTailBlock->fNext;
+        }
+        SkASSERT(0 == fTailBlock->fBack);
+    }
+
+    Header* header = reinterpret_cast<Header*>(&(*fTailBlock)[fTailBlock->fBack]);
+    void* rawPtr = &(*fTailBlock)[fTailBlock->fBack + length_of<Header>::kValue];
+
+    header->fTotalLength = totalLength;
+    header->fPrevLength = prevLength;
+    fLastItem = rawPtr;
+    fTailBlock->fBack += totalLength;
+
+    // FIXME: We currently require that the base and subclass share the same start address.
+    // This is not required by the C++ spec, and is likely to not be true in the case of
+    // multiple inheritance or a base class that doesn't have virtual methods (when the
+    // subclass does). It would be ideal to find a more robust solution that comes at no
+    // extra cost to performance or code generality.
+    SkDEBUGCODE(void* baseAddr = fLastItem;
+                void* subclassAddr = rawPtr);
+    SkASSERT(baseAddr == subclassAddr);
+
+    return rawPtr;
+}
+
+/**
+ * Iterates through a recorder from front to back. The initial state of the iterator is
+ * to not have the front item loaded yet; next() must be called first. Usage model:
+ *
+ *    GrTRecorder<TBase, TAlign>::Iter iter(recorder);
+ *    while (iter.next()) {
+ *        iter->doSomething();
+ *    }
+ */
+template<typename TBase, typename TAlign>
+class GrTRecorder<TBase, TAlign>::Iter {
+public:
+    Iter(GrTRecorder& recorder) : fBlock(recorder.fHeadBlock), fPosition(0), fItem(nullptr) {}
+
+    bool next() {
+        while (fPosition >= fBlock->fBack) {
+            SkASSERT(fPosition == fBlock->fBack);
+            if (!fBlock->fNext) {
+                return false;
+            }
+            fBlock = fBlock->fNext;
+            fPosition = 0;
+        }
+
+        Header* header = reinterpret_cast<Header*>(&(*fBlock)[fPosition]);
+        fItem = reinterpret_cast<TBase*>(&(*fBlock)[fPosition + length_of<Header>::kValue]);
+        fPosition += header->fTotalLength;
+        return true;
+    }
+
+    TBase* get() const {
+        SkASSERT(fItem);
+        return fItem;
+    }
+
+    TBase* operator->() const { return this->get(); }
+
+private:
+    MemBlock* fBlock;
+    int       fPosition;
+    TBase*    fItem;
+};
+
+/**
+ * Iterates through a recorder in reverse, from back to front. This version mirrors "Iter",
+ * so the initial state is to have recorder.back() loaded already. (Note that this will
+ * assert if the recorder is empty.) Usage model:
+ *
+ *    GrTRecorder<TBase, TAlign>::ReverseIter reverseIter(recorder);
+ *    do {
+ *        reverseIter->doSomething();
+ *    } while (reverseIter.previous());
+ */
+template<typename TBase, typename TAlign>
+class GrTRecorder<TBase, TAlign>::ReverseIter {
+public:
+    ReverseIter(GrTRecorder& recorder)
+        : fBlock(recorder.fTailBlock),
+          fItem(&recorder.back()) {
+        Header* lastHeader = reinterpret_cast<Header*>(
+            reinterpret_cast<TAlign*>(fItem) - length_of<Header>::kValue);
+        fPosition = fBlock->fBack - lastHeader->fTotalLength;
+    }
+
+    bool previous() {
+        Header* header = reinterpret_cast<Header*>(&(*fBlock)[fPosition]);
+
+        while (0 == fPosition) {
+            if (!fBlock->fPrev) {
+                // We've reached the front of the recorder.
+                return false;
+            }
+            fBlock = fBlock->fPrev;
+            fPosition = fBlock->fBack;
+        }
+
+        fPosition -= header->fPrevLength;
+        SkASSERT(fPosition >= 0);
+
+        fItem = reinterpret_cast<TBase*>(&(*fBlock)[fPosition + length_of<Header>::kValue]);
+        return true;
+    }
+
+    TBase* get() const { return fItem; }
+    TBase* operator->() const { return this->get(); }
+
+private:
+    MemBlock* fBlock;
+    int       fPosition;
+    TBase*    fItem;
+};
+
+template<typename TBase, typename TAlign>
+void GrTRecorder<TBase, TAlign>::reset() {
+    Iter iter(*this);
+    while (iter.next()) {
+        iter->~TBase();
+    }
+
+    // Assume the next time this recorder fills up it will use approximately the same
+    // amount of space as last time. Leave enough space for up to ~50% growth; free
+    // everything else.
+    if (fTailBlock->fBack <= fTailBlock->fLength / 2) {
+        MemBlock::Free(fTailBlock->fNext);
+    } else if (fTailBlock->fNext) {
+        MemBlock::Free(fTailBlock->fNext->fNext);
+        fTailBlock->fNext->fNext = nullptr;
+    }
+
+    for (MemBlock* block = fHeadBlock; block; block = block->fNext) {
+        block->fBack = 0;
+    }
+
+    fTailBlock = fHeadBlock;
+    fLastItem = nullptr;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+template<typename TItem> struct GrTRecorderAllocWrapper {
+    GrTRecorderAllocWrapper() : fDataLength(0) {}
+
+    template <typename TBase, typename TAlign>
+    GrTRecorderAllocWrapper(const GrTRecorder<TBase, TAlign>&, int sizeOfData)
+        : fDataLength(GrTRecorder<TBase, TAlign>::LengthOf(sizeOfData)) {}
+
+    const int fDataLength;
+};
+
+template <typename TBase, typename TAlign, typename TItem>
+void* operator new(size_t size, GrTRecorder<TBase, TAlign>& recorder,
+                   const GrTRecorderAllocWrapper<TItem>& wrapper) {
+    SkASSERT(size == sizeof(TItem));
+    return recorder.template alloc_back<TItem>(wrapper.fDataLength);
+}
+
+template <typename TBase, typename TAlign, typename TItem>
+void operator delete(void*, GrTRecorder<TBase, TAlign>&, const GrTRecorderAllocWrapper<TItem>&) {
+    // We only provide an operator delete to work around compiler warnings that can come
+    // up for an unmatched operator new when compiling with exceptions.
+    SK_CRASH();
+}
+
+#define GrNEW_APPEND_TO_RECORDER(recorder, type_name, args) \
+    (new (recorder, GrTRecorderAllocWrapper<type_name>()) type_name args)
+
+#define GrNEW_APPEND_WITH_DATA_TO_RECORDER(recorder, type_name, args, size_of_data) \
+    (new (recorder, GrTRecorderAllocWrapper<type_name>(recorder, size_of_data)) type_name args)
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrTemplates.h b/gfx/skia/skia/src/gpu/GrTemplates.h
deleted file mode 100644
index 2cab13278313..000000000000
--- a/gfx/skia/skia/src/gpu/GrTemplates.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrTemplates_DEFINED
-#define GrTemplates_DEFINED
-
-#include "SkTypes.h"
-
-/**
- *  Use to cast a ptr to a different type, and maintain strict-aliasing
- */
-template <typename Dst, typename Src> Dst GrTCast(Src src) {
-    union {
-        Src src;
-        Dst dst;
-    } data;
-    data.src = src;
-    return data.dst;
-}
-
-/**
- * takes a T*, saves the value it points to,  in and restores the value in the
- * destructor
- * e.g.:
- * {
- *      GrAutoTRestore<int*> autoCountRestore;
- *      if (useExtra) {
- *          autoCountRestore.reset(&fCount);
- *          fCount += fExtraCount;
- *      }
- *      ...
- * }  // fCount is restored
- */
-template <typename T> class GrAutoTRestore : SkNoncopyable {
-public:
-    GrAutoTRestore() : fPtr(NULL), fVal() {}
-
-    GrAutoTRestore(T* ptr) {
-        fPtr = ptr;
-        if (NULL != ptr) {
-            fVal = *ptr;
-        }
-    }
-
-    ~GrAutoTRestore() {
-        if (NULL != fPtr) {
-            *fPtr = fVal;
-        }
-    }
-
-    // restores previously saved value (if any) and saves value for passed T*
-    void reset(T* ptr) {
-        if (NULL != fPtr) {
-            *fPtr = fVal;
-        }
-        fPtr = ptr;
-        fVal = *ptr;
-    }
-private:
-    T* fPtr;
-    T  fVal;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/GrTest.cpp b/gfx/skia/skia/src/gpu/GrTest.cpp
index 10dc0346576f..b1c135474df4 100644
--- a/gfx/skia/skia/src/gpu/GrTest.cpp
+++ b/gfx/skia/skia/src/gpu/GrTest.cpp
@@ -8,35 +8,367 @@
 
 #include "GrTest.h"
 
-#include "GrGpu.h"
+#include "GrBatchAtlas.h"
+#include "GrBatchFontCache.h"
+#include "GrContextOptions.h"
+#include "GrDrawContext.h"
+#include "GrDrawingManager.h"
+#include "GrGpuResourceCacheAccess.h"
 #include "GrResourceCache.h"
+#include "GrTextBlobCache.h"
+#include "SkGrPriv.h"
+#include "SkString.h"
 
-void GrTestTarget::init(GrContext* ctx, GrDrawTarget* target) {
+namespace GrTest {
+void SetupAlwaysEvictAtlas(GrContext* context) {
+    // These sizes were selected because they allow each atlas to hold a single plot and will thus
+    // stress the atlas
+    int dim = GrBatchAtlas::kGlyphMaxDim;
+    GrBatchAtlasConfig configs[3];
+    configs[kA8_GrMaskFormat].fWidth = dim;
+    configs[kA8_GrMaskFormat].fHeight = dim;
+    configs[kA8_GrMaskFormat].fPlotWidth = dim;
+    configs[kA8_GrMaskFormat].fPlotHeight = dim;
+
+    configs[kA565_GrMaskFormat].fWidth = dim;
+    configs[kA565_GrMaskFormat].fHeight = dim;
+    configs[kA565_GrMaskFormat].fPlotWidth = dim;
+    configs[kA565_GrMaskFormat].fPlotHeight = dim;
+
+    configs[kARGB_GrMaskFormat].fWidth = dim;
+    configs[kARGB_GrMaskFormat].fHeight = dim;
+    configs[kARGB_GrMaskFormat].fPlotWidth = dim;
+    configs[kARGB_GrMaskFormat].fPlotHeight = dim;
+
+    context->setTextContextAtlasSizes_ForTesting(configs);
+}
+};
+
+void GrTestTarget::init(GrContext* ctx, GrDrawTarget* target, GrRenderTarget* rt) {
     SkASSERT(!fContext);
 
     fContext.reset(SkRef(ctx));
     fDrawTarget.reset(SkRef(target));
-
-    SkNEW_IN_TLAZY(&fASR, GrDrawTarget::AutoStateRestore, (target, GrDrawTarget::kReset_ASRInit));
-    SkNEW_IN_TLAZY(&fACR, GrDrawTarget::AutoClipRestore, (target));
-    SkNEW_IN_TLAZY(&fAGP, GrDrawTarget::AutoGeometryPush, (target));
+    fRenderTarget.reset(SkRef(rt));
 }
 
-void GrContext::getTestTarget(GrTestTarget* tar) {
+void GrContext::getTestTarget(GrTestTarget* tar, GrRenderTarget* rt) {
     this->flush();
     // We could create a proxy GrDrawTarget that passes through to fGpu until ~GrTextTarget() and
     // then disconnects. This would help prevent test writers from mixing using the returned
     // GrDrawTarget and regular drawing. We could also assert or fail in GrContext drawing methods
     // until ~GrTestTarget().
-    tar->init(this, fGpu);
+    if (!rt) {
+        GrSurfaceDesc desc;
+        desc.fFlags = kRenderTarget_GrSurfaceFlag;
+        desc.fWidth = 32;
+        desc.fHeight = 32;
+        desc.fConfig = kRGBA_8888_GrPixelConfig;
+        desc.fSampleCnt = 0;
+
+        SkAutoTUnref<GrTexture> texture(this->textureProvider()->createTexture(desc, false,
+                                                                               nullptr, 0));
+        if (nullptr == texture) {
+            return;
+        }
+        SkASSERT(nullptr != texture->asRenderTarget());
+        rt = texture->asRenderTarget();
+    }
+
+    SkAutoTUnref<GrDrawTarget> dt(fDrawingManager->newDrawTarget(rt));
+    tar->init(this, dt, rt);
+}
+
+void GrContext::setTextBlobCacheLimit_ForTesting(size_t bytes) {
+    fTextBlobCache->setBudget(bytes);
+}
+
+void GrContext::setTextContextAtlasSizes_ForTesting(const GrBatchAtlasConfig* configs) {
+    fBatchFontCache->setAtlasSizes_ForTesting(configs);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void GrContext::setMaxTextureSizeOverride(int maxTextureSizeOverride) {
-    fMaxTextureSizeOverride = maxTextureSizeOverride;
-}
-
 void GrContext::purgeAllUnlockedResources() {
     fResourceCache->purgeAllUnlocked();
 }
+
+void GrContext::resetGpuStats() const {
+#if GR_GPU_STATS
+    fGpu->stats()->reset();
+#endif
+}
+
+void GrContext::dumpCacheStats(SkString* out) const {
+#if GR_CACHE_STATS
+    fResourceCache->dumpStats(out);
+#endif
+}
+
+void GrContext::dumpCacheStatsKeyValuePairs(SkTArray<SkString>* keys,
+                                            SkTArray<double>* values) const {
+#if GR_CACHE_STATS
+    fResourceCache->dumpStatsKeyValuePairs(keys, values);
+#endif
+}
+
+void GrContext::printCacheStats() const {
+    SkString out;
+    this->dumpCacheStats(&out);
+    SkDebugf("%s", out.c_str());
+}
+
+void GrContext::dumpGpuStats(SkString* out) const {
+#if GR_GPU_STATS
+    return fGpu->stats()->dump(out);
+#endif
+}
+
+void GrContext::dumpGpuStatsKeyValuePairs(SkTArray<SkString>* keys,
+                                          SkTArray<double>* values) const {
+#if GR_GPU_STATS
+    return fGpu->stats()->dumpKeyValuePairs(keys, values);
+#endif
+}
+
+void GrContext::printGpuStats() const {
+    SkString out;
+    this->dumpGpuStats(&out);
+    SkDebugf("%s", out.c_str());
+}
+
+void GrContext::drawFontCache(const SkRect& rect, GrMaskFormat format, const SkPaint& paint,
+                              GrRenderTarget* target) {
+    GrBatchFontCache* cache = this->getBatchFontCache();
+
+    GrTexture* atlas = cache->getTexture(format);
+
+    SkAutoTUnref<GrDrawContext> drawContext(this->drawContext(target));
+    // TODO: add drawContext method to encapsulate this.
+
+    GrPaint grPaint;
+    SkMatrix mat;
+    mat.reset();
+    if (!SkPaintToGrPaint(this, paint, mat, &grPaint)) {
+        return;
+    }
+    SkMatrix textureMat;
+    textureMat.reset();
+    // TODO: use setScaleTranslate()
+    textureMat[SkMatrix::kMScaleX] = 1.0f/rect.width();
+    textureMat[SkMatrix::kMScaleY] = 1.0f/rect.height();
+    textureMat[SkMatrix::kMTransX] = -rect.fLeft/rect.width();
+    textureMat[SkMatrix::kMTransY] = -rect.fTop/rect.height();
+
+    grPaint.addColorTextureProcessor(atlas, textureMat);
+
+    GrClip clip;
+    drawContext->drawRect(clip, grPaint, mat, rect);
+}
+
+#if GR_GPU_STATS
+void GrGpu::Stats::dump(SkString* out) {
+    out->appendf("Render Target Binds: %d\n", fRenderTargetBinds);
+    out->appendf("Shader Compilations: %d\n", fShaderCompilations);
+    out->appendf("Textures Created: %d\n", fTextureCreates);
+    out->appendf("Texture Uploads: %d\n", fTextureUploads);
+    out->appendf("Stencil Buffer Creates: %d\n", fStencilAttachmentCreates);
+    out->appendf("Number of draws: %d\n", fNumDraws);
+}
+
+void GrGpu::Stats::dumpKeyValuePairs(SkTArray<SkString>* keys, SkTArray<double>* values) {
+    keys->push_back(SkString("render_target_binds")); values->push_back(fRenderTargetBinds);
+    keys->push_back(SkString("shader_compilations")); values->push_back(fShaderCompilations);
+    keys->push_back(SkString("textures_created")); values->push_back(fTextureCreates);
+    keys->push_back(SkString("texture_uploads")); values->push_back(fTextureUploads);
+    keys->push_back(SkString("stencil_buffer_creates")); values->push_back(fStencilAttachmentCreates);
+    keys->push_back(SkString("number_of_draws")); values->push_back(fNumDraws);
+}
+
+#endif
+
+#if GR_CACHE_STATS
+void GrResourceCache::getStats(Stats* stats) const {
+    stats->reset();
+
+    stats->fTotal = this->getResourceCount();
+    stats->fNumNonPurgeable = fNonpurgeableResources.count();
+    stats->fNumPurgeable = fPurgeableQueue.count();
+
+    for (int i = 0; i < fNonpurgeableResources.count(); ++i) {
+        stats->update(fNonpurgeableResources[i]);
+    }
+    for (int i = 0; i < fPurgeableQueue.count(); ++i) {
+        stats->update(fPurgeableQueue.at(i));
+    }
+}
+
+void GrResourceCache::dumpStats(SkString* out) const {
+    this->validate();
+
+    Stats stats;
+
+    this->getStats(&stats);
+
+    float countUtilization = (100.f * fBudgetedCount) / fMaxCount;
+    float byteUtilization = (100.f * fBudgetedBytes) / fMaxBytes;
+
+    out->appendf("Budget: %d items %d bytes\n", fMaxCount, (int)fMaxBytes);
+    out->appendf("\t\tEntry Count: current %d"
+                 " (%d budgeted, %d external(%d borrowed, %d adopted), %d locked, %d scratch %.2g%% full), high %d\n",
+                 stats.fTotal, fBudgetedCount, stats.fExternal, stats.fBorrowed,
+                 stats.fAdopted, stats.fNumNonPurgeable, stats.fScratch, countUtilization,
+                 fHighWaterCount);
+    out->appendf("\t\tEntry Bytes: current %d (budgeted %d, %.2g%% full, %d unbudgeted) high %d\n",
+                 SkToInt(fBytes), SkToInt(fBudgetedBytes), byteUtilization,
+                 SkToInt(stats.fUnbudgetedSize), SkToInt(fHighWaterBytes));
+}
+
+void GrResourceCache::dumpStatsKeyValuePairs(SkTArray<SkString>* keys,
+                                             SkTArray<double>* values) const {
+    this->validate();
+
+    Stats stats;
+    this->getStats(&stats);
+
+    keys->push_back(SkString("gpu_cache_total_entries")); values->push_back(stats.fTotal);
+    keys->push_back(SkString("gpu_cache_external_entries")); values->push_back(stats.fExternal);
+    keys->push_back(SkString("gpu_cache_borrowed_entries")); values->push_back(stats.fBorrowed);
+    keys->push_back(SkString("gpu_cache_adopted_entries")); values->push_back(stats.fAdopted);
+    keys->push_back(SkString("gpu_cache_purgable_entries")); values->push_back(stats.fNumPurgeable);
+    keys->push_back(SkString("gpu_cache_non_purgable_entries")); values->push_back(stats.fNumNonPurgeable);
+    keys->push_back(SkString("gpu_cache_scratch_entries")); values->push_back(stats.fScratch);
+    keys->push_back(SkString("gpu_cache_unbudgeted_size")); values->push_back((double)stats.fUnbudgetedSize);
+}
+
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+
+void GrResourceCache::changeTimestamp(uint32_t newTimestamp) { fTimestamp = newTimestamp; }
+
+///////////////////////////////////////////////////////////////////////////////
+// Code for the mock context. It's built on a mock GrGpu class that does nothing.
+////
+
+#include "GrGpu.h"
+
+class GrPipeline;
+
+class MockGpu : public GrGpu {
+public:
+    MockGpu(GrContext* context, const GrContextOptions& options) : INHERITED(context) {
+        fCaps.reset(new GrCaps(options));
+    }
+    ~MockGpu() override {}
+
+    bool onGetReadPixelsInfo(GrSurface* srcSurface, int readWidth, int readHeight, size_t rowBytes,
+                             GrPixelConfig readConfig, DrawPreference*,
+                             ReadPixelTempDrawInfo*) override { return false; }
+
+    bool onGetWritePixelsInfo(GrSurface* dstSurface, int width, int height, size_t rowBytes,
+                              GrPixelConfig srcConfig, DrawPreference*,
+                              WritePixelTempDrawInfo*) override { return false; }
+
+    void buildProgramDesc(GrProgramDesc*, const GrPrimitiveProcessor&,
+                          const GrPipeline&) const override {}
+
+    void discard(GrRenderTarget*) override {}
+
+    bool onCopySurface(GrSurface* dst,
+                       GrSurface* src,
+                       const SkIRect& srcRect,
+                       const SkIPoint& dstPoint) override { return false; };
+
+    bool initCopySurfaceDstDesc(const GrSurface* src, GrSurfaceDesc* desc) const override {
+        return false;
+    }
+
+private:
+    void onResetContext(uint32_t resetBits) override {}
+
+    void xferBarrier(GrRenderTarget*, GrXferBarrierType) override {}
+
+    GrTexture* onCreateTexture(const GrSurfaceDesc& desc, GrGpuResource::LifeCycle lifeCycle,
+                               const void* srcData, size_t rowBytes) override {
+        return nullptr;
+    }
+
+    GrTexture* onCreateCompressedTexture(const GrSurfaceDesc& desc, GrGpuResource::LifeCycle,
+                                         const void* srcData) override {
+        return nullptr;
+    }
+
+    GrTexture* onWrapBackendTexture(const GrBackendTextureDesc&,
+                                    GrWrapOwnership) override { return nullptr; }
+
+    GrRenderTarget* onWrapBackendRenderTarget(const GrBackendRenderTargetDesc&,
+                                              GrWrapOwnership) override {
+        return nullptr;
+    }
+
+    GrVertexBuffer* onCreateVertexBuffer(size_t size, bool dynamic) override { return nullptr; }
+
+    GrIndexBuffer* onCreateIndexBuffer(size_t size, bool dynamic) override { return nullptr; }
+
+    void onClear(GrRenderTarget*, const SkIRect& rect, GrColor color) override {}
+
+    void onClearStencilClip(GrRenderTarget*, const SkIRect& rect, bool insideClip) override {}
+
+    void onDraw(const DrawArgs&, const GrNonInstancedVertices&) override {}
+
+    bool onReadPixels(GrSurface* surface,
+                      int left, int top, int width, int height,
+                      GrPixelConfig,
+                      void* buffer,
+                      size_t rowBytes) override {
+        return false;
+    }
+
+    bool onWritePixels(GrSurface* surface,
+                       int left, int top, int width, int height,
+                       GrPixelConfig config, const void* buffer,
+                       size_t rowBytes) override {
+        return false;
+    }
+
+    void onResolveRenderTarget(GrRenderTarget* target) override { return; }
+
+    GrStencilAttachment* createStencilAttachmentForRenderTarget(const GrRenderTarget*,
+                                                                int width,
+                                                                int height) override {
+        return nullptr;
+    }
+
+    void clearStencil(GrRenderTarget* target) override  {}
+
+    GrBackendObject createTestingOnlyBackendTexture(void* pixels, int w, int h,
+                                                    GrPixelConfig config) const override {
+        return 0; 
+    }
+    bool isTestingOnlyBackendTexture(GrBackendObject ) const override { return false; }
+    void deleteTestingOnlyBackendTexture(GrBackendObject, bool abandonTexture) const override {}
+
+    typedef GrGpu INHERITED;
+};
+
+GrContext* GrContext::CreateMockContext() {
+    GrContext* context = new GrContext;
+
+    context->initMockContext();
+    return context;
+}
+
+void GrContext::initMockContext() {
+    GrContextOptions options;
+    options.fGeometryBufferMapThreshold = 0;
+    SkASSERT(nullptr == fGpu);
+    fGpu = new MockGpu(this, options);
+    SkASSERT(fGpu);
+    this->initCommon(options);
+
+    // We delete these because we want to test the cache starting with zero resources. Also, none of
+    // these objects are required for any of tests that use this context. TODO: make stop allocating
+    // resources in the buffer pools.
+    fDrawingManager->abandon();
+}
diff --git a/gfx/skia/skia/src/gpu/GrTest.h b/gfx/skia/skia/src/gpu/GrTest.h
index 5e61c29a5a91..297f51c11369 100644
--- a/gfx/skia/skia/src/gpu/GrTest.h
+++ b/gfx/skia/skia/src/gpu/GrTest.h
@@ -11,6 +11,15 @@
 
 #include "GrContext.h"
 #include "GrDrawTarget.h"
+#include "gl/GrGLContext.h"
+
+namespace GrTest {
+    /**
+     * Forces the GrContext to use a small atlas which only has room for one plot and will thus
+     * constantly be evicting entries
+     */
+    void SetupAlwaysEvictAtlas(GrContext*);
+};
 
 /** Allows a test to temporarily draw to a GrDrawTarget owned by a GrContext. Tests that use this
     should be careful not to mix using the GrDrawTarget directly and drawing via SkCanvas or
@@ -19,17 +28,15 @@ class GrTestTarget {
 public:
     GrTestTarget() {};
 
-    void init(GrContext*, GrDrawTarget*);
+    void init(GrContext*, GrDrawTarget*, GrRenderTarget*);
 
     GrDrawTarget* target() { return fDrawTarget.get(); }
+    GrResourceProvider* resourceProvider() { return fContext->resourceProvider(); }
 
 private:
-    SkTLazy<GrDrawTarget::AutoStateRestore> fASR;
-    SkTLazy<GrDrawTarget::AutoClipRestore>  fACR;
-    SkTLazy<GrDrawTarget::AutoGeometryPush> fAGP;
-
-    SkAutoTUnref<GrDrawTarget>              fDrawTarget;
     SkAutoTUnref<GrContext>                 fContext;
+    SkAutoTUnref<GrDrawTarget>              fDrawTarget;
+    SkAutoTUnref<GrRenderTarget>            fRenderTarget;
 };
 
 #endif
diff --git a/gfx/skia/skia/src/gpu/GrTestUtils.cpp b/gfx/skia/skia/src/gpu/GrTestUtils.cpp
new file mode 100644
index 000000000000..86a84ceb0a3a
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrTestUtils.cpp
@@ -0,0 +1,262 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrStrokeInfo.h"
+#include "GrTestUtils.h"
+#include "SkMatrix.h"
+#include "SkPathEffect.h"
+#include "SkPath.h"
+#include "SkRRect.h"
+
+#ifdef GR_TEST_UTILS
+
+static const SkMatrix& test_matrix(SkRandom* random, bool includePerspective) {
+    static SkMatrix gMatrices[5];
+    static const int kPerspectiveCount = 1;
+    static bool gOnce;
+    if (!gOnce) {
+        gOnce = true;
+        gMatrices[0].reset();
+        gMatrices[1].setTranslate(SkIntToScalar(-100), SkIntToScalar(100));
+        gMatrices[2].setRotate(SkIntToScalar(17));
+        gMatrices[3].setRotate(SkIntToScalar(185));
+        gMatrices[3].postTranslate(SkIntToScalar(66), SkIntToScalar(-33));
+        gMatrices[3].postScale(SkIntToScalar(2), SK_ScalarHalf);
+
+        // Perspective matrices
+        gMatrices[4].setRotate(SkIntToScalar(215));
+        gMatrices[4].set(SkMatrix::kMPersp0, 0.00013f);
+        gMatrices[4].set(SkMatrix::kMPersp1, -0.000039f);
+    }
+
+    uint32_t count = static_cast<uint32_t>(SK_ARRAY_COUNT(gMatrices));
+    if (includePerspective) {
+        return gMatrices[random->nextULessThan(count)];
+    } else {
+        return gMatrices[random->nextULessThan(count - kPerspectiveCount)];
+    }
+}
+
+namespace GrTest {
+const SkMatrix& TestMatrix(SkRandom* random) { return test_matrix(random, true); }
+
+const SkMatrix& TestMatrixPreservesRightAngles(SkRandom* random) {
+    static SkMatrix gMatrices[5];
+    static bool gOnce;
+    if (!gOnce) {
+        gOnce = true;
+        // identity
+        gMatrices[0].reset();
+        // translation
+        gMatrices[1].setTranslate(SkIntToScalar(-100), SkIntToScalar(100));
+        // scale
+        gMatrices[2].setScale(SkIntToScalar(17), SkIntToScalar(17));
+        // scale + translation
+        gMatrices[3].setScale(SkIntToScalar(-17), SkIntToScalar(-17));
+        gMatrices[3].postTranslate(SkIntToScalar(66), SkIntToScalar(-33));
+        // orthogonal basis vectors
+        gMatrices[4].reset();
+        gMatrices[4].setScale(SkIntToScalar(-1), SkIntToScalar(-1));
+        gMatrices[4].setRotate(47);
+
+        for (size_t i = 0; i < SK_ARRAY_COUNT(gMatrices); i++) {
+            SkASSERT(gMatrices[i].preservesRightAngles());
+        }
+    }
+    return gMatrices[random->nextULessThan(static_cast<uint32_t>(SK_ARRAY_COUNT(gMatrices)))];
+}
+
+const SkMatrix& TestMatrixRectStaysRect(SkRandom* random) {
+    static SkMatrix gMatrices[6];
+    static bool gOnce;
+    if (!gOnce) {
+        gOnce = true;
+        // identity
+        gMatrices[0].reset();
+        // translation
+        gMatrices[1].setTranslate(SkIntToScalar(-100), SkIntToScalar(100));
+        // scale
+        gMatrices[2].setScale(SkIntToScalar(17), SkIntToScalar(17));
+        // scale + translation
+        gMatrices[3].setScale(SkIntToScalar(-17), SkIntToScalar(-17));
+        gMatrices[3].postTranslate(SkIntToScalar(66), SkIntToScalar(-33));
+        // reflection
+        gMatrices[4].setScale(SkIntToScalar(-1), SkIntToScalar(-1));
+        // 90 degress rotation
+        gMatrices[5].setRotate(90);
+
+        for (size_t i = 0; i < SK_ARRAY_COUNT(gMatrices); i++) {
+            SkASSERT(gMatrices[i].rectStaysRect());
+        }
+    }
+    return gMatrices[random->nextULessThan(static_cast<uint32_t>(SK_ARRAY_COUNT(gMatrices)))];
+}
+
+const SkMatrix& TestMatrixInvertible(SkRandom* random) { return test_matrix(random, false); }
+
+const SkRect& TestRect(SkRandom* random) {
+    static SkRect gRects[7];
+    static bool gOnce;
+    if (!gOnce) {
+        gOnce = true;
+        gRects[0] = SkRect::MakeWH(1.f, 1.f);
+        gRects[1] = SkRect::MakeWH(1.0f, 256.0f);
+        gRects[2] = SkRect::MakeWH(256.0f, 1.0f);
+        gRects[3] = SkRect::MakeLargest();
+        gRects[4] = SkRect::MakeLTRB(-65535.0f, -65535.0f, 65535.0f, 65535.0f);
+        gRects[5] = SkRect::MakeLTRB(-10.0f, -10.0f, 10.0f, 10.0f);
+    }
+    return gRects[random->nextULessThan(static_cast<uint32_t>(SK_ARRAY_COUNT(gRects)))];
+}
+
+// Just some simple rects for code which expects its input very sanitized
+const SkRect& TestSquare(SkRandom* random) {
+    static SkRect gRects[2];
+    static bool gOnce;
+    if (!gOnce) {
+        gOnce = true;
+        gRects[0] = SkRect::MakeWH(128.f, 128.f);
+        gRects[1] = SkRect::MakeWH(256.0f, 256.0f);
+    }
+    return gRects[random->nextULessThan(static_cast<uint32_t>(SK_ARRAY_COUNT(gRects)))];
+}
+
+const SkRRect& TestRRectSimple(SkRandom* random) {
+    static SkRRect gRRect[2];
+    static bool gOnce;
+    if (!gOnce) {
+        gOnce = true;
+        SkRect rectangle = SkRect::MakeWH(10.f, 20.f);
+        // true round rect with circular corners
+        gRRect[0].setRectXY(rectangle, 1.f, 1.f);
+        // true round rect with elliptical corners
+        gRRect[1].setRectXY(rectangle, 2.0f, 1.0f);
+
+        for (size_t i = 0; i < SK_ARRAY_COUNT(gRRect); i++) {
+            SkASSERT(gRRect[i].isSimple());
+        }
+    }
+    return gRRect[random->nextULessThan(static_cast<uint32_t>(SK_ARRAY_COUNT(gRRect)))];
+}
+
+const SkPath& TestPath(SkRandom* random) {
+    static SkPath gPath[7];
+    static bool gOnce;
+    if (!gOnce) {
+        gOnce = true;
+        // line
+        gPath[0].moveTo(0.f, 0.f);
+        gPath[0].lineTo(10.f, 10.f);
+        // quad
+        gPath[1].moveTo(0.f, 0.f);
+        gPath[1].quadTo(10.f, 10.f, 20.f, 20.f);
+        // conic
+        gPath[2].moveTo(0.f, 0.f);
+        gPath[2].conicTo(10.f, 10.f, 20.f, 20.f, 1.f);
+        // cubic
+        gPath[3].moveTo(0.f, 0.f);
+        gPath[3].cubicTo(10.f, 10.f, 20.f, 20.f, 30.f, 30.f);
+        // all three
+        gPath[4].moveTo(0.f, 0.f);
+        gPath[4].lineTo(10.f, 10.f);
+        gPath[4].quadTo(10.f, 10.f, 20.f, 20.f);
+        gPath[4].conicTo(10.f, 10.f, 20.f, 20.f, 1.f);
+        gPath[4].cubicTo(10.f, 10.f, 20.f, 20.f, 30.f, 30.f);
+        // convex
+        gPath[5].moveTo(0.0f, 0.0f);
+        gPath[5].lineTo(10.0f, 0.0f);
+        gPath[5].lineTo(10.0f, 10.0f);
+        gPath[5].lineTo(0.0f, 10.0f);
+        gPath[5].close();
+        // concave
+        gPath[6].moveTo(0.0f, 0.0f);
+        gPath[6].lineTo(5.0f, 5.0f);
+        gPath[6].lineTo(10.0f, 0.0f);
+        gPath[6].lineTo(10.0f, 10.0f);
+        gPath[6].lineTo(0.0f, 10.0f);
+        gPath[6].close();
+    }
+
+    return gPath[random->nextULessThan(static_cast<uint32_t>(SK_ARRAY_COUNT(gPath)))];
+}
+
+const SkPath& TestPathConvex(SkRandom* random) {
+    static SkPath gPath[3];
+    static bool gOnce;
+    if (!gOnce) {
+        gOnce = true;
+        // narrow rect
+        gPath[0].moveTo(-1.5f, -50.0f);
+        gPath[0].lineTo(-1.5f, -50.0f);
+        gPath[0].lineTo( 1.5f, -50.0f);
+        gPath[0].lineTo( 1.5f,  50.0f);
+        gPath[0].lineTo(-1.5f,  50.0f);
+        // degenerate
+        gPath[1].moveTo(-0.025f, -0.025f);
+        gPath[1].lineTo(-0.025f, -0.025f);
+        gPath[1].lineTo( 0.025f, -0.025f);
+        gPath[1].lineTo( 0.025f,  0.025f);
+        gPath[1].lineTo(-0.025f,  0.025f);
+        // clipped triangle
+        gPath[2].moveTo(-10.0f, -50.0f);
+        gPath[2].lineTo(-10.0f, -50.0f);
+        gPath[2].lineTo( 10.0f, -50.0f);
+        gPath[2].lineTo( 50.0f,  31.0f);
+        gPath[2].lineTo( 40.0f,  50.0f);
+        gPath[2].lineTo(-40.0f,  50.0f);
+        gPath[2].lineTo(-50.0f,  31.0f);
+
+        for (size_t i = 0; i < SK_ARRAY_COUNT(gPath); i++) {
+            SkASSERT(SkPath::kConvex_Convexity == gPath[i].getConvexity());
+        }
+    }
+
+    return gPath[random->nextULessThan(static_cast<uint32_t>(SK_ARRAY_COUNT(gPath)))];
+}
+
+static void randomize_stroke_rec(SkStrokeRec* rec, SkRandom* random) {
+    bool strokeAndFill = random->nextBool();
+    SkScalar strokeWidth = random->nextBool() ? 0.f : 1.f;
+    rec->setStrokeStyle(strokeWidth, strokeAndFill);
+
+    SkPaint::Cap cap = SkPaint::Cap(random->nextULessThan(SkPaint::kCapCount));
+    SkPaint::Join join = SkPaint::Join(random->nextULessThan(SkPaint::kJoinCount));
+    SkScalar miterLimit = random->nextRangeScalar(1.f, 5.f);
+    rec->setStrokeParams(cap, join, miterLimit);
+}
+
+SkStrokeRec TestStrokeRec(SkRandom* random) {
+    SkStrokeRec::InitStyle style =
+            SkStrokeRec::InitStyle(random->nextULessThan(SkStrokeRec::kFill_InitStyle + 1));
+    SkStrokeRec rec(style);
+    randomize_stroke_rec(&rec, random);
+    return rec;
+}
+
+GrStrokeInfo TestStrokeInfo(SkRandom* random) {
+    SkStrokeRec::InitStyle style =
+            SkStrokeRec::InitStyle(random->nextULessThan(SkStrokeRec::kFill_InitStyle + 1));
+    GrStrokeInfo strokeInfo(style);
+    randomize_stroke_rec(&strokeInfo, random);
+    SkPathEffect::DashInfo dashInfo;
+    dashInfo.fCount = random->nextRangeU(1, 50) * 2;
+    dashInfo.fIntervals = new SkScalar[dashInfo.fCount];
+    SkScalar sum = 0;
+    for (int i = 0; i < dashInfo.fCount; i++) {
+        dashInfo.fIntervals[i] = random->nextRangeScalar(SkDoubleToScalar(0.01),
+                                                         SkDoubleToScalar(10.0));
+        sum += dashInfo.fIntervals[i];
+    }
+    dashInfo.fPhase = random->nextRangeScalar(0, sum);
+    strokeInfo.setDashInfo(dashInfo);
+    delete[] dashInfo.fIntervals;
+    return strokeInfo;
+}
+
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrTextBlobCache.cpp b/gfx/skia/skia/src/gpu/GrTextBlobCache.cpp
new file mode 100644
index 000000000000..f11b7c60cbd8
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrTextBlobCache.cpp
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrTextBlobCache.h"
+
+static const int kVerticesPerGlyph = 4;
+
+GrTextBlobCache::~GrTextBlobCache() {
+    this->freeAll();
+}
+
+GrAtlasTextBlob* GrTextBlobCache::createBlob(int glyphCount, int runCount, size_t maxVASize) {
+    // We allocate size for the GrAtlasTextBlob itself, plus size for the vertices array,
+    // and size for the glyphIds array.
+    size_t verticesCount = glyphCount * kVerticesPerGlyph * maxVASize;
+    size_t size = sizeof(GrAtlasTextBlob) +
+                  verticesCount +
+                  glyphCount * sizeof(GrGlyph**) +
+                  sizeof(GrAtlasTextBlob::Run) * runCount;
+
+    void* allocation = fPool.allocate(size);
+#ifdef CACHE_SANITY_CHECK
+    sk_bzero(allocation, size);
+#endif
+
+    GrAtlasTextBlob* cacheBlob = new (allocation) GrAtlasTextBlob;
+#ifdef CACHE_SANITY_CHECK
+    cacheBlob->fSize = size;
+#endif
+
+    // setup offsets for vertices / glyphs
+    cacheBlob->fVertices = sizeof(GrAtlasTextBlob) + reinterpret_cast<unsigned char*>(cacheBlob);
+    cacheBlob->fGlyphs = reinterpret_cast<GrGlyph**>(cacheBlob->fVertices + verticesCount);
+    cacheBlob->fRuns = reinterpret_cast<GrAtlasTextBlob::Run*>(cacheBlob->fGlyphs + glyphCount);
+
+    // Initialize runs
+    for (int i = 0; i < runCount; i++) {
+        new (&cacheBlob->fRuns[i]) GrAtlasTextBlob::Run;
+    }
+    cacheBlob->fRunCount = runCount;
+    cacheBlob->fPool = &fPool;
+    return cacheBlob;
+}
+
+void GrTextBlobCache::freeAll() {
+    SkTDynamicHash<GrAtlasTextBlob, GrAtlasTextBlob::Key>::Iter iter(&fCache);
+    while (!iter.done()) {
+        GrAtlasTextBlob* blob = &(*iter);
+        fBlobList.remove(blob);
+        blob->unref();
+        ++iter;
+    }
+    fCache.rewind();
+}
diff --git a/gfx/skia/skia/src/gpu/GrTextBlobCache.h b/gfx/skia/skia/src/gpu/GrTextBlobCache.h
new file mode 100644
index 000000000000..8eee9d13db03
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrTextBlobCache.h
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrTextBlobCache_DEFINED
+#define GrTextBlobCache_DEFINED
+
+#include "GrAtlasTextContext.h"
+#include "SkTDynamicHash.h"
+#include "SkTextBlobRunIterator.h"
+
+class GrTextBlobCache {
+public:
+    /**
+     * The callback function used by the cache when it is still over budget after a purge. The
+     * passed in 'data' is the same 'data' handed to setOverbudgetCallback.
+     */
+    typedef void (*PFOverBudgetCB)(void* data);
+
+    GrTextBlobCache(PFOverBudgetCB cb, void* data)
+        : fPool(kPreAllocSize, kMinGrowthSize)
+        , fCallback(cb)
+        , fData(data)
+        , fBudget(kDefaultBudget) {
+        SkASSERT(cb && data);
+    }
+    ~GrTextBlobCache();
+
+    // creates an uncached blob
+    GrAtlasTextBlob* createBlob(int glyphCount, int runCount, size_t maxVASize);
+    GrAtlasTextBlob* createBlob(const SkTextBlob* blob, size_t maxVAStride) {
+        int glyphCount = 0;
+        int runCount = 0;
+        BlobGlyphCount(&glyphCount, &runCount, blob);
+        GrAtlasTextBlob* cacheBlob = this->createBlob(glyphCount, runCount, maxVAStride);
+        return cacheBlob;
+    }
+
+    static void SetupCacheBlobKey(GrAtlasTextBlob* cacheBlob,
+                                  const GrAtlasTextBlob::Key& key,
+                                  const SkMaskFilter::BlurRec& blurRec,
+                                  const SkPaint& paint) {
+        cacheBlob->fKey = key;
+        if (key.fHasBlur) {
+            cacheBlob->fBlurRec = blurRec;
+        }
+        if (key.fStyle != SkPaint::kFill_Style) {
+            cacheBlob->fStrokeInfo.fFrameWidth = paint.getStrokeWidth();
+            cacheBlob->fStrokeInfo.fMiterLimit = paint.getStrokeMiter();
+            cacheBlob->fStrokeInfo.fJoin = paint.getStrokeJoin();
+        }
+    }
+
+    GrAtlasTextBlob* createCachedBlob(const SkTextBlob* blob,
+                                      const GrAtlasTextBlob::Key& key,
+                                      const SkMaskFilter::BlurRec& blurRec,
+                                      const SkPaint& paint,
+                                      size_t maxVAStride) {
+        int glyphCount = 0;
+        int runCount = 0;
+        BlobGlyphCount(&glyphCount, &runCount, blob);
+        GrAtlasTextBlob* cacheBlob = this->createBlob(glyphCount, runCount, maxVAStride);
+        SetupCacheBlobKey(cacheBlob, key, blurRec, paint);
+        this->add(cacheBlob);
+        return cacheBlob;
+    }
+
+    GrAtlasTextBlob* find(const GrAtlasTextBlob::Key& key) {
+        return fCache.find(key);
+    }
+
+    void remove(GrAtlasTextBlob* blob) {
+        fCache.remove(blob->fKey);
+        fBlobList.remove(blob);
+        blob->unref();
+    }
+
+    void add(GrAtlasTextBlob* blob) {
+        fCache.add(blob);
+        fBlobList.addToHead(blob);
+
+        this->checkPurge(blob);
+    }
+
+    void makeMRU(GrAtlasTextBlob* blob) {
+        if (fBlobList.head() == blob) {
+            return;
+        }
+
+        fBlobList.remove(blob);
+        fBlobList.addToHead(blob);
+    }
+
+    void freeAll();
+
+    // TODO move to SkTextBlob
+    static void BlobGlyphCount(int* glyphCount, int* runCount, const SkTextBlob* blob) {
+        SkTextBlobRunIterator itCounter(blob);
+        for (; !itCounter.done(); itCounter.next(), (*runCount)++) {
+            *glyphCount += itCounter.glyphCount();
+        }
+    }
+
+    void setBudget(size_t budget) {
+        fBudget = budget;
+        this->checkPurge();
+    }
+
+private:
+    typedef SkTInternalLList<GrAtlasTextBlob> BitmapBlobList;
+
+    void checkPurge(GrAtlasTextBlob* blob = nullptr) {
+        // If we are overbudget, then unref until we are below budget again
+        if (fPool.size() > fBudget) {
+            BitmapBlobList::Iter iter;
+            iter.init(fBlobList, BitmapBlobList::Iter::kTail_IterStart);
+            GrAtlasTextBlob* lruBlob = nullptr;
+            while (fPool.size() > fBudget && (lruBlob = iter.get()) && lruBlob != blob) {
+                fCache.remove(lruBlob->fKey);
+
+                // Backup the iterator before removing and unrefing the blob
+                iter.prev();
+                fBlobList.remove(lruBlob);
+                lruBlob->unref();
+            }
+
+            // If we break out of the loop with lruBlob == blob, then we haven't purged enough
+            // use the call back and try to free some more.  If we are still overbudget after this,
+            // then this single textblob is over our budget
+            if (blob && lruBlob == blob) {
+                (*fCallback)(fData);
+            }
+
+#ifdef SPEW_BUDGET_MESSAGE
+            if (fPool.size() > fBudget) {
+                SkDebugf("Single textblob is larger than our whole budget");
+            }
+#endif
+        }
+    }
+
+    // Budget was chosen to be ~4 megabytes.  The min alloc and pre alloc sizes in the pool are
+    // based off of the largest cached textblob I have seen in the skps(a couple of kilobytes).
+    static const int kPreAllocSize = 1 << 17;
+    static const int kMinGrowthSize = 1 << 17;
+    static const int kDefaultBudget = 1 << 22;
+    BitmapBlobList fBlobList;
+    SkTDynamicHash<GrAtlasTextBlob, GrAtlasTextBlob::Key> fCache;
+    GrMemoryPool fPool;
+    PFOverBudgetCB fCallback;
+    void* fData;
+    size_t fBudget;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrTextContext.cpp b/gfx/skia/skia/src/gpu/GrTextContext.cpp
index d281173dca5d..b1bae56ed5a5 100644
--- a/gfx/skia/skia/src/gpu/GrTextContext.cpp
+++ b/gfx/skia/skia/src/gpu/GrTextContext.cpp
@@ -6,43 +6,243 @@
  */
 
 #include "GrTextContext.h"
+#include "GrBlurUtils.h"
 #include "GrContext.h"
-
-#include "SkAutoKern.h"
-#include "SkGlyphCache.h"
+#include "GrDrawContext.h"
 #include "GrFontScaler.h"
 
-GrTextContext::GrTextContext(GrContext* context, const SkDeviceProperties& properties) :
-                            fContext(context), fDeviceProperties(properties), fDrawTarget(NULL) {
+#include "SkAutoKern.h"
+#include "SkDrawFilter.h"
+#include "SkDrawProcs.h"
+#include "SkGlyphCache.h"
+#include "SkGpuDevice.h"
+#include "SkGrPriv.h"
+#include "SkTextBlobRunIterator.h"
+#include "SkTextMapStateProc.h"
+#include "SkTextToPathIter.h"
+
+GrTextContext::GrTextContext(GrContext* context, const SkSurfaceProps& surfaceProps)
+    : fFallbackTextContext(nullptr)
+    , fContext(context)
+    , fSurfaceProps(surfaceProps) {
 }
 
-void GrTextContext::init(const GrPaint& grPaint, const SkPaint& skPaint) {
-    const GrClipData* clipData = fContext->getClip();
-
-    SkRect devConservativeBound;
-    clipData->fClipStack->getConservativeBounds(
-                                     -clipData->fOrigin.fX,
-                                     -clipData->fOrigin.fY,
-                                     fContext->getRenderTarget()->width(),
-                                     fContext->getRenderTarget()->height(),
-                                     &devConservativeBound);
-
-    devConservativeBound.roundOut(&fClipRect);
-
-    fDrawTarget = fContext->getTextTarget();
-
-    fPaint = grPaint;
-    fSkPaint = skPaint;
+GrTextContext::~GrTextContext() {
+    delete fFallbackTextContext;
 }
 
-//*** change to output positions?
-void GrTextContext::MeasureText(SkGlyphCache* cache, SkDrawCacheProc glyphCacheProc,
+void GrTextContext::drawText(GrDrawContext* dc, GrRenderTarget* rt,
+                             const GrClip& clip, const GrPaint& paint,
+                             const SkPaint& skPaint, const SkMatrix& viewMatrix,
+                             const char text[], size_t byteLength,
+                             SkScalar x, SkScalar y, const SkIRect& clipBounds) {
+    if (fContext->abandoned()) {
+        return;
+    }
+
+    GrTextContext* textContext = this;
+    do {
+        if (textContext->canDraw(skPaint, viewMatrix)) {
+            textContext->onDrawText(dc, rt, clip, paint, skPaint, viewMatrix,
+                                    text, byteLength, x, y, clipBounds);
+            return;
+        }
+        textContext = textContext->fFallbackTextContext;
+    } while (textContext);
+
+    // fall back to drawing as a path
+    this->drawTextAsPath(dc, clip, skPaint, viewMatrix, text, byteLength, x, y, clipBounds);
+}
+
+void GrTextContext::drawPosText(GrDrawContext* dc, GrRenderTarget* rt,
+                                const GrClip& clip, const GrPaint& paint,
+                                const SkPaint& skPaint, const SkMatrix& viewMatrix,
+                                const char text[], size_t byteLength,
+                                const SkScalar pos[], int scalarsPerPosition,
+                                const SkPoint& offset, const SkIRect& clipBounds) {
+    if (fContext->abandoned()) {
+        return;
+    }
+
+    GrTextContext* textContext = this;
+    do {
+        if (textContext->canDraw(skPaint, viewMatrix)) {
+            textContext->onDrawPosText(dc, rt, clip, paint, skPaint, viewMatrix,
+                                       text, byteLength, pos,
+                                       scalarsPerPosition, offset, clipBounds);
+            return;
+        }
+        textContext = textContext->fFallbackTextContext;
+    } while (textContext);
+
+    // fall back to drawing as a path
+    this->drawPosTextAsPath(dc, clip, skPaint, viewMatrix, text, byteLength, pos,
+                            scalarsPerPosition, offset, clipBounds);
+}
+
+bool GrTextContext::ShouldDisableLCD(const SkPaint& paint) {
+    if (!SkXfermode::AsMode(paint.getXfermode(), nullptr) ||
+        paint.getMaskFilter() ||
+        paint.getRasterizer() ||
+        paint.getPathEffect() ||
+        paint.isFakeBoldText() ||
+        paint.getStyle() != SkPaint::kFill_Style)
+    {
+        return true;
+    }
+    return false;
+}
+
+uint32_t GrTextContext::FilterTextFlags(const SkSurfaceProps& surfaceProps, const SkPaint& paint) {
+    uint32_t flags = paint.getFlags();
+
+    if (!paint.isLCDRenderText() || !paint.isAntiAlias()) {
+        return flags;
+    }
+
+    if (kUnknown_SkPixelGeometry == surfaceProps.pixelGeometry() || ShouldDisableLCD(paint)) {
+        flags &= ~SkPaint::kLCDRenderText_Flag;
+        flags |= SkPaint::kGenA8FromLCD_Flag;
+    }
+
+    return flags;
+}
+
+void GrTextContext::drawTextBlob(GrDrawContext* dc, GrRenderTarget* rt,
+                                 const GrClip& clip, const SkPaint& skPaint,
+                                 const SkMatrix& viewMatrix, const SkTextBlob* blob,
+                                 SkScalar x, SkScalar y,
+                                 SkDrawFilter* drawFilter, const SkIRect& clipBounds) {
+    SkPaint runPaint = skPaint;
+
+    SkTextBlobRunIterator it(blob);
+    for (;!it.done(); it.next()) {
+        size_t textLen = it.glyphCount() * sizeof(uint16_t);
+        const SkPoint& offset = it.offset();
+        // applyFontToPaint() always overwrites the exact same attributes,
+        // so it is safe to not re-seed the paint for this reason.
+        it.applyFontToPaint(&runPaint);
+
+        if (drawFilter && !drawFilter->filter(&runPaint, SkDrawFilter::kText_Type)) {
+            // A false return from filter() means we should abort the current draw.
+            runPaint = skPaint;
+            continue;
+        }
+
+        runPaint.setFlags(FilterTextFlags(fSurfaceProps, runPaint));
+
+        GrPaint grPaint;
+        if (!SkPaintToGrPaint(fContext, runPaint, viewMatrix, &grPaint)) {
+            return;
+        }
+
+        switch (it.positioning()) {
+        case SkTextBlob::kDefault_Positioning:
+            this->drawText(dc, rt, clip, grPaint, runPaint, viewMatrix, (const char *)it.glyphs(),
+                           textLen, x + offset.x(), y + offset.y(), clipBounds);
+            break;
+        case SkTextBlob::kHorizontal_Positioning:
+            this->drawPosText(dc, rt, clip, grPaint, runPaint, viewMatrix, (const char*)it.glyphs(),
+                              textLen, it.pos(), 1, SkPoint::Make(x, y + offset.y()), clipBounds);
+            break;
+        case SkTextBlob::kFull_Positioning:
+            this->drawPosText(dc, rt, clip, grPaint, runPaint, viewMatrix, (const char*)it.glyphs(),
+                              textLen, it.pos(), 2, SkPoint::Make(x, y), clipBounds);
+            break;
+        default:
+            SkFAIL("unhandled positioning mode");
+        }
+
+        if (drawFilter) {
+            // A draw filter may change the paint arbitrarily, so we must re-seed in this case.
+            runPaint = skPaint;
+        }
+    }
+}
+
+void GrTextContext::drawTextAsPath(GrDrawContext* dc,
+                                   const GrClip& clip,
+                                   const SkPaint& skPaint, const SkMatrix& viewMatrix,
+                                   const char text[], size_t byteLength, SkScalar x, SkScalar y,
+                                   const SkIRect& clipBounds) {
+    SkTextToPathIter iter(text, byteLength, skPaint, true);
+
+    SkMatrix    matrix;
+    matrix.setScale(iter.getPathScale(), iter.getPathScale());
+    matrix.postTranslate(x, y);
+
+    const SkPath* iterPath;
+    SkScalar xpos, prevXPos = 0;
+
+    while (iter.next(&iterPath, &xpos)) {
+        matrix.postTranslate(xpos - prevXPos, 0);
+        if (iterPath) {
+            const SkPaint& pnt = iter.getPaint();
+            GrBlurUtils::drawPathWithMaskFilter(fContext, dc, clip, *iterPath,
+                                                pnt, viewMatrix, &matrix, clipBounds, false);
+        }
+        prevXPos = xpos;
+    }
+}
+
+void GrTextContext::drawPosTextAsPath(GrDrawContext* dc,
+                                      const GrClip& clip,
+                                      const SkPaint& origPaint, const SkMatrix& viewMatrix,
+                                      const char text[], size_t byteLength,
+                                      const SkScalar pos[], int scalarsPerPosition,
+                                      const SkPoint& offset, const SkIRect& clipBounds) {
+    // setup our std paint, in hopes of getting hits in the cache
+    SkPaint paint(origPaint);
+    SkScalar matrixScale = paint.setupForAsPaths();
+
+    SkMatrix matrix;
+    matrix.setScale(matrixScale, matrixScale);
+
+    // Temporarily jam in kFill, so we only ever ask for the raw outline from the cache.
+    paint.setStyle(SkPaint::kFill_Style);
+    paint.setPathEffect(nullptr);
+
+    SkDrawCacheProc     glyphCacheProc = paint.getDrawCacheProc();
+    SkAutoGlyphCache    autoCache(paint, &fSurfaceProps, nullptr);
+    SkGlyphCache*       cache = autoCache.getCache();
+
+    const char*        stop = text + byteLength;
+    SkTextAlignProc    alignProc(paint.getTextAlign());
+    SkTextMapStateProc tmsProc(SkMatrix::I(), offset, scalarsPerPosition);
+
+    // Now restore the original settings, so we "draw" with whatever style/stroking.
+    paint.setStyle(origPaint.getStyle());
+    paint.setPathEffect(origPaint.getPathEffect());
+
+    while (text < stop) {
+        const SkGlyph& glyph = glyphCacheProc(cache, &text, 0, 0);
+        if (glyph.fWidth) {
+            const SkPath* path = cache->findPath(glyph);
+            if (path) {
+                SkPoint tmsLoc;
+                tmsProc(pos, &tmsLoc);
+                SkPoint loc;
+                alignProc(tmsLoc, glyph, &loc);
+
+                matrix[SkMatrix::kMTransX] = loc.fX;
+                matrix[SkMatrix::kMTransY] = loc.fY;
+                GrBlurUtils::drawPathWithMaskFilter(fContext, dc, clip, *path, paint,
+                                                    viewMatrix, &matrix, clipBounds, false);
+            }
+        }
+        pos += scalarsPerPosition;
+    }
+}
+
+// *** change to output positions?
+int GrTextContext::MeasureText(SkGlyphCache* cache, SkDrawCacheProc glyphCacheProc,
                                 const char text[], size_t byteLength, SkVector* stopVector) {
     SkFixed     x = 0, y = 0;
     const char* stop = text + byteLength;
 
     SkAutoKern  autokern;
 
+    int numGlyphs = 0;
     while (text < stop) {
         // don't need x, y here, since all subpixel variants will have the
         // same advance
@@ -50,10 +250,13 @@ void GrTextContext::MeasureText(SkGlyphCache* cache, SkDrawCacheProc glyphCacheP
 
         x += autokern.adjust(glyph) + glyph.fAdvanceX;
         y += glyph.fAdvanceY;
+        ++numGlyphs;
     }
     stopVector->set(SkFixedToScalar(x), SkFixedToScalar(y));
 
     SkASSERT(text == stop);
+    
+    return numGlyphs;
 }
 
 static void GlyphCacheAuxProc(void* data) {
@@ -63,13 +266,13 @@ static void GlyphCacheAuxProc(void* data) {
 
 GrFontScaler* GrTextContext::GetGrFontScaler(SkGlyphCache* cache) {
     void* auxData;
-    GrFontScaler* scaler = NULL;
+    GrFontScaler* scaler = nullptr;
 
     if (cache->getAuxProcData(GlyphCacheAuxProc, &auxData)) {
         scaler = (GrFontScaler*)auxData;
     }
-    if (NULL == scaler) {
-        scaler = SkNEW_ARGS(GrFontScaler, (cache));
+    if (nullptr == scaler) {
+        scaler = new GrFontScaler(cache);
         cache->setAuxProc(GlyphCacheAuxProc, scaler);
     }
 
diff --git a/gfx/skia/skia/src/gpu/GrTextContext.h b/gfx/skia/skia/src/gpu/GrTextContext.h
index c139e222959c..f50bf8586a16 100644
--- a/gfx/skia/skia/src/gpu/GrTextContext.h
+++ b/gfx/skia/skia/src/gpu/GrTextContext.h
@@ -8,48 +8,80 @@
 #ifndef GrTextContext_DEFINED
 #define GrTextContext_DEFINED
 
+#include "GrClip.h"
 #include "GrGlyph.h"
 #include "GrPaint.h"
-#include "SkDeviceProperties.h"
-
+#include "SkSurfaceProps.h"
 #include "SkPostConfig.h"
 
+class GrClip;
 class GrContext;
-class GrDrawTarget;
+class GrDrawContext;
 class GrFontScaler;
+class SkDrawFilter;
+class SkTextBlob;
 
 /*
  * This class wraps the state for a single text render
  */
 class GrTextContext {
 public:
-    virtual ~GrTextContext() {}
-    virtual void drawText(const GrPaint&, const SkPaint&, const char text[], size_t byteLength,
-                          SkScalar x, SkScalar y) = 0;
-    virtual void drawPosText(const GrPaint&, const SkPaint&,
-                             const char text[], size_t byteLength,
-                             const SkScalar pos[], SkScalar constY,
-                             int scalarsPerPosition) = 0;
+    virtual ~GrTextContext();
 
-    virtual bool canDraw(const SkPaint& paint) = 0;
+    void drawText(GrDrawContext* dc, GrRenderTarget* rt,
+                  const GrClip&,  const GrPaint&, const SkPaint&,
+                  const SkMatrix& viewMatrix, const char text[], size_t byteLength, SkScalar x,
+                  SkScalar y, const SkIRect& clipBounds);
+    void drawPosText(GrDrawContext* dc, GrRenderTarget* rt,
+                     const GrClip&, const GrPaint&, const SkPaint&,
+                     const SkMatrix& viewMatrix,
+                     const char text[], size_t byteLength,
+                     const SkScalar pos[], int scalarsPerPosition,
+                     const SkPoint& offset, const SkIRect& clipBounds);
+    virtual void drawTextBlob(GrDrawContext* dc, GrRenderTarget*, const GrClip&, const SkPaint&,
+                              const SkMatrix& viewMatrix, const SkTextBlob*,
+                              SkScalar x, SkScalar y,
+                              SkDrawFilter*, const SkIRect& clipBounds);
+
+    static bool ShouldDisableLCD(const SkPaint& paint);
 
 protected:
-    GrTextContext(GrContext*, const SkDeviceProperties&);
+    GrTextContext*                 fFallbackTextContext;
+    GrContext*                     fContext;
+    SkSurfaceProps                 fSurfaceProps;
+
+    GrTextContext(GrContext*, const SkSurfaceProps&);
+
+    virtual bool canDraw(const SkPaint&, const SkMatrix& viewMatrix) = 0;
+
+    virtual void onDrawText(GrDrawContext*, GrRenderTarget*, const GrClip&,
+                            const GrPaint&, const SkPaint&,
+                            const SkMatrix& viewMatrix, const char text[], size_t byteLength,
+                            SkScalar x, SkScalar y, const SkIRect& clipBounds) = 0;
+    virtual void onDrawPosText(GrDrawContext*, GrRenderTarget*, const GrClip&,
+                               const GrPaint&, const SkPaint&,
+                               const SkMatrix& viewMatrix,
+                               const char text[], size_t byteLength,
+                               const SkScalar pos[], int scalarsPerPosition,
+                               const SkPoint& offset, const SkIRect& clipBounds) = 0;
+
+    void drawTextAsPath(GrDrawContext*, const GrClip& clip,
+                        const SkPaint& origPaint, const SkMatrix& viewMatrix,
+                        const char text[], size_t byteLength, SkScalar x, SkScalar y,
+                        const SkIRect& clipBounds);
+    void drawPosTextAsPath(GrDrawContext*, const GrClip& clip,
+                           const SkPaint& origPaint, const SkMatrix& viewMatrix,
+                           const char text[], size_t byteLength,
+                           const SkScalar pos[], int scalarsPerPosition,
+                           const SkPoint& offset, const SkIRect& clipBounds);
 
     static GrFontScaler* GetGrFontScaler(SkGlyphCache* cache);
-    static void MeasureText(SkGlyphCache* cache, SkDrawCacheProc glyphCacheProc,
-                            const char text[], size_t byteLength, SkVector* stopVector);
+    // sets extent in stopVector and returns glyph count
+    static int MeasureText(SkGlyphCache* cache, SkDrawCacheProc glyphCacheProc,
+                           const char text[], size_t byteLength, SkVector* stopVector);
+    static uint32_t FilterTextFlags(const SkSurfaceProps& surfaceProps, const SkPaint& paint);
 
-    void init(const GrPaint&, const SkPaint&);
-    void finish() { fDrawTarget = NULL; }
-
-    GrContext*         fContext;
-    SkDeviceProperties fDeviceProperties;
-
-    GrDrawTarget*      fDrawTarget;
-    SkIRect            fClipRect;
-    GrPaint            fPaint;
-    SkPaint            fSkPaint;
+    friend class GrAtlasTextBatch;
 };
 
 #endif
diff --git a/gfx/skia/skia/src/gpu/GrTextStrike.cpp b/gfx/skia/skia/src/gpu/GrTextStrike.cpp
deleted file mode 100644
index 5606fe3bcc45..000000000000
--- a/gfx/skia/skia/src/gpu/GrTextStrike.cpp
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrGpu.h"
-#include "GrRectanizer.h"
-#include "GrTextStrike.h"
-#include "GrTextStrike_impl.h"
-#include "SkString.h"
-
-#include "SkDistanceFieldGen.h"
-
-///////////////////////////////////////////////////////////////////////////////
-
-#define GR_ATLAS_TEXTURE_WIDTH 1024
-#define GR_ATLAS_TEXTURE_HEIGHT 2048
-
-#define GR_PLOT_WIDTH  256
-#define GR_PLOT_HEIGHT 256
-
-#define GR_NUM_PLOTS_X   (GR_ATLAS_TEXTURE_WIDTH / GR_PLOT_WIDTH)
-#define GR_NUM_PLOTS_Y   (GR_ATLAS_TEXTURE_HEIGHT / GR_PLOT_HEIGHT)
-
-#define FONT_CACHE_STATS 0
-#if FONT_CACHE_STATS
-static int g_PurgeCount = 0;
-#endif
-
-GrFontCache::GrFontCache(GrGpu* gpu) : fGpu(gpu) {
-    gpu->ref();
-    for (int i = 0; i < kAtlasCount; ++i) {
-        fAtlases[i] = NULL;
-    }
-
-    fHead = fTail = NULL;
-}
-
-GrFontCache::~GrFontCache() {
-    SkTDynamicHash<GrTextStrike, GrFontDescKey>::Iter iter(&fCache);
-    while (!iter.done()) {
-        SkDELETE(&(*iter));
-        ++iter;
-    }
-    for (int i = 0; i < kAtlasCount; ++i) {
-        delete fAtlases[i];
-    }
-    fGpu->unref();
-#if FONT_CACHE_STATS
-      GrPrintf("Num purges: %d\n", g_PurgeCount);
-#endif
-}
-
-static GrPixelConfig mask_format_to_pixel_config(GrMaskFormat format) {
-    static const GrPixelConfig sPixelConfigs[] = {
-        kAlpha_8_GrPixelConfig,
-        kRGB_565_GrPixelConfig,
-        kSkia8888_GrPixelConfig,
-        kSkia8888_GrPixelConfig
-    };
-    SK_COMPILE_ASSERT(SK_ARRAY_COUNT(sPixelConfigs) == kMaskFormatCount, array_size_mismatch);
-
-    return sPixelConfigs[format];
-}
-
-static int mask_format_to_atlas_index(GrMaskFormat format) {
-    static const int sAtlasIndices[] = {
-        GrFontCache::kA8_AtlasType,
-        GrFontCache::k565_AtlasType,
-        GrFontCache::k8888_AtlasType,
-        GrFontCache::k8888_AtlasType
-    };
-    SK_COMPILE_ASSERT(SK_ARRAY_COUNT(sAtlasIndices) == kMaskFormatCount, array_size_mismatch);
-
-    SkASSERT(sAtlasIndices[format] < GrFontCache::kAtlasCount);
-    return sAtlasIndices[format];
-}
-
-GrTextStrike* GrFontCache::generateStrike(GrFontScaler* scaler) {
-    GrMaskFormat format = scaler->getMaskFormat();
-    GrPixelConfig config = mask_format_to_pixel_config(format);
-    int atlasIndex = mask_format_to_atlas_index(format);
-    if (NULL == fAtlases[atlasIndex]) {
-        SkISize textureSize = SkISize::Make(GR_ATLAS_TEXTURE_WIDTH,
-                                            GR_ATLAS_TEXTURE_HEIGHT);
-        fAtlases[atlasIndex] = SkNEW_ARGS(GrAtlas, (fGpu, config, kNone_GrTextureFlags,
-                                                    textureSize,
-                                                    GR_NUM_PLOTS_X,
-                                                    GR_NUM_PLOTS_Y,
-                                                    true));
-    }
-    GrTextStrike* strike = SkNEW_ARGS(GrTextStrike,
-                                      (this, scaler->getKey(), format, fAtlases[atlasIndex]));
-    fCache.add(strike);
-
-    if (fHead) {
-        fHead->fPrev = strike;
-    } else {
-        SkASSERT(NULL == fTail);
-        fTail = strike;
-    }
-    strike->fPrev = NULL;
-    strike->fNext = fHead;
-    fHead = strike;
-
-    return strike;
-}
-
-void GrFontCache::freeAll() {
-    SkTDynamicHash<GrTextStrike, GrFontDescKey>::Iter iter(&fCache);
-    while (!iter.done()) {
-        SkDELETE(&(*iter));
-        ++iter;
-    }
-    fCache.rewind();
-    for (int i = 0; i < kAtlasCount; ++i) {
-        delete fAtlases[i];
-        fAtlases[i] = NULL;
-    }
-    fHead = NULL;
-    fTail = NULL;
-}
-
-void GrFontCache::purgeStrike(GrTextStrike* strike) {
-    fCache.remove(*(strike->fFontScalerKey));
-    this->detachStrikeFromList(strike);
-    delete strike;
-}
-
-bool GrFontCache::freeUnusedPlot(GrTextStrike* preserveStrike) {
-    SkASSERT(NULL != preserveStrike);
-
-    GrAtlas* atlas = preserveStrike->fAtlas;
-    GrPlot* plot = atlas->getUnusedPlot();
-    if (NULL == plot) {
-        return false;
-    }
-    plot->resetRects();
-
-    GrTextStrike* strike = fHead;
-    GrMaskFormat maskFormat = preserveStrike->fMaskFormat;
-    while (strike) {
-        if (maskFormat != strike->fMaskFormat) {
-            strike = strike->fNext;
-            continue;
-        }
-
-        GrTextStrike* strikeToPurge = strike;
-        strike = strikeToPurge->fNext;
-        strikeToPurge->removePlot(plot);
-
-        // clear out any empty strikes (except this one)
-        if (strikeToPurge != preserveStrike && strikeToPurge->fPlotUsage.isEmpty()) {
-            this->purgeStrike(strikeToPurge);
-        }
-    }
-
-#if FONT_CACHE_STATS
-    ++g_PurgeCount;
-#endif
-
-    return true;
-}
-
-#ifdef SK_DEBUG
-void GrFontCache::validate() const {
-    int count = fCache.count();
-    if (0 == count) {
-        SkASSERT(!fHead);
-        SkASSERT(!fTail);
-    } else if (1 == count) {
-        SkASSERT(fHead == fTail);
-    } else {
-        SkASSERT(fHead != fTail);
-    }
-
-    int count2 = 0;
-    const GrTextStrike* strike = fHead;
-    while (strike) {
-        count2 += 1;
-        strike = strike->fNext;
-    }
-    SkASSERT(count == count2);
-
-    count2 = 0;
-    strike = fTail;
-    while (strike) {
-        count2 += 1;
-        strike = strike->fPrev;
-    }
-    SkASSERT(count == count2);
-}
-#endif
-
-void GrFontCache::dump() const {
-    static int gDumpCount = 0;
-    for (int i = 0; i < kAtlasCount; ++i) {
-        if (NULL != fAtlases[i]) {
-            GrTexture* texture = fAtlases[i]->getTexture();
-            if (NULL != texture) {
-                SkString filename;
-#ifdef SK_BUILD_FOR_ANDROID
-                filename.printf("/sdcard/fontcache_%d%d.png", gDumpCount, i);
-#else
-                filename.printf("fontcache_%d%d.png", gDumpCount, i);
-#endif
-                texture->savePixels(filename.c_str());
-            }
-        }
-    }
-    ++gDumpCount;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-#ifdef SK_DEBUG
-    static int gCounter;
-#endif
-
-/*
-    The text strike is specific to a given font/style/matrix setup, which is
-    represented by the GrHostFontScaler object we are given in getGlyph().
-
-    We map a 32bit glyphID to a GrGlyph record, which in turn points to a
-    atlas and a position within that texture.
- */
-
-GrTextStrike::GrTextStrike(GrFontCache* cache, const GrFontDescKey* key,
-                           GrMaskFormat format,
-                           GrAtlas* atlas) : fPool(64) {
-    fFontScalerKey = key;
-    fFontScalerKey->ref();
-
-    fFontCache = cache;     // no need to ref, it won't go away before we do
-    fAtlas = atlas;         // no need to ref, it won't go away before we do
-
-    fMaskFormat = format;
-
-#ifdef SK_DEBUG
-//    GrPrintf(" GrTextStrike %p %d\n", this, gCounter);
-    gCounter += 1;
-#endif
-}
-
-GrTextStrike::~GrTextStrike() {
-    fFontScalerKey->unref();
-    SkTDynamicHash<GrGlyph, GrGlyph::PackedID>::Iter iter(&fCache);
-    while (!iter.done()) {
-        (*iter).free();
-        ++iter;
-    }
-
-#ifdef SK_DEBUG
-    gCounter -= 1;
-//    GrPrintf("~GrTextStrike %p %d\n", this, gCounter);
-#endif
-}
-
-GrGlyph* GrTextStrike::generateGlyph(GrGlyph::PackedID packed,
-                                     GrFontScaler* scaler) {
-    SkIRect bounds;
-    if (fUseDistanceField) {
-        if (!scaler->getPackedGlyphDFBounds(packed, &bounds)) {
-            return NULL;
-        }
-    } else {
-        if (!scaler->getPackedGlyphBounds(packed, &bounds)) {
-            return NULL;
-        }
-    }
-
-    GrGlyph* glyph = fPool.alloc();
-    glyph->init(packed, bounds);
-    fCache.add(glyph);
-    return glyph;
-}
-
-void GrTextStrike::removePlot(const GrPlot* plot) {
-    SkTDynamicHash<GrGlyph, GrGlyph::PackedID>::Iter iter(&fCache);
-    while (!iter.done()) {
-        if (plot == (*iter).fPlot) {
-            (*iter).fPlot = NULL;
-        }
-        ++iter;
-    }
-
-    GrAtlas::RemovePlot(&fPlotUsage, plot);
-}
-
-
-bool GrTextStrike::addGlyphToAtlas(GrGlyph* glyph, GrFontScaler* scaler) {
-#if 0   // testing hack to force us to flush our cache often
-    static int gCounter;
-    if ((++gCounter % 10) == 0) return false;
-#endif
-
-    SkASSERT(glyph);
-    SkASSERT(scaler);
-    SkASSERT(fCache.find(glyph->fPackedID));
-    SkASSERT(NULL == glyph->fPlot);
-
-    SkAutoUnref ar(SkSafeRef(scaler));
-
-    int bytesPerPixel = GrMaskFormatBytesPerPixel(fMaskFormat);
-
-    size_t size = glyph->fBounds.area() * bytesPerPixel;
-    GrAutoMalloc<1024> storage(size);
-
-    if (fUseDistanceField) {
-        if (!scaler->getPackedGlyphDFImage(glyph->fPackedID, glyph->width(),
-                                           glyph->height(),
-                                           storage.get())) {
-            return false;
-        }
-    } else {
-        if (!scaler->getPackedGlyphImage(glyph->fPackedID, glyph->width(),
-                                         glyph->height(),
-                                         glyph->width() * bytesPerPixel,
-                                         storage.get())) {
-            return false;
-        }
-    }
-
-    GrPlot* plot  = fAtlas->addToAtlas(&fPlotUsage, glyph->width(),
-                                       glyph->height(), storage.get(),
-                                       &glyph->fAtlasLocation);
-
-    if (NULL == plot) {
-        return false;
-    }
-
-    glyph->fPlot = plot;
-    return true;
-}
diff --git a/gfx/skia/skia/src/gpu/GrTextStrike.h b/gfx/skia/skia/src/gpu/GrTextStrike.h
deleted file mode 100644
index a5bb6ae5db0e..000000000000
--- a/gfx/skia/skia/src/gpu/GrTextStrike.h
+++ /dev/null
@@ -1,134 +0,0 @@
-
-/*
- * Copyright 2010 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-
-#ifndef GrTextStrike_DEFINED
-#define GrTextStrike_DEFINED
-
-#include "GrAllocPool.h"
-#include "GrFontScaler.h"
-#include "SkTDynamicHash.h"
-#include "GrGlyph.h"
-#include "GrDrawTarget.h"
-#include "GrAtlas.h"
-
-class GrFontCache;
-class GrGpu;
-class GrFontPurgeListener;
-
-/**
- *  The textcache maps a hostfontscaler instance to a dictionary of
- *  glyphid->strike
- */
-class GrTextStrike {
-public:
-    GrTextStrike(GrFontCache*, const GrFontDescKey* fontScalerKey, GrMaskFormat, GrAtlas*);
-    ~GrTextStrike();
-
-    const GrFontDescKey* getFontScalerKey() const { return fFontScalerKey; }
-    GrFontCache* getFontCache() const { return fFontCache; }
-    GrMaskFormat getMaskFormat() const { return fMaskFormat; }
-    GrTexture*   getTexture() const { return fAtlas->getTexture(); }
-
-    inline GrGlyph* getGlyph(GrGlyph::PackedID, GrFontScaler*);
-    bool addGlyphToAtlas(GrGlyph*, GrFontScaler*);
-
-    // testing
-    int countGlyphs() const { return fCache.count(); }
-
-    // remove any references to this plot
-    void removePlot(const GrPlot* plot);
-
-    static const GrFontDescKey& GetKey(const GrTextStrike& ts) {
-        return *(ts.fFontScalerKey);
-    }
-    static uint32_t Hash(const GrFontDescKey& key) {
-        return key.getHash();
-    }
-
-public:
-    // for easy removal from list
-    GrTextStrike*   fPrev;
-    GrTextStrike*   fNext;
-
-private:
-    SkTDynamicHash<GrGlyph, GrGlyph::PackedID> fCache;
-    const GrFontDescKey* fFontScalerKey;
-    GrTAllocPool<GrGlyph> fPool;
-
-    GrFontCache*    fFontCache;
-    GrAtlas*        fAtlas;
-    GrMaskFormat    fMaskFormat;
-    bool            fUseDistanceField;
-
-    GrAtlas::ClientPlotUsage fPlotUsage;
-
-    GrGlyph* generateGlyph(GrGlyph::PackedID packed, GrFontScaler* scaler);
-
-    friend class GrFontCache;
-};
-
-class GrFontCache {
-public:
-    GrFontCache(GrGpu*);
-    ~GrFontCache();
-
-    inline GrTextStrike* getStrike(GrFontScaler*, bool useDistanceField);
-
-    void freeAll();
-
-    // make an unused plot available
-    bool freeUnusedPlot(GrTextStrike* preserveStrike);
-
-    // testing
-    int countStrikes() const { return fCache.count(); }
-    GrTextStrike* getHeadStrike() const { return fHead; }
-
-    void updateTextures() {
-        for (int i = 0; i < kAtlasCount; ++i) {
-            if (fAtlases[i]) {
-                fAtlases[i]->uploadPlotsToTexture();
-            }
-        }
-    }
-
-#ifdef SK_DEBUG
-    void validate() const;
-#else
-    void validate() const {}
-#endif
-
-    void dump() const;
-
-    enum AtlasType {
-        kA8_AtlasType,   //!< 1-byte per pixel
-        k565_AtlasType,  //!< 2-bytes per pixel
-        k8888_AtlasType, //!< 4-bytes per pixel
-
-        kLast_AtlasType = k8888_AtlasType
-    };
-    static const int kAtlasCount = kLast_AtlasType + 1;
-
-private:
-    friend class GrFontPurgeListener;
-
-    SkTDynamicHash<GrTextStrike, GrFontDescKey> fCache;
-    // for LRU
-    GrTextStrike* fHead;
-    GrTextStrike* fTail;
-
-    GrGpu*      fGpu;
-    GrAtlas*    fAtlases[kAtlasCount];
-
-    GrTextStrike* generateStrike(GrFontScaler*);
-    inline void detachStrikeFromList(GrTextStrike*);
-    void purgeStrike(GrTextStrike* strike);
-};
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/GrTextStrike_impl.h b/gfx/skia/skia/src/gpu/GrTextStrike_impl.h
deleted file mode 100644
index db1bf27cef0b..000000000000
--- a/gfx/skia/skia/src/gpu/GrTextStrike_impl.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-/*
- * Copyright 2010 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-
-#ifndef GrTextStrike_impl_DEFINED
-#define GrTextStrike_impl_DEFINED
-
-void GrFontCache::detachStrikeFromList(GrTextStrike* strike) {
-    if (strike->fPrev) {
-        SkASSERT(fHead != strike);
-        strike->fPrev->fNext = strike->fNext;
-    } else {
-        SkASSERT(fHead == strike);
-        fHead = strike->fNext;
-    }
-
-    if (strike->fNext) {
-        SkASSERT(fTail != strike);
-        strike->fNext->fPrev = strike->fPrev;
-    } else {
-        SkASSERT(fTail == strike);
-        fTail = strike->fPrev;
-    }
-}
-
-GrTextStrike* GrFontCache::getStrike(GrFontScaler* scaler, bool useDistanceField) {
-    this->validate();
-
-    GrTextStrike* strike = fCache.find(*(scaler->getKey()));
-    if (NULL == strike) {
-        strike = this->generateStrike(scaler);
-    } else if (strike->fPrev) {
-        // Need to put the strike at the head of its dllist, since that is how
-        // we age the strikes for purging (we purge from the back of the list)
-        this->detachStrikeFromList(strike);
-        // attach at the head
-        fHead->fPrev = strike;
-        strike->fNext = fHead;
-        strike->fPrev = NULL;
-        fHead = strike;
-    }
-    strike->fUseDistanceField = useDistanceField;
-    this->validate();
-    return strike;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-GrGlyph* GrTextStrike::getGlyph(GrGlyph::PackedID packed,
-                                GrFontScaler* scaler) {
-    GrGlyph* glyph = fCache.find(packed);
-    if (NULL == glyph) {
-        glyph = this->generateGlyph(packed, scaler);
-    }
-    return glyph;
-}
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/GrTexture.cpp b/gfx/skia/skia/src/gpu/GrTexture.cpp
index 63069a452bd6..905455a9ec70 100644
--- a/gfx/skia/skia/src/gpu/GrTexture.cpp
+++ b/gfx/skia/skia/src/gpu/GrTexture.cpp
@@ -6,46 +6,19 @@
  * found in the LICENSE file.
  */
 
-
-#include "GrTexture.h"
-
 #include "GrContext.h"
-#include "GrDrawTargetCaps.h"
+#include "GrCaps.h"
 #include "GrGpu.h"
+#include "GrResourceKey.h"
 #include "GrRenderTarget.h"
-#include "GrResourceCache.h"
+#include "GrRenderTargetPriv.h"
+#include "GrTexture.h"
+#include "GrTexturePriv.h"
 
-GrTexture::~GrTexture() {
-    if (NULL != fRenderTarget.get()) {
-        fRenderTarget.get()->owningTextureDestroyed();
-    }
-}
-
-/**
- * This method allows us to interrupt the normal deletion process and place
- * textures back in the texture cache when their ref count goes to zero.
- */
-void GrTexture::internal_dispose() const {
-    if (this->impl()->isSetFlag((GrTextureFlags) GrTextureImpl::kReturnToCache_FlagBit) &&
-        NULL != this->INHERITED::getContext()) {
-        GrTexture* nonConstThis = const_cast<GrTexture *>(this);
-        this->ref(); // restore ref count to initial setting
-
-        nonConstThis->impl()->resetFlag((GrTextureFlags) GrTextureImpl::kReturnToCache_FlagBit);
-        nonConstThis->INHERITED::getContext()->addExistingTextureToCache(nonConstThis);
-
-        // Note: "this" texture might be freed inside addExistingTextureToCache
-        // if it is purged.
-        return;
-    }
-
-    this->INHERITED::internal_dispose();
-}
-
-void GrTextureImpl::dirtyMipMaps(bool mipMapsDirty) {
+void GrTexture::dirtyMipMaps(bool mipMapsDirty) {
     if (mipMapsDirty) {
         if (kValid_MipMapsStatus == fMipMapsStatus) {
-            fMipMapsStatus = kAllocated_MipMapsStatus;
+           fMipMapsStatus = kAllocated_MipMapsStatus;
         }
     } else {
         const bool sizeChanged = kNotAllocated_MipMapsStatus == fMipMapsStatus;
@@ -57,132 +30,48 @@ void GrTextureImpl::dirtyMipMaps(bool mipMapsDirty) {
     }
 }
 
-size_t GrTexture::gpuMemorySize() const {
-    size_t textureSize =  (size_t) fDesc.fWidth *
-                                   fDesc.fHeight *
-                                   GrBytesPerPixel(fDesc.fConfig);
+size_t GrTexture::onGpuMemorySize() const {
+    size_t textureSize;
 
     if (GrPixelConfigIsCompressed(fDesc.fConfig)) {
         textureSize = GrCompressedFormatDataSize(fDesc.fConfig, fDesc.fWidth, fDesc.fHeight);
+    } else {
+        textureSize = (size_t) fDesc.fWidth * fDesc.fHeight * GrBytesPerPixel(fDesc.fConfig);
     }
 
-    if (this->impl()->hasMipMaps()) {
+    if (this->texturePriv().hasMipMaps()) {
         // We don't have to worry about the mipmaps being a different size than
         // we'd expect because we never change fDesc.fWidth/fHeight.
-        textureSize *= 2;
+        textureSize += textureSize/3;
     }
+
+    SkASSERT(!SkToBool(fDesc.fFlags & kRenderTarget_GrSurfaceFlag));
+    SkASSERT(textureSize <= WorseCaseSize(fDesc));
+
     return textureSize;
 }
 
-bool GrTexture::readPixels(int left, int top, int width, int height,
-                           GrPixelConfig config, void* buffer,
-                           size_t rowBytes, uint32_t pixelOpsFlags) {
-    // go through context so that all necessary flushing occurs
-    GrContext* context = this->getContext();
-    if (NULL == context) {
-        return false;
-    }
-    return context->readTexturePixels(this,
-                                      left, top, width, height,
-                                      config, buffer, rowBytes,
-                                      pixelOpsFlags);
-}
-
-void GrTexture::writePixels(int left, int top, int width, int height,
-                            GrPixelConfig config, const void* buffer,
-                            size_t rowBytes, uint32_t pixelOpsFlags) {
-    // go through context so that all necessary flushing occurs
-    GrContext* context = this->getContext();
-    if (NULL == context) {
-        return;
-    }
-    context->writeTexturePixels(this,
-                                left, top, width, height,
-                                config, buffer, rowBytes,
-                                pixelOpsFlags);
-}
-
-void GrTexture::onRelease() {
-    SkASSERT(!this->impl()->isSetFlag((GrTextureFlags) GrTextureImpl::kReturnToCache_FlagBit));
-    INHERITED::onRelease();
-}
-
-void GrTexture::onAbandon() {
-    if (NULL != fRenderTarget.get()) {
-        fRenderTarget->abandon();
-    }
-    INHERITED::onAbandon();
-}
-
 void GrTexture::validateDesc() const {
-    if (NULL != this->asRenderTarget()) {
+    if (this->asRenderTarget()) {
         // This texture has a render target
-        SkASSERT(0 != (fDesc.fFlags & kRenderTarget_GrTextureFlagBit));
-
-        if (NULL != this->asRenderTarget()->getStencilBuffer()) {
-            SkASSERT(0 != (fDesc.fFlags & kNoStencil_GrTextureFlagBit));
-        } else {
-            SkASSERT(0 == (fDesc.fFlags & kNoStencil_GrTextureFlagBit));
-        }
-
-        SkASSERT(fDesc.fSampleCnt == this->asRenderTarget()->numSamples());
+        SkASSERT(0 != (fDesc.fFlags & kRenderTarget_GrSurfaceFlag));
+        SkASSERT(fDesc.fSampleCnt == this->asRenderTarget()->numColorSamples());
     } else {
-        SkASSERT(0 == (fDesc.fFlags & kRenderTarget_GrTextureFlagBit));
-        SkASSERT(0 == (fDesc.fFlags & kNoStencil_GrTextureFlagBit));
+        SkASSERT(0 == (fDesc.fFlags & kRenderTarget_GrSurfaceFlag));
         SkASSERT(0 == fDesc.fSampleCnt);
     }
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-// These flags need to fit in a GrResourceKey::ResourceFlags so they can be folded into the texture
-// key
-enum TextureFlags {
-    /**
-     * The kStretchToPOT bit is set when the texture is NPOT and is being repeated but the
-     * hardware doesn't support that feature.
-     */
-    kStretchToPOT_TextureFlag = 0x1,
-    /**
-     * The kBilerp bit can only be set when the kStretchToPOT flag is set and indicates whether the
-     * stretched texture should be bilerped.
-     */
-     kBilerp_TextureFlag       = 0x2,
-};
-
 namespace {
-GrResourceKey::ResourceFlags get_texture_flags(const GrGpu* gpu,
-                                               const GrTextureParams* params,
-                                               const GrTextureDesc& desc) {
-    GrResourceKey::ResourceFlags flags = 0;
-    bool tiled = NULL != params && params->isTiled();
-    if (tiled && !gpu->caps()->npotTextureTileSupport()) {
-        if (!SkIsPow2(desc.fWidth) || !SkIsPow2(desc.fHeight)) {
-            flags |= kStretchToPOT_TextureFlag;
-            switch(params->filterMode()) {
-                case GrTextureParams::kNone_FilterMode:
-                    break;
-                case GrTextureParams::kBilerp_FilterMode:
-                case GrTextureParams::kMipMap_FilterMode:
-                    flags |= kBilerp_TextureFlag;
-                    break;
-            }
-        }
-    }
-    return flags;
-}
 
-GrResourceKey::ResourceType texture_resource_type() {
-    static const GrResourceKey::ResourceType gType = GrResourceKey::GenerateResourceType();
-    return gType;
-}
-
-// FIXME:  This should be refactored with the code in gl/GrGpuGL.cpp.
-GrSurfaceOrigin resolve_origin(const GrTextureDesc& desc) {
+// FIXME:  This should be refactored with the code in gl/GrGLGpu.cpp.
+GrSurfaceOrigin resolve_origin(const GrSurfaceDesc& desc) {
     // By default, GrRenderTargets are GL's normal orientation so that they
     // can be drawn to by the outside world without the client having
     // to render upside down.
-    bool renderTarget = 0 != (desc.fFlags & kRenderTarget_GrTextureFlagBit);
+    bool renderTarget = 0 != (desc.fFlags & kRenderTarget_GrSurfaceFlag);
     if (kDefault_GrSurfaceOrigin == desc.fOrigin) {
         return renderTarget ? kBottomLeft_GrSurfaceOrigin : kTopLeft_GrSurfaceOrigin;
     } else {
@@ -192,38 +81,33 @@ GrSurfaceOrigin resolve_origin(const GrTextureDesc& desc) {
 }
 
 //////////////////////////////////////////////////////////////////////////////
+GrTexture::GrTexture(GrGpu* gpu, LifeCycle lifeCycle, const GrSurfaceDesc& desc)
+    : INHERITED(gpu, lifeCycle, desc)
+    , fMipMapsStatus(kNotAllocated_MipMapsStatus) {
 
-GrResourceKey GrTextureImpl::ComputeKey(const GrGpu* gpu,
-                                    const GrTextureParams* params,
-                                    const GrTextureDesc& desc,
-                                    const GrCacheID& cacheID) {
-    GrResourceKey::ResourceFlags flags = get_texture_flags(gpu, params, desc);
-    return GrResourceKey(cacheID, texture_resource_type(), flags);
+    if (!this->isExternal() && !GrPixelConfigIsCompressed(desc.fConfig)) {
+        GrScratchKey key;
+        GrTexturePriv::ComputeScratchKey(desc, &key);
+        this->setScratchKey(key);
+    }
+    // only make sense if alloc size is pow2
+    fShiftFixedX = 31 - SkCLZ(fDesc.fWidth);
+    fShiftFixedY = 31 - SkCLZ(fDesc.fHeight);
 }
 
-GrResourceKey GrTextureImpl::ComputeScratchKey(const GrTextureDesc& desc) {
-    GrCacheID::Key idKey;
-    // Instead of a client-provided key of the texture contents we create a key from the
-    // descriptor.
-    GR_STATIC_ASSERT(sizeof(idKey) >= 16);
-    SkASSERT(desc.fHeight < (1 << 16));
-    SkASSERT(desc.fWidth < (1 << 16));
-    idKey.fData32[0] = (desc.fWidth) | (desc.fHeight << 16);
-    idKey.fData32[1] = desc.fConfig | desc.fSampleCnt << 16;
-    idKey.fData32[2] = desc.fFlags;
-    idKey.fData32[3] = resolve_origin(desc);    // Only needs 2 bits actually
-    static const int kPadSize = sizeof(idKey) - 16;
-    GR_STATIC_ASSERT(kPadSize >= 0);
-    memset(idKey.fData8 + 16, 0, kPadSize);
+void GrTexturePriv::ComputeScratchKey(const GrSurfaceDesc& desc, GrScratchKey* key) {
+    static const GrScratchKey::ResourceType kType = GrScratchKey::GenerateResourceType();
 
-    GrCacheID cacheID(GrResourceKey::ScratchDomain(), idKey);
-    return GrResourceKey(cacheID, texture_resource_type(), 0);
-}
+    GrSurfaceOrigin origin = resolve_origin(desc);
+    uint32_t flags = desc.fFlags & ~kCheckAllocation_GrSurfaceFlag;
 
-bool GrTextureImpl::NeedsResizing(const GrResourceKey& key) {
-    return SkToBool(key.getResourceFlags() & kStretchToPOT_TextureFlag);
-}
+    SkASSERT(static_cast<int>(desc.fConfig) < (1 << 6));
+    SkASSERT(desc.fSampleCnt < (1 << 8));
+    SkASSERT(flags < (1 << 10));
+    SkASSERT(static_cast<int>(origin) < (1 << 8));
 
-bool GrTextureImpl::NeedsBilerp(const GrResourceKey& key) {
-    return SkToBool(key.getResourceFlags() & kBilerp_TextureFlag);
+    GrScratchKey::Builder builder(key, kType, 3);
+    builder[0] = desc.fWidth;
+    builder[1] = desc.fHeight;
+    builder[2] = desc.fConfig | (desc.fSampleCnt << 6) | (flags << 14) | (origin << 24);
 }
diff --git a/gfx/skia/skia/src/gpu/GrTextureAccess.cpp b/gfx/skia/skia/src/gpu/GrTextureAccess.cpp
index 91db08bea543..7e1eda6211f5 100644
--- a/gfx/skia/skia/src/gpu/GrTextureAccess.cpp
+++ b/gfx/skia/skia/src/gpu/GrTextureAccess.cpp
@@ -42,11 +42,11 @@ GrTextureAccess::GrTextureAccess(GrTexture* texture,
 void GrTextureAccess::reset(GrTexture* texture,
                             const char* swizzle,
                             const GrTextureParams& params) {
-    SkASSERT(NULL != texture);
+    SkASSERT(texture);
     SkASSERT(strlen(swizzle) >= 1 && strlen(swizzle) <= 4);
 
     fParams = params;
-    fTexture.reset(SkRef(texture));
+    fTexture.set(SkRef(texture), kRead_GrIOType);
     this->setSwizzle(swizzle);
 }
 
@@ -54,18 +54,18 @@ void GrTextureAccess::reset(GrTexture* texture,
                             const char* swizzle,
                             GrTextureParams::FilterMode filterMode,
                             SkShader::TileMode tileXAndY) {
-    SkASSERT(NULL != texture);
+    SkASSERT(texture);
     SkASSERT(strlen(swizzle) >= 1 && strlen(swizzle) <= 4);
 
     fParams.reset(tileXAndY, filterMode);
-    fTexture.reset(SkRef(texture));
+    fTexture.set(SkRef(texture), kRead_GrIOType);
     this->setSwizzle(swizzle);
 }
 
 void GrTextureAccess::reset(GrTexture* texture,
                             const GrTextureParams& params) {
-    SkASSERT(NULL != texture);
-    fTexture.reset(SkRef(texture));
+    SkASSERT(texture);
+    fTexture.set(SkRef(texture), kRead_GrIOType);
     fParams = params;
     memcpy(fSwizzle, "rgba", 5);
     fSwizzleMask = kRGBA_GrColorComponentFlags;
@@ -74,8 +74,8 @@ void GrTextureAccess::reset(GrTexture* texture,
 void GrTextureAccess::reset(GrTexture* texture,
                             GrTextureParams::FilterMode filterMode,
                             SkShader::TileMode tileXAndY) {
-    SkASSERT(NULL != texture);
-    fTexture.reset(SkRef(texture));
+    SkASSERT(texture);
+    fTexture.set(SkRef(texture), kRead_GrIOType);
     fParams.reset(tileXAndY, filterMode);
     memcpy(fSwizzle, "rgba", 5);
     fSwizzleMask = kRGBA_GrColorComponentFlags;
diff --git a/gfx/skia/skia/src/gpu/GrTextureParamsAdjuster.cpp b/gfx/skia/skia/src/gpu/GrTextureParamsAdjuster.cpp
new file mode 100644
index 000000000000..2aedad57ef24
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrTextureParamsAdjuster.cpp
@@ -0,0 +1,484 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrTextureParamsAdjuster.h"
+
+#include "GrCaps.h"
+#include "GrContext.h"
+#include "GrDrawContext.h"
+#include "GrGpu.h"
+#include "GrGpuResourcePriv.h"
+#include "GrResourceKey.h"
+#include "GrTexture.h"
+#include "GrTextureParams.h"
+#include "GrTextureProvider.h"
+#include "SkCanvas.h"
+#include "SkGr.h"
+#include "SkGrPriv.h"
+#include "effects/GrBicubicEffect.h"
+#include "effects/GrTextureDomain.h"
+
+typedef GrTextureProducer::CopyParams CopyParams;
+
+//////////////////////////////////////////////////////////////////////////////
+
+static GrTexture* copy_on_gpu(GrTexture* inputTexture, const SkIRect* subset,
+                              const CopyParams& copyParams) {
+    SkASSERT(!subset || !subset->isEmpty());
+    GrContext* context = inputTexture->getContext();
+    SkASSERT(context);
+    const GrCaps* caps = context->caps();
+
+    // Either it's a cache miss or the original wasn't cached to begin with.
+    GrSurfaceDesc rtDesc = inputTexture->desc();
+    rtDesc.fFlags = rtDesc.fFlags | kRenderTarget_GrSurfaceFlag;
+    rtDesc.fWidth = copyParams.fWidth;
+    rtDesc.fHeight = copyParams.fHeight;
+    rtDesc.fConfig = GrMakePixelConfigUncompressed(rtDesc.fConfig);
+
+    // If the config isn't renderable try converting to either A8 or an 32 bit config. Otherwise,
+    // fail.
+    if (!caps->isConfigRenderable(rtDesc.fConfig, false)) {
+        if (GrPixelConfigIsAlphaOnly(rtDesc.fConfig)) {
+            if (caps->isConfigRenderable(kAlpha_8_GrPixelConfig, false)) {
+                rtDesc.fConfig = kAlpha_8_GrPixelConfig;
+            } else if (caps->isConfigRenderable(kSkia8888_GrPixelConfig, false)) {
+                rtDesc.fConfig = kSkia8888_GrPixelConfig;
+            } else {
+                return nullptr;
+            }
+        } else if (kRGB_GrColorComponentFlags ==
+                   (kRGB_GrColorComponentFlags & GrPixelConfigComponentMask(rtDesc.fConfig))) {
+            if (caps->isConfigRenderable(kSkia8888_GrPixelConfig, false)) {
+                rtDesc.fConfig = kSkia8888_GrPixelConfig;
+            } else {
+                return nullptr;
+            }
+        } else {
+            return nullptr;
+        }
+    }
+
+    SkAutoTUnref<GrTexture> copy(context->textureProvider()->createTexture(rtDesc, true));
+    if (!copy) {
+        return nullptr;
+    }
+
+    // TODO: If no scaling is being performed then use copySurface.
+
+    GrPaint paint;
+
+    // TODO: Initializing these values for no reason cause the compiler is complaining
+    SkScalar sx = 0.f;
+    SkScalar sy = 0.f;
+    if (subset) {
+        sx = 1.f / inputTexture->width();
+        sy = 1.f / inputTexture->height();
+    }
+
+    if (copyParams.fFilter != GrTextureParams::kNone_FilterMode && subset &&
+        (subset->width() != copyParams.fWidth || subset->height() != copyParams.fHeight)) {
+        SkRect domain;
+        domain.fLeft = (subset->fLeft + 0.5f) * sx;
+        domain.fTop = (subset->fTop + 0.5f)* sy;
+        domain.fRight = (subset->fRight - 0.5f) * sx;
+        domain.fBottom = (subset->fBottom - 0.5f) * sy;
+        // This would cause us to read values from outside the subset. Surely, the caller knows
+        // better!
+        SkASSERT(copyParams.fFilter != GrTextureParams::kMipMap_FilterMode);
+        paint.addColorFragmentProcessor(
+            GrTextureDomainEffect::Create(inputTexture, SkMatrix::I(), domain,
+                                          GrTextureDomain::kClamp_Mode,
+                                          copyParams.fFilter))->unref();
+    } else {
+        GrTextureParams params(SkShader::kClamp_TileMode, copyParams.fFilter);
+        paint.addColorTextureProcessor(inputTexture, SkMatrix::I(), params);
+    }
+    paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode);
+
+    SkRect localRect;
+    if (subset) {
+        localRect = SkRect::Make(*subset);
+        localRect.fLeft *= sx;
+        localRect.fTop *= sy;
+        localRect.fRight *= sx;
+        localRect.fBottom *= sy;
+    } else {
+        localRect = SkRect::MakeWH(1.f, 1.f);
+    }
+
+    SkAutoTUnref<GrDrawContext> drawContext(context->drawContext(copy->asRenderTarget()));
+    if (!drawContext) {
+        return nullptr;
+    }
+
+    SkRect dstRect = SkRect::MakeWH(SkIntToScalar(rtDesc.fWidth), SkIntToScalar(rtDesc.fHeight));
+    drawContext->fillRectToRect(GrClip::WideOpen(), paint, SkMatrix::I(), dstRect, localRect);
+    return copy.detach();
+}
+
+GrTextureAdjuster::GrTextureAdjuster(GrTexture* original, const SkIRect& contentArea)
+    : INHERITED(contentArea.width(), contentArea.height())
+    , fOriginal(original) {
+    SkASSERT(SkIRect::MakeWH(original->width(), original->height()).contains(contentArea));
+    if (contentArea.fLeft > 0 || contentArea.fTop > 0 ||
+        contentArea.fRight < original->width() || contentArea.fBottom < original->height()) {
+        fContentArea.set(contentArea);
+    }
+}
+
+GrTexture* GrTextureAdjuster::refTextureSafeForParams(const GrTextureParams& params,
+                                                      SkIPoint* outOffset) {
+    GrTexture* texture = this->originalTexture();
+    GrContext* context = texture->getContext();
+    CopyParams copyParams;
+    const SkIRect* contentArea = this->contentAreaOrNull();
+
+    if (contentArea && GrTextureParams::kMipMap_FilterMode == params.filterMode()) {
+        // If we generate a MIP chain for texture it will read pixel values from outside the content
+        // area.
+        copyParams.fWidth = contentArea->width();
+        copyParams.fHeight = contentArea->height();
+        copyParams.fFilter = GrTextureParams::kBilerp_FilterMode;
+    } else if (!context->getGpu()->makeCopyForTextureParams(texture->width(), texture->height(),
+                                                            params, &copyParams)) {
+        if (outOffset) {
+            if (contentArea) {
+                outOffset->set(contentArea->fLeft, contentArea->fRight);
+            } else {
+                outOffset->set(0, 0);
+            }
+        }
+        return SkRef(texture);
+    }
+    GrUniqueKey key;
+    this->makeCopyKey(copyParams, &key);
+    if (key.isValid()) {
+        GrTexture* result = context->textureProvider()->findAndRefTextureByUniqueKey(key);
+        if (result) {
+            return result;
+        }
+    }
+    GrTexture* result = copy_on_gpu(texture, contentArea, copyParams);
+    if (result) {
+        if (key.isValid()) {
+            result->resourcePriv().setUniqueKey(key);
+            this->didCacheCopy(key);
+        }
+        if (outOffset) {
+            outOffset->set(0, 0);
+        }
+    }
+    return result;
+}
+
+enum DomainMode {
+    kNoDomain_DomainMode,
+    kDomain_DomainMode,
+    kTightCopy_DomainMode
+};
+
+/** Determines whether a texture domain is necessary and if so what domain to use. There are two
+ *  rectangles to consider:
+ *  - The first is the content area specified by the texture adjuster. We can *never* allow
+ *    filtering to cause bleed of pixels outside this rectangle.
+ *  - The second rectangle is the constraint rectangle, which is known to be contained by the
+ *    content area. The filterConstraint specifies whether we are allowed to bleed across this
+ *    rect.
+ *
+ *  We want to avoid using a domain if possible. We consider the above rectangles, the filter type,
+ *  and whether the coords generated by the draw would all fall within the constraint rect. If the
+ *  latter is true we only need to consider whether the filter would extend beyond the rects.
+ */
+static DomainMode determine_domain_mode(
+                                    const SkRect& constraintRect,
+                                    GrTextureAdjuster::FilterConstraint filterConstraint,
+                                    bool coordsLimitedToConstraintRect,
+                                    int texW, int texH,
+                                    const SkIRect* textureContentArea,
+                                    const GrTextureParams::FilterMode* filterModeOrNullForBicubic,
+                                    SkRect* domainRect) {
+
+    SkASSERT(SkRect::MakeIWH(texW, texH).contains(constraintRect));
+    // We only expect a content area rect if there is some non-content area.
+    SkASSERT(!textureContentArea ||
+             (!textureContentArea->contains(SkIRect::MakeWH(texW, texH)) &&
+              SkRect::Make(*textureContentArea).contains(constraintRect)));
+
+    SkRect textureBounds = SkRect::MakeIWH(texW, texH);
+    // If the src rectangle contains the whole texture then no need for a domain.
+    if (constraintRect.contains(textureBounds)) {
+        return kNoDomain_DomainMode;
+    }
+
+    bool restrictFilterToRect = (filterConstraint == GrTextureProducer::kYes_FilterConstraint);
+
+    // If we can filter outside the constraint rect, and there is no non-content area of the
+    // texture, and we aren't going to generate sample coords outside the constraint rect then we
+    // don't need a domain.
+    if (!restrictFilterToRect && !textureContentArea && coordsLimitedToConstraintRect) {
+        return kNoDomain_DomainMode;
+    }
+
+    // Get the domain inset based on sampling mode (or bail if mipped)
+    SkScalar filterHalfWidth = 0.f;
+    if (filterModeOrNullForBicubic) {
+        switch (*filterModeOrNullForBicubic) {
+            case GrTextureParams::kNone_FilterMode:
+                if (coordsLimitedToConstraintRect) {
+                    return kNoDomain_DomainMode;
+                } else {
+                    filterHalfWidth = 0.f;
+                }
+                break;
+            case GrTextureParams::kBilerp_FilterMode:
+                filterHalfWidth = .5f;
+                break;
+            case GrTextureParams::kMipMap_FilterMode:
+                if (restrictFilterToRect || textureContentArea) {
+                    // No domain can save us here.
+                    return kTightCopy_DomainMode;
+                }
+                return kNoDomain_DomainMode;
+        }
+    } else {
+        // bicubic does nearest filtering internally.
+        filterHalfWidth = 1.5f;
+    }
+
+    // Both bilerp and bicubic use bilinear filtering and so need to be clamped to the center
+    // of the edge texel. Pinning to the texel center has no impact on nearest mode and MIP-maps
+
+    static const SkScalar kDomainInset = 0.5f;
+    // Figure out the limits of pixels we're allowed to sample from.
+    // Unless we know the amount of outset and the texture matrix we have to conservatively enforce
+    // the domain.
+    if (restrictFilterToRect) {
+        domainRect->fLeft = constraintRect.fLeft + kDomainInset;
+        domainRect->fTop = constraintRect.fTop + kDomainInset;
+        domainRect->fRight = constraintRect.fRight - kDomainInset;
+        domainRect->fBottom = constraintRect.fBottom - kDomainInset;
+    } else if (textureContentArea) {
+        // If we got here then: there is a textureContentArea, the coords are limited to the
+        // constraint rect, and we're allowed to filter across the constraint rect boundary. So
+        // we check whether the filter would reach across the edge of the content area.
+        // We will only set the sides that are required.
+
+        domainRect->setLargest();
+        if (coordsLimitedToConstraintRect) {
+            // We may be able to use the fact that the texture coords are limited to the constraint
+            // rect in order to avoid having to add a domain.
+            bool needContentAreaConstraint = false;
+            if (textureContentArea->fLeft > 0 &&
+                textureContentArea->fLeft + filterHalfWidth > constraintRect.fLeft) {
+                domainRect->fLeft = textureContentArea->fLeft + kDomainInset;
+                needContentAreaConstraint = true;
+            }
+            if (textureContentArea->fTop > 0 &&
+                textureContentArea->fTop + filterHalfWidth > constraintRect.fTop) {
+                domainRect->fTop = textureContentArea->fTop + kDomainInset;
+                needContentAreaConstraint = true;
+            }
+            if (textureContentArea->fRight < texW &&
+                textureContentArea->fRight - filterHalfWidth < constraintRect.fRight) {
+                domainRect->fRight = textureContentArea->fRight - kDomainInset;
+                needContentAreaConstraint = true;
+            }
+            if (textureContentArea->fBottom < texH &&
+                textureContentArea->fBottom - filterHalfWidth < constraintRect.fBottom) {
+                domainRect->fBottom = textureContentArea->fBottom - kDomainInset;
+                needContentAreaConstraint = true;
+            }
+            if (!needContentAreaConstraint) {
+                return kNoDomain_DomainMode;
+            }
+        } else {
+            // Our sample coords for the texture are allowed to be outside the constraintRect so we
+            // don't consider it when computing the domain.
+            if (textureContentArea->fLeft != 0) {
+                domainRect->fLeft = textureContentArea->fLeft + kDomainInset;
+            }
+            if (textureContentArea->fTop != 0) {
+                domainRect->fTop = textureContentArea->fTop + kDomainInset;
+            }
+            if (textureContentArea->fRight != texW) {
+                domainRect->fRight = textureContentArea->fRight - kDomainInset;
+            }
+            if (textureContentArea->fBottom != texH) {
+                domainRect->fBottom = textureContentArea->fBottom - kDomainInset;
+            }
+        }
+    } else {
+        return kNoDomain_DomainMode;
+    }
+
+    if (domainRect->fLeft > domainRect->fRight) {
+        domainRect->fLeft = domainRect->fRight = SkScalarAve(domainRect->fLeft, domainRect->fRight);
+    }
+    if (domainRect->fTop > domainRect->fBottom) {
+        domainRect->fTop = domainRect->fBottom = SkScalarAve(domainRect->fTop, domainRect->fBottom);
+    }
+    domainRect->fLeft /= texW;
+    domainRect->fTop /= texH;
+    domainRect->fRight /= texW;
+    domainRect->fBottom /= texH;
+    return kDomain_DomainMode;
+}
+
+static const GrFragmentProcessor* create_fp_for_domain_and_filter(
+                                        GrTexture* texture,
+                                        const SkMatrix& textureMatrix,
+                                        DomainMode domainMode,
+                                        const SkRect& domain,
+                                        const GrTextureParams::FilterMode* filterOrNullForBicubic) {
+    SkASSERT(kTightCopy_DomainMode != domainMode);
+    if (filterOrNullForBicubic) {
+        if (kDomain_DomainMode == domainMode) {
+            return GrTextureDomainEffect::Create(texture, textureMatrix, domain,
+                                                 GrTextureDomain::kClamp_Mode,
+                                                 *filterOrNullForBicubic);
+        } else {
+            GrTextureParams params(SkShader::kClamp_TileMode, *filterOrNullForBicubic);
+            return GrSimpleTextureEffect::Create(texture, textureMatrix, params);
+        }
+    } else {
+        if (kDomain_DomainMode == domainMode) {
+            return GrBicubicEffect::Create(texture, textureMatrix, domain);
+        } else {
+            static const SkShader::TileMode kClampClamp[] =
+            { SkShader::kClamp_TileMode, SkShader::kClamp_TileMode };
+            return GrBicubicEffect::Create(texture, textureMatrix, kClampClamp);
+        }
+    }
+}
+
+const GrFragmentProcessor* GrTextureAdjuster::createFragmentProcessor(
+                                        const SkMatrix& origTextureMatrix,
+                                        const SkRect& origConstraintRect,
+                                        FilterConstraint filterConstraint,
+                                        bool coordsLimitedToConstraintRect,
+                                        const GrTextureParams::FilterMode* filterOrNullForBicubic) {
+
+    SkMatrix textureMatrix = origTextureMatrix;
+    const SkIRect* contentArea = this->contentAreaOrNull();
+    // Convert the constraintRect to be relative to the texture rather than the content area so
+    // that both rects are in the same coordinate system.
+    SkTCopyOnFirstWrite<SkRect> constraintRect(origConstraintRect);
+    if (contentArea) {
+        SkScalar l = SkIntToScalar(contentArea->fLeft);
+        SkScalar t = SkIntToScalar(contentArea->fTop);
+        constraintRect.writable()->offset(l, t);
+        textureMatrix.postTranslate(l, t);
+    }
+
+    SkRect domain;
+    GrTexture* texture = this->originalTexture();
+    DomainMode domainMode =
+        determine_domain_mode(*constraintRect, filterConstraint, coordsLimitedToConstraintRect,
+                              texture->width(), texture->height(),
+                              contentArea, filterOrNullForBicubic,
+                              &domain);
+    if (kTightCopy_DomainMode == domainMode) {
+        // TODO: Copy the texture and adjust the texture matrix (both parts need to consider
+        // non-int constraint rect)
+        // For now: treat as bilerp and ignore what goes on above level 0.
+
+        // We only expect MIP maps to require a tight copy.
+        SkASSERT(filterOrNullForBicubic &&
+                 GrTextureParams::kMipMap_FilterMode == *filterOrNullForBicubic);
+        static const GrTextureParams::FilterMode kBilerp = GrTextureParams::kBilerp_FilterMode;
+        domainMode =
+            determine_domain_mode(*constraintRect, filterConstraint, coordsLimitedToConstraintRect,
+                                  texture->width(), texture->height(),
+                                  contentArea, &kBilerp, &domain);
+        SkASSERT(kTightCopy_DomainMode != domainMode);
+    }
+    SkASSERT(kNoDomain_DomainMode == domainMode ||
+             (domain.fLeft <= domain.fRight && domain.fTop <= domain.fBottom));
+    textureMatrix.postIDiv(texture->width(), texture->height());
+    return create_fp_for_domain_and_filter(texture, textureMatrix, domainMode, domain,
+                                           filterOrNullForBicubic);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+GrTexture* GrTextureMaker::refTextureForParams(const GrTextureParams& params) {
+    CopyParams copyParams;
+    if (!fContext->getGpu()->makeCopyForTextureParams(this->width(), this->height(), params,
+                                                      &copyParams)) {
+        return this->refOriginalTexture();
+    }
+    GrUniqueKey copyKey;
+    this->makeCopyKey(copyParams, &copyKey);
+    if (copyKey.isValid()) {
+        GrTexture* result = fContext->textureProvider()->findAndRefTextureByUniqueKey(copyKey);
+        if (result) {
+            return result;
+        }
+    }
+
+    GrTexture* result = this->generateTextureForParams(copyParams);
+    if (!result) {
+        return nullptr;
+    }
+
+    if (copyKey.isValid()) {
+        fContext->textureProvider()->assignUniqueKeyToTexture(copyKey, result);
+        this->didCacheCopy(copyKey);
+    }
+    return result;
+}
+
+const GrFragmentProcessor* GrTextureMaker::createFragmentProcessor(
+                                        const SkMatrix& textureMatrix,
+                                        const SkRect& constraintRect,
+                                        FilterConstraint filterConstraint,
+                                        bool coordsLimitedToConstraintRect,
+                                        const GrTextureParams::FilterMode* filterOrNullForBicubic) {
+
+    const GrTextureParams::FilterMode* fmForDetermineDomain = filterOrNullForBicubic;
+    if (filterOrNullForBicubic && GrTextureParams::kMipMap_FilterMode == *filterOrNullForBicubic &&
+        kYes_FilterConstraint == filterConstraint) {
+        // TODo: Here we should force a copy restricted to the constraintRect since MIP maps will
+        // read outside the constraint rect. However, as in the adjuster case, we aren't currently
+        // doing that.
+        // We instead we compute the domain as though were bilerping which is only correct if we
+        // only sample level 0.
+        static const GrTextureParams::FilterMode kBilerp = GrTextureParams::kBilerp_FilterMode;
+        fmForDetermineDomain = &kBilerp;
+    }
+
+    GrTextureParams params;
+    if (filterOrNullForBicubic) {
+        params.reset(SkShader::kClamp_TileMode, *filterOrNullForBicubic);
+    } else {
+        // Bicubic doesn't use filtering for it's texture accesses.
+        params.reset(SkShader::kClamp_TileMode, GrTextureParams::kNone_FilterMode);
+    }
+    SkAutoTUnref<GrTexture> texture(this->refTextureForParams(params));
+    if (!texture) {
+        return nullptr;
+    }
+    SkRect domain;
+    DomainMode domainMode =
+        determine_domain_mode(constraintRect, filterConstraint, coordsLimitedToConstraintRect,
+                              texture->width(), texture->height(), nullptr, fmForDetermineDomain,
+                              &domain);
+    SkASSERT(kTightCopy_DomainMode != domainMode);
+    SkMatrix normalizedTextureMatrix = textureMatrix;
+    normalizedTextureMatrix.postIDiv(texture->width(), texture->height());
+    return create_fp_for_domain_and_filter(texture, normalizedTextureMatrix, domainMode, domain,
+                                           filterOrNullForBicubic);
+}
+
+GrTexture* GrTextureMaker::generateTextureForParams(const CopyParams& copyParams) {
+    SkAutoTUnref<GrTexture> original(this->refOriginalTexture());
+    if (!original) {
+        return nullptr;
+    }
+    return copy_on_gpu(original, nullptr, copyParams);
+}
diff --git a/gfx/skia/skia/src/gpu/GrTextureParamsAdjuster.h b/gfx/skia/skia/src/gpu/GrTextureParamsAdjuster.h
new file mode 100644
index 000000000000..ed9f142af0f6
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrTextureParamsAdjuster.h
@@ -0,0 +1,203 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrTextureMaker_DEFINED
+#define GrTextureMaker_DEFINED
+
+#include "GrTextureParams.h"
+#include "GrResourceKey.h"
+#include "GrTexture.h"
+#include "SkTLazy.h"
+
+class GrContext;
+class GrTextureParams;
+class GrUniqueKey;
+class SkBitmap;
+
+/**
+ * Different GPUs and API extensions have different requirements with respect to what texture
+ * sampling parameters may be used with textures of various types. This class facilitates making
+ * texture compatible with a given GrTextureParams. There are two immediate subclasses defined
+ * below. One is a base class for sources that are inherently texture-backed (e.g. a texture-backed
+ * SkImage). It supports subsetting the original texture. The other is for use cases where the
+ * source can generate a texture that represents some content (e.g. cpu pixels, SkPicture, ...).
+ */
+class GrTextureProducer : public SkNoncopyable {
+public:
+    struct CopyParams {
+        GrTextureParams::FilterMode fFilter;
+        int                         fWidth;
+        int                         fHeight;
+    };
+
+    enum FilterConstraint {
+        kYes_FilterConstraint,
+        kNo_FilterConstraint,
+    };
+
+    /**
+     * Helper for creating a fragment processor to sample the texture with a given filtering mode.
+     * It attempts to avoid making texture copies or using domains whenever possible.
+     *
+     * @param textureMatrix                    Matrix used to access the texture. It is applied to
+     *                                         the local coords. The post-transformed coords should
+     *                                         be in texel units (rather than normalized) with
+     *                                         respect to this Producer's bounds (width()/height()).
+     * @param constraintRect                   A rect that represents the area of the texture to be
+     *                                         sampled. It must be contained in the Producer's bounds
+     *                                         as defined by width()/height().
+     * @param filterConstriant                 Indicates whether filtering is limited to
+     *                                         constraintRect.
+     * @param coordsLimitedToConstraintRect    Is it known that textureMatrix*localCoords is bound
+     *                                         by the portion of the texture indicated by
+     *                                         constraintRect (without consideration of filter
+     *                                         width, just the raw coords).
+     * @param filterOrNullForBicubic           If non-null indicates the filter mode. If null means
+     *                                         use bicubic filtering.
+     **/
+    virtual const GrFragmentProcessor* createFragmentProcessor(
+                                    const SkMatrix& textureMatrix,
+                                    const SkRect& constraintRect,
+                                    FilterConstraint filterConstraint,
+                                    bool coordsLimitedToConstraintRect,
+                                    const GrTextureParams::FilterMode* filterOrNullForBicubic) = 0;
+
+    virtual ~GrTextureProducer() {}
+
+    int width() const { return fWidth; }
+    int height() const { return fHeight; }
+
+protected:
+    GrTextureProducer(int width, int height) : fWidth(width), fHeight(height) {}
+
+    /** Helper for creating a key for a copy from an original key. */
+    static void MakeCopyKeyFromOrigKey(const GrUniqueKey& origKey,
+                                       const CopyParams& copyParams,
+                                       GrUniqueKey* copyKey) {
+        SkASSERT(!copyKey->isValid());
+        if (origKey.isValid()) {
+            static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
+            GrUniqueKey::Builder builder(copyKey, origKey, kDomain, 3);
+            builder[0] = copyParams.fFilter;
+            builder[1] = copyParams.fWidth;
+            builder[2] = copyParams.fHeight;
+        }
+    }
+
+    /**
+    *  If we need to make a copy in order to be compatible with GrTextureParams producer is asked to
+    *  return a key that identifies its original content + the CopyParms parameter. If the producer
+    *  does not want to cache the stretched version (e.g. the producer is volatile), this should
+    *  simply return without initializing the copyKey.
+    */
+    virtual void makeCopyKey(const CopyParams&, GrUniqueKey* copyKey) = 0;
+
+    /**
+    *  If a stretched version of the texture is generated, it may be cached (assuming that
+    *  makeCopyKey() returns true). In that case, the maker is notified in case it
+    *  wants to note that for when the maker is destroyed.
+    */
+    virtual void didCacheCopy(const GrUniqueKey& copyKey) = 0;
+
+private:
+    const int fWidth;
+    const int fHeight;
+
+    typedef SkNoncopyable INHERITED;
+};
+
+/**
+ * Base class for sources that start out as textures. Optionally allows for a content area subrect.
+ * The intent is not to use content area for subrect rendering. Rather, the pixels outside the
+ * content area have undefined values and shouldn't be read *regardless* of filtering mode or
+ * the SkCanvas::SrcRectConstraint used for subrect draws.
+ */
+class GrTextureAdjuster : public GrTextureProducer {
+public:
+    /** Makes the subset of the texture safe to use with the given texture parameters.
+        outOffset will be the top-left corner of the subset if a copy is not made. Otherwise,
+        the copy will be tight to the contents and outOffset will be (0, 0). If the copy's size
+        does not match subset's dimensions then the contents are scaled to fit the copy.*/
+    GrTexture* refTextureSafeForParams(const GrTextureParams&, SkIPoint* outOffset);
+
+    const GrFragmentProcessor* createFragmentProcessor(
+                                const SkMatrix& textureMatrix,
+                                const SkRect& constraintRect,
+                                FilterConstraint,
+                                bool coordsLimitedToConstraintRect,
+                                const GrTextureParams::FilterMode* filterOrNullForBicubic) override;
+
+protected:
+    /** The whole texture is content. */
+    explicit GrTextureAdjuster(GrTexture* original)
+        : INHERITED(original->width(), original->height())
+        , fOriginal(original) {}
+
+    GrTextureAdjuster(GrTexture* original, const SkIRect& contentArea);
+
+    GrTexture* originalTexture() const { return fOriginal; }
+
+    /** Returns the content area or null for the whole original texture */
+    const SkIRect* contentAreaOrNull() { return fContentArea.getMaybeNull(); }
+
+private:
+    SkTLazy<SkIRect>    fContentArea;
+    GrTexture*          fOriginal;
+
+    typedef GrTextureProducer INHERITED;
+};
+
+/**
+ * Base class for sources that start out as something other than a texture (encoded image,
+ * picture, ...).
+ */
+class GrTextureMaker : public GrTextureProducer {
+public:
+    /** Returns a texture that is safe for use with the params. If the size of the returned texture
+        does not match width()/height() then the contents of the original must be scaled to fit
+        the texture. */
+    GrTexture* refTextureForParams(const GrTextureParams&);
+
+    const GrFragmentProcessor* createFragmentProcessor(
+                                const SkMatrix& textureMatrix,
+                                const SkRect& constraintRect,
+                                FilterConstraint filterConstraint,
+                                bool coordsLimitedToConstraintRect,
+                                const GrTextureParams::FilterMode* filterOrNullForBicubic) override;
+
+protected:
+    GrTextureMaker(GrContext* context, int width, int height)
+        : INHERITED(width, height)
+        , fContext(context) {}
+
+    /**
+     *  Return the maker's "original" texture. It is the responsibility of the maker to handle any
+     *  caching of the original if desired.
+     */
+    virtual GrTexture* refOriginalTexture() = 0;
+
+    /**
+     *  Return a new (uncached) texture that is the stretch of the maker's original.
+     *
+     *  The base-class handles general logic for this, and only needs access to the following
+     *  method:
+     *  - refOriginalTexture()
+     *
+     *  Subclass may override this if they can handle creating the texture more directly than
+     *  by copying.
+     */
+    virtual GrTexture* generateTextureForParams(const CopyParams&);
+
+    GrContext* context() const { return fContext; }
+
+private:
+    GrContext*  fContext;
+
+    typedef GrTextureProducer INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrTexturePriv.h b/gfx/skia/skia/src/gpu/GrTexturePriv.h
new file mode 100644
index 000000000000..8add4e1c495e
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrTexturePriv.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrTexturePriv_DEFINED
+#define GrTexturePriv_DEFINED
+
+#include "GrTexture.h"
+
+/** Class that adds methods to GrTexture that are only intended for use internal to Skia.
+    This class is purely a privileged window into GrTexture. It should never have additional data
+    members or virtual methods.
+    Non-static methods that are not trivial inlines should be spring-boarded (e.g. declared and
+    implemented privately in GrTexture with a inline public method here). */
+class GrTexturePriv {
+public:
+    void setFlag(GrSurfaceFlags flags) {
+        fTexture->fDesc.fFlags = fTexture->fDesc.fFlags | flags;
+    }
+
+    void resetFlag(GrSurfaceFlags flags) {
+        fTexture->fDesc.fFlags = fTexture->fDesc.fFlags & ~flags;
+    }
+
+    bool isSetFlag(GrSurfaceFlags flags) const {
+        return 0 != (fTexture->fDesc.fFlags & flags);
+    }
+
+    void dirtyMipMaps(bool mipMapsDirty) { fTexture->dirtyMipMaps(mipMapsDirty); }
+
+    bool mipMapsAreDirty() const {
+        return GrTexture::kValid_MipMapsStatus != fTexture->fMipMapsStatus;
+    }
+
+    bool hasMipMaps() const {
+        return GrTexture::kNotAllocated_MipMapsStatus != fTexture->fMipMapsStatus;
+    }
+
+    static void ComputeScratchKey(const GrSurfaceDesc&, GrScratchKey*);
+
+    // TODO: Move this logic and the shift values out of here and to the callers.
+    SkFixed normalizeFixedX(SkFixed x) const {
+        SkASSERT(SkIsPow2(fTexture->fDesc.fWidth));
+        return x >> fTexture->fShiftFixedX;
+    }
+
+    SkFixed normalizeFixedY(SkFixed y) const {
+        SkASSERT(SkIsPow2(fTexture->fDesc.fHeight));
+        return y >> fTexture->fShiftFixedY;
+    }
+
+private:
+    GrTexturePriv(GrTexture* texture) : fTexture(texture) { }
+    GrTexturePriv(const GrTexturePriv& that) : fTexture(that.fTexture) { }
+    GrTexturePriv& operator=(const GrTexturePriv&); // unimpl
+
+    // No taking addresses of this type.
+    const GrTexturePriv* operator&() const;
+    GrTexturePriv* operator&();
+
+    GrTexture* fTexture;
+        
+    friend class GrTexture; // to construct/copy this type.
+};
+
+inline GrTexturePriv GrTexture::texturePriv() { return GrTexturePriv(this); }
+
+inline const GrTexturePriv GrTexture::texturePriv () const {
+    return GrTexturePriv(const_cast<GrTexture*>(this));
+}
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrTextureProvider.cpp b/gfx/skia/skia/src/gpu/GrTextureProvider.cpp
new file mode 100644
index 000000000000..cb652f7a7fd8
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrTextureProvider.cpp
@@ -0,0 +1,135 @@
+
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrTextureProvider.h"
+#include "GrTexturePriv.h"
+#include "GrResourceCache.h"
+#include "GrGpu.h"
+
+enum ScratchTextureFlags {
+    kExact_ScratchTextureFlag           = 0x1,
+    kNoPendingIO_ScratchTextureFlag     = 0x2,
+    kNoCreate_ScratchTextureFlag        = 0x4,
+};
+
+GrTexture* GrTextureProvider::createTexture(const GrSurfaceDesc& desc, bool budgeted,
+                                            const void* srcData, size_t rowBytes) {
+    if (this->isAbandoned()) {
+        return nullptr;
+    }
+    if ((desc.fFlags & kRenderTarget_GrSurfaceFlag) &&
+        !fGpu->caps()->isConfigRenderable(desc.fConfig, desc.fSampleCnt > 0)) {
+        return nullptr;
+    }
+    if (!GrPixelConfigIsCompressed(desc.fConfig)) {
+        static const uint32_t kFlags = kExact_ScratchTextureFlag |
+                                       kNoCreate_ScratchTextureFlag;
+        if (GrTexture* texture = this->refScratchTexture(desc, kFlags)) {
+            if (!srcData || texture->writePixels(0, 0, desc.fWidth, desc.fHeight, desc.fConfig,
+                                                 srcData, rowBytes)) {
+                if (!budgeted) {
+                    texture->resourcePriv().makeUnbudgeted();
+                }
+                return texture;
+            }
+            texture->unref();
+        }
+    }
+    return fGpu->createTexture(desc, budgeted, srcData, rowBytes);
+}
+
+GrTexture* GrTextureProvider::createApproxTexture(const GrSurfaceDesc& desc) {
+    return this->internalCreateApproxTexture(desc, 0);
+}
+
+GrTexture* GrTextureProvider::internalCreateApproxTexture(const GrSurfaceDesc& desc,
+                                                          uint32_t scratchFlags) {
+    if (this->isAbandoned()) {
+        return nullptr;
+    }
+    // Currently we don't recycle compressed textures as scratch.
+    if (GrPixelConfigIsCompressed(desc.fConfig)) {
+        return nullptr;
+    } else {
+        return this->refScratchTexture(desc, scratchFlags);
+    }
+}
+
+GrTexture* GrTextureProvider::refScratchTexture(const GrSurfaceDesc& inDesc,
+                                                uint32_t flags) {
+    SkASSERT(!this->isAbandoned());
+    SkASSERT(!GrPixelConfigIsCompressed(inDesc.fConfig));
+
+    SkTCopyOnFirstWrite<GrSurfaceDesc> desc(inDesc);
+
+    if (fGpu->caps()->reuseScratchTextures() || (desc->fFlags & kRenderTarget_GrSurfaceFlag)) {
+        if (!(kExact_ScratchTextureFlag & flags)) {
+            // bin by pow2 with a reasonable min
+            const int kMinSize = 16;
+            GrSurfaceDesc* wdesc = desc.writable();
+            wdesc->fWidth  = SkTMax(kMinSize, GrNextPow2(desc->fWidth));
+            wdesc->fHeight = SkTMax(kMinSize, GrNextPow2(desc->fHeight));
+        }
+
+        GrScratchKey key;
+        GrTexturePriv::ComputeScratchKey(*desc, &key);
+        uint32_t scratchFlags = 0;
+        if (kNoPendingIO_ScratchTextureFlag & flags) {
+            scratchFlags = GrResourceCache::kRequireNoPendingIO_ScratchFlag;
+        } else  if (!(desc->fFlags & kRenderTarget_GrSurfaceFlag)) {
+            // If it is not a render target then it will most likely be populated by
+            // writePixels() which will trigger a flush if the texture has pending IO.
+            scratchFlags = GrResourceCache::kPreferNoPendingIO_ScratchFlag;
+        }
+        GrGpuResource* resource = fCache->findAndRefScratchResource(key,
+                                                                   GrSurface::WorseCaseSize(*desc),
+                                                                   scratchFlags);
+        if (resource) {
+            GrSurface* surface = static_cast<GrSurface*>(resource);
+            GrRenderTarget* rt = surface->asRenderTarget();
+            if (rt && fGpu->caps()->discardRenderTargetSupport()) {
+                rt->discard();
+            }
+            return surface->asTexture();
+        }
+    }
+
+    if (!(kNoCreate_ScratchTextureFlag & flags)) {
+        return fGpu->createTexture(*desc, true, nullptr, 0);
+    }
+
+    return nullptr;
+}
+
+GrTexture* GrTextureProvider::wrapBackendTexture(const GrBackendTextureDesc& desc,
+                                                 GrWrapOwnership ownership) {
+    if (this->isAbandoned()) {
+        return nullptr;
+    }
+    return fGpu->wrapBackendTexture(desc, ownership);
+}
+
+GrRenderTarget* GrTextureProvider::wrapBackendRenderTarget(const GrBackendRenderTargetDesc& desc) {
+    return this->isAbandoned() ? nullptr : fGpu->wrapBackendRenderTarget(desc,
+                                                                      kBorrow_GrWrapOwnership);
+}
+
+void GrTextureProvider::assignUniqueKeyToResource(const GrUniqueKey& key, GrGpuResource* resource) {
+    if (this->isAbandoned() || !resource) {
+        return;
+    }
+    resource->resourcePriv().setUniqueKey(key);
+}
+
+bool GrTextureProvider::existsResourceWithUniqueKey(const GrUniqueKey& key) const {
+    return this->isAbandoned() ? false : fCache->hasUniqueKey(key);
+}
+
+GrGpuResource* GrTextureProvider::findAndRefResourceByUniqueKey(const GrUniqueKey& key) {
+    return this->isAbandoned() ? nullptr : fCache->findAndRefUniqueResource(key);
+}
diff --git a/gfx/skia/skia/src/gpu/GrTraceMarker.cpp b/gfx/skia/skia/src/gpu/GrTraceMarker.cpp
index bc6d4566189d..f54ab83b801e 100644
--- a/gfx/skia/skia/src/gpu/GrTraceMarker.cpp
+++ b/gfx/skia/skia/src/gpu/GrTraceMarker.cpp
@@ -62,7 +62,7 @@ SkString GrTraceMarkerSet::toString() const {
     int counter = 0;
     const int numMarkers = this->fMarkerArray.count();
 
-    // check used for GrGpuGL device after we've already collapsed all markers
+    // check used for GrGLGpu device after we've already collapsed all markers
     if (1 == numMarkers && -1 == this->fMarkerArray[0].fID) {
         marker_string.append(this->fMarkerArray[0].fMarker);
         return marker_string;
diff --git a/gfx/skia/skia/src/gpu/GrTraceMarker.h b/gfx/skia/skia/src/gpu/GrTraceMarker.h
index 4ecda2c67ab4..3182b3948e81 100644
--- a/gfx/skia/skia/src/gpu/GrTraceMarker.h
+++ b/gfx/skia/skia/src/gpu/GrTraceMarker.h
@@ -13,7 +13,6 @@
 
 class GrGpuTraceMarker {
 public:
-    GrGpuTraceMarker() {};
     GrGpuTraceMarker(const char* marker, int idCounter) : fMarker(marker), fID(idCounter) {}
 
     bool operator<(const GrGpuTraceMarker& rhs) const {
diff --git a/gfx/skia/skia/src/gpu/GrTracing.h b/gfx/skia/skia/src/gpu/GrTracing.h
index efe0fce4a156..d758c0329d9a 100644
--- a/gfx/skia/skia/src/gpu/GrTracing.h
+++ b/gfx/skia/skia/src/gpu/GrTracing.h
@@ -10,8 +10,8 @@
 
 #include "GrDrawTarget.h"
 #include "GrGpu.h"
-#include "GrInOrderDrawBuffer.h"
 #include "GrTraceMarker.h"
+#include "SkTLazy.h"
 #include "SkTraceEvent.h"
 
 /**
@@ -19,45 +19,39 @@
  */
 class GrGpuTraceMarkerGenerator : public ::SkNoncopyable {
 public:
-    GrGpuTraceMarkerGenerator(GrDrawTarget* target) : fTarget(target) {}
+    GrGpuTraceMarkerGenerator(GrDrawTarget* target) {}
 
     ~GrGpuTraceMarkerGenerator() {
         if (fTraceMarker.isValid()) {
-            fTarget->removeGpuTraceMarker(fTraceMarker.get());
+            // TODO remove trace marker
         }
     }
 
     void initialize(const char* marker_str, int* marker_counter) {
-        GrGpuTraceMarker* traceMarker = fTraceMarker.init();
-        traceMarker->fMarker = marker_str;
-        traceMarker->fID = *marker_counter;
-        fTarget->addGpuTraceMarker(traceMarker);
+        // GrGpuTraceMarker* traceMarker = fTraceMarker.init(marker_str, *marker_counter);
+        // TODO add trace marker
     }
 
 private:
-    GrDrawTarget* fTarget;
     SkTLazy<GrGpuTraceMarker> fTraceMarker;
 };
 
 class GrGpuTraceMarkerGeneratorContext : public ::SkNoncopyable {
 public:
-    GrGpuTraceMarkerGeneratorContext(GrContext* context) : fContext(context) {}
+    GrGpuTraceMarkerGeneratorContext(GrContext* context) {}
 
     ~GrGpuTraceMarkerGeneratorContext() {
         if (fTraceMarker.isValid()) {
-            fContext->removeGpuTraceMarker(fTraceMarker.get());
+            // TODO remove trace marker
         }
     }
 
     void initialize(const char* marker_str, int* marker_counter) {
-        GrGpuTraceMarker* traceMarker = fTraceMarker.init();
-        traceMarker->fMarker = marker_str;
-        traceMarker->fID = *marker_counter;
-        fContext->addGpuTraceMarker(traceMarker);
+        // GrGpuTraceMarker* traceMarker = fTraceMarker.init(marker_str, *marker_counter);
+        // TODO add trace marker
     }
 
 private:
-    GrContext* fContext;
     SkTLazy<GrGpuTraceMarker> fTraceMarker;
 };
 
@@ -85,13 +79,20 @@ private:
     INTERNAL_TRACE_EVENT_ADD_SCOPED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"),name,   \
                        "id", name_counter, ##__VA_ARGS__);                        
 
-#define GR_CREATE_GPU_TRACE_MARKER(name, name_counter, target)                    \
-    GrGpuTraceMarkerGenerator SK_MACRO_APPEND_LINE(TMG)(target);                  \
-    if (target->isGpuTracingEnabled()) {                                          \
-        SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter);                \
+#if GR_FORCE_GPU_TRACE_DEBUGGING
+#define GR_CREATE_GPU_TRACE_MARKER(name, name_counter, target)                     \
+    GrGpuTraceMarkerGenerator SK_MACRO_APPEND_LINE(TMG)(target);                   \
+    SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter);
+#else
+#define GR_CREATE_GPU_TRACE_MARKER(name, name_counter, target)                     \
+    GrGpuTraceMarkerGenerator SK_MACRO_APPEND_LINE(TMG)(target);                   \
+    bool SK_MACRO_APPEND_LINE(gpuTracingEnabled);                                  \
+    TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"),      \
+                                        &SK_MACRO_APPEND_LINE(gpuTracingEnabled)); \
+    if (SK_MACRO_APPEND_LINE(gpuTracingEnabled)) {                                 \
+        SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter);                 \
     }                                                                             
-
-
+#endif
 
 #define GR_CREATE_TRACE_MARKER_CONTEXT(name, context)                             \
     INTERNAL_GR_CREATE_TRACE_MARKER_SCOPED_C(name, context)                       
@@ -112,10 +113,19 @@ private:
     INTERNAL_TRACE_EVENT_ADD_SCOPED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"),name,   \
                                     "id", name_counter, ##__VA_ARGS__);                        
 
-#define GR_CREATE_GPU_TRACE_MARKER_C(name, name_counter, context)                 \
-    GrGpuTraceMarkerGeneratorContext SK_MACRO_APPEND_LINE(TMG)(context);          \
-    if (context->isGpuTracingEnabled()) {                                         \
-        SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter);                \
+#if GR_FORCE_GPU_TRACE_DEBUGGING
+#define GR_CREATE_GPU_TRACE_MARKER_C(name, name_counter, context)                  \
+    GrGpuTraceMarkerGeneratorContext SK_MACRO_APPEND_LINE(TMG)(context);           \
+    SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter);
+#else
+#define GR_CREATE_GPU_TRACE_MARKER_C(name, name_counter, context)                  \
+    GrGpuTraceMarkerGeneratorContext SK_MACRO_APPEND_LINE(TMG)(context);           \
+    bool SK_MACRO_APPEND_LINE(gpuTracingEnabled);                                  \
+    TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"),      \
+                                        &SK_MACRO_APPEND_LINE(gpuTracingEnabled)); \
+    if (SK_MACRO_APPEND_LINE(gpuTracingEnabled)) {                                 \
+        SK_MACRO_APPEND_LINE(TMG).initialize(name, &name_counter);                 \
     }                                                                             
+#endif
 
 #endif
diff --git a/gfx/skia/skia/src/gpu/GrVertexBuffer.h b/gfx/skia/skia/src/gpu/GrVertexBuffer.h
index c3cf53489275..3c62cd61ca7f 100644
--- a/gfx/skia/skia/src/gpu/GrVertexBuffer.h
+++ b/gfx/skia/skia/src/gpu/GrVertexBuffer.h
@@ -14,9 +14,27 @@
 #include "GrGeometryBuffer.h"
 
 class GrVertexBuffer : public GrGeometryBuffer {
+public:
+    static void ComputeScratchKey(size_t size, bool dynamic, GrScratchKey* key) {
+        static const GrScratchKey::ResourceType kType = GrScratchKey::GenerateResourceType();
+
+        GrScratchKey::Builder builder(key, kType, 2);
+
+        builder[0] = SkToUInt(size);
+        builder[1] = dynamic ? 1 : 0;
+    }
+
 protected:
-    GrVertexBuffer(GrGpu* gpu, bool isWrapped, size_t gpuMemorySize, bool dynamic, bool cpuBacked)
-        : INHERITED(gpu, isWrapped, gpuMemorySize, dynamic, cpuBacked) {}
+    GrVertexBuffer(GrGpu* gpu, size_t gpuMemorySize, bool dynamic, bool cpuBacked)
+        : INHERITED(gpu, gpuMemorySize, dynamic, cpuBacked) {
+        // We currently only make buffers scratch if they're both pow2 sized and not cpuBacked.
+        if (!cpuBacked && SkIsPow2(gpuMemorySize)) {
+            GrScratchKey key;
+            ComputeScratchKey(gpuMemorySize, dynamic, &key);
+            this->setScratchKey(key);
+        }
+    }
+
 private:
     typedef GrGeometryBuffer INHERITED;
 };
diff --git a/gfx/skia/skia/src/gpu/GrVertices.h b/gfx/skia/skia/src/gpu/GrVertices.h
new file mode 100644
index 000000000000..03ede07d154c
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrVertices.h
@@ -0,0 +1,179 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrVertices_DEFINED
+#define GrVertices_DEFINED
+
+#include "GrIndexBuffer.h"
+#include "GrVertexBuffer.h"
+
+class GrNonInstancedVertices {
+public:
+    GrPrimitiveType primitiveType() const { return fPrimitiveType; }
+    int startVertex() const { return fStartVertex; }
+    int startIndex() const { return fStartIndex; }
+    int vertexCount() const { return fVertexCount; }
+    int indexCount() const { return fIndexCount; }
+    bool isIndexed() const { return fIndexCount > 0; }
+
+    const GrVertexBuffer* vertexBuffer() const { return fVertexBuffer.get(); }
+    const GrIndexBuffer* indexBuffer() const { return fIndexBuffer.get(); }
+
+protected:
+    GrPrimitiveType         fPrimitiveType;
+    int                     fStartVertex;
+    int                     fStartIndex;
+    int                     fVertexCount;
+    int                     fIndexCount;
+    GrPendingIOResource<const GrVertexBuffer, kRead_GrIOType> fVertexBuffer;
+    GrPendingIOResource<const GrIndexBuffer, kRead_GrIOType>  fIndexBuffer;
+    friend class GrVertices;
+};
+
+/**
+ * Used to communicate index and vertex buffers, counts, and offsets for a draw from GrBatch to
+ * GrGpu. It also holds the primitive type for the draw. TODO: Consider moving ownership of this
+ * and draw-issuing responsibility to GrPrimitiveProcessor. The rest of the vertex info lives there
+ * already (stride, attribute mappings).
+ */
+class GrVertices : public GrNonInstancedVertices {
+public:
+    GrVertices() {}
+    GrVertices(const GrVertices& di) { (*this) = di; }
+    GrVertices& operator =(const GrVertices& di);
+
+    void init(GrPrimitiveType primType, const GrVertexBuffer* vertexBuffer, int startVertex,
+                int vertexCount) {
+        SkASSERT(vertexBuffer);
+        SkASSERT(vertexCount);
+        SkASSERT(startVertex >= 0);
+        fPrimitiveType = primType;
+        fVertexBuffer.reset(vertexBuffer);
+        fIndexBuffer.reset(nullptr);
+        fStartVertex = startVertex;
+        fStartIndex = 0;
+        fVertexCount = vertexCount;
+        fIndexCount = 0;
+        fInstanceCount = 0;
+        fVerticesPerInstance = 0;
+        fIndicesPerInstance = 0;
+        fMaxInstancesPerDraw = 0;
+    }
+
+    void initIndexed(GrPrimitiveType primType,
+                        const GrVertexBuffer* vertexBuffer,
+                        const GrIndexBuffer* indexBuffer,
+                        int startVertex,
+                        int startIndex,
+                        int vertexCount,
+                        int indexCount) {
+        SkASSERT(indexBuffer);
+        SkASSERT(vertexBuffer);
+        SkASSERT(indexCount);
+        SkASSERT(vertexCount);
+        SkASSERT(startIndex >= 0);
+        SkASSERT(startVertex >= 0);
+        fPrimitiveType = primType;
+        fVertexBuffer.reset(vertexBuffer);
+        fIndexBuffer.reset(indexBuffer);
+        fStartVertex = startVertex;
+        fStartIndex = startIndex;
+        fVertexCount = vertexCount;
+        fIndexCount = indexCount;
+        fInstanceCount = 0;
+        fVerticesPerInstance = 0;
+        fIndicesPerInstance = 0;
+        fMaxInstancesPerDraw = 0;
+    }
+
+
+    /** Variation of the above that may be used when the total number of instances may exceed
+        the number of instances supported by the index buffer. To be used with
+        nextInstances() to draw in max-sized batches.*/
+    void initInstanced(GrPrimitiveType primType,
+                        const GrVertexBuffer* vertexBuffer,
+                        const GrIndexBuffer* indexBuffer,
+                        int startVertex,
+                        int verticesPerInstance,
+                        int indicesPerInstance,
+                        int instanceCount,
+                        int maxInstancesPerDraw) {
+        SkASSERT(vertexBuffer);
+        SkASSERT(indexBuffer);
+        SkASSERT(instanceCount);
+        SkASSERT(verticesPerInstance);
+        SkASSERT(indicesPerInstance);
+        SkASSERT(startVertex >= 0);
+        fPrimitiveType = primType;
+        fVertexBuffer.reset(vertexBuffer);
+        fIndexBuffer.reset(indexBuffer);
+        fStartVertex = startVertex;
+        fStartIndex = 0;
+        fVerticesPerInstance = verticesPerInstance;
+        fIndicesPerInstance = indicesPerInstance;
+        fInstanceCount = instanceCount;
+        fVertexCount = instanceCount * fVerticesPerInstance;
+        fIndexCount = instanceCount * fIndicesPerInstance;
+        fMaxInstancesPerDraw = maxInstancesPerDraw;
+    }
+
+
+    /** These return 0 if initInstanced was not used to initialize the GrVertices. */
+    int verticesPerInstance() const { return fVerticesPerInstance; }
+    int indicesPerInstance() const { return fIndicesPerInstance; }
+    int instanceCount() const { return fInstanceCount; }
+
+    bool isInstanced() const { return fInstanceCount > 0; }
+
+    class Iterator {
+    public:
+        const GrNonInstancedVertices* init(const GrVertices& vertices) {
+            fVertices = &vertices;
+            if (vertices.fInstanceCount <= vertices.fMaxInstancesPerDraw) {
+                fInstancesRemaining = 0;
+                // Note, this also covers the non-instanced case!
+                return &vertices;
+            }
+            SkASSERT(vertices.isInstanced());
+            fInstanceBatch.fIndexBuffer.reset(vertices.fIndexBuffer.get());
+            fInstanceBatch.fVertexBuffer.reset(vertices.fVertexBuffer.get());
+            fInstanceBatch.fIndexCount = vertices.fMaxInstancesPerDraw *
+                                         vertices.fIndicesPerInstance;
+            fInstanceBatch.fVertexCount = vertices.fMaxInstancesPerDraw *
+                                          vertices.fVerticesPerInstance;
+            fInstanceBatch.fPrimitiveType = vertices.fPrimitiveType;
+            fInstanceBatch.fStartIndex = vertices.fStartIndex;
+            fInstanceBatch.fStartVertex = vertices.fStartVertex;
+            fInstancesRemaining = vertices.fInstanceCount - vertices.fMaxInstancesPerDraw;
+            return &fInstanceBatch;
+        }
+
+        const GrNonInstancedVertices* next() {
+            if (!fInstancesRemaining) {
+                return nullptr;
+            }
+            fInstanceBatch.fStartVertex += fInstanceBatch.fVertexCount;
+            int instances = SkTMin(fInstancesRemaining, fVertices->fMaxInstancesPerDraw);
+            fInstanceBatch.fIndexCount = instances * fVertices->fIndicesPerInstance;
+            fInstanceBatch.fVertexCount = instances * fVertices->fVerticesPerInstance;
+            fInstancesRemaining -= instances;
+            return &fInstanceBatch;
+        }
+    private:
+        GrNonInstancedVertices fInstanceBatch;
+        const GrVertices* fVertices;
+        int fInstancesRemaining;
+    };
+
+private:
+    int                     fInstanceCount;
+    int                     fVerticesPerInstance;
+    int                     fIndicesPerInstance;
+    int                     fMaxInstancesPerDraw;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/GrXferProcessor.cpp b/gfx/skia/skia/src/gpu/GrXferProcessor.cpp
new file mode 100644
index 000000000000..b07b9720df69
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrXferProcessor.cpp
@@ -0,0 +1,219 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrXferProcessor.h"
+#include "GrPipeline.h"
+#include "GrPipelineBuilder.h"
+#include "GrProcOptInfo.h"
+#include "gl/GrGLCaps.h"
+
+GrXferProcessor::GrXferProcessor()
+    : fWillReadDstColor(false)
+    , fDstReadUsesMixedSamples(false)
+    , fDstTextureOffset() {
+}
+
+GrXferProcessor::GrXferProcessor(const DstTexture* dstTexture,
+                                 bool willReadDstColor,
+                                 bool hasMixedSamples)
+    : fWillReadDstColor(willReadDstColor)
+    , fDstReadUsesMixedSamples(willReadDstColor && hasMixedSamples)
+    , fDstTextureOffset() {
+    if (dstTexture && dstTexture->texture()) {
+        SkASSERT(willReadDstColor);
+        fDstTexture.reset(dstTexture->texture());
+        fDstTextureOffset = dstTexture->offset();
+        this->addTextureAccess(&fDstTexture);
+        this->setWillReadFragmentPosition();
+    }
+}
+
+GrXferProcessor::OptFlags GrXferProcessor::getOptimizations(
+                                                       const GrPipelineOptimizations& optimizations,
+                                                       bool doesStencilWrite,
+                                                       GrColor* overrideColor,
+                                                       const GrCaps& caps) const {
+    GrXferProcessor::OptFlags flags = this->onGetOptimizations(optimizations,
+                                                               doesStencilWrite,
+                                                               overrideColor,
+                                                               caps);
+
+    if (this->willReadDstColor()) {
+        // When performing a dst read we handle coverage in the base class.
+        SkASSERT(!(flags & GrXferProcessor::kIgnoreCoverage_OptFlag));
+        if (optimizations.fCoveragePOI.isSolidWhite()) {
+            flags |= GrXferProcessor::kIgnoreCoverage_OptFlag;
+        }
+    }
+    return flags;
+}
+
+bool GrXferProcessor::hasSecondaryOutput() const {
+    if (!this->willReadDstColor()) {
+        return this->onHasSecondaryOutput();
+    }
+    return this->dstReadUsesMixedSamples();
+}
+
+void GrXferProcessor::getBlendInfo(BlendInfo* blendInfo) const {
+    blendInfo->reset();
+    if (!this->willReadDstColor()) {
+        this->onGetBlendInfo(blendInfo);
+    } else if (this->dstReadUsesMixedSamples()) {
+        blendInfo->fDstBlend = kIS2A_GrBlendCoeff;
+    }
+}
+
+void GrXferProcessor::getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const {
+    uint32_t key = this->willReadDstColor() ? 0x1 : 0x0;
+    if (key) {
+        if (const GrTexture* dstTexture = this->getDstTexture()) {
+            key |= 0x2;
+            if (kTopLeft_GrSurfaceOrigin == dstTexture->origin()) {
+                key |= 0x4;
+            }
+        }
+        if (this->dstReadUsesMixedSamples()) {
+            key |= 0x8;
+        }
+    }
+    b->add32(key);
+    this->onGetGLSLProcessorKey(caps, b);
+}
+
+GrXferBarrierType GrXferProcessor::xferBarrierType(const GrRenderTarget* rt,
+                                                   const GrCaps& caps) const {
+    SkASSERT(rt);
+    if (static_cast<const GrSurface*>(rt) == this->getDstTexture()) {
+        // Texture barriers are required when a shader reads and renders to the same texture.
+        SkASSERT(caps.textureBarrierSupport());
+        return kTexture_GrXferBarrierType;
+    }
+    return this->onXferBarrier(rt, caps);
+}
+
+#ifdef SK_DEBUG
+static const char* equation_string(GrBlendEquation eq) {
+    switch (eq) {
+        case kAdd_GrBlendEquation:
+            return "add";
+        case kSubtract_GrBlendEquation:
+            return "subtract";
+        case kReverseSubtract_GrBlendEquation:
+            return "reverse_subtract";
+        case kScreen_GrBlendEquation:
+            return "screen";
+        case kOverlay_GrBlendEquation:
+            return "overlay";
+        case kDarken_GrBlendEquation:
+            return "darken";
+        case kLighten_GrBlendEquation:
+            return "lighten";
+        case kColorDodge_GrBlendEquation:
+            return "color_dodge";
+        case kColorBurn_GrBlendEquation:
+            return "color_burn";
+        case kHardLight_GrBlendEquation:
+            return "hard_light";
+        case kSoftLight_GrBlendEquation:
+            return "soft_light";
+        case kDifference_GrBlendEquation:
+            return "difference";
+        case kExclusion_GrBlendEquation:
+            return "exclusion";
+        case kMultiply_GrBlendEquation:
+            return "multiply";
+        case kHSLHue_GrBlendEquation:
+            return "hsl_hue";
+        case kHSLSaturation_GrBlendEquation:
+            return "hsl_saturation";
+        case kHSLColor_GrBlendEquation:
+            return "hsl_color";
+        case kHSLLuminosity_GrBlendEquation:
+            return "hsl_luminosity";
+    };
+    return "";
+}
+
+static const char* coeff_string(GrBlendCoeff coeff) {
+    switch (coeff) {
+        case kZero_GrBlendCoeff:
+            return "zero";
+        case kOne_GrBlendCoeff:
+            return "one";
+        case kSC_GrBlendCoeff:
+            return "src_color";
+        case kISC_GrBlendCoeff:
+            return "inv_src_color";
+        case kDC_GrBlendCoeff:
+            return "dst_color";
+        case kIDC_GrBlendCoeff:
+            return "inv_dst_color";
+        case kSA_GrBlendCoeff:
+            return "src_alpha";
+        case kISA_GrBlendCoeff:
+            return "inv_src_alpha";
+        case kDA_GrBlendCoeff:
+            return "dst_alpha";
+        case kIDA_GrBlendCoeff:
+            return "inv_dst_alpha";
+        case kConstC_GrBlendCoeff:
+            return "const_color";
+        case kIConstC_GrBlendCoeff:
+            return "inv_const_color";
+        case kConstA_GrBlendCoeff:
+            return "const_alpha";
+        case kIConstA_GrBlendCoeff:
+            return "inv_const_alpha";
+        case kS2C_GrBlendCoeff:
+            return "src2_color";
+        case kIS2C_GrBlendCoeff:
+            return "inv_src2_color";
+        case kS2A_GrBlendCoeff:
+            return "src2_alpha";
+        case kIS2A_GrBlendCoeff:
+            return "inv_src2_alpha";
+    }
+    return "";
+}
+
+SkString GrXferProcessor::BlendInfo::dump() const {
+    SkString out;
+    out.printf("write_color(%d) equation(%s) src_coeff(%s) dst_coeff:(%s) const(0x%08x)",
+               fWriteColor, equation_string(fEquation), coeff_string(fSrcBlend),
+               coeff_string(fDstBlend), fBlendConstant);
+    return out;
+}
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+
+GrXferProcessor* GrXPFactory::createXferProcessor(const GrPipelineOptimizations& optimizations,
+                                                  bool hasMixedSamples,
+                                                  const DstTexture* dstTexture,
+                                                  const GrCaps& caps) const {
+#ifdef SK_DEBUG
+    if (this->willReadDstColor(caps, optimizations, hasMixedSamples)) {
+        if (!caps.shaderCaps()->dstReadInShaderSupport()) {
+            SkASSERT(dstTexture && dstTexture->texture());
+        } else {
+            SkASSERT(!dstTexture || !dstTexture->texture()); 
+        }
+    } else {
+        SkASSERT(!dstTexture || !dstTexture->texture()); 
+    }
+    SkASSERT(!hasMixedSamples || caps.shaderCaps()->dualSourceBlendingSupport());
+#endif
+    return this->onCreateXferProcessor(caps, optimizations, hasMixedSamples, dstTexture);
+}
+
+bool GrXPFactory::willNeedDstTexture(const GrCaps& caps,
+                                     const GrPipelineOptimizations& optimizations,
+                                     bool hasMixedSamples) const {
+    return (this->willReadDstColor(caps, optimizations, hasMixedSamples) &&
+            !caps.shaderCaps()->dstReadInShaderSupport());
+}
diff --git a/gfx/skia/skia/src/gpu/GrYUVProvider.cpp b/gfx/skia/skia/src/gpu/GrYUVProvider.cpp
new file mode 100644
index 000000000000..014c30574a42
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrYUVProvider.cpp
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrContext.h"
+#include "GrDrawContext.h"
+#include "GrYUVProvider.h"
+#include "effects/GrYUVtoRGBEffect.h"
+
+#include "SkCachedData.h"
+#include "SkRefCnt.h"
+#include "SkResourceCache.h"
+#include "SkYUVPlanesCache.h"
+
+namespace {
+/**
+ *  Helper class to manage the resources used for storing the YUV planar data. Depending on the
+ *  useCache option, we may find (and lock) the data in our ResourceCache, or we may have allocated
+ *  it in scratch storage.
+ */
+class YUVScoper {
+public:
+    bool init(GrYUVProvider*, SkYUVPlanesCache::Info*, void* planes[3], bool useCache);
+
+private:
+    // we only use one or the other of these
+    SkAutoTUnref<SkCachedData>  fCachedData;
+    SkAutoMalloc                fStorage;
+};
+}
+
+bool YUVScoper::init(GrYUVProvider* provider, SkYUVPlanesCache::Info* yuvInfo, void* planes[3],
+                     bool useCache) {
+    if (useCache) {
+        fCachedData.reset(SkYUVPlanesCache::FindAndRef(provider->onGetID(), yuvInfo));
+    }
+
+    if (fCachedData.get()) {
+        planes[0] = (void*)fCachedData->data();
+        planes[1] = (uint8_t*)planes[0] + yuvInfo->fSizeInMemory[0];
+        planes[2] = (uint8_t*)planes[1] + yuvInfo->fSizeInMemory[1];
+    } else {
+        // Fetch yuv plane sizes for memory allocation. Here, width and height can be
+        // rounded up to JPEG block size and be larger than the image's width and height.
+        if (!provider->onGetYUVSizes(yuvInfo->fSize)) {
+            return false;
+        }
+
+        // Allocate the memory for YUV
+        size_t totalSize(0);
+        for (int i = 0; i < GrYUVProvider::kPlaneCount; ++i) {
+            yuvInfo->fRowBytes[i] = yuvInfo->fSize[i].fWidth; // we assume snug fit: rb == width
+            yuvInfo->fSizeInMemory[i] = yuvInfo->fRowBytes[i] * yuvInfo->fSize[i].fHeight;
+            totalSize += yuvInfo->fSizeInMemory[i];
+        }
+        if (useCache) {
+            fCachedData.reset(SkResourceCache::NewCachedData(totalSize));
+            planes[0] = fCachedData->writable_data();
+        } else {
+            fStorage.reset(totalSize);
+            planes[0] = fStorage.get();
+        }
+        planes[1] = (uint8_t*)planes[0] + yuvInfo->fSizeInMemory[0];
+        planes[2] = (uint8_t*)planes[1] + yuvInfo->fSizeInMemory[1];
+
+        // Get the YUV planes and update plane sizes to actual image size
+        if (!provider->onGetYUVPlanes(yuvInfo->fSize, planes, yuvInfo->fRowBytes,
+                                      &yuvInfo->fColorSpace)) {
+            return false;
+        }
+
+        if (useCache) {
+            // Decoding is done, cache the resulting YUV planes
+            SkYUVPlanesCache::Add(provider->onGetID(), fCachedData, yuvInfo);
+        }
+    }
+    return true;
+}
+
+GrTexture* GrYUVProvider::refAsTexture(GrContext* ctx, const GrSurfaceDesc& desc, bool useCache) {
+    SkYUVPlanesCache::Info yuvInfo;
+    void* planes[3];
+    YUVScoper scoper;
+    if (!scoper.init(this, &yuvInfo, planes, useCache)) {
+        return nullptr;
+    }
+
+    GrSurfaceDesc yuvDesc;
+    yuvDesc.fConfig = kAlpha_8_GrPixelConfig;
+    SkAutoTUnref<GrTexture> yuvTextures[3];
+    for (int i = 0; i < 3; ++i) {
+        yuvDesc.fWidth  = yuvInfo.fSize[i].fWidth;
+        yuvDesc.fHeight = yuvInfo.fSize[i].fHeight;
+        // TODO: why do we need this check?
+        bool needsExactTexture = (yuvDesc.fWidth  != yuvInfo.fSize[0].fWidth) ||
+                                 (yuvDesc.fHeight != yuvInfo.fSize[0].fHeight);
+        if (needsExactTexture) {
+            yuvTextures[i].reset(ctx->textureProvider()->createTexture(yuvDesc, true));
+        } else {
+            yuvTextures[i].reset(ctx->textureProvider()->createApproxTexture(yuvDesc));
+        }
+        if (!yuvTextures[i] ||
+            !yuvTextures[i]->writePixels(0, 0, yuvDesc.fWidth, yuvDesc.fHeight,
+                                         yuvDesc.fConfig, planes[i], yuvInfo.fRowBytes[i])) {
+                return nullptr;
+            }
+    }
+
+    GrSurfaceDesc rtDesc = desc;
+    rtDesc.fFlags = rtDesc.fFlags | kRenderTarget_GrSurfaceFlag;
+
+    SkAutoTUnref<GrTexture> result(ctx->textureProvider()->createTexture(rtDesc, true, nullptr, 0));
+    if (!result) {
+        return nullptr;
+    }
+
+    GrRenderTarget* renderTarget = result->asRenderTarget();
+    SkASSERT(renderTarget);
+
+    GrPaint paint;
+    SkAutoTUnref<GrFragmentProcessor> yuvToRgbProcessor(
+                                        GrYUVtoRGBEffect::Create(yuvTextures[0],
+                                                                 yuvTextures[1],
+                                                                 yuvTextures[2],
+                                                                 yuvInfo.fSize,
+                                                                 yuvInfo.fColorSpace));
+    paint.addColorFragmentProcessor(yuvToRgbProcessor);
+    paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode);
+    const SkRect r = SkRect::MakeIWH(yuvInfo.fSize[0].fWidth, yuvInfo.fSize[0].fHeight);
+
+    SkAutoTUnref<GrDrawContext> drawContext(ctx->drawContext(renderTarget));
+    if (!drawContext) {
+        return nullptr;
+    }
+
+    drawContext->drawRect(GrClip::WideOpen(), paint, SkMatrix::I(), r);
+
+    return result.detach();
+}
+
diff --git a/gfx/skia/skia/src/gpu/GrYUVProvider.h b/gfx/skia/skia/src/gpu/GrYUVProvider.h
new file mode 100644
index 000000000000..869e1fd00d92
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/GrYUVProvider.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrYUVProvider_DEFINED
+#define GrYUVProvider_DEFINED
+
+#include "GrTypes.h"
+#include "SkImageInfo.h"
+
+class GrContext;
+class GrTexture;
+
+/**
+ *  There are at least 2 different ways to extract/retrieve YUV planar data...
+ *  - SkPixelRef
+ *  - SkImageGeneartor
+ *
+ *  To share common functionality around using the planar data, we use this abstract base-class
+ *  to represent accessing that data.
+ */
+class GrYUVProvider {
+public:
+    virtual ~GrYUVProvider() {}
+
+    /**
+     *  On success, this returns a texture that has converted the YUV data from the provider
+     *  into a form that is supported by the GPU (typically transformed into RGB). If useCache
+     *  is true, then the texture will automatically have a key added, so it can be retrieved
+     *  from the cache (assuming it is requested by a provider w/ the same genID).
+     *
+     *  On failure (e.g. the provider had no data), this returns NULL.
+     */
+    GrTexture* refAsTexture(GrContext*, const GrSurfaceDesc&, bool useCache);
+
+    virtual uint32_t onGetID() = 0;
+
+    enum {
+        kY_Index = 0,
+        kU_Index = 1,
+        kV_Index = 2,
+
+        kPlaneCount = 3
+    };
+
+    // These are not meant to be called by a client, only by the implementation
+
+    /**
+     *  Return the 3 dimensions for each plane and return true. On failure, return false and
+     *  ignore the sizes parameter. Typical failure is that the provider does not contain YUV
+     *  data, and may just be an RGB src.
+     */
+    virtual bool onGetYUVSizes(SkISize sizes[kPlaneCount]) = 0;
+
+    /**
+     *  On success, return true, and set sizes, rowbytes and colorspace to the appropriate values.
+     *  planes[] will have already been allocated by the client (based on the worst-case sizes
+     *  returned by onGetYUVSizes(). This method copies its planar data into those buffers.
+     *
+     *  On failure, return false and ignore other parameters.
+     */
+    virtual bool onGetYUVPlanes(SkISize sizes[kPlaneCount], void* planes[kPlaneCount],
+                                size_t rowBytes[kPlaneCount], SkYUVColorSpace*) = 0;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/SkGpuDevice.cpp b/gfx/skia/skia/src/gpu/SkGpuDevice.cpp
index c35ff41219be..17e4468acb21 100644
--- a/gfx/skia/skia/src/gpu/SkGpuDevice.cpp
+++ b/gfx/skia/skia/src/gpu/SkGpuDevice.cpp
@@ -7,61 +7,67 @@
 
 #include "SkGpuDevice.h"
 
-#include "effects/GrBicubicEffect.h"
-#include "effects/GrDashingEffect.h"
-#include "effects/GrTextureDomain.h"
-#include "effects/GrSimpleTextureEffect.h"
-
+#include "GrBlurUtils.h"
 #include "GrContext.h"
-#include "GrBitmapTextContext.h"
-#include "GrDistanceFieldTextContext.h"
-#include "GrLayerCache.h"
-#include "GrPictureUtils.h"
+#include "SkDraw.h"
+#include "GrDrawContext.h"
+#include "GrFontScaler.h"
+#include "GrGpu.h"
+#include "GrGpuResourcePriv.h"
+#include "GrImageIDTextureAdjuster.h"
+#include "GrLayerHoister.h"
+#include "GrRecordReplaceDraw.h"
 #include "GrStrokeInfo.h"
+#include "GrTextContext.h"
 #include "GrTracing.h"
-
-#include "SkGrTexturePixelRef.h"
-
-#include "SkDeviceImageFilterProxy.h"
-#include "SkDrawProcs.h"
+#include "SkCanvasPriv.h"
+#include "SkErrorInternals.h"
 #include "SkGlyphCache.h"
+#include "SkGrTexturePixelRef.h"
+#include "SkGr.h"
+#include "SkGrPriv.h"
+#include "SkImage_Base.h"
 #include "SkImageFilter.h"
+#include "SkLayerInfo.h"
 #include "SkMaskFilter.h"
+#include "SkNinePatchIter.h"
 #include "SkPathEffect.h"
 #include "SkPicture.h"
 #include "SkPictureData.h"
-#include "SkPictureRangePlayback.h"
-#include "SkPictureReplacementPlayback.h"
 #include "SkRRect.h"
+#include "SkRecord.h"
 #include "SkStroke.h"
 #include "SkSurface.h"
+#include "SkSurface_Gpu.h"
 #include "SkTLazy.h"
 #include "SkUtils.h"
 #include "SkVertState.h"
-#include "SkErrorInternals.h"
+#include "SkXfermode.h"
+#include "batches/GrRectBatchFactory.h"
+#include "effects/GrBicubicEffect.h"
+#include "effects/GrDashingEffect.h"
+#include "effects/GrSimpleTextureEffect.h"
+#include "effects/GrTextureDomain.h"
 
-#define CACHE_COMPATIBLE_DEVICE_TEXTURES 1
+#if SK_SUPPORT_GPU
+
+enum { kDefaultImageFilterCacheSize = 32 * 1024 * 1024 };
 
 #if 0
     extern bool (*gShouldDrawProc)();
-    #define CHECK_SHOULD_DRAW(draw, forceI)                     \
+    #define CHECK_SHOULD_DRAW(draw)                             \
         do {                                                    \
             if (gShouldDrawProc && !gShouldDrawProc()) return;  \
-            this->prepareDraw(draw, forceI);                    \
+            this->prepareDraw(draw);                            \
         } while (0)
 #else
-    #define CHECK_SHOULD_DRAW(draw, forceI) this->prepareDraw(draw, forceI)
+    #define CHECK_SHOULD_DRAW(draw) this->prepareDraw(draw)
 #endif
 
-// This constant represents the screen alignment criterion in texels for
-// requiring texture domain clamping to prevent color bleeding when drawing
-// a sub region of a larger source image.
-#define COLOR_BLEED_TOLERANCE 0.001f
-
 #define DO_DEFERRED_CLEAR()             \
     do {                                \
         if (fNeedClear) {               \
-            this->clear(SK_ColorTRANSPARENT); \
+            this->clearAll();           \
         }                               \
     } while (false)                     \
 
@@ -72,182 +78,161 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-
-class SkGpuDevice::SkAutoCachedTexture : public ::SkNoncopyable {
+// Helper for turning a bitmap into a texture. If the bitmap is GrTexture backed this
+// just accesses the backing GrTexture. Otherwise, it creates a cached texture
+// representation and releases it in the destructor.
+class AutoBitmapTexture : public SkNoncopyable {
 public:
-    SkAutoCachedTexture()
-        : fDevice(NULL)
-        , fTexture(NULL) {
+    AutoBitmapTexture() {}
+
+    AutoBitmapTexture(GrContext* context,
+                      const SkBitmap& bitmap,
+                      const GrTextureParams& params,
+                      GrTexture** texture) {
+        SkASSERT(texture);
+        *texture = this->set(context, bitmap, params);
     }
 
-    SkAutoCachedTexture(SkGpuDevice* device,
-                        const SkBitmap& bitmap,
-                        const GrTextureParams* params,
-                        GrTexture** texture)
-        : fDevice(NULL)
-        , fTexture(NULL) {
-        SkASSERT(NULL != texture);
-        *texture = this->set(device, bitmap, params);
-    }
-
-    ~SkAutoCachedTexture() {
-        if (NULL != fTexture) {
-            GrUnlockAndUnrefCachedBitmapTexture(fTexture);
-        }
-    }
-
-    GrTexture* set(SkGpuDevice* device,
+    GrTexture* set(GrContext* context,
                    const SkBitmap& bitmap,
-                   const GrTextureParams* params) {
-        if (NULL != fTexture) {
-            GrUnlockAndUnrefCachedBitmapTexture(fTexture);
-            fTexture = NULL;
+                   const GrTextureParams& params) {
+        // Either get the texture directly from the bitmap, or else use the cache and
+        // remember to unref it.
+        if (GrTexture* bmpTexture = bitmap.getTexture()) {
+            fTexture.reset(nullptr);
+            return bmpTexture;
+        } else {
+            fTexture.reset(GrRefCachedBitmapTexture(context, bitmap, params));
+            return fTexture.get();
         }
-        fDevice = device;
-        GrTexture* result = (GrTexture*)bitmap.getTexture();
-        if (NULL == result) {
-            // Cannot return the native texture so look it up in our cache
-            fTexture = GrLockAndRefCachedBitmapTexture(device->context(), bitmap, params);
-            result = fTexture;
-        }
-        return result;
     }
 
 private:
-    SkGpuDevice* fDevice;
-    GrTexture*   fTexture;
+    SkAutoTUnref<GrTexture> fTexture;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-struct GrSkDrawProcs : public SkDrawProcs {
-public:
-    GrContext* fContext;
-    GrTextContext* fTextContext;
-    GrFontScaler* fFontScaler;  // cached in the skia glyphcache
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
-SkGpuDevice* SkGpuDevice::Create(GrSurface* surface, unsigned flags) {
-    SkASSERT(NULL != surface);
-    if (NULL == surface->asRenderTarget() || NULL == surface->getContext()) {
-        return NULL;
-    }
-    if (surface->asTexture()) {
-        return SkNEW_ARGS(SkGpuDevice, (surface->getContext(), surface->asTexture(), flags));
-    } else {
-        return SkNEW_ARGS(SkGpuDevice, (surface->getContext(), surface->asRenderTarget(), flags));
-    }
-}
-
-SkGpuDevice::SkGpuDevice(GrContext* context, GrTexture* texture, unsigned flags) {
-    this->initFromRenderTarget(context, texture->asRenderTarget(), flags);
-}
-
-SkGpuDevice::SkGpuDevice(GrContext* context, GrRenderTarget* renderTarget, unsigned flags) {
-    this->initFromRenderTarget(context, renderTarget, flags);
-}
-
-void SkGpuDevice::initFromRenderTarget(GrContext* context,
-                                       GrRenderTarget* renderTarget,
-                                       unsigned flags) {
-    fDrawProcs = NULL;
-
-    fContext = context;
-    fContext->ref();
-
-    fRenderTarget = NULL;
-    fNeedClear = flags & kNeedClear_Flag;
-
-    SkASSERT(NULL != renderTarget);
-    fRenderTarget = renderTarget;
-    fRenderTarget->ref();
-
-    // Hold onto to the texture in the pixel ref (if there is one) because the texture holds a ref
-    // on the RT but not vice-versa.
-    // TODO: Remove this trickery once we figure out how to make SkGrPixelRef do this without
-    // busting chrome (for a currently unknown reason).
-    GrSurface* surface = fRenderTarget->asTexture();
-    if (NULL == surface) {
-        surface = fRenderTarget;
-    }
-
-    SkPixelRef* pr = SkNEW_ARGS(SkGrPixelRef,
-                                (surface->info(), surface, SkToBool(flags & kCached_Flag)));
-    fLegacyBitmap.setInfo(surface->info());
-    fLegacyBitmap.setPixelRef(pr)->unref();
-
-    bool useDFFonts = !!(flags & kDFFonts_Flag);
-    fMainTextContext = fContext->createTextContext(fRenderTarget, fLeakyProperties, useDFFonts);
-    fFallbackTextContext = SkNEW_ARGS(GrBitmapTextContext, (fContext, fLeakyProperties));
-}
-
-SkGpuDevice* SkGpuDevice::Create(GrContext* context, const SkImageInfo& origInfo,
-                                 int sampleCount) {
-    if (kUnknown_SkColorType == origInfo.colorType() ||
-        origInfo.width() < 0 || origInfo.height() < 0) {
-        return NULL;
-    }
-
-    SkImageInfo info = origInfo;
-    // TODO: perhas we can loosen this check now that colortype is more detailed
-    // e.g. can we support both RGBA and BGRA here?
-    if (kRGB_565_SkColorType == info.colorType()) {
-        info.fAlphaType = kOpaque_SkAlphaType;  // force this setting
-    } else {
-        info.fColorType = kN32_SkColorType;
-        if (kOpaque_SkAlphaType != info.alphaType()) {
-            info.fAlphaType = kPremul_SkAlphaType;  // force this setting
+/** Checks that the alpha type is legal and gets constructor flags. Returns false if device creation
+    should fail. */
+bool SkGpuDevice::CheckAlphaTypeAndGetFlags(
+                        const SkImageInfo* info, SkGpuDevice::InitContents init, unsigned* flags) {
+    *flags = 0;
+    if (info) {
+        switch (info->alphaType()) {
+            case kPremul_SkAlphaType:
+                break;
+            case kOpaque_SkAlphaType:
+                *flags |= SkGpuDevice::kIsOpaque_Flag;
+                break;
+            default: // If it is unpremul or unknown don't try to render
+                return false;
         }
     }
+    if (kClear_InitContents == init) {
+        *flags |= kNeedClear_Flag;
+    }
+    return true;
+}
 
-    GrTextureDesc desc;
-    desc.fFlags = kRenderTarget_GrTextureFlagBit;
+SkGpuDevice* SkGpuDevice::Create(GrRenderTarget* rt, const SkSurfaceProps* props,
+                                 InitContents init) {
+    return SkGpuDevice::Create(rt, rt->width(), rt->height(), props, init);
+}
+
+SkGpuDevice* SkGpuDevice::Create(GrRenderTarget* rt, int width, int height,
+                                 const SkSurfaceProps* props, InitContents init) {
+    if (!rt || rt->wasDestroyed()) {
+        return nullptr;
+    }
+    unsigned flags;
+    if (!CheckAlphaTypeAndGetFlags(nullptr, init, &flags)) {
+        return nullptr;
+    }
+    return new SkGpuDevice(rt, width, height, props, flags);
+}
+
+SkGpuDevice* SkGpuDevice::Create(GrContext* context, SkSurface::Budgeted budgeted,
+                                 const SkImageInfo& info, int sampleCount,
+                                 const SkSurfaceProps* props, InitContents init) {
+    unsigned flags;
+    if (!CheckAlphaTypeAndGetFlags(&info, init, &flags)) {
+        return nullptr;
+    }
+
+    SkAutoTUnref<GrRenderTarget> rt(CreateRenderTarget(context, budgeted, info,  sampleCount));
+    if (nullptr == rt) {
+        return nullptr;
+    }
+
+    return new SkGpuDevice(rt, info.width(), info.height(), props, flags);
+}
+
+SkGpuDevice::SkGpuDevice(GrRenderTarget* rt, int width, int height,
+                         const SkSurfaceProps* props, unsigned flags)
+    : INHERITED(SkSurfacePropsCopyOrDefault(props))
+{
+    fContext = SkRef(rt->getContext());
+    fNeedClear = SkToBool(flags & kNeedClear_Flag);
+    fOpaque = SkToBool(flags & kIsOpaque_Flag);
+
+    fRenderTarget = SkRef(rt);
+
+    SkAlphaType at = fOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
+    SkImageInfo info = rt->surfacePriv().info(at).makeWH(width, height);
+    SkPixelRef* pr = new SkGrPixelRef(info, rt);
+    fLegacyBitmap.setInfo(info);
+    fLegacyBitmap.setPixelRef(pr)->unref();
+
+    fDrawContext.reset(this->context()->drawContext(rt, &this->surfaceProps()));
+}
+
+GrRenderTarget* SkGpuDevice::CreateRenderTarget(GrContext* context, SkSurface::Budgeted budgeted,
+                                                const SkImageInfo& origInfo, int sampleCount) {
+    if (kUnknown_SkColorType == origInfo.colorType() ||
+        origInfo.width() < 0 || origInfo.height() < 0) {
+        return nullptr;
+    }
+
+    if (!context) {
+        return nullptr;
+    }
+
+    SkColorType ct = origInfo.colorType();
+    SkAlphaType at = origInfo.alphaType();
+    if (kRGB_565_SkColorType == ct) {
+        at = kOpaque_SkAlphaType;  // force this setting
+    } else if (ct != kBGRA_8888_SkColorType && ct != kRGBA_8888_SkColorType) {
+        // Fall back from whatever ct was to default of kRGBA or kBGRA which is aliased as kN32
+        ct = kN32_SkColorType;
+    }
+    if (kOpaque_SkAlphaType != at) {
+        at = kPremul_SkAlphaType;  // force this setting
+    }
+    const SkImageInfo info = SkImageInfo::Make(origInfo.width(), origInfo.height(), ct, at);
+
+    GrSurfaceDesc desc;
+    desc.fFlags = kRenderTarget_GrSurfaceFlag;
     desc.fWidth = info.width();
     desc.fHeight = info.height();
     desc.fConfig = SkImageInfo2GrPixelConfig(info);
     desc.fSampleCnt = sampleCount;
-
-    SkAutoTUnref<GrTexture> texture(context->createUncachedTexture(desc, NULL, 0));
-    if (!texture.get()) {
-        return NULL;
+    GrTexture* texture = context->textureProvider()->createTexture(
+        desc, SkToBool(budgeted), nullptr, 0);
+    if (nullptr == texture) {
+        return nullptr;
     }
-
-    return SkNEW_ARGS(SkGpuDevice, (context, texture.get()));
+    SkASSERT(nullptr != texture->asRenderTarget());
+    return texture->asRenderTarget();
 }
 
 SkGpuDevice::~SkGpuDevice() {
-    if (fDrawProcs) {
-        delete fDrawProcs;
-    }
-
-    delete fMainTextContext;
-    delete fFallbackTextContext;
-
-    // The GrContext takes a ref on the target. We don't want to cause the render
-    // target to be unnecessarily kept alive.
-    if (fContext->getRenderTarget() == fRenderTarget) {
-        fContext->setRenderTarget(NULL);
-    }
-
-    if (fContext->getClip() == &fClipData) {
-        fContext->setClip(NULL);
-    }
-
-    SkSafeUnref(fRenderTarget);
+    fRenderTarget->unref();
     fContext->unref();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void SkGpuDevice::makeRenderTargetCurrent() {
-    DO_DEFERRED_CLEAR();
-    fContext->setRenderTarget(fRenderTarget);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
 bool SkGpuDevice::onReadPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes,
                                int x, int y) {
     DO_DEFERRED_CLEAR();
@@ -262,8 +247,8 @@ bool SkGpuDevice::onReadPixels(const SkImageInfo& dstInfo, void* dstPixels, size
     if (kUnpremul_SkAlphaType == dstInfo.alphaType()) {
         flags = GrContext::kUnpremul_PixelOpsFlag;
     }
-    return fContext->readRenderTargetPixels(fRenderTarget, x, y, dstInfo.width(), dstInfo.height(),
-                                            config, dstPixels, dstRowBytes, flags);
+    return fRenderTarget->readPixels(x, y, dstInfo.width(), dstInfo.height(), config, dstPixels,
+                                     dstRowBytes, flags);
 }
 
 bool SkGpuDevice::onWritePixels(const SkImageInfo& info, const void* pixels, size_t rowBytes,
@@ -290,35 +275,36 @@ const SkBitmap& SkGpuDevice::onAccessBitmap() {
     return fLegacyBitmap;
 }
 
+bool SkGpuDevice::onAccessPixels(SkPixmap* pmap) {
+    DO_DEFERRED_CLEAR();
+    // For compatibility with clients the know we're backed w/ a bitmap, and want to inspect its
+    // genID. When we can hide/remove that fact, we can eliminate this call to notify.
+    // ... ugh.
+    fLegacyBitmap.notifyPixelsChanged();
+    return false;
+}
+
 void SkGpuDevice::onAttachToCanvas(SkCanvas* canvas) {
     INHERITED::onAttachToCanvas(canvas);
 
     // Canvas promises that this ptr is valid until onDetachFromCanvas is called
-    fClipData.fClipStack = canvas->getClipStack();
+    fClipStack.reset(SkRef(canvas->getClipStack()));
 }
 
 void SkGpuDevice::onDetachFromCanvas() {
     INHERITED::onDetachFromCanvas();
-    fClipData.fClipStack = NULL;
+    fClip.reset();
+    fClipStack.reset(nullptr);
 }
 
 // call this every draw call, to ensure that the context reflects our state,
 // and not the state from some other canvas/device
-void SkGpuDevice::prepareDraw(const SkDraw& draw, bool forceIdentity) {
-    SkASSERT(NULL != fClipData.fClipStack);
+void SkGpuDevice::prepareDraw(const SkDraw& draw) {
+    SkASSERT(fClipStack.get());
 
-    fContext->setRenderTarget(fRenderTarget);
+    SkASSERT(draw.fClipStack && draw.fClipStack == fClipStack);
 
-    SkASSERT(draw.fClipStack && draw.fClipStack == fClipData.fClipStack);
-
-    if (forceIdentity) {
-        fContext->setIdentityMatrix();
-    } else {
-        fContext->setMatrix(*draw.fMatrix);
-    }
-    fClipData.fOrigin = this->getOrigin();
-
-    fContext->setClip(&fClipData);
+    fClip.setClipStack(fClipStack, &this->getOrigin());
 
     DO_DEFERRED_CLEAR();
 }
@@ -328,36 +314,64 @@ GrRenderTarget* SkGpuDevice::accessRenderTarget() {
     return fRenderTarget;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-
-SK_COMPILE_ASSERT(SkShader::kNone_BitmapType == 0, shader_type_mismatch);
-SK_COMPILE_ASSERT(SkShader::kDefault_BitmapType == 1, shader_type_mismatch);
-SK_COMPILE_ASSERT(SkShader::kRadial_BitmapType == 2, shader_type_mismatch);
-SK_COMPILE_ASSERT(SkShader::kSweep_BitmapType == 3, shader_type_mismatch);
-SK_COMPILE_ASSERT(SkShader::kTwoPointRadial_BitmapType == 4,
-                  shader_type_mismatch);
-SK_COMPILE_ASSERT(SkShader::kTwoPointConical_BitmapType == 5,
-                  shader_type_mismatch);
-SK_COMPILE_ASSERT(SkShader::kLinear_BitmapType == 6, shader_type_mismatch);
-SK_COMPILE_ASSERT(SkShader::kLast_BitmapType == 6, shader_type_mismatch);
-
-///////////////////////////////////////////////////////////////////////////////
-
-void SkGpuDevice::clear(SkColor color) {
-    GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice::clear", fContext);
+void SkGpuDevice::clearAll() {
+    GrColor color = 0;
+    GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice::clearAll", fContext);
     SkIRect rect = SkIRect::MakeWH(this->width(), this->height());
-    fContext->clear(&rect, SkColor2GrColor(color), true, fRenderTarget);
+    fDrawContext->clear(&rect, color, true);
     fNeedClear = false;
 }
 
+void SkGpuDevice::replaceRenderTarget(bool shouldRetainContent) {
+    // Caller must have accessed the render target, because it knows the rt must be replaced.
+    SkASSERT(!fNeedClear);
+
+    SkSurface::Budgeted budgeted =
+            fRenderTarget->resourcePriv().isBudgeted() ? SkSurface::kYes_Budgeted
+                                                       : SkSurface::kNo_Budgeted;
+
+    SkAutoTUnref<GrRenderTarget> newRT(CreateRenderTarget(
+        this->context(), budgeted, this->imageInfo(), fRenderTarget->desc().fSampleCnt));
+
+    if (nullptr == newRT) {
+        return;
+    }
+
+    if (shouldRetainContent) {
+        if (fRenderTarget->wasDestroyed()) {
+            return;
+        }
+        this->context()->copySurface(newRT, fRenderTarget);
+    }
+
+    SkASSERT(fRenderTarget != newRT);
+
+    fRenderTarget->unref();
+    fRenderTarget = newRT.detach();
+
+#ifdef SK_DEBUG
+    SkImageInfo info = fRenderTarget->surfacePriv().info(fOpaque ? kOpaque_SkAlphaType :
+                                                                   kPremul_SkAlphaType);
+    SkASSERT(info == fLegacyBitmap.info());
+#endif
+    SkPixelRef* pr = new SkGrPixelRef(fLegacyBitmap.info(), fRenderTarget);
+    fLegacyBitmap.setPixelRef(pr)->unref();
+
+    fDrawContext.reset(this->context()->drawContext(fRenderTarget, &this->surfaceProps()));
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
 void SkGpuDevice::drawPaint(const SkDraw& draw, const SkPaint& paint) {
-    CHECK_SHOULD_DRAW(draw, false);
+    CHECK_SHOULD_DRAW(draw);
     GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice::drawPaint", fContext);
 
     GrPaint grPaint;
-    SkPaint2GrPaintShader(this->context(), paint, true, &grPaint);
+    if (!SkPaintToGrPaint(this->context(), paint, *draw.fMatrix, &grPaint)) {
+        return;
+    }
 
-    fContext->drawPaint(grPaint);
+    fDrawContext->drawPaint(fClip, grPaint, *draw.fMatrix);
 }
 
 // must be in SkCanvas::PointMode order
@@ -367,10 +381,32 @@ static const GrPrimitiveType gPointMode2PrimtiveType[] = {
     kLineStrip_GrPrimitiveType
 };
 
+// suppress antialiasing on axis-aligned integer-coordinate lines
+static bool needs_antialiasing(SkCanvas::PointMode mode, size_t count, const SkPoint pts[]) {
+    if (mode == SkCanvas::PointMode::kPoints_PointMode) {
+        return false;
+    }
+    if (count == 2) {
+        // We do not antialias as long as the primary axis of the line is integer-aligned, even if
+        // the other coordinates are not. This does mean the two end pixels of the line will be
+        // sharp even when they shouldn't be, but turning antialiasing on (as things stand
+        // currently) means that the line will turn into a two-pixel-wide blur. While obviously a
+        // more complete fix is possible down the road, for the time being we accept the error on
+        // the two end pixels as being the lesser of two evils.
+        if (pts[0].fX == pts[1].fX) {
+            return ((int) pts[0].fX) != pts[0].fX;
+        }
+        if (pts[0].fY == pts[1].fY) {
+            return ((int) pts[0].fY) != pts[0].fY;
+        }
+    }
+    return true;
+}
+
 void SkGpuDevice::drawPoints(const SkDraw& draw, SkCanvas::PointMode mode,
                              size_t count, const SkPoint pts[], const SkPaint& paint) {
     CHECK_FOR_ANNOTATION(paint);
-    CHECK_SHOULD_DRAW(draw, false);
+    CHECK_SHOULD_DRAW(draw);
 
     SkScalar width = paint.getStrokeWidth();
     if (width < 0) {
@@ -380,42 +416,48 @@ void SkGpuDevice::drawPoints(const SkDraw& draw, SkCanvas::PointMode mode,
     if (paint.getPathEffect() && 2 == count && SkCanvas::kLines_PointMode == mode) {
         GrStrokeInfo strokeInfo(paint, SkPaint::kStroke_Style);
         GrPaint grPaint;
-        SkPaint2GrPaintShader(this->context(), paint, true, &grPaint);
+        if (!SkPaintToGrPaint(this->context(), paint, *draw.fMatrix, &grPaint)) {
+            return;
+        }
         SkPath path;
+        path.setIsVolatile(true);
         path.moveTo(pts[0]);
         path.lineTo(pts[1]);
-        fContext->drawPath(grPaint, path, strokeInfo);
+        fDrawContext->drawPath(fClip, grPaint, *draw.fMatrix, path, strokeInfo);
         return;
     }
 
-    // we only handle hairlines and paints without path effects or mask filters,
+    // we only handle non-antialiased hairlines and paints without path effects or mask filters,
     // else we let the SkDraw call our drawPath()
-    if (width > 0 || paint.getPathEffect() || paint.getMaskFilter()) {
+    if (width > 0 || paint.getPathEffect() || paint.getMaskFilter() ||
+        (paint.isAntiAlias() && needs_antialiasing(mode, count, pts))) {
         draw.drawPoints(mode, count, pts, paint, true);
         return;
     }
 
     GrPaint grPaint;
-    SkPaint2GrPaintShader(this->context(), paint, true, &grPaint);
+    if (!SkPaintToGrPaint(this->context(), paint, *draw.fMatrix, &grPaint)) {
+        return;
+    }
 
-    fContext->drawVertices(grPaint,
-                           gPointMode2PrimtiveType[mode],
-                           SkToS32(count),
-                           (SkPoint*)pts,
-                           NULL,
-                           NULL,
-                           NULL,
-                           0);
+    fDrawContext->drawVertices(fClip,
+                               grPaint,
+                               *draw.fMatrix,
+                               gPointMode2PrimtiveType[mode],
+                               SkToS32(count),
+                               (SkPoint*)pts,
+                               nullptr,
+                               nullptr,
+                               nullptr,
+                               0);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void SkGpuDevice::drawRect(const SkDraw& draw, const SkRect& rect,
-                           const SkPaint& paint) {
+void SkGpuDevice::drawRect(const SkDraw& draw, const SkRect& rect, const SkPaint& paint) {
     GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice::drawRect", fContext);
-
     CHECK_FOR_ANNOTATION(paint);
-    CHECK_SHOULD_DRAW(draw, false);
+    CHECK_SHOULD_DRAW(draw);
 
     bool doStroke = paint.getStyle() != SkPaint::kFill_Style;
     SkScalar width = paint.getStrokeWidth();
@@ -427,79 +469,75 @@ void SkGpuDevice::drawRect(const SkDraw& draw, const SkRect& rect,
     bool usePath = doStroke && width > 0 &&
                    (paint.getStrokeJoin() == SkPaint::kRound_Join ||
                     (paint.getStrokeJoin() == SkPaint::kBevel_Join && rect.isEmpty()));
-    // another two reasons we might need to call drawPath...
 
-    if (paint.getMaskFilter()) {
+    // a few other reasons we might need to call drawPath...
+    if (paint.getMaskFilter() || paint.getPathEffect() ||
+        paint.getStyle() == SkPaint::kStrokeAndFill_Style) { // we can't both stroke and fill rects
         usePath = true;
     }
 
-    if (!usePath && paint.isAntiAlias() && !fContext->getMatrix().rectStaysRect()) {
-#if defined(SHADER_AA_FILL_RECT) || !defined(IGNORE_ROT_AA_RECT_OPT)
-        if (doStroke) {
-#endif
-            usePath = true;
-#if defined(SHADER_AA_FILL_RECT) || !defined(IGNORE_ROT_AA_RECT_OPT)
-        } else {
-            usePath = !fContext->getMatrix().preservesRightAngles();
-        }
-#endif
-    }
-    // until we can both stroke and fill rectangles
-    if (paint.getStyle() == SkPaint::kStrokeAndFill_Style) {
-        usePath = true;
-    }
-
-    GrStrokeInfo strokeInfo(paint);
-
-    const SkPathEffect* pe = paint.getPathEffect();
-    if (!usePath && NULL != pe && !strokeInfo.isDashed()) {
+    if (!usePath && paint.isAntiAlias() && !draw.fMatrix->rectStaysRect()) {
         usePath = true;
     }
 
     if (usePath) {
         SkPath path;
+        path.setIsVolatile(true);
         path.addRect(rect);
-        this->drawPath(draw, path, paint, NULL, true);
+        GrBlurUtils::drawPathWithMaskFilter(fContext, fDrawContext,
+                                            fClip, path, paint,
+                                            *draw.fMatrix, nullptr,
+                                            draw.fClip->getBounds(), true);
         return;
     }
 
     GrPaint grPaint;
-    SkPaint2GrPaintShader(this->context(), paint, true, &grPaint);
+    if (!SkPaintToGrPaint(this->context(), paint, *draw.fMatrix, &grPaint)) {
+        return;
+    }
 
-    fContext->drawRect(grPaint, rect, &strokeInfo);
+    GrStrokeInfo strokeInfo(paint);
+
+    fDrawContext->drawRect(fClip, grPaint, *draw.fMatrix, rect, &strokeInfo);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkGpuDevice::drawRRect(const SkDraw& draw, const SkRRect& rect,
-                           const SkPaint& paint) {
+                            const SkPaint& paint) {
     GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice::drawRRect", fContext);
     CHECK_FOR_ANNOTATION(paint);
-    CHECK_SHOULD_DRAW(draw, false);
+    CHECK_SHOULD_DRAW(draw);
 
     GrPaint grPaint;
-    SkPaint2GrPaintShader(this->context(), paint, true, &grPaint);
+    if (!SkPaintToGrPaint(this->context(), paint, *draw.fMatrix, &grPaint)) {
+        return;
+    }
 
     GrStrokeInfo strokeInfo(paint);
     if (paint.getMaskFilter()) {
         // try to hit the fast path for drawing filtered round rects
 
         SkRRect devRRect;
-        if (rect.transform(fContext->getMatrix(), &devRRect)) {
+        if (rect.transform(*draw.fMatrix, &devRRect)) {
             if (devRRect.allCornersCircular()) {
                 SkRect maskRect;
-                if (paint.getMaskFilter()->canFilterMaskGPU(devRRect.rect(),
-                                            draw.fClip->getBounds(),
-                                            fContext->getMatrix(),
-                                            &maskRect)) {
+                if (paint.getMaskFilter()->canFilterMaskGPU(devRRect,
+                                                            draw.fClip->getBounds(),
+                                                            *draw.fMatrix,
+                                                            &maskRect)) {
                     SkIRect finalIRect;
                     maskRect.roundOut(&finalIRect);
                     if (draw.fClip->quickReject(finalIRect)) {
                         // clipped out
                         return;
                     }
-                    if (paint.getMaskFilter()->directFilterRRectMaskGPU(fContext, &grPaint,
-                                                                        strokeInfo.getStrokeRec(),
+                    if (paint.getMaskFilter()->directFilterRRectMaskGPU(fContext->textureProvider(),
+                                                                        fDrawContext,
+                                                                        &grPaint,
+                                                                        fClip,
+                                                                        *draw.fMatrix,
+                                                                        strokeInfo,
                                                                         devRRect)) {
                         return;
                     }
@@ -507,342 +545,131 @@ void SkGpuDevice::drawRRect(const SkDraw& draw, const SkRRect& rect,
 
             }
         }
-
     }
 
-    bool usePath = false;
-
-    if (paint.getMaskFilter()) {
-        usePath = true;
-    } else {
-        const SkPathEffect* pe = paint.getPathEffect();
-        if (NULL != pe && !strokeInfo.isDashed()) {
-            usePath = true;
-        }
-    }
-
-
-    if (usePath) {
+    if (paint.getMaskFilter() || paint.getPathEffect()) {
+        // The only mask filter the native rrect drawing code could've handle was taken
+        // care of above.
+        // A path effect will presumably transform this rrect into something else.
         SkPath path;
+        path.setIsVolatile(true);
         path.addRRect(rect);
-        this->drawPath(draw, path, paint, NULL, true);
+        GrBlurUtils::drawPathWithMaskFilter(fContext, fDrawContext,
+                                            fClip, path, paint,
+                                            *draw.fMatrix, nullptr,
+                                            draw.fClip->getBounds(), true);
         return;
     }
 
-    fContext->drawRRect(grPaint, rect, strokeInfo);
+    SkASSERT(!strokeInfo.isDashed());
+
+    fDrawContext->drawRRect(fClip, grPaint, *draw.fMatrix, rect, strokeInfo);
 }
 
 void SkGpuDevice::drawDRRect(const SkDraw& draw, const SkRRect& outer,
-                              const SkRRect& inner, const SkPaint& paint) {
+                             const SkRRect& inner, const SkPaint& paint) {
+    GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice::drawDRRect", fContext);
+    CHECK_FOR_ANNOTATION(paint);
+    CHECK_SHOULD_DRAW(draw);
+
     SkStrokeRec stroke(paint);
-    if (stroke.isFillStyle()) {
-
-        CHECK_FOR_ANNOTATION(paint);
-        CHECK_SHOULD_DRAW(draw, false);
 
+    if (stroke.isFillStyle() && !paint.getMaskFilter() && !paint.getPathEffect()) {
         GrPaint grPaint;
-        SkPaint2GrPaintShader(this->context(), paint, true, &grPaint);
-
-        if (NULL == paint.getMaskFilter() && NULL == paint.getPathEffect()) {
-            fContext->drawDRRect(grPaint, outer, inner);
+        if (!SkPaintToGrPaint(this->context(), paint, *draw.fMatrix, &grPaint)) {
             return;
         }
+
+        fDrawContext->drawDRRect(fClip, grPaint, *draw.fMatrix, outer, inner);
+        return;
     }
 
     SkPath path;
+    path.setIsVolatile(true);
     path.addRRect(outer);
     path.addRRect(inner);
     path.setFillType(SkPath::kEvenOdd_FillType);
 
-    this->drawPath(draw, path, paint, NULL, true);
+    GrBlurUtils::drawPathWithMaskFilter(fContext, fDrawContext,
+                                        fClip, path, paint,
+                                        *draw.fMatrix, nullptr,
+                                        draw.fClip->getBounds(), true);
 }
 
 
 /////////////////////////////////////////////////////////////////////////////
 
-void SkGpuDevice::drawOval(const SkDraw& draw, const SkRect& oval,
-                           const SkPaint& paint) {
+void SkGpuDevice::drawOval(const SkDraw& draw, const SkRect& oval, const SkPaint& paint) {
     GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice::drawOval", fContext);
     CHECK_FOR_ANNOTATION(paint);
-    CHECK_SHOULD_DRAW(draw, false);
+    CHECK_SHOULD_DRAW(draw);
 
-    GrStrokeInfo strokeInfo(paint);
-
-    bool usePath = false;
-    // some basic reasons we might need to call drawPath...
-    if (paint.getMaskFilter()) {
-        usePath = true;
-    } else {
-        const SkPathEffect* pe = paint.getPathEffect();
-        if (NULL != pe && !strokeInfo.isDashed()) {
-            usePath = true;
-        }
-    }
-
-    if (usePath) {
+    // Presumably the path effect warps this to something other than an oval
+    if (paint.getPathEffect()) {
         SkPath path;
+        path.setIsVolatile(true);
         path.addOval(oval);
-        this->drawPath(draw, path, paint, NULL, true);
+        this->drawPath(draw, path, paint, nullptr, true);
         return;
     }
 
-    GrPaint grPaint;
-    SkPaint2GrPaintShader(this->context(), paint, true, &grPaint);
+    if (paint.getMaskFilter()) {
+        // The RRect path can handle special case blurring
+        SkRRect rr = SkRRect::MakeOval(oval);
+        return this->drawRRect(draw, rr, paint);
+    }
 
-    fContext->drawOval(grPaint, oval, strokeInfo);
+    GrPaint grPaint;
+    if (!SkPaintToGrPaint(this->context(), paint, *draw.fMatrix, &grPaint)) {
+        return;
+    }
+
+    GrStrokeInfo strokeInfo(paint);
+    SkASSERT(!strokeInfo.isDashed());
+
+    fDrawContext->drawOval(fClip, grPaint, *draw.fMatrix, oval, strokeInfo);
 }
 
 #include "SkMaskFilter.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
-// helpers for applying mask filters
-namespace {
-
-// Draw a mask using the supplied paint. Since the coverage/geometry
-// is already burnt into the mask this boils down to a rect draw.
-// Return true if the mask was successfully drawn.
-bool draw_mask(GrContext* context, const SkRect& maskRect,
-               GrPaint* grp, GrTexture* mask) {
-    GrContext::AutoMatrix am;
-    if (!am.setIdentity(context, grp)) {
-        return false;
-    }
-
-    SkMatrix matrix;
-    matrix.setTranslate(-maskRect.fLeft, -maskRect.fTop);
-    matrix.postIDiv(mask->width(), mask->height());
-
-    grp->addCoverageEffect(GrSimpleTextureEffect::Create(mask, matrix))->unref();
-    context->drawRect(*grp, maskRect);
-    return true;
-}
-
-bool draw_with_mask_filter(GrContext* context, const SkPath& devPath,
-                           SkMaskFilter* filter, const SkRegion& clip,
-                           GrPaint* grp, SkPaint::Style style) {
-    SkMask  srcM, dstM;
-
-    if (!SkDraw::DrawToMask(devPath, &clip.getBounds(), filter, &context->getMatrix(), &srcM,
-                            SkMask::kComputeBoundsAndRenderImage_CreateMode, style)) {
-        return false;
-    }
-    SkAutoMaskFreeImage autoSrc(srcM.fImage);
-
-    if (!filter->filterMask(&dstM, srcM, context->getMatrix(), NULL)) {
-        return false;
-    }
-    // this will free-up dstM when we're done (allocated in filterMask())
-    SkAutoMaskFreeImage autoDst(dstM.fImage);
-
-    if (clip.quickReject(dstM.fBounds)) {
-        return false;
-    }
-
-    // we now have a device-aligned 8bit mask in dstM, ready to be drawn using
-    // the current clip (and identity matrix) and GrPaint settings
-    GrTextureDesc desc;
-    desc.fWidth = dstM.fBounds.width();
-    desc.fHeight = dstM.fBounds.height();
-    desc.fConfig = kAlpha_8_GrPixelConfig;
-
-    GrAutoScratchTexture ast(context, desc);
-    GrTexture* texture = ast.texture();
-
-    if (NULL == texture) {
-        return false;
-    }
-    texture->writePixels(0, 0, desc.fWidth, desc.fHeight, desc.fConfig,
-                               dstM.fImage, dstM.fRowBytes);
-
-    SkRect maskRect = SkRect::Make(dstM.fBounds);
-
-    return draw_mask(context, maskRect, grp, texture);
-}
-
-// Create a mask of 'devPath' and place the result in 'mask'. Return true on
-// success; false otherwise.
-bool create_mask_GPU(GrContext* context,
-                     const SkRect& maskRect,
-                     const SkPath& devPath,
-                     const GrStrokeInfo& strokeInfo,
-                     bool doAA,
-                     GrAutoScratchTexture* mask) {
-    GrTextureDesc desc;
-    desc.fFlags = kRenderTarget_GrTextureFlagBit;
-    desc.fWidth = SkScalarCeilToInt(maskRect.width());
-    desc.fHeight = SkScalarCeilToInt(maskRect.height());
-    // We actually only need A8, but it often isn't supported as a
-    // render target so default to RGBA_8888
-    desc.fConfig = kRGBA_8888_GrPixelConfig;
-    if (context->isConfigRenderable(kAlpha_8_GrPixelConfig, false)) {
-        desc.fConfig = kAlpha_8_GrPixelConfig;
-    }
-
-    mask->set(context, desc);
-    if (NULL == mask->texture()) {
-        return false;
-    }
-
-    GrTexture* maskTexture = mask->texture();
-    SkRect clipRect = SkRect::MakeWH(maskRect.width(), maskRect.height());
-
-    GrContext::AutoRenderTarget art(context, maskTexture->asRenderTarget());
-    GrContext::AutoClip ac(context, clipRect);
-
-    context->clear(NULL, 0x0, true);
-
-    GrPaint tempPaint;
-    if (doAA) {
-        tempPaint.setAntiAlias(true);
-        // AA uses the "coverage" stages on GrDrawTarget. Coverage with a dst
-        // blend coeff of zero requires dual source blending support in order
-        // to properly blend partially covered pixels. This means the AA
-        // code path may not be taken. So we use a dst blend coeff of ISA. We
-        // could special case AA draws to a dst surface with known alpha=0 to
-        // use a zero dst coeff when dual source blending isn't available.
-        tempPaint.setBlendFunc(kOne_GrBlendCoeff, kISC_GrBlendCoeff);
-    }
-
-    GrContext::AutoMatrix am;
-
-    // Draw the mask into maskTexture with the path's top-left at the origin using tempPaint.
-    SkMatrix translate;
-    translate.setTranslate(-maskRect.fLeft, -maskRect.fTop);
-    am.set(context, translate);
-    context->drawPath(tempPaint, devPath, strokeInfo);
-    return true;
-}
-
-SkBitmap wrap_texture(GrTexture* texture) {
+static SkBitmap wrap_texture(GrTexture* texture, int width, int height) {
     SkBitmap result;
-    result.setInfo(texture->info());
-    result.setPixelRef(SkNEW_ARGS(SkGrPixelRef, (result.info(), texture)))->unref();
+    result.setInfo(SkImageInfo::MakeN32Premul(width, height));
+    result.setPixelRef(new SkGrPixelRef(result.info(), texture))->unref();
     return result;
 }
 
-};
-
 void SkGpuDevice::drawPath(const SkDraw& draw, const SkPath& origSrcPath,
                            const SkPaint& paint, const SkMatrix* prePathMatrix,
                            bool pathIsMutable) {
+    if (!origSrcPath.isInverseFillType() && !paint.getPathEffect() && !prePathMatrix) {
+        bool isClosed;
+        SkRect rect;
+        if (origSrcPath.isRect(&rect, &isClosed) && isClosed) {
+            this->drawRect(draw, rect, paint);
+            return;
+        }
+        if (origSrcPath.isOval(&rect)) {
+            this->drawOval(draw, rect, paint);
+            return;
+        }
+        SkRRect rrect;
+        if (origSrcPath.isRRect(&rrect)) {
+            this->drawRRect(draw, rrect, paint);
+            return;
+        }
+    }
+
     CHECK_FOR_ANNOTATION(paint);
-    CHECK_SHOULD_DRAW(draw, false);
+    CHECK_SHOULD_DRAW(draw);
     GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice::drawPath", fContext);
 
-    GrPaint grPaint;
-    SkPaint2GrPaintShader(this->context(), paint, true, &grPaint);
-
-    // If we have a prematrix, apply it to the path, optimizing for the case
-    // where the original path can in fact be modified in place (even though
-    // its parameter type is const).
-    SkPath* pathPtr = const_cast<SkPath*>(&origSrcPath);
-    SkTLazy<SkPath> tmpPath;
-    SkTLazy<SkPath> effectPath;
-
-    if (prePathMatrix) {
-        SkPath* result = pathPtr;
-
-        if (!pathIsMutable) {
-            result = tmpPath.init();
-            pathIsMutable = true;
-        }
-        // should I push prePathMatrix on our MV stack temporarily, instead
-        // of applying it here? See SkDraw.cpp
-        pathPtr->transform(*prePathMatrix, result);
-        pathPtr = result;
-    }
-    // at this point we're done with prePathMatrix
-    SkDEBUGCODE(prePathMatrix = (const SkMatrix*)0x50FF8001;)
-
-    GrStrokeInfo strokeInfo(paint);
-    SkPathEffect* pathEffect = paint.getPathEffect();
-    const SkRect* cullRect = NULL;  // TODO: what is our bounds?
-    SkStrokeRec* strokePtr = strokeInfo.getStrokeRecPtr();
-    if (pathEffect && pathEffect->filterPath(effectPath.init(), *pathPtr, strokePtr,
-                                             cullRect)) {
-        pathPtr = effectPath.get();
-        pathIsMutable = true;
-        strokeInfo.removeDash();
-    }
-
-    const SkStrokeRec& stroke = strokeInfo.getStrokeRec();
-    if (paint.getMaskFilter()) {
-        if (!stroke.isHairlineStyle()) {
-            SkPath* strokedPath = pathIsMutable ? pathPtr : tmpPath.init();
-            if (stroke.applyToPath(strokedPath, *pathPtr)) {
-                pathPtr = strokedPath;
-                pathIsMutable = true;
-                strokeInfo.setFillStyle();
-            }
-        }
-
-        // avoid possibly allocating a new path in transform if we can
-        SkPath* devPathPtr = pathIsMutable ? pathPtr : tmpPath.init();
-
-        // transform the path into device space
-        pathPtr->transform(fContext->getMatrix(), devPathPtr);
-
-        SkRect maskRect;
-        if (paint.getMaskFilter()->canFilterMaskGPU(devPathPtr->getBounds(),
-                                                    draw.fClip->getBounds(),
-                                                    fContext->getMatrix(),
-                                                    &maskRect)) {
-            // The context's matrix may change while creating the mask, so save the CTM here to
-            // pass to filterMaskGPU.
-            const SkMatrix ctm = fContext->getMatrix();
-
-            SkIRect finalIRect;
-            maskRect.roundOut(&finalIRect);
-            if (draw.fClip->quickReject(finalIRect)) {
-                // clipped out
-                return;
-            }
-
-            if (paint.getMaskFilter()->directFilterMaskGPU(fContext, &grPaint,
-                                                           stroke, *devPathPtr)) {
-                // the mask filter was able to draw itself directly, so there's nothing
-                // left to do.
-                return;
-            }
-
-            GrAutoScratchTexture mask;
-
-            if (create_mask_GPU(fContext, maskRect, *devPathPtr, strokeInfo,
-                                grPaint.isAntiAlias(), &mask)) {
-                GrTexture* filtered;
-
-                if (paint.getMaskFilter()->filterMaskGPU(mask.texture(),
-                                                         ctm, maskRect, &filtered, true)) {
-                    // filterMaskGPU gives us ownership of a ref to the result
-                    SkAutoTUnref<GrTexture> atu(filtered);
-
-                    // If the scratch texture that we used as the filter src also holds the filter
-                    // result then we must detach so that this texture isn't recycled for a later
-                    // draw.
-                    if (filtered == mask.texture()) {
-                        mask.detach();
-                        filtered->unref(); // detach transfers GrAutoScratchTexture's ref to us.
-                    }
-
-                    if (draw_mask(fContext, maskRect, &grPaint, filtered)) {
-                        // This path is completely drawn
-                        return;
-                    }
-                }
-            }
-        }
-
-        // draw the mask on the CPU - this is a fallthrough path in case the
-        // GPU path fails
-        SkPaint::Style style = stroke.isHairlineStyle() ? SkPaint::kStroke_Style :
-                                                          SkPaint::kFill_Style;
-        draw_with_mask_filter(fContext, *devPathPtr, paint.getMaskFilter(),
-                              *draw.fClip, &grPaint, style);
-        return;
-    }
-
-    fContext->drawPath(grPaint, *pathPtr, strokeInfo);
+    GrBlurUtils::drawPathWithMaskFilter(fContext, fDrawContext,
+                                        fClip, origSrcPath, paint,
+                                        *draw.fMatrix, prePathMatrix,
+                                        draw.fClip->getBounds(), pathIsMutable);
 }
 
 static const int kBmpSmallTileSize = 1 << 10;
@@ -853,7 +680,7 @@ static inline int get_tile_count(const SkIRect& srcRect, int tileSize)  {
     return tilesX * tilesY;
 }
 
-static int determine_tile_size(const SkBitmap& bitmap, const SkIRect& src, int maxTileSize) {
+static int determine_tile_size(const SkIRect& src, int maxTileSize) {
     if (maxTileSize <= kBmpSmallTileSize) {
         return maxTileSize;
     }
@@ -873,20 +700,21 @@ static int determine_tile_size(const SkBitmap& bitmap, const SkIRect& src, int m
 
 // Given a bitmap, an optional src rect, and a context with a clip and matrix determine what
 // pixels from the bitmap are necessary.
-static void determine_clipped_src_rect(const GrContext* context,
-                                       const SkBitmap& bitmap,
+static void determine_clipped_src_rect(const GrRenderTarget* rt,
+                                       const GrClip& clip,
+                                       const SkMatrix& viewMatrix,
+                                       const SkISize& imageSize,
                                        const SkRect* srcRectPtr,
                                        SkIRect* clippedSrcIRect) {
-    const GrClipData* clip = context->getClip();
-    clip->getConservativeBounds(context->getRenderTarget(), clippedSrcIRect, NULL);
+    clip.getConservativeBounds(rt->width(), rt->height(), clippedSrcIRect, nullptr);
     SkMatrix inv;
-    if (!context->getMatrix().invert(&inv)) {
+    if (!viewMatrix.invert(&inv)) {
         clippedSrcIRect->setEmpty();
         return;
     }
     SkRect clippedSrcRect = SkRect::Make(*clippedSrcIRect);
     inv.mapRect(&clippedSrcRect);
-    if (NULL != srcRectPtr) {
+    if (srcRectPtr) {
         // we've setup src space 0,0 to map to the top left of the src rect.
         clippedSrcRect.offset(srcRectPtr->fLeft, srcRectPtr->fTop);
         if (!clippedSrcRect.intersect(*srcRectPtr)) {
@@ -895,36 +723,30 @@ static void determine_clipped_src_rect(const GrContext* context,
         }
     }
     clippedSrcRect.roundOut(clippedSrcIRect);
-    SkIRect bmpBounds = SkIRect::MakeWH(bitmap.width(), bitmap.height());
+    SkIRect bmpBounds = SkIRect::MakeSize(imageSize);
     if (!clippedSrcIRect->intersect(bmpBounds)) {
         clippedSrcIRect->setEmpty();
     }
 }
 
-bool SkGpuDevice::shouldTileBitmap(const SkBitmap& bitmap,
-                                   const GrTextureParams& params,
-                                   const SkRect* srcRectPtr,
-                                   int maxTileSize,
-                                   int* tileSize,
-                                   SkIRect* clippedSrcRect) const {
-    // if bitmap is explictly texture backed then just use the texture
-    if (NULL != bitmap.getTexture()) {
-        return false;
-    }
-
+bool SkGpuDevice::shouldTileImageID(uint32_t imageID, const SkIRect& imageRect,
+                                    const SkMatrix& viewMatrix,
+                                    const GrTextureParams& params,
+                                    const SkRect* srcRectPtr,
+                                    int maxTileSize,
+                                    int* tileSize,
+                                    SkIRect* clippedSubset) const {
     // if it's larger than the max tile size, then we have no choice but tiling.
-    if (bitmap.width() > maxTileSize || bitmap.height() > maxTileSize) {
-        determine_clipped_src_rect(fContext, bitmap, srcRectPtr, clippedSrcRect);
-        *tileSize = determine_tile_size(bitmap, *clippedSrcRect, maxTileSize);
+    if (imageRect.width() > maxTileSize || imageRect.height() > maxTileSize) {
+        determine_clipped_src_rect(fRenderTarget, fClip, viewMatrix, imageRect.size(),
+                                   srcRectPtr, clippedSubset);
+        *tileSize = determine_tile_size(*clippedSubset, maxTileSize);
         return true;
     }
 
-    if (bitmap.width() * bitmap.height() < 4 * kBmpSmallTileSize * kBmpSmallTileSize) {
-        return false;
-    }
-
-    // if the entire texture is already in our cache then no reason to tile it
-    if (GrIsBitmapInCache(fContext, bitmap, &params)) {
+    // If the image would only produce 4 tiles of the smaller size, don't bother tiling it.
+    const size_t area = imageRect.width() * imageRect.height();
+    if (area < 4 * kBmpSmallTileSize * kBmpSmallTileSize) {
         return false;
     }
 
@@ -935,33 +757,132 @@ bool SkGpuDevice::shouldTileBitmap(const SkBitmap& bitmap,
 
     // assumption here is that sw bitmap size is a good proxy for its size as
     // a texture
-    size_t bmpSize = bitmap.getSize();
+    size_t bmpSize = area * sizeof(SkPMColor);  // assume 32bit pixels
     size_t cacheSize;
-    fContext->getResourceCacheLimits(NULL, &cacheSize);
+    fContext->getResourceCacheLimits(nullptr, &cacheSize);
     if (bmpSize < cacheSize / 2) {
         return false;
     }
 
-    // Figure out how much of the src we will need based on the src rect and clipping.
-    determine_clipped_src_rect(fContext, bitmap, srcRectPtr, clippedSrcRect);
+    // Figure out how much of the src we will need based on the src rect and clipping. Reject if
+    // tiling memory savings would be < 50%.
+    determine_clipped_src_rect(fRenderTarget, fClip, viewMatrix, imageRect.size(), srcRectPtr,
+                               clippedSubset);
     *tileSize = kBmpSmallTileSize; // already know whole bitmap fits in one max sized tile.
-    size_t usedTileBytes = get_tile_count(*clippedSrcRect, kBmpSmallTileSize) *
+    size_t usedTileBytes = get_tile_count(*clippedSubset, kBmpSmallTileSize) *
                            kBmpSmallTileSize * kBmpSmallTileSize;
 
     return usedTileBytes < 2 * bmpSize;
 }
 
+bool SkGpuDevice::shouldTileBitmap(const SkBitmap& bitmap,
+                                   const SkMatrix& viewMatrix,
+                                   const GrTextureParams& params,
+                                   const SkRect* srcRectPtr,
+                                   int maxTileSize,
+                                   int* tileSize,
+                                   SkIRect* clippedSrcRect) const {
+    // if bitmap is explictly texture backed then just use the texture
+    if (bitmap.getTexture()) {
+        return false;
+    }
+
+    return this->shouldTileImageID(bitmap.getGenerationID(), bitmap.getSubset(), viewMatrix, params,
+                                   srcRectPtr, maxTileSize, tileSize, clippedSrcRect);
+}
+
+bool SkGpuDevice::shouldTileImage(const SkImage* image, const SkRect* srcRectPtr,
+                                  SkCanvas::SrcRectConstraint constraint, SkFilterQuality quality,
+                                  const SkMatrix& viewMatrix) const {
+    // if image is explictly texture backed then just use the texture
+    if (as_IB(image)->peekTexture()) {
+        return false;
+    }
+
+    GrTextureParams params;
+    bool doBicubic;
+    GrTextureParams::FilterMode textureFilterMode =
+                    GrSkFilterQualityToGrFilterMode(quality, viewMatrix, SkMatrix::I(), &doBicubic);
+
+    int tileFilterPad;
+    if (doBicubic) {
+        tileFilterPad = GrBicubicEffect::kFilterTexelPad;
+    } else if (GrTextureParams::kNone_FilterMode == textureFilterMode) {
+        tileFilterPad = 0;
+    } else {
+        tileFilterPad = 1;
+    }
+    params.setFilterMode(textureFilterMode);
+
+    int maxTileSize = fContext->caps()->maxTileSize() - 2 * tileFilterPad;
+
+    // these are output, which we safely ignore, as we just want to know the predicate
+    int outTileSize;
+    SkIRect outClippedSrcRect;
+
+    return this->shouldTileImageID(image->unique(), image->bounds(), viewMatrix, params, srcRectPtr,
+                                   maxTileSize, &outTileSize, &outClippedSrcRect);
+}
+
 void SkGpuDevice::drawBitmap(const SkDraw& origDraw,
                              const SkBitmap& bitmap,
                              const SkMatrix& m,
                              const SkPaint& paint) {
-    SkMatrix concat;
-    SkTCopyOnFirstWrite<SkDraw> draw(origDraw);
-    if (!m.isIdentity()) {
-        concat.setConcat(*draw->fMatrix, m);
-        draw.writable()->fMatrix = &concat;
+    CHECK_SHOULD_DRAW(origDraw);
+    bool alphaOnly = kAlpha_8_SkColorType == bitmap.colorType();
+    SkMatrix viewMatrix;
+    viewMatrix.setConcat(*origDraw.fMatrix, m);
+    if (bitmap.getTexture()) {
+        GrBitmapTextureAdjuster adjuster(&bitmap);
+        // We can use kFast here because we know texture-backed bitmaps don't support extractSubset.
+        this->drawTextureProducer(&adjuster, alphaOnly, nullptr, nullptr,
+                                  SkCanvas::kFast_SrcRectConstraint, viewMatrix, fClip, paint);
+        return;
     }
-    this->drawBitmapCommon(*draw, bitmap, NULL, NULL, paint, SkCanvas::kNone_DrawBitmapRectFlag);
+    int maxTileSize = fContext->caps()->maxTileSize();
+
+    // The tile code path doesn't currently support AA, so if the paint asked for aa and we could
+    // draw untiled, then we bypass checking for tiling purely for optimization reasons.
+    bool drawAA = !fRenderTarget->isUnifiedMultisampled() &&
+                  paint.isAntiAlias() &&
+                  bitmap.width() <= maxTileSize &&
+                  bitmap.height() <= maxTileSize;
+
+    bool skipTileCheck = drawAA || paint.getMaskFilter();
+
+    if (!skipTileCheck) {
+        SkRect srcRect = SkRect::MakeIWH(bitmap.width(), bitmap.height());
+        int tileSize;
+        SkIRect clippedSrcRect;
+
+        GrTextureParams params;
+        bool doBicubic;
+        GrTextureParams::FilterMode textureFilterMode =
+            GrSkFilterQualityToGrFilterMode(paint.getFilterQuality(), viewMatrix, SkMatrix::I(),
+                                            &doBicubic);
+
+        int tileFilterPad;
+
+        if (doBicubic) {
+            tileFilterPad = GrBicubicEffect::kFilterTexelPad;
+        } else if (GrTextureParams::kNone_FilterMode == textureFilterMode) {
+            tileFilterPad = 0;
+        } else {
+            tileFilterPad = 1;
+        }
+        params.setFilterMode(textureFilterMode);
+
+        int maxTileSizeForFilter = fContext->caps()->maxTileSize() - 2 * tileFilterPad;
+        if (this->shouldTileBitmap(bitmap, viewMatrix, params, &srcRect,
+                                   maxTileSizeForFilter, &tileSize, &clippedSrcRect)) {
+            this->drawTiledBitmap(bitmap, viewMatrix, srcRect, clippedSrcRect, params, paint,
+                                  SkCanvas::kStrict_SrcRectConstraint, tileSize, doBicubic);
+            return;
+        }
+    }
+    GrBitmapTextureMaker maker(fContext, bitmap);
+    this->drawTextureProducer(&maker, alphaOnly, nullptr, nullptr,
+                              SkCanvas::kStrict_SrcRectConstraint, viewMatrix, fClip, paint);
 }
 
 // This method outsets 'iRect' by 'outset' all around and then clamps its extents to
@@ -997,231 +918,15 @@ static inline void clamped_outset_with_offset(SkIRect* iRect,
     }
 }
 
-static bool has_aligned_samples(const SkRect& srcRect,
-                                const SkRect& transformedRect) {
-    // detect pixel disalignment
-    if (SkScalarAbs(SkScalarRoundToScalar(transformedRect.left()) -
-            transformedRect.left()) < COLOR_BLEED_TOLERANCE &&
-        SkScalarAbs(SkScalarRoundToScalar(transformedRect.top()) -
-            transformedRect.top()) < COLOR_BLEED_TOLERANCE &&
-        SkScalarAbs(transformedRect.width() - srcRect.width()) <
-            COLOR_BLEED_TOLERANCE &&
-        SkScalarAbs(transformedRect.height() - srcRect.height()) <
-            COLOR_BLEED_TOLERANCE) {
-        return true;
-    }
-    return false;
-}
-
-static bool may_color_bleed(const SkRect& srcRect,
-                            const SkRect& transformedRect,
-                            const SkMatrix& m) {
-    // Only gets called if has_aligned_samples returned false.
-    // So we can assume that sampling is axis aligned but not texel aligned.
-    SkASSERT(!has_aligned_samples(srcRect, transformedRect));
-    SkRect innerSrcRect(srcRect), innerTransformedRect,
-        outerTransformedRect(transformedRect);
-    innerSrcRect.inset(SK_ScalarHalf, SK_ScalarHalf);
-    m.mapRect(&innerTransformedRect, innerSrcRect);
-
-    // The gap between outerTransformedRect and innerTransformedRect
-    // represents the projection of the source border area, which is
-    // problematic for color bleeding.  We must check whether any
-    // destination pixels sample the border area.
-    outerTransformedRect.inset(COLOR_BLEED_TOLERANCE, COLOR_BLEED_TOLERANCE);
-    innerTransformedRect.outset(COLOR_BLEED_TOLERANCE, COLOR_BLEED_TOLERANCE);
-    SkIRect outer, inner;
-    outerTransformedRect.round(&outer);
-    innerTransformedRect.round(&inner);
-    // If the inner and outer rects round to the same result, it means the
-    // border does not overlap any pixel centers. Yay!
-    return inner != outer;
-}
-
-static bool needs_texture_domain(const SkBitmap& bitmap,
-                                 const SkRect& srcRect,
-                                 GrTextureParams &params,
-                                 const SkMatrix& contextMatrix,
-                                 bool bicubic) {
-    bool needsTextureDomain = false;
-
-    if (bicubic || params.filterMode() != GrTextureParams::kNone_FilterMode) {
-        // Need texture domain if drawing a sub rect
-        needsTextureDomain = srcRect.width() < bitmap.width() ||
-                             srcRect.height() < bitmap.height();
-        if (!bicubic && needsTextureDomain && contextMatrix.rectStaysRect()) {
-            // sampling is axis-aligned
-            SkRect transformedRect;
-            contextMatrix.mapRect(&transformedRect, srcRect);
-
-            if (has_aligned_samples(srcRect, transformedRect)) {
-                params.setFilterMode(GrTextureParams::kNone_FilterMode);
-                needsTextureDomain = false;
-            } else {
-                needsTextureDomain = may_color_bleed(srcRect, transformedRect, contextMatrix);
-            }
-        }
-    }
-    return needsTextureDomain;
-}
-
-void SkGpuDevice::drawBitmapCommon(const SkDraw& draw,
-                                   const SkBitmap& bitmap,
-                                   const SkRect* srcRectPtr,
-                                   const SkSize* dstSizePtr,
-                                   const SkPaint& paint,
-                                   SkCanvas::DrawBitmapRectFlags flags) {
-    CHECK_SHOULD_DRAW(draw, false);
-
-    SkRect srcRect;
-    SkSize dstSize;
-    // If there is no src rect, or the src rect contains the entire bitmap then we're effectively
-    // in the (easier) bleed case, so update flags.
-    if (NULL == srcRectPtr) {
-        SkScalar w = SkIntToScalar(bitmap.width());
-        SkScalar h = SkIntToScalar(bitmap.height());
-        dstSize.fWidth = w;
-        dstSize.fHeight = h;
-        srcRect.set(0, 0, w, h);
-        flags = (SkCanvas::DrawBitmapRectFlags) (flags | SkCanvas::kBleed_DrawBitmapRectFlag);
-    } else {
-        SkASSERT(NULL != dstSizePtr);
-        srcRect = *srcRectPtr;
-        dstSize = *dstSizePtr;
-        if (srcRect.fLeft <= 0 && srcRect.fTop <= 0 &&
-            srcRect.fRight >= bitmap.width() && srcRect.fBottom >= bitmap.height()) {
-            flags = (SkCanvas::DrawBitmapRectFlags) (flags | SkCanvas::kBleed_DrawBitmapRectFlag);
-        }
-    }
-
-    if (paint.getMaskFilter()){
-        // Convert the bitmap to a shader so that the rect can be drawn
-        // through drawRect, which supports mask filters.
-        SkBitmap        tmp;    // subset of bitmap, if necessary
-        const SkBitmap* bitmapPtr = &bitmap;
-        SkMatrix localM;
-        if (NULL != srcRectPtr) {
-            localM.setTranslate(-srcRectPtr->fLeft, -srcRectPtr->fTop);
-            localM.postScale(dstSize.fWidth / srcRectPtr->width(),
-                             dstSize.fHeight / srcRectPtr->height());
-            // In bleed mode we position and trim the bitmap based on the src rect which is
-            // already accounted for in 'm' and 'srcRect'. In clamp mode we need to chop out
-            // the desired portion of the bitmap and then update 'm' and 'srcRect' to
-            // compensate.
-            if (!(SkCanvas::kBleed_DrawBitmapRectFlag & flags)) {
-                SkIRect iSrc;
-                srcRect.roundOut(&iSrc);
-
-                SkPoint offset = SkPoint::Make(SkIntToScalar(iSrc.fLeft),
-                                               SkIntToScalar(iSrc.fTop));
-
-                if (!bitmap.extractSubset(&tmp, iSrc)) {
-                    return;     // extraction failed
-                }
-                bitmapPtr = &tmp;
-                srcRect.offset(-offset.fX, -offset.fY);
-
-                // The source rect has changed so update the matrix
-                localM.preTranslate(offset.fX, offset.fY);
-            }
-        } else {
-            localM.reset();
-        }
-
-        SkPaint paintWithShader(paint);
-        paintWithShader.setShader(SkShader::CreateBitmapShader(*bitmapPtr,
-            SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, &localM))->unref();
-        SkRect dstRect = {0, 0, dstSize.fWidth, dstSize.fHeight};
-        this->drawRect(draw, dstRect, paintWithShader);
-
-        return;
-    }
-
-    // If there is no mask filter than it is OK to handle the src rect -> dst rect scaling using
-    // the view matrix rather than a local matrix.
-    SkMatrix m;
-    m.setScale(dstSize.fWidth / srcRect.width(),
-               dstSize.fHeight / srcRect.height());
-    fContext->concatMatrix(m);
-
-    GrTextureParams params;
-    SkPaint::FilterLevel paintFilterLevel = paint.getFilterLevel();
-    GrTextureParams::FilterMode textureFilterMode;
-
-    bool doBicubic = false;
-
-    switch(paintFilterLevel) {
-        case SkPaint::kNone_FilterLevel:
-            textureFilterMode = GrTextureParams::kNone_FilterMode;
-            break;
-        case SkPaint::kLow_FilterLevel:
-            textureFilterMode = GrTextureParams::kBilerp_FilterMode;
-            break;
-        case SkPaint::kMedium_FilterLevel:
-            if (fContext->getMatrix().getMinScale() < SK_Scalar1) {
-                textureFilterMode = GrTextureParams::kMipMap_FilterMode;
-            } else {
-                // Don't trigger MIP level generation unnecessarily.
-                textureFilterMode = GrTextureParams::kBilerp_FilterMode;
-            }
-            break;
-        case SkPaint::kHigh_FilterLevel:
-            // Minification can look bad with the bicubic effect.
-            doBicubic =
-                GrBicubicEffect::ShouldUseBicubic(fContext->getMatrix(), &textureFilterMode);
-            break;
-        default:
-            SkErrorInternals::SetError( kInvalidPaint_SkError,
-                                        "Sorry, I don't understand the filtering "
-                                        "mode you asked for.  Falling back to "
-                                        "MIPMaps.");
-            textureFilterMode = GrTextureParams::kMipMap_FilterMode;
-            break;
-    }
-
-    int tileFilterPad;
-    if (doBicubic) {
-        tileFilterPad = GrBicubicEffect::kFilterTexelPad;
-    } else if (GrTextureParams::kNone_FilterMode == textureFilterMode) {
-        tileFilterPad = 0;
-    } else {
-        tileFilterPad = 1;
-    }
-    params.setFilterMode(textureFilterMode);
-
-    int maxTileSize = fContext->getMaxTextureSize() - 2 * tileFilterPad;
-    int tileSize;
-
-    SkIRect clippedSrcRect;
-    if (this->shouldTileBitmap(bitmap, params, srcRectPtr, maxTileSize, &tileSize,
-                               &clippedSrcRect)) {
-        this->drawTiledBitmap(bitmap, srcRect, clippedSrcRect, params, paint, flags, tileSize,
-                              doBicubic);
-    } else {
-        // take the simple case
-        bool needsTextureDomain = needs_texture_domain(bitmap,
-                                                       srcRect,
-                                                       params,
-                                                       fContext->getMatrix(),
-                                                       doBicubic);
-        this->internalDrawBitmap(bitmap,
-                                 srcRect,
-                                 params,
-                                 paint,
-                                 flags,
-                                 doBicubic,
-                                 needsTextureDomain);
-    }
-}
-
 // Break 'bitmap' into several tiles to draw it since it has already
 // been determined to be too large to fit in VRAM
 void SkGpuDevice::drawTiledBitmap(const SkBitmap& bitmap,
+                                  const SkMatrix& viewMatrix,
                                   const SkRect& srcRect,
                                   const SkIRect& clippedSrcIRect,
                                   const GrTextureParams& params,
-                                  const SkPaint& paint,
-                                  SkCanvas::DrawBitmapRectFlags flags,
+                                  const SkPaint& origPaint,
+                                  SkCanvas::SrcRectConstraint constraint,
                                   int tileSize,
                                   bool bicubic) {
     // The following pixel lock is technically redundant, but it is desirable
@@ -1229,6 +934,15 @@ void SkGpuDevice::drawTiledBitmap(const SkBitmap& bitmap,
     // at each tile in cases where 'bitmap' holds an SkDiscardablePixelRef that
     // is larger than the limit of the discardable memory pool.
     SkAutoLockPixels alp(bitmap);
+
+    const SkPaint* paint = &origPaint;
+    SkPaint tempPaint;
+    if (origPaint.isAntiAlias() && !fRenderTarget->isUnifiedMultisampled()) {
+        // Drop antialiasing to avoid seams at tile boundaries.
+        tempPaint = origPaint;
+        tempPaint.setAntiAlias(false);
+        paint = &tempPaint;
+    }
     SkRect clippedSrcRect = SkRect::Make(clippedSrcIRect);
 
     int nx = bitmap.width() / tileSize;
@@ -1256,15 +970,15 @@ void SkGpuDevice::drawTiledBitmap(const SkBitmap& bitmap,
                                            SkIntToScalar(iTileR.fTop));
 
             // Adjust the context matrix to draw at the right x,y in device space
+            SkMatrix viewM = viewMatrix;
             SkMatrix tmpM;
-            GrContext::AutoMatrix am;
             tmpM.setTranslate(offset.fX - srcRect.fLeft, offset.fY - srcRect.fTop);
-            am.setPreConcat(fContext, tmpM);
+            viewM.preConcat(tmpM);
 
-            if (SkPaint::kNone_FilterLevel != paint.getFilterLevel() || bicubic) {
+            if (GrTextureParams::kNone_FilterMode != params.filterMode() || bicubic) {
                 SkIRect iClampRect;
 
-                if (SkCanvas::kBleed_DrawBitmapRectFlag & flags) {
+                if (SkCanvas::kFast_SrcRectConstraint == constraint) {
                     // In bleed mode we want to always expand the tile on all edges
                     // but stay within the bitmap bounds
                     iClampRect = SkIRect::MakeWH(bitmap.width(), bitmap.height());
@@ -1282,16 +996,14 @@ void SkGpuDevice::drawTiledBitmap(const SkBitmap& bitmap,
                 // now offset it to make it "local" to our tmp bitmap
                 tileR.offset(-offset.fX, -offset.fY);
                 GrTextureParams paramsTemp = params;
-                bool needsTextureDomain = needs_texture_domain(bitmap,
-                                                               srcRect,
-                                                               paramsTemp,
-                                                               fContext->getMatrix(),
-                                                               bicubic);
+                // de-optimized this determination
+                bool needsTextureDomain = true;
                 this->internalDrawBitmap(tmpB,
+                                         viewM,
                                          tileR,
                                          paramsTemp,
-                                         paint,
-                                         flags,
+                                         *paint,
+                                         constraint,
                                          bicubic,
                                          needsTextureDomain);
             }
@@ -1299,7 +1011,6 @@ void SkGpuDevice::drawTiledBitmap(const SkBitmap& bitmap,
     }
 }
 
-
 /*
  *  This is called by drawBitmap(), which has to handle images that may be too
  *  large to be represented by a single texture.
@@ -1308,18 +1019,25 @@ void SkGpuDevice::drawTiledBitmap(const SkBitmap& bitmap,
  *  and that non-texture portion of the GrPaint has already been setup.
  */
 void SkGpuDevice::internalDrawBitmap(const SkBitmap& bitmap,
+                                     const SkMatrix& viewMatrix,
                                      const SkRect& srcRect,
                                      const GrTextureParams& params,
                                      const SkPaint& paint,
-                                     SkCanvas::DrawBitmapRectFlags flags,
+                                     SkCanvas::SrcRectConstraint constraint,
                                      bool bicubic,
                                      bool needsTextureDomain) {
-    SkASSERT(bitmap.width() <= fContext->getMaxTextureSize() &&
-             bitmap.height() <= fContext->getMaxTextureSize());
+    // We should have already handled bitmaps larger than the max texture size.
+    SkASSERT(bitmap.width() <= fContext->caps()->maxTextureSize() &&
+             bitmap.height() <= fContext->caps()->maxTextureSize());
+    // Unless the bitmap is inherently texture-backed, we should be respecting the max tile size
+    // by the time we get here.
+    SkASSERT(bitmap.getTexture() ||
+             (bitmap.width() <= fContext->caps()->maxTileSize() &&
+              bitmap.height() <= fContext->caps()->maxTileSize()));
 
     GrTexture* texture;
-    SkAutoCachedTexture act(this, bitmap, &params, &texture);
-    if (NULL == texture) {
+    AutoBitmapTexture abt(fContext, bitmap, params, &texture);
+    if (nullptr == texture) {
         return;
     }
 
@@ -1332,9 +1050,23 @@ void SkGpuDevice::internalDrawBitmap(const SkBitmap& bitmap,
                       SkScalarMul(srcRect.fRight,  wInv),
                       SkScalarMul(srcRect.fBottom, hInv));
 
+    SkMatrix texMatrix;
+    texMatrix.reset();
+    if (kAlpha_8_SkColorType == bitmap.colorType() && paint.getShader()) {
+        // In cases where we are doing an A8 bitmap draw with a shader installed, we cannot use
+        // local coords with the bitmap draw since it may mess up texture look ups for the shader.
+        // Thus we need to pass in the transform matrix directly to the texture processor used for
+        // the bitmap draw.
+        texMatrix.setScale(wInv, hInv);
+    }
+
     SkRect textureDomain = SkRect::MakeEmpty();
-    SkAutoTUnref<GrEffect> effect;
-    if (needsTextureDomain && !(flags & SkCanvas::kBleed_DrawBitmapRectFlag)) {
+
+    // Construct a GrPaint by setting the bitmap texture as the first effect and then configuring
+    // the rest from the SkPaint.
+    SkAutoTUnref<const GrFragmentProcessor> fp;
+
+    if (needsTextureDomain && (SkCanvas::kStrict_SrcRectConstraint == constraint)) {
         // Use a constrained texture domain to avoid color bleeding
         SkScalar left, top, right, bottom;
         if (srcRect.width() > SK_Scalar1) {
@@ -1353,46 +1085,49 @@ void SkGpuDevice::internalDrawBitmap(const SkBitmap& bitmap,
         }
         textureDomain.setLTRB(left, top, right, bottom);
         if (bicubic) {
-            effect.reset(GrBicubicEffect::Create(texture, SkMatrix::I(), textureDomain));
+            fp.reset(GrBicubicEffect::Create(texture, texMatrix, textureDomain));
         } else {
-            effect.reset(GrTextureDomainEffect::Create(texture,
-                                                       SkMatrix::I(),
-                                                       textureDomain,
-                                                       GrTextureDomain::kClamp_Mode,
-                                                       params.filterMode()));
+            fp.reset(GrTextureDomainEffect::Create(texture,
+                                                   texMatrix,
+                                                   textureDomain,
+                                                   GrTextureDomain::kClamp_Mode,
+                                                   params.filterMode()));
         }
     } else if (bicubic) {
         SkASSERT(GrTextureParams::kNone_FilterMode == params.filterMode());
         SkShader::TileMode tileModes[2] = { params.getTileModeX(), params.getTileModeY() };
-        effect.reset(GrBicubicEffect::Create(texture, SkMatrix::I(), tileModes));
+        fp.reset(GrBicubicEffect::Create(texture, texMatrix, tileModes));
     } else {
-        effect.reset(GrSimpleTextureEffect::Create(texture, SkMatrix::I(), params));
+        fp.reset(GrSimpleTextureEffect::Create(texture, texMatrix, params));
     }
 
-    // Construct a GrPaint by setting the bitmap texture as the first effect and then configuring
-    // the rest from the SkPaint.
     GrPaint grPaint;
-    grPaint.addColorEffect(effect);
-    bool alphaOnly = !(kAlpha_8_SkColorType == bitmap.colorType());
-    GrColor paintColor = (alphaOnly) ? SkColor2GrColorJustAlpha(paint.getColor()) :
-                                       SkColor2GrColor(paint.getColor());
-    SkPaint2GrPaintNoShader(this->context(), paint, paintColor, false, &grPaint);
+    if (!SkPaintToGrPaintWithTexture(this->context(), paint, viewMatrix, fp,
+                                     kAlpha_8_SkColorType == bitmap.colorType(), &grPaint)) {
+        return;
+    }
 
-    fContext->drawRectToRect(grPaint, dstRect, paintRect, NULL);
+    if (kAlpha_8_SkColorType == bitmap.colorType() && paint.getShader()) {
+        // We don't have local coords in this case and have previously set the transform
+        // matrices directly on the texture processor.
+        fDrawContext->drawRect(fClip, grPaint, viewMatrix, dstRect);
+    } else {
+        fDrawContext->fillRectToRect(fClip, grPaint, viewMatrix, dstRect, paintRect);
+    }
 }
 
-static bool filter_texture(SkBaseDevice* device, GrContext* context,
-                           GrTexture* texture, const SkImageFilter* filter,
-                           int w, int h, const SkImageFilter::Context& ctx,
-                           SkBitmap* result, SkIPoint* offset) {
+bool SkGpuDevice::filterTexture(GrContext* context, GrTexture* texture,
+                                int width, int height,
+                                const SkImageFilter* filter,
+                                const SkImageFilter::Context& ctx,
+                                SkBitmap* result, SkIPoint* offset) {
     SkASSERT(filter);
-    SkDeviceImageFilterProxy proxy(device);
+
+    SkImageFilter::DeviceProxy proxy(this);
 
     if (filter->canFilterImageGPU()) {
-        // Save the render target and set it to NULL, so we don't accidentally draw to it in the
-        // filter.  Also set the clip wide open and the matrix to identity.
-        GrContext::AutoWideOpenIdentityDraw awo(context, NULL);
-        return filter->filterImageGPU(&proxy, wrap_texture(texture), ctx, result, offset);
+        return filter->filterImageGPU(&proxy, wrap_texture(texture, width, height),
+                                      ctx, result, offset);
     } else {
         return false;
     }
@@ -1401,7 +1136,7 @@ static bool filter_texture(SkBaseDevice* device, GrContext* context,
 void SkGpuDevice::drawSprite(const SkDraw& draw, const SkBitmap& bitmap,
                              int left, int top, const SkPaint& paint) {
     // drawSprite is defined to be in device coords.
-    CHECK_SHOULD_DRAW(draw, true);
+    CHECK_SHOULD_DRAW(draw);
 
     SkAutoLockPixels alp(bitmap, !bitmap.getTexture());
     if (!bitmap.getTexture() && !bitmap.readyToDraw()) {
@@ -1412,23 +1147,29 @@ void SkGpuDevice::drawSprite(const SkDraw& draw, const SkBitmap& bitmap,
     int h = bitmap.height();
 
     GrTexture* texture;
-    // draw sprite uses the default texture params
-    SkAutoCachedTexture act(this, bitmap, NULL, &texture);
+    // draw sprite neither filters nor tiles.
+    AutoBitmapTexture abt(fContext, bitmap, GrTextureParams::ClampNoFilter(), &texture);
+    if (!texture) {
+        return;
+    }
+
+    bool alphaOnly = kAlpha_8_SkColorType == bitmap.colorType();
 
     SkImageFilter* filter = paint.getImageFilter();
     // This bitmap will own the filtered result as a texture.
     SkBitmap filteredBitmap;
 
-    if (NULL != filter) {
+    if (filter) {
         SkIPoint offset = SkIPoint::Make(0, 0);
         SkMatrix matrix(*draw.fMatrix);
         matrix.postTranslate(SkIntToScalar(-left), SkIntToScalar(-top));
         SkIRect clipBounds = SkIRect::MakeWH(bitmap.width(), bitmap.height());
-        SkImageFilter::Cache* cache = SkImageFilter::Cache::Create();
-        SkAutoUnref aur(cache);
-        SkImageFilter::Context ctx(matrix, clipBounds, cache);
-        if (filter_texture(this, fContext, texture, filter, w, h, ctx, &filteredBitmap,
-                           &offset)) {
+        SkAutoTUnref<SkImageFilter::Cache> cache(getImageFilterCache());
+        // This cache is transient, and is freed (along with all its contained
+        // textures) when it goes out of scope.
+        SkImageFilter::Context ctx(matrix, clipBounds, cache, SkImageFilter::kApprox_SizeConstraint);
+        if (this->filterTexture(fContext, texture, w, h, filter, ctx, &filteredBitmap,
+                                &offset)) {
             texture = (GrTexture*) filteredBitmap.getTexture();
             w = filteredBitmap.width();
             h = filteredBitmap.height();
@@ -1437,69 +1178,121 @@ void SkGpuDevice::drawSprite(const SkDraw& draw, const SkBitmap& bitmap,
         } else {
             return;
         }
+        SkASSERT(!GrPixelConfigIsAlphaOnly(texture->config()));
+        alphaOnly = false;
     }
 
     GrPaint grPaint;
-    grPaint.addColorTextureEffect(texture, SkMatrix::I());
-
-    SkPaint2GrPaintNoShader(this->context(), paint, SkColor2GrColorJustAlpha(paint.getColor()),
-                            false, &grPaint);
-
-    fContext->drawRectToRect(grPaint,
-                             SkRect::MakeXYWH(SkIntToScalar(left),
-                                              SkIntToScalar(top),
-                                              SkIntToScalar(w),
-                                              SkIntToScalar(h)),
-                             SkRect::MakeXYWH(0,
-                                              0,
-                                              SK_Scalar1 * w / texture->width(),
-                                              SK_Scalar1 * h / texture->height()));
-}
-
-void SkGpuDevice::drawBitmapRect(const SkDraw& origDraw, const SkBitmap& bitmap,
-                                 const SkRect* src, const SkRect& dst,
-                                 const SkPaint& paint,
-                                 SkCanvas::DrawBitmapRectFlags flags) {
-    SkMatrix    matrix;
-    SkRect      bitmapBounds, tmpSrc;
-
-    bitmapBounds.set(0, 0,
-                     SkIntToScalar(bitmap.width()),
-                     SkIntToScalar(bitmap.height()));
-
-    // Compute matrix from the two rectangles
-    if (NULL != src) {
-        tmpSrc = *src;
+    SkAutoTUnref<const GrFragmentProcessor> fp(
+        GrSimpleTextureEffect::Create(texture, SkMatrix::I()));
+    if (alphaOnly) {
+        fp.reset(GrFragmentProcessor::MulOutputByInputUnpremulColor(fp));
     } else {
-        tmpSrc = bitmapBounds;
+        fp.reset(GrFragmentProcessor::MulOutputByInputAlpha(fp));
+    }
+    if (!SkPaintToGrPaintReplaceShader(this->context(), paint, fp, &grPaint)) {
+        return;
     }
 
-    matrix.setRectToRect(tmpSrc, dst, SkMatrix::kFill_ScaleToFit);
+    fDrawContext->fillRectToRect(fClip,
+                                 grPaint,
+                                 SkMatrix::I(),
+                                 SkRect::MakeXYWH(SkIntToScalar(left),
+                                                  SkIntToScalar(top),
+                                                  SkIntToScalar(w),
+                                                  SkIntToScalar(h)),
+                                 SkRect::MakeXYWH(0,
+                                                  0,
+                                                  SK_Scalar1 * w / texture->width(),
+                                                  SK_Scalar1 * h / texture->height()));
+}
 
-    // clip the tmpSrc to the bounds of the bitmap. No check needed if src==null.
-    if (NULL != src) {
-        if (!bitmapBounds.contains(tmpSrc)) {
-            if (!tmpSrc.intersect(bitmapBounds)) {
+void SkGpuDevice::drawBitmapRect(const SkDraw& draw, const SkBitmap& bitmap,
+                                 const SkRect* src, const SkRect& origDst,
+                                 const SkPaint& paint, SkCanvas::SrcRectConstraint constraint) {
+    bool alphaOnly = kAlpha_8_SkColorType == bitmap.colorType();
+    if (bitmap.getTexture()) {
+        CHECK_SHOULD_DRAW(draw);
+        GrBitmapTextureAdjuster adjuster(&bitmap);
+        this->drawTextureProducer(&adjuster, alphaOnly, src, &origDst, constraint, *draw.fMatrix,
+                                  fClip, paint);
+        return;
+    }
+    // The src rect is inferred to be the bmp bounds if not provided. Otherwise, the src rect must
+    // be clipped to the bmp bounds. To determine tiling parameters we need the filter mode which
+    // in turn requires knowing the src-to-dst mapping. If the src was clipped to the bmp bounds
+    // then we use the src-to-dst mapping to compute a new clipped dst rect.
+    const SkRect* dst = &origDst;
+    const SkRect bmpBounds = SkRect::MakeIWH(bitmap.width(), bitmap.height());
+    // Compute matrix from the two rectangles
+    if (!src) {
+        src = &bmpBounds;
+    }
+
+    SkMatrix srcToDstMatrix;
+    if (!srcToDstMatrix.setRectToRect(*src, *dst, SkMatrix::kFill_ScaleToFit)) {
+        return;
+    }
+    SkRect tmpSrc, tmpDst;
+    if (src != &bmpBounds) {
+        if (!bmpBounds.contains(*src)) {
+            tmpSrc = *src;
+            if (!tmpSrc.intersect(bmpBounds)) {
                 return; // nothing to draw
             }
+            src = &tmpSrc;
+            srcToDstMatrix.mapRect(&tmpDst, *src);
+            dst = &tmpDst;
         }
     }
 
-    SkRect tmpDst;
-    matrix.mapRect(&tmpDst, tmpSrc);
+    int maxTileSize = fContext->caps()->maxTileSize();
 
-    SkTCopyOnFirstWrite<SkDraw> draw(origDraw);
-    if (0 != tmpDst.fLeft || 0 != tmpDst.fTop) {
-        // Translate so that tempDst's top left is at the origin.
-        matrix = *origDraw.fMatrix;
-        matrix.preTranslate(tmpDst.fLeft, tmpDst.fTop);
-        draw.writable()->fMatrix = &matrix;
+    // The tile code path doesn't currently support AA, so if the paint asked for aa and we could
+    // draw untiled, then we bypass checking for tiling purely for optimization reasons.
+    bool drawAA = !fRenderTarget->isUnifiedMultisampled() &&
+        paint.isAntiAlias() &&
+        bitmap.width() <= maxTileSize &&
+        bitmap.height() <= maxTileSize;
+
+    bool skipTileCheck = drawAA || paint.getMaskFilter();
+
+    if (!skipTileCheck) {
+        int tileSize;
+        SkIRect clippedSrcRect;
+
+        GrTextureParams params;
+        bool doBicubic;
+        GrTextureParams::FilterMode textureFilterMode =
+            GrSkFilterQualityToGrFilterMode(paint.getFilterQuality(), *draw.fMatrix, srcToDstMatrix,
+                                            &doBicubic);
+
+        int tileFilterPad;
+
+        if (doBicubic) {
+            tileFilterPad = GrBicubicEffect::kFilterTexelPad;
+        } else if (GrTextureParams::kNone_FilterMode == textureFilterMode) {
+            tileFilterPad = 0;
+        } else {
+            tileFilterPad = 1;
+        }
+        params.setFilterMode(textureFilterMode);
+
+        int maxTileSizeForFilter = fContext->caps()->maxTileSize() - 2 * tileFilterPad;
+        // Fold the dst rect into the view matrix. This is only OK because we don't get here if
+        // we have a mask filter.
+        SkMatrix viewMatrix = *draw.fMatrix;
+        viewMatrix.preTranslate(dst->fLeft, dst->fTop);
+        viewMatrix.preScale(dst->width()/src->width(), dst->height()/src->height());
+        if (this->shouldTileBitmap(bitmap, viewMatrix, params, src,
+                                   maxTileSizeForFilter, &tileSize, &clippedSrcRect)) {
+            this->drawTiledBitmap(bitmap, viewMatrix, *src, clippedSrcRect, params, paint,
+                                  constraint, tileSize, doBicubic);
+            return;
+        }
     }
-    SkSize dstSize;
-    dstSize.fWidth = tmpDst.width();
-    dstSize.fHeight = tmpDst.height();
-
-    this->drawBitmapCommon(*draw, bitmap, &tmpSrc, &dstSize, paint, flags);
+    GrBitmapTextureMaker maker(fContext, bitmap);
+    this->drawTextureProducer(&maker, alphaOnly, src, dst, constraint, *draw.fMatrix, fClip, paint);
 }
 
 void SkGpuDevice::drawDevice(const SkDraw& draw, SkBaseDevice* device,
@@ -1507,38 +1300,39 @@ void SkGpuDevice::drawDevice(const SkDraw& draw, SkBaseDevice* device,
     // clear of the source device must occur before CHECK_SHOULD_DRAW
     GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice::drawDevice", fContext);
     SkGpuDevice* dev = static_cast<SkGpuDevice*>(device);
-    if (dev->fNeedClear) {
-        // TODO: could check here whether we really need to draw at all
-        dev->clear(0x0);
-    }
+
+    // TODO: If the source device covers the whole of this device, we could
+    // omit fNeedsClear -related flushing.
+    // TODO: if source needs clear, we could maybe omit the draw fully.
 
     // drawDevice is defined to be in device coords.
-    CHECK_SHOULD_DRAW(draw, true);
+    CHECK_SHOULD_DRAW(draw);
 
     GrRenderTarget* devRT = dev->accessRenderTarget();
     GrTexture* devTex;
-    if (NULL == (devTex = devRT->asTexture())) {
+    if (nullptr == (devTex = devRT->asTexture())) {
         return;
     }
 
-    const SkBitmap& bm = dev->accessBitmap(false);
-    int w = bm.width();
-    int h = bm.height();
+    const SkImageInfo ii = dev->imageInfo();
+    int w = ii.width();
+    int h = ii.height();
 
     SkImageFilter* filter = paint.getImageFilter();
     // This bitmap will own the filtered result as a texture.
     SkBitmap filteredBitmap;
 
-    if (NULL != filter) {
+    if (filter) {
         SkIPoint offset = SkIPoint::Make(0, 0);
         SkMatrix matrix(*draw.fMatrix);
         matrix.postTranslate(SkIntToScalar(-x), SkIntToScalar(-y));
         SkIRect clipBounds = SkIRect::MakeWH(devTex->width(), devTex->height());
-        SkImageFilter::Cache* cache = SkImageFilter::Cache::Create();
-        SkAutoUnref aur(cache);
-        SkImageFilter::Context ctx(matrix, clipBounds, cache);
-        if (filter_texture(this, fContext, devTex, filter, w, h, ctx, &filteredBitmap,
-                           &offset)) {
+        // This cache is transient, and is freed (along with all its contained
+        // textures) when it goes out of scope.
+        SkAutoTUnref<SkImageFilter::Cache> cache(getImageFilterCache());
+        SkImageFilter::Context ctx(matrix, clipBounds, cache, SkImageFilter::kApprox_SizeConstraint);
+        if (this->filterTexture(fContext, devTex, device->width(), device->height(),
+                                filter, ctx, &filteredBitmap, &offset)) {
             devTex = filteredBitmap.getTexture();
             w = filteredBitmap.width();
             h = filteredBitmap.height();
@@ -1550,10 +1344,18 @@ void SkGpuDevice::drawDevice(const SkDraw& draw, SkBaseDevice* device,
     }
 
     GrPaint grPaint;
-    grPaint.addColorTextureEffect(devTex, SkMatrix::I());
+    SkAutoTUnref<const GrFragmentProcessor> fp(
+        GrSimpleTextureEffect::Create(devTex, SkMatrix::I()));
+    if (GrPixelConfigIsAlphaOnly(devTex->config())) {
+        // Can this happen?
+        fp.reset(GrFragmentProcessor::MulOutputByInputUnpremulColor(fp));
+   } else {
+        fp.reset(GrFragmentProcessor::MulOutputByInputAlpha(fp));
+    }
 
-    SkPaint2GrPaintNoShader(this->context(), paint, SkColor2GrColorJustAlpha(paint.getColor()),
-                            false, &grPaint);
+    if (!SkPaintToGrPaintReplaceShader(this->context(), paint, fp, &grPaint)) {
+        return;
+    }
 
     SkRect dstRect = SkRect::MakeXYWH(SkIntToScalar(x),
                                       SkIntToScalar(y),
@@ -1565,7 +1367,7 @@ void SkGpuDevice::drawDevice(const SkDraw& draw, SkBaseDevice* device,
     SkRect srcRect = SkRect::MakeWH(SK_Scalar1 * w / devTex->width(),
                                     SK_Scalar1 * h / devTex->height());
 
-    fContext->drawRectToRect(grPaint, dstRect, srcRect);
+    fDrawContext->fillRectToRect(fClip, grPaint, SkMatrix::I(), dstRect, srcRect);
 }
 
 bool SkGpuDevice::canHandleImageFilter(const SkImageFilter* filter) {
@@ -1588,10 +1390,139 @@ bool SkGpuDevice::filterImage(const SkImageFilter* filter, const SkBitmap& src,
     GrTexture* texture;
     // We assume here that the filter will not attempt to tile the src. Otherwise, this cache lookup
     // must be pushed upstack.
-    SkAutoCachedTexture act(this, src, NULL, &texture);
+    AutoBitmapTexture abt(fContext, src, GrTextureParams::ClampNoFilter(), &texture);
+    if (!texture) {
+        return false;
+    }
 
-    return filter_texture(this, fContext, texture, filter, src.width(), src.height(), ctx,
-                          result, offset);
+    return this->filterTexture(fContext, texture, src.width(), src.height(),
+                               filter, ctx, result, offset);
+}
+
+static bool wrap_as_bm(GrContext* ctx, const SkImage* image, SkBitmap* bm) {
+    // TODO: It is wrong to assume these texture params here.
+    SkAutoTUnref<GrTexture> tex(as_IB(image)->asTextureRef(ctx, GrTextureParams::ClampNoFilter()));
+    if (tex) {
+        GrWrapTextureInBitmap(tex, image->width(), image->height(), image->isOpaque(), bm);
+        return true;
+    } else {
+        return as_IB(image)->getROPixels(bm);
+    }
+}
+
+void SkGpuDevice::drawImage(const SkDraw& draw, const SkImage* image, SkScalar x, SkScalar y,
+                            const SkPaint& paint) {
+    SkBitmap bm;
+    if (GrTexture* tex = as_IB(image)->peekTexture()) {
+        CHECK_SHOULD_DRAW(draw);
+        SkMatrix viewMatrix = *draw.fMatrix;
+        viewMatrix.preTranslate(x, y);
+        bool alphaOnly = GrPixelConfigIsAlphaOnly(tex->config());
+        GrImageTextureAdjuster adjuster(as_IB(image));
+        this->drawTextureProducer(&adjuster, alphaOnly, nullptr, nullptr,
+                                  SkCanvas::kFast_SrcRectConstraint, viewMatrix, fClip, paint);
+        return;
+    } else {
+        if (this->shouldTileImage(image, nullptr, SkCanvas::kFast_SrcRectConstraint,
+                                  paint.getFilterQuality(), *draw.fMatrix)) {
+            // only support tiling as bitmap at the moment, so force raster-version
+            if (!as_IB(image)->getROPixels(&bm)) {
+                return;
+            }
+        } else {
+            if (!wrap_as_bm(this->context(), image, &bm)) {
+                return;
+            }
+        }
+    }
+    this->drawBitmap(draw, bm, SkMatrix::MakeTrans(x, y), paint);
+}
+
+void SkGpuDevice::drawImageRect(const SkDraw& draw, const SkImage* image, const SkRect* src,
+                                const SkRect& dst, const SkPaint& paint,
+                                SkCanvas::SrcRectConstraint constraint) {
+    if (GrTexture* tex = as_IB(image)->peekTexture()) {
+        CHECK_SHOULD_DRAW(draw);
+        GrImageTextureAdjuster adjuster(as_IB(image));
+        bool alphaOnly = GrPixelConfigIsAlphaOnly(tex->config());
+        this->drawTextureProducer(&adjuster, alphaOnly, src, &dst, constraint, *draw.fMatrix,
+                                  fClip, paint);
+        return;
+    }
+    SkBitmap bm;
+    SkMatrix viewMatrix = *draw.fMatrix;
+    viewMatrix.preScale(dst.width() / (src ? src->width() : image->width()),
+                        dst.height() / (src ? src->height() : image->height()));
+    if (this->shouldTileImage(image, src, constraint, paint.getFilterQuality(), viewMatrix)) {
+        // only support tiling as bitmap at the moment, so force raster-version
+        if (!as_IB(image)->getROPixels(&bm)) {
+            return;
+        }
+    } else {
+        if (!wrap_as_bm(this->context(), image, &bm)) {
+            return;
+        }
+    }
+    this->drawBitmapRect(draw, bm, src, dst, paint, constraint);
+}
+
+void SkGpuDevice::drawImageNine(const SkDraw& draw, const SkImage* image,
+                                const SkIRect& center, const SkRect& dst, const SkPaint& paint) {
+    // TODO write native implementation
+    SkBitmap bitmap;
+    if (!wrap_as_bm(this->context(), image, &bitmap)) {
+        return;
+    }
+    return this->drawBitmapNine(draw, bitmap, center, dst, paint);
+}
+
+void SkGpuDevice::drawBitmapNine(const SkDraw& draw, const SkBitmap& bitmap, const SkIRect& center,
+                                 const SkRect& dst, const SkPaint& paint) {
+    GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice::drawBitmapNine", fContext);
+
+    CHECK_FOR_ANNOTATION(paint);
+    CHECK_SHOULD_DRAW(draw);
+
+    bool useFallback = paint.getMaskFilter() || paint.isAntiAlias() ||
+                       fRenderTarget->isUnifiedMultisampled();
+    bool doBicubic;
+    GrTextureParams::FilterMode textureFilterMode =
+            GrSkFilterQualityToGrFilterMode(paint.getFilterQuality(), *draw.fMatrix, SkMatrix::I(),
+                                            &doBicubic);
+
+    // TODO handle bilerp(vie texture domains), MSAA(via snapping)
+    if (useFallback || doBicubic || GrTextureParams::kNone_FilterMode != textureFilterMode) {
+        SkNinePatchIter iter(bitmap.width(), bitmap.height(), center, dst);
+
+        SkRect srcR, dstR;
+        while (iter.next(&srcR, &dstR)) {
+            this->drawBitmapRect(draw, bitmap, &srcR, dstR, paint,
+                                 SkCanvas::kStrict_SrcRectConstraint);
+        }
+        return;
+    }
+
+    GrTextureParams params = GrTextureParams::ClampNoFilter();
+
+    SkAutoTUnref<GrTexture> texture(GrRefCachedBitmapTexture(this->context(), bitmap, params));
+    if (nullptr == texture) {
+        return;
+    }
+
+    SkMatrix texMatrix;
+    texMatrix.setIDiv(texture->width(), texture->height());
+
+    SkAutoTUnref<const GrFragmentProcessor> fp(GrSimpleTextureEffect::Create(texture, texMatrix,
+                                                                             params));
+
+    GrPaint grPaint;
+    if (!SkPaintToGrPaintWithTexture(this->context(), paint, *draw.fMatrix, fp,
+                                     kAlpha_8_SkColorType == bitmap.colorType(), &grPaint)) {
+        return;
+    }
+
+    fDrawContext->drawImageNine(fClip, grPaint, *draw.fMatrix, bitmap.width(), bitmap.height(),
+                                center, dst);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1609,452 +1540,338 @@ void SkGpuDevice::drawVertices(const SkDraw& draw, SkCanvas::VertexMode vmode,
                               SkXfermode* xmode,
                               const uint16_t indices[], int indexCount,
                               const SkPaint& paint) {
-    CHECK_SHOULD_DRAW(draw, false);
-
+    CHECK_SHOULD_DRAW(draw);
     GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice::drawVertices", fContext);
-    
-    const uint16_t* outIndices;
-    SkAutoTDeleteArray<uint16_t> outAlloc(NULL);
-    GrPrimitiveType primType;
-    GrPaint grPaint;
-    
-    // If both textures and vertex-colors are NULL, strokes hairlines with the paint's color.
-    if ((NULL == texs || NULL == paint.getShader()) && NULL == colors) {
-        
-        texs = NULL;
-        
+
+    // If both textures and vertex-colors are nullptr, strokes hairlines with the paint's color.
+    if ((nullptr == texs || nullptr == paint.getShader()) && nullptr == colors) {
+
+        texs = nullptr;
+
         SkPaint copy(paint);
         copy.setStyle(SkPaint::kStroke_Style);
         copy.setStrokeWidth(0);
-        
-        // we ignore the shader if texs is null.
-        SkPaint2GrPaintNoShader(this->context(), copy, SkColor2GrColor(copy.getColor()),
-                                NULL == colors, &grPaint);
 
-        primType = kLines_GrPrimitiveType;
+        GrPaint grPaint;
+        // we ignore the shader if texs is null.
+        if (!SkPaintToGrPaintNoShader(this->context(), copy, &grPaint)) {
+            return;
+        }
+
         int triangleCount = 0;
+        int n = (nullptr == indices) ? vertexCount : indexCount;
         switch (vmode) {
             case SkCanvas::kTriangles_VertexMode:
-                triangleCount = indexCount / 3;
+                triangleCount = n / 3;
                 break;
             case SkCanvas::kTriangleStrip_VertexMode:
             case SkCanvas::kTriangleFan_VertexMode:
-                triangleCount = indexCount - 2;
+                triangleCount = n - 2;
                 break;
         }
-        
+
         VertState       state(vertexCount, indices, indexCount);
         VertState::Proc vertProc = state.chooseProc(vmode);
-        
+
         //number of indices for lines per triangle with kLines
         indexCount = triangleCount * 6;
-        
-        outAlloc.reset(SkNEW_ARRAY(uint16_t, indexCount));
-        outIndices = outAlloc.get();
-        uint16_t* auxIndices = outAlloc.get();
+
+        SkAutoTDeleteArray<uint16_t> lineIndices(new uint16_t[indexCount]);
         int i = 0;
         while (vertProc(&state)) {
-            auxIndices[i]     = state.f0;
-            auxIndices[i + 1] = state.f1;
-            auxIndices[i + 2] = state.f1;
-            auxIndices[i + 3] = state.f2;
-            auxIndices[i + 4] = state.f2;
-            auxIndices[i + 5] = state.f0;
+            lineIndices[i]     = state.f0;
+            lineIndices[i + 1] = state.f1;
+            lineIndices[i + 2] = state.f1;
+            lineIndices[i + 3] = state.f2;
+            lineIndices[i + 4] = state.f2;
+            lineIndices[i + 5] = state.f0;
             i += 6;
         }
-    } else {
-        outIndices = indices;
-        primType = gVertexMode2PrimitiveType[vmode];
-        
-        if (NULL == texs || NULL == paint.getShader()) {
-            SkPaint2GrPaintNoShader(this->context(), paint, SkColor2GrColor(paint.getColor()),
-                                    NULL == colors, &grPaint);
-        } else {
-            SkPaint2GrPaintShader(this->context(), paint, NULL == colors, &grPaint);
-        }
+        fDrawContext->drawVertices(fClip,
+                                   grPaint,
+                                   *draw.fMatrix,
+                                   kLines_GrPrimitiveType,
+                                   vertexCount,
+                                   vertices,
+                                   texs,
+                                   colors,
+                                   lineIndices.get(),
+                                   indexCount);
+        return;
     }
 
-#if 0
-    if (NULL != xmode && NULL != texs && NULL != colors) {
-        if (!SkXfermode::IsMode(xmode, SkXfermode::kModulate_Mode)) {
-            SkDebugf("Unsupported vertex-color/texture xfer mode.\n");
-            return;
-        }
-    }
-#endif
+    GrPrimitiveType primType = gVertexMode2PrimitiveType[vmode];
 
     SkAutoSTMalloc<128, GrColor> convertedColors(0);
-    if (NULL != colors) {
-        // need to convert byte order and from non-PM to PM
+    if (colors) {
+        // need to convert byte order and from non-PM to PM. TODO: Keep unpremul until after
+        // interpolation.
         convertedColors.reset(vertexCount);
-        SkColor color;
         for (int i = 0; i < vertexCount; ++i) {
-            color = colors[i];
-            if (paint.getAlpha() != 255) {
-                color = SkColorSetA(color, SkMulDiv255Round(SkColorGetA(color), paint.getAlpha()));
-            }
-            convertedColors[i] = SkColor2GrColor(color);
+            convertedColors[i] = SkColorToPremulGrColor(colors[i]);
         }
         colors = convertedColors.get();
     }
-    fContext->drawVertices(grPaint,
-                           primType,
-                           vertexCount,
-                           vertices,
-                           texs,
-                           colors,
-                           outIndices,
-                           indexCount);
+    GrPaint grPaint;
+    if (texs && paint.getShader()) {
+        if (colors) {
+            // When there are texs and colors the shader and colors are combined using xmode. A null
+            // xmode is defined to mean modulate.
+            SkXfermode::Mode colorMode;
+            if (xmode) {
+                if (!xmode->asMode(&colorMode)) {
+                    return;
+                }
+            } else {
+                colorMode = SkXfermode::kModulate_Mode;
+            }
+            if (!SkPaintToGrPaintWithXfermode(this->context(), paint, *draw.fMatrix, colorMode,
+                                              false, &grPaint)) {
+                return;
+            }
+        } else {
+            // We have a shader, but no colors to blend it against.
+            if (!SkPaintToGrPaint(this->context(), paint, *draw.fMatrix, &grPaint)) {
+                return;
+            }
+        }
+    } else {
+        if (colors) {
+            // We have colors, but either have no shader or no texture coords (which implies that
+            // we should ignore the shader).
+            if (!SkPaintToGrPaintWithPrimitiveColor(this->context(), paint, &grPaint)) {
+                return;
+            }
+        } else {
+            // No colors and no shaders. Just draw with the paint color.
+            if (!SkPaintToGrPaintNoShader(this->context(), paint, &grPaint)) {
+                return;
+            }
+        }
+    }
+
+    fDrawContext->drawVertices(fClip,
+                               grPaint,
+                               *draw.fMatrix,
+                               primType,
+                               vertexCount,
+                               vertices,
+                               texs,
+                               colors,
+                               indices,
+                               indexCount);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+void SkGpuDevice::drawAtlas(const SkDraw& draw, const SkImage* atlas, const SkRSXform xform[],
+                            const SkRect texRect[], const SkColor colors[], int count,
+                            SkXfermode::Mode mode, const SkPaint& paint) {
+    if (paint.isAntiAlias()) {
+        this->INHERITED::drawAtlas(draw, atlas, xform, texRect, colors, count, mode, paint);
+        return;
+    }
+
+    CHECK_SHOULD_DRAW(draw);
+    GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice::drawText", fContext);
+
+    SkPaint p(paint);
+    p.setShader(atlas->newShader(SkShader::kClamp_TileMode, SkShader::kClamp_TileMode))->unref();
+
+    GrPaint grPaint;
+    if (colors) {
+        if (!SkPaintToGrPaintWithXfermode(this->context(), p, *draw.fMatrix, mode, true,
+                                          &grPaint)) {
+            return;
+        }
+    } else {
+        if (!SkPaintToGrPaint(this->context(), p, *draw.fMatrix, &grPaint)) {
+            return;
+        }
+    }
+
+    SkDEBUGCODE(this->validate();)
+    fDrawContext->drawAtlas(fClip, grPaint, *draw.fMatrix, count, xform, texRect, colors);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkGpuDevice::drawText(const SkDraw& draw, const void* text,
-                          size_t byteLength, SkScalar x, SkScalar y,
-                          const SkPaint& paint) {
-    CHECK_SHOULD_DRAW(draw, false);
+                           size_t byteLength, SkScalar x, SkScalar y,
+                           const SkPaint& paint) {
+    CHECK_SHOULD_DRAW(draw);
     GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice::drawText", fContext);
 
-    if (fMainTextContext->canDraw(paint)) {
-        GrPaint grPaint;
-        SkPaint2GrPaintShader(this->context(), paint, true, &grPaint);
-
-        SkDEBUGCODE(this->validate();)
-
-        fMainTextContext->drawText(grPaint, paint, (const char *)text, byteLength, x, y);
-    } else if (fFallbackTextContext && fFallbackTextContext->canDraw(paint)) {
-        GrPaint grPaint;
-        SkPaint2GrPaintShader(this->context(), paint, true, &grPaint);
-
-        SkDEBUGCODE(this->validate();)
-
-        fFallbackTextContext->drawText(grPaint, paint, (const char *)text, byteLength, x, y);
-    } else {
-        // this guy will just call our drawPath()
-        draw.drawText_asPaths((const char*)text, byteLength, x, y, paint);
+    GrPaint grPaint;
+    if (!SkPaintToGrPaint(this->context(), paint, *draw.fMatrix, &grPaint)) {
+        return;
     }
+
+    SkDEBUGCODE(this->validate();)
+
+    fDrawContext->drawText(fClip, grPaint, paint, *draw.fMatrix,
+                           (const char *)text, byteLength, x, y, draw.fClip->getBounds());
 }
 
-void SkGpuDevice::drawPosText(const SkDraw& draw, const void* text,
-                             size_t byteLength, const SkScalar pos[],
-                             SkScalar constY, int scalarsPerPos,
-                             const SkPaint& paint) {
+void SkGpuDevice::drawPosText(const SkDraw& draw, const void* text, size_t byteLength,
+                              const SkScalar pos[], int scalarsPerPos,
+                              const SkPoint& offset, const SkPaint& paint) {
     GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice::drawPosText", fContext);
-    CHECK_SHOULD_DRAW(draw, false);
+    CHECK_SHOULD_DRAW(draw);
 
-    if (fMainTextContext->canDraw(paint)) {
-        GrPaint grPaint;
-        SkPaint2GrPaintShader(this->context(), paint, true, &grPaint);
-
-        SkDEBUGCODE(this->validate();)
-
-        fMainTextContext->drawPosText(grPaint, paint, (const char *)text, byteLength, pos,
-                                      constY, scalarsPerPos);
-    } else if (fFallbackTextContext && fFallbackTextContext->canDraw(paint)) {
-        GrPaint grPaint;
-        SkPaint2GrPaintShader(this->context(), paint, true, &grPaint);
-
-        SkDEBUGCODE(this->validate();)
-
-        fFallbackTextContext->drawPosText(grPaint, paint, (const char *)text, byteLength, pos,
-                                          constY, scalarsPerPos);
-    } else {
-        draw.drawPosText_asPaths((const char*)text, byteLength, pos, constY,
-                                 scalarsPerPos, paint);
+    GrPaint grPaint;
+    if (!SkPaintToGrPaint(this->context(), paint, *draw.fMatrix, &grPaint)) {
+        return;
     }
+
+    SkDEBUGCODE(this->validate();)
+
+    fDrawContext->drawPosText(fClip, grPaint, paint, *draw.fMatrix,
+                              (const char *)text, byteLength, pos, scalarsPerPos, offset,
+                              draw.fClip->getBounds());
 }
 
-void SkGpuDevice::drawTextOnPath(const SkDraw& draw, const void* text,
-                                size_t len, const SkPath& path,
-                                const SkMatrix* m, const SkPaint& paint) {
-    CHECK_SHOULD_DRAW(draw, false);
+void SkGpuDevice::drawTextBlob(const SkDraw& draw, const SkTextBlob* blob, SkScalar x, SkScalar y,
+                               const SkPaint& paint, SkDrawFilter* drawFilter) {
+    GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice::drawTextBlob", fContext);
+    CHECK_SHOULD_DRAW(draw);
 
-    SkASSERT(draw.fDevice == this);
-    draw.drawTextOnPath((const char*)text, len, path, m, paint);
+    SkDEBUGCODE(this->validate();)
+
+    fDrawContext->drawTextBlob(fClip, paint, *draw.fMatrix,
+                               blob, x, y, drawFilter, draw.fClip->getBounds());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-bool SkGpuDevice::filterTextFlags(const SkPaint& paint, TextFlags* flags) {
-    if (!paint.isLCDRenderText()) {
-        // we're cool with the paint as is
-        return false;
-    }
-
-    if (paint.getShader() ||
-        paint.getXfermode() || // unless its srcover
-        paint.getMaskFilter() ||
-        paint.getRasterizer() ||
-        paint.getColorFilter() ||
-        paint.getPathEffect() ||
-        paint.isFakeBoldText() ||
-        paint.getStyle() != SkPaint::kFill_Style) {
-        // turn off lcd
-        flags->fFlags = paint.getFlags() & ~SkPaint::kLCDRenderText_Flag;
-        flags->fHinting = paint.getHinting();
-        return true;
-    }
-    // we're cool with the paint as is
-    return false;
+bool SkGpuDevice::onShouldDisableLCD(const SkPaint& paint) const {
+    return GrTextContext::ShouldDisableLCD(paint);
 }
 
 void SkGpuDevice::flush() {
     DO_DEFERRED_CLEAR();
-    fContext->resolveRenderTarget(fRenderTarget);
+    fRenderTarget->prepareForExternalIO();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkBaseDevice* SkGpuDevice::onCreateDevice(const SkImageInfo& info, Usage usage) {
-    GrTextureDesc desc;
+SkBaseDevice* SkGpuDevice::onCreateDevice(const CreateInfo& cinfo, const SkPaint*) {
+    GrSurfaceDesc desc;
     desc.fConfig = fRenderTarget->config();
-    desc.fFlags = kRenderTarget_GrTextureFlagBit;
-    desc.fWidth = info.width();
-    desc.fHeight = info.height();
-    desc.fSampleCnt = fRenderTarget->numSamples();
+    desc.fFlags = kRenderTarget_GrSurfaceFlag;
+    desc.fWidth = cinfo.fInfo.width();
+    desc.fHeight = cinfo.fInfo.height();
+    desc.fSampleCnt = fRenderTarget->desc().fSampleCnt;
 
     SkAutoTUnref<GrTexture> texture;
     // Skia's convention is to only clear a device if it is non-opaque.
-    unsigned flags = info.isOpaque() ? 0 : kNeedClear_Flag;
+    InitContents init = cinfo.fInfo.isOpaque() ? kUninit_InitContents : kClear_InitContents;
 
-#if CACHE_COMPATIBLE_DEVICE_TEXTURES
     // layers are never draw in repeat modes, so we can request an approx
     // match and ignore any padding.
-    flags |= kCached_Flag;
-    const GrContext::ScratchTexMatch match = (kSaveLayer_Usage == usage) ?
-                                                GrContext::kApprox_ScratchTexMatch :
-                                                GrContext::kExact_ScratchTexMatch;
-    texture.reset(fContext->lockAndRefScratchTexture(desc, match));
-#else
-    texture.reset(fContext->createUncachedTexture(desc, NULL, 0));
-#endif
-    if (NULL != texture.get()) {
-        return SkGpuDevice::Create(texture, flags);
+    if (kNever_TileUsage == cinfo.fTileUsage) {
+        texture.reset(fContext->textureProvider()->createApproxTexture(desc));
     } else {
-        GrPrintf("---- failed to create compatible device texture [%d %d]\n",
-                 info.width(), info.height());
-        return NULL;
+        texture.reset(fContext->textureProvider()->createTexture(desc, true));
+    }
+
+    if (texture) {
+        SkSurfaceProps props(this->surfaceProps().flags(), cinfo.fPixelGeometry);
+        return SkGpuDevice::Create(
+            texture->asRenderTarget(), cinfo.fInfo.width(), cinfo.fInfo.height(), &props, init);
+    } else {
+        SkErrorInternals::SetError( kInternalError_SkError,
+                                    "---- failed to create gpu device texture [%d %d]\n",
+                                    cinfo.fInfo.width(), cinfo.fInfo.height());
+        return nullptr;
     }
 }
 
-SkSurface* SkGpuDevice::newSurface(const SkImageInfo& info) {
-    return SkSurface::NewRenderTarget(fContext, info, fRenderTarget->numSamples());
+SkSurface* SkGpuDevice::newSurface(const SkImageInfo& info, const SkSurfaceProps& props) {
+    // TODO: Change the signature of newSurface to take a budgeted parameter.
+    static const SkSurface::Budgeted kBudgeted = SkSurface::kNo_Budgeted;
+    return SkSurface::NewRenderTarget(fContext, kBudgeted, info, fRenderTarget->desc().fSampleCnt,
+                                      &props);
 }
 
-void SkGpuDevice::EXPERIMENTAL_optimize(const SkPicture* picture) {
-    fContext->getLayerCache()->processDeletedPictures();
-
-    SkPicture::AccelData::Key key = GPUAccelData::ComputeAccelDataKey();
-
-    const SkPicture::AccelData* existing = picture->EXPERIMENTAL_getAccelData(key);
-    if (NULL != existing) {
-        return;
-    }
-
-    SkAutoTUnref<GPUAccelData> data(SkNEW_ARGS(GPUAccelData, (key)));
-
-    picture->EXPERIMENTAL_addAccelData(data);
-
-    GatherGPUInfo(picture, data);
-
-    fContext->getLayerCache()->trackPicture(picture);
-}
-
-static void wrap_texture(GrTexture* texture, int width, int height, SkBitmap* result) {
-    SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
-    result->setInfo(info);
-    result->setPixelRef(SkNEW_ARGS(SkGrPixelRef, (info, texture)))->unref();
-}
-
-bool SkGpuDevice::EXPERIMENTAL_drawPicture(SkCanvas* canvas, const SkPicture* picture) {
-    fContext->getLayerCache()->processDeletedPictures();
-
-    SkPicture::AccelData::Key key = GPUAccelData::ComputeAccelDataKey();
-
-    const SkPicture::AccelData* data = picture->EXPERIMENTAL_getAccelData(key);
-    if (NULL == data) {
+bool SkGpuDevice::EXPERIMENTAL_drawPicture(SkCanvas* mainCanvas, const SkPicture* mainPicture,
+                                           const SkMatrix* matrix, const SkPaint* paint) {
+#ifndef SK_IGNORE_GPU_LAYER_HOISTING
+    // todo: should handle this natively
+    if (paint) {
         return false;
     }
 
-    const GPUAccelData *gpuData = static_cast<const GPUAccelData*>(data);
-
-    if (0 == gpuData->numSaveLayers()) {
+    const SkBigPicture::AccelData* data = nullptr;
+    if (const SkBigPicture* bp = mainPicture->asSkBigPicture()) {
+        data = bp->accelData();
+    }
+    if (!data) {
         return false;
     }
 
-    SkAutoTArray<bool> pullForward(gpuData->numSaveLayers());
-    for (int i = 0; i < gpuData->numSaveLayers(); ++i) {
-        pullForward[i] = false;
+    const SkLayerInfo *gpuData = static_cast<const SkLayerInfo*>(data);
+    if (0 == gpuData->numBlocks()) {
+        return false;
     }
 
-    SkRect clipBounds;
-    if (!canvas->getClipBounds(&clipBounds)) {
-        return true;
-    }
-    SkIRect query;
-    clipBounds.roundOut(&query);
+    SkTDArray<GrHoistedLayer> atlasedNeedRendering, atlasedRecycled;
 
-    SkAutoTDelete<const SkPicture::OperationList> ops(picture->EXPERIMENTAL_getActiveOps(query));
-
-    // This code pre-renders the entire layer since it will be cached and potentially
-    // reused with different clips (e.g., in different tiles). Because of this the
-    // clip will not be limiting the size of the pre-rendered layer. kSaveLayerMaxSize
-    // is used to limit which clips are pre-rendered.
-    static const int kSaveLayerMaxSize = 256;
-
-    if (NULL != ops.get()) {
-        // In this case the picture has been generated with a BBH so we use
-        // the BBH to limit the pre-rendering to just the layers needed to cover
-        // the region being drawn
-        for (int i = 0; i < ops->numOps(); ++i) {
-            uint32_t offset = ops->offset(i);
-
-            // For now we're saving all the layers in the GPUAccelData so they
-            // can be nested. Additionally, the nested layers appear before
-            // their parent in the list.
-            for (int j = 0 ; j < gpuData->numSaveLayers(); ++j) {
-                const GPUAccelData::SaveLayerInfo& info = gpuData->saveLayerInfo(j);
-
-                if (pullForward[j]) {
-                    continue;            // already pulling forward
-                }
-
-                if (offset < info.fSaveLayerOpID || offset > info.fRestoreOpID) {
-                    continue;            // the op isn't in this range
-                }
-
-                // TODO: once this code is more stable unsuitable layers can
-                // just be omitted during the optimization stage
-                if (!info.fValid ||
-                    kSaveLayerMaxSize < info.fSize.fWidth ||
-                    kSaveLayerMaxSize < info.fSize.fHeight ||
-                    info.fIsNested) {
-                    continue;            // this layer is unsuitable
-                }
-
-                pullForward[j] = true;
-            }
-        }
-    } else {
-        // In this case there is no BBH associated with the picture. Pre-render
-        // all the layers that intersect the drawn region
-        for (int j = 0; j < gpuData->numSaveLayers(); ++j) {
-            const GPUAccelData::SaveLayerInfo& info = gpuData->saveLayerInfo(j);
-
-            SkIRect layerRect = SkIRect::MakeXYWH(info.fOffset.fX,
-                                                  info.fOffset.fY,
-                                                  info.fSize.fWidth,
-                                                  info.fSize.fHeight);
-
-            if (!SkIRect::Intersects(query, layerRect)) {
-                continue;
-            }
-
-            // TODO: once this code is more stable unsuitable layers can
-            // just be omitted during the optimization stage
-            if (!info.fValid ||
-                kSaveLayerMaxSize < info.fSize.fWidth ||
-                kSaveLayerMaxSize < info.fSize.fHeight ||
-                info.fIsNested) {
-                continue;
-            }
-
-            pullForward[j] = true;
-        }
+    SkIRect iBounds;
+    if (!mainCanvas->getClipDeviceBounds(&iBounds)) {
+        return false;
     }
 
-    SkPictureReplacementPlayback::PlaybackReplacements replacements;
+    SkRect clipBounds = SkRect::Make(iBounds);
 
-    // Generate the layer and/or ensure it is locked
-    for (int i = 0; i < gpuData->numSaveLayers(); ++i) {
-        if (pullForward[i]) {
-            GrCachedLayer* layer = fContext->getLayerCache()->findLayerOrCreate(picture, i);
+    SkMatrix initialMatrix = mainCanvas->getTotalMatrix();
 
-            const GPUAccelData::SaveLayerInfo& info = gpuData->saveLayerInfo(i);
+    GrLayerHoister::Begin(fContext);
 
-            SkPictureReplacementPlayback::PlaybackReplacements::ReplacementInfo* layerInfo =
-                                                                        replacements.push();
-            layerInfo->fStart = info.fSaveLayerOpID;
-            layerInfo->fStop = info.fRestoreOpID;
-            layerInfo->fPos = info.fOffset;
+    GrLayerHoister::FindLayersToAtlas(fContext, mainPicture,
+                                      initialMatrix,
+                                      clipBounds,
+                                      &atlasedNeedRendering, &atlasedRecycled,
+                                      fRenderTarget->numColorSamples());
 
-            GrTextureDesc desc;
-            desc.fFlags = kRenderTarget_GrTextureFlagBit;
-            desc.fWidth = info.fSize.fWidth;
-            desc.fHeight = info.fSize.fHeight;
-            desc.fConfig = kSkia8888_GrPixelConfig;
-            // TODO: need to deal with sample count
+    GrLayerHoister::DrawLayersToAtlas(fContext, atlasedNeedRendering);
 
-            bool needsRendering = !fContext->getLayerCache()->lock(layer, desc);
-            if (NULL == layer->texture()) {
-                continue;
-            }
+    SkTDArray<GrHoistedLayer> needRendering, recycled;
 
-            layerInfo->fBM = SkNEW(SkBitmap);  // fBM is allocated so ReplacementInfo can be POD
-            wrap_texture(layer->texture(), 
-                         !layer->isAtlased() ? desc.fWidth : layer->texture()->width(),
-                         !layer->isAtlased() ? desc.fHeight : layer->texture()->height(),
-                         layerInfo->fBM);
+    SkAutoCanvasMatrixPaint acmp(mainCanvas, matrix, paint, mainPicture->cullRect());
 
-            SkASSERT(info.fPaint);
-            layerInfo->fPaint = info.fPaint;
+    GrLayerHoister::FindLayersToHoist(fContext, mainPicture,
+                                      initialMatrix,
+                                      clipBounds,
+                                      &needRendering, &recycled,
+                                      fRenderTarget->numColorSamples());
 
-            layerInfo->fSrcRect = SkIRect::MakeXYWH(layer->rect().fLeft,
-                                                    layer->rect().fTop,
-                                                    layer->rect().width(),
-                                                    layer->rect().height());
+    GrLayerHoister::DrawLayers(fContext, needRendering);
 
+    // Render the entire picture using new layers
+    GrRecordReplaceDraw(mainPicture, mainCanvas, fContext->getLayerCache(),
+                        initialMatrix, nullptr);
 
-            if (needsRendering) {
-                SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTargetDirect(
-                                                    layer->texture()->asRenderTarget(),
-                                                    SkSurface::kStandard_TextRenderMode,
-                                                    SkSurface::kDontClear_RenderTargetFlag));
-
-                SkCanvas* canvas = surface->getCanvas();
-
-                // Add a rect clip to make sure the rendering doesn't
-                // extend beyond the boundaries of the atlased sub-rect
-                SkRect bound = SkRect::Make(layerInfo->fSrcRect);
-                canvas->clipRect(bound);
-
-                if (layer->isAtlased()) {
-                    // Since 'clear' doesn't respect the clip we need to draw a rect
-                    // TODO: ensure none of the atlased layers contain a clear call!
-                    SkPaint paint;
-                    paint.setColor(SK_ColorTRANSPARENT);
-                    canvas->drawRect(bound, paint);
-                } else {
-                    canvas->clear(SK_ColorTRANSPARENT);
-                }
-
-                // info.fCTM maps the layer's top/left to the origin.
-                // If this layer is atlased the top/left corner needs
-                // to be offset to some arbitrary location in the backing 
-                // texture.
-                canvas->translate(bound.fLeft, bound.fTop);
-                canvas->concat(info.fCTM);
-
-                SkPictureRangePlayback rangePlayback(picture,
-                                                     info.fSaveLayerOpID, 
-                                                     info.fRestoreOpID);
-                rangePlayback.draw(canvas, NULL);
-
-                canvas->flush();
-            }
-        }
-    }
-
-    // Playback using new layers
-    SkPictureReplacementPlayback playback(picture, &replacements, ops.get());
-
-    playback.draw(canvas, NULL);
-
-    // unlock the layers
-    for (int i = 0; i < gpuData->numSaveLayers(); ++i) {
-        GrCachedLayer* layer = fContext->getLayerCache()->findLayer(picture, i);
-        fContext->getLayerCache()->unlock(layer);
-    }
+    GrLayerHoister::UnlockLayers(fContext, needRendering);
+    GrLayerHoister::UnlockLayers(fContext, recycled);
+    GrLayerHoister::UnlockLayers(fContext, atlasedNeedRendering);
+    GrLayerHoister::UnlockLayers(fContext, atlasedRecycled);
+    GrLayerHoister::End(fContext);
 
     return true;
+#else
+    return false;
+#endif
 }
+
+SkImageFilter::Cache* SkGpuDevice::NewImageFilterCache() {
+    return SkImageFilter::Cache::Create(kDefaultImageFilterCacheSize);
+}
+
+SkImageFilter::Cache* SkGpuDevice::getImageFilterCache() {
+    // We always return a transient cache, so it is freed after each
+    // filter traversal.
+    return SkGpuDevice::NewImageFilterCache();
+}
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/SkGpuDevice.h b/gfx/skia/skia/src/gpu/SkGpuDevice.h
new file mode 100644
index 000000000000..5bf074d12033
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/SkGpuDevice.h
@@ -0,0 +1,259 @@
+
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkGpuDevice_DEFINED
+#define SkGpuDevice_DEFINED
+
+#include "SkGr.h"
+#include "SkBitmap.h"
+#include "SkDevice.h"
+#include "SkPicture.h"
+#include "SkRegion.h"
+#include "SkSurface.h"
+#include "GrContext.h"
+#include "GrSurfacePriv.h"
+
+class GrAccelData;
+class GrTextureProducer;
+struct GrCachedLayer;
+
+/**
+ *  Subclass of SkBaseDevice, which directs all drawing to the GrGpu owned by the
+ *  canvas.
+ */
+class SK_API SkGpuDevice : public SkBaseDevice {
+public:
+    enum InitContents {
+        kClear_InitContents,
+        kUninit_InitContents
+    };
+
+    /**
+     * Creates an SkGpuDevice from a GrRenderTarget.
+     */
+    static SkGpuDevice* Create(GrRenderTarget* target, const SkSurfaceProps*, InitContents);
+
+    /**
+     * Creates an SkGpuDevice from a GrRenderTarget whose texture width/height is
+     * different than its actual width/height (e.g., approx-match scratch texture).
+     */
+    static SkGpuDevice* Create(GrRenderTarget* target, int width, int height,
+                               const SkSurfaceProps*, InitContents);
+
+    /**
+     * New device that will create an offscreen renderTarget based on the ImageInfo and
+     * sampleCount. The Budgeted param controls whether the device's backing store counts against
+     * the resource cache budget. On failure, returns nullptr.
+     */
+    static SkGpuDevice* Create(GrContext*, SkSurface::Budgeted, const SkImageInfo&,
+                               int sampleCount, const SkSurfaceProps*, InitContents);
+
+    virtual ~SkGpuDevice();
+
+    SkGpuDevice* cloneDevice(const SkSurfaceProps& props) {
+        SkBaseDevice* dev = this->onCreateDevice(CreateInfo(this->imageInfo(), kPossible_TileUsage,
+                                                            props.pixelGeometry()),
+                                                 nullptr);
+        return static_cast<SkGpuDevice*>(dev);
+    }
+
+    GrContext* context() const { return fContext; }
+
+    // set all pixels to 0
+    void clearAll();
+
+    void replaceRenderTarget(bool shouldRetainContent);
+
+    GrRenderTarget* accessRenderTarget() override;
+
+    SkImageInfo imageInfo() const override {
+        return fLegacyBitmap.info();
+    }
+
+    void drawPaint(const SkDraw&, const SkPaint& paint) override;
+    virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode, size_t count,
+                            const SkPoint[], const SkPaint& paint) override;
+    virtual void drawRect(const SkDraw&, const SkRect& r,
+                          const SkPaint& paint) override;
+    virtual void drawRRect(const SkDraw&, const SkRRect& r,
+                           const SkPaint& paint) override;
+    virtual void drawDRRect(const SkDraw& draw, const SkRRect& outer,
+                            const SkRRect& inner, const SkPaint& paint) override;
+    virtual void drawOval(const SkDraw&, const SkRect& oval,
+                          const SkPaint& paint) override;
+    virtual void drawPath(const SkDraw&, const SkPath& path,
+                          const SkPaint& paint, const SkMatrix* prePathMatrix,
+                          bool pathIsMutable) override;
+    virtual void drawBitmap(const SkDraw&, const SkBitmap& bitmap,
+                            const SkMatrix&, const SkPaint&) override;
+    virtual void drawBitmapRect(const SkDraw&, const SkBitmap&,
+                                const SkRect* srcOrNull, const SkRect& dst,
+                                const SkPaint& paint, SkCanvas::SrcRectConstraint) override;
+    virtual void drawSprite(const SkDraw&, const SkBitmap& bitmap,
+                            int x, int y, const SkPaint& paint) override;
+    virtual void drawText(const SkDraw&, const void* text, size_t len,
+                          SkScalar x, SkScalar y, const SkPaint&) override;
+    virtual void drawPosText(const SkDraw&, const void* text, size_t len,
+                             const SkScalar pos[], int scalarsPerPos,
+                             const SkPoint& offset, const SkPaint&) override;
+    virtual void drawTextBlob(const SkDraw&, const SkTextBlob*, SkScalar x, SkScalar y,
+                              const SkPaint& paint, SkDrawFilter* drawFilter) override;
+    virtual void drawVertices(const SkDraw&, SkCanvas::VertexMode, int vertexCount,
+                              const SkPoint verts[], const SkPoint texs[],
+                              const SkColor colors[], SkXfermode* xmode,
+                              const uint16_t indices[], int indexCount,
+                              const SkPaint&) override;
+    void drawAtlas(const SkDraw&, const SkImage* atlas, const SkRSXform[], const SkRect[],
+                       const SkColor[], int count, SkXfermode::Mode, const SkPaint&) override;
+    virtual void drawDevice(const SkDraw&, SkBaseDevice*, int x, int y,
+                            const SkPaint&) override;
+    void drawImage(const SkDraw&, const SkImage*, SkScalar x, SkScalar y, const SkPaint&) override;
+    void drawImageRect(const SkDraw&, const SkImage*, const SkRect* src, const SkRect& dst,
+                       const SkPaint&, SkCanvas::SrcRectConstraint) override;
+
+    void drawImageNine(const SkDraw& draw, const SkImage* image, const SkIRect& center,
+                       const SkRect& dst, const SkPaint& paint) override;
+    void drawBitmapNine(const SkDraw& draw, const SkBitmap& bitmap, const SkIRect& center,
+                        const SkRect& dst, const SkPaint& paint) override;
+
+    void flush() override;
+
+    void onAttachToCanvas(SkCanvas* canvas) override;
+    void onDetachFromCanvas() override;
+
+    const SkBitmap& onAccessBitmap() override;
+    bool onAccessPixels(SkPixmap*) override;
+
+    bool canHandleImageFilter(const SkImageFilter*) override;
+    virtual bool filterImage(const SkImageFilter*, const SkBitmap&,
+                             const SkImageFilter::Context&,
+                             SkBitmap*, SkIPoint*) override;
+
+    bool filterTexture(GrContext*, GrTexture*, int width, int height, const SkImageFilter*,
+                       const SkImageFilter::Context&,
+                       SkBitmap* result, SkIPoint* offset);
+
+    static SkImageFilter::Cache* NewImageFilterCache();
+
+protected:
+    bool onReadPixels(const SkImageInfo&, void*, size_t, int, int) override;
+    bool onWritePixels(const SkImageInfo&, const void*, size_t, int, int) override;
+    bool onShouldDisableLCD(const SkPaint&) const final;
+
+    /**  PRIVATE / EXPERIMENTAL -- do not call */
+    virtual bool EXPERIMENTAL_drawPicture(SkCanvas* canvas, const SkPicture* picture,
+                                          const SkMatrix*, const SkPaint*) override;
+
+private:
+    GrContext*                      fContext;
+    SkAutoTUnref<const SkClipStack> fClipStack;
+    SkIPoint                        fClipOrigin;
+    GrClip                          fClip;
+    SkAutoTUnref<GrDrawContext>     fDrawContext;
+    GrRenderTarget*                 fRenderTarget;
+    // remove when our clients don't rely on accessBitmap()
+    SkBitmap                        fLegacyBitmap;
+    bool                            fNeedClear;
+    bool                            fOpaque;
+
+    enum Flags {
+        kNeedClear_Flag = 1 << 0,  //!< Surface requires an initial clear
+        kIsOpaque_Flag  = 1 << 1,  //!< Hint from client that rendering to this device will be
+                                   //   opaque even if the config supports alpha.
+    };
+    static bool CheckAlphaTypeAndGetFlags(const SkImageInfo* info, InitContents init,
+                                          unsigned* flags);
+
+    SkGpuDevice(GrRenderTarget*, int width, int height, const SkSurfaceProps*, unsigned flags);
+
+    SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) override;
+
+    SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&) override;
+
+    SkImageFilter::Cache* getImageFilterCache() override;
+
+    bool forceConservativeRasterClip() const override { return true; }
+
+    // sets the render target and clip on context
+    void prepareDraw(const SkDraw&);
+
+    /**
+     * Helper functions called by drawBitmapCommon. By the time these are called the SkDraw's
+     * matrix, clip, and the device's render target has already been set on GrContext.
+     */
+
+    // The tileSize and clippedSrcRect will be valid only if true is returned.
+    bool shouldTileImageID(uint32_t imageID, const SkIRect& imageRect,
+                           const SkMatrix& viewMatrix,
+                           const GrTextureParams& params,
+                           const SkRect* srcRectPtr,
+                           int maxTileSize,
+                           int* tileSize,
+                           SkIRect* clippedSubset) const;
+    bool shouldTileBitmap(const SkBitmap& bitmap,
+                          const SkMatrix& viewMatrix,
+                          const GrTextureParams& sampler,
+                          const SkRect* srcRectPtr,
+                          int maxTileSize,
+                          int* tileSize,
+                          SkIRect* clippedSrcRect) const;
+    // Just returns the predicate, not the out-tileSize or out-clippedSubset, as they are not
+    // needed at the moment.
+    bool shouldTileImage(const SkImage* image, const SkRect* srcRectPtr,
+                         SkCanvas::SrcRectConstraint constraint, SkFilterQuality quality,
+                         const SkMatrix& viewMatrix) const;
+
+    void internalDrawBitmap(const SkBitmap&,
+                            const SkMatrix& viewMatrix,
+                            const SkRect&,
+                            const GrTextureParams& params,
+                            const SkPaint& paint,
+                            SkCanvas::SrcRectConstraint,
+                            bool bicubic,
+                            bool needsTextureDomain);
+
+    void drawTiledBitmap(const SkBitmap& bitmap,
+                         const SkMatrix& viewMatrix,
+                         const SkRect& srcRect,
+                         const SkIRect& clippedSrcRect,
+                         const GrTextureParams& params,
+                         const SkPaint& paint,
+                         SkCanvas::SrcRectConstraint,
+                         int tileSize,
+                         bool bicubic);
+
+    void drawTextureProducer(GrTextureProducer*,
+                             bool alphaOnly,
+                             const SkRect* srcRect,
+                             const SkRect* dstRect,
+                             SkCanvas::SrcRectConstraint,
+                             const SkMatrix& viewMatrix,
+                             const GrClip&,
+                             const SkPaint&);
+
+    void drawTextureProducerImpl(GrTextureProducer*,
+                                 bool alphaOnly,
+                                 const SkRect& clippedSrcRect,
+                                 const SkRect& clippedDstRect,
+                                 SkCanvas::SrcRectConstraint,
+                                 const SkMatrix& viewMatrix,
+                                 const SkMatrix& srcToDstMatrix,
+                                 const GrClip&,
+                                 const SkPaint&);
+
+    bool drawDashLine(const SkPoint pts[2], const SkPaint& paint);
+
+    static GrRenderTarget* CreateRenderTarget(GrContext*, SkSurface::Budgeted, const SkImageInfo&,
+                                              int sampleCount);
+
+    friend class GrAtlasTextContext;
+    friend class SkSurface_Gpu;      // for access to surfaceProps
+    typedef SkBaseDevice INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/SkGpuDevice_drawTexture.cpp b/gfx/skia/skia/src/gpu/SkGpuDevice_drawTexture.cpp
new file mode 100644
index 000000000000..0b1d3f1f08af
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/SkGpuDevice_drawTexture.cpp
@@ -0,0 +1,240 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkGpuDevice.h"
+
+#include "GrBlurUtils.h"
+#include "GrCaps.h"
+#include "GrDrawContext.h"
+#include "GrStrokeInfo.h"
+#include "GrTextureParamsAdjuster.h"
+#include "SkDraw.h"
+#include "SkGrPriv.h"
+#include "SkMaskFilter.h"
+#include "effects/GrBicubicEffect.h"
+#include "effects/GrSimpleTextureEffect.h"
+#include "effects/GrTextureDomain.h"
+
+static inline bool use_shader(bool textureIsAlphaOnly, const SkPaint& paint) {
+    return textureIsAlphaOnly && paint.getShader();
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//  Helper functions for dropping src rect constraint in bilerp mode.
+
+static const SkScalar kColorBleedTolerance = 0.001f;
+
+static bool has_aligned_samples(const SkRect& srcRect, const SkRect& transformedRect) {
+    // detect pixel disalignment
+    if (SkScalarAbs(SkScalarRoundToScalar(transformedRect.left()) - transformedRect.left()) < kColorBleedTolerance &&
+        SkScalarAbs(SkScalarRoundToScalar(transformedRect.top())  - transformedRect.top())  < kColorBleedTolerance &&
+        SkScalarAbs(transformedRect.width()  - srcRect.width())  < kColorBleedTolerance &&
+        SkScalarAbs(transformedRect.height() - srcRect.height()) < kColorBleedTolerance) {
+        return true;
+    }
+    return false;
+}
+
+static bool may_color_bleed(const SkRect& srcRect,
+                            const SkRect& transformedRect,
+                            const SkMatrix& m,
+                            bool isMSAA) {
+    // Only gets called if has_aligned_samples returned false.
+    // So we can assume that sampling is axis aligned but not texel aligned.
+    SkASSERT(!has_aligned_samples(srcRect, transformedRect));
+    SkRect innerSrcRect(srcRect), innerTransformedRect, outerTransformedRect(transformedRect);
+    if (isMSAA) {
+        innerSrcRect.inset(SK_Scalar1, SK_Scalar1);
+    } else {
+        innerSrcRect.inset(SK_ScalarHalf, SK_ScalarHalf);
+    }
+    m.mapRect(&innerTransformedRect, innerSrcRect);
+
+    // The gap between outerTransformedRect and innerTransformedRect
+    // represents the projection of the source border area, which is
+    // problematic for color bleeding.  We must check whether any
+    // destination pixels sample the border area.
+    outerTransformedRect.inset(kColorBleedTolerance, kColorBleedTolerance);
+    innerTransformedRect.outset(kColorBleedTolerance, kColorBleedTolerance);
+    SkIRect outer, inner;
+    outerTransformedRect.round(&outer);
+    innerTransformedRect.round(&inner);
+    // If the inner and outer rects round to the same result, it means the
+    // border does not overlap any pixel centers. Yay!
+    return inner != outer;
+}
+
+static bool can_ignore_bilerp_constraint(const GrTextureProducer& producer,
+                                         const SkRect& srcRect,
+                                         const SkMatrix& srcRectToDeviceSpace,
+                                         bool isMSAA) {
+    if (srcRectToDeviceSpace.rectStaysRect()) {
+        // sampling is axis-aligned
+        SkRect transformedRect;
+        srcRectToDeviceSpace.mapRect(&transformedRect, srcRect);
+
+        if (has_aligned_samples(srcRect, transformedRect) ||
+            !may_color_bleed(srcRect, transformedRect, srcRectToDeviceSpace, isMSAA)) {
+            return true;
+        }
+    }
+    return false;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+void SkGpuDevice::drawTextureProducer(GrTextureProducer* producer,
+                                      bool alphaOnly,
+                                      const SkRect* srcRect,
+                                      const SkRect* dstRect,
+                                      SkCanvas::SrcRectConstraint constraint,
+                                      const SkMatrix& viewMatrix,
+                                      const GrClip& clip,
+                                      const SkPaint& paint) {
+    // Figure out the actual dst and src rect by clipping the src rect to the bounds of the
+    // adjuster. If the src rect is clipped then the dst rect must be recomputed. Also determine
+    // the matrix that maps the src rect to the dst rect.
+    SkRect clippedSrcRect;
+    SkRect clippedDstRect;
+    const SkRect srcBounds = SkRect::MakeIWH(producer->width(), producer->height());
+    SkMatrix srcToDstMatrix;
+    if (srcRect) {
+        if (!dstRect) {
+            dstRect = &srcBounds;
+        }
+        if (!srcBounds.contains(*srcRect)) {
+            clippedSrcRect = *srcRect;
+            if (!clippedSrcRect.intersect(srcBounds)) {
+                return;
+            }
+            if (!srcToDstMatrix.setRectToRect(*srcRect, *dstRect, SkMatrix::kFill_ScaleToFit)) {
+                return;
+            }
+            srcToDstMatrix.mapRect(&clippedDstRect, clippedSrcRect);
+        } else {
+            clippedSrcRect = *srcRect;
+            clippedDstRect = *dstRect;
+            if (!srcToDstMatrix.setRectToRect(*srcRect, *dstRect, SkMatrix::kFill_ScaleToFit)) {
+                return;
+            }
+        }
+    } else {
+        clippedSrcRect = srcBounds;
+        if (dstRect) {
+            clippedDstRect = *dstRect;
+            if (!srcToDstMatrix.setRectToRect(srcBounds, *dstRect, SkMatrix::kFill_ScaleToFit)) {
+                return;
+            }
+        } else {
+            clippedDstRect = srcBounds;
+            srcToDstMatrix.reset();
+        }
+    }
+
+    this->drawTextureProducerImpl(producer, alphaOnly, clippedSrcRect, clippedDstRect, constraint,
+                                  viewMatrix, srcToDstMatrix, clip, paint);
+}
+
+void SkGpuDevice::drawTextureProducerImpl(GrTextureProducer* producer,
+                                          bool alphaTexture,
+                                          const SkRect& clippedSrcRect,
+                                          const SkRect& clippedDstRect,
+                                          SkCanvas::SrcRectConstraint constraint,
+                                          const SkMatrix& viewMatrix,
+                                          const SkMatrix& srcToDstMatrix,
+                                          const GrClip& clip,
+                                          const SkPaint& paint) {
+    // Specifying the texture coords as local coordinates is an attempt to enable more batching
+    // by not baking anything about the srcRect, dstRect, or viewMatrix, into the texture FP. In
+    // the future this should be an opaque optimization enabled by the combination of batch/GP and
+    // FP.
+    const SkMaskFilter* mf = paint.getMaskFilter();
+    // The shader expects proper local coords, so we can't replace local coords with texture coords
+    // if the shader will be used. If we have a mask filter we will change the underlying geometry
+    // that is rendered.
+    bool canUseTextureCoordsAsLocalCoords = !use_shader(alphaTexture, paint) && !mf;
+
+    bool doBicubic;
+    GrTextureParams::FilterMode fm =
+        GrSkFilterQualityToGrFilterMode(paint.getFilterQuality(), viewMatrix, srcToDstMatrix,
+                                        &doBicubic);
+    const GrTextureParams::FilterMode* filterMode = doBicubic ? nullptr : &fm;
+
+    GrTextureAdjuster::FilterConstraint constraintMode;
+    if (SkCanvas::kFast_SrcRectConstraint == constraint) {
+        constraintMode = GrTextureAdjuster::kNo_FilterConstraint;
+    } else {
+        constraintMode = GrTextureAdjuster::kYes_FilterConstraint;
+    }
+    
+    // If we have to outset for AA then we will generate texture coords outside the src rect. The
+    // same happens for any mask filter that extends the bounds rendered in the dst.
+    // This is conservative as a mask filter does not have to expand the bounds rendered.
+    bool coordsAllInsideSrcRect = !paint.isAntiAlias() && !mf;
+
+    // Check for optimization to drop the src rect constraint when on bilerp.
+    if (filterMode && GrTextureParams::kBilerp_FilterMode == *filterMode &&
+        GrTextureAdjuster::kYes_FilterConstraint == constraintMode && coordsAllInsideSrcRect) {
+        SkMatrix combinedMatrix;
+        combinedMatrix.setConcat(viewMatrix, srcToDstMatrix);
+        if (can_ignore_bilerp_constraint(*producer, clippedSrcRect, combinedMatrix,
+                                         fRenderTarget->isUnifiedMultisampled())) {
+            constraintMode = GrTextureAdjuster::kNo_FilterConstraint;
+        }
+    }
+
+    const SkMatrix* textureMatrix;
+    SkMatrix tempMatrix;
+    if (canUseTextureCoordsAsLocalCoords) {
+        textureMatrix = &SkMatrix::I();
+    } else {
+        if (!srcToDstMatrix.invert(&tempMatrix)) {
+            return;
+        }
+        textureMatrix = &tempMatrix;
+    }
+    SkAutoTUnref<const GrFragmentProcessor> fp(producer->createFragmentProcessor(
+        *textureMatrix, clippedSrcRect, constraintMode, coordsAllInsideSrcRect, filterMode));
+    if (!fp) {
+        return;
+    }
+
+    GrPaint grPaint;
+    if (!SkPaintToGrPaintWithTexture(fContext, paint, viewMatrix, fp, alphaTexture, &grPaint)) {
+        return;
+    }
+
+    if (canUseTextureCoordsAsLocalCoords) {
+        fDrawContext->fillRectToRect(clip, grPaint, viewMatrix, clippedDstRect, clippedSrcRect);
+        return;
+    }
+
+    if (!mf) {
+        fDrawContext->drawRect(clip, grPaint, viewMatrix, clippedDstRect);
+        return;
+    }
+
+    // First see if we can do the draw + mask filter direct to the dst.
+    SkStrokeRec rec(SkStrokeRec::kFill_InitStyle);
+    SkRRect rrect;
+    rrect.setRect(clippedDstRect);
+    if (mf->directFilterRRectMaskGPU(fContext->textureProvider(),
+                                      fDrawContext,
+                                      &grPaint,
+                                      clip,
+                                      viewMatrix,
+                                      rec,
+                                      rrect)) {
+        return;
+    }
+    SkPath rectPath;
+    rectPath.addRect(clippedDstRect);
+    rectPath.setIsVolatile(true);
+    GrBlurUtils::drawPathWithMaskFilter(this->context(), fDrawContext, fClip,
+                                        rectPath, &grPaint, viewMatrix, mf, paint.getPathEffect(),
+                                        GrStrokeInfo::FillInfo(), true);
+}
diff --git a/gfx/skia/skia/src/gpu/SkGr.cpp b/gfx/skia/skia/src/gpu/SkGr.cpp
index 5c0464da20ac..954bb8085242 100644
--- a/gfx/skia/skia/src/gpu/SkGr.cpp
+++ b/gfx/skia/skia/src/gpu/SkGr.cpp
@@ -5,16 +5,33 @@
  * found in the LICENSE file.
  */
 
+
 #include "SkGr.h"
+
+#include "GrCaps.h"
+#include "GrContext.h"
+#include "GrTextureParamsAdjuster.h"
+#include "GrGpuResourcePriv.h"
+#include "GrImageIDTextureAdjuster.h"
+#include "GrXferProcessor.h"
+#include "GrYUVProvider.h"
+
 #include "SkColorFilter.h"
 #include "SkConfig8888.h"
+#include "SkCanvas.h"
 #include "SkData.h"
+#include "SkErrorInternals.h"
+#include "SkGrPixelRef.h"
 #include "SkMessageBus.h"
 #include "SkPixelRef.h"
-#include "GrResourceCache.h"
-#include "GrGpu.h"
+#include "SkResourceCache.h"
+#include "SkTextureCompressor.h"
+#include "SkYUVPlanesCache.h"
+#include "effects/GrBicubicEffect.h"
+#include "effects/GrConstColorProcessor.h"
 #include "effects/GrDitherEffect.h"
-#include "GrDrawTargetCaps.h"
+#include "effects/GrPorterDuffXferProcessor.h"
+#include "effects/GrXfermodeFragmentProcessor.h"
 #include "effects/GrYUVtoRGBEffect.h"
 
 #ifndef SK_IGNORE_ETC1_SUPPORT
@@ -22,18 +39,86 @@
 #  include "etc1.h"
 #endif
 
-/*  Fill out buffer with the compressed format Ganesh expects from a colortable
- based bitmap. [palette (colortable) + indices].
+GrSurfaceDesc GrImageInfoToSurfaceDesc(const SkImageInfo& info) {
+    GrSurfaceDesc desc;
+    desc.fFlags = kNone_GrSurfaceFlags;
+    desc.fWidth = info.width();
+    desc.fHeight = info.height();
+    desc.fConfig = SkImageInfo2GrPixelConfig(info);
+    desc.fSampleCnt = 0;
+    return desc;
+}
 
- At the moment Ganesh only supports 8bit version. If Ganesh allowed we others
- we could detect that the colortable.count is <= 16, and then repack the
- indices as nibbles to save RAM, but it would take more time (i.e. a lot
- slower than memcpy), so skipping that for now.
+void GrMakeKeyFromImageID(GrUniqueKey* key, uint32_t imageID, const SkIRect& imageBounds) {
+    SkASSERT(key);
+    SkASSERT(imageID);
+    SkASSERT(!imageBounds.isEmpty());
+    static const GrUniqueKey::Domain kImageIDDomain = GrUniqueKey::GenerateDomain();
+    GrUniqueKey::Builder builder(key, kImageIDDomain, 5);
+    builder[0] = imageID;
+    builder[1] = imageBounds.fLeft;
+    builder[2] = imageBounds.fTop;
+    builder[3] = imageBounds.fRight;
+    builder[4] = imageBounds.fBottom;
+}
 
- Ganesh wants a full 256 palette entry, even though Skia's ctable is only as big
- as the colortable.count says it is.
+GrPixelConfig GrIsCompressedTextureDataSupported(GrContext* ctx, SkData* data,
+                                                 int expectedW, int expectedH,
+                                                 const void** outStartOfDataToUpload) {
+    *outStartOfDataToUpload = nullptr;
+#ifndef SK_IGNORE_ETC1_SUPPORT
+    if (!ctx->caps()->isConfigTexturable(kETC1_GrPixelConfig)) {
+        return kUnknown_GrPixelConfig;
+    }
+
+    const uint8_t* bytes = data->bytes();
+    if (data->size() > ETC_PKM_HEADER_SIZE && etc1_pkm_is_valid(bytes)) {
+        // Does the data match the dimensions of the bitmap? If not,
+        // then we don't know how to scale the image to match it...
+        if (etc1_pkm_get_width(bytes) != (unsigned)expectedW ||
+            etc1_pkm_get_height(bytes) != (unsigned)expectedH)
+        {
+            return kUnknown_GrPixelConfig;
+        }
+
+        *outStartOfDataToUpload = bytes + ETC_PKM_HEADER_SIZE;
+        return kETC1_GrPixelConfig;
+    } else if (SkKTXFile::is_ktx(bytes)) {
+        SkKTXFile ktx(data);
+
+        // Is it actually an ETC1 texture?
+        if (!ktx.isCompressedFormat(SkTextureCompressor::kETC1_Format)) {
+            return kUnknown_GrPixelConfig;
+        }
+
+        // Does the data match the dimensions of the bitmap? If not,
+        // then we don't know how to scale the image to match it...
+        if (ktx.width() != expectedW || ktx.height() != expectedH) {
+            return kUnknown_GrPixelConfig;
+        }
+
+        *outStartOfDataToUpload = ktx.pixelData();
+        return kETC1_GrPixelConfig;
+    }
+#endif
+    return kUnknown_GrPixelConfig;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Fill out buffer with the compressed format Ganesh expects from a colortable
+ * based bitmap. [palette (colortable) + indices].
+ *
+ * At the moment Ganesh only supports 8bit version. If Ganesh allowed we others
+ * we could detect that the colortable.count is <= 16, and then repack the
+ * indices as nibbles to save RAM, but it would take more time (i.e. a lot
+ * slower than memcpy), so skipping that for now.
+ *
+ * Ganesh wants a full 256 palette entry, even though Skia's ctable is only as big
+ * as the colortable.count says it is.
  */
-static void build_compressed_data(void* buffer, const SkBitmap& bitmap) {
+static void build_index8_data(void* buffer, const SkBitmap& bitmap) {
     SkASSERT(kIndex_8_SkColorType == bitmap.colorType());
 
     SkAutoLockPixels alp(bitmap);
@@ -56,15 +141,13 @@ static void build_compressed_data(void* buffer, const SkBitmap& bitmap) {
     SkSrcPixelInfo srcPI;
     srcPI.fColorType = kN32_SkColorType;
     srcPI.fAlphaType = kPremul_SkAlphaType;
-    srcPI.fPixels = ctable->lockColors();
+    srcPI.fPixels = ctable->readColors();
     srcPI.fRowBytes = count * sizeof(SkPMColor);
 
     srcPI.convertPixelsTo(&dstPI, count, 1);
 
-    ctable->unlockColors();
-
     // always skip a full 256 number of entries, even if we memcpy'd fewer
-    dst += kGrColorTableSize;
+    dst += 256 * sizeof(GrColor);
 
     if ((unsigned)bitmap.width() == bitmap.rowBytes()) {
         memcpy(dst, bitmap.getPixels(), bitmap.getSize());
@@ -81,374 +164,140 @@ static void build_compressed_data(void* buffer, const SkBitmap& bitmap) {
     }
 }
 
-////////////////////////////////////////////////////////////////////////////////
+/**
+ *  Once we have made SkImages handle all lazy/deferred/generated content, the YUV apis will
+ *  be gone from SkPixelRef, and we can remove this subclass entirely.
+ */
+class PixelRef_GrYUVProvider : public GrYUVProvider {
+    SkPixelRef* fPR;
 
-static void generate_bitmap_cache_id(const SkBitmap& bitmap, GrCacheID* id) {
-    // Our id includes the offset, width, and height so that bitmaps created by extractSubset()
-    // are unique.
-    uint32_t genID = bitmap.getGenerationID();
-    SkIPoint origin = bitmap.pixelRefOrigin();
-    int16_t width = SkToS16(bitmap.width());
-    int16_t height = SkToS16(bitmap.height());
-
-    GrCacheID::Key key;
-    memcpy(key.fData8 +  0, &genID,     4);
-    memcpy(key.fData8 +  4, &origin.fX, 4);
-    memcpy(key.fData8 +  8, &origin.fY, 4);
-    memcpy(key.fData8 + 12, &width,     2);
-    memcpy(key.fData8 + 14, &height,    2);
-    static const size_t kKeyDataSize = 16;
-    memset(key.fData8 + kKeyDataSize, 0, sizeof(key) - kKeyDataSize);
-    GR_STATIC_ASSERT(sizeof(key) >= kKeyDataSize);
-    static const GrCacheID::Domain gBitmapTextureDomain = GrCacheID::GenerateDomain();
-    id->reset(gBitmapTextureDomain, key);
-}
-
-static void generate_bitmap_texture_desc(const SkBitmap& bitmap, GrTextureDesc* desc) {
-    desc->fFlags = kNone_GrTextureFlags;
-    desc->fWidth = bitmap.width();
-    desc->fHeight = bitmap.height();
-    desc->fConfig = SkImageInfo2GrPixelConfig(bitmap.info());
-    desc->fSampleCnt = 0;
-}
-
-namespace {
-
-// When the SkPixelRef genID changes, invalidate a corresponding GrResource described by key.
-class GrResourceInvalidator : public SkPixelRef::GenIDChangeListener {
 public:
-    explicit GrResourceInvalidator(GrResourceKey key) : fKey(key) {}
-private:
-    GrResourceKey fKey;
+    PixelRef_GrYUVProvider(SkPixelRef* pr) : fPR(pr) {}
 
-    virtual void onChange() SK_OVERRIDE {
-        const GrResourceInvalidatedMessage message = { fKey };
-        SkMessageBus<GrResourceInvalidatedMessage>::Post(message);
+    uint32_t onGetID() override { return fPR->getGenerationID(); }
+    bool onGetYUVSizes(SkISize sizes[3]) override {
+        return fPR->getYUV8Planes(sizes, nullptr, nullptr, nullptr);
+    }
+    bool onGetYUVPlanes(SkISize sizes[3], void* planes[3], size_t rowBytes[3],
+                        SkYUVColorSpace* space) override {
+        return fPR->getYUV8Planes(sizes, planes, rowBytes, space);
     }
 };
 
-}  // namespace
-
-static void add_genID_listener(GrResourceKey key, SkPixelRef* pixelRef) {
-    SkASSERT(NULL != pixelRef);
-    pixelRef->addGenIDChangeListener(SkNEW_ARGS(GrResourceInvalidator, (key)));
-}
-
-#ifndef SK_IGNORE_ETC1_SUPPORT
-static GrTexture *load_etc1_texture(GrContext* ctx,
-                                    const GrTextureParams* params,
-                                    const SkBitmap &bm, GrTextureDesc desc) {
-    SkAutoTUnref<SkData> data(bm.pixelRef()->refEncodedData());
-
-    // Is this even encoded data?
-    if (NULL == data) {
-        return NULL;
-    }
-
-    // Is this a valid PKM encoded data?
-    const uint8_t *bytes = data->bytes();
-    if (etc1_pkm_is_valid(bytes)) {
-        uint32_t encodedWidth = etc1_pkm_get_width(bytes);
-        uint32_t encodedHeight = etc1_pkm_get_height(bytes);
-
-        // Does the data match the dimensions of the bitmap? If not,
-        // then we don't know how to scale the image to match it...
-        if (encodedWidth != static_cast<uint32_t>(bm.width()) ||
-            encodedHeight != static_cast<uint32_t>(bm.height())) {
-            return NULL;
-        }
-
-        // Everything seems good... skip ahead to the data.
-        bytes += ETC_PKM_HEADER_SIZE;
-        desc.fConfig = kETC1_GrPixelConfig;
-    } else if (SkKTXFile::is_ktx(bytes)) {
-        SkKTXFile ktx(data);
-
-        // Is it actually an ETC1 texture?
-        if (!ktx.isETC1()) {
-            return NULL;
-        }
-
-        // Does the data match the dimensions of the bitmap? If not,
-        // then we don't know how to scale the image to match it...
-        if (ktx.width() != bm.width() || ktx.height() != bm.height()) {
-            return NULL;
-        }        
-
-        bytes = ktx.pixelData();
-        desc.fConfig = kETC1_GrPixelConfig;
-    } else {
-        return NULL;
-    }
-
-    // This texture is likely to be used again so leave it in the cache
-    GrCacheID cacheID;
-    generate_bitmap_cache_id(bm, &cacheID);
-
-    GrResourceKey key;
-    GrTexture* result = ctx->createTexture(params, desc, cacheID, bytes, 0, &key);
-    if (NULL != result) {
-        add_genID_listener(key, bm.pixelRef());
-    }
-    return result;
-}
-#endif   // SK_IGNORE_ETC1_SUPPORT
-
-static GrTexture *load_yuv_texture(GrContext* ctx, const GrTextureParams* params,
-                                   const SkBitmap& bm, const GrTextureDesc& desc) {
-    GrTexture* result = NULL;
-    
+static GrTexture* create_texture_from_yuv(GrContext* ctx, const SkBitmap& bm,
+                                          const GrSurfaceDesc& desc) {
+    // Subsets are not supported, the whole pixelRef is loaded when using YUV decoding
     SkPixelRef* pixelRef = bm.pixelRef();
-    SkISize yuvSizes[3];
-    if ((NULL == pixelRef) || !pixelRef->getYUV8Planes(yuvSizes, NULL, NULL)) {
-        return NULL;
+    if ((nullptr == pixelRef) ||
+        (pixelRef->info().width() != bm.info().width()) ||
+        (pixelRef->info().height() != bm.info().height())) {
+        return nullptr;
     }
 
-    // Allocate the memory for YUV
-    size_t totalSize(0);
-    size_t sizes[3], rowBytes[3];
-    for (int i = 0; i < 3; ++i) {
-        rowBytes[i] = yuvSizes[i].fWidth;
-        totalSize  += sizes[i] = rowBytes[i] * yuvSizes[i].fHeight;
-    }
-    SkAutoMalloc storage(totalSize);
-    void* planes[3];
-    planes[0] = storage.get();
-    planes[1] = (uint8_t*)planes[0] + sizes[0];
-    planes[2] = (uint8_t*)planes[1] + sizes[1];
+    PixelRef_GrYUVProvider provider(pixelRef);
 
-    // Get the YUV planes
-    if (!pixelRef->getYUV8Planes(yuvSizes, planes, rowBytes)) {
-        return NULL;
-    }
-
-    GrTextureDesc yuvDesc;
-    yuvDesc.fConfig = kAlpha_8_GrPixelConfig;
-    GrAutoScratchTexture yuvTextures[3];
-    for (int i = 0; i < 3; ++i) {
-        yuvDesc.fWidth  = yuvSizes[i].fWidth;
-        yuvDesc.fHeight = yuvSizes[i].fHeight;
-        yuvTextures[i].set(ctx, yuvDesc);
-        if ((NULL == yuvTextures[i].texture()) ||
-            !ctx->writeTexturePixels(yuvTextures[i].texture(),
-                0, 0, yuvDesc.fWidth, yuvDesc.fHeight,
-                yuvDesc.fConfig, planes[i], rowBytes[i])) {
-            return NULL;
-        }
-    }
-
-    GrTextureDesc rtDesc = desc;
-    rtDesc.fFlags = rtDesc.fFlags |
-                    kRenderTarget_GrTextureFlagBit |
-                    kNoStencil_GrTextureFlagBit;
-
-    // This texture is likely to be used again so leave it in the cache
-    GrCacheID cacheID;
-    generate_bitmap_cache_id(bm, &cacheID);
-
-    GrResourceKey key;
-    result = ctx->createTexture(params, rtDesc, cacheID, NULL, 0, &key);
-    GrRenderTarget* renderTarget = result ? result->asRenderTarget() : NULL;
-    if (NULL != renderTarget) {
-        add_genID_listener(key, bm.pixelRef());
-        SkAutoTUnref<GrEffect> yuvToRgbEffect(GrYUVtoRGBEffect::Create(
-            yuvTextures[0].texture(), yuvTextures[1].texture(), yuvTextures[2].texture()));
-        GrPaint paint;
-        paint.addColorEffect(yuvToRgbEffect);
-        SkRect r = SkRect::MakeWH(SkIntToScalar(yuvSizes[0].fWidth),
-                                  SkIntToScalar(yuvSizes[0].fHeight));
-        GrContext::AutoRenderTarget autoRT(ctx, renderTarget);
-        GrContext::AutoMatrix am;
-        am.setIdentity(ctx);
-        GrContext::AutoClip ac(ctx, GrContext::AutoClip::kWideOpen_InitialClip);
-        ctx->drawRect(paint, r);
-    } else {
-        SkSafeSetNull(result);
-    }
-
-    return result;
+    return provider.refAsTexture(ctx, desc, !bm.isVolatile());
 }
 
-static GrTexture* sk_gr_create_bitmap_texture(GrContext* ctx,
-                                              bool cache,
-                                              const GrTextureParams* params,
-                                              const SkBitmap& origBitmap) {
+static GrTexture* load_etc1_texture(GrContext* ctx, const SkBitmap &bm, GrSurfaceDesc desc) {
+    SkAutoTUnref<SkData> data(bm.pixelRef()->refEncodedData());
+    if (!data) {
+        return nullptr;
+    }
+
+    const void* startOfTexData;
+    desc.fConfig = GrIsCompressedTextureDataSupported(ctx, data, bm.width(), bm.height(),
+                                                      &startOfTexData);
+    if (kUnknown_GrPixelConfig == desc.fConfig) {
+        return nullptr;
+    }
+
+    return ctx->textureProvider()->createTexture(desc, true, startOfTexData, 0);
+}
+
+GrTexture* GrUploadBitmapToTexture(GrContext* ctx, const SkBitmap& bmp) {
+    SkASSERT(!bmp.getTexture());
+
     SkBitmap tmpBitmap;
+    const SkBitmap* bitmap = &bmp;
 
-    const SkBitmap* bitmap = &origBitmap;
-
-    GrTextureDesc desc;
-    generate_bitmap_texture_desc(*bitmap, &desc);
+    GrSurfaceDesc desc = GrImageInfoToSurfaceDesc(bitmap->info());
+    const GrCaps* caps = ctx->caps();
 
     if (kIndex_8_SkColorType == bitmap->colorType()) {
-        // build_compressed_data doesn't do npot->pot expansion
-        // and paletted textures can't be sub-updated
-        if (ctx->supportsIndex8PixelConfig(params, bitmap->width(), bitmap->height())) {
-            size_t imagesize = bitmap->width() * bitmap->height() + kGrColorTableSize;
-            SkAutoMalloc storage(imagesize);
-
-            build_compressed_data(storage.get(), origBitmap);
+        if (caps->isConfigTexturable(kIndex_8_GrPixelConfig)) {
+            size_t imageSize = GrCompressedFormatDataSize(kIndex_8_GrPixelConfig,
+                                                          bitmap->width(), bitmap->height());
+            SkAutoMalloc storage(imageSize);
+            build_index8_data(storage.get(), bmp);
 
             // our compressed data will be trimmed, so pass width() for its
             // "rowBytes", since they are the same now.
-
-            if (cache) {
-                GrCacheID cacheID;
-                generate_bitmap_cache_id(origBitmap, &cacheID);
-
-                GrResourceKey key;
-                GrTexture* result = ctx->createTexture(params, desc, cacheID,
-                                                       storage.get(), bitmap->width(), &key);
-                if (NULL != result) {
-                    add_genID_listener(key, origBitmap.pixelRef());
-                }
-                return result;
-            } else {
-                GrTexture* result = ctx->lockAndRefScratchTexture(desc,
-                                                            GrContext::kExact_ScratchTexMatch);
-                result->writePixels(0, 0, bitmap->width(),
-                                    bitmap->height(), desc.fConfig,
-                                    storage.get());
-                return result;
-            }
+            return ctx->textureProvider()->createTexture(desc, true, storage.get(),
+                                                         bitmap->width());
         } else {
-            origBitmap.copyTo(&tmpBitmap, kN32_SkColorType);
+            bmp.copyTo(&tmpBitmap, kN32_SkColorType);
             // now bitmap points to our temp, which has been promoted to 32bits
             bitmap = &tmpBitmap;
             desc.fConfig = SkImageInfo2GrPixelConfig(bitmap->info());
         }
-    }
-
-    // Is this an ETC1 encoded texture?
-#ifndef SK_IGNORE_ETC1_SUPPORT
-    else if (
-        // We do not support scratch ETC1 textures, hence they should all be at least
-        // trying to go to the cache.
-        cache
-        // Make sure that the underlying device supports ETC1 textures before we go ahead
-        // and check the data.
-        && ctx->getGpu()->caps()->isConfigTexturable(kETC1_GrPixelConfig)
+    } else if (!bitmap->readyToDraw()) {
         // If the bitmap had compressed data and was then uncompressed, it'll still return
         // compressed data on 'refEncodedData' and upload it. Probably not good, since if
         // the bitmap has available pixels, then they might not be what the decompressed
         // data is.
-        && !(bitmap->readyToDraw())) {
-        GrTexture *texture = load_etc1_texture(ctx, params, *bitmap, desc);
-        if (NULL != texture) {
-            return texture;
-        }
-    }
-#endif   // SK_IGNORE_ETC1_SUPPORT
 
-    else {
-        GrTexture *texture = load_yuv_texture(ctx, params, *bitmap, desc);
-        if (NULL != texture) {
+        // Really?? We aren't doing this with YUV.
+
+        GrTexture *texture = load_etc1_texture(ctx, *bitmap, desc);
+        if (texture) {
             return texture;
         }
     }
+
+    GrTexture *texture = create_texture_from_yuv(ctx, *bitmap, desc);
+    if (texture) {
+        return texture;
+    }
+
     SkAutoLockPixels alp(*bitmap);
     if (!bitmap->readyToDraw()) {
-        return NULL;
+        return nullptr;
     }
-    if (cache) {
-        // This texture is likely to be used again so leave it in the cache
-        GrCacheID cacheID;
-        generate_bitmap_cache_id(origBitmap, &cacheID);
 
-        GrResourceKey key;
-        GrTexture* result = ctx->createTexture(params, desc, cacheID,
-                                               bitmap->getPixels(), bitmap->rowBytes(), &key);
-        if (NULL != result) {
-            add_genID_listener(key, origBitmap.pixelRef());
-        }
-        return result;
-   } else {
-        // This texture is unlikely to be used again (in its present form) so
-        // just use a scratch texture. This will remove the texture from the
-        // cache so no one else can find it. Additionally, once unlocked, the
-        // scratch texture will go to the end of the list for purging so will
-        // likely be available for this volatile bitmap the next time around.
-        GrTexture* result = ctx->lockAndRefScratchTexture(desc, GrContext::kExact_ScratchTexMatch);
-        result->writePixels(0, 0,
-                            bitmap->width(), bitmap->height(),
-                            desc.fConfig,
-                            bitmap->getPixels(),
-                            bitmap->rowBytes());
-        return result;
-    }
+    return ctx->textureProvider()->createTexture(desc, true, bitmap->getPixels(),
+                                                 bitmap->rowBytes());
 }
 
-bool GrIsBitmapInCache(const GrContext* ctx,
-                       const SkBitmap& bitmap,
-                       const GrTextureParams* params) {
-    GrCacheID cacheID;
-    generate_bitmap_cache_id(bitmap, &cacheID);
 
-    GrTextureDesc desc;
-    generate_bitmap_texture_desc(bitmap, &desc);
-    return ctx->isTextureInCache(desc, cacheID, params);
+////////////////////////////////////////////////////////////////////////////////
+
+void GrInstallBitmapUniqueKeyInvalidator(const GrUniqueKey& key, SkPixelRef* pixelRef) {
+    class Invalidator : public SkPixelRef::GenIDChangeListener {
+    public:
+        explicit Invalidator(const GrUniqueKey& key) : fMsg(key) {}
+    private:
+        GrUniqueKeyInvalidatedMessage fMsg;
+
+        void onChange() override { SkMessageBus<GrUniqueKeyInvalidatedMessage>::Post(fMsg); }
+    };
+
+    pixelRef->addGenIDChangeListener(new Invalidator(key));
 }
 
-GrTexture* GrLockAndRefCachedBitmapTexture(GrContext* ctx,
-                                           const SkBitmap& bitmap,
-                                           const GrTextureParams* params) {
-    GrTexture* result = NULL;
-
-    bool cache = !bitmap.isVolatile();
-
-    if (cache) {
-        // If the bitmap isn't changing try to find a cached copy first.
-
-        GrCacheID cacheID;
-        generate_bitmap_cache_id(bitmap, &cacheID);
-
-        GrTextureDesc desc;
-        generate_bitmap_texture_desc(bitmap, &desc);
-
-        result = ctx->findAndRefTexture(desc, cacheID, params);
+GrTexture* GrRefCachedBitmapTexture(GrContext* ctx, const SkBitmap& bitmap,
+                                    const GrTextureParams& params) {
+    if (bitmap.getTexture()) {
+        return GrBitmapTextureAdjuster(&bitmap).refTextureSafeForParams(params, nullptr);
     }
-    if (NULL == result) {
-        result = sk_gr_create_bitmap_texture(ctx, cache, params, bitmap);
-    }
-    if (NULL == result) {
-        GrPrintf("---- failed to create texture for cache [%d %d]\n",
-                    bitmap.width(), bitmap.height());
-    }
-    return result;
-}
-
-void GrUnlockAndUnrefCachedBitmapTexture(GrTexture* texture) {
-    SkASSERT(NULL != texture->getContext());
-
-    texture->getContext()->unlockScratchTexture(texture);
-    texture->unref();
+    return GrBitmapTextureMaker(ctx, bitmap).refTextureForParams(params);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG
-GrPixelConfig SkBitmapConfig2GrPixelConfig(SkBitmap::Config config) {
-    switch (config) {
-        case SkBitmap::kA8_Config:
-            return kAlpha_8_GrPixelConfig;
-        case SkBitmap::kIndex8_Config:
-            return kIndex_8_GrPixelConfig;
-        case SkBitmap::kRGB_565_Config:
-            return kRGB_565_GrPixelConfig;
-        case SkBitmap::kARGB_4444_Config:
-            return kRGBA_4444_GrPixelConfig;
-        case SkBitmap::kARGB_8888_Config:
-            return kSkia8888_GrPixelConfig;
-        default:
-            // kNo_Config, kA1_Config missing
-            return kUnknown_GrPixelConfig;
-    }
-}
-#endif
-
 // alphatype is ignore for now, but if GrPixelConfig is expanded to encompass
 // alpha info, that will be considered.
-GrPixelConfig SkImageInfo2GrPixelConfig(SkColorType ct, SkAlphaType) {
+GrPixelConfig SkImageInfo2GrPixelConfig(SkColorType ct, SkAlphaType, SkColorProfileType pt) {
     switch (ct) {
         case kUnknown_SkColorType:
             return kUnknown_GrPixelConfig;
@@ -459,18 +308,25 @@ GrPixelConfig SkImageInfo2GrPixelConfig(SkColorType ct, SkAlphaType) {
         case kARGB_4444_SkColorType:
             return kRGBA_4444_GrPixelConfig;
         case kRGBA_8888_SkColorType:
+            //if (kSRGB_SkColorProfileType == pt) {
+            //    return kSRGBA_8888_GrPixelConfig;
+            //}
             return kRGBA_8888_GrPixelConfig;
         case kBGRA_8888_SkColorType:
             return kBGRA_8888_GrPixelConfig;
         case kIndex_8_SkColorType:
             return kIndex_8_GrPixelConfig;
+        case kGray_8_SkColorType:
+            return kAlpha_8_GrPixelConfig; // TODO: gray8 support on gpu
     }
     SkASSERT(0);    // shouldn't get here
     return kUnknown_GrPixelConfig;
 }
 
-bool GrPixelConfig2ColorType(GrPixelConfig config, SkColorType* ctOut) {
+bool GrPixelConfig2ColorAndProfileType(GrPixelConfig config, SkColorType* ctOut,
+                                       SkColorProfileType* ptOut) {
     SkColorType ct;
+    SkColorProfileType pt = kLinear_SkColorProfileType;
     switch (config) {
         case kAlpha_8_GrPixelConfig:
             ct = kAlpha_8_SkColorType;
@@ -490,136 +346,291 @@ bool GrPixelConfig2ColorType(GrPixelConfig config, SkColorType* ctOut) {
         case kBGRA_8888_GrPixelConfig:
             ct = kBGRA_8888_SkColorType;
             break;
+        case kSRGBA_8888_GrPixelConfig:
+            ct = kRGBA_8888_SkColorType;
+            pt = kSRGB_SkColorProfileType;
+            break;
         default:
             return false;
     }
     if (ctOut) {
         *ctOut = ct;
     }
+    if (ptOut) {
+        *ptOut = pt;
+    }
     return true;
 }
 
-///////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////////////
 
-void SkPaint2GrPaintNoShader(GrContext* context, const SkPaint& skPaint, GrColor paintColor,
-                             bool constantColor, GrPaint* grPaint) {
+static inline bool blend_requires_shader(const SkXfermode::Mode mode, bool primitiveIsSrc) {
+    if (primitiveIsSrc) {
+        return SkXfermode::kSrc_Mode != mode;
+    } else {
+        return SkXfermode::kDst_Mode != mode;
+    }
+}
 
-    grPaint->setDither(skPaint.isDither());
+static inline bool skpaint_to_grpaint_impl(GrContext* context,
+                                           const SkPaint& skPaint,
+                                           const SkMatrix& viewM,
+                                           const GrFragmentProcessor** shaderProcessor,
+                                           SkXfermode::Mode* primColorMode,
+                                           bool primitiveIsSrc,
+                                           GrPaint* grPaint) {
     grPaint->setAntiAlias(skPaint.isAntiAlias());
 
-    SkXfermode::Coeff sm;
-    SkXfermode::Coeff dm;
+    // Setup the initial color considering the shader, the SkPaint color, and the presence or not
+    // of per-vertex colors.
+    SkAutoTUnref<const GrFragmentProcessor> aufp;
+    const GrFragmentProcessor* shaderFP = nullptr;
+    if (!primColorMode || blend_requires_shader(*primColorMode, primitiveIsSrc)) {
+        if (shaderProcessor) {
+            shaderFP = *shaderProcessor;
+        } else if (const SkShader* shader = skPaint.getShader()) {
+            aufp.reset(shader->asFragmentProcessor(context, viewM, nullptr,
+                                                   skPaint.getFilterQuality()));
+            shaderFP = aufp;
+            if (!shaderFP) {
+                return false;
+            }
+        }
+    }
 
-    SkXfermode* mode = skPaint.getXfermode();
-    GrEffect* xferEffect = NULL;
-    if (SkXfermode::AsNewEffectOrCoeff(mode, &xferEffect, &sm, &dm)) {
-        if (NULL != xferEffect) {
-            grPaint->addColorEffect(xferEffect)->unref();
-            sm = SkXfermode::kOne_Coeff;
-            dm = SkXfermode::kZero_Coeff;
+    // Set this in below cases if the output of the shader/paint-color/paint-alpha/primXfermode is
+    // a known constant value. In that case we can simply apply a color filter during this
+    // conversion without converting the color filter to a GrFragmentProcessor.
+    bool applyColorFilterToPaintColor = false;
+    if (shaderFP) {
+        if (primColorMode) {
+            // There is a blend between the primitive color and the shader color. The shader sees
+            // the opaque paint color. The shader's output is blended using the provided mode by
+            // the primitive color. The blended color is then modulated by the paint's alpha.
+
+            // The geometry processor will insert the primitive color to start the color chain, so
+            // the GrPaint color will be ignored.
+
+            GrColor shaderInput = SkColorToOpaqueGrColor(skPaint.getColor());
+
+            shaderFP = GrFragmentProcessor::OverrideInput(shaderFP, shaderInput);
+            aufp.reset(shaderFP);
+
+            if (primitiveIsSrc) {
+                shaderFP = GrXfermodeFragmentProcessor::CreateFromDstProcessor(shaderFP,
+                                                                               *primColorMode);
+            } else {
+                shaderFP = GrXfermodeFragmentProcessor::CreateFromSrcProcessor(shaderFP,
+                                                                               *primColorMode);
+            }
+            aufp.reset(shaderFP);
+            // The above may return null if compose results in a pass through of the prim color.
+            if (shaderFP) {
+                grPaint->addColorFragmentProcessor(shaderFP);
+            }
+
+            GrColor paintAlpha = SkColorAlphaToGrColor(skPaint.getColor());
+            if (GrColor_WHITE != paintAlpha) {
+                grPaint->addColorFragmentProcessor(GrConstColorProcessor::Create(
+                    paintAlpha, GrConstColorProcessor::kModulateRGBA_InputMode))->unref();
+            }
+        } else {
+            // The shader's FP sees the paint unpremul color
+            grPaint->setColor(SkColorToUnpremulGrColor(skPaint.getColor()));
+            grPaint->addColorFragmentProcessor(shaderFP);
         }
     } else {
-        //SkDEBUGCODE(SkDebugf("Unsupported xfer mode.\n");)
-        // Fall back to src-over
-        sm = SkXfermode::kOne_Coeff;
-        dm = SkXfermode::kISA_Coeff;
+        if (primColorMode) {
+            // There is a blend between the primitive color and the paint color. The blend considers
+            // the opaque paint color. The paint's alpha is applied to the post-blended color.
+            SkAutoTUnref<const GrFragmentProcessor> processor(
+                GrConstColorProcessor::Create(SkColorToOpaqueGrColor(skPaint.getColor()),
+                                              GrConstColorProcessor::kIgnore_InputMode));
+            if (primitiveIsSrc) {
+                processor.reset(GrXfermodeFragmentProcessor::CreateFromDstProcessor(processor,
+                                                                                *primColorMode));
+            } else {
+                processor.reset(GrXfermodeFragmentProcessor::CreateFromSrcProcessor(processor,
+                                                                                *primColorMode));
+
+            }
+            if (processor) {
+                grPaint->addColorFragmentProcessor(processor);
+            }
+
+            grPaint->setColor(SkColorToOpaqueGrColor(skPaint.getColor()));
+
+            GrColor paintAlpha = SkColorAlphaToGrColor(skPaint.getColor());
+            if (GrColor_WHITE != paintAlpha) {
+                grPaint->addColorFragmentProcessor(GrConstColorProcessor::Create(
+                    paintAlpha, GrConstColorProcessor::kModulateRGBA_InputMode))->unref();
+            }
+        } else {
+            // No shader, no primitive color.
+            grPaint->setColor(SkColorToPremulGrColor(skPaint.getColor()));
+            applyColorFilterToPaintColor = true;
+        }
     }
-    grPaint->setBlendFunc(sk_blend_to_grblend(sm), sk_blend_to_grblend(dm));
-    
-    //set the color of the paint to the one of the parameter
-    grPaint->setColor(paintColor);
 
     SkColorFilter* colorFilter = skPaint.getColorFilter();
-    if (NULL != colorFilter) {
-        // if the source color is a constant then apply the filter here once rather than per pixel
-        // in a shader.
-        if (constantColor) {
-            SkColor filtered = colorFilter->filterColor(skPaint.getColor());
-            grPaint->setColor(SkColor2GrColor(filtered));
+    if (colorFilter) {
+        if (applyColorFilterToPaintColor) {
+            grPaint->setColor(SkColorToPremulGrColor(colorFilter->filterColor(skPaint.getColor())));
         } else {
-            SkAutoTUnref<GrEffect> effect(colorFilter->asNewEffect(context));
-            if (NULL != effect.get()) {
-                grPaint->addColorEffect(effect);
+            SkAutoTUnref<const GrFragmentProcessor> cfFP(
+                colorFilter->asFragmentProcessor(context));
+            if (cfFP) {
+                grPaint->addColorFragmentProcessor(cfFP);
+            } else {
+                return false;
             }
         }
     }
 
+    SkXfermode* mode = skPaint.getXfermode();
+    GrXPFactory* xpFactory = nullptr;
+    SkXfermode::AsXPFactory(mode, &xpFactory);
+    SkSafeUnref(grPaint->setXPFactory(xpFactory));
+
 #ifndef SK_IGNORE_GPU_DITHER
-    // If the dither flag is set, then we need to see if the underlying context
-    // supports it. If not, then install a dither effect.
-    if (skPaint.isDither() && grPaint->numColorStages() > 0) {
-        // What are we rendering into?
-        const GrRenderTarget *target = context->getRenderTarget();
-        SkASSERT(NULL != target);
-
-        // Suspect the dithering flag has no effect on these configs, otherwise
-        // fall back on setting the appropriate state.
-        if (target->config() == kRGBA_8888_GrPixelConfig ||
-            target->config() == kBGRA_8888_GrPixelConfig) {
-            // The dither flag is set and the target is likely
-            // not going to be dithered by the GPU.
-            SkAutoTUnref<GrEffect> effect(GrDitherEffect::Create());
-            if (NULL != effect.get()) {
-                grPaint->addColorEffect(effect);
-                grPaint->setDither(false);
-            }
-        }
+    if (skPaint.isDither() && grPaint->numColorFragmentProcessors() > 0) {
+        grPaint->addColorFragmentProcessor(GrDitherEffect::Create())->unref();
     }
 #endif
+    return true;
 }
 
-/**
- * Unlike GrContext::AutoMatrix, this doesn't require setting a new matrix. GrContext::AutoMatrix
- * likes to set the new matrix in its constructor because it is usually necessary to simulataneously
- * update a GrPaint. This AutoMatrix is used while initially setting up GrPaint, however.
- */
-class AutoMatrix {
-public:
-    AutoMatrix(GrContext* context) {
-        fMatrix = context->getMatrix();
-        fContext = context;
+bool SkPaintToGrPaint(GrContext* context, const SkPaint& skPaint, const SkMatrix& viewM,
+                      GrPaint* grPaint) {
+    return skpaint_to_grpaint_impl(context, skPaint, viewM, nullptr, nullptr, false, grPaint);
+}
+
+/** Replaces the SkShader (if any) on skPaint with the passed in GrFragmentProcessor. */
+bool SkPaintToGrPaintReplaceShader(GrContext* context,
+                                   const SkPaint& skPaint,
+                                   const GrFragmentProcessor* shaderFP,
+                                   GrPaint* grPaint) {
+    if (!shaderFP) {
+        return false;
     }
-    ~AutoMatrix() {
-        SkASSERT(NULL != fContext);
-        fContext->setMatrix(fMatrix);
-    }
-private:
-    GrContext* fContext;
-    SkMatrix fMatrix;
-};
+    return skpaint_to_grpaint_impl(context, skPaint, SkMatrix::I(), &shaderFP, nullptr, false,
+                                   grPaint);
+}
 
-void SkPaint2GrPaintShader(GrContext* context, const SkPaint& skPaint,
-                           bool constantColor, GrPaint* grPaint) {
-    SkShader* shader = skPaint.getShader();
-    if (NULL == shader) {
-        SkPaint2GrPaintNoShader(context, skPaint, SkColor2GrColor(skPaint.getColor()),
-                                constantColor, grPaint);
-        return;
-    }
+/** Ignores the SkShader (if any) on skPaint. */
+bool SkPaintToGrPaintNoShader(GrContext* context,
+                              const SkPaint& skPaint,
+                              GrPaint* grPaint) {
+    // Use a ptr to a nullptr to to indicate that the SkShader is ignored and not replaced.
+    static const GrFragmentProcessor* kNullShaderFP = nullptr;
+    static const GrFragmentProcessor** kIgnoreShader = &kNullShaderFP;
+    return skpaint_to_grpaint_impl(context, skPaint, SkMatrix::I(), kIgnoreShader, nullptr, false,
+                                   grPaint);
+}
 
-    GrColor paintColor = SkColor2GrColor(skPaint.getColor());
+/** Blends the SkPaint's shader (or color if no shader) with a per-primitive color which must
+be setup as a vertex attribute using the specified SkXfermode::Mode. */
+bool SkPaintToGrPaintWithXfermode(GrContext* context,
+                                  const SkPaint& skPaint,
+                                  const SkMatrix& viewM,
+                                  SkXfermode::Mode primColorMode,
+                                  bool primitiveIsSrc,
+                                  GrPaint* grPaint) {
+    return skpaint_to_grpaint_impl(context, skPaint, viewM, nullptr, &primColorMode, primitiveIsSrc,
+                                   grPaint);
+}
 
-    // Start a new block here in order to preserve our context state after calling
-    // asNewEffect(). Since these calls get passed back to the client, we don't really
-    // want them messing around with the context.
-    {
-        // SkShader::asNewEffect() may do offscreen rendering. Save off the current RT, clip, and
-        // matrix. We don't reset the matrix on the context because SkShader::asNewEffect may use
-        // GrContext::getMatrix() to know the transformation from local coords to device space.
-        GrContext::AutoRenderTarget art(context, NULL);
-        GrContext::AutoClip ac(context, GrContext::AutoClip::kWideOpen_InitialClip);
-        AutoMatrix am(context);
-
-        // Allow the shader to modify paintColor and also create an effect to be installed as
-        // the first color effect on the GrPaint.
-        GrEffect* effect = NULL;
-        if (shader->asNewEffect(context, skPaint, NULL, &paintColor, &effect) && NULL != effect) {
-            grPaint->addColorEffect(effect)->unref();
-            constantColor = false;
+bool SkPaintToGrPaintWithTexture(GrContext* context,
+                                 const SkPaint& paint,
+                                 const SkMatrix& viewM,
+                                 const GrFragmentProcessor* fp,
+                                 bool textureIsAlphaOnly,
+                                 GrPaint* grPaint) {
+    SkAutoTUnref<const GrFragmentProcessor> shaderFP;
+    if (textureIsAlphaOnly) {
+        if (const SkShader* shader = paint.getShader()) {
+            shaderFP.reset(shader->asFragmentProcessor(context,
+                                                       viewM,
+                                                       nullptr,
+                                                       paint.getFilterQuality()));
+            if (!shaderFP) {
+                return false;
+            }
+            const GrFragmentProcessor* fpSeries[] = { shaderFP.get(), fp };
+            shaderFP.reset(GrFragmentProcessor::RunInSeries(fpSeries, 2));
+        } else {
+            shaderFP.reset(GrFragmentProcessor::MulOutputByInputUnpremulColor(fp));
         }
+    } else {
+        shaderFP.reset(GrFragmentProcessor::MulOutputByInputAlpha(fp));
     }
 
-    // The grcolor is automatically set when calling asneweffect.
-    // If the shader can be seen as an effect it returns true and adds its effect to the grpaint.
-    SkPaint2GrPaintNoShader(context, skPaint, paintColor, constantColor, grPaint);
+    return SkPaintToGrPaintReplaceShader(context, paint, shaderFP.get(), grPaint);
+}
+
+
+////////////////////////////////////////////////////////////////////////////////////////////////
+
+SkImageInfo GrMakeInfoFromTexture(GrTexture* tex, int w, int h, bool isOpaque) {
+#ifdef SK_DEBUG
+    const GrSurfaceDesc& desc = tex->desc();
+    SkASSERT(w <= desc.fWidth);
+    SkASSERT(h <= desc.fHeight);
+#endif
+    const GrPixelConfig config = tex->config();
+    SkColorType ct;
+    SkAlphaType at = isOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
+    if (!GrPixelConfig2ColorAndProfileType(config, &ct, nullptr)) {
+        ct = kUnknown_SkColorType;
+    }
+    return SkImageInfo::Make(w, h, ct, at);
+}
+
+
+void GrWrapTextureInBitmap(GrTexture* src, int w, int h, bool isOpaque, SkBitmap* dst) {
+    const SkImageInfo info = GrMakeInfoFromTexture(src, w, h, isOpaque);
+    dst->setInfo(info);
+    dst->setPixelRef(new SkGrPixelRef(info, src))->unref();
+}
+
+GrTextureParams::FilterMode GrSkFilterQualityToGrFilterMode(SkFilterQuality paintFilterQuality,
+                                                            const SkMatrix& viewM,
+                                                            const SkMatrix& localM,
+                                                            bool* doBicubic) {
+    *doBicubic = false;
+    GrTextureParams::FilterMode textureFilterMode;
+    switch (paintFilterQuality) {
+        case kNone_SkFilterQuality:
+            textureFilterMode = GrTextureParams::kNone_FilterMode;
+            break;
+        case kLow_SkFilterQuality:
+            textureFilterMode = GrTextureParams::kBilerp_FilterMode;
+            break;
+        case kMedium_SkFilterQuality: {
+            SkMatrix matrix;
+            matrix.setConcat(viewM, localM);
+            if (matrix.getMinScale() < SK_Scalar1) {
+                textureFilterMode = GrTextureParams::kMipMap_FilterMode;
+            } else {
+                // Don't trigger MIP level generation unnecessarily.
+                textureFilterMode = GrTextureParams::kBilerp_FilterMode;
+            }
+            break;
+        }
+        case kHigh_SkFilterQuality: {
+            SkMatrix matrix;
+            matrix.setConcat(viewM, localM);
+            *doBicubic = GrBicubicEffect::ShouldUseBicubic(matrix, &textureFilterMode);
+            break;
+        }
+        default:
+            SkErrorInternals::SetError( kInvalidPaint_SkError,
+                                        "Sorry, I don't understand the filtering "
+                                        "mode you asked for.  Falling back to "
+                                        "MIPMaps.");
+            textureFilterMode = GrTextureParams::kMipMap_FilterMode;
+            break;
+
+    }
+    return textureFilterMode;
 }
diff --git a/gfx/skia/skia/src/gpu/SkGrPixelRef.cpp b/gfx/skia/skia/src/gpu/SkGrPixelRef.cpp
index 2131f41b17b3..6e014feded1f 100644
--- a/gfx/skia/skia/src/gpu/SkGrPixelRef.cpp
+++ b/gfx/skia/skia/src/gpu/SkGrPixelRef.cpp
@@ -9,34 +9,33 @@
 
 
 #include "SkGrPixelRef.h"
+
 #include "GrContext.h"
 #include "GrTexture.h"
+#include "GrTexturePriv.h"
+#include "SkBitmapCache.h"
 #include "SkGr.h"
 #include "SkRect.h"
 
-// since we call lockPixels recursively on fBitmap, we need a distinct mutex,
-// to avoid deadlock with the default one provided by SkPixelRef.
-SK_DECLARE_STATIC_MUTEX(gROLockPixelsPixelRefMutex);
-
 SkROLockPixelsPixelRef::SkROLockPixelsPixelRef(const SkImageInfo& info)
-    : INHERITED(info, &gROLockPixelsPixelRefMutex) {}
+    : INHERITED(info) {}
 
 SkROLockPixelsPixelRef::~SkROLockPixelsPixelRef() {}
 
 bool SkROLockPixelsPixelRef::onNewLockPixels(LockRec* rec) {
     fBitmap.reset();
 //    SkDebugf("---------- calling readpixels in support of lockpixels\n");
-    if (!this->onReadPixels(&fBitmap, NULL)) {
+    if (!this->onReadPixels(&fBitmap, nullptr)) {
         SkDebugf("SkROLockPixelsPixelRef::onLockPixels failed!\n");
         return false;
     }
     fBitmap.lockPixels();
-    if (NULL == fBitmap.getPixels()) {
+    if (nullptr == fBitmap.getPixels()) {
         return false;
     }
 
     rec->fPixels = fBitmap.getPixels();
-    rec->fColorTable = NULL;
+    rec->fColorTable = nullptr;
     rec->fRowBytes = fBitmap.rowBytes();
     return true;
 }
@@ -51,138 +50,154 @@ bool SkROLockPixelsPixelRef::onLockPixelsAreWritable() const {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static SkGrPixelRef* copyToTexturePixelRef(GrTexture* texture, SkColorType dstCT,
-                                           const SkIRect* subset) {
-    if (NULL == texture || kUnknown_SkColorType == dstCT) {
-        return NULL;
+static SkGrPixelRef* copy_to_new_texture_pixelref(GrTexture* texture, SkColorType dstCT,
+                                                  SkColorProfileType dstPT, const SkIRect* subset) {
+    if (nullptr == texture || kUnknown_SkColorType == dstCT) {
+        return nullptr;
     }
     GrContext* context = texture->getContext();
-    if (NULL == context) {
-        return NULL;
+    if (nullptr == context) {
+        return nullptr;
     }
-    GrTextureDesc desc;
+    GrSurfaceDesc desc;
 
-    SkIPoint pointStorage;
-    SkIPoint* topLeft;
-    if (subset != NULL) {
+    SkIRect srcRect;
+
+    if (!subset) {
+        desc.fWidth  = texture->width();
+        desc.fHeight = texture->height();
+        srcRect = SkIRect::MakeWH(texture->width(), texture->height());
+    } else {
         SkASSERT(SkIRect::MakeWH(texture->width(), texture->height()).contains(*subset));
         // Create a new texture that is the size of subset.
         desc.fWidth = subset->width();
         desc.fHeight = subset->height();
-        pointStorage.set(subset->x(), subset->y());
-        topLeft = &pointStorage;
-    } else {
-        desc.fWidth  = texture->width();
-        desc.fHeight = texture->height();
-        topLeft = NULL;
+        srcRect = *subset;
     }
-    desc.fFlags = kRenderTarget_GrTextureFlagBit | kNoStencil_GrTextureFlagBit;
-    desc.fConfig = SkImageInfo2GrPixelConfig(dstCT, kPremul_SkAlphaType);
+    desc.fFlags = kRenderTarget_GrSurfaceFlag;
+    desc.fConfig = SkImageInfo2GrPixelConfig(dstCT, kPremul_SkAlphaType, dstPT);
 
-    GrTexture* dst = context->createUncachedTexture(desc, NULL, 0);
-    if (NULL == dst) {
-        return NULL;
+    GrTexture* dst = context->textureProvider()->createTexture(desc, false, nullptr, 0);
+    if (nullptr == dst) {
+        return nullptr;
     }
 
-    context->copyTexture(texture, dst->asRenderTarget(), topLeft);
+    // Blink is relying on the above copy being sent to GL immediately in the case when the source
+    // is a WebGL canvas backing store. We could have a TODO to remove this flush flag, but we have
+    // a larger TODO to remove SkGrPixelRef entirely.
+    context->copySurface(dst->asRenderTarget(), texture, srcRect, SkIPoint::Make(0,0),
+                         GrContext::kFlushWrites_PixelOp);
 
-    // TODO: figure out if this is responsible for Chrome canvas errors
-#if 0
-    // The render texture we have created (to perform the copy) isn't fully
-    // functional (since it doesn't have a stencil buffer). Release it here
-    // so the caller doesn't try to render to it.
-    // TODO: we can undo this release when dynamic stencil buffer attach/
-    // detach has been implemented
-    dst->releaseRenderTarget();
-#endif
-
-    SkImageInfo info = SkImageInfo::Make(desc.fWidth, desc.fHeight, dstCT, kPremul_SkAlphaType);
-    SkGrPixelRef* pixelRef = SkNEW_ARGS(SkGrPixelRef, (info, dst));
+    SkImageInfo info = SkImageInfo::Make(desc.fWidth, desc.fHeight, dstCT, kPremul_SkAlphaType,
+                                         dstPT);
+    SkGrPixelRef* pixelRef = new SkGrPixelRef(info, dst);
     SkSafeUnref(dst);
     return pixelRef;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkGrPixelRef::SkGrPixelRef(const SkImageInfo& info, GrSurface* surface,
-                           bool transferCacheLock) : INHERITED(info) {
-    // TODO: figure out if this is responsible for Chrome canvas errors
-#if 0
-    // The GrTexture has a ref to the GrRenderTarget but not vice versa.
-    // If the GrTexture exists take a ref to that (rather than the render
-    // target)
-    fSurface = surface->asTexture();
-#else
-    fSurface = NULL;
-#endif
-    if (NULL == fSurface) {
-        fSurface = surface;
+SkGrPixelRef::SkGrPixelRef(const SkImageInfo& info, GrSurface* surface) : INHERITED(info) {
+    // For surfaces that are both textures and render targets, the texture owns the
+    // render target but not vice versa. So we ref the texture to keep both alive for
+    // the lifetime of this pixel ref.
+    fSurface = SkSafeRef(surface->asTexture());
+    if (nullptr == fSurface) {
+        fSurface = SkSafeRef(surface);
     }
-    fUnlock = transferCacheLock;
-    SkSafeRef(surface);
 
     if (fSurface) {
-        SkASSERT(info.fWidth <= fSurface->width());
-        SkASSERT(info.fHeight <= fSurface->height());
+        SkASSERT(info.width() <= fSurface->width());
+        SkASSERT(info.height() <= fSurface->height());
     }
 }
 
 SkGrPixelRef::~SkGrPixelRef() {
-    if (fUnlock) {
-        GrContext* context = fSurface->getContext();
-        GrTexture* texture = fSurface->asTexture();
-        if (NULL != context && NULL != texture) {
-            context->unlockScratchTexture(texture);
-        }
-    }
     SkSafeUnref(fSurface);
 }
 
 GrTexture* SkGrPixelRef::getTexture() {
-    if (NULL != fSurface) {
+    if (fSurface) {
         return fSurface->asTexture();
     }
-    return NULL;
+    return nullptr;
 }
 
-SkPixelRef* SkGrPixelRef::deepCopy(SkColorType dstCT, const SkIRect* subset) {
-    if (NULL == fSurface) {
-        return NULL;
+void SkGrPixelRef::onNotifyPixelsChanged() {
+    GrTexture* texture = this->getTexture();
+    if (texture) {
+        texture->texturePriv().dirtyMipMaps(true);
     }
-    
+}
+
+SkPixelRef* SkGrPixelRef::deepCopy(SkColorType dstCT, SkColorProfileType dstPT,
+                                   const SkIRect* subset) {
+    if (nullptr == fSurface) {
+        return nullptr;
+    }
+
     // Note that when copying a render-target-backed pixel ref, we
     // return a texture-backed pixel ref instead.  This is because
     // render-target pixel refs are usually created in conjunction with
     // a GrTexture owned elsewhere (e.g., SkGpuDevice), and cannot live
     // independently of that texture.  Texture-backed pixel refs, on the other
     // hand, own their GrTextures, and are thus self-contained.
-    return copyToTexturePixelRef(fSurface->asTexture(), dstCT, subset);
+    return copy_to_new_texture_pixelref(fSurface->asTexture(), dstCT, dstPT, subset);
+}
+
+static bool tryAllocBitmapPixels(SkBitmap* bitmap) {
+    SkBitmap::Allocator* allocator = SkBitmapCache::GetAllocator();
+    if (nullptr != allocator) {
+        return allocator->allocPixelRef(bitmap, 0);
+    } else {
+        // DiscardableMemory is not available, fallback to default allocator
+        return bitmap->tryAllocPixels();
+    }
 }
 
 bool SkGrPixelRef::onReadPixels(SkBitmap* dst, const SkIRect* subset) {
-    if (NULL == fSurface || fSurface->wasDestroyed()) {
+    if (nullptr == fSurface || fSurface->wasDestroyed()) {
         return false;
     }
 
-    int left, top, width, height;
-    if (NULL != subset) {
-        left = subset->fLeft;
-        width = subset->width();
-        top = subset->fTop;
-        height = subset->height();
+    SkIRect bounds;
+    if (subset) {
+        bounds = *subset;
     } else {
-        left = 0;
-        width = this->info().fWidth;
-        top = 0;
-        height = this->info().fHeight;
+        bounds = SkIRect::MakeWH(this->info().width(), this->info().height());
     }
-    if (!dst->allocPixels(SkImageInfo::MakeN32Premul(width, height))) {
-        SkDebugf("SkGrPixelRef::onReadPixels failed to alloc bitmap for result!\n");
-        return false;
-    }
-    SkAutoLockPixels al(*dst);
-    void* buffer = dst->getPixels();
-    return fSurface->readPixels(left, top, width, height,
+
+    //Check the cache
+    if(!SkBitmapCache::Find(this->getGenerationID(), bounds, dst)) {
+        //Cache miss
+
+        SkBitmap cachedBitmap;
+        cachedBitmap.setInfo(this->info().makeWH(bounds.width(), bounds.height()));
+
+        // If we can't alloc the pixels, then fail
+        if (!tryAllocBitmapPixels(&cachedBitmap)) {
+            return false;
+        }
+
+        // Try to read the pixels from the surface
+        void* buffer = cachedBitmap.getPixels();
+        bool readPixelsOk = fSurface->readPixels(bounds.fLeft, bounds.fTop,
+                                bounds.width(), bounds.height(),
                                 kSkia8888_GrPixelConfig,
-                                buffer, dst->rowBytes());
+                                buffer, cachedBitmap.rowBytes());
+
+        if (!readPixelsOk) {
+            return false;
+        }
+
+        // If we are here, pixels were read correctly from the surface.
+        cachedBitmap.setImmutable();
+        //Add to the cache
+        SkBitmapCache::Add(this, bounds, cachedBitmap);
+
+        dst->swap(cachedBitmap);
+    }
+
+    return true;
+
 }
diff --git a/gfx/skia/skia/src/gpu/SkGrPriv.h b/gfx/skia/skia/src/gpu/SkGrPriv.h
new file mode 100644
index 000000000000..77a464c8d886
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/SkGrPriv.h
@@ -0,0 +1,138 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkGrPriv_DEFINED
+#define SkGrPriv_DEFINED
+
+#include "GrTypes.h"
+#include "GrBlend.h"
+#include "SkImageInfo.h"
+#include "SkMatrix.h"
+#include "SkXfermode.h"
+
+class GrCaps;
+class GrContext;
+class GrFragmentProcessor;
+class GrPaint;
+class GrTexture;
+class GrTextureParams;
+class GrUniqueKey;
+class SkData;
+class SkPaint;
+class SkPixelRef;
+struct SkIRect;
+
+/**
+ *  Our key includes the offset, width, and height so that bitmaps created by extractSubset()
+ *  are unique.
+ *
+ *  The imageID is in the shared namespace (see SkNextID::ImageID())
+ *      - SkBitmap/SkPixelRef
+ *      - SkImage
+ *      - SkImageGenerator
+ *
+ *  Note: width/height must fit in 16bits for this impl.
+ */
+void GrMakeKeyFromImageID(GrUniqueKey* key, uint32_t imageID, const SkIRect& imageBounds);
+
+/** Call this after installing a GrUniqueKey on texture. It will cause the texture's key to be
+    removed should the bitmap's contents change or be destroyed. */
+void GrInstallBitmapUniqueKeyInvalidator(const GrUniqueKey& key, SkPixelRef* pixelRef);
+
+/** Converts an SkPaint to a GrPaint for a given GrContext. The matrix is required in order
+    to convert the SkShader (if any) on the SkPaint. The primitive itself has no color. */
+bool SkPaintToGrPaint(GrContext*,
+                      const SkPaint& skPaint,
+                      const SkMatrix& viewM,
+                      GrPaint* grPaint);
+
+/** Same as above but ignores the SkShader (if any) on skPaint. */
+bool SkPaintToGrPaintNoShader(GrContext* context,
+                              const SkPaint& skPaint,
+                              GrPaint* grPaint);
+
+/** Replaces the SkShader (if any) on skPaint with the passed in GrFragmentProcessor. The processor
+    should expect an unpremul input color and produce a premultiplied output color. There is
+    no primitive color. */
+bool SkPaintToGrPaintReplaceShader(GrContext*,
+                                   const SkPaint& skPaint,
+                                   const GrFragmentProcessor* shaderFP,
+                                   GrPaint* grPaint);
+
+/** Blends the SkPaint's shader (or color if no shader) with the color which specified via a
+    GrBatch's GrPrimitiveProcesssor. Currently there is a bool param to indicate whether the
+    primitive color is the dst or src color to the blend in order to work around differences between
+    drawVertices and drawAtlas. */
+bool SkPaintToGrPaintWithXfermode(GrContext* context,
+                                  const SkPaint& skPaint,
+                                  const SkMatrix& viewM,
+                                  SkXfermode::Mode primColorMode,
+                                  bool primitiveIsSrc,
+                                  GrPaint* grPaint);
+
+/** This is used when there is a primitive color, but the shader should be ignored. Currently,
+    the expectation is that the primitive color will be premultiplied, though it really should be
+    unpremultiplied so that interpolation is done in unpremul space. The paint's alpha will be
+    applied to the primitive color after interpolation. */
+inline bool SkPaintToGrPaintWithPrimitiveColor(GrContext* context, const SkPaint& skPaint,
+                                               GrPaint* grPaint) {
+    return SkPaintToGrPaintWithXfermode(context, skPaint, SkMatrix::I(), SkXfermode::kDst_Mode,
+                                        false, grPaint);
+}
+
+/** This is used when there may or may not be a shader, and the caller wants to plugin a texture
+    lookup.  If there is a shader, then its output will only be used if the texture is alpha8. */
+bool SkPaintToGrPaintWithTexture(GrContext* context,
+                                 const SkPaint& paint,
+                                 const SkMatrix& viewM,
+                                 const GrFragmentProcessor* fp,
+                                 bool textureIsAlphaOnly,
+                                 GrPaint* grPaint);
+
+//////////////////////////////////////////////////////////////////////////////
+
+GrSurfaceDesc GrImageInfoToSurfaceDesc(const SkImageInfo&);
+
+bool GrPixelConfig2ColorAndProfileType(GrPixelConfig, SkColorType*, SkColorProfileType*);
+
+/**
+ *  If the compressed data in the SkData is supported (as a texture format, this returns
+ *  the pixel-config that should be used, and sets outStartOfDataToUpload to the ptr into
+ *  the data where the actual raw data starts (skipping any header bytes).
+ *
+ *  If the compressed data is not supported, this returns kUnknown_GrPixelConfig, and
+ *  ignores outStartOfDataToUpload.
+ */
+GrPixelConfig GrIsCompressedTextureDataSupported(GrContext* ctx, SkData* data,
+                                                 int expectedW, int expectedH,
+                                                 const void** outStartOfDataToUpload);
+
+
+/**
+ * Creates a new texture for the bitmap. Does not concern itself with cache keys or texture params.
+ * The bitmap must have CPU-accessible pixels. Attempts to take advantage of faster paths for
+ * compressed textures and yuv planes.
+ */
+GrTexture* GrUploadBitmapToTexture(GrContext*, const SkBitmap&);
+
+//////////////////////////////////////////////////////////////////////////////
+
+GR_STATIC_ASSERT((int)kZero_GrBlendCoeff == (int)SkXfermode::kZero_Coeff);
+GR_STATIC_ASSERT((int)kOne_GrBlendCoeff == (int)SkXfermode::kOne_Coeff);
+GR_STATIC_ASSERT((int)kSC_GrBlendCoeff == (int)SkXfermode::kSC_Coeff);
+GR_STATIC_ASSERT((int)kISC_GrBlendCoeff == (int)SkXfermode::kISC_Coeff);
+GR_STATIC_ASSERT((int)kDC_GrBlendCoeff == (int)SkXfermode::kDC_Coeff);
+GR_STATIC_ASSERT((int)kIDC_GrBlendCoeff == (int)SkXfermode::kIDC_Coeff);
+GR_STATIC_ASSERT((int)kSA_GrBlendCoeff == (int)SkXfermode::kSA_Coeff);
+GR_STATIC_ASSERT((int)kISA_GrBlendCoeff == (int)SkXfermode::kISA_Coeff);
+GR_STATIC_ASSERT((int)kDA_GrBlendCoeff == (int)SkXfermode::kDA_Coeff);
+GR_STATIC_ASSERT((int)kIDA_GrBlendCoeff == (int)SkXfermode::kIDA_Coeff);
+GR_STATIC_ASSERT(SkXfermode::kCoeffCount == 10);
+
+#define SkXfermodeCoeffToGrBlendCoeff(X) ((GrBlendCoeff)(X))
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrAAConvexPathRenderer.cpp b/gfx/skia/skia/src/gpu/batches/GrAAConvexPathRenderer.cpp
new file mode 100644
index 000000000000..c5b7c579b7e3
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrAAConvexPathRenderer.cpp
@@ -0,0 +1,1031 @@
+
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrAAConvexPathRenderer.h"
+
+#include "GrAAConvexTessellator.h"
+#include "GrBatchFlushState.h"
+#include "GrBatchTest.h"
+#include "GrCaps.h"
+#include "GrContext.h"
+#include "GrDefaultGeoProcFactory.h"
+#include "GrGeometryProcessor.h"
+#include "GrInvariantOutput.h"
+#include "GrPathUtils.h"
+#include "GrProcessor.h"
+#include "GrPipelineBuilder.h"
+#include "GrStrokeInfo.h"
+#include "SkGeometry.h"
+#include "SkPathPriv.h"
+#include "SkString.h"
+#include "SkTraceEvent.h"
+#include "batches/GrVertexBatch.h"
+#include "glsl/GrGLSLGeometryProcessor.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+#include "glsl/GrGLSLVarying.h"
+
+GrAAConvexPathRenderer::GrAAConvexPathRenderer() {
+}
+
+struct Segment {
+    enum {
+        // These enum values are assumed in member functions below.
+        kLine = 0,
+        kQuad = 1,
+    } fType;
+
+    // line uses one pt, quad uses 2 pts
+    SkPoint fPts[2];
+    // normal to edge ending at each pt
+    SkVector fNorms[2];
+    // is the corner where the previous segment meets this segment
+    // sharp. If so, fMid is a normalized bisector facing outward.
+    SkVector fMid;
+
+    int countPoints() {
+        GR_STATIC_ASSERT(0 == kLine && 1 == kQuad);
+        return fType + 1;
+    }
+    const SkPoint& endPt() const {
+        GR_STATIC_ASSERT(0 == kLine && 1 == kQuad);
+        return fPts[fType];
+    };
+    const SkPoint& endNorm() const {
+        GR_STATIC_ASSERT(0 == kLine && 1 == kQuad);
+        return fNorms[fType];
+    };
+};
+
+typedef SkTArray<Segment, true> SegmentArray;
+
+static void center_of_mass(const SegmentArray& segments, SkPoint* c) {
+    SkScalar area = 0;
+    SkPoint center = {0, 0};
+    int count = segments.count();
+    SkPoint p0 = {0, 0};
+    if (count > 2) {
+        // We translate the polygon so that the first point is at the origin.
+        // This avoids some precision issues with small area polygons far away
+        // from the origin.
+        p0 = segments[0].endPt();
+        SkPoint pi;
+        SkPoint pj;
+        // the first and last iteration of the below loop would compute
+        // zeros since the starting / ending point is (0,0). So instead we start
+        // at i=1 and make the last iteration i=count-2.
+        pj = segments[1].endPt() - p0;
+        for (int i = 1; i < count - 1; ++i) {
+            pi = pj;
+            pj = segments[i + 1].endPt() - p0;
+
+            SkScalar t = SkPoint::CrossProduct(pi, pj);
+            area += t;
+            center.fX += (pi.fX + pj.fX) * t;
+            center.fY += (pi.fY + pj.fY) * t;
+        }
+    }
+
+    // If the poly has no area then we instead return the average of
+    // its points.
+    if (SkScalarNearlyZero(area)) {
+        SkPoint avg;
+        avg.set(0, 0);
+        for (int i = 0; i < count; ++i) {
+            const SkPoint& pt = segments[i].endPt();
+            avg.fX += pt.fX;
+            avg.fY += pt.fY;
+        }
+        SkScalar denom = SK_Scalar1 / count;
+        avg.scale(denom);
+        *c = avg;
+    } else {
+        area *= 3;
+        area = SkScalarInvert(area);
+        center.scale(area);
+        // undo the translate of p0 to the origin.
+        *c = center + p0;
+    }
+    SkASSERT(!SkScalarIsNaN(c->fX) && !SkScalarIsNaN(c->fY));
+}
+
+static void compute_vectors(SegmentArray* segments,
+                            SkPoint* fanPt,
+                            SkPathPriv::FirstDirection dir,
+                            int* vCount,
+                            int* iCount) {
+    center_of_mass(*segments, fanPt);
+    int count = segments->count();
+
+    // Make the normals point towards the outside
+    SkPoint::Side normSide;
+    if (dir == SkPathPriv::kCCW_FirstDirection) {
+        normSide = SkPoint::kRight_Side;
+    } else {
+        normSide = SkPoint::kLeft_Side;
+    }
+
+    *vCount = 0;
+    *iCount = 0;
+    // compute normals at all points
+    for (int a = 0; a < count; ++a) {
+        Segment& sega = (*segments)[a];
+        int b = (a + 1) % count;
+        Segment& segb = (*segments)[b];
+
+        const SkPoint* prevPt = &sega.endPt();
+        int n = segb.countPoints();
+        for (int p = 0; p < n; ++p) {
+            segb.fNorms[p] = segb.fPts[p] - *prevPt;
+            segb.fNorms[p].normalize();
+            segb.fNorms[p].setOrthog(segb.fNorms[p], normSide);
+            prevPt = &segb.fPts[p];
+        }
+        if (Segment::kLine == segb.fType) {
+            *vCount += 5;
+            *iCount += 9;
+        } else {
+            *vCount += 6;
+            *iCount += 12;
+        }
+    }
+
+    // compute mid-vectors where segments meet. TODO: Detect shallow corners
+    // and leave out the wedges and close gaps by stitching segments together.
+    for (int a = 0; a < count; ++a) {
+        const Segment& sega = (*segments)[a];
+        int b = (a + 1) % count;
+        Segment& segb = (*segments)[b];
+        segb.fMid = segb.fNorms[0] + sega.endNorm();
+        segb.fMid.normalize();
+        // corner wedges
+        *vCount += 4;
+        *iCount += 6;
+    }
+}
+
+struct DegenerateTestData {
+    DegenerateTestData() { fStage = kInitial; }
+    bool isDegenerate() const { return kNonDegenerate != fStage; }
+    enum {
+        kInitial,
+        kPoint,
+        kLine,
+        kNonDegenerate
+    }           fStage;
+    SkPoint     fFirstPoint;
+    SkVector    fLineNormal;
+    SkScalar    fLineC;
+};
+
+static const SkScalar kClose = (SK_Scalar1 / 16);
+static const SkScalar kCloseSqd = SkScalarMul(kClose, kClose);
+
+static void update_degenerate_test(DegenerateTestData* data, const SkPoint& pt) {
+    switch (data->fStage) {
+        case DegenerateTestData::kInitial:
+            data->fFirstPoint = pt;
+            data->fStage = DegenerateTestData::kPoint;
+            break;
+        case DegenerateTestData::kPoint:
+            if (pt.distanceToSqd(data->fFirstPoint) > kCloseSqd) {
+                data->fLineNormal = pt - data->fFirstPoint;
+                data->fLineNormal.normalize();
+                data->fLineNormal.setOrthog(data->fLineNormal);
+                data->fLineC = -data->fLineNormal.dot(data->fFirstPoint);
+                data->fStage = DegenerateTestData::kLine;
+            }
+            break;
+        case DegenerateTestData::kLine:
+            if (SkScalarAbs(data->fLineNormal.dot(pt) + data->fLineC) > kClose) {
+                data->fStage = DegenerateTestData::kNonDegenerate;
+            }
+        case DegenerateTestData::kNonDegenerate:
+            break;
+        default:
+            SkFAIL("Unexpected degenerate test stage.");
+    }
+}
+
+static inline bool get_direction(const SkPath& path, const SkMatrix& m,
+                                 SkPathPriv::FirstDirection* dir) {
+    if (!SkPathPriv::CheapComputeFirstDirection(path, dir)) {
+        return false;
+    }
+    // check whether m reverses the orientation
+    SkASSERT(!m.hasPerspective());
+    SkScalar det2x2 = SkScalarMul(m.get(SkMatrix::kMScaleX), m.get(SkMatrix::kMScaleY)) -
+                      SkScalarMul(m.get(SkMatrix::kMSkewX), m.get(SkMatrix::kMSkewY));
+    if (det2x2 < 0) {
+        *dir = SkPathPriv::OppositeFirstDirection(*dir);
+    }
+    return true;
+}
+
+static inline void add_line_to_segment(const SkPoint& pt,
+                                       SegmentArray* segments) {
+    segments->push_back();
+    segments->back().fType = Segment::kLine;
+    segments->back().fPts[0] = pt;
+}
+
+static inline void add_quad_segment(const SkPoint pts[3],
+                                    SegmentArray* segments) {
+    if (pts[0].distanceToSqd(pts[1]) < kCloseSqd || pts[1].distanceToSqd(pts[2]) < kCloseSqd) {
+        if (pts[0] != pts[2]) {
+            add_line_to_segment(pts[2], segments);
+        }
+    } else {
+        segments->push_back();
+        segments->back().fType = Segment::kQuad;
+        segments->back().fPts[0] = pts[1];
+        segments->back().fPts[1] = pts[2];
+    }
+}
+
+static inline void add_cubic_segments(const SkPoint pts[4],
+                                      SkPathPriv::FirstDirection dir,
+                                      SegmentArray* segments) {
+    SkSTArray<15, SkPoint, true> quads;
+    GrPathUtils::convertCubicToQuads(pts, SK_Scalar1, true, dir, &quads);
+    int count = quads.count();
+    for (int q = 0; q < count; q += 3) {
+        add_quad_segment(&quads[q], segments);
+    }
+}
+
+static bool get_segments(const SkPath& path,
+                         const SkMatrix& m,
+                         SegmentArray* segments,
+                         SkPoint* fanPt,
+                         int* vCount,
+                         int* iCount) {
+    SkPath::Iter iter(path, true);
+    // This renderer over-emphasizes very thin path regions. We use the distance
+    // to the path from the sample to compute coverage. Every pixel intersected
+    // by the path will be hit and the maximum distance is sqrt(2)/2. We don't
+    // notice that the sample may be close to a very thin area of the path and
+    // thus should be very light. This is particularly egregious for degenerate
+    // line paths. We detect paths that are very close to a line (zero area) and
+    // draw nothing.
+    DegenerateTestData degenerateData;
+    SkPathPriv::FirstDirection dir;
+    // get_direction can fail for some degenerate paths.
+    if (!get_direction(path, m, &dir)) {
+        return false;
+    }
+
+    for (;;) {
+        SkPoint pts[4];
+        SkPath::Verb verb = iter.next(pts);
+        switch (verb) {
+            case SkPath::kMove_Verb:
+                m.mapPoints(pts, 1);
+                update_degenerate_test(&degenerateData, pts[0]);
+                break;
+            case SkPath::kLine_Verb: {
+                m.mapPoints(&pts[1], 1);
+                update_degenerate_test(&degenerateData, pts[1]);
+                add_line_to_segment(pts[1], segments);
+                break;
+            }
+            case SkPath::kQuad_Verb:
+                m.mapPoints(pts, 3);
+                update_degenerate_test(&degenerateData, pts[1]);
+                update_degenerate_test(&degenerateData, pts[2]);
+                add_quad_segment(pts, segments);
+                break;
+            case SkPath::kConic_Verb: {
+                m.mapPoints(pts, 3);
+                SkScalar weight = iter.conicWeight();
+                SkAutoConicToQuads converter;
+                const SkPoint* quadPts = converter.computeQuads(pts, weight, 0.5f);
+                for (int i = 0; i < converter.countQuads(); ++i) {
+                    update_degenerate_test(&degenerateData, quadPts[2*i + 1]);
+                    update_degenerate_test(&degenerateData, quadPts[2*i + 2]);
+                    add_quad_segment(quadPts + 2*i, segments);
+                }
+                break;
+            }
+            case SkPath::kCubic_Verb: {
+                m.mapPoints(pts, 4);
+                update_degenerate_test(&degenerateData, pts[1]);
+                update_degenerate_test(&degenerateData, pts[2]);
+                update_degenerate_test(&degenerateData, pts[3]);
+                add_cubic_segments(pts, dir, segments);
+                break;
+            };
+            case SkPath::kDone_Verb:
+                if (degenerateData.isDegenerate()) {
+                    return false;
+                } else {
+                    compute_vectors(segments, fanPt, dir, vCount, iCount);
+                    return true;
+                }
+            default:
+                break;
+        }
+    }
+}
+
+struct QuadVertex {
+    SkPoint  fPos;
+    SkPoint  fUV;
+    SkScalar fD0;
+    SkScalar fD1;
+};
+
+struct Draw {
+    Draw() : fVertexCnt(0), fIndexCnt(0) {}
+    int fVertexCnt;
+    int fIndexCnt;
+};
+
+typedef SkTArray<Draw, true> DrawArray;
+
+static void create_vertices(const SegmentArray&  segments,
+                            const SkPoint& fanPt,
+                            DrawArray*     draws,
+                            QuadVertex*    verts,
+                            uint16_t*      idxs) {
+    Draw* draw = &draws->push_back();
+    // alias just to make vert/index assignments easier to read.
+    int* v = &draw->fVertexCnt;
+    int* i = &draw->fIndexCnt;
+
+    int count = segments.count();
+    for (int a = 0; a < count; ++a) {
+        const Segment& sega = segments[a];
+        int b = (a + 1) % count;
+        const Segment& segb = segments[b];
+
+        // Check whether adding the verts for this segment to the current draw would cause index
+        // values to overflow.
+        int vCount = 4;
+        if (Segment::kLine == segb.fType) {
+            vCount += 5;
+        } else {
+            vCount += 6;
+        }
+        if (draw->fVertexCnt + vCount > (1 << 16)) {
+            verts += *v;
+            idxs += *i;
+            draw = &draws->push_back();
+            v = &draw->fVertexCnt;
+            i = &draw->fIndexCnt;
+        }
+
+        // FIXME: These tris are inset in the 1 unit arc around the corner
+        verts[*v + 0].fPos = sega.endPt();
+        verts[*v + 1].fPos = verts[*v + 0].fPos + sega.endNorm();
+        verts[*v + 2].fPos = verts[*v + 0].fPos + segb.fMid;
+        verts[*v + 3].fPos = verts[*v + 0].fPos + segb.fNorms[0];
+        verts[*v + 0].fUV.set(0,0);
+        verts[*v + 1].fUV.set(0,-SK_Scalar1);
+        verts[*v + 2].fUV.set(0,-SK_Scalar1);
+        verts[*v + 3].fUV.set(0,-SK_Scalar1);
+        verts[*v + 0].fD0 = verts[*v + 0].fD1 = -SK_Scalar1;
+        verts[*v + 1].fD0 = verts[*v + 1].fD1 = -SK_Scalar1;
+        verts[*v + 2].fD0 = verts[*v + 2].fD1 = -SK_Scalar1;
+        verts[*v + 3].fD0 = verts[*v + 3].fD1 = -SK_Scalar1;
+
+        idxs[*i + 0] = *v + 0;
+        idxs[*i + 1] = *v + 2;
+        idxs[*i + 2] = *v + 1;
+        idxs[*i + 3] = *v + 0;
+        idxs[*i + 4] = *v + 3;
+        idxs[*i + 5] = *v + 2;
+
+        *v += 4;
+        *i += 6;
+
+        if (Segment::kLine == segb.fType) {
+            verts[*v + 0].fPos = fanPt;
+            verts[*v + 1].fPos = sega.endPt();
+            verts[*v + 2].fPos = segb.fPts[0];
+
+            verts[*v + 3].fPos = verts[*v + 1].fPos + segb.fNorms[0];
+            verts[*v + 4].fPos = verts[*v + 2].fPos + segb.fNorms[0];
+
+            // we draw the line edge as a degenerate quad (u is 0, v is the
+            // signed distance to the edge)
+            SkScalar dist = fanPt.distanceToLineBetween(verts[*v + 1].fPos,
+                                                        verts[*v + 2].fPos);
+            verts[*v + 0].fUV.set(0, dist);
+            verts[*v + 1].fUV.set(0, 0);
+            verts[*v + 2].fUV.set(0, 0);
+            verts[*v + 3].fUV.set(0, -SK_Scalar1);
+            verts[*v + 4].fUV.set(0, -SK_Scalar1);
+
+            verts[*v + 0].fD0 = verts[*v + 0].fD1 = -SK_Scalar1;
+            verts[*v + 1].fD0 = verts[*v + 1].fD1 = -SK_Scalar1;
+            verts[*v + 2].fD0 = verts[*v + 2].fD1 = -SK_Scalar1;
+            verts[*v + 3].fD0 = verts[*v + 3].fD1 = -SK_Scalar1;
+            verts[*v + 4].fD0 = verts[*v + 4].fD1 = -SK_Scalar1;
+
+            idxs[*i + 0] = *v + 3;
+            idxs[*i + 1] = *v + 1;
+            idxs[*i + 2] = *v + 2;
+
+            idxs[*i + 3] = *v + 4;
+            idxs[*i + 4] = *v + 3;
+            idxs[*i + 5] = *v + 2;
+
+            *i += 6;
+
+            // Draw the interior fan if it exists.
+            // TODO: Detect and combine colinear segments. This will ensure we catch every case
+            // with no interior, and that the resulting shared edge uses the same endpoints.
+            if (count >= 3) {
+                idxs[*i + 0] = *v + 0;
+                idxs[*i + 1] = *v + 2;
+                idxs[*i + 2] = *v + 1;
+
+                *i += 3;
+            }
+
+            *v += 5;
+        } else {
+            SkPoint qpts[] = {sega.endPt(), segb.fPts[0], segb.fPts[1]};
+
+            SkVector midVec = segb.fNorms[0] + segb.fNorms[1];
+            midVec.normalize();
+
+            verts[*v + 0].fPos = fanPt;
+            verts[*v + 1].fPos = qpts[0];
+            verts[*v + 2].fPos = qpts[2];
+            verts[*v + 3].fPos = qpts[0] + segb.fNorms[0];
+            verts[*v + 4].fPos = qpts[2] + segb.fNorms[1];
+            verts[*v + 5].fPos = qpts[1] + midVec;
+
+            SkScalar c = segb.fNorms[0].dot(qpts[0]);
+            verts[*v + 0].fD0 =  -segb.fNorms[0].dot(fanPt) + c;
+            verts[*v + 1].fD0 =  0.f;
+            verts[*v + 2].fD0 =  -segb.fNorms[0].dot(qpts[2]) + c;
+            verts[*v + 3].fD0 = -SK_ScalarMax/100;
+            verts[*v + 4].fD0 = -SK_ScalarMax/100;
+            verts[*v + 5].fD0 = -SK_ScalarMax/100;
+
+            c = segb.fNorms[1].dot(qpts[2]);
+            verts[*v + 0].fD1 =  -segb.fNorms[1].dot(fanPt) + c;
+            verts[*v + 1].fD1 =  -segb.fNorms[1].dot(qpts[0]) + c;
+            verts[*v + 2].fD1 =  0.f;
+            verts[*v + 3].fD1 = -SK_ScalarMax/100;
+            verts[*v + 4].fD1 = -SK_ScalarMax/100;
+            verts[*v + 5].fD1 = -SK_ScalarMax/100;
+
+            GrPathUtils::QuadUVMatrix toUV(qpts);
+            toUV.apply<6, sizeof(QuadVertex), sizeof(SkPoint)>(verts + *v);
+
+            idxs[*i + 0] = *v + 3;
+            idxs[*i + 1] = *v + 1;
+            idxs[*i + 2] = *v + 2;
+            idxs[*i + 3] = *v + 4;
+            idxs[*i + 4] = *v + 3;
+            idxs[*i + 5] = *v + 2;
+
+            idxs[*i + 6] = *v + 5;
+            idxs[*i + 7] = *v + 3;
+            idxs[*i + 8] = *v + 4;
+
+            *i += 9;
+
+            // Draw the interior fan if it exists.
+            // TODO: Detect and combine colinear segments. This will ensure we catch every case
+            // with no interior, and that the resulting shared edge uses the same endpoints.
+            if (count >= 3) {
+                idxs[*i + 0] = *v + 0;
+                idxs[*i + 1] = *v + 2;
+                idxs[*i + 2] = *v + 1;
+
+                *i += 3;
+            }
+
+            *v += 6;
+        }
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+/*
+ * Quadratic specified by 0=u^2-v canonical coords. u and v are the first
+ * two components of the vertex attribute. Coverage is based on signed
+ * distance with negative being inside, positive outside. The edge is specified in
+ * window space (y-down). If either the third or fourth component of the interpolated
+ * vertex coord is > 0 then the pixel is considered outside the edge. This is used to
+ * attempt to trim to a portion of the infinite quad.
+ * Requires shader derivative instruction support.
+ */
+
+class QuadEdgeEffect : public GrGeometryProcessor {
+public:
+
+    static GrGeometryProcessor* Create(GrColor color, const SkMatrix& localMatrix,
+                                       bool usesLocalCoords) {
+        return new QuadEdgeEffect(color, localMatrix, usesLocalCoords);
+    }
+
+    virtual ~QuadEdgeEffect() {}
+
+    const char* name() const override { return "QuadEdge"; }
+
+    const Attribute* inPosition() const { return fInPosition; }
+    const Attribute* inQuadEdge() const { return fInQuadEdge; }
+    GrColor color() const { return fColor; }
+    bool colorIgnored() const { return GrColor_ILLEGAL == fColor; }
+    const SkMatrix& localMatrix() const { return fLocalMatrix; }
+    bool usesLocalCoords() const { return fUsesLocalCoords; }
+
+    class GLSLProcessor : public GrGLSLGeometryProcessor {
+    public:
+        GLSLProcessor()
+            : fColor(GrColor_ILLEGAL) {}
+
+        void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override {
+            const QuadEdgeEffect& qe = args.fGP.cast<QuadEdgeEffect>();
+            GrGLSLGPBuilder* pb = args.fPB;
+            GrGLSLVertexBuilder* vertBuilder = args.fVertBuilder;
+            GrGLSLVaryingHandler* varyingHandler = args.fVaryingHandler;
+
+            // emit attributes
+            varyingHandler->emitAttributes(qe);
+
+            GrGLSLVertToFrag v(kVec4f_GrSLType);
+            varyingHandler->addVarying("QuadEdge", &v);
+            vertBuilder->codeAppendf("%s = %s;", v.vsOut(), qe.inQuadEdge()->fName);
+
+            GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+            // Setup pass through color
+            if (!qe.colorIgnored()) {
+                this->setupUniformColor(pb, fragBuilder, args.fOutputColor, &fColorUniform);
+            }
+
+            // Setup position
+            this->setupPosition(pb, vertBuilder, gpArgs, qe.inPosition()->fName);
+
+            // emit transforms
+            this->emitTransforms(args.fPB,
+                                 vertBuilder,
+                                 varyingHandler,
+                                 gpArgs->fPositionVar,
+                                 qe.inPosition()->fName,
+                                 qe.localMatrix(),
+                                 args.fTransformsIn,
+                                 args.fTransformsOut);
+
+            SkAssertResult(fragBuilder->enableFeature(
+                    GrGLSLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));
+            fragBuilder->codeAppendf("float edgeAlpha;");
+
+            // keep the derivative instructions outside the conditional
+            fragBuilder->codeAppendf("vec2 duvdx = dFdx(%s.xy);", v.fsIn());
+            fragBuilder->codeAppendf("vec2 duvdy = dFdy(%s.xy);", v.fsIn());
+            fragBuilder->codeAppendf("if (%s.z > 0.0 && %s.w > 0.0) {", v.fsIn(), v.fsIn());
+            // today we know z and w are in device space. We could use derivatives
+            fragBuilder->codeAppendf("edgeAlpha = min(min(%s.z, %s.w) + 0.5, 1.0);", v.fsIn(),
+                                     v.fsIn());
+            fragBuilder->codeAppendf ("} else {");
+            fragBuilder->codeAppendf("vec2 gF = vec2(2.0*%s.x*duvdx.x - duvdx.y,"
+                                     "               2.0*%s.x*duvdy.x - duvdy.y);",
+                                     v.fsIn(), v.fsIn());
+            fragBuilder->codeAppendf("edgeAlpha = (%s.x*%s.x - %s.y);", v.fsIn(), v.fsIn(),
+                                     v.fsIn());
+            fragBuilder->codeAppendf("edgeAlpha = "
+                                     "clamp(0.5 - edgeAlpha / length(gF), 0.0, 1.0);}");
+
+            fragBuilder->codeAppendf("%s = vec4(edgeAlpha);", args.fOutputCoverage);
+        }
+
+        static inline void GenKey(const GrGeometryProcessor& gp,
+                                  const GrGLSLCaps&,
+                                  GrProcessorKeyBuilder* b) {
+            const QuadEdgeEffect& qee = gp.cast<QuadEdgeEffect>();
+            uint32_t key = 0;
+            key |= qee.usesLocalCoords() && qee.localMatrix().hasPerspective() ? 0x1 : 0x0;
+            key |= qee.colorIgnored() ? 0x2 : 0x0;
+            b->add32(key);
+        }
+
+        void setData(const GrGLSLProgramDataManager& pdman,
+                     const GrPrimitiveProcessor& gp) override {
+            const QuadEdgeEffect& qe = gp.cast<QuadEdgeEffect>();
+            if (qe.color() != fColor) {
+                float c[4];
+                GrColorToRGBAFloat(qe.color(), c);
+                pdman.set4fv(fColorUniform, 1, c);
+                fColor = qe.color();
+            }
+        }
+
+        void setTransformData(const GrPrimitiveProcessor& primProc,
+                              const GrGLSLProgramDataManager& pdman,
+                              int index,
+                              const SkTArray<const GrCoordTransform*, true>& transforms) override {
+            this->setTransformDataHelper<QuadEdgeEffect>(primProc, pdman, index, transforms);
+        }
+
+    private:
+        GrColor fColor;
+        UniformHandle fColorUniform;
+
+        typedef GrGLSLGeometryProcessor INHERITED;
+    };
+
+    void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {
+        GLSLProcessor::GenKey(*this, caps, b);
+    }
+
+    GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override {
+        return new GLSLProcessor();
+    }
+
+private:
+    QuadEdgeEffect(GrColor color, const SkMatrix& localMatrix, bool usesLocalCoords)
+        : fColor(color)
+        , fLocalMatrix(localMatrix)
+        , fUsesLocalCoords(usesLocalCoords) {
+        this->initClassID<QuadEdgeEffect>();
+        fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType));
+        fInQuadEdge = &this->addVertexAttrib(Attribute("inQuadEdge", kVec4f_GrVertexAttribType));
+    }
+
+    const Attribute* fInPosition;
+    const Attribute* fInQuadEdge;
+    GrColor          fColor;
+    SkMatrix         fLocalMatrix;
+    bool             fUsesLocalCoords;
+
+    GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
+
+    typedef GrGeometryProcessor INHERITED;
+};
+
+GR_DEFINE_GEOMETRY_PROCESSOR_TEST(QuadEdgeEffect);
+
+const GrGeometryProcessor* QuadEdgeEffect::TestCreate(GrProcessorTestData* d) {
+    // Doesn't work without derivative instructions.
+    return d->fCaps->shaderCaps()->shaderDerivativeSupport() ?
+           QuadEdgeEffect::Create(GrRandomColor(d->fRandom),
+                                  GrTest::TestMatrix(d->fRandom),
+                                  d->fRandom->nextBool()) : nullptr;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+bool GrAAConvexPathRenderer::onCanDrawPath(const CanDrawPathArgs& args) const {
+    return (args.fShaderCaps->shaderDerivativeSupport() && args.fAntiAlias &&
+            args.fStroke->isFillStyle() && !args.fPath->isInverseFillType() &&
+            args.fPath->isConvex());
+}
+
+// extract the result vertices and indices from the GrAAConvexTessellator
+static void extract_verts(const GrAAConvexTessellator& tess,
+                          void* vertices,
+                          size_t vertexStride,
+                          GrColor color,
+                          uint16_t* idxs,
+                          bool tweakAlphaForCoverage) {
+    intptr_t verts = reinterpret_cast<intptr_t>(vertices);
+
+    for (int i = 0; i < tess.numPts(); ++i) {
+        *((SkPoint*)((intptr_t)verts + i * vertexStride)) = tess.point(i);
+    }
+
+    // Make 'verts' point to the colors
+    verts += sizeof(SkPoint);
+    for (int i = 0; i < tess.numPts(); ++i) {
+        if (tweakAlphaForCoverage) {
+            SkASSERT(SkScalarRoundToInt(255.0f * tess.coverage(i)) <= 255);
+            unsigned scale = SkScalarRoundToInt(255.0f * tess.coverage(i));
+            GrColor scaledColor = (0xff == scale) ? color : SkAlphaMulQ(color, scale);
+            *reinterpret_cast<GrColor*>(verts + i * vertexStride) = scaledColor;
+        } else {
+            *reinterpret_cast<GrColor*>(verts + i * vertexStride) = color;
+            *reinterpret_cast<float*>(verts + i * vertexStride + sizeof(GrColor)) = 
+                    tess.coverage(i);
+        }
+    }
+
+    for (int i = 0; i < tess.numIndices(); ++i) {
+        idxs[i] = tess.index(i);
+    }
+}
+
+static const GrGeometryProcessor* create_fill_gp(bool tweakAlphaForCoverage,
+                                                 const SkMatrix& viewMatrix,
+                                                 bool usesLocalCoords,
+                                                 bool coverageIgnored) {
+    using namespace GrDefaultGeoProcFactory;
+
+    Color color(Color::kAttribute_Type);
+    Coverage::Type coverageType;
+    // TODO remove coverage if coverage is ignored
+    /*if (coverageIgnored) {
+        coverageType = Coverage::kNone_Type;
+    } else*/ if (tweakAlphaForCoverage) {
+        coverageType = Coverage::kSolid_Type;
+    } else {
+        coverageType = Coverage::kAttribute_Type;
+    }
+    Coverage coverage(coverageType);
+    LocalCoords localCoords(usesLocalCoords ? LocalCoords::kUsePosition_Type :
+                                              LocalCoords::kUnused_Type);
+    return CreateForDeviceSpace(color, coverage, localCoords, viewMatrix);
+}
+
+class AAConvexPathBatch : public GrVertexBatch {
+public:
+    DEFINE_BATCH_CLASS_ID
+    struct Geometry {
+        GrColor fColor;
+        SkMatrix fViewMatrix;
+        SkPath fPath;
+    };
+
+    static GrDrawBatch* Create(const Geometry& geometry) { return new AAConvexPathBatch(geometry); }
+
+    const char* name() const override { return "AAConvexBatch"; }
+
+    void computePipelineOptimizations(GrInitInvariantOutput* color, 
+                                      GrInitInvariantOutput* coverage,
+                                      GrBatchToXPOverrides* overrides) const override {
+        // When this is called on a batch, there is only one geometry bundle
+        color->setKnownFourComponents(fGeoData[0].fColor);
+        coverage->setUnknownSingleComponent();
+        overrides->fUsePLSDstRead = false;
+    }
+
+private:
+    void initBatchTracker(const GrXPOverridesForBatch& overrides) override {
+        // Handle any color overrides
+        if (!overrides.readsColor()) {
+            fGeoData[0].fColor = GrColor_ILLEGAL;
+        }
+        overrides.getOverrideColorIfSet(&fGeoData[0].fColor);
+
+        // setup batch properties
+        fBatch.fColorIgnored = !overrides.readsColor();
+        fBatch.fColor = fGeoData[0].fColor;
+        fBatch.fUsesLocalCoords = overrides.readsLocalCoords();
+        fBatch.fCoverageIgnored = !overrides.readsCoverage();
+        fBatch.fLinesOnly = SkPath::kLine_SegmentMask == fGeoData[0].fPath.getSegmentMasks();
+        fBatch.fCanTweakAlphaForCoverage = overrides.canTweakAlphaForCoverage();
+    }
+
+    void prepareLinesOnlyDraws(Target* target) const {
+        bool canTweakAlphaForCoverage = this->canTweakAlphaForCoverage();
+
+        // Setup GrGeometryProcessor
+        SkAutoTUnref<const GrGeometryProcessor> gp(create_fill_gp(canTweakAlphaForCoverage,
+                                                                  this->viewMatrix(),
+                                                                  this->usesLocalCoords(),
+                                                                  this->coverageIgnored()));
+        if (!gp) {
+            SkDebugf("Could not create GrGeometryProcessor\n");
+            return;
+        }
+
+        target->initDraw(gp, this->pipeline());
+
+        size_t vertexStride = gp->getVertexStride();
+
+        SkASSERT(canTweakAlphaForCoverage ?
+                 vertexStride == sizeof(GrDefaultGeoProcFactory::PositionColorAttr) :
+                 vertexStride == sizeof(GrDefaultGeoProcFactory::PositionColorCoverageAttr));
+
+        GrAAConvexTessellator tess;
+
+        int instanceCount = fGeoData.count();
+
+        for (int i = 0; i < instanceCount; i++) {
+            tess.rewind();
+
+            const Geometry& args = fGeoData[i];
+
+            if (!tess.tessellate(args.fViewMatrix, args.fPath)) {
+                continue;
+            }
+
+            const GrVertexBuffer* vertexBuffer;
+            int firstVertex;
+
+            void* verts = target->makeVertexSpace(vertexStride, tess.numPts(), &vertexBuffer,
+                                                  &firstVertex);
+            if (!verts) {
+                SkDebugf("Could not allocate vertices\n");
+                return;
+            }
+
+            const GrIndexBuffer* indexBuffer;
+            int firstIndex;
+
+            uint16_t* idxs = target->makeIndexSpace(tess.numIndices(), &indexBuffer, &firstIndex);
+            if (!idxs) {
+                SkDebugf("Could not allocate indices\n");
+                return;
+            }
+
+            extract_verts(tess, verts, vertexStride, args.fColor, idxs, canTweakAlphaForCoverage);
+
+            GrVertices info;
+            info.initIndexed(kTriangles_GrPrimitiveType,
+                             vertexBuffer, indexBuffer,
+                             firstVertex, firstIndex,
+                             tess.numPts(), tess.numIndices());
+            target->draw(info);
+        }
+    }
+
+    void onPrepareDraws(Target* target) const override {
+#ifndef SK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS
+        if (this->linesOnly()) {
+            this->prepareLinesOnlyDraws(target);
+            return;
+        }
+#endif
+
+        int instanceCount = fGeoData.count();
+
+        SkMatrix invert;
+        if (this->usesLocalCoords() && !this->viewMatrix().invert(&invert)) {
+            SkDebugf("Could not invert viewmatrix\n");
+            return;
+        }
+
+        // Setup GrGeometryProcessor
+        SkAutoTUnref<GrGeometryProcessor> quadProcessor(
+                QuadEdgeEffect::Create(this->color(), invert, this->usesLocalCoords()));
+
+        target->initDraw(quadProcessor, this->pipeline());
+
+        // TODO generate all segments for all paths and use one vertex buffer
+        for (int i = 0; i < instanceCount; i++) {
+            const Geometry& args = fGeoData[i];
+
+            // We use the fact that SkPath::transform path does subdivision based on
+            // perspective. Otherwise, we apply the view matrix when copying to the
+            // segment representation.
+            const SkMatrix* viewMatrix = &args.fViewMatrix;
+
+            // We avoid initializing the path unless we have to
+            const SkPath* pathPtr = &args.fPath;
+            SkTLazy<SkPath> tmpPath;
+            if (viewMatrix->hasPerspective()) {
+                SkPath* tmpPathPtr = tmpPath.init(*pathPtr);
+                tmpPathPtr->setIsVolatile(true);
+                tmpPathPtr->transform(*viewMatrix);
+                viewMatrix = &SkMatrix::I();
+                pathPtr = tmpPathPtr;
+            }
+
+            int vertexCount;
+            int indexCount;
+            enum {
+                kPreallocSegmentCnt = 512 / sizeof(Segment),
+                kPreallocDrawCnt = 4,
+            };
+            SkSTArray<kPreallocSegmentCnt, Segment, true> segments;
+            SkPoint fanPt;
+
+            if (!get_segments(*pathPtr, *viewMatrix, &segments, &fanPt, &vertexCount,
+                              &indexCount)) {
+                continue;
+            }
+
+            const GrVertexBuffer* vertexBuffer;
+            int firstVertex;
+
+            size_t vertexStride = quadProcessor->getVertexStride();
+            QuadVertex* verts = reinterpret_cast<QuadVertex*>(target->makeVertexSpace(
+                vertexStride, vertexCount, &vertexBuffer, &firstVertex));
+
+            if (!verts) {
+                SkDebugf("Could not allocate vertices\n");
+                return;
+            }
+
+            const GrIndexBuffer* indexBuffer;
+            int firstIndex;
+
+            uint16_t *idxs = target->makeIndexSpace(indexCount, &indexBuffer, &firstIndex);
+            if (!idxs) {
+                SkDebugf("Could not allocate indices\n");
+                return;
+            }
+
+            SkSTArray<kPreallocDrawCnt, Draw, true> draws;
+            create_vertices(segments, fanPt, &draws, verts, idxs);
+
+            GrVertices vertices;
+
+            for (int j = 0; j < draws.count(); ++j) {
+                const Draw& draw = draws[j];
+                vertices.initIndexed(kTriangles_GrPrimitiveType, vertexBuffer, indexBuffer,
+                                     firstVertex, firstIndex, draw.fVertexCnt, draw.fIndexCnt);
+                target->draw(vertices);
+                firstVertex += draw.fVertexCnt;
+                firstIndex += draw.fIndexCnt;
+            }
+        }
+    }
+
+    SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
+
+    AAConvexPathBatch(const Geometry& geometry) : INHERITED(ClassID()) {
+        fGeoData.push_back(geometry);
+
+        // compute bounds
+        fBounds = geometry.fPath.getBounds();
+        geometry.fViewMatrix.mapRect(&fBounds);
+    }
+
+    bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override {
+        AAConvexPathBatch* that = t->cast<AAConvexPathBatch>();
+        if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *that->pipeline(),
+                                    that->bounds(), caps)) {
+            return false;
+        }
+
+        if (this->color() != that->color()) {
+            return false;
+        }
+
+        SkASSERT(this->usesLocalCoords() == that->usesLocalCoords());
+        if (this->usesLocalCoords() && !this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
+            return false;
+        }
+
+        if (this->linesOnly() != that->linesOnly()) {
+            return false;
+        }
+
+        // In the event of two batches, one who can tweak, one who cannot, we just fall back to
+        // not tweaking
+        if (this->canTweakAlphaForCoverage() != that->canTweakAlphaForCoverage()) {
+            fBatch.fCanTweakAlphaForCoverage = false;
+        }
+
+        fGeoData.push_back_n(that->geoData()->count(), that->geoData()->begin());
+        this->joinBounds(that->bounds());
+        return true;
+    }
+
+    GrColor color() const { return fBatch.fColor; }
+    bool linesOnly() const { return fBatch.fLinesOnly; }
+    bool usesLocalCoords() const { return fBatch.fUsesLocalCoords; }
+    bool canTweakAlphaForCoverage() const { return fBatch.fCanTweakAlphaForCoverage; }
+    const SkMatrix& viewMatrix() const { return fGeoData[0].fViewMatrix; }
+    bool coverageIgnored() const { return fBatch.fCoverageIgnored; }
+
+    struct BatchTracker {
+        GrColor fColor;
+        bool fUsesLocalCoords;
+        bool fColorIgnored;
+        bool fCoverageIgnored;
+        bool fLinesOnly;
+        bool fCanTweakAlphaForCoverage;
+    };
+
+    BatchTracker fBatch;
+    SkSTArray<1, Geometry, true> fGeoData;
+
+    typedef GrVertexBatch INHERITED;
+};
+
+bool GrAAConvexPathRenderer::onDrawPath(const DrawPathArgs& args) {
+    if (args.fPath->isEmpty()) {
+        return true;
+    }
+
+    AAConvexPathBatch::Geometry geometry;
+    geometry.fColor = args.fColor;
+    geometry.fViewMatrix = *args.fViewMatrix;
+    geometry.fPath = *args.fPath;
+
+    SkAutoTUnref<GrDrawBatch> batch(AAConvexPathBatch::Create(geometry));
+    args.fTarget->drawBatch(*args.fPipelineBuilder, batch);
+
+    return true;
+
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef GR_TEST_UTILS
+
+DRAW_BATCH_TEST_DEFINE(AAConvexPathBatch) {
+    AAConvexPathBatch::Geometry geometry;
+    geometry.fColor = GrRandomColor(random);
+    geometry.fViewMatrix = GrTest::TestMatrixInvertible(random);
+    geometry.fPath = GrTest::TestPathConvex(random);
+
+    return AAConvexPathBatch::Create(geometry);
+}
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrAAConvexPathRenderer.h b/gfx/skia/skia/src/gpu/batches/GrAAConvexPathRenderer.h
new file mode 100644
index 000000000000..5d51d6c98aea
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrAAConvexPathRenderer.h
@@ -0,0 +1,24 @@
+
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrAAConvexPathRenderer_DEFINED
+#define GrAAConvexPathRenderer_DEFINED
+
+#include "GrPathRenderer.h"
+
+class GrAAConvexPathRenderer : public GrPathRenderer {
+public:
+    GrAAConvexPathRenderer();
+
+private:
+    bool onCanDrawPath(const CanDrawPathArgs&) const override;
+
+    bool onDrawPath(const DrawPathArgs&) override;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrAAConvexTessellator.cpp b/gfx/skia/skia/src/gpu/batches/GrAAConvexTessellator.cpp
new file mode 100644
index 000000000000..5ef9aefddd4a
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrAAConvexTessellator.cpp
@@ -0,0 +1,1027 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrAAConvexTessellator.h"
+#include "SkCanvas.h"
+#include "SkPath.h"
+#include "SkPoint.h"
+#include "SkString.h"
+#include "GrPathUtils.h"
+
+// Next steps:
+//  add an interactive sample app slide
+//  add debug check that all points are suitably far apart
+//  test more degenerate cases
+
+// The tolerance for fusing vertices and eliminating colinear lines (It is in device space).
+static const SkScalar kClose = (SK_Scalar1 / 16);
+static const SkScalar kCloseSqd = SkScalarMul(kClose, kClose);
+
+// tesselation tolerance values, in device space pixels
+static const SkScalar kQuadTolerance = 0.2f;
+static const SkScalar kCubicTolerance = 0.2f;
+static const SkScalar kConicTolerance = 0.5f;
+
+// dot product below which we use a round cap between curve segments
+static const SkScalar kRoundCapThreshold = 0.8f;
+
+static SkScalar intersect(const SkPoint& p0, const SkPoint& n0,
+                          const SkPoint& p1, const SkPoint& n1) {
+    const SkPoint v = p1 - p0;
+    SkScalar perpDot = n0.fX * n1.fY - n0.fY * n1.fX;
+    return (v.fX * n1.fY - v.fY * n1.fX) / perpDot;
+}
+
+// This is a special case version of intersect where we have the vector 
+// perpendicular to the second line rather than the vector parallel to it.
+static SkScalar perp_intersect(const SkPoint& p0, const SkPoint& n0,
+                               const SkPoint& p1, const SkPoint& perp) {
+    const SkPoint v = p1 - p0;
+    SkScalar perpDot = n0.dot(perp);
+    return v.dot(perp) / perpDot;
+}
+
+static bool duplicate_pt(const SkPoint& p0, const SkPoint& p1) {
+    SkScalar distSq = p0.distanceToSqd(p1);
+    return distSq < kCloseSqd;
+}
+
+static SkScalar abs_dist_from_line(const SkPoint& p0, const SkVector& v, const SkPoint& test) {
+    SkPoint testV = test - p0;
+    SkScalar dist = testV.fX * v.fY - testV.fY * v.fX;
+    return SkScalarAbs(dist);
+}
+
+int GrAAConvexTessellator::addPt(const SkPoint& pt,
+                                 SkScalar depth,
+                                 SkScalar coverage,
+                                 bool movable,
+                                 bool isCurve) {
+    this->validate();
+
+    int index = fPts.count();
+    *fPts.push() = pt;
+    *fCoverages.push() = coverage;
+    *fMovable.push() = movable;
+    *fIsCurve.push() = isCurve;
+
+    this->validate();
+    return index;
+}
+
+void GrAAConvexTessellator::popLastPt() {
+    this->validate();
+
+    fPts.pop();
+    fCoverages.pop();
+    fMovable.pop();
+
+    this->validate();
+}
+
+void GrAAConvexTessellator::popFirstPtShuffle() {
+    this->validate();
+
+    fPts.removeShuffle(0);
+    fCoverages.removeShuffle(0);
+    fMovable.removeShuffle(0);
+
+    this->validate();
+}
+
+void GrAAConvexTessellator::updatePt(int index,
+                                     const SkPoint& pt,
+                                     SkScalar depth,
+                                     SkScalar coverage) {
+    this->validate();
+    SkASSERT(fMovable[index]);
+
+    fPts[index] = pt;
+    fCoverages[index] = coverage;
+}
+
+void GrAAConvexTessellator::addTri(int i0, int i1, int i2) {
+    if (i0 == i1 || i1 == i2 || i2 == i0) {
+        return;
+    }
+
+    *fIndices.push() = i0;
+    *fIndices.push() = i1;
+    *fIndices.push() = i2;
+}
+
+void GrAAConvexTessellator::rewind() {
+    fPts.rewind();
+    fCoverages.rewind();
+    fMovable.rewind();
+    fIndices.rewind();
+    fNorms.rewind();
+    fInitialRing.rewind();
+    fCandidateVerts.rewind();
+#if GR_AA_CONVEX_TESSELLATOR_VIZ
+    fRings.rewind();        // TODO: leak in this case!
+#else
+    fRings[0].rewind();
+    fRings[1].rewind();
+#endif
+}
+
+void GrAAConvexTessellator::computeBisectors() {
+    fBisectors.setCount(fNorms.count());
+
+    int prev = fBisectors.count() - 1;
+    for (int cur = 0; cur < fBisectors.count(); prev = cur, ++cur) {
+        fBisectors[cur] = fNorms[cur] + fNorms[prev];
+        if (!fBisectors[cur].normalize()) {
+            SkASSERT(SkPoint::kLeft_Side == fSide || SkPoint::kRight_Side == fSide);
+            fBisectors[cur].setOrthog(fNorms[cur], (SkPoint::Side)-fSide);
+            SkVector other;
+            other.setOrthog(fNorms[prev], fSide);
+            fBisectors[cur] += other;
+            SkAssertResult(fBisectors[cur].normalize());        
+        } else {
+            fBisectors[cur].negate();      // make the bisector face in
+        }
+
+        SkASSERT(SkScalarNearlyEqual(1.0f, fBisectors[cur].length()));
+    }
+}
+
+// Create as many rings as we need to (up to a predefined limit) to reach the specified target
+// depth. If we are in fill mode, the final ring will automatically be fanned.
+bool GrAAConvexTessellator::createInsetRings(Ring& previousRing, SkScalar initialDepth,
+                                             SkScalar initialCoverage, SkScalar targetDepth, 
+                                             SkScalar targetCoverage, Ring** finalRing) {
+    static const int kMaxNumRings = 8;
+
+    if (previousRing.numPts() < 3) {
+        return false;
+    }
+    Ring* currentRing = &previousRing;
+    int i;
+    for (i = 0; i < kMaxNumRings; ++i) {
+        Ring* nextRing = this->getNextRing(currentRing);
+        SkASSERT(nextRing != currentRing);
+
+        bool done = this->createInsetRing(*currentRing, nextRing, initialDepth, initialCoverage, 
+                                          targetDepth, targetCoverage, i == 0);
+        currentRing = nextRing;
+        if (done) {
+            break;
+        }
+        currentRing->init(*this);
+    }
+
+    if (kMaxNumRings == i) {
+        // Bail if we've exceeded the amount of time we want to throw at this.
+        this->terminate(*currentRing);
+        return false;
+    }
+    bool done = currentRing->numPts() >= 3;
+    if (done) {
+        currentRing->init(*this);
+    }
+    *finalRing = currentRing;
+    return done;
+}
+
+// The general idea here is to, conceptually, start with the original polygon and slide
+// the vertices along the bisectors until the first intersection. At that
+// point two of the edges collapse and the process repeats on the new polygon.
+// The polygon state is captured in the Ring class while the GrAAConvexTessellator
+// controls the iteration. The CandidateVerts holds the formative points for the
+// next ring.
+bool GrAAConvexTessellator::tessellate(const SkMatrix& m, const SkPath& path) {
+    if (!this->extractFromPath(m, path)) {
+        return false;
+    }
+
+    SkScalar coverage = 1.0f;
+    SkScalar scaleFactor = 0.0f;
+    if (fStrokeWidth >= 0.0f) {
+        SkASSERT(m.isSimilarity()); 
+        scaleFactor = m.getMaxScale(); // x and y scale are the same
+        SkScalar effectiveStrokeWidth = scaleFactor * fStrokeWidth;
+        Ring outerStrokeRing;
+        this->createOuterRing(fInitialRing, effectiveStrokeWidth / 2 - kAntialiasingRadius, 
+                              coverage, &outerStrokeRing);
+        outerStrokeRing.init(*this);
+        Ring outerAARing;
+        this->createOuterRing(outerStrokeRing, kAntialiasingRadius * 2, 0.0f, &outerAARing);
+    } else {
+        Ring outerAARing;
+        this->createOuterRing(fInitialRing, kAntialiasingRadius, 0.0f, &outerAARing);
+    }
+
+    // the bisectors are only needed for the computation of the outer ring
+    fBisectors.rewind();
+    if (fStrokeWidth >= 0.0f && fInitialRing.numPts() > 2) {
+        SkScalar effectiveStrokeWidth = scaleFactor * fStrokeWidth;
+        Ring* insetStrokeRing;
+        SkScalar strokeDepth = effectiveStrokeWidth / 2 - kAntialiasingRadius;
+        if (this->createInsetRings(fInitialRing, 0.0f, coverage, strokeDepth, coverage, 
+                             &insetStrokeRing)) {
+            Ring* insetAARing;
+            this->createInsetRings(*insetStrokeRing, strokeDepth, coverage, strokeDepth + 
+                             kAntialiasingRadius * 2, 0.0f, &insetAARing);
+        }
+    } else {
+        Ring* insetAARing;
+        this->createInsetRings(fInitialRing, 0.0f, 0.5f, kAntialiasingRadius, 1.0f, &insetAARing);
+    }
+
+    SkDEBUGCODE(this->validate();)
+    return true;
+}
+
+SkScalar GrAAConvexTessellator::computeDepthFromEdge(int edgeIdx, const SkPoint& p) const {
+    SkASSERT(edgeIdx < fNorms.count());
+
+    SkPoint v = p - fPts[edgeIdx];
+    SkScalar depth = -fNorms[edgeIdx].dot(v);
+    return depth;
+}
+
+// Find a point that is 'desiredDepth' away from the 'edgeIdx'-th edge and lies
+// along the 'bisector' from the 'startIdx'-th point.
+bool GrAAConvexTessellator::computePtAlongBisector(int startIdx,
+                                                   const SkVector& bisector,
+                                                   int edgeIdx,
+                                                   SkScalar desiredDepth,
+                                                   SkPoint* result) const {
+    const SkPoint& norm = fNorms[edgeIdx];
+
+    // First find the point where the edge and the bisector intersect
+    SkPoint newP;
+
+    SkScalar t = perp_intersect(fPts[startIdx], bisector, fPts[edgeIdx], norm);
+    if (SkScalarNearlyEqual(t, 0.0f)) {
+        // the start point was one of the original ring points
+        SkASSERT(startIdx < fPts.count());
+        newP = fPts[startIdx];
+    } else if (t < 0.0f) {
+        newP = bisector;
+        newP.scale(t);
+        newP += fPts[startIdx];
+    } else {
+        return false;
+    }
+
+    // Then offset along the bisector from that point the correct distance
+    SkScalar dot = bisector.dot(norm);
+    t = -desiredDepth / dot;
+    *result = bisector;
+    result->scale(t);
+    *result += newP;
+
+    return true;
+}
+
+bool GrAAConvexTessellator::extractFromPath(const SkMatrix& m, const SkPath& path) {
+    SkASSERT(SkPath::kConvex_Convexity == path.getConvexity());
+
+    // Outer ring: 3*numPts
+    // Middle ring: numPts
+    // Presumptive inner ring: numPts
+    this->reservePts(5*path.countPoints());
+    // Outer ring: 12*numPts
+    // Middle ring: 0
+    // Presumptive inner ring: 6*numPts + 6
+    fIndices.setReserve(18*path.countPoints() + 6);
+
+    fNorms.setReserve(path.countPoints());
+
+    // TODO: is there a faster way to extract the points from the path? Perhaps
+    // get all the points via a new entry point, transform them all in bulk
+    // and then walk them to find duplicates?
+    SkPath::Iter iter(path, true);
+    SkPoint pts[4];
+    SkPath::Verb verb;
+    while ((verb = iter.next(pts)) != SkPath::kDone_Verb) {
+        switch (verb) {
+            case SkPath::kLine_Verb:
+                this->lineTo(m, pts[1], false);
+                break;
+            case SkPath::kQuad_Verb:
+                this->quadTo(m, pts);
+                break;
+            case SkPath::kCubic_Verb:
+                this->cubicTo(m, pts);
+                break;
+            case SkPath::kConic_Verb:
+                this->conicTo(m, pts, iter.conicWeight());
+                break;
+            case SkPath::kMove_Verb:
+            case SkPath::kClose_Verb:
+            case SkPath::kDone_Verb:
+                break;
+        }
+    }
+
+    if (this->numPts() < 2) {
+        return false;
+    }
+
+    // check if last point is a duplicate of the first point. If so, remove it.
+    if (duplicate_pt(fPts[this->numPts()-1], fPts[0])) {
+        this->popLastPt();
+        fNorms.pop();
+    }
+
+    SkASSERT(fPts.count() == fNorms.count()+1);
+    if (this->numPts() >= 3) {
+        if (abs_dist_from_line(fPts.top(), fNorms.top(), fPts[0]) < kClose) {
+            // The last point is on the line from the second to last to the first point.
+            this->popLastPt();
+            fNorms.pop();
+        }
+
+        *fNorms.push() = fPts[0] - fPts.top();
+        SkDEBUGCODE(SkScalar len =) SkPoint::Normalize(&fNorms.top());
+        SkASSERT(len > 0.0f);
+        SkASSERT(fPts.count() == fNorms.count());
+    }
+
+    if (this->numPts() >= 3 && abs_dist_from_line(fPts[0], fNorms.top(), fPts[1]) < kClose) {
+        // The first point is on the line from the last to the second.
+        this->popFirstPtShuffle();
+        fNorms.removeShuffle(0);
+        fNorms[0] = fPts[1] - fPts[0];
+        SkDEBUGCODE(SkScalar len =) SkPoint::Normalize(&fNorms[0]);
+        SkASSERT(len > 0.0f);
+        SkASSERT(SkScalarNearlyEqual(1.0f, fNorms[0].length()));
+    }
+
+    if (this->numPts() >= 3) {
+        // Check the cross product of the final trio
+        SkScalar cross = SkPoint::CrossProduct(fNorms[0], fNorms.top());
+        if (cross > 0.0f) {
+            fSide = SkPoint::kRight_Side;
+        } else {
+            fSide = SkPoint::kLeft_Side;
+        }
+
+        // Make all the normals face outwards rather than along the edge
+        for (int cur = 0; cur < fNorms.count(); ++cur) {
+            fNorms[cur].setOrthog(fNorms[cur], fSide);
+            SkASSERT(SkScalarNearlyEqual(1.0f, fNorms[cur].length()));
+        }
+
+        this->computeBisectors();
+    } else if (this->numPts() == 2) {
+        // We've got two points, so we're degenerate. 
+        if (fStrokeWidth < 0.0f) {
+            // it's a fill, so we don't need to worry about degenerate paths
+            return false;
+        }
+        // For stroking, we still need to process the degenerate path, so fix it up
+        fSide = SkPoint::kLeft_Side;
+
+        // Make all the normals face outwards rather than along the edge
+        for (int cur = 0; cur < fNorms.count(); ++cur) {
+            fNorms[cur].setOrthog(fNorms[cur], fSide);
+            SkASSERT(SkScalarNearlyEqual(1.0f, fNorms[cur].length()));
+        }
+
+        fNorms.push(SkPoint::Make(-fNorms[0].fX, -fNorms[0].fY));
+        // we won't actually use the bisectors, so just push zeroes
+        fBisectors.push(SkPoint::Make(0.0, 0.0));
+        fBisectors.push(SkPoint::Make(0.0, 0.0));
+    } else {
+        return false;
+    }
+
+    fCandidateVerts.setReserve(this->numPts());
+    fInitialRing.setReserve(this->numPts());
+    for (int i = 0; i < this->numPts(); ++i) {
+        fInitialRing.addIdx(i, i);
+    }
+    fInitialRing.init(fNorms, fBisectors);
+
+    this->validate();
+    return true;
+}
+
+GrAAConvexTessellator::Ring* GrAAConvexTessellator::getNextRing(Ring* lastRing) {
+#if GR_AA_CONVEX_TESSELLATOR_VIZ
+    Ring* ring = *fRings.push() = new Ring;
+    ring->setReserve(fInitialRing.numPts());
+    ring->rewind();
+    return ring;
+#else
+    // Flip flop back and forth between fRings[0] & fRings[1]
+    int nextRing = (lastRing == &fRings[0]) ? 1 : 0;
+    fRings[nextRing].setReserve(fInitialRing.numPts());
+    fRings[nextRing].rewind();
+    return &fRings[nextRing];
+#endif
+}
+
+void GrAAConvexTessellator::fanRing(const Ring& ring) {
+    // fan out from point 0
+    int startIdx = ring.index(0);
+    for (int cur = ring.numPts() - 2; cur >= 0; --cur) {
+        this->addTri(startIdx, ring.index(cur), ring.index(cur + 1));
+    }
+}
+
+void GrAAConvexTessellator::createOuterRing(const Ring& previousRing, SkScalar outset, 
+                                            SkScalar coverage, Ring* nextRing) {
+    const int numPts = previousRing.numPts();
+    if (numPts == 0) {
+        return;
+    }
+
+    int prev = numPts - 1;
+    int lastPerpIdx = -1, firstPerpIdx = -1;
+
+    const SkScalar outsetSq = SkScalarMul(outset, outset);
+    SkScalar miterLimitSq = SkScalarMul(outset, fMiterLimit);
+    miterLimitSq = SkScalarMul(miterLimitSq, miterLimitSq);
+    for (int cur = 0; cur < numPts; ++cur) {
+        int originalIdx = previousRing.index(cur);
+        // For each vertex of the original polygon we add at least two points to the 
+        // outset polygon - one extending perpendicular to each impinging edge. Connecting these
+        // two points yields a bevel join. We need one additional point for a mitered join, and 
+        // a round join requires one or more points depending upon curvature.
+
+        // The perpendicular point for the last edge
+        SkPoint normal1 = previousRing.norm(prev);
+        SkPoint perp1 = normal1;
+        perp1.scale(outset);
+        perp1 += this->point(originalIdx);
+
+        // The perpendicular point for the next edge.
+        SkPoint normal2 = previousRing.norm(cur);
+        SkPoint perp2 = normal2;
+        perp2.scale(outset);
+        perp2 += fPts[originalIdx];
+
+        bool isCurve = fIsCurve[originalIdx];
+
+        // We know it isn't a duplicate of the prior point (since it and this
+        // one are just perpendicular offsets from the non-merged polygon points)
+        int perp1Idx = this->addPt(perp1, -outset, coverage, false, isCurve);
+        nextRing->addIdx(perp1Idx, originalIdx);
+
+        int perp2Idx;
+        // For very shallow angles all the corner points could fuse.
+        if (duplicate_pt(perp2, this->point(perp1Idx))) {
+            perp2Idx = perp1Idx;
+        } else {
+            perp2Idx = this->addPt(perp2, -outset, coverage, false, isCurve);
+        }
+
+        if (perp2Idx != perp1Idx) {
+            if (isCurve) {
+                // bevel or round depending upon curvature
+                SkScalar dotProd = normal1.dot(normal2);
+                if (dotProd < kRoundCapThreshold) {
+                    // Currently we "round" by creating a single extra point, which produces
+                    // good results for common cases. For thick strokes with high curvature, we will
+                    // need to add more points; for the time being we simply fall back to software
+                    // rendering for thick strokes.
+                    SkPoint miter = previousRing.bisector(cur);
+                    miter.setLength(-outset);
+                    miter += fPts[originalIdx];
+
+                    // For very shallow angles all the corner points could fuse
+                    if (!duplicate_pt(miter, this->point(perp1Idx))) {
+                        int miterIdx;
+                        miterIdx = this->addPt(miter, -outset, coverage, false, false);
+                        nextRing->addIdx(miterIdx, originalIdx);
+                        // The two triangles for the corner
+                        this->addTri(originalIdx, perp1Idx, miterIdx);
+                        this->addTri(originalIdx, miterIdx, perp2Idx);
+                    }
+                } else {
+                    this->addTri(originalIdx, perp1Idx, perp2Idx);
+                }
+            } else {
+                switch (fJoin) {
+                    case SkPaint::Join::kMiter_Join: {
+                        // The bisector outset point
+                        SkPoint miter = previousRing.bisector(cur);
+                        SkScalar dotProd = normal1.dot(normal2);
+                        SkScalar sinHalfAngleSq = SkScalarHalf(SK_Scalar1 + dotProd);
+                        SkScalar lengthSq = outsetSq / sinHalfAngleSq;
+                        if (lengthSq > miterLimitSq) {
+                            // just bevel it
+                            this->addTri(originalIdx, perp1Idx, perp2Idx);
+                            break;
+                        }
+                        miter.setLength(-SkScalarSqrt(lengthSq));
+                        miter += fPts[originalIdx];
+
+                        // For very shallow angles all the corner points could fuse
+                        if (!duplicate_pt(miter, this->point(perp1Idx))) {
+                            int miterIdx;
+                            miterIdx = this->addPt(miter, -outset, coverage, false, false);
+                            nextRing->addIdx(miterIdx, originalIdx);
+                            // The two triangles for the corner
+                            this->addTri(originalIdx, perp1Idx, miterIdx);
+                            this->addTri(originalIdx, miterIdx, perp2Idx);
+                        }
+                        break;
+                    }
+                    case SkPaint::Join::kBevel_Join:
+                        this->addTri(originalIdx, perp1Idx, perp2Idx);
+                        break;
+                    default:
+                        // kRound_Join is unsupported for now. GrAALinearizingConvexPathRenderer is 
+                        // only willing to draw mitered or beveled, so we should never get here.
+                        SkASSERT(false);
+                }
+            }
+
+            nextRing->addIdx(perp2Idx, originalIdx);
+        }
+
+        if (0 == cur) {
+            // Store the index of the first perpendicular point to finish up
+            firstPerpIdx = perp1Idx;
+            SkASSERT(-1 == lastPerpIdx);
+        } else {
+            // The triangles for the previous edge
+            int prevIdx = previousRing.index(prev);
+            this->addTri(prevIdx, perp1Idx, originalIdx);
+            this->addTri(prevIdx, lastPerpIdx, perp1Idx);
+        }
+
+        // Track the last perpendicular outset point so we can construct the
+        // trailing edge triangles.
+        lastPerpIdx = perp2Idx;
+        prev = cur;
+    }
+
+    // pick up the final edge rect
+    int lastIdx = previousRing.index(numPts - 1);
+    this->addTri(lastIdx, firstPerpIdx, previousRing.index(0));
+    this->addTri(lastIdx, lastPerpIdx, firstPerpIdx);
+
+    this->validate();
+}
+
+// Something went wrong in the creation of the next ring. If we're filling the shape, just go ahead
+// and fan it.
+void GrAAConvexTessellator::terminate(const Ring& ring) {
+    if (fStrokeWidth < 0.0f) {
+        this->fanRing(ring);
+    }
+}
+
+static SkScalar compute_coverage(SkScalar depth, SkScalar initialDepth, SkScalar initialCoverage, 
+                                SkScalar targetDepth, SkScalar targetCoverage) {
+    if (SkScalarNearlyEqual(initialDepth, targetDepth)) {
+        return targetCoverage;
+    }
+    SkScalar result = (depth - initialDepth) / (targetDepth - initialDepth) * 
+            (targetCoverage - initialCoverage) + initialCoverage;
+    return SkScalarClampMax(result, 1.0f);
+}
+
+// return true when processing is complete
+bool GrAAConvexTessellator::createInsetRing(const Ring& lastRing, Ring* nextRing, 
+                                            SkScalar initialDepth, SkScalar initialCoverage, 
+                                            SkScalar targetDepth, SkScalar targetCoverage, 
+                                            bool forceNew) {
+    bool done = false;
+
+    fCandidateVerts.rewind();
+
+    // Loop through all the points in the ring and find the intersection with the smallest depth
+    SkScalar minDist = SK_ScalarMax, minT = 0.0f;
+    int minEdgeIdx = -1;
+
+    for (int cur = 0; cur < lastRing.numPts(); ++cur) {
+        int next = (cur + 1) % lastRing.numPts();
+        SkScalar t = intersect(this->point(lastRing.index(cur)),  lastRing.bisector(cur),
+                               this->point(lastRing.index(next)), lastRing.bisector(next));
+        SkScalar dist = -t * lastRing.norm(cur).dot(lastRing.bisector(cur));
+
+        if (minDist > dist) {
+            minDist = dist;
+            minT = t;
+            minEdgeIdx = cur;
+        }
+    }
+
+    if (minEdgeIdx == -1) {
+        return false;
+    }
+    SkPoint newPt = lastRing.bisector(minEdgeIdx);
+    newPt.scale(minT);
+    newPt += this->point(lastRing.index(minEdgeIdx));
+
+    SkScalar depth = this->computeDepthFromEdge(lastRing.origEdgeID(minEdgeIdx), newPt);
+    if (depth >= targetDepth) {
+        // None of the bisectors intersect before reaching the desired depth.
+        // Just step them all to the desired depth
+        depth = targetDepth;
+        done = true;
+    }
+
+    // 'dst' stores where each point in the last ring maps to/transforms into
+    // in the next ring.
+    SkTDArray<int> dst;
+    dst.setCount(lastRing.numPts());
+
+    // Create the first point (who compares with no one)
+    if (!this->computePtAlongBisector(lastRing.index(0),
+                                      lastRing.bisector(0),
+                                      lastRing.origEdgeID(0),
+                                      depth, &newPt)) {
+        this->terminate(lastRing);
+        return true;
+    }
+    dst[0] = fCandidateVerts.addNewPt(newPt,
+                                      lastRing.index(0), lastRing.origEdgeID(0),
+                                      !this->movable(lastRing.index(0)));
+
+    // Handle the middle points (who only compare with the prior point)
+    for (int cur = 1; cur < lastRing.numPts()-1; ++cur) {
+        if (!this->computePtAlongBisector(lastRing.index(cur),
+                                          lastRing.bisector(cur),
+                                          lastRing.origEdgeID(cur),
+                                          depth, &newPt)) {
+            this->terminate(lastRing);
+            return true;
+        }
+        if (!duplicate_pt(newPt, fCandidateVerts.lastPoint())) {
+            dst[cur] = fCandidateVerts.addNewPt(newPt,
+                                                lastRing.index(cur), lastRing.origEdgeID(cur),
+                                                !this->movable(lastRing.index(cur)));
+        } else {
+            dst[cur] = fCandidateVerts.fuseWithPrior(lastRing.origEdgeID(cur));
+        }
+    }
+
+    // Check on the last point (handling the wrap around)
+    int cur = lastRing.numPts()-1;
+    if  (!this->computePtAlongBisector(lastRing.index(cur),
+                                       lastRing.bisector(cur),
+                                       lastRing.origEdgeID(cur),
+                                       depth, &newPt)) {
+        this->terminate(lastRing);
+        return true;
+    }
+    bool dupPrev = duplicate_pt(newPt, fCandidateVerts.lastPoint());
+    bool dupNext = duplicate_pt(newPt, fCandidateVerts.firstPoint());
+
+    if (!dupPrev && !dupNext) {
+        dst[cur] = fCandidateVerts.addNewPt(newPt,
+                                            lastRing.index(cur), lastRing.origEdgeID(cur),
+                                            !this->movable(lastRing.index(cur)));
+    } else if (dupPrev && !dupNext) {
+        dst[cur] = fCandidateVerts.fuseWithPrior(lastRing.origEdgeID(cur));
+    } else if (!dupPrev && dupNext) {
+        dst[cur] = fCandidateVerts.fuseWithNext();
+    } else {
+        bool dupPrevVsNext = duplicate_pt(fCandidateVerts.firstPoint(), fCandidateVerts.lastPoint());
+
+        if (!dupPrevVsNext) {
+            dst[cur] = fCandidateVerts.fuseWithPrior(lastRing.origEdgeID(cur));
+        } else {
+            const int fused = fCandidateVerts.fuseWithBoth();
+            dst[cur] = fused;
+            const int targetIdx = dst[cur - 1];
+            for (int i = cur - 1; i >= 0 && dst[i] == targetIdx; i--) {
+                dst[i] = fused;
+            }
+        }
+    }
+
+    // Fold the new ring's points into the global pool
+    for (int i = 0; i < fCandidateVerts.numPts(); ++i) {
+        int newIdx;
+        if (fCandidateVerts.needsToBeNew(i) || forceNew) {
+            // if the originating index is still valid then this point wasn't 
+            // fused (and is thus movable)
+            SkScalar coverage = compute_coverage(depth, initialDepth, initialCoverage, 
+                                                 targetDepth, targetCoverage);
+            newIdx = this->addPt(fCandidateVerts.point(i), depth, coverage,
+                                 fCandidateVerts.originatingIdx(i) != -1, false);
+        } else {
+            SkASSERT(fCandidateVerts.originatingIdx(i) != -1);
+            this->updatePt(fCandidateVerts.originatingIdx(i), fCandidateVerts.point(i), depth,
+                           targetCoverage);
+            newIdx = fCandidateVerts.originatingIdx(i);
+        }
+
+        nextRing->addIdx(newIdx, fCandidateVerts.origEdge(i));
+    }
+
+    // 'dst' currently has indices into the ring. Remap these to be indices
+    // into the global pool since the triangulation operates in that space.
+    for (int i = 0; i < dst.count(); ++i) {
+        dst[i] = nextRing->index(dst[i]);
+    }
+
+    for (int i = 0; i < lastRing.numPts(); ++i) {
+        int next = (i + 1) % lastRing.numPts();
+
+        this->addTri(lastRing.index(i), lastRing.index(next), dst[next]);
+        this->addTri(lastRing.index(i), dst[next], dst[i]);
+    }
+
+    if (done && fStrokeWidth < 0.0f) {
+        // fill
+        this->fanRing(*nextRing);
+    }
+
+    if (nextRing->numPts() < 3) {
+        done = true;
+    }
+    return done;
+}
+
+void GrAAConvexTessellator::validate() const {
+    SkASSERT(fPts.count() == fMovable.count());
+    SkASSERT(0 == (fIndices.count() % 3));
+}
+
+//////////////////////////////////////////////////////////////////////////////
+void GrAAConvexTessellator::Ring::init(const GrAAConvexTessellator& tess) {
+    this->computeNormals(tess);
+    this->computeBisectors(tess);
+}
+
+void GrAAConvexTessellator::Ring::init(const SkTDArray<SkVector>& norms,
+                                       const SkTDArray<SkVector>& bisectors) {
+    for (int i = 0; i < fPts.count(); ++i) {
+        fPts[i].fNorm = norms[i];
+        fPts[i].fBisector = bisectors[i];
+    }
+}
+
+// Compute the outward facing normal at each vertex.
+void GrAAConvexTessellator::Ring::computeNormals(const GrAAConvexTessellator& tess) {
+    for (int cur = 0; cur < fPts.count(); ++cur) {
+        int next = (cur + 1) % fPts.count();
+
+        fPts[cur].fNorm = tess.point(fPts[next].fIndex) - tess.point(fPts[cur].fIndex);
+        SkPoint::Normalize(&fPts[cur].fNorm);
+        fPts[cur].fNorm.setOrthog(fPts[cur].fNorm, tess.side());
+    }
+}
+
+void GrAAConvexTessellator::Ring::computeBisectors(const GrAAConvexTessellator& tess) {
+    int prev = fPts.count() - 1;
+    for (int cur = 0; cur < fPts.count(); prev = cur, ++cur) {
+        fPts[cur].fBisector = fPts[cur].fNorm + fPts[prev].fNorm;
+        if (!fPts[cur].fBisector.normalize()) {
+            SkASSERT(SkPoint::kLeft_Side == tess.side() || SkPoint::kRight_Side == tess.side());
+            fPts[cur].fBisector.setOrthog(fPts[cur].fNorm, (SkPoint::Side)-tess.side());
+            SkVector other;
+            other.setOrthog(fPts[prev].fNorm, tess.side());
+            fPts[cur].fBisector += other;
+            SkAssertResult(fPts[cur].fBisector.normalize());
+        } else {
+            fPts[cur].fBisector.negate();      // make the bisector face in
+        }
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+#ifdef SK_DEBUG
+// Is this ring convex?
+bool GrAAConvexTessellator::Ring::isConvex(const GrAAConvexTessellator& tess) const {
+    if (fPts.count() < 3) {
+        return true;
+    }
+
+    SkPoint prev = tess.point(fPts[0].fIndex) - tess.point(fPts.top().fIndex);
+    SkPoint cur  = tess.point(fPts[1].fIndex) - tess.point(fPts[0].fIndex);
+    SkScalar minDot = prev.fX * cur.fY - prev.fY * cur.fX;
+    SkScalar maxDot = minDot;
+
+    prev = cur;
+    for (int i = 1; i < fPts.count(); ++i) {
+        int next = (i + 1) % fPts.count();
+
+        cur  = tess.point(fPts[next].fIndex) - tess.point(fPts[i].fIndex);
+        SkScalar dot = prev.fX * cur.fY - prev.fY * cur.fX;
+
+        minDot = SkMinScalar(minDot, dot);
+        maxDot = SkMaxScalar(maxDot, dot);
+
+        prev = cur;
+    }
+
+    if (SkScalarNearlyEqual(maxDot, 0.0f, 0.005f)) {
+        maxDot = 0;
+    }
+    if (SkScalarNearlyEqual(minDot, 0.0f, 0.005f)) {
+        minDot = 0;
+    }
+    return (maxDot >= 0.0f) == (minDot >= 0.0f);
+}
+
+#endif
+
+void GrAAConvexTessellator::lineTo(SkPoint p, bool isCurve) {
+    if (this->numPts() > 0 && duplicate_pt(p, this->lastPoint())) {
+        return;
+    }
+
+    SkASSERT(fPts.count() <= 1 || fPts.count() == fNorms.count()+1);
+    if (this->numPts() >= 2 && 
+        abs_dist_from_line(fPts.top(), fNorms.top(), p) < kClose) {
+        // The old last point is on the line from the second to last to the new point
+        this->popLastPt();
+        fNorms.pop();
+        fIsCurve.pop();
+    }
+    SkScalar initialRingCoverage = fStrokeWidth < 0.0f ? 0.5f : 1.0f;
+    this->addPt(p, 0.0f, initialRingCoverage, false, isCurve);
+    if (this->numPts() > 1) {
+        *fNorms.push() = fPts.top() - fPts[fPts.count()-2];
+        SkDEBUGCODE(SkScalar len =) SkPoint::Normalize(&fNorms.top());
+        SkASSERT(len > 0.0f);
+        SkASSERT(SkScalarNearlyEqual(1.0f, fNorms.top().length()));
+    }
+}
+
+void GrAAConvexTessellator::lineTo(const SkMatrix& m, SkPoint p, bool isCurve) {
+    m.mapPoints(&p, 1);
+    this->lineTo(p, isCurve);
+}
+
+void GrAAConvexTessellator::quadTo(SkPoint pts[3]) {
+    int maxCount = GrPathUtils::quadraticPointCount(pts, kQuadTolerance);
+    fPointBuffer.setReserve(maxCount);
+    SkPoint* target = fPointBuffer.begin();
+    int count = GrPathUtils::generateQuadraticPoints(pts[0], pts[1], pts[2], 
+            kQuadTolerance, &target, maxCount);
+    fPointBuffer.setCount(count);
+    for (int i = 0; i < count; i++) {
+        lineTo(fPointBuffer[i], true);
+    }
+}
+
+void GrAAConvexTessellator::quadTo(const SkMatrix& m, SkPoint pts[3]) {
+    SkPoint transformed[3];
+    transformed[0] = pts[0];
+    transformed[1] = pts[1];
+    transformed[2] = pts[2];
+    m.mapPoints(transformed, 3);
+    quadTo(transformed);
+}
+
+void GrAAConvexTessellator::cubicTo(const SkMatrix& m, SkPoint pts[4]) {
+    m.mapPoints(pts, 4);
+    int maxCount = GrPathUtils::cubicPointCount(pts, kCubicTolerance);
+    fPointBuffer.setReserve(maxCount);
+    SkPoint* target = fPointBuffer.begin();
+    int count = GrPathUtils::generateCubicPoints(pts[0], pts[1], pts[2], pts[3], 
+            kCubicTolerance, &target, maxCount);
+    fPointBuffer.setCount(count);
+    for (int i = 0; i < count; i++) {
+        lineTo(fPointBuffer[i], true);
+    }
+}
+
+// include down here to avoid compilation errors caused by "-" overload in SkGeometry.h
+#include "SkGeometry.h"
+
+void GrAAConvexTessellator::conicTo(const SkMatrix& m, SkPoint pts[3], SkScalar w) {
+    m.mapPoints(pts, 3);
+    SkAutoConicToQuads quadder;
+    const SkPoint* quads = quadder.computeQuads(pts, w, kConicTolerance);
+    SkPoint lastPoint = *(quads++);
+    int count = quadder.countQuads();
+    for (int i = 0; i < count; ++i) {
+        SkPoint quadPts[3];
+        quadPts[0] = lastPoint;
+        quadPts[1] = quads[0];
+        quadPts[2] = i == count - 1 ? pts[2] : quads[1];
+        quadTo(quadPts);
+        lastPoint = quadPts[2];
+        quads += 2;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+#if GR_AA_CONVEX_TESSELLATOR_VIZ
+static const SkScalar kPointRadius = 0.02f;
+static const SkScalar kArrowStrokeWidth = 0.0f;
+static const SkScalar kArrowLength = 0.2f;
+static const SkScalar kEdgeTextSize = 0.1f;
+static const SkScalar kPointTextSize = 0.02f;
+
+static void draw_point(SkCanvas* canvas, const SkPoint& p, SkScalar paramValue, bool stroke) {
+    SkPaint paint;
+    SkASSERT(paramValue <= 1.0f);
+    int gs = int(255*paramValue);
+    paint.setARGB(255, gs, gs, gs);
+
+    canvas->drawCircle(p.fX, p.fY, kPointRadius, paint);
+
+    if (stroke) {
+        SkPaint stroke;
+        stroke.setColor(SK_ColorYELLOW);
+        stroke.setStyle(SkPaint::kStroke_Style);
+        stroke.setStrokeWidth(kPointRadius/3.0f);
+        canvas->drawCircle(p.fX, p.fY, kPointRadius, stroke); 
+    }
+}
+
+static void draw_line(SkCanvas* canvas, const SkPoint& p0, const SkPoint& p1, SkColor color) {
+    SkPaint p;
+    p.setColor(color);
+
+    canvas->drawLine(p0.fX, p0.fY, p1.fX, p1.fY, p);
+}
+
+static void draw_arrow(SkCanvas*canvas, const SkPoint& p, const SkPoint &n,
+                       SkScalar len, SkColor color) {
+    SkPaint paint;
+    paint.setColor(color);
+    paint.setStrokeWidth(kArrowStrokeWidth);
+    paint.setStyle(SkPaint::kStroke_Style);
+
+    canvas->drawLine(p.fX, p.fY,
+                     p.fX + len * n.fX, p.fY + len * n.fY,
+                     paint);
+}
+
+void GrAAConvexTessellator::Ring::draw(SkCanvas* canvas, const GrAAConvexTessellator& tess) const {
+    SkPaint paint;
+    paint.setTextSize(kEdgeTextSize);
+
+    for (int cur = 0; cur < fPts.count(); ++cur) {
+        int next = (cur + 1) % fPts.count();
+
+        draw_line(canvas,
+                  tess.point(fPts[cur].fIndex),
+                  tess.point(fPts[next].fIndex),
+                  SK_ColorGREEN);
+
+        SkPoint mid = tess.point(fPts[cur].fIndex) + tess.point(fPts[next].fIndex);
+        mid.scale(0.5f);
+
+        if (fPts.count()) {
+            draw_arrow(canvas, mid, fPts[cur].fNorm, kArrowLength, SK_ColorRED);
+            mid.fX += (kArrowLength/2) * fPts[cur].fNorm.fX;
+            mid.fY += (kArrowLength/2) * fPts[cur].fNorm.fY;
+        }
+
+        SkString num;
+        num.printf("%d", this->origEdgeID(cur));
+        canvas->drawText(num.c_str(), num.size(), mid.fX, mid.fY, paint);
+
+        if (fPts.count()) {
+            draw_arrow(canvas, tess.point(fPts[cur].fIndex), fPts[cur].fBisector,
+                       kArrowLength, SK_ColorBLUE);
+        }
+    }    
+}
+
+void GrAAConvexTessellator::draw(SkCanvas* canvas) const {
+    for (int i = 0; i < fIndices.count(); i += 3) {
+        SkASSERT(fIndices[i] < this->numPts()) ;
+        SkASSERT(fIndices[i+1] < this->numPts()) ;
+        SkASSERT(fIndices[i+2] < this->numPts()) ;
+
+        draw_line(canvas,
+                  this->point(this->fIndices[i]), this->point(this->fIndices[i+1]),
+                  SK_ColorBLACK);
+        draw_line(canvas,
+                  this->point(this->fIndices[i+1]), this->point(this->fIndices[i+2]),
+                  SK_ColorBLACK);
+        draw_line(canvas,
+                  this->point(this->fIndices[i+2]), this->point(this->fIndices[i]),
+                  SK_ColorBLACK);
+    }
+
+    fInitialRing.draw(canvas, *this);
+    for (int i = 0; i < fRings.count(); ++i) {
+        fRings[i]->draw(canvas, *this);
+    }
+
+    for (int i = 0; i < this->numPts(); ++i) {
+        draw_point(canvas,
+                   this->point(i), 0.5f + (this->depth(i)/(2 * kAntialiasingRadius)), 
+                   !this->movable(i));
+
+        SkPaint paint;
+        paint.setTextSize(kPointTextSize);
+        paint.setTextAlign(SkPaint::kCenter_Align);
+        if (this->depth(i) <= -kAntialiasingRadius) {
+            paint.setColor(SK_ColorWHITE);
+        }
+
+        SkString num;
+        num.printf("%d", i);
+        canvas->drawText(num.c_str(), num.size(), 
+                         this->point(i).fX, this->point(i).fY+(kPointRadius/2.0f), 
+                         paint);
+    }
+}
+
+#endif
+
diff --git a/gfx/skia/skia/src/gpu/batches/GrAAConvexTessellator.h b/gfx/skia/skia/src/gpu/batches/GrAAConvexTessellator.h
new file mode 100644
index 000000000000..f3d84dc8ad8b
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrAAConvexTessellator.h
@@ -0,0 +1,270 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrAAConvexTessellator_DEFINED
+#define GrAAConvexTessellator_DEFINED
+
+#include "SkColor.h"
+#include "SkPaint.h"
+#include "SkPoint.h"
+#include "SkScalar.h"
+#include "SkTDArray.h"
+
+class SkCanvas;
+class SkMatrix;
+class SkPath;
+
+//#define GR_AA_CONVEX_TESSELLATOR_VIZ 1
+
+// device space distance which we inset / outset points in order to create the soft antialiased edge
+static const SkScalar kAntialiasingRadius = 0.5f;
+
+class GrAAConvexTessellator;
+
+// The AAConvexTessellator holds the global pool of points and the triangulation
+// that connects them. It also drives the tessellation process.
+// The outward facing normals of the original polygon are stored (in 'fNorms') to service
+// computeDepthFromEdge requests.
+class GrAAConvexTessellator {
+public:
+    GrAAConvexTessellator(SkScalar strokeWidth = -1.0f, 
+                          SkPaint::Join join = SkPaint::Join::kBevel_Join, 
+                          SkScalar miterLimit = 0.0f)
+        : fSide(SkPoint::kOn_Side)
+        , fStrokeWidth(strokeWidth)
+        , fJoin(join)
+        , fMiterLimit(miterLimit) {
+    }
+
+    SkPoint::Side side() const { return fSide; }
+
+    bool tessellate(const SkMatrix& m, const SkPath& path);
+
+    // The next five should only be called after tessellate to extract the result
+    int numPts() const { return fPts.count(); }
+    int numIndices() const { return fIndices.count(); }
+
+    const SkPoint& lastPoint() const { return fPts.top(); }
+    const SkPoint& point(int index) const { return fPts[index]; }
+    int index(int index) const { return fIndices[index]; }
+    SkScalar coverage(int index) const { return fCoverages[index]; }
+
+#if GR_AA_CONVEX_TESSELLATOR_VIZ
+    void draw(SkCanvas* canvas) const;
+#endif
+
+    // The tessellator can be reused for multiple paths by rewinding in between
+    void rewind();
+
+private:
+    // CandidateVerts holds the vertices for the next ring while they are 
+    // being generated. Its main function is to de-dup the points.
+    class CandidateVerts {
+    public:
+        void setReserve(int numPts) { fPts.setReserve(numPts); }
+        void rewind() { fPts.rewind(); }
+
+        int numPts() const { return fPts.count(); }
+
+        const SkPoint& lastPoint() const { return fPts.top().fPt; }
+        const SkPoint& firstPoint() const { return fPts[0].fPt; }
+        const SkPoint& point(int index) const { return fPts[index].fPt; }
+
+        int originatingIdx(int index) const { return fPts[index].fOriginatingIdx; }
+        int origEdge(int index) const { return fPts[index].fOrigEdgeId; }
+        bool needsToBeNew(int index) const { return fPts[index].fNeedsToBeNew; }
+
+        int addNewPt(const SkPoint& newPt, int originatingIdx, int origEdge, bool needsToBeNew) {
+            struct PointData* pt = fPts.push();
+            pt->fPt = newPt;
+            pt->fOrigEdgeId = origEdge;
+            pt->fOriginatingIdx = originatingIdx;
+            pt->fNeedsToBeNew = needsToBeNew;
+            return fPts.count() - 1;
+        }
+
+        int fuseWithPrior(int origEdgeId) {
+            fPts.top().fOrigEdgeId = origEdgeId;
+            fPts.top().fOriginatingIdx = -1;
+            fPts.top().fNeedsToBeNew = true;
+            return fPts.count() - 1;
+        }
+
+        int fuseWithNext() {
+            fPts[0].fOriginatingIdx = -1;
+            fPts[0].fNeedsToBeNew = true;
+            return 0;
+        }
+
+        int fuseWithBoth() {
+            if (fPts.count() > 1) {
+                fPts.pop();
+            }
+
+            fPts[0].fOriginatingIdx = -1;
+            fPts[0].fNeedsToBeNew = true;
+            return 0;
+        }
+
+    private:
+        struct PointData {
+            SkPoint fPt;
+            int     fOriginatingIdx;
+            int     fOrigEdgeId;
+            bool    fNeedsToBeNew;
+        };
+
+        SkTDArray<struct PointData> fPts;
+    };
+
+    // The Ring holds a set of indices into the global pool that together define
+    // a single polygon inset.
+    class Ring {
+    public:
+        void setReserve(int numPts) { fPts.setReserve(numPts); }
+        void rewind() { fPts.rewind(); }
+
+        int numPts() const { return fPts.count(); }
+
+        void addIdx(int index, int origEdgeId) {
+            struct PointData* pt = fPts.push();
+            pt->fIndex = index;
+            pt->fOrigEdgeId = origEdgeId;
+        }
+
+        // init should be called after all the indices have been added (via addIdx)
+        void init(const GrAAConvexTessellator& tess);
+        void init(const SkTDArray<SkVector>& norms, const SkTDArray<SkVector>& bisectors);
+
+        const SkPoint& norm(int index) const { return fPts[index].fNorm; }
+        const SkPoint& bisector(int index) const { return fPts[index].fBisector; }
+        int index(int index) const { return fPts[index].fIndex; }
+        int origEdgeID(int index) const { return fPts[index].fOrigEdgeId; }
+        void setOrigEdgeId(int index, int id) { fPts[index].fOrigEdgeId = id; }
+
+    #if GR_AA_CONVEX_TESSELLATOR_VIZ
+        void draw(SkCanvas* canvas, const GrAAConvexTessellator& tess) const;
+    #endif
+
+    private:
+        void computeNormals(const GrAAConvexTessellator& result);
+        void computeBisectors(const GrAAConvexTessellator& tess);
+
+        SkDEBUGCODE(bool isConvex(const GrAAConvexTessellator& tess) const;)
+
+        struct PointData {
+            SkPoint fNorm;
+            SkPoint fBisector;
+            int     fIndex;
+            int     fOrigEdgeId;
+        };
+
+        SkTDArray<PointData> fPts;
+    };
+
+    bool movable(int index) const { return fMovable[index]; }
+
+    // Movable points are those that can be slid along their bisector.
+    // Basically, a point is immovable if it is part of the original
+    // polygon or it results from the fusing of two bisectors.
+    int addPt(const SkPoint& pt, SkScalar depth, SkScalar coverage, bool movable, bool isCurve);
+    void popLastPt();
+    void popFirstPtShuffle();
+
+    void updatePt(int index, const SkPoint& pt, SkScalar depth, SkScalar coverage);
+
+    void addTri(int i0, int i1, int i2);
+
+    void reservePts(int count) {
+        fPts.setReserve(count);
+        fCoverages.setReserve(count);
+        fMovable.setReserve(count);
+    }
+
+    SkScalar computeDepthFromEdge(int edgeIdx, const SkPoint& p) const;
+
+    bool computePtAlongBisector(int startIdx, const SkPoint& bisector,
+                                int edgeIdx, SkScalar desiredDepth,
+                                SkPoint* result) const;
+
+    void lineTo(SkPoint p, bool isCurve);
+
+    void lineTo(const SkMatrix& m, SkPoint p, bool isCurve);
+
+    void quadTo(SkPoint pts[3]);
+
+    void quadTo(const SkMatrix& m, SkPoint pts[3]);
+
+    void cubicTo(const SkMatrix& m, SkPoint pts[4]);
+
+    void conicTo(const SkMatrix& m, SkPoint pts[3], SkScalar w);
+
+    void terminate(const Ring& lastRing);
+
+    // return false on failure/degenerate path
+    bool extractFromPath(const SkMatrix& m, const SkPath& path);
+    void computeBisectors();
+
+    void fanRing(const Ring& ring);
+
+    Ring* getNextRing(Ring* lastRing);
+
+    void createOuterRing(const Ring& previousRing, SkScalar outset, SkScalar coverage, 
+                         Ring* nextRing);
+
+    bool createInsetRings(Ring& previousRing, SkScalar initialDepth, SkScalar initialCoverage, 
+                          SkScalar targetDepth, SkScalar targetCoverage, Ring** finalRing);
+
+    bool createInsetRing(const Ring& lastRing, Ring* nextRing, 
+                         SkScalar initialDepth, SkScalar initialCoverage, SkScalar targetDepth, 
+                         SkScalar targetCoverage, bool forceNew);
+
+    void validate() const;
+
+    // fPts, fCoverages & fMovable should always have the same # of elements
+    SkTDArray<SkPoint>  fPts;
+    SkTDArray<SkScalar> fCoverages;
+    // movable points are those that can be slid further along their bisector
+    SkTDArray<bool>     fMovable;
+
+    // The outward facing normals for the original polygon
+    SkTDArray<SkVector> fNorms;
+    // The inward facing bisector at each point in the original polygon. Only
+    // needed for exterior ring creation and then handed off to the initial ring.
+    SkTDArray<SkVector> fBisectors;
+
+    // Tracks whether a given point is interior to a curve. Such points are 
+    // assumed to have shallow curvature.
+    SkTDArray<bool> fIsCurve;
+
+    SkPoint::Side       fSide;    // winding of the original polygon
+
+    // The triangulation of the points
+    SkTDArray<int>      fIndices;
+
+    Ring                fInitialRing;
+#if GR_AA_CONVEX_TESSELLATOR_VIZ
+    // When visualizing save all the rings
+    SkTDArray<Ring*>    fRings;
+#else
+    Ring                fRings[2];
+#endif
+    CandidateVerts      fCandidateVerts;
+
+    // < 0 means filling rather than stroking
+    SkScalar            fStrokeWidth;
+
+    SkPaint::Join        fJoin;
+
+    SkScalar            fMiterLimit;
+
+    SkTDArray<SkPoint>  fPointBuffer;
+};
+
+
+#endif
+
diff --git a/gfx/skia/skia/src/gpu/batches/GrAADistanceFieldPathRenderer.cpp b/gfx/skia/skia/src/gpu/batches/GrAADistanceFieldPathRenderer.cpp
new file mode 100644
index 000000000000..0b14e4df4ecf
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrAADistanceFieldPathRenderer.cpp
@@ -0,0 +1,642 @@
+
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrAADistanceFieldPathRenderer.h"
+
+#include "GrBatchFlushState.h"
+#include "GrBatchTest.h"
+#include "GrContext.h"
+#include "GrPipelineBuilder.h"
+#include "GrResourceProvider.h"
+#include "GrSurfacePriv.h"
+#include "GrSWMaskHelper.h"
+#include "GrTexturePriv.h"
+#include "GrVertexBuffer.h"
+#include "batches/GrVertexBatch.h"
+#include "effects/GrDistanceFieldGeoProc.h"
+
+#include "SkDistanceFieldGen.h"
+#include "SkRTConf.h"
+
+#define ATLAS_TEXTURE_WIDTH 2048
+#define ATLAS_TEXTURE_HEIGHT 2048
+#define PLOT_WIDTH  512
+#define PLOT_HEIGHT 256
+
+#define NUM_PLOTS_X   (ATLAS_TEXTURE_WIDTH / PLOT_WIDTH)
+#define NUM_PLOTS_Y   (ATLAS_TEXTURE_HEIGHT / PLOT_HEIGHT)
+
+#ifdef DF_PATH_TRACKING
+static int g_NumCachedPaths = 0;
+static int g_NumFreedPaths = 0;
+#endif
+
+// mip levels
+static const int kSmallMIP = 32;
+static const int kMediumMIP = 73;
+static const int kLargeMIP = 162;
+
+// Callback to clear out internal path cache when eviction occurs
+void GrAADistanceFieldPathRenderer::HandleEviction(GrBatchAtlas::AtlasID id, void* pr) {
+    GrAADistanceFieldPathRenderer* dfpr = (GrAADistanceFieldPathRenderer*)pr;
+    // remove any paths that use this plot
+    PathDataList::Iter iter;
+    iter.init(dfpr->fPathList, PathDataList::Iter::kHead_IterStart);
+    PathData* pathData;
+    while ((pathData = iter.get())) {
+        iter.next();
+        if (id == pathData->fID) {
+            dfpr->fPathCache.remove(pathData->fKey);
+            dfpr->fPathList.remove(pathData);
+            delete pathData;
+#ifdef DF_PATH_TRACKING
+            ++g_NumFreedPaths;
+#endif
+        }
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+GrAADistanceFieldPathRenderer::GrAADistanceFieldPathRenderer() : fAtlas(nullptr) {}
+
+GrAADistanceFieldPathRenderer::~GrAADistanceFieldPathRenderer() {
+    PathDataList::Iter iter;
+    iter.init(fPathList, PathDataList::Iter::kHead_IterStart);
+    PathData* pathData;
+    while ((pathData = iter.get())) {
+        iter.next();
+        fPathList.remove(pathData);
+        delete pathData;
+    }
+    delete fAtlas;
+
+#ifdef DF_PATH_TRACKING
+    SkDebugf("Cached paths: %d, freed paths: %d\n", g_NumCachedPaths, g_NumFreedPaths);
+#endif
+}
+
+////////////////////////////////////////////////////////////////////////////////
+bool GrAADistanceFieldPathRenderer::onCanDrawPath(const CanDrawPathArgs& args) const {
+
+    // TODO: Support inverse fill
+    if (!args.fShaderCaps->shaderDerivativeSupport() || !args.fAntiAlias ||
+        SkStrokeRec::kHairline_Style == args.fStroke->getStyle() ||
+        args.fPath->isInverseFillType() || args.fPath->isVolatile()) {
+        return false;
+    }
+
+    // currently don't support perspective
+    if (args.fViewMatrix->hasPerspective()) {
+        return false;
+    }
+    
+    // only support paths with bounds within kMediumMIP by kMediumMIP,
+    // scaled to have bounds within 2.0f*kLargeMIP by 2.0f*kLargeMIP
+    // the goal is to accelerate rendering of lots of small paths that may be scaling
+    SkScalar maxScale = args.fViewMatrix->getMaxScale();
+    const SkRect& bounds = args.fPath->getBounds();
+    SkScalar maxDim = SkMaxScalar(bounds.width(), bounds.height());
+    // Approximate stroked size by adding the maximum of the stroke width or 2x the miter limit
+    if (!args.fStroke->isFillStyle()) {
+        SkScalar extraWidth = args.fStroke->getWidth();
+        if (SkPaint::kMiter_Join == args.fStroke->getJoin()) {
+            extraWidth = SkTMax(extraWidth, 2.0f*args.fStroke->getMiter());
+        }
+        maxDim += extraWidth;
+    }
+    
+    return maxDim <= kMediumMIP && maxDim * maxScale <= 2.0f*kLargeMIP;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+// padding around path bounds to allow for antialiased pixels
+static const SkScalar kAntiAliasPad = 1.0f;
+
+class AADistanceFieldPathBatch : public GrVertexBatch {
+public:
+    DEFINE_BATCH_CLASS_ID
+
+    typedef GrAADistanceFieldPathRenderer::PathData PathData;
+    typedef SkTDynamicHash<PathData, PathData::Key> PathCache;
+    typedef GrAADistanceFieldPathRenderer::PathDataList PathDataList;
+
+    struct Geometry {
+        Geometry(const SkStrokeRec& stroke) : fStroke(stroke) {
+            if (!stroke.needToApply()) {
+                // purify unused values to ensure binary equality
+                fStroke.setStrokeParams(SkPaint::kDefault_Cap, SkPaint::kDefault_Join,
+                                        SkIntToScalar(4));
+                if (fStroke.getWidth() < 0) {
+                    fStroke.setStrokeStyle(-1.0f);
+                }
+            }
+        }
+        SkPath fPath;
+        // The unique ID of the path involved in this draw. This may be different than the ID
+        // in fPath since that path may have resulted from a SkStrokeRec::applyToPath call.
+        uint32_t fGenID;
+        SkStrokeRec fStroke;
+        bool fAntiAlias;
+    };
+
+    static GrDrawBatch* Create(const Geometry& geometry, GrColor color, const SkMatrix& viewMatrix,
+                               GrBatchAtlas* atlas, PathCache* pathCache, PathDataList* pathList) {
+        return new AADistanceFieldPathBatch(geometry, color, viewMatrix, atlas, pathCache,
+                                            pathList);
+    }
+
+    const char* name() const override { return "AADistanceFieldPathBatch"; }
+
+    void computePipelineOptimizations(GrInitInvariantOutput* color, 
+                                      GrInitInvariantOutput* coverage,
+                                      GrBatchToXPOverrides* overrides) const override {
+        color->setKnownFourComponents(fBatch.fColor);
+        coverage->setUnknownSingleComponent();
+        overrides->fUsePLSDstRead = false;
+    }
+
+private:
+    void initBatchTracker(const GrXPOverridesForBatch& overrides) override {
+        // Handle any color overrides
+        if (!overrides.readsColor()) {
+            fBatch.fColor = GrColor_ILLEGAL;
+        }
+        overrides.getOverrideColorIfSet(&fBatch.fColor);
+
+        // setup batch properties
+        fBatch.fColorIgnored = !overrides.readsColor();
+        fBatch.fUsesLocalCoords = overrides.readsLocalCoords();
+        fBatch.fCoverageIgnored = !overrides.readsCoverage();
+    }
+
+    struct FlushInfo {
+        SkAutoTUnref<const GrVertexBuffer> fVertexBuffer;
+        SkAutoTUnref<const GrIndexBuffer>  fIndexBuffer;
+        int fVertexOffset;
+        int fInstancesToFlush;
+    };
+
+    void onPrepareDraws(Target* target) const override {
+        int instanceCount = fGeoData.count();
+
+        SkMatrix invert;
+        if (this->usesLocalCoords() && !this->viewMatrix().invert(&invert)) {
+            SkDebugf("Could not invert viewmatrix\n");
+            return;
+        }
+
+        uint32_t flags = 0;
+        flags |= this->viewMatrix().isSimilarity() ? kSimilarity_DistanceFieldEffectFlag : 0;
+
+        GrTextureParams params(SkShader::kRepeat_TileMode, GrTextureParams::kBilerp_FilterMode);
+
+        // Setup GrGeometryProcessor
+        GrBatchAtlas* atlas = fAtlas;
+        SkAutoTUnref<GrGeometryProcessor> dfProcessor(
+                GrDistanceFieldPathGeoProc::Create(this->color(),
+                                                   this->viewMatrix(),
+                                                   atlas->getTexture(),
+                                                   params,
+                                                   flags,
+                                                   this->usesLocalCoords()));
+
+        target->initDraw(dfProcessor, this->pipeline());
+
+        FlushInfo flushInfo;
+
+        // allocate vertices
+        size_t vertexStride = dfProcessor->getVertexStride();
+        SkASSERT(vertexStride == 2 * sizeof(SkPoint));
+
+        const GrVertexBuffer* vertexBuffer;
+        void* vertices = target->makeVertexSpace(vertexStride,
+                                                 kVerticesPerQuad * instanceCount,
+                                                 &vertexBuffer,
+                                                 &flushInfo.fVertexOffset);
+        flushInfo.fVertexBuffer.reset(SkRef(vertexBuffer));
+        flushInfo.fIndexBuffer.reset(target->resourceProvider()->refQuadIndexBuffer());
+        if (!vertices || !flushInfo.fIndexBuffer) {
+            SkDebugf("Could not allocate vertices\n");
+            return;
+        }
+
+        flushInfo.fInstancesToFlush = 0;
+        for (int i = 0; i < instanceCount; i++) {
+            const Geometry& args = fGeoData[i];
+
+            // get mip level
+            SkScalar maxScale = this->viewMatrix().getMaxScale();
+            const SkRect& bounds = args.fPath.getBounds();
+            SkScalar maxDim = SkMaxScalar(bounds.width(), bounds.height());
+            SkScalar size = maxScale * maxDim;
+            uint32_t desiredDimension;
+            if (size <= kSmallMIP) {
+                desiredDimension = kSmallMIP;
+            } else if (size <= kMediumMIP) {
+                desiredDimension = kMediumMIP;
+            } else {
+                desiredDimension = kLargeMIP;
+            }
+
+            // check to see if path is cached
+            PathData::Key key(args.fGenID, desiredDimension, args.fStroke);
+            PathData* pathData = fPathCache->find(key);
+            if (nullptr == pathData || !atlas->hasID(pathData->fID)) {
+                // Remove the stale cache entry
+                if (pathData) {
+                    fPathCache->remove(pathData->fKey);
+                    fPathList->remove(pathData);
+                    delete pathData;
+                }
+                SkScalar scale = desiredDimension/maxDim;
+                pathData = new PathData;
+                if (!this->addPathToAtlas(target,
+                                          dfProcessor,
+                                          this->pipeline(),
+                                          &flushInfo,
+                                          atlas,
+                                          pathData,
+                                          args.fPath,
+                                          args.fGenID,
+                                          args.fStroke,
+                                          args.fAntiAlias,
+                                          desiredDimension,
+                                          scale)) {
+                    SkDebugf("Can't rasterize path\n");
+                    return;
+                }
+            }
+
+            atlas->setLastUseToken(pathData->fID, target->currentToken());
+
+            // Now set vertices
+            intptr_t offset = reinterpret_cast<intptr_t>(vertices);
+            offset += i * kVerticesPerQuad * vertexStride;
+            SkPoint* positions = reinterpret_cast<SkPoint*>(offset);
+            this->writePathVertices(target,
+                                    atlas,
+                                    this->pipeline(),
+                                    dfProcessor,
+                                    positions,
+                                    vertexStride,
+                                    this->viewMatrix(),
+                                    args.fPath,
+                                    pathData);
+            flushInfo.fInstancesToFlush++;
+        }
+
+        this->flush(target, &flushInfo);
+    }
+
+    SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
+
+    AADistanceFieldPathBatch(const Geometry& geometry, GrColor color, const SkMatrix& viewMatrix,
+                             GrBatchAtlas* atlas,
+                             PathCache* pathCache, PathDataList* pathList)
+        : INHERITED(ClassID()) {
+        fBatch.fColor = color;
+        fBatch.fViewMatrix = viewMatrix;
+        fGeoData.push_back(geometry);
+
+        fAtlas = atlas;
+        fPathCache = pathCache;
+        fPathList = pathList;
+
+        // Compute bounds
+        fBounds = geometry.fPath.getBounds();
+        viewMatrix.mapRect(&fBounds);
+    }
+
+    bool addPathToAtlas(GrVertexBatch::Target* target,
+                        const GrGeometryProcessor* dfProcessor,
+                        const GrPipeline* pipeline,
+                        FlushInfo* flushInfo,
+                        GrBatchAtlas* atlas,
+                        PathData* pathData,
+                        const SkPath& path,
+                        uint32_t genID,
+                        const SkStrokeRec& stroke,
+                        bool antiAlias,
+                        uint32_t dimension,
+                        SkScalar scale) const {
+        const SkRect& bounds = path.getBounds();
+
+        // generate bounding rect for bitmap draw
+        SkRect scaledBounds = bounds;
+        // scale to mip level size
+        scaledBounds.fLeft *= scale;
+        scaledBounds.fTop *= scale;
+        scaledBounds.fRight *= scale;
+        scaledBounds.fBottom *= scale;
+        // move the origin to an integer boundary (gives better results)
+        SkScalar dx = SkScalarFraction(scaledBounds.fLeft);
+        SkScalar dy = SkScalarFraction(scaledBounds.fTop);
+        scaledBounds.offset(-dx, -dy);
+        // get integer boundary
+        SkIRect devPathBounds;
+        scaledBounds.roundOut(&devPathBounds);
+        // pad to allow room for antialiasing
+        devPathBounds.outset(SkScalarCeilToInt(kAntiAliasPad), SkScalarCeilToInt(kAntiAliasPad));
+        // move origin to upper left corner
+        devPathBounds.offsetTo(0,0);
+
+        // draw path to bitmap
+        SkMatrix drawMatrix;
+        drawMatrix.setTranslate(-bounds.left(), -bounds.top());
+        drawMatrix.postScale(scale, scale);
+        drawMatrix.postTranslate(kAntiAliasPad, kAntiAliasPad);
+
+        // setup bitmap backing
+        SkASSERT(devPathBounds.fLeft == 0);
+        SkASSERT(devPathBounds.fTop == 0);
+        SkAutoPixmapStorage dst;
+        if (!dst.tryAlloc(SkImageInfo::MakeA8(devPathBounds.width(),
+                                              devPathBounds.height()))) {
+            return false;
+        }
+        sk_bzero(dst.writable_addr(), dst.getSafeSize());
+
+        // rasterize path
+        SkPaint paint;
+        paint.setStyle(SkPaint::kFill_Style);
+        paint.setAntiAlias(antiAlias);
+
+        SkDraw draw;
+        sk_bzero(&draw, sizeof(draw));
+
+        SkRasterClip rasterClip;
+        rasterClip.setRect(devPathBounds);
+        draw.fRC = &rasterClip;
+        draw.fClip = &rasterClip.bwRgn();
+        draw.fMatrix = &drawMatrix;
+        draw.fDst = dst;
+
+        draw.drawPathCoverage(path, paint);
+
+        // generate signed distance field
+        devPathBounds.outset(SK_DistanceFieldPad, SK_DistanceFieldPad);
+        int width = devPathBounds.width();
+        int height = devPathBounds.height();
+        // TODO We should really generate this directly into the plot somehow
+        SkAutoSMalloc<1024> dfStorage(width * height * sizeof(unsigned char));
+
+        // Generate signed distance field
+        SkGenerateDistanceFieldFromA8Image((unsigned char*)dfStorage.get(),
+                                           (const unsigned char*)dst.addr(),
+                                           dst.width(), dst.height(), dst.rowBytes());
+
+        // add to atlas
+        SkIPoint16 atlasLocation;
+        GrBatchAtlas::AtlasID id;
+        bool success = atlas->addToAtlas(&id, target, width, height, dfStorage.get(),
+                                         &atlasLocation);
+        if (!success) {
+            this->flush(target, flushInfo);
+            target->initDraw(dfProcessor, pipeline);
+
+            SkDEBUGCODE(success =) atlas->addToAtlas(&id, target, width, height,
+                                                     dfStorage.get(), &atlasLocation);
+            SkASSERT(success);
+
+        }
+
+        // add to cache
+        pathData->fKey = PathData::Key(genID, dimension, stroke);
+        pathData->fScale = scale;
+        pathData->fID = id;
+        // change the scaled rect to match the size of the inset distance field
+        scaledBounds.fRight = scaledBounds.fLeft +
+            SkIntToScalar(devPathBounds.width() - 2*SK_DistanceFieldInset);
+        scaledBounds.fBottom = scaledBounds.fTop +
+            SkIntToScalar(devPathBounds.height() - 2*SK_DistanceFieldInset);
+        // shift the origin to the correct place relative to the distance field
+        // need to also restore the fractional translation
+        scaledBounds.offset(-SkIntToScalar(SK_DistanceFieldInset) - kAntiAliasPad + dx,
+                            -SkIntToScalar(SK_DistanceFieldInset) - kAntiAliasPad + dy);
+        pathData->fBounds = scaledBounds;
+        // origin we render from is inset from distance field edge
+        atlasLocation.fX += SK_DistanceFieldInset;
+        atlasLocation.fY += SK_DistanceFieldInset;
+        pathData->fAtlasLocation = atlasLocation;
+
+        fPathCache->add(pathData);
+        fPathList->addToTail(pathData);
+#ifdef DF_PATH_TRACKING
+        ++g_NumCachedPaths;
+#endif
+        return true;
+    }
+
+    void writePathVertices(GrDrawBatch::Target* target,
+                           GrBatchAtlas* atlas,
+                           const GrPipeline* pipeline,
+                           const GrGeometryProcessor* gp,
+                           SkPoint* positions,
+                           size_t vertexStride,
+                           const SkMatrix& viewMatrix,
+                           const SkPath& path,
+                           const PathData* pathData) const {
+        GrTexture* texture = atlas->getTexture();
+
+        SkScalar dx = pathData->fBounds.fLeft;
+        SkScalar dy = pathData->fBounds.fTop;
+        SkScalar width = pathData->fBounds.width();
+        SkScalar height = pathData->fBounds.height();
+
+        SkScalar invScale = 1.0f / pathData->fScale;
+        dx *= invScale;
+        dy *= invScale;
+        width *= invScale;
+        height *= invScale;
+
+        SkFixed tx = SkIntToFixed(pathData->fAtlasLocation.fX);
+        SkFixed ty = SkIntToFixed(pathData->fAtlasLocation.fY);
+        SkFixed tw = SkScalarToFixed(pathData->fBounds.width());
+        SkFixed th = SkScalarToFixed(pathData->fBounds.height());
+
+        // vertex positions
+        // TODO make the vertex attributes a struct
+        SkRect r = SkRect::MakeXYWH(dx, dy, width, height);
+        positions->setRectFan(r.left(), r.top(), r.right(), r.bottom(), vertexStride);
+
+        // vertex texture coords
+        SkPoint* textureCoords = positions + 1;
+        textureCoords->setRectFan(SkFixedToFloat(texture->texturePriv().normalizeFixedX(tx)),
+                                  SkFixedToFloat(texture->texturePriv().normalizeFixedY(ty)),
+                                  SkFixedToFloat(texture->texturePriv().normalizeFixedX(tx + tw)),
+                                  SkFixedToFloat(texture->texturePriv().normalizeFixedY(ty + th)),
+                                  vertexStride);
+    }
+
+    void flush(GrVertexBatch::Target* target, FlushInfo* flushInfo) const {
+        GrVertices vertices;
+        int maxInstancesPerDraw = flushInfo->fIndexBuffer->maxQuads();
+        vertices.initInstanced(kTriangles_GrPrimitiveType, flushInfo->fVertexBuffer,
+            flushInfo->fIndexBuffer, flushInfo->fVertexOffset, kVerticesPerQuad,
+            kIndicesPerQuad, flushInfo->fInstancesToFlush, maxInstancesPerDraw);
+        target->draw(vertices);
+        flushInfo->fVertexOffset += kVerticesPerQuad * flushInfo->fInstancesToFlush;
+        flushInfo->fInstancesToFlush = 0;
+    }
+
+    GrColor color() const { return fBatch.fColor; }
+    const SkMatrix& viewMatrix() const { return fBatch.fViewMatrix; }
+    bool usesLocalCoords() const { return fBatch.fUsesLocalCoords; }
+
+    bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override {
+        AADistanceFieldPathBatch* that = t->cast<AADistanceFieldPathBatch>();
+        if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *that->pipeline(),
+                                    that->bounds(), caps)) {
+            return false;
+        }
+
+        // TODO we could actually probably do a bunch of this work on the CPU, ie map viewMatrix,
+        // maybe upload color via attribute
+        if (this->color() != that->color()) {
+            return false;
+        }
+
+        if (!this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
+            return false;
+        }
+
+        fGeoData.push_back_n(that->geoData()->count(), that->geoData()->begin());
+        this->joinBounds(that->bounds());
+        return true;
+    }
+
+    struct BatchTracker {
+        GrColor fColor;
+        SkMatrix fViewMatrix;
+        bool fUsesLocalCoords;
+        bool fColorIgnored;
+        bool fCoverageIgnored;
+    };
+
+    BatchTracker fBatch;
+    SkSTArray<1, Geometry, true> fGeoData;
+    GrBatchAtlas* fAtlas;
+    PathCache* fPathCache;
+    PathDataList* fPathList;
+
+    typedef GrVertexBatch INHERITED;
+};
+
+bool GrAADistanceFieldPathRenderer::onDrawPath(const DrawPathArgs& args) {
+    // we've already bailed on inverse filled paths, so this is safe
+    if (args.fPath->isEmpty()) {
+        return true;
+    }
+
+    if (!fAtlas) {
+        fAtlas = args.fResourceProvider->createAtlas(kAlpha_8_GrPixelConfig,
+                                                     ATLAS_TEXTURE_WIDTH, ATLAS_TEXTURE_HEIGHT,
+                                                     NUM_PLOTS_X, NUM_PLOTS_Y,
+                                                     &GrAADistanceFieldPathRenderer::HandleEviction,
+                                                     (void*)this);
+        if (!fAtlas) {
+            return false;
+        }
+    }
+
+    AADistanceFieldPathBatch::Geometry geometry(*args.fStroke);
+    if (SkStrokeRec::kFill_Style == args.fStroke->getStyle()) {
+        geometry.fPath = *args.fPath;
+    } else {
+        args.fStroke->applyToPath(&geometry.fPath, *args.fPath);
+    }
+    geometry.fAntiAlias = args.fAntiAlias;
+    // Note: this is the generation ID of the _original_ path. When a new path is
+    // generated due to stroking it is important that the original path's id is used
+    // for caching.
+    geometry.fGenID = args.fPath->getGenerationID();
+ 
+    SkAutoTUnref<GrDrawBatch> batch(AADistanceFieldPathBatch::Create(geometry, args.fColor,
+                                                                     *args.fViewMatrix, fAtlas,
+                                                                     &fPathCache, &fPathList));
+    args.fTarget->drawBatch(*args.fPipelineBuilder, batch);
+
+    return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef GR_TEST_UTILS
+
+struct PathTestStruct {
+    typedef GrAADistanceFieldPathRenderer::PathCache PathCache;
+    typedef GrAADistanceFieldPathRenderer::PathData PathData;
+    typedef GrAADistanceFieldPathRenderer::PathDataList PathDataList;
+    PathTestStruct() : fContextID(SK_InvalidGenID), fAtlas(nullptr) {}
+    ~PathTestStruct() { this->reset(); }
+
+    void reset() {
+        PathDataList::Iter iter;
+        iter.init(fPathList, PathDataList::Iter::kHead_IterStart);
+        PathData* pathData;
+        while ((pathData = iter.get())) {
+            iter.next();
+            fPathList.remove(pathData);
+            delete pathData;
+        }
+        delete fAtlas;
+        fPathCache.reset();
+    }
+
+    static void HandleEviction(GrBatchAtlas::AtlasID id, void* pr) {
+        PathTestStruct* dfpr = (PathTestStruct*)pr;
+        // remove any paths that use this plot
+        PathDataList::Iter iter;
+        iter.init(dfpr->fPathList, PathDataList::Iter::kHead_IterStart);
+        PathData* pathData;
+        while ((pathData = iter.get())) {
+            iter.next();
+            if (id == pathData->fID) {
+                dfpr->fPathCache.remove(pathData->fKey);
+                dfpr->fPathList.remove(pathData);
+                delete pathData;
+            }
+        }
+    }
+
+    uint32_t fContextID;
+    GrBatchAtlas* fAtlas;
+    PathCache fPathCache;
+    PathDataList fPathList;
+};
+
+DRAW_BATCH_TEST_DEFINE(AADistanceFieldPathBatch) {
+    static PathTestStruct gTestStruct;
+
+    if (context->uniqueID() != gTestStruct.fContextID) {
+        gTestStruct.fContextID = context->uniqueID();
+        gTestStruct.reset();
+        gTestStruct.fAtlas =
+                context->resourceProvider()->createAtlas(kAlpha_8_GrPixelConfig,
+                                                     ATLAS_TEXTURE_WIDTH, ATLAS_TEXTURE_HEIGHT,
+                                                     NUM_PLOTS_X, NUM_PLOTS_Y,
+                                                     &PathTestStruct::HandleEviction,
+                                                     (void*)&gTestStruct);
+    }
+
+    SkMatrix viewMatrix = GrTest::TestMatrix(random);
+    GrColor color = GrRandomColor(random);
+
+    AADistanceFieldPathBatch::Geometry geometry(GrTest::TestStrokeRec(random));
+    geometry.fPath = GrTest::TestPath(random);
+    geometry.fAntiAlias = random->nextBool();
+    geometry.fGenID = random->nextU();
+
+    return AADistanceFieldPathBatch::Create(geometry, color, viewMatrix,
+                                            gTestStruct.fAtlas,
+                                            &gTestStruct.fPathCache,
+                                            &gTestStruct.fPathList);
+}
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrAADistanceFieldPathRenderer.h b/gfx/skia/skia/src/gpu/batches/GrAADistanceFieldPathRenderer.h
new file mode 100755
index 000000000000..c0e68268dedf
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrAADistanceFieldPathRenderer.h
@@ -0,0 +1,92 @@
+
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrAADistanceFieldPathRenderer_DEFINED
+#define GrAADistanceFieldPathRenderer_DEFINED
+
+#include "GrBatchAtlas.h"
+#include "GrPathRenderer.h"
+#include "GrRect.h"
+
+#include "SkChecksum.h"
+#include "SkTDynamicHash.h"
+
+class GrContext;
+
+class GrAADistanceFieldPathRenderer : public GrPathRenderer {
+public:
+    GrAADistanceFieldPathRenderer();
+    virtual ~GrAADistanceFieldPathRenderer();
+
+private:
+    StencilSupport onGetStencilSupport(const SkPath&, const GrStrokeInfo&) const override {
+        return GrPathRenderer::kNoSupport_StencilSupport;
+    }
+
+    bool onCanDrawPath(const CanDrawPathArgs&) const override;
+
+    bool onDrawPath(const DrawPathArgs&) override;
+
+    struct PathData {
+        class Key {
+        public:
+            // default ctor needed for new of uninitialized PathData
+            // since fStroke has no default ctor
+            Key() 
+                : fGenID(0)
+                , fDimension(0)
+                , fStroke(SkStrokeRec::kFill_InitStyle) {}
+            Key(uint32_t genID, uint32_t dim, const SkStrokeRec& stroke)
+                : fGenID(genID)
+                , fDimension(dim)
+                , fStroke(stroke) {}
+           
+            bool operator==(const Key& other) const {
+                return other.fGenID == fGenID && other.fDimension == fDimension &&
+                       fStroke.hasEqualEffect(other.fStroke);
+            }
+           
+        private:
+            uint32_t   fGenID;
+            // rendered size for stored path (32x32 max, 64x64 max, 128x128 max)
+            uint32_t   fDimension;
+            // stroking information
+            SkStrokeRec fStroke;
+        };
+        Key                   fKey;
+        SkScalar              fScale;
+        GrBatchAtlas::AtlasID fID;
+        SkRect                fBounds;
+        SkIPoint16            fAtlasLocation;
+        SK_DECLARE_INTERNAL_LLIST_INTERFACE(PathData);
+        
+        static inline const Key& GetKey(const PathData& data) {
+            return data.fKey;
+        }
+        
+        static inline uint32_t Hash(Key key) {
+            return SkChecksum::Murmur3(reinterpret_cast<const uint32_t*>(&key), sizeof(key));
+        }
+    };
+
+    static void HandleEviction(GrBatchAtlas::AtlasID, void*);
+
+    typedef SkTDynamicHash<PathData, PathData::Key> PathCache;
+    typedef SkTInternalLList<PathData> PathDataList;
+    
+    GrBatchAtlas*                      fAtlas;
+    PathCache                          fPathCache;
+    PathDataList                       fPathList;
+    
+    typedef GrPathRenderer INHERITED;
+
+    friend class AADistanceFieldPathBatch;
+    friend struct PathTestStruct;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrAAFillRectBatch.cpp b/gfx/skia/skia/src/gpu/batches/GrAAFillRectBatch.cpp
new file mode 100644
index 000000000000..9ec8ffdc4a2a
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrAAFillRectBatch.cpp
@@ -0,0 +1,421 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrAAFillRectBatch.h"
+
+#include "GrColor.h"
+#include "GrDefaultGeoProcFactory.h"
+#include "GrResourceKey.h"
+#include "GrResourceProvider.h"
+#include "GrTInstanceBatch.h"
+#include "GrTypes.h"
+#include "SkMatrix.h"
+#include "SkRect.h"
+
+GR_DECLARE_STATIC_UNIQUE_KEY(gAAFillRectIndexBufferKey);
+
+static void set_inset_fan(SkPoint* pts, size_t stride,
+                          const SkRect& r, SkScalar dx, SkScalar dy) {
+    pts->setRectFan(r.fLeft + dx, r.fTop + dy,
+                    r.fRight - dx, r.fBottom - dy, stride);
+}
+
+static const int kNumAAFillRectsInIndexBuffer = 256;
+static const int kVertsPerAAFillRect = 8;
+static const int kIndicesPerAAFillRect = 30;
+
+const GrIndexBuffer* get_index_buffer(GrResourceProvider* resourceProvider) {
+    GR_DEFINE_STATIC_UNIQUE_KEY(gAAFillRectIndexBufferKey);
+
+    static const uint16_t gFillAARectIdx[] = {
+        0, 1, 5, 5, 4, 0,
+        1, 2, 6, 6, 5, 1,
+        2, 3, 7, 7, 6, 2,
+        3, 0, 4, 4, 7, 3,
+        4, 5, 6, 6, 7, 4,
+    };
+    GR_STATIC_ASSERT(SK_ARRAY_COUNT(gFillAARectIdx) == kIndicesPerAAFillRect);
+    return resourceProvider->findOrCreateInstancedIndexBuffer(gFillAARectIdx,
+        kIndicesPerAAFillRect, kNumAAFillRectsInIndexBuffer, kVertsPerAAFillRect,
+        gAAFillRectIndexBufferKey);
+}
+
+static const GrGeometryProcessor* create_fill_rect_gp(
+                                       const SkMatrix& viewMatrix,
+                                       const GrXPOverridesForBatch& overrides,
+                                       GrDefaultGeoProcFactory::LocalCoords::Type localCoordsType) {
+    using namespace GrDefaultGeoProcFactory;
+
+    Color color(Color::kAttribute_Type);
+    Coverage::Type coverageType;
+    // TODO remove coverage if coverage is ignored
+    /*if (coverageIgnored) {
+        coverageType = Coverage::kNone_Type;
+    } else*/ if (overrides.canTweakAlphaForCoverage()) {
+        coverageType = Coverage::kSolid_Type;
+    } else {
+        coverageType = Coverage::kAttribute_Type;
+    }
+    Coverage coverage(coverageType);
+
+    // We assume the caller has inverted the viewmatrix
+    if (LocalCoords::kHasExplicit_Type == localCoordsType) {
+        LocalCoords localCoords(localCoordsType);
+        return GrDefaultGeoProcFactory::Create(color, coverage, localCoords, SkMatrix::I());
+    } else {
+        LocalCoords localCoords(overrides.readsLocalCoords() ? localCoordsType :
+                                                               LocalCoords::kUnused_Type);
+        return CreateForDeviceSpace(color, coverage, localCoords, viewMatrix);
+    }
+}
+
+static void generate_aa_fill_rect_geometry(intptr_t verts,
+                                           size_t vertexStride,
+                                           GrColor color,
+                                           const SkMatrix& viewMatrix,
+                                           const SkRect& rect,
+                                           const SkRect& devRect,
+                                           const GrXPOverridesForBatch& overrides,
+                                           const SkMatrix* localMatrix) {
+    SkPoint* fan0Pos = reinterpret_cast<SkPoint*>(verts);
+    SkPoint* fan1Pos = reinterpret_cast<SkPoint*>(verts + 4 * vertexStride);
+
+    SkScalar inset = SkMinScalar(devRect.width(), SK_Scalar1);
+    inset = SK_ScalarHalf * SkMinScalar(inset, devRect.height());
+
+    if (viewMatrix.rectStaysRect()) {
+        set_inset_fan(fan0Pos, vertexStride, devRect, -SK_ScalarHalf, -SK_ScalarHalf);
+        set_inset_fan(fan1Pos, vertexStride, devRect, inset,  inset);
+    } else {
+        // compute transformed (1, 0) and (0, 1) vectors
+        SkVector vec[2] = {
+          { viewMatrix[SkMatrix::kMScaleX], viewMatrix[SkMatrix::kMSkewY] },
+          { viewMatrix[SkMatrix::kMSkewX],  viewMatrix[SkMatrix::kMScaleY] }
+        };
+
+        vec[0].normalize();
+        vec[0].scale(SK_ScalarHalf);
+        vec[1].normalize();
+        vec[1].scale(SK_ScalarHalf);
+
+        // create the rotated rect
+        fan0Pos->setRectFan(rect.fLeft, rect.fTop,
+                            rect.fRight, rect.fBottom, vertexStride);
+        viewMatrix.mapPointsWithStride(fan0Pos, vertexStride, 4);
+
+        // Now create the inset points and then outset the original
+        // rotated points
+
+        // TL
+        *((SkPoint*)((intptr_t)fan1Pos + 0 * vertexStride)) =
+            *((SkPoint*)((intptr_t)fan0Pos + 0 * vertexStride)) + vec[0] + vec[1];
+        *((SkPoint*)((intptr_t)fan0Pos + 0 * vertexStride)) -= vec[0] + vec[1];
+        // BL
+        *((SkPoint*)((intptr_t)fan1Pos + 1 * vertexStride)) =
+            *((SkPoint*)((intptr_t)fan0Pos + 1 * vertexStride)) + vec[0] - vec[1];
+        *((SkPoint*)((intptr_t)fan0Pos + 1 * vertexStride)) -= vec[0] - vec[1];
+        // BR
+        *((SkPoint*)((intptr_t)fan1Pos + 2 * vertexStride)) =
+            *((SkPoint*)((intptr_t)fan0Pos + 2 * vertexStride)) - vec[0] - vec[1];
+        *((SkPoint*)((intptr_t)fan0Pos + 2 * vertexStride)) += vec[0] + vec[1];
+        // TR
+        *((SkPoint*)((intptr_t)fan1Pos + 3 * vertexStride)) =
+            *((SkPoint*)((intptr_t)fan0Pos + 3 * vertexStride)) - vec[0] + vec[1];
+        *((SkPoint*)((intptr_t)fan0Pos + 3 * vertexStride)) += vec[0] - vec[1];
+    }
+
+    if (localMatrix) {
+        SkMatrix invViewMatrix;
+        if (!viewMatrix.invert(&invViewMatrix)) {
+            SkASSERT(false);
+            invViewMatrix = SkMatrix::I();
+        }
+        SkMatrix localCoordMatrix;
+        localCoordMatrix.setConcat(*localMatrix, invViewMatrix);
+        SkPoint* fan0Loc = reinterpret_cast<SkPoint*>(verts + sizeof(SkPoint) + sizeof(GrColor));
+        localCoordMatrix.mapPointsWithStride(fan0Loc, fan0Pos, vertexStride, 8);
+    }
+
+    bool tweakAlphaForCoverage = overrides.canTweakAlphaForCoverage();
+
+    // Make verts point to vertex color and then set all the color and coverage vertex attrs
+    // values.
+    verts += sizeof(SkPoint);
+
+    // The coverage offset is always the last vertex attribute
+    intptr_t coverageOffset = vertexStride - sizeof(GrColor) - sizeof(SkPoint);
+    for (int i = 0; i < 4; ++i) {
+        if (tweakAlphaForCoverage) {
+            *reinterpret_cast<GrColor*>(verts + i * vertexStride) = 0;
+        } else {
+            *reinterpret_cast<GrColor*>(verts + i * vertexStride) = color;
+            *reinterpret_cast<float*>(verts + i * vertexStride + coverageOffset) = 0;
+        }
+    }
+
+    int scale;
+    if (inset < SK_ScalarHalf) {
+        scale = SkScalarFloorToInt(512.0f * inset / (inset + SK_ScalarHalf));
+        SkASSERT(scale >= 0 && scale <= 255);
+    } else {
+        scale = 0xff;
+    }
+
+    verts += 4 * vertexStride;
+
+    float innerCoverage = GrNormalizeByteToFloat(scale);
+    GrColor scaledColor = (0xff == scale) ? color : SkAlphaMulQ(color, scale);
+
+    for (int i = 0; i < 4; ++i) {
+        if (tweakAlphaForCoverage) {
+            *reinterpret_cast<GrColor*>(verts + i * vertexStride) = scaledColor;
+        } else {
+            *reinterpret_cast<GrColor*>(verts + i * vertexStride) = color;
+            *reinterpret_cast<float*>(verts + i * vertexStride +
+                                      coverageOffset) = innerCoverage;
+        }
+    }
+}
+
+// Common functions
+class AAFillRectBatchBase {
+public:
+    static const int kVertsPerInstance = kVertsPerAAFillRect;
+    static const int kIndicesPerInstance = kIndicesPerAAFillRect;
+
+    static void InitInvariantOutputCoverage(GrInitInvariantOutput* out) {
+        out->setUnknownSingleComponent();
+    }
+
+    static const GrIndexBuffer* GetIndexBuffer(GrResourceProvider* rp) {
+        return get_index_buffer(rp);
+    }
+
+    template <class Geometry>
+    static void SetBounds(const Geometry& geo, SkRect* outBounds) {
+        *outBounds = geo.fDevRect;
+    }
+
+    template <class Geometry>
+    static void UpdateBoundsAfterAppend(const Geometry& geo, SkRect* outBounds) {
+        outBounds->join(geo.fDevRect);
+    }
+};
+
+class AAFillRectBatchNoLocalMatrixImp : public AAFillRectBatchBase {
+public:
+    struct Geometry {
+        SkMatrix fViewMatrix;
+        SkRect fRect;
+        SkRect fDevRect;
+        GrColor fColor;
+    };
+
+    static const char* Name() { return "AAFillRectBatchNoLocalMatrix"; }
+
+    static SkString DumpInfo(const Geometry& geo, int index) {
+        SkString str;
+        str.appendf("%d: Color: 0x%08x, Rect [L: %.2f, T: %.2f, R: %.2f, B: %.2f]\n",
+                    index,
+                    geo.fColor,
+                    geo.fRect.fLeft, geo.fRect.fTop, geo.fRect.fRight, geo.fRect.fBottom);
+        return str;
+    }
+
+    static bool CanCombine(const Geometry& mine, const Geometry& theirs,
+                           const GrXPOverridesForBatch& overrides) {
+        // We apply the viewmatrix to the rect points on the cpu.  However, if the pipeline uses
+        // local coords then we won't be able to batch.  We could actually upload the viewmatrix
+        // using vertex attributes in these cases, but haven't investigated that
+        return !overrides.readsLocalCoords() || mine.fViewMatrix.cheapEqualTo(theirs.fViewMatrix);
+    }
+
+    static const GrGeometryProcessor* CreateGP(const Geometry& geo,
+                                               const GrXPOverridesForBatch& overrides) {
+        const GrGeometryProcessor* gp =
+                create_fill_rect_gp(geo.fViewMatrix, overrides,
+                                    GrDefaultGeoProcFactory::LocalCoords::kUsePosition_Type);
+
+        SkASSERT(overrides.canTweakAlphaForCoverage() ?
+                 gp->getVertexStride() == sizeof(GrDefaultGeoProcFactory::PositionColorAttr) :
+                 gp->getVertexStride() ==
+                         sizeof(GrDefaultGeoProcFactory::PositionColorCoverageAttr));
+        return gp;
+    }
+
+    static void Tesselate(intptr_t vertices, size_t vertexStride, const Geometry& geo,
+                          const GrXPOverridesForBatch& overrides) {
+        generate_aa_fill_rect_geometry(vertices, vertexStride,
+                                       geo.fColor, geo.fViewMatrix, geo.fRect, geo.fDevRect, 
+                                       overrides, nullptr);
+    }
+};
+
+class AAFillRectBatchLocalMatrixImp : public AAFillRectBatchBase {
+public:
+    struct Geometry {
+        SkMatrix fViewMatrix;
+        SkMatrix fLocalMatrix;
+        SkRect fRect;
+        SkRect fDevRect;
+        GrColor fColor;
+    };
+
+    static const char* Name() { return "AAFillRectBatchLocalMatrix"; }
+
+    static SkString DumpInfo(const Geometry& geo, int index) {
+        SkString str;
+        str.appendf("%d: Color: 0x%08x, Rect [L: %.2f, T: %.2f, R: %.2f, B: %.2f]\n",
+                    index,
+                    geo.fColor,
+                    geo.fRect.fLeft, geo.fRect.fTop, geo.fRect.fRight, geo.fRect.fBottom);
+        return str;
+    }
+
+    static bool CanCombine(const Geometry& mine, const Geometry& theirs,
+                           const GrXPOverridesForBatch& overrides) {
+        return true;
+    }
+
+    static const GrGeometryProcessor* CreateGP(const Geometry& geo,
+                                               const GrXPOverridesForBatch& overrides) {
+        const GrGeometryProcessor* gp =
+                create_fill_rect_gp(geo.fViewMatrix, overrides,
+                                    GrDefaultGeoProcFactory::LocalCoords::kHasExplicit_Type);
+
+        SkASSERT(overrides.canTweakAlphaForCoverage() ?
+                 gp->getVertexStride() ==
+                         sizeof(GrDefaultGeoProcFactory::PositionColorLocalCoordAttr) :
+                 gp->getVertexStride() ==
+                         sizeof(GrDefaultGeoProcFactory::PositionColorLocalCoordCoverage));
+        return gp;
+    }
+
+    static void Tesselate(intptr_t vertices, size_t vertexStride, const Geometry& geo,
+                          const GrXPOverridesForBatch& overrides) {
+        generate_aa_fill_rect_geometry(vertices, vertexStride,
+                                       geo.fColor, geo.fViewMatrix, geo.fRect, geo.fDevRect, 
+                                       overrides, &geo.fLocalMatrix);
+    }
+};
+
+typedef GrTInstanceBatch<AAFillRectBatchNoLocalMatrixImp> AAFillRectBatchNoLocalMatrix;
+typedef GrTInstanceBatch<AAFillRectBatchLocalMatrixImp> AAFillRectBatchLocalMatrix;
+
+inline static void append_to_batch(AAFillRectBatchNoLocalMatrix* batch, GrColor color,
+                                   const SkMatrix& viewMatrix, const SkRect& rect,
+                                   const SkRect& devRect) {
+    AAFillRectBatchNoLocalMatrix::Geometry& geo = batch->geoData()->push_back();
+    geo.fColor = color;
+    geo.fViewMatrix = viewMatrix;
+    geo.fRect = rect;
+    geo.fDevRect = devRect;
+}
+
+inline static void append_to_batch(AAFillRectBatchLocalMatrix* batch, GrColor color,
+                                   const SkMatrix& viewMatrix, const SkMatrix& localMatrix,
+                                   const SkRect& rect, const SkRect& devRect) {
+    AAFillRectBatchLocalMatrix::Geometry& geo = batch->geoData()->push_back();
+    geo.fColor = color;
+    geo.fViewMatrix = viewMatrix;
+    geo.fLocalMatrix = localMatrix;
+    geo.fRect = rect;
+    geo.fDevRect = devRect;
+}
+
+namespace GrAAFillRectBatch {
+
+GrDrawBatch* Create(GrColor color,
+                    const SkMatrix& viewMatrix,
+                    const SkRect& rect,
+                    const SkRect& devRect) {
+    AAFillRectBatchNoLocalMatrix* batch = AAFillRectBatchNoLocalMatrix::Create();
+    append_to_batch(batch, color, viewMatrix, rect, devRect);
+    batch->init();
+    return batch;
+}
+
+GrDrawBatch* Create(GrColor color,
+                    const SkMatrix& viewMatrix,
+                    const SkMatrix& localMatrix,
+                    const SkRect& rect,
+                    const SkRect& devRect) {
+    AAFillRectBatchLocalMatrix* batch = AAFillRectBatchLocalMatrix::Create();
+    append_to_batch(batch, color, viewMatrix, localMatrix, rect, devRect);
+    batch->init();
+    return batch;
+}
+
+GrDrawBatch* Create(GrColor color,
+                    const SkMatrix& viewMatrix,
+                    const SkMatrix& localMatrix,
+                    const SkRect& rect) {
+    SkRect devRect;
+    viewMatrix.mapRect(&devRect, rect);
+    return Create(color, viewMatrix, localMatrix, rect, devRect);
+}
+
+GrDrawBatch* CreateWithLocalRect(GrColor color,
+                                 const SkMatrix& viewMatrix,
+                                 const SkRect& rect,
+                                 const SkRect& localRect) {
+    SkRect devRect;
+    viewMatrix.mapRect(&devRect, rect);
+    SkMatrix localMatrix;
+    if (!localMatrix.setRectToRect(rect, localRect, SkMatrix::kFill_ScaleToFit)) {
+        return nullptr;
+    }
+    return Create(color, viewMatrix, localMatrix, rect, devRect);
+}
+
+void Append(GrBatch* origBatch,
+            GrColor color,
+            const SkMatrix& viewMatrix,
+            const SkRect& rect,
+            const SkRect& devRect) {
+    AAFillRectBatchNoLocalMatrix* batch = origBatch->cast<AAFillRectBatchNoLocalMatrix>();
+    append_to_batch(batch, color, viewMatrix, rect, devRect);
+    batch->updateBoundsAfterAppend();
+}
+
+void Append(GrBatch* origBatch,
+            GrColor color,
+            const SkMatrix& viewMatrix,
+            const SkMatrix& localMatrix,
+            const SkRect& rect,
+            const SkRect& devRect) {
+    AAFillRectBatchLocalMatrix* batch = origBatch->cast<AAFillRectBatchLocalMatrix>();
+    append_to_batch(batch, color, viewMatrix, localMatrix, rect, devRect);
+    batch->updateBoundsAfterAppend();
+}
+
+};
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef GR_TEST_UTILS
+
+#include "GrBatchTest.h"
+
+DRAW_BATCH_TEST_DEFINE(AAFillRectBatch) {
+    GrColor color = GrRandomColor(random);
+    SkMatrix viewMatrix = GrTest::TestMatrixInvertible(random);
+    SkRect rect = GrTest::TestRect(random);
+    SkRect devRect = GrTest::TestRect(random);
+    return GrAAFillRectBatch::Create(color, viewMatrix, rect, devRect);
+}
+
+DRAW_BATCH_TEST_DEFINE(AAFillRectBatchLocalMatrix) {
+    GrColor color = GrRandomColor(random);
+    SkMatrix viewMatrix = GrTest::TestMatrixInvertible(random);
+    SkMatrix localMatrix = GrTest::TestMatrix(random);
+    SkRect rect = GrTest::TestRect(random);
+    SkRect devRect = GrTest::TestRect(random);
+    return GrAAFillRectBatch::Create(color, viewMatrix, localMatrix, rect, devRect);
+}
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrAAFillRectBatch.h b/gfx/skia/skia/src/gpu/batches/GrAAFillRectBatch.h
new file mode 100644
index 000000000000..6f6f0d039812
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrAAFillRectBatch.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrAAFillRectBatch_DEFINED
+#define GrAAFillRectBatch_DEFINED
+
+#include "GrColor.h"
+
+class GrBatch;
+class GrDrawBatch;
+class SkMatrix;
+struct SkRect;
+
+namespace GrAAFillRectBatch {
+GrDrawBatch* Create(GrColor color,
+                    const SkMatrix& viewMatrix,
+                    const SkRect& rect,
+                    const SkRect& devRect);
+
+GrDrawBatch* Create(GrColor color,
+                    const SkMatrix& viewMatrix,
+                    const SkMatrix& localMatrix,
+                    const SkRect& rect);
+
+GrDrawBatch* Create(GrColor color,
+                    const SkMatrix& viewMatrix,
+                    const SkMatrix& localMatrix,
+                    const SkRect& rect,
+                    const SkRect& devRect);
+
+GrDrawBatch* CreateWithLocalRect(GrColor color,
+                                 const SkMatrix& viewMatrix,
+                                 const SkRect& rect,
+                                 const SkRect& localRect);
+
+void Append(GrBatch*,
+            GrColor,
+            const SkMatrix& viewMatrix,
+            const SkRect& rect,
+            const SkRect& devRect);
+
+void Append(GrBatch*,
+            GrColor,
+            const SkMatrix& viewMatrix,
+            const SkMatrix& localMatrix,
+            const SkRect& rect,
+            const SkRect& devRect);
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrAAHairLinePathRenderer.cpp b/gfx/skia/skia/src/gpu/batches/GrAAHairLinePathRenderer.cpp
new file mode 100644
index 000000000000..d6ad9d32c9c7
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrAAHairLinePathRenderer.cpp
@@ -0,0 +1,1002 @@
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrAAHairLinePathRenderer.h"
+
+#include "GrBatchFlushState.h"
+#include "GrBatchTest.h"
+#include "GrCaps.h"
+#include "GrContext.h"
+#include "GrDefaultGeoProcFactory.h"
+#include "GrIndexBuffer.h"
+#include "GrPathUtils.h"
+#include "GrPipelineBuilder.h"
+#include "GrProcessor.h"
+#include "GrResourceProvider.h"
+#include "GrVertexBuffer.h"
+#include "SkGeometry.h"
+#include "SkStroke.h"
+#include "SkTemplates.h"
+
+#include "batches/GrVertexBatch.h"
+
+#include "effects/GrBezierEffect.h"
+
+#define PREALLOC_PTARRAY(N) SkSTArray<(N),SkPoint, true>
+
+// quadratics are rendered as 5-sided polys in order to bound the
+// AA stroke around the center-curve. See comments in push_quad_index_buffer and
+// bloat_quad. Quadratics and conics share an index buffer
+
+// lines are rendered as:
+//      *______________*
+//      |\ -_______   /|
+//      | \        \ / |
+//      |  *--------*  |
+//      | /  ______/ \ |
+//      */_-__________\*
+// For: 6 vertices and 18 indices (for 6 triangles)
+
+// Each quadratic is rendered as a five sided polygon. This poly bounds
+// the quadratic's bounding triangle but has been expanded so that the
+// 1-pixel wide area around the curve is inside the poly.
+// If a,b,c are the original control points then the poly a0,b0,c0,c1,a1
+// that is rendered would look like this:
+//              b0
+//              b
+//
+//     a0              c0
+//      a            c
+//       a1       c1
+// Each is drawn as three triangles ((a0,a1,b0), (b0,c1,c0), (a1,c1,b0))
+// specified by these 9 indices:
+static const uint16_t kQuadIdxBufPattern[] = {
+    0, 1, 2,
+    2, 4, 3,
+    1, 4, 2
+};
+
+static const int kIdxsPerQuad = SK_ARRAY_COUNT(kQuadIdxBufPattern);
+static const int kQuadNumVertices = 5;
+static const int kQuadsNumInIdxBuffer = 256;
+GR_DECLARE_STATIC_UNIQUE_KEY(gQuadsIndexBufferKey);
+
+static const GrIndexBuffer* ref_quads_index_buffer(GrResourceProvider* resourceProvider) {
+    GR_DEFINE_STATIC_UNIQUE_KEY(gQuadsIndexBufferKey);
+    return resourceProvider->findOrCreateInstancedIndexBuffer(
+        kQuadIdxBufPattern, kIdxsPerQuad, kQuadsNumInIdxBuffer, kQuadNumVertices,
+        gQuadsIndexBufferKey);
+}
+
+
+// Each line segment is rendered as two quads and two triangles.
+// p0 and p1 have alpha = 1 while all other points have alpha = 0.
+// The four external points are offset 1 pixel perpendicular to the
+// line and half a pixel parallel to the line.
+//
+// p4                  p5
+//      p0         p1
+// p2                  p3
+//
+// Each is drawn as six triangles specified by these 18 indices:
+
+static const uint16_t kLineSegIdxBufPattern[] = {
+    0, 1, 3,
+    0, 3, 2,
+    0, 4, 5,
+    0, 5, 1,
+    0, 2, 4,
+    1, 5, 3
+};
+
+static const int kIdxsPerLineSeg = SK_ARRAY_COUNT(kLineSegIdxBufPattern);
+static const int kLineSegNumVertices = 6;
+static const int kLineSegsNumInIdxBuffer = 256;
+
+GR_DECLARE_STATIC_UNIQUE_KEY(gLinesIndexBufferKey);
+
+static const GrIndexBuffer* ref_lines_index_buffer(GrResourceProvider* resourceProvider) {
+    GR_DEFINE_STATIC_UNIQUE_KEY(gLinesIndexBufferKey);
+    return resourceProvider->findOrCreateInstancedIndexBuffer(
+        kLineSegIdxBufPattern, kIdxsPerLineSeg,  kLineSegsNumInIdxBuffer, kLineSegNumVertices,
+        gLinesIndexBufferKey);
+}
+
+// Takes 178th time of logf on Z600 / VC2010
+static int get_float_exp(float x) {
+    GR_STATIC_ASSERT(sizeof(int) == sizeof(float));
+#ifdef SK_DEBUG
+    static bool tested;
+    if (!tested) {
+        tested = true;
+        SkASSERT(get_float_exp(0.25f) == -2);
+        SkASSERT(get_float_exp(0.3f) == -2);
+        SkASSERT(get_float_exp(0.5f) == -1);
+        SkASSERT(get_float_exp(1.f) == 0);
+        SkASSERT(get_float_exp(2.f) == 1);
+        SkASSERT(get_float_exp(2.5f) == 1);
+        SkASSERT(get_float_exp(8.f) == 3);
+        SkASSERT(get_float_exp(100.f) == 6);
+        SkASSERT(get_float_exp(1000.f) == 9);
+        SkASSERT(get_float_exp(1024.f) == 10);
+        SkASSERT(get_float_exp(3000000.f) == 21);
+    }
+#endif
+    const int* iptr = (const int*)&x;
+    return (((*iptr) & 0x7f800000) >> 23) - 127;
+}
+
+// Uses the max curvature function for quads to estimate
+// where to chop the conic. If the max curvature is not
+// found along the curve segment it will return 1 and
+// dst[0] is the original conic. If it returns 2 the dst[0]
+// and dst[1] are the two new conics.
+static int split_conic(const SkPoint src[3], SkConic dst[2], const SkScalar weight) {
+    SkScalar t = SkFindQuadMaxCurvature(src);
+    if (t == 0) {
+        if (dst) {
+            dst[0].set(src, weight);
+        }
+        return 1;
+    } else {
+        if (dst) {
+            SkConic conic;
+            conic.set(src, weight);
+            conic.chopAt(t, dst);
+        }
+        return 2;
+    }
+}
+
+// Calls split_conic on the entire conic and then once more on each subsection.
+// Most cases will result in either 1 conic (chop point is not within t range)
+// or 3 points (split once and then one subsection is split again).
+static int chop_conic(const SkPoint src[3], SkConic dst[4], const SkScalar weight) {
+    SkConic dstTemp[2];
+    int conicCnt = split_conic(src, dstTemp, weight);
+    if (2 == conicCnt) {
+        int conicCnt2 = split_conic(dstTemp[0].fPts, dst, dstTemp[0].fW);
+        conicCnt = conicCnt2 + split_conic(dstTemp[1].fPts, &dst[conicCnt2], dstTemp[1].fW);
+    } else {
+        dst[0] = dstTemp[0];
+    }
+    return conicCnt;
+}
+
+// returns 0 if quad/conic is degen or close to it
+// in this case approx the path with lines
+// otherwise returns 1
+static int is_degen_quad_or_conic(const SkPoint p[3], SkScalar* dsqd) {
+    static const SkScalar gDegenerateToLineTol = GrPathUtils::kDefaultTolerance;
+    static const SkScalar gDegenerateToLineTolSqd =
+        SkScalarMul(gDegenerateToLineTol, gDegenerateToLineTol);
+
+    if (p[0].distanceToSqd(p[1]) < gDegenerateToLineTolSqd ||
+        p[1].distanceToSqd(p[2]) < gDegenerateToLineTolSqd) {
+        return 1;
+    }
+
+    *dsqd = p[1].distanceToLineBetweenSqd(p[0], p[2]);
+    if (*dsqd < gDegenerateToLineTolSqd) {
+        return 1;
+    }
+
+    if (p[2].distanceToLineBetweenSqd(p[1], p[0]) < gDegenerateToLineTolSqd) {
+        return 1;
+    }
+    return 0;
+}
+
+static int is_degen_quad_or_conic(const SkPoint p[3]) {
+    SkScalar dsqd;
+    return is_degen_quad_or_conic(p, &dsqd);
+}
+
+// we subdivide the quads to avoid huge overfill
+// if it returns -1 then should be drawn as lines
+static int num_quad_subdivs(const SkPoint p[3]) {
+    SkScalar dsqd;
+    if (is_degen_quad_or_conic(p, &dsqd)) {
+        return -1;
+    }
+
+    // tolerance of triangle height in pixels
+    // tuned on windows  Quadro FX 380 / Z600
+    // trade off of fill vs cpu time on verts
+    // maybe different when do this using gpu (geo or tess shaders)
+    static const SkScalar gSubdivTol = 175 * SK_Scalar1;
+
+    if (dsqd <= SkScalarMul(gSubdivTol, gSubdivTol)) {
+        return 0;
+    } else {
+        static const int kMaxSub = 4;
+        // subdividing the quad reduces d by 4. so we want x = log4(d/tol)
+        // = log4(d*d/tol*tol)/2
+        // = log2(d*d/tol*tol)
+
+        // +1 since we're ignoring the mantissa contribution.
+        int log = get_float_exp(dsqd/(gSubdivTol*gSubdivTol)) + 1;
+        log = SkTMin(SkTMax(0, log), kMaxSub);
+        return log;
+    }
+}
+
+/**
+ * Generates the lines and quads to be rendered. Lines are always recorded in
+ * device space. We will do a device space bloat to account for the 1pixel
+ * thickness.
+ * Quads are recorded in device space unless m contains
+ * perspective, then in they are in src space. We do this because we will
+ * subdivide large quads to reduce over-fill. This subdivision has to be
+ * performed before applying the perspective matrix.
+ */
+static int gather_lines_and_quads(const SkPath& path,
+                                  const SkMatrix& m,
+                                  const SkIRect& devClipBounds,
+                                  GrAAHairLinePathRenderer::PtArray* lines,
+                                  GrAAHairLinePathRenderer::PtArray* quads,
+                                  GrAAHairLinePathRenderer::PtArray* conics,
+                                  GrAAHairLinePathRenderer::IntArray* quadSubdivCnts,
+                                  GrAAHairLinePathRenderer::FloatArray* conicWeights) {
+    SkPath::Iter iter(path, false);
+
+    int totalQuadCount = 0;
+    SkRect bounds;
+    SkIRect ibounds;
+
+    bool persp = m.hasPerspective();
+
+    for (;;) {
+        SkPoint pathPts[4];
+        SkPoint devPts[4];
+        SkPath::Verb verb = iter.next(pathPts);
+        switch (verb) {
+            case SkPath::kConic_Verb: {
+                SkConic dst[4];
+                // We chop the conics to create tighter clipping to hide error
+                // that appears near max curvature of very thin conics. Thin
+                // hyperbolas with high weight still show error.
+                int conicCnt = chop_conic(pathPts, dst, iter.conicWeight());
+                for (int i = 0; i < conicCnt; ++i) {
+                    SkPoint* chopPnts = dst[i].fPts;
+                    m.mapPoints(devPts, chopPnts, 3);
+                    bounds.setBounds(devPts, 3);
+                    bounds.outset(SK_Scalar1, SK_Scalar1);
+                    bounds.roundOut(&ibounds);
+                    if (SkIRect::Intersects(devClipBounds, ibounds)) {
+                        if (is_degen_quad_or_conic(devPts)) {
+                            SkPoint* pts = lines->push_back_n(4);
+                            pts[0] = devPts[0];
+                            pts[1] = devPts[1];
+                            pts[2] = devPts[1];
+                            pts[3] = devPts[2];
+                        } else {
+                            // when in perspective keep conics in src space
+                            SkPoint* cPts = persp ? chopPnts : devPts;
+                            SkPoint* pts = conics->push_back_n(3);
+                            pts[0] = cPts[0];
+                            pts[1] = cPts[1];
+                            pts[2] = cPts[2];
+                            conicWeights->push_back() = dst[i].fW;
+                        }
+                    }
+                }
+                break;
+            }
+            case SkPath::kMove_Verb:
+                break;
+            case SkPath::kLine_Verb:
+                m.mapPoints(devPts, pathPts, 2);
+                bounds.setBounds(devPts, 2);
+                bounds.outset(SK_Scalar1, SK_Scalar1);
+                bounds.roundOut(&ibounds);
+                if (SkIRect::Intersects(devClipBounds, ibounds)) {
+                    SkPoint* pts = lines->push_back_n(2);
+                    pts[0] = devPts[0];
+                    pts[1] = devPts[1];
+                }
+                break;
+            case SkPath::kQuad_Verb: {
+                SkPoint choppedPts[5];
+                // Chopping the quad helps when the quad is either degenerate or nearly degenerate.
+                // When it is degenerate it allows the approximation with lines to work since the
+                // chop point (if there is one) will be at the parabola's vertex. In the nearly
+                // degenerate the QuadUVMatrix computed for the points is almost singular which
+                // can cause rendering artifacts.
+                int n = SkChopQuadAtMaxCurvature(pathPts, choppedPts);
+                for (int i = 0; i < n; ++i) {
+                    SkPoint* quadPts = choppedPts + i * 2;
+                    m.mapPoints(devPts, quadPts, 3);
+                    bounds.setBounds(devPts, 3);
+                    bounds.outset(SK_Scalar1, SK_Scalar1);
+                    bounds.roundOut(&ibounds);
+
+                    if (SkIRect::Intersects(devClipBounds, ibounds)) {
+                        int subdiv = num_quad_subdivs(devPts);
+                        SkASSERT(subdiv >= -1);
+                        if (-1 == subdiv) {
+                            SkPoint* pts = lines->push_back_n(4);
+                            pts[0] = devPts[0];
+                            pts[1] = devPts[1];
+                            pts[2] = devPts[1];
+                            pts[3] = devPts[2];
+                        } else {
+                            // when in perspective keep quads in src space
+                            SkPoint* qPts = persp ? quadPts : devPts;
+                            SkPoint* pts = quads->push_back_n(3);
+                            pts[0] = qPts[0];
+                            pts[1] = qPts[1];
+                            pts[2] = qPts[2];
+                            quadSubdivCnts->push_back() = subdiv;
+                            totalQuadCount += 1 << subdiv;
+                        }
+                    }
+                }
+                break;
+            }
+            case SkPath::kCubic_Verb:
+                m.mapPoints(devPts, pathPts, 4);
+                bounds.setBounds(devPts, 4);
+                bounds.outset(SK_Scalar1, SK_Scalar1);
+                bounds.roundOut(&ibounds);
+                if (SkIRect::Intersects(devClipBounds, ibounds)) {
+                    PREALLOC_PTARRAY(32) q;
+                    // we don't need a direction if we aren't constraining the subdivision
+                    const SkPathPriv::FirstDirection kDummyDir = SkPathPriv::kCCW_FirstDirection;
+                    // We convert cubics to quadratics (for now).
+                    // In perspective have to do conversion in src space.
+                    if (persp) {
+                        SkScalar tolScale =
+                            GrPathUtils::scaleToleranceToSrc(SK_Scalar1, m,
+                                                             path.getBounds());
+                        GrPathUtils::convertCubicToQuads(pathPts, tolScale, false, kDummyDir, &q);
+                    } else {
+                        GrPathUtils::convertCubicToQuads(devPts, SK_Scalar1, false, kDummyDir, &q);
+                    }
+                    for (int i = 0; i < q.count(); i += 3) {
+                        SkPoint* qInDevSpace;
+                        // bounds has to be calculated in device space, but q is
+                        // in src space when there is perspective.
+                        if (persp) {
+                            m.mapPoints(devPts, &q[i], 3);
+                            bounds.setBounds(devPts, 3);
+                            qInDevSpace = devPts;
+                        } else {
+                            bounds.setBounds(&q[i], 3);
+                            qInDevSpace = &q[i];
+                        }
+                        bounds.outset(SK_Scalar1, SK_Scalar1);
+                        bounds.roundOut(&ibounds);
+                        if (SkIRect::Intersects(devClipBounds, ibounds)) {
+                            int subdiv = num_quad_subdivs(qInDevSpace);
+                            SkASSERT(subdiv >= -1);
+                            if (-1 == subdiv) {
+                                SkPoint* pts = lines->push_back_n(4);
+                                // lines should always be in device coords
+                                pts[0] = qInDevSpace[0];
+                                pts[1] = qInDevSpace[1];
+                                pts[2] = qInDevSpace[1];
+                                pts[3] = qInDevSpace[2];
+                            } else {
+                                SkPoint* pts = quads->push_back_n(3);
+                                // q is already in src space when there is no
+                                // perspective and dev coords otherwise.
+                                pts[0] = q[0 + i];
+                                pts[1] = q[1 + i];
+                                pts[2] = q[2 + i];
+                                quadSubdivCnts->push_back() = subdiv;
+                                totalQuadCount += 1 << subdiv;
+                            }
+                        }
+                    }
+                }
+                break;
+            case SkPath::kClose_Verb:
+                break;
+            case SkPath::kDone_Verb:
+                return totalQuadCount;
+        }
+    }
+}
+
+struct LineVertex {
+    SkPoint fPos;
+    float fCoverage;
+};
+
+struct BezierVertex {
+    SkPoint fPos;
+    union {
+        struct {
+            SkScalar fK;
+            SkScalar fL;
+            SkScalar fM;
+        } fConic;
+        SkVector   fQuadCoord;
+        struct {
+            SkScalar fBogus[4];
+        };
+    };
+};
+
+GR_STATIC_ASSERT(sizeof(BezierVertex) == 3 * sizeof(SkPoint));
+
+static void intersect_lines(const SkPoint& ptA, const SkVector& normA,
+                            const SkPoint& ptB, const SkVector& normB,
+                            SkPoint* result) {
+
+    SkScalar lineAW = -normA.dot(ptA);
+    SkScalar lineBW = -normB.dot(ptB);
+
+    SkScalar wInv = SkScalarMul(normA.fX, normB.fY) -
+        SkScalarMul(normA.fY, normB.fX);
+    wInv = SkScalarInvert(wInv);
+
+    result->fX = SkScalarMul(normA.fY, lineBW) - SkScalarMul(lineAW, normB.fY);
+    result->fX = SkScalarMul(result->fX, wInv);
+
+    result->fY = SkScalarMul(lineAW, normB.fX) - SkScalarMul(normA.fX, lineBW);
+    result->fY = SkScalarMul(result->fY, wInv);
+}
+
+static void set_uv_quad(const SkPoint qpts[3], BezierVertex verts[kQuadNumVertices]) {
+    // this should be in the src space, not dev coords, when we have perspective
+    GrPathUtils::QuadUVMatrix DevToUV(qpts);
+    DevToUV.apply<kQuadNumVertices, sizeof(BezierVertex), sizeof(SkPoint)>(verts);
+}
+
+static void bloat_quad(const SkPoint qpts[3], const SkMatrix* toDevice,
+                       const SkMatrix* toSrc, BezierVertex verts[kQuadNumVertices]) {
+    SkASSERT(!toDevice == !toSrc);
+    // original quad is specified by tri a,b,c
+    SkPoint a = qpts[0];
+    SkPoint b = qpts[1];
+    SkPoint c = qpts[2];
+
+    if (toDevice) {
+        toDevice->mapPoints(&a, 1);
+        toDevice->mapPoints(&b, 1);
+        toDevice->mapPoints(&c, 1);
+    }
+    // make a new poly where we replace a and c by a 1-pixel wide edges orthog
+    // to edges ab and bc:
+    //
+    //   before       |        after
+    //                |              b0
+    //         b      |
+    //                |
+    //                |     a0            c0
+    // a         c    |        a1       c1
+    //
+    // edges a0->b0 and b0->c0 are parallel to original edges a->b and b->c,
+    // respectively.
+    BezierVertex& a0 = verts[0];
+    BezierVertex& a1 = verts[1];
+    BezierVertex& b0 = verts[2];
+    BezierVertex& c0 = verts[3];
+    BezierVertex& c1 = verts[4];
+
+    SkVector ab = b;
+    ab -= a;
+    SkVector ac = c;
+    ac -= a;
+    SkVector cb = b;
+    cb -= c;
+
+    // We should have already handled degenerates
+    SkASSERT(ab.length() > 0 && cb.length() > 0);
+
+    ab.normalize();
+    SkVector abN;
+    abN.setOrthog(ab, SkVector::kLeft_Side);
+    if (abN.dot(ac) > 0) {
+        abN.negate();
+    }
+
+    cb.normalize();
+    SkVector cbN;
+    cbN.setOrthog(cb, SkVector::kLeft_Side);
+    if (cbN.dot(ac) < 0) {
+        cbN.negate();
+    }
+
+    a0.fPos = a;
+    a0.fPos += abN;
+    a1.fPos = a;
+    a1.fPos -= abN;
+
+    c0.fPos = c;
+    c0.fPos += cbN;
+    c1.fPos = c;
+    c1.fPos -= cbN;
+
+    intersect_lines(a0.fPos, abN, c0.fPos, cbN, &b0.fPos);
+
+    if (toSrc) {
+        toSrc->mapPointsWithStride(&verts[0].fPos, sizeof(BezierVertex), kQuadNumVertices);
+    }
+}
+
+// Equations based off of Loop-Blinn Quadratic GPU Rendering
+// Input Parametric:
+// P(t) = (P0*(1-t)^2 + 2*w*P1*t*(1-t) + P2*t^2) / (1-t)^2 + 2*w*t*(1-t) + t^2)
+// Output Implicit:
+// f(x, y, w) = f(P) = K^2 - LM
+// K = dot(k, P), L = dot(l, P), M = dot(m, P)
+// k, l, m are calculated in function GrPathUtils::getConicKLM
+static void set_conic_coeffs(const SkPoint p[3], BezierVertex verts[kQuadNumVertices],
+                             const SkScalar weight) {
+    SkScalar klm[9];
+
+    GrPathUtils::getConicKLM(p, weight, klm);
+
+    for (int i = 0; i < kQuadNumVertices; ++i) {
+        const SkPoint pnt = verts[i].fPos;
+        verts[i].fConic.fK = pnt.fX * klm[0] + pnt.fY * klm[1] + klm[2];
+        verts[i].fConic.fL = pnt.fX * klm[3] + pnt.fY * klm[4] + klm[5];
+        verts[i].fConic.fM = pnt.fX * klm[6] + pnt.fY * klm[7] + klm[8];
+    }
+}
+
+static void add_conics(const SkPoint p[3],
+                       const SkScalar weight,
+                       const SkMatrix* toDevice,
+                       const SkMatrix* toSrc,
+                       BezierVertex** vert) {
+    bloat_quad(p, toDevice, toSrc, *vert);
+    set_conic_coeffs(p, *vert, weight);
+    *vert += kQuadNumVertices;
+}
+
+static void add_quads(const SkPoint p[3],
+                      int subdiv,
+                      const SkMatrix* toDevice,
+                      const SkMatrix* toSrc,
+                      BezierVertex** vert) {
+    SkASSERT(subdiv >= 0);
+    if (subdiv) {
+        SkPoint newP[5];
+        SkChopQuadAtHalf(p, newP);
+        add_quads(newP + 0, subdiv-1, toDevice, toSrc, vert);
+        add_quads(newP + 2, subdiv-1, toDevice, toSrc, vert);
+    } else {
+        bloat_quad(p, toDevice, toSrc, *vert);
+        set_uv_quad(p, *vert);
+        *vert += kQuadNumVertices;
+    }
+}
+
+static void add_line(const SkPoint p[2],
+                     const SkMatrix* toSrc,
+                     uint8_t coverage,
+                     LineVertex** vert) {
+    const SkPoint& a = p[0];
+    const SkPoint& b = p[1];
+
+    SkVector ortho, vec = b;
+    vec -= a;
+
+    if (vec.setLength(SK_ScalarHalf)) {
+        // Create a vector orthogonal to 'vec' and of unit length
+        ortho.fX = 2.0f * vec.fY;
+        ortho.fY = -2.0f * vec.fX;
+
+        float floatCoverage = GrNormalizeByteToFloat(coverage);
+
+        (*vert)[0].fPos = a;
+        (*vert)[0].fCoverage = floatCoverage;
+        (*vert)[1].fPos = b;
+        (*vert)[1].fCoverage = floatCoverage;
+        (*vert)[2].fPos = a - vec + ortho;
+        (*vert)[2].fCoverage = 0;
+        (*vert)[3].fPos = b + vec + ortho;
+        (*vert)[3].fCoverage = 0;
+        (*vert)[4].fPos = a - vec - ortho;
+        (*vert)[4].fCoverage = 0;
+        (*vert)[5].fPos = b + vec - ortho;
+        (*vert)[5].fCoverage = 0;
+
+        if (toSrc) {
+            toSrc->mapPointsWithStride(&(*vert)->fPos,
+                                       sizeof(LineVertex),
+                                       kLineSegNumVertices);
+        }
+    } else {
+        // just make it degenerate and likely offscreen
+        for (int i = 0; i < kLineSegNumVertices; ++i) {
+            (*vert)[i].fPos.set(SK_ScalarMax, SK_ScalarMax);
+        }
+    }
+
+    *vert += kLineSegNumVertices;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+bool GrAAHairLinePathRenderer::onCanDrawPath(const CanDrawPathArgs& args) const {
+    if (!args.fAntiAlias) {
+        return false;
+    }
+
+    if (!IsStrokeHairlineOrEquivalent(*args.fStroke, *args.fViewMatrix, nullptr)) {
+        return false;
+    }
+
+    if (SkPath::kLine_SegmentMask == args.fPath->getSegmentMasks() ||
+        args.fShaderCaps->shaderDerivativeSupport()) {
+        return true;
+    }
+    return false;
+}
+
+template <class VertexType>
+bool check_bounds(const SkMatrix& viewMatrix, const SkRect& devBounds, void* vertices, int vCount)
+{
+    SkRect tolDevBounds = devBounds;
+    // The bounds ought to be tight, but in perspective the below code runs the verts
+    // through the view matrix to get back to dev coords, which can introduce imprecision.
+    if (viewMatrix.hasPerspective()) {
+        tolDevBounds.outset(SK_Scalar1 / 1000, SK_Scalar1 / 1000);
+    } else {
+        // Non-persp matrices cause this path renderer to draw in device space.
+        SkASSERT(viewMatrix.isIdentity());
+    }
+    SkRect actualBounds;
+
+    VertexType* verts = reinterpret_cast<VertexType*>(vertices);
+    bool first = true;
+    for (int i = 0; i < vCount; ++i) {
+        SkPoint pos = verts[i].fPos;
+        // This is a hack to workaround the fact that we move some degenerate segments offscreen.
+        if (SK_ScalarMax == pos.fX) {
+            continue;
+        }
+        viewMatrix.mapPoints(&pos, 1);
+        if (first) {
+            actualBounds.set(pos.fX, pos.fY, pos.fX, pos.fY);
+            first = false;
+        } else {
+            actualBounds.growToInclude(pos.fX, pos.fY);
+        }
+    }
+    if (!first) {
+        return tolDevBounds.contains(actualBounds);
+    }
+
+    return true;
+}
+
+class AAHairlineBatch : public GrVertexBatch {
+public:
+    DEFINE_BATCH_CLASS_ID
+
+    struct Geometry {
+        GrColor fColor;
+        uint8_t fCoverage;
+        SkMatrix fViewMatrix;
+        SkPath fPath;
+        SkIRect fDevClipBounds;
+    };
+
+    static GrDrawBatch* Create(const Geometry& geometry) { return new AAHairlineBatch(geometry); }
+
+    const char* name() const override { return "AAHairlineBatch"; }
+
+    void computePipelineOptimizations(GrInitInvariantOutput* color, 
+                                      GrInitInvariantOutput* coverage,
+                                      GrBatchToXPOverrides* overrides) const override {
+        // When this is called on a batch, there is only one geometry bundle
+        color->setKnownFourComponents(fGeoData[0].fColor);
+        coverage->setUnknownSingleComponent();
+        overrides->fUsePLSDstRead = true;
+    }
+
+private:
+    void initBatchTracker(const GrXPOverridesForBatch& overrides) override {
+        // Handle any color overrides
+        if (!overrides.readsColor()) {
+            fGeoData[0].fColor = GrColor_ILLEGAL;
+        }
+        overrides.getOverrideColorIfSet(&fGeoData[0].fColor);
+
+        // setup batch properties
+        fBatch.fColorIgnored = !overrides.readsColor();
+        fBatch.fColor = fGeoData[0].fColor;
+        fBatch.fUsesLocalCoords = overrides.readsLocalCoords();
+        fBatch.fCoverageIgnored = !overrides.readsCoverage();
+        fBatch.fCoverage = fGeoData[0].fCoverage;
+    }
+
+    SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
+
+    void onPrepareDraws(Target*) const override;
+
+    typedef SkTArray<SkPoint, true> PtArray;
+    typedef SkTArray<int, true> IntArray;
+    typedef SkTArray<float, true> FloatArray;
+
+    AAHairlineBatch(const Geometry& geometry) : INHERITED(ClassID()) {
+        fGeoData.push_back(geometry);
+
+        // compute bounds
+        fBounds = geometry.fPath.getBounds();
+        geometry.fViewMatrix.mapRect(&fBounds);
+
+        // This is b.c. hairlines are notionally infinitely thin so without expansion
+        // two overlapping lines could be reordered even though they hit the same pixels.
+        fBounds.outset(0.5f, 0.5f);
+    }
+
+    bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override {
+        AAHairlineBatch* that = t->cast<AAHairlineBatch>();
+
+        if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *that->pipeline(),
+                                    that->bounds(), caps)) {
+            return false;
+        }
+
+        if (this->viewMatrix().hasPerspective() != that->viewMatrix().hasPerspective()) {
+            return false;
+        }
+
+        // We go to identity if we don't have perspective
+        if (this->viewMatrix().hasPerspective() &&
+            !this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
+            return false;
+        }
+
+        // TODO we can actually batch hairlines if they are the same color in a kind of bulk method
+        // but we haven't implemented this yet
+        // TODO investigate going to vertex color and coverage?
+        if (this->coverage() != that->coverage()) {
+            return false;
+        }
+
+        if (this->color() != that->color()) {
+            return false;
+        }
+
+        SkASSERT(this->usesLocalCoords() == that->usesLocalCoords());
+        if (this->usesLocalCoords() && !this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
+            return false;
+        }
+
+        fGeoData.push_back_n(that->geoData()->count(), that->geoData()->begin());
+        this->joinBounds(that->bounds());
+        return true;
+    }
+
+    GrColor color() const { return fBatch.fColor; }
+    uint8_t coverage() const { return fBatch.fCoverage; }
+    bool usesLocalCoords() const { return fBatch.fUsesLocalCoords; }
+    const SkMatrix& viewMatrix() const { return fGeoData[0].fViewMatrix; }
+    bool coverageIgnored() const { return fBatch.fCoverageIgnored; }
+
+    struct BatchTracker {
+        GrColor fColor;
+        uint8_t fCoverage;
+        SkRect fDevBounds;
+        bool fUsesLocalCoords;
+        bool fColorIgnored;
+        bool fCoverageIgnored;
+    };
+
+    BatchTracker fBatch;
+    SkSTArray<1, Geometry, true> fGeoData;
+
+    typedef GrVertexBatch INHERITED;
+};
+
+void AAHairlineBatch::onPrepareDraws(Target* target) const {
+    // Setup the viewmatrix and localmatrix for the GrGeometryProcessor.
+    SkMatrix invert;
+    if (!this->viewMatrix().invert(&invert)) {
+        return;
+    }
+
+    // we will transform to identity space if the viewmatrix does not have perspective
+    bool hasPerspective = this->viewMatrix().hasPerspective();
+    const SkMatrix* geometryProcessorViewM = &SkMatrix::I();
+    const SkMatrix* geometryProcessorLocalM = &invert;
+    const SkMatrix* toDevice = nullptr;
+    const SkMatrix* toSrc = nullptr;
+    if (hasPerspective) {
+        geometryProcessorViewM = &this->viewMatrix();
+        geometryProcessorLocalM = &SkMatrix::I();
+        toDevice = &this->viewMatrix();
+        toSrc = &invert;
+    }
+
+    SkAutoTUnref<const GrGeometryProcessor> lineGP;
+    {
+        using namespace GrDefaultGeoProcFactory;
+
+        Color color(this->color());
+        Coverage coverage(Coverage::kAttribute_Type);
+        LocalCoords localCoords(this->usesLocalCoords() ? LocalCoords::kUsePosition_Type :
+                                                          LocalCoords::kUnused_Type);
+        localCoords.fMatrix = geometryProcessorLocalM;
+        lineGP.reset(GrDefaultGeoProcFactory::Create(color, coverage, localCoords,
+                                                     *geometryProcessorViewM));
+    }
+
+    SkAutoTUnref<const GrGeometryProcessor> quadGP(
+            GrQuadEffect::Create(this->color(),
+                                 *geometryProcessorViewM,
+                                 kHairlineAA_GrProcessorEdgeType,
+                                 target->caps(),
+                                 *geometryProcessorLocalM,
+                                 this->usesLocalCoords(),
+                                 this->coverage()));
+
+    SkAutoTUnref<const GrGeometryProcessor> conicGP(
+            GrConicEffect::Create(this->color(),
+                                  *geometryProcessorViewM,
+                                  kHairlineAA_GrProcessorEdgeType,
+                                  target->caps(),
+                                  *geometryProcessorLocalM,
+                                  this->usesLocalCoords(),
+                                  this->coverage()));
+
+    // This is hand inlined for maximum performance.
+    PREALLOC_PTARRAY(128) lines;
+    PREALLOC_PTARRAY(128) quads;
+    PREALLOC_PTARRAY(128) conics;
+    IntArray qSubdivs;
+    FloatArray cWeights;
+    int quadCount = 0;
+
+    int instanceCount = fGeoData.count();
+    for (int i = 0; i < instanceCount; i++) {
+        const Geometry& args = fGeoData[i];
+        quadCount += gather_lines_and_quads(args.fPath, args.fViewMatrix, args.fDevClipBounds,
+                                            &lines, &quads, &conics, &qSubdivs, &cWeights);
+    }
+
+    int lineCount = lines.count() / 2;
+    int conicCount = conics.count() / 3;
+
+    // do lines first
+    if (lineCount) {
+        SkAutoTUnref<const GrIndexBuffer> linesIndexBuffer(
+            ref_lines_index_buffer(target->resourceProvider()));
+        target->initDraw(lineGP, this->pipeline());
+
+        const GrVertexBuffer* vertexBuffer;
+        int firstVertex;
+
+        size_t vertexStride = lineGP->getVertexStride();
+        int vertexCount = kLineSegNumVertices * lineCount;
+        LineVertex* verts = reinterpret_cast<LineVertex*>(
+            target->makeVertexSpace(vertexStride, vertexCount, &vertexBuffer, &firstVertex));
+
+        if (!verts|| !linesIndexBuffer) {
+            SkDebugf("Could not allocate vertices\n");
+            return;
+        }
+
+        SkASSERT(lineGP->getVertexStride() == sizeof(LineVertex));
+
+        for (int i = 0; i < lineCount; ++i) {
+            add_line(&lines[2*i], toSrc, this->coverage(), &verts);
+        }
+
+        {
+            GrVertices vertices;
+            vertices.initInstanced(kTriangles_GrPrimitiveType, vertexBuffer, linesIndexBuffer,
+                                   firstVertex, kLineSegNumVertices, kIdxsPerLineSeg, lineCount,
+                                   kLineSegsNumInIdxBuffer);
+            target->draw(vertices);
+        }
+    }
+
+    if (quadCount || conicCount) {
+        const GrVertexBuffer* vertexBuffer;
+        int firstVertex;
+
+        SkAutoTUnref<const GrIndexBuffer> quadsIndexBuffer(
+            ref_quads_index_buffer(target->resourceProvider()));
+
+        size_t vertexStride = sizeof(BezierVertex);
+        int vertexCount = kQuadNumVertices * quadCount + kQuadNumVertices * conicCount;
+        void *vertices = target->makeVertexSpace(vertexStride, vertexCount,
+                                                 &vertexBuffer, &firstVertex);
+
+        if (!vertices || !quadsIndexBuffer) {
+            SkDebugf("Could not allocate vertices\n");
+            return;
+        }
+
+        // Setup vertices
+        BezierVertex* bezVerts = reinterpret_cast<BezierVertex*>(vertices);
+
+        int unsubdivQuadCnt = quads.count() / 3;
+        for (int i = 0; i < unsubdivQuadCnt; ++i) {
+            SkASSERT(qSubdivs[i] >= 0);
+            add_quads(&quads[3*i], qSubdivs[i], toDevice, toSrc, &bezVerts);
+        }
+
+        // Start Conics
+        for (int i = 0; i < conicCount; ++i) {
+            add_conics(&conics[3*i], cWeights[i], toDevice, toSrc, &bezVerts);
+        }
+
+        if (quadCount > 0) {
+            target->initDraw(quadGP, this->pipeline());
+
+            {
+                GrVertices tempVerts;
+                tempVerts.initInstanced(kTriangles_GrPrimitiveType, vertexBuffer, quadsIndexBuffer,
+                                        firstVertex, kQuadNumVertices, kIdxsPerQuad, quadCount,
+                                        kQuadsNumInIdxBuffer);
+                target->draw(tempVerts);
+                firstVertex += quadCount * kQuadNumVertices;
+           }
+        }
+
+        if (conicCount > 0) {
+            target->initDraw(conicGP, this->pipeline());
+
+            {
+                GrVertices tempVerts;
+                tempVerts.initInstanced(kTriangles_GrPrimitiveType, vertexBuffer, quadsIndexBuffer,
+                                        firstVertex, kQuadNumVertices, kIdxsPerQuad, conicCount,
+                                        kQuadsNumInIdxBuffer);
+                target->draw(tempVerts);
+            }
+        }
+    }
+}
+
+static GrDrawBatch* create_hairline_batch(GrColor color,
+                                          const SkMatrix& viewMatrix,
+                                          const SkPath& path,
+                                          const GrStrokeInfo& stroke,
+                                          const SkIRect& devClipBounds) {
+    SkScalar hairlineCoverage;
+    uint8_t newCoverage = 0xff;
+    if (GrPathRenderer::IsStrokeHairlineOrEquivalent(stroke, viewMatrix, &hairlineCoverage)) {
+        newCoverage = SkScalarRoundToInt(hairlineCoverage * 0xff);
+    }
+
+    AAHairlineBatch::Geometry geometry;
+    geometry.fColor = color;
+    geometry.fCoverage = newCoverage;
+    geometry.fViewMatrix = viewMatrix;
+    geometry.fPath = path;
+    geometry.fDevClipBounds = devClipBounds;
+
+    return AAHairlineBatch::Create(geometry);
+}
+
+bool GrAAHairLinePathRenderer::onDrawPath(const DrawPathArgs& args) {
+    SkIRect devClipBounds;
+    GrRenderTarget* rt = args.fPipelineBuilder->getRenderTarget();
+    args.fPipelineBuilder->clip().getConservativeBounds(rt->width(), rt->height(), &devClipBounds);
+
+    SkAutoTUnref<GrDrawBatch> batch(create_hairline_batch(args.fColor, *args.fViewMatrix, *args.fPath,
+                                                          *args.fStroke, devClipBounds));
+    args.fTarget->drawBatch(*args.fPipelineBuilder, batch);
+
+    return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef GR_TEST_UTILS
+
+DRAW_BATCH_TEST_DEFINE(AAHairlineBatch) {
+    GrColor color = GrRandomColor(random);
+    SkMatrix viewMatrix = GrTest::TestMatrix(random);
+    GrStrokeInfo stroke(SkStrokeRec::kHairline_InitStyle);
+    SkPath path = GrTest::TestPath(random);
+    SkIRect devClipBounds;
+    devClipBounds.setEmpty();
+    return create_hairline_batch(color, viewMatrix, path, stroke, devClipBounds);
+}
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrAAHairLinePathRenderer.h b/gfx/skia/skia/src/gpu/batches/GrAAHairLinePathRenderer.h
new file mode 100644
index 000000000000..db2d16fd6e31
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrAAHairLinePathRenderer.h
@@ -0,0 +1,31 @@
+
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrAAHairLinePathRenderer_DEFINED
+#define GrAAHairLinePathRenderer_DEFINED
+
+#include "GrPathRenderer.h"
+
+class GrAAHairLinePathRenderer : public GrPathRenderer {
+public:
+    GrAAHairLinePathRenderer() {}
+
+    typedef SkTArray<SkPoint, true> PtArray;
+    typedef SkTArray<int, true> IntArray;
+    typedef SkTArray<float, true> FloatArray;
+
+private:
+    bool onCanDrawPath(const CanDrawPathArgs&) const override;
+
+    bool onDrawPath(const DrawPathArgs&) override;
+
+    typedef GrPathRenderer INHERITED;
+};
+
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrAALinearizingConvexPathRenderer.cpp b/gfx/skia/skia/src/gpu/batches/GrAALinearizingConvexPathRenderer.cpp
new file mode 100644
index 000000000000..4b03c5a3f62d
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrAALinearizingConvexPathRenderer.cpp
@@ -0,0 +1,357 @@
+
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrAALinearizingConvexPathRenderer.h"
+
+#include "GrAAConvexTessellator.h"
+#include "GrBatchFlushState.h"
+#include "GrBatchTest.h"
+#include "GrContext.h"
+#include "GrDefaultGeoProcFactory.h"
+#include "GrGeometryProcessor.h"
+#include "GrInvariantOutput.h"
+#include "GrPathUtils.h"
+#include "GrProcessor.h"
+#include "GrPipelineBuilder.h"
+#include "GrStrokeInfo.h"
+#include "SkGeometry.h"
+#include "SkString.h"
+#include "SkTraceEvent.h"
+#include "SkPathPriv.h"
+#include "batches/GrVertexBatch.h"
+#include "glsl/GrGLSLGeometryProcessor.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+
+static const int DEFAULT_BUFFER_SIZE = 100;
+
+// The thicker the stroke, the harder it is to produce high-quality results using tessellation. For
+// the time being, we simply drop back to software rendering above this stroke width.
+static const SkScalar kMaxStrokeWidth = 20.0;
+
+GrAALinearizingConvexPathRenderer::GrAALinearizingConvexPathRenderer() {
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+bool GrAALinearizingConvexPathRenderer::onCanDrawPath(const CanDrawPathArgs& args) const {
+    if (!args.fAntiAlias) {
+        return false;
+    }
+    if (args.fPath->isInverseFillType()) {
+        return false;
+    }
+    if (!args.fPath->isConvex()) {
+        return false;
+    }
+    if (args.fStroke->getStyle() == SkStrokeRec::kStroke_Style) {
+        if (!args.fViewMatrix->isSimilarity()) {
+            return false;
+        }
+        SkScalar strokeWidth = args.fViewMatrix->getMaxScale() * args.fStroke->getWidth();
+        return strokeWidth >= 1.0f && strokeWidth <= kMaxStrokeWidth && !args.fStroke->isDashed() &&
+                SkPathPriv::LastVerbIsClose(*args.fPath) &&
+                args.fStroke->getJoin() != SkPaint::Join::kRound_Join;
+    }
+    return args.fStroke->getStyle() == SkStrokeRec::kFill_Style;
+}
+
+// extract the result vertices and indices from the GrAAConvexTessellator
+static void extract_verts(const GrAAConvexTessellator& tess,
+                          void* vertices,
+                          size_t vertexStride,
+                          GrColor color,
+                          uint16_t firstIndex,
+                          uint16_t* idxs,
+                          bool tweakAlphaForCoverage) {
+    intptr_t verts = reinterpret_cast<intptr_t>(vertices);
+
+    for (int i = 0; i < tess.numPts(); ++i) {
+        *((SkPoint*)((intptr_t)verts + i * vertexStride)) = tess.point(i);
+    }
+
+    // Make 'verts' point to the colors
+    verts += sizeof(SkPoint);
+    for (int i = 0; i < tess.numPts(); ++i) {
+        if (tweakAlphaForCoverage) {
+            SkASSERT(SkScalarRoundToInt(255.0f * tess.coverage(i)) <= 255);
+            unsigned scale = SkScalarRoundToInt(255.0f * tess.coverage(i));
+            GrColor scaledColor = (0xff == scale) ? color : SkAlphaMulQ(color, scale);
+            *reinterpret_cast<GrColor*>(verts + i * vertexStride) = scaledColor;
+        } else {
+            *reinterpret_cast<GrColor*>(verts + i * vertexStride) = color;
+            *reinterpret_cast<float*>(verts + i * vertexStride + sizeof(GrColor)) =
+                    tess.coverage(i);
+        }
+    }
+
+    for (int i = 0; i < tess.numIndices(); ++i) {
+        idxs[i] = tess.index(i) + firstIndex;
+    }
+}
+
+static const GrGeometryProcessor* create_fill_gp(bool tweakAlphaForCoverage,
+                                                 const SkMatrix& viewMatrix,
+                                                 bool usesLocalCoords,
+                                                 bool coverageIgnored) {
+    using namespace GrDefaultGeoProcFactory;
+
+    Color color(Color::kAttribute_Type);
+    Coverage::Type coverageType;
+    // TODO remove coverage if coverage is ignored
+    /*if (coverageIgnored) {
+        coverageType = Coverage::kNone_Type;
+    } else*/ if (tweakAlphaForCoverage) {
+        coverageType = Coverage::kSolid_Type;
+    } else {
+        coverageType = Coverage::kAttribute_Type;
+    }
+    Coverage coverage(coverageType);
+    LocalCoords localCoords(usesLocalCoords ? LocalCoords::kUsePosition_Type :
+                                              LocalCoords::kUnused_Type);
+    return CreateForDeviceSpace(color, coverage, localCoords, viewMatrix);
+}
+
+class AAFlatteningConvexPathBatch : public GrVertexBatch {
+public:
+    DEFINE_BATCH_CLASS_ID
+
+    struct Geometry {
+        GrColor fColor;
+        SkMatrix fViewMatrix;
+        SkPath fPath;
+        SkScalar fStrokeWidth;
+        SkPaint::Join fJoin;
+        SkScalar fMiterLimit;
+    };
+
+    static GrDrawBatch* Create(const Geometry& geometry) {
+        return new AAFlatteningConvexPathBatch(geometry);
+    }
+
+    const char* name() const override { return "AAConvexBatch"; }
+
+    void computePipelineOptimizations(GrInitInvariantOutput* color, 
+                                      GrInitInvariantOutput* coverage,
+                                      GrBatchToXPOverrides* overrides) const override {
+        // When this is called on a batch, there is only one geometry bundle
+        color->setKnownFourComponents(fGeoData[0].fColor);
+        coverage->setUnknownSingleComponent();
+        overrides->fUsePLSDstRead = false;
+    }
+
+private:
+    void initBatchTracker(const GrXPOverridesForBatch& overrides) override {
+        // Handle any color overrides
+        if (!overrides.readsColor()) {
+            fGeoData[0].fColor = GrColor_ILLEGAL;
+        }
+        overrides.getOverrideColorIfSet(&fGeoData[0].fColor);
+
+        // setup batch properties
+        fBatch.fColorIgnored = !overrides.readsColor();
+        fBatch.fColor = fGeoData[0].fColor;
+        fBatch.fUsesLocalCoords = overrides.readsLocalCoords();
+        fBatch.fCoverageIgnored = !overrides.readsCoverage();
+        fBatch.fLinesOnly = SkPath::kLine_SegmentMask == fGeoData[0].fPath.getSegmentMasks();
+        fBatch.fCanTweakAlphaForCoverage = overrides.canTweakAlphaForCoverage();
+    }
+
+    void draw(GrVertexBatch::Target* target, const GrPipeline* pipeline, int vertexCount,
+              size_t vertexStride, void* vertices, int indexCount, uint16_t* indices) const {
+        if (vertexCount == 0 || indexCount == 0) {
+            return;
+        }
+        const GrVertexBuffer* vertexBuffer;
+        GrVertices info;
+        int firstVertex;
+        void* verts = target->makeVertexSpace(vertexStride, vertexCount, &vertexBuffer,
+                                              &firstVertex);
+        if (!verts) {
+            SkDebugf("Could not allocate vertices\n");
+            return;
+        }
+        memcpy(verts, vertices, vertexCount * vertexStride);
+
+        const GrIndexBuffer* indexBuffer;
+        int firstIndex;
+        uint16_t* idxs = target->makeIndexSpace(indexCount, &indexBuffer, &firstIndex);
+        if (!idxs) {
+            SkDebugf("Could not allocate indices\n");
+            return;
+        }
+        memcpy(idxs, indices, indexCount * sizeof(uint16_t));
+        info.initIndexed(kTriangles_GrPrimitiveType, vertexBuffer, indexBuffer, firstVertex,
+                firstIndex, vertexCount, indexCount);
+        target->draw(info);
+    }
+
+    void onPrepareDraws(Target* target) const override {
+        bool canTweakAlphaForCoverage = this->canTweakAlphaForCoverage();
+
+        // Setup GrGeometryProcessor
+        SkAutoTUnref<const GrGeometryProcessor> gp(create_fill_gp(canTweakAlphaForCoverage,
+                                                                  this->viewMatrix(),
+                                                                  this->usesLocalCoords(),
+                                                                  this->coverageIgnored()));
+        if (!gp) {
+            SkDebugf("Couldn't create a GrGeometryProcessor\n");
+            return;
+        }
+
+        target->initDraw(gp, this->pipeline());
+
+        size_t vertexStride = gp->getVertexStride();
+
+        SkASSERT(canTweakAlphaForCoverage ?
+                 vertexStride == sizeof(GrDefaultGeoProcFactory::PositionColorAttr) :
+                 vertexStride == sizeof(GrDefaultGeoProcFactory::PositionColorCoverageAttr));
+
+        int instanceCount = fGeoData.count();
+
+        int vertexCount = 0;
+        int indexCount = 0;
+        int maxVertices = DEFAULT_BUFFER_SIZE;
+        int maxIndices = DEFAULT_BUFFER_SIZE;
+        uint8_t* vertices = (uint8_t*) sk_malloc_throw(maxVertices * vertexStride);
+        uint16_t* indices = (uint16_t*) sk_malloc_throw(maxIndices * sizeof(uint16_t));
+        for (int i = 0; i < instanceCount; i++) {
+            const Geometry& args = fGeoData[i];
+            GrAAConvexTessellator tess(args.fStrokeWidth, args.fJoin, args.fMiterLimit);
+
+            if (!tess.tessellate(args.fViewMatrix, args.fPath)) {
+                continue;
+            }
+
+            int currentIndices = tess.numIndices();
+            SkASSERT(currentIndices <= UINT16_MAX);
+            if (indexCount + currentIndices > UINT16_MAX) {
+                // if we added the current instance, we would overflow the indices we can store in a
+                // uint16_t. Draw what we've got so far and reset.
+                this->draw(target, this->pipeline(), vertexCount, vertexStride, vertices,
+                           indexCount, indices);
+                vertexCount = 0;
+                indexCount = 0;
+            }
+            int currentVertices = tess.numPts();
+            if (vertexCount + currentVertices > maxVertices) {
+                maxVertices = SkTMax(vertexCount + currentVertices, maxVertices * 2);
+                vertices = (uint8_t*) sk_realloc_throw(vertices, maxVertices * vertexStride);
+            }
+            if (indexCount + currentIndices > maxIndices) {
+                maxIndices = SkTMax(indexCount + currentIndices, maxIndices * 2);
+                indices = (uint16_t*) sk_realloc_throw(indices, maxIndices * sizeof(uint16_t));
+            }
+
+            extract_verts(tess, vertices + vertexStride * vertexCount, vertexStride, args.fColor,
+                    vertexCount, indices + indexCount, canTweakAlphaForCoverage);
+            vertexCount += currentVertices;
+            indexCount += currentIndices;
+        }
+        this->draw(target, this->pipeline(), vertexCount, vertexStride, vertices, indexCount,
+                   indices);
+        sk_free(vertices);
+        sk_free(indices);
+    }
+
+    SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
+
+    AAFlatteningConvexPathBatch(const Geometry& geometry) : INHERITED(ClassID()) {
+        fGeoData.push_back(geometry);
+
+        // compute bounds
+        fBounds = geometry.fPath.getBounds();
+        SkScalar w = geometry.fStrokeWidth;
+        if (w > 0) {
+            w /= 2;
+            // If the miter limit is < 1 then we effectively fallback to bevel joins.
+            if (SkPaint::kMiter_Join == geometry.fJoin && w > 1.f) {
+                w *= geometry.fMiterLimit;
+            }
+            fBounds.outset(w, w);
+        }
+        geometry.fViewMatrix.mapRect(&fBounds);
+    }
+
+    bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override {
+        AAFlatteningConvexPathBatch* that = t->cast<AAFlatteningConvexPathBatch>();
+        if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *that->pipeline(),
+                                    that->bounds(), caps)) {
+            return false;
+        }
+
+        SkASSERT(this->usesLocalCoords() == that->usesLocalCoords());
+        if (this->usesLocalCoords() && !this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
+            return false;
+        }
+
+        // In the event of two batches, one who can tweak, one who cannot, we just fall back to
+        // not tweaking
+        if (this->canTweakAlphaForCoverage() != that->canTweakAlphaForCoverage()) {
+            fBatch.fCanTweakAlphaForCoverage = false;
+        }
+
+        fGeoData.push_back_n(that->geoData()->count(), that->geoData()->begin());
+        this->joinBounds(that->bounds());
+        return true;
+    }
+
+    GrColor color() const { return fBatch.fColor; }
+    bool linesOnly() const { return fBatch.fLinesOnly; }
+    bool usesLocalCoords() const { return fBatch.fUsesLocalCoords; }
+    bool canTweakAlphaForCoverage() const { return fBatch.fCanTweakAlphaForCoverage; }
+    const SkMatrix& viewMatrix() const { return fGeoData[0].fViewMatrix; }
+    bool coverageIgnored() const { return fBatch.fCoverageIgnored; }
+
+    struct BatchTracker {
+        GrColor fColor;
+        bool fUsesLocalCoords;
+        bool fColorIgnored;
+        bool fCoverageIgnored;
+        bool fLinesOnly;
+        bool fCanTweakAlphaForCoverage;
+    };
+
+    BatchTracker fBatch;
+    SkSTArray<1, Geometry, true> fGeoData;
+
+    typedef GrVertexBatch INHERITED;
+};
+
+bool GrAALinearizingConvexPathRenderer::onDrawPath(const DrawPathArgs& args) {
+    if (args.fPath->isEmpty()) {
+        return true;
+    }
+    AAFlatteningConvexPathBatch::Geometry geometry;
+    geometry.fColor = args.fColor;
+    geometry.fViewMatrix = *args.fViewMatrix;
+    geometry.fPath = *args.fPath;
+    geometry.fStrokeWidth = args.fStroke->isFillStyle() ? -1.0f : args.fStroke->getWidth();
+    geometry.fJoin = args.fStroke->isFillStyle() ? SkPaint::Join::kMiter_Join :
+                                                   args.fStroke->getJoin();
+    geometry.fMiterLimit = args.fStroke->getMiter();
+
+    SkAutoTUnref<GrDrawBatch> batch(AAFlatteningConvexPathBatch::Create(geometry));
+    args.fTarget->drawBatch(*args.fPipelineBuilder, batch);
+
+    return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef GR_TEST_UTILS
+
+DRAW_BATCH_TEST_DEFINE(AAFlatteningConvexPathBatch) {
+    AAFlatteningConvexPathBatch::Geometry geometry;
+    geometry.fColor = GrRandomColor(random);
+    geometry.fViewMatrix = GrTest::TestMatrixInvertible(random);
+    geometry.fPath = GrTest::TestPathConvex(random);
+
+    return AAFlatteningConvexPathBatch::Create(geometry);
+}
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrAALinearizingConvexPathRenderer.h b/gfx/skia/skia/src/gpu/batches/GrAALinearizingConvexPathRenderer.h
new file mode 100644
index 000000000000..57d21e0c1ed0
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrAALinearizingConvexPathRenderer.h
@@ -0,0 +1,24 @@
+
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrAALinearizingConvexPathRenderer_DEFINED
+#define GrAALinearizingConvexPathRenderer_DEFINED
+
+#include "GrPathRenderer.h"
+
+class GrAALinearizingConvexPathRenderer : public GrPathRenderer {
+public:
+    GrAALinearizingConvexPathRenderer();
+
+private:
+    bool onCanDrawPath(const CanDrawPathArgs&) const override;
+
+    bool onDrawPath(const DrawPathArgs&) override;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrAAStrokeRectBatch.cpp b/gfx/skia/skia/src/gpu/batches/GrAAStrokeRectBatch.cpp
new file mode 100644
index 000000000000..21c55f6a5457
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrAAStrokeRectBatch.cpp
@@ -0,0 +1,665 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrAAStrokeRectBatch.h"
+
+#include "GrBatchFlushState.h"
+#include "GrDefaultGeoProcFactory.h"
+#include "GrResourceKey.h"
+#include "GrResourceProvider.h"
+
+GR_DECLARE_STATIC_UNIQUE_KEY(gMiterIndexBufferKey);
+GR_DECLARE_STATIC_UNIQUE_KEY(gBevelIndexBufferKey);
+
+static void set_inset_fan(SkPoint* pts, size_t stride,
+                          const SkRect& r, SkScalar dx, SkScalar dy) {
+    pts->setRectFan(r.fLeft + dx, r.fTop + dy,
+                    r.fRight - dx, r.fBottom - dy, stride);
+}
+
+static const GrGeometryProcessor* create_stroke_rect_gp(bool tweakAlphaForCoverage,
+                                                        const SkMatrix& viewMatrix,
+                                                        bool usesLocalCoords,
+                                                        bool coverageIgnored) {
+    using namespace GrDefaultGeoProcFactory;
+
+    Color color(Color::kAttribute_Type);
+    Coverage::Type coverageType;
+    // TODO remove coverage if coverage is ignored
+    /*if (coverageIgnored) {
+        coverageType = Coverage::kNone_Type;
+    } else*/ if (tweakAlphaForCoverage) {
+        coverageType = Coverage::kSolid_Type;
+    } else {
+        coverageType = Coverage::kAttribute_Type;
+    }
+    Coverage coverage(coverageType);
+    LocalCoords localCoords(usesLocalCoords ? LocalCoords::kUsePosition_Type :
+                                              LocalCoords::kUnused_Type);
+    return CreateForDeviceSpace(color, coverage, localCoords, viewMatrix);
+}
+
+class AAStrokeRectBatch : public GrVertexBatch {
+public:
+    DEFINE_BATCH_CLASS_ID
+
+    // TODO support AA rotated stroke rects by copying around view matrices
+    struct Geometry {
+        SkRect fDevOutside;
+        SkRect fDevOutsideAssist;
+        SkRect fDevInside;
+        GrColor fColor;
+        bool fDegenerate;
+    };
+
+    static AAStrokeRectBatch* Create(const SkMatrix& viewMatrix, bool miterStroke) {
+        return new AAStrokeRectBatch(viewMatrix, miterStroke);
+    }
+
+    const char* name() const override { return "AAStrokeRect"; }
+
+    void computePipelineOptimizations(GrInitInvariantOutput* color, 
+                                      GrInitInvariantOutput* coverage,
+                                      GrBatchToXPOverrides* overrides) const override {
+        // When this is called on a batch, there is only one geometry bundle
+        color->setKnownFourComponents(fGeoData[0].fColor);
+        coverage->setUnknownSingleComponent();
+        overrides->fUsePLSDstRead = false;
+    }
+
+    SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
+
+    bool canAppend(const SkMatrix& viewMatrix, bool miterStroke) {
+        return fViewMatrix.cheapEqualTo(viewMatrix) && fMiterStroke == miterStroke;
+    }
+
+    void append(GrColor color, const SkRect& devOutside, const SkRect& devOutsideAssist,
+                const SkRect& devInside, bool degenerate) {
+        Geometry& geometry = fGeoData.push_back();
+        geometry.fColor = color;
+        geometry.fDevOutside = devOutside;
+        geometry.fDevOutsideAssist = devOutsideAssist;
+        geometry.fDevInside = devInside;
+        geometry.fDegenerate = degenerate;
+    }
+
+    void appendAndUpdateBounds(GrColor color, const SkRect& devOutside,
+                               const SkRect& devOutsideAssist, const SkRect& devInside,
+                               bool degenerate) {
+        this->append(color, devOutside, devOutsideAssist, devInside, degenerate);
+
+        SkRect bounds;
+        this->updateBounds(&bounds, fGeoData.back());
+        this->joinBounds(bounds);
+    }
+
+    void init() { this->updateBounds(&fBounds, fGeoData[0]); }
+
+private:
+    void updateBounds(SkRect* bounds, const Geometry& geo) {
+        // If we have miterstroke then we inset devOutside and outset devOutsideAssist, so we need
+        // the join for proper bounds
+        *bounds = geo.fDevOutside;
+        bounds->join(geo.fDevOutsideAssist);
+    }
+
+    void onPrepareDraws(Target*) const override;
+    void initBatchTracker(const GrXPOverridesForBatch&) override;
+
+    AAStrokeRectBatch(const SkMatrix& viewMatrix,bool miterStroke)
+        : INHERITED(ClassID()) {
+        fViewMatrix = viewMatrix;
+        fMiterStroke = miterStroke;
+    }
+
+    static const int kMiterIndexCnt = 3 * 24;
+    static const int kMiterVertexCnt = 16;
+    static const int kNumMiterRectsInIndexBuffer = 256;
+
+    static const int kBevelIndexCnt = 48 + 36 + 24;
+    static const int kBevelVertexCnt = 24;
+    static const int kNumBevelRectsInIndexBuffer = 256;
+
+    static const GrIndexBuffer* GetIndexBuffer(GrResourceProvider* resourceProvider,
+                                               bool miterStroke);
+
+    GrColor color() const { return fBatch.fColor; }
+    bool usesLocalCoords() const { return fBatch.fUsesLocalCoords; }
+    bool canTweakAlphaForCoverage() const { return fBatch.fCanTweakAlphaForCoverage; }
+    bool colorIgnored() const { return fBatch.fColorIgnored; }
+    bool coverageIgnored() const { return fBatch.fCoverageIgnored; }
+    const Geometry& geometry() const { return fGeoData[0]; }
+    const SkMatrix& viewMatrix() const { return fViewMatrix; }
+    bool miterStroke() const { return fMiterStroke; }
+
+    bool onCombineIfPossible(GrBatch* t, const GrCaps&) override;
+
+    void generateAAStrokeRectGeometry(void* vertices,
+                                      size_t offset,
+                                      size_t vertexStride,
+                                      int outerVertexNum,
+                                      int innerVertexNum,
+                                      GrColor color,
+                                      const SkRect& devOutside,
+                                      const SkRect& devOutsideAssist,
+                                      const SkRect& devInside,
+                                      bool miterStroke,
+                                      bool degenerate,
+                                      bool tweakAlphaForCoverage) const;
+
+    struct BatchTracker {
+        GrColor fColor;
+        bool fUsesLocalCoords;
+        bool fColorIgnored;
+        bool fCoverageIgnored;
+        bool fCanTweakAlphaForCoverage;
+    };
+
+    BatchTracker fBatch;
+    SkSTArray<1, Geometry, true> fGeoData;
+    SkMatrix fViewMatrix;
+    bool fMiterStroke;
+
+    typedef GrVertexBatch INHERITED;
+};
+
+void AAStrokeRectBatch::initBatchTracker(const GrXPOverridesForBatch& overrides) {
+    // Handle any color overrides
+    if (!overrides.readsColor()) {
+        fGeoData[0].fColor = GrColor_ILLEGAL;
+    }
+    overrides.getOverrideColorIfSet(&fGeoData[0].fColor);
+
+    // setup batch properties
+    fBatch.fColorIgnored = !overrides.readsColor();
+    fBatch.fColor = fGeoData[0].fColor;
+    fBatch.fUsesLocalCoords = overrides.readsLocalCoords();
+    fBatch.fCoverageIgnored = !overrides.readsCoverage();
+    fBatch.fCanTweakAlphaForCoverage = overrides.canTweakAlphaForCoverage();
+}
+
+void AAStrokeRectBatch::onPrepareDraws(Target* target) const {
+    bool canTweakAlphaForCoverage = this->canTweakAlphaForCoverage();
+
+    SkAutoTUnref<const GrGeometryProcessor> gp(create_stroke_rect_gp(canTweakAlphaForCoverage,
+                                                                     this->viewMatrix(),
+                                                                     this->usesLocalCoords(),
+                                                                     this->coverageIgnored()));
+    if (!gp) {
+        SkDebugf("Couldn't create GrGeometryProcessor\n");
+        return;
+    }
+
+    target->initDraw(gp, this->pipeline());
+
+    size_t vertexStride = gp->getVertexStride();
+
+    SkASSERT(canTweakAlphaForCoverage ?
+             vertexStride == sizeof(GrDefaultGeoProcFactory::PositionColorAttr) :
+             vertexStride == sizeof(GrDefaultGeoProcFactory::PositionColorCoverageAttr));
+    int innerVertexNum = 4;
+    int outerVertexNum = this->miterStroke() ? 4 : 8;
+    int verticesPerInstance = (outerVertexNum + innerVertexNum) * 2;
+    int indicesPerInstance = this->miterStroke() ? kMiterIndexCnt : kBevelIndexCnt;
+    int instanceCount = fGeoData.count();
+
+    const SkAutoTUnref<const GrIndexBuffer> indexBuffer(
+        GetIndexBuffer(target->resourceProvider(), this->miterStroke()));
+    InstancedHelper helper;
+    void* vertices = helper.init(target, kTriangles_GrPrimitiveType, vertexStride,
+                                 indexBuffer, verticesPerInstance,  indicesPerInstance,
+                                 instanceCount);
+    if (!vertices || !indexBuffer) {
+         SkDebugf("Could not allocate vertices\n");
+         return;
+     }
+
+    for (int i = 0; i < instanceCount; i++) {
+        const Geometry& args = fGeoData[i];
+        this->generateAAStrokeRectGeometry(vertices,
+                                           i * verticesPerInstance * vertexStride,
+                                           vertexStride,
+                                           outerVertexNum,
+                                           innerVertexNum,
+                                           args.fColor,
+                                           args.fDevOutside,
+                                           args.fDevOutsideAssist,
+                                           args.fDevInside,
+                                           fMiterStroke,
+                                           args.fDegenerate,
+                                           canTweakAlphaForCoverage);
+    }
+    helper.recordDraw(target);
+}
+
+const GrIndexBuffer* AAStrokeRectBatch::GetIndexBuffer(GrResourceProvider* resourceProvider,
+                                                       bool miterStroke) {
+
+    if (miterStroke) {
+        static const uint16_t gMiterIndices[] = {
+            0 + 0, 1 + 0, 5 + 0, 5 + 0, 4 + 0, 0 + 0,
+            1 + 0, 2 + 0, 6 + 0, 6 + 0, 5 + 0, 1 + 0,
+            2 + 0, 3 + 0, 7 + 0, 7 + 0, 6 + 0, 2 + 0,
+            3 + 0, 0 + 0, 4 + 0, 4 + 0, 7 + 0, 3 + 0,
+
+            0 + 4, 1 + 4, 5 + 4, 5 + 4, 4 + 4, 0 + 4,
+            1 + 4, 2 + 4, 6 + 4, 6 + 4, 5 + 4, 1 + 4,
+            2 + 4, 3 + 4, 7 + 4, 7 + 4, 6 + 4, 2 + 4,
+            3 + 4, 0 + 4, 4 + 4, 4 + 4, 7 + 4, 3 + 4,
+
+            0 + 8, 1 + 8, 5 + 8, 5 + 8, 4 + 8, 0 + 8,
+            1 + 8, 2 + 8, 6 + 8, 6 + 8, 5 + 8, 1 + 8,
+            2 + 8, 3 + 8, 7 + 8, 7 + 8, 6 + 8, 2 + 8,
+            3 + 8, 0 + 8, 4 + 8, 4 + 8, 7 + 8, 3 + 8,
+        };
+        GR_STATIC_ASSERT(SK_ARRAY_COUNT(gMiterIndices) == kMiterIndexCnt);
+        GR_DEFINE_STATIC_UNIQUE_KEY(gMiterIndexBufferKey);
+        return resourceProvider->findOrCreateInstancedIndexBuffer(gMiterIndices,
+            kMiterIndexCnt, kNumMiterRectsInIndexBuffer, kMiterVertexCnt,
+            gMiterIndexBufferKey);
+    } else {
+        /**
+         * As in miter-stroke, index = a + b, and a is the current index, b is the shift
+         * from the first index. The index layout:
+         * outer AA line: 0~3, 4~7
+         * outer edge:    8~11, 12~15
+         * inner edge:    16~19
+         * inner AA line: 20~23
+         * Following comes a bevel-stroke rect and its indices:
+         *
+         *           4                                 7
+         *            *********************************
+         *          *   ______________________________  *
+         *         *  / 12                          15 \  *
+         *        *  /                                  \  *
+         *     0 *  |8     16_____________________19  11 |  * 3
+         *       *  |       |                    |       |  *
+         *       *  |       |  ****************  |       |  *
+         *       *  |       |  * 20        23 *  |       |  *
+         *       *  |       |  *              *  |       |  *
+         *       *  |       |  * 21        22 *  |       |  *
+         *       *  |       |  ****************  |       |  *
+         *       *  |       |____________________|       |  *
+         *     1 *  |9    17                      18   10|  * 2
+         *        *  \                                  /  *
+         *         *  \13 __________________________14/  *
+         *          *                                   *
+         *           **********************************
+         *          5                                  6
+         */
+        static const uint16_t gBevelIndices[] = {
+            // Draw outer AA, from outer AA line to outer edge, shift is 0.
+            0 + 0, 1 + 0,  9 + 0,  9 + 0,  8 + 0, 0 + 0,
+            1 + 0, 5 + 0, 13 + 0, 13 + 0,  9 + 0, 1 + 0,
+            5 + 0, 6 + 0, 14 + 0, 14 + 0, 13 + 0, 5 + 0,
+            6 + 0, 2 + 0, 10 + 0, 10 + 0, 14 + 0, 6 + 0,
+            2 + 0, 3 + 0, 11 + 0, 11 + 0, 10 + 0, 2 + 0,
+            3 + 0, 7 + 0, 15 + 0, 15 + 0, 11 + 0, 3 + 0,
+            7 + 0, 4 + 0, 12 + 0, 12 + 0, 15 + 0, 7 + 0,
+            4 + 0, 0 + 0,  8 + 0,  8 + 0, 12 + 0, 4 + 0,
+
+            // Draw the stroke, from outer edge to inner edge, shift is 8.
+            0 + 8, 1 + 8, 9 + 8, 9 + 8, 8 + 8, 0 + 8,
+            1 + 8, 5 + 8, 9 + 8,
+            5 + 8, 6 + 8, 10 + 8, 10 + 8, 9 + 8, 5 + 8,
+            6 + 8, 2 + 8, 10 + 8,
+            2 + 8, 3 + 8, 11 + 8, 11 + 8, 10 + 8, 2 + 8,
+            3 + 8, 7 + 8, 11 + 8,
+            7 + 8, 4 + 8, 8 + 8, 8 + 8, 11 + 8, 7 + 8,
+            4 + 8, 0 + 8, 8 + 8,
+
+            // Draw the inner AA, from inner edge to inner AA line, shift is 16.
+            0 + 16, 1 + 16, 5 + 16, 5 + 16, 4 + 16, 0 + 16,
+            1 + 16, 2 + 16, 6 + 16, 6 + 16, 5 + 16, 1 + 16,
+            2 + 16, 3 + 16, 7 + 16, 7 + 16, 6 + 16, 2 + 16,
+            3 + 16, 0 + 16, 4 + 16, 4 + 16, 7 + 16, 3 + 16,
+        };
+        GR_STATIC_ASSERT(SK_ARRAY_COUNT(gBevelIndices) == kBevelIndexCnt);
+
+        GR_DEFINE_STATIC_UNIQUE_KEY(gBevelIndexBufferKey);
+        return resourceProvider->findOrCreateInstancedIndexBuffer(gBevelIndices,
+            kBevelIndexCnt, kNumBevelRectsInIndexBuffer, kBevelVertexCnt,
+            gBevelIndexBufferKey);
+    }
+}
+
+bool AAStrokeRectBatch::onCombineIfPossible(GrBatch* t, const GrCaps& caps) {
+    AAStrokeRectBatch* that = t->cast<AAStrokeRectBatch>();
+
+    if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *that->pipeline(),
+                                that->bounds(), caps)) {
+        return false;
+    }
+
+    // TODO batch across miterstroke changes
+    if (this->miterStroke() != that->miterStroke()) {
+        return false;
+    }
+
+    // We apply the viewmatrix to the rect points on the cpu.  However, if the pipeline uses
+    // local coords then we won't be able to batch.  We could actually upload the viewmatrix
+    // using vertex attributes in these cases, but haven't investigated that
+    if (this->usesLocalCoords() && !this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
+        return false;
+    }
+
+    // In the event of two batches, one who can tweak, one who cannot, we just fall back to
+    // not tweaking
+    if (this->canTweakAlphaForCoverage() != that->canTweakAlphaForCoverage()) {
+        fBatch.fCanTweakAlphaForCoverage = false;
+    }
+
+    if (this->color() != that->color()) {
+        fBatch.fColor = GrColor_ILLEGAL;
+    }
+    fGeoData.push_back_n(that->geoData()->count(), that->geoData()->begin());
+    this->joinBounds(that->bounds());
+    return true;
+}
+
+static void setup_scale(int* scale, SkScalar inset) {
+    if (inset < SK_ScalarHalf) {
+        *scale = SkScalarFloorToInt(512.0f * inset / (inset + SK_ScalarHalf));
+        SkASSERT(*scale >= 0 && *scale <= 255);
+    } else {
+        *scale = 0xff;
+    }
+}
+
+void AAStrokeRectBatch::generateAAStrokeRectGeometry(void* vertices,
+                                                     size_t offset,
+                                                     size_t vertexStride,
+                                                     int outerVertexNum,
+                                                     int innerVertexNum,
+                                                     GrColor color,
+                                                     const SkRect& devOutside,
+                                                     const SkRect& devOutsideAssist,
+                                                     const SkRect& devInside,
+                                                     bool miterStroke,
+                                                     bool degenerate,
+                                                     bool tweakAlphaForCoverage) const {
+    intptr_t verts = reinterpret_cast<intptr_t>(vertices) + offset;
+
+    // We create vertices for four nested rectangles. There are two ramps from 0 to full
+    // coverage, one on the exterior of the stroke and the other on the interior.
+    // The following pointers refer to the four rects, from outermost to innermost.
+    SkPoint* fan0Pos = reinterpret_cast<SkPoint*>(verts);
+    SkPoint* fan1Pos = reinterpret_cast<SkPoint*>(verts + outerVertexNum * vertexStride);
+    SkPoint* fan2Pos = reinterpret_cast<SkPoint*>(verts + 2 * outerVertexNum * vertexStride);
+    SkPoint* fan3Pos = reinterpret_cast<SkPoint*>(verts +
+                                                  (2 * outerVertexNum + innerVertexNum) *
+                                                  vertexStride);
+
+#ifndef SK_IGNORE_THIN_STROKED_RECT_FIX
+    // TODO: this only really works if the X & Y margins are the same all around
+    // the rect (or if they are all >= 1.0).
+    SkScalar inset;
+    if (!degenerate) {
+        inset = SkMinScalar(SK_Scalar1, devOutside.fRight - devInside.fRight);
+        inset = SkMinScalar(inset, devInside.fLeft - devOutside.fLeft);
+        inset = SkMinScalar(inset, devInside.fTop - devOutside.fTop);
+        if (miterStroke) {
+            inset = SK_ScalarHalf * SkMinScalar(inset, devOutside.fBottom - devInside.fBottom);
+        } else {
+            inset = SK_ScalarHalf * SkMinScalar(inset, devOutsideAssist.fBottom -
+                                                       devInside.fBottom);
+        }
+        SkASSERT(inset >= 0);
+    } else {
+        // TODO use real devRect here
+        inset = SkMinScalar(devOutside.width(), SK_Scalar1);
+        inset = SK_ScalarHalf * SkMinScalar(inset, SkTMax(devOutside.height(),
+                                                          devOutsideAssist.height()));
+    }
+#else
+    SkScalar inset;
+    if (!degenerate) {
+        inset = SK_ScalarHalf;
+    } else {
+        // TODO use real devRect here
+        inset = SkMinScalar(devOutside.width(), SK_Scalar1);
+        inset = SK_ScalarHalf * SkMinScalar(inset, SkTMax(devOutside.height(),
+                                                          devOutsideAssist.height()));
+    }
+#endif
+
+    if (miterStroke) {
+        // outermost
+        set_inset_fan(fan0Pos, vertexStride, devOutside, -SK_ScalarHalf, -SK_ScalarHalf);
+        // inner two
+        set_inset_fan(fan1Pos, vertexStride, devOutside,  inset,  inset);
+        if (!degenerate) {
+            set_inset_fan(fan2Pos, vertexStride, devInside,  -inset, -inset);
+            // innermost
+            set_inset_fan(fan3Pos, vertexStride, devInside,   SK_ScalarHalf,  SK_ScalarHalf);
+        } else {
+            // When the interior rect has become degenerate we smoosh to a single point
+            SkASSERT(devInside.fLeft == devInside.fRight &&
+                     devInside.fTop == devInside.fBottom);
+            fan2Pos->setRectFan(devInside.fLeft, devInside.fTop,
+                                devInside.fRight, devInside.fBottom, vertexStride);
+            fan3Pos->setRectFan(devInside.fLeft, devInside.fTop,
+                                devInside.fRight, devInside.fBottom, vertexStride);
+        }
+    } else {
+        SkPoint* fan0AssistPos = reinterpret_cast<SkPoint*>(verts + 4 * vertexStride);
+        SkPoint* fan1AssistPos = reinterpret_cast<SkPoint*>(verts +
+                                                            (outerVertexNum + 4) *
+                                                            vertexStride);
+        // outermost
+        set_inset_fan(fan0Pos, vertexStride, devOutside, -SK_ScalarHalf, -SK_ScalarHalf);
+        set_inset_fan(fan0AssistPos, vertexStride, devOutsideAssist, -SK_ScalarHalf,
+                      -SK_ScalarHalf);
+        // outer one of the inner two
+        set_inset_fan(fan1Pos, vertexStride, devOutside,  inset,  inset);
+        set_inset_fan(fan1AssistPos, vertexStride, devOutsideAssist,  inset,  inset);
+        if (!degenerate) {
+            // inner one of the inner two
+            set_inset_fan(fan2Pos, vertexStride, devInside,  -inset, -inset);
+            // innermost
+            set_inset_fan(fan3Pos, vertexStride, devInside,   SK_ScalarHalf,  SK_ScalarHalf);
+        } else {
+            // When the interior rect has become degenerate we smoosh to a single point
+            SkASSERT(devInside.fLeft == devInside.fRight &&
+                     devInside.fTop == devInside.fBottom);
+            fan2Pos->setRectFan(devInside.fLeft, devInside.fTop,
+                                devInside.fRight, devInside.fBottom, vertexStride);
+            fan3Pos->setRectFan(devInside.fLeft, devInside.fTop,
+                                devInside.fRight, devInside.fBottom, vertexStride);
+        }
+    }
+
+    // Make verts point to vertex color and then set all the color and coverage vertex attrs
+    // values. The outermost rect has 0 coverage
+    verts += sizeof(SkPoint);
+    for (int i = 0; i < outerVertexNum; ++i) {
+        if (tweakAlphaForCoverage) {
+            *reinterpret_cast<GrColor*>(verts + i * vertexStride) = 0;
+        } else {
+            *reinterpret_cast<GrColor*>(verts + i * vertexStride) = color;
+            *reinterpret_cast<float*>(verts + i * vertexStride + sizeof(GrColor)) = 0;
+        }
+    }
+
+    // scale is the coverage for the the inner two rects.
+    int scale;
+    setup_scale(&scale, inset);
+
+    float innerCoverage = GrNormalizeByteToFloat(scale);
+    GrColor scaledColor = (0xff == scale) ? color : SkAlphaMulQ(color, scale);
+
+    verts += outerVertexNum * vertexStride;
+    for (int i = 0; i < outerVertexNum + innerVertexNum; ++i) {
+        if (tweakAlphaForCoverage) {
+            *reinterpret_cast<GrColor*>(verts + i * vertexStride) = scaledColor;
+        } else {
+            *reinterpret_cast<GrColor*>(verts + i * vertexStride) = color;
+            *reinterpret_cast<float*>(verts + i * vertexStride + sizeof(GrColor)) = innerCoverage;
+        }
+    }
+
+    // The innermost rect has 0 coverage, unless we are degenerate, in which case we must apply the
+    // scaled coverage
+    verts += (outerVertexNum + innerVertexNum) * vertexStride;
+    if (!degenerate) {
+        innerCoverage = 0;
+        scaledColor = 0;
+    }
+
+    for (int i = 0; i < innerVertexNum; ++i) {
+        if (tweakAlphaForCoverage) {
+            *reinterpret_cast<GrColor*>(verts + i * vertexStride) = scaledColor;
+        } else {
+            *reinterpret_cast<GrColor*>(verts + i * vertexStride) = color;
+            *reinterpret_cast<float*>(verts + i * vertexStride + sizeof(GrColor)) = innerCoverage;
+        }
+    }
+}
+
+inline static bool is_miter(const SkStrokeRec& stroke) {
+    // For hairlines, make bevel and round joins appear the same as mitered ones.
+    // small miter limit means right angles show bevel...
+    if ((stroke.getWidth() > 0) && (stroke.getJoin() != SkPaint::kMiter_Join ||
+                                    stroke.getMiter() < SK_ScalarSqrt2)) {
+        return false;
+    }
+    return true;
+}
+
+static void compute_rects(SkRect* devOutside, SkRect* devOutsideAssist, SkRect* devInside,
+                          bool* isDegenerate, const SkMatrix& viewMatrix, const SkRect& rect,
+                          SkScalar strokeWidth, bool miterStroke) {
+    SkRect devRect;
+    viewMatrix.mapRect(&devRect, rect);
+
+    SkVector devStrokeSize;
+    if (strokeWidth > 0) {
+        devStrokeSize.set(strokeWidth, strokeWidth);
+        viewMatrix.mapVectors(&devStrokeSize, 1);
+        devStrokeSize.setAbs(devStrokeSize);
+    } else {
+        devStrokeSize.set(SK_Scalar1, SK_Scalar1);
+    }
+
+    const SkScalar dx = devStrokeSize.fX;
+    const SkScalar dy = devStrokeSize.fY;
+    const SkScalar rx = SkScalarMul(dx, SK_ScalarHalf);
+    const SkScalar ry = SkScalarMul(dy, SK_ScalarHalf);
+
+    *devOutside = devRect;
+    *devOutsideAssist = devRect;
+    *devInside = devRect;
+
+    devOutside->outset(rx, ry);
+    devInside->inset(rx, ry);
+
+    // If we have a degenerate stroking rect(ie the stroke is larger than inner rect) then we
+    // make a degenerate inside rect to avoid double hitting.  We will also jam all of the points
+    // together when we render these rects.
+    SkScalar spare;
+    {
+        SkScalar w = devRect.width() - dx;
+        SkScalar h = devRect.height() - dy;
+        spare = SkTMin(w, h);
+    }
+
+    *isDegenerate = spare <= 0;
+    if (*isDegenerate) {
+        devInside->fLeft = devInside->fRight = devRect.centerX();
+        devInside->fTop = devInside->fBottom = devRect.centerY();
+    }
+
+    // For bevel-stroke, use 2 SkRect instances(devOutside and devOutsideAssist)
+    // to draw the outside of the octagon. Because there are 8 vertices on the outer
+    // edge, while vertex number of inner edge is 4, the same as miter-stroke.
+    if (!miterStroke) {
+        devOutside->inset(0, ry);
+        devOutsideAssist->outset(0, ry);
+    }
+}
+
+namespace GrAAStrokeRectBatch {
+
+GrDrawBatch* Create(GrColor color,
+                    const SkMatrix& viewMatrix,
+                    const SkRect& devOutside,
+                    const SkRect& devOutsideAssist,
+                    const SkRect& devInside,
+                    bool miterStroke,
+                    bool degenerate) {
+    AAStrokeRectBatch* batch = AAStrokeRectBatch::Create(viewMatrix, miterStroke);
+    batch->append(color, devOutside, devOutsideAssist, devInside, degenerate);
+    batch->init();
+    return batch;
+}
+
+GrDrawBatch* Create(GrColor color,
+                    const SkMatrix& viewMatrix,
+                    const SkRect& rect,
+                    const SkStrokeRec& stroke) {
+    bool isMiterStroke = is_miter(stroke);
+    AAStrokeRectBatch* batch = AAStrokeRectBatch::Create(viewMatrix, isMiterStroke);
+
+    SkRect devOutside, devOutsideAssist, devInside;
+    bool isDegenerate;
+    compute_rects(&devOutside, &devOutsideAssist, &devInside, &isDegenerate, viewMatrix,
+                  rect, stroke.getWidth(), isMiterStroke);
+
+    batch->append(color, devOutside, devOutsideAssist, devInside, isDegenerate);
+    batch->init();
+    return batch;
+}
+
+bool Append(GrBatch* origBatch,
+            GrColor color,
+            const SkMatrix& viewMatrix,
+            const SkRect& rect,
+            const SkStrokeRec& stroke) {
+    AAStrokeRectBatch* batch = origBatch->cast<AAStrokeRectBatch>();
+
+    // we can't batch across vm changes
+    bool isMiterStroke = is_miter(stroke);
+    if (!batch->canAppend(viewMatrix, isMiterStroke)) {
+        return false;
+    }
+
+    SkRect devOutside, devOutsideAssist, devInside;
+    bool isDegenerate;
+    compute_rects(&devOutside, &devOutsideAssist, &devInside, &isDegenerate, viewMatrix,
+                  rect, stroke.getWidth(), isMiterStroke);
+
+    batch->appendAndUpdateBounds(color, devOutside, devOutsideAssist, devInside, isDegenerate);
+    return true;
+}
+
+};
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef GR_TEST_UTILS
+
+#include "GrBatchTest.h"
+
+DRAW_BATCH_TEST_DEFINE(AAStrokeRectBatch) {
+    bool miterStroke = random->nextBool();
+
+    // Create mock stroke rect
+    SkRect outside = GrTest::TestRect(random);
+    SkScalar minDim = SkMinScalar(outside.width(), outside.height());
+    SkScalar strokeWidth = minDim * 0.1f;
+    SkRect outsideAssist = outside;
+    outsideAssist.outset(strokeWidth, strokeWidth);
+    SkRect inside = outside;
+    inside.inset(strokeWidth, strokeWidth);
+
+    GrColor color = GrRandomColor(random);
+
+    return GrAAStrokeRectBatch::Create(color, GrTest::TestMatrix(random), outside, outsideAssist,
+                                       inside, miterStroke, inside.isFinite() && inside.isEmpty());
+}
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrAAStrokeRectBatch.h b/gfx/skia/skia/src/gpu/batches/GrAAStrokeRectBatch.h
new file mode 100644
index 000000000000..4959232bab92
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrAAStrokeRectBatch.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrAAStrokeRectBatch_DEFINED
+#define GrAAStrokeRectBatch_DEFINED
+
+#include "GrColor.h"
+
+class GrBatch;
+class GrDrawBatch;
+class GrResourceProvider;
+class SkMatrix;
+struct SkRect;
+class SkStrokeRec;
+
+namespace GrAAStrokeRectBatch {
+
+GrDrawBatch* Create(GrColor color,
+                    const SkMatrix& viewMatrix,
+                    const SkRect& devOutside,
+                    const SkRect& devOutsideAssist,
+                    const SkRect& devInside,
+                    bool miterStroke,
+                    bool degenerate);
+
+GrDrawBatch* Create(GrColor color,
+                    const SkMatrix& viewMatrix,
+                    const SkRect& rect,
+                    const SkStrokeRec& stroke);
+
+bool Append(GrBatch*,
+            GrColor color,
+            const SkMatrix& viewMatrix,
+            const SkRect& rect,
+            const SkStrokeRec& stroke);
+
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrAtlasTextBatch.cpp b/gfx/skia/skia/src/gpu/batches/GrAtlasTextBatch.cpp
new file mode 100644
index 000000000000..fa34036af6e6
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrAtlasTextBatch.cpp
@@ -0,0 +1,575 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrAtlasTextBatch.h"
+
+#include "GrBatchFontCache.h"
+#include "GrBatchFlushState.h"
+#include "GrBatchTest.h"
+#include "GrResourceProvider.h"
+
+#include "SkDistanceFieldGen.h"
+#include "SkGlyphCache.h"
+
+#include "effects/GrBitmapTextGeoProc.h"
+#include "effects/GrDistanceFieldGeoProc.h"
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// A large template to handle regenerating the vertices of a textblob with as few branches as
+// possible
+template <bool regenPos, bool regenCol, bool regenTexCoords>
+inline void regen_vertices(intptr_t vertex, const GrGlyph* glyph, size_t vertexStride,
+                           bool useDistanceFields, SkScalar transX, SkScalar transY,
+                           GrColor color) {
+    int u0, v0, u1, v1;
+    if (regenTexCoords) {
+        SkASSERT(glyph);
+        int width = glyph->fBounds.width();
+        int height = glyph->fBounds.height();
+
+        if (useDistanceFields) {
+            u0 = glyph->fAtlasLocation.fX + SK_DistanceFieldInset;
+            v0 = glyph->fAtlasLocation.fY + SK_DistanceFieldInset;
+            u1 = u0 + width - 2 * SK_DistanceFieldInset;
+            v1 = v0 + height - 2 * SK_DistanceFieldInset;
+        } else {
+            u0 = glyph->fAtlasLocation.fX;
+            v0 = glyph->fAtlasLocation.fY;
+            u1 = u0 + width;
+            v1 = v0 + height;
+        }
+    }
+
+    // This is a bit wonky, but sometimes we have LCD text, in which case we won't have color
+    // vertices, hence vertexStride - sizeof(SkIPoint16)
+    intptr_t colorOffset = sizeof(SkPoint);
+    intptr_t texCoordOffset = vertexStride - sizeof(SkIPoint16);
+
+    // V0
+    if (regenPos) {
+        SkPoint* point = reinterpret_cast<SkPoint*>(vertex);
+        point->fX += transX;
+        point->fY += transY;
+    }
+
+    if (regenCol) {
+        SkColor* vcolor = reinterpret_cast<SkColor*>(vertex + colorOffset);
+        *vcolor = color;
+    }
+
+    if (regenTexCoords) {
+        SkIPoint16* textureCoords = reinterpret_cast<SkIPoint16*>(vertex + texCoordOffset);
+        textureCoords->set(u0, v0);
+    }
+    vertex += vertexStride;
+
+    // V1
+    if (regenPos) {
+        SkPoint* point = reinterpret_cast<SkPoint*>(vertex);
+        point->fX += transX;
+        point->fY += transY;
+    }
+
+    if (regenCol) {
+        SkColor* vcolor = reinterpret_cast<SkColor*>(vertex + colorOffset);
+        *vcolor = color;
+    }
+
+    if (regenTexCoords) {
+        SkIPoint16* textureCoords = reinterpret_cast<SkIPoint16*>(vertex + texCoordOffset);
+        textureCoords->set(u0, v1);
+    }
+    vertex += vertexStride;
+
+    // V2
+    if (regenPos) {
+        SkPoint* point = reinterpret_cast<SkPoint*>(vertex);
+        point->fX += transX;
+        point->fY += transY;
+    }
+
+    if (regenCol) {
+        SkColor* vcolor = reinterpret_cast<SkColor*>(vertex + colorOffset);
+        *vcolor = color;
+    }
+
+    if (regenTexCoords) {
+        SkIPoint16* textureCoords = reinterpret_cast<SkIPoint16*>(vertex + texCoordOffset);
+        textureCoords->set(u1, v1);
+    }
+    vertex += vertexStride;
+
+    // V3
+    if (regenPos) {
+        SkPoint* point = reinterpret_cast<SkPoint*>(vertex);
+        point->fX += transX;
+        point->fY += transY;
+    }
+
+    if (regenCol) {
+        SkColor* vcolor = reinterpret_cast<SkColor*>(vertex + colorOffset);
+        *vcolor = color;
+    }
+
+    if (regenTexCoords) {
+        SkIPoint16* textureCoords = reinterpret_cast<SkIPoint16*>(vertex + texCoordOffset);
+        textureCoords->set(u1, v0);
+    }
+}
+
+typedef GrAtlasTextBlob Blob;
+typedef Blob::Run Run;
+typedef Run::SubRunInfo TextInfo;
+
+template <bool regenPos, bool regenCol, bool regenTexCoords, bool regenGlyphs>
+inline void GrAtlasTextBatch::regenBlob(Target* target, FlushInfo* flushInfo, Blob* blob, Run* run,
+                                        TextInfo* info, SkGlyphCache** cache,
+                                        SkTypeface** typeface, GrFontScaler** scaler,
+                                        const SkDescriptor** desc, const GrGeometryProcessor* gp,
+                                        int glyphCount, size_t vertexStride,
+                                        GrColor color, SkScalar transX, SkScalar transY) const {
+    static_assert(!regenGlyphs || regenTexCoords, "must regenTexCoords along regenGlyphs");
+    GrBatchTextStrike* strike = nullptr;
+    if (regenTexCoords) {
+        info->fBulkUseToken.reset();
+
+        // We can reuse if we have a valid strike and our descriptors / typeface are the
+        // same.  The override descriptor is only for the non distance field text within
+        // a run
+        const SkDescriptor* newDesc = (run->fOverrideDescriptor && !this->usesDistanceFields()) ?
+                                      run->fOverrideDescriptor->getDesc() :
+                                      run->fDescriptor.getDesc();
+        if (!*cache || !SkTypeface::Equal(*typeface, run->fTypeface) ||
+                       !((*desc)->equals(*newDesc))) {
+            if (*cache) {
+                SkGlyphCache::AttachCache(*cache);
+            }
+            *desc = newDesc;
+            *cache = SkGlyphCache::DetachCache(run->fTypeface, *desc);
+            *scaler = GrTextContext::GetGrFontScaler(*cache);
+            strike = info->fStrike;
+            *typeface = run->fTypeface;
+        }
+
+        if (regenGlyphs) {
+            strike = fFontCache->getStrike(*scaler);
+        } else {
+            strike = info->fStrike;
+        }
+    }
+
+    bool brokenRun = false;
+    for (int glyphIdx = 0; glyphIdx < glyphCount; glyphIdx++) {
+        GrGlyph* glyph = nullptr;
+        if (regenTexCoords) {
+            size_t glyphOffset = glyphIdx + info->fGlyphStartIndex;
+
+            if (regenGlyphs) {
+                // Get the id from the old glyph, and use the new strike to lookup
+                // the glyph.
+                GrGlyph::PackedID id = blob->fGlyphs[glyphOffset]->fPackedID;
+                blob->fGlyphs[glyphOffset] = strike->getGlyph(id, this->maskFormat(), *scaler);
+                SkASSERT(id == blob->fGlyphs[glyphOffset]->fPackedID);
+            }
+            glyph = blob->fGlyphs[glyphOffset];
+            SkASSERT(glyph && glyph->fMaskFormat == this->maskFormat());
+
+            if (!fFontCache->hasGlyph(glyph) &&
+                !strike->addGlyphToAtlas(target, glyph, *scaler, this->maskFormat())) {
+                this->flush(target, flushInfo);
+                target->initDraw(gp, this->pipeline());
+                brokenRun = glyphIdx > 0;
+
+                SkDEBUGCODE(bool success =) strike->addGlyphToAtlas(target,
+                                                                    glyph,
+                                                                    *scaler,
+                                                                    this->maskFormat());
+                SkASSERT(success);
+            }
+            fFontCache->addGlyphToBulkAndSetUseToken(&info->fBulkUseToken, glyph,
+                                                     target->currentToken());
+        }
+
+        intptr_t vertex = reinterpret_cast<intptr_t>(blob->fVertices);
+        vertex += info->fVertexStartIndex;
+        vertex += vertexStride * glyphIdx * GrAtlasTextBatch::kVerticesPerGlyph;
+        regen_vertices<regenPos, regenCol, regenTexCoords>(vertex, glyph, vertexStride,
+                                                           this->usesDistanceFields(), transX,
+                                                           transY, color);
+        flushInfo->fGlyphsToFlush++;
+    }
+
+    // We my have changed the color so update it here
+    run->fColor = color;
+    if (regenTexCoords) {
+        if (regenGlyphs) {
+            info->fStrike.reset(SkRef(strike));
+        }
+        info->fAtlasGeneration = brokenRun ? GrBatchAtlas::kInvalidAtlasGeneration :
+                                             fFontCache->atlasGeneration(this->maskFormat());
+    }
+}
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+static inline GrColor skcolor_to_grcolor_nopremultiply(SkColor c) {
+    unsigned r = SkColorGetR(c);
+    unsigned g = SkColorGetG(c);
+    unsigned b = SkColorGetB(c);
+    return GrColorPackRGBA(r, g, b, 0xff);
+}
+
+static const int kDistanceAdjustLumShift = 5;
+
+SkString GrAtlasTextBatch::dumpInfo() const {
+    SkString str;
+
+    for (int i = 0; i < fGeoCount; ++i) {
+        str.appendf("%d: Color: 0x%08x Trans: %.2f,%.2f Runs: %d\n",
+                    i,
+                    fGeoData[i].fColor,
+                    fGeoData[i].fTransX,
+                    fGeoData[i].fTransY,
+                    fGeoData[i].fBlob->fRunCount);
+    }
+
+    str.append(INHERITED::dumpInfo());
+    return str;
+}
+
+void GrAtlasTextBatch::computePipelineOptimizations(GrInitInvariantOutput* color, 
+                                                    GrInitInvariantOutput* coverage,
+                                                    GrBatchToXPOverrides* overrides) const {
+    if (kColorBitmapMask_MaskType == fMaskType) {
+        color->setUnknownFourComponents();
+    } else {
+        color->setKnownFourComponents(fBatch.fColor);
+    }
+    switch (fMaskType) {
+        case kGrayscaleDistanceField_MaskType:
+        case kGrayscaleCoverageMask_MaskType:
+            coverage->setUnknownSingleComponent();
+            break;
+        case kLCDCoverageMask_MaskType:
+        case kLCDDistanceField_MaskType:
+            coverage->setUnknownOpaqueFourComponents();
+            coverage->setUsingLCDCoverage();
+            break;
+        case kColorBitmapMask_MaskType:
+            coverage->setKnownSingleComponent(0xff);
+    }
+}
+
+void GrAtlasTextBatch::initBatchTracker(const GrXPOverridesForBatch& overrides) {
+    // Handle any color overrides
+    if (!overrides.readsColor()) {
+        fGeoData[0].fColor = GrColor_ILLEGAL;
+    }
+    overrides.getOverrideColorIfSet(&fGeoData[0].fColor);
+
+    // setup batch properties
+    fBatch.fColorIgnored = !overrides.readsColor();
+    fBatch.fColor = fGeoData[0].fColor;
+    fBatch.fUsesLocalCoords = overrides.readsLocalCoords();
+    fBatch.fCoverageIgnored = !overrides.readsCoverage();
+}
+
+enum RegenMask {
+    kNoRegen    = 0x0,
+    kRegenPos   = 0x1,
+    kRegenCol   = 0x2,
+    kRegenTex   = 0x4,
+    kRegenGlyph = 0x8 | kRegenTex, // we have to regenerate the texture coords when we regen glyphs
+
+    // combinations
+    kRegenPosCol = kRegenPos | kRegenCol,
+    kRegenPosTex = kRegenPos | kRegenTex,
+    kRegenPosTexGlyph = kRegenPos | kRegenGlyph,
+    kRegenPosColTex = kRegenPos | kRegenCol | kRegenTex,
+    kRegenPosColTexGlyph = kRegenPos | kRegenCol | kRegenGlyph,
+    kRegenColTex = kRegenCol | kRegenTex,
+    kRegenColTexGlyph = kRegenCol | kRegenGlyph,
+};
+
+#define REGEN_ARGS target, &flushInfo, blob, &run, &info, &cache, &typeface, &scaler, &desc, gp, \
+                   glyphCount, vertexStride, args.fColor, args.fTransX, args.fTransY
+
+void GrAtlasTextBatch::onPrepareDraws(Target* target) const {
+    // if we have RGB, then we won't have any SkShaders so no need to use a localmatrix.
+    // TODO actually only invert if we don't have RGBA
+    SkMatrix localMatrix;
+    if (this->usesLocalCoords() && !this->viewMatrix().invert(&localMatrix)) {
+        SkDebugf("Cannot invert viewmatrix\n");
+        return;
+    }
+
+    GrTexture* texture = fFontCache->getTexture(this->maskFormat());
+    if (!texture) {
+        SkDebugf("Could not allocate backing texture for atlas\n");
+        return;
+    }
+
+    bool usesDistanceFields = this->usesDistanceFields();
+    GrMaskFormat maskFormat = this->maskFormat();
+    bool isLCD = this->isLCD();
+
+    SkAutoTUnref<const GrGeometryProcessor> gp;
+    if (usesDistanceFields) {
+        gp.reset(this->setupDfProcessor(this->viewMatrix(), fFilteredColor, this->color(),
+                                        texture));
+    } else {
+        GrTextureParams params(SkShader::kClamp_TileMode, GrTextureParams::kNone_FilterMode);
+        gp.reset(GrBitmapTextGeoProc::Create(this->color(),
+                                             texture,
+                                             params,
+                                             maskFormat,
+                                             localMatrix,
+                                             this->usesLocalCoords()));
+    }
+
+    FlushInfo flushInfo;
+    flushInfo.fGlyphsToFlush = 0;
+    size_t vertexStride = gp->getVertexStride();
+    SkASSERT(vertexStride == (usesDistanceFields ?
+                              GetVertexStrideDf(maskFormat, isLCD) :
+                              GetVertexStride(maskFormat)));
+
+    target->initDraw(gp, this->pipeline());
+
+    int glyphCount = this->numGlyphs();
+    const GrVertexBuffer* vertexBuffer;
+
+    void* vertices = target->makeVertexSpace(vertexStride,
+                                             glyphCount * kVerticesPerGlyph,
+                                             &vertexBuffer,
+                                             &flushInfo.fVertexOffset);
+    flushInfo.fVertexBuffer.reset(SkRef(vertexBuffer));
+    flushInfo.fIndexBuffer.reset(target->resourceProvider()->refQuadIndexBuffer());
+    if (!vertices || !flushInfo.fVertexBuffer) {
+        SkDebugf("Could not allocate vertices\n");
+        return;
+    }
+
+    unsigned char* currVertex = reinterpret_cast<unsigned char*>(vertices);
+
+    // We cache some values to avoid going to the glyphcache for the same fontScaler twice
+    // in a row
+    const SkDescriptor* desc = nullptr;
+    SkGlyphCache* cache = nullptr;
+    GrFontScaler* scaler = nullptr;
+    SkTypeface* typeface = nullptr;
+
+    for (int i = 0; i < fGeoCount; i++) {
+        const Geometry& args = fGeoData[i];
+        Blob* blob = args.fBlob;
+        Run& run = blob->fRuns[args.fRun];
+        TextInfo& info = run.fSubRunInfo[args.fSubRun];
+
+        uint64_t currentAtlasGen = fFontCache->atlasGeneration(maskFormat);
+
+        // Because the GrBatchFontCache may evict the strike a blob depends on using for
+        // generating its texture coords, we have to track whether or not the strike has
+        // been abandoned.  If it hasn't been abandoned, then we can use the GrGlyph*s as is
+        // otherwise we have to get the new strike, and use that to get the correct glyphs.
+        // Because we do not have the packed ids, and thus can't look up our glyphs in the
+        // new strike, we instead keep our ref to the old strike and use the packed ids from
+        // it.  These ids will still be valid as long as we hold the ref.  When we are done
+        // updating our cache of the GrGlyph*s, we drop our ref on the old strike
+        bool regenerateGlyphs = info.fStrike->isAbandoned();
+        bool regenerateTextureCoords = info.fAtlasGeneration != currentAtlasGen ||
+                                       regenerateGlyphs;
+        bool regenerateColors;
+        if (usesDistanceFields) {
+            regenerateColors = !isLCD && run.fColor != args.fColor;
+        } else {
+            regenerateColors = kA8_GrMaskFormat == maskFormat && run.fColor != args.fColor;
+        }
+        bool regeneratePositions = args.fTransX != 0.f || args.fTransY != 0.f;
+        int glyphCount = info.fGlyphEndIndex - info.fGlyphStartIndex;
+
+        uint32_t regenMaskBits = kNoRegen;
+        regenMaskBits |= regeneratePositions ? kRegenPos : 0;
+        regenMaskBits |= regenerateColors ? kRegenCol : 0;
+        regenMaskBits |= regenerateTextureCoords ? kRegenTex : 0;
+        regenMaskBits |= regenerateGlyphs ? kRegenGlyph : 0;
+        RegenMask regenMask = (RegenMask)regenMaskBits;
+
+        switch (regenMask) {
+            case kRegenPos: this->regenBlob<true, false, false, false>(REGEN_ARGS); break;
+            case kRegenCol: this->regenBlob<false, true, false, false>(REGEN_ARGS); break;
+            case kRegenTex: this->regenBlob<false, false, true, false>(REGEN_ARGS); break;
+            case kRegenGlyph: this->regenBlob<false, false, true, true>(REGEN_ARGS); break;
+
+            // combinations
+            case kRegenPosCol: this->regenBlob<true, true, false, false>(REGEN_ARGS); break;
+            case kRegenPosTex: this->regenBlob<true, false, true, false>(REGEN_ARGS); break;
+            case kRegenPosTexGlyph: this->regenBlob<true, false, true, true>(REGEN_ARGS); break;
+            case kRegenPosColTex: this->regenBlob<true, true, true, false>(REGEN_ARGS); break;
+            case kRegenPosColTexGlyph: this->regenBlob<true, true, true, true>(REGEN_ARGS); break;
+            case kRegenColTex: this->regenBlob<false, true, true, false>(REGEN_ARGS); break;
+            case kRegenColTexGlyph: this->regenBlob<false, true, true, true>(REGEN_ARGS); break;
+            case kNoRegen:
+                flushInfo.fGlyphsToFlush += glyphCount;
+
+                // set use tokens for all of the glyphs in our subrun.  This is only valid if we
+                // have a valid atlas generation
+                fFontCache->setUseTokenBulk(info.fBulkUseToken, target->currentToken(), maskFormat);
+                break;
+        }
+
+        // now copy all vertices
+        size_t byteCount = info.fVertexEndIndex - info.fVertexStartIndex;
+        memcpy(currVertex, blob->fVertices + info.fVertexStartIndex, byteCount);
+
+        currVertex += byteCount;
+    }
+
+    // Make sure to attach the last cache if applicable
+    if (cache) {
+        SkGlyphCache::AttachCache(cache);
+    }
+    this->flush(target, &flushInfo);
+}
+
+void GrAtlasTextBatch::flush(GrVertexBatch::Target* target, FlushInfo* flushInfo) const {
+    GrVertices vertices;
+    int maxGlyphsPerDraw = flushInfo->fIndexBuffer->maxQuads();
+    vertices.initInstanced(kTriangles_GrPrimitiveType, flushInfo->fVertexBuffer,
+                           flushInfo->fIndexBuffer, flushInfo->fVertexOffset,
+                           kVerticesPerGlyph, kIndicesPerGlyph, flushInfo->fGlyphsToFlush,
+                           maxGlyphsPerDraw);
+    target->draw(vertices);
+    flushInfo->fVertexOffset += kVerticesPerGlyph * flushInfo->fGlyphsToFlush;
+    flushInfo->fGlyphsToFlush = 0;
+}
+
+bool GrAtlasTextBatch::onCombineIfPossible(GrBatch* t, const GrCaps& caps) {
+    GrAtlasTextBatch* that = t->cast<GrAtlasTextBatch>();
+    if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *that->pipeline(),
+                                that->bounds(), caps)) {
+        return false;
+    }
+
+    if (fMaskType != that->fMaskType) {
+        return false;
+    }
+
+    if (!this->usesDistanceFields()) {
+        // TODO we can often batch across LCD text if we have dual source blending and don't
+        // have to use the blend constant
+        if (kGrayscaleCoverageMask_MaskType != fMaskType && this->color() != that->color()) {
+            return false;
+        }
+        if (this->usesLocalCoords() && !this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
+            return false;
+        }
+    } else {
+        if (!this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
+            return false;
+        }
+
+        if (fFilteredColor != that->fFilteredColor) {
+            return false;
+        }
+
+        if (fUseBGR != that->fUseBGR) {
+            return false;
+        }
+
+        // TODO see note above
+        if (kLCDDistanceField_MaskType == fMaskType && this->color() != that->color()) {
+            return false;
+        }
+    }
+
+    fBatch.fNumGlyphs += that->numGlyphs();
+
+    // Reallocate space for geo data if necessary and then import that's geo data.
+    int newGeoCount = that->fGeoCount + fGeoCount;
+    // We assume (and here enforce) that the allocation size is the smallest power of two that
+    // is greater than or equal to the number of geometries (and at least
+    // kMinGeometryAllocated).
+    int newAllocSize = GrNextPow2(newGeoCount);
+    int currAllocSize = SkTMax<int>(kMinGeometryAllocated, GrNextPow2(fGeoCount));
+
+    if (newGeoCount > currAllocSize) {
+        fGeoData.realloc(newAllocSize);
+    }
+
+    memcpy(&fGeoData[fGeoCount], that->fGeoData.get(), that->fGeoCount * sizeof(Geometry));
+    // We steal the ref on the blobs from the other TextBatch and set its count to 0 so that
+    // it doesn't try to unref them.
+#ifdef SK_DEBUG
+    for (int i = 0; i < that->fGeoCount; ++i) {
+        that->fGeoData.get()[i].fBlob = (Blob*)0x1;
+    }
+#endif
+    that->fGeoCount = 0;
+    fGeoCount = newGeoCount;
+
+    this->joinBounds(that->bounds());
+    return true;
+}
+
+// TODO just use class params
+// TODO trying to figure out why lcd is so whack
+GrGeometryProcessor* GrAtlasTextBatch::setupDfProcessor(const SkMatrix& viewMatrix,
+                                                        SkColor filteredColor,
+                                                        GrColor color, GrTexture* texture) const {
+    GrTextureParams params(SkShader::kClamp_TileMode, GrTextureParams::kBilerp_FilterMode);
+    bool isLCD = this->isLCD();
+    // set up any flags
+    uint32_t flags = viewMatrix.isSimilarity() ? kSimilarity_DistanceFieldEffectFlag : 0;
+
+    // see if we need to create a new effect
+    if (isLCD) {
+        flags |= kUseLCD_DistanceFieldEffectFlag;
+        flags |= viewMatrix.rectStaysRect() ? kRectToRect_DistanceFieldEffectFlag : 0;
+        flags |= fUseBGR ? kBGR_DistanceFieldEffectFlag : 0;
+
+        GrColor colorNoPreMul = skcolor_to_grcolor_nopremultiply(filteredColor);
+
+        float redCorrection =
+            (*fDistanceAdjustTable)[GrColorUnpackR(colorNoPreMul) >> kDistanceAdjustLumShift];
+        float greenCorrection =
+            (*fDistanceAdjustTable)[GrColorUnpackG(colorNoPreMul) >> kDistanceAdjustLumShift];
+        float blueCorrection =
+            (*fDistanceAdjustTable)[GrColorUnpackB(colorNoPreMul) >> kDistanceAdjustLumShift];
+        GrDistanceFieldLCDTextGeoProc::DistanceAdjust widthAdjust =
+            GrDistanceFieldLCDTextGeoProc::DistanceAdjust::Make(redCorrection,
+                                                                greenCorrection,
+                                                                blueCorrection);
+
+        return GrDistanceFieldLCDTextGeoProc::Create(color,
+                                                     viewMatrix,
+                                                     texture,
+                                                     params,
+                                                     widthAdjust,
+                                                     flags,
+                                                     this->usesLocalCoords());
+    } else {
+        flags |= kColorAttr_DistanceFieldEffectFlag;
+#ifdef SK_GAMMA_APPLY_TO_A8
+        U8CPU lum = SkColorSpaceLuminance::computeLuminance(SK_GAMMA_EXPONENT, filteredColor);
+        float correction = (*fDistanceAdjustTable)[lum >> kDistanceAdjustLumShift];
+        return GrDistanceFieldA8TextGeoProc::Create(color,
+                                                    viewMatrix,
+                                                    texture,
+                                                    params,
+                                                    correction,
+                                                    flags,
+                                                    this->usesLocalCoords());
+#else
+        return GrDistanceFieldA8TextGeoProc::Create(color,
+                                                    viewMatrix,
+                                                    texture,
+                                                    params,
+                                                    flags,
+                                                    this->usesLocalCoords());
+#endif
+    }
+
+}
diff --git a/gfx/skia/skia/src/gpu/batches/GrAtlasTextBatch.h b/gfx/skia/skia/src/gpu/batches/GrAtlasTextBatch.h
new file mode 100644
index 000000000000..65fd07d7bb1d
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrAtlasTextBatch.h
@@ -0,0 +1,229 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrAtlasTextBatch_DEFINED
+#define GrAtlasTextBatch_DEFINED
+
+#include "batches/GrVertexBatch.h"
+
+#include "GrAtlasTextContext.h"
+
+class GrAtlasTextBatch : public GrVertexBatch {
+public:
+    DEFINE_BATCH_CLASS_ID
+    static const size_t kLCDTextVASize = sizeof(SkPoint) + sizeof(SkIPoint16);
+
+    // position + local coord
+    static const size_t kColorTextVASize = sizeof(SkPoint) + sizeof(SkIPoint16);
+    static const size_t kGrayTextVASize = sizeof(SkPoint) + sizeof(GrColor) + sizeof(SkIPoint16);
+    static const int kVerticesPerGlyph = 4;
+    static const int kIndicesPerGlyph = 6;
+
+    typedef GrAtlasTextContext::DistanceAdjustTable DistanceAdjustTable;
+    typedef GrAtlasTextBlob Blob;
+    typedef Blob::Run Run;
+    typedef Run::SubRunInfo TextInfo;
+    struct Geometry {
+        Blob* fBlob;
+        int fRun;
+        int fSubRun;
+        GrColor fColor;
+        SkScalar fTransX;
+        SkScalar fTransY;
+    };
+
+    static GrAtlasTextBatch* CreateBitmap(GrMaskFormat maskFormat, int glyphCount,
+                                          GrBatchFontCache* fontCache) {
+        GrAtlasTextBatch* batch = new GrAtlasTextBatch;
+
+        batch->fFontCache = fontCache;
+        switch (maskFormat) {
+            case kA8_GrMaskFormat:
+                batch->fMaskType = kGrayscaleCoverageMask_MaskType;
+                break;
+            case kA565_GrMaskFormat:
+                batch->fMaskType = kLCDCoverageMask_MaskType;
+                break;
+            case kARGB_GrMaskFormat:
+                batch->fMaskType = kColorBitmapMask_MaskType;
+                break;
+        }
+        batch->fBatch.fNumGlyphs = glyphCount;
+        batch->fGeoCount = 1;
+        batch->fFilteredColor = 0;
+        batch->fFontCache = fontCache;
+        batch->fUseBGR = false;
+        return batch;
+    }
+
+    static GrAtlasTextBatch* CreateDistanceField(int glyphCount, GrBatchFontCache* fontCache,
+                                                 const DistanceAdjustTable* distanceAdjustTable,
+                                                 SkColor filteredColor, bool isLCD,
+                                                 bool useBGR) {
+        GrAtlasTextBatch* batch = new GrAtlasTextBatch;
+
+        batch->fFontCache = fontCache;
+        batch->fMaskType = isLCD ? kLCDDistanceField_MaskType : kGrayscaleDistanceField_MaskType;
+        batch->fDistanceAdjustTable.reset(SkRef(distanceAdjustTable));
+        batch->fFilteredColor = filteredColor;
+        batch->fUseBGR = useBGR;
+        batch->fBatch.fNumGlyphs = glyphCount;
+        batch->fGeoCount = 1;
+        return batch;
+    }
+
+    // to avoid even the initial copy of the struct, we have a getter for the first item which
+    // is used to seed the batch with its initial geometry.  After seeding, the client should call
+    // init() so the Batch can initialize itself
+    Geometry& geometry() { return fGeoData[0]; }
+
+    void init() {
+        const Geometry& geo = fGeoData[0];
+        fBatch.fColor = geo.fColor;
+        fBatch.fViewMatrix = geo.fBlob->fViewMatrix;
+
+        // We don't yet position distance field text on the cpu, so we have to map the vertex bounds
+        // into device space
+        const Run& run = geo.fBlob->fRuns[geo.fRun];
+        if (run.fSubRunInfo[geo.fSubRun].fDrawAsDistanceFields) {
+            SkRect bounds = run.fVertexBounds;
+            fBatch.fViewMatrix.mapRect(&bounds);
+            this->setBounds(bounds);
+        } else {
+            this->setBounds(run.fVertexBounds);
+        }
+    }
+
+    const char* name() const override { return "TextBatch"; }
+
+    SkString dumpInfo() const override;
+
+    static size_t GetVertexStride(GrMaskFormat maskFormat) {
+        switch (maskFormat) {
+            case kA8_GrMaskFormat:
+                return kGrayTextVASize;
+            case kARGB_GrMaskFormat:
+                return kColorTextVASize;
+            default:
+                return kLCDTextVASize;
+        }
+    }
+
+    static size_t GetVertexStrideDf(GrMaskFormat maskFormat, bool useLCDText) {
+        SkASSERT(maskFormat == kA8_GrMaskFormat);
+        if (useLCDText) {
+            return kLCDTextVASize;
+        } else {
+            return kGrayTextVASize;
+        }
+    }
+
+protected:
+    void computePipelineOptimizations(GrInitInvariantOutput* color, 
+                                      GrInitInvariantOutput* coverage,
+                                      GrBatchToXPOverrides* overrides) const override;
+
+
+private:
+    void initBatchTracker(const GrXPOverridesForBatch& overrides) override;
+
+    struct FlushInfo {
+        SkAutoTUnref<const GrVertexBuffer> fVertexBuffer;
+        SkAutoTUnref<const GrIndexBuffer> fIndexBuffer;
+        int fGlyphsToFlush;
+        int fVertexOffset;
+    };
+
+    void onPrepareDraws(Target* target) const override;
+
+    GrAtlasTextBatch() : INHERITED(ClassID()) {} // initialized in factory functions.
+
+    ~GrAtlasTextBatch() {
+        for (int i = 0; i < fGeoCount; i++) {
+            fGeoData[i].fBlob->unref();
+        }
+    }
+
+    GrMaskFormat maskFormat() const {
+        switch (fMaskType) {
+            case kLCDCoverageMask_MaskType:
+                return kA565_GrMaskFormat;
+            case kColorBitmapMask_MaskType:
+                return kARGB_GrMaskFormat;
+            case kGrayscaleCoverageMask_MaskType:
+            case kGrayscaleDistanceField_MaskType:
+            case kLCDDistanceField_MaskType:
+                return kA8_GrMaskFormat;
+        }
+        return kA8_GrMaskFormat; // suppress warning
+    }
+
+    bool usesDistanceFields() const {
+        return kGrayscaleDistanceField_MaskType == fMaskType ||
+               kLCDDistanceField_MaskType == fMaskType;
+    }
+
+    bool isLCD() const {
+        return kLCDCoverageMask_MaskType == fMaskType ||
+               kLCDDistanceField_MaskType == fMaskType;
+    }
+
+    template <bool regenTexCoords, bool regenPos, bool regenCol, bool regenGlyphs>
+    inline void regenBlob(Target* target, FlushInfo* flushInfo, Blob* blob, Run* run,
+                          TextInfo* info, SkGlyphCache** cache,
+                          SkTypeface** typeface, GrFontScaler** scaler, const SkDescriptor** desc,
+                          const GrGeometryProcessor* gp, int glyphCount, size_t vertexStride,
+                          GrColor color, SkScalar transX, SkScalar transY) const;
+
+    inline void flush(GrVertexBatch::Target* target, FlushInfo* flushInfo) const;
+
+    GrColor color() const { return fBatch.fColor; }
+    const SkMatrix& viewMatrix() const { return fBatch.fViewMatrix; }
+    bool usesLocalCoords() const { return fBatch.fUsesLocalCoords; }
+    int numGlyphs() const { return fBatch.fNumGlyphs; }
+
+    bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override;
+
+    // TODO just use class params
+    // TODO trying to figure out why lcd is so whack
+    GrGeometryProcessor* setupDfProcessor(const SkMatrix& viewMatrix, SkColor filteredColor,
+                                          GrColor color, GrTexture* texture) const;
+
+    struct BatchTracker {
+        GrColor fColor;
+        SkMatrix fViewMatrix;
+        bool fUsesLocalCoords;
+        bool fColorIgnored;
+        bool fCoverageIgnored;
+        int fNumGlyphs;
+    };
+
+    BatchTracker fBatch;
+    // The minimum number of Geometry we will try to allocate.
+    enum { kMinGeometryAllocated = 4 };
+    SkAutoSTMalloc<kMinGeometryAllocated, Geometry> fGeoData;
+    int fGeoCount;
+
+    enum MaskType {
+        kGrayscaleCoverageMask_MaskType,
+        kLCDCoverageMask_MaskType,
+        kColorBitmapMask_MaskType,
+        kGrayscaleDistanceField_MaskType,
+        kLCDDistanceField_MaskType,
+    } fMaskType;
+    bool fUseBGR; // fold this into the enum?
+
+    GrBatchFontCache* fFontCache;
+
+    // Distance field properties
+    SkAutoTUnref<const DistanceAdjustTable> fDistanceAdjustTable;
+    SkColor fFilteredColor;
+
+    typedef GrVertexBatch INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrBatch.cpp b/gfx/skia/skia/src/gpu/batches/GrBatch.cpp
new file mode 100644
index 000000000000..19c19ffcf1d0
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrBatch.cpp
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrBatch.h"
+
+#include "GrMemoryPool.h"
+#include "SkSpinlock.h"
+
+// TODO I noticed a small benefit to using a larger exclusive pool for batches.  Its very small,
+// but seems to be mostly consistent.  There is a lot in flux right now, but we should really
+// revisit this when batch is everywhere
+
+
+// We use a global pool protected by a mutex(spinlock). Chrome may use the same GrContext on
+// different threads. The GrContext is not used concurrently on different threads and there is a
+// memory barrier between accesses of a context on different threads. Also, there may be multiple
+// GrContexts and those contexts may be in use concurrently on different threads.
+namespace {
+SK_DECLARE_STATIC_SPINLOCK(gBatchSpinlock);
+class MemoryPoolAccessor {
+public:
+    MemoryPoolAccessor() { gBatchSpinlock.acquire(); }
+
+    ~MemoryPoolAccessor() { gBatchSpinlock.release(); }
+
+    GrMemoryPool* pool() const {
+        static GrMemoryPool gPool(16384, 16384);
+        return &gPool;
+    }
+};
+}
+
+int32_t GrBatch::gCurrBatchClassID = GrBatch::kIllegalBatchID;
+
+GrBATCH_SPEW(int32_t GrBatch::gCurrBatchUniqueID = GrBatch::kIllegalBatchID;)
+
+void* GrBatch::operator new(size_t size) {
+    return MemoryPoolAccessor().pool()->allocate(size);
+}
+
+void GrBatch::operator delete(void* target) {
+    return MemoryPoolAccessor().pool()->release(target);
+}
+
+GrBatch::GrBatch(uint32_t classID)
+    : fClassID(classID)
+#if GR_BATCH_SPEW
+    , fUniqueID(GenBatchID())
+#endif
+{
+    SkDEBUGCODE(fUsed = false;)
+}
+
+GrBatch::~GrBatch() {}
diff --git a/gfx/skia/skia/src/gpu/batches/GrBatch.h b/gfx/skia/skia/src/gpu/batches/GrBatch.h
new file mode 100644
index 000000000000..03e396a29c2f
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrBatch.h
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrBatch_DEFINED
+#define GrBatch_DEFINED
+
+#include <new>
+#include "GrNonAtomicRef.h"
+
+#include "SkRect.h"
+#include "SkString.h"
+
+class GrCaps;
+class GrBatchFlushState;
+
+/**
+ * GrBatch is the base class for all Ganesh deferred geometry generators.  To facilitate
+ * reorderable batching, Ganesh does not generate geometry inline with draw calls.  Instead, it
+ * captures the arguments to the draw and then generates the geometry on demand.  This gives GrBatch
+ * subclasses complete freedom to decide how / what they can batch.
+ *
+ * Batches are created when GrContext processes a draw call. Batches of the same  subclass may be
+ * merged using combineIfPossible. When two batches merge, one takes on the union of the data
+ * and the other is left empty. The merged batch becomes responsible for drawing the data from both
+ * the original batches.
+ *
+ * If there are any possible optimizations which might require knowing more about the full state of
+ * the draw, ie whether or not the GrBatch is allowed to tweak alpha for coverage, then this
+ * information will be communicated to the GrBatch prior to geometry generation.
+ *
+ * The bounds of the batch must contain all the vertices in device space *irrespective* of the clip.
+ * The bounds are used in determining which clip elements must be applied and thus the bounds cannot
+ * in turn depend upon the clip.
+ */
+#define GR_BATCH_SPEW 0
+#if GR_BATCH_SPEW
+    #define GrBATCH_INFO(...) SkDebugf(__VA_ARGS__)
+    #define GrBATCH_SPEW(code) code
+#else
+    #define GrBATCH_SPEW(code)
+    #define GrBATCH_INFO(...)
+#endif
+
+// A helper macro to generate a class static id
+#define DEFINE_BATCH_CLASS_ID \
+    static uint32_t ClassID() { \
+        static uint32_t kClassID = GenBatchClassID(); \
+        return kClassID; \
+    }
+
+class GrBatch : public GrNonAtomicRef {
+public:
+    GrBatch(uint32_t classID);
+    ~GrBatch() override;
+
+    virtual const char* name() const = 0;
+
+    bool combineIfPossible(GrBatch* that, const GrCaps& caps) {
+        if (this->classID() != that->classID()) {
+            return false;
+        }
+
+        return this->onCombineIfPossible(that, caps);
+    }
+
+    const SkRect& bounds() const { return fBounds; }
+
+    void* operator new(size_t size);
+    void operator delete(void* target);
+
+    void* operator new(size_t size, void* placement) {
+        return ::operator new(size, placement);
+    }
+    void operator delete(void* target, void* placement) {
+        ::operator delete(target, placement);
+    }
+
+    /**
+     * Helper for safely down-casting to a GrBatch subclass
+     */
+    template <typename T> const T& cast() const {
+        SkASSERT(T::ClassID() == this->classID());
+        return *static_cast<const T*>(this);
+    }
+
+    template <typename T> T* cast() {
+        SkASSERT(T::ClassID() == this->classID());
+        return static_cast<T*>(this);
+    }
+
+    uint32_t classID() const { SkASSERT(kIllegalBatchID != fClassID); return fClassID; }
+
+#if GR_BATCH_SPEW
+    uint32_t uniqueID() const { return fUniqueID; }
+#endif
+    SkDEBUGCODE(bool isUsed() const { return fUsed; })
+
+    /** Called prior to drawing. The batch should perform any resource creation necessary to
+        to quickly issue its draw when draw is called. */
+    void prepare(GrBatchFlushState* state) { this->onPrepare(state); }
+
+    /** Issues the batches commands to GrGpu. */
+    void draw(GrBatchFlushState* state) { this->onDraw(state); }
+
+    /** Used to block batching across render target changes. Remove this once we store
+        GrBatches for different RTs in different targets. */
+    virtual uint32_t renderTargetUniqueID() const = 0;
+
+    /** Used for spewing information about batches when debugging. */
+    virtual SkString dumpInfo() const = 0;
+
+protected:
+    // NOTE, compute some bounds, even if extremely conservative.  Do *NOT* setLargest on the bounds
+    // rect because we outset it for dst copy textures
+    void setBounds(const SkRect& newBounds) { fBounds = newBounds; }
+
+    void joinBounds(const SkRect& otherBounds) {
+        return fBounds.joinPossiblyEmptyRect(otherBounds);
+    }
+
+    static uint32_t GenBatchClassID() { return GenID(&gCurrBatchClassID); }
+
+    SkRect                              fBounds;
+
+private:
+    virtual bool onCombineIfPossible(GrBatch*, const GrCaps& caps) = 0;
+
+    virtual void onPrepare(GrBatchFlushState*) = 0;
+    virtual void onDraw(GrBatchFlushState*) = 0;
+
+    static uint32_t GenID(int32_t* idCounter) {
+        // The atomic inc returns the old value not the incremented value. So we add
+        // 1 to the returned value.
+        uint32_t id = static_cast<uint32_t>(sk_atomic_inc(idCounter)) + 1;
+        if (!id) {
+            SkFAIL("This should never wrap as it should only be called once for each GrBatch "
+                   "subclass.");
+        }
+        return id;
+    }
+
+    enum {
+        kIllegalBatchID = 0,
+    };
+
+    SkDEBUGCODE(bool                    fUsed;)
+    const uint32_t                      fClassID;
+#if GR_BATCH_SPEW
+    static uint32_t GenBatchID() { return GenID(&gCurrBatchUniqueID); }
+    const uint32_t                      fUniqueID;
+    static int32_t                      gCurrBatchUniqueID;
+#endif
+    static int32_t                      gCurrBatchClassID;
+    typedef GrNonAtomicRef INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrClearBatch.h b/gfx/skia/skia/src/gpu/batches/GrClearBatch.h
new file mode 100644
index 000000000000..944485ca7eb9
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrClearBatch.h
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrClearBatch_DEFINED
+#define GrClearBatch_DEFINED
+
+#include "GrBatch.h"
+#include "GrBatchFlushState.h"
+#include "GrGpu.h"
+#include "GrRenderTarget.h"
+
+class GrClearBatch final : public GrBatch {
+public:
+    DEFINE_BATCH_CLASS_ID
+
+    GrClearBatch(const SkIRect& rect,  GrColor color, GrRenderTarget* rt)
+        : INHERITED(ClassID())
+        , fRect(rect)
+        , fColor(color)
+        , fRenderTarget(rt) {
+        fBounds = SkRect::Make(rect);
+    }
+
+    const char* name() const override { return "Clear"; }
+
+    uint32_t renderTargetUniqueID() const override { return fRenderTarget.get()->getUniqueID(); }
+
+    SkString dumpInfo() const override {
+        SkString string;
+        string.printf("Color: 0x%08x, Rect [L: %d, T: %d, R: %d, B: %d], RT: %d",
+                      fColor, fRect.fLeft, fRect.fTop, fRect.fRight, fRect.fBottom,
+                      fRenderTarget.get()->getUniqueID());
+        return string;
+    }
+
+private:
+    bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override {
+        // We could combine clears. TBD how much complexity to put here.
+        return false;
+    }
+
+    void onPrepare(GrBatchFlushState*) override {}
+
+    void onDraw(GrBatchFlushState* state) override {
+        state->gpu()->clear(fRect, fColor, fRenderTarget.get());
+    }
+
+    SkIRect                                                 fRect;
+    GrColor                                                 fColor;
+    GrPendingIOResource<GrRenderTarget, kWrite_GrIOType>    fRenderTarget;
+
+    typedef GrBatch INHERITED;
+};
+
+class GrClearStencilClipBatch final : public GrBatch {
+public:
+    DEFINE_BATCH_CLASS_ID
+
+    GrClearStencilClipBatch(const SkIRect& rect, bool insideClip, GrRenderTarget* rt)
+        : INHERITED(ClassID())
+        , fRect(rect)
+        , fInsideClip(insideClip)
+        , fRenderTarget(rt) {
+        fBounds = SkRect::Make(rect);
+    }
+
+    const char* name() const override { return "ClearStencilClip"; }
+
+    uint32_t renderTargetUniqueID() const override { return fRenderTarget.get()->getUniqueID(); }
+
+    SkString dumpInfo() const override {
+        SkString string;
+        string.printf("Rect [L: %d, T: %d, R: %d, B: %d], IC: %d, RT: 0x%p",
+                      fRect.fLeft, fRect.fTop, fRect.fRight, fRect.fBottom, fInsideClip,
+                      fRenderTarget.get());
+        return string;
+    }
+
+private:
+    bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override { return false; }
+
+    void onPrepare(GrBatchFlushState*) override {}
+
+    void onDraw(GrBatchFlushState* state) override {
+        state->gpu()->clearStencilClip(fRect, fInsideClip, fRenderTarget.get());
+    }
+
+    SkIRect                                                 fRect;
+    bool                                                    fInsideClip;
+    GrPendingIOResource<GrRenderTarget, kWrite_GrIOType>    fRenderTarget;
+
+    typedef GrBatch INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrCopySurfaceBatch.cpp b/gfx/skia/skia/src/gpu/batches/GrCopySurfaceBatch.cpp
new file mode 100644
index 000000000000..098f7c7704c0
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrCopySurfaceBatch.cpp
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+
+#include "GrCopySurfaceBatch.h"
+
+// returns true if the read/written rect intersects the src/dst and false if not.
+static bool clip_srcrect_and_dstpoint(const GrSurface* dst,
+                                      const GrSurface* src,
+                                      const SkIRect& srcRect,
+                                      const SkIPoint& dstPoint,
+                                      SkIRect* clippedSrcRect,
+                                      SkIPoint* clippedDstPoint) {
+    *clippedSrcRect = srcRect;
+    *clippedDstPoint = dstPoint;
+
+    // clip the left edge to src and dst bounds, adjusting dstPoint if necessary
+    if (clippedSrcRect->fLeft < 0) {
+        clippedDstPoint->fX -= clippedSrcRect->fLeft;
+        clippedSrcRect->fLeft = 0;
+    }
+    if (clippedDstPoint->fX < 0) {
+        clippedSrcRect->fLeft -= clippedDstPoint->fX;
+        clippedDstPoint->fX = 0;
+    }
+
+    // clip the top edge to src and dst bounds, adjusting dstPoint if necessary
+    if (clippedSrcRect->fTop < 0) {
+        clippedDstPoint->fY -= clippedSrcRect->fTop;
+        clippedSrcRect->fTop = 0;
+    }
+    if (clippedDstPoint->fY < 0) {
+        clippedSrcRect->fTop -= clippedDstPoint->fY;
+        clippedDstPoint->fY = 0;
+    }
+
+    // clip the right edge to the src and dst bounds.
+    if (clippedSrcRect->fRight > src->width()) {
+        clippedSrcRect->fRight = src->width();
+    }
+    if (clippedDstPoint->fX + clippedSrcRect->width() > dst->width()) {
+        clippedSrcRect->fRight = clippedSrcRect->fLeft + dst->width() - clippedDstPoint->fX;
+    }
+
+    // clip the bottom edge to the src and dst bounds.
+    if (clippedSrcRect->fBottom > src->height()) {
+        clippedSrcRect->fBottom = src->height();
+    }
+    if (clippedDstPoint->fY + clippedSrcRect->height() > dst->height()) {
+        clippedSrcRect->fBottom = clippedSrcRect->fTop + dst->height() - clippedDstPoint->fY;
+    }
+
+    // The above clipping steps may have inverted the rect if it didn't intersect either the src or
+    // dst bounds.
+    return !clippedSrcRect->isEmpty();
+}
+
+GrBatch* GrCopySurfaceBatch::Create(GrSurface* dst, GrSurface* src, const SkIRect& srcRect,
+                                    const SkIPoint& dstPoint) {
+    SkASSERT(dst);
+    SkASSERT(src);
+
+    SkIRect clippedSrcRect;
+    SkIPoint clippedDstPoint;
+    // If the rect is outside the src or dst then we've already succeeded.
+    if (!clip_srcrect_and_dstpoint(dst,
+                                    src,
+                                    srcRect,
+                                    dstPoint,
+                                    &clippedSrcRect,
+                                    &clippedDstPoint)) {
+        return nullptr;
+    }
+    return new GrCopySurfaceBatch(dst, src, clippedSrcRect, clippedDstPoint);
+}
diff --git a/gfx/skia/skia/src/gpu/batches/GrCopySurfaceBatch.h b/gfx/skia/skia/src/gpu/batches/GrCopySurfaceBatch.h
new file mode 100644
index 000000000000..ed5e77f5b061
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrCopySurfaceBatch.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrCopySurfaceBatch_DEFINED
+#define GrCopySurfaceBatch_DEFINED
+
+#include "GrBatch.h"
+#include "GrBatchFlushState.h"
+#include "GrGpu.h"
+#include "GrRenderTarget.h"
+
+class GrCopySurfaceBatch final : public GrBatch {
+public:
+    DEFINE_BATCH_CLASS_ID
+
+    static GrBatch* Create(GrSurface* dst, GrSurface* src, const SkIRect& srcRect,
+                           const SkIPoint& dstPoint);
+
+    const char* name() const override { return "CopySurface"; }
+
+    uint32_t renderTargetUniqueID() const override {
+        GrRenderTarget* rt = fDst.get()->asRenderTarget();
+        return rt ? rt->getUniqueID() : 0;
+    }
+
+    SkString dumpInfo() const override {
+        SkString string;
+        string.printf("SRC: 0x%p, DST: 0x%p, SRECT: [L: %d, T: %d, R: %d, B: %d], "
+                      "DPT:[X: %d, Y: %d]",
+                      fDst.get(), fSrc.get(), fSrcRect.fLeft, fSrcRect.fTop, fSrcRect.fRight,
+                      fSrcRect.fBottom, fDstPoint.fX, fDstPoint.fY);
+        return string;
+    }
+
+private:
+    GrCopySurfaceBatch(GrSurface* dst, GrSurface* src, const SkIRect& srcRect,
+                       const SkIPoint& dstPoint)
+        : INHERITED(ClassID())
+        , fDst(dst)
+        , fSrc(src)
+        , fSrcRect(srcRect)
+        , fDstPoint(dstPoint) {
+        fBounds = SkRect::MakeXYWH(SkIntToScalar(dstPoint.fX), SkIntToScalar(dstPoint.fY),
+                                   SkIntToScalar(srcRect.width()), SkIntToScalar(srcRect.height()));
+    }
+
+    bool onCombineIfPossible(GrBatch* that, const GrCaps& caps) override { return false; }
+
+    void onPrepare(GrBatchFlushState*) override {}
+
+    void onDraw(GrBatchFlushState* state) override {
+        state->gpu()->copySurface(fDst.get(), fSrc.get(), fSrcRect, fDstPoint);
+    }
+
+    GrPendingIOResource<GrSurface, kWrite_GrIOType> fDst;
+    GrPendingIOResource<GrSurface, kRead_GrIOType>  fSrc;
+    SkIRect                                         fSrcRect;
+    SkIPoint                                        fDstPoint;
+
+    typedef GrBatch INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrDashLinePathRenderer.cpp b/gfx/skia/skia/src/gpu/batches/GrDashLinePathRenderer.cpp
new file mode 100644
index 000000000000..e26f5d762723
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrDashLinePathRenderer.cpp
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrDashLinePathRenderer.h"
+
+#include "GrGpu.h"
+#include "effects/GrDashingEffect.h"
+
+bool GrDashLinePathRenderer::onCanDrawPath(const CanDrawPathArgs& args) const {
+    SkPoint pts[2];
+    if (args.fStroke->isDashed() && args.fPath->isLine(pts)) {
+        return GrDashingEffect::CanDrawDashLine(pts, *args.fStroke, *args.fViewMatrix);
+    }
+    return false;
+}
+
+bool GrDashLinePathRenderer::onDrawPath(const DrawPathArgs& args) {
+    SkPoint pts[2];
+    SkAssertResult(args.fPath->isLine(pts));
+    return GrDashingEffect::DrawDashLine(args.fTarget, *args.fPipelineBuilder, args.fColor,
+                                         *args.fViewMatrix, pts, args.fAntiAlias, *args.fStroke);
+}
diff --git a/gfx/skia/skia/src/gpu/batches/GrDashLinePathRenderer.h b/gfx/skia/skia/src/gpu/batches/GrDashLinePathRenderer.h
new file mode 100644
index 000000000000..f21c73b688fa
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrDashLinePathRenderer.h
@@ -0,0 +1,29 @@
+
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrDashLinePathRenderer_DEFINED
+#define GrDashLinePathRenderer_DEFINED
+
+#include "GrPathRenderer.h"
+
+class GrDashLinePathRenderer : public GrPathRenderer {
+private:
+    bool onCanDrawPath(const CanDrawPathArgs&) const override;
+
+    StencilSupport onGetStencilSupport(const SkPath&, const GrStrokeInfo&) const override {
+        return kNoSupport_StencilSupport;
+    }
+
+    bool onDrawPath(const DrawPathArgs&) override;
+
+    SkAutoTUnref<GrGpu> fGpu;
+    typedef GrPathRenderer INHERITED;
+};
+
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrDefaultPathRenderer.cpp b/gfx/skia/skia/src/gpu/batches/GrDefaultPathRenderer.cpp
new file mode 100644
index 000000000000..c6ca1cafc771
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrDefaultPathRenderer.cpp
@@ -0,0 +1,773 @@
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrDefaultPathRenderer.h"
+
+#include "GrBatchFlushState.h"
+#include "GrBatchTest.h"
+#include "GrContext.h"
+#include "GrDefaultGeoProcFactory.h"
+#include "GrPathUtils.h"
+#include "GrPipelineBuilder.h"
+#include "GrVertices.h"
+#include "SkGeometry.h"
+#include "SkString.h"
+#include "SkStrokeRec.h"
+#include "SkTLazy.h"
+#include "SkTraceEvent.h"
+
+#include "batches/GrVertexBatch.h"
+
+GrDefaultPathRenderer::GrDefaultPathRenderer(bool separateStencilSupport,
+                                             bool stencilWrapOpsSupport)
+    : fSeparateStencil(separateStencilSupport)
+    , fStencilWrapOps(stencilWrapOpsSupport) {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Stencil rules for paths
+
+////// Even/Odd
+
+GR_STATIC_CONST_SAME_STENCIL(gEOStencilPass,
+    kInvert_StencilOp,
+    kKeep_StencilOp,
+    kAlwaysIfInClip_StencilFunc,
+    0xffff,
+    0xffff,
+    0xffff);
+
+// ok not to check clip b/c stencil pass only wrote inside clip
+GR_STATIC_CONST_SAME_STENCIL(gEOColorPass,
+    kZero_StencilOp,
+    kZero_StencilOp,
+    kNotEqual_StencilFunc,
+    0xffff,
+    0x0000,
+    0xffff);
+
+// have to check clip b/c outside clip will always be zero.
+GR_STATIC_CONST_SAME_STENCIL(gInvEOColorPass,
+    kZero_StencilOp,
+    kZero_StencilOp,
+    kEqualIfInClip_StencilFunc,
+    0xffff,
+    0x0000,
+    0xffff);
+
+////// Winding
+
+// when we have separate stencil we increment front faces / decrement back faces
+// when we don't have wrap incr and decr we use the stencil test to simulate
+// them.
+
+GR_STATIC_CONST_STENCIL(gWindStencilSeparateWithWrap,
+    kIncWrap_StencilOp,             kDecWrap_StencilOp,
+    kKeep_StencilOp,                kKeep_StencilOp,
+    kAlwaysIfInClip_StencilFunc,    kAlwaysIfInClip_StencilFunc,
+    0xffff,                         0xffff,
+    0xffff,                         0xffff,
+    0xffff,                         0xffff);
+
+// if inc'ing the max value, invert to make 0
+// if dec'ing zero invert to make all ones.
+// we can't avoid touching the stencil on both passing and
+// failing, so we can't resctrict ourselves to the clip.
+GR_STATIC_CONST_STENCIL(gWindStencilSeparateNoWrap,
+    kInvert_StencilOp,              kInvert_StencilOp,
+    kIncClamp_StencilOp,            kDecClamp_StencilOp,
+    kEqual_StencilFunc,             kEqual_StencilFunc,
+    0xffff,                         0xffff,
+    0xffff,                         0x0000,
+    0xffff,                         0xffff);
+
+// When there are no separate faces we do two passes to setup the winding rule
+// stencil. First we draw the front faces and inc, then we draw the back faces
+// and dec. These are same as the above two split into the incrementing and
+// decrementing passes.
+GR_STATIC_CONST_SAME_STENCIL(gWindSingleStencilWithWrapInc,
+    kIncWrap_StencilOp,
+    kKeep_StencilOp,
+    kAlwaysIfInClip_StencilFunc,
+    0xffff,
+    0xffff,
+    0xffff);
+
+GR_STATIC_CONST_SAME_STENCIL(gWindSingleStencilWithWrapDec,
+    kDecWrap_StencilOp,
+    kKeep_StencilOp,
+    kAlwaysIfInClip_StencilFunc,
+    0xffff,
+    0xffff,
+    0xffff);
+
+GR_STATIC_CONST_SAME_STENCIL(gWindSingleStencilNoWrapInc,
+    kInvert_StencilOp,
+    kIncClamp_StencilOp,
+    kEqual_StencilFunc,
+    0xffff,
+    0xffff,
+    0xffff);
+
+GR_STATIC_CONST_SAME_STENCIL(gWindSingleStencilNoWrapDec,
+    kInvert_StencilOp,
+    kDecClamp_StencilOp,
+    kEqual_StencilFunc,
+    0xffff,
+    0x0000,
+    0xffff);
+
+// Color passes are the same whether we use the two-sided stencil or two passes
+
+GR_STATIC_CONST_SAME_STENCIL(gWindColorPass,
+    kZero_StencilOp,
+    kZero_StencilOp,
+    kNonZeroIfInClip_StencilFunc,
+    0xffff,
+    0x0000,
+    0xffff);
+
+GR_STATIC_CONST_SAME_STENCIL(gInvWindColorPass,
+    kZero_StencilOp,
+    kZero_StencilOp,
+    kEqualIfInClip_StencilFunc,
+    0xffff,
+    0x0000,
+    0xffff);
+
+////// Normal render to stencil
+
+// Sometimes the default path renderer can draw a path directly to the stencil
+// buffer without having to first resolve the interior / exterior.
+GR_STATIC_CONST_SAME_STENCIL(gDirectToStencil,
+    kZero_StencilOp,
+    kIncClamp_StencilOp,
+    kAlwaysIfInClip_StencilFunc,
+    0xffff,
+    0x0000,
+    0xffff);
+
+////////////////////////////////////////////////////////////////////////////////
+// Helpers for drawPath
+
+#define STENCIL_OFF     0   // Always disable stencil (even when needed)
+
+static inline bool single_pass_path(const SkPath& path, const SkStrokeRec& stroke) {
+#if STENCIL_OFF
+    return true;
+#else
+    if (!stroke.isHairlineStyle() && !path.isInverseFillType()) {
+        return path.isConvex();
+    }
+    return false;
+#endif
+}
+
+GrPathRenderer::StencilSupport
+GrDefaultPathRenderer::onGetStencilSupport(const SkPath& path, const GrStrokeInfo& stroke) const {
+    if (single_pass_path(path, stroke)) {
+        return GrPathRenderer::kNoRestriction_StencilSupport;
+    } else {
+        return GrPathRenderer::kStencilOnly_StencilSupport;
+    }
+}
+
+static inline void append_countour_edge_indices(bool hairLine,
+                                                uint16_t fanCenterIdx,
+                                                uint16_t edgeV0Idx,
+                                                uint16_t** indices) {
+    // when drawing lines we're appending line segments along
+    // the contour. When applying the other fill rules we're
+    // drawing triangle fans around fanCenterIdx.
+    if (!hairLine) {
+        *((*indices)++) = fanCenterIdx;
+    }
+    *((*indices)++) = edgeV0Idx;
+    *((*indices)++) = edgeV0Idx + 1;
+}
+
+static inline void add_quad(SkPoint** vert, const SkPoint* base, const SkPoint pts[],
+                            SkScalar srcSpaceTolSqd, SkScalar srcSpaceTol, bool indexed,
+                            bool isHairline, uint16_t subpathIdxStart, int offset, uint16_t** idx) {
+    // first pt of quad is the pt we ended on in previous step
+    uint16_t firstQPtIdx = (uint16_t)(*vert - base) - 1 + offset;
+    uint16_t numPts =  (uint16_t)
+        GrPathUtils::generateQuadraticPoints(
+            pts[0], pts[1], pts[2],
+            srcSpaceTolSqd, vert,
+            GrPathUtils::quadraticPointCount(pts, srcSpaceTol));
+    if (indexed) {
+        for (uint16_t i = 0; i < numPts; ++i) {
+            append_countour_edge_indices(isHairline, subpathIdxStart,
+                                         firstQPtIdx + i, idx);
+        }
+    }
+}
+
+class DefaultPathBatch : public GrVertexBatch {
+public:
+    DEFINE_BATCH_CLASS_ID
+
+    struct Geometry {
+        GrColor fColor;
+        SkPath fPath;
+        SkScalar fTolerance;
+    };
+
+    static GrDrawBatch* Create(const Geometry& geometry, uint8_t coverage,
+                               const SkMatrix& viewMatrix, bool isHairline,
+                               const SkRect& devBounds) {
+        return new DefaultPathBatch(geometry, coverage, viewMatrix, isHairline, devBounds);
+    }
+
+    const char* name() const override { return "DefaultPathBatch"; }
+
+    void computePipelineOptimizations(GrInitInvariantOutput* color, 
+                                      GrInitInvariantOutput* coverage,
+                                      GrBatchToXPOverrides* overrides) const override {
+        // When this is called on a batch, there is only one geometry bundle
+        color->setKnownFourComponents(fGeoData[0].fColor);
+        coverage->setKnownSingleComponent(this->coverage());
+        overrides->fUsePLSDstRead = false;
+    }
+
+private:
+    void initBatchTracker(const GrXPOverridesForBatch& overrides) override {
+        // Handle any color overrides
+        if (!overrides.readsColor()) {
+            fGeoData[0].fColor = GrColor_ILLEGAL;
+        }
+        overrides.getOverrideColorIfSet(&fGeoData[0].fColor);
+
+        // setup batch properties
+        fBatch.fColorIgnored = !overrides.readsColor();
+        fBatch.fColor = fGeoData[0].fColor;
+        fBatch.fUsesLocalCoords = overrides.readsLocalCoords();
+        fBatch.fCoverageIgnored = !overrides.readsCoverage();
+    }
+
+    void onPrepareDraws(Target* target) const override {
+        SkAutoTUnref<const GrGeometryProcessor> gp;
+        {
+            using namespace GrDefaultGeoProcFactory;
+            Color color(this->color());
+            Coverage coverage(this->coverage());
+            if (this->coverageIgnored()) {
+                coverage.fType = Coverage::kNone_Type;
+            }
+            LocalCoords localCoords(this->usesLocalCoords() ? LocalCoords::kUsePosition_Type :
+                                                              LocalCoords::kUnused_Type);
+            gp.reset(GrDefaultGeoProcFactory::Create(color, coverage, localCoords,
+                                                     this->viewMatrix()));
+        }
+
+        size_t vertexStride = gp->getVertexStride();
+        SkASSERT(vertexStride == sizeof(SkPoint));
+
+        target->initDraw(gp, this->pipeline());
+
+        int instanceCount = fGeoData.count();
+
+        // compute number of vertices
+        int maxVertices = 0;
+
+        // We will use index buffers if we have multiple paths or one path with multiple contours
+        bool isIndexed = instanceCount > 1;
+        for (int i = 0; i < instanceCount; i++) {
+            const Geometry& args = fGeoData[i];
+
+            int contourCount;
+            maxVertices += GrPathUtils::worstCasePointCount(args.fPath, &contourCount,
+                                                            args.fTolerance);
+
+            isIndexed = isIndexed || contourCount > 1;
+        }
+
+        if (maxVertices == 0 || maxVertices > ((int)SK_MaxU16 + 1)) {
+            SkDebugf("Cannot render path (%d)\n", maxVertices);
+            return;
+        }
+
+        // determine primitiveType
+        int maxIndices = 0;
+        GrPrimitiveType primitiveType;
+        if (this->isHairline()) {
+            if (isIndexed) {
+                maxIndices = 2 * maxVertices;
+                primitiveType = kLines_GrPrimitiveType;
+            } else {
+                primitiveType = kLineStrip_GrPrimitiveType;
+            }
+        } else {
+            if (isIndexed) {
+                maxIndices = 3 * maxVertices;
+                primitiveType = kTriangles_GrPrimitiveType;
+            } else {
+                primitiveType = kTriangleFan_GrPrimitiveType;
+            }
+        }
+
+        // allocate vertex / index buffers
+        const GrVertexBuffer* vertexBuffer;
+        int firstVertex;
+
+        void* verts = target->makeVertexSpace(vertexStride, maxVertices,
+                                              &vertexBuffer, &firstVertex);
+
+        if (!verts) {
+            SkDebugf("Could not allocate vertices\n");
+            return;
+        }
+
+        const GrIndexBuffer* indexBuffer = nullptr;
+        int firstIndex = 0;
+
+        void* indices = nullptr;
+        if (isIndexed) {
+            indices = target->makeIndexSpace(maxIndices, &indexBuffer, &firstIndex);
+
+            if (!indices) {
+                SkDebugf("Could not allocate indices\n");
+                return;
+            }
+        }
+
+        // fill buffers
+        int vertexOffset = 0;
+        int indexOffset = 0;
+        for (int i = 0; i < instanceCount; i++) {
+            const Geometry& args = fGeoData[i];
+
+            int vertexCnt = 0;
+            int indexCnt = 0;
+            if (!this->createGeom(verts,
+                                  vertexOffset,
+                                  indices,
+                                  indexOffset,
+                                  &vertexCnt,
+                                  &indexCnt,
+                                  args.fPath,
+                                  args.fTolerance,
+                                  isIndexed)) {
+                return;
+            }
+
+            vertexOffset += vertexCnt;
+            indexOffset += indexCnt;
+            SkASSERT(vertexOffset <= maxVertices && indexOffset <= maxIndices);
+        }
+
+        GrVertices vertices;
+        if (isIndexed) {
+            vertices.initIndexed(primitiveType, vertexBuffer, indexBuffer, firstVertex, firstIndex,
+                                 vertexOffset, indexOffset);
+        } else {
+            vertices.init(primitiveType, vertexBuffer, firstVertex, vertexOffset);
+        }
+        target->draw(vertices);
+
+        // put back reserves
+        target->putBackIndices((size_t)(maxIndices - indexOffset));
+        target->putBackVertices((size_t)(maxVertices - vertexOffset), (size_t)vertexStride);
+    }
+
+    SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
+
+    DefaultPathBatch(const Geometry& geometry, uint8_t coverage, const SkMatrix& viewMatrix,
+                     bool isHairline, const SkRect& devBounds)
+        : INHERITED(ClassID()) {
+        fBatch.fCoverage = coverage;
+        fBatch.fIsHairline = isHairline;
+        fBatch.fViewMatrix = viewMatrix;
+        fGeoData.push_back(geometry);
+
+        this->setBounds(devBounds);
+
+        // This is b.c. hairlines are notionally infinitely thin so without expansion
+        // two overlapping lines could be reordered even though they hit the same pixels.
+        if (isHairline) {
+            fBounds.outset(0.5f, 0.5f);
+        }
+    }
+
+    bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override {
+        DefaultPathBatch* that = t->cast<DefaultPathBatch>();
+        if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *that->pipeline(),
+                                     that->bounds(), caps)) {
+            return false;
+        }
+
+        if (this->color() != that->color()) {
+            return false;
+        }
+
+        if (this->coverage() != that->coverage()) {
+            return false;
+        }
+
+        if (!this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
+            return false;
+        }
+
+        if (this->isHairline() != that->isHairline()) {
+            return false;
+        }
+
+        fGeoData.push_back_n(that->geoData()->count(), that->geoData()->begin());
+        this->joinBounds(that->bounds());
+        return true;
+    }
+
+    bool createGeom(void* vertices,
+                    size_t vertexOffset,
+                    void* indices,
+                    size_t indexOffset,
+                    int* vertexCnt,
+                    int* indexCnt,
+                    const SkPath& path,
+                    SkScalar srcSpaceTol,
+                    bool isIndexed) const {
+        {
+            SkScalar srcSpaceTolSqd = SkScalarMul(srcSpaceTol, srcSpaceTol);
+
+            uint16_t indexOffsetU16 = (uint16_t)indexOffset;
+            uint16_t vertexOffsetU16 = (uint16_t)vertexOffset;
+
+            uint16_t* idxBase = reinterpret_cast<uint16_t*>(indices) + indexOffsetU16;
+            uint16_t* idx = idxBase;
+            uint16_t subpathIdxStart = vertexOffsetU16;
+
+            SkPoint* base = reinterpret_cast<SkPoint*>(vertices) + vertexOffset;
+            SkPoint* vert = base;
+
+            SkPoint pts[4];
+
+            bool first = true;
+            int subpath = 0;
+
+            SkPath::Iter iter(path, false);
+
+            bool done = false;
+            while (!done) {
+                SkPath::Verb verb = iter.next(pts);
+                switch (verb) {
+                    case SkPath::kMove_Verb:
+                        if (!first) {
+                            uint16_t currIdx = (uint16_t) (vert - base) + vertexOffsetU16;
+                            subpathIdxStart = currIdx;
+                            ++subpath;
+                        }
+                        *vert = pts[0];
+                        vert++;
+                        break;
+                    case SkPath::kLine_Verb:
+                        if (isIndexed) {
+                            uint16_t prevIdx = (uint16_t)(vert - base) - 1 + vertexOffsetU16;
+                            append_countour_edge_indices(this->isHairline(), subpathIdxStart,
+                                                         prevIdx, &idx);
+                        }
+                        *(vert++) = pts[1];
+                        break;
+                    case SkPath::kConic_Verb: {
+                        SkScalar weight = iter.conicWeight();
+                        SkAutoConicToQuads converter;
+                        // Converting in src-space, hance the finer tolerance (0.25)
+                        // TODO: find a way to do this in dev-space so the tolerance means something
+                        const SkPoint* quadPts = converter.computeQuads(pts, weight, 0.25f);
+                        for (int i = 0; i < converter.countQuads(); ++i) {
+                            add_quad(&vert, base, quadPts + i*2, srcSpaceTolSqd, srcSpaceTol,
+                                     isIndexed, this->isHairline(), subpathIdxStart,
+                                     (int)vertexOffset, &idx);
+                        }
+                        break;
+                    }
+                    case SkPath::kQuad_Verb:
+                        add_quad(&vert, base, pts, srcSpaceTolSqd, srcSpaceTol, isIndexed,
+                                 this->isHairline(), subpathIdxStart, (int)vertexOffset, &idx);
+                        break;
+                    case SkPath::kCubic_Verb: {
+                        // first pt of cubic is the pt we ended on in previous step
+                        uint16_t firstCPtIdx = (uint16_t)(vert - base) - 1 + vertexOffsetU16;
+                        uint16_t numPts = (uint16_t) GrPathUtils::generateCubicPoints(
+                                        pts[0], pts[1], pts[2], pts[3],
+                                        srcSpaceTolSqd, &vert,
+                                        GrPathUtils::cubicPointCount(pts, srcSpaceTol));
+                        if (isIndexed) {
+                            for (uint16_t i = 0; i < numPts; ++i) {
+                                append_countour_edge_indices(this->isHairline(), subpathIdxStart,
+                                                             firstCPtIdx + i, &idx);
+                            }
+                        }
+                        break;
+                    }
+                    case SkPath::kClose_Verb:
+                        break;
+                    case SkPath::kDone_Verb:
+                        done = true;
+                }
+                first = false;
+            }
+
+            *vertexCnt = static_cast<int>(vert - base);
+            *indexCnt = static_cast<int>(idx - idxBase);
+
+        }
+        return true;
+    }
+
+    GrColor color() const { return fBatch.fColor; }
+    uint8_t coverage() const { return fBatch.fCoverage; }
+    bool usesLocalCoords() const { return fBatch.fUsesLocalCoords; }
+    const SkMatrix& viewMatrix() const { return fBatch.fViewMatrix; }
+    bool isHairline() const { return fBatch.fIsHairline; }
+    bool coverageIgnored() const { return fBatch.fCoverageIgnored; }
+
+    struct BatchTracker {
+        GrColor fColor;
+        uint8_t fCoverage;
+        SkMatrix fViewMatrix;
+        bool fUsesLocalCoords;
+        bool fColorIgnored;
+        bool fCoverageIgnored;
+        bool fIsHairline;
+    };
+
+    BatchTracker fBatch;
+    SkSTArray<1, Geometry, true> fGeoData;
+
+    typedef GrVertexBatch INHERITED;
+};
+
+bool GrDefaultPathRenderer::internalDrawPath(GrDrawTarget* target,
+                                             GrPipelineBuilder* pipelineBuilder,
+                                             GrColor color,
+                                             const SkMatrix& viewMatrix,
+                                             const SkPath& path,
+                                             const GrStrokeInfo& origStroke,
+                                             bool stencilOnly) {
+    SkTCopyOnFirstWrite<GrStrokeInfo> stroke(origStroke);
+
+    SkScalar hairlineCoverage;
+    uint8_t newCoverage = 0xff;
+    if (IsStrokeHairlineOrEquivalent(*stroke, viewMatrix, &hairlineCoverage)) {
+        newCoverage = SkScalarRoundToInt(hairlineCoverage * 0xff);
+
+        if (!stroke->isHairlineStyle()) {
+            stroke.writable()->setHairlineStyle();
+        }
+    }
+
+    const bool isHairline = stroke->isHairlineStyle();
+
+    // Save the current xp on the draw state so we can reset it if needed
+    const GrXPFactory* xpFactory = pipelineBuilder->getXPFactory();
+    SkAutoTUnref<const GrXPFactory> backupXPFactory(SkSafeRef(xpFactory));
+    // face culling doesn't make sense here
+    SkASSERT(GrPipelineBuilder::kBoth_DrawFace == pipelineBuilder->getDrawFace());
+
+    int                         passCount = 0;
+    const GrStencilSettings*    passes[3];
+    GrPipelineBuilder::DrawFace drawFace[3];
+    bool                        reverse = false;
+    bool                        lastPassIsBounds;
+
+    if (isHairline) {
+        passCount = 1;
+        if (stencilOnly) {
+            passes[0] = &gDirectToStencil;
+        } else {
+            passes[0] = nullptr;
+        }
+        lastPassIsBounds = false;
+        drawFace[0] = GrPipelineBuilder::kBoth_DrawFace;
+    } else {
+        if (single_pass_path(path, *stroke)) {
+            passCount = 1;
+            if (stencilOnly) {
+                passes[0] = &gDirectToStencil;
+            } else {
+                passes[0] = nullptr;
+            }
+            drawFace[0] = GrPipelineBuilder::kBoth_DrawFace;
+            lastPassIsBounds = false;
+        } else {
+            switch (path.getFillType()) {
+                case SkPath::kInverseEvenOdd_FillType:
+                    reverse = true;
+                    // fallthrough
+                case SkPath::kEvenOdd_FillType:
+                    passes[0] = &gEOStencilPass;
+                    if (stencilOnly) {
+                        passCount = 1;
+                        lastPassIsBounds = false;
+                    } else {
+                        passCount = 2;
+                        lastPassIsBounds = true;
+                        if (reverse) {
+                            passes[1] = &gInvEOColorPass;
+                        } else {
+                            passes[1] = &gEOColorPass;
+                        }
+                    }
+                    drawFace[0] = drawFace[1] = GrPipelineBuilder::kBoth_DrawFace;
+                    break;
+
+                case SkPath::kInverseWinding_FillType:
+                    reverse = true;
+                    // fallthrough
+                case SkPath::kWinding_FillType:
+                    if (fSeparateStencil) {
+                        if (fStencilWrapOps) {
+                            passes[0] = &gWindStencilSeparateWithWrap;
+                        } else {
+                            passes[0] = &gWindStencilSeparateNoWrap;
+                        }
+                        passCount = 2;
+                        drawFace[0] = GrPipelineBuilder::kBoth_DrawFace;
+                    } else {
+                        if (fStencilWrapOps) {
+                            passes[0] = &gWindSingleStencilWithWrapInc;
+                            passes[1] = &gWindSingleStencilWithWrapDec;
+                        } else {
+                            passes[0] = &gWindSingleStencilNoWrapInc;
+                            passes[1] = &gWindSingleStencilNoWrapDec;
+                        }
+                        // which is cw and which is ccw is arbitrary.
+                        drawFace[0] = GrPipelineBuilder::kCW_DrawFace;
+                        drawFace[1] = GrPipelineBuilder::kCCW_DrawFace;
+                        passCount = 3;
+                    }
+                    if (stencilOnly) {
+                        lastPassIsBounds = false;
+                        --passCount;
+                    } else {
+                        lastPassIsBounds = true;
+                        drawFace[passCount-1] = GrPipelineBuilder::kBoth_DrawFace;
+                        if (reverse) {
+                            passes[passCount-1] = &gInvWindColorPass;
+                        } else {
+                            passes[passCount-1] = &gWindColorPass;
+                        }
+                    }
+                    break;
+                default:
+                    SkDEBUGFAIL("Unknown path fFill!");
+                    return false;
+            }
+        }
+    }
+
+    SkScalar tol = GrPathUtils::kDefaultTolerance;
+    SkScalar srcSpaceTol = GrPathUtils::scaleToleranceToSrc(tol, viewMatrix, path.getBounds());
+
+    SkRect devBounds;
+    GetPathDevBounds(path, pipelineBuilder->getRenderTarget(), viewMatrix, &devBounds);
+
+    for (int p = 0; p < passCount; ++p) {
+        pipelineBuilder->setDrawFace(drawFace[p]);
+        if (passes[p]) {
+            *pipelineBuilder->stencil() = *passes[p];
+        }
+
+        if (lastPassIsBounds && (p == passCount-1)) {
+            // Reset the XP Factory on pipelineBuilder
+            pipelineBuilder->setXPFactory(backupXPFactory);
+            SkRect bounds;
+            SkMatrix localMatrix = SkMatrix::I();
+            if (reverse) {
+                SkASSERT(pipelineBuilder->getRenderTarget());
+                // draw over the dev bounds (which will be the whole dst surface for inv fill).
+                bounds = devBounds;
+                SkMatrix vmi;
+                // mapRect through persp matrix may not be correct
+                if (!viewMatrix.hasPerspective() && viewMatrix.invert(&vmi)) {
+                    vmi.mapRect(&bounds);
+                } else {
+                    if (!viewMatrix.invert(&localMatrix)) {
+                        return false;
+                    }
+                }
+            } else {
+                bounds = path.getBounds();
+            }
+            const SkMatrix& viewM = (reverse && viewMatrix.hasPerspective()) ? SkMatrix::I() :
+                                                                               viewMatrix;
+            target->drawNonAARect(*pipelineBuilder, color, viewM, bounds, localMatrix);
+        } else {
+            if (passCount > 1) {
+                pipelineBuilder->setDisableColorXPFactory();
+            }
+
+            DefaultPathBatch::Geometry geometry;
+            geometry.fColor = color;
+            geometry.fPath = path;
+            geometry.fTolerance = srcSpaceTol;
+
+            SkAutoTUnref<GrDrawBatch> batch(DefaultPathBatch::Create(geometry, newCoverage,
+                                                                     viewMatrix, isHairline,
+                                                                     devBounds));
+
+            target->drawBatch(*pipelineBuilder, batch);
+        }
+    }
+    return true;
+}
+
+bool GrDefaultPathRenderer::onCanDrawPath(const CanDrawPathArgs& args) const {
+    // this class can draw any path with any fill but doesn't do any anti-aliasing.
+    return !args.fAntiAlias && (args.fStroke->isFillStyle() ||
+                                IsStrokeHairlineOrEquivalent(*args.fStroke, *args.fViewMatrix,
+                                                             nullptr));
+}
+
+bool GrDefaultPathRenderer::onDrawPath(const DrawPathArgs& args) {
+    return this->internalDrawPath(args.fTarget,
+                                  args.fPipelineBuilder,
+                                  args.fColor,
+                                  *args.fViewMatrix,
+                                  *args.fPath,
+                                  *args.fStroke,
+                                  false);
+}
+
+void GrDefaultPathRenderer::onStencilPath(const StencilPathArgs& args) {
+    SkASSERT(SkPath::kInverseEvenOdd_FillType != args.fPath->getFillType());
+    SkASSERT(SkPath::kInverseWinding_FillType != args.fPath->getFillType());
+    this->internalDrawPath(args.fTarget, args.fPipelineBuilder, GrColor_WHITE, *args.fViewMatrix,
+                           *args.fPath, *args.fStroke, true);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef GR_TEST_UTILS
+
+DRAW_BATCH_TEST_DEFINE(DefaultPathBatch) {
+    GrColor color = GrRandomColor(random);
+    SkMatrix viewMatrix = GrTest::TestMatrix(random);
+
+    // For now just hairlines because the other types of draws require two batches.
+    // TODO we should figure out a way to combine the stencil and cover steps into one batch
+    GrStrokeInfo stroke(SkStrokeRec::kHairline_InitStyle);
+    SkPath path = GrTest::TestPath(random);
+
+    // Compute srcSpaceTol
+    SkRect bounds = path.getBounds();
+    SkScalar tol = GrPathUtils::kDefaultTolerance;
+    SkScalar srcSpaceTol = GrPathUtils::scaleToleranceToSrc(tol, viewMatrix, bounds);
+
+    DefaultPathBatch::Geometry geometry;
+    geometry.fColor = color;
+    geometry.fPath = path;
+    geometry.fTolerance = srcSpaceTol;
+
+    viewMatrix.mapRect(&bounds);
+    uint8_t coverage = GrRandomCoverage(random);
+    return DefaultPathBatch::Create(geometry, coverage, viewMatrix, true, bounds);
+}
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrDefaultPathRenderer.h b/gfx/skia/skia/src/gpu/batches/GrDefaultPathRenderer.h
new file mode 100644
index 000000000000..8a2ce7b9c499
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrDefaultPathRenderer.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrDefaultPathRenderer_DEFINED
+#define GrDefaultPathRenderer_DEFINED
+
+#include "GrPathRenderer.h"
+#include "SkTypes.h"
+
+/**
+ *  Subclass that renders the path using the stencil buffer to resolve fill rules
+ * (e.g. winding, even-odd)
+ */
+class SK_API GrDefaultPathRenderer : public GrPathRenderer {
+public:
+    GrDefaultPathRenderer(bool separateStencilSupport, bool stencilWrapOpsSupport);
+
+private:
+
+    StencilSupport onGetStencilSupport(const SkPath&, const GrStrokeInfo&) const override;
+
+    bool onCanDrawPath(const CanDrawPathArgs&) const override;
+
+    bool onDrawPath(const DrawPathArgs&) override;
+
+    void onStencilPath(const StencilPathArgs&) override;
+
+    bool internalDrawPath(GrDrawTarget*,
+                          GrPipelineBuilder*,
+                          GrColor,
+                          const SkMatrix& viewMatrix,
+                          const SkPath&,
+                          const GrStrokeInfo&,
+                          bool stencilOnly);
+
+    bool    fSeparateStencil;
+    bool    fStencilWrapOps;
+
+    typedef GrPathRenderer INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrDiscardBatch.h b/gfx/skia/skia/src/gpu/batches/GrDiscardBatch.h
new file mode 100644
index 000000000000..aa443cf60341
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrDiscardBatch.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrDiscardBatch_DEFINED
+#define GrDiscardBatch_DEFINED
+
+#include "GrBatch.h"
+#include "GrBatchFlushState.h"
+#include "GrGpu.h"
+#include "GrRenderTarget.h"
+
+class GrDiscardBatch final : public GrBatch {
+public:
+    DEFINE_BATCH_CLASS_ID
+
+    GrDiscardBatch(GrRenderTarget* rt)
+        : INHERITED(ClassID())
+        , fRenderTarget(rt) {
+        fBounds = SkRect::MakeWH(SkIntToScalar(rt->width()), SkIntToScalar(rt->height()));
+    }
+
+    const char* name() const override { return "Discard"; }
+
+    uint32_t renderTargetUniqueID() const override { return fRenderTarget.get()->getUniqueID(); }
+
+    SkString dumpInfo() const override {
+        SkString string;
+        string.printf("RT: %d", fRenderTarget.get()->getUniqueID());
+        return string;
+    }
+
+private:
+    bool onCombineIfPossible(GrBatch* that, const GrCaps& caps) override {
+        return fRenderTarget == that->cast<GrDiscardBatch>()->fRenderTarget;
+    }
+
+    void onPrepare(GrBatchFlushState*) override {}
+
+    void onDraw(GrBatchFlushState* state) override {
+        state->gpu()->discard(fRenderTarget.get());
+    }
+
+    GrPendingIOResource<GrRenderTarget, kWrite_GrIOType> fRenderTarget;
+
+    typedef GrBatch INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrDrawAtlasBatch.cpp b/gfx/skia/skia/src/gpu/batches/GrDrawAtlasBatch.cpp
new file mode 100644
index 000000000000..dab5b4f7c206
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrDrawAtlasBatch.cpp
@@ -0,0 +1,267 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrDrawAtlasBatch.h"
+#include "GrBatchFlushState.h"
+#include "GrBatchTest.h"
+#include "SkGr.h"
+#include "SkRandom.h"
+#include "SkRSXform.h"
+
+void GrDrawAtlasBatch::initBatchTracker(const GrXPOverridesForBatch& overrides) {
+    SkASSERT(fGeoData.count() == 1);
+    // Handle any color overrides
+    if (!overrides.readsColor()) {
+        fGeoData[0].fColor = GrColor_ILLEGAL;
+    }
+    if (overrides.getOverrideColorIfSet(&fGeoData[0].fColor) && fHasColors) {
+        size_t vertexStride = sizeof(SkPoint) + sizeof(SkPoint) +
+                             (this->hasColors() ? sizeof(GrColor) : 0);
+        uint8_t* currVertex = fGeoData[0].fVerts.begin();
+        for (int i = 0; i < 4*fQuadCount; ++i) {
+            *(reinterpret_cast<GrColor*>(currVertex + sizeof(SkPoint))) = fGeoData[0].fColor;
+            currVertex += vertexStride;
+        }
+    }
+
+    // setup batch properties
+    fColorIgnored = !overrides.readsColor();
+    fColor = fGeoData[0].fColor;
+    // We'd like to assert this, but we can't because of GLPrograms test
+    //SkASSERT(init.readsLocalCoords());
+    fCoverageIgnored = !overrides.readsCoverage();
+}
+
+static const GrGeometryProcessor* set_vertex_attributes(bool hasColors,
+                                                        GrColor color,
+                                                        const SkMatrix& viewMatrix,
+                                                        bool coverageIgnored) {
+    using namespace GrDefaultGeoProcFactory;
+    Color gpColor(color);
+    if (hasColors) {
+        gpColor.fType = Color::kAttribute_Type;
+    }
+    
+    Coverage coverage(coverageIgnored ? Coverage::kNone_Type : Coverage::kSolid_Type);
+    LocalCoords localCoords(LocalCoords::kHasExplicit_Type);
+    return GrDefaultGeoProcFactory::Create(gpColor, coverage, localCoords, viewMatrix);
+}
+
+void GrDrawAtlasBatch::onPrepareDraws(Target* target) const {
+    // Setup geometry processor
+    SkAutoTUnref<const GrGeometryProcessor> gp(set_vertex_attributes(this->hasColors(),
+                                                                     this->color(),
+                                                                     this->viewMatrix(),
+                                                                     this->coverageIgnored()));
+    
+    target->initDraw(gp, this->pipeline());
+    
+    int instanceCount = fGeoData.count();
+    size_t vertexStride = gp->getVertexStride();
+    SkASSERT(vertexStride == sizeof(SkPoint) + sizeof(SkPoint)
+             + (this->hasColors() ? sizeof(GrColor) : 0));
+    
+    QuadHelper helper;
+    int numQuads = this->quadCount();
+    void* verts = helper.init(target, vertexStride, numQuads);
+    if (!verts) {
+        SkDebugf("Could not allocate vertices\n");
+        return;
+    }
+    
+    uint8_t* vertPtr = reinterpret_cast<uint8_t*>(verts);
+    for (int i = 0; i < instanceCount; i++) {
+        const Geometry& args = fGeoData[i];
+        
+        size_t allocSize = args.fVerts.count();
+        memcpy(vertPtr, args.fVerts.begin(), allocSize);
+        vertPtr += allocSize;
+    }
+    helper.recordDraw(target);
+}
+
+GrDrawAtlasBatch::GrDrawAtlasBatch(const Geometry& geometry, const SkMatrix& viewMatrix,
+                                   int spriteCount, const SkRSXform* xforms, const SkRect* rects,
+                                   const SkColor* colors)
+    : INHERITED(ClassID()) {
+    SkASSERT(xforms);
+    SkASSERT(rects);
+    
+    fViewMatrix = viewMatrix;
+    Geometry& installedGeo = fGeoData.push_back(geometry);
+    
+    // Figure out stride and offsets
+    // Order within the vertex is: position [color] texCoord
+    size_t texOffset = sizeof(SkPoint);
+    size_t vertexStride = 2*sizeof(SkPoint);
+    fHasColors = SkToBool(colors);
+    if (colors) {
+        texOffset += sizeof(GrColor);
+        vertexStride += sizeof(GrColor);
+    }
+    
+    // Compute buffer size and alloc buffer
+    fQuadCount = spriteCount;
+    int allocSize = static_cast<int>(4*vertexStride*spriteCount);
+    installedGeo.fVerts.reset(allocSize);
+    uint8_t* currVertex = installedGeo.fVerts.begin();
+    
+    SkRect bounds;
+    bounds.setLargestInverted();
+    int paintAlpha = GrColorUnpackA(installedGeo.fColor);
+    for (int spriteIndex = 0; spriteIndex < spriteCount; ++spriteIndex) {
+        // Transform rect
+        SkPoint quad[4];
+        const SkRect& currRect = rects[spriteIndex];
+        xforms[spriteIndex].toQuad(currRect.width(), currRect.height(), quad);
+ 
+        // Copy colors if necessary
+        if (colors) {
+            // convert to GrColor
+            SkColor color = colors[spriteIndex];
+            if (paintAlpha != 255) {
+                color = SkColorSetA(color, SkMulDiv255Round(SkColorGetA(color), paintAlpha));
+            }
+            GrColor grColor = SkColorToPremulGrColor(color);
+            
+            *(reinterpret_cast<GrColor*>(currVertex+sizeof(SkPoint))) = grColor;
+            *(reinterpret_cast<GrColor*>(currVertex+vertexStride+sizeof(SkPoint))) = grColor;
+            *(reinterpret_cast<GrColor*>(currVertex+2*vertexStride+sizeof(SkPoint))) = grColor;
+            *(reinterpret_cast<GrColor*>(currVertex+3*vertexStride+sizeof(SkPoint))) = grColor;
+        }
+        
+        // Copy position and uv to verts
+        *(reinterpret_cast<SkPoint*>(currVertex)) = quad[0];
+        *(reinterpret_cast<SkPoint*>(currVertex+texOffset)) = SkPoint::Make(currRect.fLeft,
+                                                                            currRect.fTop);
+        bounds.growToInclude(quad[0].fX, quad[0].fY);
+        currVertex += vertexStride;
+
+        *(reinterpret_cast<SkPoint*>(currVertex)) = quad[1];
+        *(reinterpret_cast<SkPoint*>(currVertex+texOffset)) = SkPoint::Make(currRect.fRight,
+                                                                            currRect.fTop);
+        bounds.growToInclude(quad[1].fX, quad[1].fY);
+        currVertex += vertexStride;
+        
+        *(reinterpret_cast<SkPoint*>(currVertex)) = quad[2];
+        *(reinterpret_cast<SkPoint*>(currVertex+texOffset)) = SkPoint::Make(currRect.fRight,
+                                                                            currRect.fBottom);
+        bounds.growToInclude(quad[2].fX, quad[2].fY);
+        currVertex += vertexStride;
+        
+        *(reinterpret_cast<SkPoint*>(currVertex)) = quad[3];
+        *(reinterpret_cast<SkPoint*>(currVertex+texOffset)) = SkPoint::Make(currRect.fLeft,
+                                                                            currRect.fBottom);
+        bounds.growToInclude(quad[3].fX, quad[3].fY);
+        currVertex += vertexStride;
+    }
+    
+    viewMatrix.mapRect(&bounds);
+    // Outset for a half pixel in each direction to account for snapping in non-AA case
+    bounds.outset(0.5f, 0.5f);
+    this->setBounds(bounds);
+}
+ 
+bool GrDrawAtlasBatch::onCombineIfPossible(GrBatch* t, const GrCaps& caps) {
+    GrDrawAtlasBatch* that = t->cast<GrDrawAtlasBatch>();
+
+    if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *that->pipeline(),
+                                that->bounds(), caps)) {
+        return false;
+    }
+
+    // We currently use a uniform viewmatrix for this batch
+    if (!this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
+        return false;
+    }
+    
+    if (this->hasColors() != that->hasColors()) {
+        return false;
+    }
+    
+    if (!this->hasColors() && this->color() != that->color()) {
+        return false;
+    }
+    
+    if (this->color() != that->color()) {
+        fColor = GrColor_ILLEGAL;
+    }
+    fGeoData.push_back_n(that->geoData()->count(), that->geoData()->begin());
+    fQuadCount += that->quadCount();
+    
+    this->joinBounds(that->bounds());
+    return true;
+}
+
+#ifdef GR_TEST_UTILS
+
+static SkRSXform random_xform(SkRandom* random) {
+    static const SkScalar kMinExtent = -100.f;
+    static const SkScalar kMaxExtent = 100.f;
+    static const SkScalar kMinScale = 0.1f;
+    static const SkScalar kMaxScale = 100.f;
+    static const SkScalar kMinRotate = -SK_ScalarPI;
+    static const SkScalar kMaxRotate = SK_ScalarPI;
+
+    SkRSXform xform = SkRSXform::MakeFromRadians(random->nextRangeScalar(kMinScale, kMaxScale),
+                                                 random->nextRangeScalar(kMinRotate, kMaxRotate),
+                                                 random->nextRangeScalar(kMinExtent, kMaxExtent),
+                                                 random->nextRangeScalar(kMinExtent, kMaxExtent),
+                                                 random->nextRangeScalar(kMinExtent, kMaxExtent),
+                                                 random->nextRangeScalar(kMinExtent, kMaxExtent));
+    return xform;
+}
+
+static SkRect random_texRect(SkRandom* random) {
+    static const SkScalar kMinCoord = 0.0f;
+    static const SkScalar kMaxCoord = 1024.f;
+    
+    SkRect texRect = SkRect::MakeLTRB(random->nextRangeScalar(kMinCoord, kMaxCoord),
+                                      random->nextRangeScalar(kMinCoord, kMaxCoord),
+                                      random->nextRangeScalar(kMinCoord, kMaxCoord),
+                                      random->nextRangeScalar(kMinCoord, kMaxCoord));
+    texRect.sort();
+    return texRect;
+}
+
+static void randomize_params(uint32_t count, SkRandom* random,
+                             SkTArray<SkRSXform>* xforms,
+                             SkTArray<SkRect>* texRects,
+                             SkTArray<GrColor>* colors, bool hasColors) {
+    for (uint32_t v = 0; v < count; v++) {
+        xforms->push_back(random_xform(random));
+        texRects->push_back(random_texRect(random));
+        if (hasColors) {
+            colors->push_back(GrRandomColor(random));
+        }
+    }
+}
+
+DRAW_BATCH_TEST_DEFINE(GrDrawAtlasBatch) {
+    uint32_t spriteCount = random->nextRangeU(1, 100);
+    
+    SkTArray<SkRSXform> xforms(spriteCount);
+    SkTArray<SkRect> texRects(spriteCount);
+    SkTArray<GrColor> colors;
+    
+    bool hasColors = random->nextBool();
+    
+    randomize_params(spriteCount,
+                     random,
+                     &xforms,
+                     &texRects,
+                     &colors, hasColors);
+    
+    SkMatrix viewMatrix = GrTest::TestMatrix(random);
+    
+    GrDrawAtlasBatch::Geometry geometry;
+    geometry.fColor = GrRandomColor(random);
+    return GrDrawAtlasBatch::Create(geometry, viewMatrix, spriteCount, xforms.begin(),
+                                    texRects.begin(), hasColors ? colors.begin() : nullptr);
+}
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrDrawAtlasBatch.h b/gfx/skia/skia/src/gpu/batches/GrDrawAtlasBatch.h
new file mode 100644
index 000000000000..4e89523dcbb4
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrDrawAtlasBatch.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrDrawAtlasBatch_DEFINED
+#define GrDrawAtlasBatch_DEFINED
+
+#include "GrColor.h"
+#include "GrDefaultGeoProcFactory.h"
+#include "GrVertexBatch.h"
+
+class GrDrawAtlasBatch : public GrVertexBatch {
+public:
+    DEFINE_BATCH_CLASS_ID
+
+    struct Geometry {
+        GrColor                 fColor;
+        SkTArray<uint8_t, true> fVerts;
+    };
+
+    static GrDrawBatch* Create(const Geometry& geometry, const SkMatrix& viewMatrix,
+                               int spriteCount, const SkRSXform* xforms, const SkRect* rects,
+                               const SkColor* colors) {
+        return new GrDrawAtlasBatch(geometry, viewMatrix, spriteCount, xforms, rects, colors);
+    }
+    
+    const char* name() const override { return "DrawAtlasBatch"; }
+    
+    void computePipelineOptimizations(GrInitInvariantOutput* color, 
+                                      GrInitInvariantOutput* coverage,
+                                      GrBatchToXPOverrides* overrides) const override {
+        // When this is called on a batch, there is only one geometry bundle
+        if (this->hasColors()) {
+            color->setUnknownFourComponents();
+        } else {
+            color->setKnownFourComponents(fGeoData[0].fColor);
+        }
+        coverage->setKnownSingleComponent(0xff);
+        overrides->fUsePLSDstRead = false;
+    }
+
+    SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
+
+private:
+    void onPrepareDraws(Target*) const override;
+
+    void initBatchTracker(const GrXPOverridesForBatch&) override;
+
+    GrDrawAtlasBatch(const Geometry& geometry, const SkMatrix& viewMatrix, int spriteCount,
+                     const SkRSXform* xforms, const SkRect* rects, const SkColor* colors);
+
+    GrColor color() const { return fColor; }
+    bool colorIgnored() const { return fColorIgnored; }
+    const SkMatrix& viewMatrix() const { return fViewMatrix; }
+    bool hasColors() const { return fHasColors; }
+    int quadCount() const { return fQuadCount; }
+    bool coverageIgnored() const { return fCoverageIgnored; }
+    
+    bool onCombineIfPossible(GrBatch* t, const GrCaps&) override;
+    SkSTArray<1, Geometry, true> fGeoData;
+    
+    SkMatrix fViewMatrix;
+    GrColor  fColor;
+    int      fQuadCount;
+    bool     fColorIgnored;
+    bool     fCoverageIgnored;
+    bool     fHasColors;
+
+    typedef GrVertexBatch INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrDrawBatch.cpp b/gfx/skia/skia/src/gpu/batches/GrDrawBatch.cpp
new file mode 100644
index 000000000000..4253923f335d
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrDrawBatch.cpp
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrDrawBatch.h"
+
+GrDrawBatch::GrDrawBatch(uint32_t classID) : INHERITED(classID), fPipelineInstalled(false) { }
+
+GrDrawBatch::~GrDrawBatch() {
+    if (fPipelineInstalled) {
+        this->pipeline()->~GrPipeline();
+    }
+}
+
+void GrDrawBatch::getPipelineOptimizations(GrPipelineOptimizations* opt) const {
+    GrInitInvariantOutput color;
+    GrInitInvariantOutput coverage;
+    this->computePipelineOptimizations(&color, &coverage, &opt->fOverrides);
+    opt->fColorPOI.initUsingInvariantOutput(color);
+    opt->fCoveragePOI.initUsingInvariantOutput(coverage);
+}
+
+bool GrDrawBatch::installPipeline(const GrPipeline::CreateArgs& args) {
+    GrXPOverridesForBatch overrides;
+    void* location = fPipelineStorage.get();
+    if (!GrPipeline::CreateAt(location, args, &overrides)) {
+        return false;
+    }
+    this->initBatchTracker(overrides);
+    fPipelineInstalled = true;
+    return true;
+}
diff --git a/gfx/skia/skia/src/gpu/batches/GrDrawBatch.h b/gfx/skia/skia/src/gpu/batches/GrDrawBatch.h
new file mode 100644
index 000000000000..8e738789812c
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrDrawBatch.h
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrDrawBatch_DEFINED
+#define GrDrawBatch_DEFINED
+
+#include "GrBatch.h"
+#include "GrPipeline.h"
+
+struct GrInitInvariantOutput;
+
+/**
+ * GrDrawBatches are flushed in two phases (preDraw, and draw). In preDraw uploads to GrGpuResources
+ * and draws are determined and scheduled. They are issued in the draw phase. GrBatchToken is used
+ * to sequence the uploads relative to each other and to draws.
+ **/
+
+typedef uint64_t GrBatchToken;
+
+class GrBatchUploader : public SkRefCnt {
+public:
+    class TextureUploader;
+
+    GrBatchUploader(GrBatchToken lastUploadToken) : fLastUploadToken(lastUploadToken) {}
+    GrBatchToken lastUploadToken() const { return fLastUploadToken; }
+    virtual void upload(TextureUploader*)=0;
+
+private:
+    GrBatchToken fLastUploadToken;
+};
+
+/**
+ * Base class for GrBatches that draw. These batches have a GrPipeline installed by GrDrawTarget.
+ */
+class GrDrawBatch : public GrBatch {
+public:
+    class Target;
+
+    GrDrawBatch(uint32_t classID);
+    ~GrDrawBatch() override;
+
+    /**
+     * Fills in a structure informing the XP of overrides to its normal behavior.
+     */
+    void getPipelineOptimizations(GrPipelineOptimizations* override) const;
+
+    const GrPipeline* pipeline() const {
+        SkASSERT(fPipelineInstalled);
+        return reinterpret_cast<const GrPipeline*>(fPipelineStorage.get());
+    }
+
+    bool installPipeline(const GrPipeline::CreateArgs&);
+
+    // TODO no GrPrimitiveProcessors yet read fragment position
+    bool willReadFragmentPosition() const { return false; }
+
+    uint32_t renderTargetUniqueID() const final {
+        SkASSERT(fPipelineInstalled);
+        return this->pipeline()->getRenderTarget()->getUniqueID();
+    }
+
+    SkString dumpInfo() const override {
+        SkString string;
+        string.appendf("RT: %d\n", this->renderTargetUniqueID());
+        string.append("ColorStages:\n");
+        for (int i = 0; i < this->pipeline()->numColorFragmentProcessors(); i++) {
+            string.appendf("\t\t%s\n\t\t%s\n",
+                           this->pipeline()->getColorFragmentProcessor(i).name(),
+                           this->pipeline()->getColorFragmentProcessor(i).dumpInfo().c_str());
+        }
+        string.append("CoverageStages:\n");
+        for (int i = 0; i < this->pipeline()->numCoverageFragmentProcessors(); i++) {
+            string.appendf("\t\t%s\n\t\t%s\n",
+                           this->pipeline()->getCoverageFragmentProcessor(i).name(),
+                           this->pipeline()->getCoverageFragmentProcessor(i).dumpInfo().c_str());
+        }
+        string.appendf("XP: %s\n", this->pipeline()->getXferProcessor()->name());
+        return string;
+    }
+
+protected:
+    virtual void computePipelineOptimizations(GrInitInvariantOutput* color, 
+                                              GrInitInvariantOutput* coverage,
+                                              GrBatchToXPOverrides* overrides) const = 0;
+
+private:
+    /**
+     * initBatchTracker is a hook for the some additional overrides / optimization possibilities
+     * from the GrXferProcessor.
+     */
+    virtual void initBatchTracker(const GrXPOverridesForBatch&) = 0;
+
+protected:
+    SkTArray<SkAutoTUnref<GrBatchUploader>, true>   fInlineUploads;
+
+private:
+    SkAlignedSTStorage<1, GrPipeline>               fPipelineStorage;
+    bool                                            fPipelineInstalled;
+    typedef GrBatch INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrDrawPathBatch.cpp b/gfx/skia/skia/src/gpu/batches/GrDrawPathBatch.cpp
new file mode 100644
index 000000000000..5209f907de29
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrDrawPathBatch.cpp
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrDrawPathBatch.h"
+
+SkString GrDrawPathBatch::dumpInfo() const {
+    SkString string;
+    string.printf("PATH: 0x%p", fPath.get());
+    return string;
+}
+
+void GrDrawPathBatch::onDraw(GrBatchFlushState* state) {
+    GrProgramDesc  desc;
+
+    SkAutoTUnref<GrPathProcessor> pathProc(GrPathProcessor::Create(this->color(),
+                                                                   this->overrides(),
+                                                                   this->viewMatrix()));
+    state->gpu()->buildProgramDesc(&desc, *pathProc, *this->pipeline());
+    GrPathRendering::DrawPathArgs args(pathProc, this->pipeline(),
+                                        &desc, &this->stencilSettings());
+    state->gpu()->pathRendering()->drawPath(args, fPath.get());
+}
+
+GrDrawPathRangeBatch::~GrDrawPathRangeBatch() {
+    for (DrawList::Iter iter(fDraws); iter.get(); iter.next()) {
+        (*iter.get())->unref();
+    }
+}
+
+SkString GrDrawPathRangeBatch::dumpInfo() const {
+    SkString string;
+    string.printf("RANGE: 0x%p COUNTS: [", *fDraws.head());
+    for (DrawList::Iter iter(fDraws); iter.get(); iter.next()) {
+        string.appendf("%d ,", (*iter.get())->count());
+    }
+    string.remove(string.size() - 2, 2);
+    string.append("]");
+    return string;
+}
+
+bool GrDrawPathRangeBatch::isWinding() const {
+    static const GrStencilSettings::Face pathFace = GrStencilSettings::kFront_Face;
+    bool isWinding = kInvert_StencilOp != this->stencilSettings().passOp(pathFace);
+    if (isWinding) {
+        // Double check that it is in fact winding.
+        SkASSERT(kIncClamp_StencilOp == this->stencilSettings().passOp(pathFace));
+        SkASSERT(kIncClamp_StencilOp == this->stencilSettings().failOp(pathFace));
+        SkASSERT(0x1 != this->stencilSettings().writeMask(pathFace));
+        SkASSERT(!this->stencilSettings().isTwoSided());
+    }
+    return isWinding;
+}
+
+GrDrawPathRangeBatch::GrDrawPathRangeBatch(const SkMatrix& viewMatrix, const SkMatrix& localMatrix,
+                                           GrColor color, GrPathRange* range, GrPathRangeDraw* draw,
+                                           const SkRect& bounds)
+    : INHERITED(ClassID(), viewMatrix, color)
+    , fPathRange(range)
+    , fLocalMatrix(localMatrix) {
+    SkDEBUGCODE(draw->fUsedInBatch = true;)
+    fDraws.addToHead(SkRef(draw));
+    fTotalPathCount = draw->count();
+    fBounds = bounds;
+}
+
+bool GrDrawPathRangeBatch::onCombineIfPossible(GrBatch* t, const GrCaps& caps) {
+    GrDrawPathRangeBatch* that = t->cast<GrDrawPathRangeBatch>();
+    if (this->fPathRange.get() != that->fPathRange.get()) {
+        return false;
+    }
+    if (!GrPathRangeDraw::CanMerge(**this->fDraws.head(), **that->fDraws.head())) {
+        return false;
+    }
+    if (!GrPipeline::AreEqual(*this->pipeline(), *that->pipeline(), false)) {
+        return false;
+    }
+    if (this->color() != that->color() ||
+        !this->viewMatrix().cheapEqualTo(that->viewMatrix()) ||
+        !fLocalMatrix.cheapEqualTo(that->fLocalMatrix)) {
+        return false;
+    }
+    // TODO: Check some other things here. (winding, opaque, pathProc color, vm, ...)
+    // Try to combine this call with the previous DrawPaths. We do this by stenciling all the
+    // paths together and then covering them in a single pass. This is not equivalent to two
+    // separate draw calls, so we can only do it if there is no blending (no overlap would also
+    // work). Note that it's also possible for overlapping paths to cancel each other's winding
+    // numbers, and we only partially account for this by not allowing even/odd paths to be
+    // combined. (Glyphs in the same font tend to wind the same direction so it works out OK.)
+    if (!this->isWinding() ||
+        this->stencilSettings() != that->stencilSettings() ||
+        this->overrides().willColorBlendWithDst()) {
+        return false;
+    }
+    SkASSERT(!that->overrides().willColorBlendWithDst());
+    fTotalPathCount += that->fTotalPathCount;
+    while (GrPathRangeDraw** head = that->fDraws.head()) {
+        fDraws.addToTail(*head);
+        // We're stealing that's refs, so pop without unreffing.
+        that->fDraws.popHead();
+    }
+    return true;
+}
+
+void GrDrawPathRangeBatch::onDraw(GrBatchFlushState* state) {
+    GrProgramDesc  desc;
+    SkAutoTUnref<GrPathProcessor> pathProc(GrPathProcessor::Create(this->color(),
+                                                                   this->overrides(),
+                                                                   this->viewMatrix(),
+                                                                   fLocalMatrix));
+    state->gpu()->buildProgramDesc(&desc, *pathProc, *this->pipeline());
+    GrPathRendering::DrawPathArgs args(pathProc, this->pipeline(),
+                                        &desc, &this->stencilSettings());
+    if (fDraws.count() == 1) {
+        const GrPathRangeDraw& draw = **fDraws.head();
+        state->gpu()->pathRendering()->drawPaths(args, fPathRange.get(), draw.indices(),
+            GrPathRange::kU16_PathIndexType, draw.transforms(), draw.transformType(),
+            draw.count());
+        return;
+    }
+
+    GrPathRendering::PathTransformType transformType = (*fDraws.head())->transformType();
+    int floatsPerTransform = GrPathRendering::PathTransformSize(transformType);
+    SkAutoSTMalloc<512, float> transformStorage(floatsPerTransform * fTotalPathCount);
+    SkAutoSTMalloc<256, uint16_t> indexStorage(fTotalPathCount);
+    uint16_t* indices = indexStorage.get();
+    float* transforms = transformStorage.get();
+    for (DrawList::Iter iter(fDraws); iter.get(); iter.next()) {
+        SkASSERT((*iter.get())->transformType() == transformType);
+        int cnt = (*iter.get())->count();
+        memcpy(indices, (*iter.get())->indices(), cnt * sizeof(uint16_t));
+        indices += cnt;
+        memcpy(transforms, (*iter.get())->transforms(), cnt * floatsPerTransform * sizeof(float));
+        transforms += cnt * floatsPerTransform;
+    }
+    SkASSERT(indices - indexStorage.get() == fTotalPathCount);
+    state->gpu()->pathRendering()->drawPaths(args, fPathRange.get(), indexStorage.get(),
+        GrPathRange::kU16_PathIndexType, transformStorage.get(), transformType,
+        fTotalPathCount);
+}
diff --git a/gfx/skia/skia/src/gpu/batches/GrDrawPathBatch.h b/gfx/skia/skia/src/gpu/batches/GrDrawPathBatch.h
new file mode 100644
index 000000000000..4067c808dc01
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrDrawPathBatch.h
@@ -0,0 +1,184 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrDrawPathBatch_DEFINED
+#define GrDrawPathBatch_DEFINED
+
+#include "GrBatchFlushState.h"
+#include "GrDrawBatch.h"
+#include "GrGpu.h"
+#include "GrPath.h"
+#include "GrPathRendering.h"
+#include "GrPathProcessor.h"
+
+#include "SkTLList.h"
+
+class GrDrawPathBatchBase : public GrDrawBatch {
+public:
+    void computePipelineOptimizations(GrInitInvariantOutput* color, 
+                                      GrInitInvariantOutput* coverage,
+                                      GrBatchToXPOverrides* overrides) const override {
+        color->setKnownFourComponents(fColor);
+        coverage->setKnownSingleComponent(0xff);
+        overrides->fUsePLSDstRead = false;
+    }
+
+    void setStencilSettings(const GrStencilSettings& stencil) { fStencilSettings = stencil; }
+
+protected:
+    GrDrawPathBatchBase(uint32_t classID, const SkMatrix& viewMatrix, GrColor initialColor)
+        : INHERITED(classID)
+        , fViewMatrix(viewMatrix)
+        , fColor(initialColor) {}
+
+    const GrStencilSettings& stencilSettings() const { return fStencilSettings; }
+    const GrXPOverridesForBatch& overrides() const { return fOverrides; }
+    const SkMatrix& viewMatrix() const { return fViewMatrix; }
+    GrColor color() const { return fColor; }
+
+private:
+    void initBatchTracker(const GrXPOverridesForBatch& overrides) override {
+        overrides.getOverrideColorIfSet(&fColor);
+        fOverrides = overrides;
+    }
+
+    SkMatrix                                                fViewMatrix;
+    GrColor                                                 fColor;
+    GrStencilSettings                                       fStencilSettings;
+    GrXPOverridesForBatch                                   fOverrides;
+
+    typedef GrDrawBatch INHERITED;
+};
+
+class GrDrawPathBatch final : public GrDrawPathBatchBase {
+public:
+    DEFINE_BATCH_CLASS_ID
+
+    // This can't return a more abstract type because we install the stencil settings late :(
+    static GrDrawPathBatchBase* Create(const SkMatrix& viewMatrix, GrColor color,
+                                       const GrPath* path) {
+        return new GrDrawPathBatch(viewMatrix, color, path);
+    }
+
+    const char* name() const override { return "DrawPath"; }
+
+    SkString dumpInfo() const override;
+
+private:
+    GrDrawPathBatch(const SkMatrix& viewMatrix, GrColor color, const GrPath* path)
+        : INHERITED(ClassID(), viewMatrix, color)
+        , fPath(path) {
+        fBounds = path->getBounds();
+        viewMatrix.mapRect(&fBounds);
+    }
+
+    bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override { return false; }
+
+    void onPrepare(GrBatchFlushState*) override {}
+
+    void onDraw(GrBatchFlushState* state) override;
+
+    GrPendingIOResource<const GrPath, kRead_GrIOType> fPath;
+
+    typedef GrDrawPathBatchBase INHERITED;
+};
+
+/**
+ * This could be nested inside the batch class, but for now it must be declarable in a public
+ * header (GrDrawContext)
+ */
+class GrPathRangeDraw : public GrNonAtomicRef {
+public:
+    typedef GrPathRendering::PathTransformType TransformType;
+
+    static GrPathRangeDraw* Create(TransformType transformType, int reserveCnt) {
+        return new GrPathRangeDraw(transformType, reserveCnt);
+    }
+
+    void append(uint16_t index, float transform[]) {
+        fTransforms.push_back_n(GrPathRendering::PathTransformSize(fTransformType), transform);
+        fIndices.push_back(index);
+    }
+
+    int count() const { return fIndices.count(); }
+
+    TransformType transformType() const { return fTransformType; }
+
+    const float* transforms() const { return fTransforms.begin(); }
+
+    const uint16_t* indices() const { return fIndices.begin(); }
+
+    static bool CanMerge(const GrPathRangeDraw& a, const GrPathRangeDraw& b) {
+        return a.transformType() == b.transformType();
+    }
+
+private:
+    GrPathRangeDraw(TransformType transformType, int reserveCnt)
+        : fTransformType(transformType)
+        , fIndices(reserveCnt)
+        , fTransforms(reserveCnt * GrPathRendering::PathTransformSize(transformType)) {
+        SkDEBUGCODE(fUsedInBatch = false;)
+    }
+
+    // Reserve space for 64 paths where indices are 16 bit and transforms are translations.
+    static const int kIndexReserveCnt = 64;
+    static const int kTransformBufferReserveCnt = 2 * 64;
+
+    GrPathRendering::PathTransformType                     fTransformType;
+    SkSTArray<kIndexReserveCnt, uint16_t, true>            fIndices;
+    SkSTArray<kTransformBufferReserveCnt, float, true>     fTransforms;
+
+    // To ensure we don't reuse these across batches.
+#ifdef SK_DEBUG
+    bool fUsedInBatch;
+    friend class GrDrawPathRangeBatch;
+#endif
+
+    typedef GrNonAtomicRef INHERITED;
+};
+
+// Template this if we decide to support index types other than 16bit
+class GrDrawPathRangeBatch final : public GrDrawPathBatchBase {
+public:
+    DEFINE_BATCH_CLASS_ID
+
+    // This can't return a more abstract type because we install the stencil settings late :(
+    static GrDrawPathBatchBase* Create(const SkMatrix& viewMatrix, const SkMatrix& localMatrix,
+                                       GrColor color, GrPathRange* range, GrPathRangeDraw* draw,
+                                       const SkRect& bounds) {
+        return new GrDrawPathRangeBatch(viewMatrix, localMatrix, color, range, draw, bounds);
+    }
+
+    ~GrDrawPathRangeBatch() override;
+
+    const char* name() const override { return "DrawPathRange"; }
+
+    SkString dumpInfo() const override;
+
+private:
+    inline bool isWinding() const;
+
+    GrDrawPathRangeBatch(const SkMatrix& viewMatrix, const SkMatrix& localMatrix, GrColor color,
+                         GrPathRange* range, GrPathRangeDraw* draw, const SkRect& bounds);
+
+    bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override;
+
+    void onPrepare(GrBatchFlushState*) override {}
+
+    void onDraw(GrBatchFlushState* state) override;
+
+    typedef GrPendingIOResource<const GrPathRange, kRead_GrIOType> PendingPathRange;
+    typedef SkTLList<GrPathRangeDraw*, 4> DrawList;
+    PendingPathRange    fPathRange;
+    DrawList            fDraws;
+    int                 fTotalPathCount;
+    SkMatrix            fLocalMatrix;
+
+    typedef GrDrawPathBatchBase INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrDrawVerticesBatch.cpp b/gfx/skia/skia/src/gpu/batches/GrDrawVerticesBatch.cpp
new file mode 100644
index 000000000000..cfbd24c9c57d
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrDrawVerticesBatch.cpp
@@ -0,0 +1,327 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrDrawVerticesBatch.h"
+
+#include "GrBatchFlushState.h"
+#include "GrInvariantOutput.h"
+#include "GrDefaultGeoProcFactory.h"
+
+static const GrGeometryProcessor* set_vertex_attributes(bool hasLocalCoords,
+                                                        int* colorOffset,
+                                                        int* texOffset,
+                                                        const SkMatrix& viewMatrix,
+                                                        bool coverageIgnored) {
+    using namespace GrDefaultGeoProcFactory;
+    *texOffset = -1;
+    *colorOffset = -1;
+
+    Coverage coverage(coverageIgnored ? Coverage::kNone_Type : Coverage::kSolid_Type);
+    LocalCoords localCoords(hasLocalCoords ? LocalCoords::kHasExplicit_Type :
+                                             LocalCoords::kUsePosition_Type);
+    *colorOffset = sizeof(SkPoint);
+    if (hasLocalCoords) {
+        *texOffset = sizeof(SkPoint) + sizeof(GrColor);
+    }
+    return GrDefaultGeoProcFactory::Create(Color(Color::kAttribute_Type),
+                                           coverage, localCoords, viewMatrix);
+}
+
+GrDrawVerticesBatch::GrDrawVerticesBatch(const Geometry& geometry, GrPrimitiveType primitiveType,
+                                         const SkMatrix& viewMatrix,
+                                         const SkPoint* positions, int vertexCount,
+                                         const uint16_t* indices, int indexCount,
+                                         const GrColor* colors, const SkPoint* localCoords,
+                                         const SkRect& bounds)
+    : INHERITED(ClassID()) {
+    SkASSERT(positions);
+
+    fViewMatrix = viewMatrix;
+    Geometry& installedGeo = fGeoData.push_back(geometry);
+
+    installedGeo.fPositions.append(vertexCount, positions);
+    if (indices) {
+        installedGeo.fIndices.append(indexCount, indices);
+    }
+
+    if (colors) {
+        fVariableColor = true;
+        installedGeo.fColors.append(vertexCount, colors);
+    } else {
+        fVariableColor = false;
+    }
+
+    if (localCoords) {
+        installedGeo.fLocalCoords.append(vertexCount, localCoords);
+    }
+    fVertexCount = vertexCount;
+    fIndexCount = indexCount;
+    fPrimitiveType = primitiveType;
+
+    this->setBounds(bounds);
+}
+
+void GrDrawVerticesBatch::computePipelineOptimizations(GrInitInvariantOutput* color, 
+                                                       GrInitInvariantOutput* coverage,
+                                                       GrBatchToXPOverrides* overrides) const {
+    // When this is called on a batch, there is only one geometry bundle
+    if (fVariableColor) {
+        color->setUnknownFourComponents();
+    } else {
+        color->setKnownFourComponents(fGeoData[0].fColor);
+    }
+    coverage->setKnownSingleComponent(0xff);
+    overrides->fUsePLSDstRead = false;
+}
+
+void GrDrawVerticesBatch::initBatchTracker(const GrXPOverridesForBatch& overrides) {
+    SkASSERT(fGeoData.count() == 1);
+    GrColor overrideColor;
+    if (overrides.getOverrideColorIfSet(&overrideColor)) {
+        fGeoData[0].fColor = overrideColor;
+        fGeoData[0].fColors.reset();
+        fVariableColor = false;
+    }
+    fCoverageIgnored = !overrides.readsCoverage();
+    if (!overrides.readsLocalCoords()) {
+        fGeoData[0].fLocalCoords.reset();
+    }
+}
+
+void GrDrawVerticesBatch::onPrepareDraws(Target* target) const {
+    bool hasLocalCoords = !fGeoData[0].fLocalCoords.isEmpty();
+    int colorOffset = -1, texOffset = -1;
+    SkAutoTUnref<const GrGeometryProcessor> gp(
+        set_vertex_attributes(hasLocalCoords, &colorOffset, &texOffset, fViewMatrix,
+                              fCoverageIgnored));
+    target->initDraw(gp, this->pipeline());
+
+    size_t vertexStride = gp->getVertexStride();
+
+    SkASSERT(vertexStride == sizeof(SkPoint) + (hasLocalCoords ? sizeof(SkPoint) : 0)
+                                             + sizeof(GrColor));
+
+    int instanceCount = fGeoData.count();
+
+    const GrVertexBuffer* vertexBuffer;
+    int firstVertex;
+
+    void* verts = target->makeVertexSpace(vertexStride, fVertexCount, &vertexBuffer, &firstVertex);
+
+    if (!verts) {
+        SkDebugf("Could not allocate vertices\n");
+        return;
+    }
+
+    const GrIndexBuffer* indexBuffer = nullptr;
+    int firstIndex = 0;
+
+    uint16_t* indices = nullptr;
+    if (!fGeoData[0].fIndices.isEmpty()) {
+        indices = target->makeIndexSpace(fIndexCount, &indexBuffer, &firstIndex);
+
+        if (!indices) {
+            SkDebugf("Could not allocate indices\n");
+            return;
+        }
+    }
+
+    int indexOffset = 0;
+    int vertexOffset = 0;
+    for (int i = 0; i < instanceCount; i++) {
+        const Geometry& args = fGeoData[i];
+
+        // TODO we can actually cache this interleaved and then just memcopy
+        if (indices) {
+            for (int j = 0; j < args.fIndices.count(); ++j, ++indexOffset) {
+                *(indices + indexOffset) = args.fIndices[j] + vertexOffset;
+            }
+        }
+
+        for (int j = 0; j < args.fPositions.count(); ++j) {
+            *((SkPoint*)verts) = args.fPositions[j];
+            if (args.fColors.isEmpty()) {
+                *(GrColor*)((intptr_t)verts + colorOffset) = args.fColor;
+            } else {
+                *(GrColor*)((intptr_t)verts + colorOffset) = args.fColors[j];
+            }
+            if (hasLocalCoords) {
+                *(SkPoint*)((intptr_t)verts + texOffset) = args.fLocalCoords[j];
+            }
+            verts = (void*)((intptr_t)verts + vertexStride);
+            vertexOffset++;
+        }
+    }
+
+    GrVertices vertices;
+    if (indices) {
+        vertices.initIndexed(this->primitiveType(), vertexBuffer, indexBuffer, firstVertex,
+                             firstIndex, fVertexCount, fIndexCount);
+
+    } else {
+        vertices.init(this->primitiveType(), vertexBuffer, firstVertex, fVertexCount);
+    }
+    target->draw(vertices);
+}
+
+bool GrDrawVerticesBatch::onCombineIfPossible(GrBatch* t, const GrCaps& caps) {
+    GrDrawVerticesBatch* that = t->cast<GrDrawVerticesBatch>();
+
+    if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *that->pipeline(),
+                                that->bounds(), caps)) {
+        return false;
+    }
+
+    if (!this->batchablePrimitiveType() || this->primitiveType() != that->primitiveType()) {
+        return false;
+    }
+
+    // We currently use a uniform viewmatrix for this batch
+    if (!fViewMatrix.cheapEqualTo(that->fViewMatrix)) {
+        return false;
+    }
+
+    if (fGeoData[0].fIndices.isEmpty() != that->fGeoData[0].fIndices.isEmpty()) {
+        return false;
+    }
+
+    if (fGeoData[0].fLocalCoords.isEmpty() != that->fGeoData[0].fLocalCoords.isEmpty()) {
+        return false;
+    }
+
+    if (!fVariableColor) {
+        if (that->fVariableColor || that->fGeoData[0].fColor != fGeoData[0].fColor) {
+            fVariableColor = true;
+        }
+    }
+
+    fGeoData.push_back_n(that->geoData()->count(), that->geoData()->begin());
+    fVertexCount += that->fVertexCount;
+    fIndexCount += that->fIndexCount;
+
+    this->joinBounds(that->bounds());
+    return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef GR_TEST_UTILS
+
+#include "GrBatchTest.h"
+
+static uint32_t seed_vertices(GrPrimitiveType type) {
+    switch (type) {
+        case kTriangles_GrPrimitiveType:
+        case kTriangleStrip_GrPrimitiveType:
+        case kTriangleFan_GrPrimitiveType:
+            return 3;
+        case kPoints_GrPrimitiveType:
+            return 1;
+        case kLines_GrPrimitiveType:
+        case kLineStrip_GrPrimitiveType:
+            return 2;
+    }
+    SkFAIL("Incomplete switch\n");
+    return 0;
+}
+
+static uint32_t primitive_vertices(GrPrimitiveType type) {
+    switch (type) {
+        case kTriangles_GrPrimitiveType:
+            return 3;
+        case kLines_GrPrimitiveType:
+            return 2;
+        case kTriangleStrip_GrPrimitiveType:
+        case kTriangleFan_GrPrimitiveType:
+        case kPoints_GrPrimitiveType:
+        case kLineStrip_GrPrimitiveType:
+            return 1;
+    }
+    SkFAIL("Incomplete switch\n");
+    return 0;
+}
+
+static SkPoint random_point(SkRandom* random, SkScalar min, SkScalar max) {
+    SkPoint p;
+    p.fX = random->nextRangeScalar(min, max);
+    p.fY = random->nextRangeScalar(min, max);
+    return p;
+}
+
+static void randomize_params(size_t count, size_t maxVertex, SkScalar min, SkScalar max,
+                             SkRandom* random,
+                             SkTArray<SkPoint>* positions,
+                             SkTArray<SkPoint>* texCoords, bool hasTexCoords,
+                             SkTArray<GrColor>* colors, bool hasColors,
+                             SkTArray<uint16_t>* indices, bool hasIndices) {
+    for (uint32_t v = 0; v < count; v++) {
+        positions->push_back(random_point(random, min, max));
+        if (hasTexCoords) {
+            texCoords->push_back(random_point(random, min, max));
+        }
+        if (hasColors) {
+            colors->push_back(GrRandomColor(random));
+        }
+        if (hasIndices) {
+            SkASSERT(maxVertex <= SK_MaxU16);
+            indices->push_back(random->nextULessThan((uint16_t)maxVertex));
+        }
+    }
+}
+
+DRAW_BATCH_TEST_DEFINE(VerticesBatch) {
+    GrPrimitiveType type = GrPrimitiveType(random->nextULessThan(kLast_GrPrimitiveType + 1));
+    uint32_t primitiveCount = random->nextRangeU(1, 100);
+
+    // TODO make 'sensible' indexbuffers
+    SkTArray<SkPoint> positions;
+    SkTArray<SkPoint> texCoords;
+    SkTArray<GrColor> colors;
+    SkTArray<uint16_t> indices;
+
+    bool hasTexCoords = random->nextBool();
+    bool hasIndices = random->nextBool();
+    bool hasColors = random->nextBool();
+
+    uint32_t vertexCount = seed_vertices(type) + (primitiveCount - 1) * primitive_vertices(type);
+
+    static const SkScalar kMinVertExtent = -100.f;
+    static const SkScalar kMaxVertExtent = 100.f;
+    randomize_params(seed_vertices(type), vertexCount, kMinVertExtent, kMaxVertExtent,
+                     random,
+                     &positions,
+                     &texCoords, hasTexCoords,
+                     &colors, hasColors,
+                     &indices, hasIndices);
+
+    for (uint32_t i = 1; i < primitiveCount; i++) {
+        randomize_params(primitive_vertices(type), vertexCount, kMinVertExtent, kMaxVertExtent,
+                         random,
+                         &positions,
+                         &texCoords, hasTexCoords,
+                         &colors, hasColors,
+                         &indices, hasIndices);
+    }
+
+    SkMatrix viewMatrix = GrTest::TestMatrix(random);
+    SkRect bounds;
+    SkDEBUGCODE(bool result = ) bounds.setBoundsCheck(positions.begin(), vertexCount);
+    SkASSERT(result);
+
+    viewMatrix.mapRect(&bounds);
+
+    GrDrawVerticesBatch::Geometry geometry;
+    geometry.fColor = GrRandomColor(random);
+    return GrDrawVerticesBatch::Create(geometry, type, viewMatrix,
+                                       positions.begin(), vertexCount,
+                                       indices.begin(), hasIndices ? vertexCount : 0,
+                                       colors.begin(),
+                                       texCoords.begin(),
+                                       bounds);
+}
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrDrawVerticesBatch.h b/gfx/skia/skia/src/gpu/batches/GrDrawVerticesBatch.h
new file mode 100644
index 000000000000..9b2faf3d3dba
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrDrawVerticesBatch.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrDrawVerticesBatch_DEFINED
+#define GrDrawVerticesBatch_DEFINED
+
+#include "GrColor.h"
+#include "GrTypes.h"
+#include "GrVertexBatch.h"
+#include "SkMatrix.h"
+#include "SkRect.h"
+#include "SkTDArray.h"
+
+class GrBatchFlushState;
+struct GrInitInvariantOutput;
+
+class GrDrawVerticesBatch : public GrVertexBatch {
+public:
+    DEFINE_BATCH_CLASS_ID
+
+    struct Geometry {
+        GrColor fColor; // Only used if there are no per-vertex colors
+        SkTDArray<SkPoint> fPositions;
+        SkTDArray<uint16_t> fIndices;
+        SkTDArray<GrColor> fColors;
+        SkTDArray<SkPoint> fLocalCoords;
+    };
+
+    static GrDrawBatch* Create(const Geometry& geometry, GrPrimitiveType primitiveType,
+                               const SkMatrix& viewMatrix,
+                               const SkPoint* positions, int vertexCount,
+                               const uint16_t* indices, int indexCount,
+                               const GrColor* colors, const SkPoint* localCoords,
+                               const SkRect& bounds) {
+        return new GrDrawVerticesBatch(geometry, primitiveType, viewMatrix, positions, vertexCount,
+                                       indices, indexCount, colors, localCoords, bounds);
+    }
+
+    const char* name() const override { return "DrawVerticesBatch"; }
+
+    void computePipelineOptimizations(GrInitInvariantOutput* color, 
+                                      GrInitInvariantOutput* coverage,
+                                      GrBatchToXPOverrides* overrides) const override;
+
+    SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
+
+private:
+    void onPrepareDraws(Target*) const override;
+    void initBatchTracker(const GrXPOverridesForBatch&) override;
+
+    GrDrawVerticesBatch(const Geometry& geometry, GrPrimitiveType primitiveType,
+                        const SkMatrix& viewMatrix,
+                        const SkPoint* positions, int vertexCount,
+                        const uint16_t* indices, int indexCount,
+                        const GrColor* colors, const SkPoint* localCoords, const SkRect& bounds);
+
+    GrPrimitiveType primitiveType() const { return fPrimitiveType; }
+    bool batchablePrimitiveType() const {
+        return kTriangles_GrPrimitiveType == fPrimitiveType ||
+               kLines_GrPrimitiveType == fPrimitiveType ||
+               kPoints_GrPrimitiveType == fPrimitiveType;
+    }
+
+    bool onCombineIfPossible(GrBatch* t, const GrCaps&) override;
+
+    GrPrimitiveType     fPrimitiveType;
+    SkMatrix            fViewMatrix;
+    bool                fVariableColor;
+    int                 fVertexCount;
+    int                 fIndexCount;
+    bool                fCoverageIgnored; // comes from initBatchTracker.
+
+    SkSTArray<1, Geometry, true> fGeoData;
+
+    typedef GrVertexBatch INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrNinePatch.cpp b/gfx/skia/skia/src/gpu/batches/GrNinePatch.cpp
new file mode 100644
index 000000000000..59040cbbe939
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrNinePatch.cpp
@@ -0,0 +1,184 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrNinePatch.h"
+
+#include "GrBatchFlushState.h"
+#include "GrDefaultGeoProcFactory.h"
+#include "GrResourceProvider.h"
+#include "GrVertexBatch.h"
+#include "SkBitmap.h"
+#include "SkNinePatchIter.h"
+#include "SkRect.h"
+
+static const GrGeometryProcessor* create_gp(bool readsCoverage) {
+    using namespace GrDefaultGeoProcFactory;
+    Color color(Color::kAttribute_Type);
+    Coverage coverage(readsCoverage ? Coverage::kSolid_Type : Coverage::kNone_Type);
+    LocalCoords localCoords(LocalCoords::kHasExplicit_Type);
+    return GrDefaultGeoProcFactory::Create(color, coverage, localCoords, SkMatrix::I());
+}
+
+class GrNonAANinePatchBatch : public GrVertexBatch {
+public:
+    DEFINE_BATCH_CLASS_ID
+
+    static const int kVertsPerRect = 4;
+    static const int kIndicesPerRect = 6;
+    static const int kRectsPerInstance = 9; // We could skip empty rects
+
+    struct Geometry {
+        SkMatrix fViewMatrix;
+        SkIRect fCenter;
+        SkRect fDst;
+        GrColor fColor;
+    };
+
+    GrNonAANinePatchBatch(GrColor color, const SkMatrix& viewMatrix, int imageWidth,
+                          int imageHeight, const SkIRect& center, const SkRect &dst)
+        : INHERITED(ClassID()) {
+        Geometry& geo = fGeoData.push_back();
+        geo.fViewMatrix = viewMatrix;
+        geo.fColor = color;
+        geo.fCenter = center;
+        geo.fDst = dst;
+
+        fImageWidth = imageWidth;
+        fImageHeight = imageHeight;
+
+        // setup bounds
+        geo.fViewMatrix.mapRect(&fBounds, geo.fDst);
+    }
+
+    const char* name() const override { return "NonAANinePatchBatch"; }
+
+    SkString dumpInfo() const override {
+        SkString str;
+
+        for (int i = 0; i < fGeoData.count(); ++i) {
+            str.appendf("%d: Color: 0x%08x Center [L: %d, T: %d, R: %d, B: %d], "
+                        "Dst [L: %.2f, T: %.2f, R: %.2f, B: %.2f]\n",
+                        i,
+                        fGeoData[i].fColor,
+                        fGeoData[i].fCenter.fLeft, fGeoData[i].fCenter.fTop,
+                        fGeoData[i].fCenter.fRight, fGeoData[i].fCenter.fBottom,
+                        fGeoData[i].fDst.fLeft, fGeoData[i].fDst.fTop,
+                        fGeoData[i].fDst.fRight, fGeoData[i].fDst.fBottom);
+        }
+
+        str.append(INHERITED::dumpInfo());
+        return str;
+    }
+
+    void computePipelineOptimizations(GrInitInvariantOutput* color, 
+                                      GrInitInvariantOutput* coverage,
+                                      GrBatchToXPOverrides* overrides) const override {
+        color->setUnknownFourComponents();
+        coverage->setKnownSingleComponent(0xff);
+        overrides->fUsePLSDstRead = false;
+    }
+
+    SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
+
+private:
+    void onPrepareDraws(Target* target) const override {
+        SkAutoTUnref<const GrGeometryProcessor> gp(create_gp(fOverrides.readsCoverage()));
+        if (!gp) {
+            SkDebugf("Couldn't create GrGeometryProcessor\n");
+            return;
+        }
+
+        target->initDraw(gp, this->pipeline());
+
+        size_t vertexStride = gp->getVertexStride();
+        int instanceCount = fGeoData.count();
+
+        SkAutoTUnref<const GrIndexBuffer> indexBuffer(
+                target->resourceProvider()->refQuadIndexBuffer());
+        InstancedHelper helper;
+        void* vertices = helper.init(target, kTriangles_GrPrimitiveType, vertexStride,
+                                     indexBuffer, kVertsPerRect,
+                                     kIndicesPerRect, instanceCount * kRectsPerInstance);
+        if (!vertices || !indexBuffer) {
+            SkDebugf("Could not allocate vertices\n");
+            return;
+        }
+
+        for (int i = 0; i < instanceCount; i++) {
+            intptr_t verts = reinterpret_cast<intptr_t>(vertices) +
+                             i * kRectsPerInstance * kVertsPerRect * vertexStride;
+
+            const Geometry& geo = fGeoData[i];
+            SkNinePatchIter iter(fImageWidth, fImageHeight, geo.fCenter, geo.fDst);
+
+            SkRect srcR, dstR;
+            while (iter.next(&srcR, &dstR)) {
+                SkPoint* positions = reinterpret_cast<SkPoint*>(verts);
+
+                positions->setRectFan(dstR.fLeft, dstR.fTop,
+                                      dstR.fRight, dstR.fBottom, vertexStride);
+
+                SkASSERT(!geo.fViewMatrix.hasPerspective());
+                geo.fViewMatrix.mapPointsWithStride(positions, vertexStride, kVertsPerRect);
+
+                // Setup local coords
+                static const int kLocalOffset = sizeof(SkPoint) + sizeof(GrColor);
+                SkPoint* coords = reinterpret_cast<SkPoint*>(verts + kLocalOffset);
+                coords->setRectFan(srcR.fLeft, srcR.fTop, srcR.fRight, srcR.fBottom, vertexStride);
+
+                static const int kColorOffset = sizeof(SkPoint);
+                GrColor* vertColor = reinterpret_cast<GrColor*>(verts + kColorOffset);
+                for (int j = 0; j < 4; ++j) {
+                    *vertColor = geo.fColor;
+                    vertColor = (GrColor*) ((intptr_t) vertColor + vertexStride);
+                }
+                verts += kVertsPerRect * vertexStride;
+            }
+        }
+        helper.recordDraw(target);
+    }
+
+    void initBatchTracker(const GrXPOverridesForBatch& overrides) override {
+        overrides.getOverrideColorIfSet(&fGeoData[0].fColor);
+        fOverrides = overrides;
+    }
+
+    bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override {
+        GrNonAANinePatchBatch* that = t->cast<GrNonAANinePatchBatch>();
+        if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *that->pipeline(),
+                                    that->bounds(), caps)) {
+            return false;
+        }
+
+        SkASSERT(this->fImageWidth == that->fImageWidth &&
+                 this->fImageHeight == that->fImageHeight);
+
+        // In the event of two batches, one who can tweak, one who cannot, we just fall back to
+        // not tweaking
+        if (fOverrides.canTweakAlphaForCoverage() && !that->fOverrides.canTweakAlphaForCoverage()) {
+            fOverrides = that->fOverrides;
+        }
+
+        fGeoData.push_back_n(that->geoData()->count(), that->geoData()->begin());
+        this->joinBounds(that->bounds());
+        return true;
+    }
+
+    GrXPOverridesForBatch fOverrides;
+    int fImageWidth;
+    int fImageHeight;
+    SkSTArray<1, Geometry, true> fGeoData;
+
+    typedef GrVertexBatch INHERITED;
+};
+
+namespace GrNinePatch {
+GrDrawBatch* CreateNonAA(GrColor color, const SkMatrix& viewMatrix, int imageWidth, int imageHeight,
+                         const SkIRect& center, const SkRect& dst) {
+    return new GrNonAANinePatchBatch(color, viewMatrix, imageWidth, imageHeight, center, dst);
+}
+};
diff --git a/gfx/skia/skia/src/gpu/batches/GrNinePatch.h b/gfx/skia/skia/src/gpu/batches/GrNinePatch.h
new file mode 100644
index 000000000000..0a4ffd6e03aa
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrNinePatch.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrNinePatch_DEFINED
+#define GrNinePatch_DEFINED
+
+#include "GrColor.h"
+
+class GrDrawBatch;
+class SkBitmap;
+class SkMatrix;
+struct SkIRect;
+struct SkRect;
+
+namespace GrNinePatch {
+GrDrawBatch* CreateNonAA(GrColor color, const SkMatrix& viewMatrix, int imageWidth, int imageHeight,
+                         const SkIRect& center, const SkRect& dst);
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrNonAAFillRectBatch.cpp b/gfx/skia/skia/src/gpu/batches/GrNonAAFillRectBatch.cpp
new file mode 100644
index 000000000000..09643444d083
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrNonAAFillRectBatch.cpp
@@ -0,0 +1,338 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrNonAAFillRectBatch.h"
+
+#include "GrBatchFlushState.h"
+#include "GrColor.h"
+#include "GrDefaultGeoProcFactory.h"
+#include "GrPrimitiveProcessor.h"
+#include "GrResourceProvider.h"
+#include "GrTInstanceBatch.h"
+#include "GrQuad.h"
+#include "GrVertexBatch.h"
+
+// Common functions
+class NonAAFillRectBatchBase {
+public:
+    static const int kVertsPerInstance = 4;
+    static const int kIndicesPerInstance = 6;
+
+    static void InitInvariantOutputCoverage(GrInitInvariantOutput* out) {
+        out->setKnownSingleComponent(0xff);
+    }
+
+    static const GrIndexBuffer* GetIndexBuffer(GrResourceProvider* rp) {
+        return rp->refQuadIndexBuffer();
+    }
+
+    template <typename Geometry>
+    static void SetBounds(const Geometry& geo, SkRect* outBounds) {
+        geo.fViewMatrix.mapRect(outBounds, geo.fRect);
+    }
+
+    template <typename Geometry>
+    static void UpdateBoundsAfterAppend(const Geometry& geo, SkRect* outBounds) {
+        SkRect bounds = geo.fRect;
+        geo.fViewMatrix.mapRect(&bounds);
+        outBounds->join(bounds);
+    }
+};
+
+/** We always use per-vertex colors so that rects can be batched across color changes. Sometimes
+    we  have explicit local coords and sometimes not. We *could* always provide explicit local
+    coords and just duplicate the positions when the caller hasn't provided a local coord rect,
+    but we haven't seen a use case which frequently switches between local rect and no local
+    rect draws.
+
+    The vertex attrib order is always pos, color, [local coords].
+ */
+static const GrGeometryProcessor* create_gp(const SkMatrix& viewMatrix,
+                                            bool readsCoverage,
+                                            bool hasExplicitLocalCoords,
+                                            const SkMatrix* localMatrix) {
+    using namespace GrDefaultGeoProcFactory;
+    Color color(Color::kAttribute_Type);
+    Coverage coverage(readsCoverage ? Coverage::kSolid_Type : Coverage::kNone_Type);
+
+    // If we have perspective on the viewMatrix then we won't map on the CPU, nor will we map
+    // the local rect on the cpu (in case the localMatrix also has perspective).
+    // Otherwise, if we have a local rect, then we apply the localMatrix directly to the localRect
+    // to generate vertex local coords
+    if (viewMatrix.hasPerspective()) {
+        LocalCoords localCoords(hasExplicitLocalCoords ? LocalCoords::kHasExplicit_Type :
+                                                         LocalCoords::kUsePosition_Type,
+                                localMatrix);
+        return GrDefaultGeoProcFactory::Create(color, coverage, localCoords, viewMatrix);
+    } else if (hasExplicitLocalCoords) {
+        LocalCoords localCoords(LocalCoords::kHasExplicit_Type);
+        return GrDefaultGeoProcFactory::Create(color, coverage, localCoords, SkMatrix::I());
+    } else {
+        LocalCoords localCoords(LocalCoords::kUsePosition_Type, localMatrix);
+        return GrDefaultGeoProcFactory::CreateForDeviceSpace(color, coverage, localCoords,
+                                                             viewMatrix);
+    }
+}
+
+static void tesselate(intptr_t vertices,
+                      size_t vertexStride,
+                      GrColor color,
+                      const SkMatrix& viewMatrix,
+                      const SkRect& rect,
+                      const GrQuad* localQuad) {
+    SkPoint* positions = reinterpret_cast<SkPoint*>(vertices);
+
+    positions->setRectFan(rect.fLeft, rect.fTop,
+                          rect.fRight, rect.fBottom, vertexStride);
+
+    if (!viewMatrix.hasPerspective()) {
+        viewMatrix.mapPointsWithStride(positions, vertexStride,
+                                       NonAAFillRectBatchBase::kVertsPerInstance);
+    }
+
+    // Setup local coords
+    // TODO we should only do this if local coords are being read
+    if (localQuad) {
+        static const int kLocalOffset = sizeof(SkPoint) + sizeof(GrColor);
+        for (int i = 0; i < NonAAFillRectBatchBase::kVertsPerInstance; i++) {
+            SkPoint* coords = reinterpret_cast<SkPoint*>(vertices + kLocalOffset +
+                              i * vertexStride);
+            *coords = localQuad->point(i);
+        }
+    }
+
+    static const int kColorOffset = sizeof(SkPoint);
+    GrColor* vertColor = reinterpret_cast<GrColor*>(vertices + kColorOffset);
+    for (int j = 0; j < 4; ++j) {
+        *vertColor = color;
+        vertColor = (GrColor*) ((intptr_t) vertColor + vertexStride);
+    }
+}
+
+class NonAAFillRectBatchImp : public NonAAFillRectBatchBase {
+public:
+    struct Geometry {
+        SkMatrix fViewMatrix;
+        SkRect fRect;
+        GrQuad fLocalQuad;
+        GrColor fColor;
+    };
+
+    static const char* Name() { return "NonAAFillRectBatch"; }
+
+    static SkString DumpInfo(const Geometry& geo, int index) {
+        SkString str;
+        str.appendf("%d: Color: 0x%08x, Rect [L: %.2f, T: %.2f, R: %.2f, B: %.2f]\n",
+                    index,
+                    geo.fColor,
+                    geo.fRect.fLeft, geo.fRect.fTop, geo.fRect.fRight, geo.fRect.fBottom);
+        return str;
+    }
+
+    static bool CanCombine(const Geometry& mine, const Geometry& theirs,
+                           const GrXPOverridesForBatch& overrides) {
+        return true;
+    }
+
+    static const GrGeometryProcessor* CreateGP(const Geometry& geo,
+                                               const GrXPOverridesForBatch& overrides) {
+        const GrGeometryProcessor* gp = create_gp(geo.fViewMatrix, overrides.readsCoverage(), true,
+                                                  nullptr);
+
+        SkASSERT(gp->getVertexStride() ==
+                sizeof(GrDefaultGeoProcFactory::PositionColorLocalCoordAttr));
+        return gp;
+    }
+
+    static void Tesselate(intptr_t vertices, size_t vertexStride, const Geometry& geo,
+                          const GrXPOverridesForBatch& overrides) {
+        tesselate(vertices, vertexStride, geo.fColor, geo.fViewMatrix, geo.fRect, &geo.fLocalQuad);
+    }
+};
+
+// We handle perspective in the local matrix or viewmatrix with special batches
+class NonAAFillRectBatchPerspectiveImp : public NonAAFillRectBatchBase {
+public:
+    struct Geometry {
+        SkMatrix fViewMatrix;
+        SkMatrix fLocalMatrix;
+        SkRect fRect;
+        SkRect fLocalRect;
+        GrColor fColor;
+        bool fHasLocalMatrix;
+        bool fHasLocalRect;
+    };
+
+    static const char* Name() { return "NonAAFillRectBatchPerspective"; }
+
+    static SkString DumpInfo(const Geometry& geo, int index) {
+        SkString str;
+        str.appendf("%d: Color: 0x%08x, Rect [L: %.2f, T: %.2f, R: %.2f, B: %.2f]\n",
+                    index,
+                    geo.fColor,
+                    geo.fRect.fLeft, geo.fRect.fTop, geo.fRect.fRight, geo.fRect.fBottom);
+        return str;
+    }
+
+    static bool CanCombine(const Geometry& mine, const Geometry& theirs,
+                           const GrXPOverridesForBatch& overrides) {
+        // We could batch across perspective vm changes if we really wanted to
+        return mine.fViewMatrix.cheapEqualTo(theirs.fViewMatrix) &&
+               mine.fHasLocalRect == theirs.fHasLocalRect &&
+               (!mine.fHasLocalMatrix || mine.fLocalMatrix.cheapEqualTo(theirs.fLocalMatrix));
+    }
+
+    static const GrGeometryProcessor* CreateGP(const Geometry& geo,
+                                               const GrXPOverridesForBatch& overrides) {
+        const GrGeometryProcessor* gp = create_gp(geo.fViewMatrix, overrides.readsCoverage(),
+                                                  geo.fHasLocalRect,
+                                                  geo.fHasLocalMatrix ? &geo.fLocalMatrix :
+                                                                        nullptr);
+
+        SkASSERT(geo.fHasLocalRect ?
+             gp->getVertexStride() == sizeof(GrDefaultGeoProcFactory::PositionColorLocalCoordAttr) :
+             gp->getVertexStride() == sizeof(GrDefaultGeoProcFactory::PositionColorAttr));
+        return gp;
+    }
+
+    static void Tesselate(intptr_t vertices, size_t vertexStride, const Geometry& geo,
+                          const GrXPOverridesForBatch& overrides) {
+        if (geo.fHasLocalRect) {
+            GrQuad quad(geo.fLocalRect);
+            tesselate(vertices, vertexStride, geo.fColor, geo.fViewMatrix, geo.fRect, &quad);
+        } else {
+            tesselate(vertices, vertexStride, geo.fColor, geo.fViewMatrix, geo.fRect, nullptr);
+        }
+    }
+};
+
+typedef GrTInstanceBatch<NonAAFillRectBatchImp> NonAAFillRectBatchSimple;
+typedef GrTInstanceBatch<NonAAFillRectBatchPerspectiveImp> NonAAFillRectBatchPerspective;
+
+inline static void append_to_batch(NonAAFillRectBatchSimple* batch, GrColor color,
+                                   const SkMatrix& viewMatrix, const SkRect& rect,
+                                   const SkRect* localRect, const SkMatrix* localMatrix) {
+    SkASSERT(!viewMatrix.hasPerspective() && (!localMatrix || !localMatrix->hasPerspective()));
+    NonAAFillRectBatchSimple::Geometry& geo = batch->geoData()->push_back();
+
+    geo.fColor = color;
+    geo.fViewMatrix = viewMatrix;
+    geo.fRect = rect;
+
+    if (localRect && localMatrix) {
+        geo.fLocalQuad.setFromMappedRect(*localRect, *localMatrix);
+    } else if (localRect) {
+        geo.fLocalQuad.set(*localRect);
+    } else if (localMatrix) {
+        geo.fLocalQuad.setFromMappedRect(rect, *localMatrix);
+    } else {
+        geo.fLocalQuad.set(rect);
+    }
+}
+
+inline static void append_to_batch(NonAAFillRectBatchPerspective* batch, GrColor color,
+                                   const SkMatrix& viewMatrix, const SkRect& rect,
+                                   const SkRect* localRect, const SkMatrix* localMatrix) {
+    SkASSERT(viewMatrix.hasPerspective() || (localMatrix && localMatrix->hasPerspective()));
+    NonAAFillRectBatchPerspective::Geometry& geo = batch->geoData()->push_back();
+
+    geo.fColor = color;
+    geo.fViewMatrix = viewMatrix;
+    geo.fRect = rect;
+    geo.fHasLocalRect = SkToBool(localRect);
+    geo.fHasLocalMatrix = SkToBool(localMatrix);
+    if (localMatrix) {
+        geo.fLocalMatrix = *localMatrix;
+    }
+    if (localRect) {
+        geo.fLocalRect = *localRect;
+    }
+
+}
+
+namespace GrNonAAFillRectBatch {
+
+GrDrawBatch* Create(GrColor color,
+                    const SkMatrix& viewMatrix,
+                    const SkRect& rect,
+                    const SkRect* localRect,
+                    const SkMatrix* localMatrix) {
+    NonAAFillRectBatchSimple* batch = NonAAFillRectBatchSimple::Create();
+    append_to_batch(batch, color, viewMatrix, rect, localRect, localMatrix);
+    batch->init();
+    return batch;
+}
+
+GrDrawBatch* CreateWithPerspective(GrColor color,
+                                   const SkMatrix& viewMatrix,
+                                   const SkRect& rect,
+                                   const SkRect* localRect,
+                                   const SkMatrix* localMatrix) {
+    NonAAFillRectBatchPerspective* batch = NonAAFillRectBatchPerspective::Create();
+    append_to_batch(batch, color, viewMatrix, rect, localRect, localMatrix);
+    batch->init();
+    return batch;
+}
+
+bool Append(GrBatch* origBatch,
+            GrColor color,
+            const SkMatrix& viewMatrix,
+            const SkRect& rect,
+            const SkRect* localRect,
+            const SkMatrix* localMatrix) {
+    bool usePerspective = viewMatrix.hasPerspective() ||
+                          (localMatrix && localMatrix->hasPerspective());
+
+    if (usePerspective && origBatch->classID() != NonAAFillRectBatchPerspective::ClassID()) {
+        return false;
+    }
+
+    if (!usePerspective) {
+        NonAAFillRectBatchSimple* batch = origBatch->cast<NonAAFillRectBatchSimple>();
+        append_to_batch(batch, color, viewMatrix, rect, localRect, localMatrix);
+        batch->updateBoundsAfterAppend();
+    } else {
+        NonAAFillRectBatchPerspective* batch = origBatch->cast<NonAAFillRectBatchPerspective>();
+        const NonAAFillRectBatchPerspective::Geometry& geo = batch->geoData()->back();
+
+        if (!geo.fViewMatrix.cheapEqualTo(viewMatrix) ||
+            geo.fHasLocalRect != SkToBool(localRect) ||
+            geo.fHasLocalMatrix != SkToBool(localMatrix) ||
+            (geo.fHasLocalMatrix && !geo.fLocalMatrix.cheapEqualTo(*localMatrix))) {
+            return false;
+        }
+
+        append_to_batch(batch, color, viewMatrix, rect, localRect, localMatrix);
+        batch->updateBoundsAfterAppend();
+    }
+
+    return true;
+}
+
+};
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef GR_TEST_UTILS
+
+#include "GrBatchTest.h"
+
+DRAW_BATCH_TEST_DEFINE(RectBatch) {
+    GrColor color = GrRandomColor(random);
+    SkRect rect = GrTest::TestRect(random);
+    SkRect localRect = GrTest::TestRect(random);
+    SkMatrix viewMatrix = GrTest::TestMatrixInvertible(random);
+    SkMatrix localMatrix = GrTest::TestMatrix(random);
+
+    bool hasLocalRect = random->nextBool();
+    bool hasLocalMatrix = random->nextBool();
+    return GrNonAAFillRectBatch::Create(color, viewMatrix, rect,
+                                        hasLocalRect ? &localRect : nullptr,
+                                        hasLocalMatrix ? &localMatrix : nullptr);
+}
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrNonAAFillRectBatch.h b/gfx/skia/skia/src/gpu/batches/GrNonAAFillRectBatch.h
new file mode 100644
index 000000000000..aeb388f51056
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrNonAAFillRectBatch.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrNonAAFillRectBatch_DEFINED
+#define GrNonAAFillRectBatch_DEFINED
+
+#include "GrColor.h"
+
+class GrDrawBatch;
+class SkMatrix;
+struct SkRect;
+
+namespace GrNonAAFillRectBatch {
+
+GrDrawBatch* Create(GrColor color,
+                    const SkMatrix& viewMatrix,
+                    const SkRect& rect,
+                    const SkRect* localRect,
+                    const SkMatrix* localMatrix);
+
+GrDrawBatch* CreateWithPerspective(GrColor color,
+                                   const SkMatrix& viewMatrix,
+                                   const SkRect& rect,
+                                   const SkRect* localRect,
+                                   const SkMatrix* localMatrix);
+
+bool Append(GrColor color,
+            const SkMatrix& viewMatrix,
+            const SkRect& rect,
+            const SkRect* localRect,
+            const SkMatrix* localMatrix);
+
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrNonAAStrokeRectBatch.cpp b/gfx/skia/skia/src/gpu/batches/GrNonAAStrokeRectBatch.cpp
new file mode 100644
index 000000000000..d036b90c27ce
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrNonAAStrokeRectBatch.cpp
@@ -0,0 +1,254 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrNonAAStrokeRectBatch.h"
+
+#include "GrBatchTest.h"
+#include "GrBatchFlushState.h"
+#include "GrColor.h"
+#include "GrDefaultGeoProcFactory.h"
+#include "GrVertexBatch.h"
+#include "SkRandom.h"
+
+/*  create a triangle strip that strokes the specified rect. There are 8
+    unique vertices, but we repeat the last 2 to close up. Alternatively we
+    could use an indices array, and then only send 8 verts, but not sure that
+    would be faster.
+    */
+static void init_stroke_rect_strip(SkPoint verts[10], const SkRect& rect, SkScalar width) {
+    const SkScalar rad = SkScalarHalf(width);
+    // TODO we should be able to enable this assert, but we'd have to filter these draws
+    // this is a bug
+    //SkASSERT(rad < rect.width() / 2 && rad < rect.height() / 2);
+
+    verts[0].set(rect.fLeft + rad, rect.fTop + rad);
+    verts[1].set(rect.fLeft - rad, rect.fTop - rad);
+    verts[2].set(rect.fRight - rad, rect.fTop + rad);
+    verts[3].set(rect.fRight + rad, rect.fTop - rad);
+    verts[4].set(rect.fRight - rad, rect.fBottom - rad);
+    verts[5].set(rect.fRight + rad, rect.fBottom + rad);
+    verts[6].set(rect.fLeft + rad, rect.fBottom - rad);
+    verts[7].set(rect.fLeft - rad, rect.fBottom + rad);
+    verts[8] = verts[0];
+    verts[9] = verts[1];
+}
+
+class NonAAStrokeRectBatch : public GrVertexBatch {
+public:
+    DEFINE_BATCH_CLASS_ID
+
+    struct Geometry {
+        SkMatrix fViewMatrix;
+        SkRect fRect;
+        SkScalar fStrokeWidth;
+        GrColor fColor;
+    };
+
+    static NonAAStrokeRectBatch* Create() {
+        return new NonAAStrokeRectBatch;
+    }
+
+    const char* name() const override { return "GrStrokeRectBatch"; }
+
+    void computePipelineOptimizations(GrInitInvariantOutput* color, 
+                                      GrInitInvariantOutput* coverage,
+                                      GrBatchToXPOverrides* overrides) const override {
+        // When this is called on a batch, there is only one geometry bundle
+        color->setKnownFourComponents(fGeoData[0].fColor);
+        coverage->setKnownSingleComponent(0xff);
+        overrides->fUsePLSDstRead = false;
+    }
+
+    void append(GrColor color, const SkMatrix& viewMatrix, const SkRect& rect,
+                SkScalar strokeWidth) {
+        Geometry& geometry = fGeoData.push_back();
+        geometry.fViewMatrix = viewMatrix;
+        geometry.fRect = rect;
+        geometry.fStrokeWidth = strokeWidth;
+        geometry.fColor = color;
+
+        // Sort the rect for hairlines
+        geometry.fRect.sort();
+    }
+
+    void appendAndUpdateBounds(GrColor color, const SkMatrix& viewMatrix, const SkRect& rect,
+                               SkScalar strokeWidth, bool snapToPixelCenters) {
+        this->append(color, viewMatrix, rect, strokeWidth);
+
+        SkRect bounds;
+        this->setupBounds(&bounds, fGeoData.back(), snapToPixelCenters);
+        this->joinBounds(bounds);
+    }
+
+    void init(bool snapToPixelCenters) {
+        const Geometry& geo = fGeoData[0];
+        fBatch.fHairline = geo.fStrokeWidth == 0;
+
+        // setup bounds
+        this->setupBounds(&fBounds, geo, snapToPixelCenters);
+    }
+
+private:
+    void setupBounds(SkRect* bounds, const Geometry& geo, bool snapToPixelCenters) {
+        *bounds = geo.fRect;
+        SkScalar rad = SkScalarHalf(geo.fStrokeWidth);
+        bounds->outset(rad, rad);
+        geo.fViewMatrix.mapRect(&fBounds);
+
+        // If our caller snaps to pixel centers then we have to round out the bounds
+        if (snapToPixelCenters) {
+            bounds->roundOut();
+        }
+    }
+
+    void onPrepareDraws(Target* target) const override {
+        SkAutoTUnref<const GrGeometryProcessor> gp;
+        {
+            using namespace GrDefaultGeoProcFactory;
+            Color color(this->color());
+            Coverage coverage(this->coverageIgnored() ? Coverage::kSolid_Type :
+                                                        Coverage::kNone_Type);
+            LocalCoords localCoords(this->usesLocalCoords() ? LocalCoords::kUsePosition_Type :
+                                                              LocalCoords::kUnused_Type);
+            gp.reset(GrDefaultGeoProcFactory::Create(color, coverage, localCoords,
+                                                     this->viewMatrix()));
+        }
+
+        target->initDraw(gp, this->pipeline());
+
+        size_t vertexStride = gp->getVertexStride();
+
+        SkASSERT(vertexStride == sizeof(GrDefaultGeoProcFactory::PositionAttr));
+
+        const Geometry& args = fGeoData[0];
+
+        int vertexCount = kVertsPerHairlineRect;
+        if (args.fStrokeWidth > 0) {
+            vertexCount = kVertsPerStrokeRect;
+        }
+
+        const GrVertexBuffer* vertexBuffer;
+        int firstVertex;
+
+        void* verts = target->makeVertexSpace(vertexStride, vertexCount, &vertexBuffer,
+                                              &firstVertex);
+
+        if (!verts) {
+            SkDebugf("Could not allocate vertices\n");
+            return;
+        }
+
+        SkPoint* vertex = reinterpret_cast<SkPoint*>(verts);
+
+        GrPrimitiveType primType;
+        if (args.fStrokeWidth > 0) {;
+            primType = kTriangleStrip_GrPrimitiveType;
+            init_stroke_rect_strip(vertex, args.fRect, args.fStrokeWidth);
+        } else {
+            // hairline
+            primType = kLineStrip_GrPrimitiveType;
+            vertex[0].set(args.fRect.fLeft, args.fRect.fTop);
+            vertex[1].set(args.fRect.fRight, args.fRect.fTop);
+            vertex[2].set(args.fRect.fRight, args.fRect.fBottom);
+            vertex[3].set(args.fRect.fLeft, args.fRect.fBottom);
+            vertex[4].set(args.fRect.fLeft, args.fRect.fTop);
+        }
+
+        GrVertices vertices;
+        vertices.init(primType, vertexBuffer, firstVertex, vertexCount);
+        target->draw(vertices);
+    }
+
+    void initBatchTracker(const GrXPOverridesForBatch& overrides) override {
+        // Handle any color overrides
+        if (!overrides.readsColor()) {
+            fGeoData[0].fColor = GrColor_ILLEGAL;
+        }
+        overrides.getOverrideColorIfSet(&fGeoData[0].fColor);
+
+        // setup batch properties
+        fBatch.fColorIgnored = !overrides.readsColor();
+        fBatch.fColor = fGeoData[0].fColor;
+        fBatch.fUsesLocalCoords = overrides.readsLocalCoords();
+        fBatch.fCoverageIgnored = !overrides.readsCoverage();
+    }
+
+    NonAAStrokeRectBatch() : INHERITED(ClassID()) {}
+
+    GrColor color() const { return fBatch.fColor; }
+    bool usesLocalCoords() const { return fBatch.fUsesLocalCoords; }
+    bool colorIgnored() const { return fBatch.fColorIgnored; }
+    const SkMatrix& viewMatrix() const { return fGeoData[0].fViewMatrix; }
+    bool hairline() const { return fBatch.fHairline; }
+    bool coverageIgnored() const { return fBatch.fCoverageIgnored; }
+
+    bool onCombineIfPossible(GrBatch* t, const GrCaps&) override {
+        // if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *t->pipeline(),
+        //     t->bounds(), caps)) {
+        //     return false;
+        // }
+        // GrStrokeRectBatch* that = t->cast<StrokeRectBatch>();
+
+        // NonAA stroke rects cannot batch right now
+        // TODO make these batchable
+        return false;
+    }
+
+    struct BatchTracker {
+        GrColor fColor;
+        bool fUsesLocalCoords;
+        bool fColorIgnored;
+        bool fCoverageIgnored;
+        bool fHairline;
+    };
+
+    const static int kVertsPerHairlineRect = 5;
+    const static int kVertsPerStrokeRect = 10;
+
+    BatchTracker fBatch;
+    SkSTArray<1, Geometry, true> fGeoData;
+
+    typedef GrVertexBatch INHERITED;
+};
+
+namespace GrNonAAStrokeRectBatch {
+
+GrDrawBatch* Create(GrColor color,
+                    const SkMatrix& viewMatrix,
+                    const SkRect& rect,
+                    SkScalar strokeWidth,
+                    bool snapToPixelCenters) {
+    NonAAStrokeRectBatch* batch = NonAAStrokeRectBatch::Create();
+    batch->append(color, viewMatrix, rect, strokeWidth);
+    batch->init(snapToPixelCenters);
+    return batch;
+}
+
+void Append(GrBatch* origBatch,
+            GrColor color,
+            const SkMatrix& viewMatrix,
+            const SkRect& rect,
+            SkScalar strokeWidth,
+            bool snapToPixelCenters) {
+    NonAAStrokeRectBatch* batch = origBatch->cast<NonAAStrokeRectBatch>();
+    batch->appendAndUpdateBounds(color, viewMatrix, rect, strokeWidth, snapToPixelCenters);
+}
+
+};
+
+#ifdef GR_TEST_UTILS
+
+DRAW_BATCH_TEST_DEFINE(NonAAStrokeRectBatch) {
+    SkMatrix viewMatrix = GrTest::TestMatrix(random);
+    GrColor color = GrRandomColor(random);
+    SkRect rect = GrTest::TestRect(random);
+    SkScalar strokeWidth = random->nextBool() ? 0.0f : 1.0f;
+
+    return GrNonAAStrokeRectBatch::Create(color, viewMatrix, rect, strokeWidth, random->nextBool());
+}
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrNonAAStrokeRectBatch.h b/gfx/skia/skia/src/gpu/batches/GrNonAAStrokeRectBatch.h
new file mode 100644
index 000000000000..3cee47dedd71
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrNonAAStrokeRectBatch.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrNonAAStrokeRectBatch_DEFINED
+#define GrNonAAStrokeRectBatch_DEFINED
+
+#include "GrColor.h"
+
+#include "SkTypes.h"
+
+class GrDrawBatch;
+struct SkRect;
+class SkMatrix;
+
+namespace GrNonAAStrokeRectBatch {
+
+GrDrawBatch* Create(GrColor color,
+                    const SkMatrix& viewMatrix,
+                    const SkRect& rect,
+                    SkScalar strokeWidth,
+                    bool snapToPixelCenters);
+
+void Append(GrColor color,
+            const SkMatrix& viewMatrix,
+            const SkRect& rect,
+            SkScalar strokeWidth,
+            bool snapToPixelCenters);
+
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrRectBatchFactory.cpp b/gfx/skia/skia/src/gpu/batches/GrRectBatchFactory.cpp
new file mode 100644
index 000000000000..f144d1b5325e
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrRectBatchFactory.cpp
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrRectBatchFactory.h"
+
+#include "GrAAStrokeRectBatch.h"
+
+#include "SkStrokeRec.h"
+
+namespace GrRectBatchFactory {
+
+GrDrawBatch* CreateAAFillNestedRects(GrColor color,
+                                     const SkMatrix& viewMatrix,
+                                     const SkRect rects[2]) {
+    SkASSERT(viewMatrix.rectStaysRect());
+    SkASSERT(!rects[0].isEmpty() && !rects[1].isEmpty());
+
+    SkRect devOutside, devInside;
+    viewMatrix.mapRect(&devOutside, rects[0]);
+    viewMatrix.mapRect(&devInside, rects[1]);
+
+    return GrAAStrokeRectBatch::Create(color, viewMatrix, devOutside, devOutside, devInside, true,
+                                       devInside.isEmpty());
+}
+
+};
diff --git a/gfx/skia/skia/src/gpu/batches/GrRectBatchFactory.h b/gfx/skia/skia/src/gpu/batches/GrRectBatchFactory.h
new file mode 100644
index 000000000000..16eeaee02c38
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrRectBatchFactory.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrRectBatchFactory_DEFINED
+#define GrRectBatchFactory_DEFINED
+
+#include "GrAAFillRectBatch.h"
+#include "GrAAStrokeRectBatch.h"
+#include "GrColor.h"
+#include "GrNonAAFillRectBatch.h"
+#include "GrNonAAStrokeRectBatch.h"
+#include "SkMatrix.h"
+
+class GrBatch;
+struct SkRect;
+class SkStrokeRec;
+
+/*
+ * A factory for returning batches which can draw rectangles.
+ */
+namespace GrRectBatchFactory {
+
+inline GrDrawBatch* CreateNonAAFill(GrColor color,
+                                    const SkMatrix& viewMatrix,
+                                    const SkRect& rect,
+                                    const SkRect* localRect,
+                                    const SkMatrix* localMatrix) {
+    if (viewMatrix.hasPerspective() || (localMatrix && localMatrix->hasPerspective())) {
+        return GrNonAAFillRectBatch::CreateWithPerspective(color, viewMatrix, rect, localRect,
+                                                           localMatrix);
+    } else {
+        return GrNonAAFillRectBatch::Create(color, viewMatrix, rect, localRect, localMatrix);
+    }
+}
+
+inline GrDrawBatch* CreateAAFill(GrColor color,
+                                 const SkMatrix& viewMatrix,
+                                 const SkRect& rect,
+                                 const SkRect& devRect) {
+    return GrAAFillRectBatch::Create(color, viewMatrix, rect, devRect);
+}
+
+inline GrDrawBatch* CreateAAFill(GrColor color,
+                                 const SkMatrix& viewMatrix,
+                                 const SkMatrix& localMatrix,
+                                 const SkRect& rect,
+                                 const SkRect& devRect) {
+    return GrAAFillRectBatch::Create(color, viewMatrix, localMatrix, rect, devRect);
+}
+
+inline GrDrawBatch* CreateNonAAStroke(GrColor color,
+                                      const SkMatrix& viewMatrix,
+                                      const SkRect& rect,
+                                      SkScalar strokeWidth,
+                                      bool snapToPixelCenters) {
+    return GrNonAAStrokeRectBatch::Create(color, viewMatrix, rect, strokeWidth, snapToPixelCenters);
+}
+
+inline GrDrawBatch* CreateAAStroke(GrColor color,
+                                   const SkMatrix& viewMatrix,
+                                   const SkRect& rect,
+                                   const SkStrokeRec& stroke) {
+    return GrAAStrokeRectBatch::Create(color, viewMatrix, rect, stroke);
+}
+
+// First rect is outer; second rect is inner
+GrDrawBatch* CreateAAFillNestedRects(GrColor,
+                                     const SkMatrix& viewMatrix,
+                                     const SkRect rects[2]);
+
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrStencilAndCoverPathRenderer.cpp b/gfx/skia/skia/src/gpu/batches/GrStencilAndCoverPathRenderer.cpp
new file mode 100644
index 000000000000..a11d2b468345
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrStencilAndCoverPathRenderer.cpp
@@ -0,0 +1,158 @@
+
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+
+#include "GrStencilAndCoverPathRenderer.h"
+#include "GrCaps.h"
+#include "GrContext.h"
+#include "GrGpu.h"
+#include "GrPath.h"
+#include "GrRenderTarget.h"
+#include "GrResourceProvider.h"
+#include "GrStrokeInfo.h"
+
+/*
+ * For now paths only natively support winding and even odd fill types
+ */
+static GrPathRendering::FillType convert_skpath_filltype(SkPath::FillType fill) {
+    switch (fill) {
+        default:
+            SkFAIL("Incomplete Switch\n");
+        case SkPath::kWinding_FillType:
+        case SkPath::kInverseWinding_FillType:
+            return GrPathRendering::kWinding_FillType;
+        case SkPath::kEvenOdd_FillType:
+        case SkPath::kInverseEvenOdd_FillType:
+            return GrPathRendering::kEvenOdd_FillType;
+    }
+}
+
+GrPathRenderer* GrStencilAndCoverPathRenderer::Create(GrResourceProvider* resourceProvider,
+                                                      const GrCaps& caps) {
+    if (caps.shaderCaps()->pathRenderingSupport()) {
+        return new GrStencilAndCoverPathRenderer(resourceProvider);
+    } else {
+        return nullptr;
+    }
+}
+
+GrStencilAndCoverPathRenderer::GrStencilAndCoverPathRenderer(GrResourceProvider* resourceProvider)
+    : fResourceProvider(resourceProvider) {    
+}
+
+bool GrStencilAndCoverPathRenderer::onCanDrawPath(const CanDrawPathArgs& args) const {
+    if (args.fStroke->isHairlineStyle()) {
+        return false;
+    }
+    if (!args.fIsStencilDisabled) {
+        return false;
+    }
+    if (args.fAntiAlias) {
+        return args.fIsStencilBufferMSAA;
+    } else {
+        return true; // doesn't do per-path AA, relies on the target having MSAA
+    }
+}
+
+static GrPath* get_gr_path(GrResourceProvider* resourceProvider, const SkPath& skPath,
+                           const GrStrokeInfo& stroke) {
+    GrUniqueKey key;
+    bool isVolatile;
+    GrPath::ComputeKey(skPath, stroke, &key, &isVolatile);
+    SkAutoTUnref<GrPath> path(
+        static_cast<GrPath*>(resourceProvider->findAndRefResourceByUniqueKey(key)));
+    if (!path) {
+        path.reset(resourceProvider->createPath(skPath, stroke));
+        if (!isVolatile) {
+            resourceProvider->assignUniqueKeyToResource(key, path);
+        }
+    } else {
+        SkASSERT(path->isEqualTo(skPath, stroke));
+    }
+    return path.detach();
+}
+
+void GrStencilAndCoverPathRenderer::onStencilPath(const StencilPathArgs& args) {
+    SkASSERT(!args.fPath->isInverseFillType());
+    SkAutoTUnref<GrPath> p(get_gr_path(fResourceProvider, *args.fPath, *args.fStroke));
+    args.fTarget->stencilPath(*args.fPipelineBuilder, *args.fViewMatrix, p,
+                              convert_skpath_filltype(args.fPath->getFillType()));
+}
+
+bool GrStencilAndCoverPathRenderer::onDrawPath(const DrawPathArgs& args) {
+    SkASSERT(!args.fStroke->isHairlineStyle());
+    const SkPath& path = *args.fPath;
+    GrPipelineBuilder* pipelineBuilder = args.fPipelineBuilder;
+    const SkMatrix& viewMatrix = *args.fViewMatrix;
+
+    SkASSERT(pipelineBuilder->getStencil().isDisabled());
+
+    if (args.fAntiAlias) {
+        SkASSERT(pipelineBuilder->getRenderTarget()->isStencilBufferMultisampled());
+        pipelineBuilder->enableState(GrPipelineBuilder::kHWAntialias_Flag);
+    }
+
+    SkAutoTUnref<GrPath> p(get_gr_path(fResourceProvider, path, *args.fStroke));
+
+    if (path.isInverseFillType()) {
+        GR_STATIC_CONST_SAME_STENCIL(kInvertedStencilPass,
+            kKeep_StencilOp,
+            kZero_StencilOp,
+            // We know our rect will hit pixels outside the clip and the user bits will be 0
+            // outside the clip. So we can't just fill where the user bits are 0. We also need to
+            // check that the clip bit is set.
+            kEqualIfInClip_StencilFunc,
+            0xffff,
+            0x0000,
+            0xffff);
+
+        pipelineBuilder->setStencil(kInvertedStencilPass);
+
+        // fake inverse with a stencil and cover
+        args.fTarget->stencilPath(*pipelineBuilder, viewMatrix, p,
+                                  convert_skpath_filltype(path.getFillType()));
+
+        SkMatrix invert = SkMatrix::I();
+        SkRect bounds =
+            SkRect::MakeLTRB(0, 0, SkIntToScalar(pipelineBuilder->getRenderTarget()->width()),
+                             SkIntToScalar(pipelineBuilder->getRenderTarget()->height()));
+        SkMatrix vmi;
+        // mapRect through persp matrix may not be correct
+        if (!viewMatrix.hasPerspective() && viewMatrix.invert(&vmi)) {
+            vmi.mapRect(&bounds);
+            // theoretically could set bloat = 0, instead leave it because of matrix inversion
+            // precision.
+            SkScalar bloat = viewMatrix.getMaxScale() * SK_ScalarHalf;
+            bounds.outset(bloat, bloat);
+        } else {
+            if (!viewMatrix.invert(&invert)) {
+                return false;
+            }
+        }
+        const SkMatrix& viewM = viewMatrix.hasPerspective() ? SkMatrix::I() : viewMatrix;
+        if (pipelineBuilder->getRenderTarget()->hasMixedSamples()) {
+            pipelineBuilder->disableState(GrPipelineBuilder::kHWAntialias_Flag);
+        }
+        args.fTarget->drawNonAARect(*pipelineBuilder, args.fColor, viewM, bounds, invert);
+    } else {
+        GR_STATIC_CONST_SAME_STENCIL(kStencilPass,
+            kZero_StencilOp,
+            kKeep_StencilOp,
+            kNotEqual_StencilFunc,
+            0xffff,
+            0x0000,
+            0xffff);
+
+        pipelineBuilder->setStencil(kStencilPass);
+        args.fTarget->drawPath(*pipelineBuilder, viewMatrix, args.fColor, p,
+                               convert_skpath_filltype(path.getFillType()));
+    }
+
+    pipelineBuilder->stencil()->setDisabled();
+    return true;
+}
diff --git a/gfx/skia/skia/src/gpu/batches/GrStencilAndCoverPathRenderer.h b/gfx/skia/skia/src/gpu/batches/GrStencilAndCoverPathRenderer.h
new file mode 100644
index 000000000000..bb8cdb0dd772
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrStencilAndCoverPathRenderer.h
@@ -0,0 +1,45 @@
+
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrBuiltInPathRenderer_DEFINED
+#define GrBuiltInPathRenderer_DEFINED
+
+#include "GrPathRenderer.h"
+
+class GrContext;
+class GrGpu;
+
+/**
+ * Uses GrGpu::stencilPath followed by a cover rectangle. This subclass doesn't apply AA; it relies
+ * on the target having MSAA if AA is desired.
+ */
+class GrStencilAndCoverPathRenderer : public GrPathRenderer {
+public:
+
+    static GrPathRenderer* Create(GrResourceProvider*, const GrCaps&);
+
+
+private:
+    StencilSupport onGetStencilSupport(const SkPath&, const GrStrokeInfo&) const override {
+        return GrPathRenderer::kStencilOnly_StencilSupport;
+    }
+
+    bool onCanDrawPath(const CanDrawPathArgs&) const override;
+
+    bool onDrawPath(const DrawPathArgs&) override;
+
+    void onStencilPath(const StencilPathArgs&) override;
+
+    GrStencilAndCoverPathRenderer(GrResourceProvider*);
+
+    GrResourceProvider* fResourceProvider;
+
+    typedef GrPathRenderer INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrStencilPathBatch.h b/gfx/skia/skia/src/gpu/batches/GrStencilPathBatch.h
new file mode 100644
index 000000000000..a0dcadb620ea
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrStencilPathBatch.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrStencilPathBatch_DEFINED
+#define GrStencilPathBatch_DEFINED
+
+#include "GrBatch.h"
+#include "GrBatchFlushState.h"
+#include "GrGpu.h"
+#include "GrPath.h"
+#include "GrPathRendering.h"
+#include "GrRenderTarget.h"
+
+class GrStencilPathBatch final : public GrBatch {
+public:
+    DEFINE_BATCH_CLASS_ID
+
+    static GrBatch* Create(const SkMatrix& viewMatrix,
+                           bool useHWAA,
+                           const GrStencilSettings& stencil,
+                           const GrScissorState& scissor,
+                           GrRenderTarget* renderTarget,
+                           const GrPath* path) {
+        return new GrStencilPathBatch(viewMatrix, useHWAA, stencil, scissor, renderTarget, path);
+    }
+
+    const char* name() const override { return "StencilPath"; }
+
+    uint32_t renderTargetUniqueID() const override { return fRenderTarget.get()->getUniqueID(); }
+
+    SkString dumpInfo() const override {
+        SkString string;
+        string.printf("PATH: 0x%p, AA:%d", fPath.get(), fUseHWAA);
+        return string;
+    }
+
+private:
+    GrStencilPathBatch(const SkMatrix& viewMatrix,
+                       bool useHWAA,
+                       const GrStencilSettings& stencil,
+                       const GrScissorState& scissor,
+                       GrRenderTarget* renderTarget,
+                       const GrPath* path)
+    : INHERITED(ClassID())
+    , fViewMatrix(viewMatrix)
+    , fUseHWAA(useHWAA)
+    , fStencil(stencil)
+    , fScissor(scissor)
+    , fRenderTarget(renderTarget)
+    , fPath(path) {
+        fBounds = path->getBounds();
+    }
+
+    bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override { return false; }
+
+    void onPrepare(GrBatchFlushState*) override {}
+
+    void onDraw(GrBatchFlushState* state) override {
+        GrPathRendering::StencilPathArgs args(fUseHWAA, fRenderTarget.get(), &fViewMatrix,
+                                              &fScissor, &fStencil);
+        state->gpu()->pathRendering()->stencilPath(args, fPath.get());
+    }
+
+    SkMatrix                                                fViewMatrix;
+    bool                                                    fUseHWAA;
+    GrStencilSettings                                       fStencil;
+    GrScissorState                                          fScissor;
+    GrPendingIOResource<GrRenderTarget, kWrite_GrIOType>    fRenderTarget;
+    GrPendingIOResource<const GrPath, kRead_GrIOType>       fPath;
+
+    typedef GrBatch INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrTInstanceBatch.h b/gfx/skia/skia/src/gpu/batches/GrTInstanceBatch.h
new file mode 100644
index 000000000000..bf371689bd30
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrTInstanceBatch.h
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrTInstanceBatch_DEFINED
+#define GrTInstanceBatch_DEFINED
+
+#include "GrVertexBatch.h"
+
+#include "GrBatchFlushState.h"
+
+/**
+ * GrTInstanceBatch is an optional template to help with writing batches
+ * To use this template, The 'Impl' must define the following statics:
+ *     A Geometry struct
+ *
+ *     static const int kVertsPerInstance
+ *     static const int kIndicesPerInstance
+ *
+ *     const char* Name()
+ *
+ *     void InvariantOutputCoverage(GrInitInvariantOutput* out)
+ *
+ *     void SetBounds(const Geometry& seedGeometry, SkRect* outBounds)
+ *
+ *     void UpdateBoundsAfterAppend(const Geometry& lastGeometry, SkRect* currentBounds)
+ *
+ *     bool CanCombine(const Geometry& mine, const Geometry& theirs,
+ *                     const GrXPOverridesForBatch&)
+ *
+ *     const GrGeometryProcessor* CreateGP(const Geometry& seedGeometry,
+ *                                         const GrXPOverridesForBatch& overrides)
+ *
+ *     const GrIndexBuffer* GetIndexBuffer(GrResourceProvider*)
+ *
+ *     Tesselate(intptr_t vertices, size_t vertexStride, const Geometry& geo,
+ *               const GrXPOverridesForBatch& overrides)
+ */
+template <typename Impl>
+class GrTInstanceBatch : public GrVertexBatch {
+public:
+    DEFINE_BATCH_CLASS_ID
+
+    typedef typename Impl::Geometry Geometry;
+
+    static GrTInstanceBatch* Create() { return new GrTInstanceBatch; }
+
+    const char* name() const override { return Impl::Name(); }
+
+    SkString dumpInfo() const override {
+        SkString str;
+        for (int i = 0; i < fGeoData.count(); ++i) {
+            str.append(Impl::DumpInfo(fGeoData[i], i));
+        }
+        str.append(INHERITED::dumpInfo());
+        return str;
+    }
+
+    void computePipelineOptimizations(GrInitInvariantOutput* color, 
+                                      GrInitInvariantOutput* coverage,
+                                      GrBatchToXPOverrides* overrides) const override {
+        // When this is called on a batch, there is only one geometry bundle
+        color->setKnownFourComponents(fGeoData[0].fColor);
+        Impl::InitInvariantOutputCoverage(coverage);
+        overrides->fUsePLSDstRead = false;
+    }
+
+    void initBatchTracker(const GrXPOverridesForBatch& overrides) override {
+        overrides.getOverrideColorIfSet(&fGeoData[0].fColor);
+        fOverrides = overrides;
+    }
+
+    SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
+
+    // After seeding, the client should call init() so the Batch can initialize itself
+    void init() {
+        const Geometry& geo = fGeoData[0];
+        Impl::SetBounds(geo, &fBounds);
+    }
+
+    void updateBoundsAfterAppend() {
+        const Geometry& geo = fGeoData.back();
+        Impl::UpdateBoundsAfterAppend(geo, &fBounds);
+    }
+
+private:
+    GrTInstanceBatch() : INHERITED(ClassID()) {}
+
+    void onPrepareDraws(Target* target) const override {
+        SkAutoTUnref<const GrGeometryProcessor> gp(Impl::CreateGP(this->seedGeometry(), 
+                                                                  fOverrides));
+        if (!gp) {
+            SkDebugf("Couldn't create GrGeometryProcessor\n");
+            return;
+        }
+
+        target->initDraw(gp, this->pipeline());
+
+        size_t vertexStride = gp->getVertexStride();
+        int instanceCount = fGeoData.count();
+
+        SkAutoTUnref<const GrIndexBuffer> indexBuffer(
+                Impl::GetIndexBuffer(target->resourceProvider()));
+        InstancedHelper helper;
+        void* vertices = helper.init(target, kTriangles_GrPrimitiveType, vertexStride,
+                                     indexBuffer, Impl::kVertsPerInstance,
+                                     Impl::kIndicesPerInstance, instanceCount);
+        if (!vertices || !indexBuffer) {
+            SkDebugf("Could not allocate vertices\n");
+            return;
+        }
+
+        for (int i = 0; i < instanceCount; i++) {
+            intptr_t verts = reinterpret_cast<intptr_t>(vertices) +
+                             i * Impl::kVertsPerInstance * vertexStride;
+            Impl::Tesselate(verts, vertexStride, fGeoData[i], fOverrides);
+        }
+        helper.recordDraw(target);
+    }
+
+    const Geometry& seedGeometry() const { return fGeoData[0]; }
+
+    bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override {
+        GrTInstanceBatch* that = t->cast<GrTInstanceBatch>();
+        if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *that->pipeline(),
+                                    that->bounds(), caps)) {
+            return false;
+        }
+
+        if (!Impl::CanCombine(this->seedGeometry(), that->seedGeometry(), fOverrides)) {
+            return false;
+        }
+
+        // In the event of two batches, one who can tweak, one who cannot, we just fall back to
+        // not tweaking
+        if (fOverrides.canTweakAlphaForCoverage() && !that->fOverrides.canTweakAlphaForCoverage()) {
+            fOverrides = that->fOverrides;
+        }
+
+        fGeoData.push_back_n(that->geoData()->count(), that->geoData()->begin());
+        this->joinBounds(that->bounds());
+        return true;
+    }
+
+    GrXPOverridesForBatch fOverrides;
+    SkSTArray<1, Geometry, true> fGeoData;
+
+    typedef GrVertexBatch INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrTessellatingPathRenderer.cpp b/gfx/skia/skia/src/gpu/batches/GrTessellatingPathRenderer.cpp
new file mode 100644
index 000000000000..27e287e9c6bc
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrTessellatingPathRenderer.cpp
@@ -0,0 +1,1671 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrTessellatingPathRenderer.h"
+
+#include "GrBatchFlushState.h"
+#include "GrBatchTest.h"
+#include "GrDefaultGeoProcFactory.h"
+#include "GrPathUtils.h"
+#include "GrVertices.h"
+#include "GrResourceCache.h"
+#include "GrResourceProvider.h"
+#include "SkChunkAlloc.h"
+#include "SkGeometry.h"
+
+#include "batches/GrVertexBatch.h"
+
+#include <stdio.h>
+
+/*
+ * This path renderer tessellates the path into triangles, uploads the triangles to a
+ * vertex buffer, and renders them with a single draw call. It does not currently do
+ * antialiasing, so it must be used in conjunction with multisampling.
+ *
+ * There are six stages to the algorithm:
+ *
+ * 1) Linearize the path contours into piecewise linear segments (path_to_contours()).
+ * 2) Build a mesh of edges connecting the vertices (build_edges()).
+ * 3) Sort the vertices in Y (and secondarily in X) (merge_sort()).
+ * 4) Simplify the mesh by inserting new vertices at intersecting edges (simplify()).
+ * 5) Tessellate the simplified mesh into monotone polygons (tessellate()).
+ * 6) Triangulate the monotone polygons directly into a vertex buffer (polys_to_triangles()).
+ *
+ * The vertex sorting in step (3) is a merge sort, since it plays well with the linked list
+ * of vertices (and the necessity of inserting new vertices on intersection).
+ *
+ * Stages (4) and (5) use an active edge list, which a list of all edges for which the
+ * sweep line has crossed the top vertex, but not the bottom vertex.  It's sorted
+ * left-to-right based on the point where both edges are active (when both top vertices
+ * have been seen, so the "lower" top vertex of the two). If the top vertices are equal
+ * (shared), it's sorted based on the last point where both edges are active, so the
+ * "upper" bottom vertex.
+ *
+ * The most complex step is the simplification (4). It's based on the Bentley-Ottman
+ * line-sweep algorithm, but due to floating point inaccuracy, the intersection points are
+ * not exact and may violate the mesh topology or active edge list ordering. We
+ * accommodate this by adjusting the topology of the mesh and AEL to match the intersection
+ * points. This occurs in three ways:
+ *
+ * A) Intersections may cause a shortened edge to no longer be ordered with respect to its
+ *    neighbouring edges at the top or bottom vertex. This is handled by merging the
+ *    edges (merge_collinear_edges()).
+ * B) Intersections may cause an edge to violate the left-to-right ordering of the
+ *    active edge list. This is handled by splitting the neighbour edge on the
+ *    intersected vertex (cleanup_active_edges()).
+ * C) Shortening an edge may cause an active edge to become inactive or an inactive edge
+ *    to become active. This is handled by removing or inserting the edge in the active
+ *    edge list (fix_active_state()).
+ *
+ * The tessellation steps (5) and (6) are based on "Triangulating Simple Polygons and
+ * Equivalent Problems" (Fournier and Montuno); also a line-sweep algorithm. Note that it
+ * currently uses a linked list for the active edge list, rather than a 2-3 tree as the
+ * paper describes. The 2-3 tree gives O(lg N) lookups, but insertion and removal also
+ * become O(lg N). In all the test cases, it was found that the cost of frequent O(lg N)
+ * insertions and removals was greater than the cost of infrequent O(N) lookups with the
+ * linked list implementation. With the latter, all removals are O(1), and most insertions
+ * are O(1), since we know the adjacent edge in the active edge list based on the topology.
+ * Only type 2 vertices (see paper) require the O(N) lookups, and these are much less
+ * frequent. There may be other data structures worth investigating, however.
+ *
+ * Note that the orientation of the line sweep algorithms is determined by the aspect ratio of the
+ * path bounds. When the path is taller than it is wide, we sort vertices based on increasing Y
+ * coordinate, and secondarily by increasing X coordinate. When the path is wider than it is tall,
+ * we sort by increasing X coordinate, but secondarily by *decreasing* Y coordinate. This is so
+ * that the "left" and "right" orientation in the code remains correct (edges to the left are
+ * increasing in Y; edges to the right are decreasing in Y). That is, the setting rotates 90
+ * degrees counterclockwise, rather that transposing.
+ */
+#define LOGGING_ENABLED 0
+#define WIREFRAME 0
+
+#if LOGGING_ENABLED
+#define LOG printf
+#else
+#define LOG(...)
+#endif
+
+#define ALLOC_NEW(Type, args, alloc) new (alloc.allocThrow(sizeof(Type))) Type args
+
+namespace {
+
+struct Vertex;
+struct Edge;
+struct Poly;
+
+template <class T, T* T::*Prev, T* T::*Next>
+void insert(T* t, T* prev, T* next, T** head, T** tail) {
+    t->*Prev = prev;
+    t->*Next = next;
+    if (prev) {
+        prev->*Next = t;
+    } else if (head) {
+        *head = t;
+    }
+    if (next) {
+        next->*Prev = t;
+    } else if (tail) {
+        *tail = t;
+    }
+}
+
+template <class T, T* T::*Prev, T* T::*Next>
+void remove(T* t, T** head, T** tail) {
+    if (t->*Prev) {
+        t->*Prev->*Next = t->*Next;
+    } else if (head) {
+        *head = t->*Next;
+    }
+    if (t->*Next) {
+        t->*Next->*Prev = t->*Prev;
+    } else if (tail) {
+        *tail = t->*Prev;
+    }
+    t->*Prev = t->*Next = nullptr;
+}
+
+/**
+ * Vertices are used in three ways: first, the path contours are converted into a
+ * circularly-linked list of Vertices for each contour. After edge construction, the same Vertices
+ * are re-ordered by the merge sort according to the sweep_lt comparator (usually, increasing
+ * in Y) using the same fPrev/fNext pointers that were used for the contours, to avoid
+ * reallocation. Finally, MonotonePolys are built containing a circularly-linked list of
+ * Vertices. (Currently, those Vertices are newly-allocated for the MonotonePolys, since
+ * an individual Vertex from the path mesh may belong to multiple
+ * MonotonePolys, so the original Vertices cannot be re-used.
+ */
+
+struct Vertex {
+  Vertex(const SkPoint& point)
+    : fPoint(point), fPrev(nullptr), fNext(nullptr)
+    , fFirstEdgeAbove(nullptr), fLastEdgeAbove(nullptr)
+    , fFirstEdgeBelow(nullptr), fLastEdgeBelow(nullptr)
+    , fProcessed(false)
+#if LOGGING_ENABLED
+    , fID (-1.0f)
+#endif
+    {}
+    SkPoint fPoint;           // Vertex position
+    Vertex* fPrev;            // Linked list of contours, then Y-sorted vertices.
+    Vertex* fNext;            // "
+    Edge*   fFirstEdgeAbove;  // Linked list of edges above this vertex.
+    Edge*   fLastEdgeAbove;   // "
+    Edge*   fFirstEdgeBelow;  // Linked list of edges below this vertex.
+    Edge*   fLastEdgeBelow;   // "
+    bool    fProcessed;       // Has this vertex been seen in simplify()?
+#if LOGGING_ENABLED
+    float   fID;              // Identifier used for logging.
+#endif
+};
+
+/***************************************************************************************/
+
+typedef bool (*CompareFunc)(const SkPoint& a, const SkPoint& b);
+
+struct Comparator {
+    CompareFunc sweep_lt;
+    CompareFunc sweep_gt;
+};
+
+bool sweep_lt_horiz(const SkPoint& a, const SkPoint& b) {
+    return a.fX == b.fX ? a.fY > b.fY : a.fX < b.fX;
+}
+
+bool sweep_lt_vert(const SkPoint& a, const SkPoint& b) {
+    return a.fY == b.fY ? a.fX < b.fX : a.fY < b.fY;
+}
+
+bool sweep_gt_horiz(const SkPoint& a, const SkPoint& b) {
+    return a.fX == b.fX ? a.fY < b.fY : a.fX > b.fX;
+}
+
+bool sweep_gt_vert(const SkPoint& a, const SkPoint& b) {
+    return a.fY == b.fY ? a.fX > b.fX : a.fY > b.fY;
+}
+
+inline SkPoint* emit_vertex(Vertex* v, SkPoint* data) {
+    *data++ = v->fPoint;
+    return data;
+}
+
+SkPoint* emit_triangle(Vertex* v0, Vertex* v1, Vertex* v2, SkPoint* data) {
+#if WIREFRAME
+    data = emit_vertex(v0, data);
+    data = emit_vertex(v1, data);
+    data = emit_vertex(v1, data);
+    data = emit_vertex(v2, data);
+    data = emit_vertex(v2, data);
+    data = emit_vertex(v0, data);
+#else
+    data = emit_vertex(v0, data);
+    data = emit_vertex(v1, data);
+    data = emit_vertex(v2, data);
+#endif
+    return data;
+}
+
+struct EdgeList {
+    EdgeList() : fHead(nullptr), fTail(nullptr) {}
+    Edge* fHead;
+    Edge* fTail;
+};
+
+/**
+ * An Edge joins a top Vertex to a bottom Vertex. Edge ordering for the list of "edges above" and
+ * "edge below" a vertex as well as for the active edge list is handled by isLeftOf()/isRightOf().
+ * Note that an Edge will give occasionally dist() != 0 for its own endpoints (because floating
+ * point). For speed, that case is only tested by the callers which require it (e.g.,
+ * cleanup_active_edges()). Edges also handle checking for intersection with other edges.
+ * Currently, this converts the edges to the parametric form, in order to avoid doing a division
+ * until an intersection has been confirmed. This is slightly slower in the "found" case, but
+ * a lot faster in the "not found" case.
+ *
+ * The coefficients of the line equation stored in double precision to avoid catastrphic
+ * cancellation in the isLeftOf() and isRightOf() checks. Using doubles ensures that the result is
+ * correct in float, since it's a polynomial of degree 2. The intersect() function, being
+ * degree 5, is still subject to catastrophic cancellation. We deal with that by assuming its
+ * output may be incorrect, and adjusting the mesh topology to match (see comment at the top of
+ * this file).
+ */
+
+struct Edge {
+    Edge(Vertex* top, Vertex* bottom, int winding)
+        : fWinding(winding)
+        , fTop(top)
+        , fBottom(bottom)
+        , fLeft(nullptr)
+        , fRight(nullptr)
+        , fPrevEdgeAbove(nullptr)
+        , fNextEdgeAbove(nullptr)
+        , fPrevEdgeBelow(nullptr)
+        , fNextEdgeBelow(nullptr)
+        , fLeftPoly(nullptr)
+        , fRightPoly(nullptr) {
+            recompute();
+        }
+    int      fWinding;          // 1 == edge goes downward; -1 = edge goes upward.
+    Vertex*  fTop;              // The top vertex in vertex-sort-order (sweep_lt).
+    Vertex*  fBottom;           // The bottom vertex in vertex-sort-order.
+    Edge*    fLeft;             // The linked list of edges in the active edge list.
+    Edge*    fRight;            // "
+    Edge*    fPrevEdgeAbove;    // The linked list of edges in the bottom Vertex's "edges above".
+    Edge*    fNextEdgeAbove;    // "
+    Edge*    fPrevEdgeBelow;    // The linked list of edges in the top Vertex's "edges below".
+    Edge*    fNextEdgeBelow;    // "
+    Poly*    fLeftPoly;         // The Poly to the left of this edge, if any.
+    Poly*    fRightPoly;        // The Poly to the right of this edge, if any.
+    double   fDX;               // The line equation for this edge, in implicit form.
+    double   fDY;               // fDY * x + fDX * y + fC = 0, for point (x, y) on the line.
+    double   fC;
+    double dist(const SkPoint& p) const {
+        return fDY * p.fX - fDX * p.fY + fC;
+    }
+    bool isRightOf(Vertex* v) const {
+        return dist(v->fPoint) < 0.0;
+    }
+    bool isLeftOf(Vertex* v) const {
+        return dist(v->fPoint) > 0.0;
+    }
+    void recompute() {
+        fDX = static_cast<double>(fBottom->fPoint.fX) - fTop->fPoint.fX;
+        fDY = static_cast<double>(fBottom->fPoint.fY) - fTop->fPoint.fY;
+        fC = static_cast<double>(fTop->fPoint.fY) * fBottom->fPoint.fX -
+             static_cast<double>(fTop->fPoint.fX) * fBottom->fPoint.fY;
+    }
+    bool intersect(const Edge& other, SkPoint* p) {
+        LOG("intersecting %g -> %g with %g -> %g\n",
+               fTop->fID, fBottom->fID,
+               other.fTop->fID, other.fBottom->fID);
+        if (fTop == other.fTop || fBottom == other.fBottom) {
+            return false;
+        }
+        double denom = fDX * other.fDY - fDY * other.fDX;
+        if (denom == 0.0) {
+            return false;
+        }
+        double dx = static_cast<double>(fTop->fPoint.fX) - other.fTop->fPoint.fX;
+        double dy = static_cast<double>(fTop->fPoint.fY) - other.fTop->fPoint.fY;
+        double sNumer = dy * other.fDX - dx * other.fDY;
+        double tNumer = dy * fDX - dx * fDY;
+        // If (sNumer / denom) or (tNumer / denom) is not in [0..1], exit early.
+        // This saves us doing the divide below unless absolutely necessary.
+        if (denom > 0.0 ? (sNumer < 0.0 || sNumer > denom || tNumer < 0.0 || tNumer > denom)
+                        : (sNumer > 0.0 || sNumer < denom || tNumer > 0.0 || tNumer < denom)) {
+            return false;
+        }
+        double s = sNumer / denom;
+        SkASSERT(s >= 0.0 && s <= 1.0);
+        p->fX = SkDoubleToScalar(fTop->fPoint.fX + s * fDX);
+        p->fY = SkDoubleToScalar(fTop->fPoint.fY + s * fDY);
+        return true;
+    }
+    bool isActive(EdgeList* activeEdges) const {
+        return activeEdges && (fLeft || fRight || activeEdges->fHead == this);
+    }
+};
+
+/***************************************************************************************/
+
+struct Poly {
+    Poly(int winding)
+        : fWinding(winding)
+        , fHead(nullptr)
+        , fTail(nullptr)
+        , fActive(nullptr)
+        , fNext(nullptr)
+        , fPartner(nullptr)
+        , fCount(0)
+    {
+#if LOGGING_ENABLED
+        static int gID = 0;
+        fID = gID++;
+        LOG("*** created Poly %d\n", fID);
+#endif
+    }
+    typedef enum { kNeither_Side, kLeft_Side, kRight_Side } Side;
+    struct MonotonePoly {
+        MonotonePoly()
+            : fSide(kNeither_Side)
+            , fHead(nullptr)
+            , fTail(nullptr)
+            , fPrev(nullptr)
+            , fNext(nullptr) {}
+        Side          fSide;
+        Vertex*       fHead;
+        Vertex*       fTail;
+        MonotonePoly* fPrev;
+        MonotonePoly* fNext;
+        bool addVertex(Vertex* v, Side side, SkChunkAlloc& alloc) {
+            Vertex* newV = ALLOC_NEW(Vertex, (v->fPoint), alloc);
+            bool done = false;
+            if (fSide == kNeither_Side) {
+                fSide = side;
+            } else {
+                done = side != fSide;
+            }
+            if (fHead == nullptr) {
+                fHead = fTail = newV;
+            } else if (fSide == kRight_Side) {
+                newV->fPrev = fTail;
+                fTail->fNext = newV;
+                fTail = newV;
+            } else {
+                newV->fNext = fHead;
+                fHead->fPrev = newV;
+                fHead = newV;
+            }
+            return done;
+        }
+
+        SkPoint* emit(SkPoint* data) {
+            Vertex* first = fHead;
+            Vertex* v = first->fNext;
+            while (v != fTail) {
+                SkASSERT(v && v->fPrev && v->fNext);
+                Vertex* prev = v->fPrev;
+                Vertex* curr = v;
+                Vertex* next = v->fNext;
+                double ax = static_cast<double>(curr->fPoint.fX) - prev->fPoint.fX;
+                double ay = static_cast<double>(curr->fPoint.fY) - prev->fPoint.fY;
+                double bx = static_cast<double>(next->fPoint.fX) - curr->fPoint.fX;
+                double by = static_cast<double>(next->fPoint.fY) - curr->fPoint.fY;
+                if (ax * by - ay * bx >= 0.0) {
+                    data = emit_triangle(prev, curr, next, data);
+                    v->fPrev->fNext = v->fNext;
+                    v->fNext->fPrev = v->fPrev;
+                    if (v->fPrev == first) {
+                        v = v->fNext;
+                    } else {
+                        v = v->fPrev;
+                    }
+                } else {
+                    v = v->fNext;
+                }
+            }
+            return data;
+        }
+    };
+    Poly* addVertex(Vertex* v, Side side, SkChunkAlloc& alloc) {
+        LOG("addVertex() to %d at %g (%g, %g), %s side\n", fID, v->fID, v->fPoint.fX, v->fPoint.fY,
+               side == kLeft_Side ? "left" : side == kRight_Side ? "right" : "neither");
+        Poly* partner = fPartner;
+        Poly* poly = this;
+        if (partner) {
+            fPartner = partner->fPartner = nullptr;
+        }
+        if (!fActive) {
+            fActive = ALLOC_NEW(MonotonePoly, (), alloc);
+        }
+        if (fActive->addVertex(v, side, alloc)) {
+            if (fTail) {
+                fActive->fPrev = fTail;
+                fTail->fNext = fActive;
+                fTail = fActive;
+            } else {
+                fHead = fTail = fActive;
+            }
+            if (partner) {
+                partner->addVertex(v, side, alloc);
+                poly = partner;
+            } else {
+                Vertex* prev = fActive->fSide == Poly::kLeft_Side ?
+                               fActive->fHead->fNext : fActive->fTail->fPrev;
+                fActive = ALLOC_NEW(MonotonePoly, , alloc);
+                fActive->addVertex(prev, Poly::kNeither_Side, alloc);
+                fActive->addVertex(v, side, alloc);
+            }
+        }
+        fCount++;
+        return poly;
+    }
+    void end(Vertex* v, SkChunkAlloc& alloc) {
+        LOG("end() %d at %g, %g\n", fID, v->fPoint.fX, v->fPoint.fY);
+        if (fPartner) {
+            fPartner = fPartner->fPartner = nullptr;
+        }
+        addVertex(v, fActive->fSide == kLeft_Side ? kRight_Side : kLeft_Side, alloc);
+    }
+    SkPoint* emit(SkPoint *data) {
+        if (fCount < 3) {
+            return data;
+        }
+        LOG("emit() %d, size %d\n", fID, fCount);
+        for (MonotonePoly* m = fHead; m != nullptr; m = m->fNext) {
+            data = m->emit(data);
+        }
+        return data;
+    }
+    int fWinding;
+    MonotonePoly* fHead;
+    MonotonePoly* fTail;
+    MonotonePoly* fActive;
+    Poly* fNext;
+    Poly* fPartner;
+    int fCount;
+#if LOGGING_ENABLED
+    int fID;
+#endif
+};
+
+/***************************************************************************************/
+
+bool coincident(const SkPoint& a, const SkPoint& b) {
+    return a == b;
+}
+
+Poly* new_poly(Poly** head, Vertex* v, int winding, SkChunkAlloc& alloc) {
+    Poly* poly = ALLOC_NEW(Poly, (winding), alloc);
+    poly->addVertex(v, Poly::kNeither_Side, alloc);
+    poly->fNext = *head;
+    *head = poly;
+    return poly;
+}
+
+Vertex* append_point_to_contour(const SkPoint& p, Vertex* prev, Vertex** head,
+                                SkChunkAlloc& alloc) {
+    Vertex* v = ALLOC_NEW(Vertex, (p), alloc);
+#if LOGGING_ENABLED
+    static float gID = 0.0f;
+    v->fID = gID++;
+#endif
+    if (prev) {
+        prev->fNext = v;
+        v->fPrev = prev;
+    } else {
+        *head = v;
+    }
+    return v;
+}
+
+Vertex* generate_quadratic_points(const SkPoint& p0,
+                                  const SkPoint& p1,
+                                  const SkPoint& p2,
+                                  SkScalar tolSqd,
+                                  Vertex* prev,
+                                  Vertex** head,
+                                  int pointsLeft,
+                                  SkChunkAlloc& alloc) {
+    SkScalar d = p1.distanceToLineSegmentBetweenSqd(p0, p2);
+    if (pointsLeft < 2 || d < tolSqd || !SkScalarIsFinite(d)) {
+        return append_point_to_contour(p2, prev, head, alloc);
+    }
+
+    const SkPoint q[] = {
+        { SkScalarAve(p0.fX, p1.fX), SkScalarAve(p0.fY, p1.fY) },
+        { SkScalarAve(p1.fX, p2.fX), SkScalarAve(p1.fY, p2.fY) },
+    };
+    const SkPoint r = { SkScalarAve(q[0].fX, q[1].fX), SkScalarAve(q[0].fY, q[1].fY) };
+
+    pointsLeft >>= 1;
+    prev = generate_quadratic_points(p0, q[0], r, tolSqd, prev, head, pointsLeft, alloc);
+    prev = generate_quadratic_points(r, q[1], p2, tolSqd, prev, head, pointsLeft, alloc);
+    return prev;
+}
+
+Vertex* generate_cubic_points(const SkPoint& p0,
+                              const SkPoint& p1,
+                              const SkPoint& p2,
+                              const SkPoint& p3,
+                              SkScalar tolSqd,
+                              Vertex* prev,
+                              Vertex** head,
+                              int pointsLeft,
+                              SkChunkAlloc& alloc) {
+    SkScalar d1 = p1.distanceToLineSegmentBetweenSqd(p0, p3);
+    SkScalar d2 = p2.distanceToLineSegmentBetweenSqd(p0, p3);
+    if (pointsLeft < 2 || (d1 < tolSqd && d2 < tolSqd) ||
+        !SkScalarIsFinite(d1) || !SkScalarIsFinite(d2)) {
+        return append_point_to_contour(p3, prev, head, alloc);
+    }
+    const SkPoint q[] = {
+        { SkScalarAve(p0.fX, p1.fX), SkScalarAve(p0.fY, p1.fY) },
+        { SkScalarAve(p1.fX, p2.fX), SkScalarAve(p1.fY, p2.fY) },
+        { SkScalarAve(p2.fX, p3.fX), SkScalarAve(p2.fY, p3.fY) }
+    };
+    const SkPoint r[] = {
+        { SkScalarAve(q[0].fX, q[1].fX), SkScalarAve(q[0].fY, q[1].fY) },
+        { SkScalarAve(q[1].fX, q[2].fX), SkScalarAve(q[1].fY, q[2].fY) }
+    };
+    const SkPoint s = { SkScalarAve(r[0].fX, r[1].fX), SkScalarAve(r[0].fY, r[1].fY) };
+    pointsLeft >>= 1;
+    prev = generate_cubic_points(p0, q[0], r[0], s, tolSqd, prev, head, pointsLeft, alloc);
+    prev = generate_cubic_points(s, r[1], q[2], p3, tolSqd, prev, head, pointsLeft, alloc);
+    return prev;
+}
+
+// Stage 1: convert the input path to a set of linear contours (linked list of Vertices).
+
+void path_to_contours(const SkPath& path, SkScalar tolerance, const SkRect& clipBounds,
+                      Vertex** contours, SkChunkAlloc& alloc, bool *isLinear) {
+
+    SkScalar toleranceSqd = tolerance * tolerance;
+
+    SkPoint pts[4];
+    bool done = false;
+    *isLinear = true;
+    SkPath::Iter iter(path, false);
+    Vertex* prev = nullptr;
+    Vertex* head = nullptr;
+    if (path.isInverseFillType()) {
+        SkPoint quad[4];
+        clipBounds.toQuad(quad);
+        for (int i = 3; i >= 0; i--) {
+            prev = append_point_to_contour(quad[i], prev, &head, alloc);
+        }
+        head->fPrev = prev;
+        prev->fNext = head;
+        *contours++ = head;
+        head = prev = nullptr;
+    }
+    SkAutoConicToQuads converter;
+    while (!done) {
+        SkPath::Verb verb = iter.next(pts);
+        switch (verb) {
+            case SkPath::kConic_Verb: {
+                SkScalar weight = iter.conicWeight();
+                const SkPoint* quadPts = converter.computeQuads(pts, weight, toleranceSqd);
+                for (int i = 0; i < converter.countQuads(); ++i) {
+                    int pointsLeft = GrPathUtils::quadraticPointCount(quadPts, tolerance);
+                    prev = generate_quadratic_points(quadPts[0], quadPts[1], quadPts[2],
+                                                     toleranceSqd, prev, &head, pointsLeft, alloc);
+                    quadPts += 2;
+                }
+                *isLinear = false;
+                break;
+            }
+            case SkPath::kMove_Verb:
+                if (head) {
+                    head->fPrev = prev;
+                    prev->fNext = head;
+                    *contours++ = head;
+                }
+                head = prev = nullptr;
+                prev = append_point_to_contour(pts[0], prev, &head, alloc);
+                break;
+            case SkPath::kLine_Verb: {
+                prev = append_point_to_contour(pts[1], prev, &head, alloc);
+                break;
+            }
+            case SkPath::kQuad_Verb: {
+                int pointsLeft = GrPathUtils::quadraticPointCount(pts, tolerance);
+                prev = generate_quadratic_points(pts[0], pts[1], pts[2], toleranceSqd, prev,
+                                                 &head, pointsLeft, alloc);
+                *isLinear = false;
+                break;
+            }
+            case SkPath::kCubic_Verb: {
+                int pointsLeft = GrPathUtils::cubicPointCount(pts, tolerance);
+                prev = generate_cubic_points(pts[0], pts[1], pts[2], pts[3],
+                                toleranceSqd, prev, &head, pointsLeft, alloc);
+                *isLinear = false;
+                break;
+            }
+            case SkPath::kClose_Verb:
+                if (head) {
+                    head->fPrev = prev;
+                    prev->fNext = head;
+                    *contours++ = head;
+                }
+                head = prev = nullptr;
+                break;
+            case SkPath::kDone_Verb:
+                if (head) {
+                    head->fPrev = prev;
+                    prev->fNext = head;
+                    *contours++ = head;
+                }
+                done = true;
+                break;
+        }
+    }
+}
+
+inline bool apply_fill_type(SkPath::FillType fillType, int winding) {
+    switch (fillType) {
+        case SkPath::kWinding_FillType:
+            return winding != 0;
+        case SkPath::kEvenOdd_FillType:
+            return (winding & 1) != 0;
+        case SkPath::kInverseWinding_FillType:
+            return winding == 1;
+        case SkPath::kInverseEvenOdd_FillType:
+            return (winding & 1) == 1;
+        default:
+            SkASSERT(false);
+            return false;
+    }
+}
+
+Edge* new_edge(Vertex* prev, Vertex* next, SkChunkAlloc& alloc, Comparator& c) {
+    int winding = c.sweep_lt(prev->fPoint, next->fPoint) ? 1 : -1;
+    Vertex* top = winding < 0 ? next : prev;
+    Vertex* bottom = winding < 0 ? prev : next;
+    return ALLOC_NEW(Edge, (top, bottom, winding), alloc);
+}
+
+void remove_edge(Edge* edge, EdgeList* edges) {
+    LOG("removing edge %g -> %g\n", edge->fTop->fID, edge->fBottom->fID);
+    SkASSERT(edge->isActive(edges));
+    remove<Edge, &Edge::fLeft, &Edge::fRight>(edge, &edges->fHead, &edges->fTail);
+}
+
+void insert_edge(Edge* edge, Edge* prev, EdgeList* edges) {
+    LOG("inserting edge %g -> %g\n", edge->fTop->fID, edge->fBottom->fID);
+    SkASSERT(!edge->isActive(edges));
+    Edge* next = prev ? prev->fRight : edges->fHead;
+    insert<Edge, &Edge::fLeft, &Edge::fRight>(edge, prev, next, &edges->fHead, &edges->fTail);
+}
+
+void find_enclosing_edges(Vertex* v, EdgeList* edges, Edge** left, Edge** right) {
+    if (v->fFirstEdgeAbove) {
+        *left = v->fFirstEdgeAbove->fLeft;
+        *right = v->fLastEdgeAbove->fRight;
+        return;
+    }
+    Edge* next = nullptr;
+    Edge* prev;
+    for (prev = edges->fTail; prev != nullptr; prev = prev->fLeft) {
+        if (prev->isLeftOf(v)) {
+            break;
+        }
+        next = prev;
+    }
+    *left = prev;
+    *right = next;
+    return;
+}
+
+void find_enclosing_edges(Edge* edge, EdgeList* edges, Comparator& c, Edge** left, Edge** right) {
+    Edge* prev = nullptr;
+    Edge* next;
+    for (next = edges->fHead; next != nullptr; next = next->fRight) {
+        if ((c.sweep_gt(edge->fTop->fPoint, next->fTop->fPoint) && next->isRightOf(edge->fTop)) ||
+            (c.sweep_gt(next->fTop->fPoint, edge->fTop->fPoint) && edge->isLeftOf(next->fTop)) ||
+            (c.sweep_lt(edge->fBottom->fPoint, next->fBottom->fPoint) &&
+             next->isRightOf(edge->fBottom)) ||
+            (c.sweep_lt(next->fBottom->fPoint, edge->fBottom->fPoint) &&
+             edge->isLeftOf(next->fBottom))) {
+            break;
+        }
+        prev = next;
+    }
+    *left = prev;
+    *right = next;
+    return;
+}
+
+void fix_active_state(Edge* edge, EdgeList* activeEdges, Comparator& c) {
+    if (edge->isActive(activeEdges)) {
+        if (edge->fBottom->fProcessed || !edge->fTop->fProcessed) {
+            remove_edge(edge, activeEdges);
+        }
+    } else if (edge->fTop->fProcessed && !edge->fBottom->fProcessed) {
+        Edge* left;
+        Edge* right;
+        find_enclosing_edges(edge, activeEdges, c, &left, &right);
+        insert_edge(edge, left, activeEdges);
+    }
+}
+
+void insert_edge_above(Edge* edge, Vertex* v, Comparator& c) {
+    if (edge->fTop->fPoint == edge->fBottom->fPoint ||
+        c.sweep_gt(edge->fTop->fPoint, edge->fBottom->fPoint)) {
+        return;
+    }
+    LOG("insert edge (%g -> %g) above vertex %g\n", edge->fTop->fID, edge->fBottom->fID, v->fID);
+    Edge* prev = nullptr;
+    Edge* next;
+    for (next = v->fFirstEdgeAbove; next; next = next->fNextEdgeAbove) {
+        if (next->isRightOf(edge->fTop)) {
+            break;
+        }
+        prev = next;
+    }
+    insert<Edge, &Edge::fPrevEdgeAbove, &Edge::fNextEdgeAbove>(
+        edge, prev, next, &v->fFirstEdgeAbove, &v->fLastEdgeAbove);
+}
+
+void insert_edge_below(Edge* edge, Vertex* v, Comparator& c) {
+    if (edge->fTop->fPoint == edge->fBottom->fPoint ||
+        c.sweep_gt(edge->fTop->fPoint, edge->fBottom->fPoint)) {
+        return;
+    }
+    LOG("insert edge (%g -> %g) below vertex %g\n", edge->fTop->fID, edge->fBottom->fID, v->fID);
+    Edge* prev = nullptr;
+    Edge* next;
+    for (next = v->fFirstEdgeBelow; next; next = next->fNextEdgeBelow) {
+        if (next->isRightOf(edge->fBottom)) {
+            break;
+        }
+        prev = next;
+    }
+    insert<Edge, &Edge::fPrevEdgeBelow, &Edge::fNextEdgeBelow>(
+        edge, prev, next, &v->fFirstEdgeBelow, &v->fLastEdgeBelow);
+}
+
+void remove_edge_above(Edge* edge) {
+    LOG("removing edge (%g -> %g) above vertex %g\n", edge->fTop->fID, edge->fBottom->fID,
+        edge->fBottom->fID);
+    remove<Edge, &Edge::fPrevEdgeAbove, &Edge::fNextEdgeAbove>(
+        edge, &edge->fBottom->fFirstEdgeAbove, &edge->fBottom->fLastEdgeAbove);
+}
+
+void remove_edge_below(Edge* edge) {
+    LOG("removing edge (%g -> %g) below vertex %g\n", edge->fTop->fID, edge->fBottom->fID,
+        edge->fTop->fID);
+    remove<Edge, &Edge::fPrevEdgeBelow, &Edge::fNextEdgeBelow>(
+        edge, &edge->fTop->fFirstEdgeBelow, &edge->fTop->fLastEdgeBelow);
+}
+
+void erase_edge_if_zero_winding(Edge* edge, EdgeList* edges) {
+    if (edge->fWinding != 0) {
+        return;
+    }
+    LOG("erasing edge (%g -> %g)\n", edge->fTop->fID, edge->fBottom->fID);
+    remove_edge_above(edge);
+    remove_edge_below(edge);
+    if (edge->isActive(edges)) {
+        remove_edge(edge, edges);
+    }
+}
+
+void merge_collinear_edges(Edge* edge, EdgeList* activeEdges, Comparator& c);
+
+void set_top(Edge* edge, Vertex* v, EdgeList* activeEdges, Comparator& c) {
+    remove_edge_below(edge);
+    edge->fTop = v;
+    edge->recompute();
+    insert_edge_below(edge, v, c);
+    fix_active_state(edge, activeEdges, c);
+    merge_collinear_edges(edge, activeEdges, c);
+}
+
+void set_bottom(Edge* edge, Vertex* v, EdgeList* activeEdges, Comparator& c) {
+    remove_edge_above(edge);
+    edge->fBottom = v;
+    edge->recompute();
+    insert_edge_above(edge, v, c);
+    fix_active_state(edge, activeEdges, c);
+    merge_collinear_edges(edge, activeEdges, c);
+}
+
+void merge_edges_above(Edge* edge, Edge* other, EdgeList* activeEdges, Comparator& c) {
+    if (coincident(edge->fTop->fPoint, other->fTop->fPoint)) {
+        LOG("merging coincident above edges (%g, %g) -> (%g, %g)\n",
+            edge->fTop->fPoint.fX, edge->fTop->fPoint.fY,
+            edge->fBottom->fPoint.fX, edge->fBottom->fPoint.fY);
+        other->fWinding += edge->fWinding;
+        erase_edge_if_zero_winding(other, activeEdges);
+        edge->fWinding = 0;
+        erase_edge_if_zero_winding(edge, activeEdges);
+    } else if (c.sweep_lt(edge->fTop->fPoint, other->fTop->fPoint)) {
+        other->fWinding += edge->fWinding;
+        erase_edge_if_zero_winding(other, activeEdges);
+        set_bottom(edge, other->fTop, activeEdges, c);
+    } else {
+        edge->fWinding += other->fWinding;
+        erase_edge_if_zero_winding(edge, activeEdges);
+        set_bottom(other, edge->fTop, activeEdges, c);
+    }
+}
+
+void merge_edges_below(Edge* edge, Edge* other, EdgeList* activeEdges, Comparator& c) {
+    if (coincident(edge->fBottom->fPoint, other->fBottom->fPoint)) {
+        LOG("merging coincident below edges (%g, %g) -> (%g, %g)\n",
+            edge->fTop->fPoint.fX, edge->fTop->fPoint.fY,
+            edge->fBottom->fPoint.fX, edge->fBottom->fPoint.fY);
+        other->fWinding += edge->fWinding;
+        erase_edge_if_zero_winding(other, activeEdges);
+        edge->fWinding = 0;
+        erase_edge_if_zero_winding(edge, activeEdges);
+    } else if (c.sweep_lt(edge->fBottom->fPoint, other->fBottom->fPoint)) {
+        edge->fWinding += other->fWinding;
+        erase_edge_if_zero_winding(edge, activeEdges);
+        set_top(other, edge->fBottom, activeEdges, c);
+    } else {
+        other->fWinding += edge->fWinding;
+        erase_edge_if_zero_winding(other, activeEdges);
+        set_top(edge, other->fBottom, activeEdges, c);
+    }
+}
+
+void merge_collinear_edges(Edge* edge, EdgeList* activeEdges, Comparator& c) {
+    if (edge->fPrevEdgeAbove && (edge->fTop == edge->fPrevEdgeAbove->fTop ||
+                                 !edge->fPrevEdgeAbove->isLeftOf(edge->fTop))) {
+        merge_edges_above(edge, edge->fPrevEdgeAbove, activeEdges, c);
+    } else if (edge->fNextEdgeAbove && (edge->fTop == edge->fNextEdgeAbove->fTop ||
+                                        !edge->isLeftOf(edge->fNextEdgeAbove->fTop))) {
+        merge_edges_above(edge, edge->fNextEdgeAbove, activeEdges, c);
+    }
+    if (edge->fPrevEdgeBelow && (edge->fBottom == edge->fPrevEdgeBelow->fBottom ||
+                                 !edge->fPrevEdgeBelow->isLeftOf(edge->fBottom))) {
+        merge_edges_below(edge, edge->fPrevEdgeBelow, activeEdges, c);
+    } else if (edge->fNextEdgeBelow && (edge->fBottom == edge->fNextEdgeBelow->fBottom ||
+                                        !edge->isLeftOf(edge->fNextEdgeBelow->fBottom))) {
+        merge_edges_below(edge, edge->fNextEdgeBelow, activeEdges, c);
+    }
+}
+
+void split_edge(Edge* edge, Vertex* v, EdgeList* activeEdges, Comparator& c, SkChunkAlloc& alloc);
+
+void cleanup_active_edges(Edge* edge, EdgeList* activeEdges, Comparator& c, SkChunkAlloc& alloc) {
+    Vertex* top = edge->fTop;
+    Vertex* bottom = edge->fBottom;
+    if (edge->fLeft) {
+        Vertex* leftTop = edge->fLeft->fTop;
+        Vertex* leftBottom = edge->fLeft->fBottom;
+        if (c.sweep_gt(top->fPoint, leftTop->fPoint) && !edge->fLeft->isLeftOf(top)) {
+            split_edge(edge->fLeft, edge->fTop, activeEdges, c, alloc);
+        } else if (c.sweep_gt(leftTop->fPoint, top->fPoint) && !edge->isRightOf(leftTop)) {
+            split_edge(edge, leftTop, activeEdges, c, alloc);
+        } else if (c.sweep_lt(bottom->fPoint, leftBottom->fPoint) &&
+                   !edge->fLeft->isLeftOf(bottom)) {
+            split_edge(edge->fLeft, bottom, activeEdges, c, alloc);
+        } else if (c.sweep_lt(leftBottom->fPoint, bottom->fPoint) && !edge->isRightOf(leftBottom)) {
+            split_edge(edge, leftBottom, activeEdges, c, alloc);
+        }
+    }
+    if (edge->fRight) {
+        Vertex* rightTop = edge->fRight->fTop;
+        Vertex* rightBottom = edge->fRight->fBottom;
+        if (c.sweep_gt(top->fPoint, rightTop->fPoint) && !edge->fRight->isRightOf(top)) {
+            split_edge(edge->fRight, top, activeEdges, c, alloc);
+        } else if (c.sweep_gt(rightTop->fPoint, top->fPoint) && !edge->isLeftOf(rightTop)) {
+            split_edge(edge, rightTop, activeEdges, c, alloc);
+        } else if (c.sweep_lt(bottom->fPoint, rightBottom->fPoint) &&
+                   !edge->fRight->isRightOf(bottom)) {
+            split_edge(edge->fRight, bottom, activeEdges, c, alloc);
+        } else if (c.sweep_lt(rightBottom->fPoint, bottom->fPoint) &&
+                   !edge->isLeftOf(rightBottom)) {
+            split_edge(edge, rightBottom, activeEdges, c, alloc);
+        }
+    }
+}
+
+void split_edge(Edge* edge, Vertex* v, EdgeList* activeEdges, Comparator& c, SkChunkAlloc& alloc) {
+    LOG("splitting edge (%g -> %g) at vertex %g (%g, %g)\n",
+        edge->fTop->fID, edge->fBottom->fID,
+        v->fID, v->fPoint.fX, v->fPoint.fY);
+    if (c.sweep_lt(v->fPoint, edge->fTop->fPoint)) {
+        set_top(edge, v, activeEdges, c);
+    } else if (c.sweep_gt(v->fPoint, edge->fBottom->fPoint)) {
+        set_bottom(edge, v, activeEdges, c);
+    } else {
+        Edge* newEdge = ALLOC_NEW(Edge, (v, edge->fBottom, edge->fWinding), alloc);
+        insert_edge_below(newEdge, v, c);
+        insert_edge_above(newEdge, edge->fBottom, c);
+        set_bottom(edge, v, activeEdges, c);
+        cleanup_active_edges(edge, activeEdges, c, alloc);
+        fix_active_state(newEdge, activeEdges, c);
+        merge_collinear_edges(newEdge, activeEdges, c);
+    }
+}
+
+void merge_vertices(Vertex* src, Vertex* dst, Vertex** head, Comparator& c, SkChunkAlloc& alloc) {
+    LOG("found coincident verts at %g, %g; merging %g into %g\n", src->fPoint.fX, src->fPoint.fY,
+        src->fID, dst->fID);
+    for (Edge* edge = src->fFirstEdgeAbove; edge;) {
+        Edge* next = edge->fNextEdgeAbove;
+        set_bottom(edge, dst, nullptr, c);
+        edge = next;
+    }
+    for (Edge* edge = src->fFirstEdgeBelow; edge;) {
+        Edge* next = edge->fNextEdgeBelow;
+        set_top(edge, dst, nullptr, c);
+        edge = next;
+    }
+    remove<Vertex, &Vertex::fPrev, &Vertex::fNext>(src, head, nullptr);
+}
+
+Vertex* check_for_intersection(Edge* edge, Edge* other, EdgeList* activeEdges, Comparator& c,
+                               SkChunkAlloc& alloc) {
+    SkPoint p;
+    if (!edge || !other) {
+        return nullptr;
+    }
+    if (edge->intersect(*other, &p)) {
+        Vertex* v;
+        LOG("found intersection, pt is %g, %g\n", p.fX, p.fY);
+        if (p == edge->fTop->fPoint || c.sweep_lt(p, edge->fTop->fPoint)) {
+            split_edge(other, edge->fTop, activeEdges, c, alloc);
+            v = edge->fTop;
+        } else if (p == edge->fBottom->fPoint || c.sweep_gt(p, edge->fBottom->fPoint)) {
+            split_edge(other, edge->fBottom, activeEdges, c, alloc);
+            v = edge->fBottom;
+        } else if (p == other->fTop->fPoint || c.sweep_lt(p, other->fTop->fPoint)) {
+            split_edge(edge, other->fTop, activeEdges, c, alloc);
+            v = other->fTop;
+        } else if (p == other->fBottom->fPoint || c.sweep_gt(p, other->fBottom->fPoint)) {
+            split_edge(edge, other->fBottom, activeEdges, c, alloc);
+            v = other->fBottom;
+        } else {
+            Vertex* nextV = edge->fTop;
+            while (c.sweep_lt(p, nextV->fPoint)) {
+                nextV = nextV->fPrev;
+            }
+            while (c.sweep_lt(nextV->fPoint, p)) {
+                nextV = nextV->fNext;
+            }
+            Vertex* prevV = nextV->fPrev;
+            if (coincident(prevV->fPoint, p)) {
+                v = prevV;
+            } else if (coincident(nextV->fPoint, p)) {
+                v = nextV;
+            } else {
+                v = ALLOC_NEW(Vertex, (p), alloc);
+                LOG("inserting between %g (%g, %g) and %g (%g, %g)\n",
+                    prevV->fID, prevV->fPoint.fX, prevV->fPoint.fY,
+                    nextV->fID, nextV->fPoint.fX, nextV->fPoint.fY);
+#if LOGGING_ENABLED
+                v->fID = (nextV->fID + prevV->fID) * 0.5f;
+#endif
+                v->fPrev = prevV;
+                v->fNext = nextV;
+                prevV->fNext = v;
+                nextV->fPrev = v;
+            }
+            split_edge(edge, v, activeEdges, c, alloc);
+            split_edge(other, v, activeEdges, c, alloc);
+        }
+        return v;
+    }
+    return nullptr;
+}
+
+void sanitize_contours(Vertex** contours, int contourCnt) {
+    for (int i = 0; i < contourCnt; ++i) {
+        SkASSERT(contours[i]);
+        for (Vertex* v = contours[i];;) {
+            if (coincident(v->fPrev->fPoint, v->fPoint)) {
+                LOG("vertex %g,%g coincident; removing\n", v->fPoint.fX, v->fPoint.fY);
+                if (v->fPrev == v) {
+                    contours[i] = nullptr;
+                    break;
+                }
+                v->fPrev->fNext = v->fNext;
+                v->fNext->fPrev = v->fPrev;
+                if (contours[i] == v) {
+                    contours[i] = v->fNext;
+                }
+                v = v->fPrev;
+            } else {
+                v = v->fNext;
+                if (v == contours[i]) break;
+            }
+        }
+    }
+}
+
+void merge_coincident_vertices(Vertex** vertices, Comparator& c, SkChunkAlloc& alloc) {
+    for (Vertex* v = (*vertices)->fNext; v != nullptr; v = v->fNext) {
+        if (c.sweep_lt(v->fPoint, v->fPrev->fPoint)) {
+            v->fPoint = v->fPrev->fPoint;
+        }
+        if (coincident(v->fPrev->fPoint, v->fPoint)) {
+            merge_vertices(v->fPrev, v, vertices, c, alloc);
+        }
+    }
+}
+
+// Stage 2: convert the contours to a mesh of edges connecting the vertices.
+
+Vertex* build_edges(Vertex** contours, int contourCnt, Comparator& c, SkChunkAlloc& alloc) {
+    Vertex* vertices = nullptr;
+    Vertex* prev = nullptr;
+    for (int i = 0; i < contourCnt; ++i) {
+        for (Vertex* v = contours[i]; v != nullptr;) {
+            Vertex* vNext = v->fNext;
+            Edge* edge = new_edge(v->fPrev, v, alloc, c);
+            if (edge->fWinding > 0) {
+                insert_edge_below(edge, v->fPrev, c);
+                insert_edge_above(edge, v, c);
+            } else {
+                insert_edge_below(edge, v, c);
+                insert_edge_above(edge, v->fPrev, c);
+            }
+            merge_collinear_edges(edge, nullptr, c);
+            if (prev) {
+                prev->fNext = v;
+                v->fPrev = prev;
+            } else {
+                vertices = v;
+            }
+            prev = v;
+            v = vNext;
+            if (v == contours[i]) break;
+        }
+    }
+    if (prev) {
+        prev->fNext = vertices->fPrev = nullptr;
+    }
+    return vertices;
+}
+
+// Stage 3: sort the vertices by increasing sweep direction.
+
+Vertex* sorted_merge(Vertex* a, Vertex* b, Comparator& c);
+
+void front_back_split(Vertex* v, Vertex** pFront, Vertex** pBack) {
+    Vertex* fast;
+    Vertex* slow;
+    if (!v || !v->fNext) {
+        *pFront = v;
+        *pBack = nullptr;
+    } else {
+        slow = v;
+        fast = v->fNext;
+
+        while (fast != nullptr) {
+            fast = fast->fNext;
+            if (fast != nullptr) {
+                slow = slow->fNext;
+                fast = fast->fNext;
+            }
+        }
+
+        *pFront = v;
+        *pBack = slow->fNext;
+        slow->fNext->fPrev = nullptr;
+        slow->fNext = nullptr;
+    }
+}
+
+void merge_sort(Vertex** head, Comparator& c) {
+    if (!*head || !(*head)->fNext) {
+        return;
+    }
+
+    Vertex* a;
+    Vertex* b;
+    front_back_split(*head, &a, &b);
+
+    merge_sort(&a, c);
+    merge_sort(&b, c);
+
+    *head = sorted_merge(a, b, c);
+}
+
+inline void append_vertex(Vertex* v, Vertex** head, Vertex** tail) {
+    insert<Vertex, &Vertex::fPrev, &Vertex::fNext>(v, *tail, nullptr, head, tail);
+}
+
+inline void append_vertex_list(Vertex* v, Vertex** head, Vertex** tail) {
+    insert<Vertex, &Vertex::fPrev, &Vertex::fNext>(v, *tail, v->fNext, head, tail);
+}
+
+Vertex* sorted_merge(Vertex* a, Vertex* b, Comparator& c) {
+    Vertex* head = nullptr;
+    Vertex* tail = nullptr;
+
+    while (a && b) {
+        if (c.sweep_lt(a->fPoint, b->fPoint)) {
+            Vertex* next = a->fNext;
+            append_vertex(a, &head, &tail);
+            a = next;
+        } else {
+            Vertex* next = b->fNext;
+            append_vertex(b, &head, &tail);
+            b = next;
+        }
+    }
+    if (a) {
+        append_vertex_list(a, &head, &tail);
+    }
+    if (b) {
+        append_vertex_list(b, &head, &tail);
+    }
+    return head;
+}
+
+// Stage 4: Simplify the mesh by inserting new vertices at intersecting edges.
+
+void simplify(Vertex* vertices, Comparator& c, SkChunkAlloc& alloc) {
+    LOG("simplifying complex polygons\n");
+    EdgeList activeEdges;
+    for (Vertex* v = vertices; v != nullptr; v = v->fNext) {
+        if (!v->fFirstEdgeAbove && !v->fFirstEdgeBelow) {
+            continue;
+        }
+#if LOGGING_ENABLED
+        LOG("\nvertex %g: (%g,%g)\n", v->fID, v->fPoint.fX, v->fPoint.fY);
+#endif
+        Edge* leftEnclosingEdge = nullptr;
+        Edge* rightEnclosingEdge = nullptr;
+        bool restartChecks;
+        do {
+            restartChecks = false;
+            find_enclosing_edges(v, &activeEdges, &leftEnclosingEdge, &rightEnclosingEdge);
+            if (v->fFirstEdgeBelow) {
+                for (Edge* edge = v->fFirstEdgeBelow; edge != nullptr; edge = edge->fNextEdgeBelow) {
+                    if (check_for_intersection(edge, leftEnclosingEdge, &activeEdges, c, alloc)) {
+                        restartChecks = true;
+                        break;
+                    }
+                    if (check_for_intersection(edge, rightEnclosingEdge, &activeEdges, c, alloc)) {
+                        restartChecks = true;
+                        break;
+                    }
+                }
+            } else {
+                if (Vertex* pv = check_for_intersection(leftEnclosingEdge, rightEnclosingEdge,
+                                                        &activeEdges, c, alloc)) {
+                    if (c.sweep_lt(pv->fPoint, v->fPoint)) {
+                        v = pv;
+                    }
+                    restartChecks = true;
+                }
+
+            }
+        } while (restartChecks);
+        for (Edge* e = v->fFirstEdgeAbove; e; e = e->fNextEdgeAbove) {
+            remove_edge(e, &activeEdges);
+        }
+        Edge* leftEdge = leftEnclosingEdge;
+        for (Edge* e = v->fFirstEdgeBelow; e; e = e->fNextEdgeBelow) {
+            insert_edge(e, leftEdge, &activeEdges);
+            leftEdge = e;
+        }
+        v->fProcessed = true;
+    }
+}
+
+// Stage 5: Tessellate the simplified mesh into monotone polygons.
+
+Poly* tessellate(Vertex* vertices, SkChunkAlloc& alloc) {
+    LOG("tessellating simple polygons\n");
+    EdgeList activeEdges;
+    Poly* polys = nullptr;
+    for (Vertex* v = vertices; v != nullptr; v = v->fNext) {
+        if (!v->fFirstEdgeAbove && !v->fFirstEdgeBelow) {
+            continue;
+        }
+#if LOGGING_ENABLED
+        LOG("\nvertex %g: (%g,%g)\n", v->fID, v->fPoint.fX, v->fPoint.fY);
+#endif
+        Edge* leftEnclosingEdge = nullptr;
+        Edge* rightEnclosingEdge = nullptr;
+        find_enclosing_edges(v, &activeEdges, &leftEnclosingEdge, &rightEnclosingEdge);
+        Poly* leftPoly = nullptr;
+        Poly* rightPoly = nullptr;
+        if (v->fFirstEdgeAbove) {
+            leftPoly = v->fFirstEdgeAbove->fLeftPoly;
+            rightPoly = v->fLastEdgeAbove->fRightPoly;
+        } else {
+            leftPoly = leftEnclosingEdge ? leftEnclosingEdge->fRightPoly : nullptr;
+            rightPoly = rightEnclosingEdge ? rightEnclosingEdge->fLeftPoly : nullptr;
+        }
+#if LOGGING_ENABLED
+        LOG("edges above:\n");
+        for (Edge* e = v->fFirstEdgeAbove; e; e = e->fNextEdgeAbove) {
+            LOG("%g -> %g, lpoly %d, rpoly %d\n", e->fTop->fID, e->fBottom->fID,
+                e->fLeftPoly ? e->fLeftPoly->fID : -1, e->fRightPoly ? e->fRightPoly->fID : -1);
+        }
+        LOG("edges below:\n");
+        for (Edge* e = v->fFirstEdgeBelow; e; e = e->fNextEdgeBelow) {
+            LOG("%g -> %g, lpoly %d, rpoly %d\n", e->fTop->fID, e->fBottom->fID,
+                e->fLeftPoly ? e->fLeftPoly->fID : -1, e->fRightPoly ? e->fRightPoly->fID : -1);
+        }
+#endif
+        if (v->fFirstEdgeAbove) {
+            if (leftPoly) {
+                leftPoly = leftPoly->addVertex(v, Poly::kRight_Side, alloc);
+            }
+            if (rightPoly) {
+                rightPoly = rightPoly->addVertex(v, Poly::kLeft_Side, alloc);
+            }
+            for (Edge* e = v->fFirstEdgeAbove; e != v->fLastEdgeAbove; e = e->fNextEdgeAbove) {
+                Edge* leftEdge = e;
+                Edge* rightEdge = e->fNextEdgeAbove;
+                SkASSERT(rightEdge->isRightOf(leftEdge->fTop));
+                remove_edge(leftEdge, &activeEdges);
+                if (leftEdge->fRightPoly) {
+                    leftEdge->fRightPoly->end(v, alloc);
+                }
+                if (rightEdge->fLeftPoly && rightEdge->fLeftPoly != leftEdge->fRightPoly) {
+                    rightEdge->fLeftPoly->end(v, alloc);
+                }
+            }
+            remove_edge(v->fLastEdgeAbove, &activeEdges);
+            if (!v->fFirstEdgeBelow) {
+                if (leftPoly && rightPoly && leftPoly != rightPoly) {
+                    SkASSERT(leftPoly->fPartner == nullptr && rightPoly->fPartner == nullptr);
+                    rightPoly->fPartner = leftPoly;
+                    leftPoly->fPartner = rightPoly;
+                }
+            }
+        }
+        if (v->fFirstEdgeBelow) {
+            if (!v->fFirstEdgeAbove) {
+                if (leftPoly && leftPoly == rightPoly) {
+                    // Split the poly.
+                    if (leftPoly->fActive->fSide == Poly::kLeft_Side) {
+                        leftPoly = new_poly(&polys, leftEnclosingEdge->fTop, leftPoly->fWinding,
+                                            alloc);
+                        leftPoly->addVertex(v, Poly::kRight_Side, alloc);
+                        rightPoly->addVertex(v, Poly::kLeft_Side, alloc);
+                        leftEnclosingEdge->fRightPoly = leftPoly;
+                    } else {
+                        rightPoly = new_poly(&polys, rightEnclosingEdge->fTop, rightPoly->fWinding,
+                                             alloc);
+                        rightPoly->addVertex(v, Poly::kLeft_Side, alloc);
+                        leftPoly->addVertex(v, Poly::kRight_Side, alloc);
+                        rightEnclosingEdge->fLeftPoly = rightPoly;
+                    }
+                } else {
+                    if (leftPoly) {
+                        leftPoly = leftPoly->addVertex(v, Poly::kRight_Side, alloc);
+                    }
+                    if (rightPoly) {
+                        rightPoly = rightPoly->addVertex(v, Poly::kLeft_Side, alloc);
+                    }
+                }
+            }
+            Edge* leftEdge = v->fFirstEdgeBelow;
+            leftEdge->fLeftPoly = leftPoly;
+            insert_edge(leftEdge, leftEnclosingEdge, &activeEdges);
+            for (Edge* rightEdge = leftEdge->fNextEdgeBelow; rightEdge;
+                 rightEdge = rightEdge->fNextEdgeBelow) {
+                insert_edge(rightEdge, leftEdge, &activeEdges);
+                int winding = leftEdge->fLeftPoly ? leftEdge->fLeftPoly->fWinding : 0;
+                winding += leftEdge->fWinding;
+                if (winding != 0) {
+                    Poly* poly = new_poly(&polys, v, winding, alloc);
+                    leftEdge->fRightPoly = rightEdge->fLeftPoly = poly;
+                }
+                leftEdge = rightEdge;
+            }
+            v->fLastEdgeBelow->fRightPoly = rightPoly;
+        }
+#if LOGGING_ENABLED
+        LOG("\nactive edges:\n");
+        for (Edge* e = activeEdges.fHead; e != nullptr; e = e->fRight) {
+            LOG("%g -> %g, lpoly %d, rpoly %d\n", e->fTop->fID, e->fBottom->fID,
+                e->fLeftPoly ? e->fLeftPoly->fID : -1, e->fRightPoly ? e->fRightPoly->fID : -1);
+        }
+#endif
+    }
+    return polys;
+}
+
+// This is a driver function which calls stages 2-5 in turn.
+
+Poly* contours_to_polys(Vertex** contours, int contourCnt, Comparator& c, SkChunkAlloc& alloc) {
+#if LOGGING_ENABLED
+    for (int i = 0; i < contourCnt; ++i) {
+        Vertex* v = contours[i];
+        SkASSERT(v);
+        LOG("path.moveTo(%20.20g, %20.20g);\n", v->fPoint.fX, v->fPoint.fY);
+        for (v = v->fNext; v != contours[i]; v = v->fNext) {
+            LOG("path.lineTo(%20.20g, %20.20g);\n", v->fPoint.fX, v->fPoint.fY);
+        }
+    }
+#endif
+    sanitize_contours(contours, contourCnt);
+    Vertex* vertices = build_edges(contours, contourCnt, c, alloc);
+    if (!vertices) {
+        return nullptr;
+    }
+
+    // Sort vertices in Y (secondarily in X).
+    merge_sort(&vertices, c);
+    merge_coincident_vertices(&vertices, c, alloc);
+#if LOGGING_ENABLED
+    for (Vertex* v = vertices; v != nullptr; v = v->fNext) {
+        static float gID = 0.0f;
+        v->fID = gID++;
+    }
+#endif
+    simplify(vertices, c, alloc);
+    return tessellate(vertices, alloc);
+}
+
+// Stage 6: Triangulate the monotone polygons into a vertex buffer.
+
+SkPoint* polys_to_triangles(Poly* polys, SkPath::FillType fillType, SkPoint* data) {
+    SkPoint* d = data;
+    for (Poly* poly = polys; poly; poly = poly->fNext) {
+        if (apply_fill_type(fillType, poly->fWinding)) {
+            d = poly->emit(d);
+        }
+    }
+    return d;
+}
+
+struct TessInfo {
+    SkScalar  fTolerance;
+    int       fCount;
+};
+
+bool cache_match(GrVertexBuffer* vertexBuffer, SkScalar tol, int* actualCount) {
+    if (!vertexBuffer) {
+        return false;
+    }
+    const SkData* data = vertexBuffer->getUniqueKey().getCustomData();
+    SkASSERT(data);
+    const TessInfo* info = static_cast<const TessInfo*>(data->data());
+    if (info->fTolerance == 0 || info->fTolerance < 3.0f * tol) {
+        *actualCount = info->fCount;
+        return true;
+    }
+    return false;
+}
+
+};
+
+GrTessellatingPathRenderer::GrTessellatingPathRenderer() {
+}
+
+namespace {
+
+// When the SkPathRef genID changes, invalidate a corresponding GrResource described by key.
+class PathInvalidator : public SkPathRef::GenIDChangeListener {
+public:
+    explicit PathInvalidator(const GrUniqueKey& key) : fMsg(key) {}
+private:
+    GrUniqueKeyInvalidatedMessage fMsg;
+
+    void onChange() override {
+        SkMessageBus<GrUniqueKeyInvalidatedMessage>::Post(fMsg);
+    }
+};
+
+}  // namespace
+
+bool GrTessellatingPathRenderer::onCanDrawPath(const CanDrawPathArgs& args) const {
+    // This path renderer can draw all fill styles, all stroke styles except hairlines, but does
+    // not do antialiasing. It can do convex and concave paths, but we'll leave the convex ones to
+    // simpler algorithms.
+    return !IsStrokeHairlineOrEquivalent(*args.fStroke, *args.fViewMatrix, nullptr) &&
+           !args.fAntiAlias && !args.fPath->isConvex();
+}
+
+class TessellatingPathBatch : public GrVertexBatch {
+public:
+    DEFINE_BATCH_CLASS_ID
+
+    static GrDrawBatch* Create(const GrColor& color,
+                               const SkPath& path,
+                               const GrStrokeInfo& stroke,
+                               const SkMatrix& viewMatrix,
+                               SkRect clipBounds) {
+        return new TessellatingPathBatch(color, path, stroke, viewMatrix, clipBounds);
+    }
+
+    const char* name() const override { return "TessellatingPathBatch"; }
+
+    void computePipelineOptimizations(GrInitInvariantOutput* color, 
+                                      GrInitInvariantOutput* coverage,
+                                      GrBatchToXPOverrides* overrides) const override {
+        color->setKnownFourComponents(fColor);
+        coverage->setUnknownSingleComponent();
+        overrides->fUsePLSDstRead = false;
+    }
+
+private:
+    void initBatchTracker(const GrXPOverridesForBatch& overrides) override {
+        // Handle any color overrides
+        if (!overrides.readsColor()) {
+            fColor = GrColor_ILLEGAL;
+        }
+        overrides.getOverrideColorIfSet(&fColor);
+        fPipelineInfo = overrides;
+    }
+
+    int tessellate(GrUniqueKey* key,
+                   GrResourceProvider* resourceProvider,
+                   SkAutoTUnref<GrVertexBuffer>& vertexBuffer,
+                   bool canMapVB) const {
+        SkPath path;
+        GrStrokeInfo stroke(fStroke);
+        if (stroke.isDashed()) {
+            if (!stroke.applyDashToPath(&path, &stroke, fPath)) {
+                return 0;
+            }
+        } else {
+            path = fPath;
+        }
+        if (!stroke.isFillStyle()) {
+            stroke.setResScale(SkScalarAbs(fViewMatrix.getMaxScale()));
+            if (!stroke.applyToPath(&path, path)) {
+                return 0;
+            }
+            stroke.setFillStyle();
+        }
+        SkRect pathBounds = path.getBounds();
+        Comparator c;
+        if (pathBounds.width() > pathBounds.height()) {
+            c.sweep_lt = sweep_lt_horiz;
+            c.sweep_gt = sweep_gt_horiz;
+        } else {
+            c.sweep_lt = sweep_lt_vert;
+            c.sweep_gt = sweep_gt_vert;
+        }
+        SkScalar screenSpaceTol = GrPathUtils::kDefaultTolerance;
+        SkScalar tol = GrPathUtils::scaleToleranceToSrc(screenSpaceTol, fViewMatrix, pathBounds);
+        int contourCnt;
+        int maxPts = GrPathUtils::worstCasePointCount(path, &contourCnt, tol);
+        if (maxPts <= 0) {
+            return 0;
+        }
+        if (maxPts > ((int)SK_MaxU16 + 1)) {
+            SkDebugf("Path not rendered, too many verts (%d)\n", maxPts);
+            return 0;
+        }
+        SkPath::FillType fillType = path.getFillType();
+        if (SkPath::IsInverseFillType(fillType)) {
+            contourCnt++;
+        }
+
+        LOG("got %d pts, %d contours\n", maxPts, contourCnt);
+        SkAutoTDeleteArray<Vertex*> contours(new Vertex* [contourCnt]);
+
+        // For the initial size of the chunk allocator, estimate based on the point count:
+        // one vertex per point for the initial passes, plus two for the vertices in the
+        // resulting Polys, since the same point may end up in two Polys.  Assume minimal
+        // connectivity of one Edge per Vertex (will grow for intersections).
+        SkChunkAlloc alloc(maxPts * (3 * sizeof(Vertex) + sizeof(Edge)));
+        bool isLinear;
+        path_to_contours(path, tol, fClipBounds, contours.get(), alloc, &isLinear);
+        Poly* polys;
+        polys = contours_to_polys(contours.get(), contourCnt, c, alloc);
+        int count = 0;
+        for (Poly* poly = polys; poly; poly = poly->fNext) {
+            if (apply_fill_type(fillType, poly->fWinding) && poly->fCount >= 3) {
+                count += (poly->fCount - 2) * (WIREFRAME ? 6 : 3);
+            }
+        }
+        if (0 == count) {
+            return 0;
+        }
+
+        size_t size = count * sizeof(SkPoint);
+        if (!vertexBuffer.get() || vertexBuffer->gpuMemorySize() < size) {
+            vertexBuffer.reset(resourceProvider->createVertexBuffer(
+                size, GrResourceProvider::kStatic_BufferUsage, 0));
+        }
+        if (!vertexBuffer.get()) {
+            SkDebugf("Could not allocate vertices\n");
+            return 0;
+        }
+        SkPoint* verts;
+        if (canMapVB) {
+            verts = static_cast<SkPoint*>(vertexBuffer->map());
+        } else {
+            verts = new SkPoint[count];
+        }
+        SkPoint* end = polys_to_triangles(polys, fillType, verts);
+        int actualCount = static_cast<int>(end - verts);
+        LOG("actual count: %d\n", actualCount);
+        SkASSERT(actualCount <= count);
+        if (canMapVB) {
+            vertexBuffer->unmap();
+        } else {
+            vertexBuffer->updateData(verts, actualCount * sizeof(SkPoint));
+            delete[] verts;
+        }
+
+
+        if (!fPath.isVolatile()) {
+            TessInfo info;
+            info.fTolerance = isLinear ? 0 : tol;
+            info.fCount = actualCount;
+            SkAutoTUnref<SkData> data(SkData::NewWithCopy(&info, sizeof(info)));
+            key->setCustomData(data.get());
+            resourceProvider->assignUniqueKeyToResource(*key, vertexBuffer.get());
+            SkPathPriv::AddGenIDChangeListener(fPath, new PathInvalidator(*key));
+        }
+        return actualCount;
+    }
+
+    void onPrepareDraws(Target* target) const override {
+        // construct a cache key from the path's genID and the view matrix
+        static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
+        GrUniqueKey key;
+        int clipBoundsSize32 =
+            fPath.isInverseFillType() ? sizeof(fClipBounds) / sizeof(uint32_t) : 0;
+        int strokeDataSize32 = fStroke.computeUniqueKeyFragmentData32Cnt();
+        GrUniqueKey::Builder builder(&key, kDomain, 2 + clipBoundsSize32 + strokeDataSize32);
+        builder[0] = fPath.getGenerationID();
+        builder[1] = fPath.getFillType();
+        // For inverse fills, the tessellation is dependent on clip bounds.
+        if (fPath.isInverseFillType()) {
+            memcpy(&builder[2], &fClipBounds, sizeof(fClipBounds));
+        }
+        fStroke.asUniqueKeyFragment(&builder[2 + clipBoundsSize32]);
+        builder.finish();
+        GrResourceProvider* rp = target->resourceProvider();
+        SkAutoTUnref<GrVertexBuffer> vertexBuffer(rp->findAndRefTByUniqueKey<GrVertexBuffer>(key));
+        int actualCount;
+        SkScalar screenSpaceTol = GrPathUtils::kDefaultTolerance;
+        SkScalar tol = GrPathUtils::scaleToleranceToSrc(
+            screenSpaceTol, fViewMatrix, fPath.getBounds());
+        if (!cache_match(vertexBuffer.get(), tol, &actualCount)) {
+            bool canMapVB = GrCaps::kNone_MapFlags != target->caps().mapBufferFlags();
+            actualCount = this->tessellate(&key, rp, vertexBuffer, canMapVB);
+        }
+
+        if (actualCount == 0) {
+            return;
+        }
+
+        SkAutoTUnref<const GrGeometryProcessor> gp;
+        {
+            using namespace GrDefaultGeoProcFactory;
+
+            Color color(fColor);
+            LocalCoords localCoords(fPipelineInfo.readsLocalCoords() ?
+                                    LocalCoords::kUsePosition_Type :
+                                    LocalCoords::kUnused_Type);
+            Coverage::Type coverageType;
+            if (fPipelineInfo.readsCoverage()) {
+                coverageType = Coverage::kSolid_Type;
+            } else {
+                coverageType = Coverage::kNone_Type;
+            }
+            Coverage coverage(coverageType);
+            gp.reset(GrDefaultGeoProcFactory::Create(color, coverage, localCoords,
+                                                     fViewMatrix));
+        }
+
+        target->initDraw(gp, this->pipeline());
+        SkASSERT(gp->getVertexStride() == sizeof(SkPoint));
+
+        GrPrimitiveType primitiveType = WIREFRAME ? kLines_GrPrimitiveType
+                                                  : kTriangles_GrPrimitiveType;
+        GrVertices vertices;
+        vertices.init(primitiveType, vertexBuffer.get(), 0, actualCount);
+        target->draw(vertices);
+    }
+
+    bool onCombineIfPossible(GrBatch*, const GrCaps&) override { return false; }
+
+    TessellatingPathBatch(const GrColor& color,
+                          const SkPath& path,
+                          const GrStrokeInfo& stroke,
+                          const SkMatrix& viewMatrix,
+                          const SkRect& clipBounds)
+      : INHERITED(ClassID())
+      , fColor(color)
+      , fPath(path)
+      , fStroke(stroke)
+      , fViewMatrix(viewMatrix) {
+        const SkRect& pathBounds = path.getBounds();
+        fClipBounds = clipBounds;
+        // Because the clip bounds are used to add a contour for inverse fills, they must also
+        // include the path bounds.
+        fClipBounds.join(pathBounds);
+        if (path.isInverseFillType()) {
+            fBounds = fClipBounds;
+        } else {
+            fBounds = path.getBounds();
+        }
+        if (!stroke.isFillStyle()) {
+            SkScalar radius = SkScalarHalf(stroke.getWidth());
+            if (stroke.getJoin() == SkPaint::kMiter_Join) {
+                SkScalar scale = stroke.getMiter();
+                if (scale > SK_Scalar1) {
+                    radius = SkScalarMul(radius, scale);
+                }
+            }
+            fBounds.outset(radius, radius);
+        }
+        viewMatrix.mapRect(&fBounds);
+    }
+
+    GrColor                 fColor;
+    SkPath                  fPath;
+    GrStrokeInfo            fStroke;
+    SkMatrix                fViewMatrix;
+    SkRect                  fClipBounds; // in source space
+    GrXPOverridesForBatch   fPipelineInfo;
+
+    typedef GrVertexBatch INHERITED;
+};
+
+bool GrTessellatingPathRenderer::onDrawPath(const DrawPathArgs& args) {
+    SkASSERT(!args.fAntiAlias);
+    const GrRenderTarget* rt = args.fPipelineBuilder->getRenderTarget();
+    if (nullptr == rt) {
+        return false;
+    }
+
+    SkIRect clipBoundsI;
+    args.fPipelineBuilder->clip().getConservativeBounds(rt->width(), rt->height(), &clipBoundsI);
+    SkRect clipBounds = SkRect::Make(clipBoundsI);
+    SkMatrix vmi;
+    if (!args.fViewMatrix->invert(&vmi)) {
+        return false;
+    }
+    vmi.mapRect(&clipBounds);
+    SkAutoTUnref<GrDrawBatch> batch(TessellatingPathBatch::Create(args.fColor, *args.fPath,
+                                                                  *args.fStroke, *args.fViewMatrix,
+                                                                  clipBounds));
+    args.fTarget->drawBatch(*args.fPipelineBuilder, batch);
+
+    return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef GR_TEST_UTILS
+
+DRAW_BATCH_TEST_DEFINE(TesselatingPathBatch) {
+    GrColor color = GrRandomColor(random);
+    SkMatrix viewMatrix = GrTest::TestMatrixInvertible(random);
+    SkPath path = GrTest::TestPath(random);
+    SkRect clipBounds = GrTest::TestRect(random);
+    SkMatrix vmi;
+    bool result = viewMatrix.invert(&vmi);
+    if (!result) {
+        SkFAIL("Cannot invert matrix\n");
+    }
+    vmi.mapRect(&clipBounds);
+    GrStrokeInfo strokeInfo = GrTest::TestStrokeInfo(random);
+    return TessellatingPathBatch::Create(color, path, strokeInfo, viewMatrix, clipBounds);
+}
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrTessellatingPathRenderer.h b/gfx/skia/skia/src/gpu/batches/GrTessellatingPathRenderer.h
new file mode 100644
index 000000000000..7598ceb065a7
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrTessellatingPathRenderer.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrTessellatingPathRenderer_DEFINED
+#define GrTessellatingPathRenderer_DEFINED
+
+#include "GrPathRenderer.h"
+
+/**
+ *  Subclass that renders the path by converting to screen-space trapezoids plus
+ *   extra 1-pixel geometry for AA.
+ */
+class SK_API GrTessellatingPathRenderer : public GrPathRenderer {
+public:
+    GrTessellatingPathRenderer();
+
+private:
+    bool onCanDrawPath(const CanDrawPathArgs& ) const override;
+
+    StencilSupport onGetStencilSupport(const SkPath&, const GrStrokeInfo&) const override {
+        return GrPathRenderer::kNoSupport_StencilSupport;
+    }
+
+    bool onDrawPath(const DrawPathArgs&) override;
+
+    typedef GrPathRenderer INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrTestBatch.h b/gfx/skia/skia/src/gpu/batches/GrTestBatch.h
new file mode 100644
index 000000000000..9427504d2ee6
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrTestBatch.h
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrTestBatch_DEFINED
+#define GrTestBatch_DEFINED
+
+#include "GrBatchFlushState.h"
+#include "GrGeometryProcessor.h"
+#include "GrVertexBuffer.h"
+
+#include "batches/GrVertexBatch.h"
+
+/*
+ * A simple batch only for testing purposes which actually doesn't batch at all, but can fit into
+ * the batch pipeline and generate arbitrary geometry
+ */
+class GrTestBatch : public GrVertexBatch {
+public:
+    struct Geometry {
+        GrColor fColor;
+    };
+
+    virtual const char* name() const override = 0;
+
+    void computePipelineOptimizations(GrInitInvariantOutput* color, 
+                                      GrInitInvariantOutput* coverage,
+                                      GrBatchToXPOverrides* overrides) const override {
+        // When this is called on a batch, there is only one geometry bundle
+        color->setKnownFourComponents(this->geoData(0)->fColor);
+        coverage->setUnknownSingleComponent();
+        overrides->fUsePLSDstRead = false;
+    }
+
+    void initBatchTracker(const GrXPOverridesForBatch& overrides) override {
+        // Handle any color overrides
+        if (!overrides.readsColor()) {
+            this->geoData(0)->fColor = GrColor_ILLEGAL;
+        }
+        overrides.getOverrideColorIfSet(&this->geoData(0)->fColor);
+
+        // setup batch properties
+        fBatch.fColorIgnored = !overrides.readsColor();
+        fBatch.fColor = this->geoData(0)->fColor;
+        fBatch.fUsesLocalCoords = overrides.readsLocalCoords();
+        fBatch.fCoverageIgnored = !overrides.readsCoverage();
+    }
+
+protected:
+    GrTestBatch(uint32_t classID, const GrGeometryProcessor* gp, const SkRect& bounds)
+        : INHERITED(classID) {
+        fGeometryProcessor.reset(SkRef(gp));
+
+        this->setBounds(bounds);
+    }
+
+    const GrGeometryProcessor* geometryProcessor() const { return fGeometryProcessor; }
+
+private:
+    void onPrepareDraws(Target* target) const override {
+        target->initDraw(fGeometryProcessor, this->pipeline());
+        this->generateGeometry(target);
+    }
+
+    virtual Geometry* geoData(int index) = 0;
+    virtual const Geometry* geoData(int index) const = 0;
+
+    bool onCombineIfPossible(GrBatch* t, const GrCaps&) override {
+        return false;
+    }
+
+    virtual void generateGeometry(Target*) const = 0;
+
+    struct BatchTracker {
+        GrColor fColor;
+        bool fUsesLocalCoords;
+        bool fColorIgnored;
+        bool fCoverageIgnored;
+    };
+
+    SkAutoTUnref<const GrGeometryProcessor> fGeometryProcessor;
+    BatchTracker fBatch;
+
+    typedef GrVertexBatch INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/batches/GrVertexBatch.cpp b/gfx/skia/skia/src/gpu/batches/GrVertexBatch.cpp
new file mode 100644
index 000000000000..5897fe95c47b
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrVertexBatch.cpp
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrVertexBatch.h"
+#include "GrBatchFlushState.h"
+#include "GrResourceProvider.h"
+
+GrVertexBatch::GrVertexBatch(uint32_t classID) : INHERITED(classID) {}
+
+void GrVertexBatch::onPrepare(GrBatchFlushState* state) {
+    Target target(state, this);
+    this->onPrepareDraws(&target);
+}
+
+void* GrVertexBatch::InstancedHelper::init(Target* target, GrPrimitiveType primType,
+                                           size_t vertexStride, const GrIndexBuffer* indexBuffer,
+                                           int verticesPerInstance, int indicesPerInstance,
+                                           int instancesToDraw) {
+    SkASSERT(target);
+    if (!indexBuffer) {
+        return nullptr;
+    }
+    const GrVertexBuffer* vertexBuffer;
+    int firstVertex;
+    int vertexCount = verticesPerInstance * instancesToDraw;
+    void* vertices = target->makeVertexSpace(vertexStride, vertexCount, &vertexBuffer, &firstVertex);
+    if (!vertices) {
+        SkDebugf("Vertices could not be allocated for instanced rendering.");
+        return nullptr;
+    }
+    SkASSERT(vertexBuffer);
+    size_t ibSize = indexBuffer->gpuMemorySize();
+    int maxInstancesPerDraw = static_cast<int>(ibSize / (sizeof(uint16_t) * indicesPerInstance));
+
+    fVertices.initInstanced(primType, vertexBuffer, indexBuffer,
+        firstVertex, verticesPerInstance, indicesPerInstance, instancesToDraw,
+        maxInstancesPerDraw);
+    return vertices;
+}
+
+void GrVertexBatch::InstancedHelper::recordDraw(Target* target) {
+    SkASSERT(fVertices.instanceCount());
+    target->draw(fVertices);
+}
+
+void* GrVertexBatch::QuadHelper::init(Target* target, size_t vertexStride,
+                                      int quadsToDraw) {
+    SkAutoTUnref<const GrIndexBuffer> quadIndexBuffer(
+        target->resourceProvider()->refQuadIndexBuffer());
+    if (!quadIndexBuffer) {
+        SkDebugf("Could not get quad index buffer.");
+        return nullptr;
+    }
+    return this->INHERITED::init(target, kTriangles_GrPrimitiveType, vertexStride,
+                                 quadIndexBuffer, kVerticesPerQuad, kIndicesPerQuad, quadsToDraw);
+}
+
+void GrVertexBatch::onDraw(GrBatchFlushState* state) {
+    int uploadCnt = fInlineUploads.count();
+    int currUpload = 0;
+
+    // Iterate of all the drawArrays. Before issuing the draws in each array, perform any inline
+    // uploads.
+    for (DrawArrayList::Iter da(fDrawArrays); da.get(); da.next()) {
+        state->advanceLastFlushedToken();
+        while (currUpload < uploadCnt &&
+               fInlineUploads[currUpload]->lastUploadToken() <= state->lastFlushedToken()) {
+            fInlineUploads[currUpload++]->upload(state->uploader());
+        }
+        const GrVertexBatch::DrawArray& drawArray = *da.get();
+        GrProgramDesc desc;
+        const GrPipeline* pipeline = this->pipeline();
+        const GrPrimitiveProcessor* primProc = drawArray.fPrimitiveProcessor.get();
+        state->gpu()->buildProgramDesc(&desc, *primProc, *pipeline);
+        GrGpu::DrawArgs args(primProc, pipeline, &desc);
+
+        int drawCount = drawArray.fDraws.count();
+        for (int i = 0; i < drawCount; i++) {
+            state->gpu()->draw(args,  drawArray.fDraws[i]);
+        }
+    }
+}
diff --git a/gfx/skia/skia/src/gpu/batches/GrVertexBatch.h b/gfx/skia/skia/src/gpu/batches/GrVertexBatch.h
new file mode 100644
index 000000000000..d0daf5914123
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/batches/GrVertexBatch.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrVertexBatch_DEFINED
+#define GrVertexBatch_DEFINED
+
+#include "GrDrawBatch.h"
+#include "GrPrimitiveProcessor.h"
+#include "GrPendingProgramElement.h"
+#include "GrVertices.h"
+
+#include "SkTLList.h"
+
+class GrBatchFlushState;
+
+/**
+ * Base class for vertex-based GrBatches.
+ */
+class GrVertexBatch : public GrDrawBatch {
+public:
+    class Target;
+
+    GrVertexBatch(uint32_t classID);
+
+protected:
+    /** Helper for rendering instances using an instanced index index buffer. This class creates the
+        space for the vertices and flushes the draws to the batch target. */
+   class InstancedHelper {
+   public:
+        InstancedHelper() {}
+        /** Returns the allocated storage for the vertices. The caller should populate the before
+            vertices before calling issueDraws(). */
+        void* init(Target*, GrPrimitiveType, size_t vertexStride,
+                   const GrIndexBuffer*, int verticesPerInstance, int indicesPerInstance,
+                   int instancesToDraw);
+
+        /** Call after init() to issue draws to the batch target.*/
+        void recordDraw(Target* target);
+    private:
+        GrVertices  fVertices;
+    };
+
+    static const int kVerticesPerQuad = 4;
+    static const int kIndicesPerQuad = 6;
+
+    /** A specialization of InstanceHelper for quad rendering. */
+    class QuadHelper : private InstancedHelper {
+    public:
+        QuadHelper() : INHERITED() {}
+        /** Finds the cached quad index buffer and reserves vertex space. Returns nullptr on failure
+            and on sucess a pointer to the vertex data that the caller should populate before
+            calling issueDraws(). */
+        void* init(Target* batchTarget, size_t vertexStride, int quadsToDraw);
+
+        using InstancedHelper::recordDraw;
+    private:
+        typedef InstancedHelper INHERITED;
+    };
+
+private:
+    void onPrepare(GrBatchFlushState* state) final;
+    void onDraw(GrBatchFlushState* state) final;
+
+    virtual void onPrepareDraws(Target*) const = 0;
+
+    // A set of contiguous draws with no inline uploads between them that all use the same
+    // primitive processor. All the draws in a DrawArray share a primitive processor and use the
+    // the batch's GrPipeline.
+    struct DrawArray {
+        SkSTArray<1, GrVertices, true>                      fDraws;
+        GrPendingProgramElement<const GrPrimitiveProcessor> fPrimitiveProcessor;
+    };
+
+    // Array of DrawArray. There may be inline uploads between each DrawArray and each DrawArray
+    // may use a different primitive processor.
+    typedef SkTLList<DrawArray, 4> DrawArrayList;
+    DrawArrayList fDrawArrays;
+
+    typedef GrDrawBatch INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/effects/Gr1DKernelEffect.h b/gfx/skia/skia/src/gpu/effects/Gr1DKernelEffect.h
index 171273360b59..519d6dbeb566 100644
--- a/gfx/skia/skia/src/gpu/effects/Gr1DKernelEffect.h
+++ b/gfx/skia/skia/src/gpu/effects/Gr1DKernelEffect.h
@@ -31,7 +31,7 @@ public:
     Gr1DKernelEffect(GrTexture* texture,
                      Direction direction,
                      int radius)
-        : GrSingleTextureEffect(texture, MakeDivByTextureWHMatrix(texture))
+        : INHERITED(texture, GrCoordTransform::MakeDivByTextureWHMatrix(texture))
         , fDirection(direction)
         , fRadius(radius) {}
 
@@ -43,6 +43,13 @@ public:
     int width() const { return WidthFromRadius(fRadius); }
     Direction direction() const { return fDirection; }
 
+    SkString dumpInfo() const override {
+        SkString str;
+        str.appendf("Direction: %s, Radius: %d ", kX_Direction == fDirection ? "X" : "Y", fRadius);
+        str.append(INHERITED::dumpInfo());
+        return str;
+    }
+
 private:
 
     Direction       fDirection;
diff --git a/gfx/skia/skia/src/gpu/effects/GrBezierEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrBezierEffect.cpp
index 7337d8a7fc8f..13672da6ea2b 100644
--- a/gfx/skia/skia/src/gpu/effects/GrBezierEffect.cpp
+++ b/gfx/skia/skia/src/gpu/effects/GrBezierEffect.cpp
@@ -7,120 +7,187 @@
 
 #include "GrBezierEffect.h"
 
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
-#include "gl/GrGLSL.h"
-#include "gl/GrGLVertexEffect.h"
-#include "GrTBackendEffectFactory.h"
+#include "glsl/GrGLSLGeometryProcessor.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+#include "glsl/GrGLSLUtil.h"
+#include "glsl/GrGLSLVarying.h"
 
-class GrGLConicEffect : public GrGLVertexEffect {
+class GrGLConicEffect : public GrGLSLGeometryProcessor {
 public:
-    GrGLConicEffect(const GrBackendEffectFactory&, const GrDrawEffect&);
+    GrGLConicEffect(const GrGeometryProcessor&);
 
-    virtual void emitCode(GrGLFullShaderBuilder* builder,
-                          const GrDrawEffect& drawEffect,
-                          const GrEffectKey& key,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    void onEmitCode(EmitArgs&, GrGPArgs*) override;
 
-    static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*);
+    static inline void GenKey(const GrGeometryProcessor&,
+                              const GrGLSLCaps&,
+                              GrProcessorKeyBuilder*);
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE {}
+    void setData(const GrGLSLProgramDataManager& pdman,
+                 const GrPrimitiveProcessor& primProc) override {
+        const GrConicEffect& ce = primProc.cast<GrConicEffect>();
+
+        if (!ce.viewMatrix().isIdentity() && !fViewMatrix.cheapEqualTo(ce.viewMatrix())) {
+            fViewMatrix = ce.viewMatrix();
+            float viewMatrix[3 * 3];
+            GrGLSLGetMatrix<3>(viewMatrix, fViewMatrix);
+            pdman.setMatrix3f(fViewMatrixUniform, viewMatrix);
+        }
+
+        if (ce.color() != fColor) {
+            float c[4];
+            GrColorToRGBAFloat(ce.color(), c);
+            pdman.set4fv(fColorUniform, 1, c);
+            fColor = ce.color();
+        }
+
+        if (ce.coverageScale() != 0xff && ce.coverageScale() != fCoverageScale) {
+            pdman.set1f(fCoverageScaleUniform, GrNormalizeByteToFloat(ce.coverageScale()));
+            fCoverageScale = ce.coverageScale();
+        }
+    }
+
+    void setTransformData(const GrPrimitiveProcessor& primProc,
+                          const GrGLSLProgramDataManager& pdman,
+                          int index,
+                          const SkTArray<const GrCoordTransform*, true>& transforms) override {
+        this->setTransformDataHelper<GrConicEffect>(primProc, pdman, index, transforms);
+    }
 
 private:
-    GrEffectEdgeType fEdgeType;
+    SkMatrix fViewMatrix;
+    GrColor fColor;
+    uint8_t fCoverageScale;
+    GrPrimitiveEdgeType fEdgeType;
+    UniformHandle fColorUniform;
+    UniformHandle fCoverageScaleUniform;
+    UniformHandle fViewMatrixUniform;
 
-    typedef GrGLVertexEffect INHERITED;
+    typedef GrGLSLGeometryProcessor INHERITED;
 };
 
-GrGLConicEffect::GrGLConicEffect(const GrBackendEffectFactory& factory,
-                                 const GrDrawEffect& drawEffect)
-    : INHERITED (factory) {
-    const GrConicEffect& ce = drawEffect.castEffect<GrConicEffect>();
+GrGLConicEffect::GrGLConicEffect(const GrGeometryProcessor& processor)
+    : fViewMatrix(SkMatrix::InvalidMatrix()), fColor(GrColor_ILLEGAL), fCoverageScale(0xff) {
+    const GrConicEffect& ce = processor.cast<GrConicEffect>();
     fEdgeType = ce.getEdgeType();
 }
 
-void GrGLConicEffect::emitCode(GrGLFullShaderBuilder* builder,
-                               const GrDrawEffect& drawEffect,
-                               const GrEffectKey& key,
-                               const char* outputColor,
-                               const char* inputColor,
-                               const TransformedCoordsArray&,
-                               const TextureSamplerArray& samplers) {
-    const char *vsName, *fsName;
+void GrGLConicEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
+    GrGLSLGPBuilder* pb = args.fPB;
+    GrGLSLVertexBuilder* vertBuilder = args.fVertBuilder;
+    const GrConicEffect& gp = args.fGP.cast<GrConicEffect>();
+    GrGLSLVaryingHandler* varyingHandler = args.fVaryingHandler;
 
-    builder->addVarying(kVec4f_GrSLType, "ConicCoeffs",
-                              &vsName, &fsName);
-    const SkString* attr0Name =
-        builder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[0]);
-    builder->vsCodeAppendf("\t%s = %s;\n", vsName, attr0Name->c_str());
+    // emit attributes
+    varyingHandler->emitAttributes(gp);
 
-    builder->fsCodeAppend("\t\tfloat edgeAlpha;\n");
+    GrGLSLVertToFrag v(kVec4f_GrSLType);
+    varyingHandler->addVarying("ConicCoeffs", &v);
+    vertBuilder->codeAppendf("%s = %s;", v.vsOut(), gp.inConicCoeffs()->fName);
+
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    // Setup pass through color
+    if (!gp.colorIgnored()) {
+        this->setupUniformColor(args.fPB, fragBuilder, args.fOutputColor, &fColorUniform);
+    }
+
+    // Setup position
+    this->setupPosition(pb,
+                        vertBuilder,
+                        gpArgs,
+                        gp.inPosition()->fName,
+                        gp.viewMatrix(),
+                        &fViewMatrixUniform);
+
+    // emit transforms with position
+    this->emitTransforms(pb,
+                         vertBuilder,
+                         varyingHandler,
+                         gpArgs->fPositionVar,
+                         gp.inPosition()->fName,
+                         gp.localMatrix(),
+                         args.fTransformsIn,
+                         args.fTransformsOut);
+
+    fragBuilder->codeAppend("float edgeAlpha;");
 
     switch (fEdgeType) {
-        case kHairlineAA_GrEffectEdgeType: {
-            SkAssertResult(builder->enableFeature(
-                    GrGLShaderBuilder::kStandardDerivatives_GLSLFeature));
-            builder->fsCodeAppendf("\t\tvec3 dklmdx = dFdx(%s.xyz);\n", fsName);
-            builder->fsCodeAppendf("\t\tvec3 dklmdy = dFdy(%s.xyz);\n", fsName);
-            builder->fsCodeAppendf("\t\tfloat dfdx =\n"
-                                   "\t\t\t2.0*%s.x*dklmdx.x - %s.y*dklmdx.z - %s.z*dklmdx.y;\n",
-                                   fsName, fsName, fsName);
-            builder->fsCodeAppendf("\t\tfloat dfdy =\n"
-                                   "\t\t\t2.0*%s.x*dklmdy.x - %s.y*dklmdy.z - %s.z*dklmdy.y;\n",
-                                   fsName, fsName, fsName);
-            builder->fsCodeAppend("\t\tvec2 gF = vec2(dfdx, dfdy);\n");
-            builder->fsCodeAppend("\t\tfloat gFM = sqrt(dot(gF, gF));\n");
-            builder->fsCodeAppendf("\t\tfloat func = %s.x*%s.x - %s.y*%s.z;\n", fsName, fsName,
-                                   fsName, fsName);
-            builder->fsCodeAppend("\t\tfunc = abs(func);\n");
-            builder->fsCodeAppend("\t\tedgeAlpha = func / gFM;\n");
-            builder->fsCodeAppend("\t\tedgeAlpha = max(1.0 - edgeAlpha, 0.0);\n");
+        case kHairlineAA_GrProcessorEdgeType: {
+            SkAssertResult(fragBuilder->enableFeature(
+                    GrGLSLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));
+            fragBuilder->codeAppendf("vec3 dklmdx = dFdx(%s.xyz);", v.fsIn());
+            fragBuilder->codeAppendf("vec3 dklmdy = dFdy(%s.xyz);", v.fsIn());
+            fragBuilder->codeAppendf("float dfdx ="
+                                     "2.0 * %s.x * dklmdx.x - %s.y * dklmdx.z - %s.z * dklmdx.y;",
+                                     v.fsIn(), v.fsIn(), v.fsIn());
+            fragBuilder->codeAppendf("float dfdy ="
+                                     "2.0 * %s.x * dklmdy.x - %s.y * dklmdy.z - %s.z * dklmdy.y;",
+                                     v.fsIn(), v.fsIn(), v.fsIn());
+            fragBuilder->codeAppend("vec2 gF = vec2(dfdx, dfdy);");
+            fragBuilder->codeAppend("float gFM = sqrt(dot(gF, gF));");
+            fragBuilder->codeAppendf("float func = %s.x*%s.x - %s.y*%s.z;", v.fsIn(), v.fsIn(),
+                                     v.fsIn(), v.fsIn());
+            fragBuilder->codeAppend("func = abs(func);");
+            fragBuilder->codeAppend("edgeAlpha = func / gFM;");
+            fragBuilder->codeAppend("edgeAlpha = max(1.0 - edgeAlpha, 0.0);");
             // Add line below for smooth cubic ramp
-            // builder->fsCodeAppend("\t\tedgeAlpha = edgeAlpha*edgeAlpha*(3.0-2.0*edgeAlpha);\n");
+            // fragBuilder->codeAppend("edgeAlpha = edgeAlpha*edgeAlpha*(3.0-2.0*edgeAlpha);");
             break;
         }
-        case kFillAA_GrEffectEdgeType: {
-            SkAssertResult(builder->enableFeature(
-                    GrGLShaderBuilder::kStandardDerivatives_GLSLFeature));
-            builder->fsCodeAppendf("\t\tvec3 dklmdx = dFdx(%s.xyz);\n", fsName);
-            builder->fsCodeAppendf("\t\tvec3 dklmdy = dFdy(%s.xyz);\n", fsName);
-            builder->fsCodeAppendf("\t\tfloat dfdx =\n"
-                                   "\t\t\t2.0*%s.x*dklmdx.x - %s.y*dklmdx.z - %s.z*dklmdx.y;\n",
-                                   fsName, fsName, fsName);
-            builder->fsCodeAppendf("\t\tfloat dfdy =\n"
-                                   "\t\t\t2.0*%s.x*dklmdy.x - %s.y*dklmdy.z - %s.z*dklmdy.y;\n",
-                                   fsName, fsName, fsName);
-            builder->fsCodeAppend("\t\tvec2 gF = vec2(dfdx, dfdy);\n");
-            builder->fsCodeAppend("\t\tfloat gFM = sqrt(dot(gF, gF));\n");
-            builder->fsCodeAppendf("\t\tfloat func = %s.x*%s.x - %s.y*%s.z;\n", fsName, fsName,
-                                   fsName, fsName);
-            builder->fsCodeAppend("\t\tedgeAlpha = func / gFM;\n");
-            builder->fsCodeAppend("\t\tedgeAlpha = clamp(1.0 - edgeAlpha, 0.0, 1.0);\n");
+        case kFillAA_GrProcessorEdgeType: {
+            SkAssertResult(fragBuilder->enableFeature(
+                    GrGLSLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));
+            fragBuilder->codeAppendf("vec3 dklmdx = dFdx(%s.xyz);", v.fsIn());
+            fragBuilder->codeAppendf("vec3 dklmdy = dFdy(%s.xyz);", v.fsIn());
+            fragBuilder->codeAppendf("float dfdx ="
+                                     "2.0 * %s.x * dklmdx.x - %s.y * dklmdx.z - %s.z * dklmdx.y;",
+                                     v.fsIn(), v.fsIn(), v.fsIn());
+            fragBuilder->codeAppendf("float dfdy ="
+                                     "2.0 * %s.x * dklmdy.x - %s.y * dklmdy.z - %s.z * dklmdy.y;",
+                                     v.fsIn(), v.fsIn(), v.fsIn());
+            fragBuilder->codeAppend("vec2 gF = vec2(dfdx, dfdy);");
+            fragBuilder->codeAppend("float gFM = sqrt(dot(gF, gF));");
+            fragBuilder->codeAppendf("float func = %s.x * %s.x - %s.y * %s.z;", v.fsIn(), v.fsIn(),
+                                     v.fsIn(), v.fsIn());
+            fragBuilder->codeAppend("edgeAlpha = func / gFM;");
+            fragBuilder->codeAppend("edgeAlpha = clamp(1.0 - edgeAlpha, 0.0, 1.0);");
             // Add line below for smooth cubic ramp
-            // builder->fsCodeAppend("\t\tedgeAlpha = edgeAlpha*edgeAlpha*(3.0-2.0*edgeAlpha);\n");
+            // fragBuilder->codeAppend("edgeAlpha = edgeAlpha*edgeAlpha*(3.0-2.0*edgeAlpha);");
             break;
         }
-        case kFillBW_GrEffectEdgeType: {
-            builder->fsCodeAppendf("\t\tedgeAlpha = %s.x*%s.x - %s.y*%s.z;\n", fsName, fsName,
-                                   fsName, fsName);
-            builder->fsCodeAppend("\t\tedgeAlpha = float(edgeAlpha < 0.0);\n");
+        case kFillBW_GrProcessorEdgeType: {
+            fragBuilder->codeAppendf("edgeAlpha = %s.x * %s.x - %s.y * %s.z;", v.fsIn(), v.fsIn(),
+                                     v.fsIn(), v.fsIn());
+            fragBuilder->codeAppend("edgeAlpha = float(edgeAlpha < 0.0);");
             break;
         }
         default:
             SkFAIL("Shouldn't get here");
     }
 
-    builder->fsCodeAppendf("\t%s = %s;\n", outputColor,
-                           (GrGLSLExpr4(inputColor) * GrGLSLExpr1("edgeAlpha")).c_str());
+    // TODO should we really be doing this?
+    if (gp.coverageScale() != 0xff) {
+        const char* coverageScale;
+        fCoverageScaleUniform = pb->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                               kFloat_GrSLType,
+                                               kDefault_GrSLPrecision,
+                                               "Coverage",
+                                               &coverageScale);
+        fragBuilder->codeAppendf("%s = vec4(%s * edgeAlpha);", args.fOutputCoverage, coverageScale);
+    } else {
+        fragBuilder->codeAppendf("%s = vec4(edgeAlpha);", args.fOutputCoverage);
+    }
 }
 
-void GrGLConicEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
-                             GrEffectKeyBuilder* b) {
-    const GrConicEffect& ce = drawEffect.castEffect<GrConicEffect>();
+void GrGLConicEffect::GenKey(const GrGeometryProcessor& gp,
+                             const GrGLSLCaps&,
+                             GrProcessorKeyBuilder* b) {
+    const GrConicEffect& ce = gp.cast<GrConicEffect>();
     uint32_t key = ce.isAntiAliased() ? (ce.isFilled() ? 0x0 : 0x1) : 0x2;
+    key |= GrColor_ILLEGAL != ce.color() ? 0x4 : 0x0;
+    key |= 0xff != ce.coverageScale() ? 0x8 : 0x0;
+    key |= ce.usesLocalCoords() && ce.localMatrix().hasPerspective() ? 0x10 : 0x0;
+    key |= ComputePosKey(ce.viewMatrix()) << 5;
     b->add32(key);
 }
 
@@ -128,139 +195,215 @@ void GrGLConicEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
 
 GrConicEffect::~GrConicEffect() {}
 
-const GrBackendEffectFactory& GrConicEffect::getFactory() const {
-    return GrTBackendEffectFactory<GrConicEffect>::getInstance();
+void GrConicEffect::getGLSLProcessorKey(const GrGLSLCaps& caps,
+                                        GrProcessorKeyBuilder* b) const {
+    GrGLConicEffect::GenKey(*this, caps, b);
 }
 
-GrConicEffect::GrConicEffect(GrEffectEdgeType edgeType) : GrVertexEffect() {
-    this->addVertexAttrib(kVec4f_GrSLType);
-    fEdgeType = edgeType;
+GrGLSLPrimitiveProcessor* GrConicEffect::createGLSLInstance(const GrGLSLCaps&) const {
+    return new GrGLConicEffect(*this);
 }
 
-bool GrConicEffect::onIsEqual(const GrEffect& other) const {
-    const GrConicEffect& ce = CastEffect<GrConicEffect>(other);
-    return (ce.fEdgeType == fEdgeType);
+GrConicEffect::GrConicEffect(GrColor color, const SkMatrix& viewMatrix, uint8_t coverage,
+                             GrPrimitiveEdgeType edgeType, const SkMatrix& localMatrix,
+                             bool usesLocalCoords)
+    : fColor(color)
+    , fViewMatrix(viewMatrix)
+    , fLocalMatrix(viewMatrix)
+    , fUsesLocalCoords(usesLocalCoords)
+    , fCoverageScale(coverage)
+    , fEdgeType(edgeType) {
+    this->initClassID<GrConicEffect>();
+    fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType,
+                                                   kHigh_GrSLPrecision));
+    fInConicCoeffs = &this->addVertexAttrib(Attribute("inConicCoeffs",
+                                                      kVec4f_GrVertexAttribType));
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-GR_DEFINE_EFFECT_TEST(GrConicEffect);
+GR_DEFINE_GEOMETRY_PROCESSOR_TEST(GrConicEffect);
 
-GrEffect* GrConicEffect::TestCreate(SkRandom* random,
-                                    GrContext*,
-                                    const GrDrawTargetCaps& caps,
-                                    GrTexture*[]) {
-    GrEffect* effect;
+const GrGeometryProcessor* GrConicEffect::TestCreate(GrProcessorTestData* d) {
+    GrGeometryProcessor* gp;
     do {
-        GrEffectEdgeType edgeType = static_cast<GrEffectEdgeType>(
-                                                    random->nextULessThan(kGrEffectEdgeTypeCnt));
-        effect = GrConicEffect::Create(edgeType, caps);
-    } while (NULL == effect);
-    return effect;
+        GrPrimitiveEdgeType edgeType =
+                static_cast<GrPrimitiveEdgeType>(
+                        d->fRandom->nextULessThan(kGrProcessorEdgeTypeCnt));
+        gp = GrConicEffect::Create(GrRandomColor(d->fRandom), GrTest::TestMatrix(d->fRandom),
+                                   edgeType, *d->fCaps,
+                                   GrTest::TestMatrix(d->fRandom), d->fRandom->nextBool());
+    } while (nullptr == gp);
+    return gp;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // Quad
 //////////////////////////////////////////////////////////////////////////////
 
-class GrGLQuadEffect : public GrGLVertexEffect {
+class GrGLQuadEffect : public GrGLSLGeometryProcessor {
 public:
-    GrGLQuadEffect(const GrBackendEffectFactory&, const GrDrawEffect&);
+    GrGLQuadEffect(const GrGeometryProcessor&);
 
-    virtual void emitCode(GrGLFullShaderBuilder* builder,
-                          const GrDrawEffect& drawEffect,
-                          const GrEffectKey& key,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    void onEmitCode(EmitArgs&, GrGPArgs*) override;
 
-    static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*);
+    static inline void GenKey(const GrGeometryProcessor&,
+                              const GrGLSLCaps&,
+                              GrProcessorKeyBuilder*);
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE {}
+    void setData(const GrGLSLProgramDataManager& pdman,
+                 const GrPrimitiveProcessor& primProc) override {
+        const GrQuadEffect& qe = primProc.cast<GrQuadEffect>();
+
+        if (!qe.viewMatrix().isIdentity() && !fViewMatrix.cheapEqualTo(qe.viewMatrix())) {
+            fViewMatrix = qe.viewMatrix();
+            float viewMatrix[3 * 3];
+            GrGLSLGetMatrix<3>(viewMatrix, fViewMatrix);
+            pdman.setMatrix3f(fViewMatrixUniform, viewMatrix);
+        }
+
+        if (qe.color() != fColor) {
+            float c[4];
+            GrColorToRGBAFloat(qe.color(), c);
+            pdman.set4fv(fColorUniform, 1, c);
+            fColor = qe.color();
+        }
+
+        if (qe.coverageScale() != 0xff && qe.coverageScale() != fCoverageScale) {
+            pdman.set1f(fCoverageScaleUniform, GrNormalizeByteToFloat(qe.coverageScale()));
+            fCoverageScale = qe.coverageScale();
+        }
+    }
+
+    void setTransformData(const GrPrimitiveProcessor& primProc,
+                          const GrGLSLProgramDataManager& pdman,
+                          int index,
+                          const SkTArray<const GrCoordTransform*, true>& transforms) override {
+        this->setTransformDataHelper<GrQuadEffect>(primProc, pdman, index, transforms);
+    }
 
 private:
-    GrEffectEdgeType fEdgeType;
+    SkMatrix fViewMatrix;
+    GrColor fColor;
+    uint8_t fCoverageScale;
+    GrPrimitiveEdgeType fEdgeType;
+    UniformHandle fColorUniform;
+    UniformHandle fCoverageScaleUniform;
+    UniformHandle fViewMatrixUniform;
 
-    typedef GrGLVertexEffect INHERITED;
+    typedef GrGLSLGeometryProcessor INHERITED;
 };
 
-GrGLQuadEffect::GrGLQuadEffect(const GrBackendEffectFactory& factory,
-                                 const GrDrawEffect& drawEffect)
-    : INHERITED (factory) {
-    const GrQuadEffect& ce = drawEffect.castEffect<GrQuadEffect>();
+GrGLQuadEffect::GrGLQuadEffect(const GrGeometryProcessor& processor)
+    : fViewMatrix(SkMatrix::InvalidMatrix()), fColor(GrColor_ILLEGAL), fCoverageScale(0xff) {
+    const GrQuadEffect& ce = processor.cast<GrQuadEffect>();
     fEdgeType = ce.getEdgeType();
 }
 
-void GrGLQuadEffect::emitCode(GrGLFullShaderBuilder* builder,
-                              const GrDrawEffect& drawEffect,
-                              const GrEffectKey& key,
-                              const char* outputColor,
-                              const char* inputColor,
-                              const TransformedCoordsArray&,
-                              const TextureSamplerArray& samplers) {
-    const char *vsName, *fsName;
+void GrGLQuadEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
+    GrGLSLGPBuilder* pb = args.fPB;
+    GrGLSLVertexBuilder* vertBuilder = args.fVertBuilder;
+    const GrQuadEffect& gp = args.fGP.cast<GrQuadEffect>();
+    GrGLSLVaryingHandler* varyingHandler = args.fVaryingHandler;
 
-    const SkString* attrName =
-        builder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[0]);
-    builder->fsCodeAppendf("\t\tfloat edgeAlpha;\n");
+    // emit attributes
+    varyingHandler->emitAttributes(gp);
 
-    builder->addVarying(kVec4f_GrSLType, "HairQuadEdge", &vsName, &fsName);
+    GrGLSLVertToFrag v(kVec4f_GrSLType);
+    varyingHandler->addVarying("HairQuadEdge", &v);
+    vertBuilder->codeAppendf("%s = %s;", v.vsOut(), gp.inHairQuadEdge()->fName);
+
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    // Setup pass through color
+    if (!gp.colorIgnored()) {
+        this->setupUniformColor(args.fPB, fragBuilder, args.fOutputColor, &fColorUniform);
+    }
+
+    // Setup position
+    this->setupPosition(pb,
+                        vertBuilder,
+                        gpArgs,
+                        gp.inPosition()->fName,
+                        gp.viewMatrix(),
+                        &fViewMatrixUniform);
+
+    // emit transforms with position
+    this->emitTransforms(pb,
+                         vertBuilder,
+                         varyingHandler,
+                         gpArgs->fPositionVar,
+                         gp.inPosition()->fName,
+                         gp.localMatrix(),
+                         args.fTransformsIn,
+                         args.fTransformsOut);
+
+    fragBuilder->codeAppendf("float edgeAlpha;");
 
     switch (fEdgeType) {
-        case kHairlineAA_GrEffectEdgeType: {
-            SkAssertResult(builder->enableFeature(
-                    GrGLShaderBuilder::kStandardDerivatives_GLSLFeature));
-            builder->fsCodeAppendf("\t\tvec2 duvdx = dFdx(%s.xy);\n", fsName);
-            builder->fsCodeAppendf("\t\tvec2 duvdy = dFdy(%s.xy);\n", fsName);
-            builder->fsCodeAppendf("\t\tvec2 gF = vec2(2.0*%s.x*duvdx.x - duvdx.y,\n"
-                                   "\t\t               2.0*%s.x*duvdy.x - duvdy.y);\n",
-                                   fsName, fsName);
-            builder->fsCodeAppendf("\t\tedgeAlpha = (%s.x*%s.x - %s.y);\n", fsName, fsName,
-                                   fsName);
-            builder->fsCodeAppend("\t\tedgeAlpha = sqrt(edgeAlpha*edgeAlpha / dot(gF, gF));\n");
-            builder->fsCodeAppend("\t\tedgeAlpha = max(1.0 - edgeAlpha, 0.0);\n");
+        case kHairlineAA_GrProcessorEdgeType: {
+            SkAssertResult(fragBuilder->enableFeature(
+                    GrGLSLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));
+            fragBuilder->codeAppendf("vec2 duvdx = dFdx(%s.xy);", v.fsIn());
+            fragBuilder->codeAppendf("vec2 duvdy = dFdy(%s.xy);", v.fsIn());
+            fragBuilder->codeAppendf("vec2 gF = vec2(2.0 * %s.x * duvdx.x - duvdx.y,"
+                                     "               2.0 * %s.x * duvdy.x - duvdy.y);",
+                                     v.fsIn(), v.fsIn());
+            fragBuilder->codeAppendf("edgeAlpha = (%s.x * %s.x - %s.y);",
+                                     v.fsIn(), v.fsIn(), v.fsIn());
+            fragBuilder->codeAppend("edgeAlpha = sqrt(edgeAlpha * edgeAlpha / dot(gF, gF));");
+            fragBuilder->codeAppend("edgeAlpha = max(1.0 - edgeAlpha, 0.0);");
             // Add line below for smooth cubic ramp
-            // builder->fsCodeAppend("\t\tedgeAlpha = edgeAlpha*edgeAlpha*(3.0-2.0*edgeAlpha);\n");
+            // fragBuilder->codeAppend("edgeAlpha = edgeAlpha*edgeAlpha*(3.0-2.0*edgeAlpha);");
             break;
         }
-        case kFillAA_GrEffectEdgeType: {
-            SkAssertResult(builder->enableFeature(
-                    GrGLShaderBuilder::kStandardDerivatives_GLSLFeature));
-            builder->fsCodeAppendf("\t\tvec2 duvdx = dFdx(%s.xy);\n", fsName);
-            builder->fsCodeAppendf("\t\tvec2 duvdy = dFdy(%s.xy);\n", fsName);
-            builder->fsCodeAppendf("\t\tvec2 gF = vec2(2.0*%s.x*duvdx.x - duvdx.y,\n"
-                                   "\t\t               2.0*%s.x*duvdy.x - duvdy.y);\n",
-                                   fsName, fsName);
-            builder->fsCodeAppendf("\t\tedgeAlpha = (%s.x*%s.x - %s.y);\n", fsName, fsName,
-                                   fsName);
-            builder->fsCodeAppend("\t\tedgeAlpha = edgeAlpha / sqrt(dot(gF, gF));\n");
-            builder->fsCodeAppend("\t\tedgeAlpha = clamp(1.0 - edgeAlpha, 0.0, 1.0);\n");
+        case kFillAA_GrProcessorEdgeType: {
+            SkAssertResult(fragBuilder->enableFeature(
+                    GrGLSLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));
+            fragBuilder->codeAppendf("vec2 duvdx = dFdx(%s.xy);", v.fsIn());
+            fragBuilder->codeAppendf("vec2 duvdy = dFdy(%s.xy);", v.fsIn());
+            fragBuilder->codeAppendf("vec2 gF = vec2(2.0 * %s.x * duvdx.x - duvdx.y,"
+                                     "               2.0 * %s.x * duvdy.x - duvdy.y);",
+                                     v.fsIn(), v.fsIn());
+            fragBuilder->codeAppendf("edgeAlpha = (%s.x * %s.x - %s.y);",
+                                     v.fsIn(), v.fsIn(), v.fsIn());
+            fragBuilder->codeAppend("edgeAlpha = edgeAlpha / sqrt(dot(gF, gF));");
+            fragBuilder->codeAppend("edgeAlpha = clamp(1.0 - edgeAlpha, 0.0, 1.0);");
             // Add line below for smooth cubic ramp
-            // builder->fsCodeAppend("\t\tedgeAlpha = edgeAlpha*edgeAlpha*(3.0-2.0*edgeAlpha);\n");
+            // fragBuilder->codeAppend("edgeAlpha = edgeAlpha*edgeAlpha*(3.0-2.0*edgeAlpha);");
             break;
         }
-        case kFillBW_GrEffectEdgeType: {
-            builder->fsCodeAppendf("\t\tedgeAlpha = (%s.x*%s.x - %s.y);\n", fsName, fsName,
-                                   fsName);
-            builder->fsCodeAppend("\t\tedgeAlpha = float(edgeAlpha < 0.0);\n");
+        case kFillBW_GrProcessorEdgeType: {
+            fragBuilder->codeAppendf("edgeAlpha = (%s.x * %s.x - %s.y);",
+                                     v.fsIn(), v.fsIn(), v.fsIn());
+            fragBuilder->codeAppend("edgeAlpha = float(edgeAlpha < 0.0);");
             break;
         }
         default:
             SkFAIL("Shouldn't get here");
     }
 
-    builder->fsCodeAppendf("\t%s = %s;\n", outputColor,
-                           (GrGLSLExpr4(inputColor) * GrGLSLExpr1("edgeAlpha")).c_str());
-
-
-    builder->vsCodeAppendf("\t%s = %s;\n", vsName, attrName->c_str());
+    if (0xff != gp.coverageScale()) {
+        const char* coverageScale;
+        fCoverageScaleUniform = pb->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                               kFloat_GrSLType,
+                                               kDefault_GrSLPrecision,
+                                               "Coverage",
+                                               &coverageScale);
+        fragBuilder->codeAppendf("%s = vec4(%s * edgeAlpha);", args.fOutputCoverage, coverageScale);
+    } else {
+        fragBuilder->codeAppendf("%s = vec4(edgeAlpha);", args.fOutputCoverage);
+    }
 }
 
-void GrGLQuadEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
-                            GrEffectKeyBuilder* b) {
-    const GrQuadEffect& ce = drawEffect.castEffect<GrQuadEffect>();
+void GrGLQuadEffect::GenKey(const GrGeometryProcessor& gp,
+                            const GrGLSLCaps&,
+                            GrProcessorKeyBuilder* b) {
+    const GrQuadEffect& ce = gp.cast<GrQuadEffect>();
     uint32_t key = ce.isAntiAliased() ? (ce.isFilled() ? 0x0 : 0x1) : 0x2;
+    key |= ce.color() != GrColor_ILLEGAL ? 0x4 : 0x0;
+    key |= ce.coverageScale() != 0xff ? 0x8 : 0x0;
+    key |= ce.usesLocalCoords() && ce.localMatrix().hasPerspective() ? 0x10 : 0x0;
+    key |= ComputePosKey(ce.viewMatrix()) << 5;
     b->add32(key);
 }
 
@@ -268,149 +411,231 @@ void GrGLQuadEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
 
 GrQuadEffect::~GrQuadEffect() {}
 
-const GrBackendEffectFactory& GrQuadEffect::getFactory() const {
-    return GrTBackendEffectFactory<GrQuadEffect>::getInstance();
+void GrQuadEffect::getGLSLProcessorKey(const GrGLSLCaps& caps,
+                                       GrProcessorKeyBuilder* b) const {
+    GrGLQuadEffect::GenKey(*this, caps, b);
 }
 
-GrQuadEffect::GrQuadEffect(GrEffectEdgeType edgeType) : GrVertexEffect() {
-    this->addVertexAttrib(kVec4f_GrSLType);
-    fEdgeType = edgeType;
+GrGLSLPrimitiveProcessor* GrQuadEffect::createGLSLInstance(const GrGLSLCaps&) const {
+    return new GrGLQuadEffect(*this);
 }
 
-bool GrQuadEffect::onIsEqual(const GrEffect& other) const {
-    const GrQuadEffect& ce = CastEffect<GrQuadEffect>(other);
-    return (ce.fEdgeType == fEdgeType);
+GrQuadEffect::GrQuadEffect(GrColor color, const SkMatrix& viewMatrix, uint8_t coverage,
+                           GrPrimitiveEdgeType edgeType, const SkMatrix& localMatrix,
+                           bool usesLocalCoords)
+    : fColor(color)
+    , fViewMatrix(viewMatrix)
+    , fLocalMatrix(localMatrix)
+    , fUsesLocalCoords(usesLocalCoords)
+    , fCoverageScale(coverage)
+    , fEdgeType(edgeType) {
+    this->initClassID<GrQuadEffect>();
+    fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType,
+                                                   kHigh_GrSLPrecision));
+    fInHairQuadEdge = &this->addVertexAttrib(Attribute("inHairQuadEdge",
+                                                        kVec4f_GrVertexAttribType));
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-GR_DEFINE_EFFECT_TEST(GrQuadEffect);
+GR_DEFINE_GEOMETRY_PROCESSOR_TEST(GrQuadEffect);
 
-GrEffect* GrQuadEffect::TestCreate(SkRandom* random,
-                                   GrContext*,
-                                   const GrDrawTargetCaps& caps,
-                                   GrTexture*[]) {
-    GrEffect* effect;
+const GrGeometryProcessor* GrQuadEffect::TestCreate(GrProcessorTestData* d) {
+    GrGeometryProcessor* gp;
     do {
-        GrEffectEdgeType edgeType = static_cast<GrEffectEdgeType>(
-                                                    random->nextULessThan(kGrEffectEdgeTypeCnt));
-        effect = GrQuadEffect::Create(edgeType, caps);
-    } while (NULL == effect);
-    return effect;
+        GrPrimitiveEdgeType edgeType = static_cast<GrPrimitiveEdgeType>(
+                d->fRandom->nextULessThan(kGrProcessorEdgeTypeCnt));
+        gp = GrQuadEffect::Create(GrRandomColor(d->fRandom),
+                                  GrTest::TestMatrix(d->fRandom),
+                                  edgeType, *d->fCaps,
+                                  GrTest::TestMatrix(d->fRandom),
+                                  d->fRandom->nextBool());
+    } while (nullptr == gp);
+    return gp;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // Cubic
 //////////////////////////////////////////////////////////////////////////////
 
-class GrGLCubicEffect : public GrGLVertexEffect {
+class GrGLCubicEffect : public GrGLSLGeometryProcessor {
 public:
-    GrGLCubicEffect(const GrBackendEffectFactory&, const GrDrawEffect&);
+    GrGLCubicEffect(const GrGeometryProcessor&);
 
-    virtual void emitCode(GrGLFullShaderBuilder* builder,
-                          const GrDrawEffect& drawEffect,
-                          const GrEffectKey& key,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    void onEmitCode(EmitArgs&, GrGPArgs*) override;
 
-    static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*);
+    static inline void GenKey(const GrGeometryProcessor&,
+                              const GrGLSLCaps&,
+                              GrProcessorKeyBuilder*);
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE {}
+    void setData(const GrGLSLProgramDataManager& pdman,
+                 const GrPrimitiveProcessor& primProc) override {
+        const GrCubicEffect& ce = primProc.cast<GrCubicEffect>();
+
+        if (!ce.viewMatrix().isIdentity() && !fViewMatrix.cheapEqualTo(ce.viewMatrix())) {
+            fViewMatrix = ce.viewMatrix();
+            float viewMatrix[3 * 3];
+            GrGLSLGetMatrix<3>(viewMatrix, fViewMatrix);
+            pdman.setMatrix3f(fViewMatrixUniform, viewMatrix);
+        }
+
+        if (ce.color() != fColor) {
+            float c[4];
+            GrColorToRGBAFloat(ce.color(), c);
+            pdman.set4fv(fColorUniform, 1, c);
+            fColor = ce.color();
+        }
+    }
 
 private:
-    GrEffectEdgeType fEdgeType;
+    SkMatrix fViewMatrix;
+    GrColor fColor;
+    GrPrimitiveEdgeType fEdgeType;
+    UniformHandle fColorUniform;
+    UniformHandle fViewMatrixUniform;
 
-    typedef GrGLVertexEffect INHERITED;
+    typedef GrGLSLGeometryProcessor INHERITED;
 };
 
-GrGLCubicEffect::GrGLCubicEffect(const GrBackendEffectFactory& factory,
-                                 const GrDrawEffect& drawEffect)
-    : INHERITED (factory) {
-    const GrCubicEffect& ce = drawEffect.castEffect<GrCubicEffect>();
+GrGLCubicEffect::GrGLCubicEffect(const GrGeometryProcessor& processor)
+    : fViewMatrix(SkMatrix::InvalidMatrix()), fColor(GrColor_ILLEGAL) {
+    const GrCubicEffect& ce = processor.cast<GrCubicEffect>();
     fEdgeType = ce.getEdgeType();
 }
 
-void GrGLCubicEffect::emitCode(GrGLFullShaderBuilder* builder,
-                               const GrDrawEffect& drawEffect,
-                               const GrEffectKey& key,
-                               const char* outputColor,
-                               const char* inputColor,
-                               const TransformedCoordsArray&,
-                               const TextureSamplerArray& samplers) {
-    const char *vsName, *fsName;
+void GrGLCubicEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
+    GrGLSLVertexBuilder* vertBuilder = args.fVertBuilder;
+    const GrCubicEffect& gp = args.fGP.cast<GrCubicEffect>();
+    GrGLSLVaryingHandler* varyingHandler = args.fVaryingHandler;
 
-    builder->addVarying(kVec4f_GrSLType, "CubicCoeffs",
-                              &vsName, &fsName);
-    const SkString* attr0Name =
-        builder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[0]);
-    builder->vsCodeAppendf("\t%s = %s;\n", vsName, attr0Name->c_str());
+    // emit attributes
+    varyingHandler->emitAttributes(gp);
 
-    builder->fsCodeAppend("\t\tfloat edgeAlpha;\n");
+    GrGLSLVertToFrag v(kVec4f_GrSLType);
+    varyingHandler->addVarying("CubicCoeffs", &v, kHigh_GrSLPrecision);
+    vertBuilder->codeAppendf("%s = %s;", v.vsOut(), gp.inCubicCoeffs()->fName);
+
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    // Setup pass through color
+    if (!gp.colorIgnored()) {
+        this->setupUniformColor(args.fPB, fragBuilder, args.fOutputColor, &fColorUniform);
+    }
+
+    // Setup position
+    this->setupPosition(args.fPB,
+                        vertBuilder,
+                        gpArgs,
+                        gp.inPosition()->fName,
+                        gp.viewMatrix(),
+                        &fViewMatrixUniform);
+
+    // emit transforms with position
+    this->emitTransforms(args.fPB,
+                         vertBuilder,
+                         varyingHandler,
+                         gpArgs->fPositionVar,
+                         gp.inPosition()->fName,
+                         args.fTransformsIn,
+                         args.fTransformsOut);
+
+
+    GrGLSLShaderVar edgeAlpha("edgeAlpha", kFloat_GrSLType, 0, kHigh_GrSLPrecision);
+    GrGLSLShaderVar dklmdx("dklmdx", kVec3f_GrSLType, 0, kHigh_GrSLPrecision);
+    GrGLSLShaderVar dklmdy("dklmdy", kVec3f_GrSLType, 0, kHigh_GrSLPrecision);
+    GrGLSLShaderVar dfdx("dfdx", kFloat_GrSLType, 0, kHigh_GrSLPrecision);
+    GrGLSLShaderVar dfdy("dfdy", kFloat_GrSLType, 0, kHigh_GrSLPrecision);
+    GrGLSLShaderVar gF("gF", kVec2f_GrSLType, 0, kHigh_GrSLPrecision);
+    GrGLSLShaderVar gFM("gFM", kFloat_GrSLType, 0, kHigh_GrSLPrecision);
+    GrGLSLShaderVar func("func", kFloat_GrSLType, 0, kHigh_GrSLPrecision);
+
+    fragBuilder->declAppend(edgeAlpha);
+    fragBuilder->declAppend(dklmdx);
+    fragBuilder->declAppend(dklmdy);
+    fragBuilder->declAppend(dfdx);
+    fragBuilder->declAppend(dfdy);
+    fragBuilder->declAppend(gF);
+    fragBuilder->declAppend(gFM);
+    fragBuilder->declAppend(func);
 
     switch (fEdgeType) {
-        case kHairlineAA_GrEffectEdgeType: {
-            SkAssertResult(builder->enableFeature(
-                    GrGLShaderBuilder::kStandardDerivatives_GLSLFeature));
-            builder->fsCodeAppendf("\t\tvec3 dklmdx = dFdx(%s.xyz);\n", fsName);
-            builder->fsCodeAppendf("\t\tvec3 dklmdy = dFdy(%s.xyz);\n", fsName);
-            builder->fsCodeAppendf("\t\tfloat dfdx =\n"
-                                   "\t\t3.0*%s.x*%s.x*dklmdx.x - %s.y*dklmdx.z - %s.z*dklmdx.y;\n",
-                                   fsName, fsName, fsName, fsName);
-            builder->fsCodeAppendf("\t\tfloat dfdy =\n"
-                                   "\t\t3.0*%s.x*%s.x*dklmdy.x - %s.y*dklmdy.z - %s.z*dklmdy.y;\n",
-                                   fsName, fsName, fsName, fsName);
-            builder->fsCodeAppend("\t\tvec2 gF = vec2(dfdx, dfdy);\n");
-            builder->fsCodeAppend("\t\tfloat gFM = sqrt(dot(gF, gF));\n");
-            builder->fsCodeAppendf("\t\tfloat func = %s.x*%s.x*%s.x - %s.y*%s.z;\n",
-                                   fsName, fsName, fsName, fsName, fsName);
-            builder->fsCodeAppend("\t\tfunc = abs(func);\n");
-            builder->fsCodeAppend("\t\tedgeAlpha = func / gFM;\n");
-            builder->fsCodeAppend("\t\tedgeAlpha = max(1.0 - edgeAlpha, 0.0);\n");
+        case kHairlineAA_GrProcessorEdgeType: {
+            SkAssertResult(fragBuilder->enableFeature(
+                    GrGLSLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));
+            fragBuilder->codeAppendf("%s = dFdx(%s.xyz);", dklmdx.c_str(), v.fsIn());
+            fragBuilder->codeAppendf("%s = dFdy(%s.xyz);", dklmdy.c_str(), v.fsIn());
+            fragBuilder->codeAppendf("%s = 3.0 * %s.x * %s.x * %s.x - %s.y * %s.z - %s.z * %s.y;",
+                                     dfdx.c_str(), v.fsIn(), v.fsIn(), dklmdx.c_str(), v.fsIn(),
+                                     dklmdx.c_str(), v.fsIn(), dklmdx.c_str());
+            fragBuilder->codeAppendf("%s = 3.0 * %s.x * %s.x * %s.x - %s.y * %s.z - %s.z * %s.y;",
+                                     dfdy.c_str(), v.fsIn(), v.fsIn(), dklmdy.c_str(), v.fsIn(),
+                                     dklmdy.c_str(), v.fsIn(), dklmdy.c_str());
+            fragBuilder->codeAppendf("%s = vec2(%s, %s);", gF.c_str(), dfdx.c_str(), dfdy.c_str());
+            fragBuilder->codeAppendf("%s = sqrt(dot(%s, %s));",
+                                     gFM.c_str(), gF.c_str(), gF.c_str());
+            fragBuilder->codeAppendf("%s = %s.x * %s.x * %s.x - %s.y * %s.z;",
+                                     func.c_str(), v.fsIn(), v.fsIn(),
+                                     v.fsIn(), v.fsIn(), v.fsIn());
+            fragBuilder->codeAppendf("%s = abs(%s);", func.c_str(), func.c_str());
+            fragBuilder->codeAppendf("%s = %s / %s;",
+                                     edgeAlpha.c_str(), func.c_str(), gFM.c_str());
+            fragBuilder->codeAppendf("%s = max(1.0 - %s, 0.0);",
+                                     edgeAlpha.c_str(), edgeAlpha.c_str());
             // Add line below for smooth cubic ramp
-            // builder->fsCodeAppend("\t\tedgeAlpha = edgeAlpha*edgeAlpha*(3.0-2.0*edgeAlpha);\n");
+            // fragBuilder->codeAppendf("%s = %s * %s * (3.0 - 2.0 * %s);",
+            //                        edgeAlpha.c_str(), edgeAlpha.c_str(), edgeAlpha.c_str(),
+            //                        edgeAlpha.c_str());
             break;
         }
-        case kFillAA_GrEffectEdgeType: {
-            SkAssertResult(builder->enableFeature(
-                    GrGLShaderBuilder::kStandardDerivatives_GLSLFeature));
-            builder->fsCodeAppendf("\t\tvec3 dklmdx = dFdx(%s.xyz);\n", fsName);
-            builder->fsCodeAppendf("\t\tvec3 dklmdy = dFdy(%s.xyz);\n", fsName);
-            builder->fsCodeAppendf("\t\tfloat dfdx =\n"
-                                   "\t\t3.0*%s.x*%s.x*dklmdx.x - %s.y*dklmdx.z - %s.z*dklmdx.y;\n",
-                                   fsName, fsName, fsName, fsName);
-            builder->fsCodeAppendf("\t\tfloat dfdy =\n"
-                                   "\t\t3.0*%s.x*%s.x*dklmdy.x - %s.y*dklmdy.z - %s.z*dklmdy.y;\n",
-                                   fsName, fsName, fsName, fsName);
-            builder->fsCodeAppend("\t\tvec2 gF = vec2(dfdx, dfdy);\n");
-            builder->fsCodeAppend("\t\tfloat gFM = sqrt(dot(gF, gF));\n");
-            builder->fsCodeAppendf("\t\tfloat func = %s.x*%s.x*%s.x - %s.y*%s.z;\n",
-                                   fsName, fsName, fsName, fsName, fsName);
-            builder->fsCodeAppend("\t\tedgeAlpha = func / gFM;\n");
-            builder->fsCodeAppend("\t\tedgeAlpha = clamp(1.0 - edgeAlpha, 0.0, 1.0);\n");
+        case kFillAA_GrProcessorEdgeType: {
+            SkAssertResult(fragBuilder->enableFeature(
+                    GrGLSLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));
+            fragBuilder->codeAppendf("%s = dFdx(%s.xyz);", dklmdx.c_str(), v.fsIn());
+            fragBuilder->codeAppendf("%s = dFdy(%s.xyz);", dklmdy.c_str(), v.fsIn());
+            fragBuilder->codeAppendf("%s ="
+                                     "3.0 * %s.x * %s.x * %s.x - %s.y * %s.z - %s.z * %s.y;",
+                                     dfdx.c_str(), v.fsIn(), v.fsIn(), dklmdx.c_str(), v.fsIn(),
+                                     dklmdx.c_str(), v.fsIn(), dklmdx.c_str());
+            fragBuilder->codeAppendf("%s = 3.0 * %s.x * %s.x * %s.x - %s.y * %s.z - %s.z * %s.y;",
+                                     dfdy.c_str(), v.fsIn(), v.fsIn(), dklmdy.c_str(), v.fsIn(),
+                                     dklmdy.c_str(), v.fsIn(), dklmdy.c_str());
+            fragBuilder->codeAppendf("%s = vec2(%s, %s);", gF.c_str(), dfdx.c_str(), dfdy.c_str());
+            fragBuilder->codeAppendf("%s = sqrt(dot(%s, %s));",
+                                     gFM.c_str(), gF.c_str(), gF.c_str());
+            fragBuilder->codeAppendf("%s = %s.x * %s.x * %s.x - %s.y * %s.z;",
+                                     func.c_str(), v.fsIn(), v.fsIn(),
+                                     v.fsIn(), v.fsIn(), v.fsIn());
+            fragBuilder->codeAppendf("%s = %s / %s;",
+                                     edgeAlpha.c_str(), func.c_str(), gFM.c_str());
+            fragBuilder->codeAppendf("%s = clamp(1.0 - %s, 0.0, 1.0);",
+                                     edgeAlpha.c_str(), edgeAlpha.c_str());
             // Add line below for smooth cubic ramp
-            // builder->fsCodeAppend("\t\tedgeAlpha = edgeAlpha*edgeAlpha*(3.0-2.0*edgeAlpha);\n");
+            // fragBuilder->codeAppendf("%s = %s * %s * (3.0 - 2.0 * %s);",
+            //                        edgeAlpha.c_str(), edgeAlpha.c_str(), edgeAlpha.c_str(),
+            //                        edgeAlpha.c_str());
             break;
         }
-        case kFillBW_GrEffectEdgeType: {
-            builder->fsCodeAppendf("\t\tedgeAlpha = %s.x*%s.x*%s.x - %s.y*%s.z;\n",
-                                   fsName, fsName, fsName, fsName, fsName);
-            builder->fsCodeAppend("\t\tedgeAlpha = float(edgeAlpha < 0.0);\n");
+        case kFillBW_GrProcessorEdgeType: {
+            fragBuilder->codeAppendf("%s = %s.x * %s.x * %s.x - %s.y * %s.z;",
+                                     edgeAlpha.c_str(), v.fsIn(), v.fsIn(),
+                                     v.fsIn(), v.fsIn(), v.fsIn());
+            fragBuilder->codeAppendf("%s = float(%s < 0.0);", edgeAlpha.c_str(), edgeAlpha.c_str());
             break;
         }
         default:
             SkFAIL("Shouldn't get here");
     }
 
-    builder->fsCodeAppendf("\t%s = %s;\n", outputColor,
-                           (GrGLSLExpr4(inputColor) * GrGLSLExpr1("edgeAlpha")).c_str());
+
+    fragBuilder->codeAppendf("%s = vec4(%s);", args.fOutputCoverage, edgeAlpha.c_str());
 }
 
-void GrGLCubicEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
-                             GrEffectKeyBuilder* b) {
-    const GrCubicEffect& ce = drawEffect.castEffect<GrCubicEffect>();
+void GrGLCubicEffect::GenKey(const GrGeometryProcessor& gp,
+                             const GrGLSLCaps&,
+                             GrProcessorKeyBuilder* b) {
+    const GrCubicEffect& ce = gp.cast<GrCubicEffect>();
     uint32_t key = ce.isAntiAliased() ? (ce.isFilled() ? 0x0 : 0x1) : 0x2;
+    key |= ce.color() != GrColor_ILLEGAL ? 0x4 : 0x8;
+    key |= ComputePosKey(ce.viewMatrix()) << 5;
     b->add32(key);
 }
 
@@ -418,33 +643,39 @@ void GrGLCubicEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
 
 GrCubicEffect::~GrCubicEffect() {}
 
-const GrBackendEffectFactory& GrCubicEffect::getFactory() const {
-    return GrTBackendEffectFactory<GrCubicEffect>::getInstance();
+void GrCubicEffect::getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const {
+    GrGLCubicEffect::GenKey(*this, caps, b);
 }
 
-GrCubicEffect::GrCubicEffect(GrEffectEdgeType edgeType) : GrVertexEffect() {
-    this->addVertexAttrib(kVec4f_GrSLType);
-    fEdgeType = edgeType;
+GrGLSLPrimitiveProcessor* GrCubicEffect::createGLSLInstance(const GrGLSLCaps&) const {
+    return new GrGLCubicEffect(*this);
 }
 
-bool GrCubicEffect::onIsEqual(const GrEffect& other) const {
-    const GrCubicEffect& ce = CastEffect<GrCubicEffect>(other);
-    return (ce.fEdgeType == fEdgeType);
+GrCubicEffect::GrCubicEffect(GrColor color, const SkMatrix& viewMatrix,
+                             GrPrimitiveEdgeType edgeType)
+    : fColor(color)
+    , fViewMatrix(viewMatrix)
+    , fEdgeType(edgeType) {
+    this->initClassID<GrCubicEffect>();
+    fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType,
+                                                   kHigh_GrSLPrecision));
+    fInCubicCoeffs = &this->addVertexAttrib(Attribute("inCubicCoeffs",
+                                                        kVec4f_GrVertexAttribType));
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-GR_DEFINE_EFFECT_TEST(GrCubicEffect);
+GR_DEFINE_GEOMETRY_PROCESSOR_TEST(GrCubicEffect);
 
-GrEffect* GrCubicEffect::TestCreate(SkRandom* random,
-                                    GrContext*,
-                                    const GrDrawTargetCaps& caps,
-                                    GrTexture*[]) {
-    GrEffect* effect;
+const GrGeometryProcessor* GrCubicEffect::TestCreate(GrProcessorTestData* d) {
+    GrGeometryProcessor* gp;
     do {
-        GrEffectEdgeType edgeType = static_cast<GrEffectEdgeType>(
-                                                    random->nextULessThan(kGrEffectEdgeTypeCnt));
-        effect = GrCubicEffect::Create(edgeType, caps);
-    } while (NULL == effect);
-    return effect;
+        GrPrimitiveEdgeType edgeType =
+                static_cast<GrPrimitiveEdgeType>(
+                        d->fRandom->nextULessThan(kGrProcessorEdgeTypeCnt));
+        gp = GrCubicEffect::Create(GrRandomColor(d->fRandom),
+                                   GrTest::TestMatrix(d->fRandom), edgeType, *d->fCaps);
+    } while (nullptr == gp);
+    return gp;
 }
+
diff --git a/gfx/skia/skia/src/gpu/effects/GrBezierEffect.h b/gfx/skia/skia/src/gpu/effects/GrBezierEffect.h
index b8d8f7b2e4d2..ddb249b587ac 100644
--- a/gfx/skia/skia/src/gpu/effects/GrBezierEffect.h
+++ b/gfx/skia/skia/src/gpu/effects/GrBezierEffect.h
@@ -8,9 +8,10 @@
 #ifndef GrBezierEffect_DEFINED
 #define GrBezierEffect_DEFINED
 
-#include "GrDrawTargetCaps.h"
-#include "GrEffect.h"
-#include "GrVertexEffect.h"
+#include "GrCaps.h"
+#include "GrProcessor.h"
+#include "GrGeometryProcessor.h"
+#include "GrInvariantOutput.h"
 #include "GrTypesPriv.h"
 
 /**
@@ -55,60 +56,73 @@
  */
 class GrGLConicEffect;
 
-class GrConicEffect : public GrVertexEffect {
+class GrConicEffect : public GrGeometryProcessor {
 public:
-    static GrEffect* Create(const GrEffectEdgeType edgeType, const GrDrawTargetCaps& caps) {
-        GR_CREATE_STATIC_EFFECT(gConicFillAA, GrConicEffect, (kFillAA_GrEffectEdgeType));
-        GR_CREATE_STATIC_EFFECT(gConicHairAA, GrConicEffect, (kHairlineAA_GrEffectEdgeType));
-        GR_CREATE_STATIC_EFFECT(gConicFillBW, GrConicEffect, (kFillBW_GrEffectEdgeType));
+    static GrGeometryProcessor* Create(GrColor color,
+                                       const SkMatrix& viewMatrix,
+                                       const GrPrimitiveEdgeType edgeType,
+                                       const GrCaps& caps,
+                                       const SkMatrix& localMatrix,
+                                       bool usesLocalCoords,
+                                       uint8_t coverage = 0xff) {
         switch (edgeType) {
-            case kFillAA_GrEffectEdgeType:
-                if (!caps.shaderDerivativeSupport()) {
-                    return NULL;
+            case kFillAA_GrProcessorEdgeType:
+                if (!caps.shaderCaps()->shaderDerivativeSupport()) {
+                    return nullptr;
                 }
-                gConicFillAA->ref();
-                return gConicFillAA;
-            case kHairlineAA_GrEffectEdgeType:
-                if (!caps.shaderDerivativeSupport()) {
-                    return NULL;
+                return new GrConicEffect(color, viewMatrix, coverage, kFillAA_GrProcessorEdgeType,
+                                         localMatrix, usesLocalCoords);
+            case kHairlineAA_GrProcessorEdgeType:
+                if (!caps.shaderCaps()->shaderDerivativeSupport()) {
+                    return nullptr;
                 }
-                gConicHairAA->ref();
-                return gConicHairAA;
-            case kFillBW_GrEffectEdgeType:
-                gConicFillBW->ref();
-                return gConicFillBW;
+                return new GrConicEffect(color, viewMatrix, coverage,
+                                         kHairlineAA_GrProcessorEdgeType, localMatrix,
+                                         usesLocalCoords);
+            case kFillBW_GrProcessorEdgeType:
+                return new GrConicEffect(color, viewMatrix, coverage, kFillBW_GrProcessorEdgeType,
+                                         localMatrix, usesLocalCoords);
             default:
-                return NULL;
+                return nullptr;
         }
     }
 
     virtual ~GrConicEffect();
 
-    static const char* Name() { return "Conic"; }
+    const char* name() const override { return "Conic"; }
 
-    inline bool isAntiAliased() const { return GrEffectEdgeTypeIsAA(fEdgeType); }
-    inline bool isFilled() const { return GrEffectEdgeTypeIsFill(fEdgeType); }
-    inline GrEffectEdgeType getEdgeType() const { return fEdgeType; }
+    inline const Attribute* inPosition() const { return fInPosition; }
+    inline const Attribute* inConicCoeffs() const { return fInConicCoeffs; }
+    inline bool isAntiAliased() const { return GrProcessorEdgeTypeIsAA(fEdgeType); }
+    inline bool isFilled() const { return GrProcessorEdgeTypeIsFill(fEdgeType); }
+    inline GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
+    GrColor color() const { return fColor; }
+    bool colorIgnored() const { return GrColor_ILLEGAL == fColor; }
+    const SkMatrix& viewMatrix() const { return fViewMatrix; }
+    const SkMatrix& localMatrix() const { return fLocalMatrix; }
+    bool usesLocalCoords() const { return fUsesLocalCoords; }
+    uint8_t coverageScale() const { return fCoverageScale; }
 
-    typedef GrGLConicEffect GLEffect;
+    void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
 
-    virtual void getConstantColorComponents(GrColor* color,
-                                            uint32_t* validFlags) const SK_OVERRIDE {
-        *validFlags = 0;
-    }
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
+    GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override;
 
 private:
-    GrConicEffect(GrEffectEdgeType);
+    GrConicEffect(GrColor, const SkMatrix& viewMatrix, uint8_t coverage, GrPrimitiveEdgeType,
+                  const SkMatrix& localMatrix, bool usesLocalCoords);
 
-    virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE;
+    GrColor             fColor;
+    SkMatrix            fViewMatrix;
+    SkMatrix            fLocalMatrix;
+    bool                fUsesLocalCoords;
+    uint8_t             fCoverageScale;
+    GrPrimitiveEdgeType fEdgeType;
+    const Attribute*    fInPosition;
+    const Attribute*    fInConicCoeffs;
 
-    GrEffectEdgeType fEdgeType;
+    GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
 
-    GR_DECLARE_EFFECT_TEST;
-
-    typedef GrVertexEffect INHERITED;
+    typedef GrGeometryProcessor INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -122,60 +136,73 @@ private:
  */
 class GrGLQuadEffect;
 
-class GrQuadEffect : public GrVertexEffect {
+class GrQuadEffect : public GrGeometryProcessor {
 public:
-    static GrEffect* Create(const GrEffectEdgeType edgeType, const GrDrawTargetCaps& caps) {
-        GR_CREATE_STATIC_EFFECT(gQuadFillAA, GrQuadEffect, (kFillAA_GrEffectEdgeType));
-        GR_CREATE_STATIC_EFFECT(gQuadHairAA, GrQuadEffect, (kHairlineAA_GrEffectEdgeType));
-        GR_CREATE_STATIC_EFFECT(gQuadFillBW, GrQuadEffect, (kFillBW_GrEffectEdgeType));
+    static GrGeometryProcessor* Create(GrColor color,
+                                       const SkMatrix& viewMatrix,
+                                       const GrPrimitiveEdgeType edgeType,
+                                       const GrCaps& caps,
+                                       const SkMatrix& localMatrix,
+                                       bool usesLocalCoords,
+                                       uint8_t coverage = 0xff) {
         switch (edgeType) {
-            case kFillAA_GrEffectEdgeType:
-                if (!caps.shaderDerivativeSupport()) {
-                    return NULL;
+            case kFillAA_GrProcessorEdgeType:
+                if (!caps.shaderCaps()->shaderDerivativeSupport()) {
+                    return nullptr;
                 }
-                gQuadFillAA->ref();
-                return gQuadFillAA;
-            case kHairlineAA_GrEffectEdgeType:
-                if (!caps.shaderDerivativeSupport()) {
-                    return NULL;
+                return new GrQuadEffect(color, viewMatrix, coverage, kFillAA_GrProcessorEdgeType,
+                                        localMatrix, usesLocalCoords);
+            case kHairlineAA_GrProcessorEdgeType:
+                if (!caps.shaderCaps()->shaderDerivativeSupport()) {
+                    return nullptr;
                 }
-                gQuadHairAA->ref();
-                return gQuadHairAA;
-            case kFillBW_GrEffectEdgeType:
-                gQuadFillBW->ref();
-                return gQuadFillBW;
+                return new GrQuadEffect(color, viewMatrix, coverage,
+                                        kHairlineAA_GrProcessorEdgeType, localMatrix,
+                                        usesLocalCoords);
+            case kFillBW_GrProcessorEdgeType:
+                return new GrQuadEffect(color, viewMatrix, coverage, kFillBW_GrProcessorEdgeType,
+                                        localMatrix, usesLocalCoords);
             default:
-                return NULL;
+                return nullptr;
         }
     }
 
     virtual ~GrQuadEffect();
 
-    static const char* Name() { return "Quad"; }
+    const char* name() const override { return "Quad"; }
 
-    inline bool isAntiAliased() const { return GrEffectEdgeTypeIsAA(fEdgeType); }
-    inline bool isFilled() const { return GrEffectEdgeTypeIsFill(fEdgeType); }
-    inline GrEffectEdgeType getEdgeType() const { return fEdgeType; }
+    inline const Attribute* inPosition() const { return fInPosition; }
+    inline const Attribute* inHairQuadEdge() const { return fInHairQuadEdge; }
+    inline bool isAntiAliased() const { return GrProcessorEdgeTypeIsAA(fEdgeType); }
+    inline bool isFilled() const { return GrProcessorEdgeTypeIsFill(fEdgeType); }
+    inline GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
+    GrColor color() const { return fColor; }
+    bool colorIgnored() const { return GrColor_ILLEGAL == fColor; }
+    const SkMatrix& viewMatrix() const { return fViewMatrix; }
+    const SkMatrix& localMatrix() const { return fLocalMatrix; }
+    bool usesLocalCoords() const { return fUsesLocalCoords; }
+    uint8_t coverageScale() const { return fCoverageScale; }
 
-    typedef GrGLQuadEffect GLEffect;
+    void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
 
-    virtual void getConstantColorComponents(GrColor* color,
-                                            uint32_t* validFlags) const SK_OVERRIDE {
-        *validFlags = 0;
-    }
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
+    GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override;
 
 private:
-    GrQuadEffect(GrEffectEdgeType);
+    GrQuadEffect(GrColor, const SkMatrix& viewMatrix, uint8_t coverage, GrPrimitiveEdgeType,
+                 const SkMatrix& localMatrix, bool usesLocalCoords);
 
-    virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE;
+    GrColor             fColor;
+    SkMatrix            fViewMatrix;
+    SkMatrix            fLocalMatrix;
+    bool                fUsesLocalCoords;
+    uint8_t             fCoverageScale;
+    GrPrimitiveEdgeType fEdgeType;
+    const Attribute*    fInPosition;
+    const Attribute*    fInHairQuadEdge;
 
-    GrEffectEdgeType fEdgeType;
+    GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
 
-    GR_DECLARE_EFFECT_TEST;
-
-    typedef GrVertexEffect INHERITED;
+    typedef GrGeometryProcessor INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
@@ -191,60 +218,59 @@ private:
  */
 class GrGLCubicEffect;
 
-class GrCubicEffect : public GrVertexEffect {
+class GrCubicEffect : public GrGeometryProcessor {
 public:
-    static GrEffect* Create(const GrEffectEdgeType edgeType, const GrDrawTargetCaps& caps) {
-        GR_CREATE_STATIC_EFFECT(gCubicFillAA, GrCubicEffect, (kFillAA_GrEffectEdgeType));
-        GR_CREATE_STATIC_EFFECT(gCubicHairAA, GrCubicEffect, (kHairlineAA_GrEffectEdgeType));
-        GR_CREATE_STATIC_EFFECT(gCubicFillBW, GrCubicEffect, (kFillBW_GrEffectEdgeType));
+    static GrGeometryProcessor* Create(GrColor color,
+                                       const SkMatrix& viewMatrix,
+                                       const GrPrimitiveEdgeType edgeType,
+                                       const GrCaps& caps) {
         switch (edgeType) {
-            case kFillAA_GrEffectEdgeType:
-                if (!caps.shaderDerivativeSupport()) {
-                    return NULL;
+            case kFillAA_GrProcessorEdgeType:
+                if (!caps.shaderCaps()->shaderDerivativeSupport()) {
+                    return nullptr;
                 }
-                gCubicFillAA->ref();
-                return gCubicFillAA;
-            case kHairlineAA_GrEffectEdgeType:
-                if (!caps.shaderDerivativeSupport()) {
-                    return NULL;
+                return new GrCubicEffect(color, viewMatrix, kFillAA_GrProcessorEdgeType);
+            case kHairlineAA_GrProcessorEdgeType:
+                if (!caps.shaderCaps()->shaderDerivativeSupport()) {
+                    return nullptr;
                 }
-                gCubicHairAA->ref();
-                return gCubicHairAA;
-            case kFillBW_GrEffectEdgeType:
-                gCubicFillBW->ref();
-                return gCubicFillBW;
+                return new GrCubicEffect(color, viewMatrix, kHairlineAA_GrProcessorEdgeType);
+            case kFillBW_GrProcessorEdgeType:
+                return new GrCubicEffect(color, viewMatrix, kFillBW_GrProcessorEdgeType);
             default:
-                return NULL;
+                return nullptr;
         }
     }
 
     virtual ~GrCubicEffect();
 
-    static const char* Name() { return "Cubic"; }
+    const char* name() const override { return "Cubic"; }
 
-    inline bool isAntiAliased() const { return GrEffectEdgeTypeIsAA(fEdgeType); }
-    inline bool isFilled() const { return GrEffectEdgeTypeIsFill(fEdgeType); }
-    inline GrEffectEdgeType getEdgeType() const { return fEdgeType; }
+    inline const Attribute* inPosition() const { return fInPosition; }
+    inline const Attribute* inCubicCoeffs() const { return fInCubicCoeffs; }
+    inline bool isAntiAliased() const { return GrProcessorEdgeTypeIsAA(fEdgeType); }
+    inline bool isFilled() const { return GrProcessorEdgeTypeIsFill(fEdgeType); }
+    inline GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
+    GrColor color() const { return fColor; }
+    bool colorIgnored() const { return GrColor_ILLEGAL == fColor; }
+    const SkMatrix& viewMatrix() const { return fViewMatrix; }
 
-    typedef GrGLCubicEffect GLEffect;
+    void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
 
-    virtual void getConstantColorComponents(GrColor* color,
-                                            uint32_t* validFlags) const SK_OVERRIDE {
-        *validFlags = 0;
-    }
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
+    GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override;
 
 private:
-    GrCubicEffect(GrEffectEdgeType);
+    GrCubicEffect(GrColor, const SkMatrix& viewMatrix, GrPrimitiveEdgeType);
 
-    virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE;
+    GrColor             fColor;
+    SkMatrix            fViewMatrix;
+    GrPrimitiveEdgeType fEdgeType;
+    const Attribute*    fInPosition;
+    const Attribute*    fInCubicCoeffs;
 
-    GrEffectEdgeType fEdgeType;
+    GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
 
-    GR_DECLARE_EFFECT_TEST;
-
-    typedef GrVertexEffect INHERITED;
+    typedef GrGeometryProcessor INHERITED;
 };
 
 #endif
diff --git a/gfx/skia/skia/src/gpu/effects/GrBicubicEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrBicubicEffect.cpp
index 2b819f68424c..8efcffdf030c 100644
--- a/gfx/skia/skia/src/gpu/effects/GrBicubicEffect.cpp
+++ b/gfx/skia/skia/src/gpu/effects/GrBicubicEffect.cpp
@@ -6,8 +6,10 @@
  */
 
 #include "GrBicubicEffect.h"
-
-#include "gl/GrGLShaderBuilder.h"
+#include "GrInvariantOutput.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
 
 #define DS(x) SkDoubleToScalar(x)
 
@@ -19,111 +21,110 @@ const SkScalar GrBicubicEffect::gMitchellCoefficients[16] = {
 };
 
 
-class GrGLBicubicEffect : public GrGLEffect {
+class GrGLBicubicEffect : public GrGLSLFragmentProcessor {
 public:
-    GrGLBicubicEffect(const GrBackendEffectFactory& factory,
-                      const GrDrawEffect&);
+    GrGLBicubicEffect(const GrProcessor&);
 
-    virtual void emitCode(GrGLShaderBuilder*,
-                          const GrDrawEffect&,
-                          const GrEffectKey&,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    virtual void emitCode(EmitArgs&) override;
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
-
-    static inline void GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
-                              GrEffectKeyBuilder* b) {
-        const GrTextureDomain& domain = drawEffect.castEffect<GrBicubicEffect>().domain();
+    static inline void GenKey(const GrProcessor& effect, const GrGLSLCaps&,
+                              GrProcessorKeyBuilder* b) {
+        const GrTextureDomain& domain = effect.cast<GrBicubicEffect>().domain();
         b->add32(GrTextureDomain::GLDomain::DomainKey(domain));
     }
 
+protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
+
 private:
-    typedef GrGLUniformManager::UniformHandle        UniformHandle;
+    typedef GrGLSLProgramDataManager::UniformHandle UniformHandle;
 
     UniformHandle               fCoefficientsUni;
     UniformHandle               fImageIncrementUni;
     GrTextureDomain::GLDomain   fDomain;
 
-    typedef GrGLEffect INHERITED;
+    typedef GrGLSLFragmentProcessor INHERITED;
 };
 
-GrGLBicubicEffect::GrGLBicubicEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&)
-    : INHERITED(factory) {
+GrGLBicubicEffect::GrGLBicubicEffect(const GrProcessor&) {
 }
 
-void GrGLBicubicEffect::emitCode(GrGLShaderBuilder* builder,
-                                 const GrDrawEffect& drawEffect,
-                                 const GrEffectKey& key,
-                                 const char* outputColor,
-                                 const char* inputColor,
-                                 const TransformedCoordsArray& coords,
-                                 const TextureSamplerArray& samplers) {
-    const GrTextureDomain& domain = drawEffect.castEffect<GrBicubicEffect>().domain();
+void GrGLBicubicEffect::emitCode(EmitArgs& args) {
+    const GrTextureDomain& domain = args.fFp.cast<GrBicubicEffect>().domain();
 
-    SkString coords2D = builder->ensureFSCoords2D(coords, 0);
-    fCoefficientsUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                           kMat44f_GrSLType, "Coefficients");
-    fImageIncrementUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                             kVec2f_GrSLType, "ImageIncrement");
+    fCoefficientsUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                           kMat44f_GrSLType, kDefault_GrSLPrecision,
+                                           "Coefficients");
+    fImageIncrementUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                             kVec2f_GrSLType, kDefault_GrSLPrecision,
+                                             "ImageIncrement");
 
-    const char* imgInc = builder->getUniformCStr(fImageIncrementUni);
-    const char* coeff = builder->getUniformCStr(fCoefficientsUni);
+    const char* imgInc = args.fBuilder->getUniformCStr(fImageIncrementUni);
+    const char* coeff = args.fBuilder->getUniformCStr(fCoefficientsUni);
 
     SkString cubicBlendName;
 
-    static const GrGLShaderVar gCubicBlendArgs[] = {
-        GrGLShaderVar("coefficients",  kMat44f_GrSLType),
-        GrGLShaderVar("t",             kFloat_GrSLType),
-        GrGLShaderVar("c0",            kVec4f_GrSLType),
-        GrGLShaderVar("c1",            kVec4f_GrSLType),
-        GrGLShaderVar("c2",            kVec4f_GrSLType),
-        GrGLShaderVar("c3",            kVec4f_GrSLType),
+    static const GrGLSLShaderVar gCubicBlendArgs[] = {
+        GrGLSLShaderVar("coefficients",  kMat44f_GrSLType),
+        GrGLSLShaderVar("t",             kFloat_GrSLType),
+        GrGLSLShaderVar("c0",            kVec4f_GrSLType),
+        GrGLSLShaderVar("c1",            kVec4f_GrSLType),
+        GrGLSLShaderVar("c2",            kVec4f_GrSLType),
+        GrGLSLShaderVar("c3",            kVec4f_GrSLType),
     };
-    builder->fsEmitFunction(kVec4f_GrSLType,
-                            "cubicBlend",
-                            SK_ARRAY_COUNT(gCubicBlendArgs),
-                            gCubicBlendArgs,
-                            "\tvec4 ts = vec4(1.0, t, t * t, t * t * t);\n"
-                            "\tvec4 c = coefficients * ts;\n"
-                            "\treturn c.x * c0 + c.y * c1 + c.z * c2 + c.w * c3;\n",
-                            &cubicBlendName);
-    builder->fsCodeAppendf("\tvec2 coord = %s - %s * vec2(0.5);\n", coords2D.c_str(), imgInc);
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    SkString coords2D = fragBuilder->ensureFSCoords2D(args.fCoords, 0);
+    fragBuilder->emitFunction(kVec4f_GrSLType,
+                              "cubicBlend",
+                              SK_ARRAY_COUNT(gCubicBlendArgs),
+                              gCubicBlendArgs,
+                              "\tvec4 ts = vec4(1.0, t, t * t, t * t * t);\n"
+                              "\tvec4 c = coefficients * ts;\n"
+                              "\treturn c.x * c0 + c.y * c1 + c.z * c2 + c.w * c3;\n",
+                              &cubicBlendName);
+    fragBuilder->codeAppendf("\tvec2 coord = %s - %s * vec2(0.5);\n", coords2D.c_str(), imgInc);
     // We unnormalize the coord in order to determine our fractional offset (f) within the texel
     // We then snap coord to a texel center and renormalize. The snap prevents cases where the
     // starting coords are near a texel boundary and accumulations of imgInc would cause us to skip/
     // double hit a texel.
-    builder->fsCodeAppendf("\tcoord /= %s;\n", imgInc);
-    builder->fsCodeAppend("\tvec2 f = fract(coord);\n");
-    builder->fsCodeAppendf("\tcoord = (coord - f + vec2(0.5)) * %s;\n", imgInc);
-    builder->fsCodeAppend("\tvec4 rowColors[4];\n");
+    fragBuilder->codeAppendf("\tcoord /= %s;\n", imgInc);
+    fragBuilder->codeAppend("\tvec2 f = fract(coord);\n");
+    fragBuilder->codeAppendf("\tcoord = (coord - f + vec2(0.5)) * %s;\n", imgInc);
+    fragBuilder->codeAppend("\tvec4 rowColors[4];\n");
     for (int y = 0; y < 4; ++y) {
         for (int x = 0; x < 4; ++x) {
             SkString coord;
             coord.printf("coord + %s * vec2(%d, %d)", imgInc, x - 1, y - 1);
             SkString sampleVar;
             sampleVar.printf("rowColors[%d]", x);
-            fDomain.sampleTexture(builder, domain, sampleVar.c_str(), coord, samplers[0]);
+            fDomain.sampleTexture(fragBuilder,
+                                  args.fGLSLCaps,
+                                  domain,
+                                  sampleVar.c_str(),
+                                  coord,
+                                  args.fSamplers[0]);
         }
-        builder->fsCodeAppendf("\tvec4 s%d = %s(%s, f.x, rowColors[0], rowColors[1], rowColors[2], rowColors[3]);\n", y, cubicBlendName.c_str(), coeff);
+        fragBuilder->codeAppendf(
+            "\tvec4 s%d = %s(%s, f.x, rowColors[0], rowColors[1], rowColors[2], rowColors[3]);\n",
+            y, cubicBlendName.c_str(), coeff);
     }
     SkString bicubicColor;
     bicubicColor.printf("%s(%s, f.y, s0, s1, s2, s3)", cubicBlendName.c_str(), coeff);
-    builder->fsCodeAppendf("\t%s = %s;\n", outputColor, (GrGLSLExpr4(bicubicColor.c_str()) * GrGLSLExpr4(inputColor)).c_str());
+    fragBuilder->codeAppendf("\t%s = %s;\n",
+                             args.fOutputColor, (GrGLSLExpr4(bicubicColor.c_str()) *
+                                                 GrGLSLExpr4(args.fInputColor)).c_str());
 }
 
-void GrGLBicubicEffect::setData(const GrGLUniformManager& uman,
-                                const GrDrawEffect& drawEffect) {
-    const GrBicubicEffect& effect = drawEffect.castEffect<GrBicubicEffect>();
-    const GrTexture& texture = *effect.texture(0);
+void GrGLBicubicEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                                  const GrProcessor& processor) {
+    const GrBicubicEffect& bicubicEffect = processor.cast<GrBicubicEffect>();
+    const GrTexture& texture = *processor.texture(0);
     float imageIncrement[2];
     imageIncrement[0] = 1.0f / texture.width();
     imageIncrement[1] = 1.0f / texture.height();
-    uman.set2fv(fImageIncrementUni, 1, imageIncrement);
-    uman.setMatrix4f(fCoefficientsUni, effect.coefficients());
-    fDomain.setData(uman, effect.domain(), texture.origin());
+    pdman.set2fv(fImageIncrementUni, 1, imageIncrement);
+    pdman.setMatrix4f(fCoefficientsUni, bicubicEffect.coefficients());
+    fDomain.setData(pdman, bicubicEffect.domain(), texture.origin());
 }
 
 static inline void convert_row_major_scalar_coeffs_to_column_major_floats(float dst[16],
@@ -141,6 +142,7 @@ GrBicubicEffect::GrBicubicEffect(GrTexture* texture,
                                  const SkShader::TileMode tileModes[2])
   : INHERITED(texture, matrix, GrTextureParams(tileModes, GrTextureParams::kNone_FilterMode))
   , fDomain(GrTextureDomain::IgnoredDomain()) {
+    this->initClassID<GrBicubicEffect>();
     convert_row_major_scalar_coeffs_to_column_major_floats(fCoefficients, coefficients);
 }
 
@@ -148,44 +150,46 @@ GrBicubicEffect::GrBicubicEffect(GrTexture* texture,
                                  const SkScalar coefficients[16],
                                  const SkMatrix &matrix,
                                  const SkRect& domain)
-  : INHERITED(texture, matrix, GrTextureParams(SkShader::kClamp_TileMode,
-                                               GrTextureParams::kNone_FilterMode))
+  : INHERITED(texture, matrix,
+              GrTextureParams(SkShader::kClamp_TileMode, GrTextureParams::kNone_FilterMode))
   , fDomain(domain, GrTextureDomain::kClamp_Mode) {
+    this->initClassID<GrBicubicEffect>();
     convert_row_major_scalar_coeffs_to_column_major_floats(fCoefficients, coefficients);
 }
 
 GrBicubicEffect::~GrBicubicEffect() {
 }
 
-const GrBackendEffectFactory& GrBicubicEffect::getFactory() const {
-    return GrTBackendEffectFactory<GrBicubicEffect>::getInstance();
+void GrBicubicEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                            GrProcessorKeyBuilder* b) const {
+    GrGLBicubicEffect::GenKey(*this, caps, b);
 }
 
-bool GrBicubicEffect::onIsEqual(const GrEffect& sBase) const {
-    const GrBicubicEffect& s = CastEffect<GrBicubicEffect>(sBase);
-    return this->textureAccess(0) == s.textureAccess(0) &&
-           !memcmp(fCoefficients, s.coefficients(), 16);
+GrGLSLFragmentProcessor* GrBicubicEffect::onCreateGLSLInstance() const  {
+    return new GrGLBicubicEffect(*this);
 }
 
-void GrBicubicEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
+bool GrBicubicEffect::onIsEqual(const GrFragmentProcessor& sBase) const {
+    const GrBicubicEffect& s = sBase.cast<GrBicubicEffect>();
+    return !memcmp(fCoefficients, s.coefficients(), 16) &&
+           fDomain == s.fDomain;
+}
+
+void GrBicubicEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const {
     // FIXME: Perhaps we can do better.
-    *validFlags = 0;
-    return;
+    inout->mulByUnknownSingleComponent();
 }
 
-GR_DEFINE_EFFECT_TEST(GrBicubicEffect);
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrBicubicEffect);
 
-GrEffect* GrBicubicEffect::TestCreate(SkRandom* random,
-                                      GrContext* context,
-                                      const GrDrawTargetCaps&,
-                                      GrTexture* textures[]) {
-    int texIdx = random->nextBool() ? GrEffectUnitTest::kSkiaPMTextureIdx :
-                                      GrEffectUnitTest::kAlphaTextureIdx;
+const GrFragmentProcessor* GrBicubicEffect::TestCreate(GrProcessorTestData* d) {
+    int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :
+                                          GrProcessorUnitTest::kAlphaTextureIdx;
     SkScalar coefficients[16];
     for (int i = 0; i < 16; i++) {
-        coefficients[i] = random->nextSScalar1();
+        coefficients[i] = d->fRandom->nextSScalar1();
     }
-    return GrBicubicEffect::Create(textures[texIdx], coefficients);
+    return GrBicubicEffect::Create(d->fTextures[texIdx], coefficients);
 }
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/gfx/skia/skia/src/gpu/effects/GrBicubicEffect.h b/gfx/skia/skia/src/gpu/effects/GrBicubicEffect.h
index 6cfb82741598..208719217bc2 100644
--- a/gfx/skia/skia/src/gpu/effects/GrBicubicEffect.h
+++ b/gfx/skia/skia/src/gpu/effects/GrBicubicEffect.h
@@ -10,11 +10,10 @@
 
 #include "GrSingleTextureEffect.h"
 #include "GrTextureDomain.h"
-#include "GrDrawEffect.h"
-#include "gl/GrGLEffect.h"
-#include "GrTBackendEffectFactory.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
 
 class GrGLBicubicEffect;
+class GrInvariantOutput;
 
 class GrBicubicEffect : public GrSingleTextureEffect {
 public:
@@ -24,36 +23,33 @@ public:
     };
     virtual ~GrBicubicEffect();
 
-    static const char* Name() { return "Bicubic"; }
     const float* coefficients() const { return fCoefficients; }
 
-    typedef GrGLBicubicEffect GLEffect;
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
+    const char* name() const override { return "Bicubic"; }
 
     const GrTextureDomain& domain() const { return fDomain; }
 
     /**
      * Create a simple filter effect with custom bicubic coefficients and optional domain.
      */
-    static GrEffect* Create(GrTexture* tex, const SkScalar coefficients[16],
-                            const SkRect* domain = NULL) {
-        if (NULL == domain) {
+    static const GrFragmentProcessor* Create(GrTexture* tex, const SkScalar coefficients[16],
+                                             const SkRect* domain = nullptr) {
+        if (nullptr == domain) {
             static const SkShader::TileMode kTileModes[] = { SkShader::kClamp_TileMode,
                                                              SkShader::kClamp_TileMode };
-            return Create(tex, coefficients, MakeDivByTextureWHMatrix(tex), kTileModes);
+            return Create(tex, coefficients, GrCoordTransform::MakeDivByTextureWHMatrix(tex),
+                          kTileModes);
         } else {
-            return SkNEW_ARGS(GrBicubicEffect, (tex, coefficients,
-                                                MakeDivByTextureWHMatrix(tex), *domain));
+            return new GrBicubicEffect(tex, coefficients,
+                                       GrCoordTransform::MakeDivByTextureWHMatrix(tex), *domain);
         }
     }
 
     /**
      * Create a Mitchell filter effect with specified texture matrix and x/y tile modes.
      */
-    static GrEffect* Create(GrTexture* tex, const SkMatrix& matrix,
-                            SkShader::TileMode tileModes[2]) {
+    static const GrFragmentProcessor* Create(GrTexture* tex, const SkMatrix& matrix,
+                                             const SkShader::TileMode tileModes[2]) {
         return Create(tex, gMitchellCoefficients, matrix, tileModes);
     }
 
@@ -61,16 +57,18 @@ public:
      * Create a filter effect with custom bicubic coefficients, the texture matrix, and the x/y
      * tilemodes.
      */
-    static GrEffect* Create(GrTexture* tex, const SkScalar coefficients[16],
-                            const SkMatrix& matrix, const SkShader::TileMode tileModes[2]) {
-        return SkNEW_ARGS(GrBicubicEffect, (tex, coefficients, matrix, tileModes));
+    static const GrFragmentProcessor* Create(GrTexture* tex, const SkScalar coefficients[16],
+                                             const SkMatrix& matrix,
+                                             const SkShader::TileMode tileModes[2]) {
+        return new GrBicubicEffect(tex, coefficients, matrix, tileModes);
     }
 
     /**
      * Create a Mitchell filter effect with a texture matrix and a domain.
      */
-    static GrEffect* Create(GrTexture* tex, const SkMatrix& matrix, const SkRect& domain) {
-        return SkNEW_ARGS(GrBicubicEffect, (tex, gMitchellCoefficients, matrix, domain));
+    static const GrFragmentProcessor* Create(GrTexture* tex, const SkMatrix& matrix,
+                                             const SkRect& domain) {
+        return new GrBicubicEffect(tex, gMitchellCoefficients, matrix, domain);
     }
 
     /**
@@ -84,16 +82,23 @@ public:
                                  GrTextureParams::FilterMode* filterMode);
 
 private:
-    GrBicubicEffect(GrTexture*, const SkScalar coefficients[16],
-                    const SkMatrix &matrix, const SkShader::TileMode tileModes[2]);
-    GrBicubicEffect(GrTexture*, const SkScalar coefficients[16],
-                    const SkMatrix &matrix, const SkRect& domain);
-    virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE;
+    GrBicubicEffect(GrTexture*, const SkScalar coefficients[16], const SkMatrix &matrix,
+                    const SkShader::TileMode tileModes[2]);
+    GrBicubicEffect(GrTexture*, const SkScalar coefficients[16], const SkMatrix &matrix,
+                    const SkRect& domain);
+
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
+
+    bool onIsEqual(const GrFragmentProcessor&) const override;
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
 
     float           fCoefficients[16];
     GrTextureDomain fDomain;
 
-    GR_DECLARE_EFFECT_TEST;
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
 
     static const SkScalar gMitchellCoefficients[16];
 
diff --git a/gfx/skia/skia/src/gpu/effects/GrBitmapTextGeoProc.cpp b/gfx/skia/skia/src/gpu/effects/GrBitmapTextGeoProc.cpp
new file mode 100644
index 000000000000..594646256e58
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/effects/GrBitmapTextGeoProc.cpp
@@ -0,0 +1,201 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrBitmapTextGeoProc.h"
+#include "GrInvariantOutput.h"
+#include "GrTexture.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLGeometryProcessor.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+#include "glsl/GrGLSLVarying.h"
+#include "glsl/GrGLSLVertexShaderBuilder.h"
+
+class GrGLBitmapTextGeoProc : public GrGLSLGeometryProcessor {
+public:
+    GrGLBitmapTextGeoProc() : fColor(GrColor_ILLEGAL) {}
+
+    void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override {
+        const GrBitmapTextGeoProc& cte = args.fGP.cast<GrBitmapTextGeoProc>();
+
+        GrGLSLGPBuilder* pb = args.fPB;
+        GrGLSLVertexBuilder* vertBuilder = args.fVertBuilder;
+        GrGLSLVaryingHandler* varyingHandler = args.fVaryingHandler;
+
+        // emit attributes
+        varyingHandler->emitAttributes(cte);
+
+        // compute numbers to be hardcoded to convert texture coordinates from int to float
+        SkASSERT(cte.numTextures() == 1);
+        GrTexture* atlas = cte.textureAccess(0).getTexture();
+        SkASSERT(atlas && SkIsPow2(atlas->width()) && SkIsPow2(atlas->height()));
+        SkScalar recipWidth = 1.0f / atlas->width();
+        SkScalar recipHeight = 1.0f / atlas->height();
+
+        GrGLSLVertToFrag v(kVec2f_GrSLType);
+        varyingHandler->addVarying("TextureCoords", &v);
+        vertBuilder->codeAppendf("%s = vec2(%.*f, %.*f) * %s;", v.vsOut(),
+                                 GR_SIGNIFICANT_POW2_DECIMAL_DIG, recipWidth,
+                                 GR_SIGNIFICANT_POW2_DECIMAL_DIG, recipHeight,
+                                 cte.inTextureCoords()->fName);
+
+        GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+        // Setup pass through color
+        if (!cte.colorIgnored()) {
+            if (cte.hasVertexColor()) {
+                varyingHandler->addPassThroughAttribute(cte.inColor(), args.fOutputColor);
+            } else {
+                this->setupUniformColor(pb, fragBuilder, args.fOutputColor, &fColorUniform);
+            }
+        }
+
+        // Setup position
+        this->setupPosition(pb, vertBuilder, gpArgs, cte.inPosition()->fName);
+
+        // emit transforms
+        this->emitTransforms(args.fPB,
+                             vertBuilder,
+                             varyingHandler,
+                             gpArgs->fPositionVar,
+                             cte.inPosition()->fName,
+                             cte.localMatrix(),
+                             args.fTransformsIn,
+                             args.fTransformsOut);
+
+        if (cte.maskFormat() == kARGB_GrMaskFormat) {
+            fragBuilder->codeAppendf("%s = ", args.fOutputColor);
+            fragBuilder->appendTextureLookupAndModulate(args.fOutputColor,
+                                                        args.fSamplers[0],
+                                                        v.fsIn(),
+                                                        kVec2f_GrSLType);
+            fragBuilder->codeAppend(";");
+            fragBuilder->codeAppendf("%s = vec4(1);", args.fOutputCoverage);
+        } else {
+            fragBuilder->codeAppendf("%s = ", args.fOutputCoverage);
+            fragBuilder->appendTextureLookup(args.fSamplers[0], v.fsIn(), kVec2f_GrSLType);
+            fragBuilder->codeAppend(";");
+            if (cte.maskFormat() == kA565_GrMaskFormat) {
+                // set alpha to be max of rgb coverage
+                fragBuilder->codeAppendf("%s.a = max(max(%s.r, %s.g), %s.b);",
+                                         args.fOutputCoverage, args.fOutputCoverage,
+                                         args.fOutputCoverage, args.fOutputCoverage);
+            }
+        }
+    }
+
+    void setData(const GrGLSLProgramDataManager& pdman, const GrPrimitiveProcessor& gp) override {
+        const GrBitmapTextGeoProc& btgp = gp.cast<GrBitmapTextGeoProc>();
+        if (btgp.color() != fColor && !btgp.hasVertexColor()) {
+            float c[4];
+            GrColorToRGBAFloat(btgp.color(), c);
+            pdman.set4fv(fColorUniform, 1, c);
+            fColor = btgp.color();
+        }
+    }
+
+    void setTransformData(const GrPrimitiveProcessor& primProc,
+                          const GrGLSLProgramDataManager& pdman,
+                          int index,
+                          const SkTArray<const GrCoordTransform*, true>& transforms) override {
+        this->setTransformDataHelper<GrBitmapTextGeoProc>(primProc, pdman, index, transforms);
+    }
+
+    static inline void GenKey(const GrGeometryProcessor& proc,
+                              const GrGLSLCaps&,
+                              GrProcessorKeyBuilder* b) {
+        const GrBitmapTextGeoProc& gp = proc.cast<GrBitmapTextGeoProc>();
+        uint32_t key = 0;
+        key |= gp.usesLocalCoords() && gp.localMatrix().hasPerspective() ? 0x1 : 0x0;
+        key |= gp.colorIgnored() ? 0x2 : 0x0;
+        key |= gp.maskFormat() << 3;
+        b->add32(key);
+
+        // Currently we hardcode numbers to convert atlas coordinates to normalized floating point
+        SkASSERT(gp.numTextures() == 1);
+        GrTexture* atlas = gp.textureAccess(0).getTexture();
+        SkASSERT(atlas);
+        b->add32(atlas->width());
+        b->add32(atlas->height());
+    }
+
+private:
+    GrColor fColor;
+    UniformHandle fColorUniform;
+
+    typedef GrGLSLGeometryProcessor INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+GrBitmapTextGeoProc::GrBitmapTextGeoProc(GrColor color, GrTexture* texture,
+                                         const GrTextureParams& params, GrMaskFormat format,
+                                         const SkMatrix& localMatrix, bool usesLocalCoords)
+    : fColor(color)
+    , fLocalMatrix(localMatrix)
+    , fUsesLocalCoords(usesLocalCoords)
+    , fTextureAccess(texture, params)
+    , fInColor(nullptr)
+    , fMaskFormat(format) {
+    this->initClassID<GrBitmapTextGeoProc>();
+    fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType));
+
+    // TODO we could think about removing this attribute if color is ignored, but unfortunately
+    // we don't do text positioning in batch, so we can't quite do that yet.
+    bool hasVertexColor = kA8_GrMaskFormat == fMaskFormat;
+    if (hasVertexColor) {
+        fInColor = &this->addVertexAttrib(Attribute("inColor", kVec4ub_GrVertexAttribType));
+    }
+    fInTextureCoords = &this->addVertexAttrib(Attribute("inTextureCoords",
+                                                        kVec2s_GrVertexAttribType));
+    this->addTextureAccess(&fTextureAccess);
+}
+
+void GrBitmapTextGeoProc::getGLSLProcessorKey(const GrGLSLCaps& caps,
+                                              GrProcessorKeyBuilder* b) const {
+    GrGLBitmapTextGeoProc::GenKey(*this, caps, b);
+}
+
+GrGLSLPrimitiveProcessor* GrBitmapTextGeoProc::createGLSLInstance(const GrGLSLCaps& caps) const {
+    return new GrGLBitmapTextGeoProc();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+GR_DEFINE_GEOMETRY_PROCESSOR_TEST(GrBitmapTextGeoProc);
+
+const GrGeometryProcessor* GrBitmapTextGeoProc::TestCreate(GrProcessorTestData* d) {
+    int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :
+                                          GrProcessorUnitTest::kAlphaTextureIdx;
+    static const SkShader::TileMode kTileModes[] = {
+        SkShader::kClamp_TileMode,
+        SkShader::kRepeat_TileMode,
+        SkShader::kMirror_TileMode,
+    };
+    SkShader::TileMode tileModes[] = {
+        kTileModes[d->fRandom->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
+        kTileModes[d->fRandom->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
+    };
+    GrTextureParams params(tileModes, d->fRandom->nextBool() ? GrTextureParams::kBilerp_FilterMode :
+                                                           GrTextureParams::kNone_FilterMode);
+
+    GrMaskFormat format;
+    switch (d->fRandom->nextULessThan(3)) {
+        case 0:
+            format = kA8_GrMaskFormat;
+            break;
+        case 1:
+            format = kA565_GrMaskFormat;
+            break;
+        case 2:
+            format = kARGB_GrMaskFormat;
+            break;
+    }
+
+    return GrBitmapTextGeoProc::Create(GrRandomColor(d->fRandom), d->fTextures[texIdx], params,
+                                       format, GrTest::TestMatrix(d->fRandom),
+                                       d->fRandom->nextBool());
+}
diff --git a/gfx/skia/skia/src/gpu/effects/GrBitmapTextGeoProc.h b/gfx/skia/skia/src/gpu/effects/GrBitmapTextGeoProc.h
new file mode 100644
index 000000000000..5501d938f560
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/effects/GrBitmapTextGeoProc.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrBitmapTextGeoProc_DEFINED
+#define GrBitmapTextGeoProc_DEFINED
+
+#include "GrProcessor.h"
+#include "GrGeometryProcessor.h"
+
+class GrGLBitmapTextGeoProc;
+class GrInvariantOutput;
+
+/**
+ * The output color of this effect is a modulation of the input color and a sample from a texture.
+ * It allows explicit specification of the filtering and wrap modes (GrTextureParams). The input
+ * coords are a custom attribute.
+ */
+class GrBitmapTextGeoProc : public GrGeometryProcessor {
+public:
+    static GrGeometryProcessor* Create(GrColor color, GrTexture* tex, const GrTextureParams& p,
+                                       GrMaskFormat format, const SkMatrix& localMatrix,
+                                       bool usesLocalCoords) {
+        return new GrBitmapTextGeoProc(color, tex, p, format, localMatrix, usesLocalCoords);
+    }
+
+    virtual ~GrBitmapTextGeoProc() {}
+
+    const char* name() const override { return "Texture"; }
+
+    const Attribute* inPosition() const { return fInPosition; }
+    const Attribute* inColor() const { return fInColor; }
+    const Attribute* inTextureCoords() const { return fInTextureCoords; }
+    GrMaskFormat maskFormat() const { return fMaskFormat; }
+    GrColor color() const { return fColor; }
+    bool colorIgnored() const { return GrColor_ILLEGAL == fColor; }
+    bool hasVertexColor() const { return SkToBool(fInColor); }
+    const SkMatrix& localMatrix() const { return fLocalMatrix; }
+    bool usesLocalCoords() const { return fUsesLocalCoords; }
+
+    void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
+
+    GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps& caps) const override;
+
+private:
+    GrBitmapTextGeoProc(GrColor, GrTexture* texture, const GrTextureParams& params,
+                        GrMaskFormat format, const SkMatrix& localMatrix, bool usesLocalCoords);
+
+    GrColor          fColor;
+    SkMatrix         fLocalMatrix;
+    bool             fUsesLocalCoords;
+    GrTextureAccess  fTextureAccess;
+    const Attribute* fInPosition;
+    const Attribute* fInColor;
+    const Attribute* fInTextureCoords;
+    GrMaskFormat     fMaskFormat;
+
+    GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
+
+    typedef GrGeometryProcessor INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/effects/GrConfigConversionEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrConfigConversionEffect.cpp
index 07529d04ff38..4df894b40a64 100644
--- a/gfx/skia/skia/src/gpu/effects/GrConfigConversionEffect.cpp
+++ b/gfx/skia/skia/src/gpu/effects/GrConfigConversionEffect.cpp
@@ -7,73 +7,82 @@
 
 #include "GrConfigConversionEffect.h"
 #include "GrContext.h"
-#include "GrTBackendEffectFactory.h"
+#include "GrDrawContext.h"
+#include "GrInvariantOutput.h"
 #include "GrSimpleTextureEffect.h"
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
 #include "SkMatrix.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
 
-class GrGLConfigConversionEffect : public GrGLEffect {
+class GrGLConfigConversionEffect : public GrGLSLFragmentProcessor {
 public:
-    GrGLConfigConversionEffect(const GrBackendEffectFactory& factory,
-                               const GrDrawEffect& drawEffect)
-    : INHERITED (factory) {
-        const GrConfigConversionEffect& effect = drawEffect.castEffect<GrConfigConversionEffect>();
-        fSwapRedAndBlue = effect.swapsRedAndBlue();
-        fPMConversion = effect.pmConversion();
+    GrGLConfigConversionEffect(const GrProcessor& processor) {
+        const GrConfigConversionEffect& configConversionEffect =
+                processor.cast<GrConfigConversionEffect>();
+        fSwapRedAndBlue = configConversionEffect.swapsRedAndBlue();
+        fPMConversion = configConversionEffect.pmConversion();
     }
 
-    virtual void emitCode(GrGLShaderBuilder* builder,
-                          const GrDrawEffect&,
-                          const GrEffectKey& key,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray& coords,
-                          const TextureSamplerArray& samplers) SK_OVERRIDE {
-        builder->fsCodeAppendf("\t\t%s = ", outputColor);
-        builder->fsAppendTextureLookup(samplers[0], coords[0].c_str(), coords[0].type());
-        builder->fsCodeAppend(";\n");
+    virtual void emitCode(EmitArgs& args) override {
+        // Using highp for GLES here in order to avoid some precision issues on specific GPUs.
+        GrGLSLShaderVar tmpVar("tmpColor", kVec4f_GrSLType, 0, kHigh_GrSLPrecision);
+        SkString tmpDecl;
+        tmpVar.appendDecl(args.fGLSLCaps, &tmpDecl);
+
+        GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+
+        fragBuilder->codeAppendf("%s;", tmpDecl.c_str());
+
+        fragBuilder->codeAppendf("%s = ", tmpVar.c_str());
+        fragBuilder->appendTextureLookup(args.fSamplers[0], args.fCoords[0].c_str(),
+                                       args.fCoords[0].getType());
+        fragBuilder->codeAppend(";");
+
         if (GrConfigConversionEffect::kNone_PMConversion == fPMConversion) {
             SkASSERT(fSwapRedAndBlue);
-            builder->fsCodeAppendf("\t%s = %s.bgra;\n", outputColor, outputColor);
+            fragBuilder->codeAppendf("%s = %s.bgra;", args.fOutputColor, tmpVar.c_str());
         } else {
             const char* swiz = fSwapRedAndBlue ? "bgr" : "rgb";
             switch (fPMConversion) {
                 case GrConfigConversionEffect::kMulByAlpha_RoundUp_PMConversion:
-                    builder->fsCodeAppendf(
-                        "\t\t%s = vec4(ceil(%s.%s * %s.a * 255.0) / 255.0, %s.a);\n",
-                        outputColor, outputColor, swiz, outputColor, outputColor);
+                    fragBuilder->codeAppendf(
+                        "%s = vec4(ceil(%s.%s * %s.a * 255.0) / 255.0, %s.a);",
+                        tmpVar.c_str(), tmpVar.c_str(), swiz, tmpVar.c_str(), tmpVar.c_str());
                     break;
                 case GrConfigConversionEffect::kMulByAlpha_RoundDown_PMConversion:
                     // Add a compensation(0.001) here to avoid the side effect of the floor operation.
                     // In Intel GPUs, the integer value converted from floor(%s.r * 255.0) / 255.0
                     // is less than the integer value converted from  %s.r by 1 when the %s.r is
                     // converted from the integer value 2^n, such as 1, 2, 4, 8, etc.
-                    builder->fsCodeAppendf(
-                        "\t\t%s = vec4(floor(%s.%s * %s.a * 255.0 + 0.001) / 255.0, %s.a);\n",
-                        outputColor, outputColor, swiz, outputColor, outputColor);
+                    fragBuilder->codeAppendf(
+                        "%s = vec4(floor(%s.%s * %s.a * 255.0 + 0.001) / 255.0, %s.a);",
+                        tmpVar.c_str(), tmpVar.c_str(), swiz, tmpVar.c_str(), tmpVar.c_str());
                     break;
                 case GrConfigConversionEffect::kDivByAlpha_RoundUp_PMConversion:
-                    builder->fsCodeAppendf("\t\t%s = %s.a <= 0.0 ? vec4(0,0,0,0) : vec4(ceil(%s.%s / %s.a * 255.0) / 255.0, %s.a);\n",
-                        outputColor, outputColor, outputColor, swiz, outputColor, outputColor);
+                    fragBuilder->codeAppendf(
+                        "%s = %s.a <= 0.0 ? vec4(0,0,0,0) : vec4(ceil(%s.%s / %s.a * 255.0) / 255.0, %s.a);",
+                        tmpVar.c_str(), tmpVar.c_str(), tmpVar.c_str(), swiz, tmpVar.c_str(), tmpVar.c_str());
                     break;
                 case GrConfigConversionEffect::kDivByAlpha_RoundDown_PMConversion:
-                    builder->fsCodeAppendf("\t\t%s = %s.a <= 0.0 ? vec4(0,0,0,0) : vec4(floor(%s.%s / %s.a * 255.0) / 255.0, %s.a);\n",
-                        outputColor, outputColor, outputColor, swiz, outputColor, outputColor);
+                    fragBuilder->codeAppendf(
+                        "%s = %s.a <= 0.0 ? vec4(0,0,0,0) : vec4(floor(%s.%s / %s.a * 255.0) / 255.0, %s.a);",
+                        tmpVar.c_str(), tmpVar.c_str(), tmpVar.c_str(), swiz, tmpVar.c_str(), tmpVar.c_str());
                     break;
                 default:
                     SkFAIL("Unknown conversion op.");
                     break;
             }
+            fragBuilder->codeAppendf("%s = %s;", args.fOutputColor, tmpVar.c_str());
         }
         SkString modulate;
-        GrGLSLMulVarBy4f(&modulate, 2, outputColor, inputColor);
-        builder->fsCodeAppend(modulate.c_str());
+        GrGLSLMulVarBy4f(&modulate, args.fOutputColor, args.fInputColor);
+        fragBuilder->codeAppend(modulate.c_str());
     }
 
-    static inline void GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
-                              GrEffectKeyBuilder* b) {
-        const GrConfigConversionEffect& conv = drawEffect.castEffect<GrConfigConversionEffect>();
+    static inline void GenKey(const GrProcessor& processor, const GrGLSLCaps&,
+                              GrProcessorKeyBuilder* b) {
+        const GrConfigConversionEffect& conv = processor.cast<GrConfigConversionEffect>();
         uint32_t key = (conv.swapsRedAndBlue() ? 0 : 1) | (conv.pmConversion() << 1);
         b->add32(key);
     }
@@ -82,7 +91,7 @@ private:
     bool                                    fSwapRedAndBlue;
     GrConfigConversionEffect::PMConversion  fPMConversion;
 
-    typedef GrGLEffect INHERITED;
+    typedef GrGLSLFragmentProcessor INHERITED;
 
 };
 
@@ -92,54 +101,58 @@ GrConfigConversionEffect::GrConfigConversionEffect(GrTexture* texture,
                                                    bool swapRedAndBlue,
                                                    PMConversion pmConversion,
                                                    const SkMatrix& matrix)
-    : GrSingleTextureEffect(texture, matrix)
+    : INHERITED(texture, matrix)
     , fSwapRedAndBlue(swapRedAndBlue)
     , fPMConversion(pmConversion) {
-    SkASSERT(kRGBA_8888_GrPixelConfig == texture->config() ||
-             kBGRA_8888_GrPixelConfig == texture->config());
+    this->initClassID<GrConfigConversionEffect>();
+    // We expect to get here with non-BGRA/RGBA only if we're doing not doing a premul/unpremul
+    // conversion.
+    SkASSERT((kRGBA_8888_GrPixelConfig == texture->config() ||
+              kBGRA_8888_GrPixelConfig == texture->config()) ||
+              kNone_PMConversion == pmConversion);
     // Why did we pollute our texture cache instead of using a GrSingleTextureEffect?
     SkASSERT(swapRedAndBlue || kNone_PMConversion != pmConversion);
 }
 
-const GrBackendEffectFactory& GrConfigConversionEffect::getFactory() const {
-    return GrTBackendEffectFactory<GrConfigConversionEffect>::getInstance();
-}
-
-bool GrConfigConversionEffect::onIsEqual(const GrEffect& s) const {
-    const GrConfigConversionEffect& other = CastEffect<GrConfigConversionEffect>(s);
-    return this->texture(0) == s.texture(0) &&
-           other.fSwapRedAndBlue == fSwapRedAndBlue &&
+bool GrConfigConversionEffect::onIsEqual(const GrFragmentProcessor& s) const {
+    const GrConfigConversionEffect& other = s.cast<GrConfigConversionEffect>();
+    return other.fSwapRedAndBlue == fSwapRedAndBlue &&
            other.fPMConversion == fPMConversion;
 }
 
-void GrConfigConversionEffect::getConstantColorComponents(GrColor* color,
-                                                          uint32_t* validFlags) const {
-    this->updateConstantColorComponentsForModulation(color, validFlags);
+void GrConfigConversionEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const {
+    this->updateInvariantOutputForModulation(inout);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-GR_DEFINE_EFFECT_TEST(GrConfigConversionEffect);
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrConfigConversionEffect);
 
-GrEffect* GrConfigConversionEffect::TestCreate(SkRandom* random,
-                                               GrContext*,
-                                               const GrDrawTargetCaps&,
-                                               GrTexture* textures[]) {
-    PMConversion pmConv = static_cast<PMConversion>(random->nextULessThan(kPMConversionCnt));
+const GrFragmentProcessor* GrConfigConversionEffect::TestCreate(GrProcessorTestData* d) {
+    PMConversion pmConv = static_cast<PMConversion>(d->fRandom->nextULessThan(kPMConversionCnt));
     bool swapRB;
     if (kNone_PMConversion == pmConv) {
         swapRB = true;
     } else {
-        swapRB = random->nextBool();
+        swapRB = d->fRandom->nextBool();
     }
-    return SkNEW_ARGS(GrConfigConversionEffect,
-                                      (textures[GrEffectUnitTest::kSkiaPMTextureIdx],
-                                       swapRB,
-                                       pmConv,
-                                       GrEffectUnitTest::TestMatrix(random)));
+    return new GrConfigConversionEffect(d->fTextures[GrProcessorUnitTest::kSkiaPMTextureIdx],
+                                        swapRB, pmConv, GrTest::TestMatrix(d->fRandom));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
+
+void GrConfigConversionEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                                     GrProcessorKeyBuilder* b) const {
+    GrGLConfigConversionEffect::GenKey(*this, caps, b);
+}
+
+GrGLSLFragmentProcessor* GrConfigConversionEffect::onCreateGLSLInstance() const {
+    return new GrGLConfigConversionEffect(*this);
+}
+
+
+
 void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context,
                                                               PMConversion* pmToUPMRule,
                                                               PMConversion* upmToPMRule) {
@@ -162,23 +175,22 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context
         }
     }
 
-    GrTextureDesc desc;
-    desc.fFlags = kRenderTarget_GrTextureFlagBit |
-                  kNoStencil_GrTextureFlagBit;
+    GrSurfaceDesc desc;
+    desc.fFlags = kRenderTarget_GrSurfaceFlag;
     desc.fWidth = 256;
     desc.fHeight = 256;
     desc.fConfig = kRGBA_8888_GrPixelConfig;
 
-    SkAutoTUnref<GrTexture> readTex(context->createUncachedTexture(desc, NULL, 0));
+    SkAutoTUnref<GrTexture> readTex(context->textureProvider()->createTexture(desc, true, nullptr, 0));
     if (!readTex.get()) {
         return;
     }
-    SkAutoTUnref<GrTexture> tempTex(context->createUncachedTexture(desc, NULL, 0));
+    SkAutoTUnref<GrTexture> tempTex(context->textureProvider()->createTexture(desc, true, nullptr, 0));
     if (!tempTex.get()) {
         return;
     }
-    desc.fFlags = kNone_GrTextureFlags;
-    SkAutoTUnref<GrTexture> dataTex(context->createUncachedTexture(desc, data, 0));
+    desc.fFlags = kNone_GrSurfaceFlags;
+    SkAutoTUnref<GrTexture> dataTex(context->textureProvider()->createTexture(desc, true, data, 0));
     if (!dataTex.get()) {
         return;
     }
@@ -188,8 +200,6 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context
         {kDivByAlpha_RoundUp_PMConversion, kMulByAlpha_RoundDown_PMConversion},
     };
 
-    GrContext::AutoWideOpenIdentityDraw awoid(context, NULL);
-
     bool failed = true;
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(kConversionRules) && failed; ++i) {
@@ -202,35 +212,64 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context
         // from readTex to tempTex followed by a PM->UPM draw to readTex and finally read the data.
         // We then verify that two reads produced the same values.
 
-        SkAutoTUnref<GrEffect> pmToUPM1(SkNEW_ARGS(GrConfigConversionEffect, (dataTex,
-                                                                              false,
-                                                                              *pmToUPMRule,
-                                                                              SkMatrix::I())));
-        SkAutoTUnref<GrEffect> upmToPM(SkNEW_ARGS(GrConfigConversionEffect, (readTex,
-                                                                             false,
-                                                                             *upmToPMRule,
-                                                                             SkMatrix::I())));
-        SkAutoTUnref<GrEffect> pmToUPM2(SkNEW_ARGS(GrConfigConversionEffect, (tempTex,
-                                                                              false,
-                                                                              *pmToUPMRule,
-                                                                              SkMatrix::I())));
-
-        context->setRenderTarget(readTex->asRenderTarget());
         GrPaint paint1;
-        paint1.addColorEffect(pmToUPM1);
-        context->drawRectToRect(paint1, kDstRect, kSrcRect);
+        GrPaint paint2;
+        GrPaint paint3;
+        SkAutoTUnref<GrFragmentProcessor> pmToUPM1(new GrConfigConversionEffect(
+                dataTex, false, *pmToUPMRule, SkMatrix::I()));
+        SkAutoTUnref<GrFragmentProcessor> upmToPM(new GrConfigConversionEffect(
+                readTex, false, *upmToPMRule, SkMatrix::I()));
+        SkAutoTUnref<GrFragmentProcessor> pmToUPM2(new GrConfigConversionEffect(
+                tempTex, false, *pmToUPMRule, SkMatrix::I()));
+
+        paint1.addColorFragmentProcessor(pmToUPM1);
+        paint1.setPorterDuffXPFactory(SkXfermode::kSrc_Mode);
+
+
+        SkAutoTUnref<GrDrawContext> readDrawContext(
+                                    context->drawContext(readTex->asRenderTarget()));
+        if (!readDrawContext) {
+            failed = true;
+            break;
+        }
+
+        readDrawContext->fillRectToRect(GrClip::WideOpen(),
+                                        paint1,
+                                        SkMatrix::I(),
+                                        kDstRect,
+                                        kSrcRect);
 
         readTex->readPixels(0, 0, 256, 256, kRGBA_8888_GrPixelConfig, firstRead);
 
-        context->setRenderTarget(tempTex->asRenderTarget());
-        GrPaint paint2;
-        paint2.addColorEffect(upmToPM);
-        context->drawRectToRect(paint2, kDstRect, kSrcRect);
-        context->setRenderTarget(readTex->asRenderTarget());
+        paint2.addColorFragmentProcessor(upmToPM);
+        paint2.setPorterDuffXPFactory(SkXfermode::kSrc_Mode);
 
-        GrPaint paint3;
-        paint3.addColorEffect(pmToUPM2);
-        context->drawRectToRect(paint3, kDstRect, kSrcRect);
+        SkAutoTUnref<GrDrawContext> tempDrawContext(
+                                    context->drawContext(tempTex->asRenderTarget()));
+        if (!tempDrawContext) {
+            failed = true;
+            break;
+        }
+        tempDrawContext->fillRectToRect(GrClip::WideOpen(),
+                                        paint2,
+                                        SkMatrix::I(),
+                                        kDstRect,
+                                        kSrcRect);
+
+        paint3.addColorFragmentProcessor(pmToUPM2);
+        paint3.setPorterDuffXPFactory(SkXfermode::kSrc_Mode);
+
+        readDrawContext.reset(context->drawContext(readTex->asRenderTarget()));
+        if (!readDrawContext) {
+            failed = true;
+            break;
+        }
+
+        readDrawContext->fillRectToRect(GrClip::WideOpen(),
+                                        paint3,
+                                        SkMatrix::I(),
+                                        kDstRect,
+                                        kSrcRect);
 
         readTex->readPixels(0, 0, 256, 256, kRGBA_8888_GrPixelConfig, secondRead);
 
@@ -250,10 +289,10 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context
     }
 }
 
-const GrEffect* GrConfigConversionEffect::Create(GrTexture* texture,
-                                                 bool swapRedAndBlue,
-                                                 PMConversion pmConversion,
-                                                 const SkMatrix& matrix) {
+const GrFragmentProcessor* GrConfigConversionEffect::Create(GrTexture* texture,
+                                                            bool swapRedAndBlue,
+                                                            PMConversion pmConversion,
+                                                            const SkMatrix& matrix) {
     if (!swapRedAndBlue && kNone_PMConversion == pmConversion) {
         // If we returned a GrConfigConversionEffect that was equivalent to a GrSimpleTextureEffect
         // then we may pollute our texture cache with redundant shaders. So in the case that no
@@ -264,11 +303,8 @@ const GrEffect* GrConfigConversionEffect::Create(GrTexture* texture,
             kBGRA_8888_GrPixelConfig != texture->config() &&
             kNone_PMConversion != pmConversion) {
             // The PM conversions assume colors are 0..255
-            return NULL;
+            return nullptr;
         }
-        return SkNEW_ARGS(GrConfigConversionEffect, (texture,
-                                                     swapRedAndBlue,
-                                                     pmConversion,
-                                                     matrix));
+        return new GrConfigConversionEffect(texture, swapRedAndBlue, pmConversion, matrix);
     }
 }
diff --git a/gfx/skia/skia/src/gpu/effects/GrConfigConversionEffect.h b/gfx/skia/skia/src/gpu/effects/GrConfigConversionEffect.h
index 4416d054523b..56beef97b192 100644
--- a/gfx/skia/skia/src/gpu/effects/GrConfigConversionEffect.h
+++ b/gfx/skia/skia/src/gpu/effects/GrConfigConversionEffect.h
@@ -10,8 +10,7 @@
 
 #include "GrSingleTextureEffect.h"
 
-class GrEffectStage;
-class GrGLConfigConversionEffect;
+class GrInvariantOutput;
 
 /**
  * This class is used to perform config conversions. Clients may want to read/write data that is
@@ -34,18 +33,10 @@ public:
         kPMConversionCnt
     };
 
-    // Installs an effect in the GrEffectStage to perform a config conversion.
-    static const GrEffect* Create(GrTexture*,
-                                  bool swapRedAndBlue,
-                                  PMConversion pmConversion,
-                                  const SkMatrix& matrix);
+    static const GrFragmentProcessor* Create(GrTexture*, bool swapRedAndBlue, PMConversion,
+                                             const SkMatrix&);
 
-    static const char* Name() { return "Config Conversion"; }
-    typedef GrGLConfigConversionEffect GLEffect;
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
-
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
+    const char* name() const override { return "Config Conversion"; }
 
     bool swapsRedAndBlue() const { return fSwapRedAndBlue; }
     PMConversion  pmConversion() const { return fPMConversion; }
@@ -61,16 +52,22 @@ public:
 
 private:
     GrConfigConversionEffect(GrTexture*,
-                            bool swapRedAndBlue,
-                            PMConversion pmConversion,
-                            const SkMatrix& matrix);
+                             bool swapRedAndBlue,
+                             PMConversion pmConversion,
+                             const SkMatrix& matrix);
 
-    virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE;
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
+
+    bool onIsEqual(const GrFragmentProcessor&) const override;
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
 
     bool            fSwapRedAndBlue;
     PMConversion    fPMConversion;
 
-    GR_DECLARE_EFFECT_TEST;
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
 
     typedef GrSingleTextureEffect INHERITED;
 };
diff --git a/gfx/skia/skia/src/gpu/effects/GrConstColorProcessor.cpp b/gfx/skia/skia/src/gpu/effects/GrConstColorProcessor.cpp
new file mode 100644
index 000000000000..cf567aac5c4f
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/effects/GrConstColorProcessor.cpp
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "effects/GrConstColorProcessor.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+
+class GLConstColorProcessor : public GrGLSLFragmentProcessor {
+public:
+    GLConstColorProcessor() : fPrevColor(GrColor_ILLEGAL) {}
+
+    void emitCode(EmitArgs& args) override {
+        GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+        const char* colorUni;
+        fColorUniform = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                            kVec4f_GrSLType, kMedium_GrSLPrecision, "constantColor",
+                                            &colorUni);
+        GrConstColorProcessor::InputMode mode = args.fFp.cast<GrConstColorProcessor>().inputMode();
+        if (!args.fInputColor) {
+            mode = GrConstColorProcessor::kIgnore_InputMode;
+        }
+        switch (mode) {
+            case GrConstColorProcessor::kIgnore_InputMode:
+                fragBuilder->codeAppendf("%s = %s;", args.fOutputColor, colorUni);
+                break;
+            case GrConstColorProcessor::kModulateRGBA_InputMode:
+                fragBuilder->codeAppendf("%s = %s * %s;", args.fOutputColor, args.fInputColor,
+                                       colorUni);
+                break;
+            case GrConstColorProcessor::kModulateA_InputMode:
+                fragBuilder->codeAppendf("%s = %s.a * %s;", args.fOutputColor, args.fInputColor,
+                                       colorUni);
+                break;
+        }
+    }
+
+protected:
+    void onSetData(const GrGLSLProgramDataManager& pdm, const GrProcessor& processor) override {
+        GrColor color = processor.cast<GrConstColorProcessor>().color();
+        // We use the "illegal" color value as an uninit sentinel. However, ut isn't inherently
+        // illegal to use this processor with unpremul colors. So we correctly handle the case
+        // when the "illegal" color is used but we will always upload it.
+        if (GrColor_ILLEGAL == color || fPrevColor != color) {
+            static const float scale = 1.f / 255.f;
+            float floatColor[4] = {
+                GrColorUnpackR(color) * scale,
+                GrColorUnpackG(color) * scale,
+                GrColorUnpackB(color) * scale,
+                GrColorUnpackA(color) * scale,
+            };
+            pdm.set4fv(fColorUniform, 1, floatColor);
+            fPrevColor = color;
+        }
+    }
+
+private:
+    GrGLSLProgramDataManager::UniformHandle fColorUniform;
+    GrColor                               fPrevColor;
+
+    typedef GrGLSLFragmentProcessor INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+void GrConstColorProcessor::onComputeInvariantOutput(GrInvariantOutput* inout) const {
+    if (kIgnore_InputMode == fMode) {
+        inout->setToOther(kRGBA_GrColorComponentFlags, fColor,
+                          GrInvariantOutput::kWillNot_ReadInput);
+    } else {
+        GrColor r = GrColorUnpackR(fColor);
+        bool colorIsSingleChannel = r == GrColorUnpackG(fColor) && r == GrColorUnpackB(fColor) &&
+                                    r == GrColorUnpackA(fColor);
+        if (kModulateRGBA_InputMode == fMode) {
+            if (colorIsSingleChannel) {
+                inout->mulByKnownSingleComponent(r);
+            } else {
+                inout->mulByKnownFourComponents(fColor);
+            }
+        } else {
+            if (colorIsSingleChannel) {
+                inout->mulAlphaByKnownSingleComponent(r);
+            } else {
+                inout->mulAlphaByKnownFourComponents(fColor);
+            }
+        }
+    }
+}
+
+void GrConstColorProcessor::onGetGLSLProcessorKey(const GrGLSLCaps&,
+                                                  GrProcessorKeyBuilder* b) const {
+    b->add32(fMode);
+}
+
+GrGLSLFragmentProcessor* GrConstColorProcessor::onCreateGLSLInstance() const  {
+    return new GLConstColorProcessor;
+}
+
+bool GrConstColorProcessor::onIsEqual(const GrFragmentProcessor& other) const {
+    const GrConstColorProcessor& that = other.cast<GrConstColorProcessor>();
+    return fMode == that.fMode && fColor == that.fColor;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrConstColorProcessor);
+
+const GrFragmentProcessor* GrConstColorProcessor::TestCreate(GrProcessorTestData* d) {
+    GrColor color;
+    int colorPicker = d->fRandom->nextULessThan(3);
+    switch (colorPicker) {
+        case 0: {
+            uint32_t a = d->fRandom->nextULessThan(0x100);
+            uint32_t r = d->fRandom->nextULessThan(a+1);
+            uint32_t g = d->fRandom->nextULessThan(a+1);
+            uint32_t b = d->fRandom->nextULessThan(a+1);
+            color = GrColorPackRGBA(r, g, b, a);
+            break;
+        }
+        case 1:
+            color = 0;
+            break;
+        case 2:
+            color = d->fRandom->nextULessThan(0x100);
+            color = color | (color << 8) | (color << 16) | (color << 24);
+            break;
+    }
+    InputMode mode = static_cast<InputMode>(d->fRandom->nextULessThan(kInputModeCnt));
+    return GrConstColorProcessor::Create(color, mode);
+}
diff --git a/gfx/skia/skia/src/gpu/effects/GrConvexPolyEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrConvexPolyEffect.cpp
index 11109f7ed837..13df7bc4bd6f 100644
--- a/gfx/skia/skia/src/gpu/effects/GrConvexPolyEffect.cpp
+++ b/gfx/skia/skia/src/gpu/effects/GrConvexPolyEffect.cpp
@@ -6,287 +6,261 @@
  */
 
 #include "GrConvexPolyEffect.h"
-
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
-#include "gl/GrGLSL.h"
-#include "GrTBackendEffectFactory.h"
-
-#include "SkPath.h"
+#include "GrInvariantOutput.h"
+#include "SkPathPriv.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
 
 //////////////////////////////////////////////////////////////////////////////
-class GLAARectEffect;
-
-class AARectEffect : public GrEffect {
+class AARectEffect : public GrFragmentProcessor {
 public:
-    typedef GLAARectEffect GLEffect;
-
     const SkRect& getRect() const { return fRect; }
 
-    static const char* Name() { return "AARect"; }
-
-    static GrEffect* Create(GrEffectEdgeType edgeType, const SkRect& rect) {
-        return SkNEW_ARGS(AARectEffect, (edgeType, rect));
+    static GrFragmentProcessor* Create(GrPrimitiveEdgeType edgeType, const SkRect& rect) {
+        return new AARectEffect(edgeType, rect);
     }
 
-    virtual void getConstantColorComponents(GrColor* color,
-                                            uint32_t* validFlags) const SK_OVERRIDE {
-        if (fRect.isEmpty()) {
-            // An empty rect will have no coverage anywhere.
-            *color = 0x00000000;
-            *validFlags = kRGBA_GrColorComponentFlags;
-        } else {
-            *validFlags = 0;
-        }
-    }
+    GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
 
-    GrEffectEdgeType getEdgeType() const { return fEdgeType; }
+    const char* name() const override { return "AARect"; }
 
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
+    void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
 
 private:
-    AARectEffect(GrEffectEdgeType edgeType, const SkRect& rect) : fRect(rect), fEdgeType(edgeType) {
+    AARectEffect(GrPrimitiveEdgeType edgeType, const SkRect& rect)
+        : fRect(rect), fEdgeType(edgeType) {
+        this->initClassID<AARectEffect>();
         this->setWillReadFragmentPosition();
     }
 
-    virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE {
-        const AARectEffect& aare = CastEffect<AARectEffect>(other);
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
+
+    bool onIsEqual(const GrFragmentProcessor& other) const override {
+        const AARectEffect& aare = other.cast<AARectEffect>();
         return fRect == aare.fRect;
     }
 
-    SkRect fRect;
-    GrEffectEdgeType fEdgeType;
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override {
+        if (fRect.isEmpty()) {
+            // An empty rect will have no coverage anywhere.
+            inout->mulByKnownSingleComponent(0);
+        } else {
+            inout->mulByUnknownSingleComponent();
+        }
+    }
 
-    typedef GrEffect INHERITED;
+    SkRect              fRect;
+    GrPrimitiveEdgeType fEdgeType;
 
-    GR_DECLARE_EFFECT_TEST;
+    typedef GrFragmentProcessor INHERITED;
+
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
 
 };
 
-GR_DEFINE_EFFECT_TEST(AARectEffect);
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(AARectEffect);
 
-GrEffect* AARectEffect::TestCreate(SkRandom* random,
-                                   GrContext*,
-                                   const GrDrawTargetCaps& caps,
-                                   GrTexture*[]) {
-    SkRect rect = SkRect::MakeLTRB(random->nextSScalar1(),
-                                   random->nextSScalar1(),
-                                   random->nextSScalar1(),
-                                   random->nextSScalar1());
-    GrEffect* effect;
+const GrFragmentProcessor* AARectEffect::TestCreate(GrProcessorTestData* d) {
+    SkRect rect = SkRect::MakeLTRB(d->fRandom->nextSScalar1(),
+                                   d->fRandom->nextSScalar1(),
+                                   d->fRandom->nextSScalar1(),
+                                   d->fRandom->nextSScalar1());
+    GrFragmentProcessor* fp;
     do {
-        GrEffectEdgeType edgeType = static_cast<GrEffectEdgeType>(random->nextULessThan(
-                                                                    kGrEffectEdgeTypeCnt));
+        GrPrimitiveEdgeType edgeType = static_cast<GrPrimitiveEdgeType>(
+                d->fRandom->nextULessThan(kGrProcessorEdgeTypeCnt));
 
-        effect = AARectEffect::Create(edgeType, rect);
-    } while (NULL == effect);
-    return effect;
+        fp = AARectEffect::Create(edgeType, rect);
+    } while (nullptr == fp);
+    return fp;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-class GLAARectEffect : public GrGLEffect {
+class GLAARectEffect : public GrGLSLFragmentProcessor {
 public:
-    GLAARectEffect(const GrBackendEffectFactory&, const GrDrawEffect&);
+    GLAARectEffect(const GrProcessor&);
 
-    virtual void emitCode(GrGLShaderBuilder* builder,
-                          const GrDrawEffect& drawEffect,
-                          const GrEffectKey& key,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    virtual void emitCode(EmitArgs&) override;
 
-    static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*);
+    static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*);
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
 
 private:
-    GrGLUniformManager::UniformHandle   fRectUniform;
-    SkRect                              fPrevRect;
-    typedef GrGLEffect INHERITED;
+    GrGLSLProgramDataManager::UniformHandle fRectUniform;
+    SkRect                                fPrevRect;
+    typedef GrGLSLFragmentProcessor INHERITED;
 };
 
-GLAARectEffect::GLAARectEffect(const GrBackendEffectFactory& factory,
-                               const GrDrawEffect& drawEffect)
-    : INHERITED (factory) {
+GLAARectEffect::GLAARectEffect(const GrProcessor& effect) {
     fPrevRect.fLeft = SK_ScalarNaN;
 }
 
-void GLAARectEffect::emitCode(GrGLShaderBuilder* builder,
-                              const GrDrawEffect& drawEffect,
-                              const GrEffectKey& key,
-                              const char* outputColor,
-                              const char* inputColor,
-                              const TransformedCoordsArray&,
-                              const TextureSamplerArray& samplers) {
-    const AARectEffect& aare = drawEffect.castEffect<AARectEffect>();
+void GLAARectEffect::emitCode(EmitArgs& args) {
+    const AARectEffect& aare = args.fFp.cast<AARectEffect>();
     const char *rectName;
     // The rect uniform's xyzw refer to (left + 0.5, top + 0.5, right - 0.5, bottom - 0.5),
     // respectively.
-    fRectUniform = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
+    fRectUniform = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
                                        kVec4f_GrSLType,
+                                       kDefault_GrSLPrecision,
                                        "rect",
                                        &rectName);
-    const char* fragmentPos = builder->fragmentPosition();
-    if (GrEffectEdgeTypeIsAA(aare.getEdgeType())) {
+
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    const char* fragmentPos = fragBuilder->fragmentPosition();
+    if (GrProcessorEdgeTypeIsAA(aare.getEdgeType())) {
         // The amount of coverage removed in x and y by the edges is computed as a pair of negative
         // numbers, xSub and ySub.
-        builder->fsCodeAppend("\t\tfloat xSub, ySub;\n");
-        builder->fsCodeAppendf("\t\txSub = min(%s.x - %s.x, 0.0);\n", fragmentPos, rectName);
-        builder->fsCodeAppendf("\t\txSub += min(%s.z - %s.x, 0.0);\n", rectName, fragmentPos);
-        builder->fsCodeAppendf("\t\tySub = min(%s.y - %s.y, 0.0);\n", fragmentPos, rectName);
-        builder->fsCodeAppendf("\t\tySub += min(%s.w - %s.y, 0.0);\n", rectName, fragmentPos);
+        fragBuilder->codeAppend("\t\tfloat xSub, ySub;\n");
+        fragBuilder->codeAppendf("\t\txSub = min(%s.x - %s.x, 0.0);\n", fragmentPos, rectName);
+        fragBuilder->codeAppendf("\t\txSub += min(%s.z - %s.x, 0.0);\n", rectName, fragmentPos);
+        fragBuilder->codeAppendf("\t\tySub = min(%s.y - %s.y, 0.0);\n", fragmentPos, rectName);
+        fragBuilder->codeAppendf("\t\tySub += min(%s.w - %s.y, 0.0);\n", rectName, fragmentPos);
         // Now compute coverage in x and y and multiply them to get the fraction of the pixel
         // covered.
-        builder->fsCodeAppendf("\t\tfloat alpha = (1.0 + max(xSub, -1.0)) * (1.0 + max(ySub, -1.0));\n");
+        fragBuilder->codeAppendf("\t\tfloat alpha = (1.0 + max(xSub, -1.0)) * (1.0 + max(ySub, -1.0));\n");
     } else {
-        builder->fsCodeAppendf("\t\tfloat alpha = 1.0;\n");
-        builder->fsCodeAppendf("\t\talpha *= (%s.x - %s.x) > -0.5 ? 1.0 : 0.0;\n", fragmentPos, rectName);
-        builder->fsCodeAppendf("\t\talpha *= (%s.z - %s.x) > -0.5 ? 1.0 : 0.0;\n", rectName, fragmentPos);
-        builder->fsCodeAppendf("\t\talpha *= (%s.y - %s.y) > -0.5 ? 1.0 : 0.0;\n", fragmentPos, rectName);
-        builder->fsCodeAppendf("\t\talpha *= (%s.w - %s.y) > -0.5 ? 1.0 : 0.0;\n", rectName, fragmentPos);
+        fragBuilder->codeAppendf("\t\tfloat alpha = 1.0;\n");
+        fragBuilder->codeAppendf("\t\talpha *= (%s.x - %s.x) > -0.5 ? 1.0 : 0.0;\n", fragmentPos, rectName);
+        fragBuilder->codeAppendf("\t\talpha *= (%s.z - %s.x) > -0.5 ? 1.0 : 0.0;\n", rectName, fragmentPos);
+        fragBuilder->codeAppendf("\t\talpha *= (%s.y - %s.y) > -0.5 ? 1.0 : 0.0;\n", fragmentPos, rectName);
+        fragBuilder->codeAppendf("\t\talpha *= (%s.w - %s.y) > -0.5 ? 1.0 : 0.0;\n", rectName, fragmentPos);
     }
 
-    if (GrEffectEdgeTypeIsInverseFill(aare.getEdgeType())) {
-        builder->fsCodeAppend("\t\talpha = 1.0 - alpha;\n");
+    if (GrProcessorEdgeTypeIsInverseFill(aare.getEdgeType())) {
+        fragBuilder->codeAppend("\t\talpha = 1.0 - alpha;\n");
     }
-    builder->fsCodeAppendf("\t\t%s = %s;\n", outputColor,
-                           (GrGLSLExpr4(inputColor) * GrGLSLExpr1("alpha")).c_str());
+    fragBuilder->codeAppendf("\t\t%s = %s;\n", args.fOutputColor,
+                             (GrGLSLExpr4(args.fInputColor) * GrGLSLExpr1("alpha")).c_str());
 }
 
-void GLAARectEffect::setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) {
-    const AARectEffect& aare = drawEffect.castEffect<AARectEffect>();
+void GLAARectEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                               const GrProcessor& processor) {
+    const AARectEffect& aare = processor.cast<AARectEffect>();
     const SkRect& rect = aare.getRect();
     if (rect != fPrevRect) {
-        uman.set4f(fRectUniform, rect.fLeft + 0.5f, rect.fTop + 0.5f,
+        pdman.set4f(fRectUniform, rect.fLeft + 0.5f, rect.fTop + 0.5f,
                    rect.fRight - 0.5f, rect.fBottom - 0.5f);
         fPrevRect = rect;
     }
 }
 
-void GLAARectEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
-                            GrEffectKeyBuilder* b) {
-    const AARectEffect& aare = drawEffect.castEffect<AARectEffect>();
+void GLAARectEffect::GenKey(const GrProcessor& processor, const GrGLSLCaps&,
+                            GrProcessorKeyBuilder* b) {
+    const AARectEffect& aare = processor.cast<AARectEffect>();
     b->add32(aare.getEdgeType());
 }
 
-const GrBackendEffectFactory& AARectEffect::getFactory() const {
-    return GrTBackendEffectFactory<AARectEffect>::getInstance();
+void AARectEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const {
+    GLAARectEffect::GenKey(*this, caps, b);
+}
+
+GrGLSLFragmentProcessor* AARectEffect::onCreateGLSLInstance() const  {
+    return new GLAARectEffect(*this);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-class GrGLConvexPolyEffect : public GrGLEffect {
+class GrGLConvexPolyEffect : public GrGLSLFragmentProcessor {
 public:
-    GrGLConvexPolyEffect(const GrBackendEffectFactory&, const GrDrawEffect&);
+    GrGLConvexPolyEffect(const GrProcessor&);
 
-    virtual void emitCode(GrGLShaderBuilder* builder,
-                          const GrDrawEffect& drawEffect,
-                          const GrEffectKey& key,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    virtual void emitCode(EmitArgs&) override;
 
-    static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*);
+    static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*);
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
 
 private:
-    GrGLUniformManager::UniformHandle   fEdgeUniform;
-    SkScalar                            fPrevEdges[3 * GrConvexPolyEffect::kMaxEdges];
-    typedef GrGLEffect INHERITED;
+    GrGLSLProgramDataManager::UniformHandle fEdgeUniform;
+    SkScalar                              fPrevEdges[3 * GrConvexPolyEffect::kMaxEdges];
+    typedef GrGLSLFragmentProcessor INHERITED;
 };
 
-GrGLConvexPolyEffect::GrGLConvexPolyEffect(const GrBackendEffectFactory& factory,
-                                           const GrDrawEffect& drawEffect)
-    : INHERITED (factory) {
+GrGLConvexPolyEffect::GrGLConvexPolyEffect(const GrProcessor&) {
     fPrevEdges[0] = SK_ScalarNaN;
 }
 
-void GrGLConvexPolyEffect::emitCode(GrGLShaderBuilder* builder,
-                                    const GrDrawEffect& drawEffect,
-                                    const GrEffectKey& key,
-                                    const char* outputColor,
-                                    const char* inputColor,
-                                    const TransformedCoordsArray&,
-                                    const TextureSamplerArray& samplers) {
-    const GrConvexPolyEffect& cpe = drawEffect.castEffect<GrConvexPolyEffect>();
+void GrGLConvexPolyEffect::emitCode(EmitArgs& args) {
+    const GrConvexPolyEffect& cpe = args.fFp.cast<GrConvexPolyEffect>();
 
     const char *edgeArrayName;
-    fEdgeUniform = builder->addUniformArray(GrGLShaderBuilder::kFragment_Visibility,
+    fEdgeUniform = args.fBuilder->addUniformArray(GrGLSLProgramBuilder::kFragment_Visibility,
                                             kVec3f_GrSLType,
-                                            "edges",
+                                             kDefault_GrSLPrecision,
+                                             "edges",
                                             cpe.getEdgeCount(),
                                             &edgeArrayName);
-    builder->fsCodeAppend("\t\tfloat alpha = 1.0;\n");
-    builder->fsCodeAppend("\t\tfloat edge;\n");
-    const char* fragmentPos = builder->fragmentPosition();
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    fragBuilder->codeAppend("\t\tfloat alpha = 1.0;\n");
+    fragBuilder->codeAppend("\t\tfloat edge;\n");
+    const char* fragmentPos = fragBuilder->fragmentPosition();
     for (int i = 0; i < cpe.getEdgeCount(); ++i) {
-        builder->fsCodeAppendf("\t\tedge = dot(%s[%d], vec3(%s.x, %s.y, 1));\n",
-                               edgeArrayName, i, fragmentPos, fragmentPos);
-        if (GrEffectEdgeTypeIsAA(cpe.getEdgeType())) {
-            builder->fsCodeAppend("\t\tedge = clamp(edge, 0.0, 1.0);\n");
+        fragBuilder->codeAppendf("\t\tedge = dot(%s[%d], vec3(%s.x, %s.y, 1));\n",
+                                 edgeArrayName, i, fragmentPos, fragmentPos);
+        if (GrProcessorEdgeTypeIsAA(cpe.getEdgeType())) {
+            fragBuilder->codeAppend("\t\tedge = clamp(edge, 0.0, 1.0);\n");
         } else {
-            builder->fsCodeAppend("\t\tedge = edge >= 0.5 ? 1.0 : 0.0;\n");
+            fragBuilder->codeAppend("\t\tedge = edge >= 0.5 ? 1.0 : 0.0;\n");
         }
-        builder->fsCodeAppend("\t\talpha *= edge;\n");
+        fragBuilder->codeAppend("\t\talpha *= edge;\n");
     }
 
-    // Woe is me. See skbug.com/2149.
-    if (kTegra2_GrGLRenderer == builder->ctxInfo().renderer()) {
-        builder->fsCodeAppend("\t\tif (-1.0 == alpha) {\n\t\t\tdiscard;\n\t\t}\n");
+    if (GrProcessorEdgeTypeIsInverseFill(cpe.getEdgeType())) {
+        fragBuilder->codeAppend("\talpha = 1.0 - alpha;\n");
     }
-
-    if (GrEffectEdgeTypeIsInverseFill(cpe.getEdgeType())) {
-        builder->fsCodeAppend("\talpha = 1.0 - alpha;\n");
-    }
-    builder->fsCodeAppendf("\t%s = %s;\n", outputColor,
-                           (GrGLSLExpr4(inputColor) * GrGLSLExpr1("alpha")).c_str());
+    fragBuilder->codeAppendf("\t%s = %s;\n", args.fOutputColor,
+                             (GrGLSLExpr4(args.fInputColor) * GrGLSLExpr1("alpha")).c_str());
 }
 
-void GrGLConvexPolyEffect::setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) {
-    const GrConvexPolyEffect& cpe = drawEffect.castEffect<GrConvexPolyEffect>();
+void GrGLConvexPolyEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                                     const GrProcessor& effect) {
+    const GrConvexPolyEffect& cpe = effect.cast<GrConvexPolyEffect>();
     size_t byteSize = 3 * cpe.getEdgeCount() * sizeof(SkScalar);
     if (0 != memcmp(fPrevEdges, cpe.getEdges(), byteSize)) {
-        uman.set3fv(fEdgeUniform, cpe.getEdgeCount(), cpe.getEdges());
+        pdman.set3fv(fEdgeUniform, cpe.getEdgeCount(), cpe.getEdges());
         memcpy(fPrevEdges, cpe.getEdges(), byteSize);
     }
 }
 
-void GrGLConvexPolyEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
-                                  GrEffectKeyBuilder* b) {
-    const GrConvexPolyEffect& cpe = drawEffect.castEffect<GrConvexPolyEffect>();
-    GR_STATIC_ASSERT(kGrEffectEdgeTypeCnt <= 8);
+void GrGLConvexPolyEffect::GenKey(const GrProcessor& processor, const GrGLSLCaps&,
+                                  GrProcessorKeyBuilder* b) {
+    const GrConvexPolyEffect& cpe = processor.cast<GrConvexPolyEffect>();
+    GR_STATIC_ASSERT(kGrProcessorEdgeTypeCnt <= 8);
     uint32_t key = (cpe.getEdgeCount() << 3) | cpe.getEdgeType();
     b->add32(key);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-GrEffect* GrConvexPolyEffect::Create(GrEffectEdgeType type, const SkPath& path,
-                                     const SkVector* offset) {
-    if (kHairlineAA_GrEffectEdgeType == type) {
-        return NULL;
+GrFragmentProcessor* GrConvexPolyEffect::Create(GrPrimitiveEdgeType type, const SkPath& path,
+                                                const SkVector* offset) {
+    if (kHairlineAA_GrProcessorEdgeType == type) {
+        return nullptr;
     }
     if (path.getSegmentMasks() != SkPath::kLine_SegmentMask ||
         !path.isConvex()) {
-        return NULL;
+        return nullptr;
     }
 
     if (path.countPoints() > kMaxEdges) {
-        return NULL;
+        return nullptr;
     }
 
     SkPoint pts[kMaxEdges];
     SkScalar edges[3 * kMaxEdges];
 
-    SkPath::Direction dir;
-    SkAssertResult(path.cheapComputeDirection(&dir));
+    SkPathPriv::FirstDirection dir;
+    SkAssertResult(SkPathPriv::CheapComputeFirstDirection(path, &dir));
 
     SkVector t;
-    if (NULL == offset) {
+    if (nullptr == offset) {
         t.set(0, 0);
     } else {
         t = *offset;
@@ -298,7 +272,7 @@ GrEffect* GrConvexPolyEffect::Create(GrEffectEdgeType type, const SkPath& path,
         if (pts[lastPt] != pts[i]) {
             SkVector v = pts[i] - pts[lastPt];
             v.normalize();
-            if (SkPath::kCCW_Direction == dir) {
+            if (SkPathPriv::kCCW_FirstDirection == dir) {
                 edges[3 * n] = v.fY;
                 edges[3 * n + 1] = -v.fX;
             } else {
@@ -311,31 +285,37 @@ GrEffect* GrConvexPolyEffect::Create(GrEffectEdgeType type, const SkPath& path,
         }
     }
     if (path.isInverseFillType()) {
-        type = GrInvertEffectEdgeType(type);
+        type = GrInvertProcessorEdgeType(type);
     }
     return Create(type, n, edges);
 }
 
-GrEffect* GrConvexPolyEffect::Create(GrEffectEdgeType edgeType, const SkRect& rect) {
-    if (kHairlineAA_GrEffectEdgeType == edgeType){
-        return NULL;
+GrFragmentProcessor* GrConvexPolyEffect::Create(GrPrimitiveEdgeType edgeType, const SkRect& rect) {
+    if (kHairlineAA_GrProcessorEdgeType == edgeType){
+        return nullptr;
     }
     return AARectEffect::Create(edgeType, rect);
 }
 
 GrConvexPolyEffect::~GrConvexPolyEffect() {}
 
-void GrConvexPolyEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
-    *validFlags = 0;
+void GrConvexPolyEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const {
+    inout->mulByUnknownSingleComponent();
 }
 
-const GrBackendEffectFactory& GrConvexPolyEffect::getFactory() const {
-    return GrTBackendEffectFactory<GrConvexPolyEffect>::getInstance();
+void GrConvexPolyEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                               GrProcessorKeyBuilder* b) const {
+    GrGLConvexPolyEffect::GenKey(*this, caps, b);
 }
 
-GrConvexPolyEffect::GrConvexPolyEffect(GrEffectEdgeType edgeType, int n, const SkScalar edges[])
+GrGLSLFragmentProcessor* GrConvexPolyEffect::onCreateGLSLInstance() const  {
+    return new GrGLConvexPolyEffect(*this);
+}
+
+GrConvexPolyEffect::GrConvexPolyEffect(GrPrimitiveEdgeType edgeType, int n, const SkScalar edges[])
     : fEdgeType(edgeType)
     , fEdgeCount(n) {
+    this->initClassID<GrConvexPolyEffect>();
     // Factory function should have already ensured this.
     SkASSERT(n <= kMaxEdges);
     memcpy(fEdges, edges, 3 * n * sizeof(SkScalar));
@@ -347,8 +327,8 @@ GrConvexPolyEffect::GrConvexPolyEffect(GrEffectEdgeType edgeType, int n, const S
     this->setWillReadFragmentPosition();
 }
 
-bool GrConvexPolyEffect::onIsEqual(const GrEffect& other) const {
-    const GrConvexPolyEffect& cpe = CastEffect<GrConvexPolyEffect>(other);
+bool GrConvexPolyEffect::onIsEqual(const GrFragmentProcessor& other) const {
+    const GrConvexPolyEffect& cpe = other.cast<GrConvexPolyEffect>();
     // ignore the fact that 0 == -0 and just use memcmp.
     return (cpe.fEdgeType == fEdgeType && cpe.fEdgeCount == fEdgeCount &&
             0 == memcmp(cpe.fEdges, fEdges, 3 * fEdgeCount * sizeof(SkScalar)));
@@ -356,23 +336,20 @@ bool GrConvexPolyEffect::onIsEqual(const GrEffect& other) const {
 
 //////////////////////////////////////////////////////////////////////////////
 
-GR_DEFINE_EFFECT_TEST(GrConvexPolyEffect);
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrConvexPolyEffect);
 
-GrEffect* GrConvexPolyEffect::TestCreate(SkRandom* random,
-                                         GrContext*,
-                                         const GrDrawTargetCaps& caps,
-                                         GrTexture*[]) {
-    int count = random->nextULessThan(kMaxEdges) + 1;
+const GrFragmentProcessor* GrConvexPolyEffect::TestCreate(GrProcessorTestData* d) {
+    int count = d->fRandom->nextULessThan(kMaxEdges) + 1;
     SkScalar edges[kMaxEdges * 3];
     for (int i = 0; i < 3 * count; ++i) {
-        edges[i] = random->nextSScalar1();
+        edges[i] = d->fRandom->nextSScalar1();
     }
 
-    GrEffect* effect;
+    GrFragmentProcessor* fp;
     do {
-        GrEffectEdgeType edgeType = static_cast<GrEffectEdgeType>(
-                                        random->nextULessThan(kGrEffectEdgeTypeCnt));
-        effect = GrConvexPolyEffect::Create(edgeType, count, edges);
-    } while (NULL == effect);
-    return effect;
+        GrPrimitiveEdgeType edgeType = static_cast<GrPrimitiveEdgeType>(
+                d->fRandom->nextULessThan(kGrProcessorEdgeTypeCnt));
+        fp = GrConvexPolyEffect::Create(edgeType, count, edges);
+    } while (nullptr == fp);
+    return fp;
 }
diff --git a/gfx/skia/skia/src/gpu/effects/GrConvexPolyEffect.h b/gfx/skia/skia/src/gpu/effects/GrConvexPolyEffect.h
index 9164b3ecf24e..316f1117bbe1 100644
--- a/gfx/skia/skia/src/gpu/effects/GrConvexPolyEffect.h
+++ b/gfx/skia/skia/src/gpu/effects/GrConvexPolyEffect.h
@@ -8,11 +8,12 @@
 #ifndef GrConvexPolyEffect_DEFINED
 #define GrConvexPolyEffect_DEFINED
 
-#include "GrDrawTargetCaps.h"
-#include "GrEffect.h"
+#include "GrCaps.h"
+#include "GrFragmentProcessor.h"
+#include "GrProcessor.h"
 #include "GrTypesPriv.h"
 
-class GrGLConvexPolyEffect;
+class GrInvariantOutput;
 class SkPath;
 
 /**
@@ -20,7 +21,7 @@ class SkPath;
  * Bounding geometry is rendered and the effect computes coverage based on the fragment's
  * position relative to the polygon.
  */
-class GrConvexPolyEffect : public GrEffect {
+class GrConvexPolyEffect : public GrFragmentProcessor {
 public:
     enum {
         kMaxEdges = 8,
@@ -37,53 +38,55 @@ public:
      * have to modify the effect/shaderbuilder interface to make it possible (e.g. give access
      * to the view matrix or untransformed positions in the fragment shader).
      */
-    static GrEffect* Create(GrEffectEdgeType edgeType, int n, const SkScalar edges[]) {
-        if (n <= 0 || n > kMaxEdges || kHairlineAA_GrEffectEdgeType == edgeType) {
-            return NULL;
+    static GrFragmentProcessor* Create(GrPrimitiveEdgeType edgeType, int n,
+                                       const SkScalar edges[]) {
+        if (n <= 0 || n > kMaxEdges || kHairlineAA_GrProcessorEdgeType == edgeType) {
+            return nullptr;
         }
-        return SkNEW_ARGS(GrConvexPolyEffect, (edgeType, n, edges));
+        return new GrConvexPolyEffect(edgeType, n, edges);
     }
 
     /**
      * Creates an effect that clips against the path. If the path is not a convex polygon, is
-     * inverse filled, or has too many edges, this will return NULL. If offset is non-NULL, then
+     * inverse filled, or has too many edges, this will return nullptr. If offset is non-nullptr, then
      * the path is translated by the vector.
      */
-    static GrEffect* Create(GrEffectEdgeType, const SkPath&, const SkVector* offset = NULL);
+    static GrFragmentProcessor* Create(GrPrimitiveEdgeType, const SkPath&,
+                                       const SkVector* offset = nullptr);
 
     /**
      * Creates an effect that fills inside the rect with AA edges..
      */
-    static GrEffect* Create(GrEffectEdgeType, const SkRect&);
+    static GrFragmentProcessor* Create(GrPrimitiveEdgeType, const SkRect&);
 
     virtual ~GrConvexPolyEffect();
 
-    static const char* Name() { return "ConvexPoly"; }
+    const char* name() const override { return "ConvexPoly"; }
 
-    GrEffectEdgeType getEdgeType() const { return fEdgeType; }
+    GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
 
     int getEdgeCount() const { return fEdgeCount; }
 
     const SkScalar* getEdges() const { return fEdges; }
 
-    typedef GrGLConvexPolyEffect GLEffect;
-
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
-
 private:
-    GrConvexPolyEffect(GrEffectEdgeType edgeType, int n, const SkScalar edges[]);
+    GrConvexPolyEffect(GrPrimitiveEdgeType edgeType, int n, const SkScalar edges[]);
 
-    virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE;
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
 
-    GrEffectEdgeType    fEdgeType;
-    int                 fEdgeCount;
-    SkScalar            fEdges[3 * kMaxEdges];
+    void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
 
-    GR_DECLARE_EFFECT_TEST;
+    bool onIsEqual(const GrFragmentProcessor& other) const override;
 
-    typedef GrEffect INHERITED;
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
+
+    GrPrimitiveEdgeType    fEdgeType;
+    int                    fEdgeCount;
+    SkScalar               fEdges[3 * kMaxEdges];
+
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+
+    typedef GrFragmentProcessor INHERITED;
 };
 
 
diff --git a/gfx/skia/skia/src/gpu/effects/GrConvolutionEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrConvolutionEffect.cpp
index f20d1db99751..8e05f4789b7a 100644
--- a/gfx/skia/skia/src/gpu/effects/GrConvolutionEffect.cpp
+++ b/gfx/skia/skia/src/gpu/effects/GrConvolutionEffect.cpp
@@ -6,30 +6,24 @@
  */
 
 #include "GrConvolutionEffect.h"
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
-#include "gl/GrGLSL.h"
-#include "gl/GrGLTexture.h"
-#include "GrTBackendEffectFactory.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
 
 // For brevity
-typedef GrGLUniformManager::UniformHandle UniformHandle;
+typedef GrGLSLProgramDataManager::UniformHandle UniformHandle;
 
-class GrGLConvolutionEffect : public GrGLEffect {
+class GrGLConvolutionEffect : public GrGLSLFragmentProcessor {
 public:
-    GrGLConvolutionEffect(const GrBackendEffectFactory&, const GrDrawEffect&);
+    GrGLConvolutionEffect(const GrProcessor&);
 
-    virtual void emitCode(GrGLShaderBuilder*,
-                          const GrDrawEffect&,
-                          const GrEffectKey&,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    virtual void emitCode(EmitArgs&) override;
 
-    virtual void setData(const GrGLUniformManager& uman, const GrDrawEffect&) SK_OVERRIDE;
+    static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*);
 
-    static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*);
+protected:
+    void onSetData(const GrGLSLProgramDataManager& pdman, const GrProcessor&) override;
 
 private:
     int width() const { return Gr1DKernelEffect::WidthFromRadius(fRadius); }
@@ -43,42 +37,39 @@ private:
     UniformHandle       fImageIncrementUni;
     UniformHandle       fBoundsUni;
 
-    typedef GrGLEffect INHERITED;
+    typedef GrGLSLFragmentProcessor INHERITED;
 };
 
-GrGLConvolutionEffect::GrGLConvolutionEffect(const GrBackendEffectFactory& factory,
-                                             const GrDrawEffect& drawEffect)
-    : INHERITED(factory) {
-    const GrConvolutionEffect& c = drawEffect.castEffect<GrConvolutionEffect>();
+GrGLConvolutionEffect::GrGLConvolutionEffect(const GrProcessor& processor) {
+    const GrConvolutionEffect& c = processor.cast<GrConvolutionEffect>();
     fRadius = c.radius();
     fUseBounds = c.useBounds();
     fDirection = c.direction();
 }
 
-void GrGLConvolutionEffect::emitCode(GrGLShaderBuilder* builder,
-                                     const GrDrawEffect&,
-                                     const GrEffectKey& key,
-                                     const char* outputColor,
-                                     const char* inputColor,
-                                     const TransformedCoordsArray& coords,
-                                     const TextureSamplerArray& samplers) {
-    SkString coords2D = builder->ensureFSCoords2D(coords, 0);
-    fImageIncrementUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                             kVec2f_GrSLType, "ImageIncrement");
+void GrGLConvolutionEffect::emitCode(EmitArgs& args) {
+    fImageIncrementUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                             kVec2f_GrSLType, kDefault_GrSLPrecision,
+                                             "ImageIncrement");
     if (this->useBounds()) {
-        fBoundsUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                         kVec2f_GrSLType, "Bounds");
+        fBoundsUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                         kVec2f_GrSLType, kDefault_GrSLPrecision,
+                                         "Bounds");
     }
-    fKernelUni = builder->addUniformArray(GrGLShaderBuilder::kFragment_Visibility,
-                                          kFloat_GrSLType, "Kernel", this->width());
+    fKernelUni = args.fBuilder->addUniformArray(GrGLSLProgramBuilder::kFragment_Visibility,
+                                          kFloat_GrSLType, kDefault_GrSLPrecision,
+                                          "Kernel", this->width());
 
-    builder->fsCodeAppendf("\t\t%s = vec4(0, 0, 0, 0);\n", outputColor);
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    SkString coords2D = fragBuilder->ensureFSCoords2D(args.fCoords, 0);
+
+    fragBuilder->codeAppendf("\t\t%s = vec4(0, 0, 0, 0);\n", args.fOutputColor);
 
     int width = this->width();
-    const GrGLShaderVar& kernel = builder->getUniformVariable(fKernelUni);
-    const char* imgInc = builder->getUniformCStr(fImageIncrementUni);
+    const GrGLSLShaderVar& kernel = args.fBuilder->getUniformVariable(fKernelUni);
+    const char* imgInc = args.fBuilder->getUniformCStr(fImageIncrementUni);
 
-    builder->fsCodeAppendf("\t\tvec2 coord = %s - %d.0 * %s;\n", coords2D.c_str(), fRadius, imgInc);
+    fragBuilder->codeAppendf("\t\tvec2 coord = %s - %d.0 * %s;\n", coords2D.c_str(), fRadius, imgInc);
 
     // Manually unroll loop because some drivers don't; yields 20-30% speedup.
     for (int i = 0; i < width; i++) {
@@ -86,26 +77,33 @@ void GrGLConvolutionEffect::emitCode(GrGLShaderBuilder* builder,
         SkString kernelIndex;
         index.appendS32(i);
         kernel.appendArrayAccess(index.c_str(), &kernelIndex);
-        builder->fsCodeAppendf("\t\t%s += ", outputColor);
-        builder->fsAppendTextureLookup(samplers[0], "coord");
+
         if (this->useBounds()) {
-            const char* bounds = builder->getUniformCStr(fBoundsUni);
+            // We used to compute a bool indicating whether we're in bounds or not, cast it to a
+            // float, and then mul weight*texture_sample by the float. However, the Adreno 430 seems
+            // to have a bug that caused corruption.
+            const char* bounds = args.fBuilder->getUniformCStr(fBoundsUni);
             const char* component = this->direction() == Gr1DKernelEffect::kY_Direction ? "y" : "x";
-            builder->fsCodeAppendf(" * float(coord.%s >= %s.x && coord.%s <= %s.y)",
-                component, bounds, component, bounds);
+            fragBuilder->codeAppendf("if (coord.%s >= %s.x && coord.%s <= %s.y) {",
+                                     component, bounds, component, bounds);
         }
-        builder->fsCodeAppendf(" * %s;\n", kernelIndex.c_str());
-        builder->fsCodeAppendf("\t\tcoord += %s;\n", imgInc);
+        fragBuilder->codeAppendf("\t\t%s += ", args.fOutputColor);
+        fragBuilder->appendTextureLookup(args.fSamplers[0], "coord");
+        fragBuilder->codeAppendf(" * %s;\n", kernelIndex.c_str());
+        if (this->useBounds()) {
+            fragBuilder->codeAppend("}");
+        }
+        fragBuilder->codeAppendf("\t\tcoord += %s;\n", imgInc);
     }
 
     SkString modulate;
-    GrGLSLMulVarBy4f(&modulate, 2, outputColor, inputColor);
-    builder->fsCodeAppend(modulate.c_str());
+    GrGLSLMulVarBy4f(&modulate, args.fOutputColor, args.fInputColor);
+    fragBuilder->codeAppend(modulate.c_str());
 }
 
-void GrGLConvolutionEffect::setData(const GrGLUniformManager& uman,
-                                    const GrDrawEffect& drawEffect) {
-    const GrConvolutionEffect& conv = drawEffect.castEffect<GrConvolutionEffect>();
+void GrGLConvolutionEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                                      const GrProcessor& processor) {
+    const GrConvolutionEffect& conv = processor.cast<GrConvolutionEffect>();
     GrTexture& texture = *conv.texture(0);
     // the code we generated was for a specific kernel radius
     SkASSERT(conv.radius() == fRadius);
@@ -121,22 +119,22 @@ void GrGLConvolutionEffect::setData(const GrGLUniformManager& uman,
         default:
             SkFAIL("Unknown filter direction.");
     }
-    uman.set2fv(fImageIncrementUni, 1, imageIncrement);
+    pdman.set2fv(fImageIncrementUni, 1, imageIncrement);
     if (conv.useBounds()) {
         const float* bounds = conv.bounds();
         if (Gr1DKernelEffect::kY_Direction == conv.direction() &&
             texture.origin() != kTopLeft_GrSurfaceOrigin) {
-            uman.set2f(fBoundsUni, 1.0f - bounds[1], 1.0f - bounds[0]);
+            pdman.set2f(fBoundsUni, 1.0f - bounds[1], 1.0f - bounds[0]);
         } else {
-            uman.set2f(fBoundsUni, bounds[0], bounds[1]);
+            pdman.set2f(fBoundsUni, bounds[0], bounds[1]);
         }
     }
-    uman.set1fv(fKernelUni, this->width(), conv.kernel());
+    pdman.set1fv(fKernelUni, this->width(), conv.kernel());
 }
 
-void GrGLConvolutionEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
-                                   GrEffectKeyBuilder* b) {
-    const GrConvolutionEffect& conv = drawEffect.castEffect<GrConvolutionEffect>();
+void GrGLConvolutionEffect::GenKey(const GrProcessor& processor, const GrGLSLCaps&,
+                                   GrProcessorKeyBuilder* b) {
+    const GrConvolutionEffect& conv = processor.cast<GrConvolutionEffect>();
     uint32_t key = conv.radius();
     key <<= 2;
     if (conv.useBounds()) {
@@ -154,9 +152,10 @@ GrConvolutionEffect::GrConvolutionEffect(GrTexture* texture,
                                          const float* kernel,
                                          bool useBounds,
                                          float bounds[2])
-    : Gr1DKernelEffect(texture, direction, radius), fUseBounds(useBounds) {
+    : INHERITED(texture, direction, radius), fUseBounds(useBounds) {
+    this->initClassID<GrConvolutionEffect>();
     SkASSERT(radius <= kMaxKernelRadius);
-    SkASSERT(NULL != kernel);
+    SkASSERT(kernel);
     int width = this->width();
     for (int i = 0; i < width; i++) {
         fKernel[i] = kernel[i];
@@ -170,7 +169,8 @@ GrConvolutionEffect::GrConvolutionEffect(GrTexture* texture,
                                          float gaussianSigma,
                                          bool useBounds,
                                          float bounds[2])
-    : Gr1DKernelEffect(texture, direction, radius), fUseBounds(useBounds) {
+    : INHERITED(texture, direction, radius), fUseBounds(useBounds) {
+    this->initClassID<GrConvolutionEffect>();
     SkASSERT(radius <= kMaxKernelRadius);
     int width = this->width();
 
@@ -194,14 +194,18 @@ GrConvolutionEffect::GrConvolutionEffect(GrTexture* texture,
 GrConvolutionEffect::~GrConvolutionEffect() {
 }
 
-const GrBackendEffectFactory& GrConvolutionEffect::getFactory() const {
-    return GrTBackendEffectFactory<GrConvolutionEffect>::getInstance();
+void GrConvolutionEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                                GrProcessorKeyBuilder* b) const {
+    GrGLConvolutionEffect::GenKey(*this, caps, b);
 }
 
-bool GrConvolutionEffect::onIsEqual(const GrEffect& sBase) const {
-    const GrConvolutionEffect& s = CastEffect<GrConvolutionEffect>(sBase);
-    return (this->texture(0) == s.texture(0) &&
-            this->radius() == s.radius() &&
+GrGLSLFragmentProcessor* GrConvolutionEffect::onCreateGLSLInstance() const  {
+    return new GrGLConvolutionEffect(*this);
+}
+
+bool GrConvolutionEffect::onIsEqual(const GrFragmentProcessor& sBase) const {
+    const GrConvolutionEffect& s = sBase.cast<GrConvolutionEffect>();
+    return (this->radius() == s.radius() &&
             this->direction() == s.direction() &&
             this->useBounds() == s.useBounds() &&
             0 == memcmp(fBounds, s.fBounds, sizeof(fBounds)) &&
@@ -210,27 +214,24 @@ bool GrConvolutionEffect::onIsEqual(const GrEffect& sBase) const {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-GR_DEFINE_EFFECT_TEST(GrConvolutionEffect);
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrConvolutionEffect);
 
-GrEffect* GrConvolutionEffect::TestCreate(SkRandom* random,
-                                          GrContext*,
-                                          const GrDrawTargetCaps&,
-                                          GrTexture* textures[]) {
-    int texIdx = random->nextBool() ? GrEffectUnitTest::kSkiaPMTextureIdx :
-                                      GrEffectUnitTest::kAlphaTextureIdx;
-    Direction dir = random->nextBool() ? kX_Direction : kY_Direction;
-    int radius = random->nextRangeU(1, kMaxKernelRadius);
+const GrFragmentProcessor* GrConvolutionEffect::TestCreate(GrProcessorTestData* d) {
+    int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :
+                                          GrProcessorUnitTest::kAlphaTextureIdx;
+    Direction dir = d->fRandom->nextBool() ? kX_Direction : kY_Direction;
+    int radius = d->fRandom->nextRangeU(1, kMaxKernelRadius);
     float kernel[kMaxKernelWidth];
     for (size_t i = 0; i < SK_ARRAY_COUNT(kernel); ++i) {
-        kernel[i] = random->nextSScalar1();
+        kernel[i] = d->fRandom->nextSScalar1();
     }
     float bounds[2];
     for (size_t i = 0; i < SK_ARRAY_COUNT(bounds); ++i) {
-        bounds[i] = random->nextF();
+        bounds[i] = d->fRandom->nextF();
     }
 
-    bool useBounds = random->nextBool();
-    return GrConvolutionEffect::Create(textures[texIdx],
+    bool useBounds = d->fRandom->nextBool();
+    return GrConvolutionEffect::Create(d->fTextures[texIdx],
                                        dir,
                                        radius,
                                        kernel,
diff --git a/gfx/skia/skia/src/gpu/effects/GrConvolutionEffect.h b/gfx/skia/skia/src/gpu/effects/GrConvolutionEffect.h
index a96ea7be86c8..af580217d9fe 100644
--- a/gfx/skia/skia/src/gpu/effects/GrConvolutionEffect.h
+++ b/gfx/skia/skia/src/gpu/effects/GrConvolutionEffect.h
@@ -9,8 +9,7 @@
 #define GrConvolutionEffect_DEFINED
 
 #include "Gr1DKernelEffect.h"
-
-class GrGLConvolutionEffect;
+#include "GrInvariantOutput.h"
 
 /**
  * A convolution effect. The kernel is specified as an array of 2 * half-width
@@ -22,33 +21,23 @@ class GrConvolutionEffect : public Gr1DKernelEffect {
 public:
 
     /// Convolve with an arbitrary user-specified kernel
-    static GrEffect* Create(GrTexture* tex,
-                            Direction dir,
-                            int halfWidth,
-                            const float* kernel,
-                            bool useBounds,
-                            float bounds[2]) {
-        return SkNEW_ARGS(GrConvolutionEffect, (tex,
-                                                dir,
-                                                halfWidth,
-                                                kernel,
-                                                useBounds,
-                                                bounds));
+    static GrFragmentProcessor* Create(GrTexture* tex,
+                                       Direction dir,
+                                       int halfWidth,
+                                       const float* kernel,
+                                       bool useBounds,
+                                       float bounds[2]) {
+        return new GrConvolutionEffect(tex, dir, halfWidth, kernel, useBounds, bounds);
     }
 
     /// Convolve with a Gaussian kernel
-    static GrEffect* CreateGaussian(GrTexture* tex,
-                                    Direction dir,
-                                    int halfWidth,
-                                    float gaussianSigma,
-                                    bool useBounds,
-                                    float bounds[2]) {
-        return SkNEW_ARGS(GrConvolutionEffect, (tex,
-                                                dir,
-                                                halfWidth,
-                                                gaussianSigma,
-                                                useBounds,
-                                                bounds));
+    static GrFragmentProcessor* CreateGaussian(GrTexture* tex,
+                                               Direction dir,
+                                               int halfWidth,
+                                               float gaussianSigma,
+                                               bool useBounds,
+                                               float bounds[2]) {
+        return new GrConvolutionEffect(tex, dir, halfWidth, gaussianSigma, useBounds, bounds);
     }
 
     virtual ~GrConvolutionEffect();
@@ -58,17 +47,7 @@ public:
     const float* bounds() const { return fBounds; }
     bool useBounds() const { return fUseBounds; }
 
-    static const char* Name() { return "Convolution"; }
-
-    typedef GrGLConvolutionEffect GLEffect;
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
-
-    virtual void getConstantColorComponents(GrColor*, uint32_t* validFlags) const {
-        // If the texture was opaque we could know that the output color if we knew the sum of the
-        // kernel values.
-        *validFlags = 0;
-    }
+    const char* name() const override { return "Convolution"; }
 
     enum {
         // This was decided based on the min allowed value for the max texture
@@ -101,9 +80,19 @@ private:
                         bool useBounds,
                         float bounds[2]);
 
-    virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE;
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
 
-    GR_DECLARE_EFFECT_TEST;
+    void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
+
+    bool onIsEqual(const GrFragmentProcessor&) const override;
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override {
+        // If the texture was opaque we could know that the output color if we knew the sum of the
+        // kernel values.
+        inout->mulByUnknownFourComponents();
+    }
+
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
 
     typedef Gr1DKernelEffect INHERITED;
 };
diff --git a/gfx/skia/skia/src/gpu/effects/GrCoverageSetOpXP.cpp b/gfx/skia/skia/src/gpu/effects/GrCoverageSetOpXP.cpp
new file mode 100644
index 000000000000..219ed0b505c9
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/effects/GrCoverageSetOpXP.cpp
@@ -0,0 +1,342 @@
+
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "effects/GrCoverageSetOpXP.h"
+#include "GrCaps.h"
+#include "GrColor.h"
+#include "GrProcessor.h"
+#include "GrProcOptInfo.h"
+#include "glsl/GrGLSLBlend.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLXferProcessor.h"
+
+class CoverageSetOpXP : public GrXferProcessor {
+public:
+    static GrXferProcessor* Create(SkRegion::Op regionOp, bool invertCoverage) {
+        return new CoverageSetOpXP(regionOp, invertCoverage);
+    }
+
+    ~CoverageSetOpXP() override;
+
+    const char* name() const override { return "Coverage Set Op"; }
+
+    GrGLSLXferProcessor* createGLSLInstance() const override;
+
+    bool invertCoverage() const { return fInvertCoverage; }
+
+private:
+    CoverageSetOpXP(SkRegion::Op regionOp, bool fInvertCoverage);
+
+    GrXferProcessor::OptFlags onGetOptimizations(const GrPipelineOptimizations& optimizations,
+                                                 bool doesStencilWrite,
+                                                 GrColor* color,
+                                                 const GrCaps& caps) const override;
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
+
+    void onGetBlendInfo(GrXferProcessor::BlendInfo* blendInfo) const override;
+
+    bool onIsEqual(const GrXferProcessor& xpBase) const override {
+        const CoverageSetOpXP& xp = xpBase.cast<CoverageSetOpXP>();
+        return (fRegionOp == xp.fRegionOp &&
+                fInvertCoverage == xp.fInvertCoverage);
+    }
+
+    SkRegion::Op fRegionOp;
+    bool         fInvertCoverage;
+
+    typedef GrXferProcessor INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+class GLCoverageSetOpXP : public GrGLSLXferProcessor {
+public:
+    GLCoverageSetOpXP(const GrProcessor&) {}
+
+    ~GLCoverageSetOpXP() override {}
+
+    static void GenKey(const GrProcessor& processor, const GrGLSLCaps& caps,
+                       GrProcessorKeyBuilder* b) {
+        const CoverageSetOpXP& xp = processor.cast<CoverageSetOpXP>();
+        uint32_t key = xp.invertCoverage() ?  0x0 : 0x1;
+        b->add32(key);
+    };
+
+private:
+    void emitOutputsForBlendState(const EmitArgs& args) override {
+        const CoverageSetOpXP& xp = args.fXP.cast<CoverageSetOpXP>();
+        GrGLSLXPFragmentBuilder* fragBuilder = args.fXPFragBuilder;
+
+        if (xp.invertCoverage()) {
+            fragBuilder->codeAppendf("%s = 1.0 - %s;", args.fOutputPrimary, args.fInputCoverage);
+        } else {
+            fragBuilder->codeAppendf("%s = %s;", args.fOutputPrimary, args.fInputCoverage);
+        }
+    }
+
+    void onSetData(const GrGLSLProgramDataManager&, const GrXferProcessor&) override {};
+
+    typedef GrGLSLXferProcessor INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+CoverageSetOpXP::CoverageSetOpXP(SkRegion::Op regionOp, bool invertCoverage)
+    : fRegionOp(regionOp)
+    , fInvertCoverage(invertCoverage) {
+    this->initClassID<CoverageSetOpXP>();
+}
+
+CoverageSetOpXP::~CoverageSetOpXP() {
+}
+
+void CoverageSetOpXP::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                            GrProcessorKeyBuilder* b) const {
+    GLCoverageSetOpXP::GenKey(*this, caps, b);
+}
+
+GrGLSLXferProcessor* CoverageSetOpXP::createGLSLInstance() const {
+    return new GLCoverageSetOpXP(*this);
+}
+
+GrXferProcessor::OptFlags
+CoverageSetOpXP::onGetOptimizations(const GrPipelineOptimizations& optimizations,
+                                    bool doesStencilWrite,
+                                    GrColor* color,
+                                    const GrCaps& caps) const {
+    // We never look at the color input
+    return GrXferProcessor::kIgnoreColor_OptFlag; 
+}
+
+void CoverageSetOpXP::onGetBlendInfo(GrXferProcessor::BlendInfo* blendInfo) const {
+    switch (fRegionOp) {
+        case SkRegion::kReplace_Op:
+            blendInfo->fSrcBlend = kOne_GrBlendCoeff;
+            blendInfo->fDstBlend = kZero_GrBlendCoeff;
+            break;
+        case SkRegion::kIntersect_Op:
+            blendInfo->fSrcBlend = kDC_GrBlendCoeff;
+            blendInfo->fDstBlend = kZero_GrBlendCoeff;
+            break;
+        case SkRegion::kUnion_Op:
+            blendInfo->fSrcBlend = kOne_GrBlendCoeff;
+            blendInfo->fDstBlend = kISC_GrBlendCoeff;
+            break;
+        case SkRegion::kXOR_Op:
+            blendInfo->fSrcBlend = kIDC_GrBlendCoeff;
+            blendInfo->fDstBlend = kISC_GrBlendCoeff;
+            break;
+        case SkRegion::kDifference_Op:
+            blendInfo->fSrcBlend = kZero_GrBlendCoeff;
+            blendInfo->fDstBlend = kISC_GrBlendCoeff;
+            break;
+        case SkRegion::kReverseDifference_Op:
+            blendInfo->fSrcBlend = kIDC_GrBlendCoeff;
+            blendInfo->fDstBlend = kZero_GrBlendCoeff;
+            break;
+    }
+    blendInfo->fBlendConstant = 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+class ShaderCSOXferProcessor : public GrXferProcessor {
+public:
+    ShaderCSOXferProcessor(const DstTexture* dstTexture,
+                           bool hasMixedSamples,
+                           SkXfermode::Mode xfermode,
+                           SkRegion::Op regionOp,
+                           bool invertCoverage)
+        : INHERITED(dstTexture, true, hasMixedSamples)
+        , fRegionOp(regionOp)
+        , fInvertCoverage(invertCoverage) {
+        this->initClassID<ShaderCSOXferProcessor>();
+    }
+
+    const char* name() const override { return "Coverage Set Op Shader"; }
+
+    GrGLSLXferProcessor* createGLSLInstance() const override;
+
+    SkRegion::Op regionOp() const { return fRegionOp; }
+    bool invertCoverage() const { return fInvertCoverage; }
+
+private:
+    GrXferProcessor::OptFlags onGetOptimizations(const GrPipelineOptimizations&, bool, GrColor*, 
+                                                 const GrCaps&) const override {
+        // We never look at the color input
+        return GrXferProcessor::kIgnoreColor_OptFlag; 
+    }
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
+
+    bool onIsEqual(const GrXferProcessor& xpBase) const override {
+        const ShaderCSOXferProcessor& xp = xpBase.cast<ShaderCSOXferProcessor>();
+        return (fRegionOp == xp.fRegionOp &&
+                fInvertCoverage == xp.fInvertCoverage);
+    }
+
+    SkRegion::Op fRegionOp;
+    bool         fInvertCoverage;
+
+    typedef GrXferProcessor INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+class GLShaderCSOXferProcessor : public GrGLSLXferProcessor {
+public:
+    static void GenKey(const GrProcessor& processor, GrProcessorKeyBuilder* b) {
+        const ShaderCSOXferProcessor& xp = processor.cast<ShaderCSOXferProcessor>();
+        b->add32(xp.regionOp());
+        uint32_t key = xp.invertCoverage() ?  0x0 : 0x1;
+        b->add32(key);
+    }
+
+private:
+    void emitBlendCodeForDstRead(GrGLSLXPBuilder* pb,
+                                 GrGLSLXPFragmentBuilder* fragBuilder,
+                                 const char* srcColor,
+                                 const char* srcCoverage,
+                                 const char* dstColor,
+                                 const char* outColor,
+                                 const char* outColorSecondary,
+                                 const GrXferProcessor& proc) override {
+        const ShaderCSOXferProcessor& xp = proc.cast<ShaderCSOXferProcessor>();
+
+        if (xp.invertCoverage()) {
+            fragBuilder->codeAppendf("%s = 1.0 - %s;", outColor, srcCoverage);
+        } else {
+            fragBuilder->codeAppendf("%s = %s;", outColor, srcCoverage);
+        }
+
+        GrGLSLBlend::AppendRegionOp(fragBuilder, outColor, dstColor, outColor, xp.regionOp());
+    }
+
+    void onSetData(const GrGLSLProgramDataManager&, const GrXferProcessor&) override {}
+
+    typedef GrGLSLXferProcessor INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+void ShaderCSOXferProcessor::onGetGLSLProcessorKey(const GrGLSLCaps&,
+                                                   GrProcessorKeyBuilder* b) const {
+    GLShaderCSOXferProcessor::GenKey(*this, b);
+}
+
+GrGLSLXferProcessor* ShaderCSOXferProcessor::createGLSLInstance() const {
+    return new GLShaderCSOXferProcessor;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+//
+GrCoverageSetOpXPFactory::GrCoverageSetOpXPFactory(SkRegion::Op regionOp, bool invertCoverage)
+    : fRegionOp(regionOp)
+    , fInvertCoverage(invertCoverage) {
+    this->initClassID<GrCoverageSetOpXPFactory>();
+}
+
+GrXPFactory* GrCoverageSetOpXPFactory::Create(SkRegion::Op regionOp, bool invertCoverage) {
+    switch (regionOp) {
+        case SkRegion::kReplace_Op: {
+            if (invertCoverage) {
+                static GrCoverageSetOpXPFactory gReplaceCDXPFI(regionOp, invertCoverage);
+                return SkRef(&gReplaceCDXPFI);
+            } else {
+                static GrCoverageSetOpXPFactory gReplaceCDXPF(regionOp, invertCoverage);
+                return SkRef(&gReplaceCDXPF);
+            }
+            break;
+        }
+        case SkRegion::kIntersect_Op: {
+            if (invertCoverage) {
+                static GrCoverageSetOpXPFactory gIntersectCDXPFI(regionOp, invertCoverage);
+                return SkRef(&gIntersectCDXPFI);
+            } else {
+                static GrCoverageSetOpXPFactory gIntersectCDXPF(regionOp, invertCoverage);
+                return SkRef(&gIntersectCDXPF);
+            }
+            break;
+        }
+        case SkRegion::kUnion_Op: {
+            if (invertCoverage) {
+                static GrCoverageSetOpXPFactory gUnionCDXPFI(regionOp, invertCoverage);
+                return SkRef(&gUnionCDXPFI);
+            } else {
+                static GrCoverageSetOpXPFactory gUnionCDXPF(regionOp, invertCoverage);
+                return SkRef(&gUnionCDXPF);
+            }
+            break;
+        }
+        case SkRegion::kXOR_Op: {
+            if (invertCoverage) {
+                static GrCoverageSetOpXPFactory gXORCDXPFI(regionOp, invertCoverage);
+                return SkRef(&gXORCDXPFI);
+            } else {
+                static GrCoverageSetOpXPFactory gXORCDXPF(regionOp, invertCoverage);
+                return SkRef(&gXORCDXPF);
+            }
+            break;
+        }
+        case SkRegion::kDifference_Op: {
+            if (invertCoverage) {
+                static GrCoverageSetOpXPFactory gDifferenceCDXPFI(regionOp, invertCoverage);
+                return SkRef(&gDifferenceCDXPFI);
+            } else {
+                static GrCoverageSetOpXPFactory gDifferenceCDXPF(regionOp, invertCoverage);
+                return SkRef(&gDifferenceCDXPF);
+            }
+            break;
+        }
+        case SkRegion::kReverseDifference_Op: {
+            if (invertCoverage) {
+                static GrCoverageSetOpXPFactory gRevDiffCDXPFI(regionOp, invertCoverage);
+                return SkRef(&gRevDiffCDXPFI);
+            } else {
+                static GrCoverageSetOpXPFactory gRevDiffCDXPF(regionOp, invertCoverage);
+                return SkRef(&gRevDiffCDXPF);
+            }
+            break;
+        }
+        default:
+            return nullptr;
+    }
+}
+
+GrXferProcessor*
+GrCoverageSetOpXPFactory::onCreateXferProcessor(const GrCaps& caps,
+                                                const GrPipelineOptimizations& optimizations,
+                                                bool hasMixedSamples,
+                                                const DstTexture* dst) const {
+    // We don't support inverting coverage with mixed samples. We don't expect to ever want this in
+    // the future, however we could at some point make this work using an inverted coverage
+    // modulation table. Note that an inverted table still won't work if there are coverage procs.
+    if (fInvertCoverage && hasMixedSamples) {
+        SkASSERT(false);
+        return nullptr;
+    }
+
+    return CoverageSetOpXP::Create(fRegionOp, fInvertCoverage);
+}
+
+void GrCoverageSetOpXPFactory::getInvariantBlendedColor(const GrProcOptInfo& colorPOI,
+                                                        InvariantBlendedColor* blendedColor) const {
+    blendedColor->fWillBlendWithDst = SkRegion::kReplace_Op != fRegionOp;
+    blendedColor->fKnownColorFlags = kNone_GrColorComponentFlags;
+}
+
+GR_DEFINE_XP_FACTORY_TEST(GrCoverageSetOpXPFactory);
+
+const GrXPFactory* GrCoverageSetOpXPFactory::TestCreate(GrProcessorTestData* d) {
+    SkRegion::Op regionOp = SkRegion::Op(d->fRandom->nextULessThan(SkRegion::kLastOp + 1));
+    bool invertCoverage = !d->fRenderTarget->hasMixedSamples() && d->fRandom->nextBool();
+    return GrCoverageSetOpXPFactory::Create(regionOp, invertCoverage);
+}
+
diff --git a/gfx/skia/skia/src/gpu/effects/GrCustomCoordsTextureEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrCustomCoordsTextureEffect.cpp
deleted file mode 100644
index a24abf9f63d3..000000000000
--- a/gfx/skia/skia/src/gpu/effects/GrCustomCoordsTextureEffect.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrCustomCoordsTextureEffect.h"
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
-#include "gl/GrGLSL.h"
-#include "gl/GrGLTexture.h"
-#include "gl/GrGLVertexEffect.h"
-#include "GrTBackendEffectFactory.h"
-#include "GrTexture.h"
-
-class GrGLCustomCoordsTextureEffect : public GrGLVertexEffect {
-public:
-    GrGLCustomCoordsTextureEffect(const GrBackendEffectFactory& factory, const GrDrawEffect& drawEffect)
-        : INHERITED (factory) {}
-
-    virtual void emitCode(GrGLFullShaderBuilder* builder,
-                          const GrDrawEffect& drawEffect,
-                          const GrEffectKey& key,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray& samplers) SK_OVERRIDE {
-        SkASSERT(1 == drawEffect.castEffect<GrCustomCoordsTextureEffect>().numVertexAttribs());
-
-        SkString fsCoordName;
-        const char* vsVaryingName;
-        const char* fsVaryingNamePtr;
-        builder->addVarying(kVec2f_GrSLType, "textureCoords", &vsVaryingName, &fsVaryingNamePtr);
-        fsCoordName = fsVaryingNamePtr;
-
-        const char* attrName =
-            builder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[0])->c_str();
-        builder->vsCodeAppendf("\t%s = %s;\n", vsVaryingName, attrName);
-
-        builder->fsCodeAppendf("\t%s = ", outputColor);
-        builder->fsAppendTextureLookupAndModulate(inputColor,
-                                                  samplers[0],
-                                                  fsCoordName.c_str(),
-                                                  kVec2f_GrSLType);
-        builder->fsCodeAppend(";\n");
-    }
-
-    virtual void setData(const GrGLUniformManager& uman,
-                         const GrDrawEffect& drawEffect) SK_OVERRIDE {}
-
-private:
-    typedef GrGLVertexEffect INHERITED;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
-GrCustomCoordsTextureEffect::GrCustomCoordsTextureEffect(GrTexture* texture,
-                                                         const GrTextureParams& params)
-    : fTextureAccess(texture, params) {
-    this->addTextureAccess(&fTextureAccess);
-    this->addVertexAttrib(kVec2f_GrSLType);
-}
-
-bool GrCustomCoordsTextureEffect::onIsEqual(const GrEffect& other) const {
-    const GrCustomCoordsTextureEffect& cte = CastEffect<GrCustomCoordsTextureEffect>(other);
-    return fTextureAccess == cte.fTextureAccess;
-}
-
-void GrCustomCoordsTextureEffect::getConstantColorComponents(GrColor* color,
-                                                             uint32_t* validFlags) const {
-    if ((*validFlags & kA_GrColorComponentFlag) && 0xFF == GrColorUnpackA(*color) &&
-        GrPixelConfigIsOpaque(this->texture(0)->config())) {
-        *validFlags = kA_GrColorComponentFlag;
-    } else {
-        *validFlags = 0;
-    }
-}
-
-const GrBackendEffectFactory& GrCustomCoordsTextureEffect::getFactory() const {
-    return GrTBackendEffectFactory<GrCustomCoordsTextureEffect>::getInstance();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-GR_DEFINE_EFFECT_TEST(GrCustomCoordsTextureEffect);
-
-GrEffect* GrCustomCoordsTextureEffect::TestCreate(SkRandom* random,
-                                                  GrContext*,
-                                                  const GrDrawTargetCaps&,
-                                                  GrTexture* textures[]) {
-    int texIdx = random->nextBool() ? GrEffectUnitTest::kSkiaPMTextureIdx :
-                                      GrEffectUnitTest::kAlphaTextureIdx;
-    static const SkShader::TileMode kTileModes[] = {
-        SkShader::kClamp_TileMode,
-        SkShader::kRepeat_TileMode,
-        SkShader::kMirror_TileMode,
-    };
-    SkShader::TileMode tileModes[] = {
-        kTileModes[random->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
-        kTileModes[random->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
-    };
-    GrTextureParams params(tileModes, random->nextBool() ? GrTextureParams::kBilerp_FilterMode :
-                                                           GrTextureParams::kNone_FilterMode);
-
-    return GrCustomCoordsTextureEffect::Create(textures[texIdx], params);
-}
diff --git a/gfx/skia/skia/src/gpu/effects/GrCustomCoordsTextureEffect.h b/gfx/skia/skia/src/gpu/effects/GrCustomCoordsTextureEffect.h
deleted file mode 100644
index 95e0fbba1478..000000000000
--- a/gfx/skia/skia/src/gpu/effects/GrCustomCoordsTextureEffect.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrCustomCoordsTextureEffect_DEFINED
-#define GrCustomCoordsTextureEffect_DEFINED
-
-#include "GrEffect.h"
-#include "GrVertexEffect.h"
-
-class GrGLCustomCoordsTextureEffect;
-
-/**
- * The output color of this effect is a modulation of the input color and a sample from a texture.
- * It allows explicit specification of the filtering and wrap modes (GrTextureParams). The input
- * coords are a custom attribute.
- */
-class GrCustomCoordsTextureEffect : public GrVertexEffect {
-public:
-    static GrEffect* Create(GrTexture* tex, const GrTextureParams& p) {
-        return SkNEW_ARGS(GrCustomCoordsTextureEffect, (tex, p));
-    }
-
-    virtual ~GrCustomCoordsTextureEffect() {}
-
-    static const char* Name() { return "Texture"; }
-
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
-
-    typedef GrGLCustomCoordsTextureEffect GLEffect;
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
-
-private:
-    GrCustomCoordsTextureEffect(GrTexture* texture, const GrTextureParams& params);
-
-    virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE;
-
-    GrTextureAccess fTextureAccess;
-
-    GR_DECLARE_EFFECT_TEST;
-
-    typedef GrVertexEffect INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/effects/GrCustomXfermode.cpp b/gfx/skia/skia/src/gpu/effects/GrCustomXfermode.cpp
new file mode 100644
index 000000000000..d2aff6042c28
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/effects/GrCustomXfermode.cpp
@@ -0,0 +1,409 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "effects/GrCustomXfermode.h"
+
+#include "GrCoordTransform.h"
+#include "GrContext.h"
+#include "GrFragmentProcessor.h"
+#include "GrInvariantOutput.h"
+#include "GrPipeline.h"
+#include "GrProcessor.h"
+#include "GrTexture.h"
+#include "GrTextureAccess.h"
+#include "SkXfermode.h"
+#include "glsl/GrGLSLBlend.h"
+#include "glsl/GrGLSLCaps.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+#include "glsl/GrGLSLXferProcessor.h"
+
+bool GrCustomXfermode::IsSupportedMode(SkXfermode::Mode mode) {
+    return mode > SkXfermode::kLastCoeffMode && mode <= SkXfermode::kLastMode;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Static helpers
+///////////////////////////////////////////////////////////////////////////////
+
+static GrBlendEquation hw_blend_equation(SkXfermode::Mode mode) {
+    enum { kOffset = kOverlay_GrBlendEquation - SkXfermode::kOverlay_Mode };
+    return static_cast<GrBlendEquation>(mode + kOffset);
+
+    GR_STATIC_ASSERT(kOverlay_GrBlendEquation == SkXfermode::kOverlay_Mode + kOffset);
+    GR_STATIC_ASSERT(kDarken_GrBlendEquation == SkXfermode::kDarken_Mode + kOffset);
+    GR_STATIC_ASSERT(kLighten_GrBlendEquation == SkXfermode::kLighten_Mode + kOffset);
+    GR_STATIC_ASSERT(kColorDodge_GrBlendEquation == SkXfermode::kColorDodge_Mode + kOffset);
+    GR_STATIC_ASSERT(kColorBurn_GrBlendEquation == SkXfermode::kColorBurn_Mode + kOffset);
+    GR_STATIC_ASSERT(kHardLight_GrBlendEquation == SkXfermode::kHardLight_Mode + kOffset);
+    GR_STATIC_ASSERT(kSoftLight_GrBlendEquation == SkXfermode::kSoftLight_Mode + kOffset);
+    GR_STATIC_ASSERT(kDifference_GrBlendEquation == SkXfermode::kDifference_Mode + kOffset);
+    GR_STATIC_ASSERT(kExclusion_GrBlendEquation == SkXfermode::kExclusion_Mode + kOffset);
+    GR_STATIC_ASSERT(kMultiply_GrBlendEquation == SkXfermode::kMultiply_Mode + kOffset);
+    GR_STATIC_ASSERT(kHSLHue_GrBlendEquation == SkXfermode::kHue_Mode + kOffset);
+    GR_STATIC_ASSERT(kHSLSaturation_GrBlendEquation == SkXfermode::kSaturation_Mode + kOffset);
+    GR_STATIC_ASSERT(kHSLColor_GrBlendEquation == SkXfermode::kColor_Mode + kOffset);
+    GR_STATIC_ASSERT(kHSLLuminosity_GrBlendEquation == SkXfermode::kLuminosity_Mode + kOffset);
+    GR_STATIC_ASSERT(kGrBlendEquationCnt == SkXfermode::kLastMode + 1 + kOffset);
+}
+
+static bool can_use_hw_blend_equation(GrBlendEquation equation,
+                                      const GrProcOptInfo& coveragePOI,
+                                      const GrCaps& caps) {
+    if (!caps.advancedBlendEquationSupport()) {
+        return false;
+    }
+    if (coveragePOI.isFourChannelOutput()) {
+        return false; // LCD coverage must be applied after the blend equation.
+    }
+    if (caps.canUseAdvancedBlendEquation(equation)) {
+        return false;
+    }
+    return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Xfer Processor
+///////////////////////////////////////////////////////////////////////////////
+
+class CustomXP : public GrXferProcessor {
+public:
+    CustomXP(SkXfermode::Mode mode, GrBlendEquation hwBlendEquation)
+        : fMode(mode),
+          fHWBlendEquation(hwBlendEquation) {
+        this->initClassID<CustomXP>();
+    }
+
+    CustomXP(const DstTexture* dstTexture, bool hasMixedSamples, SkXfermode::Mode mode)
+        : INHERITED(dstTexture, true, hasMixedSamples),
+          fMode(mode),
+          fHWBlendEquation(static_cast<GrBlendEquation>(-1)) {
+        this->initClassID<CustomXP>();
+    }
+
+    const char* name() const override { return "Custom Xfermode"; }
+
+    GrGLSLXferProcessor* createGLSLInstance() const override;
+
+    SkXfermode::Mode mode() const { return fMode; }
+    bool hasHWBlendEquation() const { return -1 != static_cast<int>(fHWBlendEquation); }
+
+    GrBlendEquation hwBlendEquation() const {
+        SkASSERT(this->hasHWBlendEquation());
+        return fHWBlendEquation;
+    }
+
+private:
+    GrXferProcessor::OptFlags onGetOptimizations(const GrPipelineOptimizations& optimizations,
+                                                 bool doesStencilWrite,
+                                                 GrColor* overrideColor,
+                                                 const GrCaps& caps) const override;
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
+
+    GrXferBarrierType onXferBarrier(const GrRenderTarget*, const GrCaps&) const override;
+
+    void onGetBlendInfo(BlendInfo*) const override;
+
+    bool onIsEqual(const GrXferProcessor& xpBase) const override;
+
+    const SkXfermode::Mode fMode;
+    const GrBlendEquation  fHWBlendEquation;
+
+    typedef GrXferProcessor INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+class GLCustomXP : public GrGLSLXferProcessor {
+public:
+    GLCustomXP(const GrXferProcessor&) {}
+    ~GLCustomXP() override {}
+
+    static void GenKey(const GrXferProcessor& p, const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) {
+        const CustomXP& xp = p.cast<CustomXP>();
+        uint32_t key = 0;
+        if (xp.hasHWBlendEquation()) {
+            SkASSERT(caps.advBlendEqInteraction() > 0);  // 0 will mean !xp.hasHWBlendEquation().
+            key |= caps.advBlendEqInteraction();
+            GR_STATIC_ASSERT(GrGLSLCaps::kLast_AdvBlendEqInteraction < 4);
+        }
+        if (!xp.hasHWBlendEquation() || caps.mustEnableSpecificAdvBlendEqs()) {
+            key |= xp.mode() << 3;
+        }
+        b->add32(key);
+    }
+
+private:
+    void emitOutputsForBlendState(const EmitArgs& args) override {
+        const CustomXP& xp = args.fXP.cast<CustomXP>();
+        SkASSERT(xp.hasHWBlendEquation());
+
+        GrGLSLXPFragmentBuilder* fragBuilder = args.fXPFragBuilder;
+        fragBuilder->enableAdvancedBlendEquationIfNeeded(xp.hwBlendEquation());
+
+        // Apply coverage by multiplying it into the src color before blending. Mixed samples will
+        // "just work" automatically. (See onGetOptimizations())
+        if (args.fInputCoverage) {
+            fragBuilder->codeAppendf("%s = %s * %s;",
+                                     args.fOutputPrimary, args.fInputCoverage, args.fInputColor);
+        } else {
+            fragBuilder->codeAppendf("%s = %s;", args.fOutputPrimary, args.fInputColor);
+        }
+    }
+
+    void emitBlendCodeForDstRead(GrGLSLXPBuilder* pb,
+                                 GrGLSLXPFragmentBuilder* fragBuilder,
+                                 const char* srcColor,
+                                 const char* srcCoverage,
+                                 const char* dstColor,
+                                 const char* outColor,
+                                 const char* outColorSecondary,
+                                 const GrXferProcessor& proc) override {
+        const CustomXP& xp = proc.cast<CustomXP>();
+        SkASSERT(!xp.hasHWBlendEquation());
+
+        GrGLSLBlend::AppendMode(fragBuilder, srcColor, dstColor, outColor, xp.mode());
+
+        // Apply coverage.
+        if (xp.dstReadUsesMixedSamples()) {
+            if (srcCoverage) {
+                fragBuilder->codeAppendf("%s *= %s;", outColor, srcCoverage);
+                fragBuilder->codeAppendf("%s = %s;", outColorSecondary, srcCoverage);
+            } else {
+                fragBuilder->codeAppendf("%s = vec4(1.0);", outColorSecondary);
+            }
+        } else if (srcCoverage) {
+            fragBuilder->codeAppendf("%s = %s * %s + (vec4(1.0) - %s) * %s;",
+                                     outColor, srcCoverage, outColor, srcCoverage, dstColor);
+        }
+    }
+
+    void onSetData(const GrGLSLProgramDataManager&, const GrXferProcessor&) override {}
+
+    typedef GrGLSLXferProcessor INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+void CustomXP::onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const {
+    GLCustomXP::GenKey(*this, caps, b);
+}
+
+GrGLSLXferProcessor* CustomXP::createGLSLInstance() const {
+    SkASSERT(this->willReadDstColor() != this->hasHWBlendEquation());
+    return new GLCustomXP(*this);
+}
+
+bool CustomXP::onIsEqual(const GrXferProcessor& other) const {
+    const CustomXP& s = other.cast<CustomXP>();
+    return fMode == s.fMode && fHWBlendEquation == s.fHWBlendEquation;
+}
+
+GrXferProcessor::OptFlags CustomXP::onGetOptimizations(const GrPipelineOptimizations& optimizations,
+                                                       bool doesStencilWrite,
+                                                       GrColor* overrideColor,
+                                                       const GrCaps& caps) const {
+  /*
+    Most the optimizations we do here are based on tweaking alpha for coverage.
+
+    The general SVG blend equation is defined in the spec as follows:
+
+      Dca' = B(Sc, Dc) * Sa * Da + Y * Sca * (1-Da) + Z * Dca * (1-Sa)
+      Da'  = X * Sa * Da + Y * Sa * (1-Da) + Z * Da * (1-Sa)
+
+    (Note that Sca, Dca indicate RGB vectors that are premultiplied by alpha,
+     and that B(Sc, Dc) is a mode-specific function that accepts non-multiplied
+     RGB colors.)
+
+    For every blend mode supported by this class, i.e. the "advanced" blend
+    modes, X=Y=Z=1 and this equation reduces to the PDF blend equation.
+
+    It can be shown that when X=Y=Z=1, these equations can modulate alpha for
+    coverage.
+
+
+    == Color ==
+
+    We substitute Y=Z=1 and define a blend() function that calculates Dca' in
+    terms of premultiplied alpha only:
+
+      blend(Sca, Dca, Sa, Da) = {Dca : if Sa == 0,
+                                 Sca : if Da == 0,
+                                 B(Sca/Sa, Dca/Da) * Sa * Da + Sca * (1-Da) + Dca * (1-Sa) : if Sa,Da != 0}
+
+    And for coverage modulation, we use a post blend src-over model:
+
+      Dca'' = f * blend(Sca, Dca, Sa, Da) + (1-f) * Dca
+
+    (Where f is the fractional coverage.)
+
+    Next we show that canTweakAlphaForCoverage() is true by proving the
+    following relationship:
+
+      blend(f*Sca, Dca, f*Sa, Da) == f * blend(Sca, Dca, Sa, Da) + (1-f) * Dca
+
+    General case (f,Sa,Da != 0):
+
+      f * blend(Sca, Dca, Sa, Da) + (1-f) * Dca
+        = f * (B(Sca/Sa, Dca/Da) * Sa * Da + Sca * (1-Da) + Dca * (1-Sa)) + (1-f) * Dca  [Sa,Da != 0, definition of blend()]
+        = B(Sca/Sa, Dca/Da) * f*Sa * Da + f*Sca * (1-Da) + f*Dca * (1-Sa) + Dca - f*Dca
+        = B(Sca/Sa, Dca/Da) * f*Sa * Da + f*Sca - f*Sca * Da + f*Dca - f*Dca * Sa + Dca - f*Dca
+        = B(Sca/Sa, Dca/Da) * f*Sa * Da + f*Sca - f*Sca * Da - f*Dca * Sa + Dca
+        = B(Sca/Sa, Dca/Da) * f*Sa * Da + f*Sca * (1-Da) - f*Dca * Sa + Dca
+        = B(Sca/Sa, Dca/Da) * f*Sa * Da + f*Sca * (1-Da) + Dca * (1 - f*Sa)
+        = B(f*Sca/f*Sa, Dca/Da) * f*Sa * Da + f*Sca * (1-Da) + Dca * (1 - f*Sa)  [f!=0]
+        = blend(f*Sca, Dca, f*Sa, Da)  [definition of blend()]
+
+    Corner cases (Sa=0, Da=0, and f=0):
+
+      Sa=0: f * blend(Sca, Dca, Sa, Da) + (1-f) * Dca
+              = f * Dca + (1-f) * Dca  [Sa=0, definition of blend()]
+              = Dca
+              = blend(0, Dca, 0, Da)  [definition of blend()]
+              = blend(f*Sca, Dca, f*Sa, Da)  [Sa=0]
+
+      Da=0: f * blend(Sca, Dca, Sa, Da) + (1-f) * Dca
+              = f * Sca + (1-f) * Dca  [Da=0, definition of blend()]
+              = f * Sca  [Da=0]
+              = blend(f*Sca, 0, f*Sa, 0)  [definition of blend()]
+              = blend(f*Sca, Dca, f*Sa, Da)  [Da=0]
+
+      f=0: f * blend(Sca, Dca, Sa, Da) + (1-f) * Dca
+             = Dca  [f=0]
+             = blend(0, Dca, 0, Da)  [definition of blend()]
+             = blend(f*Sca, Dca, f*Sa, Da)  [f=0]
+
+    == Alpha ==
+
+    We substitute X=Y=Z=1 and define a blend() function that calculates Da':
+
+      blend(Sa, Da) = Sa * Da + Sa * (1-Da) + Da * (1-Sa)
+                    = Sa * Da + Sa - Sa * Da + Da - Da * Sa
+                    = Sa + Da - Sa * Da
+
+    We use the same model for coverage modulation as we did with color:
+
+      Da'' = f * blend(Sa, Da) + (1-f) * Da
+
+    And show that canTweakAlphaForCoverage() is true by proving the following
+    relationship:
+
+      blend(f*Sa, Da) == f * blend(Sa, Da) + (1-f) * Da
+
+
+      f * blend(Sa, Da) + (1-f) * Da
+        = f * (Sa + Da - Sa * Da) + (1-f) * Da
+        = f*Sa + f*Da - f*Sa * Da + Da - f*Da
+        = f*Sa - f*Sa * Da + Da
+        = f*Sa + Da - f*Sa * Da
+        = blend(f*Sa, Da)
+   */
+
+    OptFlags flags = kNone_OptFlags;
+    if (optimizations.fColorPOI.allStagesMultiplyInput()) {
+        flags |= kCanTweakAlphaForCoverage_OptFlag;
+    }
+    if (this->hasHWBlendEquation() && optimizations.fCoveragePOI.isSolidWhite()) {
+        flags |= kIgnoreCoverage_OptFlag;
+    }
+    return flags;
+}
+
+GrXferBarrierType CustomXP::onXferBarrier(const GrRenderTarget* rt, const GrCaps& caps) const {
+    if (this->hasHWBlendEquation() && !caps.advancedCoherentBlendEquationSupport()) {
+        return kBlend_GrXferBarrierType;
+    }
+    return kNone_GrXferBarrierType;
+}
+
+void CustomXP::onGetBlendInfo(BlendInfo* blendInfo) const {
+    if (this->hasHWBlendEquation()) {
+        blendInfo->fEquation = this->hwBlendEquation();
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+class CustomXPFactory : public GrXPFactory {
+public:
+    CustomXPFactory(SkXfermode::Mode mode);
+
+    void getInvariantBlendedColor(const GrProcOptInfo& colorPOI,
+                                  GrXPFactory::InvariantBlendedColor*) const override;
+
+private:
+    GrXferProcessor* onCreateXferProcessor(const GrCaps& caps,
+                                           const GrPipelineOptimizations& optimizations,
+                                           bool hasMixedSamples,
+                                           const DstTexture*) const override;
+
+    bool willReadDstColor(const GrCaps& caps,
+                          const GrPipelineOptimizations& optimizations,
+                          bool hasMixedSamples) const override;
+
+    bool onIsEqual(const GrXPFactory& xpfBase) const override {
+        const CustomXPFactory& xpf = xpfBase.cast<CustomXPFactory>();
+        return fMode == xpf.fMode;
+    }
+
+    GR_DECLARE_XP_FACTORY_TEST;
+
+    SkXfermode::Mode fMode;
+    GrBlendEquation  fHWBlendEquation;
+
+    typedef GrXPFactory INHERITED;
+};
+
+CustomXPFactory::CustomXPFactory(SkXfermode::Mode mode)
+    : fMode(mode),
+      fHWBlendEquation(hw_blend_equation(mode)) {
+    SkASSERT(GrCustomXfermode::IsSupportedMode(fMode));
+    this->initClassID<CustomXPFactory>();
+}
+
+GrXferProcessor* CustomXPFactory::onCreateXferProcessor(const GrCaps& caps,
+                                                        const GrPipelineOptimizations& opt,
+                                                        bool hasMixedSamples,
+                                                        const DstTexture* dstTexture) const {
+    if (can_use_hw_blend_equation(fHWBlendEquation, opt.fCoveragePOI, caps)) {
+        SkASSERT(!dstTexture || !dstTexture->texture());
+        return new CustomXP(fMode, fHWBlendEquation);
+    }
+    return new CustomXP(dstTexture, hasMixedSamples, fMode);
+}
+
+bool CustomXPFactory::willReadDstColor(const GrCaps& caps,
+                                       const GrPipelineOptimizations& optimizations,
+                                       bool hasMixedSamples) const {
+    return !can_use_hw_blend_equation(fHWBlendEquation, optimizations.fCoveragePOI, caps);
+}
+
+void CustomXPFactory::getInvariantBlendedColor(const GrProcOptInfo& colorPOI,
+                                               InvariantBlendedColor* blendedColor) const {
+    blendedColor->fWillBlendWithDst = true;
+    blendedColor->fKnownColorFlags = kNone_GrColorComponentFlags;
+}
+
+GR_DEFINE_XP_FACTORY_TEST(CustomXPFactory);
+const GrXPFactory* CustomXPFactory::TestCreate(GrProcessorTestData* d) {
+    int mode = d->fRandom->nextRangeU(SkXfermode::kLastCoeffMode + 1,
+                                      SkXfermode::kLastSeparableMode);
+
+    return new CustomXPFactory(static_cast<SkXfermode::Mode>(mode));
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+GrXPFactory* GrCustomXfermode::CreateXPFactory(SkXfermode::Mode mode) {
+    if (!GrCustomXfermode::IsSupportedMode(mode)) {
+        return nullptr;
+    } else {
+        return new CustomXPFactory(mode);
+    }
+}
diff --git a/gfx/skia/skia/src/gpu/effects/GrDashingEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrDashingEffect.cpp
index 9f6b77d64f3f..e62ede0a33c1 100644
--- a/gfx/skia/skia/src/gpu/effects/GrDashingEffect.cpp
+++ b/gfx/skia/skia/src/gpu/effects/GrDashingEffect.cpp
@@ -7,32 +7,32 @@
 
 #include "GrDashingEffect.h"
 
-#include "../GrAARectRenderer.h"
-
-#include "effects/GrVertexEffect.h"
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLVertexEffect.h"
-#include "gl/GrGLShaderBuilder.h"
-#include "gl/GrGLSL.h"
+#include "GrBatchFlushState.h"
+#include "GrBatchTest.h"
+#include "GrCaps.h"
+#include "GrGeometryProcessor.h"
 #include "GrContext.h"
 #include "GrCoordTransform.h"
+#include "GrDefaultGeoProcFactory.h"
 #include "GrDrawTarget.h"
-#include "GrDrawTargetCaps.h"
-#include "GrEffect.h"
-#include "GrGpu.h"
+#include "GrInvariantOutput.h"
+#include "GrProcessor.h"
 #include "GrStrokeInfo.h"
-#include "GrTBackendEffectFactory.h"
+#include "GrVertexBuffer.h"
 #include "SkGr.h"
+#include "batches/GrVertexBatch.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLGeometryProcessor.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+#include "glsl/GrGLSLVarying.h"
+#include "glsl/GrGLSLVertexShaderBuilder.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
 // Returns whether or not the gpu can fast path the dash line effect.
-static bool can_fast_path_dash(const SkPoint pts[2], const GrStrokeInfo& strokeInfo,
-                               const GrDrawTarget& target, const SkMatrix& viewMatrix) {
-    if (target.getDrawState().getRenderTarget()->isMultisampled()) {
-        return false;
-    }
-
+bool GrDashingEffect::CanDrawDashLine(const SkPoint pts[2], const GrStrokeInfo& strokeInfo,
+                                      const SkMatrix& viewMatrix) {
     // Pts must be either horizontal or vertical in src space
     if (pts[0].fX != pts[1].fX && pts[0].fY != pts[1].fY) {
         return false;
@@ -44,18 +44,18 @@ static bool can_fast_path_dash(const SkPoint pts[2], const GrStrokeInfo& strokeI
         return false;
     }
 
-    if (!strokeInfo.isDashed() || 2 != strokeInfo.dashCount()) {
+    if (!strokeInfo.isDashed() || 2 != strokeInfo.getDashCount()) {
         return false;
     }
 
-    const SkPathEffect::DashInfo& info = strokeInfo.getDashInfo();
-    if (0 == info.fIntervals[0] && 0 == info.fIntervals[1]) {
+    const SkScalar* intervals = strokeInfo.getDashIntervals();
+    if (0 == intervals[0] && 0 == intervals[1]) {
         return false;
     }
 
-    SkPaint::Cap cap = strokeInfo.getStrokeRec().getCap();
+    SkPaint::Cap cap = strokeInfo.getCap();
     // Current we do don't handle Round or Square cap dashes
-    if (SkPaint::kRound_Cap == cap && info.fIntervals[0] != 0.f) {
+    if (SkPaint::kRound_Cap == cap && intervals[0] != 0.f) {
         return false;
     }
 
@@ -63,18 +63,29 @@ static bool can_fast_path_dash(const SkPoint pts[2], const GrStrokeInfo& strokeI
 }
 
 namespace {
-
 struct DashLineVertex {
     SkPoint fPos;
     SkPoint fDashPos;
+    SkScalar fIntervalLength;
+    SkRect fRect;
+};
+struct DashCircleVertex {
+    SkPoint fPos;
+    SkPoint fDashPos;
+    SkScalar fIntervalLength;
+    SkScalar fRadius;
+    SkScalar fCenterX;
 };
 
-extern const GrVertexAttrib gDashLineVertexAttribs[] = {
-    { kVec2f_GrVertexAttribType, 0,                 kPosition_GrVertexAttribBinding },
-    { kVec2f_GrVertexAttribType, sizeof(SkPoint),   kEffect_GrVertexAttribBinding },
+enum DashAAMode {
+    kBW_DashAAMode,
+    kEdgeAA_DashAAMode,
+    kMSAA_DashAAMode,
+
+    kDashAAModeCount,
+};
 };
 
-};
 static void calc_dash_scaling(SkScalar* parallelScale, SkScalar* perpScale,
                             const SkMatrix& viewMatrix, const SkPoint pts[2]) {
     SkVector vecSrc = pts[1] - pts[0];
@@ -95,7 +106,7 @@ static void calc_dash_scaling(SkScalar* parallelScale, SkScalar* perpScale,
 
 // calculates the rotation needed to aligned pts to the x axis with pts[0] < pts[1]
 // Stores the rotation matrix in rotMatrix, and the mapped points in ptsRot
-static void align_to_x_axis(const SkPoint pts[2], SkMatrix* rotMatrix, SkPoint ptsRot[2] = NULL) {
+static void align_to_x_axis(const SkPoint pts[2], SkMatrix* rotMatrix, SkPoint ptsRot[2] = nullptr) {
     SkVector vec = pts[1] - pts[0];
     SkScalar mag = vec.length();
     SkScalar inv = mag ? SkScalarInvert(mag) : 0;
@@ -110,310 +121,651 @@ static void align_to_x_axis(const SkPoint pts[2], SkMatrix* rotMatrix, SkPoint p
 }
 
 // Assumes phase < sum of all intervals
-static SkScalar calc_start_adjustment(const SkPathEffect::DashInfo& info) {
-    SkASSERT(info.fPhase < info.fIntervals[0] + info.fIntervals[1]);
-    if (info.fPhase >= info.fIntervals[0] && info.fPhase != 0) {
-        SkScalar srcIntervalLen = info.fIntervals[0] + info.fIntervals[1];
-        return srcIntervalLen - info.fPhase;
+static SkScalar calc_start_adjustment(const SkScalar intervals[2], SkScalar phase) {
+    SkASSERT(phase < intervals[0] + intervals[1]);
+    if (phase >= intervals[0] && phase != 0) {
+        SkScalar srcIntervalLen = intervals[0] + intervals[1];
+        return srcIntervalLen - phase;
     }
     return 0;
 }
 
-static SkScalar calc_end_adjustment(const SkPathEffect::DashInfo& info, const SkPoint pts[2],
+static SkScalar calc_end_adjustment(const SkScalar intervals[2], const SkPoint pts[2],
                                     SkScalar phase, SkScalar* endingInt) {
     if (pts[1].fX <= pts[0].fX) {
         return 0;
     }
-    SkScalar srcIntervalLen = info.fIntervals[0] + info.fIntervals[1];
+    SkScalar srcIntervalLen = intervals[0] + intervals[1];
     SkScalar totalLen = pts[1].fX - pts[0].fX;
-    SkScalar temp = SkScalarDiv(totalLen, srcIntervalLen);
+    SkScalar temp = totalLen / srcIntervalLen;
     SkScalar numFullIntervals = SkScalarFloorToScalar(temp);
     *endingInt = totalLen - numFullIntervals * srcIntervalLen + phase;
-    temp = SkScalarDiv(*endingInt, srcIntervalLen);
+    temp = *endingInt / srcIntervalLen;
     *endingInt = *endingInt - SkScalarFloorToScalar(temp) * srcIntervalLen;
     if (0 == *endingInt) {
         *endingInt = srcIntervalLen;
     }
-    if (*endingInt > info.fIntervals[0]) {
-        if (0 == info.fIntervals[0]) {
+    if (*endingInt > intervals[0]) {
+        if (0 == intervals[0]) {
             *endingInt -= 0.01f; // make sure we capture the last zero size pnt (used if has caps)
         }
-        return *endingInt - info.fIntervals[0];
+        return *endingInt - intervals[0];
     }
     return 0;
 }
 
-static void setup_dashed_rect(const SkRect& rect, DashLineVertex* verts, int idx, const SkMatrix& matrix,
-                       SkScalar offset, SkScalar bloat, SkScalar len, SkScalar stroke) {
+enum DashCap {
+    kRound_DashCap,
+    kNonRound_DashCap,
+};
 
-        SkScalar startDashX = offset - bloat;
-        SkScalar endDashX = offset + len + bloat;
-        SkScalar startDashY = -stroke - bloat;
-        SkScalar endDashY = stroke + bloat;
-        verts[idx].fDashPos = SkPoint::Make(startDashX , startDashY);
-        verts[idx + 1].fDashPos = SkPoint::Make(startDashX, endDashY);
-        verts[idx + 2].fDashPos = SkPoint::Make(endDashX, endDashY);
-        verts[idx + 3].fDashPos = SkPoint::Make(endDashX, startDashY);
+static int kDashVertices = 4;
 
-        verts[idx].fPos = SkPoint::Make(rect.fLeft, rect.fTop);
-        verts[idx + 1].fPos = SkPoint::Make(rect.fLeft, rect.fBottom);
-        verts[idx + 2].fPos = SkPoint::Make(rect.fRight, rect.fBottom);
-        verts[idx + 3].fPos = SkPoint::Make(rect.fRight, rect.fTop);
+template <typename T>
+void setup_dashed_rect_common(const SkRect& rect, const SkMatrix& matrix, T* vertices, int idx,
+                              SkScalar offset, SkScalar bloatX, SkScalar bloatY, SkScalar len,
+                              SkScalar stroke) {
+    SkScalar startDashX = offset - bloatX;
+    SkScalar endDashX = offset + len + bloatX;
+    SkScalar startDashY = -stroke - bloatY;
+    SkScalar endDashY = stroke + bloatY;
+    vertices[idx].fDashPos = SkPoint::Make(startDashX , startDashY);
+    vertices[idx + 1].fDashPos = SkPoint::Make(startDashX, endDashY);
+    vertices[idx + 2].fDashPos = SkPoint::Make(endDashX, endDashY);
+    vertices[idx + 3].fDashPos = SkPoint::Make(endDashX, startDashY);
 
-        matrix.mapPointsWithStride(&verts[idx].fPos, sizeof(DashLineVertex), 4);
+    vertices[idx].fPos = SkPoint::Make(rect.fLeft, rect.fTop);
+    vertices[idx + 1].fPos = SkPoint::Make(rect.fLeft, rect.fBottom);
+    vertices[idx + 2].fPos = SkPoint::Make(rect.fRight, rect.fBottom);
+    vertices[idx + 3].fPos = SkPoint::Make(rect.fRight, rect.fTop);
+
+    matrix.mapPointsWithStride(&vertices[idx].fPos, sizeof(T), 4);
+}
+
+static void setup_dashed_rect(const SkRect& rect, void* vertices, int idx,
+                              const SkMatrix& matrix, SkScalar offset, SkScalar bloatX,
+                              SkScalar bloatY, SkScalar len, SkScalar stroke,
+                              SkScalar startInterval, SkScalar endInterval, SkScalar strokeWidth,
+                              DashCap cap, const size_t vertexStride) {
+    SkScalar intervalLength = startInterval + endInterval;
+
+    if (kRound_DashCap == cap) {
+        SkASSERT(vertexStride == sizeof(DashCircleVertex));
+        DashCircleVertex* verts = reinterpret_cast<DashCircleVertex*>(vertices);
+
+        setup_dashed_rect_common<DashCircleVertex>(rect, matrix, verts, idx, offset, bloatX,
+                                                   bloatY, len, stroke);
+
+        SkScalar radius = SkScalarHalf(strokeWidth) - 0.5f;
+        SkScalar centerX = SkScalarHalf(endInterval);
+
+        for (int i = 0; i < kDashVertices; i++) {
+            verts[idx + i].fIntervalLength = intervalLength;
+            verts[idx + i].fRadius = radius;
+            verts[idx + i].fCenterX = centerX;
+        }
+
+    } else {
+        SkASSERT(kNonRound_DashCap == cap && vertexStride == sizeof(DashLineVertex));
+        DashLineVertex* verts = reinterpret_cast<DashLineVertex*>(vertices);
+
+        setup_dashed_rect_common<DashLineVertex>(rect, matrix, verts, idx, offset, bloatX,
+                                                 bloatY, len, stroke);
+
+        SkScalar halfOffLen = SkScalarHalf(endInterval);
+        SkScalar halfStroke = SkScalarHalf(strokeWidth);
+        SkRect rectParam;
+        rectParam.set(halfOffLen + 0.5f, -halfStroke + 0.5f,
+                      halfOffLen + startInterval - 0.5f, halfStroke - 0.5f);
+        for (int i = 0; i < kDashVertices; i++) {
+            verts[idx + i].fIntervalLength = intervalLength;
+            verts[idx + i].fRect = rectParam;
+        }
+    }
+}
+
+static void setup_dashed_rect_pos(const SkRect& rect, int idx, const SkMatrix& matrix,
+                                  SkPoint* verts) {
+    verts[idx] = SkPoint::Make(rect.fLeft, rect.fTop);
+    verts[idx + 1] = SkPoint::Make(rect.fLeft, rect.fBottom);
+    verts[idx + 2] = SkPoint::Make(rect.fRight, rect.fBottom);
+    verts[idx + 3] = SkPoint::Make(rect.fRight, rect.fTop);
+    matrix.mapPoints(&verts[idx], 4);
 }
 
 
-bool GrDashingEffect::DrawDashLine(const SkPoint pts[2], const GrPaint& paint,
-                                   const GrStrokeInfo& strokeInfo, GrGpu* gpu,
-                                   GrDrawTarget* target, const SkMatrix& vm) {
+/**
+ * An GrGeometryProcessor that renders a dashed line.
+ * This GrGeometryProcessor is meant for dashed lines that only have a single on/off interval pair.
+ * Bounding geometry is rendered and the effect computes coverage based on the fragment's
+ * position relative to the dashed line.
+ */
+static GrGeometryProcessor* create_dash_gp(GrColor,
+                                           DashAAMode aaMode,
+                                           DashCap cap,
+                                           const SkMatrix& localMatrix,
+                                           bool usesLocalCoords);
 
-    if (!can_fast_path_dash(pts, strokeInfo, *target, vm)) {
-        return false;
+class DashBatch : public GrVertexBatch {
+public:
+    DEFINE_BATCH_CLASS_ID
+
+    struct Geometry {
+        SkMatrix fViewMatrix;
+        SkMatrix fSrcRotInv;
+        SkPoint fPtsRot[2];
+        SkScalar fSrcStrokeWidth;
+        SkScalar fPhase;
+        SkScalar fIntervals[2];
+        SkScalar fParallelScale;
+        SkScalar fPerpendicularScale;
+        GrColor fColor;
+    };
+
+    static GrDrawBatch* Create(const Geometry& geometry, SkPaint::Cap cap, DashAAMode aaMode,
+                               bool fullDash) {
+        return new DashBatch(geometry, cap, aaMode, fullDash);
     }
 
-    const SkPathEffect::DashInfo& info = strokeInfo.getDashInfo();
+    const char* name() const override { return "DashBatch"; }
 
-    SkPaint::Cap cap = strokeInfo.getStrokeRec().getCap();
+    void computePipelineOptimizations(GrInitInvariantOutput* color, 
+                                      GrInitInvariantOutput* coverage,
+                                      GrBatchToXPOverrides* overrides) const override {
+        // When this is called on a batch, there is only one geometry bundle
+        color->setKnownFourComponents(fGeoData[0].fColor);
+        coverage->setUnknownSingleComponent();
+        overrides->fUsePLSDstRead = false;
+    }
 
-    SkScalar srcStrokeWidth = strokeInfo.getStrokeRec().getWidth();
+    SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
 
-    // the phase should be normalized to be [0, sum of all intervals)
-    SkASSERT(info.fPhase >= 0 && info.fPhase < info.fIntervals[0] + info.fIntervals[1]);
+private:
+    DashBatch(const Geometry& geometry, SkPaint::Cap cap, DashAAMode aaMode, bool fullDash)
+        : INHERITED(ClassID()) {
+        fGeoData.push_back(geometry);
 
-    SkScalar srcPhase = info.fPhase;
+        fBatch.fAAMode = aaMode;
+        fBatch.fCap = cap;
+        fBatch.fFullDash = fullDash;
 
-    // Rotate the src pts so they are aligned horizontally with pts[0].fX < pts[1].fX
-    SkMatrix srcRotInv;
-    SkPoint ptsRot[2];
-    if (pts[0].fY != pts[1].fY || pts[0].fX > pts[1].fX) {
-        SkMatrix rotMatrix;
-        align_to_x_axis(pts, &rotMatrix, ptsRot);
-        if(!rotMatrix.invert(&srcRotInv)) {
-            GrPrintf("Failed to create invertible rotation matrix!\n");
-            return false;
+        // compute bounds
+        SkScalar halfStrokeWidth = 0.5f * geometry.fSrcStrokeWidth;
+        SkScalar xBloat = SkPaint::kButt_Cap == cap ? 0 : halfStrokeWidth;
+        fBounds.set(geometry.fPtsRot[0], geometry.fPtsRot[1]);
+        fBounds.outset(xBloat, halfStrokeWidth);
+
+        // Note, we actually create the combined matrix here, and save the work
+        SkMatrix& combinedMatrix = fGeoData[0].fSrcRotInv;
+        combinedMatrix.postConcat(geometry.fViewMatrix);
+        combinedMatrix.mapRect(&fBounds);
+    }
+
+    void initBatchTracker(const GrXPOverridesForBatch& overrides) override {
+        // Handle any color overrides
+        if (!overrides.readsColor()) {
+            fGeoData[0].fColor = GrColor_ILLEGAL;
         }
-    } else {
-        srcRotInv.reset();
-        memcpy(ptsRot, pts, 2 * sizeof(SkPoint));
+        overrides.getOverrideColorIfSet(&fGeoData[0].fColor);
+
+        // setup batch properties
+        fBatch.fColorIgnored = !overrides.readsColor();
+        fBatch.fColor = fGeoData[0].fColor;
+        fBatch.fUsesLocalCoords = overrides.readsLocalCoords();
+        fBatch.fCoverageIgnored = !overrides.readsCoverage();
     }
 
-    bool useAA = paint.isAntiAlias();
-
-    // Scale corrections of intervals and stroke from view matrix
-    SkScalar parallelScale;
-    SkScalar perpScale;
-    calc_dash_scaling(&parallelScale, &perpScale, vm, ptsRot);
-
-    bool hasCap = SkPaint::kButt_Cap != cap && 0 != srcStrokeWidth;
-
-    // We always want to at least stroke out half a pixel on each side in device space
-    // so 0.5f / perpScale gives us this min in src space
-    SkScalar halfSrcStroke = SkMaxScalar(srcStrokeWidth * 0.5f, 0.5f / perpScale);
-
-    SkScalar strokeAdj;
-    if (!hasCap) {
-        strokeAdj = 0.f;
-    } else {
-        strokeAdj = halfSrcStroke;
-    }
-
-    SkScalar startAdj = 0;
-
-    SkMatrix combinedMatrix = srcRotInv;
-    combinedMatrix.postConcat(vm);
-
-    bool lineDone = false;
-    SkRect startRect;
-    bool hasStartRect = false;
-    // If we are using AA, check to see if we are drawing a partial dash at the start. If so
-    // draw it separately here and adjust our start point accordingly
-    if (useAA) {
-        if (srcPhase > 0 && srcPhase < info.fIntervals[0]) {
-            SkPoint startPts[2];
-            startPts[0] = ptsRot[0];
-            startPts[1].fY = startPts[0].fY;
-            startPts[1].fX = SkMinScalar(startPts[0].fX + info.fIntervals[0] - srcPhase,
-                                         ptsRot[1].fX);
-            startRect.set(startPts, 2);
-            startRect.outset(strokeAdj, halfSrcStroke);
-
-            hasStartRect = true;
-            startAdj = info.fIntervals[0] + info.fIntervals[1] - srcPhase;
+    struct DashDraw {
+        DashDraw(const Geometry& geo) {
+            memcpy(fPtsRot, geo.fPtsRot, sizeof(geo.fPtsRot));
+            memcpy(fIntervals, geo.fIntervals, sizeof(geo.fIntervals));
+            fPhase = geo.fPhase;
         }
-    }
+        SkPoint fPtsRot[2];
+        SkScalar fIntervals[2];
+        SkScalar fPhase;
+        SkScalar fStartOffset;
+        SkScalar fStrokeWidth;
+        SkScalar fLineLength;
+        SkScalar fHalfDevStroke;
+        SkScalar fDevBloatX;
+        SkScalar fDevBloatY;
+        bool fLineDone;
+        bool fHasStartRect;
+        bool fHasEndRect;
+    };
 
-    // adjustments for start and end of bounding rect so we only draw dash intervals
-    // contained in the original line segment.
-    startAdj += calc_start_adjustment(info);
-    if (startAdj != 0) {
-        ptsRot[0].fX += startAdj;
-        srcPhase = 0;
-    }
-    SkScalar endingInterval = 0;
-    SkScalar endAdj = calc_end_adjustment(info, ptsRot, srcPhase, &endingInterval);
-    ptsRot[1].fX -= endAdj;
-    if (ptsRot[0].fX >= ptsRot[1].fX) {
-        lineDone = true;
-    }
+    void onPrepareDraws(Target* target) const override {
+        int instanceCount = fGeoData.count();
+        SkPaint::Cap cap = this->cap();
+        bool isRoundCap = SkPaint::kRound_Cap == cap;
+        DashCap capType = isRoundCap ? kRound_DashCap : kNonRound_DashCap;
 
-    SkRect endRect;
-    bool hasEndRect = false;
-    // If we are using AA, check to see if we are drawing a partial dash at then end. If so
-    // draw it separately here and adjust our end point accordingly
-    if (useAA && !lineDone) {
-        // If we adjusted the end then we will not be drawing a partial dash at the end.
-        // If we didn't adjust the end point then we just need to make sure the ending
-        // dash isn't a full dash
-        if (0 == endAdj && endingInterval != info.fIntervals[0]) {
-            SkPoint endPts[2];
-            endPts[1] = ptsRot[1];
-            endPts[0].fY = endPts[1].fY;
-            endPts[0].fX = endPts[1].fX - endingInterval;
+        SkAutoTUnref<const GrGeometryProcessor> gp;
+        if (this->fullDash()) {
+            gp.reset(create_dash_gp(this->color(), this->aaMode(), capType, this->viewMatrix(),
+                                    this->usesLocalCoords()));
+        } else {
+            // Set up the vertex data for the line and start/end dashes
+            using namespace GrDefaultGeoProcFactory;
+            Color color(this->color());
+            Coverage coverage(this->coverageIgnored() ? Coverage::kNone_Type :
+                                                        Coverage::kSolid_Type);
+            LocalCoords localCoords(this->usesLocalCoords() ? LocalCoords::kUsePosition_Type :
+                                                              LocalCoords::kUnused_Type);
+            gp.reset(CreateForDeviceSpace(color, coverage, localCoords, this->viewMatrix()));
+        }
 
-            endRect.set(endPts, 2);
-            endRect.outset(strokeAdj, halfSrcStroke);
+        if (!gp) {
+            SkDebugf("Could not create GrGeometryProcessor\n");
+            return;
+        }
 
-            hasEndRect = true;
-            endAdj = endingInterval + info.fIntervals[1];
+        target->initDraw(gp, this->pipeline());
 
-            ptsRot[1].fX -= endAdj;
-            if (ptsRot[0].fX >= ptsRot[1].fX) {
+        // useAA here means Edge AA or MSAA
+        bool useAA = this->aaMode() != kBW_DashAAMode;
+        bool fullDash = this->fullDash();
+
+        // We do two passes over all of the dashes.  First we setup the start, end, and bounds,
+        // rectangles.  We preserve all of this work in the rects / draws arrays below.  Then we
+        // iterate again over these decomposed dashes to generate vertices
+        static const int kNumStackDashes = 128;
+        SkSTArray<kNumStackDashes, SkRect, true> rects;
+        SkSTArray<kNumStackDashes, DashDraw, true> draws;
+
+        int totalRectCount = 0;
+        int rectOffset = 0;
+        rects.push_back_n(3 * instanceCount);
+        for (int i = 0; i < instanceCount; i++) {
+            const Geometry& args = fGeoData[i];
+
+            DashDraw& draw = draws.push_back(args);
+
+            bool hasCap = SkPaint::kButt_Cap != cap && 0 != args.fSrcStrokeWidth;
+
+            // We always want to at least stroke out half a pixel on each side in device space
+            // so 0.5f / perpScale gives us this min in src space
+            SkScalar halfSrcStroke =
+                    SkMaxScalar(args.fSrcStrokeWidth * 0.5f, 0.5f / args.fPerpendicularScale);
+
+            SkScalar strokeAdj;
+            if (!hasCap) {
+                strokeAdj = 0.f;
+            } else {
+                strokeAdj = halfSrcStroke;
+            }
+
+            SkScalar startAdj = 0;
+
+            bool lineDone = false;
+
+            // Too simplify the algorithm, we always push back rects for start and end rect.
+            // Otherwise we'd have to track start / end rects for each individual geometry
+            SkRect& bounds = rects[rectOffset++];
+            SkRect& startRect = rects[rectOffset++];
+            SkRect& endRect = rects[rectOffset++];
+
+            bool hasStartRect = false;
+            // If we are using AA, check to see if we are drawing a partial dash at the start. If so
+            // draw it separately here and adjust our start point accordingly
+            if (useAA) {
+                if (draw.fPhase > 0 && draw.fPhase < draw.fIntervals[0]) {
+                    SkPoint startPts[2];
+                    startPts[0] = draw.fPtsRot[0];
+                    startPts[1].fY = startPts[0].fY;
+                    startPts[1].fX = SkMinScalar(startPts[0].fX + draw.fIntervals[0] - draw.fPhase,
+                                                 draw.fPtsRot[1].fX);
+                    startRect.set(startPts, 2);
+                    startRect.outset(strokeAdj, halfSrcStroke);
+
+                    hasStartRect = true;
+                    startAdj = draw.fIntervals[0] + draw.fIntervals[1] - draw.fPhase;
+                }
+            }
+
+            // adjustments for start and end of bounding rect so we only draw dash intervals
+            // contained in the original line segment.
+            startAdj += calc_start_adjustment(draw.fIntervals, draw.fPhase);
+            if (startAdj != 0) {
+                draw.fPtsRot[0].fX += startAdj;
+                draw.fPhase = 0;
+            }
+            SkScalar endingInterval = 0;
+            SkScalar endAdj = calc_end_adjustment(draw.fIntervals, draw.fPtsRot, draw.fPhase,
+                                                  &endingInterval);
+            draw.fPtsRot[1].fX -= endAdj;
+            if (draw.fPtsRot[0].fX >= draw.fPtsRot[1].fX) {
                 lineDone = true;
             }
+
+            bool hasEndRect = false;
+            // If we are using AA, check to see if we are drawing a partial dash at then end. If so
+            // draw it separately here and adjust our end point accordingly
+            if (useAA && !lineDone) {
+                // If we adjusted the end then we will not be drawing a partial dash at the end.
+                // If we didn't adjust the end point then we just need to make sure the ending
+                // dash isn't a full dash
+                if (0 == endAdj && endingInterval != draw.fIntervals[0]) {
+                    SkPoint endPts[2];
+                    endPts[1] = draw.fPtsRot[1];
+                    endPts[0].fY = endPts[1].fY;
+                    endPts[0].fX = endPts[1].fX - endingInterval;
+
+                    endRect.set(endPts, 2);
+                    endRect.outset(strokeAdj, halfSrcStroke);
+
+                    hasEndRect = true;
+                    endAdj = endingInterval + draw.fIntervals[1];
+
+                    draw.fPtsRot[1].fX -= endAdj;
+                    if (draw.fPtsRot[0].fX >= draw.fPtsRot[1].fX) {
+                        lineDone = true;
+                    }
+                }
+            }
+
+            if (startAdj != 0) {
+                draw.fPhase = 0;
+            }
+
+            // Change the dashing info from src space into device space
+            SkScalar* devIntervals = draw.fIntervals;
+            devIntervals[0] = draw.fIntervals[0] * args.fParallelScale;
+            devIntervals[1] = draw.fIntervals[1] * args.fParallelScale;
+            SkScalar devPhase = draw.fPhase * args.fParallelScale;
+            SkScalar strokeWidth = args.fSrcStrokeWidth * args.fPerpendicularScale;
+
+            if ((strokeWidth < 1.f && useAA) || 0.f == strokeWidth) {
+                strokeWidth = 1.f;
+            }
+
+            SkScalar halfDevStroke = strokeWidth * 0.5f;
+
+            if (SkPaint::kSquare_Cap == cap && 0 != args.fSrcStrokeWidth) {
+                // add cap to on interval and remove from off interval
+                devIntervals[0] += strokeWidth;
+                devIntervals[1] -= strokeWidth;
+            }
+            SkScalar startOffset = devIntervals[1] * 0.5f + devPhase;
+
+            // For EdgeAA, we bloat in X & Y for both square and round caps.
+            // For MSAA, we don't bloat at all for square caps, and bloat in Y only for round caps.
+            SkScalar devBloatX = this->aaMode() == kEdgeAA_DashAAMode ? 0.5f : 0.0f;
+            SkScalar devBloatY = (SkPaint::kRound_Cap == cap && this->aaMode() == kMSAA_DashAAMode)
+                                 ? 0.5f : devBloatX;
+
+            SkScalar bloatX = devBloatX / args.fParallelScale;
+            SkScalar bloatY = devBloatY / args.fPerpendicularScale;
+
+            if (devIntervals[1] <= 0.f && useAA) {
+                // Case when we end up drawing a solid AA rect
+                // Reset the start rect to draw this single solid rect
+                // but it requires to upload a new intervals uniform so we can mimic
+                // one giant dash
+                draw.fPtsRot[0].fX -= hasStartRect ? startAdj : 0;
+                draw.fPtsRot[1].fX += hasEndRect ? endAdj : 0;
+                startRect.set(draw.fPtsRot, 2);
+                startRect.outset(strokeAdj, halfSrcStroke);
+                hasStartRect = true;
+                hasEndRect = false;
+                lineDone = true;
+
+                SkPoint devicePts[2];
+                args.fViewMatrix.mapPoints(devicePts, draw.fPtsRot, 2);
+                SkScalar lineLength = SkPoint::Distance(devicePts[0], devicePts[1]);
+                if (hasCap) {
+                    lineLength += 2.f * halfDevStroke;
+                }
+                devIntervals[0] = lineLength;
+            }
+
+            totalRectCount += !lineDone ? 1 : 0;
+            totalRectCount += hasStartRect ? 1 : 0;
+            totalRectCount += hasEndRect ? 1 : 0;
+
+            if (SkPaint::kRound_Cap == cap && 0 != args.fSrcStrokeWidth) {
+                // need to adjust this for round caps to correctly set the dashPos attrib on
+                // vertices
+                startOffset -= halfDevStroke;
+            }
+
+            if (!lineDone) {
+                SkPoint devicePts[2];
+                args.fViewMatrix.mapPoints(devicePts, draw.fPtsRot, 2);
+                draw.fLineLength = SkPoint::Distance(devicePts[0], devicePts[1]);
+                if (hasCap) {
+                    draw.fLineLength += 2.f * halfDevStroke;
+                }
+
+                bounds.set(draw.fPtsRot[0].fX, draw.fPtsRot[0].fY,
+                           draw.fPtsRot[1].fX, draw.fPtsRot[1].fY);
+                bounds.outset(bloatX + strokeAdj, bloatY + halfSrcStroke);
+            }
+
+            if (hasStartRect) {
+                SkASSERT(useAA);  // so that we know bloatX and bloatY have been set
+                startRect.outset(bloatX, bloatY);
+            }
+
+            if (hasEndRect) {
+                SkASSERT(useAA);  // so that we know bloatX and bloatY have been set
+                endRect.outset(bloatX, bloatY);
+            }
+
+            draw.fStartOffset = startOffset;
+            draw.fDevBloatX = devBloatX;
+            draw.fDevBloatY = devBloatY;
+            draw.fHalfDevStroke = halfDevStroke;
+            draw.fStrokeWidth = strokeWidth;
+            draw.fHasStartRect = hasStartRect;
+            draw.fLineDone = lineDone;
+            draw.fHasEndRect = hasEndRect;
         }
+
+        if (!totalRectCount) {
+            return;
+        }
+
+        QuadHelper helper;
+        void* vertices = helper.init(target, gp->getVertexStride(), totalRectCount);
+        if (!vertices) {
+            return;
+        }
+
+        int curVIdx = 0;
+        int rectIndex = 0;
+        for (int i = 0; i < instanceCount; i++) {
+            const Geometry& geom = fGeoData[i];
+
+            if (!draws[i].fLineDone) {
+                if (fullDash) {
+                    setup_dashed_rect(rects[rectIndex], vertices, curVIdx, geom.fSrcRotInv,
+                                      draws[i].fStartOffset, draws[i].fDevBloatX,
+                                      draws[i].fDevBloatY, draws[i].fLineLength,
+                                      draws[i].fHalfDevStroke, draws[i].fIntervals[0],
+                                      draws[i].fIntervals[1], draws[i].fStrokeWidth,
+                                      capType, gp->getVertexStride());
+                } else {
+                    SkPoint* verts = reinterpret_cast<SkPoint*>(vertices);
+                    SkASSERT(gp->getVertexStride() == sizeof(SkPoint));
+                    setup_dashed_rect_pos(rects[rectIndex], curVIdx, geom.fSrcRotInv, verts);
+                }
+                curVIdx += 4;
+            }
+            rectIndex++;
+
+            if (draws[i].fHasStartRect) {
+                if (fullDash) {
+                    setup_dashed_rect(rects[rectIndex], vertices, curVIdx, geom.fSrcRotInv,
+                                      draws[i].fStartOffset, draws[i].fDevBloatX,
+                                      draws[i].fDevBloatY, draws[i].fIntervals[0],
+                                      draws[i].fHalfDevStroke, draws[i].fIntervals[0],
+                                      draws[i].fIntervals[1], draws[i].fStrokeWidth, capType,
+                                      gp->getVertexStride());
+                } else {
+                    SkPoint* verts = reinterpret_cast<SkPoint*>(vertices);
+                    SkASSERT(gp->getVertexStride() == sizeof(SkPoint));
+                    setup_dashed_rect_pos(rects[rectIndex], curVIdx, geom.fSrcRotInv, verts);
+                }
+                curVIdx += 4;
+            }
+            rectIndex++;
+
+            if (draws[i].fHasEndRect) {
+                if (fullDash) {
+                    setup_dashed_rect(rects[rectIndex], vertices, curVIdx, geom.fSrcRotInv,
+                                      draws[i].fStartOffset, draws[i].fDevBloatX,
+                                      draws[i].fDevBloatY, draws[i].fIntervals[0],
+                                      draws[i].fHalfDevStroke, draws[i].fIntervals[0],
+                                      draws[i].fIntervals[1], draws[i].fStrokeWidth, capType,
+                                      gp->getVertexStride());
+                } else {
+                    SkPoint* verts = reinterpret_cast<SkPoint*>(vertices);
+                    SkASSERT(gp->getVertexStride() == sizeof(SkPoint));
+                    setup_dashed_rect_pos(rects[rectIndex], curVIdx, geom.fSrcRotInv, verts);
+                }
+                curVIdx += 4;
+            }
+            rectIndex++;
+        }
+        SkASSERT(0 == (curVIdx % 4) && (curVIdx / 4) == totalRectCount);
+        helper.recordDraw(target);
     }
 
-    if (startAdj != 0) {
-        srcPhase = 0;
+    bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override {
+        DashBatch* that = t->cast<DashBatch>();
+        if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *that->pipeline(),
+                                    that->bounds(), caps)) {
+            return false;
+        }
+
+        if (this->aaMode() != that->aaMode()) {
+            return false;
+        }
+
+        if (this->fullDash() != that->fullDash()) {
+            return false;
+        }
+
+        if (this->cap() != that->cap()) {
+            return false;
+        }
+
+        // TODO vertex color
+        if (this->color() != that->color()) {
+            return false;
+        }
+
+        SkASSERT(this->usesLocalCoords() == that->usesLocalCoords());
+        if (this->usesLocalCoords() && !this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
+            return false;
+        }
+
+        fGeoData.push_back_n(that->geoData()->count(), that->geoData()->begin());
+        this->joinBounds(that->bounds());
+        return true;
     }
 
-    // Change the dashing info from src space into device space
-    SkScalar devIntervals[2];
-    devIntervals[0] = info.fIntervals[0] * parallelScale;
-    devIntervals[1] = info.fIntervals[1] * parallelScale;
-    SkScalar devPhase = srcPhase * parallelScale;
-    SkScalar strokeWidth = srcStrokeWidth * perpScale;
+    GrColor color() const { return fBatch.fColor; }
+    bool usesLocalCoords() const { return fBatch.fUsesLocalCoords; }
+    const SkMatrix& viewMatrix() const { return fGeoData[0].fViewMatrix; }
+    DashAAMode aaMode() const { return fBatch.fAAMode; }
+    bool fullDash() const { return fBatch.fFullDash; }
+    SkPaint::Cap cap() const { return fBatch.fCap; }
+    bool coverageIgnored() const { return fBatch.fCoverageIgnored; }
 
-    if ((strokeWidth < 1.f && !useAA) || 0.f == strokeWidth) {
-        strokeWidth = 1.f;
+    struct BatchTracker {
+        GrColor fColor;
+        bool fUsesLocalCoords;
+        bool fColorIgnored;
+        bool fCoverageIgnored;
+        SkPaint::Cap fCap;
+        DashAAMode fAAMode;
+        bool fFullDash;
+    };
+
+    static const int kVertsPerDash = 4;
+    static const int kIndicesPerDash = 6;
+
+    BatchTracker fBatch;
+    SkSTArray<1, Geometry, true> fGeoData;
+
+    typedef GrVertexBatch INHERITED;
+};
+
+static GrDrawBatch* create_batch(GrColor color, const SkMatrix& viewMatrix, const SkPoint pts[2],
+                                 bool useAA, const GrStrokeInfo& strokeInfo, bool msaaRT) {
+    const SkScalar* intervals = strokeInfo.getDashIntervals();
+    SkScalar phase = strokeInfo.getDashPhase();
+
+    SkPaint::Cap cap = strokeInfo.getCap();
+
+    DashBatch::Geometry geometry;
+    geometry.fSrcStrokeWidth = strokeInfo.getWidth();
+
+    // the phase should be normalized to be [0, sum of all intervals)
+    SkASSERT(phase >= 0 && phase < intervals[0] + intervals[1]);
+
+    // Rotate the src pts so they are aligned horizontally with pts[0].fX < pts[1].fX
+    if (pts[0].fY != pts[1].fY || pts[0].fX > pts[1].fX) {
+        SkMatrix rotMatrix;
+        align_to_x_axis(pts, &rotMatrix, geometry.fPtsRot);
+        if(!rotMatrix.invert(&geometry.fSrcRotInv)) {
+            SkDebugf("Failed to create invertible rotation matrix!\n");
+            return nullptr;
+        }
+    } else {
+        geometry.fSrcRotInv.reset();
+        memcpy(geometry.fPtsRot, pts, 2 * sizeof(SkPoint));
     }
 
-    SkScalar halfDevStroke = strokeWidth * 0.5f;
+    // Scale corrections of intervals and stroke from view matrix
+    calc_dash_scaling(&geometry.fParallelScale, &geometry.fPerpendicularScale, viewMatrix,
+                      geometry.fPtsRot);
 
-    if (SkPaint::kSquare_Cap == cap && 0 != srcStrokeWidth) {
+    SkScalar offInterval = intervals[1] * geometry.fParallelScale;
+    SkScalar strokeWidth = geometry.fSrcStrokeWidth * geometry.fPerpendicularScale;
+
+    if (SkPaint::kSquare_Cap == cap && 0 != geometry.fSrcStrokeWidth) {
         // add cap to on interveal and remove from off interval
-        devIntervals[0] += strokeWidth;
-        devIntervals[1] -= strokeWidth;
-    }
-    SkScalar startOffset = devIntervals[1] * 0.5f + devPhase;
-
-    SkScalar bloatX = useAA ? 0.5f / parallelScale : 0.f;
-    SkScalar bloatY = useAA ? 0.5f / perpScale : 0.f;
-
-    SkScalar devBloat = useAA ? 0.5f : 0.f;
-
-    GrDrawState* drawState = target->drawState();
-    if (devIntervals[1] <= 0.f && useAA) {
-        // Case when we end up drawing a solid AA rect
-        // Reset the start rect to draw this single solid rect
-        // but it requires to upload a new intervals uniform so we can mimic
-        // one giant dash
-        ptsRot[0].fX -= hasStartRect ? startAdj : 0;
-        ptsRot[1].fX += hasEndRect ? endAdj : 0;
-        startRect.set(ptsRot, 2);
-        startRect.outset(strokeAdj, halfSrcStroke);
-        hasStartRect = true;
-        hasEndRect = false;
-        lineDone = true;
-
-        SkPoint devicePts[2];
-        vm.mapPoints(devicePts, ptsRot, 2);
-        SkScalar lineLength = SkPoint::Distance(devicePts[0], devicePts[1]);
-        if (hasCap) {
-            lineLength += 2.f * halfDevStroke;
-        }
-        devIntervals[0] = lineLength;
-    }
-    if (devIntervals[1] > 0.f || useAA) {
-        SkPathEffect::DashInfo devInfo;
-        devInfo.fPhase = devPhase;
-        devInfo.fCount = 2;
-        devInfo.fIntervals = devIntervals;
-        GrEffectEdgeType edgeType= useAA ? kFillAA_GrEffectEdgeType :
-            kFillBW_GrEffectEdgeType;
-        bool isRoundCap = SkPaint::kRound_Cap == cap;
-        GrDashingEffect::DashCap capType = isRoundCap ? GrDashingEffect::kRound_DashCap :
-                                                        GrDashingEffect::kNonRound_DashCap;
-        drawState->addCoverageEffect(
-            GrDashingEffect::Create(edgeType, devInfo, strokeWidth, capType), 1)->unref();
+        offInterval -= strokeWidth;
     }
 
-    // Set up the vertex data for the line and start/end dashes
-    drawState->setVertexAttribs<gDashLineVertexAttribs>(SK_ARRAY_COUNT(gDashLineVertexAttribs));
+    DashAAMode aaMode = msaaRT ? kMSAA_DashAAMode :
+                                 useAA ? kEdgeAA_DashAAMode : kBW_DashAAMode;
 
-    int totalRectCnt = 0;
+    // TODO we can do a real rect call if not using fulldash(ie no off interval, not using AA)
+    bool fullDash = offInterval > 0.f || aaMode != kBW_DashAAMode;
 
-    totalRectCnt += !lineDone ? 1 : 0;
-    totalRectCnt += hasStartRect ? 1 : 0;
-    totalRectCnt += hasEndRect ? 1 : 0;
+    geometry.fColor = color;
+    geometry.fViewMatrix = viewMatrix;
+    geometry.fPhase = phase;
+    geometry.fIntervals[0] = intervals[0];
+    geometry.fIntervals[1] = intervals[1];
 
-    GrDrawTarget::AutoReleaseGeometry geo(target, totalRectCnt * 4, 0);
-    if (!geo.succeeded()) {
-        GrPrintf("Failed to get space for vertices!\n");
+    return DashBatch::Create(geometry, cap, aaMode, fullDash);
+}
+
+bool GrDashingEffect::DrawDashLine(GrDrawTarget* target,
+                                   const GrPipelineBuilder& pipelineBuilder, GrColor color,
+                                   const SkMatrix& viewMatrix, const SkPoint pts[2],
+                                   bool useAA, const GrStrokeInfo& strokeInfo) {
+    SkAutoTUnref<GrDrawBatch> batch(
+            create_batch(color, viewMatrix, pts, useAA, strokeInfo,
+                         pipelineBuilder.getRenderTarget()->isUnifiedMultisampled()));
+    if (!batch) {
         return false;
     }
 
-    DashLineVertex* verts = reinterpret_cast<DashLineVertex*>(geo.vertices());
-
-    int curVIdx = 0;
-
-    if (SkPaint::kRound_Cap == cap && 0 != srcStrokeWidth) {
-        // need to adjust this for round caps to correctly set the dashPos attrib on vertices
-        startOffset -= halfDevStroke;
-    }
-
-    // Draw interior part of dashed line
-    if (!lineDone) {
-        SkPoint devicePts[2];
-        vm.mapPoints(devicePts, ptsRot, 2);
-        SkScalar lineLength = SkPoint::Distance(devicePts[0], devicePts[1]);
-        if (hasCap) {
-            lineLength += 2.f * halfDevStroke;
-        }
-
-        SkRect bounds;
-        bounds.set(ptsRot[0].fX, ptsRot[0].fY, ptsRot[1].fX, ptsRot[1].fY);
-        bounds.outset(bloatX + strokeAdj, bloatY + halfSrcStroke);
-        setup_dashed_rect(bounds, verts, curVIdx, combinedMatrix, startOffset, devBloat,
-                          lineLength, halfDevStroke);
-        curVIdx += 4;
-    }
-
-    if (hasStartRect) {
-        SkASSERT(useAA);  // so that we know bloatX and bloatY have been set
-        startRect.outset(bloatX, bloatY);
-        setup_dashed_rect(startRect, verts, curVIdx, combinedMatrix, startOffset, devBloat,
-                          devIntervals[0], halfDevStroke);
-        curVIdx += 4;
-    }
-
-    if (hasEndRect) {
-        SkASSERT(useAA);  // so that we know bloatX and bloatY have been set
-        endRect.outset(bloatX, bloatY);
-        setup_dashed_rect(endRect, verts, curVIdx, combinedMatrix, startOffset, devBloat,
-                          devIntervals[0], halfDevStroke);
-    }
-
-    target->setIndexSourceToBuffer(gpu->getContext()->getQuadIndexBuffer());
-    target->drawIndexedInstances(kTriangles_GrPrimitiveType, totalRectCnt, 4, 6);
-    target->resetIndexSource();
+    target->drawBatch(pipelineBuilder, batch);
     return true;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
 class GLDashingCircleEffect;
+
 /*
  * This effect will draw a dotted line (defined as a dashed lined with round caps and no on
  * interval). The radius of the dots is given by the strokeWidth and the spacing by the DashInfo.
@@ -423,199 +775,210 @@ class GLDashingCircleEffect;
  * transform the line to be horizontal, with the start of line at the origin then shifted to the
  * right by half the off interval. The line then goes in the positive x direction.
  */
-class DashingCircleEffect : public GrVertexEffect {
+class DashingCircleEffect : public GrGeometryProcessor {
 public:
     typedef SkPathEffect::DashInfo DashInfo;
 
-    static GrEffect* Create(GrEffectEdgeType edgeType, const DashInfo& info, SkScalar radius);
+    static GrGeometryProcessor* Create(GrColor,
+                                       DashAAMode aaMode,
+                                       const SkMatrix& localMatrix,
+                                       bool usesLocalCoords);
 
-    virtual ~DashingCircleEffect();
+    const char* name() const override { return "DashingCircleEffect"; }
 
-    static const char* Name() { return "DashingCircleEffect"; }
+    const Attribute* inPosition() const { return fInPosition; }
 
-    GrEffectEdgeType getEdgeType() const { return fEdgeType; }
+    const Attribute* inDashParams() const { return fInDashParams; }
 
-    SkScalar getRadius() const { return fRadius; }
+    const Attribute* inCircleParams() const { return fInCircleParams; }
 
-    SkScalar getCenterX() const { return fCenterX; }
+    DashAAMode aaMode() const { return fAAMode; }
 
-    SkScalar getIntervalLength() const { return fIntervalLength; }
+    GrColor color() const { return fColor; }
 
-    typedef GLDashingCircleEffect GLEffect;
+    bool colorIgnored() const { return GrColor_ILLEGAL == fColor; }
 
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
+    const SkMatrix& localMatrix() const { return fLocalMatrix; }
 
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
+    bool usesLocalCoords() const { return fUsesLocalCoords; }
+
+    void getGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder* b) const override;
+
+    GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override;
 
 private:
-    DashingCircleEffect(GrEffectEdgeType edgeType, const DashInfo& info, SkScalar radius);
+    DashingCircleEffect(GrColor, DashAAMode aaMode, const SkMatrix& localMatrix,
+                        bool usesLocalCoords);
 
-    virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE;
+    GrColor             fColor;
+    SkMatrix            fLocalMatrix;
+    bool                fUsesLocalCoords;
+    DashAAMode          fAAMode;
+    const Attribute*    fInPosition;
+    const Attribute*    fInDashParams;
+    const Attribute*    fInCircleParams;
 
-    GrEffectEdgeType    fEdgeType;
-    SkScalar            fIntervalLength;
-    SkScalar            fRadius;
-    SkScalar            fCenterX;
+    GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
 
-    GR_DECLARE_EFFECT_TEST;
-
-    typedef GrVertexEffect INHERITED;
+    typedef GrGeometryProcessor INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
-class GLDashingCircleEffect : public GrGLVertexEffect {
+class GLDashingCircleEffect : public GrGLSLGeometryProcessor {
 public:
-    GLDashingCircleEffect(const GrBackendEffectFactory&, const GrDrawEffect&);
+    GLDashingCircleEffect();
 
-    virtual void emitCode(GrGLFullShaderBuilder* builder,
-                          const GrDrawEffect& drawEffect,
-                          const GrEffectKey& key,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    void onEmitCode(EmitArgs&, GrGPArgs*) override;
 
-    static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*);
+    static inline void GenKey(const GrGeometryProcessor&,
+                              const GrGLSLCaps&,
+                              GrProcessorKeyBuilder*);
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+    void setData(const GrGLSLProgramDataManager&, const GrPrimitiveProcessor&) override;
+
+    void setTransformData(const GrPrimitiveProcessor& primProc,
+                          const GrGLSLProgramDataManager& pdman,
+                          int index,
+                          const SkTArray<const GrCoordTransform*, true>& transforms) override {
+        this->setTransformDataHelper<DashingCircleEffect>(primProc, pdman, index, transforms);
+    }
 
 private:
-    GrGLUniformManager::UniformHandle   fParamUniform;
-    SkScalar                            fPrevRadius;
-    SkScalar                            fPrevCenterX;
-    SkScalar                            fPrevIntervalLength;
-    typedef GrGLVertexEffect INHERITED;
+    UniformHandle fParamUniform;
+    UniformHandle fColorUniform;
+    GrColor       fColor;
+    SkScalar      fPrevRadius;
+    SkScalar      fPrevCenterX;
+    SkScalar      fPrevIntervalLength;
+    typedef GrGLSLGeometryProcessor INHERITED;
 };
 
-GLDashingCircleEffect::GLDashingCircleEffect(const GrBackendEffectFactory& factory,
-                                             const GrDrawEffect& drawEffect)
-    : INHERITED (factory) {
+GLDashingCircleEffect::GLDashingCircleEffect() {
+    fColor = GrColor_ILLEGAL;
     fPrevRadius = SK_ScalarMin;
     fPrevCenterX = SK_ScalarMin;
     fPrevIntervalLength = SK_ScalarMax;
 }
 
-void GLDashingCircleEffect::emitCode(GrGLFullShaderBuilder* builder,
-                                    const GrDrawEffect& drawEffect,
-                                    const GrEffectKey& key,
-                                    const char* outputColor,
-                                    const char* inputColor,
-                                    const TransformedCoordsArray&,
-                                    const TextureSamplerArray& samplers) {
-    const DashingCircleEffect& dce = drawEffect.castEffect<DashingCircleEffect>();
-    const char *paramName;
-    // The param uniforms, xyz, refer to circle radius - 0.5, cicles center x coord, and
-    // the total interval length of the dash.
-    fParamUniform = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                       kVec3f_GrSLType,
-                                       "params",
-                                       &paramName);
+void GLDashingCircleEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
+    const DashingCircleEffect& dce = args.fGP.cast<DashingCircleEffect>();
+    GrGLSLGPBuilder* pb = args.fPB;
+    GrGLSLVertexBuilder* vertBuilder = args.fVertBuilder;
+    GrGLSLVaryingHandler* varyingHandler = args.fVaryingHandler;
 
-    const char *vsCoordName, *fsCoordName;
-    builder->addVarying(kVec2f_GrSLType, "Coord", &vsCoordName, &fsCoordName);
-    const SkString* attr0Name =
-        builder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[0]);
-    builder->vsCodeAppendf("\t%s = %s;\n", vsCoordName, attr0Name->c_str());
+    // emit attributes
+    varyingHandler->emitAttributes(dce);
+
+    // XY are dashPos, Z is dashInterval
+    GrGLSLVertToFrag dashParams(kVec3f_GrSLType);
+    varyingHandler->addVarying("DashParam", &dashParams);
+    vertBuilder->codeAppendf("%s = %s;", dashParams.vsOut(), dce.inDashParams()->fName);
+
+    // x refers to circle radius - 0.5, y refers to cicle's center x coord
+    GrGLSLVertToFrag circleParams(kVec2f_GrSLType);
+    varyingHandler->addVarying("CircleParams", &circleParams);
+    vertBuilder->codeAppendf("%s = %s;", circleParams.vsOut(), dce.inCircleParams()->fName);
+
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    // Setup pass through color
+    if (!dce.colorIgnored()) {
+        this->setupUniformColor(pb, fragBuilder, args.fOutputColor, &fColorUniform);
+    }
+
+    // Setup position
+    this->setupPosition(pb, vertBuilder, gpArgs, dce.inPosition()->fName);
+
+    // emit transforms
+    this->emitTransforms(args.fPB,
+                         vertBuilder,
+                         varyingHandler,
+                         gpArgs->fPositionVar,
+                         dce.inPosition()->fName,
+                         dce.localMatrix(),
+                         args.fTransformsIn,
+                         args.fTransformsOut);
 
     // transforms all points so that we can compare them to our test circle
-    builder->fsCodeAppendf("\t\tfloat xShifted = %s.x - floor(%s.x / %s.z) * %s.z;\n",
-                           fsCoordName, fsCoordName, paramName, paramName);
-    builder->fsCodeAppendf("\t\tvec2 fragPosShifted = vec2(xShifted, %s.y);\n", fsCoordName);
-    builder->fsCodeAppendf("\t\tvec2 center = vec2(%s.y, 0.0);\n", paramName);
-    builder->fsCodeAppend("\t\tfloat dist = length(center - fragPosShifted);\n");
-    if (GrEffectEdgeTypeIsAA(dce.getEdgeType())) {
-        builder->fsCodeAppendf("\t\tfloat diff = dist - %s.x;\n", paramName);
-        builder->fsCodeAppend("\t\tdiff = 1.0 - diff;\n");
-        builder->fsCodeAppend("\t\tfloat alpha = clamp(diff, 0.0, 1.0);\n");
+    fragBuilder->codeAppendf("float xShifted = %s.x - floor(%s.x / %s.z) * %s.z;",
+                             dashParams.fsIn(), dashParams.fsIn(), dashParams.fsIn(),
+                             dashParams.fsIn());
+    fragBuilder->codeAppendf("vec2 fragPosShifted = vec2(xShifted, %s.y);", dashParams.fsIn());
+    fragBuilder->codeAppendf("vec2 center = vec2(%s.y, 0.0);", circleParams.fsIn());
+    fragBuilder->codeAppend("float dist = length(center - fragPosShifted);");
+    if (dce.aaMode() != kBW_DashAAMode) {
+        fragBuilder->codeAppendf("float diff = dist - %s.x;", circleParams.fsIn());
+        fragBuilder->codeAppend("diff = 1.0 - diff;");
+        fragBuilder->codeAppend("float alpha = clamp(diff, 0.0, 1.0);");
     } else {
-        builder->fsCodeAppendf("\t\tfloat alpha = 1.0;\n");
-        builder->fsCodeAppendf("\t\talpha *=  dist < %s.x + 0.5 ? 1.0 : 0.0;\n", paramName);
+        fragBuilder->codeAppendf("float alpha = 1.0;");
+        fragBuilder->codeAppendf("alpha *=  dist < %s.x + 0.5 ? 1.0 : 0.0;", circleParams.fsIn());
     }
-    builder->fsCodeAppendf("\t\t%s = %s;\n", outputColor,
-                           (GrGLSLExpr4(inputColor) * GrGLSLExpr1("alpha")).c_str());
+    fragBuilder->codeAppendf("%s = vec4(alpha);", args.fOutputCoverage);
 }
 
-void GLDashingCircleEffect::setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) {
-    const DashingCircleEffect& dce = drawEffect.castEffect<DashingCircleEffect>();
-    SkScalar radius = dce.getRadius();
-    SkScalar centerX = dce.getCenterX();
-    SkScalar intervalLength = dce.getIntervalLength();
-    if (radius != fPrevRadius || centerX != fPrevCenterX || intervalLength != fPrevIntervalLength) {
-        uman.set3f(fParamUniform, radius - 0.5f, centerX, intervalLength);
-        fPrevRadius = radius;
-        fPrevCenterX = centerX;
-        fPrevIntervalLength = intervalLength;
+void GLDashingCircleEffect::setData(const GrGLSLProgramDataManager& pdman,
+                                    const GrPrimitiveProcessor& processor) {
+    const DashingCircleEffect& dce = processor.cast<DashingCircleEffect>();
+    if (dce.color() != fColor) {
+        float c[4];
+        GrColorToRGBAFloat(dce.color(), c);
+        pdman.set4fv(fColorUniform, 1, c);
+        fColor = dce.color();
     }
 }
 
-void GLDashingCircleEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
-                                   GrEffectKeyBuilder* b) {
-    const DashingCircleEffect& dce = drawEffect.castEffect<DashingCircleEffect>();
-    b->add32(dce.getEdgeType());
+void GLDashingCircleEffect::GenKey(const GrGeometryProcessor& gp,
+                                   const GrGLSLCaps&,
+                                   GrProcessorKeyBuilder* b) {
+    const DashingCircleEffect& dce = gp.cast<DashingCircleEffect>();
+    uint32_t key = 0;
+    key |= dce.usesLocalCoords() && dce.localMatrix().hasPerspective() ? 0x1 : 0x0;
+    key |= dce.colorIgnored() ? 0x2 : 0x0;
+    key |= dce.aaMode() << 8;
+    b->add32(key);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-GrEffect* DashingCircleEffect::Create(GrEffectEdgeType edgeType, const DashInfo& info,
-                                      SkScalar radius) {
-    if (info.fCount != 2 || info.fIntervals[0] != 0) {
-        return NULL;
-    }
-
-    return SkNEW_ARGS(DashingCircleEffect, (edgeType, info, radius));
+GrGeometryProcessor* DashingCircleEffect::Create(GrColor color,
+                                                 DashAAMode aaMode,
+                                                 const SkMatrix& localMatrix,
+                                                 bool usesLocalCoords) {
+    return new DashingCircleEffect(color, aaMode, localMatrix, usesLocalCoords);
 }
 
-DashingCircleEffect::~DashingCircleEffect() {}
-
-void DashingCircleEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
-    *validFlags = 0;
+void DashingCircleEffect::getGLSLProcessorKey(const GrGLSLCaps& caps,
+                                              GrProcessorKeyBuilder* b) const {
+    GLDashingCircleEffect::GenKey(*this, caps, b);
 }
 
-const GrBackendEffectFactory& DashingCircleEffect::getFactory() const {
-    return GrTBackendEffectFactory<DashingCircleEffect>::getInstance();
+GrGLSLPrimitiveProcessor* DashingCircleEffect::createGLSLInstance(const GrGLSLCaps&) const {
+    return new GLDashingCircleEffect();
 }
 
-DashingCircleEffect::DashingCircleEffect(GrEffectEdgeType edgeType, const DashInfo& info,
-                                         SkScalar radius)
-    : fEdgeType(edgeType) {
-    SkScalar onLen = info.fIntervals[0];
-    SkScalar offLen = info.fIntervals[1];
-    fIntervalLength = onLen + offLen;
-    fRadius = radius;
-    fCenterX = SkScalarHalf(offLen);
-
-    this->addVertexAttrib(kVec2f_GrSLType);
+DashingCircleEffect::DashingCircleEffect(GrColor color,
+                                         DashAAMode aaMode,
+                                         const SkMatrix& localMatrix,
+                                         bool usesLocalCoords)
+    : fColor(color)
+    , fLocalMatrix(localMatrix)
+    , fUsesLocalCoords(usesLocalCoords)
+    , fAAMode(aaMode) {
+    this->initClassID<DashingCircleEffect>();
+    fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType));
+    fInDashParams = &this->addVertexAttrib(Attribute("inDashParams", kVec3f_GrVertexAttribType));
+    fInCircleParams = &this->addVertexAttrib(Attribute("inCircleParams",
+                                                       kVec2f_GrVertexAttribType));
 }
 
-bool DashingCircleEffect::onIsEqual(const GrEffect& other) const {
-    const DashingCircleEffect& dce = CastEffect<DashingCircleEffect>(other);
-    return (fEdgeType == dce.fEdgeType &&
-            fIntervalLength == dce.fIntervalLength &&
-            fRadius == dce.fRadius &&
-            fCenterX == dce.fCenterX);
-}
+GR_DEFINE_GEOMETRY_PROCESSOR_TEST(DashingCircleEffect);
 
-GR_DEFINE_EFFECT_TEST(DashingCircleEffect);
-
-GrEffect* DashingCircleEffect::TestCreate(SkRandom* random,
-                                          GrContext*,
-                                          const GrDrawTargetCaps& caps,
-                                          GrTexture*[]) {
-    GrEffect* effect;
-    GrEffectEdgeType edgeType = static_cast<GrEffectEdgeType>(random->nextULessThan(
-            kGrEffectEdgeTypeCnt));
-    SkScalar strokeWidth = random->nextRangeScalar(0, 100.f);
-    DashInfo info;
-    info.fCount = 2;
-    SkAutoTArray<SkScalar> intervals(info.fCount);
-    info.fIntervals = intervals.get();
-    info.fIntervals[0] = 0; 
-    info.fIntervals[1] = random->nextRangeScalar(0, 10.f);
-    info.fPhase = random->nextRangeScalar(0, info.fIntervals[1]);
-
-    effect = DashingCircleEffect::Create(edgeType, info, strokeWidth);
-    return effect;
+const GrGeometryProcessor* DashingCircleEffect::TestCreate(GrProcessorTestData* d) {
+    DashAAMode aaMode = static_cast<DashAAMode>(d->fRandom->nextULessThan(kDashAAModeCount));
+    return DashingCircleEffect::Create(GrRandomColor(d->fRandom),
+                                      aaMode, GrTest::TestMatrix(d->fRandom),
+                                      d->fRandom->nextBool());
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -631,221 +994,323 @@ class GLDashingLineEffect;
  * line at the origin then shifted to the right by half the off interval. The line then goes in the
  * positive x direction.
  */
-class DashingLineEffect : public GrVertexEffect {
+class DashingLineEffect : public GrGeometryProcessor {
 public:
     typedef SkPathEffect::DashInfo DashInfo;
 
-    static GrEffect* Create(GrEffectEdgeType edgeType, const DashInfo& info, SkScalar strokeWidth);
+    static GrGeometryProcessor* Create(GrColor,
+                                       DashAAMode aaMode,
+                                       const SkMatrix& localMatrix,
+                                       bool usesLocalCoords);
 
-    virtual ~DashingLineEffect();
+    const char* name() const override { return "DashingEffect"; }
 
-    static const char* Name() { return "DashingEffect"; }
+    const Attribute* inPosition() const { return fInPosition; }
 
-    GrEffectEdgeType getEdgeType() const { return fEdgeType; }
+    const Attribute* inDashParams() const { return fInDashParams; }
 
-    const SkRect& getRect() const { return fRect; }
+    const Attribute* inRectParams() const { return fInRectParams; }
 
-    SkScalar getIntervalLength() const { return fIntervalLength; }
+    DashAAMode aaMode() const { return fAAMode; }
 
-    typedef GLDashingLineEffect GLEffect;
+    GrColor color() const { return fColor; }
 
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
+    bool colorIgnored() const { return GrColor_ILLEGAL == fColor; }
 
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
+    const SkMatrix& localMatrix() const { return fLocalMatrix; }
+
+    bool usesLocalCoords() const { return fUsesLocalCoords; }
+
+    void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
+
+    GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override;
 
 private:
-    DashingLineEffect(GrEffectEdgeType edgeType, const DashInfo& info, SkScalar strokeWidth);
+    DashingLineEffect(GrColor, DashAAMode aaMode, const SkMatrix& localMatrix,
+                      bool usesLocalCoords);
 
-    virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE;
+    GrColor             fColor;
+    SkMatrix            fLocalMatrix;
+    bool                fUsesLocalCoords;
+    DashAAMode          fAAMode;
+    const Attribute*    fInPosition;
+    const Attribute*    fInDashParams;
+    const Attribute*    fInRectParams;
 
-    GrEffectEdgeType    fEdgeType;
-    SkRect              fRect;
-    SkScalar            fIntervalLength;
+    GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
 
-    GR_DECLARE_EFFECT_TEST;
-
-    typedef GrVertexEffect INHERITED;
+    typedef GrGeometryProcessor INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
-class GLDashingLineEffect : public GrGLVertexEffect {
+class GLDashingLineEffect : public GrGLSLGeometryProcessor {
 public:
-    GLDashingLineEffect(const GrBackendEffectFactory&, const GrDrawEffect&);
+    GLDashingLineEffect();
 
-    virtual void emitCode(GrGLFullShaderBuilder* builder,
-                          const GrDrawEffect& drawEffect,
-                          const GrEffectKey& key,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    void onEmitCode(EmitArgs&, GrGPArgs*) override;
 
-    static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*);
+    static inline void GenKey(const GrGeometryProcessor&,
+                              const GrGLSLCaps&,
+                              GrProcessorKeyBuilder*);
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+    void setData(const GrGLSLProgramDataManager&, const GrPrimitiveProcessor&) override;
+
+    void setTransformData(const GrPrimitiveProcessor& primProc,
+                          const GrGLSLProgramDataManager& pdman,
+                          int index,
+                          const SkTArray<const GrCoordTransform*, true>& transforms) override {
+        this->setTransformDataHelper<DashingLineEffect>(primProc, pdman, index, transforms);
+    }
 
 private:
-    GrGLUniformManager::UniformHandle   fRectUniform;
-    GrGLUniformManager::UniformHandle   fIntervalUniform;
-    SkRect                              fPrevRect;
-    SkScalar                            fPrevIntervalLength;
-    typedef GrGLVertexEffect INHERITED;
+    GrColor       fColor;
+    UniformHandle fColorUniform;
+    typedef GrGLSLGeometryProcessor INHERITED;
 };
 
-GLDashingLineEffect::GLDashingLineEffect(const GrBackendEffectFactory& factory,
-                                     const GrDrawEffect& drawEffect)
-    : INHERITED (factory) {
-    fPrevRect.fLeft = SK_ScalarNaN;
-    fPrevIntervalLength = SK_ScalarMax;
+GLDashingLineEffect::GLDashingLineEffect() {
+    fColor = GrColor_ILLEGAL;
 }
 
-void GLDashingLineEffect::emitCode(GrGLFullShaderBuilder* builder,
-                                    const GrDrawEffect& drawEffect,
-                                    const GrEffectKey& key,
-                                    const char* outputColor,
-                                    const char* inputColor,
-                                    const TransformedCoordsArray&,
-                                    const TextureSamplerArray& samplers) {
-    const DashingLineEffect& de = drawEffect.castEffect<DashingLineEffect>();
-    const char *rectName;
+void GLDashingLineEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
+    const DashingLineEffect& de = args.fGP.cast<DashingLineEffect>();
+    GrGLSLGPBuilder* pb = args.fPB;
+
+    GrGLSLVertexBuilder* vertBuilder = args.fVertBuilder;
+    GrGLSLVaryingHandler* varyingHandler = args.fVaryingHandler;
+
+    // emit attributes
+    varyingHandler->emitAttributes(de);
+
+    // XY refers to dashPos, Z is the dash interval length
+    GrGLSLVertToFrag inDashParams(kVec3f_GrSLType);
+    varyingHandler->addVarying("DashParams", &inDashParams, GrSLPrecision::kHigh_GrSLPrecision);
+    vertBuilder->codeAppendf("%s = %s;", inDashParams.vsOut(), de.inDashParams()->fName);
+
     // The rect uniform's xyzw refer to (left + 0.5, top + 0.5, right - 0.5, bottom - 0.5),
     // respectively.
-    fRectUniform = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                       kVec4f_GrSLType,
-                                       "rect",
-                                       &rectName);
-    const char *intervalName;
-    // The interval uniform's refers to the total length of the interval (on + off)
-    fIntervalUniform = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                       kFloat_GrSLType,
-                                       "interval",
-                                       &intervalName);
+    GrGLSLVertToFrag inRectParams(kVec4f_GrSLType);
+    varyingHandler->addVarying("RectParams", &inRectParams, GrSLPrecision::kHigh_GrSLPrecision);
+    vertBuilder->codeAppendf("%s = %s;", inRectParams.vsOut(), de.inRectParams()->fName);
 
-    const char *vsCoordName, *fsCoordName;
-    builder->addVarying(kVec2f_GrSLType, "Coord", &vsCoordName, &fsCoordName);
-    const SkString* attr0Name =
-        builder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[0]);
-    builder->vsCodeAppendf("\t%s = %s;\n", vsCoordName, attr0Name->c_str());
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    // Setup pass through color
+    if (!de.colorIgnored()) {
+        this->setupUniformColor(pb, fragBuilder, args.fOutputColor, &fColorUniform);
+    }
+
+    // Setup position
+    this->setupPosition(pb, vertBuilder, gpArgs, de.inPosition()->fName);
+
+    // emit transforms
+    this->emitTransforms(args.fPB,
+                         vertBuilder,
+                         varyingHandler,
+                         gpArgs->fPositionVar,
+                         de.inPosition()->fName,
+                         de.localMatrix(),
+                         args.fTransformsIn,
+                         args.fTransformsOut);
 
     // transforms all points so that we can compare them to our test rect
-    builder->fsCodeAppendf("\t\tfloat xShifted = %s.x - floor(%s.x / %s) * %s;\n",
-                           fsCoordName, fsCoordName, intervalName, intervalName);
-    builder->fsCodeAppendf("\t\tvec2 fragPosShifted = vec2(xShifted, %s.y);\n", fsCoordName);
-    if (GrEffectEdgeTypeIsAA(de.getEdgeType())) {
+    fragBuilder->codeAppendf("float xShifted = %s.x - floor(%s.x / %s.z) * %s.z;",
+                             inDashParams.fsIn(), inDashParams.fsIn(), inDashParams.fsIn(),
+                             inDashParams.fsIn());
+    fragBuilder->codeAppendf("vec2 fragPosShifted = vec2(xShifted, %s.y);", inDashParams.fsIn());
+    if (de.aaMode() == kEdgeAA_DashAAMode) {
         // The amount of coverage removed in x and y by the edges is computed as a pair of negative
         // numbers, xSub and ySub.
-        builder->fsCodeAppend("\t\tfloat xSub, ySub;\n");
-        builder->fsCodeAppendf("\t\txSub = min(fragPosShifted.x - %s.x, 0.0);\n", rectName);
-        builder->fsCodeAppendf("\t\txSub += min(%s.z - fragPosShifted.x, 0.0);\n", rectName);
-        builder->fsCodeAppendf("\t\tySub = min(fragPosShifted.y - %s.y, 0.0);\n", rectName);
-        builder->fsCodeAppendf("\t\tySub += min(%s.w - fragPosShifted.y, 0.0);\n", rectName);
+        fragBuilder->codeAppend("float xSub, ySub;");
+        fragBuilder->codeAppendf("xSub = min(fragPosShifted.x - %s.x, 0.0);", inRectParams.fsIn());
+        fragBuilder->codeAppendf("xSub += min(%s.z - fragPosShifted.x, 0.0);", inRectParams.fsIn());
+        fragBuilder->codeAppendf("ySub = min(fragPosShifted.y - %s.y, 0.0);", inRectParams.fsIn());
+        fragBuilder->codeAppendf("ySub += min(%s.w - fragPosShifted.y, 0.0);", inRectParams.fsIn());
         // Now compute coverage in x and y and multiply them to get the fraction of the pixel
         // covered.
-        builder->fsCodeAppendf("\t\tfloat alpha = (1.0 + max(xSub, -1.0)) * (1.0 + max(ySub, -1.0));\n");
+        fragBuilder->codeAppendf(
+            "float alpha = (1.0 + max(xSub, -1.0)) * (1.0 + max(ySub, -1.0));");
+    } else if (de.aaMode() == kMSAA_DashAAMode) {
+        // For MSAA, we don't modulate the alpha by the Y distance, since MSAA coverage will handle
+        // AA on the the top and bottom edges. The shader is only responsible for intra-dash alpha.
+        fragBuilder->codeAppend("float xSub;");
+        fragBuilder->codeAppendf("xSub = min(fragPosShifted.x - %s.x, 0.0);", inRectParams.fsIn());
+        fragBuilder->codeAppendf("xSub += min(%s.z - fragPosShifted.x, 0.0);", inRectParams.fsIn());
+        // Now compute coverage in x to get the fraction of the pixel covered.
+        fragBuilder->codeAppendf("float alpha = (1.0 + max(xSub, -1.0));");
     } else {
         // Assuming the bounding geometry is tight so no need to check y values
-        builder->fsCodeAppendf("\t\tfloat alpha = 1.0;\n");
-        builder->fsCodeAppendf("\t\talpha *= (fragPosShifted.x - %s.x) > -0.5 ? 1.0 : 0.0;\n", rectName);
-        builder->fsCodeAppendf("\t\talpha *= (%s.z - fragPosShifted.x) >= -0.5 ? 1.0 : 0.0;\n", rectName);
+        fragBuilder->codeAppendf("float alpha = 1.0;");
+        fragBuilder->codeAppendf("alpha *= (fragPosShifted.x - %s.x) > -0.5 ? 1.0 : 0.0;",
+                                 inRectParams.fsIn());
+        fragBuilder->codeAppendf("alpha *= (%s.z - fragPosShifted.x) >= -0.5 ? 1.0 : 0.0;",
+                                 inRectParams.fsIn());
     }
-    builder->fsCodeAppendf("\t\t%s = %s;\n", outputColor,
-                           (GrGLSLExpr4(inputColor) * GrGLSLExpr1("alpha")).c_str());
+    fragBuilder->codeAppendf("%s = vec4(alpha);", args.fOutputCoverage);
 }
 
-void GLDashingLineEffect::setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) {
-    const DashingLineEffect& de = drawEffect.castEffect<DashingLineEffect>();
-    const SkRect& rect = de.getRect();
-    SkScalar intervalLength = de.getIntervalLength();
-    if (rect != fPrevRect || intervalLength != fPrevIntervalLength) {
-        uman.set4f(fRectUniform, rect.fLeft + 0.5f, rect.fTop + 0.5f,
-                   rect.fRight - 0.5f, rect.fBottom - 0.5f);
-        uman.set1f(fIntervalUniform, intervalLength);
-        fPrevRect = rect;
-        fPrevIntervalLength = intervalLength;
+void GLDashingLineEffect::setData(const GrGLSLProgramDataManager& pdman,
+                                  const GrPrimitiveProcessor& processor) {
+    const DashingLineEffect& de = processor.cast<DashingLineEffect>();
+    if (de.color() != fColor) {
+        float c[4];
+        GrColorToRGBAFloat(de.color(), c);
+        pdman.set4fv(fColorUniform, 1, c);
+        fColor = de.color();
     }
 }
 
-void GLDashingLineEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
-                                 GrEffectKeyBuilder* b) {
-    const DashingLineEffect& de = drawEffect.castEffect<DashingLineEffect>();
-    b->add32(de.getEdgeType());
+void GLDashingLineEffect::GenKey(const GrGeometryProcessor& gp,
+                                 const GrGLSLCaps&,
+                                 GrProcessorKeyBuilder* b) {
+    const DashingLineEffect& de = gp.cast<DashingLineEffect>();
+    uint32_t key = 0;
+    key |= de.usesLocalCoords() && de.localMatrix().hasPerspective() ? 0x1 : 0x0;
+    key |= de.colorIgnored() ? 0x2 : 0x0;
+    key |= de.aaMode() << 8;
+    b->add32(key);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-GrEffect* DashingLineEffect::Create(GrEffectEdgeType edgeType, const DashInfo& info,
-                                    SkScalar strokeWidth) {
-    if (info.fCount != 2) {
-        return NULL;
-    }
-
-    return SkNEW_ARGS(DashingLineEffect, (edgeType, info, strokeWidth));
+GrGeometryProcessor* DashingLineEffect::Create(GrColor color,
+                                               DashAAMode aaMode,
+                                               const SkMatrix& localMatrix,
+                                               bool usesLocalCoords) {
+    return new DashingLineEffect(color, aaMode, localMatrix, usesLocalCoords);
 }
 
-DashingLineEffect::~DashingLineEffect() {}
-
-void DashingLineEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
-    *validFlags = 0;
+void DashingLineEffect::getGLSLProcessorKey(const GrGLSLCaps& caps,
+                                            GrProcessorKeyBuilder* b) const {
+    GLDashingLineEffect::GenKey(*this, caps, b);
 }
 
-const GrBackendEffectFactory& DashingLineEffect::getFactory() const {
-    return GrTBackendEffectFactory<DashingLineEffect>::getInstance();
+GrGLSLPrimitiveProcessor* DashingLineEffect::createGLSLInstance(const GrGLSLCaps&) const {
+    return new GLDashingLineEffect();
 }
 
-DashingLineEffect::DashingLineEffect(GrEffectEdgeType edgeType, const DashInfo& info,
-                                     SkScalar strokeWidth)
-    : fEdgeType(edgeType) {
-    SkScalar onLen = info.fIntervals[0];
-    SkScalar offLen = info.fIntervals[1];
-    SkScalar halfOffLen = SkScalarHalf(offLen);
-    SkScalar halfStroke = SkScalarHalf(strokeWidth);
-    fIntervalLength = onLen + offLen;
-    fRect.set(halfOffLen, -halfStroke, halfOffLen + onLen, halfStroke);
-
-    this->addVertexAttrib(kVec2f_GrSLType);
+DashingLineEffect::DashingLineEffect(GrColor color,
+                                     DashAAMode aaMode,
+                                     const SkMatrix& localMatrix,
+                                     bool usesLocalCoords)
+    : fColor(color)
+    , fLocalMatrix(localMatrix)
+    , fUsesLocalCoords(usesLocalCoords)
+    , fAAMode(aaMode) {
+    this->initClassID<DashingLineEffect>();
+    fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType));
+    fInDashParams = &this->addVertexAttrib(Attribute("inDashParams", kVec3f_GrVertexAttribType));
+    fInRectParams = &this->addVertexAttrib(Attribute("inRect", kVec4f_GrVertexAttribType));
 }
 
-bool DashingLineEffect::onIsEqual(const GrEffect& other) const {
-    const DashingLineEffect& de = CastEffect<DashingLineEffect>(other);
-    return (fEdgeType == de.fEdgeType &&
-            fRect == de.fRect &&
-            fIntervalLength == de.fIntervalLength);
-}
+GR_DEFINE_GEOMETRY_PROCESSOR_TEST(DashingLineEffect);
 
-GR_DEFINE_EFFECT_TEST(DashingLineEffect);
-
-GrEffect* DashingLineEffect::TestCreate(SkRandom* random,
-                                        GrContext*,
-                                        const GrDrawTargetCaps& caps,
-                                        GrTexture*[]) {
-    GrEffect* effect;
-    GrEffectEdgeType edgeType = static_cast<GrEffectEdgeType>(random->nextULessThan(
-            kGrEffectEdgeTypeCnt));
-    SkScalar strokeWidth = random->nextRangeScalar(0, 100.f);
-    DashInfo info;
-    info.fCount = 2;
-    SkAutoTArray<SkScalar> intervals(info.fCount);
-    info.fIntervals = intervals.get();
-    info.fIntervals[0] = random->nextRangeScalar(0, 10.f);
-    info.fIntervals[1] = random->nextRangeScalar(0, 10.f);
-    info.fPhase = random->nextRangeScalar(0, info.fIntervals[0] + info.fIntervals[1]);
-
-    effect = DashingLineEffect::Create(edgeType, info, strokeWidth);
-    return effect;
+const GrGeometryProcessor* DashingLineEffect::TestCreate(GrProcessorTestData* d) {
+    DashAAMode aaMode = static_cast<DashAAMode>(d->fRandom->nextULessThan(kDashAAModeCount));
+    return DashingLineEffect::Create(GrRandomColor(d->fRandom),
+                                     aaMode, GrTest::TestMatrix(d->fRandom),
+                                     d->fRandom->nextBool());
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-GrEffect* GrDashingEffect::Create(GrEffectEdgeType edgeType, const SkPathEffect::DashInfo& info,
-                                  SkScalar strokeWidth, GrDashingEffect::DashCap cap) {
+static GrGeometryProcessor* create_dash_gp(GrColor color,
+                                           DashAAMode dashAAMode,
+                                           DashCap cap,
+                                           const SkMatrix& viewMatrix,
+                                           bool usesLocalCoords) {
+    SkMatrix invert;
+    if (usesLocalCoords && !viewMatrix.invert(&invert)) {
+        SkDebugf("Failed to invert\n");
+        return nullptr;
+    }
+
     switch (cap) {
-        case GrDashingEffect::kRound_DashCap:
-            return DashingCircleEffect::Create(edgeType, info, SkScalarHalf(strokeWidth));
-        case GrDashingEffect::kNonRound_DashCap:
-            return DashingLineEffect::Create(edgeType, info, strokeWidth);
-        default:
-            SkFAIL("Unexpected dashed cap.");
+        case kRound_DashCap:
+            return DashingCircleEffect::Create(color, dashAAMode, invert, usesLocalCoords);
+        case kNonRound_DashCap:
+            return DashingLineEffect::Create(color, dashAAMode, invert, usesLocalCoords);
     }
-    return NULL;
+    return nullptr;
 }
+
+/////////////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef GR_TEST_UTILS
+
+DRAW_BATCH_TEST_DEFINE(DashBatch) {
+    GrColor color = GrRandomColor(random);
+    SkMatrix viewMatrix = GrTest::TestMatrixPreservesRightAngles(random);
+    bool useAA = random->nextBool();
+    bool msaaRT = random->nextBool();
+
+    // We can only dash either horizontal or vertical lines
+    SkPoint pts[2];
+    if (random->nextBool()) {
+        // vertical
+        pts[0].fX = 1.f;
+        pts[0].fY = random->nextF() * 10.f;
+        pts[1].fX = 1.f;
+        pts[1].fY = random->nextF() * 10.f;
+    } else {
+        // horizontal
+        pts[0].fX = random->nextF() * 10.f;
+        pts[0].fY = 1.f;
+        pts[1].fX = random->nextF() * 10.f;
+        pts[1].fY = 1.f;
+    }
+
+    // pick random cap
+    SkPaint::Cap cap = SkPaint::Cap(random->nextULessThan(SkPaint::Cap::kCapCount));
+
+    SkScalar intervals[2];
+
+    // We can only dash with the following intervals
+    enum Intervals {
+        kOpenOpen_Intervals ,
+        kOpenClose_Intervals,
+        kCloseOpen_Intervals,
+    };
+
+    Intervals intervalType = SkPaint::kRound_Cap ?
+                             kOpenClose_Intervals :
+                             Intervals(random->nextULessThan(kCloseOpen_Intervals + 1));
+    static const SkScalar kIntervalMin = 0.1f;
+    static const SkScalar kIntervalMax = 10.f;
+    switch (intervalType) {
+        case kOpenOpen_Intervals:
+            intervals[0] = random->nextRangeScalar(kIntervalMin, kIntervalMax);
+            intervals[1] = random->nextRangeScalar(kIntervalMin, kIntervalMax);
+            break;
+        case kOpenClose_Intervals:
+            intervals[0] = 0.f;
+            intervals[1] = random->nextRangeScalar(kIntervalMin, kIntervalMax);
+            break;
+        case kCloseOpen_Intervals:
+            intervals[0] = random->nextRangeScalar(kIntervalMin, kIntervalMax);
+            intervals[1] = 0.f;
+            break;
+
+    }
+
+    // phase is 0 < sum (i0, i1)
+    SkScalar phase = random->nextRangeScalar(0, intervals[0] + intervals[1]);
+
+    SkPaint p;
+    p.setStyle(SkPaint::kStroke_Style);
+    p.setStrokeWidth(SkIntToScalar(1));
+    p.setStrokeCap(cap);
+
+    GrStrokeInfo strokeInfo(p);
+
+    SkPathEffect::DashInfo info;
+    info.fIntervals = intervals;
+    info.fCount = 2;
+    info.fPhase = phase;
+    SkDEBUGCODE(bool success = ) strokeInfo.setDashInfo(info);
+    SkASSERT(success);
+
+    return create_batch(color, viewMatrix, pts, useAA, strokeInfo, msaaRT);
+}
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/effects/GrDashingEffect.h b/gfx/skia/skia/src/gpu/effects/GrDashingEffect.h
index 1a51e89ac85b..7d0d006f1b56 100644
--- a/gfx/skia/skia/src/gpu/effects/GrDashingEffect.h
+++ b/gfx/skia/skia/src/gpu/effects/GrDashingEffect.h
@@ -9,34 +9,22 @@
 #ifndef GrDashingEffect_DEFINED
 #define GrDashingEffect_DEFINED
 
+#include "GrColor.h"
 #include "GrTypesPriv.h"
 #include "SkPathEffect.h"
 
-class GrGpu;
+class GrClip;
 class GrDrawTarget;
 class GrPaint;
+class GrPipelineBuilder;
 class GrStrokeInfo;
 
-class GrGLDashingEffect;
-class SkPath;
-
 namespace GrDashingEffect {
-    bool DrawDashLine(const SkPoint pts[2], const GrPaint& paint, const GrStrokeInfo& strokeInfo,
-                      GrGpu* gpu, GrDrawTarget* target, const SkMatrix& vm);
-
-    enum DashCap {
-        kRound_DashCap,
-        kNonRound_DashCap,
-    };
-
-    /**
-     * An effect that renders a dashed line. It is intended to be used as a coverage effect.
-     * The effect is meant for dashed lines that only have a single on/off interval pair.
-     * Bounding geometry is rendered and the effect computes coverage based on the fragment's
-     * position relative to the dashed line.
-     */
-    GrEffect* Create(GrEffectEdgeType edgeType, const SkPathEffect::DashInfo& info,
-                     SkScalar strokeWidth, DashCap cap);
+    bool DrawDashLine(GrDrawTarget*, const GrPipelineBuilder&, GrColor,
+                      const SkMatrix& viewMatrix, const SkPoint pts[2], bool useAA,
+                      const GrStrokeInfo& strokeInfo);
+    bool CanDrawDashLine(const SkPoint pts[2], const GrStrokeInfo& strokeInfo,
+                         const SkMatrix& viewMatrix);
 }
 
 #endif
diff --git a/gfx/skia/skia/src/gpu/effects/GrDisableColorXP.cpp b/gfx/skia/skia/src/gpu/effects/GrDisableColorXP.cpp
new file mode 100644
index 000000000000..e669f8b0240a
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/effects/GrDisableColorXP.cpp
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "effects/GrDisableColorXP.h"
+#include "GrProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+#include "glsl/GrGLSLXferProcessor.h"
+
+/**
+ * This xfer processor disables color writing. Thus color and coverage and ignored and no blending
+ * occurs. This XP is usful for things like stenciling.
+ */
+class DisableColorXP : public GrXferProcessor {
+public:
+    static GrXferProcessor* Create() { return new DisableColorXP; }
+
+    ~DisableColorXP() override {};
+
+    const char* name() const override { return "Disable Color"; }
+
+    GrGLSLXferProcessor* createGLSLInstance() const override;
+
+private:
+    DisableColorXP();
+
+    GrXferProcessor::OptFlags onGetOptimizations(const GrPipelineOptimizations& optimizations,
+                                                 bool doesStencilWrite,
+                                                 GrColor* color,
+                                                 const GrCaps& caps) const override {
+        return GrXferProcessor::kIgnoreColor_OptFlag | GrXferProcessor::kIgnoreCoverage_OptFlag;
+    }
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
+
+    void onGetBlendInfo(GrXferProcessor::BlendInfo* blendInfo) const override;
+
+    bool onIsEqual(const GrXferProcessor& xpBase) const override {
+        return true;
+    }
+
+    typedef GrXferProcessor INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+class GLDisableColorXP : public GrGLSLXferProcessor {
+public:
+    GLDisableColorXP(const GrProcessor&) {}
+
+    ~GLDisableColorXP() override {}
+
+    static void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*) {}
+
+private:
+    void emitOutputsForBlendState(const EmitArgs& args) override {
+        // This emit code should be empty. However, on the nexus 6 there is a driver bug where if
+        // you do not give gl_FragColor a value, the gl context is lost and we end up drawing
+        // nothing. So this fix just sets the gl_FragColor arbitrarily to 0.
+        GrGLSLXPFragmentBuilder* fragBuilder = args.fXPFragBuilder;
+        fragBuilder->codeAppendf("%s = vec4(0);", args.fOutputPrimary);
+    }
+
+    void onSetData(const GrGLSLProgramDataManager&, const GrXferProcessor&) override {}
+
+    typedef GrGLSLXferProcessor INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+DisableColorXP::DisableColorXP() {
+    this->initClassID<DisableColorXP>();
+}
+
+void DisableColorXP::onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const {
+    GLDisableColorXP::GenKey(*this, caps, b);
+}
+
+GrGLSLXferProcessor* DisableColorXP::createGLSLInstance() const { return new GLDisableColorXP(*this); }
+
+void DisableColorXP::onGetBlendInfo(GrXferProcessor::BlendInfo* blendInfo) const {
+    blendInfo->fWriteColor = false;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+GrDisableColorXPFactory::GrDisableColorXPFactory() {
+    this->initClassID<GrDisableColorXPFactory>();
+}
+
+GrXferProcessor*
+GrDisableColorXPFactory::onCreateXferProcessor(const GrCaps& caps,
+                                               const GrPipelineOptimizations& optimizations,
+                                               bool hasMixedSamples,
+                                               const DstTexture* dst) const {
+    return DisableColorXP::Create();
+}
+
+GR_DEFINE_XP_FACTORY_TEST(GrDisableColorXPFactory);
+
+const GrXPFactory* GrDisableColorXPFactory::TestCreate(GrProcessorTestData*) {
+    return GrDisableColorXPFactory::Create();
+}
+
diff --git a/gfx/skia/skia/src/gpu/effects/GrDisableColorXP.h b/gfx/skia/skia/src/gpu/effects/GrDisableColorXP.h
new file mode 100644
index 000000000000..94aae317514c
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/effects/GrDisableColorXP.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrDisableColorXP_DEFINED
+#define GrDisableColorXP_DEFINED
+
+#include "GrTypes.h"
+#include "GrXferProcessor.h"
+
+class GrProcOptInfo;
+
+class GrDisableColorXPFactory : public GrXPFactory {
+public:
+    static GrXPFactory* Create() { return new GrDisableColorXPFactory; }
+
+    void getInvariantBlendedColor(const GrProcOptInfo& colorPOI,
+                                  GrXPFactory::InvariantBlendedColor* blendedColor) const override {
+        blendedColor->fKnownColorFlags = kNone_GrColorComponentFlags;
+        blendedColor->fWillBlendWithDst = false;
+    }
+
+private:
+    GrDisableColorXPFactory();
+
+    GrXferProcessor* onCreateXferProcessor(const GrCaps& caps,
+                                           const GrPipelineOptimizations& optimizations,
+                                           bool hasMixedSamples,
+                                           const DstTexture* dstTexture) const override;
+
+    bool willReadDstColor(const GrCaps& caps,
+                          const GrPipelineOptimizations& optimizations,
+                          bool hasMixedSamples) const override {
+        return false;
+    }
+
+    bool onIsEqual(const GrXPFactory& xpfBase) const override {
+        return true;
+    }
+
+    GR_DECLARE_XP_FACTORY_TEST;
+
+    typedef GrXPFactory INHERITED;
+};
+
+#endif
+
diff --git a/gfx/skia/skia/src/gpu/effects/GrDistanceFieldGeoProc.cpp b/gfx/skia/skia/src/gpu/effects/GrDistanceFieldGeoProc.cpp
new file mode 100644
index 000000000000..cf77157e0d31
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/effects/GrDistanceFieldGeoProc.cpp
@@ -0,0 +1,793 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrDistanceFieldGeoProc.h"
+#include "GrInvariantOutput.h"
+#include "GrTexture.h"
+
+#include "SkDistanceFieldGen.h"
+
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLGeometryProcessor.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+#include "glsl/GrGLSLUtil.h"
+#include "glsl/GrGLSLVarying.h"
+#include "glsl/GrGLSLVertexShaderBuilder.h"
+
+// Assuming a radius of a little less than the diagonal of the fragment
+#define SK_DistanceFieldAAFactor     "0.65"
+
+class GrGLDistanceFieldA8TextGeoProc : public GrGLSLGeometryProcessor {
+public:
+    GrGLDistanceFieldA8TextGeoProc()
+        : fViewMatrix(SkMatrix::InvalidMatrix())
+        , fColor(GrColor_ILLEGAL)
+#ifdef SK_GAMMA_APPLY_TO_A8
+        , fDistanceAdjust(-1.0f)
+#endif
+        {}
+
+    void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override{
+        const GrDistanceFieldA8TextGeoProc& dfTexEffect =
+                args.fGP.cast<GrDistanceFieldA8TextGeoProc>();
+        GrGLSLGPBuilder* pb = args.fPB;
+        GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+        SkAssertResult(fragBuilder->enableFeature(
+                GrGLSLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));
+
+        GrGLSLVertexBuilder* vertBuilder = args.fVertBuilder;
+        GrGLSLVaryingHandler* varyingHandler = args.fVaryingHandler;
+
+        // emit attributes
+        varyingHandler->emitAttributes(dfTexEffect);
+
+#ifdef SK_GAMMA_APPLY_TO_A8
+        // adjust based on gamma
+        const char* distanceAdjustUniName = nullptr;
+        // width, height, 1/(3*width)
+        fDistanceAdjustUni = pb->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+            kFloat_GrSLType, kDefault_GrSLPrecision,
+            "DistanceAdjust", &distanceAdjustUniName);
+#endif
+
+        // Setup pass through color
+        if (!dfTexEffect.colorIgnored()) {
+            if (dfTexEffect.hasVertexColor()) {
+                varyingHandler->addPassThroughAttribute(dfTexEffect.inColor(), args.fOutputColor);
+            } else {
+                this->setupUniformColor(pb, fragBuilder, args.fOutputColor, &fColorUniform);
+            }
+        }
+
+        // Setup position
+        this->setupPosition(pb,
+                            vertBuilder,
+                            gpArgs,
+                            dfTexEffect.inPosition()->fName,
+                            dfTexEffect.viewMatrix(),
+                            &fViewMatrixUniform);
+
+        // emit transforms
+        this->emitTransforms(pb,
+                             vertBuilder,
+                             varyingHandler,
+                             gpArgs->fPositionVar,
+                             dfTexEffect.inPosition()->fName,
+                             args.fTransformsIn,
+                             args.fTransformsOut);
+
+        // add varyings
+        GrGLSLVertToFrag recipScale(kFloat_GrSLType);
+        GrGLSLVertToFrag st(kVec2f_GrSLType);
+        bool isSimilarity = SkToBool(dfTexEffect.getFlags() & kSimilarity_DistanceFieldEffectFlag);
+        varyingHandler->addVarying("IntTextureCoords", &st, kHigh_GrSLPrecision);
+        vertBuilder->codeAppendf("%s = %s;", st.vsOut(), dfTexEffect.inTextureCoords()->fName);
+
+        // compute numbers to be hardcoded to convert texture coordinates from int to float
+        SkASSERT(dfTexEffect.numTextures() == 1);
+        GrTexture* atlas = dfTexEffect.textureAccess(0).getTexture();
+        SkASSERT(atlas && SkIsPow2(atlas->width()) && SkIsPow2(atlas->height()));
+        SkScalar recipWidth = 1.0f / atlas->width();
+        SkScalar recipHeight = 1.0f / atlas->height();
+
+        GrGLSLVertToFrag uv(kVec2f_GrSLType);
+        varyingHandler->addVarying("TextureCoords", &uv, kHigh_GrSLPrecision);
+        vertBuilder->codeAppendf("%s = vec2(%.*f, %.*f) * %s;", uv.vsOut(),
+                                 GR_SIGNIFICANT_POW2_DECIMAL_DIG, recipWidth,
+                                 GR_SIGNIFICANT_POW2_DECIMAL_DIG, recipHeight,
+                                 dfTexEffect.inTextureCoords()->fName);
+        
+        // Use highp to work around aliasing issues
+        fragBuilder->codeAppend(GrGLSLShaderVar::PrecisionString(args.fGLSLCaps,
+                                                                 kHigh_GrSLPrecision));
+        fragBuilder->codeAppendf("vec2 uv = %s;\n", uv.fsIn());
+
+        fragBuilder->codeAppend("\tfloat texColor = ");
+        fragBuilder->appendTextureLookup(args.fSamplers[0],
+                                         "uv",
+                                         kVec2f_GrSLType);
+        fragBuilder->codeAppend(".r;\n");
+        fragBuilder->codeAppend("\tfloat distance = "
+                       SK_DistanceFieldMultiplier "*(texColor - " SK_DistanceFieldThreshold ");");
+#ifdef SK_GAMMA_APPLY_TO_A8
+        // adjust width based on gamma
+        fragBuilder->codeAppendf("distance -= %s;", distanceAdjustUniName);
+#endif
+
+        fragBuilder->codeAppend("float afwidth;");
+        if (isSimilarity) {
+            // For uniform scale, we adjust for the effect of the transformation on the distance
+            // by using the length of the gradient of the texture coordinates. We use st coordinates
+            // to ensure we're mapping 1:1 from texel space to pixel space.
+
+            // this gives us a smooth step across approximately one fragment
+            // we use y to work around a Mali400 bug in the x direction
+            fragBuilder->codeAppendf("afwidth = abs(" SK_DistanceFieldAAFactor "*dFdy(%s.y));",
+                                     st.fsIn());
+        } else {
+            // For general transforms, to determine the amount of correction we multiply a unit
+            // vector pointing along the SDF gradient direction by the Jacobian of the st coords
+            // (which is the inverse transform for this fragment) and take the length of the result.
+            fragBuilder->codeAppend("vec2 dist_grad = vec2(dFdx(distance), dFdy(distance));");
+            // the length of the gradient may be 0, so we need to check for this
+            // this also compensates for the Adreno, which likes to drop tiles on division by 0
+            fragBuilder->codeAppend("float dg_len2 = dot(dist_grad, dist_grad);");
+            fragBuilder->codeAppend("if (dg_len2 < 0.0001) {");
+            fragBuilder->codeAppend("dist_grad = vec2(0.7071, 0.7071);");
+            fragBuilder->codeAppend("} else {");
+            fragBuilder->codeAppend("dist_grad = dist_grad*inversesqrt(dg_len2);");
+            fragBuilder->codeAppend("}");
+
+            fragBuilder->codeAppendf("vec2 Jdx = dFdx(%s);", st.fsIn());
+            fragBuilder->codeAppendf("vec2 Jdy = dFdy(%s);", st.fsIn());
+            fragBuilder->codeAppend("vec2 grad = vec2(dist_grad.x*Jdx.x + dist_grad.y*Jdy.x,");
+            fragBuilder->codeAppend("                 dist_grad.x*Jdx.y + dist_grad.y*Jdy.y);");
+
+            // this gives us a smooth step across approximately one fragment
+            fragBuilder->codeAppend("afwidth = " SK_DistanceFieldAAFactor "*length(grad);");
+        }
+        fragBuilder->codeAppend("float val = smoothstep(-afwidth, afwidth, distance);");
+
+        fragBuilder->codeAppendf("%s = vec4(val);", args.fOutputCoverage);
+    }
+
+    void setData(const GrGLSLProgramDataManager& pdman, const GrPrimitiveProcessor& proc) override {
+#ifdef SK_GAMMA_APPLY_TO_A8
+        const GrDistanceFieldA8TextGeoProc& dfTexEffect = proc.cast<GrDistanceFieldA8TextGeoProc>();
+        float distanceAdjust = dfTexEffect.getDistanceAdjust();
+        if (distanceAdjust != fDistanceAdjust) {
+            pdman.set1f(fDistanceAdjustUni, distanceAdjust);
+            fDistanceAdjust = distanceAdjust;
+        }
+#endif
+        const GrDistanceFieldA8TextGeoProc& dfa8gp = proc.cast<GrDistanceFieldA8TextGeoProc>();
+
+        if (!dfa8gp.viewMatrix().isIdentity() && !fViewMatrix.cheapEqualTo(dfa8gp.viewMatrix())) {
+            fViewMatrix = dfa8gp.viewMatrix();
+            float viewMatrix[3 * 3];
+            GrGLSLGetMatrix<3>(viewMatrix, fViewMatrix);
+            pdman.setMatrix3f(fViewMatrixUniform, viewMatrix);
+        }
+
+        if (dfa8gp.color() != fColor && !dfa8gp.hasVertexColor()) {
+            float c[4];
+            GrColorToRGBAFloat(dfa8gp.color(), c);
+            pdman.set4fv(fColorUniform, 1, c);
+            fColor = dfa8gp.color();
+        }
+    }
+
+    static inline void GenKey(const GrGeometryProcessor& gp,
+                              const GrGLSLCaps&,
+                              GrProcessorKeyBuilder* b) {
+        const GrDistanceFieldA8TextGeoProc& dfTexEffect = gp.cast<GrDistanceFieldA8TextGeoProc>();
+        uint32_t key = dfTexEffect.getFlags();
+        key |= dfTexEffect.hasVertexColor() << 16;
+        key |= dfTexEffect.colorIgnored() << 17;
+        key |= ComputePosKey(dfTexEffect.viewMatrix()) << 25;
+        b->add32(key);
+
+        // Currently we hardcode numbers to convert atlas coordinates to normalized floating point
+        SkASSERT(gp.numTextures() == 1);
+        GrTexture* atlas = gp.textureAccess(0).getTexture();
+        SkASSERT(atlas);
+        b->add32(atlas->width());
+        b->add32(atlas->height());
+    }
+
+private:
+    SkMatrix      fViewMatrix;
+    GrColor       fColor;
+    UniformHandle fColorUniform;
+    UniformHandle fViewMatrixUniform;
+#ifdef SK_GAMMA_APPLY_TO_A8
+    float         fDistanceAdjust;
+    UniformHandle fDistanceAdjustUni;
+#endif
+
+    typedef GrGLSLGeometryProcessor INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+GrDistanceFieldA8TextGeoProc::GrDistanceFieldA8TextGeoProc(GrColor color,
+                                                           const SkMatrix& viewMatrix,
+                                                           GrTexture* texture,
+                                                           const GrTextureParams& params,
+#ifdef SK_GAMMA_APPLY_TO_A8
+                                                           float distanceAdjust,
+#endif
+                                                           uint32_t flags,
+                                                           bool usesLocalCoords)
+    : fColor(color)
+    , fViewMatrix(viewMatrix)
+    , fTextureAccess(texture, params)
+#ifdef SK_GAMMA_APPLY_TO_A8
+    , fDistanceAdjust(distanceAdjust)
+#endif
+    , fFlags(flags & kNonLCD_DistanceFieldEffectMask)
+    , fInColor(nullptr)
+    , fUsesLocalCoords(usesLocalCoords) {
+    SkASSERT(!(flags & ~kNonLCD_DistanceFieldEffectMask));
+    this->initClassID<GrDistanceFieldA8TextGeoProc>();
+    fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType,
+                                                   kHigh_GrSLPrecision));
+    if (flags & kColorAttr_DistanceFieldEffectFlag) {
+        fInColor = &this->addVertexAttrib(Attribute("inColor", kVec4ub_GrVertexAttribType));
+    }
+    fInTextureCoords = &this->addVertexAttrib(Attribute("inTextureCoords",
+                                                          kVec2s_GrVertexAttribType));
+    this->addTextureAccess(&fTextureAccess);
+}
+
+void GrDistanceFieldA8TextGeoProc::getGLSLProcessorKey(const GrGLSLCaps& caps,
+                                                       GrProcessorKeyBuilder* b) const {
+    GrGLDistanceFieldA8TextGeoProc::GenKey(*this, caps, b);
+}
+
+GrGLSLPrimitiveProcessor* GrDistanceFieldA8TextGeoProc::createGLSLInstance(const GrGLSLCaps&) const {
+    return new GrGLDistanceFieldA8TextGeoProc();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+GR_DEFINE_GEOMETRY_PROCESSOR_TEST(GrDistanceFieldA8TextGeoProc);
+
+const GrGeometryProcessor* GrDistanceFieldA8TextGeoProc::TestCreate(GrProcessorTestData* d) {
+    int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :
+                                          GrProcessorUnitTest::kAlphaTextureIdx;
+    static const SkShader::TileMode kTileModes[] = {
+        SkShader::kClamp_TileMode,
+        SkShader::kRepeat_TileMode,
+        SkShader::kMirror_TileMode,
+    };
+    SkShader::TileMode tileModes[] = {
+        kTileModes[d->fRandom->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
+        kTileModes[d->fRandom->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
+    };
+    GrTextureParams params(tileModes, d->fRandom->nextBool() ? GrTextureParams::kBilerp_FilterMode :
+                                                           GrTextureParams::kNone_FilterMode);
+
+    return GrDistanceFieldA8TextGeoProc::Create(GrRandomColor(d->fRandom),
+                                                GrTest::TestMatrix(d->fRandom),
+                                                d->fTextures[texIdx], params,
+#ifdef SK_GAMMA_APPLY_TO_A8
+                                                d->fRandom->nextF(),
+#endif
+                                                d->fRandom->nextBool() ?
+                                                    kSimilarity_DistanceFieldEffectFlag : 0,
+                                                    d->fRandom->nextBool());
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+class GrGLDistanceFieldPathGeoProc : public GrGLSLGeometryProcessor {
+public:
+    GrGLDistanceFieldPathGeoProc()
+        : fViewMatrix(SkMatrix::InvalidMatrix())
+        , fColor(GrColor_ILLEGAL)
+        , fTextureSize(SkISize::Make(-1, -1)) {}
+
+    void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override{
+        const GrDistanceFieldPathGeoProc& dfTexEffect = args.fGP.cast<GrDistanceFieldPathGeoProc>();
+
+        GrGLSLGPBuilder* pb = args.fPB;
+        GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+        SkAssertResult(fragBuilder->enableFeature(
+                                     GrGLSLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));
+
+        GrGLSLVertexBuilder* vertBuilder = args.fVertBuilder;
+        GrGLSLVaryingHandler* varyingHandler = args.fVaryingHandler;
+
+        // emit attributes
+        varyingHandler->emitAttributes(dfTexEffect);
+
+        GrGLSLVertToFrag v(kVec2f_GrSLType);
+        varyingHandler->addVarying("TextureCoords", &v, kHigh_GrSLPrecision);
+
+        // setup pass through color
+        if (!dfTexEffect.colorIgnored()) {
+            if (dfTexEffect.hasVertexColor()) {
+                varyingHandler->addPassThroughAttribute(dfTexEffect.inColor(), args.fOutputColor);
+            } else {
+                this->setupUniformColor(pb, fragBuilder, args.fOutputColor, &fColorUniform);
+            }
+        }
+        vertBuilder->codeAppendf("%s = %s;", v.vsOut(), dfTexEffect.inTextureCoords()->fName);
+
+        // Setup position
+        this->setupPosition(pb,
+                            vertBuilder,
+                            gpArgs,
+                            dfTexEffect.inPosition()->fName,
+                            dfTexEffect.viewMatrix(),
+                            &fViewMatrixUniform);
+
+        // emit transforms
+        this->emitTransforms(pb,
+                             vertBuilder,
+                             varyingHandler,
+                             gpArgs->fPositionVar,
+                             dfTexEffect.inPosition()->fName,
+                             args.fTransformsIn,
+                             args.fTransformsOut);
+
+        const char* textureSizeUniName = nullptr;
+        fTextureSizeUni = pb->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                         kVec2f_GrSLType, kDefault_GrSLPrecision,
+                                         "TextureSize", &textureSizeUniName);
+
+        // Use highp to work around aliasing issues
+        fragBuilder->codeAppend(GrGLSLShaderVar::PrecisionString(args.fGLSLCaps,
+                                                                 kHigh_GrSLPrecision));
+        fragBuilder->codeAppendf("vec2 uv = %s;", v.fsIn());
+
+        fragBuilder->codeAppend("float texColor = ");
+        fragBuilder->appendTextureLookup(args.fSamplers[0],
+                                         "uv",
+                                         kVec2f_GrSLType);
+        fragBuilder->codeAppend(".r;");
+        fragBuilder->codeAppend("float distance = "
+            SK_DistanceFieldMultiplier "*(texColor - " SK_DistanceFieldThreshold ");");
+
+        fragBuilder->codeAppend(GrGLSLShaderVar::PrecisionString(args.fGLSLCaps,
+                                                                 kHigh_GrSLPrecision));
+        fragBuilder->codeAppendf("vec2 st = uv*%s;", textureSizeUniName);
+        fragBuilder->codeAppend("float afwidth;");
+        if (dfTexEffect.getFlags() & kSimilarity_DistanceFieldEffectFlag) {
+            // For uniform scale, we adjust for the effect of the transformation on the distance
+            // by using the length of the gradient of the texture coordinates. We use st coordinates
+            // to ensure we're mapping 1:1 from texel space to pixel space.
+
+            // this gives us a smooth step across approximately one fragment
+            fragBuilder->codeAppend("afwidth = abs(" SK_DistanceFieldAAFactor "*dFdy(st.y));");
+        } else {
+            // For general transforms, to determine the amount of correction we multiply a unit
+            // vector pointing along the SDF gradient direction by the Jacobian of the st coords
+            // (which is the inverse transform for this fragment) and take the length of the result.
+            fragBuilder->codeAppend("vec2 dist_grad = vec2(dFdx(distance), dFdy(distance));");
+            // the length of the gradient may be 0, so we need to check for this
+            // this also compensates for the Adreno, which likes to drop tiles on division by 0
+            fragBuilder->codeAppend("float dg_len2 = dot(dist_grad, dist_grad);");
+            fragBuilder->codeAppend("if (dg_len2 < 0.0001) {");
+            fragBuilder->codeAppend("dist_grad = vec2(0.7071, 0.7071);");
+            fragBuilder->codeAppend("} else {");
+            fragBuilder->codeAppend("dist_grad = dist_grad*inversesqrt(dg_len2);");
+            fragBuilder->codeAppend("}");
+
+            fragBuilder->codeAppend("vec2 Jdx = dFdx(st);");
+            fragBuilder->codeAppend("vec2 Jdy = dFdy(st);");
+            fragBuilder->codeAppend("vec2 grad = vec2(dist_grad.x*Jdx.x + dist_grad.y*Jdy.x,");
+            fragBuilder->codeAppend("                 dist_grad.x*Jdx.y + dist_grad.y*Jdy.y);");
+
+            // this gives us a smooth step across approximately one fragment
+            fragBuilder->codeAppend("afwidth = " SK_DistanceFieldAAFactor "*length(grad);");
+        }
+        fragBuilder->codeAppend("float val = smoothstep(-afwidth, afwidth, distance);");
+
+        fragBuilder->codeAppendf("%s = vec4(val);", args.fOutputCoverage);
+    }
+
+    void setData(const GrGLSLProgramDataManager& pdman, const GrPrimitiveProcessor& proc) override {
+        SkASSERT(fTextureSizeUni.isValid());
+
+        GrTexture* texture = proc.texture(0);
+        if (texture->width() != fTextureSize.width() || 
+            texture->height() != fTextureSize.height()) {
+            fTextureSize = SkISize::Make(texture->width(), texture->height());
+            pdman.set2f(fTextureSizeUni,
+                        SkIntToScalar(fTextureSize.width()),
+                        SkIntToScalar(fTextureSize.height()));
+        }
+
+        const GrDistanceFieldPathGeoProc& dfpgp = proc.cast<GrDistanceFieldPathGeoProc>();
+
+        if (!dfpgp.viewMatrix().isIdentity() && !fViewMatrix.cheapEqualTo(dfpgp.viewMatrix())) {
+            fViewMatrix = dfpgp.viewMatrix();
+            float viewMatrix[3 * 3];
+            GrGLSLGetMatrix<3>(viewMatrix, fViewMatrix);
+            pdman.setMatrix3f(fViewMatrixUniform, viewMatrix);
+        }
+
+        if (dfpgp.color() != fColor) {
+            float c[4];
+            GrColorToRGBAFloat(dfpgp.color(), c);
+            pdman.set4fv(fColorUniform, 1, c);
+            fColor = dfpgp.color();
+        }
+    }
+
+    static inline void GenKey(const GrGeometryProcessor& gp,
+                              const GrGLSLCaps&,
+                              GrProcessorKeyBuilder* b) {
+        const GrDistanceFieldPathGeoProc& dfTexEffect = gp.cast<GrDistanceFieldPathGeoProc>();
+
+        uint32_t key = dfTexEffect.getFlags();
+        key |= dfTexEffect.colorIgnored() << 16;
+        key |= dfTexEffect.hasVertexColor() << 17;
+        key |= ComputePosKey(dfTexEffect.viewMatrix()) << 25;
+        b->add32(key);
+    }
+
+private:
+    UniformHandle fColorUniform;
+    UniformHandle fTextureSizeUni;
+    UniformHandle fViewMatrixUniform;
+    SkMatrix      fViewMatrix;
+    GrColor       fColor;
+    SkISize       fTextureSize;
+
+    typedef GrGLSLGeometryProcessor INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+GrDistanceFieldPathGeoProc::GrDistanceFieldPathGeoProc(
+        GrColor color,
+        const SkMatrix& viewMatrix,
+        GrTexture* texture,
+        const GrTextureParams& params,
+        uint32_t flags,
+        bool usesLocalCoords)
+    : fColor(color)
+    , fViewMatrix(viewMatrix)
+    , fTextureAccess(texture, params)
+    , fFlags(flags & kNonLCD_DistanceFieldEffectMask)
+    , fInColor(nullptr)
+    , fUsesLocalCoords(usesLocalCoords) {
+    SkASSERT(!(flags & ~kNonLCD_DistanceFieldEffectMask));
+    this->initClassID<GrDistanceFieldPathGeoProc>();
+    fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType,
+                                                   kHigh_GrSLPrecision));
+    if (flags & kColorAttr_DistanceFieldEffectFlag) {
+        fInColor = &this->addVertexAttrib(Attribute("inColor", kVec4ub_GrVertexAttribType));
+    }
+    fInTextureCoords = &this->addVertexAttrib(Attribute("inTextureCoords",
+                                                        kVec2f_GrVertexAttribType));
+    this->addTextureAccess(&fTextureAccess);
+}
+
+void GrDistanceFieldPathGeoProc::getGLSLProcessorKey(const GrGLSLCaps& caps,
+                                                     GrProcessorKeyBuilder* b) const {
+    GrGLDistanceFieldPathGeoProc::GenKey(*this, caps, b);
+}
+
+GrGLSLPrimitiveProcessor* GrDistanceFieldPathGeoProc::createGLSLInstance(const GrGLSLCaps&) const {
+    return new GrGLDistanceFieldPathGeoProc();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+GR_DEFINE_GEOMETRY_PROCESSOR_TEST(GrDistanceFieldPathGeoProc);
+
+const GrGeometryProcessor* GrDistanceFieldPathGeoProc::TestCreate(GrProcessorTestData* d) {
+    int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx
+                                        : GrProcessorUnitTest::kAlphaTextureIdx;
+    static const SkShader::TileMode kTileModes[] = {
+        SkShader::kClamp_TileMode,
+        SkShader::kRepeat_TileMode,
+        SkShader::kMirror_TileMode,
+    };
+    SkShader::TileMode tileModes[] = {
+        kTileModes[d->fRandom->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
+        kTileModes[d->fRandom->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
+    };
+    GrTextureParams params(tileModes, d->fRandom->nextBool() ? GrTextureParams::kBilerp_FilterMode
+                                                             : GrTextureParams::kNone_FilterMode);
+
+    return GrDistanceFieldPathGeoProc::Create(GrRandomColor(d->fRandom),
+                                              GrTest::TestMatrix(d->fRandom),
+                                              d->fTextures[texIdx],
+                                              params,
+                                              d->fRandom->nextBool() ?
+                                                      kSimilarity_DistanceFieldEffectFlag : 0,
+                                                      d->fRandom->nextBool());
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+class GrGLDistanceFieldLCDTextGeoProc : public GrGLSLGeometryProcessor {
+public:
+    GrGLDistanceFieldLCDTextGeoProc()
+        : fViewMatrix(SkMatrix::InvalidMatrix()), fColor(GrColor_ILLEGAL) {
+        fDistanceAdjust = GrDistanceFieldLCDTextGeoProc::DistanceAdjust::Make(1.0f, 1.0f, 1.0f);
+    }
+
+    void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override{
+        const GrDistanceFieldLCDTextGeoProc& dfTexEffect =
+                args.fGP.cast<GrDistanceFieldLCDTextGeoProc>();
+        GrGLSLGPBuilder* pb = args.fPB;
+
+        GrGLSLVertexBuilder* vertBuilder = args.fVertBuilder;
+        GrGLSLVaryingHandler* varyingHandler = args.fVaryingHandler;
+
+        // emit attributes
+        varyingHandler->emitAttributes(dfTexEffect);
+
+        GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+
+        // setup pass through color
+        if (!dfTexEffect.colorIgnored()) {
+            this->setupUniformColor(pb, fragBuilder, args.fOutputColor, &fColorUniform);
+        }
+
+        // Setup position
+        this->setupPosition(pb,
+                            vertBuilder,
+                            gpArgs,
+                            dfTexEffect.inPosition()->fName,
+                            dfTexEffect.viewMatrix(),
+                            &fViewMatrixUniform);
+
+        // emit transforms
+        this->emitTransforms(pb,
+                             vertBuilder,
+                             varyingHandler,
+                             gpArgs->fPositionVar,
+                             dfTexEffect.inPosition()->fName,
+                             args.fTransformsIn,
+                             args.fTransformsOut);
+
+        // set up varyings
+        bool isUniformScale = SkToBool(dfTexEffect.getFlags() & kUniformScale_DistanceFieldEffectMask);
+        GrGLSLVertToFrag recipScale(kFloat_GrSLType);
+        GrGLSLVertToFrag st(kVec2f_GrSLType);
+        varyingHandler->addVarying("IntTextureCoords", &st, kHigh_GrSLPrecision);
+        vertBuilder->codeAppendf("%s = %s;", st.vsOut(), dfTexEffect.inTextureCoords()->fName);
+
+        // compute numbers to be hardcoded to convert texture coordinates from int to float
+        SkASSERT(dfTexEffect.numTextures() == 1);
+        GrTexture* atlas = dfTexEffect.textureAccess(0).getTexture();
+        SkASSERT(atlas && SkIsPow2(atlas->width()) && SkIsPow2(atlas->height()));
+        SkScalar recipWidth = 1.0f / atlas->width();
+        SkScalar recipHeight = 1.0f / atlas->height();
+
+        GrGLSLVertToFrag uv(kVec2f_GrSLType);
+        varyingHandler->addVarying("TextureCoords", &uv, kHigh_GrSLPrecision);
+        vertBuilder->codeAppendf("%s = vec2(%.*f, %.*f) * %s;", uv.vsOut(),
+                                 GR_SIGNIFICANT_POW2_DECIMAL_DIG, recipWidth,
+                                 GR_SIGNIFICANT_POW2_DECIMAL_DIG, recipHeight,
+                                 dfTexEffect.inTextureCoords()->fName);
+
+        // add frag shader code
+
+        SkAssertResult(fragBuilder->enableFeature(
+                GrGLSLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));
+
+        // create LCD offset adjusted by inverse of transform
+        // Use highp to work around aliasing issues
+        fragBuilder->codeAppend(GrGLSLShaderVar::PrecisionString(args.fGLSLCaps,
+                                                                 kHigh_GrSLPrecision));
+        fragBuilder->codeAppendf("vec2 uv = %s;\n", uv.fsIn());
+        fragBuilder->codeAppend(GrGLSLShaderVar::PrecisionString(args.fGLSLCaps,
+                                                                 kHigh_GrSLPrecision));
+
+        SkScalar lcdDelta = 1.0f / (3.0f * atlas->width());
+        if (dfTexEffect.getFlags() & kBGR_DistanceFieldEffectFlag) {
+            fragBuilder->codeAppendf("float delta = -%.*f;\n", SK_FLT_DECIMAL_DIG, lcdDelta);
+        } else {
+            fragBuilder->codeAppendf("float delta = %.*f;\n", SK_FLT_DECIMAL_DIG, lcdDelta);
+        }
+        if (isUniformScale) {
+            fragBuilder->codeAppendf("float dy = abs(dFdy(%s.y));", st.fsIn());
+            fragBuilder->codeAppend("vec2 offset = vec2(dy*delta, 0.0);");
+        } else {
+            fragBuilder->codeAppendf("vec2 st = %s;\n", st.fsIn());
+
+            fragBuilder->codeAppend("vec2 Jdx = dFdx(st);");
+            fragBuilder->codeAppend("vec2 Jdy = dFdy(st);");
+            fragBuilder->codeAppend("vec2 offset = delta*Jdx;");
+        }
+
+        // green is distance to uv center
+        fragBuilder->codeAppend("\tvec4 texColor = ");
+        fragBuilder->appendTextureLookup(args.fSamplers[0], "uv", kVec2f_GrSLType);
+        fragBuilder->codeAppend(";\n");
+        fragBuilder->codeAppend("\tvec3 distance;\n");
+        fragBuilder->codeAppend("\tdistance.y = texColor.r;\n");
+        // red is distance to left offset
+        fragBuilder->codeAppend("\tvec2 uv_adjusted = uv - offset;\n");
+        fragBuilder->codeAppend("\ttexColor = ");
+        fragBuilder->appendTextureLookup(args.fSamplers[0], "uv_adjusted", kVec2f_GrSLType);
+        fragBuilder->codeAppend(";\n");
+        fragBuilder->codeAppend("\tdistance.x = texColor.r;\n");
+        // blue is distance to right offset
+        fragBuilder->codeAppend("\tuv_adjusted = uv + offset;\n");
+        fragBuilder->codeAppend("\ttexColor = ");
+        fragBuilder->appendTextureLookup(args.fSamplers[0], "uv_adjusted", kVec2f_GrSLType);
+        fragBuilder->codeAppend(";\n");
+        fragBuilder->codeAppend("\tdistance.z = texColor.r;\n");
+
+        fragBuilder->codeAppend("\tdistance = "
+           "vec3(" SK_DistanceFieldMultiplier ")*(distance - vec3(" SK_DistanceFieldThreshold"));");
+
+        // adjust width based on gamma
+        const char* distanceAdjustUniName = nullptr;
+        fDistanceAdjustUni = pb->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+            kVec3f_GrSLType, kDefault_GrSLPrecision,
+            "DistanceAdjust", &distanceAdjustUniName);
+        fragBuilder->codeAppendf("distance -= %s;", distanceAdjustUniName);
+
+        // To be strictly correct, we should compute the anti-aliasing factor separately
+        // for each color component. However, this is only important when using perspective
+        // transformations, and even then using a single factor seems like a reasonable
+        // trade-off between quality and speed.
+        fragBuilder->codeAppend("float afwidth;");
+        if (isUniformScale) {
+            // For uniform scale, we adjust for the effect of the transformation on the distance
+            // by using the length of the gradient of the texture coordinates. We use st coordinates
+            // to ensure we're mapping 1:1 from texel space to pixel space.
+
+            // this gives us a smooth step across approximately one fragment
+            fragBuilder->codeAppend("afwidth = " SK_DistanceFieldAAFactor "*dy;");
+        } else {
+            // For general transforms, to determine the amount of correction we multiply a unit
+            // vector pointing along the SDF gradient direction by the Jacobian of the st coords
+            // (which is the inverse transform for this fragment) and take the length of the result.
+            fragBuilder->codeAppend("vec2 dist_grad = vec2(dFdx(distance.r), dFdy(distance.r));");
+            // the length of the gradient may be 0, so we need to check for this
+            // this also compensates for the Adreno, which likes to drop tiles on division by 0
+            fragBuilder->codeAppend("float dg_len2 = dot(dist_grad, dist_grad);");
+            fragBuilder->codeAppend("if (dg_len2 < 0.0001) {");
+            fragBuilder->codeAppend("dist_grad = vec2(0.7071, 0.7071);");
+            fragBuilder->codeAppend("} else {");
+            fragBuilder->codeAppend("dist_grad = dist_grad*inversesqrt(dg_len2);");
+            fragBuilder->codeAppend("}");
+            fragBuilder->codeAppend("vec2 grad = vec2(dist_grad.x*Jdx.x + dist_grad.y*Jdy.x,");
+            fragBuilder->codeAppend("                 dist_grad.x*Jdx.y + dist_grad.y*Jdy.y);");
+
+            // this gives us a smooth step across approximately one fragment
+            fragBuilder->codeAppend("afwidth = " SK_DistanceFieldAAFactor "*length(grad);");
+        }
+
+        fragBuilder->codeAppend(
+                      "vec4 val = vec4(smoothstep(vec3(-afwidth), vec3(afwidth), distance), 1.0);");
+        // set alpha to be max of rgb coverage
+        fragBuilder->codeAppend("val.a = max(max(val.r, val.g), val.b);");
+
+        fragBuilder->codeAppendf("%s = val;", args.fOutputCoverage);
+    }
+
+    void setData(const GrGLSLProgramDataManager& pdman,
+                 const GrPrimitiveProcessor& processor) override {
+        SkASSERT(fDistanceAdjustUni.isValid());
+
+        const GrDistanceFieldLCDTextGeoProc& dflcd = processor.cast<GrDistanceFieldLCDTextGeoProc>();
+        GrDistanceFieldLCDTextGeoProc::DistanceAdjust wa = dflcd.getDistanceAdjust();
+        if (wa != fDistanceAdjust) {
+            pdman.set3f(fDistanceAdjustUni,
+                        wa.fR,
+                        wa.fG,
+                        wa.fB);
+            fDistanceAdjust = wa;
+        }
+
+        if (!dflcd.viewMatrix().isIdentity() && !fViewMatrix.cheapEqualTo(dflcd.viewMatrix())) {
+            fViewMatrix = dflcd.viewMatrix();
+            float viewMatrix[3 * 3];
+            GrGLSLGetMatrix<3>(viewMatrix, fViewMatrix);
+            pdman.setMatrix3f(fViewMatrixUniform, viewMatrix);
+        }
+
+        if (dflcd.color() != fColor) {
+            float c[4];
+            GrColorToRGBAFloat(dflcd.color(), c);
+            pdman.set4fv(fColorUniform, 1, c);
+            fColor = dflcd.color();
+        }
+    }
+
+    static inline void GenKey(const GrGeometryProcessor& gp,
+                              const GrGLSLCaps&,
+                              GrProcessorKeyBuilder* b) {
+        const GrDistanceFieldLCDTextGeoProc& dfTexEffect = gp.cast<GrDistanceFieldLCDTextGeoProc>();
+
+        uint32_t key = dfTexEffect.getFlags();
+        key |= dfTexEffect.colorIgnored() << 16;
+        key |= ComputePosKey(dfTexEffect.viewMatrix()) << 25;
+        b->add32(key);
+
+        // Currently we hardcode numbers to convert atlas coordinates to normalized floating point
+        SkASSERT(gp.numTextures() == 1);
+        GrTexture* atlas = gp.textureAccess(0).getTexture();
+        SkASSERT(atlas);
+        b->add32(atlas->width());
+        b->add32(atlas->height());
+    }
+
+private:
+    SkMatrix                                     fViewMatrix;
+    GrColor                                      fColor;
+    UniformHandle                                fViewMatrixUniform;
+    UniformHandle                                fColorUniform;
+    GrDistanceFieldLCDTextGeoProc::DistanceAdjust fDistanceAdjust;
+    UniformHandle                                fDistanceAdjustUni;
+
+    typedef GrGLSLGeometryProcessor INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+GrDistanceFieldLCDTextGeoProc::GrDistanceFieldLCDTextGeoProc(
+                                                  GrColor color, const SkMatrix& viewMatrix,
+                                                  GrTexture* texture, const GrTextureParams& params,
+                                                  DistanceAdjust distanceAdjust,
+                                                  uint32_t flags, bool usesLocalCoords)
+    : fColor(color)
+    , fViewMatrix(viewMatrix)
+    , fTextureAccess(texture, params)
+    , fDistanceAdjust(distanceAdjust)
+    , fFlags(flags & kLCD_DistanceFieldEffectMask)
+    , fUsesLocalCoords(usesLocalCoords) {
+    SkASSERT(!(flags & ~kLCD_DistanceFieldEffectMask) && (flags & kUseLCD_DistanceFieldEffectFlag));
+    this->initClassID<GrDistanceFieldLCDTextGeoProc>();
+    fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType,
+                                                   kHigh_GrSLPrecision));
+    fInTextureCoords = &this->addVertexAttrib(Attribute("inTextureCoords",
+                                                        kVec2s_GrVertexAttribType));
+    this->addTextureAccess(&fTextureAccess);
+}
+
+void GrDistanceFieldLCDTextGeoProc::getGLSLProcessorKey(const GrGLSLCaps& caps,
+                                                        GrProcessorKeyBuilder* b) const {
+    GrGLDistanceFieldLCDTextGeoProc::GenKey(*this, caps, b);
+}
+
+GrGLSLPrimitiveProcessor* GrDistanceFieldLCDTextGeoProc::createGLSLInstance(const GrGLSLCaps&) const {
+    return new GrGLDistanceFieldLCDTextGeoProc();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+GR_DEFINE_GEOMETRY_PROCESSOR_TEST(GrDistanceFieldLCDTextGeoProc);
+
+const GrGeometryProcessor* GrDistanceFieldLCDTextGeoProc::TestCreate(GrProcessorTestData* d) {
+    int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :
+                                          GrProcessorUnitTest::kAlphaTextureIdx;
+    static const SkShader::TileMode kTileModes[] = {
+        SkShader::kClamp_TileMode,
+        SkShader::kRepeat_TileMode,
+        SkShader::kMirror_TileMode,
+    };
+    SkShader::TileMode tileModes[] = {
+        kTileModes[d->fRandom->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
+        kTileModes[d->fRandom->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
+    };
+    GrTextureParams params(tileModes, d->fRandom->nextBool() ? GrTextureParams::kBilerp_FilterMode :
+                           GrTextureParams::kNone_FilterMode);
+    DistanceAdjust wa = { 0.0f, 0.1f, -0.1f };
+    uint32_t flags = kUseLCD_DistanceFieldEffectFlag;
+    flags |= d->fRandom->nextBool() ? kUniformScale_DistanceFieldEffectMask : 0;
+    flags |= d->fRandom->nextBool() ? kBGR_DistanceFieldEffectFlag : 0;
+    return GrDistanceFieldLCDTextGeoProc::Create(GrRandomColor(d->fRandom),
+                                                 GrTest::TestMatrix(d->fRandom),
+                                                 d->fTextures[texIdx], params,
+                                                 wa,
+                                                 flags,
+                                                 d->fRandom->nextBool());
+}
diff --git a/gfx/skia/skia/src/gpu/effects/GrDistanceFieldGeoProc.h b/gfx/skia/skia/src/gpu/effects/GrDistanceFieldGeoProc.h
new file mode 100644
index 000000000000..e17a0ce7819c
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/effects/GrDistanceFieldGeoProc.h
@@ -0,0 +1,232 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrDistanceFieldGeoProc_DEFINED
+#define GrDistanceFieldGeoProc_DEFINED
+
+#include "GrProcessor.h"
+#include "GrGeometryProcessor.h"
+
+class GrGLDistanceFieldA8TextGeoProc;
+class GrGLDistanceFieldPathGeoProc;
+class GrGLDistanceFieldLCDTextGeoProc;
+class GrInvariantOutput;
+
+enum GrDistanceFieldEffectFlags {
+    kSimilarity_DistanceFieldEffectFlag = 0x01,   // ctm is similarity matrix
+    kRectToRect_DistanceFieldEffectFlag = 0x02,   // ctm maps rects to rects
+    kUseLCD_DistanceFieldEffectFlag     = 0x04,   // use lcd text
+    kBGR_DistanceFieldEffectFlag        = 0x08,   // lcd display has bgr order
+    kPortrait_DistanceFieldEffectFlag   = 0x10,   // lcd display is in portrait mode (not used yet)
+    kColorAttr_DistanceFieldEffectFlag  = 0x20,   // color vertex attribute
+
+    kInvalid_DistanceFieldEffectFlag    = 0x80,   // invalid state (for initialization)
+    
+    kUniformScale_DistanceFieldEffectMask = kSimilarity_DistanceFieldEffectFlag |
+                                            kRectToRect_DistanceFieldEffectFlag,
+    // The subset of the flags relevant to GrDistanceFieldA8TextGeoProc
+    kNonLCD_DistanceFieldEffectMask       = kSimilarity_DistanceFieldEffectFlag |
+                                            kColorAttr_DistanceFieldEffectFlag,
+    // The subset of the flags relevant to GrDistanceFieldLCDTextGeoProc
+    kLCD_DistanceFieldEffectMask          = kSimilarity_DistanceFieldEffectFlag |
+                                            kRectToRect_DistanceFieldEffectFlag |
+                                            kUseLCD_DistanceFieldEffectFlag |
+                                            kBGR_DistanceFieldEffectFlag,
+};
+
+/**
+ * The output color of this effect is a modulation of the input color and a sample from a
+ * distance field texture (using a smoothed step function near 0.5).
+ * It allows explicit specification of the filtering and wrap modes (GrTextureParams). The input
+ * coords are a custom attribute. Gamma correction is handled via a texture LUT.
+ */
+class GrDistanceFieldA8TextGeoProc : public GrGeometryProcessor {
+public:
+#ifdef SK_GAMMA_APPLY_TO_A8
+    static GrGeometryProcessor* Create(GrColor color, const SkMatrix& viewMatrix,
+                                       GrTexture* tex, const GrTextureParams& params,
+                                       float lum, uint32_t flags, bool usesLocalCoords) {
+        return new GrDistanceFieldA8TextGeoProc(color, viewMatrix, tex, params, lum, flags,
+                                                usesLocalCoords);
+    }
+#else
+    static GrGeometryProcessor* Create(GrColor color, const SkMatrix& viewMatrix,
+                                       GrTexture* tex, const GrTextureParams& params,
+                                       uint32_t flags, bool usesLocalCoords) {
+        return new GrDistanceFieldA8TextGeoProc(color, viewMatrix, tex, params, flags,
+                                                usesLocalCoords);
+    }
+#endif
+
+    virtual ~GrDistanceFieldA8TextGeoProc() {}
+
+    const char* name() const override { return "DistanceFieldTexture"; }
+
+    const Attribute* inPosition() const { return fInPosition; }
+    const Attribute* inColor() const { return fInColor; }
+    const Attribute* inTextureCoords() const { return fInTextureCoords; }
+    GrColor color() const { return fColor; }
+    bool colorIgnored() const { return GrColor_ILLEGAL == fColor; }
+    bool hasVertexColor() const { return SkToBool(fInColor); }
+    const SkMatrix& viewMatrix() const { return fViewMatrix; }
+    bool usesLocalCoords() const { return fUsesLocalCoords; }
+#ifdef SK_GAMMA_APPLY_TO_A8
+    float getDistanceAdjust() const { return fDistanceAdjust; }
+#endif
+    uint32_t getFlags() const { return fFlags; }
+
+    void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
+
+    GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override;
+
+private:
+    GrDistanceFieldA8TextGeoProc(GrColor, const SkMatrix& viewMatrix,
+                                 GrTexture* texture, const GrTextureParams& params,
+#ifdef SK_GAMMA_APPLY_TO_A8
+                                 float distanceAdjust,
+#endif
+                                 uint32_t flags, bool usesLocalCoords);
+
+    GrColor          fColor;
+    SkMatrix         fViewMatrix;
+    GrTextureAccess  fTextureAccess;
+#ifdef SK_GAMMA_APPLY_TO_A8
+    float            fDistanceAdjust;
+#endif
+    uint32_t         fFlags;
+    const Attribute* fInPosition;
+    const Attribute* fInColor;
+    const Attribute* fInTextureCoords;
+    bool             fUsesLocalCoords;
+
+    GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
+
+    typedef GrGeometryProcessor INHERITED;
+};
+
+
+/**
+* The output color of this effect is a modulation of the input color and a sample from a
+* distance field texture (using a smoothed step function near 0.5).
+* It allows explicit specification of the filtering and wrap modes (GrTextureParams). The input
+* coords are a custom attribute. No gamma correct blending is applied. Used for paths only.
+*/
+class GrDistanceFieldPathGeoProc : public GrGeometryProcessor {
+public:
+    static GrGeometryProcessor* Create(GrColor color, const SkMatrix& viewMatrix, GrTexture* tex,
+                                       const GrTextureParams& params,
+                                       uint32_t flags, bool usesLocalCoords) {
+        return new GrDistanceFieldPathGeoProc(color, viewMatrix, tex, params, flags,
+                                              usesLocalCoords);
+    }
+
+    virtual ~GrDistanceFieldPathGeoProc() {}
+
+    const char* name() const override { return "DistanceFieldTexture"; }
+
+    const Attribute* inPosition() const { return fInPosition; }
+    const Attribute* inColor() const { return fInColor; }
+    const Attribute* inTextureCoords() const { return fInTextureCoords; }
+    GrColor color() const { return fColor; }
+    bool colorIgnored() const { return GrColor_ILLEGAL == fColor; }
+    bool hasVertexColor() const { return SkToBool(fInColor); }
+    const SkMatrix& viewMatrix() const { return fViewMatrix; }
+    uint32_t getFlags() const { return fFlags; }
+    bool usesLocalCoords() const { return fUsesLocalCoords; }
+
+    void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
+
+    GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override;
+
+private:
+    GrDistanceFieldPathGeoProc(GrColor, const SkMatrix& viewMatrix, GrTexture* texture,
+                               const GrTextureParams& params, uint32_t flags,
+                               bool usesLocalCoords);
+
+    GrColor          fColor;
+    SkMatrix         fViewMatrix;
+    GrTextureAccess  fTextureAccess;
+    uint32_t         fFlags;
+    const Attribute* fInPosition;
+    const Attribute* fInColor;
+    const Attribute* fInTextureCoords;
+    bool             fUsesLocalCoords;
+
+    GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
+
+    typedef GrGeometryProcessor INHERITED;
+};
+
+/**
+ * The output color of this effect is a modulation of the input color and samples from a
+ * distance field texture (using a smoothed step function near 0.5), adjusted for LCD displays.
+ * It allows explicit specification of the filtering and wrap modes (GrTextureParams). The input
+ * coords are a custom attribute. Gamma correction is handled via a texture LUT.
+ */
+class GrDistanceFieldLCDTextGeoProc : public GrGeometryProcessor {
+public:
+    struct DistanceAdjust {
+        SkScalar fR, fG, fB;
+        static DistanceAdjust Make(SkScalar r, SkScalar g, SkScalar b) {
+            DistanceAdjust result;
+            result.fR = r; result.fG = g; result.fB = b;
+            return result;
+        }
+        bool operator==(const DistanceAdjust& wa) const {
+            return (fR == wa.fR && fG == wa.fG && fB == wa.fB);
+        }
+        bool operator!=(const DistanceAdjust& wa) const {
+            return !(*this == wa);
+        }
+    };
+
+    static GrGeometryProcessor* Create(GrColor color, const SkMatrix& viewMatrix,
+                                       GrTexture* tex, const GrTextureParams& params,
+                                       DistanceAdjust distanceAdjust, uint32_t flags,
+                                       bool usesLocalCoords) {
+        return new GrDistanceFieldLCDTextGeoProc(color, viewMatrix, tex, params, distanceAdjust,
+                                                 flags, usesLocalCoords);
+    }
+
+    virtual ~GrDistanceFieldLCDTextGeoProc() {}
+
+    const char* name() const override { return "DistanceFieldLCDTexture"; }
+
+    const Attribute* inPosition() const { return fInPosition; }
+    const Attribute* inTextureCoords() const { return fInTextureCoords; }
+    DistanceAdjust getDistanceAdjust() const { return fDistanceAdjust; }
+    GrColor color() const { return fColor; }
+    bool colorIgnored() const { return GrColor_ILLEGAL == fColor; }
+    const SkMatrix& viewMatrix() const { return fViewMatrix; }
+    uint32_t getFlags() const { return fFlags; }
+    bool usesLocalCoords() const { return fUsesLocalCoords; }
+
+    void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
+
+    GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override;
+
+private:
+    GrDistanceFieldLCDTextGeoProc(GrColor, const SkMatrix& viewMatrix,
+                                  GrTexture* texture, const GrTextureParams& params,
+                                  DistanceAdjust wa, uint32_t flags,
+                                  bool usesLocalCoords);
+
+    GrColor          fColor;
+    SkMatrix         fViewMatrix;
+    GrTextureAccess  fTextureAccess;
+    DistanceAdjust   fDistanceAdjust;
+    uint32_t         fFlags;
+    const Attribute* fInPosition;
+    const Attribute* fInTextureCoords;
+    bool             fUsesLocalCoords;
+
+    GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
+
+    typedef GrGeometryProcessor INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/effects/GrDistanceFieldTextureEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrDistanceFieldTextureEffect.cpp
deleted file mode 100755
index 0c0c1afc769a..000000000000
--- a/gfx/skia/skia/src/gpu/effects/GrDistanceFieldTextureEffect.cpp
+++ /dev/null
@@ -1,503 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrDistanceFieldTextureEffect.h"
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
-#include "gl/GrGLSL.h"
-#include "gl/GrGLTexture.h"
-#include "gl/GrGLVertexEffect.h"
-#include "GrTBackendEffectFactory.h"
-#include "GrTexture.h"
-
-#include "SkDistanceFieldGen.h"
-
-// To get optical sizes people don't complain about when we blit correctly,
-// we need to slightly bold each glyph. On the Mac, we need a larger bold value.
-#if defined(SK_BUILD_FOR_MAC)
-#define SK_DistanceFieldLCDFactor    "0.33"
-#define SK_DistanceFieldNonLCDFactor "0.25"
-#else
-#define SK_DistanceFieldLCDFactor    "0.05"
-#define SK_DistanceFieldNonLCDFactor "0.05"
-#endif
-
-// Assuming a radius of the diagonal of the fragment, hence a factor of sqrt(2)/2
-#define SK_DistanceFieldAAFactor     "0.7071"
-
-class GrGLDistanceFieldTextureEffect : public GrGLVertexEffect {
-public:
-    GrGLDistanceFieldTextureEffect(const GrBackendEffectFactory& factory,
-                                   const GrDrawEffect& drawEffect)
-        : INHERITED (factory)
-        , fTextureSize(SkISize::Make(-1,-1)) {}
-
-    virtual void emitCode(GrGLFullShaderBuilder* builder,
-                          const GrDrawEffect& drawEffect,
-                          const GrEffectKey& key,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray& samplers) SK_OVERRIDE {
-        SkASSERT(1 == drawEffect.castEffect<GrDistanceFieldTextureEffect>().numVertexAttribs());
-
-        SkAssertResult(builder->enableFeature(GrGLShaderBuilder::kStandardDerivatives_GLSLFeature));
-        const GrDistanceFieldTextureEffect& dfTexEffect =
-                                              drawEffect.castEffect<GrDistanceFieldTextureEffect>();
-
-        SkString fsCoordName;
-        const char* vsCoordName;
-        const char* fsCoordNamePtr;
-        builder->addVarying(kVec2f_GrSLType, "textureCoords", &vsCoordName, &fsCoordNamePtr);
-        fsCoordName = fsCoordNamePtr;
-
-        const char* attrName0 =
-            builder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[0])->c_str();
-        builder->vsCodeAppendf("\t%s = %s;\n", vsCoordName, attrName0);
-
-        const char* textureSizeUniName = NULL;
-        fTextureSizeUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                              kVec2f_GrSLType, "TextureSize",
-                                              &textureSizeUniName);
-
-        builder->fsCodeAppend("\tvec4 texColor = ");
-        builder->fsAppendTextureLookup(samplers[0],
-                                       fsCoordName.c_str(),
-                                       kVec2f_GrSLType);
-        builder->fsCodeAppend(";\n");
-        builder->fsCodeAppend("\tfloat distance = "
-                          SK_DistanceFieldMultiplier "*(texColor.r - " SK_DistanceFieldThreshold ")"
-                          "+ " SK_DistanceFieldNonLCDFactor ";\n");
-
-        // we adjust for the effect of the transformation on the distance by using
-        // the length of the gradient of the texture coordinates. We use st coordinates
-        // to ensure we're mapping 1:1 from texel space to pixel space.
-        builder->fsCodeAppendf("\tvec2 uv = %s;\n", fsCoordName.c_str());
-        builder->fsCodeAppendf("\tvec2 st = uv*%s;\n", textureSizeUniName);
-        builder->fsCodeAppend("\tfloat afwidth;\n");
-        if (dfTexEffect.isSimilarity()) {
-            // this gives us a smooth step across approximately one fragment
-            builder->fsCodeAppend("\tafwidth = " SK_DistanceFieldAAFactor "*dFdx(st.x);\n");
-        } else {
-            builder->fsCodeAppend("\tvec2 Jdx = dFdx(st);\n");
-            builder->fsCodeAppend("\tvec2 Jdy = dFdy(st);\n");
-
-            builder->fsCodeAppend("\tvec2 uv_grad;\n");
-            if (builder->ctxInfo().caps()->dropsTileOnZeroDivide()) {
-                // this is to compensate for the Adreno, which likes to drop tiles on division by 0
-                builder->fsCodeAppend("\tfloat uv_len2 = dot(uv, uv);\n");
-                builder->fsCodeAppend("\tif (uv_len2 < 0.0001) {\n");
-                builder->fsCodeAppend("\t\tuv_grad = vec2(0.7071, 0.7071);\n");
-                builder->fsCodeAppend("\t} else {\n");
-                builder->fsCodeAppend("\t\tuv_grad = uv*inversesqrt(uv_len2);\n");
-                builder->fsCodeAppend("\t}\n");
-            } else {
-                builder->fsCodeAppend("\tuv_grad = normalize(uv);\n");
-            }
-            builder->fsCodeAppend("\tvec2 grad = vec2(uv_grad.x*Jdx.x + uv_grad.y*Jdy.x,\n");
-            builder->fsCodeAppend("\t                 uv_grad.x*Jdx.y + uv_grad.y*Jdy.y);\n");
-
-            // this gives us a smooth step across approximately one fragment
-            builder->fsCodeAppend("\tafwidth = " SK_DistanceFieldAAFactor "*length(grad);\n");
-        }
-        builder->fsCodeAppend("\tfloat val = smoothstep(-afwidth, afwidth, distance);\n");
-
-#ifdef SK_GAMMA_APPLY_TO_A8
-        // adjust based on gamma
-        const char* luminanceUniName = NULL;
-        // width, height, 1/(3*width)
-        fLuminanceUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                            kFloat_GrSLType, "Luminance",
-                                            &luminanceUniName);
-
-        builder->fsCodeAppendf("\tuv = vec2(val, %s);\n", luminanceUniName);
-        builder->fsCodeAppend("\tvec4 gammaColor = ");
-        builder->fsAppendTextureLookup(samplers[1], "uv", kVec2f_GrSLType);
-        builder->fsCodeAppend(";\n");
-        builder->fsCodeAppend("\tval = gammaColor.r;\n");
-#endif
-
-        builder->fsCodeAppendf("\t%s = %s;\n", outputColor,
-                                   (GrGLSLExpr4(inputColor) * GrGLSLExpr1("val")).c_str());
-    }
-
-    virtual void setData(const GrGLUniformManager& uman,
-                         const GrDrawEffect& drawEffect) SK_OVERRIDE {
-        SkASSERT(fTextureSizeUni.isValid());
-
-        GrTexture* texture = drawEffect.effect()->texture(0);
-        if (texture->width() != fTextureSize.width() ||
-            texture->height() != fTextureSize.height()) {
-            fTextureSize = SkISize::Make(texture->width(), texture->height());
-            uman.set2f(fTextureSizeUni,
-                       SkIntToScalar(fTextureSize.width()),
-                       SkIntToScalar(fTextureSize.height()));
-        }
-#ifdef SK_GAMMA_APPLY_TO_A8
-        const GrDistanceFieldTextureEffect& dfTexEffect =
-                                              drawEffect.castEffect<GrDistanceFieldTextureEffect>();
-        float luminance = dfTexEffect.getLuminance();
-        if (luminance != fLuminance) {
-            uman.set1f(fLuminanceUni, luminance);
-            fLuminance = luminance;
-        }
-#endif
-    }
-
-    static inline void GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
-                              GrEffectKeyBuilder* b) {
-        const GrDistanceFieldTextureEffect& dfTexEffect =
-                                              drawEffect.castEffect<GrDistanceFieldTextureEffect>();
-
-        b->add32(dfTexEffect.isSimilarity());
-    }
-
-private:
-    GrGLUniformManager::UniformHandle fTextureSizeUni;
-    SkISize                           fTextureSize;
-    GrGLUniformManager::UniformHandle fLuminanceUni;
-    float                             fLuminance;
-
-    typedef GrGLVertexEffect INHERITED;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
-GrDistanceFieldTextureEffect::GrDistanceFieldTextureEffect(GrTexture* texture,
-                                                           const GrTextureParams& params,
-#ifdef SK_GAMMA_APPLY_TO_A8
-                                                           GrTexture* gamma,
-                                                           const GrTextureParams& gammaParams,
-                                                           float luminance,
-#endif
-                                                           bool similarity)
-    : fTextureAccess(texture, params)
-#ifdef SK_GAMMA_APPLY_TO_A8
-    , fGammaTextureAccess(gamma, gammaParams)
-    , fLuminance(luminance)
-#endif
-    , fIsSimilarity(similarity) {
-    this->addTextureAccess(&fTextureAccess);
-#ifdef SK_GAMMA_APPLY_TO_A8
-    this->addTextureAccess(&fGammaTextureAccess);
-#endif
-    this->addVertexAttrib(kVec2f_GrSLType);
-}
-
-bool GrDistanceFieldTextureEffect::onIsEqual(const GrEffect& other) const {
-    const GrDistanceFieldTextureEffect& cte = CastEffect<GrDistanceFieldTextureEffect>(other);
-    return fTextureAccess == cte.fTextureAccess;
-}
-
-void GrDistanceFieldTextureEffect::getConstantColorComponents(GrColor* color,
-                                                             uint32_t* validFlags) const {
-    if ((*validFlags & kA_GrColorComponentFlag) && 0xFF == GrColorUnpackA(*color) &&
-        GrPixelConfigIsOpaque(this->texture(0)->config())) {
-        *validFlags = kA_GrColorComponentFlag;
-    } else {
-        *validFlags = 0;
-    }
-}
-
-const GrBackendEffectFactory& GrDistanceFieldTextureEffect::getFactory() const {
-    return GrTBackendEffectFactory<GrDistanceFieldTextureEffect>::getInstance();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-GR_DEFINE_EFFECT_TEST(GrDistanceFieldTextureEffect);
-
-GrEffect* GrDistanceFieldTextureEffect::TestCreate(SkRandom* random,
-                                                   GrContext*,
-                                                   const GrDrawTargetCaps&,
-                                                   GrTexture* textures[]) {
-    int texIdx = random->nextBool() ? GrEffectUnitTest::kSkiaPMTextureIdx :
-                                      GrEffectUnitTest::kAlphaTextureIdx;
-#ifdef SK_GAMMA_APPLY_TO_A8
-    int texIdx2 = random->nextBool() ? GrEffectUnitTest::kSkiaPMTextureIdx :
-                                       GrEffectUnitTest::kAlphaTextureIdx;
-#endif
-    static const SkShader::TileMode kTileModes[] = {
-        SkShader::kClamp_TileMode,
-        SkShader::kRepeat_TileMode,
-        SkShader::kMirror_TileMode,
-    };
-    SkShader::TileMode tileModes[] = {
-        kTileModes[random->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
-        kTileModes[random->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
-    };
-    GrTextureParams params(tileModes, random->nextBool() ? GrTextureParams::kBilerp_FilterMode :
-                                                           GrTextureParams::kNone_FilterMode);
-#ifdef SK_GAMMA_APPLY_TO_A8
-    GrTextureParams params2(tileModes, random->nextBool() ? GrTextureParams::kBilerp_FilterMode :
-                                                            GrTextureParams::kNone_FilterMode);
-#endif
-
-    return GrDistanceFieldTextureEffect::Create(textures[texIdx], params,
-#ifdef SK_GAMMA_APPLY_TO_A8
-                                                textures[texIdx2], params2,
-                                                random->nextF(),
-#endif
-                                                random->nextBool());
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-class GrGLDistanceFieldLCDTextureEffect : public GrGLVertexEffect {
-public:
-    GrGLDistanceFieldLCDTextureEffect(const GrBackendEffectFactory& factory,
-                                      const GrDrawEffect& drawEffect)
-    : INHERITED (factory)
-    , fTextureSize(SkISize::Make(-1,-1)) {}
-
-    virtual void emitCode(GrGLFullShaderBuilder* builder,
-                          const GrDrawEffect& drawEffect,
-                          const GrEffectKey& key,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray& samplers) SK_OVERRIDE {
-        SkASSERT(1 == drawEffect.castEffect<GrDistanceFieldLCDTextureEffect>().numVertexAttribs());
-
-        SkAssertResult(builder->enableFeature(GrGLShaderBuilder::kStandardDerivatives_GLSLFeature));
-        const GrDistanceFieldLCDTextureEffect& dfTexEffect =
-                                           drawEffect.castEffect<GrDistanceFieldLCDTextureEffect>();
-
-        SkString fsCoordName;
-        const char* vsCoordName;
-        const char* fsCoordNamePtr;
-        builder->addVarying(kVec2f_GrSLType, "textureCoords", &vsCoordName, &fsCoordNamePtr);
-        fsCoordName = fsCoordNamePtr;
-
-        const char* attrName0 =
-                   builder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[0])->c_str();
-        builder->vsCodeAppendf("\t%s = %s;\n", vsCoordName, attrName0);
-
-        const char* textureSizeUniName = NULL;
-        // width, height, 1/(3*width)
-        fTextureSizeUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                              kVec3f_GrSLType, "TextureSize",
-                                              &textureSizeUniName);
-
-        // create LCD offset adjusted by inverse of transform
-        builder->fsCodeAppendf("\tvec2 uv = %s;\n", fsCoordName.c_str());
-        builder->fsCodeAppendf("\tvec2 st = uv*%s.xy;\n", textureSizeUniName);
-        if (dfTexEffect.isUniformScale()) {
-            builder->fsCodeAppend("\tfloat dx = dFdx(st.x);\n");
-            builder->fsCodeAppendf("\tvec2 offset = vec2(dx*%s.z, 0.0);\n", textureSizeUniName);
-        } else {
-            builder->fsCodeAppend("\tvec2 Jdx = dFdx(st);\n");
-            builder->fsCodeAppend("\tvec2 Jdy = dFdy(st);\n");
-            builder->fsCodeAppendf("\tvec2 offset = %s.z*Jdx;\n", textureSizeUniName);
-        }
-
-        // green is distance to uv center
-        builder->fsCodeAppend("\tvec4 texColor = ");
-        builder->fsAppendTextureLookup(samplers[0], "uv", kVec2f_GrSLType);
-        builder->fsCodeAppend(";\n");
-        builder->fsCodeAppend("\tvec3 distance;\n");
-        builder->fsCodeAppend("\tdistance.y = texColor.r;\n");
-        // red is distance to left offset
-        builder->fsCodeAppend("\tvec2 uv_adjusted = uv - offset;\n");
-        builder->fsCodeAppend("\ttexColor = ");
-        builder->fsAppendTextureLookup(samplers[0], "uv_adjusted", kVec2f_GrSLType);
-        builder->fsCodeAppend(";\n");
-        builder->fsCodeAppend("\tdistance.x = texColor.r;\n");
-        // blue is distance to right offset
-        builder->fsCodeAppend("\tuv_adjusted = uv + offset;\n");
-        builder->fsCodeAppend("\ttexColor = ");
-        builder->fsAppendTextureLookup(samplers[0], "uv_adjusted", kVec2f_GrSLType);
-        builder->fsCodeAppend(";\n");
-        builder->fsCodeAppend("\tdistance.z = texColor.r;\n");
-
-        builder->fsCodeAppend("\tdistance = "
-            "vec3(" SK_DistanceFieldMultiplier ")*(distance - vec3(" SK_DistanceFieldThreshold"))"
-            "+ vec3(" SK_DistanceFieldLCDFactor ");\n");
-
-        // we adjust for the effect of the transformation on the distance by using
-        // the length of the gradient of the texture coordinates. We use st coordinates
-        // to ensure we're mapping 1:1 from texel space to pixel space.
-
-        // To be strictly correct, we should compute the anti-aliasing factor separately
-        // for each color component. However, this is only important when using perspective
-        // transformations, and even then using a single factor seems like a reasonable
-        // trade-off between quality and speed.
-        builder->fsCodeAppend("\tfloat afwidth;\n");
-        if (dfTexEffect.isUniformScale()) {
-            // this gives us a smooth step across approximately one fragment
-            builder->fsCodeAppend("\tafwidth = " SK_DistanceFieldAAFactor "*dx;\n");
-        } else {
-            builder->fsCodeAppend("\tvec2 uv_grad;\n");
-            if (builder->ctxInfo().caps()->dropsTileOnZeroDivide()) {
-                // this is to compensate for the Adreno, which likes to drop tiles on division by 0
-                builder->fsCodeAppend("\tfloat uv_len2 = dot(uv, uv);\n");
-                builder->fsCodeAppend("\tif (uv_len2 < 0.0001) {\n");
-                builder->fsCodeAppend("\t\tuv_grad = vec2(0.7071, 0.7071);\n");
-                builder->fsCodeAppend("\t} else {\n");
-                builder->fsCodeAppend("\t\tuv_grad = uv*inversesqrt(uv_len2);\n");
-                builder->fsCodeAppend("\t}\n");
-            } else {
-                builder->fsCodeAppend("\tuv_grad = normalize(uv);\n");
-            }
-            builder->fsCodeAppend("\tvec2 grad = vec2(uv_grad.x*Jdx.x + uv_grad.y*Jdy.x,\n");
-            builder->fsCodeAppend("\t                 uv_grad.x*Jdx.y + uv_grad.y*Jdy.y);\n");
-
-            // this gives us a smooth step across approximately one fragment
-            builder->fsCodeAppend("\tafwidth = " SK_DistanceFieldAAFactor "*length(grad);\n");
-        }
-
-        builder->fsCodeAppend("\tvec4 val = vec4(smoothstep(vec3(-afwidth), vec3(afwidth), distance), 1.0);\n");
-
-        // adjust based on gamma
-        const char* textColorUniName = NULL;
-        // width, height, 1/(3*width)
-        fTextColorUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                            kVec3f_GrSLType, "TextColor",
-                                            &textColorUniName);
-
-        builder->fsCodeAppendf("\tuv = vec2(val.x, %s.x);\n", textColorUniName);
-        builder->fsCodeAppend("\tvec4 gammaColor = ");
-        builder->fsAppendTextureLookup(samplers[1], "uv", kVec2f_GrSLType);
-        builder->fsCodeAppend(";\n");
-        builder->fsCodeAppend("\tval.x = gammaColor.r;\n");
-
-        builder->fsCodeAppendf("\tuv = vec2(val.y, %s.y);\n", textColorUniName);
-        builder->fsCodeAppend("\tgammaColor = ");
-        builder->fsAppendTextureLookup(samplers[1], "uv", kVec2f_GrSLType);
-        builder->fsCodeAppend(";\n");
-        builder->fsCodeAppend("\tval.y = gammaColor.r;\n");
-
-        builder->fsCodeAppendf("\tuv = vec2(val.z, %s.z);\n", textColorUniName);
-        builder->fsCodeAppend("\tgammaColor = ");
-        builder->fsAppendTextureLookup(samplers[1], "uv", kVec2f_GrSLType);
-        builder->fsCodeAppend(";\n");
-        builder->fsCodeAppend("\tval.z = gammaColor.r;\n");
-
-        builder->fsCodeAppendf("\t%s = %s;\n", outputColor,
-                               (GrGLSLExpr4(inputColor) * GrGLSLExpr4("val")).c_str());
-    }
-
-    virtual void setData(const GrGLUniformManager& uman,
-                         const GrDrawEffect& drawEffect) SK_OVERRIDE {
-        SkASSERT(fTextureSizeUni.isValid());
-        SkASSERT(fTextColorUni.isValid());
-
-        const GrDistanceFieldLCDTextureEffect& dfTexEffect =
-                                    drawEffect.castEffect<GrDistanceFieldLCDTextureEffect>();
-        GrTexture* texture = drawEffect.effect()->texture(0);
-        if (texture->width() != fTextureSize.width() ||
-            texture->height() != fTextureSize.height()) {
-            fTextureSize = SkISize::Make(texture->width(), texture->height());
-            float delta = 1.0f/(3.0f*texture->width());
-            if (dfTexEffect.useBGR()) {
-                delta = -delta;
-            }
-            uman.set3f(fTextureSizeUni,
-                       SkIntToScalar(fTextureSize.width()),
-                       SkIntToScalar(fTextureSize.height()),
-                       delta);
-        }
-
-        GrColor textColor = dfTexEffect.getTextColor();
-        if (textColor != fTextColor) {
-            static const float ONE_OVER_255 = 1.f / 255.f;
-            uman.set3f(fTextColorUni,
-                       GrColorUnpackR(textColor) * ONE_OVER_255,
-                       GrColorUnpackG(textColor) * ONE_OVER_255,
-                       GrColorUnpackB(textColor) * ONE_OVER_255);
-            fTextColor = textColor;
-        }
-    }
-
-    static inline void GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
-                              GrEffectKeyBuilder* b) {
-        const GrDistanceFieldLCDTextureEffect& dfTexEffect =
-                                           drawEffect.castEffect<GrDistanceFieldLCDTextureEffect>();
-
-        b->add32(dfTexEffect.isUniformScale());
-    }
-
-private:
-    GrGLUniformManager::UniformHandle fTextureSizeUni;
-    SkISize                           fTextureSize;
-    GrGLUniformManager::UniformHandle fTextColorUni;
-    SkColor                           fTextColor;
-
-    typedef GrGLVertexEffect INHERITED;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
-GrDistanceFieldLCDTextureEffect::GrDistanceFieldLCDTextureEffect(
-                                                  GrTexture* texture, const GrTextureParams& params,
-                                                  GrTexture* gamma, const GrTextureParams& gParams,
-                                                  SkColor textColor,
-                                                  bool uniformScale, bool useBGR)
-    : fTextureAccess(texture, params)
-    , fGammaTextureAccess(gamma, gParams)
-    , fTextColor(textColor)
-    , fUniformScale(uniformScale)
-    , fUseBGR(useBGR) {
-    this->addTextureAccess(&fTextureAccess);
-    this->addTextureAccess(&fGammaTextureAccess);
-    this->addVertexAttrib(kVec2f_GrSLType);
-}
-
-bool GrDistanceFieldLCDTextureEffect::onIsEqual(const GrEffect& other) const {
-    const GrDistanceFieldLCDTextureEffect& cte = 
-                                            CastEffect<GrDistanceFieldLCDTextureEffect>(other);
-    return (fTextureAccess == cte.fTextureAccess && fGammaTextureAccess == cte.fGammaTextureAccess);
-}
-
-void GrDistanceFieldLCDTextureEffect::getConstantColorComponents(GrColor* color,
-                                                                 uint32_t* validFlags) const {
-    if ((*validFlags & kA_GrColorComponentFlag) && 0xFF == GrColorUnpackA(*color) &&
-        GrPixelConfigIsOpaque(this->texture(0)->config())) {
-        *validFlags = kA_GrColorComponentFlag;
-    } else {
-        *validFlags = 0;
-    }
-}
-
-const GrBackendEffectFactory& GrDistanceFieldLCDTextureEffect::getFactory() const {
-    return GrTBackendEffectFactory<GrDistanceFieldLCDTextureEffect>::getInstance();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-GR_DEFINE_EFFECT_TEST(GrDistanceFieldLCDTextureEffect);
-
-GrEffect* GrDistanceFieldLCDTextureEffect::TestCreate(SkRandom* random,
-                                                      GrContext*,
-                                                      const GrDrawTargetCaps&,
-                                                      GrTexture* textures[]) {
-    int texIdx = random->nextBool() ? GrEffectUnitTest::kSkiaPMTextureIdx :
-                                      GrEffectUnitTest::kAlphaTextureIdx;
-    int texIdx2 = random->nextBool() ? GrEffectUnitTest::kSkiaPMTextureIdx :
-                                       GrEffectUnitTest::kAlphaTextureIdx;
-    static const SkShader::TileMode kTileModes[] = {
-        SkShader::kClamp_TileMode,
-        SkShader::kRepeat_TileMode,
-        SkShader::kMirror_TileMode,
-    };
-    SkShader::TileMode tileModes[] = {
-        kTileModes[random->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
-        kTileModes[random->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
-    };
-    GrTextureParams params(tileModes, random->nextBool() ? GrTextureParams::kBilerp_FilterMode :
-                           GrTextureParams::kNone_FilterMode);
-    GrTextureParams params2(tileModes, random->nextBool() ? GrTextureParams::kBilerp_FilterMode :
-                           GrTextureParams::kNone_FilterMode);
-    GrColor textColor = GrColorPackRGBA(random->nextULessThan(256),
-                                        random->nextULessThan(256),
-                                        random->nextULessThan(256),
-                                        random->nextULessThan(256));
-    return GrDistanceFieldLCDTextureEffect::Create(textures[texIdx], params,
-                                                   textures[texIdx2], params2,
-                                                   textColor,
-                                                   random->nextBool(), random->nextBool());
-}
diff --git a/gfx/skia/skia/src/gpu/effects/GrDistanceFieldTextureEffect.h b/gfx/skia/skia/src/gpu/effects/GrDistanceFieldTextureEffect.h
deleted file mode 100644
index 38e41e5590d6..000000000000
--- a/gfx/skia/skia/src/gpu/effects/GrDistanceFieldTextureEffect.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrDistanceFieldTextureEffect_DEFINED
-#define GrDistanceFieldTextureEffect_DEFINED
-
-#include "GrEffect.h"
-#include "GrVertexEffect.h"
-
-class GrGLDistanceFieldTextureEffect;
-class GrGLDistanceFieldLCDTextureEffect;
-
-/**
- * The output color of this effect is a modulation of the input color and a sample from a
- * distance field texture (using a smoothed step function near 0.5).
- * It allows explicit specification of the filtering and wrap modes (GrTextureParams). The input
- * coords are a custom attribute. Gamma correction is handled via a texture LUT.
- */
-class GrDistanceFieldTextureEffect : public GrVertexEffect {
-public:
-#ifdef SK_GAMMA_APPLY_TO_A8
-    static GrEffect* Create(GrTexture* tex, const GrTextureParams& params,
-                            GrTexture* gamma, const GrTextureParams& gammaParams, float lum,
-                            bool similarity) {
-       return SkNEW_ARGS(GrDistanceFieldTextureEffect, (tex, params, gamma, gammaParams, lum,
-                                                        similarity));
-    }
-#else
-    static GrEffect* Create(GrTexture* tex, const GrTextureParams& params,
-                            bool similarity) {
-        return  SkNEW_ARGS(GrDistanceFieldTextureEffect, (tex, params, similarity));
-    }
-#endif
-
-    virtual ~GrDistanceFieldTextureEffect() {}
-
-    static const char* Name() { return "DistanceFieldTexture"; }
-
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
-#ifdef SK_GAMMA_APPLY_TO_A8
-    float getLuminance() const { return fLuminance; }
-#endif
-    bool isSimilarity() const { return fIsSimilarity; }
-
-    typedef GrGLDistanceFieldTextureEffect GLEffect;
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
-
-private:
-    GrDistanceFieldTextureEffect(GrTexture* texture, const GrTextureParams& params,
-#ifdef SK_GAMMA_APPLY_TO_A8
-                                 GrTexture* gamma, const GrTextureParams& gammaParams, float lum,
-#endif
-                                 bool uniformScale);
-
-    virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE;
-
-    GrTextureAccess fTextureAccess;
-#ifdef SK_GAMMA_APPLY_TO_A8
-    GrTextureAccess fGammaTextureAccess;
-    float           fLuminance;
-#endif
-    bool            fIsSimilarity;
-
-    GR_DECLARE_EFFECT_TEST;
-
-    typedef GrVertexEffect INHERITED;
-};
-
-/**
- * The output color of this effect is a modulation of the input color and samples from a
- * distance field texture (using a smoothed step function near 0.5), adjusted for LCD displays.
- * It allows explicit specification of the filtering and wrap modes (GrTextureParams). The input
- * coords are a custom attribute. Gamma correction is handled via a texture LUT.
- */
-class GrDistanceFieldLCDTextureEffect : public GrVertexEffect {
-public:
-    static GrEffect* Create(GrTexture* tex, const GrTextureParams& params,
-                            GrTexture* gamma, const GrTextureParams& gammaParams, 
-                            SkColor textColor, bool uniformScale, bool useBGR) {
-        return SkNEW_ARGS(GrDistanceFieldLCDTextureEffect,
-                          (tex, params, gamma, gammaParams, textColor, uniformScale, useBGR));
-    }
-
-    virtual ~GrDistanceFieldLCDTextureEffect() {}
-
-    static const char* Name() { return "DistanceFieldLCDTexture"; }
-
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
-    GrColor getTextColor() const { return fTextColor; }
-    bool isUniformScale() const { return fUniformScale; }
-    bool useBGR() const { return fUseBGR; }
-
-    typedef GrGLDistanceFieldLCDTextureEffect GLEffect;
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
-
-private:
-    GrDistanceFieldLCDTextureEffect(GrTexture* texture, const GrTextureParams& params,
-                                    GrTexture* gamma, const GrTextureParams& gammaParams,
-                                    SkColor textColor,
-                                    bool uniformScale, bool useBGR);
-
-    virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE;
-
-    GrTextureAccess fTextureAccess;
-    GrTextureAccess fGammaTextureAccess;
-    GrColor         fTextColor;
-    bool            fUniformScale;
-    bool            fUseBGR;
-
-    GR_DECLARE_EFFECT_TEST;
-
-    typedef GrVertexEffect INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/effects/GrDitherEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrDitherEffect.cpp
index a431897a4eaa..37cc1ae5701e 100644
--- a/gfx/skia/skia/src/gpu/effects/GrDitherEffect.cpp
+++ b/gfx/skia/skia/src/gpu/effects/GrDitherEffect.cpp
@@ -6,94 +6,74 @@
  */
 
 #include "GrDitherEffect.h"
-
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
-#include "gl/GrGLSL.h"
-#include "GrTBackendEffectFactory.h"
-
+#include "GrFragmentProcessor.h"
+#include "GrInvariantOutput.h"
 #include "SkRect.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
 
 //////////////////////////////////////////////////////////////////////////////
 
-class GLDitherEffect;
-
-class DitherEffect : public GrEffect {
+class DitherEffect : public GrFragmentProcessor {
 public:
-    static GrEffect* Create() {
-        GR_CREATE_STATIC_EFFECT(gDitherEffect, DitherEffect, ())
-        return SkRef(gDitherEffect);
+    static GrFragmentProcessor* Create() {
+        return new DitherEffect;
     }
 
     virtual ~DitherEffect() {};
-    static const char* Name() { return "Dither"; }
 
-    typedef GLDitherEffect GLEffect;
-
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE {
-        return GrTBackendEffectFactory<DitherEffect>::getInstance();
-    }
+    const char* name() const override { return "Dither"; }
 
 private:
     DitherEffect() {
+        this->initClassID<DitherEffect>();
         this->setWillReadFragmentPosition();
     }
 
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
+
     // All dither effects are equal
-    virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE { return true; }
+    bool onIsEqual(const GrFragmentProcessor&) const override { return true; }
 
-    GR_DECLARE_EFFECT_TEST;
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
 
-    typedef GrEffect INHERITED;
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+
+    typedef GrFragmentProcessor INHERITED;
 };
 
-void DitherEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
-    *validFlags = 0;
+void DitherEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const {
+    inout->setToUnknown(GrInvariantOutput::kWill_ReadInput);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-GR_DEFINE_EFFECT_TEST(DitherEffect);
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(DitherEffect);
 
-GrEffect* DitherEffect::TestCreate(SkRandom*,
-                                   GrContext*,
-                                   const GrDrawTargetCaps&,
-                                   GrTexture*[]) {
+const GrFragmentProcessor* DitherEffect::TestCreate(GrProcessorTestData*) {
     return DitherEffect::Create();
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-class GLDitherEffect : public GrGLEffect {
+class GLDitherEffect : public GrGLSLFragmentProcessor {
 public:
-    GLDitherEffect(const GrBackendEffectFactory&, const GrDrawEffect&);
+    GLDitherEffect(const GrProcessor&);
 
-    virtual void emitCode(GrGLShaderBuilder* builder,
-                          const GrDrawEffect& drawEffect,
-                          const GrEffectKey& key,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    virtual void emitCode(EmitArgs& args) override;
 
 private:
-    typedef GrGLEffect INHERITED;
+    typedef GrGLSLFragmentProcessor INHERITED;
 };
 
-GLDitherEffect::GLDitherEffect(const GrBackendEffectFactory& factory,
-                               const GrDrawEffect& drawEffect)
-    : INHERITED (factory) {
+GLDitherEffect::GLDitherEffect(const GrProcessor&) {
 }
 
-void GLDitherEffect::emitCode(GrGLShaderBuilder* builder,
-                              const GrDrawEffect& drawEffect,
-                              const GrEffectKey& key,
-                              const char* outputColor,
-                              const char* inputColor,
-                              const TransformedCoordsArray&,
-                              const TextureSamplerArray& samplers) {
+void GLDitherEffect::emitCode(EmitArgs& args) {
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
     // Generate a random number based on the fragment position. For this
     // random number generator, we use the "GLSL rand" function
     // that seems to be floating around on the internet. It works under
@@ -103,13 +83,22 @@ void GLDitherEffect::emitCode(GrGLShaderBuilder* builder,
 
     // For each channel c, add the random offset to the pixel to either bump
     // it up or let it remain constant during quantization.
-    builder->fsCodeAppendf("\t\tfloat r = "
-                           "fract(sin(dot(%s.xy ,vec2(12.9898,78.233))) * 43758.5453);\n",
-                           builder->fragmentPosition());
-    builder->fsCodeAppendf("\t\t%s = (1.0/255.0) * vec4(r, r, r, r) + %s;\n",
-                           outputColor, GrGLSLExpr4(inputColor).c_str());
+    fragBuilder->codeAppendf("\t\tfloat r = "
+                             "fract(sin(dot(%s.xy ,vec2(12.9898,78.233))) * 43758.5453);\n",
+                             fragBuilder->fragmentPosition());
+    fragBuilder->codeAppendf("\t\t%s = (1.0/255.0) * vec4(r, r, r, r) + %s;\n",
+                             args.fOutputColor, GrGLSLExpr4(args.fInputColor).c_str());
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-GrEffect* GrDitherEffect::Create() { return DitherEffect::Create(); }
+void DitherEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                         GrProcessorKeyBuilder* b) const {
+    GLDitherEffect::GenKey(*this, caps, b);
+}
+
+GrGLSLFragmentProcessor* DitherEffect::onCreateGLSLInstance() const  {
+    return new GLDitherEffect(*this);
+}
+
+GrFragmentProcessor* GrDitherEffect::Create() { return DitherEffect::Create(); }
diff --git a/gfx/skia/skia/src/gpu/effects/GrDitherEffect.h b/gfx/skia/skia/src/gpu/effects/GrDitherEffect.h
index 88e0a27ae153..64c85f7bf4ff 100644
--- a/gfx/skia/skia/src/gpu/effects/GrDitherEffect.h
+++ b/gfx/skia/skia/src/gpu/effects/GrDitherEffect.h
@@ -11,13 +11,13 @@
 #include "GrTypes.h"
 #include "GrTypesPriv.h"
 
-class GrEffect;
+class GrFragmentProcessor;
 
 namespace GrDitherEffect {
     /**
      * Creates an effect that dithers the resulting color to an RGBA8 framebuffer
      */
-    GrEffect* Create();
+    GrFragmentProcessor* Create();
 };
 
 #endif
diff --git a/gfx/skia/skia/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrMatrixConvolutionEffect.cpp
index 283138e1338e..5fb694b0d752 100644
--- a/gfx/skia/skia/src/gpu/effects/GrMatrixConvolutionEffect.cpp
+++ b/gfx/skia/skia/src/gpu/effects/GrMatrixConvolutionEffect.cpp
@@ -5,185 +5,137 @@
  * found in the LICENSE file.
  */
 #include "GrMatrixConvolutionEffect.h"
-#include "gl/GrGLShaderBuilder.h"
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLSL.h"
-#include "gl/GrGLTexture.h"
-#include "GrTBackendEffectFactory.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
 
-class GrGLMatrixConvolutionEffect : public GrGLEffect {
+class GrGLMatrixConvolutionEffect : public GrGLSLFragmentProcessor {
 public:
-    GrGLMatrixConvolutionEffect(const GrBackendEffectFactory& factory,
-                                const GrDrawEffect& effect);
-    virtual void emitCode(GrGLShaderBuilder*,
-                          const GrDrawEffect&,
-                          const GrEffectKey&,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    GrGLMatrixConvolutionEffect(const GrProcessor&);
+    virtual void emitCode(EmitArgs&) override;
 
-    static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*);
+    static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*);
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
 
 private:
-    typedef GrGLUniformManager::UniformHandle        UniformHandle;
-    typedef GrMatrixConvolutionEffect::TileMode TileMode;
-    SkISize             fKernelSize;
-    TileMode            fTileMode;
-    bool                fConvolveAlpha;
+    typedef GrGLSLProgramDataManager::UniformHandle UniformHandle;
+    SkISize                     fKernelSize;
+    bool                        fConvolveAlpha;
 
-    UniformHandle       fBoundsUni;
-    UniformHandle       fKernelUni;
-    UniformHandle       fImageIncrementUni;
-    UniformHandle       fKernelOffsetUni;
-    UniformHandle       fGainUni;
-    UniformHandle       fBiasUni;
+    UniformHandle               fKernelUni;
+    UniformHandle               fImageIncrementUni;
+    UniformHandle               fKernelOffsetUni;
+    UniformHandle               fGainUni;
+    UniformHandle               fBiasUni;
+    GrTextureDomain::GLDomain   fDomain;
 
-    typedef GrGLEffect INHERITED;
+    typedef GrGLSLFragmentProcessor INHERITED;
 };
 
-GrGLMatrixConvolutionEffect::GrGLMatrixConvolutionEffect(const GrBackendEffectFactory& factory,
-                                                         const GrDrawEffect& drawEffect)
-    : INHERITED(factory) {
-    const GrMatrixConvolutionEffect& m = drawEffect.castEffect<GrMatrixConvolutionEffect>();
+GrGLMatrixConvolutionEffect::GrGLMatrixConvolutionEffect(const GrProcessor& processor) {
+    const GrMatrixConvolutionEffect& m = processor.cast<GrMatrixConvolutionEffect>();
     fKernelSize = m.kernelSize();
-    fTileMode = m.tileMode();
     fConvolveAlpha = m.convolveAlpha();
 }
 
-static void appendTextureLookup(GrGLShaderBuilder* builder,
-                                const GrGLShaderBuilder::TextureSampler& sampler,
-                                const char* coord,
-                                const char* bounds,
-                                GrMatrixConvolutionEffect::TileMode tileMode) {
-    SkString clampedCoord;
-    switch (tileMode) {
-        case GrMatrixConvolutionEffect::kClamp_TileMode:
-            clampedCoord.printf("clamp(%s, %s.xy, %s.zw)", coord, bounds, bounds);
-            coord = clampedCoord.c_str();
-            break;
-        case GrMatrixConvolutionEffect::kRepeat_TileMode:
-            clampedCoord.printf("mod(%s - %s.xy, %s.zw - %s.xy) + %s.xy", coord, bounds, bounds, bounds, bounds);
-            coord = clampedCoord.c_str();
-            break;
-        case GrMatrixConvolutionEffect::kClampToBlack_TileMode:
-            builder->fsCodeAppendf("clamp(%s, %s.xy, %s.zw) != %s ? vec4(0, 0, 0, 0) : ", coord, bounds, bounds, coord);
-            break;
-    }
-    builder->fsAppendTextureLookup(sampler, coord);
-}
+void GrGLMatrixConvolutionEffect::emitCode(EmitArgs& args) {
+    const GrTextureDomain& domain = args.fFp.cast<GrMatrixConvolutionEffect>().domain();
+    fImageIncrementUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                             kVec2f_GrSLType, kDefault_GrSLPrecision,
+                                             "ImageIncrement");
+    fKernelUni = args.fBuilder->addUniformArray(GrGLSLProgramBuilder::kFragment_Visibility,
+                                          kFloat_GrSLType, kDefault_GrSLPrecision,
+                                          "Kernel",
+                                          fKernelSize.width() * fKernelSize.height());
+    fKernelOffsetUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                           kVec2f_GrSLType, kDefault_GrSLPrecision, "KernelOffset");
+    fGainUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                   kFloat_GrSLType, kDefault_GrSLPrecision, "Gain");
+    fBiasUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                   kFloat_GrSLType, kDefault_GrSLPrecision, "Bias");
 
-void GrGLMatrixConvolutionEffect::emitCode(GrGLShaderBuilder* builder,
-                                           const GrDrawEffect&,
-                                           const GrEffectKey& key,
-                                           const char* outputColor,
-                                           const char* inputColor,
-                                           const TransformedCoordsArray& coords,
-                                           const TextureSamplerArray& samplers) {
-    sk_ignore_unused_variable(inputColor);
-    SkString coords2D = builder->ensureFSCoords2D(coords, 0);
-    fBoundsUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                     kVec4f_GrSLType, "Bounds");
-    fImageIncrementUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                             kVec2f_GrSLType, "ImageIncrement");
-    fKernelUni = builder->addUniformArray(GrGLShaderBuilder::kFragment_Visibility,
-                                             kFloat_GrSLType,
-                                             "Kernel",
-                                             fKernelSize.width() * fKernelSize.height());
-    fKernelOffsetUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                             kVec2f_GrSLType, "KernelOffset");
-    fGainUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                   kFloat_GrSLType, "Gain");
-    fBiasUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                   kFloat_GrSLType, "Bias");
-
-    const char* bounds = builder->getUniformCStr(fBoundsUni);
-    const char* kernelOffset = builder->getUniformCStr(fKernelOffsetUni);
-    const char* imgInc = builder->getUniformCStr(fImageIncrementUni);
-    const char* kernel = builder->getUniformCStr(fKernelUni);
-    const char* gain = builder->getUniformCStr(fGainUni);
-    const char* bias = builder->getUniformCStr(fBiasUni);
+    const char* kernelOffset = args.fBuilder->getUniformCStr(fKernelOffsetUni);
+    const char* imgInc = args.fBuilder->getUniformCStr(fImageIncrementUni);
+    const char* kernel = args.fBuilder->getUniformCStr(fKernelUni);
+    const char* gain = args.fBuilder->getUniformCStr(fGainUni);
+    const char* bias = args.fBuilder->getUniformCStr(fBiasUni);
     int kWidth = fKernelSize.width();
     int kHeight = fKernelSize.height();
 
-    builder->fsCodeAppend("\t\tvec4 sum = vec4(0, 0, 0, 0);\n");
-    builder->fsCodeAppendf("\t\tvec2 coord = %s - %s * %s;\n", coords2D.c_str(), kernelOffset, imgInc);
-    builder->fsCodeAppendf("\t\tfor (int y = 0; y < %d; y++) {\n", kHeight);
-    builder->fsCodeAppendf("\t\t\tfor (int x = 0; x < %d; x++) {\n", kWidth);
-    builder->fsCodeAppendf("\t\t\t\tfloat k = %s[y * %d + x];\n", kernel, kWidth);
-    builder->fsCodeAppendf("\t\t\t\tvec2 coord2 = coord + vec2(x, y) * %s;\n", imgInc);
-    builder->fsCodeAppend("\t\t\t\tvec4 c = ");
-    appendTextureLookup(builder, samplers[0], "coord2", bounds, fTileMode);
-    builder->fsCodeAppend(";\n");
-    if (!fConvolveAlpha) {
-        builder->fsCodeAppend("\t\t\t\tc.rgb /= c.a;\n");
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    SkString coords2D = fragBuilder->ensureFSCoords2D(args.fCoords, 0);
+    fragBuilder->codeAppend("vec4 sum = vec4(0, 0, 0, 0);");
+    fragBuilder->codeAppendf("vec2 coord = %s - %s * %s;", coords2D.c_str(), kernelOffset, imgInc);
+    fragBuilder->codeAppend("vec4 c;");
+
+    for (int y = 0; y < kHeight; y++) {
+        for (int x = 0; x < kWidth; x++) {
+            GrGLSLShaderBuilder::ShaderBlock block(fragBuilder);
+            fragBuilder->codeAppendf("float k = %s[%d * %d + %d];", kernel, y, kWidth, x);
+            SkString coord;
+            coord.printf("coord + vec2(%d, %d) * %s", x, y, imgInc);
+            fDomain.sampleTexture(fragBuilder,
+                                  args.fGLSLCaps,
+                                  domain,
+                                  "c",
+                                  coord,
+                                  args.fSamplers[0]);
+            if (!fConvolveAlpha) {
+                fragBuilder->codeAppend("c.rgb /= c.a;");
+                fragBuilder->codeAppend("c.rgb = clamp(c.rgb, 0.0, 1.0);");
+            }
+            fragBuilder->codeAppend("sum += c * k;");
+        }
     }
-    builder->fsCodeAppend("\t\t\t\tsum += c * k;\n");
-    builder->fsCodeAppend("\t\t\t}\n");
-    builder->fsCodeAppend("\t\t}\n");
     if (fConvolveAlpha) {
-        builder->fsCodeAppendf("\t\t%s = sum * %s + %s;\n", outputColor, gain, bias);
-        builder->fsCodeAppendf("\t\t%s.rgb = clamp(%s.rgb, 0.0, %s.a);\n",
-            outputColor, outputColor, outputColor);
+        fragBuilder->codeAppendf("%s = sum * %s + %s;", args.fOutputColor, gain, bias);
+        fragBuilder->codeAppendf("%s.rgb = clamp(%s.rgb, 0.0, %s.a);",
+                                 args.fOutputColor, args.fOutputColor, args.fOutputColor);
     } else {
-        builder->fsCodeAppend("\t\tvec4 c = ");
-        appendTextureLookup(builder, samplers[0], coords2D.c_str(), bounds, fTileMode);
-        builder->fsCodeAppend(";\n");
-        builder->fsCodeAppendf("\t\t%s.a = c.a;\n", outputColor);
-        builder->fsCodeAppendf("\t\t%s.rgb = sum.rgb * %s + %s;\n", outputColor, gain, bias);
-        builder->fsCodeAppendf("\t\t%s.rgb *= %s.a;\n", outputColor, outputColor);
+        fDomain.sampleTexture(fragBuilder,
+                              args.fGLSLCaps,
+                              domain,
+                              "c",
+                              coords2D,
+                              args.fSamplers[0]);
+        fragBuilder->codeAppendf("%s.a = c.a;", args.fOutputColor);
+        fragBuilder->codeAppendf("%s.rgb = sum.rgb * %s + %s;", args.fOutputColor, gain, bias);
+        fragBuilder->codeAppendf("%s.rgb *= %s.a;", args.fOutputColor, args.fOutputColor);
     }
+
+    SkString modulate;
+    GrGLSLMulVarBy4f(&modulate, args.fOutputColor, args.fInputColor);
+    fragBuilder->codeAppend(modulate.c_str());
 }
 
-namespace {
-
-int encodeXY(int x, int y) {
-    SkASSERT(x >= 1 && y >= 1 && x * y <= 32);
-    if (y < x)
-        return 0x40 | encodeXY(y, x);
-    else
-        return (0x40 >> x) | (y - x);
-}
-
-};
-
-void GrGLMatrixConvolutionEffect::GenKey(const GrDrawEffect& drawEffect,
-                                         const GrGLCaps&, GrEffectKeyBuilder* b) {
-    const GrMatrixConvolutionEffect& m = drawEffect.castEffect<GrMatrixConvolutionEffect>();
-    uint32_t key = encodeXY(m.kernelSize().width(), m.kernelSize().height());
-    key |= m.tileMode() << 7;
-    key |= m.convolveAlpha() ? 1 << 9 : 0;
+void GrGLMatrixConvolutionEffect::GenKey(const GrProcessor& processor,
+                                         const GrGLSLCaps&, GrProcessorKeyBuilder* b) {
+    const GrMatrixConvolutionEffect& m = processor.cast<GrMatrixConvolutionEffect>();
+    SkASSERT(m.kernelSize().width() <= 0x7FFF && m.kernelSize().height() <= 0xFFFF);
+    uint32_t key = m.kernelSize().width() << 16 | m.kernelSize().height();
+    key |= m.convolveAlpha() ? 1 << 31 : 0;
     b->add32(key);
+    b->add32(GrTextureDomain::GLDomain::DomainKey(m.domain()));
 }
 
-void GrGLMatrixConvolutionEffect::setData(const GrGLUniformManager& uman,
-                                          const GrDrawEffect& drawEffect) {
-    const GrMatrixConvolutionEffect& conv = drawEffect.castEffect<GrMatrixConvolutionEffect>();
+void GrGLMatrixConvolutionEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                                            const GrProcessor& processor) {
+    const GrMatrixConvolutionEffect& conv = processor.cast<GrMatrixConvolutionEffect>();
     GrTexture& texture = *conv.texture(0);
     // the code we generated was for a specific kernel size
     SkASSERT(conv.kernelSize() == fKernelSize);
-    SkASSERT(conv.tileMode() == fTileMode);
     float imageIncrement[2];
     float ySign = texture.origin() == kTopLeft_GrSurfaceOrigin ? 1.0f : -1.0f;
     imageIncrement[0] = 1.0f / texture.width();
     imageIncrement[1] = ySign / texture.height();
-    uman.set2fv(fImageIncrementUni, 1, imageIncrement);
-    uman.set2fv(fKernelOffsetUni, 1, conv.kernelOffset());
-    uman.set1fv(fKernelUni, fKernelSize.width() * fKernelSize.height(), conv.kernel());
-    uman.set1f(fGainUni, conv.gain());
-    uman.set1f(fBiasUni, conv.bias());
-    const SkIRect& bounds = conv.bounds();
-    float left = (float) bounds.left() / texture.width();
-    float top = (float) bounds.top() / texture.height();
-    float right = (float) bounds.right() / texture.width();
-    float bottom = (float) bounds.bottom() / texture.height();
-    if (texture.origin() == kBottomLeft_GrSurfaceOrigin) {
-        uman.set4f(fBoundsUni, left, 1.0f - bottom, right, 1.0f - top);
-    } else {
-        uman.set4f(fBoundsUni, left, top, right, bottom);
-    }
+    pdman.set2fv(fImageIncrementUni, 1, imageIncrement);
+    pdman.set2fv(fKernelOffsetUni, 1, conv.kernelOffset());
+    pdman.set1fv(fKernelUni, fKernelSize.width() * fKernelSize.height(), conv.kernel());
+    pdman.set1f(fGainUni, conv.gain());
+    pdman.set1f(fBiasUni, conv.bias());
+    fDomain.setData(pdman, conv.domain(), texture.origin());
 }
 
 GrMatrixConvolutionEffect::GrMatrixConvolutionEffect(GrTexture* texture,
@@ -193,71 +145,112 @@ GrMatrixConvolutionEffect::GrMatrixConvolutionEffect(GrTexture* texture,
                                                      SkScalar gain,
                                                      SkScalar bias,
                                                      const SkIPoint& kernelOffset,
-                                                     TileMode tileMode,
+                                                     GrTextureDomain::Mode tileMode,
                                                      bool convolveAlpha)
-  : INHERITED(texture, MakeDivByTextureWHMatrix(texture)),
-    fBounds(bounds),
+  : INHERITED(texture, GrCoordTransform::MakeDivByTextureWHMatrix(texture)),
     fKernelSize(kernelSize),
     fGain(SkScalarToFloat(gain)),
     fBias(SkScalarToFloat(bias) / 255.0f),
-    fTileMode(tileMode),
-    fConvolveAlpha(convolveAlpha) {
-    fKernel = new float[kernelSize.width() * kernelSize.height()];
+    fConvolveAlpha(convolveAlpha),
+    fDomain(GrTextureDomain::MakeTexelDomainForMode(texture, bounds, tileMode), tileMode) {
+    this->initClassID<GrMatrixConvolutionEffect>();
     for (int i = 0; i < kernelSize.width() * kernelSize.height(); i++) {
         fKernel[i] = SkScalarToFloat(kernel[i]);
     }
     fKernelOffset[0] = static_cast<float>(kernelOffset.x());
     fKernelOffset[1] = static_cast<float>(kernelOffset.y());
-    this->setWillNotUseInputColor();
 }
 
 GrMatrixConvolutionEffect::~GrMatrixConvolutionEffect() {
-    delete[] fKernel;
 }
 
-const GrBackendEffectFactory& GrMatrixConvolutionEffect::getFactory() const {
-    return GrTBackendEffectFactory<GrMatrixConvolutionEffect>::getInstance();
+void GrMatrixConvolutionEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                                      GrProcessorKeyBuilder* b) const {
+    GrGLMatrixConvolutionEffect::GenKey(*this, caps, b);
 }
 
-bool GrMatrixConvolutionEffect::onIsEqual(const GrEffect& sBase) const {
-    const GrMatrixConvolutionEffect& s = CastEffect<GrMatrixConvolutionEffect>(sBase);
-    return this->texture(0) == s.texture(0) &&
-           fKernelSize == s.kernelSize() &&
+GrGLSLFragmentProcessor* GrMatrixConvolutionEffect::onCreateGLSLInstance() const  {
+    return new GrGLMatrixConvolutionEffect(*this);
+}
+
+bool GrMatrixConvolutionEffect::onIsEqual(const GrFragmentProcessor& sBase) const {
+    const GrMatrixConvolutionEffect& s = sBase.cast<GrMatrixConvolutionEffect>();
+    return fKernelSize == s.kernelSize() &&
            !memcmp(fKernel, s.kernel(),
                    fKernelSize.width() * fKernelSize.height() * sizeof(float)) &&
            fGain == s.gain() &&
            fBias == s.bias() &&
            fKernelOffset == s.kernelOffset() &&
-           fTileMode == s.tileMode() &&
-           fConvolveAlpha == s.convolveAlpha();
+           fConvolveAlpha == s.convolveAlpha() &&
+           fDomain == s.domain();
 }
 
-GR_DEFINE_EFFECT_TEST(GrMatrixConvolutionEffect);
+// Static function to create a 2D convolution
+GrFragmentProcessor*
+GrMatrixConvolutionEffect::CreateGaussian(GrTexture* texture,
+                                          const SkIRect& bounds,
+                                          const SkISize& kernelSize,
+                                          SkScalar gain,
+                                          SkScalar bias,
+                                          const SkIPoint& kernelOffset,
+                                          GrTextureDomain::Mode tileMode,
+                                          bool convolveAlpha,
+                                          SkScalar sigmaX,
+                                          SkScalar sigmaY) {
+    float kernel[MAX_KERNEL_SIZE];
+    int width = kernelSize.width();
+    int height = kernelSize.height();
+    SkASSERT(width * height <= MAX_KERNEL_SIZE);
+    float sum = 0.0f;
+    float sigmaXDenom = 1.0f / (2.0f * SkScalarToFloat(SkScalarSquare(sigmaX)));
+    float sigmaYDenom = 1.0f / (2.0f * SkScalarToFloat(SkScalarSquare(sigmaY)));
+    int xRadius = width / 2;
+    int yRadius = height / 2;
+    for (int x = 0; x < width; x++) {
+      float xTerm = static_cast<float>(x - xRadius);
+      xTerm = xTerm * xTerm * sigmaXDenom;
+      for (int y = 0; y < height; y++) {
+        float yTerm = static_cast<float>(y - yRadius);
+        float xyTerm = sk_float_exp(-(xTerm + yTerm * yTerm * sigmaYDenom));
+        // Note that the constant term (1/(sqrt(2*pi*sigma^2)) of the Gaussian
+       // is dropped here, since we renormalize the kernel below.
+        kernel[y * width + x] = xyTerm;
+        sum += xyTerm;
+      }
+    }
+    // Normalize the kernel
+    float scale = 1.0f / sum;
+    for (int i = 0; i < width * height; ++i) {
+        kernel[i] *= scale;
+    }
+    return new GrMatrixConvolutionEffect(texture, bounds, kernelSize, kernel, gain, bias,
+                                         kernelOffset, tileMode, convolveAlpha);
+}
 
-GrEffect* GrMatrixConvolutionEffect::TestCreate(SkRandom* random,
-                                                GrContext* context,
-                                                const GrDrawTargetCaps&,
-                                                GrTexture* textures[]) {
-    int texIdx = random->nextBool() ? GrEffectUnitTest::kSkiaPMTextureIdx :
-                                      GrEffectUnitTest::kAlphaTextureIdx;
-    int width = random->nextRangeU(1, MAX_KERNEL_SIZE);
-    int height = random->nextRangeU(1, MAX_KERNEL_SIZE / width);
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrMatrixConvolutionEffect);
+
+const GrFragmentProcessor* GrMatrixConvolutionEffect::TestCreate(GrProcessorTestData* d) {
+    int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :
+                                          GrProcessorUnitTest::kAlphaTextureIdx;
+    int width = d->fRandom->nextRangeU(1, MAX_KERNEL_SIZE);
+    int height = d->fRandom->nextRangeU(1, MAX_KERNEL_SIZE / width);
     SkISize kernelSize = SkISize::Make(width, height);
     SkAutoTDeleteArray<SkScalar> kernel(new SkScalar[width * height]);
     for (int i = 0; i < width * height; i++) {
-        kernel.get()[i] = random->nextSScalar1();
+        kernel.get()[i] = d->fRandom->nextSScalar1();
     }
-    SkScalar gain = random->nextSScalar1();
-    SkScalar bias = random->nextSScalar1();
-    SkIPoint kernelOffset = SkIPoint::Make(random->nextRangeU(0, kernelSize.width()),
-                                           random->nextRangeU(0, kernelSize.height()));
-    SkIRect bounds = SkIRect::MakeXYWH(random->nextRangeU(0, textures[texIdx]->width()),
-                                       random->nextRangeU(0, textures[texIdx]->height()),
-                                       random->nextRangeU(0, textures[texIdx]->width()),
-                                       random->nextRangeU(0, textures[texIdx]->height()));
-    TileMode tileMode = static_cast<TileMode>(random->nextRangeU(0, 2));
-    bool convolveAlpha = random->nextBool();
-    return GrMatrixConvolutionEffect::Create(textures[texIdx],
+    SkScalar gain = d->fRandom->nextSScalar1();
+    SkScalar bias = d->fRandom->nextSScalar1();
+    SkIPoint kernelOffset = SkIPoint::Make(d->fRandom->nextRangeU(0, kernelSize.width()),
+                                           d->fRandom->nextRangeU(0, kernelSize.height()));
+    SkIRect bounds = SkIRect::MakeXYWH(d->fRandom->nextRangeU(0, d->fTextures[texIdx]->width()),
+                                       d->fRandom->nextRangeU(0, d->fTextures[texIdx]->height()),
+                                       d->fRandom->nextRangeU(0, d->fTextures[texIdx]->width()),
+                                       d->fRandom->nextRangeU(0, d->fTextures[texIdx]->height()));
+    GrTextureDomain::Mode tileMode =
+            static_cast<GrTextureDomain::Mode>(d->fRandom->nextRangeU(0, 2));
+    bool convolveAlpha = d->fRandom->nextBool();
+    return GrMatrixConvolutionEffect::Create(d->fTextures[texIdx],
                                              bounds,
                                              kernelSize,
                                              kernel.get(),
diff --git a/gfx/skia/skia/src/gpu/effects/GrMatrixConvolutionEffect.h b/gfx/skia/skia/src/gpu/effects/GrMatrixConvolutionEffect.h
index 6fdd85b7c74d..b114abed61a7 100644
--- a/gfx/skia/skia/src/gpu/effects/GrMatrixConvolutionEffect.h
+++ b/gfx/skia/skia/src/gpu/effects/GrMatrixConvolutionEffect.h
@@ -9,64 +9,51 @@
 #define GrMatrixConvolutionEffect_DEFINED
 
 #include "GrSingleTextureEffect.h"
+#include "GrInvariantOutput.h"
+#include "GrTextureDomain.h"
 
 // A little bit less than the minimum # uniforms required by DX9SM2 (32).
 // Allows for a 5x5 kernel (or 25x1, for that matter).
 #define MAX_KERNEL_SIZE 25
 
-class GrGLMatrixConvolutionEffect;
-
 class GrMatrixConvolutionEffect : public GrSingleTextureEffect {
 public:
-    /*! \enum TileMode */
-    enum TileMode {
-        kClamp_TileMode = 0,         /*!< Clamp to the image's edge pixels. */
-        kRepeat_TileMode,        /*!< Wrap around to the image's opposite edge. */
-        kClampToBlack_TileMode,  /*!< Fill with transparent black. */
-        kMax_TileMode = kClampToBlack_TileMode
-    };
-
-    typedef GrMatrixConvolutionEffect::TileMode TileMode;
-    static GrEffect* Create(GrTexture* texture,
-                            const SkIRect& bounds,
-                            const SkISize& kernelSize,
-                            const SkScalar* kernel,
-                            SkScalar gain,
-                            SkScalar bias,
-                            const SkIPoint& kernelOffset,
-                            TileMode tileMode,
-                            bool convolveAlpha) {
-        return SkNEW_ARGS(GrMatrixConvolutionEffect, (texture,
-                                                      bounds,
-                                                      kernelSize,
-                                                      kernel,
-                                                      gain,
-                                                      bias,
-                                                      kernelOffset,
-                                                      tileMode,
-                                                      convolveAlpha));
+    static GrFragmentProcessor* Create(GrTexture* texture,
+                                       const SkIRect& bounds,
+                                       const SkISize& kernelSize,
+                                       const SkScalar* kernel,
+                                       SkScalar gain,
+                                       SkScalar bias,
+                                       const SkIPoint& kernelOffset,
+                                       GrTextureDomain::Mode tileMode,
+                                       bool convolveAlpha) {
+        return new GrMatrixConvolutionEffect(texture, bounds, kernelSize, kernel, gain, bias,
+                                             kernelOffset, tileMode, convolveAlpha);
     }
+
+    static GrFragmentProcessor* CreateGaussian(GrTexture* texture,
+                                               const SkIRect& bounds,
+                                               const SkISize& kernelSize,
+                                               SkScalar gain,
+                                               SkScalar bias,
+                                               const SkIPoint& kernelOffset,
+                                               GrTextureDomain::Mode tileMode,
+                                               bool convolveAlpha,
+                                               SkScalar sigmaX,
+                                               SkScalar sigmaY);
+
     virtual ~GrMatrixConvolutionEffect();
 
-    virtual void getConstantColorComponents(GrColor* color,
-                                            uint32_t* validFlags) const SK_OVERRIDE {
-        // TODO: Try to do better?
-        *validFlags = 0;
-    }
-
-    static const char* Name() { return "MatrixConvolution"; }
     const SkIRect& bounds() const { return fBounds; }
     const SkISize& kernelSize() const { return fKernelSize; }
     const float* kernelOffset() const { return fKernelOffset; }
     const float* kernel() const { return fKernel; }
     float gain() const { return fGain; }
     float bias() const { return fBias; }
-    TileMode tileMode() const { return fTileMode; }
     bool convolveAlpha() const { return fConvolveAlpha; }
+    const GrTextureDomain& domain() const { return fDomain; }
 
-    typedef GrGLMatrixConvolutionEffect GLEffect;
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
+    const char* name() const override { return "MatrixConvolution"; }
 
 private:
     GrMatrixConvolutionEffect(GrTexture*,
@@ -76,21 +63,30 @@ private:
                               SkScalar gain,
                               SkScalar bias,
                               const SkIPoint& kernelOffset,
-                              TileMode tileMode,
+                              GrTextureDomain::Mode tileMode,
                               bool convolveAlpha);
 
-    virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE;
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
 
-    SkIRect  fBounds;
-    SkISize  fKernelSize;
-    float   *fKernel;
-    float    fGain;
-    float    fBias;
-    float    fKernelOffset[2];
-    TileMode fTileMode;
-    bool     fConvolveAlpha;
+    void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
 
-    GR_DECLARE_EFFECT_TEST;
+    bool onIsEqual(const GrFragmentProcessor&) const override;
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override {
+        // TODO: Try to do better?
+        inout->mulByUnknownFourComponents();
+    }
+
+    SkIRect         fBounds;
+    SkISize         fKernelSize;
+    float           fKernel[MAX_KERNEL_SIZE];
+    float           fGain;
+    float           fBias;
+    float           fKernelOffset[2];
+    bool            fConvolveAlpha;
+    GrTextureDomain fDomain;
+
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
 
     typedef GrSingleTextureEffect INHERITED;
 };
diff --git a/gfx/skia/skia/src/gpu/effects/GrOvalEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrOvalEffect.cpp
index ebeb288c975e..94c5acd94947 100644
--- a/gfx/skia/skia/src/gpu/effects/GrOvalEffect.cpp
+++ b/gfx/skia/skia/src/gpu/effects/GrOvalEffect.cpp
@@ -7,367 +7,364 @@
 
 #include "GrOvalEffect.h"
 
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
-#include "gl/GrGLSL.h"
-#include "GrTBackendEffectFactory.h"
-
+#include "GrFragmentProcessor.h"
+#include "GrInvariantOutput.h"
 #include "SkRect.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
 
 //////////////////////////////////////////////////////////////////////////////
 
-class GLCircleEffect;
-
-class CircleEffect : public GrEffect {
+class CircleEffect : public GrFragmentProcessor {
 public:
-    static GrEffect* Create(GrEffectEdgeType, const SkPoint& center, SkScalar radius);
+    static GrFragmentProcessor* Create(GrPrimitiveEdgeType, const SkPoint& center, SkScalar radius);
 
     virtual ~CircleEffect() {};
-    static const char* Name() { return "Circle"; }
+
+    const char* name() const override { return "Circle"; }
 
     const SkPoint& getCenter() const { return fCenter; }
     SkScalar getRadius() const { return fRadius; }
 
-    GrEffectEdgeType getEdgeType() const { return fEdgeType; }
-
-    typedef GLCircleEffect GLEffect;
-
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
+    GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
 
 private:
-    CircleEffect(GrEffectEdgeType, const SkPoint& center, SkScalar radius);
+    CircleEffect(GrPrimitiveEdgeType, const SkPoint& center, SkScalar radius);
 
-    virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE;
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
+
+    bool onIsEqual(const GrFragmentProcessor&) const override;
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
 
     SkPoint             fCenter;
     SkScalar            fRadius;
-    GrEffectEdgeType    fEdgeType;
+    GrPrimitiveEdgeType    fEdgeType;
 
-    GR_DECLARE_EFFECT_TEST;
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
 
-    typedef GrEffect INHERITED;
+    typedef GrFragmentProcessor INHERITED;
 };
 
-GrEffect* CircleEffect::Create(GrEffectEdgeType edgeType, const SkPoint& center, SkScalar radius) {
+GrFragmentProcessor* CircleEffect::Create(GrPrimitiveEdgeType edgeType, const SkPoint& center,
+                                          SkScalar radius) {
     SkASSERT(radius >= 0);
-    return SkNEW_ARGS(CircleEffect, (edgeType, center, radius));
+    return new CircleEffect(edgeType, center, radius);
 }
 
-void CircleEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
-    *validFlags = 0;
+void CircleEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const {
+    inout->mulByUnknownSingleComponent();
 }
 
-const GrBackendEffectFactory& CircleEffect::getFactory() const {
-    return GrTBackendEffectFactory<CircleEffect>::getInstance();
-}
-
-CircleEffect::CircleEffect(GrEffectEdgeType edgeType, const SkPoint& c, SkScalar r)
+CircleEffect::CircleEffect(GrPrimitiveEdgeType edgeType, const SkPoint& c, SkScalar r)
     : fCenter(c)
     , fRadius(r)
     , fEdgeType(edgeType) {
+    this->initClassID<CircleEffect>();
     this->setWillReadFragmentPosition();
 }
 
-bool CircleEffect::onIsEqual(const GrEffect& other) const {
-    const CircleEffect& ce = CastEffect<CircleEffect>(other);
+bool CircleEffect::onIsEqual(const GrFragmentProcessor& other) const {
+    const CircleEffect& ce = other.cast<CircleEffect>();
     return fEdgeType == ce.fEdgeType && fCenter == ce.fCenter && fRadius == ce.fRadius;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-GR_DEFINE_EFFECT_TEST(CircleEffect);
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(CircleEffect);
 
-GrEffect* CircleEffect::TestCreate(SkRandom* random,
-                                   GrContext*,
-                                   const GrDrawTargetCaps& caps,
-                                   GrTexture*[]) {
+const GrFragmentProcessor* CircleEffect::TestCreate(GrProcessorTestData* d) {
     SkPoint center;
-    center.fX = random->nextRangeScalar(0.f, 1000.f);
-    center.fY = random->nextRangeScalar(0.f, 1000.f);
-    SkScalar radius = random->nextRangeF(0.f, 1000.f);
-    GrEffectEdgeType et;
+    center.fX = d->fRandom->nextRangeScalar(0.f, 1000.f);
+    center.fY = d->fRandom->nextRangeScalar(0.f, 1000.f);
+    SkScalar radius = d->fRandom->nextRangeF(0.f, 1000.f);
+    GrPrimitiveEdgeType et;
     do {
-        et = (GrEffectEdgeType)random->nextULessThan(kGrEffectEdgeTypeCnt);
-    } while (kHairlineAA_GrEffectEdgeType == et);
+        et = (GrPrimitiveEdgeType)d->fRandom->nextULessThan(kGrProcessorEdgeTypeCnt);
+    } while (kHairlineAA_GrProcessorEdgeType == et);
     return CircleEffect::Create(et, center, radius);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-class GLCircleEffect : public GrGLEffect {
+class GLCircleEffect : public GrGLSLFragmentProcessor {
 public:
-    GLCircleEffect(const GrBackendEffectFactory&, const GrDrawEffect&);
+    GLCircleEffect(const GrProcessor&);
 
-    virtual void emitCode(GrGLShaderBuilder* builder,
-                          const GrDrawEffect& drawEffect,
-                          const GrEffectKey& key,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    virtual void emitCode(EmitArgs&) override;
 
-    static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*);
+    static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*);
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
 
 private:
-    GrGLUniformManager::UniformHandle   fCircleUniform;
-    SkPoint                             fPrevCenter;
-    SkScalar                            fPrevRadius;
+    GrGLSLProgramDataManager::UniformHandle fCircleUniform;
+    SkPoint                                 fPrevCenter;
+    SkScalar                                fPrevRadius;
 
-    typedef GrGLEffect INHERITED;
+    typedef GrGLSLFragmentProcessor INHERITED;
 };
 
-GLCircleEffect::GLCircleEffect(const GrBackendEffectFactory& factory,
-                               const GrDrawEffect& drawEffect)
-    : INHERITED (factory) {
+GLCircleEffect::GLCircleEffect(const GrProcessor&) {
     fPrevRadius = -1.f;
 }
 
-void GLCircleEffect::emitCode(GrGLShaderBuilder* builder,
-                              const GrDrawEffect& drawEffect,
-                              const GrEffectKey& key,
-                              const char* outputColor,
-                              const char* inputColor,
-                              const TransformedCoordsArray&,
-                              const TextureSamplerArray& samplers) {
-    const CircleEffect& ce = drawEffect.castEffect<CircleEffect>();
+void GLCircleEffect::emitCode(EmitArgs& args) {
+    const CircleEffect& ce = args.fFp.cast<CircleEffect>();
     const char *circleName;
-    // The circle uniform is (center.x, center.y, radius + 0.5) for regular fills and
-    // (... ,radius - 0.5) for inverse fills.
-    fCircleUniform = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                         kVec3f_GrSLType,
+    // The circle uniform is (center.x, center.y, radius + 0.5, 1 / (radius + 0.5)) for regular
+    // fills and (..., radius - 0.5, 1 / (radius - 0.5)) for inverse fills.
+    fCircleUniform = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                         kVec4f_GrSLType, kDefault_GrSLPrecision,
                                          "circle",
                                          &circleName);
-    const char* fragmentPos = builder->fragmentPosition();
 
-    SkASSERT(kHairlineAA_GrEffectEdgeType != ce.getEdgeType());
-    if (GrEffectEdgeTypeIsInverseFill(ce.getEdgeType())) {
-        builder->fsCodeAppendf("\t\tfloat d = length(%s.xy - %s.xy) - %s.z;\n",
-                                circleName, fragmentPos, circleName);
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    const char* fragmentPos = fragBuilder->fragmentPosition();
+
+    SkASSERT(kHairlineAA_GrProcessorEdgeType != ce.getEdgeType());
+    // TODO: Right now the distance to circle caclulation is performed in a space normalized to the
+    // radius and then denormalized. This is to prevent overflow on devices that have a "real"
+    // mediump. It'd be nice to only to this on mediump devices but we currently don't have the
+    // caps here.
+    if (GrProcessorEdgeTypeIsInverseFill(ce.getEdgeType())) {
+        fragBuilder->codeAppendf("\t\tfloat d = (length((%s.xy - %s.xy) * %s.w) - 1.0) * %s.z;\n",
+                                 circleName, fragmentPos, circleName, circleName);
     } else {
-        builder->fsCodeAppendf("\t\tfloat d = %s.z - length(%s.xy - %s.xy);\n",
-                               circleName, fragmentPos, circleName);
+        fragBuilder->codeAppendf("\t\tfloat d = (1.0 - length((%s.xy - %s.xy) *  %s.w)) * %s.z;\n",
+                                 circleName, fragmentPos, circleName, circleName);
     }
-    if (GrEffectEdgeTypeIsAA(ce.getEdgeType())) {
-        builder->fsCodeAppend("\t\td = clamp(d, 0.0, 1.0);\n");
+    if (GrProcessorEdgeTypeIsAA(ce.getEdgeType())) {
+        fragBuilder->codeAppend("\t\td = clamp(d, 0.0, 1.0);\n");
     } else {
-        builder->fsCodeAppend("\t\td = d > 0.5 ? 1.0 : 0.0;\n");
+        fragBuilder->codeAppend("\t\td = d > 0.5 ? 1.0 : 0.0;\n");
     }
 
-    builder->fsCodeAppendf("\t\t%s = %s;\n", outputColor,
-                           (GrGLSLExpr4(inputColor) * GrGLSLExpr1("d")).c_str());
+    fragBuilder->codeAppendf("\t\t%s = %s;\n", args.fOutputColor,
+                             (GrGLSLExpr4(args.fInputColor) * GrGLSLExpr1("d")).c_str());
 }
 
-void GLCircleEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
-                            GrEffectKeyBuilder* b) {
-    const CircleEffect& ce = drawEffect.castEffect<CircleEffect>();
+void GLCircleEffect::GenKey(const GrProcessor& processor, const GrGLSLCaps&,
+                            GrProcessorKeyBuilder* b) {
+    const CircleEffect& ce = processor.cast<CircleEffect>();
     b->add32(ce.getEdgeType());
 }
 
-void GLCircleEffect::setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) {
-    const CircleEffect& ce = drawEffect.castEffect<CircleEffect>();
+void GLCircleEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                               const GrProcessor& processor) {
+    const CircleEffect& ce = processor.cast<CircleEffect>();
     if (ce.getRadius() != fPrevRadius || ce.getCenter() != fPrevCenter) {
         SkScalar radius = ce.getRadius();
-        if (GrEffectEdgeTypeIsInverseFill(ce.getEdgeType())) {
+        if (GrProcessorEdgeTypeIsInverseFill(ce.getEdgeType())) {
             radius -= 0.5f;
         } else {
             radius += 0.5f;
         }
-        uman.set3f(fCircleUniform, ce.getCenter().fX, ce.getCenter().fY, radius);
+        pdman.set4f(fCircleUniform, ce.getCenter().fX, ce.getCenter().fY, radius,
+                    SkScalarInvert(radius));
         fPrevCenter = ce.getCenter();
         fPrevRadius = ce.getRadius();
     }
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+void CircleEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                         GrProcessorKeyBuilder* b) const {
+    GLCircleEffect::GenKey(*this, caps, b);
+}
+
+GrGLSLFragmentProcessor* CircleEffect::onCreateGLSLInstance() const  {
+    return new GLCircleEffect(*this);
+}
+
 //////////////////////////////////////////////////////////////////////////////
 
-class GLEllipseEffect;
-
-class EllipseEffect : public GrEffect {
+class EllipseEffect : public GrFragmentProcessor {
 public:
-    static GrEffect* Create(GrEffectEdgeType, const SkPoint& center, SkScalar rx, SkScalar ry);
+    static GrFragmentProcessor* Create(GrPrimitiveEdgeType, const SkPoint& center, SkScalar rx,
+                                       SkScalar ry);
 
     virtual ~EllipseEffect() {};
-    static const char* Name() { return "Ellipse"; }
+
+    const char* name() const override { return "Ellipse"; }
 
     const SkPoint& getCenter() const { return fCenter; }
     SkVector getRadii() const { return fRadii; }
 
-    GrEffectEdgeType getEdgeType() const { return fEdgeType; }
-
-    typedef GLEllipseEffect GLEffect;
-
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
+    GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
 
 private:
-    EllipseEffect(GrEffectEdgeType, const SkPoint& center, SkScalar rx, SkScalar ry);
+    EllipseEffect(GrPrimitiveEdgeType, const SkPoint& center, SkScalar rx, SkScalar ry);
 
-    virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE;
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
+
+    bool onIsEqual(const GrFragmentProcessor&) const override;
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
 
     SkPoint             fCenter;
     SkVector            fRadii;
-    GrEffectEdgeType    fEdgeType;
+    GrPrimitiveEdgeType    fEdgeType;
 
-    GR_DECLARE_EFFECT_TEST;
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
 
-    typedef GrEffect INHERITED;
+    typedef GrFragmentProcessor INHERITED;
 };
 
-GrEffect* EllipseEffect::Create(GrEffectEdgeType edgeType,
-                                const SkPoint& center,
-                                SkScalar rx,
-                                SkScalar ry) {
+GrFragmentProcessor* EllipseEffect::Create(GrPrimitiveEdgeType edgeType,
+                                           const SkPoint& center,
+                                           SkScalar rx,
+                                           SkScalar ry) {
     SkASSERT(rx >= 0 && ry >= 0);
-    return SkNEW_ARGS(EllipseEffect, (edgeType, center, rx, ry));
+    return new EllipseEffect(edgeType, center, rx, ry);
 }
 
-void EllipseEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
-    *validFlags = 0;
+void EllipseEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const {
+    inout->mulByUnknownSingleComponent();
 }
 
-const GrBackendEffectFactory& EllipseEffect::getFactory() const {
-    return GrTBackendEffectFactory<EllipseEffect>::getInstance();
-}
-
-EllipseEffect::EllipseEffect(GrEffectEdgeType edgeType, const SkPoint& c, SkScalar rx, SkScalar ry)
+EllipseEffect::EllipseEffect(GrPrimitiveEdgeType edgeType, const SkPoint& c, SkScalar rx, SkScalar ry)
     : fCenter(c)
     , fRadii(SkVector::Make(rx, ry))
     , fEdgeType(edgeType) {
+    this->initClassID<EllipseEffect>();
     this->setWillReadFragmentPosition();
 }
 
-bool EllipseEffect::onIsEqual(const GrEffect& other) const {
-    const EllipseEffect& ee = CastEffect<EllipseEffect>(other);
+bool EllipseEffect::onIsEqual(const GrFragmentProcessor& other) const {
+    const EllipseEffect& ee = other.cast<EllipseEffect>();
     return fEdgeType == ee.fEdgeType && fCenter == ee.fCenter && fRadii == ee.fRadii;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-GR_DEFINE_EFFECT_TEST(EllipseEffect);
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(EllipseEffect);
 
-GrEffect* EllipseEffect::TestCreate(SkRandom* random,
-                                    GrContext*,
-                                    const GrDrawTargetCaps& caps,
-                                    GrTexture*[]) {
+const GrFragmentProcessor* EllipseEffect::TestCreate(GrProcessorTestData* d) {
     SkPoint center;
-    center.fX = random->nextRangeScalar(0.f, 1000.f);
-    center.fY = random->nextRangeScalar(0.f, 1000.f);
-    SkScalar rx = random->nextRangeF(0.f, 1000.f);
-    SkScalar ry = random->nextRangeF(0.f, 1000.f);
-    GrEffectEdgeType et;
+    center.fX = d->fRandom->nextRangeScalar(0.f, 1000.f);
+    center.fY = d->fRandom->nextRangeScalar(0.f, 1000.f);
+    SkScalar rx = d->fRandom->nextRangeF(0.f, 1000.f);
+    SkScalar ry = d->fRandom->nextRangeF(0.f, 1000.f);
+    GrPrimitiveEdgeType et;
     do {
-        et = (GrEffectEdgeType)random->nextULessThan(kGrEffectEdgeTypeCnt);
-    } while (kHairlineAA_GrEffectEdgeType == et);
+        et = (GrPrimitiveEdgeType)d->fRandom->nextULessThan(kGrProcessorEdgeTypeCnt);
+    } while (kHairlineAA_GrProcessorEdgeType == et);
     return EllipseEffect::Create(et, center, rx, ry);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-class GLEllipseEffect : public GrGLEffect {
+class GLEllipseEffect : public GrGLSLFragmentProcessor {
 public:
-    GLEllipseEffect(const GrBackendEffectFactory&, const GrDrawEffect&);
+    GLEllipseEffect(const GrProcessor&);
 
-    virtual void emitCode(GrGLShaderBuilder* builder,
-                          const GrDrawEffect& drawEffect,
-                          const GrEffectKey& key,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    virtual void emitCode(EmitArgs&) override;
 
-    static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*);
+    static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*);
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
 
 private:
-    GrGLUniformManager::UniformHandle   fEllipseUniform;
-    SkPoint                             fPrevCenter;
-    SkVector                            fPrevRadii;
+    GrGLSLProgramDataManager::UniformHandle fEllipseUniform;
+    SkPoint                                 fPrevCenter;
+    SkVector                                fPrevRadii;
 
-    typedef GrGLEffect INHERITED;
+    typedef GrGLSLFragmentProcessor INHERITED;
 };
 
-GLEllipseEffect::GLEllipseEffect(const GrBackendEffectFactory& factory,
-                                 const GrDrawEffect& drawEffect)
-    : INHERITED (factory) {
+GLEllipseEffect::GLEllipseEffect(const GrProcessor& effect) {
     fPrevRadii.fX = -1.f;
 }
 
-void GLEllipseEffect::emitCode(GrGLShaderBuilder* builder,
-                               const GrDrawEffect& drawEffect,
-                               const GrEffectKey& key,
-                               const char* outputColor,
-                               const char* inputColor,
-                               const TransformedCoordsArray&,
-                               const TextureSamplerArray& samplers) {
-    const EllipseEffect& ee = drawEffect.castEffect<EllipseEffect>();
+void GLEllipseEffect::emitCode(EmitArgs& args) {
+    const EllipseEffect& ee = args.fFp.cast<EllipseEffect>();
     const char *ellipseName;
     // The ellipse uniform is (center.x, center.y, 1 / rx^2, 1 / ry^2)
-    fEllipseUniform = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                         kVec4f_GrSLType,
+    // The last two terms can underflow on mediump, so we use highp.
+    fEllipseUniform = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                         kVec4f_GrSLType, kHigh_GrSLPrecision,
                                          "ellipse",
                                          &ellipseName);
-    const char* fragmentPos = builder->fragmentPosition();
+
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    const char* fragmentPos = fragBuilder->fragmentPosition();
 
     // d is the offset to the ellipse center
-    builder->fsCodeAppendf("\t\tvec2 d = %s.xy - %s.xy;\n", fragmentPos, ellipseName);
-    builder->fsCodeAppendf("\t\tvec2 Z = d * %s.zw;\n", ellipseName);
+    fragBuilder->codeAppendf("\t\tvec2 d = %s.xy - %s.xy;\n", fragmentPos, ellipseName);
+    fragBuilder->codeAppendf("\t\tvec2 Z = d * %s.zw;\n", ellipseName);
     // implicit is the evaluation of (x/rx)^2 + (y/ry)^2 - 1.
-    builder->fsCodeAppend("\t\tfloat implicit = dot(Z, d) - 1.0;\n");
+    fragBuilder->codeAppend("\t\tfloat implicit = dot(Z, d) - 1.0;\n");
     // grad_dot is the squared length of the gradient of the implicit.
-    builder->fsCodeAppendf("\t\tfloat grad_dot = 4.0 * dot(Z, Z);\n");
+    fragBuilder->codeAppendf("\t\tfloat grad_dot = 4.0 * dot(Z, Z);\n");
     // avoid calling inversesqrt on zero.
-    builder->fsCodeAppend("\t\tgrad_dot = max(grad_dot, 1.0e-4);\n");
-    builder->fsCodeAppendf("\t\tfloat approx_dist = implicit * inversesqrt(grad_dot);\n");
+    fragBuilder->codeAppend("\t\tgrad_dot = max(grad_dot, 1.0e-4);\n");
+    fragBuilder->codeAppendf("\t\tfloat approx_dist = implicit * inversesqrt(grad_dot);\n");
 
     switch (ee.getEdgeType()) {
-        case kFillAA_GrEffectEdgeType:
-            builder->fsCodeAppend("\t\tfloat alpha = clamp(0.5 - approx_dist, 0.0, 1.0);\n");
+        case kFillAA_GrProcessorEdgeType:
+            fragBuilder->codeAppend("\t\tfloat alpha = clamp(0.5 - approx_dist, 0.0, 1.0);\n");
             break;
-        case kInverseFillAA_GrEffectEdgeType:
-            builder->fsCodeAppend("\t\tfloat alpha = clamp(0.5 + approx_dist, 0.0, 1.0);\n");
+        case kInverseFillAA_GrProcessorEdgeType:
+            fragBuilder->codeAppend("\t\tfloat alpha = clamp(0.5 + approx_dist, 0.0, 1.0);\n");
             break;
-        case kFillBW_GrEffectEdgeType:
-            builder->fsCodeAppend("\t\tfloat alpha = approx_dist > 0.0 ? 0.0 : 1.0;\n");
+        case kFillBW_GrProcessorEdgeType:
+            fragBuilder->codeAppend("\t\tfloat alpha = approx_dist > 0.0 ? 0.0 : 1.0;\n");
             break;
-        case kInverseFillBW_GrEffectEdgeType:
-            builder->fsCodeAppend("\t\tfloat alpha = approx_dist > 0.0 ? 1.0 : 0.0;\n");
+        case kInverseFillBW_GrProcessorEdgeType:
+            fragBuilder->codeAppend("\t\tfloat alpha = approx_dist > 0.0 ? 1.0 : 0.0;\n");
             break;
-        case kHairlineAA_GrEffectEdgeType:
+        case kHairlineAA_GrProcessorEdgeType:
             SkFAIL("Hairline not expected here.");
     }
 
-    builder->fsCodeAppendf("\t\t%s = %s;\n", outputColor,
-                           (GrGLSLExpr4(inputColor) * GrGLSLExpr1("alpha")).c_str());
+    fragBuilder->codeAppendf("\t\t%s = %s;\n", args.fOutputColor,
+                             (GrGLSLExpr4(args.fInputColor) * GrGLSLExpr1("alpha")).c_str());
 }
 
-void GLEllipseEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
-                             GrEffectKeyBuilder* b) {
-    const EllipseEffect& ee = drawEffect.castEffect<EllipseEffect>();
+void GLEllipseEffect::GenKey(const GrProcessor& effect, const GrGLSLCaps&,
+                             GrProcessorKeyBuilder* b) {
+    const EllipseEffect& ee = effect.cast<EllipseEffect>();
     b->add32(ee.getEdgeType());
 }
 
-void GLEllipseEffect::setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) {
-    const EllipseEffect& ee = drawEffect.castEffect<EllipseEffect>();
+void GLEllipseEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                                const GrProcessor& effect) {
+    const EllipseEffect& ee = effect.cast<EllipseEffect>();
     if (ee.getRadii() != fPrevRadii || ee.getCenter() != fPrevCenter) {
         SkScalar invRXSqd = 1.f / (ee.getRadii().fX * ee.getRadii().fX);
         SkScalar invRYSqd = 1.f / (ee.getRadii().fY * ee.getRadii().fY);
-        uman.set4f(fEllipseUniform, ee.getCenter().fX, ee.getCenter().fY, invRXSqd, invRYSqd);
+        pdman.set4f(fEllipseUniform, ee.getCenter().fX, ee.getCenter().fY, invRXSqd, invRYSqd);
         fPrevCenter = ee.getCenter();
         fPrevRadii = ee.getRadii();
     }
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+void EllipseEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                          GrProcessorKeyBuilder* b) const {
+    GLEllipseEffect::GenKey(*this, caps, b);
+}
+
+GrGLSLFragmentProcessor* EllipseEffect::onCreateGLSLInstance() const  {
+    return new GLEllipseEffect(*this);
+}
+
 //////////////////////////////////////////////////////////////////////////////
 
-GrEffect* GrOvalEffect::Create(GrEffectEdgeType edgeType, const SkRect& oval) {
-    if (kHairlineAA_GrEffectEdgeType == edgeType) {
-        return NULL;
+GrFragmentProcessor* GrOvalEffect::Create(GrPrimitiveEdgeType edgeType, const SkRect& oval) {
+    if (kHairlineAA_GrProcessorEdgeType == edgeType) {
+        return nullptr;
     }
     SkScalar w = oval.width();
     SkScalar h = oval.height();
@@ -380,5 +377,5 @@ GrEffect* GrOvalEffect::Create(GrEffectEdgeType edgeType, const SkRect& oval) {
         return EllipseEffect::Create(edgeType, SkPoint::Make(oval.fLeft + w, oval.fTop + h), w, h);
     }
 
-    return NULL;
+    return nullptr;
 }
diff --git a/gfx/skia/skia/src/gpu/effects/GrOvalEffect.h b/gfx/skia/skia/src/gpu/effects/GrOvalEffect.h
index 37574ec58c67..8f8536573185 100644
--- a/gfx/skia/skia/src/gpu/effects/GrOvalEffect.h
+++ b/gfx/skia/skia/src/gpu/effects/GrOvalEffect.h
@@ -11,14 +11,14 @@
 #include "GrTypes.h"
 #include "GrTypesPriv.h"
 
-class GrEffect;
+class GrFragmentProcessor;
 struct SkRect;
 
 namespace GrOvalEffect {
     /**
      * Creates an effect that performs clipping against an oval.
      */
-    GrEffect* Create(GrEffectEdgeType, const SkRect&);
+    GrFragmentProcessor* Create(GrPrimitiveEdgeType, const SkRect&);
 };
 
 #endif
diff --git a/gfx/skia/skia/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/gfx/skia/skia/src/gpu/effects/GrPorterDuffXferProcessor.cpp
new file mode 100644
index 000000000000..42a96319769d
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/effects/GrPorterDuffXferProcessor.cpp
@@ -0,0 +1,920 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "effects/GrPorterDuffXferProcessor.h"
+
+#include "GrBlend.h"
+#include "GrCaps.h"
+#include "GrPipeline.h"
+#include "GrProcessor.h"
+#include "GrProcOptInfo.h"
+#include "GrTypes.h"
+#include "GrXferProcessor.h"
+#include "glsl/GrGLSLBlend.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+#include "glsl/GrGLSLXferProcessor.h"
+
+/**
+ * Wraps the shader outputs and HW blend state that comprise a Porter Duff blend mode with coverage.
+ */
+struct BlendFormula {
+public:
+    /**
+     * Values the shader can write to primary and secondary outputs. These must all be modulated by
+     * coverage to support mixed samples. The XP will ignore the multiplies when not using coverage.
+     */
+    enum OutputType {
+        kNone_OutputType,        //<! 0
+        kCoverage_OutputType,    //<! inputCoverage
+        kModulate_OutputType,    //<! inputColor * inputCoverage
+        kSAModulate_OutputType,  //<! inputColor.a * inputCoverage
+        kISAModulate_OutputType, //<! (1 - inputColor.a) * inputCoverage
+        kISCModulate_OutputType, //<! (1 - inputColor) * inputCoverage
+
+        kLast_OutputType = kISCModulate_OutputType
+    };
+
+    enum Properties {
+        kModifiesDst_Property              = 1,
+        kUsesDstColor_Property             = 1 << 1,
+        kUsesInputColor_Property           = 1 << 2,
+        kCanTweakAlphaForCoverage_Property = 1 << 3,
+
+        kLast_Property = kCanTweakAlphaForCoverage_Property
+    };
+
+    BlendFormula& operator =(const BlendFormula& other) {
+        fData = other.fData;
+        return *this;
+    }
+
+    bool operator ==(const BlendFormula& other) const {
+        return fData == other.fData;
+    }
+
+    bool hasSecondaryOutput() const { return kNone_OutputType != fSecondaryOutputType; }
+    bool modifiesDst() const { return SkToBool(fProps & kModifiesDst_Property); }
+    bool usesDstColor() const { return SkToBool(fProps & kUsesDstColor_Property); }
+    bool usesInputColor() const { return SkToBool(fProps & kUsesInputColor_Property); }
+    bool canTweakAlphaForCoverage() const {
+        return SkToBool(fProps & kCanTweakAlphaForCoverage_Property);
+    }
+
+    /**
+     * Deduce the properties of a compile-time constant BlendFormula.
+     */
+    template<OutputType PrimaryOut, OutputType SecondaryOut,
+             GrBlendEquation BlendEquation, GrBlendCoeff SrcCoeff, GrBlendCoeff DstCoeff>
+    struct get_properties : skstd::integral_constant<Properties, static_cast<Properties>(
+
+        (GR_BLEND_MODIFIES_DST(BlendEquation, SrcCoeff, DstCoeff) ?
+            kModifiesDst_Property : 0) |
+
+        (GR_BLEND_COEFFS_USE_DST_COLOR(SrcCoeff, DstCoeff) ?
+            kUsesDstColor_Property : 0) |
+
+        ((PrimaryOut >= kModulate_OutputType && GR_BLEND_COEFFS_USE_SRC_COLOR(SrcCoeff,DstCoeff)) ||
+         (SecondaryOut >= kModulate_OutputType && GR_BLEND_COEFF_REFS_SRC2(DstCoeff)) ?
+            kUsesInputColor_Property : 0) |  // We assert later that SrcCoeff doesn't ref src2.
+
+        (kModulate_OutputType == PrimaryOut &&
+         kNone_OutputType == SecondaryOut &&
+         GR_BLEND_CAN_TWEAK_ALPHA_FOR_COVERAGE(BlendEquation, SrcCoeff, DstCoeff) ?
+            kCanTweakAlphaForCoverage_Property : 0))> {
+
+        // The provided formula should already be optimized.
+        GR_STATIC_ASSERT((kNone_OutputType == PrimaryOut) ==
+                         !GR_BLEND_COEFFS_USE_SRC_COLOR(SrcCoeff, DstCoeff));
+        GR_STATIC_ASSERT(!GR_BLEND_COEFF_REFS_SRC2(SrcCoeff));
+        GR_STATIC_ASSERT((kNone_OutputType == SecondaryOut) ==
+                         !GR_BLEND_COEFF_REFS_SRC2(DstCoeff));
+        GR_STATIC_ASSERT(PrimaryOut != SecondaryOut || kNone_OutputType == PrimaryOut);
+        GR_STATIC_ASSERT(kNone_OutputType != PrimaryOut || kNone_OutputType == SecondaryOut);
+    };
+
+    union {
+        struct {
+            // We allot the enums one more bit than they require because MSVC seems to sign-extend
+            // them when the top bit is set. (This is in violation of the C++03 standard 9.6/4)
+            OutputType        fPrimaryOutputType    : 4;
+            OutputType        fSecondaryOutputType  : 4;
+            GrBlendEquation   fBlendEquation        : 6;
+            GrBlendCoeff      fSrcCoeff             : 6;
+            GrBlendCoeff      fDstCoeff             : 6;
+            Properties        fProps                : 32 - (4 + 4 + 6 + 6 + 6);
+        };
+        uint32_t fData;
+    };
+
+    GR_STATIC_ASSERT(kLast_OutputType      < (1 << 3));
+    GR_STATIC_ASSERT(kLast_GrBlendEquation < (1 << 5));
+    GR_STATIC_ASSERT(kLast_GrBlendCoeff    < (1 << 5));
+    GR_STATIC_ASSERT(kLast_Property        < (1 << 6));
+};
+
+GR_STATIC_ASSERT(4 == sizeof(BlendFormula));
+
+GR_MAKE_BITFIELD_OPS(BlendFormula::Properties);
+
+/**
+ * Initialize a compile-time constant BlendFormula and automatically deduce fProps.
+ */
+#define INIT_BLEND_FORMULA(PRIMARY_OUT, SECONDARY_OUT, BLEND_EQUATION, SRC_COEFF, DST_COEFF) \
+    {{{PRIMARY_OUT, \
+       SECONDARY_OUT, \
+       BLEND_EQUATION, SRC_COEFF, DST_COEFF, \
+       BlendFormula::get_properties<PRIMARY_OUT, SECONDARY_OUT, \
+                                    BLEND_EQUATION, SRC_COEFF, DST_COEFF>::value}}}
+
+/**
+ * When there is no coverage, or the blend mode can tweak alpha for coverage, we use the standard
+ * Porter Duff formula.
+ */
+#define COEFF_FORMULA(SRC_COEFF, DST_COEFF) \
+    INIT_BLEND_FORMULA(BlendFormula::kModulate_OutputType, \
+                       BlendFormula::kNone_OutputType, \
+                       kAdd_GrBlendEquation, SRC_COEFF, DST_COEFF)
+
+/**
+ * Basic coeff formula similar to COEFF_FORMULA but we will make the src f*Sa. This is used in
+ * LCD dst-out.
+ */
+#define COEFF_FORMULA_SA_MODULATE(SRC_COEFF, DST_COEFF) \
+    INIT_BLEND_FORMULA(BlendFormula::kSAModulate_OutputType, \
+                       BlendFormula::kNone_OutputType, \
+                       kAdd_GrBlendEquation, SRC_COEFF, DST_COEFF)
+
+/**
+ * When the coeffs are (Zero, Zero), we clear the dst. This formula has its own macro so we can set
+ * the primary output type to none.
+ */
+#define DST_CLEAR_FORMULA \
+    INIT_BLEND_FORMULA(BlendFormula::kNone_OutputType, \
+                       BlendFormula::kNone_OutputType, \
+                       kAdd_GrBlendEquation, kZero_GrBlendCoeff, kZero_GrBlendCoeff)
+
+/**
+ * When the coeffs are (Zero, One), we don't write to the dst at all. This formula has its own macro
+ * so we can set the primary output type to none.
+ */
+#define NO_DST_WRITE_FORMULA \
+    INIT_BLEND_FORMULA(BlendFormula::kNone_OutputType, \
+                       BlendFormula::kNone_OutputType, \
+                       kAdd_GrBlendEquation, kZero_GrBlendCoeff, kOne_GrBlendCoeff)
+
+/**
+ * When there is coverage, the equation with f=coverage is:
+ *
+ *   D' = f * (S * srcCoeff + D * dstCoeff) + (1-f) * D
+ *
+ * This can be rewritten as:
+ *
+ *   D' = f * S * srcCoeff + D * (1 - [f * (1 - dstCoeff)])
+ *
+ * To implement this formula, we output [f * (1 - dstCoeff)] for the secondary color and replace the
+ * HW dst coeff with IS2C.
+ *
+ * Xfer modes: dst-atop (Sa!=1)
+ */
+#define COVERAGE_FORMULA(ONE_MINUS_DST_COEFF_MODULATE_OUTPUT, SRC_COEFF) \
+    INIT_BLEND_FORMULA(BlendFormula::kModulate_OutputType, \
+                       ONE_MINUS_DST_COEFF_MODULATE_OUTPUT, \
+                       kAdd_GrBlendEquation, SRC_COEFF, kIS2C_GrBlendCoeff)
+
+/**
+ * When there is coverage and the src coeff is Zero, the equation with f=coverage becomes:
+ *
+ *   D' = f * D * dstCoeff + (1-f) * D
+ *
+ * This can be rewritten as:
+ *
+ *   D' = D - D * [f * (1 - dstCoeff)]
+ *
+ * To implement this formula, we output [f * (1 - dstCoeff)] for the primary color and use a reverse
+ * subtract HW blend equation with coeffs of (DC, One).
+ *
+ * Xfer modes: clear, dst-out (Sa=1), dst-in (Sa!=1), modulate (Sc!=1)
+ */
+#define COVERAGE_SRC_COEFF_ZERO_FORMULA(ONE_MINUS_DST_COEFF_MODULATE_OUTPUT) \
+    INIT_BLEND_FORMULA(ONE_MINUS_DST_COEFF_MODULATE_OUTPUT, \
+                       BlendFormula::kNone_OutputType, \
+                       kReverseSubtract_GrBlendEquation, kDC_GrBlendCoeff, kOne_GrBlendCoeff)
+
+/**
+ * When there is coverage and the dst coeff is Zero, the equation with f=coverage becomes:
+ *
+ *   D' = f * S * srcCoeff + (1-f) * D
+ *
+ * To implement this formula, we output [f] for the secondary color and replace the HW dst coeff
+ * with IS2A. (Note that we can avoid dual source blending when Sa=1 by using ISA.)
+ *
+ * Xfer modes (Sa!=1): src, src-in, src-out
+ */
+#define COVERAGE_DST_COEFF_ZERO_FORMULA(SRC_COEFF) \
+    INIT_BLEND_FORMULA(BlendFormula::kModulate_OutputType, \
+                       BlendFormula::kCoverage_OutputType, \
+                       kAdd_GrBlendEquation, SRC_COEFF, kIS2A_GrBlendCoeff)
+
+/**
+ * This table outlines the blend formulas we will use with each xfermode, with and without coverage,
+ * with and without an opaque input color. Optimization properties are deduced at compile time so we
+ * can make runtime decisions quickly. RGB coverage is not supported.
+ */
+static const BlendFormula gBlendTable[2][2][SkXfermode::kLastCoeffMode + 1] = {
+
+                     /*>> No coverage, input color unknown <<*/ {{
+
+    /* clear */      DST_CLEAR_FORMULA,
+    /* src */        COEFF_FORMULA(   kOne_GrBlendCoeff,    kZero_GrBlendCoeff),
+    /* dst */        NO_DST_WRITE_FORMULA,
+    /* src-over */   COEFF_FORMULA(   kOne_GrBlendCoeff,    kISA_GrBlendCoeff),
+    /* dst-over */   COEFF_FORMULA(   kIDA_GrBlendCoeff,    kOne_GrBlendCoeff),
+    /* src-in */     COEFF_FORMULA(   kDA_GrBlendCoeff,     kZero_GrBlendCoeff),
+    /* dst-in */     COEFF_FORMULA(   kZero_GrBlendCoeff,   kSA_GrBlendCoeff),
+    /* src-out */    COEFF_FORMULA(   kIDA_GrBlendCoeff,    kZero_GrBlendCoeff),
+    /* dst-out */    COEFF_FORMULA(   kZero_GrBlendCoeff,   kISA_GrBlendCoeff),
+    /* src-atop */   COEFF_FORMULA(   kDA_GrBlendCoeff,     kISA_GrBlendCoeff),
+    /* dst-atop */   COEFF_FORMULA(   kIDA_GrBlendCoeff,    kSA_GrBlendCoeff),
+    /* xor */        COEFF_FORMULA(   kIDA_GrBlendCoeff,    kISA_GrBlendCoeff),
+    /* plus */       COEFF_FORMULA(   kOne_GrBlendCoeff,    kOne_GrBlendCoeff),
+    /* modulate */   COEFF_FORMULA(   kZero_GrBlendCoeff,   kSC_GrBlendCoeff),
+    /* screen */     COEFF_FORMULA(   kOne_GrBlendCoeff,    kISC_GrBlendCoeff),
+
+                     }, /*>> Has coverage, input color unknown <<*/ {
+
+    /* clear */      COVERAGE_SRC_COEFF_ZERO_FORMULA(BlendFormula::kCoverage_OutputType),
+    /* src */        COVERAGE_DST_COEFF_ZERO_FORMULA(kOne_GrBlendCoeff),
+    /* dst */        NO_DST_WRITE_FORMULA,
+    /* src-over */   COEFF_FORMULA(   kOne_GrBlendCoeff,    kISA_GrBlendCoeff),
+    /* dst-over */   COEFF_FORMULA(   kIDA_GrBlendCoeff,    kOne_GrBlendCoeff),
+    /* src-in */     COVERAGE_DST_COEFF_ZERO_FORMULA(kDA_GrBlendCoeff),
+    /* dst-in */     COVERAGE_SRC_COEFF_ZERO_FORMULA(BlendFormula::kISAModulate_OutputType),
+    /* src-out */    COVERAGE_DST_COEFF_ZERO_FORMULA(kIDA_GrBlendCoeff),
+    /* dst-out */    COEFF_FORMULA(   kZero_GrBlendCoeff,   kISA_GrBlendCoeff),
+    /* src-atop */   COEFF_FORMULA(   kDA_GrBlendCoeff,     kISA_GrBlendCoeff),
+    /* dst-atop */   COVERAGE_FORMULA(BlendFormula::kISAModulate_OutputType, kIDA_GrBlendCoeff),
+    /* xor */        COEFF_FORMULA(   kIDA_GrBlendCoeff,    kISA_GrBlendCoeff),
+    /* plus */       COEFF_FORMULA(   kOne_GrBlendCoeff,    kOne_GrBlendCoeff),
+    /* modulate */   COVERAGE_SRC_COEFF_ZERO_FORMULA(BlendFormula::kISCModulate_OutputType),
+    /* screen */     COEFF_FORMULA(   kOne_GrBlendCoeff,    kISC_GrBlendCoeff),
+
+                     }}, /*>> No coverage, input color opaque <<*/ {{
+
+    /* clear */      DST_CLEAR_FORMULA,
+    /* src */        COEFF_FORMULA(   kOne_GrBlendCoeff,    kZero_GrBlendCoeff),
+    /* dst */        NO_DST_WRITE_FORMULA,
+    /* src-over */   COEFF_FORMULA(   kOne_GrBlendCoeff,    kZero_GrBlendCoeff),
+    /* dst-over */   COEFF_FORMULA(   kIDA_GrBlendCoeff,    kOne_GrBlendCoeff),
+    /* src-in */     COEFF_FORMULA(   kDA_GrBlendCoeff,     kZero_GrBlendCoeff),
+    /* dst-in */     NO_DST_WRITE_FORMULA,
+    /* src-out */    COEFF_FORMULA(   kIDA_GrBlendCoeff,    kZero_GrBlendCoeff),
+    /* dst-out */    DST_CLEAR_FORMULA,
+    /* src-atop */   COEFF_FORMULA(   kDA_GrBlendCoeff,     kZero_GrBlendCoeff),
+    /* dst-atop */   COEFF_FORMULA(   kIDA_GrBlendCoeff,    kOne_GrBlendCoeff),
+    /* xor */        COEFF_FORMULA(   kIDA_GrBlendCoeff,    kZero_GrBlendCoeff),
+    /* plus */       COEFF_FORMULA(   kOne_GrBlendCoeff,    kOne_GrBlendCoeff),
+    /* modulate */   COEFF_FORMULA(   kZero_GrBlendCoeff,   kSC_GrBlendCoeff),
+    /* screen */     COEFF_FORMULA(   kOne_GrBlendCoeff,    kISC_GrBlendCoeff),
+
+                     }, /*>> Has coverage, input color opaque <<*/ {
+
+    /* clear */      COVERAGE_SRC_COEFF_ZERO_FORMULA(BlendFormula::kCoverage_OutputType),
+    /* src */        COEFF_FORMULA(   kOne_GrBlendCoeff,    kISA_GrBlendCoeff),
+    /* dst */        NO_DST_WRITE_FORMULA,
+    /* src-over */   COEFF_FORMULA(   kOne_GrBlendCoeff,    kISA_GrBlendCoeff),
+    /* dst-over */   COEFF_FORMULA(   kIDA_GrBlendCoeff,    kOne_GrBlendCoeff),
+    /* src-in */     COEFF_FORMULA(   kDA_GrBlendCoeff,     kISA_GrBlendCoeff),
+    /* dst-in */     NO_DST_WRITE_FORMULA,
+    /* src-out */    COEFF_FORMULA(   kIDA_GrBlendCoeff,    kISA_GrBlendCoeff),
+    /* dst-out */    COVERAGE_SRC_COEFF_ZERO_FORMULA(BlendFormula::kCoverage_OutputType),
+    /* src-atop */   COEFF_FORMULA(   kDA_GrBlendCoeff,     kISA_GrBlendCoeff),
+    /* dst-atop */   COEFF_FORMULA(   kIDA_GrBlendCoeff,    kOne_GrBlendCoeff),
+    /* xor */        COEFF_FORMULA(   kIDA_GrBlendCoeff,    kISA_GrBlendCoeff),
+    /* plus */       COEFF_FORMULA(   kOne_GrBlendCoeff,    kOne_GrBlendCoeff),
+    /* modulate */   COVERAGE_SRC_COEFF_ZERO_FORMULA(BlendFormula::kISCModulate_OutputType),
+    /* screen */     COEFF_FORMULA(   kOne_GrBlendCoeff,    kISC_GrBlendCoeff),
+}}};
+
+static const BlendFormula gLCDBlendTable[SkXfermode::kLastCoeffMode + 1] = {
+    /* clear */      COVERAGE_SRC_COEFF_ZERO_FORMULA(BlendFormula::kCoverage_OutputType),
+    /* src */        COVERAGE_FORMULA(BlendFormula::kCoverage_OutputType, kOne_GrBlendCoeff),
+    /* dst */        NO_DST_WRITE_FORMULA,
+    /* src-over */   COVERAGE_FORMULA(BlendFormula::kSAModulate_OutputType, kOne_GrBlendCoeff),
+    /* dst-over */   COEFF_FORMULA(   kIDA_GrBlendCoeff,    kOne_GrBlendCoeff),
+    /* src-in */     COVERAGE_FORMULA(BlendFormula::kCoverage_OutputType, kDA_GrBlendCoeff),
+    /* dst-in */     COVERAGE_SRC_COEFF_ZERO_FORMULA(BlendFormula::kISAModulate_OutputType),
+    /* src-out */    COVERAGE_FORMULA(BlendFormula::kCoverage_OutputType, kIDA_GrBlendCoeff),
+    /* dst-out */    COEFF_FORMULA_SA_MODULATE(   kZero_GrBlendCoeff,   kISC_GrBlendCoeff),
+    /* src-atop */   COVERAGE_FORMULA(BlendFormula::kSAModulate_OutputType, kDA_GrBlendCoeff),
+    /* dst-atop */   COVERAGE_FORMULA(BlendFormula::kISAModulate_OutputType, kIDA_GrBlendCoeff),
+    /* xor */        COVERAGE_FORMULA(BlendFormula::kSAModulate_OutputType, kIDA_GrBlendCoeff),
+    /* plus */       COEFF_FORMULA(   kOne_GrBlendCoeff,    kOne_GrBlendCoeff),
+    /* modulate */   COVERAGE_SRC_COEFF_ZERO_FORMULA(BlendFormula::kISCModulate_OutputType),
+    /* screen */     COEFF_FORMULA(   kOne_GrBlendCoeff,    kISC_GrBlendCoeff),
+};
+
+static BlendFormula get_blend_formula(const GrProcOptInfo& colorPOI,
+                                      const GrProcOptInfo& coveragePOI,
+                                      bool hasMixedSamples,
+                                      SkXfermode::Mode xfermode) {
+    SkASSERT(xfermode >= 0 && xfermode <= SkXfermode::kLastCoeffMode);
+    SkASSERT(!coveragePOI.isFourChannelOutput());
+
+    bool conflatesCoverage = !coveragePOI.isSolidWhite() || hasMixedSamples;
+    return gBlendTable[colorPOI.isOpaque()][conflatesCoverage][xfermode];
+}
+
+static BlendFormula get_lcd_blend_formula(const GrProcOptInfo& coveragePOI,
+                                          SkXfermode::Mode xfermode) {
+    SkASSERT(xfermode >= 0 && xfermode <= SkXfermode::kLastCoeffMode);
+    SkASSERT(coveragePOI.isFourChannelOutput());
+
+    return gLCDBlendTable[xfermode];
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+class PorterDuffXferProcessor : public GrXferProcessor {
+public:
+    PorterDuffXferProcessor(BlendFormula blendFormula) : fBlendFormula(blendFormula) {
+        this->initClassID<PorterDuffXferProcessor>();
+    }
+
+    const char* name() const override { return "Porter Duff"; }
+
+    GrGLSLXferProcessor* createGLSLInstance() const override;
+
+    BlendFormula getBlendFormula() const { return fBlendFormula; }
+
+private:
+    GrXferProcessor::OptFlags onGetOptimizations(const GrPipelineOptimizations& optimizations,
+                                                 bool doesStencilWrite,
+                                                 GrColor* overrideColor,
+                                                 const GrCaps& caps) const override;
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
+
+    bool onHasSecondaryOutput() const override { return fBlendFormula.hasSecondaryOutput(); }
+
+    void onGetBlendInfo(GrXferProcessor::BlendInfo* blendInfo) const override {
+        blendInfo->fEquation = fBlendFormula.fBlendEquation;
+        blendInfo->fSrcBlend = fBlendFormula.fSrcCoeff;
+        blendInfo->fDstBlend = fBlendFormula.fDstCoeff;
+        blendInfo->fWriteColor = fBlendFormula.modifiesDst();
+    }
+
+    bool onIsEqual(const GrXferProcessor& xpBase) const override {
+        const PorterDuffXferProcessor& xp = xpBase.cast<PorterDuffXferProcessor>();
+        return fBlendFormula == xp.fBlendFormula;
+    }
+
+    const BlendFormula fBlendFormula;
+
+    typedef GrXferProcessor INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+static void append_color_output(const PorterDuffXferProcessor& xp,
+                                GrGLSLXPFragmentBuilder* fragBuilder,
+                                BlendFormula::OutputType outputType, const char* output,
+                                const char* inColor, const char* inCoverage) {
+    switch (outputType) {
+        case BlendFormula::kNone_OutputType:
+            fragBuilder->codeAppendf("%s = vec4(0.0);", output);
+            break;
+        case BlendFormula::kCoverage_OutputType:
+            // We can have a coverage formula while not reading coverage if there are mixed samples.
+            if (inCoverage) {
+                fragBuilder->codeAppendf("%s = %s;", output, inCoverage);
+            } else {
+                fragBuilder->codeAppendf("%s = vec4(1.0);", output);
+            }
+            break;
+        case BlendFormula::kModulate_OutputType:
+            if (inCoverage) {
+                fragBuilder->codeAppendf("%s = %s * %s;", output, inColor, inCoverage);
+            } else {
+                fragBuilder->codeAppendf("%s = %s;", output, inColor);
+            }
+            break;
+        case BlendFormula::kSAModulate_OutputType:
+            if (inCoverage) {
+                fragBuilder->codeAppendf("%s = %s.a * %s;", output, inColor, inCoverage);
+            } else {
+                fragBuilder->codeAppendf("%s = %s;", output, inColor);
+            }
+            break;
+        case BlendFormula::kISAModulate_OutputType:
+            if (inCoverage) {
+                fragBuilder->codeAppendf("%s = (1.0 - %s.a) * %s;", output, inColor, inCoverage);
+            } else {
+                fragBuilder->codeAppendf("%s = vec4(1.0 - %s.a);", output, inColor);
+            }
+            break;
+        case BlendFormula::kISCModulate_OutputType:
+            if (inCoverage) {
+                fragBuilder->codeAppendf("%s = (vec4(1.0) - %s) * %s;", output, inColor, inCoverage);
+            } else {
+                fragBuilder->codeAppendf("%s = vec4(1.0) - %s;", output, inColor);
+            }
+            break;
+        default:
+            SkFAIL("Unsupported output type.");
+            break;
+    }
+}
+
+class GLPorterDuffXferProcessor : public GrGLSLXferProcessor {
+public:
+    static void GenKey(const GrProcessor& processor, GrProcessorKeyBuilder* b) {
+        const PorterDuffXferProcessor& xp = processor.cast<PorterDuffXferProcessor>();
+        b->add32(xp.getBlendFormula().fPrimaryOutputType |
+                 (xp.getBlendFormula().fSecondaryOutputType << 3));
+        GR_STATIC_ASSERT(BlendFormula::kLast_OutputType < 8);
+    };
+
+private:
+    void emitOutputsForBlendState(const EmitArgs& args) override {
+        const PorterDuffXferProcessor& xp = args.fXP.cast<PorterDuffXferProcessor>();
+        GrGLSLXPFragmentBuilder* fragBuilder = args.fXPFragBuilder;
+
+        BlendFormula blendFormula = xp.getBlendFormula();
+        if (blendFormula.hasSecondaryOutput()) {
+            append_color_output(xp, fragBuilder, blendFormula.fSecondaryOutputType,
+                                args.fOutputSecondary, args.fInputColor, args.fInputCoverage);
+        }
+        append_color_output(xp, fragBuilder, blendFormula.fPrimaryOutputType,
+                            args.fOutputPrimary, args.fInputColor, args.fInputCoverage);
+    }
+
+    void onSetData(const GrGLSLProgramDataManager&, const GrXferProcessor&) override {}
+
+    typedef GrGLSLXferProcessor INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+void PorterDuffXferProcessor::onGetGLSLProcessorKey(const GrGLSLCaps&,
+                                                    GrProcessorKeyBuilder* b) const {
+    GLPorterDuffXferProcessor::GenKey(*this, b);
+}
+
+GrGLSLXferProcessor* PorterDuffXferProcessor::createGLSLInstance() const {
+    return new GLPorterDuffXferProcessor;
+}
+
+GrXferProcessor::OptFlags
+PorterDuffXferProcessor::onGetOptimizations(const GrPipelineOptimizations& optimizations,
+                                            bool doesStencilWrite,
+                                            GrColor* overrideColor,
+                                            const GrCaps& caps) const {
+    GrXferProcessor::OptFlags optFlags = GrXferProcessor::kNone_OptFlags;
+    if (!fBlendFormula.modifiesDst()) {
+        if (!doesStencilWrite) {
+            optFlags |= GrXferProcessor::kSkipDraw_OptFlag;
+        }
+        optFlags |= (GrXferProcessor::kIgnoreColor_OptFlag |
+                     GrXferProcessor::kIgnoreCoverage_OptFlag |
+                     GrXferProcessor::kCanTweakAlphaForCoverage_OptFlag);
+    } else {
+        if (!fBlendFormula.usesInputColor()) {
+            optFlags |= GrXferProcessor::kIgnoreColor_OptFlag;
+        }
+        if (optimizations.fCoveragePOI.isSolidWhite()) {
+            optFlags |= GrXferProcessor::kIgnoreCoverage_OptFlag;
+        }
+        if (optimizations.fColorPOI.allStagesMultiplyInput() &&
+            fBlendFormula.canTweakAlphaForCoverage() &&
+            !optimizations.fCoveragePOI.isFourChannelOutput()) {
+            optFlags |= GrXferProcessor::kCanTweakAlphaForCoverage_OptFlag;
+        }
+    }
+    return optFlags;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+class ShaderPDXferProcessor : public GrXferProcessor {
+public:
+    ShaderPDXferProcessor(const DstTexture* dstTexture,
+                          bool hasMixedSamples,
+                          SkXfermode::Mode xfermode)
+        : INHERITED(dstTexture, true, hasMixedSamples)
+        , fXfermode(xfermode) {
+        this->initClassID<ShaderPDXferProcessor>();
+    }
+
+    const char* name() const override { return "Porter Duff Shader"; }
+
+    GrGLSLXferProcessor* createGLSLInstance() const override;
+
+    SkXfermode::Mode getXfermode() const { return fXfermode; }
+
+private:
+    GrXferProcessor::OptFlags onGetOptimizations(const GrPipelineOptimizations&, bool, GrColor*, 
+                                                 const GrCaps&) const override {
+        return kNone_OptFlags;
+    }
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
+
+    bool onIsEqual(const GrXferProcessor& xpBase) const override {
+        const ShaderPDXferProcessor& xp = xpBase.cast<ShaderPDXferProcessor>();
+        return fXfermode == xp.fXfermode;
+    }
+
+    const SkXfermode::Mode fXfermode;
+
+    typedef GrXferProcessor INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+class GLShaderPDXferProcessor : public GrGLSLXferProcessor {
+public:
+    static void GenKey(const GrProcessor& processor, GrProcessorKeyBuilder* b) {
+        const ShaderPDXferProcessor& xp = processor.cast<ShaderPDXferProcessor>();
+        b->add32(xp.getXfermode());
+    }
+
+private:
+    void emitBlendCodeForDstRead(GrGLSLXPBuilder* pb,
+                                 GrGLSLXPFragmentBuilder* fragBuilder,
+                                 const char* srcColor,
+                                 const char* srcCoverage,
+                                 const char* dstColor,
+                                 const char* outColor,
+                                 const char* outColorSecondary,
+                                 const GrXferProcessor& proc) override {
+        const ShaderPDXferProcessor& xp = proc.cast<ShaderPDXferProcessor>();
+
+        GrGLSLBlend::AppendMode(fragBuilder, srcColor, dstColor, outColor, xp.getXfermode());
+
+        // Apply coverage.
+        if (xp.dstReadUsesMixedSamples()) {
+            if (srcCoverage) {
+                fragBuilder->codeAppendf("%s *= %s;", outColor, srcCoverage);
+                fragBuilder->codeAppendf("%s = %s;", outColorSecondary, srcCoverage);
+            } else {
+                fragBuilder->codeAppendf("%s = vec4(1.0);", outColorSecondary);
+            }
+        } else if (srcCoverage) {
+            fragBuilder->codeAppendf("%s = %s * %s + (vec4(1.0) - %s) * %s;",
+                                     outColor, srcCoverage, outColor, srcCoverage, dstColor);
+        }
+    }
+
+    void onSetData(const GrGLSLProgramDataManager&, const GrXferProcessor&) override {}
+
+    typedef GrGLSLXferProcessor INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+void ShaderPDXferProcessor::onGetGLSLProcessorKey(const GrGLSLCaps&,
+                                                  GrProcessorKeyBuilder* b) const {
+    GLShaderPDXferProcessor::GenKey(*this, b);
+}
+
+GrGLSLXferProcessor* ShaderPDXferProcessor::createGLSLInstance() const {
+    return new GLShaderPDXferProcessor;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+class PDLCDXferProcessor : public GrXferProcessor {
+public:
+    static GrXferProcessor* Create(SkXfermode::Mode xfermode, const GrProcOptInfo& colorPOI);
+
+    ~PDLCDXferProcessor() override;
+
+    const char* name() const override { return "Porter Duff LCD"; }
+
+    GrGLSLXferProcessor* createGLSLInstance() const override;
+
+private:
+    PDLCDXferProcessor(GrColor blendConstant, uint8_t alpha);
+
+    GrXferProcessor::OptFlags onGetOptimizations(const GrPipelineOptimizations& optimizations,
+                                                 bool doesStencilWrite,
+                                                 GrColor* overrideColor,
+                                                 const GrCaps& caps) const override;
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
+
+    void onGetBlendInfo(GrXferProcessor::BlendInfo* blendInfo) const override {
+        blendInfo->fSrcBlend = kConstC_GrBlendCoeff;
+        blendInfo->fDstBlend = kISC_GrBlendCoeff;
+        blendInfo->fBlendConstant = fBlendConstant;
+    }
+
+    bool onIsEqual(const GrXferProcessor& xpBase) const override {
+        const PDLCDXferProcessor& xp = xpBase.cast<PDLCDXferProcessor>();
+        if (fBlendConstant != xp.fBlendConstant ||
+            fAlpha != xp.fAlpha) {
+            return false;
+        }
+        return true;
+    }
+
+    GrColor      fBlendConstant;
+    uint8_t      fAlpha;
+
+    typedef GrXferProcessor INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+class GLPDLCDXferProcessor : public GrGLSLXferProcessor {
+public:
+    GLPDLCDXferProcessor(const GrProcessor&) {}
+
+    virtual ~GLPDLCDXferProcessor() {}
+
+    static void GenKey(const GrProcessor& processor, const GrGLSLCaps& caps,
+                       GrProcessorKeyBuilder* b) {}
+
+private:
+    void emitOutputsForBlendState(const EmitArgs& args) override {
+        GrGLSLXPFragmentBuilder* fragBuilder = args.fXPFragBuilder;
+        SkASSERT(args.fInputCoverage);
+        fragBuilder->codeAppendf("%s = %s * %s;", args.fOutputPrimary, args.fInputColor,
+                                 args.fInputCoverage);
+    }
+
+    void onSetData(const GrGLSLProgramDataManager&, const GrXferProcessor&) override {};
+
+    typedef GrGLSLXferProcessor INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+PDLCDXferProcessor::PDLCDXferProcessor(GrColor blendConstant, uint8_t alpha)
+    : fBlendConstant(blendConstant)
+    , fAlpha(alpha) {
+    this->initClassID<PDLCDXferProcessor>();
+}
+
+GrXferProcessor* PDLCDXferProcessor::Create(SkXfermode::Mode xfermode,
+                                            const GrProcOptInfo& colorPOI) {
+    if (SkXfermode::kSrcOver_Mode != xfermode) {
+        return nullptr;
+    }
+
+    if (kRGBA_GrColorComponentFlags != colorPOI.validFlags()) {
+        return nullptr;
+    }
+
+    GrColor blendConstant = GrUnpremulColor(colorPOI.color());
+    uint8_t alpha = GrColorUnpackA(blendConstant);
+    blendConstant |= (0xff << GrColor_SHIFT_A);
+
+    return new PDLCDXferProcessor(blendConstant, alpha);
+}
+
+PDLCDXferProcessor::~PDLCDXferProcessor() {
+}
+
+void PDLCDXferProcessor::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                               GrProcessorKeyBuilder* b) const {
+    GLPDLCDXferProcessor::GenKey(*this, caps, b);
+}
+
+GrGLSLXferProcessor* PDLCDXferProcessor::createGLSLInstance() const {
+    return new GLPDLCDXferProcessor(*this);
+}
+
+GrXferProcessor::OptFlags
+PDLCDXferProcessor::onGetOptimizations(const GrPipelineOptimizations& optimizations,
+                                       bool doesStencilWrite,
+                                       GrColor* overrideColor,
+                                       const GrCaps& caps) const {
+        // We want to force our primary output to be alpha * Coverage, where alpha is the alpha
+        // value of the blend the constant. We should already have valid blend coeff's if we are at
+        // a point where we have RGB coverage. We don't need any color stages since the known color
+        // output is already baked into the blendConstant.
+        *overrideColor = GrColorPackRGBA(fAlpha, fAlpha, fAlpha, fAlpha);
+        return GrXferProcessor::kOverrideColor_OptFlag;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+GrPorterDuffXPFactory::GrPorterDuffXPFactory(SkXfermode::Mode xfermode)
+    : fXfermode(xfermode) {
+    SkASSERT(fXfermode <= SkXfermode::kLastCoeffMode);
+    this->initClassID<GrPorterDuffXPFactory>();
+}
+
+GrXPFactory* GrPorterDuffXPFactory::Create(SkXfermode::Mode xfermode) {
+    static GrPorterDuffXPFactory gClearPDXPF(SkXfermode::kClear_Mode);
+    static GrPorterDuffXPFactory gSrcPDXPF(SkXfermode::kSrc_Mode);
+    static GrPorterDuffXPFactory gDstPDXPF(SkXfermode::kDst_Mode);
+    static GrPorterDuffXPFactory gSrcOverPDXPF(SkXfermode::kSrcOver_Mode);
+    static GrPorterDuffXPFactory gDstOverPDXPF(SkXfermode::kDstOver_Mode);
+    static GrPorterDuffXPFactory gSrcInPDXPF(SkXfermode::kSrcIn_Mode);
+    static GrPorterDuffXPFactory gDstInPDXPF(SkXfermode::kDstIn_Mode);
+    static GrPorterDuffXPFactory gSrcOutPDXPF(SkXfermode::kSrcOut_Mode);
+    static GrPorterDuffXPFactory gDstOutPDXPF(SkXfermode::kDstOut_Mode);
+    static GrPorterDuffXPFactory gSrcATopPDXPF(SkXfermode::kSrcATop_Mode);
+    static GrPorterDuffXPFactory gDstATopPDXPF(SkXfermode::kDstATop_Mode);
+    static GrPorterDuffXPFactory gXorPDXPF(SkXfermode::kXor_Mode);
+    static GrPorterDuffXPFactory gPlusPDXPF(SkXfermode::kPlus_Mode);
+    static GrPorterDuffXPFactory gModulatePDXPF(SkXfermode::kModulate_Mode);
+    static GrPorterDuffXPFactory gScreenPDXPF(SkXfermode::kScreen_Mode);
+
+    static GrPorterDuffXPFactory* gFactories[] = {
+        &gClearPDXPF, &gSrcPDXPF, &gDstPDXPF, &gSrcOverPDXPF, &gDstOverPDXPF, &gSrcInPDXPF,
+        &gDstInPDXPF, &gSrcOutPDXPF, &gDstOutPDXPF, &gSrcATopPDXPF, &gDstATopPDXPF, &gXorPDXPF,
+        &gPlusPDXPF, &gModulatePDXPF, &gScreenPDXPF
+    };
+    GR_STATIC_ASSERT(SK_ARRAY_COUNT(gFactories) == SkXfermode::kLastCoeffMode + 1);
+
+    if (xfermode < 0 || xfermode > SkXfermode::kLastCoeffMode) {
+        return nullptr;
+    }
+    return SkRef(gFactories[xfermode]);
+}
+
+GrXferProcessor*
+GrPorterDuffXPFactory::onCreateXferProcessor(const GrCaps& caps,
+                                             const GrPipelineOptimizations& optimizations,
+                                             bool hasMixedSamples,
+                                             const DstTexture* dstTexture) const {
+    BlendFormula blendFormula;
+    if (optimizations.fCoveragePOI.isFourChannelOutput()) {
+        if (SkXfermode::kSrcOver_Mode == fXfermode &&
+            kRGBA_GrColorComponentFlags == optimizations.fColorPOI.validFlags() &&
+            !caps.shaderCaps()->dualSourceBlendingSupport() &&
+            !caps.shaderCaps()->dstReadInShaderSupport()) {
+            // If we don't have dual source blending or in shader dst reads, we fall back to this
+            // trick for rendering SrcOver LCD text instead of doing a dst copy.
+            SkASSERT(!dstTexture || !dstTexture->texture());
+            return PDLCDXferProcessor::Create(fXfermode, optimizations.fColorPOI);
+        }
+        blendFormula = get_lcd_blend_formula(optimizations.fCoveragePOI, fXfermode);
+    } else {
+        blendFormula = get_blend_formula(optimizations.fColorPOI, optimizations.fCoveragePOI, 
+                                         hasMixedSamples, fXfermode);
+    }
+
+    if (blendFormula.hasSecondaryOutput() && !caps.shaderCaps()->dualSourceBlendingSupport()) {
+        return new ShaderPDXferProcessor(dstTexture, hasMixedSamples, fXfermode);
+    }
+
+    SkASSERT(!dstTexture || !dstTexture->texture());
+    return new PorterDuffXferProcessor(blendFormula);
+}
+
+void GrPorterDuffXPFactory::getInvariantBlendedColor(const GrProcOptInfo& colorPOI,
+                                                     InvariantBlendedColor* blendedColor) const {
+    // Find the blended color info based on the formula that does not have coverage.
+    BlendFormula colorFormula = gBlendTable[colorPOI.isOpaque()][0][fXfermode];
+    if (colorFormula.usesDstColor()) {
+        blendedColor->fWillBlendWithDst = true;
+        blendedColor->fKnownColorFlags = kNone_GrColorComponentFlags;
+        return;
+    }
+
+    blendedColor->fWillBlendWithDst = false;
+
+    SkASSERT(kAdd_GrBlendEquation == colorFormula.fBlendEquation);
+
+    switch (colorFormula.fSrcCoeff) {
+        case kZero_GrBlendCoeff:
+            blendedColor->fKnownColor = 0;
+            blendedColor->fKnownColorFlags = kRGBA_GrColorComponentFlags;
+            return;
+
+        case kOne_GrBlendCoeff:
+            blendedColor->fKnownColor = colorPOI.color();
+            blendedColor->fKnownColorFlags = colorPOI.validFlags();
+            return;
+
+        default:
+            blendedColor->fKnownColorFlags = kNone_GrColorComponentFlags;
+            return;
+    }
+}
+
+bool GrPorterDuffXPFactory::willReadDstColor(const GrCaps& caps,
+                                             const GrPipelineOptimizations& optimizations,
+                                             bool hasMixedSamples) const {
+    if (caps.shaderCaps()->dualSourceBlendingSupport()) {
+        return false;
+    }
+    
+    // When we have four channel coverage we always need to read the dst in order to correctly
+    // blend. The one exception is when we are using srcover mode and we know the input color into
+    // the XP.
+    if (optimizations.fCoveragePOI.isFourChannelOutput()) {
+        if (SkXfermode::kSrcOver_Mode == fXfermode &&
+            kRGBA_GrColorComponentFlags == optimizations.fColorPOI.validFlags() &&
+            !caps.shaderCaps()->dstReadInShaderSupport()) {
+            return false;
+        }
+        return get_lcd_blend_formula(optimizations.fCoveragePOI, fXfermode).hasSecondaryOutput();
+    }
+    // We fallback on the shader XP when the blend formula would use dual source blending but we
+    // don't have support for it.
+    return get_blend_formula(optimizations.fColorPOI, optimizations.fCoveragePOI, hasMixedSamples, 
+                             fXfermode).hasSecondaryOutput();
+}
+
+GR_DEFINE_XP_FACTORY_TEST(GrPorterDuffXPFactory);
+
+const GrXPFactory* GrPorterDuffXPFactory::TestCreate(GrProcessorTestData* d) {
+    SkXfermode::Mode mode = SkXfermode::Mode(d->fRandom->nextULessThan(SkXfermode::kLastCoeffMode));
+    return GrPorterDuffXPFactory::Create(mode);
+}
+
+void GrPorterDuffXPFactory::TestGetXPOutputTypes(const GrXferProcessor* xp,
+                                                 int* outPrimary,
+                                                 int* outSecondary) {
+    if (!!strcmp(xp->name(), "Porter Duff")) {
+        *outPrimary = *outSecondary = -1;
+        return;
+    }
+    BlendFormula blendFormula = static_cast<const PorterDuffXferProcessor*>(xp)->getBlendFormula();
+    *outPrimary = blendFormula.fPrimaryOutputType;
+    *outSecondary = blendFormula.fSecondaryOutputType;
+}
+
+
+////////////////////////////////////////////////////////////////////////////////////////////////
+// SrcOver Global functions
+////////////////////////////////////////////////////////////////////////////////////////////////
+
+GrXferProcessor* GrPorterDuffXPFactory::CreateSrcOverXferProcessor(
+        const GrCaps& caps,
+        const GrPipelineOptimizations& optimizations,
+        bool hasMixedSamples,
+        const GrXferProcessor::DstTexture* dstTexture) {
+    if (!optimizations.fCoveragePOI.isFourChannelOutput() &&
+        !(optimizations.fCoveragePOI.isSolidWhite() &&
+          !hasMixedSamples &&
+          optimizations.fColorPOI.isOpaque())) {
+        static BlendFormula gSrcOverBlendFormula = COEFF_FORMULA(kOne_GrBlendCoeff,
+                                                                 kISA_GrBlendCoeff);
+        static PorterDuffXferProcessor gSrcOverXP(gSrcOverBlendFormula);
+        SkASSERT(!dstTexture || !dstTexture->texture());
+        gSrcOverXP.ref();
+        return &gSrcOverXP;
+    }
+
+    BlendFormula blendFormula;
+    if (optimizations.fCoveragePOI.isFourChannelOutput()) {
+        if (kRGBA_GrColorComponentFlags == optimizations.fColorPOI.validFlags() &&
+            !caps.shaderCaps()->dualSourceBlendingSupport() &&
+            !caps.shaderCaps()->dstReadInShaderSupport()) {
+            // If we don't have dual source blending or in shader dst reads, we fall
+            // back to this trick for rendering SrcOver LCD text instead of doing a
+            // dst copy.
+            SkASSERT(!dstTexture || !dstTexture->texture());
+            return PDLCDXferProcessor::Create(SkXfermode::kSrcOver_Mode, optimizations.fColorPOI);
+        }
+        blendFormula = get_lcd_blend_formula(optimizations.fCoveragePOI, SkXfermode::kSrcOver_Mode);
+    } else {
+        blendFormula = get_blend_formula(optimizations.fColorPOI, optimizations.fCoveragePOI, 
+                                         hasMixedSamples, SkXfermode::kSrcOver_Mode);
+    }
+
+    if (blendFormula.hasSecondaryOutput() && !caps.shaderCaps()->dualSourceBlendingSupport()) {
+        return new ShaderPDXferProcessor(dstTexture, hasMixedSamples, SkXfermode::kSrcOver_Mode);
+    }
+
+    SkASSERT(!dstTexture || !dstTexture->texture());
+    return new PorterDuffXferProcessor(blendFormula);
+}
+
+bool GrPorterDuffXPFactory::SrcOverWillNeedDstTexture(const GrCaps& caps,
+                                                      const GrPipelineOptimizations& optimizations,
+                                                      bool hasMixedSamples) {
+    if (caps.shaderCaps()->dstReadInShaderSupport() ||
+        caps.shaderCaps()->dualSourceBlendingSupport()) {
+        return false;
+    }
+
+    // When we have four channel coverage we always need to read the dst in order to correctly
+    // blend. The one exception is when we are using srcover mode and we know the input color
+    // into the XP.
+    if (optimizations.fCoveragePOI.isFourChannelOutput()) {
+        if (kRGBA_GrColorComponentFlags == optimizations.fColorPOI.validFlags() &&
+            !caps.shaderCaps()->dstReadInShaderSupport()) {
+            return false;
+        }
+        return get_lcd_blend_formula(optimizations.fCoveragePOI, 
+                                     SkXfermode::kSrcOver_Mode).hasSecondaryOutput();
+    }
+    // We fallback on the shader XP when the blend formula would use dual source blending but we
+    // don't have support for it.
+    return get_blend_formula(optimizations.fColorPOI, optimizations.fCoveragePOI,
+                             hasMixedSamples, SkXfermode::kSrcOver_Mode).hasSecondaryOutput();
+}
+
diff --git a/gfx/skia/skia/src/gpu/effects/GrRRectEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrRRectEffect.cpp
index 277f6df1a7df..c45f5f309c20 100644
--- a/gfx/skia/skia/src/gpu/effects/GrRRectEffect.cpp
+++ b/gfx/skia/skia/src/gpu/effects/GrRRectEffect.cpp
@@ -7,23 +7,22 @@
 
 #include "GrRRectEffect.h"
 
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
-#include "gl/GrGLSL.h"
 #include "GrConvexPolyEffect.h"
+#include "GrFragmentProcessor.h"
+#include "GrInvariantOutput.h"
 #include "GrOvalEffect.h"
-#include "GrTBackendEffectFactory.h"
-
 #include "SkRRect.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
 
 // The effects defined here only handle rrect radii >= kRadiusMin.
 static const SkScalar kRadiusMin = SK_ScalarHalf;
 
 //////////////////////////////////////////////////////////////////////////////
 
-class GLCircularRRectEffect;
-
-class CircularRRectEffect : public GrEffect {
+class CircularRRectEffect : public GrFragmentProcessor {
 public:
 
     enum CornerFlags {
@@ -45,143 +44,129 @@ public:
 
     // The flags are used to indicate which corners are circluar (unflagged corners are assumed to
     // be square).
-    static GrEffect* Create(GrEffectEdgeType, uint32_t circularCornerFlags, const SkRRect&);
+    static GrFragmentProcessor* Create(GrPrimitiveEdgeType, uint32_t circularCornerFlags,
+                                       const SkRRect&);
 
     virtual ~CircularRRectEffect() {};
-    static const char* Name() { return "CircularRRect"; }
+
+    const char* name() const override { return "CircularRRect"; }
 
     const SkRRect& getRRect() const { return fRRect; }
 
     uint32_t getCircularCornerFlags() const { return fCircularCornerFlags; }
 
-    GrEffectEdgeType getEdgeType() const { return fEdgeType; }
-
-    typedef GLCircularRRectEffect GLEffect;
-
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
+    GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
 
 private:
-    CircularRRectEffect(GrEffectEdgeType, uint32_t circularCornerFlags, const SkRRect&);
+    CircularRRectEffect(GrPrimitiveEdgeType, uint32_t circularCornerFlags, const SkRRect&);
 
-    virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE;
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
 
-    SkRRect             fRRect;
-    GrEffectEdgeType    fEdgeType;
-    uint32_t            fCircularCornerFlags;
+    void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
 
-    GR_DECLARE_EFFECT_TEST;
+    bool onIsEqual(const GrFragmentProcessor& other) const override;
 
-    typedef GrEffect INHERITED;
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
+
+    SkRRect                fRRect;
+    GrPrimitiveEdgeType    fEdgeType;
+    uint32_t               fCircularCornerFlags;
+
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+
+    typedef GrFragmentProcessor INHERITED;
 };
 
-GrEffect* CircularRRectEffect::Create(GrEffectEdgeType edgeType,
-                                      uint32_t circularCornerFlags,
-                                      const SkRRect& rrect) {
-    if (kFillAA_GrEffectEdgeType != edgeType && kInverseFillAA_GrEffectEdgeType != edgeType) {
-        return NULL;
+GrFragmentProcessor* CircularRRectEffect::Create(GrPrimitiveEdgeType edgeType,
+                                                 uint32_t circularCornerFlags,
+                                                 const SkRRect& rrect) {
+    if (kFillAA_GrProcessorEdgeType != edgeType && kInverseFillAA_GrProcessorEdgeType != edgeType) {
+        return nullptr;
     }
-    return SkNEW_ARGS(CircularRRectEffect, (edgeType, circularCornerFlags, rrect));
+    return new CircularRRectEffect(edgeType, circularCornerFlags, rrect);
 }
 
-void CircularRRectEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
-    *validFlags = 0;
+void CircularRRectEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const {
+    inout->mulByUnknownSingleComponent();
 }
 
-const GrBackendEffectFactory& CircularRRectEffect::getFactory() const {
-    return GrTBackendEffectFactory<CircularRRectEffect>::getInstance();
-}
-
-CircularRRectEffect::CircularRRectEffect(GrEffectEdgeType edgeType, uint32_t circularCornerFlags,
-                         const SkRRect& rrect)
+CircularRRectEffect::CircularRRectEffect(GrPrimitiveEdgeType edgeType, uint32_t circularCornerFlags,
+                                         const SkRRect& rrect)
     : fRRect(rrect)
     , fEdgeType(edgeType)
     , fCircularCornerFlags(circularCornerFlags) {
+    this->initClassID<CircularRRectEffect>();
     this->setWillReadFragmentPosition();
 }
 
-bool CircularRRectEffect::onIsEqual(const GrEffect& other) const {
-    const CircularRRectEffect& crre = CastEffect<CircularRRectEffect>(other);
+bool CircularRRectEffect::onIsEqual(const GrFragmentProcessor& other) const {
+    const CircularRRectEffect& crre = other.cast<CircularRRectEffect>();
     // The corner flags are derived from fRRect, so no need to check them.
     return fEdgeType == crre.fEdgeType && fRRect == crre.fRRect;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-GR_DEFINE_EFFECT_TEST(CircularRRectEffect);
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(CircularRRectEffect);
 
-GrEffect* CircularRRectEffect::TestCreate(SkRandom* random,
-                                          GrContext*,
-                                          const GrDrawTargetCaps& caps,
-                                          GrTexture*[]) {
-    SkScalar w = random->nextRangeScalar(20.f, 1000.f);
-    SkScalar h = random->nextRangeScalar(20.f, 1000.f);
-    SkScalar r = random->nextRangeF(kRadiusMin, 9.f);
+const GrFragmentProcessor* CircularRRectEffect::TestCreate(GrProcessorTestData* d) {
+    SkScalar w = d->fRandom->nextRangeScalar(20.f, 1000.f);
+    SkScalar h = d->fRandom->nextRangeScalar(20.f, 1000.f);
+    SkScalar r = d->fRandom->nextRangeF(kRadiusMin, 9.f);
     SkRRect rrect;
     rrect.setRectXY(SkRect::MakeWH(w, h), r, r);
-    GrEffect* effect;
+    GrFragmentProcessor* fp;
     do {
-        GrEffectEdgeType et = (GrEffectEdgeType)random->nextULessThan(kGrEffectEdgeTypeCnt);
-        effect = GrRRectEffect::Create(et, rrect);
-    } while (NULL == effect);
-    return effect;
+        GrPrimitiveEdgeType et =
+                (GrPrimitiveEdgeType)d->fRandom->nextULessThan(kGrProcessorEdgeTypeCnt);
+        fp = GrRRectEffect::Create(et, rrect);
+    } while (nullptr == fp);
+    return fp;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-class GLCircularRRectEffect : public GrGLEffect {
+class GLCircularRRectEffect : public GrGLSLFragmentProcessor {
 public:
-    GLCircularRRectEffect(const GrBackendEffectFactory&, const GrDrawEffect&);
+    GLCircularRRectEffect(const GrProcessor&);
 
-    virtual void emitCode(GrGLShaderBuilder* builder,
-                          const GrDrawEffect& drawEffect,
-                          const GrEffectKey& key,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    virtual void emitCode(EmitArgs&) override;
 
-    static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*);
+    static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*);
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
 
 private:
-    GrGLUniformManager::UniformHandle   fInnerRectUniform;
-    GrGLUniformManager::UniformHandle   fRadiusPlusHalfUniform;
-    SkRRect                             fPrevRRect;
-    typedef GrGLEffect INHERITED;
+    GrGLSLProgramDataManager::UniformHandle fInnerRectUniform;
+    GrGLSLProgramDataManager::UniformHandle fRadiusPlusHalfUniform;
+    SkRRect                               fPrevRRect;
+    typedef GrGLSLFragmentProcessor INHERITED;
 };
 
-GLCircularRRectEffect::GLCircularRRectEffect(const GrBackendEffectFactory& factory,
-                             const GrDrawEffect& drawEffect)
-    : INHERITED (factory) {
+GLCircularRRectEffect::GLCircularRRectEffect(const GrProcessor& ) {
     fPrevRRect.setEmpty();
 }
 
-void GLCircularRRectEffect::emitCode(GrGLShaderBuilder* builder,
-                             const GrDrawEffect& drawEffect,
-                             const GrEffectKey& key,
-                             const char* outputColor,
-                             const char* inputColor,
-                             const TransformedCoordsArray&,
-                             const TextureSamplerArray& samplers) {
-    const CircularRRectEffect& crre = drawEffect.castEffect<CircularRRectEffect>();
+void GLCircularRRectEffect::emitCode(EmitArgs& args) {
+    const CircularRRectEffect& crre = args.fFp.cast<CircularRRectEffect>();
     const char *rectName;
     const char *radiusPlusHalfName;
     // The inner rect is the rrect bounds inset by the radius. Its left, top, right, and bottom
     // edges correspond to components x, y, z, and w, respectively. When a side of the rrect has
     // only rectangular corners, that side's value corresponds to the rect edge's value outset by
     // half a pixel.
-    fInnerRectUniform = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                            kVec4f_GrSLType,
-                                            "innerRect",
-                                            &rectName);
-    fRadiusPlusHalfUniform = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                                 kFloat_GrSLType,
-                                                 "radiusPlusHalf",
-                                                 &radiusPlusHalfName);
-    const char* fragmentPos = builder->fragmentPosition();
+    fInnerRectUniform = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                                  kVec4f_GrSLType, kDefault_GrSLPrecision,
+                                                  "innerRect",
+                                                  &rectName);
+    fRadiusPlusHalfUniform = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                                       kFloat_GrSLType, kDefault_GrSLPrecision,
+                                                       "radiusPlusHalf",
+                                                       &radiusPlusHalfName);
+
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    const char* fragmentPos = fragBuilder->fragmentPosition();
     // At each quarter-circle corner we compute a vector that is the offset of the fragment position
     // from the circle center. The vector is pinned in x and y to be in the quarter-plane relevant
     // to that corner. This means that points near the interior near the rrect top edge will have
@@ -199,108 +184,116 @@ void GLCircularRRectEffect::emitCode(GrGLShaderBuilder* builder,
     // alphas together.
     switch (crre.getCircularCornerFlags()) {
         case CircularRRectEffect::kAll_CornerFlags:
-            builder->fsCodeAppendf("\t\tvec2 dxy0 = %s.xy - %s.xy;\n", rectName, fragmentPos);
-            builder->fsCodeAppendf("\t\tvec2 dxy1 = %s.xy - %s.zw;\n", fragmentPos, rectName);
-            builder->fsCodeAppend("\t\tvec2 dxy = max(max(dxy0, dxy1), 0.0);\n");
-            builder->fsCodeAppendf("\t\tfloat alpha = clamp(%s - length(dxy), 0.0, 1.0);\n",
+            fragBuilder->codeAppendf("\t\tvec2 dxy0 = %s.xy - %s.xy;\n", rectName, fragmentPos);
+            fragBuilder->codeAppendf("\t\tvec2 dxy1 = %s.xy - %s.zw;\n", fragmentPos, rectName);
+            fragBuilder->codeAppend("\t\tvec2 dxy = max(max(dxy0, dxy1), 0.0);\n");
+            fragBuilder->codeAppendf("\t\tfloat alpha = clamp(%s - length(dxy), 0.0, 1.0);\n",
                                    radiusPlusHalfName);
             break;
         case CircularRRectEffect::kTopLeft_CornerFlag:
-            builder->fsCodeAppendf("\t\tvec2 dxy = max(%s.xy - %s.xy, 0.0);\n",
-                                   rectName, fragmentPos);
-            builder->fsCodeAppendf("\t\tfloat rightAlpha = clamp(%s.z - %s.x, 0.0, 1.0);\n",
-                                    rectName, fragmentPos);
-            builder->fsCodeAppendf("\t\tfloat bottomAlpha = clamp(%s.w - %s.y, 0.0, 1.0);\n",
-                                    rectName, fragmentPos);
-            builder->fsCodeAppendf("\t\tfloat alpha = bottomAlpha * rightAlpha * clamp(%s - length(dxy), 0.0, 1.0);\n",
-                                   radiusPlusHalfName);
+            fragBuilder->codeAppendf("\t\tvec2 dxy = max(%s.xy - %s.xy, 0.0);\n",
+                                     rectName, fragmentPos);
+            fragBuilder->codeAppendf("\t\tfloat rightAlpha = clamp(%s.z - %s.x, 0.0, 1.0);\n",
+                                     rectName, fragmentPos);
+            fragBuilder->codeAppendf("\t\tfloat bottomAlpha = clamp(%s.w - %s.y, 0.0, 1.0);\n",
+                                     rectName, fragmentPos);
+            fragBuilder->codeAppendf(
+                "\t\tfloat alpha = bottomAlpha * rightAlpha * clamp(%s - length(dxy), 0.0, 1.0);\n",
+                radiusPlusHalfName);
             break;
         case CircularRRectEffect::kTopRight_CornerFlag:
-            builder->fsCodeAppendf("\t\tvec2 dxy = max(vec2(%s.x - %s.z, %s.y - %s.y), 0.0);\n",
-                                   fragmentPos, rectName, rectName, fragmentPos);
-            builder->fsCodeAppendf("\t\tfloat leftAlpha = clamp(%s.x - %s.x, 0.0, 1.0);\n",
-                                   fragmentPos, rectName);
-            builder->fsCodeAppendf("\t\tfloat bottomAlpha = clamp(%s.w - %s.y, 0.0, 1.0);\n",
-                                    rectName, fragmentPos);
-            builder->fsCodeAppendf("\t\tfloat alpha = bottomAlpha * leftAlpha * clamp(%s - length(dxy), 0.0, 1.0);\n",
-                                   radiusPlusHalfName);
+            fragBuilder->codeAppendf("\t\tvec2 dxy = max(vec2(%s.x - %s.z, %s.y - %s.y), 0.0);\n",
+                                     fragmentPos, rectName, rectName, fragmentPos);
+            fragBuilder->codeAppendf("\t\tfloat leftAlpha = clamp(%s.x - %s.x, 0.0, 1.0);\n",
+                                     fragmentPos, rectName);
+            fragBuilder->codeAppendf("\t\tfloat bottomAlpha = clamp(%s.w - %s.y, 0.0, 1.0);\n",
+                                     rectName, fragmentPos);
+            fragBuilder->codeAppendf(
+                "\t\tfloat alpha = bottomAlpha * leftAlpha * clamp(%s - length(dxy), 0.0, 1.0);\n",
+                radiusPlusHalfName);
             break;
         case CircularRRectEffect::kBottomRight_CornerFlag:
-            builder->fsCodeAppendf("\t\tvec2 dxy = max(%s.xy - %s.zw, 0.0);\n",
-                                   fragmentPos, rectName);
-            builder->fsCodeAppendf("\t\tfloat leftAlpha = clamp(%s.x - %s.x, 0.0, 1.0);\n",
-                                   fragmentPos, rectName);
-            builder->fsCodeAppendf("\t\tfloat topAlpha = clamp(%s.y - %s.y, 0.0, 1.0);\n",
-                                   fragmentPos, rectName);
-            builder->fsCodeAppendf("\t\tfloat alpha = topAlpha * leftAlpha * clamp(%s - length(dxy), 0.0, 1.0);\n",
-                                   radiusPlusHalfName);
+            fragBuilder->codeAppendf("\t\tvec2 dxy = max(%s.xy - %s.zw, 0.0);\n",
+                                     fragmentPos, rectName);
+            fragBuilder->codeAppendf("\t\tfloat leftAlpha = clamp(%s.x - %s.x, 0.0, 1.0);\n",
+                                     fragmentPos, rectName);
+            fragBuilder->codeAppendf("\t\tfloat topAlpha = clamp(%s.y - %s.y, 0.0, 1.0);\n",
+                                     fragmentPos, rectName);
+            fragBuilder->codeAppendf(
+                "\t\tfloat alpha = topAlpha * leftAlpha * clamp(%s - length(dxy), 0.0, 1.0);\n",
+                radiusPlusHalfName);
             break;
         case CircularRRectEffect::kBottomLeft_CornerFlag:
-            builder->fsCodeAppendf("\t\tvec2 dxy = max(vec2(%s.x - %s.x, %s.y - %s.w), 0.0);\n",
-                                   rectName, fragmentPos, fragmentPos, rectName);
-            builder->fsCodeAppendf("\t\tfloat rightAlpha = clamp(%s.z - %s.x, 0.0, 1.0);\n",
-                                    rectName, fragmentPos);
-            builder->fsCodeAppendf("\t\tfloat topAlpha = clamp(%s.y - %s.y, 0.0, 1.0);\n",
-                                   fragmentPos, rectName);
-            builder->fsCodeAppendf("\t\tfloat alpha = topAlpha * rightAlpha * clamp(%s - length(dxy), 0.0, 1.0);\n",
-                                   radiusPlusHalfName);
+            fragBuilder->codeAppendf("\t\tvec2 dxy = max(vec2(%s.x - %s.x, %s.y - %s.w), 0.0);\n",
+                                     rectName, fragmentPos, fragmentPos, rectName);
+            fragBuilder->codeAppendf("\t\tfloat rightAlpha = clamp(%s.z - %s.x, 0.0, 1.0);\n",
+                                     rectName, fragmentPos);
+            fragBuilder->codeAppendf("\t\tfloat topAlpha = clamp(%s.y - %s.y, 0.0, 1.0);\n",
+                                     fragmentPos, rectName);
+            fragBuilder->codeAppendf(
+                "\t\tfloat alpha = topAlpha * rightAlpha * clamp(%s - length(dxy), 0.0, 1.0);\n",
+                radiusPlusHalfName);
             break;
         case CircularRRectEffect::kLeft_CornerFlags:
-            builder->fsCodeAppendf("\t\tvec2 dxy0 = %s.xy - %s.xy;\n", rectName, fragmentPos);
-            builder->fsCodeAppendf("\t\tfloat dy1 = %s.y - %s.w;\n", fragmentPos, rectName);
-            builder->fsCodeAppend("\t\tvec2 dxy = max(vec2(dxy0.x, max(dxy0.y, dy1)), 0.0);\n");
-            builder->fsCodeAppendf("\t\tfloat rightAlpha = clamp(%s.z - %s.x, 0.0, 1.0);\n",
-                                    rectName, fragmentPos);
-            builder->fsCodeAppendf("\t\tfloat alpha = rightAlpha * clamp(%s - length(dxy), 0.0, 1.0);\n",
-                                   radiusPlusHalfName);
+            fragBuilder->codeAppendf("\t\tvec2 dxy0 = %s.xy - %s.xy;\n", rectName, fragmentPos);
+            fragBuilder->codeAppendf("\t\tfloat dy1 = %s.y - %s.w;\n", fragmentPos, rectName);
+            fragBuilder->codeAppend("\t\tvec2 dxy = max(vec2(dxy0.x, max(dxy0.y, dy1)), 0.0);\n");
+            fragBuilder->codeAppendf("\t\tfloat rightAlpha = clamp(%s.z - %s.x, 0.0, 1.0);\n",
+                                     rectName, fragmentPos);
+            fragBuilder->codeAppendf(
+                "\t\tfloat alpha = rightAlpha * clamp(%s - length(dxy), 0.0, 1.0);\n",
+                radiusPlusHalfName);
             break;
         case CircularRRectEffect::kTop_CornerFlags:
-            builder->fsCodeAppendf("\t\tvec2 dxy0 = %s.xy - %s.xy;\n", rectName, fragmentPos);
-            builder->fsCodeAppendf("\t\tfloat dx1 = %s.x - %s.z;\n", fragmentPos, rectName);
-            builder->fsCodeAppend("\t\tvec2 dxy = max(vec2(max(dxy0.x, dx1), dxy0.y), 0.0);\n");
-            builder->fsCodeAppendf("\t\tfloat bottomAlpha = clamp(%s.w - %s.y, 0.0, 1.0);\n",
-                                   rectName, fragmentPos);
-            builder->fsCodeAppendf("\t\tfloat alpha = bottomAlpha * clamp(%s - length(dxy), 0.0, 1.0);\n",
-                                   radiusPlusHalfName);
+            fragBuilder->codeAppendf("\t\tvec2 dxy0 = %s.xy - %s.xy;\n", rectName, fragmentPos);
+            fragBuilder->codeAppendf("\t\tfloat dx1 = %s.x - %s.z;\n", fragmentPos, rectName);
+            fragBuilder->codeAppend("\t\tvec2 dxy = max(vec2(max(dxy0.x, dx1), dxy0.y), 0.0);\n");
+            fragBuilder->codeAppendf("\t\tfloat bottomAlpha = clamp(%s.w - %s.y, 0.0, 1.0);\n",
+                                     rectName, fragmentPos);
+            fragBuilder->codeAppendf(
+                "\t\tfloat alpha = bottomAlpha * clamp(%s - length(dxy), 0.0, 1.0);\n",
+                radiusPlusHalfName);
             break;
         case CircularRRectEffect::kRight_CornerFlags:
-            builder->fsCodeAppendf("\t\tfloat dy0 = %s.y - %s.y;\n", rectName, fragmentPos);
-            builder->fsCodeAppendf("\t\tvec2 dxy1 = %s.xy - %s.zw;\n", fragmentPos, rectName);
-            builder->fsCodeAppend("\t\tvec2 dxy = max(vec2(dxy1.x, max(dy0, dxy1.y)), 0.0);\n");
-            builder->fsCodeAppendf("\t\tfloat leftAlpha = clamp(%s.x - %s.x, 0.0, 1.0);\n",
-                                   fragmentPos, rectName);
-            builder->fsCodeAppendf("\t\tfloat alpha = leftAlpha * clamp(%s - length(dxy), 0.0, 1.0);\n",
-                                   radiusPlusHalfName);
+            fragBuilder->codeAppendf("\t\tfloat dy0 = %s.y - %s.y;\n", rectName, fragmentPos);
+            fragBuilder->codeAppendf("\t\tvec2 dxy1 = %s.xy - %s.zw;\n", fragmentPos, rectName);
+            fragBuilder->codeAppend("\t\tvec2 dxy = max(vec2(dxy1.x, max(dy0, dxy1.y)), 0.0);\n");
+            fragBuilder->codeAppendf("\t\tfloat leftAlpha = clamp(%s.x - %s.x, 0.0, 1.0);\n",
+                                     fragmentPos, rectName);
+            fragBuilder->codeAppendf(
+                "\t\tfloat alpha = leftAlpha * clamp(%s - length(dxy), 0.0, 1.0);\n",
+                radiusPlusHalfName);
             break;
         case CircularRRectEffect::kBottom_CornerFlags:
-            builder->fsCodeAppendf("\t\tfloat dx0 = %s.x - %s.x;\n", rectName, fragmentPos);
-            builder->fsCodeAppendf("\t\tvec2 dxy1 = %s.xy - %s.zw;\n", fragmentPos, rectName);
-            builder->fsCodeAppend("\t\tvec2 dxy = max(vec2(max(dx0, dxy1.x), dxy1.y), 0.0);\n");
-            builder->fsCodeAppendf("\t\tfloat topAlpha = clamp(%s.y - %s.y, 0.0, 1.0);\n",
-                                   fragmentPos, rectName);
-            builder->fsCodeAppendf("\t\tfloat alpha = topAlpha * clamp(%s - length(dxy), 0.0, 1.0);\n",
-                                   radiusPlusHalfName);
+            fragBuilder->codeAppendf("\t\tfloat dx0 = %s.x - %s.x;\n", rectName, fragmentPos);
+            fragBuilder->codeAppendf("\t\tvec2 dxy1 = %s.xy - %s.zw;\n", fragmentPos, rectName);
+            fragBuilder->codeAppend("\t\tvec2 dxy = max(vec2(max(dx0, dxy1.x), dxy1.y), 0.0);\n");
+            fragBuilder->codeAppendf("\t\tfloat topAlpha = clamp(%s.y - %s.y, 0.0, 1.0);\n",
+                                     fragmentPos, rectName);
+            fragBuilder->codeAppendf(
+                "\t\tfloat alpha = topAlpha * clamp(%s - length(dxy), 0.0, 1.0);\n",
+                radiusPlusHalfName);
             break;
     }
 
-    if (kInverseFillAA_GrEffectEdgeType == crre.getEdgeType()) {
-        builder->fsCodeAppend("\t\talpha = 1.0 - alpha;\n");
+    if (kInverseFillAA_GrProcessorEdgeType == crre.getEdgeType()) {
+        fragBuilder->codeAppend("\t\talpha = 1.0 - alpha;\n");
     }
 
-    builder->fsCodeAppendf("\t\t%s = %s;\n", outputColor,
-                           (GrGLSLExpr4(inputColor) * GrGLSLExpr1("alpha")).c_str());
+    fragBuilder->codeAppendf("\t\t%s = %s;\n", args.fOutputColor,
+                             (GrGLSLExpr4(args.fInputColor) * GrGLSLExpr1("alpha")).c_str());
 }
 
-void GLCircularRRectEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
-                                   GrEffectKeyBuilder* b) {
-    const CircularRRectEffect& crre = drawEffect.castEffect<CircularRRectEffect>();
-    GR_STATIC_ASSERT(kGrEffectEdgeTypeCnt <= 8);
+void GLCircularRRectEffect::GenKey(const GrProcessor& processor, const GrGLSLCaps&,
+                                   GrProcessorKeyBuilder* b) {
+    const CircularRRectEffect& crre = processor.cast<CircularRRectEffect>();
+    GR_STATIC_ASSERT(kGrProcessorEdgeTypeCnt <= 8);
     b->add32((crre.getCircularCornerFlags() << 3) | crre.getEdgeType());
 }
 
-void GLCircularRRectEffect::setData(const GrGLUniformManager& uman,
-                                    const GrDrawEffect& drawEffect) {
-    const CircularRRectEffect& crre = drawEffect.castEffect<CircularRRectEffect>();
+void GLCircularRRectEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                                      const GrProcessor& processor) {
+    const CircularRRectEffect& crre = processor.cast<CircularRRectEffect>();
     const SkRRect& rrect = crre.getRRect();
     if (rrect != fPrevRRect) {
         SkRect rect = rrect.getBounds();
@@ -371,95 +364,99 @@ void GLCircularRRectEffect::setData(const GrGLUniformManager& uman,
             default:
                 SkFAIL("Should have been one of the above cases.");
         }
-        uman.set4f(fInnerRectUniform, rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
-        uman.set1f(fRadiusPlusHalfUniform, radius + 0.5f);
+        pdman.set4f(fInnerRectUniform, rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
+        pdman.set1f(fRadiusPlusHalfUniform, radius + 0.5f);
         fPrevRRect = rrect;
     }
 }
 
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+void CircularRRectEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                                GrProcessorKeyBuilder* b) const {
+    GLCircularRRectEffect::GenKey(*this, caps, b);
+}
+
+GrGLSLFragmentProcessor* CircularRRectEffect::onCreateGLSLInstance() const  {
+    return new GLCircularRRectEffect(*this);
+}
+
 //////////////////////////////////////////////////////////////////////////////
 
-class GLEllipticalRRectEffect;
-
-class EllipticalRRectEffect : public GrEffect {
+class EllipticalRRectEffect : public GrFragmentProcessor {
 public:
-    static GrEffect* Create(GrEffectEdgeType, const SkRRect&);
+    static GrFragmentProcessor* Create(GrPrimitiveEdgeType, const SkRRect&);
 
     virtual ~EllipticalRRectEffect() {};
-    static const char* Name() { return "EllipticalRRect"; }
+
+    const char* name() const override { return "EllipticalRRect"; }
 
     const SkRRect& getRRect() const { return fRRect; }
 
-
-    GrEffectEdgeType getEdgeType() const { return fEdgeType; }
-
-    typedef GLEllipticalRRectEffect GLEffect;
-
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
+    GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
 
 private:
-    EllipticalRRectEffect(GrEffectEdgeType, const SkRRect&);
+    EllipticalRRectEffect(GrPrimitiveEdgeType, const SkRRect&);
 
-    virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE;
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
+
+    bool onIsEqual(const GrFragmentProcessor& other) const override;
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
 
     SkRRect             fRRect;
-    GrEffectEdgeType    fEdgeType;
+    GrPrimitiveEdgeType    fEdgeType;
 
-    GR_DECLARE_EFFECT_TEST;
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
 
-    typedef GrEffect INHERITED;
+    typedef GrFragmentProcessor INHERITED;
 };
 
-GrEffect* EllipticalRRectEffect::Create(GrEffectEdgeType edgeType, const SkRRect& rrect) {
-    if (kFillAA_GrEffectEdgeType != edgeType && kInverseFillAA_GrEffectEdgeType != edgeType) {
-        return NULL;
+GrFragmentProcessor*
+EllipticalRRectEffect::Create(GrPrimitiveEdgeType edgeType, const SkRRect& rrect) {
+    if (kFillAA_GrProcessorEdgeType != edgeType && kInverseFillAA_GrProcessorEdgeType != edgeType) {
+        return nullptr;
     }
-    return SkNEW_ARGS(EllipticalRRectEffect, (edgeType, rrect));
+    return new EllipticalRRectEffect(edgeType, rrect);
 }
 
-void EllipticalRRectEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
-    *validFlags = 0;
+void EllipticalRRectEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const {
+    inout->mulByUnknownSingleComponent();
 }
 
-const GrBackendEffectFactory& EllipticalRRectEffect::getFactory() const {
-    return GrTBackendEffectFactory<EllipticalRRectEffect>::getInstance();
-}
-
-EllipticalRRectEffect::EllipticalRRectEffect(GrEffectEdgeType edgeType, const SkRRect& rrect)
+EllipticalRRectEffect::EllipticalRRectEffect(GrPrimitiveEdgeType edgeType, const SkRRect& rrect)
     : fRRect(rrect)
-    , fEdgeType(edgeType){
+    , fEdgeType(edgeType) {
+    this->initClassID<EllipticalRRectEffect>();
     this->setWillReadFragmentPosition();
 }
 
-bool EllipticalRRectEffect::onIsEqual(const GrEffect& other) const {
-    const EllipticalRRectEffect& erre = CastEffect<EllipticalRRectEffect>(other);
+bool EllipticalRRectEffect::onIsEqual(const GrFragmentProcessor& other) const {
+    const EllipticalRRectEffect& erre = other.cast<EllipticalRRectEffect>();
     return fEdgeType == erre.fEdgeType && fRRect == erre.fRRect;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-GR_DEFINE_EFFECT_TEST(EllipticalRRectEffect);
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(EllipticalRRectEffect);
 
-GrEffect* EllipticalRRectEffect::TestCreate(SkRandom* random,
-                                            GrContext*,
-                                            const GrDrawTargetCaps& caps,
-                                            GrTexture*[]) {
-    SkScalar w = random->nextRangeScalar(20.f, 1000.f);
-    SkScalar h = random->nextRangeScalar(20.f, 1000.f);
+const GrFragmentProcessor* EllipticalRRectEffect::TestCreate(GrProcessorTestData* d) {
+    SkScalar w = d->fRandom->nextRangeScalar(20.f, 1000.f);
+    SkScalar h = d->fRandom->nextRangeScalar(20.f, 1000.f);
     SkVector r[4];
-    r[SkRRect::kUpperLeft_Corner].fX = random->nextRangeF(kRadiusMin, 9.f);
+    r[SkRRect::kUpperLeft_Corner].fX = d->fRandom->nextRangeF(kRadiusMin, 9.f);
     // ensure at least one corner really is elliptical
     do {
-        r[SkRRect::kUpperLeft_Corner].fY = random->nextRangeF(kRadiusMin, 9.f);
+        r[SkRRect::kUpperLeft_Corner].fY = d->fRandom->nextRangeF(kRadiusMin, 9.f);
     } while (r[SkRRect::kUpperLeft_Corner].fY == r[SkRRect::kUpperLeft_Corner].fX);
 
     SkRRect rrect;
-    if (random->nextBool()) {
+    if (d->fRandom->nextBool()) {
         // half the time create a four-radii rrect.
-        r[SkRRect::kLowerRight_Corner].fX = random->nextRangeF(kRadiusMin, 9.f);
-        r[SkRRect::kLowerRight_Corner].fY = random->nextRangeF(kRadiusMin, 9.f);
+        r[SkRRect::kLowerRight_Corner].fX = d->fRandom->nextRangeF(kRadiusMin, 9.f);
+        r[SkRRect::kLowerRight_Corner].fY = d->fRandom->nextRangeF(kRadiusMin, 9.f);
 
         r[SkRRect::kUpperRight_Corner].fX = r[SkRRect::kLowerRight_Corner].fX;
         r[SkRRect::kUpperRight_Corner].fY = r[SkRRect::kUpperLeft_Corner].fY;
@@ -472,60 +469,50 @@ GrEffect* EllipticalRRectEffect::TestCreate(SkRandom* random,
         rrect.setRectXY(SkRect::MakeWH(w, h), r[SkRRect::kUpperLeft_Corner].fX,
                                               r[SkRRect::kUpperLeft_Corner].fY);
     }
-    GrEffect* effect;
+    GrFragmentProcessor* fp;
     do {
-        GrEffectEdgeType et = (GrEffectEdgeType)random->nextULessThan(kGrEffectEdgeTypeCnt);
-        effect = GrRRectEffect::Create(et, rrect);
-    } while (NULL == effect);
-    return effect;
+        GrPrimitiveEdgeType et =
+                (GrPrimitiveEdgeType)d->fRandom->nextULessThan(kGrProcessorEdgeTypeCnt);
+        fp = GrRRectEffect::Create(et, rrect);
+    } while (nullptr == fp);
+    return fp;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-class GLEllipticalRRectEffect : public GrGLEffect {
+class GLEllipticalRRectEffect : public GrGLSLFragmentProcessor {
 public:
-    GLEllipticalRRectEffect(const GrBackendEffectFactory&, const GrDrawEffect&);
+    GLEllipticalRRectEffect(const GrProcessor&);
 
-    virtual void emitCode(GrGLShaderBuilder* builder,
-                          const GrDrawEffect& drawEffect,
-                          const GrEffectKey& key,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    virtual void emitCode(EmitArgs&) override;
 
-    static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*);
+    static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*);
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
 
 private:
-    GrGLUniformManager::UniformHandle   fInnerRectUniform;
-    GrGLUniformManager::UniformHandle   fInvRadiiSqdUniform;
-    SkRRect                             fPrevRRect;
-    typedef GrGLEffect INHERITED;
+    GrGLSLProgramDataManager::UniformHandle fInnerRectUniform;
+    GrGLSLProgramDataManager::UniformHandle fInvRadiiSqdUniform;
+    SkRRect                               fPrevRRect;
+    typedef GrGLSLFragmentProcessor INHERITED;
 };
 
-GLEllipticalRRectEffect::GLEllipticalRRectEffect(const GrBackendEffectFactory& factory,
-                             const GrDrawEffect& drawEffect)
-    : INHERITED (factory) {
+GLEllipticalRRectEffect::GLEllipticalRRectEffect(const GrProcessor& effect) {
     fPrevRRect.setEmpty();
 }
 
-void GLEllipticalRRectEffect::emitCode(GrGLShaderBuilder* builder,
-                                       const GrDrawEffect& drawEffect,
-                                       const GrEffectKey& key,
-                                       const char* outputColor,
-                                       const char* inputColor,
-                                       const TransformedCoordsArray&,
-                                       const TextureSamplerArray& samplers) {
-    const EllipticalRRectEffect& erre = drawEffect.castEffect<EllipticalRRectEffect>();
+void GLEllipticalRRectEffect::emitCode(EmitArgs& args) {
+    const EllipticalRRectEffect& erre = args.fFp.cast<EllipticalRRectEffect>();
     const char *rectName;
     // The inner rect is the rrect bounds inset by the x/y radii
-    fInnerRectUniform = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                            kVec4f_GrSLType,
+    fInnerRectUniform = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                            kVec4f_GrSLType, kDefault_GrSLPrecision,
                                             "innerRect",
                                             &rectName);
-    const char* fragmentPos = builder->fragmentPosition();
+
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    const char* fragmentPos = fragBuilder->fragmentPosition();
     // At each quarter-ellipse corner we compute a vector that is the offset of the fragment pos
     // to the ellipse center. The vector is pinned in x and y to be in the quarter-plane relevant
     // to that corner. This means that points near the interior near the rrect top edge will have
@@ -534,68 +521,72 @@ void GLEllipticalRRectEffect::emitCode(GrGLShaderBuilder* builder,
     // fragments near the other three edges will get the correct AA. Fragments in the interior of
     // the rrect will have a (0,0) vector at all four corners. So long as the radii > 0.5 they will
     // correctly produce an alpha value of 1 at all four corners. We take the min of all the alphas.
+    //
     // The code below is a simplified version of the above that performs maxs on the vector
     // components before computing distances and alpha values so that only one distance computation
     // need be computed to determine the min alpha.
-    builder->fsCodeAppendf("\t\tvec2 dxy0 = %s.xy - %s.xy;\n", rectName, fragmentPos);
-    builder->fsCodeAppendf("\t\tvec2 dxy1 = %s.xy - %s.zw;\n", fragmentPos, rectName);
+    fragBuilder->codeAppendf("\t\tvec2 dxy0 = %s.xy - %s.xy;\n", rectName, fragmentPos);
+    fragBuilder->codeAppendf("\t\tvec2 dxy1 = %s.xy - %s.zw;\n", fragmentPos, rectName);
+    // The uniforms with the inv squared radii are highp to prevent underflow.
     switch (erre.getRRect().getType()) {
         case SkRRect::kSimple_Type: {
             const char *invRadiiXYSqdName;
-            fInvRadiiSqdUniform = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                                      kVec2f_GrSLType,
-                                                      "invRadiiXY",
-                                                      &invRadiiXYSqdName);
-            builder->fsCodeAppend("\t\tvec2 dxy = max(max(dxy0, dxy1), 0.0);\n");
+            fInvRadiiSqdUniform = args.fBuilder->addUniform(
+                                                         GrGLSLProgramBuilder::kFragment_Visibility,
+                                                         kVec2f_GrSLType, kHigh_GrSLPrecision,
+                                                         "invRadiiXY",
+                                                         &invRadiiXYSqdName);
+            fragBuilder->codeAppend("\t\tvec2 dxy = max(max(dxy0, dxy1), 0.0);\n");
             // Z is the x/y offsets divided by squared radii.
-            builder->fsCodeAppendf("\t\tvec2 Z = dxy * %s;\n", invRadiiXYSqdName);
+            fragBuilder->codeAppendf("\t\tvec2 Z = dxy * %s;\n", invRadiiXYSqdName);
             break;
         }
         case SkRRect::kNinePatch_Type: {
             const char *invRadiiLTRBSqdName;
-            fInvRadiiSqdUniform = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                                      kVec4f_GrSLType,
-                                                      "invRadiiLTRB",
-                                                      &invRadiiLTRBSqdName);
-            builder->fsCodeAppend("\t\tvec2 dxy = max(max(dxy0, dxy1), 0.0);\n");
+            fInvRadiiSqdUniform = args.fBuilder->addUniform(
+                                                         GrGLSLProgramBuilder::kFragment_Visibility,
+                                                         kVec4f_GrSLType, kHigh_GrSLPrecision,
+                                                         "invRadiiLTRB",
+                                                         &invRadiiLTRBSqdName);
+            fragBuilder->codeAppend("\t\tvec2 dxy = max(max(dxy0, dxy1), 0.0);\n");
             // Z is the x/y offsets divided by squared radii. We only care about the (at most) one
             // corner where both the x and y offsets are positive, hence the maxes. (The inverse
             // squared radii will always be positive.)
-            builder->fsCodeAppendf("\t\tvec2 Z = max(max(dxy0 * %s.xy, dxy1 * %s.zw), 0.0);\n",
-                                   invRadiiLTRBSqdName, invRadiiLTRBSqdName);
+            fragBuilder->codeAppendf("\t\tvec2 Z = max(max(dxy0 * %s.xy, dxy1 * %s.zw), 0.0);\n",
+                                     invRadiiLTRBSqdName, invRadiiLTRBSqdName);
             break;
         }
         default:
             SkFAIL("RRect should always be simple or nine-patch.");
     }
     // implicit is the evaluation of (x/a)^2 + (y/b)^2 - 1.
-    builder->fsCodeAppend("\t\tfloat implicit = dot(Z, dxy) - 1.0;\n");
+    fragBuilder->codeAppend("\t\tfloat implicit = dot(Z, dxy) - 1.0;\n");
     // grad_dot is the squared length of the gradient of the implicit.
-    builder->fsCodeAppendf("\t\tfloat grad_dot = 4.0 * dot(Z, Z);\n");
+    fragBuilder->codeAppendf("\t\tfloat grad_dot = 4.0 * dot(Z, Z);\n");
     // avoid calling inversesqrt on zero.
-    builder->fsCodeAppend("\t\tgrad_dot = max(grad_dot, 1.0e-4);\n");
-    builder->fsCodeAppendf("\t\tfloat approx_dist = implicit * inversesqrt(grad_dot);\n");
+    fragBuilder->codeAppend("\t\tgrad_dot = max(grad_dot, 1.0e-4);\n");
+    fragBuilder->codeAppendf("\t\tfloat approx_dist = implicit * inversesqrt(grad_dot);\n");
 
-    if (kFillAA_GrEffectEdgeType == erre.getEdgeType()) {
-        builder->fsCodeAppend("\t\tfloat alpha = clamp(0.5 - approx_dist, 0.0, 1.0);\n");
+    if (kFillAA_GrProcessorEdgeType == erre.getEdgeType()) {
+        fragBuilder->codeAppend("\t\tfloat alpha = clamp(0.5 - approx_dist, 0.0, 1.0);\n");
     } else {
-        builder->fsCodeAppend("\t\tfloat alpha = clamp(0.5 + approx_dist, 0.0, 1.0);\n");
+        fragBuilder->codeAppend("\t\tfloat alpha = clamp(0.5 + approx_dist, 0.0, 1.0);\n");
     }
 
-    builder->fsCodeAppendf("\t\t%s = %s;\n", outputColor,
-                           (GrGLSLExpr4(inputColor) * GrGLSLExpr1("alpha")).c_str());
+    fragBuilder->codeAppendf("\t\t%s = %s;\n", args.fOutputColor,
+                             (GrGLSLExpr4(args.fInputColor) * GrGLSLExpr1("alpha")).c_str());
 }
 
-void GLEllipticalRRectEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
-                                     GrEffectKeyBuilder* b) {
-    const EllipticalRRectEffect& erre = drawEffect.castEffect<EllipticalRRectEffect>();
-    GR_STATIC_ASSERT(kLast_GrEffectEdgeType < (1 << 3));
+void GLEllipticalRRectEffect::GenKey(const GrProcessor& effect, const GrGLSLCaps&,
+                                     GrProcessorKeyBuilder* b) {
+    const EllipticalRRectEffect& erre = effect.cast<EllipticalRRectEffect>();
+    GR_STATIC_ASSERT(kLast_GrProcessorEdgeType < (1 << 3));
     b->add32(erre.getRRect().getType() | erre.getEdgeType() << 3);
 }
 
-void GLEllipticalRRectEffect::setData(const GrGLUniformManager& uman,
-                                      const GrDrawEffect& drawEffect) {
-    const EllipticalRRectEffect& erre = drawEffect.castEffect<EllipticalRRectEffect>();
+void GLEllipticalRRectEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                                        const GrProcessor& effect) {
+    const EllipticalRRectEffect& erre = effect.cast<EllipticalRRectEffect>();
     const SkRRect& rrect = erre.getRRect();
     if (rrect != fPrevRRect) {
         SkRect rect = rrect.getBounds();
@@ -605,7 +596,7 @@ void GLEllipticalRRectEffect::setData(const GrGLUniformManager& uman,
         switch (erre.getRRect().getType()) {
             case SkRRect::kSimple_Type:
                 rect.inset(r0.fX, r0.fY);
-                uman.set2f(fInvRadiiSqdUniform, 1.f / (r0.fX * r0.fX),
+                pdman.set2f(fInvRadiiSqdUniform, 1.f / (r0.fX * r0.fX),
                                                 1.f / (r0.fY * r0.fY));
                 break;
             case SkRRect::kNinePatch_Type: {
@@ -616,7 +607,7 @@ void GLEllipticalRRectEffect::setData(const GrGLUniformManager& uman,
                 rect.fTop += r0.fY;
                 rect.fRight -= r1.fX;
                 rect.fBottom -= r1.fY;
-                uman.set4f(fInvRadiiSqdUniform, 1.f / (r0.fX * r0.fX),
+                pdman.set4f(fInvRadiiSqdUniform, 1.f / (r0.fX * r0.fX),
                                                 1.f / (r0.fY * r0.fY),
                                                 1.f / (r1.fX * r1.fX),
                                                 1.f / (r1.fY * r1.fY));
@@ -625,14 +616,25 @@ void GLEllipticalRRectEffect::setData(const GrGLUniformManager& uman,
         default:
             SkFAIL("RRect should always be simple or nine-patch.");
         }
-        uman.set4f(fInnerRectUniform, rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
+        pdman.set4f(fInnerRectUniform, rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
         fPrevRRect = rrect;
     }
 }
 
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+void EllipticalRRectEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                                  GrProcessorKeyBuilder* b) const {
+    GLEllipticalRRectEffect::GenKey(*this, caps, b);
+}
+
+GrGLSLFragmentProcessor* EllipticalRRectEffect::onCreateGLSLInstance() const  {
+    return new GLEllipticalRRectEffect(*this);
+}
+
 //////////////////////////////////////////////////////////////////////////////
 
-GrEffect* GrRRectEffect::Create(GrEffectEdgeType edgeType, const SkRRect& rrect) {
+GrFragmentProcessor* GrRRectEffect::Create(GrPrimitiveEdgeType edgeType, const SkRRect& rrect) {
     if (rrect.isRect()) {
         return GrConvexPolyEffect::Create(edgeType, rrect.getBounds());
     }
@@ -716,15 +718,15 @@ GrEffect* GrRRectEffect::Create(GrEffectEdgeType edgeType, const SkRRect& rrect)
                     // If we got here then we squashed some but not all the radii to zero. (If all
                     // had been squashed cornerFlags would be 0.) The elliptical effect doesn't
                     // support some rounded and some square corners.
-                    return NULL;
+                    return nullptr;
                 }
                 if (rrect.isNinePatch()) {
                     return EllipticalRRectEffect::Create(edgeType, rrect);
                 }
-                return NULL;
+                return nullptr;
             }
         }
     }
 
-    return NULL;
+    return nullptr;
 }
diff --git a/gfx/skia/skia/src/gpu/effects/GrRRectEffect.h b/gfx/skia/skia/src/gpu/effects/GrRRectEffect.h
index bcf4884ddd97..63e08a442430 100644
--- a/gfx/skia/skia/src/gpu/effects/GrRRectEffect.h
+++ b/gfx/skia/skia/src/gpu/effects/GrRRectEffect.h
@@ -11,15 +11,16 @@
 #include "GrTypes.h"
 #include "GrTypesPriv.h"
 
-class GrEffect;
+class GrFragmentProcessor;
+class GrProcessor;
 class SkRRect;
 
 namespace GrRRectEffect {
     /**
      * Creates an effect that performs anti-aliased clipping against a SkRRect. It doesn't support
-     * all varieties of SkRRect so the caller must check for a NULL return.
+     * all varieties of SkRRect so the caller must check for a nullptr return.
      */
-    GrEffect* Create(GrEffectEdgeType, const SkRRect&);
+    GrFragmentProcessor* Create(GrPrimitiveEdgeType, const SkRRect&);
 };
 
 #endif
diff --git a/gfx/skia/skia/src/gpu/effects/GrSimpleTextureEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrSimpleTextureEffect.cpp
index 74926bc1455a..4db6f2c50981 100644
--- a/gfx/skia/skia/src/gpu/effects/GrSimpleTextureEffect.cpp
+++ b/gfx/skia/skia/src/gpu/effects/GrSimpleTextureEffect.cpp
@@ -6,76 +6,70 @@
  */
 
 #include "GrSimpleTextureEffect.h"
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
-#include "gl/GrGLSL.h"
-#include "gl/GrGLTexture.h"
-#include "GrTBackendEffectFactory.h"
+#include "GrInvariantOutput.h"
 #include "GrTexture.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
 
-class GrGLSimpleTextureEffect : public GrGLEffect {
+class GrGLSimpleTextureEffect : public GrGLSLFragmentProcessor {
 public:
-    GrGLSimpleTextureEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&)
-        : INHERITED (factory) {
-    }
+    GrGLSimpleTextureEffect(const GrProcessor&) {}
 
-    virtual void emitCode(GrGLShaderBuilder* builder,
-                          const GrDrawEffect& drawEffect,
-                          const GrEffectKey& key,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray& coords,
-                          const TextureSamplerArray& samplers) SK_OVERRIDE {
-        builder->fsCodeAppendf("\t%s = ", outputColor);
-        builder->fsAppendTextureLookupAndModulate(inputColor,
-                                                  samplers[0],
-                                                  coords[0].c_str(),
-                                                  coords[0].type());
-        builder->fsCodeAppend(";\n");
+    virtual void emitCode(EmitArgs& args) override {
+        GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+        fragBuilder->codeAppendf("\t%s = ", args.fOutputColor);
+        fragBuilder->appendTextureLookupAndModulate(args.fInputColor,
+                                                  args.fSamplers[0],
+                                                  args.fCoords[0].c_str(),
+                                                  args.fCoords[0].getType());
+        fragBuilder->codeAppend(";\n");
     }
 
 private:
-    typedef GrGLEffect INHERITED;
+    typedef GrGLSLFragmentProcessor INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void GrSimpleTextureEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
-    this->updateConstantColorComponentsForModulation(color, validFlags);
+void GrSimpleTextureEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const {
+    this->updateInvariantOutputForModulation(inout);
 }
 
-const GrBackendEffectFactory& GrSimpleTextureEffect::getFactory() const {
-    return GrTBackendEffectFactory<GrSimpleTextureEffect>::getInstance();
+void GrSimpleTextureEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                                  GrProcessorKeyBuilder* b) const {
+    GrGLSimpleTextureEffect::GenKey(*this, caps, b);
+}
+
+GrGLSLFragmentProcessor* GrSimpleTextureEffect::onCreateGLSLInstance() const  {
+    return new GrGLSimpleTextureEffect(*this);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-GR_DEFINE_EFFECT_TEST(GrSimpleTextureEffect);
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrSimpleTextureEffect);
 
-GrEffect* GrSimpleTextureEffect::TestCreate(SkRandom* random,
-                                            GrContext*,
-                                            const GrDrawTargetCaps&,
-                                            GrTexture* textures[]) {
-    int texIdx = random->nextBool() ? GrEffectUnitTest::kSkiaPMTextureIdx :
-                                      GrEffectUnitTest::kAlphaTextureIdx;
+const GrFragmentProcessor* GrSimpleTextureEffect::TestCreate(GrProcessorTestData* d) {
+    int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :
+                                          GrProcessorUnitTest::kAlphaTextureIdx;
     static const SkShader::TileMode kTileModes[] = {
         SkShader::kClamp_TileMode,
         SkShader::kRepeat_TileMode,
         SkShader::kMirror_TileMode,
     };
     SkShader::TileMode tileModes[] = {
-        kTileModes[random->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
-        kTileModes[random->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
+        kTileModes[d->fRandom->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
+        kTileModes[d->fRandom->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
     };
-    GrTextureParams params(tileModes, random->nextBool() ? GrTextureParams::kBilerp_FilterMode :
-                                                           GrTextureParams::kNone_FilterMode);
+    GrTextureParams params(tileModes, d->fRandom->nextBool() ? GrTextureParams::kBilerp_FilterMode :
+                                                               GrTextureParams::kNone_FilterMode);
 
     static const GrCoordSet kCoordSets[] = {
         kLocal_GrCoordSet,
-        kPosition_GrCoordSet
+        kDevice_GrCoordSet
     };
-    GrCoordSet coordSet = kCoordSets[random->nextULessThan(SK_ARRAY_COUNT(kCoordSets))];
+    GrCoordSet coordSet = kCoordSets[d->fRandom->nextULessThan(SK_ARRAY_COUNT(kCoordSets))];
 
-    const SkMatrix& matrix = GrEffectUnitTest::TestMatrix(random);
-    return GrSimpleTextureEffect::Create(textures[texIdx], matrix, coordSet);
+    const SkMatrix& matrix = GrTest::TestMatrix(d->fRandom);
+    return GrSimpleTextureEffect::Create(d->fTextures[texIdx], matrix, coordSet);
 }
diff --git a/gfx/skia/skia/src/gpu/effects/GrSimpleTextureEffect.h b/gfx/skia/skia/src/gpu/effects/GrSimpleTextureEffect.h
index 49e3d7a84369..18a8a78fc453 100644
--- a/gfx/skia/skia/src/gpu/effects/GrSimpleTextureEffect.h
+++ b/gfx/skia/skia/src/gpu/effects/GrSimpleTextureEffect.h
@@ -10,50 +10,41 @@
 
 #include "GrSingleTextureEffect.h"
 
-class GrGLSimpleTextureEffect;
+class GrInvariantOutput;
 
 /**
  * The output color of this effect is a modulation of the input color and a sample from a texture.
  * It allows explicit specification of the filtering and wrap modes (GrTextureParams). It can use
- * local coords, positions, or a custom vertex attribute as input texture coords. The input coords
- * can have a matrix applied in the VS in both the local and position cases but not with a custom
- * attribute coords at this time. It will add a varying to input interpolate texture coords to the
- * FS.
+ * local coords or device space coords as input texture coords. The input coords may be transformed
+ * by a matrix.
  */
 class GrSimpleTextureEffect : public GrSingleTextureEffect {
 public:
     /* unfiltered, clamp mode */
-    static GrEffect* Create(GrTexture* tex,
-                            const SkMatrix& matrix,
-                            GrCoordSet coordSet = kLocal_GrCoordSet) {
-        return SkNEW_ARGS(GrSimpleTextureEffect, (tex, matrix, GrTextureParams::kNone_FilterMode,
-                                                  coordSet));
+    static const GrFragmentProcessor* Create(GrTexture* tex,
+                                             const SkMatrix& matrix,
+                                             GrCoordSet coordSet = kLocal_GrCoordSet) {
+        return new GrSimpleTextureEffect(tex, matrix, GrTextureParams::kNone_FilterMode, coordSet);
     }
 
     /* clamp mode */
-    static GrEffect* Create(GrTexture* tex,
-                            const SkMatrix& matrix,
-                            GrTextureParams::FilterMode filterMode,
-                            GrCoordSet coordSet = kLocal_GrCoordSet) {
-        return SkNEW_ARGS(GrSimpleTextureEffect, (tex, matrix, filterMode, coordSet));
+    static GrFragmentProcessor* Create(GrTexture* tex,
+                                       const SkMatrix& matrix,
+                                       GrTextureParams::FilterMode filterMode,
+                                       GrCoordSet coordSet = kLocal_GrCoordSet) {
+        return new GrSimpleTextureEffect(tex, matrix, filterMode, coordSet);
     }
 
-    static GrEffect* Create(GrTexture* tex,
-                            const SkMatrix& matrix,
-                            const GrTextureParams& p,
-                            GrCoordSet coordSet = kLocal_GrCoordSet) {
-        return SkNEW_ARGS(GrSimpleTextureEffect, (tex, matrix, p, coordSet));
+    static GrFragmentProcessor* Create(GrTexture* tex,
+                                       const SkMatrix& matrix,
+                                       const GrTextureParams& p,
+                                       GrCoordSet coordSet = kLocal_GrCoordSet) {
+        return new GrSimpleTextureEffect(tex, matrix, p, coordSet);
     }
 
     virtual ~GrSimpleTextureEffect() {}
 
-    static const char* Name() { return "Texture"; }
-
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
-
-    typedef GrGLSimpleTextureEffect GLEffect;
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
+    const char* name() const override { return "SimpleTexture"; }
 
 private:
     GrSimpleTextureEffect(GrTexture* texture,
@@ -61,6 +52,7 @@ private:
                           GrTextureParams::FilterMode filterMode,
                           GrCoordSet coordSet)
         : GrSingleTextureEffect(texture, matrix, filterMode, coordSet) {
+        this->initClassID<GrSimpleTextureEffect>();
     }
 
     GrSimpleTextureEffect(GrTexture* texture,
@@ -68,14 +60,18 @@ private:
                           const GrTextureParams& params,
                           GrCoordSet coordSet)
         : GrSingleTextureEffect(texture, matrix, params, coordSet) {
+        this->initClassID<GrSimpleTextureEffect>();
     }
 
-    virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE {
-        const GrSimpleTextureEffect& ste = CastEffect<GrSimpleTextureEffect>(other);
-        return this->hasSameTextureParamsMatrixAndSourceCoords(ste);
-    }
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
 
-    GR_DECLARE_EFFECT_TEST;
+    void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
+
+    bool onIsEqual(const GrFragmentProcessor& other) const override { return true; }
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
+
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
 
     typedef GrSingleTextureEffect INHERITED;
 };
diff --git a/gfx/skia/skia/src/gpu/effects/GrSingleTextureEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrSingleTextureEffect.cpp
index 3ab5e3ae0577..c291735c0d78 100644
--- a/gfx/skia/skia/src/gpu/effects/GrSingleTextureEffect.cpp
+++ b/gfx/skia/skia/src/gpu/effects/GrSingleTextureEffect.cpp
@@ -10,7 +10,7 @@
 GrSingleTextureEffect::GrSingleTextureEffect(GrTexture* texture,
                                              const SkMatrix& m,
                                              GrCoordSet coordSet)
-    : fCoordTransform(coordSet, m, texture)
+    : fCoordTransform(coordSet, m, texture, GrTextureParams::kNone_FilterMode)
     , fTextureAccess(texture) {
     this->addCoordTransform(&fCoordTransform);
     this->addTextureAccess(&fTextureAccess);
@@ -20,7 +20,7 @@ GrSingleTextureEffect::GrSingleTextureEffect(GrTexture* texture,
                                              const SkMatrix& m,
                                              GrTextureParams::FilterMode filterMode,
                                              GrCoordSet coordSet)
-    : fCoordTransform(coordSet, m, texture)
+    : fCoordTransform(coordSet, m, texture, filterMode)
     , fTextureAccess(texture, filterMode) {
     this->addCoordTransform(&fCoordTransform);
     this->addTextureAccess(&fTextureAccess);
@@ -30,7 +30,7 @@ GrSingleTextureEffect::GrSingleTextureEffect(GrTexture* texture,
                                              const SkMatrix& m,
                                              const GrTextureParams& params,
                                              GrCoordSet coordSet)
-    : fCoordTransform(coordSet, m, texture)
+    : fCoordTransform(coordSet, m, texture, params.filterMode())
     , fTextureAccess(texture, params) {
     this->addCoordTransform(&fCoordTransform);
     this->addTextureAccess(&fTextureAccess);
diff --git a/gfx/skia/skia/src/gpu/effects/GrSingleTextureEffect.h b/gfx/skia/skia/src/gpu/effects/GrSingleTextureEffect.h
index a8f9a6d52142..4169e404691c 100644
--- a/gfx/skia/skia/src/gpu/effects/GrSingleTextureEffect.h
+++ b/gfx/skia/skia/src/gpu/effects/GrSingleTextureEffect.h
@@ -8,9 +8,10 @@
 #ifndef GrSingleTextureEffect_DEFINED
 #define GrSingleTextureEffect_DEFINED
 
-#include "GrEffect.h"
-#include "SkMatrix.h"
+#include "GrFragmentProcessor.h"
 #include "GrCoordTransform.h"
+#include "GrInvariantOutput.h"
+#include "SkMatrix.h"
 
 class GrTexture;
 
@@ -18,9 +19,15 @@ class GrTexture;
  * A base class for effects that draw a single texture with a texture matrix. This effect has no
  * backend implementations. One must be provided by the subclass.
  */
-class GrSingleTextureEffect : public GrEffect {
+class GrSingleTextureEffect : public GrFragmentProcessor {
 public:
-    virtual ~GrSingleTextureEffect();
+    ~GrSingleTextureEffect() override;
+
+    SkString dumpInfo() const override {
+        SkString str;
+        str.appendf("Texture: %d", fTextureAccess.getTexture()->getUniqueID());
+        return str;
+    }
 
 protected:
     /** unfiltered, clamp mode */
@@ -34,26 +41,17 @@ protected:
                           GrCoordSet = kLocal_GrCoordSet);
 
     /**
-     * Helper for subclass onIsEqual() functions.
-     */
-    bool hasSameTextureParamsMatrixAndSourceCoords(const GrSingleTextureEffect& other) const {
-        // We don't have to check the accesses' swizzles because they are inferred from the texture.
-        return fTextureAccess == other.fTextureAccess &&
-               fCoordTransform.getMatrix().cheapEqualTo(other.fCoordTransform.getMatrix()) &&
-               fCoordTransform.sourceCoords() == other.fCoordTransform.sourceCoords();
-    }
-
-    /**
-     * Can be used as a helper to implement subclass getConstantColorComponents(). It assumes that
+     * Can be used as a helper to implement subclass onComputeInvariantOutput(). It assumes that
      * the subclass output color will be a modulation of the input color with a value read from the
      * texture.
      */
-    void updateConstantColorComponentsForModulation(GrColor* color, uint32_t* validFlags) const {
-        if ((*validFlags & kA_GrColorComponentFlag) && 0xFF == GrColorUnpackA(*color) &&
-            GrPixelConfigIsOpaque(this->texture(0)->config())) {
-            *validFlags = kA_GrColorComponentFlag;
+    void updateInvariantOutputForModulation(GrInvariantOutput* inout) const {
+        if (GrPixelConfigIsAlphaOnly(this->texture(0)->config())) {
+            inout->mulByUnknownSingleComponent();
+        } else if (GrPixelConfigIsOpaque(this->texture(0)->config())) {
+            inout->mulByUnknownOpaqueFourComponents();
         } else {
-            *validFlags = 0;
+            inout->mulByUnknownFourComponents();
         }
     }
 
@@ -61,7 +59,7 @@ private:
     GrCoordTransform fCoordTransform;
     GrTextureAccess  fTextureAccess;
 
-    typedef GrEffect INHERITED;
+    typedef GrFragmentProcessor INHERITED;
 };
 
 #endif
diff --git a/gfx/skia/skia/src/gpu/effects/GrTextureDomain.cpp b/gfx/skia/skia/src/gpu/effects/GrTextureDomain.cpp
index 5af5bc86f3a9..c0902c617609 100644
--- a/gfx/skia/skia/src/gpu/effects/GrTextureDomain.cpp
+++ b/gfx/skia/skia/src/gpu/effects/GrTextureDomain.cpp
@@ -6,12 +6,13 @@
  */
 
 #include "GrTextureDomain.h"
+#include "GrInvariantOutput.h"
 #include "GrSimpleTextureEffect.h"
-#include "GrTBackendEffectFactory.h"
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
 #include "SkFloatingPoint.h"
-
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+#include "glsl/GrGLSLTextureSampler.h"
 
 GrTextureDomain::GrTextureDomain(const SkRect& domain, Mode mode, int index)
     : fIndex(index) {
@@ -29,10 +30,10 @@ GrTextureDomain::GrTextureDomain(const SkRect& domain, Mode mode, int index)
         // handle rects that do not intersect the [0..1]x[0..1] rect.
         SkASSERT(domain.fLeft <= domain.fRight);
         SkASSERT(domain.fTop <= domain.fBottom);
-        fDomain.fLeft = SkMaxScalar(domain.fLeft, kFullRect.fLeft);
-        fDomain.fRight = SkMinScalar(domain.fRight, kFullRect.fRight);
-        fDomain.fTop = SkMaxScalar(domain.fTop, kFullRect.fTop);
-        fDomain.fBottom = SkMinScalar(domain.fBottom, kFullRect.fBottom);
+        fDomain.fLeft = SkScalarPin(domain.fLeft, kFullRect.fLeft, kFullRect.fRight);
+        fDomain.fRight = SkScalarPin(domain.fRight, kFullRect.fLeft, kFullRect.fRight);
+        fDomain.fTop = SkScalarPin(domain.fTop, kFullRect.fTop, kFullRect.fBottom);
+        fDomain.fBottom = SkScalarPin(domain.fBottom, kFullRect.fTop, kFullRect.fBottom);
         SkASSERT(fDomain.fLeft <= fDomain.fRight);
         SkASSERT(fDomain.fTop <= fDomain.fBottom);
     }
@@ -40,84 +41,115 @@ GrTextureDomain::GrTextureDomain(const SkRect& domain, Mode mode, int index)
 
 //////////////////////////////////////////////////////////////////////////////
 
-void GrTextureDomain::GLDomain::sampleTexture(GrGLShaderBuilder* builder,
+void GrTextureDomain::GLDomain::sampleTexture(GrGLSLShaderBuilder* builder,
+                                              const GrGLSLCaps* glslCaps,
                                               const GrTextureDomain& textureDomain,
                                               const char* outColor,
                                               const SkString& inCoords,
-                                              const GrGLEffect::TextureSampler sampler,
+                                              const GrGLSLTextureSampler& sampler,
                                               const char* inModulateColor) {
     SkASSERT((Mode)-1 == fMode || textureDomain.mode() == fMode);
     SkDEBUGCODE(fMode = textureDomain.mode();)
 
-    if (kIgnore_Mode == textureDomain.mode()) {
-        builder->fsCodeAppendf("\t%s = ", outColor);
-        builder->fsAppendTextureLookupAndModulate(inModulateColor, sampler,
-                                                    inCoords.c_str());
-        builder->fsCodeAppend(";\n");
-        return;
-    }
+    GrGLSLProgramBuilder* program = builder->getProgramBuilder();
 
-    if (!fDomainUni.isValid()) {
+    if (textureDomain.mode() != kIgnore_Mode && !fDomainUni.isValid()) {
         const char* name;
         SkString uniName("TexDom");
         if (textureDomain.fIndex >= 0) {
             uniName.appendS32(textureDomain.fIndex);
         }
-        fDomainUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                            kVec4f_GrSLType, uniName.c_str(), &name);
+        fDomainUni = program->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                         kVec4f_GrSLType, kDefault_GrSLPrecision,
+                                         uniName.c_str(), &name);
         fDomainName = name;
     }
-    if (kClamp_Mode == textureDomain.mode()) {
-        SkString clampedCoords;
-        clampedCoords.appendf("\tclamp(%s, %s.xy, %s.zw)",
-                                inCoords.c_str(), fDomainName.c_str(), fDomainName.c_str());
 
-        builder->fsCodeAppendf("\t%s = ", outColor);
-        builder->fsAppendTextureLookupAndModulate(inModulateColor, sampler, clampedCoords.c_str());
-        builder->fsCodeAppend(";\n");
-    } else {
-        SkASSERT(GrTextureDomain::kDecal_Mode == textureDomain.mode());
-        // Add a block since we're going to declare variables.
-        GrGLShaderBuilder::FSBlock block(builder);
+    switch (textureDomain.mode()) {
+        case kIgnore_Mode: {
+            builder->codeAppendf("%s = ", outColor);
+            builder->appendTextureLookupAndModulate(inModulateColor, sampler,
+                                                      inCoords.c_str());
+            builder->codeAppend(";");
+            break;
+        }
+        case kClamp_Mode: {
+            SkString clampedCoords;
+            clampedCoords.appendf("clamp(%s, %s.xy, %s.zw)",
+                                  inCoords.c_str(), fDomainName.c_str(), fDomainName.c_str());
 
-        const char* domain = fDomainName.c_str();
-        if (kImagination_GrGLVendor == builder->ctxInfo().vendor()) {
-            // On the NexusS and GalaxyNexus, the other path (with the 'any'
-            // call) causes the compilation error "Calls to any function that
-            // may require a gradient calculation inside a conditional block
-            // may return undefined results". This appears to be an issue with
-            // the 'any' call since even the simple "result=black; if (any())
-            // result=white;" code fails to compile.
-            builder->fsCodeAppend("\tvec4 outside = vec4(0.0, 0.0, 0.0, 0.0);\n");
-            builder->fsCodeAppend("\tvec4 inside = ");
-            builder->fsAppendTextureLookupAndModulate(inModulateColor, sampler, inCoords.c_str());
-            builder->fsCodeAppend(";\n");
+            builder->codeAppendf("%s = ", outColor);
+            builder->appendTextureLookupAndModulate(inModulateColor, sampler,
+                                                      clampedCoords.c_str());
+            builder->codeAppend(";");
+            break;
+        }
+        case kDecal_Mode: {
+            // Add a block since we're going to declare variables.
+            GrGLSLShaderBuilder::ShaderBlock block(builder);
 
-            builder->fsCodeAppendf("\tfloat x = abs(2.0*(%s.x - %s.x)/(%s.z - %s.x) - 1.0);\n",
-                                    inCoords.c_str(), domain, domain, domain);
-            builder->fsCodeAppendf("\tfloat y = abs(2.0*(%s.y - %s.y)/(%s.w - %s.y) - 1.0);\n",
-                                    inCoords.c_str(), domain, domain, domain);
-            builder->fsCodeAppend("\tfloat blend = step(1.0, max(x, y));\n");
-            builder->fsCodeAppendf("\t%s = mix(inside, outside, blend);\n", outColor);
-        } else {
-            builder->fsCodeAppend("\tbvec4 outside;\n");
-            builder->fsCodeAppendf("\toutside.xy = lessThan(%s, %s.xy);\n", inCoords.c_str(),
-                                   domain);
-            builder->fsCodeAppendf("\toutside.zw = greaterThan(%s, %s.zw);\n", inCoords.c_str(),
-                                   domain);
-            builder->fsCodeAppendf("\t%s = any(outside) ? vec4(0.0, 0.0, 0.0, 0.0) : ", outColor);
-            builder->fsAppendTextureLookupAndModulate(inModulateColor, sampler, inCoords.c_str());
-            builder->fsCodeAppend(";\n");
+            const char* domain = fDomainName.c_str();
+            if (!glslCaps->canUseAnyFunctionInShader()) {
+                // On the NexusS and GalaxyNexus, the other path (with the 'any'
+                // call) causes the compilation error "Calls to any function that
+                // may require a gradient calculation inside a conditional block
+                // may return undefined results". This appears to be an issue with
+                // the 'any' call since even the simple "result=black; if (any())
+                // result=white;" code fails to compile.
+                builder->codeAppend("vec4 outside = vec4(0.0, 0.0, 0.0, 0.0);");
+                builder->codeAppend("vec4 inside = ");
+                builder->appendTextureLookupAndModulate(inModulateColor, sampler,
+                                                          inCoords.c_str());
+                builder->codeAppend(";");
+                
+                builder->codeAppend(GrGLSLShaderVar::PrecisionString(glslCaps,
+                                                                     kHigh_GrSLPrecision));
+                builder->codeAppendf("float x = (%s).x;", inCoords.c_str());
+                builder->codeAppend(GrGLSLShaderVar::PrecisionString(glslCaps,
+                                                                     kHigh_GrSLPrecision));
+                builder->codeAppendf("float y = (%s).y;", inCoords.c_str());
+
+                builder->codeAppendf("x = abs(2.0*(x - %s.x)/(%s.z - %s.x) - 1.0);",
+                                     domain, domain, domain);
+                builder->codeAppendf("y = abs(2.0*(y - %s.y)/(%s.w - %s.y) - 1.0);",
+                                     domain, domain, domain);
+                builder->codeAppend("float blend = step(1.0, max(x, y));");
+                builder->codeAppendf("%s = mix(inside, outside, blend);", outColor);
+            } else {
+                builder->codeAppend("bvec4 outside;\n");
+                builder->codeAppendf("outside.xy = lessThan(%s, %s.xy);", inCoords.c_str(),
+                                       domain);
+                builder->codeAppendf("outside.zw = greaterThan(%s, %s.zw);", inCoords.c_str(),
+                                       domain);
+                builder->codeAppendf("%s = any(outside) ? vec4(0.0, 0.0, 0.0, 0.0) : ",
+                                       outColor);
+                builder->appendTextureLookupAndModulate(inModulateColor, sampler,
+                                                          inCoords.c_str());
+                builder->codeAppend(";");
+            }
+            break;
+        }
+        case kRepeat_Mode: {
+            SkString clampedCoords;
+            clampedCoords.printf("mod(%s - %s.xy, %s.zw - %s.xy) + %s.xy",
+                                 inCoords.c_str(), fDomainName.c_str(), fDomainName.c_str(),
+                                 fDomainName.c_str(), fDomainName.c_str());
+
+            builder->codeAppendf("%s = ", outColor);
+            builder->appendTextureLookupAndModulate(inModulateColor, sampler,
+                                                      clampedCoords.c_str());
+            builder->codeAppend(";");
+            break;
         }
     }
 }
 
-void GrTextureDomain::GLDomain::setData(const GrGLUniformManager& uman,
+void GrTextureDomain::GLDomain::setData(const GrGLSLProgramDataManager& pdman,
                                         const GrTextureDomain& textureDomain,
                                         GrSurfaceOrigin textureOrigin) {
     SkASSERT(textureDomain.mode() == fMode);
     if (kIgnore_Mode != textureDomain.mode()) {
-        GrGLfloat values[4] = {
+        float values[kPrevDomainCount] = {
             SkScalarToFloat(textureDomain.domain().left()),
             SkScalarToFloat(textureDomain.domain().top()),
             SkScalarToFloat(textureDomain.domain().right()),
@@ -131,9 +163,9 @@ void GrTextureDomain::GLDomain::setData(const GrGLUniformManager& uman,
             // of elements so that values = (l, t, r, b).
             SkTSwap(values[1], values[3]);
         }
-        if (0 != memcmp(values, fPrevDomain, 4 * sizeof(GrGLfloat))) {
-            uman.set4fv(fDomainUni, 1, values);
-            memcpy(fPrevDomain, values, 4 * sizeof(GrGLfloat));
+        if (0 != memcmp(values, fPrevDomain, kPrevDomainCount * sizeof(float))) {
+            pdman.set4fv(fDomainUni, 1, values);
+            memcpy(fPrevDomain, values, kPrevDomainCount * sizeof(float));
         }
     }
 }
@@ -141,80 +173,68 @@ void GrTextureDomain::GLDomain::setData(const GrGLUniformManager& uman,
 
 //////////////////////////////////////////////////////////////////////////////
 
-class GrGLTextureDomainEffect : public GrGLEffect {
+class GrGLTextureDomainEffect : public GrGLSLFragmentProcessor {
 public:
-    GrGLTextureDomainEffect(const GrBackendEffectFactory&, const GrDrawEffect&);
+    GrGLTextureDomainEffect(const GrProcessor&);
 
-    virtual void emitCode(GrGLShaderBuilder*,
-                          const GrDrawEffect&,
-                          const GrEffectKey&,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray&,
-                          const TextureSamplerArray&) SK_OVERRIDE;
+    virtual void emitCode(EmitArgs&) override;
 
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;
+    static inline void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*);
 
-    static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*);
+protected:
+    void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) override;
 
 private:
     GrTextureDomain::GLDomain         fGLDomain;
-    typedef GrGLEffect INHERITED;
+    typedef GrGLSLFragmentProcessor INHERITED;
 };
 
-GrGLTextureDomainEffect::GrGLTextureDomainEffect(const GrBackendEffectFactory& factory,
-                                                 const GrDrawEffect&)
-    : INHERITED(factory) {
+GrGLTextureDomainEffect::GrGLTextureDomainEffect(const GrProcessor&) {
 }
 
-void GrGLTextureDomainEffect::emitCode(GrGLShaderBuilder* builder,
-                                       const GrDrawEffect& drawEffect,
-                                       const GrEffectKey& key,
-                                       const char* outputColor,
-                                       const char* inputColor,
-                                       const TransformedCoordsArray& coords,
-                                       const TextureSamplerArray& samplers) {
-    const GrTextureDomainEffect& effect = drawEffect.castEffect<GrTextureDomainEffect>();
-    const GrTextureDomain& domain = effect.textureDomain();
+void GrGLTextureDomainEffect::emitCode(EmitArgs& args) {
+    const GrTextureDomainEffect& textureDomainEffect = args.fFp.cast<GrTextureDomainEffect>();
+    const GrTextureDomain& domain = textureDomainEffect.textureDomain();
 
-    SkString coords2D = builder->ensureFSCoords2D(coords, 0);
-    fGLDomain.sampleTexture(builder, domain, outputColor, coords2D, samplers[0], inputColor);
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    SkString coords2D = fragBuilder->ensureFSCoords2D(args.fCoords, 0);
+    fGLDomain.sampleTexture(fragBuilder,
+                            args.fGLSLCaps,
+                            domain,
+                            args.fOutputColor,
+                            coords2D,
+                            args.fSamplers[0],
+                            args.fInputColor);
 }
 
-void GrGLTextureDomainEffect::setData(const GrGLUniformManager& uman,
-                                      const GrDrawEffect& drawEffect) {
-    const GrTextureDomainEffect& effect = drawEffect.castEffect<GrTextureDomainEffect>();
-    const GrTextureDomain& domain = effect.textureDomain();
-    fGLDomain.setData(uman, domain, effect.texture(0)->origin());
+void GrGLTextureDomainEffect::onSetData(const GrGLSLProgramDataManager& pdman,
+                                        const GrProcessor& processor) {
+    const GrTextureDomainEffect& textureDomainEffect = processor.cast<GrTextureDomainEffect>();
+    const GrTextureDomain& domain = textureDomainEffect.textureDomain();
+    fGLDomain.setData(pdman, domain, processor.texture(0)->origin());
 }
 
-void GrGLTextureDomainEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
-                                     GrEffectKeyBuilder* b) {
-    const GrTextureDomain& domain = drawEffect.castEffect<GrTextureDomainEffect>().textureDomain();
+void GrGLTextureDomainEffect::GenKey(const GrProcessor& processor, const GrGLSLCaps&,
+                                     GrProcessorKeyBuilder* b) {
+    const GrTextureDomain& domain = processor.cast<GrTextureDomainEffect>().textureDomain();
     b->add32(GrTextureDomain::GLDomain::DomainKey(domain));
 }
 
 
 ///////////////////////////////////////////////////////////////////////////////
 
-GrEffect* GrTextureDomainEffect::Create(GrTexture* texture,
-                                           const SkMatrix& matrix,
-                                           const SkRect& domain,
-                                           GrTextureDomain::Mode mode,
-                                           GrTextureParams::FilterMode filterMode,
-                                           GrCoordSet coordSet) {
+const GrFragmentProcessor* GrTextureDomainEffect::Create(GrTexture* texture,
+                                                         const SkMatrix& matrix,
+                                                         const SkRect& domain,
+                                                         GrTextureDomain::Mode mode,
+                                                         GrTextureParams::FilterMode filterMode,
+                                                         GrCoordSet coordSet) {
     static const SkRect kFullRect = {0, 0, SK_Scalar1, SK_Scalar1};
     if (GrTextureDomain::kIgnore_Mode == mode ||
         (GrTextureDomain::kClamp_Mode == mode && domain.contains(kFullRect))) {
         return GrSimpleTextureEffect::Create(texture, matrix, filterMode);
     } else {
-
-        return SkNEW_ARGS(GrTextureDomainEffect, (texture,
-                                                  matrix,
-                                                  domain,
-                                                  mode,
-                                                  filterMode,
-                                                  coordSet));
+        return new GrTextureDomainEffect(texture, matrix, domain, mode, filterMode, coordSet);
     }
 }
 
@@ -226,54 +246,61 @@ GrTextureDomainEffect::GrTextureDomainEffect(GrTexture* texture,
                                              GrCoordSet coordSet)
     : GrSingleTextureEffect(texture, matrix, filterMode, coordSet)
     , fTextureDomain(domain, mode) {
+    SkASSERT(mode != GrTextureDomain::kRepeat_Mode ||
+            filterMode == GrTextureParams::kNone_FilterMode);
+    this->initClassID<GrTextureDomainEffect>();
 }
 
-GrTextureDomainEffect::~GrTextureDomainEffect() {
+GrTextureDomainEffect::~GrTextureDomainEffect() {}
 
+void GrTextureDomainEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                                  GrProcessorKeyBuilder* b) const {
+    GrGLTextureDomainEffect::GenKey(*this, caps, b);
 }
 
-const GrBackendEffectFactory& GrTextureDomainEffect::getFactory() const {
-    return GrTBackendEffectFactory<GrTextureDomainEffect>::getInstance();
+GrGLSLFragmentProcessor* GrTextureDomainEffect::onCreateGLSLInstance() const  {
+    return new GrGLTextureDomainEffect(*this);
 }
 
-bool GrTextureDomainEffect::onIsEqual(const GrEffect& sBase) const {
-    const GrTextureDomainEffect& s = CastEffect<GrTextureDomainEffect>(sBase);
-    return this->hasSameTextureParamsMatrixAndSourceCoords(s) &&
-           this->fTextureDomain == s.fTextureDomain;
+bool GrTextureDomainEffect::onIsEqual(const GrFragmentProcessor& sBase) const {
+    const GrTextureDomainEffect& s = sBase.cast<GrTextureDomainEffect>();
+    return this->fTextureDomain == s.fTextureDomain;
 }
 
-void GrTextureDomainEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
+void GrTextureDomainEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const {
     if (GrTextureDomain::kDecal_Mode == fTextureDomain.mode()) { // TODO: helper
-        *validFlags = 0;
+        if (GrPixelConfigIsAlphaOnly(this->texture(0)->config())) {
+            inout->mulByUnknownSingleComponent();
+        } else {
+            inout->mulByUnknownFourComponents();
+        }
     } else {
-        this->updateConstantColorComponentsForModulation(color, validFlags);
+        this->updateInvariantOutputForModulation(inout);
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-GR_DEFINE_EFFECT_TEST(GrTextureDomainEffect);
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrTextureDomainEffect);
 
-GrEffect* GrTextureDomainEffect::TestCreate(SkRandom* random,
-                                            GrContext*,
-                                            const GrDrawTargetCaps&,
-                                            GrTexture* textures[]) {
-    int texIdx = random->nextBool() ? GrEffectUnitTest::kSkiaPMTextureIdx :
-                                      GrEffectUnitTest::kAlphaTextureIdx;
+const GrFragmentProcessor* GrTextureDomainEffect::TestCreate(GrProcessorTestData* d) {
+    int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :
+                                          GrProcessorUnitTest::kAlphaTextureIdx;
     SkRect domain;
-    domain.fLeft = random->nextUScalar1();
-    domain.fRight = random->nextRangeScalar(domain.fLeft, SK_Scalar1);
-    domain.fTop = random->nextUScalar1();
-    domain.fBottom = random->nextRangeScalar(domain.fTop, SK_Scalar1);
+    domain.fLeft = d->fRandom->nextUScalar1();
+    domain.fRight = d->fRandom->nextRangeScalar(domain.fLeft, SK_Scalar1);
+    domain.fTop = d->fRandom->nextUScalar1();
+    domain.fBottom = d->fRandom->nextRangeScalar(domain.fTop, SK_Scalar1);
     GrTextureDomain::Mode mode =
-        (GrTextureDomain::Mode) random->nextULessThan(GrTextureDomain::kModeCount);
-    const SkMatrix& matrix = GrEffectUnitTest::TestMatrix(random);
-    bool bilerp = random->nextBool();
-    GrCoordSet coords = random->nextBool() ? kLocal_GrCoordSet : kPosition_GrCoordSet;
-    return GrTextureDomainEffect::Create(textures[texIdx],
-                                         matrix,
-                                         domain,
-                                         mode,
-                                         bilerp ? GrTextureParams::kBilerp_FilterMode : GrTextureParams::kNone_FilterMode,
-                                         coords);
+        (GrTextureDomain::Mode) d->fRandom->nextULessThan(GrTextureDomain::kModeCount);
+    const SkMatrix& matrix = GrTest::TestMatrix(d->fRandom);
+    bool bilerp = mode != GrTextureDomain::kRepeat_Mode ? d->fRandom->nextBool() : false;
+    GrCoordSet coords = d->fRandom->nextBool() ? kLocal_GrCoordSet : kDevice_GrCoordSet;
+    return GrTextureDomainEffect::Create(
+        d->fTextures[texIdx],
+        matrix,
+        domain,
+        mode,
+        bilerp ? GrTextureParams::kBilerp_FilterMode : GrTextureParams::kNone_FilterMode,
+        coords);
 }
diff --git a/gfx/skia/skia/src/gpu/effects/GrTextureDomain.h b/gfx/skia/skia/src/gpu/effects/GrTextureDomain.h
index 80a617ef722e..49e557d18ab7 100644
--- a/gfx/skia/skia/src/gpu/effects/GrTextureDomain.h
+++ b/gfx/skia/skia/src/gpu/effects/GrTextureDomain.h
@@ -9,9 +9,13 @@
 #define GrTextureDomainEffect_DEFINED
 
 #include "GrSingleTextureEffect.h"
-#include "gl/GrGLEffect.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLProgramDataManager.h"
 
-class GrGLShaderBuilder;
+class GrGLProgramBuilder;
+class GrGLSLShaderBuilder;
+class GrInvariantOutput;
+class GrGLSLTextureSampler;
 struct SkRect;
 
 /**
@@ -23,11 +27,18 @@ struct SkRect;
 class GrTextureDomain {
 public:
     enum Mode {
-        kIgnore_Mode,  // Ignore the texture domain rectangle.
-        kClamp_Mode,   // Clamp texture coords to the domain rectangle.
-        kDecal_Mode,   // Treat the area outside the domain rectangle as fully transparent.
+        // Ignore the texture domain rectangle.
+        kIgnore_Mode,
+        // Clamp texture coords to the domain rectangle.
+        kClamp_Mode,
+        // Treat the area outside the domain rectangle as fully transparent.
+        kDecal_Mode,
+        // Wrap texture coordinates.  NOTE: filtering may not work as expected because Bilerp will
+        // read texels outside of the domain.  We could perform additional texture reads and filter
+        // in the shader, but are not currently doing this for performance reasons
+        kRepeat_Mode,
 
-        kLastMode = kDecal_Mode
+        kLastMode = kRepeat_Mode
     };
     static const int kModeCount = kLastMode + 1;
 
@@ -60,44 +71,62 @@ public:
         return result;
     }
 
+    static const SkRect MakeTexelDomainForMode(const GrTexture* texture, const SkIRect& texelRect, Mode mode) {
+        // For Clamp mode, inset by half a texel.
+        SkScalar wInv = SK_Scalar1 / texture->width();
+        SkScalar hInv = SK_Scalar1 / texture->height();
+        SkScalar inset = (mode == kClamp_Mode && !texelRect.isEmpty()) ? SK_ScalarHalf : 0;
+        return SkRect::MakeLTRB(
+            (texelRect.fLeft + inset) * wInv,
+            (texelRect.fTop + inset) * hInv,
+            (texelRect.fRight - inset) * wInv,
+            (texelRect.fBottom - inset) * hInv
+        );
+    }
+
     bool operator== (const GrTextureDomain& that) const {
-        return fMode == that.fMode && fDomain == that.fDomain;
+        return fMode == that.fMode && (kIgnore_Mode == fMode || fDomain == that.fDomain);
     }
 
     /**
-     * A GrGLEffect subclass that corresponds to a GrEffect subclass that uses GrTextureDomain
-     * should include this helper. It generates the texture domain GLSL, produces the part of the
-     * effect key that reflects the texture domain code, and performs the uniform uploads necessary
-     * for texture domains.
+     * A GrGLSLFragmentProcessor subclass that corresponds to a GrProcessor subclass that uses
+     * GrTextureDomain should include this helper. It generates the texture domain GLSL, produces
+     * the part of the effect key that reflects the texture domain code, and performs the uniform
+     * uploads necessary for texture domains.
      */
     class GLDomain {
     public:
         GLDomain() {
-            fPrevDomain[0] = SK_FloatNaN;
+            for (int i = 0; i < kPrevDomainCount; i++) {
+                fPrevDomain[i] = SK_FloatNaN;
+            }
             SkDEBUGCODE(fMode = (Mode) -1;)
         }
 
         /**
-         * Call this from GrGLEffect::emitCode() to sample the texture W.R.T. the domain and mode.
+         * Call this from GrGLSLFragmentProcessor::emitCode() to sample the texture W.R.T. the
+         * domain and mode.
          *
          * @param outcolor  name of vec4 variable to hold the sampled color.
          * @param inCoords  name of vec2 variable containing the coords to be used with the domain.
          *                  It is assumed that this is a variable and not an expression.
-         * @param inModulateColor   if non-NULL the sampled color will be modulated with this
+         * @param inModulateColor   if non-nullptr the sampled color will be modulated with this
          *                          expression before being written to outColor.
          */
-        void sampleTexture(GrGLShaderBuilder* builder,
+        void sampleTexture(GrGLSLShaderBuilder* builder,
+                           const GrGLSLCaps* glslCaps,
                            const GrTextureDomain& textureDomain,
                            const char* outColor,
                            const SkString& inCoords,
-                           const GrGLEffect::TextureSampler sampler,
-                           const char* inModulateColor = NULL);
+                           const GrGLSLTextureSampler& sampler,
+                           const char* inModulateColor = nullptr);
 
         /**
-         * Call this from GrGLEffect::setData() to upload uniforms necessary for the texture domain.
-         * The rectangle is automatically adjusted to account for the texture's origin.
+         * Call this from GrGLSLFragmentProcessor::setData() to upload uniforms necessary for the
+         * texture domain. The rectangle is automatically adjusted to account for the texture's
+         * origin.
          */
-        void setData(const GrGLUniformManager& uman, const GrTextureDomain& textureDomain,
+        void setData(const GrGLSLProgramDataManager& pdman, const GrTextureDomain& textureDomain,
                      GrSurfaceOrigin textureOrigin);
 
         enum {
@@ -105,8 +134,8 @@ public:
         };
 
         /**
-         * GrGLEffect::GenKey() must call this and include the returned value in it's computed key.
-         * The returned will be limited to the lower kDomainKeyBits bits.
+         * GrGLSLFragmentProcessor::GenKey() must call this and include the returned value in it's
+         * computed key. The returned will be limited to the lower kDomainKeyBits bits.
          */
         static uint32_t DomainKey(const GrTextureDomain& domain) {
             GR_STATIC_ASSERT(kModeCount <= 4);
@@ -114,10 +143,11 @@ public:
         }
 
     private:
-        SkDEBUGCODE(Mode                  fMode;)
-        GrGLUniformManager::UniformHandle fDomainUni;
-        SkString                          fDomainName;
-        GrGLfloat                         fPrevDomain[4];
+        static const int kPrevDomainCount = 4;
+        SkDEBUGCODE(Mode                        fMode;)
+        GrGLSLProgramDataManager::UniformHandle fDomainUni;
+        SkString                                fDomainName;
+        float                                   fPrevDomain[kPrevDomainCount];
     };
 
 protected:
@@ -128,29 +158,31 @@ protected:
     typedef GrSingleTextureEffect INHERITED;
 };
 
-class GrGLTextureDomainEffect;
-
 /**
  * A basic texture effect that uses GrTextureDomain.
  */
 class GrTextureDomainEffect : public GrSingleTextureEffect {
 
 public:
-    static GrEffect* Create(GrTexture*,
-                            const SkMatrix&,
-                            const SkRect& domain,
-                            GrTextureDomain::Mode,
-                            GrTextureParams::FilterMode filterMode,
-                            GrCoordSet = kLocal_GrCoordSet);
+    static const GrFragmentProcessor* Create(GrTexture*,
+                                             const SkMatrix&,
+                                             const SkRect& domain,
+                                             GrTextureDomain::Mode,
+                                             GrTextureParams::FilterMode filterMode,
+                                             GrCoordSet = kLocal_GrCoordSet);
 
     virtual ~GrTextureDomainEffect();
 
-    static const char* Name() { return "TextureDomain"; }
+    const char* name() const override { return "TextureDomain"; }
 
-    typedef GrGLTextureDomainEffect GLEffect;
-
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
-    virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
+    SkString dumpInfo() const override {
+        SkString str;
+        str.appendf("Domain: [L: %.2f, T: %.2f, R: %.2f, B: %.2f] ", 
+                    fTextureDomain.domain().fLeft, fTextureDomain.domain().fTop,
+                    fTextureDomain.domain().fRight, fTextureDomain.domain().fBottom);
+        str.append(INHERITED::dumpInfo());
+        return str;
+    }
 
     const GrTextureDomain& textureDomain() const { return fTextureDomain; }
 
@@ -165,9 +197,15 @@ private:
                           GrTextureParams::FilterMode,
                           GrCoordSet);
 
-    virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE;
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
 
-    GR_DECLARE_EFFECT_TEST;
+    void onGetGLSLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder*) const override;
+
+    bool onIsEqual(const GrFragmentProcessor&) const override;
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
+
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
 
     typedef GrSingleTextureEffect INHERITED;
 };
diff --git a/gfx/skia/skia/src/gpu/effects/GrTextureStripAtlas.cpp b/gfx/skia/skia/src/gpu/effects/GrTextureStripAtlas.cpp
index e3927c0d1f09..f2133d12f2bf 100644
--- a/gfx/skia/skia/src/gpu/effects/GrTextureStripAtlas.cpp
+++ b/gfx/skia/skia/src/gpu/effects/GrTextureStripAtlas.cpp
@@ -7,9 +7,11 @@
  */
 
 #include "GrTextureStripAtlas.h"
+#include "GrContext.h"
+#include "GrTexture.h"
+#include "SkGr.h"
 #include "SkPixelRef.h"
 #include "SkTSearch.h"
-#include "GrTexture.h"
 
 #ifdef SK_DEBUG
     #define VALIDATE this->validate()
@@ -18,16 +20,16 @@
 #endif
 
 class GrTextureStripAtlas::Hash : public SkTDynamicHash<GrTextureStripAtlas::AtlasEntry, 
-                                                        GrTextureStripAtlas::AtlasEntry::Key> {};
+                                                        GrTextureStripAtlas::Desc> {};
 
 int32_t GrTextureStripAtlas::gCacheCount = 0;
 
-GrTextureStripAtlas::Hash* GrTextureStripAtlas::gAtlasCache = NULL;
+GrTextureStripAtlas::Hash* GrTextureStripAtlas::gAtlasCache = nullptr;
 
 GrTextureStripAtlas::Hash* GrTextureStripAtlas::GetCache() {
 
-    if (NULL == gAtlasCache) {
-        gAtlasCache = SkNEW(Hash);
+    if (nullptr == gAtlasCache) {
+        gAtlasCache = new Hash;
     }
 
     return gAtlasCache;
@@ -35,31 +37,29 @@ GrTextureStripAtlas::Hash* GrTextureStripAtlas::GetCache() {
 
 // Remove the specified atlas from the cache
 void GrTextureStripAtlas::CleanUp(const GrContext*, void* info) {
-    SkASSERT(NULL != info);
+    SkASSERT(info);
 
     AtlasEntry* entry = static_cast<AtlasEntry*>(info);
 
     // remove the cache entry
-    GetCache()->remove(entry->fKey);
+    GetCache()->remove(entry->fDesc);
 
     // remove the actual entry
-    SkDELETE(entry);
+    delete entry;
 
     if (0 == GetCache()->count()) {
-        SkDELETE(gAtlasCache);
-        gAtlasCache = NULL;
+        delete gAtlasCache;
+        gAtlasCache = nullptr;
     }
 }
 
 GrTextureStripAtlas* GrTextureStripAtlas::GetAtlas(const GrTextureStripAtlas::Desc& desc) {
-    AtlasEntry::Key key;
-    key.setKeyData(desc.asKey());
-    AtlasEntry* entry = GetCache()->find(key);
-    if (NULL == entry) {
-        entry = SkNEW(AtlasEntry);
+    AtlasEntry* entry = GetCache()->find(desc);
+    if (nullptr == entry) {
+        entry = new AtlasEntry;
 
-        entry->fAtlas = SkNEW_ARGS(GrTextureStripAtlas, (desc));
-        entry->fKey = key;
+        entry->fAtlas = new GrTextureStripAtlas(desc);
+        entry->fDesc = desc;
 
         desc.fContext->addCleanUp(CleanUp, entry);
 
@@ -74,23 +74,25 @@ GrTextureStripAtlas::GrTextureStripAtlas(GrTextureStripAtlas::Desc desc)
     , fLockedRows(0)
     , fDesc(desc)
     , fNumRows(desc.fHeight / desc.fRowHeight)
-    , fTexture(NULL)
-    , fRows(SkNEW_ARRAY(AtlasRow, fNumRows))
-    , fLRUFront(NULL)
-    , fLRUBack(NULL) {
+    , fTexture(nullptr)
+    , fRows(new AtlasRow[fNumRows])
+    , fLRUFront(nullptr)
+    , fLRUBack(nullptr) {
     SkASSERT(fNumRows * fDesc.fRowHeight == fDesc.fHeight);
     this->initLRU();
+    fNormalizedYHeight = SK_Scalar1 / fDesc.fHeight;
     VALIDATE;
 }
 
-GrTextureStripAtlas::~GrTextureStripAtlas() {
-    SkDELETE_ARRAY(fRows);
-}
+GrTextureStripAtlas::~GrTextureStripAtlas() { delete[] fRows; }
 
 int GrTextureStripAtlas::lockRow(const SkBitmap& data) {
     VALIDATE;
     if (0 == fLockedRows) {
         this->lockTexture();
+        if (!fTexture) {
+            return -1;
+        }
     }
 
     int key = data.getGenerationID();
@@ -118,11 +120,11 @@ int GrTextureStripAtlas::lockRow(const SkBitmap& data) {
 
         ++fLockedRows;
 
-        if (NULL == row) {
+        if (nullptr == row) {
             // force a flush, which should unlock all the rows; then try again
             fDesc.fContext->flush();
             row = this->getLRU();
-            if (NULL == row) {
+            if (nullptr == row) {
                 --fLockedRows;
                 return -1;
             }
@@ -155,13 +157,12 @@ int GrTextureStripAtlas::lockRow(const SkBitmap& data) {
 
         // Pass in the kDontFlush flag, since we know we're writing to a part of this texture
         // that is not currently in use
-        fDesc.fContext->writeTexturePixels(fTexture,
-                                           0,  rowNumber * fDesc.fRowHeight,
-                                           fDesc.fWidth, fDesc.fRowHeight,
-                                           SkImageInfo2GrPixelConfig(data.info()),
-                                           data.getPixels(),
-                                           data.rowBytes(),
-                                           GrContext::kDontFlush_PixelOpsFlag);
+        fTexture->writePixels(0,  rowNumber * fDesc.fRowHeight,
+                              fDesc.fWidth, fDesc.fRowHeight,
+                              SkImageInfo2GrPixelConfig(data.info()),
+                              data.getPixels(),
+                              data.rowBytes(),
+                              GrContext::kDontFlush_PixelOpsFlag);
     }
 
     SkASSERT(rowNumber >= 0);
@@ -190,52 +191,54 @@ GrTextureStripAtlas::AtlasRow* GrTextureStripAtlas::getLRU() {
 }
 
 void GrTextureStripAtlas::lockTexture() {
-    GrTextureParams params;
-    GrTextureDesc texDesc;
+    GrSurfaceDesc texDesc;
     texDesc.fWidth = fDesc.fWidth;
     texDesc.fHeight = fDesc.fHeight;
     texDesc.fConfig = fDesc.fConfig;
 
-    static const GrCacheID::Domain gTextureStripAtlasDomain = GrCacheID::GenerateDomain();
-    GrCacheID::Key key;
-    *key.fData32 = fCacheKey;
-    memset(key.fData32 + 1, 0, sizeof(key) - sizeof(uint32_t));
-    GrCacheID cacheID(gTextureStripAtlasDomain, key);
+    static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
+    GrUniqueKey key;
+    GrUniqueKey::Builder builder(&key, kDomain, 1);
+    builder[0] = static_cast<uint32_t>(fCacheKey);
+    builder.finish();
 
-    fTexture = fDesc.fContext->findAndRefTexture(texDesc, cacheID, &params);
-    if (NULL == fTexture) {
-        fTexture = fDesc.fContext->createTexture(&params, texDesc, cacheID, NULL, 0);
+    fTexture = fDesc.fContext->textureProvider()->findAndRefTextureByUniqueKey(key);
+    if (nullptr == fTexture) {
+        fTexture = fDesc.fContext->textureProvider()->createTexture(texDesc, true, nullptr, 0);
+        if (!fTexture) {
+            return;
+        }
+        fDesc.fContext->textureProvider()->assignUniqueKeyToTexture(key, fTexture);
         // This is a new texture, so all of our cache info is now invalid
         this->initLRU();
         fKeyTable.rewind();
     }
-    SkASSERT(NULL != fTexture);
+    SkASSERT(fTexture);
 }
 
 void GrTextureStripAtlas::unlockTexture() {
-    SkASSERT(NULL != fTexture && 0 == fLockedRows);
+    SkASSERT(fTexture && 0 == fLockedRows);
     fTexture->unref();
-    fTexture = NULL;
-    fDesc.fContext->purgeCache();
+    fTexture = nullptr;
 }
 
 void GrTextureStripAtlas::initLRU() {
-    fLRUFront = NULL;
-    fLRUBack = NULL;
+    fLRUFront = nullptr;
+    fLRUBack = nullptr;
     // Initially all the rows are in the LRU list
     for (int i = 0; i < fNumRows; ++i) {
         fRows[i].fKey = kEmptyAtlasRowKey;
-        fRows[i].fNext = NULL;
-        fRows[i].fPrev = NULL;
+        fRows[i].fNext = nullptr;
+        fRows[i].fPrev = nullptr;
         this->appendLRU(fRows + i);
     }
-    SkASSERT(NULL == fLRUFront || NULL == fLRUFront->fPrev);
-    SkASSERT(NULL == fLRUBack || NULL == fLRUBack->fNext);
+    SkASSERT(nullptr == fLRUFront || nullptr == fLRUFront->fPrev);
+    SkASSERT(nullptr == fLRUBack || nullptr == fLRUBack->fNext);
 }
 
 void GrTextureStripAtlas::appendLRU(AtlasRow* row) {
-    SkASSERT(NULL == row->fPrev && NULL == row->fNext);
-    if (NULL == fLRUFront && NULL == fLRUBack) {
+    SkASSERT(nullptr == row->fPrev && nullptr == row->fNext);
+    if (nullptr == fLRUFront && nullptr == fLRUBack) {
         fLRUFront = row;
         fLRUBack = row;
     } else {
@@ -246,28 +249,28 @@ void GrTextureStripAtlas::appendLRU(AtlasRow* row) {
 }
 
 void GrTextureStripAtlas::removeFromLRU(AtlasRow* row) {
-    SkASSERT(NULL != row);
-    if (NULL != row->fNext && NULL != row->fPrev) {
+    SkASSERT(row);
+    if (row->fNext && row->fPrev) {
         row->fPrev->fNext = row->fNext;
         row->fNext->fPrev = row->fPrev;
     } else {
-        if (NULL == row->fNext) {
+        if (nullptr == row->fNext) {
             SkASSERT(row == fLRUBack);
             fLRUBack = row->fPrev;
             if (fLRUBack) {
-                fLRUBack->fNext = NULL;
+                fLRUBack->fNext = nullptr;
             }
         }
-        if (NULL == row->fPrev) {
+        if (nullptr == row->fPrev) {
             SkASSERT(row == fLRUFront);
             fLRUFront = row->fNext;
             if (fLRUFront) {
-                fLRUFront->fPrev = NULL;
+                fLRUFront->fPrev = nullptr;
             }
         }
     }
-    row->fNext = NULL;
-    row->fPrev = NULL;
+    row->fNext = nullptr;
+    row->fPrev = nullptr;
 }
 
 int GrTextureStripAtlas::searchByKey(uint32_t key) {
@@ -293,10 +296,10 @@ void GrTextureStripAtlas::validate() {
 
     int lruCount = 0;
     // Validate LRU pointers, and count LRU entries
-    SkASSERT(NULL == fLRUFront || NULL == fLRUFront->fPrev);
-    SkASSERT(NULL == fLRUBack  || NULL == fLRUBack->fNext);
-    for (AtlasRow* r = fLRUFront; r != NULL; r = r->fNext) {
-        if (NULL == r->fNext) {
+    SkASSERT(nullptr == fLRUFront || nullptr == fLRUFront->fPrev);
+    SkASSERT(nullptr == fLRUBack  || nullptr == fLRUBack->fNext);
+    for (AtlasRow* r = fLRUFront; r != nullptr; r = r->fNext) {
+        if (nullptr == r->fNext) {
             SkASSERT(r == fLRUBack);
         } else {
             SkASSERT(r->fNext->fPrev == r);
@@ -313,7 +316,7 @@ void GrTextureStripAtlas::validate() {
             ++freeRows;
             bool inLRU = false;
             // Step through the LRU and make sure it's present
-            for (AtlasRow* r = fLRUFront; r != NULL; r = r->fNext) {
+            for (AtlasRow* r = fLRUFront; r != nullptr; r = r->fNext) {
                 if (r == &fRows[i]) {
                     inLRU = true;
                     break;
@@ -340,9 +343,9 @@ void GrTextureStripAtlas::validate() {
     // If we have locked rows, we should have a locked texture, otherwise
     // it should be unlocked
     if (fLockedRows == 0) {
-        SkASSERT(NULL == fTexture);
+        SkASSERT(nullptr == fTexture);
     } else {
-        SkASSERT(NULL != fTexture);
+        SkASSERT(fTexture);
     }
 }
 #endif
diff --git a/gfx/skia/skia/src/gpu/effects/GrTextureStripAtlas.h b/gfx/skia/skia/src/gpu/effects/GrTextureStripAtlas.h
index 6d2fb8fdf8da..91ce61c23200 100644
--- a/gfx/skia/skia/src/gpu/effects/GrTextureStripAtlas.h
+++ b/gfx/skia/skia/src/gpu/effects/GrTextureStripAtlas.h
@@ -8,8 +8,8 @@
 #ifndef GrTextureStripAtlas_DEFINED
 #define GrTextureStripAtlas_DEFINED
 
-#include "GrBinHashKey.h"
 #include "SkBitmap.h"
+#include "SkChecksum.h"
 #include "SkGr.h"
 #include "SkTDArray.h"
 #include "SkTDynamicHash.h"
@@ -25,11 +25,14 @@ public:
      * Descriptor struct which we'll use as a hash table key
      **/
     struct Desc {
-        Desc() { memset(this, 0, sizeof(*this)); }
-        uint16_t fWidth, fHeight, fRowHeight;
-        GrPixelConfig fConfig;
+        Desc() { sk_bzero(this, sizeof(*this)); }
         GrContext* fContext;
-        const uint32_t* asKey() const { return reinterpret_cast<const uint32_t*>(this); }
+        GrPixelConfig fConfig;
+        uint16_t fWidth, fHeight, fRowHeight;
+        uint16_t fUnusedPadding;
+        bool operator==(const Desc& other) const {
+            return 0 == memcmp(this, &other, sizeof(Desc));
+        }
     };
 
     /**
@@ -61,11 +64,11 @@ public:
      *       texture2D(sampler, vec2(x, yOffset + y * scaleFactor))
      *
      * Where yOffset, returned by getYOffset(), is the offset to the start of the row within the
-     * atlas and scaleFactor, returned by getVerticalScaleFactor(), is the y-scale of the row,
-     * relative to the height of the overall atlas texture.
+     * atlas and scaleFactor, returned by getNormalizedTexelHeight, is the normalized height of
+     * one texel row.
      */
     SkScalar getYOffset(int row) const { return SkIntToScalar(row) / fNumRows; }
-    SkScalar getVerticalScaleFactor() const { return SkIntToScalar(fDesc.fRowHeight) / fDesc.fHeight; }
+    SkScalar getNormalizedTexelHeight() const { return fNormalizedYHeight; }
 
     GrContext* getContext() const { return fDesc.fContext; }
     GrTexture* getTexture() const { return fTexture; }
@@ -80,7 +83,7 @@ private:
      * together to represent LRU status
      */
     struct AtlasRow : SkNoncopyable {
-        AtlasRow() : fKey(kEmptyAtlasRowKey), fLocks(0), fNext(NULL), fPrev(NULL) { }
+        AtlasRow() : fKey(kEmptyAtlasRowKey), fLocks(0), fNext(nullptr), fPrev(nullptr) { }
         // GenerationID of the bitmap that is represented by this row, 0xffffffff means "empty"
         uint32_t fKey;
         // How many times this has been locked (0 == unlocked)
@@ -104,7 +107,7 @@ private:
     void initLRU();
 
     /**
-     * Grabs the least recently used free row out of the LRU list, returns NULL if no rows are free.
+     * Grabs the least recently used free row out of the LRU list, returns nullptr if no rows are free.
      */
     AtlasRow* getLRU();
 
@@ -138,14 +141,13 @@ private:
     class AtlasEntry : public ::SkNoncopyable {
     public:
         // for SkTDynamicHash
-        class Key : public GrMurmur3HashKey<sizeof(GrTextureStripAtlas::Desc)> {};
-        static const Key& GetKey(const AtlasEntry& entry) { return entry.fKey; }
-        static uint32_t Hash(const Key& key) { return key.getHash(); }
+        static const Desc& GetKey(const AtlasEntry& entry) { return entry.fDesc; }
+        static uint32_t Hash(const Desc& desc) { return SkChecksum::Murmur3(&desc, sizeof(Desc)); }
 
         // AtlasEntry proper
-        AtlasEntry() : fAtlas(NULL) {}
-        ~AtlasEntry() { SkDELETE(fAtlas); }
-        Key fKey;
+        AtlasEntry() : fAtlas(nullptr) {}
+        ~AtlasEntry() { delete fAtlas; }
+        Desc fDesc;
         GrTextureStripAtlas* fAtlas;
     };
 
@@ -168,6 +170,8 @@ private:
     const uint16_t fNumRows;
     GrTexture* fTexture;
 
+    SkScalar fNormalizedYHeight;
+
     // Array of AtlasRows which store the state of all our rows. Stored in a contiguous array, in
     // order that they appear in our texture, this means we can subtract this pointer from a row
     // pointer to get its index in the texture, and can save storing a row number in AtlasRow.
diff --git a/gfx/skia/skia/src/gpu/effects/GrVertexEffect.h b/gfx/skia/skia/src/gpu/effects/GrVertexEffect.h
deleted file mode 100644
index 387ec7aee913..000000000000
--- a/gfx/skia/skia/src/gpu/effects/GrVertexEffect.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrVertexEffect_DEFINED
-#define GrVertexEffect_DEFINED
-
-#include "GrEffect.h"
-
-/**
- * If an effect needs specialized vertex shader code, then it must inherit from this class.
- * Otherwise it won't be able to add vertex attribs, and it might be given a vertexless shader
- * program in emitCode.
- */
-class GrVertexEffect : public GrEffect {
-public:
-    GrVertexEffect() { fHasVertexCode = true; }
-
-protected:
-    /**
-     * Subclasses call this from their constructor to register vertex attributes (at most
-     * kMaxVertexAttribs). This must only be called from the constructor because GrEffects are
-     * immutable.
-     */
-    void addVertexAttrib(GrSLType type) {
-        SkASSERT(fVertexAttribTypes.count() < kMaxVertexAttribs);
-        fVertexAttribTypes.push_back(type);
-    }
-
-private:
-    typedef GrEffect INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/effects/GrXfermodeFragmentProcessor.cpp b/gfx/skia/skia/src/gpu/effects/GrXfermodeFragmentProcessor.cpp
new file mode 100644
index 000000000000..6ff4d32f0673
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/effects/GrXfermodeFragmentProcessor.cpp
@@ -0,0 +1,312 @@
+/*
+* Copyright 2015 Google Inc.
+*
+* Use of this source code is governed by a BSD-style license that can be
+* found in the LICENSE file.
+*/
+
+#include "effects/GrXfermodeFragmentProcessor.h"
+
+#include "GrFragmentProcessor.h"
+#include "effects/GrConstColorProcessor.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLBlend.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "SkGrPriv.h"
+
+class ComposeTwoFragmentProcessor : public GrFragmentProcessor {
+public:
+    ComposeTwoFragmentProcessor(const GrFragmentProcessor* src, const GrFragmentProcessor* dst,
+                    SkXfermode::Mode mode)
+        : fMode(mode) {
+        this->initClassID<ComposeTwoFragmentProcessor>();
+        SkDEBUGCODE(int shaderAChildIndex = )this->registerChildProcessor(src);
+        SkDEBUGCODE(int shaderBChildIndex = )this->registerChildProcessor(dst);
+        SkASSERT(0 == shaderAChildIndex);
+        SkASSERT(1 == shaderBChildIndex);
+    }
+
+    const char* name() const override { return "ComposeTwo"; }
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {
+        b->add32(fMode);
+    }
+
+    SkXfermode::Mode getMode() const { return fMode; }
+
+protected:
+    bool onIsEqual(const GrFragmentProcessor& other) const override {
+        const ComposeTwoFragmentProcessor& cs = other.cast<ComposeTwoFragmentProcessor>();
+        return fMode == cs.fMode;
+    }
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override {
+        inout->setToUnknown(GrInvariantOutput::kWill_ReadInput);
+    }
+
+private:
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
+
+    SkXfermode::Mode fMode;
+
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+
+    typedef GrFragmentProcessor INHERITED;
+};
+
+/////////////////////////////////////////////////////////////////////
+
+class GLComposeTwoFragmentProcessor : public GrGLSLFragmentProcessor {
+public:
+    GLComposeTwoFragmentProcessor(const GrProcessor& processor) {}
+
+    void emitCode(EmitArgs&) override;
+
+private:
+    typedef GrGLSLFragmentProcessor INHERITED;
+};
+
+/////////////////////////////////////////////////////////////////////
+
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(ComposeTwoFragmentProcessor);
+
+const GrFragmentProcessor* ComposeTwoFragmentProcessor::TestCreate(GrProcessorTestData* d) {
+    // Create two random frag procs.
+    SkAutoTUnref<const GrFragmentProcessor> fpA(GrProcessorUnitTest::CreateChildFP(d));
+    SkAutoTUnref<const GrFragmentProcessor> fpB(GrProcessorUnitTest::CreateChildFP(d));
+
+    SkXfermode::Mode mode = static_cast<SkXfermode::Mode>(
+        d->fRandom->nextRangeU(0, SkXfermode::kLastMode));
+    return new ComposeTwoFragmentProcessor(fpA, fpB, mode);
+}
+
+GrGLSLFragmentProcessor* ComposeTwoFragmentProcessor::onCreateGLSLInstance() const{
+    return new GLComposeTwoFragmentProcessor(*this);
+}
+
+/////////////////////////////////////////////////////////////////////
+
+void GLComposeTwoFragmentProcessor::emitCode(EmitArgs& args) {
+
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    const ComposeTwoFragmentProcessor& cs = args.fFp.cast<ComposeTwoFragmentProcessor>();
+
+    const char* inputColor = nullptr;
+    if (args.fInputColor) {
+        inputColor = "inputColor";
+        fragBuilder->codeAppendf("vec4 inputColor = vec4(%s.rgb, 1.0);", args.fInputColor);
+    }
+
+    // declare outputColor and emit the code for each of the two children
+    SkString srcColor("src");
+    this->emitChild(0, inputColor, &srcColor, args);
+
+    SkString dstColor("dst");
+    this->emitChild(1, inputColor, &dstColor, args);
+
+    // emit blend code
+    SkXfermode::Mode mode = cs.getMode();
+    fragBuilder->codeAppendf("// Compose Xfer Mode: %s\n", SkXfermode::ModeName(mode));
+    GrGLSLBlend::AppendMode(fragBuilder,
+                            srcColor.c_str(),
+                            dstColor.c_str(),
+                            args.fOutputColor,
+                            mode);
+
+    // re-multiply the output color by the input color's alpha
+    if (args.fInputColor) {
+        fragBuilder->codeAppendf("%s *= %s.a;", args.fOutputColor, args.fInputColor);
+    }
+}
+
+const GrFragmentProcessor* GrXfermodeFragmentProcessor::CreateFromTwoProcessors(
+         const GrFragmentProcessor* src, const GrFragmentProcessor* dst, SkXfermode::Mode mode) {
+    switch (mode) {
+        case SkXfermode::kClear_Mode:
+            return GrConstColorProcessor::Create(GrColor_TRANSPARENT_BLACK,
+                                                 GrConstColorProcessor::kIgnore_InputMode);
+        case SkXfermode::kSrc_Mode:
+            return SkRef(src);
+        case SkXfermode::kDst_Mode:
+            return SkRef(dst);
+        default:
+            return new ComposeTwoFragmentProcessor(src, dst, mode);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+class ComposeOneFragmentProcessor : public GrFragmentProcessor {
+public:
+    enum Child {
+        kDst_Child,
+        kSrc_Child,
+    };
+
+    ComposeOneFragmentProcessor(const GrFragmentProcessor* dst, SkXfermode::Mode mode, Child child)
+        : fMode(mode)
+        , fChild(child) {
+        this->initClassID<ComposeOneFragmentProcessor>();
+        SkDEBUGCODE(int dstIndex = )this->registerChildProcessor(dst);
+        SkASSERT(0 == dstIndex);
+    }
+
+    const char* name() const override { return "ComposeOne"; }
+
+    SkString dumpInfo() const override {
+        SkString str;
+
+        for (int i = 0; i < this->numChildProcessors(); ++i) {
+            str.append(this->childProcessor(i).dumpInfo());
+        }
+        return str;
+    }
+
+    void onGetGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {
+        GR_STATIC_ASSERT((SkXfermode::kLastMode & SK_MaxU16) == SkXfermode::kLastMode);
+        b->add32(fMode | (fChild << 16));
+    }
+
+    SkXfermode::Mode mode() const { return fMode; }
+
+    Child child() const { return fChild; }
+
+protected:
+    bool onIsEqual(const GrFragmentProcessor& that) const override {
+        return fMode == that.cast<ComposeOneFragmentProcessor>().fMode;
+    }
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override {
+        SkXfermode::Coeff skSrcCoeff, skDstCoeff;
+        if (SkXfermode::ModeAsCoeff(fMode, &skSrcCoeff, &skDstCoeff)) {
+            GrBlendCoeff srcCoeff = SkXfermodeCoeffToGrBlendCoeff(skSrcCoeff);
+            GrBlendCoeff dstCoeff = SkXfermodeCoeffToGrBlendCoeff(skDstCoeff);
+            GrInvariantOutput childOutput(0xFFFFFFFF, kRGBA_GrColorComponentFlags, false);
+            this->childProcessor(0).computeInvariantOutput(&childOutput);
+            GrColor blendColor;
+            GrColorComponentFlags blendFlags;
+            if (kDst_Child == fChild) {
+                GrGetCoeffBlendKnownComponents(srcCoeff, dstCoeff,
+                                               inout->color(), inout->validFlags(),
+                                               childOutput.color(), childOutput.validFlags(),
+                                               &blendColor, &blendFlags);
+            } else {
+                GrGetCoeffBlendKnownComponents(srcCoeff, dstCoeff,
+                                               childOutput.color(), childOutput.validFlags(),
+                                               inout->color(), inout->validFlags(),
+                                               &blendColor, &blendFlags);
+            }
+            // will the shader code reference the input color?
+            GrInvariantOutput::ReadInput readsInput = GrInvariantOutput::kWillNot_ReadInput;
+            if (kDst_Child == fChild) {
+                if (kZero_GrBlendCoeff != srcCoeff || GrBlendCoeffRefsSrc(dstCoeff)) {
+                    readsInput = GrInvariantOutput::kWill_ReadInput;
+                }
+            } else {
+                if (kZero_GrBlendCoeff != dstCoeff || GrBlendCoeffRefsDst(srcCoeff)) {
+                    readsInput = GrInvariantOutput::kWill_ReadInput;
+                }
+            }
+            inout->setToOther(blendFlags, blendColor, readsInput);
+        } else {
+            inout->setToUnknown(GrInvariantOutput::kWill_ReadInput);
+        }
+    }
+
+private:
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
+
+    SkXfermode::Mode    fMode;
+    Child               fChild;
+
+    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
+
+    typedef GrFragmentProcessor INHERITED;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+class GLComposeOneFragmentProcessor : public GrGLSLFragmentProcessor {
+public:
+    GLComposeOneFragmentProcessor(const GrProcessor& processor) {}
+
+    void emitCode(EmitArgs& args) override {
+        GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+        SkXfermode::Mode mode = args.fFp.cast<ComposeOneFragmentProcessor>().mode();
+        ComposeOneFragmentProcessor::Child child =
+            args.fFp.cast<ComposeOneFragmentProcessor>().child();
+        SkString childColor("child");
+        this->emitChild(0, nullptr, &childColor, args);
+
+        const char* inputColor = args.fInputColor;
+        // We don't try to optimize for this case at all
+        if (!inputColor) {
+            fragBuilder->codeAppendf("const vec4 ones = vec4(1);");
+            inputColor = "ones";
+        }
+
+        // emit blend code
+        fragBuilder->codeAppendf("// Compose Xfer Mode: %s\n", SkXfermode::ModeName(mode));
+        const char* childStr = childColor.c_str();
+        if (ComposeOneFragmentProcessor::kDst_Child == child) {
+            GrGLSLBlend::AppendMode(fragBuilder, inputColor, childStr, args.fOutputColor, mode);
+        } else {
+            GrGLSLBlend::AppendMode(fragBuilder, childStr, inputColor, args.fOutputColor, mode);
+        }
+    }
+
+private:
+    typedef GrGLSLFragmentProcessor INHERITED;
+};
+
+/////////////////////////////////////////////////////////////////////
+
+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(ComposeOneFragmentProcessor);
+
+const GrFragmentProcessor* ComposeOneFragmentProcessor::TestCreate(GrProcessorTestData* d) {
+    // Create one random frag procs.
+    // For now, we'll prevent either children from being a shader with children to prevent the
+    // possibility of an arbitrarily large tree of procs.
+    SkAutoTUnref<const GrFragmentProcessor> dst(GrProcessorUnitTest::CreateChildFP(d));
+    SkXfermode::Mode mode = static_cast<SkXfermode::Mode>(
+        d->fRandom->nextRangeU(0, SkXfermode::kLastMode));
+    ComposeOneFragmentProcessor::Child child = d->fRandom->nextBool() ?
+        ComposeOneFragmentProcessor::kDst_Child :
+        ComposeOneFragmentProcessor::kSrc_Child;
+    return new ComposeOneFragmentProcessor(dst, mode, child);
+}
+
+GrGLSLFragmentProcessor* ComposeOneFragmentProcessor::onCreateGLSLInstance() const {
+    return new GLComposeOneFragmentProcessor(*this);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+const GrFragmentProcessor* GrXfermodeFragmentProcessor::CreateFromDstProcessor(
+    const GrFragmentProcessor* dst, SkXfermode::Mode mode) {
+    switch (mode) {
+        case SkXfermode::kClear_Mode:
+            return GrConstColorProcessor::Create(GrColor_TRANSPARENT_BLACK,
+                                                 GrConstColorProcessor::kIgnore_InputMode);
+        case SkXfermode::kSrc_Mode:
+            return nullptr;
+        default:
+            return new ComposeOneFragmentProcessor(dst, mode,
+                                                   ComposeOneFragmentProcessor::kDst_Child);
+    }
+}
+
+const GrFragmentProcessor* GrXfermodeFragmentProcessor::CreateFromSrcProcessor(
+    const GrFragmentProcessor* src, SkXfermode::Mode mode) {
+    switch (mode) {
+        case SkXfermode::kClear_Mode:
+            return GrConstColorProcessor::Create(GrColor_TRANSPARENT_BLACK,
+                                                 GrConstColorProcessor::kIgnore_InputMode);
+        case SkXfermode::kDst_Mode:
+            return nullptr;
+        default:
+            return new ComposeOneFragmentProcessor(src, mode,
+                                                   ComposeOneFragmentProcessor::kSrc_Child);
+    }
+}
diff --git a/gfx/skia/skia/src/gpu/effects/GrYUVtoRGBEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrYUVtoRGBEffect.cpp
index 15e51a2c625d..6d1c864b82cd 100644
--- a/gfx/skia/skia/src/gpu/effects/GrYUVtoRGBEffect.cpp
+++ b/gfx/skia/skia/src/gpu/effects/GrYUVtoRGBEffect.cpp
@@ -8,99 +8,176 @@
 #include "GrYUVtoRGBEffect.h"
 
 #include "GrCoordTransform.h"
-#include "GrEffect.h"
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
-#include "GrTBackendEffectFactory.h"
+#include "GrInvariantOutput.h"
+#include "GrProcessor.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
 
 namespace {
 
-class YUVtoRGBEffect : public GrEffect {
+class YUVtoRGBEffect : public GrFragmentProcessor {
 public:
-    static GrEffect* Create(GrTexture* yTexture, GrTexture* uTexture, GrTexture* vTexture) {
-        return SkNEW_ARGS(YUVtoRGBEffect, (yTexture, uTexture, vTexture));
+    static GrFragmentProcessor* Create(GrTexture* yTexture, GrTexture* uTexture,
+                                       GrTexture* vTexture, const SkISize sizes[3],
+                                       SkYUVColorSpace colorSpace) {
+        SkScalar w[3], h[3];
+        w[0] = SkIntToScalar(sizes[0].fWidth)  / SkIntToScalar(yTexture->width());
+        h[0] = SkIntToScalar(sizes[0].fHeight) / SkIntToScalar(yTexture->height());
+        w[1] = SkIntToScalar(sizes[1].fWidth)  / SkIntToScalar(uTexture->width());
+        h[1] = SkIntToScalar(sizes[1].fHeight) / SkIntToScalar(uTexture->height());
+        w[2] = SkIntToScalar(sizes[2].fWidth)  / SkIntToScalar(vTexture->width());
+        h[2] = SkIntToScalar(sizes[2].fHeight) / SkIntToScalar(vTexture->height());
+        SkMatrix yuvMatrix[3];
+        yuvMatrix[0] = GrCoordTransform::MakeDivByTextureWHMatrix(yTexture);
+        yuvMatrix[1] = yuvMatrix[0];
+        yuvMatrix[1].preScale(w[1] / w[0], h[1] / h[0]);
+        yuvMatrix[2] = yuvMatrix[0];
+        yuvMatrix[2].preScale(w[2] / w[0], h[2] / h[0]);
+        GrTextureParams::FilterMode uvFilterMode =
+            ((sizes[1].fWidth  != sizes[0].fWidth) ||
+             (sizes[1].fHeight != sizes[0].fHeight) ||
+             (sizes[2].fWidth  != sizes[0].fWidth) ||
+             (sizes[2].fHeight != sizes[0].fHeight)) ?
+            GrTextureParams::kBilerp_FilterMode :
+            GrTextureParams::kNone_FilterMode;
+        return new YUVtoRGBEffect(yTexture, uTexture, vTexture, yuvMatrix, uvFilterMode,
+                                  colorSpace);
     }
 
-    static const char* Name() { return "YUV to RGB"; }
+    const char* name() const override { return "YUV to RGB"; }
 
-    virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE {
-        return GrTBackendEffectFactory<YUVtoRGBEffect>::getInstance();
+    SkYUVColorSpace getColorSpace() const {
+        return fColorSpace;
     }
 
-    virtual void getConstantColorComponents(GrColor* color,
-                                            uint32_t* validFlags) const SK_OVERRIDE {
-        // YUV is opaque
-        *color = 0xFF;
-        *validFlags = kA_GrColorComponentFlag;
-    }
-
-    class GLEffect : public GrGLEffect {
+    class GLSLProcessor : public GrGLSLFragmentProcessor {
     public:
+        static const float kJPEGConversionMatrix[16];
+        static const float kRec601ConversionMatrix[16];
+        static const float kRec709ConversionMatrix[16];
+
         // this class always generates the same code.
-        static void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*) {}
+        static void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*) {}
 
-        GLEffect(const GrBackendEffectFactory& factory,
-                 const GrDrawEffect&)
-        : INHERITED(factory) {
+        GLSLProcessor(const GrProcessor&) {}
+
+        virtual void emitCode(EmitArgs& args) override {
+            GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+
+            const char* yuvMatrix   = nullptr;
+            fMatrixUni = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                                   kMat44f_GrSLType, kDefault_GrSLPrecision,
+                                                   "YUVMatrix", &yuvMatrix);
+            fragBuilder->codeAppendf("\t%s = vec4(\n\t\t", args.fOutputColor);
+            fragBuilder->appendTextureLookup(args.fSamplers[0], args.fCoords[0].c_str(),
+                                             args.fCoords[0].getType());
+            fragBuilder->codeAppend(".r,\n\t\t");
+            fragBuilder->appendTextureLookup(args.fSamplers[1], args.fCoords[1].c_str(),
+                                             args.fCoords[1].getType());
+            fragBuilder->codeAppend(".r,\n\t\t");
+            fragBuilder->appendTextureLookup(args.fSamplers[2], args.fCoords[2].c_str(),
+                                             args.fCoords[2].getType());
+            fragBuilder->codeAppendf(".r,\n\t\t1.0) * %s;\n", yuvMatrix);
         }
 
-        virtual void emitCode(GrGLShaderBuilder* builder,
-                              const GrDrawEffect&,
-                              const GrEffectKey&,
-                              const char* outputColor,
-                              const char* inputColor,
-                              const TransformedCoordsArray& coords,
-                              const TextureSamplerArray& samplers) SK_OVERRIDE {
-            const char* yuvMatrix   = "yuvMatrix";
-            builder->fsCodeAppendf("\tconst mat4 %s = mat4(1.0,  0.0,    1.402, -0.701,\n\t\t\t"
-                                                          "1.0, -0.344, -0.714,  0.529,\n\t\t\t"
-                                                          "1.0,  1.772,  0.0,   -0.886,\n\t\t\t"
-                                                          "0.0,  0.0,    0.0,    1.0);\n",
-                                   yuvMatrix);
-            builder->fsCodeAppendf("\t%s = vec4(\n\t\t", outputColor);
-            builder->fsAppendTextureLookup(samplers[0], coords[0].c_str(), coords[0].type());
-            builder->fsCodeAppend(".r,\n\t\t");
-            builder->fsAppendTextureLookup(samplers[1], coords[0].c_str(), coords[0].type());
-            builder->fsCodeAppend(".r,\n\t\t");
-            builder->fsAppendTextureLookup(samplers[2], coords[0].c_str(), coords[0].type());
-            builder->fsCodeAppendf(".r,\n\t\t1.0) * %s;\n", yuvMatrix);
+    protected:
+        virtual void onSetData(const GrGLSLProgramDataManager& pdman,
+                               const GrProcessor& processor) override {
+            const YUVtoRGBEffect& yuvEffect = processor.cast<YUVtoRGBEffect>();
+            switch (yuvEffect.getColorSpace()) {
+                case kJPEG_SkYUVColorSpace:
+                    pdman.setMatrix4f(fMatrixUni, kJPEGConversionMatrix);
+                    break;
+                case kRec601_SkYUVColorSpace:
+                    pdman.setMatrix4f(fMatrixUni, kRec601ConversionMatrix);
+                    break;
+                case kRec709_SkYUVColorSpace:
+                    pdman.setMatrix4f(fMatrixUni, kRec709ConversionMatrix);
+                    break;
+            }
         }
 
-        typedef GrGLEffect INHERITED;
+    private:
+        GrGLSLProgramDataManager::UniformHandle fMatrixUni;
+
+        typedef GrGLSLFragmentProcessor INHERITED;
     };
 
 private:
-    YUVtoRGBEffect(GrTexture* yTexture, GrTexture* uTexture, GrTexture* vTexture)
-    : fCoordTransform(kLocal_GrCoordSet, MakeDivByTextureWHMatrix(yTexture), yTexture)
+    YUVtoRGBEffect(GrTexture* yTexture, GrTexture* uTexture, GrTexture* vTexture,
+                   const SkMatrix yuvMatrix[3], GrTextureParams::FilterMode uvFilterMode,
+                   SkYUVColorSpace colorSpace)
+    : fYTransform(kLocal_GrCoordSet, yuvMatrix[0], yTexture, GrTextureParams::kNone_FilterMode)
     , fYAccess(yTexture)
-    , fUAccess(uTexture)
-    , fVAccess(vTexture) {
-        this->addCoordTransform(&fCoordTransform);
+    , fUTransform(kLocal_GrCoordSet, yuvMatrix[1], uTexture, uvFilterMode)
+    , fUAccess(uTexture, uvFilterMode)
+    , fVTransform(kLocal_GrCoordSet, yuvMatrix[2], vTexture, uvFilterMode)
+    , fVAccess(vTexture, uvFilterMode)
+    , fColorSpace(colorSpace) {
+        this->initClassID<YUVtoRGBEffect>();
+        this->addCoordTransform(&fYTransform);
         this->addTextureAccess(&fYAccess);
+        this->addCoordTransform(&fUTransform);
         this->addTextureAccess(&fUAccess);
+        this->addCoordTransform(&fVTransform);
         this->addTextureAccess(&fVAccess);
-        this->setWillNotUseInputColor();
     }
 
-    virtual bool onIsEqual(const GrEffect& sBase) const {
-        const YUVtoRGBEffect& s = CastEffect<YUVtoRGBEffect>(sBase);
-        return fYAccess.getTexture() == s.fYAccess.getTexture() &&
-               fUAccess.getTexture() == s.fUAccess.getTexture() &&
-               fVAccess.getTexture() == s.fVAccess.getTexture();
+    GrGLSLFragmentProcessor* onCreateGLSLInstance() const override {
+        return new GLSLProcessor(*this);
     }
 
-    GrCoordTransform fCoordTransform;
+    virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps,
+                                       GrProcessorKeyBuilder* b) const override {
+        GLSLProcessor::GenKey(*this, caps, b);
+    }
+
+    bool onIsEqual(const GrFragmentProcessor& sBase) const override {
+        const YUVtoRGBEffect& s = sBase.cast<YUVtoRGBEffect>();
+        return fColorSpace == s.getColorSpace();
+    }
+
+    void onComputeInvariantOutput(GrInvariantOutput* inout) const override {
+        // YUV is opaque
+        inout->setToOther(kA_GrColorComponentFlag, 0xFF << GrColor_SHIFT_A,
+                          GrInvariantOutput::kWillNot_ReadInput);
+    }
+
+    GrCoordTransform fYTransform;
     GrTextureAccess fYAccess;
+    GrCoordTransform fUTransform;
     GrTextureAccess fUAccess;
+    GrCoordTransform fVTransform;
     GrTextureAccess fVAccess;
+    SkYUVColorSpace fColorSpace;
 
-    typedef GrEffect INHERITED;
+    typedef GrFragmentProcessor INHERITED;
 };
 
+const float YUVtoRGBEffect::GLSLProcessor::kJPEGConversionMatrix[16] = {
+    1.0f,  0.0f,      1.402f,  -0.701f,
+    1.0f, -0.34414f, -0.71414f, 0.529f,
+    1.0f,  1.772f,    0.0f,    -0.886f,
+    0.0f,  0.0f,      0.0f,     1.0};
+const float YUVtoRGBEffect::GLSLProcessor::kRec601ConversionMatrix[16] = {
+    1.164f,  0.0f,    1.596f, -0.87075f,
+    1.164f, -0.391f, -0.813f,  0.52925f,
+    1.164f,  2.018f,  0.0f,   -1.08175f,
+    0.0f,    0.0f,    0.0f,    1.0};
+const float YUVtoRGBEffect::GLSLProcessor::kRec709ConversionMatrix[16] = {
+    1.164f,  0.0f,    1.793f, -0.96925f,
+    1.164f, -0.213f, -0.533f,  0.30025f,
+    1.164f,  2.112f,  0.0f,   -1.12875f,
+    0.0f,    0.0f,    0.0f,    1.0f};
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-GrEffect* GrYUVtoRGBEffect::Create(GrTexture* yTexture, GrTexture* uTexture, GrTexture* vTexture) {
-    return YUVtoRGBEffect::Create(yTexture, uTexture, vTexture);
+GrFragmentProcessor*
+GrYUVtoRGBEffect::Create(GrTexture* yTexture, GrTexture* uTexture, GrTexture* vTexture,
+                         const SkISize sizes[3], SkYUVColorSpace colorSpace) {
+    SkASSERT(yTexture && uTexture && vTexture && sizes);
+    return YUVtoRGBEffect::Create(yTexture, uTexture, vTexture, sizes, colorSpace);
 }
diff --git a/gfx/skia/skia/src/gpu/effects/GrYUVtoRGBEffect.h b/gfx/skia/skia/src/gpu/effects/GrYUVtoRGBEffect.h
index 150acd5a9027..03679788ddb0 100644
--- a/gfx/skia/skia/src/gpu/effects/GrYUVtoRGBEffect.h
+++ b/gfx/skia/skia/src/gpu/effects/GrYUVtoRGBEffect.h
@@ -8,14 +8,17 @@
 #ifndef GrYUVtoRGBEffect_DEFINED
 #define GrYUVtoRGBEffect_DEFINED
 
-class GrEffect;
+#include "SkImageInfo.h"
+
+class GrFragmentProcessor;
 class GrTexture;
 
 namespace GrYUVtoRGBEffect {
     /**
      * Creates an effect that performs color conversion from YUV to RGB
      */
-    GrEffect* Create(GrTexture* yTexture, GrTexture* uTexture, GrTexture* vTexture);
+    GrFragmentProcessor* Create(GrTexture* yTexture, GrTexture* uTexture, GrTexture* vTexture,
+                                const SkISize sizes[3], SkYUVColorSpace colorSpace);
 };
 
 #endif
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLAssembleGLESInterface.h b/gfx/skia/skia/src/gpu/gl/GrGLAssembleGLESInterface.h
deleted file mode 100644
index d3ebebd75671..000000000000
--- a/gfx/skia/skia/src/gpu/gl/GrGLAssembleGLESInterface.h
+++ /dev/null
@@ -1,286 +0,0 @@
-
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/* This file is meant to be included "inline" the implementation that is using the function.
- * The platform native GL implementation header file should be included before this file.
- * Following macros should be defined before this file is included:
- * GET_PROC and GET_PROC_SUFFIX
- *   Call the get function and assign to the interface instance
- * GET_PROC_LOCAL
- *   Call the get function and assign to a local variable
- * GET_LINKED and GET_LINKED_SUFFIX
- *   Get the link-time address of the function and assign it to the interface instance. If
- *   using the linked addresses is not intended, can be the same as GET_PROC.
- */
-
-/**
- * Generic function for creating a GrGLInterface for an OpenGL ES (but not Open GL) context. It
- * calls get() to get each function address. ctx is a generic ptr passed to and interpreted by
- * get().
- */
-static const GrGLInterface* GrGLAssembleGLESInterface(void* ctx, GrGLGetProc get) {
-    const char* verStr = reinterpret_cast<const char*>(glGetString(GR_GL_VERSION));
-    GrGLVersion version = GrGLGetVersionFromString(verStr);
-
-    if (version < GR_GL_VER(2,0)) {
-        return NULL;
-    }
-
-    GET_PROC_LOCAL(GetIntegerv);
-    GET_PROC_LOCAL(GetStringi);
-    GrGLExtensions extensions;
-    if (!extensions.init(kGLES_GrGLStandard, glGetString, GetStringi, GetIntegerv)) {
-        return NULL;
-    }
-
-    GrGLInterface* interface = SkNEW(GrGLInterface);
-    GrGLInterface::Functions* functions = &interface->fFunctions;
-
-    GET_LINKED(ActiveTexture);
-    GET_LINKED(AttachShader);
-    GET_LINKED(BindAttribLocation);
-    GET_LINKED(BindBuffer);
-    GET_LINKED(BindTexture);
-    GET_LINKED_SUFFIX(BindVertexArray, OES);
-    GET_LINKED(BlendColor);
-    GET_LINKED(BlendFunc);
-    GET_LINKED(BufferData);
-    GET_LINKED(BufferSubData);
-    GET_LINKED(Clear);
-    GET_LINKED(ClearColor);
-    GET_LINKED(ClearStencil);
-    GET_LINKED(ColorMask);
-    GET_LINKED(CompileShader);
-    GET_LINKED(CompressedTexImage2D);
-    GET_LINKED(CompressedTexSubImage2D);
-    GET_LINKED(CopyTexSubImage2D);
-    GET_LINKED(CreateProgram);
-    GET_LINKED(CreateShader);
-    GET_LINKED(CullFace);
-    GET_LINKED(DeleteBuffers);
-    GET_LINKED(DeleteProgram);
-    GET_LINKED(DeleteShader);
-    GET_LINKED(DeleteTextures);
-    GET_LINKED_SUFFIX(DeleteVertexArrays, OES);
-    GET_LINKED(DepthMask);
-    GET_LINKED(Disable);
-    GET_LINKED(DisableVertexAttribArray);
-    GET_LINKED(DrawArrays);
-    GET_LINKED(DrawElements);
-    GET_LINKED(Enable);
-    GET_LINKED(EnableVertexAttribArray);
-    GET_LINKED(Finish);
-    GET_LINKED(Flush);
-    GET_LINKED(FrontFace);
-    GET_LINKED(GenBuffers);
-    GET_LINKED(GenerateMipmap);
-    GET_LINKED(GenTextures);
-    GET_LINKED_SUFFIX(GenVertexArrays, OES);
-    GET_LINKED(GetBufferParameteriv);
-    GET_LINKED(GetError);
-    GET_LINKED(GetIntegerv);
-    GET_LINKED(GetProgramInfoLog);
-    GET_LINKED(GetProgramiv);
-    GET_LINKED(GetShaderInfoLog);
-    GET_LINKED(GetShaderiv);
-    GET_LINKED(GetString);
-#if GL_ES_VERSION_3_0
-    GET_LINKED(GetStringi);
-#else
-    GET_PROC(GetStringi);
-#endif
-    GET_LINKED(GetUniformLocation);
-    GET_LINKED(LineWidth);
-    GET_LINKED(LinkProgram);
-    GET_LINKED(PixelStorei);
-    GET_LINKED(ReadPixels);
-    GET_LINKED(Scissor);
-#if GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE
-    functions->fShaderSource = (GrGLShaderSourceProc) glShaderSource;
-#else
-    GET_LINKED(ShaderSource);
-#endif
-    GET_LINKED(StencilFunc);
-    GET_LINKED(StencilFuncSeparate);
-    GET_LINKED(StencilMask);
-    GET_LINKED(StencilMaskSeparate);
-    GET_LINKED(StencilOp);
-    GET_LINKED(StencilOpSeparate);
-    GET_LINKED(TexImage2D);
-    GET_LINKED(TexParameteri);
-    GET_LINKED(TexParameteriv);
-    GET_LINKED(TexSubImage2D);
-
-    if (version >= GR_GL_VER(3,0)) {
-#if GL_ES_VERSION_3_0
-        GET_LINKED(TexStorage2D);
-#else
-        GET_PROC(TexStorage2D);
-#endif
-    } else {
-#if GL_EXT_texture_storage
-        GET_LINKED_SUFFIX(TexStorage2D, EXT);
-#else
-        GET_PROC_SUFFIX(TexStorage2D, EXT);
-#endif
-    }
-
-#if GL_EXT_discard_framebuffer
-    GET_LINKED_SUFFIX(DiscardFramebuffer, EXT);
-#endif
-    GET_LINKED(Uniform1f);
-    GET_LINKED(Uniform1i);
-    GET_LINKED(Uniform1fv);
-    GET_LINKED(Uniform1iv);
-    GET_LINKED(Uniform2f);
-    GET_LINKED(Uniform2i);
-    GET_LINKED(Uniform2fv);
-    GET_LINKED(Uniform2iv);
-    GET_LINKED(Uniform3f);
-    GET_LINKED(Uniform3i);
-    GET_LINKED(Uniform3fv);
-    GET_LINKED(Uniform3iv);
-    GET_LINKED(Uniform4f);
-    GET_LINKED(Uniform4i);
-    GET_LINKED(Uniform4fv);
-    GET_LINKED(Uniform4iv);
-    GET_LINKED(UniformMatrix2fv);
-    GET_LINKED(UniformMatrix3fv);
-    GET_LINKED(UniformMatrix4fv);
-    GET_LINKED(UseProgram);
-    GET_LINKED(VertexAttrib4fv);
-    GET_LINKED(VertexAttribPointer);
-    GET_LINKED(Viewport);
-    GET_LINKED(BindFramebuffer);
-    GET_LINKED(BindRenderbuffer);
-    GET_LINKED(CheckFramebufferStatus);
-    GET_LINKED(DeleteFramebuffers);
-    GET_LINKED(DeleteRenderbuffers);
-    GET_LINKED(FramebufferRenderbuffer);
-    GET_LINKED(FramebufferTexture2D);
-
-    if (version >= GR_GL_VER(3,0)) {
-#if GL_ES_VERSION_3_0
-        GET_LINKED(RenderbufferStorageMultisample);
-        GET_LINKED(BlitFramebuffer);
-#else
-        GET_PROC(RenderbufferStorageMultisample);
-        GET_PROC(BlitFramebuffer);
-#endif
-    }
-
-    if (extensions.has("GL_EXT_multisampled_render_to_texture")) {
-#if GL_EXT_multisampled_render_to_texture
-        GET_LINKED_SUFFIX(FramebufferTexture2DMultisample, EXT);
-        functions->fRenderbufferStorageMultisampleES2EXT = glRenderbufferStorageMultisampleEXT;
-#else
-        GET_PROC_SUFFIX(FramebufferTexture2DMultisample, EXT);
-        functions->fRenderbufferStorageMultisampleES2EXT = (GrGLRenderbufferStorageMultisampleProc) get(ctx, "glRenderbufferStorageMultisampleEXT");
-#endif
-    } else if (extensions.has("GL_IMG_multisampled_render_to_texture")) {
-#if GL_IMG_multisampled_render_to_texture
-        GET_LINKED_SUFFIX(FramebufferTexture2DMultisample, IMG);
-        functions->fRenderbufferStorageMultisampleES2EXT = glRenderbufferStorageMultisampleIMG;
-#else
-        GET_PROC_SUFFIX(FramebufferTexture2DMultisample, IMG);
-        functions->fRenderbufferStorageMultisampleES2EXT = (GrGLRenderbufferStorageMultisampleProc) get(ctx, "glRenderbufferStorageMultisampleIMG");
-#endif
-    }
-
-    GET_LINKED(GenFramebuffers);
-    GET_LINKED(GenRenderbuffers);
-    GET_LINKED(GetFramebufferAttachmentParameteriv);
-    GET_LINKED(GetRenderbufferParameteriv);
-    GET_LINKED(RenderbufferStorage);
-
-#if GL_OES_mapbuffer
-    GET_LINKED_SUFFIX(MapBuffer, OES);
-    GET_LINKED_SUFFIX(UnmapBuffer, OES);
-#else
-    GET_PROC_SUFFIX(MapBuffer, OES);
-    GET_PROC_SUFFIX(UnmapBuffer, OES);
-#endif
-
-    if (version >= GR_GL_VER(3,0)) {
-#if GL_ES_VERSION_3_0
-        GET_LINKED(MapBufferRange);
-        GET_LINKED(FlushMappedBufferRange);
-#else
-        GET_PROC(MapBufferRange);
-        GET_PROC(FlushMappedBufferRange);
-#endif
-    } else if (extensions.has("GL_EXT_map_buffer_range")) {
-#if GL_EXT_map_buffer_range
-        GET_LINKED_SUFFIX(MapBufferRange, EXT);
-        GET_LINKED_SUFFIX(FlushMappedBufferRange, EXT);
-#else
-        GET_PROC_SUFFIX(MapBufferRange, EXT);
-        GET_PROC_SUFFIX(FlushMappedBufferRange, EXT);
-#endif
-    }
-
-    if (extensions.has("GL_EXT_debug_marker")) {
-        GET_PROC(InsertEventMarker);
-        GET_PROC(PushGroupMarker);
-        GET_PROC(PopGroupMarker);
-        // The below check is here because a device has been found that has the extension string but
-        // returns NULL from the eglGetProcAddress for the functions
-        if (NULL == functions->fInsertEventMarker ||
-            NULL == functions->fPushGroupMarker ||
-            NULL == functions->fPopGroupMarker) {
-            extensions.remove("GL_EXT_debug_marker");
-        }
-    }
-
-#if GL_ES_VERSION_3_0
-    GET_LINKED(InvalidateFramebuffer);
-    GET_LINKED(InvalidateSubFramebuffer);
-#else
-    GET_PROC(InvalidateFramebuffer);
-    GET_PROC(InvalidateSubFramebuffer);
-#endif
-    GET_PROC(InvalidateBufferData);
-    GET_PROC(InvalidateBufferSubData);
-    GET_PROC(InvalidateTexImage);
-    GET_PROC(InvalidateTexSubImage);
-
-#if GL_ES_VERSION_3_1
-    GET_LINKED(GetProgramResourceLocation);
-#else
-    if (version >= GR_GL_VER(3,1)) {
-        GET_PROC(GetProgramResourceLocation);
-    }
-#endif
-
-    if (extensions.has("GL_NV_path_rendering")) {
-        GET_PROC_SUFFIX(MatrixLoadf, EXT);
-        GET_PROC_SUFFIX(MatrixLoadIdentity, EXT);
-        GET_PROC_SUFFIX(PathCommands, NV);
-        GET_PROC_SUFFIX(PathCoords, NV);
-        GET_PROC_SUFFIX(PathParameteri, NV);
-        GET_PROC_SUFFIX(PathParameterf, NV);
-        GET_PROC_SUFFIX(GenPaths, NV);
-        GET_PROC_SUFFIX(DeletePaths, NV);
-        GET_PROC_SUFFIX(IsPath, NV);
-        GET_PROC_SUFFIX(PathStencilFunc, NV);
-        GET_PROC_SUFFIX(StencilFillPath, NV);
-        GET_PROC_SUFFIX(StencilStrokePath, NV);
-        GET_PROC_SUFFIX(StencilFillPathInstanced, NV);
-        GET_PROC_SUFFIX(StencilStrokePathInstanced, NV);
-        GET_PROC_SUFFIX(CoverFillPath, NV);
-        GET_PROC_SUFFIX(CoverStrokePath, NV);
-        GET_PROC_SUFFIX(CoverFillPathInstanced, NV);
-        GET_PROC_SUFFIX(CoverStrokePathInstanced, NV);
-        GET_PROC_SUFFIX(ProgramPathFragmentInputGen, NV);
-    }
-
-    interface->fStandard = kGLES_GrGLStandard;
-    interface->fExtensions.swap(&extensions);
-
-    return interface;
-}
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLAssembleInterface.cpp b/gfx/skia/skia/src/gpu/gl/GrGLAssembleInterface.cpp
index c6b3f937933a..dbc54adbe494 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLAssembleInterface.cpp
+++ b/gfx/skia/skia/src/gpu/gl/GrGLAssembleInterface.cpp
@@ -14,14 +14,52 @@
 #define GET_PROC_SUFFIX(F, S) functions->f ## F = (GrGL ## F ## Proc) get(ctx, "gl" #F #S)
 #define GET_PROC_LOCAL(F) GrGL ## F ## Proc F = (GrGL ## F ## Proc) get(ctx, "gl" #F)
 
+#define GET_EGL_PROC_SUFFIX(F, S) functions->fEGL ## F = (GrEGL ## F ## Proc) get(ctx, "egl" #F #S)
+
+const GrGLInterface* GrGLAssembleInterface(void* ctx, GrGLGetProc get) {
+    GET_PROC_LOCAL(GetString);
+    if (nullptr == GetString) {
+        return nullptr;
+    }
+
+    const char* verStr = reinterpret_cast<const char*>(GetString(GR_GL_VERSION));
+    if (nullptr == verStr) {
+        return nullptr;
+    }
+
+    GrGLStandard standard = GrGLGetStandardInUseFromString(verStr);
+
+    if (kGLES_GrGLStandard == standard) {
+        return GrGLAssembleGLESInterface(ctx, get);
+    } else if (kGL_GrGLStandard == standard) {
+        return GrGLAssembleGLInterface(ctx, get);
+    }
+    return nullptr;
+}
+
+static void get_egl_query_and_display(GrEGLQueryStringProc* queryString, GrEGLDisplay* display,
+                                      void* ctx, GrGLGetProc get) {
+    *queryString = (GrEGLQueryStringProc) get(ctx, "eglQueryString");
+    *display = GR_EGL_NO_DISPLAY;
+    if (*queryString) {
+        GrEGLGetCurrentDisplayProc getCurrentDisplay =
+            (GrEGLGetCurrentDisplayProc) get(ctx, "eglGetCurrentDisplay");
+        if (getCurrentDisplay) {
+            *display = getCurrentDisplay();
+        } else {
+            *queryString = nullptr;
+        }
+    }
+}
+
 const GrGLInterface* GrGLAssembleGLInterface(void* ctx, GrGLGetProc get) {
     GET_PROC_LOCAL(GetString);
     GET_PROC_LOCAL(GetStringi);
     GET_PROC_LOCAL(GetIntegerv);
 
-    // GetStringi may be NULL depending on the GL version.
-    if (NULL == GetString || NULL == GetIntegerv) {
-        return NULL;
+    // GetStringi may be nullptr depending on the GL version.
+    if (nullptr == GetString || nullptr == GetIntegerv) {
+        return nullptr;
     }
 
     const char* versionString = (const char*) GetString(GR_GL_VERSION);
@@ -29,15 +67,19 @@ const GrGLInterface* GrGLAssembleGLInterface(void* ctx, GrGLGetProc get) {
 
     if (glVer < GR_GL_VER(1,5) || GR_GL_INVALID_VER == glVer) {
         // We must have array and element_array buffer objects.
-        return NULL;
+        return nullptr;
     }
 
+    GrEGLQueryStringProc queryString;
+    GrEGLDisplay display;
+    get_egl_query_and_display(&queryString, &display, ctx, get);
     GrGLExtensions extensions;
-    if (!extensions.init(kGL_GrGLStandard, GetString, GetStringi, GetIntegerv)) {
-        return NULL;
+    if (!extensions.init(kGL_GrGLStandard, GetString, GetStringi, GetIntegerv, queryString,
+                         display)) {
+        return nullptr;
     }
 
-    GrGLInterface* interface = SkNEW(GrGLInterface());
+    GrGLInterface* interface = new GrGLInterface();
     GrGLInterface::Functions* functions = &interface->fFunctions;
 
     GET_PROC(ActiveTexture);
@@ -49,14 +91,28 @@ const GrGLInterface* GrGLAssembleGLInterface(void* ctx, GrGLGetProc get) {
     }
     GET_PROC(BeginQuery);
     GET_PROC(BindTexture);
-    GET_PROC(BlendFunc);
 
-    if (glVer >= GR_GL_VER(1,4) ||
-        extensions.has("GL_ARB_imaging") ||
-        extensions.has("GL_EXT_blend_color")) {
-        GET_PROC(BlendColor);
+    if (extensions.has("GL_KHR_blend_equation_advanced")) {
+        GET_PROC_SUFFIX(BlendBarrier, KHR);
+    } else if (extensions.has("GL_NV_blend_equation_advanced")) {
+        GET_PROC_SUFFIX(BlendBarrier, NV);
     }
 
+    if (glVer >= GR_GL_VER(1,4) ||
+        extensions.has("GL_ARB_imaging")) {
+        GET_PROC(BlendColor);
+    } else if (extensions.has("GL_EXT_blend_color")) {
+        GET_PROC_SUFFIX(BlendColor, EXT);
+    }
+
+    if (glVer >= GR_GL_VER(1,4) ||
+        extensions.has("GL_ARB_imaging")) {
+        GET_PROC(BlendEquation);
+    } else if (extensions.has("GL_EXT_blend_subtract")) {
+        GET_PROC_SUFFIX(BlendEquation, EXT);
+    }
+
+    GET_PROC(BlendFunc);
     GET_PROC(BufferData);
     GET_PROC(BufferSubData);
     GET_PROC(Clear);
@@ -110,18 +166,19 @@ const GrGLInterface* GrGLAssembleGLInterface(void* ctx, GrGLGetProc get) {
     GET_PROC(GetShaderiv);
     GET_PROC(GetString);
     GET_PROC(GetStringi);
+    GET_PROC(GetShaderPrecisionFormat);
     GET_PROC(GetTexLevelParameteriv);
     GET_PROC(GenQueries);
     GET_PROC(GenTextures);
     GET_PROC(GetUniformLocation);
+    GET_PROC(IsTexture);
     GET_PROC(LineWidth);
     GET_PROC(LinkProgram);
     GET_PROC(MapBuffer);
-    if (extensions.has("GL_EXT_direct_state_access")) {
-        GET_PROC_SUFFIX(MatrixLoadf, EXT);
-        GET_PROC_SUFFIX(MatrixLoadIdentity, EXT);
-    }
     GET_PROC(PixelStorei);
+    if (extensions.has("GL_EXT_raster_multisample")) {
+        GET_PROC_SUFFIX(RasterSamples, EXT);
+    }
     GET_PROC(ReadBuffer);
     GET_PROC(ReadPixels);
     GET_PROC(Scissor);
@@ -141,6 +198,11 @@ const GrGLInterface* GrGLAssembleGLInterface(void* ctx, GrGLGetProc get) {
         GET_PROC_SUFFIX(TexStorage2D, EXT);
     }
     GET_PROC(TexSubImage2D);
+    if (glVer >= GR_GL_VER(4,5) || extensions.has("GL_ARB_texture_barrier")) {
+        GET_PROC(TextureBarrier);
+    } else if (extensions.has("GL_NV_texture_barrier")) {
+        GET_PROC_SUFFIX(TextureBarrier, NV);
+    }
     GET_PROC(Uniform1f);
     GET_PROC(Uniform1i);
     GET_PROC(Uniform1fv);
@@ -162,6 +224,9 @@ const GrGLInterface* GrGLAssembleGLInterface(void* ctx, GrGLGetProc get) {
     GET_PROC(UniformMatrix4fv);
     GET_PROC(UnmapBuffer);
     GET_PROC(UseProgram);
+    GET_PROC(VertexAttrib1f);
+    GET_PROC(VertexAttrib2fv);
+    GET_PROC(VertexAttrib3fv);
     GET_PROC(VertexAttrib4fv);
     GET_PROC(VertexAttribPointer);
     GET_PROC(Viewport);
@@ -172,6 +237,10 @@ const GrGLInterface* GrGLAssembleGLInterface(void* ctx, GrGLGetProc get) {
         GET_PROC(BindVertexArray);
         GET_PROC(GenVertexArrays);
         GET_PROC(DeleteVertexArrays);
+    } else if (extensions.has("GL_APPLE_vertex_array_object")) {
+        GET_PROC_SUFFIX(BindVertexArray, APPLE);
+        GET_PROC_SUFFIX(GenVertexArrays, APPLE);
+        GET_PROC_SUFFIX(DeleteVertexArrays, APPLE);
     }
 
     if (glVer >= GR_GL_VER(3,0) || extensions.has("GL_ARB_map_buffer_range")) {
@@ -218,12 +287,13 @@ const GrGLInterface* GrGLAssembleGLInterface(void* ctx, GrGLGetProc get) {
     } else {
         // we must have FBOs
         delete interface;
-        return NULL;
+        return nullptr;
     }
 
     if (extensions.has("GL_NV_path_rendering")) {
+        GET_PROC_SUFFIX(MatrixLoadf, EXT);
+        GET_PROC_SUFFIX(MatrixLoadIdentity, EXT);
         GET_PROC_SUFFIX(PathCommands, NV);
-        GET_PROC_SUFFIX(PathCoords, NV);
         GET_PROC_SUFFIX(PathParameteri, NV);
         GET_PROC_SUFFIX(PathParameterf, NV);
         GET_PROC_SUFFIX(GenPaths, NV);
@@ -234,14 +304,21 @@ const GrGLInterface* GrGLAssembleGLInterface(void* ctx, GrGLGetProc get) {
         GET_PROC_SUFFIX(StencilStrokePath, NV);
         GET_PROC_SUFFIX(StencilFillPathInstanced, NV);
         GET_PROC_SUFFIX(StencilStrokePathInstanced, NV);
-        GET_PROC_SUFFIX(PathTexGen, NV);
         GET_PROC_SUFFIX(CoverFillPath, NV);
         GET_PROC_SUFFIX(CoverStrokePath, NV);
         GET_PROC_SUFFIX(CoverFillPathInstanced, NV);
         GET_PROC_SUFFIX(CoverStrokePathInstanced, NV);
+        GET_PROC_SUFFIX(StencilThenCoverFillPath, NV);
+        GET_PROC_SUFFIX(StencilThenCoverStrokePath, NV);
+        GET_PROC_SUFFIX(StencilThenCoverFillPathInstanced, NV);
+        GET_PROC_SUFFIX(StencilThenCoverStrokePathInstanced, NV);
         GET_PROC_SUFFIX(ProgramPathFragmentInputGen, NV);
     }
 
+    if (extensions.has("GL_NV_framebuffer_mixed_samples")) {
+        GET_PROC_SUFFIX(CoverageModulation, NV);
+    }
+
     if (extensions.has("GL_EXT_debug_marker")) {
         GET_PROC_SUFFIX(InsertEventMarker, EXT);
         GET_PROC_SUFFIX(PushGroupMarker, EXT);
@@ -261,8 +338,471 @@ const GrGLInterface* GrGLAssembleGLInterface(void* ctx, GrGLGetProc get) {
         GET_PROC(GetProgramResourceLocation);
     }
 
+    if (glVer >= GR_GL_VER(3,1) || extensions.has("GL_ARB_draw_instanced") ||
+        extensions.has("GL_EXT_draw_instanced")) {
+        GET_PROC(DrawArraysInstanced);
+        GET_PROC(DrawElementsInstanced);
+    }
+
+    if (glVer >= GR_GL_VER(3,2) || extensions.has("GL_ARB_instanced_arrays")) {
+        GET_PROC(VertexAttribDivisor);
+    }
+
+    if (extensions.has("GL_NV_bindless_texture")) {
+        GET_PROC_SUFFIX(GetTextureHandle, NV);
+        GET_PROC_SUFFIX(GetTextureSamplerHandle, NV);
+        GET_PROC_SUFFIX(MakeTextureHandleResident, NV);
+        GET_PROC_SUFFIX(MakeTextureHandleNonResident, NV);
+        GET_PROC_SUFFIX(GetImageHandle, NV);
+        GET_PROC_SUFFIX(MakeImageHandleResident, NV);
+        GET_PROC_SUFFIX(MakeImageHandleNonResident, NV);
+        GET_PROC_SUFFIX(IsTextureHandleResident, NV);
+        GET_PROC_SUFFIX(IsImageHandleResident, NV);
+        GET_PROC_SUFFIX(UniformHandleui64, NV);
+        GET_PROC_SUFFIX(UniformHandleui64v, NV);
+        GET_PROC_SUFFIX(ProgramUniformHandleui64, NV);
+        GET_PROC_SUFFIX(ProgramUniformHandleui64v, NV);
+    }
+
+    if (extensions.has("GL_EXT_direct_state_access")) {
+        GET_PROC_SUFFIX(TextureParameteri, EXT);
+        GET_PROC_SUFFIX(TextureParameteriv, EXT);
+        GET_PROC_SUFFIX(TextureParameterf, EXT);
+        GET_PROC_SUFFIX(TextureParameterfv, EXT);
+        GET_PROC_SUFFIX(TextureImage1D, EXT);
+        GET_PROC_SUFFIX(TextureImage2D, EXT);
+        GET_PROC_SUFFIX(TextureSubImage1D, EXT);
+        GET_PROC_SUFFIX(TextureSubImage2D, EXT);
+        GET_PROC_SUFFIX(CopyTextureImage1D, EXT);
+        GET_PROC_SUFFIX(CopyTextureImage2D, EXT);
+        GET_PROC_SUFFIX(CopyTextureSubImage1D, EXT);
+        GET_PROC_SUFFIX(CopyTextureSubImage2D, EXT);
+        GET_PROC_SUFFIX(GetTextureImage, EXT);
+        GET_PROC_SUFFIX(GetTextureParameterfv, EXT);
+        GET_PROC_SUFFIX(GetTextureParameteriv, EXT);
+        GET_PROC_SUFFIX(GetTextureLevelParameterfv, EXT);
+        GET_PROC_SUFFIX(GetTextureLevelParameteriv, EXT);
+        if (glVer >= GR_GL_VER(1,2)) {
+            GET_PROC_SUFFIX(TextureImage3D, EXT);
+            GET_PROC_SUFFIX(TextureSubImage3D, EXT);
+            GET_PROC_SUFFIX(CopyTextureSubImage3D, EXT);
+            GET_PROC_SUFFIX(CompressedTextureImage3D, EXT);
+            GET_PROC_SUFFIX(CompressedTextureImage2D, EXT);
+            GET_PROC_SUFFIX(CompressedTextureImage1D, EXT);
+            GET_PROC_SUFFIX(CompressedTextureSubImage3D, EXT);
+            GET_PROC_SUFFIX(CompressedTextureSubImage2D, EXT);
+            GET_PROC_SUFFIX(CompressedTextureSubImage1D, EXT);
+            GET_PROC_SUFFIX(GetCompressedTextureImage, EXT);
+        }
+        if (glVer >= GR_GL_VER(1,5)) {
+            GET_PROC_SUFFIX(NamedBufferData, EXT);
+            GET_PROC_SUFFIX(NamedBufferSubData, EXT);
+            GET_PROC_SUFFIX(MapNamedBuffer, EXT);
+            GET_PROC_SUFFIX(UnmapNamedBuffer, EXT);
+            GET_PROC_SUFFIX(GetNamedBufferParameteriv, EXT);
+            GET_PROC_SUFFIX(GetNamedBufferPointerv, EXT);
+            GET_PROC_SUFFIX(GetNamedBufferSubData, EXT);
+        }
+        if (glVer >= GR_GL_VER(2,0)) {
+            GET_PROC_SUFFIX(ProgramUniform1f, EXT);
+            GET_PROC_SUFFIX(ProgramUniform2f, EXT);
+            GET_PROC_SUFFIX(ProgramUniform3f, EXT);
+            GET_PROC_SUFFIX(ProgramUniform4f, EXT);
+            GET_PROC_SUFFIX(ProgramUniform1i, EXT);
+            GET_PROC_SUFFIX(ProgramUniform2i, EXT);
+            GET_PROC_SUFFIX(ProgramUniform3i, EXT);
+            GET_PROC_SUFFIX(ProgramUniform4i, EXT);
+            GET_PROC_SUFFIX(ProgramUniform1fv, EXT);
+            GET_PROC_SUFFIX(ProgramUniform2fv, EXT);
+            GET_PROC_SUFFIX(ProgramUniform3fv, EXT);
+            GET_PROC_SUFFIX(ProgramUniform4fv, EXT);
+            GET_PROC_SUFFIX(ProgramUniform1iv, EXT);
+            GET_PROC_SUFFIX(ProgramUniform2iv, EXT);
+            GET_PROC_SUFFIX(ProgramUniform3iv, EXT);
+            GET_PROC_SUFFIX(ProgramUniform4iv, EXT);
+            GET_PROC_SUFFIX(ProgramUniformMatrix2fv, EXT);
+            GET_PROC_SUFFIX(ProgramUniformMatrix3fv, EXT);
+            GET_PROC_SUFFIX(ProgramUniformMatrix4fv, EXT);
+        }
+        if (glVer >= GR_GL_VER(2,1)) {
+            GET_PROC_SUFFIX(ProgramUniformMatrix2x3fv, EXT);
+            GET_PROC_SUFFIX(ProgramUniformMatrix3x2fv, EXT);
+            GET_PROC_SUFFIX(ProgramUniformMatrix2x4fv, EXT);
+            GET_PROC_SUFFIX(ProgramUniformMatrix4x2fv, EXT);
+            GET_PROC_SUFFIX(ProgramUniformMatrix3x4fv, EXT);
+            GET_PROC_SUFFIX(ProgramUniformMatrix4x3fv, EXT);
+        }
+        if (glVer >= GR_GL_VER(3,0)) {
+            GET_PROC_SUFFIX(NamedRenderbufferStorage, EXT);
+            GET_PROC_SUFFIX(GetNamedRenderbufferParameteriv, EXT);
+            GET_PROC_SUFFIX(NamedRenderbufferStorageMultisample, EXT);
+            GET_PROC_SUFFIX(CheckNamedFramebufferStatus, EXT);
+            GET_PROC_SUFFIX(NamedFramebufferTexture1D, EXT);
+            GET_PROC_SUFFIX(NamedFramebufferTexture2D, EXT);
+            GET_PROC_SUFFIX(NamedFramebufferTexture3D, EXT);
+            GET_PROC_SUFFIX(NamedFramebufferRenderbuffer, EXT);
+            GET_PROC_SUFFIX(GetNamedFramebufferAttachmentParameteriv, EXT);
+            GET_PROC_SUFFIX(GenerateTextureMipmap, EXT);
+            GET_PROC_SUFFIX(FramebufferDrawBuffer, EXT);
+            GET_PROC_SUFFIX(FramebufferDrawBuffers, EXT);
+            GET_PROC_SUFFIX(FramebufferReadBuffer, EXT);
+            GET_PROC_SUFFIX(GetFramebufferParameteriv, EXT);
+            GET_PROC_SUFFIX(NamedCopyBufferSubData, EXT);
+            GET_PROC_SUFFIX(VertexArrayVertexOffset, EXT);
+            GET_PROC_SUFFIX(VertexArrayColorOffset, EXT);
+            GET_PROC_SUFFIX(VertexArrayEdgeFlagOffset, EXT);
+            GET_PROC_SUFFIX(VertexArrayIndexOffset, EXT);
+            GET_PROC_SUFFIX(VertexArrayNormalOffset, EXT);
+            GET_PROC_SUFFIX(VertexArrayTexCoordOffset, EXT);
+            GET_PROC_SUFFIX(VertexArrayMultiTexCoordOffset, EXT);
+            GET_PROC_SUFFIX(VertexArrayFogCoordOffset, EXT);
+            GET_PROC_SUFFIX(VertexArraySecondaryColorOffset, EXT);
+            GET_PROC_SUFFIX(VertexArrayVertexAttribOffset, EXT);
+            GET_PROC_SUFFIX(VertexArrayVertexAttribIOffset, EXT);
+            GET_PROC_SUFFIX(EnableVertexArray, EXT);
+            GET_PROC_SUFFIX(DisableVertexArray, EXT);
+            GET_PROC_SUFFIX(EnableVertexArrayAttrib, EXT);
+            GET_PROC_SUFFIX(DisableVertexArrayAttrib, EXT);
+            GET_PROC_SUFFIX(GetVertexArrayIntegerv, EXT);
+            GET_PROC_SUFFIX(GetVertexArrayPointerv, EXT);
+            GET_PROC_SUFFIX(GetVertexArrayIntegeri_v, EXT);
+            GET_PROC_SUFFIX(GetVertexArrayPointeri_v, EXT);
+            GET_PROC_SUFFIX(MapNamedBufferRange, EXT);
+            GET_PROC_SUFFIX(FlushMappedNamedBufferRange, EXT);
+        }
+    }
+
+    if (glVer >= GR_GL_VER(4,3) || extensions.has("GL_KHR_debug")) {
+        // KHR_debug defines these methods to have no suffix in an OpenGL (not ES) context.
+        GET_PROC(DebugMessageControl);
+        GET_PROC(DebugMessageInsert);
+        GET_PROC(DebugMessageCallback);
+        GET_PROC(GetDebugMessageLog);
+        GET_PROC(PushDebugGroup);
+        GET_PROC(PopDebugGroup);
+        GET_PROC(ObjectLabel);
+    }
+
+    if (extensions.has("EGL_KHR_image") || extensions.has("EGL_KHR_image_base")) {
+        GET_EGL_PROC_SUFFIX(CreateImage, KHR);
+        GET_EGL_PROC_SUFFIX(DestroyImage, KHR);
+    }
+
     interface->fStandard = kGL_GrGLStandard;
     interface->fExtensions.swap(&extensions);
 
     return interface;
 }
+
+const GrGLInterface* GrGLAssembleGLESInterface(void* ctx, GrGLGetProc get) {
+    GET_PROC_LOCAL(GetString);
+    if (nullptr == GetString) {
+        return nullptr;
+    }
+
+    const char* verStr = reinterpret_cast<const char*>(GetString(GR_GL_VERSION));
+    GrGLVersion version = GrGLGetVersionFromString(verStr);
+
+    if (version < GR_GL_VER(2,0)) {
+        return nullptr;
+    }
+
+    GET_PROC_LOCAL(GetIntegerv);
+    GET_PROC_LOCAL(GetStringi);
+    GrEGLQueryStringProc queryString;
+    GrEGLDisplay display;
+    get_egl_query_and_display(&queryString, &display, ctx, get);
+    GrGLExtensions extensions;
+    if (!extensions.init(kGLES_GrGLStandard, GetString, GetStringi, GetIntegerv, queryString,
+                         display)) {
+        return nullptr;
+    }
+
+    GrGLInterface* interface = new GrGLInterface;
+    GrGLInterface::Functions* functions = &interface->fFunctions;
+
+    GET_PROC(ActiveTexture);
+    GET_PROC(AttachShader);
+    GET_PROC(BindAttribLocation);
+    GET_PROC(BindBuffer);
+    GET_PROC(BindTexture);
+    GET_PROC_SUFFIX(BindVertexArray, OES);
+
+    if (version >= GR_GL_VER(3,0) && extensions.has("GL_EXT_blend_func_extended")) {
+        GET_PROC_SUFFIX(BindFragDataLocation, EXT);
+        GET_PROC_SUFFIX(BindFragDataLocationIndexed, EXT);
+    }
+
+    if (extensions.has("GL_KHR_blend_equation_advanced")) {
+        GET_PROC_SUFFIX(BlendBarrier, KHR);
+    } else if (extensions.has("GL_NV_blend_equation_advanced")) {
+        GET_PROC_SUFFIX(BlendBarrier, NV);
+    }
+
+    GET_PROC(BlendColor);
+    GET_PROC(BlendEquation);
+    GET_PROC(BlendFunc);
+    GET_PROC(BufferData);
+    GET_PROC(BufferSubData);
+    GET_PROC(Clear);
+    GET_PROC(ClearColor);
+    GET_PROC(ClearStencil);
+    GET_PROC(ColorMask);
+    GET_PROC(CompileShader);
+    GET_PROC(CompressedTexImage2D);
+    GET_PROC(CompressedTexSubImage2D);
+    GET_PROC(CopyTexSubImage2D);
+    GET_PROC(CreateProgram);
+    GET_PROC(CreateShader);
+    GET_PROC(CullFace);
+    GET_PROC(DeleteBuffers);
+    GET_PROC(DeleteProgram);
+    GET_PROC(DeleteShader);
+    GET_PROC(DeleteTextures);
+    GET_PROC_SUFFIX(DeleteVertexArrays, OES);
+    GET_PROC(DepthMask);
+    GET_PROC(Disable);
+    GET_PROC(DisableVertexAttribArray);
+    GET_PROC(DrawArrays);
+    GET_PROC(DrawElements);
+    GET_PROC(Enable);
+    GET_PROC(EnableVertexAttribArray);
+    GET_PROC(Finish);
+    GET_PROC(Flush);
+    GET_PROC(FrontFace);
+    GET_PROC(GenBuffers);
+    GET_PROC(GenerateMipmap);
+    GET_PROC(GenTextures);
+    GET_PROC_SUFFIX(GenVertexArrays, OES);
+    GET_PROC(GetBufferParameteriv);
+    GET_PROC(GetError);
+    GET_PROC(GetIntegerv);
+    GET_PROC(GetProgramInfoLog);
+    GET_PROC(GetProgramiv);
+    GET_PROC(GetShaderInfoLog);
+    GET_PROC(GetShaderPrecisionFormat);
+    GET_PROC(GetShaderiv);
+    GET_PROC(GetString);
+    GET_PROC(GetStringi);
+    GET_PROC(GetUniformLocation);
+    GET_PROC(IsTexture);
+    GET_PROC(LineWidth);
+    GET_PROC(LinkProgram);
+    GET_PROC(PixelStorei);
+
+    if (extensions.has("GL_EXT_raster_multisample")) {
+        GET_PROC_SUFFIX(RasterSamples, EXT);
+    }
+
+    GET_PROC(ReadPixels);
+    GET_PROC(Scissor);
+    GET_PROC(ShaderSource);
+    GET_PROC(StencilFunc);
+    GET_PROC(StencilFuncSeparate);
+    GET_PROC(StencilMask);
+    GET_PROC(StencilMaskSeparate);
+    GET_PROC(StencilOp);
+    GET_PROC(StencilOpSeparate);
+    GET_PROC(TexImage2D);
+    GET_PROC(TexParameteri);
+    GET_PROC(TexParameteriv);
+    GET_PROC(TexSubImage2D);
+
+    if (version >= GR_GL_VER(3,0)) {
+        GET_PROC(TexStorage2D);
+    } else {
+        GET_PROC_SUFFIX(TexStorage2D, EXT);
+    }
+
+    if (extensions.has("GL_NV_texture_barrier")) {
+        GET_PROC_SUFFIX(TextureBarrier, NV);
+    }
+
+    GET_PROC_SUFFIX(DiscardFramebuffer, EXT);
+    GET_PROC(Uniform1f);
+    GET_PROC(Uniform1i);
+    GET_PROC(Uniform1fv);
+    GET_PROC(Uniform1iv);
+    GET_PROC(Uniform2f);
+    GET_PROC(Uniform2i);
+    GET_PROC(Uniform2fv);
+    GET_PROC(Uniform2iv);
+    GET_PROC(Uniform3f);
+    GET_PROC(Uniform3i);
+    GET_PROC(Uniform3fv);
+    GET_PROC(Uniform3iv);
+    GET_PROC(Uniform4f);
+    GET_PROC(Uniform4i);
+    GET_PROC(Uniform4fv);
+    GET_PROC(Uniform4iv);
+    GET_PROC(UniformMatrix2fv);
+    GET_PROC(UniformMatrix3fv);
+    GET_PROC(UniformMatrix4fv);
+    GET_PROC(UseProgram);
+    GET_PROC(VertexAttrib1f);
+    GET_PROC(VertexAttrib2fv);
+    GET_PROC(VertexAttrib3fv);
+    GET_PROC(VertexAttrib4fv);
+    GET_PROC(VertexAttribPointer);
+    GET_PROC(Viewport);
+    GET_PROC(BindFramebuffer);
+    GET_PROC(BindRenderbuffer);
+    GET_PROC(CheckFramebufferStatus);
+    GET_PROC(DeleteFramebuffers);
+    GET_PROC(DeleteRenderbuffers);
+    GET_PROC(FramebufferRenderbuffer);
+    GET_PROC(FramebufferTexture2D);
+
+    if (extensions.has("GL_CHROMIUM_framebuffer_multisample")) {
+        GET_PROC_SUFFIX(RenderbufferStorageMultisample, CHROMIUM);
+        GET_PROC_SUFFIX(BlitFramebuffer, CHROMIUM);
+    } else if (version >= GR_GL_VER(3,0)) {
+        GET_PROC(RenderbufferStorageMultisample);
+        GET_PROC(BlitFramebuffer);
+    }
+
+    if (extensions.has("GL_CHROMIUM_map_sub")) {
+        GET_PROC_SUFFIX(MapBufferSubData, CHROMIUM);
+        GET_PROC_SUFFIX(MapTexSubImage2D, CHROMIUM);
+        GET_PROC_SUFFIX(UnmapBufferSubData, CHROMIUM);
+        GET_PROC_SUFFIX(UnmapTexSubImage2D, CHROMIUM);
+    }
+
+    if (extensions.has("GL_EXT_multisampled_render_to_texture")) {
+        GET_PROC_SUFFIX(FramebufferTexture2DMultisample, EXT);
+        functions->fRenderbufferStorageMultisampleES2EXT = (GrGLRenderbufferStorageMultisampleProc) get(ctx, "glRenderbufferStorageMultisampleEXT");
+    } else if (extensions.has("GL_IMG_multisampled_render_to_texture")) {
+        GET_PROC_SUFFIX(FramebufferTexture2DMultisample, IMG);
+        functions->fRenderbufferStorageMultisampleES2EXT = (GrGLRenderbufferStorageMultisampleProc) get(ctx, "glRenderbufferStorageMultisampleIMG");
+    } else if (extensions.has("GL_APPLE_framebuffer_multisample")) {
+        functions->fRenderbufferStorageMultisampleES2APPLE = (GrGLRenderbufferStorageMultisampleProc) get(ctx, "glRenderbufferStorageMultisampleAPPLE");
+        GET_PROC_SUFFIX(ResolveMultisampleFramebuffer, APPLE);
+    }
+
+    GET_PROC(GenFramebuffers);
+    GET_PROC(GenRenderbuffers);
+    GET_PROC(GetFramebufferAttachmentParameteriv);
+    GET_PROC(GetRenderbufferParameteriv);
+    GET_PROC(RenderbufferStorage);
+
+    GET_PROC_SUFFIX(MapBuffer, OES);
+    GET_PROC_SUFFIX(UnmapBuffer, OES);
+
+    if (version >= GR_GL_VER(3,0)) {
+        GET_PROC(MapBufferRange);
+        GET_PROC(FlushMappedBufferRange);
+    } else if (extensions.has("GL_EXT_map_buffer_range")) {
+        GET_PROC_SUFFIX(MapBufferRange, EXT);
+        GET_PROC_SUFFIX(FlushMappedBufferRange, EXT);
+    }
+
+    if (extensions.has("GL_EXT_debug_marker")) {
+        GET_PROC(InsertEventMarker);
+        GET_PROC(PushGroupMarker);
+        GET_PROC(PopGroupMarker);
+        // The below check is here because a device has been found that has the extension string but
+        // returns nullptr from the eglGetProcAddress for the functions
+        if (nullptr == functions->fInsertEventMarker ||
+            nullptr == functions->fPushGroupMarker ||
+            nullptr == functions->fPopGroupMarker) {
+            extensions.remove("GL_EXT_debug_marker");
+        }
+    }
+
+    GET_PROC(InvalidateFramebuffer);
+    GET_PROC(InvalidateSubFramebuffer);
+    GET_PROC(InvalidateBufferData);
+    GET_PROC(InvalidateBufferSubData);
+    GET_PROC(InvalidateTexImage);
+    GET_PROC(InvalidateTexSubImage);
+
+    if (version >= GR_GL_VER(3,1)) {
+        GET_PROC(GetProgramResourceLocation);
+    }
+
+    if (extensions.has("GL_NV_path_rendering")) {
+        GET_PROC_SUFFIX(MatrixLoadf, EXT);
+        GET_PROC_SUFFIX(MatrixLoadIdentity, EXT);
+        GET_PROC_SUFFIX(PathCommands, NV);
+        GET_PROC_SUFFIX(PathParameteri, NV);
+        GET_PROC_SUFFIX(PathParameterf, NV);
+        GET_PROC_SUFFIX(GenPaths, NV);
+        GET_PROC_SUFFIX(DeletePaths, NV);
+        GET_PROC_SUFFIX(IsPath, NV);
+        GET_PROC_SUFFIX(PathStencilFunc, NV);
+        GET_PROC_SUFFIX(StencilFillPath, NV);
+        GET_PROC_SUFFIX(StencilStrokePath, NV);
+        GET_PROC_SUFFIX(StencilFillPathInstanced, NV);
+        GET_PROC_SUFFIX(StencilStrokePathInstanced, NV);
+        GET_PROC_SUFFIX(CoverFillPath, NV);
+        GET_PROC_SUFFIX(CoverStrokePath, NV);
+        GET_PROC_SUFFIX(CoverFillPathInstanced, NV);
+        GET_PROC_SUFFIX(CoverStrokePathInstanced, NV);
+        GET_PROC_SUFFIX(StencilThenCoverFillPath, NV);
+        GET_PROC_SUFFIX(StencilThenCoverStrokePath, NV);
+        GET_PROC_SUFFIX(StencilThenCoverFillPathInstanced, NV);
+        GET_PROC_SUFFIX(StencilThenCoverStrokePathInstanced, NV);
+        GET_PROC_SUFFIX(ProgramPathFragmentInputGen, NV);
+    }
+
+    if (extensions.has("GL_NV_framebuffer_mixed_samples")) {
+        GET_PROC_SUFFIX(CoverageModulation, NV);
+    }
+
+    if (version >= GR_GL_VER(3,0) || extensions.has("GL_EXT_draw_instanced")) {
+        GET_PROC(DrawArraysInstanced);
+        GET_PROC(DrawElementsInstanced);
+    }
+
+    if (version >= GR_GL_VER(3,0) || extensions.has("GL_EXT_instanced_arrays")) {
+        GET_PROC(VertexAttribDivisor);
+    }
+
+    if (extensions.has("GL_NV_bindless_texture")) {
+        GET_PROC_SUFFIX(GetTextureHandle, NV);
+        GET_PROC_SUFFIX(GetTextureSamplerHandle, NV);
+        GET_PROC_SUFFIX(MakeTextureHandleResident, NV);
+        GET_PROC_SUFFIX(MakeTextureHandleNonResident, NV);
+        GET_PROC_SUFFIX(GetImageHandle, NV);
+        GET_PROC_SUFFIX(MakeImageHandleResident, NV);
+        GET_PROC_SUFFIX(MakeImageHandleNonResident, NV);
+        GET_PROC_SUFFIX(IsTextureHandleResident, NV);
+        GET_PROC_SUFFIX(IsImageHandleResident, NV);
+        GET_PROC_SUFFIX(UniformHandleui64, NV);
+        GET_PROC_SUFFIX(UniformHandleui64v, NV);
+        GET_PROC_SUFFIX(ProgramUniformHandleui64, NV);
+        GET_PROC_SUFFIX(ProgramUniformHandleui64v, NV);
+    }
+
+    if (extensions.has("GL_KHR_debug")) {
+        GET_PROC_SUFFIX(DebugMessageControl, KHR);
+        GET_PROC_SUFFIX(DebugMessageInsert, KHR);
+        GET_PROC_SUFFIX(DebugMessageCallback, KHR);
+        GET_PROC_SUFFIX(GetDebugMessageLog, KHR);
+        GET_PROC_SUFFIX(PushDebugGroup, KHR);
+        GET_PROC_SUFFIX(PopDebugGroup, KHR);
+        GET_PROC_SUFFIX(ObjectLabel, KHR);
+        // In general we have a policy against removing extension strings when the driver does
+        // not provide function pointers for an advertised extension. However, because there is a
+        // known device that advertises GL_KHR_debug but fails to provide the functions and this is
+        // a debugging- only extension we've made an exception. This also can happen when using
+        // APITRACE.
+        if (!interface->fFunctions.fDebugMessageControl) {
+            extensions.remove("GL_KHR_debug");
+        }
+    }
+
+    if (extensions.has("GL_CHROMIUM_bind_uniform_location")) {
+        GET_PROC_SUFFIX(BindUniformLocation, CHROMIUM);
+    }
+
+    if (extensions.has("EGL_KHR_image") || extensions.has("EGL_KHR_image_base")) {
+        GET_EGL_PROC_SUFFIX(CreateImage, KHR);
+        GET_EGL_PROC_SUFFIX(DestroyImage, KHR);
+    }
+
+    interface->fStandard = kGLES_GrGLStandard;
+    interface->fExtensions.swap(&extensions);
+
+    return interface;
+}
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLAssembleInterface.h b/gfx/skia/skia/src/gpu/gl/GrGLAssembleInterface.h
index 36a451344749..2a4835be3800 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLAssembleInterface.h
+++ b/gfx/skia/skia/src/gpu/gl/GrGLAssembleInterface.h
@@ -8,11 +8,24 @@
 
 #include "gl/GrGLInterface.h"
 
-typedef void(*GrGLFuncPtr)();
 typedef GrGLFuncPtr (*GrGLGetProc)(void* ctx, const char name[]);
 
+
+/**
+ * Generic function for creating a GrGLInterface for an either OpenGL or GLES. It calls
+ * get() to get each function address. ctx is a generic ptr passed to and interpreted by get().
+ */
+const GrGLInterface* GrGLAssembleInterface(void* ctx, GrGLGetProc get);
+
 /**
  * Generic function for creating a GrGLInterface for an OpenGL (but not GLES) context. It calls
  * get() to get each function address. ctx is a generic ptr passed to and interpreted by get().
  */
 const GrGLInterface* GrGLAssembleGLInterface(void* ctx, GrGLGetProc get);
+
+/**
+ * Generic function for creating a GrGLInterface for an OpenGL ES (but not Open GL) context. It
+ * calls get() to get each function address. ctx is a generic ptr passed to and interpreted by
+ * get().
+ */
+const GrGLInterface* GrGLAssembleGLESInterface(void* ctx, GrGLGetProc get);
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLBufferImpl.cpp b/gfx/skia/skia/src/gpu/gl/GrGLBufferImpl.cpp
index ae578a20fa8b..6cbf4e0d0eca 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLBufferImpl.cpp
+++ b/gfx/skia/skia/src/gpu/gl/GrGLBufferImpl.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "GrGLBufferImpl.h"
-#include "GrGpuGL.h"
+#include "GrGLGpu.h"
 
 #define GL_CALL(GPU, X) GR_GL_CALL(GPU->glInterface(), X)
 
@@ -16,151 +16,78 @@
 #define VALIDATE() do {} while(false)
 #endif
 
-// GL_STREAM_DRAW triggers an optimization in Chromium's GPU process where a client's vertex buffer
-// objects are implemented as client-side-arrays on tile-deferred architectures.
-#define DYNAMIC_USAGE_PARAM GR_GL_STREAM_DRAW
-
-GrGLBufferImpl::GrGLBufferImpl(GrGpuGL* gpu, const Desc& desc, GrGLenum bufferType)
+GrGLBufferImpl::GrGLBufferImpl(GrGLGpu* gpu, const Desc& desc, GrGLenum bufferType)
     : fDesc(desc)
     , fBufferType(bufferType)
-    , fMapPtr(NULL) {
+    , fMapPtr(nullptr) {
     if (0 == desc.fID) {
-        fCPUData = sk_malloc_flags(desc.fSizeInBytes, SK_MALLOC_THROW);
+        if (gpu->caps()->mustClearUploadedBufferData()) {
+            fCPUData = sk_calloc_throw(desc.fSizeInBytes);
+        } else {
+            fCPUData = sk_malloc_flags(desc.fSizeInBytes, SK_MALLOC_THROW);
+        }
         fGLSizeInBytes = 0;
     } else {
-        fCPUData = NULL;
+        fCPUData = nullptr;
         // We assume that the GL buffer was created at the desc's size initially.
         fGLSizeInBytes = fDesc.fSizeInBytes;
     }
     VALIDATE();
 }
 
-void GrGLBufferImpl::release(GrGpuGL* gpu) {
+void GrGLBufferImpl::release(GrGLGpu* gpu) {
     VALIDATE();
     // make sure we've not been abandoned or already released
-    if (NULL != fCPUData) {
+    if (fCPUData) {
         sk_free(fCPUData);
-        fCPUData = NULL;
-    } else if (fDesc.fID && !fDesc.fIsWrapped) {
-        GL_CALL(gpu, DeleteBuffers(1, &fDesc.fID));
-        if (GR_GL_ARRAY_BUFFER == fBufferType) {
-            gpu->notifyVertexBufferDelete(fDesc.fID);
-        } else {
-            SkASSERT(GR_GL_ELEMENT_ARRAY_BUFFER == fBufferType);
-            gpu->notifyIndexBufferDelete(fDesc.fID);
-        }
+        fCPUData = nullptr;
+    } else if (fDesc.fID) {
+        gpu->releaseBuffer(fDesc.fID, fBufferType);
         fDesc.fID = 0;
         fGLSizeInBytes = 0;
     }
-    fMapPtr = NULL;
+    fMapPtr = nullptr;
     VALIDATE();
 }
 
 void GrGLBufferImpl::abandon() {
     fDesc.fID = 0;
     fGLSizeInBytes = 0;
-    fMapPtr = NULL;
+    fMapPtr = nullptr;
     sk_free(fCPUData);
-    fCPUData = NULL;
+    fCPUData = nullptr;
     VALIDATE();
 }
 
-void GrGLBufferImpl::bind(GrGpuGL* gpu) const {
-    VALIDATE();
-    if (GR_GL_ARRAY_BUFFER == fBufferType) {
-        gpu->bindVertexBuffer(fDesc.fID);
-    } else {
-        SkASSERT(GR_GL_ELEMENT_ARRAY_BUFFER == fBufferType);
-        gpu->bindIndexBufferAndDefaultVertexArray(fDesc.fID);
-    }
-    VALIDATE();
-}
-
-void* GrGLBufferImpl::map(GrGpuGL* gpu) {
+void* GrGLBufferImpl::map(GrGLGpu* gpu) {
     VALIDATE();
     SkASSERT(!this->isMapped());
     if (0 == fDesc.fID) {
         fMapPtr = fCPUData;
     } else {
-        switch (gpu->glCaps().mapBufferType()) {
-            case GrGLCaps::kNone_MapBufferType:
-                VALIDATE();
-                return NULL;
-            case GrGLCaps::kMapBuffer_MapBufferType:
-                this->bind(gpu);
-                // Let driver know it can discard the old data
-                if (GR_GL_USE_BUFFER_DATA_NULL_HINT || fDesc.fSizeInBytes != fGLSizeInBytes) {
-                    fGLSizeInBytes = fDesc.fSizeInBytes;
-                    GL_CALL(gpu,
-                            BufferData(fBufferType, fGLSizeInBytes, NULL,
-                                       fDesc.fDynamic ? DYNAMIC_USAGE_PARAM : GR_GL_STATIC_DRAW));
-                }
-                GR_GL_CALL_RET(gpu->glInterface(), fMapPtr,
-                               MapBuffer(fBufferType, GR_GL_WRITE_ONLY));
-                break;
-            case GrGLCaps::kMapBufferRange_MapBufferType: {
-                this->bind(gpu);
-                // Make sure the GL buffer size agrees with fDesc before mapping.
-                if (fDesc.fSizeInBytes != fGLSizeInBytes) {
-                    fGLSizeInBytes = fDesc.fSizeInBytes;
-                    GL_CALL(gpu,
-                            BufferData(fBufferType, fGLSizeInBytes, NULL,
-                                       fDesc.fDynamic ? DYNAMIC_USAGE_PARAM : GR_GL_STATIC_DRAW));
-                }
-                static const GrGLbitfield kAccess = GR_GL_MAP_INVALIDATE_BUFFER_BIT |
-                                                    GR_GL_MAP_WRITE_BIT;
-                GR_GL_CALL_RET(gpu->glInterface(),
-                               fMapPtr,
-                               MapBufferRange(fBufferType, 0, fGLSizeInBytes, kAccess));
-                break;
-            }
-            case GrGLCaps::kChromium_MapBufferType:
-                this->bind(gpu);
-                // Make sure the GL buffer size agrees with fDesc before mapping.
-                if (fDesc.fSizeInBytes != fGLSizeInBytes) {
-                    fGLSizeInBytes = fDesc.fSizeInBytes;
-                    GL_CALL(gpu,
-                            BufferData(fBufferType, fGLSizeInBytes, NULL,
-                                       fDesc.fDynamic ? DYNAMIC_USAGE_PARAM : GR_GL_STATIC_DRAW));
-                }
-                GR_GL_CALL_RET(gpu->glInterface(),
-                               fMapPtr,
-                               MapBufferSubData(fBufferType, 0, fGLSizeInBytes, GR_GL_WRITE_ONLY));
-                break;
-        }
+        fMapPtr = gpu->mapBuffer(fDesc.fID, fBufferType, fDesc.fDynamic, fGLSizeInBytes,
+                                 fDesc.fSizeInBytes);
+        fGLSizeInBytes = fDesc.fSizeInBytes;
     }
     VALIDATE();
     return fMapPtr;
 }
 
-void GrGLBufferImpl::unmap(GrGpuGL* gpu) {
+void GrGLBufferImpl::unmap(GrGLGpu* gpu) {
     VALIDATE();
     SkASSERT(this->isMapped());
     if (0 != fDesc.fID) {
-        switch (gpu->glCaps().mapBufferType()) {
-            case GrGLCaps::kNone_MapBufferType:
-                SkDEBUGFAIL("Shouldn't get here.");
-                return;
-            case GrGLCaps::kMapBuffer_MapBufferType: // fall through
-            case GrGLCaps::kMapBufferRange_MapBufferType:
-                this->bind(gpu);
-                GL_CALL(gpu, UnmapBuffer(fBufferType));
-                break;
-            case GrGLCaps::kChromium_MapBufferType:
-                this->bind(gpu);
-                GR_GL_CALL(gpu->glInterface(), UnmapBufferSubData(fMapPtr));
-                break;
-        }
+        gpu->unmapBuffer(fDesc.fID, fBufferType, fMapPtr);
     }
-    fMapPtr = NULL;
+    fMapPtr = nullptr;
 }
 
 bool GrGLBufferImpl::isMapped() const {
     VALIDATE();
-    return NULL != fMapPtr;
+    return SkToBool(fMapPtr);
 }
 
-bool GrGLBufferImpl::updateData(GrGpuGL* gpu, const void* src, size_t srcSizeInBytes) {
+bool GrGLBufferImpl::updateData(GrGLGpu* gpu, const void* src, size_t srcSizeInBytes) {
     SkASSERT(!this->isMapped());
     VALIDATE();
     if (srcSizeInBytes > fDesc.fSizeInBytes) {
@@ -170,57 +97,22 @@ bool GrGLBufferImpl::updateData(GrGpuGL* gpu, const void* src, size_t srcSizeInB
         memcpy(fCPUData, src, srcSizeInBytes);
         return true;
     }
-    this->bind(gpu);
-    GrGLenum usage = fDesc.fDynamic ? DYNAMIC_USAGE_PARAM : GR_GL_STATIC_DRAW;
-
+    gpu->bufferData(fDesc.fID, fBufferType, fDesc.fDynamic, fDesc.fSizeInBytes, src,
+                    srcSizeInBytes);
 #if GR_GL_USE_BUFFER_DATA_NULL_HINT
-    if (fDesc.fSizeInBytes == srcSizeInBytes) {
-        GL_CALL(gpu, BufferData(fBufferType, (GrGLsizeiptr) srcSizeInBytes, src, usage));
-    } else {
-        // Before we call glBufferSubData we give the driver a hint using
-        // glBufferData with NULL. This makes the old buffer contents
-        // inaccessible to future draws. The GPU may still be processing
-        // draws that reference the old contents. With this hint it can
-        // assign a different allocation for the new contents to avoid
-        // flushing the gpu past draws consuming the old contents.
-        fGLSizeInBytes = fDesc.fSizeInBytes;
-        GL_CALL(gpu, BufferData(fBufferType, fGLSizeInBytes, NULL, usage));
-        GL_CALL(gpu, BufferSubData(fBufferType, 0, (GrGLsizeiptr) srcSizeInBytes, src));
-    }
+    fGLSizeInBytes = fDesc.fSizeInBytes;
 #else
-    // Note that we're cheating on the size here. Currently no methods
-    // allow a partial update that preserves contents of non-updated
-    // portions of the buffer (map() does a glBufferData(..size, NULL..))
-    bool doSubData = false;
-#if GR_GL_MAC_BUFFER_OBJECT_PERFOMANCE_WORKAROUND
-    static int N = 0;
-    // 128 was chosen experimentally. At 256 a slight hitchiness was noticed
-    // when dragging a Chromium window around with a canvas tab backgrounded.
-    doSubData = 0 == (N % 128);
-    ++N;
-#endif
-    if (doSubData) {
-        // The workaround is to do a glBufferData followed by glBufferSubData.
-        // Chromium's command buffer may turn a glBufferSubData where the size
-        // exactly matches the buffer size into a glBufferData. So we tack 1
-        // extra byte onto the glBufferData.
-        fGLSizeInBytes = srcSizeInBytes + 1;
-        GL_CALL(gpu, BufferData(fBufferType, fGLSizeInBytes, NULL, usage));
-        GL_CALL(gpu, BufferSubData(fBufferType, 0, srcSizeInBytes, src));
-    } else {
-        fGLSizeInBytes = srcSizeInBytes;
-        GL_CALL(gpu, BufferData(fBufferType, fGLSizeInBytes, src, usage));
-    }
+    fGLSizeInBytes = srcSizeInBytes;
 #endif
+    VALIDATE();
     return true;
 }
 
 void GrGLBufferImpl::validate() const {
     SkASSERT(GR_GL_ARRAY_BUFFER == fBufferType || GR_GL_ELEMENT_ARRAY_BUFFER == fBufferType);
     // The following assert isn't valid when the buffer has been abandoned:
-    // SkASSERT((0 == fDesc.fID) == (NULL != fCPUData));
-    SkASSERT(0 != fDesc.fID || !fDesc.fIsWrapped);
-    SkASSERT(NULL == fCPUData || 0 == fGLSizeInBytes);
-    SkASSERT(NULL == fMapPtr || NULL != fCPUData || fGLSizeInBytes == fDesc.fSizeInBytes);
-    SkASSERT(NULL == fCPUData || NULL == fMapPtr || fCPUData == fMapPtr);
+    // SkASSERT((0 == fDesc.fID) == (fCPUData));
+    SkASSERT(nullptr == fCPUData || 0 == fGLSizeInBytes);
+    SkASSERT(nullptr == fMapPtr || fCPUData || fGLSizeInBytes <= fDesc.fSizeInBytes);
+    SkASSERT(nullptr == fCPUData || nullptr == fMapPtr || fCPUData == fMapPtr);
 }
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLBufferImpl.h b/gfx/skia/skia/src/gpu/gl/GrGLBufferImpl.h
index 279075f4c9e6..15d2f48efe44 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLBufferImpl.h
+++ b/gfx/skia/skia/src/gpu/gl/GrGLBufferImpl.h
@@ -9,9 +9,9 @@
 #define GrGLBufferImpl_DEFINED
 
 #include "SkTypes.h"
-#include "gl/GrGLFunctions.h"
+#include "gl/GrGLTypes.h"
 
-class GrGpuGL;
+class GrGLGpu;
 
 /**
  * This class serves as the implementation of GrGL*Buffer classes. It was written to avoid code
@@ -20,30 +20,27 @@ class GrGpuGL;
 class GrGLBufferImpl : SkNoncopyable {
 public:
     struct Desc {
-        bool        fIsWrapped;
         GrGLuint    fID;            // set to 0 to indicate buffer is CPU-backed and not a VBO.
         size_t      fSizeInBytes;
         bool        fDynamic;
     };
 
-    GrGLBufferImpl(GrGpuGL*, const Desc&, GrGLenum bufferType);
+    GrGLBufferImpl(GrGLGpu*, const Desc&, GrGLenum bufferType);
     ~GrGLBufferImpl() {
         // either release or abandon should have been called by the owner of this object.
         SkASSERT(0 == fDesc.fID);
     }
 
     void abandon();
-    void release(GrGpuGL* gpu);
+    void release(GrGLGpu* gpu);
 
     GrGLuint bufferID() const { return fDesc.fID; }
     size_t baseOffset() const { return reinterpret_cast<size_t>(fCPUData); }
 
-    void bind(GrGpuGL* gpu) const;
-
-    void* map(GrGpuGL* gpu);
-    void unmap(GrGpuGL* gpu);
+    void* map(GrGLGpu* gpu);
+    void unmap(GrGLGpu* gpu);
     bool isMapped() const;
-    bool updateData(GrGpuGL* gpu, const void* src, size_t srcSizeInBytes);
+    bool updateData(GrGLGpu* gpu, const void* src, size_t srcSizeInBytes);
 
 private:
     void validate() const;
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLCaps.cpp b/gfx/skia/skia/src/gpu/gl/GrGLCaps.cpp
index 8474873ffff5..a768b371059f 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLCaps.cpp
+++ b/gfx/skia/skia/src/gpu/gl/GrGLCaps.cpp
@@ -7,32 +7,27 @@
 
 
 #include "GrGLCaps.h"
+
+#include "GrContextOptions.h"
 #include "GrGLContext.h"
+#include "glsl/GrGLSLCaps.h"
 #include "SkTSearch.h"
 #include "SkTSort.h"
 
-GrGLCaps::GrGLCaps() {
-    this->reset();
-}
-
-void GrGLCaps::reset() {
-    INHERITED::reset();
-
+GrGLCaps::GrGLCaps(const GrContextOptions& contextOptions,
+                   const GrGLContextInfo& ctxInfo,
+                   const GrGLInterface* glInterface) : INHERITED(contextOptions) {
     fVerifiedColorConfigs.reset();
     fStencilFormats.reset();
-    fStencilVerifiedColorConfigs.reset();
     fMSFBOType = kNone_MSFBOType;
-    fFBFetchType = kNone_FBFetchType;
     fInvalidateFBType = kNone_InvalidateFBType;
     fLATCAlias = kLATC_LATCAlias;
     fMapBufferType = kNone_MapBufferType;
     fMaxFragmentUniformVectors = 0;
     fMaxVertexAttributes = 0;
     fMaxFragmentTextureUnits = 0;
-    fMaxFixedFunctionTextureCoords = 0;
     fRGBA8RenderbufferSupport = false;
     fBGRAIsInternalFormat = false;
-    fTextureSwizzleSupport = false;
     fUnpackRowLengthSupport = false;
     fUnpackFlipYSupport = false;
     fPackRowLengthSupport = false;
@@ -42,61 +37,30 @@ void GrGLCaps::reset() {
     fTextureRedSupport = false;
     fImagingSupport = false;
     fTwoFormatLimit = false;
-    fFragCoordsConventionSupport = false;
     fVertexArrayObjectSupport = false;
+    fInstancedDrawingSupport = false;
+    fDirectStateAccessSupport = false;
+    fDebugSupport = false;
+    fES2CompatibilitySupport = false;
+    fMultisampleDisableSupport = false;
     fUseNonVBOVertexAndIndexDynamicData = false;
     fIsCoreProfile = false;
-    fFullClearIsFree = false;
-    fDropsTileOnZeroDivide = false;
+    fBindFragDataLocationSupport = false;
+    fExternalTextureSupport = false;
+    fSRGBWriteControl = false;
+    fRGBA8888PixelsOpsAreSlow = false;
+    fPartialFBOReadIsSlow = false;
+
+    fReadPixelsSupportedCache.reset();
+
+    fShaderCaps.reset(new GrGLSLCaps(contextOptions));
+
+    this->init(contextOptions, ctxInfo, glInterface);
 }
 
-GrGLCaps::GrGLCaps(const GrGLCaps& caps) : GrDrawTargetCaps() {
-    *this = caps;
-}
-
-GrGLCaps& GrGLCaps::operator= (const GrGLCaps& caps) {
-    INHERITED::operator=(caps);
-    fVerifiedColorConfigs = caps.fVerifiedColorConfigs;
-    fStencilFormats = caps.fStencilFormats;
-    fStencilVerifiedColorConfigs = caps.fStencilVerifiedColorConfigs;
-    fLATCAlias = caps.fLATCAlias;
-    fMaxFragmentUniformVectors = caps.fMaxFragmentUniformVectors;
-    fMaxVertexAttributes = caps.fMaxVertexAttributes;
-    fMaxFragmentTextureUnits = caps.fMaxFragmentTextureUnits;
-    fMaxFixedFunctionTextureCoords = caps.fMaxFixedFunctionTextureCoords;
-    fMSFBOType = caps.fMSFBOType;
-    fFBFetchType = caps.fFBFetchType;
-    fInvalidateFBType = caps.fInvalidateFBType;
-    fMapBufferType = caps.fMapBufferType;
-    fRGBA8RenderbufferSupport = caps.fRGBA8RenderbufferSupport;
-    fBGRAIsInternalFormat = caps.fBGRAIsInternalFormat;
-    fTextureSwizzleSupport = caps.fTextureSwizzleSupport;
-    fUnpackRowLengthSupport = caps.fUnpackRowLengthSupport;
-    fUnpackFlipYSupport = caps.fUnpackFlipYSupport;
-    fPackRowLengthSupport = caps.fPackRowLengthSupport;
-    fPackFlipYSupport = caps.fPackFlipYSupport;
-    fTextureUsageSupport = caps.fTextureUsageSupport;
-    fTexStorageSupport = caps.fTexStorageSupport;
-    fTextureRedSupport = caps.fTextureRedSupport;
-    fImagingSupport = caps.fImagingSupport;
-    fTwoFormatLimit = caps.fTwoFormatLimit;
-    fFragCoordsConventionSupport = caps.fFragCoordsConventionSupport;
-    fVertexArrayObjectSupport = caps.fVertexArrayObjectSupport;
-    fUseNonVBOVertexAndIndexDynamicData = caps.fUseNonVBOVertexAndIndexDynamicData;
-    fIsCoreProfile = caps.fIsCoreProfile;
-    fFullClearIsFree = caps.fFullClearIsFree;
-    fDropsTileOnZeroDivide = caps.fDropsTileOnZeroDivide;
-
-    return *this;
-}
-
-bool GrGLCaps::init(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) {
-
-    this->reset();
-    if (!ctxInfo.isInitialized()) {
-        return false;
-    }
-
+void GrGLCaps::init(const GrContextOptions& contextOptions,
+                    const GrGLContextInfo& ctxInfo,
+                    const GrGLInterface* gli) {
     GrGLStandard standard = ctxInfo.standard();
     GrGLVersion version = ctxInfo.version();
 
@@ -117,11 +81,6 @@ bool GrGLCaps::init(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) {
             GR_GL_GetIntegerv(gli, GR_GL_CONTEXT_PROFILE_MASK, &profileMask);
             fIsCoreProfile = SkToBool(profileMask & GR_GL_CONTEXT_CORE_PROFILE_BIT);
         }
-        if (!fIsCoreProfile) {
-            GR_GL_GetIntegerv(gli, GR_GL_MAX_TEXTURE_COORDS, &fMaxFixedFunctionTextureCoords);
-            // Sanity check
-            SkASSERT(fMaxFixedFunctionTextureCoords > 0 && fMaxFixedFunctionTextureCoords < 128);
-        }
     }
     GR_GL_GetIntegerv(gli, GR_GL_MAX_VERTEX_ATTRIBS, &fMaxVertexAttributes);
     GR_GL_GetIntegerv(gli, GR_GL_MAX_TEXTURE_IMAGE_UNITS, &fMaxFragmentTextureUnits);
@@ -134,13 +93,6 @@ bool GrGLCaps::init(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) {
                                     ctxInfo.hasExtension("GL_ARM_rgba8");
     }
 
-    if (kGL_GrGLStandard == standard) {
-        fTextureSwizzleSupport = version >= GR_GL_VER(3,3) ||
-                                 ctxInfo.hasExtension("GL_ARB_texture_swizzle");
-    } else {
-        fTextureSwizzleSupport = version >= GR_GL_VER(3,0);
-    }
-
     if (kGL_GrGLStandard == standard) {
         fUnpackRowLengthSupport = true;
         fUnpackFlipYSupport = false;
@@ -171,20 +123,25 @@ bool GrGLCaps::init(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) {
                              ctxInfo.hasExtension("GL_EXT_texture_storage");
     }
 
-    // ARB_texture_rg is part of OpenGL 3.0, but mesa doesn't support it if
-    // it doesn't have ARB_texture_rg extension.
     if (kGL_GrGLStandard == standard) {
-        if (ctxInfo.isMesa()) {
-            fTextureRedSupport = ctxInfo.hasExtension("GL_ARB_texture_rg");
-        } else {
-            fTextureRedSupport = version >= GR_GL_VER(3,0) ||
-                                 ctxInfo.hasExtension("GL_ARB_texture_rg");
-        }
+        fTextureBarrierSupport = version >= GR_GL_VER(4,5) ||
+                                 ctxInfo.hasExtension("GL_ARB_texture_barrier") ||
+                                 ctxInfo.hasExtension("GL_NV_texture_barrier");
     } else {
-        fTextureRedSupport =  version >= GR_GL_VER(3,0) ||
-                              ctxInfo.hasExtension("GL_EXT_texture_rg");
+        fTextureBarrierSupport = ctxInfo.hasExtension("GL_NV_texture_barrier");
     }
 
+    // ARB_texture_rg is part of OpenGL 3.0, but mesa doesn't support GL_RED 
+    // and GL_RG on FBO textures.
+    if (kMesa_GrGLDriver != ctxInfo.driver()) {
+        if (kGL_GrGLStandard == standard) {
+            fTextureRedSupport = version >= GR_GL_VER(3,0) ||
+                                 ctxInfo.hasExtension("GL_ARB_texture_rg");
+        } else {
+            fTextureRedSupport =  version >= GR_GL_VER(3,0) ||
+                                  ctxInfo.hasExtension("GL_EXT_texture_rg");
+        }
+    }
     fImagingSupport = kGL_GrGLStandard == standard &&
                       ctxInfo.hasExtension("GL_ARB_imaging");
 
@@ -193,11 +150,26 @@ bool GrGLCaps::init(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) {
     // can change based on which render target is bound
     fTwoFormatLimit = kGLES_GrGLStandard == standard;
 
-    // Known issue on at least some Intel platforms:
-    // http://code.google.com/p/skia/issues/detail?id=946
-    if (kIntel_GrGLVendor != ctxInfo.vendor()) {
-        fFragCoordsConventionSupport = ctxInfo.glslGeneration() >= k150_GrGLSLGeneration ||
-                                       ctxInfo.hasExtension("GL_ARB_fragment_coord_conventions");
+    // We only enable srgb support if both textures and FBOs support srgb.
+    bool srgbSupport = false;
+    if (kGL_GrGLStandard == standard) {
+        if (ctxInfo.version() >= GR_GL_VER(3,0)) {
+            srgbSupport = true;
+        } else if (ctxInfo.hasExtension("GL_EXT_texture_sRGB")) {
+            if (ctxInfo.hasExtension("GL_ARB_framebuffer_sRGB") ||
+                ctxInfo.hasExtension("GL_EXT_framebuffer_sRGB")) {
+                srgbSupport = true;
+            }
+         }
+        // All the above srgb extensions support toggling srgb writes
+        fSRGBWriteControl = srgbSupport;
+    } else {
+        // See https://bug.skia.org/4148 for PowerVR issue.
+        srgbSupport = kPowerVRRogue_GrGLRenderer != ctxInfo.renderer() &&
+                      (ctxInfo.version() >= GR_GL_VER(3,0) || ctxInfo.hasExtension("GL_EXT_sRGB"));
+        // ES through 3.1 requires EXT_srgb_write_control to support toggling
+        // sRGB writing for destinations.
+        fSRGBWriteControl = ctxInfo.hasExtension("GL_EXT_sRGB_write_control");
     }
 
     // SGX and Mali GPUs that are based on a tiled-deferred architecture that have trouble with
@@ -205,13 +177,18 @@ bool GrGLCaps::init(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) {
     // data for dynamic content on these GPUs. Perhaps we should read the renderer string and
     // limit this decision to specific GPU families rather than basing it on the vendor alone.
     if (!GR_GL_MUST_USE_VBO &&
-        (kARM_GrGLVendor == ctxInfo.vendor() || kImagination_GrGLVendor == ctxInfo.vendor())) {
+        (kARM_GrGLVendor == ctxInfo.vendor() ||
+         kImagination_GrGLVendor == ctxInfo.vendor() ||
+         kQualcomm_GrGLVendor == ctxInfo.vendor())) {
         fUseNonVBOVertexAndIndexDynamicData = true;
     }
 
-    if ((kGL_GrGLStandard == standard && version >= GR_GL_VER(4,3)) ||
-        (kGLES_GrGLStandard == standard && version >= GR_GL_VER(3,0)) ||
-        ctxInfo.hasExtension("GL_ARB_invalidate_subdata")) {
+    // A driver but on the nexus 6 causes incorrect dst copies when invalidate is called beforehand.
+    // Thus we are blacklisting this extension for now on Adreno4xx devices.
+    if (kAdreno4xx_GrGLRenderer != ctxInfo.renderer() &&
+        ((kGL_GrGLStandard == standard && version >= GR_GL_VER(4,3)) ||
+         (kGLES_GrGLStandard == standard && version >= GR_GL_VER(3,0)) ||
+         ctxInfo.hasExtension("GL_ARB_invalidate_subdata"))) {
         fDiscardRenderTargetSupport = true;
         fInvalidateFBType = kInvalidate_InvalidateFBType;
     } else if (ctxInfo.hasExtension("GL_EXT_discard_framebuffer")) {
@@ -225,29 +202,136 @@ bool GrGLCaps::init(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) {
 
     if (kGL_GrGLStandard == standard) {
         fVertexArrayObjectSupport = version >= GR_GL_VER(3, 0) ||
-                                    ctxInfo.hasExtension("GL_ARB_vertex_array_object");
+                                    ctxInfo.hasExtension("GL_ARB_vertex_array_object") ||
+                                    ctxInfo.hasExtension("GL_APPLE_vertex_array_object");
     } else {
         fVertexArrayObjectSupport = version >= GR_GL_VER(3, 0) ||
                                     ctxInfo.hasExtension("GL_OES_vertex_array_object");
     }
 
-    if (kGLES_GrGLStandard == standard) {
-        if (ctxInfo.hasExtension("GL_EXT_shader_framebuffer_fetch")) {
-            fFBFetchType = kEXT_FBFetchType;
-        } else if (ctxInfo.hasExtension("GL_NV_shader_framebuffer_fetch")) {
-            fFBFetchType = kNV_FBFetchType;
+    if ((kGL_GrGLStandard == standard && version >= GR_GL_VER(3,2)) ||
+        (kGLES_GrGLStandard == standard && version >= GR_GL_VER(3,0))) {
+        fInstancedDrawingSupport = true;
+    } else {
+        fInstancedDrawingSupport = (ctxInfo.hasExtension("GL_ARB_draw_instanced") ||
+                                    ctxInfo.hasExtension("GL_EXT_draw_instanced")) &&
+                                   (ctxInfo.hasExtension("GL_ARB_instanced_arrays") ||
+                                    ctxInfo.hasExtension("GL_EXT_instanced_arrays"));
+    }
+
+    if (kGL_GrGLStandard == standard) {
+        fDirectStateAccessSupport = ctxInfo.hasExtension("GL_EXT_direct_state_access");
+    } else {
+        fDirectStateAccessSupport = false;
+    }
+
+    if (kGL_GrGLStandard == standard && version >= GR_GL_VER(4,3)) {
+        fDebugSupport = true;
+    } else {
+        fDebugSupport = ctxInfo.hasExtension("GL_KHR_debug");
+    }
+
+    if (kGL_GrGLStandard == standard) {
+        fES2CompatibilitySupport = ctxInfo.hasExtension("GL_ARB_ES2_compatibility");
+    }
+    else {
+        fES2CompatibilitySupport = true;
+    }
+
+    if (kGL_GrGLStandard == standard) {
+        fMultisampleDisableSupport = true;
+    } else {
+        fMultisampleDisableSupport = ctxInfo.hasExtension("GL_EXT_multisample_compatibility");
+    }
+
+    if (kGL_GrGLStandard == standard) {
+        if (version >= GR_GL_VER(3, 0)) {
+            fBindFragDataLocationSupport = true;
+        }
+    } else {
+        if (version >= GR_GL_VER(3, 0) && ctxInfo.hasExtension("GL_EXT_blend_func_extended")) {
+            fBindFragDataLocationSupport = true;
         }
     }
 
-    // Adreno GPUs have a tendency to drop tiles when there is a divide-by-zero in a shader
-    fDropsTileOnZeroDivide = kQualcomm_GrGLVendor == ctxInfo.vendor();
+#if 0 // Disabled due to https://bug.skia.org/4454
+    fBindUniformLocationSupport = ctxInfo.hasExtension("GL_CHROMIUM_bind_uniform_location");
+#else
+    fBindUniformLocationSupport = false;
+#endif
 
-    this->initFSAASupport(ctxInfo, gli);
-    this->initStencilFormats(ctxInfo);
+    if (ctxInfo.hasExtension("GL_OES_EGL_image_external")) {
+        if (ctxInfo.glslGeneration() == k110_GrGLSLGeneration) {
+            fExternalTextureSupport = true;
+        } else if (ctxInfo.hasExtension("GL_OES_EGL_image_external_essl3") ||
+                   ctxInfo.hasExtension("OES_EGL_image_external_essl3")) {
+            // At least one driver has been found that has this extension without the "GL_" prefix.
+            fExternalTextureSupport = true;
+        }
+    }
+
+#ifdef SK_BUILD_FOR_WIN
+    // We're assuming that on Windows Chromium we're using ANGLE.
+    bool isANGLE = kANGLE_GrGLDriver == ctxInfo.driver() ||
+                   kChromium_GrGLDriver == ctxInfo.driver();
+    // Angle has slow read/write pixel paths for 32bit RGBA (but fast for BGRA). 
+    fRGBA8888PixelsOpsAreSlow = isANGLE;
+    // On DX9 ANGLE reading a partial FBO is slow. TODO: Check whether this is still true and
+    // check DX11 ANGLE.
+    fPartialFBOReadIsSlow = isANGLE;
+#endif
 
     /**************************************************************************
-     * GrDrawTargetCaps fields
+    * GrShaderCaps fields
+    **************************************************************************/
+
+    // This must be called after fCoreProfile is set on the GrGLCaps
+    this->initGLSL(ctxInfo);
+    GrGLSLCaps* glslCaps = static_cast<GrGLSLCaps*>(fShaderCaps.get());
+
+    glslCaps->fPathRenderingSupport = this->hasPathRenderingSupport(ctxInfo, gli);
+
+    // For now these two are equivalent but we could have dst read in shader via some other method.
+    // Before setting this, initGLSL() must have been called.
+    glslCaps->fDstReadInShaderSupport = glslCaps->fFBFetchSupport;
+
+    // Enable supported shader-related caps
+    if (kGL_GrGLStandard == standard) {
+        glslCaps->fDualSourceBlendingSupport = (ctxInfo.version() >= GR_GL_VER(3, 3) ||
+            ctxInfo.hasExtension("GL_ARB_blend_func_extended")) &&
+            GrGLSLSupportsNamedFragmentShaderOutputs(ctxInfo.glslGeneration());
+        glslCaps->fShaderDerivativeSupport = true;
+        // we don't support GL_ARB_geometry_shader4, just GL 3.2+ GS
+        glslCaps->fGeometryShaderSupport = ctxInfo.version() >= GR_GL_VER(3, 2) &&
+            ctxInfo.glslGeneration() >= k150_GrGLSLGeneration;
+    }
+    else {
+        glslCaps->fDualSourceBlendingSupport = ctxInfo.hasExtension("GL_EXT_blend_func_extended");
+
+        glslCaps->fShaderDerivativeSupport = ctxInfo.version() >= GR_GL_VER(3, 0) ||
+            ctxInfo.hasExtension("GL_OES_standard_derivatives");
+    }
+
+    /**************************************************************************
+     * GrCaps fields
      **************************************************************************/
+
+    // We need dual source blending and the ability to disable multisample in order to support mixed
+    // samples in every corner case.
+    if (fMultisampleDisableSupport && glslCaps->dualSourceBlendingSupport()) {
+        fMixedSamplesSupport = ctxInfo.hasExtension("GL_NV_framebuffer_mixed_samples");
+        // Workaround NVIDIA bug related to glInvalidateFramebuffer and mixed samples.
+        if (fMixedSamplesSupport && kNVIDIA_GrGLDriver == ctxInfo.driver()) {
+            fDiscardRenderTargetSupport = false;
+            fInvalidateFBType = kNone_InvalidateFBType;
+        }
+    }
+
+    // fPathRenderingSupport and fMixedSamplesSupport must be set before calling initFSAASupport.
+    this->initFSAASupport(ctxInfo, gli);
+    this->initBlendEqationSupport(ctxInfo);
+    this->initStencilFormats(ctxInfo);
+
     if (kGL_GrGLStandard == standard) {
         // we could also look for GL_ATI_separate_stencil extension or
         // GL_EXT_stencil_two_side but they use different function signatures
@@ -286,6 +370,19 @@ bool GrGLCaps::init(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) {
         }
     }
 
+    // On many GPUs, map memory is very expensive, so we effectively disable it here by setting the
+    // threshold to the maximum unless the client gives us a hint that map memory is cheap.
+    if (fGeometryBufferMapThreshold < 0) {
+        // We think mapping on Chromium will be cheaper once we know ahead of time how much space
+        // we will use for all GrBatchs. Right now we might wind up mapping a large buffer and using
+        // a small subset.
+#if 0
+        fGeometryBufferMapThreshold = kChromium_GrGLDriver == ctxInfo.driver() ? 0 : SK_MaxS32;
+#else
+        fGeometryBufferMapThreshold = SK_MaxS32;
+#endif
+    }
+
     if (kGL_GrGLStandard == standard) {
         SkASSERT(ctxInfo.version() >= GR_GL_VER(2,0) ||
                  ctxInfo.hasExtension("GL_ARB_texture_non_power_of_two"));
@@ -303,7 +400,10 @@ bool GrGLCaps::init(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) {
         fMipMapSupport = fNPOTTextureTileSupport || ctxInfo.hasExtension("GL_IMG_texture_npot");
     }
 
-    fHWAALineSupport = (kGL_GrGLStandard == standard);
+    // Using MIPs on this GPU seems to be a source of trouble.
+    if (kPowerVR54x_GrGLRenderer == ctxInfo.renderer()) {
+        fMipMapSupport = false;
+    }
 
     GR_GL_GetIntegerv(gli, GR_GL_MAX_TEXTURE_SIZE, &fMaxTextureSize);
     GR_GL_GetIntegerv(gli, GR_GL_MAX_RENDERBUFFER_SIZE, &fMaxRenderTargetSize);
@@ -311,62 +411,249 @@ bool GrGLCaps::init(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) {
     // attachment, hence this min:
     fMaxRenderTargetSize = SkTMin(fMaxTextureSize, fMaxRenderTargetSize);
 
-    fPathRenderingSupport = ctxInfo.hasExtension("GL_NV_path_rendering");
-
-    if (fPathRenderingSupport) {
-        if (kGL_GrGLStandard == standard) {
-            // We need one of the two possible texturing methods: using fixed function pipeline
-            // (PathTexGen, texcoords, ...)  or using the newer NVPR API additions that support
-            // setting individual fragment inputs with ProgramPathFragmentInputGen. The API
-            // additions are detected by checking the existence of the function. Eventually we may
-            // choose to remove the fixed function codepath.
-            // Set fMaxFixedFunctionTextureCoords = 0 here if you want to force
-            // ProgramPathFragmentInputGen usage on desktop.
-            fPathRenderingSupport = ctxInfo.hasExtension("GL_EXT_direct_state_access") &&
-                (fMaxFixedFunctionTextureCoords > 0 ||
-                 ((ctxInfo.version() >= GR_GL_VER(4,3) ||
-                   ctxInfo.hasExtension("GL_ARB_program_interface_query")) &&
-                  NULL != gli->fFunctions.fProgramPathFragmentInputGen));
-        } else {
-            // Note: path rendering is not yet implemented for GLES.
-            fPathRenderingSupport = ctxInfo.version() >= GR_GL_VER(3,1) && false;
-        }
-    }
-
     fGpuTracingSupport = ctxInfo.hasExtension("GL_EXT_debug_marker");
 
-    fDstReadInShaderSupport = kNone_FBFetchType != fFBFetchType;
-
     // Disable scratch texture reuse on Mali and Adreno devices
     fReuseScratchTextures = kARM_GrGLVendor != ctxInfo.vendor() &&
                             kQualcomm_GrGLVendor != ctxInfo.vendor();
 
-    // Enable supported shader-related caps
-    if (kGL_GrGLStandard == standard) {
-        fDualSourceBlendingSupport = ctxInfo.version() >= GR_GL_VER(3,3) ||
-                                     ctxInfo.hasExtension("GL_ARB_blend_func_extended");
-        fShaderDerivativeSupport = true;
-        // we don't support GL_ARB_geometry_shader4, just GL 3.2+ GS
-        fGeometryShaderSupport = ctxInfo.version() >= GR_GL_VER(3,2) &&
-                                 ctxInfo.glslGeneration() >= k150_GrGLSLGeneration;
-    } else {
-        fShaderDerivativeSupport = ctxInfo.hasExtension("GL_OES_standard_derivatives");
-    }
+#if 0
+    fReuseScratchBuffers = kARM_GrGLVendor != ctxInfo.vendor() &&
+                           kQualcomm_GrGLVendor != ctxInfo.vendor();
+#endif
 
+    // initFSAASupport() must have been called before this point
     if (GrGLCaps::kES_IMG_MsToTexture_MSFBOType == fMSFBOType) {
         GR_GL_GetIntegerv(gli, GR_GL_MAX_SAMPLES_IMG, &fMaxSampleCount);
     } else if (GrGLCaps::kNone_MSFBOType != fMSFBOType) {
         GR_GL_GetIntegerv(gli, GR_GL_MAX_SAMPLES, &fMaxSampleCount);
     }
 
-    this->initConfigTexturableTable(ctxInfo, gli);
-    this->initConfigRenderableTable(ctxInfo);
+    if (kPowerVR54x_GrGLRenderer == ctxInfo.renderer() ||
+        kPowerVRRogue_GrGLRenderer == ctxInfo.renderer() ||
+        kAdreno3xx_GrGLRenderer == ctxInfo.renderer()) {
+        fUseDrawInsteadOfClear = true;
+    }
 
+    if (kAdreno4xx_GrGLRenderer == ctxInfo.renderer()) {
+        fUseDrawInsteadOfPartialRenderTargetWrite = true;
+    }
+
+#ifdef SK_BUILD_FOR_WIN
+    // On ANGLE deferring flushes can lead to GPU starvation
+    fPreferVRAMUseOverFlushes = !isANGLE;
+#endif
+
+    if (kChromium_GrGLDriver == ctxInfo.driver()) {
+        fMustClearUploadedBufferData = true;
+    }
+
+    if (kGL_GrGLStandard == standard) {
+        // ARB allows mixed size FBO attachments, EXT does not.
+        if (ctxInfo.version() >= GR_GL_VER(3, 0) ||
+            ctxInfo.hasExtension("GL_ARB_framebuffer_object")) {
+            fOversizedStencilSupport = true;
+        } else {
+            SkASSERT(ctxInfo.hasExtension("GL_EXT_framebuffer_object"));
+        }
+    } else {
+        // ES 3.0 supports mixed size FBO attachments, 2.0 does not.
+        fOversizedStencilSupport = ctxInfo.version() >= GR_GL_VER(3, 0);
+    }
+
+    if (kGL_GrGLStandard == standard) {
+        // 3.1 has draw_instanced but not instanced_arrays, for the time being we only care about
+        // instanced arrays, but we could make this more granular if we wanted
+        fSupportsInstancedDraws =
+                version >= GR_GL_VER(3, 2) ||
+                (ctxInfo.hasExtension("GL_ARB_draw_instanced") &&
+                 ctxInfo.hasExtension("GL_ARB_instanced_arrays"));
+    } else {
+        fSupportsInstancedDraws =
+                version >= GR_GL_VER(3, 0) ||
+                (ctxInfo.hasExtension("GL_EXT_draw_instanced") &&
+                 ctxInfo.hasExtension("GL_EXT_instanced_arrays"));
+    }
+
+    this->initConfigTexturableTable(ctxInfo, gli, srgbSupport);
+    this->initConfigRenderableTable(ctxInfo, srgbSupport);
+    this->initShaderPrecisionTable(ctxInfo, gli, glslCaps);
+    // Requires fTexutreSwizzleSupport and fTextureRedSupport to be set before this point.
+    this->initConfigSwizzleTable(ctxInfo, glslCaps);
+
+    this->applyOptionsOverrides(contextOptions);
+    glslCaps->applyOptionsOverrides(contextOptions);
+}
+
+const char* get_glsl_version_decl_string(GrGLStandard standard, GrGLSLGeneration generation,
+                                         bool isCoreProfile) {
+    switch (generation) {
+        case k110_GrGLSLGeneration:
+            if (kGLES_GrGLStandard == standard) {
+                // ES2s shader language is based on version 1.20 but is version
+                // 1.00 of the ES language.
+                return "#version 100\n";
+            } else {
+                SkASSERT(kGL_GrGLStandard == standard);
+                return "#version 110\n";
+            }
+        case k130_GrGLSLGeneration:
+            SkASSERT(kGL_GrGLStandard == standard);
+            return "#version 130\n";
+        case k140_GrGLSLGeneration:
+            SkASSERT(kGL_GrGLStandard == standard);
+            return "#version 140\n";
+        case k150_GrGLSLGeneration:
+            SkASSERT(kGL_GrGLStandard == standard);
+            if (isCoreProfile) {
+                return "#version 150\n";
+            } else {
+                return "#version 150 compatibility\n";
+            }
+        case k330_GrGLSLGeneration:
+            if (kGLES_GrGLStandard == standard) {
+                return "#version 300 es\n";
+            } else {
+                SkASSERT(kGL_GrGLStandard == standard);
+                if (isCoreProfile) {
+                    return "#version 330\n";
+                } else {
+                    return "#version 330 compatibility\n";
+                }
+            }
+        case k310es_GrGLSLGeneration:
+            SkASSERT(kGLES_GrGLStandard == standard);
+            return "#version 310 es\n";
+    }
+    return "<no version>";
+}
+
+void GrGLCaps::initGLSL(const GrGLContextInfo& ctxInfo) {
+    GrGLStandard standard = ctxInfo.standard();
+    GrGLVersion version = ctxInfo.version();
+
+    /**************************************************************************
+    * Caps specific to GrGLSLCaps
+    **************************************************************************/
+
+    GrGLSLCaps* glslCaps = static_cast<GrGLSLCaps*>(fShaderCaps.get());
+    glslCaps->fGLSLGeneration = ctxInfo.glslGeneration();
+
+    if (kGLES_GrGLStandard == standard) {
+        if (ctxInfo.hasExtension("GL_EXT_shader_framebuffer_fetch")) {
+            glslCaps->fFBFetchNeedsCustomOutput = (version >= GR_GL_VER(3, 0));
+            glslCaps->fFBFetchSupport = true;
+            glslCaps->fFBFetchColorName = "gl_LastFragData[0]";
+            glslCaps->fFBFetchExtensionString = "GL_EXT_shader_framebuffer_fetch";
+        }
+        else if (ctxInfo.hasExtension("GL_NV_shader_framebuffer_fetch")) {
+            // Actually, we haven't seen an ES3.0 device with this extension yet, so we don't know
+            glslCaps->fFBFetchNeedsCustomOutput = false;
+            glslCaps->fFBFetchSupport = true;
+            glslCaps->fFBFetchColorName = "gl_LastFragData[0]";
+            glslCaps->fFBFetchExtensionString = "GL_NV_shader_framebuffer_fetch";
+        }
+        else if (ctxInfo.hasExtension("GL_ARM_shader_framebuffer_fetch")) {
+            // The arm extension also requires an additional flag which we will set onResetContext
+            glslCaps->fFBFetchNeedsCustomOutput = false;
+            glslCaps->fFBFetchSupport = true;
+            glslCaps->fFBFetchColorName = "gl_LastFragColorARM";
+            glslCaps->fFBFetchExtensionString = "GL_ARM_shader_framebuffer_fetch";
+        }
+        glslCaps->fUsesPrecisionModifiers = true;
+    }
+
+    glslCaps->fBindlessTextureSupport = ctxInfo.hasExtension("GL_NV_bindless_texture");
+
+    // Adreno GPUs have a tendency to drop tiles when there is a divide-by-zero in a shader
+    glslCaps->fDropsTileOnZeroDivide = kQualcomm_GrGLVendor == ctxInfo.vendor();
+
+    // On the NexusS and GalaxyNexus, the use of 'any' causes the compilation error "Calls to any
+    // function that may require a gradient calculation inside a conditional block may return
+    // undefined results". This appears to be an issue with the 'any' call since even the simple
+    // "result=black; if (any()) result=white;" code fails to compile. This issue comes into play
+    // from our GrTextureDomain processor.
+    glslCaps->fCanUseAnyFunctionInShader = kImagination_GrGLVendor != ctxInfo.vendor();
+
+    glslCaps->fForceHighPrecisionNDSTransform = kARM_GrGLVendor == ctxInfo.vendor() ||
+                                                kPowerVR54x_GrGLRenderer == ctxInfo.renderer();
+
+    glslCaps->fVersionDeclString = get_glsl_version_decl_string(standard, glslCaps->fGLSLGeneration,
+                                                                fIsCoreProfile);
+
+    if (kGLES_GrGLStandard == standard && k110_GrGLSLGeneration == glslCaps->fGLSLGeneration) {
+        glslCaps->fShaderDerivativeExtensionString = "GL_OES_standard_derivatives";
+    }
+
+    // Frag Coords Convention support is not part of ES
+    // Known issue on at least some Intel platforms:
+    // http://code.google.com/p/skia/issues/detail?id=946
+    if (kIntel_GrGLVendor != ctxInfo.vendor() &&
+        kGLES_GrGLStandard != standard &&
+        (ctxInfo.glslGeneration() >= k150_GrGLSLGeneration ||
+         ctxInfo.hasExtension("GL_ARB_fragment_coord_conventions"))) {
+        glslCaps->fFragCoordConventionsExtensionString = "GL_ARB_fragment_coord_conventions";
+    }
+
+    if (kGLES_GrGLStandard == standard) {
+        glslCaps->fSecondaryOutputExtensionString = "GL_EXT_blend_func_extended";
+    }
+
+    if (fExternalTextureSupport) {
+        if (ctxInfo.glslGeneration() == k110_GrGLSLGeneration) {
+            glslCaps->fExternalTextureExtensionString = "GL_OES_EGL_image_external";
+        } else {
+            glslCaps->fExternalTextureExtensionString = "GL_OES_EGL_image_external_essl3";
+        }
+    }
+
+    // The Tegra3 compiler will sometimes never return if we have min(abs(x), 1.0), so we must do
+    // the abs first in a separate expression.
+    if (kTegra3_GrGLRenderer == ctxInfo.renderer()) {
+        glslCaps->fCanUseMinAndAbsTogether = false;
+    }
+
+    // On Intel GPU there is an issue where it reads the second argument to atan "- %s.x" as an int
+    // thus must us -1.0 * %s.x to work correctly
+    if (kIntel_GrGLVendor == ctxInfo.vendor()) {
+        glslCaps->fMustForceNegatedAtanParamToFloat = true;
+    }
+}
+
+bool GrGLCaps::hasPathRenderingSupport(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) {
+    bool hasChromiumPathRendering = ctxInfo.hasExtension("GL_CHROMIUM_path_rendering");
+
+    if (!(ctxInfo.hasExtension("GL_NV_path_rendering") || hasChromiumPathRendering)) {
+        return false;
+    }
+
+    if (kGL_GrGLStandard == ctxInfo.standard()) {
+        if (ctxInfo.version() < GR_GL_VER(4, 3) &&
+            !ctxInfo.hasExtension("GL_ARB_program_interface_query")) {
+            return false;
+        }
+    } else {
+        if (!hasChromiumPathRendering &&
+            ctxInfo.version() < GR_GL_VER(3, 1)) {
+            return false;
+        }
+    }
+    // We only support v1.3+ of GL_NV_path_rendering which allows us to
+    // set individual fragment inputs with ProgramPathFragmentInputGen. The API
+    // additions are detected by checking the existence of the function.
+    // We also use *Then* functions that not all drivers might have. Check
+    // them for consistency.
+    if (nullptr == gli->fFunctions.fStencilThenCoverFillPath ||
+        nullptr == gli->fFunctions.fStencilThenCoverStrokePath ||
+        nullptr == gli->fFunctions.fStencilThenCoverFillPathInstanced ||
+        nullptr == gli->fFunctions.fStencilThenCoverStrokePathInstanced ||
+        nullptr == gli->fFunctions.fProgramPathFragmentInputGen) {
+        return false;
+    }
     return true;
 }
 
-void GrGLCaps::initConfigRenderableTable(const GrGLContextInfo& ctxInfo) {
-
+void GrGLCaps::initConfigRenderableTable(const GrGLContextInfo& ctxInfo, bool srgbSupport) {
     // OpenGL < 3.0
     //  no support for render targets unless the GL_ARB_framebuffer_object
     //  extension is supported (in which case we get ALPHA, RED, RG, RGB,
@@ -444,8 +731,67 @@ void GrGLCaps::initConfigRenderableTable(const GrGLContextInfo& ctxInfo) {
         }
     }
 
+    if (this->fRGBA8RenderbufferSupport && srgbSupport) {
+        fConfigRenderSupport[kSRGBA_8888_GrPixelConfig][kNo_MSAA] = true;
+        fConfigRenderSupport[kSRGBA_8888_GrPixelConfig][kYes_MSAA] = true;
+    }
+    
     if (this->isConfigTexturable(kRGBA_float_GrPixelConfig)) {
-        fConfigRenderSupport[kRGBA_float_GrPixelConfig][kNo_MSAA] = true;
+        if (kGL_GrGLStandard == standard) {
+            fConfigRenderSupport[kRGBA_float_GrPixelConfig][kNo_MSAA] = true;
+            fConfigRenderSupport[kRGBA_float_GrPixelConfig][kYes_MSAA] = true;
+        } else {
+            // for now we only enable this on desktop, because on ES we'd have to solve many
+            // precision issues and no clients actually want this yet
+            /*
+            if (ctxInfo.hasExtension("GL_EXT_color_buffer_float")) {
+                fConfigRenderSupport[kRGBA_float_GrPixelConfig][kNo_MSAA] = true;
+            } else {
+                fConfigRenderSupport[kRGBA_float_GrPixelConfig][kNo_MSAA] = false;
+            }
+            // for now we don't support floating point MSAA on ES
+            fConfigRenderSupport[kRGBA_float_GrPixelConfig][kYes_MSAA] = false;*/
+            fConfigRenderSupport[kRGBA_float_GrPixelConfig][kNo_MSAA] = false;
+            fConfigRenderSupport[kRGBA_float_GrPixelConfig][kYes_MSAA] = false;
+        }
+    }
+
+    if (this->isConfigTexturable(kAlpha_half_GrPixelConfig)) {
+        if (kGL_GrGLStandard == standard) {
+            fConfigRenderSupport[kAlpha_half_GrPixelConfig][kNo_MSAA] = true;
+            fConfigRenderSupport[kAlpha_half_GrPixelConfig][kYes_MSAA] = true;
+        } else if (ctxInfo.version() >= GR_GL_VER(3,0)) {
+            fConfigRenderSupport[kAlpha_half_GrPixelConfig][kNo_MSAA] = true;
+            // for now we don't support floating point MSAA on ES
+            fConfigRenderSupport[kAlpha_half_GrPixelConfig][kYes_MSAA] = false;
+        } else {
+            if (ctxInfo.hasExtension("GL_EXT_color_buffer_half_float") && fTextureRedSupport) {
+                fConfigRenderSupport[kAlpha_half_GrPixelConfig][kNo_MSAA] = true;
+            } else {
+                fConfigRenderSupport[kAlpha_half_GrPixelConfig][kNo_MSAA] = false;
+            }
+            // for now we don't support floating point MSAA on ES
+            fConfigRenderSupport[kAlpha_half_GrPixelConfig][kYes_MSAA] = false;
+        }
+    }
+    
+    if (this->isConfigTexturable(kRGBA_half_GrPixelConfig)) {
+        if (kGL_GrGLStandard == standard) {
+            fConfigRenderSupport[kRGBA_half_GrPixelConfig][kNo_MSAA] = true;
+            fConfigRenderSupport[kRGBA_half_GrPixelConfig][kYes_MSAA] = true;
+        } else if (ctxInfo.version() >= GR_GL_VER(3, 0)) {
+            fConfigRenderSupport[kRGBA_half_GrPixelConfig][kNo_MSAA] = true;
+            // for now we don't support floating point MSAA on ES
+            fConfigRenderSupport[kRGBA_half_GrPixelConfig][kYes_MSAA] = false;
+        } else {
+            if (ctxInfo.hasExtension("GL_EXT_color_buffer_half_float")) {
+                fConfigRenderSupport[kRGBA_half_GrPixelConfig][kNo_MSAA] = true;
+            } else {
+                fConfigRenderSupport[kRGBA_half_GrPixelConfig][kNo_MSAA] = false;
+            }
+            // for now we don't support floating point MSAA on ES
+            fConfigRenderSupport[kRGBA_half_GrPixelConfig][kYes_MSAA] = false;
+        }
     }
 
     // If we don't support MSAA then undo any places above where we set a config as renderable with
@@ -457,7 +803,8 @@ void GrGLCaps::initConfigRenderableTable(const GrGLContextInfo& ctxInfo) {
     }
 }
 
-void GrGLCaps::initConfigTexturableTable(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) {
+void GrGLCaps::initConfigTexturableTable(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli,
+                                         bool srgbSupport) {
     GrGLStandard standard = ctxInfo.standard();
     GrGLVersion version = ctxInfo.version();
 
@@ -467,16 +814,19 @@ void GrGLCaps::initConfigTexturableTable(const GrGLContextInfo& ctxInfo, const G
     fConfigTextureSupport[kRGBA_4444_GrPixelConfig] = true;
     fConfigTextureSupport[kRGBA_8888_GrPixelConfig] = true;
 
-    // Check for 8-bit palette..
-    GrGLint numFormats;
-    GR_GL_GetIntegerv(gli, GR_GL_NUM_COMPRESSED_TEXTURE_FORMATS, &numFormats);
-    if (numFormats) {
-        SkAutoSTMalloc<10, GrGLint> formats(numFormats);
-        GR_GL_GetIntegerv(gli, GR_GL_COMPRESSED_TEXTURE_FORMATS, formats);
-        for (int i = 0; i < numFormats; ++i) {
-            if (GR_GL_PALETTE8_RGBA8 == formats[i]) {
-                fConfigTextureSupport[kIndex_8_GrPixelConfig] = true;
-                break;
+    // Disable this for now, while we investigate https://bug.skia.org/4333
+    if (false) {
+        // Check for 8-bit palette..
+        GrGLint numFormats;
+        GR_GL_GetIntegerv(gli, GR_GL_NUM_COMPRESSED_TEXTURE_FORMATS, &numFormats);
+        if (numFormats) {
+            SkAutoSTMalloc<10, GrGLint> formats(numFormats);
+            GR_GL_GetIntegerv(gli, GR_GL_COMPRESSED_TEXTURE_FORMATS, formats);
+            for (int i = 0; i < numFormats; ++i) {
+                if (GR_GL_PALETTE8_RGBA8 == formats[i]) {
+                    fConfigTextureSupport[kIndex_8_GrPixelConfig] = true;
+                    break;
+                }
             }
         }
     }
@@ -496,12 +846,17 @@ void GrGLCaps::initConfigTexturableTable(const GrGLContextInfo& ctxInfo, const G
                  kSkia8888_GrPixelConfig != kBGRA_8888_GrPixelConfig);
     }
 
+    fConfigTextureSupport[kSRGBA_8888_GrPixelConfig] = srgbSupport;
+    
     // Compressed texture support
 
     // glCompressedTexImage2D is available on all OpenGL ES devices...
     // however, it is only available on standard OpenGL after version 1.3
     bool hasCompressTex2D = (kGL_GrGLStandard != standard || version >= GR_GL_VER(1, 3));
 
+    fCompressedTexSubImageSupport =
+        hasCompressTex2D && (gli->fFunctions.fCompressedTexSubImage2D);
+
     // Check for ETC1
     bool hasETC1 = false;
 
@@ -555,16 +910,15 @@ void GrGLCaps::initConfigTexturableTable(const GrGLContextInfo& ctxInfo, const G
     fConfigTextureSupport[kLATC_GrPixelConfig] = hasLATC;
     fLATCAlias = alias;
 
-    // Check for R11_EAC
-    if (kGL_GrGLStandard == standard) {
-        fConfigTextureSupport[kR11_EAC_GrPixelConfig] =
-            version >= GR_GL_VER(4, 3) || ctxInfo.hasExtension("GL_ARB_ES3_compatibility");
-    } else {
+    // Check for R11_EAC ... We don't support R11_EAC on desktop, as most
+    // cards default to decompressing the textures in the driver, and is
+    // generally slower.
+    if (kGL_GrGLStandard != standard) {
         fConfigTextureSupport[kR11_EAC_GrPixelConfig] = version >= GR_GL_VER(3, 0);
     }
 
     // Check for ASTC
-    fConfigTextureSupport[kASTC_12x12_GrPixelConfig] = 
+    fConfigTextureSupport[kASTC_12x12_GrPixelConfig] =
         ctxInfo.hasExtension("GL_KHR_texture_compression_astc_hdr") ||
         ctxInfo.hasExtension("GL_KHR_texture_compression_astc_ldr") ||
         ctxInfo.hasExtension("GL_OES_texture_compression_astc");
@@ -577,15 +931,29 @@ void GrGLCaps::initConfigTexturableTable(const GrGLContextInfo& ctxInfo, const G
     bool hasFPTextures = version >= GR_GL_VER(3, 1);
     if (!hasFPTextures) {
         hasFPTextures = ctxInfo.hasExtension("GL_ARB_texture_float") ||
-                        (ctxInfo.hasExtension("OES_texture_float_linear") &&
+                        (ctxInfo.hasExtension("GL_OES_texture_float_linear") &&
                          ctxInfo.hasExtension("GL_OES_texture_float"));
     }
     fConfigTextureSupport[kRGBA_float_GrPixelConfig] = hasFPTextures;
+
+    // Check for fp16 texture support
+    // NOTE: We disallow floating point textures on ES devices if linear
+    // filtering modes are not supported.  This is for simplicity, but a more
+    // granular approach is possible.  Coincidentally, 16-bit floating point textures became part of
+    // the standard in ES3.1 / OGL 3.1, hence the shorthand
+    bool hasHalfFPTextures = version >= GR_GL_VER(3, 1);
+    if (!hasHalfFPTextures) {
+        hasHalfFPTextures = ctxInfo.hasExtension("GL_ARB_texture_float") ||
+                            (ctxInfo.hasExtension("GL_OES_texture_half_float_linear") &&
+                             ctxInfo.hasExtension("GL_OES_texture_half_float"));
+    }
+    fConfigTextureSupport[kAlpha_half_GrPixelConfig] = hasHalfFPTextures;
+    fConfigTextureSupport[kRGBA_half_GrPixelConfig] = hasHalfFPTextures;
 }
 
-bool GrGLCaps::readPixelsSupported(const GrGLInterface* intf,
-                                   GrGLenum format,
-                                   GrGLenum type) const {
+bool GrGLCaps::doReadPixelsSupported(const GrGLInterface* intf,
+                                     GrGLenum format,
+                                     GrGLenum type) const {
     if (GR_GL_RGBA == format && GR_GL_UNSIGNED_BYTE == type) {
         // ES 2 guarantees this format is supported
         return true;
@@ -612,6 +980,19 @@ bool GrGLCaps::readPixelsSupported(const GrGLInterface* intf,
     return (GrGLenum)otherFormat == format && (GrGLenum)otherType == type;
 }
 
+bool GrGLCaps::readPixelsSupported(const GrGLInterface* intf,
+                                   GrGLenum format,
+                                   GrGLenum type,
+                                   GrGLenum currFboFormat) const {
+    ReadPixelsSupportedFormat key = {format, type, currFboFormat};
+    if (const bool* supported = fReadPixelsSupportedCache.find(key)) {
+        return *supported;
+    }
+    bool supported = this->doReadPixelsSupported(intf, format, type);
+    fReadPixelsSupportedCache.set(key, supported);
+    return supported;
+}
+
 void GrGLCaps::initFSAASupport(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) {
 
     fMSFBOType = kNone_MSFBOType;
@@ -622,6 +1003,8 @@ void GrGLCaps::initFSAASupport(const GrGLContextInfo& ctxInfo, const GrGLInterfa
             fMSFBOType = kES_EXT_MsToTexture_MSFBOType;
         } else if (ctxInfo.hasExtension("GL_IMG_multisampled_render_to_texture")) {
             fMSFBOType = kES_IMG_MsToTexture_MSFBOType;
+        } else if (fMixedSamplesSupport && fShaderCaps->pathRenderingSupport()) {
+            fMSFBOType = kMixedSamples_MSFBOType;
         } else if (ctxInfo.version() >= GR_GL_VER(3,0)) {
             fMSFBOType = GrGLCaps::kES_3_0_MSFBOType;
         } else if (ctxInfo.hasExtension("GL_CHROMIUM_framebuffer_multisample")) {
@@ -632,7 +1015,9 @@ void GrGLCaps::initFSAASupport(const GrGLContextInfo& ctxInfo, const GrGLInterfa
             fMSFBOType = kES_Apple_MSFBOType;
         }
     } else {
-        if ((ctxInfo.version() >= GR_GL_VER(3,0)) ||
+        if (fMixedSamplesSupport && fShaderCaps->pathRenderingSupport()) {
+            fMSFBOType = kMixedSamples_MSFBOType;
+        } else if ((ctxInfo.version() >= GR_GL_VER(3,0)) ||
             ctxInfo.hasExtension("GL_ARB_framebuffer_object")) {
             fMSFBOType = GrGLCaps::kDesktop_ARB_MSFBOType;
         } else if (ctxInfo.hasExtension("GL_EXT_framebuffer_multisample") &&
@@ -642,8 +1027,54 @@ void GrGLCaps::initFSAASupport(const GrGLContextInfo& ctxInfo, const GrGLInterfa
     }
 }
 
+void GrGLCaps::initBlendEqationSupport(const GrGLContextInfo& ctxInfo) {
+    GrGLSLCaps* glslCaps = static_cast<GrGLSLCaps*>(fShaderCaps.get());
+
+    // Disabling advanced blend on various platforms with major known issues. We also block Chrome
+    // for now until its own blacklists can be updated.
+    if (kAdreno4xx_GrGLRenderer == ctxInfo.renderer() ||
+        kIntel_GrGLDriver == ctxInfo.driver() ||
+        kChromium_GrGLDriver == ctxInfo.driver()) {
+        return;
+    }
+
+    if (ctxInfo.hasExtension("GL_NV_blend_equation_advanced_coherent")) {
+        fBlendEquationSupport = kAdvancedCoherent_BlendEquationSupport;
+        glslCaps->fAdvBlendEqInteraction = GrGLSLCaps::kAutomatic_AdvBlendEqInteraction;
+    } else if (ctxInfo.hasExtension("GL_KHR_blend_equation_advanced_coherent")) {
+        fBlendEquationSupport = kAdvancedCoherent_BlendEquationSupport;
+        glslCaps->fAdvBlendEqInteraction = GrGLSLCaps::kGeneralEnable_AdvBlendEqInteraction;
+    } else if (kNVIDIA_GrGLDriver == ctxInfo.driver() &&
+               ctxInfo.driverVersion() < GR_GL_DRIVER_VER(337,00)) {
+        // Non-coherent advanced blend has an issue on NVIDIA pre 337.00.
+        return;
+    } else if (ctxInfo.hasExtension("GL_NV_blend_equation_advanced")) {
+        fBlendEquationSupport = kAdvanced_BlendEquationSupport;
+        glslCaps->fAdvBlendEqInteraction = GrGLSLCaps::kAutomatic_AdvBlendEqInteraction;
+    } else if (ctxInfo.hasExtension("GL_KHR_blend_equation_advanced")) {
+        fBlendEquationSupport = kAdvanced_BlendEquationSupport;
+        glslCaps->fAdvBlendEqInteraction = GrGLSLCaps::kGeneralEnable_AdvBlendEqInteraction;
+        // TODO: Use kSpecificEnables_AdvBlendEqInteraction if "blend_support_all_equations" is
+        // slow on a particular platform.
+    } else {
+        return; // No advanced blend support.
+    }
+
+    SkASSERT(this->advancedBlendEquationSupport());
+
+    if (kNVIDIA_GrGLDriver == ctxInfo.driver()) {
+        // Blacklist color-dodge and color-burn on NVIDIA until the fix is released.
+        fAdvBlendEqBlacklist |= (1 << kColorDodge_GrBlendEquation) |
+                                (1 << kColorBurn_GrBlendEquation);
+    }
+    if (kARM_GrGLVendor == ctxInfo.vendor()) {
+        // Blacklist color-burn on ARM until the fix is released.
+        fAdvBlendEqBlacklist |= (1 << kColorBurn_GrBlendEquation);
+    }
+}
+
 namespace {
-const GrGLuint kUnknownBitCount = GrGLStencilBuffer::kUnknownBitCount;
+const GrGLuint kUnknownBitCount = GrGLStencilAttachment::kUnknownBitCount;
 }
 
 void GrGLCaps::initStencilFormats(const GrGLContextInfo& ctxInfo) {
@@ -696,53 +1127,6 @@ void GrGLCaps::initStencilFormats(const GrGLContextInfo& ctxInfo) {
             fStencilFormats.push_back() = gS4;
         }
     }
-    SkASSERT(0 == fStencilVerifiedColorConfigs.count());
-    fStencilVerifiedColorConfigs.push_back_n(fStencilFormats.count());
-}
-
-void GrGLCaps::markColorConfigAndStencilFormatAsVerified(
-                                    GrPixelConfig config,
-                                    const GrGLStencilBuffer::Format& format) {
-#if !GR_GL_CHECK_FBO_STATUS_ONCE_PER_FORMAT
-    return;
-#endif
-    SkASSERT((unsigned)config < (unsigned)kGrPixelConfigCnt);
-    SkASSERT(fStencilFormats.count() == fStencilVerifiedColorConfigs.count());
-    int count = fStencilFormats.count();
-    // we expect a really small number of possible formats so linear search
-    // should be OK
-    SkASSERT(count < 16);
-    for (int i = 0; i < count; ++i) {
-        if (format.fInternalFormat ==
-            fStencilFormats[i].fInternalFormat) {
-            fStencilVerifiedColorConfigs[i].markVerified(config);
-            return;
-        }
-    }
-    SkFAIL("Why are we seeing a stencil format that "
-            "GrGLCaps doesn't know about.");
-}
-
-bool GrGLCaps::isColorConfigAndStencilFormatVerified(
-                                GrPixelConfig config,
-                                const GrGLStencilBuffer::Format& format) const {
-#if !GR_GL_CHECK_FBO_STATUS_ONCE_PER_FORMAT
-    return false;
-#endif
-    SkASSERT((unsigned)config < (unsigned)kGrPixelConfigCnt);
-    int count = fStencilFormats.count();
-    // we expect a really small number of possible formats so linear search
-    // should be OK
-    SkASSERT(count < 16);
-    for (int i = 0; i < count; ++i) {
-        if (format.fInternalFormat ==
-            fStencilFormats[i].fInternalFormat) {
-            return fStencilVerifiedColorConfigs[i].isVerified(config);
-        }
-    }
-    SkFAIL("Why are we seeing a stencil format that "
-            "GLCaps doesn't know about.");
-    return false;
 }
 
 SkString GrGLCaps::dump() const {
@@ -765,6 +1149,7 @@ SkString GrGLCaps::dump() const {
         "Apple",
         "IMG MS To Texture",
         "EXT MS To Texture",
+        "MixedSamples",
     };
     GR_STATIC_ASSERT(0 == kNone_MSFBOType);
     GR_STATIC_ASSERT(1 == kDesktop_ARB_MSFBOType);
@@ -773,18 +1158,9 @@ SkString GrGLCaps::dump() const {
     GR_STATIC_ASSERT(4 == kES_Apple_MSFBOType);
     GR_STATIC_ASSERT(5 == kES_IMG_MsToTexture_MSFBOType);
     GR_STATIC_ASSERT(6 == kES_EXT_MsToTexture_MSFBOType);
+    GR_STATIC_ASSERT(7 == kMixedSamples_MSFBOType);
     GR_STATIC_ASSERT(SK_ARRAY_COUNT(kMSFBOExtStr) == kLast_MSFBOType + 1);
 
-    static const char* kFBFetchTypeStr[] = {
-        "None",
-        "EXT",
-        "NV",
-    };
-    GR_STATIC_ASSERT(0 == kNone_FBFetchType);
-    GR_STATIC_ASSERT(1 == kEXT_FBFetchType);
-    GR_STATIC_ASSERT(2 == kNV_FBFetchType);
-    GR_STATIC_ASSERT(SK_ARRAY_COUNT(kFBFetchTypeStr) == kLast_FBFetchType + 1);
-
     static const char* kInvalidateFBTypeStr[] = {
         "None",
         "Discard",
@@ -809,18 +1185,13 @@ SkString GrGLCaps::dump() const {
 
     r.appendf("Core Profile: %s\n", (fIsCoreProfile ? "YES" : "NO"));
     r.appendf("MSAA Type: %s\n", kMSFBOExtStr[fMSFBOType]);
-    r.appendf("FB Fetch Type: %s\n", kFBFetchTypeStr[fFBFetchType]);
     r.appendf("Invalidate FB Type: %s\n", kInvalidateFBTypeStr[fInvalidateFBType]);
     r.appendf("Map Buffer Type: %s\n", kMapBufferTypeStr[fMapBufferType]);
     r.appendf("Max FS Uniform Vectors: %d\n", fMaxFragmentUniformVectors);
     r.appendf("Max FS Texture Units: %d\n", fMaxFragmentTextureUnits);
-    if (!fIsCoreProfile) {
-        r.appendf("Max Fixed Function Texture Coords: %d\n", fMaxFixedFunctionTextureCoords);
-    }
     r.appendf("Max Vertex Attributes: %d\n", fMaxVertexAttributes);
     r.appendf("Support RGBA8 Render Buffer: %s\n", (fRGBA8RenderbufferSupport ? "YES": "NO"));
     r.appendf("BGRA is an internal format: %s\n", (fBGRAIsInternalFormat ? "YES": "NO"));
-    r.appendf("Support texture swizzle: %s\n", (fTextureSwizzleSupport ? "YES": "NO"));
     r.appendf("Unpack Row length support: %s\n", (fUnpackRowLengthSupport ? "YES": "NO"));
     r.appendf("Unpack Flip Y support: %s\n", (fUnpackFlipYSupport ? "YES": "NO"));
     r.appendf("Pack Row length support: %s\n", (fPackRowLengthSupport ? "YES": "NO"));
@@ -831,12 +1202,142 @@ SkString GrGLCaps::dump() const {
     r.appendf("GL_R support: %s\n", (fTextureRedSupport ? "YES": "NO"));
     r.appendf("GL_ARB_imaging support: %s\n", (fImagingSupport ? "YES": "NO"));
     r.appendf("Two Format Limit: %s\n", (fTwoFormatLimit ? "YES": "NO"));
-    r.appendf("Fragment coord conventions support: %s\n",
-             (fFragCoordsConventionSupport ? "YES": "NO"));
     r.appendf("Vertex array object support: %s\n", (fVertexArrayObjectSupport ? "YES": "NO"));
+    r.appendf("Instanced drawing support: %s\n", (fInstancedDrawingSupport ? "YES": "NO"));
+    r.appendf("Direct state access support: %s\n", (fDirectStateAccessSupport ? "YES": "NO"));
+    r.appendf("Debug support: %s\n", (fDebugSupport ? "YES": "NO"));
+    r.appendf("Multisample disable support: %s\n", (fMultisampleDisableSupport ? "YES" : "NO"));
     r.appendf("Use non-VBO for dynamic data: %s\n",
              (fUseNonVBOVertexAndIndexDynamicData ? "YES" : "NO"));
-    r.appendf("Full screen clear is free: %s\n", (fFullClearIsFree ? "YES" : "NO"));
-    r.appendf("Drops tile on zero divide: %s\n", (fDropsTileOnZeroDivide ? "YES" : "NO"));
+    r.appendf("SRGB write contol: %s\n", (fSRGBWriteControl ? "YES" : "NO"));
+    r.appendf("RGBA 8888 pixel ops are slow: %s\n", (fRGBA8888PixelsOpsAreSlow ? "YES" : "NO"));
+    r.appendf("Partial FBO read is slow: %s\n", (fPartialFBOReadIsSlow ? "YES" : "NO"));
+    r.appendf("Bind uniform location support: %s\n", (fBindUniformLocationSupport ? "YES" : "NO"));
     return r;
 }
+
+static GrGLenum precision_to_gl_float_type(GrSLPrecision p) {
+    switch (p) {
+    case kLow_GrSLPrecision:
+        return GR_GL_LOW_FLOAT;
+    case kMedium_GrSLPrecision:
+        return GR_GL_MEDIUM_FLOAT;
+    case kHigh_GrSLPrecision:
+        return GR_GL_HIGH_FLOAT;
+    }
+    SkFAIL("Unknown precision.");
+    return -1;
+}
+
+static GrGLenum shader_type_to_gl_shader(GrShaderType type) {
+    switch (type) {
+    case kVertex_GrShaderType:
+        return GR_GL_VERTEX_SHADER;
+    case kGeometry_GrShaderType:
+        return GR_GL_GEOMETRY_SHADER;
+    case kFragment_GrShaderType:
+        return GR_GL_FRAGMENT_SHADER;
+    }
+    SkFAIL("Unknown shader type.");
+    return -1;
+}
+
+void GrGLCaps::initShaderPrecisionTable(const GrGLContextInfo& ctxInfo,
+                                        const GrGLInterface* intf, 
+                                        GrGLSLCaps* glslCaps) {
+    if (kGLES_GrGLStandard == ctxInfo.standard() || ctxInfo.version() >= GR_GL_VER(4, 1) ||
+        ctxInfo.hasExtension("GL_ARB_ES2_compatibility")) {
+        for (int s = 0; s < kGrShaderTypeCount; ++s) {
+            if (kGeometry_GrShaderType != s) {
+                GrShaderType shaderType = static_cast<GrShaderType>(s);
+                GrGLenum glShader = shader_type_to_gl_shader(shaderType);
+                GrShaderCaps::PrecisionInfo* first = nullptr;
+                glslCaps->fShaderPrecisionVaries = false;
+                for (int p = 0; p < kGrSLPrecisionCount; ++p) {
+                    GrSLPrecision precision = static_cast<GrSLPrecision>(p);
+                    GrGLenum glPrecision = precision_to_gl_float_type(precision);
+                    GrGLint range[2];
+                    GrGLint bits;
+                    GR_GL_GetShaderPrecisionFormat(intf, glShader, glPrecision, range, &bits);
+                    if (bits) {
+                        glslCaps->fFloatPrecisions[s][p].fLogRangeLow = range[0];
+                        glslCaps->fFloatPrecisions[s][p].fLogRangeHigh = range[1];
+                        glslCaps->fFloatPrecisions[s][p].fBits = bits;
+                        if (!first) {
+                            first = &glslCaps->fFloatPrecisions[s][p];
+                        }
+                        else if (!glslCaps->fShaderPrecisionVaries) {
+                            glslCaps->fShaderPrecisionVaries = 
+                                                     (*first != glslCaps->fFloatPrecisions[s][p]);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    else {
+        // We're on a desktop GL that doesn't have precision info. Assume they're all 32bit float.
+        glslCaps->fShaderPrecisionVaries = false;
+        for (int s = 0; s < kGrShaderTypeCount; ++s) {
+            if (kGeometry_GrShaderType != s) {
+                for (int p = 0; p < kGrSLPrecisionCount; ++p) {
+                    glslCaps->fFloatPrecisions[s][p].fLogRangeLow = 127;
+                    glslCaps->fFloatPrecisions[s][p].fLogRangeHigh = 127;
+                    glslCaps->fFloatPrecisions[s][p].fBits = 23;
+                }
+            }
+        }
+    }
+    // GetShaderPrecisionFormat doesn't accept GL_GEOMETRY_SHADER as a shader type. Assume they're
+    // the same as the vertex shader. Only fragment shaders were ever allowed to omit support for
+    // highp. GS was added after GetShaderPrecisionFormat was added to the list of features that
+    // are recommended against.
+    if (glslCaps->fGeometryShaderSupport) {
+        for (int p = 0; p < kGrSLPrecisionCount; ++p) {
+            glslCaps->fFloatPrecisions[kGeometry_GrShaderType][p] = 
+                                               glslCaps->fFloatPrecisions[kVertex_GrShaderType][p];
+        }
+    }
+}
+
+void GrGLCaps::initConfigSwizzleTable(const GrGLContextInfo& ctxInfo, GrGLSLCaps* glslCaps) {
+    GrGLStandard standard = ctxInfo.standard();
+    GrGLVersion version = ctxInfo.version();
+
+    glslCaps->fMustSwizzleInShader = true;
+    if (kGL_GrGLStandard == standard) {
+        if (version >= GR_GL_VER(3,3) || ctxInfo.hasExtension("GL_ARB_texture_swizzle")) {
+            glslCaps->fMustSwizzleInShader = false;
+        }
+    } else {
+        if (version >= GR_GL_VER(3,0)) {
+            glslCaps->fMustSwizzleInShader = false;
+        }
+    }
+
+    glslCaps->fConfigSwizzle[kUnknown_GrPixelConfig] = nullptr;
+    if (fTextureRedSupport) {
+        glslCaps->fConfigSwizzle[kAlpha_8_GrPixelConfig] = "rrrr";
+        glslCaps->fConfigSwizzle[kAlpha_half_GrPixelConfig] = "rrrr";
+    } else {
+        glslCaps->fConfigSwizzle[kAlpha_8_GrPixelConfig] = "aaaa";
+        glslCaps->fConfigSwizzle[kAlpha_half_GrPixelConfig] = "aaaa";
+    }
+    glslCaps->fConfigSwizzle[kIndex_8_GrPixelConfig] = "rgba";
+    glslCaps->fConfigSwizzle[kRGB_565_GrPixelConfig] = "rgba";
+    glslCaps->fConfigSwizzle[kRGBA_4444_GrPixelConfig] = "rgba";
+    glslCaps->fConfigSwizzle[kRGBA_8888_GrPixelConfig] = "rgba";
+    glslCaps->fConfigSwizzle[kBGRA_8888_GrPixelConfig] = "rgba";
+    glslCaps->fConfigSwizzle[kSRGBA_8888_GrPixelConfig] = "rgba";
+    glslCaps->fConfigSwizzle[kETC1_GrPixelConfig] = "rgba";
+    glslCaps->fConfigSwizzle[kLATC_GrPixelConfig] = "rrrr";
+    glslCaps->fConfigSwizzle[kR11_EAC_GrPixelConfig] = "rrrr";
+    glslCaps->fConfigSwizzle[kASTC_12x12_GrPixelConfig] = "rgba";
+    glslCaps->fConfigSwizzle[kRGBA_float_GrPixelConfig] = "rgba";
+    glslCaps->fConfigSwizzle[kRGBA_half_GrPixelConfig] = "rgba";
+
+}
+
+void GrGLCaps::onApplyOptionsOverrides(const GrContextOptions& options) {}
+
+
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLCaps.h b/gfx/skia/skia/src/gpu/gl/GrGLCaps.h
index ccf04fd7ba5a..0ec6c85b47ee 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLCaps.h
+++ b/gfx/skia/skia/src/gpu/gl/GrGLCaps.h
@@ -9,23 +9,24 @@
 #ifndef GrGLCaps_DEFINED
 #define GrGLCaps_DEFINED
 
-#include "GrDrawTargetCaps.h"
-#include "GrGLStencilBuffer.h"
+#include "GrCaps.h"
+#include "glsl/GrGLSL.h"
+#include "GrGLStencilAttachment.h"
+#include "SkChecksum.h"
+#include "SkTHash.h"
 #include "SkTArray.h"
-#include "SkTDArray.h"
 
 class GrGLContextInfo;
+class GrGLSLCaps;
 
 /**
  * Stores some capabilities of a GL context. Most are determined by the GL
  * version and the extensions string. It also tracks formats that have passed
  * the FBO completeness test.
  */
-class GrGLCaps : public GrDrawTargetCaps {
+class GrGLCaps : public GrCaps {
 public:
-    SK_DECLARE_INST_COUNT(GrGLCaps)
-
-    typedef GrGLStencilBuffer::Format StencilFormat;
+    typedef GrGLStencilAttachment::Format StencilFormat;
 
     /**
      * The type of MSAA for FBOs supported. Different extensions have different
@@ -64,18 +65,12 @@ public:
          * GL_MAX_SAMPLES value.
          */
         kES_EXT_MsToTexture_MSFBOType,
+        /**
+         * GL_NV_framebuffer_mixed_samples.
+         */
+        kMixedSamples_MSFBOType,
 
-        kLast_MSFBOType = kES_EXT_MsToTexture_MSFBOType
-    };
-
-    enum FBFetchType {
-        kNone_FBFetchType,
-        /** GL_EXT_shader_framebuffer_fetch */
-        kEXT_FBFetchType,
-        /** GL_NV_shader_framebuffer_fetch */
-        kNV_FBFetchType,
-
-        kLast_FBFetchType = kNV_FBFetchType
+        kLast_MSFBOType = kMixedSamples_MSFBOType
     };
 
     enum InvalidateFBType {
@@ -95,26 +90,12 @@ public:
         kLast_MapBufferType = kChromium_MapBufferType,
     };
 
-    /**
-     * Creates a GrGLCaps that advertises no support for any extensions,
-     * formats, etc. Call init to initialize from a GrGLContextInfo.
-     */
-    GrGLCaps();
-
-    GrGLCaps(const GrGLCaps& caps);
-
-    GrGLCaps& operator = (const GrGLCaps& caps);
-
-    /**
-     * Resets the caps such that nothing is supported.
-     */
-    virtual void reset() SK_OVERRIDE;
-
     /**
      * Initializes the GrGLCaps to the set of features supported in the current
      * OpenGL context accessible via ctxInfo.
      */
-    bool init(const GrGLContextInfo& ctxInfo, const GrGLInterface* glInterface);
+    GrGLCaps(const GrContextOptions& contextOptions, const GrGLContextInfo& ctxInfo,
+             const GrGLInterface* glInterface);
 
     /**
      * Call to note that a color config has been verified as a valid color
@@ -133,24 +114,6 @@ public:
         return fVerifiedColorConfigs.isVerified(config);
     }
 
-    /**
-     * Call to note that a color config / stencil format pair passed
-     * FBO status check. We may skip calling glCheckFramebufferStatus for
-     * this combination in the future using
-     * isColorConfigAndStencilFormatVerified().
-     */
-    void markColorConfigAndStencilFormatAsVerified(
-                    GrPixelConfig config,
-                    const GrGLStencilBuffer::Format& format);
-
-    /**
-     * Call to check whether color config / stencil format pair has already
-     * passed FBO status check.
-     */
-    bool isColorConfigAndStencilFormatVerified(
-                    GrPixelConfig config,
-                    const GrGLStencilBuffer::Format& format) const;
-
     /**
      * Reports the type of MSAA FBO support.
      */
@@ -162,7 +125,8 @@ public:
     bool usesMSAARenderBuffers() const {
         return kNone_MSFBOType != fMSFBOType &&
                kES_IMG_MsToTexture_MSFBOType != fMSFBOType &&
-               kES_EXT_MsToTexture_MSFBOType != fMSFBOType;
+               kES_EXT_MsToTexture_MSFBOType != fMSFBOType &&
+               kMixedSamples_MSFBOType != fMSFBOType;
     }
 
     /**
@@ -174,8 +138,6 @@ public:
                kES_EXT_MsToTexture_MSFBOType == fMSFBOType;
     }
 
-    FBFetchType fbFetchType() const { return fFBFetchType; }
-
     InvalidateFBType invalidateFBType() const { return fInvalidateFBType; }
 
     /// What type of buffer mapping is supported?
@@ -199,9 +161,6 @@ public:
     /// maximum number of texture units accessible in the fragment shader.
     int maxFragmentTextureUnits() const { return fMaxFragmentTextureUnits; }
 
-    /// maximum number of fixed-function texture coords, or zero if no fixed-function.
-    int maxFixedFunctionTextureCoords() const { return fMaxFixedFunctionTextureCoords; }
-
     /// ES requires an extension to support RGBA8 in RenderBufferStorage
     bool rgba8RenderbufferSupport() const { return fRGBA8RenderbufferSupport; }
 
@@ -212,9 +171,6 @@ public:
      */
     bool bgraIsInternalFormat() const { return fBGRAIsInternalFormat; }
 
-    /// GL_ARB_texture_swizzle support
-    bool textureSwizzleSupport() const { return fTextureSwizzleSupport; }
-
     /// Is there support for GL_UNPACK_ROW_LENGTH
     bool unpackRowLengthSupport() const { return fUnpackRowLengthSupport; }
 
@@ -239,12 +195,26 @@ public:
     /// Is GL_ARB_IMAGING supported
     bool imagingSupport() const { return fImagingSupport; }
 
-    /// Is GL_ARB_fragment_coord_conventions supported?
-    bool fragCoordConventionsSupport() const { return fFragCoordsConventionSupport; }
-
     /// Is there support for Vertex Array Objects?
     bool vertexArrayObjectSupport() const { return fVertexArrayObjectSupport; }
 
+    /// Is there support for glDraw*Instanced and glVertexAttribDivisor?
+    bool instancedDrawingSupport() const { return fInstancedDrawingSupport; }
+
+    /// Is there support for GL_EXT_direct_state_access?
+    bool directStateAccessSupport() const { return fDirectStateAccessSupport; }
+
+    /// Is there support for GL_KHR_debug?
+    bool debugSupport() const { return fDebugSupport; }
+
+    /// Is there support for ES2 compatability?
+    bool ES2CompatibilitySupport() const { return fES2CompatibilitySupport; }
+
+    /// Can we call glDisable(GL_MULTISAMPLE)?
+    bool multisampleDisableSupport() const {
+        return fMultisampleDisableSupport;
+    }
+
     /// Use indices or vertices in CPU arrays rather than VBOs for dynamic content.
     bool useNonVBOVertexAndIndexDynamicData() const {
         return fUseNonVBOVertexAndIndexDynamicData;
@@ -253,19 +223,29 @@ public:
     /// Does ReadPixels support the provided format/type combo?
     bool readPixelsSupported(const GrGLInterface* intf,
                              GrGLenum format,
-                             GrGLenum type) const;
+                             GrGLenum type,
+                             GrGLenum currFboFormat) const;
 
     bool isCoreProfile() const { return fIsCoreProfile; }
 
+    bool bindFragDataLocationSupport() const { return fBindFragDataLocationSupport; }
 
-    bool fullClearIsFree() const { return fFullClearIsFree; }
+    bool bindUniformLocationSupport() const { return fBindUniformLocationSupport; }
 
-    bool dropsTileOnZeroDivide() const { return fDropsTileOnZeroDivide; }
+    /// Are textures with GL_TEXTURE_EXTERNAL_OES type supported.
+    bool externalTextureSupport() const { return fExternalTextureSupport; }
+
+    /**
+     * Is there support for enabling/disabling sRGB writes for sRGB-capable color attachments?
+     * If false this does not mean sRGB is not supported but rather that if it is supported
+     * it cannot be turned off for configs that support it.
+     */
+    bool srgbWriteControl() const { return fSRGBWriteControl; }
 
     /**
      * Returns a string containing the caps info.
      */
-    virtual SkString dump() const SK_OVERRIDE;
+    SkString dump() const override;
 
     /**
      * LATC can appear under one of three possible names. In order to know
@@ -280,7 +260,18 @@ public:
 
     LATCAlias latcAlias() const { return fLATCAlias; }
 
+    bool rgba8888PixelsOpsAreSlow() const { return fRGBA8888PixelsOpsAreSlow; }
+    bool partialFBOReadIsSlow() const { return fPartialFBOReadIsSlow; }
+
+    const GrGLSLCaps* glslCaps() const { return reinterpret_cast<GrGLSLCaps*>(fShaderCaps.get()); }
+
 private:
+    void init(const GrContextOptions&, const GrGLContextInfo&, const GrGLInterface*);
+    void initGLSL(const GrGLContextInfo&);
+    bool hasPathRenderingSupport(const GrGLContextInfo&, const GrGLInterface*);
+
+    void onApplyOptionsOverrides(const GrContextOptions& options) override;
+
     /**
      * Maintains a bit per GrPixelConfig. It is used to avoid redundantly
      * performing glCheckFrameBufferStatus for the same config.
@@ -319,35 +310,37 @@ private:
     };
 
     void initFSAASupport(const GrGLContextInfo&, const GrGLInterface*);
+    void initBlendEqationSupport(const GrGLContextInfo&);
     void initStencilFormats(const GrGLContextInfo&);
     // This must be called after initFSAASupport().
-    void initConfigRenderableTable(const GrGLContextInfo&);
-    void initConfigTexturableTable(const GrGLContextInfo&, const GrGLInterface*);
+    void initConfigRenderableTable(const GrGLContextInfo&, bool srgbSupport);
+    void initConfigTexturableTable(const GrGLContextInfo&, const GrGLInterface*, bool srgbSupport);
+
+    bool doReadPixelsSupported(const GrGLInterface* intf, GrGLenum format, GrGLenum type) const;
+
+    void initShaderPrecisionTable(const GrGLContextInfo& ctxInfo,
+                                  const GrGLInterface* intf,
+                                  GrGLSLCaps* glslCaps);
+
+    void initConfigSwizzleTable(const GrGLContextInfo& ctxInfo, GrGLSLCaps* glslCaps);
 
     // tracks configs that have been verified to pass the FBO completeness when
     // used as a color attachment
     VerifiedColorConfigs fVerifiedColorConfigs;
 
     SkTArray<StencilFormat, true> fStencilFormats;
-    // tracks configs that have been verified to pass the FBO completeness when
-    // used as a color attachment when a particular stencil format is used
-    // as a stencil attachment.
-    SkTArray<VerifiedColorConfigs, true> fStencilVerifiedColorConfigs;
 
     int fMaxFragmentUniformVectors;
     int fMaxVertexAttributes;
     int fMaxFragmentTextureUnits;
-    int fMaxFixedFunctionTextureCoords;
 
     MSFBOType           fMSFBOType;
-    FBFetchType         fFBFetchType;
     InvalidateFBType    fInvalidateFBType;
     MapBufferType       fMapBufferType;
     LATCAlias           fLATCAlias;
 
     bool fRGBA8RenderbufferSupport : 1;
     bool fBGRAIsInternalFormat : 1;
-    bool fTextureSwizzleSupport : 1;
     bool fUnpackRowLengthSupport : 1;
     bool fUnpackFlipYSupport : 1;
     bool fPackRowLengthSupport : 1;
@@ -357,14 +350,35 @@ private:
     bool fTextureRedSupport : 1;
     bool fImagingSupport  : 1;
     bool fTwoFormatLimit : 1;
-    bool fFragCoordsConventionSupport : 1;
     bool fVertexArrayObjectSupport : 1;
+    bool fInstancedDrawingSupport : 1;
+    bool fDirectStateAccessSupport : 1;
+    bool fDebugSupport : 1;
+    bool fES2CompatibilitySupport : 1;
+    bool fMultisampleDisableSupport : 1;
     bool fUseNonVBOVertexAndIndexDynamicData : 1;
     bool fIsCoreProfile : 1;
-    bool fFullClearIsFree : 1;
-    bool fDropsTileOnZeroDivide : 1;
+    bool fBindFragDataLocationSupport : 1;
+    bool fSRGBWriteControl : 1;
+    bool fRGBA8888PixelsOpsAreSlow : 1;
+    bool fPartialFBOReadIsSlow : 1;
+    bool fBindUniformLocationSupport : 1;
+    bool fExternalTextureSupport : 1;
 
-    typedef GrDrawTargetCaps INHERITED;
+    struct ReadPixelsSupportedFormat {
+        GrGLenum fFormat;
+        GrGLenum fType;
+        GrGLenum fFboFormat;
+
+        bool operator==(const ReadPixelsSupportedFormat& rhs) const {
+            return fFormat    == rhs.fFormat
+                && fType      == rhs.fType
+                && fFboFormat == rhs.fFboFormat;
+        }
+    };
+    mutable SkTHashMap<ReadPixelsSupportedFormat, bool> fReadPixelsSupportedCache;
+
+    typedef GrCaps INHERITED;
 };
 
 #endif
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLContext.cpp b/gfx/skia/skia/src/gpu/gl/GrGLContext.cpp
index 5bc5b6f0312b..9e70b472c537 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLContext.cpp
+++ b/gfx/skia/skia/src/gpu/gl/GrGLContext.cpp
@@ -6,73 +6,71 @@
  */
 
 #include "GrGLContext.h"
+#include "GrGLGLSL.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
-GrGLContextInfo& GrGLContextInfo::operator= (const GrGLContextInfo& that) {
-    fInterface.reset(SkSafeRef(that.fInterface.get()));
-    fGLVersion      = that.fGLVersion;
-    fGLSLGeneration = that.fGLSLGeneration;
-    fVendor         = that.fVendor;
-    fRenderer       = that.fRenderer;
-    fIsMesa         = that.fIsMesa;
-    fIsChromium     = that.fIsChromium;
-    *fGLCaps        = *that.fGLCaps.get();
-    return *this;
-}
-
-bool GrGLContextInfo::initialize(const GrGLInterface* interface) {
-    this->reset();
-    // We haven't validated the GrGLInterface yet, so check for GetString
-    // function pointer
-    if (interface->fFunctions.fGetString) {
-        const GrGLubyte* verUByte;
-        GR_GL_CALL_RET(interface, verUByte, GetString(GR_GL_VERSION));
-        const char* ver = reinterpret_cast<const char*>(verUByte);
-
-        const GrGLubyte* rendererUByte;
-        GR_GL_CALL_RET(interface, rendererUByte, GetString(GR_GL_RENDERER));
-        const char* renderer = reinterpret_cast<const char*>(rendererUByte);
-
-        if (interface->validate()) {
-
-            fGLVersion = GrGLGetVersionFromString(ver);
-            if (GR_GL_INVALID_VER == fGLVersion) {
-                return false;
-            }
-
-            if (!GrGetGLSLGeneration(interface, &fGLSLGeneration)) {
-                return false;
-            }
-
-            fVendor = GrGLGetVendor(interface);
-
-            fRenderer = GrGLGetRendererFromString(renderer);
-
-            fIsMesa = GrGLIsMesaFromVersionString(ver);
-
-            fIsChromium = GrGLIsChromiumFromRendererString(renderer);
-
-            // This must occur before caps init.
-            fInterface.reset(SkRef(interface));
-
-            return fGLCaps->init(*this, interface);
-        }
+GrGLContext* GrGLContext::Create(const GrGLInterface* interface, const GrContextOptions& options) {
+    // We haven't validated the GrGLInterface yet, so check for GetString function pointer
+    if (!interface->fFunctions.fGetString) {
+        return nullptr;
     }
-    return false;
+    ConstructorArgs args;
+    args.fInterface = interface;
+
+    const GrGLubyte* verUByte;
+    GR_GL_CALL_RET(interface, verUByte, GetString(GR_GL_VERSION));
+    const char* ver = reinterpret_cast<const char*>(verUByte);
+
+    const GrGLubyte* rendererUByte;
+    GR_GL_CALL_RET(interface, rendererUByte, GetString(GR_GL_RENDERER));
+    const char* renderer = reinterpret_cast<const char*>(rendererUByte);
+
+    if (!interface->validate()) {
+        return nullptr;
+    }
+
+    args.fGLVersion = GrGLGetVersionFromString(ver);
+    if (GR_GL_INVALID_VER == args.fGLVersion) {
+        return nullptr;
+    }
+
+    if (!GrGLGetGLSLGeneration(interface, &args.fGLSLGeneration)) {
+        return nullptr;
+    }
+
+    args.fVendor = GrGLGetVendor(interface);
+
+    args.fRenderer = GrGLGetRendererFromString(renderer);
+
+    /*
+     * Qualcomm drivers for the 3xx series have a horrendous bug with some drivers. Though they
+     * claim to support GLES 3.00, some perfectly valid GLSL300 shaders will only compile with
+     * #version 100, and will fail to compile with #version 300 es.  In the long term, we
+     * need to lock this down to a specific driver version.
+     * ?????/2015 - This bug is still present in Lollipop pre-mr1
+     * 06/18/2015 - This bug does not affect the nexus 6 (which has an Adreno 4xx).
+     */
+    if (kAdreno3xx_GrGLRenderer == args.fRenderer) {
+        args.fGLSLGeneration = k110_GrGLSLGeneration;
+    }
+
+    GrGLGetDriverInfo(interface->fStandard, args.fVendor, renderer, ver,
+                      &args.fDriver, &args.fDriverVersion);
+
+    args.fContextOptions = &options;
+
+    return new GrGLContext(args);
 }
 
-bool GrGLContextInfo::isInitialized() const {
-    return NULL != fInterface.get();
-}
+GrGLContextInfo::GrGLContextInfo(const ConstructorArgs& args) {
+    fInterface.reset(SkRef(args.fInterface));
+    fGLVersion = args.fGLVersion;
+    fGLSLGeneration = args.fGLSLGeneration;
+    fVendor = args.fVendor;
+    fRenderer = args.fRenderer;
+    fDriver = args.fDriver;
+    fDriverVersion = args.fDriverVersion;
 
-void GrGLContextInfo::reset() {
-    fInterface.reset(NULL);
-    fGLVersion = GR_GL_VER(0, 0);
-    fGLSLGeneration = static_cast<GrGLSLGeneration>(0);
-    fVendor = kOther_GrGLVendor;
-    fRenderer = kOther_GrGLRenderer;
-    fIsMesa = false;
-    fIsChromium = false;
-    fGLCaps->reset();
+    fGLCaps.reset(new GrGLCaps(*args.fContextOptions, *this, fInterface));
 }
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLContext.h b/gfx/skia/skia/src/gpu/gl/GrGLContext.h
index 7f46522af290..6016f6859a35 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLContext.h
+++ b/gfx/skia/skia/src/gpu/gl/GrGLContext.h
@@ -12,74 +12,54 @@
 #include "gl/GrGLExtensions.h"
 #include "gl/GrGLInterface.h"
 #include "GrGLCaps.h"
-#include "GrGLSL.h"
 #include "GrGLUtil.h"
 
-#include "SkString.h"
+struct GrContextOptions;
 
 /**
  * Encapsulates information about an OpenGL context including the OpenGL
  * version, the GrGLStandard type of the context, and GLSL version.
  */
-class GrGLContextInfo {
+class GrGLContextInfo : public SkRefCnt {
 public:
-    /**
-     * Default constructor
-     */
-    GrGLContextInfo() {
-        fGLCaps.reset(SkNEW(GrGLCaps));
-        this->reset();
-    }
-
-    GrGLContextInfo(const GrGLContextInfo& that) {
-        fGLCaps.reset(SkNEW(GrGLCaps));
-        *this = that;
-    }
-
-    GrGLContextInfo& operator= (const GrGLContextInfo&);
-
-    /**
-     * Initializes a GrGLContextInfo from a GrGLInterface and the currently
-     * bound OpenGL context accessible by the GrGLInterface.
-     */
-    bool initialize(const GrGLInterface* interface);
-    bool isInitialized() const;
-
     GrGLStandard standard() const { return fInterface->fStandard; }
     GrGLVersion version() const { return fGLVersion; }
     GrGLSLGeneration glslGeneration() const { return fGLSLGeneration; }
     GrGLVendor vendor() const { return fVendor; }
     GrGLRenderer renderer() const { return fRenderer; }
-    /** Is this a mesa-based driver. Does not mean it is the osmesa software rasterizer. */
-    bool isMesa() const { return fIsMesa; }
-    /** Are we running inside Chromium (using the command buffer)? We make some different tradeoffs
-        about what errors to check for because queries are synchronous. We should probably expose
-        this as an option for clients other than Chromium. */
-    bool isChromium() const { return fIsChromium; }
+    /** What driver is running our GL implementation? This is not necessarily related to the vendor.
+        (e.g. Intel GPU being driven by Mesa) */
+    GrGLDriver driver() const { return fDriver; }
+    GrGLDriverVersion driverVersion() const { return fDriverVersion; }
     const GrGLCaps* caps() const { return fGLCaps.get(); }
     GrGLCaps* caps() { return fGLCaps; }
     bool hasExtension(const char* ext) const {
-        if (!this->isInitialized()) {
-            return false;
-        }
         return fInterface->hasExtension(ext);
     }
 
     const GrGLExtensions& extensions() const { return fInterface->fExtensions; }
 
-    /**
-     * Reset the information
-     */
-    void reset();
-
 protected:
+    struct ConstructorArgs {
+        const GrGLInterface*                fInterface;
+        GrGLVersion                         fGLVersion;
+        GrGLSLGeneration                    fGLSLGeneration;
+        GrGLVendor                          fVendor;
+        GrGLRenderer                        fRenderer;
+        GrGLDriver                          fDriver;
+        GrGLDriverVersion                   fDriverVersion;
+        const  GrContextOptions*            fContextOptions;
+    };
+
+    GrGLContextInfo(const ConstructorArgs& args);
+
     SkAutoTUnref<const GrGLInterface>   fInterface;
     GrGLVersion                         fGLVersion;
     GrGLSLGeneration                    fGLSLGeneration;
     GrGLVendor                          fVendor;
     GrGLRenderer                        fRenderer;
-    bool                                fIsMesa;
-    bool                                fIsChromium;
+    GrGLDriver                          fDriver;
+    GrGLDriverVersion                   fDriverVersion;
     SkAutoTUnref<GrGLCaps>              fGLCaps;
 };
 
@@ -92,20 +72,13 @@ public:
      * Creates a GrGLContext from a GrGLInterface and the currently
      * bound OpenGL context accessible by the GrGLInterface.
      */
-    explicit GrGLContext(const GrGLInterface* interface) {
-        this->initialize(interface);
-    }
+    static GrGLContext* Create(const GrGLInterface* interface, const GrContextOptions& options);
 
-    GrGLContext(const GrGLContext& that) : INHERITED(that) {}
-
-    GrGLContext& operator= (const GrGLContext& that) {
-        this->INHERITED::operator=(that);
-        return *this;
-    }
-
-    const GrGLInterface* interface() const { return fInterface.get(); }
+    const GrGLInterface* interface() const { return fInterface; }
 
 private:
+    GrGLContext(const ConstructorArgs& args) : INHERITED(args) {}
+
     typedef GrGLContextInfo INHERITED;
 };
 
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp b/gfx/skia/skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp
index e0c72c539dfb..0a0f279f1646 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp
+++ b/gfx/skia/skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp
@@ -8,5 +8,5 @@
 #include "gl/GrGLInterface.h"
 
 const GrGLInterface* GrGLCreateNativeInterface() {
-    return NULL;
+    return nullptr;
 }
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLCreateNullInterface.cpp b/gfx/skia/skia/src/gpu/gl/GrGLCreateNullInterface.cpp
index d047e730f71a..f0a3e7d4bdd1 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLCreateNullInterface.cpp
+++ b/gfx/skia/skia/src/gpu/gl/GrGLCreateNullInterface.cpp
@@ -10,25 +10,30 @@
 #include "GrGLDefines.h"
 #include "SkTDArray.h"
 #include "GrGLNoOpInterface.h"
+#include "SkTLS.h"
 
-// Functions not declared in GrGLBogusInterface.h (not common with the Debug GL interface).
+// TODO: Delete this file after chrome starts using SkNullGLContext.
 
-namespace { // added to suppress 'no previous prototype' warning
+// added to suppress 'no previous prototype' warning and because this code is duplicated in
+// SkNullGLContext.cpp
+namespace {      
 
-class GrBufferObj {
+class BufferObj {
 public:
-    GrBufferObj(GrGLuint id) : fID(id), fDataPtr(NULL), fSize(0), fMapped(false) {
+    
+
+    BufferObj(GrGLuint id) : fID(id), fDataPtr(nullptr), fSize(0), fMapped(false) {
     }
-    ~GrBufferObj() { SkDELETE_ARRAY(fDataPtr); }
+    ~BufferObj() { delete[] fDataPtr; }
 
     void allocate(GrGLsizeiptr size, const GrGLchar* dataPtr) {
-        if (NULL != fDataPtr) {
+        if (fDataPtr) {
             SkASSERT(0 != fSize);
-            SkDELETE_ARRAY(fDataPtr);
+            delete[] fDataPtr;
         }
 
         fSize = size;
-        fDataPtr = SkNEW_ARRAY(char, size);
+        fDataPtr = new char[size];
     }
 
     GrGLuint id() const          { return fID; }
@@ -45,54 +50,102 @@ private:
     bool         fMapped;
 };
 
-// In debug builds we do asserts that ensure we agree with GL about when a buffer
-// is mapped.
-static SkTDArray<GrBufferObj*> gBuffers;  // slot 0 is reserved for head of free list
-static GrGLuint gCurrArrayBuffer;
-static GrGLuint gCurrElementArrayBuffer;
+// This class maintains a sparsely populated array of buffer pointers.
+class BufferManager {
+public:
+    
 
-static GrBufferObj* look_up(GrGLuint id) {
-    GrBufferObj* buffer = gBuffers[id];
-    SkASSERT(NULL != buffer && buffer->id() == id);
-    return buffer;
-}
+    BufferManager() : fFreeListHead(kFreeListEnd) {}
 
-static GrBufferObj* create_buffer() {
-    if (0 == gBuffers.count()) {
-        // slot zero is reserved for the head of the free list
-        *gBuffers.append() = NULL;
+    ~BufferManager() {
+        // nullptr out the entries that are really free list links rather than ptrs before deleting.
+        intptr_t curr = fFreeListHead;
+        while (kFreeListEnd != curr) {
+            intptr_t next = reinterpret_cast<intptr_t>(fBuffers[SkToS32(curr)]);
+            fBuffers[SkToS32(curr)] = nullptr;
+            curr = next;
+        }
+
+        fBuffers.deleteAll();
     }
 
-    GrGLuint id;
-    GrBufferObj* buffer;
-
-    if (NULL == gBuffers[0]) {
-        // no free slots - create a new one
-        id = gBuffers.count();
-        buffer = SkNEW_ARGS(GrBufferObj, (id));
-        gBuffers.append(1, &buffer);
-    } else {
-        // recycle a slot from the free list
-        id = SkTCast<GrGLuint>(gBuffers[0]);
-        gBuffers[0] = gBuffers[id];
-
-        buffer = SkNEW_ARGS(GrBufferObj, (id));
-        gBuffers[id] = buffer;
+    BufferObj* lookUp(GrGLuint id) {
+        BufferObj* buffer = fBuffers[id];
+        SkASSERT(buffer && buffer->id() == id);
+        return buffer;
     }
 
-    return buffer;
-}
+    BufferObj* create() {
+        GrGLuint id;
+        BufferObj* buffer;
 
-static void delete_buffer(GrBufferObj* buffer) {
-    SkASSERT(gBuffers.count() > 0);
+        if (kFreeListEnd == fFreeListHead) {
+            // no free slots - create a new one
+            id = fBuffers.count();
+            buffer = new BufferObj(id);
+            *fBuffers.append() = buffer;
+        } else {
+            // grab the head of the free list and advance the head to the next free slot.
+            id = static_cast<GrGLuint>(fFreeListHead);
+            fFreeListHead = reinterpret_cast<intptr_t>(fBuffers[id]);
 
-    GrGLuint id = buffer->id();
-    SkDELETE(buffer);
+            buffer = new BufferObj(id);
+            fBuffers[id] = buffer;
+        }
 
-    // Add this slot to the free list
-    gBuffers[id] = gBuffers[0];
-    gBuffers[0] = SkTCast<GrBufferObj*>((const void*)(intptr_t)id);
-}
+        return buffer;
+    }
+
+    void free(BufferObj* buffer) {
+        SkASSERT(fBuffers.count() > 0);
+
+        GrGLuint id = buffer->id();
+        delete buffer;
+
+        fBuffers[id] = reinterpret_cast<BufferObj*>(fFreeListHead);
+        fFreeListHead = id;
+    }
+
+private:
+    static const intptr_t kFreeListEnd = -1;
+    // Index of the first entry of fBuffers in the free list. Free slots in fBuffers are indices to
+    // the next free slot. The last free slot has a value of kFreeListEnd.
+    intptr_t                fFreeListHead;
+    SkTDArray<BufferObj*>   fBuffers;
+};
+
+/**
+ * The global-to-thread state object for the null interface. All null interfaces on the
+ * same thread currently share one of these. This means two null contexts on the same thread
+ * can interfere with each other. It may make sense to more integrate this into SkNullGLContext
+ * and use it's makeCurrent mechanism.
+ */
+struct ThreadContext {
+public:
+    
+
+    BufferManager   fBufferManager;
+    GrGLuint        fCurrArrayBuffer;
+    GrGLuint        fCurrElementArrayBuffer;
+    GrGLuint        fCurrProgramID;
+    GrGLuint        fCurrShaderID;
+
+    static ThreadContext* Get() {
+        return reinterpret_cast<ThreadContext*>(SkTLS::Get(Create, Delete));
+    }
+
+    ThreadContext()
+        : fCurrArrayBuffer(0)
+        , fCurrElementArrayBuffer(0)
+        , fCurrProgramID(0)
+        , fCurrShaderID(0) {}
+
+private:
+    static void* Create() { return new ThreadContext; }
+    static void Delete(void* context) { delete reinterpret_cast<ThreadContext*>(context); }
+};
+
+// Functions not declared in GrGLBogusInterface.h (not common with the Debug GL interface).
 
 GrGLvoid GR_GL_FUNCTION_TYPE nullGLActiveTexture(GrGLenum texture) {}
 GrGLvoid GR_GL_FUNCTION_TYPE nullGLAttachShader(GrGLuint program, GrGLuint shader) {}
@@ -102,9 +155,9 @@ GrGLvoid GR_GL_FUNCTION_TYPE nullGLBindTexture(GrGLenum target, GrGLuint texture
 GrGLvoid GR_GL_FUNCTION_TYPE nullGLBindVertexArray(GrGLuint id) {}
 
 GrGLvoid GR_GL_FUNCTION_TYPE nullGLGenBuffers(GrGLsizei n, GrGLuint* ids) {
-
+    ThreadContext* ctx = ThreadContext::Get();
     for (int i = 0; i < n; ++i) {
-        GrBufferObj* buffer = create_buffer();
+        BufferObj* buffer = ctx->fBufferManager.create();
         ids[i] = buffer->id();
     }
 }
@@ -115,14 +168,15 @@ GrGLvoid GR_GL_FUNCTION_TYPE nullGLBufferData(GrGLenum target,
                                               GrGLsizeiptr size,
                                               const GrGLvoid* data,
                                               GrGLenum usage) {
+    ThreadContext* ctx = ThreadContext::Get();
     GrGLuint id = 0;
 
     switch (target) {
     case GR_GL_ARRAY_BUFFER:
-        id = gCurrArrayBuffer;
+        id = ctx->fCurrArrayBuffer;
         break;
     case GR_GL_ELEMENT_ARRAY_BUFFER:
-        id = gCurrElementArrayBuffer;
+        id = ctx->fCurrElementArrayBuffer;
         break;
     default:
         SkFAIL("Unexpected target to nullGLBufferData");
@@ -130,7 +184,7 @@ GrGLvoid GR_GL_FUNCTION_TYPE nullGLBufferData(GrGLenum target,
     }
 
     if (id > 0) {
-        GrBufferObj* buffer = look_up(id);
+        BufferObj* buffer = ctx->fBufferManager.lookUp(id);
         buffer->allocate(size, (const GrGLchar*) data);
     }
 }
@@ -147,13 +201,11 @@ GrGLvoid GR_GL_FUNCTION_TYPE nullGLFramebufferRenderbuffer(GrGLenum target, GrGL
 GrGLvoid GR_GL_FUNCTION_TYPE nullGLFramebufferTexture2D(GrGLenum target, GrGLenum attachment, GrGLenum textarget, GrGLuint texture, GrGLint level) {}
 
 GrGLuint GR_GL_FUNCTION_TYPE nullGLCreateProgram() {
-    static GrGLuint gCurrID = 0;
-    return ++gCurrID;
+    return ++ThreadContext::Get()->fCurrProgramID;
 }
 
 GrGLuint GR_GL_FUNCTION_TYPE nullGLCreateShader(GrGLenum type) {
-    static GrGLuint gCurrID = 0;
-    return ++gCurrID;
+    return ++ThreadContext::Get()->fCurrShaderID;
 }
 
 // same delete used for shaders and programs
@@ -161,73 +213,77 @@ GrGLvoid GR_GL_FUNCTION_TYPE nullGLDelete(GrGLuint program) {
 }
 
 GrGLvoid GR_GL_FUNCTION_TYPE nullGLBindBuffer(GrGLenum target, GrGLuint buffer) {
+    ThreadContext* ctx = ThreadContext::Get();
     switch (target) {
     case GR_GL_ARRAY_BUFFER:
-        gCurrArrayBuffer = buffer;
+        ctx->fCurrArrayBuffer = buffer;
         break;
     case GR_GL_ELEMENT_ARRAY_BUFFER:
-        gCurrElementArrayBuffer = buffer;
+        ctx->fCurrElementArrayBuffer = buffer;
         break;
     }
 }
 
 // deleting a bound buffer has the side effect of binding 0
 GrGLvoid GR_GL_FUNCTION_TYPE nullGLDeleteBuffers(GrGLsizei n, const GrGLuint* ids) {
+    ThreadContext* ctx = ThreadContext::Get();
     for (int i = 0; i < n; ++i) {
-        if (ids[i] == gCurrArrayBuffer) {
-            gCurrArrayBuffer = 0;
+        if (ids[i] == ctx->fCurrArrayBuffer) {
+            ctx->fCurrArrayBuffer = 0;
         }
-        if (ids[i] == gCurrElementArrayBuffer) {
-            gCurrElementArrayBuffer = 0;
+        if (ids[i] == ctx->fCurrElementArrayBuffer) {
+            ctx->fCurrElementArrayBuffer = 0;
         }
 
-        GrBufferObj* buffer = look_up(ids[i]);
-        delete_buffer(buffer);
+        BufferObj* buffer = ctx->fBufferManager.lookUp(ids[i]);
+        ctx->fBufferManager.free(buffer);
     }
 }
 
 GrGLvoid* GR_GL_FUNCTION_TYPE nullGLMapBufferRange(GrGLenum target, GrGLintptr offset,
                                                    GrGLsizeiptr length, GrGLbitfield access) {
+    ThreadContext* ctx = ThreadContext::Get();
     GrGLuint id = 0;
     switch (target) {
         case GR_GL_ARRAY_BUFFER:
-            id = gCurrArrayBuffer;
+            id = ctx->fCurrArrayBuffer;
             break;
         case GR_GL_ELEMENT_ARRAY_BUFFER:
-            id = gCurrElementArrayBuffer;
+            id = ctx->fCurrElementArrayBuffer;
             break;
     }
 
     if (id > 0) {
         // We just ignore the offset and length here.
-        GrBufferObj* buffer = look_up(id);
+        BufferObj* buffer = ctx->fBufferManager.lookUp(id);
         SkASSERT(!buffer->mapped());
         buffer->setMapped(true);
         return buffer->dataPtr();
     }
-    return NULL;
+    return nullptr;
 }
 
 GrGLvoid* GR_GL_FUNCTION_TYPE nullGLMapBuffer(GrGLenum target, GrGLenum access) {
+    ThreadContext* ctx = ThreadContext::Get();
     GrGLuint id = 0;
     switch (target) {
         case GR_GL_ARRAY_BUFFER:
-            id = gCurrArrayBuffer;
+            id = ctx->fCurrArrayBuffer;
             break;
         case GR_GL_ELEMENT_ARRAY_BUFFER:
-            id = gCurrElementArrayBuffer;
+            id = ctx->fCurrElementArrayBuffer;
             break;
     }
 
     if (id > 0) {
-        GrBufferObj* buffer = look_up(id);
+        BufferObj* buffer = ctx->fBufferManager.lookUp(id);
         SkASSERT(!buffer->mapped());
         buffer->setMapped(true);
         return buffer->dataPtr();
     }
 
     SkASSERT(false);
-    return NULL;            // no buffer bound to target
+    return nullptr;            // no buffer bound to target
 }
 
 GrGLvoid GR_GL_FUNCTION_TYPE nullGLFlushMappedBufferRange(GrGLenum target,
@@ -236,17 +292,18 @@ GrGLvoid GR_GL_FUNCTION_TYPE nullGLFlushMappedBufferRange(GrGLenum target,
 
 
 GrGLboolean GR_GL_FUNCTION_TYPE nullGLUnmapBuffer(GrGLenum target) {
+    ThreadContext* ctx = ThreadContext::Get();
     GrGLuint id = 0;
     switch (target) {
     case GR_GL_ARRAY_BUFFER:
-        id = gCurrArrayBuffer;
+        id = ctx->fCurrArrayBuffer;
         break;
     case GR_GL_ELEMENT_ARRAY_BUFFER:
-        id = gCurrElementArrayBuffer;
+        id = ctx->fCurrElementArrayBuffer;
         break;
     }
     if (id > 0) {
-        GrBufferObj* buffer = look_up(id);
+        BufferObj* buffer = ctx->fBufferManager.lookUp(id);
         SkASSERT(buffer->mapped());
         buffer->setMapped(false);
         return GR_GL_TRUE;
@@ -257,20 +314,21 @@ GrGLboolean GR_GL_FUNCTION_TYPE nullGLUnmapBuffer(GrGLenum target) {
 }
 
 GrGLvoid GR_GL_FUNCTION_TYPE nullGLGetBufferParameteriv(GrGLenum target, GrGLenum pname, GrGLint* params) {
+    ThreadContext* ctx = ThreadContext::Get();
     switch (pname) {
         case GR_GL_BUFFER_MAPPED: {
             *params = GR_GL_FALSE;
             GrGLuint id = 0;
             switch (target) {
                 case GR_GL_ARRAY_BUFFER:
-                    id = gCurrArrayBuffer;
+                    id = ctx->fCurrArrayBuffer;
                     break;
                 case GR_GL_ELEMENT_ARRAY_BUFFER:
-                    id = gCurrElementArrayBuffer;
+                    id = ctx->fCurrElementArrayBuffer;
                     break;
             }
             if (id > 0) {
-                GrBufferObj* buffer = look_up(id);
+                BufferObj* buffer = ctx->fBufferManager.lookUp(id);
                 if (buffer->mapped()) {
                     *params = GR_GL_TRUE;
                 }
@@ -285,7 +343,7 @@ GrGLvoid GR_GL_FUNCTION_TYPE nullGLGetBufferParameteriv(GrGLenum target, GrGLenu
 } // end anonymous namespace
 
 const GrGLInterface* GrGLCreateNullInterface() {
-    GrGLInterface* interface = SkNEW(GrGLInterface);
+    GrGLInterface* interface = new GrGLInterface;
 
     interface->fStandard = kGL_GrGLStandard;
 
@@ -299,6 +357,7 @@ const GrGLInterface* GrGLCreateNullInterface() {
     functions->fBindTexture = nullGLBindTexture;
     functions->fBindVertexArray = nullGLBindVertexArray;
     functions->fBlendColor = noOpGLBlendColor;
+    functions->fBlendEquation = noOpGLBlendEquation;
     functions->fBlendFunc = noOpGLBlendFunc;
     functions->fBufferData = nullGLBufferData;
     functions->fBufferSubData = noOpGLBufferSubData;
@@ -323,9 +382,11 @@ const GrGLInterface* GrGLCreateNullInterface() {
     functions->fDisable = noOpGLDisable;
     functions->fDisableVertexAttribArray = noOpGLDisableVertexAttribArray;
     functions->fDrawArrays = noOpGLDrawArrays;
+    functions->fDrawArraysInstanced = noOpGLDrawArraysInstanced;
     functions->fDrawBuffer = noOpGLDrawBuffer;
     functions->fDrawBuffers = noOpGLDrawBuffers;
     functions->fDrawElements = noOpGLDrawElements;
+    functions->fDrawElementsInstanced = noOpGLDrawElementsInstanced;
     functions->fEnable = noOpGLEnable;
     functions->fEnableVertexAttribArray = noOpGLEnableVertexAttribArray;
     functions->fEndQuery = noOpGLEndQuery;
@@ -400,8 +461,12 @@ const GrGLInterface* GrGLCreateNullInterface() {
     functions->fUniformMatrix4fv = noOpGLUniformMatrix4fv;
     functions->fUnmapBuffer = nullGLUnmapBuffer;
     functions->fUseProgram = nullGLUseProgram;
+    functions->fVertexAttrib1f = noOpGLVertexAttrib1f;
+    functions->fVertexAttrib2fv = noOpGLVertexAttrib2fv;
+    functions->fVertexAttrib3fv = noOpGLVertexAttrib3fv;
     functions->fVertexAttrib4fv = noOpGLVertexAttrib4fv;
     functions->fVertexAttribPointer = noOpGLVertexAttribPointer;
+    functions->fVertexAttribDivisor = noOpGLVertexAttribDivisor;
     functions->fViewport = nullGLViewport;
     functions->fBindFramebuffer = nullGLBindFramebuffer;
     functions->fBindRenderbuffer = nullGLBindRenderbuffer;
@@ -423,6 +488,6 @@ const GrGLInterface* GrGLCreateNullInterface() {
     functions->fBindFragDataLocationIndexed = noOpGLBindFragDataLocationIndexed;
 
     interface->fExtensions.init(kGL_GrGLStandard, functions->fGetString, functions->fGetStringi,
-                                functions->fGetIntegerv);
+                                functions->fGetIntegerv, nullptr, GR_EGL_NO_DISPLAY);
     return interface;
 }
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLDefaultInterface_none.cpp b/gfx/skia/skia/src/gpu/gl/GrGLDefaultInterface_none.cpp
index 84c7f7c32196..f9e52470bc21 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLDefaultInterface_none.cpp
+++ b/gfx/skia/skia/src/gpu/gl/GrGLDefaultInterface_none.cpp
@@ -8,5 +8,5 @@
 #include "gl/GrGLInterface.h"
 
 const GrGLInterface* GrGLDefaultInterface() {
-    return NULL;
+    return nullptr;
 }
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLDefines.h b/gfx/skia/skia/src/gpu/gl/GrGLDefines.h
index 77b7a1536643..dfab5e7e13a1 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLDefines.h
+++ b/gfx/skia/skia/src/gpu/gl/GrGLDefines.h
@@ -45,6 +45,28 @@
 /*      GL_GEQUAL */
 /*      GL_ALWAYS */
 
+/* Basic OpenGL blend equations */
+#define GR_GL_FUNC_ADD                       0x8006
+#define GR_GL_FUNC_SUBTRACT                  0x800A
+#define GR_GL_FUNC_REVERSE_SUBTRACT          0x800B
+
+/* GL_KHR_blend_equation_advanced */
+#define GR_GL_SCREEN                         0x9295
+#define GR_GL_OVERLAY                        0x9296
+#define GR_GL_DARKEN                         0x9297
+#define GR_GL_LIGHTEN                        0x9298
+#define GR_GL_COLORDODGE                     0x9299
+#define GR_GL_COLORBURN                      0x929A
+#define GR_GL_HARDLIGHT                      0x929B
+#define GR_GL_SOFTLIGHT                      0x929C
+#define GR_GL_DIFFERENCE                     0x929E
+#define GR_GL_EXCLUSION                      0x92A0
+#define GR_GL_MULTIPLY                       0x9294
+#define GR_GL_HSL_HUE                        0x92AD
+#define GR_GL_HSL_SATURATION                 0x92AE
+#define GR_GL_HSL_COLOR                      0x92AF
+#define GR_GL_HSL_LUMINOSITY                 0x92B0
+
 /* BlendingFactorDest */
 #define GR_GL_ZERO                           0
 #define GR_GL_ONE                            1
@@ -132,6 +154,7 @@
 #define GR_GL_INDEX_LOGIC_OP                 0x0BF1
 #define GR_GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
 #define GR_GL_LINE_STIPPLE                   0x0B24
+#define GR_GL_FRAMEBUFFER_SRGB               0x8DB9
 
 /* ErrorCode */
 #define GR_GL_NO_ERROR                       0
@@ -211,80 +234,80 @@
 #define GR_GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
 
 /* Compressed Texture Formats */
-#define GR_GL_COMPRESSED_RGB_S3TC_DXT1_EXT         0x83F0
-#define GR_GL_COMPRESSED_RGBA_S3TC_DXT1_EXT        0x83F1
-#define GR_GL_COMPRESSED_RGBA_S3TC_DXT3_EXT        0x83F2
-#define GR_GL_COMPRESSED_RGBA_S3TC_DXT5_EXT        0x83F3
+#define GR_GL_COMPRESSED_RGB_S3TC_DXT1_EXT             0x83F0
+#define GR_GL_COMPRESSED_RGBA_S3TC_DXT1_EXT            0x83F1
+#define GR_GL_COMPRESSED_RGBA_S3TC_DXT3_EXT            0x83F2
+#define GR_GL_COMPRESSED_RGBA_S3TC_DXT5_EXT            0x83F3
 
-#define GR_GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG      0x8C00
-#define GR_GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG      0x8C01
-#define GR_GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG     0x8C02
-#define GR_GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG     0x8C03
+#define GR_GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG          0x8C00
+#define GR_GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG          0x8C01
+#define GR_GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG         0x8C02
+#define GR_GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG         0x8C03
 
-#define GR_GL_COMPRESSED_RGBA_PVRTC_2BPPV2_IMG     0x9137
-#define GR_GL_COMPRESSED_RGBA_PVRTC_4BPPV2_IMG     0x9138
+#define GR_GL_COMPRESSED_RGBA_PVRTC_2BPPV2_IMG         0x9137
+#define GR_GL_COMPRESSED_RGBA_PVRTC_4BPPV2_IMG         0x9138
 
-#define GR_GL_COMPRESSED_RGB8_ETC1                 0x8D64
+#define GR_GL_COMPRESSED_ETC1_RGB8                     0x8D64
 
-#define GR_GL_COMPRESSED_R11                       0x9270
-#define GR_GL_COMPRESSED_SIGNED_R11                0x9271
-#define GR_GL_COMPRESSED_RG11                      0x9272
-#define GR_GL_COMPRESSED_SIGNED_RG11               0x9273
+#define GR_GL_COMPRESSED_R11_EAC                       0x9270
+#define GR_GL_COMPRESSED_SIGNED_R11_EAC                0x9271
+#define GR_GL_COMPRESSED_RG11_EAC                      0x9272
+#define GR_GL_COMPRESSED_SIGNED_RG11_EAC               0x9273
 
-#define GR_GL_COMPRESSED_RGB8_ETC2                 0x9274
-#define GR_GL_COMPRESSED_SRGB8                     0x9275
-#define GR_GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1  0x9276
-#define GR_GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1 0x9277
-#define GR_GL_COMPRESSED_RGBA8_ETC2                0x9278
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ETC2         0x9279
+#define GR_GL_COMPRESSED_RGB8_ETC2                     0x9274
+#define GR_GL_COMPRESSED_SRGB8                         0x9275
+#define GR_GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1      0x9276
+#define GR_GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1     0x9277
+#define GR_GL_COMPRESSED_RGBA8_ETC2                    0x9278
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ETC2             0x9279
 
-#define GR_GL_COMPRESSED_LUMINANCE_LATC1           0x8C70
-#define GR_GL_COMPRESSED_SIGNED_LUMINANCE_LATC1    0x8C71
-#define GR_GL_COMPRESSED_LUMINANCE_ALPHA_LATC2     0x8C72
-#define GR_GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2 0x8C73
+#define GR_GL_COMPRESSED_LUMINANCE_LATC1               0x8C70
+#define GR_GL_COMPRESSED_SIGNED_LUMINANCE_LATC1        0x8C71
+#define GR_GL_COMPRESSED_LUMINANCE_ALPHA_LATC2         0x8C72
+#define GR_GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2  0x8C73
 
-#define GR_GL_COMPRESSED_RED_RGTC1                 0x8DBB
-#define GR_GL_COMPRESSED_SIGNED_RED_RGTC1          0x8DBC
-#define GR_GL_COMPRESSED_RED_GREEN_RGTC2           0x8DBD
-#define GR_GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2    0x8DBE
+#define GR_GL_COMPRESSED_RED_RGTC1                     0x8DBB
+#define GR_GL_COMPRESSED_SIGNED_RED_RGTC1              0x8DBC
+#define GR_GL_COMPRESSED_RED_GREEN_RGTC2               0x8DBD
+#define GR_GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2        0x8DBE
 
-#define GR_GL_COMPRESSED_3DC_X                     0x87F9
-#define GR_GL_COMPRESSED_3DC_XY                    0x87FA
+#define GR_GL_COMPRESSED_3DC_X                         0x87F9
+#define GR_GL_COMPRESSED_3DC_XY                        0x87FA
 
-#define GR_GL_COMPRESSED_RGBA_BPTC_UNORM           0x8E8C
-#define GR_GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM     0x8E8D
-#define GR_GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT     0x8E8E
-#define GR_GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT   0x8E8F
+#define GR_GL_COMPRESSED_RGBA_BPTC_UNORM               0x8E8C
+#define GR_GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM         0x8E8D
+#define GR_GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT         0x8E8E
+#define GR_GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT       0x8E8F
 
-#define GR_GL_COMPRESSED_RGBA_ASTC_4x4             0x93B0
-#define GR_GL_COMPRESSED_RGBA_ASTC_5x4             0x93B1
-#define GR_GL_COMPRESSED_RGBA_ASTC_5x5             0x93B2
-#define GR_GL_COMPRESSED_RGBA_ASTC_6x5             0x93B3
-#define GR_GL_COMPRESSED_RGBA_ASTC_6x6             0x93B4
-#define GR_GL_COMPRESSED_RGBA_ASTC_8x5             0x93B5
-#define GR_GL_COMPRESSED_RGBA_ASTC_8x6             0x93B6
-#define GR_GL_COMPRESSED_RGBA_ASTC_8x8             0x93B7
-#define GR_GL_COMPRESSED_RGBA_ASTC_10x5            0x93B8
-#define GR_GL_COMPRESSED_RGBA_ASTC_10x6            0x93B9
-#define GR_GL_COMPRESSED_RGBA_ASTC_10x8            0x93BA
-#define GR_GL_COMPRESSED_RGBA_ASTC_10x10           0x93BB
-#define GR_GL_COMPRESSED_RGBA_ASTC_12x10           0x93BC
-#define GR_GL_COMPRESSED_RGBA_ASTC_12x12           0x93BD
+#define GR_GL_COMPRESSED_RGBA_ASTC_4x4_KHR             0x93B0
+#define GR_GL_COMPRESSED_RGBA_ASTC_5x4_KHR             0x93B1
+#define GR_GL_COMPRESSED_RGBA_ASTC_5x5_KHR             0x93B2
+#define GR_GL_COMPRESSED_RGBA_ASTC_6x5_KHR             0x93B3
+#define GR_GL_COMPRESSED_RGBA_ASTC_6x6_KHR             0x93B4
+#define GR_GL_COMPRESSED_RGBA_ASTC_8x5_KHR             0x93B5
+#define GR_GL_COMPRESSED_RGBA_ASTC_8x6_KHR             0x93B6
+#define GR_GL_COMPRESSED_RGBA_ASTC_8x8_KHR             0x93B7
+#define GR_GL_COMPRESSED_RGBA_ASTC_10x5_KHR            0x93B8
+#define GR_GL_COMPRESSED_RGBA_ASTC_10x6_KHR            0x93B9
+#define GR_GL_COMPRESSED_RGBA_ASTC_10x8_KHR            0x93BA
+#define GR_GL_COMPRESSED_RGBA_ASTC_10x10_KHR           0x93BB
+#define GR_GL_COMPRESSED_RGBA_ASTC_12x10_KHR           0x93BC
+#define GR_GL_COMPRESSED_RGBA_ASTC_12x12_KHR           0x93BD
 
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4     0x93D0
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4     0x93D1
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5     0x93D2
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5     0x93D3
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6     0x93D4
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5     0x93D5
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6     0x93D6
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8     0x93D7
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5    0x93D8
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6    0x93D9
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8    0x93DA
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10   0x93DB
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10   0x93DC
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12   0x93DD
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR     0x93D0
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR     0x93D1
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR     0x93D2
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR     0x93D3
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR     0x93D4
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR     0x93D5
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR     0x93D6
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR     0x93D7
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR    0x93D8
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR    0x93D9
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR    0x93DA
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR   0x93DB
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR   0x93DC
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR   0x93DD
 
 /* HintMode */
 #define GR_GL_DONT_CARE                      0x1100
@@ -302,7 +325,9 @@
 #define GR_GL_INT                            0x1404
 #define GR_GL_UNSIGNED_INT                   0x1405
 #define GR_GL_FLOAT                          0x1406
+#define GR_GL_HALF_FLOAT                     0x140B
 #define GR_GL_FIXED                          0x140C
+#define GR_GL_HALF_FLOAT_OES                 0x8D61
 
 /* Lighting */
 #define GR_GL_LIGHTING                       0x0B50
@@ -379,6 +404,9 @@
 #define GR_GL_ALPHA8                         0x803C
 
 #define GR_GL_R8                             0x8229
+#define GR_GL_R16F                           0x822D
+#define GR_GL_RGBA16F                        0x881A
+#define GR_GL_ALPHA16F                       0x881C
 
 /* PixelType */
 /*      GL_UNSIGNED_BYTE */
@@ -732,6 +760,7 @@
 #define GR_GL_RGB565                         0x8D62
 #define GR_GL_RGBA8                          0x8058
 #define GR_GL_RGBA32F                        0x8814
+#define GR_GL_RGB5                           0x8050
 #define GR_GL_RGB8                           0x8051
 #define GR_GL_BGRA8                          0x93A1
 #define GR_GL_SRGB                           0x8C40
@@ -765,6 +794,8 @@
 #define GR_GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL         0x8CD2
 #define GR_GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
 #define GR_GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER         0x8CD4
+#define GR_GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING        0x8210
+#define GR_GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE        0x8211
 #define GR_GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE              0x8212
 #define GR_GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE            0x8213
 #define GR_GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE             0x8214
@@ -799,105 +830,116 @@
 // commands
 #define GR_GL_CLOSE_PATH                                    0x00
 #define GR_GL_MOVE_TO                                       0x02
-#define GR_GL_RELATIVE_MOVE_TO                              0x03
 #define GR_GL_LINE_TO                                       0x04
-#define GR_GL_RELATIVE_LINE_TO                              0x05
-#define GR_GL_HORIZONTAL_LINE_TO                            0x06
-#define GR_GL_RELATIVE_HORIZONTAL_LINE_TO                   0x07
-#define GR_GL_VERTICAL_LINE_TO                              0x08
-#define GR_GL_RELATIVE_VERTICAL_LINE_TO                     0x09
 #define GR_GL_QUADRATIC_CURVE_TO                            0x0A
-#define GR_GL_RELATIVE_QUADRATIC_CURVE_TO                   0x0B
 #define GR_GL_CUBIC_CURVE_TO                                0x0C
-#define GR_GL_RELATIVE_CUBIC_CURVE_TO                       0x0D
-#define GR_GL_SMOOTH_QUADRATIC_CURVE_TO                     0x0E
-#define GR_GL_RELATIVE_SMOOTH_QUADRATIC_CURVE_TO            0x0F
-#define GR_GL_SMOOTH_CUBIC_CURVE_TO                         0x10
-#define GR_GL_RELATIVE_SMOOTH_CUBIC_CURVE_TO                0x11
-#define GR_GL_SMALL_CCW_ARC_TO                              0x12
-#define GR_GL_RELATIVE_SMALL_CCW_ARC_TO                     0x13
-#define GR_GL_SMALL_CW_ARC_TO                               0x14
-#define GR_GL_RELATIVE_SMALL_CW_ARC_TO                      0x15
-#define GR_GL_LARGE_CCW_ARC_TO                              0x16
-#define GR_GL_RELATIVE_LARGE_CCW_ARC_TO                     0x17
-#define GR_GL_LARGE_CW_ARC_TO                               0x18
-#define GR_GL_RELATIVE_LARGE_CW_ARC_TO                      0x19
-#define GR_GL_CIRCULAR_CCW_ARC_TO                           0xF8
-#define GR_GL_CIRCULAR_CW_ARC_TO                            0xFA
-#define GR_GL_CIRCULAR_TANGENT_ARC_TO                       0xFC
-#define GR_GL_ARC_TO                                        0xFE
-#define GR_GL_RELATIVE_ARC_TO                               0xFF
+#define GR_GL_CONIC_CURVE_TO                                0x1A
 
 // path parameters
 #define GR_GL_PATH_STROKE_WIDTH                             0x9075
-#define GR_GL_PATH_INITIAL_END_CAP                          0x9077
-#define GR_GL_PATH_TERMINAL_END_CAP                         0x9078
+#define GR_GL_PATH_END_CAPS                                 0x9076
 #define GR_GL_PATH_JOIN_STYLE                               0x9079
 #define GR_GL_PATH_MITER_LIMIT                              0x907A
-#define GR_GL_PATH_INITIAL_DASH_CAP                         0x907C
-#define GR_GL_PATH_TERMINAL_DASH_CAP                        0x907D
-#define GR_GL_PATH_DASH_OFFSET                              0x907E
-#define GR_GL_PATH_CLIENT_LENGTH                            0x907F
-#define GR_GL_PATH_DASH_OFFSET_RESET                        0x90B4
-#define GR_GL_PATH_FILL_MODE                                0x9080
-#define GR_GL_PATH_FILL_MASK                                0x9081
-#define GR_GL_PATH_FILL_COVER_MODE                          0x9082
-#define GR_GL_PATH_STROKE_COVER_MODE                        0x9083
-#define GR_GL_PATH_STROKE_MASK                              0x9084
-#define GR_GL_PATH_END_CAPS                                 0x9076
-#define GR_GL_PATH_DASH_CAPS                                0x907B
-#define GR_GL_PATH_COMMAND_COUNT                            0x909D
-#define GR_GL_PATH_COORD_COUNT                              0x909E
-#define GR_GL_PATH_DASH_ARRAY_COUNT                         0x909F
-#define GR_GL_PATH_FILL_BOUNDING_BOX                        0x90A1
-#define GR_GL_PATH_STROKE_BOUNDING_BOX                      0x90A2
+#define GR_GL_PATH_STROKE_BOUND                             0x9086
 
 // fill modes
-/*      GL_INVERT */
 #define GR_GL_COUNT_UP                                      0x9088
-#define GR_GL_COUNT_DOWN                                    0x9089
-/*      GL_PATH_FILL_MODE_NV */
-
-// gen mode
-/*      GL_NONE */
-/*      GL_EYE_LINEAR */
-/*      GL_OBJECT_LINEAR */
-#define GR_GL_PATH_OBJECT_BOUNDING_BOX                      0x908A
 
 // cover mode
-#define GR_GL_CONVEX_HULL                                   0x908B
 #define GR_GL_BOUNDING_BOX                                  0x908D
 #define GR_GL_BOUNDING_BOX_OF_BOUNDING_BOXES                0x909C
-/*      GL_PATH_FILL_COVER_MODE_NV */
 
 // transform type
-/*      GL_NONE */
 #define GR_GL_TRANSLATE_X                                   0x908E
 #define GR_GL_TRANSLATE_Y                                   0x908F
 #define GR_GL_TRANSLATE_2D                                  0x9090
-#define GR_GL_TRANSLATE_3D                                  0x9091
-#define GR_GL_AFFINE_2D                                     0x9092
-#define GR_GL_AFFINE_3D                                     0x9094
 #define GR_GL_TRANSPOSE_AFFINE_2D                           0x9096
-#define GR_GL_TRANSPOSE_AFFINE_3D                           0x9098
-
 
 // cap/dash values
-/*      GL_FLAT */
 #define GR_GL_SQUARE                                        0x90A3
 #define GR_GL_ROUND                                         0x90A4
-#define GR_GL_TRIANGULAR                                    0x90A5
 
 // join values
-/*      GL_NONE */
-/*      GL_ROUND_NV  */
 #define GR_GL_BEVEL                                         0x90A6
 #define GR_GL_MITER_REVERT                                  0x90A7
-#define GR_GL_MITER_TRUNCATE                                0x90A8
+
+// glyph loading values
+#define GR_GL_STANDARD_FONT_FORMAT                          0x936C
+#define GR_GL_FONT_GLYPHS_AVAILABLE                         0x9368
 
 // NV_path_rendering extension to ARB_program_interface_query:
 // .. corresponds to the set of active input variables used by the fragment
 // shader stage of <program> (if a fragment stage exists).
 #define GR_GL_FRAGMENT_INPUT                                0x936D
 
+// NV_path_rendering extension to EXT_direct_state_access:
+// [the matrix functions] must support the PATH_PROJECTION_NV and
+// PATH_MODELVIEW_NV tokens for matrixMode.
+#define GR_GL_PATH_PROJECTION                               0x1701
+#define GR_GL_PATH_MODELVIEW                                0x1700
+
+/*  ARM specific define for MSAA support on framebuffer fetch */
+#define GR_GL_FETCH_PER_SAMPLE_ARM                          0x8F65
+
+/* GL_EXT_raster_multisample */
+#define GR_GL_RASTER_MULTISAMPLE                            0x9327
+#define GR_GL_RASTER_SAMPLES                                0x9328
+#define GR_GL_MAX_RASTER_SAMPLES                            0x9329
+#define GR_GL_RASTER_FIXED_SAMPLE_LOCATIONS                 0x932A
+#define GR_GL_MULTISAMPLE_RASTERIZATION_ALLOWED             0x932B
+#define GR_GL_EFFECTIVE_RASTER_SAMPLES                      0x932C
+
+/* GL_KHR_debug */
+#define GR_GL_DEBUG_OUTPUT                                  0x92E0
+#define GR_GL_DEBUG_OUTPUT_SYNCHRONOUS                      0x8242
+#define GR_GL_CONTEXT_FLAG_DEBUG_BIT                        0x00000002
+#define GR_GL_MAX_DEBUG_MESSAGE_LENGTH                      0x9143
+#define GR_GL_MAX_DEBUG_LOGGED_MESSAGES                     0x9144
+#define GR_GL_DEBUG_LOGGED_MESSAGES                         0x9145
+#define GR_GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH              0x8243
+#define GR_GL_MAX_DEBUG_GROUP_STACK_DEPTH                   0x826C
+#define GR_GL_DEBUG_GROUP_STACK_DEPTH                       0x826D
+#define GR_GL_MAX_LABEL_LENGTH                              0x82E8
+#define GR_GL_DEBUG_SOURCE_API                              0x8246
+#define GR_GL_DEBUG_SOURCE_WINDOW_SYSTEM                    0x8247
+#define GR_GL_DEBUG_SOURCE_SHADER_COMPILER                  0x8248
+#define GR_GL_DEBUG_SOURCE_THIRD_PARTY                      0x8249
+#define GR_GL_DEBUG_SOURCE_APPLICATION                      0x824A
+#define GR_GL_DEBUG_SOURCE_OTHER                            0x824B
+#define GR_GL_DEBUG_TYPE_ERROR                              0x824C
+#define GR_GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR                0x824D
+#define GR_GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR                 0x824E
+#define GR_GL_DEBUG_TYPE_PORTABILITY                        0x824F
+#define GR_GL_DEBUG_TYPE_PERFORMANCE                        0x8250
+#define GR_GL_DEBUG_TYPE_OTHER                              0x8251
+#define GR_GL_DEBUG_TYPE_MARKER                             0x8268
+#define GR_GL_DEBUG_TYPE_PUSH_GROUP                         0x8269
+#define GR_GL_DEBUG_TYPE_POP_GROUP                          0x826A
+#define GR_GL_DEBUG_SEVERITY_HIGH                           0x9146
+#define GR_GL_DEBUG_SEVERITY_MEDIUM                         0x9147
+#define GR_GL_DEBUG_SEVERITY_LOW                            0x9148
+#define GR_GL_DEBUG_SEVERITY_NOTIFICATION                   0x826B
+#define GR_GL_STACK_UNDERFLOW                               0x0504
+#define GR_GL_STACK_OVERFLOW                                0x0503
+#define GR_GL_BUFFER                                        0x82E0
+#define GR_GL_SHADER                                        0x82E1
+#define GR_GL_PROGRAM                                       0x82E2
+#define GR_GL_QUERY                                         0x82E3
+#define GR_GL_PROGRAM_PIPELINE                              0x82E4
+#define GR_GL_SAMPLER                                       0x82E6
+
+/* GL_OES_EGL_image_external */
+#define GR_GL_TEXTURE_EXTERNAL                              0x8D65
+
+/* EGL Defines */
+#define GR_EGL_NO_DISPLAY                                   ((GrEGLDisplay)0)
+#define GR_EGL_EXTENSIONS                                   0x3055
+#define GR_EGL_GL_TEXTURE_2D                                0x30B1
+#define GR_EGL_GL_TEXTURE_LEVEL                             0x30BC
+#define GR_EGL_IMAGE_PRESERVED                              0x30D2
+#define GR_EGL_FALSE                                        0x0
+#define GR_EGL_TRUE                                         0x1
+#define GR_EGL_NONE                                         0x3038
+#define GR_EGL_NO_IMAGE                                    ((GrEGLImage)0)
+
 #endif
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLEffect.h b/gfx/skia/skia/src/gpu/gl/GrGLEffect.h
deleted file mode 100644
index f9235db238d5..000000000000
--- a/gfx/skia/skia/src/gpu/gl/GrGLEffect.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrGLEffect_DEFINED
-#define GrGLEffect_DEFINED
-
-#include "GrBackendEffectFactory.h"
-#include "GrGLProgramEffects.h"
-#include "GrGLShaderVar.h"
-#include "GrGLSL.h"
-
-class GrGLShaderBuilder;
-
-/** @file
-    This file contains specializations for OpenGL of the shader stages declared in
-    include/gpu/GrEffect.h. Objects of type GrGLEffect are responsible for emitting the
-    GLSL code that implements a GrEffect and for uploading uniforms at draw time. If they don't
-    always emit the same GLSL code, they must have a function:
-        static inline void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*)
-    that is used to implement a program cache. When two GrEffects produce the same key this means
-    that their GrGLEffects would emit the same GLSL code.
-
-    The GrGLEffect subclass must also have a constructor of the form:
-        EffectSubclass::EffectSubclass(const GrBackendEffectFactory&, const GrDrawEffect&)
-    The effect held by the GrDrawEffect is guaranteed to be of the type that generated the
-    GrGLEffect subclass instance.
-
-    These objects are created by the factory object returned by the GrEffect::getFactory().
-*/
-
-class GrDrawEffect;
-class GrGLTexture;
-class GrGLVertexEffect;
-
-class GrGLEffect {
-
-public:
-    typedef GrGLProgramEffects::TransformedCoordsArray TransformedCoordsArray;
-    typedef GrGLProgramEffects::TextureSampler TextureSampler;
-    typedef GrGLProgramEffects::TextureSamplerArray TextureSamplerArray;
-
-    GrGLEffect(const GrBackendEffectFactory& factory)
-        : fFactory(factory)
-        , fIsVertexEffect(false) {
-    }
-
-    virtual ~GrGLEffect() {}
-
-    /** Called when the program stage should insert its code into the shaders. The code in each
-        shader will be in its own block ({}) and so locally scoped names will not collide across
-        stages.
-
-        @param builder      Interface used to emit code in the shaders.
-        @param drawEffect   A wrapper on the effect that generated this program stage.
-        @param key          The key that was computed by GenKey() from the generating GrEffect.
-        @param outputColor  A predefined vec4 in the FS in which the stage should place its output
-                            color (or coverage).
-        @param inputColor   A vec4 that holds the input color to the stage in the FS. This may be
-                            NULL in which case the implied input is solid white (all ones).
-                            TODO: Better system for communicating optimization info (e.g. input
-                            color is solid white, trans black, known to be opaque, etc.) that allows
-                            the effect to communicate back similar known info about its output.
-        @param samplers     One entry for each GrTextureAccess of the GrEffect that generated the
-                            GrGLEffect. These can be passed to the builder to emit texture
-                            reads in the generated code.
-        */
-    virtual void emitCode(GrGLShaderBuilder* builder,
-                          const GrDrawEffect& drawEffect,
-                          const GrEffectKey& key,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray& coords,
-                          const TextureSamplerArray& samplers) = 0;
-
-    /** A GrGLEffect instance can be reused with any GrEffect that produces the same stage
-        key; this function reads data from a GrEffect and uploads any uniform variables required
-        by the shaders created in emitCode(). The GrEffect installed in the GrDrawEffect is
-        guaranteed to be of the same type that created this GrGLEffect and to have an identical
-        effect key as the one that created this GrGLEffect. Effects that use local coords have
-        to consider whether the GrEffectStage's coord change matrix should be used. When explicit
-        local coordinates are used it can be ignored. */
-    virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) {}
-
-    const char* name() const { return fFactory.name(); }
-
-    static void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*) {}
-
-    /** Used by the system when generating shader code, to see if this effect can be downcasted to
-        the internal GrGLVertexEffect type */
-    bool isVertexEffect() const { return fIsVertexEffect; }
-
-protected:
-    const GrBackendEffectFactory& fFactory;
-
-private:
-    friend class GrGLVertexEffect; // to set fIsVertexEffect
-
-    bool fIsVertexEffect;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLExtensions.cpp b/gfx/skia/skia/src/gpu/gl/GrGLExtensions.cpp
index 53013df64da1..e51fa04ce839 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLExtensions.cpp
+++ b/gfx/skia/skia/src/gpu/gl/GrGLExtensions.cpp
@@ -31,7 +31,7 @@ static int find_string(const SkTArray<SkString>& strings, const char ext[]) {
     return idx;
 }
 
-GrGLExtensions::GrGLExtensions(const GrGLExtensions& that) : fStrings(SkNEW(SkTArray<SkString>)) {
+GrGLExtensions::GrGLExtensions(const GrGLExtensions& that) : fStrings(new SkTArray<SkString>) {
     *this = that;
 }
 
@@ -41,14 +41,36 @@ GrGLExtensions& GrGLExtensions::operator=(const GrGLExtensions& that) {
     return *this;
 }
 
+static void eat_space_sep_strings(SkTArray<SkString>* out, const char in[]) {
+    if (!in) {
+        return;
+    }
+    while (true) {
+        // skip over multiple spaces between extensions
+        while (' ' == *in) {
+            ++in;
+        }
+        // quit once we reach the end of the string.
+        if ('\0' == *in) {
+            break;
+        }
+        // we found an extension
+        size_t length = strcspn(in, " ");
+        out->push_back().set(in, length);
+        in += length;
+    }
+}
+
 bool GrGLExtensions::init(GrGLStandard standard,
                           GrGLGetStringProc getString,
                           GrGLGetStringiProc getStringi,
-                          GrGLGetIntegervProc getIntegerv) {
+                          GrGLGetIntegervProc getIntegerv,
+                          GrEGLQueryStringProc queryString,
+                          GrEGLDisplay eglDisplay) {
     fInitialized = false;
     fStrings->reset();
 
-    if (NULL == getString) {
+    if (!getString) {
         return false;
     }
 
@@ -62,7 +84,7 @@ bool GrGLExtensions::init(GrGLStandard standard,
     bool indexed = version >= GR_GL_VER(3, 0);
 
     if (indexed) {
-        if (NULL == getStringi || NULL == getIntegerv) {
+        if (!getStringi || !getIntegerv) {
             return false;
         }
         GrGLint extensionCnt = 0;
@@ -74,23 +96,15 @@ bool GrGLExtensions::init(GrGLStandard standard,
         }
     } else {
         const char* extensions = (const char*) getString(GR_GL_EXTENSIONS);
-        if (NULL == extensions) {
+        if (!extensions) {
             return false;
         }
-        while (true) {
-            // skip over multiple spaces between extensions
-            while (' ' == *extensions) {
-                ++extensions;
-            }
-            // quit once we reach the end of the string.
-            if ('\0' == *extensions) {
-                break;
-            }
-            // we found an extension
-            size_t length = strcspn(extensions, " ");
-            fStrings->push_back().set(extensions, length);
-            extensions += length;
-        }
+        eat_space_sep_strings(fStrings, extensions);
+    }
+    if (queryString) {
+        const char* extensions = queryString(eglDisplay, GR_EGL_EXTENSIONS);
+
+        eat_space_sep_strings(fStrings, extensions);
     }
     if (!fStrings->empty()) {
         SkTLessFunctionToFunctorAdaptor<SkString, extension_compare> cmp;
@@ -112,7 +126,7 @@ bool GrGLExtensions::remove(const char ext[]) {
         // This is not terribly effecient but we really only expect this function to be called at
         // most a handful of times when our test programs start.
         SkAutoTDelete< SkTArray<SkString> > oldStrings(fStrings.detach());
-        fStrings.reset(SkNEW(SkTArray<SkString>(oldStrings->count() - 1)));
+        fStrings.reset(new SkTArray<SkString>(oldStrings->count() - 1));
         fStrings->push_back_n(idx, &oldStrings->front());
         fStrings->push_back_n(oldStrings->count() - idx - 1, &(*oldStrings)[idx] + 1);
         return true;
@@ -133,11 +147,11 @@ void GrGLExtensions::add(const char ext[]) {
 }
 
 void GrGLExtensions::print(const char* sep) const {
-    if (NULL == sep) {
+    if (nullptr == sep) {
         sep = " ";
     }
     int cnt = fStrings->count();
     for (int i = 0; i < cnt; ++i) {
-        GrPrintf("%s%s", (*fStrings)[i].c_str(), (i < cnt - 1) ? sep : "");
+        SkDebugf("%s%s", (*fStrings)[i].c_str(), (i < cnt - 1) ? sep : "");
     }
 }
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLGLSL.cpp b/gfx/skia/skia/src/gpu/gl/GrGLGLSL.cpp
new file mode 100755
index 000000000000..98a2386161f8
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/GrGLGLSL.cpp
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrGLGLSL.h"
+#include "GrGLContext.h"
+#include "GrGLUtil.h"
+#include "SkString.h"
+
+bool GrGLGetGLSLGeneration(const GrGLInterface* gl, GrGLSLGeneration* generation) {
+    SkASSERT(generation);
+    GrGLSLVersion ver = GrGLGetGLSLVersion(gl);
+    if (GR_GLSL_INVALID_VER == ver) {
+        return false;
+    }
+    switch (gl->fStandard) {
+        case kGL_GrGLStandard:
+            SkASSERT(ver >= GR_GLSL_VER(1,10));
+            if (ver >= GR_GLSL_VER(3,30)) {
+                *generation = k330_GrGLSLGeneration;
+            } else if (ver >= GR_GLSL_VER(1,50)) {
+                *generation = k150_GrGLSLGeneration;
+            } else if (ver >= GR_GLSL_VER(1,40)) {
+                *generation = k140_GrGLSLGeneration;
+            } else if (ver >= GR_GLSL_VER(1,30)) {
+                *generation = k130_GrGLSLGeneration;
+            } else {
+                *generation = k110_GrGLSLGeneration;
+            }
+            return true;
+        case kGLES_GrGLStandard:
+            SkASSERT(ver >= GR_GL_VER(1,00));
+            if (ver >= GR_GLSL_VER(3,1)) {
+                *generation = k310es_GrGLSLGeneration;
+            }
+            else if (ver >= GR_GLSL_VER(3,0)) {
+                *generation = k330_GrGLSLGeneration;
+            } else {
+                *generation = k110_GrGLSLGeneration;
+            }
+            return true;
+        default:
+            SkFAIL("Unknown GL Standard");
+            return false;
+    }
+}
+
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLGLSL.h b/gfx/skia/skia/src/gpu/gl/GrGLGLSL.h
new file mode 100755
index 000000000000..31e2de7d7403
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/GrGLGLSL.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGLInitGLSL_DEFINED
+#define GrGLInitGLSL_DEFINED
+
+#include "gl/GrGLInterface.h"
+#include "glsl/GrGLSL.h"
+#include "GrColor.h"
+#include "GrTypesPriv.h"
+#include "SkString.h"
+
+class GrGLContextInfo;
+
+/**
+ * Gets the most recent GLSL Generation compatible with the OpenGL context.
+ */
+bool GrGLGetGLSLGeneration(const GrGLInterface* gl, GrGLSLGeneration* generation);
+
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLGpu.cpp b/gfx/skia/skia/src/gpu/gl/GrGLGpu.cpp
new file mode 100644
index 000000000000..c0581377f108
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/GrGLGpu.cpp
@@ -0,0 +1,3406 @@
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+
+#include "GrGLGpu.h"
+#include "GrGLGLSL.h"
+#include "GrGLStencilAttachment.h"
+#include "GrGLTextureRenderTarget.h"
+#include "GrGpuResourcePriv.h"
+#include "GrPipeline.h"
+#include "GrRenderTargetPriv.h"
+#include "GrSurfacePriv.h"
+#include "GrTexturePriv.h"
+#include "GrTypes.h"
+#include "GrVertices.h"
+#include "builders/GrGLShaderStringBuilder.h"
+#include "glsl/GrGLSL.h"
+#include "glsl/GrGLSLCaps.h"
+#include "SkStrokeRec.h"
+#include "SkTemplates.h"
+
+#define GL_CALL(X) GR_GL_CALL(this->glInterface(), X)
+#define GL_CALL_RET(RET, X) GR_GL_CALL_RET(this->glInterface(), RET, X)
+
+#define SKIP_CACHE_CHECK    true
+
+#if GR_GL_CHECK_ALLOC_WITH_GET_ERROR
+    #define CLEAR_ERROR_BEFORE_ALLOC(iface)   GrGLClearErr(iface)
+    #define GL_ALLOC_CALL(iface, call)        GR_GL_CALL_NOERRCHECK(iface, call)
+    #define CHECK_ALLOC_ERROR(iface)          GR_GL_GET_ERROR(iface)
+#else
+    #define CLEAR_ERROR_BEFORE_ALLOC(iface)
+    #define GL_ALLOC_CALL(iface, call)        GR_GL_CALL(iface, call)
+    #define CHECK_ALLOC_ERROR(iface)          GR_GL_NO_ERROR
+#endif
+
+
+///////////////////////////////////////////////////////////////////////////////
+
+
+static const GrGLenum gXfermodeEquation2Blend[] = {
+    // Basic OpenGL blend equations.
+    GR_GL_FUNC_ADD,
+    GR_GL_FUNC_SUBTRACT,
+    GR_GL_FUNC_REVERSE_SUBTRACT,
+
+    // GL_KHR_blend_equation_advanced.
+    GR_GL_SCREEN,
+    GR_GL_OVERLAY,
+    GR_GL_DARKEN,
+    GR_GL_LIGHTEN,
+    GR_GL_COLORDODGE,
+    GR_GL_COLORBURN,
+    GR_GL_HARDLIGHT,
+    GR_GL_SOFTLIGHT,
+    GR_GL_DIFFERENCE,
+    GR_GL_EXCLUSION,
+    GR_GL_MULTIPLY,
+    GR_GL_HSL_HUE,
+    GR_GL_HSL_SATURATION,
+    GR_GL_HSL_COLOR,
+    GR_GL_HSL_LUMINOSITY
+};
+GR_STATIC_ASSERT(0 == kAdd_GrBlendEquation);
+GR_STATIC_ASSERT(1 == kSubtract_GrBlendEquation);
+GR_STATIC_ASSERT(2 == kReverseSubtract_GrBlendEquation);
+GR_STATIC_ASSERT(3 == kScreen_GrBlendEquation);
+GR_STATIC_ASSERT(4 == kOverlay_GrBlendEquation);
+GR_STATIC_ASSERT(5 == kDarken_GrBlendEquation);
+GR_STATIC_ASSERT(6 == kLighten_GrBlendEquation);
+GR_STATIC_ASSERT(7 == kColorDodge_GrBlendEquation);
+GR_STATIC_ASSERT(8 == kColorBurn_GrBlendEquation);
+GR_STATIC_ASSERT(9 == kHardLight_GrBlendEquation);
+GR_STATIC_ASSERT(10 == kSoftLight_GrBlendEquation);
+GR_STATIC_ASSERT(11 == kDifference_GrBlendEquation);
+GR_STATIC_ASSERT(12 == kExclusion_GrBlendEquation);
+GR_STATIC_ASSERT(13 == kMultiply_GrBlendEquation);
+GR_STATIC_ASSERT(14 == kHSLHue_GrBlendEquation);
+GR_STATIC_ASSERT(15 == kHSLSaturation_GrBlendEquation);
+GR_STATIC_ASSERT(16 == kHSLColor_GrBlendEquation);
+GR_STATIC_ASSERT(17 == kHSLLuminosity_GrBlendEquation);
+GR_STATIC_ASSERT(SK_ARRAY_COUNT(gXfermodeEquation2Blend) == kGrBlendEquationCnt);
+
+static const GrGLenum gXfermodeCoeff2Blend[] = {
+    GR_GL_ZERO,
+    GR_GL_ONE,
+    GR_GL_SRC_COLOR,
+    GR_GL_ONE_MINUS_SRC_COLOR,
+    GR_GL_DST_COLOR,
+    GR_GL_ONE_MINUS_DST_COLOR,
+    GR_GL_SRC_ALPHA,
+    GR_GL_ONE_MINUS_SRC_ALPHA,
+    GR_GL_DST_ALPHA,
+    GR_GL_ONE_MINUS_DST_ALPHA,
+    GR_GL_CONSTANT_COLOR,
+    GR_GL_ONE_MINUS_CONSTANT_COLOR,
+    GR_GL_CONSTANT_ALPHA,
+    GR_GL_ONE_MINUS_CONSTANT_ALPHA,
+
+    // extended blend coeffs
+    GR_GL_SRC1_COLOR,
+    GR_GL_ONE_MINUS_SRC1_COLOR,
+    GR_GL_SRC1_ALPHA,
+    GR_GL_ONE_MINUS_SRC1_ALPHA,
+};
+
+bool GrGLGpu::BlendCoeffReferencesConstant(GrBlendCoeff coeff) {
+    static const bool gCoeffReferencesBlendConst[] = {
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        true,
+        true,
+        true,
+        true,
+
+        // extended blend coeffs
+        false,
+        false,
+        false,
+        false,
+    };
+    return gCoeffReferencesBlendConst[coeff];
+    GR_STATIC_ASSERT(kGrBlendCoeffCnt == SK_ARRAY_COUNT(gCoeffReferencesBlendConst));
+
+    GR_STATIC_ASSERT(0 == kZero_GrBlendCoeff);
+    GR_STATIC_ASSERT(1 == kOne_GrBlendCoeff);
+    GR_STATIC_ASSERT(2 == kSC_GrBlendCoeff);
+    GR_STATIC_ASSERT(3 == kISC_GrBlendCoeff);
+    GR_STATIC_ASSERT(4 == kDC_GrBlendCoeff);
+    GR_STATIC_ASSERT(5 == kIDC_GrBlendCoeff);
+    GR_STATIC_ASSERT(6 == kSA_GrBlendCoeff);
+    GR_STATIC_ASSERT(7 == kISA_GrBlendCoeff);
+    GR_STATIC_ASSERT(8 == kDA_GrBlendCoeff);
+    GR_STATIC_ASSERT(9 == kIDA_GrBlendCoeff);
+    GR_STATIC_ASSERT(10 == kConstC_GrBlendCoeff);
+    GR_STATIC_ASSERT(11 == kIConstC_GrBlendCoeff);
+    GR_STATIC_ASSERT(12 == kConstA_GrBlendCoeff);
+    GR_STATIC_ASSERT(13 == kIConstA_GrBlendCoeff);
+
+    GR_STATIC_ASSERT(14 == kS2C_GrBlendCoeff);
+    GR_STATIC_ASSERT(15 == kIS2C_GrBlendCoeff);
+    GR_STATIC_ASSERT(16 == kS2A_GrBlendCoeff);
+    GR_STATIC_ASSERT(17 == kIS2A_GrBlendCoeff);
+
+    // assertion for gXfermodeCoeff2Blend have to be in GrGpu scope
+    GR_STATIC_ASSERT(kGrBlendCoeffCnt == SK_ARRAY_COUNT(gXfermodeCoeff2Blend));
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+// Used in the map of pixel configs to stencil format indices. This value is used to
+// indicate that a stencil format has not yet been set for the given config.
+static const int kUnknownStencilIndex = -1;
+// This value is used as the stencil index when no stencil configs are supported with the
+// given pixel config.
+static const int kUnsupportedStencilIndex = -2;
+
+///////////////////////////////////////////////////////////////////////////////
+
+GrGpu* GrGLGpu::Create(GrBackendContext backendContext, const GrContextOptions& options,
+                       GrContext* context) {
+    SkAutoTUnref<const GrGLInterface> glInterface(
+        reinterpret_cast<const GrGLInterface*>(backendContext));
+    if (!glInterface) {
+        glInterface.reset(GrGLDefaultInterface());
+    } else {
+        glInterface->ref();
+    }
+    if (!glInterface) {
+        return nullptr;
+    }
+    GrGLContext* glContext = GrGLContext::Create(glInterface, options);
+    if (glContext) {
+        return new GrGLGpu(glContext, context);
+    }
+    return nullptr;
+}
+
+static bool gPrintStartupSpew;
+
+GrGLGpu::GrGLGpu(GrGLContext* ctx, GrContext* context)
+    : GrGpu(context)
+    , fGLContext(ctx) {
+    SkASSERT(ctx);
+    fCaps.reset(SkRef(ctx->caps()));
+
+    fHWBoundTextureUniqueIDs.reset(this->glCaps().maxFragmentTextureUnits());
+
+    GrGLClearErr(this->glInterface());
+    if (gPrintStartupSpew) {
+        const GrGLubyte* vendor;
+        const GrGLubyte* renderer;
+        const GrGLubyte* version;
+        GL_CALL_RET(vendor, GetString(GR_GL_VENDOR));
+        GL_CALL_RET(renderer, GetString(GR_GL_RENDERER));
+        GL_CALL_RET(version, GetString(GR_GL_VERSION));
+        SkDebugf("------------------------- create GrGLGpu %p --------------\n",
+                 this);
+        SkDebugf("------ VENDOR %s\n", vendor);
+        SkDebugf("------ RENDERER %s\n", renderer);
+        SkDebugf("------ VERSION %s\n",  version);
+        SkDebugf("------ EXTENSIONS\n");
+        this->glContext().extensions().print();
+        SkDebugf("\n");
+        SkDebugf("%s", this->glCaps().dump().c_str());
+    }
+
+    fProgramCache = new ProgramCache(this);
+
+    SkASSERT(this->glCaps().maxVertexAttributes() >= GrGeometryProcessor::kMaxVertexAttribs);
+
+    for (int i = 0; i < kGrPixelConfigCnt; ++i) {
+        fPixelConfigToStencilIndex[i] = kUnknownStencilIndex;
+    }
+    fHWProgramID = 0;
+    fTempSrcFBOID = 0;
+    fTempDstFBOID = 0;
+    fStencilClearFBOID = 0;
+
+    if (this->glCaps().shaderCaps()->pathRenderingSupport()) {
+        fPathRendering.reset(new GrGLPathRendering(this));
+    }
+
+    this->createCopyPrograms();
+}
+
+GrGLGpu::~GrGLGpu() {
+    if (0 != fHWProgramID) {
+        // detach the current program so there is no confusion on OpenGL's part
+        // that we want it to be deleted
+        GL_CALL(UseProgram(0));
+    }
+
+    if (0 != fTempSrcFBOID) {
+        GL_CALL(DeleteFramebuffers(1, &fTempSrcFBOID));
+    }
+    if (0 != fTempDstFBOID) {
+        GL_CALL(DeleteFramebuffers(1, &fTempDstFBOID));
+    }
+    if (0 != fStencilClearFBOID) {
+        GL_CALL(DeleteFramebuffers(1, &fStencilClearFBOID));
+    }
+
+    for (size_t i = 0; i < SK_ARRAY_COUNT(fCopyPrograms); ++i) {
+        if (0 != fCopyPrograms[i].fProgram) {
+            GL_CALL(DeleteProgram(fCopyPrograms[i].fProgram));
+        }
+    }
+    if (0 != fCopyProgramArrayBuffer) {
+        GL_CALL(DeleteBuffers(1, &fCopyProgramArrayBuffer));
+    }
+
+    delete fProgramCache;
+}
+
+void GrGLGpu::contextAbandoned() {
+    INHERITED::contextAbandoned();
+    fProgramCache->abandon();
+    fHWProgramID = 0;
+    fTempSrcFBOID = 0;
+    fTempDstFBOID = 0;
+    fStencilClearFBOID = 0;
+    fCopyProgramArrayBuffer = 0;
+    for (size_t i = 0; i < SK_ARRAY_COUNT(fCopyPrograms); ++i) {
+        fCopyPrograms[i].fProgram = 0;
+    }
+    if (this->glCaps().shaderCaps()->pathRenderingSupport()) {
+        this->glPathRendering()->abandonGpuResources();
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+void GrGLGpu::onResetContext(uint32_t resetBits) {
+    // we don't use the zb at all
+    if (resetBits & kMisc_GrGLBackendState) {
+        GL_CALL(Disable(GR_GL_DEPTH_TEST));
+        GL_CALL(DepthMask(GR_GL_FALSE));
+
+        fHWDrawFace = GrPipelineBuilder::kInvalid_DrawFace;
+
+        if (kGL_GrGLStandard == this->glStandard()) {
+            // Desktop-only state that we never change
+            if (!this->glCaps().isCoreProfile()) {
+                GL_CALL(Disable(GR_GL_POINT_SMOOTH));
+                GL_CALL(Disable(GR_GL_LINE_SMOOTH));
+                GL_CALL(Disable(GR_GL_POLYGON_SMOOTH));
+                GL_CALL(Disable(GR_GL_POLYGON_STIPPLE));
+                GL_CALL(Disable(GR_GL_COLOR_LOGIC_OP));
+                GL_CALL(Disable(GR_GL_INDEX_LOGIC_OP));
+            }
+            // The windows NVIDIA driver has GL_ARB_imaging in the extension string when using a
+            // core profile. This seems like a bug since the core spec removes any mention of
+            // GL_ARB_imaging.
+            if (this->glCaps().imagingSupport() && !this->glCaps().isCoreProfile()) {
+                GL_CALL(Disable(GR_GL_COLOR_TABLE));
+            }
+            GL_CALL(Disable(GR_GL_POLYGON_OFFSET_FILL));
+            // Since ES doesn't support glPointSize at all we always use the VS to
+            // set the point size
+            GL_CALL(Enable(GR_GL_VERTEX_PROGRAM_POINT_SIZE));
+
+            // We should set glPolygonMode(FRONT_AND_BACK,FILL) here, too. It isn't
+            // currently part of our gl interface. There are probably others as
+            // well.
+        }
+
+        if (kGLES_GrGLStandard == this->glStandard() &&
+                this->hasExtension("GL_ARM_shader_framebuffer_fetch")) {
+            // The arm extension requires specifically enabling MSAA fetching per sample.
+            // On some devices this may have a perf hit.  Also multiple render targets are disabled
+            GL_CALL(Enable(GR_GL_FETCH_PER_SAMPLE_ARM));
+        }
+        fHWWriteToColor = kUnknown_TriState;
+        // we only ever use lines in hairline mode
+        GL_CALL(LineWidth(1));
+        GL_CALL(Disable(GR_GL_DITHER));
+    }
+
+    if (resetBits & kMSAAEnable_GrGLBackendState) {
+        fMSAAEnabled = kUnknown_TriState;
+
+        // In mixed samples mode coverage modulation allows the coverage to be converted to
+        // "opacity", which can then be blended into the color buffer to accomplish antialiasing.
+        // Enable coverage modulation suitable for premultiplied alpha colors.
+        // This state has no effect when not rendering to a mixed sampled target.
+        if (this->caps()->mixedSamplesSupport()) {
+            GL_CALL(CoverageModulation(GR_GL_RGBA));
+        }
+    }
+
+    fHWActiveTextureUnitIdx = -1; // invalid
+
+    if (resetBits & kTextureBinding_GrGLBackendState) {
+        for (int s = 0; s < fHWBoundTextureUniqueIDs.count(); ++s) {
+            fHWBoundTextureUniqueIDs[s] = SK_InvalidUniqueID;
+        }
+    }
+
+    if (resetBits & kBlend_GrGLBackendState) {
+        fHWBlendState.invalidate();
+    }
+
+    if (resetBits & kView_GrGLBackendState) {
+        fHWScissorSettings.invalidate();
+        fHWViewport.invalidate();
+    }
+
+    if (resetBits & kStencil_GrGLBackendState) {
+        fHWStencilSettings.invalidate();
+        fHWStencilTestEnabled = kUnknown_TriState;
+    }
+
+    // Vertex
+    if (resetBits & kVertex_GrGLBackendState) {
+        fHWGeometryState.invalidate();
+    }
+
+    if (resetBits & kRenderTarget_GrGLBackendState) {
+        fHWBoundRenderTargetUniqueID = SK_InvalidUniqueID;
+        fHWSRGBFramebuffer = kUnknown_TriState;
+    }
+
+    if (resetBits & kPathRendering_GrGLBackendState) {
+        if (this->caps()->shaderCaps()->pathRenderingSupport()) {
+            this->glPathRendering()->resetContext();
+        }
+    }
+
+    // we assume these values
+    if (resetBits & kPixelStore_GrGLBackendState) {
+        if (this->glCaps().unpackRowLengthSupport()) {
+            GL_CALL(PixelStorei(GR_GL_UNPACK_ROW_LENGTH, 0));
+        }
+        if (this->glCaps().packRowLengthSupport()) {
+            GL_CALL(PixelStorei(GR_GL_PACK_ROW_LENGTH, 0));
+        }
+        if (this->glCaps().unpackFlipYSupport()) {
+            GL_CALL(PixelStorei(GR_GL_UNPACK_FLIP_Y, GR_GL_FALSE));
+        }
+        if (this->glCaps().packFlipYSupport()) {
+            GL_CALL(PixelStorei(GR_GL_PACK_REVERSE_ROW_ORDER, GR_GL_FALSE));
+        }
+    }
+
+    if (resetBits & kProgram_GrGLBackendState) {
+        fHWProgramID = 0;
+    }
+}
+
+static GrSurfaceOrigin resolve_origin(GrSurfaceOrigin origin, bool renderTarget) {
+    // By default, GrRenderTargets are GL's normal orientation so that they
+    // can be drawn to by the outside world without the client having
+    // to render upside down.
+    if (kDefault_GrSurfaceOrigin == origin) {
+        return renderTarget ? kBottomLeft_GrSurfaceOrigin : kTopLeft_GrSurfaceOrigin;
+    } else {
+        return origin;
+    }
+}
+
+GrTexture* GrGLGpu::onWrapBackendTexture(const GrBackendTextureDesc& desc,
+                                         GrWrapOwnership ownership) {
+    if (!this->configToGLFormats(desc.fConfig, false, nullptr, nullptr, nullptr)) {
+        return nullptr;
+    }
+#ifdef SK_IGNORE_GL_TEXTURE_TARGET
+    if (!desc.fTextureHandle) {
+        return nullptr;
+    }
+#else
+    const GrGLTextureInfo* info = reinterpret_cast<const GrGLTextureInfo*>(desc.fTextureHandle);
+    if (!info || !info->fID) {
+        return nullptr;
+    }
+#endif
+
+    int maxSize = this->caps()->maxTextureSize();
+    if (desc.fWidth > maxSize || desc.fHeight > maxSize) {
+        return nullptr;
+    }
+
+    // next line relies on GrBackendTextureDesc's flags matching GrTexture's
+    bool renderTarget = SkToBool(desc.fFlags & kRenderTarget_GrBackendTextureFlag);
+
+    GrGLTexture::IDDesc idDesc;
+    GrSurfaceDesc surfDesc;
+
+#ifdef SK_IGNORE_GL_TEXTURE_TARGET
+    idDesc.fInfo.fID = static_cast<GrGLuint>(desc.fTextureHandle);
+    // We only support GL_TEXTURE_2D at the moment.
+    idDesc.fInfo.fTarget = GR_GL_TEXTURE_2D;
+#else
+    idDesc.fInfo = *info;
+#endif
+    if (GR_GL_TEXTURE_EXTERNAL == idDesc.fInfo.fTarget) {
+        if (renderTarget) {
+            // This combination is not supported.
+            return nullptr;
+        }
+        if (!this->glCaps().externalTextureSupport()) {
+            return nullptr;
+        }
+    }
+    // Sample count is interpretted to mean the number of samples that Gr code should allocate
+    // for a render buffer that resolves to the texture. We don't support MSAA textures.
+    if (desc.fSampleCnt && !renderTarget) {
+        return nullptr;
+    }
+
+    switch (ownership) {
+        case kAdopt_GrWrapOwnership:
+            idDesc.fLifeCycle = GrGpuResource::kAdopted_LifeCycle;
+            break;
+        case kBorrow_GrWrapOwnership:
+            idDesc.fLifeCycle = GrGpuResource::kBorrowed_LifeCycle;
+            break;
+    }    
+
+    surfDesc.fFlags = (GrSurfaceFlags) desc.fFlags;
+    surfDesc.fWidth = desc.fWidth;
+    surfDesc.fHeight = desc.fHeight;
+    surfDesc.fConfig = desc.fConfig;
+    surfDesc.fSampleCnt = SkTMin(desc.fSampleCnt, this->caps()->maxSampleCount());
+    // FIXME:  this should be calling resolve_origin(), but Chrome code is currently
+    // assuming the old behaviour, which is that backend textures are always
+    // BottomLeft, even for non-RT's.  Once Chrome is fixed, change this to:
+    // glTexDesc.fOrigin = resolve_origin(desc.fOrigin, renderTarget);
+    if (kDefault_GrSurfaceOrigin == desc.fOrigin) {
+        surfDesc.fOrigin = kBottomLeft_GrSurfaceOrigin;
+    } else {
+        surfDesc.fOrigin = desc.fOrigin;
+    }
+
+    GrGLTexture* texture = nullptr;
+    if (renderTarget) {
+        GrGLRenderTarget::IDDesc rtIDDesc;
+        if (!this->createRenderTargetObjects(surfDesc, GrGpuResource::kUncached_LifeCycle,
+                                             idDesc.fInfo, &rtIDDesc)) {
+            return nullptr;
+        }
+        texture = new GrGLTextureRenderTarget(this, surfDesc, idDesc, rtIDDesc);
+    } else {
+        texture = new GrGLTexture(this, surfDesc, idDesc);
+    }
+    if (nullptr == texture) {
+        return nullptr;
+    }
+
+    return texture;
+}
+
+GrRenderTarget* GrGLGpu::onWrapBackendRenderTarget(const GrBackendRenderTargetDesc& wrapDesc,
+                                                   GrWrapOwnership ownership) {
+    GrGLRenderTarget::IDDesc idDesc;
+    idDesc.fRTFBOID = static_cast<GrGLuint>(wrapDesc.fRenderTargetHandle);
+    idDesc.fMSColorRenderbufferID = 0;
+    idDesc.fTexFBOID = GrGLRenderTarget::kUnresolvableFBOID;
+    switch (ownership) {
+        case kAdopt_GrWrapOwnership:
+            idDesc.fLifeCycle = GrGpuResource::kAdopted_LifeCycle;
+            break;
+        case kBorrow_GrWrapOwnership:
+            idDesc.fLifeCycle = GrGpuResource::kBorrowed_LifeCycle;
+            break;
+    }    
+    idDesc.fSampleConfig = GrRenderTarget::kUnified_SampleConfig;
+
+    GrSurfaceDesc desc;
+    desc.fConfig = wrapDesc.fConfig;
+    desc.fFlags = kCheckAllocation_GrSurfaceFlag | kRenderTarget_GrSurfaceFlag;
+    desc.fWidth = wrapDesc.fWidth;
+    desc.fHeight = wrapDesc.fHeight;
+    desc.fSampleCnt = SkTMin(wrapDesc.fSampleCnt, this->caps()->maxSampleCount());
+    desc.fOrigin = resolve_origin(wrapDesc.fOrigin, true);
+
+    return GrGLRenderTarget::CreateWrapped(this, desc, idDesc, wrapDesc.fStencilBits);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+bool GrGLGpu::onGetWritePixelsInfo(GrSurface* dstSurface, int width, int height,
+                                   size_t rowBytes, GrPixelConfig srcConfig,
+                                   DrawPreference* drawPreference,
+                                   WritePixelTempDrawInfo* tempDrawInfo) {
+    if (kIndex_8_GrPixelConfig == srcConfig || GrPixelConfigIsCompressed(dstSurface->config())) {
+        return false;
+    }
+
+    // This subclass only allows writes to textures. If the dst is not a texture we have to draw
+    // into it. We could use glDrawPixels on GLs that have it, but we don't today.
+    if (!dstSurface->asTexture()) {
+        ElevateDrawPreference(drawPreference, kRequireDraw_DrawPreference);
+    } else {
+        GrGLTexture* texture = static_cast<GrGLTexture*>(dstSurface->asTexture());
+        if (GR_GL_TEXTURE_2D != texture->target()) {
+             // We don't currently support writing pixels to non-TEXTURE_2D textures.
+             return false;
+        }
+    }
+
+    if (GrPixelConfigIsSRGB(dstSurface->config()) != GrPixelConfigIsSRGB(srcConfig)) {
+        ElevateDrawPreference(drawPreference, kRequireDraw_DrawPreference);
+    }
+
+    tempDrawInfo->fSwapRAndB = false;
+
+    // These settings we will always want if a temp draw is performed. Initially set the config
+    // to srcConfig, though that may be modified if we decide to do a R/G swap.
+    tempDrawInfo->fTempSurfaceDesc.fFlags = kNone_GrSurfaceFlags;
+    tempDrawInfo->fTempSurfaceDesc.fConfig = srcConfig;
+    tempDrawInfo->fTempSurfaceDesc.fWidth = width;
+    tempDrawInfo->fTempSurfaceDesc.fHeight = height;
+    tempDrawInfo->fTempSurfaceDesc.fSampleCnt = 0;
+    tempDrawInfo->fTempSurfaceDesc.fOrigin = kTopLeft_GrSurfaceOrigin; // no CPU y-flip for TL.
+
+    bool configsAreRBSwaps = GrPixelConfigSwapRAndB(srcConfig) == dstSurface->config();
+
+    if (configsAreRBSwaps) {
+        if (!this->caps()->isConfigTexturable(srcConfig)) {
+            ElevateDrawPreference(drawPreference, kRequireDraw_DrawPreference);
+            tempDrawInfo->fTempSurfaceDesc.fConfig = dstSurface->config();
+            tempDrawInfo->fSwapRAndB = true;
+        } else if (this->glCaps().rgba8888PixelsOpsAreSlow() &&
+                   kRGBA_8888_GrPixelConfig == srcConfig) {
+            ElevateDrawPreference(drawPreference, kGpuPrefersDraw_DrawPreference);
+            tempDrawInfo->fTempSurfaceDesc.fConfig = dstSurface->config();
+            tempDrawInfo->fSwapRAndB = true;
+        } else if (kGLES_GrGLStandard == this->glStandard() &&
+                   this->glCaps().bgraIsInternalFormat()) {
+            // The internal format and external formats must match texture uploads so we can't
+            // swizzle while uploading when BGRA is a distinct internal format.
+            ElevateDrawPreference(drawPreference, kRequireDraw_DrawPreference);
+            tempDrawInfo->fTempSurfaceDesc.fConfig = dstSurface->config();
+            tempDrawInfo->fSwapRAndB = true;
+        }
+    }
+
+    if (!this->glCaps().unpackFlipYSupport() &&
+        kBottomLeft_GrSurfaceOrigin == dstSurface->origin()) {
+        ElevateDrawPreference(drawPreference, kGpuPrefersDraw_DrawPreference);
+    }
+
+    return true;
+}
+
+bool GrGLGpu::onWritePixels(GrSurface* surface,
+                            int left, int top, int width, int height,
+                            GrPixelConfig config, const void* buffer,
+                            size_t rowBytes) {
+    GrGLTexture* glTex = static_cast<GrGLTexture*>(surface->asTexture());
+    if (!glTex) {
+        return false;
+    }
+
+    // OpenGL doesn't do sRGB <-> linear conversions when reading and writing pixels.
+    if (GrPixelConfigIsSRGB(surface->config()) != GrPixelConfigIsSRGB(config)) {
+        return false;
+    }
+
+    // Write pixels is only implemented for TEXTURE_2D textures
+    if (GR_GL_TEXTURE_2D != glTex->target()) {
+        return false;
+    }
+
+    this->setScratchTextureUnit();
+    GL_CALL(BindTexture(glTex->target(), glTex->textureID()));
+
+    bool success = false;
+    if (GrPixelConfigIsCompressed(glTex->desc().fConfig)) {
+        // We check that config == desc.fConfig in GrGLGpu::canWriteTexturePixels()
+        SkASSERT(config == glTex->desc().fConfig);
+        success = this->uploadCompressedTexData(glTex->desc(), glTex->target(), buffer, false, left,
+                                                top, width, height);
+    } else {
+        success = this->uploadTexData(glTex->desc(), glTex->target(), false, left, top, width,
+                                      height, config, buffer, rowBytes);
+    }
+
+    if (success) {
+        glTex->texturePriv().dirtyMipMaps(true);
+        return true;
+    }
+
+    return false;
+}
+
+static inline GrGLenum check_alloc_error(const GrSurfaceDesc& desc,
+                                         const GrGLInterface* interface) {
+    if (SkToBool(desc.fFlags & kCheckAllocation_GrSurfaceFlag)) {
+        return GR_GL_GET_ERROR(interface);
+    } else {
+        return CHECK_ALLOC_ERROR(interface);
+    }
+}
+
+bool GrGLGpu::uploadTexData(const GrSurfaceDesc& desc,
+                            GrGLenum target,
+                            bool isNewTexture,
+                            int left, int top, int width, int height,
+                            GrPixelConfig dataConfig,
+                            const void* data,
+                            size_t rowBytes) {
+    SkASSERT(data || isNewTexture);
+
+    // If we're uploading compressed data then we should be using uploadCompressedTexData
+    SkASSERT(!GrPixelConfigIsCompressed(dataConfig));
+
+    size_t bpp = GrBytesPerPixel(dataConfig);
+    if (!GrSurfacePriv::AdjustWritePixelParams(desc.fWidth, desc.fHeight, bpp, &left, &top,
+                                               &width, &height, &data, &rowBytes)) {
+        return false;
+    }
+    size_t trimRowBytes = width * bpp;
+
+    // in case we need a temporary, trimmed copy of the src pixels
+    SkAutoMalloc tempStorage;
+
+    // We currently lazily create MIPMAPs when the we see a draw with
+    // GrTextureParams::kMipMap_FilterMode. Using texture storage requires that the
+    // MIP levels are all created when the texture is created. So for now we don't use
+    // texture storage.
+    bool useTexStorage = false &&
+                         isNewTexture &&
+                         this->glCaps().texStorageSupport();
+
+    if (useTexStorage && kGL_GrGLStandard == this->glStandard()) {
+        // 565 is not a sized internal format on desktop GL. So on desktop with
+        // 565 we always use an unsized internal format to let the system pick
+        // the best sized format to convert the 565 data to. Since TexStorage
+        // only allows sized internal formats we will instead use TexImage2D.
+        useTexStorage = desc.fConfig != kRGB_565_GrPixelConfig;
+    }
+
+    GrGLenum internalFormat = 0x0; // suppress warning
+    GrGLenum externalFormat = 0x0; // suppress warning
+    GrGLenum externalType = 0x0;   // suppress warning
+
+    // glTexStorage requires sized internal formats on both desktop and ES. ES2 requires an unsized
+    // format for glTexImage, unlike ES3 and desktop.
+    bool useSizedFormat = useTexStorage;
+    if (kGL_GrGLStandard == this->glStandard() ||
+        (this->glVersion() >= GR_GL_VER(3, 0) &&
+         // ES3 only works with sized BGRA8 format if "GL_APPLE_texture_format_BGRA8888" enabled
+         (kBGRA_8888_GrPixelConfig != dataConfig || !this->glCaps().bgraIsInternalFormat())))  {
+        useSizedFormat = true;
+    }
+
+    if (!this->configToGLFormats(dataConfig, useSizedFormat, &internalFormat,
+                                 &externalFormat, &externalType)) {
+        return false;
+    }
+
+    /*
+     *  check whether to allocate a temporary buffer for flipping y or
+     *  because our srcData has extra bytes past each row. If so, we need
+     *  to trim those off here, since GL ES may not let us specify
+     *  GL_UNPACK_ROW_LENGTH.
+     */
+    bool restoreGLRowLength = false;
+    bool swFlipY = false;
+    bool glFlipY = false;
+    if (data) {
+        if (kBottomLeft_GrSurfaceOrigin == desc.fOrigin) {
+            if (this->glCaps().unpackFlipYSupport()) {
+                glFlipY = true;
+            } else {
+                swFlipY = true;
+            }
+        }
+        if (this->glCaps().unpackRowLengthSupport() && !swFlipY) {
+            // can't use this for flipping, only non-neg values allowed. :(
+            if (rowBytes != trimRowBytes) {
+                GrGLint rowLength = static_cast<GrGLint>(rowBytes / bpp);
+                GL_CALL(PixelStorei(GR_GL_UNPACK_ROW_LENGTH, rowLength));
+                restoreGLRowLength = true;
+            }
+        } else {
+            if (trimRowBytes != rowBytes || swFlipY) {
+                // copy data into our new storage, skipping the trailing bytes
+                size_t trimSize = height * trimRowBytes;
+                const char* src = (const char*)data;
+                if (swFlipY) {
+                    src += (height - 1) * rowBytes;
+                }
+                char* dst = (char*)tempStorage.reset(trimSize);
+                for (int y = 0; y < height; y++) {
+                    memcpy(dst, src, trimRowBytes);
+                    if (swFlipY) {
+                        src -= rowBytes;
+                    } else {
+                        src += rowBytes;
+                    }
+                    dst += trimRowBytes;
+                }
+                // now point data to our copied version
+                data = tempStorage.get();
+            }
+        }
+        if (glFlipY) {
+            GL_CALL(PixelStorei(GR_GL_UNPACK_FLIP_Y, GR_GL_TRUE));
+        }
+        GL_CALL(PixelStorei(GR_GL_UNPACK_ALIGNMENT,
+              static_cast<GrGLint>(GrUnpackAlignment(dataConfig))));
+    }
+    bool succeeded = true;
+    if (isNewTexture &&
+        0 == left && 0 == top &&
+        desc.fWidth == width && desc.fHeight == height) {
+        CLEAR_ERROR_BEFORE_ALLOC(this->glInterface());
+        if (useTexStorage) {
+            // We never resize  or change formats of textures.
+            GL_ALLOC_CALL(this->glInterface(),
+                          TexStorage2D(target,
+                                       1, // levels
+                                       internalFormat,
+                                       desc.fWidth, desc.fHeight));
+        } else {
+            GL_ALLOC_CALL(this->glInterface(),
+                          TexImage2D(target,
+                                     0, // level
+                                     internalFormat,
+                                     desc.fWidth, desc.fHeight,
+                                     0, // border
+                                     externalFormat, externalType,
+                                     data));
+        }
+        GrGLenum error = check_alloc_error(desc, this->glInterface());
+        if (error != GR_GL_NO_ERROR) {
+            succeeded = false;
+        } else {
+            // if we have data and we used TexStorage to create the texture, we
+            // now upload with TexSubImage.
+            if (data && useTexStorage) {
+                GL_CALL(TexSubImage2D(target,
+                                      0, // level
+                                      left, top,
+                                      width, height,
+                                      externalFormat, externalType,
+                                      data));
+            }
+        }
+    } else {
+        if (swFlipY || glFlipY) {
+            top = desc.fHeight - (top + height);
+        }
+        GL_CALL(TexSubImage2D(target,
+                              0, // level
+                              left, top,
+                              width, height,
+                              externalFormat, externalType, data));
+    }
+
+    if (restoreGLRowLength) {
+        SkASSERT(this->glCaps().unpackRowLengthSupport());
+        GL_CALL(PixelStorei(GR_GL_UNPACK_ROW_LENGTH, 0));
+    }
+    if (glFlipY) {
+        GL_CALL(PixelStorei(GR_GL_UNPACK_FLIP_Y, GR_GL_FALSE));
+    }
+    return succeeded;
+}
+
+// TODO: This function is using a lot of wonky semantics like, if width == -1
+// then set width = desc.fWdith ... blah. A better way to do it might be to
+// create a CompressedTexData struct that takes a desc/ptr and figures out
+// the proper upload semantics. Then users can construct this function how they
+// see fit if they want to go against the "standard" way to do it.
+bool GrGLGpu::uploadCompressedTexData(const GrSurfaceDesc& desc,
+                                      GrGLenum target,
+                                      const void* data,
+                                      bool isNewTexture,
+                                      int left, int top, int width, int height) {
+    SkASSERT(data || isNewTexture);
+
+    // No support for software flip y, yet...
+    SkASSERT(kBottomLeft_GrSurfaceOrigin != desc.fOrigin);
+
+    if (-1 == width) {
+        width = desc.fWidth;
+    }
+#ifdef SK_DEBUG
+    else {
+        SkASSERT(width <= desc.fWidth);
+    }
+#endif
+
+    if (-1 == height) {
+        height = desc.fHeight;
+    }
+#ifdef SK_DEBUG
+    else {
+        SkASSERT(height <= desc.fHeight);
+    }
+#endif
+
+    // Make sure that the width and height that we pass to OpenGL
+    // is a multiple of the block size.
+    size_t dataSize = GrCompressedFormatDataSize(desc.fConfig, width, height);
+
+    // We only need the internal format for compressed 2D textures.
+    GrGLenum internalFormat = 0;
+    if (!this->configToGLFormats(desc.fConfig, false, &internalFormat, nullptr, nullptr)) {
+        return false;
+    }
+
+    if (isNewTexture) {
+        CLEAR_ERROR_BEFORE_ALLOC(this->glInterface());
+        GL_ALLOC_CALL(this->glInterface(),
+                      CompressedTexImage2D(target,
+                                           0, // level
+                                           internalFormat,
+                                           width, height,
+                                           0, // border
+                                           SkToInt(dataSize),
+                                           data));
+        GrGLenum error = check_alloc_error(desc, this->glInterface());
+        if (error != GR_GL_NO_ERROR) {
+            return false;
+        }
+    } else {
+        // Paletted textures can't be updated.
+        if (GR_GL_PALETTE8_RGBA8 == internalFormat) {
+            return false;
+        }
+        GL_CALL(CompressedTexSubImage2D(target,
+                                        0, // level
+                                        left, top,
+                                        width, height,
+                                        internalFormat,
+                                        SkToInt(dataSize),
+                                        data));
+    }
+
+    return true;
+}
+
+static bool renderbuffer_storage_msaa(const GrGLContext& ctx,
+                                      int sampleCount,
+                                      GrGLenum format,
+                                      int width, int height) {
+    CLEAR_ERROR_BEFORE_ALLOC(ctx.interface());
+    SkASSERT(GrGLCaps::kNone_MSFBOType != ctx.caps()->msFBOType());
+    switch (ctx.caps()->msFBOType()) {
+        case GrGLCaps::kDesktop_ARB_MSFBOType:
+        case GrGLCaps::kDesktop_EXT_MSFBOType:
+        case GrGLCaps::kMixedSamples_MSFBOType:
+        case GrGLCaps::kES_3_0_MSFBOType:
+            GL_ALLOC_CALL(ctx.interface(),
+                            RenderbufferStorageMultisample(GR_GL_RENDERBUFFER,
+                                                            sampleCount,
+                                                            format,
+                                                            width, height));
+            break;
+        case GrGLCaps::kES_Apple_MSFBOType:
+            GL_ALLOC_CALL(ctx.interface(),
+                            RenderbufferStorageMultisampleES2APPLE(GR_GL_RENDERBUFFER,
+                                                                    sampleCount,
+                                                                    format,
+                                                                    width, height));
+            break;
+        case GrGLCaps::kES_EXT_MsToTexture_MSFBOType:
+        case GrGLCaps::kES_IMG_MsToTexture_MSFBOType:
+            GL_ALLOC_CALL(ctx.interface(),
+                            RenderbufferStorageMultisampleES2EXT(GR_GL_RENDERBUFFER,
+                                                                sampleCount,
+                                                                format,
+                                                                width, height));
+            break;
+        case GrGLCaps::kNone_MSFBOType:
+            SkFAIL("Shouldn't be here if we don't support multisampled renderbuffers.");
+            break;
+    }
+    return (GR_GL_NO_ERROR == CHECK_ALLOC_ERROR(ctx.interface()));
+}
+
+bool GrGLGpu::createRenderTargetObjects(const GrSurfaceDesc& desc,
+                                        GrGpuResource::LifeCycle lifeCycle,
+                                        const GrGLTextureInfo& texInfo,
+                                        GrGLRenderTarget::IDDesc* idDesc) {
+    idDesc->fMSColorRenderbufferID = 0;
+    idDesc->fRTFBOID = 0;
+    idDesc->fTexFBOID = 0;
+    idDesc->fLifeCycle = lifeCycle;
+    idDesc->fSampleConfig = (GrGLCaps::kMixedSamples_MSFBOType == this->glCaps().msFBOType() &&
+                            desc.fSampleCnt > 0) ? GrRenderTarget::kStencil_SampleConfig :
+                                                   GrRenderTarget::kUnified_SampleConfig;
+
+    GrGLenum status;
+
+    GrGLenum msColorFormat = 0; // suppress warning
+
+    if (desc.fSampleCnt > 0 && GrGLCaps::kNone_MSFBOType == this->glCaps().msFBOType()) {
+        goto FAILED;
+    }
+
+    GL_CALL(GenFramebuffers(1, &idDesc->fTexFBOID));
+    if (!idDesc->fTexFBOID) {
+        goto FAILED;
+    }
+
+
+    // If we are using multisampling we will create two FBOS. We render to one and then resolve to
+    // the texture bound to the other. The exception is the IMG multisample extension. With this
+    // extension the texture is multisampled when rendered to and then auto-resolves it when it is
+    // rendered from.
+    if (desc.fSampleCnt > 0 && this->glCaps().usesMSAARenderBuffers()) {
+        GL_CALL(GenFramebuffers(1, &idDesc->fRTFBOID));
+        GL_CALL(GenRenderbuffers(1, &idDesc->fMSColorRenderbufferID));
+        if (!idDesc->fRTFBOID ||
+            !idDesc->fMSColorRenderbufferID ||
+            !this->configToGLFormats(desc.fConfig,
+                                     // ES2 and ES3 require sized internal formats for rb storage.
+                                     kGLES_GrGLStandard == this->glStandard(),
+                                     &msColorFormat,
+                                     nullptr,
+                                     nullptr)) {
+            goto FAILED;
+        }
+    } else {
+        idDesc->fRTFBOID = idDesc->fTexFBOID;
+    }
+
+    // below here we may bind the FBO
+    fHWBoundRenderTargetUniqueID = SK_InvalidUniqueID;
+    if (idDesc->fRTFBOID != idDesc->fTexFBOID) {
+        SkASSERT(desc.fSampleCnt > 0);
+        GL_CALL(BindRenderbuffer(GR_GL_RENDERBUFFER, idDesc->fMSColorRenderbufferID));
+        if (!renderbuffer_storage_msaa(*fGLContext,
+                                       desc.fSampleCnt,
+                                       msColorFormat,
+                                       desc.fWidth, desc.fHeight)) {
+            goto FAILED;
+        }
+        fStats.incRenderTargetBinds();
+        GL_CALL(BindFramebuffer(GR_GL_FRAMEBUFFER, idDesc->fRTFBOID));
+        GL_CALL(FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
+                                        GR_GL_COLOR_ATTACHMENT0,
+                                        GR_GL_RENDERBUFFER,
+                                        idDesc->fMSColorRenderbufferID));
+        if ((desc.fFlags & kCheckAllocation_GrSurfaceFlag) ||
+            !this->glCaps().isConfigVerifiedColorAttachment(desc.fConfig)) {
+            GL_CALL_RET(status, CheckFramebufferStatus(GR_GL_FRAMEBUFFER));
+            if (status != GR_GL_FRAMEBUFFER_COMPLETE) {
+                goto FAILED;
+            }
+            fGLContext->caps()->markConfigAsValidColorAttachment(desc.fConfig);
+        }
+    }
+    fStats.incRenderTargetBinds();
+    GL_CALL(BindFramebuffer(GR_GL_FRAMEBUFFER, idDesc->fTexFBOID));
+
+    if (this->glCaps().usesImplicitMSAAResolve() && desc.fSampleCnt > 0) {
+        GL_CALL(FramebufferTexture2DMultisample(GR_GL_FRAMEBUFFER,
+                                                GR_GL_COLOR_ATTACHMENT0,
+                                                texInfo.fTarget,
+                                                texInfo.fID, 0, desc.fSampleCnt));
+    } else {
+        GL_CALL(FramebufferTexture2D(GR_GL_FRAMEBUFFER,
+                                     GR_GL_COLOR_ATTACHMENT0,
+                                     texInfo.fTarget,
+                                     texInfo.fID, 0));
+    }
+    if ((desc.fFlags & kCheckAllocation_GrSurfaceFlag) ||
+        !this->glCaps().isConfigVerifiedColorAttachment(desc.fConfig)) {
+        GL_CALL_RET(status, CheckFramebufferStatus(GR_GL_FRAMEBUFFER));
+        if (status != GR_GL_FRAMEBUFFER_COMPLETE) {
+            goto FAILED;
+        }
+        fGLContext->caps()->markConfigAsValidColorAttachment(desc.fConfig);
+    }
+
+    return true;
+
+FAILED:
+    if (idDesc->fMSColorRenderbufferID) {
+        GL_CALL(DeleteRenderbuffers(1, &idDesc->fMSColorRenderbufferID));
+    }
+    if (idDesc->fRTFBOID != idDesc->fTexFBOID) {
+        GL_CALL(DeleteFramebuffers(1, &idDesc->fRTFBOID));
+    }
+    if (idDesc->fTexFBOID) {
+        GL_CALL(DeleteFramebuffers(1, &idDesc->fTexFBOID));
+    }
+    return false;
+}
+
+// good to set a break-point here to know when createTexture fails
+static GrTexture* return_null_texture() {
+//    SkDEBUGFAIL("null texture");
+    return nullptr;
+}
+
+#if 0 && defined(SK_DEBUG)
+static size_t as_size_t(int x) {
+    return x;
+}
+#endif
+
+GrTexture* GrGLGpu::onCreateTexture(const GrSurfaceDesc& desc,
+                                    GrGpuResource::LifeCycle lifeCycle,
+                                    const void* srcData, size_t rowBytes) {
+    // We fail if the MSAA was requested and is not available.
+    if (GrGLCaps::kNone_MSFBOType == this->glCaps().msFBOType() && desc.fSampleCnt) {
+        //SkDebugf("MSAA RT requested but not supported on this platform.");
+        return return_null_texture();
+    }
+
+    bool renderTarget = SkToBool(desc.fFlags & kRenderTarget_GrSurfaceFlag);
+
+    GrGLTexture::IDDesc idDesc;
+    GL_CALL(GenTextures(1, &idDesc.fInfo.fID));
+    idDesc.fLifeCycle = lifeCycle;
+    // We only support GL_TEXTURE_2D at the moment.
+    idDesc.fInfo.fTarget = GR_GL_TEXTURE_2D;
+
+    if (!idDesc.fInfo.fID) {
+        return return_null_texture();
+    }
+
+    this->setScratchTextureUnit();
+    GL_CALL(BindTexture(idDesc.fInfo.fTarget, idDesc.fInfo.fID));
+
+    if (renderTarget && this->glCaps().textureUsageSupport()) {
+        // provides a hint about how this texture will be used
+        GL_CALL(TexParameteri(idDesc.fInfo.fTarget,
+                              GR_GL_TEXTURE_USAGE,
+                              GR_GL_FRAMEBUFFER_ATTACHMENT));
+    }
+
+    // Some drivers like to know filter/wrap before seeing glTexImage2D. Some
+    // drivers have a bug where an FBO won't be complete if it includes a
+    // texture that is not mipmap complete (considering the filter in use).
+    GrGLTexture::TexParams initialTexParams;
+    // we only set a subset here so invalidate first
+    initialTexParams.invalidate();
+    initialTexParams.fMinFilter = GR_GL_NEAREST;
+    initialTexParams.fMagFilter = GR_GL_NEAREST;
+    initialTexParams.fWrapS = GR_GL_CLAMP_TO_EDGE;
+    initialTexParams.fWrapT = GR_GL_CLAMP_TO_EDGE;
+    GL_CALL(TexParameteri(idDesc.fInfo.fTarget,
+                          GR_GL_TEXTURE_MAG_FILTER,
+                          initialTexParams.fMagFilter));
+    GL_CALL(TexParameteri(idDesc.fInfo.fTarget,
+                          GR_GL_TEXTURE_MIN_FILTER,
+                          initialTexParams.fMinFilter));
+    GL_CALL(TexParameteri(idDesc.fInfo.fTarget,
+                          GR_GL_TEXTURE_WRAP_S,
+                          initialTexParams.fWrapS));
+    GL_CALL(TexParameteri(idDesc.fInfo.fTarget,
+                          GR_GL_TEXTURE_WRAP_T,
+                          initialTexParams.fWrapT));
+    if (!this->uploadTexData(desc, idDesc.fInfo.fTarget, true, 0, 0,
+                             desc.fWidth, desc.fHeight,
+                             desc.fConfig, srcData, rowBytes)) {
+        GL_CALL(DeleteTextures(1, &idDesc.fInfo.fID));
+        return return_null_texture();
+    }
+
+    GrGLTexture* tex;
+    if (renderTarget) {
+        // unbind the texture from the texture unit before binding it to the frame buffer
+        GL_CALL(BindTexture(idDesc.fInfo.fTarget, 0));
+        GrGLRenderTarget::IDDesc rtIDDesc;
+
+        if (!this->createRenderTargetObjects(desc, lifeCycle, idDesc.fInfo, &rtIDDesc)) {
+            GL_CALL(DeleteTextures(1, &idDesc.fInfo.fID));
+            return return_null_texture();
+        }
+        tex = new GrGLTextureRenderTarget(this, desc, idDesc, rtIDDesc);
+    } else {
+        tex = new GrGLTexture(this, desc, idDesc);
+    }
+    tex->setCachedTexParams(initialTexParams, this->getResetTimestamp());
+#ifdef TRACE_TEXTURE_CREATION
+    SkDebugf("--- new texture [%d] size=(%d %d) config=%d\n",
+             glTexDesc.fTextureID, desc.fWidth, desc.fHeight, desc.fConfig);
+#endif
+    return tex;
+}
+
+GrTexture* GrGLGpu::onCreateCompressedTexture(const GrSurfaceDesc& desc,
+                                              GrGpuResource::LifeCycle lifeCycle,
+                                              const void* srcData) {
+    // Make sure that we're not flipping Y.
+    if (kBottomLeft_GrSurfaceOrigin == desc.fOrigin) {
+        return return_null_texture();
+    }
+
+    GrGLTexture::IDDesc idDesc;
+    GL_CALL(GenTextures(1, &idDesc.fInfo.fID));
+    idDesc.fLifeCycle = lifeCycle;
+    // We only support GL_TEXTURE_2D at the moment.
+    idDesc.fInfo.fTarget = GR_GL_TEXTURE_2D;
+
+    if (!idDesc.fInfo.fID) {
+        return return_null_texture();
+    }
+
+    this->setScratchTextureUnit();
+    GL_CALL(BindTexture(idDesc.fInfo.fTarget, idDesc.fInfo.fID));
+
+    // Some drivers like to know filter/wrap before seeing glTexImage2D. Some
+    // drivers have a bug where an FBO won't be complete if it includes a
+    // texture that is not mipmap complete (considering the filter in use).
+    GrGLTexture::TexParams initialTexParams;
+    // we only set a subset here so invalidate first
+    initialTexParams.invalidate();
+    initialTexParams.fMinFilter = GR_GL_NEAREST;
+    initialTexParams.fMagFilter = GR_GL_NEAREST;
+    initialTexParams.fWrapS = GR_GL_CLAMP_TO_EDGE;
+    initialTexParams.fWrapT = GR_GL_CLAMP_TO_EDGE;
+    GL_CALL(TexParameteri(idDesc.fInfo.fTarget,
+                          GR_GL_TEXTURE_MAG_FILTER,
+                          initialTexParams.fMagFilter));
+    GL_CALL(TexParameteri(idDesc.fInfo.fTarget,
+                          GR_GL_TEXTURE_MIN_FILTER,
+                          initialTexParams.fMinFilter));
+    GL_CALL(TexParameteri(idDesc.fInfo.fTarget,
+                          GR_GL_TEXTURE_WRAP_S,
+                          initialTexParams.fWrapS));
+    GL_CALL(TexParameteri(idDesc.fInfo.fTarget,
+                          GR_GL_TEXTURE_WRAP_T,
+                          initialTexParams.fWrapT));
+
+    if (!this->uploadCompressedTexData(desc, idDesc.fInfo.fTarget, srcData)) {
+        GL_CALL(DeleteTextures(1, &idDesc.fInfo.fID));
+        return return_null_texture();
+    }
+
+    GrGLTexture* tex;
+    tex = new GrGLTexture(this, desc, idDesc);
+    tex->setCachedTexParams(initialTexParams, this->getResetTimestamp());
+#ifdef TRACE_TEXTURE_CREATION
+    SkDebugf("--- new compressed texture [%d] size=(%d %d) config=%d\n",
+             glTexDesc.fTextureID, desc.fWidth, desc.fHeight, desc.fConfig);
+#endif
+    return tex;
+}
+
+namespace {
+
+const GrGLuint kUnknownBitCount = GrGLStencilAttachment::kUnknownBitCount;
+
+void inline get_stencil_rb_sizes(const GrGLInterface* gl,
+                                 GrGLStencilAttachment::Format* format) {
+
+    // we shouldn't ever know one size and not the other
+    SkASSERT((kUnknownBitCount == format->fStencilBits) ==
+             (kUnknownBitCount == format->fTotalBits));
+    if (kUnknownBitCount == format->fStencilBits) {
+        GR_GL_GetRenderbufferParameteriv(gl, GR_GL_RENDERBUFFER,
+                                         GR_GL_RENDERBUFFER_STENCIL_SIZE,
+                                         (GrGLint*)&format->fStencilBits);
+        if (format->fPacked) {
+            GR_GL_GetRenderbufferParameteriv(gl, GR_GL_RENDERBUFFER,
+                                             GR_GL_RENDERBUFFER_DEPTH_SIZE,
+                                             (GrGLint*)&format->fTotalBits);
+            format->fTotalBits += format->fStencilBits;
+        } else {
+            format->fTotalBits = format->fStencilBits;
+        }
+    }
+}
+}
+
+int GrGLGpu::getCompatibleStencilIndex(GrPixelConfig config) {
+    static const int kSize = 16;
+    if (kUnknownStencilIndex == fPixelConfigToStencilIndex[config]) {
+        // Default to unsupported
+        fPixelConfigToStencilIndex[config] = kUnsupportedStencilIndex;
+        // Create color texture
+        GrGLuint colorID;
+        GL_CALL(GenTextures(1, &colorID));
+        this->setScratchTextureUnit();
+        GL_CALL(BindTexture(GR_GL_TEXTURE_2D, colorID));
+        GL_CALL(TexParameteri(GR_GL_TEXTURE_2D,
+                              GR_GL_TEXTURE_MAG_FILTER,
+                              GR_GL_NEAREST));
+        GL_CALL(TexParameteri(GR_GL_TEXTURE_2D,
+                              GR_GL_TEXTURE_MIN_FILTER,
+                              GR_GL_NEAREST));
+        GL_CALL(TexParameteri(GR_GL_TEXTURE_2D,
+                              GR_GL_TEXTURE_WRAP_S,
+                              GR_GL_CLAMP_TO_EDGE));
+        GL_CALL(TexParameteri(GR_GL_TEXTURE_2D,
+                              GR_GL_TEXTURE_WRAP_T,
+                              GR_GL_CLAMP_TO_EDGE));
+
+        GrGLenum internalFormat = 0x0; // suppress warning
+        GrGLenum externalFormat = 0x0; // suppress warning
+        GrGLenum externalType = 0x0;   // suppress warning
+        bool useSizedFormat = false;
+        if (kGL_GrGLStandard == this->glStandard() ||
+            (this->glVersion() >= GR_GL_VER(3, 0) &&
+             // ES3 only works with sized BGRA8 format if "GL_APPLE_texture_format_BGRA8888" enabled
+             (kBGRA_8888_GrPixelConfig != config || !this->glCaps().bgraIsInternalFormat())))  {
+            useSizedFormat = true;
+        }
+        if (!this->configToGLFormats(config, useSizedFormat, &internalFormat,
+                                     &externalFormat, &externalType)) {
+            GL_CALL(DeleteTextures(1, &colorID));
+            fPixelConfigToStencilIndex[config] = kUnsupportedStencilIndex;
+            return kUnsupportedStencilIndex;
+        }
+
+        CLEAR_ERROR_BEFORE_ALLOC(this->glInterface());
+        GL_ALLOC_CALL(this->glInterface(), TexImage2D(GR_GL_TEXTURE_2D,
+                                                      0, internalFormat,
+                                                      kSize,
+                                                      kSize,
+                                                      0,
+                                                      externalFormat,
+                                                      externalType,
+                                                      NULL));
+        if (GR_GL_NO_ERROR != GR_GL_GET_ERROR(this->glInterface())) {
+            GL_CALL(DeleteTextures(1, &colorID));
+            fPixelConfigToStencilIndex[config] = kUnsupportedStencilIndex;
+            return kUnsupportedStencilIndex;
+        }
+
+        // unbind the texture from the texture unit before binding it to the frame buffer
+        GL_CALL(BindTexture(GR_GL_TEXTURE_2D, 0));
+
+        // Create Framebuffer
+        GrGLuint fb;
+        GL_CALL(GenFramebuffers(1, &fb));
+        GL_CALL(BindFramebuffer(GR_GL_FRAMEBUFFER, fb));
+        fHWBoundRenderTargetUniqueID = SK_InvalidUniqueID;
+        GL_CALL(FramebufferTexture2D(GR_GL_FRAMEBUFFER,
+                                     GR_GL_COLOR_ATTACHMENT0,
+                                     GR_GL_TEXTURE_2D,
+                                     colorID,
+                                     0));
+
+        // look over formats till I find a compatible one
+        int stencilFmtCnt = this->glCaps().stencilFormats().count();
+        GrGLuint sbRBID = 0;
+        for (int i = 0; i < stencilFmtCnt; ++i) {
+            const GrGLCaps::StencilFormat& sFmt = this->glCaps().stencilFormats()[i];
+
+            GL_CALL(GenRenderbuffers(1, &sbRBID));
+            if (!sbRBID) {
+                break;
+            }
+            GL_CALL(BindRenderbuffer(GR_GL_RENDERBUFFER, sbRBID));
+            CLEAR_ERROR_BEFORE_ALLOC(this->glInterface());
+            GL_ALLOC_CALL(this->glInterface(), RenderbufferStorage(GR_GL_RENDERBUFFER,
+                                                                   sFmt.fInternalFormat,
+                                                                   kSize, kSize));
+            if (GR_GL_NO_ERROR == GR_GL_GET_ERROR(this->glInterface())) {
+                GL_CALL(FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
+                                                GR_GL_STENCIL_ATTACHMENT,
+                                                GR_GL_RENDERBUFFER, sbRBID));
+                if (sFmt.fPacked) {
+                    GL_CALL(FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
+                                                    GR_GL_DEPTH_ATTACHMENT,
+                                                    GR_GL_RENDERBUFFER, sbRBID));
+                } else {
+                    GL_CALL(FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
+                                                    GR_GL_DEPTH_ATTACHMENT,
+                                                    GR_GL_RENDERBUFFER, 0));
+                }
+                GrGLenum status;
+                GL_CALL_RET(status, CheckFramebufferStatus(GR_GL_FRAMEBUFFER));
+                if (status != GR_GL_FRAMEBUFFER_COMPLETE) {
+                    GL_CALL(FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
+                                                    GR_GL_STENCIL_ATTACHMENT,
+                                                    GR_GL_RENDERBUFFER, 0));
+                    if (sFmt.fPacked) {
+                        GL_CALL(FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
+                                                        GR_GL_DEPTH_ATTACHMENT,
+                                                        GR_GL_RENDERBUFFER, 0));
+                    }
+                } else {
+                    fPixelConfigToStencilIndex[config] = i;
+                    break;
+                }
+            }
+            sbRBID = 0;
+        }
+        GL_CALL(DeleteTextures(1, &colorID));
+        GL_CALL(DeleteRenderbuffers(1, &sbRBID));
+        GL_CALL(BindFramebuffer(GR_GL_FRAMEBUFFER, 0));
+        GL_CALL(DeleteFramebuffers(1, &fb));
+    }
+    SkASSERT(kUnknownStencilIndex != fPixelConfigToStencilIndex[config]);
+    return fPixelConfigToStencilIndex[config];
+}
+
+GrStencilAttachment* GrGLGpu::createStencilAttachmentForRenderTarget(const GrRenderTarget* rt,
+                                                                     int width,
+                                                                     int height) {
+    // All internally created RTs are also textures. We don't create
+    // SBs for a client's standalone RT (that is a RT that isn't also a texture).
+    SkASSERT(rt->asTexture());
+    SkASSERT(width >= rt->width());
+    SkASSERT(height >= rt->height());
+
+    int samples = rt->numStencilSamples();
+    GrGLStencilAttachment::IDDesc sbDesc;
+
+    int sIdx = this->getCompatibleStencilIndex(rt->config());
+    if (sIdx == kUnsupportedStencilIndex) {
+        return nullptr;
+    }
+
+    if (!sbDesc.fRenderbufferID) {
+        GL_CALL(GenRenderbuffers(1, &sbDesc.fRenderbufferID));
+    }
+    if (!sbDesc.fRenderbufferID) {
+        return nullptr;
+    }
+    GL_CALL(BindRenderbuffer(GR_GL_RENDERBUFFER, sbDesc.fRenderbufferID));
+    const GrGLCaps::StencilFormat& sFmt = this->glCaps().stencilFormats()[sIdx];
+    CLEAR_ERROR_BEFORE_ALLOC(this->glInterface());
+    // we do this "if" so that we don't call the multisample
+    // version on a GL that doesn't have an MSAA extension.
+    if (samples > 0) {
+        SkAssertResult(renderbuffer_storage_msaa(*fGLContext,
+                                                 samples,
+                                                 sFmt.fInternalFormat,
+                                                 width, height));
+    } else {
+        GL_ALLOC_CALL(this->glInterface(), RenderbufferStorage(GR_GL_RENDERBUFFER,
+                                                               sFmt.fInternalFormat,
+                                                               width, height));
+        SkASSERT(GR_GL_NO_ERROR == check_alloc_error(rt->desc(), this->glInterface()));
+    }
+    fStats.incStencilAttachmentCreates();
+    // After sized formats we attempt an unsized format and take
+    // whatever sizes GL gives us. In that case we query for the size.
+    GrGLStencilAttachment::Format format = sFmt;
+    get_stencil_rb_sizes(this->glInterface(), &format);
+    GrGLStencilAttachment* stencil = new GrGLStencilAttachment(this,
+                                                               sbDesc,
+                                                               width,
+                                                               height,
+                                                               samples,
+                                                               format);
+    return stencil;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+GrVertexBuffer* GrGLGpu::onCreateVertexBuffer(size_t size, bool dynamic) {
+    GrGLVertexBuffer::Desc desc;
+    desc.fDynamic = dynamic;
+    desc.fSizeInBytes = size;
+
+    if (this->glCaps().useNonVBOVertexAndIndexDynamicData() && desc.fDynamic) {
+        desc.fID = 0;
+        GrGLVertexBuffer* vertexBuffer = new GrGLVertexBuffer(this, desc);
+        return vertexBuffer;
+    } else {
+        GL_CALL(GenBuffers(1, &desc.fID));
+        if (desc.fID) {
+            fHWGeometryState.setVertexBufferID(this, desc.fID);
+            CLEAR_ERROR_BEFORE_ALLOC(this->glInterface());
+            // make sure driver can allocate memory for this buffer
+            GL_ALLOC_CALL(this->glInterface(),
+                          BufferData(GR_GL_ARRAY_BUFFER,
+                                     (GrGLsizeiptr) desc.fSizeInBytes,
+                                     nullptr,   // data ptr
+                                     desc.fDynamic ? GR_GL_DYNAMIC_DRAW : GR_GL_STATIC_DRAW));
+            if (CHECK_ALLOC_ERROR(this->glInterface()) != GR_GL_NO_ERROR) {
+                GL_CALL(DeleteBuffers(1, &desc.fID));
+                this->notifyVertexBufferDelete(desc.fID);
+                return nullptr;
+            }
+            GrGLVertexBuffer* vertexBuffer = new GrGLVertexBuffer(this, desc);
+            return vertexBuffer;
+        }
+        return nullptr;
+    }
+}
+
+GrIndexBuffer* GrGLGpu::onCreateIndexBuffer(size_t size, bool dynamic) {
+    GrGLIndexBuffer::Desc desc;
+    desc.fDynamic = dynamic;
+    desc.fSizeInBytes = size;
+
+    if (this->glCaps().useNonVBOVertexAndIndexDynamicData() && desc.fDynamic) {
+        desc.fID = 0;
+        GrIndexBuffer* indexBuffer = new GrGLIndexBuffer(this, desc);
+        return indexBuffer;
+    } else {
+        GL_CALL(GenBuffers(1, &desc.fID));
+        if (desc.fID) {
+            fHWGeometryState.setIndexBufferIDOnDefaultVertexArray(this, desc.fID);
+            CLEAR_ERROR_BEFORE_ALLOC(this->glInterface());
+            // make sure driver can allocate memory for this buffer
+            GL_ALLOC_CALL(this->glInterface(),
+                          BufferData(GR_GL_ELEMENT_ARRAY_BUFFER,
+                                     (GrGLsizeiptr) desc.fSizeInBytes,
+                                     nullptr,  // data ptr
+                                     desc.fDynamic ? GR_GL_DYNAMIC_DRAW : GR_GL_STATIC_DRAW));
+            if (CHECK_ALLOC_ERROR(this->glInterface()) != GR_GL_NO_ERROR) {
+                GL_CALL(DeleteBuffers(1, &desc.fID));
+                this->notifyIndexBufferDelete(desc.fID);
+                return nullptr;
+            }
+            GrIndexBuffer* indexBuffer = new GrGLIndexBuffer(this, desc);
+            return indexBuffer;
+        }
+        return nullptr;
+    }
+}
+
+void GrGLGpu::flushScissor(const GrScissorState& scissorState,
+                           const GrGLIRect& rtViewport,
+                           GrSurfaceOrigin rtOrigin) {
+    if (scissorState.enabled()) {
+        GrGLIRect scissor;
+        scissor.setRelativeTo(rtViewport,
+                              scissorState.rect().fLeft,
+                              scissorState.rect().fTop,
+                              scissorState.rect().width(),
+                              scissorState.rect().height(),
+                              rtOrigin);
+        // if the scissor fully contains the viewport then we fall through and
+        // disable the scissor test.
+        if (!scissor.contains(rtViewport)) {
+            if (fHWScissorSettings.fRect != scissor) {
+                scissor.pushToGLScissor(this->glInterface());
+                fHWScissorSettings.fRect = scissor;
+            }
+            if (kYes_TriState != fHWScissorSettings.fEnabled) {
+                GL_CALL(Enable(GR_GL_SCISSOR_TEST));
+                fHWScissorSettings.fEnabled = kYes_TriState;
+            }
+            return;
+        }
+    }
+
+    // See fall through note above
+    this->disableScissor();
+}
+
+bool GrGLGpu::flushGLState(const DrawArgs& args) {
+    GrXferProcessor::BlendInfo blendInfo;
+    const GrPipeline& pipeline = *args.fPipeline;
+    args.fPipeline->getXferProcessor()->getBlendInfo(&blendInfo);
+
+    this->flushColorWrite(blendInfo.fWriteColor);
+    this->flushDrawFace(pipeline.getDrawFace());
+
+    SkAutoTUnref<GrGLProgram> program(fProgramCache->refProgram(args));
+    if (!program) {
+        GrCapsDebugf(this->caps(), "Failed to create program!\n");
+        return false;
+    }
+
+    GrGLuint programID = program->programID();
+    if (fHWProgramID != programID) {
+        GL_CALL(UseProgram(programID));
+        fHWProgramID = programID;
+    }
+
+    if (blendInfo.fWriteColor) {
+        this->flushBlend(blendInfo);
+    }
+
+    SkSTArray<8, const GrTextureAccess*> textureAccesses;
+    program->setData(*args.fPrimitiveProcessor, pipeline, &textureAccesses);
+
+    int numTextureAccesses = textureAccesses.count();
+    for (int i = 0; i < numTextureAccesses; i++) {
+        this->bindTexture(i, textureAccesses[i]->getParams(),
+                          static_cast<GrGLTexture*>(textureAccesses[i]->getTexture()));
+    }
+
+    GrGLRenderTarget* glRT = static_cast<GrGLRenderTarget*>(pipeline.getRenderTarget());
+    this->flushStencil(pipeline.getStencil());
+    this->flushScissor(pipeline.getScissorState(), glRT->getViewport(), glRT->origin());
+    this->flushHWAAState(glRT, pipeline.isHWAntialiasState());
+
+    // This must come after textures are flushed because a texture may need
+    // to be msaa-resolved (which will modify bound FBO state).
+    this->flushRenderTarget(glRT, nullptr);
+
+    return true;
+}
+
+void GrGLGpu::setupGeometry(const GrPrimitiveProcessor& primProc,
+                            const GrNonInstancedVertices& vertices,
+                            size_t* indexOffsetInBytes) {
+    GrGLVertexBuffer* vbuf;
+    vbuf = (GrGLVertexBuffer*) vertices.vertexBuffer();
+
+    SkASSERT(vbuf);
+    SkASSERT(!vbuf->isMapped());
+
+    GrGLIndexBuffer* ibuf = nullptr;
+    if (vertices.isIndexed()) {
+        SkASSERT(indexOffsetInBytes);
+
+        *indexOffsetInBytes = 0;
+        ibuf = (GrGLIndexBuffer*)vertices.indexBuffer();
+
+        SkASSERT(ibuf);
+        SkASSERT(!ibuf->isMapped());
+        *indexOffsetInBytes += ibuf->baseOffset();
+    }
+    GrGLAttribArrayState* attribState =
+        fHWGeometryState.bindArrayAndBuffersToDraw(this, vbuf, ibuf);
+
+    int vaCount = primProc.numAttribs();
+    if (vaCount > 0) {
+
+        GrGLsizei stride = static_cast<GrGLsizei>(primProc.getVertexStride());
+
+        size_t vertexOffsetInBytes = stride * vertices.startVertex();
+
+        vertexOffsetInBytes += vbuf->baseOffset();
+
+        uint32_t usedAttribArraysMask = 0;
+        size_t offset = 0;
+
+        for (int attribIndex = 0; attribIndex < vaCount; attribIndex++) {
+            const GrGeometryProcessor::Attribute& attrib = primProc.getAttrib(attribIndex);
+            usedAttribArraysMask |= (1 << attribIndex);
+            GrVertexAttribType attribType = attrib.fType;
+            attribState->set(this,
+                             attribIndex,
+                             vbuf->bufferID(),
+                             GrGLAttribTypeToLayout(attribType).fCount,
+                             GrGLAttribTypeToLayout(attribType).fType,
+                             GrGLAttribTypeToLayout(attribType).fNormalized,
+                             stride,
+                             reinterpret_cast<GrGLvoid*>(vertexOffsetInBytes + offset));
+            offset += attrib.fOffset;
+        }
+        attribState->disableUnusedArrays(this, usedAttribArraysMask);
+    }
+}
+
+void GrGLGpu::buildProgramDesc(GrProgramDesc* desc,
+                               const GrPrimitiveProcessor& primProc,
+                               const GrPipeline& pipeline) const {
+    if (!GrGLProgramDescBuilder::Build(desc, primProc, pipeline, this)) {
+        SkDEBUGFAIL("Failed to generate GL program descriptor");
+    }
+}
+
+void GrGLGpu::bindBuffer(GrGLuint id, GrGLenum type) {
+    this->handleDirtyContext();
+    if (GR_GL_ARRAY_BUFFER == type) {
+        this->bindVertexBuffer(id);
+    } else {
+        SkASSERT(GR_GL_ELEMENT_ARRAY_BUFFER == type);
+        this->bindIndexBufferAndDefaultVertexArray(id);
+    }
+}
+
+void GrGLGpu::releaseBuffer(GrGLuint id, GrGLenum type) {
+    this->handleDirtyContext();
+    GL_CALL(DeleteBuffers(1, &id));
+    if (GR_GL_ARRAY_BUFFER == type) {
+        this->notifyVertexBufferDelete(id);
+    } else {
+        SkASSERT(GR_GL_ELEMENT_ARRAY_BUFFER == type);
+        this->notifyIndexBufferDelete(id);
+    }
+}
+
+// GL_STREAM_DRAW triggers an optimization in Chromium's GPU process where a client's vertex buffer
+// objects are implemented as client-side-arrays on tile-deferred architectures.
+#define DYNAMIC_USAGE_PARAM GR_GL_STREAM_DRAW
+
+void* GrGLGpu::mapBuffer(GrGLuint id, GrGLenum type, bool dynamic, size_t currentSize,
+                         size_t requestedSize) {
+    void* mapPtr = nullptr;
+    // Handling dirty context is done in the bindBuffer call
+    switch (this->glCaps().mapBufferType()) {
+        case GrGLCaps::kNone_MapBufferType:
+            break;
+        case GrGLCaps::kMapBuffer_MapBufferType:
+            this->bindBuffer(id, type);
+            // Let driver know it can discard the old data
+            if (GR_GL_USE_BUFFER_DATA_NULL_HINT || currentSize != requestedSize) {
+                GL_CALL(BufferData(type, requestedSize, nullptr,
+                                   dynamic ? DYNAMIC_USAGE_PARAM : GR_GL_STATIC_DRAW));
+            }
+            GL_CALL_RET(mapPtr, MapBuffer(type, GR_GL_WRITE_ONLY));
+            break;
+        case GrGLCaps::kMapBufferRange_MapBufferType: {
+            this->bindBuffer(id, type);
+            // Make sure the GL buffer size agrees with fDesc before mapping.
+            if (currentSize != requestedSize) {
+                GL_CALL(BufferData(type, requestedSize, nullptr,
+                                   dynamic ? DYNAMIC_USAGE_PARAM : GR_GL_STATIC_DRAW));
+            }
+            static const GrGLbitfield kAccess = GR_GL_MAP_INVALIDATE_BUFFER_BIT |
+                                                GR_GL_MAP_WRITE_BIT;
+            GL_CALL_RET(mapPtr, MapBufferRange(type, 0, requestedSize, kAccess));
+            break;
+        }
+        case GrGLCaps::kChromium_MapBufferType:
+            this->bindBuffer(id, type);
+            // Make sure the GL buffer size agrees with fDesc before mapping.
+            if (currentSize != requestedSize) {
+                GL_CALL(BufferData(type, requestedSize, nullptr,
+                                   dynamic ? DYNAMIC_USAGE_PARAM : GR_GL_STATIC_DRAW));
+            }
+            GL_CALL_RET(mapPtr, MapBufferSubData(type, 0, requestedSize, GR_GL_WRITE_ONLY));
+            break;
+    }
+    return mapPtr;
+}
+
+void GrGLGpu::bufferData(GrGLuint id, GrGLenum type, bool dynamic, size_t currentSize,
+                         const void* src, size_t srcSizeInBytes) {
+    SkASSERT(srcSizeInBytes <= currentSize);
+    // bindbuffer handles dirty context
+    this->bindBuffer(id, type);
+    GrGLenum usage = dynamic ? DYNAMIC_USAGE_PARAM : GR_GL_STATIC_DRAW;
+
+#if GR_GL_USE_BUFFER_DATA_NULL_HINT
+    if (currentSize == srcSizeInBytes) {
+        GL_CALL(BufferData(type, (GrGLsizeiptr) srcSizeInBytes, src, usage));
+    } else {
+        // Before we call glBufferSubData we give the driver a hint using
+        // glBufferData with nullptr. This makes the old buffer contents
+        // inaccessible to future draws. The GPU may still be processing
+        // draws that reference the old contents. With this hint it can
+        // assign a different allocation for the new contents to avoid
+        // flushing the gpu past draws consuming the old contents.
+        // TODO I think we actually want to try calling bufferData here
+        GL_CALL(BufferData(type, currentSize, nullptr, usage));
+        GL_CALL(BufferSubData(type, 0, (GrGLsizeiptr) srcSizeInBytes, src));
+    }
+#else
+    // Note that we're cheating on the size here. Currently no methods
+    // allow a partial update that preserves contents of non-updated
+    // portions of the buffer (map() does a glBufferData(..size, nullptr..))
+    GL_CALL(BufferData(type, srcSizeInBytes, src, usage));
+#endif
+}
+
+void GrGLGpu::unmapBuffer(GrGLuint id, GrGLenum type, void* mapPtr) {
+    // bind buffer handles the dirty context
+    switch (this->glCaps().mapBufferType()) {
+        case GrGLCaps::kNone_MapBufferType:
+            SkDEBUGFAIL("Shouldn't get here.");
+            return;
+        case GrGLCaps::kMapBuffer_MapBufferType: // fall through
+        case GrGLCaps::kMapBufferRange_MapBufferType:
+            this->bindBuffer(id, type);
+            GL_CALL(UnmapBuffer(type));
+            break;
+        case GrGLCaps::kChromium_MapBufferType:
+            this->bindBuffer(id, type);
+            GL_CALL(UnmapBufferSubData(mapPtr));
+            break;
+    }
+}
+
+void GrGLGpu::disableScissor() {
+    if (kNo_TriState != fHWScissorSettings.fEnabled) {
+        GL_CALL(Disable(GR_GL_SCISSOR_TEST));
+        fHWScissorSettings.fEnabled = kNo_TriState;
+        return;
+    }
+}
+
+void GrGLGpu::onClear(GrRenderTarget* target, const SkIRect& rect, GrColor color) {
+    // parent class should never let us get here with no RT
+    SkASSERT(target);
+    GrGLRenderTarget* glRT = static_cast<GrGLRenderTarget*>(target);
+
+    this->flushRenderTarget(glRT, &rect);
+    GrScissorState scissorState;
+    scissorState.set(rect);
+    this->flushScissor(scissorState, glRT->getViewport(), glRT->origin());
+
+    GrGLfloat r, g, b, a;
+    static const GrGLfloat scale255 = 1.f / 255.f;
+    a = GrColorUnpackA(color) * scale255;
+    GrGLfloat scaleRGB = scale255;
+    r = GrColorUnpackR(color) * scaleRGB;
+    g = GrColorUnpackG(color) * scaleRGB;
+    b = GrColorUnpackB(color) * scaleRGB;
+
+    GL_CALL(ColorMask(GR_GL_TRUE, GR_GL_TRUE, GR_GL_TRUE, GR_GL_TRUE));
+    fHWWriteToColor = kYes_TriState;
+    GL_CALL(ClearColor(r, g, b, a));
+    GL_CALL(Clear(GR_GL_COLOR_BUFFER_BIT));
+}
+
+void GrGLGpu::discard(GrRenderTarget* renderTarget) {
+    SkASSERT(renderTarget);
+    if (!this->caps()->discardRenderTargetSupport()) {
+        return;
+    }
+
+    GrGLRenderTarget* glRT = static_cast<GrGLRenderTarget*>(renderTarget);
+    if (renderTarget->getUniqueID() != fHWBoundRenderTargetUniqueID) {
+        fHWBoundRenderTargetUniqueID = SK_InvalidUniqueID;
+        fStats.incRenderTargetBinds();
+        GL_CALL(BindFramebuffer(GR_GL_FRAMEBUFFER, glRT->renderFBOID()));
+    }
+    switch (this->glCaps().invalidateFBType()) {
+        case GrGLCaps::kNone_InvalidateFBType:
+            SkFAIL("Should never get here.");
+            break;
+        case GrGLCaps::kInvalidate_InvalidateFBType:
+            if (0 == glRT->renderFBOID()) {
+                //  When rendering to the default framebuffer the legal values for attachments
+                //  are GL_COLOR, GL_DEPTH, GL_STENCIL, ... rather than the various FBO attachment
+                //  types.
+                static const GrGLenum attachments[] = { GR_GL_COLOR };
+                GL_CALL(InvalidateFramebuffer(GR_GL_FRAMEBUFFER, SK_ARRAY_COUNT(attachments),
+                        attachments));
+            } else {
+                static const GrGLenum attachments[] = { GR_GL_COLOR_ATTACHMENT0 };
+                GL_CALL(InvalidateFramebuffer(GR_GL_FRAMEBUFFER, SK_ARRAY_COUNT(attachments),
+                        attachments));
+            }
+            break;
+        case GrGLCaps::kDiscard_InvalidateFBType: {
+            if (0 == glRT->renderFBOID()) {
+                //  When rendering to the default framebuffer the legal values for attachments
+                //  are GL_COLOR, GL_DEPTH, GL_STENCIL, ... rather than the various FBO attachment
+                //  types. See glDiscardFramebuffer() spec.
+                static const GrGLenum attachments[] = { GR_GL_COLOR };
+                GL_CALL(DiscardFramebuffer(GR_GL_FRAMEBUFFER, SK_ARRAY_COUNT(attachments),
+                        attachments));
+            } else {
+                static const GrGLenum attachments[] = { GR_GL_COLOR_ATTACHMENT0 };
+                GL_CALL(DiscardFramebuffer(GR_GL_FRAMEBUFFER, SK_ARRAY_COUNT(attachments),
+                        attachments));
+            }
+            break;
+        }
+    }
+    renderTarget->flagAsResolved();
+}
+
+void GrGLGpu::clearStencil(GrRenderTarget* target) {
+    if (nullptr == target) {
+        return;
+    }
+    GrGLRenderTarget* glRT = static_cast<GrGLRenderTarget*>(target);
+    this->flushRenderTarget(glRT, &SkIRect::EmptyIRect());
+
+    this->disableScissor();
+
+    GL_CALL(StencilMask(0xffffffff));
+    GL_CALL(ClearStencil(0));
+    GL_CALL(Clear(GR_GL_STENCIL_BUFFER_BIT));
+    fHWStencilSettings.invalidate();
+}
+
+void GrGLGpu::onClearStencilClip(GrRenderTarget* target, const SkIRect& rect, bool insideClip) {
+    SkASSERT(target);
+
+    GrStencilAttachment* sb = target->renderTargetPriv().getStencilAttachment();
+    // this should only be called internally when we know we have a
+    // stencil buffer.
+    SkASSERT(sb);
+    GrGLint stencilBitCount =  sb->bits();
+#if 0
+    SkASSERT(stencilBitCount > 0);
+    GrGLint clipStencilMask  = (1 << (stencilBitCount - 1));
+#else
+    // we could just clear the clip bit but when we go through
+    // ANGLE a partial stencil mask will cause clears to be
+    // turned into draws. Our contract on GrDrawTarget says that
+    // changing the clip between stencil passes may or may not
+    // zero the client's clip bits. So we just clear the whole thing.
+    static const GrGLint clipStencilMask  = ~0;
+#endif
+    GrGLint value;
+    if (insideClip) {
+        value = (1 << (stencilBitCount - 1));
+    } else {
+        value = 0;
+    }
+    GrGLRenderTarget* glRT = static_cast<GrGLRenderTarget*>(target);
+    this->flushRenderTarget(glRT, &SkIRect::EmptyIRect());
+
+    GrScissorState scissorState;
+    scissorState.set(rect);
+    this->flushScissor(scissorState, glRT->getViewport(), glRT->origin());
+
+    GL_CALL(StencilMask((uint32_t) clipStencilMask));
+    GL_CALL(ClearStencil(value));
+    GL_CALL(Clear(GR_GL_STENCIL_BUFFER_BIT));
+    fHWStencilSettings.invalidate();
+}
+
+static bool read_pixels_pays_for_y_flip(GrRenderTarget* renderTarget, const GrGLCaps& caps,
+                                        int width, int height,  GrPixelConfig config,
+                                        size_t rowBytes) {
+    // If this render target is already TopLeft, we don't need to flip.
+    if (kTopLeft_GrSurfaceOrigin == renderTarget->origin()) {
+        return false;
+    }
+
+    // If the read is really small or smaller than the min texture size, don't force a draw.
+    static const int kMinSize = 32;
+    if (width < kMinSize || height < kMinSize) {
+        return false;
+    }
+
+    // if GL can do the flip then we'll never pay for it.
+    if (caps.packFlipYSupport()) {
+        return false;
+    }
+
+    // If we have to do memcpy to handle non-trim rowBytes then we
+    // get the flip for free. Otherwise it costs.
+    // Note that we're assuming that 0 rowBytes has already been handled and that the width has been
+    // clipped.
+    return caps.packRowLengthSupport() || GrBytesPerPixel(config) * width == rowBytes;
+}
+
+bool GrGLGpu::onGetReadPixelsInfo(GrSurface* srcSurface, int width, int height, size_t rowBytes,
+                                  GrPixelConfig readConfig, DrawPreference* drawPreference,
+                                  ReadPixelTempDrawInfo* tempDrawInfo) {
+    // This subclass can only read pixels from a render target. We could use glTexSubImage2D on
+    // GL versions that support it but we don't today.
+    if (!srcSurface->asRenderTarget()) {
+        ElevateDrawPreference(drawPreference, kRequireDraw_DrawPreference);
+    }
+
+    if (GrPixelConfigIsSRGB(srcSurface->config()) != GrPixelConfigIsSRGB(readConfig)) {
+        ElevateDrawPreference(drawPreference, kRequireDraw_DrawPreference);
+    }
+
+    tempDrawInfo->fSwapRAndB = false;
+
+    // These settings we will always want if a temp draw is performed. The config is set below
+    // depending on whether we want to do a R/B swap or not.
+    tempDrawInfo->fTempSurfaceDesc.fFlags = kRenderTarget_GrSurfaceFlag;
+    tempDrawInfo->fTempSurfaceDesc.fWidth = width;
+    tempDrawInfo->fTempSurfaceDesc.fHeight = height;
+    tempDrawInfo->fTempSurfaceDesc.fSampleCnt = 0;
+    tempDrawInfo->fTempSurfaceDesc.fOrigin = kTopLeft_GrSurfaceOrigin; // no CPU y-flip for TL.
+    tempDrawInfo->fUseExactScratch = this->glCaps().partialFBOReadIsSlow();
+
+    // Start off assuming that any temp draw should be to the readConfig, then check if that will
+    // be inefficient.
+    GrPixelConfig srcConfig = srcSurface->config();
+    tempDrawInfo->fTempSurfaceDesc.fConfig = readConfig;
+
+    if (this->glCaps().rgba8888PixelsOpsAreSlow() && kRGBA_8888_GrPixelConfig == readConfig) {
+        tempDrawInfo->fTempSurfaceDesc.fConfig = kBGRA_8888_GrPixelConfig;
+        tempDrawInfo->fSwapRAndB = true;
+        ElevateDrawPreference(drawPreference, kGpuPrefersDraw_DrawPreference);
+    } else if (kMesa_GrGLDriver == this->glContext().driver() &&
+               GrBytesPerPixel(readConfig) == 4 &&
+               GrPixelConfigSwapRAndB(readConfig) == srcConfig) {
+        // Mesa 3D takes a slow path on when reading back  BGRA from an RGBA surface and vice-versa.
+        // Better to do a draw with a R/B swap and then read as the original config.
+        tempDrawInfo->fTempSurfaceDesc.fConfig = srcConfig;
+        tempDrawInfo->fSwapRAndB = true;
+        ElevateDrawPreference(drawPreference, kGpuPrefersDraw_DrawPreference);
+    } else if (readConfig == kBGRA_8888_GrPixelConfig &&
+               !this->glCaps().readPixelsSupported(this->glInterface(), GR_GL_BGRA,
+                                                   GR_GL_UNSIGNED_BYTE, srcConfig)) {
+        tempDrawInfo->fTempSurfaceDesc.fConfig = kRGBA_8888_GrPixelConfig;
+        tempDrawInfo->fSwapRAndB = true;
+        ElevateDrawPreference(drawPreference, kRequireDraw_DrawPreference);
+    }
+
+    GrRenderTarget* srcAsRT = srcSurface->asRenderTarget();
+    if (!srcAsRT) {
+        ElevateDrawPreference(drawPreference, kRequireDraw_DrawPreference);
+    } else if (read_pixels_pays_for_y_flip(srcAsRT, this->glCaps(), width, height, readConfig,
+                                           rowBytes)) {
+        ElevateDrawPreference(drawPreference, kGpuPrefersDraw_DrawPreference);
+    }
+
+    return true;
+}
+
+bool GrGLGpu::onReadPixels(GrSurface* surface,
+                           int left, int top,
+                           int width, int height,
+                           GrPixelConfig config,
+                           void* buffer,
+                           size_t rowBytes) {
+    SkASSERT(surface);
+
+    GrGLRenderTarget* tgt = static_cast<GrGLRenderTarget*>(surface->asRenderTarget());
+    if (!tgt) {
+        return false;
+    }
+
+    // OpenGL doesn't do sRGB <-> linear conversions when reading and writing pixels.
+    if (GrPixelConfigIsSRGB(surface->config()) != GrPixelConfigIsSRGB(config)) {
+        return false;
+    }
+
+    GrGLenum format = 0;
+    GrGLenum type = 0;
+    bool flipY = kBottomLeft_GrSurfaceOrigin == surface->origin();
+    if (!this->configToGLFormats(config, false, nullptr, &format, &type)) {
+        return false;
+    }
+
+    // glReadPixels does not allow GL_SRGB_ALPHA. Instead use GL_RGBA. This will not trigger a
+    // conversion when the src is srgb.
+    if (GR_GL_SRGB_ALPHA == format) {
+        format = GR_GL_RGBA;
+    }
+
+    // resolve the render target if necessary
+    switch (tgt->getResolveType()) {
+        case GrGLRenderTarget::kCantResolve_ResolveType:
+            return false;
+        case GrGLRenderTarget::kAutoResolves_ResolveType:
+            this->flushRenderTarget(tgt, &SkIRect::EmptyIRect());
+            break;
+        case GrGLRenderTarget::kCanResolve_ResolveType:
+            this->onResolveRenderTarget(tgt);
+            // we don't track the state of the READ FBO ID.
+            fStats.incRenderTargetBinds();
+            GL_CALL(BindFramebuffer(GR_GL_READ_FRAMEBUFFER,
+                                    tgt->textureFBOID()));
+            break;
+        default:
+            SkFAIL("Unknown resolve type");
+    }
+
+    const GrGLIRect& glvp = tgt->getViewport();
+
+    // the read rect is viewport-relative
+    GrGLIRect readRect;
+    readRect.setRelativeTo(glvp, left, top, width, height, tgt->origin());
+
+    size_t tightRowBytes = GrBytesPerPixel(config) * width;
+
+    size_t readDstRowBytes = tightRowBytes;
+    void* readDst = buffer;
+
+    // determine if GL can read using the passed rowBytes or if we need
+    // a scratch buffer.
+    SkAutoMalloc scratch;
+    if (rowBytes != tightRowBytes) {
+        if (this->glCaps().packRowLengthSupport()) {
+            SkASSERT(!(rowBytes % sizeof(GrColor)));
+            GL_CALL(PixelStorei(GR_GL_PACK_ROW_LENGTH,
+                                static_cast<GrGLint>(rowBytes / sizeof(GrColor))));
+            readDstRowBytes = rowBytes;
+        } else {
+            scratch.reset(tightRowBytes * height);
+            readDst = scratch.get();
+        }
+    }
+    if (flipY && this->glCaps().packFlipYSupport()) {
+        GL_CALL(PixelStorei(GR_GL_PACK_REVERSE_ROW_ORDER, 1));
+    }
+    GL_CALL(ReadPixels(readRect.fLeft, readRect.fBottom,
+                       readRect.fWidth, readRect.fHeight,
+                       format, type, readDst));
+    if (readDstRowBytes != tightRowBytes) {
+        SkASSERT(this->glCaps().packRowLengthSupport());
+        GL_CALL(PixelStorei(GR_GL_PACK_ROW_LENGTH, 0));
+    }
+    if (flipY && this->glCaps().packFlipYSupport()) {
+        GL_CALL(PixelStorei(GR_GL_PACK_REVERSE_ROW_ORDER, 0));
+        flipY = false;
+    }
+
+    // now reverse the order of the rows, since GL's are bottom-to-top, but our
+    // API presents top-to-bottom. We must preserve the padding contents. Note
+    // that the above readPixels did not overwrite the padding.
+    if (readDst == buffer) {
+        SkASSERT(rowBytes == readDstRowBytes);
+        if (flipY) {
+            scratch.reset(tightRowBytes);
+            void* tmpRow = scratch.get();
+            // flip y in-place by rows
+            const int halfY = height >> 1;
+            char* top = reinterpret_cast<char*>(buffer);
+            char* bottom = top + (height - 1) * rowBytes;
+            for (int y = 0; y < halfY; y++) {
+                memcpy(tmpRow, top, tightRowBytes);
+                memcpy(top, bottom, tightRowBytes);
+                memcpy(bottom, tmpRow, tightRowBytes);
+                top += rowBytes;
+                bottom -= rowBytes;
+            }
+        }
+    } else {
+        SkASSERT(readDst != buffer);        SkASSERT(rowBytes != tightRowBytes);
+        // copy from readDst to buffer while flipping y
+        // const int halfY = height >> 1;
+        const char* src = reinterpret_cast<const char*>(readDst);
+        char* dst = reinterpret_cast<char*>(buffer);
+        if (flipY) {
+            dst += (height-1) * rowBytes;
+        }
+        for (int y = 0; y < height; y++) {
+            memcpy(dst, src, tightRowBytes);
+            src += readDstRowBytes;
+            if (!flipY) {
+                dst += rowBytes;
+            } else {
+                dst -= rowBytes;
+            }
+        }
+    }
+    return true;
+}
+
+void GrGLGpu::flushRenderTarget(GrGLRenderTarget* target, const SkIRect* bound) {
+
+    SkASSERT(target);
+
+    uint32_t rtID = target->getUniqueID();
+    if (fHWBoundRenderTargetUniqueID != rtID) {
+        fStats.incRenderTargetBinds();
+        GL_CALL(BindFramebuffer(GR_GL_FRAMEBUFFER, target->renderFBOID()));
+#ifdef SK_DEBUG
+        // don't do this check in Chromium -- this is causing
+        // lots of repeated command buffer flushes when the compositor is
+        // rendering with Ganesh, which is really slow; even too slow for
+        // Debug mode.
+        if (kChromium_GrGLDriver != this->glContext().driver()) {
+            GrGLenum status;
+            GL_CALL_RET(status, CheckFramebufferStatus(GR_GL_FRAMEBUFFER));
+            if (status != GR_GL_FRAMEBUFFER_COMPLETE) {
+                SkDebugf("GrGLGpu::flushRenderTarget glCheckFramebufferStatus %x\n", status);
+            }
+        }
+#endif
+        fHWBoundRenderTargetUniqueID = rtID;
+        const GrGLIRect& vp = target->getViewport();
+        if (fHWViewport != vp) {
+            vp.pushToGLViewport(this->glInterface());
+            fHWViewport = vp;
+        }
+        if (this->glCaps().srgbWriteControl()) {
+            bool enableSRGBWrite = GrPixelConfigIsSRGB(target->config());
+            if (enableSRGBWrite && kYes_TriState != fHWSRGBFramebuffer) {
+                GL_CALL(Enable(GR_GL_FRAMEBUFFER_SRGB));
+                fHWSRGBFramebuffer = kYes_TriState;
+            } else if (!enableSRGBWrite && kNo_TriState != fHWSRGBFramebuffer) {
+                GL_CALL(Disable(GR_GL_FRAMEBUFFER_SRGB));
+                fHWSRGBFramebuffer = kNo_TriState;
+            }
+        }
+    }
+    if (nullptr == bound || !bound->isEmpty()) {
+        target->flagAsNeedingResolve(bound);
+    }
+
+    GrTexture *texture = target->asTexture();
+    if (texture) {
+        texture->texturePriv().dirtyMipMaps(true);
+    }
+}
+
+GrGLenum gPrimitiveType2GLMode[] = {
+    GR_GL_TRIANGLES,
+    GR_GL_TRIANGLE_STRIP,
+    GR_GL_TRIANGLE_FAN,
+    GR_GL_POINTS,
+    GR_GL_LINES,
+    GR_GL_LINE_STRIP
+};
+
+#define SWAP_PER_DRAW 0
+
+#if SWAP_PER_DRAW
+    #if defined(SK_BUILD_FOR_MAC)
+        #include <AGL/agl.h>
+    #elif defined(SK_BUILD_FOR_WIN32)
+        #include <gl/GL.h>
+        void SwapBuf() {
+            DWORD procID = GetCurrentProcessId();
+            HWND hwnd = GetTopWindow(GetDesktopWindow());
+            while(hwnd) {
+                DWORD wndProcID = 0;
+                GetWindowThreadProcessId(hwnd, &wndProcID);
+                if(wndProcID == procID) {
+                    SwapBuffers(GetDC(hwnd));
+                }
+                hwnd = GetNextWindow(hwnd, GW_HWNDNEXT);
+            }
+         }
+    #endif
+#endif
+
+void GrGLGpu::onDraw(const DrawArgs& args, const GrNonInstancedVertices& vertices) {
+    if (!this->flushGLState(args)) {
+        return;
+    }
+
+    size_t indexOffsetInBytes = 0;
+    this->setupGeometry(*args.fPrimitiveProcessor, vertices, &indexOffsetInBytes);
+
+    SkASSERT((size_t)vertices.primitiveType() < SK_ARRAY_COUNT(gPrimitiveType2GLMode));
+
+    if (vertices.isIndexed()) {
+        GrGLvoid* indices =
+            reinterpret_cast<GrGLvoid*>(indexOffsetInBytes + sizeof(uint16_t) *
+                                        vertices.startIndex());
+        // info.startVertex() was accounted for by setupGeometry.
+        GL_CALL(DrawElements(gPrimitiveType2GLMode[vertices.primitiveType()],
+                             vertices.indexCount(),
+                             GR_GL_UNSIGNED_SHORT,
+                             indices));
+    } else {
+        // Pass 0 for parameter first. We have to adjust glVertexAttribPointer() to account for
+        // startVertex in the DrawElements case. So we always rely on setupGeometry to have
+        // accounted for startVertex.
+        GL_CALL(DrawArrays(gPrimitiveType2GLMode[vertices.primitiveType()], 0,
+                           vertices.vertexCount()));
+    }
+#if SWAP_PER_DRAW
+    glFlush();
+    #if defined(SK_BUILD_FOR_MAC)
+        aglSwapBuffers(aglGetCurrentContext());
+        int set_a_break_pt_here = 9;
+        aglSwapBuffers(aglGetCurrentContext());
+    #elif defined(SK_BUILD_FOR_WIN32)
+        SwapBuf();
+        int set_a_break_pt_here = 9;
+        SwapBuf();
+    #endif
+#endif
+}
+
+void GrGLGpu::onResolveRenderTarget(GrRenderTarget* target) {
+    GrGLRenderTarget* rt = static_cast<GrGLRenderTarget*>(target);
+    if (rt->needsResolve()) {
+        // Some extensions automatically resolves the texture when it is read.
+        if (this->glCaps().usesMSAARenderBuffers()) {
+            SkASSERT(rt->textureFBOID() != rt->renderFBOID());
+            fStats.incRenderTargetBinds();
+            fStats.incRenderTargetBinds();
+            GL_CALL(BindFramebuffer(GR_GL_READ_FRAMEBUFFER, rt->renderFBOID()));
+            GL_CALL(BindFramebuffer(GR_GL_DRAW_FRAMEBUFFER, rt->textureFBOID()));
+            // make sure we go through flushRenderTarget() since we've modified
+            // the bound DRAW FBO ID.
+            fHWBoundRenderTargetUniqueID = SK_InvalidUniqueID;
+            const GrGLIRect& vp = rt->getViewport();
+            const SkIRect dirtyRect = rt->getResolveRect();
+
+            if (GrGLCaps::kES_Apple_MSFBOType == this->glCaps().msFBOType()) {
+                // Apple's extension uses the scissor as the blit bounds.
+                GrScissorState scissorState;
+                scissorState.set(dirtyRect);
+                this->flushScissor(scissorState, vp, rt->origin());
+                GL_CALL(ResolveMultisampleFramebuffer());
+            } else {
+                GrGLIRect r;
+                r.setRelativeTo(vp, dirtyRect.fLeft, dirtyRect.fTop,
+                                dirtyRect.width(), dirtyRect.height(), target->origin());
+
+                int right = r.fLeft + r.fWidth;
+                int top = r.fBottom + r.fHeight;
+
+                // BlitFrameBuffer respects the scissor, so disable it.
+                this->disableScissor();
+                GL_CALL(BlitFramebuffer(r.fLeft, r.fBottom, right, top,
+                                        r.fLeft, r.fBottom, right, top,
+                                        GR_GL_COLOR_BUFFER_BIT, GR_GL_NEAREST));
+            }
+        }
+        rt->flagAsResolved();
+    }
+}
+
+namespace {
+
+
+GrGLenum gr_to_gl_stencil_op(GrStencilOp op) {
+    static const GrGLenum gTable[] = {
+        GR_GL_KEEP,        // kKeep_StencilOp
+        GR_GL_REPLACE,     // kReplace_StencilOp
+        GR_GL_INCR_WRAP,   // kIncWrap_StencilOp
+        GR_GL_INCR,        // kIncClamp_StencilOp
+        GR_GL_DECR_WRAP,   // kDecWrap_StencilOp
+        GR_GL_DECR,        // kDecClamp_StencilOp
+        GR_GL_ZERO,        // kZero_StencilOp
+        GR_GL_INVERT,      // kInvert_StencilOp
+    };
+    GR_STATIC_ASSERT(SK_ARRAY_COUNT(gTable) == kStencilOpCount);
+    GR_STATIC_ASSERT(0 == kKeep_StencilOp);
+    GR_STATIC_ASSERT(1 == kReplace_StencilOp);
+    GR_STATIC_ASSERT(2 == kIncWrap_StencilOp);
+    GR_STATIC_ASSERT(3 == kIncClamp_StencilOp);
+    GR_STATIC_ASSERT(4 == kDecWrap_StencilOp);
+    GR_STATIC_ASSERT(5 == kDecClamp_StencilOp);
+    GR_STATIC_ASSERT(6 == kZero_StencilOp);
+    GR_STATIC_ASSERT(7 == kInvert_StencilOp);
+    SkASSERT((unsigned) op < kStencilOpCount);
+    return gTable[op];
+}
+
+void set_gl_stencil(const GrGLInterface* gl,
+                    const GrStencilSettings& settings,
+                    GrGLenum glFace,
+                    GrStencilSettings::Face grFace) {
+    GrGLenum glFunc = GrToGLStencilFunc(settings.func(grFace));
+    GrGLenum glFailOp = gr_to_gl_stencil_op(settings.failOp(grFace));
+    GrGLenum glPassOp = gr_to_gl_stencil_op(settings.passOp(grFace));
+
+    GrGLint ref = settings.funcRef(grFace);
+    GrGLint mask = settings.funcMask(grFace);
+    GrGLint writeMask = settings.writeMask(grFace);
+
+    if (GR_GL_FRONT_AND_BACK == glFace) {
+        // we call the combined func just in case separate stencil is not
+        // supported.
+        GR_GL_CALL(gl, StencilFunc(glFunc, ref, mask));
+        GR_GL_CALL(gl, StencilMask(writeMask));
+        GR_GL_CALL(gl, StencilOp(glFailOp, GR_GL_KEEP, glPassOp));
+    } else {
+        GR_GL_CALL(gl, StencilFuncSeparate(glFace, glFunc, ref, mask));
+        GR_GL_CALL(gl, StencilMaskSeparate(glFace, writeMask));
+        GR_GL_CALL(gl, StencilOpSeparate(glFace, glFailOp, GR_GL_KEEP, glPassOp));
+    }
+}
+}
+
+void GrGLGpu::flushStencil(const GrStencilSettings& stencilSettings) {
+    if (fHWStencilSettings != stencilSettings) {
+        if (stencilSettings.isDisabled()) {
+            if (kNo_TriState != fHWStencilTestEnabled) {
+                GL_CALL(Disable(GR_GL_STENCIL_TEST));
+                fHWStencilTestEnabled = kNo_TriState;
+            }
+        } else {
+            if (kYes_TriState != fHWStencilTestEnabled) {
+                GL_CALL(Enable(GR_GL_STENCIL_TEST));
+                fHWStencilTestEnabled = kYes_TriState;
+            }
+        }
+        if (!stencilSettings.isDisabled()) {
+            if (this->caps()->twoSidedStencilSupport()) {
+                set_gl_stencil(this->glInterface(),
+                               stencilSettings,
+                               GR_GL_FRONT,
+                               GrStencilSettings::kFront_Face);
+                set_gl_stencil(this->glInterface(),
+                               stencilSettings,
+                               GR_GL_BACK,
+                               GrStencilSettings::kBack_Face);
+            } else {
+                set_gl_stencil(this->glInterface(),
+                               stencilSettings,
+                               GR_GL_FRONT_AND_BACK,
+                               GrStencilSettings::kFront_Face);
+            }
+        }
+        fHWStencilSettings = stencilSettings;
+    }
+}
+
+void GrGLGpu::flushHWAAState(GrRenderTarget* rt, bool useHWAA) {
+    SkASSERT(!useHWAA || rt->isStencilBufferMultisampled());
+
+    if (this->glCaps().multisampleDisableSupport()) {
+        if (useHWAA) {
+            if (kYes_TriState != fMSAAEnabled) {
+                GL_CALL(Enable(GR_GL_MULTISAMPLE));
+                fMSAAEnabled = kYes_TriState;
+            }
+        } else {
+            if (kNo_TriState != fMSAAEnabled) {
+                GL_CALL(Disable(GR_GL_MULTISAMPLE));
+                fMSAAEnabled = kNo_TriState;
+            }
+        }
+    }
+}
+
+void GrGLGpu::flushBlend(const GrXferProcessor::BlendInfo& blendInfo) {
+    // Any optimization to disable blending should have already been applied and
+    // tweaked the equation to "add" or "subtract", and the coeffs to (1, 0).
+
+    GrBlendEquation equation = blendInfo.fEquation;
+    GrBlendCoeff srcCoeff = blendInfo.fSrcBlend;
+    GrBlendCoeff dstCoeff = blendInfo.fDstBlend;
+    bool blendOff = (kAdd_GrBlendEquation == equation || kSubtract_GrBlendEquation == equation) &&
+                    kOne_GrBlendCoeff == srcCoeff && kZero_GrBlendCoeff == dstCoeff;
+    if (blendOff) {
+        if (kNo_TriState != fHWBlendState.fEnabled) {
+            GL_CALL(Disable(GR_GL_BLEND));
+
+            // Workaround for the ARM KHR_blend_equation_advanced blacklist issue
+            // https://code.google.com/p/skia/issues/detail?id=3943
+            if (kARM_GrGLVendor == this->ctxInfo().vendor() &&
+                GrBlendEquationIsAdvanced(fHWBlendState.fEquation)) {
+                SkASSERT(this->caps()->advancedBlendEquationSupport());
+                // Set to any basic blending equation.
+                GrBlendEquation blend_equation = kAdd_GrBlendEquation;
+                GL_CALL(BlendEquation(gXfermodeEquation2Blend[blend_equation]));
+                fHWBlendState.fEquation = blend_equation;
+            }
+
+            fHWBlendState.fEnabled = kNo_TriState;
+        }
+        return;
+    }
+
+    if (kYes_TriState != fHWBlendState.fEnabled) {
+        GL_CALL(Enable(GR_GL_BLEND));
+        fHWBlendState.fEnabled = kYes_TriState;
+    }
+
+    if (fHWBlendState.fEquation != equation) {
+        GL_CALL(BlendEquation(gXfermodeEquation2Blend[equation]));
+        fHWBlendState.fEquation = equation;
+    }
+
+    if (GrBlendEquationIsAdvanced(equation)) {
+        SkASSERT(this->caps()->advancedBlendEquationSupport());
+        // Advanced equations have no other blend state.
+        return;
+    }
+
+    if (fHWBlendState.fSrcCoeff != srcCoeff ||
+        fHWBlendState.fDstCoeff != dstCoeff) {
+        GL_CALL(BlendFunc(gXfermodeCoeff2Blend[srcCoeff],
+                          gXfermodeCoeff2Blend[dstCoeff]));
+        fHWBlendState.fSrcCoeff = srcCoeff;
+        fHWBlendState.fDstCoeff = dstCoeff;
+    }
+
+    GrColor blendConst = blendInfo.fBlendConstant;
+    if ((BlendCoeffReferencesConstant(srcCoeff) ||
+         BlendCoeffReferencesConstant(dstCoeff)) &&
+        (!fHWBlendState.fConstColorValid ||
+         fHWBlendState.fConstColor != blendConst)) {
+        GrGLfloat c[4];
+        GrColorToRGBAFloat(blendConst, c);
+        GL_CALL(BlendColor(c[0], c[1], c[2], c[3]));
+        fHWBlendState.fConstColor = blendConst;
+        fHWBlendState.fConstColorValid = true;
+    }
+}
+
+static inline GrGLenum tile_to_gl_wrap(SkShader::TileMode tm) {
+    static const GrGLenum gWrapModes[] = {
+        GR_GL_CLAMP_TO_EDGE,
+        GR_GL_REPEAT,
+        GR_GL_MIRRORED_REPEAT
+    };
+    GR_STATIC_ASSERT(SkShader::kTileModeCount == SK_ARRAY_COUNT(gWrapModes));
+    GR_STATIC_ASSERT(0 == SkShader::kClamp_TileMode);
+    GR_STATIC_ASSERT(1 == SkShader::kRepeat_TileMode);
+    GR_STATIC_ASSERT(2 == SkShader::kMirror_TileMode);
+    return gWrapModes[tm];
+}
+
+static GrGLenum get_component_enum_from_char(char component) {
+    switch (component) {
+        case 'r':
+           return GR_GL_RED;
+        case 'g':
+           return GR_GL_GREEN;
+        case 'b':
+           return GR_GL_BLUE;
+        case 'a':
+           return GR_GL_ALPHA;
+        default:
+            SkFAIL("Unsupported component");
+            return 0;
+    }
+}
+
+/** If texture swizzling is available using tex parameters then it is preferred over mangling
+  the generated shader code. This potentially allows greater reuse of cached shaders. */
+static void get_tex_param_swizzle(GrPixelConfig config,
+                                  const GrGLSLCaps& caps,
+                                  GrGLenum* glSwizzle) {
+    const char* swizzle = caps.getSwizzleMap(config);
+    for (int i = 0; i < 4; ++i) {
+        glSwizzle[i] = get_component_enum_from_char(swizzle[i]);
+    }
+}
+
+void GrGLGpu::bindTexture(int unitIdx, const GrTextureParams& params, GrGLTexture* texture) {
+    SkASSERT(texture);
+
+#ifdef SK_DEBUG
+    if (!this->caps()->npotTextureTileSupport()) {
+        const bool tileX = SkShader::kClamp_TileMode != params.getTileModeX();
+        const bool tileY = SkShader::kClamp_TileMode != params.getTileModeY();
+        if (tileX || tileY) {
+            const int w = texture->width();
+            const int h = texture->height();
+            SkASSERT(SkIsPow2(w) && SkIsPow2(h));
+        }
+    }
+#endif
+
+    // If we created a rt/tex and rendered to it without using a texture and now we're texturing
+    // from the rt it will still be the last bound texture, but it needs resolving. So keep this
+    // out of the "last != next" check.
+    GrGLRenderTarget* texRT = static_cast<GrGLRenderTarget*>(texture->asRenderTarget());
+    if (texRT) {
+        this->onResolveRenderTarget(texRT);
+    }
+
+    uint32_t textureID = texture->getUniqueID();
+    GrGLenum target = texture->target();
+    if (fHWBoundTextureUniqueIDs[unitIdx] != textureID) {
+        this->setTextureUnit(unitIdx);
+        GL_CALL(BindTexture(target, texture->textureID()));
+        fHWBoundTextureUniqueIDs[unitIdx] = textureID;
+    }
+
+    ResetTimestamp timestamp;
+    const GrGLTexture::TexParams& oldTexParams = texture->getCachedTexParams(&timestamp);
+    bool setAll = timestamp < this->getResetTimestamp();
+    GrGLTexture::TexParams newTexParams;
+
+    static GrGLenum glMinFilterModes[] = {
+        GR_GL_NEAREST,
+        GR_GL_LINEAR,
+        GR_GL_LINEAR_MIPMAP_LINEAR
+    };
+    static GrGLenum glMagFilterModes[] = {
+        GR_GL_NEAREST,
+        GR_GL_LINEAR,
+        GR_GL_LINEAR
+    };
+    GrTextureParams::FilterMode filterMode = params.filterMode();
+
+    if (GrTextureParams::kMipMap_FilterMode == filterMode) {
+        if (!this->caps()->mipMapSupport() || GrPixelConfigIsCompressed(texture->config())) {
+            filterMode = GrTextureParams::kBilerp_FilterMode;
+        }
+    }
+
+    newTexParams.fMinFilter = glMinFilterModes[filterMode];
+    newTexParams.fMagFilter = glMagFilterModes[filterMode];
+
+    if (GrTextureParams::kMipMap_FilterMode == filterMode &&
+        texture->texturePriv().mipMapsAreDirty()) {
+        GL_CALL(GenerateMipmap(target));
+        texture->texturePriv().dirtyMipMaps(false);
+    }
+
+    newTexParams.fWrapS = tile_to_gl_wrap(params.getTileModeX());
+    newTexParams.fWrapT = tile_to_gl_wrap(params.getTileModeY());
+    get_tex_param_swizzle(texture->config(), *this->glCaps().glslCaps(), newTexParams.fSwizzleRGBA);
+    if (setAll || newTexParams.fMagFilter != oldTexParams.fMagFilter) {
+        this->setTextureUnit(unitIdx);
+        GL_CALL(TexParameteri(target, GR_GL_TEXTURE_MAG_FILTER, newTexParams.fMagFilter));
+    }
+    if (setAll || newTexParams.fMinFilter != oldTexParams.fMinFilter) {
+        this->setTextureUnit(unitIdx);
+        GL_CALL(TexParameteri(target, GR_GL_TEXTURE_MIN_FILTER, newTexParams.fMinFilter));
+    }
+    if (setAll || newTexParams.fWrapS != oldTexParams.fWrapS) {
+        this->setTextureUnit(unitIdx);
+        GL_CALL(TexParameteri(target, GR_GL_TEXTURE_WRAP_S, newTexParams.fWrapS));
+    }
+    if (setAll || newTexParams.fWrapT != oldTexParams.fWrapT) {
+        this->setTextureUnit(unitIdx);
+        GL_CALL(TexParameteri(target, GR_GL_TEXTURE_WRAP_T, newTexParams.fWrapT));
+    }
+    if (!this->glCaps().glslCaps()->mustSwizzleInShader() &&
+        (setAll || memcmp(newTexParams.fSwizzleRGBA,
+                          oldTexParams.fSwizzleRGBA,
+                          sizeof(newTexParams.fSwizzleRGBA)))) {
+        this->setTextureUnit(unitIdx);
+        if (this->glStandard() == kGLES_GrGLStandard) {
+            // ES3 added swizzle support but not GL_TEXTURE_SWIZZLE_RGBA.
+            const GrGLenum* swizzle = newTexParams.fSwizzleRGBA;
+            GL_CALL(TexParameteri(target, GR_GL_TEXTURE_SWIZZLE_R, swizzle[0]));
+            GL_CALL(TexParameteri(target, GR_GL_TEXTURE_SWIZZLE_G, swizzle[1]));
+            GL_CALL(TexParameteri(target, GR_GL_TEXTURE_SWIZZLE_B, swizzle[2]));
+            GL_CALL(TexParameteri(target, GR_GL_TEXTURE_SWIZZLE_A, swizzle[3]));
+        } else {
+            GR_STATIC_ASSERT(sizeof(newTexParams.fSwizzleRGBA[0]) == sizeof(GrGLint));
+            const GrGLint* swizzle = reinterpret_cast<const GrGLint*>(newTexParams.fSwizzleRGBA);
+            GL_CALL(TexParameteriv(target, GR_GL_TEXTURE_SWIZZLE_RGBA, swizzle));
+        }
+    }
+    texture->setCachedTexParams(newTexParams, this->getResetTimestamp());
+}
+
+void GrGLGpu::flushColorWrite(bool writeColor) {
+    if (!writeColor) {
+        if (kNo_TriState != fHWWriteToColor) {
+            GL_CALL(ColorMask(GR_GL_FALSE, GR_GL_FALSE,
+                              GR_GL_FALSE, GR_GL_FALSE));
+            fHWWriteToColor = kNo_TriState;
+        }
+    } else {
+        if (kYes_TriState != fHWWriteToColor) {
+            GL_CALL(ColorMask(GR_GL_TRUE, GR_GL_TRUE, GR_GL_TRUE, GR_GL_TRUE));
+            fHWWriteToColor = kYes_TriState;
+        }
+    }
+}
+
+void GrGLGpu::flushDrawFace(GrPipelineBuilder::DrawFace face) {
+    if (fHWDrawFace != face) {
+        switch (face) {
+            case GrPipelineBuilder::kCCW_DrawFace:
+                GL_CALL(Enable(GR_GL_CULL_FACE));
+                GL_CALL(CullFace(GR_GL_BACK));
+                break;
+            case GrPipelineBuilder::kCW_DrawFace:
+                GL_CALL(Enable(GR_GL_CULL_FACE));
+                GL_CALL(CullFace(GR_GL_FRONT));
+                break;
+            case GrPipelineBuilder::kBoth_DrawFace:
+                GL_CALL(Disable(GR_GL_CULL_FACE));
+                break;
+            default:
+                SkFAIL("Unknown draw face.");
+        }
+        fHWDrawFace = face;
+    }
+}
+
+bool GrGLGpu::configToGLFormats(GrPixelConfig config,
+                                bool getSizedInternalFormat,
+                                GrGLenum* internalFormat,
+                                GrGLenum* externalFormat,
+                                GrGLenum* externalType) const {
+    GrGLenum dontCare;
+    if (nullptr == internalFormat) {
+        internalFormat = &dontCare;
+    }
+    if (nullptr == externalFormat) {
+        externalFormat = &dontCare;
+    }
+    if (nullptr == externalType) {
+        externalType = &dontCare;
+    }
+
+    if(!this->glCaps().isConfigTexturable(config)) {
+        return false;
+    }
+
+    switch (config) {
+        case kRGBA_8888_GrPixelConfig:
+            *internalFormat = GR_GL_RGBA;
+            *externalFormat = GR_GL_RGBA;
+            if (getSizedInternalFormat) {
+                *internalFormat = GR_GL_RGBA8;
+            } else {
+                *internalFormat = GR_GL_RGBA;
+            }
+            *externalType = GR_GL_UNSIGNED_BYTE;
+            break;
+        case kBGRA_8888_GrPixelConfig:
+            if (this->glCaps().bgraIsInternalFormat()) {
+                if (getSizedInternalFormat) {
+                    *internalFormat = GR_GL_BGRA8;
+                } else {
+                    *internalFormat = GR_GL_BGRA;
+                }
+            } else {
+                if (getSizedInternalFormat) {
+                    *internalFormat = GR_GL_RGBA8;
+                } else {
+                    *internalFormat = GR_GL_RGBA;
+                }
+            }
+            *externalFormat = GR_GL_BGRA;
+            *externalType = GR_GL_UNSIGNED_BYTE;
+            break;
+        case kSRGBA_8888_GrPixelConfig:
+            if (getSizedInternalFormat) {
+                *internalFormat = GR_GL_SRGB8_ALPHA8;
+            } else {
+                *internalFormat = GR_GL_SRGB_ALPHA;
+            }
+            // OpenGL ES 2.0 + GL_EXT_sRGB allows GL_SRGB_ALPHA to be specified as the <format>
+            // param to Tex(Sub)Image2D. ES 2.0 requires the internalFormat and format to match.
+            // Thus, on ES 2.0 we will use GL_SRGB_ALPHA as the externalFormat. However,
+            // onReadPixels needs code to override that because GL_SRGB_ALPHA is not allowed as a
+            // glReadPixels format.
+            // On OpenGL and ES 3.0 GL_SRGB_ALPHA does not work for the <format> param to
+            // glReadPixels nor does it work with Tex(Sub)Image2D So we always set the externalFormat
+            // return to GL_RGBA.
+            if (this->glStandard() == kGLES_GrGLStandard &&
+                this->glVersion() == GR_GL_VER(2,0)) {
+                *externalFormat = GR_GL_SRGB_ALPHA;
+            } else {
+                *externalFormat = GR_GL_RGBA;
+            }
+            *externalType = GR_GL_UNSIGNED_BYTE;
+            break;
+        case kRGB_565_GrPixelConfig:
+            *internalFormat = GR_GL_RGB;
+            *externalFormat = GR_GL_RGB;
+            if (getSizedInternalFormat) {
+                if (!this->glCaps().ES2CompatibilitySupport()) {
+                    *internalFormat = GR_GL_RGB5;
+                } else {
+                    *internalFormat = GR_GL_RGB565;
+                }
+            } else {
+                *internalFormat = GR_GL_RGB;
+            }
+            *externalType = GR_GL_UNSIGNED_SHORT_5_6_5;
+            break;
+        case kRGBA_4444_GrPixelConfig:
+            *internalFormat = GR_GL_RGBA;
+            *externalFormat = GR_GL_RGBA;
+            if (getSizedInternalFormat) {
+                *internalFormat = GR_GL_RGBA4;
+            } else {
+                *internalFormat = GR_GL_RGBA;
+            }
+            *externalType = GR_GL_UNSIGNED_SHORT_4_4_4_4;
+            break;
+        case kIndex_8_GrPixelConfig:
+            // no sized/unsized internal format distinction here
+            *internalFormat = GR_GL_PALETTE8_RGBA8;
+            break;
+        case kAlpha_8_GrPixelConfig:
+            if (this->glCaps().textureRedSupport()) {
+                *internalFormat = GR_GL_RED;
+                *externalFormat = GR_GL_RED;
+                if (getSizedInternalFormat) {
+                    *internalFormat = GR_GL_R8;
+                } else {
+                    *internalFormat = GR_GL_RED;
+                }
+                *externalType = GR_GL_UNSIGNED_BYTE;
+            } else {
+                *internalFormat = GR_GL_ALPHA;
+                *externalFormat = GR_GL_ALPHA;
+                if (getSizedInternalFormat) {
+                    *internalFormat = GR_GL_ALPHA8;
+                } else {
+                    *internalFormat = GR_GL_ALPHA;
+                }
+                *externalType = GR_GL_UNSIGNED_BYTE;
+            }
+            break;
+        case kETC1_GrPixelConfig:
+            *internalFormat = GR_GL_COMPRESSED_ETC1_RGB8;
+            break;
+        case kLATC_GrPixelConfig:
+            switch(this->glCaps().latcAlias()) {
+                case GrGLCaps::kLATC_LATCAlias:
+                    *internalFormat = GR_GL_COMPRESSED_LUMINANCE_LATC1;
+                    break;
+                case GrGLCaps::kRGTC_LATCAlias:
+                    *internalFormat = GR_GL_COMPRESSED_RED_RGTC1;
+                    break;
+                case GrGLCaps::k3DC_LATCAlias:
+                    *internalFormat = GR_GL_COMPRESSED_3DC_X;
+                    break;
+            }
+            break;
+        case kR11_EAC_GrPixelConfig:
+            *internalFormat = GR_GL_COMPRESSED_R11_EAC;
+            break;
+
+        case kASTC_12x12_GrPixelConfig:
+            *internalFormat = GR_GL_COMPRESSED_RGBA_ASTC_12x12_KHR;
+            break;
+
+        case kRGBA_float_GrPixelConfig:
+            *internalFormat = GR_GL_RGBA32F;
+            *externalFormat = GR_GL_RGBA;
+            *externalType = GR_GL_FLOAT;
+            break;
+
+        case kAlpha_half_GrPixelConfig:
+            if (this->glCaps().textureRedSupport()) {
+                if (getSizedInternalFormat) {
+                    *internalFormat = GR_GL_R16F;
+                } else {
+                    *internalFormat = GR_GL_RED;
+                }
+                *externalFormat = GR_GL_RED;
+            } else {
+                if (getSizedInternalFormat) {
+                    *internalFormat = GR_GL_ALPHA16F;
+                } else {
+                    *internalFormat = GR_GL_ALPHA;
+                }
+                *externalFormat = GR_GL_ALPHA;
+            }
+            if (kGL_GrGLStandard == this->glStandard() || this->glVersion() >= GR_GL_VER(3, 0)) {
+                *externalType = GR_GL_HALF_FLOAT;
+            } else {
+                *externalType = GR_GL_HALF_FLOAT_OES;
+            }
+            break;
+            
+        case kRGBA_half_GrPixelConfig:
+            *internalFormat = GR_GL_RGBA16F;
+            *externalFormat = GR_GL_RGBA;
+            if (kGL_GrGLStandard == this->glStandard() || this->glVersion() >= GR_GL_VER(3, 0)) {
+                *externalType = GR_GL_HALF_FLOAT;
+            } else {
+                *externalType = GR_GL_HALF_FLOAT_OES;
+            }
+            break;
+
+        default:
+            return false;
+    }
+    return true;
+}
+
+void GrGLGpu::setTextureUnit(int unit) {
+    SkASSERT(unit >= 0 && unit < fHWBoundTextureUniqueIDs.count());
+    if (unit != fHWActiveTextureUnitIdx) {
+        GL_CALL(ActiveTexture(GR_GL_TEXTURE0 + unit));
+        fHWActiveTextureUnitIdx = unit;
+    }
+}
+
+void GrGLGpu::setScratchTextureUnit() {
+    // Bind the last texture unit since it is the least likely to be used by GrGLProgram.
+    int lastUnitIdx = fHWBoundTextureUniqueIDs.count() - 1;
+    if (lastUnitIdx != fHWActiveTextureUnitIdx) {
+        GL_CALL(ActiveTexture(GR_GL_TEXTURE0 + lastUnitIdx));
+        fHWActiveTextureUnitIdx = lastUnitIdx;
+    }
+    // clear out the this field so that if a program does use this unit it will rebind the correct
+    // texture.
+    fHWBoundTextureUniqueIDs[lastUnitIdx] = SK_InvalidUniqueID;
+}
+
+// Determines whether glBlitFramebuffer could be used between src and dst.
+static inline bool can_blit_framebuffer(const GrSurface* dst,
+                                        const GrSurface* src,
+                                        const GrGLGpu* gpu) {
+    if (gpu->glCaps().isConfigRenderable(dst->config(), dst->desc().fSampleCnt > 0) &&
+        gpu->glCaps().isConfigRenderable(src->config(), src->desc().fSampleCnt > 0) &&
+        gpu->glCaps().usesMSAARenderBuffers()) {
+        // ES3 doesn't allow framebuffer blits when the src has MSAA and the configs don't match
+        // or the rects are not the same (not just the same size but have the same edges).
+        if (GrGLCaps::kES_3_0_MSFBOType == gpu->glCaps().msFBOType() &&
+            (src->desc().fSampleCnt > 0 || src->config() != dst->config())) {
+           return false;
+        }
+        const GrGLTexture* dstTex = static_cast<const GrGLTexture*>(dst->asTexture());
+        if (dstTex && dstTex->target() != GR_GL_TEXTURE_2D) {
+            return false;
+        }
+        const GrGLTexture* srcTex = static_cast<const GrGLTexture*>(dst->asTexture());
+        if (srcTex && srcTex->target() != GR_GL_TEXTURE_2D) {
+            return false;
+        }
+        return true;
+    } else {
+        return false;
+    }
+}
+
+static inline bool can_copy_texsubimage(const GrSurface* dst,
+                                        const GrSurface* src,
+                                        const GrGLGpu* gpu) {
+    // Table 3.9 of the ES2 spec indicates the supported formats with CopyTexSubImage
+    // and BGRA isn't in the spec. There doesn't appear to be any extension that adds it. Perhaps
+    // many drivers would allow it to work, but ANGLE does not.
+    if (kGLES_GrGLStandard == gpu->glStandard() && gpu->glCaps().bgraIsInternalFormat() &&
+        (kBGRA_8888_GrPixelConfig == dst->config() || kBGRA_8888_GrPixelConfig == src->config())) {
+        return false;
+    }
+    const GrGLRenderTarget* dstRT = static_cast<const GrGLRenderTarget*>(dst->asRenderTarget());
+    // If dst is multisampled (and uses an extension where there is a separate MSAA renderbuffer)
+    // then we don't want to copy to the texture but to the MSAA buffer.
+    if (dstRT && dstRT->renderFBOID() != dstRT->textureFBOID()) {
+        return false;
+    }
+    const GrGLRenderTarget* srcRT = static_cast<const GrGLRenderTarget*>(src->asRenderTarget());
+    // If the src is multisampled (and uses an extension where there is a separate MSAA
+    // renderbuffer) then it is an invalid operation to call CopyTexSubImage
+    if (srcRT && srcRT->renderFBOID() != srcRT->textureFBOID()) {
+        return false;
+    }
+
+    const GrGLTexture* dstTex = static_cast<const GrGLTexture*>(dst->asTexture());
+    // CopyTex(Sub)Image writes to a texture and we have no way of dynamically wrapping a RT in a
+    // texture.
+    if (!dstTex) {
+        return false;
+    }
+
+    const GrGLTexture* srcTex = static_cast<const GrGLTexture*>(src->asTexture());
+    
+    // Check that we could wrap the source in an FBO, that the dst is TEXTURE_2D, that no mirroring
+    // is required.
+    if (gpu->glCaps().isConfigRenderable(src->config(), src->desc().fSampleCnt > 0) &&
+        !GrPixelConfigIsCompressed(src->config()) &&
+        (!srcTex || srcTex->target() == GR_GL_TEXTURE_2D) &&
+        dstTex->target() == GR_GL_TEXTURE_2D &&
+        dst->origin() == src->origin()) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+// If a temporary FBO was created, its non-zero ID is returned. The viewport that the copy rect is
+// relative to is output.
+void GrGLGpu::bindSurfaceFBOForCopy(GrSurface* surface, GrGLenum fboTarget, GrGLIRect* viewport,
+                                    TempFBOTarget tempFBOTarget) {
+    GrGLRenderTarget* rt = static_cast<GrGLRenderTarget*>(surface->asRenderTarget());
+    if (nullptr == rt) {
+        SkASSERT(surface->asTexture());
+        GrGLuint texID = static_cast<GrGLTexture*>(surface->asTexture())->textureID();
+        GrGLenum target = static_cast<GrGLTexture*>(surface->asTexture())->target();
+        GrGLuint* tempFBOID;
+        tempFBOID = kSrc_TempFBOTarget == tempFBOTarget ? &fTempSrcFBOID : &fTempDstFBOID;
+
+        if (0 == *tempFBOID) {
+            GR_GL_CALL(this->glInterface(), GenFramebuffers(1, tempFBOID));
+        }
+
+        fStats.incRenderTargetBinds();
+        GR_GL_CALL(this->glInterface(), BindFramebuffer(fboTarget, *tempFBOID));
+        GR_GL_CALL(this->glInterface(), FramebufferTexture2D(fboTarget,
+                                                             GR_GL_COLOR_ATTACHMENT0,
+                                                             target,
+                                                             texID,
+                                                             0));
+        viewport->fLeft = 0;
+        viewport->fBottom = 0;
+        viewport->fWidth = surface->width();
+        viewport->fHeight = surface->height();
+    } else {
+        fStats.incRenderTargetBinds();
+        GR_GL_CALL(this->glInterface(), BindFramebuffer(fboTarget, rt->renderFBOID()));
+        *viewport = rt->getViewport();
+    }
+}
+
+void GrGLGpu::unbindTextureFBOForCopy(GrGLenum fboTarget, GrSurface* surface) {
+    // bindSurfaceFBOForCopy temporarily binds textures that are not render targets to 
+    if (!surface->asRenderTarget()) {
+        SkASSERT(surface->asTexture());
+        GrGLenum textureTarget = static_cast<GrGLTexture*>(surface->asTexture())->target();
+        GR_GL_CALL(this->glInterface(), FramebufferTexture2D(fboTarget,
+                                                             GR_GL_COLOR_ATTACHMENT0,
+                                                             textureTarget,
+                                                             0,
+                                                             0));
+    }
+}
+
+bool GrGLGpu::initCopySurfaceDstDesc(const GrSurface* src, GrSurfaceDesc* desc) const {
+    // If the src is a texture, we can implement the blit as a draw assuming the config is
+    // renderable.
+    if (src->asTexture() && this->caps()->isConfigRenderable(src->config(), false)) {
+        desc->fOrigin = kDefault_GrSurfaceOrigin;
+        desc->fFlags = kRenderTarget_GrSurfaceFlag;
+        desc->fConfig = src->config();
+        return true;
+    }
+
+    const GrGLTexture* srcTexture = static_cast<const GrGLTexture*>(src->asTexture());
+    if (srcTexture && srcTexture->target() != GR_GL_TEXTURE_2D) {
+        // Not supported for FBO blit or CopyTexSubImage
+        return false;
+    }
+
+    // We look for opportunities to use CopyTexSubImage, or fbo blit. If neither are
+    // possible and we return false to fallback to creating a render target dst for render-to-
+    // texture. This code prefers CopyTexSubImage to fbo blit and avoids triggering temporary fbo
+    // creation. It isn't clear that avoiding temporary fbo creation is actually optimal.
+
+    // Check for format issues with glCopyTexSubImage2D
+    if (kGLES_GrGLStandard == this->glStandard() && this->glCaps().bgraIsInternalFormat() &&
+        kBGRA_8888_GrPixelConfig == src->config()) {
+        // glCopyTexSubImage2D doesn't work with this config. If the bgra can be used with fbo blit
+        // then we set up for that, otherwise fail.
+        if (this->caps()->isConfigRenderable(kBGRA_8888_GrPixelConfig, false)) {
+            desc->fOrigin = kDefault_GrSurfaceOrigin;
+            desc->fFlags = kRenderTarget_GrSurfaceFlag;
+            desc->fConfig = kBGRA_8888_GrPixelConfig;
+            return true;
+        }
+        return false;
+    } else if (nullptr == src->asRenderTarget()) {
+        // CopyTexSubImage2D or fbo blit would require creating a temp fbo for the src.
+        return false;
+    }
+
+    const GrGLRenderTarget* srcRT = static_cast<const GrGLRenderTarget*>(src->asRenderTarget());
+    if (srcRT && srcRT->renderFBOID() != srcRT->textureFBOID()) {
+        // It's illegal to call CopyTexSubImage2D on a MSAA renderbuffer. Set up for FBO blit or
+        // fail.
+        if (this->caps()->isConfigRenderable(src->config(), false)) {
+            desc->fOrigin = kDefault_GrSurfaceOrigin;
+            desc->fFlags = kRenderTarget_GrSurfaceFlag;
+            desc->fConfig = src->config();
+            return true;
+        }
+        return false;
+    }
+
+    // We'll do a CopyTexSubImage. Make the dst a plain old texture.
+    desc->fConfig = src->config();
+    desc->fOrigin = src->origin();
+    desc->fFlags = kNone_GrSurfaceFlags;
+    return true;
+}
+
+bool GrGLGpu::onCopySurface(GrSurface* dst,
+                            GrSurface* src,
+                            const SkIRect& srcRect,
+                            const SkIPoint& dstPoint) {
+    if (src->asTexture() && dst->asRenderTarget()) {
+        this->copySurfaceAsDraw(dst, src, srcRect, dstPoint);
+        return true;
+    }
+    
+    if (can_copy_texsubimage(dst, src, this)) {
+        this->copySurfaceAsCopyTexSubImage(dst, src, srcRect, dstPoint);
+        return true;
+    }
+
+    if (can_blit_framebuffer(dst, src, this)) {
+        return this->copySurfaceAsBlitFramebuffer(dst, src, srcRect, dstPoint);
+    }
+
+    return false;
+}
+
+
+void GrGLGpu::createCopyPrograms() {
+    for (size_t i = 0; i < SK_ARRAY_COUNT(fCopyPrograms); ++i) {
+        fCopyPrograms[i].fProgram = 0;
+    }
+    const char* version = this->glCaps().glslCaps()->versionDeclString();
+    static const GrSLType kSamplerTypes[2] = { kSampler2D_GrSLType, kSamplerExternal_GrSLType };
+    SkASSERT(2 == SK_ARRAY_COUNT(fCopyPrograms));
+    int programCount = this->glCaps().externalTextureSupport() ? 2 : 1;
+    for (int i = 0; i < programCount; ++i) {
+        GrGLSLShaderVar aVertex("a_vertex", kVec2f_GrSLType, GrShaderVar::kAttribute_TypeModifier);
+        GrGLSLShaderVar uTexCoordXform("u_texCoordXform", kVec4f_GrSLType,
+                                     GrShaderVar::kUniform_TypeModifier);
+        GrGLSLShaderVar uPosXform("u_posXform", kVec4f_GrSLType,
+                                  GrShaderVar::kUniform_TypeModifier);
+        GrGLSLShaderVar uTexture("u_texture", kSamplerTypes[i],
+                                 GrShaderVar::kUniform_TypeModifier);
+        GrGLSLShaderVar vTexCoord("v_texCoord", kVec2f_GrSLType,
+                                  GrShaderVar::kVaryingOut_TypeModifier);
+        GrGLSLShaderVar oFragColor("o_FragColor", kVec4f_GrSLType,
+                                   GrShaderVar::kOut_TypeModifier);
+    
+        SkString vshaderTxt(version);
+        aVertex.appendDecl(this->glCaps().glslCaps(), &vshaderTxt);
+        vshaderTxt.append(";");
+        uTexCoordXform.appendDecl(this->glCaps().glslCaps(), &vshaderTxt);
+        vshaderTxt.append(";");
+        uPosXform.appendDecl(this->glCaps().glslCaps(), &vshaderTxt);
+        vshaderTxt.append(";");
+        vTexCoord.appendDecl(this->glCaps().glslCaps(), &vshaderTxt);
+        vshaderTxt.append(";");
+    
+        vshaderTxt.append(
+            "// Copy Program VS\n"
+            "void main() {"
+            "  v_texCoord = a_vertex.xy * u_texCoordXform.xy + u_texCoordXform.zw;"
+            "  gl_Position.xy = a_vertex * u_posXform.xy + u_posXform.zw;"
+            "  gl_Position.zw = vec2(0, 1);"
+            "}"
+        );
+
+        SkString fshaderTxt(version);
+        if (kSamplerTypes[i] == kSamplerExternal_GrSLType) {
+            fshaderTxt.appendf("#extension %s : require\n",
+                               this->glCaps().glslCaps()->externalTextureExtensionString());
+        }
+        GrGLSLAppendDefaultFloatPrecisionDeclaration(kDefault_GrSLPrecision,
+                                                     *this->glCaps().glslCaps(),
+                                                     &fshaderTxt);
+        vTexCoord.setTypeModifier(GrShaderVar::kVaryingIn_TypeModifier);
+        vTexCoord.appendDecl(this->glCaps().glslCaps(), &fshaderTxt);
+        fshaderTxt.append(";");
+        uTexture.appendDecl(this->glCaps().glslCaps(), &fshaderTxt);
+        fshaderTxt.append(";");
+        const char* fsOutName;
+        if (this->glCaps().glslCaps()->mustDeclareFragmentShaderOutput()) {
+            oFragColor.appendDecl(this->glCaps().glslCaps(), &fshaderTxt);
+            fshaderTxt.append(";");
+            fsOutName = oFragColor.c_str();
+        } else {
+            fsOutName = "gl_FragColor";
+        }
+        fshaderTxt.appendf(
+            "// Copy Program FS\n"
+            "void main() {"
+            "  %s = %s(u_texture, v_texCoord);"
+            "}",
+            fsOutName,
+            GrGLSLTexture2DFunctionName(kVec2f_GrSLType, this->glslGeneration())
+        );
+    
+        GL_CALL_RET(fCopyPrograms[i].fProgram, CreateProgram());
+        const char* str;
+        GrGLint length;
+
+        str = vshaderTxt.c_str();
+        length = SkToInt(vshaderTxt.size());
+        GrGLuint vshader = GrGLCompileAndAttachShader(*fGLContext, fCopyPrograms[i].fProgram,
+                                                      GR_GL_VERTEX_SHADER, &str, &length, 1,
+                                                      &fStats);
+
+        str = fshaderTxt.c_str();
+        length = SkToInt(fshaderTxt.size());
+        GrGLuint fshader = GrGLCompileAndAttachShader(*fGLContext, fCopyPrograms[i].fProgram,
+                                                      GR_GL_FRAGMENT_SHADER, &str, &length, 1,
+                                                      &fStats);
+
+        GL_CALL(LinkProgram(fCopyPrograms[i].fProgram));
+
+        GL_CALL_RET(fCopyPrograms[i].fTextureUniform,
+                    GetUniformLocation(fCopyPrograms[i].fProgram, "u_texture"));
+        GL_CALL_RET(fCopyPrograms[i].fPosXformUniform,
+                    GetUniformLocation(fCopyPrograms[i].fProgram, "u_posXform"));
+        GL_CALL_RET(fCopyPrograms[i].fTexCoordXformUniform,
+                    GetUniformLocation(fCopyPrograms[i].fProgram, "u_texCoordXform"));
+
+        GL_CALL(BindAttribLocation(fCopyPrograms[i].fProgram, 0, "a_vertex"));
+
+        GL_CALL(DeleteShader(vshader));
+        GL_CALL(DeleteShader(fshader));
+    }
+
+    GL_CALL(GenBuffers(1, &fCopyProgramArrayBuffer));
+    fHWGeometryState.setVertexBufferID(this, fCopyProgramArrayBuffer);
+    static const GrGLfloat vdata[] = {
+        0, 0,
+        0, 1,
+        1, 0,
+        1, 1
+    };
+    GL_ALLOC_CALL(this->glInterface(),
+                  BufferData(GR_GL_ARRAY_BUFFER,
+                             (GrGLsizeiptr) sizeof(vdata),
+                             vdata,  // data ptr
+                             GR_GL_STATIC_DRAW));
+}
+
+void GrGLGpu::copySurfaceAsDraw(GrSurface* dst,
+                                GrSurface* src,
+                                const SkIRect& srcRect,
+                                const SkIPoint& dstPoint) {
+    int w = srcRect.width();
+    int h = srcRect.height();
+
+    GrGLTexture* srcTex = static_cast<GrGLTexture*>(src->asTexture());
+    GrTextureParams params(SkShader::kClamp_TileMode, GrTextureParams::kNone_FilterMode);
+    this->bindTexture(0, params, srcTex);
+
+    GrGLRenderTarget* dstRT = static_cast<GrGLRenderTarget*>(dst->asRenderTarget());
+    SkIRect dstRect = SkIRect::MakeXYWH(dstPoint.fX, dstPoint.fY, w, h);
+    this->flushRenderTarget(dstRT, &dstRect);
+
+    int progIdx = TextureTargetToCopyProgramIdx(srcTex->target());
+
+    GL_CALL(UseProgram(fCopyPrograms[progIdx].fProgram));
+    fHWProgramID = fCopyPrograms[progIdx].fProgram;
+
+    fHWGeometryState.setVertexArrayID(this, 0);
+
+    GrGLAttribArrayState* attribs =
+        fHWGeometryState.bindArrayAndBufferToDraw(this, fCopyProgramArrayBuffer);
+    attribs->set(this, 0, fCopyProgramArrayBuffer, 2, GR_GL_FLOAT, false,
+                    2 * sizeof(GrGLfloat), 0);
+    attribs->disableUnusedArrays(this, 0x1);
+
+    // dst rect edges in NDC (-1 to 1)
+    int dw = dst->width();
+    int dh = dst->height();
+    GrGLfloat dx0 = 2.f * dstPoint.fX / dw - 1.f;
+    GrGLfloat dx1 = 2.f * (dstPoint.fX + w) / dw - 1.f;
+    GrGLfloat dy0 = 2.f * dstPoint.fY / dh - 1.f;
+    GrGLfloat dy1 = 2.f * (dstPoint.fY + h) / dh - 1.f;
+    if (kBottomLeft_GrSurfaceOrigin == dst->origin()) {
+        dy0 = -dy0;
+        dy1 = -dy1;
+    }
+
+    // src rect edges in normalized texture space (0 to 1)
+    int sw = src->width();
+    int sh = src->height();
+    GrGLfloat sx0 = (GrGLfloat)srcRect.fLeft / sw;
+    GrGLfloat sx1 = (GrGLfloat)(srcRect.fLeft + w) / sw;
+    GrGLfloat sy0 = (GrGLfloat)srcRect.fTop / sh;
+    GrGLfloat sy1 = (GrGLfloat)(srcRect.fTop + h) / sh;
+    if (kBottomLeft_GrSurfaceOrigin == src->origin()) {
+        sy0 = 1.f - sy0;
+        sy1 = 1.f - sy1;
+    }
+
+    GL_CALL(Uniform4f(fCopyPrograms[progIdx].fPosXformUniform, dx1 - dx0, dy1 - dy0, dx0, dy0));
+    GL_CALL(Uniform4f(fCopyPrograms[progIdx].fTexCoordXformUniform,
+                      sx1 - sx0, sy1 - sy0, sx0, sy0));
+    GL_CALL(Uniform1i(fCopyPrograms[progIdx].fTextureUniform, 0));
+
+    GrXferProcessor::BlendInfo blendInfo;
+    blendInfo.reset();
+    this->flushBlend(blendInfo);
+    this->flushColorWrite(true);
+    this->flushDrawFace(GrPipelineBuilder::kBoth_DrawFace);
+    this->flushHWAAState(dstRT, false);
+    this->disableScissor();
+    GrStencilSettings stencil;
+    stencil.setDisabled();
+    this->flushStencil(stencil);
+
+    GL_CALL(DrawArrays(GR_GL_TRIANGLE_STRIP, 0, 4));
+}
+
+void GrGLGpu::copySurfaceAsCopyTexSubImage(GrSurface* dst,
+                                           GrSurface* src,
+                                           const SkIRect& srcRect,
+                                           const SkIPoint& dstPoint) {
+    SkASSERT(can_copy_texsubimage(dst, src, this));
+    GrGLIRect srcVP;
+    this->bindSurfaceFBOForCopy(src, GR_GL_FRAMEBUFFER, &srcVP, kSrc_TempFBOTarget);
+    GrGLTexture* dstTex = static_cast<GrGLTexture*>(dst->asTexture());
+    SkASSERT(dstTex);
+    // We modified the bound FBO
+    fHWBoundRenderTargetUniqueID = SK_InvalidUniqueID;
+    GrGLIRect srcGLRect;
+    srcGLRect.setRelativeTo(srcVP,
+                            srcRect.fLeft,
+                            srcRect.fTop,
+                            srcRect.width(),
+                            srcRect.height(),
+                            src->origin());
+
+    this->setScratchTextureUnit();
+    GL_CALL(BindTexture(dstTex->target(), dstTex->textureID()));
+    GrGLint dstY;
+    if (kBottomLeft_GrSurfaceOrigin == dst->origin()) {
+        dstY = dst->height() - (dstPoint.fY + srcGLRect.fHeight);
+    } else {
+        dstY = dstPoint.fY;
+    }
+    GL_CALL(CopyTexSubImage2D(dstTex->target(), 0,
+                                dstPoint.fX, dstY,
+                                srcGLRect.fLeft, srcGLRect.fBottom,
+                                srcGLRect.fWidth, srcGLRect.fHeight));
+    this->unbindTextureFBOForCopy(GR_GL_FRAMEBUFFER, src);
+}
+
+bool GrGLGpu::copySurfaceAsBlitFramebuffer(GrSurface* dst,
+                                           GrSurface* src,
+                                           const SkIRect& srcRect,
+                                           const SkIPoint& dstPoint) {
+    SkASSERT(can_blit_framebuffer(dst, src, this));
+    SkIRect dstRect = SkIRect::MakeXYWH(dstPoint.fX, dstPoint.fY,
+                                        srcRect.width(), srcRect.height());
+    if (dst == src) {
+        if (SkIRect::IntersectsNoEmptyCheck(dstRect, srcRect)) {
+            return false;
+        }
+    }
+
+    GrGLIRect dstVP;
+    GrGLIRect srcVP;
+    this->bindSurfaceFBOForCopy(dst, GR_GL_DRAW_FRAMEBUFFER, &dstVP, kDst_TempFBOTarget);
+    this->bindSurfaceFBOForCopy(src, GR_GL_READ_FRAMEBUFFER, &srcVP, kSrc_TempFBOTarget);
+    // We modified the bound FBO
+    fHWBoundRenderTargetUniqueID = SK_InvalidUniqueID;
+    GrGLIRect srcGLRect;
+    GrGLIRect dstGLRect;
+    srcGLRect.setRelativeTo(srcVP,
+                            srcRect.fLeft,
+                            srcRect.fTop,
+                            srcRect.width(),
+                            srcRect.height(),
+                            src->origin());
+    dstGLRect.setRelativeTo(dstVP,
+                            dstRect.fLeft,
+                            dstRect.fTop,
+                            dstRect.width(),
+                            dstRect.height(),
+                            dst->origin());
+
+    // BlitFrameBuffer respects the scissor, so disable it.
+    this->disableScissor();
+
+    GrGLint srcY0;
+    GrGLint srcY1;
+    // Does the blit need to y-mirror or not?
+    if (src->origin() == dst->origin()) {
+        srcY0 = srcGLRect.fBottom;
+        srcY1 = srcGLRect.fBottom + srcGLRect.fHeight;
+    } else {
+        srcY0 = srcGLRect.fBottom + srcGLRect.fHeight;
+        srcY1 = srcGLRect.fBottom;
+    }
+    GL_CALL(BlitFramebuffer(srcGLRect.fLeft,
+                            srcY0,
+                            srcGLRect.fLeft + srcGLRect.fWidth,
+                            srcY1,
+                            dstGLRect.fLeft,
+                            dstGLRect.fBottom,
+                            dstGLRect.fLeft + dstGLRect.fWidth,
+                            dstGLRect.fBottom + dstGLRect.fHeight,
+                            GR_GL_COLOR_BUFFER_BIT, GR_GL_NEAREST));
+    this->unbindTextureFBOForCopy(GR_GL_DRAW_FRAMEBUFFER, dst);
+    this->unbindTextureFBOForCopy(GR_GL_READ_FRAMEBUFFER, src);
+    return true;
+}
+
+void GrGLGpu::xferBarrier(GrRenderTarget* rt, GrXferBarrierType type) {
+    SkASSERT(type);
+    switch (type) {
+        case kTexture_GrXferBarrierType: {
+            GrGLRenderTarget* glrt = static_cast<GrGLRenderTarget*>(rt);
+            if (glrt->textureFBOID() != glrt->renderFBOID()) {
+                // The render target uses separate storage so no need for glTextureBarrier.
+                // FIXME: The render target will resolve automatically when its texture is bound,
+                // but we could resolve only the bounds that will be read if we do it here instead.
+                return;
+            }
+            SkASSERT(this->caps()->textureBarrierSupport());
+            GL_CALL(TextureBarrier());
+            return;
+        }
+        case kBlend_GrXferBarrierType:
+            SkASSERT(GrCaps::kAdvanced_BlendEquationSupport ==
+                     this->caps()->blendEquationSupport());
+            GL_CALL(BlendBarrier());
+            return;
+        default: break; // placate compiler warnings that kNone not handled
+    }
+}
+
+GrBackendObject GrGLGpu::createTestingOnlyBackendTexture(void* pixels, int w, int h,
+                                                         GrPixelConfig config) const {
+    GrGLTextureInfo* info = new GrGLTextureInfo;
+    info->fTarget = GR_GL_TEXTURE_2D;
+    GL_CALL(GenTextures(1, &info->fID));
+    GL_CALL(ActiveTexture(GR_GL_TEXTURE0));
+    GL_CALL(PixelStorei(GR_GL_UNPACK_ALIGNMENT, 1));
+    GL_CALL(BindTexture(info->fTarget, info->fID));
+    GL_CALL(TexParameteri(info->fTarget, GR_GL_TEXTURE_MAG_FILTER, GR_GL_NEAREST));
+    GL_CALL(TexParameteri(info->fTarget, GR_GL_TEXTURE_MIN_FILTER, GR_GL_NEAREST));
+    GL_CALL(TexParameteri(info->fTarget, GR_GL_TEXTURE_WRAP_S, GR_GL_CLAMP_TO_EDGE));
+    GL_CALL(TexParameteri(info->fTarget, GR_GL_TEXTURE_WRAP_T, GR_GL_CLAMP_TO_EDGE));
+
+    GrGLenum internalFormat = 0x0; // suppress warning
+    GrGLenum externalFormat = 0x0; // suppress warning
+    GrGLenum externalType = 0x0;   // suppress warning
+
+    this->configToGLFormats(config, false, &internalFormat, &externalFormat, &externalType);
+
+    GL_CALL(TexImage2D(info->fTarget, 0, internalFormat, w, h, 0, externalFormat,
+                       externalType, pixels));
+
+#ifdef SK_IGNORE_GL_TEXTURE_TARGET
+    GrGLuint id = info->fID;
+    delete info;
+    return id;
+#else
+    return reinterpret_cast<GrBackendObject>(info);
+#endif
+}
+
+bool GrGLGpu::isTestingOnlyBackendTexture(GrBackendObject id) const {
+#ifdef SK_IGNORE_GL_TEXTURE_TARGET
+    GrGLuint texID = (GrGLuint)id;
+#else
+    GrGLuint texID = reinterpret_cast<const GrGLTextureInfo*>(id)->fID;
+#endif
+
+    GrGLboolean result;
+    GL_CALL_RET(result, IsTexture(texID));
+
+    return (GR_GL_TRUE == result);
+}
+
+void GrGLGpu::deleteTestingOnlyBackendTexture(GrBackendObject id, bool abandonTexture) const {
+#ifdef SK_IGNORE_GL_TEXTURE_TARGET
+    GrGLuint texID = (GrGLuint)id;
+#else
+    const GrGLTextureInfo* info = reinterpret_cast<const GrGLTextureInfo*>(id);
+    GrGLuint texID = info->fID;
+#endif
+
+    if (!abandonTexture) {
+        GL_CALL(DeleteTextures(1, &texID));
+    }
+
+#ifndef SK_IGNORE_GL_TEXTURE_TARGET
+    delete info;
+#endif
+}
+
+void GrGLGpu::resetShaderCacheForTesting() const {
+    fProgramCache->abandon();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+GrGLAttribArrayState* GrGLGpu::HWGeometryState::bindArrayAndBuffersToDraw(
+                                                GrGLGpu* gpu,
+                                                const GrGLVertexBuffer* vbuffer,
+                                                const GrGLIndexBuffer* ibuffer) {
+    SkASSERT(vbuffer);
+    GrGLuint vbufferID = vbuffer->bufferID();
+    GrGLuint* ibufferIDPtr = nullptr;
+    GrGLuint ibufferID;
+    if (ibuffer) {
+        ibufferID = ibuffer->bufferID();
+        ibufferIDPtr = &ibufferID;
+    }
+    return this->internalBind(gpu, vbufferID, ibufferIDPtr);
+}
+
+GrGLAttribArrayState* GrGLGpu::HWGeometryState::bindArrayAndBufferToDraw(GrGLGpu* gpu,
+                                                                         GrGLuint vbufferID) {
+    return this->internalBind(gpu, vbufferID, nullptr);
+}
+
+GrGLAttribArrayState* GrGLGpu::HWGeometryState::bindArrayAndBuffersToDraw(GrGLGpu* gpu,
+                                                                          GrGLuint vbufferID,
+                                                                          GrGLuint ibufferID) {
+    return this->internalBind(gpu, vbufferID, &ibufferID);
+}
+
+GrGLAttribArrayState* GrGLGpu::HWGeometryState::internalBind(GrGLGpu* gpu,
+                                                             GrGLuint vbufferID,
+                                                             GrGLuint* ibufferID) {
+    GrGLAttribArrayState* attribState;
+
+    if (gpu->glCaps().isCoreProfile() && 0 != vbufferID) {
+        if (!fVBOVertexArray) {
+            GrGLuint arrayID;
+            GR_GL_CALL(gpu->glInterface(), GenVertexArrays(1, &arrayID));
+            int attrCount = gpu->glCaps().maxVertexAttributes();
+            fVBOVertexArray = new GrGLVertexArray(arrayID, attrCount);
+        }
+        if (ibufferID) {
+            attribState = fVBOVertexArray->bindWithIndexBuffer(gpu, *ibufferID);
+        } else {
+            attribState = fVBOVertexArray->bind(gpu);
+        }
+    } else {
+        if (ibufferID) {
+            this->setIndexBufferIDOnDefaultVertexArray(gpu, *ibufferID);
+        } else {
+            this->setVertexArrayID(gpu, 0);
+        }
+        int attrCount = gpu->glCaps().maxVertexAttributes();
+        if (fDefaultVertexArrayAttribState.count() != attrCount) {
+            fDefaultVertexArrayAttribState.resize(attrCount);
+        }
+        attribState = &fDefaultVertexArrayAttribState;
+    }
+    return attribState;
+}
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLGpu.h b/gfx/skia/skia/src/gpu/gl/GrGLGpu.h
new file mode 100644
index 000000000000..2d05396f87c8
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/GrGLGpu.h
@@ -0,0 +1,537 @@
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGLGpu_DEFINED
+#define GrGLGpu_DEFINED
+
+#include "GrGLContext.h"
+#include "GrGLIRect.h"
+#include "GrGLIndexBuffer.h"
+#include "GrGLPathRendering.h"
+#include "GrGLProgram.h"
+#include "GrGLRenderTarget.h"
+#include "GrGLStencilAttachment.h"
+#include "GrGLTexture.h"
+#include "GrGLVertexArray.h"
+#include "GrGLVertexBuffer.h"
+#include "GrGpu.h"
+#include "GrPipelineBuilder.h"
+#include "GrXferProcessor.h"
+#include "SkTypes.h"
+
+class GrPipeline;
+class GrNonInstancedVertices;
+
+#ifdef SK_DEVELOPER
+#define PROGRAM_CACHE_STATS
+#endif
+
+class GrGLGpu : public GrGpu {
+public:
+    static GrGpu* Create(GrBackendContext backendContext, const GrContextOptions& options,
+                         GrContext* context);
+    ~GrGLGpu() override;
+
+    void contextAbandoned() override;
+
+    const GrGLContext& glContext() const { return *fGLContext; }
+
+    const GrGLInterface* glInterface() const { return fGLContext->interface(); }
+    const GrGLContextInfo& ctxInfo() const { return *fGLContext; }
+    GrGLStandard glStandard() const { return fGLContext->standard(); }
+    GrGLVersion glVersion() const { return fGLContext->version(); }
+    GrGLSLGeneration glslGeneration() const { return fGLContext->glslGeneration(); }
+    const GrGLCaps& glCaps() const { return *fGLContext->caps(); }
+
+    GrGLPathRendering* glPathRendering() {
+        SkASSERT(glCaps().shaderCaps()->pathRenderingSupport());
+        return static_cast<GrGLPathRendering*>(pathRendering());
+    }
+
+    void discard(GrRenderTarget*) override;
+
+    // Used by GrGLProgram to configure OpenGL state.
+    void bindTexture(int unitIdx, const GrTextureParams& params, GrGLTexture* texture);
+
+    bool onGetReadPixelsInfo(GrSurface* srcSurface, int readWidth, int readHeight, size_t rowBytes,
+                             GrPixelConfig readConfig, DrawPreference*,
+                             ReadPixelTempDrawInfo*) override;
+
+    bool onGetWritePixelsInfo(GrSurface* dstSurface, int width, int height,
+                              size_t rowBytes, GrPixelConfig srcConfig, DrawPreference*,
+                              WritePixelTempDrawInfo*) override;
+
+    bool initCopySurfaceDstDesc(const GrSurface* src, GrSurfaceDesc* desc) const override;
+
+    // These functions should be used to bind GL objects. They track the GL state and skip redundant
+    // bindings. Making the equivalent glBind calls directly will confuse the state tracking.
+    void bindVertexArray(GrGLuint id) {
+        fHWGeometryState.setVertexArrayID(this, id);
+    }
+    void bindIndexBufferAndDefaultVertexArray(GrGLuint id) {
+        fHWGeometryState.setIndexBufferIDOnDefaultVertexArray(this, id);
+    }
+    void bindVertexBuffer(GrGLuint id) {
+        fHWGeometryState.setVertexBufferID(this, id);
+    }
+
+    // These callbacks update state tracking when GL objects are deleted. They are called from
+    // GrGLResource onRelease functions.
+    void notifyVertexArrayDelete(GrGLuint id) {
+        fHWGeometryState.notifyVertexArrayDelete(id);
+    }
+    void notifyVertexBufferDelete(GrGLuint id) {
+        fHWGeometryState.notifyVertexBufferDelete(id);
+    }
+    void notifyIndexBufferDelete(GrGLuint id) {
+        fHWGeometryState.notifyIndexBufferDelete(id);
+    }
+
+    void buildProgramDesc(GrProgramDesc*,
+                          const GrPrimitiveProcessor&,
+                          const GrPipeline&) const override;
+
+    // id and type (GL_ARRAY_BUFFER or GL_ELEMENT_ARRAY_BUFFER) of buffer to bind
+    void bindBuffer(GrGLuint id, GrGLenum type);
+
+    void releaseBuffer(GrGLuint id, GrGLenum type);
+
+    // sizes are in bytes
+    void* mapBuffer(GrGLuint id, GrGLenum type, bool dynamic, size_t currentSize,
+                    size_t requestedSize);
+
+    void unmapBuffer(GrGLuint id, GrGLenum type, void* mapPtr);
+
+    void bufferData(GrGLuint id, GrGLenum type, bool dynamic, size_t currentSize,
+                    const void* src, size_t srcSizeInBytes);
+
+    const GrGLContext* glContextForTesting() const override {
+        return &this->glContext();
+    }
+
+    void clearStencil(GrRenderTarget*) override;
+
+    void invalidateBoundRenderTarget() {
+        fHWBoundRenderTargetUniqueID = SK_InvalidUniqueID;
+    }
+
+    GrStencilAttachment* createStencilAttachmentForRenderTarget(const GrRenderTarget* rt,
+                                                                int width,
+                                                                int height) override;
+
+    GrBackendObject createTestingOnlyBackendTexture(void* pixels, int w, int h,
+                                                    GrPixelConfig config) const override;
+    bool isTestingOnlyBackendTexture(GrBackendObject) const override;
+    void deleteTestingOnlyBackendTexture(GrBackendObject, bool abandonTexture) const override;
+
+    void resetShaderCacheForTesting() const override;
+
+private:
+    GrGLGpu(GrGLContext* ctx, GrContext* context);
+
+    // GrGpu overrides
+    void onResetContext(uint32_t resetBits) override;
+
+    void xferBarrier(GrRenderTarget*, GrXferBarrierType) override;
+
+    GrTexture* onCreateTexture(const GrSurfaceDesc& desc, GrGpuResource::LifeCycle lifeCycle,
+                               const void* srcData, size_t rowBytes) override;
+    GrTexture* onCreateCompressedTexture(const GrSurfaceDesc& desc,
+                                         GrGpuResource::LifeCycle lifeCycle,
+                                         const void* srcData) override;
+    GrVertexBuffer* onCreateVertexBuffer(size_t size, bool dynamic) override;
+    GrIndexBuffer* onCreateIndexBuffer(size_t size, bool dynamic) override;
+    GrTexture* onWrapBackendTexture(const GrBackendTextureDesc&, GrWrapOwnership) override;
+    GrRenderTarget* onWrapBackendRenderTarget(const GrBackendRenderTargetDesc&,
+                                              GrWrapOwnership) override;
+    // Given a GrPixelConfig return the index into the stencil format array on GrGLCaps to a
+    // compatible stencil format.
+    int getCompatibleStencilIndex(GrPixelConfig config);
+
+    void onClear(GrRenderTarget*, const SkIRect& rect, GrColor color) override;
+
+    void onClearStencilClip(GrRenderTarget*, const SkIRect& rect, bool insideClip) override;
+
+    bool onReadPixels(GrSurface*,
+                      int left, int top,
+                      int width, int height,
+                      GrPixelConfig,
+                      void* buffer,
+                      size_t rowBytes) override;
+
+    bool onWritePixels(GrSurface*,
+                       int left, int top, int width, int height,
+                       GrPixelConfig config, const void* buffer,
+                       size_t rowBytes) override;
+
+    void onResolveRenderTarget(GrRenderTarget* target) override;
+
+    void onDraw(const DrawArgs&, const GrNonInstancedVertices&) override;
+
+    bool onCopySurface(GrSurface* dst,
+                       GrSurface* src,
+                       const SkIRect& srcRect,
+                       const SkIPoint& dstPoint) override;
+
+    // binds texture unit in GL
+    void setTextureUnit(int unitIdx);
+
+    // Flushes state from GrPipeline to GL. Returns false if the state couldn't be set.
+    bool flushGLState(const DrawArgs&);
+
+    // Sets up vertex attribute pointers and strides. On return indexOffsetInBytes gives the offset
+    // an into the index buffer. It does not account for vertices.startIndex() but rather the start
+    // index is relative to the returned offset.
+    void setupGeometry(const GrPrimitiveProcessor&,
+                       const GrNonInstancedVertices& vertices,
+                       size_t* indexOffsetInBytes);
+
+    // Subclasses should call this to flush the blend state.
+    void flushBlend(const GrXferProcessor::BlendInfo& blendInfo);
+
+    bool hasExtension(const char* ext) const { return fGLContext->hasExtension(ext); }
+
+    void copySurfaceAsDraw(GrSurface* dst,
+                           GrSurface* src,
+                           const SkIRect& srcRect,
+                           const SkIPoint& dstPoint);
+    void copySurfaceAsCopyTexSubImage(GrSurface* dst,
+                                      GrSurface* src,
+                                      const SkIRect& srcRect,
+                                      const SkIPoint& dstPoint);
+    bool copySurfaceAsBlitFramebuffer(GrSurface* dst,
+                                      GrSurface* src,
+                                      const SkIRect& srcRect,
+                                      const SkIPoint& dstPoint);
+
+    static bool BlendCoeffReferencesConstant(GrBlendCoeff coeff);
+
+    class ProgramCache : public ::SkNoncopyable {
+    public:
+        ProgramCache(GrGLGpu* gpu);
+        ~ProgramCache();
+
+        void reset();
+        void abandon();
+        GrGLProgram* refProgram(const DrawArgs&);
+
+    private:
+        enum {
+            // We may actually have kMaxEntries+1 shaders in the GL context because we create a new
+            // shader before evicting from the cache.
+            kMaxEntries = 128,
+            kHashBits = 6,
+        };
+
+        struct Entry;
+
+        struct ProgDescLess;
+
+        // binary search for entry matching desc. returns index into fEntries that matches desc or ~
+        // of the index of where it should be inserted.
+        int search(const GrProgramDesc& desc) const;
+
+        // sorted array of all the entries
+        Entry*                      fEntries[kMaxEntries];
+        // hash table based on lowest kHashBits bits of the program key. Used to avoid binary
+        // searching fEntries.
+        Entry*                      fHashTable[1 << kHashBits];
+
+        int                         fCount;
+        unsigned int                fCurrLRUStamp;
+        GrGLGpu*                    fGpu;
+#ifdef PROGRAM_CACHE_STATS
+        int                         fTotalRequests;
+        int                         fCacheMisses;
+        int                         fHashMisses; // cache hit but hash table missed
+#endif
+    };
+
+    void flushColorWrite(bool writeColor);
+    void flushDrawFace(GrPipelineBuilder::DrawFace face);
+
+    // flushes the scissor. see the note on flushBoundTextureAndParams about
+    // flushing the scissor after that function is called.
+    void flushScissor(const GrScissorState&,
+                      const GrGLIRect& rtViewport,
+                      GrSurfaceOrigin rtOrigin);
+
+    // disables the scissor
+    void disableScissor();
+
+    void initFSAASupport();
+
+    // determines valid stencil formats
+    void initStencilFormats();
+
+    // sets a texture unit to use for texture operations other than binding a texture to a program.
+    // ensures that such operations don't negatively interact with tracking bound textures.
+    void setScratchTextureUnit();
+
+    // bounds is region that may be modified and therefore has to be resolved.
+    // nullptr means whole target. Can be an empty rect.
+    void flushRenderTarget(GrGLRenderTarget*, const SkIRect* bounds);
+
+    void flushStencil(const GrStencilSettings&);
+    void flushHWAAState(GrRenderTarget* rt, bool useHWAA);
+
+    bool configToGLFormats(GrPixelConfig config,
+                           bool getSizedInternal,
+                           GrGLenum* internalFormat,
+                           GrGLenum* externalFormat,
+                           GrGLenum* externalType) const;
+    // helper for onCreateTexture and writeTexturePixels
+    bool uploadTexData(const GrSurfaceDesc& desc,
+                       GrGLenum target,
+                       bool isNewTexture,
+                       int left, int top, int width, int height,
+                       GrPixelConfig dataConfig,
+                       const void* data,
+                       size_t rowBytes);
+
+    // helper for onCreateCompressedTexture. If width and height are
+    // set to -1, then this function will use desc.fWidth and desc.fHeight
+    // for the size of the data. The isNewTexture flag should be set to true
+    // whenever a new texture needs to be created. Otherwise, we assume that
+    // the texture is already in GPU memory and that it's going to be updated
+    // with new data.
+    bool uploadCompressedTexData(const GrSurfaceDesc& desc,
+                                 GrGLenum target,
+                                 const void* data,
+                                 bool isNewTexture = true,
+                                 int left = 0, int top = 0,
+                                 int width = -1, int height = -1);
+
+    bool createRenderTargetObjects(const GrSurfaceDesc&, GrGpuResource::LifeCycle lifeCycle,
+                                   const GrGLTextureInfo& texInfo, GrGLRenderTarget::IDDesc*);
+
+    enum TempFBOTarget {
+        kSrc_TempFBOTarget,
+        kDst_TempFBOTarget
+    };
+
+    // Binds a surface as a FBO for a copy operation. If the surface already owns an FBO ID then
+    // that ID is bound. If not the surface is temporarily bound to a FBO and that FBO is bound.
+    // This must be paired with a call to unbindSurfaceFBOForCopy().
+    void bindSurfaceFBOForCopy(GrSurface* surface, GrGLenum fboTarget, GrGLIRect* viewport,
+                              TempFBOTarget tempFBOTarget);
+
+    // Must be called if bindSurfaceFBOForCopy was used to bind a surface for copying.
+    void unbindTextureFBOForCopy(GrGLenum fboTarget, GrSurface* surface);
+
+    SkAutoTUnref<GrGLContext>  fGLContext;
+
+    void createCopyPrograms();
+
+    // GL program-related state
+    ProgramCache*               fProgramCache;
+
+    ///////////////////////////////////////////////////////////////////////////
+    ///@name Caching of GL State
+    ///@{
+    int                         fHWActiveTextureUnitIdx;
+    GrGLuint                    fHWProgramID;
+
+    enum TriState {
+        kNo_TriState,
+        kYes_TriState,
+        kUnknown_TriState
+    };
+
+    GrGLuint                    fTempSrcFBOID;
+    GrGLuint                    fTempDstFBOID;
+
+    GrGLuint                    fStencilClearFBOID;
+
+    // last scissor / viewport scissor state seen by the GL.
+    struct {
+        TriState    fEnabled;
+        GrGLIRect   fRect;
+        void invalidate() {
+            fEnabled = kUnknown_TriState;
+            fRect.invalidate();
+        }
+    } fHWScissorSettings;
+
+    GrGLIRect                   fHWViewport;
+
+    /**
+     * Tracks bound vertex and index buffers and vertex attrib array state.
+     */
+    class HWGeometryState {
+    public:
+        HWGeometryState() { fVBOVertexArray = nullptr; this->invalidate(); }
+
+        ~HWGeometryState() { delete fVBOVertexArray; }
+
+        void invalidate() {
+            fBoundVertexArrayIDIsValid = false;
+            fBoundVertexBufferIDIsValid = false;
+            fDefaultVertexArrayBoundIndexBufferID = false;
+            fDefaultVertexArrayBoundIndexBufferIDIsValid = false;
+            fDefaultVertexArrayAttribState.invalidate();
+            if (fVBOVertexArray) {
+                fVBOVertexArray->invalidateCachedState();
+            }
+        }
+
+        void notifyVertexArrayDelete(GrGLuint id) {
+            if (fBoundVertexArrayIDIsValid && fBoundVertexArrayID == id) {
+                // Does implicit bind to 0
+                fBoundVertexArrayID = 0;
+            }
+        }
+
+        void setVertexArrayID(GrGLGpu* gpu, GrGLuint arrayID) {
+            if (!gpu->glCaps().vertexArrayObjectSupport()) {
+                SkASSERT(0 == arrayID);
+                return;
+            }
+            if (!fBoundVertexArrayIDIsValid || arrayID != fBoundVertexArrayID) {
+                GR_GL_CALL(gpu->glInterface(), BindVertexArray(arrayID));
+                fBoundVertexArrayIDIsValid = true;
+                fBoundVertexArrayID = arrayID;
+            }
+        }
+
+        void notifyVertexBufferDelete(GrGLuint id) {
+            if (fBoundVertexBufferIDIsValid && id == fBoundVertexBufferID) {
+                fBoundVertexBufferID = 0;
+            }
+            if (fVBOVertexArray) {
+                fVBOVertexArray->notifyVertexBufferDelete(id);
+            }
+            fDefaultVertexArrayAttribState.notifyVertexBufferDelete(id);
+        }
+
+        void notifyIndexBufferDelete(GrGLuint id) {
+            if (fDefaultVertexArrayBoundIndexBufferIDIsValid &&
+                id == fDefaultVertexArrayBoundIndexBufferID) {
+                fDefaultVertexArrayBoundIndexBufferID = 0;
+            }
+            if (fVBOVertexArray) {
+                fVBOVertexArray->notifyIndexBufferDelete(id);
+            }
+        }
+
+        void setVertexBufferID(GrGLGpu* gpu, GrGLuint id) {
+            if (!fBoundVertexBufferIDIsValid || id != fBoundVertexBufferID) {
+                GR_GL_CALL(gpu->glInterface(), BindBuffer(GR_GL_ARRAY_BUFFER, id));
+                fBoundVertexBufferIDIsValid = true;
+                fBoundVertexBufferID = id;
+            }
+        }
+
+        /**
+         * Binds the default vertex array and binds the index buffer. This is used when binding
+         * an index buffer in order to update it.
+         */
+        void setIndexBufferIDOnDefaultVertexArray(GrGLGpu* gpu, GrGLuint id) {
+            this->setVertexArrayID(gpu, 0);
+            if (!fDefaultVertexArrayBoundIndexBufferIDIsValid ||
+                id != fDefaultVertexArrayBoundIndexBufferID) {
+                GR_GL_CALL(gpu->glInterface(), BindBuffer(GR_GL_ELEMENT_ARRAY_BUFFER, id));
+                fDefaultVertexArrayBoundIndexBufferIDIsValid = true;
+                fDefaultVertexArrayBoundIndexBufferID = id;
+            }
+        }
+
+        /**
+         * Binds the vertex array object that should be used to render from the vertex buffer.
+         * The vertex array is bound and its attrib array state object is returned. The vertex
+         * buffer is bound. The index buffer (if non-nullptr) is bound to the vertex array. The
+         * returned GrGLAttribArrayState should be used to set vertex attribute arrays.
+         */
+        GrGLAttribArrayState* bindArrayAndBuffersToDraw(GrGLGpu* gpu,
+                                                        const GrGLVertexBuffer* vbuffer,
+                                                        const GrGLIndexBuffer* ibuffer);
+
+        /** Variants of the above that takes GL buffer IDs. Note that 0 does not imply that a 
+            buffer won't be bound. The "default buffer" will be bound, which is used for client-side
+            array rendering. */
+        GrGLAttribArrayState* bindArrayAndBufferToDraw(GrGLGpu* gpu, GrGLuint vbufferID);
+        GrGLAttribArrayState* bindArrayAndBuffersToDraw(GrGLGpu* gpu,
+                                                        GrGLuint vbufferID,
+                                                        GrGLuint ibufferID);
+
+    private:
+        GrGLAttribArrayState* internalBind(GrGLGpu* gpu, GrGLuint vbufferID, GrGLuint* ibufferID);
+
+        GrGLuint                fBoundVertexArrayID;
+        GrGLuint                fBoundVertexBufferID;
+        bool                    fBoundVertexArrayIDIsValid;
+        bool                    fBoundVertexBufferIDIsValid;
+
+        GrGLuint                fDefaultVertexArrayBoundIndexBufferID;
+        bool                    fDefaultVertexArrayBoundIndexBufferIDIsValid;
+        // We return a non-const pointer to this from bindArrayAndBuffersToDraw when vertex array 0
+        // is bound. However, this class is internal to GrGLGpu and this object never leaks out of
+        // GrGLGpu.
+        GrGLAttribArrayState    fDefaultVertexArrayAttribState;
+
+        // This is used when we're using a core profile and the vertices are in a VBO.
+        GrGLVertexArray*        fVBOVertexArray;
+    } fHWGeometryState;
+
+    struct {
+        GrBlendEquation fEquation;
+        GrBlendCoeff    fSrcCoeff;
+        GrBlendCoeff    fDstCoeff;
+        GrColor         fConstColor;
+        bool            fConstColorValid;
+        TriState        fEnabled;
+
+        void invalidate() {
+            fEquation = static_cast<GrBlendEquation>(-1);
+            fSrcCoeff = static_cast<GrBlendCoeff>(-1);
+            fDstCoeff = static_cast<GrBlendCoeff>(-1);
+            fConstColorValid = false;
+            fEnabled = kUnknown_TriState;
+        }
+    } fHWBlendState;
+
+    /** IDs for copy surface program. */
+    struct {
+        GrGLuint    fProgram;
+        GrGLint     fTextureUniform;
+        GrGLint     fTexCoordXformUniform;
+        GrGLint     fPosXformUniform;
+    }                           fCopyPrograms[2];
+    GrGLuint                    fCopyProgramArrayBuffer;
+
+    static int TextureTargetToCopyProgramIdx(GrGLenum target) {
+        if (target == GR_GL_TEXTURE_2D) {
+            return 0;
+        } else {
+            SkASSERT(target == GR_GL_TEXTURE_EXTERNAL);
+            return 1;
+        }
+    }
+
+    TriState fMSAAEnabled;
+
+    GrStencilSettings           fHWStencilSettings;
+    TriState                    fHWStencilTestEnabled;
+
+
+    GrPipelineBuilder::DrawFace fHWDrawFace;
+    TriState                    fHWWriteToColor;
+    uint32_t                    fHWBoundRenderTargetUniqueID;
+    TriState                    fHWSRGBFramebuffer;
+    SkTArray<uint32_t, true>    fHWBoundTextureUniqueIDs;
+
+    ///@}
+
+    // Mapping of pixel configs to known supported stencil formats to be used
+    // when adding a stencil buffer to a framebuffer.
+    int fPixelConfigToStencilIndex[kGrPixelConfigCnt];
+
+    typedef GrGpu INHERITED;
+    friend class GrGLPathRendering; // For accessing setTextureUnit.
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLGpuProgramCache.cpp b/gfx/skia/skia/src/gpu/gl/GrGLGpuProgramCache.cpp
new file mode 100644
index 000000000000..df8cf60c7b3c
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/GrGLGpuProgramCache.cpp
@@ -0,0 +1,215 @@
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrGLGpu.h"
+
+#include "builders/GrGLProgramBuilder.h"
+#include "GrProcessor.h"
+#include "GrGLPathRendering.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+#include "SkRTConf.h"
+#include "SkTSearch.h"
+
+#ifdef PROGRAM_CACHE_STATS
+SK_CONF_DECLARE(bool, c_DisplayCache, "gpu.displayCache", false,
+                "Display program cache usage.");
+#endif
+
+typedef GrGLSLProgramDataManager::UniformHandle UniformHandle;
+
+struct GrGLGpu::ProgramCache::Entry {
+    
+    Entry() : fProgram(nullptr), fLRUStamp(0) {}
+
+    SkAutoTUnref<GrGLProgram>   fProgram;
+    unsigned int                fLRUStamp;
+};
+
+struct GrGLGpu::ProgramCache::ProgDescLess {
+    bool operator() (const GrProgramDesc& desc, const Entry* entry) {
+        SkASSERT(entry->fProgram.get());
+        return GrProgramDesc::Less(desc, entry->fProgram->getDesc());
+    }
+
+    bool operator() (const Entry* entry, const GrProgramDesc& desc) {
+        SkASSERT(entry->fProgram.get());
+        return GrProgramDesc::Less(entry->fProgram->getDesc(), desc);
+    }
+};
+
+GrGLGpu::ProgramCache::ProgramCache(GrGLGpu* gpu)
+    : fCount(0)
+    , fCurrLRUStamp(0)
+    , fGpu(gpu)
+#ifdef PROGRAM_CACHE_STATS
+    , fTotalRequests(0)
+    , fCacheMisses(0)
+    , fHashMisses(0)
+#endif
+{
+    for (int i = 0; i < 1 << kHashBits; ++i) {
+        fHashTable[i] = nullptr;
+    }
+}
+
+GrGLGpu::ProgramCache::~ProgramCache() {
+    for (int i = 0; i < fCount; ++i){
+        delete fEntries[i];
+    }
+    // dump stats
+#ifdef PROGRAM_CACHE_STATS
+    if (c_DisplayCache) {
+        SkDebugf("--- Program Cache ---\n");
+        SkDebugf("Total requests: %d\n", fTotalRequests);
+        SkDebugf("Cache misses: %d\n", fCacheMisses);
+        SkDebugf("Cache miss %%: %f\n", (fTotalRequests > 0) ?
+                                            100.f * fCacheMisses / fTotalRequests :
+                                            0.f);
+        int cacheHits = fTotalRequests - fCacheMisses;
+        SkDebugf("Hash miss %%: %f\n", (cacheHits > 0) ? 100.f * fHashMisses / cacheHits : 0.f);
+        SkDebugf("---------------------\n");
+    }
+#endif
+}
+
+void GrGLGpu::ProgramCache::reset() {
+    for (int i = 0; i < fCount; ++i) {
+        SkASSERT(fEntries[i]->fProgram.get());
+        fEntries[i]->fProgram->abandon();
+        delete fEntries[i];
+        fEntries[i] = nullptr;
+    }
+    fCount = 0;
+
+    // zero out hash table
+    for (int i = 0; i < 1 << kHashBits; i++) {
+        fHashTable[i] = nullptr;
+    }
+
+    fCurrLRUStamp = 0;
+#ifdef PROGRAM_CACHE_STATS
+    fTotalRequests = 0;
+    fCacheMisses = 0;
+    fHashMisses = 0;
+#endif
+}
+
+void GrGLGpu::ProgramCache::abandon() {
+    this->reset();
+}
+
+int GrGLGpu::ProgramCache::search(const GrProgramDesc& desc) const {
+    ProgDescLess less;
+    return SkTSearch(fEntries, fCount, desc, sizeof(Entry*), less);
+}
+
+GrGLProgram* GrGLGpu::ProgramCache::refProgram(const DrawArgs& args) {
+#ifdef PROGRAM_CACHE_STATS
+    ++fTotalRequests;
+#endif
+
+    Entry* entry = nullptr;
+
+    uint32_t hashIdx = args.fDesc->getChecksum();
+    hashIdx ^= hashIdx >> 16;
+    if (kHashBits <= 8) {
+        hashIdx ^= hashIdx >> 8;
+    }
+    hashIdx &=((1 << kHashBits) - 1);
+    Entry* hashedEntry = fHashTable[hashIdx];
+    if (hashedEntry && hashedEntry->fProgram->getDesc() == *args.fDesc) {
+        SkASSERT(hashedEntry->fProgram);
+        entry = hashedEntry;
+    }
+
+    int entryIdx;
+    if (nullptr == entry) {
+        entryIdx = this->search(*args.fDesc);
+        if (entryIdx >= 0) {
+            entry = fEntries[entryIdx];
+#ifdef PROGRAM_CACHE_STATS
+            ++fHashMisses;
+#endif
+        }
+    }
+
+    if (nullptr == entry) {
+        // We have a cache miss
+#ifdef PROGRAM_CACHE_STATS
+        ++fCacheMisses;
+#endif
+        GrGLProgram* program = GrGLProgramBuilder::CreateProgram(args, fGpu);
+        if (nullptr == program) {
+            return nullptr;
+        }
+        int purgeIdx = 0;
+        if (fCount < kMaxEntries) {
+            entry = new Entry;
+            purgeIdx = fCount++;
+            fEntries[purgeIdx] = entry;
+        } else {
+            SkASSERT(fCount == kMaxEntries);
+            purgeIdx = 0;
+            for (int i = 1; i < kMaxEntries; ++i) {
+                if (fEntries[i]->fLRUStamp < fEntries[purgeIdx]->fLRUStamp) {
+                    purgeIdx = i;
+                }
+            }
+            entry = fEntries[purgeIdx];
+            int purgedHashIdx = entry->fProgram->getDesc().getChecksum() & ((1 << kHashBits) - 1);
+            if (fHashTable[purgedHashIdx] == entry) {
+                fHashTable[purgedHashIdx] = nullptr;
+            }
+        }
+        SkASSERT(fEntries[purgeIdx] == entry);
+        entry->fProgram.reset(program);
+        // We need to shift fEntries around so that the entry currently at purgeIdx is placed
+        // just before the entry at ~entryIdx (in order to keep fEntries sorted by descriptor).
+        entryIdx = ~entryIdx;
+        if (entryIdx < purgeIdx) {
+            //  Let E and P be the entries at index entryIdx and purgeIdx, respectively.
+            //  If the entries array looks like this:
+            //       aaaaEbbbbbPccccc
+            //  we rearrange it to look like this:
+            //       aaaaPEbbbbbccccc
+            size_t copySize = (purgeIdx - entryIdx) * sizeof(Entry*);
+            memmove(fEntries + entryIdx + 1, fEntries + entryIdx, copySize);
+            fEntries[entryIdx] = entry;
+        } else if (purgeIdx < entryIdx) {
+            //  If the entries array looks like this:
+            //       aaaaPbbbbbEccccc
+            //  we rearrange it to look like this:
+            //       aaaabbbbbPEccccc
+            size_t copySize = (entryIdx - purgeIdx - 1) * sizeof(Entry*);
+            memmove(fEntries + purgeIdx, fEntries + purgeIdx + 1, copySize);
+            fEntries[entryIdx - 1] = entry;
+        }
+#ifdef SK_DEBUG
+        SkASSERT(fEntries[0]->fProgram.get());
+        for (int i = 0; i < fCount - 1; ++i) {
+            SkASSERT(fEntries[i + 1]->fProgram.get());
+            const GrProgramDesc& a = fEntries[i]->fProgram->getDesc();
+            const GrProgramDesc& b = fEntries[i + 1]->fProgram->getDesc();
+            SkASSERT(GrProgramDesc::Less(a, b));
+            SkASSERT(!GrProgramDesc::Less(b, a));
+        }
+#endif
+    }
+
+    fHashTable[hashIdx] = entry;
+    entry->fLRUStamp = fCurrLRUStamp;
+
+    if (SK_MaxU32 == fCurrLRUStamp) {
+        // wrap around! just trash our LRU, one time hit.
+        for (int i = 0; i < fCount; ++i) {
+            fEntries[i]->fLRUStamp = 0;
+        }
+    }
+    ++fCurrLRUStamp;
+    return SkRef(entry->fProgram.get());
+}
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLIndexBuffer.cpp b/gfx/skia/skia/src/gpu/gl/GrGLIndexBuffer.cpp
index a137348ef75e..230d9a46933a 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLIndexBuffer.cpp
+++ b/gfx/skia/skia/src/gpu/gl/GrGLIndexBuffer.cpp
@@ -6,11 +6,13 @@
  */
 
 #include "GrGLIndexBuffer.h"
-#include "GrGpuGL.h"
+#include "GrGLGpu.h"
+#include "SkTraceMemoryDump.h"
 
-GrGLIndexBuffer::GrGLIndexBuffer(GrGpuGL* gpu, const Desc& desc)
-    : INHERITED(gpu, desc.fIsWrapped, desc.fSizeInBytes, desc.fDynamic, 0 == desc.fID)
+GrGLIndexBuffer::GrGLIndexBuffer(GrGLGpu* gpu, const Desc& desc)
+    : INHERITED(gpu, desc.fSizeInBytes, desc.fDynamic, 0 == desc.fID)
     , fImpl(gpu, desc, GR_GL_ELEMENT_ARRAY_BUFFER) {
+    this->registerWithCache();
 }
 
 void GrGLIndexBuffer::onRelease() {
@@ -30,7 +32,7 @@ void* GrGLIndexBuffer::onMap() {
     if (!this->wasDestroyed()) {
         return fImpl.map(this->getGpuGL());
     } else {
-        return NULL;
+        return nullptr;
     }
 }
 
@@ -47,3 +49,11 @@ bool GrGLIndexBuffer::onUpdateData(const void* src, size_t srcSizeInBytes) {
         return false;
     }
 }
+
+void GrGLIndexBuffer::setMemoryBacking(SkTraceMemoryDump* traceMemoryDump,
+                                       const SkString& dumpName) const {
+    SkString buffer_id;
+    buffer_id.appendU32(this->bufferID());
+    traceMemoryDump->setMemoryBacking(dumpName.c_str(), "gl_buffer",
+                                      buffer_id.c_str());
+}
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLIndexBuffer.h b/gfx/skia/skia/src/gpu/gl/GrGLIndexBuffer.h
index 5d5de43eee4c..628970a0fa4d 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLIndexBuffer.h
+++ b/gfx/skia/skia/src/gpu/gl/GrGLIndexBuffer.h
@@ -12,37 +12,32 @@
 #include "GrGLBufferImpl.h"
 #include "gl/GrGLInterface.h"
 
-class GrGpuGL;
+class GrGLGpu;
 
 class GrGLIndexBuffer : public GrIndexBuffer {
 
 public:
     typedef GrGLBufferImpl::Desc Desc;
 
-    GrGLIndexBuffer(GrGpuGL* gpu, const Desc& desc);
-    virtual ~GrGLIndexBuffer() { this->release(); }
+    GrGLIndexBuffer(GrGLGpu* gpu, const Desc& desc);
 
     GrGLuint bufferID() const { return fImpl.bufferID(); }
     size_t baseOffset() const { return fImpl.baseOffset(); }
 
-    void bind() const {
-        if (!this->wasDestroyed()) {
-            fImpl.bind(this->getGpuGL());
-        }
-    }
-
 protected:
-    virtual void onAbandon() SK_OVERRIDE;
-    virtual void onRelease() SK_OVERRIDE;
+    void onAbandon() override;
+    void onRelease() override;
+    void setMemoryBacking(SkTraceMemoryDump* traceMemoryDump,
+                          const SkString& dumpName) const override;
 
 private:
-    virtual void* onMap() SK_OVERRIDE;
-    virtual void onUnmap() SK_OVERRIDE;
-    virtual bool onUpdateData(const void* src, size_t srcSizeInBytes) SK_OVERRIDE;
+    void* onMap() override;
+    void onUnmap() override;
+    bool onUpdateData(const void* src, size_t srcSizeInBytes) override;
 
-    GrGpuGL* getGpuGL() const {
+    GrGLGpu* getGpuGL() const {
         SkASSERT(!this->wasDestroyed());
-        return (GrGpuGL*)(this->getGpu());
+        return (GrGLGpu*)(this->getGpu());
     }
 
     GrGLBufferImpl fImpl;
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLInterface.cpp b/gfx/skia/skia/src/gpu/gl/GrGLInterface.cpp
index 823b73efa38a..da3c656c18c3 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLInterface.cpp
+++ b/gfx/skia/skia/src/gpu/gl/GrGLInterface.cpp
@@ -39,24 +39,27 @@ const GrGLInterface* GrGLInterfaceRemoveNVPR(const GrGLInterface* interface) {
     GrGLInterface* newInterface = GrGLInterface::NewClone(interface);
 
     newInterface->fExtensions.remove("GL_NV_path_rendering");
-    newInterface->fFunctions.fPathCommands = NULL;
-    newInterface->fFunctions.fPathCoords = NULL;
-    newInterface->fFunctions.fPathParameteri = NULL;
-    newInterface->fFunctions.fPathParameterf = NULL;
-    newInterface->fFunctions.fGenPaths = NULL;
-    newInterface->fFunctions.fDeletePaths = NULL;
-    newInterface->fFunctions.fIsPath = NULL;
-    newInterface->fFunctions.fPathStencilFunc = NULL;
-    newInterface->fFunctions.fStencilFillPath = NULL;
-    newInterface->fFunctions.fStencilStrokePath = NULL;
-    newInterface->fFunctions.fStencilFillPathInstanced = NULL;
-    newInterface->fFunctions.fStencilStrokePathInstanced = NULL;
-    newInterface->fFunctions.fPathTexGen = NULL;
-    newInterface->fFunctions.fCoverFillPath = NULL;
-    newInterface->fFunctions.fCoverStrokePath = NULL;
-    newInterface->fFunctions.fCoverFillPathInstanced = NULL;
-    newInterface->fFunctions.fCoverStrokePathInstanced = NULL;
-    newInterface->fFunctions.fProgramPathFragmentInputGen = NULL;
+    newInterface->fFunctions.fPathCommands = nullptr;
+    newInterface->fFunctions.fPathParameteri = nullptr;
+    newInterface->fFunctions.fPathParameterf = nullptr;
+    newInterface->fFunctions.fGenPaths = nullptr;
+    newInterface->fFunctions.fDeletePaths = nullptr;
+    newInterface->fFunctions.fIsPath = nullptr;
+    newInterface->fFunctions.fPathStencilFunc = nullptr;
+    newInterface->fFunctions.fStencilFillPath = nullptr;
+    newInterface->fFunctions.fStencilStrokePath = nullptr;
+    newInterface->fFunctions.fStencilFillPathInstanced = nullptr;
+    newInterface->fFunctions.fStencilStrokePathInstanced = nullptr;
+    newInterface->fFunctions.fCoverFillPath = nullptr;
+    newInterface->fFunctions.fCoverStrokePath = nullptr;
+    newInterface->fFunctions.fCoverFillPathInstanced = nullptr;
+    newInterface->fFunctions.fCoverStrokePathInstanced = nullptr;
+    newInterface->fFunctions.fStencilThenCoverFillPath = nullptr;
+    newInterface->fFunctions.fStencilThenCoverStrokePath = nullptr;
+    newInterface->fFunctions.fStencilThenCoverFillPathInstanced = nullptr;
+    newInterface->fFunctions.fStencilThenCoverStrokePathInstanced = nullptr;
+    newInterface->fFunctions.fProgramPathFragmentInputGen = nullptr;
+    newInterface->fFunctions.fBindFragmentInputLocation = nullptr;
     return newInterface;
 }
 
@@ -70,9 +73,9 @@ GrGLInterface::GrGLInterface() {
 }
 
 GrGLInterface* GrGLInterface::NewClone(const GrGLInterface* interface) {
-    SkASSERT(NULL != interface);
+    SkASSERT(interface);
 
-    GrGLInterface* clone = SkNEW(GrGLInterface);
+    GrGLInterface* clone = new GrGLInterface;
     clone->fStandard = interface->fStandard;
     clone->fExtensions = interface->fExtensions;
     clone->fFunctions = interface->fFunctions;
@@ -104,98 +107,105 @@ bool GrGLInterface::validate() const {
     }
 
     // functions that are always required
-    if (NULL == fFunctions.fActiveTexture ||
-        NULL == fFunctions.fAttachShader ||
-        NULL == fFunctions.fBindAttribLocation ||
-        NULL == fFunctions.fBindBuffer ||
-        NULL == fFunctions.fBindTexture ||
-        NULL == fFunctions.fBlendFunc ||
-        NULL == fFunctions.fBlendColor ||      // -> GL >= 1.4, ES >= 2.0 or extension
-        NULL == fFunctions.fBufferData ||
-        NULL == fFunctions.fBufferSubData ||
-        NULL == fFunctions.fClear ||
-        NULL == fFunctions.fClearColor ||
-        NULL == fFunctions.fClearStencil ||
-        NULL == fFunctions.fColorMask ||
-        NULL == fFunctions.fCompileShader ||
-        NULL == fFunctions.fCopyTexSubImage2D ||
-        NULL == fFunctions.fCreateProgram ||
-        NULL == fFunctions.fCreateShader ||
-        NULL == fFunctions.fCullFace ||
-        NULL == fFunctions.fDeleteBuffers ||
-        NULL == fFunctions.fDeleteProgram ||
-        NULL == fFunctions.fDeleteShader ||
-        NULL == fFunctions.fDeleteTextures ||
-        NULL == fFunctions.fDepthMask ||
-        NULL == fFunctions.fDisable ||
-        NULL == fFunctions.fDisableVertexAttribArray ||
-        NULL == fFunctions.fDrawArrays ||
-        NULL == fFunctions.fDrawElements ||
-        NULL == fFunctions.fEnable ||
-        NULL == fFunctions.fEnableVertexAttribArray ||
-        NULL == fFunctions.fFrontFace ||
-        NULL == fFunctions.fGenBuffers ||
-        NULL == fFunctions.fGenTextures ||
-        NULL == fFunctions.fGetBufferParameteriv ||
-        NULL == fFunctions.fGenerateMipmap ||
-        NULL == fFunctions.fGetError ||
-        NULL == fFunctions.fGetIntegerv ||
-        NULL == fFunctions.fGetProgramInfoLog ||
-        NULL == fFunctions.fGetProgramiv ||
-        NULL == fFunctions.fGetShaderInfoLog ||
-        NULL == fFunctions.fGetShaderiv ||
-        NULL == fFunctions.fGetString ||
-        NULL == fFunctions.fGetUniformLocation ||
-        NULL == fFunctions.fLinkProgram ||
-        NULL == fFunctions.fLineWidth ||
-        NULL == fFunctions.fPixelStorei ||
-        NULL == fFunctions.fReadPixels ||
-        NULL == fFunctions.fScissor ||
-        NULL == fFunctions.fShaderSource ||
-        NULL == fFunctions.fStencilFunc ||
-        NULL == fFunctions.fStencilMask ||
-        NULL == fFunctions.fStencilOp ||
-        NULL == fFunctions.fTexImage2D ||
-        NULL == fFunctions.fTexParameteri ||
-        NULL == fFunctions.fTexParameteriv ||
-        NULL == fFunctions.fTexSubImage2D ||
-        NULL == fFunctions.fUniform1f ||
-        NULL == fFunctions.fUniform1i ||
-        NULL == fFunctions.fUniform1fv ||
-        NULL == fFunctions.fUniform1iv ||
-        NULL == fFunctions.fUniform2f ||
-        NULL == fFunctions.fUniform2i ||
-        NULL == fFunctions.fUniform2fv ||
-        NULL == fFunctions.fUniform2iv ||
-        NULL == fFunctions.fUniform3f ||
-        NULL == fFunctions.fUniform3i ||
-        NULL == fFunctions.fUniform3fv ||
-        NULL == fFunctions.fUniform3iv ||
-        NULL == fFunctions.fUniform4f ||
-        NULL == fFunctions.fUniform4i ||
-        NULL == fFunctions.fUniform4fv ||
-        NULL == fFunctions.fUniform4iv ||
-        NULL == fFunctions.fUniformMatrix2fv ||
-        NULL == fFunctions.fUniformMatrix3fv ||
-        NULL == fFunctions.fUniformMatrix4fv ||
-        NULL == fFunctions.fUseProgram ||
-        NULL == fFunctions.fVertexAttrib4fv ||
-        NULL == fFunctions.fVertexAttribPointer ||
-        NULL == fFunctions.fViewport ||
-        NULL == fFunctions.fBindFramebuffer ||
-        NULL == fFunctions.fBindRenderbuffer ||
-        NULL == fFunctions.fCheckFramebufferStatus ||
-        NULL == fFunctions.fDeleteFramebuffers ||
-        NULL == fFunctions.fDeleteRenderbuffers ||
-        NULL == fFunctions.fFinish ||
-        NULL == fFunctions.fFlush ||
-        NULL == fFunctions.fFramebufferRenderbuffer ||
-        NULL == fFunctions.fFramebufferTexture2D ||
-        NULL == fFunctions.fGetFramebufferAttachmentParameteriv ||
-        NULL == fFunctions.fGetRenderbufferParameteriv ||
-        NULL == fFunctions.fGenFramebuffers ||
-        NULL == fFunctions.fGenRenderbuffers ||
-        NULL == fFunctions.fRenderbufferStorage) {
+    if (nullptr == fFunctions.fActiveTexture ||
+        nullptr == fFunctions.fAttachShader ||
+        nullptr == fFunctions.fBindAttribLocation ||
+        nullptr == fFunctions.fBindBuffer ||
+        nullptr == fFunctions.fBindTexture ||
+        nullptr == fFunctions.fBlendColor ||      // -> GL >= 1.4 or extension, ES >= 2.0
+        nullptr == fFunctions.fBlendEquation ||   // -> GL >= 1.4 or extension, ES >= 2.0
+        nullptr == fFunctions.fBlendFunc ||
+        nullptr == fFunctions.fBufferData ||
+        nullptr == fFunctions.fBufferSubData ||
+        nullptr == fFunctions.fClear ||
+        nullptr == fFunctions.fClearColor ||
+        nullptr == fFunctions.fClearStencil ||
+        nullptr == fFunctions.fColorMask ||
+        nullptr == fFunctions.fCompileShader ||
+        nullptr == fFunctions.fCopyTexSubImage2D ||
+        nullptr == fFunctions.fCreateProgram ||
+        nullptr == fFunctions.fCreateShader ||
+        nullptr == fFunctions.fCullFace ||
+        nullptr == fFunctions.fDeleteBuffers ||
+        nullptr == fFunctions.fDeleteProgram ||
+        nullptr == fFunctions.fDeleteShader ||
+        nullptr == fFunctions.fDeleteTextures ||
+        nullptr == fFunctions.fDepthMask ||
+        nullptr == fFunctions.fDisable ||
+        nullptr == fFunctions.fDisableVertexAttribArray ||
+        nullptr == fFunctions.fDrawArrays ||
+        nullptr == fFunctions.fDrawElements ||
+        nullptr == fFunctions.fEnable ||
+        nullptr == fFunctions.fEnableVertexAttribArray ||
+        nullptr == fFunctions.fFrontFace ||
+        nullptr == fFunctions.fGenBuffers ||
+        nullptr == fFunctions.fGenTextures ||
+        nullptr == fFunctions.fGetBufferParameteriv ||
+        nullptr == fFunctions.fGenerateMipmap ||
+        nullptr == fFunctions.fGetError ||
+        nullptr == fFunctions.fGetIntegerv ||
+        nullptr == fFunctions.fGetProgramInfoLog ||
+        nullptr == fFunctions.fGetProgramiv ||
+        nullptr == fFunctions.fGetShaderInfoLog ||
+        nullptr == fFunctions.fGetShaderiv ||
+        nullptr == fFunctions.fGetString ||
+        nullptr == fFunctions.fGetUniformLocation ||
+#if 0 //  Not included in Chrome yet
+        nullptr == fFunctions.fIsTexture ||
+#endif
+        nullptr == fFunctions.fLinkProgram ||
+        nullptr == fFunctions.fLineWidth ||
+        nullptr == fFunctions.fPixelStorei ||
+        nullptr == fFunctions.fReadPixels ||
+        nullptr == fFunctions.fScissor ||
+        nullptr == fFunctions.fShaderSource ||
+        nullptr == fFunctions.fStencilFunc ||
+        nullptr == fFunctions.fStencilMask ||
+        nullptr == fFunctions.fStencilOp ||
+        nullptr == fFunctions.fTexImage2D ||
+        nullptr == fFunctions.fTexParameteri ||
+        nullptr == fFunctions.fTexParameteriv ||
+        nullptr == fFunctions.fTexSubImage2D ||
+        nullptr == fFunctions.fUniform1f ||
+        nullptr == fFunctions.fUniform1i ||
+        nullptr == fFunctions.fUniform1fv ||
+        nullptr == fFunctions.fUniform1iv ||
+        nullptr == fFunctions.fUniform2f ||
+        nullptr == fFunctions.fUniform2i ||
+        nullptr == fFunctions.fUniform2fv ||
+        nullptr == fFunctions.fUniform2iv ||
+        nullptr == fFunctions.fUniform3f ||
+        nullptr == fFunctions.fUniform3i ||
+        nullptr == fFunctions.fUniform3fv ||
+        nullptr == fFunctions.fUniform3iv ||
+        nullptr == fFunctions.fUniform4f ||
+        nullptr == fFunctions.fUniform4i ||
+        nullptr == fFunctions.fUniform4fv ||
+        nullptr == fFunctions.fUniform4iv ||
+        nullptr == fFunctions.fUniformMatrix2fv ||
+        nullptr == fFunctions.fUniformMatrix3fv ||
+        nullptr == fFunctions.fUniformMatrix4fv ||
+        nullptr == fFunctions.fUseProgram ||
+        nullptr == fFunctions.fVertexAttrib1f ||
+        nullptr == fFunctions.fVertexAttrib2fv ||
+        nullptr == fFunctions.fVertexAttrib3fv ||
+        nullptr == fFunctions.fVertexAttrib4fv ||
+        nullptr == fFunctions.fVertexAttribPointer ||
+        nullptr == fFunctions.fViewport ||
+        nullptr == fFunctions.fBindFramebuffer ||
+        nullptr == fFunctions.fBindRenderbuffer ||
+        nullptr == fFunctions.fCheckFramebufferStatus ||
+        nullptr == fFunctions.fDeleteFramebuffers ||
+        nullptr == fFunctions.fDeleteRenderbuffers ||
+        nullptr == fFunctions.fFinish ||
+        nullptr == fFunctions.fFlush ||
+        nullptr == fFunctions.fFramebufferRenderbuffer ||
+        nullptr == fFunctions.fFramebufferTexture2D ||
+        nullptr == fFunctions.fGetFramebufferAttachmentParameteriv ||
+        nullptr == fFunctions.fGetRenderbufferParameteriv ||
+        nullptr == fFunctions.fGenFramebuffers ||
+        nullptr == fFunctions.fGenRenderbuffers ||
+        nullptr == fFunctions.fRenderbufferStorage) {
         RETURN_FALSE_INTERFACE
     }
 
@@ -212,50 +222,50 @@ bool GrGLInterface::validate() const {
     // On the desktop we assume they are available if the extension
     // is present or GL version is high enough.
     if (kGLES_GrGLStandard == fStandard) {
-        if (NULL == fFunctions.fStencilFuncSeparate ||
-            NULL == fFunctions.fStencilMaskSeparate ||
-            NULL == fFunctions.fStencilOpSeparate) {
+        if (nullptr == fFunctions.fStencilFuncSeparate ||
+            nullptr == fFunctions.fStencilMaskSeparate ||
+            nullptr == fFunctions.fStencilOpSeparate) {
             RETURN_FALSE_INTERFACE
         }
     } else if (kGL_GrGLStandard == fStandard) {
 
         if (glVer >= GR_GL_VER(2,0)) {
-            if (NULL == fFunctions.fStencilFuncSeparate ||
-                NULL == fFunctions.fStencilMaskSeparate ||
-                NULL == fFunctions.fStencilOpSeparate) {
+            if (nullptr == fFunctions.fStencilFuncSeparate ||
+                nullptr == fFunctions.fStencilMaskSeparate ||
+                nullptr == fFunctions.fStencilOpSeparate) {
                 RETURN_FALSE_INTERFACE
             }
         }
-        if (glVer >= GR_GL_VER(3,0) && NULL == fFunctions.fBindFragDataLocation) {
+        if (glVer >= GR_GL_VER(3,0) && nullptr == fFunctions.fBindFragDataLocation) {
             RETURN_FALSE_INTERFACE
         }
         if (glVer >= GR_GL_VER(2,0) || fExtensions.has("GL_ARB_draw_buffers")) {
-            if (NULL == fFunctions.fDrawBuffers) {
+            if (nullptr == fFunctions.fDrawBuffers) {
                 RETURN_FALSE_INTERFACE
             }
         }
 
         if (glVer >= GR_GL_VER(1,5) || fExtensions.has("GL_ARB_occlusion_query")) {
-            if (NULL == fFunctions.fGenQueries ||
-                NULL == fFunctions.fDeleteQueries ||
-                NULL == fFunctions.fBeginQuery ||
-                NULL == fFunctions.fEndQuery ||
-                NULL == fFunctions.fGetQueryiv ||
-                NULL == fFunctions.fGetQueryObjectiv ||
-                NULL == fFunctions.fGetQueryObjectuiv) {
+            if (nullptr == fFunctions.fGenQueries ||
+                nullptr == fFunctions.fDeleteQueries ||
+                nullptr == fFunctions.fBeginQuery ||
+                nullptr == fFunctions.fEndQuery ||
+                nullptr == fFunctions.fGetQueryiv ||
+                nullptr == fFunctions.fGetQueryObjectiv ||
+                nullptr == fFunctions.fGetQueryObjectuiv) {
                 RETURN_FALSE_INTERFACE
             }
         }
         if (glVer >= GR_GL_VER(3,3) ||
             fExtensions.has("GL_ARB_timer_query") ||
             fExtensions.has("GL_EXT_timer_query")) {
-            if (NULL == fFunctions.fGetQueryObjecti64v ||
-                NULL == fFunctions.fGetQueryObjectui64v) {
+            if (nullptr == fFunctions.fGetQueryObjecti64v ||
+                nullptr == fFunctions.fGetQueryObjectui64v) {
                 RETURN_FALSE_INTERFACE
             }
         }
         if (glVer >= GR_GL_VER(3,3) || fExtensions.has("GL_ARB_timer_query")) {
-            if (NULL == fFunctions.fQueryCounter) {
+            if (nullptr == fFunctions.fQueryCounter) {
                 RETURN_FALSE_INTERFACE
             }
         }
@@ -265,9 +275,9 @@ bool GrGLInterface::validate() const {
     if (kGL_GrGLStandard != fStandard ||
         (glVer >= GR_GL_VER(1,3)) ||
         fExtensions.has("GL_ARB_texture_compression")) {
-        if (NULL == fFunctions.fCompressedTexImage2D
+        if (nullptr == fFunctions.fCompressedTexImage2D
 #if 0
-            || NULL == fFunctions.fCompressedTexSubImage2D
+            || nullptr == fFunctions.fCompressedTexSubImage2D
 #endif
             ) {
             RETURN_FALSE_INTERFACE
@@ -276,9 +286,9 @@ bool GrGLInterface::validate() const {
 
     // part of desktop GL, but not ES
     if (kGL_GrGLStandard == fStandard &&
-        (NULL == fFunctions.fGetTexLevelParameteriv ||
-         NULL == fFunctions.fDrawBuffer ||
-         NULL == fFunctions.fReadBuffer)) {
+        (nullptr == fFunctions.fGetTexLevelParameteriv ||
+         nullptr == fFunctions.fDrawBuffer ||
+         nullptr == fFunctions.fReadBuffer)) {
         RETURN_FALSE_INTERFACE
     }
 
@@ -288,12 +298,34 @@ bool GrGLInterface::validate() const {
         if (glVer >= GR_GL_VER(4,2) ||
             fExtensions.has("GL_ARB_texture_storage") ||
             fExtensions.has("GL_EXT_texture_storage")) {
-            if (NULL == fFunctions.fTexStorage2D) {
+            if (nullptr == fFunctions.fTexStorage2D) {
                 RETURN_FALSE_INTERFACE
             }
         }
     } else if (glVer >= GR_GL_VER(3,0) || fExtensions.has("GL_EXT_texture_storage")) {
-        if (NULL == fFunctions.fTexStorage2D) {
+        if (nullptr == fFunctions.fTexStorage2D) {
+            RETURN_FALSE_INTERFACE
+        }
+    }
+
+    // glTextureBarrier is part of desktop 4.5. There are also ARB and NV extensions.
+    if (kGL_GrGLStandard == fStandard) {
+        if (glVer >= GR_GL_VER(4,5) ||
+            fExtensions.has("GL_ARB_texture_barrier") ||
+            fExtensions.has("GL_NV_texture_barrier")) {
+            if (nullptr == fFunctions.fTextureBarrier) {
+                RETURN_FALSE_INTERFACE
+            }
+        }
+    } else if (fExtensions.has("GL_NV_texture_barrier")) {
+        if (nullptr == fFunctions.fTextureBarrier) {
+            RETURN_FALSE_INTERFACE
+        }
+    }
+
+    if (fExtensions.has("GL_KHR_blend_equation_advanced") ||
+        fExtensions.has("GL_NV_blend_equation_advanced")) {
+        if (nullptr == fFunctions.fBlendBarrier) {
             RETURN_FALSE_INTERFACE
         }
     }
@@ -301,7 +333,7 @@ bool GrGLInterface::validate() const {
     if (fExtensions.has("GL_EXT_discard_framebuffer")) {
 // FIXME: Remove this once Chromium is updated to provide this function
 #if 0
-        if (NULL == fFunctions.fDiscardFramebuffer) {
+        if (nullptr == fFunctions.fDiscardFramebuffer) {
             RETURN_FALSE_INTERFACE
         }
 #endif
@@ -311,37 +343,37 @@ bool GrGLInterface::validate() const {
     if (kGL_GrGLStandard == fStandard) {
         // GL 3.0 and the ARB extension have multisample + blit
         if (glVer >= GR_GL_VER(3,0) || fExtensions.has("GL_ARB_framebuffer_object")) {
-            if (NULL == fFunctions.fRenderbufferStorageMultisample ||
-                NULL == fFunctions.fBlitFramebuffer) {
+            if (nullptr == fFunctions.fRenderbufferStorageMultisample ||
+                nullptr == fFunctions.fBlitFramebuffer) {
                 RETURN_FALSE_INTERFACE
             }
         } else {
             if (fExtensions.has("GL_EXT_framebuffer_blit") &&
-                NULL == fFunctions.fBlitFramebuffer) {
+                nullptr == fFunctions.fBlitFramebuffer) {
                 RETURN_FALSE_INTERFACE
             }
             if (fExtensions.has("GL_EXT_framebuffer_multisample") &&
-                NULL == fFunctions.fRenderbufferStorageMultisample) {
+                nullptr == fFunctions.fRenderbufferStorageMultisample) {
                 RETURN_FALSE_INTERFACE
             }
         }
     } else {
         if (glVer >= GR_GL_VER(3,0) || fExtensions.has("GL_CHROMIUM_framebuffer_multisample")) {
-            if (NULL == fFunctions.fRenderbufferStorageMultisample ||
-                NULL == fFunctions.fBlitFramebuffer) {
+            if (nullptr == fFunctions.fRenderbufferStorageMultisample ||
+                nullptr == fFunctions.fBlitFramebuffer) {
                 RETURN_FALSE_INTERFACE
             }
         }
         if (fExtensions.has("GL_APPLE_framebuffer_multisample")) {
-            if (NULL == fFunctions.fRenderbufferStorageMultisampleES2APPLE ||
-                NULL == fFunctions.fResolveMultisampleFramebuffer) {
+            if (nullptr == fFunctions.fRenderbufferStorageMultisampleES2APPLE ||
+                nullptr == fFunctions.fResolveMultisampleFramebuffer) {
                 RETURN_FALSE_INTERFACE
             }
         }
         if (fExtensions.has("GL_IMG_multisampled_render_to_texture") ||
             fExtensions.has("GL_EXT_multisampled_render_to_texture")) {
-            if (NULL == fFunctions.fRenderbufferStorageMultisampleES2EXT ||
-                NULL == fFunctions.fFramebufferTexture2DMultisample) {
+            if (nullptr == fFunctions.fRenderbufferStorageMultisampleES2EXT ||
+                nullptr == fFunctions.fFramebufferTexture2DMultisample) {
                 RETURN_FALSE_INTERFACE
             }
         }
@@ -351,76 +383,85 @@ bool GrGLInterface::validate() const {
     // buffer mapping was part of original VBO extension
     // which we require.
     if (kGL_GrGLStandard == fStandard || fExtensions.has("GL_OES_mapbuffer")) {
-        if (NULL == fFunctions.fMapBuffer ||
-            NULL == fFunctions.fUnmapBuffer) {
+        if (nullptr == fFunctions.fMapBuffer ||
+            nullptr == fFunctions.fUnmapBuffer) {
             RETURN_FALSE_INTERFACE
         }
     }
 
     // Dual source blending
-    if (kGL_GrGLStandard == fStandard &&
-        (glVer >= GR_GL_VER(3,3) || fExtensions.has("GL_ARB_blend_func_extended"))) {
-        if (NULL == fFunctions.fBindFragDataLocationIndexed) {
-            RETURN_FALSE_INTERFACE
+    if (kGL_GrGLStandard == fStandard) {
+        if (glVer >= GR_GL_VER(3,3) || fExtensions.has("GL_ARB_blend_func_extended")) {
+            if (nullptr == fFunctions.fBindFragDataLocationIndexed) {
+                RETURN_FALSE_INTERFACE
+            }
+        }
+    } else {
+        if (glVer >= GR_GL_VER(3,0) && fExtensions.has("GL_EXT_blend_func_extended")) {
+            if (nullptr == fFunctions.fBindFragDataLocation ||
+                nullptr == fFunctions.fBindFragDataLocationIndexed) {
+                RETURN_FALSE_INTERFACE
+            }
         }
     }
 
+
     // glGetStringi was added in version 3.0 of both desktop and ES.
     if (glVer >= GR_GL_VER(3, 0)) {
-        if (NULL == fFunctions.fGetStringi) {
+        if (nullptr == fFunctions.fGetStringi) {
             RETURN_FALSE_INTERFACE
         }
     }
 
     if (kGL_GrGLStandard == fStandard) {
         if (glVer >= GR_GL_VER(3, 0) || fExtensions.has("GL_ARB_vertex_array_object")) {
-            if (NULL == fFunctions.fBindVertexArray ||
-                NULL == fFunctions.fDeleteVertexArrays ||
-                NULL == fFunctions.fGenVertexArrays) {
+            if (nullptr == fFunctions.fBindVertexArray ||
+                nullptr == fFunctions.fDeleteVertexArrays ||
+                nullptr == fFunctions.fGenVertexArrays) {
                 RETURN_FALSE_INTERFACE
             }
         }
     } else {
         if (glVer >= GR_GL_VER(3,0) || fExtensions.has("GL_OES_vertex_array_object")) {
-            if (NULL == fFunctions.fBindVertexArray ||
-                NULL == fFunctions.fDeleteVertexArrays ||
-                NULL == fFunctions.fGenVertexArrays) {
+            if (nullptr == fFunctions.fBindVertexArray ||
+                nullptr == fFunctions.fDeleteVertexArrays ||
+                nullptr == fFunctions.fGenVertexArrays) {
                 RETURN_FALSE_INTERFACE
             }
         }
     }
 
     if (fExtensions.has("GL_EXT_debug_marker")) {
-        if (NULL == fFunctions.fInsertEventMarker ||
-            NULL == fFunctions.fPushGroupMarker ||
-            NULL == fFunctions.fPopGroupMarker) {
+        if (nullptr == fFunctions.fInsertEventMarker ||
+            nullptr == fFunctions.fPushGroupMarker ||
+            nullptr == fFunctions.fPopGroupMarker) {
             RETURN_FALSE_INTERFACE
         }
     }
 
     if ((kGL_GrGLStandard == fStandard && glVer >= GR_GL_VER(4,3)) ||
         fExtensions.has("GL_ARB_invalidate_subdata")) {
-        if (NULL == fFunctions.fInvalidateBufferData ||
-            NULL == fFunctions.fInvalidateBufferSubData ||
-            NULL == fFunctions.fInvalidateFramebuffer ||
-            NULL == fFunctions.fInvalidateSubFramebuffer ||
-            NULL == fFunctions.fInvalidateTexImage ||
-            NULL == fFunctions.fInvalidateTexSubImage) {
+        if (nullptr == fFunctions.fInvalidateBufferData ||
+            nullptr == fFunctions.fInvalidateBufferSubData ||
+            nullptr == fFunctions.fInvalidateFramebuffer ||
+            nullptr == fFunctions.fInvalidateSubFramebuffer ||
+            nullptr == fFunctions.fInvalidateTexImage ||
+            nullptr == fFunctions.fInvalidateTexSubImage) {
             RETURN_FALSE_INTERFACE;
         }
     } else if (kGLES_GrGLStandard == fStandard && glVer >= GR_GL_VER(3,0)) {
         // ES 3.0 adds the framebuffer functions but not the others.
-        if (NULL == fFunctions.fInvalidateFramebuffer ||
-            NULL == fFunctions.fInvalidateSubFramebuffer) {
+        if (nullptr == fFunctions.fInvalidateFramebuffer ||
+            nullptr == fFunctions.fInvalidateSubFramebuffer) {
             RETURN_FALSE_INTERFACE;
         }
     }
 
     if (kGLES_GrGLStandard == fStandard && fExtensions.has("GL_CHROMIUM_map_sub")) {
-        if (NULL == fFunctions.fMapBufferSubData ||
-            NULL == fFunctions.fMapTexSubImage2D ||
-            NULL == fFunctions.fUnmapBufferSubData ||
-            NULL == fFunctions.fUnmapTexSubImage2D) {
+        if (nullptr == fFunctions.fMapBufferSubData ||
+            nullptr == fFunctions.fMapTexSubImage2D ||
+            nullptr == fFunctions.fUnmapBufferSubData ||
+            nullptr == fFunctions.fUnmapTexSubImage2D) {
             RETURN_FALSE_INTERFACE;
         }
     }
@@ -429,51 +470,265 @@ bool GrGLInterface::validate() const {
     if (glVer >= GR_GL_VER(3,0) ||
         (kGLES_GrGLStandard == fStandard && fExtensions.has("GL_EXT_map_buffer_range")) ||
         (kGL_GrGLStandard == fStandard && fExtensions.has("GL_ARB_map_buffer_range"))) {
-        if (NULL == fFunctions.fMapBufferRange ||
-            NULL == fFunctions.fFlushMappedBufferRange) {
+        if (nullptr == fFunctions.fMapBufferRange ||
+            nullptr == fFunctions.fFlushMappedBufferRange) {
             RETURN_FALSE_INTERFACE;
         }
     }
 
-    if ((kGL_GrGLStandard == fStandard && fExtensions.has("GL_EXT_direct_state_access")) ||
-        (kGLES_GrGLStandard == fStandard && fExtensions.has("GL_NV_path_rendering"))) {
-        if (NULL == fFunctions.fMatrixLoadf ||
-            NULL == fFunctions.fMatrixLoadIdentity) {
-            RETURN_FALSE_INTERFACE
-        }
-    }
-
     if ((kGL_GrGLStandard == fStandard &&
          (glVer >= GR_GL_VER(4,3) || fExtensions.has("GL_ARB_program_interface_query"))) ||
         (kGLES_GrGLStandard == fStandard && glVer >= GR_GL_VER(3,1))) {
-        if (NULL == fFunctions.fGetProgramResourceLocation) {
+        if (nullptr == fFunctions.fGetProgramResourceLocation) {
             RETURN_FALSE_INTERFACE
         }
     }
 
-    if (fExtensions.has("GL_NV_path_rendering")) {
-        if (NULL == fFunctions.fPathCommands ||
-            NULL == fFunctions.fPathCoords ||
-            NULL == fFunctions.fPathParameteri ||
-            NULL == fFunctions.fPathParameterf ||
-            NULL == fFunctions.fGenPaths ||
-            NULL == fFunctions.fDeletePaths ||
-            NULL == fFunctions.fIsPath ||
-            NULL == fFunctions.fPathStencilFunc ||
-            NULL == fFunctions.fStencilFillPath ||
-            NULL == fFunctions.fStencilStrokePath ||
-            NULL == fFunctions.fStencilFillPathInstanced ||
-            NULL == fFunctions.fStencilStrokePathInstanced ||
-            NULL == fFunctions.fCoverFillPath ||
-            NULL == fFunctions.fCoverStrokePath ||
-            NULL == fFunctions.fCoverFillPathInstanced ||
-            NULL == fFunctions.fCoverStrokePathInstanced) {
+    if (kGLES_GrGLStandard == fStandard || glVer >= GR_GL_VER(4,1) ||
+        fExtensions.has("GL_ARB_ES2_compatibility")) {
+#if 0 // Enable this once Chrome gives us the function ptr
+        if (nullptr == fFunctions.fGetShaderPrecisionFormat) {
             RETURN_FALSE_INTERFACE
         }
-        // Currently ProgramPathFragmentInputGen is not used on
-        // OpenGL, rather PathTexGen is.
-        if ((kGL_GrGLStandard == fStandard && NULL == fFunctions.fPathTexGen) ||
-            (kGLES_GrGLStandard == fStandard && NULL == fFunctions.fProgramPathFragmentInputGen)) {
+#endif
+    }
+
+    if (fExtensions.has("GL_NV_path_rendering") || fExtensions.has("GL_CHROMIUM_path_rendering")) {
+        if (nullptr == fFunctions.fMatrixLoadf ||
+            nullptr == fFunctions.fMatrixLoadIdentity ||
+            nullptr == fFunctions.fPathCommands ||
+            nullptr == fFunctions.fPathParameteri ||
+            nullptr == fFunctions.fPathParameterf ||
+            nullptr == fFunctions.fGenPaths ||
+            nullptr == fFunctions.fDeletePaths ||
+            nullptr == fFunctions.fIsPath ||
+            nullptr == fFunctions.fPathStencilFunc ||
+            nullptr == fFunctions.fStencilFillPath ||
+            nullptr == fFunctions.fStencilStrokePath ||
+            nullptr == fFunctions.fStencilFillPathInstanced ||
+            nullptr == fFunctions.fStencilStrokePathInstanced ||
+            nullptr == fFunctions.fCoverFillPath ||
+            nullptr == fFunctions.fCoverStrokePath ||
+            nullptr == fFunctions.fCoverFillPathInstanced ||
+            nullptr == fFunctions.fCoverStrokePathInstanced
+#if 0
+            // List of functions that Skia uses, but which have been added since the initial release
+            // of NV_path_rendering driver. We do not want to fail interface validation due to
+            // missing features, we will just not use the extension.
+            // Update this list -> update GrGLCaps::hasPathRenderingSupport too.
+            || nullptr == fFunctions.fStencilThenCoverFillPath ||
+            nullptr == fFunctions.fStencilThenCoverStrokePath ||
+            nullptr == fFunctions.fStencilThenCoverFillPathInstanced ||
+            nullptr == fFunctions.fStencilThenCoverStrokePathInstanced ||
+            nullptr == fFunctions.fProgramPathFragmentInputGen
+#endif
+            ) {
+            RETURN_FALSE_INTERFACE
+        }
+        if (fExtensions.has("GL_CHROMIUM_path_rendering")) {
+            if (nullptr == fFunctions.fBindFragmentInputLocation) {
+                RETURN_FALSE_INTERFACE
+            }
+        }
+    }
+
+    if (fExtensions.has("GL_EXT_raster_multisample")) {
+        if (nullptr == fFunctions.fRasterSamples) {
+            RETURN_FALSE_INTERFACE
+        }
+    }
+
+    if (fExtensions.has("GL_NV_framebuffer_mixed_samples")) {
+        if (nullptr == fFunctions.fCoverageModulation) {
+            RETURN_FALSE_INTERFACE
+        }
+    }
+
+    if (kGL_GrGLStandard == fStandard) {
+        if (glVer >= GR_GL_VER(3,1) ||
+            fExtensions.has("GL_EXT_draw_instanced") || fExtensions.has("GL_ARB_draw_instanced")) {
+            if (nullptr == fFunctions.fDrawArraysInstanced ||
+                nullptr == fFunctions.fDrawElementsInstanced) {
+                RETURN_FALSE_INTERFACE
+            }
+        }    
+    } else if (kGLES_GrGLStandard == fStandard) {
+        if (glVer >= GR_GL_VER(3,0) || fExtensions.has("GL_EXT_draw_instanced")) {
+            if (nullptr == fFunctions.fDrawArraysInstanced ||
+                nullptr == fFunctions.fDrawElementsInstanced) {
+                RETURN_FALSE_INTERFACE
+            }
+        }    
+    }
+
+    if (kGL_GrGLStandard == fStandard) {
+        if (glVer >= GR_GL_VER(3,2) || fExtensions.has("GL_ARB_instanced_arrays")) {
+            if (nullptr == fFunctions.fVertexAttribDivisor) {
+                RETURN_FALSE_INTERFACE
+            }
+        }    
+    } else if (kGLES_GrGLStandard == fStandard) {
+        if (glVer >= GR_GL_VER(3,0) || fExtensions.has("GL_EXT_instanced_arrays")) {
+            if (nullptr == fFunctions.fVertexAttribDivisor) {
+                RETURN_FALSE_INTERFACE
+            }
+        }    
+    }
+
+    if (fExtensions.has("GL_NV_bindless_texture")) {
+        if (nullptr == fFunctions.fGetTextureHandle ||
+            nullptr == fFunctions.fGetTextureSamplerHandle ||
+            nullptr == fFunctions.fMakeTextureHandleResident ||
+            nullptr == fFunctions.fMakeTextureHandleNonResident ||
+            nullptr == fFunctions.fGetImageHandle ||
+            nullptr == fFunctions.fMakeImageHandleResident ||
+            nullptr == fFunctions.fMakeImageHandleNonResident ||
+            nullptr == fFunctions.fIsTextureHandleResident ||
+            nullptr == fFunctions.fIsImageHandleResident ||
+            nullptr == fFunctions.fUniformHandleui64 ||
+            nullptr == fFunctions.fUniformHandleui64v ||
+            nullptr == fFunctions.fProgramUniformHandleui64 ||
+            nullptr == fFunctions.fProgramUniformHandleui64v) {
+            RETURN_FALSE_INTERFACE
+        }
+    }
+
+    if (kGL_GrGLStandard == fStandard && fExtensions.has("GL_EXT_direct_state_access")) {
+        if (nullptr == fFunctions.fTextureParameteri ||
+            nullptr == fFunctions.fTextureParameteriv ||
+            nullptr == fFunctions.fTextureParameterf ||
+            nullptr == fFunctions.fTextureParameterfv ||
+            nullptr == fFunctions.fTextureImage1D ||
+            nullptr == fFunctions.fTextureImage2D ||
+            nullptr == fFunctions.fTextureSubImage1D ||
+            nullptr == fFunctions.fTextureSubImage2D ||
+            nullptr == fFunctions.fCopyTextureImage1D ||
+            nullptr == fFunctions.fCopyTextureImage2D ||
+            nullptr == fFunctions.fCopyTextureSubImage1D ||
+            nullptr == fFunctions.fCopyTextureSubImage2D ||
+            nullptr == fFunctions.fGetTextureImage ||
+            nullptr == fFunctions.fGetTextureParameterfv ||
+            nullptr == fFunctions.fGetTextureParameteriv ||
+            nullptr == fFunctions.fGetTextureLevelParameterfv ||
+            nullptr == fFunctions.fGetTextureLevelParameteriv) {
+            RETURN_FALSE_INTERFACE
+        }
+        if (glVer >= GR_GL_VER(1,2)) {
+            if (nullptr == fFunctions.fTextureImage3D ||
+                nullptr == fFunctions.fTextureSubImage3D ||
+                nullptr == fFunctions.fCopyTextureSubImage3D ||
+                nullptr == fFunctions.fCompressedTextureImage3D ||
+                nullptr == fFunctions.fCompressedTextureImage2D ||
+                nullptr == fFunctions.fCompressedTextureImage1D ||
+                nullptr == fFunctions.fCompressedTextureSubImage3D ||
+                nullptr == fFunctions.fCompressedTextureSubImage2D ||
+                nullptr == fFunctions.fCompressedTextureSubImage1D ||
+                nullptr == fFunctions.fGetCompressedTextureImage) {
+                RETURN_FALSE_INTERFACE
+            }
+        }
+        if (glVer >= GR_GL_VER(1,5)) {
+            if (nullptr == fFunctions.fNamedBufferData ||
+                nullptr == fFunctions.fNamedBufferSubData ||
+                nullptr == fFunctions.fMapNamedBuffer ||
+                nullptr == fFunctions.fUnmapNamedBuffer ||
+                nullptr == fFunctions.fGetNamedBufferParameteriv ||
+                nullptr == fFunctions.fGetNamedBufferPointerv ||
+                nullptr == fFunctions.fGetNamedBufferSubData) {
+                RETURN_FALSE_INTERFACE
+            }
+        }
+        if (glVer >= GR_GL_VER(2,0)) {
+            if (nullptr == fFunctions.fProgramUniform1f ||
+                nullptr == fFunctions.fProgramUniform2f ||
+                nullptr == fFunctions.fProgramUniform3f ||
+                nullptr == fFunctions.fProgramUniform4f ||
+                nullptr == fFunctions.fProgramUniform1i ||
+                nullptr == fFunctions.fProgramUniform2i ||
+                nullptr == fFunctions.fProgramUniform3i ||
+                nullptr == fFunctions.fProgramUniform4i ||
+                nullptr == fFunctions.fProgramUniform1fv ||
+                nullptr == fFunctions.fProgramUniform2fv ||
+                nullptr == fFunctions.fProgramUniform3fv ||
+                nullptr == fFunctions.fProgramUniform4fv ||
+                nullptr == fFunctions.fProgramUniform1iv ||
+                nullptr == fFunctions.fProgramUniform2iv ||
+                nullptr == fFunctions.fProgramUniform3iv ||
+                nullptr == fFunctions.fProgramUniform4iv ||
+                nullptr == fFunctions.fProgramUniformMatrix2fv ||
+                nullptr == fFunctions.fProgramUniformMatrix3fv ||
+                nullptr == fFunctions.fProgramUniformMatrix4fv) {
+                RETURN_FALSE_INTERFACE
+            }
+        }
+        if (glVer >= GR_GL_VER(2,1)) {
+            if (nullptr == fFunctions.fProgramUniformMatrix2x3fv ||
+                nullptr == fFunctions.fProgramUniformMatrix3x2fv ||
+                nullptr == fFunctions.fProgramUniformMatrix2x4fv ||
+                nullptr == fFunctions.fProgramUniformMatrix4x2fv ||
+                nullptr == fFunctions.fProgramUniformMatrix3x4fv ||
+                nullptr == fFunctions.fProgramUniformMatrix4x3fv) {
+                RETURN_FALSE_INTERFACE
+            }
+        }
+        if (glVer >= GR_GL_VER(3,0)) {
+            if (nullptr == fFunctions.fNamedRenderbufferStorage ||
+                nullptr == fFunctions.fGetNamedRenderbufferParameteriv ||
+                nullptr == fFunctions.fNamedRenderbufferStorageMultisample ||
+                nullptr == fFunctions.fCheckNamedFramebufferStatus ||
+                nullptr == fFunctions.fNamedFramebufferTexture1D ||
+                nullptr == fFunctions.fNamedFramebufferTexture2D ||
+                nullptr == fFunctions.fNamedFramebufferTexture3D ||
+                nullptr == fFunctions.fNamedFramebufferRenderbuffer ||
+                nullptr == fFunctions.fGetNamedFramebufferAttachmentParameteriv ||
+                nullptr == fFunctions.fGenerateTextureMipmap ||
+                nullptr == fFunctions.fFramebufferDrawBuffer ||
+                nullptr == fFunctions.fFramebufferDrawBuffers ||
+                nullptr == fFunctions.fFramebufferReadBuffer ||
+                nullptr == fFunctions.fGetFramebufferParameteriv ||
+                nullptr == fFunctions.fNamedCopyBufferSubData ||
+                nullptr == fFunctions.fVertexArrayVertexOffset ||
+                nullptr == fFunctions.fVertexArrayColorOffset ||
+                nullptr == fFunctions.fVertexArrayEdgeFlagOffset ||
+                nullptr == fFunctions.fVertexArrayIndexOffset ||
+                nullptr == fFunctions.fVertexArrayNormalOffset ||
+                nullptr == fFunctions.fVertexArrayTexCoordOffset ||
+                nullptr == fFunctions.fVertexArrayMultiTexCoordOffset ||
+                nullptr == fFunctions.fVertexArrayFogCoordOffset ||
+                nullptr == fFunctions.fVertexArraySecondaryColorOffset ||
+                nullptr == fFunctions.fVertexArrayVertexAttribOffset ||
+                nullptr == fFunctions.fVertexArrayVertexAttribIOffset ||
+                nullptr == fFunctions.fEnableVertexArray ||
+                nullptr == fFunctions.fDisableVertexArray ||
+                nullptr == fFunctions.fEnableVertexArrayAttrib ||
+                nullptr == fFunctions.fDisableVertexArrayAttrib ||
+                nullptr == fFunctions.fGetVertexArrayIntegerv ||
+                nullptr == fFunctions.fGetVertexArrayPointerv ||
+                nullptr == fFunctions.fGetVertexArrayIntegeri_v ||
+                nullptr == fFunctions.fGetVertexArrayPointeri_v ||
+                nullptr == fFunctions.fMapNamedBufferRange ||
+                nullptr == fFunctions.fFlushMappedNamedBufferRange) {
+                RETURN_FALSE_INTERFACE
+            }
+        }
+    }
+
+    if ((kGL_GrGLStandard == fStandard && glVer >= GR_GL_VER(4,3)) ||
+        fExtensions.has("GL_KHR_debug")) {
+        if (nullptr == fFunctions.fDebugMessageControl ||
+            nullptr == fFunctions.fDebugMessageInsert ||
+            nullptr == fFunctions.fDebugMessageCallback ||
+            nullptr == fFunctions.fGetDebugMessageLog ||
+            nullptr == fFunctions.fPushDebugGroup ||
+            nullptr == fFunctions.fPopDebugGroup ||
+            nullptr == fFunctions.fObjectLabel) {
+            RETURN_FALSE_INTERFACE
+        }
+    }
+
+    if (fExtensions.has("EGL_KHR_image") || fExtensions.has("EGL_KHR_image_base")) {
+        if (nullptr == fFunctions.fEGLCreateImage ||
+            nullptr == fFunctions.fEGLDestroyImage) {
             RETURN_FALSE_INTERFACE
         }
     }
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLNameAllocator.cpp b/gfx/skia/skia/src/gpu/gl/GrGLNameAllocator.cpp
index f2c37edbeb20..03123a6d86ea 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLNameAllocator.cpp
+++ b/gfx/skia/skia/src/gpu/gl/GrGLNameAllocator.cpp
@@ -64,7 +64,7 @@ public:
      *
      * @param removedCount A pointer that receives the size of the contiguous
                            range that was removed.
-     * @return The resulting SparseNameRange after the removal (or NULL if it
+     * @return The resulting SparseNameRange after the removal (or nullptr if it
      *         became empty). Note that this call is destructive, so the
      *         original SparseNameRange will no longer be valid afterward. The
      *         caller must always update its pointer with the new
@@ -100,7 +100,7 @@ public:
      *
      * @param name The name to free. Not-allocated names are silently ignored
      *             the same way they are in the OpenGL spec.
-     * @return The resulting SparseNameRange after the free (or NULL if it
+     * @return The resulting SparseNameRange after the free (or nullptr if it
      *         became empty). Note that this call is destructive, so the
      *         original SparseNameRange will no longer be valid afterward. The
      *         caller must always update its pointer with the new
@@ -133,7 +133,7 @@ public:
         this->updateStats();
     }
 
-    virtual SparseNameRange* SK_WARN_UNUSED_RESULT internalAllocate(GrGLuint* outName) SK_OVERRIDE {
+    SparseNameRange* SK_WARN_UNUSED_RESULT internalAllocate(GrGLuint* outName) override {
         // Try allocating the range inside fLeft's internal gaps.
         fLeft.reset(fLeft->internalAllocate(outName));
         if (0 != *outName) {
@@ -146,7 +146,7 @@ public:
             GrGLuint removedCount;
             fRight.reset(fRight->removeLeftmostContiguousRange(&removedCount));
             *outName = fLeft->appendNames(1 + removedCount);
-            if (NULL == fRight.get()) {
+            if (nullptr == fRight.get()) {
                 return fLeft.detach();
             }
             this->updateStats();
@@ -160,16 +160,16 @@ public:
         return this->takeRef();
     }
 
-    virtual SparseNameRange* SK_WARN_UNUSED_RESULT removeLeftmostContiguousRange(GrGLuint* removedCount) SK_OVERRIDE {
+    SparseNameRange* SK_WARN_UNUSED_RESULT removeLeftmostContiguousRange(GrGLuint* removedCount) override {
         fLeft.reset(fLeft->removeLeftmostContiguousRange(removedCount));
-        if (NULL == fLeft) {
+        if (nullptr == fLeft) {
             return fRight.detach();
         }
         this->updateStats();
         return this->rebalance();
     }
 
-    virtual GrGLuint appendNames(GrGLuint count) SK_OVERRIDE {
+    GrGLuint appendNames(GrGLuint count) override {
         SkASSERT(fEnd + count > fEnd); // Check for integer wrap.
         GrGLuint name = fRight->appendNames(count);
         SkASSERT(fRight->end() == fEnd + count);
@@ -177,7 +177,7 @@ public:
         return name;
     }
 
-    virtual GrGLuint prependNames(GrGLuint count) SK_OVERRIDE {
+    GrGLuint prependNames(GrGLuint count) override {
         SkASSERT(fFirst > count); // We can't allocate at or below 0.
         GrGLuint name = fLeft->prependNames(count);
         SkASSERT(fLeft->first() == fFirst - count);
@@ -185,10 +185,10 @@ public:
         return name;
     }
 
-    virtual SparseNameRange* SK_WARN_UNUSED_RESULT free(GrGLuint name) SK_OVERRIDE {
+    SparseNameRange* SK_WARN_UNUSED_RESULT free(GrGLuint name) override {
         if (name < fLeft->end()) {
             fLeft.reset(fLeft->free(name));
-            if (NULL == fLeft) {
+            if (nullptr == fLeft) {
                 // fLeft became empty after the free.
                 return fRight.detach();
             }
@@ -196,7 +196,7 @@ public:
             return this->rebalance();
         } else {
             fRight.reset(fRight->free(name));
-            if (NULL == fRight) {
+            if (nullptr == fRight) {
                 // fRight became empty after the free.
                 return fLeft.detach();
             }
@@ -280,30 +280,30 @@ public:
         fHeight = 0;
     }
 
-    virtual SparseNameRange* SK_WARN_UNUSED_RESULT internalAllocate(GrGLuint* outName) SK_OVERRIDE {
+    SparseNameRange* SK_WARN_UNUSED_RESULT internalAllocate(GrGLuint* outName) override {
         *outName = 0; // No internal gaps, we are contiguous.
         return this->takeRef();
     }
 
-    virtual SparseNameRange* SK_WARN_UNUSED_RESULT removeLeftmostContiguousRange(GrGLuint* removedCount) SK_OVERRIDE {
+    SparseNameRange* SK_WARN_UNUSED_RESULT removeLeftmostContiguousRange(GrGLuint* removedCount) override {
         *removedCount = fEnd - fFirst;
-        return NULL;
+        return nullptr;
     }
 
-    virtual GrGLuint appendNames(GrGLuint count) SK_OVERRIDE {
+    GrGLuint appendNames(GrGLuint count) override {
         SkASSERT(fEnd + count > fEnd); // Check for integer wrap.
         GrGLuint name = fEnd;
         fEnd += count;
         return name;
     }
 
-    virtual GrGLuint prependNames(GrGLuint count) SK_OVERRIDE {
+    GrGLuint prependNames(GrGLuint count) override {
         SkASSERT(fFirst > count); // We can't allocate at or below 0.
         fFirst -= count;
         return fFirst;
     }
 
-    virtual SparseNameRange* SK_WARN_UNUSED_RESULT free(GrGLuint name) SK_OVERRIDE {
+    SparseNameRange* SK_WARN_UNUSED_RESULT free(GrGLuint name) override {
         if (name < fFirst || name >= fEnd) {
           // Not-allocated names are silently ignored.
           return this->takeRef();
@@ -311,7 +311,7 @@ public:
 
         if (fFirst == name) {
             ++fFirst;
-            return (fEnd == fFirst) ? NULL : this->takeRef();
+            return (fEnd == fFirst) ? nullptr : this->takeRef();
         }
 
         if (fEnd == name + 1) {
@@ -319,10 +319,10 @@ public:
             return this->takeRef();
         }
 
-        SparseNameRange* left = SkNEW_ARGS(ContiguousNameRange, (fFirst, name));
+        SparseNameRange* left = new ContiguousNameRange(fFirst, name);
         SparseNameRange* right = this->takeRef();
         fFirst = name + 1;
-        return SkNEW_ARGS(SparseNameTree, (left, right));
+        return new SparseNameTree(left, right);
     }
 };
 
@@ -337,8 +337,8 @@ GrGLNameAllocator::~GrGLNameAllocator() {
 }
 
 GrGLuint GrGLNameAllocator::allocateName() {
-    if (NULL == fAllocatedNames.get()) {
-        fAllocatedNames.reset(SkNEW_ARGS(ContiguousNameRange, (fFirstName, fFirstName + 1)));
+    if (nullptr == fAllocatedNames.get()) {
+        fAllocatedNames.reset(new ContiguousNameRange(fFirstName, fFirstName + 1));
         return fFirstName;
     }
 
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLNameAllocator.h b/gfx/skia/skia/src/gpu/gl/GrGLNameAllocator.h
index 1c2c26e59f69..8b0b2a244ab9 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLNameAllocator.h
+++ b/gfx/skia/skia/src/gpu/gl/GrGLNameAllocator.h
@@ -10,7 +10,7 @@
 #define GrGLNameAllocator_DEFINED
 
 #include "SkRefCnt.h"
-#include "gl/GrGLFunctions.h"
+#include "gl/GrGLTypes.h"
 
 /**
  * This class assumes ownership of an explicit range of OpenGL object names and
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLNoOpInterface.cpp b/gfx/skia/skia/src/gpu/gl/GrGLNoOpInterface.cpp
index df32d2a7cfc6..113c47d05428 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLNoOpInterface.cpp
+++ b/gfx/skia/skia/src/gpu/gl/GrGLNoOpInterface.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "GrGLNoOpInterface.h"
+#include "SkMutex.h"
 #include "SkString.h"
-#include "SkThread.h"
 
 // the OpenGLES 2.0 spec says this must be >= 128
 static const GrGLint kDefaultMaxVertexUniformVectors = 128;
@@ -27,7 +27,6 @@ static const char* kExtensions[] = {
     "GL_ARB_timer_query",
     "GL_ARB_draw_buffers",
     "GL_ARB_occlusion_query",
-    "GL_EXT_blend_color",
     "GL_EXT_stencil_wrap"
 };
 
@@ -48,15 +47,18 @@ const GrGLubyte* combined_extensions_string() {
 }
 }
 
+GrGLvoid GR_GL_FUNCTION_TYPE noOpGLBindFragDataLocation(GrGLuint program,
+                                                        GrGLuint colorNumber,
+                                                        const GrGLchar* name) {
+}
+
 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLBlendColor(GrGLclampf red,
                                               GrGLclampf green,
                                               GrGLclampf blue,
                                               GrGLclampf alpha) {
 }
 
-GrGLvoid GR_GL_FUNCTION_TYPE noOpGLBindFragDataLocation(GrGLuint program,
-                                                        GrGLuint colorNumber,
-                                                        const GrGLchar* name) {
+GrGLvoid GR_GL_FUNCTION_TYPE noOpGLBlendEquation(GrGLenum mode) {
 }
 
 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLBlendFunc(GrGLenum sfactor,
@@ -138,6 +140,12 @@ GrGLvoid GR_GL_FUNCTION_TYPE noOpGLDrawArrays(GrGLenum mode,
                                               GrGLsizei count) {
 }
 
+GrGLvoid GR_GL_FUNCTION_TYPE noOpGLDrawArraysInstanced(GrGLenum mode,
+                                                       GrGLint first,
+                                                       GrGLsizei count,
+                                                       GrGLsizei primcount) {
+}
+
 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLDrawBuffer(GrGLenum mode) {
 }
 
@@ -151,6 +159,13 @@ GrGLvoid GR_GL_FUNCTION_TYPE noOpGLDrawElements(GrGLenum mode,
                                                 const GrGLvoid* indices) {
 }
 
+GrGLvoid GR_GL_FUNCTION_TYPE noOpGLDrawElementsInstanced(GrGLenum mode,
+                                                         GrGLsizei count,
+                                                         GrGLenum type,
+                                                         const GrGLvoid* indices,
+                                                         GrGLsizei primcount) {
+}
+
 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLEnable(GrGLenum cap) {
 }
 
@@ -367,6 +382,15 @@ GrGLvoid GR_GL_FUNCTION_TYPE noOpGLUniformMatrix4fv(GrGLint location,
                                                     const GrGLfloat* value) {
 }
 
+ GrGLvoid GR_GL_FUNCTION_TYPE noOpGLVertexAttrib1f(GrGLuint indx, const GrGLfloat value) {
+}
+
+ GrGLvoid GR_GL_FUNCTION_TYPE noOpGLVertexAttrib2fv(GrGLuint indx, const GrGLfloat* values) {
+}
+
+ GrGLvoid GR_GL_FUNCTION_TYPE noOpGLVertexAttrib3fv(GrGLuint indx, const GrGLfloat* values) {
+}
+
  GrGLvoid GR_GL_FUNCTION_TYPE noOpGLVertexAttrib4fv(GrGLuint indx, const GrGLfloat* values) {
 }
 
@@ -378,6 +402,9 @@ GrGLvoid GR_GL_FUNCTION_TYPE noOpGLVertexAttribPointer(GrGLuint indx,
                                                        const GrGLvoid* ptr) {
 }
 
+GrGLvoid GR_GL_FUNCTION_TYPE noOpGLVertexAttribDivisor(GrGLuint index, GrGLuint divisor) {
+}
+
 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLViewport(GrGLint x,
                                             GrGLint y,
                                             GrGLsizei width,
@@ -615,7 +642,7 @@ const GrGLubyte* GR_GL_FUNCTION_TYPE noOpGLGetString(GrGLenum name) {
             return (const GrGLubyte*)"The Debug (Non-)Renderer";
         default:
             SkFAIL("Unexpected name passed to GetString");
-            return NULL;
+            return nullptr;
    }
 }
 
@@ -625,11 +652,11 @@ const GrGLubyte* GR_GL_FUNCTION_TYPE noOpGLGetStringi(GrGLenum name, GrGLuint i)
             if (static_cast<size_t>(i) <= SK_ARRAY_COUNT(kExtensions)) {
                 return (const GrGLubyte*) kExtensions[i];
             } else {
-                return NULL;
+                return nullptr;
             }
         default:
             SkFAIL("Unexpected name passed to GetStringi");
-            return NULL;
+            return nullptr;
     }
 }
 
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLNoOpInterface.h b/gfx/skia/skia/src/gpu/gl/GrGLNoOpInterface.h
index 3e146d330b41..627de63d7d33 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLNoOpInterface.h
+++ b/gfx/skia/skia/src/gpu/gl/GrGLNoOpInterface.h
@@ -9,18 +9,20 @@
 #define GrGLNoOpInterface_DEFINED
 
 #include "gl/GrGLDefines.h"
-#include "gl/GrGLFunctions.h"
+#include "gl/GrGLTypes.h"
 
 // These are constants/functions that are common to the Null and Debug GL interface implementations.
 
+GrGLvoid GR_GL_FUNCTION_TYPE noOpGLBindFragDataLocation(GrGLuint program,
+                                                        GrGLuint colorNumber,
+                                                        const GrGLchar* name);
+
 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLBlendColor(GrGLclampf red,
                                               GrGLclampf green,
                                               GrGLclampf blue,
                                               GrGLclampf alpha);
 
-GrGLvoid GR_GL_FUNCTION_TYPE noOpGLBindFragDataLocation(GrGLuint program,
-                                                        GrGLuint colorNumber,
-                                                        const GrGLchar* name);
+GrGLvoid GR_GL_FUNCTION_TYPE noOpGLBlendEquation(GrGLenum mode);
 
 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLBlendFunc(GrGLenum sfactor,
                                              GrGLenum dfactor);
@@ -84,6 +86,11 @@ GrGLvoid GR_GL_FUNCTION_TYPE noOpGLDisableVertexAttribArray(GrGLuint index);
 
 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLDrawArrays(GrGLenum mode, GrGLint first, GrGLsizei count);
 
+GrGLvoid GR_GL_FUNCTION_TYPE noOpGLDrawArraysInstanced(GrGLenum mode,
+                                                       GrGLint first,
+                                                       GrGLsizei count,
+                                                       GrGLsizei primcount);
+
 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLDrawBuffer(GrGLenum mode);
 
 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLDrawBuffers(GrGLsizei n,
@@ -94,6 +101,12 @@ GrGLvoid GR_GL_FUNCTION_TYPE noOpGLDrawElements(GrGLenum mode,
                                                 GrGLenum type,
                                                 const GrGLvoid* indices);
 
+GrGLvoid GR_GL_FUNCTION_TYPE noOpGLDrawElementsInstanced(GrGLenum mode,
+                                                         GrGLsizei count,
+                                                         GrGLenum type,
+                                                         const GrGLvoid* indices,
+                                                         GrGLsizei primcount);
+
 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLEnable(GrGLenum cap);
 
 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLEnableVertexAttribArray(GrGLuint index);
@@ -266,6 +279,12 @@ GrGLvoid GR_GL_FUNCTION_TYPE noOpGLUniformMatrix4fv(GrGLint location,
                                                     GrGLboolean transpose,
                                                     const GrGLfloat* value);
 
+ GrGLvoid GR_GL_FUNCTION_TYPE noOpGLVertexAttrib1f(GrGLuint indx, const GrGLfloat value);
+
+ GrGLvoid GR_GL_FUNCTION_TYPE noOpGLVertexAttrib2fv(GrGLuint indx, const GrGLfloat* values);
+
+ GrGLvoid GR_GL_FUNCTION_TYPE noOpGLVertexAttrib3fv(GrGLuint indx, const GrGLfloat* values);
+
  GrGLvoid GR_GL_FUNCTION_TYPE noOpGLVertexAttrib4fv(GrGLuint indx, const GrGLfloat* values);
 
 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLVertexAttribPointer(GrGLuint indx,
@@ -275,6 +294,8 @@ GrGLvoid GR_GL_FUNCTION_TYPE noOpGLVertexAttribPointer(GrGLuint indx,
                                                        GrGLsizei stride,
                                                        const GrGLvoid* ptr);
 
+GrGLvoid GR_GL_FUNCTION_TYPE noOpGLVertexAttribDivisor(GrGLuint index, GrGLuint divisor);
+
 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLViewport(GrGLint x,
                                             GrGLint y,
                                             GrGLsizei width,
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLPath.cpp b/gfx/skia/skia/src/gpu/gl/GrGLPath.cpp
index 1c745808e986..d1fc39dffcc5 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLPath.cpp
+++ b/gfx/skia/skia/src/gpu/gl/GrGLPath.cpp
@@ -7,12 +7,8 @@
  */
 
 #include "GrGLPath.h"
-#include "GrGpuGL.h"
-
-#define GPUGL static_cast<GrGpuGL*>(this->getGpu())
-
-#define GL_CALL(X) GR_GL_CALL(GPUGL->glInterface(), X)
-#define GL_CALL_RET(R, X) GR_GL_CALL_RET(GPUGL->glInterface(), R, X)
+#include "GrGLPathRendering.h"
+#include "GrGLGpu.h"
 
 namespace {
 inline GrGLubyte verb_to_gl_path_cmd(SkPath::Verb verb) {
@@ -20,13 +16,14 @@ inline GrGLubyte verb_to_gl_path_cmd(SkPath::Verb verb) {
         GR_GL_MOVE_TO,
         GR_GL_LINE_TO,
         GR_GL_QUADRATIC_CURVE_TO,
-        0xFF, // conic
+        GR_GL_CONIC_CURVE_TO,
         GR_GL_CUBIC_CURVE_TO,
         GR_GL_CLOSE_PATH,
     };
     GR_STATIC_ASSERT(0 == SkPath::kMove_Verb);
     GR_STATIC_ASSERT(1 == SkPath::kLine_Verb);
     GR_STATIC_ASSERT(2 == SkPath::kQuad_Verb);
+    GR_STATIC_ASSERT(3 == SkPath::kConic_Verb);
     GR_STATIC_ASSERT(4 == SkPath::kCubic_Verb);
     GR_STATIC_ASSERT(5 == SkPath::kClose_Verb);
 
@@ -35,18 +32,19 @@ inline GrGLubyte verb_to_gl_path_cmd(SkPath::Verb verb) {
 }
 
 #ifdef SK_DEBUG
-inline int num_pts(SkPath::Verb verb) {
+inline int num_coords(SkPath::Verb verb) {
     static const int gTable[] = {
-        1, // move
-        1, // line
-        2, // quad
-        2, // conic
-        3, // cubic
+        2, // move
+        2, // line
+        4, // quad
+        5, // conic
+        6, // cubic
         0, // close
     };
     GR_STATIC_ASSERT(0 == SkPath::kMove_Verb);
     GR_STATIC_ASSERT(1 == SkPath::kLine_Verb);
     GR_STATIC_ASSERT(2 == SkPath::kQuad_Verb);
+    GR_STATIC_ASSERT(3 == SkPath::kConic_Verb);
     GR_STATIC_ASSERT(4 == SkPath::kCubic_Verb);
     GR_STATIC_ASSERT(5 == SkPath::kClose_Verb);
 
@@ -81,72 +79,233 @@ inline GrGLenum cap_to_gl_cap(SkPaint::Cap cap) {
     GR_STATIC_ASSERT(SK_ARRAY_COUNT(gSkCapsToGrGLCaps) == SkPaint::kCapCount);
 }
 
+inline void points_to_coords(const SkPoint points[], size_t first_point, size_t amount,
+                             GrGLfloat coords[]) {
+    for (size_t i = 0;  i < amount; ++i) {
+        coords[i * 2] =  SkScalarToFloat(points[first_point + i].fX);
+        coords[i * 2 + 1] = SkScalarToFloat(points[first_point + i].fY);
+    }
 }
 
-static const bool kIsWrapped = false; // The constructor creates the GL path object.
-
-void GrGLPath::InitPathObject(const GrGLInterface* gl,
-                              GrGLuint pathID,
-                              const SkPath& skPath,
-                              const SkStrokeRec& stroke) {
-    SkSTArray<16, GrGLubyte, true> pathCommands;
-    SkSTArray<16, SkPoint, true> pathPoints;
-
+template<bool checkForDegenerates>
+inline bool init_path_object_for_general_path(GrGLGpu* gpu, GrGLuint pathID,
+                                              const SkPath& skPath) {
+    SkDEBUGCODE(int numCoords = 0);
     int verbCnt = skPath.countVerbs();
     int pointCnt = skPath.countPoints();
-    pathCommands.resize_back(verbCnt);
-    pathPoints.resize_back(pointCnt);
+    int minCoordCnt = pointCnt * 2;
 
-    // TODO: Direct access to path points since we could pass them on directly.
-    skPath.getPoints(&pathPoints[0], pointCnt);
-    skPath.getVerbs(&pathCommands[0], verbCnt);
+    SkSTArray<16, GrGLubyte, true> pathCommands(verbCnt);
+    SkSTArray<16, GrGLfloat, true> pathCoords(minCoordCnt);
+    bool lastVerbWasMove = true; // A path with just "close;" means "moveto(0,0); close;"
+    SkPoint points[4];
+    SkPath::RawIter iter(skPath);
+    SkPath::Verb verb;
+    while ((verb = iter.next(points)) != SkPath::kDone_Verb) {
+        pathCommands.push_back(verb_to_gl_path_cmd(verb));
+        GrGLfloat coords[6];
+        int coordsForVerb;
+        switch (verb) {
+            case SkPath::kMove_Verb:
+                if (checkForDegenerates) {
+                    lastVerbWasMove = true;
+                }
+                points_to_coords(points, 0, 1, coords);
+                coordsForVerb = 2;
+                break;
+            case SkPath::kLine_Verb:
+                if (checkForDegenerates) {
+                    if (SkPath::IsLineDegenerate(points[0], points[1], true)) {
+                        return false;
+                    }
+                    lastVerbWasMove = false;
+                }
 
-    SkDEBUGCODE(int numPts = 0);
-    for (int i = 0; i < verbCnt; ++i) {
-        SkPath::Verb v = static_cast<SkPath::Verb>(pathCommands[i]);
-        pathCommands[i] = verb_to_gl_path_cmd(v);
-        SkDEBUGCODE(numPts += num_pts(v));
+                points_to_coords(points, 1, 1, coords);
+                coordsForVerb = 2;
+                break;
+            case SkPath::kConic_Verb:
+                if (checkForDegenerates) {
+                    if (SkPath::IsQuadDegenerate(points[0], points[1], points[2], true)) {
+                        return false;
+                    }
+                    lastVerbWasMove = false;
+                }
+                points_to_coords(points, 1, 2, coords);
+                coords[4] = SkScalarToFloat(iter.conicWeight());
+                coordsForVerb = 5;
+                break;
+            case SkPath::kQuad_Verb:
+                if (checkForDegenerates) {
+                    if (SkPath::IsQuadDegenerate(points[0], points[1], points[2], true)) {
+                        return false;
+                    }
+                    lastVerbWasMove = false;
+                }
+                points_to_coords(points, 1, 2, coords);
+                coordsForVerb = 4;
+                break;
+            case SkPath::kCubic_Verb:
+                if (checkForDegenerates) {
+                    if (SkPath::IsCubicDegenerate(points[0], points[1], points[2], points[3],
+                                                  true)) {
+                        return false;
+                    }
+                    lastVerbWasMove = false;
+                }
+                points_to_coords(points, 1, 3, coords);
+                coordsForVerb = 6;
+                break;
+            case SkPath::kClose_Verb:
+                if (checkForDegenerates) {
+                    if (lastVerbWasMove) {
+                        // Interpret "move(x,y);close;" as "move(x,y);lineto(x,y);close;".
+                        // which produces a degenerate segment.
+                        return false;
+                    }
+                }
+                continue;
+            default:
+                SkASSERT(false);  // Not reached.
+                continue;
+        }
+        SkDEBUGCODE(numCoords += num_coords(verb));
+        pathCoords.push_back_n(coordsForVerb, coords);
     }
-    SkASSERT(pathPoints.count() == numPts);
+    SkASSERT(verbCnt == pathCommands.count());
+    SkASSERT(numCoords == pathCoords.count());
 
-    GR_GL_CALL(gl, PathCommands(pathID,
-                                verbCnt, &pathCommands[0],
-                                2 * pointCnt, GR_GL_FLOAT, &pathPoints[0]));
+    GR_GL_CALL(gpu->glInterface(), PathCommands(pathID, pathCommands.count(), &pathCommands[0],
+                                                pathCoords.count(), GR_GL_FLOAT, &pathCoords[0]));
+    return true;
+}
+} // namespace
 
-    if (stroke.needToApply()) {
-        SkASSERT(!stroke.isHairlineStyle());
-        GR_GL_CALL(gl, PathParameterf(pathID, GR_GL_PATH_STROKE_WIDTH, SkScalarToFloat(stroke.getWidth())));
-        GR_GL_CALL(gl, PathParameterf(pathID, GR_GL_PATH_MITER_LIMIT, SkScalarToFloat(stroke.getMiter())));
-        GrGLenum join = join_to_gl_join(stroke.getJoin());
-        GR_GL_CALL(gl, PathParameteri(pathID, GR_GL_PATH_JOIN_STYLE, join));
-        GrGLenum cap = cap_to_gl_cap(stroke.getCap());
-        GR_GL_CALL(gl, PathParameteri(pathID, GR_GL_PATH_INITIAL_END_CAP, cap));
-        GR_GL_CALL(gl, PathParameteri(pathID, GR_GL_PATH_TERMINAL_END_CAP, cap));
-    }
+bool GrGLPath::InitPathObjectPathDataCheckingDegenerates(GrGLGpu* gpu, GrGLuint pathID,
+                                                         const SkPath& skPath) {
+    return init_path_object_for_general_path<true>(gpu, pathID, skPath);
 }
 
-GrGLPath::GrGLPath(GrGpuGL* gpu, const SkPath& path, const SkStrokeRec& stroke)
-    : INHERITED(gpu, kIsWrapped, path, stroke) {
-    SkASSERT(!path.isEmpty());
+void GrGLPath::InitPathObjectPathData(GrGLGpu* gpu,
+                                      GrGLuint pathID,
+                                      const SkPath& skPath) {
+    SkASSERT(!skPath.isEmpty());
 
-    fPathID = gpu->createGLPathObject();
+#ifdef SK_SCALAR_IS_FLOAT
+    // This branch does type punning, converting SkPoint* to GrGLfloat*.
+    if ((skPath.getSegmentMasks() & SkPath::kConic_SegmentMask) == 0) {
+        int verbCnt = skPath.countVerbs();
+        int pointCnt = skPath.countPoints();
+        int coordCnt = pointCnt * 2;
+        SkSTArray<16, GrGLubyte, true> pathCommands(verbCnt);
+        SkSTArray<16, GrGLfloat, true> pathCoords(coordCnt);
 
-    InitPathObject(static_cast<GrGpuGL*>(this->getGpu())->glInterface(),
-                   fPathID, fSkPath, stroke);
+        static_assert(sizeof(SkPoint) == sizeof(GrGLfloat) * 2, "sk_point_not_two_floats");
 
-    if (stroke.needToApply()) {
-        // FIXME: try to account for stroking, without rasterizing the stroke.
-        fBounds.outset(stroke.getWidth(), stroke.getWidth());
+        pathCommands.resize_back(verbCnt);
+        pathCoords.resize_back(coordCnt);
+        skPath.getPoints(reinterpret_cast<SkPoint*>(&pathCoords[0]), pointCnt);
+        skPath.getVerbs(&pathCommands[0], verbCnt);
+
+        SkDEBUGCODE(int verbCoordCnt = 0);
+        for (int i = 0; i < verbCnt; ++i) {
+            SkPath::Verb v = static_cast<SkPath::Verb>(pathCommands[i]);
+            pathCommands[i] = verb_to_gl_path_cmd(v);
+            SkDEBUGCODE(verbCoordCnt += num_coords(v));
+        }
+        SkASSERT(verbCnt == pathCommands.count());
+        SkASSERT(verbCoordCnt == pathCoords.count());
+        GR_GL_CALL(gpu->glInterface(), PathCommands(pathID, pathCommands.count(), &pathCommands[0],
+                                                    pathCoords.count(), GR_GL_FLOAT,
+                                                    &pathCoords[0]));
+        return;
     }
+#endif
+    SkAssertResult(init_path_object_for_general_path<false>(gpu, pathID, skPath));
 }
 
-GrGLPath::~GrGLPath() {
-    this->release();
+void GrGLPath::InitPathObjectStroke(GrGLGpu* gpu, GrGLuint pathID, const GrStrokeInfo& stroke) {
+    SkASSERT(stroke.needToApply());
+    SkASSERT(!stroke.isDashed());
+    SkASSERT(!stroke.isHairlineStyle());
+    GR_GL_CALL(gpu->glInterface(),
+               PathParameterf(pathID, GR_GL_PATH_STROKE_WIDTH, SkScalarToFloat(stroke.getWidth())));
+    GR_GL_CALL(gpu->glInterface(),
+               PathParameterf(pathID, GR_GL_PATH_MITER_LIMIT, SkScalarToFloat(stroke.getMiter())));
+    GrGLenum join = join_to_gl_join(stroke.getJoin());
+    GR_GL_CALL(gpu->glInterface(), PathParameteri(pathID, GR_GL_PATH_JOIN_STYLE, join));
+    GrGLenum cap = cap_to_gl_cap(stroke.getCap());
+    GR_GL_CALL(gpu->glInterface(), PathParameteri(pathID, GR_GL_PATH_END_CAPS, cap));
+    GR_GL_CALL(gpu->glInterface(), PathParameterf(pathID, GR_GL_PATH_STROKE_BOUND, 0.02f));
+}
+
+void GrGLPath::InitPathObjectEmptyPath(GrGLGpu* gpu, GrGLuint pathID) {
+    GR_GL_CALL(gpu->glInterface(), PathCommands(pathID, 0, nullptr, 0, GR_GL_FLOAT, nullptr));
+}
+
+GrGLPath::GrGLPath(GrGLGpu* gpu, const SkPath& origSkPath, const GrStrokeInfo& origStroke)
+    : INHERITED(gpu, origSkPath, origStroke),
+      fPathID(gpu->glPathRendering()->genPaths(1)) {
+
+    if (origSkPath.isEmpty()) {
+        InitPathObjectEmptyPath(gpu, fPathID);
+        fShouldStroke = false;
+        fShouldFill = false;
+    } else {
+        const SkPath* skPath = &origSkPath;
+        SkTLazy<SkPath> tmpPath;
+        const GrStrokeInfo* stroke = &origStroke;
+        GrStrokeInfo tmpStroke(SkStrokeRec::kFill_InitStyle);
+
+        if (stroke->isDashed()) {
+            // Skia stroking and NVPR stroking differ with respect to dashing
+            // pattern.
+            // Convert a dashing to either a stroke or a fill.
+            if (stroke->applyDashToPath(tmpPath.init(), &tmpStroke, *skPath)) {
+                skPath = tmpPath.get();
+                stroke = &tmpStroke;
+            }
+        }
+
+        bool didInit = false;
+        if (stroke->needToApply() && stroke->getCap() != SkPaint::kButt_Cap) {
+            // Skia stroking and NVPR stroking differ with respect to stroking
+            // end caps of empty subpaths.
+            // Convert stroke to fill if path contains empty subpaths.
+            didInit = InitPathObjectPathDataCheckingDegenerates(gpu, fPathID, *skPath);
+            if (!didInit) {
+                if (!tmpPath.isValid()) {
+                    tmpPath.init();
+                }
+                SkAssertResult(stroke->applyToPath(tmpPath.get(), *skPath));
+                skPath = tmpPath.get();
+                tmpStroke.setFillStyle();
+                stroke = &tmpStroke;
+            }
+        }
+
+        if (!didInit) {
+            InitPathObjectPathData(gpu, fPathID, *skPath);
+        }
+
+        fShouldStroke = stroke->needToApply();
+        fShouldFill = stroke->isFillStyle() ||
+                stroke->getStyle() == SkStrokeRec::kStrokeAndFill_Style;
+
+        if (fShouldStroke) {
+            InitPathObjectStroke(gpu, fPathID, *stroke);
+
+            // FIXME: try to account for stroking, without rasterizing the stroke.
+            fBounds.outset(stroke->getWidth(), stroke->getWidth());
+        }
+    }
+
+    this->registerWithCache();
 }
 
 void GrGLPath::onRelease() {
-    if (0 != fPathID && !this->isWrapped()) {
-        static_cast<GrGpuGL*>(this->getGpu())->deleteGLPathObject(fPathID);
+    if (0 != fPathID && this->shouldFreeResources()) {
+        static_cast<GrGLGpu*>(this->getGpu())->glPathRendering()->deletePaths(fPathID, 1);
         fPathID = 0;
     }
 
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLPath.h b/gfx/skia/skia/src/gpu/gl/GrGLPath.h
index 4831b7250fe0..e8642f346892 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLPath.h
+++ b/gfx/skia/skia/src/gpu/gl/GrGLPath.h
@@ -10,10 +10,9 @@
 #define GrGLPath_DEFINED
 
 #include "../GrPath.h"
-#include "gl/GrGLFunctions.h"
+#include "gl/GrGLTypes.h"
 
-class GrGpuGL;
-struct GrGLInterface;
+class GrGLGpu;
 
 /**
  * Currently this represents a path built using GL_NV_path_rendering. If we
@@ -23,24 +22,33 @@ struct GrGLInterface;
 
 class GrGLPath : public GrPath {
 public:
-    static void InitPathObject(const GrGLInterface*,
-                               GrGLuint pathID,
-                               const SkPath&,
-                               const SkStrokeRec&);
+    static bool InitPathObjectPathDataCheckingDegenerates(GrGLGpu*,
+                                                          GrGLuint pathID,
+                                                          const SkPath&);
+    static void InitPathObjectPathData(GrGLGpu*,
+                                       GrGLuint pathID,
+                                       const SkPath&);
+    static void InitPathObjectStroke(GrGLGpu* gpu, GrGLuint pathID, const GrStrokeInfo& stroke);
 
-    GrGLPath(GrGpuGL* gpu, const SkPath& path, const SkStrokeRec& stroke);
-    virtual ~GrGLPath();
+    static void InitPathObjectEmptyPath(GrGLGpu*, GrGLuint pathID);
+
+
+    GrGLPath(GrGLGpu* gpu, const SkPath& path, const GrStrokeInfo& stroke);
     GrGLuint pathID() const { return fPathID; }
-    // TODO: Figure out how to get an approximate size of the path in Gpu
-    // memory.
-    virtual size_t gpuMemorySize() const SK_OVERRIDE { return 100; }
 
+    bool shouldStroke() const { return fShouldStroke; }
+    bool shouldFill() const { return fShouldFill; }
 protected:
-    virtual void onRelease() SK_OVERRIDE;
-    virtual void onAbandon() SK_OVERRIDE;
+    void onRelease() override;
+    void onAbandon() override;
 
 private:
+    // TODO: Figure out how to get an approximate size of the path in Gpu memory.
+    size_t onGpuMemorySize() const override { return 100; }
+
     GrGLuint fPathID;
+    bool fShouldStroke;
+    bool fShouldFill;
 
     typedef GrPath INHERITED;
 };
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLPathRange.cpp b/gfx/skia/skia/src/gpu/gl/GrGLPathRange.cpp
index 2df04e3057ef..4714b924ab4d 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLPathRange.cpp
+++ b/gfx/skia/skia/src/gpu/gl/GrGLPathRange.cpp
@@ -8,47 +8,103 @@
 
 #include "GrGLPathRange.h"
 #include "GrGLPath.h"
-#include "GrGpuGL.h"
+#include "GrGLPathRendering.h"
+#include "GrGLGpu.h"
 
-#define GPUGL static_cast<GrGpuGL*>(this->getGpu())
-
-#define GL_CALL(X) GR_GL_CALL(GPUGL->glInterface(), X)
-#define GL_CALL_RET(R, X) GR_GL_CALL_RET(GPUGL->glInterface(), R, X)
-
-GrGLPathRange::GrGLPathRange(GrGpu* gpu, size_t size, const SkStrokeRec& stroke)
-    : INHERITED(gpu, size, stroke),
-      fNumDefinedPaths(0) {
-    GL_CALL_RET(fBasePathID, GenPaths(fSize));
+GrGLPathRange::GrGLPathRange(GrGLGpu* gpu, PathGenerator* pathGenerator, const GrStrokeInfo& stroke)
+    : INHERITED(gpu, pathGenerator),
+      fStroke(stroke),
+      fBasePathID(gpu->glPathRendering()->genPaths(this->getNumPaths())),
+      fGpuMemorySize(0) {
+    this->init();
+    this->registerWithCache();
 }
 
-GrGLPathRange::~GrGLPathRange() {
-    this->release();
+GrGLPathRange::GrGLPathRange(GrGLGpu* gpu,
+                             GrGLuint basePathID,
+                             int numPaths,
+                             size_t gpuMemorySize,
+                             const GrStrokeInfo& stroke)
+    : INHERITED(gpu, numPaths),
+      fStroke(stroke),
+      fBasePathID(basePathID),
+      fGpuMemorySize(gpuMemorySize) {
+    this->init();
+    this->registerWithCache();
 }
 
-void GrGLPathRange::initAt(size_t index, const SkPath& skPath) {
-    GrGpuGL* gpu = static_cast<GrGpuGL*>(this->getGpu());
-    if (NULL == gpu) {
+void GrGLPathRange::init() {
+    // Must force fill:
+    // * dashing: NVPR stroke dashing is different to Skia.
+    // * end caps: NVPR stroking degenerate contours with end caps is different to Skia.
+    bool forceFill = fStroke.isDashed() ||
+            (fStroke.needToApply() && fStroke.getCap() != SkPaint::kButt_Cap);
+
+    if (forceFill) {
+        fShouldStroke = false;
+        fShouldFill = true;
+    } else {
+        fShouldStroke = fStroke.needToApply();
+        fShouldFill = fStroke.isFillStyle() ||
+                fStroke.getStyle() == SkStrokeRec::kStrokeAndFill_Style;
+    }
+}
+
+void GrGLPathRange::onInitPath(int index, const SkPath& origSkPath) const {
+    GrGLGpu* gpu = static_cast<GrGLGpu*>(this->getGpu());
+    if (nullptr == gpu) {
         return;
     }
 
-#ifdef SK_DEBUG
     // Make sure the path at this index hasn't been initted already.
-    GrGLboolean hasPathAtIndex;
-    GL_CALL_RET(hasPathAtIndex, IsPath(fBasePathID + index));
-    SkASSERT(GR_GL_FALSE == hasPathAtIndex);
-#endif
+    SkDEBUGCODE(
+        GrGLboolean isPath;
+        GR_GL_CALL_RET(gpu->glInterface(), isPath, IsPath(fBasePathID + index)));
+    SkASSERT(GR_GL_FALSE == isPath);
 
-    GrGLPath::InitPathObject(gpu->glInterface(), fBasePathID + index, skPath, fStroke);
+    if (origSkPath.isEmpty()) {
+        GrGLPath::InitPathObjectEmptyPath(gpu, fBasePathID + index);
+    } else if (fShouldStroke) {
+        GrGLPath::InitPathObjectPathData(gpu, fBasePathID + index, origSkPath);
+        GrGLPath::InitPathObjectStroke(gpu, fBasePathID + index, fStroke);
+    } else {
+        const SkPath* skPath = &origSkPath;
+        SkTLazy<SkPath> tmpPath;
+        const GrStrokeInfo* stroke = &fStroke;
+        GrStrokeInfo tmpStroke(SkStrokeRec::kFill_InitStyle);
 
-    ++fNumDefinedPaths;
-    this->didChangeGpuMemorySize();
+        // Dashing must be applied to the path. However, if dashing is present,
+        // we must convert all the paths to fills. The GrStrokeInfo::applyDash leaves
+        // simple paths as strokes but converts other paths to fills.
+        // Thus we must stroke the strokes here, so that all paths in the
+        // path range are using the same style.
+        if (fStroke.isDashed()) {
+            if (!stroke->applyDashToPath(tmpPath.init(), &tmpStroke, *skPath)) {
+                return;
+            }
+            skPath = tmpPath.get();
+            stroke = &tmpStroke;
+        }
+        if (stroke->needToApply()) {
+            if (!tmpPath.isValid()) {
+                tmpPath.init();
+            }
+            if (!stroke->applyToPath(tmpPath.get(), *tmpPath.get())) {
+                return;
+            }
+        }
+        GrGLPath::InitPathObjectPathData(gpu, fBasePathID + index, *skPath);
+    }
+    // TODO: Use a better approximation for the individual path sizes.
+    fGpuMemorySize += 100;
 }
 
 void GrGLPathRange::onRelease() {
-    SkASSERT(NULL != this->getGpu());
+    SkASSERT(this->getGpu());
 
-    if (0 != fBasePathID && !this->isWrapped()) {
-        GL_CALL(DeletePaths(fBasePathID, fSize));
+    if (0 != fBasePathID && this->shouldFreeResources()) {
+        static_cast<GrGLGpu*>(this->getGpu())->glPathRendering()->deletePaths(fBasePathID,
+                                                                              this->getNumPaths());
         fBasePathID = 0;
     }
 
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLPathRange.h b/gfx/skia/skia/src/gpu/gl/GrGLPathRange.h
index 6c6b78e0163d..c9d4845c449e 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLPathRange.h
+++ b/gfx/skia/skia/src/gpu/gl/GrGLPathRange.h
@@ -10,9 +10,10 @@
 #define GrGLPathRange_DEFINED
 
 #include "../GrPathRange.h"
-#include "gl/GrGLFunctions.h"
+#include "GrStrokeInfo.h"
+#include "gl/GrGLTypes.h"
 
-class GrGpuGL;
+class GrGLGpu;
 
 /**
  * Currently this represents a range of GL_NV_path_rendering Path IDs. If we
@@ -22,25 +23,43 @@ class GrGpuGL;
 
 class GrGLPathRange : public GrPathRange {
 public:
-    GrGLPathRange(GrGpu*, size_t size, const SkStrokeRec&);
-    virtual ~GrGLPathRange();
+    /**
+     * Initialize a GL path range from a PathGenerator. This class will allocate
+     * the GPU path objects and initialize them lazily.
+     */
+    GrGLPathRange(GrGLGpu*, PathGenerator*, const GrStrokeInfo&);
+
+    /**
+     * Initialize a GL path range from an existing range of pre-initialized GPU
+     * path objects. This class assumes ownership of the GPU path objects and
+     * will delete them when done.
+     */
+    GrGLPathRange(GrGLGpu*,
+                  GrGLuint basePathID,
+                  int numPaths,
+                  size_t gpuMemorySize,
+                  const GrStrokeInfo&);
 
     GrGLuint basePathID() const { return fBasePathID; }
 
-    virtual void initAt(size_t index, const SkPath&);
-
-    // TODO: Use a better approximation for the individual path sizes.
-    virtual size_t gpuMemorySize() const SK_OVERRIDE {
-        return 100 * fNumDefinedPaths;
-    }
+    bool shouldStroke() const { return fShouldStroke; }
+    bool shouldFill() const { return fShouldFill; }
 
 protected:
-    virtual void onRelease() SK_OVERRIDE;
-    virtual void onAbandon() SK_OVERRIDE;
+    void onInitPath(int index, const SkPath&) const override;
+
+    void onRelease() override;
+    void onAbandon() override;
 
 private:
+    void init();
+    size_t onGpuMemorySize() const override { return fGpuMemorySize; }
+
+    const GrStrokeInfo fStroke;
     GrGLuint fBasePathID;
-    size_t fNumDefinedPaths;
+    mutable size_t fGpuMemorySize;
+    bool fShouldStroke;
+    bool fShouldFill;
 
     typedef GrPathRange INHERITED;
 };
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLPathRendering.cpp b/gfx/skia/skia/src/gpu/gl/GrGLPathRendering.cpp
new file mode 100644
index 000000000000..4c9ef8678674
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/GrGLPathRendering.cpp
@@ -0,0 +1,298 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "gl/GrGLPathRendering.h"
+#include "gl/GrGLNameAllocator.h"
+#include "gl/GrGLUtil.h"
+#include "gl/GrGLGpu.h"
+
+#include "GrGLPath.h"
+#include "GrGLPathRange.h"
+#include "GrGLPathRendering.h"
+
+#include "SkStream.h"
+#include "SkTypeface.h"
+
+#define GL_CALL(X) GR_GL_CALL(this->gpu()->glInterface(), X)
+#define GL_CALL_RET(RET, X) GR_GL_CALL_RET(this->gpu()->glInterface(), RET, X)
+
+
+static const GrGLenum gIndexType2GLType[] = {
+    GR_GL_UNSIGNED_BYTE,
+    GR_GL_UNSIGNED_SHORT,
+    GR_GL_UNSIGNED_INT
+};
+
+GR_STATIC_ASSERT(0 == GrPathRange::kU8_PathIndexType);
+GR_STATIC_ASSERT(1 == GrPathRange::kU16_PathIndexType);
+GR_STATIC_ASSERT(2 == GrPathRange::kU32_PathIndexType);
+GR_STATIC_ASSERT(GrPathRange::kU32_PathIndexType == GrPathRange::kLast_PathIndexType);
+
+static const GrGLenum gXformType2GLType[] = {
+    GR_GL_NONE,
+    GR_GL_TRANSLATE_X,
+    GR_GL_TRANSLATE_Y,
+    GR_GL_TRANSLATE_2D,
+    GR_GL_TRANSPOSE_AFFINE_2D
+};
+
+GR_STATIC_ASSERT(0 == GrPathRendering::kNone_PathTransformType);
+GR_STATIC_ASSERT(1 == GrPathRendering::kTranslateX_PathTransformType);
+GR_STATIC_ASSERT(2 == GrPathRendering::kTranslateY_PathTransformType);
+GR_STATIC_ASSERT(3 == GrPathRendering::kTranslate_PathTransformType);
+GR_STATIC_ASSERT(4 == GrPathRendering::kAffine_PathTransformType);
+GR_STATIC_ASSERT(GrPathRendering::kAffine_PathTransformType == GrPathRendering::kLast_PathTransformType);
+
+static GrGLenum gr_stencil_op_to_gl_path_rendering_fill_mode(GrStencilOp op) {
+    switch (op) {
+        default:
+            SkFAIL("Unexpected path fill.");
+            /* fallthrough */;
+        case kIncClamp_StencilOp:
+            return GR_GL_COUNT_UP;
+        case kInvert_StencilOp:
+            return GR_GL_INVERT;
+    }
+}
+
+GrGLPathRendering::GrGLPathRendering(GrGLGpu* gpu)
+    : GrPathRendering(gpu) {
+    const GrGLInterface* glInterface = gpu->glInterface();
+    fCaps.bindFragmentInputSupport =
+        nullptr != glInterface->fFunctions.fBindFragmentInputLocation;
+}
+
+GrGLPathRendering::~GrGLPathRendering() {
+}
+
+void GrGLPathRendering::abandonGpuResources() {
+    fPathNameAllocator.reset(nullptr);
+}
+
+void GrGLPathRendering::resetContext() {
+    fHWProjectionMatrixState.invalidate();
+    // we don't use the model view matrix.
+    GL_CALL(MatrixLoadIdentity(GR_GL_PATH_MODELVIEW));
+
+    fHWPathStencilSettings.invalidate();
+}
+
+GrPath* GrGLPathRendering::createPath(const SkPath& inPath, const GrStrokeInfo& stroke) {
+    return new GrGLPath(this->gpu(), inPath, stroke);
+}
+
+GrPathRange* GrGLPathRendering::createPathRange(GrPathRange::PathGenerator* pathGenerator,
+                                                const GrStrokeInfo& stroke) {
+    return new GrGLPathRange(this->gpu(), pathGenerator, stroke);
+}
+
+void GrGLPathRendering::onStencilPath(const StencilPathArgs& args, const GrPath* path) {
+    GrGLGpu* gpu = this->gpu();
+    SkASSERT(gpu->caps()->shaderCaps()->pathRenderingSupport());
+    gpu->flushColorWrite(false);
+    gpu->flushDrawFace(GrPipelineBuilder::kBoth_DrawFace);
+
+    GrGLRenderTarget* rt = static_cast<GrGLRenderTarget*>(args.fRenderTarget);
+    SkISize size = SkISize::Make(rt->width(), rt->height());
+    this->setProjectionMatrix(*args.fViewMatrix, size, rt->origin());
+    gpu->flushScissor(*args.fScissor, rt->getViewport(), rt->origin());
+    gpu->flushHWAAState(rt, args.fUseHWAA);
+    gpu->flushRenderTarget(rt, nullptr);
+
+    const GrGLPath* glPath = static_cast<const GrGLPath*>(path);
+
+    this->flushPathStencilSettings(*args.fStencil);
+    SkASSERT(!fHWPathStencilSettings.isTwoSided());
+
+    GrGLenum fillMode = gr_stencil_op_to_gl_path_rendering_fill_mode(
+        fHWPathStencilSettings.passOp(GrStencilSettings::kFront_Face));
+    GrGLint writeMask = fHWPathStencilSettings.writeMask(GrStencilSettings::kFront_Face);
+
+    if (glPath->shouldFill()) {
+        GL_CALL(StencilFillPath(glPath->pathID(), fillMode, writeMask));
+    }
+    if (glPath->shouldStroke()) {
+        GL_CALL(StencilStrokePath(glPath->pathID(), 0xffff, writeMask));
+    }
+}
+
+void GrGLPathRendering::onDrawPath(const DrawPathArgs& args, const GrPath* path) {
+    if (!this->gpu()->flushGLState(args)) {
+        return;
+    }
+    const GrGLPath* glPath = static_cast<const GrGLPath*>(path);
+
+    this->flushPathStencilSettings(*args.fStencil);
+    SkASSERT(!fHWPathStencilSettings.isTwoSided());
+
+    GrGLenum fillMode = gr_stencil_op_to_gl_path_rendering_fill_mode(
+        fHWPathStencilSettings.passOp(GrStencilSettings::kFront_Face));
+    GrGLint writeMask = fHWPathStencilSettings.writeMask(GrStencilSettings::kFront_Face);
+
+    if (glPath->shouldStroke()) {
+        if (glPath->shouldFill()) {
+            GL_CALL(StencilFillPath(glPath->pathID(), fillMode, writeMask));
+        }
+        GL_CALL(StencilThenCoverStrokePath(glPath->pathID(), 0xffff, writeMask,
+                                           GR_GL_BOUNDING_BOX));
+    } else {
+        GL_CALL(StencilThenCoverFillPath(glPath->pathID(), fillMode, writeMask,
+                                         GR_GL_BOUNDING_BOX));
+    }
+}
+
+void GrGLPathRendering::onDrawPaths(const DrawPathArgs& args, const GrPathRange* pathRange,
+                                    const void* indices, PathIndexType indexType,
+                                    const float transformValues[], PathTransformType transformType,
+                                    int count) {
+    if (!this->gpu()->flushGLState(args)) {
+        return;
+    }
+    this->flushPathStencilSettings(*args.fStencil);
+    SkASSERT(!fHWPathStencilSettings.isTwoSided());
+
+
+    const GrGLPathRange* glPathRange = static_cast<const GrGLPathRange*>(pathRange);
+
+    GrGLenum fillMode =
+        gr_stencil_op_to_gl_path_rendering_fill_mode(
+            fHWPathStencilSettings.passOp(GrStencilSettings::kFront_Face));
+    GrGLint writeMask =
+        fHWPathStencilSettings.writeMask(GrStencilSettings::kFront_Face);
+
+    if (glPathRange->shouldStroke()) {
+        if (glPathRange->shouldFill()) {
+            GL_CALL(StencilFillPathInstanced(
+                            count, gIndexType2GLType[indexType], indices, glPathRange->basePathID(),
+                            fillMode, writeMask, gXformType2GLType[transformType],
+                            transformValues));
+        }
+        GL_CALL(StencilThenCoverStrokePathInstanced(
+                            count, gIndexType2GLType[indexType], indices, glPathRange->basePathID(),
+                            0xffff, writeMask, GR_GL_BOUNDING_BOX_OF_BOUNDING_BOXES,
+                            gXformType2GLType[transformType], transformValues));
+    } else {
+        GL_CALL(StencilThenCoverFillPathInstanced(
+                            count, gIndexType2GLType[indexType], indices, glPathRange->basePathID(),
+                            fillMode, writeMask, GR_GL_BOUNDING_BOX_OF_BOUNDING_BOXES,
+                            gXformType2GLType[transformType], transformValues));
+    }
+}
+
+void GrGLPathRendering::setProgramPathFragmentInputTransform(GrGLuint program, GrGLint location,
+                                                             GrGLenum genMode, GrGLint components,
+                                                             const SkMatrix& matrix) {
+    float coefficients[3 * 3];
+    SkASSERT(components >= 1 && components <= 3);
+
+    coefficients[0] = SkScalarToFloat(matrix[SkMatrix::kMScaleX]);
+    coefficients[1] = SkScalarToFloat(matrix[SkMatrix::kMSkewX]);
+    coefficients[2] = SkScalarToFloat(matrix[SkMatrix::kMTransX]);
+
+    if (components >= 2) {
+        coefficients[3] = SkScalarToFloat(matrix[SkMatrix::kMSkewY]);
+        coefficients[4] = SkScalarToFloat(matrix[SkMatrix::kMScaleY]);
+        coefficients[5] = SkScalarToFloat(matrix[SkMatrix::kMTransY]);
+    }
+
+    if (components >= 3) {
+        coefficients[6] = SkScalarToFloat(matrix[SkMatrix::kMPersp0]);
+        coefficients[7] = SkScalarToFloat(matrix[SkMatrix::kMPersp1]);
+        coefficients[8] = SkScalarToFloat(matrix[SkMatrix::kMPersp2]);
+    }
+
+    GL_CALL(ProgramPathFragmentInputGen(program, location, genMode, components, coefficients));
+}
+
+void GrGLPathRendering::setProjectionMatrix(const SkMatrix& matrix,
+                                            const SkISize& renderTargetSize,
+                                            GrSurfaceOrigin renderTargetOrigin) {
+
+    SkASSERT(this->gpu()->glCaps().shaderCaps()->pathRenderingSupport());
+
+    if (renderTargetOrigin == fHWProjectionMatrixState.fRenderTargetOrigin &&
+        renderTargetSize == fHWProjectionMatrixState.fRenderTargetSize &&
+        matrix.cheapEqualTo(fHWProjectionMatrixState.fViewMatrix)) {
+        return;
+    }
+
+    fHWProjectionMatrixState.fViewMatrix = matrix;
+    fHWProjectionMatrixState.fRenderTargetSize = renderTargetSize;
+    fHWProjectionMatrixState.fRenderTargetOrigin = renderTargetOrigin;
+
+    float glMatrix[4 * 4];
+    fHWProjectionMatrixState.getRTAdjustedGLMatrix<4>(glMatrix);
+    GL_CALL(MatrixLoadf(GR_GL_PATH_PROJECTION, glMatrix));
+}
+
+GrGLuint GrGLPathRendering::genPaths(GrGLsizei range) {
+    if (range > 1) {
+        GrGLuint name;
+        GL_CALL_RET(name, GenPaths(range));
+        return name;
+    }
+
+    if (nullptr == fPathNameAllocator.get()) {
+        static const int range = 65536;
+        GrGLuint firstName;
+        GL_CALL_RET(firstName, GenPaths(range));
+        fPathNameAllocator.reset(new GrGLNameAllocator(firstName, firstName + range));
+    }
+
+    // When allocating names one at a time, pull from a client-side pool of
+    // available names in order to save a round trip to the GL server.
+    GrGLuint name = fPathNameAllocator->allocateName();
+
+    if (0 == name) {
+        // Our reserved path names are all in use. Fall back on GenPaths.
+        GL_CALL_RET(name, GenPaths(1));
+    }
+
+    return name;
+}
+
+void GrGLPathRendering::deletePaths(GrGLuint path, GrGLsizei range) {
+    if (range > 1) {
+        // It is not supported to delete names in ranges that were allocated
+        // individually using GrGLPathNameAllocator.
+        SkASSERT(nullptr == fPathNameAllocator.get() ||
+                 path + range <= fPathNameAllocator->firstName() ||
+                 path >= fPathNameAllocator->endName());
+        GL_CALL(DeletePaths(path, range));
+        return;
+    }
+
+    if (nullptr == fPathNameAllocator.get() ||
+        path < fPathNameAllocator->firstName() ||
+        path >= fPathNameAllocator->endName()) {
+        // If we aren't inside fPathNameAllocator's range then this name was
+        // generated by the GenPaths fallback (or else was never allocated).
+        GL_CALL(DeletePaths(path, 1));
+        return;
+    }
+
+    // Make the path empty to save memory, but don't free the name in the driver.
+    GL_CALL(PathCommands(path, 0, nullptr, 0, GR_GL_FLOAT, nullptr));
+    fPathNameAllocator->free(path);
+}
+
+void GrGLPathRendering::flushPathStencilSettings(const GrStencilSettings& stencilSettings) {
+    if (fHWPathStencilSettings != stencilSettings) {
+        // Just the func, ref, and mask is set here. The op and write mask are params to the call
+        // that draws the path to the SB (glStencilFillPath)
+        GrGLenum func =
+            GrToGLStencilFunc(stencilSettings.func(GrStencilSettings::kFront_Face));
+        GL_CALL(PathStencilFunc(func, stencilSettings.funcRef(GrStencilSettings::kFront_Face),
+                                stencilSettings.funcMask(GrStencilSettings::kFront_Face)));
+
+        fHWPathStencilSettings = stencilSettings;
+    }
+}
+
+inline GrGLGpu* GrGLPathRendering::gpu() {
+    return static_cast<GrGLGpu*>(fGpu);
+}
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLPathRendering.h b/gfx/skia/skia/src/gpu/gl/GrGLPathRendering.h
new file mode 100644
index 000000000000..57209fddc117
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/GrGLPathRendering.h
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGLPathRendering_DEFINED
+#define GrGLPathRendering_DEFINED
+
+#include "SkRefCnt.h"
+#include "GrPathRendering.h"
+#include "GrStencil.h"
+#include "gl/GrGLTypes.h"
+#include "glsl/GrGLSLUtil.h"
+
+class GrGLNameAllocator;
+class GrGLGpu;
+
+/**
+ * This class wraps the NV_path_rendering extension and manages its various
+ * API versions. If a method is not present in the GrGLInterface of the GrGLGpu
+ * (because the driver version is old), it tries to provide a backup
+ * implementation. But if a backup implementation is not practical, it marks the
+ * method as not supported.
+ */
+class GrGLPathRendering : public GrPathRendering {
+public:
+    /**
+     * Create a new GrGLPathRendering object from a given GrGLGpu.
+     */
+    GrGLPathRendering(GrGLGpu* gpu);
+    virtual ~GrGLPathRendering();
+
+    // GrPathRendering implementations.
+    GrPath* createPath(const SkPath&, const GrStrokeInfo&) override;
+    virtual GrPathRange* createPathRange(GrPathRange::PathGenerator*,
+                                         const GrStrokeInfo&) override;
+
+    /* Called when the 3D context state is unknown. */
+    void resetContext();
+
+    /**
+     * Called when the GPU resources have been lost and need to be abandoned
+     * (for example after a context loss).
+     */
+    void abandonGpuResources();
+
+    bool shouldBindFragmentInputs() const {
+        return fCaps.bindFragmentInputSupport;
+    }
+
+    // Functions for "separable shader" texturing support.
+    void setProgramPathFragmentInputTransform(GrGLuint program, GrGLint location,
+                                              GrGLenum genMode, GrGLint components,
+                                              const SkMatrix&);
+
+    /* Sets the projection matrix for path rendering */
+    void setProjectionMatrix(const SkMatrix& matrix,
+                             const SkISize& renderTargetSize,
+                             GrSurfaceOrigin renderTargetOrigin);
+
+    GrGLuint genPaths(GrGLsizei range);
+    GrGLvoid deletePaths(GrGLuint path, GrGLsizei range);
+
+protected:
+    void onStencilPath(const StencilPathArgs&, const GrPath*) override;
+    void onDrawPath(const DrawPathArgs&, const GrPath*) override;
+    void onDrawPaths(const DrawPathArgs&, const GrPathRange*, const void* indices, PathIndexType,
+                     const float transformValues[], PathTransformType, int count) override;
+private:
+    /**
+     * Mark certain functionality as not supported.
+     */
+    struct Caps {
+        bool bindFragmentInputSupport : 1;
+    };
+
+    void flushPathStencilSettings(const GrStencilSettings&);
+
+    struct MatrixState {
+        SkMatrix        fViewMatrix;
+        SkISize         fRenderTargetSize;
+        GrSurfaceOrigin fRenderTargetOrigin;
+
+        MatrixState() { this->invalidate(); }
+        void invalidate() {
+            fViewMatrix = SkMatrix::InvalidMatrix();
+            fRenderTargetSize.fWidth = -1;
+            fRenderTargetSize.fHeight = -1;
+            fRenderTargetOrigin = (GrSurfaceOrigin) -1;
+        }
+
+        /**
+         * Gets a matrix that goes from local coordinates to GL normalized device coords.
+         */
+        template<int Size> void getRTAdjustedGLMatrix(float* destMatrix) {
+            SkMatrix combined;
+            if (kBottomLeft_GrSurfaceOrigin == fRenderTargetOrigin) {
+                combined.setAll(SkIntToScalar(2) / fRenderTargetSize.fWidth, 0, -SK_Scalar1,
+                                0, -SkIntToScalar(2) / fRenderTargetSize.fHeight, SK_Scalar1,
+                                0, 0, 1);
+            } else {
+                combined.setAll(SkIntToScalar(2) / fRenderTargetSize.fWidth, 0, -SK_Scalar1,
+                                0, SkIntToScalar(2) / fRenderTargetSize.fHeight, -SK_Scalar1,
+                                0, 0, 1);
+            }
+            combined.preConcat(fViewMatrix);
+            GrGLSLGetMatrix<Size>(destMatrix, combined);
+        }
+    };
+    GrGLGpu* gpu();
+
+    SkAutoTDelete<GrGLNameAllocator> fPathNameAllocator;
+    MatrixState fHWProjectionMatrixState;
+    GrStencilSettings fHWPathStencilSettings;
+    Caps fCaps;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLProgram.cpp b/gfx/skia/skia/src/gpu/gl/GrGLProgram.cpp
index 5bc7d0b277a3..3cf9e4dd7c66 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLProgram.cpp
+++ b/gfx/skia/skia/src/gpu/gl/GrGLProgram.cpp
@@ -8,253 +8,142 @@
 #include "GrGLProgram.h"
 
 #include "GrAllocator.h"
-#include "GrEffect.h"
+#include "GrProcessor.h"
 #include "GrCoordTransform.h"
-#include "GrDrawEffect.h"
-#include "GrGLEffect.h"
-#include "GrGpuGL.h"
-#include "GrGLShaderVar.h"
-#include "GrGLSL.h"
+#include "GrGLGpu.h"
+#include "GrGLPathRendering.h"
+#include "GrPathProcessor.h"
+#include "GrPipeline.h"
+#include "GrXferProcessor.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLGeometryProcessor.h"
+#include "glsl/GrGLSLXferProcessor.h"
 #include "SkXfermode.h"
 
 #define GL_CALL(X) GR_GL_CALL(fGpu->glInterface(), X)
 #define GL_CALL_RET(R, X) GR_GL_CALL_RET(fGpu->glInterface(), R, X)
 
-GrGLProgram* GrGLProgram::Create(GrGpuGL* gpu,
-                                 const GrGLProgramDesc& desc,
-                                 const GrEffectStage* colorStages[],
-                                 const GrEffectStage* coverageStages[]) {
-    GrGLShaderBuilder::GenProgramOutput output;
-    SkAutoTUnref<GrGLUniformManager> uman(SkNEW_ARGS(GrGLUniformManager, (gpu)));
-    if (GrGLShaderBuilder::GenProgram(gpu, uman, desc, colorStages, coverageStages,
-                                      &output)) {
-        SkASSERT(0 != output.fProgramID);
-        return SkNEW_ARGS(GrGLProgram, (gpu, desc, uman, output));
-    }
-    return NULL;
-}
+///////////////////////////////////////////////////////////////////////////////////////////////////
 
-GrGLProgram::GrGLProgram(GrGpuGL* gpu,
-                         const GrGLProgramDesc& desc,
-                         GrGLUniformManager* uman,
-                         const GrGLShaderBuilder::GenProgramOutput& builderOutput)
-    : fColor(GrColor_ILLEGAL)
-    , fCoverage(GrColor_ILLEGAL)
-    , fDstCopyTexUnit(-1)
-    , fBuilderOutput(builderOutput)
+GrGLProgram::GrGLProgram(GrGLGpu* gpu,
+                         const GrProgramDesc& desc,
+                         const BuiltinUniformHandles& builtinUniforms,
+                         GrGLuint programID,
+                         const UniformInfoArray& uniforms,
+                         const VaryingInfoArray& pathProcVaryings,
+                         GrGLInstalledGeoProc* geometryProcessor,
+                         GrGLInstalledXferProc* xferProcessor,
+                         GrGLInstalledFragProcs* fragmentProcessors,
+                         SkTArray<UniformHandle>* passSamplerUniforms)
+    : fBuiltinUniformHandles(builtinUniforms)
+    , fProgramID(programID)
+    , fGeometryProcessor(geometryProcessor)
+    , fXferProcessor(xferProcessor)
+    , fFragmentProcessors(SkRef(fragmentProcessors))
     , fDesc(desc)
     , fGpu(gpu)
-    , fUniformManager(SkRef(uman)) {
-    this->initSamplerUniforms();
+    , fProgramDataManager(gpu, programID, uniforms, pathProcVaryings) {
+    fSamplerUniforms.swap(passSamplerUniforms);
+    // Assign texture units to sampler uniforms one time up front.
+    GL_CALL(UseProgram(fProgramID));
+    for (int i = 0; i < fSamplerUniforms.count(); i++) {
+        fProgramDataManager.setSampler(fSamplerUniforms[i], i);
+    }
 }
 
 GrGLProgram::~GrGLProgram() {
-    if (fBuilderOutput.fProgramID) {
-        GL_CALL(DeleteProgram(fBuilderOutput.fProgramID));
+    if (fProgramID) {
+        GL_CALL(DeleteProgram(fProgramID));
     }
 }
 
 void GrGLProgram::abandon() {
-    fBuilderOutput.fProgramID = 0;
-}
-
-void GrGLProgram::overrideBlend(GrBlendCoeff* srcCoeff,
-                                GrBlendCoeff* dstCoeff) const {
-    switch (fDesc.getHeader().fCoverageOutput) {
-        case GrGLProgramDesc::kModulate_CoverageOutput:
-            break;
-        // The prog will write a coverage value to the secondary
-        // output and the dst is blended by one minus that value.
-        case GrGLProgramDesc::kSecondaryCoverage_CoverageOutput:
-        case GrGLProgramDesc::kSecondaryCoverageISA_CoverageOutput:
-        case GrGLProgramDesc::kSecondaryCoverageISC_CoverageOutput:
-            *dstCoeff = (GrBlendCoeff)GrGpu::kIS2C_GrBlendCoeff;
-            break;
-        case GrGLProgramDesc::kCombineWithDst_CoverageOutput:
-            // We should only have set this if the blend was specified as (1, 0)
-            SkASSERT(kOne_GrBlendCoeff == *srcCoeff && kZero_GrBlendCoeff == *dstCoeff);
-            break;
-        default:
-            SkFAIL("Unexpected coverage output");
-            break;
-    }
-}
-
-void GrGLProgram::initSamplerUniforms() {
-    GL_CALL(UseProgram(fBuilderOutput.fProgramID));
-    GrGLint texUnitIdx = 0;
-    if (fBuilderOutput.fUniformHandles.fDstCopySamplerUni.isValid()) {
-        fUniformManager->setSampler(fBuilderOutput.fUniformHandles.fDstCopySamplerUni, texUnitIdx);
-        fDstCopyTexUnit = texUnitIdx++;
-    }
-    fBuilderOutput.fColorEffects->initSamplers(*fUniformManager, &texUnitIdx);
-    fBuilderOutput.fCoverageEffects->initSamplers(*fUniformManager, &texUnitIdx);
+    fProgramID = 0;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void GrGLProgram::setData(GrDrawState::BlendOptFlags blendOpts,
-                          const GrEffectStage* colorStages[],
-                          const GrEffectStage* coverageStages[],
-                          const GrDeviceCoordTexture* dstCopy,
-                          SharedGLState* sharedState) {
-    const GrDrawState& drawState = fGpu->getDrawState();
-
-    GrColor color;
-    GrColor coverage;
-    if (blendOpts & GrDrawState::kEmitTransBlack_BlendOptFlag) {
-        color = 0;
-        coverage = 0;
-    } else if (blendOpts & GrDrawState::kEmitCoverage_BlendOptFlag) {
-        color = 0xffffffff;
-        coverage = drawState.getCoverageColor();
-    } else {
-        color = drawState.getColor();
-        coverage = drawState.getCoverageColor();
-    }
-
-    this->setColor(drawState, color, sharedState);
-    this->setCoverage(drawState, coverage, sharedState);
-    this->setMatrixAndRenderTargetHeight(drawState);
-
-    if (NULL != dstCopy) {
-        if (fBuilderOutput.fUniformHandles.fDstCopyTopLeftUni.isValid()) {
-            fUniformManager->set2f(fBuilderOutput.fUniformHandles.fDstCopyTopLeftUni,
-                                   static_cast<GrGLfloat>(dstCopy->offset().fX),
-                                   static_cast<GrGLfloat>(dstCopy->offset().fY));
-            fUniformManager->set2f(fBuilderOutput.fUniformHandles.fDstCopyScaleUni,
-                                   1.f / dstCopy->texture()->width(),
-                                   1.f / dstCopy->texture()->height());
-            GrGLTexture* texture = static_cast<GrGLTexture*>(dstCopy->texture());
-            static GrTextureParams kParams; // the default is clamp, nearest filtering.
-            fGpu->bindTexture(fDstCopyTexUnit, kParams, texture);
-        } else {
-            SkASSERT(!fBuilderOutput.fUniformHandles.fDstCopyScaleUni.isValid());
-            SkASSERT(!fBuilderOutput.fUniformHandles.fDstCopySamplerUni.isValid());
-        }
-    } else {
-        SkASSERT(!fBuilderOutput.fUniformHandles.fDstCopyTopLeftUni.isValid());
-        SkASSERT(!fBuilderOutput.fUniformHandles.fDstCopyScaleUni.isValid());
-        SkASSERT(!fBuilderOutput.fUniformHandles.fDstCopySamplerUni.isValid());
-    }
-
-    fBuilderOutput.fColorEffects->setData(fGpu, *fUniformManager, colorStages);
-    fBuilderOutput.fCoverageEffects->setData(fGpu, *fUniformManager, coverageStages);
-
-
-    // PathTexGen state applies to the the fixed function vertex shader. For
-    // custom shaders, it's ignored, so we don't need to change the texgen
-    // settings in that case.
-    if (!fBuilderOutput.fHasVertexShader) {
-        fGpu->flushPathTexGenSettings(fBuilderOutput.fTexCoordSetCnt);
+template <class Proc>
+static void append_texture_bindings(const Proc* ip,
+                                    const GrProcessor& processor,
+                                    SkTArray<const GrTextureAccess*>* textureBindings) {
+    if (int numTextures = processor.numTextures()) {
+        SkASSERT(textureBindings->count() == ip->fSamplersIdx);
+        const GrTextureAccess** bindings = textureBindings->push_back_n(numTextures);
+        int i = 0;
+        do {
+            bindings[i] = &processor.textureAccess(i);
+        } while (++i < numTextures);
     }
 }
 
-void GrGLProgram::setColor(const GrDrawState& drawState,
-                           GrColor color,
-                           SharedGLState* sharedState) {
-    const GrGLProgramDesc::KeyHeader& header = fDesc.getHeader();
-    if (!drawState.hasColorVertexAttribute() || drawState.canIgnoreColorAttribute()) {
-        switch (header.fColorInput) {
-            case GrGLProgramDesc::kAttribute_ColorInput:
-                SkASSERT(-1 != header.fColorAttributeIndex);
-                if (sharedState->fConstAttribColor != color ||
-                    sharedState->fConstAttribColorIndex != header.fColorAttributeIndex) {
-                    // OpenGL ES only supports the float varieties of glVertexAttrib
-                    GrGLfloat c[4];
-                    GrColorToRGBAFloat(color, c);
-                    GL_CALL(VertexAttrib4fv(header.fColorAttributeIndex, c));
-                    sharedState->fConstAttribColor = color;
-                    sharedState->fConstAttribColorIndex = header.fColorAttributeIndex;
-                }
-                break;
-            case GrGLProgramDesc::kUniform_ColorInput:
-                if (fColor != color && fBuilderOutput.fUniformHandles.fColorUni.isValid()) {
-                    // OpenGL ES doesn't support unsigned byte varieties of glUniform
-                    GrGLfloat c[4];
-                    GrColorToRGBAFloat(color, c);
-                    fUniformManager->set4fv(fBuilderOutput.fUniformHandles.fColorUni, 1, c);
-                    fColor = color;
-                }
-                sharedState->fConstAttribColorIndex = -1;
-                break;
-            default:
-                SkFAIL("Unexpected color type.");
-        }
-    } else {
-        sharedState->fConstAttribColorIndex = -1;
-    }
+void GrGLProgram::setData(const GrPrimitiveProcessor& primProc,
+                          const GrPipeline& pipeline,
+                          SkTArray<const GrTextureAccess*>* textureBindings) {
+    this->setRenderTargetState(primProc, pipeline);
+
+    // we set the textures, and uniforms for installed processors in a generic way, but subclasses
+    // of GLProgram determine how to set coord transforms
+    fGeometryProcessor->fGLProc->setData(fProgramDataManager, primProc);
+    append_texture_bindings(fGeometryProcessor.get(), primProc, textureBindings);
+
+    this->setFragmentData(primProc, pipeline, textureBindings);
+
+    const GrXferProcessor& xp = *pipeline.getXferProcessor();
+    fXferProcessor->fGLProc->setData(fProgramDataManager, xp);
+    append_texture_bindings(fXferProcessor.get(), xp, textureBindings);
 }
 
-void GrGLProgram::setCoverage(const GrDrawState& drawState,
-                              GrColor coverage,
-                              SharedGLState* sharedState) {
-    const GrGLProgramDesc::KeyHeader& header = fDesc.getHeader();
-    if (!drawState.hasCoverageVertexAttribute()) {
-        switch (header.fCoverageInput) {
-            case GrGLProgramDesc::kAttribute_ColorInput:
-                if (sharedState->fConstAttribCoverage != coverage ||
-                    sharedState->fConstAttribCoverageIndex != header.fCoverageAttributeIndex) {
-                    // OpenGL ES only supports the float varieties of  glVertexAttrib
-                    GrGLfloat c[4];
-                    GrColorToRGBAFloat(coverage, c);
-                    GL_CALL(VertexAttrib4fv(header.fCoverageAttributeIndex, c));
-                    sharedState->fConstAttribCoverage = coverage;
-                    sharedState->fConstAttribCoverageIndex = header.fCoverageAttributeIndex;
-                }
-                break;
-            case GrGLProgramDesc::kUniform_ColorInput:
-                if (fCoverage != coverage) {
-                    // OpenGL ES doesn't support unsigned byte varieties of glUniform
-                    GrGLfloat c[4];
-                    GrColorToRGBAFloat(coverage, c);
-                    fUniformManager->set4fv(fBuilderOutput.fUniformHandles.fCoverageUni, 1, c);
-                    fCoverage = coverage;
-                }
-                sharedState->fConstAttribCoverageIndex = -1;
-                break;
-            case GrGLProgramDesc::kSolidWhite_ColorInput:
-                sharedState->fConstAttribCoverageIndex = -1;
-                break;
-            default:
-                SkFAIL("Unexpected coverage type.");
-        }
-    } else {
-        sharedState->fConstAttribCoverageIndex = -1;
+void GrGLProgram::setFragmentData(const GrPrimitiveProcessor& primProc,
+                                  const GrPipeline& pipeline,
+                                  SkTArray<const GrTextureAccess*>* textureBindings) {
+    int numProcessors = fFragmentProcessors->fProcs.count();
+    for (int i = 0; i < numProcessors; ++i) {
+        const GrFragmentProcessor& processor = pipeline.getFragmentProcessor(i);
+        fFragmentProcessors->fProcs[i]->fGLProc->setData(fProgramDataManager, processor);
+        this->setTransformData(primProc,
+                               processor,
+                               i,
+                               fFragmentProcessors->fProcs[i]);
+        append_texture_bindings(fFragmentProcessors->fProcs[i], processor, textureBindings);
     }
 }
+void GrGLProgram::setTransformData(const GrPrimitiveProcessor& primProc,
+                                   const GrFragmentProcessor& processor,
+                                   int index,
+                                   GrGLInstalledFragProc* ip) {
+    GrGLSLPrimitiveProcessor* gp = fGeometryProcessor.get()->fGLProc.get();
+    gp->setTransformData(primProc, fProgramDataManager, index,
+                         processor.coordTransforms());
+}
 
-void GrGLProgram::setMatrixAndRenderTargetHeight(const GrDrawState& drawState) {
-    const GrRenderTarget* rt = drawState.getRenderTarget();
+void GrGLProgram::setRenderTargetState(const GrPrimitiveProcessor& primProc,
+                                       const GrPipeline& pipeline) {
+    // Load the RT height uniform if it is needed to y-flip gl_FragCoord.
+    if (fBuiltinUniformHandles.fRTHeightUni.isValid() &&
+        fRenderTargetState.fRenderTargetSize.fHeight != pipeline.getRenderTarget()->height()) {
+        fProgramDataManager.set1f(fBuiltinUniformHandles.fRTHeightUni,
+                                   SkIntToScalar(pipeline.getRenderTarget()->height()));
+    }
+
+    // set RT adjustment
+    const GrRenderTarget* rt = pipeline.getRenderTarget();
     SkISize size;
     size.set(rt->width(), rt->height());
+    if (!primProc.isPathRendering()) {
+        if (fRenderTargetState.fRenderTargetOrigin != rt->origin() ||
+            fRenderTargetState.fRenderTargetSize != size) {
+            fRenderTargetState.fRenderTargetSize = size;
+            fRenderTargetState.fRenderTargetOrigin = rt->origin();
 
-    // Load the RT height uniform if it is needed to y-flip gl_FragCoord.
-    if (fBuilderOutput.fUniformHandles.fRTHeightUni.isValid() &&
-        fMatrixState.fRenderTargetSize.fHeight != size.fHeight) {
-        fUniformManager->set1f(fBuilderOutput.fUniformHandles.fRTHeightUni,
-                               SkIntToScalar(size.fHeight));
-    }
-
-    if (!fBuilderOutput.fHasVertexShader) {
-        SkASSERT(!fBuilderOutput.fUniformHandles.fViewMatrixUni.isValid());
-        SkASSERT(!fBuilderOutput.fUniformHandles.fRTAdjustmentUni.isValid());
-        fGpu->setProjectionMatrix(drawState.getViewMatrix(), size, rt->origin());
-    } else if (fMatrixState.fRenderTargetOrigin != rt->origin() ||
-               fMatrixState.fRenderTargetSize != size ||
-               !fMatrixState.fViewMatrix.cheapEqualTo(drawState.getViewMatrix())) {
-        SkASSERT(fBuilderOutput.fUniformHandles.fViewMatrixUni.isValid());
-
-        fMatrixState.fViewMatrix = drawState.getViewMatrix();
-        fMatrixState.fRenderTargetSize = size;
-        fMatrixState.fRenderTargetOrigin = rt->origin();
-
-        GrGLfloat viewMatrix[3 * 3];
-        fMatrixState.getGLMatrix<3>(viewMatrix);
-        fUniformManager->setMatrix3f(fBuilderOutput.fUniformHandles.fViewMatrixUni, viewMatrix);
-
-        GrGLfloat rtAdjustmentVec[4];
-        fMatrixState.getRTAdjustmentVec(rtAdjustmentVec);
-        fUniformManager->set4fv(fBuilderOutput.fUniformHandles.fRTAdjustmentUni, 1, rtAdjustmentVec);
+            float rtAdjustmentVec[4];
+            fRenderTargetState.getRTAdjustmentVec(rtAdjustmentVec);
+            fProgramDataManager.set4fv(fBuiltinUniformHandles.fRTAdjustmentUni, 1, rtAdjustmentVec);
+        }
+    } else {
+        SkASSERT(fGpu->glCaps().shaderCaps()->pathRenderingSupport());
+        const GrPathProcessor& pathProc = primProc.cast<GrPathProcessor>();
+        fGpu->glPathRendering()->setProjectionMatrix(pathProc.viewMatrix(),
+                                                     size, rt->origin());
     }
 }
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLProgram.h b/gfx/skia/skia/src/gpu/gl/GrGLProgram.h
index 73a32395a29b..72fa9b01a01c 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLProgram.h
+++ b/gfx/skia/skia/src/gpu/gl/GrGLProgram.h
@@ -9,21 +9,20 @@
 #ifndef GrGLProgram_DEFINED
 #define GrGLProgram_DEFINED
 
-#include "GrDrawState.h"
 #include "GrGLContext.h"
 #include "GrGLProgramDesc.h"
-#include "GrGLShaderBuilder.h"
-#include "GrGLSL.h"
 #include "GrGLTexture.h"
-#include "GrGLUniformManager.h"
+#include "GrGLProgramDataManager.h"
+#include "glsl/GrGLSLProgramDataManager.h"
 
 #include "SkString.h"
 #include "SkXfermode.h"
 
-class GrBinHashKeyBuilder;
-class GrGLEffect;
-class GrGLProgramEffects;
-class GrGLShaderBuilder;
+#include "builders/GrGLProgramBuilder.h"
+
+class GrGLInstalledProcessors;
+class GrGLProgramBuilder;
+class GrPipeline;
 
 /**
  * This class manages a GPU program and records per-program information.
@@ -36,107 +35,46 @@ class GrGLShaderBuilder;
  */
 class GrGLProgram : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(GrGLProgram)
+    typedef GrGLProgramBuilder::BuiltinUniformHandles BuiltinUniformHandles;
 
-    static GrGLProgram* Create(GrGpuGL* gpu,
-                               const GrGLProgramDesc& desc,
-                               const GrEffectStage* colorStages[],
-                               const GrEffectStage* coverageStages[]);
-
-    virtual ~GrGLProgram();
+    ~GrGLProgram();
 
     /**
      * Call to abandon GL objects owned by this program.
      */
     void abandon();
 
-    /**
-     * The shader may modify the blend coefficients. Params are in/out.
-     */
-    void overrideBlend(GrBlendCoeff* srcCoeff, GrBlendCoeff* dstCoeff) const;
-
-    const GrGLProgramDesc& getDesc() { return fDesc; }
+    const GrProgramDesc& getDesc() { return fDesc; }
 
     /**
      * Gets the GL program ID for this program.
      */
-    GrGLuint programID() const { return fBuilderOutput.fProgramID; }
-
-    bool hasVertexShader() const { return fBuilderOutput.fHasVertexShader; }
+    GrGLuint programID() const { return fProgramID; }
 
     /**
-     * Some GL state that is relevant to programs is not stored per-program. In particular color
-     * and coverage attributes can be global state. This struct is read and updated by
-     * GrGLProgram::setColor and GrGLProgram::setCoverage to allow us to avoid setting this state
-     * redundantly.
+     * We use the RT's size and origin to adjust from Skia device space to OpenGL normalized device
+     * space and to make device space positions have the correct origin for processors that require
+     * them.
      */
-    struct SharedGLState {
-        GrColor fConstAttribColor;
-        int     fConstAttribColorIndex;
-        GrColor fConstAttribCoverage;
-        int     fConstAttribCoverageIndex;
-
-        SharedGLState() { this->invalidate(); }
-        void invalidate() {
-            fConstAttribColor = GrColor_ILLEGAL;
-            fConstAttribColorIndex = -1;
-            fConstAttribCoverage = GrColor_ILLEGAL;
-            fConstAttribCoverageIndex = -1;
-        }
-    };
-
-    /**
-     * The GrDrawState's view matrix along with the aspects of the render target determine the
-     * matrix sent to GL. The size of the render target affects the GL matrix because we must
-     * convert from Skia device coords to GL's normalized coords. Also the origin of the render
-     * target may require us to perform a mirror-flip.
-     */
-    struct MatrixState {
-        SkMatrix        fViewMatrix;
+    struct RenderTargetState {
         SkISize         fRenderTargetSize;
         GrSurfaceOrigin fRenderTargetOrigin;
 
-        MatrixState() { this->invalidate(); }
+        RenderTargetState() { this->invalidate(); }
         void invalidate() {
-            fViewMatrix = SkMatrix::InvalidMatrix();
             fRenderTargetSize.fWidth = -1;
             fRenderTargetSize.fHeight = -1;
             fRenderTargetOrigin = (GrSurfaceOrigin) -1;
         }
 
-        /**
-         * Gets a matrix that goes from local coords to Skia's device coordinates.
-         */
-        template<int Size> void getGLMatrix(GrGLfloat* destMatrix) {
-            GrGLGetMatrix<Size>(destMatrix, fViewMatrix);
-        }
-
-        /**
-         * Gets a matrix that goes from local coordinates to GL normalized device coords.
-         */
-        template<int Size> void getRTAdjustedGLMatrix(GrGLfloat* destMatrix) {
-            SkMatrix combined;
-            if (kBottomLeft_GrSurfaceOrigin == fRenderTargetOrigin) {
-                combined.setAll(SkIntToScalar(2) / fRenderTargetSize.fWidth, 0, -SK_Scalar1,
-                                0, -SkIntToScalar(2) / fRenderTargetSize.fHeight, SK_Scalar1,
-                                0, 0, 1);
-            } else {
-                combined.setAll(SkIntToScalar(2) / fRenderTargetSize.fWidth, 0, -SK_Scalar1,
-                                0, SkIntToScalar(2) / fRenderTargetSize.fHeight, -SK_Scalar1,
-                                0, 0, 1);
-            }
-            combined.preConcat(fViewMatrix);
-            GrGLGetMatrix<Size>(destMatrix, combined);
-        }
-
         /**
          * Gets a vec4 that adjusts the position from Skia device coords to GL's normalized device
          * coords. Assuming the transformed position, pos, is a homogeneous vec3, the vec, v, is
          * applied as such:
          * pos.x = dot(v.xy, pos.xz)
-         * pos.y = dot(v.zq, pos.yz)
+         * pos.y = dot(v.zw, pos.yz)
          */
-        void getRTAdjustmentVec(GrGLfloat* destVec) {
+        void getRTAdjustmentVec(float* destVec) {
             destVec[0] = 2.f / fRenderTargetSize.fWidth;
             destVec[1] = -1.f;
             if (kBottomLeft_GrSurfaceOrigin == fRenderTargetOrigin) {
@@ -150,51 +88,57 @@ public:
     };
 
     /**
-     * This function uploads uniforms and calls each GrGLEffect's setData. It is called before a
-     * draw occurs using the program after the program has already been bound. It also uses the
-     * GrGpuGL object to bind the textures required by the GrGLEffects. The color and coverage
-     * stages come from GrGLProgramDesc::Build().
+     * This function uploads uniforms, calls each GrGL*Processor's setData, and retrieves the
+     * textures that need to be bound on each unit. It is the caller's responsibility to ensure
+     * the program is bound before calling, and to bind the outgoing textures to their respective
+     * units upon return. (Each index in the array corresponds to its matching GL texture unit.)
      */
-    void setData(GrDrawState::BlendOptFlags,
-                 const GrEffectStage* colorStages[],
-                 const GrEffectStage* coverageStages[],
-                 const GrDeviceCoordTexture* dstCopy, // can be NULL
-                 SharedGLState*);
+    void setData(const GrPrimitiveProcessor&, const GrPipeline&,
+                 SkTArray<const GrTextureAccess*>* textureBindings);
 
-private:
-    typedef GrGLUniformManager::UniformHandle UniformHandle;
+protected:
+    typedef GrGLSLProgramDataManager::UniformHandle UniformHandle;
+    typedef GrGLProgramDataManager::UniformInfoArray UniformInfoArray;
+    typedef GrGLProgramDataManager::VaryingInfoArray VaryingInfoArray;
 
-    GrGLProgram(GrGpuGL*,
-                const GrGLProgramDesc&,
-                GrGLUniformManager*,
-                const GrGLShaderBuilder::GenProgramOutput&);
+    GrGLProgram(GrGLGpu*,
+                const GrProgramDesc&,
+                const BuiltinUniformHandles&,
+                GrGLuint programID,
+                const UniformInfoArray&,
+                const VaryingInfoArray&, // used for NVPR only currently
+                GrGLInstalledGeoProc* geometryProcessor,
+                GrGLInstalledXferProc* xferProcessor,
+                GrGLInstalledFragProcs* fragmentProcessors,
+                SkTArray<UniformHandle>* passSamplerUniforms);
 
-    // Sets the texture units for samplers.
-    void initSamplerUniforms();
-
-    // Helper for setData(). Makes GL calls to specify the initial color when there is not
-    // per-vertex colors.
-    void setColor(const GrDrawState&, GrColor color, SharedGLState*);
-
-    // Helper for setData(). Makes GL calls to specify the initial coverage when there is not
-    // per-vertex coverages.
-    void setCoverage(const GrDrawState&, GrColor coverage, SharedGLState*);
+    // A templated helper to loop over effects, set the transforms(via subclass) and bind textures
+    void setFragmentData(const GrPrimitiveProcessor&, const GrPipeline&,
+                         SkTArray<const GrTextureAccess*>* textureBindings);
+    void setTransformData(const GrPrimitiveProcessor&,
+                          const GrFragmentProcessor&,
+                          int index,
+                          GrGLInstalledFragProc*);
 
     // Helper for setData() that sets the view matrix and loads the render target height uniform
-    void setMatrixAndRenderTargetHeight(const GrDrawState&);
+    void setRenderTargetState(const GrPrimitiveProcessor&, const GrPipeline&);
 
     // these reflect the current values of uniforms (GL uniform values travel with program)
-    MatrixState                         fMatrixState;
-    GrColor                             fColor;
-    GrColor                             fCoverage;
-    int                                 fDstCopyTexUnit;
+    RenderTargetState fRenderTargetState;
+    BuiltinUniformHandles fBuiltinUniformHandles;
+    GrGLuint fProgramID;
 
-    GrGLShaderBuilder::GenProgramOutput fBuilderOutput;
+    // the installed effects
+    SkAutoTDelete<GrGLInstalledGeoProc> fGeometryProcessor;
+    SkAutoTDelete<GrGLInstalledXferProc> fXferProcessor;
+    SkAutoTUnref<GrGLInstalledFragProcs> fFragmentProcessors;
 
-    GrGLProgramDesc                     fDesc;
-    GrGpuGL*                            fGpu;
+    GrProgramDesc fDesc;
+    GrGLGpu* fGpu;
+    GrGLProgramDataManager fProgramDataManager;
+    SkTArray<UniformHandle> fSamplerUniforms;
 
-    SkAutoTUnref<GrGLUniformManager>    fUniformManager;
+    friend class GrGLProgramBuilder;
 
     typedef SkRefCnt INHERITED;
 };
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLProgramDataManager.cpp b/gfx/skia/skia/src/gpu/gl/GrGLProgramDataManager.cpp
new file mode 100644
index 000000000000..f0aba497201b
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/GrGLProgramDataManager.cpp
@@ -0,0 +1,301 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkMatrix.h"
+#include "gl/GrGLProgramDataManager.h"
+#include "gl/GrGLGpu.h"
+
+#define ASSERT_ARRAY_UPLOAD_IN_BOUNDS(UNI, COUNT) \
+         SkASSERT(arrayCount <= uni.fArrayCount || \
+                  (1 == arrayCount && GrGLSLShaderVar::kNonArray == uni.fArrayCount))
+
+GrGLProgramDataManager::GrGLProgramDataManager(GrGLGpu* gpu, GrGLuint programID,
+                                               const UniformInfoArray& uniforms,
+                                               const VaryingInfoArray& pathProcVaryings)
+    : fGpu(gpu)
+    , fProgramID(programID) {
+    int count = uniforms.count();
+    fUniforms.push_back_n(count);
+    for (int i = 0; i < count; i++) {
+        Uniform& uniform = fUniforms[i];
+        const UniformInfo& builderUniform = uniforms[i];
+        SkASSERT(GrGLSLShaderVar::kNonArray == builderUniform.fVariable.getArrayCount() ||
+                 builderUniform.fVariable.getArrayCount() > 0);
+        SkDEBUGCODE(
+            uniform.fArrayCount = builderUniform.fVariable.getArrayCount();
+            uniform.fType = builderUniform.fVariable.getType();
+        );
+        // TODO: Move the Xoom uniform array in both FS and VS bug workaround here.
+
+        if (GrGLProgramBuilder::kVertex_Visibility & builderUniform.fVisibility) {
+            uniform.fVSLocation = builderUniform.fLocation;
+        } else {
+            uniform.fVSLocation = kUnusedUniform;
+        }
+        if (GrGLProgramBuilder::kFragment_Visibility & builderUniform.fVisibility) {
+            uniform.fFSLocation = builderUniform.fLocation;
+        } else {
+            uniform.fFSLocation = kUnusedUniform;
+        }
+    }
+
+    // NVPR programs have separable varyings
+    count = pathProcVaryings.count();
+    fPathProcVaryings.push_back_n(count);
+    for (int i = 0; i < count; i++) {
+        SkASSERT(fGpu->glCaps().shaderCaps()->pathRenderingSupport());
+        PathProcVarying& pathProcVarying = fPathProcVaryings[i];
+        const VaryingInfo& builderPathProcVarying = pathProcVaryings[i];
+        SkASSERT(GrGLSLShaderVar::kNonArray == builderPathProcVarying.fVariable.getArrayCount() ||
+                 builderPathProcVarying.fVariable.getArrayCount() > 0);
+        SkDEBUGCODE(
+            pathProcVarying.fArrayCount = builderPathProcVarying.fVariable.getArrayCount();
+            pathProcVarying.fType = builderPathProcVarying.fVariable.getType();
+        );
+        pathProcVarying.fLocation = builderPathProcVarying.fLocation;
+    }
+}
+
+void GrGLProgramDataManager::setSampler(UniformHandle u, int texUnit) const {
+    const Uniform& uni = fUniforms[u.toIndex()];
+    SkASSERT(uni.fType == kSampler2D_GrSLType || uni.fType == kSamplerExternal_GrSLType);
+    SkASSERT(GrGLSLShaderVar::kNonArray == uni.fArrayCount);
+    // FIXME: We still insert a single sampler uniform for every stage. If the shader does not
+    // reference the sampler then the compiler may have optimized it out. Uncomment this assert
+    // once stages insert their own samplers.
+    // this->printUnused(uni);
+    if (kUnusedUniform != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(), Uniform1i(uni.fFSLocation, texUnit));
+    }
+    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(), Uniform1i(uni.fVSLocation, texUnit));
+    }
+}
+
+void GrGLProgramDataManager::set1f(UniformHandle u, float v0) const {
+    const Uniform& uni = fUniforms[u.toIndex()];
+    SkASSERT(uni.fType == kFloat_GrSLType);
+    SkASSERT(GrGLSLShaderVar::kNonArray == uni.fArrayCount);
+    SkDEBUGCODE(this->printUnused(uni);)
+    if (kUnusedUniform != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(), Uniform1f(uni.fFSLocation, v0));
+    }
+    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(), Uniform1f(uni.fVSLocation, v0));
+    }
+}
+
+void GrGLProgramDataManager::set1fv(UniformHandle u,
+                                    int arrayCount,
+                                    const float v[]) const {
+    const Uniform& uni = fUniforms[u.toIndex()];
+    SkASSERT(uni.fType == kFloat_GrSLType);
+    SkASSERT(arrayCount > 0);
+    ASSERT_ARRAY_UPLOAD_IN_BOUNDS(uni, arrayCount);
+    // This assert fires in some instances of the two-pt gradient for its VSParams.
+    // Once the uniform manager is responsible for inserting the duplicate uniform
+    // arrays in VS and FS driver bug workaround, this can be enabled.
+    // this->printUni(uni);
+    if (kUnusedUniform != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(), Uniform1fv(uni.fFSLocation, arrayCount, v));
+    }
+    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(), Uniform1fv(uni.fVSLocation, arrayCount, v));
+    }
+}
+
+void GrGLProgramDataManager::set2f(UniformHandle u, float v0, float v1) const {
+    const Uniform& uni = fUniforms[u.toIndex()];
+    SkASSERT(uni.fType == kVec2f_GrSLType);
+    SkASSERT(GrGLSLShaderVar::kNonArray == uni.fArrayCount);
+    SkDEBUGCODE(this->printUnused(uni);)
+    if (kUnusedUniform != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(), Uniform2f(uni.fFSLocation, v0, v1));
+    }
+    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(), Uniform2f(uni.fVSLocation, v0, v1));
+    }
+}
+
+void GrGLProgramDataManager::set2fv(UniformHandle u,
+                                    int arrayCount,
+                                    const float v[]) const {
+    const Uniform& uni = fUniforms[u.toIndex()];
+    SkASSERT(uni.fType == kVec2f_GrSLType);
+    SkASSERT(arrayCount > 0);
+    ASSERT_ARRAY_UPLOAD_IN_BOUNDS(uni, arrayCount);
+    SkDEBUGCODE(this->printUnused(uni);)
+    if (kUnusedUniform != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(), Uniform2fv(uni.fFSLocation, arrayCount, v));
+    }
+    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(), Uniform2fv(uni.fVSLocation, arrayCount, v));
+    }
+}
+
+void GrGLProgramDataManager::set3f(UniformHandle u, float v0, float v1, float v2) const {
+    const Uniform& uni = fUniforms[u.toIndex()];
+    SkASSERT(uni.fType == kVec3f_GrSLType);
+    SkASSERT(GrGLSLShaderVar::kNonArray == uni.fArrayCount);
+    SkDEBUGCODE(this->printUnused(uni);)
+    if (kUnusedUniform != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(), Uniform3f(uni.fFSLocation, v0, v1, v2));
+    }
+    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(), Uniform3f(uni.fVSLocation, v0, v1, v2));
+    }
+}
+
+void GrGLProgramDataManager::set3fv(UniformHandle u,
+                                    int arrayCount,
+                                    const float v[]) const {
+    const Uniform& uni = fUniforms[u.toIndex()];
+    SkASSERT(uni.fType == kVec3f_GrSLType);
+    SkASSERT(arrayCount > 0);
+    ASSERT_ARRAY_UPLOAD_IN_BOUNDS(uni, arrayCount);
+    SkDEBUGCODE(this->printUnused(uni);)
+    if (kUnusedUniform != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(), Uniform3fv(uni.fFSLocation, arrayCount, v));
+    }
+    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(), Uniform3fv(uni.fVSLocation, arrayCount, v));
+    }
+}
+
+void GrGLProgramDataManager::set4f(UniformHandle u,
+                                   float v0,
+                                   float v1,
+                                   float v2,
+                                   float v3) const {
+    const Uniform& uni = fUniforms[u.toIndex()];
+    SkASSERT(uni.fType == kVec4f_GrSLType);
+    SkASSERT(GrGLSLShaderVar::kNonArray == uni.fArrayCount);
+    SkDEBUGCODE(this->printUnused(uni);)
+    if (kUnusedUniform != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(), Uniform4f(uni.fFSLocation, v0, v1, v2, v3));
+    }
+    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(), Uniform4f(uni.fVSLocation, v0, v1, v2, v3));
+    }
+}
+
+void GrGLProgramDataManager::set4fv(UniformHandle u,
+                                    int arrayCount,
+                                    const float v[]) const {
+    const Uniform& uni = fUniforms[u.toIndex()];
+    SkASSERT(uni.fType == kVec4f_GrSLType);
+    SkASSERT(arrayCount > 0);
+    ASSERT_ARRAY_UPLOAD_IN_BOUNDS(uni, arrayCount);
+    SkDEBUGCODE(this->printUnused(uni);)
+    if (kUnusedUniform != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(), Uniform4fv(uni.fFSLocation, arrayCount, v));
+    }
+    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(), Uniform4fv(uni.fVSLocation, arrayCount, v));
+    }
+}
+
+void GrGLProgramDataManager::setMatrix3f(UniformHandle u, const float matrix[]) const {
+    const Uniform& uni = fUniforms[u.toIndex()];
+    SkASSERT(uni.fType == kMat33f_GrSLType);
+    SkASSERT(GrGLSLShaderVar::kNonArray == uni.fArrayCount);
+    SkDEBUGCODE(this->printUnused(uni);)
+    if (kUnusedUniform != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(), UniformMatrix3fv(uni.fFSLocation, 1, false, matrix));
+    }
+    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(), UniformMatrix3fv(uni.fVSLocation, 1, false, matrix));
+    }
+}
+
+void GrGLProgramDataManager::setMatrix4f(UniformHandle u, const float matrix[]) const {
+    const Uniform& uni = fUniforms[u.toIndex()];
+    SkASSERT(uni.fType == kMat44f_GrSLType);
+    SkASSERT(GrGLSLShaderVar::kNonArray == uni.fArrayCount);
+    SkDEBUGCODE(this->printUnused(uni);)
+    if (kUnusedUniform != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(), UniformMatrix4fv(uni.fFSLocation, 1, false, matrix));
+    }
+    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(), UniformMatrix4fv(uni.fVSLocation, 1, false, matrix));
+    }
+}
+
+void GrGLProgramDataManager::setMatrix3fv(UniformHandle u,
+                                          int arrayCount,
+                                          const float matrices[]) const {
+    const Uniform& uni = fUniforms[u.toIndex()];
+    SkASSERT(uni.fType == kMat33f_GrSLType);
+    SkASSERT(arrayCount > 0);
+    ASSERT_ARRAY_UPLOAD_IN_BOUNDS(uni, arrayCount);
+    SkDEBUGCODE(this->printUnused(uni);)
+    if (kUnusedUniform != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(),
+                   UniformMatrix3fv(uni.fFSLocation, arrayCount, false, matrices));
+    }
+    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(),
+                   UniformMatrix3fv(uni.fVSLocation, arrayCount, false, matrices));
+    }
+}
+
+void GrGLProgramDataManager::setMatrix4fv(UniformHandle u,
+                                          int arrayCount,
+                                          const float matrices[]) const {
+    const Uniform& uni = fUniforms[u.toIndex()];
+    SkASSERT(uni.fType == kMat44f_GrSLType);
+    SkASSERT(arrayCount > 0);
+    ASSERT_ARRAY_UPLOAD_IN_BOUNDS(uni, arrayCount);
+    SkDEBUGCODE(this->printUnused(uni);)
+    if (kUnusedUniform != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(),
+                   UniformMatrix4fv(uni.fFSLocation, arrayCount, false, matrices));
+    }
+    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
+        GR_GL_CALL(fGpu->glInterface(),
+                   UniformMatrix4fv(uni.fVSLocation, arrayCount, false, matrices));
+    }
+}
+
+void GrGLProgramDataManager::setSkMatrix(UniformHandle u, const SkMatrix& matrix) const {
+    float mt[] = {
+        matrix.get(SkMatrix::kMScaleX),
+        matrix.get(SkMatrix::kMSkewY),
+        matrix.get(SkMatrix::kMPersp0),
+        matrix.get(SkMatrix::kMSkewX),
+        matrix.get(SkMatrix::kMScaleY),
+        matrix.get(SkMatrix::kMPersp1),
+        matrix.get(SkMatrix::kMTransX),
+        matrix.get(SkMatrix::kMTransY),
+        matrix.get(SkMatrix::kMPersp2),
+    };
+    this->setMatrix3f(u, mt);
+}
+
+void GrGLProgramDataManager::setPathFragmentInputTransform(VaryingHandle u,
+                                                           int components,
+                                                           const SkMatrix& matrix) const {
+    SkASSERT(fGpu->glCaps().shaderCaps()->pathRenderingSupport());
+    const PathProcVarying& fragmentInput = fPathProcVaryings[u.toIndex()];
+
+    SkASSERT((components == 2 && fragmentInput.fType == kVec2f_GrSLType) ||
+              (components == 3 && fragmentInput.fType == kVec3f_GrSLType));
+
+    fGpu->glPathRendering()->setProgramPathFragmentInputTransform(fProgramID,
+                                                                  fragmentInput.fLocation,
+                                                                  GR_GL_OBJECT_LINEAR,
+                                                                  components,
+                                                                  matrix);
+}
+
+#ifdef SK_DEBUG
+void GrGLProgramDataManager::printUnused(const Uniform& uni) const {
+    if (kUnusedUniform == uni.fFSLocation && kUnusedUniform == uni.fVSLocation) {
+        GrCapsDebugf(fGpu->caps(), "Unused uniform in shader\n");
+    }
+}
+#endif
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLProgramDataManager.h b/gfx/skia/skia/src/gpu/gl/GrGLProgramDataManager.h
new file mode 100644
index 000000000000..d47745334d42
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/GrGLProgramDataManager.h
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGLProgramDataManager_DEFINED
+#define GrGLProgramDataManager_DEFINED
+
+#include "glsl/GrGLSLProgramDataManager.h"
+
+#include "GrAllocator.h"
+#include "gl/GrGLTypes.h"
+#include "glsl/GrGLSLShaderVar.h"
+
+#include "SkTArray.h"
+
+class GrGLGpu;
+class SkMatrix;
+class GrGLProgram;
+class GrGLProgramBuilder;
+
+/** Manages the resources used by a shader program.
+ * The resources are objects the program uses to communicate with the
+ * application code.
+ */
+class GrGLProgramDataManager : public GrGLSLProgramDataManager {
+public:
+    struct UniformInfo {
+        GrGLSLShaderVar fVariable;
+        uint32_t        fVisibility;
+        GrGLint         fLocation;
+    };
+
+    struct VaryingInfo {
+        GrGLSLShaderVar fVariable;
+        GrGLint         fLocation;
+    };
+
+    // This uses an allocator rather than array so that the GrGLSLShaderVars don't move in memory
+    // after they are inserted. Users of GrGLShaderBuilder get refs to the vars and ptrs to their
+    // name strings. Otherwise, we'd have to hand out copies.
+    typedef GrTAllocator<UniformInfo> UniformInfoArray;
+    typedef GrTAllocator<VaryingInfo> VaryingInfoArray;
+
+    GrGLProgramDataManager(GrGLGpu*, GrGLuint programID, const UniformInfoArray&,
+                           const VaryingInfoArray&);
+
+    /** Functions for uploading uniform values. The varities ending in v can be used to upload to an
+     *  array of uniforms. arrayCount must be <= the array count of the uniform.
+     */
+    void setSampler(UniformHandle, int texUnit) const;
+
+    void set1f(UniformHandle, float v0) const override;
+    void set1fv(UniformHandle, int arrayCount, const float v[]) const override;
+    void set2f(UniformHandle, float, float) const override;
+    void set2fv(UniformHandle, int arrayCount, const float v[]) const override;
+    void set3f(UniformHandle, float, float, float) const override;
+    void set3fv(UniformHandle, int arrayCount, const float v[]) const override;
+    void set4f(UniformHandle, float, float, float, float) const override;
+    void set4fv(UniformHandle, int arrayCount, const float v[]) const override;
+    // matrices are column-major, the first three upload a single matrix, the latter three upload
+    // arrayCount matrices into a uniform array.
+    void setMatrix3f(UniformHandle, const float matrix[]) const override;
+    void setMatrix4f(UniformHandle, const float matrix[]) const override;
+    void setMatrix3fv(UniformHandle, int arrayCount, const float matrices[]) const override;
+    void setMatrix4fv(UniformHandle, int arrayCount, const float matrices[]) const override;
+
+    // convenience method for uploading a SkMatrix to a 3x3 matrix uniform
+    void setSkMatrix(UniformHandle, const SkMatrix&) const override;
+
+    // for nvpr only
+    void setPathFragmentInputTransform(VaryingHandle u, int components,
+                                       const SkMatrix& matrix) const override;
+
+private:
+    enum {
+        kUnusedUniform = -1,
+    };
+
+    struct Uniform {
+        GrGLint     fVSLocation;
+        GrGLint     fFSLocation;
+        SkDEBUGCODE(
+            GrSLType    fType;
+            int         fArrayCount;
+        );
+    };
+
+    enum {
+        kUnusedPathProcVarying = -1,
+    };
+    struct PathProcVarying {
+        GrGLint     fLocation;
+        SkDEBUGCODE(
+            GrSLType    fType;
+            int         fArrayCount;
+        );
+    };
+
+    SkDEBUGCODE(void printUnused(const Uniform&) const;)
+
+    SkTArray<Uniform, true> fUniforms;
+    SkTArray<PathProcVarying, true> fPathProcVaryings;
+    GrGLGpu* fGpu;
+    GrGLuint fProgramID;
+
+    typedef GrGLSLProgramDataManager INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLProgramDesc.cpp b/gfx/skia/skia/src/gpu/gl/GrGLProgramDesc.cpp
index e1a319104d1d..e3d292c062ae 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLProgramDesc.cpp
+++ b/gfx/skia/skia/src/gpu/gl/GrGLProgramDesc.cpp
@@ -4,321 +4,159 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-
 #include "GrGLProgramDesc.h"
-#include "GrBackendEffectFactory.h"
-#include "GrDrawEffect.h"
-#include "GrEffect.h"
-#include "GrGLShaderBuilder.h"
-#include "GrGpuGL.h"
 
+#include "GrProcessor.h"
+#include "GrGLGpu.h"
+#include "GrPipeline.h"
 #include "SkChecksum.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
 
-bool GrGLProgramDesc::GetEffectKeyAndUpdateStats(const GrEffectStage& stage,
-                                                 const GrGLCaps& caps,
-                                                 bool useExplicitLocalCoords,
-                                                 GrEffectKeyBuilder* b,
-                                                 uint16_t* effectKeySize,
-                                                 bool* setTrueIfReadsDst,
-                                                 bool* setTrueIfReadsPos,
-                                                 bool* setTrueIfHasVertexCode) {
-    const GrBackendEffectFactory& factory = stage.getEffect()->getFactory();
-    GrDrawEffect drawEffect(stage, useExplicitLocalCoords);
-    if (stage.getEffect()->willReadDstColor()) {
-        *setTrueIfReadsDst = true;
-    }
-    if (stage.getEffect()->willReadFragmentPosition()) {
-        *setTrueIfReadsPos = true;
-    }
-    if (stage.getEffect()->hasVertexCode()) {
-        *setTrueIfHasVertexCode = true;
-    }
-    factory.getGLEffectKey(drawEffect, caps, b);
-    size_t size = b->size();
-    if (size > SK_MaxU16) {
-        *effectKeySize = 0; // suppresses a warning.
+/**
+ * Do we need to either map r,g,b->a or a->r. configComponentMask indicates which channels are
+ * present in the texture's config. swizzleComponentMask indicates the channels present in the
+ * shader swizzle.
+ */
+static bool swizzle_requires_alpha_remapping(const GrGLSLCaps& caps, GrPixelConfig config) {
+    if (!caps.mustSwizzleInShader()) {
+        // Any remapping is handled using texture swizzling not shader modifications.
         return false;
     }
-    *effectKeySize = SkToU16(size);
-    if (!GrGLProgramEffects::GenEffectMetaKey(drawEffect, caps, b)) {
+    const char* swizzleMap = caps.getSwizzleMap(config);
+    
+    return SkToBool(memcmp(swizzleMap, "rgba", 4));
+}
+
+static uint32_t gen_texture_key(const GrProcessor& proc, const GrGLCaps& caps) {
+    uint32_t key = 0;
+    int numTextures = proc.numTextures();
+    int shift = 0;
+    for (int t = 0; t < numTextures; ++t) {
+        const GrTextureAccess& access = proc.textureAccess(t);
+        if (swizzle_requires_alpha_remapping(*caps.glslCaps(), access.getTexture()->config())) {
+            key |= 1 << shift;
+        }
+        if (GR_GL_TEXTURE_EXTERNAL == static_cast<GrGLTexture*>(access.getTexture())->target()) {
+            key |= 2 << shift;
+        }
+        shift += 2;
+    }
+    return key;
+}
+
+/**
+ * A function which emits a meta key into the key builder.  This is required because shader code may
+ * be dependent on properties of the effect that the effect itself doesn't use
+ * in its key (e.g. the pixel format of textures used). So we create a meta-key for
+ * every effect using this function. It is also responsible for inserting the effect's class ID
+ * which must be different for every GrProcessor subclass. It can fail if an effect uses too many
+ * textures, transforms, etc, for the space allotted in the meta-key.  NOTE, both FPs and GPs share
+ * this function because it is hairy, though FPs do not have attribs, and GPs do not have transforms
+ */
+static bool gen_meta_key(const GrProcessor& proc,
+                         const GrGLCaps& caps,
+                         uint32_t transformKey,
+                         GrProcessorKeyBuilder* b) {
+    size_t processorKeySize = b->size();
+    uint32_t textureKey = gen_texture_key(proc, caps);
+    uint32_t classID = proc.classID();
+
+    // Currently we allow 16 bits for the class id and the overall processor key size.
+    static const uint32_t kMetaKeyInvalidMask = ~((uint32_t) SK_MaxU16);
+    if ((processorKeySize | classID) & kMetaKeyInvalidMask) {
         return false;
     }
+
+    uint32_t* key = b->add32n(3);
+    key[0] = (classID << 16) | SkToU32(processorKeySize);
+    key[1] = textureKey;
+    key[2] = transformKey;
     return true;
 }
 
-bool GrGLProgramDesc::Build(const GrDrawState& drawState,
-                            GrGpu::DrawType drawType,
-                            GrDrawState::BlendOptFlags blendOpts,
-                            GrBlendCoeff srcCoeff,
-                            GrBlendCoeff dstCoeff,
-                            const GrGpuGL* gpu,
-                            const GrDeviceCoordTexture* dstCopy,
-                            SkTArray<const GrEffectStage*, true>* colorStages,
-                            SkTArray<const GrEffectStage*, true>* coverageStages,
-                            GrGLProgramDesc* desc) {
-    colorStages->reset();
-    coverageStages->reset();
-
-    // This should already have been caught
-    SkASSERT(!(GrDrawState::kSkipDraw_BlendOptFlag & blendOpts));
-
-    bool skipCoverage = SkToBool(blendOpts & GrDrawState::kEmitTransBlack_BlendOptFlag);
-
-    bool skipColor = SkToBool(blendOpts & (GrDrawState::kEmitTransBlack_BlendOptFlag |
-                                           GrDrawState::kEmitCoverage_BlendOptFlag));
-
-    int firstEffectiveColorStage = 0;
-    bool inputColorIsUsed = true;
-    if (!skipColor) {
-        firstEffectiveColorStage = drawState.numColorStages();
-        while (firstEffectiveColorStage > 0 && inputColorIsUsed) {
-            --firstEffectiveColorStage;
-            const GrEffect* effect = drawState.getColorStage(firstEffectiveColorStage).getEffect();
-            inputColorIsUsed = effect->willUseInputColor();
+static bool gen_frag_proc_and_meta_keys(const GrPrimitiveProcessor& primProc,
+                                        const GrFragmentProcessor& fp,
+                                        const GrGLCaps& caps,
+                                        GrProcessorKeyBuilder* b) {
+    for (int i = 0; i < fp.numChildProcessors(); ++i) {
+        if (!gen_frag_proc_and_meta_keys(primProc, fp.childProcessor(i), caps, b)) {
+            return false;
         }
     }
 
-    int firstEffectiveCoverageStage = 0;
-    bool inputCoverageIsUsed = true;
-    if (!skipCoverage) {
-        firstEffectiveCoverageStage = drawState.numCoverageStages();
-        while (firstEffectiveCoverageStage > 0 && inputCoverageIsUsed) {
-            --firstEffectiveCoverageStage;
-            const GrEffect* effect = drawState.getCoverageStage(firstEffectiveCoverageStage).getEffect();
-            inputCoverageIsUsed = effect->willUseInputColor();
-        }
-    }
+    fp.getGLSLProcessorKey(*caps.glslCaps(), b);
 
+    //**** use glslCaps here?
+    return gen_meta_key(fp, caps, primProc.getTransformKey(fp.coordTransforms(),
+                                                           fp.numTransformsExclChildren()), b);
+}
+
+bool GrGLProgramDescBuilder::Build(GrProgramDesc* desc,
+                                   const GrPrimitiveProcessor& primProc,
+                                   const GrPipeline& pipeline,
+                                   const GrGLGpu* gpu) {
     // The descriptor is used as a cache key. Thus when a field of the
     // descriptor will not affect program generation (because of the attribute
     // bindings in use or other descriptor field settings) it should be set
     // to a canonical value to avoid duplicate programs with different keys.
 
-    bool requiresColorAttrib = !skipColor && drawState.hasColorVertexAttribute();
-    bool requiresCoverageAttrib = !skipCoverage && drawState.hasCoverageVertexAttribute();
-    // we only need the local coords if we're actually going to generate effect code
-    bool requiresLocalCoordAttrib = !(skipCoverage  && skipColor) &&
-                                    drawState.hasLocalCoordAttribute();
+    GrGLProgramDesc* glDesc = (GrGLProgramDesc*) desc;
 
-    bool readsDst = false;
-    bool readFragPosition = false;
-    // We use vertexshader-less shader programs only when drawing paths.
-    bool hasVertexCode = !(GrGpu::kDrawPath_DrawType == drawType ||
-                           GrGpu::kDrawPaths_DrawType == drawType);
-    int numStages = 0;
-    if (!skipColor) {
-        numStages += drawState.numColorStages() - firstEffectiveColorStage;
-    }
-    if (!skipCoverage) {
-        numStages += drawState.numCoverageStages() - firstEffectiveCoverageStage;
-    }
-    GR_STATIC_ASSERT(0 == kEffectKeyOffsetsAndLengthOffset % sizeof(uint32_t));
-    // Make room for everything up to and including the array of offsets to effect keys.
-    desc->fKey.reset();
-    desc->fKey.push_back_n(kEffectKeyOffsetsAndLengthOffset + 2 * sizeof(uint16_t) * numStages);
+    GR_STATIC_ASSERT(0 == kProcessorKeysOffset % sizeof(uint32_t));
+    // Make room for everything up to the effect keys.
+    glDesc->key().reset();
+    glDesc->key().push_back_n(kProcessorKeysOffset);
 
-    int offsetAndSizeIndex = 0;
+    GrProcessorKeyBuilder b(&glDesc->key());
 
-    bool effectKeySuccess = true;
-    if (!skipColor) {
-        for (int s = firstEffectiveColorStage; s < drawState.numColorStages(); ++s) {
-            uint16_t* offsetAndSize =
-                reinterpret_cast<uint16_t*>(desc->fKey.begin() + kEffectKeyOffsetsAndLengthOffset +
-                                            offsetAndSizeIndex * 2 * sizeof(uint16_t));
-
-            GrEffectKeyBuilder b(&desc->fKey);
-            uint16_t effectKeySize;
-            uint32_t effectOffset = desc->fKey.count();
-            effectKeySuccess |= GetEffectKeyAndUpdateStats(
-                                    drawState.getColorStage(s), gpu->glCaps(),
-                                    requiresLocalCoordAttrib, &b,
-                                    &effectKeySize, &readsDst,
-                                    &readFragPosition, &hasVertexCode);
-            effectKeySuccess |= (effectOffset <= SK_MaxU16);
-
-            offsetAndSize[0] = SkToU16(effectOffset);
-            offsetAndSize[1] = effectKeySize;
-            ++offsetAndSizeIndex;
-        }
-    }
-    if (!skipCoverage) {
-        for (int s = firstEffectiveCoverageStage; s < drawState.numCoverageStages(); ++s) {
-            uint16_t* offsetAndSize =
-                reinterpret_cast<uint16_t*>(desc->fKey.begin() + kEffectKeyOffsetsAndLengthOffset +
-                                            offsetAndSizeIndex * 2 * sizeof(uint16_t));
-
-            GrEffectKeyBuilder b(&desc->fKey);
-            uint16_t effectKeySize;
-            uint32_t effectOffset = desc->fKey.count();
-            effectKeySuccess |= GetEffectKeyAndUpdateStats(
-                                    drawState.getCoverageStage(s), gpu->glCaps(),
-                                    requiresLocalCoordAttrib, &b,
-                                    &effectKeySize, &readsDst,
-                                    &readFragPosition, &hasVertexCode);
-            effectKeySuccess |= (effectOffset <= SK_MaxU16);
-
-            offsetAndSize[0] = SkToU16(effectOffset);
-            offsetAndSize[1] = effectKeySize;
-            ++offsetAndSizeIndex;
-        }
-    }
-    if (!effectKeySuccess) {
-        desc->fKey.reset();
+    primProc.getGLSLProcessorKey(*gpu->glCaps().glslCaps(), &b);
+    //**** use glslCaps here?
+    if (!gen_meta_key(primProc, gpu->glCaps(), 0, &b)) {
+        glDesc->key().reset();
         return false;
     }
 
-    KeyHeader* header = desc->header();
-    // make sure any padding in the header is zeroed.
-    memset(desc->header(), 0, kHeaderSize);
+    for (int i = 0; i < pipeline.numFragmentProcessors(); ++i) {
+        const GrFragmentProcessor& fp = pipeline.getFragmentProcessor(i);
+        if (!gen_frag_proc_and_meta_keys(primProc, fp, gpu->glCaps(), &b)) {
+            glDesc->key().reset();
+            return false;
+        }
+    }
 
+    const GrXferProcessor& xp = *pipeline.getXferProcessor();
+    xp.getGLSLProcessorKey(*gpu->glCaps().glslCaps(), &b);
+    //**** use glslCaps here?
+    if (!gen_meta_key(xp, gpu->glCaps(), 0, &b)) {
+        glDesc->key().reset();
+        return false;
+    }
+
+    // --------DO NOT MOVE HEADER ABOVE THIS LINE--------------------------------------------------
     // Because header is a pointer into the dynamic array, we can't push any new data into the key
     // below here.
+    KeyHeader* header = glDesc->atOffset<KeyHeader, kHeaderOffset>();
 
-    header->fHasVertexCode = hasVertexCode || requiresLocalCoordAttrib;
-    header->fEmitsPointSize = GrGpu::kDrawPoints_DrawType == drawType;
+    // make sure any padding in the header is zeroed.
+    memset(header, 0, kHeaderSize);
 
-    // Currently the experimental GS will only work with triangle prims (and it doesn't do anything
-    // other than pass through values from the VS to the FS anyway).
-#if GR_GL_EXPERIMENTAL_GS
-#if 0
-    header->fExperimentalGS = gpu->caps().geometryShaderSupport();
-#else
-    header->fExperimentalGS = false;
-#endif
-#endif
-    bool defaultToUniformInputs = GR_GL_NO_CONSTANT_ATTRIBUTES || gpu->caps()->pathRenderingSupport();
-
-    if (defaultToUniformInputs && !requiresColorAttrib && inputColorIsUsed) {
-        header->fColorInput = kUniform_ColorInput;
-    } else {
-        header->fColorInput = kAttribute_ColorInput;
-        header->fHasVertexCode = true;
-    }
-
-    bool covIsSolidWhite = !requiresCoverageAttrib && 0xffffffff == drawState.getCoverageColor();
-
-    if ((covIsSolidWhite || !inputCoverageIsUsed) && !skipCoverage) {
-        header->fCoverageInput = kSolidWhite_ColorInput;
-    } else if (defaultToUniformInputs && !requiresCoverageAttrib && inputCoverageIsUsed) {
-        header->fCoverageInput = kUniform_ColorInput;
-    } else {
-        header->fCoverageInput = kAttribute_ColorInput;
-        header->fHasVertexCode = true;
-    }
-
-    if (readsDst) {
-        SkASSERT(NULL != dstCopy || gpu->caps()->dstReadInShaderSupport());
-        const GrTexture* dstCopyTexture = NULL;
-        if (NULL != dstCopy) {
-            dstCopyTexture = dstCopy->texture();
-        }
-        header->fDstReadKey = GrGLShaderBuilder::KeyForDstRead(dstCopyTexture, gpu->glCaps());
-        SkASSERT(0 != header->fDstReadKey);
-    } else {
-        header->fDstReadKey = 0;
-    }
-
-    if (readFragPosition) {
-        header->fFragPosKey = GrGLShaderBuilder::KeyForFragmentPosition(drawState.getRenderTarget(),
-                                                                      gpu->glCaps());
+    if (pipeline.readsFragPosition()) {
+        header->fFragPosKey =
+                GrGLSLFragmentShaderBuilder::KeyForFragmentPosition(pipeline.getRenderTarget());
     } else {
         header->fFragPosKey = 0;
     }
 
-    // Record attribute indices
-    header->fPositionAttributeIndex = drawState.positionAttributeIndex();
-    header->fLocalCoordAttributeIndex = drawState.localCoordAttributeIndex();
-
-    // For constant color and coverage we need an attribute with an index beyond those already set
-    int availableAttributeIndex = drawState.getVertexAttribCount();
-    if (requiresColorAttrib) {
-        header->fColorAttributeIndex = drawState.colorVertexAttributeIndex();
-    } else if (GrGLProgramDesc::kAttribute_ColorInput == header->fColorInput) {
-        SkASSERT(availableAttributeIndex < GrDrawState::kMaxVertexAttribCnt);
-        header->fColorAttributeIndex = availableAttributeIndex;
-        availableAttributeIndex++;
+    if (pipeline.ignoresCoverage()) {
+        header->fIgnoresCoverage = 1;
     } else {
-        header->fColorAttributeIndex = -1;
+        header->fIgnoresCoverage = 0;
     }
 
-    if (requiresCoverageAttrib) {
-        header->fCoverageAttributeIndex = drawState.coverageVertexAttributeIndex();
-    } else if (GrGLProgramDesc::kAttribute_ColorInput == header->fCoverageInput) {
-        SkASSERT(availableAttributeIndex < GrDrawState::kMaxVertexAttribCnt);
-        header->fCoverageAttributeIndex = availableAttributeIndex;
-    } else {
-        header->fCoverageAttributeIndex = -1;
-    }
-
-    // Here we deal with whether/how we handle color and coverage separately.
-
-    // Set this default and then possibly change our mind if there is coverage.
-    header->fCoverageOutput = kModulate_CoverageOutput;
-
-    // If we do have coverage determine whether it matters.
-    bool separateCoverageFromColor = false;
-    if (!drawState.isCoverageDrawing() && !skipCoverage &&
-        (drawState.numCoverageStages() > 0 || requiresCoverageAttrib)) {
-
-        if (gpu->caps()->dualSourceBlendingSupport() &&
-            !(blendOpts & (GrDrawState::kEmitCoverage_BlendOptFlag |
-                           GrDrawState::kCoverageAsAlpha_BlendOptFlag))) {
-            if (kZero_GrBlendCoeff == dstCoeff) {
-                // write the coverage value to second color
-                header->fCoverageOutput =  kSecondaryCoverage_CoverageOutput;
-                separateCoverageFromColor = true;
-            } else if (kSA_GrBlendCoeff == dstCoeff) {
-                // SA dst coeff becomes 1-(1-SA)*coverage when dst is partially covered.
-                header->fCoverageOutput = kSecondaryCoverageISA_CoverageOutput;
-                separateCoverageFromColor = true;
-            } else if (kSC_GrBlendCoeff == dstCoeff) {
-                // SA dst coeff becomes 1-(1-SA)*coverage when dst is partially covered.
-                header->fCoverageOutput = kSecondaryCoverageISC_CoverageOutput;
-                separateCoverageFromColor = true;
-            }
-        } else if (readsDst &&
-                   kOne_GrBlendCoeff == srcCoeff &&
-                   kZero_GrBlendCoeff == dstCoeff) {
-            header->fCoverageOutput = kCombineWithDst_CoverageOutput;
-            separateCoverageFromColor = true;
-        }
-    }
-    if (!skipColor) {
-        for (int s = firstEffectiveColorStage; s < drawState.numColorStages(); ++s) {
-            colorStages->push_back(&drawState.getColorStage(s));
-        }
-    }
-    if (!skipCoverage) {
-        SkTArray<const GrEffectStage*, true>* array;
-        if (separateCoverageFromColor) {
-            array = coverageStages;
-        } else {
-            array = colorStages;
-        }
-        for (int s = firstEffectiveCoverageStage; s < drawState.numCoverageStages(); ++s) {
-            array->push_back(&drawState.getCoverageStage(s));
-        }
-    }
-    header->fColorEffectCnt = colorStages->count();
-    header->fCoverageEffectCnt = coverageStages->count();
-
-    desc->finalize();
+    header->fSnapVerticesToPixelCenters = pipeline.snapVerticesToPixelCenters();
+    header->fColorEffectCnt = pipeline.numColorFragmentProcessors();
+    header->fCoverageEffectCnt = pipeline.numCoverageFragmentProcessors();
+    glDesc->finalize();
     return true;
 }
-
-void GrGLProgramDesc::finalize() {
-    int keyLength = fKey.count();
-    SkASSERT(0 == (keyLength % 4));
-    *this->atOffset<uint32_t, kLengthOffset>() = SkToU32(keyLength);
-
-    uint32_t* checksum = this->atOffset<uint32_t, kChecksumOffset>();
-    *checksum = 0;
-    *checksum = SkChecksum::Compute(reinterpret_cast<uint32_t*>(fKey.begin()), keyLength);
-}
-
-GrGLProgramDesc& GrGLProgramDesc::operator= (const GrGLProgramDesc& other) {
-    size_t keyLength = other.keyLength();
-    fKey.reset(keyLength);
-    memcpy(fKey.begin(), other.fKey.begin(), keyLength);
-    return *this;
-}
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLProgramDesc.h b/gfx/skia/skia/src/gpu/gl/GrGLProgramDesc.h
index cccdee9ce2c4..7ce79ecae9e3 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLProgramDesc.h
+++ b/gfx/skia/skia/src/gpu/gl/GrGLProgramDesc.h
@@ -8,253 +8,58 @@
 #ifndef GrGLProgramDesc_DEFINED
 #define GrGLProgramDesc_DEFINED
 
-#include "GrGLEffect.h"
-#include "GrDrawState.h"
+#include "GrColor.h"
+#include "GrProgramDesc.h"
 #include "GrGpu.h"
+#include "GrTypesPriv.h"
 
-class GrGpuGL;
+class GrGLGpu;
+class GrGLProgramDescBuilder;
 
-#ifdef SK_DEBUG
-  // Optionally compile the experimental GS code. Set to SK_DEBUG so that debug build bots will
-  // execute the code.
-  #define GR_GL_EXPERIMENTAL_GS 1
-#else
-  #define GR_GL_EXPERIMENTAL_GS 0
-#endif
+class GrGLProgramDesc : public GrProgramDesc {
+    friend class GrGLProgramDescBuilder;
+};
 
-
-/** This class describes a program to generate. It also serves as a program cache key. Very little
-    of this is GL-specific. The GL-specific parts could be factored out into a subclass. */
-class GrGLProgramDesc {
+/**
+ * This class can be used to build a GrProgramDesc.  It also provides helpers for accessing
+ * GL specific info in the header.
+ */
+class GrGLProgramDescBuilder {
 public:
-    GrGLProgramDesc() {}
-    GrGLProgramDesc(const GrGLProgramDesc& desc) { *this = desc; }
-
-    // Returns this as a uint32_t array to be used as a key in the program cache.
-    const uint32_t* asKey() const {
-        return reinterpret_cast<const uint32_t*>(fKey.begin());
-    }
-
-    // Gets the number of bytes in asKey(). It will be a 4-byte aligned value. When comparing two
-    // keys the size of either key can be used with memcmp() since the lengths themselves begin the
-    // keys and thus the memcmp will exit early if the keys are of different lengths.
-    uint32_t keyLength() const { return *this->atOffset<uint32_t, kLengthOffset>(); }
-
-    // Gets the a checksum of the key. Can be used as a hash value for a fast lookup in a cache.
-    uint32_t getChecksum() const { return *this->atOffset<uint32_t, kChecksumOffset>(); }
-
-    // For unit testing.
-    bool setRandom(SkRandom*,
-                   const GrGpuGL* gpu,
-                   const GrRenderTarget* dummyDstRenderTarget,
-                   const GrTexture* dummyDstCopyTexture,
-                   const GrEffectStage* stages[],
-                   int numColorStages,
-                   int numCoverageStages,
-                   int currAttribIndex);
-
-    /**
-     * Builds a program descriptor from a GrDrawState. Whether the primitive type is points, the
-     * output of GrDrawState::getBlendOpts, and the caps of the GrGpuGL are also inputs. It also
-     * outputs the color and coverage stages referenced by the generated descriptor. This may
-     * not contain all stages from the draw state and coverage stages from the drawState may
-     * be treated as color stages in the output.
-     */
-    static bool Build(const GrDrawState&,
-                      GrGpu::DrawType drawType,
-                      GrDrawState::BlendOptFlags,
-                      GrBlendCoeff srcCoeff,
-                      GrBlendCoeff dstCoeff,
-                      const GrGpuGL* gpu,
-                      const GrDeviceCoordTexture* dstCopy,
-                      SkTArray<const GrEffectStage*, true>* outColorStages,
-                      SkTArray<const GrEffectStage*, true>* outCoverageStages,
-                      GrGLProgramDesc* outDesc);
-
-    int numColorEffects() const {
-        return this->getHeader().fColorEffectCnt;
-    }
-
-    int numCoverageEffects() const {
-        return this->getHeader().fCoverageEffectCnt;
-    }
-
-    int numTotalEffects() const { return this->numColorEffects() + this->numCoverageEffects(); }
-
-    GrGLProgramDesc& operator= (const GrGLProgramDesc& other);
-
-    bool operator== (const GrGLProgramDesc& other) const {
-        // The length is masked as a hint to the compiler that the address will be 4 byte aligned.
-        return 0 == memcmp(this->asKey(), other.asKey(), this->keyLength() & ~0x3);
-    }
-
-    bool operator!= (const GrGLProgramDesc& other) const {
-        return !(*this == other);
-    }
-
-    static bool Less(const GrGLProgramDesc& a, const GrGLProgramDesc& b) {
-        return memcmp(a.asKey(), b.asKey(), a.keyLength() & ~0x3) < 0;
-    }
-
-private:
-    // Specifies where the initial color comes from before the stages are applied.
-    enum ColorInput {
-        kSolidWhite_ColorInput,
-        kAttribute_ColorInput,
-        kUniform_ColorInput,
-
-        kColorInputCnt
-    };
-
-    enum CoverageOutput {
-        // modulate color and coverage, write result as the color output.
-        kModulate_CoverageOutput,
-        // Writes color*coverage as the primary color output and also writes coverage as the
-        // secondary output. Only set if dual source blending is supported.
-        kSecondaryCoverage_CoverageOutput,
-        // Writes color*coverage as the primary color output and also writes coverage * (1 - colorA)
-        // as the secondary output. Only set if dual source blending is supported.
-        kSecondaryCoverageISA_CoverageOutput,
-        // Writes color*coverage as the primary color output and also writes coverage *
-        // (1 - colorRGB) as the secondary output. Only set if dual source blending is supported.
-        kSecondaryCoverageISC_CoverageOutput,
-        // Combines the coverage, dst, and color as coverage * color + (1 - coverage) * dst. This
-        // can only be set if fDstReadKey is non-zero.
-        kCombineWithDst_CoverageOutput,
-
-        kCoverageOutputCnt
-    };
-
-    static bool CoverageOutputUsesSecondaryOutput(CoverageOutput co) {
-        switch (co) {
-            case kSecondaryCoverage_CoverageOutput: //  fallthru
-            case kSecondaryCoverageISA_CoverageOutput:
-            case kSecondaryCoverageISC_CoverageOutput:
-                return true;
-            default:
-                return false;
-        }
-    }
-
-    struct KeyHeader {
-        uint8_t                     fDstReadKey;        // set by GrGLShaderBuilder if there
-                                                        // are effects that must read the dst.
-                                                        // Otherwise, 0.
-        uint8_t                     fFragPosKey;        // set by GrGLShaderBuilder if there are
-                                                        // effects that read the fragment position.
-                                                        // Otherwise, 0.
-        ColorInput                  fColorInput : 8;
-        ColorInput                  fCoverageInput : 8;
-        CoverageOutput              fCoverageOutput : 8;
-
-        SkBool8                     fHasVertexCode;
-        SkBool8                     fEmitsPointSize;
-
-        // To enable experimental geometry shader code (not for use in
-        // production)
-#if GR_GL_EXPERIMENTAL_GS
-        SkBool8                     fExperimentalGS;
-#endif
-
-        int8_t                      fPositionAttributeIndex;
-        int8_t                      fLocalCoordAttributeIndex;
-        int8_t                      fColorAttributeIndex;
-        int8_t                      fCoverageAttributeIndex;
-
-        int8_t                      fColorEffectCnt;
-        int8_t                      fCoverageEffectCnt;
-    };
-
-    // The key, stored in fKey, is composed of five parts:
+    typedef GrProgramDesc::KeyHeader KeyHeader;
+    // The key, stored in fKey, is composed of five parts(first 2 are defined in the key itself):
     // 1. uint32_t for total key length.
     // 2. uint32_t for a checksum.
     // 3. Header struct defined above.
-    // 4. An array of offsets to effect keys and their sizes (see 5). uint16_t for each
-    //    offset and size.
-    // 5. per-effect keys. Each effect's key is a variable length array of uint32_t.
+    // 4. Backend-specific information including per-processor keys and their key lengths.
+    //    Each processor's key is a variable length array of uint32_t.
     enum {
-        // Part 1.
-        kLengthOffset = 0,
-        // Part 2.
-        kChecksumOffset = kLengthOffset + sizeof(uint32_t),
         // Part 3.
-        kHeaderOffset = kChecksumOffset + sizeof(uint32_t),
+        kHeaderOffset = GrGLProgramDesc::kHeaderOffset,
         kHeaderSize = SkAlign4(sizeof(KeyHeader)),
         // Part 4.
-        // This is the offset in the overall key to the array of per-effect offset,length pairs.
-        kEffectKeyOffsetsAndLengthOffset = kHeaderOffset + kHeaderSize,
+        // This is the offset into the backenend specific part of the key, which includes
+        // per-processor keys.
+        kProcessorKeysOffset = kHeaderOffset + kHeaderSize,
     };
 
-    template<typename T, size_t OFFSET> T* atOffset() {
-        return reinterpret_cast<T*>(reinterpret_cast<intptr_t>(fKey.begin()) + OFFSET);
-    }
-
-    template<typename T, size_t OFFSET> const T* atOffset() const {
-        return reinterpret_cast<const T*>(reinterpret_cast<intptr_t>(fKey.begin()) + OFFSET);
-    }
-
-    KeyHeader* header() { return this->atOffset<KeyHeader, kHeaderOffset>(); }
-
-    // Shared code between setRandom() and Build().
-    static bool GetEffectKeyAndUpdateStats(const GrEffectStage& stage,
-                                           const GrGLCaps& caps,
-                                           bool useExplicitLocalCoords,
-                                           GrEffectKeyBuilder* b,
-                                           uint16_t* effectKeySize,
-                                           bool* setTrueIfReadsDst,
-                                           bool* setTrueIfReadsPos,
-                                           bool* setTrueIfHasVertexCode);
-
-    void finalize();
-
-    const KeyHeader& getHeader() const { return *this->atOffset<KeyHeader, kHeaderOffset>(); }
-
-    /** Used to provide effects' keys to their emitCode() function. */
-    class EffectKeyProvider {
-    public:
-        enum EffectType {
-            kColor_EffectType,
-            kCoverage_EffectType,
-        };
-
-        EffectKeyProvider(const GrGLProgramDesc* desc, EffectType type) : fDesc(desc) {
-            // Coverage effect key offsets begin immediately after those of the color effects.
-            fBaseIndex = kColor_EffectType == type ? 0 : desc->numColorEffects();
-        }
-
-        GrEffectKey get(int index) const {
-            const uint16_t* offsetsAndLengths = reinterpret_cast<const uint16_t*>(
-                fDesc->fKey.begin() + kEffectKeyOffsetsAndLengthOffset);
-            // We store two uint16_ts per effect, one for the offset to the effect's key and one for
-            // its length. Here we just need the offset.
-            uint16_t offset = offsetsAndLengths[2 * (fBaseIndex + index) + 0];
-            uint16_t length = offsetsAndLengths[2 * (fBaseIndex + index) + 1];
-            // Currently effects must add to the key in units of uint32_t.
-            SkASSERT(0 == (length % sizeof(uint32_t)));
-            return GrEffectKey(reinterpret_cast<const uint32_t*>(fDesc->fKey.begin() + offset),
-                               length / sizeof(uint32_t));
-        }
-    private:
-        const GrGLProgramDesc*  fDesc;
-        int                     fBaseIndex;
-    };
-
-    enum {
-        kMaxPreallocEffects = 8,
-        kIntsPerEffect      = 4,    // This is an overestimate of the average effect key size.
-        kPreAllocSize = kEffectKeyOffsetsAndLengthOffset +
-                        kMaxPreallocEffects * sizeof(uint32_t) * kIntsPerEffect,
-    };
-
-    SkSTArray<kPreAllocSize, uint8_t, true> fKey;
-
-    // GrGLProgram and GrGLShaderBuilder read the private fields to generate code. TODO: Split out
-    // part of GrGLShaderBuilder that is used by effects so that this header doesn't need to be
-    // visible to GrGLEffects. Then make public accessors as necessary and remove friends.
-    friend class GrGLProgram;
-    friend class GrGLShaderBuilder;
-    friend class GrGLFullShaderBuilder;
-    friend class GrGLFragmentOnlyShaderBuilder;
+    /**
+     * Builds a GL specific program descriptor
+     *
+     * @param GrPrimitiveProcessor The geometry
+     * @param GrPipeline  The optimized drawstate.  The descriptor will represent a program
+     *                        which this optstate can use to draw with.  The optstate contains
+     *                        general draw information, as well as the specific color, geometry,
+     *                        and coverage stages which will be used to generate the GL Program for
+     *                        this optstate.
+     * @param GrGLGpu  A GL Gpu, the caps and Gpu object are used to output processor specific
+     *                 parts of the descriptor.
+     * @param GrProgramDesc  The built and finalized descriptor
+     **/
+    static bool Build(GrProgramDesc*,
+                      const GrPrimitiveProcessor&,
+                      const GrPipeline&,
+                      const GrGLGpu*);
 };
 
 #endif
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLProgramEffects.cpp b/gfx/skia/skia/src/gpu/gl/GrGLProgramEffects.cpp
deleted file mode 100644
index 05b15013c21a..000000000000
--- a/gfx/skia/skia/src/gpu/gl/GrGLProgramEffects.cpp
+++ /dev/null
@@ -1,510 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrGLProgramEffects.h"
-#include "GrDrawEffect.h"
-#include "gl/GrGLEffect.h"
-#include "gl/GrGLShaderBuilder.h"
-#include "gl/GrGLVertexEffect.h"
-#include "gl/GrGpuGL.h"
-
-typedef GrGLProgramEffects::TransformedCoords TransformedCoords;
-typedef GrGLProgramEffects::TransformedCoordsArray TransformedCoordsArray;
-typedef GrGLProgramEffects::TextureSampler TextureSampler;
-typedef GrGLProgramEffects::TextureSamplerArray TextureSamplerArray;
-
-/**
- * We specialize the vertex code for each of these matrix types.
- */
-enum MatrixType {
-    kNoPersp_MatrixType  = 0,
-    kGeneral_MatrixType  = 1,
-};
-
-/**
- * The key for an individual coord transform is made up of a matrix type and a bit that
- * indicates the source of the input coords.
- */
-enum {
-    kMatrixTypeKeyBits   = 1,
-    kMatrixTypeKeyMask   = (1 << kMatrixTypeKeyBits) - 1,
-    kPositionCoords_Flag = (1 << kMatrixTypeKeyBits),
-    kTransformKeyBits    = kMatrixTypeKeyBits + 1,
-};
-
-namespace {
-
-/**
- * Do we need to either map r,g,b->a or a->r. configComponentMask indicates which channels are
- * present in the texture's config. swizzleComponentMask indicates the channels present in the
- * shader swizzle.
- */
-inline bool swizzle_requires_alpha_remapping(const GrGLCaps& caps,
-                                             uint32_t configComponentMask,
-                                             uint32_t swizzleComponentMask) {
-    if (caps.textureSwizzleSupport()) {
-        // Any remapping is handled using texture swizzling not shader modifications.
-        return false;
-    }
-    // check if the texture is alpha-only
-    if (kA_GrColorComponentFlag == configComponentMask) {
-        if (caps.textureRedSupport() && (kA_GrColorComponentFlag & swizzleComponentMask)) {
-            // we must map the swizzle 'a's to 'r'.
-            return true;
-        }
-        if (kRGB_GrColorComponentFlags & swizzleComponentMask) {
-            // The 'r', 'g', and/or 'b's must be mapped to 'a' according to our semantics that
-            // alpha-only textures smear alpha across all four channels when read.
-            return true;
-        }
-    }
-    return false;
-}
-
-/**
- * Retrieves the matrix type from transformKey for the transform at transformIdx.
- */
-MatrixType get_matrix_type(uint32_t transformKey, int transformIdx) {
-    return static_cast<MatrixType>(
-               (transformKey >> (kTransformKeyBits * transformIdx)) & kMatrixTypeKeyMask);
-}
-
-/**
- * Retrieves the source coords from transformKey for the transform at transformIdx. It may not be
- * the same coordinate set as the original GrCoordTransform if the position and local coords are
- * identical for this program.
- */
-GrCoordSet get_source_coords(uint32_t transformKey, int transformIdx) {
-    return (transformKey >> (kTransformKeyBits * transformIdx)) & kPositionCoords_Flag ?
-               kPosition_GrCoordSet :
-               kLocal_GrCoordSet;
-}
-
-/**
- * Retrieves the final matrix that a transform needs to apply to its source coords.
- */
-SkMatrix get_transform_matrix(const GrDrawEffect& drawEffect, int transformIdx) {
-    const GrCoordTransform& coordTransform = drawEffect.effect()->coordTransform(transformIdx);
-    SkMatrix combined;
-    if (kLocal_GrCoordSet == coordTransform.sourceCoords() &&
-        !drawEffect.programHasExplicitLocalCoords()) {
-        combined.setConcat(coordTransform.getMatrix(), drawEffect.getCoordChangeMatrix());
-    } else {
-        combined = coordTransform.getMatrix();
-    }
-    if (coordTransform.reverseY()) {
-        // combined.postScale(1,-1);
-        // combined.postTranslate(0,1);
-        combined.set(SkMatrix::kMSkewY,
-            combined[SkMatrix::kMPersp0] - combined[SkMatrix::kMSkewY]);
-        combined.set(SkMatrix::kMScaleY,
-            combined[SkMatrix::kMPersp1] - combined[SkMatrix::kMScaleY]);
-        combined.set(SkMatrix::kMTransY,
-            combined[SkMatrix::kMPersp2] - combined[SkMatrix::kMTransY]);
-    }
-    return combined;
-}
-
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-bool GrGLProgramEffects::GenEffectMetaKey(const GrDrawEffect& drawEffect, const GrGLCaps& caps,
-                                          GrEffectKeyBuilder* b) {
-
-    uint32_t textureKey = GrGLProgramEffects::GenTextureKey(drawEffect, caps);
-    uint32_t transformKey = GrGLProgramEffects::GenTransformKey(drawEffect);
-    uint32_t attribKey = GrGLProgramEffects::GenAttribKey(drawEffect);
-    uint32_t classID = drawEffect.effect()->getFactory().effectClassID();
-
-    // Currently we allow 16 bits for each of the above portions of the meta-key. Fail if they
-    // don't fit.
-    static const uint32_t kMetaKeyInvalidMask = ~((uint32_t) SK_MaxU16);
-    if ((textureKey | transformKey | attribKey | classID) & kMetaKeyInvalidMask) {
-        return false;
-    }
-
-    uint32_t* key = b->add32n(2);
-    key[0] = (textureKey << 16 | transformKey);
-    key[1] = (classID << 16 | attribKey);
-    return true;
-}
-
-uint32_t GrGLProgramEffects::GenAttribKey(const GrDrawEffect& drawEffect) {
-    uint32_t key = 0;
-    int numAttributes = drawEffect.getVertexAttribIndexCount();
-    SkASSERT(numAttributes <= 2);
-    const int* attributeIndices = drawEffect.getVertexAttribIndices();
-    for (int a = 0; a < numAttributes; ++a) {
-        uint32_t value = attributeIndices[a] << 3 * a;
-        SkASSERT(0 == (value & key)); // keys for each attribute ought not to overlap
-        key |= value;
-    }
-    return key;
-}
-
-uint32_t GrGLProgramEffects::GenTransformKey(const GrDrawEffect& drawEffect) {
-    uint32_t totalKey = 0;
-    int numTransforms = drawEffect.effect()->numTransforms();
-    for (int t = 0; t < numTransforms; ++t) {
-        uint32_t key = 0;
-        const GrCoordTransform& coordTransform = drawEffect.effect()->coordTransform(t);
-        SkMatrix::TypeMask type0 = coordTransform.getMatrix().getType();
-        SkMatrix::TypeMask type1;
-        if (kLocal_GrCoordSet == coordTransform.sourceCoords()) {
-            type1 = drawEffect.getCoordChangeMatrix().getType();
-        } else {
-            if (drawEffect.programHasExplicitLocalCoords()) {
-                // We only make the key indicate that device coords are referenced when the local coords
-                // are not actually determined by positions. Otherwise the local coords var and position
-                // var are identical.
-                key |= kPositionCoords_Flag;
-            }
-            type1 = SkMatrix::kIdentity_Mask;
-        }
-
-        int combinedTypes = type0 | type1;
-
-        if (SkMatrix::kPerspective_Mask & combinedTypes) {
-            key |= kGeneral_MatrixType;
-        } else {
-            key |= kNoPersp_MatrixType;
-        }
-        key <<= kTransformKeyBits * t;
-        SkASSERT(0 == (totalKey & key)); // keys for each transform ought not to overlap
-        totalKey |= key;
-    }
-    return totalKey;
-}
-
-uint32_t GrGLProgramEffects::GenTextureKey(const GrDrawEffect& drawEffect, const GrGLCaps& caps) {
-    uint32_t key = 0;
-    int numTextures = drawEffect.effect()->numTextures();
-    for (int t = 0; t < numTextures; ++t) {
-        const GrTextureAccess& access = drawEffect.effect()->textureAccess(t);
-        uint32_t configComponentMask = GrPixelConfigComponentMask(access.getTexture()->config());
-        if (swizzle_requires_alpha_remapping(caps, configComponentMask, access.swizzleMask())) {
-            key |= 1 << t;
-        }
-    }
-    return key;
-}
-
-GrGLProgramEffects::~GrGLProgramEffects() {
-    int numEffects = fGLEffects.count();
-    for (int e = 0; e < numEffects; ++e) {
-        SkDELETE(fGLEffects[e]);
-    }
-}
-
-void GrGLProgramEffects::emitSamplers(GrGLShaderBuilder* builder,
-                                      const GrEffect* effect,
-                                      TextureSamplerArray* outSamplers) {
-    SkTArray<Sampler, true>& samplers = fSamplers.push_back();
-    int numTextures = effect->numTextures();
-    samplers.push_back_n(numTextures);
-    SkString name;
-    for (int t = 0; t < numTextures; ++t) {
-        name.printf("Sampler%d", t);
-        samplers[t].fUniform = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
-                                                   kSampler2D_GrSLType,
-                                                   name.c_str());
-        SkNEW_APPEND_TO_TARRAY(outSamplers, TextureSampler,
-                               (samplers[t].fUniform, effect->textureAccess(t)));
-    }
-}
-
-void GrGLProgramEffects::initSamplers(const GrGLUniformManager& uniformManager, int* texUnitIdx) {
-    int numEffects = fGLEffects.count();
-    SkASSERT(numEffects == fSamplers.count());
-    for (int e = 0; e < numEffects; ++e) {
-        SkTArray<Sampler, true>& samplers = fSamplers[e];
-        int numSamplers = samplers.count();
-        for (int s = 0; s < numSamplers; ++s) {
-            SkASSERT(samplers[s].fUniform.isValid());
-            uniformManager.setSampler(samplers[s].fUniform, *texUnitIdx);
-            samplers[s].fTextureUnit = (*texUnitIdx)++;
-        }
-    }
-}
-
-void GrGLProgramEffects::bindTextures(GrGpuGL* gpu, const GrEffect* effect, int effectIdx) {
-    const SkTArray<Sampler, true>& samplers = fSamplers[effectIdx];
-    int numSamplers = samplers.count();
-    SkASSERT(numSamplers == effect->numTextures());
-    for (int s = 0; s < numSamplers; ++s) {
-        SkASSERT(samplers[s].fTextureUnit >= 0);
-        const GrTextureAccess& textureAccess = effect->textureAccess(s);
-        gpu->bindTexture(samplers[s].fTextureUnit,
-                         textureAccess.getParams(),
-                         static_cast<GrGLTexture*>(textureAccess.getTexture()));
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-void GrGLVertexProgramEffects::emitEffect(GrGLFullShaderBuilder* builder,
-                                          const GrEffectStage& stage,
-                                          const GrEffectKey& key,
-                                          const char* outColor,
-                                          const char* inColor,
-                                          int stageIndex) {
-    GrDrawEffect drawEffect(stage, fHasExplicitLocalCoords);
-    const GrEffect* effect = stage.getEffect();
-    SkSTArray<2, TransformedCoords> coords(effect->numTransforms());
-    SkSTArray<4, TextureSampler> samplers(effect->numTextures());
-
-    this->emitAttributes(builder, stage);
-    this->emitTransforms(builder, drawEffect, &coords);
-    this->emitSamplers(builder, effect, &samplers);
-
-    GrGLEffect* glEffect = effect->getFactory().createGLInstance(drawEffect);
-    fGLEffects.push_back(glEffect);
-
-    // Enclose custom code in a block to avoid namespace conflicts
-    SkString openBrace;
-    openBrace.printf("\t{ // Stage %d: %s\n", stageIndex, glEffect->name());
-    builder->vsCodeAppend(openBrace.c_str());
-    builder->fsCodeAppend(openBrace.c_str());
-
-    if (glEffect->isVertexEffect()) {
-        GrGLVertexEffect* vertexEffect = static_cast<GrGLVertexEffect*>(glEffect);
-        vertexEffect->emitCode(builder, drawEffect, key, outColor, inColor, coords, samplers);
-    } else {
-        glEffect->emitCode(builder, drawEffect, key, outColor, inColor, coords, samplers);
-    }
-
-    builder->vsCodeAppend("\t}\n");
-    builder->fsCodeAppend("\t}\n");
-}
-
-void GrGLVertexProgramEffects::emitAttributes(GrGLFullShaderBuilder* builder,
-                                              const GrEffectStage& stage) {
-    int numAttributes = stage.getVertexAttribIndexCount();
-    const int* attributeIndices = stage.getVertexAttribIndices();
-    for (int a = 0; a < numAttributes; ++a) {
-        // TODO: Make addAttribute mangle the name.
-        SkString attributeName("aAttr");
-        attributeName.appendS32(attributeIndices[a]);
-        builder->addEffectAttribute(attributeIndices[a],
-                                    stage.getEffect()->vertexAttribType(a),
-                                    attributeName);
-    }
-}
-
-void GrGLVertexProgramEffects::emitTransforms(GrGLFullShaderBuilder* builder,
-                                              const GrDrawEffect& drawEffect,
-                                              TransformedCoordsArray* outCoords) {
-    SkTArray<Transform, true>& transforms = fTransforms.push_back();
-    uint32_t totalKey = GenTransformKey(drawEffect);
-    int numTransforms = drawEffect.effect()->numTransforms();
-    transforms.push_back_n(numTransforms);
-    for (int t = 0; t < numTransforms; t++) {
-        GrSLType varyingType = kVoid_GrSLType;
-        const char* uniName;
-        switch (get_matrix_type(totalKey, t)) {
-            case kNoPersp_MatrixType:
-                uniName = "StageMatrix";
-                varyingType = kVec2f_GrSLType;
-                break;
-            case kGeneral_MatrixType:
-                uniName = "StageMatrix";
-                varyingType = kVec3f_GrSLType;
-                break;
-            default:
-                SkFAIL("Unexpected key.");
-        }
-        SkString suffixedUniName;
-        if (0 != t) {
-            suffixedUniName.append(uniName);
-            suffixedUniName.appendf("_%i", t);
-            uniName = suffixedUniName.c_str();
-        }
-        transforms[t].fHandle = builder->addUniform(GrGLShaderBuilder::kVertex_Visibility,
-                                                    kMat33f_GrSLType,
-                                                    uniName,
-                                                    &uniName);
-
-        const char* varyingName = "MatrixCoord";
-        SkString suffixedVaryingName;
-        if (0 != t) {
-            suffixedVaryingName.append(varyingName);
-            suffixedVaryingName.appendf("_%i", t);
-            varyingName = suffixedVaryingName.c_str();
-        }
-        const char* vsVaryingName;
-        const char* fsVaryingName;
-        builder->addVarying(varyingType, varyingName, &vsVaryingName, &fsVaryingName);
-
-        const GrGLShaderVar& coords = kPosition_GrCoordSet == get_source_coords(totalKey, t) ?
-                                          builder->positionAttribute() :
-                                          builder->localCoordsAttribute();
-        // varying = matrix * coords (logically)
-        SkASSERT(kVec2f_GrSLType == varyingType || kVec3f_GrSLType == varyingType);
-        if (kVec2f_GrSLType == varyingType) {
-            builder->vsCodeAppendf("\t%s = (%s * vec3(%s, 1)).xy;\n",
-                                   vsVaryingName, uniName, coords.c_str());
-        } else {
-            builder->vsCodeAppendf("\t%s = %s * vec3(%s, 1);\n",
-                                   vsVaryingName, uniName, coords.c_str());
-        }
-        SkNEW_APPEND_TO_TARRAY(outCoords, TransformedCoords,
-                               (SkString(fsVaryingName), varyingType));
-    }
-}
-
-void GrGLVertexProgramEffects::setData(GrGpuGL* gpu,
-                                       const GrGLUniformManager& uniformManager,
-                                       const GrEffectStage* effectStages[]) {
-    int numEffects = fGLEffects.count();
-    SkASSERT(numEffects == fTransforms.count());
-    SkASSERT(numEffects == fSamplers.count());
-    for (int e = 0; e < numEffects; ++e) {
-        GrDrawEffect drawEffect(*effectStages[e], fHasExplicitLocalCoords);
-        fGLEffects[e]->setData(uniformManager, drawEffect);
-        this->setTransformData(uniformManager, drawEffect, e);
-        this->bindTextures(gpu, drawEffect.effect(), e);
-    }
-}
-
-void GrGLVertexProgramEffects::setTransformData(const GrGLUniformManager& uniformManager,
-                                                const GrDrawEffect& drawEffect,
-                                                int effectIdx) {
-    SkTArray<Transform, true>& transforms = fTransforms[effectIdx];
-    int numTransforms = transforms.count();
-    SkASSERT(numTransforms == drawEffect.effect()->numTransforms());
-    for (int t = 0; t < numTransforms; ++t) {
-        SkASSERT(transforms[t].fHandle.isValid());
-        const SkMatrix& matrix = get_transform_matrix(drawEffect, t);
-        if (!transforms[t].fCurrentValue.cheapEqualTo(matrix)) {
-            uniformManager.setSkMatrix(transforms[t].fHandle, matrix);
-            transforms[t].fCurrentValue = matrix;
-        }
-    }
-}
-
-GrGLVertexProgramEffectsBuilder::GrGLVertexProgramEffectsBuilder(GrGLFullShaderBuilder* builder,
-                                                                 int reserveCount)
-    : fBuilder(builder)
-    , fProgramEffects(SkNEW_ARGS(GrGLVertexProgramEffects,
-                                 (reserveCount, fBuilder->hasExplicitLocalCoords()))) {
-}
-
-void GrGLVertexProgramEffectsBuilder::emitEffect(const GrEffectStage& stage,
-                                                 const GrEffectKey& key,
-                                                 const char* outColor,
-                                                 const char* inColor,
-                                                 int stageIndex) {
-    SkASSERT(NULL != fProgramEffects.get());
-    fProgramEffects->emitEffect(fBuilder, stage, key, outColor, inColor, stageIndex);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-void GrGLPathTexGenProgramEffects::emitEffect(GrGLFragmentOnlyShaderBuilder* builder,
-                                          const GrEffectStage& stage,
-                                          const GrEffectKey& key,
-                                          const char* outColor,
-                                          const char* inColor,
-                                          int stageIndex) {
-    GrDrawEffect drawEffect(stage, false);
-    const GrEffect* effect = stage.getEffect();
-    SkSTArray<2, TransformedCoords> coords(effect->numTransforms());
-    SkSTArray<4, TextureSampler> samplers(effect->numTextures());
-
-    SkASSERT(0 == stage.getVertexAttribIndexCount());
-    this->setupPathTexGen(builder, drawEffect, &coords);
-    this->emitSamplers(builder, effect, &samplers);
-
-    GrGLEffect* glEffect = effect->getFactory().createGLInstance(drawEffect);
-    fGLEffects.push_back(glEffect);
-
-    // Enclose custom code in a block to avoid namespace conflicts
-    SkString openBrace;
-    openBrace.printf("\t{ // Stage %d: %s\n", stageIndex, glEffect->name());
-    builder->fsCodeAppend(openBrace.c_str());
-
-    SkASSERT(!glEffect->isVertexEffect());
-    glEffect->emitCode(builder, drawEffect, key, outColor, inColor, coords, samplers);
-
-    builder->fsCodeAppend("\t}\n");
-}
-
-void GrGLPathTexGenProgramEffects::setupPathTexGen(GrGLFragmentOnlyShaderBuilder* builder,
-                                           const GrDrawEffect& drawEffect,
-                                           TransformedCoordsArray* outCoords) {
-    int numTransforms = drawEffect.effect()->numTransforms();
-    uint32_t totalKey = GenTransformKey(drawEffect);
-    int texCoordIndex = builder->addTexCoordSets(numTransforms);
-    SkNEW_APPEND_TO_TARRAY(&fTransforms, Transforms, (totalKey, texCoordIndex));
-    SkString name;
-    for (int t = 0; t < numTransforms; ++t) {
-        GrSLType type = kGeneral_MatrixType == get_matrix_type(totalKey, t) ?
-                            kVec3f_GrSLType :
-                            kVec2f_GrSLType;
-        name.printf("%s(gl_TexCoord[%i])", GrGLSLTypeString(type), texCoordIndex++);
-        SkNEW_APPEND_TO_TARRAY(outCoords, TransformedCoords, (name, type));
-    }
-}
-
-void GrGLPathTexGenProgramEffects::setData(GrGpuGL* gpu,
-                                       const GrGLUniformManager& uniformManager,
-                                       const GrEffectStage* effectStages[]) {
-    int numEffects = fGLEffects.count();
-    SkASSERT(numEffects == fTransforms.count());
-    SkASSERT(numEffects == fSamplers.count());
-    for (int e = 0; e < numEffects; ++e) {
-        GrDrawEffect drawEffect(*effectStages[e], false);
-        fGLEffects[e]->setData(uniformManager, drawEffect);
-        this->setPathTexGenState(gpu, drawEffect, e);
-        this->bindTextures(gpu, drawEffect.effect(), e);
-    }
-}
-
-void GrGLPathTexGenProgramEffects::setPathTexGenState(GrGpuGL* gpu,
-                                              const GrDrawEffect& drawEffect,
-                                              int effectIdx) {
-    uint32_t totalKey = fTransforms[effectIdx].fTransformKey;
-    int texCoordIndex = fTransforms[effectIdx].fTexCoordIndex;
-    int numTransforms = drawEffect.effect()->numTransforms();
-    for (int t = 0; t < numTransforms; ++t) {
-        switch (get_matrix_type(totalKey, t)) {
-            case kNoPersp_MatrixType: {
-                const SkMatrix& transform = get_transform_matrix(drawEffect, t);
-                gpu->enablePathTexGen(texCoordIndex++,
-                                      GrGpuGL::kST_PathTexGenComponents,
-                                      transform);
-                break;
-            }
-            case kGeneral_MatrixType: {
-                const SkMatrix& transform = get_transform_matrix(drawEffect, t);
-                gpu->enablePathTexGen(texCoordIndex++,
-                                      GrGpuGL::kSTR_PathTexGenComponents,
-                                      transform);
-                break;
-            }
-            default:
-                SkFAIL("Unexpected matrixs type.");
-        }
-    }
-}
-
-GrGLPathTexGenProgramEffectsBuilder::GrGLPathTexGenProgramEffectsBuilder(
-        GrGLFragmentOnlyShaderBuilder* builder,
-        int reserveCount)
-    : fBuilder(builder)
-    , fProgramEffects(SkNEW_ARGS(GrGLPathTexGenProgramEffects, (reserveCount))) {
-}
-
-void GrGLPathTexGenProgramEffectsBuilder::emitEffect(const GrEffectStage& stage,
-                                                     const GrEffectKey& key,
-                                                     const char* outColor,
-                                                     const char* inColor,
-                                                     int stageIndex) {
-    SkASSERT(NULL != fProgramEffects.get());
-    fProgramEffects->emitEffect(fBuilder, stage, key, outColor, inColor, stageIndex);
-}
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLProgramEffects.h b/gfx/skia/skia/src/gpu/gl/GrGLProgramEffects.h
deleted file mode 100644
index c9ba9135a9bc..000000000000
--- a/gfx/skia/skia/src/gpu/gl/GrGLProgramEffects.h
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrGLProgramEffects_DEFINED
-#define GrGLProgramEffects_DEFINED
-
-#include "GrBackendEffectFactory.h"
-#include "GrGLUniformManager.h"
-#include "GrTexture.h"
-#include "GrTextureAccess.h"
-
-class GrEffect;
-class GrEffectStage;
-class GrGLVertexProgramEffectsBuilder;
-class GrGLShaderBuilder;
-class GrGLFullShaderBuilder;
-class GrGLFragmentOnlyShaderBuilder;
-
-/**
- * This class encapsulates an array of GrGLEffects and their supporting data (coord transforms
- * and textures). It is built with GrGLProgramEffectsBuilder, then used to manage the necessary GL
- * state and shader uniforms.
- */
-class GrGLProgramEffects : public SkRefCnt {
-public:
-    typedef GrGLUniformManager::UniformHandle UniformHandle;
-
-    /**
-     * This class emits some of the code inserted into the shaders for an effect. The code it
-     * creates may be dependent on properties of the effect that the effect itself doesn't use
-     * in its key (e.g. the pixel format of textures used). So this class inserts a meta-key for
-     * every effect using this function. It is also responsible for inserting the effect's class ID
-     * which must be different for every GrEffect subclass. It can fail if an effect uses too many
-     * textures, attributes, etc for the space allotted in the meta-key.
-     */
-    static bool GenEffectMetaKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*);
-
-    virtual ~GrGLProgramEffects();
-
-    /**
-     * Assigns a texture unit to each sampler. It starts on *texUnitIdx and writes the next
-     * available unit to *texUnitIdx when it returns.
-     */
-    void initSamplers(const GrGLUniformManager&, int* texUnitIdx);
-
-    /**
-     * Calls setData() on each effect, and sets their transformation matrices and texture bindings.
-     */
-    virtual void setData(GrGpuGL*,
-                         const GrGLUniformManager&,
-                         const GrEffectStage* effectStages[]) = 0;
-
-    /**
-     * Passed to GrGLEffects so they can add transformed coordinates to their shader code.
-     */
-    class TransformedCoords {
-    public:
-        TransformedCoords(const SkString& name, GrSLType type)
-            : fName(name), fType(type) {
-        }
-
-        const char* c_str() const { return fName.c_str(); }
-        GrSLType type() const { return fType; }
-        const SkString& getName() const { return fName; }
-
-    private:
-        SkString fName;
-        GrSLType fType;
-    };
-
-    typedef SkTArray<TransformedCoords> TransformedCoordsArray;
-
-    /**
-     * Passed to GrGLEffects so they can add texture reads to their shader code.
-     */
-    class TextureSampler {
-    public:
-        TextureSampler(UniformHandle uniform, const GrTextureAccess& access)
-            : fSamplerUniform(uniform)
-            , fConfigComponentMask(GrPixelConfigComponentMask(access.getTexture()->config())) {
-            SkASSERT(0 != fConfigComponentMask);
-            memcpy(fSwizzle, access.getSwizzle(), 5);
-        }
-
-        UniformHandle samplerUniform() const { return fSamplerUniform; }
-        // bitfield of GrColorComponentFlags present in the texture's config.
-        uint32_t configComponentMask() const { return fConfigComponentMask; }
-        const char* swizzle() const { return fSwizzle; }
-
-    private:
-        UniformHandle fSamplerUniform;
-        uint32_t      fConfigComponentMask;
-        char          fSwizzle[5];
-    };
-
-    typedef SkTArray<TextureSampler> TextureSamplerArray;
-
-protected:
-    /**
-     * Helpers for GenEffectMetaKey.
-     */
-    static uint32_t GenAttribKey(const GrDrawEffect&);
-    static uint32_t GenTransformKey(const GrDrawEffect&);
-    static uint32_t GenTextureKey(const GrDrawEffect&, const GrGLCaps&);
-
-    GrGLProgramEffects(int reserveCount)
-        : fGLEffects(reserveCount)
-        , fSamplers(reserveCount) {
-    }
-
-    /**
-     * Helper for emitEffect() in a subclasses. Emits uniforms for an effect's texture accesses and
-     * appends the necessary data to the TextureSamplerArray* object so effects can add texture
-     * lookups to their code. This method is only meant to be called during the construction phase.
-     */
-    void emitSamplers(GrGLShaderBuilder*, const GrEffect*, TextureSamplerArray*);
-
-    /**
-     * Helper for setData(). Binds all the textures for an effect.
-     */
-    void bindTextures(GrGpuGL*, const GrEffect*, int effectIdx);
-
-    struct Sampler {
-        SkDEBUGCODE(Sampler() : fTextureUnit(-1) {})
-        UniformHandle fUniform;
-        int           fTextureUnit;
-    };
-
-    SkTArray<GrGLEffect*>                  fGLEffects;
-    SkTArray<SkSTArray<4, Sampler, true> > fSamplers;
-
-private:
-    typedef SkRefCnt INHERITED;
-};
-
-/**
- * This is an abstract base class for constructing different types of GrGLProgramEffects objects.
- */
-class GrGLProgramEffectsBuilder {
-public:
-    virtual ~GrGLProgramEffectsBuilder() { }
-
-    /**
-     * Emits the effect's shader code, and stores the necessary uniforms internally.
-     */
-    virtual void emitEffect(const GrEffectStage&,
-                            const GrEffectKey&,
-                            const char* outColor,
-                            const char* inColor,
-                            int stageIndex) = 0;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-/**
- * This is a GrGLProgramEffects implementation that does coord transforms with the vertex shader.
- */
-class GrGLVertexProgramEffects : public GrGLProgramEffects {
-public:
-    virtual void setData(GrGpuGL*,
-                         const GrGLUniformManager&,
-                         const GrEffectStage* effectStages[]) SK_OVERRIDE;
-
-private:
-    friend class GrGLVertexProgramEffectsBuilder;
-
-    GrGLVertexProgramEffects(int reserveCount, bool explicitLocalCoords)
-        : INHERITED(reserveCount)
-        , fTransforms(reserveCount)
-        , fHasExplicitLocalCoords(explicitLocalCoords) {
-    }
-
-    /**
-     * Helper for GrGLProgramEffectsBuilder::emitEfffect(). This method is meant to only be called
-     * during the construction phase.
-     */
-    void emitEffect(GrGLFullShaderBuilder*,
-                    const GrEffectStage&,
-                    const GrEffectKey&,
-                    const char* outColor,
-                    const char* inColor,
-                    int stageIndex);
-
-    /**
-     * Helper for emitEffect(). Emits any attributes an effect may have.
-     */
-    void emitAttributes(GrGLFullShaderBuilder*, const GrEffectStage&);
-
-    /**
-     * Helper for emitEffect(). Emits code to implement an effect's coord transforms in the VS.
-     * Varyings are added as an outputs of the VS and inputs to the FS. The varyings may be either a
-     * vec2f or vec3f depending upon whether perspective interpolation is required or not. The names
-     * of the varyings in the VS and FS as well their types are appended to the
-     * TransformedCoordsArray* object, which is in turn passed to the effect's emitCode() function.
-     */
-    void emitTransforms(GrGLFullShaderBuilder*,
-                        const GrDrawEffect&,
-                        TransformedCoordsArray*);
-
-    /**
-     * Helper for setData(). Sets all the transform matrices for an effect.
-     */
-    void setTransformData(const GrGLUniformManager&, const GrDrawEffect&, int effectIdx);
-
-    struct Transform {
-        Transform() { fCurrentValue = SkMatrix::InvalidMatrix(); }
-        UniformHandle fHandle;
-        SkMatrix      fCurrentValue;
-    };
-
-    SkTArray<SkSTArray<2, Transform, true> > fTransforms;
-    bool                                     fHasExplicitLocalCoords;
-
-    typedef GrGLProgramEffects INHERITED;
-};
-
-/**
- * This class is used to construct a GrGLVertexProgramEffects* object.
- */
-class GrGLVertexProgramEffectsBuilder : public GrGLProgramEffectsBuilder {
-public:
-    GrGLVertexProgramEffectsBuilder(GrGLFullShaderBuilder*, int reserveCount);
-    virtual ~GrGLVertexProgramEffectsBuilder() { }
-
-    virtual void emitEffect(const GrEffectStage&,
-                            const GrEffectKey&,
-                            const char* outColor,
-                            const char* inColor,
-                            int stageIndex) SK_OVERRIDE;
-
-    /**
-     * Finalizes the building process and returns the effect array. After this call, the builder
-     * becomes invalid.
-     */
-    GrGLProgramEffects* finish() { return fProgramEffects.detach(); }
-
-private:
-    GrGLFullShaderBuilder*                  fBuilder;
-    SkAutoTDelete<GrGLVertexProgramEffects> fProgramEffects;
-
-    typedef GrGLProgramEffectsBuilder INHERITED;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-/**
- * This is a GrGLProgramEffects implementation that does coord transforms with
- * the the  NV_path_rendering PathTexGen functionality.
- */
-class GrGLPathTexGenProgramEffects : public GrGLProgramEffects {
-public:
-    virtual void setData(GrGpuGL*,
-                         const GrGLUniformManager&,
-                         const GrEffectStage* effectStages[]) SK_OVERRIDE;
-
-private:
-    friend class GrGLPathTexGenProgramEffectsBuilder;
-
-    GrGLPathTexGenProgramEffects(int reserveCount)
-        : INHERITED(reserveCount)
-        , fTransforms(reserveCount) {
-    }
-
-    /**
-     * Helper for GrGLProgramEffectsBuilder::emitEfffect(). This method is meant to only be called
-     * during the construction phase.
-     */
-    void emitEffect(GrGLFragmentOnlyShaderBuilder*,
-                    const GrEffectStage&,
-                    const GrEffectKey&,
-                    const char* outColor,
-                    const char* inColor,
-                    int stageIndex);
-
-    /**
-     * Helper for emitEffect(). Allocates texture units from the builder for each transform in an
-     * effect. The transforms all use adjacent texture units. They either use two or three of the
-     * coordinates at a given texture unit, depending on if they need perspective interpolation.
-     * The expressions to access the transformed coords (i.e. 'vec2(gl_TexCoord[0])') as well as the
-     * types are appended to the TransformedCoordsArray* object, which is in turn passed to the
-     * effect's emitCode() function.
-     */
-    void setupPathTexGen(GrGLFragmentOnlyShaderBuilder*,
-                         const GrDrawEffect&,
-                         TransformedCoordsArray*);
-
-    /**
-     * Helper for setData(). Sets the PathTexGen state for each transform in an effect.
-     */
-    void setPathTexGenState(GrGpuGL*, const GrDrawEffect&, int effectIdx);
-
-    struct Transforms {
-        Transforms(uint32_t transformKey, int texCoordIndex)
-            : fTransformKey(transformKey), fTexCoordIndex(texCoordIndex) {}
-        uint32_t    fTransformKey;
-        int         fTexCoordIndex;
-    };
-
-    SkTArray<Transforms> fTransforms;
-
-    typedef GrGLProgramEffects INHERITED;
-};
-
-/**
- * This class is used to construct a GrGLPathTexGenProgramEffects* object.
- */
-class GrGLPathTexGenProgramEffectsBuilder : public GrGLProgramEffectsBuilder {
-public:
-    GrGLPathTexGenProgramEffectsBuilder(GrGLFragmentOnlyShaderBuilder*, int reserveCount);
-    virtual ~GrGLPathTexGenProgramEffectsBuilder() { }
-
-    virtual void emitEffect(const GrEffectStage&,
-                            const GrEffectKey&,
-                            const char* outColor,
-                            const char* inColor,
-                            int stageIndex) SK_OVERRIDE;
-
-    /**
-     * Finalizes the building process and returns the effect array. After this call, the builder
-     * becomes invalid.
-     */
-    GrGLProgramEffects* finish() { return fProgramEffects.detach(); }
-
-private:
-    GrGLFragmentOnlyShaderBuilder*          fBuilder;
-    SkAutoTDelete<GrGLPathTexGenProgramEffects> fProgramEffects;
-
-    typedef GrGLProgramEffectsBuilder INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLRenderTarget.cpp b/gfx/skia/skia/src/gpu/gl/GrGLRenderTarget.cpp
index 2486396186a4..d4585f6402f9 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLRenderTarget.cpp
+++ b/gfx/skia/skia/src/gpu/gl/GrGLRenderTarget.cpp
@@ -7,79 +7,119 @@
 
 #include "GrGLRenderTarget.h"
 
-#include "GrGpuGL.h"
-
-#define GPUGL static_cast<GrGpuGL*>(getGpu())
+#include "GrRenderTargetPriv.h"
+#include "GrGLGpu.h"
+#include "GrGLUtil.h"
+#include "SkTraceMemoryDump.h"
 
+#define GPUGL static_cast<GrGLGpu*>(this->getGpu())
 #define GL_CALL(X) GR_GL_CALL(GPUGL->glInterface(), X)
 
-void GrGLRenderTarget::init(const Desc& desc,
-                            const GrGLIRect& viewport,
-                            GrGLTexID* texID) {
-    fRTFBOID                = desc.fRTFBOID;
-    fTexFBOID               = desc.fTexFBOID;
-    fMSColorRenderbufferID  = desc.fMSColorRenderbufferID;
-    fViewport               = viewport;
-    fTexIDObj.reset(SkSafeRef(texID));
+// Because this class is virtually derived from GrSurface we must explicitly call its constructor.
+GrGLRenderTarget::GrGLRenderTarget(GrGLGpu* gpu,
+                                   const GrSurfaceDesc& desc,
+                                   const IDDesc& idDesc,
+                                   GrGLStencilAttachment* stencil)
+    : GrSurface(gpu, idDesc.fLifeCycle, desc)
+    , INHERITED(gpu, idDesc.fLifeCycle, desc, idDesc.fSampleConfig, stencil) {
+    this->init(desc, idDesc);
+    this->registerWithCache();
 }
 
-namespace {
-GrTextureDesc MakeDesc(GrTextureFlags flags,
-                       int width, int height,
-                       GrPixelConfig config, int sampleCnt,
-                       GrSurfaceOrigin origin) {
-    GrTextureDesc temp;
-    temp.fFlags = flags;
-    temp.fWidth = width;
-    temp.fHeight = height;
-    temp.fConfig = config;
-    temp.fSampleCnt = sampleCnt;
-    temp.fOrigin = origin;
-    return temp;
+GrGLRenderTarget::GrGLRenderTarget(GrGLGpu* gpu, const GrSurfaceDesc& desc, const IDDesc& idDesc,
+                                   Derived)
+    : GrSurface(gpu, idDesc.fLifeCycle, desc)
+    , INHERITED(gpu, idDesc.fLifeCycle, desc, idDesc.fSampleConfig) {
+    this->init(desc, idDesc);
 }
 
-};
+void GrGLRenderTarget::init(const GrSurfaceDesc& desc, const IDDesc& idDesc) {
+    fRTFBOID                = idDesc.fRTFBOID;
+    fTexFBOID               = idDesc.fTexFBOID;
+    fMSColorRenderbufferID  = idDesc.fMSColorRenderbufferID;
+    fRTLifecycle            = idDesc.fLifeCycle;
 
-GrGLRenderTarget::GrGLRenderTarget(GrGpuGL* gpu,
-                                   const Desc& desc,
-                                   const GrGLIRect& viewport,
-                                   GrGLTexID* texID,
-                                   GrGLTexture* texture)
-    : INHERITED(gpu,
-                desc.fIsWrapped,
-                texture,
-                MakeDesc(kNone_GrTextureFlags,
-                         viewport.fWidth, viewport.fHeight,
-                         desc.fConfig, desc.fSampleCnt,
-                         desc.fOrigin)) {
-    SkASSERT(NULL != texID);
-    SkASSERT(NULL != texture);
-    // FBO 0 can't also be a texture, right?
-    SkASSERT(0 != desc.fRTFBOID);
-    SkASSERT(0 != desc.fTexFBOID);
+    fViewport.fLeft   = 0;
+    fViewport.fBottom = 0;
+    fViewport.fWidth  = desc.fWidth;
+    fViewport.fHeight = desc.fHeight;
 
-    // we assume this is true, TODO: get rid of viewport as a param.
-    SkASSERT(viewport.fWidth == texture->width());
-    SkASSERT(viewport.fHeight == texture->height());
+    fGpuMemorySize = this->totalSamples() * this->totalBytesPerSample();
 
-    this->init(desc, viewport, texID);
+    SkASSERT(fGpuMemorySize <= WorseCaseSize(desc));
 }
 
-GrGLRenderTarget::GrGLRenderTarget(GrGpuGL* gpu,
-                                   const Desc& desc,
-                                   const GrGLIRect& viewport)
-    : INHERITED(gpu,
-                desc.fIsWrapped,
-                NULL,
-                MakeDesc(kNone_GrTextureFlags,
-                         viewport.fWidth, viewport.fHeight,
-                         desc.fConfig, desc.fSampleCnt,
-                         desc.fOrigin)) {
-    this->init(desc, viewport, NULL);
+GrGLRenderTarget* GrGLRenderTarget::CreateWrapped(GrGLGpu* gpu,
+                                                  const GrSurfaceDesc& desc,
+                                                  const IDDesc& idDesc,
+                                                  int stencilBits) {
+    GrGLStencilAttachment* sb = nullptr;
+    if (stencilBits) {
+        GrGLStencilAttachment::IDDesc sbDesc;
+        GrGLStencilAttachment::Format format;
+        format.fInternalFormat = GrGLStencilAttachment::kUnknownInternalFormat;
+        format.fPacked = false;
+        format.fStencilBits = stencilBits;
+        format.fTotalBits = stencilBits;
+        // Owndership of sb is passed to the GrRenderTarget so doesn't need to be deleted
+        sb = new GrGLStencilAttachment(gpu, sbDesc, desc.fWidth, desc.fHeight,
+                                       desc.fSampleCnt, format);
+    }
+    return (new GrGLRenderTarget(gpu, desc, idDesc, sb));
+}
+
+size_t GrGLRenderTarget::onGpuMemorySize() const {
+    return fGpuMemorySize;
+}
+
+bool GrGLRenderTarget::completeStencilAttachment() {
+    GrGLGpu* gpu = this->getGLGpu();
+    const GrGLInterface* interface = gpu->glInterface();
+    GrStencilAttachment* stencil = this->renderTargetPriv().getStencilAttachment();
+    if (nullptr == stencil) {
+        GR_GL_CALL(interface, FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
+                                                      GR_GL_STENCIL_ATTACHMENT,
+                                                      GR_GL_RENDERBUFFER, 0));
+        GR_GL_CALL(interface, FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
+                                                      GR_GL_DEPTH_ATTACHMENT,
+                                                      GR_GL_RENDERBUFFER, 0));
+#ifdef SK_DEBUG
+        GrGLenum status;
+        GR_GL_CALL_RET(interface, status, CheckFramebufferStatus(GR_GL_FRAMEBUFFER));
+        SkASSERT(GR_GL_FRAMEBUFFER_COMPLETE == status);
+#endif
+        return true;
+    } else {
+        const GrGLStencilAttachment* glStencil = static_cast<const GrGLStencilAttachment*>(stencil);
+        GrGLuint rb = glStencil->renderbufferID();
+
+        gpu->invalidateBoundRenderTarget();
+        gpu->stats()->incRenderTargetBinds();
+        GR_GL_CALL(interface, BindFramebuffer(GR_GL_FRAMEBUFFER, this->renderFBOID()));
+        GR_GL_CALL(interface, FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
+                                                      GR_GL_STENCIL_ATTACHMENT,
+                                                      GR_GL_RENDERBUFFER, rb));
+        if (glStencil->format().fPacked) {
+            GR_GL_CALL(interface, FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
+                                                          GR_GL_DEPTH_ATTACHMENT,
+                                                          GR_GL_RENDERBUFFER, rb));
+        } else {
+            GR_GL_CALL(interface, FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
+                                                          GR_GL_DEPTH_ATTACHMENT,
+                                                          GR_GL_RENDERBUFFER, 0));
+        }
+
+#ifdef SK_DEBUG
+        GrGLenum status;
+        GR_GL_CALL_RET(interface, status, CheckFramebufferStatus(GR_GL_FRAMEBUFFER));
+        SkASSERT(GR_GL_FRAMEBUFFER_COMPLETE == status);
+#endif
+        return true;
+    }
 }
 
 void GrGLRenderTarget::onRelease() {
-    if (!this->isWrapped()) {
+    if (kBorrowed_LifeCycle != fRTLifecycle) {
         if (fTexFBOID) {
             GL_CALL(DeleteFramebuffers(1, &fTexFBOID));
         }
@@ -93,7 +133,6 @@ void GrGLRenderTarget::onRelease() {
     fRTFBOID                = 0;
     fTexFBOID               = 0;
     fMSColorRenderbufferID  = 0;
-    fTexIDObj.reset(NULL);
     INHERITED::onRelease();
 }
 
@@ -101,9 +140,70 @@ void GrGLRenderTarget::onAbandon() {
     fRTFBOID                = 0;
     fTexFBOID               = 0;
     fMSColorRenderbufferID  = 0;
-    if (NULL != fTexIDObj.get()) {
-        fTexIDObj->abandon();
-        fTexIDObj.reset(NULL);
-    }
     INHERITED::onAbandon();
 }
+
+GrGLGpu* GrGLRenderTarget::getGLGpu() const {
+    SkASSERT(!this->wasDestroyed());
+    return static_cast<GrGLGpu*>(this->getGpu());
+}
+
+void GrGLRenderTarget::dumpMemoryStatistics(SkTraceMemoryDump* traceMemoryDump) const {
+    // Don't log the backing texture's contribution to the memory size. This will be handled by the
+    // texture object.
+
+    // Log any renderbuffer's contribution to memory. We only do this if we own the renderbuffer
+    // (have a fMSColorRenderbufferID).
+    if (fMSColorRenderbufferID) {
+        size_t size = this->msaaSamples() * this->totalBytesPerSample();
+
+        // Due to this resource having both a texture and a renderbuffer component, dump as
+        // skia/gpu_resources/resource_#/renderbuffer
+        SkString dumpName("skia/gpu_resources/resource_");
+        dumpName.appendS32(this->getUniqueID());
+        dumpName.append("/renderbuffer");
+
+        traceMemoryDump->dumpNumericValue(dumpName.c_str(), "size", "bytes", size);
+
+        if (this->isPurgeable()) {
+            traceMemoryDump->dumpNumericValue(dumpName.c_str(), "purgeable_size", "bytes", size);
+        }
+
+        SkString renderbuffer_id;
+        renderbuffer_id.appendU32(fMSColorRenderbufferID);
+        traceMemoryDump->setMemoryBacking(dumpName.c_str(), "gl_renderbuffer",
+                                          renderbuffer_id.c_str());
+    }
+}
+
+size_t GrGLRenderTarget::totalBytesPerSample() const {
+    SkASSERT(kUnknown_GrPixelConfig != fDesc.fConfig);
+    SkASSERT(!GrPixelConfigIsCompressed(fDesc.fConfig));
+    size_t colorBytes = GrBytesPerPixel(fDesc.fConfig);
+    SkASSERT(colorBytes > 0);
+
+    return fDesc.fWidth * fDesc.fHeight * colorBytes;
+}
+
+int GrGLRenderTarget::msaaSamples() const {
+    if (fTexFBOID == kUnresolvableFBOID || fTexFBOID != fRTFBOID) {
+        // If the render target's FBO is external (fTexFBOID == kUnresolvableFBOID), or if we own
+        // the render target's FBO (fTexFBOID == fRTFBOID) then we use the provided sample count.
+        return SkTMax(1, fDesc.fSampleCnt);
+    }
+
+    // When fTexFBOID == fRTFBOID, we either are not using MSAA, or MSAA is auto resolving, so use
+    // 0 for the sample count.
+    return 0;
+}
+
+int GrGLRenderTarget::totalSamples() const {
+  int total_samples = this->msaaSamples();
+
+  if (fTexFBOID != kUnresolvableFBOID) {
+      // If we own the resolve buffer then that is one more sample per pixel.
+      total_samples += 1;
+  }
+
+  return total_samples;
+}
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLRenderTarget.h b/gfx/skia/skia/src/gpu/gl/GrGLRenderTarget.h
index de9f4c1aa08c..d1365efd420c 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLRenderTarget.h
+++ b/gfx/skia/skia/src/gpu/gl/GrGLRenderTarget.h
@@ -13,41 +13,27 @@
 #include "GrRenderTarget.h"
 #include "SkScalar.h"
 
-class GrGpuGL;
-class GrGLTexture;
-class GrGLTexID;
+class GrGLGpu;
+class GrGLStencilAttachment;
 
 class GrGLRenderTarget : public GrRenderTarget {
-
 public:
     // set fTexFBOID to this value to indicate that it is multisampled but
     // Gr doesn't know how to resolve it.
     enum { kUnresolvableFBOID = 0 };
 
-    struct Desc {
-        GrGLuint         fRTFBOID;
-        GrGLuint         fTexFBOID;
-        GrGLuint         fMSColorRenderbufferID;
-        bool             fIsWrapped;
-        GrPixelConfig    fConfig;
-        int              fSampleCnt;
-        GrSurfaceOrigin  fOrigin;
-        bool             fCheckAllocation;
+    struct IDDesc {
+        GrGLuint                     fRTFBOID;
+        GrGLuint                     fTexFBOID;
+        GrGLuint                     fMSColorRenderbufferID;
+        GrGpuResource::LifeCycle     fLifeCycle;
+        GrRenderTarget::SampleConfig fSampleConfig;
     };
 
-    // creates a GrGLRenderTarget associated with a texture
-    GrGLRenderTarget(GrGpuGL*          gpu,
-                     const Desc&       desc,
-                     const GrGLIRect&  viewport,
-                     GrGLTexID*        texID,
-                     GrGLTexture*      texture);
-
-    // creates an independent GrGLRenderTarget
-    GrGLRenderTarget(GrGpuGL*          gpu,
-                     const Desc&       desc,
-                     const GrGLIRect&  viewport);
-
-    virtual ~GrGLRenderTarget() { this->release(); }
+    static GrGLRenderTarget* CreateWrapped(GrGLGpu*,
+                                           const GrSurfaceDesc&,
+                                           const IDDesc&,
+                                           int stencilBits);
 
     void setViewport(const GrGLIRect& rect) { fViewport = rect; }
     const GrGLIRect& getViewport() const { return fViewport; }
@@ -61,15 +47,8 @@ public:
     GrGLuint textureFBOID() const { return fTexFBOID; }
 
     // override of GrRenderTarget
-    virtual GrBackendObject getRenderTargetHandle() const {
-        return this->renderFBOID();
-    }
-    virtual GrBackendObject getRenderTargetResolvedHandle() const {
-        return this->textureFBOID();
-    }
-    virtual ResolveType getResolveType() const {
-
-        if (!this->isMultisampled() ||
+    ResolveType getResolveType() const override {
+        if (!this->isUnifiedMultisampled() ||
             fRTFBOID == fTexFBOID) {
             // catches FBO 0 and non MSAA case
             return kAutoResolves_ResolveType;
@@ -80,26 +59,62 @@ public:
         }
     }
 
+    GrBackendObject getRenderTargetHandle() const override { return fRTFBOID; }
+
+    /** When we don't own the FBO ID we don't attempt to modify its attachments. */
+    bool canAttemptStencilAttachment() const override {
+        return kCached_LifeCycle == fRTLifecycle || kUncached_LifeCycle == fRTLifecycle;
+    }
+
+    // GrGLRenderTarget overrides dumpMemoryStatistics so it can log its texture and renderbuffer
+    // components seperately.
+    void dumpMemoryStatistics(SkTraceMemoryDump* traceMemoryDump) const override;
+
 protected:
-    // override of GrResource
-    virtual void onAbandon() SK_OVERRIDE;
-    virtual void onRelease() SK_OVERRIDE;
+    // The public constructor registers this object with the cache. However, only the most derived
+    // class should register with the cache. This constructor does not do the registration and
+    // rather moves that burden onto the derived class.
+    enum Derived { kDerived };
+    GrGLRenderTarget(GrGLGpu*, const GrSurfaceDesc&, const IDDesc&, Derived);
+
+    void init(const GrSurfaceDesc&, const IDDesc&);
+
+    void onAbandon() override;
+    void onRelease() override;
+
+    // In protected because subclass GrGLTextureRenderTarget calls this version.
+    size_t onGpuMemorySize() const override;
 
 private:
-    GrGLuint      fRTFBOID;
-    GrGLuint      fTexFBOID;
+    // This ctor is used only for creating wrapped render targets and is only called for the static
+    // create function CreateWrapped(...).
+    GrGLRenderTarget(GrGLGpu*, const GrSurfaceDesc&, const IDDesc&, GrGLStencilAttachment*);
 
-    GrGLuint      fMSColorRenderbufferID;
+    GrGLGpu* getGLGpu() const;
+    bool completeStencilAttachment() override;
+
+    // The total size of the resource (including all pixels) for a single sample.
+    size_t totalBytesPerSample() const;
+    int msaaSamples() const;
+    // The number total number of samples, including both MSAA and resolve texture samples.
+    int totalSamples() const;
+
+    GrGLuint    fRTFBOID;
+    GrGLuint    fTexFBOID;
+    GrGLuint    fMSColorRenderbufferID;
+
+    // We track this separately from GrGpuResource because this may be both a texture and a render
+    // target, and the texture may be wrapped while the render target is not.
+    LifeCycle   fRTLifecycle;
 
     // when we switch to this render target we want to set the viewport to
-    // only render to to content area (as opposed to the whole allocation) and
+    // only render to content area (as opposed to the whole allocation) and
     // we want the rendering to be at top left (GL has origin in bottom left)
-    GrGLIRect fViewport;
+    GrGLIRect   fViewport;
 
-    // non-NULL if this RT was created by Gr with an associated GrGLTexture.
-    SkAutoTUnref<GrGLTexID> fTexIDObj;
-
-    void init(const Desc& desc, const GrGLIRect& viewport, GrGLTexID* texID);
+    // onGpuMemorySize() needs to know the VRAM footprint of the FBO(s). However, abandon and
+    // release zero out the IDs and the cache needs to know the size even after those actions.
+    size_t      fGpuMemorySize;
 
     typedef GrRenderTarget INHERITED;
 };
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLSL.cpp b/gfx/skia/skia/src/gpu/gl/GrGLSL.cpp
deleted file mode 100644
index 468b13b138d0..000000000000
--- a/gfx/skia/skia/src/gpu/gl/GrGLSL.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrGLSL.h"
-#include "GrGLShaderVar.h"
-#include "SkString.h"
-
-bool GrGetGLSLGeneration(const GrGLInterface* gl, GrGLSLGeneration* generation) {
-    SkASSERT(NULL != generation);
-    GrGLSLVersion ver = GrGLGetGLSLVersion(gl);
-    if (GR_GLSL_INVALID_VER == ver) {
-        return false;
-    }
-    switch (gl->fStandard) {
-        case kGL_GrGLStandard:
-            SkASSERT(ver >= GR_GLSL_VER(1,10));
-            if (ver >= GR_GLSL_VER(1,50)) {
-                *generation = k150_GrGLSLGeneration;
-            } else if (ver >= GR_GLSL_VER(1,40)) {
-                *generation = k140_GrGLSLGeneration;
-            } else if (ver >= GR_GLSL_VER(1,30)) {
-                *generation = k130_GrGLSLGeneration;
-            } else {
-                *generation = k110_GrGLSLGeneration;
-            }
-            return true;
-        case kGLES_GrGLStandard:
-            // version 1.00 of ES GLSL based on ver 1.20 of desktop GLSL
-            SkASSERT(ver >= GR_GL_VER(1,00));
-            *generation = k110_GrGLSLGeneration;
-            return true;
-        default:
-            SkFAIL("Unknown GL Standard");
-            return false;
-    }
-}
-
-const char* GrGetGLSLVersionDecl(const GrGLContextInfo& info) {
-    switch (info.glslGeneration()) {
-        case k110_GrGLSLGeneration:
-            if (kGLES_GrGLStandard == info.standard()) {
-                // ES2s shader language is based on version 1.20 but is version
-                // 1.00 of the ES language.
-                return "#version 100\n";
-            } else {
-                SkASSERT(kGL_GrGLStandard == info.standard());
-                return "#version 110\n";
-            }
-        case k130_GrGLSLGeneration:
-            SkASSERT(kGL_GrGLStandard == info.standard());
-            return "#version 130\n";
-        case k140_GrGLSLGeneration:
-            SkASSERT(kGL_GrGLStandard == info.standard());
-            return "#version 140\n";
-        case k150_GrGLSLGeneration:
-            SkASSERT(kGL_GrGLStandard == info.standard());
-            if (info.caps()->isCoreProfile()) {
-                return "#version 150\n";
-            } else {
-                return "#version 150 compatibility\n";
-            }
-        default:
-            SkFAIL("Unknown GL version.");
-            return ""; // suppress warning
-    }
-}
-
-namespace {
-    void append_tabs(SkString* outAppend, int tabCnt) {
-        static const char kTabs[] = "\t\t\t\t\t\t\t\t";
-        while (tabCnt) {
-            int cnt = SkTMin((int)SK_ARRAY_COUNT(kTabs), tabCnt);
-            outAppend->append(kTabs, cnt);
-            tabCnt -= cnt;
-        }
-    }
-}
-
-void GrGLSLMulVarBy4f(SkString* outAppend,
-                      unsigned tabCnt,
-                      const char* vec4VarName,
-                      const GrGLSLExpr4& mulFactor) {
-    if (mulFactor.isOnes()) {
-        *outAppend = SkString();
-    }
-
-    append_tabs(outAppend, tabCnt);
-
-    if (mulFactor.isZeros()) {
-        outAppend->appendf("%s = vec4(0);\n", vec4VarName);
-    } else {
-        outAppend->appendf("%s *= %s;\n", vec4VarName, mulFactor.c_str());
-    }
-}
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLShaderBuilder.cpp b/gfx/skia/skia/src/gpu/gl/GrGLShaderBuilder.cpp
deleted file mode 100644
index 8d1e66be7c0e..000000000000
--- a/gfx/skia/skia/src/gpu/gl/GrGLShaderBuilder.cpp
+++ /dev/null
@@ -1,1106 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "gl/GrGLShaderBuilder.h"
-#include "gl/GrGLProgram.h"
-#include "gl/GrGLUniformHandle.h"
-#include "GrCoordTransform.h"
-#include "GrDrawEffect.h"
-#include "GrGpuGL.h"
-#include "GrTexture.h"
-#include "SkRTConf.h"
-#include "SkTraceEvent.h"
-
-#define GL_CALL(X) GR_GL_CALL(this->gpu()->glInterface(), X)
-#define GL_CALL_RET(R, X) GR_GL_CALL_RET(this->gpu()->glInterface(), R, X)
-
-// number of each input/output type in a single allocation block
-static const int kVarsPerBlock = 8;
-
-// except FS outputs where we expect 2 at most.
-static const int kMaxFSOutputs = 2;
-
-// ES2 FS only guarantees mediump and lowp support
-static const GrGLShaderVar::Precision kDefaultFragmentPrecision = GrGLShaderVar::kMedium_Precision;
-
-typedef GrGLUniformManager::UniformHandle UniformHandle;
-
-SK_CONF_DECLARE(bool, c_PrintShaders, "gpu.printShaders", false,
-                "Print the source code for all shaders generated.");
-
-///////////////////////////////////////////////////////////////////////////////
-
-namespace {
-
-inline const char* color_attribute_name() { return "aColor"; }
-inline const char* coverage_attribute_name() { return "aCoverage"; }
-inline const char* declared_color_output_name() { return "fsColorOut"; }
-inline const char* dual_source_output_name() { return "dualSourceOut"; }
-inline const char* sample_function_name(GrSLType type, GrGLSLGeneration glslGen) {
-    if (kVec2f_GrSLType == type) {
-        return glslGen >= k130_GrGLSLGeneration ? "texture" : "texture2D";
-    } else {
-        SkASSERT(kVec3f_GrSLType == type);
-        return glslGen >= k130_GrGLSLGeneration ? "textureProj" : "texture2DProj";
-    }
-}
-
-void append_texture_lookup(SkString* out,
-                           GrGpuGL* gpu,
-                           const char* samplerName,
-                           const char* coordName,
-                           uint32_t configComponentMask,
-                           const char* swizzle,
-                           GrSLType varyingType = kVec2f_GrSLType) {
-    SkASSERT(NULL != coordName);
-
-    out->appendf("%s(%s, %s)",
-                 sample_function_name(varyingType, gpu->glslGeneration()),
-                 samplerName,
-                 coordName);
-
-    char mangledSwizzle[5];
-
-    // The swizzling occurs using texture params instead of shader-mangling if ARB_texture_swizzle
-    // is available.
-    if (!gpu->glCaps().textureSwizzleSupport() &&
-        (kA_GrColorComponentFlag == configComponentMask)) {
-        char alphaChar = gpu->glCaps().textureRedSupport() ? 'r' : 'a';
-        int i;
-        for (i = 0; '\0' != swizzle[i]; ++i) {
-            mangledSwizzle[i] = alphaChar;
-        }
-        mangledSwizzle[i] ='\0';
-        swizzle = mangledSwizzle;
-    }
-    // For shader prettiness we omit the swizzle rather than appending ".rgba".
-    if (memcmp(swizzle, "rgba", 4)) {
-        out->appendf(".%s", swizzle);
-    }
-}
-
-}
-
-static const char kDstCopyColorName[] = "_dstColor";
-
-///////////////////////////////////////////////////////////////////////////////
-
-bool GrGLShaderBuilder::GenProgram(GrGpuGL* gpu,
-                                   GrGLUniformManager* uman,
-                                   const GrGLProgramDesc& desc,
-                                   const GrEffectStage* inColorStages[],
-                                   const GrEffectStage* inCoverageStages[],
-                                   GenProgramOutput* output) {
-    SkAutoTDelete<GrGLShaderBuilder> builder;
-    if (desc.getHeader().fHasVertexCode ||!gpu->shouldUseFixedFunctionTexturing()) {
-        builder.reset(SkNEW_ARGS(GrGLFullShaderBuilder, (gpu, uman, desc)));
-    } else {
-        builder.reset(SkNEW_ARGS(GrGLFragmentOnlyShaderBuilder, (gpu, uman, desc)));
-    }
-    if (builder->genProgram(inColorStages, inCoverageStages)) {
-        *output = builder->getOutput();
-        return true;
-    }
-    return false;
-}
-
-bool GrGLShaderBuilder::genProgram(const GrEffectStage* colorStages[],
-                                   const GrEffectStage* coverageStages[]) {
-    const GrGLProgramDesc::KeyHeader& header = this->desc().getHeader();
-
-    ///////////////////////////////////////////////////////////////////////////
-    // emit code to read the dst copy texture, if necessary
-    if (kNoDstRead_DstReadKey != header.fDstReadKey &&
-        GrGLCaps::kNone_FBFetchType == fGpu->glCaps().fbFetchType()) {
-        bool topDown = SkToBool(kTopLeftOrigin_DstReadKeyBit & header.fDstReadKey);
-        const char* dstCopyTopLeftName;
-        const char* dstCopyCoordScaleName;
-        const char* dstCopySamplerName;
-        uint32_t configMask;
-        if (SkToBool(kUseAlphaConfig_DstReadKeyBit & header.fDstReadKey)) {
-            configMask = kA_GrColorComponentFlag;
-        } else {
-            configMask = kRGBA_GrColorComponentFlags;
-        }
-        fOutput.fUniformHandles.fDstCopySamplerUni =
-            this->addUniform(kFragment_Visibility, kSampler2D_GrSLType, "DstCopySampler",
-                             &dstCopySamplerName);
-        fOutput.fUniformHandles.fDstCopyTopLeftUni =
-            this->addUniform(kFragment_Visibility, kVec2f_GrSLType, "DstCopyUpperLeft",
-                             &dstCopyTopLeftName);
-        fOutput.fUniformHandles.fDstCopyScaleUni =
-            this->addUniform(kFragment_Visibility, kVec2f_GrSLType, "DstCopyCoordScale",
-                             &dstCopyCoordScaleName);
-        const char* fragPos = this->fragmentPosition();
-        this->fsCodeAppend("\t// Read color from copy of the destination.\n");
-        this->fsCodeAppendf("\tvec2 _dstTexCoord = (%s.xy - %s) * %s;\n",
-                            fragPos, dstCopyTopLeftName, dstCopyCoordScaleName);
-        if (!topDown) {
-            this->fsCodeAppend("\t_dstTexCoord.y = 1.0 - _dstTexCoord.y;\n");
-        }
-        this->fsCodeAppendf("\tvec4 %s = ", kDstCopyColorName);
-        append_texture_lookup(&fFSCode,
-                              fGpu,
-                              dstCopySamplerName,
-                              "_dstTexCoord",
-                              configMask,
-                              "rgba");
-        this->fsCodeAppend(";\n\n");
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // get the initial color and coverage to feed into the first effect in each effect chain
-
-    GrGLSLExpr4 inputColor;
-    GrGLSLExpr4 inputCoverage;
-
-    if (GrGLProgramDesc::kUniform_ColorInput == header.fColorInput) {
-        const char* name;
-        fOutput.fUniformHandles.fColorUni =
-            this->addUniform(GrGLShaderBuilder::kFragment_Visibility, kVec4f_GrSLType, "Color",
-                             &name);
-        inputColor = GrGLSLExpr4(name);
-    }
-
-    if (GrGLProgramDesc::kUniform_ColorInput == header.fCoverageInput) {
-        const char* name;
-        fOutput.fUniformHandles.fCoverageUni =
-            this->addUniform(GrGLShaderBuilder::kFragment_Visibility, kVec4f_GrSLType, "Coverage",
-                             &name);
-        inputCoverage = GrGLSLExpr4(name);
-    } else if (GrGLProgramDesc::kSolidWhite_ColorInput == header.fCoverageInput) {
-        inputCoverage = GrGLSLExpr4(1);
-    }
-
-    if (k110_GrGLSLGeneration != fGpu->glslGeneration()) {
-        fFSOutputs.push_back().set(kVec4f_GrSLType,
-                                   GrGLShaderVar::kOut_TypeModifier,
-                                   declared_color_output_name());
-        fHasCustomColorOutput = true;
-    }
-
-    this->emitCodeBeforeEffects(&inputColor, &inputCoverage);
-
-    ///////////////////////////////////////////////////////////////////////////
-    // emit the per-effect code for both color and coverage effects
-
-    GrGLProgramDesc::EffectKeyProvider colorKeyProvider(
-        &this->desc(), GrGLProgramDesc::EffectKeyProvider::kColor_EffectType);
-    fOutput.fColorEffects.reset(this->createAndEmitEffects(colorStages,
-                                                           this->desc().numColorEffects(),
-                                                           colorKeyProvider,
-                                                           &inputColor));
-
-    GrGLProgramDesc::EffectKeyProvider coverageKeyProvider(
-        &this->desc(), GrGLProgramDesc::EffectKeyProvider::kCoverage_EffectType);
-    fOutput.fCoverageEffects.reset(this->createAndEmitEffects(coverageStages,
-                                   this->desc().numCoverageEffects(),
-                                   coverageKeyProvider,
-                                   &inputCoverage));
-
-    this->emitCodeAfterEffects();
-
-    ///////////////////////////////////////////////////////////////////////////
-    // write the secondary color output if necessary
-    if (GrGLProgramDesc::CoverageOutputUsesSecondaryOutput(header.fCoverageOutput)) {
-        const char* secondaryOutputName = this->enableSecondaryOutput();
-
-        // default coeff to ones for kCoverage_DualSrcOutput
-        GrGLSLExpr4 coeff(1);
-        if (GrGLProgramDesc::kSecondaryCoverageISA_CoverageOutput == header.fCoverageOutput) {
-            // Get (1-A) into coeff
-            coeff = GrGLSLExpr4::VectorCast(GrGLSLExpr1(1) - inputColor.a());
-        } else if (GrGLProgramDesc::kSecondaryCoverageISC_CoverageOutput ==
-                   header.fCoverageOutput){
-            // Get (1-RGBA) into coeff
-            coeff = GrGLSLExpr4(1) - inputColor;
-        }
-        // Get coeff * coverage into modulate and then write that to the dual source output.
-        this->fsCodeAppendf("\t%s = %s;\n", secondaryOutputName, (coeff * inputCoverage).c_str());
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // combine color and coverage as frag color
-
-    // Get "color * coverage" into fragColor
-    GrGLSLExpr4 fragColor = inputColor * inputCoverage;
-    // Now tack on "+(1-coverage)dst onto the frag color if we were asked to do so.
-    if (GrGLProgramDesc::kCombineWithDst_CoverageOutput == header.fCoverageOutput) {
-        GrGLSLExpr4 dstCoeff = GrGLSLExpr4(1) - inputCoverage;
-
-        GrGLSLExpr4 dstContribution = dstCoeff * GrGLSLExpr4(this->dstColor());
-
-        fragColor = fragColor + dstContribution;
-    }
-    this->fsCodeAppendf("\t%s = %s;\n", this->getColorOutputName(), fragColor.c_str());
-
-    if (!this->finish()) {
-        return false;
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-GrGLShaderBuilder::GrGLShaderBuilder(GrGpuGL* gpu,
-                                     GrGLUniformManager* uniformManager,
-                                     const GrGLProgramDesc& desc)
-    : fDesc(desc)
-    , fGpu(gpu)
-    , fUniformManager(SkRef(uniformManager))
-    , fFSFeaturesAddedMask(0)
-    , fFSInputs(kVarsPerBlock)
-    , fFSOutputs(kMaxFSOutputs)
-    , fUniforms(kVarsPerBlock)
-    , fSetupFragPosition(false)
-    , fTopLeftFragPosRead(kTopLeftFragPosRead_FragPosKey == desc.getHeader().fFragPosKey)
-    , fHasCustomColorOutput(false)
-    , fHasSecondaryOutput(false) {
-}
-
-bool GrGLShaderBuilder::enableFeature(GLSLFeature feature) {
-    switch (feature) {
-        case kStandardDerivatives_GLSLFeature:
-            if (!fGpu->glCaps().shaderDerivativeSupport()) {
-                return false;
-            }
-            if (kGLES_GrGLStandard == fGpu->glStandard()) {
-                this->addFSFeature(1 << kStandardDerivatives_GLSLFeature,
-                                   "GL_OES_standard_derivatives");
-            }
-            return true;
-        default:
-            SkFAIL("Unexpected GLSLFeature requested.");
-            return false;
-    }
-}
-
-bool GrGLShaderBuilder::enablePrivateFeature(GLSLPrivateFeature feature) {
-    switch (feature) {
-        case kFragCoordConventions_GLSLPrivateFeature:
-            if (!fGpu->glCaps().fragCoordConventionsSupport()) {
-                return false;
-            }
-            if (fGpu->glslGeneration() < k150_GrGLSLGeneration) {
-                this->addFSFeature(1 << kFragCoordConventions_GLSLPrivateFeature,
-                                   "GL_ARB_fragment_coord_conventions");
-            }
-            return true;
-        case kEXTShaderFramebufferFetch_GLSLPrivateFeature:
-            if (GrGLCaps::kEXT_FBFetchType != fGpu->glCaps().fbFetchType()) {
-                return false;
-            }
-            this->addFSFeature(1 << kEXTShaderFramebufferFetch_GLSLPrivateFeature,
-                               "GL_EXT_shader_framebuffer_fetch");
-            return true;
-        case kNVShaderFramebufferFetch_GLSLPrivateFeature:
-            if (GrGLCaps::kNV_FBFetchType != fGpu->glCaps().fbFetchType()) {
-                return false;
-            }
-            this->addFSFeature(1 << kNVShaderFramebufferFetch_GLSLPrivateFeature,
-                               "GL_NV_shader_framebuffer_fetch");
-            return true;
-        default:
-            SkFAIL("Unexpected GLSLPrivateFeature requested.");
-            return false;
-    }
-}
-
-void GrGLShaderBuilder::addFSFeature(uint32_t featureBit, const char* extensionName) {
-    if (!(featureBit & fFSFeaturesAddedMask)) {
-        fFSExtensions.appendf("#extension %s: require\n", extensionName);
-        fFSFeaturesAddedMask |= featureBit;
-    }
-}
-
-void GrGLShaderBuilder::nameVariable(SkString* out, char prefix, const char* name) {
-    if ('\0' == prefix) {
-        *out = name;
-    } else {
-        out->printf("%c%s", prefix, name);
-    }
-    if (fCodeStage.inStageCode()) {
-        if (out->endsWith('_')) {
-            // Names containing "__" are reserved.
-            out->append("x");
-        }
-        out->appendf("_Stage%d", fCodeStage.stageIndex());
-    }
-}
-
-const char* GrGLShaderBuilder::dstColor() {
-    if (fCodeStage.inStageCode()) {
-        const GrEffect* effect = fCodeStage.effectStage()->getEffect();
-        if (!effect->willReadDstColor()) {
-            SkDEBUGFAIL("GrGLEffect asked for dst color but its generating GrEffect "
-                         "did not request access.");
-            return "";
-        }
-    }
-    static const char kFBFetchColorName[] = "gl_LastFragData[0]";
-    GrGLCaps::FBFetchType fetchType = fGpu->glCaps().fbFetchType();
-    if (GrGLCaps::kEXT_FBFetchType == fetchType) {
-        SkAssertResult(this->enablePrivateFeature(kEXTShaderFramebufferFetch_GLSLPrivateFeature));
-        return kFBFetchColorName;
-    } else if (GrGLCaps::kNV_FBFetchType == fetchType) {
-        SkAssertResult(this->enablePrivateFeature(kNVShaderFramebufferFetch_GLSLPrivateFeature));
-        return kFBFetchColorName;
-    } else if (fOutput.fUniformHandles.fDstCopySamplerUni.isValid()) {
-        return kDstCopyColorName;
-    } else {
-        return "";
-    }
-}
-
-void GrGLShaderBuilder::appendTextureLookup(SkString* out,
-                                            const GrGLShaderBuilder::TextureSampler& sampler,
-                                            const char* coordName,
-                                            GrSLType varyingType) const {
-    append_texture_lookup(out,
-                          fGpu,
-                          this->getUniformCStr(sampler.samplerUniform()),
-                          coordName,
-                          sampler.configComponentMask(),
-                          sampler.swizzle(),
-                          varyingType);
-}
-
-void GrGLShaderBuilder::fsAppendTextureLookup(const GrGLShaderBuilder::TextureSampler& sampler,
-                                              const char* coordName,
-                                              GrSLType varyingType) {
-    this->appendTextureLookup(&fFSCode, sampler, coordName, varyingType);
-}
-
-void GrGLShaderBuilder::fsAppendTextureLookupAndModulate(
-                                            const char* modulation,
-                                            const GrGLShaderBuilder::TextureSampler& sampler,
-                                            const char* coordName,
-                                            GrSLType varyingType) {
-    SkString lookup;
-    this->appendTextureLookup(&lookup, sampler, coordName, varyingType);
-    fFSCode.append((GrGLSLExpr4(modulation) * GrGLSLExpr4(lookup)).c_str());
-}
-
-GrGLShaderBuilder::DstReadKey GrGLShaderBuilder::KeyForDstRead(const GrTexture* dstCopy,
-                                                               const GrGLCaps& caps) {
-    uint32_t key = kYesDstRead_DstReadKeyBit;
-    if (GrGLCaps::kNone_FBFetchType != caps.fbFetchType()) {
-        return key;
-    }
-    SkASSERT(NULL != dstCopy);
-    if (!caps.textureSwizzleSupport() && GrPixelConfigIsAlphaOnly(dstCopy->config())) {
-        // The fact that the config is alpha-only must be considered when generating code.
-        key |= kUseAlphaConfig_DstReadKeyBit;
-    }
-    if (kTopLeft_GrSurfaceOrigin == dstCopy->origin()) {
-        key |= kTopLeftOrigin_DstReadKeyBit;
-    }
-    SkASSERT(static_cast<DstReadKey>(key) == key);
-    return static_cast<DstReadKey>(key);
-}
-
-GrGLShaderBuilder::FragPosKey GrGLShaderBuilder::KeyForFragmentPosition(const GrRenderTarget* dst,
-                                                                        const GrGLCaps&) {
-    if (kTopLeft_GrSurfaceOrigin == dst->origin()) {
-        return kTopLeftFragPosRead_FragPosKey;
-    } else {
-        return kBottomLeftFragPosRead_FragPosKey;
-    }
-}
-
-
-const GrGLenum* GrGLShaderBuilder::GetTexParamSwizzle(GrPixelConfig config, const GrGLCaps& caps) {
-    if (caps.textureSwizzleSupport() && GrPixelConfigIsAlphaOnly(config)) {
-        if (caps.textureRedSupport()) {
-            static const GrGLenum gRedSmear[] = { GR_GL_RED, GR_GL_RED, GR_GL_RED, GR_GL_RED };
-            return gRedSmear;
-        } else {
-            static const GrGLenum gAlphaSmear[] = { GR_GL_ALPHA, GR_GL_ALPHA,
-                                                    GR_GL_ALPHA, GR_GL_ALPHA };
-            return gAlphaSmear;
-        }
-    } else {
-        static const GrGLenum gStraight[] = { GR_GL_RED, GR_GL_GREEN, GR_GL_BLUE, GR_GL_ALPHA };
-        return gStraight;
-    }
-}
-
-GrGLUniformManager::UniformHandle GrGLShaderBuilder::addUniformArray(uint32_t visibility,
-                                                                     GrSLType type,
-                                                                     const char* name,
-                                                                     int count,
-                                                                     const char** outName) {
-    SkASSERT(name && strlen(name));
-    SkDEBUGCODE(static const uint32_t kVisibilityMask = kVertex_Visibility | kFragment_Visibility);
-    SkASSERT(0 == (~kVisibilityMask & visibility));
-    SkASSERT(0 != visibility);
-
-    BuilderUniform& uni = fUniforms.push_back();
-    UniformHandle h = GrGLUniformManager::UniformHandle::CreateFromUniformIndex(fUniforms.count() - 1);
-    SkDEBUGCODE(UniformHandle h2 =)
-    fUniformManager->appendUniform(type, count);
-    // We expect the uniform manager to initially have no uniforms and that all uniforms are added
-    // by this function. Therefore, the handles should match.
-    SkASSERT(h2 == h);
-    uni.fVariable.setType(type);
-    uni.fVariable.setTypeModifier(GrGLShaderVar::kUniform_TypeModifier);
-    this->nameVariable(uni.fVariable.accessName(), 'u', name);
-    uni.fVariable.setArrayCount(count);
-    uni.fVisibility = visibility;
-
-    // If it is visible in both the VS and FS, the precision must match.
-    // We declare a default FS precision, but not a default VS. So set the var
-    // to use the default FS precision.
-    if ((kVertex_Visibility | kFragment_Visibility) == visibility) {
-        // the fragment and vertex precisions must match
-        uni.fVariable.setPrecision(kDefaultFragmentPrecision);
-    }
-
-    if (NULL != outName) {
-        *outName = uni.fVariable.c_str();
-    }
-
-    return h;
-}
-
-SkString GrGLShaderBuilder::ensureFSCoords2D(const TransformedCoordsArray& coords, int index) {
-    if (kVec3f_GrSLType != coords[index].type()) {
-        SkASSERT(kVec2f_GrSLType == coords[index].type());
-        return coords[index].getName();
-    }
-
-    SkString coords2D("coords2D");
-    if (0 != index) {
-        coords2D.appendf("_%i", index);
-    }
-    this->fsCodeAppendf("\tvec2 %s = %s.xy / %s.z;",
-                        coords2D.c_str(), coords[index].c_str(), coords[index].c_str());
-    return coords2D;
-}
-
-const char* GrGLShaderBuilder::fragmentPosition() {
-    if (fCodeStage.inStageCode()) {
-        const GrEffect* effect = fCodeStage.effectStage()->getEffect();
-        if (!effect->willReadFragmentPosition()) {
-            SkDEBUGFAIL("GrGLEffect asked for frag position but its generating GrEffect "
-                         "did not request access.");
-            return "";
-        }
-    }
-    // We only declare "gl_FragCoord" when we're in the case where we want to use layout qualifiers
-    // to reverse y. Otherwise it isn't necessary and whether the "in" qualifier appears in the
-    // declaration varies in earlier GLSL specs. So it is simpler to omit it.
-    if (fTopLeftFragPosRead) {
-        fSetupFragPosition = true;
-        return "gl_FragCoord";
-    } else if (fGpu->glCaps().fragCoordConventionsSupport()) {
-        if (!fSetupFragPosition) {
-            SkAssertResult(this->enablePrivateFeature(kFragCoordConventions_GLSLPrivateFeature));
-            fFSInputs.push_back().set(kVec4f_GrSLType,
-                                      GrGLShaderVar::kIn_TypeModifier,
-                                      "gl_FragCoord",
-                                      GrGLShaderVar::kDefault_Precision,
-                                      GrGLShaderVar::kUpperLeft_Origin);
-            fSetupFragPosition = true;
-        }
-        return "gl_FragCoord";
-    } else {
-        static const char* kCoordName = "fragCoordYDown";
-        if (!fSetupFragPosition) {
-            // temporarily change the stage index because we're inserting non-stage code.
-            CodeStage::AutoStageRestore csar(&fCodeStage, NULL);
-
-            SkASSERT(!fOutput.fUniformHandles.fRTHeightUni.isValid());
-            const char* rtHeightName;
-
-            fOutput.fUniformHandles.fRTHeightUni =
-                this->addUniform(kFragment_Visibility, kFloat_GrSLType, "RTHeight", &rtHeightName);
-
-            // Using glFragCoord.zw for the last two components tickles an Adreno driver bug that
-            // causes programs to fail to link. Making this function return a vec2() didn't fix the
-            // problem but using 1.0 for the last two components does.
-            this->fFSCode.prependf("\tvec4 %s = vec4(gl_FragCoord.x, %s - gl_FragCoord.y, 1.0, "
-                                   "1.0);\n", kCoordName, rtHeightName);
-            fSetupFragPosition = true;
-        }
-        SkASSERT(fOutput.fUniformHandles.fRTHeightUni.isValid());
-        return kCoordName;
-    }
-}
-
-void GrGLShaderBuilder::fsEmitFunction(GrSLType returnType,
-                                       const char* name,
-                                       int argCnt,
-                                       const GrGLShaderVar* args,
-                                       const char* body,
-                                       SkString* outName) {
-    fFSFunctions.append(GrGLSLTypeString(returnType));
-    this->nameVariable(outName, '\0', name);
-    fFSFunctions.appendf(" %s", outName->c_str());
-    fFSFunctions.append("(");
-    for (int i = 0; i < argCnt; ++i) {
-        args[i].appendDecl(this->ctxInfo(), &fFSFunctions);
-        if (i < argCnt - 1) {
-            fFSFunctions.append(", ");
-        }
-    }
-    fFSFunctions.append(") {\n");
-    fFSFunctions.append(body);
-    fFSFunctions.append("}\n\n");
-}
-
-namespace {
-
-inline void append_default_precision_qualifier(GrGLShaderVar::Precision p,
-                                               GrGLStandard standard,
-                                               SkString* str) {
-    // Desktop GLSL has added precision qualifiers but they don't do anything.
-    if (kGLES_GrGLStandard == standard) {
-        switch (p) {
-            case GrGLShaderVar::kHigh_Precision:
-                str->append("precision highp float;\n");
-                break;
-            case GrGLShaderVar::kMedium_Precision:
-                str->append("precision mediump float;\n");
-                break;
-            case GrGLShaderVar::kLow_Precision:
-                str->append("precision lowp float;\n");
-                break;
-            case GrGLShaderVar::kDefault_Precision:
-                SkFAIL("Default precision now allowed.");
-            default:
-                SkFAIL("Unknown precision value.");
-        }
-    }
-}
-}
-
-void GrGLShaderBuilder::appendDecls(const VarArray& vars, SkString* out) const {
-    for (int i = 0; i < vars.count(); ++i) {
-        vars[i].appendDecl(this->ctxInfo(), out);
-        out->append(";\n");
-    }
-}
-
-void GrGLShaderBuilder::appendUniformDecls(ShaderVisibility visibility,
-                                           SkString* out) const {
-    for (int i = 0; i < fUniforms.count(); ++i) {
-        if (fUniforms[i].fVisibility & visibility) {
-            fUniforms[i].fVariable.appendDecl(this->ctxInfo(), out);
-            out->append(";\n");
-        }
-    }
-}
-
-void GrGLShaderBuilder::createAndEmitEffects(GrGLProgramEffectsBuilder* programEffectsBuilder,
-                                             const GrEffectStage* effectStages[],
-                                             int effectCnt,
-                                             const GrGLProgramDesc::EffectKeyProvider& keyProvider,
-                                             GrGLSLExpr4* fsInOutColor) {
-    bool effectEmitted = false;
-
-    GrGLSLExpr4 inColor = *fsInOutColor;
-    GrGLSLExpr4 outColor;
-
-    for (int e = 0; e < effectCnt; ++e) {
-        SkASSERT(NULL != effectStages[e] && NULL != effectStages[e]->getEffect());
-        const GrEffectStage& stage = *effectStages[e];
-
-        CodeStage::AutoStageRestore csar(&fCodeStage, &stage);
-
-        if (inColor.isZeros()) {
-            SkString inColorName;
-
-            // Effects have no way to communicate zeros, they treat an empty string as ones.
-            this->nameVariable(&inColorName, '\0', "input");
-            this->fsCodeAppendf("\tvec4 %s = %s;\n", inColorName.c_str(), inColor.c_str());
-            inColor = inColorName;
-        }
-
-        // create var to hold stage result
-        SkString outColorName;
-        this->nameVariable(&outColorName, '\0', "output");
-        this->fsCodeAppendf("\tvec4 %s;\n", outColorName.c_str());
-        outColor = outColorName;
-
-
-        programEffectsBuilder->emitEffect(stage,
-                                          keyProvider.get(e),
-                                          outColor.c_str(),
-                                          inColor.isOnes() ? NULL : inColor.c_str(),
-                                          fCodeStage.stageIndex());
-
-        inColor = outColor;
-        effectEmitted = true;
-    }
-
-    if (effectEmitted) {
-        *fsInOutColor = outColor;
-    }
-}
-
-const char* GrGLShaderBuilder::getColorOutputName() const {
-    return fHasCustomColorOutput ? declared_color_output_name() : "gl_FragColor";
-}
-
-const char* GrGLShaderBuilder::enableSecondaryOutput() {
-    if (!fHasSecondaryOutput) {
-        fFSOutputs.push_back().set(kVec4f_GrSLType,
-                                   GrGLShaderVar::kOut_TypeModifier,
-                                   dual_source_output_name());
-        fHasSecondaryOutput = true;
-    }
-    return dual_source_output_name();
-}
-
-bool GrGLShaderBuilder::finish() {
-    SkASSERT(0 == fOutput.fProgramID);
-    GL_CALL_RET(fOutput.fProgramID, CreateProgram());
-    if (!fOutput.fProgramID) {
-        return false;
-    }
-
-    SkTDArray<GrGLuint> shadersToDelete;
-
-    if (!this->compileAndAttachShaders(fOutput.fProgramID, &shadersToDelete)) {
-        GL_CALL(DeleteProgram(fOutput.fProgramID));
-        return false;
-    }
-
-    this->bindProgramLocations(fOutput.fProgramID);
-    if (fUniformManager->isUsingBindUniform()) {
-        fUniformManager->getUniformLocations(fOutput.fProgramID, fUniforms);
-    }
-
-    GL_CALL(LinkProgram(fOutput.fProgramID));
-
-    // Calling GetProgramiv is expensive in Chromium. Assume success in release builds.
-    bool checkLinked = !fGpu->ctxInfo().isChromium();
-#ifdef SK_DEBUG
-    checkLinked = true;
-#endif
-    if (checkLinked) {
-        GrGLint linked = GR_GL_INIT_ZERO;
-        GL_CALL(GetProgramiv(fOutput.fProgramID, GR_GL_LINK_STATUS, &linked));
-        if (!linked) {
-            GrGLint infoLen = GR_GL_INIT_ZERO;
-            GL_CALL(GetProgramiv(fOutput.fProgramID, GR_GL_INFO_LOG_LENGTH, &infoLen));
-            SkAutoMalloc log(sizeof(char)*(infoLen+1));  // outside if for debugger
-            if (infoLen > 0) {
-                // retrieve length even though we don't need it to workaround
-                // bug in chrome cmd buffer param validation.
-                GrGLsizei length = GR_GL_INIT_ZERO;
-                GL_CALL(GetProgramInfoLog(fOutput.fProgramID,
-                                          infoLen+1,
-                                          &length,
-                                          (char*)log.get()));
-                GrPrintf((char*)log.get());
-            }
-            SkDEBUGFAIL("Error linking program");
-            GL_CALL(DeleteProgram(fOutput.fProgramID));
-            fOutput.fProgramID = 0;
-            return false;
-        }
-    }
-
-    if (!fUniformManager->isUsingBindUniform()) {
-        fUniformManager->getUniformLocations(fOutput.fProgramID, fUniforms);
-    }
-
-    for (int i = 0; i < shadersToDelete.count(); ++i) {
-      GL_CALL(DeleteShader(shadersToDelete[i]));
-    }
-
-    return true;
-}
-
-// Compiles a GL shader and attaches it to a program. Returns the shader ID if
-// successful, or 0 if not.
-static GrGLuint attach_shader(const GrGLContext& glCtx,
-                              GrGLuint programId,
-                              GrGLenum type,
-                              const SkString& shaderSrc) {
-    const GrGLInterface* gli = glCtx.interface();
-
-    GrGLuint shaderId;
-    GR_GL_CALL_RET(gli, shaderId, CreateShader(type));
-    if (0 == shaderId) {
-        return 0;
-    }
-
-    const GrGLchar* sourceStr = shaderSrc.c_str();
-    GrGLint sourceLength = static_cast<GrGLint>(shaderSrc.size());
-    GR_GL_CALL(gli, ShaderSource(shaderId, 1, &sourceStr, &sourceLength));
-    GR_GL_CALL(gli, CompileShader(shaderId));
-
-    // Calling GetShaderiv in Chromium is quite expensive. Assume success in release builds.
-    bool checkCompiled = !glCtx.isChromium();
-#ifdef SK_DEBUG
-    checkCompiled = true;
-#endif
-    if (checkCompiled) {
-        GrGLint compiled = GR_GL_INIT_ZERO;
-        GR_GL_CALL(gli, GetShaderiv(shaderId, GR_GL_COMPILE_STATUS, &compiled));
-
-        if (!compiled) {
-            GrGLint infoLen = GR_GL_INIT_ZERO;
-            GR_GL_CALL(gli, GetShaderiv(shaderId, GR_GL_INFO_LOG_LENGTH, &infoLen));
-            SkAutoMalloc log(sizeof(char)*(infoLen+1)); // outside if for debugger
-            if (infoLen > 0) {
-                // retrieve length even though we don't need it to workaround bug in Chromium cmd
-                // buffer param validation.
-                GrGLsizei length = GR_GL_INIT_ZERO;
-                GR_GL_CALL(gli, GetShaderInfoLog(shaderId, infoLen+1,
-                                                 &length, (char*)log.get()));
-                GrPrintf(shaderSrc.c_str());
-                GrPrintf("\n%s", log.get());
-            }
-            SkDEBUGFAIL("Shader compilation failed!");
-            GR_GL_CALL(gli, DeleteShader(shaderId));
-            return 0;
-        }
-    }
-
-    TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), "skia_gpu::GLShader",
-                         TRACE_EVENT_SCOPE_THREAD, "shader", TRACE_STR_COPY(shaderSrc.c_str()));
-    if (c_PrintShaders) {
-        GrPrintf(shaderSrc.c_str());
-        GrPrintf("\n");
-    }
-
-    // Attach the shader, but defer deletion until after we have linked the program.
-    // This works around a bug in the Android emulator's GLES2 wrapper which
-    // will immediately delete the shader object and free its memory even though it's
-    // attached to a program, which then causes glLinkProgram to fail.
-    GR_GL_CALL(gli, AttachShader(programId, shaderId));
-
-    return shaderId;
-}
-
-bool GrGLShaderBuilder::compileAndAttachShaders(GrGLuint programId, SkTDArray<GrGLuint>* shaderIds) const {
-    SkString fragShaderSrc(GrGetGLSLVersionDecl(this->ctxInfo()));
-    fragShaderSrc.append(fFSExtensions);
-    append_default_precision_qualifier(kDefaultFragmentPrecision,
-                                       fGpu->glStandard(),
-                                       &fragShaderSrc);
-    this->appendUniformDecls(kFragment_Visibility, &fragShaderSrc);
-    this->appendDecls(fFSInputs, &fragShaderSrc);
-    // We shouldn't have declared outputs on 1.10
-    SkASSERT(k110_GrGLSLGeneration != fGpu->glslGeneration() || fFSOutputs.empty());
-    this->appendDecls(fFSOutputs, &fragShaderSrc);
-    fragShaderSrc.append(fFSFunctions);
-    fragShaderSrc.append("void main() {\n");
-    fragShaderSrc.append(fFSCode);
-    fragShaderSrc.append("}\n");
-
-    GrGLuint fragShaderId = attach_shader(fGpu->glContext(), programId, GR_GL_FRAGMENT_SHADER, fragShaderSrc);
-    if (!fragShaderId) {
-        return false;
-    }
-
-    *shaderIds->append() = fragShaderId;
-
-    return true;
-}
-
-void GrGLShaderBuilder::bindProgramLocations(GrGLuint programId) const {
-    if (fHasCustomColorOutput) {
-        GL_CALL(BindFragDataLocation(programId, 0, declared_color_output_name()));
-    }
-    if (fHasSecondaryOutput) {
-        GL_CALL(BindFragDataLocationIndexed(programId, 0, 1, dual_source_output_name()));
-    }
-}
-
-const GrGLContextInfo& GrGLShaderBuilder::ctxInfo() const {
-    return fGpu->ctxInfo();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-GrGLFullShaderBuilder::GrGLFullShaderBuilder(GrGpuGL* gpu,
-                                             GrGLUniformManager* uniformManager,
-                                             const GrGLProgramDesc& desc)
-    : INHERITED(gpu, uniformManager, desc)
-    , fVSAttrs(kVarsPerBlock)
-    , fVSOutputs(kVarsPerBlock)
-    , fGSInputs(kVarsPerBlock)
-    , fGSOutputs(kVarsPerBlock) {
-}
-
-void GrGLFullShaderBuilder::emitCodeBeforeEffects(GrGLSLExpr4* color, GrGLSLExpr4* coverage) {
-    const GrGLProgramDesc::KeyHeader& header = this->desc().getHeader();
-
-    fOutput.fHasVertexShader = true;
-
-    fPositionVar = &fVSAttrs.push_back();
-    fPositionVar->set(kVec2f_GrSLType, GrGLShaderVar::kAttribute_TypeModifier, "aPosition");
-    if (-1 != header.fLocalCoordAttributeIndex) {
-        fLocalCoordsVar = &fVSAttrs.push_back();
-        fLocalCoordsVar->set(kVec2f_GrSLType,
-                             GrGLShaderVar::kAttribute_TypeModifier,
-                             "aLocalCoords");
-    } else {
-        fLocalCoordsVar = fPositionVar;
-    }
-
-    const char* viewMName;
-    fOutput.fUniformHandles.fViewMatrixUni =
-        this->addUniform(GrGLShaderBuilder::kVertex_Visibility, kMat33f_GrSLType, "ViewM",
-                          &viewMName);
-
-    // Transform the position into Skia's device coords.
-    this->vsCodeAppendf("\tvec3 pos3 = %s * vec3(%s, 1);\n",
-                        viewMName, fPositionVar->c_str());
-
-    // we output point size in the GS if present
-    if (header.fEmitsPointSize
-#if GR_GL_EXPERIMENTAL_GS
-        && !header.fExperimentalGS
-#endif
-        ) {
-        this->vsCodeAppend("\tgl_PointSize = 1.0;\n");
-    }
-
-    if (GrGLProgramDesc::kAttribute_ColorInput == header.fColorInput) {
-        this->addAttribute(kVec4f_GrSLType, color_attribute_name());
-        const char *vsName, *fsName;
-        this->addVarying(kVec4f_GrSLType, "Color", &vsName, &fsName);
-        this->vsCodeAppendf("\t%s = %s;\n", vsName, color_attribute_name());
-        *color = fsName;
-    }
-
-    if (GrGLProgramDesc::kAttribute_ColorInput == header.fCoverageInput) {
-        this->addAttribute(kVec4f_GrSLType, coverage_attribute_name());
-        const char *vsName, *fsName;
-        this->addVarying(kVec4f_GrSLType, "Coverage", &vsName, &fsName);
-        this->vsCodeAppendf("\t%s = %s;\n", vsName, coverage_attribute_name());
-        *coverage = fsName;
-    }
-}
-
-void GrGLFullShaderBuilder::emitCodeAfterEffects() {
-    const char* rtAdjustName;
-    fOutput.fUniformHandles.fRTAdjustmentUni =
-        this->addUniform(GrGLShaderBuilder::kVertex_Visibility, kVec4f_GrSLType, "rtAdjustment",
-                         &rtAdjustName);
-
-    // Transform from Skia's device coords to GL's normalized device coords.
-    this->vsCodeAppendf(
-        "\tgl_Position = vec4(dot(pos3.xz, %s.xy), dot(pos3.yz, %s.zw), 0, pos3.z);\n",
-        rtAdjustName, rtAdjustName);
-}
-
-bool GrGLFullShaderBuilder::addAttribute(GrSLType type, const char* name) {
-    for (int i = 0; i < fVSAttrs.count(); ++i) {
-        const GrGLShaderVar& attr = fVSAttrs[i];
-        // if attribute already added, don't add it again
-        if (attr.getName().equals(name)) {
-            SkASSERT(attr.getType() == type);
-            return false;
-        }
-    }
-    fVSAttrs.push_back().set(type,
-                             GrGLShaderVar::kAttribute_TypeModifier,
-                             name);
-    return true;
-}
-
-bool GrGLFullShaderBuilder::addEffectAttribute(int attributeIndex,
-                                               GrSLType type,
-                                               const SkString& name) {
-    if (!this->addAttribute(type, name.c_str())) {
-        return false;
-    }
-
-    fEffectAttributes.push_back().set(attributeIndex, name);
-    return true;
-}
-
-void GrGLFullShaderBuilder::addVarying(GrSLType type,
-                                       const char* name,
-                                       const char** vsOutName,
-                                       const char** fsInName) {
-    fVSOutputs.push_back();
-    fVSOutputs.back().setType(type);
-    fVSOutputs.back().setTypeModifier(GrGLShaderVar::kVaryingOut_TypeModifier);
-    this->nameVariable(fVSOutputs.back().accessName(), 'v', name);
-
-    if (vsOutName) {
-        *vsOutName = fVSOutputs.back().getName().c_str();
-    }
-    // input to FS comes either from VS or GS
-    const SkString* fsName;
-#if GR_GL_EXPERIMENTAL_GS
-    if (this->desc().getHeader().fExperimentalGS) {
-        // if we have a GS take each varying in as an array
-        // and output as non-array.
-        fGSInputs.push_back();
-        fGSInputs.back().setType(type);
-        fGSInputs.back().setTypeModifier(GrGLShaderVar::kVaryingIn_TypeModifier);
-        fGSInputs.back().setUnsizedArray();
-        *fGSInputs.back().accessName() = fVSOutputs.back().getName();
-        fGSOutputs.push_back();
-        fGSOutputs.back().setType(type);
-        fGSOutputs.back().setTypeModifier(GrGLShaderVar::kVaryingOut_TypeModifier);
-        this->nameVariable(fGSOutputs.back().accessName(), 'g', name);
-        fsName = fGSOutputs.back().accessName();
-    } else
-#endif
-    {
-        fsName = fVSOutputs.back().accessName();
-    }
-    this->fsInputAppend().set(type, GrGLShaderVar::kVaryingIn_TypeModifier, *fsName);
-    if (fsInName) {
-        *fsInName = fsName->c_str();
-    }
-}
-
-const SkString* GrGLFullShaderBuilder::getEffectAttributeName(int attributeIndex) const {
-    const AttributePair* attribEnd = fEffectAttributes.end();
-    for (const AttributePair* attrib = fEffectAttributes.begin(); attrib != attribEnd; ++attrib) {
-        if (attrib->fIndex == attributeIndex) {
-            return &attrib->fName;
-        }
-    }
-
-    return NULL;
-}
-
-GrGLProgramEffects* GrGLFullShaderBuilder::createAndEmitEffects(
-        const GrEffectStage* effectStages[],
-        int effectCnt,
-        const GrGLProgramDesc::EffectKeyProvider& keyProvider,
-        GrGLSLExpr4* inOutFSColor) {
-
-    GrGLVertexProgramEffectsBuilder programEffectsBuilder(this, effectCnt);
-    this->INHERITED::createAndEmitEffects(&programEffectsBuilder,
-                                          effectStages,
-                                          effectCnt,
-                                          keyProvider,
-                                          inOutFSColor);
-    return programEffectsBuilder.finish();
-}
-
-bool GrGLFullShaderBuilder::compileAndAttachShaders(GrGLuint programId,
-                                                    SkTDArray<GrGLuint>* shaderIds) const {
-    const GrGLContext& glCtx = this->gpu()->glContext();
-    SkString vertShaderSrc(GrGetGLSLVersionDecl(this->ctxInfo()));
-    this->appendUniformDecls(kVertex_Visibility, &vertShaderSrc);
-    this->appendDecls(fVSAttrs, &vertShaderSrc);
-    this->appendDecls(fVSOutputs, &vertShaderSrc);
-    vertShaderSrc.append("void main() {\n");
-    vertShaderSrc.append(fVSCode);
-    vertShaderSrc.append("}\n");
-    GrGLuint vertShaderId = attach_shader(glCtx, programId, GR_GL_VERTEX_SHADER, vertShaderSrc);
-    if (!vertShaderId) {
-        return false;
-    }
-    *shaderIds->append() = vertShaderId;
-
-#if GR_GL_EXPERIMENTAL_GS
-    if (this->desc().getHeader().fExperimentalGS) {
-        SkASSERT(this->ctxInfo().glslGeneration() >= k150_GrGLSLGeneration);
-        SkString geomShaderSrc(GrGetGLSLVersionDecl(this->ctxInfo()));
-        geomShaderSrc.append("layout(triangles) in;\n"
-                             "layout(triangle_strip, max_vertices = 6) out;\n");
-        this->appendDecls(fGSInputs, &geomShaderSrc);
-        this->appendDecls(fGSOutputs, &geomShaderSrc);
-        geomShaderSrc.append("void main() {\n");
-        geomShaderSrc.append("\tfor (int i = 0; i < 3; ++i) {\n"
-                             "\t\tgl_Position = gl_in[i].gl_Position;\n");
-        if (this->desc().getHeader().fEmitsPointSize) {
-            geomShaderSrc.append("\t\tgl_PointSize = 1.0;\n");
-        }
-        SkASSERT(fGSInputs.count() == fGSOutputs.count());
-        for (int i = 0; i < fGSInputs.count(); ++i) {
-            geomShaderSrc.appendf("\t\t%s = %s[i];\n",
-                                  fGSOutputs[i].getName().c_str(),
-                                  fGSInputs[i].getName().c_str());
-        }
-        geomShaderSrc.append("\t\tEmitVertex();\n"
-                             "\t}\n"
-                             "\tEndPrimitive();\n");
-        geomShaderSrc.append("}\n");
-        GrGLuint geomShaderId = attach_shader(glCtx, programId, GR_GL_GEOMETRY_SHADER, geomShaderSrc);
-        if (!geomShaderId) {
-            return false;
-        }
-        *shaderIds->append() = geomShaderId;
-    }
-#endif
-
-    return this->INHERITED::compileAndAttachShaders(programId, shaderIds);
-}
-
-void GrGLFullShaderBuilder::bindProgramLocations(GrGLuint programId) const {
-    this->INHERITED::bindProgramLocations(programId);
-
-    const GrGLProgramDesc::KeyHeader& header = this->desc().getHeader();
-
-    // Bind the attrib locations to same values for all shaders
-    SkASSERT(-1 != header.fPositionAttributeIndex);
-    GL_CALL(BindAttribLocation(programId,
-                               header.fPositionAttributeIndex,
-                               fPositionVar->c_str()));
-    if (-1 != header.fLocalCoordAttributeIndex) {
-        GL_CALL(BindAttribLocation(programId,
-                                   header.fLocalCoordAttributeIndex,
-                                   fLocalCoordsVar->c_str()));
-    }
-    if (-1 != header.fColorAttributeIndex) {
-        GL_CALL(BindAttribLocation(programId,
-                                   header.fColorAttributeIndex,
-                                   color_attribute_name()));
-    }
-    if (-1 != header.fCoverageAttributeIndex) {
-        GL_CALL(BindAttribLocation(programId,
-                                   header.fCoverageAttributeIndex,
-                                   coverage_attribute_name()));
-    }
-
-    const AttributePair* attribEnd = fEffectAttributes.end();
-    for (const AttributePair* attrib = fEffectAttributes.begin(); attrib != attribEnd; ++attrib) {
-         GL_CALL(BindAttribLocation(programId, attrib->fIndex, attrib->fName.c_str()));
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-GrGLFragmentOnlyShaderBuilder::GrGLFragmentOnlyShaderBuilder(GrGpuGL* gpu,
-                                                             GrGLUniformManager* uniformManager,
-                                                             const GrGLProgramDesc& desc)
-    : INHERITED(gpu, uniformManager, desc) {
-    SkASSERT(!desc.getHeader().fHasVertexCode);
-    SkASSERT(gpu->glCaps().pathRenderingSupport());
-    SkASSERT(GrGLProgramDesc::kAttribute_ColorInput != desc.getHeader().fColorInput);
-    SkASSERT(GrGLProgramDesc::kAttribute_ColorInput != desc.getHeader().fCoverageInput);
-}
-
-int GrGLFragmentOnlyShaderBuilder::addTexCoordSets(int count) {
-    int firstFreeCoordSet = fOutput.fTexCoordSetCnt;
-    fOutput.fTexCoordSetCnt += count;
-    SkASSERT(gpu()->glCaps().maxFixedFunctionTextureCoords() >= fOutput.fTexCoordSetCnt);
-    return firstFreeCoordSet;
-}
-
-GrGLProgramEffects* GrGLFragmentOnlyShaderBuilder::createAndEmitEffects(
-        const GrEffectStage* effectStages[],
-        int effectCnt,
-        const GrGLProgramDesc::EffectKeyProvider& keyProvider,
-        GrGLSLExpr4* inOutFSColor) {
-
-    GrGLPathTexGenProgramEffectsBuilder pathTexGenEffectsBuilder(this,
-                                                                 effectCnt);
-    this->INHERITED::createAndEmitEffects(&pathTexGenEffectsBuilder,
-                                          effectStages,
-                                          effectCnt,
-                                          keyProvider,
-                                          inOutFSColor);
-    return pathTexGenEffectsBuilder.finish();
-}
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLShaderBuilder.h b/gfx/skia/skia/src/gpu/gl/GrGLShaderBuilder.h
deleted file mode 100644
index 73e9a8f8032f..000000000000
--- a/gfx/skia/skia/src/gpu/gl/GrGLShaderBuilder.h
+++ /dev/null
@@ -1,522 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrGLShaderBuilder_DEFINED
-#define GrGLShaderBuilder_DEFINED
-
-#include "GrAllocator.h"
-#include "GrBackendEffectFactory.h"
-#include "GrColor.h"
-#include "GrEffect.h"
-#include "SkTypes.h"
-#include "gl/GrGLProgramDesc.h"
-#include "gl/GrGLProgramEffects.h"
-#include "gl/GrGLSL.h"
-#include "gl/GrGLUniformManager.h"
-
-#include <stdarg.h>
-
-class GrGLContextInfo;
-class GrEffectStage;
-class GrGLProgramDesc;
-
-/**
-  Contains all the incremental state of a shader as it is being built,as well as helpers to
-  manipulate that state.
-*/
-class GrGLShaderBuilder {
-public:
-    typedef GrTAllocator<GrGLShaderVar> VarArray;
-    typedef GrGLProgramEffects::TextureSampler TextureSampler;
-    typedef GrGLProgramEffects::TransformedCoordsArray TransformedCoordsArray;
-    typedef GrGLUniformManager::BuilderUniform BuilderUniform;
-
-    enum ShaderVisibility {
-        kVertex_Visibility   = 0x1,
-        kGeometry_Visibility = 0x2,
-        kFragment_Visibility = 0x4,
-    };
-
-    typedef GrGLUniformManager::UniformHandle UniformHandle;
-
-    // Handles for program uniforms (other than per-effect uniforms)
-    struct UniformHandles {
-        UniformHandle       fViewMatrixUni;
-        UniformHandle       fRTAdjustmentUni;
-        UniformHandle       fColorUni;
-        UniformHandle       fCoverageUni;
-
-        // We use the render target height to provide a y-down frag coord when specifying
-        // origin_upper_left is not supported.
-        UniformHandle       fRTHeightUni;
-
-        // Uniforms for computing texture coords to do the dst-copy lookup
-        UniformHandle       fDstCopyTopLeftUni;
-        UniformHandle       fDstCopyScaleUni;
-        UniformHandle       fDstCopySamplerUni;
-    };
-
-    struct GenProgramOutput {
-        GenProgramOutput()
-            : fColorEffects(NULL)
-            , fCoverageEffects(NULL)
-            , fHasVertexShader(false)
-            , fTexCoordSetCnt(0)
-            , fProgramID(0) {}
-
-        GenProgramOutput(const GenProgramOutput& other) {
-            *this = other;
-        }
-
-        GenProgramOutput& operator=(const GenProgramOutput& other) {
-            fColorEffects.reset(SkRef(other.fColorEffects.get()));
-            fCoverageEffects.reset(SkRef(other.fCoverageEffects.get()));
-            fUniformHandles = other.fUniformHandles;
-            fHasVertexShader = other.fHasVertexShader;
-            fTexCoordSetCnt = other.fTexCoordSetCnt;
-            fProgramID = other.fProgramID;
-            return *this;
-        }
-
-        SkAutoTUnref<GrGLProgramEffects> fColorEffects;
-        SkAutoTUnref<GrGLProgramEffects> fCoverageEffects;
-        UniformHandles                   fUniformHandles;
-        bool                             fHasVertexShader;
-        int                              fTexCoordSetCnt;
-        GrGLuint                         fProgramID;
-    };
-
-    static bool GenProgram(GrGpuGL* gpu,
-                           GrGLUniformManager* uman,
-                           const GrGLProgramDesc& desc,
-                           const GrEffectStage* inColorStages[],
-                           const GrEffectStage* inCoverageStages[],
-                           GenProgramOutput* output);
-
-    virtual ~GrGLShaderBuilder() {}
-
-    /**
-     * Use of these features may require a GLSL extension to be enabled. Shaders may not compile
-     * if code is added that uses one of these features without calling enableFeature()
-     */
-    enum GLSLFeature {
-        kStandardDerivatives_GLSLFeature = 0,
-
-        kLastGLSLFeature = kStandardDerivatives_GLSLFeature
-    };
-
-    /**
-     * If the feature is supported then true is returned and any necessary #extension declarations
-     * are added to the shaders. If the feature is not supported then false will be returned.
-     */
-    bool enableFeature(GLSLFeature);
-
-    /**
-     * Called by GrGLEffects to add code the fragment shader.
-     */
-    void fsCodeAppendf(const char format[], ...) SK_PRINTF_LIKE(2, 3) {
-        va_list args;
-        va_start(args, format);
-        fFSCode.appendVAList(format, args);
-        va_end(args);
-    }
-
-    void fsCodeAppend(const char* str) { fFSCode.append(str); }
-
-    /** Appends a 2D texture sample with projection if necessary. coordType must either be Vec2f or
-        Vec3f. The latter is interpreted as projective texture coords. The vec length and swizzle
-        order of the result depends on the GrTextureAccess associated with the TextureSampler. */
-    void appendTextureLookup(SkString* out,
-                             const TextureSampler&,
-                             const char* coordName,
-                             GrSLType coordType = kVec2f_GrSLType) const;
-
-    /** Version of above that appends the result to the fragment shader code instead.*/
-    void fsAppendTextureLookup(const TextureSampler&,
-                               const char* coordName,
-                               GrSLType coordType = kVec2f_GrSLType);
-
-
-    /** Does the work of appendTextureLookup and modulates the result by modulation. The result is
-        always a vec4. modulation and the swizzle specified by TextureSampler must both be vec4 or
-        float. If modulation is "" or NULL it this function acts as though appendTextureLookup were
-        called. */
-    void fsAppendTextureLookupAndModulate(const char* modulation,
-                                          const TextureSampler&,
-                                          const char* coordName,
-                                          GrSLType coordType = kVec2f_GrSLType);
-
-    /** Emits a helper function outside of main() in the fragment shader. */
-    void fsEmitFunction(GrSLType returnType,
-                        const char* name,
-                        int argCnt,
-                        const GrGLShaderVar* args,
-                        const char* body,
-                        SkString* outName);
-
-    typedef uint8_t DstReadKey;
-    typedef uint8_t FragPosKey;
-
-    /**  Returns a key for adding code to read the copy-of-dst color in service of effects that
-         require reading the dst. It must not return 0 because 0 indicates that there is no dst
-         copy read at all (in which case this function should not be called). */
-    static DstReadKey KeyForDstRead(const GrTexture* dstCopy, const GrGLCaps&);
-
-    /** Returns a key for reading the fragment location. This should only be called if there is an
-        effect that will requires the fragment position. If the fragment position is not required,
-        the key is 0. */
-    static FragPosKey KeyForFragmentPosition(const GrRenderTarget* dst, const GrGLCaps&);
-
-    /** If texture swizzling is available using tex parameters then it is preferred over mangling
-        the generated shader code. This potentially allows greater reuse of cached shaders. */
-    static const GrGLenum* GetTexParamSwizzle(GrPixelConfig config, const GrGLCaps& caps);
-
-    /** Add a uniform variable to the current program, that has visibility in one or more shaders.
-        visibility is a bitfield of ShaderVisibility values indicating from which shaders the
-        uniform should be accessible. At least one bit must be set. Geometry shader uniforms are not
-        supported at this time. The actual uniform name will be mangled. If outName is not NULL then
-        it will refer to the final uniform name after return. Use the addUniformArray variant to add
-        an array of uniforms. */
-    GrGLUniformManager::UniformHandle addUniform(uint32_t visibility,
-                                                 GrSLType type,
-                                                 const char* name,
-                                                 const char** outName = NULL) {
-        return this->addUniformArray(visibility, type, name, GrGLShaderVar::kNonArray, outName);
-    }
-    GrGLUniformManager::UniformHandle addUniformArray(uint32_t visibility,
-                                                      GrSLType type,
-                                                      const char* name,
-                                                      int arrayCount,
-                                                      const char** outName = NULL);
-
-    const GrGLShaderVar& getUniformVariable(GrGLUniformManager::UniformHandle u) const {
-        return fUniformManager->getBuilderUniform(fUniforms, u).fVariable;
-    }
-
-    /**
-     * Shortcut for getUniformVariable(u).c_str()
-     */
-    const char* getUniformCStr(GrGLUniformManager::UniformHandle u) const {
-        return this->getUniformVariable(u).c_str();
-    }
-
-    /**
-     * This returns a variable name to access the 2D, perspective correct version of the coords in
-     * the fragment shader. If the coordinates at index are 3-dimensional, it immediately emits a
-     * perspective divide into the fragment shader (xy / z) to convert them to 2D.
-     */
-    SkString ensureFSCoords2D(const TransformedCoordsArray&, int index);
-
-    /** Returns a variable name that represents the position of the fragment in the FS. The position
-        is in device space (e.g. 0,0 is the top left and pixel centers are at half-integers). */
-    const char* fragmentPosition();
-
-    /** Returns the variable name that holds the color of the destination pixel. This may be NULL if
-        no effect advertised that it will read the destination. */
-    const char* dstColor();
-
-    const GrGLContextInfo& ctxInfo() const;
-
-    /**
-     * Helper for begining and ending a block in the fragment code. TODO: Make GrGLShaderBuilder
-     * aware of all blocks and turn single \t's into the correct number of tabs (or spaces) so that
-     * our shaders print pretty without effect writers tracking indentation.
-     */
-    class FSBlock {
-    public:
-        FSBlock(GrGLShaderBuilder* builder) : fBuilder(builder) {
-            SkASSERT(NULL != builder);
-            fBuilder->fsCodeAppend("\t{\n");
-        }
-
-        ~FSBlock() {
-            fBuilder->fsCodeAppend("\t}\n");
-        }
-    private:
-        GrGLShaderBuilder* fBuilder;
-    };
-
-protected:
-    GrGLShaderBuilder(GrGpuGL*, GrGLUniformManager*, const GrGLProgramDesc&);
-
-    GrGpuGL* gpu() const { return fGpu; }
-
-    const GrGLProgramDesc& desc() const { return fDesc; }
-
-    /** Add input/output variable declarations (i.e. 'varying') to the fragment shader. */
-    GrGLShaderVar& fsInputAppend() { return fFSInputs.push_back(); }
-
-    // Helper for emitEffects().
-    void createAndEmitEffects(GrGLProgramEffectsBuilder*,
-                              const GrEffectStage* effectStages[],
-                              int effectCnt,
-                              const GrGLProgramDesc::EffectKeyProvider&,
-                              GrGLSLExpr4* inOutFSColor);
-
-    // Generates a name for a variable. The generated string will be name prefixed by the prefix
-    // char (unless the prefix is '\0'). It also mangles the name to be stage-specific if we're
-    // generating stage code.
-    void nameVariable(SkString* out, char prefix, const char* name);
-
-    virtual bool compileAndAttachShaders(GrGLuint programId, SkTDArray<GrGLuint>* shaderIds) const;
-
-    virtual void bindProgramLocations(GrGLuint programId) const;
-
-    void appendDecls(const VarArray&, SkString*) const;
-    void appendUniformDecls(ShaderVisibility, SkString*) const;
-
-    const GenProgramOutput& getOutput() const { return fOutput; }
-
-    GenProgramOutput fOutput;
-
-private:
-    class CodeStage : SkNoncopyable {
-    public:
-        CodeStage() : fNextIndex(0), fCurrentIndex(-1), fEffectStage(NULL) {}
-
-        bool inStageCode() const {
-            this->validate();
-            return NULL != fEffectStage;
-        }
-
-        const GrEffectStage* effectStage() const {
-            this->validate();
-            return fEffectStage;
-        }
-
-        int stageIndex() const {
-            this->validate();
-            return fCurrentIndex;
-        }
-
-        class AutoStageRestore : SkNoncopyable {
-        public:
-            AutoStageRestore(CodeStage* codeStage, const GrEffectStage* newStage) {
-                SkASSERT(NULL != codeStage);
-                fSavedIndex = codeStage->fCurrentIndex;
-                fSavedEffectStage = codeStage->fEffectStage;
-
-                if (NULL == newStage) {
-                    codeStage->fCurrentIndex = -1;
-                } else {
-                    codeStage->fCurrentIndex = codeStage->fNextIndex++;
-                }
-                codeStage->fEffectStage = newStage;
-
-                fCodeStage = codeStage;
-            }
-            ~AutoStageRestore() {
-                fCodeStage->fCurrentIndex = fSavedIndex;
-                fCodeStage->fEffectStage = fSavedEffectStage;
-            }
-        private:
-            CodeStage*              fCodeStage;
-            int                     fSavedIndex;
-            const GrEffectStage*    fSavedEffectStage;
-        };
-    private:
-        void validate() const { SkASSERT((NULL == fEffectStage) == (-1 == fCurrentIndex)); }
-        int                     fNextIndex;
-        int                     fCurrentIndex;
-        const GrEffectStage*    fEffectStage;
-    } fCodeStage;
-
-    bool genProgram(const GrEffectStage* colorStages[], const GrEffectStage* coverageStages[]);
-
-    /**
-     * The base class will emit the fragment code that precedes the per-effect code and then call
-     * this function. The subclass can use it to insert additional fragment code that should
-     * execute before the effects' code and/or emit other shaders (e.g. geometry, vertex).
-     *
-     * The subclass can modify the initial color or coverage 
-     */
-    virtual void emitCodeBeforeEffects(GrGLSLExpr4* color, GrGLSLExpr4* coverage) = 0;
-
-    /**
-    * Adds code for effects and returns a GrGLProgramEffects* object. The caller is responsible for
-    * deleting it when finished. effectStages contains the effects to add. The effect key provider 
-    * is used to communicate the key each effect created in its GenKey function. inOutFSColor
-    * specifies the input color to the first stage and is updated to be the output color of the
-    * last stage. The handles to texture samplers for effectStage[i] are added to
-    * effectSamplerHandles[i].
-    */
-    virtual GrGLProgramEffects* createAndEmitEffects(const GrEffectStage* effectStages[],
-                                                     int effectCnt,
-                                                     const GrGLProgramDesc::EffectKeyProvider&,
-                                                     GrGLSLExpr4* inOutFSColor) = 0;
-
-    /**
-     * Similar to emitCodeBeforeEffects() but called after per-effect code is emitted.
-     */
-    virtual void emitCodeAfterEffects() = 0;
-
-    /** Enables using the secondary color output and returns the name of the var in which it is
-        to be stored */
-    const char* enableSecondaryOutput();
-    /** Gets the name of the primary color output. */
-    const char* getColorOutputName() const;
-
-    /**
-     * Compiles all the shaders, links them into a program, and writes the program id to the output
-     * struct.
-     **/
-    bool finish();
-
-    /**
-     * Features that should only be enabled by GrGLShaderBuilder itself.
-     */
-    enum GLSLPrivateFeature {
-        kFragCoordConventions_GLSLPrivateFeature = kLastGLSLFeature + 1,
-        kEXTShaderFramebufferFetch_GLSLPrivateFeature,
-        kNVShaderFramebufferFetch_GLSLPrivateFeature,
-    };
-    bool enablePrivateFeature(GLSLPrivateFeature);
-
-    // If we ever have VS/GS features we can expand this to take a bitmask of ShaderVisibility and
-    // track the enables separately for each shader.
-    void addFSFeature(uint32_t featureBit, const char* extensionName);
-
-    // Interpretation of DstReadKey when generating code
-    enum {
-        kNoDstRead_DstReadKey           = 0,
-        kYesDstRead_DstReadKeyBit       = 0x1, // Set if we do a dst-copy-read.
-        kUseAlphaConfig_DstReadKeyBit   = 0x2, // Set if dst-copy config is alpha only.
-        kTopLeftOrigin_DstReadKeyBit    = 0x4, // Set if dst-copy origin is top-left.
-    };
-
-    enum {
-        kNoFragPosRead_FragPosKey           = 0,  // The fragment positition will not be needed.
-        kTopLeftFragPosRead_FragPosKey      = 0x1,// Read frag pos relative to top-left.
-        kBottomLeftFragPosRead_FragPosKey   = 0x2,// Read frag pos relative to bottom-left.
-    };
-
-    const GrGLProgramDesc&                  fDesc;
-    GrGpuGL*                                fGpu;
-    SkAutoTUnref<GrGLUniformManager>        fUniformManager;
-    uint32_t                                fFSFeaturesAddedMask;
-    SkString                                fFSFunctions;
-    SkString                                fFSExtensions;
-    VarArray                                fFSInputs;
-    VarArray                                fFSOutputs;
-    GrGLUniformManager::BuilderUniformArray fUniforms;
-
-    SkString                                fFSCode;
-
-    bool                                    fSetupFragPosition;
-    bool                                    fTopLeftFragPosRead;
-
-    bool                                    fHasCustomColorOutput;
-    bool                                    fHasSecondaryOutput;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-class GrGLFullShaderBuilder : public GrGLShaderBuilder {
-public:
-    GrGLFullShaderBuilder(GrGpuGL*, GrGLUniformManager*, const GrGLProgramDesc&);
-
-    /**
-     * Called by GrGLEffects to add code to one of the shaders.
-     */
-    void vsCodeAppendf(const char format[], ...) SK_PRINTF_LIKE(2, 3) {
-        va_list args;
-        va_start(args, format);
-        fVSCode.appendVAList(format, args);
-        va_end(args);
-    }
-
-    void vsCodeAppend(const char* str) { fVSCode.append(str); }
-
-   /** Add a vertex attribute to the current program that is passed in from the vertex data.
-       Returns false if the attribute was already there, true otherwise. */
-    bool addAttribute(GrSLType type, const char* name);
-
-   /** Add a varying variable to the current program to pass values between vertex and fragment
-        shaders. If the last two parameters are non-NULL, they are filled in with the name
-        generated. */
-    void addVarying(GrSLType type,
-                    const char* name,
-                    const char** vsOutName = NULL,
-                    const char** fsInName = NULL);
-
-    /** Returns a vertex attribute that represents the vertex position in the VS. This is the
-        pre-matrix position and is commonly used by effects to compute texture coords via a matrix.
-      */
-    const GrGLShaderVar& positionAttribute() const { return *fPositionVar; }
-
-    /** Returns a vertex attribute that represents the local coords in the VS. This may be the same
-        as positionAttribute() or it may not be. It depends upon whether the rendering code
-        specified explicit local coords or not in the GrDrawState. */
-    const GrGLShaderVar& localCoordsAttribute() const { return *fLocalCoordsVar; }
-
-    /**
-     * Are explicit local coordinates provided as input to the vertex shader.
-     */
-    bool hasExplicitLocalCoords() const { return (fLocalCoordsVar != fPositionVar); }
-
-    bool addEffectAttribute(int attributeIndex, GrSLType type, const SkString& name);
-    const SkString* getEffectAttributeName(int attributeIndex) const;
-
-private:
-    virtual void emitCodeBeforeEffects(GrGLSLExpr4* color, GrGLSLExpr4* coverage) SK_OVERRIDE;
-
-    virtual GrGLProgramEffects* createAndEmitEffects(const GrEffectStage* effectStages[],
-                                                     int effectCnt,
-                                                     const GrGLProgramDesc::EffectKeyProvider&,
-                                                     GrGLSLExpr4* inOutFSColor) SK_OVERRIDE;
-
-    virtual void emitCodeAfterEffects() SK_OVERRIDE;
-
-    virtual bool compileAndAttachShaders(GrGLuint programId,
-                                         SkTDArray<GrGLuint>* shaderIds) const SK_OVERRIDE;
-
-    virtual void bindProgramLocations(GrGLuint programId) const SK_OVERRIDE;
-
-    VarArray                            fVSAttrs;
-    VarArray                            fVSOutputs;
-    VarArray                            fGSInputs;
-    VarArray                            fGSOutputs;
-
-    SkString                            fVSCode;
-
-    struct AttributePair {
-        void set(int index, const SkString& name) {
-            fIndex = index; fName = name;
-        }
-        int      fIndex;
-        SkString fName;
-    };
-    SkSTArray<10, AttributePair, true>  fEffectAttributes;
-
-    GrGLShaderVar*                      fPositionVar;
-    GrGLShaderVar*                      fLocalCoordsVar;
-
-    typedef GrGLShaderBuilder INHERITED;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-class GrGLFragmentOnlyShaderBuilder : public GrGLShaderBuilder {
-public:
-    GrGLFragmentOnlyShaderBuilder(GrGpuGL*, GrGLUniformManager*, const GrGLProgramDesc&);
-
-    int addTexCoordSets(int count);
-
-private:
-    virtual void emitCodeBeforeEffects(GrGLSLExpr4* color, GrGLSLExpr4* coverage) SK_OVERRIDE {}
-
-    virtual GrGLProgramEffects* createAndEmitEffects(const GrEffectStage* effectStages[],
-                                                     int effectCnt,
-                                                     const GrGLProgramDesc::EffectKeyProvider&,
-                                                     GrGLSLExpr4* inOutFSColor) SK_OVERRIDE;
-
-    virtual void emitCodeAfterEffects() SK_OVERRIDE {}
-
-    typedef GrGLShaderBuilder INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLStencilAttachment.cpp b/gfx/skia/skia/src/gpu/gl/GrGLStencilAttachment.cpp
new file mode 100644
index 000000000000..15e531be84cb
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/GrGLStencilAttachment.cpp
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+
+#include "GrGLStencilAttachment.h"
+#include "GrGLGpu.h"
+#include "SkTraceMemoryDump.h"
+
+size_t GrGLStencilAttachment::onGpuMemorySize() const {
+    uint64_t size = this->width();
+    size *= this->height();
+    size *= fFormat.fTotalBits;
+    size *= SkTMax(1,this->numSamples());
+    return static_cast<size_t>(size / 8);
+}
+
+void GrGLStencilAttachment::onRelease() {
+    if (0 != fRenderbufferID && this->shouldFreeResources()) {
+        GrGLGpu* gpuGL = (GrGLGpu*) this->getGpu();
+        const GrGLInterface* gl = gpuGL->glInterface();
+        GR_GL_CALL(gl, DeleteRenderbuffers(1, &fRenderbufferID));
+        fRenderbufferID = 0;
+    }
+
+    INHERITED::onRelease();
+}
+
+void GrGLStencilAttachment::onAbandon() {
+    fRenderbufferID = 0;
+
+    INHERITED::onAbandon();
+}
+
+void GrGLStencilAttachment::setMemoryBacking(SkTraceMemoryDump* traceMemoryDump,
+                                             const SkString& dumpName) const {
+    SkString renderbuffer_id;
+    renderbuffer_id.appendU32(this->renderbufferID());
+    traceMemoryDump->setMemoryBacking(dumpName.c_str(), "gl_renderbuffer",
+                                      renderbuffer_id.c_str());
+}
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLStencilBuffer.h b/gfx/skia/skia/src/gpu/gl/GrGLStencilAttachment.h
similarity index 53%
rename from gfx/skia/skia/src/gpu/gl/GrGLStencilBuffer.h
rename to gfx/skia/skia/src/gpu/gl/GrGLStencilAttachment.h
index 1cb0a3301ab8..3b89a5aa2112 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLStencilBuffer.h
+++ b/gfx/skia/skia/src/gpu/gl/GrGLStencilAttachment.h
@@ -6,13 +6,13 @@
  */
 
 
-#ifndef GrGLStencilBuffer_DEFINED
-#define GrGLStencilBuffer_DEFINED
+#ifndef GrGLStencilAttachment_DEFINED
+#define GrGLStencilAttachment_DEFINED
 
 #include "gl/GrGLInterface.h"
-#include "GrStencilBuffer.h"
+#include "GrStencilAttachment.h"
 
-class GrGLStencilBuffer : public GrStencilBuffer {
+class GrGLStencilAttachment : public GrStencilAttachment {
 public:
     static const GrGLenum kUnknownInternalFormat = ~0U;
     static const GrGLuint kUnknownBitCount = ~0U;
@@ -23,21 +23,23 @@ public:
         bool      fPacked;
     };
 
-    GrGLStencilBuffer(GrGpu* gpu,
-                      bool isWrapped,
-                      GrGLint rbid,
+    struct IDDesc {
+        IDDesc() : fRenderbufferID(0), fLifeCycle(kCached_LifeCycle) {}
+        GrGLuint fRenderbufferID;
+        GrGpuResource::LifeCycle fLifeCycle;
+    };
+
+    GrGLStencilAttachment(GrGpu* gpu,
+                      const IDDesc& idDesc,
                       int width, int height,
                       int sampleCnt,
                       const Format& format)
-        : GrStencilBuffer(gpu, isWrapped, width, height, format.fStencilBits, sampleCnt)
+        : GrStencilAttachment(gpu, idDesc.fLifeCycle, width, height, format.fStencilBits, sampleCnt)
         , fFormat(format)
-        , fRenderbufferID(rbid) {
+        , fRenderbufferID(idDesc.fRenderbufferID) {
+        this->registerWithCache();
     }
 
-    virtual ~GrGLStencilBuffer();
-
-    virtual size_t gpuMemorySize() const SK_OVERRIDE;
-
     GrGLuint renderbufferID() const {
         return fRenderbufferID;
     }
@@ -46,17 +48,21 @@ public:
 
 protected:
     // overrides of GrResource
-    virtual void onRelease() SK_OVERRIDE;
-    virtual void onAbandon() SK_OVERRIDE;
+    void onRelease() override;
+    void onAbandon() override;
+    void setMemoryBacking(SkTraceMemoryDump* traceMemoryDump,
+                          const SkString& dumpName) const override;
 
 private:
+    size_t onGpuMemorySize() const override;
+
     Format fFormat;
     // may be zero for external SBs associated with external RTs
     // (we don't require the client to give us the id, just tell
     // us how many bits of stencil there are).
     GrGLuint fRenderbufferID;
 
-    typedef GrStencilBuffer INHERITED;
+    typedef GrStencilAttachment INHERITED;
 };
 
 #endif
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLStencilBuffer.cpp b/gfx/skia/skia/src/gpu/gl/GrGLStencilBuffer.cpp
deleted file mode 100644
index abcb3c4ba01c..000000000000
--- a/gfx/skia/skia/src/gpu/gl/GrGLStencilBuffer.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#include "GrGLStencilBuffer.h"
-#include "GrGpuGL.h"
-
-GrGLStencilBuffer::~GrGLStencilBuffer() {
-    this->release();
-}
-
-size_t GrGLStencilBuffer::gpuMemorySize() const {
-    uint64_t size = this->width();
-    size *= this->height();
-    size *= fFormat.fTotalBits;
-    size *= SkTMax(1,this->numSamples());
-    return static_cast<size_t>(size / 8);
-}
-
-void GrGLStencilBuffer::onRelease() {
-    if (0 != fRenderbufferID && !this->isWrapped()) {
-        GrGpuGL* gpuGL = (GrGpuGL*) this->getGpu();
-        const GrGLInterface* gl = gpuGL->glInterface();
-        GR_GL_CALL(gl, DeleteRenderbuffers(1, &fRenderbufferID));
-        fRenderbufferID = 0;
-    }
-
-    INHERITED::onRelease();
-}
-
-void GrGLStencilBuffer::onAbandon() {
-    fRenderbufferID = 0;
-
-    INHERITED::onAbandon();
-}
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLTexture.cpp b/gfx/skia/skia/src/gpu/gl/GrGLTexture.cpp
index 255cdd963165..39a8d9279fee 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLTexture.cpp
+++ b/gfx/skia/skia/src/gpu/gl/GrGLTexture.cpp
@@ -6,62 +6,62 @@
  */
 
 #include "GrGLTexture.h"
-#include "GrGpuGL.h"
-
-#define GPUGL static_cast<GrGpuGL*>(getGpu())
+#include "GrGLGpu.h"
+#include "SkTraceMemoryDump.h"
 
+#define GPUGL static_cast<GrGLGpu*>(this->getGpu())
 #define GL_CALL(X) GR_GL_CALL(GPUGL->glInterface(), X)
 
-void GrGLTexture::init(GrGpuGL* gpu,
-                       const Desc& textureDesc,
-                       const GrGLRenderTarget::Desc* rtDesc) {
+// Because this class is virtually derived from GrSurface we must explicitly call its constructor.
+GrGLTexture::GrGLTexture(GrGLGpu* gpu, const GrSurfaceDesc& desc, const IDDesc& idDesc)
+    : GrSurface(gpu, idDesc.fLifeCycle, desc)
+    , INHERITED(gpu, idDesc.fLifeCycle, desc) {
+    this->init(desc, idDesc);
+    this->registerWithCache();
+}
 
-    SkASSERT(0 != textureDesc.fTextureID);
+GrGLTexture::GrGLTexture(GrGLGpu* gpu, const GrSurfaceDesc& desc, const IDDesc& idDesc, Derived)
+    : GrSurface(gpu, idDesc.fLifeCycle, desc)
+    , INHERITED(gpu, idDesc.fLifeCycle, desc) {
+    this->init(desc, idDesc);
+}
 
+void GrGLTexture::init(const GrSurfaceDesc& desc, const IDDesc& idDesc) {
+    SkASSERT(0 != idDesc.fInfo.fID);
     fTexParams.invalidate();
     fTexParamsTimestamp = GrGpu::kExpiredTimestamp;
-    fTexIDObj.reset(SkNEW_ARGS(GrGLTexID, (GPUGL->glInterface(),
-                                           textureDesc.fTextureID,
-                                           textureDesc.fIsWrapped)));
-
-    if (NULL != rtDesc) {
-        GrGLIRect vp;
-        vp.fLeft   = 0;
-        vp.fWidth  = textureDesc.fWidth;
-        vp.fBottom = 0;
-        vp.fHeight = textureDesc.fHeight;
-
-        fRenderTarget.reset(SkNEW_ARGS(GrGLRenderTarget, (gpu, *rtDesc, vp, fTexIDObj, this)));
-    }
-}
-
-GrGLTexture::GrGLTexture(GrGpuGL* gpu,
-                         const Desc& textureDesc)
-    : INHERITED(gpu, textureDesc.fIsWrapped, textureDesc) {
-    this->init(gpu, textureDesc, NULL);
-}
-
-GrGLTexture::GrGLTexture(GrGpuGL* gpu,
-                         const Desc& textureDesc,
-                         const GrGLRenderTarget::Desc& rtDesc)
-    : INHERITED(gpu, textureDesc.fIsWrapped, textureDesc) {
-    this->init(gpu, textureDesc, &rtDesc);
+    fInfo = idDesc.fInfo;
+    fTextureIDLifecycle = idDesc.fLifeCycle;
 }
 
 void GrGLTexture::onRelease() {
-    fTexIDObj.reset(NULL);
+    if (fInfo.fID) {
+        if (GrGpuResource::kBorrowed_LifeCycle != fTextureIDLifecycle) {
+            GL_CALL(DeleteTextures(1, &fInfo.fID));
+        }
+        fInfo.fID = 0;
+    }
     INHERITED::onRelease();
 }
 
 void GrGLTexture::onAbandon() {
-    if (NULL != fTexIDObj.get()) {
-        fTexIDObj->abandon();
-        fTexIDObj.reset(NULL);
-    }
-
+    fInfo.fTarget = 0;
+    fInfo.fID = 0;
     INHERITED::onAbandon();
 }
 
 GrBackendObject GrGLTexture::getTextureHandle() const {
+#ifdef SK_IGNORE_GL_TEXTURE_TARGET
     return static_cast<GrBackendObject>(this->textureID());
+#else
+    return reinterpret_cast<GrBackendObject>(&fInfo);
+#endif
+}
+
+void GrGLTexture::setMemoryBacking(SkTraceMemoryDump* traceMemoryDump,
+                                   const SkString& dumpName) const {
+    SkString texture_id;
+    texture_id.appendU32(this->textureID());
+    traceMemoryDump->setMemoryBacking(dumpName.c_str(), "gl_texture",
+                                      texture_id.c_str());
 }
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLTexture.h b/gfx/skia/skia/src/gpu/gl/GrGLTexture.h
index a8800fab55b0..8366a8dab06c 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLTexture.h
+++ b/gfx/skia/skia/src/gpu/gl/GrGLTexture.h
@@ -10,42 +10,12 @@
 #define GrGLTexture_DEFINED
 
 #include "GrGpu.h"
-#include "GrGLRenderTarget.h"
+#include "GrTexture.h"
+#include "GrGLUtil.h"
 
-/**
- * A ref counted tex id that deletes the texture in its destructor.
- */
-class GrGLTexID : public SkRefCnt {
-public:
-    SK_DECLARE_INST_COUNT(GrGLTexID)
+class GrGLGpu;
 
-    GrGLTexID(const GrGLInterface* gl, GrGLuint texID, bool isWrapped)
-        : fGL(gl)
-        , fTexID(texID)
-        , fIsWrapped(isWrapped) {
-    }
-
-    virtual ~GrGLTexID() {
-        if (0 != fTexID && !fIsWrapped) {
-            GR_GL_CALL(fGL, DeleteTextures(1, &fTexID));
-        }
-    }
-
-    void abandon() { fTexID = 0; }
-    GrGLuint id() const { return fTexID; }
-
-private:
-    const GrGLInterface* fGL;
-    GrGLuint             fTexID;
-    bool                 fIsWrapped;
-
-    typedef SkRefCnt INHERITED;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-
-class GrGLTexture : public GrTextureImpl {
+class GrGLTexture : public GrTexture {
 
 public:
     struct TexParams {
@@ -57,25 +27,16 @@ public:
         void invalidate() { memset(this, 0xff, sizeof(TexParams)); }
     };
 
-    struct Desc : public GrTextureDesc {
-        GrGLuint        fTextureID;
-        bool            fIsWrapped;
+    struct IDDesc {
+        GrGLTextureInfo             fInfo;
+        GrGpuResource::LifeCycle    fLifeCycle;
     };
 
-    // creates a texture that is also an RT
-    GrGLTexture(GrGpuGL* gpu,
-                const Desc& textureDesc,
-                const GrGLRenderTarget::Desc& rtDesc);
+    GrGLTexture(GrGLGpu*, const GrSurfaceDesc&, const IDDesc&);
 
-    // creates a non-RT texture
-    GrGLTexture(GrGpuGL* gpu,
-                const Desc& textureDesc);
+    GrBackendObject getTextureHandle() const override;
 
-    virtual ~GrGLTexture() { this->release(); }
-
-    virtual GrBackendObject getTextureHandle() const SK_OVERRIDE;
-
-    virtual void textureParamsModified() SK_OVERRIDE { fTexParams.invalidate(); }
+    void textureParamsModified() override { fTexParams.invalidate(); }
 
     // These functions are used to track the texture parameters associated with the texture.
     const TexParams& getCachedTexParams(GrGpu::ResetTimestamp* timestamp) const {
@@ -89,23 +50,36 @@ public:
         fTexParamsTimestamp = timestamp;
     }
 
-    GrGLuint textureID() const { return (NULL != fTexIDObj.get()) ? fTexIDObj->id() : 0; }
+    GrGLuint textureID() const { return fInfo.fID; }
+
+    GrGLenum target() const { return fInfo.fTarget; }
 
 protected:
-    // overrides of GrTexture
-    virtual void onAbandon() SK_OVERRIDE;
-    virtual void onRelease() SK_OVERRIDE;
+    // The public constructor registers this object with the cache. However, only the most derived
+    // class should register with the cache. This constructor does not do the registration and
+    // rather moves that burden onto the derived class.
+    enum Derived { kDerived };
+    GrGLTexture(GrGLGpu*, const GrSurfaceDesc&, const IDDesc&, Derived);
+
+    void init(const GrSurfaceDesc&, const IDDesc&);
+
+    void onAbandon() override;
+    void onRelease() override;
+    void setMemoryBacking(SkTraceMemoryDump* traceMemoryDump,
+                          const SkString& dumpName) const override;
 
 private:
     TexParams                       fTexParams;
     GrGpu::ResetTimestamp           fTexParamsTimestamp;
-    SkAutoTUnref<GrGLTexID>         fTexIDObj;
+    // Holds the texture target and ID. A pointer to this may be shared to external clients for
+    // direct interaction with the GL object.
+    GrGLTextureInfo                 fInfo;
 
-    void init(GrGpuGL* gpu,
-              const Desc& textureDesc,
-              const GrGLRenderTarget::Desc* rtDesc);
+    // We track this separately from GrGpuResource because this may be both a texture and a render
+    // target, and the texture may be wrapped while the render target is not.
+    LifeCycle                       fTextureIDLifecycle;
 
-    typedef GrTextureImpl INHERITED;
+    typedef GrTexture INHERITED;
 };
 
 #endif
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLTextureRenderTarget.cpp b/gfx/skia/skia/src/gpu/gl/GrGLTextureRenderTarget.cpp
new file mode 100644
index 000000000000..b6068a4e56ef
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/GrGLTextureRenderTarget.cpp
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrGLTextureRenderTarget.h"
+
+#include "SkTraceMemoryDump.h"
+
+// GrGLTextureRenderTarget must dump both of its superclasses.
+void GrGLTextureRenderTarget::dumpMemoryStatistics(
+    SkTraceMemoryDump* traceMemoryDump) const {
+  GrGLRenderTarget::dumpMemoryStatistics(traceMemoryDump);
+
+  // Also dump the GrGLTexture's memory. Due to this resource having both a
+  // texture and a
+  // renderbuffer component, dump as skia/gpu_resources/resource_#/texture
+  SkString dumpName("skia/gpu_resources/resource_");
+  dumpName.appendS32(this->getUniqueID());
+  dumpName.append("/texture");
+
+  // Use the texture's gpuMemorySize, not our own, which includes the
+  // renderbuffer as well.
+  size_t size = GrGLTexture::gpuMemorySize();
+
+  traceMemoryDump->dumpNumericValue(dumpName.c_str(), "size", "bytes", size);
+
+  if (this->isPurgeable()) {
+    traceMemoryDump->dumpNumericValue(dumpName.c_str(), "purgeable_size",
+                                      "bytes", size);
+  }
+
+  SkString texture_id;
+  texture_id.appendU32(this->textureID());
+  traceMemoryDump->setMemoryBacking(dumpName.c_str(), "gl_texture",
+                                    texture_id.c_str());
+}
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLTextureRenderTarget.h b/gfx/skia/skia/src/gpu/gl/GrGLTextureRenderTarget.h
new file mode 100644
index 000000000000..02db8bc08634
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/GrGLTextureRenderTarget.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+
+#ifndef GrGLTextureRenderTarget_DEFINED
+#define GrGLTextureRenderTarget_DEFINED
+
+#include "GrGLGpu.h"
+#include "GrGLTexture.h"
+#include "GrGLRenderTarget.h"
+
+class GrGLGpu;
+
+#ifdef SK_BUILD_FOR_WIN
+// Windows gives bogus warnings about inheriting asTexture/asRenderTarget via dominance.
+#pragma warning(push)
+#pragma warning(disable: 4250)
+#endif
+
+class GrGLTextureRenderTarget : public GrGLTexture, public GrGLRenderTarget {
+public:
+    // We're virtually derived from GrSurface (via both GrGLTexture and GrGLRenderTarget) so its
+    // constructor must be explicitly called.
+    GrGLTextureRenderTarget(GrGLGpu* gpu,
+                            const GrSurfaceDesc& desc,
+                            const GrGLTexture::IDDesc& texIDDesc,
+                            const GrGLRenderTarget::IDDesc& rtIDDesc)
+        : GrSurface(gpu, texIDDesc.fLifeCycle, desc)
+        , GrGLTexture(gpu, desc, texIDDesc, GrGLTexture::kDerived)
+        , GrGLRenderTarget(gpu, desc, rtIDDesc, GrGLRenderTarget::kDerived) {
+        this->registerWithCache();
+    }
+
+    void dumpMemoryStatistics(SkTraceMemoryDump* traceMemoryDump) const override;
+
+protected:
+    void onAbandon() override {
+        GrGLRenderTarget::onAbandon();
+        GrGLTexture::onAbandon();
+    }
+
+    void onRelease() override {
+        GrGLRenderTarget::onRelease();
+        GrGLTexture::onRelease();
+    }
+
+private:
+    // GrGLRenderTarget accounts for the texture's memory and any MSAA renderbuffer's memory.
+    size_t onGpuMemorySize() const override {
+        return GrGLRenderTarget::onGpuMemorySize();
+    }
+
+};
+
+#ifdef SK_BUILD_FOR_WIN
+#pragma warning(pop)
+#endif
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLUniformHandle.h b/gfx/skia/skia/src/gpu/gl/GrGLUniformHandle.h
deleted file mode 100644
index 797afff4e082..000000000000
--- a/gfx/skia/skia/src/gpu/gl/GrGLUniformHandle.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrUniformHandle_DEFINED
-#define GrUniformHandle_DEFINED
-
-inline GrGLUniformManager::UniformHandle GrGLUniformManager::UniformHandle::CreateFromUniformIndex(int index) {
-    return GrGLUniformManager::UniformHandle(index);
-}
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLUniformManager.cpp b/gfx/skia/skia/src/gpu/gl/GrGLUniformManager.cpp
deleted file mode 100644
index 29679aa409a4..000000000000
--- a/gfx/skia/skia/src/gpu/gl/GrGLUniformManager.cpp
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "gl/GrGLShaderBuilder.h"
-#include "gl/GrGLProgram.h"
-#include "gl/GrGLUniformHandle.h"
-#include "gl/GrGpuGL.h"
-#include "SkMatrix.h"
-
-#define ASSERT_ARRAY_UPLOAD_IN_BOUNDS(UNI, COUNT) \
-         SkASSERT(arrayCount <= uni.fArrayCount || \
-                  (1 == arrayCount && GrGLShaderVar::kNonArray == uni.fArrayCount))
-
-GrGLUniformManager::GrGLUniformManager(GrGpuGL* gpu) : fGpu(gpu) {
-    // skbug.com/2056
-    fUsingBindUniform = fGpu->glInterface()->fFunctions.fBindUniformLocation != NULL;
-}
-
-GrGLUniformManager::UniformHandle GrGLUniformManager::appendUniform(GrSLType type, int arrayCount) {
-    int idx = fUniforms.count();
-    Uniform& uni = fUniforms.push_back();
-    SkASSERT(GrGLShaderVar::kNonArray == arrayCount || arrayCount > 0);
-    uni.fArrayCount = arrayCount;
-    uni.fType = type;
-    uni.fVSLocation = kUnusedUniform;
-    uni.fFSLocation = kUnusedUniform;
-    return GrGLUniformManager::UniformHandle::CreateFromUniformIndex(idx);
-}
-
-void GrGLUniformManager::setSampler(UniformHandle u, GrGLint texUnit) const {
-    const Uniform& uni = fUniforms[u.toUniformIndex()];
-    SkASSERT(uni.fType == kSampler2D_GrSLType);
-    SkASSERT(GrGLShaderVar::kNonArray == uni.fArrayCount);
-    // FIXME: We still insert a single sampler uniform for every stage. If the shader does not
-    // reference the sampler then the compiler may have optimized it out. Uncomment this assert
-    // once stages insert their own samplers.
-    // SkASSERT(kUnusedUniform != uni.fFSLocation || kUnusedUniform != uni.fVSLocation);
-    if (kUnusedUniform != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(), Uniform1i(uni.fFSLocation, texUnit));
-    }
-    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(), Uniform1i(uni.fVSLocation, texUnit));
-    }
-}
-
-void GrGLUniformManager::set1f(UniformHandle u, GrGLfloat v0) const {
-    const Uniform& uni = fUniforms[u.toUniformIndex()];
-    SkASSERT(uni.fType == kFloat_GrSLType);
-    SkASSERT(GrGLShaderVar::kNonArray == uni.fArrayCount);
-    SkASSERT(kUnusedUniform != uni.fFSLocation || kUnusedUniform != uni.fVSLocation);
-    if (kUnusedUniform != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(), Uniform1f(uni.fFSLocation, v0));
-    }
-    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(), Uniform1f(uni.fVSLocation, v0));
-    }
-}
-
-void GrGLUniformManager::set1fv(UniformHandle u,
-                                int arrayCount,
-                                const GrGLfloat v[]) const {
-    const Uniform& uni = fUniforms[u.toUniformIndex()];
-    SkASSERT(uni.fType == kFloat_GrSLType);
-    SkASSERT(arrayCount > 0);
-    ASSERT_ARRAY_UPLOAD_IN_BOUNDS(uni, arrayCount);
-    // This assert fires in some instances of the two-pt gradient for its VSParams.
-    // Once the uniform manager is responsible for inserting the duplicate uniform
-    // arrays in VS and FS driver bug workaround, this can be enabled.
-    //SkASSERT(kUnusedUniform != uni.fFSLocation || kUnusedUniform != uni.fVSLocation);
-    if (kUnusedUniform != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(), Uniform1fv(uni.fFSLocation, arrayCount, v));
-    }
-    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(), Uniform1fv(uni.fVSLocation, arrayCount, v));
-    }
-}
-
-void GrGLUniformManager::set2f(UniformHandle u, GrGLfloat v0, GrGLfloat v1) const {
-    const Uniform& uni = fUniforms[u.toUniformIndex()];
-    SkASSERT(uni.fType == kVec2f_GrSLType);
-    SkASSERT(GrGLShaderVar::kNonArray == uni.fArrayCount);
-    SkASSERT(kUnusedUniform != uni.fFSLocation || kUnusedUniform != uni.fVSLocation);
-    if (kUnusedUniform != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(), Uniform2f(uni.fFSLocation, v0, v1));
-    }
-    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(), Uniform2f(uni.fVSLocation, v0, v1));
-    }
-}
-
-void GrGLUniformManager::set2fv(UniformHandle u,
-                                int arrayCount,
-                                const GrGLfloat v[]) const {
-    const Uniform& uni = fUniforms[u.toUniformIndex()];
-    SkASSERT(uni.fType == kVec2f_GrSLType);
-    SkASSERT(arrayCount > 0);
-    ASSERT_ARRAY_UPLOAD_IN_BOUNDS(uni, arrayCount);
-    SkASSERT(kUnusedUniform != uni.fFSLocation || kUnusedUniform != uni.fVSLocation);
-    if (kUnusedUniform != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(), Uniform2fv(uni.fFSLocation, arrayCount, v));
-    }
-    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(), Uniform2fv(uni.fVSLocation, arrayCount, v));
-    }
-}
-
-void GrGLUniformManager::set3f(UniformHandle u, GrGLfloat v0, GrGLfloat v1, GrGLfloat v2) const {
-    const Uniform& uni = fUniforms[u.toUniformIndex()];
-    SkASSERT(uni.fType == kVec3f_GrSLType);
-    SkASSERT(GrGLShaderVar::kNonArray == uni.fArrayCount);
-    SkASSERT(kUnusedUniform != uni.fFSLocation || kUnusedUniform != uni.fVSLocation);
-    if (kUnusedUniform != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(), Uniform3f(uni.fFSLocation, v0, v1, v2));
-    }
-    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(), Uniform3f(uni.fVSLocation, v0, v1, v2));
-    }
-}
-
-void GrGLUniformManager::set3fv(UniformHandle u,
-                                int arrayCount,
-                                const GrGLfloat v[]) const {
-    const Uniform& uni = fUniforms[u.toUniformIndex()];
-    SkASSERT(uni.fType == kVec3f_GrSLType);
-    SkASSERT(arrayCount > 0);
-    ASSERT_ARRAY_UPLOAD_IN_BOUNDS(uni, arrayCount);
-    SkASSERT(kUnusedUniform != uni.fFSLocation || kUnusedUniform != uni.fVSLocation);
-    if (kUnusedUniform != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(), Uniform3fv(uni.fFSLocation, arrayCount, v));
-    }
-    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(), Uniform3fv(uni.fVSLocation, arrayCount, v));
-    }
-}
-
-void GrGLUniformManager::set4f(UniformHandle u,
-                               GrGLfloat v0,
-                               GrGLfloat v1,
-                               GrGLfloat v2,
-                               GrGLfloat v3) const {
-    const Uniform& uni = fUniforms[u.toUniformIndex()];
-    SkASSERT(uni.fType == kVec4f_GrSLType);
-    SkASSERT(GrGLShaderVar::kNonArray == uni.fArrayCount);
-    SkASSERT(kUnusedUniform != uni.fFSLocation || kUnusedUniform != uni.fVSLocation);
-    if (kUnusedUniform != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(), Uniform4f(uni.fFSLocation, v0, v1, v2, v3));
-    }
-    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(), Uniform4f(uni.fVSLocation, v0, v1, v2, v3));
-    }
-}
-
-void GrGLUniformManager::set4fv(UniformHandle u,
-                                int arrayCount,
-                                const GrGLfloat v[]) const {
-    const Uniform& uni = fUniforms[u.toUniformIndex()];
-    SkASSERT(uni.fType == kVec4f_GrSLType);
-    SkASSERT(arrayCount > 0);
-    ASSERT_ARRAY_UPLOAD_IN_BOUNDS(uni, arrayCount);
-    SkASSERT(kUnusedUniform != uni.fFSLocation || kUnusedUniform != uni.fVSLocation);
-    if (kUnusedUniform != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(), Uniform4fv(uni.fFSLocation, arrayCount, v));
-    }
-    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(), Uniform4fv(uni.fVSLocation, arrayCount, v));
-    }
-}
-
-void GrGLUniformManager::setMatrix3f(UniformHandle u, const GrGLfloat matrix[]) const {
-    const Uniform& uni = fUniforms[u.toUniformIndex()];
-    SkASSERT(uni.fType == kMat33f_GrSLType);
-    SkASSERT(GrGLShaderVar::kNonArray == uni.fArrayCount);
-    // TODO: Re-enable this assert once texture matrices aren't forced on all effects
-    // SkASSERT(kUnusedUniform != uni.fFSLocation || kUnusedUniform != uni.fVSLocation);
-    if (kUnusedUniform != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(), UniformMatrix3fv(uni.fFSLocation, 1, false, matrix));
-    }
-    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(), UniformMatrix3fv(uni.fVSLocation, 1, false, matrix));
-    }
-}
-
-void GrGLUniformManager::setMatrix4f(UniformHandle u, const GrGLfloat matrix[]) const {
-    const Uniform& uni = fUniforms[u.toUniformIndex()];
-    SkASSERT(uni.fType == kMat44f_GrSLType);
-    SkASSERT(GrGLShaderVar::kNonArray == uni.fArrayCount);
-    SkASSERT(kUnusedUniform != uni.fFSLocation || kUnusedUniform != uni.fVSLocation);
-    if (kUnusedUniform != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(), UniformMatrix4fv(uni.fFSLocation, 1, false, matrix));
-    }
-    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(), UniformMatrix4fv(uni.fVSLocation, 1, false, matrix));
-    }
-}
-
-void GrGLUniformManager::setMatrix3fv(UniformHandle u,
-                                      int arrayCount,
-                                      const GrGLfloat matrices[]) const {
-    const Uniform& uni = fUniforms[u.toUniformIndex()];
-    SkASSERT(uni.fType == kMat33f_GrSLType);
-    SkASSERT(arrayCount > 0);
-    ASSERT_ARRAY_UPLOAD_IN_BOUNDS(uni, arrayCount);
-    SkASSERT(kUnusedUniform != uni.fFSLocation || kUnusedUniform != uni.fVSLocation);
-    if (kUnusedUniform != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(),
-                   UniformMatrix3fv(uni.fFSLocation, arrayCount, false, matrices));
-    }
-    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(),
-                   UniformMatrix3fv(uni.fVSLocation, arrayCount, false, matrices));
-    }
-}
-
-void GrGLUniformManager::setMatrix4fv(UniformHandle u,
-                                      int arrayCount,
-                                      const GrGLfloat matrices[]) const {
-    const Uniform& uni = fUniforms[u.toUniformIndex()];
-    SkASSERT(uni.fType == kMat44f_GrSLType);
-    SkASSERT(arrayCount > 0);
-    ASSERT_ARRAY_UPLOAD_IN_BOUNDS(uni, arrayCount);
-    SkASSERT(kUnusedUniform != uni.fFSLocation || kUnusedUniform != uni.fVSLocation);
-    if (kUnusedUniform != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(),
-                   UniformMatrix4fv(uni.fFSLocation, arrayCount, false, matrices));
-    }
-    if (kUnusedUniform != uni.fVSLocation && uni.fVSLocation != uni.fFSLocation) {
-        GR_GL_CALL(fGpu->glInterface(),
-                   UniformMatrix4fv(uni.fVSLocation, arrayCount, false, matrices));
-    }
-}
-
-void GrGLUniformManager::setSkMatrix(UniformHandle u, const SkMatrix& matrix) const {
-    GrGLfloat mt[] = {
-        matrix.get(SkMatrix::kMScaleX),
-        matrix.get(SkMatrix::kMSkewY),
-        matrix.get(SkMatrix::kMPersp0),
-        matrix.get(SkMatrix::kMSkewX),
-        matrix.get(SkMatrix::kMScaleY),
-        matrix.get(SkMatrix::kMPersp1),
-        matrix.get(SkMatrix::kMTransX),
-        matrix.get(SkMatrix::kMTransY),
-        matrix.get(SkMatrix::kMPersp2),
-    };
-    this->setMatrix3f(u, mt);
-}
-
-
-void GrGLUniformManager::getUniformLocations(GrGLuint programID, const BuilderUniformArray& uniforms) {
-    SkASSERT(uniforms.count() == fUniforms.count());
-    int count = fUniforms.count();
-    for (int i = 0; i < count; ++i) {
-        SkASSERT(uniforms[i].fVariable.getType() == fUniforms[i].fType);
-        SkASSERT(uniforms[i].fVariable.getArrayCount() == fUniforms[i].fArrayCount);
-        GrGLint location;
-        // TODO: Move the Xoom uniform array in both FS and VS bug workaround here.
-        if (fUsingBindUniform) {
-            location = i;
-            GR_GL_CALL(fGpu->glInterface(),
-                       BindUniformLocation(programID, location, uniforms[i].fVariable.c_str()));
-        } else {
-            GR_GL_CALL_RET(fGpu->glInterface(), location,
-                       GetUniformLocation(programID, uniforms[i].fVariable.c_str()));
-        }
-        if (GrGLShaderBuilder::kVertex_Visibility & uniforms[i].fVisibility) {
-            fUniforms[i].fVSLocation = location;
-        }
-        if (GrGLShaderBuilder::kFragment_Visibility & uniforms[i].fVisibility) {
-            fUniforms[i].fFSLocation = location;
-        }
-    }
-}
-
-const GrGLUniformManager::BuilderUniform&
-GrGLUniformManager::getBuilderUniform(const BuilderUniformArray& array, UniformHandle handle) const {
-    return array[handle.toUniformIndex()];
-}
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLUniformManager.h b/gfx/skia/skia/src/gpu/gl/GrGLUniformManager.h
deleted file mode 100644
index 6137bcd9cc88..000000000000
--- a/gfx/skia/skia/src/gpu/gl/GrGLUniformManager.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrGLUniformManager_DEFINED
-#define GrGLUniformManager_DEFINED
-
-#include "gl/GrGLShaderVar.h"
-#include "gl/GrGLSL.h"
-#include "GrAllocator.h"
-
-#include "SkTArray.h"
-
-class GrGpuGL;
-class SkMatrix;
-
-/** Manages a program's uniforms.
-*/
-class GrGLUniformManager : public SkRefCnt {
-public:
-    // Opaque handle to a uniform
-    class UniformHandle {
-    public:
-        static UniformHandle CreateFromUniformIndex(int i);
-
-        bool isValid() const { return 0 != fValue; }
-
-        bool operator==(const UniformHandle& other) const { return other.fValue == fValue; }
-
-        UniformHandle()
-            : fValue(0) {
-        }
-
-    private:
-        UniformHandle(int value)
-            : fValue(~value) {
-            SkASSERT(isValid());
-        }
-
-        int toUniformIndex() const { SkASSERT(isValid()); return ~fValue; }
-
-        int fValue;
-        friend class GrGLUniformManager; // For accessing toUniformIndex().
-    };
-
-    GrGLUniformManager(GrGpuGL* gpu);
-
-    UniformHandle appendUniform(GrSLType type, int arrayCount = GrGLShaderVar::kNonArray);
-
-    /** Functions for uploading uniform values. The varities ending in v can be used to upload to an
-     *  array of uniforms. arrayCount must be <= the array count of the uniform.
-     */
-    void setSampler(UniformHandle, GrGLint texUnit) const;
-    void set1f(UniformHandle, GrGLfloat v0) const;
-    void set1fv(UniformHandle, int arrayCount, const GrGLfloat v[]) const;
-    void set2f(UniformHandle, GrGLfloat, GrGLfloat) const;
-    void set2fv(UniformHandle, int arrayCount, const GrGLfloat v[]) const;
-    void set3f(UniformHandle, GrGLfloat, GrGLfloat, GrGLfloat) const;
-    void set3fv(UniformHandle, int arrayCount, const GrGLfloat v[]) const;
-    void set4f(UniformHandle, GrGLfloat, GrGLfloat, GrGLfloat, GrGLfloat) const;
-    void set4fv(UniformHandle, int arrayCount, const GrGLfloat v[]) const;
-    // matrices are column-major, the first three upload a single matrix, the latter three upload
-    // arrayCount matrices into a uniform array.
-    void setMatrix3f(UniformHandle, const GrGLfloat matrix[]) const;
-    void setMatrix4f(UniformHandle, const GrGLfloat matrix[]) const;
-    void setMatrix3fv(UniformHandle, int arrayCount, const GrGLfloat matrices[]) const;
-    void setMatrix4fv(UniformHandle, int arrayCount, const GrGLfloat matrices[]) const;
-
-    // convenience method for uploading a SkMatrix to a 3x3 matrix uniform
-    void setSkMatrix(UniformHandle, const SkMatrix&) const;
-
-    struct BuilderUniform {
-        GrGLShaderVar fVariable;
-        uint32_t      fVisibility;
-    };
-    // This uses an allocator rather than array so that the GrGLShaderVars don't move in memory
-    // after they are inserted. Users of GrGLShaderBuilder get refs to the vars and ptrs to their
-    // name strings. Otherwise, we'd have to hand out copies.
-    typedef GrTAllocator<BuilderUniform> BuilderUniformArray;
-
-    /**
-     * Called by the GrGLShaderBuilder to know if the manager is using
-     * BindUniformLocation. In that case getUniformLocations must be called
-     * before the program is linked.
-     */
-    bool isUsingBindUniform() const { return fUsingBindUniform; }
-
-    /**
-     * Called by the GrGLShaderBuilder to get GL locations for all uniforms.
-     */
-    void getUniformLocations(GrGLuint programID, const BuilderUniformArray& uniforms);
-
-    /**
-     * Called by the GrGLShaderBuilder to access the array by the handle (index).
-     */
-    const BuilderUniform& getBuilderUniform(const BuilderUniformArray&, GrGLUniformManager::UniformHandle) const;
-
-private:
-    enum {
-        kUnusedUniform = -1,
-    };
-
-    struct Uniform {
-        GrGLint     fVSLocation;
-        GrGLint     fFSLocation;
-        GrSLType    fType;
-        int         fArrayCount;
-    };
-
-    bool fUsingBindUniform;
-    SkTArray<Uniform, true> fUniforms;
-    GrGpuGL* fGpu;
-
-    typedef SkRefCnt INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLUtil.cpp b/gfx/skia/skia/src/gpu/gl/GrGLUtil.cpp
index 6a2eb6e17ee0..71d54c35c060 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLUtil.cpp
+++ b/gfx/skia/skia/src/gpu/gl/GrGLUtil.cpp
@@ -39,52 +39,17 @@ void GrGLCheckErr(const GrGLInterface* gl,
                   const char* call) {
     uint32_t err = GR_GL_GET_ERROR(gl);
     if (GR_GL_NO_ERROR != err) {
-        GrPrintf("---- glGetError 0x%x(%s)", err, get_error_string(err));
-        if (NULL != location) {
-            GrPrintf(" at\n\t%s", location);
+        SkDebugf("---- glGetError 0x%x(%s)", err, get_error_string(err));
+        if (location) {
+            SkDebugf(" at\n\t%s", location);
         }
-        if (NULL != call) {
-            GrPrintf("\n\t\t%s", call);
+        if (call) {
+            SkDebugf("\n\t\t%s", call);
         }
-        GrPrintf("\n");
+        SkDebugf("\n");
     }
 }
 
-namespace {
-// Mesa uses a non-standard version string of format: 1.4 Mesa <mesa_major>.<mesa_minor>.
-// The mapping of from mesa version to GL version came from here: http://www.mesa3d.org/intro.html
-bool get_gl_version_for_mesa(int mesaMajorVersion, int* major, int* minor) {
-    switch (mesaMajorVersion) {
-        case 2:
-        case 3:
-        case 4:
-        case 5:
-        case 6:
-            *major = 1;
-            *minor = mesaMajorVersion - 1;
-            return true;
-        case 7:
-            *major = 2;
-            *minor = 1;
-            return true;
-        case 8:
-            *major = 3;
-            *minor = 0;
-            return true;
-        case 9:
-            *major = 3;
-            *minor = 1;
-            return true;
-        case 10:
-            *major = 3;
-            *minor = 3;
-            return true;
-        default:
-            return false;
-    }
-}
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
 #if GR_GL_LOG_CALLS
@@ -98,8 +63,8 @@ bool get_gl_version_for_mesa(int mesaMajorVersion, int* major, int* minor) {
 ///////////////////////////////////////////////////////////////////////////////
 
 GrGLStandard GrGLGetStandardInUseFromString(const char* versionString) {
-    if (NULL == versionString) {
-        SkDebugf("NULL GL version string.");
+    if (nullptr == versionString) {
+        SkDebugf("nullptr GL version string.");
         return kNone_GrGLStandard;
     }
 
@@ -127,19 +92,81 @@ GrGLStandard GrGLGetStandardInUseFromString(const char* versionString) {
     return kNone_GrGLStandard;
 }
 
-bool GrGLIsMesaFromVersionString(const char* versionString) {
-    int major, minor, mesaMajor, mesaMinor;
-    int n = sscanf(versionString, "%d.%d Mesa %d.%d", &major, &minor, &mesaMajor, &mesaMinor);
-    return 4 == n;
-}
+void GrGLGetDriverInfo(GrGLStandard standard,
+                       GrGLVendor vendor,
+                       const char* rendererString,
+                       const char* versionString,
+                       GrGLDriver* outDriver,
+                       GrGLDriverVersion* outVersion) {
+    int major, minor, rev, driverMajor, driverMinor;
 
-bool GrGLIsChromiumFromRendererString(const char* rendererString) {
-    return 0 == strcmp(rendererString, "Chromium");
+    *outDriver = kUnknown_GrGLDriver;
+    *outVersion = GR_GL_DRIVER_UNKNOWN_VER;
+
+    if (0 == strcmp(rendererString, "Chromium")) {
+        *outDriver = kChromium_GrGLDriver;
+        return;
+    }
+
+    if (standard == kGL_GrGLStandard) {
+        if (kNVIDIA_GrGLVendor == vendor) {
+            *outDriver = kNVIDIA_GrGLDriver;
+            int n = sscanf(versionString, "%d.%d.%d NVIDIA %d.%d",
+                           &major, &minor, &rev, &driverMajor, &driverMinor);
+            // Some older NVIDIA drivers don't report the driver version.
+            if (5 == n) {
+                *outVersion = GR_GL_DRIVER_VER(driverMajor, driverMinor);
+            }
+            return;
+        }
+
+        int n = sscanf(versionString, "%d.%d Mesa %d.%d",
+                       &major, &minor, &driverMajor, &driverMinor);
+        if (4 == n) {
+            *outDriver = kMesa_GrGLDriver;
+            *outVersion = GR_GL_DRIVER_VER(driverMajor, driverMinor);
+            return;
+        }
+    }
+    else {
+        if (kNVIDIA_GrGLVendor == vendor) {
+            *outDriver = kNVIDIA_GrGLDriver;
+            int n = sscanf(versionString, "OpenGL ES %d.%d NVIDIA %d.%d",
+                           &major, &minor, &driverMajor, &driverMinor);
+            // Some older NVIDIA drivers don't report the driver version.
+            if (4 == n) {
+                *outVersion = GR_GL_DRIVER_VER(driverMajor, driverMinor);
+            }
+            return;
+        }
+
+        int n = sscanf(versionString, "OpenGL ES %d.%d Mesa %d.%d",
+                       &major, &minor, &driverMajor, &driverMinor);
+        if (4 == n) {
+            *outDriver = kMesa_GrGLDriver;
+            *outVersion = GR_GL_DRIVER_VER(driverMajor, driverMinor);
+            return;
+        }
+        if (0 == strncmp("ANGLE", rendererString, 5)) {
+            *outDriver = kANGLE_GrGLDriver;
+            n = sscanf(versionString, "OpenGL ES %d.%d (ANGLE %d.%d", &major, &minor, &driverMajor,
+                                                                      &driverMinor);
+            if (4 == n) {
+                *outVersion = GR_GL_DRIVER_VER(driverMajor, driverMinor);
+            }
+            return;
+        }
+    }
+
+    if (kIntel_GrGLVendor == vendor) {
+        // We presume we're on the Intel driver since it hasn't identified itself as Mesa.
+        *outDriver = kIntel_GrGLDriver;
+    }
 }
 
 GrGLVersion GrGLGetVersionFromString(const char* versionString) {
-    if (NULL == versionString) {
-        SkDebugf("NULL GL version string.");
+    if (nullptr == versionString) {
+        SkDebugf("nullptr GL version string.");
         return GR_GL_INVALID_VER;
     }
 
@@ -149,11 +176,7 @@ GrGLVersion GrGLGetVersionFromString(const char* versionString) {
     int mesaMajor, mesaMinor;
     int n = sscanf(versionString, "%d.%d Mesa %d.%d", &major, &minor, &mesaMajor, &mesaMinor);
     if (4 == n) {
-        if (get_gl_version_for_mesa(mesaMajor, &major, &minor)) {
-            return GR_GL_VER(major, minor);
-        } else {
-            return GR_GL_INVALID_VER;
-        }
+        return GR_GL_VER(major, minor);
     }
 
     n = sscanf(versionString, "%d.%d", &major, &minor);
@@ -177,8 +200,8 @@ GrGLVersion GrGLGetVersionFromString(const char* versionString) {
 }
 
 GrGLSLVersion GrGLGetGLSLVersionFromString(const char* versionString) {
-    if (NULL == versionString) {
-        SkDebugf("NULL GLSL version string.");
+    if (nullptr == versionString) {
+        SkDebugf("nullptr GLSL version string.");
         return GR_GLSL_INVALID_VER;
     }
 
@@ -206,7 +229,7 @@ GrGLSLVersion GrGLGetGLSLVersionFromString(const char* versionString) {
 }
 
 GrGLVendor GrGLGetVendorFromString(const char* vendorString) {
-    if (NULL != vendorString) {
+    if (vendorString) {
         if (0 == strcmp(vendorString, "ARM")) {
             return kARM_GrGLVendor;
         }
@@ -220,19 +243,41 @@ GrGLVendor GrGLGetVendorFromString(const char* vendorString) {
             return kQualcomm_GrGLVendor;
         }
         if (0 == strcmp(vendorString, "NVIDIA Corporation")) {
-                return kNVIDIA_GrGLVendor;
+            return kNVIDIA_GrGLVendor;
         }
     }
     return kOther_GrGLVendor;
 }
 
 GrGLRenderer GrGLGetRendererFromString(const char* rendererString) {
-    if (NULL != rendererString) {
+    if (rendererString) {
         if (0 == strcmp(rendererString, "NVIDIA Tegra 3")) {
             return kTegra3_GrGLRenderer;
         } else if (0 == strcmp(rendererString, "NVIDIA Tegra")) {
             return kTegra2_GrGLRenderer;
         }
+        int lastDigit;
+        int n = sscanf(rendererString, "PowerVR SGX 54%d", &lastDigit);
+        if (1 == n && lastDigit >= 0 && lastDigit <= 9) {
+            return kPowerVR54x_GrGLRenderer;
+        }
+        static const char kPowerVRRogueStr[] = "PowerVR Rogue";
+        if (0 == strncmp(rendererString, kPowerVRRogueStr,
+                         SK_ARRAY_COUNT(kPowerVRRogueStr)-1)) {
+            return kPowerVRRogue_GrGLRenderer;
+        }
+        int adrenoNumber;
+        n = sscanf(rendererString, "Adreno (TM) %d", &adrenoNumber);
+        if (1 == n) {
+            if (adrenoNumber >= 300) {
+                if (adrenoNumber < 400) {
+                    return kAdreno3xx_GrGLRenderer;
+                }
+                if (adrenoNumber < 500) {
+                    return kAdreno4xx_GrGLRenderer;
+                }
+            }
+        }
     }
     return kOther_GrGLRenderer;
 }
@@ -261,45 +306,27 @@ GrGLRenderer GrGLGetRenderer(const GrGLInterface* gl) {
     return GrGLGetRendererFromString((const char*) v);
 }
 
-template<> void GrGLGetMatrix<3>(GrGLfloat* dest, const SkMatrix& src) {
-    // Col 0
-    dest[0] = SkScalarToFloat(src[SkMatrix::kMScaleX]);
-    dest[1] = SkScalarToFloat(src[SkMatrix::kMSkewY]);
-    dest[2] = SkScalarToFloat(src[SkMatrix::kMPersp0]);
+GrGLenum GrToGLStencilFunc(GrStencilFunc basicFunc) {
+    static const GrGLenum gTable[] = {
+        GR_GL_ALWAYS,           // kAlways_StencilFunc
+        GR_GL_NEVER,            // kNever_StencilFunc
+        GR_GL_GREATER,          // kGreater_StencilFunc
+        GR_GL_GEQUAL,           // kGEqual_StencilFunc
+        GR_GL_LESS,             // kLess_StencilFunc
+        GR_GL_LEQUAL,           // kLEqual_StencilFunc,
+        GR_GL_EQUAL,            // kEqual_StencilFunc,
+        GR_GL_NOTEQUAL,         // kNotEqual_StencilFunc,
+    };
+    GR_STATIC_ASSERT(SK_ARRAY_COUNT(gTable) == kBasicStencilFuncCount);
+    GR_STATIC_ASSERT(0 == kAlways_StencilFunc);
+    GR_STATIC_ASSERT(1 == kNever_StencilFunc);
+    GR_STATIC_ASSERT(2 == kGreater_StencilFunc);
+    GR_STATIC_ASSERT(3 == kGEqual_StencilFunc);
+    GR_STATIC_ASSERT(4 == kLess_StencilFunc);
+    GR_STATIC_ASSERT(5 == kLEqual_StencilFunc);
+    GR_STATIC_ASSERT(6 == kEqual_StencilFunc);
+    GR_STATIC_ASSERT(7 == kNotEqual_StencilFunc);
+    SkASSERT((unsigned) basicFunc < kBasicStencilFuncCount);
 
-    // Col 1
-    dest[3] = SkScalarToFloat(src[SkMatrix::kMSkewX]);
-    dest[4] = SkScalarToFloat(src[SkMatrix::kMScaleY]);
-    dest[5] = SkScalarToFloat(src[SkMatrix::kMPersp1]);
-
-    // Col 2
-    dest[6] = SkScalarToFloat(src[SkMatrix::kMTransX]);
-    dest[7] = SkScalarToFloat(src[SkMatrix::kMTransY]);
-    dest[8] = SkScalarToFloat(src[SkMatrix::kMPersp2]);
-}
-
-template<> void GrGLGetMatrix<4>(GrGLfloat* dest, const SkMatrix& src) {
-    // Col 0
-    dest[0]  = SkScalarToFloat(src[SkMatrix::kMScaleX]);
-    dest[1]  = SkScalarToFloat(src[SkMatrix::kMSkewY]);
-    dest[2]  = 0;
-    dest[3]  = SkScalarToFloat(src[SkMatrix::kMPersp0]);
-
-    // Col 1
-    dest[4]  = SkScalarToFloat(src[SkMatrix::kMSkewX]);
-    dest[5]  = SkScalarToFloat(src[SkMatrix::kMScaleY]);
-    dest[6]  = 0;
-    dest[7]  = SkScalarToFloat(src[SkMatrix::kMPersp1]);
-
-    // Col 2
-    dest[8]  = 0;
-    dest[9]  = 0;
-    dest[10] = 1;
-    dest[11] = 0;
-
-    // Col 3
-    dest[12] = SkScalarToFloat(src[SkMatrix::kMTransX]);
-    dest[13] = SkScalarToFloat(src[SkMatrix::kMTransY]);
-    dest[14] = 0;
-    dest[15] = SkScalarToFloat(src[SkMatrix::kMPersp2]);
+    return gTable[basicFunc];
 }
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLUtil.h b/gfx/skia/skia/src/gpu/gl/GrGLUtil.h
index 89d807613946..70af3a36f414 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLUtil.h
+++ b/gfx/skia/skia/src/gpu/gl/GrGLUtil.h
@@ -10,6 +10,7 @@
 
 #include "gl/GrGLInterface.h"
 #include "GrGLDefines.h"
+#include "GrStencil.h"
 
 class SkMatrix;
 
@@ -17,14 +18,18 @@ class SkMatrix;
 
 typedef uint32_t GrGLVersion;
 typedef uint32_t GrGLSLVersion;
+typedef uint32_t GrGLDriverVersion;
 
 #define GR_GL_VER(major, minor) ((static_cast<int>(major) << 16) | \
                                  static_cast<int>(minor))
 #define GR_GLSL_VER(major, minor) ((static_cast<int>(major) << 16) | \
                                    static_cast<int>(minor))
+#define GR_GL_DRIVER_VER(major, minor) ((static_cast<int>(major) << 16) | \
+                                        static_cast<int>(minor))
 
 #define GR_GL_INVALID_VER GR_GL_VER(0, 0)
-#define GR_GLSL_INVALID_VER GR_GL_VER(0, 0)
+#define GR_GLSL_INVALID_VER GR_GLSL_VER(0, 0)
+#define GR_GL_DRIVER_UNKNOWN_VER GR_GL_DRIVER_VER(0, 0)
 
 /**
  * The Vendor and Renderer enum values are lazily updated as required.
@@ -42,10 +47,22 @@ enum GrGLVendor {
 enum GrGLRenderer {
     kTegra2_GrGLRenderer,
     kTegra3_GrGLRenderer,
-
+    kPowerVR54x_GrGLRenderer,
+    kPowerVRRogue_GrGLRenderer,
+    kAdreno3xx_GrGLRenderer,
+    kAdreno4xx_GrGLRenderer,
     kOther_GrGLRenderer
 };
 
+enum GrGLDriver {
+    kMesa_GrGLDriver,
+    kChromium_GrGLDriver,
+    kNVIDIA_GrGLDriver,
+    kIntel_GrGLDriver,
+    kANGLE_GrGLDriver,
+    kUnknown_GrGLDriver
+};
+
 ////////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -69,12 +86,21 @@ enum GrGLRenderer {
         *(p) = GR_GL_INIT_ZERO;                                                \
         GR_GL_CALL(gl, GetRenderbufferParameteriv(t, pname, p));               \
     } while (0)
+
 #define GR_GL_GetTexLevelParameteriv(gl, t, l, pname, p)                       \
     do {                                                                       \
         *(p) = GR_GL_INIT_ZERO;                                                \
         GR_GL_CALL(gl, GetTexLevelParameteriv(t, l, pname, p));                \
     } while (0)
 
+#define GR_GL_GetShaderPrecisionFormat(gl, st, pt, range, precision)           \
+    do {                                                                       \
+        (range)[0] = GR_GL_INIT_ZERO;                                          \
+        (range)[1] = GR_GL_INIT_ZERO;                                          \
+        (*precision) = GR_GL_INIT_ZERO;                                        \
+        GR_GL_CALL(gl, GetShaderPrecisionFormat(st, pt, range, precision));    \
+    } while (0)
+
 ////////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -85,10 +111,15 @@ enum GrGLRenderer {
 GrGLVersion GrGLGetVersionFromString(const char* versionString);
 GrGLStandard GrGLGetStandardInUseFromString(const char* versionString);
 GrGLSLVersion GrGLGetGLSLVersionFromString(const char* versionString);
-bool GrGLIsMesaFromVersionString(const char* versionString);
 GrGLVendor GrGLGetVendorFromString(const char* vendorString);
 GrGLRenderer GrGLGetRendererFromString(const char* rendererString);
-bool GrGLIsChromiumFromRendererString(const char* rendererString);
+
+void GrGLGetDriverInfo(GrGLStandard standard,
+                       GrGLVendor vendor,
+                       const char* rendererString,
+                       const char* versionString,
+                       GrGLDriver* outDriver,
+                       GrGLDriverVersion* outVersion);
 
 // these variants call glGetString()
 GrGLVersion GrGLGetVersion(const GrGLInterface*);
@@ -107,11 +138,6 @@ void GrGLCheckErr(const GrGLInterface* gl,
 
 void GrGLClearErr(const GrGLInterface* gl);
 
-/**
- * Helper for converting SkMatrix to a column-major GL float array
- */
-template<int MatrixSize> void GrGLGetMatrix(GrGLfloat* dest, const SkMatrix& src);
-
 ////////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -129,13 +155,13 @@ template<int MatrixSize> void GrGLGetMatrix(GrGLfloat* dest, const SkMatrix& src
     #define GR_GL_CHECK_ERROR_IMPL(IFACE, X)
 #endif
 
-// internal macro to conditionally log the gl call using GrPrintf based on
+// internal macro to conditionally log the gl call using SkDebugf based on
 // compile-time and run-time flags.
 #if GR_GL_LOG_CALLS
     extern bool gLogCallsGL;
     #define GR_GL_LOG_CALLS_IMPL(X)                             \
         if (gLogCallsGL)                                        \
-            GrPrintf(GR_FILE_AND_LINE_STR "GL: " #X "\n")
+            SkDebugf(GR_FILE_AND_LINE_STR "GL: " #X "\n")
 #else
     #define GR_GL_LOG_CALLS_IMPL(X)
 #endif
@@ -181,4 +207,7 @@ template<int MatrixSize> void GrGLGetMatrix(GrGLfloat* dest, const SkMatrix& src
 // call glGetError without doing a redundant error check or logging.
 #define GR_GL_GET_ERROR(IFACE) (IFACE)->fFunctions.fGetError()
 
+GrGLenum GrToGLStencilFunc(GrStencilFunc basicFunc);
+
+
 #endif
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLVaryingHandler.cpp b/gfx/skia/skia/src/gpu/gl/GrGLVaryingHandler.cpp
new file mode 100644
index 000000000000..b27a9960ec08
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/GrGLVaryingHandler.cpp
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "gl/GrGLVaryingHandler.h"
+
+#include "gl/GrGLGpu.h"
+#include "gl/builders/GrGLProgramBuilder.h"
+
+
+GrGLSLVaryingHandler::VaryingHandle GrGLVaryingHandler::addPathProcessingVarying(
+                                                                       const char* name,
+                                                                       GrGLSLVertToFrag* v,
+                                                                       GrSLPrecision fsPrecision) {
+#ifdef SK_DEBUG
+    GrGLProgramBuilder* glPB = (GrGLProgramBuilder*) fProgramBuilder;
+    // This call is not used for non-NVPR backends.
+    SkASSERT(glPB->gpu()->glCaps().shaderCaps()->pathRenderingSupport() &&
+             glPB->fArgs.fPrimitiveProcessor->isPathRendering() &&
+             !glPB->fArgs.fPrimitiveProcessor->willUseGeoShader() &&
+             glPB->fArgs.fPrimitiveProcessor->numAttribs() == 0);
+#endif
+    this->addVarying(name, v, fsPrecision);
+    VaryingInfo& varyingInfo = fPathProcVaryingInfos.push_back();
+    varyingInfo.fVariable = fFragInputs.back();
+    varyingInfo.fLocation = fPathProcVaryingInfos.count() - 1;
+    return VaryingHandle(varyingInfo.fLocation);
+}
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLVaryingHandler.h b/gfx/skia/skia/src/gpu/gl/GrGLVaryingHandler.h
new file mode 100644
index 000000000000..ab931debd7cb
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/GrGLVaryingHandler.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGLVaryingHandler_DEFINED
+#define GrGLVaryingHandler_DEFINED
+
+#include "glsl/GrGLSLVarying.h"
+#include "GrTypesPriv.h"
+#include "gl/GrGLProgramDataManager.h"
+
+class GrGLVaryingHandler : public GrGLSLVaryingHandler {
+public:
+    GrGLVaryingHandler(GrGLSLProgramBuilder* program)
+        : INHERITED(program),
+        fPathProcVaryingInfos(kVaryingsPerBlock) {}
+
+    // This function is used by the NVPR PathProcessor to add a varying directly into the fragment
+    // shader since there is no vertex shader.
+    VaryingHandle addPathProcessingVarying(const char* name, GrGLSLVertToFrag*,
+                                       GrSLPrecision fsPrecision = kDefault_GrSLPrecision);
+
+private:
+    typedef GrGLProgramDataManager::VaryingInfo VaryingInfo;
+    typedef GrGLProgramDataManager::VaryingInfoArray VaryingInfoArray;
+
+    VaryingInfoArray fPathProcVaryingInfos;
+
+    friend class GrGLProgramBuilder;
+
+    typedef GrGLSLVaryingHandler INHERITED; 
+};
+
+#endif
+
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLVertexArray.cpp b/gfx/skia/skia/src/gpu/gl/GrGLVertexArray.cpp
index 66feb820530a..8cfa8d655050 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLVertexArray.cpp
+++ b/gfx/skia/skia/src/gpu/gl/GrGLVertexArray.cpp
@@ -6,14 +6,13 @@
  */
 
 #include "GrGLVertexArray.h"
-#include "GrGpuGL.h"
+#include "GrGLGpu.h"
 
-#define GPUGL static_cast<GrGpuGL*>(this->getGpu())
-#define GL_CALL(X) GR_GL_CALL(GPUGL->glInterface(), X);
 
-void GrGLAttribArrayState::set(const GrGpuGL* gpu,
+
+void GrGLAttribArrayState::set(GrGLGpu* gpu,
                                int index,
-                               GrGLVertexBuffer* buffer,
+                               GrGLuint vertexBufferID,
                                GrGLint size,
                                GrGLenum type,
                                GrGLboolean normalized,
@@ -27,13 +26,13 @@ void GrGLAttribArrayState::set(const GrGpuGL* gpu,
         array->fEnabled = true;
     }
     if (!array->fAttribPointerIsValid ||
-        array->fVertexBufferID != buffer->bufferID() ||
+        array->fVertexBufferID != vertexBufferID ||
         array->fSize != size ||
         array->fNormalized != normalized ||
         array->fStride != stride ||
         array->fOffset != offset) {
 
-        buffer->bind();
+        gpu->bindVertexBuffer(vertexBufferID);
         GR_GL_CALL(gpu->glInterface(), VertexAttribPointer(index,
                                                            size,
                                                            type,
@@ -41,7 +40,7 @@ void GrGLAttribArrayState::set(const GrGpuGL* gpu,
                                                            stride,
                                                            offset));
         array->fAttribPointerIsValid = true;
-        array->fVertexBufferID = buffer->bufferID();
+        array->fVertexBufferID = vertexBufferID;
         array->fSize = size;
         array->fNormalized = normalized;
         array->fStride = stride;
@@ -49,7 +48,7 @@ void GrGLAttribArrayState::set(const GrGpuGL* gpu,
     }
 }
 
-void GrGLAttribArrayState::disableUnusedArrays(const GrGpuGL* gpu, uint64_t usedMask) {
+void GrGLAttribArrayState::disableUnusedArrays(const GrGLGpu* gpu, uint64_t usedMask) {
     int count = fAttribArrayStates.count();
     for (int i = 0; i < count; ++i) {
         if (!(usedMask & 0x1)) {
@@ -68,43 +67,27 @@ void GrGLAttribArrayState::disableUnusedArrays(const GrGpuGL* gpu, uint64_t used
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-GrGLVertexArray::GrGLVertexArray(GrGpuGL* gpu, GrGLint id, int attribCount)
-    : INHERITED(gpu, false)
-    , fID(id)
+GrGLVertexArray::GrGLVertexArray(GrGLint id, int attribCount)
+    : fID(id)
     , fAttribArrays(attribCount)
     , fIndexBufferIDIsValid(false) {
 }
 
-void GrGLVertexArray::onAbandon() {
-    fID = 0;
-    INHERITED::onAbandon();
-}
-
-void GrGLVertexArray::onRelease() {
-    if (0 != fID) {
-        GL_CALL(DeleteVertexArrays(1, &fID));
-        GPUGL->notifyVertexArrayDelete(fID);
-        fID = 0;
-    }
-    INHERITED::onRelease();
-}
-
-GrGLAttribArrayState* GrGLVertexArray::bind() {
+GrGLAttribArrayState* GrGLVertexArray::bind(GrGLGpu* gpu) {
     if (0 == fID) {
-        return NULL;
+        return nullptr;
     }
-    GPUGL->bindVertexArray(fID);
+    gpu->bindVertexArray(fID);
     return &fAttribArrays;
 }
 
-GrGLAttribArrayState* GrGLVertexArray::bindWithIndexBuffer(const GrGLIndexBuffer* buffer) {
-    GrGLAttribArrayState* state = this->bind();
-    if (NULL != state && NULL != buffer) {
-        GrGLuint bufferID = buffer->bufferID();
-        if (!fIndexBufferIDIsValid || bufferID != fIndexBufferID) {
-            GL_CALL(BindBuffer(GR_GL_ELEMENT_ARRAY_BUFFER, bufferID));
+GrGLAttribArrayState* GrGLVertexArray::bindWithIndexBuffer(GrGLGpu* gpu, GrGLuint ibufferID) {
+    GrGLAttribArrayState* state = this->bind(gpu);
+    if (state) {
+        if (!fIndexBufferIDIsValid || ibufferID != fIndexBufferID) {            
+            GR_GL_CALL(gpu->glInterface(), BindBuffer(GR_GL_ELEMENT_ARRAY_BUFFER, ibufferID));
             fIndexBufferIDIsValid = true;
-            fIndexBufferID = bufferID;
+            fIndexBufferID = ibufferID;
         }
     }
     return state;
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLVertexArray.h b/gfx/skia/skia/src/gpu/gl/GrGLVertexArray.h
index f4eb3d52ca29..ebdb681e34e4 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLVertexArray.h
+++ b/gfx/skia/skia/src/gpu/gl/GrGLVertexArray.h
@@ -8,16 +8,14 @@
 #ifndef GrGLVertexArray_DEFINED
 #define GrGLVertexArray_DEFINED
 
-#include "GrGpuResource.h"
 #include "GrTypesPriv.h"
 #include "gl/GrGLDefines.h"
-#include "gl/GrGLFunctions.h"
-
+#include "gl/GrGLTypes.h"
 #include "SkTArray.h"
 
 class GrGLVertexBuffer;
 class GrGLIndexBuffer;
-class GrGpuGL;
+class GrGLGpu;
 
 struct GrGLAttribLayout {
     GrGLint     fCount;
@@ -32,13 +30,17 @@ static inline const GrGLAttribLayout& GrGLAttribTypeToLayout(GrVertexAttribType
         {2, GR_GL_FLOAT, false},         // kVec2f_GrVertexAttribType
         {3, GR_GL_FLOAT, false},         // kVec3f_GrVertexAttribType
         {4, GR_GL_FLOAT, false},         // kVec4f_GrVertexAttribType
+        {1, GR_GL_UNSIGNED_BYTE, true},  // kUByte_GrVertexAttribType
         {4, GR_GL_UNSIGNED_BYTE, true},  // kVec4ub_GrVertexAttribType
+        {2, GR_GL_SHORT, false},         // kVec2s_GrVertexAttribType
     };
     GR_STATIC_ASSERT(0 == kFloat_GrVertexAttribType);
     GR_STATIC_ASSERT(1 == kVec2f_GrVertexAttribType);
     GR_STATIC_ASSERT(2 == kVec3f_GrVertexAttribType);
     GR_STATIC_ASSERT(3 == kVec4f_GrVertexAttribType);
-    GR_STATIC_ASSERT(4 == kVec4ub_GrVertexAttribType);
+    GR_STATIC_ASSERT(4 == kUByte_GrVertexAttribType);
+    GR_STATIC_ASSERT(5 == kVec4ub_GrVertexAttribType);
+    GR_STATIC_ASSERT(6 == kVec2s_GrVertexAttribType);
     GR_STATIC_ASSERT(SK_ARRAY_COUNT(kLayouts) == kGrVertexAttribTypeCount);
     return kLayouts[type];
 }
@@ -65,9 +67,9 @@ public:
      * assumed that the GrGLAttribArrayState is tracking the state of the currently bound vertex
      * array object.
      */
-    void set(const GrGpuGL*,
-             int index,
-             GrGLVertexBuffer*,
+    void set(GrGLGpu*,
+             int attribIndex,
+             GrGLuint vertexBufferID,
              GrGLint size,
              GrGLenum type,
              GrGLboolean normalized,
@@ -78,7 +80,7 @@ public:
      * This function disables vertex attribs not present in the mask. It is assumed that the
      * GrGLAttribArrayState is tracking the state of the currently bound vertex array object.
      */
-    void disableUnusedArrays(const GrGpuGL*, uint64_t usedAttribArrayMask);
+    void disableUnusedArrays(const GrGLGpu*, uint64_t usedAttribArrayMask);
 
     void invalidate() {
         int count = fAttribArrayStates.count();
@@ -130,22 +132,22 @@ private:
  * This class represents an OpenGL vertex array object. It manages the lifetime of the vertex array
  * and is used to track the state of the vertex array to avoid redundant GL calls.
  */
-class GrGLVertexArray : public GrGpuResource {
+class GrGLVertexArray {
 public:
-    GrGLVertexArray(GrGpuGL* gpu, GrGLint id, int attribCount);
+    GrGLVertexArray(GrGLint id, int attribCount);
 
     /**
-     * Binds this vertex array. If the ID has been deleted or abandoned then NULL is returned.
+     * Binds this vertex array. If the ID has been deleted or abandoned then nullptr is returned.
      * Otherwise, the GrGLAttribArrayState that is tracking this vertex array's attrib bindings is
      * returned.
      */
-    GrGLAttribArrayState* bind();
+    GrGLAttribArrayState* bind(GrGLGpu*);
 
     /**
      * This is a version of the above function that also binds an index buffer to the vertex
      * array object.
      */
-    GrGLAttribArrayState* bindWithIndexBuffer(const GrGLIndexBuffer* indexBuffer);
+    GrGLAttribArrayState* bindWithIndexBuffer(GrGLGpu* gpu, GrGLuint indexBufferID);
 
     void notifyIndexBufferDelete(GrGLuint bufferID);
 
@@ -157,20 +159,11 @@ public:
 
     void invalidateCachedState();
 
-    virtual size_t gpuMemorySize() const SK_OVERRIDE { return 0; }
-
-protected:
-    virtual void onAbandon() SK_OVERRIDE;
-
-    virtual void onRelease() SK_OVERRIDE;
-
 private:
     GrGLuint                fID;
     GrGLAttribArrayState    fAttribArrays;
     GrGLuint                fIndexBufferID;
     bool                    fIndexBufferIDIsValid;
-
-    typedef GrGpuResource INHERITED;
 };
 
 #endif
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLVertexBuffer.cpp b/gfx/skia/skia/src/gpu/gl/GrGLVertexBuffer.cpp
index a13ad126ecc8..1f8951654f92 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLVertexBuffer.cpp
+++ b/gfx/skia/skia/src/gpu/gl/GrGLVertexBuffer.cpp
@@ -6,11 +6,13 @@
  */
 
 #include "GrGLVertexBuffer.h"
-#include "GrGpuGL.h"
+#include "GrGLGpu.h"
+#include "SkTraceMemoryDump.h"
 
-GrGLVertexBuffer::GrGLVertexBuffer(GrGpuGL* gpu, const Desc& desc)
-    : INHERITED(gpu, desc.fIsWrapped, desc.fSizeInBytes, desc.fDynamic, 0 == desc.fID)
+GrGLVertexBuffer::GrGLVertexBuffer(GrGLGpu* gpu, const Desc& desc)
+    : INHERITED(gpu, desc.fSizeInBytes, desc.fDynamic, 0 == desc.fID)
     , fImpl(gpu, desc, GR_GL_ARRAY_BUFFER) {
+    this->registerWithCache();
 }
 
 void GrGLVertexBuffer::onRelease() {
@@ -30,7 +32,7 @@ void* GrGLVertexBuffer::onMap() {
     if (!this->wasDestroyed()) {
         return fImpl.map(this->getGpuGL());
     } else {
-        return NULL;
+        return nullptr;
     }
 }
 
@@ -47,3 +49,11 @@ bool GrGLVertexBuffer::onUpdateData(const void* src, size_t srcSizeInBytes) {
         return false;
     }
 }
+
+void GrGLVertexBuffer::setMemoryBacking(SkTraceMemoryDump* traceMemoryDump,
+                                        const SkString& dumpName) const {
+    SkString buffer_id;
+    buffer_id.appendU32(this->bufferID());
+    traceMemoryDump->setMemoryBacking(dumpName.c_str(), "gl_buffer",
+                                      buffer_id.c_str());
+}
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLVertexBuffer.h b/gfx/skia/skia/src/gpu/gl/GrGLVertexBuffer.h
index db413ac9909c..93c6b2baddbc 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLVertexBuffer.h
+++ b/gfx/skia/skia/src/gpu/gl/GrGLVertexBuffer.h
@@ -12,37 +12,32 @@
 #include "GrGLBufferImpl.h"
 #include "gl/GrGLInterface.h"
 
-class GrGpuGL;
+class GrGLGpu;
 
 class GrGLVertexBuffer : public GrVertexBuffer {
 
 public:
     typedef GrGLBufferImpl::Desc Desc;
 
-    GrGLVertexBuffer(GrGpuGL* gpu, const Desc& desc);
-    virtual ~GrGLVertexBuffer() { this->release(); }
+    GrGLVertexBuffer(GrGLGpu* gpu, const Desc& desc);
 
     GrGLuint bufferID() const { return fImpl.bufferID(); }
     size_t baseOffset() const { return fImpl.baseOffset(); }
 
-    void bind() const {
-        if (!this->wasDestroyed()) {
-            fImpl.bind(this->getGpuGL());
-        }
-    }
-
 protected:
-    virtual void onAbandon() SK_OVERRIDE;
-    virtual void onRelease() SK_OVERRIDE;
+    void onAbandon() override;
+    void onRelease() override;
+    void setMemoryBacking(SkTraceMemoryDump* traceMemoryDump,
+                          const SkString& dumpName) const override;
 
 private:
-    virtual void* onMap() SK_OVERRIDE;
-    virtual void onUnmap() SK_OVERRIDE;
-    virtual bool onUpdateData(const void* src, size_t srcSizeInBytes) SK_OVERRIDE;
+    void* onMap() override;
+    void onUnmap() override;
+    bool onUpdateData(const void* src, size_t srcSizeInBytes) override;
 
-    GrGpuGL* getGpuGL() const {
+    GrGLGpu* getGpuGL() const {
         SkASSERT(!this->wasDestroyed());
-        return (GrGpuGL*)(this->getGpu());
+        return (GrGLGpu*)(this->getGpu());
     }
 
     GrGLBufferImpl fImpl;
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLVertexEffect.h b/gfx/skia/skia/src/gpu/gl/GrGLVertexEffect.h
deleted file mode 100644
index eba1fbe79573..000000000000
--- a/gfx/skia/skia/src/gpu/gl/GrGLVertexEffect.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrGLVertexEffect_DEFINED
-#define GrGLVertexEffect_DEFINED
-
-#include "GrGLEffect.h"
-
-/**
- * If a GL effect needs a GrGLFullShaderBuilder* object to emit vertex code, then it must inherit
- * from this class. Since paths don't have vertices, this class is only meant to be used internally
- * by skia, for special cases.
- */
-class GrGLVertexEffect : public GrGLEffect {
-public:
-    GrGLVertexEffect(const GrBackendEffectFactory& factory)
-        : INHERITED(factory) { fIsVertexEffect = true; }
-
-    /**
-     * This is similar to emitCode() in the base class, except it takes a full shader builder.
-     * This allows the effect subclass to emit vertex code.
-     */
-    virtual void emitCode(GrGLFullShaderBuilder* builder,
-                          const GrDrawEffect& drawEffect,
-                          const GrEffectKey& key,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray& coords,
-                          const TextureSamplerArray& samplers) = 0;
-
-    /**
-     * Provide a default override for base class's emitCode() function.
-     */
-    virtual void emitCode(GrGLShaderBuilder* builder,
-                          const GrDrawEffect& drawEffect,
-                          const GrEffectKey& key,
-                          const char* outputColor,
-                          const char* inputColor,
-                          const TransformedCoordsArray& coords,
-                          const TextureSamplerArray& samplers) SK_OVERRIDE {
-        SkFAIL("GrGLVertexEffect requires GrGLFullShaderBuilder* overload for emitCode().");
-    }
-
-private:
-    typedef GrGLEffect INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/gl/GrGpuGL.cpp b/gfx/skia/skia/src/gpu/gl/GrGpuGL.cpp
deleted file mode 100644
index 1bbf02acb01a..000000000000
--- a/gfx/skia/skia/src/gpu/gl/GrGpuGL.cpp
+++ /dev/null
@@ -1,3027 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#include "GrGpuGL.h"
-#include "GrGLNameAllocator.h"
-#include "GrGLStencilBuffer.h"
-#include "GrGLPath.h"
-#include "GrGLPathRange.h"
-#include "GrGLShaderBuilder.h"
-#include "GrTemplates.h"
-#include "GrTypes.h"
-#include "SkStrokeRec.h"
-#include "SkTemplates.h"
-
-#define GL_CALL(X) GR_GL_CALL(this->glInterface(), X)
-#define GL_CALL_RET(RET, X) GR_GL_CALL_RET(this->glInterface(), RET, X)
-
-#define SKIP_CACHE_CHECK    true
-
-#if GR_GL_CHECK_ALLOC_WITH_GET_ERROR
-    #define CLEAR_ERROR_BEFORE_ALLOC(iface)   GrGLClearErr(iface)
-    #define GL_ALLOC_CALL(iface, call)        GR_GL_CALL_NOERRCHECK(iface, call)
-    #define CHECK_ALLOC_ERROR(iface)          GR_GL_GET_ERROR(iface)
-#else
-    #define CLEAR_ERROR_BEFORE_ALLOC(iface)
-    #define GL_ALLOC_CALL(iface, call)        GR_GL_CALL(iface, call)
-    #define CHECK_ALLOC_ERROR(iface)          GR_GL_NO_ERROR
-#endif
-
-
-///////////////////////////////////////////////////////////////////////////////
-
-static const GrGLenum gXformType2GLType[] = {
-    GR_GL_NONE,
-    GR_GL_TRANSLATE_X,
-    GR_GL_TRANSLATE_Y,
-    GR_GL_TRANSLATE_2D,
-    GR_GL_TRANSPOSE_AFFINE_2D
-};
-
-GR_STATIC_ASSERT(0 == GrDrawTarget::kNone_PathTransformType);
-GR_STATIC_ASSERT(1 == GrDrawTarget::kTranslateX_PathTransformType);
-GR_STATIC_ASSERT(2 == GrDrawTarget::kTranslateY_PathTransformType);
-GR_STATIC_ASSERT(3 == GrDrawTarget::kTranslate_PathTransformType);
-GR_STATIC_ASSERT(4 == GrDrawTarget::kAffine_PathTransformType);
-GR_STATIC_ASSERT(GrDrawTarget::kAffine_PathTransformType == GrDrawTarget::kLast_PathTransformType);
-
-static const GrGLenum gXfermodeCoeff2Blend[] = {
-    GR_GL_ZERO,
-    GR_GL_ONE,
-    GR_GL_SRC_COLOR,
-    GR_GL_ONE_MINUS_SRC_COLOR,
-    GR_GL_DST_COLOR,
-    GR_GL_ONE_MINUS_DST_COLOR,
-    GR_GL_SRC_ALPHA,
-    GR_GL_ONE_MINUS_SRC_ALPHA,
-    GR_GL_DST_ALPHA,
-    GR_GL_ONE_MINUS_DST_ALPHA,
-    GR_GL_CONSTANT_COLOR,
-    GR_GL_ONE_MINUS_CONSTANT_COLOR,
-    GR_GL_CONSTANT_ALPHA,
-    GR_GL_ONE_MINUS_CONSTANT_ALPHA,
-
-    // extended blend coeffs
-    GR_GL_SRC1_COLOR,
-    GR_GL_ONE_MINUS_SRC1_COLOR,
-    GR_GL_SRC1_ALPHA,
-    GR_GL_ONE_MINUS_SRC1_ALPHA,
-};
-
-bool GrGpuGL::BlendCoeffReferencesConstant(GrBlendCoeff coeff) {
-    static const bool gCoeffReferencesBlendConst[] = {
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        true,
-        true,
-        true,
-        true,
-
-        // extended blend coeffs
-        false,
-        false,
-        false,
-        false,
-    };
-    return gCoeffReferencesBlendConst[coeff];
-    GR_STATIC_ASSERT(kTotalGrBlendCoeffCount ==
-                     SK_ARRAY_COUNT(gCoeffReferencesBlendConst));
-
-    GR_STATIC_ASSERT(0 == kZero_GrBlendCoeff);
-    GR_STATIC_ASSERT(1 == kOne_GrBlendCoeff);
-    GR_STATIC_ASSERT(2 == kSC_GrBlendCoeff);
-    GR_STATIC_ASSERT(3 == kISC_GrBlendCoeff);
-    GR_STATIC_ASSERT(4 == kDC_GrBlendCoeff);
-    GR_STATIC_ASSERT(5 == kIDC_GrBlendCoeff);
-    GR_STATIC_ASSERT(6 == kSA_GrBlendCoeff);
-    GR_STATIC_ASSERT(7 == kISA_GrBlendCoeff);
-    GR_STATIC_ASSERT(8 == kDA_GrBlendCoeff);
-    GR_STATIC_ASSERT(9 == kIDA_GrBlendCoeff);
-    GR_STATIC_ASSERT(10 == kConstC_GrBlendCoeff);
-    GR_STATIC_ASSERT(11 == kIConstC_GrBlendCoeff);
-    GR_STATIC_ASSERT(12 == kConstA_GrBlendCoeff);
-    GR_STATIC_ASSERT(13 == kIConstA_GrBlendCoeff);
-
-    GR_STATIC_ASSERT(14 == kS2C_GrBlendCoeff);
-    GR_STATIC_ASSERT(15 == kIS2C_GrBlendCoeff);
-    GR_STATIC_ASSERT(16 == kS2A_GrBlendCoeff);
-    GR_STATIC_ASSERT(17 == kIS2A_GrBlendCoeff);
-
-    // assertion for gXfermodeCoeff2Blend have to be in GrGpu scope
-    GR_STATIC_ASSERT(kTotalGrBlendCoeffCount ==
-                     SK_ARRAY_COUNT(gXfermodeCoeff2Blend));
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-static bool gPrintStartupSpew;
-
-GrGpuGL::GrGpuGL(const GrGLContext& ctx, GrContext* context)
-    : GrGpu(context)
-    , fGLContext(ctx) {
-
-    SkASSERT(ctx.isInitialized());
-    fCaps.reset(SkRef(ctx.caps()));
-
-    fHWBoundTextureUniqueIDs.reset(this->glCaps().maxFragmentTextureUnits());
-    fHWPathTexGenSettings.reset(this->glCaps().maxFixedFunctionTextureCoords());
-
-    GrGLClearErr(fGLContext.interface());
-    if (gPrintStartupSpew) {
-        const GrGLubyte* vendor;
-        const GrGLubyte* renderer;
-        const GrGLubyte* version;
-        GL_CALL_RET(vendor, GetString(GR_GL_VENDOR));
-        GL_CALL_RET(renderer, GetString(GR_GL_RENDERER));
-        GL_CALL_RET(version, GetString(GR_GL_VERSION));
-        GrPrintf("------------------------- create GrGpuGL %p --------------\n",
-                 this);
-        GrPrintf("------ VENDOR %s\n", vendor);
-        GrPrintf("------ RENDERER %s\n", renderer);
-        GrPrintf("------ VERSION %s\n",  version);
-        GrPrintf("------ EXTENSIONS\n");
-        ctx.extensions().print();
-        GrPrintf("\n");
-        GrPrintf(this->glCaps().dump().c_str());
-    }
-
-    fProgramCache = SkNEW_ARGS(ProgramCache, (this));
-
-    SkASSERT(this->glCaps().maxVertexAttributes() >= GrDrawState::kMaxVertexAttribCnt);
-
-    fLastSuccessfulStencilFmtIdx = 0;
-    fHWProgramID = 0;
-}
-
-GrGpuGL::~GrGpuGL() {
-    if (0 != fHWProgramID) {
-        // detach the current program so there is no confusion on OpenGL's part
-        // that we want it to be deleted
-        SkASSERT(fHWProgramID == fCurrentProgram->programID());
-        GL_CALL(UseProgram(0));
-    }
-
-    delete fProgramCache;
-
-    // This must be called by before the GrDrawTarget destructor
-    this->releaseGeometry();
-    // This subclass must do this before the base class destructor runs
-    // since we will unref the GrGLInterface.
-    this->releaseResources();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-
-GrPixelConfig GrGpuGL::preferredReadPixelsConfig(GrPixelConfig readConfig,
-                                                 GrPixelConfig surfaceConfig) const {
-    if (GR_GL_RGBA_8888_PIXEL_OPS_SLOW && kRGBA_8888_GrPixelConfig == readConfig) {
-        return kBGRA_8888_GrPixelConfig;
-    } else if (this->glContext().isMesa() &&
-               GrBytesPerPixel(readConfig) == 4 &&
-               GrPixelConfigSwapRAndB(readConfig) == surfaceConfig) {
-        // Mesa 3D takes a slow path on when reading back  BGRA from an RGBA surface and vice-versa.
-        // Perhaps this should be guarded by some compiletime or runtime check.
-        return surfaceConfig;
-    } else if (readConfig == kBGRA_8888_GrPixelConfig &&
-               !this->glCaps().readPixelsSupported(this->glInterface(),
-                                                   GR_GL_BGRA, GR_GL_UNSIGNED_BYTE)) {
-        return kRGBA_8888_GrPixelConfig;
-    } else {
-        return readConfig;
-    }
-}
-
-GrPixelConfig GrGpuGL::preferredWritePixelsConfig(GrPixelConfig writeConfig,
-                                                  GrPixelConfig surfaceConfig) const {
-    if (GR_GL_RGBA_8888_PIXEL_OPS_SLOW && kRGBA_8888_GrPixelConfig == writeConfig) {
-        return kBGRA_8888_GrPixelConfig;
-    } else {
-        return writeConfig;
-    }
-}
-
-bool GrGpuGL::canWriteTexturePixels(const GrTexture* texture, GrPixelConfig srcConfig) const {
-    if (kIndex_8_GrPixelConfig == srcConfig || kIndex_8_GrPixelConfig == texture->config()) {
-        return false;
-    }
-    if (srcConfig != texture->config() && kGLES_GrGLStandard == this->glStandard()) {
-        // In general ES2 requires the internal format of the texture and the format of the src
-        // pixels to match. However, It may or may not be possible to upload BGRA data to a RGBA
-        // texture. It depends upon which extension added BGRA. The Apple extension allows it
-        // (BGRA's internal format is RGBA) while the EXT extension does not (BGRA is its own
-        // internal format).
-        if (this->glCaps().isConfigTexturable(kBGRA_8888_GrPixelConfig) &&
-            !this->glCaps().bgraIsInternalFormat() &&
-            kBGRA_8888_GrPixelConfig == srcConfig &&
-            kRGBA_8888_GrPixelConfig == texture->config()) {
-            return true;
-        } else {
-            return false;
-        }
-    } else {
-        return true;
-    }
-}
-
-bool GrGpuGL::fullReadPixelsIsFasterThanPartial() const {
-    return SkToBool(GR_GL_FULL_READPIXELS_FASTER_THAN_PARTIAL);
-}
-
-void GrGpuGL::onResetContext(uint32_t resetBits) {
-    // we don't use the zb at all
-    if (resetBits & kMisc_GrGLBackendState) {
-        GL_CALL(Disable(GR_GL_DEPTH_TEST));
-        GL_CALL(DepthMask(GR_GL_FALSE));
-
-        fHWDrawFace = GrDrawState::kInvalid_DrawFace;
-        fHWDitherEnabled = kUnknown_TriState;
-
-        if (kGL_GrGLStandard == this->glStandard()) {
-            // Desktop-only state that we never change
-            if (!this->glCaps().isCoreProfile()) {
-                GL_CALL(Disable(GR_GL_POINT_SMOOTH));
-                GL_CALL(Disable(GR_GL_LINE_SMOOTH));
-                GL_CALL(Disable(GR_GL_POLYGON_SMOOTH));
-                GL_CALL(Disable(GR_GL_POLYGON_STIPPLE));
-                GL_CALL(Disable(GR_GL_COLOR_LOGIC_OP));
-                GL_CALL(Disable(GR_GL_INDEX_LOGIC_OP));
-            }
-            // The windows NVIDIA driver has GL_ARB_imaging in the extension string when using a
-            // core profile. This seems like a bug since the core spec removes any mention of
-            // GL_ARB_imaging.
-            if (this->glCaps().imagingSupport() && !this->glCaps().isCoreProfile()) {
-                GL_CALL(Disable(GR_GL_COLOR_TABLE));
-            }
-            GL_CALL(Disable(GR_GL_POLYGON_OFFSET_FILL));
-            // Since ES doesn't support glPointSize at all we always use the VS to
-            // set the point size
-            GL_CALL(Enable(GR_GL_VERTEX_PROGRAM_POINT_SIZE));
-
-            // We should set glPolygonMode(FRONT_AND_BACK,FILL) here, too. It isn't
-            // currently part of our gl interface. There are probably others as
-            // well.
-        }
-        fHWWriteToColor = kUnknown_TriState;
-        // we only ever use lines in hairline mode
-        GL_CALL(LineWidth(1));
-    }
-
-    if (resetBits & kAA_GrGLBackendState) {
-        fHWAAState.invalidate();
-    }
-
-    fHWActiveTextureUnitIdx = -1; // invalid
-
-    if (resetBits & kTextureBinding_GrGLBackendState) {
-        for (int s = 0; s < fHWBoundTextureUniqueIDs.count(); ++s) {
-            fHWBoundTextureUniqueIDs[s] = SK_InvalidUniqueID;
-        }
-    }
-
-    if (resetBits & kBlend_GrGLBackendState) {
-        fHWBlendState.invalidate();
-    }
-
-    if (resetBits & kView_GrGLBackendState) {
-        fHWScissorSettings.invalidate();
-        fHWViewport.invalidate();
-    }
-
-    if (resetBits & kStencil_GrGLBackendState) {
-        fHWStencilSettings.invalidate();
-        fHWStencilTestEnabled = kUnknown_TriState;
-    }
-
-    // Vertex
-    if (resetBits & kVertex_GrGLBackendState) {
-        fHWGeometryState.invalidate();
-    }
-
-    if (resetBits & kRenderTarget_GrGLBackendState) {
-        fHWBoundRenderTargetUniqueID = SK_InvalidUniqueID;
-    }
-
-    if (resetBits & kPathRendering_GrGLBackendState) {
-        if (this->caps()->pathRenderingSupport()) {
-            fHWProjectionMatrixState.invalidate();
-            // we don't use the model view matrix.
-            GL_CALL(MatrixLoadIdentity(GR_GL_MODELVIEW));
-
-            for (int i = 0; i < this->glCaps().maxFixedFunctionTextureCoords(); ++i) {
-                GL_CALL(PathTexGen(GR_GL_TEXTURE0 + i, GR_GL_NONE, 0, NULL));
-                fHWPathTexGenSettings[i].fMode = GR_GL_NONE;
-                fHWPathTexGenSettings[i].fNumComponents = 0;
-            }
-            fHWActivePathTexGenSets = 0;
-        }
-        fHWPathStencilSettings.invalidate();
-    }
-
-    // we assume these values
-    if (resetBits & kPixelStore_GrGLBackendState) {
-        if (this->glCaps().unpackRowLengthSupport()) {
-            GL_CALL(PixelStorei(GR_GL_UNPACK_ROW_LENGTH, 0));
-        }
-        if (this->glCaps().packRowLengthSupport()) {
-            GL_CALL(PixelStorei(GR_GL_PACK_ROW_LENGTH, 0));
-        }
-        if (this->glCaps().unpackFlipYSupport()) {
-            GL_CALL(PixelStorei(GR_GL_UNPACK_FLIP_Y, GR_GL_FALSE));
-        }
-        if (this->glCaps().packFlipYSupport()) {
-            GL_CALL(PixelStorei(GR_GL_PACK_REVERSE_ROW_ORDER, GR_GL_FALSE));
-        }
-    }
-
-    if (resetBits & kProgram_GrGLBackendState) {
-        fHWProgramID = 0;
-        fSharedGLProgramState.invalidate();
-    }
-}
-
-namespace {
-
-GrSurfaceOrigin resolve_origin(GrSurfaceOrigin origin, bool renderTarget) {
-    // By default, GrRenderTargets are GL's normal orientation so that they
-    // can be drawn to by the outside world without the client having
-    // to render upside down.
-    if (kDefault_GrSurfaceOrigin == origin) {
-        return renderTarget ? kBottomLeft_GrSurfaceOrigin : kTopLeft_GrSurfaceOrigin;
-    } else {
-        return origin;
-    }
-}
-
-}
-
-GrTexture* GrGpuGL::onWrapBackendTexture(const GrBackendTextureDesc& desc) {
-    if (!this->configToGLFormats(desc.fConfig, false, NULL, NULL, NULL)) {
-        return NULL;
-    }
-
-    if (0 == desc.fTextureHandle) {
-        return NULL;
-    }
-
-    int maxSize = this->caps()->maxTextureSize();
-    if (desc.fWidth > maxSize || desc.fHeight > maxSize) {
-        return NULL;
-    }
-
-    GrGLTexture::Desc glTexDesc;
-    // next line relies on GrBackendTextureDesc's flags matching GrTexture's
-    glTexDesc.fFlags = (GrTextureFlags) desc.fFlags;
-    glTexDesc.fWidth = desc.fWidth;
-    glTexDesc.fHeight = desc.fHeight;
-    glTexDesc.fConfig = desc.fConfig;
-    glTexDesc.fSampleCnt = desc.fSampleCnt;
-    glTexDesc.fTextureID = static_cast<GrGLuint>(desc.fTextureHandle);
-    glTexDesc.fIsWrapped = true;
-    bool renderTarget = SkToBool(desc.fFlags & kRenderTarget_GrBackendTextureFlag);
-    // FIXME:  this should be calling resolve_origin(), but Chrome code is currently
-    // assuming the old behaviour, which is that backend textures are always
-    // BottomLeft, even for non-RT's.  Once Chrome is fixed, change this to:
-    // glTexDesc.fOrigin = resolve_origin(desc.fOrigin, renderTarget);
-    if (kDefault_GrSurfaceOrigin == desc.fOrigin) {
-        glTexDesc.fOrigin = kBottomLeft_GrSurfaceOrigin;
-    } else {
-        glTexDesc.fOrigin = desc.fOrigin;
-    }
-
-    GrGLTexture* texture = NULL;
-    if (renderTarget) {
-        GrGLRenderTarget::Desc glRTDesc;
-        glRTDesc.fRTFBOID = 0;
-        glRTDesc.fTexFBOID = 0;
-        glRTDesc.fMSColorRenderbufferID = 0;
-        glRTDesc.fConfig = desc.fConfig;
-        glRTDesc.fSampleCnt = desc.fSampleCnt;
-        glRTDesc.fOrigin = glTexDesc.fOrigin;
-        glRTDesc.fCheckAllocation = false;
-        if (!this->createRenderTargetObjects(glTexDesc.fWidth,
-                                             glTexDesc.fHeight,
-                                             glTexDesc.fTextureID,
-                                             &glRTDesc)) {
-            return NULL;
-        }
-        texture = SkNEW_ARGS(GrGLTexture, (this, glTexDesc, glRTDesc));
-    } else {
-        texture = SkNEW_ARGS(GrGLTexture, (this, glTexDesc));
-    }
-    if (NULL == texture) {
-        return NULL;
-    }
-
-    return texture;
-}
-
-GrRenderTarget* GrGpuGL::onWrapBackendRenderTarget(const GrBackendRenderTargetDesc& desc) {
-    GrGLRenderTarget::Desc glDesc;
-    glDesc.fConfig = desc.fConfig;
-    glDesc.fRTFBOID = static_cast<GrGLuint>(desc.fRenderTargetHandle);
-    glDesc.fMSColorRenderbufferID = 0;
-    glDesc.fTexFBOID = GrGLRenderTarget::kUnresolvableFBOID;
-    glDesc.fSampleCnt = desc.fSampleCnt;
-    glDesc.fIsWrapped = true;
-    glDesc.fCheckAllocation = false;
-
-    glDesc.fOrigin = resolve_origin(desc.fOrigin, true);
-    GrGLIRect viewport;
-    viewport.fLeft   = 0;
-    viewport.fBottom = 0;
-    viewport.fWidth  = desc.fWidth;
-    viewport.fHeight = desc.fHeight;
-
-    GrRenderTarget* tgt = SkNEW_ARGS(GrGLRenderTarget,
-                                     (this, glDesc, viewport));
-    if (desc.fStencilBits) {
-        GrGLStencilBuffer::Format format;
-        format.fInternalFormat = GrGLStencilBuffer::kUnknownInternalFormat;
-        format.fPacked = false;
-        format.fStencilBits = desc.fStencilBits;
-        format.fTotalBits = desc.fStencilBits;
-        static const bool kIsSBWrapped = false;
-        GrGLStencilBuffer* sb = SkNEW_ARGS(GrGLStencilBuffer,
-                                           (this,
-                                            kIsSBWrapped,
-                                            0,
-                                            desc.fWidth,
-                                            desc.fHeight,
-                                            desc.fSampleCnt,
-                                            format));
-        tgt->setStencilBuffer(sb);
-        sb->unref();
-    }
-    return tgt;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-bool GrGpuGL::onWriteTexturePixels(GrTexture* texture,
-                                   int left, int top, int width, int height,
-                                   GrPixelConfig config, const void* buffer,
-                                   size_t rowBytes) {
-    if (NULL == buffer) {
-        return false;
-    }
-    GrGLTexture* glTex = static_cast<GrGLTexture*>(texture);
-
-    this->setScratchTextureUnit();
-    GL_CALL(BindTexture(GR_GL_TEXTURE_2D, glTex->textureID()));
-    GrGLTexture::Desc desc;
-    desc.fFlags = glTex->desc().fFlags;
-    desc.fWidth = glTex->width();
-    desc.fHeight = glTex->height();
-    desc.fConfig = glTex->config();
-    desc.fSampleCnt = glTex->desc().fSampleCnt;
-    desc.fTextureID = glTex->textureID();
-    desc.fOrigin = glTex->origin();
-
-    bool success = false;
-    if (GrPixelConfigIsCompressed(desc.fConfig)) {
-        // We check that config == desc.fConfig in GrGpuGL::canWriteTexturePixels()
-        SkASSERT(config == desc.fConfig);
-        success = this->uploadCompressedTexData(desc, buffer, false,
-                                                left, top, width, height);
-    } else {
-        success = this->uploadTexData(desc, false,
-                                      left, top, width, height,
-                                      config, buffer, rowBytes);
-    }
-
-    if (success) {
-        texture->impl()->dirtyMipMaps(true);
-        return true;
-    }
-
-    return false;
-}
-
-namespace {
-bool adjust_pixel_ops_params(int surfaceWidth,
-                             int surfaceHeight,
-                             size_t bpp,
-                             int* left, int* top, int* width, int* height,
-                             const void** data,
-                             size_t* rowBytes) {
-    if (!*rowBytes) {
-        *rowBytes = *width * bpp;
-    }
-
-    SkIRect subRect = SkIRect::MakeXYWH(*left, *top, *width, *height);
-    SkIRect bounds = SkIRect::MakeWH(surfaceWidth, surfaceHeight);
-
-    if (!subRect.intersect(bounds)) {
-        return false;
-    }
-    *data = reinterpret_cast<const void*>(reinterpret_cast<intptr_t>(*data) +
-          (subRect.fTop - *top) * *rowBytes + (subRect.fLeft - *left) * bpp);
-
-    *left = subRect.fLeft;
-    *top = subRect.fTop;
-    *width = subRect.width();
-    *height = subRect.height();
-    return true;
-}
-
-GrGLenum check_alloc_error(const GrTextureDesc& desc, const GrGLInterface* interface) {
-    if (SkToBool(desc.fFlags & kCheckAllocation_GrTextureFlagBit)) {
-        return GR_GL_GET_ERROR(interface);
-    } else {
-        return CHECK_ALLOC_ERROR(interface);
-    }
-}
-
-}
-
-bool GrGpuGL::uploadTexData(const GrGLTexture::Desc& desc,
-                            bool isNewTexture,
-                            int left, int top, int width, int height,
-                            GrPixelConfig dataConfig,
-                            const void* data,
-                            size_t rowBytes) {
-    SkASSERT(NULL != data || isNewTexture);
-
-    // If we're uploading compressed data then we should be using uploadCompressedTexData
-    SkASSERT(!GrPixelConfigIsCompressed(dataConfig));
-
-    size_t bpp = GrBytesPerPixel(dataConfig);
-    if (!adjust_pixel_ops_params(desc.fWidth, desc.fHeight, bpp, &left, &top,
-                                 &width, &height, &data, &rowBytes)) {
-        return false;
-    }
-    size_t trimRowBytes = width * bpp;
-
-    // in case we need a temporary, trimmed copy of the src pixels
-    GrAutoMalloc<128 * 128> tempStorage;
-
-    // paletted textures cannot be partially updated
-    // We currently lazily create MIPMAPs when the we see a draw with
-    // GrTextureParams::kMipMap_FilterMode. Using texture storage requires that the
-    // MIP levels are all created when the texture is created. So for now we don't use
-    // texture storage.
-    bool useTexStorage = false &&
-                         isNewTexture &&
-                         kIndex_8_GrPixelConfig != desc.fConfig &&
-                         this->glCaps().texStorageSupport();
-
-    if (useTexStorage && kGL_GrGLStandard == this->glStandard()) {
-        // 565 is not a sized internal format on desktop GL. So on desktop with
-        // 565 we always use an unsized internal format to let the system pick
-        // the best sized format to convert the 565 data to. Since TexStorage
-        // only allows sized internal formats we will instead use TexImage2D.
-        useTexStorage = desc.fConfig != kRGB_565_GrPixelConfig;
-    }
-
-    GrGLenum internalFormat;
-    GrGLenum externalFormat = 0x0; // suprress warning
-    GrGLenum externalType = 0x0;// suprress warning
-
-    // glTexStorage requires sized internal formats on both desktop and ES. ES2 requires an unsized
-    // format for glTexImage, unlike ES3 and desktop. However, we allow the driver to decide the
-    // size of the internal format whenever possible and so only use a sized internal format when
-    // using texture storage.
-    bool useSizedFormat = useTexStorage;
-    // At least some versions of the desktop ES3 drivers for NVIDIA won't accept GL_RED in
-    // glTexImage2D for the internal format but will accept GL_R8.
-    if (!useSizedFormat && kNVIDIA_GrGLVendor == this->glContext().vendor() &&
-        kGLES_GrGLStandard == this->glStandard() && this->glVersion() >= GR_GL_VER(3, 0)) {
-        useSizedFormat = true;
-    }
-    if (!this->configToGLFormats(dataConfig, useSizedFormat, &internalFormat,
-                                 &externalFormat, &externalType)) {
-        return false;
-    }
-
-    if (!isNewTexture && GR_GL_PALETTE8_RGBA8 == internalFormat) {
-        // paletted textures cannot be updated
-        return false;
-    }
-
-    /*
-     *  check whether to allocate a temporary buffer for flipping y or
-     *  because our srcData has extra bytes past each row. If so, we need
-     *  to trim those off here, since GL ES may not let us specify
-     *  GL_UNPACK_ROW_LENGTH.
-     */
-    bool restoreGLRowLength = false;
-    bool swFlipY = false;
-    bool glFlipY = false;
-    if (NULL != data) {
-        if (kBottomLeft_GrSurfaceOrigin == desc.fOrigin) {
-            if (this->glCaps().unpackFlipYSupport()) {
-                glFlipY = true;
-            } else {
-                swFlipY = true;
-            }
-        }
-        if (this->glCaps().unpackRowLengthSupport() && !swFlipY) {
-            // can't use this for flipping, only non-neg values allowed. :(
-            if (rowBytes != trimRowBytes) {
-                GrGLint rowLength = static_cast<GrGLint>(rowBytes / bpp);
-                GL_CALL(PixelStorei(GR_GL_UNPACK_ROW_LENGTH, rowLength));
-                restoreGLRowLength = true;
-            }
-        } else {
-            if (trimRowBytes != rowBytes || swFlipY) {
-                // copy data into our new storage, skipping the trailing bytes
-                size_t trimSize = height * trimRowBytes;
-                const char* src = (const char*)data;
-                if (swFlipY) {
-                    src += (height - 1) * rowBytes;
-                }
-                char* dst = (char*)tempStorage.reset(trimSize);
-                for (int y = 0; y < height; y++) {
-                    memcpy(dst, src, trimRowBytes);
-                    if (swFlipY) {
-                        src -= rowBytes;
-                    } else {
-                        src += rowBytes;
-                    }
-                    dst += trimRowBytes;
-                }
-                // now point data to our copied version
-                data = tempStorage.get();
-            }
-        }
-        if (glFlipY) {
-            GL_CALL(PixelStorei(GR_GL_UNPACK_FLIP_Y, GR_GL_TRUE));
-        }
-        GL_CALL(PixelStorei(GR_GL_UNPACK_ALIGNMENT,
-              static_cast<GrGLint>(GrUnpackAlignment(dataConfig))));
-    }
-    bool succeeded = true;
-    if (isNewTexture &&
-        0 == left && 0 == top &&
-        desc.fWidth == width && desc.fHeight == height) {
-        CLEAR_ERROR_BEFORE_ALLOC(this->glInterface());
-        if (useTexStorage) {
-            // We never resize  or change formats of textures.
-            GL_ALLOC_CALL(this->glInterface(),
-                          TexStorage2D(GR_GL_TEXTURE_2D,
-                                       1, // levels
-                                       internalFormat,
-                                       desc.fWidth, desc.fHeight));
-        } else {
-            if (GR_GL_PALETTE8_RGBA8 == internalFormat) {
-                GrGLsizei imageSize = desc.fWidth * desc.fHeight +
-                                      kGrColorTableSize;
-                GL_ALLOC_CALL(this->glInterface(),
-                              CompressedTexImage2D(GR_GL_TEXTURE_2D,
-                                                   0, // level
-                                                   internalFormat,
-                                                   desc.fWidth, desc.fHeight,
-                                                   0, // border
-                                                   imageSize,
-                                                   data));
-            } else {
-                GL_ALLOC_CALL(this->glInterface(),
-                              TexImage2D(GR_GL_TEXTURE_2D,
-                                         0, // level
-                                         internalFormat,
-                                         desc.fWidth, desc.fHeight,
-                                         0, // border
-                                         externalFormat, externalType,
-                                         data));
-            }
-        }
-        GrGLenum error = check_alloc_error(desc, this->glInterface());
-        if (error != GR_GL_NO_ERROR) {
-            succeeded = false;
-        } else {
-            // if we have data and we used TexStorage to create the texture, we
-            // now upload with TexSubImage.
-            if (NULL != data && useTexStorage) {
-                GL_CALL(TexSubImage2D(GR_GL_TEXTURE_2D,
-                                      0, // level
-                                      left, top,
-                                      width, height,
-                                      externalFormat, externalType,
-                                      data));
-            }
-        }
-    } else {
-        if (swFlipY || glFlipY) {
-            top = desc.fHeight - (top + height);
-        }
-        GL_CALL(TexSubImage2D(GR_GL_TEXTURE_2D,
-                              0, // level
-                              left, top,
-                              width, height,
-                              externalFormat, externalType, data));
-    }
-
-    if (restoreGLRowLength) {
-        SkASSERT(this->glCaps().unpackRowLengthSupport());
-        GL_CALL(PixelStorei(GR_GL_UNPACK_ROW_LENGTH, 0));
-    }
-    if (glFlipY) {
-        GL_CALL(PixelStorei(GR_GL_UNPACK_FLIP_Y, GR_GL_FALSE));
-    }
-    return succeeded;
-}
-
-// TODO: This function is using a lot of wonky semantics like, if width == -1
-// then set width = desc.fWdith ... blah. A better way to do it might be to 
-// create a CompressedTexData struct that takes a desc/ptr and figures out
-// the proper upload semantics. Then users can construct this function how they
-// see fit if they want to go against the "standard" way to do it.
-bool GrGpuGL::uploadCompressedTexData(const GrGLTexture::Desc& desc,
-                                      const void* data,
-                                      bool isNewTexture,
-                                      int left, int top, int width, int height) {
-    SkASSERT(NULL != data || isNewTexture);
-
-    // No support for software flip y, yet...
-    SkASSERT(kBottomLeft_GrSurfaceOrigin != desc.fOrigin);
-
-    if (-1 == width) {
-        width = desc.fWidth;
-    }
-#ifdef SK_DEBUG
-    else {
-        SkASSERT(width <= desc.fWidth);
-    }
-#endif
-
-    if (-1 == height) {
-        height = desc.fHeight;
-    }
-#ifdef SK_DEBUG
-    else {
-        SkASSERT(height <= desc.fHeight);
-    }
-#endif
-
-    // Make sure that the width and height that we pass to OpenGL
-    // is a multiple of the block size.
-    int dataSize = GrCompressedFormatDataSize(desc.fConfig, width, height);
-
-    // We only need the internal format for compressed 2D textures.
-    GrGLenum internalFormat = 0;
-    if (!this->configToGLFormats(desc.fConfig, false, &internalFormat, NULL, NULL)) {
-        return false;
-    }
-
-    bool succeeded = true;
-    CLEAR_ERROR_BEFORE_ALLOC(this->glInterface());
-
-    if (isNewTexture) {
-        GL_ALLOC_CALL(this->glInterface(),
-                      CompressedTexImage2D(GR_GL_TEXTURE_2D,
-                                           0, // level
-                                           internalFormat,
-                                           width, height,
-                                           0, // border
-                                           dataSize,
-                                           data));
-    } else {
-        GL_ALLOC_CALL(this->glInterface(),
-                      CompressedTexSubImage2D(GR_GL_TEXTURE_2D,
-                                              0, // level
-                                              left, top,
-                                              width, height,
-                                              internalFormat,
-                                              dataSize,
-                                              data));
-    }
-
-    GrGLenum error = check_alloc_error(desc, this->glInterface());
-    if (error != GR_GL_NO_ERROR) {
-        succeeded = false;
-    }
-    return succeeded;
-}
-
-static bool renderbuffer_storage_msaa(GrGLContext& ctx,
-                                      int sampleCount,
-                                      GrGLenum format,
-                                      int width, int height) {
-    CLEAR_ERROR_BEFORE_ALLOC(ctx.interface());
-    SkASSERT(GrGLCaps::kNone_MSFBOType != ctx.caps()->msFBOType());
-    switch (ctx.caps()->msFBOType()) {
-        case GrGLCaps::kDesktop_ARB_MSFBOType:
-        case GrGLCaps::kDesktop_EXT_MSFBOType:
-        case GrGLCaps::kES_3_0_MSFBOType:
-            GL_ALLOC_CALL(ctx.interface(),
-                            RenderbufferStorageMultisample(GR_GL_RENDERBUFFER,
-                                                            sampleCount,
-                                                            format,
-                                                            width, height));
-            break;
-        case GrGLCaps::kES_Apple_MSFBOType:
-            GL_ALLOC_CALL(ctx.interface(),
-                            RenderbufferStorageMultisampleES2APPLE(GR_GL_RENDERBUFFER,
-                                                                    sampleCount,
-                                                                    format,
-                                                                    width, height));
-            break;
-        case GrGLCaps::kES_EXT_MsToTexture_MSFBOType:
-        case GrGLCaps::kES_IMG_MsToTexture_MSFBOType:
-            GL_ALLOC_CALL(ctx.interface(),
-                            RenderbufferStorageMultisampleES2EXT(GR_GL_RENDERBUFFER,
-                                                                sampleCount,
-                                                                format,
-                                                                width, height));
-            break;
-        case GrGLCaps::kNone_MSFBOType:
-            SkFAIL("Shouldn't be here if we don't support multisampled renderbuffers.");
-            break;
-    }
-    return (GR_GL_NO_ERROR == CHECK_ALLOC_ERROR(ctx.interface()));;
-}
-
-bool GrGpuGL::createRenderTargetObjects(int width, int height,
-                                        GrGLuint texID,
-                                        GrGLRenderTarget::Desc* desc) {
-    desc->fMSColorRenderbufferID = 0;
-    desc->fRTFBOID = 0;
-    desc->fTexFBOID = 0;
-    desc->fIsWrapped = false;
-
-    GrGLenum status;
-
-    GrGLenum msColorFormat = 0; // suppress warning
-
-    if (desc->fSampleCnt > 0 && GrGLCaps::kNone_MSFBOType == this->glCaps().msFBOType()) {
-        goto FAILED;
-    }
-
-    GL_CALL(GenFramebuffers(1, &desc->fTexFBOID));
-    if (!desc->fTexFBOID) {
-        goto FAILED;
-    }
-
-
-    // If we are using multisampling we will create two FBOS. We render to one and then resolve to
-    // the texture bound to the other. The exception is the IMG multisample extension. With this
-    // extension the texture is multisampled when rendered to and then auto-resolves it when it is
-    // rendered from.
-    if (desc->fSampleCnt > 0 && this->glCaps().usesMSAARenderBuffers()) {
-        GL_CALL(GenFramebuffers(1, &desc->fRTFBOID));
-        GL_CALL(GenRenderbuffers(1, &desc->fMSColorRenderbufferID));
-        if (!desc->fRTFBOID ||
-            !desc->fMSColorRenderbufferID ||
-            !this->configToGLFormats(desc->fConfig,
-                                     // ES2 and ES3 require sized internal formats for rb storage.
-                                     kGLES_GrGLStandard == this->glStandard(),
-                                     &msColorFormat,
-                                     NULL,
-                                     NULL)) {
-            goto FAILED;
-        }
-    } else {
-        desc->fRTFBOID = desc->fTexFBOID;
-    }
-
-    // below here we may bind the FBO
-    fHWBoundRenderTargetUniqueID = SK_InvalidUniqueID;
-    if (desc->fRTFBOID != desc->fTexFBOID) {
-        SkASSERT(desc->fSampleCnt > 0);
-        GL_CALL(BindRenderbuffer(GR_GL_RENDERBUFFER,
-                               desc->fMSColorRenderbufferID));
-        if (!renderbuffer_storage_msaa(fGLContext,
-                                       desc->fSampleCnt,
-                                       msColorFormat,
-                                       width, height)) {
-            goto FAILED;
-        }
-        GL_CALL(BindFramebuffer(GR_GL_FRAMEBUFFER, desc->fRTFBOID));
-        GL_CALL(FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
-                                      GR_GL_COLOR_ATTACHMENT0,
-                                      GR_GL_RENDERBUFFER,
-                                      desc->fMSColorRenderbufferID));
-        if (desc->fCheckAllocation ||
-            !this->glCaps().isConfigVerifiedColorAttachment(desc->fConfig)) {
-            GL_CALL_RET(status, CheckFramebufferStatus(GR_GL_FRAMEBUFFER));
-            if (status != GR_GL_FRAMEBUFFER_COMPLETE) {
-                goto FAILED;
-            }
-            fGLContext.caps()->markConfigAsValidColorAttachment(desc->fConfig);
-        }
-    }
-    GL_CALL(BindFramebuffer(GR_GL_FRAMEBUFFER, desc->fTexFBOID));
-
-    if (this->glCaps().usesImplicitMSAAResolve() && desc->fSampleCnt > 0) {
-        GL_CALL(FramebufferTexture2DMultisample(GR_GL_FRAMEBUFFER,
-                                                GR_GL_COLOR_ATTACHMENT0,
-                                                GR_GL_TEXTURE_2D,
-                                                texID, 0, desc->fSampleCnt));
-    } else {
-        GL_CALL(FramebufferTexture2D(GR_GL_FRAMEBUFFER,
-                                     GR_GL_COLOR_ATTACHMENT0,
-                                     GR_GL_TEXTURE_2D,
-                                     texID, 0));
-    }
-    if (desc->fCheckAllocation ||
-        !this->glCaps().isConfigVerifiedColorAttachment(desc->fConfig)) {
-        GL_CALL_RET(status, CheckFramebufferStatus(GR_GL_FRAMEBUFFER));
-        if (status != GR_GL_FRAMEBUFFER_COMPLETE) {
-            goto FAILED;
-        }
-        fGLContext.caps()->markConfigAsValidColorAttachment(desc->fConfig);
-    }
-
-    return true;
-
-FAILED:
-    if (desc->fMSColorRenderbufferID) {
-        GL_CALL(DeleteRenderbuffers(1, &desc->fMSColorRenderbufferID));
-    }
-    if (desc->fRTFBOID != desc->fTexFBOID) {
-        GL_CALL(DeleteFramebuffers(1, &desc->fRTFBOID));
-    }
-    if (desc->fTexFBOID) {
-        GL_CALL(DeleteFramebuffers(1, &desc->fTexFBOID));
-    }
-    return false;
-}
-
-// good to set a break-point here to know when createTexture fails
-static GrTexture* return_null_texture() {
-//    SkDEBUGFAIL("null texture");
-    return NULL;
-}
-
-#if 0 && defined(SK_DEBUG)
-static size_t as_size_t(int x) {
-    return x;
-}
-#endif
-
-GrTexture* GrGpuGL::onCreateTexture(const GrTextureDesc& desc,
-                                    const void* srcData,
-                                    size_t rowBytes) {
-
-    GrGLTexture::Desc glTexDesc;
-    GrGLRenderTarget::Desc  glRTDesc;
-
-    // Attempt to catch un- or wrongly initialized sample counts;
-    SkASSERT(desc.fSampleCnt >= 0 && desc.fSampleCnt <= 64);
-    // We fail if the MSAA was requested and is not available.
-    if (GrGLCaps::kNone_MSFBOType == this->glCaps().msFBOType() && desc.fSampleCnt) {
-        //GrPrintf("MSAA RT requested but not supported on this platform.");
-        return return_null_texture();
-    }
-    // If the sample count exceeds the max then we clamp it.
-    glTexDesc.fSampleCnt = SkTMin(desc.fSampleCnt, this->caps()->maxSampleCount());
-
-    glTexDesc.fFlags  = desc.fFlags;
-    glTexDesc.fWidth  = desc.fWidth;
-    glTexDesc.fHeight = desc.fHeight;
-    glTexDesc.fConfig = desc.fConfig;
-    glTexDesc.fIsWrapped = false;
-
-    glRTDesc.fMSColorRenderbufferID = 0;
-    glRTDesc.fRTFBOID = 0;
-    glRTDesc.fTexFBOID = 0;
-    glRTDesc.fIsWrapped = false;
-    glRTDesc.fConfig = glTexDesc.fConfig;
-    glRTDesc.fCheckAllocation = SkToBool(desc.fFlags & kCheckAllocation_GrTextureFlagBit);
-
-    bool renderTarget = SkToBool(desc.fFlags & kRenderTarget_GrTextureFlagBit);
-
-    glTexDesc.fOrigin = resolve_origin(desc.fOrigin, renderTarget);
-    glRTDesc.fOrigin = glTexDesc.fOrigin;
-
-    glRTDesc.fSampleCnt = glTexDesc.fSampleCnt;
-    if (GrGLCaps::kNone_MSFBOType == this->glCaps().msFBOType() &&
-        desc.fSampleCnt) {
-        //GrPrintf("MSAA RT requested but not supported on this platform.");
-        return return_null_texture();
-    }
-
-    if (renderTarget) {
-        int maxRTSize = this->caps()->maxRenderTargetSize();
-        if (glTexDesc.fWidth > maxRTSize || glTexDesc.fHeight > maxRTSize) {
-            return return_null_texture();
-        }
-    } else {
-        int maxSize = this->caps()->maxTextureSize();
-        if (glTexDesc.fWidth > maxSize || glTexDesc.fHeight > maxSize) {
-            return return_null_texture();
-        }
-    }
-
-    GL_CALL(GenTextures(1, &glTexDesc.fTextureID));
-
-    if (!glTexDesc.fTextureID) {
-        return return_null_texture();
-    }
-
-    this->setScratchTextureUnit();
-    GL_CALL(BindTexture(GR_GL_TEXTURE_2D, glTexDesc.fTextureID));
-
-    if (renderTarget && this->glCaps().textureUsageSupport()) {
-        // provides a hint about how this texture will be used
-        GL_CALL(TexParameteri(GR_GL_TEXTURE_2D,
-                              GR_GL_TEXTURE_USAGE,
-                              GR_GL_FRAMEBUFFER_ATTACHMENT));
-    }
-
-    // Some drivers like to know filter/wrap before seeing glTexImage2D. Some
-    // drivers have a bug where an FBO won't be complete if it includes a
-    // texture that is not mipmap complete (considering the filter in use).
-    GrGLTexture::TexParams initialTexParams;
-    // we only set a subset here so invalidate first
-    initialTexParams.invalidate();
-    initialTexParams.fMinFilter = GR_GL_NEAREST;
-    initialTexParams.fMagFilter = GR_GL_NEAREST;
-    initialTexParams.fWrapS = GR_GL_CLAMP_TO_EDGE;
-    initialTexParams.fWrapT = GR_GL_CLAMP_TO_EDGE;
-    GL_CALL(TexParameteri(GR_GL_TEXTURE_2D,
-                          GR_GL_TEXTURE_MAG_FILTER,
-                          initialTexParams.fMagFilter));
-    GL_CALL(TexParameteri(GR_GL_TEXTURE_2D,
-                          GR_GL_TEXTURE_MIN_FILTER,
-                          initialTexParams.fMinFilter));
-    GL_CALL(TexParameteri(GR_GL_TEXTURE_2D,
-                          GR_GL_TEXTURE_WRAP_S,
-                          initialTexParams.fWrapS));
-    GL_CALL(TexParameteri(GR_GL_TEXTURE_2D,
-                          GR_GL_TEXTURE_WRAP_T,
-                          initialTexParams.fWrapT));
-    if (!this->uploadTexData(glTexDesc, true, 0, 0,
-                             glTexDesc.fWidth, glTexDesc.fHeight,
-                             desc.fConfig, srcData, rowBytes)) {
-        GL_CALL(DeleteTextures(1, &glTexDesc.fTextureID));
-        return return_null_texture();
-    }
-
-    GrGLTexture* tex;
-    if (renderTarget) {
-        // unbind the texture from the texture unit before binding it to the frame buffer
-        GL_CALL(BindTexture(GR_GL_TEXTURE_2D, 0));
-
-        if (!this->createRenderTargetObjects(glTexDesc.fWidth,
-                                             glTexDesc.fHeight,
-                                             glTexDesc.fTextureID,
-                                             &glRTDesc)) {
-            GL_CALL(DeleteTextures(1, &glTexDesc.fTextureID));
-            return return_null_texture();
-        }
-        tex = SkNEW_ARGS(GrGLTexture, (this, glTexDesc, glRTDesc));
-    } else {
-        tex = SkNEW_ARGS(GrGLTexture, (this, glTexDesc));
-    }
-    tex->setCachedTexParams(initialTexParams, this->getResetTimestamp());
-#ifdef TRACE_TEXTURE_CREATION
-    GrPrintf("--- new texture [%d] size=(%d %d) config=%d\n",
-             glTexDesc.fTextureID, desc.fWidth, desc.fHeight, desc.fConfig);
-#endif
-    return tex;
-}
-
-GrTexture* GrGpuGL::onCreateCompressedTexture(const GrTextureDesc& desc,
-                                              const void* srcData) {
-
-    if(SkToBool(desc.fFlags & kRenderTarget_GrTextureFlagBit)) {
-        return return_null_texture();
-    }
-
-    // Make sure that we're not flipping Y.
-    GrSurfaceOrigin texOrigin = resolve_origin(desc.fOrigin, false);
-    if (kBottomLeft_GrSurfaceOrigin == texOrigin) {
-        return return_null_texture();
-    }
-
-    GrGLTexture::Desc glTexDesc;
-
-    glTexDesc.fFlags  = desc.fFlags;
-    glTexDesc.fWidth  = desc.fWidth;
-    glTexDesc.fHeight = desc.fHeight;
-    glTexDesc.fConfig = desc.fConfig;
-    glTexDesc.fIsWrapped = false;
-    glTexDesc.fOrigin = texOrigin;
-
-    int maxSize = this->caps()->maxTextureSize();
-    if (glTexDesc.fWidth > maxSize || glTexDesc.fHeight > maxSize) {
-        return return_null_texture();
-    }
-
-    GL_CALL(GenTextures(1, &glTexDesc.fTextureID));
-
-    if (!glTexDesc.fTextureID) {
-        return return_null_texture();
-    }
-
-    this->setScratchTextureUnit();
-    GL_CALL(BindTexture(GR_GL_TEXTURE_2D, glTexDesc.fTextureID));
-
-    // Some drivers like to know filter/wrap before seeing glTexImage2D. Some
-    // drivers have a bug where an FBO won't be complete if it includes a
-    // texture that is not mipmap complete (considering the filter in use).
-    GrGLTexture::TexParams initialTexParams;
-    // we only set a subset here so invalidate first
-    initialTexParams.invalidate();
-    initialTexParams.fMinFilter = GR_GL_NEAREST;
-    initialTexParams.fMagFilter = GR_GL_NEAREST;
-    initialTexParams.fWrapS = GR_GL_CLAMP_TO_EDGE;
-    initialTexParams.fWrapT = GR_GL_CLAMP_TO_EDGE;
-    GL_CALL(TexParameteri(GR_GL_TEXTURE_2D,
-                          GR_GL_TEXTURE_MAG_FILTER,
-                          initialTexParams.fMagFilter));
-    GL_CALL(TexParameteri(GR_GL_TEXTURE_2D,
-                          GR_GL_TEXTURE_MIN_FILTER,
-                          initialTexParams.fMinFilter));
-    GL_CALL(TexParameteri(GR_GL_TEXTURE_2D,
-                          GR_GL_TEXTURE_WRAP_S,
-                          initialTexParams.fWrapS));
-    GL_CALL(TexParameteri(GR_GL_TEXTURE_2D,
-                          GR_GL_TEXTURE_WRAP_T,
-                          initialTexParams.fWrapT));
-
-    if (!this->uploadCompressedTexData(glTexDesc, srcData)) {
-        GL_CALL(DeleteTextures(1, &glTexDesc.fTextureID));
-        return return_null_texture();
-    }
-
-    GrGLTexture* tex;
-    tex = SkNEW_ARGS(GrGLTexture, (this, glTexDesc));
-    tex->setCachedTexParams(initialTexParams, this->getResetTimestamp());
-#ifdef TRACE_TEXTURE_CREATION
-    GrPrintf("--- new compressed texture [%d] size=(%d %d) config=%d\n",
-             glTexDesc.fTextureID, desc.fWidth, desc.fHeight, desc.fConfig);
-#endif
-    return tex;
-}
-
-namespace {
-
-const GrGLuint kUnknownBitCount = GrGLStencilBuffer::kUnknownBitCount;
-
-void inline get_stencil_rb_sizes(const GrGLInterface* gl,
-                                 GrGLStencilBuffer::Format* format) {
-
-    // we shouldn't ever know one size and not the other
-    SkASSERT((kUnknownBitCount == format->fStencilBits) ==
-             (kUnknownBitCount == format->fTotalBits));
-    if (kUnknownBitCount == format->fStencilBits) {
-        GR_GL_GetRenderbufferParameteriv(gl, GR_GL_RENDERBUFFER,
-                                         GR_GL_RENDERBUFFER_STENCIL_SIZE,
-                                         (GrGLint*)&format->fStencilBits);
-        if (format->fPacked) {
-            GR_GL_GetRenderbufferParameteriv(gl, GR_GL_RENDERBUFFER,
-                                             GR_GL_RENDERBUFFER_DEPTH_SIZE,
-                                             (GrGLint*)&format->fTotalBits);
-            format->fTotalBits += format->fStencilBits;
-        } else {
-            format->fTotalBits = format->fStencilBits;
-        }
-    }
-}
-}
-
-bool GrGpuGL::createStencilBufferForRenderTarget(GrRenderTarget* rt,
-                                                 int width, int height) {
-
-    // All internally created RTs are also textures. We don't create
-    // SBs for a client's standalone RT (that is a RT that isn't also a texture).
-    SkASSERT(rt->asTexture());
-    SkASSERT(width >= rt->width());
-    SkASSERT(height >= rt->height());
-
-    int samples = rt->numSamples();
-    GrGLuint sbID;
-    GL_CALL(GenRenderbuffers(1, &sbID));
-    if (!sbID) {
-        return false;
-    }
-
-    int stencilFmtCnt = this->glCaps().stencilFormats().count();
-    for (int i = 0; i < stencilFmtCnt; ++i) {
-        GL_CALL(BindRenderbuffer(GR_GL_RENDERBUFFER, sbID));
-        // we start with the last stencil format that succeeded in hopes
-        // that we won't go through this loop more than once after the
-        // first (painful) stencil creation.
-        int sIdx = (i + fLastSuccessfulStencilFmtIdx) % stencilFmtCnt;
-        const GrGLCaps::StencilFormat& sFmt =
-                this->glCaps().stencilFormats()[sIdx];
-        CLEAR_ERROR_BEFORE_ALLOC(this->glInterface());
-        // we do this "if" so that we don't call the multisample
-        // version on a GL that doesn't have an MSAA extension.
-        bool created;
-        if (samples > 0) {
-            created = renderbuffer_storage_msaa(fGLContext,
-                                                samples,
-                                                sFmt.fInternalFormat,
-                                                width, height);
-        } else {
-            GL_ALLOC_CALL(this->glInterface(),
-                          RenderbufferStorage(GR_GL_RENDERBUFFER,
-                                              sFmt.fInternalFormat,
-                                              width, height));
-            created =
-                (GR_GL_NO_ERROR == check_alloc_error(rt->desc(), this->glInterface()));
-        }
-        if (created) {
-            // After sized formats we attempt an unsized format and take
-            // whatever sizes GL gives us. In that case we query for the size.
-            GrGLStencilBuffer::Format format = sFmt;
-            get_stencil_rb_sizes(this->glInterface(), &format);
-            static const bool kIsWrapped = false;
-            SkAutoTUnref<GrStencilBuffer> sb(SkNEW_ARGS(GrGLStencilBuffer,
-                                                  (this, kIsWrapped, sbID, width, height,
-                                                  samples, format)));
-            if (this->attachStencilBufferToRenderTarget(sb, rt)) {
-                fLastSuccessfulStencilFmtIdx = sIdx;
-                sb->transferToCache();
-                rt->setStencilBuffer(sb);
-                return true;
-           }
-           sb->abandon(); // otherwise we lose sbID
-        }
-    }
-    GL_CALL(DeleteRenderbuffers(1, &sbID));
-    return false;
-}
-
-bool GrGpuGL::attachStencilBufferToRenderTarget(GrStencilBuffer* sb, GrRenderTarget* rt) {
-    GrGLRenderTarget* glrt = (GrGLRenderTarget*) rt;
-
-    GrGLuint fbo = glrt->renderFBOID();
-
-    if (NULL == sb) {
-        if (NULL != rt->getStencilBuffer()) {
-            GL_CALL(FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
-                                            GR_GL_STENCIL_ATTACHMENT,
-                                            GR_GL_RENDERBUFFER, 0));
-            GL_CALL(FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
-                                            GR_GL_DEPTH_ATTACHMENT,
-                                            GR_GL_RENDERBUFFER, 0));
-#ifdef SK_DEBUG
-            GrGLenum status;
-            GL_CALL_RET(status, CheckFramebufferStatus(GR_GL_FRAMEBUFFER));
-            SkASSERT(GR_GL_FRAMEBUFFER_COMPLETE == status);
-#endif
-        }
-        return true;
-    } else {
-        GrGLStencilBuffer* glsb = static_cast<GrGLStencilBuffer*>(sb);
-        GrGLuint rb = glsb->renderbufferID();
-
-        fHWBoundRenderTargetUniqueID = SK_InvalidUniqueID;
-        GL_CALL(BindFramebuffer(GR_GL_FRAMEBUFFER, fbo));
-        GL_CALL(FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
-                                        GR_GL_STENCIL_ATTACHMENT,
-                                        GR_GL_RENDERBUFFER, rb));
-        if (glsb->format().fPacked) {
-            GL_CALL(FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
-                                            GR_GL_DEPTH_ATTACHMENT,
-                                            GR_GL_RENDERBUFFER, rb));
-        } else {
-            GL_CALL(FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
-                                            GR_GL_DEPTH_ATTACHMENT,
-                                            GR_GL_RENDERBUFFER, 0));
-        }
-
-        GrGLenum status;
-        if (!this->glCaps().isColorConfigAndStencilFormatVerified(rt->config(), glsb->format())) {
-            GL_CALL_RET(status, CheckFramebufferStatus(GR_GL_FRAMEBUFFER));
-            if (status != GR_GL_FRAMEBUFFER_COMPLETE) {
-                GL_CALL(FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
-                                              GR_GL_STENCIL_ATTACHMENT,
-                                              GR_GL_RENDERBUFFER, 0));
-                if (glsb->format().fPacked) {
-                    GL_CALL(FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
-                                                  GR_GL_DEPTH_ATTACHMENT,
-                                                  GR_GL_RENDERBUFFER, 0));
-                }
-                return false;
-            } else {
-                fGLContext.caps()->markColorConfigAndStencilFormatAsVerified(
-                    rt->config(),
-                    glsb->format());
-            }
-        }
-        return true;
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-GrVertexBuffer* GrGpuGL::onCreateVertexBuffer(size_t size, bool dynamic) {
-    GrGLVertexBuffer::Desc desc;
-    desc.fDynamic = dynamic;
-    desc.fSizeInBytes = size;
-    desc.fIsWrapped = false;
-
-    if (this->glCaps().useNonVBOVertexAndIndexDynamicData() && desc.fDynamic) {
-        desc.fID = 0;
-        GrGLVertexBuffer* vertexBuffer = SkNEW_ARGS(GrGLVertexBuffer, (this, desc));
-        return vertexBuffer;
-    } else {
-        GL_CALL(GenBuffers(1, &desc.fID));
-        if (desc.fID) {
-            fHWGeometryState.setVertexBufferID(this, desc.fID);
-            CLEAR_ERROR_BEFORE_ALLOC(this->glInterface());
-            // make sure driver can allocate memory for this buffer
-            GL_ALLOC_CALL(this->glInterface(),
-                          BufferData(GR_GL_ARRAY_BUFFER,
-                                     (GrGLsizeiptr) desc.fSizeInBytes,
-                                     NULL,   // data ptr
-                                     desc.fDynamic ? GR_GL_DYNAMIC_DRAW : GR_GL_STATIC_DRAW));
-            if (CHECK_ALLOC_ERROR(this->glInterface()) != GR_GL_NO_ERROR) {
-                GL_CALL(DeleteBuffers(1, &desc.fID));
-                this->notifyVertexBufferDelete(desc.fID);
-                return NULL;
-            }
-            GrGLVertexBuffer* vertexBuffer = SkNEW_ARGS(GrGLVertexBuffer, (this, desc));
-            return vertexBuffer;
-        }
-        return NULL;
-    }
-}
-
-GrIndexBuffer* GrGpuGL::onCreateIndexBuffer(size_t size, bool dynamic) {
-    GrGLIndexBuffer::Desc desc;
-    desc.fDynamic = dynamic;
-    desc.fSizeInBytes = size;
-    desc.fIsWrapped = false;
-
-    if (this->glCaps().useNonVBOVertexAndIndexDynamicData() && desc.fDynamic) {
-        desc.fID = 0;
-        GrIndexBuffer* indexBuffer = SkNEW_ARGS(GrGLIndexBuffer, (this, desc));
-        return indexBuffer;
-    } else {
-        GL_CALL(GenBuffers(1, &desc.fID));
-        if (desc.fID) {
-            fHWGeometryState.setIndexBufferIDOnDefaultVertexArray(this, desc.fID);
-            CLEAR_ERROR_BEFORE_ALLOC(this->glInterface());
-            // make sure driver can allocate memory for this buffer
-            GL_ALLOC_CALL(this->glInterface(),
-                          BufferData(GR_GL_ELEMENT_ARRAY_BUFFER,
-                                     (GrGLsizeiptr) desc.fSizeInBytes,
-                                     NULL,  // data ptr
-                                     desc.fDynamic ? GR_GL_DYNAMIC_DRAW : GR_GL_STATIC_DRAW));
-            if (CHECK_ALLOC_ERROR(this->glInterface()) != GR_GL_NO_ERROR) {
-                GL_CALL(DeleteBuffers(1, &desc.fID));
-                this->notifyIndexBufferDelete(desc.fID);
-                return NULL;
-            }
-            GrIndexBuffer* indexBuffer = SkNEW_ARGS(GrGLIndexBuffer, (this, desc));
-            return indexBuffer;
-        }
-        return NULL;
-    }
-}
-
-GrPath* GrGpuGL::onCreatePath(const SkPath& inPath, const SkStrokeRec& stroke) {
-    SkASSERT(this->caps()->pathRenderingSupport());
-    return SkNEW_ARGS(GrGLPath, (this, inPath, stroke));
-}
-
-GrPathRange* GrGpuGL::onCreatePathRange(size_t size, const SkStrokeRec& stroke) {
-    SkASSERT(this->caps()->pathRenderingSupport());
-    return SkNEW_ARGS(GrGLPathRange, (this, size, stroke));
-}
-
-void GrGpuGL::flushScissor() {
-    if (fScissorState.fEnabled) {
-        // Only access the RT if scissoring is being enabled. We can call this before performing
-        // a glBitframebuffer for a surface->surface copy, which requires no RT to be bound to the
-        // GrDrawState.
-        const GrDrawState& drawState = this->getDrawState();
-        const GrGLRenderTarget* rt =
-            static_cast<const GrGLRenderTarget*>(drawState.getRenderTarget());
-
-        SkASSERT(NULL != rt);
-        const GrGLIRect& vp = rt->getViewport();
-        GrGLIRect scissor;
-        scissor.setRelativeTo(vp,
-                              fScissorState.fRect.fLeft,
-                              fScissorState.fRect.fTop,
-                              fScissorState.fRect.width(),
-                              fScissorState.fRect.height(),
-                              rt->origin());
-        // if the scissor fully contains the viewport then we fall through and
-        // disable the scissor test.
-        if (!scissor.contains(vp)) {
-            if (fHWScissorSettings.fRect != scissor) {
-                scissor.pushToGLScissor(this->glInterface());
-                fHWScissorSettings.fRect = scissor;
-            }
-            if (kYes_TriState != fHWScissorSettings.fEnabled) {
-                GL_CALL(Enable(GR_GL_SCISSOR_TEST));
-                fHWScissorSettings.fEnabled = kYes_TriState;
-            }
-            return;
-        }
-    }
-    if (kNo_TriState != fHWScissorSettings.fEnabled) {
-        GL_CALL(Disable(GR_GL_SCISSOR_TEST));
-        fHWScissorSettings.fEnabled = kNo_TriState;
-        return;
-    }
-}
-
-void GrGpuGL::onClear(const SkIRect* rect, GrColor color, bool canIgnoreRect) {
-    const GrDrawState& drawState = this->getDrawState();
-    const GrRenderTarget* rt = drawState.getRenderTarget();
-    // parent class should never let us get here with no RT
-    SkASSERT(NULL != rt);
-
-    if (canIgnoreRect && this->glCaps().fullClearIsFree()) {
-        rect = NULL;
-    }
-
-    SkIRect clippedRect;
-    if (NULL != rect) {
-        // flushScissor expects rect to be clipped to the target.
-        clippedRect = *rect;
-        SkIRect rtRect = SkIRect::MakeWH(rt->width(), rt->height());
-        if (clippedRect.intersect(rtRect)) {
-            rect = &clippedRect;
-        } else {
-            return;
-        }
-    }
-
-    this->flushRenderTarget(rect);
-    GrAutoTRestore<ScissorState> asr(&fScissorState);
-    fScissorState.fEnabled = (NULL != rect);
-    if (fScissorState.fEnabled) {
-        fScissorState.fRect = *rect;
-    }
-    this->flushScissor();
-
-    GrGLfloat r, g, b, a;
-    static const GrGLfloat scale255 = 1.f / 255.f;
-    a = GrColorUnpackA(color) * scale255;
-    GrGLfloat scaleRGB = scale255;
-    r = GrColorUnpackR(color) * scaleRGB;
-    g = GrColorUnpackG(color) * scaleRGB;
-    b = GrColorUnpackB(color) * scaleRGB;
-
-    GL_CALL(ColorMask(GR_GL_TRUE, GR_GL_TRUE, GR_GL_TRUE, GR_GL_TRUE));
-    fHWWriteToColor = kYes_TriState;
-    GL_CALL(ClearColor(r, g, b, a));
-    GL_CALL(Clear(GR_GL_COLOR_BUFFER_BIT));
-}
-
-void GrGpuGL::discard(GrRenderTarget* renderTarget) {
-    if (!this->caps()->discardRenderTargetSupport()) {
-        return;
-    }
-    if (NULL == renderTarget) {
-        renderTarget = this->drawState()->getRenderTarget();
-        if (NULL == renderTarget) {
-            return;
-        }
-    }
-
-    GrGLRenderTarget* glRT = static_cast<GrGLRenderTarget*>(renderTarget);
-    if (renderTarget->getUniqueID() != fHWBoundRenderTargetUniqueID) {
-        fHWBoundRenderTargetUniqueID = SK_InvalidUniqueID;
-        GL_CALL(BindFramebuffer(GR_GL_FRAMEBUFFER, glRT->renderFBOID()));
-    }
-    switch (this->glCaps().invalidateFBType()) {
-        case GrGLCaps::kNone_FBFetchType:
-            SkFAIL("Should never get here.");
-            break;
-        case GrGLCaps::kInvalidate_InvalidateFBType:
-            if (0 == glRT->renderFBOID()) {
-                //  When rendering to the default framebuffer the legal values for attachments
-                //  are GL_COLOR, GL_DEPTH, GL_STENCIL, ... rather than the various FBO attachment
-                //  types.
-                static const GrGLenum attachments[] = { GR_GL_COLOR };
-                GL_CALL(InvalidateFramebuffer(GR_GL_FRAMEBUFFER, SK_ARRAY_COUNT(attachments),
-                        attachments));
-            } else {
-                static const GrGLenum attachments[] = { GR_GL_COLOR_ATTACHMENT0 };
-                GL_CALL(InvalidateFramebuffer(GR_GL_FRAMEBUFFER, SK_ARRAY_COUNT(attachments),
-                        attachments));
-            }
-            break;
-        case GrGLCaps::kDiscard_InvalidateFBType: {
-            if (0 == glRT->renderFBOID()) {
-                //  When rendering to the default framebuffer the legal values for attachments
-                //  are GL_COLOR, GL_DEPTH, GL_STENCIL, ... rather than the various FBO attachment
-                //  types. See glDiscardFramebuffer() spec.
-                static const GrGLenum attachments[] = { GR_GL_COLOR };
-                GL_CALL(DiscardFramebuffer(GR_GL_FRAMEBUFFER, SK_ARRAY_COUNT(attachments),
-                        attachments));
-            } else {
-                static const GrGLenum attachments[] = { GR_GL_COLOR_ATTACHMENT0 };
-                GL_CALL(DiscardFramebuffer(GR_GL_FRAMEBUFFER, SK_ARRAY_COUNT(attachments),
-                        attachments));
-            }
-            break;
-        }
-    }
-    renderTarget->flagAsResolved();
-}
-
-
-void GrGpuGL::clearStencil() {
-    if (NULL == this->getDrawState().getRenderTarget()) {
-        return;
-    }
-
-    this->flushRenderTarget(&SkIRect::EmptyIRect());
-
-    GrAutoTRestore<ScissorState> asr(&fScissorState);
-    fScissorState.fEnabled = false;
-    this->flushScissor();
-
-    GL_CALL(StencilMask(0xffffffff));
-    GL_CALL(ClearStencil(0));
-    GL_CALL(Clear(GR_GL_STENCIL_BUFFER_BIT));
-    fHWStencilSettings.invalidate();
-}
-
-void GrGpuGL::clearStencilClip(const SkIRect& rect, bool insideClip) {
-    const GrDrawState& drawState = this->getDrawState();
-    const GrRenderTarget* rt = drawState.getRenderTarget();
-    SkASSERT(NULL != rt);
-
-    // this should only be called internally when we know we have a
-    // stencil buffer.
-    SkASSERT(NULL != rt->getStencilBuffer());
-    GrGLint stencilBitCount =  rt->getStencilBuffer()->bits();
-#if 0
-    SkASSERT(stencilBitCount > 0);
-    GrGLint clipStencilMask  = (1 << (stencilBitCount - 1));
-#else
-    // we could just clear the clip bit but when we go through
-    // ANGLE a partial stencil mask will cause clears to be
-    // turned into draws. Our contract on GrDrawTarget says that
-    // changing the clip between stencil passes may or may not
-    // zero the client's clip bits. So we just clear the whole thing.
-    static const GrGLint clipStencilMask  = ~0;
-#endif
-    GrGLint value;
-    if (insideClip) {
-        value = (1 << (stencilBitCount - 1));
-    } else {
-        value = 0;
-    }
-    this->flushRenderTarget(&SkIRect::EmptyIRect());
-
-    GrAutoTRestore<ScissorState> asr(&fScissorState);
-    fScissorState.fEnabled = true;
-    fScissorState.fRect = rect;
-    this->flushScissor();
-
-    GL_CALL(StencilMask((uint32_t) clipStencilMask));
-    GL_CALL(ClearStencil(value));
-    GL_CALL(Clear(GR_GL_STENCIL_BUFFER_BIT));
-    fHWStencilSettings.invalidate();
-}
-
-bool GrGpuGL::readPixelsWillPayForYFlip(GrRenderTarget* renderTarget,
-                                        int left, int top,
-                                        int width, int height,
-                                        GrPixelConfig config,
-                                        size_t rowBytes) const {
-    // If this rendertarget is aready TopLeft, we don't need to flip.
-    if (kTopLeft_GrSurfaceOrigin == renderTarget->origin()) {
-        return false;
-    }
-
-    // if GL can do the flip then we'll never pay for it.
-    if (this->glCaps().packFlipYSupport()) {
-        return false;
-    }
-
-    // If we have to do memcpy to handle non-trim rowBytes then we
-    // get the flip for free. Otherwise it costs.
-    if (this->glCaps().packRowLengthSupport()) {
-        return true;
-    }
-    // If we have to do memcpys to handle rowBytes then y-flip is free
-    // Note the rowBytes might be tight to the passed in data, but if data
-    // gets clipped in x to the target the rowBytes will no longer be tight.
-    if (left >= 0 && (left + width) < renderTarget->width()) {
-           return 0 == rowBytes ||
-                  GrBytesPerPixel(config) * width == rowBytes;
-    } else {
-        return false;
-    }
-}
-
-bool GrGpuGL::onReadPixels(GrRenderTarget* target,
-                           int left, int top,
-                           int width, int height,
-                           GrPixelConfig config,
-                           void* buffer,
-                           size_t rowBytes) {
-    // We cannot read pixels into a compressed buffer
-    if (GrPixelConfigIsCompressed(config)) {
-        return false;
-    }
-
-    GrGLenum format = 0;
-    GrGLenum type = 0;
-    bool flipY = kBottomLeft_GrSurfaceOrigin == target->origin();
-    if (!this->configToGLFormats(config, false, NULL, &format, &type)) {
-        return false;
-    }
-    size_t bpp = GrBytesPerPixel(config);
-    if (!adjust_pixel_ops_params(target->width(), target->height(), bpp,
-                                 &left, &top, &width, &height,
-                                 const_cast<const void**>(&buffer),
-                                 &rowBytes)) {
-        return false;
-    }
-
-    // resolve the render target if necessary
-    GrGLRenderTarget* tgt = static_cast<GrGLRenderTarget*>(target);
-    GrDrawState::AutoRenderTargetRestore artr;
-    switch (tgt->getResolveType()) {
-        case GrGLRenderTarget::kCantResolve_ResolveType:
-            return false;
-        case GrGLRenderTarget::kAutoResolves_ResolveType:
-            artr.set(this->drawState(), target);
-            this->flushRenderTarget(&SkIRect::EmptyIRect());
-            break;
-        case GrGLRenderTarget::kCanResolve_ResolveType:
-            this->onResolveRenderTarget(tgt);
-            // we don't track the state of the READ FBO ID.
-            GL_CALL(BindFramebuffer(GR_GL_READ_FRAMEBUFFER,
-                                    tgt->textureFBOID()));
-            break;
-        default:
-            SkFAIL("Unknown resolve type");
-    }
-
-    const GrGLIRect& glvp = tgt->getViewport();
-
-    // the read rect is viewport-relative
-    GrGLIRect readRect;
-    readRect.setRelativeTo(glvp, left, top, width, height, target->origin());
-
-    size_t tightRowBytes = bpp * width;
-    if (0 == rowBytes) {
-        rowBytes = tightRowBytes;
-    }
-    size_t readDstRowBytes = tightRowBytes;
-    void* readDst = buffer;
-
-    // determine if GL can read using the passed rowBytes or if we need
-    // a scratch buffer.
-    GrAutoMalloc<32 * sizeof(GrColor)> scratch;
-    if (rowBytes != tightRowBytes) {
-        if (this->glCaps().packRowLengthSupport()) {
-            SkASSERT(!(rowBytes % sizeof(GrColor)));
-            GL_CALL(PixelStorei(GR_GL_PACK_ROW_LENGTH,
-                                static_cast<GrGLint>(rowBytes / sizeof(GrColor))));
-            readDstRowBytes = rowBytes;
-        } else {
-            scratch.reset(tightRowBytes * height);
-            readDst = scratch.get();
-        }
-    }
-    if (flipY && this->glCaps().packFlipYSupport()) {
-        GL_CALL(PixelStorei(GR_GL_PACK_REVERSE_ROW_ORDER, 1));
-    }
-    GL_CALL(ReadPixels(readRect.fLeft, readRect.fBottom,
-                       readRect.fWidth, readRect.fHeight,
-                       format, type, readDst));
-    if (readDstRowBytes != tightRowBytes) {
-        SkASSERT(this->glCaps().packRowLengthSupport());
-        GL_CALL(PixelStorei(GR_GL_PACK_ROW_LENGTH, 0));
-    }
-    if (flipY && this->glCaps().packFlipYSupport()) {
-        GL_CALL(PixelStorei(GR_GL_PACK_REVERSE_ROW_ORDER, 0));
-        flipY = false;
-    }
-
-    // now reverse the order of the rows, since GL's are bottom-to-top, but our
-    // API presents top-to-bottom. We must preserve the padding contents. Note
-    // that the above readPixels did not overwrite the padding.
-    if (readDst == buffer) {
-        SkASSERT(rowBytes == readDstRowBytes);
-        if (flipY) {
-            scratch.reset(tightRowBytes);
-            void* tmpRow = scratch.get();
-            // flip y in-place by rows
-            const int halfY = height >> 1;
-            char* top = reinterpret_cast<char*>(buffer);
-            char* bottom = top + (height - 1) * rowBytes;
-            for (int y = 0; y < halfY; y++) {
-                memcpy(tmpRow, top, tightRowBytes);
-                memcpy(top, bottom, tightRowBytes);
-                memcpy(bottom, tmpRow, tightRowBytes);
-                top += rowBytes;
-                bottom -= rowBytes;
-            }
-        }
-    } else {
-        SkASSERT(readDst != buffer);        SkASSERT(rowBytes != tightRowBytes);
-        // copy from readDst to buffer while flipping y
-        // const int halfY = height >> 1;
-        const char* src = reinterpret_cast<const char*>(readDst);
-        char* dst = reinterpret_cast<char*>(buffer);
-        if (flipY) {
-            dst += (height-1) * rowBytes;
-        }
-        for (int y = 0; y < height; y++) {
-            memcpy(dst, src, tightRowBytes);
-            src += readDstRowBytes;
-            if (!flipY) {
-                dst += rowBytes;
-            } else {
-                dst -= rowBytes;
-            }
-        }
-    }
-    return true;
-}
-
-void GrGpuGL::flushRenderTarget(const SkIRect* bound) {
-
-    GrGLRenderTarget* rt =
-        static_cast<GrGLRenderTarget*>(this->drawState()->getRenderTarget());
-    SkASSERT(NULL != rt);
-
-    uint32_t rtID = rt->getUniqueID();
-    if (fHWBoundRenderTargetUniqueID != rtID) {
-        GL_CALL(BindFramebuffer(GR_GL_FRAMEBUFFER, rt->renderFBOID()));
-#ifdef SK_DEBUG
-        // don't do this check in Chromium -- this is causing
-        // lots of repeated command buffer flushes when the compositor is
-        // rendering with Ganesh, which is really slow; even too slow for
-        // Debug mode.
-        if (!this->glContext().isChromium()) {
-            GrGLenum status;
-            GL_CALL_RET(status, CheckFramebufferStatus(GR_GL_FRAMEBUFFER));
-            if (status != GR_GL_FRAMEBUFFER_COMPLETE) {
-                GrPrintf("GrGpuGL::flushRenderTarget glCheckFramebufferStatus %x\n", status);
-            }
-        }
-#endif
-        fHWBoundRenderTargetUniqueID = rtID;
-        const GrGLIRect& vp = rt->getViewport();
-        if (fHWViewport != vp) {
-            vp.pushToGLViewport(this->glInterface());
-            fHWViewport = vp;
-        }
-    }
-    if (NULL == bound || !bound->isEmpty()) {
-        rt->flagAsNeedingResolve(bound);
-    }
-
-    GrTexture *texture = rt->asTexture();
-    if (NULL != texture) {
-        texture->impl()->dirtyMipMaps(true);
-    }
-}
-
-GrGLenum gPrimitiveType2GLMode[] = {
-    GR_GL_TRIANGLES,
-    GR_GL_TRIANGLE_STRIP,
-    GR_GL_TRIANGLE_FAN,
-    GR_GL_POINTS,
-    GR_GL_LINES,
-    GR_GL_LINE_STRIP
-};
-
-#define SWAP_PER_DRAW 0
-
-#if SWAP_PER_DRAW
-    #if defined(SK_BUILD_FOR_MAC)
-        #include <AGL/agl.h>
-    #elif defined(SK_BUILD_FOR_WIN32)
-        #include <gl/GL.h>
-        void SwapBuf() {
-            DWORD procID = GetCurrentProcessId();
-            HWND hwnd = GetTopWindow(GetDesktopWindow());
-            while(hwnd) {
-                DWORD wndProcID = 0;
-                GetWindowThreadProcessId(hwnd, &wndProcID);
-                if(wndProcID == procID) {
-                    SwapBuffers(GetDC(hwnd));
-                }
-                hwnd = GetNextWindow(hwnd, GW_HWNDNEXT);
-            }
-         }
-    #endif
-#endif
-
-void GrGpuGL::onGpuDraw(const DrawInfo& info) {
-    size_t indexOffsetInBytes;
-    this->setupGeometry(info, &indexOffsetInBytes);
-
-    SkASSERT((size_t)info.primitiveType() < SK_ARRAY_COUNT(gPrimitiveType2GLMode));
-
-    if (info.isIndexed()) {
-        GrGLvoid* indices =
-            reinterpret_cast<GrGLvoid*>(indexOffsetInBytes + sizeof(uint16_t) * info.startIndex());
-        // info.startVertex() was accounted for by setupGeometry.
-        GL_CALL(DrawElements(gPrimitiveType2GLMode[info.primitiveType()],
-                             info.indexCount(),
-                             GR_GL_UNSIGNED_SHORT,
-                             indices));
-    } else {
-        // Pass 0 for parameter first. We have to adjust glVertexAttribPointer() to account for
-        // startVertex in the DrawElements case. So we always rely on setupGeometry to have
-        // accounted for startVertex.
-        GL_CALL(DrawArrays(gPrimitiveType2GLMode[info.primitiveType()], 0, info.vertexCount()));
-    }
-#if SWAP_PER_DRAW
-    glFlush();
-    #if defined(SK_BUILD_FOR_MAC)
-        aglSwapBuffers(aglGetCurrentContext());
-        int set_a_break_pt_here = 9;
-        aglSwapBuffers(aglGetCurrentContext());
-    #elif defined(SK_BUILD_FOR_WIN32)
-        SwapBuf();
-        int set_a_break_pt_here = 9;
-        SwapBuf();
-    #endif
-#endif
-}
-
-static GrGLenum gr_stencil_op_to_gl_path_rendering_fill_mode(GrStencilOp op) {
-    switch (op) {
-        default:
-            SkFAIL("Unexpected path fill.");
-            /* fallthrough */;
-        case kIncClamp_StencilOp:
-            return GR_GL_COUNT_UP;
-        case kInvert_StencilOp:
-            return GR_GL_INVERT;
-    }
-}
-
-void GrGpuGL::onGpuStencilPath(const GrPath* path, SkPath::FillType fill) {
-    SkASSERT(this->caps()->pathRenderingSupport());
-
-    GrGLuint id = static_cast<const GrGLPath*>(path)->pathID();
-    SkASSERT(NULL != this->drawState()->getRenderTarget());
-    SkASSERT(NULL != this->drawState()->getRenderTarget()->getStencilBuffer());
-
-    flushPathStencilSettings(fill);
-
-    // Decide how to manipulate the stencil buffer based on the fill rule.
-    SkASSERT(!fHWPathStencilSettings.isTwoSided());
-
-    GrGLenum fillMode =
-        gr_stencil_op_to_gl_path_rendering_fill_mode(fHWPathStencilSettings.passOp(GrStencilSettings::kFront_Face));
-    GrGLint writeMask = fHWPathStencilSettings.writeMask(GrStencilSettings::kFront_Face);
-    GL_CALL(StencilFillPath(id, fillMode, writeMask));
-}
-
-void GrGpuGL::onGpuDrawPath(const GrPath* path, SkPath::FillType fill) {
-    SkASSERT(this->caps()->pathRenderingSupport());
-
-    GrGLuint id = static_cast<const GrGLPath*>(path)->pathID();
-    SkASSERT(NULL != this->drawState()->getRenderTarget());
-    SkASSERT(NULL != this->drawState()->getRenderTarget()->getStencilBuffer());
-    SkASSERT(!fCurrentProgram->hasVertexShader());
-
-    flushPathStencilSettings(fill);
-    const SkStrokeRec& stroke = path->getStroke();
-
-    SkPath::FillType nonInvertedFill = SkPath::ConvertToNonInverseFillType(fill);
-    SkASSERT(!fHWPathStencilSettings.isTwoSided());
-    GrGLenum fillMode =
-        gr_stencil_op_to_gl_path_rendering_fill_mode(fHWPathStencilSettings.passOp(GrStencilSettings::kFront_Face));
-    GrGLint writeMask = fHWPathStencilSettings.writeMask(GrStencilSettings::kFront_Face);
-
-    if (stroke.isFillStyle() || SkStrokeRec::kStrokeAndFill_Style == stroke.getStyle()) {
-        GL_CALL(StencilFillPath(id, fillMode, writeMask));
-    }
-    if (stroke.needToApply()) {
-        GL_CALL(StencilStrokePath(id, 0xffff, writeMask));
-    }
-
-    if (nonInvertedFill == fill) {
-        if (stroke.needToApply()) {
-            GL_CALL(CoverStrokePath(id, GR_GL_BOUNDING_BOX));
-        } else {
-            GL_CALL(CoverFillPath(id, GR_GL_BOUNDING_BOX));
-        }
-    } else {
-        GrDrawState* drawState = this->drawState();
-        GrDrawState::AutoViewMatrixRestore avmr;
-        SkRect bounds = SkRect::MakeLTRB(0, 0,
-                                         SkIntToScalar(drawState->getRenderTarget()->width()),
-                                         SkIntToScalar(drawState->getRenderTarget()->height()));
-        SkMatrix vmi;
-        // mapRect through persp matrix may not be correct
-        if (!drawState->getViewMatrix().hasPerspective() && drawState->getViewInverse(&vmi)) {
-            vmi.mapRect(&bounds);
-            // theoretically could set bloat = 0, instead leave it because of matrix inversion
-            // precision.
-            SkScalar bloat = drawState->getViewMatrix().getMaxScale() * SK_ScalarHalf;
-            bounds.outset(bloat, bloat);
-        } else {
-            avmr.setIdentity(drawState);
-        }
-
-        this->drawSimpleRect(bounds, NULL);
-    }
-}
-
-void GrGpuGL::onGpuDrawPaths(const GrPathRange* pathRange,
-                             const uint32_t indices[], int count,
-                             const float transforms[], PathTransformType transformsType,
-                             SkPath::FillType fill) {
-    SkASSERT(this->caps()->pathRenderingSupport());
-    SkASSERT(NULL != this->drawState()->getRenderTarget());
-    SkASSERT(NULL != this->drawState()->getRenderTarget()->getStencilBuffer());
-    SkASSERT(!fCurrentProgram->hasVertexShader());
-
-    GrGLuint baseID = static_cast<const GrGLPathRange*>(pathRange)->basePathID();
-
-    flushPathStencilSettings(fill);
-    const SkStrokeRec& stroke = pathRange->getStroke();
-
-    SkPath::FillType nonInvertedFill =
-        SkPath::ConvertToNonInverseFillType(fill);
-
-    SkASSERT(!fHWPathStencilSettings.isTwoSided());
-    GrGLenum fillMode =
-        gr_stencil_op_to_gl_path_rendering_fill_mode(
-            fHWPathStencilSettings.passOp(GrStencilSettings::kFront_Face));
-    GrGLint writeMask =
-        fHWPathStencilSettings.writeMask(GrStencilSettings::kFront_Face);
-
-    if (stroke.isFillStyle() || SkStrokeRec::kStrokeAndFill_Style == stroke.getStyle()) {
-        GL_CALL(StencilFillPathInstanced(count, GR_GL_UNSIGNED_INT, indices, baseID, fillMode,
-                                         writeMask, gXformType2GLType[transformsType],
-                                         transforms));
-    }
-    if (stroke.needToApply()) {
-        GL_CALL(StencilStrokePathInstanced(count, GR_GL_UNSIGNED_INT, indices, baseID, 0xffff,
-                                           writeMask, gXformType2GLType[transformsType],
-                                           transforms));
-    }
-
-    if (nonInvertedFill == fill) {
-        if (stroke.needToApply()) {
-            GL_CALL(CoverStrokePathInstanced(
-                        count, GR_GL_UNSIGNED_INT, indices, baseID,
-                        GR_GL_BOUNDING_BOX_OF_BOUNDING_BOXES,
-                        gXformType2GLType[transformsType], transforms));
-        } else {
-            GL_CALL(CoverFillPathInstanced(
-                        count, GR_GL_UNSIGNED_INT, indices, baseID,
-                        GR_GL_BOUNDING_BOX_OF_BOUNDING_BOXES,
-                        gXformType2GLType[transformsType], transforms));
-        }
-    } else {
-        GrDrawState* drawState = this->drawState();
-        GrDrawState::AutoViewMatrixRestore avmr;
-        SkRect bounds = SkRect::MakeLTRB(0, 0,
-                                         SkIntToScalar(drawState->getRenderTarget()->width()),
-                                         SkIntToScalar(drawState->getRenderTarget()->height()));
-        SkMatrix vmi;
-        // mapRect through persp matrix may not be correct
-        if (!drawState->getViewMatrix().hasPerspective() && drawState->getViewInverse(&vmi)) {
-            vmi.mapRect(&bounds);
-            // theoretically could set bloat = 0, instead leave it because of matrix inversion
-            // precision.
-            SkScalar bloat = drawState->getViewMatrix().getMaxScale() * SK_ScalarHalf;
-            bounds.outset(bloat, bloat);
-        } else {
-            avmr.setIdentity(drawState);
-        }
-
-        this->drawSimpleRect(bounds, NULL);
-    }
-}
-
-void GrGpuGL::onResolveRenderTarget(GrRenderTarget* target) {
-    GrGLRenderTarget* rt = static_cast<GrGLRenderTarget*>(target);
-    if (rt->needsResolve()) {
-        // Some extensions automatically resolves the texture when it is read.
-        if (this->glCaps().usesMSAARenderBuffers()) {
-            SkASSERT(rt->textureFBOID() != rt->renderFBOID());
-            GL_CALL(BindFramebuffer(GR_GL_READ_FRAMEBUFFER, rt->renderFBOID()));
-            GL_CALL(BindFramebuffer(GR_GL_DRAW_FRAMEBUFFER, rt->textureFBOID()));
-            // make sure we go through flushRenderTarget() since we've modified
-            // the bound DRAW FBO ID.
-            fHWBoundRenderTargetUniqueID = SK_InvalidUniqueID;
-            const GrGLIRect& vp = rt->getViewport();
-            const SkIRect dirtyRect = rt->getResolveRect();
-            GrGLIRect r;
-            r.setRelativeTo(vp, dirtyRect.fLeft, dirtyRect.fTop,
-                            dirtyRect.width(), dirtyRect.height(), target->origin());
-
-            GrAutoTRestore<ScissorState> asr;
-            if (GrGLCaps::kES_Apple_MSFBOType == this->glCaps().msFBOType()) {
-                // Apple's extension uses the scissor as the blit bounds.
-                asr.reset(&fScissorState);
-                fScissorState.fEnabled = true;
-                fScissorState.fRect = dirtyRect;
-                this->flushScissor();
-                GL_CALL(ResolveMultisampleFramebuffer());
-            } else {
-                if (GrGLCaps::kDesktop_EXT_MSFBOType == this->glCaps().msFBOType()) {
-                    // this respects the scissor during the blit, so disable it.
-                    asr.reset(&fScissorState);
-                    fScissorState.fEnabled = false;
-                    this->flushScissor();
-                }
-                int right = r.fLeft + r.fWidth;
-                int top = r.fBottom + r.fHeight;
-                GL_CALL(BlitFramebuffer(r.fLeft, r.fBottom, right, top,
-                                        r.fLeft, r.fBottom, right, top,
-                                        GR_GL_COLOR_BUFFER_BIT, GR_GL_NEAREST));
-            }
-        }
-        rt->flagAsResolved();
-    }
-}
-
-namespace {
-
-GrGLenum gr_to_gl_stencil_func(GrStencilFunc basicFunc) {
-    static const GrGLenum gTable[] = {
-        GR_GL_ALWAYS,           // kAlways_StencilFunc
-        GR_GL_NEVER,            // kNever_StencilFunc
-        GR_GL_GREATER,          // kGreater_StencilFunc
-        GR_GL_GEQUAL,           // kGEqual_StencilFunc
-        GR_GL_LESS,             // kLess_StencilFunc
-        GR_GL_LEQUAL,           // kLEqual_StencilFunc,
-        GR_GL_EQUAL,            // kEqual_StencilFunc,
-        GR_GL_NOTEQUAL,         // kNotEqual_StencilFunc,
-    };
-    GR_STATIC_ASSERT(SK_ARRAY_COUNT(gTable) == kBasicStencilFuncCount);
-    GR_STATIC_ASSERT(0 == kAlways_StencilFunc);
-    GR_STATIC_ASSERT(1 == kNever_StencilFunc);
-    GR_STATIC_ASSERT(2 == kGreater_StencilFunc);
-    GR_STATIC_ASSERT(3 == kGEqual_StencilFunc);
-    GR_STATIC_ASSERT(4 == kLess_StencilFunc);
-    GR_STATIC_ASSERT(5 == kLEqual_StencilFunc);
-    GR_STATIC_ASSERT(6 == kEqual_StencilFunc);
-    GR_STATIC_ASSERT(7 == kNotEqual_StencilFunc);
-    SkASSERT((unsigned) basicFunc < kBasicStencilFuncCount);
-
-    return gTable[basicFunc];
-}
-
-GrGLenum gr_to_gl_stencil_op(GrStencilOp op) {
-    static const GrGLenum gTable[] = {
-        GR_GL_KEEP,        // kKeep_StencilOp
-        GR_GL_REPLACE,     // kReplace_StencilOp
-        GR_GL_INCR_WRAP,   // kIncWrap_StencilOp
-        GR_GL_INCR,        // kIncClamp_StencilOp
-        GR_GL_DECR_WRAP,   // kDecWrap_StencilOp
-        GR_GL_DECR,        // kDecClamp_StencilOp
-        GR_GL_ZERO,        // kZero_StencilOp
-        GR_GL_INVERT,      // kInvert_StencilOp
-    };
-    GR_STATIC_ASSERT(SK_ARRAY_COUNT(gTable) == kStencilOpCount);
-    GR_STATIC_ASSERT(0 == kKeep_StencilOp);
-    GR_STATIC_ASSERT(1 == kReplace_StencilOp);
-    GR_STATIC_ASSERT(2 == kIncWrap_StencilOp);
-    GR_STATIC_ASSERT(3 == kIncClamp_StencilOp);
-    GR_STATIC_ASSERT(4 == kDecWrap_StencilOp);
-    GR_STATIC_ASSERT(5 == kDecClamp_StencilOp);
-    GR_STATIC_ASSERT(6 == kZero_StencilOp);
-    GR_STATIC_ASSERT(7 == kInvert_StencilOp);
-    SkASSERT((unsigned) op < kStencilOpCount);
-    return gTable[op];
-}
-
-void set_gl_stencil(const GrGLInterface* gl,
-                    const GrStencilSettings& settings,
-                    GrGLenum glFace,
-                    GrStencilSettings::Face grFace) {
-    GrGLenum glFunc = gr_to_gl_stencil_func(settings.func(grFace));
-    GrGLenum glFailOp = gr_to_gl_stencil_op(settings.failOp(grFace));
-    GrGLenum glPassOp = gr_to_gl_stencil_op(settings.passOp(grFace));
-
-    GrGLint ref = settings.funcRef(grFace);
-    GrGLint mask = settings.funcMask(grFace);
-    GrGLint writeMask = settings.writeMask(grFace);
-
-    if (GR_GL_FRONT_AND_BACK == glFace) {
-        // we call the combined func just in case separate stencil is not
-        // supported.
-        GR_GL_CALL(gl, StencilFunc(glFunc, ref, mask));
-        GR_GL_CALL(gl, StencilMask(writeMask));
-        GR_GL_CALL(gl, StencilOp(glFailOp, glPassOp, glPassOp));
-    } else {
-        GR_GL_CALL(gl, StencilFuncSeparate(glFace, glFunc, ref, mask));
-        GR_GL_CALL(gl, StencilMaskSeparate(glFace, writeMask));
-        GR_GL_CALL(gl, StencilOpSeparate(glFace, glFailOp, glPassOp, glPassOp));
-    }
-}
-}
-
-void GrGpuGL::flushStencil(DrawType type) {
-    if (kStencilPath_DrawType != type && fHWStencilSettings != fStencilSettings) {
-        if (fStencilSettings.isDisabled()) {
-            if (kNo_TriState != fHWStencilTestEnabled) {
-                GL_CALL(Disable(GR_GL_STENCIL_TEST));
-                fHWStencilTestEnabled = kNo_TriState;
-            }
-        } else {
-            if (kYes_TriState != fHWStencilTestEnabled) {
-                GL_CALL(Enable(GR_GL_STENCIL_TEST));
-                fHWStencilTestEnabled = kYes_TriState;
-            }
-        }
-        if (!fStencilSettings.isDisabled()) {
-            if (this->caps()->twoSidedStencilSupport()) {
-                set_gl_stencil(this->glInterface(),
-                               fStencilSettings,
-                               GR_GL_FRONT,
-                               GrStencilSettings::kFront_Face);
-                set_gl_stencil(this->glInterface(),
-                               fStencilSettings,
-                               GR_GL_BACK,
-                               GrStencilSettings::kBack_Face);
-            } else {
-                set_gl_stencil(this->glInterface(),
-                               fStencilSettings,
-                               GR_GL_FRONT_AND_BACK,
-                               GrStencilSettings::kFront_Face);
-            }
-        }
-        fHWStencilSettings = fStencilSettings;
-    }
-}
-
-void GrGpuGL::flushAAState(DrawType type) {
-// At least some ATI linux drivers will render GL_LINES incorrectly when MSAA state is enabled but
-// the target is not multisampled. Single pixel wide lines are rendered thicker than 1 pixel wide.
-#if 0
-    // Replace RT_HAS_MSAA with this definition once this driver bug is no longer a relevant concern
-    #define RT_HAS_MSAA rt->isMultisampled()
-#else
-    #define RT_HAS_MSAA (rt->isMultisampled() || kDrawLines_DrawType == type)
-#endif
-
-    const GrRenderTarget* rt = this->getDrawState().getRenderTarget();
-    if (kGL_GrGLStandard == this->glStandard()) {
-        // ES doesn't support toggling GL_MULTISAMPLE and doesn't have
-        // smooth lines.
-        // we prefer smooth lines over multisampled lines
-        bool smoothLines = false;
-
-        if (kDrawLines_DrawType == type) {
-            smoothLines = this->willUseHWAALines();
-            if (smoothLines) {
-                if (kYes_TriState != fHWAAState.fSmoothLineEnabled) {
-                    GL_CALL(Enable(GR_GL_LINE_SMOOTH));
-                    fHWAAState.fSmoothLineEnabled = kYes_TriState;
-                    // must disable msaa to use line smoothing
-                    if (RT_HAS_MSAA &&
-                        kNo_TriState != fHWAAState.fMSAAEnabled) {
-                        GL_CALL(Disable(GR_GL_MULTISAMPLE));
-                        fHWAAState.fMSAAEnabled = kNo_TriState;
-                    }
-                }
-            } else {
-                if (kNo_TriState != fHWAAState.fSmoothLineEnabled) {
-                    GL_CALL(Disable(GR_GL_LINE_SMOOTH));
-                    fHWAAState.fSmoothLineEnabled = kNo_TriState;
-                }
-            }
-        }
-        if (!smoothLines && RT_HAS_MSAA) {
-            // FIXME: GL_NV_pr doesn't seem to like MSAA disabled. The paths
-            // convex hulls of each segment appear to get filled.
-            bool enableMSAA = kStencilPath_DrawType == type ||
-                              this->getDrawState().isHWAntialiasState();
-            if (enableMSAA) {
-                if (kYes_TriState != fHWAAState.fMSAAEnabled) {
-                    GL_CALL(Enable(GR_GL_MULTISAMPLE));
-                    fHWAAState.fMSAAEnabled = kYes_TriState;
-                }
-            } else {
-                if (kNo_TriState != fHWAAState.fMSAAEnabled) {
-                    GL_CALL(Disable(GR_GL_MULTISAMPLE));
-                    fHWAAState.fMSAAEnabled = kNo_TriState;
-                }
-            }
-        }
-    }
-}
-
-void GrGpuGL::flushPathStencilSettings(SkPath::FillType fill) {
-    GrStencilSettings pathStencilSettings;
-    this->getPathStencilSettingsForFillType(fill, &pathStencilSettings);
-    if (fHWPathStencilSettings != pathStencilSettings) {
-        // Just the func, ref, and mask is set here. The op and write mask are params to the call
-        // that draws the path to the SB (glStencilFillPath)
-        GrGLenum func =
-            gr_to_gl_stencil_func(pathStencilSettings.func(GrStencilSettings::kFront_Face));
-        GL_CALL(PathStencilFunc(func,
-                                pathStencilSettings.funcRef(GrStencilSettings::kFront_Face),
-                                pathStencilSettings.funcMask(GrStencilSettings::kFront_Face)));
-
-        fHWPathStencilSettings = pathStencilSettings;
-    }
-}
-
-void GrGpuGL::flushBlend(bool isLines,
-                         GrBlendCoeff srcCoeff,
-                         GrBlendCoeff dstCoeff) {
-    if (isLines && this->willUseHWAALines()) {
-        if (kYes_TriState != fHWBlendState.fEnabled) {
-            GL_CALL(Enable(GR_GL_BLEND));
-            fHWBlendState.fEnabled = kYes_TriState;
-        }
-        if (kSA_GrBlendCoeff != fHWBlendState.fSrcCoeff ||
-            kISA_GrBlendCoeff != fHWBlendState.fDstCoeff) {
-            GL_CALL(BlendFunc(gXfermodeCoeff2Blend[kSA_GrBlendCoeff],
-                              gXfermodeCoeff2Blend[kISA_GrBlendCoeff]));
-            fHWBlendState.fSrcCoeff = kSA_GrBlendCoeff;
-            fHWBlendState.fDstCoeff = kISA_GrBlendCoeff;
-        }
-    } else {
-        // any optimization to disable blending should
-        // have already been applied and tweaked the coeffs
-        // to (1, 0).
-        bool blendOff = kOne_GrBlendCoeff == srcCoeff &&
-                        kZero_GrBlendCoeff == dstCoeff;
-        if (blendOff) {
-            if (kNo_TriState != fHWBlendState.fEnabled) {
-                GL_CALL(Disable(GR_GL_BLEND));
-                fHWBlendState.fEnabled = kNo_TriState;
-            }
-        } else {
-            if (kYes_TriState != fHWBlendState.fEnabled) {
-                GL_CALL(Enable(GR_GL_BLEND));
-                fHWBlendState.fEnabled = kYes_TriState;
-            }
-            if (fHWBlendState.fSrcCoeff != srcCoeff ||
-                fHWBlendState.fDstCoeff != dstCoeff) {
-                GL_CALL(BlendFunc(gXfermodeCoeff2Blend[srcCoeff],
-                                  gXfermodeCoeff2Blend[dstCoeff]));
-                fHWBlendState.fSrcCoeff = srcCoeff;
-                fHWBlendState.fDstCoeff = dstCoeff;
-            }
-            GrColor blendConst = this->getDrawState().getBlendConstant();
-            if ((BlendCoeffReferencesConstant(srcCoeff) ||
-                 BlendCoeffReferencesConstant(dstCoeff)) &&
-                (!fHWBlendState.fConstColorValid ||
-                 fHWBlendState.fConstColor != blendConst)) {
-                GrGLfloat c[4];
-                GrColorToRGBAFloat(blendConst, c);
-                GL_CALL(BlendColor(c[0], c[1], c[2], c[3]));
-                fHWBlendState.fConstColor = blendConst;
-                fHWBlendState.fConstColorValid = true;
-            }
-        }
-    }
-}
-
-static inline GrGLenum tile_to_gl_wrap(SkShader::TileMode tm) {
-    static const GrGLenum gWrapModes[] = {
-        GR_GL_CLAMP_TO_EDGE,
-        GR_GL_REPEAT,
-        GR_GL_MIRRORED_REPEAT
-    };
-    GR_STATIC_ASSERT(SkShader::kTileModeCount == SK_ARRAY_COUNT(gWrapModes));
-    GR_STATIC_ASSERT(0 == SkShader::kClamp_TileMode);
-    GR_STATIC_ASSERT(1 == SkShader::kRepeat_TileMode);
-    GR_STATIC_ASSERT(2 == SkShader::kMirror_TileMode);
-    return gWrapModes[tm];
-}
-
-void GrGpuGL::bindTexture(int unitIdx, const GrTextureParams& params, GrGLTexture* texture) {
-    SkASSERT(NULL != texture);
-
-    // If we created a rt/tex and rendered to it without using a texture and now we're texturing
-    // from the rt it will still be the last bound texture, but it needs resolving. So keep this
-    // out of the "last != next" check.
-    GrGLRenderTarget* texRT =  static_cast<GrGLRenderTarget*>(texture->asRenderTarget());
-    if (NULL != texRT) {
-        this->onResolveRenderTarget(texRT);
-    }
-
-    uint32_t textureID = texture->getUniqueID();
-    if (fHWBoundTextureUniqueIDs[unitIdx] != textureID) {
-        this->setTextureUnit(unitIdx);
-        GL_CALL(BindTexture(GR_GL_TEXTURE_2D, texture->textureID()));
-        fHWBoundTextureUniqueIDs[unitIdx] = textureID;
-    }
-
-    ResetTimestamp timestamp;
-    const GrGLTexture::TexParams& oldTexParams = texture->getCachedTexParams(&timestamp);
-    bool setAll = timestamp < this->getResetTimestamp();
-    GrGLTexture::TexParams newTexParams;
-
-    static GrGLenum glMinFilterModes[] = {
-        GR_GL_NEAREST,
-        GR_GL_LINEAR,
-        GR_GL_LINEAR_MIPMAP_LINEAR
-    };
-    static GrGLenum glMagFilterModes[] = {
-        GR_GL_NEAREST,
-        GR_GL_LINEAR,
-        GR_GL_LINEAR
-    };
-    GrTextureParams::FilterMode filterMode = params.filterMode();
-    if (!this->caps()->mipMapSupport() && GrTextureParams::kMipMap_FilterMode == filterMode) {
-        filterMode = GrTextureParams::kBilerp_FilterMode;
-    }
-    newTexParams.fMinFilter = glMinFilterModes[filterMode];
-    newTexParams.fMagFilter = glMagFilterModes[filterMode];
-
-    if (GrTextureParams::kMipMap_FilterMode == filterMode &&
-        texture->mipMapsAreDirty() && !GrPixelConfigIsCompressed(texture->config())) {
-        GL_CALL(GenerateMipmap(GR_GL_TEXTURE_2D));
-        texture->dirtyMipMaps(false);
-    }
-
-    newTexParams.fWrapS = tile_to_gl_wrap(params.getTileModeX());
-    newTexParams.fWrapT = tile_to_gl_wrap(params.getTileModeY());
-    memcpy(newTexParams.fSwizzleRGBA,
-           GrGLShaderBuilder::GetTexParamSwizzle(texture->config(), this->glCaps()),
-           sizeof(newTexParams.fSwizzleRGBA));
-    if (setAll || newTexParams.fMagFilter != oldTexParams.fMagFilter) {
-        this->setTextureUnit(unitIdx);
-        GL_CALL(TexParameteri(GR_GL_TEXTURE_2D,
-                              GR_GL_TEXTURE_MAG_FILTER,
-                              newTexParams.fMagFilter));
-    }
-    if (setAll || newTexParams.fMinFilter != oldTexParams.fMinFilter) {
-        this->setTextureUnit(unitIdx);
-        GL_CALL(TexParameteri(GR_GL_TEXTURE_2D,
-                              GR_GL_TEXTURE_MIN_FILTER,
-                              newTexParams.fMinFilter));
-    }
-    if (setAll || newTexParams.fWrapS != oldTexParams.fWrapS) {
-        this->setTextureUnit(unitIdx);
-        GL_CALL(TexParameteri(GR_GL_TEXTURE_2D,
-                              GR_GL_TEXTURE_WRAP_S,
-                              newTexParams.fWrapS));
-    }
-    if (setAll || newTexParams.fWrapT != oldTexParams.fWrapT) {
-        this->setTextureUnit(unitIdx);
-        GL_CALL(TexParameteri(GR_GL_TEXTURE_2D,
-                              GR_GL_TEXTURE_WRAP_T,
-                              newTexParams.fWrapT));
-    }
-    if (this->glCaps().textureSwizzleSupport() &&
-        (setAll || memcmp(newTexParams.fSwizzleRGBA,
-                          oldTexParams.fSwizzleRGBA,
-                          sizeof(newTexParams.fSwizzleRGBA)))) {
-        this->setTextureUnit(unitIdx);
-        if (this->glStandard() == kGLES_GrGLStandard) {
-            // ES3 added swizzle support but not GL_TEXTURE_SWIZZLE_RGBA.
-            const GrGLenum* swizzle = newTexParams.fSwizzleRGBA;
-            GL_CALL(TexParameteri(GR_GL_TEXTURE_2D, GR_GL_TEXTURE_SWIZZLE_R, swizzle[0]));
-            GL_CALL(TexParameteri(GR_GL_TEXTURE_2D, GR_GL_TEXTURE_SWIZZLE_G, swizzle[1]));
-            GL_CALL(TexParameteri(GR_GL_TEXTURE_2D, GR_GL_TEXTURE_SWIZZLE_B, swizzle[2]));
-            GL_CALL(TexParameteri(GR_GL_TEXTURE_2D, GR_GL_TEXTURE_SWIZZLE_A, swizzle[3]));
-        } else {
-            GR_STATIC_ASSERT(sizeof(newTexParams.fSwizzleRGBA[0]) == sizeof(GrGLint));
-            const GrGLint* swizzle = reinterpret_cast<const GrGLint*>(newTexParams.fSwizzleRGBA);
-            GL_CALL(TexParameteriv(GR_GL_TEXTURE_2D, GR_GL_TEXTURE_SWIZZLE_RGBA, swizzle));
-        }
-    }
-    texture->setCachedTexParams(newTexParams, this->getResetTimestamp());
-}
-
-void GrGpuGL::setProjectionMatrix(const SkMatrix& matrix,
-                                  const SkISize& renderTargetSize,
-                                  GrSurfaceOrigin renderTargetOrigin) {
-
-    SkASSERT(this->glCaps().pathRenderingSupport());
-
-    if (renderTargetOrigin == fHWProjectionMatrixState.fRenderTargetOrigin &&
-        renderTargetSize == fHWProjectionMatrixState.fRenderTargetSize &&
-        matrix.cheapEqualTo(fHWProjectionMatrixState.fViewMatrix)) {
-        return;
-    }
-
-    fHWProjectionMatrixState.fViewMatrix = matrix;
-    fHWProjectionMatrixState.fRenderTargetSize = renderTargetSize;
-    fHWProjectionMatrixState.fRenderTargetOrigin = renderTargetOrigin;
-
-    GrGLfloat glMatrix[4 * 4];
-    fHWProjectionMatrixState.getRTAdjustedGLMatrix<4>(glMatrix);
-    GL_CALL(MatrixLoadf(GR_GL_PROJECTION, glMatrix));
-}
-
-void GrGpuGL::enablePathTexGen(int unitIdx,
-                               PathTexGenComponents components,
-                               const GrGLfloat* coefficients) {
-    SkASSERT(this->glCaps().pathRenderingSupport());
-    SkASSERT(components >= kS_PathTexGenComponents &&
-             components <= kSTR_PathTexGenComponents);
-    SkASSERT(this->glCaps().maxFixedFunctionTextureCoords() >= unitIdx);
-
-    if (GR_GL_OBJECT_LINEAR == fHWPathTexGenSettings[unitIdx].fMode &&
-        components == fHWPathTexGenSettings[unitIdx].fNumComponents &&
-        !memcmp(coefficients, fHWPathTexGenSettings[unitIdx].fCoefficients,
-                3 * components * sizeof(GrGLfloat))) {
-        return;
-    }
-
-    this->setTextureUnit(unitIdx);
-
-    fHWPathTexGenSettings[unitIdx].fNumComponents = components;
-    GL_CALL(PathTexGen(GR_GL_TEXTURE0 + unitIdx,
-                       GR_GL_OBJECT_LINEAR,
-                       components,
-                       coefficients));
-
-    memcpy(fHWPathTexGenSettings[unitIdx].fCoefficients, coefficients,
-           3 * components * sizeof(GrGLfloat));
-}
-
-void GrGpuGL::enablePathTexGen(int unitIdx, PathTexGenComponents components,
-                               const SkMatrix& matrix) {
-    GrGLfloat coefficients[3 * 3];
-    SkASSERT(this->glCaps().pathRenderingSupport());
-    SkASSERT(components >= kS_PathTexGenComponents &&
-             components <= kSTR_PathTexGenComponents);
-
-    coefficients[0] = SkScalarToFloat(matrix[SkMatrix::kMScaleX]);
-    coefficients[1] = SkScalarToFloat(matrix[SkMatrix::kMSkewX]);
-    coefficients[2] = SkScalarToFloat(matrix[SkMatrix::kMTransX]);
-
-    if (components >= kST_PathTexGenComponents) {
-        coefficients[3] = SkScalarToFloat(matrix[SkMatrix::kMSkewY]);
-        coefficients[4] = SkScalarToFloat(matrix[SkMatrix::kMScaleY]);
-        coefficients[5] = SkScalarToFloat(matrix[SkMatrix::kMTransY]);
-    }
-
-    if (components >= kSTR_PathTexGenComponents) {
-        coefficients[6] = SkScalarToFloat(matrix[SkMatrix::kMPersp0]);
-        coefficients[7] = SkScalarToFloat(matrix[SkMatrix::kMPersp1]);
-        coefficients[8] = SkScalarToFloat(matrix[SkMatrix::kMPersp2]);
-    }
-
-    enablePathTexGen(unitIdx, components, coefficients);
-}
-
-void GrGpuGL::flushPathTexGenSettings(int numUsedTexCoordSets) {
-    SkASSERT(this->glCaps().pathRenderingSupport());
-    SkASSERT(this->glCaps().maxFixedFunctionTextureCoords() >= numUsedTexCoordSets);
-
-    // Only write the inactive path tex gens, since active path tex gens were
-    // written when they were enabled.
-
-    SkDEBUGCODE(
-        for (int i = 0; i < numUsedTexCoordSets; i++) {
-            SkASSERT(0 != fHWPathTexGenSettings[i].fNumComponents);
-        }
-    );
-
-    for (int i = numUsedTexCoordSets; i < fHWActivePathTexGenSets; i++) {
-        SkASSERT(0 != fHWPathTexGenSettings[i].fNumComponents);
-
-        this->setTextureUnit(i);
-        GL_CALL(PathTexGen(GR_GL_TEXTURE0 + i, GR_GL_NONE, 0, NULL));
-        fHWPathTexGenSettings[i].fNumComponents = 0;
-    }
-
-    fHWActivePathTexGenSets = numUsedTexCoordSets;
-}
-
-void GrGpuGL::flushMiscFixedFunctionState() {
-
-    const GrDrawState& drawState = this->getDrawState();
-
-    if (drawState.isDitherState()) {
-        if (kYes_TriState != fHWDitherEnabled) {
-            GL_CALL(Enable(GR_GL_DITHER));
-            fHWDitherEnabled = kYes_TriState;
-        }
-    } else {
-        if (kNo_TriState != fHWDitherEnabled) {
-            GL_CALL(Disable(GR_GL_DITHER));
-            fHWDitherEnabled = kNo_TriState;
-        }
-    }
-
-    if (drawState.isColorWriteDisabled()) {
-        if (kNo_TriState != fHWWriteToColor) {
-            GL_CALL(ColorMask(GR_GL_FALSE, GR_GL_FALSE,
-                              GR_GL_FALSE, GR_GL_FALSE));
-            fHWWriteToColor = kNo_TriState;
-        }
-    } else {
-        if (kYes_TriState != fHWWriteToColor) {
-            GL_CALL(ColorMask(GR_GL_TRUE, GR_GL_TRUE, GR_GL_TRUE, GR_GL_TRUE));
-            fHWWriteToColor = kYes_TriState;
-        }
-    }
-
-    if (fHWDrawFace != drawState.getDrawFace()) {
-        switch (this->getDrawState().getDrawFace()) {
-            case GrDrawState::kCCW_DrawFace:
-                GL_CALL(Enable(GR_GL_CULL_FACE));
-                GL_CALL(CullFace(GR_GL_BACK));
-                break;
-            case GrDrawState::kCW_DrawFace:
-                GL_CALL(Enable(GR_GL_CULL_FACE));
-                GL_CALL(CullFace(GR_GL_FRONT));
-                break;
-            case GrDrawState::kBoth_DrawFace:
-                GL_CALL(Disable(GR_GL_CULL_FACE));
-                break;
-            default:
-                SkFAIL("Unknown draw face.");
-        }
-        fHWDrawFace = drawState.getDrawFace();
-    }
-}
-
-GrGLuint GrGpuGL::createGLPathObject() {
-    if (NULL == fPathNameAllocator.get()) {
-        static const int range = 65536;
-        GrGLuint firstName;
-        GL_CALL_RET(firstName, GenPaths(range));
-        fPathNameAllocator.reset(SkNEW_ARGS(GrGLNameAllocator, (firstName, firstName + range)));
-    }
-
-    GrGLuint name = fPathNameAllocator->allocateName();
-    if (0 == name) {
-        // Our reserved path names are all in use. Fall back on GenPaths.
-        GL_CALL_RET(name, GenPaths(1));
-    }
-
-    return name;
-}
-
-void GrGpuGL::deleteGLPathObject(GrGLuint name) {
-    if (NULL == fPathNameAllocator.get() ||
-        name < fPathNameAllocator->firstName() ||
-        name >= fPathNameAllocator->endName()) {
-        // If we aren't inside fPathNameAllocator's range then this name was
-        // generated by the GenPaths fallback (or else the name is unallocated).
-        GL_CALL(DeletePaths(name, 1));
-        return;
-    }
-
-    // Make the path empty to save memory, but don't free the name in the driver.
-    GL_CALL(PathCommands(name, 0, NULL, 0, GR_GL_FLOAT, NULL));
-    fPathNameAllocator->free(name);
-}
-
-bool GrGpuGL::configToGLFormats(GrPixelConfig config,
-                                bool getSizedInternalFormat,
-                                GrGLenum* internalFormat,
-                                GrGLenum* externalFormat,
-                                GrGLenum* externalType) {
-    GrGLenum dontCare;
-    if (NULL == internalFormat) {
-        internalFormat = &dontCare;
-    }
-    if (NULL == externalFormat) {
-        externalFormat = &dontCare;
-    }
-    if (NULL == externalType) {
-        externalType = &dontCare;
-    }
-
-    if(!this->glCaps().isConfigTexturable(config)) {
-        return false;
-    }
-
-    switch (config) {
-        case kRGBA_8888_GrPixelConfig:
-            *internalFormat = GR_GL_RGBA;
-            *externalFormat = GR_GL_RGBA;
-            if (getSizedInternalFormat) {
-                *internalFormat = GR_GL_RGBA8;
-            } else {
-                *internalFormat = GR_GL_RGBA;
-            }
-            *externalType = GR_GL_UNSIGNED_BYTE;
-            break;
-        case kBGRA_8888_GrPixelConfig:
-            if (this->glCaps().bgraIsInternalFormat()) {
-                if (getSizedInternalFormat) {
-                    *internalFormat = GR_GL_BGRA8;
-                } else {
-                    *internalFormat = GR_GL_BGRA;
-                }
-            } else {
-                if (getSizedInternalFormat) {
-                    *internalFormat = GR_GL_RGBA8;
-                } else {
-                    *internalFormat = GR_GL_RGBA;
-                }
-            }
-            *externalFormat = GR_GL_BGRA;
-            *externalType = GR_GL_UNSIGNED_BYTE;
-            break;
-        case kRGB_565_GrPixelConfig:
-            *internalFormat = GR_GL_RGB;
-            *externalFormat = GR_GL_RGB;
-            if (getSizedInternalFormat) {
-                if (this->glStandard() == kGL_GrGLStandard) {
-                    return false;
-                } else {
-                    *internalFormat = GR_GL_RGB565;
-                }
-            } else {
-                *internalFormat = GR_GL_RGB;
-            }
-            *externalType = GR_GL_UNSIGNED_SHORT_5_6_5;
-            break;
-        case kRGBA_4444_GrPixelConfig:
-            *internalFormat = GR_GL_RGBA;
-            *externalFormat = GR_GL_RGBA;
-            if (getSizedInternalFormat) {
-                *internalFormat = GR_GL_RGBA4;
-            } else {
-                *internalFormat = GR_GL_RGBA;
-            }
-            *externalType = GR_GL_UNSIGNED_SHORT_4_4_4_4;
-            break;
-        case kIndex_8_GrPixelConfig:
-            // glCompressedTexImage doesn't take external params
-            *externalFormat = GR_GL_PALETTE8_RGBA8;
-            // no sized/unsized internal format distinction here
-            *internalFormat = GR_GL_PALETTE8_RGBA8;
-            // unused with CompressedTexImage
-            *externalType = GR_GL_UNSIGNED_BYTE;
-            break;
-        case kAlpha_8_GrPixelConfig:
-            if (this->glCaps().textureRedSupport()) {
-                *internalFormat = GR_GL_RED;
-                *externalFormat = GR_GL_RED;
-                if (getSizedInternalFormat) {
-                    *internalFormat = GR_GL_R8;
-                } else {
-                    *internalFormat = GR_GL_RED;
-                }
-                *externalType = GR_GL_UNSIGNED_BYTE;
-            } else {
-                *internalFormat = GR_GL_ALPHA;
-                *externalFormat = GR_GL_ALPHA;
-                if (getSizedInternalFormat) {
-                    *internalFormat = GR_GL_ALPHA8;
-                } else {
-                    *internalFormat = GR_GL_ALPHA;
-                }
-                *externalType = GR_GL_UNSIGNED_BYTE;
-            }
-            break;
-        case kETC1_GrPixelConfig:
-            *internalFormat = GR_GL_COMPRESSED_RGB8_ETC1;
-            break;
-        case kLATC_GrPixelConfig:
-            switch(this->glCaps().latcAlias()) {
-                case GrGLCaps::kLATC_LATCAlias:
-                    *internalFormat = GR_GL_COMPRESSED_LUMINANCE_LATC1;
-                    break;
-                case GrGLCaps::kRGTC_LATCAlias:
-                    *internalFormat = GR_GL_COMPRESSED_RED_RGTC1;
-                    break;
-                case GrGLCaps::k3DC_LATCAlias:
-                    *internalFormat = GR_GL_COMPRESSED_3DC_X;
-                    break;
-            }
-            break;
-        case kR11_EAC_GrPixelConfig:
-            *internalFormat = GR_GL_COMPRESSED_R11;
-            break;
-
-        case kASTC_12x12_GrPixelConfig:
-            *internalFormat = GR_GL_COMPRESSED_RGBA_ASTC_12x12;
-            break;
-
-        case kRGBA_float_GrPixelConfig:
-            *internalFormat = GR_GL_RGBA32F;
-            *externalFormat = GR_GL_RGBA;
-            *externalType = GR_GL_FLOAT;
-            break;
-
-        default:
-            return false;
-    }
-    return true;
-}
-
-void GrGpuGL::setTextureUnit(int unit) {
-    SkASSERT(unit >= 0 && unit < fHWBoundTextureUniqueIDs.count());
-    if (unit != fHWActiveTextureUnitIdx) {
-        GL_CALL(ActiveTexture(GR_GL_TEXTURE0 + unit));
-        fHWActiveTextureUnitIdx = unit;
-    }
-}
-
-void GrGpuGL::setScratchTextureUnit() {
-    // Bind the last texture unit since it is the least likely to be used by GrGLProgram.
-    int lastUnitIdx = fHWBoundTextureUniqueIDs.count() - 1;
-    if (lastUnitIdx != fHWActiveTextureUnitIdx) {
-        GL_CALL(ActiveTexture(GR_GL_TEXTURE0 + lastUnitIdx));
-        fHWActiveTextureUnitIdx = lastUnitIdx;
-    }
-    // clear out the this field so that if a program does use this unit it will rebind the correct
-    // texture.
-    fHWBoundTextureUniqueIDs[lastUnitIdx] = SK_InvalidUniqueID;
-}
-
-namespace {
-// Determines whether glBlitFramebuffer could be used between src and dst.
-inline bool can_blit_framebuffer(const GrSurface* dst,
-                                 const GrSurface* src,
-                                 const GrGpuGL* gpu,
-                                 bool* wouldNeedTempFBO = NULL) {
-    if (gpu->glCaps().isConfigRenderable(dst->config(), dst->desc().fSampleCnt > 0) &&
-        gpu->glCaps().isConfigRenderable(src->config(), src->desc().fSampleCnt > 0) &&
-        gpu->glCaps().usesMSAARenderBuffers()) {
-        // ES3 doesn't allow framebuffer blits when the src has MSAA and the configs don't match
-        // or the rects are not the same (not just the same size but have the same edges).
-        if (GrGLCaps::kES_3_0_MSFBOType == gpu->glCaps().msFBOType() &&
-            (src->desc().fSampleCnt > 0 || src->config() != dst->config())) {
-           return false;
-        }
-        if (NULL != wouldNeedTempFBO) {
-            *wouldNeedTempFBO = NULL == dst->asRenderTarget() || NULL == src->asRenderTarget();
-        }
-        return true;
-    } else {
-        return false;
-    }
-}
-
-inline bool can_copy_texsubimage(const GrSurface* dst,
-                                 const GrSurface* src,
-                                 const GrGpuGL* gpu,
-                                 bool* wouldNeedTempFBO = NULL) {
-    // Table 3.9 of the ES2 spec indicates the supported formats with CopyTexSubImage
-    // and BGRA isn't in the spec. There doesn't appear to be any extension that adds it. Perhaps
-    // many drivers would allow it to work, but ANGLE does not.
-    if (kGLES_GrGLStandard == gpu->glStandard() && gpu->glCaps().bgraIsInternalFormat() &&
-        (kBGRA_8888_GrPixelConfig == dst->config() || kBGRA_8888_GrPixelConfig == src->config())) {
-        return false;
-    }
-    const GrGLRenderTarget* dstRT = static_cast<const GrGLRenderTarget*>(dst->asRenderTarget());
-    // If dst is multisampled (and uses an extension where there is a separate MSAA renderbuffer)
-    // then we don't want to copy to the texture but to the MSAA buffer.
-    if (NULL != dstRT && dstRT->renderFBOID() != dstRT->textureFBOID()) {
-        return false;
-    }
-    const GrGLRenderTarget* srcRT = static_cast<const GrGLRenderTarget*>(src->asRenderTarget());
-    // If the src is multisampled (and uses an extension where there is a separate MSAA
-    // renderbuffer) then it is an invalid operation to call CopyTexSubImage
-    if (NULL != srcRT && srcRT->renderFBOID() != srcRT->textureFBOID()) {
-        return false;
-    }
-    if (gpu->glCaps().isConfigRenderable(src->config(), src->desc().fSampleCnt > 0) &&
-        NULL != dst->asTexture() &&
-        dst->origin() == src->origin() &&
-        kIndex_8_GrPixelConfig != src->config() &&
-        !GrPixelConfigIsCompressed(src->config())) {
-        if (NULL != wouldNeedTempFBO) {
-            *wouldNeedTempFBO = NULL == src->asRenderTarget();
-        }
-        return true;
-    } else {
-        return false;
-    }
-}
-
-// If a temporary FBO was created, its non-zero ID is returned. The viewport that the copy rect is
-// relative to is output.
-inline GrGLuint bind_surface_as_fbo(const GrGLInterface* gl,
-                                    GrSurface* surface,
-                                    GrGLenum fboTarget,
-                                    GrGLIRect* viewport) {
-    GrGLRenderTarget* rt = static_cast<GrGLRenderTarget*>(surface->asRenderTarget());
-    GrGLuint tempFBOID;
-    if (NULL == rt) {
-        SkASSERT(NULL != surface->asTexture());
-        GrGLuint texID = static_cast<GrGLTexture*>(surface->asTexture())->textureID();
-        GR_GL_CALL(gl, GenFramebuffers(1, &tempFBOID));
-        GR_GL_CALL(gl, BindFramebuffer(fboTarget, tempFBOID));
-        GR_GL_CALL(gl, FramebufferTexture2D(fboTarget,
-                                            GR_GL_COLOR_ATTACHMENT0,
-                                            GR_GL_TEXTURE_2D,
-                                            texID,
-                                            0));
-        viewport->fLeft = 0;
-        viewport->fBottom = 0;
-        viewport->fWidth = surface->width();
-        viewport->fHeight = surface->height();
-    } else {
-        tempFBOID = 0;
-        GR_GL_CALL(gl, BindFramebuffer(fboTarget, rt->renderFBOID()));
-        *viewport = rt->getViewport();
-    }
-    return tempFBOID;
-}
-
-}
-
-void GrGpuGL::initCopySurfaceDstDesc(const GrSurface* src, GrTextureDesc* desc) {
-    // Check for format issues with glCopyTexSubImage2D
-    if (kGLES_GrGLStandard == this->glStandard() && this->glCaps().bgraIsInternalFormat() &&
-        kBGRA_8888_GrPixelConfig == src->config()) {
-        // glCopyTexSubImage2D doesn't work with this config. We'll want to make it a render target
-        // in order to call glBlitFramebuffer or to copy to it by rendering.
-        INHERITED::initCopySurfaceDstDesc(src, desc);
-        return;
-    } else if (NULL == src->asRenderTarget()) {
-        // We don't want to have to create an FBO just to use glCopyTexSubImage2D. Let the base
-        // class handle it by rendering.
-        INHERITED::initCopySurfaceDstDesc(src, desc);
-        return;
-    }
-
-    const GrGLRenderTarget* srcRT = static_cast<const GrGLRenderTarget*>(src->asRenderTarget());
-    if (NULL != srcRT && srcRT->renderFBOID() != srcRT->textureFBOID()) {
-        // It's illegal to call CopyTexSubImage2D on a MSAA renderbuffer.
-        INHERITED::initCopySurfaceDstDesc(src, desc);
-    } else {
-        desc->fConfig = src->config();
-        desc->fOrigin = src->origin();
-        desc->fFlags = kNone_GrTextureFlags;
-    }
-}
-
-bool GrGpuGL::onCopySurface(GrSurface* dst,
-                            GrSurface* src,
-                            const SkIRect& srcRect,
-                            const SkIPoint& dstPoint) {
-    bool inheritedCouldCopy = INHERITED::onCanCopySurface(dst, src, srcRect, dstPoint);
-    bool copied = false;
-    bool wouldNeedTempFBO = false;
-    if (can_copy_texsubimage(dst, src, this, &wouldNeedTempFBO) &&
-        (!wouldNeedTempFBO || !inheritedCouldCopy)) {
-        GrGLuint srcFBO;
-        GrGLIRect srcVP;
-        srcFBO = bind_surface_as_fbo(this->glInterface(), src, GR_GL_FRAMEBUFFER, &srcVP);
-        GrGLTexture* dstTex = static_cast<GrGLTexture*>(dst->asTexture());
-        SkASSERT(NULL != dstTex);
-        // We modified the bound FBO
-        fHWBoundRenderTargetUniqueID = SK_InvalidUniqueID;
-        GrGLIRect srcGLRect;
-        srcGLRect.setRelativeTo(srcVP,
-                                srcRect.fLeft,
-                                srcRect.fTop,
-                                srcRect.width(),
-                                srcRect.height(),
-                                src->origin());
-
-        this->setScratchTextureUnit();
-        GL_CALL(BindTexture(GR_GL_TEXTURE_2D, dstTex->textureID()));
-        GrGLint dstY;
-        if (kBottomLeft_GrSurfaceOrigin == dst->origin()) {
-            dstY = dst->height() - (dstPoint.fY + srcGLRect.fHeight);
-        } else {
-            dstY = dstPoint.fY;
-        }
-        GL_CALL(CopyTexSubImage2D(GR_GL_TEXTURE_2D, 0,
-                                  dstPoint.fX, dstY,
-                                  srcGLRect.fLeft, srcGLRect.fBottom,
-                                  srcGLRect.fWidth, srcGLRect.fHeight));
-        copied = true;
-        if (srcFBO) {
-            GL_CALL(DeleteFramebuffers(1, &srcFBO));
-        }
-    } else if (can_blit_framebuffer(dst, src, this, &wouldNeedTempFBO) &&
-               (!wouldNeedTempFBO || !inheritedCouldCopy)) {
-        SkIRect dstRect = SkIRect::MakeXYWH(dstPoint.fX, dstPoint.fY,
-                                            srcRect.width(), srcRect.height());
-        bool selfOverlap = false;
-        if (dst->isSameAs(src)) {
-            selfOverlap = SkIRect::IntersectsNoEmptyCheck(dstRect, srcRect);
-        }
-
-        if (!selfOverlap) {
-            GrGLuint dstFBO;
-            GrGLuint srcFBO;
-            GrGLIRect dstVP;
-            GrGLIRect srcVP;
-            dstFBO = bind_surface_as_fbo(this->glInterface(), dst, GR_GL_DRAW_FRAMEBUFFER, &dstVP);
-            srcFBO = bind_surface_as_fbo(this->glInterface(), src, GR_GL_READ_FRAMEBUFFER, &srcVP);
-            // We modified the bound FBO
-            fHWBoundRenderTargetUniqueID = SK_InvalidUniqueID;
-            GrGLIRect srcGLRect;
-            GrGLIRect dstGLRect;
-            srcGLRect.setRelativeTo(srcVP,
-                                    srcRect.fLeft,
-                                    srcRect.fTop,
-                                    srcRect.width(),
-                                    srcRect.height(),
-                                    src->origin());
-            dstGLRect.setRelativeTo(dstVP,
-                                    dstRect.fLeft,
-                                    dstRect.fTop,
-                                    dstRect.width(),
-                                    dstRect.height(),
-                                    dst->origin());
-
-            GrAutoTRestore<ScissorState> asr;
-            if (GrGLCaps::kDesktop_EXT_MSFBOType == this->glCaps().msFBOType()) {
-                // The EXT version applies the scissor during the blit, so disable it.
-                asr.reset(&fScissorState);
-                fScissorState.fEnabled = false;
-                this->flushScissor();
-            }
-            GrGLint srcY0;
-            GrGLint srcY1;
-            // Does the blit need to y-mirror or not?
-            if (src->origin() == dst->origin()) {
-                srcY0 = srcGLRect.fBottom;
-                srcY1 = srcGLRect.fBottom + srcGLRect.fHeight;
-            } else {
-                srcY0 = srcGLRect.fBottom + srcGLRect.fHeight;
-                srcY1 = srcGLRect.fBottom;
-            }
-            GL_CALL(BlitFramebuffer(srcGLRect.fLeft,
-                                    srcY0,
-                                    srcGLRect.fLeft + srcGLRect.fWidth,
-                                    srcY1,
-                                    dstGLRect.fLeft,
-                                    dstGLRect.fBottom,
-                                    dstGLRect.fLeft + dstGLRect.fWidth,
-                                    dstGLRect.fBottom + dstGLRect.fHeight,
-                                    GR_GL_COLOR_BUFFER_BIT, GR_GL_NEAREST));
-            if (dstFBO) {
-                GL_CALL(DeleteFramebuffers(1, &dstFBO));
-            }
-            if (srcFBO) {
-                GL_CALL(DeleteFramebuffers(1, &srcFBO));
-            }
-            copied = true;
-        }
-    }
-    if (!copied && inheritedCouldCopy) {
-        copied = INHERITED::onCopySurface(dst, src, srcRect, dstPoint);
-        SkASSERT(copied);
-    }
-    return copied;
-}
-
-bool GrGpuGL::onCanCopySurface(GrSurface* dst,
-                               GrSurface* src,
-                               const SkIRect& srcRect,
-                               const SkIPoint& dstPoint) {
-    // This mirrors the logic in onCopySurface.
-    if (can_copy_texsubimage(dst, src, this)) {
-        return true;
-    }
-    if (can_blit_framebuffer(dst, src, this)) {
-        if (dst->isSameAs(src)) {
-            SkIRect dstRect = SkIRect::MakeXYWH(dstPoint.fX, dstPoint.fY,
-                                                srcRect.width(), srcRect.height());
-            if(!SkIRect::IntersectsNoEmptyCheck(dstRect, srcRect)) {
-                return true;
-            }
-        } else {
-            return true;
-        }
-    }
-    return INHERITED::onCanCopySurface(dst, src, srcRect, dstPoint);
-}
-
-void GrGpuGL::didAddGpuTraceMarker() {
-    if (this->caps()->gpuTracingSupport()) {
-        const GrTraceMarkerSet& markerArray = this->getActiveTraceMarkers();
-        SkString markerString = markerArray.toStringLast();
-        GL_CALL(PushGroupMarker(0, markerString.c_str()));
-    }
-}
-
-void GrGpuGL::didRemoveGpuTraceMarker() {
-    if (this->caps()->gpuTracingSupport()) {
-        GL_CALL(PopGroupMarker());
-    }
-}
-///////////////////////////////////////////////////////////////////////////////
-
-GrGLAttribArrayState* GrGpuGL::HWGeometryState::bindArrayAndBuffersToDraw(
-                                                GrGpuGL* gpu,
-                                                const GrGLVertexBuffer* vbuffer,
-                                                const GrGLIndexBuffer* ibuffer) {
-    SkASSERT(NULL != vbuffer);
-    GrGLAttribArrayState* attribState;
-
-    // We use a vertex array if we're on a core profile and the verts are in a VBO.
-    if (gpu->glCaps().isCoreProfile() && !vbuffer->isCPUBacked()) {
-        if (NULL == fVBOVertexArray || fVBOVertexArray->wasDestroyed()) {
-            SkSafeUnref(fVBOVertexArray);
-            GrGLuint arrayID;
-            GR_GL_CALL(gpu->glInterface(), GenVertexArrays(1, &arrayID));
-            int attrCount = gpu->glCaps().maxVertexAttributes();
-            fVBOVertexArray = SkNEW_ARGS(GrGLVertexArray, (gpu, arrayID, attrCount));
-        }
-        attribState = fVBOVertexArray->bindWithIndexBuffer(ibuffer);
-    } else {
-        if (NULL != ibuffer) {
-            this->setIndexBufferIDOnDefaultVertexArray(gpu, ibuffer->bufferID());
-        } else {
-            this->setVertexArrayID(gpu, 0);
-        }
-        int attrCount = gpu->glCaps().maxVertexAttributes();
-        if (fDefaultVertexArrayAttribState.count() != attrCount) {
-            fDefaultVertexArrayAttribState.resize(attrCount);
-        }
-        attribState = &fDefaultVertexArrayAttribState;
-    }
-    return attribState;
-}
diff --git a/gfx/skia/skia/src/gpu/gl/GrGpuGL.h b/gfx/skia/skia/src/gpu/gl/GrGpuGL.h
deleted file mode 100644
index f41903ae7e1e..000000000000
--- a/gfx/skia/skia/src/gpu/gl/GrGpuGL.h
+++ /dev/null
@@ -1,487 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrGpuGL_DEFINED
-#define GrGpuGL_DEFINED
-
-#include "GrBinHashKey.h"
-#include "GrDrawState.h"
-#include "GrGLContext.h"
-#include "GrGLIRect.h"
-#include "GrGLIndexBuffer.h"
-#include "GrGLProgram.h"
-#include "GrGLStencilBuffer.h"
-#include "GrGLTexture.h"
-#include "GrGLVertexArray.h"
-#include "GrGLVertexBuffer.h"
-#include "GrGpu.h"
-#include "SkTypes.h"
-
-#ifdef SK_DEVELOPER
-#define PROGRAM_CACHE_STATS
-#endif
-
-class GrGLNameAllocator;
-
-class GrGpuGL : public GrGpu {
-public:
-    GrGpuGL(const GrGLContext& ctx, GrContext* context);
-    virtual ~GrGpuGL();
-
-    const GrGLContext& glContext() const { return fGLContext; }
-
-    const GrGLInterface* glInterface() const { return fGLContext.interface(); }
-    const GrGLContextInfo& ctxInfo() const { return fGLContext; }
-    GrGLStandard glStandard() const { return fGLContext.standard(); }
-    GrGLVersion glVersion() const { return fGLContext.version(); }
-    GrGLSLGeneration glslGeneration() const { return fGLContext.glslGeneration(); }
-    const GrGLCaps& glCaps() const { return *fGLContext.caps(); }
-
-    virtual void discard(GrRenderTarget*) SK_OVERRIDE;
-
-    // Used by GrGLProgram and GrGLPathTexGenProgramEffects to configure OpenGL
-    // state.
-    void bindTexture(int unitIdx, const GrTextureParams& params, GrGLTexture* texture);
-    void setProjectionMatrix(const SkMatrix& matrix,
-                             const SkISize& renderTargetSize,
-                             GrSurfaceOrigin renderTargetOrigin);
-    enum PathTexGenComponents {
-        kS_PathTexGenComponents = 1,
-        kST_PathTexGenComponents = 2,
-        kSTR_PathTexGenComponents = 3
-    };
-    void enablePathTexGen(int unitIdx, PathTexGenComponents, const GrGLfloat* coefficients);
-    void enablePathTexGen(int unitIdx, PathTexGenComponents, const SkMatrix& matrix);
-    void flushPathTexGenSettings(int numUsedTexCoordSets);
-    bool shouldUseFixedFunctionTexturing() const {
-        return this->glCaps().pathRenderingSupport();
-    }
-
-    bool programUnitTest(int maxStages);
-
-    // GrGpu overrides
-    virtual GrPixelConfig preferredReadPixelsConfig(GrPixelConfig readConfig,
-                                                    GrPixelConfig surfaceConfig) const SK_OVERRIDE;
-    virtual GrPixelConfig preferredWritePixelsConfig(GrPixelConfig writeConfig,
-                                                     GrPixelConfig surfaceConfig) const SK_OVERRIDE;
-    virtual bool canWriteTexturePixels(const GrTexture*, GrPixelConfig srcConfig) const SK_OVERRIDE;
-    virtual bool readPixelsWillPayForYFlip(
-                                    GrRenderTarget* renderTarget,
-                                    int left, int top,
-                                    int width, int height,
-                                    GrPixelConfig config,
-                                    size_t rowBytes) const SK_OVERRIDE;
-    virtual bool fullReadPixelsIsFasterThanPartial() const SK_OVERRIDE;
-
-    virtual void initCopySurfaceDstDesc(const GrSurface* src, GrTextureDesc* desc) SK_OVERRIDE;
-
-    virtual void abandonResources() SK_OVERRIDE;
-
-    // These functions should be used to bind GL objects. They track the GL state and skip redundant
-    // bindings. Making the equivalent glBind calls directly will confuse the state tracking.
-    void bindVertexArray(GrGLuint id) {
-        fHWGeometryState.setVertexArrayID(this, id);
-    }
-    void bindIndexBufferAndDefaultVertexArray(GrGLuint id) {
-        fHWGeometryState.setIndexBufferIDOnDefaultVertexArray(this, id);
-    }
-    void bindVertexBuffer(GrGLuint id) {
-        fHWGeometryState.setVertexBufferID(this, id);
-    }
-
-    // These callbacks update state tracking when GL objects are deleted. They are called from
-    // GrGLResource onRelease functions.
-    void notifyVertexArrayDelete(GrGLuint id) {
-        fHWGeometryState.notifyVertexArrayDelete(id);
-    }
-    void notifyVertexBufferDelete(GrGLuint id) {
-        fHWGeometryState.notifyVertexBufferDelete(id);
-    }
-    void notifyIndexBufferDelete(GrGLuint id) {
-        fHWGeometryState.notifyIndexBufferDelete(id);
-    }
-
-    // These functions should be used to generate and delete GL path names. They have their own
-    // allocator that runs on the client side, so they are much faster than going through GenPaths.
-    GrGLuint createGLPathObject();
-    void deleteGLPathObject(GrGLuint);
-
-protected:
-    virtual bool onCopySurface(GrSurface* dst,
-                               GrSurface* src,
-                               const SkIRect& srcRect,
-                               const SkIPoint& dstPoint) SK_OVERRIDE;
-
-    virtual bool onCanCopySurface(GrSurface* dst,
-                                  GrSurface* src,
-                                  const SkIRect& srcRect,
-                                  const SkIPoint& dstPoint) SK_OVERRIDE;
-
-private:
-    // GrGpu overrides
-    virtual void onResetContext(uint32_t resetBits) SK_OVERRIDE;
-
-    virtual GrTexture* onCreateTexture(const GrTextureDesc& desc,
-                                       const void* srcData,
-                                       size_t rowBytes) SK_OVERRIDE;
-    virtual GrTexture* onCreateCompressedTexture(const GrTextureDesc& desc,
-                                                 const void* srcData) SK_OVERRIDE;
-    virtual GrVertexBuffer* onCreateVertexBuffer(size_t size, bool dynamic) SK_OVERRIDE;
-    virtual GrIndexBuffer* onCreateIndexBuffer(size_t size, bool dynamic) SK_OVERRIDE;
-    virtual GrPath* onCreatePath(const SkPath&, const SkStrokeRec&) SK_OVERRIDE;
-    virtual GrPathRange* onCreatePathRange(size_t size, const SkStrokeRec&) SK_OVERRIDE;
-    virtual GrTexture* onWrapBackendTexture(const GrBackendTextureDesc&) SK_OVERRIDE;
-    virtual GrRenderTarget* onWrapBackendRenderTarget(const GrBackendRenderTargetDesc&) SK_OVERRIDE;
-    virtual bool createStencilBufferForRenderTarget(GrRenderTarget* rt,
-                                                    int width,
-                                                    int height) SK_OVERRIDE;
-    virtual bool attachStencilBufferToRenderTarget(
-        GrStencilBuffer* sb,
-        GrRenderTarget* rt) SK_OVERRIDE;
-
-    virtual void onClear(const SkIRect* rect, GrColor color, bool canIgnoreRect) SK_OVERRIDE;
-
-    virtual bool onReadPixels(GrRenderTarget* target,
-                              int left, int top,
-                              int width, int height,
-                              GrPixelConfig,
-                              void* buffer,
-                              size_t rowBytes) SK_OVERRIDE;
-
-    virtual bool onWriteTexturePixels(GrTexture* texture,
-                                      int left, int top, int width, int height,
-                                      GrPixelConfig config, const void* buffer,
-                                      size_t rowBytes) SK_OVERRIDE;
-
-    virtual void onResolveRenderTarget(GrRenderTarget* target) SK_OVERRIDE;
-
-    virtual void onGpuDraw(const DrawInfo&) SK_OVERRIDE;
-
-    virtual void onGpuStencilPath(const GrPath*, SkPath::FillType) SK_OVERRIDE;
-    virtual void onGpuDrawPath(const GrPath*, SkPath::FillType) SK_OVERRIDE;
-    virtual void onGpuDrawPaths(const GrPathRange*,
-                                const uint32_t indices[], int count,
-                                const float transforms[], PathTransformType,
-                                SkPath::FillType) SK_OVERRIDE;
-
-    virtual void clearStencil() SK_OVERRIDE;
-    virtual void clearStencilClip(const SkIRect& rect,
-                                  bool insideClip) SK_OVERRIDE;
-    virtual bool flushGraphicsState(DrawType, const GrDeviceCoordTexture* dstCopy) SK_OVERRIDE;
-
-    // GrDrawTarget ovverides
-    virtual void didAddGpuTraceMarker() SK_OVERRIDE;
-    virtual void didRemoveGpuTraceMarker() SK_OVERRIDE;
-
-    // binds texture unit in GL
-    void setTextureUnit(int unitIdx);
-
-    // Sets up vertex attribute pointers and strides. On return indexOffsetInBytes gives the offset
-    // an into the index buffer. It does not account for drawInfo.startIndex() but rather the start
-    // index is relative to the returned offset.
-    void setupGeometry(const DrawInfo& info, size_t* indexOffsetInBytes);
-
-    // Subclasses should call this to flush the blend state.
-    // The params should be the final coefficients to apply
-    // (after any blending optimizations or dual source blending considerations
-    // have been accounted for).
-    void flushBlend(bool isLines, GrBlendCoeff srcCoeff, GrBlendCoeff dstCoeff);
-
-    bool hasExtension(const char* ext) const { return fGLContext.hasExtension(ext); }
-
-    static bool BlendCoeffReferencesConstant(GrBlendCoeff coeff);
-
-    class ProgramCache : public ::SkNoncopyable {
-    public:
-        ProgramCache(GrGpuGL* gpu);
-        ~ProgramCache();
-
-        void abandon();
-        GrGLProgram* getProgram(const GrGLProgramDesc& desc,
-                                const GrEffectStage* colorStages[],
-                                const GrEffectStage* coverageStages[]);
-
-    private:
-        enum {
-            // We may actually have kMaxEntries+1 shaders in the GL context because we create a new
-            // shader before evicting from the cache.
-            kMaxEntries = 128,
-            kHashBits = 6,
-        };
-
-        struct Entry;
-
-        struct ProgDescLess;
-
-        // binary search for entry matching desc. returns index into fEntries that matches desc or ~
-        // of the index of where it should be inserted.
-        int search(const GrGLProgramDesc& desc) const;
-
-        // sorted array of all the entries
-        Entry*                      fEntries[kMaxEntries];
-        // hash table based on lowest kHashBits bits of the program key. Used to avoid binary
-        // searching fEntries.
-        Entry*                      fHashTable[1 << kHashBits];
-
-        int                         fCount;
-        unsigned int                fCurrLRUStamp;
-        GrGpuGL*                    fGpu;
-#ifdef PROGRAM_CACHE_STATS
-        int                         fTotalRequests;
-        int                         fCacheMisses;
-        int                         fHashMisses; // cache hit but hash table missed
-#endif
-    };
-
-    // flushes dithering, color-mask, and face culling stat
-    void flushMiscFixedFunctionState();
-
-    // flushes the scissor. see the note on flushBoundTextureAndParams about
-    // flushing the scissor after that function is called.
-    void flushScissor();
-
-    void initFSAASupport();
-
-    // determines valid stencil formats
-    void initStencilFormats();
-
-    // sets a texture unit to use for texture operations other than binding a texture to a program.
-    // ensures that such operations don't negatively interact with tracking bound textures.
-    void setScratchTextureUnit();
-
-    // bound is region that may be modified and therefore has to be resolved.
-    // NULL means whole target. Can be an empty rect.
-    void flushRenderTarget(const SkIRect* bound);
-    void flushStencil(DrawType);
-    void flushAAState(DrawType);
-    void flushPathStencilSettings(SkPath::FillType fill);
-
-    bool configToGLFormats(GrPixelConfig config,
-                           bool getSizedInternal,
-                           GrGLenum* internalFormat,
-                           GrGLenum* externalFormat,
-                           GrGLenum* externalType);
-    // helper for onCreateTexture and writeTexturePixels
-    bool uploadTexData(const GrGLTexture::Desc& desc,
-                       bool isNewTexture,
-                       int left, int top, int width, int height,
-                       GrPixelConfig dataConfig,
-                       const void* data,
-                       size_t rowBytes);
-
-    // helper for onCreateCompressedTexture. If width and height are
-    // set to -1, then this function will use desc.fWidth and desc.fHeight
-    // for the size of the data. The isNewTexture flag should be set to true
-    // whenever a new texture needs to be created. Otherwise, we assume that
-    // the texture is already in GPU memory and that it's going to be updated
-    // with new data.
-    bool uploadCompressedTexData(const GrGLTexture::Desc& desc,
-                                 const void* data,
-                                 bool isNewTexture = true,
-                                 int left = 0, int top = 0,
-                                 int width = -1, int height = -1);
-
-    bool createRenderTargetObjects(int width, int height,
-                                   GrGLuint texID,
-                                   GrGLRenderTarget::Desc* desc);
-
-    GrGLContext fGLContext;
-
-    // GL program-related state
-    ProgramCache*               fProgramCache;
-    SkAutoTUnref<GrGLProgram>   fCurrentProgram;
-
-    ///////////////////////////////////////////////////////////////////////////
-    ///@name Caching of GL State
-    ///@{
-    int                         fHWActiveTextureUnitIdx;
-    GrGLuint                    fHWProgramID;
-
-    GrGLProgram::SharedGLState  fSharedGLProgramState;
-
-    enum TriState {
-        kNo_TriState,
-        kYes_TriState,
-        kUnknown_TriState
-    };
-
-    // last scissor / viewport scissor state seen by the GL.
-    struct {
-        TriState    fEnabled;
-        GrGLIRect   fRect;
-        void invalidate() {
-            fEnabled = kUnknown_TriState;
-            fRect.invalidate();
-        }
-    } fHWScissorSettings;
-
-    GrGLIRect   fHWViewport;
-
-    /**
-     * Tracks bound vertex and index buffers and vertex attrib array state.
-     */
-    class HWGeometryState {
-    public:
-        HWGeometryState() { fVBOVertexArray = NULL; this->invalidate(); }
-
-        ~HWGeometryState() { SkSafeUnref(fVBOVertexArray); }
-
-        void invalidate() {
-            fBoundVertexArrayIDIsValid = false;
-            fBoundVertexBufferIDIsValid = false;
-            fDefaultVertexArrayBoundIndexBufferID = false;
-            fDefaultVertexArrayBoundIndexBufferIDIsValid = false;
-            fDefaultVertexArrayAttribState.invalidate();
-            if (NULL != fVBOVertexArray) {
-                fVBOVertexArray->invalidateCachedState();
-            }
-        }
-
-        void notifyVertexArrayDelete(GrGLuint id) {
-            if (fBoundVertexArrayIDIsValid && fBoundVertexArrayID == id) {
-                // Does implicit bind to 0
-                fBoundVertexArrayID = 0;
-            }
-        }
-
-        void setVertexArrayID(GrGpuGL* gpu, GrGLuint arrayID) {
-            if (!gpu->glCaps().vertexArrayObjectSupport()) {
-                SkASSERT(0 == arrayID);
-                return;
-            }
-            if (!fBoundVertexArrayIDIsValid || arrayID != fBoundVertexArrayID) {
-                GR_GL_CALL(gpu->glInterface(), BindVertexArray(arrayID));
-                fBoundVertexArrayIDIsValid = true;
-                fBoundVertexArrayID = arrayID;
-            }
-        }
-
-        void notifyVertexBufferDelete(GrGLuint id) {
-            if (fBoundVertexBufferIDIsValid && id == fBoundVertexBufferID) {
-                fBoundVertexBufferID = 0;
-            }
-            if (NULL != fVBOVertexArray) {
-                fVBOVertexArray->notifyVertexBufferDelete(id);
-            }
-            fDefaultVertexArrayAttribState.notifyVertexBufferDelete(id);
-        }
-
-        void notifyIndexBufferDelete(GrGLuint id) {
-            if (fDefaultVertexArrayBoundIndexBufferIDIsValid &&
-                id == fDefaultVertexArrayBoundIndexBufferID) {
-                fDefaultVertexArrayBoundIndexBufferID = 0;
-            }
-            if (NULL != fVBOVertexArray) {
-                fVBOVertexArray->notifyIndexBufferDelete(id);
-            }
-        }
-
-        void setVertexBufferID(GrGpuGL* gpu, GrGLuint id) {
-            if (!fBoundVertexBufferIDIsValid || id != fBoundVertexBufferID) {
-                GR_GL_CALL(gpu->glInterface(), BindBuffer(GR_GL_ARRAY_BUFFER, id));
-                fBoundVertexBufferIDIsValid = true;
-                fBoundVertexBufferID = id;
-            }
-        }
-
-        /**
-         * Binds the default vertex array and binds the index buffer. This is used when binding
-         * an index buffer in order to update it.
-         */
-        void setIndexBufferIDOnDefaultVertexArray(GrGpuGL* gpu, GrGLuint id) {
-            this->setVertexArrayID(gpu, 0);
-            if (!fDefaultVertexArrayBoundIndexBufferIDIsValid ||
-                id != fDefaultVertexArrayBoundIndexBufferID) {
-                GR_GL_CALL(gpu->glInterface(), BindBuffer(GR_GL_ELEMENT_ARRAY_BUFFER, id));
-                fDefaultVertexArrayBoundIndexBufferIDIsValid = true;
-                fDefaultVertexArrayBoundIndexBufferID = id;
-            }
-        }
-
-        /**
-         * Binds the vertex array object that should be used to render from the vertex buffer.
-         * The vertex array is bound and its attrib array state object is returned. The vertex
-         * buffer is bound. The index buffer (if non-NULL) is bound to the vertex array. The
-         * returned GrGLAttribArrayState should be used to set vertex attribute arrays.
-         */
-        GrGLAttribArrayState* bindArrayAndBuffersToDraw(GrGpuGL* gpu,
-                                                        const GrGLVertexBuffer* vbuffer,
-                                                        const GrGLIndexBuffer* ibuffer);
-
-    private:
-        GrGLuint                fBoundVertexArrayID;
-        GrGLuint                fBoundVertexBufferID;
-        bool                    fBoundVertexArrayIDIsValid;
-        bool                    fBoundVertexBufferIDIsValid;
-
-        GrGLuint                fDefaultVertexArrayBoundIndexBufferID;
-        bool                    fDefaultVertexArrayBoundIndexBufferIDIsValid;
-        // We return a non-const pointer to this from bindArrayAndBuffersToDraw when vertex array 0
-        // is bound. However, this class is internal to GrGpuGL and this object never leaks out of
-        // GrGpuGL.
-        GrGLAttribArrayState    fDefaultVertexArrayAttribState;
-
-        // This is used when we're using a core profile and the vertices are in a VBO.
-        GrGLVertexArray*        fVBOVertexArray;
-    } fHWGeometryState;
-
-    struct {
-        GrBlendCoeff    fSrcCoeff;
-        GrBlendCoeff    fDstCoeff;
-        GrColor         fConstColor;
-        bool            fConstColorValid;
-        TriState        fEnabled;
-
-        void invalidate() {
-            fSrcCoeff = kInvalid_GrBlendCoeff;
-            fDstCoeff = kInvalid_GrBlendCoeff;
-            fConstColorValid = false;
-            fEnabled = kUnknown_TriState;
-        }
-    } fHWBlendState;
-
-    struct {
-        TriState fMSAAEnabled;
-        TriState fSmoothLineEnabled;
-        void invalidate() {
-            fMSAAEnabled = kUnknown_TriState;
-            fSmoothLineEnabled = kUnknown_TriState;
-        }
-    } fHWAAState;
-
-
-    GrGLProgram::MatrixState    fHWProjectionMatrixState;
-
-    GrStencilSettings           fHWStencilSettings;
-    TriState                    fHWStencilTestEnabled;
-    GrStencilSettings           fHWPathStencilSettings;
-
-    GrDrawState::DrawFace       fHWDrawFace;
-    TriState                    fHWWriteToColor;
-    TriState                    fHWDitherEnabled;
-    uint32_t                    fHWBoundRenderTargetUniqueID;
-    SkTArray<uint32_t, true>    fHWBoundTextureUniqueIDs;
-
-    struct PathTexGenData {
-        GrGLenum  fMode;
-        GrGLint   fNumComponents;
-        GrGLfloat fCoefficients[3 * 3];
-    };
-    int                         fHWActivePathTexGenSets;
-    SkTArray<PathTexGenData, true>  fHWPathTexGenSettings;
-    ///@}
-
-    // we record what stencil format worked last time to hopefully exit early
-    // from our loop that tries stencil formats and calls check fb status.
-    int fLastSuccessfulStencilFmtIdx;
-
-    SkAutoTDelete<GrGLNameAllocator> fPathNameAllocator;
-
-    typedef GrGpu INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/gpu/gl/GrGpuGL_program.cpp b/gfx/skia/skia/src/gpu/gl/GrGpuGL_program.cpp
deleted file mode 100644
index 45181c25a8d8..000000000000
--- a/gfx/skia/skia/src/gpu/gl/GrGpuGL_program.cpp
+++ /dev/null
@@ -1,377 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "GrGpuGL.h"
-
-#include "GrEffect.h"
-#include "GrGLEffect.h"
-#include "SkRTConf.h"
-#include "GrGLNameAllocator.h"
-#include "SkTSearch.h"
-
-#ifdef PROGRAM_CACHE_STATS
-SK_CONF_DECLARE(bool, c_DisplayCache, "gpu.displayCache", false,
-                "Display program cache usage.");
-#endif
-
-typedef GrGLUniformManager::UniformHandle UniformHandle;
-
-struct GrGpuGL::ProgramCache::Entry {
-    SK_DECLARE_INST_COUNT_ROOT(Entry);
-    Entry() : fProgram(NULL), fLRUStamp(0) {}
-
-    SkAutoTUnref<GrGLProgram>   fProgram;
-    unsigned int                fLRUStamp;
-};
-
-struct GrGpuGL::ProgramCache::ProgDescLess {
-    bool operator() (const GrGLProgramDesc& desc, const Entry* entry) {
-        SkASSERT(NULL != entry->fProgram.get());
-        return GrGLProgramDesc::Less(desc, entry->fProgram->getDesc());
-    }
-
-    bool operator() (const Entry* entry, const GrGLProgramDesc& desc) {
-        SkASSERT(NULL != entry->fProgram.get());
-        return GrGLProgramDesc::Less(entry->fProgram->getDesc(), desc);
-    }
-};
-
-GrGpuGL::ProgramCache::ProgramCache(GrGpuGL* gpu)
-    : fCount(0)
-    , fCurrLRUStamp(0)
-    , fGpu(gpu)
-#ifdef PROGRAM_CACHE_STATS
-    , fTotalRequests(0)
-    , fCacheMisses(0)
-    , fHashMisses(0)
-#endif
-{
-    for (int i = 0; i < 1 << kHashBits; ++i) {
-        fHashTable[i] = NULL;
-    }
-}
-
-GrGpuGL::ProgramCache::~ProgramCache() {
-    for (int i = 0; i < fCount; ++i){
-        SkDELETE(fEntries[i]);
-    }
-    // dump stats
-#ifdef PROGRAM_CACHE_STATS
-    if (c_DisplayCache) {
-        SkDebugf("--- Program Cache ---\n");
-        SkDebugf("Total requests: %d\n", fTotalRequests);
-        SkDebugf("Cache misses: %d\n", fCacheMisses);
-        SkDebugf("Cache miss %%: %f\n", (fTotalRequests > 0) ?
-                                            100.f * fCacheMisses / fTotalRequests :
-                                            0.f);
-        int cacheHits = fTotalRequests - fCacheMisses;
-        SkDebugf("Hash miss %%: %f\n", (cacheHits > 0) ? 100.f * fHashMisses / cacheHits : 0.f);
-        SkDebugf("---------------------\n");
-    }
-#endif
-}
-
-void GrGpuGL::ProgramCache::abandon() {
-    for (int i = 0; i < fCount; ++i) {
-        SkASSERT(NULL != fEntries[i]->fProgram.get());
-        fEntries[i]->fProgram->abandon();
-        fEntries[i]->fProgram.reset(NULL);
-    }
-    fCount = 0;
-}
-
-int GrGpuGL::ProgramCache::search(const GrGLProgramDesc& desc) const {
-    ProgDescLess less;
-    return SkTSearch(fEntries, fCount, desc, sizeof(Entry*), less);
-}
-
-GrGLProgram* GrGpuGL::ProgramCache::getProgram(const GrGLProgramDesc& desc,
-                                               const GrEffectStage* colorStages[],
-                                               const GrEffectStage* coverageStages[]) {
-#ifdef PROGRAM_CACHE_STATS
-    ++fTotalRequests;
-#endif
-
-    Entry* entry = NULL;
-
-    uint32_t hashIdx = desc.getChecksum();
-    hashIdx ^= hashIdx >> 16;
-    if (kHashBits <= 8) {
-        hashIdx ^= hashIdx >> 8;
-    }
-    hashIdx &=((1 << kHashBits) - 1);
-    Entry* hashedEntry = fHashTable[hashIdx];
-    if (NULL != hashedEntry && hashedEntry->fProgram->getDesc() == desc) {
-        SkASSERT(NULL != hashedEntry->fProgram);
-        entry = hashedEntry;
-    }
-
-    int entryIdx;
-    if (NULL == entry) {
-        entryIdx = this->search(desc);
-        if (entryIdx >= 0) {
-            entry = fEntries[entryIdx];
-#ifdef PROGRAM_CACHE_STATS
-            ++fHashMisses;
-#endif
-        }
-    }
-
-    if (NULL == entry) {
-        // We have a cache miss
-#ifdef PROGRAM_CACHE_STATS
-        ++fCacheMisses;
-#endif
-        GrGLProgram* program = GrGLProgram::Create(fGpu, desc, colorStages, coverageStages);
-        if (NULL == program) {
-            return NULL;
-        }
-        int purgeIdx = 0;
-        if (fCount < kMaxEntries) {
-            entry = SkNEW(Entry);
-            purgeIdx = fCount++;
-            fEntries[purgeIdx] = entry;
-        } else {
-            SkASSERT(fCount == kMaxEntries);
-            purgeIdx = 0;
-            for (int i = 1; i < kMaxEntries; ++i) {
-                if (fEntries[i]->fLRUStamp < fEntries[purgeIdx]->fLRUStamp) {
-                    purgeIdx = i;
-                }
-            }
-            entry = fEntries[purgeIdx];
-            int purgedHashIdx = entry->fProgram->getDesc().getChecksum() & ((1 << kHashBits) - 1);
-            if (fHashTable[purgedHashIdx] == entry) {
-                fHashTable[purgedHashIdx] = NULL;
-            }
-        }
-        SkASSERT(fEntries[purgeIdx] == entry);
-        entry->fProgram.reset(program);
-        // We need to shift fEntries around so that the entry currently at purgeIdx is placed
-        // just before the entry at ~entryIdx (in order to keep fEntries sorted by descriptor).
-        entryIdx = ~entryIdx;
-        if (entryIdx < purgeIdx) {
-            //  Let E and P be the entries at index entryIdx and purgeIdx, respectively.
-            //  If the entries array looks like this:
-            //       aaaaEbbbbbPccccc
-            //  we rearrange it to look like this:
-            //       aaaaPEbbbbbccccc
-            size_t copySize = (purgeIdx - entryIdx) * sizeof(Entry*);
-            memmove(fEntries + entryIdx + 1, fEntries + entryIdx, copySize);
-            fEntries[entryIdx] = entry;
-        } else if (purgeIdx < entryIdx) {
-            //  If the entries array looks like this:
-            //       aaaaPbbbbbEccccc
-            //  we rearrange it to look like this:
-            //       aaaabbbbbPEccccc
-            size_t copySize = (entryIdx - purgeIdx - 1) * sizeof(Entry*);
-            memmove(fEntries + purgeIdx, fEntries + purgeIdx + 1, copySize);
-            fEntries[entryIdx - 1] = entry;
-        }
-#ifdef SK_DEBUG
-        SkASSERT(NULL != fEntries[0]->fProgram.get());
-        for (int i = 0; i < fCount - 1; ++i) {
-            SkASSERT(NULL != fEntries[i + 1]->fProgram.get());
-            const GrGLProgramDesc& a = fEntries[i]->fProgram->getDesc();
-            const GrGLProgramDesc& b = fEntries[i + 1]->fProgram->getDesc();
-            SkASSERT(GrGLProgramDesc::Less(a, b));
-            SkASSERT(!GrGLProgramDesc::Less(b, a));
-        }
-#endif
-    }
-
-    fHashTable[hashIdx] = entry;
-    entry->fLRUStamp = fCurrLRUStamp;
-
-    if (SK_MaxU32 == fCurrLRUStamp) {
-        // wrap around! just trash our LRU, one time hit.
-        for (int i = 0; i < fCount; ++i) {
-            fEntries[i]->fLRUStamp = 0;
-        }
-    }
-    ++fCurrLRUStamp;
-    return entry->fProgram;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-void GrGpuGL::abandonResources(){
-    INHERITED::abandonResources();
-    fProgramCache->abandon();
-    fHWProgramID = 0;
-    fPathNameAllocator.reset(NULL);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-#define GL_CALL(X) GR_GL_CALL(this->glInterface(), X)
-
-bool GrGpuGL::flushGraphicsState(DrawType type, const GrDeviceCoordTexture* dstCopy) {
-    const GrDrawState& drawState = this->getDrawState();
-
-    // GrGpu::setupClipAndFlushState should have already checked this and bailed if not true.
-    SkASSERT(NULL != drawState.getRenderTarget());
-
-    if (kStencilPath_DrawType == type) {
-        const GrRenderTarget* rt = this->getDrawState().getRenderTarget();
-        SkISize size;
-        size.set(rt->width(), rt->height());
-        this->setProjectionMatrix(drawState.getViewMatrix(), size, rt->origin());
-    } else {
-        this->flushMiscFixedFunctionState();
-
-        GrBlendCoeff srcCoeff;
-        GrBlendCoeff dstCoeff;
-        GrDrawState::BlendOptFlags blendOpts = drawState.getBlendOpts(false, &srcCoeff, &dstCoeff);
-        if (GrDrawState::kSkipDraw_BlendOptFlag & blendOpts) {
-            return false;
-        }
-
-        SkSTArray<8, const GrEffectStage*, true> colorStages;
-        SkSTArray<8, const GrEffectStage*, true> coverageStages;
-        GrGLProgramDesc desc;
-        if (!GrGLProgramDesc::Build(this->getDrawState(),
-                               type,
-                               blendOpts,
-                               srcCoeff,
-                               dstCoeff,
-                               this,
-                               dstCopy,
-                               &colorStages,
-                               &coverageStages,
-                               &desc)) {
-            SkDEBUGFAIL("Failed to generate GL program descriptor");
-            return false;
-        }
-
-        fCurrentProgram.reset(fProgramCache->getProgram(desc,
-                                                        colorStages.begin(),
-                                                        coverageStages.begin()));
-        if (NULL == fCurrentProgram.get()) {
-            SkDEBUGFAIL("Failed to create program!");
-            return false;
-        }
-
-        SkASSERT((kDrawPath_DrawType != type && kDrawPaths_DrawType != type)
-                 || !fCurrentProgram->hasVertexShader());
-
-        fCurrentProgram.get()->ref();
-
-        GrGLuint programID = fCurrentProgram->programID();
-        if (fHWProgramID != programID) {
-            GL_CALL(UseProgram(programID));
-            fHWProgramID = programID;
-        }
-
-        fCurrentProgram->overrideBlend(&srcCoeff, &dstCoeff);
-        this->flushBlend(kDrawLines_DrawType == type, srcCoeff, dstCoeff);
-
-        fCurrentProgram->setData(blendOpts,
-                                 colorStages.begin(),
-                                 coverageStages.begin(),
-                                 dstCopy,
-                                 &fSharedGLProgramState);
-    }
-    this->flushStencil(type);
-    this->flushScissor();
-    this->flushAAState(type);
-
-    SkIRect* devRect = NULL;
-    SkIRect devClipBounds;
-    if (drawState.isClipState()) {
-        this->getClip()->getConservativeBounds(drawState.getRenderTarget(), &devClipBounds);
-        devRect = &devClipBounds;
-    }
-    // This must come after textures are flushed because a texture may need
-    // to be msaa-resolved (which will modify bound FBO state).
-    this->flushRenderTarget(devRect);
-
-    return true;
-}
-
-void GrGpuGL::setupGeometry(const DrawInfo& info, size_t* indexOffsetInBytes) {
-
-    GrGLsizei stride = static_cast<GrGLsizei>(this->getDrawState().getVertexSize());
-
-    size_t vertexOffsetInBytes = stride * info.startVertex();
-
-    const GeometryPoolState& geoPoolState = this->getGeomPoolState();
-
-    GrGLVertexBuffer* vbuf;
-    switch (this->getGeomSrc().fVertexSrc) {
-        case kBuffer_GeometrySrcType:
-            vbuf = (GrGLVertexBuffer*) this->getGeomSrc().fVertexBuffer;
-            break;
-        case kArray_GeometrySrcType:
-        case kReserved_GeometrySrcType:
-            this->finalizeReservedVertices();
-            vertexOffsetInBytes += geoPoolState.fPoolStartVertex * this->getGeomSrc().fVertexSize;
-            vbuf = (GrGLVertexBuffer*) geoPoolState.fPoolVertexBuffer;
-            break;
-        default:
-            vbuf = NULL; // suppress warning
-            SkFAIL("Unknown geometry src type!");
-    }
-
-    SkASSERT(NULL != vbuf);
-    SkASSERT(!vbuf->isMapped());
-    vertexOffsetInBytes += vbuf->baseOffset();
-
-    GrGLIndexBuffer* ibuf = NULL;
-    if (info.isIndexed()) {
-        SkASSERT(NULL != indexOffsetInBytes);
-
-        switch (this->getGeomSrc().fIndexSrc) {
-        case kBuffer_GeometrySrcType:
-            *indexOffsetInBytes = 0;
-            ibuf = (GrGLIndexBuffer*)this->getGeomSrc().fIndexBuffer;
-            break;
-        case kArray_GeometrySrcType:
-        case kReserved_GeometrySrcType:
-            this->finalizeReservedIndices();
-            *indexOffsetInBytes = geoPoolState.fPoolStartIndex * sizeof(GrGLushort);
-            ibuf = (GrGLIndexBuffer*) geoPoolState.fPoolIndexBuffer;
-            break;
-        default:
-            ibuf = NULL; // suppress warning
-            SkFAIL("Unknown geometry src type!");
-        }
-
-        SkASSERT(NULL != ibuf);
-        SkASSERT(!ibuf->isMapped());
-        *indexOffsetInBytes += ibuf->baseOffset();
-    }
-    GrGLAttribArrayState* attribState =
-        fHWGeometryState.bindArrayAndBuffersToDraw(this, vbuf, ibuf);
-
-    if (fCurrentProgram->hasVertexShader()) {
-        int vertexAttribCount = this->getDrawState().getVertexAttribCount();
-        uint32_t usedAttribArraysMask = 0;
-        const GrVertexAttrib* vertexAttrib = this->getDrawState().getVertexAttribs();
-
-        bool canIgnoreColorAttrib = this->getDrawState().canIgnoreColorAttribute();
-
-        for (int vertexAttribIndex = 0; vertexAttribIndex < vertexAttribCount;
-             ++vertexAttribIndex, ++vertexAttrib) {
-
-            if (kColor_GrVertexAttribBinding != vertexAttrib->fBinding || !canIgnoreColorAttrib) {
-            usedAttribArraysMask |= (1 << vertexAttribIndex);
-            GrVertexAttribType attribType = vertexAttrib->fType;
-            attribState->set(this,
-                             vertexAttribIndex,
-                             vbuf,
-                             GrGLAttribTypeToLayout(attribType).fCount,
-                             GrGLAttribTypeToLayout(attribType).fType,
-                             GrGLAttribTypeToLayout(attribType).fNormalized,
-                             stride,
-                             reinterpret_cast<GrGLvoid*>(
-                                 vertexOffsetInBytes + vertexAttrib->fOffset));
-            }
-        }
-        attribState->disableUnusedArrays(this, usedAttribArraysMask);
-    }
-}
diff --git a/gfx/skia/skia/src/gpu/gl/SkGLContext.cpp b/gfx/skia/skia/src/gpu/gl/SkGLContext.cpp
new file mode 100644
index 000000000000..ec318cb80d94
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/SkGLContext.cpp
@@ -0,0 +1,154 @@
+
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "gl/SkGLContext.h"
+#include "GrGLUtil.h"
+#include "SkGpuFenceSync.h"
+
+class SkGLContext::GLFenceSync : public SkGpuFenceSync {
+public:
+    static GLFenceSync* CreateIfSupported(const SkGLContext*);
+
+    SkPlatformGpuFence SK_WARN_UNUSED_RESULT insertFence() const override;
+    bool flushAndWaitFence(SkPlatformGpuFence fence) const override;
+    void deleteFence(SkPlatformGpuFence fence) const override;
+
+private:
+    GLFenceSync() {}
+
+    static const GrGLenum GL_SYNC_GPU_COMMANDS_COMPLETE  = 0x9117;
+    static const GrGLenum GL_WAIT_FAILED                 = 0x911d;
+    static const GrGLbitfield GL_SYNC_FLUSH_COMMANDS_BIT = 0x00000001;
+
+    typedef struct __GLsync *GLsync;
+
+    typedef GLsync (GR_GL_FUNCTION_TYPE* GLFenceSyncProc) (GrGLenum, GrGLbitfield);
+    typedef GrGLenum (GR_GL_FUNCTION_TYPE* GLClientWaitSyncProc) (GLsync, GrGLbitfield, GrGLuint64);
+    typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GLDeleteSyncProc) (GLsync);
+
+    GLFenceSyncProc        fGLFenceSync;
+    GLClientWaitSyncProc   fGLClientWaitSync;
+    GLDeleteSyncProc       fGLDeleteSync;
+
+    typedef SkGpuFenceSync INHERITED;
+};
+
+SkGLContext::SkGLContext()
+    : fCurrentFenceIdx(0) {
+    memset(fFrameFences, 0, sizeof(fFrameFences));
+}
+
+SkGLContext::~SkGLContext() {
+    // Subclass should call teardown.
+#ifdef SK_DEBUG
+    for (size_t i = 0; i < SK_ARRAY_COUNT(fFrameFences); i++) {
+        SkASSERT(0 == fFrameFences[i]);
+    }
+#endif
+    SkASSERT(nullptr == fGL.get());
+    SkASSERT(nullptr == fFenceSync.get());
+}
+
+void SkGLContext::init(const GrGLInterface* gl, SkGpuFenceSync* fenceSync) {
+    SkASSERT(!fGL.get());
+    fGL.reset(gl);
+    fFenceSync.reset(fenceSync ? fenceSync : GLFenceSync::CreateIfSupported(this));
+}
+
+void SkGLContext::teardown() {
+    if (fFenceSync) {
+        for (size_t i = 0; i < SK_ARRAY_COUNT(fFrameFences); i++) {
+            if (fFrameFences[i]) {
+                fFenceSync->deleteFence(fFrameFences[i]);
+                fFrameFences[i] = 0;
+            }
+        }
+        fFenceSync.reset(nullptr);
+    }
+
+    fGL.reset(nullptr);
+}
+
+void SkGLContext::makeCurrent() const {
+    this->onPlatformMakeCurrent();
+}
+
+void SkGLContext::swapBuffers() {
+    if (!fFenceSync) {
+        // Fallback on the platform SwapBuffers method for synchronization. This may have no effect.
+        this->onPlatformSwapBuffers();
+        return;
+    }
+
+    if (fFrameFences[fCurrentFenceIdx]) {
+        if (!fFenceSync->flushAndWaitFence(fFrameFences[fCurrentFenceIdx])) {
+            SkDebugf("WARNING: Wait failed for fence sync. Timings might not be accurate.\n");
+        }
+        fFenceSync->deleteFence(fFrameFences[fCurrentFenceIdx]);
+    }
+
+    fFrameFences[fCurrentFenceIdx] = fFenceSync->insertFence();
+    fCurrentFenceIdx = (fCurrentFenceIdx + 1) % SK_ARRAY_COUNT(fFrameFences);
+}
+
+void SkGLContext::testAbandon() {
+    if (fGL) {
+        fGL->abandon();
+    }
+    if (fFenceSync) {
+        memset(fFrameFences, 0, sizeof(fFrameFences));
+    }
+}
+
+SkGLContext::GLFenceSync* SkGLContext::GLFenceSync::CreateIfSupported(const SkGLContext* ctx) {
+    SkAutoTDelete<GLFenceSync> ret(new GLFenceSync);
+
+    if (kGL_GrGLStandard == ctx->gl()->fStandard) {
+        const GrGLubyte* versionStr;
+        SK_GL_RET(*ctx, versionStr, GetString(GR_GL_VERSION));
+        GrGLVersion version = GrGLGetVersionFromString(reinterpret_cast<const char*>(versionStr));
+        if (version < GR_GL_VER(3,2) && !ctx->gl()->hasExtension("GL_ARB_sync")) {
+            return nullptr;
+        }
+        ret->fGLFenceSync = reinterpret_cast<GLFenceSyncProc>(
+            ctx->onPlatformGetProcAddress("glFenceSync"));
+        ret->fGLClientWaitSync = reinterpret_cast<GLClientWaitSyncProc>(
+            ctx->onPlatformGetProcAddress("glClientWaitSync"));
+        ret->fGLDeleteSync = reinterpret_cast<GLDeleteSyncProc>(
+            ctx->onPlatformGetProcAddress("glDeleteSync"));
+    } else {
+        if (!ctx->gl()->hasExtension("GL_APPLE_sync")) {
+            return nullptr;
+        }
+        ret->fGLFenceSync = reinterpret_cast<GLFenceSyncProc>(
+            ctx->onPlatformGetProcAddress("glFenceSyncAPPLE"));
+        ret->fGLClientWaitSync = reinterpret_cast<GLClientWaitSyncProc>(
+            ctx->onPlatformGetProcAddress("glClientWaitSyncAPPLE"));
+        ret->fGLDeleteSync = reinterpret_cast<GLDeleteSyncProc>(
+            ctx->onPlatformGetProcAddress("glDeleteSyncAPPLE"));
+    }
+
+    if (!ret->fGLFenceSync || !ret->fGLClientWaitSync || !ret->fGLDeleteSync) {
+        return nullptr;
+    }
+
+    return ret.detach();
+}
+
+SkPlatformGpuFence SkGLContext::GLFenceSync::insertFence() const {
+    return fGLFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+}
+
+bool SkGLContext::GLFenceSync::flushAndWaitFence(SkPlatformGpuFence fence) const {
+    GLsync glsync = static_cast<GLsync>(fence);
+    return GL_WAIT_FAILED != fGLClientWaitSync(glsync, GL_SYNC_FLUSH_COMMANDS_BIT, -1);
+}
+
+void SkGLContext::GLFenceSync::deleteFence(SkPlatformGpuFence fence) const {
+    GLsync glsync = static_cast<GLsync>(fence);
+    fGLDeleteSync(glsync);
+}
diff --git a/gfx/skia/skia/src/gpu/gl/SkGLContextHelper.cpp b/gfx/skia/skia/src/gpu/gl/SkGLContextHelper.cpp
deleted file mode 100644
index 2381a84519b8..000000000000
--- a/gfx/skia/skia/src/gpu/gl/SkGLContextHelper.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#include "gl/SkGLContextHelper.h"
-#include "GrGLUtil.h"
-
-SkGLContextHelper::SkGLContextHelper()
-    : fFBO(0)
-    , fColorBufferID(0)
-    , fDepthStencilBufferID(0)
-    , fGL(NULL) {
-}
-
-SkGLContextHelper::~SkGLContextHelper() {
-
-    if (fGL) {
-        // TODO: determine why DeleteFramebuffers is generating a GL error in tests
-        SK_GL_NOERRCHECK(*this, DeleteFramebuffers(1, &fFBO));
-        SK_GL_NOERRCHECK(*this, DeleteRenderbuffers(1, &fColorBufferID));
-        SK_GL_NOERRCHECK(*this, DeleteRenderbuffers(1, &fDepthStencilBufferID));
-    }
-
-    SkSafeUnref(fGL);
-}
-
-bool SkGLContextHelper::init(GrGLStandard forcedGpuAPI, int width,
-                             int height) {
-    if (fGL) {
-        fGL->unref();
-        this->destroyGLContext();
-    }
-
-    fGL = this->createGLContext(forcedGpuAPI);
-    if (fGL) {
-        const GrGLubyte* temp;
-
-        if (!fGL->validate()) {
-            fGL = NULL;
-            this->destroyGLContext();
-            return false;
-        }
-
-        SK_GL_RET(*this, temp, GetString(GR_GL_VERSION));
-        const char* versionStr = reinterpret_cast<const char*>(temp);
-        GrGLVersion version = GrGLGetVersionFromString(versionStr);
-
-        // clear any existing GL erorrs
-        GrGLenum error;
-        do {
-            SK_GL_RET(*this, error, GetError());
-        } while (GR_GL_NO_ERROR != error);
-
-        SK_GL(*this, GenFramebuffers(1, &fFBO));
-        SK_GL(*this, BindFramebuffer(GR_GL_FRAMEBUFFER, fFBO));
-        SK_GL(*this, GenRenderbuffers(1, &fColorBufferID));
-        SK_GL(*this, BindRenderbuffer(GR_GL_RENDERBUFFER, fColorBufferID));
-        if (kGLES_GrGLStandard == this->gl()->fStandard) {
-            SK_GL(*this, RenderbufferStorage(GR_GL_RENDERBUFFER,
-                                             GR_GL_RGBA8,
-                                             width, height));
-        } else {
-            SK_GL(*this, RenderbufferStorage(GR_GL_RENDERBUFFER,
-                                             GR_GL_RGBA,
-                                             width, height));
-        }
-        SK_GL(*this, FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
-                                             GR_GL_COLOR_ATTACHMENT0,
-                                             GR_GL_RENDERBUFFER,
-                                             fColorBufferID));
-        SK_GL(*this, GenRenderbuffers(1, &fDepthStencilBufferID));
-        SK_GL(*this, BindRenderbuffer(GR_GL_RENDERBUFFER, fDepthStencilBufferID));
-
-        // Some drivers that support packed depth stencil will only succeed
-        // in binding a packed format an FBO. However, we can't rely on packed
-        // depth stencil being available.
-        bool supportsPackedDepthStencil;
-        if (kGLES_GrGLStandard == this->gl()->fStandard) {
-            supportsPackedDepthStencil = version >= GR_GL_VER(3,0) ||
-                                         this->hasExtension("GL_OES_packed_depth_stencil");
-        } else {
-            supportsPackedDepthStencil = version >= GR_GL_VER(3,0) ||
-                                         this->hasExtension("GL_EXT_packed_depth_stencil") ||
-                                         this->hasExtension("GL_ARB_framebuffer_object");
-        }
-
-        if (supportsPackedDepthStencil) {
-            // ES2 requires sized internal formats for RenderbufferStorage
-            // On Desktop we let the driver decide.
-            GrGLenum format = kGLES_GrGLStandard == this->gl()->fStandard ?
-                                    GR_GL_DEPTH24_STENCIL8 :
-                                    GR_GL_DEPTH_STENCIL;
-            SK_GL(*this, RenderbufferStorage(GR_GL_RENDERBUFFER,
-                                             format,
-                                             width, height));
-            SK_GL(*this, FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
-                                                 GR_GL_DEPTH_ATTACHMENT,
-                                                 GR_GL_RENDERBUFFER,
-                                                 fDepthStencilBufferID));
-        } else {
-            GrGLenum format = kGLES_GrGLStandard == this->gl()->fStandard ? GR_GL_STENCIL_INDEX8 :
-                                                                          GR_GL_STENCIL_INDEX;
-            SK_GL(*this, RenderbufferStorage(GR_GL_RENDERBUFFER,
-                                             format,
-                                             width, height));
-        }
-        SK_GL(*this, FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
-                                             GR_GL_STENCIL_ATTACHMENT,
-                                             GR_GL_RENDERBUFFER,
-                                             fDepthStencilBufferID));
-        SK_GL(*this, Viewport(0, 0, width, height));
-        SK_GL(*this, ClearStencil(0));
-        SK_GL(*this, Clear(GR_GL_STENCIL_BUFFER_BIT));
-
-        SK_GL_RET(*this, error, GetError());
-        GrGLenum status;
-        SK_GL_RET(*this, status, CheckFramebufferStatus(GR_GL_FRAMEBUFFER));
-
-        if (GR_GL_FRAMEBUFFER_COMPLETE != status ||
-            GR_GL_NO_ERROR != error) {
-            fFBO = 0;
-            fColorBufferID = 0;
-            fDepthStencilBufferID = 0;
-            fGL->unref();
-            fGL = NULL;
-            this->destroyGLContext();
-            return false;
-        } else {
-            return true;
-        }
-    }
-    return false;
-}
diff --git a/gfx/skia/skia/src/gpu/gl/SkNullGLContext.cpp b/gfx/skia/skia/src/gpu/gl/SkNullGLContext.cpp
index 576ee526f198..e2a80ce2b37e 100644
--- a/gfx/skia/skia/src/gpu/gl/SkNullGLContext.cpp
+++ b/gfx/skia/skia/src/gpu/gl/SkNullGLContext.cpp
@@ -7,10 +7,556 @@
  */
 
 #include "gl/SkNullGLContext.h"
+#include "gl/GrGLInterface.h"
+#include "GrGLDefines.h"
+#include "GrGLNoOpInterface.h"
+#include "SkTDArray.h"
+#include "SkTLS.h"
 
-const GrGLInterface* SkNullGLContext::createGLContext(GrGLStandard forcedGpuAPI) {
-    if (kGLES_GrGLStandard == forcedGpuAPI) {
-        return NULL;
+static SkNullGLContext::ContextState* current_context();
+
+/////////////////////////////////////////////////////////////////////////////////////////////////
+
+class BufferObj {
+public:
+    
+
+    BufferObj(GrGLuint id) : fID(id), fDataPtr(nullptr), fSize(0), fMapped(false) {}
+    ~BufferObj() { delete[] fDataPtr; }
+
+    void allocate(GrGLsizeiptr size, const GrGLchar* dataPtr) {
+        if (fDataPtr) {
+            SkASSERT(0 != fSize);
+            delete[] fDataPtr;
+        }
+
+        fSize = size;
+        fDataPtr = new char[size];
     }
-    return GrGLCreateNullInterface();
+
+    GrGLuint id() const          { return fID; }
+    GrGLchar* dataPtr()          { return fDataPtr; }
+    GrGLsizeiptr size() const    { return fSize; }
+
+    void setMapped(bool mapped)  { fMapped = mapped; }
+    bool mapped() const          { return fMapped; }
+
+private:
+    GrGLuint     fID;
+    GrGLchar*    fDataPtr;
+    GrGLsizeiptr fSize;         // size in bytes
+    bool         fMapped;
 };
+
+// This class maintains a sparsely populated array of buffer pointers.
+class BufferManager {
+public:
+    
+
+    BufferManager() : fFreeListHead(kFreeListEnd) {}
+
+    ~BufferManager() {
+        // nullptr out the entries that are really free list links rather than ptrs before deleting.
+        intptr_t curr = fFreeListHead;
+        while (kFreeListEnd != curr) {
+            intptr_t next = reinterpret_cast<intptr_t>(fBuffers[SkToS32(curr)]);
+            fBuffers[SkToS32(curr)] = nullptr;
+            curr = next;
+        }
+
+        fBuffers.deleteAll();
+    }
+
+    BufferObj* lookUp(GrGLuint id) {
+        BufferObj* buffer = fBuffers[id];
+        SkASSERT(buffer && buffer->id() == id);
+        return buffer;
+    }
+
+    BufferObj* create() {
+        GrGLuint id;
+        BufferObj* buffer;
+
+        if (kFreeListEnd == fFreeListHead) {
+            // no free slots - create a new one
+            id = fBuffers.count();
+            buffer = new BufferObj(id);
+            *fBuffers.append() = buffer;
+        } else {
+            // grab the head of the free list and advance the head to the next free slot.
+            id = static_cast<GrGLuint>(fFreeListHead);
+            fFreeListHead = reinterpret_cast<intptr_t>(fBuffers[id]);
+
+            buffer = new BufferObj(id);
+            fBuffers[id] = buffer;
+        }
+
+        return buffer;
+    }
+
+    void free(BufferObj* buffer) {
+        SkASSERT(fBuffers.count() > 0);
+
+        GrGLuint id = buffer->id();
+        delete buffer;
+
+        fBuffers[id] = reinterpret_cast<BufferObj*>(fFreeListHead);
+        fFreeListHead = id;
+    }
+
+private:
+    static const intptr_t kFreeListEnd = -1;
+    // Index of the first entry of fBuffers in the free list. Free slots in fBuffers are indices to
+    // the next free slot. The last free slot has a value of kFreeListEnd.
+    intptr_t                fFreeListHead;
+    SkTDArray<BufferObj*>   fBuffers;
+};
+
+/**
+ * The state object for the null interface.
+ */
+class SkNullGLContext::ContextState : public SkRefCnt {
+public:
+    
+
+    BufferManager   fBufferManager;
+    GrGLuint        fCurrArrayBuffer;
+    GrGLuint        fCurrElementArrayBuffer;
+    GrGLuint        fCurrProgramID;
+    GrGLuint        fCurrShaderID;
+
+
+    ContextState()
+        : fCurrArrayBuffer(0)
+        , fCurrElementArrayBuffer(0)
+        , fCurrProgramID(0)
+        , fCurrShaderID(0) {}
+
+    static ContextState* Get() { return current_context(); }
+};
+
+typedef SkNullGLContext::ContextState State;
+
+// Functions not declared in GrGLBogusInterface.h (not common with the Debug GL interface).
+
+namespace { // added to suppress 'no previous prototype' warning
+
+GrGLvoid GR_GL_FUNCTION_TYPE nullGLActiveTexture(GrGLenum texture) {}
+GrGLvoid GR_GL_FUNCTION_TYPE nullGLAttachShader(GrGLuint program, GrGLuint shader) {}
+GrGLvoid GR_GL_FUNCTION_TYPE nullGLBeginQuery(GrGLenum target, GrGLuint id) {}
+GrGLvoid GR_GL_FUNCTION_TYPE nullGLBindAttribLocation(GrGLuint program, GrGLuint index, const char* name) {}
+GrGLvoid GR_GL_FUNCTION_TYPE nullGLBindTexture(GrGLenum target, GrGLuint texture) {}
+GrGLvoid GR_GL_FUNCTION_TYPE nullGLBindVertexArray(GrGLuint id) {}
+
+GrGLvoid GR_GL_FUNCTION_TYPE nullGLGenBuffers(GrGLsizei n, GrGLuint* ids) {
+    State* state = State::Get();
+    for (int i = 0; i < n; ++i) {
+        BufferObj* buffer = state->fBufferManager.create();
+        ids[i] = buffer->id();
+    }
+}
+
+GrGLvoid GR_GL_FUNCTION_TYPE nullGLGenerateMipmap(GrGLenum target) {}
+
+GrGLvoid GR_GL_FUNCTION_TYPE nullGLBufferData(GrGLenum target,
+                                              GrGLsizeiptr size,
+                                              const GrGLvoid* data,
+                                              GrGLenum usage) {
+    State* state = State::Get();
+    GrGLuint id = 0;
+
+    switch (target) {
+    case GR_GL_ARRAY_BUFFER:
+        id = state->fCurrArrayBuffer;
+        break;
+    case GR_GL_ELEMENT_ARRAY_BUFFER:
+        id = state->fCurrElementArrayBuffer;
+        break;
+    default:
+        SkFAIL("Unexpected target to nullGLBufferData");
+        break;
+    }
+
+    if (id > 0) {
+        BufferObj* buffer = state->fBufferManager.lookUp(id);
+        buffer->allocate(size, (const GrGLchar*) data);
+    }
+}
+
+GrGLvoid GR_GL_FUNCTION_TYPE nullGLPixelStorei(GrGLenum pname, GrGLint param) {}
+GrGLvoid GR_GL_FUNCTION_TYPE nullGLReadPixels(GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height, GrGLenum format, GrGLenum type, GrGLvoid* pixels) {}
+GrGLvoid GR_GL_FUNCTION_TYPE nullGLUseProgram(GrGLuint program) {}
+GrGLvoid GR_GL_FUNCTION_TYPE nullGLViewport(GrGLint x, GrGLint y, GrGLsizei width, GrGLsizei height) {}
+GrGLvoid GR_GL_FUNCTION_TYPE nullGLBindFramebuffer(GrGLenum target, GrGLuint framebuffer) {}
+GrGLvoid GR_GL_FUNCTION_TYPE nullGLBindRenderbuffer(GrGLenum target, GrGLuint renderbuffer) {}
+GrGLvoid GR_GL_FUNCTION_TYPE nullGLDeleteFramebuffers(GrGLsizei n, const GrGLuint *framebuffers) {}
+GrGLvoid GR_GL_FUNCTION_TYPE nullGLDeleteRenderbuffers(GrGLsizei n, const GrGLuint *renderbuffers) {}
+GrGLvoid GR_GL_FUNCTION_TYPE nullGLFramebufferRenderbuffer(GrGLenum target, GrGLenum attachment, GrGLenum renderbuffertarget, GrGLuint renderbuffer) {}
+GrGLvoid GR_GL_FUNCTION_TYPE nullGLFramebufferTexture2D(GrGLenum target, GrGLenum attachment, GrGLenum textarget, GrGLuint texture, GrGLint level) {}
+
+GrGLuint GR_GL_FUNCTION_TYPE nullGLCreateProgram() {
+    return ++State::Get()->fCurrProgramID;
+}
+
+GrGLuint GR_GL_FUNCTION_TYPE nullGLCreateShader(GrGLenum type) {
+    return ++State::Get()->fCurrShaderID;
+}
+
+// same delete used for shaders and programs
+GrGLvoid GR_GL_FUNCTION_TYPE nullGLDelete(GrGLuint program) {
+}
+
+GrGLvoid GR_GL_FUNCTION_TYPE nullGLBindBuffer(GrGLenum target, GrGLuint buffer) {
+    State* state = State::Get();
+    switch (target) {
+    case GR_GL_ARRAY_BUFFER:
+        state->fCurrArrayBuffer = buffer;
+        break;
+    case GR_GL_ELEMENT_ARRAY_BUFFER:
+        state->fCurrElementArrayBuffer = buffer;
+        break;
+    }
+}
+
+// deleting a bound buffer has the side effect of binding 0
+GrGLvoid GR_GL_FUNCTION_TYPE nullGLDeleteBuffers(GrGLsizei n, const GrGLuint* ids) {
+    State* state = State::Get();
+    for (int i = 0; i < n; ++i) {
+        if (ids[i] == state->fCurrArrayBuffer) {
+            state->fCurrArrayBuffer = 0;
+        }
+        if (ids[i] == state->fCurrElementArrayBuffer) {
+            state->fCurrElementArrayBuffer = 0;
+        }
+
+        BufferObj* buffer = state->fBufferManager.lookUp(ids[i]);
+        state->fBufferManager.free(buffer);
+    }
+}
+
+GrGLvoid* GR_GL_FUNCTION_TYPE nullGLMapBufferRange(GrGLenum target, GrGLintptr offset,
+                                                   GrGLsizeiptr length, GrGLbitfield access) {
+    State* state = State::Get();
+    GrGLuint id = 0;
+    switch (target) {
+        case GR_GL_ARRAY_BUFFER:
+            id = state->fCurrArrayBuffer;
+            break;
+        case GR_GL_ELEMENT_ARRAY_BUFFER:
+            id = state->fCurrElementArrayBuffer;
+            break;
+    }
+
+    if (id > 0) {
+        // We just ignore the offset and length here.
+        BufferObj* buffer = state->fBufferManager.lookUp(id);
+        SkASSERT(!buffer->mapped());
+        buffer->setMapped(true);
+        return buffer->dataPtr();
+    }
+    return nullptr;
+}
+
+GrGLvoid* GR_GL_FUNCTION_TYPE nullGLMapBuffer(GrGLenum target, GrGLenum access) {
+    State* state = State::Get();
+    GrGLuint id = 0;
+    switch (target) {
+        case GR_GL_ARRAY_BUFFER:
+            id = state->fCurrArrayBuffer;
+            break;
+        case GR_GL_ELEMENT_ARRAY_BUFFER:
+            id = state->fCurrElementArrayBuffer;
+            break;
+    }
+
+    if (id > 0) {
+        BufferObj* buffer = state->fBufferManager.lookUp(id);
+        SkASSERT(!buffer->mapped());
+        buffer->setMapped(true);
+        return buffer->dataPtr();
+    }
+
+    SkASSERT(false);
+    return nullptr;            // no buffer bound to target
+}
+
+GrGLvoid GR_GL_FUNCTION_TYPE nullGLFlushMappedBufferRange(GrGLenum target,
+                                                          GrGLintptr offset,
+                                                          GrGLsizeiptr length) {}
+
+
+GrGLboolean GR_GL_FUNCTION_TYPE nullGLUnmapBuffer(GrGLenum target) {
+    State* state = State::Get();
+    GrGLuint id = 0;
+    switch (target) {
+    case GR_GL_ARRAY_BUFFER:
+        id = state->fCurrArrayBuffer;
+        break;
+    case GR_GL_ELEMENT_ARRAY_BUFFER:
+        id = state->fCurrElementArrayBuffer;
+        break;
+    }
+    if (id > 0) {
+        BufferObj* buffer = state->fBufferManager.lookUp(id);
+        SkASSERT(buffer->mapped());
+        buffer->setMapped(false);
+        return GR_GL_TRUE;
+    }
+
+    GrAlwaysAssert(false);
+    return GR_GL_FALSE; // GR_GL_INVALID_OPERATION;
+}
+
+GrGLvoid GR_GL_FUNCTION_TYPE nullGLGetBufferParameteriv(GrGLenum target, GrGLenum pname, GrGLint* params) {
+    State* state = State::Get();
+    switch (pname) {
+        case GR_GL_BUFFER_MAPPED: {
+            *params = GR_GL_FALSE;
+            GrGLuint id = 0;
+            switch (target) {
+                case GR_GL_ARRAY_BUFFER:
+                    id = state->fCurrArrayBuffer;
+                    break;
+                case GR_GL_ELEMENT_ARRAY_BUFFER:
+                    id = state->fCurrElementArrayBuffer;
+                    break;
+            }
+            if (id > 0) {
+                BufferObj* buffer = state->fBufferManager.lookUp(id);
+                if (buffer->mapped()) {
+                    *params = GR_GL_TRUE;
+                }
+            }
+            break; }
+        default:
+            SkFAIL("Unexpected pname to GetBufferParamateriv");
+            break;
+    }
+};
+
+class NullInterface : public GrGLInterface {
+public:
+    NullInterface(State* state) : fState(SkRef(state)) {}
+    ~NullInterface() override {
+        fState->unref();
+    }
+    State* fState;
+};
+
+} // end anonymous namespace
+
+static GrGLInterface* create_null_interface(State* state) {
+    GrGLInterface* interface = new NullInterface(state);
+
+    interface->fStandard = kGL_GrGLStandard;
+
+    GrGLInterface::Functions* functions = &interface->fFunctions;
+    functions->fActiveTexture = nullGLActiveTexture;
+    functions->fAttachShader = nullGLAttachShader;
+    functions->fBeginQuery = nullGLBeginQuery;
+    functions->fBindAttribLocation = nullGLBindAttribLocation;
+    functions->fBindBuffer = nullGLBindBuffer;
+    functions->fBindFragDataLocation = noOpGLBindFragDataLocation;
+    functions->fBindTexture = nullGLBindTexture;
+    functions->fBindVertexArray = nullGLBindVertexArray;
+    functions->fBlendColor = noOpGLBlendColor;
+    functions->fBlendEquation = noOpGLBlendEquation;
+    functions->fBlendFunc = noOpGLBlendFunc;
+    functions->fBufferData = nullGLBufferData;
+    functions->fBufferSubData = noOpGLBufferSubData;
+    functions->fClear = noOpGLClear;
+    functions->fClearColor = noOpGLClearColor;
+    functions->fClearStencil = noOpGLClearStencil;
+    functions->fColorMask = noOpGLColorMask;
+    functions->fCompileShader = noOpGLCompileShader;
+    functions->fCompressedTexImage2D = noOpGLCompressedTexImage2D;
+    functions->fCompressedTexSubImage2D = noOpGLCompressedTexSubImage2D;
+    functions->fCopyTexSubImage2D = noOpGLCopyTexSubImage2D;
+    functions->fCreateProgram = nullGLCreateProgram;
+    functions->fCreateShader = nullGLCreateShader;
+    functions->fCullFace = noOpGLCullFace;
+    functions->fDeleteBuffers = nullGLDeleteBuffers;
+    functions->fDeleteProgram = nullGLDelete;
+    functions->fDeleteQueries = noOpGLDeleteIds;
+    functions->fDeleteShader = nullGLDelete;
+    functions->fDeleteTextures = noOpGLDeleteIds;
+    functions->fDeleteVertexArrays = noOpGLDeleteIds;
+    functions->fDepthMask = noOpGLDepthMask;
+    functions->fDisable = noOpGLDisable;
+    functions->fDisableVertexAttribArray = noOpGLDisableVertexAttribArray;
+    functions->fDrawArrays = noOpGLDrawArrays;
+    functions->fDrawArraysInstanced = noOpGLDrawArraysInstanced;
+    functions->fDrawBuffer = noOpGLDrawBuffer;
+    functions->fDrawBuffers = noOpGLDrawBuffers;
+    functions->fDrawElements = noOpGLDrawElements;
+    functions->fDrawElementsInstanced = noOpGLDrawElementsInstanced;
+    functions->fEnable = noOpGLEnable;
+    functions->fEnableVertexAttribArray = noOpGLEnableVertexAttribArray;
+    functions->fEndQuery = noOpGLEndQuery;
+    functions->fFinish = noOpGLFinish;
+    functions->fFlush = noOpGLFlush;
+    functions->fFlushMappedBufferRange = nullGLFlushMappedBufferRange;
+    functions->fFrontFace = noOpGLFrontFace;
+    functions->fGenBuffers = nullGLGenBuffers;
+    functions->fGenerateMipmap = nullGLGenerateMipmap;
+    functions->fGenQueries = noOpGLGenIds;
+    functions->fGenTextures = noOpGLGenIds;
+    functions->fGenVertexArrays = noOpGLGenIds;
+    functions->fGetBufferParameteriv = nullGLGetBufferParameteriv;
+    functions->fGetError = noOpGLGetError;
+    functions->fGetIntegerv = noOpGLGetIntegerv;
+    functions->fGetQueryObjecti64v = noOpGLGetQueryObjecti64v;
+    functions->fGetQueryObjectiv = noOpGLGetQueryObjectiv;
+    functions->fGetQueryObjectui64v = noOpGLGetQueryObjectui64v;
+    functions->fGetQueryObjectuiv = noOpGLGetQueryObjectuiv;
+    functions->fGetQueryiv = noOpGLGetQueryiv;
+    functions->fGetProgramInfoLog = noOpGLGetInfoLog;
+    functions->fGetProgramiv = noOpGLGetShaderOrProgramiv;
+    functions->fGetShaderInfoLog = noOpGLGetInfoLog;
+    functions->fGetShaderiv = noOpGLGetShaderOrProgramiv;
+    functions->fGetString = noOpGLGetString;
+    functions->fGetStringi = noOpGLGetStringi;
+    functions->fGetTexLevelParameteriv = noOpGLGetTexLevelParameteriv;
+    functions->fGetUniformLocation = noOpGLGetUniformLocation;
+    functions->fInsertEventMarker = noOpGLInsertEventMarker;
+    functions->fLineWidth = noOpGLLineWidth;
+    functions->fLinkProgram = noOpGLLinkProgram;
+    functions->fMapBuffer = nullGLMapBuffer;
+    functions->fMapBufferRange = nullGLMapBufferRange;
+    functions->fPixelStorei = nullGLPixelStorei;
+    functions->fPopGroupMarker = noOpGLPopGroupMarker;
+    functions->fPushGroupMarker = noOpGLPushGroupMarker;
+    functions->fQueryCounter = noOpGLQueryCounter;
+    functions->fReadBuffer = noOpGLReadBuffer;
+    functions->fReadPixels = nullGLReadPixels;
+    functions->fScissor = noOpGLScissor;
+    functions->fShaderSource = noOpGLShaderSource;
+    functions->fStencilFunc = noOpGLStencilFunc;
+    functions->fStencilFuncSeparate = noOpGLStencilFuncSeparate;
+    functions->fStencilMask = noOpGLStencilMask;
+    functions->fStencilMaskSeparate = noOpGLStencilMaskSeparate;
+    functions->fStencilOp = noOpGLStencilOp;
+    functions->fStencilOpSeparate = noOpGLStencilOpSeparate;
+    functions->fTexImage2D = noOpGLTexImage2D;
+    functions->fTexParameteri = noOpGLTexParameteri;
+    functions->fTexParameteriv = noOpGLTexParameteriv;
+    functions->fTexSubImage2D = noOpGLTexSubImage2D;
+    functions->fTexStorage2D = noOpGLTexStorage2D;
+    functions->fDiscardFramebuffer = noOpGLDiscardFramebuffer;
+    functions->fUniform1f = noOpGLUniform1f;
+    functions->fUniform1i = noOpGLUniform1i;
+    functions->fUniform1fv = noOpGLUniform1fv;
+    functions->fUniform1iv = noOpGLUniform1iv;
+    functions->fUniform2f = noOpGLUniform2f;
+    functions->fUniform2i = noOpGLUniform2i;
+    functions->fUniform2fv = noOpGLUniform2fv;
+    functions->fUniform2iv = noOpGLUniform2iv;
+    functions->fUniform3f = noOpGLUniform3f;
+    functions->fUniform3i = noOpGLUniform3i;
+    functions->fUniform3fv = noOpGLUniform3fv;
+    functions->fUniform3iv = noOpGLUniform3iv;
+    functions->fUniform4f = noOpGLUniform4f;
+    functions->fUniform4i = noOpGLUniform4i;
+    functions->fUniform4fv = noOpGLUniform4fv;
+    functions->fUniform4iv = noOpGLUniform4iv;
+    functions->fUniformMatrix2fv = noOpGLUniformMatrix2fv;
+    functions->fUniformMatrix3fv = noOpGLUniformMatrix3fv;
+    functions->fUniformMatrix4fv = noOpGLUniformMatrix4fv;
+    functions->fUnmapBuffer = nullGLUnmapBuffer;
+    functions->fUseProgram = nullGLUseProgram;
+    functions->fVertexAttrib1f = noOpGLVertexAttrib1f;
+    functions->fVertexAttrib2fv = noOpGLVertexAttrib2fv;
+    functions->fVertexAttrib3fv = noOpGLVertexAttrib3fv;
+    functions->fVertexAttrib4fv = noOpGLVertexAttrib4fv;
+    functions->fVertexAttribPointer = noOpGLVertexAttribPointer;
+    functions->fVertexAttribDivisor = noOpGLVertexAttribDivisor;
+    functions->fViewport = nullGLViewport;
+    functions->fBindFramebuffer = nullGLBindFramebuffer;
+    functions->fBindRenderbuffer = nullGLBindRenderbuffer;
+    functions->fCheckFramebufferStatus = noOpGLCheckFramebufferStatus;
+    functions->fDeleteFramebuffers = nullGLDeleteFramebuffers;
+    functions->fDeleteRenderbuffers = nullGLDeleteRenderbuffers;
+    functions->fFramebufferRenderbuffer = nullGLFramebufferRenderbuffer;
+    functions->fFramebufferTexture2D = nullGLFramebufferTexture2D;
+    functions->fGenFramebuffers = noOpGLGenIds;
+    functions->fGenRenderbuffers = noOpGLGenIds;
+    functions->fGetFramebufferAttachmentParameteriv = noOpGLGetFramebufferAttachmentParameteriv;
+    functions->fGetRenderbufferParameteriv = noOpGLGetRenderbufferParameteriv;
+    functions->fRenderbufferStorage = noOpGLRenderbufferStorage;
+    functions->fRenderbufferStorageMultisample = noOpGLRenderbufferStorageMultisample;
+    functions->fBlitFramebuffer = noOpGLBlitFramebuffer;
+    functions->fResolveMultisampleFramebuffer = noOpGLResolveMultisampleFramebuffer;
+    functions->fMatrixLoadf = noOpGLMatrixLoadf;
+    functions->fMatrixLoadIdentity = noOpGLMatrixLoadIdentity;
+    functions->fBindFragDataLocationIndexed = noOpGLBindFragDataLocationIndexed;
+
+    interface->fExtensions.init(kGL_GrGLStandard, functions->fGetString, functions->fGetStringi,
+                                functions->fGetIntegerv, nullptr, GR_EGL_NO_DISPLAY);
+    return interface;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+static void* create_tls() {
+    State** current = new State*;
+    *current = nullptr;
+    return current;
+}
+
+static void delete_tls(void* ctx) {
+    State** current = static_cast<State**>(ctx);
+    if (*current) {
+        (*current)->unref();
+    }
+    delete current;
+}
+
+static State* current_context() {
+    return *static_cast<State**>(SkTLS::Get(create_tls, delete_tls));
+}
+
+static void set_current_context(State* state) {
+    State** current = static_cast<State**>(SkTLS::Get(create_tls, delete_tls));
+    if (*current) {
+        (*current)->unref();
+    }
+    *current = state;
+    if (state) {
+        state->ref();
+    }
+}
+
+#if GR_GL_PER_GL_FUNC_CALLBACK
+static void set_current_context_from_interface(const GrGLInterface* interface) {
+    set_current_context(reinterpret_cast<State*>(interface->fCallbackData));
+}
+#endif
+
+SkNullGLContext* SkNullGLContext::Create(GrGLStandard forcedGpuAPI) {
+    if (kGLES_GrGLStandard == forcedGpuAPI) {
+        return nullptr;
+    }
+    SkNullGLContext* ctx = new SkNullGLContext;
+    if (!ctx->isValid()) {
+        delete ctx;
+        return nullptr;
+    }
+    return ctx;
+}
+
+SkNullGLContext::SkNullGLContext() {
+    fState = new ContextState;
+    GrGLInterface* interface = create_null_interface(fState);
+    this->init(interface);
+#if GR_GL_PER_GL_FUNC_CALLBACK
+    interface->fCallback = set_current_context_from_interface;
+    interface->fCallbackData = reinterpret_cast<GrGLInterfaceCallbackData>(fState);
+#endif
+}
+
+SkNullGLContext::~SkNullGLContext() {
+    this->teardown();
+    fState->unref();
+}
+
+void SkNullGLContext::onPlatformMakeCurrent() const { set_current_context(fState); }
diff --git a/gfx/skia/skia/src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp b/gfx/skia/skia/src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp
index df212b1995ed..58a98090d56b 100644
--- a/gfx/skia/skia/src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp
+++ b/gfx/skia/skia/src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp
@@ -1,47 +1,238 @@
-// Modified from chromium/src/webkit/glue/gl_bindings_skia_cmd_buffer.cc
 
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_ANDROID)
 
 #include "gl/GrGLInterface.h"
 #include "gl/GrGLAssembleInterface.h"
-#include "gl/GrGLExtensions.h"
 #include "gl/GrGLUtil.h"
 
-#ifndef GL_GLEXT_PROTOTYPES
-#define GL_GLEXT_PROTOTYPES
-#endif
-
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-
 #include <EGL/egl.h>
-
-#define GET_PROC(F) functions->f ## F = (GrGL ## F ## Proc) get(ctx, "gl" #F)
-#define GET_PROC_SUFFIX(F, S) functions->f ## F = (GrGL ## F ## Proc) get(ctx, "gl" #F #S)
-#define GET_PROC_LOCAL(F) GrGL ## F ## Proc F = (GrGL ## F ## Proc) get(ctx, "gl" #F)
-
-#define GET_LINKED(F) functions->f ## F = gl ## F
-#define GET_LINKED_SUFFIX(F, S) functions->f ## F = gl ## F ##S
-
-#include "gl/GrGLAssembleGLESInterface.h"
+#include <GLES2/gl2.h>
 
 static GrGLFuncPtr android_get_gl_proc(void* ctx, const char name[]) {
-    SkASSERT(NULL == ctx);
+    SkASSERT(nullptr == ctx);
+    // Some older drivers on Android have busted eglGetProcAdddress Functions that
+    // will return the wrong pointer for built in GLES2 functions. This set of functions
+    // was generated on a Xoom by finding mismatches between the function pulled in via gl2.h and
+    // the address returned by eglGetProcAddress.
+    if (0 == strcmp("glActiveTexture", name)) {
+        return (GrGLFuncPtr) glActiveTexture;
+    } else if (0 == strcmp("glAttachShader", name)) {
+        return (GrGLFuncPtr) glAttachShader;
+    } else if (0 == strcmp("glBindAttribLocation", name)) {
+        return (GrGLFuncPtr) glBindAttribLocation;
+    } else if (0 == strcmp("glBindBuffer", name)) {
+        return (GrGLFuncPtr) glBindBuffer;
+    } else if (0 == strcmp("glBindTexture", name)) {
+        return (GrGLFuncPtr) glBindTexture;
+    } else if (0 == strcmp("glBlendColor", name)) {
+        return (GrGLFuncPtr) glBlendColor;
+    } else if (0 == strcmp("glBlendEquation", name)) {
+        return (GrGLFuncPtr) glBlendEquation;
+    } else if (0 == strcmp("glBlendFunc", name)) {
+        return (GrGLFuncPtr) glBlendFunc;
+    } else if (0 == strcmp("glBufferData", name)) {
+        return (GrGLFuncPtr) glBufferData;
+    } else if (0 == strcmp("glBufferSubData", name)) {
+        return (GrGLFuncPtr) glBufferSubData;
+    } else if (0 == strcmp("glClear", name)) {
+        return (GrGLFuncPtr) glClear;
+    } else if (0 == strcmp("glClearColor", name)) {
+        return (GrGLFuncPtr) glClearColor;
+    } else if (0 == strcmp("glClearStencil", name)) {
+        return (GrGLFuncPtr) glClearStencil;
+    } else if (0 == strcmp("glColorMask", name)) {
+        return (GrGLFuncPtr) glColorMask;
+    } else if (0 == strcmp("glCompileShader", name)) {
+        return (GrGLFuncPtr) glCompileShader;
+    } else if (0 == strcmp("glCompressedTexImage2D", name)) {
+        return (GrGLFuncPtr) glCompressedTexImage2D;
+    } else if (0 == strcmp("glCompressedTexSubImage2D", name)) {
+        return (GrGLFuncPtr) glCompressedTexSubImage2D;
+    } else if (0 == strcmp("glCopyTexSubImage2D", name)) {
+        return (GrGLFuncPtr) glCopyTexSubImage2D;
+    } else if (0 == strcmp("glCreateProgram", name)) {
+        return (GrGLFuncPtr) glCreateProgram;
+    } else if (0 == strcmp("glCreateShader", name)) {
+        return (GrGLFuncPtr) glCreateShader;
+    } else if (0 == strcmp("glCullFace", name)) {
+        return (GrGLFuncPtr) glCullFace;
+    } else if (0 == strcmp("glDeleteBuffers", name)) {
+        return (GrGLFuncPtr) glDeleteBuffers;
+    } else if (0 == strcmp("glDeleteProgram", name)) {
+        return (GrGLFuncPtr) glDeleteProgram;
+    } else if (0 == strcmp("glDeleteShader", name)) {
+        return (GrGLFuncPtr) glDeleteShader;
+    } else if (0 == strcmp("glDeleteTextures", name)) {
+        return (GrGLFuncPtr) glDeleteTextures;
+    } else if (0 == strcmp("glDepthMask", name)) {
+        return (GrGLFuncPtr) glDepthMask;
+    } else if (0 == strcmp("glDisable", name)) {
+        return (GrGLFuncPtr) glDisable;
+    } else if (0 == strcmp("glDisableVertexAttribArray", name)) {
+        return (GrGLFuncPtr) glDisableVertexAttribArray;
+    } else if (0 == strcmp("glDrawArrays", name)) {
+        return (GrGLFuncPtr) glDrawArrays;
+    } else if (0 == strcmp("glDrawElements", name)) {
+        return (GrGLFuncPtr) glDrawElements;
+    } else if (0 == strcmp("glEnable", name)) {
+        return (GrGLFuncPtr) glEnable;
+    } else if (0 == strcmp("glEnableVertexAttribArray", name)) {
+        return (GrGLFuncPtr) glEnableVertexAttribArray;
+    } else if (0 == strcmp("glFinish", name)) {
+        return (GrGLFuncPtr) glFinish;
+    } else if (0 == strcmp("glFlush", name)) {
+        return (GrGLFuncPtr) glFlush;
+    } else if (0 == strcmp("glFrontFace", name)) {
+        return (GrGLFuncPtr) glFrontFace;
+    } else if (0 == strcmp("glGenBuffers", name)) {
+        return (GrGLFuncPtr) glGenBuffers;
+    } else if (0 == strcmp("glGenerateMipmap", name)) {
+        return (GrGLFuncPtr) glGenerateMipmap;
+    } else if (0 == strcmp("glGenTextures", name)) {
+        return (GrGLFuncPtr) glGenTextures;
+    } else if (0 == strcmp("glGetBufferParameteriv", name)) {
+        return (GrGLFuncPtr) glGetBufferParameteriv;
+    } else if (0 == strcmp("glGetError", name)) {
+        return (GrGLFuncPtr) glGetError;
+    } else if (0 == strcmp("glGetIntegerv", name)) {
+        return (GrGLFuncPtr) glGetIntegerv;
+    } else if (0 == strcmp("glGetProgramInfoLog", name)) {
+        return (GrGLFuncPtr) glGetProgramInfoLog;
+    } else if (0 == strcmp("glGetProgramiv", name)) {
+        return (GrGLFuncPtr) glGetProgramiv;
+    } else if (0 == strcmp("glGetShaderInfoLog", name)) {
+        return (GrGLFuncPtr) glGetShaderInfoLog;
+    } else if (0 == strcmp("glGetShaderiv", name)) {
+        return (GrGLFuncPtr) glGetShaderiv;
+    } else if (0 == strcmp("glGetString", name)) {
+        return (GrGLFuncPtr) glGetString;
+    } else if (0 == strcmp("glGetUniformLocation", name)) {
+        return (GrGLFuncPtr) glGetUniformLocation;
+    } else if (0 == strcmp("glLineWidth", name)) {
+        return (GrGLFuncPtr) glLineWidth;
+    } else if (0 == strcmp("glLinkProgram", name)) {
+        return (GrGLFuncPtr) glLinkProgram;
+    } else if (0 == strcmp("glPixelStorei", name)) {
+        return (GrGLFuncPtr) glPixelStorei;
+    } else if (0 == strcmp("glReadPixels", name)) {
+        return (GrGLFuncPtr) glReadPixels;
+    } else if (0 == strcmp("glScissor", name)) {
+        return (GrGLFuncPtr) glScissor;
+    } else if (0 == strcmp("glShaderSource", name)) {
+        return (GrGLFuncPtr) glShaderSource;
+    } else if (0 == strcmp("glStencilFunc", name)) {
+        return (GrGLFuncPtr) glStencilFunc;
+    } else if (0 == strcmp("glStencilFuncSeparate", name)) {
+        return (GrGLFuncPtr) glStencilFuncSeparate;
+    } else if (0 == strcmp("glStencilMask", name)) {
+        return (GrGLFuncPtr) glStencilMask;
+    } else if (0 == strcmp("glStencilMaskSeparate", name)) {
+        return (GrGLFuncPtr) glStencilMaskSeparate;
+    } else if (0 == strcmp("glStencilOp", name)) {
+        return (GrGLFuncPtr) glStencilOp;
+    } else if (0 == strcmp("glStencilOpSeparate", name)) {
+        return (GrGLFuncPtr) glStencilOpSeparate;
+    } else if (0 == strcmp("glTexImage2D", name)) {
+        return (GrGLFuncPtr) glTexImage2D;
+    } else if (0 == strcmp("glTexParameteri", name)) {
+        return (GrGLFuncPtr) glTexParameteri;
+    } else if (0 == strcmp("glTexParameteriv", name)) {
+        return (GrGLFuncPtr) glTexParameteriv;
+    } else if (0 == strcmp("glTexSubImage2D", name)) {
+        return (GrGLFuncPtr) glTexSubImage2D;
+    } else if (0 == strcmp("glUniform1f", name)) {
+        return (GrGLFuncPtr) glUniform1f;
+    } else if (0 == strcmp("glUniform1i", name)) {
+        return (GrGLFuncPtr) glUniform1i;
+    } else if (0 == strcmp("glUniform1fv", name)) {
+        return (GrGLFuncPtr) glUniform1fv;
+    } else if (0 == strcmp("glUniform1iv", name)) {
+        return (GrGLFuncPtr) glUniform1iv;
+    } else if (0 == strcmp("glUniform2f", name)) {
+        return (GrGLFuncPtr) glUniform2f;
+    } else if (0 == strcmp("glUniform2i", name)) {
+        return (GrGLFuncPtr) glUniform2i;
+    } else if (0 == strcmp("glUniform2fv", name)) {
+        return (GrGLFuncPtr) glUniform2fv;
+    } else if (0 == strcmp("glUniform2iv", name)) {
+        return (GrGLFuncPtr) glUniform2iv;
+    } else if (0 == strcmp("glUniform3f", name)) {
+        return (GrGLFuncPtr) glUniform3f;
+    } else if (0 == strcmp("glUniform3i", name)) {
+        return (GrGLFuncPtr) glUniform3i;
+    } else if (0 == strcmp("glUniform3fv", name)) {
+        return (GrGLFuncPtr) glUniform3fv;
+    } else if (0 == strcmp("glUniform3iv", name)) {
+        return (GrGLFuncPtr) glUniform3iv;
+    } else if (0 == strcmp("glUniform4f", name)) {
+        return (GrGLFuncPtr) glUniform4f;
+    } else if (0 == strcmp("glUniform4i", name)) {
+        return (GrGLFuncPtr) glUniform4i;
+    } else if (0 == strcmp("glUniform4fv", name)) {
+        return (GrGLFuncPtr) glUniform4fv;
+    } else if (0 == strcmp("glUniform4iv", name)) {
+        return (GrGLFuncPtr) glUniform4iv;
+    } else if (0 == strcmp("glUniformMatrix2fv", name)) {
+        return (GrGLFuncPtr) glUniformMatrix2fv;
+    } else if (0 == strcmp("glUniformMatrix3fv", name)) {
+        return (GrGLFuncPtr) glUniformMatrix3fv;
+    } else if (0 == strcmp("glUniformMatrix4fv", name)) {
+        return (GrGLFuncPtr) glUniformMatrix4fv;
+    } else if (0 == strcmp("glUseProgram", name)) {
+        return (GrGLFuncPtr) glUseProgram;
+    } else if (0 == strcmp("glVertexAttrib1f", name)) {
+        return (GrGLFuncPtr) glVertexAttrib1f;
+    } else if (0 == strcmp("glVertexAttrib2fv", name)) {
+        return (GrGLFuncPtr) glVertexAttrib2fv;
+    } else if (0 == strcmp("glVertexAttrib3fv", name)) {
+        return (GrGLFuncPtr) glVertexAttrib3fv;
+    } else if (0 == strcmp("glVertexAttrib4fv", name)) {
+        return (GrGLFuncPtr) glVertexAttrib4fv;
+    } else if (0 == strcmp("glVertexAttribPointer", name)) {
+        return (GrGLFuncPtr) glVertexAttribPointer;
+    } else if (0 == strcmp("glViewport", name)) {
+        return (GrGLFuncPtr) glViewport;
+    } else if (0 == strcmp("glBindFramebuffer", name)) {
+        return (GrGLFuncPtr) glBindFramebuffer;
+    } else if (0 == strcmp("glBindRenderbuffer", name)) {
+        return (GrGLFuncPtr) glBindRenderbuffer;
+    } else if (0 == strcmp("glCheckFramebufferStatus", name)) {
+        return (GrGLFuncPtr) glCheckFramebufferStatus;
+    } else if (0 == strcmp("glDeleteFramebuffers", name)) {
+        return (GrGLFuncPtr) glDeleteFramebuffers;
+    } else if (0 == strcmp("glDeleteRenderbuffers", name)) {
+        return (GrGLFuncPtr) glDeleteRenderbuffers;
+    } else if (0 == strcmp("glFramebufferRenderbuffer", name)) {
+        return (GrGLFuncPtr) glFramebufferRenderbuffer;
+    } else if (0 == strcmp("glFramebufferTexture2D", name)) {
+        return (GrGLFuncPtr) glFramebufferTexture2D;
+    } else if (0 == strcmp("glGenFramebuffers", name)) {
+        return (GrGLFuncPtr) glGenFramebuffers;
+    } else if (0 == strcmp("glGenRenderbuffers", name)) {
+        return (GrGLFuncPtr) glGenRenderbuffers;
+    } else if (0 == strcmp("glGetFramebufferAttachmentParameteriv", name)) {
+        return (GrGLFuncPtr) glGetFramebufferAttachmentParameteriv;
+    } else if (0 == strcmp("glGetRenderbufferParameteriv", name)) {
+        return (GrGLFuncPtr) glGetRenderbufferParameteriv;
+    } else if (0 == strcmp("glRenderbufferStorage", name)) {
+        return (GrGLFuncPtr) glRenderbufferStorage;
+    } else if (0 == strcmp("eglQueryString", name)) {
+        return (GrGLFuncPtr) eglQueryString;
+    } else if (0 == strcmp("eglGetCurrentDisplay", name)) {
+        return (GrGLFuncPtr) eglGetCurrentDisplay;
+    }
     return eglGetProcAddress(name);
 }
 
 const GrGLInterface* GrGLCreateNativeInterface() {
-
-    const char* verStr = reinterpret_cast<const char*>(glGetString(GR_GL_VERSION));
-    GrGLStandard standard = GrGLGetStandardInUseFromString(verStr);
-
-    if (kGLES_GrGLStandard == standard) {
-        return GrGLAssembleGLESInterface(NULL, android_get_gl_proc);
-    } else if (kGL_GrGLStandard == standard) {
-        return GrGLAssembleGLInterface(NULL, android_get_gl_proc);
-    }
-
-    return NULL;
+    return GrGLAssembleInterface(nullptr, android_get_gl_proc);
 }
+
+#endif//defined(SK_BUILD_FOR_ANDROID)
diff --git a/gfx/skia/skia/src/gpu/gl/android/SkNativeGLContext_android.cpp b/gfx/skia/skia/src/gpu/gl/android/SkNativeGLContext_android.cpp
deleted file mode 100644
index 705bd8f49caa..000000000000
--- a/gfx/skia/skia/src/gpu/gl/android/SkNativeGLContext_android.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#include "gl/SkNativeGLContext.h"
-
-SkNativeGLContext::AutoContextRestore::AutoContextRestore() {
-    fOldEGLContext = eglGetCurrentContext();
-    fOldDisplay = eglGetCurrentDisplay();
-    fOldSurface = eglGetCurrentSurface(EGL_DRAW);
-
-}
-
-SkNativeGLContext::AutoContextRestore::~AutoContextRestore() {
-    if (NULL != fOldDisplay) {
-        eglMakeCurrent(fOldDisplay, fOldSurface, fOldSurface, fOldEGLContext);
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-SkNativeGLContext::SkNativeGLContext()
-    : fContext(EGL_NO_CONTEXT)
-    , fDisplay(EGL_NO_DISPLAY)
-    , fSurface(EGL_NO_SURFACE) {
-}
-
-SkNativeGLContext::~SkNativeGLContext() {
-    this->destroyGLContext();
-}
-
-void SkNativeGLContext::destroyGLContext() {
-    if (fDisplay) {
-        eglMakeCurrent(fDisplay, 0, 0, 0);
-
-        if (fContext) {
-            eglDestroyContext(fDisplay, fContext);
-            fContext = EGL_NO_CONTEXT;
-        }
-
-        if (fSurface) {
-            eglDestroySurface(fDisplay, fSurface);
-            fSurface = EGL_NO_SURFACE;
-        }
-
-        //TODO should we close the display?
-        fDisplay = EGL_NO_DISPLAY;
-    }
-}
-
-const GrGLInterface* SkNativeGLContext::createGLContext(GrGLStandard forcedGpuAPI) {
-    static const EGLint kEGLContextAttribsForOpenGL[] = {
-        EGL_NONE
-    };
-
-    static const EGLint kEGLContextAttribsForOpenGLES[] = {
-        EGL_CONTEXT_CLIENT_VERSION, 2,
-        EGL_NONE
-    };
-
-    static const struct {
-        const EGLint* fContextAttribs;
-        EGLenum fAPI;
-        EGLint  fRenderableTypeBit;
-        GrGLStandard fStandard;
-    } kAPIs[] = {
-        {   // OpenGL
-            kEGLContextAttribsForOpenGL,
-            EGL_OPENGL_API,
-            EGL_OPENGL_BIT,
-            kGL_GrGLStandard
-        },
-        {   // OpenGL ES. This seems to work for both ES2 and 3 (when available).
-            kEGLContextAttribsForOpenGLES,
-            EGL_OPENGL_ES_API,
-            EGL_OPENGL_ES2_BIT,
-            kGLES_GrGLStandard
-        },
-    };
-
-    size_t apiLimit = SK_ARRAY_COUNT(kAPIs);
-    size_t api = 0;
-    if (forcedGpuAPI == kGL_GrGLStandard) {
-        apiLimit = 1;
-    } else if (forcedGpuAPI == kGLES_GrGLStandard) {
-        api = 1;
-    }
-    SkASSERT(forcedGpuAPI == kNone_GrGLStandard || kAPIs[api].fStandard == forcedGpuAPI);
-
-    const GrGLInterface* interface = NULL;
-
-    for (size_t i = 0; NULL == interface && i < apiLimit; ++api) {
-        fDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-
-        EGLint majorVersion;
-        EGLint minorVersion;
-        eglInitialize(fDisplay, &majorVersion, &minorVersion);
-
-#if 0
-        SkDebugf("VENDOR: %s\n", eglQueryString(fDisplay, EGL_VENDOR));
-        SkDebugf("APIS: %s\n", eglQueryString(fDisplay, EGL_CLIENT_APIS));
-        SkDebugf("VERSION: %s\n", eglQueryString(fDisplay, EGL_VERSION));
-        SkDebugf("EXTENSIONS %s\n", eglQueryString(fDisplay, EGL_EXTENSIONS));
-#endif
-
-        if (!eglBindAPI(kAPIs[api].fAPI)) {
-            continue;
-        }
-
-        EGLint numConfigs;
-        const EGLint configAttribs[] = {
-            EGL_SURFACE_TYPE, EGL_PBUFFER_BIT,
-            EGL_RENDERABLE_TYPE, kAPIs[api].fRenderableTypeBit,
-            EGL_RED_SIZE, 8,
-            EGL_GREEN_SIZE, 8,
-            EGL_BLUE_SIZE, 8,
-            EGL_ALPHA_SIZE, 8,
-            EGL_NONE
-        };
-
-        EGLConfig surfaceConfig;
-        if (!eglChooseConfig(fDisplay, configAttribs, &surfaceConfig, 1, &numConfigs)) {
-            SkDebugf("eglChooseConfig failed. EGL Error: 0x%08x\n", eglGetError());
-            continue;
-        }
-
-        fContext = eglCreateContext(fDisplay, surfaceConfig, NULL, kAPIs[api].fContextAttribs);
-        if (EGL_NO_CONTEXT == fContext) {
-            SkDebugf("eglCreateContext failed.  EGL Error: 0x%08x\n", eglGetError());
-            continue;
-        }
-
-        static const EGLint kSurfaceAttribs[] = {
-            EGL_WIDTH, 1,
-            EGL_HEIGHT, 1,
-            EGL_NONE
-        };
-
-        fSurface = eglCreatePbufferSurface(fDisplay, surfaceConfig, kSurfaceAttribs);
-        if (EGL_NO_SURFACE == fSurface) {
-            SkDebugf("eglCreatePbufferSurface failed. EGL Error: 0x%08x\n", eglGetError());
-            this->destroyGLContext();
-            continue;
-        }
-
-        if (!eglMakeCurrent(fDisplay, fSurface, fSurface, fContext)) {
-            SkDebugf("eglMakeCurrent failed.  EGL Error: 0x%08x\n", eglGetError());
-            this->destroyGLContext();
-            continue;
-        }
-
-        interface = GrGLCreateNativeInterface();
-        if (NULL == interface) {
-            SkDebugf("Failed to create gl interface.\n");
-            this->destroyGLContext();
-            continue;
-        }
-
-        if (!interface->validate()) {
-            interface->unref();
-            interface = NULL;
-            this->destroyGLContext();
-        }
-    }
-
-    return interface;
-}
-
-void SkNativeGLContext::makeCurrent() const {
-    if (!eglMakeCurrent(fDisplay, fSurface, fSurface, fContext)) {
-        SkDebugf("Could not set the context.\n");
-    }
-}
-
-void SkNativeGLContext::swapBuffers() const {
-    if (!eglSwapBuffers(fDisplay, fSurface)) {
-        SkDebugf("Could not complete eglSwapBuffers.\n");
-    }
-}
diff --git a/gfx/skia/skia/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp b/gfx/skia/skia/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp
index 6552f7c179fb..05afb2cb1c2e 100644
--- a/gfx/skia/skia/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp
+++ b/gfx/skia/skia/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp
@@ -6,182 +6,53 @@
  * found in the LICENSE file.
  */
 
-
 #include "gl/GrGLInterface.h"
+#include "gl/GrGLAssembleInterface.h"
+#include "../ports/SkOSLibrary.h"
 
-#ifndef GL_GLEXT_PROTOTYPES
-#define GL_GLEXT_PROTOTYPES
-#endif
+#include <EGL/egl.h>
 
-#include "GLES2/gl2.h"
-#include "GLES2/gl2ext.h"
-#include "EGL/egl.h"
+namespace {
+struct Libs {
+    void* fGLLib;
+    void* fEGLLib;
+};
+}
 
-#define GET_PROC(name)             \
-    interface->fFunctions.f ## name = (GrGL ## name ## Proc) GetProcAddress(ghANGLELib, "gl" #name);
+static GrGLFuncPtr angle_get_gl_proc(void* ctx, const char name[]) {
+    const Libs* libs = reinterpret_cast<const Libs*>(ctx);
+    GrGLFuncPtr proc = (GrGLFuncPtr) GetProcedureAddress(libs->fGLLib, name);
+    if (proc) {
+        return proc;
+    }
+    proc = (GrGLFuncPtr) GetProcedureAddress(libs->fEGLLib, name);
+    if (proc) {
+        return proc;
+    }
+    return eglGetProcAddress(name);
+}
 
 const GrGLInterface* GrGLCreateANGLEInterface() {
+    static Libs gLibs = { nullptr, nullptr };
 
-    static HMODULE ghANGLELib = NULL;
-
-    if (NULL == ghANGLELib) {
+    if (nullptr == gLibs.fGLLib) {
         // We load the ANGLE library and never let it go
-        ghANGLELib = LoadLibrary("libGLESv2.dll");
-    }
-    if (NULL == ghANGLELib) {
-        // We can't setup the interface correctly w/o the DLL
-        return NULL;
+#if defined _WIN32
+        gLibs.fGLLib = DynamicLoadLibrary("libGLESv2.dll");
+        gLibs.fEGLLib = DynamicLoadLibrary("libEGL.dll");
+#elif defined SK_BUILD_FOR_MAC
+        gLibs.fGLLib = DynamicLoadLibrary("libGLESv2.dylib");
+        gLibs.fEGLLib = DynamicLoadLibrary("libEGL.dylib");
+#else
+        gLibs.fGLLib = DynamicLoadLibrary("libGLESv2.so");
+        gLibs.fGLLib = DynamicLoadLibrary("libEGL.so");
+#endif
     }
 
-    GrGLInterface* interface = SkNEW(GrGLInterface);
-    interface->fStandard = kGLES_GrGLStandard;
+    if (nullptr == gLibs.fGLLib || nullptr == gLibs.fEGLLib) {
+        // We can't setup the interface correctly w/o the so
+        return nullptr;
+    }
 
-    GrGLInterface::Functions* functions = &interface->fFunctions;
-
-    GET_PROC(ActiveTexture);
-    GET_PROC(AttachShader);
-    GET_PROC(BindAttribLocation);
-    GET_PROC(BindBuffer);
-    GET_PROC(BindTexture);
-    functions->fBindVertexArray =
-        (GrGLBindVertexArrayProc) eglGetProcAddress("glBindVertexArrayOES");
-    GET_PROC(BlendColor);
-    GET_PROC(BlendFunc);
-    GET_PROC(BufferData);
-    GET_PROC(BufferSubData);
-    GET_PROC(Clear);
-    GET_PROC(ClearColor);
-    GET_PROC(ClearStencil);
-    GET_PROC(ColorMask);
-    GET_PROC(CompileShader);
-    GET_PROC(CompressedTexImage2D);
-    GET_PROC(CompressedTexSubImage2D);
-    GET_PROC(CopyTexSubImage2D);
-    GET_PROC(CreateProgram);
-    GET_PROC(CreateShader);
-    GET_PROC(CullFace);
-    GET_PROC(DeleteBuffers);
-    GET_PROC(DeleteProgram);
-    GET_PROC(DeleteShader);
-    GET_PROC(DeleteTextures);
-    functions->fDeleteVertexArrays =
-        (GrGLDeleteVertexArraysProc) eglGetProcAddress("glDeleteVertexArraysOES");
-    GET_PROC(DepthMask);
-    GET_PROC(Disable);
-    GET_PROC(DisableVertexAttribArray);
-    GET_PROC(DrawArrays);
-    GET_PROC(DrawElements);
-    GET_PROC(Enable);
-    GET_PROC(EnableVertexAttribArray);
-    GET_PROC(Finish);
-    GET_PROC(Flush);
-    GET_PROC(FrontFace);
-    GET_PROC(GenBuffers);
-    GET_PROC(GenerateMipmap);
-    GET_PROC(GenTextures);
-    functions->fGenVertexArrays =
-        (GrGLGenVertexArraysProc) eglGetProcAddress("glGenVertexArraysOES");
-    GET_PROC(GetBufferParameteriv);
-    GET_PROC(GetError);
-    GET_PROC(GetIntegerv);
-    GET_PROC(GetProgramInfoLog);
-    GET_PROC(GetProgramiv);
-    GET_PROC(GetShaderInfoLog);
-    GET_PROC(GetShaderiv);
-    GET_PROC(GetString);
-    GET_PROC(GetStringi);
-    GET_PROC(GetUniformLocation);
-    GET_PROC(LineWidth);
-    GET_PROC(LinkProgram);
-    GET_PROC(PixelStorei);
-    GET_PROC(ReadPixels);
-    GET_PROC(Scissor);
-    GET_PROC(ShaderSource);
-    GET_PROC(StencilFunc);
-    GET_PROC(StencilFuncSeparate);
-    GET_PROC(StencilMask);
-    GET_PROC(StencilMaskSeparate);
-    GET_PROC(StencilOp);
-    GET_PROC(StencilOpSeparate);
-    GET_PROC(TexImage2D);
-    GET_PROC(TexParameteri);
-    GET_PROC(TexParameteriv);
-    GET_PROC(TexSubImage2D);
-#if GL_ARB_texture_storage
-    GET_PROC(TexStorage2D);
-#elif GL_EXT_texture_storage
-    functions->fTexStorage2D = (GrGLTexStorage2DProc) eglGetProcAddress("glTexStorage2DEXT");
-#endif
-    GET_PROC(Uniform1f);
-    GET_PROC(Uniform1i);
-    GET_PROC(Uniform1fv);
-    GET_PROC(Uniform1iv);
-
-    GET_PROC(Uniform2f);
-    GET_PROC(Uniform2i);
-    GET_PROC(Uniform2fv);
-    GET_PROC(Uniform2iv);
-
-    GET_PROC(Uniform3f);
-    GET_PROC(Uniform3i);
-    GET_PROC(Uniform3fv);
-    GET_PROC(Uniform3iv);
-
-    GET_PROC(Uniform4f);
-    GET_PROC(Uniform4i);
-    GET_PROC(Uniform4fv);
-    GET_PROC(Uniform4iv);
-
-    GET_PROC(UniformMatrix2fv);
-    GET_PROC(UniformMatrix3fv);
-    GET_PROC(UniformMatrix4fv);
-    GET_PROC(UseProgram);
-    GET_PROC(VertexAttrib4fv);
-    GET_PROC(VertexAttribPointer);
-    GET_PROC(Viewport);
-    GET_PROC(BindFramebuffer);
-    GET_PROC(BindRenderbuffer);
-    GET_PROC(CheckFramebufferStatus);
-    GET_PROC(DeleteFramebuffers);
-    GET_PROC(DeleteRenderbuffers);
-    GET_PROC(FramebufferRenderbuffer);
-    GET_PROC(FramebufferTexture2D);
-    GET_PROC(GenFramebuffers);
-    GET_PROC(GenRenderbuffers);
-    GET_PROC(GetFramebufferAttachmentParameteriv);
-    GET_PROC(GetRenderbufferParameteriv);
-    GET_PROC(RenderbufferStorage);
-
-    functions->fMapBuffer = (GrGLMapBufferProc) eglGetProcAddress("glMapBufferOES");
-    functions->fUnmapBuffer = (GrGLUnmapBufferProc) eglGetProcAddress("glUnmapBufferOES");
-
-#if GL_ES_VERSION_3_0
-    functions->fMapBufferRange = GET_PROC(glMapBufferRange);
-    functions->fFlushMappedBufferRange = GET_PROC(glFlushMappedBufferRange);
-#else
-    functions->fMapBufferRange = (GrGLMapBufferRangeProc) eglGetProcAddress("glMapBufferRange");
-    functions->fFlushMappedBufferRange = (GrGLFlushMappedBufferRangeProc) eglGetProcAddress("glFlushMappedBufferRange");
-#endif
-
-    functions->fInsertEventMarker = (GrGLInsertEventMarkerProc) eglGetProcAddress("glInsertEventMarkerEXT");
-    functions->fPushGroupMarker = (GrGLInsertEventMarkerProc) eglGetProcAddress("glPushGroupMarkerEXT");
-    functions->fPopGroupMarker = (GrGLPopGroupMarkerProc) eglGetProcAddress("glPopGroupMarkerEXT");
-
-#if GL_ES_VERSION_3_0
-    GET_PROC(InvalidateFramebuffer);
-    GET_PROC(InvalidateSubFramebuffer);
-#else
-    functions->fInvalidateFramebuffer = (GrGLInvalidateFramebufferProc) eglGetProcAddress("glInvalidateFramebuffer");
-    functions->fInvalidateSubFramebuffer = (GrGLInvalidateSubFramebufferProc) eglGetProcAddress("glInvalidateSubFramebuffer");
-#endif
-    functions->fInvalidateBufferData = (GrGLInvalidateBufferDataProc) eglGetProcAddress("glInvalidateBufferData");
-    functions->fInvalidateBufferSubData = (GrGLInvalidateBufferSubDataProc) eglGetProcAddress("glInvalidateBufferSubData");
-    functions->fInvalidateTexImage = (GrGLInvalidateTexImageProc) eglGetProcAddress("glInvalidateTexImage");
-    functions->fInvalidateTexSubImage = (GrGLInvalidateTexSubImageProc) eglGetProcAddress("glInvalidateTexSubImage");
-
-    interface->fExtensions.init(kGLES_GrGLStandard,
-                                functions->fGetString,
-                                functions->fGetStringi,
-                                functions->fGetIntegerv);
-    return interface;
+    return GrGLAssembleGLESInterface(&gLibs, angle_get_gl_proc);
 }
diff --git a/gfx/skia/skia/src/gpu/gl/angle/SkANGLEGLContext.cpp b/gfx/skia/skia/src/gpu/gl/angle/SkANGLEGLContext.cpp
index 884fe7ca11c1..54ef02d49246 100644
--- a/gfx/skia/skia/src/gpu/gl/angle/SkANGLEGLContext.cpp
+++ b/gfx/skia/skia/src/gpu/gl/angle/SkANGLEGLContext.cpp
@@ -6,33 +6,187 @@
  * found in the LICENSE file.
  */
 
-#include "gl/SkANGLEGLContext.h"
+#include "gl/angle/SkANGLEGLContext.h"
 
-SkANGLEGLContext::AutoContextRestore::AutoContextRestore() {
-    fOldEGLContext = eglGetCurrentContext();
-    fOldDisplay = eglGetCurrentDisplay();
-    fOldSurface = eglGetCurrentSurface(EGL_DRAW);
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
 
-}
+#include "gl/GrGLDefines.h"
+#include "gl/GrGLUtil.h"
 
-SkANGLEGLContext::AutoContextRestore::~AutoContextRestore() {
-    if (NULL != fOldDisplay) {
-        eglMakeCurrent(fOldDisplay, fOldSurface, fOldSurface, fOldEGLContext);
+#define EGL_PLATFORM_ANGLE_ANGLE                0x3202
+#define EGL_PLATFORM_ANGLE_TYPE_ANGLE           0x3203
+#define EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE      0x3207
+#define EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE     0x3208
+#define EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE    0x320D
+
+void* SkANGLEGLContext::GetD3DEGLDisplay(void* nativeDisplay, bool useGLBackend) {
+    PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXT;
+    eglGetPlatformDisplayEXT =
+        (PFNEGLGETPLATFORMDISPLAYEXTPROC)eglGetProcAddress("eglGetPlatformDisplayEXT");
+
+    if (!eglGetPlatformDisplayEXT) {
+        return eglGetDisplay(static_cast<EGLNativeDisplayType>(nativeDisplay));
     }
+
+    EGLDisplay display = EGL_NO_DISPLAY;
+    if (useGLBackend) {
+        // Try for an ANGLE D3D11 context, fall back to D3D9.
+        EGLint attribs[3] = {
+              EGL_PLATFORM_ANGLE_TYPE_ANGLE,
+              EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE,
+              EGL_NONE
+        };
+        display = eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, nativeDisplay, attribs);
+    } else {
+        // Try for an ANGLE D3D11 context, fall back to D3D9, and finally GL.
+        EGLint attribs[3][3] = {
+            {
+                EGL_PLATFORM_ANGLE_TYPE_ANGLE,
+                EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
+                EGL_NONE
+            },
+            {
+                EGL_PLATFORM_ANGLE_TYPE_ANGLE,
+                EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE,
+                EGL_NONE
+            },
+            {
+                EGL_PLATFORM_ANGLE_TYPE_ANGLE,
+                EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE,
+                EGL_NONE
+            }
+        };
+        for (int i = 0; i < 3 && display == EGL_NO_DISPLAY; ++i) {
+            display = eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE,nativeDisplay, attribs[i]);
+        }
+    }
+    return display;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-
-SkANGLEGLContext::SkANGLEGLContext()
+SkANGLEGLContext::SkANGLEGLContext(bool useGLBackend)
     : fContext(EGL_NO_CONTEXT)
     , fDisplay(EGL_NO_DISPLAY)
     , fSurface(EGL_NO_SURFACE) {
+
+    EGLint numConfigs;
+    static const EGLint configAttribs[] = {
+        EGL_SURFACE_TYPE, EGL_PBUFFER_BIT,
+        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+        EGL_RED_SIZE, 8,
+        EGL_GREEN_SIZE, 8,
+        EGL_BLUE_SIZE, 8,
+        EGL_ALPHA_SIZE, 8,
+        EGL_NONE
+    };
+
+    fIsGLBackend = useGLBackend;
+    fDisplay = GetD3DEGLDisplay(EGL_DEFAULT_DISPLAY, useGLBackend);
+    if (EGL_NO_DISPLAY == fDisplay) {
+        SkDebugf("Could not create EGL display!");
+        return;
+    }
+
+    EGLint majorVersion;
+    EGLint minorVersion;
+    eglInitialize(fDisplay, &majorVersion, &minorVersion);
+
+    EGLConfig surfaceConfig;
+    eglChooseConfig(fDisplay, configAttribs, &surfaceConfig, 1, &numConfigs);
+
+    static const EGLint contextAttribs[] = {
+        EGL_CONTEXT_CLIENT_VERSION, 2,
+        EGL_NONE
+    };
+    fContext = eglCreateContext(fDisplay, surfaceConfig, nullptr, contextAttribs);
+
+
+    static const EGLint surfaceAttribs[] = {
+        EGL_WIDTH, 1,
+        EGL_HEIGHT, 1,
+        EGL_NONE
+    };
+
+    fSurface = eglCreatePbufferSurface(fDisplay, surfaceConfig, surfaceAttribs);
+
+    eglMakeCurrent(fDisplay, fSurface, fSurface, fContext);
+
+    SkAutoTUnref<const GrGLInterface> gl(GrGLCreateANGLEInterface());
+    if (nullptr == gl.get()) {
+        SkDebugf("Could not create ANGLE GL interface!\n");
+        this->destroyGLContext();
+        return;
+    }
+    if (!gl->validate()) {
+        SkDebugf("Could not validate ANGLE GL interface!\n");
+        this->destroyGLContext();
+        return;
+    }
+
+    this->init(gl.detach());
 }
 
 SkANGLEGLContext::~SkANGLEGLContext() {
+    this->teardown();
     this->destroyGLContext();
 }
 
+GrEGLImage SkANGLEGLContext::texture2DToEGLImage(GrGLuint texID) const {
+    if (!this->gl()->hasExtension("EGL_KHR_gl_texture_2D_image")) {
+        return GR_EGL_NO_IMAGE;
+    }
+    GrEGLImage img;
+    GrEGLint attribs[] = { GR_EGL_GL_TEXTURE_LEVEL, 0,
+                           GR_EGL_IMAGE_PRESERVED, GR_EGL_TRUE,
+                           GR_EGL_NONE };
+    // 64 bit cast is to shut Visual C++ up about casting 32 bit value to a pointer.
+    GrEGLClientBuffer clientBuffer = reinterpret_cast<GrEGLClientBuffer>((uint64_t)texID);
+    GR_GL_CALL_RET(this->gl(), img,
+                   EGLCreateImage(fDisplay, fContext, GR_EGL_GL_TEXTURE_2D, clientBuffer,
+                                  attribs));
+    return img;
+}
+
+void SkANGLEGLContext::destroyEGLImage(GrEGLImage image) const {
+    GR_GL_CALL(this->gl(), EGLDestroyImage(fDisplay, image));
+}
+
+GrGLuint SkANGLEGLContext::eglImageToExternalTexture(GrEGLImage image) const {
+    GrGLClearErr(this->gl());
+    if (!this->gl()->hasExtension("GL_OES_EGL_image_external")) {
+        return 0;
+    }
+    GrGLEGLImageTargetTexture2DProc glEGLImageTargetTexture2D =
+        (GrGLEGLImageTargetTexture2DProc)eglGetProcAddress("glEGLImageTargetTexture2DOES");
+    if (!glEGLImageTargetTexture2D) {
+        return 0;
+    }
+    GrGLuint texID;
+    GR_GL_CALL(this->gl(), GenTextures(1, &texID));
+    if (!texID) {
+        return 0;
+    }
+    GR_GL_CALL(this->gl(), BindTexture(GR_GL_TEXTURE_EXTERNAL, texID));
+    if (GR_GL_GET_ERROR(this->gl()) != GR_GL_NO_ERROR) {
+        GR_GL_CALL(this->gl(), DeleteTextures(1, &texID));
+        return 0;
+    }
+    glEGLImageTargetTexture2D(GR_GL_TEXTURE_EXTERNAL, image);
+    if (GR_GL_GET_ERROR(this->gl()) != GR_GL_NO_ERROR) {
+        GR_GL_CALL(this->gl(), DeleteTextures(1, &texID));
+        return 0;
+    }
+    return texID;
+}
+
+SkGLContext* SkANGLEGLContext::createNew() const {
+    SkGLContext* ctx = SkANGLEGLContext::Create(this->gl()->fStandard, fIsGLBackend);
+    if (ctx) {
+        ctx->makeCurrent();
+    }
+    return ctx;
+}
+
 void SkANGLEGLContext::destroyGLContext() {
     if (fDisplay) {
         eglMakeCurrent(fDisplay, 0, 0, 0);
@@ -52,65 +206,18 @@ void SkANGLEGLContext::destroyGLContext() {
     }
 }
 
-const GrGLInterface* SkANGLEGLContext::createGLContext(GrGLStandard forcedGpuAPI) {
-    if (kGL_GrGLStandard == forcedGpuAPI) {
-        return NULL;
-    }
-
-    fDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-
-    EGLint majorVersion;
-    EGLint minorVersion;
-    eglInitialize(fDisplay, &majorVersion, &minorVersion);
-
-    EGLint numConfigs;
-    static const EGLint configAttribs[] = {
-        EGL_SURFACE_TYPE, EGL_PBUFFER_BIT,
-        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-        EGL_RED_SIZE, 8,
-        EGL_GREEN_SIZE, 8,
-        EGL_BLUE_SIZE, 8,
-        EGL_ALPHA_SIZE, 8,
-        EGL_NONE
-    };
-
-    EGLConfig surfaceConfig;
-    eglChooseConfig(fDisplay, configAttribs, &surfaceConfig, 1, &numConfigs);
-
-    static const EGLint contextAttribs[] = {
-        EGL_CONTEXT_CLIENT_VERSION, 2,
-        EGL_NONE
-    };
-    fContext = eglCreateContext(fDisplay, surfaceConfig, NULL, contextAttribs);
-
-
-    static const EGLint surfaceAttribs[] = {
-            EGL_WIDTH, 1,
-            EGL_HEIGHT, 1,
-            EGL_NONE
-        };
-    fSurface = eglCreatePbufferSurface(fDisplay, surfaceConfig, surfaceAttribs);
-
-    eglMakeCurrent(fDisplay, fSurface, fSurface, fContext);
-
-    const GrGLInterface* interface = GrGLCreateANGLEInterface();
-    if (NULL == interface) {
-        SkDebugf("Could not create ANGLE GL interface!\n");
-        this->destroyGLContext();
-        return NULL;
-    }
-
-    return interface;
-}
-
-void SkANGLEGLContext::makeCurrent() const {
+void SkANGLEGLContext::onPlatformMakeCurrent() const {
     if (!eglMakeCurrent(fDisplay, fSurface, fSurface, fContext)) {
         SkDebugf("Could not set the context.\n");
     }
 }
 
-void SkANGLEGLContext::swapBuffers() const {
+void SkANGLEGLContext::onPlatformSwapBuffers() const {
     if (!eglSwapBuffers(fDisplay, fSurface)) {
         SkDebugf("Could not complete eglSwapBuffers.\n");
     }
 }
+
+GrGLFuncPtr SkANGLEGLContext::onPlatformGetProcAddress(const char* name) const {
+    return eglGetProcAddress(name);
+}
diff --git a/gfx/skia/skia/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/gfx/skia/skia/src/gpu/gl/builders/GrGLProgramBuilder.cpp
new file mode 100644
index 000000000000..86264c02de99
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/builders/GrGLProgramBuilder.cpp
@@ -0,0 +1,540 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrGLProgramBuilder.h"
+
+#include "GrAutoLocaleSetter.h"
+#include "GrCoordTransform.h"
+#include "GrGLProgramBuilder.h"
+#include "GrTexture.h"
+#include "SkRTConf.h"
+#include "SkTraceEvent.h"
+#include "gl/GrGLGpu.h"
+#include "gl/GrGLProgram.h"
+#include "gl/GrGLSLPrettyPrint.h"
+#include "gl/builders/GrGLShaderStringBuilder.h"
+#include "glsl/GrGLSLCaps.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLGeometryProcessor.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+#include "glsl/GrGLSLTextureSampler.h"
+#include "glsl/GrGLSLXferProcessor.h"
+
+#define GL_CALL(X) GR_GL_CALL(this->gpu()->glInterface(), X)
+#define GL_CALL_RET(R, X) GR_GL_CALL_RET(this->gpu()->glInterface(), R, X)
+
+GrGLProgram* GrGLProgramBuilder::CreateProgram(const DrawArgs& args, GrGLGpu* gpu) {
+    GrAutoLocaleSetter als("C");
+
+    // create a builder.  This will be handed off to effects so they can use it to add
+    // uniforms, varyings, textures, etc
+    SkAutoTDelete<GrGLProgramBuilder> builder(new GrGLProgramBuilder(gpu, args));
+
+    GrGLProgramBuilder* pb = builder.get();
+
+    // TODO: Once all stages can handle taking a float or vec4 and correctly handling them we can
+    // seed correctly here
+    GrGLSLExpr4 inputColor;
+    GrGLSLExpr4 inputCoverage;
+
+    if (!pb->emitAndInstallProcs(&inputColor, &inputCoverage)) {
+        return nullptr;
+    }
+
+    return pb->finalize();
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+GrGLProgramBuilder::GrGLProgramBuilder(GrGLGpu* gpu, const DrawArgs& args)
+    : INHERITED(args)
+    , fGeometryProcessor(nullptr)
+    , fXferProcessor(nullptr)
+    , fGpu(gpu)
+    , fUniforms(kVarsPerBlock)
+    , fSamplerUniforms(4)
+    , fVaryingHandler(this) {
+}
+
+GrGLSLProgramDataManager::UniformHandle GrGLProgramBuilder::internalAddUniformArray(
+                                                                uint32_t visibility,
+                                                                GrSLType type,
+                                                                GrSLPrecision precision,
+                                                                const char* name,
+                                                                bool mangleName,
+                                                                int count,
+                                                                const char** outName) {
+    SkASSERT(name && strlen(name));
+    SkDEBUGCODE(static const uint32_t kVisibilityMask = kVertex_Visibility | kFragment_Visibility);
+    SkASSERT(0 == (~kVisibilityMask & visibility));
+    SkASSERT(0 != visibility);
+    SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsFloatType(type));
+
+    UniformInfo& uni = fUniforms.push_back();
+    uni.fVariable.setType(type);
+    uni.fVariable.setTypeModifier(GrGLSLShaderVar::kUniform_TypeModifier);
+    // TODO this is a bit hacky, lets think of a better way.  Basically we need to be able to use
+    // the uniform view matrix name in the GP, and the GP is immutable so it has to tell the PB
+    // exactly what name it wants to use for the uniform view matrix.  If we prefix anythings, then
+    // the names will mismatch.  I think the correct solution is to have all GPs which need the
+    // uniform view matrix, they should upload the view matrix in their setData along with regular
+    // uniforms.
+    char prefix = 'u';
+    if ('u' == name[0]) {
+        prefix = '\0';
+    }
+    this->nameVariable(uni.fVariable.accessName(), prefix, name, mangleName);
+    uni.fVariable.setArrayCount(count);
+    uni.fVisibility = visibility;
+    uni.fVariable.setPrecision(precision);
+
+    if (outName) {
+        *outName = uni.fVariable.c_str();
+    }
+    return GrGLSLProgramDataManager::UniformHandle(fUniforms.count() - 1);
+}
+
+void GrGLProgramBuilder::onAppendUniformDecls(ShaderVisibility visibility, SkString* out) const {
+    for (int i = 0; i < fUniforms.count(); ++i) {
+        if (fUniforms[i].fVisibility & visibility) {
+            fUniforms[i].fVariable.appendDecl(this->glslCaps(), out);
+            out->append(";\n");
+        }
+    }
+}
+
+const GrGLSLCaps* GrGLProgramBuilder::glslCaps() const {
+    return this->fGpu->ctxInfo().caps()->glslCaps();
+}
+
+bool GrGLProgramBuilder::emitAndInstallProcs(GrGLSLExpr4* inputColor, GrGLSLExpr4* inputCoverage) {
+    // First we loop over all of the installed processors and collect coord transforms.  These will
+    // be sent to the GrGLSLPrimitiveProcessor in its emitCode function
+    const GrPrimitiveProcessor& primProc = this->primitiveProcessor();
+    int totalTextures = primProc.numTextures();
+    const int maxTextureUnits = fGpu->glCaps().maxFragmentTextureUnits();
+
+    for (int i = 0; i < this->pipeline().numFragmentProcessors(); i++) {
+        const GrFragmentProcessor& processor = this->pipeline().getFragmentProcessor(i);
+
+        if (!primProc.hasTransformedLocalCoords()) {
+            SkTArray<const GrCoordTransform*, true>& procCoords = fCoordTransforms.push_back();
+            processor.gatherCoordTransforms(&procCoords);
+        }
+
+        totalTextures += processor.numTextures();
+        if (totalTextures >= maxTextureUnits) {
+            GrCapsDebugf(fGpu->caps(), "Program would use too many texture units\n");
+            return false;
+        }
+    }
+
+    this->emitAndInstallProc(primProc, inputColor, inputCoverage);
+
+    fFragmentProcessors.reset(new GrGLInstalledFragProcs);
+    int numProcs = this->pipeline().numFragmentProcessors();
+    this->emitAndInstallFragProcs(0, this->pipeline().numColorFragmentProcessors(), inputColor);
+    this->emitAndInstallFragProcs(this->pipeline().numColorFragmentProcessors(), numProcs,
+                                  inputCoverage);
+    this->emitAndInstallXferProc(*this->pipeline().getXferProcessor(), *inputColor, *inputCoverage,
+                                 this->pipeline().ignoresCoverage());
+    return true;
+}
+
+void GrGLProgramBuilder::emitAndInstallFragProcs(int procOffset,
+                                                 int numProcs,
+                                                 GrGLSLExpr4* inOut) {
+    for (int i = procOffset; i < numProcs; ++i) {
+        GrGLSLExpr4 output;
+        const GrFragmentProcessor& fp = this->pipeline().getFragmentProcessor(i);
+        this->emitAndInstallProc(fp, i, *inOut, &output);
+        *inOut = output;
+    }
+}
+
+void GrGLProgramBuilder::nameExpression(GrGLSLExpr4* output, const char* baseName) {
+    // create var to hold stage result.  If we already have a valid output name, just use that
+    // otherwise create a new mangled one.  This name is only valid if we are reordering stages
+    // and have to tell stage exactly where to put its output.
+    SkString outName;
+    if (output->isValid()) {
+        outName = output->c_str();
+    } else {
+        this->nameVariable(&outName, '\0', baseName);
+    }
+    fFS.codeAppendf("vec4 %s;", outName.c_str());
+    *output = outName;
+}
+
+// TODO Processors cannot output zeros because an empty string is all 1s
+// the fix is to allow effects to take the GrGLSLExpr4 directly
+void GrGLProgramBuilder::emitAndInstallProc(const GrFragmentProcessor& fp,
+                                            int index,
+                                            const GrGLSLExpr4& input,
+                                            GrGLSLExpr4* output) {
+    // Program builders have a bit of state we need to clear with each effect
+    AutoStageAdvance adv(this);
+    this->nameExpression(output, "output");
+
+    // Enclose custom code in a block to avoid namespace conflicts
+    SkString openBrace;
+    openBrace.printf("{ // Stage %d, %s\n", fStageIndex, fp.name());
+    fFS.codeAppend(openBrace.c_str());
+
+    this->emitAndInstallProc(fp, index, output->c_str(), input.isOnes() ? nullptr : input.c_str());
+
+    fFS.codeAppend("}");
+}
+
+void GrGLProgramBuilder::emitAndInstallProc(const GrPrimitiveProcessor& proc,
+                                            GrGLSLExpr4* outputColor,
+                                            GrGLSLExpr4* outputCoverage) {
+    // Program builders have a bit of state we need to clear with each effect
+    AutoStageAdvance adv(this);
+    this->nameExpression(outputColor, "outputColor");
+    this->nameExpression(outputCoverage, "outputCoverage");
+
+    // Enclose custom code in a block to avoid namespace conflicts
+    SkString openBrace;
+    openBrace.printf("{ // Stage %d, %s\n", fStageIndex, proc.name());
+    fFS.codeAppend(openBrace.c_str());
+    fVS.codeAppendf("// Primitive Processor %s\n", proc.name());
+
+    this->emitAndInstallProc(proc, outputColor->c_str(), outputCoverage->c_str());
+
+    fFS.codeAppend("}");
+}
+
+void GrGLProgramBuilder::emitAndInstallProc(const GrFragmentProcessor& fp,
+                                            int index,
+                                            const char* outColor,
+                                            const char* inColor) {
+    GrGLInstalledFragProc* ifp = new GrGLInstalledFragProc;
+
+    ifp->fGLProc.reset(fp.createGLSLInstance());
+
+    SkSTArray<4, GrGLSLTextureSampler> samplers(fp.numTextures());
+    this->emitSamplers(fp, &samplers, ifp);
+
+    GrGLSLFragmentProcessor::EmitArgs args(this,
+                                           &fFS,
+                                           this->glslCaps(),
+                                           fp,
+                                           outColor,
+                                           inColor,
+                                           fOutCoords[index],
+                                           samplers);
+    ifp->fGLProc->emitCode(args);
+
+    // We have to check that effects and the code they emit are consistent, ie if an effect
+    // asks for dst color, then the emit code needs to follow suit
+    verify(fp);
+    fFragmentProcessors->fProcs.push_back(ifp);
+}
+
+void GrGLProgramBuilder::emitAndInstallProc(const GrPrimitiveProcessor& gp,
+                                            const char* outColor,
+                                            const char* outCoverage) {
+    SkASSERT(!fGeometryProcessor);
+    fGeometryProcessor = new GrGLInstalledGeoProc;
+
+    fGeometryProcessor->fGLProc.reset(gp.createGLSLInstance(*fGpu->glCaps().glslCaps()));
+
+    SkSTArray<4, GrGLSLTextureSampler> samplers(gp.numTextures());
+    this->emitSamplers(gp, &samplers, fGeometryProcessor);
+
+    GrGLSLGeometryProcessor::EmitArgs args(this,
+                                           &fVS,
+                                           &fFS,
+                                           &fVaryingHandler,
+                                           this->glslCaps(),
+                                           gp,
+                                           outColor,
+                                           outCoverage,
+                                           samplers,
+                                           fCoordTransforms,
+                                           &fOutCoords);
+    fGeometryProcessor->fGLProc->emitCode(args);
+
+    // We have to check that effects and the code they emit are consistent, ie if an effect
+    // asks for dst color, then the emit code needs to follow suit
+    verify(gp);
+}
+
+void GrGLProgramBuilder::emitAndInstallXferProc(const GrXferProcessor& xp,
+                                                const GrGLSLExpr4& colorIn,
+                                                const GrGLSLExpr4& coverageIn,
+                                                bool ignoresCoverage) {
+    // Program builders have a bit of state we need to clear with each effect
+    AutoStageAdvance adv(this);
+
+    SkASSERT(!fXferProcessor);
+    fXferProcessor = new GrGLInstalledXferProc;
+
+    fXferProcessor->fGLProc.reset(xp.createGLSLInstance());
+
+    // Enable dual source secondary output if we have one
+    if (xp.hasSecondaryOutput()) {
+        fFS.enableSecondaryOutput();
+    }
+
+    if (this->glslCaps()->mustDeclareFragmentShaderOutput()) {
+        fFS.enableCustomOutput();
+    }
+
+    SkString openBrace;
+    openBrace.printf("{ // Xfer Processor: %s\n", xp.name());
+    fFS.codeAppend(openBrace.c_str());
+
+    SkSTArray<4, GrGLSLTextureSampler> samplers(xp.numTextures());
+    this->emitSamplers(xp, &samplers, fXferProcessor);
+
+    GrGLSLXferProcessor::EmitArgs args(this,
+                                       &fFS,
+                                       this->glslCaps(),
+                                       xp, colorIn.c_str(),
+                                       ignoresCoverage ? nullptr : coverageIn.c_str(),
+                                       fFS.getPrimaryColorOutputName(),
+                                       fFS.getSecondaryColorOutputName(),
+                                       samplers);
+    fXferProcessor->fGLProc->emitCode(args);
+
+    // We have to check that effects and the code they emit are consistent, ie if an effect
+    // asks for dst color, then the emit code needs to follow suit
+    verify(xp);
+    fFS.codeAppend("}");
+}
+
+void GrGLProgramBuilder::verify(const GrPrimitiveProcessor& gp) {
+    SkASSERT(fFS.hasReadFragmentPosition() == gp.willReadFragmentPosition());
+}
+
+void GrGLProgramBuilder::verify(const GrXferProcessor& xp) {
+    SkASSERT(fFS.hasReadDstColor() == xp.willReadDstColor());
+}
+
+void GrGLProgramBuilder::verify(const GrFragmentProcessor& fp) {
+    SkASSERT(fFS.hasReadFragmentPosition() == fp.willReadFragmentPosition());
+}
+
+static GrSLType get_sampler_type(const GrTextureAccess& access) {
+    GrGLTexture* glTexture = static_cast<GrGLTexture*>(access.getTexture());
+    if (glTexture->target() == GR_GL_TEXTURE_EXTERNAL) {
+        return kSamplerExternal_GrSLType;
+    } else {
+        SkASSERT(glTexture->target() == GR_GL_TEXTURE_2D);
+        return kSampler2D_GrSLType;
+    }
+}
+
+template <class Proc>
+void GrGLProgramBuilder::emitSamplers(const GrProcessor& processor,
+                                      GrGLSLTextureSampler::TextureSamplerArray* outSamplers,
+                                      GrGLInstalledProc<Proc>* ip) {
+    SkDEBUGCODE(ip->fSamplersIdx = fSamplerUniforms.count();)
+    int numTextures = processor.numTextures();
+    UniformHandle* localSamplerUniforms = fSamplerUniforms.push_back_n(numTextures);
+    SkString name;
+    for (int t = 0; t < numTextures; ++t) {
+        name.printf("Sampler%d", t);
+        GrSLType samplerType = get_sampler_type(processor.textureAccess(t));
+        localSamplerUniforms[t] = this->addUniform(GrGLProgramBuilder::kFragment_Visibility,
+                                                   samplerType, kDefault_GrSLPrecision,
+                                                   name.c_str());
+        SkNEW_APPEND_TO_TARRAY(outSamplers, GrGLSLTextureSampler,
+                               (localSamplerUniforms[t], processor.textureAccess(t)));
+        if (kSamplerExternal_GrSLType == samplerType) {
+            const char* externalFeatureString = this->glslCaps()->externalTextureExtensionString();
+            // We shouldn't ever create a GrGLTexture that requires external sampler type 
+            SkASSERT(externalFeatureString);
+            fFS.addFeature(1 << GrGLSLFragmentShaderBuilder::kExternalTexture_GLSLPrivateFeature,
+                           externalFeatureString);
+        }
+    }
+}
+
+bool GrGLProgramBuilder::compileAndAttachShaders(GrGLSLShaderBuilder& shader,
+                                                 GrGLuint programId,
+                                                 GrGLenum type,
+                                                 SkTDArray<GrGLuint>* shaderIds) {
+    GrGLGpu* gpu = this->gpu();
+    GrGLuint shaderId = GrGLCompileAndAttachShader(gpu->glContext(),
+                                                   programId,
+                                                   type,
+                                                   shader.fCompilerStrings.begin(),
+                                                   shader.fCompilerStringLengths.begin(),
+                                                   shader.fCompilerStrings.count(),
+                                                   gpu->stats());
+
+    if (!shaderId) {
+        return false;
+    }
+
+    *shaderIds->append() = shaderId;
+
+    return true;
+}
+
+GrGLProgram* GrGLProgramBuilder::finalize() {
+    // verify we can get a program id
+    GrGLuint programID;
+    GL_CALL_RET(programID, CreateProgram());
+    if (0 == programID) {
+        return nullptr;
+    }
+
+    // compile shaders and bind attributes / uniforms
+    SkTDArray<GrGLuint> shadersToDelete;
+    fVS.finalize(kVertex_Visibility);
+    if (!this->compileAndAttachShaders(fVS, programID, GR_GL_VERTEX_SHADER, &shadersToDelete)) {
+        this->cleanupProgram(programID, shadersToDelete);
+        return nullptr;
+    }
+
+    // NVPR actually requires a vertex shader to compile
+    bool useNvpr = primitiveProcessor().isPathRendering();
+    if (!useNvpr) {
+        const GrPrimitiveProcessor& primProc = this->primitiveProcessor();
+
+        int vaCount = primProc.numAttribs();
+        for (int i = 0; i < vaCount; i++) {
+            GL_CALL(BindAttribLocation(programID, i, primProc.getAttrib(i).fName));
+        }
+    }
+
+    fFS.finalize(kFragment_Visibility);
+    if (!this->compileAndAttachShaders(fFS, programID, GR_GL_FRAGMENT_SHADER, &shadersToDelete)) {
+        this->cleanupProgram(programID, shadersToDelete);
+        return nullptr;
+    }
+
+    this->bindProgramResourceLocations(programID);
+
+    GL_CALL(LinkProgram(programID));
+
+    // Calling GetProgramiv is expensive in Chromium. Assume success in release builds.
+    bool checkLinked = kChromium_GrGLDriver != fGpu->ctxInfo().driver();
+#ifdef SK_DEBUG
+    checkLinked = true;
+#endif
+    if (checkLinked) {
+        checkLinkStatus(programID);
+    }
+    this->resolveProgramResourceLocations(programID);
+
+    this->cleanupShaders(shadersToDelete);
+
+    return this->createProgram(programID);
+}
+
+void GrGLProgramBuilder::bindProgramResourceLocations(GrGLuint programID) {
+    if (fGpu->glCaps().bindUniformLocationSupport()) {
+        int count = fUniforms.count();
+        for (int i = 0; i < count; ++i) {
+            GL_CALL(BindUniformLocation(programID, i, fUniforms[i].fVariable.c_str()));
+            fUniforms[i].fLocation = i;
+        }
+    }
+
+    const GrGLCaps& caps = this->gpu()->glCaps();
+    if (fFS.hasCustomColorOutput() && caps.bindFragDataLocationSupport()) {
+        GL_CALL(BindFragDataLocation(programID, 0,
+                                     GrGLSLFragmentShaderBuilder::DeclaredColorOutputName()));
+    }
+    if (fFS.hasSecondaryOutput() && caps.glslCaps()->mustDeclareFragmentShaderOutput()) {
+        GL_CALL(BindFragDataLocationIndexed(programID, 0, 1,
+                                  GrGLSLFragmentShaderBuilder::DeclaredSecondaryColorOutputName()));
+    }
+
+    // handle NVPR separable varyings
+    if (!fGpu->glCaps().shaderCaps()->pathRenderingSupport() ||
+        !fGpu->glPathRendering()->shouldBindFragmentInputs()) {
+        return;
+    }
+    int count = fVaryingHandler.fPathProcVaryingInfos.count();
+    for (int i = 0; i < count; ++i) {
+        GL_CALL(BindFragmentInputLocation(programID, i,
+                                       fVaryingHandler.fPathProcVaryingInfos[i].fVariable.c_str()));
+        fVaryingHandler.fPathProcVaryingInfos[i].fLocation = i;
+    }
+}
+
+bool GrGLProgramBuilder::checkLinkStatus(GrGLuint programID) {
+    GrGLint linked = GR_GL_INIT_ZERO;
+    GL_CALL(GetProgramiv(programID, GR_GL_LINK_STATUS, &linked));
+    if (!linked) {
+        GrGLint infoLen = GR_GL_INIT_ZERO;
+        GL_CALL(GetProgramiv(programID, GR_GL_INFO_LOG_LENGTH, &infoLen));
+        SkAutoMalloc log(sizeof(char)*(infoLen+1));  // outside if for debugger
+        if (infoLen > 0) {
+            // retrieve length even though we don't need it to workaround
+            // bug in chrome cmd buffer param validation.
+            GrGLsizei length = GR_GL_INIT_ZERO;
+            GL_CALL(GetProgramInfoLog(programID,
+                                      infoLen+1,
+                                      &length,
+                                      (char*)log.get()));
+            SkDebugf("%s", (char*)log.get());
+        }
+        SkDEBUGFAIL("Error linking program");
+        GL_CALL(DeleteProgram(programID));
+        programID = 0;
+    }
+    return SkToBool(linked);
+}
+
+void GrGLProgramBuilder::resolveProgramResourceLocations(GrGLuint programID) {
+    if (!fGpu->glCaps().bindUniformLocationSupport()) {
+        int count = fUniforms.count();
+        for (int i = 0; i < count; ++i) {
+            GrGLint location;
+            GL_CALL_RET(location, GetUniformLocation(programID, fUniforms[i].fVariable.c_str()));
+            fUniforms[i].fLocation = location;
+        }
+    }
+
+    // handle NVPR separable varyings
+    if (!fGpu->glCaps().shaderCaps()->pathRenderingSupport() ||
+        !fGpu->glPathRendering()->shouldBindFragmentInputs()) {
+        return;
+    }
+    int count = fVaryingHandler.fPathProcVaryingInfos.count();
+    for (int i = 0; i < count; ++i) {
+        GrGLint location;
+        GL_CALL_RET(location, GetProgramResourceLocation(
+                                       programID,
+                                       GR_GL_FRAGMENT_INPUT,
+                                       fVaryingHandler.fPathProcVaryingInfos[i].fVariable.c_str()));
+        fVaryingHandler.fPathProcVaryingInfos[i].fLocation = location;
+    }
+}
+
+void GrGLProgramBuilder::cleanupProgram(GrGLuint programID, const SkTDArray<GrGLuint>& shaderIDs) {
+    GL_CALL(DeleteProgram(programID));
+    cleanupShaders(shaderIDs);
+}
+void GrGLProgramBuilder::cleanupShaders(const SkTDArray<GrGLuint>& shaderIDs) {
+    for (int i = 0; i < shaderIDs.count(); ++i) {
+      GL_CALL(DeleteShader(shaderIDs[i]));
+    }
+}
+
+GrGLProgram* GrGLProgramBuilder::createProgram(GrGLuint programID) {
+    return new GrGLProgram(fGpu, this->desc(), fUniformHandles, programID, fUniforms,
+                           fVaryingHandler.fPathProcVaryingInfos,
+                           fGeometryProcessor, fXferProcessor, fFragmentProcessors.get(),
+                           &fSamplerUniforms);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+GrGLInstalledFragProcs::~GrGLInstalledFragProcs() {
+    int numProcs = fProcs.count();
+    for (int i = 0; i < numProcs; ++i) {
+        delete fProcs[i];
+    }
+}
diff --git a/gfx/skia/skia/src/gpu/gl/builders/GrGLProgramBuilder.h b/gfx/skia/skia/src/gpu/gl/builders/GrGLProgramBuilder.h
new file mode 100644
index 000000000000..329e5d7d0815
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/builders/GrGLProgramBuilder.h
@@ -0,0 +1,178 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGLProgramBuilder_DEFINED
+#define GrGLProgramBuilder_DEFINED
+
+#include "GrPipeline.h"
+#include "gl/GrGLProgramDataManager.h"
+#include "gl/GrGLVaryingHandler.h"
+#include "glsl/GrGLSLPrimitiveProcessor.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+#include "glsl/GrGLSLTextureSampler.h"
+#include "glsl/GrGLSLXferProcessor.h"
+
+class GrFragmentProcessor;
+class GrGLContextInfo;
+class GrGLSLShaderBuilder;
+class GrGLSLCaps;
+
+/**
+ * The below struct represent processors installed in programs.
+ */
+template <class Proc>
+struct GrGLInstalledProc {
+    SkDEBUGCODE(int fSamplersIdx;)
+    SkAutoTDelete<Proc> fGLProc;
+};
+
+typedef GrGLInstalledProc<GrGLSLPrimitiveProcessor> GrGLInstalledGeoProc;
+typedef GrGLInstalledProc<GrGLSLXferProcessor> GrGLInstalledXferProc;
+typedef GrGLInstalledProc<GrGLSLFragmentProcessor> GrGLInstalledFragProc;
+
+struct GrGLInstalledFragProcs : public SkRefCnt {
+    virtual ~GrGLInstalledFragProcs();
+    SkSTArray<8, GrGLInstalledFragProc*, true> fProcs;
+};
+
+/*
+ * Please note - no diamond problems because of virtual inheritance.  Also, both base classes
+ * are pure virtual with no data members.  This is the base class for program building.
+ * Subclasses are nearly identical but each has their own way of emitting transforms.  State for
+ * each of the elements of the shader pipeline, ie vertex, fragment, geometry, etc, lives in those
+ * respective builders
+*/
+class GrGLProgramBuilder : public GrGLSLProgramBuilder {
+public:
+    /** Generates a shader program.
+     *
+     * The program implements what is specified in the stages given as input.
+     * After successful generation, the builder result objects are available
+     * to be used.
+     * @return true if generation was successful.
+     */
+    static GrGLProgram* CreateProgram(const DrawArgs&, GrGLGpu*);
+
+    const GrGLSLShaderVar& getUniformVariable(UniformHandle u) const override {
+        return fUniforms[u.toIndex()].fVariable;
+    }
+
+    const char* getUniformCStr(UniformHandle u) const override {
+        return this->getUniformVariable(u).c_str();
+    }
+
+    const GrGLSLCaps* glslCaps() const override;
+
+    GrGLGpu* gpu() const { return fGpu; }
+
+private:
+    typedef GrGLProgramDataManager::UniformInfo UniformInfo;
+    typedef GrGLProgramDataManager::UniformInfoArray UniformInfoArray;
+
+    GrGLProgramBuilder(GrGLGpu*, const DrawArgs&);
+
+    UniformHandle internalAddUniformArray(uint32_t visibility,
+                                          GrSLType type,
+                                          GrSLPrecision precision,
+                                          const char* name,
+                                          bool mangleName,
+                                          int arrayCount,
+                                          const char** outName) override;
+
+    // Generates a possibly mangled name for a stage variable and writes it to the fragment shader.
+    // If GrGLSLExpr4 has a valid name then it will use that instead
+    void nameExpression(GrGLSLExpr4*, const char* baseName);
+    bool emitAndInstallProcs(GrGLSLExpr4* inputColor, GrGLSLExpr4* inputCoverage);
+    void emitAndInstallFragProcs(int procOffset, int numProcs, GrGLSLExpr4* inOut);
+    void emitAndInstallProc(const GrFragmentProcessor&,
+                            int index,
+                            const GrGLSLExpr4& input,
+                            GrGLSLExpr4* output);
+
+    void emitAndInstallProc(const GrPrimitiveProcessor&,
+                            GrGLSLExpr4* outputColor,
+                            GrGLSLExpr4* outputCoverage);
+
+    // these emit functions help to keep the createAndEmitProcessors template general
+    void emitAndInstallProc(const GrFragmentProcessor&,
+                            int index,
+                            const char* outColor,
+                            const char* inColor);
+    void emitAndInstallProc(const GrPrimitiveProcessor&,
+                            const char* outColor,
+                            const char* outCoverage);
+    void emitAndInstallXferProc(const GrXferProcessor&,
+                                const GrGLSLExpr4& colorIn,
+                                const GrGLSLExpr4& coverageIn,
+                                bool ignoresCoverage);
+
+    void verify(const GrPrimitiveProcessor&);
+    void verify(const GrXferProcessor&);
+    void verify(const GrFragmentProcessor&);
+    template <class Proc>
+    void emitSamplers(const GrProcessor&,
+                      GrGLSLTextureSampler::TextureSamplerArray* outSamplers,
+                      GrGLInstalledProc<Proc>*);
+
+    bool compileAndAttachShaders(GrGLSLShaderBuilder& shader,
+                                 GrGLuint programId,
+                                 GrGLenum type,
+                                 SkTDArray<GrGLuint>* shaderIds); 
+    GrGLProgram* finalize();
+    void bindProgramResourceLocations(GrGLuint programID);
+    bool checkLinkStatus(GrGLuint programID);
+    void resolveProgramResourceLocations(GrGLuint programID);
+    void cleanupProgram(GrGLuint programID, const SkTDArray<GrGLuint>& shaderIDs);
+    void cleanupShaders(const SkTDArray<GrGLuint>& shaderIDs);
+
+    // Subclasses create different programs
+    GrGLProgram* createProgram(GrGLuint programID);
+
+    void onAppendUniformDecls(ShaderVisibility visibility, SkString* out) const override;
+
+    GrGLSLVaryingHandler* varyingHandler() override { return &fVaryingHandler; }
+
+    // reset is called by program creator between each processor's emit code.  It increments the
+    // stage offset for variable name mangling, and also ensures verfication variables in the
+    // fragment shader are cleared.
+    void reset() {
+        this->addStage();
+        fFS.reset();
+    }
+    void addStage() { fStageIndex++; }
+
+    class AutoStageAdvance {
+    public:
+        AutoStageAdvance(GrGLProgramBuilder* pb)
+            : fPB(pb) {
+            fPB->reset();
+            // Each output to the fragment processor gets its own code section
+            fPB->fFS.nextStage();
+        }
+        ~AutoStageAdvance() {}
+    private:
+        GrGLProgramBuilder* fPB;
+    };
+
+    GrGLInstalledGeoProc* fGeometryProcessor;
+    GrGLInstalledXferProc* fXferProcessor;
+    SkAutoTUnref<GrGLInstalledFragProcs> fFragmentProcessors;
+
+    GrGLGpu* fGpu;
+    UniformInfoArray fUniforms;
+    GrGLSLPrimitiveProcessor::TransformsIn fCoordTransforms;
+    GrGLSLPrimitiveProcessor::TransformsOut fOutCoords;
+    SkTArray<UniformHandle> fSamplerUniforms;
+
+    GrGLVaryingHandler        fVaryingHandler;
+
+    friend class GrGLVaryingHandler; 
+
+    typedef GrGLSLProgramBuilder INHERITED; 
+};
+#endif
diff --git a/gfx/skia/skia/src/gpu/gl/builders/GrGLSLPrettyPrint.cpp b/gfx/skia/skia/src/gpu/gl/builders/GrGLSLPrettyPrint.cpp
new file mode 100644
index 000000000000..02802987c600
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/builders/GrGLSLPrettyPrint.cpp
@@ -0,0 +1,204 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "gl/GrGLSLPrettyPrint.h"
+
+namespace GrGLSLPrettyPrint {
+
+class GLSLPrettyPrint {
+public:
+    GLSLPrettyPrint() {}
+
+    SkString prettify(const char** strings,
+                      int* lengths,
+                      int count,
+                      bool countlines) {
+        fCountlines = countlines;
+        fTabs = 0;
+        fLinecount = 1;
+        fFreshline = true;
+
+        // If a string breaks while in the middle 'parse until' we need to continue parsing on the
+        // next string
+        fInParseUntilNewline = false;
+        fInParseUntil = false;
+
+        int parensDepth = 0;
+
+        // number 1st line
+        this->lineNumbering();
+        for (int i = 0; i < count; i++) {
+            // setup pretty state
+            fIndex = 0;
+            fLength = lengths[i];
+            fInput = strings[i];
+
+            while (fLength > fIndex) {
+                /* the heart and soul of our prettification algorithm.  The rules should hopefully
+                 * be self explanatory.  For '#' and '//' tokens we parse until we reach a newline.
+                 *
+                 * For long style comments like this one, we search for the ending token.  We also
+                 * preserve whitespace in these comments WITH THE CAVEAT that we do the newlines
+                 * ourselves.  This allows us to remain in control of line numbers, and matching
+                 * tabs Existing tabs in the input string are copied over too, but this will look
+                 *  funny
+                 *
+                 * '{' and '}' are handled in basically the same way.  We add a newline if we aren't
+                 * on a fresh line, dirty the line, then add a second newline, ie braces are always
+                 * on their own lines indented properly.  The one funkiness here is structs print
+                 * with the semicolon on its own line.  Its not a problem for a glsl compiler though
+                 *
+                 * '(' and ')' are basically ignored, except as a sign we need to ignore ';' ala
+                 * in for loops.
+                 *
+                 * ';' means add a new line
+                 *
+                 * '\t' and '\n' are ignored in general parsing for backwards compatability with
+                 * existing shader code and we also have a special case for handling whitespace
+                 * at the beginning of fresh lines.
+                 *
+                 * Otherwise just add the new character to the pretty string, indenting if necessary.
+                 */
+                if (fInParseUntilNewline) {
+                    this->parseUntilNewline();
+                } else if (fInParseUntil) {
+                    this->parseUntil(fInParseUntilToken);
+                } else if (this->hasToken("#") || this->hasToken("//")) {
+                    this->parseUntilNewline();
+                } else if (this->hasToken("/*")) {
+                    this->parseUntil("*/");
+                } else if ('{' == fInput[fIndex]) {
+                    this->newline();
+                    this->appendChar('{');
+                    fTabs++;
+                    this->newline();
+                } else if ('}' == fInput[fIndex]) {
+                    fTabs--;
+                    this->newline();
+                    this->appendChar('}');
+                    this->newline();
+                } else if (this->hasToken(")")) {
+                    parensDepth--;
+                } else if (this->hasToken("(")) {
+                    parensDepth++;
+                } else if (!parensDepth && this->hasToken(";")) {
+                    this->newline();
+                } else if ('\t' == fInput[fIndex] || '\n' == fInput[fIndex] ||
+                        (fFreshline && ' ' == fInput[fIndex])) {
+                    fIndex++;
+                } else {
+                    this->appendChar(fInput[fIndex]);
+                }
+            }
+        }
+        return fPretty;
+    }
+private:
+    void appendChar(char c) {
+        this->tabString();
+        fPretty.appendf("%c", fInput[fIndex++]);
+        fFreshline = false;
+    }
+
+    // hasToken automatically consumes the next token, if it is a match, and then tabs
+    // if necessary, before inserting the token into the pretty string
+    bool hasToken(const char* token) {
+        size_t i = fIndex;
+        for (size_t j = 0; token[j] && fLength > i; i++, j++) {
+            if (token[j] != fInput[i]) {
+                return false;
+            }
+        }
+        this->tabString();
+        fIndex = i;
+        fPretty.append(token);
+        fFreshline = false;
+        return true;
+    }
+
+    void parseUntilNewline() {
+        while (fLength > fIndex) {
+            if ('\n' == fInput[fIndex]) {
+                fIndex++;
+                this->newline();
+                fInParseUntilNewline = false;
+                break;
+            }
+            fPretty.appendf("%c", fInput[fIndex++]);
+            fInParseUntilNewline = true;
+        }
+    }
+
+    // this code assumes it is not actually searching for a newline.  If you need to search for a
+    // newline, then use the function above.  If you do search for a newline with this function
+    // it will consume the entire string and the output will certainly not be prettified
+    void parseUntil(const char* token) {
+        while (fLength > fIndex) {
+            // For embedded newlines,  this code will make sure to embed the newline in the
+            // pretty string, increase the linecount, and tab out the next line to the appropriate
+            // place
+            if ('\n' == fInput[fIndex]) {
+                this->newline();
+                this->tabString();
+                fIndex++;
+            }
+            if (this->hasToken(token)) {
+                fInParseUntil = false;
+                break;
+            }
+            fFreshline = false;
+            fPretty.appendf("%c", fInput[fIndex++]);
+            fInParseUntil = true;
+            fInParseUntilToken = token;
+        }
+    }
+
+    // We only tab if on a newline, otherwise consider the line tabbed
+    void tabString() {
+        if (fFreshline) {
+            for (int t = 0; t < fTabs; t++) {
+                fPretty.append("\t");
+            }
+        }
+    }
+
+    // newline is really a request to add a newline, if we are on a fresh line there is no reason
+    // to add another newline
+    void newline() {
+        if (!fFreshline) {
+            fFreshline = true;
+            fPretty.append("\n");
+            this->lineNumbering();
+        }
+    }
+
+    void lineNumbering() {
+        if (fCountlines) {
+            fPretty.appendf("%4d\t", fLinecount++);
+        }
+    }
+
+    bool fCountlines, fFreshline;
+    int fTabs, fLinecount;
+    size_t fIndex, fLength;
+    const char* fInput;
+    SkString fPretty;
+
+    // Some helpers for parseUntil when we go over a string length
+    bool fInParseUntilNewline;
+    bool fInParseUntil;
+    const char* fInParseUntilToken;
+};
+
+SkString PrettyPrintGLSL(const char** strings,
+                         int* lengths,
+                         int count,
+                         bool countlines) {
+    GLSLPrettyPrint pp;
+    return pp.prettify(strings, lengths, count, countlines);
+}
+
+} // end namespace
diff --git a/gfx/skia/skia/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp b/gfx/skia/skia/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp
new file mode 100644
index 000000000000..52915b6f8992
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrGLShaderStringBuilder.h"
+#include "gl/GrGLGpu.h"
+#include "gl/GrGLSLPrettyPrint.h"
+#include "SkRTConf.h"
+#include "SkTraceEvent.h"
+
+#define GL_CALL(X) GR_GL_CALL(gpu->glInterface(), X)
+#define GL_CALL_RET(R, X) GR_GL_CALL_RET(gpu->glInterface(), R, X)
+
+SK_CONF_DECLARE(bool, c_PrintShaders, "gpu.printShaders", false,
+                "Print the source code for all shaders generated.");
+
+GrGLuint GrGLCompileAndAttachShader(const GrGLContext& glCtx,
+                                    GrGLuint programId,
+                                    GrGLenum type,
+                                    const char** strings,
+                                    int* lengths,
+                                    int count,
+                                    GrGpu::Stats* stats) {
+    const GrGLInterface* gli = glCtx.interface();
+
+    GrGLuint shaderId;
+    GR_GL_CALL_RET(gli, shaderId, CreateShader(type));
+    if (0 == shaderId) {
+        return 0;
+    }
+
+#ifdef SK_DEBUG
+    SkString prettySource = GrGLSLPrettyPrint::PrettyPrintGLSL(strings, lengths, count, false);
+    const GrGLchar* sourceStr = prettySource.c_str();
+    GrGLint sourceLength = static_cast<GrGLint>(prettySource.size());
+    GR_GL_CALL(gli, ShaderSource(shaderId, 1, &sourceStr, &sourceLength));
+#else
+    GR_GL_CALL(gli, ShaderSource(shaderId, count, strings, lengths));
+#endif
+
+    // If tracing is enabled in chrome then we pretty print
+    bool traceShader;
+    TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), &traceShader);
+    if (traceShader) {
+        SkString shader = GrGLSLPrettyPrint::PrettyPrintGLSL(strings, lengths, count, false);
+        TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), "skia_gpu::GLShader",
+                             TRACE_EVENT_SCOPE_THREAD, "shader", TRACE_STR_COPY(shader.c_str()));
+    }
+
+    stats->incShaderCompilations();
+    GR_GL_CALL(gli, CompileShader(shaderId));
+
+    // Calling GetShaderiv in Chromium is quite expensive. Assume success in release builds.
+    bool checkCompiled = kChromium_GrGLDriver != glCtx.driver();
+#ifdef SK_DEBUG
+    checkCompiled = true;
+#endif
+    if (checkCompiled) {
+        GrGLint compiled = GR_GL_INIT_ZERO;
+        GR_GL_CALL(gli, GetShaderiv(shaderId, GR_GL_COMPILE_STATUS, &compiled));
+
+        if (!compiled) {
+            GrGLint infoLen = GR_GL_INIT_ZERO;
+            GR_GL_CALL(gli, GetShaderiv(shaderId, GR_GL_INFO_LOG_LENGTH, &infoLen));
+            SkAutoMalloc log(sizeof(char)*(infoLen+1)); // outside if for debugger
+            if (infoLen > 0) {
+                // retrieve length even though we don't need it to workaround bug in Chromium cmd
+                // buffer param validation.
+                GrGLsizei length = GR_GL_INIT_ZERO;
+                GR_GL_CALL(gli, GetShaderInfoLog(shaderId, infoLen+1, &length, (char*)log.get()));
+                SkDebugf("%s", GrGLSLPrettyPrint::PrettyPrintGLSL(strings, lengths, count, true).c_str());
+                SkDebugf("\n%s", log.get());
+            }
+            SkDEBUGFAIL("Shader compilation failed!");
+            GR_GL_CALL(gli, DeleteShader(shaderId));
+            return 0;
+        }
+    }
+
+    if (c_PrintShaders) {
+        SkDebugf("%s", GrGLSLPrettyPrint::PrettyPrintGLSL(strings, lengths, count, true).c_str());
+        SkDebugf("\n");
+    }
+
+    // Attach the shader, but defer deletion until after we have linked the program.
+    // This works around a bug in the Android emulator's GLES2 wrapper which
+    // will immediately delete the shader object and free its memory even though it's
+    // attached to a program, which then causes glLinkProgram to fail.
+    GR_GL_CALL(gli, AttachShader(programId, shaderId));
+
+    return shaderId;
+}
diff --git a/gfx/skia/skia/src/gpu/gl/builders/GrGLShaderStringBuilder.h b/gfx/skia/skia/src/gpu/gl/builders/GrGLShaderStringBuilder.h
new file mode 100644
index 000000000000..062e229cdf87
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/builders/GrGLShaderStringBuilder.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGLShaderStringBuilder_DEFINED
+#define GrGLShaderStringBuilder_DEFINED
+
+#include "GrAllocator.h"
+#include "GrGpu.h"
+#include "gl/GrGLContext.h"
+#include "SkTypes.h"
+
+GrGLuint GrGLCompileAndAttachShader(const GrGLContext& glCtx,
+                                    GrGLuint programId,
+                                    GrGLenum type,
+                                    const char** strings,
+                                    int* lengths,
+                                    int count,
+                                    GrGpu::Stats*);
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/gl/command_buffer/SkCommandBufferGLContext.cpp b/gfx/skia/skia/src/gpu/gl/command_buffer/SkCommandBufferGLContext.cpp
new file mode 100644
index 000000000000..585f1d079eb3
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/command_buffer/SkCommandBufferGLContext.cpp
@@ -0,0 +1,311 @@
+
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "SkOnce.h"
+#include "gl/GrGLInterface.h"
+#include "gl/GrGLAssembleInterface.h"
+#include "gl/command_buffer/SkCommandBufferGLContext.h"
+#include "../ports/SkOSLibrary.h"
+
+#if defined SK_BUILD_FOR_MAC
+
+// EGL doesn't exist on the mac, so expose what we need to get the command buffer's EGL running.
+typedef void *EGLDisplay;
+typedef unsigned int EGLBoolean;
+typedef void *EGLConfig;
+typedef void *EGLSurface;
+typedef void *EGLContext;
+typedef int32_t EGLint;
+typedef void* EGLNativeDisplayType;
+typedef void* EGLNativeWindowType;
+typedef void (*__eglMustCastToProperFunctionPointerType)(void);
+#define EGL_FALSE 0
+#define EGL_OPENGL_ES2_BIT 0x0004
+#define EGL_CONTEXT_CLIENT_VERSION 0x3098
+#define EGL_NO_SURFACE ((EGLSurface)0)
+#define EGL_NO_DISPLAY ((EGLDisplay)0)
+#define EGL_NO_CONTEXT ((EGLContext)0)
+#define EGL_DEFAULT_DISPLAY ((EGLNativeDisplayType)0)
+#define EGL_SURFACE_TYPE 0x3033
+#define EGL_PBUFFER_BIT 0x0001
+#define EGL_RENDERABLE_TYPE 0x3040
+#define EGL_RED_SIZE 0x3024
+#define EGL_GREEN_SIZE 0x3023
+#define EGL_BLUE_SIZE 0x3022
+#define EGL_ALPHA_SIZE 0x3021
+#define EGL_DEPTH_SIZE 0x3025
+#define EGL_STENCIL_SIZE 0x3025
+#define EGL_SAMPLES 0x3031
+#define EGL_SAMPLE_BUFFERS 0x3032
+#define EGL_NONE 0x3038
+#define EGL_WIDTH 0x3057
+#define EGL_HEIGHT 0x3056
+
+#else
+
+#include <EGL/egl.h>
+
+#endif
+
+typedef EGLDisplay (*GetDisplayProc)(EGLNativeDisplayType display_id);
+typedef EGLBoolean (*InitializeProc)(EGLDisplay dpy, EGLint *major, EGLint *minor);
+typedef EGLBoolean (*TerminateProc)(EGLDisplay dpy);
+typedef EGLBoolean (*ChooseConfigProc)(EGLDisplay dpy, const EGLint* attrib_list, EGLConfig* configs, EGLint config_size, EGLint* num_config);
+typedef EGLBoolean (*GetConfigAttrib)(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint* value);
+typedef EGLSurface (*CreateWindowSurfaceProc)(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint* attrib_list);
+typedef EGLSurface (*CreatePbufferSurfaceProc)(EGLDisplay dpy, EGLConfig config, const EGLint* attrib_list);
+typedef EGLBoolean (*DestroySurfaceProc)(EGLDisplay dpy, EGLSurface surface);
+typedef EGLContext (*CreateContextProc)(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint* attrib_list);
+typedef EGLBoolean (*DestroyContextProc)(EGLDisplay dpy, EGLContext ctx);
+typedef EGLBoolean (*MakeCurrentProc)(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx);
+typedef EGLBoolean (*SwapBuffersProc)(EGLDisplay dpy, EGLSurface surface);
+typedef __eglMustCastToProperFunctionPointerType (*GetProcAddressProc)(const char* procname);
+
+static GetDisplayProc gfGetDisplay = nullptr;
+static InitializeProc gfInitialize = nullptr;
+static TerminateProc gfTerminate = nullptr;
+static ChooseConfigProc gfChooseConfig = nullptr;
+static GetConfigAttrib gfGetConfigAttrib = nullptr;
+static CreateWindowSurfaceProc gfCreateWindowSurface = nullptr;
+static CreatePbufferSurfaceProc gfCreatePbufferSurface = nullptr;
+static DestroySurfaceProc gfDestroySurface = nullptr;
+static CreateContextProc gfCreateContext = nullptr;
+static DestroyContextProc gfDestroyContext = nullptr;
+static MakeCurrentProc gfMakeCurrent = nullptr;
+static SwapBuffersProc gfSwapBuffers = nullptr;
+static GetProcAddressProc gfGetProcAddress = nullptr;
+
+static void* gLibrary = nullptr;
+static bool gfFunctionsLoadedSuccessfully = false;
+
+static void load_command_buffer_functions() {
+    if (!gLibrary) {
+#if defined _WIN32
+        gLibrary = DynamicLoadLibrary("command_buffer_gles2.dll");
+#elif defined SK_BUILD_FOR_MAC
+        gLibrary = DynamicLoadLibrary("libcommand_buffer_gles2.dylib");
+#else
+        gLibrary = DynamicLoadLibrary("libcommand_buffer_gles2.so");
+#endif // defined _WIN32
+        if (gLibrary) {
+            gfGetDisplay = (GetDisplayProc)GetProcedureAddress(gLibrary, "eglGetDisplay");
+            gfInitialize = (InitializeProc)GetProcedureAddress(gLibrary, "eglInitialize");
+            gfTerminate = (TerminateProc)GetProcedureAddress(gLibrary, "eglTerminate");
+            gfChooseConfig = (ChooseConfigProc)GetProcedureAddress(gLibrary, "eglChooseConfig");
+            gfGetConfigAttrib = (GetConfigAttrib)GetProcedureAddress(gLibrary, "eglGetConfigAttrib");
+            gfCreateWindowSurface = (CreateWindowSurfaceProc)GetProcedureAddress(gLibrary, "eglCreateWindowSurface");
+            gfCreatePbufferSurface = (CreatePbufferSurfaceProc)GetProcedureAddress(gLibrary, "eglCreatePbufferSurface");
+            gfDestroySurface = (DestroySurfaceProc)GetProcedureAddress(gLibrary, "eglDestroySurface");
+            gfCreateContext = (CreateContextProc)GetProcedureAddress(gLibrary, "eglCreateContext");
+            gfDestroyContext = (DestroyContextProc)GetProcedureAddress(gLibrary, "eglDestroyContext");
+            gfMakeCurrent = (MakeCurrentProc)GetProcedureAddress(gLibrary, "eglMakeCurrent");
+            gfSwapBuffers = (SwapBuffersProc)GetProcedureAddress(gLibrary, "eglSwapBuffers");
+            gfGetProcAddress = (GetProcAddressProc)GetProcedureAddress(gLibrary, "eglGetProcAddress");
+
+            gfFunctionsLoadedSuccessfully = gfGetDisplay && gfInitialize && gfTerminate &&
+                                            gfChooseConfig && gfCreateWindowSurface &&
+                                            gfCreatePbufferSurface && gfDestroySurface &&
+                                            gfCreateContext && gfDestroyContext && gfMakeCurrent &&
+                                            gfSwapBuffers && gfGetProcAddress;
+
+        }
+    }
+}
+
+static GrGLFuncPtr command_buffer_get_gl_proc(void* ctx, const char name[]) {
+    if (!gfFunctionsLoadedSuccessfully) {
+        return nullptr;
+    }
+    return gfGetProcAddress(name);
+}
+
+SK_DECLARE_STATIC_ONCE(loadCommandBufferOnce);
+void LoadCommandBufferOnce() {
+    SkOnce(&loadCommandBufferOnce, load_command_buffer_functions);
+}
+
+const GrGLInterface* GrGLCreateCommandBufferInterface() {
+    LoadCommandBufferOnce();
+    if (!gfFunctionsLoadedSuccessfully) {
+        return nullptr;
+    }
+    return GrGLAssembleGLESInterface(gLibrary, command_buffer_get_gl_proc);
+}
+
+SkCommandBufferGLContext::SkCommandBufferGLContext()
+    : fContext(EGL_NO_CONTEXT)
+    , fDisplay(EGL_NO_DISPLAY)
+    , fSurface(EGL_NO_SURFACE) {
+
+    static const EGLint configAttribs[] = {
+        EGL_SURFACE_TYPE, EGL_PBUFFER_BIT,
+        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+        EGL_RED_SIZE, 8,
+        EGL_GREEN_SIZE, 8,
+        EGL_BLUE_SIZE, 8,
+        EGL_ALPHA_SIZE, 8,
+        EGL_NONE
+    };
+
+    static const EGLint surfaceAttribs[] = {
+        EGL_WIDTH, 1,
+        EGL_HEIGHT, 1,
+        EGL_NONE
+    };
+
+    initializeGLContext(nullptr, configAttribs, surfaceAttribs);
+}
+
+SkCommandBufferGLContext::SkCommandBufferGLContext(void* nativeWindow, int msaaSampleCount) {
+    static const EGLint surfaceAttribs[] = { EGL_NONE };
+
+    EGLint configAttribs[] = {
+        EGL_RED_SIZE,       8,
+        EGL_GREEN_SIZE,     8,
+        EGL_BLUE_SIZE,      8,
+        EGL_ALPHA_SIZE,     8,
+        EGL_DEPTH_SIZE,     8,
+        EGL_STENCIL_SIZE,   8,
+        EGL_SAMPLE_BUFFERS, 1,
+        EGL_SAMPLES,        msaaSampleCount,
+        EGL_NONE
+    };
+    if (msaaSampleCount == 0) {
+        configAttribs[12] = EGL_NONE;
+    }
+
+    initializeGLContext(nativeWindow, configAttribs, surfaceAttribs);
+}
+
+void SkCommandBufferGLContext::initializeGLContext(void* nativeWindow, const int* configAttribs,
+                                                   const int* surfaceAttribs) {
+    LoadCommandBufferOnce();
+    if (!gfFunctionsLoadedSuccessfully) {
+        return;
+    }
+
+    fDisplay = gfGetDisplay(static_cast<EGLNativeDisplayType>(EGL_DEFAULT_DISPLAY));
+    if (EGL_NO_DISPLAY == fDisplay) {
+        SkDebugf("Could not create EGL display!");
+        return;
+    }
+
+    EGLint majorVersion;
+    EGLint minorVersion;
+    gfInitialize(fDisplay, &majorVersion, &minorVersion);
+
+    EGLConfig surfaceConfig = static_cast<EGLConfig>(fConfig);
+    EGLint numConfigs;
+    gfChooseConfig(fDisplay, configAttribs, &surfaceConfig, 1, &numConfigs);
+
+    if (nativeWindow) {
+        fSurface = gfCreateWindowSurface(fDisplay, surfaceConfig,
+                                         (EGLNativeWindowType)nativeWindow, surfaceAttribs);
+    } else {
+        fSurface = gfCreatePbufferSurface(fDisplay, surfaceConfig, surfaceAttribs);
+    }
+
+    static const EGLint contextAttribs[] = {
+        EGL_CONTEXT_CLIENT_VERSION, 2,
+        EGL_NONE
+    };
+    fContext = gfCreateContext(fDisplay, surfaceConfig, nullptr, contextAttribs);
+
+    gfMakeCurrent(fDisplay, fSurface, fSurface, fContext);
+
+    SkAutoTUnref<const GrGLInterface> gl(GrGLCreateCommandBufferInterface());
+    if (nullptr == gl.get()) {
+        SkDebugf("Could not create CommandBuffer GL interface!\n");
+        this->destroyGLContext();
+        return;
+    }
+    if (!gl->validate()) {
+        SkDebugf("Could not validate CommandBuffer GL interface!\n");
+        this->destroyGLContext();
+        return;
+    }
+
+    this->init(gl.detach());
+}
+
+SkCommandBufferGLContext::~SkCommandBufferGLContext() {
+    this->teardown();
+    this->destroyGLContext();
+}
+
+void SkCommandBufferGLContext::destroyGLContext() {
+    if (!gfFunctionsLoadedSuccessfully) {
+        return;
+    }
+    if (fDisplay) {
+        gfMakeCurrent(fDisplay, 0, 0, 0);
+
+        if (fContext) {
+            gfDestroyContext(fDisplay, fContext);
+            fContext = EGL_NO_CONTEXT;
+        }
+
+        if (fSurface) {
+            gfDestroySurface(fDisplay, fSurface);
+            fSurface = EGL_NO_SURFACE;
+        }
+
+        gfTerminate(fDisplay);
+        fDisplay = EGL_NO_DISPLAY;
+    }
+}
+
+void SkCommandBufferGLContext::onPlatformMakeCurrent() const {
+    if (!gfFunctionsLoadedSuccessfully) {
+        return;
+    }
+    if (!gfMakeCurrent(fDisplay, fSurface, fSurface, fContext)) {
+        SkDebugf("Could not set the context.\n");
+    }
+}
+
+void SkCommandBufferGLContext::onPlatformSwapBuffers() const {
+    if (!gfFunctionsLoadedSuccessfully) {
+        return;
+    }
+    if (!gfSwapBuffers(fDisplay, fSurface)) {
+        SkDebugf("Could not complete gfSwapBuffers.\n");
+    }
+}
+
+GrGLFuncPtr SkCommandBufferGLContext::onPlatformGetProcAddress(const char* name) const {
+    if (!gfFunctionsLoadedSuccessfully) {
+        return nullptr;
+    }
+    return gfGetProcAddress(name);
+}
+
+void SkCommandBufferGLContext::presentCommandBuffer() {
+    if (this->gl()) {
+        this->gl()->fFunctions.fFlush();
+    }
+
+    this->onPlatformSwapBuffers();
+}
+
+bool SkCommandBufferGLContext::makeCurrent() {
+    return gfMakeCurrent(fDisplay, fSurface, fSurface, fContext) != EGL_FALSE;
+}
+
+int SkCommandBufferGLContext::getStencilBits() {
+    EGLint result = 0;
+    EGLConfig surfaceConfig = static_cast<EGLConfig>(fConfig);
+    gfGetConfigAttrib(fDisplay, surfaceConfig, EGL_STENCIL_SIZE, &result);
+    return result;
+}
+
+int SkCommandBufferGLContext::getSampleCount() {
+    EGLint result = 0;
+    EGLConfig surfaceConfig = static_cast<EGLConfig>(fConfig);
+    gfGetConfigAttrib(fDisplay, surfaceConfig, EGL_SAMPLES, &result);
+    return result;
+}
diff --git a/gfx/skia/skia/src/gpu/gl/debug/GrBufferObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrBufferObj.h
index 5c282eef31ba..65b1caf82000 100644
--- a/gfx/skia/skia/src/gpu/gl/debug/GrBufferObj.h
+++ b/gfx/skia/skia/src/gpu/gl/debug/GrBufferObj.h
@@ -19,7 +19,7 @@ class GrBufferObj : public GrFakeRefObj {
 public:
     GrBufferObj()
         : GrFakeRefObj()
-        , fDataPtr(NULL)
+        , fDataPtr(nullptr)
         , fMapped(false)
         , fBound(false)
         , fSize(0)
@@ -55,7 +55,7 @@ public:
     void setUsage(GrGLint usage) { fUsage = usage; }
     GrGLint getUsage() const     { return fUsage; }
 
-    virtual void deleteAction() SK_OVERRIDE;
+    void deleteAction() override;
 
 protected:
 private:
diff --git a/gfx/skia/skia/src/gpu/gl/debug/GrDebugGL.cpp b/gfx/skia/skia/src/gpu/gl/debug/GrDebugGL.cpp
index 03ff36daf278..2de349bc3801 100644
--- a/gfx/skia/skia/src/gpu/gl/debug/GrDebugGL.cpp
+++ b/gfx/skia/skia/src/gpu/gl/debug/GrDebugGL.cpp
@@ -16,7 +16,7 @@
 #include "GrTextureUnitObj.h"
 #include "GrVertexArrayObj.h"
 
-GrDebugGL* GrDebugGL::gObj = NULL;
+GrDebugGL* GrDebugGL::gObj = nullptr;
 int GrDebugGL::gStaticRefCount = 0;
 GrDebugGL::Create GrDebugGL::gFactoryFunc[kObjTypeCount] = {
     GrTextureObj::createGrTextureObj,
@@ -34,13 +34,14 @@ GrDebugGL::GrDebugGL()
     : fPackRowLength(0)
     , fUnPackRowLength(0)
     , fCurTextureUnit(0)
-    , fArrayBuffer(NULL)
-    , fElementArrayBuffer(NULL)
-    , fFrameBuffer(NULL)
-    , fRenderBuffer(NULL)
-    , fProgram(NULL)
-    , fTexture(NULL)
-    , fVertexArray(NULL)  {
+    , fArrayBuffer(nullptr)
+    , fElementArrayBuffer(nullptr)
+    , fFrameBuffer(nullptr)
+    , fRenderBuffer(nullptr)
+    , fProgram(nullptr)
+    , fTexture(nullptr)
+    , fVertexArray(nullptr)
+    , fAbandoned(false) {
 
     for (int i = 0; i < kDefaultMaxTextureUnits; ++i) {
 
@@ -66,13 +67,13 @@ GrDebugGL::~GrDebugGL() {
     }
     fObjects.reset();
 
-    fArrayBuffer = NULL;
-    fElementArrayBuffer = NULL;
-    fFrameBuffer = NULL;
-    fRenderBuffer = NULL;
-    fProgram = NULL;
-    fTexture = NULL;
-    fVertexArray = NULL;
+    fArrayBuffer = nullptr;
+    fElementArrayBuffer = nullptr;
+    fFrameBuffer = nullptr;
+    fRenderBuffer = nullptr;
+    fProgram = nullptr;
+    fTexture = nullptr;
+    fVertexArray = nullptr;
 }
 
 GrFakeRefObj *GrDebugGL::findObject(GrGLuint ID, GrObjTypes type) {
@@ -86,7 +87,7 @@ GrFakeRefObj *GrDebugGL::findObject(GrGLuint ID, GrObjTypes type) {
         }
     }
 
-    return NULL;
+    return nullptr;
 }
 
 void GrDebugGL::setArrayBuffer(GrBufferObj *arrayBuffer) {
@@ -111,7 +112,7 @@ void GrDebugGL::setArrayBuffer(GrBufferObj *arrayBuffer) {
 }
 
 void GrDebugGL::setVertexArray(GrVertexArrayObj* vertexArray) {
-    if (NULL != vertexArray) {
+    if (vertexArray) {
         SkASSERT(!vertexArray->getDeleted());
     }
     SkRefCnt_SafeAssign(fVertexArray, vertexArray);
@@ -204,8 +205,9 @@ void GrDebugGL::useProgram(GrProgramObj *program) {
 
 void GrDebugGL::report() const {
     for (int i = 0; i < fObjects.count(); ++i) {
-        GrAlwaysAssert(0 == fObjects[i]->getRefCount());
-        GrAlwaysAssert(0 < fObjects[i]->getHighRefCount());
-        GrAlwaysAssert(fObjects[i]->getDeleted());
+        if (!fAbandoned) {
+            GrAlwaysAssert(0 == fObjects[i]->getRefCount());
+            GrAlwaysAssert(fObjects[i]->getDeleted());
+        }
     }
 }
diff --git a/gfx/skia/skia/src/gpu/gl/debug/GrDebugGL.h b/gfx/skia/skia/src/gpu/gl/debug/GrDebugGL.h
index ad6edffdf58a..2560879b4f46 100644
--- a/gfx/skia/skia/src/gpu/gl/debug/GrDebugGL.h
+++ b/gfx/skia/skia/src/gpu/gl/debug/GrDebugGL.h
@@ -92,8 +92,8 @@ public:
         // someone should admit to actually using this class
         SkASSERT(0 < gStaticRefCount);
 
-        if (NULL == gObj) {
-            gObj = SkNEW(GrDebugGL);
+        if (nullptr == gObj) {
+            gObj = new GrDebugGL;
         }
 
         return gObj;
@@ -109,11 +109,16 @@ public:
         SkASSERT(gStaticRefCount > 0);
         gStaticRefCount--;
         if (0 == gStaticRefCount) {
-            SkDELETE(gObj);
-            gObj = NULL;
+            delete gObj;
+            gObj = nullptr;
         }
     }
 
+    static void abandon() {
+        SkASSERT(gStaticRefCount > 0);
+        gObj->fAbandoned = true;
+    }
+
 protected:
 
 private:
@@ -132,6 +137,8 @@ private:
     GrTextureUnitObj *fTextureUnits[kDefaultMaxTextureUnits];
     GrVertexArrayObj *fVertexArray;
 
+    bool fAbandoned;
+
     typedef GrFakeRefObj *(*Create)();
 
     static Create gFactoryFunc[kObjTypeCount];
diff --git a/gfx/skia/skia/src/gpu/gl/debug/GrFakeRefObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrFakeRefObj.h
index 84ac499c7587..30580516fa5a 100644
--- a/gfx/skia/skia/src/gpu/gl/debug/GrFakeRefObj.h
+++ b/gfx/skia/skia/src/gpu/gl/debug/GrFakeRefObj.h
@@ -22,7 +22,6 @@ class GrFakeRefObj : SkNoncopyable {
 public:
     GrFakeRefObj()
         : fRef(0)
-        , fHighRefCount(0)
         , fMarkedForDeletion(false)
         , fDeleted(false) {
 
@@ -35,9 +34,6 @@ public:
 
     void ref() {
         fRef++;
-        if (fHighRefCount < fRef) {
-            fHighRefCount = fRef;
-        }
     }
     void unref() {
         fRef--;
@@ -51,7 +47,6 @@ public:
         }
     }
     int getRefCount() const             { return fRef; }
-    int getHighRefCount() const         { return fHighRefCount; }
 
     GrGLuint getID() const              { return fID; }
 
@@ -69,7 +64,6 @@ public:
 protected:
 private:
     int         fRef;               // ref count
-    int         fHighRefCount;      // high water mark of the ref count
     GrGLuint    fID;                // globally unique ID
     bool        fMarkedForDeletion;
     // The deleted flag is only set when OpenGL thinks the object is deleted
@@ -85,10 +79,8 @@ private:
 // factory creation entry point. This entry point is used by the GrGLDebug
 // object to instantiate the various objects
 // all globally unique IDs
-#define GR_DEFINE_CREATOR(className)                        \
-    public:                                                 \
-    static GrFakeRefObj *create ## className() {            \
-        return SkNEW(className);                            \
-    }
+#define GR_DEFINE_CREATOR(className) \
+public:                              \
+    static GrFakeRefObj *create##className() { return new className; }
 
 #endif // GrFakeRefObj_DEFINED
diff --git a/gfx/skia/skia/src/gpu/gl/debug/GrFrameBufferObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrFrameBufferObj.h
index 33af4f7a9793..42a0effe072f 100644
--- a/gfx/skia/skia/src/gpu/gl/debug/GrFrameBufferObj.h
+++ b/gfx/skia/skia/src/gpu/gl/debug/GrFrameBufferObj.h
@@ -22,15 +22,15 @@ public:
     GrFrameBufferObj()
         : GrFakeRefObj()
         , fBound(false)
-        , fColorBuffer(NULL)
-        , fDepthBuffer(NULL)
-        , fStencilBuffer(NULL) {
+        , fColorBuffer(nullptr)
+        , fDepthBuffer(nullptr)
+        , fStencilBuffer(nullptr) {
     }
 
     virtual ~GrFrameBufferObj() {
-        fColorBuffer = NULL;
-        fDepthBuffer = NULL;
-        fStencilBuffer = NULL;
+        fColorBuffer = nullptr;
+        fDepthBuffer = nullptr;
+        fStencilBuffer = nullptr;
     }
 
     void setBound()         { fBound = true; }
@@ -46,11 +46,11 @@ public:
     void setStencil(GrFBBindableObj *buffer);
     GrFBBindableObj *getStencil()     { return fStencilBuffer; }
 
-    virtual void deleteAction() SK_OVERRIDE {
+    void deleteAction() override {
 
-        setColor(NULL);
-        setDepth(NULL);
-        setStencil(NULL);
+        setColor(nullptr);
+        setDepth(nullptr);
+        setStencil(nullptr);
 
         this->INHERITED::deleteAction();
     }
diff --git a/gfx/skia/skia/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp b/gfx/skia/skia/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp
index 788179cd845d..f5440fe31375 100644
--- a/gfx/skia/skia/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp
+++ b/gfx/skia/skia/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp
@@ -84,7 +84,7 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLBufferData(GrGLenum target,
                    GR_GL_STATIC_DRAW == usage ||
                    GR_GL_DYNAMIC_DRAW == usage);
 
-    GrBufferObj *buffer = NULL;
+    GrBufferObj *buffer = nullptr;
     switch (target) {
         case GR_GL_ARRAY_BUFFER:
             buffer = GrDebugGL::getInstance()->getArrayBuffer();
@@ -241,7 +241,7 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLReadPixels(GrGLint x,
 
                  if (textures[j] == pTU->getTexture()->getID()) {
                      // this ID is the current texture - revert the binding to 0
-                     pTU->setTexture(NULL);
+                     pTU->setTexture(nullptr);
                  }
              }
          }
@@ -256,17 +256,17 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLReadPixels(GrGLint x,
 
          for (int i = 0; i < n; ++i) {
 
-             if (NULL != frameBuffer->getColor() &&
+             if (frameBuffer->getColor() &&
                  textures[i] == frameBuffer->getColor()->getID()) {
-                 frameBuffer->setColor(NULL);
+                 frameBuffer->setColor(nullptr);
              }
-             if (NULL != frameBuffer->getDepth() &&
+             if (frameBuffer->getDepth() &&
                  textures[i] == frameBuffer->getDepth()->getID()) {
-                 frameBuffer->setDepth(NULL);
+                 frameBuffer->setDepth(nullptr);
              }
-             if (NULL != frameBuffer->getStencil() &&
+             if (frameBuffer->getStencil() &&
                  textures[i] == frameBuffer->getStencil()->getID()) {
-                 frameBuffer->setStencil(NULL);
+                 frameBuffer->setStencil(nullptr);
              }
          }
      }
@@ -298,7 +298,7 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLReadPixels(GrGLint x,
              if (frameBuffers[i] ==
                  GrDebugGL::getInstance()->getFrameBuffer()->getID()) {
                  // this ID is the current frame buffer - rebind to the default
-                 GrDebugGL::getInstance()->setFrameBuffer(NULL);
+                 GrDebugGL::getInstance()->setFrameBuffer(nullptr);
              }
          }
      }
@@ -326,7 +326,7 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLReadPixels(GrGLint x,
                  GrDebugGL::getInstance()->getRenderBuffer()->getID()) {
                  // this ID is the current render buffer - make no
                  // render buffer be bound
-                 GrDebugGL::getInstance()->setRenderBuffer(NULL);
+                 GrDebugGL::getInstance()->setRenderBuffer(nullptr);
              }
          }
      }
@@ -341,17 +341,17 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLReadPixels(GrGLint x,
 
          for (int i = 0; i < n; ++i) {
 
-             if (NULL != frameBuffer->getColor() &&
+             if (frameBuffer->getColor() &&
                  renderBuffers[i] == frameBuffer->getColor()->getID()) {
-                 frameBuffer->setColor(NULL);
+                 frameBuffer->setColor(nullptr);
              }
-             if (NULL != frameBuffer->getDepth() &&
+             if (frameBuffer->getDepth() &&
                  renderBuffers[i] == frameBuffer->getDepth()->getID()) {
-                 frameBuffer->setDepth(NULL);
+                 frameBuffer->setDepth(nullptr);
              }
-             if (NULL != frameBuffer->getStencil() &&
+             if (frameBuffer->getStencil() &&
                  renderBuffers[i] == frameBuffer->getStencil()->getID()) {
-                 frameBuffer->setStencil(NULL);
+                 frameBuffer->setStencil(nullptr);
              }
          }
      }
@@ -390,7 +390,7 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLReadPixels(GrGLint x,
 
      GrFrameBufferObj *framebuffer = GrDebugGL::getInstance()->getFrameBuffer();
      // A render buffer cannot be attached to the default framebuffer
-     GrAlwaysAssert(NULL != framebuffer);
+     GrAlwaysAssert(framebuffer);
 
      // a renderBufferID of 0 is acceptable - it unbinds the current
      // render buffer
@@ -430,7 +430,7 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLReadPixels(GrGLint x,
 
      GrFrameBufferObj *framebuffer = GrDebugGL::getInstance()->getFrameBuffer();
      // A texture cannot be attached to the default framebuffer
-     GrAlwaysAssert(NULL != framebuffer);
+     GrAlwaysAssert(framebuffer);
 
      // A textureID of 0 is allowed - it unbinds the currently bound texture
      GrTextureObj *texture = GR_FIND(textureID, GrTextureObj,
@@ -552,7 +552,7 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLDeleteVertexArrays(GrGLsizei n, const GrGLui
 
         // Deleting the current vertex array binds object 0
         if (GrDebugGL::getInstance()->getVertexArray() == array) {
-            GrDebugGL::getInstance()->setVertexArray(NULL);
+            GrDebugGL::getInstance()->setVertexArray(nullptr);
         }
 
         if (array->getRefCount()) {
@@ -566,7 +566,7 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLDeleteVertexArrays(GrGLsizei n, const GrGLui
 
 GrGLvoid GR_GL_FUNCTION_TYPE debugGLBindVertexArray(GrGLuint id) {
     GrVertexArrayObj* array = GR_FIND(id, GrVertexArrayObj, GrDebugGL::kVertexArray_ObjTypes);
-    GrAlwaysAssert((0 == id) || NULL != array);
+    GrAlwaysAssert((0 == id) || array);
     GrDebugGL::getInstance()->setVertexArray(array);
 }
 
@@ -599,13 +599,13 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLDeleteBuffers(GrGLsizei n, const GrGLuint* i
         if (GrDebugGL::getInstance()->getArrayBuffer() &&
             ids[i] == GrDebugGL::getInstance()->getArrayBuffer()->getID()) {
             // this ID is the current array buffer
-            GrDebugGL::getInstance()->setArrayBuffer(NULL);
+            GrDebugGL::getInstance()->setArrayBuffer(nullptr);
         }
         if (GrDebugGL::getInstance()->getElementArrayBuffer() &&
             ids[i] ==
                 GrDebugGL::getInstance()->getElementArrayBuffer()->getID()) {
             // this ID is the current element array buffer
-            GrDebugGL::getInstance()->setElementArrayBuffer(NULL);
+            GrDebugGL::getInstance()->setElementArrayBuffer(nullptr);
         }
     }
 
@@ -631,7 +631,7 @@ GrGLvoid* GR_GL_FUNCTION_TYPE debugGLMapBufferRange(GrGLenum target, GrGLintptr
     GrAlwaysAssert(!SkToBool(GR_GL_MAP_READ_BIT & access));
     GrAlwaysAssert((GR_GL_MAP_INVALIDATE_BUFFER_BIT | GR_GL_MAP_INVALIDATE_RANGE_BIT) & access);
 
-    GrBufferObj *buffer = NULL;
+    GrBufferObj *buffer = nullptr;
     switch (target) {
         case GR_GL_ARRAY_BUFFER:
             buffer = GrDebugGL::getInstance()->getArrayBuffer();
@@ -644,7 +644,7 @@ GrGLvoid* GR_GL_FUNCTION_TYPE debugGLMapBufferRange(GrGLenum target, GrGLintptr
             break;
     }
 
-    if (NULL != buffer) {
+    if (buffer) {
         GrAlwaysAssert(offset >= 0 && offset + length <= buffer->getSize());
         GrAlwaysAssert(!buffer->getMapped());
         buffer->setMapped(offset, length);
@@ -652,13 +652,13 @@ GrGLvoid* GR_GL_FUNCTION_TYPE debugGLMapBufferRange(GrGLenum target, GrGLintptr
     }
 
     GrAlwaysAssert(false);
-    return NULL;        // no buffer bound to the target
+    return nullptr;        // no buffer bound to the target
 }
 
 GrGLvoid* GR_GL_FUNCTION_TYPE debugGLMapBuffer(GrGLenum target, GrGLenum access) {
     GrAlwaysAssert(GR_GL_WRITE_ONLY == access);
 
-    GrBufferObj *buffer = NULL;
+    GrBufferObj *buffer = nullptr;
     switch (target) {
         case GR_GL_ARRAY_BUFFER:
             buffer = GrDebugGL::getInstance()->getArrayBuffer();
@@ -682,7 +682,7 @@ GrGLboolean GR_GL_FUNCTION_TYPE debugGLUnmapBuffer(GrGLenum target) {
     GrAlwaysAssert(GR_GL_ARRAY_BUFFER == target ||
                    GR_GL_ELEMENT_ARRAY_BUFFER == target);
 
-    GrBufferObj *buffer = NULL;
+    GrBufferObj *buffer = nullptr;
     switch (target) {
         case GR_GL_ARRAY_BUFFER:
             buffer = GrDebugGL::getInstance()->getArrayBuffer();
@@ -695,7 +695,7 @@ GrGLboolean GR_GL_FUNCTION_TYPE debugGLUnmapBuffer(GrGLenum target) {
             break;
     }
 
-    if (NULL != buffer) {
+    if (buffer) {
         GrAlwaysAssert(buffer->getMapped());
         buffer->resetMapped();
         return GR_GL_TRUE;
@@ -711,7 +711,7 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLFlushMappedBufferRange(GrGLenum target,
     GrAlwaysAssert(GR_GL_ARRAY_BUFFER == target ||
                    GR_GL_ELEMENT_ARRAY_BUFFER == target);
 
-    GrBufferObj *buffer = NULL;
+    GrBufferObj *buffer = nullptr;
     switch (target) {
         case GR_GL_ARRAY_BUFFER:
             buffer = GrDebugGL::getInstance()->getArrayBuffer();
@@ -724,7 +724,7 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLFlushMappedBufferRange(GrGLenum target,
             break;
     }
 
-    if (NULL != buffer) {
+    if (buffer) {
         GrAlwaysAssert(buffer->getMapped());
         GrAlwaysAssert(offset >= 0 && (offset + length) <= buffer->getMappedLength());
     } else {
@@ -742,7 +742,7 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLGetBufferParameteriv(GrGLenum target,
     GrAlwaysAssert(GR_GL_BUFFER_SIZE == value ||
                    GR_GL_BUFFER_USAGE == value);
 
-    GrBufferObj *buffer = NULL;
+    GrBufferObj *buffer = nullptr;
     switch (target) {
         case GR_GL_ARRAY_BUFFER:
             buffer = GrDebugGL::getInstance()->getArrayBuffer();
@@ -757,17 +757,17 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLGetBufferParameteriv(GrGLenum target,
     switch (value) {
         case GR_GL_BUFFER_MAPPED:
             *params = GR_GL_FALSE;
-            if (NULL != buffer)
+            if (buffer)
                 *params = buffer->getMapped() ? GR_GL_TRUE : GR_GL_FALSE;
             break;
         case GR_GL_BUFFER_SIZE:
             *params = 0;
-            if (NULL != buffer)
+            if (buffer)
                 *params = SkToInt(buffer->getSize());
             break;
         case GR_GL_BUFFER_USAGE:
             *params = GR_GL_STATIC_DRAW;
-            if (NULL != buffer)
+            if (buffer)
                 *params = buffer->getUsage();
             break;
         default:
@@ -781,10 +781,10 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLGetBufferParameteriv(GrGLenum target,
 struct GrDebugGLInterface : public GrGLInterface {
 
 public:
-    SK_DECLARE_INST_COUNT(GrDebugGLInterface)
+    
 
     GrDebugGLInterface()
-        : fWrapped(NULL) {
+        : fWrapped(nullptr) {
         GrDebugGL::staticRef();
     }
 
@@ -796,6 +796,10 @@ public:
         fWrapped.reset(interface);
     }
 
+    void abandon() const override {
+        GrDebugGL::abandon();
+    }
+
     // TODO: there are some issues w/ wrapping another GL interface inside the
     // debug interface:
     //      Since none of the "gl" methods are member functions they don't get
@@ -815,7 +819,7 @@ public:
     //      The solution to this is probably to alter SkDebugGlContext's
     //      "makeCurrent" method to make a call like "makeCurrent(this)" to
     //      the debug GL interface (assuming that the application will create
-    //      multiple SkGLContextHelper's) to let it switch between the active
+    //      multiple SkGLContext's) to let it switch between the active
     //      context. Everything in the GrDebugGL object would then need to be
     //      moved to a GrContextObj and the GrDebugGL object would just switch
     //      between them. Note that this approach would also require that
@@ -832,7 +836,7 @@ private:
 
 ////////////////////////////////////////////////////////////////////////////////
 const GrGLInterface* GrGLCreateDebugInterface() {
-    GrGLInterface* interface = SkNEW(GrDebugGLInterface);
+    GrGLInterface *interface = new GrDebugGLInterface;
 
     interface->fStandard = kGL_GrGLStandard;
 
@@ -846,6 +850,7 @@ const GrGLInterface* GrGLCreateDebugInterface() {
     functions->fBindTexture = debugGLBindTexture;
     functions->fBindVertexArray = debugGLBindVertexArray;
     functions->fBlendColor = noOpGLBlendColor;
+    functions->fBlendEquation = noOpGLBlendEquation;
     functions->fBlendFunc = noOpGLBlendFunc;
     functions->fBufferData = debugGLBufferData;
     functions->fBufferSubData = noOpGLBufferSubData;
@@ -870,9 +875,11 @@ const GrGLInterface* GrGLCreateDebugInterface() {
     functions->fDisable = noOpGLDisable;
     functions->fDisableVertexAttribArray = noOpGLDisableVertexAttribArray;
     functions->fDrawArrays = noOpGLDrawArrays;
+    functions->fDrawArraysInstanced = noOpGLDrawArraysInstanced;
     functions->fDrawBuffer = noOpGLDrawBuffer;
     functions->fDrawBuffers = noOpGLDrawBuffers;
     functions->fDrawElements = noOpGLDrawElements;
+    functions->fDrawElementsInstanced = noOpGLDrawElementsInstanced;
     functions->fEnable = noOpGLEnable;
     functions->fEnableVertexAttribArray = noOpGLEnableVertexAttribArray;
     functions->fEndQuery = noOpGLEndQuery;
@@ -944,8 +951,12 @@ const GrGLInterface* GrGLCreateDebugInterface() {
     functions->fUniformMatrix4fv = noOpGLUniformMatrix4fv;
     functions->fUnmapBuffer = debugGLUnmapBuffer;
     functions->fUseProgram = debugGLUseProgram;
+    functions->fVertexAttrib1f = noOpGLVertexAttrib1f;
+    functions->fVertexAttrib2fv = noOpGLVertexAttrib2fv;
+    functions->fVertexAttrib3fv = noOpGLVertexAttrib3fv;
     functions->fVertexAttrib4fv = noOpGLVertexAttrib4fv;
     functions->fVertexAttribPointer = noOpGLVertexAttribPointer;
+    functions->fVertexAttribDivisor = noOpGLVertexAttribDivisor;
     functions->fViewport = noOpGLViewport;
     functions->fBindFramebuffer = debugGLBindFramebuffer;
     functions->fBindRenderbuffer = debugGLBindRenderbuffer;
@@ -972,7 +983,7 @@ const GrGLInterface* GrGLCreateDebugInterface() {
                                     noOpGLBindFragDataLocationIndexed;
 
     interface->fExtensions.init(kGL_GrGLStandard, functions->fGetString, functions->fGetStringi,
-                                functions->fGetIntegerv);
+                                functions->fGetIntegerv, nullptr, GR_EGL_NO_DISPLAY);
 
     return interface;
 }
diff --git a/gfx/skia/skia/src/gpu/gl/debug/GrProgramObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrProgramObj.h
index eebcc8885076..a25341a215e6 100644
--- a/gfx/skia/skia/src/gpu/gl/debug/GrProgramObj.h
+++ b/gfx/skia/skia/src/gpu/gl/debug/GrProgramObj.h
@@ -24,7 +24,7 @@ public:
 
     void AttachShader(GrShaderObj *shader);
 
-    virtual void deleteAction() SK_OVERRIDE;
+    void deleteAction() override;
 
     // TODO: this flag system won't work w/ multiple contexts!
     void setInUse()         { fInUse = true; }
diff --git a/gfx/skia/skia/src/gpu/gl/debug/GrRenderBufferObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrRenderBufferObj.h
index 344b90e5a9eb..8231ef58dfba 100644
--- a/gfx/skia/skia/src/gpu/gl/debug/GrRenderBufferObj.h
+++ b/gfx/skia/skia/src/gpu/gl/debug/GrRenderBufferObj.h
@@ -25,7 +25,7 @@ public:
     void resetBound()       { fBound = false; }
     bool getBound() const   { return fBound; }
 
-    virtual void deleteAction() SK_OVERRIDE {
+    void deleteAction() override {
 
         this->INHERITED::deleteAction();
     }
diff --git a/gfx/skia/skia/src/gpu/gl/debug/GrShaderObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrShaderObj.h
index 0b888fa0b267..977920fe0f6f 100644
--- a/gfx/skia/skia/src/gpu/gl/debug/GrShaderObj.h
+++ b/gfx/skia/skia/src/gpu/gl/debug/GrShaderObj.h
@@ -24,7 +24,7 @@ public:
     void setType(GrGLenum type)         { fType = type; }
     GrGLenum getType()                  { return fType; }
 
-    virtual void deleteAction() SK_OVERRIDE;
+    void deleteAction() override;
 
 protected:
 private:
diff --git a/gfx/skia/skia/src/gpu/gl/debug/GrTextureObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrTextureObj.h
index 7673cd118e40..fcf851db8639 100644
--- a/gfx/skia/skia/src/gpu/gl/debug/GrTextureObj.h
+++ b/gfx/skia/skia/src/gpu/gl/debug/GrTextureObj.h
@@ -43,7 +43,7 @@ public:
         return 0 != fTextureUnitReferees.count();
     }
 
-    virtual void deleteAction() SK_OVERRIDE;
+    void deleteAction() override;
 
 protected:
 
diff --git a/gfx/skia/skia/src/gpu/gl/debug/GrTextureUnitObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrTextureUnitObj.h
index 7d9ed2e6df1c..b0254a0fc1a4 100644
--- a/gfx/skia/skia/src/gpu/gl/debug/GrTextureUnitObj.h
+++ b/gfx/skia/skia/src/gpu/gl/debug/GrTextureUnitObj.h
@@ -22,7 +22,7 @@ public:
     GrTextureUnitObj()
         : GrFakeRefObj()
         , fNumber(0)
-        , fTexture(NULL) {
+        , fTexture(nullptr) {
     }
 
     void setNumber(GrGLenum number) {
diff --git a/gfx/skia/skia/src/gpu/gl/debug/SkDebugGLContext.cpp b/gfx/skia/skia/src/gpu/gl/debug/SkDebugGLContext.cpp
index 93c0b30b8b96..531e6c3ab89a 100644
--- a/gfx/skia/skia/src/gpu/gl/debug/SkDebugGLContext.cpp
+++ b/gfx/skia/skia/src/gpu/gl/debug/SkDebugGLContext.cpp
@@ -6,12 +6,12 @@
  * found in the LICENSE file.
  */
 
-#include "gl/SkDebugGLContext.h"
+#include "gl/debug/SkDebugGLContext.h"
 
-const GrGLInterface* SkDebugGLContext::createGLContext(GrGLStandard forcedGpuAPI) {
-    if (kGLES_GrGLStandard == forcedGpuAPI) {
-        return NULL;
-    }
+SkDebugGLContext::SkDebugGLContext() {
+    this->init(GrGLCreateDebugInterface());
+}
 
-    return GrGLCreateDebugInterface();
-};
+SkDebugGLContext::~SkDebugGLContext() {
+    this->teardown();
+}
diff --git a/gfx/skia/skia/src/gpu/gl/debug/SkDebugGLContext.h b/gfx/skia/skia/src/gpu/gl/debug/SkDebugGLContext.h
new file mode 100644
index 000000000000..abbcf559c58a
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/debug/SkDebugGLContext.h
@@ -0,0 +1,31 @@
+
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef SkDebugGLContext_DEFINED
+#define SkDebugGLContext_DEFINED
+
+#include "gl/SkGLContext.h"
+
+class SkDebugGLContext : public SkGLContext {
+public:
+    ~SkDebugGLContext() override;
+
+    static SkDebugGLContext* Create(GrGLStandard forcedGpuAPI) {
+        if (kGLES_GrGLStandard == forcedGpuAPI) {
+            return nullptr;
+        }
+        return new SkDebugGLContext;
+    }
+private:
+    void onPlatformMakeCurrent() const override {}
+    void onPlatformSwapBuffers() const override {}
+    GrGLFuncPtr onPlatformGetProcAddress(const char*) const override { return nullptr; }
+
+    SkDebugGLContext();
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/gl/egl/GrGLCreateNativeInterface_egl.cpp b/gfx/skia/skia/src/gpu/gl/egl/GrGLCreateNativeInterface_egl.cpp
new file mode 100644
index 000000000000..fef4f0276f3c
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/egl/GrGLCreateNativeInterface_egl.cpp
@@ -0,0 +1,30 @@
+
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "gl/GrGLInterface.h"
+#include "gl/GrGLAssembleInterface.h"
+#include "gl/GrGLUtil.h"
+
+#include <EGL/egl.h>
+#include <GLES2/gl2.h>
+
+static GrGLFuncPtr egl_get_gl_proc(void* ctx, const char name[]) {
+    SkASSERT(nullptr == ctx);
+    GrGLFuncPtr ptr = eglGetProcAddress(name);
+    if (!ptr) {
+        if (0 == strcmp("eglQueryString", name)) {
+            return (GrGLFuncPtr)eglQueryString;
+        } else if (0 == strcmp("eglGetCurrentDisplay", name)) {
+            return (GrGLFuncPtr)eglGetCurrentDisplay;
+        }
+    }
+    return ptr;
+}
+
+const GrGLInterface* GrGLCreateNativeInterface() {
+    return GrGLAssembleInterface(nullptr, egl_get_gl_proc);
+}
diff --git a/gfx/skia/skia/src/gpu/gl/egl/SkCreatePlatformGLContext_egl.cpp b/gfx/skia/skia/src/gpu/gl/egl/SkCreatePlatformGLContext_egl.cpp
new file mode 100644
index 000000000000..591cae349c0f
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/egl/SkCreatePlatformGLContext_egl.cpp
@@ -0,0 +1,328 @@
+
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "gl/SkGLContext.h"
+
+#include <GLES2/gl2.h>
+
+#define EGL_EGLEXT_PROTOTYPES
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+
+#include "gl/GrGLDefines.h"
+#include "gl/GrGLUtil.h"
+
+namespace {
+
+// TODO: Share this class with ANGLE if/when it gets support for EGL_KHR_fence_sync.
+class SkEGLFenceSync : public SkGpuFenceSync {
+public:
+    static SkEGLFenceSync* CreateIfSupported(EGLDisplay);
+
+    SkPlatformGpuFence SK_WARN_UNUSED_RESULT insertFence() const override;
+    bool flushAndWaitFence(SkPlatformGpuFence fence) const override;
+    void deleteFence(SkPlatformGpuFence fence) const override;
+
+private:
+    SkEGLFenceSync(EGLDisplay display) : fDisplay(display) {}
+
+    EGLDisplay                    fDisplay;
+
+    typedef SkGpuFenceSync INHERITED;
+};
+
+class EGLGLContext : public SkGLContext  {
+public:
+    EGLGLContext(GrGLStandard forcedGpuAPI);
+    ~EGLGLContext() override;
+
+    GrEGLImage texture2DToEGLImage(GrGLuint texID) const override;
+    void destroyEGLImage(GrEGLImage) const override;
+    GrGLuint eglImageToExternalTexture(GrEGLImage) const override;
+    SkGLContext* createNew() const override;
+
+private:
+    void destroyGLContext();
+
+    void onPlatformMakeCurrent() const override;
+    void onPlatformSwapBuffers() const override;
+    GrGLFuncPtr onPlatformGetProcAddress(const char*) const override;
+
+    EGLContext fContext;
+    EGLDisplay fDisplay;
+    EGLSurface fSurface;
+};
+
+EGLGLContext::EGLGLContext(GrGLStandard forcedGpuAPI)
+    : fContext(EGL_NO_CONTEXT)
+    , fDisplay(EGL_NO_DISPLAY)
+    , fSurface(EGL_NO_SURFACE) {
+    static const EGLint kEGLContextAttribsForOpenGL[] = {
+        EGL_NONE
+    };
+
+    static const EGLint kEGLContextAttribsForOpenGLES[] = {
+        EGL_CONTEXT_CLIENT_VERSION, 2,
+        EGL_NONE
+    };
+
+    static const struct {
+        const EGLint* fContextAttribs;
+        EGLenum fAPI;
+        EGLint  fRenderableTypeBit;
+        GrGLStandard fStandard;
+    } kAPIs[] = {
+        {   // OpenGL
+            kEGLContextAttribsForOpenGL,
+            EGL_OPENGL_API,
+            EGL_OPENGL_BIT,
+            kGL_GrGLStandard
+        },
+        {   // OpenGL ES. This seems to work for both ES2 and 3 (when available).
+            kEGLContextAttribsForOpenGLES,
+            EGL_OPENGL_ES_API,
+            EGL_OPENGL_ES2_BIT,
+            kGLES_GrGLStandard
+        },
+    };
+
+    size_t apiLimit = SK_ARRAY_COUNT(kAPIs);
+    size_t api = 0;
+    if (forcedGpuAPI == kGL_GrGLStandard) {
+        apiLimit = 1;
+    } else if (forcedGpuAPI == kGLES_GrGLStandard) {
+        api = 1;
+    }
+    SkASSERT(forcedGpuAPI == kNone_GrGLStandard || kAPIs[api].fStandard == forcedGpuAPI);
+
+    SkAutoTUnref<const GrGLInterface> gl;
+
+    for (; nullptr == gl.get() && api < apiLimit; ++api) {
+        fDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+
+        EGLint majorVersion;
+        EGLint minorVersion;
+        eglInitialize(fDisplay, &majorVersion, &minorVersion);
+
+#if 0
+        SkDebugf("VENDOR: %s\n", eglQueryString(fDisplay, EGL_VENDOR));
+        SkDebugf("APIS: %s\n", eglQueryString(fDisplay, EGL_CLIENT_APIS));
+        SkDebugf("VERSION: %s\n", eglQueryString(fDisplay, EGL_VERSION));
+        SkDebugf("EXTENSIONS %s\n", eglQueryString(fDisplay, EGL_EXTENSIONS));
+#endif
+
+        if (!eglBindAPI(kAPIs[api].fAPI)) {
+            continue;
+        }
+
+        EGLint numConfigs = 0;
+        const EGLint configAttribs[] = {
+            EGL_SURFACE_TYPE, EGL_PBUFFER_BIT,
+            EGL_RENDERABLE_TYPE, kAPIs[api].fRenderableTypeBit,
+            EGL_RED_SIZE, 8,
+            EGL_GREEN_SIZE, 8,
+            EGL_BLUE_SIZE, 8,
+            EGL_ALPHA_SIZE, 8,
+            EGL_NONE
+        };
+
+        EGLConfig surfaceConfig;
+        if (!eglChooseConfig(fDisplay, configAttribs, &surfaceConfig, 1, &numConfigs)) {
+            SkDebugf("eglChooseConfig failed. EGL Error: 0x%08x\n", eglGetError());
+            continue;
+        }
+
+        if (0 == numConfigs) {
+            SkDebugf("No suitable EGL config found.\n");
+            continue;
+        }
+
+        fContext = eglCreateContext(fDisplay, surfaceConfig, nullptr, kAPIs[api].fContextAttribs);
+        if (EGL_NO_CONTEXT == fContext) {
+            SkDebugf("eglCreateContext failed.  EGL Error: 0x%08x\n", eglGetError());
+            continue;
+        }
+
+        static const EGLint kSurfaceAttribs[] = {
+            EGL_WIDTH, 1,
+            EGL_HEIGHT, 1,
+            EGL_NONE
+        };
+
+        fSurface = eglCreatePbufferSurface(fDisplay, surfaceConfig, kSurfaceAttribs);
+        if (EGL_NO_SURFACE == fSurface) {
+            SkDebugf("eglCreatePbufferSurface failed. EGL Error: 0x%08x\n", eglGetError());
+            this->destroyGLContext();
+            continue;
+        }
+
+        if (!eglMakeCurrent(fDisplay, fSurface, fSurface, fContext)) {
+            SkDebugf("eglMakeCurrent failed.  EGL Error: 0x%08x\n", eglGetError());
+            this->destroyGLContext();
+            continue;
+        }
+
+        gl.reset(GrGLCreateNativeInterface());
+        if (nullptr == gl.get()) {
+            SkDebugf("Failed to create gl interface.\n");
+            this->destroyGLContext();
+            continue;
+        }
+
+        if (!gl->validate()) {
+            SkDebugf("Failed to validate gl interface.\n");
+            this->destroyGLContext();
+            continue;
+        }
+
+        this->init(gl.detach(), SkEGLFenceSync::CreateIfSupported(fDisplay));
+        break;
+    }
+}
+
+EGLGLContext::~EGLGLContext() {
+    this->teardown();
+    this->destroyGLContext();
+}
+
+void EGLGLContext::destroyGLContext() {
+    if (fDisplay) {
+        eglMakeCurrent(fDisplay, 0, 0, 0);
+
+        if (fContext) {
+            eglDestroyContext(fDisplay, fContext);
+            fContext = EGL_NO_CONTEXT;
+        }
+
+        if (fSurface) {
+            eglDestroySurface(fDisplay, fSurface);
+            fSurface = EGL_NO_SURFACE;
+        }
+
+        //TODO should we close the display?
+        fDisplay = EGL_NO_DISPLAY;
+    }
+}
+
+GrEGLImage EGLGLContext::texture2DToEGLImage(GrGLuint texID) const {
+    if (!this->gl()->hasExtension("EGL_KHR_gl_texture_2D_image")) {
+        return GR_EGL_NO_IMAGE;
+    }
+    GrEGLImage img;
+    GrEGLint attribs[] = { GR_EGL_GL_TEXTURE_LEVEL, 0, GR_EGL_NONE };
+    GrEGLClientBuffer clientBuffer = reinterpret_cast<GrEGLClientBuffer>(texID);
+    GR_GL_CALL_RET(this->gl(), img,
+                   EGLCreateImage(fDisplay, fContext, GR_EGL_GL_TEXTURE_2D, clientBuffer, attribs));
+    return img;
+}
+
+void EGLGLContext::destroyEGLImage(GrEGLImage image) const {
+    GR_GL_CALL(this->gl(), EGLDestroyImage(fDisplay, image));
+}
+
+GrGLuint EGLGLContext::eglImageToExternalTexture(GrEGLImage image) const {
+    GrGLClearErr(this->gl());
+    if (!this->gl()->hasExtension("GL_OES_EGL_image_external")) {
+        return 0;
+    }
+    GrGLEGLImageTargetTexture2DProc glEGLImageTargetTexture2D = 
+            (GrGLEGLImageTargetTexture2DProc) eglGetProcAddress("glEGLImageTargetTexture2DOES");
+    if (!glEGLImageTargetTexture2D) {
+        return 0;
+    }
+    GrGLuint texID;
+    glGenTextures(1, &texID);
+    if (!texID) {
+        return 0;
+    }
+    glBindTexture(GR_GL_TEXTURE_EXTERNAL, texID);
+    if (glGetError() != GR_GL_NO_ERROR) {
+        glDeleteTextures(1, &texID);
+        return 0;
+    }
+    glEGLImageTargetTexture2D(GR_GL_TEXTURE_EXTERNAL, image);
+    if (glGetError() != GR_GL_NO_ERROR) {
+        glDeleteTextures(1, &texID);
+        return 0;
+    }
+    return texID;
+}
+
+SkGLContext* EGLGLContext::createNew() const {
+    SkGLContext* ctx = SkCreatePlatformGLContext(this->gl()->fStandard);
+    if (ctx) {
+        ctx->makeCurrent();
+    }
+    return ctx;
+}
+
+void EGLGLContext::onPlatformMakeCurrent() const {
+    if (!eglMakeCurrent(fDisplay, fSurface, fSurface, fContext)) {
+        SkDebugf("Could not set the context.\n");
+    }
+}
+
+void EGLGLContext::onPlatformSwapBuffers() const {
+    if (!eglSwapBuffers(fDisplay, fSurface)) {
+        SkDebugf("Could not complete eglSwapBuffers.\n");
+    }
+}
+
+GrGLFuncPtr EGLGLContext::onPlatformGetProcAddress(const char* procName) const {
+    return eglGetProcAddress(procName);
+}
+
+static bool supports_egl_extension(EGLDisplay display, const char* extension) {
+    int extensionLength = strlen(extension);
+    const char* extensionsStr = eglQueryString(display, EGL_EXTENSIONS);
+    while (const char* match = strstr(extensionsStr, extension)) {
+        // Ensure the string we found is its own extension, not a substring of a larger extension
+        // (e.g. GL_ARB_occlusion_query / GL_ARB_occlusion_query2).
+        if ((match == extensionsStr || match[-1] == ' ') &&
+            (match[extensionLength] == ' ' || match[extensionLength] == '\0')) {
+            return true;
+        }
+        extensionsStr = match + extensionLength;
+    }
+    return false;
+}
+
+SkEGLFenceSync* SkEGLFenceSync::CreateIfSupported(EGLDisplay display) {
+    if (!display || !supports_egl_extension(display, "EGL_KHR_fence_sync")) {
+        return nullptr;
+    }
+    return new SkEGLFenceSync(display);
+}
+
+SkPlatformGpuFence SkEGLFenceSync::insertFence() const {
+    return eglCreateSyncKHR(fDisplay, EGL_SYNC_FENCE_KHR, nullptr);
+}
+
+bool SkEGLFenceSync::flushAndWaitFence(SkPlatformGpuFence platformFence) const {
+    EGLSyncKHR eglsync = static_cast<EGLSyncKHR>(platformFence);
+    return EGL_CONDITION_SATISFIED_KHR == eglClientWaitSyncKHR(fDisplay,
+                                                               eglsync,
+                                                               EGL_SYNC_FLUSH_COMMANDS_BIT_KHR,
+                                                               EGL_FOREVER_KHR);
+}
+
+void SkEGLFenceSync::deleteFence(SkPlatformGpuFence platformFence) const {
+    EGLSyncKHR eglsync = static_cast<EGLSyncKHR>(platformFence);
+    eglDestroySyncKHR(fDisplay, eglsync);
+}
+
+} // anonymous namespace
+
+SkGLContext* SkCreatePlatformGLContext(GrGLStandard forcedGpuAPI) {
+    EGLGLContext* ctx = new EGLGLContext(forcedGpuAPI);
+    if (!ctx->isValid()) {
+        delete ctx;
+        return nullptr;
+    }
+    return ctx;
+}
+
diff --git a/gfx/skia/skia/src/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp b/gfx/skia/skia/src/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp
new file mode 100644
index 000000000000..e3d37bd80f1e
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+
+#include "gl/GrGLInterface.h"
+#include "gl/GrGLAssembleInterface.h"
+#include "gl/GrGLUtil.h"
+
+#include <GL/glx.h>
+
+static GrGLFuncPtr glx_get(void* ctx, const char name[]) {
+    SkASSERT(nullptr == ctx);
+    SkASSERT(glXGetCurrentContext());
+    return glXGetProcAddress(reinterpret_cast<const GLubyte*>(name));
+}
+
+const GrGLInterface* GrGLCreateNativeInterface() {
+    if (nullptr == glXGetCurrentContext()) {
+        return nullptr;
+    }
+
+    return GrGLAssembleInterface(nullptr, glx_get);
+}
diff --git a/gfx/skia/skia/src/gpu/gl/unix/SkNativeGLContext_unix.cpp b/gfx/skia/skia/src/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp
similarity index 57%
rename from gfx/skia/skia/src/gpu/gl/unix/SkNativeGLContext_unix.cpp
rename to gfx/skia/skia/src/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp
index 4da1eb2f4f86..8c58a53702b4 100644
--- a/gfx/skia/skia/src/gpu/gl/unix/SkNativeGLContext_unix.cpp
+++ b/gfx/skia/skia/src/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp
@@ -5,25 +5,38 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "gl/SkNativeGLContext.h"
+#include "gl/SkGLContext.h"
 
+#include <X11/Xlib.h>
+#include <GL/glx.h>
 #include <GL/glu.h>
 
-#define GLX_1_3 1
+namespace {
 
-SkNativeGLContext::AutoContextRestore::AutoContextRestore() {
-    fOldGLXContext = glXGetCurrentContext();
-    fOldDisplay = glXGetCurrentDisplay();
-    fOldDrawable = glXGetCurrentDrawable();
-}
+/* Note: Skia requires glx 1.3 or newer */
 
-SkNativeGLContext::AutoContextRestore::~AutoContextRestore() {
-    if (NULL != fOldDisplay) {
-        glXMakeCurrent(fOldDisplay, fOldDrawable, fOldGLXContext);
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
+/* This struct is taken from a mesa demo.  Please update as required */
+static const struct { int major, minor; } gl_versions[] = {
+   {1, 0},
+   {1, 1},
+   {1, 2},
+   {1, 3},
+   {1, 4},
+   {1, 5},
+   {2, 0},
+   {2, 1},
+   {3, 0},
+   {3, 1},
+   {3, 2},
+   {3, 3},
+   {4, 0},
+   {4, 1},
+   {4, 2},
+   {4, 3},
+   {4, 4},
+   {0, 0} /* end of list */
+};
+#define NUM_GL_VERSIONS SK_ARRAY_COUNT(gl_versions)
 
 static bool ctxErrorOccurred = false;
 static int ctxErrorHandler(Display *dpy, XErrorEvent *ev) {
@@ -31,48 +44,36 @@ static int ctxErrorHandler(Display *dpy, XErrorEvent *ev) {
     return 0;
 }
 
-SkNativeGLContext::SkNativeGLContext()
-    : fContext(NULL)
-    , fDisplay(NULL)
+class GLXGLContext : public SkGLContext {
+public:
+    GLXGLContext(GrGLStandard forcedGpuAPI);
+    ~GLXGLContext() override;
+
+private:
+    void destroyGLContext();
+
+    void onPlatformMakeCurrent() const override;
+    void onPlatformSwapBuffers() const override;
+    GrGLFuncPtr onPlatformGetProcAddress(const char*) const override;
+
+    GLXContext fContext;
+    Display* fDisplay;
+    Pixmap fPixmap;
+    GLXPixmap fGlxPixmap;
+};
+
+GLXGLContext::GLXGLContext(GrGLStandard forcedGpuAPI)
+    : fContext(nullptr)
+    , fDisplay(nullptr)
     , fPixmap(0)
     , fGlxPixmap(0) {
-}
 
-SkNativeGLContext::~SkNativeGLContext() {
-    this->destroyGLContext();
-}
-
-void SkNativeGLContext::destroyGLContext() {
-    if (fDisplay) {
-        glXMakeCurrent(fDisplay, 0, 0);
-
-        if (fContext) {
-            glXDestroyContext(fDisplay, fContext);
-            fContext = NULL;
-        }
-
-        if (fGlxPixmap) {
-            glXDestroyGLXPixmap(fDisplay, fGlxPixmap);
-            fGlxPixmap = 0;
-        }
-
-        if (fPixmap) {
-            XFreePixmap(fDisplay, fPixmap);
-            fPixmap = 0;
-        }
-
-        XCloseDisplay(fDisplay);
-        fDisplay = NULL;
-    }
-}
-
-const GrGLInterface* SkNativeGLContext::createGLContext(GrGLStandard forcedGpuAPI) {
     fDisplay = XOpenDisplay(0);
 
     if (!fDisplay) {
         SkDebugf("Failed to open X display.\n");
         this->destroyGLContext();
-        return NULL;
+        return;
     }
 
     // Get a matching FB config
@@ -82,7 +83,16 @@ const GrGLInterface* SkNativeGLContext::createGLContext(GrGLStandard forcedGpuAP
         None
     };
 
-#ifdef GLX_1_3
+    int glx_major, glx_minor;
+
+    // FBConfigs were added in GLX version 1.3.
+    if (!glXQueryVersion(fDisplay, &glx_major, &glx_minor) ||
+            ((glx_major == 1) && (glx_minor < 3)) || (glx_major < 1)) {
+        SkDebugf("GLX version 1.3 or higher required.\n");
+        this->destroyGLContext();
+        return;
+    }
+
     //SkDebugf("Getting matching framebuffer configs.\n");
     int fbcount;
     GLXFBConfig *fbc = glXChooseFBConfig(fDisplay, DefaultScreen(fDisplay),
@@ -90,7 +100,7 @@ const GrGLInterface* SkNativeGLContext::createGLContext(GrGLStandard forcedGpuAP
     if (!fbc) {
         SkDebugf("Failed to retrieve a framebuffer config.\n");
         this->destroyGLContext();
-        return NULL;
+        return;
     }
     //SkDebugf("Found %d matching FB configs.\n", fbcount);
 
@@ -124,51 +134,19 @@ const GrGLInterface* SkNativeGLContext::createGLContext(GrGLStandard forcedGpuAP
     // Get a visual
     XVisualInfo *vi = glXGetVisualFromFBConfig(fDisplay, bestFbc);
     //SkDebugf("Chosen visual ID = 0x%x\n", (unsigned int)vi->visualid);
-#else
-    int numVisuals;
-    XVisualInfo visTemplate, *visReturn;
-
-    visReturn = XGetVisualInfo(fDisplay, VisualNoMask, &visTemplate, &numVisuals);
-    if (NULL == visReturn)
-    {
-        SkDebugf("Failed to get visual information.\n");
-        this->destroyGLContext();
-        return NULL;
-    }
-
-    int best = -1, best_num_samp = -1;
-
-    for (int i = 0; i < numVisuals; ++i)
-    {
-        int samp_buf, samples;
-
-        glXGetConfig(fDisplay, &visReturn[i], GLX_SAMPLE_BUFFERS, &samp_buf);
-        glXGetConfig(fDisplay, &visReturn[i], GLX_SAMPLES, &samples);
-
-        if (best < 0 || (samp_buf && samples > best_num_samp))
-            best = i, best_num_samp = samples;
-    }
-
-    XVisualInfo temp = visReturn[best];
-    XVisualInfo *vi = &temp;
-
-    XFree(visReturn);
-#endif
 
     fPixmap = XCreatePixmap(fDisplay, RootWindow(fDisplay, vi->screen), 10, 10, vi->depth);
 
     if (!fPixmap) {
         SkDebugf("Failed to create pixmap.\n");
         this->destroyGLContext();
-        return NULL;
+        return;
     }
 
     fGlxPixmap = glXCreateGLXPixmap(fDisplay, vi, fPixmap);
 
-#ifdef GLX_1_3
     // Done with the visual info data
     XFree(vi);
-#endif
 
     // Create the context
 
@@ -191,58 +169,71 @@ const GrGLInterface* SkNativeGLContext::createGLContext(GrGLStandard forcedGpuAP
 
     // Check for the GLX_ARB_create_context extension string and the function.
     // If either is not present, use GLX 1.3 context creation method.
-
     if (!gluCheckExtension(reinterpret_cast<const GLubyte*>("GLX_ARB_create_context"),
                            reinterpret_cast<const GLubyte*>(glxExts))) {
         if (kGLES_GrGLStandard != forcedGpuAPI) {
-#ifdef GLX_1_3
             fContext = glXCreateNewContext(fDisplay, bestFbc, GLX_RGBA_TYPE, 0, True);
-#else
-            fContext = glXCreateContext(fDisplay, vi, 0, True);
-#endif
         }
-    }
-#ifdef GLX_1_3
-    else {
+    } else {
         //SkDebugf("Creating context.\n");
         PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribsARB =
             (PFNGLXCREATECONTEXTATTRIBSARBPROC) glXGetProcAddressARB((GrGLubyte*)"glXCreateContextAttribsARB");
 
-        static const int context_attribs_gl[] = {
-            GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
-            GLX_CONTEXT_MINOR_VERSION_ARB, 0,
-            None
-        };
-        static const int context_attribs_gl_fallback[] = {
-            GLX_CONTEXT_MAJOR_VERSION_ARB, 1,
-            GLX_CONTEXT_MINOR_VERSION_ARB, 0,
-            None
-        };
-        static const int context_attribs_gles[] = {
-            GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
-            GLX_CONTEXT_MINOR_VERSION_ARB, 0,
-            GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_ES2_PROFILE_BIT_EXT,
-            None
-        };
-
         if (kGLES_GrGLStandard == forcedGpuAPI) {
             if (gluCheckExtension(
                     reinterpret_cast<const GLubyte*>("GLX_EXT_create_context_es2_profile"),
                     reinterpret_cast<const GLubyte*>(glxExts))) {
+                static const int context_attribs_gles[] = {
+                    GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
+                    GLX_CONTEXT_MINOR_VERSION_ARB, 0,
+                    GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_ES2_PROFILE_BIT_EXT,
+                    None
+                };
                 fContext = glXCreateContextAttribsARB(fDisplay, bestFbc, 0, True,
                                                       context_attribs_gles);
             }
         } else {
-            fContext = glXCreateContextAttribsARB(fDisplay, bestFbc, 0, True, context_attribs_gl);
+            // Well, unfortunately GLX will not just give us the highest context so instead we have
+            // to do this nastiness
+            for (i = NUM_GL_VERSIONS - 2; i > 0 ; i--) {
+                /* don't bother below GL 3.0 */
+                if (gl_versions[i].major == 3 && gl_versions[i].minor == 0) {
+                    break;
+                }
+                // On Nvidia GPUs, to use Nv Path rendering we need a compatibility profile for the
+                // time being.
+                // TODO when Nvidia implements NVPR on Core profiles, we should start requesting
+                // core here
+                static const int context_attribs_gl[] = {
+                      GLX_CONTEXT_MAJOR_VERSION_ARB, gl_versions[i].major,
+                      GLX_CONTEXT_MINOR_VERSION_ARB, gl_versions[i].minor,
+                      GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB,
+                      None
+                };
+                fContext =
+                        glXCreateContextAttribsARB(fDisplay, bestFbc, 0, True, context_attribs_gl);
 
-            // Sync to ensure any errors generated are processed.
-            XSync(fDisplay, False);
+                // Sync to ensure any errors generated are processed.
+                XSync(fDisplay, False);
+
+                if (!ctxErrorOccurred && fContext) {
+                    break;
+                }
+                // try again
+                ctxErrorOccurred = false;
+            }
+
+            // Couldn't create GL 3.0 context.
+            // Fall back to old-style 2.x context.
+            // When a context version below 3.0 is requested,
+            // implementations will return the newest context version
+            // compatible with OpenGL versions less than version 3.0.
             if (ctxErrorOccurred || !fContext) {
-                // Couldn't create GL 3.0 context.
-                // Fall back to old-style 2.x context.
-                // When a context version below 3.0 is requested,
-                // implementations will return the newest context version
-                // compatible with OpenGL versions less than version 3.0.
+                static const int context_attribs_gl_fallback[] = {
+                    GLX_CONTEXT_MAJOR_VERSION_ARB, 1,
+                    GLX_CONTEXT_MINOR_VERSION_ARB, 0,
+                    None
+                };
 
                 ctxErrorOccurred = false;
 
@@ -251,7 +242,6 @@ const GrGLInterface* SkNativeGLContext::createGLContext(GrGLStandard forcedGpuAP
             }
         }
     }
-#endif
 
     // Sync to ensure any errors generated are processed.
     XSync(fDisplay, False);
@@ -262,7 +252,7 @@ const GrGLInterface* SkNativeGLContext::createGLContext(GrGLStandard forcedGpuAP
     if (ctxErrorOccurred || !fContext) {
         SkDebugf("Failed to create an OpenGL context.\n");
         this->destroyGLContext();
-        return NULL;
+        return;
     }
 
     // Verify that context is a direct context
@@ -276,24 +266,76 @@ const GrGLInterface* SkNativeGLContext::createGLContext(GrGLStandard forcedGpuAP
     if (!glXMakeCurrent(fDisplay, fGlxPixmap, fContext)) {
       SkDebugf("Could not set the context.\n");
         this->destroyGLContext();
-        return NULL;
+        return;
     }
 
-    const GrGLInterface* interface = GrGLCreateNativeInterface();
-    if (!interface) {
+    SkAutoTUnref<const GrGLInterface> gl(GrGLCreateNativeInterface());
+    if (nullptr == gl.get()) {
         SkDebugf("Failed to create gl interface");
         this->destroyGLContext();
-        return NULL;
+        return;
     }
-    return interface;
+
+    if (!gl->validate()) {
+        SkDebugf("Failed to validate gl interface");
+        this->destroyGLContext();
+        return;
+    }
+
+    this->init(gl.detach());
 }
 
-void SkNativeGLContext::makeCurrent() const {
+
+GLXGLContext::~GLXGLContext() {
+    this->teardown();
+    this->destroyGLContext();
+}
+
+void GLXGLContext::destroyGLContext() {
+    if (fDisplay) {
+        glXMakeCurrent(fDisplay, 0, 0);
+
+        if (fContext) {
+            glXDestroyContext(fDisplay, fContext);
+            fContext = nullptr;
+        }
+
+        if (fGlxPixmap) {
+            glXDestroyGLXPixmap(fDisplay, fGlxPixmap);
+            fGlxPixmap = 0;
+        }
+
+        if (fPixmap) {
+            XFreePixmap(fDisplay, fPixmap);
+            fPixmap = 0;
+        }
+
+        XCloseDisplay(fDisplay);
+        fDisplay = nullptr;
+    }
+}
+
+void GLXGLContext::onPlatformMakeCurrent() const {
     if (!glXMakeCurrent(fDisplay, fGlxPixmap, fContext)) {
         SkDebugf("Could not set the context.\n");
     }
 }
 
-void SkNativeGLContext::swapBuffers() const {
+void GLXGLContext::onPlatformSwapBuffers() const {
     glXSwapBuffers(fDisplay, fGlxPixmap);
 }
+
+GrGLFuncPtr GLXGLContext::onPlatformGetProcAddress(const char* procName) const {
+    return glXGetProcAddress(reinterpret_cast<const GLubyte*>(procName));
+}
+
+} // anonymous namespace
+
+SkGLContext* SkCreatePlatformGLContext(GrGLStandard forcedGpuAPI) {
+    GLXGLContext *ctx = new GLXGLContext(forcedGpuAPI);
+    if (!ctx->isValid()) {
+        delete ctx;
+        return nullptr;
+    }
+    return ctx;
+}
diff --git a/gfx/skia/skia/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp b/gfx/skia/skia/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp
index 04089656946a..c85f05c07e9d 100644
--- a/gfx/skia/skia/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp
+++ b/gfx/skia/skia/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp
@@ -1,174 +1,56 @@
 
 /*
- * Copyright 2011 Google Inc.
+ * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gl/GrGLInterface.h"
+#include "gl/GrGLAssembleInterface.h"
+#include <dlfcn.h>
 
-#import <OpenGLES/ES2/gl.h>
-#import <OpenGLES/ES2/glext.h>
+class GLLoader {
+public:
+    GLLoader() {
+        fLibrary = dlopen(
+            "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib",
+            RTLD_LAZY);
+    }
+
+    ~GLLoader() {
+        if (fLibrary) {
+            dlclose(fLibrary);
+        }
+    }
+
+    void* handle() const {
+        return nullptr == fLibrary ? RTLD_DEFAULT : fLibrary;
+    }
+
+private:
+    void* fLibrary;
+};
+
+class GLProcGetter {
+public:
+    GLProcGetter() {}
+
+    GrGLFuncPtr getProc(const char name[]) const {
+        return (GrGLFuncPtr) dlsym(fLoader.handle(), name);
+    }
+    
+private:
+    GLLoader fLoader;
+};
+
+static GrGLFuncPtr ios_get_gl_proc(void* ctx, const char name[]) {
+    SkASSERT(ctx);
+    const GLProcGetter* getter = (const GLProcGetter*) ctx;
+    return getter->getProc(name);
+}
 
 const GrGLInterface* GrGLCreateNativeInterface() {
-    GrGLInterface* interface = SkNEW(GrGLInterface);
-
-    GrGLInterface::Functions* functions = &interface->fFunctions;
-
-    functions->fActiveTexture = glActiveTexture;
-    functions->fAttachShader = glAttachShader;
-    functions->fBindAttribLocation = glBindAttribLocation;
-    functions->fBindBuffer = glBindBuffer;
-    functions->fBindTexture = glBindTexture;
-    functions->fBlendColor = glBlendColor;
-    functions->fBlendFunc = glBlendFunc;
-    functions->fBufferData = (GrGLBufferDataProc)glBufferData;
-    functions->fBufferSubData = (GrGLBufferSubDataProc)glBufferSubData;
-    functions->fClear = glClear;
-    functions->fClearColor = glClearColor;
-    functions->fClearStencil = glClearStencil;
-    functions->fColorMask = glColorMask;
-    functions->fCompileShader = glCompileShader;
-    functions->fCompressedTexImage2D = glCompressedTexImage2D;
-    functions->fCompressedTexSubImage2D = glCompressedTexSubImage2D;
-    functions->fCopyTexSubImage2D = glCopyTexSubImage2D;
-    functions->fCreateProgram = glCreateProgram;
-    functions->fCreateShader = glCreateShader;
-    functions->fCullFace = glCullFace;
-    functions->fDeleteBuffers = glDeleteBuffers;
-    functions->fDeleteProgram = glDeleteProgram;
-    functions->fDeleteShader = glDeleteShader;
-    functions->fDeleteTextures = glDeleteTextures;
-    functions->fDepthMask = glDepthMask;
-    functions->fDisable = glDisable;
-    functions->fDisableVertexAttribArray = glDisableVertexAttribArray;
-    functions->fDrawArrays = glDrawArrays;
-    functions->fDrawBuffer = NULL;
-    functions->fDrawBuffers = NULL;
-    functions->fDrawElements = glDrawElements;
-    functions->fEnable = glEnable;
-    functions->fEnableVertexAttribArray = glEnableVertexAttribArray;
-    functions->fFinish = glFinish;
-    functions->fFlush = glFlush;
-    functions->fFrontFace = glFrontFace;
-    functions->fGenBuffers = glGenBuffers;
-    functions->fGenerateMipmap = glGenerateMipmap;
-    functions->fGetBufferParameteriv = glGetBufferParameteriv;
-    functions->fGetError = glGetError;
-    functions->fGetIntegerv = glGetIntegerv;
-    functions->fGetProgramInfoLog = glGetProgramInfoLog;
-    functions->fGetProgramiv = glGetProgramiv;
-    functions->fGetShaderInfoLog = glGetShaderInfoLog;
-    functions->fGetShaderiv = glGetShaderiv;
-    functions->fGetString = glGetString;
-    functions->fGenTextures = glGenTextures;
-    functions->fGetUniformLocation = glGetUniformLocation;
-    functions->fLineWidth = glLineWidth;
-    functions->fLinkProgram = glLinkProgram;
-    functions->fPixelStorei = glPixelStorei;
-    functions->fReadBuffer = NULL;
-    functions->fReadPixels = glReadPixels;
-    functions->fScissor = glScissor;
-    functions->fShaderSource = (GrGLShaderSourceProc) glShaderSource;
-    functions->fStencilFunc = glStencilFunc;
-    functions->fStencilFuncSeparate = glStencilFuncSeparate;
-    functions->fStencilMask = glStencilMask;
-    functions->fStencilMaskSeparate = glStencilMaskSeparate;
-    functions->fStencilOp = glStencilOp;
-    functions->fStencilOpSeparate = glStencilOpSeparate;
-    // mac uses GLenum for internalFormat param (non-standard)
-    // amounts to int vs. uint.
-    functions->fTexImage2D = (GrGLTexImage2DProc)glTexImage2D;
-#if GL_ARB_texture_storage
-    functions->fTexStorage2D = glTexStorage2D;
-#elif GL_EXT_texture_storage
-    functions->fTexStorage2D = glTexStorage2DEXT;
-#endif
-#if GL_EXT_discard_framebuffer
-    functions->fDiscardFramebuffer = glDiscardFramebufferEXT;
-#endif
-    functions->fTexParameteri = glTexParameteri;
-    functions->fTexParameteriv = glTexParameteriv;
-    functions->fTexSubImage2D = glTexSubImage2D;
-    functions->fUniform1f = glUniform1f;
-    functions->fUniform1i = glUniform1i;
-    functions->fUniform1fv = glUniform1fv;
-    functions->fUniform1iv = glUniform1iv;
-    functions->fUniform2f = glUniform2f;
-    functions->fUniform2i = glUniform2i;
-    functions->fUniform2fv = glUniform2fv;
-    functions->fUniform2iv = glUniform2iv;
-    functions->fUniform3f = glUniform3f;
-    functions->fUniform3i = glUniform3i;
-    functions->fUniform3fv = glUniform3fv;
-    functions->fUniform3iv = glUniform3iv;
-    functions->fUniform4f = glUniform4f;
-    functions->fUniform4i = glUniform4i;
-    functions->fUniform4fv = glUniform4fv;
-    functions->fUniform4iv = glUniform4iv;
-    functions->fUniform4fv = glUniform4fv;
-    functions->fUniformMatrix2fv = glUniformMatrix2fv;
-    functions->fUniformMatrix3fv = glUniformMatrix3fv;
-    functions->fUniformMatrix4fv = glUniformMatrix4fv;
-    functions->fUseProgram = glUseProgram;
-    functions->fVertexAttrib4fv = glVertexAttrib4fv;
-    functions->fVertexAttribPointer = glVertexAttribPointer;
-    functions->fViewport = glViewport;
-    functions->fGenFramebuffers = glGenFramebuffers;
-    functions->fGetFramebufferAttachmentParameteriv = glGetFramebufferAttachmentParameteriv;
-    functions->fGetRenderbufferParameteriv = glGetRenderbufferParameteriv;
-    functions->fBindFramebuffer = glBindFramebuffer;
-    functions->fFramebufferTexture2D = glFramebufferTexture2D;
-    functions->fCheckFramebufferStatus = glCheckFramebufferStatus;
-    functions->fDeleteFramebuffers = glDeleteFramebuffers;
-    functions->fRenderbufferStorage = glRenderbufferStorage;
-    functions->fGenRenderbuffers = glGenRenderbuffers;
-    functions->fDeleteRenderbuffers = glDeleteRenderbuffers;
-    functions->fFramebufferRenderbuffer = glFramebufferRenderbuffer;
-    functions->fBindRenderbuffer = glBindRenderbuffer;
-
-#if GL_OES_mapbuffer
-    functions->fMapBuffer = glMapBufferOES;
-    functions->fUnmapBuffer = glUnmapBufferOES;
-#endif
-
-#if GL_EXT_map_buffer_range || GL_ES_VERSION_3_0
-    functions->fMapBufferRange = glMapBufferRangeEXT;
-    functions->fFlushMappedBufferRange = glFlushMappedBufferRangeEXT;
-#endif
-
-#if GL_APPLE_framebuffer_multisample
-    functions->fRenderbufferStorageMultisampleES2APPLE = glRenderbufferStorageMultisampleAPPLE;
-    functions->fResolveMultisampleFramebuffer = glResolveMultisampleFramebufferAPPLE;
-#endif
-
-#if GL_OES_vertex_array_object
-    functions->fBindVertexArray = glBindVertexArrayOES;
-    functions->fDeleteVertexArrays = glDeleteVertexArraysOES;
-    functions->fGenVertexArrays = glGenVertexArraysOES;
-#endif
-
-#if GL_EXT_debug_marker
-    functions->fInsertEventMarker = glInsertEventMarkerEXT;
-    functions->fPushGroupMarker = glPushGroupMarkerEXT;
-    functions->fPopGroupMarker = glPopGroupMarkerEXT;
-#endif
-
-#if GL_ES_VERSION_3_0 || GL_ARB_invalidate_subdata
-    functions->fInvalidateFramebuffer = glInvalidateFramebuffer;
-    functions->fInvalidateSubFramebuffer = glInvalidateSubFramebuffer;
-#endif
-
-#if GL_ARB_invalidate_subdata
-    functions->fInvalidateBufferData = glInvalidateBufferData;
-    functions->fInvalidateBufferSubData = glInvalidateBufferSubData;
-    functions->fInvalidateTexImage = glInvalidateTexImage;
-    functions->fInvalidateTexSubImage = glInvalidateTexSubImage;
-#endif
-
-    interface->fStandard = kGLES_GrGLStandard;
-    interface->fExtensions.init(kGLES_GrGLStandard, glGetString, NULL, glGetIntegerv);
-
-    return interface;
+    GLProcGetter getter;
+    return GrGLAssembleGLESInterface(&getter, ios_get_gl_proc);
 }
diff --git a/gfx/skia/skia/src/gpu/gl/iOS/SkCreatePlatformGLContext_iOS.mm b/gfx/skia/skia/src/gpu/gl/iOS/SkCreatePlatformGLContext_iOS.mm
new file mode 100644
index 000000000000..b90948af4421
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/iOS/SkCreatePlatformGLContext_iOS.mm
@@ -0,0 +1,102 @@
+
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "gl/SkGLContext.h"
+#import <OpenGLES/EAGL.h>
+#include <dlfcn.h>
+
+#define EAGLCTX ((EAGLContext*)(fEAGLContext))
+
+namespace {
+
+class IOSGLContext : public SkGLContext {
+public:
+    IOSGLContext();
+    ~IOSGLContext() override;
+
+private:
+    void destroyGLContext();
+
+    void onPlatformMakeCurrent() const override;
+    void onPlatformSwapBuffers() const override;
+    GrGLFuncPtr onPlatformGetProcAddress(const char*) const override;
+
+    void* fEAGLContext;
+    void* fGLLibrary;
+};
+
+IOSGLContext::IOSGLContext()
+    : fEAGLContext(NULL)
+    , fGLLibrary(RTLD_DEFAULT) {
+
+    fEAGLContext = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];
+    [EAGLContext setCurrentContext:EAGLCTX];
+
+    SkAutoTUnref<const GrGLInterface> gl(GrGLCreateNativeInterface());
+    if (NULL == gl.get()) {
+        SkDebugf("Failed to create gl interface");
+        this->destroyGLContext();
+        return;
+    }
+    if (!gl->validate()) {
+        SkDebugf("Failed to validate gl interface");
+        this->destroyGLContext();
+        return;
+    }
+
+    fGLLibrary = dlopen(
+        "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib",
+        RTLD_LAZY);
+
+    this->init(gl.detach());
+}
+
+IOSGLContext::~IOSGLContext() {
+    this->teardown();
+    this->destroyGLContext();
+}
+
+void IOSGLContext::destroyGLContext() {
+    if (fEAGLContext) {
+        if ([EAGLContext currentContext] == EAGLCTX) {
+            [EAGLContext setCurrentContext:nil];
+        }
+        [EAGLCTX release];
+        fEAGLContext = NULL;
+    }
+    if (RTLD_DEFAULT != fGLLibrary) {
+        dlclose(fGLLibrary);
+    }
+}
+
+
+void IOSGLContext::onPlatformMakeCurrent() const {
+    if (![EAGLContext setCurrentContext:EAGLCTX]) {
+        SkDebugf("Could not set the context.\n");
+    }
+}
+
+void IOSGLContext::onPlatformSwapBuffers() const { }
+
+GrGLFuncPtr IOSGLContext::onPlatformGetProcAddress(const char* procName) const {
+    return reinterpret_cast<GrGLFuncPtr>(dlsym(fGLLibrary, procName));
+}
+
+} // anonymous namespace
+
+SkGLContext* SkCreatePlatformGLContext(GrGLStandard forcedGpuAPI) {
+    if (kGL_GrGLStandard == forcedGpuAPI) {
+        return NULL;
+    }
+    IOSGLContext* ctx = new IOSGLContext;
+    if (!ctx->isValid()) {
+        delete ctx;
+        return NULL;
+    }
+    return ctx;
+}
diff --git a/gfx/skia/skia/src/gpu/gl/iOS/SkNativeGLContext_iOS.mm b/gfx/skia/skia/src/gpu/gl/iOS/SkNativeGLContext_iOS.mm
deleted file mode 100644
index 1e11c0deb7be..000000000000
--- a/gfx/skia/skia/src/gpu/gl/iOS/SkNativeGLContext_iOS.mm
+++ /dev/null
@@ -1,68 +0,0 @@
-
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "gl/SkNativeGLContext.h"
-#import <OpenGLES/EAGL.h>
-
-#define EAGLCTX ((EAGLContext*)(fEAGLContext))
-
-SkNativeGLContext::AutoContextRestore::AutoContextRestore() {
-    fEAGLContext = [EAGLContext currentContext];
-    if (EAGLCTX) {
-        [EAGLCTX retain];
-    }
-}
-
-SkNativeGLContext::AutoContextRestore::~AutoContextRestore() {
-    if (EAGLCTX) {
-        [EAGLContext setCurrentContext:EAGLCTX];
-        [EAGLCTX release];
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-SkNativeGLContext::SkNativeGLContext()
-    : fEAGLContext(NULL) {
-}
-
-SkNativeGLContext::~SkNativeGLContext() {
-    this->destroyGLContext();
-}
-
-void SkNativeGLContext::destroyGLContext() {
-    if ([EAGLContext currentContext] == EAGLCTX) {
-        [EAGLContext setCurrentContext:nil];
-    }
-    [EAGLCTX release];
-}
-
-const GrGLInterface* SkNativeGLContext::createGLContext(GrGLStandard forcedGpuAPI) {
-    if (kGL_GrGLStandard == forcedGpuAPI) {
-        return NULL;
-    }
-
-    fEAGLContext = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];
-    [EAGLContext setCurrentContext:EAGLCTX];
-    
-    const GrGLInterface* interface = GrGLCreateNativeInterface();
-    if (!interface) {
-        SkDebugf("Failed to create gl interface");
-        this->destroyGLContext();
-        return NULL;
-    }
-    return interface;
-}
-
-void SkNativeGLContext::makeCurrent() const {
-    if (![EAGLContext setCurrentContext:EAGLCTX]) {
-        SkDebugf("Could not set the context.\n");
-    }
-}
-
-void SkNativeGLContext::swapBuffers() const { }
diff --git a/gfx/skia/skia/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp b/gfx/skia/skia/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp
index ab3f0ad2417c..83e559339a25 100644
--- a/gfx/skia/skia/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp
+++ b/gfx/skia/skia/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp
@@ -5,6 +5,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_MAC)
 
 
 #include "gl/GrGLInterface.h"
@@ -21,13 +23,13 @@ public:
     }
 
     ~GLLoader() {
-        if (NULL != fLibrary) {
+        if (fLibrary) {
             dlclose(fLibrary);
         }
     }
 
     void* handle() const {
-        return NULL == fLibrary ? RTLD_DEFAULT : fLibrary;
+        return nullptr == fLibrary ? RTLD_DEFAULT : fLibrary;
     }
 
 private:
@@ -47,7 +49,7 @@ private:
 };
 
 static GrGLFuncPtr mac_get_gl_proc(void* ctx, const char name[]) {
-    SkASSERT(NULL != ctx);
+    SkASSERT(ctx);
     const GLProcGetter* getter = (const GLProcGetter*) ctx;
     return getter->getProc(name);
 }
@@ -56,3 +58,5 @@ const GrGLInterface* GrGLCreateNativeInterface() {
     GLProcGetter getter;
     return GrGLAssembleGLInterface(&getter, mac_get_gl_proc);
 }
+
+#endif//defined(SK_BUILD_FOR_MAC)
diff --git a/gfx/skia/skia/src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp b/gfx/skia/skia/src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp
new file mode 100644
index 000000000000..41585c8632ec
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp
@@ -0,0 +1,124 @@
+
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_MAC)
+
+#include "gl/SkGLContext.h"
+#include "AvailabilityMacros.h"
+
+#include <OpenGL/OpenGL.h>
+#include <dlfcn.h>
+
+namespace {
+class MacGLContext : public SkGLContext {
+public:
+    MacGLContext();
+    ~MacGLContext() override;
+
+private:
+    void destroyGLContext();
+
+    void onPlatformMakeCurrent() const override;
+    void onPlatformSwapBuffers() const override;
+    GrGLFuncPtr onPlatformGetProcAddress(const char*) const override;
+
+    CGLContextObj fContext;
+    void* fGLLibrary;
+};
+
+MacGLContext::MacGLContext()
+    : fContext(nullptr)
+    , fGLLibrary(RTLD_DEFAULT) {
+    CGLPixelFormatAttribute attributes[] = {
+#if MAC_OS_X_VERSION_10_7
+        kCGLPFAOpenGLProfile, (CGLPixelFormatAttribute) kCGLOGLPVersion_3_2_Core,
+#endif
+        kCGLPFADoubleBuffer,
+        (CGLPixelFormatAttribute)0
+    };
+    CGLPixelFormatObj pixFormat;
+    GLint npix;
+
+    CGLChoosePixelFormat(attributes, &pixFormat, &npix);
+
+    if (nullptr == pixFormat) {
+        SkDebugf("CGLChoosePixelFormat failed.");
+        return;
+    }
+
+    CGLCreateContext(pixFormat, nullptr, &fContext);
+    CGLReleasePixelFormat(pixFormat);
+
+    if (nullptr == fContext) {
+        SkDebugf("CGLCreateContext failed.");
+        return;
+    }
+
+    CGLSetCurrentContext(fContext);
+
+    SkAutoTUnref<const GrGLInterface> gl(GrGLCreateNativeInterface());
+    if (nullptr == gl.get()) {
+        SkDebugf("Context could not create GL interface.\n");
+        this->destroyGLContext();
+        return;
+    }
+    if (!gl->validate()) {
+        SkDebugf("Context could not validate GL interface.\n");
+        this->destroyGLContext();
+        return;
+    }
+
+    fGLLibrary = dlopen(
+        "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib",
+        RTLD_LAZY);
+
+    this->init(gl.detach());
+}
+
+MacGLContext::~MacGLContext() {
+    this->teardown();
+    this->destroyGLContext();
+}
+
+void MacGLContext::destroyGLContext() {
+    if (fContext) {
+        CGLReleaseContext(fContext);
+        fContext = nullptr;
+    }
+    if (RTLD_DEFAULT != fGLLibrary) {
+        dlclose(fGLLibrary);
+    }
+}
+
+void MacGLContext::onPlatformMakeCurrent() const {
+    CGLSetCurrentContext(fContext);
+}
+
+void MacGLContext::onPlatformSwapBuffers() const {
+    CGLFlushDrawable(fContext);
+}
+
+GrGLFuncPtr MacGLContext::onPlatformGetProcAddress(const char* procName) const {
+    return reinterpret_cast<GrGLFuncPtr>(dlsym(fGLLibrary, procName));
+}
+
+} // anonymous namespace
+
+SkGLContext* SkCreatePlatformGLContext(GrGLStandard forcedGpuAPI) {
+    if (kGLES_GrGLStandard == forcedGpuAPI) {
+        return nullptr;
+    }
+    MacGLContext* ctx = new MacGLContext;
+    if (!ctx->isValid()) {
+        delete ctx;
+        return nullptr;
+    }
+    return ctx;
+}
+
+#endif//defined(SK_BUILD_FOR_MAC)
diff --git a/gfx/skia/skia/src/gpu/gl/mac/SkNativeGLContext_mac.cpp b/gfx/skia/skia/src/gpu/gl/mac/SkNativeGLContext_mac.cpp
deleted file mode 100644
index fefbb4c12b6a..000000000000
--- a/gfx/skia/skia/src/gpu/gl/mac/SkNativeGLContext_mac.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#include "gl/SkNativeGLContext.h"
-#include "AvailabilityMacros.h"
-
-SkNativeGLContext::AutoContextRestore::AutoContextRestore() {
-    fOldCGLContext = CGLGetCurrentContext();
-}
-
-SkNativeGLContext::AutoContextRestore::~AutoContextRestore() {
-    CGLSetCurrentContext(fOldCGLContext);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-SkNativeGLContext::SkNativeGLContext()
-    : fContext(NULL) {
-}
-
-SkNativeGLContext::~SkNativeGLContext() {
-    this->destroyGLContext();
-}
-
-void SkNativeGLContext::destroyGLContext() {
-    if (NULL != fContext) {
-        CGLReleaseContext(fContext);
-    }
-}
-
-const GrGLInterface* SkNativeGLContext::createGLContext(GrGLStandard forcedGpuAPI) {
-    SkASSERT(NULL == fContext);
-    if (kGLES_GrGLStandard == forcedGpuAPI) {
-        return NULL;
-    }
-
-    CGLPixelFormatAttribute attributes[] = {
-#if MAC_OS_X_VERSION_10_7
-        kCGLPFAOpenGLProfile, (CGLPixelFormatAttribute) kCGLOGLPVersion_3_2_Core,
-#endif
-        kCGLPFADoubleBuffer,
-        (CGLPixelFormatAttribute)0
-    };
-    CGLPixelFormatObj pixFormat;
-    GLint npix;
-
-    CGLChoosePixelFormat(attributes, &pixFormat, &npix);
-
-    if (NULL == pixFormat) {
-        SkDebugf("CGLChoosePixelFormat failed.");
-        return NULL;
-    }
-
-    CGLCreateContext(pixFormat, NULL, &fContext);
-    CGLReleasePixelFormat(pixFormat);
-
-    if (NULL == fContext) {
-        SkDebugf("CGLCreateContext failed.");
-        return NULL;
-    }
-
-    CGLSetCurrentContext(fContext);
-
-    const GrGLInterface* interface = GrGLCreateNativeInterface();
-    if (NULL == interface) {
-        SkDebugf("Context could not create GL interface.\n");
-        this->destroyGLContext();
-        return NULL;
-    }
-
-    return interface;
-}
-
-void SkNativeGLContext::makeCurrent() const {
-    CGLSetCurrentContext(fContext);
-}
-
-void SkNativeGLContext::swapBuffers() const {
-    CGLFlushDrawable(fContext);
-}
diff --git a/gfx/skia/skia/src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp b/gfx/skia/skia/src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp
index a95b6fc8695d..734c1fea0ce6 100644
--- a/gfx/skia/skia/src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp
+++ b/gfx/skia/skia/src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp
@@ -12,14 +12,14 @@
 #include "osmesa_wrapper.h"
 
 static GrGLFuncPtr osmesa_get(void* ctx, const char name[]) {
-    SkASSERT(NULL == ctx);
-    SkASSERT(NULL != OSMesaGetCurrentContext());
+    SkASSERT(nullptr == ctx);
+    SkASSERT(OSMesaGetCurrentContext());
     return OSMesaGetProcAddress(name);
 }
 
 const GrGLInterface* GrGLCreateMesaInterface() {
-    if (NULL == OSMesaGetCurrentContext()) {
-        return NULL;
+    if (nullptr == OSMesaGetCurrentContext()) {
+        return nullptr;
     }
-    return GrGLAssembleGLInterface(NULL, osmesa_get);
+    return GrGLAssembleInterface(nullptr, osmesa_get);
 }
diff --git a/gfx/skia/skia/src/gpu/gl/mesa/SkMesaGLContext.cpp b/gfx/skia/skia/src/gpu/gl/mesa/SkMesaGLContext.cpp
index 58e325dfeb82..541b247fa86c 100644
--- a/gfx/skia/skia/src/gpu/gl/mesa/SkMesaGLContext.cpp
+++ b/gfx/skia/skia/src/gpu/gl/mesa/SkMesaGLContext.cpp
@@ -8,67 +8,27 @@
 
 #include <GL/osmesa.h>
 
-#include "gl/SkMesaGLContext.h"
+#include "gl/mesa/SkMesaGLContext.h"
 #include "gl/GrGLDefines.h"
 
-SkMesaGLContext::AutoContextRestore::AutoContextRestore() {
-    fOldContext = (Context)OSMesaGetCurrentContext();
-    if (NULL != (OSMesaContext)fOldContext) {
-        OSMesaGetColorBuffer((OSMesaContext)fOldContext,
-                              &fOldWidth, &fOldHeight,
-                              &fOldFormat, &fOldImage);
-    }
-}
-
-SkMesaGLContext::AutoContextRestore::~AutoContextRestore() {
-    if (NULL != (OSMesaContext)fOldContext) {
-        OSMesaMakeCurrent((OSMesaContext)fOldContext, fOldImage,
-                          fOldFormat, fOldWidth, fOldHeight);
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-SkMesaGLContext::SkMesaGLContext()
-    : fContext(static_cast<Context>(NULL))
-    , fImage(NULL) {
-    GR_STATIC_ASSERT(sizeof(Context) == sizeof(OSMesaContext));
-}
-
-SkMesaGLContext::~SkMesaGLContext() {
-    this->destroyGLContext();
-}
-
-void SkMesaGLContext::destroyGLContext() {
-    if (fImage) {
-        sk_free(fImage);
-        fImage = NULL;
-    }
-
-    if (fContext) {
-        OSMesaDestroyContext((OSMesaContext)fContext);
-        fContext = static_cast<Context>(NULL);
-    }
-}
-
 static const GrGLint gBOGUS_SIZE = 16;
 
-const GrGLInterface* SkMesaGLContext::createGLContext(GrGLStandard forcedGpuAPI) {
-    if (kGLES_GrGLStandard == forcedGpuAPI) {
-        return NULL;
-    }
+SkMesaGLContext::SkMesaGLContext()
+    : fContext(static_cast<Context>(0))
+    , fImage(nullptr) {
+    GR_STATIC_ASSERT(sizeof(Context) == sizeof(OSMesaContext));
 
     /* Create an RGBA-mode context */
 #if OSMESA_MAJOR_VERSION * 100 + OSMESA_MINOR_VERSION >= 305
     /* specify Z, stencil, accum sizes */
-    fContext = (Context)OSMesaCreateContextExt(OSMESA_BGRA, 0, 0, 0, NULL);
+    fContext = (Context)OSMesaCreateContextExt(OSMESA_BGRA, 0, 0, 0, nullptr);
 #else
-    fContext = (Context)OSMesaCreateContext(OSMESA_BGRA, NULL);
+    fContext = (Context)OSMesaCreateContext(OSMESA_BGRA, nullptr);
 #endif
     if (!fContext) {
         SkDebugf("OSMesaCreateContext failed!\n");
         this->destroyGLContext();
-        return NULL;
+        return;
     }
     // Allocate the image buffer
     fImage = (GrGLubyte *) sk_malloc_throw(gBOGUS_SIZE * gBOGUS_SIZE *
@@ -76,7 +36,7 @@ const GrGLInterface* SkMesaGLContext::createGLContext(GrGLStandard forcedGpuAPI)
     if (!fImage) {
         SkDebugf("Alloc image buffer failed!\n");
         this->destroyGLContext();
-        return NULL;
+        return;
     }
 
     // Bind the buffer to the context and make it current
@@ -87,20 +47,45 @@ const GrGLInterface* SkMesaGLContext::createGLContext(GrGLStandard forcedGpuAPI)
                            gBOGUS_SIZE)) {
         SkDebugf("OSMesaMakeCurrent failed!\n");
         this->destroyGLContext();
-        return NULL;
+        return;
     }
 
-    const GrGLInterface* interface = GrGLCreateMesaInterface();
-    if (!interface) {
+    SkAutoTUnref<const GrGLInterface> gl(GrGLCreateMesaInterface());
+    if (nullptr == gl.get()) {
         SkDebugf("Could not create GL interface!\n");
         this->destroyGLContext();
-        return NULL;
+        return;
     }
-    return interface;
 
+    if (!gl->validate()) {
+        SkDebugf("Could not validate GL interface!\n");
+        this->destroyGLContext();
+        return;
+    }
+
+    this->init(gl.detach());
 }
 
-void SkMesaGLContext::makeCurrent() const {
+SkMesaGLContext::~SkMesaGLContext() {
+    this->teardown();
+    this->destroyGLContext();
+}
+
+void SkMesaGLContext::destroyGLContext() {
+    if (fImage) {
+        sk_free(fImage);
+        fImage = nullptr;
+    }
+
+    if (fContext) {
+        OSMesaDestroyContext((OSMesaContext)fContext);
+        fContext = static_cast<Context>(0);
+    }
+}
+
+
+
+void SkMesaGLContext::onPlatformMakeCurrent() const {
     if (fContext) {
         if (!OSMesaMakeCurrent((OSMesaContext)fContext, fImage,
                                GR_GL_UNSIGNED_BYTE, gBOGUS_SIZE, gBOGUS_SIZE)) {
@@ -109,4 +94,8 @@ void SkMesaGLContext::makeCurrent() const {
     }
 }
 
-void SkMesaGLContext::swapBuffers() const { }
+void SkMesaGLContext::onPlatformSwapBuffers() const { }
+
+GrGLFuncPtr SkMesaGLContext::onPlatformGetProcAddress(const char* procName) const {
+    return OSMesaGetProcAddress(procName);
+}
diff --git a/gfx/skia/skia/src/gpu/gl/mesa/SkMesaGLContext.h b/gfx/skia/skia/src/gpu/gl/mesa/SkMesaGLContext.h
new file mode 100644
index 000000000000..a58f1c890ee9
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/gl/mesa/SkMesaGLContext.h
@@ -0,0 +1,48 @@
+
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef SkMesaGLContext_DEFINED
+#define SkMesaGLContext_DEFINED
+
+#include "gl/SkGLContext.h"
+
+#if SK_MESA
+
+class SkMesaGLContext : public SkGLContext {
+private:
+    typedef intptr_t Context;
+
+public:
+    ~SkMesaGLContext() override;
+
+    static SkMesaGLContext* Create(GrGLStandard forcedGpuAPI) {
+        if (kGLES_GrGLStandard == forcedGpuAPI) {
+            return nullptr;
+        }
+        SkMesaGLContext* ctx = new SkMesaGLContext;
+        if (!ctx->isValid()) {
+            delete ctx;
+            return nullptr;
+        }
+        return ctx;
+    }
+
+private:
+    SkMesaGLContext();
+    void destroyGLContext();
+
+    void onPlatformMakeCurrent() const override;
+    void onPlatformSwapBuffers() const override;
+    GrGLFuncPtr onPlatformGetProcAddress(const char*) const override;
+
+    Context fContext;
+    GrGLubyte *fImage;
+};
+
+#endif
+
+#endif
diff --git a/gfx/skia/skia/src/utils/SkThreadUtils_pthread_other.cpp b/gfx/skia/skia/src/gpu/gl/nacl/SkCreatePlatformGLContext_nacl.cpp
similarity index 55%
rename from gfx/skia/skia/src/utils/SkThreadUtils_pthread_other.cpp
rename to gfx/skia/skia/src/gpu/gl/nacl/SkCreatePlatformGLContext_nacl.cpp
index a3973f1d720b..21f30019a9b5 100644
--- a/gfx/skia/skia/src/utils/SkThreadUtils_pthread_other.cpp
+++ b/gfx/skia/skia/src/gpu/gl/nacl/SkCreatePlatformGLContext_nacl.cpp
@@ -1,12 +1,14 @@
+
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#include "gl/SkGLContext.h"
 
-#include "SkThreadUtils.h"
-
-bool SkThread::setProcessorAffinity(unsigned int processor) {
-    return false;
+SkGLContext* SkCreatePlatformGLContext(GrGLStandard forcedGpuAPI) {
+    return nullptr;
 }
+
+
diff --git a/gfx/skia/skia/src/gpu/gl/nacl/SkNativeGLContext_nacl.cpp b/gfx/skia/skia/src/gpu/gl/nacl/SkNativeGLContext_nacl.cpp
deleted file mode 100644
index 334be1d9542a..000000000000
--- a/gfx/skia/skia/src/gpu/gl/nacl/SkNativeGLContext_nacl.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#include "gl/SkNativeGLContext.h"
-
-SkNativeGLContext::AutoContextRestore::AutoContextRestore() {
-}
-
-SkNativeGLContext::AutoContextRestore::~AutoContextRestore() {
-}
-
-SkNativeGLContext::SkNativeGLContext()
-    : fContext(NULL)
-    , fDisplay(NULL)
-{
-}
-
-SkNativeGLContext::~SkNativeGLContext() {
-    this->destroyGLContext();
-}
-
-void SkNativeGLContext::destroyGLContext() {
-}
-
-const GrGLInterface* SkNativeGLContext::createGLContext(GrGLStandard forcedGpuAPI) {
-    return NULL;
-}
-
-void SkNativeGLContext::makeCurrent() const {
-}
-
-void SkNativeGLContext::swapBuffers() const {
-}
diff --git a/gfx/skia/skia/src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp b/gfx/skia/skia/src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp
deleted file mode 100644
index b3c7a3c5a9d1..000000000000
--- a/gfx/skia/skia/src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#include "gl/GrGLInterface.h"
-#include "gl/GrGLAssembleInterface.h"
-#include "gl/GrGLUtil.h"
-
-#include <GL/glx.h>
-
-#define GET_PROC(F) functions->f ## F = (GrGL ## F ## Proc) get(ctx, "gl" #F)
-#define GET_PROC_SUFFIX(F, S) functions->f ## F = (GrGL ## F ## Proc) get(ctx, "gl" #F #S)
-#define GET_PROC_LOCAL(F) GrGL ## F ## Proc F = (GrGL ## F ## Proc) get(ctx, "gl" #F)
-
-#define GET_LINKED GET_PROC
-#define GET_LINKED_SUFFIX GET_PROC_SUFFIX
-
-#include "gl/GrGLAssembleGLESInterface.h"
-
-static GrGLFuncPtr glx_get(void* ctx, const char name[]) {
-    SkASSERT(NULL == ctx);
-    SkASSERT(NULL != glXGetCurrentContext());
-    return glXGetProcAddress(reinterpret_cast<const GLubyte*>(name));
-}
-
-const GrGLInterface* GrGLCreateNativeInterface() {
-    if (NULL == glXGetCurrentContext()) {
-        return NULL;
-    }
-
-    const char* verStr = reinterpret_cast<const char*>(glGetString(GR_GL_VERSION));
-    GrGLStandard standard = GrGLGetStandardInUseFromString(verStr);
-
-    if (kGLES_GrGLStandard == standard) {
-        return GrGLAssembleGLESInterface(NULL, glx_get);
-    } else if (kGL_GrGLStandard == standard) {
-        return GrGLAssembleGLInterface(NULL, glx_get);
-    }
-    return NULL;
-}
diff --git a/gfx/skia/skia/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp b/gfx/skia/skia/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp
index 7afa2e076259..b0eaa548f191 100644
--- a/gfx/skia/skia/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp
+++ b/gfx/skia/skia/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp
@@ -5,6 +5,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_WIN32)
 
 #include "gl/GrGLInterface.h"
 #include "gl/GrGLAssembleInterface.h"
@@ -12,24 +14,13 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-#include <GL/gl.h>
-
-#define GET_PROC(F) functions->f ## F = (GrGL ## F ## Proc) get(ctx, "gl" #F)
-#define GET_PROC_SUFFIX(F, S) functions->f ## F = (GrGL ## F ## Proc) get(ctx, "gl" #F #S)
-#define GET_PROC_LOCAL(F) GrGL ## F ## Proc F = (GrGL ## F ## Proc) get(ctx, "gl" #F)
-
-#define GET_LINKED GET_PROC
-#define GET_LINKED_SUFFIX GET_PROC_SUFFIX
-
-#include "gl/GrGLAssembleGLESInterface.h"
-
 class AutoLibraryUnload {
 public:
     AutoLibraryUnload(const char* moduleName) {
         fModule = LoadLibrary(moduleName);
     }
     ~AutoLibraryUnload() {
-        if (NULL != fModule) {
+        if (fModule) {
             FreeLibrary(fModule);
         }
     }
@@ -43,17 +34,17 @@ class GLProcGetter {
 public:
     GLProcGetter() : fGLLib("opengl32.dll") {}
 
-    bool isInitialized() const { return NULL != fGLLib.get(); }
+    bool isInitialized() const { return SkToBool(fGLLib.get()); }
 
     GrGLFuncPtr getProc(const char name[]) const {
         GrGLFuncPtr proc;
-        if (NULL != (proc = (GrGLFuncPtr) GetProcAddress(fGLLib.get(), name))) {
+        if ((proc = (GrGLFuncPtr) GetProcAddress(fGLLib.get(), name))) {
             return proc;
         }
-        if (NULL != (proc = (GrGLFuncPtr) wglGetProcAddress(name))) {
+        if ((proc = (GrGLFuncPtr) wglGetProcAddress(name))) {
             return proc;
         }
-        return NULL;
+        return nullptr;
     }
 
 private:
@@ -61,8 +52,8 @@ private:
 };
 
 static GrGLFuncPtr win_get_gl_proc(void* ctx, const char name[]) {
-    SkASSERT(NULL != ctx);
-    SkASSERT(NULL != wglGetCurrentContext());
+    SkASSERT(ctx);
+    SkASSERT(wglGetCurrentContext());
     const GLProcGetter* getter = (const GLProcGetter*) ctx;
     return getter->getProc(name);
 }
@@ -73,18 +64,18 @@ static GrGLFuncPtr win_get_gl_proc(void* ctx, const char name[]) {
  * Otherwise, a springboard would be needed that hides the calling convention.
  */
 const GrGLInterface* GrGLCreateNativeInterface() {
-    if (NULL == wglGetCurrentContext()) {
-        return NULL;
+    if (nullptr == wglGetCurrentContext()) {
+        return nullptr;
     }
 
     GLProcGetter getter;
     if (!getter.isInitialized()) {
-        return NULL;
+        return nullptr;
     }
 
     GrGLGetStringProc getString = (GrGLGetStringProc)getter.getProc("glGetString");
-    if (NULL == getString) {
-        return NULL;
+    if (nullptr == getString) {
+        return nullptr;
     }
     const char* verStr = reinterpret_cast<const char*>(getString(GR_GL_VERSION));
     GrGLStandard standard = GrGLGetStandardInUseFromString(verStr);
@@ -94,5 +85,7 @@ const GrGLInterface* GrGLCreateNativeInterface() {
     } else if (kGL_GrGLStandard == standard) {
         return GrGLAssembleGLInterface(&getter, win_get_gl_proc);
     }
-    return NULL;
+    return nullptr;
 }
+
+#endif//defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/src/gpu/gl/win/SkNativeGLContext_win.cpp b/gfx/skia/skia/src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp
similarity index 58%
rename from gfx/skia/skia/src/gpu/gl/win/SkNativeGLContext_win.cpp
rename to gfx/skia/skia/src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp
index ab66ba4d55ce..f795f525547d 100644
--- a/gfx/skia/skia/src/gpu/gl/win/SkNativeGLContext_win.cpp
+++ b/gfx/skia/skia/src/gpu/gl/win/SkCreatePlatformGLContext_win.cpp
@@ -6,71 +6,62 @@
  * found in the LICENSE file.
  */
 
-#include "gl/SkNativeGLContext.h"
+#include "gl/SkGLContext.h"
+
+#include <windows.h>
+#include <GL/GL.h>
+#include "win/SkWGL.h"
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-SkNativeGLContext::AutoContextRestore::AutoContextRestore() {
-    fOldHGLRC = wglGetCurrentContext();
-    fOldHDC = wglGetCurrentDC();
-}
+namespace {
 
-SkNativeGLContext::AutoContextRestore::~AutoContextRestore() {
-    wglMakeCurrent(fOldHDC, fOldHGLRC);
-}
+class WinGLContext : public SkGLContext {
+public:
+    WinGLContext(GrGLStandard forcedGpuAPI);
+	~WinGLContext() override;
 
-///////////////////////////////////////////////////////////////////////////////
+private:
+    void destroyGLContext();
 
-ATOM SkNativeGLContext::gWC = 0;
+    void onPlatformMakeCurrent() const override;
+    void onPlatformSwapBuffers() const override;
+    GrGLFuncPtr onPlatformGetProcAddress(const char* name) const override;
 
-SkNativeGLContext::SkNativeGLContext()
-    : fWindow(NULL)
-    , fDeviceContext(NULL)
+    HWND fWindow;
+    HDC fDeviceContext;
+    HGLRC fGlRenderContext;
+    static ATOM gWC;
+    SkWGLPbufferContext* fPbufferContext;
+};
+
+ATOM WinGLContext::gWC = 0;
+
+WinGLContext::WinGLContext(GrGLStandard forcedGpuAPI)
+    : fWindow(nullptr)
+    , fDeviceContext(nullptr)
     , fGlRenderContext(0)
-    , fPbufferContext(NULL) {
-}
-
-SkNativeGLContext::~SkNativeGLContext() {
-    this->destroyGLContext();
-}
-
-void SkNativeGLContext::destroyGLContext() {
-    SkSafeSetNull(fPbufferContext);
-    if (fGlRenderContext) {
-        wglDeleteContext(fGlRenderContext);
-        fGlRenderContext = 0;
-    }
-    if (fWindow && fDeviceContext) {
-        ReleaseDC(fWindow, fDeviceContext);
-        fDeviceContext = 0;
-    }
-    if (fWindow) {
-        DestroyWindow(fWindow);
-        fWindow = 0;
-    }
-}
-
-const GrGLInterface* SkNativeGLContext::createGLContext(GrGLStandard forcedGpuAPI) {
-    HINSTANCE hInstance = (HINSTANCE)GetModuleHandle(NULL);
+    , fPbufferContext(nullptr) {
+    HINSTANCE hInstance = (HINSTANCE)GetModuleHandle(nullptr);
 
     if (!gWC) {
         WNDCLASS wc;
         wc.cbClsExtra = 0;
         wc.cbWndExtra = 0;
-        wc.hbrBackground = NULL;
-        wc.hCursor = LoadCursor(NULL, IDC_ARROW);
-        wc.hIcon = LoadIcon(NULL, IDI_APPLICATION);
+        wc.hbrBackground = nullptr;
+        wc.hCursor = LoadCursor(nullptr, IDC_ARROW);
+        wc.hIcon = LoadIcon(nullptr, IDI_APPLICATION);
         wc.hInstance = hInstance;
         wc.lpfnWndProc = (WNDPROC) DefWindowProc;
         wc.lpszClassName = TEXT("Griffin");
-        wc.lpszMenuName = NULL;
+        wc.lpszMenuName = nullptr;
         wc.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC;
 
         gWC = RegisterClass(&wc);
         if (!gWC) {
             SkDebugf("Could not register window class.\n");
-            return NULL;
+            return;
         }
     }
 
@@ -78,16 +69,16 @@ const GrGLInterface* SkNativeGLContext::createGLContext(GrGLStandard forcedGpuAP
                                  TEXT("The Invisible Man"),
                                  WS_OVERLAPPEDWINDOW,
                                  0, 0, 1, 1,
-                                 NULL, NULL,
-                                 hInstance, NULL))) {
+                                 nullptr, nullptr,
+                                 hInstance, nullptr))) {
         SkDebugf("Could not create window.\n");
-        return NULL;
+        return;
     }
 
     if (!(fDeviceContext = GetDC(fWindow))) {
         SkDebugf("Could not get device context.\n");
         this->destroyGLContext();
-        return NULL;
+        return;
     }
     // Requesting a Core profile would bar us from using NVPR. So we request
     // compatibility profile or GL ES.
@@ -100,11 +91,11 @@ const GrGLInterface* SkNativeGLContext::createGLContext(GrGLStandard forcedGpuAP
     HDC dc;
     HGLRC glrc;
 
-    if (NULL == fPbufferContext) {
+    if (nullptr == fPbufferContext) {
         if (!(fGlRenderContext = SkCreateWGLContext(fDeviceContext, 0, contextType))) {
             SkDebugf("Could not create rendering context.\n");
             this->destroyGLContext();
-            return NULL;
+            return;
         }
         dc = fDeviceContext;
         glrc = fGlRenderContext;
@@ -121,24 +112,50 @@ const GrGLInterface* SkNativeGLContext::createGLContext(GrGLStandard forcedGpuAP
     if (!(wglMakeCurrent(dc, glrc))) {
         SkDebugf("Could not set the context.\n");
         this->destroyGLContext();
-        return NULL;
+        return;
     }
 
-    const GrGLInterface* interface = GrGLCreateNativeInterface();
-    if (NULL == interface) {
+    SkAutoTUnref<const GrGLInterface> gl(GrGLCreateNativeInterface());
+    if (nullptr == gl.get()) {
         SkDebugf("Could not create GL interface.\n");
         this->destroyGLContext();
-        return NULL;
+        return;
+    }
+    if (!gl->validate()) {
+        SkDebugf("Could not validate GL interface.\n");
+        this->destroyGLContext();
+        return;
     }
 
-    return interface;
+    this->init(gl.detach());
 }
 
-void SkNativeGLContext::makeCurrent() const {
+WinGLContext::~WinGLContext() {
+    this->teardown();
+    this->destroyGLContext();
+}
+
+void WinGLContext::destroyGLContext() {
+    SkSafeSetNull(fPbufferContext);
+    if (fGlRenderContext) {
+        wglDeleteContext(fGlRenderContext);
+        fGlRenderContext = 0;
+    }
+    if (fWindow && fDeviceContext) {
+        ReleaseDC(fWindow, fDeviceContext);
+        fDeviceContext = 0;
+    }
+    if (fWindow) {
+        DestroyWindow(fWindow);
+        fWindow = 0;
+    }
+}
+
+void WinGLContext::onPlatformMakeCurrent() const {
     HDC dc;
     HGLRC glrc;
 
-    if (NULL == fPbufferContext) {
+    if (nullptr == fPbufferContext) {
         dc = fDeviceContext;
         glrc = fGlRenderContext;
     } else {
@@ -151,10 +168,10 @@ void SkNativeGLContext::makeCurrent() const {
     }
 }
 
-void SkNativeGLContext::swapBuffers() const {
+void WinGLContext::onPlatformSwapBuffers() const {
     HDC dc;
 
-    if (NULL == fPbufferContext) {
+    if (nullptr == fPbufferContext) {
         dc = fDeviceContext;
     } else {
         dc = fPbufferContext->getDC();
@@ -163,3 +180,19 @@ void SkNativeGLContext::swapBuffers() const {
         SkDebugf("Could not complete SwapBuffers.\n");
     }
 }
+
+GrGLFuncPtr WinGLContext::onPlatformGetProcAddress(const char* name) const {
+    return reinterpret_cast<GrGLFuncPtr>(wglGetProcAddress(name));
+}
+
+} // anonymous namespace
+
+SkGLContext* SkCreatePlatformGLContext(GrGLStandard forcedGpuAPI) {
+    WinGLContext* ctx = new WinGLContext(forcedGpuAPI);
+    if (!ctx->isValid()) {
+        delete ctx;
+        return nullptr;
+    }
+    return ctx;
+}
+
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSL.cpp b/gfx/skia/skia/src/gpu/glsl/GrGLSL.cpp
new file mode 100644
index 000000000000..2de81ddd60ef
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSL.cpp
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrGLSL.h"
+#include "GrGLSLCaps.h"
+#include "SkString.h"
+
+bool GrGLSLSupportsNamedFragmentShaderOutputs(GrGLSLGeneration gen) {
+    switch (gen) {
+        case k110_GrGLSLGeneration:
+            return false;
+        case k130_GrGLSLGeneration:
+        case k140_GrGLSLGeneration:
+        case k150_GrGLSLGeneration:
+        case k330_GrGLSLGeneration:
+        case k310es_GrGLSLGeneration:
+            return true;
+    }
+    return false;
+}
+
+void GrGLSLAppendDefaultFloatPrecisionDeclaration(GrSLPrecision p,
+                                                  const GrGLSLCaps& glslCaps,
+                                                  SkString* out) {
+    if (glslCaps.usesPrecisionModifiers()) {
+        switch (p) {
+            case kHigh_GrSLPrecision:
+                out->append("precision highp float;\n");
+                break;
+            case kMedium_GrSLPrecision:
+                out->append("precision mediump float;\n");
+                break;
+            case kLow_GrSLPrecision:
+                out->append("precision lowp float;\n");
+                break;
+            default:
+                SkFAIL("Unknown precision value.");
+        }
+    }
+}
+
+void GrGLSLMulVarBy4f(SkString* outAppend, const char* vec4VarName, const GrGLSLExpr4& mulFactor) {
+    if (mulFactor.isOnes()) {
+        *outAppend = SkString();
+    }
+
+    if (mulFactor.isZeros()) {
+        outAppend->appendf("%s = vec4(0);", vec4VarName);
+    } else {
+        outAppend->appendf("%s *= %s;", vec4VarName, mulFactor.c_str());
+    }
+}
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLSL.h b/gfx/skia/skia/src/gpu/glsl/GrGLSL.h
similarity index 86%
rename from gfx/skia/skia/src/gpu/gl/GrGLSL.h
rename to gfx/skia/skia/src/gpu/glsl/GrGLSL.h
index ff39c2b68007..ac38522ca140 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLSL.h
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSL.h
@@ -8,13 +8,10 @@
 #ifndef GrGLSL_DEFINED
 #define GrGLSL_DEFINED
 
-#include "gl/GrGLInterface.h"
-#include "GrColor.h"
 #include "GrTypesPriv.h"
 #include "SkString.h"
 
-class GrGLContextInfo;
-class GrGLShaderVar;
+class GrGLSLCaps;
 
 // Limited set of GLSL versions we build shaders for. Caller should round
 // down the GLSL version to one of these enums.
@@ -35,18 +32,37 @@ enum GrGLSLGeneration {
      * Desktop GLSL 1.50
      */
     k150_GrGLSLGeneration,
+    /**
+     * Desktop GLSL 3.30, and ES GLSL 3.00
+     */
+    k330_GrGLSLGeneration,
+    /**
+     * ES GLSL 3.10 only TODO Make GLSLCap objects to make this more granular
+     */
+    k310es_GrGLSLGeneration,
 };
 
-/**
- * Gets the most recent GLSL Generation compatible with the OpenGL context.
- */
-bool GrGetGLSLGeneration(const GrGLInterface* gl, GrGLSLGeneration* generation);
+bool GrGLSLSupportsNamedFragmentShaderOutputs(GrGLSLGeneration);
 
 /**
- * Returns a string to include at the beginning of a shader to declare the GLSL
- * version.
+ * Gets the name of the function that should be used to sample a 2D texture. Coord type is used
+ * to indicate whether the texture is sampled using projective textured (kVec3f) or not (kVec2f).
  */
-const char* GrGetGLSLVersionDecl(const GrGLContextInfo&);
+inline const char* GrGLSLTexture2DFunctionName(GrSLType coordType, GrGLSLGeneration glslGen) {
+    if (kVec2f_GrSLType == coordType) {
+        return glslGen >= k130_GrGLSLGeneration ? "texture" : "texture2D";
+    } else {
+        SkASSERT(kVec3f_GrSLType == coordType);
+        return glslGen >= k130_GrGLSLGeneration ? "textureProj" : "texture2DProj";
+    }
+}
+
+/**
+ * Adds a line of GLSL code to declare the default precision for float types.
+ */
+void GrGLSLAppendDefaultFloatPrecisionDeclaration(GrSLPrecision,
+                                                  const GrGLSLCaps& glslCaps,
+                                                  SkString* out);
 
 /**
  * Converts a GrSLType to a string containing the name of the equivalent GLSL type.
@@ -69,6 +85,8 @@ static inline const char* GrGLSLTypeString(GrSLType t) {
             return "mat4";
         case kSampler2D_GrSLType:
             return "sampler2D";
+        case kSamplerExternal_GrSLType:
+            return "samplerExternalOES";
         default:
             SkFAIL("Unknown shader var type.");
             return ""; // suppress warning
@@ -98,6 +116,10 @@ public:
         return fExpr.c_str();
     }
 
+    bool isValid() const {
+        return kFullExpr_ExprType != fType || !fExpr.isEmpty();
+    }
+
 protected:
     /** Constructs an invalid expression.
      * Useful only as a return value from functions that never actually return
@@ -124,7 +146,7 @@ protected:
      * Argument expr is a simple expression or a parenthesized expression. */
     // TODO: make explicit once effects input Exprs.
     GrGLSLExpr(const char expr[]) {
-        if (NULL == expr) {  // TODO: remove this once effects input Exprs.
+        if (nullptr == expr) {  // TODO: remove this once effects input Exprs.
             fType = kOnes_ExprType;
         } else {
             fType = kFullExpr_ExprType;
@@ -158,10 +180,6 @@ protected:
         fExpr.appendf(format, in0, in1);
     }
 
-    bool isValid() const {
-        return kFullExpr_ExprType != fType || !fExpr.isEmpty();
-    }
-
     /** Returns expression casted to another type.
      * Generic implementation that is called for non-trivial cases of casts. */
     template <typename T>
@@ -310,10 +328,9 @@ private:
 
 /**
  * Does an inplace mul, *=, of vec4VarName by mulFactor.
- * A semicolon and newline are added after the assignment.
+ * A semicolon is added after the assignment.
  */
-void GrGLSLMulVarBy4f(SkString* outAppend, unsigned tabCnt,
-                      const char* vec4VarName, const GrGLSLExpr4& mulFactor);
+void GrGLSLMulVarBy4f(SkString* outAppend, const char* vec4VarName, const GrGLSLExpr4& mulFactor);
 
 #include "GrGLSL_impl.h"
 
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLBlend.cpp b/gfx/skia/skia/src/gpu/glsl/GrGLSLBlend.cpp
new file mode 100644
index 000000000000..6937977a948a
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLBlend.cpp
@@ -0,0 +1,482 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "GrGLSLBlend.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+
+//////////////////////////////////////////////////////////////////////////////
+//  Advanced (non-coeff) blend helpers
+//////////////////////////////////////////////////////////////////////////////
+
+static void hard_light(GrGLSLFragmentBuilder* fsBuilder,
+                       const char* final,
+                       const char* src,
+                       const char* dst) {
+    static const char kComponents[] = { 'r', 'g', 'b' };
+    for (size_t i = 0; i < SK_ARRAY_COUNT(kComponents); ++i) {
+        char component = kComponents[i];
+        fsBuilder->codeAppendf("if (2.0 * %s.%c <= %s.a) {", src, component, src);
+        fsBuilder->codeAppendf("%s.%c = 2.0 * %s.%c * %s.%c;",
+                               final, component, src, component, dst, component);
+        fsBuilder->codeAppend("} else {");
+        fsBuilder->codeAppendf("%s.%c = %s.a * %s.a - 2.0 * (%s.a - %s.%c) * (%s.a - %s.%c);",
+                               final, component, src, dst, dst, dst, component, src, src,
+                               component);
+        fsBuilder->codeAppend("}");
+    }
+    fsBuilder->codeAppendf("%s.rgb += %s.rgb * (1.0 - %s.a) + %s.rgb * (1.0 - %s.a);",
+                           final, src, dst, dst, src);
+}
+
+// Does one component of color-dodge
+static void color_dodge_component(GrGLSLFragmentBuilder* fsBuilder,
+                                  const char* final,
+                                  const char* src,
+                                  const char* dst,
+                                  const char component) {
+    fsBuilder->codeAppendf("if (0.0 == %s.%c) {", dst, component);
+    fsBuilder->codeAppendf("%s.%c = %s.%c * (1.0 - %s.a);",
+                           final, component, src, component, dst);
+    fsBuilder->codeAppend("} else {");
+    fsBuilder->codeAppendf("float d = %s.a - %s.%c;", src, src, component);
+    fsBuilder->codeAppend("if (0.0 == d) {");
+    fsBuilder->codeAppendf("%s.%c = %s.a * %s.a + %s.%c * (1.0 - %s.a) + %s.%c * (1.0 - %s.a);",
+                           final, component, src, dst, src, component, dst, dst, component,
+                           src);
+    fsBuilder->codeAppend("} else {");
+    fsBuilder->codeAppendf("d = min(%s.a, %s.%c * %s.a / d);",
+                           dst, dst, component, src);
+    fsBuilder->codeAppendf("%s.%c = d * %s.a + %s.%c * (1.0 - %s.a) + %s.%c * (1.0 - %s.a);",
+                           final, component, src, src, component, dst, dst, component, src);
+    fsBuilder->codeAppend("}");
+    fsBuilder->codeAppend("}");
+}
+
+// Does one component of color-burn
+static void color_burn_component(GrGLSLFragmentBuilder* fsBuilder,
+                                 const char* final,
+                                 const char* src,
+                                 const char* dst,
+                                 const char component) {
+    fsBuilder->codeAppendf("if (%s.a == %s.%c) {", dst, dst, component);
+    fsBuilder->codeAppendf("%s.%c = %s.a * %s.a + %s.%c * (1.0 - %s.a) + %s.%c * (1.0 - %s.a);",
+                           final, component, src, dst, src, component, dst, dst, component,
+                           src);
+    fsBuilder->codeAppendf("} else if (0.0 == %s.%c) {", src, component);
+    fsBuilder->codeAppendf("%s.%c = %s.%c * (1.0 - %s.a);",
+                           final, component, dst, component, src);
+    fsBuilder->codeAppend("} else {");
+    fsBuilder->codeAppendf("float d = max(0.0, %s.a - (%s.a - %s.%c) * %s.a / %s.%c);",
+                           dst, dst, dst, component, src, src, component);
+    fsBuilder->codeAppendf("%s.%c = %s.a * d + %s.%c * (1.0 - %s.a) + %s.%c * (1.0 - %s.a);",
+                           final, component, src, src, component, dst, dst, component, src);
+    fsBuilder->codeAppend("}");
+}
+
+// Does one component of soft-light. Caller should have already checked that dst alpha > 0.
+static void soft_light_component_pos_dst_alpha(GrGLSLFragmentBuilder* fsBuilder,
+                                               const char* final,
+                                               const char* src,
+                                               const char* dst,
+                                               const char component) {
+    // if (2S < Sa)
+    fsBuilder->codeAppendf("if (2.0 * %s.%c <= %s.a) {", src, component, src);
+    // (D^2 (Sa-2 S))/Da+(1-Da) S+D (-Sa+2 S+1)
+    fsBuilder->codeAppendf("%s.%c = (%s.%c*%s.%c*(%s.a - 2.0*%s.%c)) / %s.a +"
+                           "(1.0 - %s.a) * %s.%c + %s.%c*(-%s.a + 2.0*%s.%c + 1.0);",
+                           final, component, dst, component, dst, component, src, src,
+                           component, dst, dst, src, component, dst, component, src, src,
+                           component);
+    // else if (4D < Da)
+    fsBuilder->codeAppendf("} else if (4.0 * %s.%c <= %s.a) {",
+                           dst, component, dst);
+    fsBuilder->codeAppendf("float DSqd = %s.%c * %s.%c;",
+                           dst, component, dst, component);
+    fsBuilder->codeAppendf("float DCub = DSqd * %s.%c;", dst, component);
+    fsBuilder->codeAppendf("float DaSqd = %s.a * %s.a;", dst, dst);
+    fsBuilder->codeAppendf("float DaCub = DaSqd * %s.a;", dst);
+    // (Da^3 (-S)+Da^2 (S-D (3 Sa-6 S-1))+12 Da D^2 (Sa-2 S)-16 D^3 (Sa-2 S))/Da^2
+    fsBuilder->codeAppendf("%s.%c ="
+                           "(DaSqd*(%s.%c - %s.%c * (3.0*%s.a - 6.0*%s.%c - 1.0)) +"
+                           " 12.0*%s.a*DSqd*(%s.a - 2.0*%s.%c) - 16.0*DCub * (%s.a - 2.0*%s.%c) -"
+                           " DaCub*%s.%c) / DaSqd;",
+                           final, component, src, component, dst, component,
+                           src, src, component, dst, src, src, component, src, src,
+                           component, src, component);
+    fsBuilder->codeAppendf("} else {");
+    // -sqrt(Da * D) (Sa-2 S)-Da S+D (Sa-2 S+1)+S
+    fsBuilder->codeAppendf("%s.%c = %s.%c*(%s.a - 2.0*%s.%c + 1.0) + %s.%c -"
+                           " sqrt(%s.a*%s.%c)*(%s.a - 2.0*%s.%c) - %s.a*%s.%c;",
+                           final, component, dst, component, src, src, component, src, component,
+                           dst, dst, component, src, src, component, dst, src, component);
+    fsBuilder->codeAppendf("}");
+}
+
+// Adds a function that takes two colors and an alpha as input. It produces a color with the
+// hue and saturation of the first color, the luminosity of the second color, and the input
+// alpha. It has this signature:
+//      vec3 set_luminance(vec3 hueSatColor, float alpha, vec3 lumColor).
+static void add_lum_function(GrGLSLFragmentBuilder* fsBuilder, SkString* setLumFunction) {
+    // Emit a helper that gets the luminance of a color.
+    SkString getFunction;
+    GrGLSLShaderVar getLumArgs[] = {
+        GrGLSLShaderVar("color", kVec3f_GrSLType),
+    };
+    SkString getLumBody("return dot(vec3(0.3, 0.59, 0.11), color);");
+    fsBuilder->emitFunction(kFloat_GrSLType,
+                            "luminance",
+                            SK_ARRAY_COUNT(getLumArgs), getLumArgs,
+                            getLumBody.c_str(),
+                            &getFunction);
+
+    // Emit the set luminance function.
+    GrGLSLShaderVar setLumArgs[] = {
+        GrGLSLShaderVar("hueSat", kVec3f_GrSLType),
+        GrGLSLShaderVar("alpha", kFloat_GrSLType),
+        GrGLSLShaderVar("lumColor", kVec3f_GrSLType),
+    };
+    SkString setLumBody;
+    setLumBody.printf("float diff = %s(lumColor - hueSat);", getFunction.c_str());
+    setLumBody.append("vec3 outColor = hueSat + diff;");
+    setLumBody.appendf("float outLum = %s(outColor);", getFunction.c_str());
+    setLumBody.append("float minComp = min(min(outColor.r, outColor.g), outColor.b);"
+                      "float maxComp = max(max(outColor.r, outColor.g), outColor.b);"
+                      "if (minComp < 0.0 && outLum != minComp) {"
+                      "outColor = outLum + ((outColor - vec3(outLum, outLum, outLum)) * outLum) /"
+                      "(outLum - minComp);"
+                      "}"
+                      "if (maxComp > alpha && maxComp != outLum) {"
+                      "outColor = outLum +"
+                      "((outColor - vec3(outLum, outLum, outLum)) * (alpha - outLum)) /"
+                      "(maxComp - outLum);"
+                      "}"
+                      "return outColor;");
+    fsBuilder->emitFunction(kVec3f_GrSLType,
+                            "set_luminance",
+                            SK_ARRAY_COUNT(setLumArgs), setLumArgs,
+                            setLumBody.c_str(),
+                            setLumFunction);
+}
+
+// Adds a function that creates a color with the hue and luminosity of one input color and
+// the saturation of another color. It will have this signature:
+//      float set_saturation(vec3 hueLumColor, vec3 satColor)
+static void add_sat_function(GrGLSLFragmentBuilder* fsBuilder, SkString* setSatFunction) {
+    // Emit a helper that gets the saturation of a color
+    SkString getFunction;
+    GrGLSLShaderVar getSatArgs[] = { GrGLSLShaderVar("color", kVec3f_GrSLType) };
+    SkString getSatBody;
+    getSatBody.printf("return max(max(color.r, color.g), color.b) - "
+                      "min(min(color.r, color.g), color.b);");
+    fsBuilder->emitFunction(kFloat_GrSLType,
+                            "saturation",
+                            SK_ARRAY_COUNT(getSatArgs), getSatArgs,
+                            getSatBody.c_str(),
+                            &getFunction);
+
+    // Emit a helper that sets the saturation given sorted input channels. This used
+    // to use inout params for min, mid, and max components but that seems to cause
+    // problems on PowerVR drivers. So instead it returns a vec3 where r, g ,b are the
+    // adjusted min, mid, and max inputs, respectively.
+    SkString helperFunction;
+    GrGLSLShaderVar helperArgs[] = {
+        GrGLSLShaderVar("minComp", kFloat_GrSLType),
+        GrGLSLShaderVar("midComp", kFloat_GrSLType),
+        GrGLSLShaderVar("maxComp", kFloat_GrSLType),
+        GrGLSLShaderVar("sat", kFloat_GrSLType),
+    };
+    static const char kHelperBody[] = "if (minComp < maxComp) {"
+        "vec3 result;"
+        "result.r = 0.0;"
+        "result.g = sat * (midComp - minComp) / (maxComp - minComp);"
+        "result.b = sat;"
+        "return result;"
+        "} else {"
+        "return vec3(0, 0, 0);"
+        "}";
+    fsBuilder->emitFunction(kVec3f_GrSLType,
+                            "set_saturation_helper",
+                            SK_ARRAY_COUNT(helperArgs), helperArgs,
+                            kHelperBody,
+                            &helperFunction);
+
+    GrGLSLShaderVar setSatArgs[] = {
+        GrGLSLShaderVar("hueLumColor", kVec3f_GrSLType),
+        GrGLSLShaderVar("satColor", kVec3f_GrSLType),
+    };
+    const char* helpFunc = helperFunction.c_str();
+    SkString setSatBody;
+    setSatBody.appendf("float sat = %s(satColor);"
+                       "if (hueLumColor.r <= hueLumColor.g) {"
+                       "if (hueLumColor.g <= hueLumColor.b) {"
+                       "hueLumColor.rgb = %s(hueLumColor.r, hueLumColor.g, hueLumColor.b, sat);"
+                       "} else if (hueLumColor.r <= hueLumColor.b) {"
+                       "hueLumColor.rbg = %s(hueLumColor.r, hueLumColor.b, hueLumColor.g, sat);"
+                       "} else {"
+                       "hueLumColor.brg = %s(hueLumColor.b, hueLumColor.r, hueLumColor.g, sat);"
+                       "}"
+                       "} else if (hueLumColor.r <= hueLumColor.b) {"
+                       "hueLumColor.grb = %s(hueLumColor.g, hueLumColor.r, hueLumColor.b, sat);"
+                       "} else if (hueLumColor.g <= hueLumColor.b) {"
+                       "hueLumColor.gbr = %s(hueLumColor.g, hueLumColor.b, hueLumColor.r, sat);"
+                       "} else {"
+                       "hueLumColor.bgr = %s(hueLumColor.b, hueLumColor.g, hueLumColor.r, sat);"
+                       "}"
+                       "return hueLumColor;",
+                       getFunction.c_str(), helpFunc, helpFunc, helpFunc, helpFunc,
+                       helpFunc, helpFunc);
+    fsBuilder->emitFunction(kVec3f_GrSLType,
+                            "set_saturation",
+                            SK_ARRAY_COUNT(setSatArgs), setSatArgs,
+                            setSatBody.c_str(),
+                            setSatFunction);
+}
+
+static void emit_advanced_xfermode_code(GrGLSLFragmentBuilder* fsBuilder, const char* srcColor,
+                                        const char* dstColor, const char* outputColor,
+                                        SkXfermode::Mode mode) {
+    SkASSERT(srcColor);
+    SkASSERT(dstColor);
+    SkASSERT(outputColor);
+    // These all perform src-over on the alpha channel.
+    fsBuilder->codeAppendf("%s.a = %s.a + (1.0 - %s.a) * %s.a;",
+                           outputColor, srcColor, srcColor, dstColor);
+
+    switch (mode) {
+        case SkXfermode::kOverlay_Mode:
+            // Overlay is Hard-Light with the src and dst reversed
+            hard_light(fsBuilder, outputColor, dstColor, srcColor);
+            break;
+        case SkXfermode::kDarken_Mode:
+            fsBuilder->codeAppendf("%s.rgb = min((1.0 - %s.a) * %s.rgb + %s.rgb, "
+                                   "(1.0 - %s.a) * %s.rgb + %s.rgb);",
+                                   outputColor,
+                                   srcColor, dstColor, srcColor,
+                                   dstColor, srcColor, dstColor);
+            break;
+        case SkXfermode::kLighten_Mode:
+            fsBuilder->codeAppendf("%s.rgb = max((1.0 - %s.a) * %s.rgb + %s.rgb, "
+                                   "(1.0 - %s.a) * %s.rgb + %s.rgb);",
+                                   outputColor,
+                                   srcColor, dstColor, srcColor,
+                                   dstColor, srcColor, dstColor);
+            break;
+        case SkXfermode::kColorDodge_Mode:
+            color_dodge_component(fsBuilder, outputColor, srcColor, dstColor, 'r');
+            color_dodge_component(fsBuilder, outputColor, srcColor, dstColor, 'g');
+            color_dodge_component(fsBuilder, outputColor, srcColor, dstColor, 'b');
+            break;
+        case SkXfermode::kColorBurn_Mode:
+            color_burn_component(fsBuilder, outputColor, srcColor, dstColor, 'r');
+            color_burn_component(fsBuilder, outputColor, srcColor, dstColor, 'g');
+            color_burn_component(fsBuilder, outputColor, srcColor, dstColor, 'b');
+            break;
+        case SkXfermode::kHardLight_Mode:
+            hard_light(fsBuilder, outputColor, srcColor, dstColor);
+            break;
+        case SkXfermode::kSoftLight_Mode:
+            fsBuilder->codeAppendf("if (0.0 == %s.a) {", dstColor);
+            fsBuilder->codeAppendf("%s.rgba = %s;", outputColor, srcColor);
+            fsBuilder->codeAppendf("} else {");
+            soft_light_component_pos_dst_alpha(fsBuilder, outputColor, srcColor, dstColor, 'r');
+            soft_light_component_pos_dst_alpha(fsBuilder, outputColor, srcColor, dstColor, 'g');
+            soft_light_component_pos_dst_alpha(fsBuilder, outputColor, srcColor, dstColor, 'b');
+            fsBuilder->codeAppendf("}");
+            break;
+        case SkXfermode::kDifference_Mode:
+            fsBuilder->codeAppendf("%s.rgb = %s.rgb + %s.rgb -"
+                                   "2.0 * min(%s.rgb * %s.a, %s.rgb * %s.a);",
+                                   outputColor, srcColor, dstColor, srcColor, dstColor,
+                                   dstColor, srcColor);
+            break;
+        case SkXfermode::kExclusion_Mode:
+            fsBuilder->codeAppendf("%s.rgb = %s.rgb + %s.rgb - "
+                                   "2.0 * %s.rgb * %s.rgb;",
+                                   outputColor, dstColor, srcColor, dstColor, srcColor);
+            break;
+        case SkXfermode::kMultiply_Mode:
+            fsBuilder->codeAppendf("%s.rgb = (1.0 - %s.a) * %s.rgb + "
+                                   "(1.0 - %s.a) * %s.rgb + "
+                                   "%s.rgb * %s.rgb;",
+                                   outputColor, srcColor, dstColor, dstColor, srcColor,
+                                   srcColor, dstColor);
+            break;
+        case SkXfermode::kHue_Mode: {
+            //  SetLum(SetSat(S * Da, Sat(D * Sa)), Sa*Da, D*Sa) + (1 - Sa) * D + (1 - Da) * S
+            SkString setSat, setLum;
+            add_sat_function(fsBuilder, &setSat);
+            add_lum_function(fsBuilder, &setLum);
+            fsBuilder->codeAppendf("vec4 dstSrcAlpha = %s * %s.a;",
+                                   dstColor, srcColor);
+            fsBuilder->codeAppendf("%s.rgb = %s(%s(%s.rgb * %s.a, dstSrcAlpha.rgb),"
+                                   "dstSrcAlpha.a, dstSrcAlpha.rgb);",
+                                   outputColor, setLum.c_str(), setSat.c_str(), srcColor,
+                                   dstColor);
+            fsBuilder->codeAppendf("%s.rgb += (1.0 - %s.a) * %s.rgb + (1.0 - %s.a) * %s.rgb;",
+                                   outputColor, srcColor, dstColor, dstColor, srcColor);
+            break;
+        }
+        case SkXfermode::kSaturation_Mode: {
+            // SetLum(SetSat(D * Sa, Sat(S * Da)), Sa*Da, D*Sa)) + (1 - Sa) * D + (1 - Da) * S
+            SkString setSat, setLum;
+            add_sat_function(fsBuilder, &setSat);
+            add_lum_function(fsBuilder, &setLum);
+            fsBuilder->codeAppendf("vec4 dstSrcAlpha = %s * %s.a;",
+                                   dstColor, srcColor);
+            fsBuilder->codeAppendf("%s.rgb = %s(%s(dstSrcAlpha.rgb, %s.rgb * %s.a),"
+                                   "dstSrcAlpha.a, dstSrcAlpha.rgb);",
+                                   outputColor, setLum.c_str(), setSat.c_str(), srcColor,
+                                   dstColor);
+            fsBuilder->codeAppendf("%s.rgb += (1.0 - %s.a) * %s.rgb + (1.0 - %s.a) * %s.rgb;",
+                                   outputColor, srcColor, dstColor, dstColor, srcColor);
+            break;
+        }
+        case SkXfermode::kColor_Mode: {
+            //  SetLum(S * Da, Sa* Da, D * Sa) + (1 - Sa) * D + (1 - Da) * S
+            SkString setLum;
+            add_lum_function(fsBuilder, &setLum);
+            fsBuilder->codeAppendf("vec4 srcDstAlpha = %s * %s.a;",
+                                   srcColor, dstColor);
+            fsBuilder->codeAppendf("%s.rgb = %s(srcDstAlpha.rgb, srcDstAlpha.a, %s.rgb * %s.a);",
+                                   outputColor, setLum.c_str(), dstColor, srcColor);
+            fsBuilder->codeAppendf("%s.rgb += (1.0 - %s.a) * %s.rgb + (1.0 - %s.a) * %s.rgb;",
+                                   outputColor, srcColor, dstColor, dstColor, srcColor);
+            break;
+        }
+        case SkXfermode::kLuminosity_Mode: {
+            //  SetLum(D * Sa, Sa* Da, S * Da) + (1 - Sa) * D + (1 - Da) * S
+            SkString setLum;
+            add_lum_function(fsBuilder, &setLum);
+            fsBuilder->codeAppendf("vec4 srcDstAlpha = %s * %s.a;",
+                                   srcColor, dstColor);
+            fsBuilder->codeAppendf("%s.rgb = %s(%s.rgb * %s.a, srcDstAlpha.a, srcDstAlpha.rgb);",
+                                   outputColor, setLum.c_str(), dstColor, srcColor);
+            fsBuilder->codeAppendf("%s.rgb += (1.0 - %s.a) * %s.rgb + (1.0 - %s.a) * %s.rgb;",
+                                   outputColor, srcColor, dstColor, dstColor, srcColor);
+            break;
+        }
+        default:
+            SkFAIL("Unknown Custom Xfer mode.");
+            break;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+//  Porter-Duff blend helper
+//////////////////////////////////////////////////////////////////////////////
+
+static bool append_porterduff_term(GrGLSLFragmentBuilder* fsBuilder, SkXfermode::Coeff coeff,
+                                   const char* colorName, const char* srcColorName,
+                                   const char* dstColorName, bool hasPrevious) {
+    if (SkXfermode::kZero_Coeff == coeff) {
+        return hasPrevious;
+    } else {
+        if (hasPrevious) {
+            fsBuilder->codeAppend(" + ");
+        }
+        fsBuilder->codeAppendf("%s", colorName);
+        switch (coeff) {
+            case SkXfermode::kOne_Coeff:
+                break;
+            case SkXfermode::kSC_Coeff:
+                fsBuilder->codeAppendf(" * %s", srcColorName);
+                break;
+            case SkXfermode::kISC_Coeff:
+                fsBuilder->codeAppendf(" * (vec4(1.0) - %s)", srcColorName);
+                break;
+            case SkXfermode::kDC_Coeff:
+                fsBuilder->codeAppendf(" * %s", dstColorName);
+                break;
+            case SkXfermode::kIDC_Coeff:
+                fsBuilder->codeAppendf(" * (vec4(1.0) - %s)", dstColorName);
+                break;
+            case SkXfermode::kSA_Coeff:
+                fsBuilder->codeAppendf(" * %s.a", srcColorName);
+                break;
+            case SkXfermode::kISA_Coeff:
+                fsBuilder->codeAppendf(" * (1.0 - %s.a)", srcColorName);
+                break;
+            case SkXfermode::kDA_Coeff:
+                fsBuilder->codeAppendf(" * %s.a", dstColorName);
+                break;
+            case SkXfermode::kIDA_Coeff:
+                fsBuilder->codeAppendf(" * (1.0 - %s.a)", dstColorName);
+                break;
+            default:
+                SkFAIL("Unsupported Blend Coeff");
+        }
+        return true;
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+void GrGLSLBlend::AppendMode(GrGLSLFragmentBuilder* fsBuilder, const char* srcColor,
+                             const char* dstColor, const char* outColor,
+                             SkXfermode::Mode mode) {
+
+    SkXfermode::Coeff srcCoeff, dstCoeff;
+    if (SkXfermode::ModeAsCoeff(mode, &srcCoeff, &dstCoeff)) {
+        fsBuilder->codeAppendf("%s = ", outColor);
+        // append src blend
+        bool didAppend = append_porterduff_term(fsBuilder, srcCoeff, srcColor, srcColor, dstColor,
+                                                false);
+        // append dst blend
+        if(!append_porterduff_term(fsBuilder, dstCoeff, dstColor, srcColor, dstColor, didAppend)) {
+            fsBuilder->codeAppend("vec4(0, 0, 0, 0)");
+        }
+        fsBuilder->codeAppend(";");
+    } else {
+        emit_advanced_xfermode_code(fsBuilder, srcColor, dstColor, outColor, mode);
+    }
+}
+
+void GrGLSLBlend::AppendRegionOp(GrGLSLFragmentBuilder* fsBuilder, const char* srcColor,
+                                 const char* dstColor, const char* outColor,
+                                 SkRegion::Op regionOp) {
+    SkXfermode::Coeff srcCoeff, dstCoeff;
+    switch (regionOp) {
+        case SkRegion::kReplace_Op:
+            srcCoeff = SkXfermode::kOne_Coeff;
+            dstCoeff = SkXfermode::kZero_Coeff;
+            break;
+        case SkRegion::kIntersect_Op:
+            srcCoeff = SkXfermode::kDC_Coeff;
+            dstCoeff = SkXfermode::kZero_Coeff;
+            break;
+        case SkRegion::kUnion_Op:
+            srcCoeff = SkXfermode::kOne_Coeff;
+            dstCoeff = SkXfermode::kISC_Coeff;
+            break;
+        case SkRegion::kXOR_Op:
+            srcCoeff = SkXfermode::kIDC_Coeff;
+            dstCoeff = SkXfermode::kISC_Coeff;
+            break;
+        case SkRegion::kDifference_Op:
+            srcCoeff = SkXfermode::kZero_Coeff;
+            dstCoeff = SkXfermode::kISC_Coeff;
+            break;
+        case SkRegion::kReverseDifference_Op:
+            srcCoeff = SkXfermode::kIDC_Coeff;
+            dstCoeff = SkXfermode::kZero_Coeff;
+            break;
+        default:
+            SkFAIL("Unsupported Op");
+            // We should never get here but to make compiler happy
+            srcCoeff = SkXfermode::kZero_Coeff;
+            dstCoeff = SkXfermode::kZero_Coeff;
+    }
+    fsBuilder->codeAppendf("%s = ", outColor);
+    // append src blend
+    bool didAppend = append_porterduff_term(fsBuilder, srcCoeff, srcColor, srcColor, dstColor,
+                                            false);
+    // append dst blend
+    if(!append_porterduff_term(fsBuilder, dstCoeff, dstColor, srcColor, dstColor, didAppend)) {
+        fsBuilder->codeAppend("vec4(0, 0, 0, 0)");
+    }
+    fsBuilder->codeAppend(";");
+}
+
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLBlend.h b/gfx/skia/skia/src/gpu/glsl/GrGLSLBlend.h
new file mode 100644
index 000000000000..c8047f8af5f9
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLBlend.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGLBlend_DEFINED
+#define GrGLBlend_DEFINED
+
+#include "SkRegion.h"
+#include "SkXfermode.h"
+
+class GrGLSLFragmentBuilder;
+
+namespace GrGLSLBlend {
+    /*
+     * Appends GLSL code to fsBuilder that assigns a specified blend of the srcColor and dstColor
+     * variables to the outColor variable.
+     */
+    void AppendMode(GrGLSLFragmentBuilder* fsBuilder, const char* srcColor,
+                    const char* dstColor, const char* outColor, SkXfermode::Mode mode);
+
+    void AppendRegionOp(GrGLSLFragmentBuilder* fsBuilder, const char* srcColor,
+                        const char* dstColor, const char* outColor, SkRegion::Op regionOp);
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLCaps.cpp b/gfx/skia/skia/src/gpu/glsl/GrGLSLCaps.cpp
new file mode 100755
index 000000000000..191fb567e6d8
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLCaps.cpp
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+
+#include "GrGLSLCaps.h"
+
+#include "GrContextOptions.h"
+
+////////////////////////////////////////////////////////////////////////////////////////////
+
+GrGLSLCaps::GrGLSLCaps(const GrContextOptions& options) {
+    fGLSLGeneration = k330_GrGLSLGeneration;
+
+    fDropsTileOnZeroDivide = false;
+    fFBFetchSupport = false;
+    fFBFetchNeedsCustomOutput = false;
+    fBindlessTextureSupport = false;
+    fUsesPrecisionModifiers = false;
+    fCanUseAnyFunctionInShader = true;
+    fForceHighPrecisionNDSTransform = false;
+    fCanUseMinAndAbsTogether = true;
+    fMustForceNegatedAtanParamToFloat = false;
+    fVersionDeclString = nullptr;
+    fShaderDerivativeExtensionString = nullptr;
+    fFragCoordConventionsExtensionString = nullptr;
+    fSecondaryOutputExtensionString = nullptr;
+    fExternalTextureExtensionString = nullptr;
+    fFBFetchColorName = nullptr;
+    fFBFetchExtensionString = nullptr;
+    fAdvBlendEqInteraction = kNotSupported_AdvBlendEqInteraction;
+
+    fMustSwizzleInShader = false;
+    memset(fConfigSwizzle, 0, sizeof(fConfigSwizzle));
+}
+
+SkString GrGLSLCaps::dump() const {
+    SkString r = INHERITED::dump();
+
+    static const char* kAdvBlendEqInteractionStr[] = {
+        "Not Supported",
+        "Automatic",
+        "General Enable",
+        "Specific Enables",
+    };
+    GR_STATIC_ASSERT(0 == kNotSupported_AdvBlendEqInteraction);
+    GR_STATIC_ASSERT(1 == kAutomatic_AdvBlendEqInteraction);
+    GR_STATIC_ASSERT(2 == kGeneralEnable_AdvBlendEqInteraction);
+    GR_STATIC_ASSERT(3 == kSpecificEnables_AdvBlendEqInteraction);
+    GR_STATIC_ASSERT(SK_ARRAY_COUNT(kAdvBlendEqInteractionStr) == kLast_AdvBlendEqInteraction + 1);
+
+    r.appendf("--- GLSL-Specific ---\n");
+
+    r.appendf("FB Fetch Support: %s\n", (fFBFetchSupport ? "YES" : "NO"));
+    r.appendf("Drops tile on zero divide: %s\n", (fDropsTileOnZeroDivide ? "YES" : "NO"));
+    r.appendf("Bindless texture support: %s\n", (fBindlessTextureSupport ? "YES" : "NO"));
+    r.appendf("Uses precision modifiers: %s\n", (fUsesPrecisionModifiers ? "YES" : "NO"));
+    r.appendf("Can use any() function: %s\n", (fCanUseAnyFunctionInShader ? "YES" : "NO"));
+    r.appendf("Force high precision on NDS transform: %s\n", (fForceHighPrecisionNDSTransform ?
+                                                              "YES" : "NO"));
+    r.appendf("Can use min() and abs() together: %s\n", (fCanUseMinAndAbsTogether ? "YES" : "NO"));
+    r.appendf("Must force negated atan param to float: %s\n", (fMustForceNegatedAtanParamToFloat ?
+                                                               "YES" : "NO"));
+    r.appendf("Advanced blend equation interaction: %s\n",
+              kAdvBlendEqInteractionStr[fAdvBlendEqInteraction]);
+    return r;
+}
+
+void GrGLSLCaps::onApplyOptionsOverrides(const GrContextOptions& options) {
+    if (options.fUseShaderSwizzling) {
+        fMustSwizzleInShader = true;
+    }
+}
+
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLCaps.h b/gfx/skia/skia/src/gpu/glsl/GrGLSLCaps.h
new file mode 100755
index 000000000000..9924773139c0
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLCaps.h
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+
+#ifndef GrGLSLCaps_DEFINED
+#define GrGLSLCaps_DEFINED
+
+#include "GrCaps.h"
+#include "GrGLSL.h"
+
+class GrGLSLCaps : public GrShaderCaps {
+public:
+    
+
+    /**
+    * Indicates how GLSL must interact with advanced blend equations. The KHR extension requires
+    * special layout qualifiers in the fragment shader.
+    */
+    enum AdvBlendEqInteraction {
+        kNotSupported_AdvBlendEqInteraction,     //<! No _blend_equation_advanced extension
+        kAutomatic_AdvBlendEqInteraction,        //<! No interaction required
+        kGeneralEnable_AdvBlendEqInteraction,    //<! layout(blend_support_all_equations) out
+        kSpecificEnables_AdvBlendEqInteraction,  //<! Specific layout qualifiers per equation
+
+        kLast_AdvBlendEqInteraction = kSpecificEnables_AdvBlendEqInteraction
+    };
+
+    /**
+     * Initializes the GrGLSLCaps to a default set of features
+     */
+    GrGLSLCaps(const GrContextOptions&);
+
+    /**
+     * Some helper functions for encapsulating various extensions to read FB Buffer on openglES
+     *
+     * TODO(joshualitt) On desktop opengl 4.2+ we can achieve something similar to this effect
+     */
+    bool fbFetchSupport() const { return fFBFetchSupport; }
+
+    bool fbFetchNeedsCustomOutput() const { return fFBFetchNeedsCustomOutput; }
+
+    bool bindlessTextureSupport() const { return fBindlessTextureSupport; }
+
+    const char* versionDeclString() const { return fVersionDeclString; }
+
+    const char* fbFetchColorName() const { return fFBFetchColorName; }
+
+    const char* fbFetchExtensionString() const { return fFBFetchExtensionString; }
+
+    bool dropsTileOnZeroDivide() const { return fDropsTileOnZeroDivide; }
+
+    AdvBlendEqInteraction advBlendEqInteraction() const { return fAdvBlendEqInteraction; }
+
+    bool mustEnableAdvBlendEqs() const {
+        return fAdvBlendEqInteraction >= kGeneralEnable_AdvBlendEqInteraction;
+    }
+
+    bool mustEnableSpecificAdvBlendEqs() const {
+        return fAdvBlendEqInteraction == kSpecificEnables_AdvBlendEqInteraction;
+    }
+    
+    bool mustDeclareFragmentShaderOutput() const {
+        return fGLSLGeneration > k110_GrGLSLGeneration;
+    }
+
+    bool usesPrecisionModifiers() const { return fUsesPrecisionModifiers; }
+
+    // Returns whether we can use the glsl funciton any() in our shader code.
+    bool canUseAnyFunctionInShader() const { return fCanUseAnyFunctionInShader; }
+
+    bool forceHighPrecisionNDSTransform() const { return fForceHighPrecisionNDSTransform; }
+
+    bool canUseMinAndAbsTogether() const { return fCanUseMinAndAbsTogether; }
+
+    bool mustForceNegatedAtanParamToFloat() const { return fMustForceNegatedAtanParamToFloat; }
+
+    // Returns the string of an extension that must be enabled in the shader to support
+    // derivatives. If nullptr is returned then no extension needs to be enabled. Before calling
+    // this function, the caller should check that shaderDerivativeSupport exists.
+    const char* shaderDerivativeExtensionString() const {
+        SkASSERT(this->shaderDerivativeSupport());
+        return fShaderDerivativeExtensionString;
+    }
+    
+    // Returns the string of an extension that will do all necessary coord transfomations needed
+    // when reading the fragment position. If such an extension does not exisits, this function
+    // returns a nullptr, and all transforms of the frag position must be done manually in the
+    // shader.
+    const char* fragCoordConventionsExtensionString() const {
+        return fFragCoordConventionsExtensionString;
+    }
+
+    // This returns the name of an extension that must be enabled in the shader, if such a thing is
+    // required in order to use a secondary output in the shader. This returns a nullptr if no such
+    // extension is required. However, the return value of this function does not say whether dual
+    // source blending is supported.
+    const char* secondaryOutputExtensionString() const {
+        return fSecondaryOutputExtensionString;
+    }
+
+    const char* externalTextureExtensionString() const {
+        return fExternalTextureExtensionString;
+    }
+
+    bool mustSwizzleInShader() const { return fMustSwizzleInShader; }
+
+    /**
+     * Returns a string which represents how to map from an internal GLFormat to a given
+     * GrPixelConfig. The function mustSwizzleInShader determines whether this swizzle is applied
+     * in the generated shader code or using sample state in the 3D API.
+     */
+    const char* getSwizzleMap(GrPixelConfig config) const { return fConfigSwizzle[config]; }
+
+    GrGLSLGeneration generation() const { return fGLSLGeneration; }
+
+    /**
+    * Returns a string containing the caps info.
+    */
+    SkString dump() const override;
+
+private:
+    void onApplyOptionsOverrides(const GrContextOptions& options) override;
+
+    GrGLSLGeneration fGLSLGeneration;
+    
+    bool fDropsTileOnZeroDivide : 1;
+    bool fFBFetchSupport : 1;
+    bool fFBFetchNeedsCustomOutput : 1;
+    bool fBindlessTextureSupport : 1;
+    bool fUsesPrecisionModifiers : 1;
+    bool fCanUseAnyFunctionInShader : 1;
+    bool fForceHighPrecisionNDSTransform : 1;
+
+    // Used for specific driver bug work arounds
+    bool fCanUseMinAndAbsTogether : 1;
+    bool fMustForceNegatedAtanParamToFloat : 1;
+
+    const char* fVersionDeclString;
+
+    const char* fShaderDerivativeExtensionString;
+    const char* fFragCoordConventionsExtensionString;
+    const char* fSecondaryOutputExtensionString;
+    const char* fExternalTextureExtensionString;
+
+    const char* fFBFetchColorName;
+    const char* fFBFetchExtensionString;
+
+    AdvBlendEqInteraction fAdvBlendEqInteraction;
+
+    bool        fMustSwizzleInShader;
+    const char* fConfigSwizzle[kGrPixelConfigCnt];
+
+    friend class GrGLCaps;  // For initialization.
+
+    typedef GrShaderCaps INHERITED;
+};
+
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLFragmentProcessor.cpp b/gfx/skia/skia/src/gpu/glsl/GrGLSLFragmentProcessor.cpp
new file mode 100644
index 000000000000..a0019669f210
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLFragmentProcessor.cpp
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrGLSLFragmentProcessor.h"
+#include "GrFragmentProcessor.h"
+#include "GrProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+
+void GrGLSLFragmentProcessor::setData(const GrGLSLProgramDataManager& pdman,
+                                      const GrFragmentProcessor& processor) {
+    this->onSetData(pdman, processor);
+    SkASSERT(fChildProcessors.count() == processor.numChildProcessors());
+    for (int i = 0; i < fChildProcessors.count(); ++i) {
+        fChildProcessors[i]->setData(pdman, processor.childProcessor(i));
+    }
+}
+
+void GrGLSLFragmentProcessor::emitChild(int childIndex, const char* inputColor, EmitArgs& args) {
+    this->internalEmitChild(childIndex, inputColor, args.fOutputColor, args);
+}
+
+void GrGLSLFragmentProcessor::emitChild(int childIndex, const char* inputColor,
+                                        SkString* outputColor, EmitArgs& args) {
+
+    SkASSERT(outputColor);
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+    outputColor->append(fragBuilder->getMangleString());
+    fragBuilder->codeAppendf("vec4 %s;", outputColor->c_str());
+    this->internalEmitChild(childIndex, inputColor, outputColor->c_str(), args);
+}
+
+void GrGLSLFragmentProcessor::internalEmitChild(int childIndex, const char* inputColor,
+                                                const char* outputColor, EmitArgs& args) {
+    GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+
+    fragBuilder->onBeforeChildProcEmitCode();  // call first so mangleString is updated
+
+    const GrFragmentProcessor& childProc = args.fFp.childProcessor(childIndex);
+
+    /*
+     * We now want to find the subset of coords and samplers that belong to the child and its
+     * descendants and put that into childCoords and childSamplers. To do so, we'll do a forwards
+     * linear search.
+     *
+     * Explanation:
+     * Each GrFragmentProcessor has a copy of all the transforms and textures of itself and
+     * all procs in its subtree. For example, suppose we have frag proc A, who has two children B
+     * and D. B has a child C, and D has two children E and F. Each frag proc's transforms array
+     * contains its own transforms, followed by the transforms of all its descendants (i.e. preorder
+     * traversal). Suppose procs A, B, C, D, E, F have 1, 2, 1, 1, 3, 2 transforms respectively.
+     *
+     *                                   (A)
+     *                        [a1,b1,b2,c1,d1,e1,e2,e3,f1,f2]
+     *                                  /    \
+     *                                /        \
+     *                            (B)           (D)
+     *                        [b1,b2,c1]   [d1,e1,e2,e3,f1,f2]
+     *                          /             /    \
+     *                        /             /        \
+     *                      (C)          (E)          (F)
+     *                     [c1]      [e1,e2,e3]      [f1,f2]
+     *
+     * So if we're inside proc A's emitCode, and A is about to call emitCode on proc D, we want the
+     * EmitArgs that's passed onto D to only contain its and its descendants' coords. The
+     * EmitArgs given to A would contain the transforms [a1,b1,b2,c1,d1,e1,e2,e3,f1,f2], and we want
+     * to extract the subset [d1,e1,e2,e3,f1,f2] to pass on to D. We can do this with a linear
+     * search since we know that A has 1 transform (using A.numTransformsExclChildren()), and B's
+     * subtree has 3 transforms (using B.numTransforms()), so we know the start of D's transforms is
+     * 4 after the start of A's transforms.
+     * Textures work the same way as transforms.
+     */
+    int firstCoordAt = args.fFp.numTransformsExclChildren();
+    int firstSamplerAt = args.fFp.numTexturesExclChildren();
+    for (int i = 0; i < childIndex; ++i) {
+        firstCoordAt += args.fFp.childProcessor(i).numTransforms();
+        firstSamplerAt += args.fFp.childProcessor(i).numTextures();
+    }
+    GrGLSLTransformedCoordsArray childCoords;
+    TextureSamplerArray childSamplers;
+    if (childProc.numTransforms() > 0) {
+        childCoords.push_back_n(childProc.numTransforms(), &args.fCoords[firstCoordAt]);
+    }
+    if (childProc.numTextures() > 0) {
+        childSamplers.push_back_n(childProc.numTextures(), &args.fSamplers[firstSamplerAt]);
+    }
+
+    // emit the code for the child in its own scope
+    fragBuilder->codeAppend("{\n");
+    fragBuilder->codeAppendf("// Child Index %d (mangle: %s): %s\n", childIndex,
+                             fragBuilder->getMangleString().c_str(), childProc.name());
+    EmitArgs childArgs(args.fBuilder,
+                       fragBuilder,
+                       args.fGLSLCaps,
+                       childProc,
+                       outputColor,
+                       inputColor,
+                       childCoords,
+                       childSamplers);
+    this->childProcessor(childIndex)->emitCode(childArgs);
+    fragBuilder->codeAppend("}\n");
+
+    fragBuilder->onAfterChildProcEmitCode();
+}
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLFragmentProcessor.h b/gfx/skia/skia/src/gpu/glsl/GrGLSLFragmentProcessor.h
new file mode 100644
index 000000000000..0fd1ae3c32f7
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLFragmentProcessor.h
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGLSLFragmentProcessor_DEFINED
+#define GrGLSLFragmentProcessor_DEFINED
+
+#include "glsl/GrGLSLProcessorTypes.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+#include "glsl/GrGLSLTextureSampler.h"
+
+class GrProcessor;
+class GrProcessorKeyBuilder;
+class GrGLSLFPBuilder;
+class GrGLSLFragmentBuilder;
+class GrGLSLCaps;
+
+class GrGLSLFragmentProcessor {
+public:
+    GrGLSLFragmentProcessor() {}
+
+    virtual ~GrGLSLFragmentProcessor() {
+        for (int i = 0; i < fChildProcessors.count(); ++i) {
+            delete fChildProcessors[i];
+        }
+    }
+
+    typedef GrGLSLProgramDataManager::UniformHandle UniformHandle;
+    typedef GrGLSLTextureSampler::TextureSamplerArray TextureSamplerArray;
+
+    /** Called when the program stage should insert its code into the shaders. The code in each
+        shader will be in its own block ({}) and so locally scoped names will not collide across
+        stages.
+
+        @param builder      Interface used to emit code in the shaders.
+        @param processor    The processor that generated this program stage.
+        @param key          The key that was computed by GenKey() from the generating GrProcessor.
+        @param outputColor  A predefined vec4 in the FS in which the stage should place its output
+                            color (or coverage).
+        @param inputColor   A vec4 that holds the input color to the stage in the FS. This may be
+                            nullptr in which case the implied input is solid white (all ones).
+                            TODO: Better system for communicating optimization info (e.g. input
+                            color is solid white, trans black, known to be opaque, etc.) that allows
+                            the processor to communicate back similar known info about its output.
+        @param samplers     Contains one entry for each GrTextureAccess of the GrProcessor. These
+                            can be passed to the builder to emit texture reads in the generated
+                            code.
+     */
+
+    struct EmitArgs {
+        EmitArgs(GrGLSLFPBuilder* builder,
+                 GrGLSLFragmentBuilder* fragBuilder,
+                 const GrGLSLCaps* caps,
+                 const GrFragmentProcessor& fp,
+                 const char* outputColor,
+                 const char* inputColor,
+                 const GrGLSLTransformedCoordsArray& coords,
+                 const TextureSamplerArray& samplers)
+            : fBuilder(builder)
+            , fFragBuilder(fragBuilder)
+            , fGLSLCaps(caps)
+            , fFp(fp)
+            , fOutputColor(outputColor)
+            , fInputColor(inputColor)
+            , fCoords(coords)
+            , fSamplers(samplers) {}
+        GrGLSLFPBuilder* fBuilder;
+        GrGLSLFragmentBuilder* fFragBuilder;
+        const GrGLSLCaps* fGLSLCaps;
+        const GrFragmentProcessor& fFp;
+        const char* fOutputColor;
+        const char* fInputColor;
+        const GrGLSLTransformedCoordsArray& fCoords;
+        const TextureSamplerArray& fSamplers;
+    };
+
+    virtual void emitCode(EmitArgs&) = 0;
+
+    void setData(const GrGLSLProgramDataManager& pdman, const GrFragmentProcessor& processor);
+
+    static void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*) {}
+
+    int numChildProcessors() const { return fChildProcessors.count(); }
+
+    GrGLSLFragmentProcessor* childProcessor(int index) const {
+        return fChildProcessors[index];
+    }
+
+    /** Will emit the code of a child proc in its own scope. Pass in the parent's EmitArgs and
+     *  emitChild will automatically extract the coords and samplers of that child and pass them
+     *  on to the child's emitCode(). Also, any uniforms or functions emitted by the child will
+     *  have their names mangled to prevent redefinitions. The output color name is also mangled
+     *  therefore in an in/out param. It will be declared in mangled form by emitChild(). It is
+     *  legal to pass nullptr as inputColor, since all fragment processors are required to work
+     *  without an input color.
+     */
+    void emitChild(int childIndex, const char* inputColor, SkString* outputColor,
+                   EmitArgs& parentArgs);
+
+    /** Variation that uses the parent's output color variable to hold the child's output.*/
+    void emitChild(int childIndex, const char* inputColor, EmitArgs& parentArgs);
+
+protected:
+    /** A GrGLSLFragmentProcessor instance can be reused with any GrFragmentProcessor that produces
+    the same stage key; this function reads data from a GrFragmentProcessor and uploads any
+    uniform variables required by the shaders created in emitCode(). The GrFragmentProcessor
+    parameter is guaranteed to be of the same type that created this GrGLSLFragmentProcessor and
+    to have an identical processor key as the one that created this GrGLSLFragmentProcessor.  */
+    // TODO update this to pass in GrFragmentProcessor
+    virtual void onSetData(const GrGLSLProgramDataManager&, const GrProcessor&) {}
+
+private:
+    void internalEmitChild(int, const char*, const char*, EmitArgs&);
+
+    SkTArray<GrGLSLFragmentProcessor*, true> fChildProcessors;
+
+    friend class GrFragmentProcessor;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp b/gfx/skia/skia/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
new file mode 100644
index 000000000000..122db10ec99b
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
@@ -0,0 +1,262 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrGLSLFragmentShaderBuilder.h"
+#include "GrRenderTarget.h"
+#include "glsl/GrGLSL.h"
+#include "glsl/GrGLSLCaps.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLVarying.h"
+
+const char* GrGLSLFragmentShaderBuilder::kDstTextureColorName = "_dstColor";
+
+static const char* specific_layout_qualifier_name(GrBlendEquation equation) {
+    SkASSERT(GrBlendEquationIsAdvanced(equation));
+
+    static const char* kLayoutQualifierNames[] = {
+        "blend_support_screen",
+        "blend_support_overlay",
+        "blend_support_darken",
+        "blend_support_lighten",
+        "blend_support_colordodge",
+        "blend_support_colorburn",
+        "blend_support_hardlight",
+        "blend_support_softlight",
+        "blend_support_difference",
+        "blend_support_exclusion",
+        "blend_support_multiply",
+        "blend_support_hsl_hue",
+        "blend_support_hsl_saturation",
+        "blend_support_hsl_color",
+        "blend_support_hsl_luminosity"
+    };
+    return kLayoutQualifierNames[equation - kFirstAdvancedGrBlendEquation];
+
+    GR_STATIC_ASSERT(0 == kScreen_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    GR_STATIC_ASSERT(1 == kOverlay_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    GR_STATIC_ASSERT(2 == kDarken_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    GR_STATIC_ASSERT(3 == kLighten_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    GR_STATIC_ASSERT(4 == kColorDodge_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    GR_STATIC_ASSERT(5 == kColorBurn_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    GR_STATIC_ASSERT(6 == kHardLight_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    GR_STATIC_ASSERT(7 == kSoftLight_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    GR_STATIC_ASSERT(8 == kDifference_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    GR_STATIC_ASSERT(9 == kExclusion_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    GR_STATIC_ASSERT(10 == kMultiply_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    GR_STATIC_ASSERT(11 == kHSLHue_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    GR_STATIC_ASSERT(12 == kHSLSaturation_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    GR_STATIC_ASSERT(13 == kHSLColor_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    GR_STATIC_ASSERT(14 == kHSLLuminosity_GrBlendEquation - kFirstAdvancedGrBlendEquation);
+    GR_STATIC_ASSERT(SK_ARRAY_COUNT(kLayoutQualifierNames) ==
+                     kGrBlendEquationCnt - kFirstAdvancedGrBlendEquation);
+}
+
+GrGLSLFragmentShaderBuilder::FragPosKey
+GrGLSLFragmentShaderBuilder::KeyForFragmentPosition(const GrRenderTarget* dst) {
+    if (kTopLeft_GrSurfaceOrigin == dst->origin()) {
+        return kTopLeftFragPosRead_FragPosKey;
+    } else {
+        return kBottomLeftFragPosRead_FragPosKey;
+    }
+}
+
+GrGLSLFragmentShaderBuilder::GrGLSLFragmentShaderBuilder(GrGLSLProgramBuilder* program,
+                                                         uint8_t fragPosKey)
+    : INHERITED(program)
+    , fSetupFragPosition(false)
+    , fTopLeftFragPosRead(kTopLeftFragPosRead_FragPosKey == fragPosKey)
+    , fCustomColorOutputIndex(-1)
+    , fHasReadDstColor(false)
+    , fHasReadFragmentPosition(false) {
+}
+
+bool GrGLSLFragmentShaderBuilder::enableFeature(GLSLFeature feature) {
+    switch (feature) {
+        case kStandardDerivatives_GLSLFeature: {
+            if (!fProgramBuilder->glslCaps()->shaderDerivativeSupport()) {
+                return false;
+            }
+            const char* extension = fProgramBuilder->glslCaps()->shaderDerivativeExtensionString();
+            if (extension) {
+                this->addFeature(1 << kStandardDerivatives_GLSLFeature, extension);
+            }
+            return true;
+        }
+        default:
+            SkFAIL("Unexpected GLSLFeature requested.");
+            return false;
+    }
+}
+
+SkString GrGLSLFragmentShaderBuilder::ensureFSCoords2D(const GrGLSLTransformedCoordsArray& coords,
+                                                       int index) {
+    if (kVec3f_GrSLType != coords[index].getType()) {
+        SkASSERT(kVec2f_GrSLType == coords[index].getType());
+        return coords[index].getName();
+    }
+
+    SkString coords2D("coords2D");
+    if (0 != index) {
+        coords2D.appendf("_%i", index);
+    }
+    this->codeAppendf("\tvec2 %s = %s.xy / %s.z;",
+                      coords2D.c_str(), coords[index].c_str(), coords[index].c_str());
+    return coords2D;
+}
+
+const char* GrGLSLFragmentShaderBuilder::fragmentPosition() {
+    fHasReadFragmentPosition = true;
+
+    const GrGLSLCaps* glslCaps = fProgramBuilder->glslCaps();
+    // We only declare "gl_FragCoord" when we're in the case where we want to use layout qualifiers
+    // to reverse y. Otherwise it isn't necessary and whether the "in" qualifier appears in the
+    // declaration varies in earlier GLSL specs. So it is simpler to omit it.
+    if (fTopLeftFragPosRead) {
+        fSetupFragPosition = true;
+        return "gl_FragCoord";
+    } else if (const char* extension = glslCaps->fragCoordConventionsExtensionString()) {
+        if (!fSetupFragPosition) {
+            if (glslCaps->generation() < k150_GrGLSLGeneration) {
+                this->addFeature(1 << kFragCoordConventions_GLSLPrivateFeature,
+                                 extension);
+            }
+            fInputs.push_back().set(kVec4f_GrSLType,
+                                    GrGLSLShaderVar::kIn_TypeModifier,
+                                    "gl_FragCoord",
+                                    kDefault_GrSLPrecision,
+                                    GrGLSLShaderVar::kUpperLeft_Origin);
+            fSetupFragPosition = true;
+        }
+        return "gl_FragCoord";
+    } else {
+        static const char* kTempName = "tmpXYFragCoord";
+        static const char* kCoordName = "fragCoordYDown";
+        if (!fSetupFragPosition) {
+            SkASSERT(!fProgramBuilder->fUniformHandles.fRTHeightUni.isValid());
+            const char* rtHeightName;
+
+            fProgramBuilder->fUniformHandles.fRTHeightUni =
+                    fProgramBuilder->addFragPosUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                                       kFloat_GrSLType,
+                                                       kDefault_GrSLPrecision,
+                                                       "RTHeight",
+                                                       &rtHeightName);
+
+            // The Adreno compiler seems to be very touchy about access to "gl_FragCoord".
+            // Accessing glFragCoord.zw can cause a program to fail to link. Additionally,
+            // depending on the surrounding code, accessing .xy with a uniform involved can
+            // do the same thing. Copying gl_FragCoord.xy into a temp vec2 beforehand 
+            // (and only accessing .xy) seems to "fix" things.
+            this->codePrependf("\tvec4 %s = vec4(%s.x, %s - %s.y, 1.0, 1.0);\n",
+                               kCoordName, kTempName, rtHeightName, kTempName);
+            this->codePrependf("vec2 %s = gl_FragCoord.xy;", kTempName);
+            fSetupFragPosition = true;
+        }
+        SkASSERT(fProgramBuilder->fUniformHandles.fRTHeightUni.isValid());
+        return kCoordName;
+    }
+}
+
+const char* GrGLSLFragmentShaderBuilder::dstColor() {
+    fHasReadDstColor = true;
+
+    const GrGLSLCaps* glslCaps = fProgramBuilder->glslCaps();
+    if (glslCaps->fbFetchSupport()) {
+        this->addFeature(1 << (GrGLSLFragmentShaderBuilder::kLastGLSLPrivateFeature + 1),
+                         glslCaps->fbFetchExtensionString());
+
+        // Some versions of this extension string require declaring custom color output on ES 3.0+
+        const char* fbFetchColorName = glslCaps->fbFetchColorName();
+        if (glslCaps->fbFetchNeedsCustomOutput()) {
+            this->enableCustomOutput();
+            fOutputs[fCustomColorOutputIndex].setTypeModifier(GrShaderVar::kInOut_TypeModifier);
+            fbFetchColorName = DeclaredColorOutputName();
+        }
+        return fbFetchColorName;
+    } else {
+        return kDstTextureColorName;
+    } 
+}
+
+void GrGLSLFragmentShaderBuilder::enableAdvancedBlendEquationIfNeeded(GrBlendEquation equation) {
+    SkASSERT(GrBlendEquationIsAdvanced(equation));
+
+    const GrGLSLCaps& caps = *fProgramBuilder->glslCaps();
+    if (!caps.mustEnableAdvBlendEqs()) {
+        return;
+    }
+
+    this->addFeature(1 << kBlendEquationAdvanced_GLSLPrivateFeature,
+                     "GL_KHR_blend_equation_advanced");
+    if (caps.mustEnableSpecificAdvBlendEqs()) {
+        this->addLayoutQualifier(specific_layout_qualifier_name(equation), kOut_InterfaceQualifier);
+    } else {
+        this->addLayoutQualifier("blend_support_all_equations", kOut_InterfaceQualifier);
+    }
+}
+
+void GrGLSLFragmentShaderBuilder::enableCustomOutput() {
+    if (!fHasCustomColorOutput) {
+        fHasCustomColorOutput = true;
+        fCustomColorOutputIndex = fOutputs.count();
+        fOutputs.push_back().set(kVec4f_GrSLType,
+                                 GrGLSLShaderVar::kOut_TypeModifier,
+                                 DeclaredColorOutputName());
+    }
+}
+
+void GrGLSLFragmentShaderBuilder::enableSecondaryOutput() {
+    SkASSERT(!fHasSecondaryOutput);
+    fHasSecondaryOutput = true;
+    const GrGLSLCaps& caps = *fProgramBuilder->glslCaps();
+    if (const char* extension = caps.secondaryOutputExtensionString()) {
+        this->addFeature(1 << kBlendFuncExtended_GLSLPrivateFeature, extension);
+    }
+
+    // If the primary output is declared, we must declare also the secondary output
+    // and vice versa, since it is not allowed to use a built-in gl_FragColor and a custom
+    // output. The condition also co-incides with the condition in whici GLES SL 2.0
+    // requires the built-in gl_SecondaryFragColorEXT, where as 3.0 requires a custom output.
+    if (caps.mustDeclareFragmentShaderOutput()) {
+        fOutputs.push_back().set(kVec4f_GrSLType, GrGLSLShaderVar::kOut_TypeModifier,
+                                 DeclaredSecondaryColorOutputName());
+    }
+}
+
+const char* GrGLSLFragmentShaderBuilder::getPrimaryColorOutputName() const {
+    return fHasCustomColorOutput ? DeclaredColorOutputName() : "gl_FragColor";
+}
+
+const char* GrGLSLFragmentShaderBuilder::getSecondaryColorOutputName() const {
+    const GrGLSLCaps& caps = *fProgramBuilder->glslCaps();
+    return caps.mustDeclareFragmentShaderOutput() ? DeclaredSecondaryColorOutputName()
+                                                  : "gl_SecondaryFragColorEXT";
+}
+
+void GrGLSLFragmentShaderBuilder::onFinalize() {
+    fProgramBuilder->varyingHandler()->getFragDecls(&this->inputs(), &this->outputs());
+    GrGLSLAppendDefaultFloatPrecisionDeclaration(kDefault_GrSLPrecision,
+                                                 *fProgramBuilder->glslCaps(),
+                                                 &this->precisionQualifier());
+}
+
+void GrGLSLFragmentBuilder::onBeforeChildProcEmitCode() {
+    SkASSERT(fSubstageIndices.count() >= 1);
+    fSubstageIndices.push_back(0);
+    // second-to-last value in the fSubstageIndices stack is the index of the child proc
+    // at that level which is currently emitting code.
+    fMangleString.appendf("_c%d", fSubstageIndices[fSubstageIndices.count() - 2]);
+}
+
+void GrGLSLFragmentBuilder::onAfterChildProcEmitCode() {
+    SkASSERT(fSubstageIndices.count() >= 2);
+    fSubstageIndices.pop_back();
+    fSubstageIndices.back()++;
+    int removeAt = fMangleString.findLastOf('_');
+    fMangleString.remove(removeAt, fMangleString.size() - removeAt);
+}
+
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h b/gfx/skia/skia/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h
new file mode 100644
index 000000000000..a55fdd2860ac
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGLSLFragmentShaderBuilder_DEFINED
+#define GrGLSLFragmentShaderBuilder_DEFINED
+
+#include "GrGLSLShaderBuilder.h"
+
+#include "glsl/GrGLSLProcessorTypes.h"
+
+class GrRenderTarget;
+class GrGLSLVarying;
+
+/*
+ * This base class encapsulates the functionality which the GP uses to build fragment shaders
+ */
+class GrGLSLFragmentBuilder : public GrGLSLShaderBuilder {
+public:
+    GrGLSLFragmentBuilder(GrGLSLProgramBuilder* program)
+        : INHERITED(program)
+        , fHasCustomColorOutput(false)
+        , fHasSecondaryOutput(false) {
+        fSubstageIndices.push_back(0);
+    }
+    virtual ~GrGLSLFragmentBuilder() {}
+    /**
+     * Use of these features may require a GLSL extension to be enabled. Shaders may not compile
+     * if code is added that uses one of these features without calling enableFeature()
+     */
+    enum GLSLFeature {
+        kStandardDerivatives_GLSLFeature = 0,
+        kLastGLSLFeature = kStandardDerivatives_GLSLFeature
+    };
+
+    /**
+     * If the feature is supported then true is returned and any necessary #extension declarations
+     * are added to the shaders. If the feature is not supported then false will be returned.
+     */
+    virtual bool enableFeature(GLSLFeature) = 0;
+
+    /**
+     * This returns a variable name to access the 2D, perspective correct version of the coords in
+     * the fragment shader. If the coordinates at index are 3-dimensional, it immediately emits a
+     * perspective divide into the fragment shader (xy / z) to convert them to 2D.
+     */
+    virtual SkString ensureFSCoords2D(const GrGLSLTransformedCoordsArray& coords, int index) = 0;
+
+
+    /** Returns a variable name that represents the position of the fragment in the FS. The position
+        is in device space (e.g. 0,0 is the top left and pixel centers are at half-integers). */
+    virtual const char* fragmentPosition() = 0;
+
+    /**
+     * Fragment procs with child procs should call these functions before/after calling emitCode
+     * on a child proc.
+     */
+    void onBeforeChildProcEmitCode();
+    void onAfterChildProcEmitCode();
+
+    const SkString& getMangleString() const { return fMangleString; }
+
+    bool hasCustomColorOutput() const { return fHasCustomColorOutput; }
+    bool hasSecondaryOutput() const { return fHasSecondaryOutput; }
+
+protected:
+    bool fHasCustomColorOutput;
+    bool fHasSecondaryOutput;
+
+private:
+    /*
+     * State that tracks which child proc in the proc tree is currently emitting code.  This is
+     * used to update the fMangleString, which is used to mangle the names of uniforms and functions
+     * emitted by the proc.  fSubstageIndices is a stack: its count indicates how many levels deep
+     * we are in the tree, and its second-to-last value is the index of the child proc at that
+     * level which is currently emitting code. For example, if fSubstageIndices = [3, 1, 2, 0], that
+     * means we're currently emitting code for the base proc's 3rd child's 1st child's 2nd child.
+     */
+    SkTArray<int> fSubstageIndices;
+
+    /*
+     * The mangle string is used to mangle the names of uniforms/functions emitted by the child
+     * procs so no duplicate uniforms/functions appear in the generated shader program. The mangle
+     * string is simply based on fSubstageIndices. For example, if fSubstageIndices = [3, 1, 2, 0],
+     * then the manglestring will be "_c3_c1_c2", and any uniform/function emitted by that proc will
+     * have "_c3_c1_c2" appended to its name, which can be interpreted as "base proc's 3rd child's
+     * 1st child's 2nd child".
+     */
+    SkString fMangleString;
+
+    friend class GrGLPathProcessor;
+
+    typedef GrGLSLShaderBuilder INHERITED;
+};
+
+/*
+ * Fragment processor's, in addition to all of the above, may need to use dst color so they use
+ * this builder to create their shader.  Because this is the only shader builder the FP sees, we
+ * just call it FPShaderBuilder
+ */
+class GrGLSLXPFragmentBuilder : public GrGLSLFragmentBuilder {
+public:
+    GrGLSLXPFragmentBuilder(GrGLSLProgramBuilder* program) : INHERITED(program) {}
+
+    /** Returns the variable name that holds the color of the destination pixel. This may be nullptr if
+        no effect advertised that it will read the destination. */
+    virtual const char* dstColor() = 0;
+
+    /** Adds any necessary layout qualifiers in order to legalize the supplied blend equation with
+        this shader. It is only legal to call this method with an advanced blend equation, and only
+        if these equations are supported. */
+    virtual void enableAdvancedBlendEquationIfNeeded(GrBlendEquation) = 0;
+
+private:
+    typedef GrGLSLFragmentBuilder INHERITED;
+};
+
+// TODO rename to Fragment Builder
+class GrGLSLFragmentShaderBuilder : public GrGLSLXPFragmentBuilder {
+public:
+    typedef uint8_t FragPosKey;
+
+    /** Returns a key for reading the fragment location. This should only be called if there is an
+       effect that will requires the fragment position. If the fragment position is not required,
+       the key is 0. */
+    static FragPosKey KeyForFragmentPosition(const GrRenderTarget* dst);
+
+    GrGLSLFragmentShaderBuilder(GrGLSLProgramBuilder* program, uint8_t fragPosKey);
+
+    // true public interface, defined explicitly in the abstract interfaces above
+    bool enableFeature(GLSLFeature) override;
+    virtual SkString ensureFSCoords2D(const GrGLSLTransformedCoordsArray& coords,
+                                      int index) override;
+    const char* fragmentPosition() override;
+    const char* dstColor() override;
+
+    void enableAdvancedBlendEquationIfNeeded(GrBlendEquation) override;
+
+private:
+    // Private public interface, used by GrGLProgramBuilder to build a fragment shader
+    void enableCustomOutput();
+    void enableSecondaryOutput();
+    const char* getPrimaryColorOutputName() const;
+    const char* getSecondaryColorOutputName() const;
+
+    // As GLSLProcessors emit code, there are some conditions we need to verify.  We use the below
+    // state to track this.  The reset call is called per processor emitted.
+    bool hasReadDstColor() const { return fHasReadDstColor; }
+    bool hasReadFragmentPosition() const { return fHasReadFragmentPosition; }
+    void reset() {
+        fHasReadDstColor = false;
+        fHasReadFragmentPosition = false;
+    }
+
+    static const char* DeclaredColorOutputName() { return "fsColorOut"; }
+    static const char* DeclaredSecondaryColorOutputName() { return "fsSecondaryColorOut"; }
+
+    /*
+     * An internal call for GrGLProgramBuilder to use to add varyings to the vertex shader
+     */
+    void addVarying(GrGLSLVarying*, GrSLPrecision);
+
+    void onFinalize() override;
+
+    /**
+     * Features that should only be enabled by GrGLSLFragmentShaderBuilder itself.
+     */
+    enum GLSLPrivateFeature {
+        kFragCoordConventions_GLSLPrivateFeature = kLastGLSLFeature + 1,
+        kBlendEquationAdvanced_GLSLPrivateFeature,
+        kBlendFuncExtended_GLSLPrivateFeature,
+        kExternalTexture_GLSLPrivateFeature,
+        kLastGLSLPrivateFeature = kBlendFuncExtended_GLSLPrivateFeature
+    };
+
+    // Interpretation of FragPosKey when generating code
+    enum {
+        kNoFragPosRead_FragPosKey           = 0,  // The fragment positition will not be needed.
+        kTopLeftFragPosRead_FragPosKey      = 0x1,// Read frag pos relative to top-left.
+        kBottomLeftFragPosRead_FragPosKey   = 0x2,// Read frag pos relative to bottom-left.
+    };
+
+    static const char* kDstTextureColorName;
+
+    bool fSetupFragPosition;
+    bool fTopLeftFragPosRead;
+    int  fCustomColorOutputIndex;
+
+    // some state to verify shaders and effects are consistent, this is reset between effects by
+    // the program creator
+    bool fHasReadDstColor;
+    bool fHasReadFragmentPosition;
+
+    friend class GrGLProgramBuilder;
+
+    typedef GrGLSLXPFragmentBuilder INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLGeometryProcessor.cpp b/gfx/skia/skia/src/gpu/glsl/GrGLSLGeometryProcessor.cpp
new file mode 100644
index 000000000000..8a1e81a1f8ee
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLGeometryProcessor.cpp
@@ -0,0 +1,160 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrGLSLGeometryProcessor.h"
+
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProcessorTypes.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLVarying.h"
+#include "glsl/GrGLSLVertexShaderBuilder.h"
+
+void GrGLSLGeometryProcessor::emitCode(EmitArgs& args) {
+    GrGLSLVertexBuilder* vBuilder = args.fVertBuilder;
+    GrGPArgs gpArgs;
+    this->onEmitCode(args, &gpArgs);
+    vBuilder->transformToNormalizedDeviceSpace(gpArgs.fPositionVar);
+}
+
+void GrGLSLGeometryProcessor::emitTransforms(GrGLSLGPBuilder* pb,
+                                             GrGLSLVertexBuilder* vb,
+                                             GrGLSLVaryingHandler* varyingHandler,
+                                             const GrShaderVar& posVar,
+                                             const char* localCoords,
+                                             const SkMatrix& localMatrix,
+                                             const TransformsIn& tin,
+                                             TransformsOut* tout) {
+    tout->push_back_n(tin.count());
+    fInstalledTransforms.push_back_n(tin.count());
+    for (int i = 0; i < tin.count(); i++) {
+        const ProcCoords& coordTransforms = tin[i];
+        fInstalledTransforms[i].push_back_n(coordTransforms.count());
+        for (int t = 0; t < coordTransforms.count(); t++) {
+            SkString strUniName("StageMatrix");
+            strUniName.appendf("_%i_%i", i, t);
+            GrSLType varyingType;
+
+            GrCoordSet coordType = coordTransforms[t]->sourceCoords();
+            uint32_t type = coordTransforms[t]->getMatrix().getType();
+            if (kLocal_GrCoordSet == coordType) {
+                type |= localMatrix.getType();
+            }
+            varyingType = SkToBool(SkMatrix::kPerspective_Mask & type) ? kVec3f_GrSLType :
+                                                                         kVec2f_GrSLType;
+            GrSLPrecision precision = coordTransforms[t]->precision();
+
+            const char* uniName;
+            fInstalledTransforms[i][t].fHandle =
+                    pb->addUniform(GrGLSLProgramBuilder::kVertex_Visibility,
+                                   kMat33f_GrSLType, precision,
+                                   strUniName.c_str(),
+                                   &uniName).toIndex();
+
+            SkString strVaryingName("MatrixCoord");
+            strVaryingName.appendf("_%i_%i", i, t);
+
+            GrGLSLVertToFrag v(varyingType);
+            varyingHandler->addVarying(strVaryingName.c_str(), &v, precision);
+
+            SkASSERT(kVec2f_GrSLType == varyingType || kVec3f_GrSLType == varyingType);
+            SkNEW_APPEND_TO_TARRAY(&(*tout)[i], GrGLSLTransformedCoords,
+                                   (SkString(v.fsIn()), varyingType));
+
+            // varying = matrix * coords (logically)
+            if (kDevice_GrCoordSet == coordType) {
+                if (kVec2f_GrSLType == varyingType) {
+                    if (kVec2f_GrSLType == posVar.getType()) {
+                        vb->codeAppendf("%s = (%s * vec3(%s, 1)).xy;",
+                                        v.vsOut(), uniName, posVar.c_str());
+                    } else {
+                        // The brackets here are just to scope the temp variable
+                        vb->codeAppendf("{ vec3 temp = %s * %s;", uniName, posVar.c_str());
+                        vb->codeAppendf("%s = vec2(temp.x/temp.z, temp.y/temp.z); }", v.vsOut());
+                    }
+                } else {
+                    if (kVec2f_GrSLType == posVar.getType()) {
+                        vb->codeAppendf("%s = %s * vec3(%s, 1);",
+                                        v.vsOut(), uniName, posVar.c_str());
+                    } else {
+                        vb->codeAppendf("%s = %s * %s;", v.vsOut(), uniName, posVar.c_str());
+                    }
+                }
+            } else {
+                if (kVec2f_GrSLType == varyingType) {
+                    vb->codeAppendf("%s = (%s * vec3(%s, 1)).xy;", v.vsOut(), uniName, localCoords);
+                } else {
+                    vb->codeAppendf("%s = %s * vec3(%s, 1);", v.vsOut(), uniName, localCoords);
+                }
+            }
+        }
+    }
+}
+
+void GrGLSLGeometryProcessor::emitTransforms(GrGLSLGPBuilder* pb,
+                                             GrGLSLVertexBuilder* vb,
+                                             GrGLSLVaryingHandler* varyingHandler,
+                                             const char* localCoords,
+                                             const TransformsIn& tin,
+                                             TransformsOut* tout) {
+    tout->push_back_n(tin.count());
+    for (int i = 0; i < tin.count(); i++) {
+        const ProcCoords& coordTransforms = tin[i];
+        for (int t = 0; t < coordTransforms.count(); t++) {
+            GrSLType varyingType = kVec2f_GrSLType;
+
+            // Device coords aren't supported
+            SkASSERT(kDevice_GrCoordSet != coordTransforms[t]->sourceCoords());
+            GrSLPrecision precision = coordTransforms[t]->precision();
+
+            SkString strVaryingName("MatrixCoord");
+            strVaryingName.appendf("_%i_%i", i, t);
+
+            GrGLSLVertToFrag v(varyingType);
+            varyingHandler->addVarying(strVaryingName.c_str(), &v, precision);
+            vb->codeAppendf("%s = %s;", v.vsOut(), localCoords);
+
+            SkNEW_APPEND_TO_TARRAY(&(*tout)[i],
+                                   GrGLSLTransformedCoords,
+                                   (SkString(v.fsIn()), varyingType));
+        }
+    }
+}
+
+void GrGLSLGeometryProcessor::setupPosition(GrGLSLGPBuilder* pb,
+                                            GrGLSLVertexBuilder* vertBuilder,
+                                            GrGPArgs* gpArgs,
+                                            const char* posName) {
+    gpArgs->fPositionVar.set(kVec2f_GrSLType, "pos2");
+    vertBuilder->codeAppendf("vec2 %s = %s;", gpArgs->fPositionVar.c_str(), posName);
+}
+
+void GrGLSLGeometryProcessor::setupPosition(GrGLSLGPBuilder* pb,
+                                            GrGLSLVertexBuilder* vertBuilder,
+                                            GrGPArgs* gpArgs,
+                                            const char* posName,
+                                            const SkMatrix& mat,
+                                            UniformHandle* viewMatrixUniform) {
+    if (mat.isIdentity()) {
+        gpArgs->fPositionVar.set(kVec2f_GrSLType, "pos2");
+        vertBuilder->codeAppendf("vec2 %s = %s;", gpArgs->fPositionVar.c_str(), posName);
+    } else {
+        const char* viewMatrixName;
+        *viewMatrixUniform = pb->addUniform(GrGLSLProgramBuilder::kVertex_Visibility,
+                                            kMat33f_GrSLType, kHigh_GrSLPrecision,
+                                            "uViewM",
+                                            &viewMatrixName);
+        if (!mat.hasPerspective()) {
+            gpArgs->fPositionVar.set(kVec2f_GrSLType, "pos2");
+            vertBuilder->codeAppendf("vec2 %s = vec2(%s * vec3(%s, 1));",
+                                     gpArgs->fPositionVar.c_str(), viewMatrixName, posName);
+        } else {
+            gpArgs->fPositionVar.set(kVec3f_GrSLType, "pos3");
+            vertBuilder->codeAppendf("vec3 %s = %s * vec3(%s, 1);",
+                                     gpArgs->fPositionVar.c_str(), viewMatrixName, posName);
+        }
+    }
+}
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLGeometryProcessor.h b/gfx/skia/skia/src/gpu/glsl/GrGLSLGeometryProcessor.h
new file mode 100644
index 000000000000..4c586a790004
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLGeometryProcessor.h
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGLSLGeometryProcessor_DEFINED
+#define GrGLSLGeometryProcessor_DEFINED
+
+#include "GrGLSLPrimitiveProcessor.h"
+
+class GrGLSLGPBuilder;
+
+/**
+ * If a GL effect needs a GrGLFullShaderBuilder* object to emit vertex code, then it must inherit
+ * from this class. Since paths don't have vertices, this class is only meant to be used internally
+ * by skia, for special cases.
+ */
+class GrGLSLGeometryProcessor : public GrGLSLPrimitiveProcessor {
+public:
+    /* Any general emit code goes in the base class emitCode.  Subclasses override onEmitCode */
+    void emitCode(EmitArgs&) override;
+
+    // By default we use the identity matrix
+    void setTransformData(const GrPrimitiveProcessor&,
+                          const GrGLSLProgramDataManager& pdman,
+                          int index,
+                          const SkTArray<const GrCoordTransform*, true>& transforms) override {
+        this->setTransformDataMatrix(SkMatrix::I(), pdman, index, transforms);
+    }
+
+    // A helper which subclasses can use if needed
+    template <class GeometryProcessor>
+    void setTransformDataHelper(const GrPrimitiveProcessor& primProc,
+                                const GrGLSLProgramDataManager& pdman,
+                                int index,
+                                const SkTArray<const GrCoordTransform*, true>& transforms) {
+        const GeometryProcessor& gp = primProc.cast<GeometryProcessor>();
+        this->setTransformDataMatrix(gp.localMatrix(), pdman, index, transforms);
+    }
+
+protected:
+    // Emit a uniform matrix for each coord transform.
+    void emitTransforms(GrGLSLGPBuilder* gp,
+                        GrGLSLVertexBuilder* vb,
+                        GrGLSLVaryingHandler* varyingHandler,
+                        const GrShaderVar& posVar,
+                        const char* localCoords,
+                        const TransformsIn& tin,
+                        TransformsOut* tout) {
+        this->emitTransforms(gp, vb, varyingHandler, posVar, localCoords, SkMatrix::I(), tin, tout);
+    }
+
+    // Emit pre-transformed coords as a vertex attribute per coord-transform.
+    void emitTransforms(GrGLSLGPBuilder*,
+                        GrGLSLVertexBuilder*,
+                        GrGLSLVaryingHandler*,
+                        const GrShaderVar& posVar,
+                        const char* localCoords,
+                        const SkMatrix& localMatrix,
+                        const TransformsIn&,
+                        TransformsOut*);
+
+    // caller has emitted transforms via attributes
+    void emitTransforms(GrGLSLGPBuilder*,
+                        GrGLSLVertexBuilder*,
+                        GrGLSLVaryingHandler*,
+                        const char* localCoords,
+                        const TransformsIn& tin,
+                        TransformsOut* tout);
+
+    struct GrGPArgs {
+        // The variable used by a GP to store its position. It can be
+        // either a vec2 or a vec3 depending on the presence of perspective.
+        GrShaderVar fPositionVar;
+    };
+
+    // Create the correct type of position variable given the CTM
+    void setupPosition(GrGLSLGPBuilder*, GrGLSLVertexBuilder*, GrGPArgs*, const char* posName);
+    void setupPosition(GrGLSLGPBuilder*,
+                       GrGLSLVertexBuilder*,
+                       GrGPArgs*,
+                       const char* posName,
+                       const SkMatrix& mat,
+                       UniformHandle* viewMatrixUniform);
+
+    static uint32_t ComputePosKey(const SkMatrix& mat) {
+        if (mat.isIdentity()) {
+            return 0x0;
+        } else if (!mat.hasPerspective()) {
+            return 0x01;
+        } else {
+            return 0x02;
+        }
+    }
+
+private:
+    void setTransformDataMatrix(const SkMatrix& localMatrix,
+                                const GrGLSLProgramDataManager& pdman,
+                                int index,
+                                const SkTArray<const GrCoordTransform*, true>& transforms) {
+        SkSTArray<2, Transform, true>& procTransforms = fInstalledTransforms[index];
+        int numTransforms = transforms.count();
+        for (int t = 0; t < numTransforms; ++t) {
+            SkASSERT(procTransforms[t].fHandle.isValid());
+            const SkMatrix& transform = GetTransformMatrix(localMatrix, *transforms[t]);
+            if (!procTransforms[t].fCurrentValue.cheapEqualTo(transform)) {
+                pdman.setSkMatrix(procTransforms[t].fHandle.toIndex(), transform);
+                procTransforms[t].fCurrentValue = transform;
+            }
+        }
+    }
+
+    virtual void onEmitCode(EmitArgs&, GrGPArgs*) = 0;
+
+    typedef GrGLSLPrimitiveProcessor INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLGeometryShaderBuilder.cpp b/gfx/skia/skia/src/gpu/glsl/GrGLSLGeometryShaderBuilder.cpp
new file mode 100644
index 000000000000..25e9f9e320cc
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLGeometryShaderBuilder.cpp
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrGLSLGeometryShaderBuilder.h"
+#include "GrGLSLProgramBuilder.h"
+#include "GrGLSLVarying.h"
+
+GrGLSLGeometryBuilder::GrGLSLGeometryBuilder(GrGLSLProgramBuilder* program)
+    : INHERITED(program) {
+
+}
+
+void GrGLSLGeometryBuilder::onFinalize() {
+    fProgramBuilder->varyingHandler()->getGeomDecls(&this->inputs(), &this->outputs());
+}
+
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLGeometryShaderBuilder.h b/gfx/skia/skia/src/gpu/glsl/GrGLSLGeometryShaderBuilder.h
new file mode 100644
index 000000000000..f5e09f11a2ef
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLGeometryShaderBuilder.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGLSLGeometryShaderBuilder_DEFINED
+#define GrGLSLGeometryShaderBuilder_DEFINED
+
+#include "GrGLSLShaderBuilder.h"
+
+class GrGLSLVarying;
+
+class GrGLSLGeometryBuilder : public GrGLSLShaderBuilder {
+public:
+    GrGLSLGeometryBuilder(GrGLSLProgramBuilder* program);
+
+private:
+    void onFinalize() override;
+
+    friend class GrGLProgramBuilder;
+
+    typedef GrGLSLShaderBuilder INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp b/gfx/skia/skia/src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp
new file mode 100644
index 000000000000..70b58cda94f2
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrGLSLPrimitiveProcessor.h"
+
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+
+SkMatrix GrGLSLPrimitiveProcessor::GetTransformMatrix(const SkMatrix& localMatrix,
+                                                      const GrCoordTransform& coordTransform) {
+    SkMatrix combined;
+    // We only apply the localmatrix to localcoords
+    if (kLocal_GrCoordSet == coordTransform.sourceCoords()) {
+        combined.setConcat(coordTransform.getMatrix(), localMatrix);
+    } else {
+        combined = coordTransform.getMatrix();
+    }
+    if (coordTransform.reverseY()) {
+        // combined.postScale(1,-1);
+        // combined.postTranslate(0,1);
+        combined.set(SkMatrix::kMSkewY,
+            combined[SkMatrix::kMPersp0] - combined[SkMatrix::kMSkewY]);
+        combined.set(SkMatrix::kMScaleY,
+            combined[SkMatrix::kMPersp1] - combined[SkMatrix::kMScaleY]);
+        combined.set(SkMatrix::kMTransY,
+            combined[SkMatrix::kMPersp2] - combined[SkMatrix::kMTransY]);
+    }
+    return combined;
+}
+
+void GrGLSLPrimitiveProcessor::setupUniformColor(GrGLSLGPBuilder* pb,
+                                                 GrGLSLFragmentBuilder* fragBuilder,
+                                                 const char* outputName,
+                                                 UniformHandle* colorUniform) {
+    SkASSERT(colorUniform);
+    const char* stagedLocalVarName;
+    *colorUniform = pb->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                   kVec4f_GrSLType,
+                                   kDefault_GrSLPrecision,
+                                   "Color",
+                                   &stagedLocalVarName);
+    fragBuilder->codeAppendf("%s = %s;", outputName, stagedLocalVarName);
+}
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLPrimitiveProcessor.h b/gfx/skia/skia/src/gpu/glsl/GrGLSLPrimitiveProcessor.h
new file mode 100644
index 000000000000..d164bbe53e03
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLPrimitiveProcessor.h
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGLSLPrimitiveProcessor_DEFINED
+#define GrGLSLPrimitiveProcessor_DEFINED
+
+#include "GrPrimitiveProcessor.h"
+#include "glsl/GrGLSLProcessorTypes.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+#include "glsl/GrGLSLTextureSampler.h"
+
+class GrBatchTracker;
+class GrPrimitiveProcessor;
+class GrGLSLCaps;
+class GrGLSLFragmentBuilder;
+class GrGLSLGPBuilder;
+class GrGLSLVaryingHandler;
+class GrGLSLVertexBuilder;
+
+class GrGLSLPrimitiveProcessor {
+public:
+    virtual ~GrGLSLPrimitiveProcessor() {}
+
+    typedef GrGLSLProgramDataManager::UniformHandle UniformHandle;
+    typedef GrGLSLTextureSampler::TextureSamplerArray TextureSamplerArray;
+
+    typedef SkSTArray<2, const GrCoordTransform*, true> ProcCoords;
+    typedef SkSTArray<8, ProcCoords> TransformsIn;
+    typedef SkSTArray<8, GrGLSLTransformedCoordsArray> TransformsOut;
+
+    struct EmitArgs {
+        EmitArgs(GrGLSLGPBuilder* pb,
+                 GrGLSLVertexBuilder* vertBuilder,
+                 GrGLSLFragmentBuilder* fragBuilder,
+                 GrGLSLVaryingHandler* varyingHandler,
+                 const GrGLSLCaps* caps,
+                 const GrPrimitiveProcessor& gp,
+                 const char* outputColor,
+                 const char* outputCoverage,
+                 const TextureSamplerArray& samplers,
+                 const TransformsIn& transformsIn,
+                 TransformsOut* transformsOut)
+            : fPB(pb)
+            , fVertBuilder(vertBuilder)
+            , fFragBuilder(fragBuilder)
+            , fVaryingHandler(varyingHandler)
+            , fGLSLCaps(caps)
+            , fGP(gp)
+            , fOutputColor(outputColor)
+            , fOutputCoverage(outputCoverage)
+            , fSamplers(samplers)
+            , fTransformsIn(transformsIn)
+            , fTransformsOut(transformsOut) {}
+        GrGLSLGPBuilder* fPB;
+        GrGLSLVertexBuilder* fVertBuilder;
+        GrGLSLFragmentBuilder* fFragBuilder;
+        GrGLSLVaryingHandler* fVaryingHandler;
+        const GrGLSLCaps* fGLSLCaps;
+        const GrPrimitiveProcessor& fGP;
+        const char* fOutputColor;
+        const char* fOutputCoverage;
+        const TextureSamplerArray& fSamplers;
+        const TransformsIn& fTransformsIn;
+        TransformsOut* fTransformsOut;
+    };
+
+    /**
+     * This is similar to emitCode() in the base class, except it takes a full shader builder.
+     * This allows the effect subclass to emit vertex code.
+     */
+    virtual void emitCode(EmitArgs&) = 0;
+
+
+    /** A GrGLSLPrimitiveProcessor instance can be reused with any GrGLSLPrimitiveProcessor that
+        produces the same stage key; this function reads data from a GrGLSLPrimitiveProcessor and
+        uploads any uniform variables required  by the shaders created in emitCode(). The
+        GrPrimitiveProcessor parameter is guaranteed to be of the same type that created this
+        GrGLSLPrimitiveProcessor and to have an identical processor key as the one that created this
+        GrGLSLPrimitiveProcessor.  */
+    virtual void setData(const GrGLSLProgramDataManager&, const GrPrimitiveProcessor&) = 0;
+
+    static SkMatrix GetTransformMatrix(const SkMatrix& localMatrix, const GrCoordTransform&);
+
+    virtual void setTransformData(const GrPrimitiveProcessor&,
+                                  const GrGLSLProgramDataManager& pdman,
+                                  int index,
+                                  const SkTArray<const GrCoordTransform*, true>& transforms) = 0;
+
+protected:
+    void setupUniformColor(GrGLSLGPBuilder* pb,
+                           GrGLSLFragmentBuilder* fragBuilder,
+                           const char* outputName,
+                           UniformHandle* colorUniform);
+
+    struct Transform {
+        Transform() : fType(kVoid_GrSLType) { fCurrentValue = SkMatrix::InvalidMatrix(); }
+        UniformHandle  fHandle;
+        SkMatrix       fCurrentValue;
+        GrSLType       fType;
+    };
+
+    SkSTArray<8, SkSTArray<2, Transform, true> > fInstalledTransforms;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLProcessorTypes.h b/gfx/skia/skia/src/gpu/glsl/GrGLSLProcessorTypes.h
new file mode 100644
index 000000000000..6410e5eee165
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLProcessorTypes.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGLSLProcessorTypes_DEFINED
+#define GrGLSLProcessorTypes_DEFINED
+
+#include "GrShaderVar.h"
+
+/**
+ * These are meant to only be used by GrGLSL*Processors so they can add transformed coordinates
+ * to their shader code.
+ */
+typedef GrShaderVar GrGLSLTransformedCoords;
+typedef SkTArray<GrShaderVar> GrGLSLTransformedCoordsArray;
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLProgramBuilder.cpp b/gfx/skia/skia/src/gpu/glsl/GrGLSLProgramBuilder.cpp
new file mode 100644
index 000000000000..54e82b30c0a4
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLProgramBuilder.cpp
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "glsl/GrGLSLProgramBuilder.h"
+
+const int GrGLSLProgramBuilder::kVarsPerBlock = 8;
+
+GrGLSLProgramBuilder::GrGLSLProgramBuilder(const DrawArgs& args)
+    : fVS(this)
+    , fGS(this)
+    , fFS(this, args.fDesc->header().fFragPosKey)
+    , fStageIndex(-1)
+    , fArgs(args) {
+}
+
+void GrGLSLProgramBuilder::nameVariable(SkString* out, char prefix, const char* name, bool mangle) {
+    if ('\0' == prefix) {
+        *out = name;
+    } else {
+        out->printf("%c%s", prefix, name);
+    }
+    if (mangle) {
+        if (out->endsWith('_')) {
+            // Names containing "__" are reserved.
+            out->append("x");
+        }
+        out->appendf("_Stage%d%s", fStageIndex, fFS.getMangleString().c_str());
+    }
+}
+
+void GrGLSLProgramBuilder::appendUniformDecls(ShaderVisibility visibility,
+                                              SkString* out) const {
+    this->onAppendUniformDecls(visibility, out);
+}
+
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLProgramBuilder.h b/gfx/skia/skia/src/gpu/glsl/GrGLSLProgramBuilder.h
new file mode 100644
index 000000000000..81037084e980
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLProgramBuilder.h
@@ -0,0 +1,176 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGLSLProgramBuilder_DEFINED
+#define GrGLSLProgramBuilder_DEFINED
+
+#include "GrGeometryProcessor.h"
+#include "GrGpu.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLGeometryShaderBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+#include "glsl/GrGLSLVertexShaderBuilder.h"
+
+class GrGLSLCaps;
+class GrGLSLShaderVar;
+class GrGLSLVaryingHandler;
+
+// Enough precision to represent 1 / 2048 accurately in printf
+#define GR_SIGNIFICANT_POW2_DECIMAL_DIG 11
+
+class GrGLSLUniformBuilder {
+public:
+    enum ShaderVisibility {
+        kVertex_Visibility   = 1 << kVertex_GrShaderType,
+        kGeometry_Visibility = 1 << kGeometry_GrShaderType,
+        kFragment_Visibility = 1 << kFragment_GrShaderType,
+    };
+
+    virtual ~GrGLSLUniformBuilder() {}
+
+    typedef GrGLSLProgramDataManager::UniformHandle UniformHandle;
+
+    /** Add a uniform variable to the current program, that has visibility in one or more shaders.
+        visibility is a bitfield of ShaderVisibility values indicating from which shaders the
+        uniform should be accessible. At least one bit must be set. Geometry shader uniforms are not
+        supported at this time. The actual uniform name will be mangled. If outName is not nullptr
+        then it will refer to the final uniform name after return. Use the addUniformArray variant
+        to add an array of uniforms. */
+    UniformHandle addUniform(uint32_t visibility,
+                             GrSLType type,
+                             GrSLPrecision precision,
+                             const char* name,
+                             const char** outName = nullptr) {
+        return this->addUniformArray(visibility, type, precision, name, 0, outName);
+    }
+
+    UniformHandle addUniformArray(uint32_t visibility,
+                                  GrSLType type,
+                                  GrSLPrecision precision,
+                                  const char* name,
+                                  int arrayCount,
+                                  const char** outName = nullptr) {
+        return this->internalAddUniformArray(visibility, type, precision, name, true, arrayCount,
+                                             outName);
+    }
+
+    virtual const GrGLSLShaderVar& getUniformVariable(UniformHandle u) const = 0;
+
+    /**
+     * Shortcut for getUniformVariable(u).c_str()
+     */
+    virtual const char* getUniformCStr(UniformHandle u) const = 0;
+
+    /*
+     * *NOTE* NO MEMBERS ALLOWED, MULTIPLE INHERITANCE
+     */
+protected:
+    virtual UniformHandle internalAddUniformArray(
+        uint32_t visibility,
+        GrSLType type,
+        GrSLPrecision precision,
+        const char* name,
+        bool mangleName,
+        int arrayCount,
+        const char** outName) = 0;
+};
+
+/* a specialization of the above for GPs.  Lets the user add uniforms, varyings, and VS / FS code */
+class GrGLSLGPBuilder : public virtual GrGLSLUniformBuilder {
+public:
+    /*
+     * *NOTE* NO MEMBERS ALLOWED, MULTIPLE INHERITANCE
+     */
+};
+
+
+/* a specializations for FPs. Lets the user add uniforms and FS code */
+class GrGLSLFPBuilder : public virtual GrGLSLUniformBuilder {
+public:
+    /*
+     * *NOTE* NO MEMBERS ALLOWED, MULTIPLE INHERITANCE
+     */
+};
+
+/* a specializations for XPs. Lets the user add uniforms and FS code */
+class GrGLSLXPBuilder : public virtual GrGLSLUniformBuilder {
+public:
+    /*
+     * *NOTE* NO MEMBERS ALLOWED, MULTIPLE INHERITANCE
+     */
+};
+
+class GrGLSLProgramBuilder : public GrGLSLGPBuilder,
+                             public GrGLSLFPBuilder,
+                             public GrGLSLXPBuilder {
+public:
+    typedef GrGpu::DrawArgs DrawArgs;
+
+    virtual const GrGLSLCaps* glslCaps() const = 0;
+
+    // Handles for program uniforms (other than per-effect uniforms)
+    struct BuiltinUniformHandles {
+        UniformHandle       fRTAdjustmentUni;
+
+        // We use the render target height to provide a y-down frag coord when specifying
+        // origin_upper_left is not supported.
+        UniformHandle       fRTHeightUni;
+    };
+
+protected:
+    explicit GrGLSLProgramBuilder(const DrawArgs& args);
+
+    const GrPrimitiveProcessor& primitiveProcessor() const { return *fArgs.fPrimitiveProcessor; }
+    const GrPipeline& pipeline() const { return *fArgs.fPipeline; }
+    const GrProgramDesc& desc() const { return *fArgs.fDesc; }
+    const GrProgramDesc::KeyHeader& header() const { return fArgs.fDesc->header(); }
+
+    void appendUniformDecls(ShaderVisibility, SkString*) const;
+
+    // Used to add a uniform for frag position without mangling the name of the uniform inside of a
+    // stage.
+    UniformHandle addFragPosUniform(uint32_t visibility,
+                                    GrSLType type,
+                                    GrSLPrecision precision,
+                                    const char* name,
+                                    const char** outName) {
+        return this->internalAddUniformArray(visibility, type, precision, name, false, 0, outName);
+    }
+
+    const char* rtAdjustment() const { return "rtAdjustment"; }
+
+    // Generates a name for a variable. The generated string will be name prefixed by the prefix
+    // char (unless the prefix is '\0'). It also will mangle the name to be stage-specific unless
+    // explicitly asked not to.
+    void nameVariable(SkString* out, char prefix, const char* name, bool mangle = true);
+
+    virtual GrGLSLVaryingHandler* varyingHandler() = 0;
+
+    // number of each input/output type in a single allocation block, used by many builders
+    static const int kVarsPerBlock;
+
+    GrGLSLVertexBuilder         fVS;
+    GrGLSLGeometryBuilder       fGS;
+    GrGLSLFragmentShaderBuilder fFS;
+
+    int fStageIndex;
+
+    BuiltinUniformHandles fUniformHandles;
+
+    const DrawArgs& fArgs;
+
+private:
+    virtual void onAppendUniformDecls(ShaderVisibility visibility, SkString* out) const = 0;
+
+    friend class GrGLSLShaderBuilder;
+    friend class GrGLSLVertexBuilder;
+    friend class GrGLSLFragmentShaderBuilder;
+    friend class GrGLSLGeometryBuilder;
+    friend class GrGLSLVaryingHandler;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLProgramDataManager.h b/gfx/skia/skia/src/gpu/glsl/GrGLSLProgramDataManager.h
new file mode 100644
index 000000000000..1a8f6391aac0
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLProgramDataManager.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGLSLProgramDataManager_DEFINED
+#define GrGLSLProgramDataManager_DEFINED
+
+#include "SkTypes.h"
+
+class SkMatrix;
+
+/** Manages the resources used by a shader program.
+ * The resources are objects the program uses to communicate with the
+ * application code.
+ */
+class GrGLSLProgramDataManager : SkNoncopyable {
+public:
+    // Opaque handle to a resource
+    class ShaderResourceHandle {
+    public:
+        ShaderResourceHandle(int value)
+            : fValue(value) {
+            SkASSERT(this->isValid());
+        }
+
+        ShaderResourceHandle()
+            : fValue(kInvalid_ShaderResourceHandle) {
+        }
+
+        bool operator==(const ShaderResourceHandle& other) const { return other.fValue == fValue; }
+        bool isValid() const { return kInvalid_ShaderResourceHandle != fValue; }
+        int toIndex() const { SkASSERT(this->isValid()); return fValue; }
+
+    private:
+        static const int kInvalid_ShaderResourceHandle = -1;
+        int fValue;
+    };
+
+    typedef ShaderResourceHandle UniformHandle;
+
+    virtual ~GrGLSLProgramDataManager() {}
+
+    /** Functions for uploading uniform values. The varities ending in v can be used to upload to an
+     *  array of uniforms. arrayCount must be <= the array count of the uniform.
+     */
+    virtual void set1f(UniformHandle, float v0) const = 0;
+    virtual void set1fv(UniformHandle, int arrayCount, const float v[]) const = 0;
+    virtual void set2f(UniformHandle, float, float) const = 0;
+    virtual void set2fv(UniformHandle, int arrayCount, const float v[]) const = 0;
+    virtual void set3f(UniformHandle, float, float, float) const = 0;
+    virtual void set3fv(UniformHandle, int arrayCount, const float v[]) const = 0;
+    virtual void set4f(UniformHandle, float, float, float, float) const = 0;
+    virtual void set4fv(UniformHandle, int arrayCount, const float v[]) const = 0;
+    // matrices are column-major, the first three upload a single matrix, the latter three upload
+    // arrayCount matrices into a uniform array.
+    virtual void setMatrix3f(UniformHandle, const float matrix[]) const = 0;
+    virtual void setMatrix4f(UniformHandle, const float matrix[]) const = 0;
+    virtual void setMatrix3fv(UniformHandle, int arrayCount, const float matrices[]) const = 0;
+    virtual void setMatrix4fv(UniformHandle, int arrayCount, const float matrices[]) const = 0;
+
+    // convenience method for uploading a SkMatrix to a 3x3 matrix uniform
+    virtual void setSkMatrix(UniformHandle, const SkMatrix&) const = 0;
+
+    // for nvpr only
+    typedef ShaderResourceHandle VaryingHandle;
+    virtual void setPathFragmentInputTransform(VaryingHandle u, int components,
+                                               const SkMatrix& matrix) const = 0;
+
+protected:
+    GrGLSLProgramDataManager() {}
+
+private:
+
+    typedef SkNoncopyable INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLShaderBuilder.cpp b/gfx/skia/skia/src/gpu/glsl/GrGLSLShaderBuilder.cpp
new file mode 100644
index 000000000000..1fc15ecb3c41
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLShaderBuilder.cpp
@@ -0,0 +1,205 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "glsl/GrGLSLShaderBuilder.h"
+#include "glsl/GrGLSLCaps.h"
+#include "glsl/GrGLSLShaderVar.h"
+#include "glsl/GrGLSLTextureSampler.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+
+static void map_swizzle(const char* swizzleMap, const char* swizzle, char* mangledSwizzle) {
+    int i;
+    for (i = 0; '\0' != swizzle[i]; ++i) {
+        switch (swizzle[i]) {
+            case 'r':
+                mangledSwizzle[i] = swizzleMap[0];
+                break;
+            case 'g':
+                mangledSwizzle[i] = swizzleMap[1];
+                break;
+            case 'b':
+                mangledSwizzle[i] = swizzleMap[2];
+                break;
+            case 'a':
+                mangledSwizzle[i] = swizzleMap[3];
+                break;
+            default:
+                SkFAIL("Unsupported swizzle");
+        }
+    }
+    mangledSwizzle[i] ='\0';
+}
+
+static void append_texture_lookup(SkString* out,
+                                  const GrGLSLCaps* glslCaps,
+                                  const char* samplerName,
+                                  const char* coordName,
+                                  GrPixelConfig config,
+                                  const char* swizzle,
+                                  GrSLType varyingType = kVec2f_GrSLType) {
+    SkASSERT(coordName);
+
+    out->appendf("%s(%s, %s)",
+                 GrGLSLTexture2DFunctionName(varyingType, glslCaps->generation()),
+                 samplerName,
+                 coordName);
+
+    char mangledSwizzle[5];
+
+    // This refers to any swizzling we may need to get from some backend internal format to the
+    // format used in GrPixelConfig. Some backends will automatically do the sizzling for us.
+    if (glslCaps->mustSwizzleInShader()) {
+        const char* swizzleMap = glslCaps->getSwizzleMap(config);
+        // if the map is simply 'rgba' then we don't need to do any manual swizzling to get us to
+        // a GrPixelConfig format.
+        if (memcmp(swizzleMap, "rgba", 4)) {
+            // Manually 'swizzle' the swizzle using our mapping
+            map_swizzle(swizzleMap, swizzle, mangledSwizzle);
+            swizzle = mangledSwizzle;
+        }
+    }
+
+    // For shader prettiness we omit the swizzle rather than appending ".rgba".
+    if (memcmp(swizzle, "rgba", 4)) {
+        out->appendf(".%s", swizzle);
+    }
+}
+
+GrGLSLShaderBuilder::GrGLSLShaderBuilder(GrGLSLProgramBuilder* program)
+    : fProgramBuilder(program)
+    , fInputs(GrGLSLProgramBuilder::kVarsPerBlock)
+    , fOutputs(GrGLSLProgramBuilder::kVarsPerBlock)
+    , fFeaturesAddedMask(0)
+    , fCodeIndex(kCode)
+    , fFinalized(false) {
+    // We push back some dummy pointers which will later become our header
+    for (int i = 0; i <= kCode; i++) {
+        fShaderStrings.push_back();
+        fCompilerStrings.push_back(nullptr);
+        fCompilerStringLengths.push_back(0);
+    }
+
+    this->main() = "void main() {";
+}
+
+void GrGLSLShaderBuilder::declAppend(const GrGLSLShaderVar& var) {
+    SkString tempDecl;
+    var.appendDecl(fProgramBuilder->glslCaps(), &tempDecl);
+    this->codeAppendf("%s;", tempDecl.c_str());
+}
+
+void GrGLSLShaderBuilder::emitFunction(GrSLType returnType,
+                                       const char* name,
+                                       int argCnt,
+                                       const GrGLSLShaderVar* args,
+                                       const char* body,
+                                       SkString* outName) {
+    this->functions().append(GrGLSLTypeString(returnType));
+    fProgramBuilder->nameVariable(outName, '\0', name);
+    this->functions().appendf(" %s", outName->c_str());
+    this->functions().append("(");
+    for (int i = 0; i < argCnt; ++i) {
+        args[i].appendDecl(fProgramBuilder->glslCaps(), &this->functions());
+        if (i < argCnt - 1) {
+            this->functions().append(", ");
+        }
+    }
+    this->functions().append(") {\n");
+    this->functions().append(body);
+    this->functions().append("}\n\n");
+}
+
+void GrGLSLShaderBuilder::appendTextureLookup(SkString* out,
+                                              const GrGLSLTextureSampler& sampler,
+                                              const char* coordName,
+                                              GrSLType varyingType) const {
+    append_texture_lookup(out,
+                          fProgramBuilder->glslCaps(),
+                          fProgramBuilder->getUniformCStr(sampler.fSamplerUniform),
+                          coordName,
+                          sampler.config(),
+                          sampler.swizzle(),
+                          varyingType);
+}
+
+void GrGLSLShaderBuilder::appendTextureLookup(const GrGLSLTextureSampler& sampler,
+                                              const char* coordName,
+                                              GrSLType varyingType) {
+    this->appendTextureLookup(&this->code(), sampler, coordName, varyingType);
+}
+
+void GrGLSLShaderBuilder::appendTextureLookupAndModulate(const char* modulation,
+                                                         const GrGLSLTextureSampler& sampler,
+                                                         const char* coordName,
+                                                         GrSLType varyingType) {
+    SkString lookup;
+    this->appendTextureLookup(&lookup, sampler, coordName, varyingType);
+    this->codeAppend((GrGLSLExpr4(modulation) * GrGLSLExpr4(lookup)).c_str());
+}
+
+void GrGLSLShaderBuilder::addFeature(uint32_t featureBit, const char* extensionName) {
+    if (!(featureBit & fFeaturesAddedMask)) {
+        this->extensions().appendf("#extension %s: require\n", extensionName);
+        fFeaturesAddedMask |= featureBit;
+    }
+}
+
+void GrGLSLShaderBuilder::appendDecls(const VarArray& vars, SkString* out) const {
+    for (int i = 0; i < vars.count(); ++i) {
+        vars[i].appendDecl(fProgramBuilder->glslCaps(), out);
+        out->append(";\n");
+    }
+}
+
+void GrGLSLShaderBuilder::addLayoutQualifier(const char* param, InterfaceQualifier interface) {
+    SkASSERT(fProgramBuilder->glslCaps()->generation() >= k330_GrGLSLGeneration ||
+             fProgramBuilder->glslCaps()->mustEnableAdvBlendEqs());
+    fLayoutParams[interface].push_back() = param;
+}
+
+void GrGLSLShaderBuilder::compileAndAppendLayoutQualifiers() {
+    static const char* interfaceQualifierNames[] = {
+        "out"
+    };
+
+    for (int interface = 0; interface <= kLastInterfaceQualifier; ++interface) {
+        const SkTArray<SkString>& params = fLayoutParams[interface];
+        if (params.empty()) {
+            continue;
+        }
+        this->layoutQualifiers().appendf("layout(%s", params[0].c_str());
+        for (int i = 1; i < params.count(); ++i) {
+            this->layoutQualifiers().appendf(", %s", params[i].c_str());
+        }
+        this->layoutQualifiers().appendf(") %s;\n", interfaceQualifierNames[interface]);
+    }
+
+    GR_STATIC_ASSERT(0 == GrGLSLShaderBuilder::kOut_InterfaceQualifier);
+    GR_STATIC_ASSERT(SK_ARRAY_COUNT(interfaceQualifierNames) == kLastInterfaceQualifier + 1);
+}
+
+void GrGLSLShaderBuilder::finalize(uint32_t visibility) {
+    SkASSERT(!fFinalized);
+    this->versionDecl() = fProgramBuilder->glslCaps()->versionDeclString();
+    this->compileAndAppendLayoutQualifiers();
+    SkASSERT(visibility);
+    fProgramBuilder->appendUniformDecls((GrGLSLProgramBuilder::ShaderVisibility) visibility,
+                                        &this->uniforms());
+    this->appendDecls(fInputs, &this->inputs());
+    this->appendDecls(fOutputs, &this->outputs());
+    this->onFinalize();
+    // append the 'footer' to code
+    this->code().append("}");
+
+    for (int i = 0; i <= fCodeIndex; i++) {
+        fCompilerStrings[i] = fShaderStrings[i].c_str();
+        fCompilerStringLengths[i] = (int)fShaderStrings[i].size();
+    }
+
+    fFinalized = true;
+}
+
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLShaderBuilder.h b/gfx/skia/skia/src/gpu/glsl/GrGLSLShaderBuilder.h
new file mode 100644
index 000000000000..1a8255dbb46e
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLShaderBuilder.h
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGLSLShaderBuilder_DEFINED
+#define GrGLSLShaderBuilder_DEFINED
+
+#include "GrAllocator.h"
+#include "glsl/GrGLSLShaderVar.h"
+#include "SkTDArray.h"
+
+#include <stdarg.h>
+
+class GrGLSLProgramBuilder;
+class GrGLSLTextureSampler;
+
+/**
+  base class for all shaders builders
+*/
+class GrGLSLShaderBuilder {
+public:
+    GrGLSLShaderBuilder(GrGLSLProgramBuilder* program);
+    virtual ~GrGLSLShaderBuilder() {}
+
+    /*
+     * We put texture lookups in the base class because it is TECHNICALLY possible to do texture
+     * lookups in any kind of shader.  However, for the time being using these calls on non-fragment
+     * shaders will result in a shader compilation error as texture sampler uniforms are only
+     * visible to the fragment shader.  It would not be hard to change this behavior, if someone
+     * actually wants to do texture lookups in a non-fragment shader
+     *
+     * TODO if append texture lookup is used on a non-fragment shader, sampler uniforms should be
+     * made visible to that shaders
+     */
+    /** Appends a 2D texture sample with projection if necessary. coordType must either be Vec2f or
+        Vec3f. The latter is interpreted as projective texture coords. The vec length and swizzle
+        order of the result depends on the GrTextureAccess associated with the GrGLSLTextureSampler.
+        */
+    void appendTextureLookup(SkString* out,
+                             const GrGLSLTextureSampler&,
+                             const char* coordName,
+                             GrSLType coordType = kVec2f_GrSLType) const;
+
+    /** Version of above that appends the result to the fragment shader code instead.*/
+    void appendTextureLookup(const GrGLSLTextureSampler&,
+                             const char* coordName,
+                             GrSLType coordType = kVec2f_GrSLType);
+
+
+    /** Does the work of appendTextureLookup and modulates the result by modulation. The result is
+        always a vec4. modulation and the swizzle specified by GrGLSLTextureSampler must both be
+        vec4 or float. If modulation is "" or nullptr it this function acts as though
+        appendTextureLookup were called. */
+    void appendTextureLookupAndModulate(const char* modulation,
+                                        const GrGLSLTextureSampler&,
+                                        const char* coordName,
+                                        GrSLType coordType = kVec2f_GrSLType);
+
+    /**
+    * Called by GrGLSLProcessors to add code to one of the shaders.
+    */
+    void codeAppendf(const char format[], ...) SK_PRINTF_LIKE(2, 3) {
+       va_list args;
+       va_start(args, format);
+       this->code().appendVAList(format, args);
+       va_end(args);
+    }
+
+    void codeAppend(const char* str) { this->code().append(str); }
+
+    void codePrependf(const char format[], ...) SK_PRINTF_LIKE(2, 3) {
+       va_list args;
+       va_start(args, format);
+       this->code().prependVAList(format, args);
+       va_end(args);
+    }
+
+    /**
+     * Appends a variable declaration to one of the shaders
+     */
+    void declAppend(const GrGLSLShaderVar& var);
+
+    /** Emits a helper function outside of main() in the fragment shader. */
+    void emitFunction(GrSLType returnType,
+                      const char* name,
+                      int argCnt,
+                      const GrGLSLShaderVar* args,
+                      const char* body,
+                      SkString* outName);
+
+    /*
+     * Combines the various parts of the shader to create a single finalized shader string.
+     */
+    void finalize(uint32_t visibility);
+
+    /*
+     * Get parent builder for adding uniforms
+     */
+    GrGLSLProgramBuilder* getProgramBuilder() { return fProgramBuilder; }
+
+    /**
+     * Helper for begining and ending a block in the shader code.
+     */
+    class ShaderBlock {
+    public:
+        ShaderBlock(GrGLSLShaderBuilder* builder) : fBuilder(builder) {
+            SkASSERT(builder);
+            fBuilder->codeAppend("{");
+        }
+
+        ~ShaderBlock() {
+            fBuilder->codeAppend("}");
+        }
+    private:
+        GrGLSLShaderBuilder* fBuilder;
+    };
+
+protected:
+    typedef GrTAllocator<GrGLSLShaderVar> VarArray;
+    void appendDecls(const VarArray& vars, SkString* out) const;
+
+    /*
+     * A general function which enables an extension in a shader if the feature bit is not present
+     */
+    void addFeature(uint32_t featureBit, const char* extensionName);
+
+    enum InterfaceQualifier {
+        kOut_InterfaceQualifier,
+        kLastInterfaceQualifier = kOut_InterfaceQualifier
+    };
+
+    /*
+     * A low level function to build default layout qualifiers.
+     *
+     *   e.g. layout(param1, param2, ...) out;
+     *
+     * GLSL allows default layout qualifiers for in, out, and uniform.
+     */
+    void addLayoutQualifier(const char* param, InterfaceQualifier);
+
+    void compileAndAppendLayoutQualifiers();
+
+    void nextStage() {
+        fShaderStrings.push_back();
+        fCompilerStrings.push_back(this->code().c_str());
+        fCompilerStringLengths.push_back((int)this->code().size());
+        fCodeIndex++;
+    }
+
+    SkString& versionDecl() { return fShaderStrings[kVersionDecl]; }
+    SkString& extensions() { return fShaderStrings[kExtensions]; }
+    SkString& precisionQualifier() { return fShaderStrings[kPrecisionQualifier]; }
+    SkString& layoutQualifiers() { return fShaderStrings[kLayoutQualifiers]; }
+    SkString& uniforms() { return fShaderStrings[kUniforms]; }
+    SkString& inputs() { return fShaderStrings[kInputs]; }
+    SkString& outputs() { return fShaderStrings[kOutputs]; }
+    SkString& functions() { return fShaderStrings[kFunctions]; }
+    SkString& main() { return fShaderStrings[kMain]; }
+    SkString& code() { return fShaderStrings[fCodeIndex]; }
+
+    virtual void onFinalize() = 0;
+
+    enum {
+        kVersionDecl,
+        kExtensions,
+        kPrecisionQualifier,
+        kLayoutQualifiers,
+        kUniforms,
+        kInputs,
+        kOutputs,
+        kFunctions,
+        kMain,
+        kCode,
+    };
+
+    GrGLSLProgramBuilder* fProgramBuilder;
+    SkSTArray<kCode, const char*, true> fCompilerStrings;
+    SkSTArray<kCode, int, true> fCompilerStringLengths;
+    SkSTArray<kCode, SkString> fShaderStrings;
+    SkString fCode;
+    SkString fFunctions;
+    SkString fExtensions;
+
+    VarArray fInputs;
+    VarArray fOutputs;
+    uint32_t fFeaturesAddedMask;
+    SkSTArray<1, SkString> fLayoutParams[kLastInterfaceQualifier + 1];
+    int fCodeIndex;
+    bool fFinalized;
+
+    friend class GrGLProgramBuilder;
+    friend class GrGLPathProgramBuilder; // to access fInputs.
+};
+#endif
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLShaderVar.h b/gfx/skia/skia/src/gpu/glsl/GrGLSLShaderVar.h
similarity index 53%
rename from gfx/skia/skia/src/gpu/gl/GrGLShaderVar.h
rename to gfx/skia/skia/src/gpu/glsl/GrGLSLShaderVar.h
index 68c4bbd23a33..a8b2c9b638cf 100644
--- a/gfx/skia/skia/src/gpu/gl/GrGLShaderVar.h
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLShaderVar.h
@@ -5,48 +5,20 @@
  * found in the LICENSE file.
  */
 
-#ifndef GrGLShaderVar_DEFINED
-#define GrGLShaderVar_DEFINED
+#ifndef GrGLSLShaderVar_DEFINED
+#define GrGLSLShaderVar_DEFINED
 
-#include "GrGLContext.h"
-#include "GrGLSL.h"
-#include "SkString.h"
+#include "GrShaderVar.h"
+#include "../glsl/GrGLSL.h"
+#include "../glsl/GrGLSLCaps.h"
 
 #define USE_UNIFORM_FLOAT_ARRAYS true
 
 /**
  * Represents a variable in a shader
  */
-class GrGLShaderVar {
+class GrGLSLShaderVar : public GrShaderVar {
 public:
-
-    /**
-     * Early versions of GLSL have Varying and Attribute; those are later
-     * deprecated, but we still need to know whether a Varying variable
-     * should be treated as In or Out.
-     */
-    enum TypeModifier {
-        kNone_TypeModifier,
-        kOut_TypeModifier,
-        kIn_TypeModifier,
-        kInOut_TypeModifier,
-        kUniform_TypeModifier,
-        kAttribute_TypeModifier,
-        kVaryingIn_TypeModifier,
-        kVaryingOut_TypeModifier
-    };
-
-    enum Precision {
-        kLow_Precision,         // lowp
-        kMedium_Precision,      // mediump
-        kHigh_Precision,        // highp
-        kDefault_Precision,     // Default for the current context. We make
-                                // fragment shaders default to mediump on ES2
-                                // because highp support is not guaranteed (and
-                                // we haven't been motivated to test for it).
-                                // Otherwise, highp.
-    };
-
     /**
      * See GL_ARB_fragment_coord_conventions.
      */
@@ -58,36 +30,43 @@ public:
     /**
      * Defaults to a float with no precision specifier
      */
-    GrGLShaderVar() {
-        fType = kFloat_GrSLType;
-        fTypeModifier = kNone_TypeModifier;
-        fCount = kNonArray;
-        fPrecision = kDefault_Precision;
-        fOrigin = kDefault_Origin;
-        fUseUniformFloatArrays = USE_UNIFORM_FLOAT_ARRAYS;
+    GrGLSLShaderVar()
+        : GrShaderVar()
+        , fOrigin(kDefault_Origin)
+        , fUseUniformFloatArrays(USE_UNIFORM_FLOAT_ARRAYS) {
     }
 
-    GrGLShaderVar(const char* name, GrSLType type, int arrayCount = kNonArray,
-                  Precision precision = kDefault_Precision) {
+    GrGLSLShaderVar(const char* name, GrSLType type, int arrayCount = kNonArray,
+                    GrSLPrecision precision = kDefault_GrSLPrecision)
+        : GrShaderVar(name, type, arrayCount, precision)
+        , fOrigin(kDefault_Origin)
+        , fUseUniformFloatArrays(USE_UNIFORM_FLOAT_ARRAYS) {
         SkASSERT(kVoid_GrSLType != type);
-        fType = type;
-        fTypeModifier = kNone_TypeModifier;
-        fCount = arrayCount;
-        fPrecision = precision;
         fOrigin = kDefault_Origin;
         fUseUniformFloatArrays = USE_UNIFORM_FLOAT_ARRAYS;
-        fName = name;
     }
 
-    GrGLShaderVar(const GrGLShaderVar& var)
-        : fType(var.fType)
-        , fTypeModifier(var.fTypeModifier)
-        , fName(var.fName)
-        , fCount(var.fCount)
-        , fPrecision(var.fPrecision)
+    GrGLSLShaderVar(const char* name, GrSLType type, TypeModifier typeModifier,
+                    int arrayCount = kNonArray, GrSLPrecision precision = kDefault_GrSLPrecision)
+        : GrShaderVar(name, type, typeModifier, arrayCount, precision)
+        , fOrigin(kDefault_Origin)
+        , fUseUniformFloatArrays(USE_UNIFORM_FLOAT_ARRAYS) {
+        SkASSERT(kVoid_GrSLType != type);
+    }
+
+    GrGLSLShaderVar(const GrShaderVar& var)
+        : GrShaderVar(var)
+        , fOrigin(kDefault_Origin)
+        , fUseUniformFloatArrays(USE_UNIFORM_FLOAT_ARRAYS) {
+        SkASSERT(kVoid_GrSLType != var.getType());
+    }
+
+    GrGLSLShaderVar(const GrGLSLShaderVar& var)
+        : GrShaderVar(var.c_str(), var.getType(), var.getTypeModifier(),
+                      var.getArrayCount(), var.getPrecision())
         , fOrigin(var.fOrigin)
         , fUseUniformFloatArrays(var.fUseUniformFloatArrays) {
-        SkASSERT(kVoid_GrSLType != var.fType);
+        SkASSERT(kVoid_GrSLType != var.getType());
     }
 
     /**
@@ -104,15 +83,12 @@ public:
     void set(GrSLType type,
              TypeModifier typeModifier,
              const SkString& name,
-             Precision precision = kDefault_Precision,
+             GrSLPrecision precision = kDefault_GrSLPrecision,
              Origin origin = kDefault_Origin,
              bool useUniformFloatArrays = USE_UNIFORM_FLOAT_ARRAYS) {
         SkASSERT(kVoid_GrSLType != type);
-        fType = type;
-        fTypeModifier = typeModifier;
-        fName = name;
-        fCount = kNonArray;
-        fPrecision = precision;
+        SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsFloatType(type));
+        INHERITED::set(type, name, typeModifier, precision);
         fOrigin = origin;
         fUseUniformFloatArrays = useUniformFloatArrays;
     }
@@ -123,15 +99,12 @@ public:
     void set(GrSLType type,
              TypeModifier typeModifier,
              const char* name,
-             Precision precision = kDefault_Precision,
+             GrSLPrecision precision = kDefault_GrSLPrecision,
              Origin origin = kDefault_Origin,
              bool useUniformFloatArrays = USE_UNIFORM_FLOAT_ARRAYS) {
         SkASSERT(kVoid_GrSLType != type);
-        fType = type;
-        fTypeModifier = typeModifier;
-        fName = name;
-        fCount = kNonArray;
-        fPrecision = precision;
+        SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsFloatType(type));
+        INHERITED::set(type, name, typeModifier, precision);
         fOrigin = origin;
         fUseUniformFloatArrays = useUniformFloatArrays;
     }
@@ -143,15 +116,12 @@ public:
              TypeModifier typeModifier,
              const SkString& name,
              int count,
-             Precision precision = kDefault_Precision,
+             GrSLPrecision precision = kDefault_GrSLPrecision,
              Origin origin = kDefault_Origin,
              bool useUniformFloatArrays = USE_UNIFORM_FLOAT_ARRAYS) {
         SkASSERT(kVoid_GrSLType != type);
-        fType = type;
-        fTypeModifier = typeModifier;
-        fName = name;
-        fCount = count;
-        fPrecision = precision;
+        SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsFloatType(type));
+        INHERITED::set(type, name, typeModifier, precision, count);
         fOrigin = origin;
         fUseUniformFloatArrays = useUniformFloatArrays;
     }
@@ -163,86 +133,16 @@ public:
              TypeModifier typeModifier,
              const char* name,
              int count,
-             Precision precision = kDefault_Precision,
+             GrSLPrecision precision = kDefault_GrSLPrecision,
              Origin origin = kDefault_Origin,
              bool useUniformFloatArrays = USE_UNIFORM_FLOAT_ARRAYS) {
         SkASSERT(kVoid_GrSLType != type);
-        fType = type;
-        fTypeModifier = typeModifier;
-        fName = name;
-        fCount = count;
-        fPrecision = precision;
+        SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsFloatType(type));
+        INHERITED::set(type, name, typeModifier, precision, count);
         fOrigin = origin;
         fUseUniformFloatArrays = useUniformFloatArrays;
     }
 
-    /**
-     * Is the var an array.
-     */
-    bool isArray() const { return kNonArray != fCount; }
-    /**
-     * Is this an unsized array, (i.e. declared with []).
-     */
-    bool isUnsizedArray() const { return kUnsizedArray == fCount; }
-    /**
-     * Get the array length of the var.
-     */
-    int getArrayCount() const { return fCount; }
-    /**
-     * Set the array length of the var
-     */
-    void setArrayCount(int count) { fCount = count; }
-    /**
-     * Set to be a non-array.
-     */
-    void setNonArray() { fCount = kNonArray; }
-    /**
-     * Set to be an unsized array.
-     */
-    void setUnsizedArray() { fCount = kUnsizedArray; }
-
-    /**
-     * Access the var name as a writable string
-     */
-    SkString* accessName() { return &fName; }
-    /**
-     * Set the var name
-     */
-    void setName(const SkString& n) { fName = n; }
-    void setName(const char* n) { fName = n; }
-
-    /**
-     * Get the var name.
-     */
-    const SkString& getName() const { return fName; }
-
-    /**
-     * Shortcut for this->getName().c_str();
-     */
-    const char* c_str() const { return this->getName().c_str(); }
-
-    /**
-     * Get the type of the var
-     */
-    GrSLType getType() const { return fType; }
-    /**
-     * Set the type of the var
-     */
-    void setType(GrSLType type) { fType = type; }
-
-    TypeModifier getTypeModifier() const { return fTypeModifier; }
-    void setTypeModifier(TypeModifier type) { fTypeModifier = type; }
-
-    /**
-     * Get the precision of the var
-     */
-    Precision getPrecision() const { return fPrecision; }
-
-    /**
-     * Set the precision of the var
-     */
-    void setPrecision(Precision p) { fPrecision = p; }
-
     /**
      * Get the origin of the var
      */
@@ -256,18 +156,18 @@ public:
     /**
      * Write a declaration of this variable to out.
      */
-    void appendDecl(const GrGLContextInfo& ctxInfo, SkString* out) const {
+    void appendDecl(const GrGLSLCaps* glslCaps, SkString* out) const {
+        SkASSERT(kDefault_GrSLPrecision == fPrecision || GrSLTypeIsFloatType(fType));
         if (kUpperLeft_Origin == fOrigin) {
             // this is the only place where we specify a layout modifier. If we use other layout
             // modifiers in the future then they should be placed in a list.
             out->append("layout(origin_upper_left) ");
         }
         if (this->getTypeModifier() != kNone_TypeModifier) {
-           out->append(TypeModifierString(this->getTypeModifier(),
-                                          ctxInfo.glslGeneration()));
+           out->append(TypeModifierString(glslCaps, this->getTypeModifier()));
            out->append(" ");
         }
-        out->append(PrecisionString(fPrecision, ctxInfo.standard()));
+        out->append(PrecisionString(glslCaps, fPrecision));
         GrSLType effectiveType = this->getType();
         if (this->isArray()) {
             if (this->isUnsizedArray()) {
@@ -302,18 +202,16 @@ public:
                      fUseUniformFloatArrays ? "" : ".x");
     }
 
-    static const char* PrecisionString(Precision p, GrGLStandard standard) {
+    static const char* PrecisionString(const GrGLSLCaps* glslCaps, GrSLPrecision p) {
         // Desktop GLSL has added precision qualifiers but they don't do anything.
-        if (kGLES_GrGLStandard == standard) {
+        if (glslCaps->usesPrecisionModifiers()) {
             switch (p) {
-                case kLow_Precision:
+                case kLow_GrSLPrecision:
                     return "lowp ";
-                case kMedium_Precision:
+                case kMedium_GrSLPrecision:
                     return "mediump ";
-                case kHigh_Precision:
+                case kHigh_GrSLPrecision:
                     return "highp ";
-                case kDefault_Precision:
-                    return "";
                 default:
                     SkFAIL("Unexpected precision type.");
             }
@@ -322,7 +220,8 @@ public:
     }
 
 private:
-    static const char* TypeModifierString(TypeModifier t, GrGLSLGeneration gen) {
+    static const char* TypeModifierString(const GrGLSLCaps* glslCaps, TypeModifier t) {
+        GrGLSLGeneration gen = glslCaps->generation();
         switch (t) {
             case kNone_TypeModifier:
                 return "";
@@ -346,15 +245,12 @@ private:
         }
     }
 
-    GrSLType        fType;
-    TypeModifier    fTypeModifier;
-    SkString        fName;
-    int             fCount;
-    Precision       fPrecision;
     Origin          fOrigin;
     /// Work around driver bugs on some hardware that don't correctly
     /// support uniform float []
     bool            fUseUniformFloatArrays;
+
+    typedef GrShaderVar INHERITED;
 };
 
 #endif
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLTextureSampler.h b/gfx/skia/skia/src/gpu/glsl/GrGLSLTextureSampler.h
new file mode 100644
index 000000000000..a4fbf550f250
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLTextureSampler.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGLSLTextureSampler_DEFINED
+#define GrGLSLTextureSampler_DEFINED
+
+#include "GrShaderVar.h"
+#include "GrTextureAccess.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+
+class GrGLSLTextureSampler {
+public:
+    typedef GrGLSLProgramDataManager::UniformHandle UniformHandle;
+    typedef SkTArray<GrGLSLTextureSampler> TextureSamplerArray;
+
+    GrGLSLTextureSampler(UniformHandle uniform, const GrTextureAccess& access)
+        : fSamplerUniform(uniform)
+        , fConfig(access.getTexture()->config()) {
+        SkASSERT(kUnknown_GrPixelConfig != fConfig);
+        memcpy(fSwizzle, access.getSwizzle(), 5);
+    }
+
+    GrPixelConfig config() const { return fConfig; }
+    // this is .abcd
+    const char* swizzle() const { return fSwizzle; }
+
+private:
+    UniformHandle fSamplerUniform;
+    GrPixelConfig fConfig;
+    char          fSwizzle[5];
+
+    friend class GrGLSLShaderBuilder;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLUtil.cpp b/gfx/skia/skia/src/gpu/glsl/GrGLSLUtil.cpp
new file mode 100644
index 000000000000..5a333244b295
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLUtil.cpp
@@ -0,0 +1,52 @@
+/*
+* Copyright 2015 Google Inc.
+*
+* Use of this source code is governed by a BSD-style license that can be
+* found in the LICENSE file.
+*/
+
+#include "GrGLSLUtil.h"
+#include "SkMatrix.h"
+
+template<> void GrGLSLGetMatrix<3>(float* dest, const SkMatrix& src) {
+    // Col 0
+    dest[0] = SkScalarToFloat(src[SkMatrix::kMScaleX]);
+    dest[1] = SkScalarToFloat(src[SkMatrix::kMSkewY]);
+    dest[2] = SkScalarToFloat(src[SkMatrix::kMPersp0]);
+
+    // Col 1
+    dest[3] = SkScalarToFloat(src[SkMatrix::kMSkewX]);
+    dest[4] = SkScalarToFloat(src[SkMatrix::kMScaleY]);
+    dest[5] = SkScalarToFloat(src[SkMatrix::kMPersp1]);
+
+    // Col 2
+    dest[6] = SkScalarToFloat(src[SkMatrix::kMTransX]);
+    dest[7] = SkScalarToFloat(src[SkMatrix::kMTransY]);
+    dest[8] = SkScalarToFloat(src[SkMatrix::kMPersp2]);
+}
+
+template<> void GrGLSLGetMatrix<4>(float* dest, const SkMatrix& src) {
+    // Col 0
+    dest[0] = SkScalarToFloat(src[SkMatrix::kMScaleX]);
+    dest[1] = SkScalarToFloat(src[SkMatrix::kMSkewY]);
+    dest[2] = 0;
+    dest[3] = SkScalarToFloat(src[SkMatrix::kMPersp0]);
+
+    // Col 1
+    dest[4] = SkScalarToFloat(src[SkMatrix::kMSkewX]);
+    dest[5] = SkScalarToFloat(src[SkMatrix::kMScaleY]);
+    dest[6] = 0;
+    dest[7] = SkScalarToFloat(src[SkMatrix::kMPersp1]);
+
+    // Col 2
+    dest[8] = 0;
+    dest[9] = 0;
+    dest[10] = 1;
+    dest[11] = 0;
+
+    // Col 3
+    dest[12] = SkScalarToFloat(src[SkMatrix::kMTransX]);
+    dest[13] = SkScalarToFloat(src[SkMatrix::kMTransY]);
+    dest[14] = 0;
+    dest[15] = SkScalarToFloat(src[SkMatrix::kMPersp2]);
+}
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLUtil.h b/gfx/skia/skia/src/gpu/glsl/GrGLSLUtil.h
new file mode 100644
index 000000000000..0d2b7e742f4d
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLUtil.h
@@ -0,0 +1,19 @@
+/*
+* Copyright 2015 Google Inc.
+*
+* Use of this source code is governed by a BSD-style license that can be
+* found in the LICENSE file.
+*/
+
+#ifndef GrGLSLUtil_DEFINED
+#define GrGLSLUtil_DEFINED
+
+class SkMatrix;
+
+/**
+ * Helper for converting SkMatrix to a column-major float array. We assume that all GLSL backends
+ * use a column major representation for matrices.
+ */
+template<int MatrixSize> void GrGLSLGetMatrix(float* dest, const SkMatrix& src);
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLVarying.cpp b/gfx/skia/skia/src/gpu/glsl/GrGLSLVarying.cpp
new file mode 100644
index 000000000000..279dd5937e92
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLVarying.cpp
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "glsl/GrGLSLVarying.h"
+
+#include "glsl/GrGLSLProgramBuilder.h"
+
+void GrGLSLVaryingHandler::addPassThroughAttribute(const GrGeometryProcessor::Attribute* input,
+                                                   const char* output) {
+    GrSLType type = GrVertexAttribTypeToSLType(input->fType);
+    GrGLSLVertToFrag v(type);
+    this->addVarying(input->fName, &v);
+    fProgramBuilder->fVS.codeAppendf("%s = %s;", v.vsOut(), input->fName);
+
+    if (fProgramBuilder->primitiveProcessor().willUseGeoShader()) {
+        fProgramBuilder->fGS.codeAppendf("%s = %s[0];", v.gsOut(), v.gsIn());
+    }
+
+    fProgramBuilder->fFS.codeAppendf("%s = %s;", output, v.fsIn());
+}
+
+void GrGLSLVaryingHandler::addVarying(const char* name,
+                                      GrGLSLVarying* varying,
+                                      GrSLPrecision precision) {
+    SkASSERT(varying);
+    if (varying->vsVarying()) {
+        this->addVertexVarying(name, precision, varying);
+    }
+    if (fProgramBuilder->primitiveProcessor().willUseGeoShader()) {
+        this->addGeomVarying(name, precision, varying);
+    }
+    if (varying->fsVarying()) {
+        this->addFragVarying(precision, varying);
+    }
+}
+
+void GrGLSLVaryingHandler::addVertexVarying(const char* name,
+                                            GrSLPrecision precision,
+                                            GrGLSLVarying* v) {
+    fVertexOutputs.push_back();
+    fVertexOutputs.back().setType(v->fType);
+    fVertexOutputs.back().setTypeModifier(GrGLSLShaderVar::kVaryingOut_TypeModifier);
+    fVertexOutputs.back().setPrecision(precision);
+    fProgramBuilder->nameVariable(fVertexOutputs.back().accessName(), 'v', name);
+    v->fVsOut = fVertexOutputs.back().getName().c_str();
+}
+void GrGLSLVaryingHandler::addGeomVarying(const char* name,
+                                          GrSLPrecision precision,
+                                          GrGLSLVarying* v) {
+    // if we have a GS take each varying in as an array
+    // and output as non-array.
+    if (v->vsVarying()) {
+        fGeomInputs.push_back();
+        fGeomInputs.back().setType(v->fType);
+        fGeomInputs.back().setTypeModifier(GrGLSLShaderVar::kVaryingIn_TypeModifier);
+        fGeomInputs.back().setPrecision(precision);
+        fGeomInputs.back().setUnsizedArray();
+        *fGeomInputs.back().accessName() = v->fVsOut;
+        v->fGsIn = v->fVsOut;
+    }
+
+    if (v->fsVarying()) {
+        fGeomOutputs.push_back();
+        fGeomOutputs.back().setType(v->fType);
+        fGeomOutputs.back().setTypeModifier(GrGLSLShaderVar::kVaryingOut_TypeModifier);
+        fGeomOutputs.back().setPrecision(precision);
+        fProgramBuilder->nameVariable(fGeomOutputs.back().accessName(), 'g', name);
+        v->fGsOut = fGeomOutputs.back().getName().c_str();
+    }
+}
+
+void GrGLSLVaryingHandler::addFragVarying(GrSLPrecision precision, GrGLSLVarying* v) {
+    v->fFsIn = v->fGsOut ? v->fGsOut : v->fVsOut;
+    fFragInputs.push_back().set(v->fType,
+                                GrGLSLShaderVar::kVaryingIn_TypeModifier,
+                                v->fFsIn,
+                                precision);
+}
+
+void GrGLSLVaryingHandler::emitAttributes(const GrGeometryProcessor& gp) {
+    int vaCount = gp.numAttribs();
+    for (int i = 0; i < vaCount; i++) {
+        const GrGeometryProcessor::Attribute& attr = gp.getAttrib(i);
+        this->addAttribute(GrShaderVar(attr.fName,
+                                       GrVertexAttribTypeToSLType(attr.fType),
+                                       GrShaderVar::kAttribute_TypeModifier,
+                                       GrShaderVar::kNonArray,
+                                       attr.fPrecision));
+    }
+}
+
+void GrGLSLVaryingHandler::addAttribute(const GrShaderVar& var) {
+    SkASSERT(GrShaderVar::kAttribute_TypeModifier == var.getTypeModifier());
+    for (int j = 0; j < fVertexInputs.count(); ++j) {
+        const GrGLSLShaderVar& attr = fVertexInputs[j];
+        // if attribute already added, don't add it again
+        if (attr.getName().equals(var.getName())) {
+            return;
+        }
+    }
+    fVertexInputs.push_back(var);
+}
+
+void GrGLSLVaryingHandler::appendDecls(const VarArray& vars, SkString* out) const {
+    for (int i = 0; i < vars.count(); ++i) {
+        vars[i].appendDecl(fProgramBuilder->glslCaps(), out);
+        out->append(";");
+    }
+}
+
+void GrGLSLVaryingHandler::getVertexDecls(SkString* inputDecls, SkString* outputDecls) const {
+    this->appendDecls(fVertexInputs, inputDecls);
+    this->appendDecls(fVertexOutputs, outputDecls);
+}
+
+void GrGLSLVaryingHandler::getGeomDecls(SkString* inputDecls, SkString* outputDecls) const {
+    this->appendDecls(fGeomInputs, inputDecls);
+    this->appendDecls(fGeomOutputs, outputDecls);
+}
+
+void GrGLSLVaryingHandler::getFragDecls(SkString* inputDecls, SkString* outputDecls) const {
+    // We should not have any outputs in the fragment shader when using version 1.10
+    SkASSERT(k110_GrGLSLGeneration != fProgramBuilder->glslCaps()->generation() ||
+             fFragOutputs.empty());
+    this->appendDecls(fFragInputs, inputDecls);
+    this->appendDecls(fFragOutputs, outputDecls);
+}
+
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLVarying.h b/gfx/skia/skia/src/gpu/glsl/GrGLSLVarying.h
new file mode 100644
index 000000000000..116ba09b99bd
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLVarying.h
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGLSLVarying_DEFINED
+#define GrGLSLVarying_DEFINED
+
+#include "GrAllocator.h"
+#include "GrGeometryProcessor.h"
+#include "GrTypesPriv.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+#include "glsl/GrGLSLShaderVar.h"
+
+class GrGLSLProgramBuilder;
+
+class GrGLSLVarying {
+public:
+    bool vsVarying() const { return kVertToFrag_Varying == fVarying ||
+                                    kVertToGeo_Varying == fVarying; }
+    bool fsVarying() const { return kVertToFrag_Varying == fVarying ||
+                                    kGeoToFrag_Varying == fVarying; }
+    const char* vsOut() const { return fVsOut; }
+    const char* gsIn() const { return fGsIn; }
+    const char* gsOut() const { return fGsOut; }
+    const char* fsIn() const { return fFsIn; }
+    GrSLType type() const { return fType; }
+
+protected:
+    enum Varying {
+        kVertToFrag_Varying,
+        kVertToGeo_Varying,
+        kGeoToFrag_Varying,
+    };
+
+    GrGLSLVarying(GrSLType type, Varying varying)
+        : fVarying(varying), fType(type), fVsOut(nullptr), fGsIn(nullptr), fGsOut(nullptr),
+          fFsIn(nullptr) {}
+
+    Varying fVarying;
+
+private:
+    GrSLType fType;
+    const char* fVsOut;
+    const char* fGsIn;
+    const char* fGsOut;
+    const char* fFsIn;
+
+    friend class GrGLSLVaryingHandler;
+};
+
+struct GrGLSLVertToFrag : public GrGLSLVarying {
+    GrGLSLVertToFrag(GrSLType type)
+        : GrGLSLVarying(type, kVertToFrag_Varying) {}
+};
+
+struct GrGLSLVertToGeo : public GrGLSLVarying {
+    GrGLSLVertToGeo(GrSLType type)
+        : GrGLSLVarying(type, kVertToGeo_Varying) {}
+};
+
+struct GrGLSLGeoToFrag : public GrGLSLVarying {
+    GrGLSLGeoToFrag(GrSLType type)
+        : GrGLSLVarying(type, kGeoToFrag_Varying) {}
+};
+
+static const int kVaryingsPerBlock = 8;
+
+class GrGLSLVaryingHandler {
+public:
+    explicit GrGLSLVaryingHandler(GrGLSLProgramBuilder* program)
+        : fVertexInputs(kVaryingsPerBlock)
+        , fVertexOutputs(kVaryingsPerBlock)
+        , fGeomInputs(kVaryingsPerBlock)
+        , fGeomOutputs(kVaryingsPerBlock)
+        , fFragInputs(kVaryingsPerBlock)
+        , fFragOutputs(kVaryingsPerBlock)
+        , fProgramBuilder(program) {}
+
+    typedef GrTAllocator<GrGLSLShaderVar> VarArray;
+    typedef GrGLSLProgramDataManager::VaryingHandle VaryingHandle;
+
+    /*
+     * addVarying allows fine grained control for setting up varyings between stages. Calling this
+     * functions will make sure all necessary decls are setup for the client. The client however is
+     * responsible for setting up all shader code (e.g "vOut = vIn;") If you just need to take an
+     * attribute and pass it through to an output value in a fragment shader, use
+     * addPassThroughAttribute.
+     * TODO convert most uses of addVarying to addPassThroughAttribute
+     */
+    void addVarying(const char* name,
+                    GrGLSLVarying*,
+                    GrSLPrecision precision = kDefault_GrSLPrecision);
+
+    /*
+     * This call can be used by GP to pass an attribute through all shaders directly to 'output' in
+     * the fragment shader.  Though this call effects both the vertex shader and fragment shader,
+     * it expects 'output' to be defined in the fragment shader before this call is made. If there
+     * is a geometry shader, we will simply take the value of the varying from the first vertex and
+     * that will be set as the output varying for all emitted vertices.
+     * TODO it might be nicer behavior to have a flag to declare output inside this call
+     */
+    void addPassThroughAttribute(const GrGeometryProcessor::Attribute*, const char* output);
+
+    void emitAttributes(const GrGeometryProcessor& gp);
+
+    void getVertexDecls(SkString* inputDecls, SkString* outputDecls) const;
+    void getGeomDecls(SkString* inputDecls, SkString* outputDecls) const;
+    void getFragDecls(SkString* inputDecls, SkString* outputDecls) const;
+protected:
+    VarArray fVertexInputs;
+    VarArray fVertexOutputs;
+    VarArray fGeomInputs;
+    VarArray fGeomOutputs;
+    VarArray fFragInputs;
+    VarArray fFragOutputs;
+
+    // This is not owned by the class
+    GrGLSLProgramBuilder* fProgramBuilder;
+
+private:
+    void addVertexVarying(const char* name, GrSLPrecision precision, GrGLSLVarying* v);
+    void addGeomVarying(const char* name, GrSLPrecision precision, GrGLSLVarying* v);
+    void addFragVarying(GrSLPrecision precision, GrGLSLVarying* v);
+
+    void addAttribute(const GrShaderVar& var);
+
+    // helper function for get*Decls
+    void appendDecls(const VarArray& vars, SkString* out) const;
+
+    friend class GrGLSLProgramBuilder;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLVertexShaderBuilder.cpp b/gfx/skia/skia/src/gpu/glsl/GrGLSLVertexShaderBuilder.cpp
new file mode 100644
index 000000000000..73c0fcd81e1d
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLVertexShaderBuilder.cpp
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrGLSLVertexShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLVarying.h"
+
+GrGLSLVertexBuilder::GrGLSLVertexBuilder(GrGLSLProgramBuilder* program)
+    : INHERITED(program)
+    , fRtAdjustName(nullptr) {
+}
+
+void GrGLSLVertexBuilder::transformToNormalizedDeviceSpace(const GrShaderVar& posVar) {
+    SkASSERT(!fRtAdjustName);
+
+    GrSLPrecision precision = kDefault_GrSLPrecision;
+    if (fProgramBuilder->glslCaps()->forceHighPrecisionNDSTransform()) {
+        precision = kHigh_GrSLPrecision;
+    }
+
+    // setup RT Uniform
+    fProgramBuilder->fUniformHandles.fRTAdjustmentUni =
+            fProgramBuilder->addUniform(GrGLSLProgramBuilder::kVertex_Visibility,
+                                        kVec4f_GrSLType, precision,
+                                        fProgramBuilder->rtAdjustment(),
+                                        &fRtAdjustName);
+    if (this->getProgramBuilder()->desc().header().fSnapVerticesToPixelCenters) {
+        if (kVec3f_GrSLType == posVar.getType()) {
+            const char* p = posVar.c_str();
+            this->codeAppendf("{vec2 _posTmp = vec2(%s.x/%s.z, %s.y/%s.z);", p, p, p, p);
+        } else {
+            SkASSERT(kVec2f_GrSLType == posVar.getType());
+            this->codeAppendf("{vec2 _posTmp = %s;", posVar.c_str());
+        }
+        this->codeAppendf("_posTmp = floor(_posTmp) + vec2(0.5, 0.5);"
+                          "gl_Position = vec4(_posTmp.x * %s.x + %s.y,"
+                                             "_posTmp.y * %s.z + %s.w, 0, 1);}",
+                          fRtAdjustName, fRtAdjustName, fRtAdjustName, fRtAdjustName);
+    } else if (kVec3f_GrSLType == posVar.getType()) {
+        this->codeAppendf("gl_Position = vec4(dot(%s.xz, %s.xy), dot(%s.yz, %s.zw), 0, %s.z);",
+                          posVar.c_str(), fRtAdjustName,
+                          posVar.c_str(), fRtAdjustName,
+                          posVar.c_str());
+    } else {
+        SkASSERT(kVec2f_GrSLType == posVar.getType());
+        this->codeAppendf("gl_Position = vec4(%s.x * %s.x + %s.y, %s.y * %s.z + %s.w, 0, 1);",
+                          posVar.c_str(), fRtAdjustName, fRtAdjustName,
+                          posVar.c_str(), fRtAdjustName, fRtAdjustName);
+    }
+    // We could have the GrGeometryProcessor do this, but its just easier to have it performed
+    // here. If we ever need to set variable pointsize, then we can reinvestigate
+    this->codeAppend("gl_PointSize = 1.0;");
+}
+
+void GrGLSLVertexBuilder::onFinalize() {
+    fProgramBuilder->varyingHandler()->getVertexDecls(&this->inputs(), &this->outputs());
+}
+
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLVertexShaderBuilder.h b/gfx/skia/skia/src/gpu/glsl/GrGLSLVertexShaderBuilder.h
new file mode 100644
index 000000000000..b76721fd00b8
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLVertexShaderBuilder.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGLSLVertexShader_DEFINED
+#define GrGLSLVertexShader_DEFINED
+
+#include "GrGLSLShaderBuilder.h"
+#include "GrGeometryProcessor.h"
+
+class GrGLSLVarying;
+
+class GrGLSLVertexBuilder : public GrGLSLShaderBuilder {
+public:
+    GrGLSLVertexBuilder(GrGLSLProgramBuilder* program);
+
+    void transformToNormalizedDeviceSpace(const GrShaderVar& posVar);
+private:
+    void onFinalize() override;
+    
+    const char* fRtAdjustName;
+
+    friend class GrGLProgramBuilder;
+
+    typedef GrGLSLShaderBuilder INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLXferProcessor.cpp b/gfx/skia/skia/src/gpu/glsl/GrGLSLXferProcessor.cpp
new file mode 100644
index 000000000000..b6af968651aa
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLXferProcessor.cpp
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "glsl/GrGLSLXferProcessor.h"
+
+#include "GrXferProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLProgramBuilder.h"
+#include "glsl/GrGLSLProgramDataManager.h"
+
+void GrGLSLXferProcessor::emitCode(const EmitArgs& args) {
+    if (!args.fXP.willReadDstColor()) {
+        this->emitOutputsForBlendState(args);
+        return;
+    }
+
+    GrGLSLXPFragmentBuilder* fragBuilder = args.fXPFragBuilder;
+    const char* dstColor = fragBuilder->dstColor();
+
+    if (args.fXP.getDstTexture()) {
+        bool topDown = kTopLeft_GrSurfaceOrigin == args.fXP.getDstTexture()->origin();
+
+        if (args.fInputCoverage) {
+            // We don't think any shaders actually output negative coverage, but just as a safety
+            // check for floating point precision errors we compare with <= here
+            fragBuilder->codeAppendf("if (all(lessThanEqual(%s, vec4(0)))) {"
+                                     "    discard;"
+                                     "}", args.fInputCoverage);
+        }
+
+        const char* dstTopLeftName;
+        const char* dstCoordScaleName;
+
+        fDstTopLeftUni = args.fPB->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                              kVec2f_GrSLType,
+                                              kDefault_GrSLPrecision,
+                                              "DstTextureUpperLeft",
+                                              &dstTopLeftName);
+        fDstScaleUni = args.fPB->addUniform(GrGLSLProgramBuilder::kFragment_Visibility,
+                                            kVec2f_GrSLType,
+                                            kDefault_GrSLPrecision,
+                                            "DstTextureCoordScale",
+                                            &dstCoordScaleName);
+        const char* fragPos = fragBuilder->fragmentPosition();
+
+        fragBuilder->codeAppend("// Read color from copy of the destination.\n");
+        fragBuilder->codeAppendf("vec2 _dstTexCoord = (%s.xy - %s) * %s;",
+                                 fragPos, dstTopLeftName, dstCoordScaleName);
+
+        if (!topDown) {
+            fragBuilder->codeAppend("_dstTexCoord.y = 1.0 - _dstTexCoord.y;");
+        }
+
+        fragBuilder->codeAppendf("vec4 %s = ", dstColor);
+        fragBuilder->appendTextureLookup(args.fSamplers[0], "_dstTexCoord", kVec2f_GrSLType);
+        fragBuilder->codeAppend(";");
+    }
+
+    this->emitBlendCodeForDstRead(args.fPB,
+                                  fragBuilder,
+                                  args.fInputColor,
+                                  args.fInputCoverage,
+                                  dstColor,
+                                  args.fOutputPrimary,
+                                  args.fOutputSecondary,
+                                  args.fXP);
+}
+
+void GrGLSLXferProcessor::setData(const GrGLSLProgramDataManager& pdm, const GrXferProcessor& xp) {
+    if (xp.getDstTexture()) {
+        if (fDstTopLeftUni.isValid()) {
+            pdm.set2f(fDstTopLeftUni, static_cast<float>(xp.dstTextureOffset().fX),
+                      static_cast<float>(xp.dstTextureOffset().fY));
+            pdm.set2f(fDstScaleUni, 1.f / xp.getDstTexture()->width(),
+                      1.f / xp.getDstTexture()->height());
+        } else {
+            SkASSERT(!fDstScaleUni.isValid());
+        }
+    } else {
+        SkASSERT(!fDstTopLeftUni.isValid());
+        SkASSERT(!fDstScaleUni.isValid());
+    }
+    this->onSetData(pdm, xp);
+}
+
diff --git a/gfx/skia/skia/src/gpu/glsl/GrGLSLXferProcessor.h b/gfx/skia/skia/src/gpu/glsl/GrGLSLXferProcessor.h
new file mode 100644
index 000000000000..3707d934592b
--- /dev/null
+++ b/gfx/skia/skia/src/gpu/glsl/GrGLSLXferProcessor.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGLSLXferProcessor_DEFINED
+#define GrGLSLXferProcessor_DEFINED
+
+#include "glsl/GrGLSLProgramDataManager.h"
+#include "glsl/GrGLSLTextureSampler.h"
+
+class GrXferProcessor;
+class GrGLSLXPBuilder;
+class GrGLSLXPFragmentBuilder;
+class GrGLSLCaps;
+
+class GrGLSLXferProcessor {
+public:
+    GrGLSLXferProcessor() {}
+    virtual ~GrGLSLXferProcessor() {}
+
+    typedef GrGLSLTextureSampler::TextureSamplerArray TextureSamplerArray;
+    struct EmitArgs {
+        EmitArgs(GrGLSLXPBuilder* pb,
+                 GrGLSLXPFragmentBuilder* fragBuilder,
+                 const GrGLSLCaps* caps,
+                 const GrXferProcessor& xp,
+                 const char* inputColor,
+                 const char* inputCoverage,
+                 const char* outputPrimary,
+                 const char* outputSecondary,
+                 const TextureSamplerArray& samplers)
+            : fPB(pb)
+            , fXPFragBuilder(fragBuilder)
+            , fGLSLCaps(caps)
+            , fXP(xp)
+            , fInputColor(inputColor)
+            , fInputCoverage(inputCoverage)
+            , fOutputPrimary(outputPrimary)
+            , fOutputSecondary(outputSecondary)
+            , fSamplers(samplers) {}
+
+        GrGLSLXPBuilder* fPB;
+        GrGLSLXPFragmentBuilder* fXPFragBuilder;
+        const GrGLSLCaps* fGLSLCaps;
+        const GrXferProcessor& fXP;
+        const char* fInputColor;
+        const char* fInputCoverage;
+        const char* fOutputPrimary;
+        const char* fOutputSecondary;
+        const TextureSamplerArray& fSamplers;
+    };
+    /**
+     * This is similar to emitCode() in the base class, except it takes a full shader builder.
+     * This allows the effect subclass to emit vertex code.
+     */
+    void emitCode(const EmitArgs&);
+
+    /** A GrGLSLXferProcessor instance can be reused with any GrGLSLXferProcessor that produces
+        the same stage key; this function reads data from a GrGLSLXferProcessor and uploads any
+        uniform variables required  by the shaders created in emitCode(). The GrXferProcessor
+        parameter is guaranteed to be of the same type that created this GrGLSLXferProcessor and
+        to have an identical processor key as the one that created this GrGLSLXferProcessor. This
+        function calls onSetData on the subclass of GrGLSLXferProcessor
+     */
+    void setData(const GrGLSLProgramDataManager& pdm, const GrXferProcessor& xp);
+
+private:
+    /**
+     * Called by emitCode() when the XP will not be performing a dst read. This method is
+     * responsible for both blending and coverage. A subclass only needs to implement this method if
+     * it can construct a GrXferProcessor that will not read the dst color.
+     */
+    virtual void emitOutputsForBlendState(const EmitArgs&) {
+        SkFAIL("emitOutputsForBlendState not implemented.");
+    }
+
+    /**
+     * Called by emitCode() when the XP will perform a dst read. This method only needs to supply
+     * the blending logic. The base class applies coverage. A subclass only needs to implement this
+     * method if it can construct a GrXferProcessor that reads the dst color.
+     */
+    virtual void emitBlendCodeForDstRead(GrGLSLXPBuilder*,
+                                         GrGLSLXPFragmentBuilder*,
+                                         const char* srcColor,
+                                         const char* srcCoverage,
+                                         const char* dstColor,
+                                         const char* outColor,
+                                         const char* outColorSecondary,
+                                         const GrXferProcessor&) {
+        SkFAIL("emitBlendCodeForDstRead not implemented.");
+    }
+
+    virtual void onSetData(const GrGLSLProgramDataManager&, const GrXferProcessor&) = 0;
+
+    GrGLSLProgramDataManager::UniformHandle fDstTopLeftUni;
+    GrGLSLProgramDataManager::UniformHandle fDstScaleUni;
+};
+#endif
diff --git a/gfx/skia/skia/src/gpu/gl/GrGLSL_impl.h b/gfx/skia/skia/src/gpu/glsl/GrGLSL_impl.h
similarity index 100%
rename from gfx/skia/skia/src/gpu/gl/GrGLSL_impl.h
rename to gfx/skia/skia/src/gpu/glsl/GrGLSL_impl.h
diff --git a/gfx/skia/skia/src/image/SkImage.cpp b/gfx/skia/skia/src/image/SkImage.cpp
index c812f58eff6d..be837f28a8fa 100644
--- a/gfx/skia/skia/src/image/SkImage.cpp
+++ b/gfx/skia/skia/src/image/SkImage.cpp
@@ -6,82 +6,168 @@
  */
 
 #include "SkBitmap.h"
+#include "SkBitmapCache.h"
 #include "SkCanvas.h"
+#include "SkData.h"
+#include "SkImageGenerator.h"
 #include "SkImagePriv.h"
+#include "SkImageShader.h"
 #include "SkImage_Base.h"
+#include "SkNextID.h"
+#include "SkPixelRef.h"
+#include "SkPixelSerializer.h"
+#include "SkReadPixelsRec.h"
+#include "SkString.h"
+#include "SkSurface.h"
 
-static SkImage_Base* as_IB(SkImage* image) {
-    return static_cast<SkImage_Base*>(image);
-}
+#if SK_SUPPORT_GPU
+#include "GrTexture.h"
+#include "GrContext.h"
+#include "SkImage_Gpu.h"
+#endif
 
-static const SkImage_Base* as_IB(const SkImage* image) {
-    return static_cast<const SkImage_Base*>(image);
-}
-
-uint32_t SkImage::NextUniqueID() {
-    static int32_t gUniqueID;
-
-    // never return 0;
-    uint32_t id;
-    do {
-        id = sk_atomic_inc(&gUniqueID) + 1;
-    } while (0 == id);
-    return id;
-}
-
-void SkImage::draw(SkCanvas* canvas, SkScalar x, SkScalar y,
-                   const SkPaint* paint) {
-    as_IB(this)->onDraw(canvas, x, y, paint);
-}
-
-void SkImage::draw(SkCanvas* canvas, const SkRect* src, const SkRect& dst,
-                   const SkPaint* paint) {
-    as_IB(this)->onDrawRectToRect(canvas, src, dst, paint);
+SkImage::SkImage(int width, int height, uint32_t uniqueID)
+    : fWidth(width)
+    , fHeight(height)
+    , fUniqueID(kNeedNewImageUniqueID == uniqueID ? SkNextID::ImageID() : uniqueID)
+{
+    SkASSERT(width > 0);
+    SkASSERT(height > 0);
 }
 
 const void* SkImage::peekPixels(SkImageInfo* info, size_t* rowBytes) const {
     SkImageInfo infoStorage;
     size_t rowBytesStorage;
-    if (NULL == info) {
+    if (nullptr == info) {
         info = &infoStorage;
     }
-    if (NULL == rowBytes) {
+    if (nullptr == rowBytes) {
         rowBytes = &rowBytesStorage;
     }
     return as_IB(this)->onPeekPixels(info, rowBytes);
 }
 
-bool SkImage::readPixels(SkBitmap* bitmap, const SkIRect* subset) const {
-    if (NULL == bitmap) {
+bool SkImage::readPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes,
+                           int srcX, int srcY, CachingHint chint) const {
+    SkReadPixelsRec rec(dstInfo, dstPixels, dstRowBytes, srcX, srcY);
+    if (!rec.trim(this->width(), this->height())) {
         return false;
     }
+    return as_IB(this)->onReadPixels(rec.fInfo, rec.fPixels, rec.fRowBytes, rec.fX, rec.fY, chint);
+}
 
-    SkIRect bounds = SkIRect::MakeWH(this->width(), this->height());
+bool SkImage::scalePixels(const SkPixmap& dst, SkFilterQuality quality, CachingHint chint) const {
+    if (this->width() == dst.width() && this->height() == dst.height()) {
+        return this->readPixels(dst, 0, 0, chint);
+    }
 
-    // trim against the bitmap, if its already been allocated
-    if (bitmap->pixelRef()) {
-        bounds.fRight = SkMin32(bounds.fRight, bitmap->width());
-        bounds.fBottom = SkMin32(bounds.fBottom, bitmap->height());
-        if (bounds.isEmpty()) {
-            return false;
+    // Idea: If/when SkImageGenerator supports a native-scaling API (where the generator itself
+    //       can scale more efficiently) we should take advantage of it here.
+    //
+    SkBitmap bm;
+    if (as_IB(this)->getROPixels(&bm, chint)) {
+        bm.lockPixels();
+        SkPixmap pmap;
+        // Note: By calling the pixmap scaler, we never cache the final result, so the chint
+        //       is (currently) only being applied to the getROPixels. If we get a request to
+        //       also attempt to cache the final (scaled) result, we would add that logic here.
+        //
+        return bm.peekPixels(&pmap) && pmap.scalePixels(dst, quality);
+    }
+    return false;
+}
+
+void SkImage::preroll(GrContext* ctx) const {
+    // For now, and to maintain parity w/ previous pixelref behavior, we just force the image
+    // to produce a cached raster-bitmap form, so that drawing to a raster canvas should be fast.
+    //
+    SkBitmap bm;
+    if (as_IB(this)->getROPixels(&bm)) {
+        bm.lockPixels();
+        bm.unlockPixels();
+    }
+}
+
+SkImage* SkImage::applyFilter(SkImageFilter* filter, SkIPoint* offset,
+                              bool forceResultToOriginalSize) const {
+    if (!filter) {
+        return nullptr;
+    }
+
+    SkIPoint offsetStorage;
+    if (!offset) {
+        offset = &offsetStorage;
+    }
+    return as_IB(this)->onApplyFilter(filter, offset, forceResultToOriginalSize);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#include "SkImageFilter.h"
+#include "SkBitmapDevice.h"
+
+static SkIRect compute_fast_ibounds(SkImageFilter* filter, const SkIRect& srcBounds) {
+    SkRect fastBounds;
+    fastBounds.set(srcBounds);
+    filter->computeFastBounds(fastBounds, &fastBounds);
+    return fastBounds.roundOut();
+}
+
+class SkRasterImageFilterProxy : public SkImageFilter::Proxy {
+public:
+    SkBaseDevice* createDevice(int width, int height) override {
+        return SkBitmapDevice::Create(SkImageInfo::MakeN32Premul(width, height));
+    }
+
+    bool filterImage(const SkImageFilter*, const SkBitmap&, const SkImageFilter::Context&,
+                     SkBitmap*, SkIPoint*) override {
+        return false;
+    }
+};
+
+SkImage* SkImage_Base::onApplyFilter(SkImageFilter* filter, SkIPoint* offsetResult,
+                                     bool forceResultToOriginalSize) const {
+    SkBitmap src;
+    if (!this->getROPixels(&src)) {
+        return nullptr;
+    }
+
+    const SkIRect srcBounds = SkIRect::MakeWH(this->width(), this->height());
+
+    if (forceResultToOriginalSize) {
+        const SkIRect clipBounds = srcBounds;
+        SkRasterImageFilterProxy proxy;
+        SkImageFilter::Context ctx(SkMatrix::I(), clipBounds, SkImageFilter::Cache::Get(),
+                                   SkImageFilter::kExact_SizeConstraint);
+
+        SkBitmap dst;
+        if (filter->filterImage(&proxy, src, ctx, &dst, offsetResult)) {
+            dst.setImmutable();
+            return SkImage::NewFromBitmap(dst);
         }
-    }
+    } else {
+        const SkIRect dstR = compute_fast_ibounds(filter, srcBounds);
 
-    if (subset && !bounds.intersect(*subset)) {
-        // perhaps we could return true + empty-bitmap?
-        return false;
+        SkImageInfo info = SkImageInfo::MakeN32Premul(dstR.width(), dstR.height());
+        SkAutoTUnref<SkSurface> surface(this->onNewSurface(info));
+
+        SkPaint paint;
+        paint.setImageFilter(filter);
+        surface->getCanvas()->drawImage(this, SkIntToScalar(-dstR.x()), SkIntToScalar(-dstR.y()),
+                                        &paint);
+
+        offsetResult->set(dstR.x(), dstR.y());
+        return surface->newImageSnapshot();
     }
-    return as_IB(this)->onReadPixels(bitmap, bounds);
+    return nullptr;
 }
 
-GrTexture* SkImage::getTexture() {
-    return as_IB(this)->onGetTexture();
-}
+///////////////////////////////////////////////////////////////////////////////////////////////////
 
 SkShader* SkImage::newShader(SkShader::TileMode tileX,
                              SkShader::TileMode tileY,
                              const SkMatrix* localMatrix) const {
-    return as_IB(this)->onNewShader(tileX, tileY, localMatrix);
+    return SkImageShader::Create(this, tileX, tileY, localMatrix);
 }
 
 SkData* SkImage::encode(SkImageEncoder::Type type, int quality) const {
@@ -89,15 +175,116 @@ SkData* SkImage::encode(SkImageEncoder::Type type, int quality) const {
     if (as_IB(this)->getROPixels(&bm)) {
         return SkImageEncoder::EncodeData(bm, type, quality);
     }
-    return NULL;
+    return nullptr;
 }
 
+namespace {
+
+class DefaultSerializer :  public SkPixelSerializer {
+protected:
+    bool onUseEncodedData(const void *data, size_t len) override {
+        return true;
+    }
+
+    SkData* onEncodePixels(const SkImageInfo& info, const void* pixels, size_t rowBytes) override {
+        return SkImageEncoder::EncodeData(info, pixels, rowBytes, SkImageEncoder::kPNG_Type, 100);
+    }
+};
+
+} // anonymous namespace
+
+SkData* SkImage::encode(SkPixelSerializer* serializer) const {
+    DefaultSerializer defaultSerializer;
+    SkPixelSerializer* effectiveSerializer = serializer ? serializer : &defaultSerializer;
+
+    SkAutoTUnref<SkData> encoded(this->refEncoded());
+    if (encoded && effectiveSerializer->useEncodedData(encoded->data(), encoded->size())) {
+        return encoded.detach();
+    }
+
+    SkBitmap bm;
+    SkAutoPixmapUnlock apu;
+    if (as_IB(this)->getROPixels(&bm) && bm.requestLock(&apu)) {
+        const SkPixmap& pmap = apu.pixmap();
+        return effectiveSerializer->encodePixels(pmap.info(), pmap.addr(), pmap.rowBytes());
+    }
+
+    return nullptr;
+}
+
+SkData* SkImage::refEncoded() const {
+    return as_IB(this)->onRefEncoded();
+}
+
+SkImage* SkImage::NewFromEncoded(SkData* encoded, const SkIRect* subset) {
+    if (nullptr == encoded || 0 == encoded->size()) {
+        return nullptr;
+    }
+    SkImageGenerator* generator = SkImageGenerator::NewFromEncoded(encoded);
+    return generator ? SkImage::NewFromGenerator(generator, subset) : nullptr;
+}
+
+const char* SkImage::toString(SkString* str) const {
+    str->appendf("image: (id:%d (%d, %d) %s)", this->uniqueID(), this->width(), this->height(),
+                 this->isOpaque() ? "opaque" : "");
+    return str->c_str();
+}
+
+SkImage* SkImage::newSubset(const SkIRect& subset) const {
+    if (subset.isEmpty()) {
+        return nullptr;
+    }
+
+    const SkIRect bounds = SkIRect::MakeWH(this->width(), this->height());
+    if (!bounds.contains(subset)) {
+        return nullptr;
+    }
+
+    // optimization : return self if the subset == our bounds
+    if (bounds == subset) {
+        return SkRef(const_cast<SkImage*>(this));
+    }
+    return as_IB(this)->onNewSubset(subset);
+}
+
+#if SK_SUPPORT_GPU
+
+GrTexture* SkImage::getTexture() const {
+    return as_IB(this)->peekTexture();
+}
+
+bool SkImage::isTextureBacked() const { return SkToBool(as_IB(this)->getTexture()); }
+
+GrBackendObject SkImage::getTextureHandle(bool flushPendingGrContextIO) const {
+    GrTexture* texture = as_IB(this)->getTexture();
+    if (texture) {
+        GrContext* context = texture->getContext();
+        if (context) {            
+            if (flushPendingGrContextIO) {
+                context->prepareSurfaceForExternalIO(texture);
+            }
+        }
+        return texture->getTextureHandle();
+    }
+    return 0;
+}
+
+#else
+
+GrTexture* SkImage::getTexture() const { return nullptr; }
+
+bool SkImage::isTextureBacked() const { return false; }
+
+GrBackendObject SkImage::getTextureHandle(bool) const { return 0; }
+
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////
 
 static bool raster_canvas_supports(const SkImageInfo& info) {
-    switch (info.fColorType) {
+    switch (info.colorType()) {
         case kN32_SkColorType:
-            return kUnpremul_SkAlphaType != info.fAlphaType;
+            return kUnpremul_SkAlphaType != info.alphaType();
         case kRGB_565_SkColorType:
             return true;
         case kAlpha_8_SkColorType:
@@ -108,35 +295,132 @@ static bool raster_canvas_supports(const SkImageInfo& info) {
     return false;
 }
 
-bool SkImage_Base::onReadPixels(SkBitmap* bitmap, const SkIRect& subset) const {
-    if (bitmap->pixelRef()) {
-        const SkImageInfo info = bitmap->info();
-        if (kUnknown_SkColorType == info.colorType()) {
-            return false;
-        }
-        if (!raster_canvas_supports(info)) {
-            return false;
-        }
-    } else {
-        const SkImageInfo info = SkImageInfo::MakeN32Premul(subset.width(), subset.height());
-        SkBitmap tmp;
-        if (!tmp.allocPixels(info)) {
-            return false;
-        }
-        *bitmap = tmp;
+SkImage_Base::SkImage_Base(int width, int height, uint32_t uniqueID)
+    : INHERITED(width, height, uniqueID)
+    , fAddedToCache(false)
+{}
+
+SkImage_Base::~SkImage_Base() {
+    if (fAddedToCache.load()) {
+        SkNotifyBitmapGenIDIsStale(this->uniqueID());
+    }
+}
+
+bool SkImage_Base::onReadPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes,
+                                int srcX, int srcY, CachingHint) const {
+    if (!raster_canvas_supports(dstInfo)) {
+        return false;
     }
 
-    SkRect srcR, dstR;
-    srcR.set(subset);
-    dstR = srcR;
-    dstR.offset(-dstR.left(), -dstR.top());
-
-    SkCanvas canvas(*bitmap);
+    SkBitmap bm;
+    bm.installPixels(dstInfo, dstPixels, dstRowBytes);
+    SkCanvas canvas(bm);
 
     SkPaint paint;
-    paint.setXfermodeMode(SkXfermode::kClear_Mode);
-    canvas.drawRect(dstR, paint);
+    paint.setXfermodeMode(SkXfermode::kSrc_Mode);
+    canvas.drawImage(this, -SkIntToScalar(srcX), -SkIntToScalar(srcY), &paint);
 
-    const_cast<SkImage_Base*>(this)->onDrawRectToRect(&canvas, &srcR, dstR, NULL);
     return true;
 }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+bool SkImage::peekPixels(SkPixmap* pmap) const {
+    SkImageInfo info;
+    size_t rowBytes;
+    const void* pixels = this->peekPixels(&info, &rowBytes);
+    if (pixels) {
+        if (pmap) {
+            pmap->reset(info, pixels, rowBytes);
+        }
+        return true;
+    }
+    return false;
+}
+
+bool SkImage::readPixels(const SkPixmap& pmap, int srcX, int srcY, CachingHint chint) const {
+    return this->readPixels(pmap.info(), pmap.writable_addr(), pmap.rowBytes(), srcX, srcY, chint);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+SkImage* SkImage::NewFromBitmap(const SkBitmap& bm) {
+    SkPixelRef* pr = bm.pixelRef();
+    if (nullptr == pr) {
+        return nullptr;
+    }
+
+#if SK_SUPPORT_GPU
+    if (GrTexture* tex = pr->getTexture()) {
+        SkAutoTUnref<GrTexture> unrefCopy;
+        if (!bm.isImmutable()) {
+            const bool notBudgeted = false;
+            tex = GrDeepCopyTexture(tex, notBudgeted);
+            if (nullptr == tex) {
+                return nullptr;
+            }
+            unrefCopy.reset(tex);
+        }
+        const SkImageInfo info = bm.info();
+        return new SkImage_Gpu(info.width(), info.height(), bm.getGenerationID(), info.alphaType(),
+                               tex, SkSurface::kNo_Budgeted);
+    }
+#endif
+
+    // This will check for immutable (share or copy)
+    return SkNewImageFromRasterBitmap(bm);
+}
+
+bool SkImage::asLegacyBitmap(SkBitmap* bitmap, LegacyBitmapMode mode) const {
+    return as_IB(this)->onAsLegacyBitmap(bitmap, mode);
+}
+
+bool SkImage_Base::onAsLegacyBitmap(SkBitmap* bitmap, LegacyBitmapMode mode) const {
+    // As the base-class, all we can do is make a copy (regardless of mode).
+    // Subclasses that want to be more optimal should override.
+    SkImageInfo info = SkImageInfo::MakeN32(this->width(), this->height(),
+                                    this->isOpaque() ? kOpaque_SkAlphaType : kPremul_SkAlphaType);
+    if (!bitmap->tryAllocPixels(info)) {
+        return false;
+    }
+    if (!this->readPixels(bitmap->info(), bitmap->getPixels(), bitmap->rowBytes(), 0, 0)) {
+        bitmap->reset();
+        return false;
+    }
+
+    if (kRO_LegacyBitmapMode == mode) {
+        bitmap->setImmutable();
+    }
+    return true;
+}
+
+SkImage* SkImage::NewFromPicture(const SkPicture* picture, const SkISize& dimensions,
+                                 const SkMatrix* matrix, const SkPaint* paint) {
+    if (!picture) {
+        return nullptr;
+    }
+    return NewFromGenerator(SkImageGenerator::NewFromPicture(dimensions, picture, matrix, paint));
+}
+
+bool SkImage::isLazyGenerated() const {
+    return as_IB(this)->onIsLazyGenerated();
+}
+
+//////////////////////////////////////////////////////////////////////////////////////
+
+#if !SK_SUPPORT_GPU
+
+SkImage* SkImage::NewFromTexture(GrContext*, const GrBackendTextureDesc&, SkAlphaType,
+                                 TextureReleaseProc, ReleaseContext) {
+    return nullptr;
+}
+
+SkImage* SkImage::NewFromAdoptedTexture(GrContext*, const GrBackendTextureDesc&, SkAlphaType) {
+    return nullptr;
+}
+
+SkImage* SkImage::NewFromTextureCopy(GrContext*, const GrBackendTextureDesc&, SkAlphaType) {
+    return nullptr;
+}
+
+#endif
diff --git a/gfx/skia/skia/src/image/SkImagePriv.cpp b/gfx/skia/skia/src/image/SkImagePriv.cpp
deleted file mode 100644
index f5b785877c73..000000000000
--- a/gfx/skia/skia/src/image/SkImagePriv.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkImagePriv.h"
-#include "SkCanvas.h"
-#include "SkPicture.h"
-
-#ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG
-SkBitmap::Config SkColorTypeToBitmapConfig(SkColorType colorType) {
-    switch (colorType) {
-        case kAlpha_8_SkColorType:
-            return SkBitmap::kA8_Config;
-
-        case kARGB_4444_SkColorType:
-            return SkBitmap::kARGB_4444_Config;
-
-        case kRGB_565_SkColorType:
-            return SkBitmap::kRGB_565_Config;
-
-        case kN32_SkColorType:
-            return SkBitmap::kARGB_8888_Config;
-
-        case kIndex_8_SkColorType:
-            return SkBitmap::kIndex8_Config;
-
-        default:
-            // break for unsupported colortypes
-            break;
-    }
-    return SkBitmap::kNo_Config;
-}
-
-SkColorType SkBitmapConfigToColorType(SkBitmap::Config config) {
-    static const SkColorType gCT[] = {
-        kUnknown_SkColorType,   // kNo_Config
-        kAlpha_8_SkColorType,   // kA8_Config
-        kIndex_8_SkColorType,   // kIndex8_Config
-        kRGB_565_SkColorType,   // kRGB_565_Config
-        kARGB_4444_SkColorType, // kARGB_4444_Config
-        kN32_SkColorType,   // kARGB_8888_Config
-    };
-    SkASSERT((unsigned)config < SK_ARRAY_COUNT(gCT));
-    return gCT[config];
-}
-#endif
-
-SkImage* SkNewImageFromBitmap(const SkBitmap& bm, bool canSharePixelRef) {
-    const SkImageInfo info = bm.info();
-    if (kUnknown_SkColorType == info.colorType()) {
-        return NULL;
-    }
-
-    SkImage* image = NULL;
-    if (canSharePixelRef || bm.isImmutable()) {
-        image = SkNewImageFromPixelRef(info, bm.pixelRef(), bm.rowBytes());
-    } else {
-        bm.lockPixels();
-        if (bm.getPixels()) {
-            image = SkImage::NewRasterCopy(info, bm.getPixels(), bm.rowBytes());
-        }
-        bm.unlockPixels();
-    }
-    return image;
-}
diff --git a/gfx/skia/skia/src/image/SkImagePriv.h b/gfx/skia/skia/src/image/SkImagePriv.h
index 031832bd0d4e..b8f177905dc2 100644
--- a/gfx/skia/skia/src/image/SkImagePriv.h
+++ b/gfx/skia/skia/src/image/SkImagePriv.h
@@ -8,42 +8,62 @@
 #ifndef SkImagePriv_DEFINED
 #define SkImagePriv_DEFINED
 
-#include "SkBitmap.h"
 #include "SkImage.h"
+#include "SkSurface.h"
 
 // Call this if you explicitly want to use/share this pixelRef in the image
 extern SkImage* SkNewImageFromPixelRef(const SkImageInfo&, SkPixelRef*,
+                                       const SkIPoint& pixelRefOrigin,
                                        size_t rowBytes);
 
 /**
  *  Examines the bitmap to decide if it can share the existing pixelRef, or
- *  if it needs to make a deep-copy of the pixels. The bitmap's pixelref will
- *  be shared if either the bitmap is marked as immutable, or canSharePixelRef
- *  is true.
+ *  if it needs to make a deep-copy of the pixels.
+ *
+ *  The bitmap's pixelref will be shared if either the bitmap is marked as
+ *  immutable, or forceSharePixelRef is true.  Shared pixel refs are also
+ *  locked when kLocked_SharedPixelRefMode is specified.
+ *
+ *  Passing kLocked_SharedPixelRefMode allows the image's peekPixels() method
+ *  to succeed, but it will force any lazy decodes/generators to execute if
+ *  they exist on the pixelref.
+ *
+ *  It is illegal to call this with a texture-backed bitmap.
  *
  *  If the bitmap's colortype cannot be converted into a corresponding
  *  SkImageInfo, or the bitmap's pixels cannot be accessed, this will return
- *  NULL.
+ *  nullptr.
  */
-extern SkImage* SkNewImageFromBitmap(const SkBitmap&, bool canSharePixelRef);
+enum ForceCopyMode {
+    kNo_ForceCopyMode,
+    kYes_ForceCopyMode, // must copy the pixels even if the bitmap is immutable
+};
+extern SkImage* SkNewImageFromRasterBitmap(const SkBitmap&, ForceCopyMode = kNo_ForceCopyMode);
 
 static inline size_t SkImageMinRowBytes(const SkImageInfo& info) {
-    return SkAlign4(info.minRowBytes());
+    size_t minRB = info.minRowBytes();
+    if (kIndex_8_SkColorType != info.colorType()) {
+        minRB = SkAlign4(minRB);
+    }
+    return minRB;
 }
 
 // Given an image created from SkNewImageFromBitmap, return its pixelref. This
 // may be called to see if the surface and the image share the same pixelref,
 // in which case the surface may need to perform a copy-on-write.
-extern SkPixelRef* SkBitmapImageGetPixelRef(SkImage* rasterImage);
+extern const SkPixelRef* SkBitmapImageGetPixelRef(const SkImage* rasterImage);
 
-// Given an image created with NewTexture, return its GrTexture. This
-// may be called to see if the surface and the image share the same GrTexture,
-// in which case the surface may need to perform a copy-on-write.
-extern GrTexture* SkTextureImageGetTexture(SkImage* textureImage);
+// When a texture is shared by a surface and an image its budgeted status is that of the
+// surface. This function is used when the surface makes a new texture for itself in order
+// for the orphaned image to determine whether the original texture counts against the
+// budget or not.
+extern void SkTextureImageApplyBudgetedDecision(SkImage* textureImage);
 
 // Update the texture wrapped by an image created with NewTexture. This
 // is called when a surface and image share the same GrTexture and the
 // surface needs to perform a copy-on-write
 extern void SkTextureImageSetTexture(SkImage* image, GrTexture* texture);
 
+GrTexture* GrDeepCopyTexture(GrTexture* src, bool isBudgeted);
+
 #endif
diff --git a/gfx/skia/skia/src/image/SkImageShader.cpp b/gfx/skia/skia/src/image/SkImageShader.cpp
new file mode 100644
index 000000000000..22189fa61a44
--- /dev/null
+++ b/gfx/skia/skia/src/image/SkImageShader.cpp
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkBitmapProcShader.h"
+#include "SkBitmapProvider.h"
+#include "SkImage_Base.h"
+#include "SkImageShader.h"
+#include "SkReadBuffer.h"
+#include "SkWriteBuffer.h"
+
+SkImageShader::SkImageShader(const SkImage* img, TileMode tmx, TileMode tmy, const SkMatrix* matrix)
+    : INHERITED(matrix)
+    , fImage(SkRef(img))
+    , fTileModeX(tmx)
+    , fTileModeY(tmy)
+{}
+
+SkFlattenable* SkImageShader::CreateProc(SkReadBuffer& buffer) {
+    const TileMode tx = (TileMode)buffer.readUInt();
+    const TileMode ty = (TileMode)buffer.readUInt();
+    SkMatrix matrix;
+    buffer.readMatrix(&matrix);
+    SkAutoTUnref<SkImage> img(buffer.readImage());
+    if (!img) {
+        return nullptr;
+    }
+    return new SkImageShader(img, tx, ty, &matrix);
+}
+
+void SkImageShader::flatten(SkWriteBuffer& buffer) const {
+    buffer.writeUInt(fTileModeX);
+    buffer.writeUInt(fTileModeY);
+    buffer.writeMatrix(this->getLocalMatrix());
+    buffer.writeImage(fImage);
+}
+
+bool SkImageShader::isOpaque() const {
+    return fImage->isOpaque();
+}
+
+size_t SkImageShader::contextSize() const {
+    return SkBitmapProcShader::ContextSize();
+}
+
+SkShader::Context* SkImageShader::onCreateContext(const ContextRec& rec, void* storage) const {
+    return SkBitmapProcShader::MakeContext(*this, fTileModeX, fTileModeY,
+                                           SkBitmapProvider(fImage), rec, storage);
+}
+
+SkShader* SkImageShader::Create(const SkImage* image, TileMode tx, TileMode ty,
+                                const SkMatrix* localMatrix) {
+    if (!image) {
+        return nullptr;
+    }
+    return new SkImageShader(image, tx, ty, localMatrix);
+}
+
+#ifndef SK_IGNORE_TO_STRING
+void SkImageShader::toString(SkString* str) const {
+    const char* gTileModeName[SkShader::kTileModeCount] = {
+        "clamp", "repeat", "mirror"
+    };
+
+    str->appendf("ImageShader: ((%s %s) ", gTileModeName[fTileModeX], gTileModeName[fTileModeY]);
+    fImage->toString(str);
+    this->INHERITED::toString(str);
+    str->append(")");
+}
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#if SK_SUPPORT_GPU
+
+#include "GrTextureAccess.h"
+#include "SkGr.h"
+#include "SkGrPriv.h"
+#include "effects/GrSimpleTextureEffect.h"
+#include "effects/GrBicubicEffect.h"
+#include "effects/GrSimpleTextureEffect.h"
+
+const GrFragmentProcessor* SkImageShader::asFragmentProcessor(GrContext* context,
+                                                              const SkMatrix& viewM,
+                                                              const SkMatrix* localMatrix,
+                                                              SkFilterQuality filterQuality) const {
+    SkMatrix matrix;
+    matrix.setIDiv(fImage->width(), fImage->height());
+
+    SkMatrix lmInverse;
+    if (!this->getLocalMatrix().invert(&lmInverse)) {
+        return nullptr;
+    }
+    if (localMatrix) {
+        SkMatrix inv;
+        if (!localMatrix->invert(&inv)) {
+            return nullptr;
+        }
+        lmInverse.postConcat(inv);
+    }
+    matrix.preConcat(lmInverse);
+
+    SkShader::TileMode tm[] = { fTileModeX, fTileModeY };
+
+    // Must set wrap and filter on the sampler before requesting a texture. In two places below
+    // we check the matrix scale factors to determine how to interpret the filter quality setting.
+    // This completely ignores the complexity of the drawVertices case where explicit local coords
+    // are provided by the caller.
+    bool doBicubic;
+    GrTextureParams::FilterMode textureFilterMode =
+    GrSkFilterQualityToGrFilterMode(filterQuality, viewM, this->getLocalMatrix(), &doBicubic);
+    GrTextureParams params(tm, textureFilterMode);
+    SkAutoTUnref<GrTexture> texture(as_IB(fImage)->asTextureRef(context, params));
+    if (!texture) {
+        return nullptr;
+    }
+
+    SkAutoTUnref<const GrFragmentProcessor> inner;
+    if (doBicubic) {
+        inner.reset(GrBicubicEffect::Create(texture, matrix, tm));
+    } else {
+        inner.reset(GrSimpleTextureEffect::Create(texture, matrix, params));
+    }
+
+    if (GrPixelConfigIsAlphaOnly(texture->config())) {
+        return SkRef(inner.get());
+    }
+    return GrFragmentProcessor::MulOutputByInputAlpha(inner);
+}
+
+#endif
diff --git a/gfx/skia/skia/src/image/SkImageShader.h b/gfx/skia/skia/src/image/SkImageShader.h
new file mode 100644
index 000000000000..e209b3593864
--- /dev/null
+++ b/gfx/skia/skia/src/image/SkImageShader.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkImageShader_DEFINED
+#define SkImageShader_DEFINED
+
+#include "SkImage.h"
+#include "SkShader.h"
+
+class SkImageShader : public SkShader {
+public:
+    static SkShader* Create(const SkImage*, TileMode tx, TileMode ty, const SkMatrix* localMatrix);
+
+    bool isOpaque() const override;
+    size_t contextSize() const override;
+
+    SK_TO_STRING_OVERRIDE()
+    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkImageShader)
+
+#if SK_SUPPORT_GPU
+    const GrFragmentProcessor* asFragmentProcessor(GrContext*, const SkMatrix& viewM,
+                                                   const SkMatrix*, SkFilterQuality) const override;
+#endif
+
+protected:
+    void flatten(SkWriteBuffer&) const override;
+    Context* onCreateContext(const ContextRec&, void* storage) const override;
+
+    SkAutoTUnref<const SkImage> fImage;
+    const TileMode              fTileModeX;
+    const TileMode              fTileModeY;
+
+private:
+    SkImageShader(const SkImage*, TileMode tx, TileMode ty, const SkMatrix* localMatrix);
+
+    typedef SkShader INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/image/SkImage_Base.h b/gfx/skia/skia/src/image/SkImage_Base.h
index 752afedc09e7..c91430e5bd4c 100644
--- a/gfx/skia/skia/src/image/SkImage_Base.h
+++ b/gfx/skia/skia/src/image/SkImage_Base.h
@@ -8,34 +8,72 @@
 #ifndef SkImage_Base_DEFINED
 #define SkImage_Base_DEFINED
 
+#include "SkAtomics.h"
 #include "SkImage.h"
+#include "SkSurface.h"
+
+#include <new>
+
+class GrTextureParams;
+
+enum {
+    kNeedNewImageUniqueID = 0
+};
 
 class SkImage_Base : public SkImage {
 public:
-    SkImage_Base(int width, int height) : INHERITED(width, height) {}
+    SkImage_Base(int width, int height, uint32_t uniqueID);
+    virtual ~SkImage_Base();
 
-    virtual void onDraw(SkCanvas*, SkScalar x, SkScalar y, const SkPaint*) = 0;
-    virtual void onDrawRectToRect(SkCanvas*, const SkRect* src,
-                                  const SkRect& dst, const SkPaint*) = 0;
+    virtual const void* onPeekPixels(SkImageInfo*, size_t* /*rowBytes*/) const { return nullptr; }
 
     // Default impl calls onDraw
-    virtual bool onReadPixels(SkBitmap*, const SkIRect& subset) const;
+    virtual bool onReadPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes,
+                              int srcX, int srcY, CachingHint) const;
 
-    virtual const void* onPeekPixels(SkImageInfo*, size_t* /*rowBytes*/) const {
-        return NULL;
-    }
-
-    virtual GrTexture* onGetTexture() { return NULL; }
+    virtual GrTexture* peekTexture() const { return nullptr; }
 
     // return a read-only copy of the pixels. We promise to not modify them,
     // but only inspect them (or encode them).
-    virtual bool getROPixels(SkBitmap*) const { return false; }
+    virtual bool getROPixels(SkBitmap*, CachingHint = kAllow_CachingHint) const = 0;
+
+    virtual SkImage* onApplyFilter(SkImageFilter*, SkIPoint* offset,
+                                   bool forceResultToOriginalSize) const;
+
+    virtual SkSurface* onNewSurface(const SkImageInfo& info) const {
+        return SkSurface::NewRaster(info);
+    }
+
+    // Caller must call unref when they are done.
+    virtual GrTexture* asTextureRef(GrContext*, const GrTextureParams&) const = 0;
+
+    virtual SkImage* onNewSubset(const SkIRect&) const = 0;
+
+    virtual SkData* onRefEncoded() const { return nullptr; }
+
+    virtual bool onAsLegacyBitmap(SkBitmap*, LegacyBitmapMode) const;
+
+    virtual bool onIsLazyGenerated() const { return false; }
+
+    // Call when this image is part of the key to a resourcecache entry. This allows the cache
+    // to know automatically those entries can be purged when this SkImage deleted.
+    void notifyAddedToCache() const {
+        fAddedToCache.store(true);
+    }
 
-    virtual SkShader* onNewShader(SkShader::TileMode,
-                                  SkShader::TileMode,
-                                  const SkMatrix* localMatrix) const { return NULL; };
 private:
+    // Set true by caches when they cache content that's derived from the current pixels.
+    mutable SkAtomic<bool> fAddedToCache;
+
     typedef SkImage INHERITED;
 };
 
+static inline SkImage_Base* as_IB(SkImage* image) {
+    return static_cast<SkImage_Base*>(image);
+}
+
+static inline const SkImage_Base* as_IB(const SkImage* image) {
+    return static_cast<const SkImage_Base*>(image);
+}
+
 #endif
diff --git a/gfx/skia/skia/src/image/SkImage_Codec.cpp b/gfx/skia/skia/src/image/SkImage_Codec.cpp
deleted file mode 100644
index 3d815ce7f437..000000000000
--- a/gfx/skia/skia/src/image/SkImage_Codec.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkImageDecoder.h"
-#include "SkImage_Base.h"
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkData.h"
-
-class SkImage_Codec : public SkImage_Base {
-public:
-    static SkImage* NewEmpty();
-
-    SkImage_Codec(SkData* encodedData, int width, int height);
-    virtual ~SkImage_Codec();
-
-    virtual void onDraw(SkCanvas*, SkScalar, SkScalar, const SkPaint*) SK_OVERRIDE;
-    virtual void onDrawRectToRect(SkCanvas*, const SkRect*, const SkRect&, const SkPaint*) SK_OVERRIDE;
-
-private:
-    SkData*     fEncodedData;
-    SkBitmap    fBitmap;
-
-    typedef SkImage_Base INHERITED;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
-SkImage_Codec::SkImage_Codec(SkData* data, int width, int height) : INHERITED(width, height) {
-    fEncodedData = data;
-    fEncodedData->ref();
-}
-
-SkImage_Codec::~SkImage_Codec() {
-    fEncodedData->unref();
-}
-
-void SkImage_Codec::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y, const SkPaint* paint) {
-    if (!fBitmap.pixelRef()) {
-        if (!SkImageDecoder::DecodeMemory(fEncodedData->bytes(), fEncodedData->size(), &fBitmap)) {
-            return;
-        }
-    }
-    canvas->drawBitmap(fBitmap, x, y, paint);
-}
-
-void SkImage_Codec::onDrawRectToRect(SkCanvas* canvas, const SkRect* src,
-                                     const SkRect& dst, const SkPaint* paint) {
-    if (!fBitmap.pixelRef()) {
-        if (!SkImageDecoder::DecodeMemory(fEncodedData->bytes(), fEncodedData->size(), &fBitmap)) {
-            return;
-        }
-    }
-    canvas->drawBitmapRectToRect(fBitmap, src, dst, paint);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-SkImage* SkImage::NewEncodedData(SkData* data) {
-    if (NULL == data) {
-        return NULL;
-    }
-
-    SkBitmap bitmap;
-    if (!SkImageDecoder::DecodeMemory(data->bytes(), data->size(), &bitmap, kUnknown_SkColorType,
-                                      SkImageDecoder::kDecodeBounds_Mode)) {
-        return NULL;
-    }
-
-    return SkNEW_ARGS(SkImage_Codec, (data, bitmap.width(), bitmap.height()));
-}
diff --git a/gfx/skia/skia/src/image/SkImage_Generator.cpp b/gfx/skia/skia/src/image/SkImage_Generator.cpp
new file mode 100644
index 000000000000..fbde92da663f
--- /dev/null
+++ b/gfx/skia/skia/src/image/SkImage_Generator.cpp
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkImage_Base.h"
+#include "SkBitmap.h"
+#include "SkCanvas.h"
+#include "SkData.h"
+#include "SkImageCacherator.h"
+#include "SkImagePriv.h"
+#include "SkPixelRef.h"
+#include "SkSurface.h"
+
+class SkImage_Generator : public SkImage_Base {
+public:
+    SkImage_Generator(SkImageCacherator* cache)
+        : INHERITED(cache->info().width(), cache->info().height(), cache->uniqueID())
+        , fCache(cache) // take ownership
+    {}
+
+    bool onReadPixels(const SkImageInfo&, void*, size_t, int srcX, int srcY, CachingHint) const override;
+    const void* onPeekPixels(SkImageInfo*, size_t* /*rowBytes*/) const override;
+    SkData* onRefEncoded() const override;
+    bool isOpaque() const override { return fCache->info().isOpaque(); }
+    SkImage* onNewSubset(const SkIRect&) const override;
+    bool getROPixels(SkBitmap*, CachingHint) const override;
+    GrTexture* asTextureRef(GrContext*, const GrTextureParams&) const override;
+    bool onIsLazyGenerated() const override { return true; }
+
+private:
+    SkAutoTDelete<SkImageCacherator> fCache;
+
+    typedef SkImage_Base INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+bool SkImage_Generator::onReadPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRB,
+                                     int srcX, int srcY, CachingHint chint) const {
+    SkBitmap bm;
+    if (kDisallow_CachingHint == chint) {
+        if (fCache->lockAsBitmapOnlyIfAlreadyCached(&bm)) {
+            return bm.readPixels(dstInfo, dstPixels, dstRB, srcX, srcY);
+        } else {
+            // Try passing the caller's buffer directly down to the generator. If this fails we
+            // may still succeed in the general case, as the generator may prefer some other
+            // config, which we could then convert via SkBitmap::readPixels.
+            if (fCache->directGeneratePixels(dstInfo, dstPixels, dstRB, srcX, srcY)) {
+                return true;
+            }
+            // else fall through
+        }
+    }
+
+    if (this->getROPixels(&bm, chint)) {
+        return bm.readPixels(dstInfo, dstPixels, dstRB, srcX, srcY);
+    }
+    return false;
+}
+
+const void* SkImage_Generator::onPeekPixels(SkImageInfo* infoPtr, size_t* rowBytesPtr) const {
+    return NULL;
+}
+
+SkData* SkImage_Generator::onRefEncoded() const {
+    return fCache->refEncoded();
+}
+
+bool SkImage_Generator::getROPixels(SkBitmap* bitmap, CachingHint chint) const {
+    return fCache->lockAsBitmap(bitmap, this, chint);
+}
+
+GrTexture* SkImage_Generator::asTextureRef(GrContext* ctx, const GrTextureParams& params) const {
+    return fCache->lockAsTexture(ctx, params, this);
+}
+
+SkImage* SkImage_Generator::onNewSubset(const SkIRect& subset) const {
+    // TODO: make this lazy, by wrapping the subset inside a new generator or something
+    // For now, we do effectively what we did before, make it a raster
+
+    const SkImageInfo info = SkImageInfo::MakeN32(subset.width(), subset.height(),
+                                      this->isOpaque() ? kOpaque_SkAlphaType : kPremul_SkAlphaType);
+    SkAutoTUnref<SkSurface> surface(SkSurface::NewRaster(info));
+    if (!surface) {
+        return nullptr;
+    }
+    surface->getCanvas()->clear(0);
+    surface->getCanvas()->drawImage(this, SkIntToScalar(-subset.x()), SkIntToScalar(-subset.y()),
+                                    nullptr);
+    return surface->newImageSnapshot();
+}
+
+SkImage* SkImage::NewFromGenerator(SkImageGenerator* generator, const SkIRect* subset) {
+    SkImageCacherator* cache = SkImageCacherator::NewFromGenerator(generator, subset);
+    if (!cache) {
+        return nullptr;
+    }
+    return new SkImage_Generator(cache);
+}
diff --git a/gfx/skia/skia/src/image/SkImage_Gpu.cpp b/gfx/skia/skia/src/image/SkImage_Gpu.cpp
index 81114b0fe8d1..346f7983b71e 100644
--- a/gfx/skia/skia/src/image/SkImage_Gpu.cpp
+++ b/gfx/skia/skia/src/image/SkImage_Gpu.cpp
@@ -5,83 +5,390 @@
  * found in the LICENSE file.
  */
 
-#include "SkImage_Base.h"
-#include "SkImagePriv.h"
-#include "SkBitmap.h"
-#include "SkCanvas.h"
+#include "SkBitmapCache.h"
+#include "SkImage_Gpu.h"
+#include "GrCaps.h"
 #include "GrContext.h"
-#include "GrTexture.h"
-#include "SkGrPixelRef.h"
+#include "GrDrawContext.h"
+#include "GrTextureParamsAdjuster.h"
+#include "effects/GrYUVtoRGBEffect.h"
+#include "SkCanvas.h"
+#include "SkGpuDevice.h"
+#include "SkGrPriv.h"
+#include "SkPixelRef.h"
 
-class SkImage_Gpu : public SkImage_Base {
-public:
-    SK_DECLARE_INST_COUNT(SkImage_Gpu)
-
-    explicit SkImage_Gpu(const SkBitmap&);
-    virtual ~SkImage_Gpu();
-
-    virtual void onDraw(SkCanvas*, SkScalar x, SkScalar y, const SkPaint*) SK_OVERRIDE;
-    virtual void onDrawRectToRect(SkCanvas*, const SkRect* src, const SkRect& dst, const SkPaint*) SK_OVERRIDE;
-    virtual GrTexture* onGetTexture() SK_OVERRIDE;
-    virtual bool getROPixels(SkBitmap*) const SK_OVERRIDE;
-
-    GrTexture* getTexture() { return fBitmap.getTexture(); }
-
-    virtual SkShader* onNewShader(SkShader::TileMode,
-                                  SkShader::TileMode,
-                                  const SkMatrix* localMatrix) const SK_OVERRIDE;
-private:
-    SkBitmap    fBitmap;
-
-    typedef SkImage_Base INHERITED;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
-SkImage_Gpu::SkImage_Gpu(const SkBitmap& bitmap)
-    : INHERITED(bitmap.width(), bitmap.height())
-    , fBitmap(bitmap) {
-    SkASSERT(NULL != fBitmap.getTexture());
+SkImage_Gpu::SkImage_Gpu(int w, int h, uint32_t uniqueID, SkAlphaType at, GrTexture* tex,
+                         SkSurface::Budgeted budgeted)
+    : INHERITED(w, h, uniqueID)
+    , fTexture(SkRef(tex))
+    , fAlphaType(at)
+    , fBudgeted(budgeted)
+    , fAddedRasterVersionToCache(false)
+{
+    SkASSERT(tex->width() == w);
+    SkASSERT(tex->height() == h);
 }
 
 SkImage_Gpu::~SkImage_Gpu() {
+    if (fAddedRasterVersionToCache.load()) {
+        SkNotifyBitmapGenIDIsStale(this->uniqueID());
+    }
 }
 
-SkShader* SkImage_Gpu::onNewShader(SkShader::TileMode tileX,
-                                   SkShader::TileMode tileY,
-                                   const SkMatrix* localMatrix) const
-{
-    return SkShader::CreateBitmapShader(fBitmap, tileX, tileY, localMatrix);
+extern void SkTextureImageApplyBudgetedDecision(SkImage* image) {
+    if (as_IB(image)->getTexture()) {
+        ((SkImage_Gpu*)image)->applyBudgetDecision();
+    }
 }
 
-void SkImage_Gpu::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y,
-                         const SkPaint* paint) {
-    canvas->drawBitmap(fBitmap, x, y, paint);
+static SkImageInfo make_info(int w, int h, bool isOpaque) {
+    return SkImageInfo::MakeN32(w, h, isOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType);
 }
 
-void SkImage_Gpu::onDrawRectToRect(SkCanvas* canvas, const SkRect* src, const SkRect& dst,
-                         const SkPaint* paint) {
-    canvas->drawBitmapRectToRect(fBitmap, src, dst, paint);
-}
-
-GrTexture* SkImage_Gpu::onGetTexture() {
-    return fBitmap.getTexture();
-}
-
-bool SkImage_Gpu::getROPixels(SkBitmap* dst) const {
-    return fBitmap.copyTo(dst, kN32_SkColorType);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-SkImage* SkImage::NewTexture(const SkBitmap& bitmap) {
-    if (NULL == bitmap.getTexture()) {
-        return NULL;
+bool SkImage_Gpu::getROPixels(SkBitmap* dst, CachingHint chint) const {
+    if (SkBitmapCache::Find(this->uniqueID(), dst)) {
+        SkASSERT(dst->getGenerationID() == this->uniqueID());
+        SkASSERT(dst->isImmutable());
+        SkASSERT(dst->getPixels());
+        return true;
     }
 
-    return SkNEW_ARGS(SkImage_Gpu, (bitmap));
+    if (!dst->tryAllocPixels(make_info(this->width(), this->height(), this->isOpaque()))) {
+        return false;
+    }
+    if (!fTexture->readPixels(0, 0, dst->width(), dst->height(), kSkia8888_GrPixelConfig,
+                              dst->getPixels(), dst->rowBytes())) {
+        return false;
+    }
+
+    dst->pixelRef()->setImmutableWithID(this->uniqueID());
+    if (kAllow_CachingHint == chint) {
+        SkBitmapCache::Add(this->uniqueID(), *dst);
+        fAddedRasterVersionToCache.store(true);
+    }
+    return true;
 }
 
-GrTexture* SkTextureImageGetTexture(SkImage* image) {
-    return ((SkImage_Gpu*)image)->getTexture();
+class GpuImage_GrTextureAdjuster : public GrTextureAdjuster {
+public:
+    GpuImage_GrTextureAdjuster(const SkImage_Gpu* image)
+        : INHERITED(image->peekTexture())
+        , fImage(image)
+    {}
+
+protected:
+    void makeCopyKey(const CopyParams& params, GrUniqueKey* copyKey) override {
+        GrUniqueKey baseKey;
+        GrMakeKeyFromImageID(&baseKey, fImage->uniqueID(),
+                             SkIRect::MakeWH(fImage->width(), fImage->height()));
+        MakeCopyKeyFromOrigKey(baseKey, params, copyKey);
+    }
+
+    void didCacheCopy(const GrUniqueKey& copyKey) override { as_IB(fImage)->notifyAddedToCache(); }
+
+private:
+    const SkImage*  fImage;
+
+    typedef GrTextureAdjuster INHERITED;
+};
+
+GrTexture* SkImage_Gpu::asTextureRef(GrContext* ctx, const GrTextureParams& params) const {
+    return GpuImage_GrTextureAdjuster(this).refTextureSafeForParams(params, nullptr);
 }
+
+bool SkImage_Gpu::isOpaque() const {
+    return GrPixelConfigIsOpaque(fTexture->config()) || fAlphaType == kOpaque_SkAlphaType;
+}
+
+static void apply_premul(const SkImageInfo& info, void* pixels, size_t rowBytes) {
+    switch (info.colorType()) {
+        case kRGBA_8888_SkColorType:
+        case kBGRA_8888_SkColorType:
+            break;
+        default:
+            return; // nothing to do
+    }
+
+    // SkColor is not necesarily RGBA or BGRA, but it is one of them on little-endian,
+    // and in either case, the alpha-byte is always in the same place, so we can safely call
+    // SkPreMultiplyColor()
+    //
+    SkColor* row = (SkColor*)pixels;
+    for (int y = 0; y < info.height(); ++y) {
+        for (int x = 0; x < info.width(); ++x) {
+            row[x] = SkPreMultiplyColor(row[x]);
+        }
+    }
+}
+
+bool SkImage_Gpu::onReadPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
+                               int srcX, int srcY, CachingHint) const {
+    GrPixelConfig config = SkImageInfo2GrPixelConfig(info.colorType(), info.alphaType(),
+                                                     info.profileType());
+    uint32_t flags = 0;
+    if (kUnpremul_SkAlphaType == info.alphaType() && kPremul_SkAlphaType == fAlphaType) {
+        // let the GPU perform this transformation for us
+        flags = GrContext::kUnpremul_PixelOpsFlag;
+    }
+    if (!fTexture->readPixels(srcX, srcY, info.width(), info.height(), config,
+                              pixels, rowBytes, flags)) {
+        return false;
+    }
+    // do we have to manually fix-up the alpha channel?
+    //      src         dst
+    //      unpremul    premul      fix manually
+    //      premul      unpremul    done by kUnpremul_PixelOpsFlag
+    // all other combos need to change.
+    //
+    // Should this be handled by Ganesh? todo:?
+    //
+    if (kPremul_SkAlphaType == info.alphaType() && kUnpremul_SkAlphaType == fAlphaType) {
+        apply_premul(info, pixels, rowBytes);
+    }
+    return true;
+}
+
+SkImage* SkImage_Gpu::onNewSubset(const SkIRect& subset) const {
+    GrContext* ctx = fTexture->getContext();
+    GrSurfaceDesc desc = fTexture->desc();
+    desc.fWidth = subset.width();
+    desc.fHeight = subset.height();
+
+    GrTexture* subTx = ctx->textureProvider()->createTexture(desc,
+                                                             SkSurface::kYes_Budgeted == fBudgeted);
+    if (!subTx) {
+        return nullptr;
+    }
+    ctx->copySurface(subTx, fTexture, subset, SkIPoint::Make(0, 0));
+    return new SkImage_Gpu(desc.fWidth, desc.fHeight, kNeedNewImageUniqueID, fAlphaType, subTx,
+                           fBudgeted);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#include "SkGrPixelRef.h"
+#include "SkImageFilter.h"
+
+class SkGpuImageFilterProxy : public SkImageFilter::Proxy {
+    GrContext* fCtx;
+
+public:
+    SkGpuImageFilterProxy(GrContext* ctx) : fCtx(ctx) {}
+
+    SkBaseDevice* createDevice(int width, int height) override {
+        GrSurfaceDesc desc;
+        desc.fConfig = kSkia8888_GrPixelConfig;
+        desc.fFlags = kRenderTarget_GrSurfaceFlag;
+        desc.fWidth = width;
+        desc.fHeight = height;
+        desc.fSampleCnt = 0;
+
+        SkAutoTUnref<GrTexture> texture(fCtx->textureProvider()->createTexture(desc, true));
+
+        if (texture) {
+            SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
+            return SkGpuDevice::Create(texture->asRenderTarget(), width, height, &props,
+                                       SkGpuDevice::kClear_InitContents);
+        } else {
+            return nullptr;
+        }
+    }
+
+    bool filterImage(const SkImageFilter* filter, const SkBitmap& src,
+                     const SkImageFilter::Context& ctx, SkBitmap* dst, SkIPoint* offset) override {
+        return filter->canFilterImageGPU() &&
+               filter->filterImageGPU(this, src, ctx, dst, offset);
+    }
+};
+
+static SkIRect compute_fast_ibounds(SkImageFilter* filter, const SkIRect& srcBounds) {
+    SkRect fastBounds;
+    fastBounds.set(srcBounds);
+    filter->computeFastBounds(fastBounds, &fastBounds);
+    return fastBounds.roundOut();
+}
+
+SkImage* SkImage_Gpu::onApplyFilter(SkImageFilter* filter, SkIPoint* offsetResult,
+                                    bool forceResultToOriginalSize) const {
+    const SkIRect srcBounds = SkIRect::MakeWH(this->width(), this->height());
+
+    if (forceResultToOriginalSize) {
+        SkBitmap src;
+        GrWrapTextureInBitmap(fTexture, this->width(), this->height(), this->isOpaque(), &src);
+
+        const SkIRect clipBounds = srcBounds;
+        SkGpuImageFilterProxy proxy(fTexture->getContext());
+        SkAutoTUnref<SkImageFilter::Cache> cache(SkGpuDevice::NewImageFilterCache());
+        SkImageFilter::Context ctx(SkMatrix::I(), clipBounds, cache, SkImageFilter::kExact_SizeConstraint);
+
+        SkBitmap dst;
+        if (!filter->filterImage(&proxy, src, ctx, &dst, offsetResult)) {
+            return nullptr;
+        }
+        return new SkImage_Gpu(dst.width(), dst.height(), kNeedNewImageUniqueID, dst.alphaType(),
+                               dst.getTexture(), SkSurface::kNo_Budgeted);
+    }
+
+    const SkIRect dstR = compute_fast_ibounds(filter, srcBounds);
+
+    SkImageInfo info = SkImageInfo::MakeN32Premul(dstR.width(), dstR.height());
+    SkAutoTUnref<SkSurface> surface(this->onNewSurface(info));
+
+    SkPaint paint;
+    paint.setImageFilter(filter);
+    surface->getCanvas()->drawImage(this, SkIntToScalar(-dstR.x()), SkIntToScalar(-dstR.y()),
+                                    &paint);
+
+    offsetResult->set(dstR.x(), dstR.y());
+    return surface->newImageSnapshot();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+static SkImage* new_wrapped_texture_common(GrContext* ctx, const GrBackendTextureDesc& desc,
+                                           SkAlphaType at, GrWrapOwnership ownership,
+                                           SkImage::TextureReleaseProc releaseProc,
+                                           SkImage::ReleaseContext releaseCtx) {
+    if (desc.fWidth <= 0 || desc.fHeight <= 0) {
+        return nullptr;
+    }
+    SkAutoTUnref<GrTexture> tex(ctx->textureProvider()->wrapBackendTexture(desc, ownership));
+    if (!tex) {
+        return nullptr;
+    }
+    if (releaseProc) {
+        tex->setRelease(releaseProc, releaseCtx);
+    }
+
+    const SkSurface::Budgeted budgeted = SkSurface::kNo_Budgeted;
+    return new SkImage_Gpu(desc.fWidth, desc.fHeight, kNeedNewImageUniqueID, at, tex, budgeted);
+}
+
+SkImage* SkImage::NewFromTexture(GrContext* ctx, const GrBackendTextureDesc& desc, SkAlphaType at,
+                                 TextureReleaseProc releaseP, ReleaseContext releaseC) {
+    return new_wrapped_texture_common(ctx, desc, at, kBorrow_GrWrapOwnership, releaseP, releaseC);
+}
+
+SkImage* SkImage::NewFromAdoptedTexture(GrContext* ctx, const GrBackendTextureDesc& desc,
+                                        SkAlphaType at) {
+    return new_wrapped_texture_common(ctx, desc, at, kAdopt_GrWrapOwnership, nullptr, nullptr);
+}
+
+SkImage* SkImage::NewFromTextureCopy(GrContext* ctx, const GrBackendTextureDesc& desc,
+                                     SkAlphaType at) {
+    if (desc.fWidth <= 0 || desc.fHeight <= 0) {
+        return nullptr;
+    }
+
+    SkAutoTUnref<GrTexture> src(ctx->textureProvider()->wrapBackendTexture(
+        desc, kBorrow_GrWrapOwnership));
+    if (!src) {
+        return nullptr;
+    }
+
+    const bool isBudgeted = true;
+    SkAutoTUnref<GrTexture> dst(GrDeepCopyTexture(src, isBudgeted));
+    if (!dst) {
+        return nullptr;
+    }
+
+    const SkSurface::Budgeted budgeted = SkSurface::kYes_Budgeted;
+    return new SkImage_Gpu(desc.fWidth, desc.fHeight, kNeedNewImageUniqueID, at, dst,
+                           budgeted);
+}
+
+SkImage* SkImage::NewFromYUVTexturesCopy(GrContext* ctx , SkYUVColorSpace colorSpace,
+                                         const GrBackendObject yuvTextureHandles[3],
+                                         const SkISize yuvSizes[3],
+                                         GrSurfaceOrigin origin) {
+    const SkSurface::Budgeted budgeted = SkSurface::kYes_Budgeted;
+
+    if (yuvSizes[0].fWidth <= 0 || yuvSizes[0].fHeight <= 0 ||
+        yuvSizes[1].fWidth <= 0 || yuvSizes[1].fHeight <= 0 ||
+        yuvSizes[2].fWidth <= 0 || yuvSizes[2].fHeight <= 0) {
+        return nullptr;
+    }
+    static const GrPixelConfig kConfig = kAlpha_8_GrPixelConfig;
+    GrBackendTextureDesc yDesc;
+    yDesc.fConfig = kConfig;
+    yDesc.fOrigin = origin;
+    yDesc.fSampleCnt = 0;
+    yDesc.fTextureHandle = yuvTextureHandles[0];
+    yDesc.fWidth = yuvSizes[0].fWidth;
+    yDesc.fHeight = yuvSizes[0].fHeight;
+
+    GrBackendTextureDesc uDesc;
+    uDesc.fConfig = kConfig;
+    uDesc.fOrigin = origin;
+    uDesc.fSampleCnt = 0;
+    uDesc.fTextureHandle = yuvTextureHandles[1];
+    uDesc.fWidth = yuvSizes[1].fWidth;
+    uDesc.fHeight = yuvSizes[1].fHeight;
+
+    GrBackendTextureDesc vDesc;
+    vDesc.fConfig = kConfig;
+    vDesc.fOrigin = origin;
+    vDesc.fSampleCnt = 0;
+    vDesc.fTextureHandle = yuvTextureHandles[2];
+    vDesc.fWidth = yuvSizes[2].fWidth;
+    vDesc.fHeight = yuvSizes[2].fHeight;
+
+    SkAutoTUnref<GrTexture> yTex(ctx->textureProvider()->wrapBackendTexture(
+        yDesc, kBorrow_GrWrapOwnership));
+    SkAutoTUnref<GrTexture> uTex(ctx->textureProvider()->wrapBackendTexture(
+        uDesc, kBorrow_GrWrapOwnership));
+    SkAutoTUnref<GrTexture> vTex(ctx->textureProvider()->wrapBackendTexture(
+        vDesc, kBorrow_GrWrapOwnership));
+    if (!yTex || !uTex || !vTex) {
+        return nullptr;
+    }
+
+    GrSurfaceDesc dstDesc;
+    // Needs to be a render target in order to draw to it for the yuv->rgb conversion.
+    dstDesc.fFlags = kRenderTarget_GrSurfaceFlag;
+    dstDesc.fOrigin = origin;
+    dstDesc.fWidth = yuvSizes[0].fWidth;
+    dstDesc.fHeight = yuvSizes[0].fHeight;
+    dstDesc.fConfig = kRGBA_8888_GrPixelConfig;
+    dstDesc.fSampleCnt = 0;
+
+    SkAutoTUnref<GrTexture> dst(ctx->textureProvider()->createTexture(dstDesc, true));
+    if (!dst) {
+        return nullptr;
+    }
+
+    GrPaint paint;
+    paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode);
+    paint.addColorFragmentProcessor(GrYUVtoRGBEffect::Create(yTex, uTex, vTex, yuvSizes,
+                                                             colorSpace))->unref();
+
+    const SkRect rect = SkRect::MakeWH(SkIntToScalar(dstDesc.fWidth),
+                                       SkIntToScalar(dstDesc.fHeight));
+    SkAutoTUnref<GrDrawContext> drawContext(ctx->drawContext(dst->asRenderTarget()));
+    if (!drawContext) {
+        return nullptr;
+    }
+
+    drawContext->drawRect(GrClip::WideOpen(), paint, SkMatrix::I(), rect);
+    ctx->flushSurfaceWrites(dst);
+    return new SkImage_Gpu(dstDesc.fWidth, dstDesc.fHeight, kNeedNewImageUniqueID,
+                           kOpaque_SkAlphaType, dst, budgeted);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+GrTexture* GrDeepCopyTexture(GrTexture* src, bool budgeted) {
+    GrContext* ctx = src->getContext();
+
+    GrSurfaceDesc desc = src->desc();
+    GrTexture* dst = ctx->textureProvider()->createTexture(desc, budgeted, nullptr, 0);
+    if (!dst) {
+        return nullptr;
+    }
+    
+    const SkIRect srcR = SkIRect::MakeWH(desc.fWidth, desc.fHeight);
+    const SkIPoint dstP = SkIPoint::Make(0, 0);
+    ctx->copySurface(dst, src, srcR, dstP, GrContext::kFlushWrites_PixelOp);
+    return dst;
+}
+
diff --git a/gfx/skia/skia/src/image/SkImage_Gpu.h b/gfx/skia/skia/src/image/SkImage_Gpu.h
new file mode 100644
index 000000000000..ff3b12e668d4
--- /dev/null
+++ b/gfx/skia/skia/src/image/SkImage_Gpu.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkImage_Gpu_DEFINED
+#define SkImage_Gpu_DEFINED
+
+#include "SkAtomics.h"
+#include "GrTexture.h"
+#include "GrGpuResourcePriv.h"
+#include "SkBitmap.h"
+#include "SkImage_Base.h"
+#include "SkImagePriv.h"
+#include "SkSurface.h"
+
+class SkImage_Gpu : public SkImage_Base {
+public:
+    /**
+     *  An "image" can be a subset/window into a larger texture, so we explicit take the
+     *  width and height.
+     */
+    SkImage_Gpu(int w, int h, uint32_t uniqueID, SkAlphaType, GrTexture*, SkSurface::Budgeted);
+    ~SkImage_Gpu() override;
+
+    void applyBudgetDecision() const {
+        GrTexture* tex = this->getTexture();
+        SkASSERT(tex);
+        if (fBudgeted) {
+            tex->resourcePriv().makeBudgeted();
+        } else {
+            tex->resourcePriv().makeUnbudgeted();
+        }
+    }
+
+    bool getROPixels(SkBitmap*, CachingHint) const override;
+    GrTexture* asTextureRef(GrContext* ctx, const GrTextureParams& params) const override;
+    SkImage* onNewSubset(const SkIRect&) const override;
+
+    GrTexture* peekTexture() const override { return fTexture; }
+    bool isOpaque() const override;
+    bool onReadPixels(const SkImageInfo&, void* dstPixels, size_t dstRowBytes,
+                      int srcX, int srcY, CachingHint) const override;
+    SkImage* onApplyFilter(SkImageFilter*, SkIPoint* offset,
+                           bool forceResultToOriginalSize) const override;
+
+    SkSurface* onNewSurface(const SkImageInfo& info) const override {
+        return SkSurface::NewRenderTarget(fTexture->getContext(), SkSurface::kNo_Budgeted, info);
+    }
+
+private:
+    SkAutoTUnref<GrTexture>     fTexture;
+    const SkAlphaType           fAlphaType;
+    const SkSurface::Budgeted   fBudgeted;
+    mutable SkAtomic<bool>      fAddedRasterVersionToCache;
+
+
+    typedef SkImage_Base INHERITED;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/image/SkImage_Raster.cpp b/gfx/skia/skia/src/image/SkImage_Raster.cpp
index 828d80276c7b..977dc01c4bb3 100644
--- a/gfx/skia/skia/src/image/SkImage_Raster.cpp
+++ b/gfx/skia/skia/src/image/SkImage_Raster.cpp
@@ -6,28 +6,36 @@
  */
 
 #include "SkImage_Base.h"
-#include "SkImagePriv.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
+#include "SkColorTable.h"
 #include "SkData.h"
-#include "SkMallocPixelRef.h"
+#include "SkImagePriv.h"
+#include "SkPixelRef.h"
+#include "SkSurface.h"
+
+#if SK_SUPPORT_GPU
+#include "GrContext.h"
+#include "SkGr.h"
+#include "SkGrPriv.h"
+#endif
 
 class SkImage_Raster : public SkImage_Base {
 public:
-    static bool ValidArgs(const Info& info, size_t rowBytes) {
+    static bool ValidArgs(const Info& info, size_t rowBytes, bool hasColorTable,
+                          size_t* minSize) {
         const int maxDimension = SK_MaxS32 >> 2;
-        const size_t kMaxPixelByteSize = SK_MaxS32;
 
-        if (info.fWidth < 0 || info.fHeight < 0) {
+        if (info.width() <= 0 || info.height() <= 0) {
             return false;
         }
-        if (info.fWidth > maxDimension || info.fHeight > maxDimension) {
+        if (info.width() > maxDimension || info.height() > maxDimension) {
             return false;
         }
-        if ((unsigned)info.fColorType > (unsigned)kLastEnum_SkColorType) {
+        if ((unsigned)info.colorType() > (unsigned)kLastEnum_SkColorType) {
             return false;
         }
-        if ((unsigned)info.fAlphaType > (unsigned)kLastEnum_SkAlphaType) {
+        if ((unsigned)info.alphaType() > (unsigned)kLastEnum_SkAlphaType) {
             return false;
         }
 
@@ -35,176 +43,252 @@ public:
             return false;
         }
 
-        // TODO: check colorspace
+        const bool needsCT = kIndex_8_SkColorType == info.colorType();
+        if (needsCT != hasColorTable) {
+            return false;
+        }
 
         if (rowBytes < SkImageMinRowBytes(info)) {
             return false;
         }
 
-        int64_t size = (int64_t)info.fHeight * rowBytes;
-        if (size > (int64_t)kMaxPixelByteSize) {
+        size_t size = info.getSafeSize(rowBytes);
+        if (0 == size) {
             return false;
         }
+
+        if (minSize) {
+            *minSize = size;
+        }
         return true;
     }
 
-    static SkImage* NewEmpty();
-
-    SkImage_Raster(const SkImageInfo&, SkData*, size_t rb);
+    SkImage_Raster(const SkImageInfo&, SkData*, size_t rb, SkColorTable*);
     virtual ~SkImage_Raster();
 
-    virtual void onDraw(SkCanvas*, SkScalar, SkScalar, const SkPaint*) SK_OVERRIDE;
-    virtual void onDrawRectToRect(SkCanvas*, const SkRect*, const SkRect&, const SkPaint*) SK_OVERRIDE;
-    virtual bool onReadPixels(SkBitmap*, const SkIRect&) const SK_OVERRIDE;
-    virtual const void* onPeekPixels(SkImageInfo*, size_t* /*rowBytes*/) const SK_OVERRIDE;
-    virtual bool getROPixels(SkBitmap*) const SK_OVERRIDE;
+    bool onReadPixels(const SkImageInfo&, void*, size_t, int srcX, int srcY, CachingHint) const override;
+    const void* onPeekPixels(SkImageInfo*, size_t* /*rowBytes*/) const override;
+    SkData* onRefEncoded() const override;
+    bool getROPixels(SkBitmap*, CachingHint) const override;
+    GrTexture* asTextureRef(GrContext*, const GrTextureParams&) const override;
+    SkImage* onNewSubset(const SkIRect&) const override;
 
     // exposed for SkSurface_Raster via SkNewImageFromPixelRef
-    SkImage_Raster(const SkImageInfo&, SkPixelRef*, size_t rowBytes);
+    SkImage_Raster(const SkImageInfo&, SkPixelRef*, const SkIPoint& origin, size_t rowBytes);
 
     SkPixelRef* getPixelRef() const { return fBitmap.pixelRef(); }
 
-    virtual SkShader* onNewShader(SkShader::TileMode,
-                                  SkShader::TileMode,
-                                  const SkMatrix* localMatrix) const SK_OVERRIDE;
+    bool isOpaque() const override;
+    bool onAsLegacyBitmap(SkBitmap*, LegacyBitmapMode) const override;
+
+    SkImage_Raster(const SkBitmap& bm)
+        : INHERITED(bm.width(), bm.height(), bm.getGenerationID())
+        , fBitmap(bm)
+    {
+        if (bm.pixelRef()->isPreLocked()) {
+            // we only preemptively lock if there is no chance of triggering something expensive
+            // like a lazy decode or imagegenerator. PreLocked means it is flat pixels already.
+            fBitmap.lockPixels();
+        }
+        SkASSERT(fBitmap.isImmutable());
+    }
+
+    bool onIsLazyGenerated() const override {
+        return fBitmap.pixelRef() && fBitmap.pixelRef()->isLazyGenerated();
+    }
 
 private:
-    SkImage_Raster() : INHERITED(0, 0) {}
-
-    SkBitmap    fBitmap;
+    SkBitmap fBitmap;
 
     typedef SkImage_Base INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkImage* SkImage_Raster::NewEmpty() {
-    // Returns lazily created singleton
-    static SkImage* gEmpty;
-    if (NULL == gEmpty) {
-        gEmpty = SkNEW(SkImage_Raster);
-    }
-    gEmpty->ref();
-    return gEmpty;
-}
-
 static void release_data(void* addr, void* context) {
     SkData* data = static_cast<SkData*>(context);
     data->unref();
 }
 
-SkImage_Raster::SkImage_Raster(const Info& info, SkData* data, size_t rowBytes)
-    : INHERITED(info.fWidth, info.fHeight)
+SkImage_Raster::SkImage_Raster(const Info& info, SkData* data, size_t rowBytes,
+                               SkColorTable* ctable)
+    : INHERITED(info.width(), info.height(), kNeedNewImageUniqueID)
 {
     data->ref();
     void* addr = const_cast<void*>(data->data());
-    SkColorTable* ctable = NULL;
 
     fBitmap.installPixels(info, addr, rowBytes, ctable, release_data, data);
     fBitmap.setImmutable();
     fBitmap.lockPixels();
 }
 
-SkImage_Raster::SkImage_Raster(const Info& info, SkPixelRef* pr, size_t rowBytes)
-    : INHERITED(info.fWidth, info.fHeight)
+SkImage_Raster::SkImage_Raster(const Info& info, SkPixelRef* pr, const SkIPoint& pixelRefOrigin,
+                               size_t rowBytes)
+    : INHERITED(info.width(), info.height(), pr->getGenerationID())
 {
     fBitmap.setInfo(info, rowBytes);
-    fBitmap.setPixelRef(pr);
+    fBitmap.setPixelRef(pr, pixelRefOrigin);
     fBitmap.lockPixels();
+    SkASSERT(fBitmap.isImmutable());
 }
 
 SkImage_Raster::~SkImage_Raster() {}
 
-SkShader* SkImage_Raster::onNewShader(SkShader::TileMode tileX,
-                                      SkShader::TileMode tileY,
-                                      const SkMatrix* localMatrix) const
-{
-    return SkShader::CreateBitmapShader(fBitmap, tileX, tileY, localMatrix);
+bool SkImage_Raster::onReadPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes,
+                                  int srcX, int srcY, CachingHint) const {
+    SkBitmap shallowCopy(fBitmap);
+    return shallowCopy.readPixels(dstInfo, dstPixels, dstRowBytes, srcX, srcY);
 }
 
-void SkImage_Raster::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y, const SkPaint* paint) {
-    canvas->drawBitmap(fBitmap, x, y, paint);
-}
-
-void SkImage_Raster::onDrawRectToRect(SkCanvas* canvas, const SkRect* src,
-                                      const SkRect& dst, const SkPaint* paint) {
-    canvas->drawBitmapRectToRect(fBitmap, src, dst, paint);
-}
-
-bool SkImage_Raster::onReadPixels(SkBitmap* dst, const SkIRect& subset) const {
-    if (dst->pixelRef()) {
-        return this->INHERITED::onReadPixels(dst, subset);
-    } else {
-        SkBitmap src;
-        if (!fBitmap.extractSubset(&src, subset)) {
-            return false;
-        }
-        return src.copyTo(dst, src.colorType());
-    }
-}
-
-const void* SkImage_Raster::onPeekPixels(SkImageInfo* infoPtr,
-                                         size_t* rowBytesPtr) const {
+const void* SkImage_Raster::onPeekPixels(SkImageInfo* infoPtr, size_t* rowBytesPtr) const {
     const SkImageInfo info = fBitmap.info();
     if ((kUnknown_SkColorType == info.colorType()) || !fBitmap.getPixels()) {
-        return NULL;
+        return nullptr;
     }
     *infoPtr = info;
     *rowBytesPtr = fBitmap.rowBytes();
     return fBitmap.getPixels();
 }
 
-bool SkImage_Raster::getROPixels(SkBitmap* dst) const {
+SkData* SkImage_Raster::onRefEncoded() const {
+    SkPixelRef* pr = fBitmap.pixelRef();
+    const SkImageInfo prInfo = pr->info();
+    const SkImageInfo bmInfo = fBitmap.info();
+
+    // we only try if we (the image) cover the entire area of the pixelRef
+    if (prInfo.width() == bmInfo.width() && prInfo.height() == bmInfo.height()) {
+        return pr->refEncodedData();
+    }
+    return nullptr;
+}
+
+bool SkImage_Raster::getROPixels(SkBitmap* dst, CachingHint) const {
     *dst = fBitmap;
     return true;
 }
 
+GrTexture* SkImage_Raster::asTextureRef(GrContext* ctx, const GrTextureParams& params) const {
+#if SK_SUPPORT_GPU
+    if (!ctx) {
+        return nullptr;
+    }
+
+    return GrRefCachedBitmapTexture(ctx, fBitmap, params);
+#endif
+    
+    return nullptr;
+}
+
+SkImage* SkImage_Raster::onNewSubset(const SkIRect& subset) const {
+    // TODO : could consider heurist of sharing pixels, if subset is pretty close to complete
+
+    SkImageInfo info = SkImageInfo::MakeN32(subset.width(), subset.height(), fBitmap.alphaType());
+    SkAutoTUnref<SkSurface> surface(SkSurface::NewRaster(info));
+    if (!surface) {
+        return nullptr;
+    }
+    surface->getCanvas()->clear(0);
+    surface->getCanvas()->drawImage(this, SkIntToScalar(-subset.x()), SkIntToScalar(-subset.y()),
+                                    nullptr);
+    return surface->newImageSnapshot();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
-SkImage* SkImage::NewRasterCopy(const SkImageInfo& info, const void* pixels, size_t rowBytes) {
-    if (!SkImage_Raster::ValidArgs(info, rowBytes)) {
-        return NULL;
-    }
-    if (0 == info.fWidth && 0 == info.fHeight) {
-        return SkImage_Raster::NewEmpty();
-    }
-    // check this after empty-check
-    if (NULL == pixels) {
-        return NULL;
+SkImage* SkImage::NewRasterCopy(const SkImageInfo& info, const void* pixels, size_t rowBytes,
+                                SkColorTable* ctable) {
+    size_t size;
+    if (!SkImage_Raster::ValidArgs(info, rowBytes, ctable != nullptr, &size) || !pixels) {
+        return nullptr;
     }
 
     // Here we actually make a copy of the caller's pixel data
-    SkAutoDataUnref data(SkData::NewWithCopy(pixels, info.fHeight * rowBytes));
-    return SkNEW_ARGS(SkImage_Raster, (info, data, rowBytes));
+    SkAutoDataUnref data(SkData::NewWithCopy(pixels, size));
+    return new SkImage_Raster(info, data, rowBytes, ctable);
 }
 
 
 SkImage* SkImage::NewRasterData(const SkImageInfo& info, SkData* data, size_t rowBytes) {
-    if (!SkImage_Raster::ValidArgs(info, rowBytes)) {
-        return NULL;
-    }
-    if (0 == info.fWidth && 0 == info.fHeight) {
-        return SkImage_Raster::NewEmpty();
-    }
-    // check this after empty-check
-    if (NULL == data) {
-        return NULL;
+    size_t size;
+    if (!SkImage_Raster::ValidArgs(info, rowBytes, false, &size) || !data) {
+        return nullptr;
     }
 
     // did they give us enough data?
-    size_t size = info.fHeight * rowBytes;
     if (data->size() < size) {
-        return NULL;
+        return nullptr;
     }
 
-    return SkNEW_ARGS(SkImage_Raster, (info, data, rowBytes));
+    SkColorTable* ctable = nullptr;
+    return new SkImage_Raster(info, data, rowBytes, ctable);
+}
+
+SkImage* SkImage::NewFromRaster(const SkImageInfo& info, const void* pixels, size_t rowBytes,
+                                RasterReleaseProc proc, ReleaseContext ctx) {
+    size_t size;
+    if (!SkImage_Raster::ValidArgs(info, rowBytes, false, &size) || !pixels) {
+        return nullptr;
+    }
+
+    SkColorTable* ctable = nullptr;
+    SkAutoDataUnref data(SkData::NewWithProc(pixels, size, proc, ctx));
+    return new SkImage_Raster(info, data, rowBytes, ctable);
 }
 
 SkImage* SkNewImageFromPixelRef(const SkImageInfo& info, SkPixelRef* pr,
-                                size_t rowBytes) {
-    return SkNEW_ARGS(SkImage_Raster, (info, pr, rowBytes));
+                                const SkIPoint& pixelRefOrigin, size_t rowBytes) {
+    if (!SkImage_Raster::ValidArgs(info, rowBytes, false, nullptr)) {
+        return nullptr;
+    }
+    return new SkImage_Raster(info, pr, pixelRefOrigin, rowBytes);
 }
 
-SkPixelRef* SkBitmapImageGetPixelRef(SkImage* image) {
-    return ((SkImage_Raster*)image)->getPixelRef();
+SkImage* SkNewImageFromRasterBitmap(const SkBitmap& bm, ForceCopyMode forceCopy) {
+    SkASSERT(nullptr == bm.getTexture());
+
+    bool hasColorTable = false;
+    if (kIndex_8_SkColorType == bm.colorType()) {
+        SkAutoLockPixels autoLockPixels(bm);
+        hasColorTable = bm.getColorTable() != nullptr;
+    }
+
+    if (!SkImage_Raster::ValidArgs(bm.info(), bm.rowBytes(), hasColorTable, nullptr)) {
+        return nullptr;
+    }
+
+    SkImage* image = nullptr;
+    if (kYes_ForceCopyMode == forceCopy || !bm.isImmutable()) {
+        SkBitmap tmp(bm);
+        tmp.lockPixels();
+        if (tmp.getPixels()) {
+            image = SkImage::NewRasterCopy(tmp.info(), tmp.getPixels(), tmp.rowBytes(),
+                                           tmp.getColorTable());
+        }
+    } else {
+        image = new SkImage_Raster(bm);
+    }
+    return image;
+}
+
+const SkPixelRef* SkBitmapImageGetPixelRef(const SkImage* image) {
+    return ((const SkImage_Raster*)image)->getPixelRef();
+}
+
+bool SkImage_Raster::isOpaque() const {
+    return fBitmap.isOpaque();
+}
+
+bool SkImage_Raster::onAsLegacyBitmap(SkBitmap* bitmap, LegacyBitmapMode mode) const {
+    if (kRO_LegacyBitmapMode == mode) {
+        // When we're a snapshot from a surface, our bitmap may not be marked immutable
+        // even though logically always we are, but in that case we can't physically share our
+        // pixelref since the caller might call setImmutable() themselves
+        // (thus changing our state).
+        if (fBitmap.isImmutable()) {
+            bitmap->setInfo(fBitmap.info(), fBitmap.rowBytes());
+            bitmap->setPixelRef(fBitmap.pixelRef(), fBitmap.pixelRefOrigin());
+            return true;
+        }
+    }
+    return this->INHERITED::onAsLegacyBitmap(bitmap, mode);
 }
diff --git a/gfx/skia/skia/src/image/SkReadPixelsRec.h b/gfx/skia/skia/src/image/SkReadPixelsRec.h
new file mode 100644
index 000000000000..ed93b74b0f8a
--- /dev/null
+++ b/gfx/skia/skia/src/image/SkReadPixelsRec.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkReadPixelsRec_DEFINED
+#define SkReadPixelsRec_DEFINED
+
+#include "SkImageInfo.h"
+
+/**
+ *  Helper class to package and trim the parameters passed to readPixels()
+ */
+struct SkReadPixelsRec {
+    SkReadPixelsRec(const SkImageInfo& info, void* pixels, size_t rowBytes, int x, int y)
+        : fPixels(pixels)
+        , fRowBytes(rowBytes)
+        , fInfo(info)
+        , fX(x)
+        , fY(y)
+    {}
+
+    void*       fPixels;
+    size_t      fRowBytes;
+    SkImageInfo fInfo;
+    int         fX;
+    int         fY;
+
+    /*
+     *  On true, may have modified its fields (except fRowBytes) to make it a legal subset
+     *  of the specified src width/height.
+     *
+     *  On false, leaves self unchanged, but indicates that it does not overlap src, or
+     *  is not valid (e.g. bad fInfo) for readPixels().
+     */
+    bool trim(int srcWidth, int srcHeight);
+};
+
+#endif
diff --git a/gfx/skia/skia/src/image/SkSurface.cpp b/gfx/skia/skia/src/image/SkSurface.cpp
index edc6ef5fa0e6..0315f6cc84c8 100644
--- a/gfx/skia/skia/src/image/SkSurface.cpp
+++ b/gfx/skia/skia/src/image/SkSurface.cpp
@@ -9,54 +9,112 @@
 #include "SkImagePriv.h"
 #include "SkCanvas.h"
 
-///////////////////////////////////////////////////////////////////////////////
-
-SkSurface_Base::SkSurface_Base(int width, int height) : INHERITED(width, height) {
-    fCachedCanvas = NULL;
-    fCachedImage = NULL;
+#include "SkFontLCDConfig.h"
+static SkPixelGeometry compute_default_geometry() {
+    SkFontLCDConfig::LCDOrder order = SkFontLCDConfig::GetSubpixelOrder();
+    if (SkFontLCDConfig::kNONE_LCDOrder == order) {
+        return kUnknown_SkPixelGeometry;
+    } else {
+        // Bit0 is RGB(0), BGR(1)
+        // Bit1 is H(0), V(1)
+        const SkPixelGeometry gGeo[] = {
+            kRGB_H_SkPixelGeometry,
+            kBGR_H_SkPixelGeometry,
+            kRGB_V_SkPixelGeometry,
+            kBGR_V_SkPixelGeometry,
+        };
+        int index = 0;
+        if (SkFontLCDConfig::kBGR_LCDOrder == order) {
+            index |= 1;
+        }
+        if (SkFontLCDConfig::kVertical_LCDOrientation == SkFontLCDConfig::GetSubpixelOrientation()){
+            index |= 2;
+        }
+        return gGeo[index];
+    }
 }
 
-SkSurface_Base::SkSurface_Base(const SkImageInfo& info) : INHERITED(info) {
-    fCachedCanvas = NULL;
-    fCachedImage = NULL;
+SkSurfaceProps::SkSurfaceProps() : fFlags(0), fPixelGeometry(kUnknown_SkPixelGeometry) {}
+
+SkSurfaceProps::SkSurfaceProps(InitType) : fFlags(0), fPixelGeometry(compute_default_geometry()) {}
+
+SkSurfaceProps::SkSurfaceProps(uint32_t flags, InitType)
+    : fFlags(flags)
+    , fPixelGeometry(compute_default_geometry())
+{}
+
+SkSurfaceProps::SkSurfaceProps(uint32_t flags, SkPixelGeometry pg)
+    : fFlags(flags), fPixelGeometry(pg)
+{}
+
+SkSurfaceProps::SkSurfaceProps(const SkSurfaceProps& other)
+    : fFlags(other.fFlags)
+    , fPixelGeometry(other.fPixelGeometry)
+{}
+
+///////////////////////////////////////////////////////////////////////////////
+
+SkSurface_Base::SkSurface_Base(int width, int height, const SkSurfaceProps* props)
+    : INHERITED(width, height, props)
+{
+    fCachedCanvas = nullptr;
+    fCachedImage = nullptr;
+}
+
+SkSurface_Base::SkSurface_Base(const SkImageInfo& info, const SkSurfaceProps* props)
+    : INHERITED(info, props)
+{
+    fCachedCanvas = nullptr;
+    fCachedImage = nullptr;
 }
 
 SkSurface_Base::~SkSurface_Base() {
     // in case the canvas outsurvives us, we null the callback
     if (fCachedCanvas) {
-        fCachedCanvas->setSurfaceBase(NULL);
+        fCachedCanvas->setSurfaceBase(nullptr);
     }
 
     SkSafeUnref(fCachedImage);
     SkSafeUnref(fCachedCanvas);
 }
 
-void SkSurface_Base::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y,
-                            const SkPaint* paint) {
-    SkImage* image = this->newImageSnapshot();
+void SkSurface_Base::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y, const SkPaint* paint) {
+    SkImage* image = this->newImageSnapshot(kYes_Budgeted);
     if (image) {
-        image->draw(canvas, x, y, paint);
+        canvas->drawImage(image, x, y, paint);
         image->unref();
     }
 }
 
+bool SkSurface_Base::outstandingImageSnapshot() const {
+    return fCachedImage && !fCachedImage->unique();
+}
+
 void SkSurface_Base::aboutToDraw(ContentChangeMode mode) {
     this->dirtyGenerationID();
 
     SkASSERT(!fCachedCanvas || fCachedCanvas->getSurfaceBase() == this);
 
-    if (NULL != fCachedImage) {
+    if (fCachedImage) {
         // the surface may need to fork its backend, if its sharing it with
         // the cached image. Note: we only call if there is an outstanding owner
         // on the image (besides us).
-        if (!fCachedImage->unique()) {
+        bool unique = fCachedImage->unique();
+        if (!unique) {
             this->onCopyOnWrite(mode);
         }
 
         // regardless of copy-on-write, we must drop our cached image now, so
         // that the next request will get our new contents.
         fCachedImage->unref();
-        fCachedImage = NULL;
+        fCachedImage = nullptr;
+
+        if (unique) {
+            // Our content isn't held by any image now, so we can consider that content mutable.
+            // Raster surfaces need to be told it's safe to consider its pixels mutable again.
+            // We make this call after the ->unref() so the subclass can assert there are no images.
+            this->onRestoreBackingMutability();
+        }
     } else if (kDiscard_ContentChangeMode == mode) {
         this->onDiscard();
     }
@@ -74,18 +132,19 @@ static SkSurface_Base* asSB(SkSurface* surface) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkSurface::SkSurface(int width, int height) : fWidth(width), fHeight(height) {
-    SkASSERT(fWidth >= 0);
-    SkASSERT(fHeight >= 0);
+SkSurface::SkSurface(int width, int height, const SkSurfaceProps* props)
+    : fProps(SkSurfacePropsCopyOrDefault(props)), fWidth(width), fHeight(height)
+{
+    SkASSERT(fWidth > 0);
+    SkASSERT(fHeight > 0);
     fGenerationID = 0;
 }
 
-SkSurface::SkSurface(const SkImageInfo& info)
-    : fWidth(info.fWidth)
-    , fHeight(info.fHeight)
+SkSurface::SkSurface(const SkImageInfo& info, const SkSurfaceProps* props)
+    : fProps(SkSurfacePropsCopyOrDefault(props)), fWidth(info.width()), fHeight(info.height())
 {
-    SkASSERT(fWidth >= 0);
-    SkASSERT(fHeight >= 0);
+    SkASSERT(fWidth > 0);
+    SkASSERT(fHeight > 0);
     fGenerationID = 0;
 }
 
@@ -104,8 +163,8 @@ SkCanvas* SkSurface::getCanvas() {
     return asSB(this)->getCachedCanvas();
 }
 
-SkImage* SkSurface::newImageSnapshot() {
-    SkImage* image = asSB(this)->getCachedImage();
+SkImage* SkSurface::newImageSnapshot(Budgeted budgeted) {
+    SkImage* image = asSB(this)->getCachedImage(budgeted);
     SkSafeRef(image);   // the caller will call unref() to balance this
     return image;
 }
@@ -122,3 +181,41 @@ void SkSurface::draw(SkCanvas* canvas, SkScalar x, SkScalar y,
 const void* SkSurface::peekPixels(SkImageInfo* info, size_t* rowBytes) {
     return this->getCanvas()->peekPixels(info, rowBytes);
 }
+
+bool SkSurface::readPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes,
+                           int srcX, int srcY) {
+    return this->getCanvas()->readPixels(dstInfo, dstPixels, dstRowBytes, srcX, srcY);
+}
+
+GrBackendObject SkSurface::getTextureHandle(BackendHandleAccess access) {
+    return asSB(this)->onGetTextureHandle(access);
+}
+
+bool SkSurface::getRenderTargetHandle(GrBackendObject* obj, BackendHandleAccess access) {
+    return asSB(this)->onGetRenderTargetHandle(obj, access);
+}
+
+//////////////////////////////////////////////////////////////////////////////////////
+
+#if !SK_SUPPORT_GPU
+
+SkSurface* SkSurface::NewRenderTargetDirect(GrRenderTarget*, const SkSurfaceProps*) {
+    return nullptr;
+}
+
+SkSurface* SkSurface::NewRenderTarget(GrContext*, Budgeted, const SkImageInfo&, int,
+                                      const SkSurfaceProps*) {
+    return nullptr;
+}
+
+SkSurface* SkSurface::NewFromBackendTexture(GrContext*, const GrBackendTextureDesc&,
+                                             const SkSurfaceProps*) {
+    return nullptr;
+}
+
+SkSurface* SkSurface::NewFromBackendRenderTarget(GrContext*, const GrBackendRenderTargetDesc&,
+                                                 const SkSurfaceProps*) {
+    return nullptr;
+}
+
+#endif
diff --git a/gfx/skia/skia/src/image/SkSurface_Base.h b/gfx/skia/skia/src/image/SkSurface_Base.h
index 2314341f21a7..7658409ad764 100644
--- a/gfx/skia/skia/src/image/SkSurface_Base.h
+++ b/gfx/skia/skia/src/image/SkSurface_Base.h
@@ -8,15 +8,24 @@
 #ifndef SkSurface_Base_DEFINED
 #define SkSurface_Base_DEFINED
 
-#include "SkSurface.h"
 #include "SkCanvas.h"
+#include "SkSurface.h"
+#include "SkSurfacePriv.h"
 
 class SkSurface_Base : public SkSurface {
 public:
-    SkSurface_Base(int width, int height);
-    explicit SkSurface_Base(const SkImageInfo&);
+    SkSurface_Base(int width, int height, const SkSurfaceProps*);
+    SkSurface_Base(const SkImageInfo&, const SkSurfaceProps*);
     virtual ~SkSurface_Base();
 
+    virtual GrBackendObject onGetTextureHandle(BackendHandleAccess) {
+        return 0;
+    }
+
+    virtual bool onGetRenderTargetHandle(GrBackendObject*, BackendHandleAccess) {
+        return false;
+    }
+
     /**
      *  Allocate a canvas that will draw into this surface. We will cache this
      *  canvas, to return the same object to the caller multiple times. We
@@ -31,9 +40,9 @@ public:
      *  Allocate an SkImage that represents the current contents of the surface.
      *  This needs to be able to outlive the surface itself (if need be), and
      *  must faithfully represent the current contents, even if the surface
-     *  is chaged after this calle (e.g. it is drawn to via its canvas).
+     *  is changed after this called (e.g. it is drawn to via its canvas).
      */
-    virtual SkImage* onNewImageSnapshot() = 0;
+    virtual SkImage* onNewImageSnapshot(Budgeted) = 0;
 
     /**
      *  Default implementation:
@@ -59,8 +68,16 @@ public:
      */
     virtual void onCopyOnWrite(ContentChangeMode) = 0;
 
+    /**
+     *  Signal the surface to remind its backing store that it's mutable again.
+     *  Called only when we _didn't_ copy-on-write; we assume the copies start mutable.
+     */
+    virtual void onRestoreBackingMutability() {}
+
     inline SkCanvas* getCachedCanvas();
-    inline SkImage* getCachedImage();
+    inline SkImage* getCachedImage(Budgeted);
+
+    bool hasCachedImage() const { return fCachedImage != nullptr; }
 
     // called by SkSurface to compute a new genID
     uint32_t newGenerationID();
@@ -70,6 +87,11 @@ private:
     SkImage*    fCachedImage;
 
     void aboutToDraw(ContentChangeMode mode);
+
+    // Returns true if there is an outstanding image-snapshot, indicating that a call to aboutToDraw
+    // would trigger a copy-on-write.
+    bool outstandingImageSnapshot() const;
+
     friend class SkCanvas;
     friend class SkSurface;
 
@@ -77,18 +99,18 @@ private:
 };
 
 SkCanvas* SkSurface_Base::getCachedCanvas() {
-    if (NULL == fCachedCanvas) {
+    if (nullptr == fCachedCanvas) {
         fCachedCanvas = this->onNewCanvas();
-        if (NULL != fCachedCanvas) {
+        if (fCachedCanvas) {
             fCachedCanvas->setSurfaceBase(this);
         }
     }
     return fCachedCanvas;
 }
 
-SkImage* SkSurface_Base::getCachedImage() {
-    if (NULL == fCachedImage) {
-        fCachedImage = this->onNewImageSnapshot();
+SkImage* SkSurface_Base::getCachedImage(Budgeted budgeted) {
+    if (nullptr == fCachedImage) {
+        fCachedImage = this->onNewImageSnapshot(budgeted);
         SkASSERT(!fCachedCanvas || fCachedCanvas->getSurfaceBase() == this);
     }
     return fCachedImage;
diff --git a/gfx/skia/skia/src/image/SkSurface_Gpu.cpp b/gfx/skia/skia/src/image/SkSurface_Gpu.cpp
index fab130cdde19..2d5645b2b016 100644
--- a/gfx/skia/skia/src/image/SkSurface_Gpu.cpp
+++ b/gfx/skia/skia/src/image/SkSurface_Gpu.cpp
@@ -5,94 +5,101 @@
  * found in the LICENSE file.
  */
 
-#include "SkSurface_Base.h"
-#include "SkImagePriv.h"
+#include "SkSurface_Gpu.h"
+
 #include "SkCanvas.h"
 #include "SkGpuDevice.h"
+#include "SkImage_Base.h"
+#include "SkImage_Gpu.h"
+#include "SkImagePriv.h"
+#include "SkSurface_Base.h"
 
-class SkSurface_Gpu : public SkSurface_Base {
-public:
-    SK_DECLARE_INST_COUNT(SkSurface_Gpu)
+#if SK_SUPPORT_GPU
 
-    SkSurface_Gpu(GrRenderTarget*, bool cached, TextRenderMode trm, 
-                  SkSurface::RenderTargetFlags flags);
-    virtual ~SkSurface_Gpu();
-
-    virtual SkCanvas* onNewCanvas() SK_OVERRIDE;
-    virtual SkSurface* onNewSurface(const SkImageInfo&) SK_OVERRIDE;
-    virtual SkImage* onNewImageSnapshot() SK_OVERRIDE;
-    virtual void onDraw(SkCanvas*, SkScalar x, SkScalar y,
-                        const SkPaint*) SK_OVERRIDE;
-    virtual void onCopyOnWrite(ContentChangeMode) SK_OVERRIDE;
-    virtual void onDiscard() SK_OVERRIDE;
-
-private:
-    SkGpuDevice* fDevice;
-
-    typedef SkSurface_Base INHERITED;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
-SkSurface_Gpu::SkSurface_Gpu(GrRenderTarget* renderTarget, bool cached, TextRenderMode trm,
-                             SkSurface::RenderTargetFlags flags)
-        : INHERITED(renderTarget->width(), renderTarget->height()) {
-    int deviceFlags = 0;
-    deviceFlags |= cached ? SkGpuDevice::kCached_Flag : 0;
-    deviceFlags |= (kDistanceField_TextRenderMode == trm) ? SkGpuDevice::kDFFonts_Flag : 0;
-    fDevice = SkGpuDevice::Create(renderTarget, deviceFlags);
-
-    if (kRGB_565_GrPixelConfig != renderTarget->config() && 
-        !(flags & kDontClear_RenderTargetFlag)) {
-        fDevice->clear(0x0);
-    }
+SkSurface_Gpu::SkSurface_Gpu(SkGpuDevice* device)
+    : INHERITED(device->width(), device->height(), &device->surfaceProps())
+    , fDevice(SkRef(device)) {
 }
 
 SkSurface_Gpu::~SkSurface_Gpu() {
-    SkSafeUnref(fDevice);
+    fDevice->unref();
+}
+
+static GrRenderTarget* prepare_rt_for_external_access(SkSurface_Gpu* surface,
+                                                      SkSurface::BackendHandleAccess access) {
+    switch (access) {
+        case SkSurface::kFlushRead_BackendHandleAccess:
+            break;
+        case SkSurface::kFlushWrite_BackendHandleAccess:
+        case SkSurface::kDiscardWrite_BackendHandleAccess:
+            // for now we don't special-case on Discard, but we may in the future.
+            surface->notifyContentWillChange(SkSurface::kRetain_ContentChangeMode);
+            // legacy: need to dirty the bitmap's genID in our device (curse it)
+            surface->getDevice()->accessBitmap(false).notifyPixelsChanged();
+            break;
+    }
+
+    // Grab the render target *after* firing notifications, as it may get switched if CoW kicks in.
+    GrRenderTarget* rt = surface->getDevice()->accessRenderTarget();
+    rt->prepareForExternalIO();
+    return rt;
+}
+
+GrBackendObject SkSurface_Gpu::onGetTextureHandle(BackendHandleAccess access) {
+    GrRenderTarget* rt = prepare_rt_for_external_access(this, access);
+    GrTexture* texture = rt->asTexture();
+    if (texture) {
+        return texture->getTextureHandle();
+    }
+    return 0;
+}
+
+bool SkSurface_Gpu::onGetRenderTargetHandle(GrBackendObject* obj, BackendHandleAccess access) {
+    GrRenderTarget* rt = prepare_rt_for_external_access(this, access);
+    *obj = rt->getRenderTargetHandle();
+    return true;
 }
 
 SkCanvas* SkSurface_Gpu::onNewCanvas() {
-    return SkNEW_ARGS(SkCanvas, (fDevice));
+    SkCanvas::InitFlags flags = SkCanvas::kDefault_InitFlags;
+    // When we think this works...
+//    flags |= SkCanvas::kConservativeRasterClip_InitFlag;
+
+    return new SkCanvas(fDevice, flags);
 }
 
 SkSurface* SkSurface_Gpu::onNewSurface(const SkImageInfo& info) {
     GrRenderTarget* rt = fDevice->accessRenderTarget();
-    int sampleCount = rt->numSamples();
-    return SkSurface::NewRenderTarget(fDevice->context(), info, sampleCount);
+    int sampleCount = rt->numColorSamples();
+    // TODO: Make caller specify this (change virtual signature of onNewSurface).
+    static const Budgeted kBudgeted = kNo_Budgeted;
+    return SkSurface::NewRenderTarget(fDevice->context(), kBudgeted, info, sampleCount,
+                                      &this->props());
 }
 
-SkImage* SkSurface_Gpu::onNewImageSnapshot() {
-    return SkImage::NewTexture(fDevice->accessBitmap(false));
+SkImage* SkSurface_Gpu::onNewImageSnapshot(Budgeted budgeted) {
+    const SkImageInfo info = fDevice->imageInfo();
+    SkImage* image = nullptr;
+    GrTexture* tex = fDevice->accessRenderTarget()->asTexture();
+    if (tex) {
+        image = new SkImage_Gpu(info.width(), info.height(), kNeedNewImageUniqueID,
+                                info.alphaType(), tex, budgeted);
+    }
+    return image;
 }
 
-void SkSurface_Gpu::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y,
-                              const SkPaint* paint) {
-    canvas->drawBitmap(fDevice->accessBitmap(false), x, y, paint);
-}
-
-// Create a new SkGpuDevice and, if necessary, copy the contents of the old
-// device into it. Note that this flushes the SkGpuDevice but
+// Create a new render target and, if necessary, copy the contents of the old
+// render target into it. Note that this flushes the SkGpuDevice but
 // doesn't force an OpenGL flush.
 void SkSurface_Gpu::onCopyOnWrite(ContentChangeMode mode) {
     GrRenderTarget* rt = fDevice->accessRenderTarget();
-    // are we sharing our render target with the image?
-    SkASSERT(NULL != this->getCachedImage());
-    if (rt->asTexture() == SkTextureImageGetTexture(this->getCachedImage())) {
-        // We call createCompatibleDevice because it uses the texture cache. This isn't
-        // necessarily correct (http://skbug.com/2252), but never using the cache causes
-        // a Chromium regression. (http://crbug.com/344020)
-        SkGpuDevice* newDevice = static_cast<SkGpuDevice*>(
-            fDevice->createCompatibleDevice(fDevice->imageInfo()));
-        SkAutoTUnref<SkGpuDevice> aurd(newDevice);
-        if (kRetain_ContentChangeMode == mode) {
-            fDevice->context()->copyTexture(rt->asTexture(), newDevice->accessRenderTarget());
-        }
-        SkASSERT(NULL != this->getCachedCanvas());
-        SkASSERT(this->getCachedCanvas()->getDevice() == fDevice);
-
-        this->getCachedCanvas()->setRootDevice(newDevice);
-        SkRefCnt_SafeAssign(fDevice, newDevice);
+    // are we sharing our render target with the image? Note this call should never create a new
+    // image because onCopyOnWrite is only called when there is a cached image.
+    SkImage* image = this->getCachedImage(kNo_Budgeted);
+    SkASSERT(image);
+    if (rt->asTexture() == as_IB(image)->getTexture()) {
+        this->fDevice->replaceRenderTarget(SkSurface::kRetain_ContentChangeMode == mode);
+        SkTextureImageApplyBudgetedDecision(image);
     } else if (kDiscard_ContentChangeMode == mode) {
         this->SkSurface_Gpu::onDiscard();
     }
@@ -104,54 +111,62 @@ void SkSurface_Gpu::onDiscard() {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkSurface* SkSurface::NewRenderTargetDirect(GrRenderTarget* target, TextRenderMode trm,
-                                            RenderTargetFlags flags) {
-    if (NULL == target) {
-        return NULL;
+SkSurface* SkSurface::NewRenderTargetDirect(GrRenderTarget* target, const SkSurfaceProps* props) {
+    SkAutoTUnref<SkGpuDevice> device(
+        SkGpuDevice::Create(target, props, SkGpuDevice::kUninit_InitContents));
+    if (!device) {
+        return nullptr;
     }
-    return SkNEW_ARGS(SkSurface_Gpu, (target, false, trm, flags));
+    return new SkSurface_Gpu(device);
 }
 
-SkSurface* SkSurface::NewRenderTarget(GrContext* ctx, const SkImageInfo& info, int sampleCount,
-                                      TextRenderMode trm, RenderTargetFlags flags) {
-    if (NULL == ctx) {
-        return NULL;
+SkSurface* SkSurface::NewRenderTarget(GrContext* ctx, Budgeted budgeted, const SkImageInfo& info,
+                                      int sampleCount, const SkSurfaceProps* props) {
+    SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(ctx, budgeted, info, sampleCount, props,
+                                                         SkGpuDevice::kClear_InitContents));
+    if (!device) {
+        return nullptr;
     }
-
-    GrTextureDesc desc;
-    desc.fFlags = kRenderTarget_GrTextureFlagBit | kCheckAllocation_GrTextureFlagBit;
-    desc.fWidth = info.width();
-    desc.fHeight = info.height();
-    desc.fConfig = SkImageInfo2GrPixelConfig(info);
-    desc.fSampleCnt = sampleCount;
-
-    SkAutoTUnref<GrTexture> tex(ctx->createUncachedTexture(desc, NULL, 0));
-    if (NULL == tex) {
-        return NULL;
-    }
-
-    return SkNEW_ARGS(SkSurface_Gpu, (tex->asRenderTarget(), false, trm, flags));
+    return new SkSurface_Gpu(device);
 }
 
-SkSurface* SkSurface::NewScratchRenderTarget(GrContext* ctx, const SkImageInfo& info,
-                                             int sampleCount, TextRenderMode trm,
-                                             RenderTargetFlags flags) {
-    if (NULL == ctx) {
-        return NULL;
+SkSurface* SkSurface::NewFromBackendTexture(GrContext* context, const GrBackendTextureDesc& desc,
+                                            const SkSurfaceProps* props) {
+    if (nullptr == context) {
+        return nullptr;
     }
-
-    GrTextureDesc desc;
-    desc.fFlags = kRenderTarget_GrTextureFlagBit | kCheckAllocation_GrTextureFlagBit;
-    desc.fWidth = info.width();
-    desc.fHeight = info.height();
-    desc.fConfig = SkImageInfo2GrPixelConfig(info);
-    desc.fSampleCnt = sampleCount;
-
-    SkAutoTUnref<GrTexture> tex(ctx->lockAndRefScratchTexture(desc, GrContext::kExact_ScratchTexMatch));
-
-    if (NULL == tex) {
-        return NULL;
+    if (!SkToBool(desc.fFlags & kRenderTarget_GrBackendTextureFlag)) {
+        return nullptr;
     }
-
-    return SkNEW_ARGS(SkSurface_Gpu, (tex->asRenderTarget(), true, trm, flags));
+    SkAutoTUnref<GrSurface> surface(context->textureProvider()->wrapBackendTexture(desc,
+                                    kBorrow_GrWrapOwnership));
+    if (!surface) {
+        return nullptr;
+    }
+    SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(surface->asRenderTarget(), props,
+                                                         SkGpuDevice::kUninit_InitContents));
+    if (!device) {
+        return nullptr;
+    }
+    return new SkSurface_Gpu(device);
 }
+
+SkSurface* SkSurface::NewFromBackendRenderTarget(GrContext* context,
+                                                 const GrBackendRenderTargetDesc& desc,
+                                                 const SkSurfaceProps* props) {
+    if (nullptr == context) {
+        return nullptr;
+    }
+    SkAutoTUnref<GrRenderTarget> rt(context->textureProvider()->wrapBackendRenderTarget(desc));
+    if (!rt) {
+        return nullptr;
+    }
+    SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(rt, props,
+                                                         SkGpuDevice::kUninit_InitContents));
+    if (!device) {
+        return nullptr;
+    }
+    return new SkSurface_Gpu(device);
+}
+
+#endif
diff --git a/gfx/skia/skia/src/image/SkSurface_Gpu.h b/gfx/skia/skia/src/image/SkSurface_Gpu.h
new file mode 100644
index 000000000000..23241540bfe3
--- /dev/null
+++ b/gfx/skia/skia/src/image/SkSurface_Gpu.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkSurface_Gpu_DEFINED
+#define SkSurface_Gpu_DEFINED
+
+#include "SkSurface_Base.h"
+
+#if SK_SUPPORT_GPU
+
+class SkGpuDevice;
+
+class SkSurface_Gpu : public SkSurface_Base {
+public:
+    SkSurface_Gpu(SkGpuDevice*);
+    virtual ~SkSurface_Gpu();
+
+    GrBackendObject onGetTextureHandle(BackendHandleAccess) override;
+    bool onGetRenderTargetHandle(GrBackendObject*, BackendHandleAccess) override;
+    SkCanvas* onNewCanvas() override;
+    SkSurface* onNewSurface(const SkImageInfo&) override;
+    SkImage* onNewImageSnapshot(Budgeted) override;
+    void onCopyOnWrite(ContentChangeMode) override;
+    void onDiscard() override;
+
+    SkGpuDevice* getDevice() { return fDevice; }
+
+private:
+    SkGpuDevice* fDevice;
+
+    typedef SkSurface_Base INHERITED;
+};
+
+#endif // SK_SUPPORT_GPU
+
+#endif // SkSurface_Gpu_DEFINED
diff --git a/gfx/skia/skia/src/image/SkSurface_Raster.cpp b/gfx/skia/skia/src/image/SkSurface_Raster.cpp
index 986994ab8f83..d5593eb1d7dd 100644
--- a/gfx/skia/skia/src/image/SkSurface_Raster.cpp
+++ b/gfx/skia/skia/src/image/SkSurface_Raster.cpp
@@ -18,15 +18,16 @@ public:
     static bool Valid(const SkImageInfo&, size_t rb = kIgnoreRowBytesValue);
 
     SkSurface_Raster(const SkImageInfo&, void*, size_t rb,
-                     void (*releaseProc)(void* pixels, void* context), void* context);
-    SkSurface_Raster(SkPixelRef*);
+                     void (*releaseProc)(void* pixels, void* context), void* context,
+                     const SkSurfaceProps*);
+    SkSurface_Raster(SkPixelRef*, const SkSurfaceProps*);
 
-    virtual SkCanvas* onNewCanvas() SK_OVERRIDE;
-    virtual SkSurface* onNewSurface(const SkImageInfo&) SK_OVERRIDE;
-    virtual SkImage* onNewImageSnapshot() SK_OVERRIDE;
-    virtual void onDraw(SkCanvas*, SkScalar x, SkScalar y,
-                        const SkPaint*) SK_OVERRIDE;
-    virtual void onCopyOnWrite(ContentChangeMode) SK_OVERRIDE;
+    SkCanvas* onNewCanvas() override;
+    SkSurface* onNewSurface(const SkImageInfo&) override;
+    SkImage* onNewImageSnapshot(Budgeted) override;
+    void onDraw(SkCanvas*, SkScalar x, SkScalar y, const SkPaint*) override;
+    void onCopyOnWrite(ContentChangeMode) override;
+    void onRestoreBackingMutability() override;
 
 private:
     SkBitmap    fBitmap;
@@ -38,10 +39,14 @@ private:
 ///////////////////////////////////////////////////////////////////////////////
 
 bool SkSurface_Raster::Valid(const SkImageInfo& info, size_t rowBytes) {
+    if (info.isEmpty()) {
+        return false;
+    }
+
     static const size_t kMaxTotalSize = SK_MaxS32;
 
     int shift = 0;
-    switch (info.fColorType) {
+    switch (info.colorType()) {
         case kAlpha_8_SkColorType:
             shift = 0;
             break;
@@ -59,7 +64,7 @@ bool SkSurface_Raster::Valid(const SkImageInfo& info, size_t rowBytes) {
         return true;
     }
 
-    uint64_t minRB = (uint64_t)info.fWidth << shift;
+    uint64_t minRB = (uint64_t)info.width() << shift;
     if (minRB > rowBytes) {
         return false;
     }
@@ -69,7 +74,7 @@ bool SkSurface_Raster::Valid(const SkImageInfo& info, size_t rowBytes) {
         return false;
     }
 
-    uint64_t size = sk_64_mul(info.fHeight, rowBytes);
+    uint64_t size = sk_64_mul(info.height(), rowBytes);
     if (size > kMaxTotalSize) {
         return false;
     }
@@ -78,15 +83,16 @@ bool SkSurface_Raster::Valid(const SkImageInfo& info, size_t rowBytes) {
 }
 
 SkSurface_Raster::SkSurface_Raster(const SkImageInfo& info, void* pixels, size_t rb,
-                                   void (*releaseProc)(void* pixels, void* context), void* context)
-    : INHERITED(info)
+                                   void (*releaseProc)(void* pixels, void* context), void* context,
+                                   const SkSurfaceProps* props)
+    : INHERITED(info, props)
 {
-    fBitmap.installPixels(info, pixels, rb, NULL, releaseProc, context);
+    fBitmap.installPixels(info, pixels, rb, nullptr, releaseProc, context);
     fWeOwnThePixels = false;    // We are "Direct"
 }
 
-SkSurface_Raster::SkSurface_Raster(SkPixelRef* pr)
-    : INHERITED(pr->info().fWidth, pr->info().fHeight)
+SkSurface_Raster::SkSurface_Raster(SkPixelRef* pr, const SkSurfaceProps* props)
+    : INHERITED(pr->info().width(), pr->info().height(), props)
 {
     const SkImageInfo& info = pr->info();
 
@@ -99,12 +105,10 @@ SkSurface_Raster::SkSurface_Raster(SkPixelRef* pr)
     }
 }
 
-SkCanvas* SkSurface_Raster::onNewCanvas() {
-    return SkNEW_ARGS(SkCanvas, (fBitmap));
-}
+SkCanvas* SkSurface_Raster::onNewCanvas() { return new SkCanvas(fBitmap, this->props()); }
 
 SkSurface* SkSurface_Raster::onNewSurface(const SkImageInfo& info) {
-    return SkSurface::NewRaster(info);
+    return SkSurface::NewRaster(info, &this->props());
 }
 
 void SkSurface_Raster::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y,
@@ -112,17 +116,34 @@ void SkSurface_Raster::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y,
     canvas->drawBitmap(fBitmap, x, y, paint);
 }
 
-SkImage* SkSurface_Raster::onNewImageSnapshot() {
-    return SkNewImageFromBitmap(fBitmap, fWeOwnThePixels);
+SkImage* SkSurface_Raster::onNewImageSnapshot(Budgeted) {
+    if (fWeOwnThePixels) {
+        // SkImage_raster requires these pixels are immutable for its full lifetime.
+        // We'll undo this via onRestoreBackingMutability() if we can avoid the COW.
+        if (SkPixelRef* pr = fBitmap.pixelRef()) {
+            pr->setTemporarilyImmutable();
+        }
+    }
+    // Our pixels are in memory, so read access on the snapshot SkImage could be cheap.
+    // Lock the shared pixel ref to ensure peekPixels() is usable.
+    return SkNewImageFromRasterBitmap(fBitmap,
+                                      fWeOwnThePixels ? kNo_ForceCopyMode : kYes_ForceCopyMode);
+}
+
+void SkSurface_Raster::onRestoreBackingMutability() {
+    SkASSERT(!this->hasCachedImage());  // Shouldn't be any snapshots out there.
+    if (SkPixelRef* pr = fBitmap.pixelRef()) {
+        pr->restoreMutability();
+    }
 }
 
 void SkSurface_Raster::onCopyOnWrite(ContentChangeMode mode) {
     // are we sharing pixelrefs with the image?
-    SkASSERT(NULL != this->getCachedImage());
-    if (SkBitmapImageGetPixelRef(this->getCachedImage()) == fBitmap.pixelRef()) {
+    SkASSERT(this->getCachedImage(kNo_Budgeted));
+    if (SkBitmapImageGetPixelRef(this->getCachedImage(kNo_Budgeted)) == fBitmap.pixelRef()) {
         SkASSERT(fWeOwnThePixels);
         if (kDiscard_ContentChangeMode == mode) {
-            fBitmap.setPixelRef(NULL);
+            fBitmap.setPixelRef(nullptr);
             fBitmap.allocPixels();
         } else {
             SkBitmap prev(fBitmap);
@@ -131,7 +152,7 @@ void SkSurface_Raster::onCopyOnWrite(ContentChangeMode mode) {
         // Now fBitmap is a deep copy of itself (and therefore different from
         // what is being used by the image. Next we update the canvas to use
         // this as its backend, so we can't modify the image's pixels anymore.
-        SkASSERT(NULL != this->getCachedCanvas());
+        SkASSERT(this->getCachedCanvas());
         this->getCachedCanvas()->getDevice()->replaceBitmapBackendForRasterSurface(fBitmap);
     }
 }
@@ -140,32 +161,33 @@ void SkSurface_Raster::onCopyOnWrite(ContentChangeMode mode) {
 
 SkSurface* SkSurface::NewRasterDirectReleaseProc(const SkImageInfo& info, void* pixels, size_t rb,
                                                  void (*releaseProc)(void* pixels, void* context),
-                                                 void* context) {
-    if (NULL == releaseProc) {
-        context = NULL;
+                                                 void* context, const SkSurfaceProps* props) {
+    if (nullptr == releaseProc) {
+        context = nullptr;
     }
     if (!SkSurface_Raster::Valid(info, rb)) {
-        return NULL;
+        return nullptr;
     }
-    if (NULL == pixels) {
-        return NULL;
+    if (nullptr == pixels) {
+        return nullptr;
     }
-    
-    return SkNEW_ARGS(SkSurface_Raster, (info, pixels, rb, releaseProc, context));
+
+    return new SkSurface_Raster(info, pixels, rb, releaseProc, context, props);
 }
 
-SkSurface* SkSurface::NewRasterDirect(const SkImageInfo& info, void* pixels, size_t rowBytes) {
-    return NewRasterDirectReleaseProc(info, pixels, rowBytes, NULL, NULL);
+SkSurface* SkSurface::NewRasterDirect(const SkImageInfo& info, void* pixels, size_t rowBytes,
+                                      const SkSurfaceProps* props) {
+    return NewRasterDirectReleaseProc(info, pixels, rowBytes, nullptr, nullptr, props);
 }
 
-SkSurface* SkSurface::NewRaster(const SkImageInfo& info) {
+SkSurface* SkSurface::NewRaster(const SkImageInfo& info, const SkSurfaceProps* props) {
     if (!SkSurface_Raster::Valid(info)) {
-        return NULL;
+        return nullptr;
     }
 
-    SkAutoTUnref<SkPixelRef> pr(SkMallocPixelRef::NewAllocate(info, 0, NULL));
-    if (NULL == pr.get()) {
-        return NULL;
+    SkAutoTUnref<SkPixelRef> pr(SkMallocPixelRef::NewAllocate(info, 0, nullptr));
+    if (nullptr == pr.get()) {
+        return nullptr;
     }
-    return SkNEW_ARGS(SkSurface_Raster, (pr));
+    return new SkSurface_Raster(pr, props);
 }
diff --git a/gfx/skia/skia/src/images/SkDecodingImageGenerator.cpp b/gfx/skia/skia/src/images/SkDecodingImageGenerator.cpp
index dfa093becc5d..8cfacc3fba10 100644
--- a/gfx/skia/skia/src/images/SkDecodingImageGenerator.cpp
+++ b/gfx/skia/skia/src/images/SkDecodingImageGenerator.cpp
@@ -24,11 +24,11 @@ class DecodingImageGenerator : public SkImageGenerator {
 public:
     virtual ~DecodingImageGenerator();
 
-    SkData*                fData;
-    SkStreamRewindable*    fStream;
-    const SkImageInfo      fInfo;
-    const int              fSampleSize;
-    const bool             fDitherImage;
+    SkData*                             fData;
+    SkAutoTDelete<SkStreamRewindable>   fStream;
+    const SkImageInfo                   fInfo;
+    const int                           fSampleSize;
+    const bool                          fDitherImage;
 
     DecodingImageGenerator(SkData* data,
                            SkStreamRewindable* stream,
@@ -37,14 +37,11 @@ public:
                            bool ditherImage);
 
 protected:
-    virtual SkData* onRefEncodedData() SK_OVERRIDE;
-    virtual bool onGetInfo(SkImageInfo* info) SK_OVERRIDE {
-        *info = fInfo;
-        return true;
-    }
-    virtual bool onGetPixels(const SkImageInfo& info,
-                             void* pixels, size_t rowBytes,
-                             SkPMColor ctable[], int* ctableCount) SK_OVERRIDE;
+    SkData* onRefEncodedData() override;
+    bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
+                     SkPMColor ctable[], int* ctableCount) override;
+    bool onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3],
+                         SkYUVColorSpace* colorSpace) override;
 
 private:
     typedef SkImageGenerator INHERITED;
@@ -64,20 +61,20 @@ public:
         , fRowBytes(rowBytes)
     {}
 
-    bool isReady() { return (fTarget != NULL); }
+    bool isReady() { return (fTarget != nullptr); }
 
     virtual bool allocPixelRef(SkBitmap* bm, SkColorTable* ct) {
-        if (NULL == fTarget || !equal_modulo_alpha(fInfo, bm->info())) {
+        if (nullptr == fTarget || !equal_modulo_alpha(fInfo, bm->info())) {
             // Call default allocator.
-            return bm->allocPixels(NULL, ct);
+            return bm->tryAllocPixels(nullptr, ct);
         }
 
         // TODO(halcanary): verify that all callers of this function
         // will respect new RowBytes.  Will be moot once rowbytes belongs
         // to PixelRef.
-        bm->installPixels(fInfo, fTarget, fRowBytes, ct, NULL, NULL);
+        bm->installPixels(fInfo, fTarget, fRowBytes, ct, nullptr, nullptr);
 
-        fTarget = NULL;  // never alloc same pixels twice!
+        fTarget = nullptr;  // never alloc same pixels twice!
         return true;
     }
 
@@ -114,44 +111,39 @@ DecodingImageGenerator::DecodingImageGenerator(
         const SkImageInfo& info,
         int sampleSize,
         bool ditherImage)
-    : fData(data)
+    : INHERITED(info)
+    , fData(data)
     , fStream(stream)
     , fInfo(info)
     , fSampleSize(sampleSize)
     , fDitherImage(ditherImage)
 {
-    SkASSERT(stream != NULL);
-    SkSafeRef(fData);  // may be NULL.
+    SkASSERT(stream != nullptr);
+    SkSafeRef(fData);  // may be nullptr.
 }
 
 DecodingImageGenerator::~DecodingImageGenerator() {
     SkSafeUnref(fData);
-    fStream->unref();
 }
 
 SkData* DecodingImageGenerator::onRefEncodedData() {
     // This functionality is used in `gm --serialize`
     // Does not encode options.
-    if (fData != NULL) {
-        return SkSafeRef(fData);
+    if (nullptr == fData) {
+        // TODO(halcanary): SkStreamRewindable needs a refData() function
+        // which returns a cheap copy of the underlying data.
+        if (!fStream->rewind()) {
+            return nullptr;
+        }
+        size_t length = fStream->getLength();
+        if (length) {
+            fData = SkData::NewFromStream(fStream, length);
+        }
     }
-    // TODO(halcanary): SkStreamRewindable needs a refData() function
-    // which returns a cheap copy of the underlying data.
-    if (!fStream->rewind()) {
-        return NULL;
-    }
-    size_t length = fStream->getLength();
-    if (0 == length) {
-        return NULL;
-    }
-    void* buffer = sk_malloc_flags(length, 0);
-    SkCheckResult(fStream->read(buffer, length), length);
-    fData = SkData::NewFromMalloc(buffer, length);
     return SkSafeRef(fData);
 }
 
-bool DecodingImageGenerator::onGetPixels(const SkImageInfo& info,
-                                         void* pixels, size_t rowBytes,
+bool DecodingImageGenerator::onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
                                          SkPMColor ctableEntries[], int* ctableCount) {
     if (fInfo != info) {
         // The caller has specified a different info.  This is an
@@ -162,21 +154,20 @@ bool DecodingImageGenerator::onGetPixels(const SkImageInfo& info,
 
     SkAssertResult(fStream->rewind());
     SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(fStream));
-    if (NULL == decoder.get()) {
+    if (nullptr == decoder.get()) {
         return false;
     }
     decoder->setDitherImage(fDitherImage);
     decoder->setSampleSize(fSampleSize);
-    decoder->setRequireUnpremultipliedColors(
-            info.fAlphaType == kUnpremul_SkAlphaType);
+    decoder->setRequireUnpremultipliedColors(info.alphaType() == kUnpremul_SkAlphaType);
 
     SkBitmap bitmap;
     TargetAllocator allocator(fInfo, pixels, rowBytes);
     decoder->setAllocator(&allocator);
-    bool success = decoder->decode(fStream, &bitmap, info.colorType(),
-                                   SkImageDecoder::kDecodePixels_Mode);
-    decoder->setAllocator(NULL);
-    if (!success) {
+    const SkImageDecoder::Result decodeResult = decoder->decode(fStream, &bitmap, info.colorType(),
+                                                                SkImageDecoder::kDecodePixels_Mode);
+    decoder->setAllocator(nullptr);
+    if (SkImageDecoder::kFailure == decodeResult) {
         return false;
     }
     if (allocator.isReady()) {  // Did not use pixels!
@@ -195,21 +186,35 @@ bool DecodingImageGenerator::onGetPixels(const SkImageInfo& info,
 
     if (kIndex_8_SkColorType == info.colorType()) {
         if (kIndex_8_SkColorType != bitmap.colorType()) {
-            return false;   // they asked for Index8, but we didn't receive that from decoder
+            // they asked for Index8, but we didn't receive that from decoder
+            return false;
         }
         SkColorTable* ctable = bitmap.getColorTable();
-        if (NULL == ctable) {
+        if (nullptr == ctable) {
             return false;
         }
         const int count = ctable->count();
-        memcpy(ctableEntries, ctable->lockColors(), count * sizeof(SkPMColor));
-        ctable->unlockColors();
+        memcpy(ctableEntries, ctable->readColors(), count * sizeof(SkPMColor));
         *ctableCount = count;
     }
     return true;
 }
 
-// A contructor-type function that returns NULL on failure.  This
+bool DecodingImageGenerator::onGetYUV8Planes(SkISize sizes[3], void* planes[3],
+                                             size_t rowBytes[3], SkYUVColorSpace* colorSpace) {
+    if (!fStream->rewind()) {
+        return false;
+    }
+
+    SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(fStream));
+    if (nullptr == decoder.get()) {
+        return false;
+    }
+
+    return decoder->decodeYUV8Planes(fStream, sizes, planes, rowBytes, colorSpace);
+}
+
+// A contructor-type function that returns nullptr on failure.  This
 // prevents the returned SkImageGenerator from ever being in a bad
 // state.  Called by both Create() functions
 SkImageGenerator* CreateDecodingImageGenerator(
@@ -217,20 +222,20 @@ SkImageGenerator* CreateDecodingImageGenerator(
         SkStreamRewindable* stream,
         const SkDecodingImageGenerator::Options& opts) {
     SkASSERT(stream);
-    SkAutoTUnref<SkStreamRewindable> autoStream(stream);  // always unref this.
+    SkAutoTDelete<SkStreamRewindable> autoStream(stream);  // always delete this
     SkAssertResult(autoStream->rewind());
     SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(autoStream));
-    if (NULL == decoder.get()) {
-        return NULL;
+    if (nullptr == decoder.get()) {
+        return nullptr;
     }
     SkBitmap bitmap;
     decoder->setSampleSize(opts.fSampleSize);
     decoder->setRequireUnpremultipliedColors(opts.fRequireUnpremul);
     if (!decoder->decode(stream, &bitmap, SkImageDecoder::kDecodeBounds_Mode)) {
-        return NULL;
+        return nullptr;
     }
     if (kUnknown_SkColorType == bitmap.colorType()) {
-        return NULL;
+        return nullptr;
     }
 
     SkImageInfo info = bitmap.info();
@@ -238,22 +243,22 @@ SkImageGenerator* CreateDecodingImageGenerator(
     if (opts.fUseRequestedColorType && (opts.fRequestedColorType != info.colorType())) {
         if (!bitmap.canCopyTo(opts.fRequestedColorType)) {
             SkASSERT(bitmap.colorType() != opts.fRequestedColorType);
-            return NULL;  // Can not translate to needed config.
+            return nullptr;  // Can not translate to needed config.
         }
-        info.fColorType = opts.fRequestedColorType;
+        info = info.makeColorType(opts.fRequestedColorType);
     }
 
-    if (opts.fRequireUnpremul && info.fAlphaType != kOpaque_SkAlphaType) {
-        info.fAlphaType = kUnpremul_SkAlphaType;
+    if (opts.fRequireUnpremul && info.alphaType() != kOpaque_SkAlphaType) {
+        info = info.makeAlphaType(kUnpremul_SkAlphaType);
     }
 
-    if (!SkColorTypeValidateAlphaType(info.fColorType, info.fAlphaType, &info.fAlphaType)) {
-        return NULL;
+    SkAlphaType newAlphaType = info.alphaType();
+    if (!SkColorTypeValidateAlphaType(info.colorType(), info.alphaType(), &newAlphaType)) {
+        return nullptr;
     }
 
-    return SkNEW_ARGS(DecodingImageGenerator,
-                      (data, autoStream.detach(), info,
-                       opts.fSampleSize, opts.fDitherImage));
+    return new DecodingImageGenerator(data, autoStream.detach(), info.makeAlphaType(newAlphaType),
+                                      opts.fSampleSize, opts.fDitherImage);
 }
 
 }  // namespace
@@ -263,24 +268,21 @@ SkImageGenerator* CreateDecodingImageGenerator(
 SkImageGenerator* SkDecodingImageGenerator::Create(
         SkData* data,
         const SkDecodingImageGenerator::Options& opts) {
-    SkASSERT(data != NULL);
-    if (NULL == data) {
-        return NULL;
+    SkASSERT(data != nullptr);
+    if (nullptr == data) {
+        return nullptr;
     }
-    SkStreamRewindable* stream = SkNEW_ARGS(SkMemoryStream, (data));
-    SkASSERT(stream != NULL);
-    SkASSERT(stream->unique());
+    SkStreamRewindable* stream = new SkMemoryStream(data);
+    SkASSERT(stream != nullptr);
     return CreateDecodingImageGenerator(data, stream, opts);
 }
 
 SkImageGenerator* SkDecodingImageGenerator::Create(
         SkStreamRewindable* stream,
         const SkDecodingImageGenerator::Options& opts) {
-    SkASSERT(stream != NULL);
-    SkASSERT(stream->unique());
-    if ((stream == NULL) || !stream->unique()) {
-        SkSafeUnref(stream);
-        return NULL;
+    SkASSERT(stream != nullptr);
+    if (stream == nullptr) {
+        return nullptr;
     }
-    return CreateDecodingImageGenerator(NULL, stream, opts);
+    return CreateDecodingImageGenerator(nullptr, stream, opts);
 }
diff --git a/gfx/skia/skia/src/images/SkForceLinking.cpp b/gfx/skia/skia/src/images/SkForceLinking.cpp
index 442f0f77c001..55b7021432b7 100644
--- a/gfx/skia/skia/src/images/SkForceLinking.cpp
+++ b/gfx/skia/skia/src/images/SkForceLinking.cpp
@@ -18,12 +18,15 @@ int SkForceLinking(bool doNotPassTrue) {
         CreateWEBPImageDecoder();
         CreateBMPImageDecoder();
         CreateICOImageDecoder();
+        CreateWBMPImageDecoder();
+        // Only link hardware texture codecs on platforms that build them. See images.gyp
+#ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK
         CreatePKMImageDecoder();
         CreateKTXImageDecoder();
-        CreateWBMPImageDecoder();
+        CreateASTCImageDecoder();
+#endif
         // Only link GIF and PNG on platforms that build them. See images.gyp
-#if !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_WIN) && !defined(SK_BUILD_FOR_NACL) \
-        && !defined(SK_BUILD_FOR_IOS)
+#if !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_WIN) && !defined(SK_BUILD_FOR_IOS)
         CreateGIFImageDecoder();
 #endif
 #if !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_WIN) && !defined(SK_BUILD_FOR_IOS)
diff --git a/gfx/skia/skia/src/images/SkImageDecoder.cpp b/gfx/skia/skia/src/images/SkImageDecoder.cpp
index fcba91069a43..221faf74d5e3 100644
--- a/gfx/skia/skia/src/images/SkImageDecoder.cpp
+++ b/gfx/skia/skia/src/images/SkImageDecoder.cpp
@@ -15,18 +15,12 @@
 #include "SkCanvas.h"
 
 SkImageDecoder::SkImageDecoder()
-    : fPeeker(NULL)
-#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER
-    , fChooser(NULL)
-#endif
-    , fAllocator(NULL)
+    : fPeeker(nullptr)
+    , fAllocator(nullptr)
     , fSampleSize(1)
     , fDefaultPref(kUnknown_SkColorType)
     , fPreserveSrcDepth(false)
     , fDitherImage(true)
-#ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG
-    , fUsePrefTable(false)
-#endif
     , fSkipWritingZeroes(false)
     , fPreferQualityOverSpeed(false)
     , fRequireUnpremultipliedColors(false) {
@@ -34,29 +28,16 @@ SkImageDecoder::SkImageDecoder()
 
 SkImageDecoder::~SkImageDecoder() {
     SkSafeUnref(fPeeker);
-#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER
-    SkSafeUnref(fChooser);
-#endif
     SkSafeUnref(fAllocator);
 }
 
 void SkImageDecoder::copyFieldsToOther(SkImageDecoder* other) {
-    if (NULL == other) {
+    if (nullptr == other) {
         return;
     }
     other->setPeeker(fPeeker);
-#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER
-    other->setChooser(fChooser);
-#endif
     other->setAllocator(fAllocator);
     other->setSampleSize(fSampleSize);
-#ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG
-    if (fUsePrefTable) {
-        other->setPrefConfigTable(fPrefTable);
-    } else {
-        other->fDefaultPref = fDefaultPref;
-    }
-#endif
     other->setPreserveSrcDepth(fPreserveSrcDepth);
     other->setDitherImage(fDitherImage);
     other->setSkipWritingZeroes(fSkipWritingZeroes);
@@ -86,6 +67,8 @@ const char* SkImageDecoder::GetFormatName(Format format) {
             return "PKM";
         case kKTX_Format:
             return "KTX";
+        case kASTC_Format:
+            return "ASTC";
         case kJPEG_Format:
             return "JPEG";
         case kPNG_Format:
@@ -100,18 +83,11 @@ const char* SkImageDecoder::GetFormatName(Format format) {
     return "Unknown Format";
 }
 
-SkImageDecoder::Peeker* SkImageDecoder::setPeeker(Peeker* peeker) {
+SkPngChunkReader* SkImageDecoder::setPeeker(SkPngChunkReader* peeker) {
     SkRefCnt_SafeAssign(fPeeker, peeker);
     return peeker;
 }
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER
-SkImageDecoder::Chooser* SkImageDecoder::setChooser(Chooser* chooser) {
-    SkRefCnt_SafeAssign(fChooser, chooser);
-    return chooser;
-}
-#endif
-
 SkBitmap::Allocator* SkImageDecoder::setAllocator(SkBitmap::Allocator* alloc) {
     SkRefCnt_SafeAssign(fAllocator, alloc);
     return alloc;
@@ -124,60 +100,15 @@ void SkImageDecoder::setSampleSize(int size) {
     fSampleSize = size;
 }
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER
-// TODO: change Chooser virtual to take colorType, so we can stop calling SkColorTypeToBitmapConfig
-//
-bool SkImageDecoder::chooseFromOneChoice(SkColorType colorType, int width, int height) const {
-    Chooser* chooser = fChooser;
-    
-    if (NULL == chooser) {    // no chooser, we just say YES to decoding :)
-        return true;
-    }
-    chooser->begin(1);
-    chooser->inspect(0, SkColorTypeToBitmapConfig(colorType), width, height);
-    return chooser->choose() == 0;
-}
-#endif
-
 bool SkImageDecoder::allocPixelRef(SkBitmap* bitmap,
                                    SkColorTable* ctable) const {
-    return bitmap->allocPixels(fAllocator, ctable);
+    return bitmap->tryAllocPixels(fAllocator, ctable);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG
-void SkImageDecoder::setPrefConfigTable(const PrefConfigTable& prefTable) {
-    fUsePrefTable = true;
-    fPrefTable = prefTable;
-}
-#endif
-
-// TODO: use colortype in fPrefTable, fDefaultPref so we can stop using SkBitmapConfigToColorType()
-//
 SkColorType SkImageDecoder::getPrefColorType(SrcDepth srcDepth, bool srcHasAlpha) const {
     SkColorType ct = fDefaultPref;
-#ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG
-    if (fUsePrefTable) {
-        // Until we kill or change the PrefTable, we have to go into Config land for a moment.
-        SkBitmap::Config config = SkBitmap::kNo_Config;
-        switch (srcDepth) {
-            case kIndex_SrcDepth:
-                config = srcHasAlpha ? fPrefTable.fPrefFor_8Index_YesAlpha_src
-                                     : fPrefTable.fPrefFor_8Index_NoAlpha_src;
-                break;
-            case k8BitGray_SrcDepth:
-                config = fPrefTable.fPrefFor_8Gray_src;
-                break;
-            case k32Bit_SrcDepth:
-                config = srcHasAlpha ? fPrefTable.fPrefFor_8bpc_YesAlpha_src
-                                     : fPrefTable.fPrefFor_8bpc_NoAlpha_src;
-                break;
-        }
-        // now return to SkColorType land
-        ct = SkBitmapConfigToColorType(config);
-    }
-#endif
     if (fPreserveSrcDepth) {
         switch (srcDepth) {
             case kIndex_SrcDepth:
@@ -194,7 +125,8 @@ SkColorType SkImageDecoder::getPrefColorType(SrcDepth srcDepth, bool srcHasAlpha
     return ct;
 }
 
-bool SkImageDecoder::decode(SkStream* stream, SkBitmap* bm, SkColorType pref, Mode mode) {
+SkImageDecoder::Result SkImageDecoder::decode(SkStream* stream, SkBitmap* bm, SkColorType pref,
+                                              Mode mode) {
     // we reset this to false before calling onDecode
     fShouldCancelDecode = false;
     // assign this, for use by getPrefColorType(), in case fUsePrefTable is false
@@ -202,75 +134,12 @@ bool SkImageDecoder::decode(SkStream* stream, SkBitmap* bm, SkColorType pref, Mo
 
     // pass a temporary bitmap, so that if we return false, we are assured of
     // leaving the caller's bitmap untouched.
-    SkBitmap    tmp;
-    if (!this->onDecode(stream, &tmp, mode)) {
-        return false;
+    SkBitmap tmp;
+    const Result result = this->onDecode(stream, &tmp, mode);
+    if (kFailure != result) {
+        bm->swap(tmp);
     }
-    bm->swap(tmp);
-    return true;
-}
-
-bool SkImageDecoder::decodeSubset(SkBitmap* bm, const SkIRect& rect, SkColorType pref) {
-    // we reset this to false before calling onDecodeSubset
-    fShouldCancelDecode = false;
-    // assign this, for use by getPrefColorType(), in case fUsePrefTable is false
-    fDefaultPref = pref;
-
-    return this->onDecodeSubset(bm, rect);
-}
-
-bool SkImageDecoder::buildTileIndex(SkStreamRewindable* stream, int *width, int *height) {
-    // we reset this to false before calling onBuildTileIndex
-    fShouldCancelDecode = false;
-
-    return this->onBuildTileIndex(stream, width, height);
-}
-
-bool SkImageDecoder::cropBitmap(SkBitmap *dst, SkBitmap *src, int sampleSize,
-                                int dstX, int dstY, int width, int height,
-                                int srcX, int srcY) {
-    int w = width / sampleSize;
-    int h = height / sampleSize;
-    if (src->colorType() == kIndex_8_SkColorType) {
-        // kIndex8 does not allow drawing via an SkCanvas, as is done below.
-        // Instead, use extractSubset. Note that this shares the SkPixelRef and
-        // SkColorTable.
-        // FIXME: Since src is discarded in practice, this holds on to more
-        // pixels than is strictly necessary. Switch to a copy if memory
-        // savings are more important than speed here. This also means
-        // that the pixels in dst can not be reused (though there is no
-        // allocation, which was already done on src).
-        int x = (dstX - srcX) / sampleSize;
-        int y = (dstY - srcY) / sampleSize;
-        SkIRect subset = SkIRect::MakeXYWH(x, y, w, h);
-        return src->extractSubset(dst, subset);
-    }
-    // if the destination has no pixels then we must allocate them.
-    if (dst->isNull()) {
-        dst->setInfo(src->info().makeWH(w, h));
-
-        if (!this->allocPixelRef(dst, NULL)) {
-            SkDEBUGF(("failed to allocate pixels needed to crop the bitmap"));
-            return false;
-        }
-    }
-    // check to see if the destination is large enough to decode the desired
-    // region. If this assert fails we will just draw as much of the source
-    // into the destination that we can.
-    if (dst->width() < w || dst->height() < h) {
-        SkDEBUGF(("SkImageDecoder::cropBitmap does not have a large enough bitmap.\n"));
-    }
-
-    // Set the Src_Mode for the paint to prevent transparency issue in the
-    // dest in the event that the dest was being re-used.
-    SkPaint paint;
-    paint.setXfermodeMode(SkXfermode::kSrc_Mode);
-
-    SkCanvas canvas(*dst);
-    canvas.drawSprite(*src, (srcX - dstX) / sampleSize,
-                            (srcY - dstY) / sampleSize,
-                            &paint);
-    return true;
+    return result;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -280,10 +149,12 @@ bool SkImageDecoder::DecodeFile(const char file[], SkBitmap* bm, SkColorType pre
     SkASSERT(file);
     SkASSERT(bm);
 
-    SkAutoTUnref<SkStreamRewindable> stream(SkStream::NewFromFile(file));
+    SkAutoTDelete<SkStreamRewindable> stream(SkStream::NewFromFile(file));
     if (stream.get()) {
         if (SkImageDecoder::DecodeStream(stream, bm, pref, mode, format)) {
-            bm->pixelRef()->setURI(file);
+            if (SkPixelRef* pr = bm->pixelRef()) {
+                pr->setURI(file);
+            }
             return true;
         }
     }
@@ -309,8 +180,8 @@ bool SkImageDecoder::DecodeStream(SkStreamRewindable* stream, SkBitmap* bm, SkCo
     bool success = false;
     SkImageDecoder* codec = SkImageDecoder::Factory(stream);
 
-    if (NULL != codec) {
-        success = codec->decode(stream, bm, pref, mode);
+    if (codec) {
+        success = codec->decode(stream, bm, pref, mode) != kFailure;
         if (success && format) {
             *format = codec->getFormat();
             if (kUnknown_Format == *format) {
@@ -323,3 +194,11 @@ bool SkImageDecoder::DecodeStream(SkStreamRewindable* stream, SkBitmap* bm, SkCo
     }
     return success;
 }
+
+bool SkImageDecoder::decodeYUV8Planes(SkStream* stream, SkISize componentSizes[3], void* planes[3],
+                                      size_t rowBytes[3], SkYUVColorSpace* colorSpace) {
+    // we reset this to false before calling onDecodeYUV8Planes
+    fShouldCancelDecode = false;
+
+    return this->onDecodeYUV8Planes(stream, componentSizes, planes, rowBytes, colorSpace);
+}
diff --git a/gfx/skia/skia/src/images/SkImageDecoder_FactoryDefault.cpp b/gfx/skia/skia/src/images/SkImageDecoder_FactoryDefault.cpp
index e959c8b69b81..77c0a0ac578f 100644
--- a/gfx/skia/skia/src/images/SkImageDecoder_FactoryDefault.cpp
+++ b/gfx/skia/skia/src/images/SkImageDecoder_FactoryDefault.cpp
@@ -27,10 +27,10 @@ SkMovie* SkMovie::DecodeStream(SkStreamRewindable* stream) {
         if (movie) {
             return movie;
         }
-        // we must rewind only if we got NULL, since we gave the stream to the
+        // we must rewind only if we got nullptr, since we gave the stream to the
         // movie, who may have already started reading from it
         stream->rewind();
         curr = curr->next();
     }
-    return NULL;
+    return nullptr;
 }
diff --git a/gfx/skia/skia/src/images/SkImageDecoder_FactoryRegistrar.cpp b/gfx/skia/skia/src/images/SkImageDecoder_FactoryRegistrar.cpp
index b47a6d5317dc..36034d20ad1a 100644
--- a/gfx/skia/skia/src/images/SkImageDecoder_FactoryRegistrar.cpp
+++ b/gfx/skia/skia/src/images/SkImageDecoder_FactoryRegistrar.cpp
@@ -19,7 +19,7 @@ template SkImageDecoder_DecodeReg* SkImageDecoder_DecodeReg::gHead;
 SkImageDecoder* image_decoder_from_stream(SkStreamRewindable*);
 
 SkImageDecoder* image_decoder_from_stream(SkStreamRewindable* stream) {
-    SkImageDecoder* codec = NULL;
+    SkImageDecoder* codec = nullptr;
     const SkImageDecoder_DecodeReg* curr = SkImageDecoder_DecodeReg::Head();
     while (curr) {
         codec = curr->factory()(stream);
@@ -31,8 +31,8 @@ SkImageDecoder* image_decoder_from_stream(SkStreamRewindable* stream) {
         // if we are given a stream that does not support rewinding.
         if (!rewindSuceeded) {
             SkDEBUGF(("Unable to rewind the image stream."));
-            SkDELETE(codec);
-            return NULL;
+            delete codec;
+            return nullptr;
         }
 
         if (codec) {
@@ -40,14 +40,14 @@ SkImageDecoder* image_decoder_from_stream(SkStreamRewindable* stream) {
         }
         curr = curr->next();
     }
-    return NULL;
+    return nullptr;
 }
 
 template SkImageDecoder_FormatReg* SkImageDecoder_FormatReg::gHead;
 
 SkImageDecoder::Format SkImageDecoder::GetStreamFormat(SkStreamRewindable* stream) {
     const SkImageDecoder_FormatReg* curr = SkImageDecoder_FormatReg::Head();
-    while (curr != NULL) {
+    while (curr != nullptr) {
         Format format = curr->factory()(stream);
         if (!stream->rewind()) {
             SkErrorInternals::SetError(kInvalidOperation_SkError,
diff --git a/gfx/skia/skia/src/images/SkImageDecoder_astc.cpp b/gfx/skia/skia/src/images/SkImageDecoder_astc.cpp
new file mode 100644
index 000000000000..e1a6a06fa758
--- /dev/null
+++ b/gfx/skia/skia/src/images/SkImageDecoder_astc.cpp
@@ -0,0 +1,203 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkEndian.h"
+#include "SkColorPriv.h"
+#include "SkImageDecoder.h"
+#include "SkScaledBitmapSampler.h"
+#include "SkStream.h"
+#include "SkStreamPriv.h"
+#include "SkTypes.h"
+
+#include "SkTextureCompressor.h"
+
+class SkASTCImageDecoder : public SkImageDecoder {
+public:
+    SkASTCImageDecoder() { }
+
+    Format getFormat() const override {
+        return kASTC_Format;
+    }
+
+protected:
+    Result onDecode(SkStream* stream, SkBitmap* bm, Mode) override;
+
+private:
+    typedef SkImageDecoder INHERITED;
+};
+
+/////////////////////////////////////////////////////////////////////////////////////////
+
+static const uint32_t kASTCMagicNumber = 0x5CA1AB13;
+
+static inline int read_24bit(const uint8_t* buf) {
+    // Assume everything is little endian...
+    return
+        static_cast<int>(buf[0]) |
+        (static_cast<int>(buf[1]) << 8) |
+        (static_cast<int>(buf[2]) << 16);
+}
+
+SkImageDecoder::Result SkASTCImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
+    SkAutoMalloc autoMal;
+    const size_t length = SkCopyStreamToStorage(&autoMal, stream);
+    if (0 == length) {
+        return kFailure;
+    }
+
+    unsigned char* buf = (unsigned char*)autoMal.get();
+
+    // Make sure that the magic header is there...
+    SkASSERT(SkEndian_SwapLE32(*(reinterpret_cast<uint32_t*>(buf))) == kASTCMagicNumber);
+
+    // Advance past the magic header
+    buf += 4;
+
+    const int blockDimX = buf[0];
+    const int blockDimY = buf[1];
+    const int blockDimZ = buf[2];
+
+    if (1 != blockDimZ) {
+        // We don't support decoding 3D
+        return kFailure;
+    }
+
+    // Choose the proper ASTC format
+    SkTextureCompressor::Format astcFormat;
+    if (4 == blockDimX && 4 == blockDimY) {
+        astcFormat = SkTextureCompressor::kASTC_4x4_Format;
+    } else if (5 == blockDimX && 4 == blockDimY) {
+        astcFormat = SkTextureCompressor::kASTC_5x4_Format;
+    } else if (5 == blockDimX && 5 == blockDimY) {
+        astcFormat = SkTextureCompressor::kASTC_5x5_Format;
+    } else if (6 == blockDimX && 5 == blockDimY) {
+        astcFormat = SkTextureCompressor::kASTC_6x5_Format;
+    } else if (6 == blockDimX && 6 == blockDimY) {
+        astcFormat = SkTextureCompressor::kASTC_6x6_Format;
+    } else if (8 == blockDimX && 5 == blockDimY) {
+        astcFormat = SkTextureCompressor::kASTC_8x5_Format;
+    } else if (8 == blockDimX && 6 == blockDimY) {
+        astcFormat = SkTextureCompressor::kASTC_8x6_Format;
+    } else if (8 == blockDimX && 8 == blockDimY) {
+        astcFormat = SkTextureCompressor::kASTC_8x8_Format;
+    } else if (10 == blockDimX && 5 == blockDimY) {
+        astcFormat = SkTextureCompressor::kASTC_10x5_Format;
+    } else if (10 == blockDimX && 6 == blockDimY) {
+        astcFormat = SkTextureCompressor::kASTC_10x6_Format;
+    } else if (10 == blockDimX && 8 == blockDimY) {
+        astcFormat = SkTextureCompressor::kASTC_10x8_Format;
+    } else if (10 == blockDimX && 10 == blockDimY) {
+        astcFormat = SkTextureCompressor::kASTC_10x10_Format;
+    } else if (12 == blockDimX && 10 == blockDimY) {
+        astcFormat = SkTextureCompressor::kASTC_12x10_Format;
+    } else if (12 == blockDimX && 12 == blockDimY) {
+        astcFormat = SkTextureCompressor::kASTC_12x12_Format;
+    } else {
+        // We don't support any other block dimensions..
+        return kFailure;
+    }
+
+    // Advance buf past the block dimensions
+    buf += 3;
+
+    // Read the width/height/depth from the buffer...
+    const int width = read_24bit(buf);
+    const int height = read_24bit(buf + 3);
+    const int depth = read_24bit(buf + 6);
+
+    if (1 != depth) {
+        // We don't support decoding 3D.
+        return kFailure;
+    }
+
+    // Advance the buffer past the image dimensions
+    buf += 9;
+
+    // Setup the sampler...
+    SkScaledBitmapSampler sampler(width, height, this->getSampleSize());
+
+    // Determine the alpha of the bitmap...
+    SkAlphaType alphaType = kOpaque_SkAlphaType;
+    if (this->getRequireUnpremultipliedColors()) {
+        alphaType = kUnpremul_SkAlphaType;
+    } else {
+        alphaType = kPremul_SkAlphaType;
+    }
+
+    // Set the config...
+    bm->setInfo(SkImageInfo::MakeN32(sampler.scaledWidth(), sampler.scaledHeight(), alphaType));
+
+    if (SkImageDecoder::kDecodeBounds_Mode == mode) {
+        return kSuccess;
+    }
+
+    if (!this->allocPixelRef(bm, nullptr)) {
+        return kFailure;
+    }
+
+    // Lock the pixels, since we're about to write to them...
+    SkAutoLockPixels alp(*bm);
+
+    if (!sampler.begin(bm, SkScaledBitmapSampler::kRGBA, *this)) {
+        return kFailure;
+    }
+
+    // ASTC Data is encoded as RGBA pixels, so we should extract it as such
+    int nPixels = width * height;
+    SkAutoMalloc outRGBAData(nPixels * 4);
+    uint8_t *outRGBADataPtr = reinterpret_cast<uint8_t *>(outRGBAData.get());
+
+    // Decode ASTC
+    if (!SkTextureCompressor::DecompressBufferFromFormat(
+            outRGBADataPtr, width*4, buf, width, height, astcFormat)) {
+        return kFailure;
+    }
+
+    // Set each of the pixels...
+    const int srcRowBytes = width * 4;
+    const int dstHeight = sampler.scaledHeight();
+    const uint8_t *srcRow = reinterpret_cast<uint8_t *>(outRGBADataPtr);
+    srcRow += sampler.srcY0() * srcRowBytes;
+    for (int y = 0; y < dstHeight; ++y) {
+        sampler.next(srcRow);
+        srcRow += sampler.srcDY() * srcRowBytes;
+    }
+
+    return kSuccess;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+DEFINE_DECODER_CREATOR(ASTCImageDecoder);
+/////////////////////////////////////////////////////////////////////////////////////////
+
+static bool is_astc(SkStreamRewindable* stream) {
+    // Read the ASTC header and make sure it's valid.
+    uint32_t magic;
+    if (stream->read((void*)&magic, 4) != 4) {
+        return false;
+    }
+
+    return kASTCMagicNumber == SkEndian_SwapLE32(magic);
+}
+
+static SkImageDecoder* sk_libastc_dfactory(SkStreamRewindable* stream) {
+    if (is_astc(stream)) {
+        return new SkASTCImageDecoder;
+    }
+    return nullptr;
+}
+
+static SkImageDecoder_DecodeReg gReg(sk_libastc_dfactory);
+
+static SkImageDecoder::Format get_format_astc(SkStreamRewindable* stream) {
+    if (is_astc(stream)) {
+        return SkImageDecoder::kASTC_Format;
+    }
+    return SkImageDecoder::kUnknown_Format;
+}
+
+static SkImageDecoder_FormatReg gFormatReg(get_format_astc);
diff --git a/gfx/skia/skia/src/images/SkImageDecoder_ktx.cpp b/gfx/skia/skia/src/images/SkImageDecoder_ktx.cpp
index 058ab7264695..a95ab6f602d3 100644
--- a/gfx/skia/skia/src/images/SkImageDecoder_ktx.cpp
+++ b/gfx/skia/skia/src/images/SkImageDecoder_ktx.cpp
@@ -36,39 +36,32 @@ class SkKTXImageDecoder : public SkImageDecoder {
 public:
     SkKTXImageDecoder() { }
 
-    virtual Format getFormat() const SK_OVERRIDE {
+    Format getFormat() const override {
         return kKTX_Format;
     }
 
 protected:
-    virtual bool onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE;
+    Result onDecode(SkStream* stream, SkBitmap* bm, Mode) override;
 
 private:
     typedef SkImageDecoder INHERITED;
 };
 
-bool SkKTXImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
+SkImageDecoder::Result SkKTXImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
     // TODO: Implement SkStream::copyToData() that's cheap for memory and file streams
     SkAutoDataUnref data(SkCopyStreamToData(stream));
-    if (NULL == data) {
-        return false;
+    if (nullptr == data) {
+        return kFailure;
     }
 
     SkKTXFile ktxFile(data);
     if (!ktxFile.valid()) {
-        return false;
+        return kFailure;
     }
 
     const unsigned short width = ktxFile.width();
     const unsigned short height = ktxFile.height();
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER
-    // should we allow the Chooser (if present) to pick a config for us???
-    if (!this->chooseFromOneChoice(kN32_SkColorType, width, height)) {
-        return false;
-    }
-#endif
-
     // Set a flag if our source is premultiplied alpha
     const SkString premulKey("KTXPremultipliedAlpha");
     const bool bSrcIsPremul = ktxFile.getValueForKey(premulKey) == SkString("True");
@@ -84,41 +77,98 @@ bool SkKTXImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
             // If the client wants unpremul colors and we only have
             // premul, then we cannot honor their wish.
             if (bSrcIsPremul) {
-                return false;
+                return kFailure;
             }
         } else {
             alphaType = kPremul_SkAlphaType;
         }
     }
 
-    // Set the config...
-    bm->setInfo(SkImageInfo::MakeN32(sampler.scaledWidth(), sampler.scaledHeight(), alphaType));
-    if (SkImageDecoder::kDecodeBounds_Mode == mode) {
-        return true;
+    // Search through the compressed formats to see if the KTX file is holding
+    // compressed data
+    bool ktxIsCompressed = false;
+    SkTextureCompressor::Format ktxCompressedFormat;
+    for (int i = 0; i < SkTextureCompressor::kFormatCnt; ++i) {
+        SkTextureCompressor::Format fmt = static_cast<SkTextureCompressor::Format>(i);
+        if (ktxFile.isCompressedFormat(fmt)) {
+            ktxIsCompressed = true;
+            ktxCompressedFormat = fmt;
+            break;
+        }
+    }
+
+    // If the compressed format is a grayscale image, then setup the bitmap properly...
+    bool isCompressedAlpha = ktxIsCompressed &&
+        ((SkTextureCompressor::kLATC_Format == ktxCompressedFormat) ||
+         (SkTextureCompressor::kR11_EAC_Format == ktxCompressedFormat));
+
+    // Set the image dimensions and underlying pixel type.
+    if (isCompressedAlpha) {
+        const int w = sampler.scaledWidth();
+        const int h = sampler.scaledHeight();
+        bm->setInfo(SkImageInfo::MakeA8(w, h));
+    } else {
+        const int w = sampler.scaledWidth();
+        const int h = sampler.scaledHeight();
+        bm->setInfo(SkImageInfo::MakeN32(w, h, alphaType));
     }
     
+    if (SkImageDecoder::kDecodeBounds_Mode == mode) {
+        return kSuccess;
+    }
+
     // If we've made it this far, then we know how to grok the data.
-    if (!this->allocPixelRef(bm, NULL)) {
-        return false;
+    if (!this->allocPixelRef(bm, nullptr)) {
+        return kFailure;
     }
 
     // Lock the pixels, since we're about to write to them...
     SkAutoLockPixels alp(*bm);
 
-    if (ktxFile.isETC1()) {
+    if (isCompressedAlpha) {
+        if (!sampler.begin(bm, SkScaledBitmapSampler::kGray, *this)) {
+            return kFailure;
+        }
+
+        // Alpha data is only a single byte per pixel.
+        int nPixels = width * height;
+        SkAutoMalloc outRGBData(nPixels);
+        uint8_t *outRGBDataPtr = reinterpret_cast<uint8_t *>(outRGBData.get());
+
+        // Decode the compressed format
+        const uint8_t *buf = reinterpret_cast<const uint8_t *>(ktxFile.pixelData());
+        if (!SkTextureCompressor::DecompressBufferFromFormat(
+                outRGBDataPtr, width, buf, width, height, ktxCompressedFormat)) {
+            return kFailure;
+        }
+
+        // Set each of the pixels...
+        const int srcRowBytes = width;
+        const int dstHeight = sampler.scaledHeight();
+        const uint8_t *srcRow = reinterpret_cast<uint8_t *>(outRGBDataPtr);
+        srcRow += sampler.srcY0() * srcRowBytes;
+        for (int y = 0; y < dstHeight; ++y) {
+            sampler.next(srcRow);
+            srcRow += sampler.srcDY() * srcRowBytes;
+        }
+
+        return kSuccess;
+
+    } else if (ktxFile.isCompressedFormat(SkTextureCompressor::kETC1_Format)) {
         if (!sampler.begin(bm, SkScaledBitmapSampler::kRGB, *this)) {
-            return false;
+            return kFailure;
         }
 
         // ETC1 Data is encoded as RGB pixels, so we should extract it as such
         int nPixels = width * height;
         SkAutoMalloc outRGBData(nPixels * 3);
-        etc1_byte *outRGBDataPtr = reinterpret_cast<etc1_byte *>(outRGBData.get());
+        uint8_t *outRGBDataPtr = reinterpret_cast<uint8_t *>(outRGBData.get());
 
         // Decode ETC1
-        const etc1_byte *buf = reinterpret_cast<const etc1_byte *>(ktxFile.pixelData());
-        if (etc1_decode_image(buf, outRGBDataPtr, width, height, 3, width*3)) {
-            return false;
+        const uint8_t *buf = reinterpret_cast<const uint8_t *>(ktxFile.pixelData());
+        if (!SkTextureCompressor::DecompressBufferFromFormat(
+                outRGBDataPtr, width*3, buf, width, height, SkTextureCompressor::kETC1_Format)) {
+            return kFailure;
         }
 
         // Set each of the pixels...
@@ -131,13 +181,13 @@ bool SkKTXImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
             srcRow += sampler.srcDY() * srcRowBytes;
         }
 
-        return true;
+        return kSuccess;
 
     } else if (ktxFile.isRGB8()) {
 
         // Uncompressed RGB data (without alpha)
         if (!sampler.begin(bm, SkScaledBitmapSampler::kRGB, *this)) {
-            return false;
+            return kFailure;
         }
 
         // Just need to read RGB pixels
@@ -150,7 +200,7 @@ bool SkKTXImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
             srcRow += sampler.srcDY() * srcRowBytes;
         }
 
-        return true;
+        return kSuccess;
 
     } else if (ktxFile.isRGBA8()) {
 
@@ -167,7 +217,7 @@ bool SkKTXImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
         } 
 
         if (!sampler.begin(bm, SkScaledBitmapSampler::kRGBA, opts)) {
-            return false;
+            return kFailure;
         }
 
         // Just need to read RGBA pixels
@@ -180,10 +230,10 @@ bool SkKTXImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
             srcRow += sampler.srcDY() * srcRowBytes;
         }
 
-        return true;
+        return kSuccess;
     }
 
-    return false;
+    return kFailure;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -201,7 +251,7 @@ bool SkKTXImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
 
 class SkKTXImageEncoder : public SkImageEncoder {
 protected:
-    virtual bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality) SK_OVERRIDE;
+    bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality) override;
 
 private:
     virtual bool encodePKM(SkWStream* stream, const SkData *data);
@@ -215,7 +265,7 @@ bool SkKTXImageEncoder::onEncode(SkWStream* stream, const SkBitmap& bitmap, int)
     SkAutoDataUnref data(bitmap.pixelRef()->refEncodedData());
 
     // Is this even encoded data?
-    if (NULL != data) {
+    if (data) {
         const uint8_t *bytes = data->bytes();
         if (etc1_pkm_is_valid(bytes)) {
             return this->encodePKM(stream, data);
@@ -259,9 +309,9 @@ DEFINE_ENCODER_CREATOR(KTXImageEncoder);
 
 static SkImageDecoder* sk_libktx_dfactory(SkStreamRewindable* stream) {
     if (SkKTXFile::is_ktx(stream)) {
-        return SkNEW(SkKTXImageDecoder);
+        return new SkKTXImageDecoder;
     }
-    return NULL;
+    return nullptr;
 }
 
 static SkImageDecoder::Format get_format_ktx(SkStreamRewindable* stream) {
@@ -272,7 +322,7 @@ static SkImageDecoder::Format get_format_ktx(SkStreamRewindable* stream) {
 }
 
 SkImageEncoder* sk_libktx_efactory(SkImageEncoder::Type t) {
-    return (SkImageEncoder::kKTX_Type == t) ? SkNEW(SkKTXImageEncoder) : NULL;
+    return (SkImageEncoder::kKTX_Type == t) ? new SkKTXImageEncoder : nullptr;
 }
 
 static SkImageDecoder_DecodeReg gReg(sk_libktx_dfactory);
diff --git a/gfx/skia/skia/src/images/SkImageDecoder_libbmp.cpp b/gfx/skia/skia/src/images/SkImageDecoder_libbmp.cpp
index 7b87e40039d4..179162356aec 100644
--- a/gfx/skia/skia/src/images/SkImageDecoder_libbmp.cpp
+++ b/gfx/skia/skia/src/images/SkImageDecoder_libbmp.cpp
@@ -19,12 +19,12 @@ class SkBMPImageDecoder : public SkImageDecoder {
 public:
     SkBMPImageDecoder() {}
 
-    virtual Format getFormat() const SK_OVERRIDE {
+    Format getFormat() const override {
         return kBMP_Format;
     }
 
 protected:
-    virtual bool onDecode(SkStream* stream, SkBitmap* bm, Mode mode) SK_OVERRIDE;
+    Result onDecode(SkStream* stream, SkBitmap* bm, Mode mode) override;
 
 private:
     typedef SkImageDecoder INHERITED;
@@ -46,9 +46,9 @@ static bool is_bmp(SkStreamRewindable* stream) {
 
 static SkImageDecoder* sk_libbmp_dfactory(SkStreamRewindable* stream) {
     if (is_bmp(stream)) {
-        return SkNEW(SkBMPImageDecoder);
+        return new SkBMPImageDecoder;
     }
-    return NULL;
+    return nullptr;
 }
 
 static SkImageDecoder_DecodeReg gReg(sk_libbmp_dfactory);
@@ -74,7 +74,7 @@ public:
         fWidth = width;
         fHeight = height;
         if (fJustBounds) {
-            return NULL;
+            return nullptr;
         }
 
         fRGB.setCount(width * height * 3);  // 3 == r, g, b
@@ -92,7 +92,7 @@ private:
     bool fJustBounds;
 };
 
-bool SkBMPImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
+SkImageDecoder::Result SkBMPImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
     // First read the entire stream, so that all of the data can be passed to
     // the BmpDecoderHelper.
 
@@ -101,7 +101,7 @@ bool SkBMPImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
     // Byte length of all of the data.
     const size_t length = SkCopyStreamToStorage(&storage, stream);
     if (0 == length) {
-        return 0;
+        return kFailure;
     }
 
     const bool justBounds = SkImageDecoder::kDecodeBounds_Mode == mode;
@@ -113,7 +113,7 @@ bool SkBMPImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
         const int max_pixels = 16383*16383; // max width*height
         if (!helper.DecodeImage((const char*)storage.get(), length,
                                 max_pixels, &callback)) {
-            return false;
+            return kFailure;
         }
     }
 
@@ -136,17 +136,17 @@ bool SkBMPImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
                                   colorType, kOpaque_SkAlphaType));
 
     if (justBounds) {
-        return true;
+        return kSuccess;
     }
 
-    if (!this->allocPixelRef(bm, NULL)) {
-        return false;
+    if (!this->allocPixelRef(bm, nullptr)) {
+        return kFailure;
     }
 
     SkAutoLockPixels alp(*bm);
 
     if (!sampler.begin(bm, SkScaledBitmapSampler::kRGB, *this)) {
-        return false;
+        return kFailure;
     }
 
     const int srcRowBytes = width * 3;
@@ -158,5 +158,5 @@ bool SkBMPImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
         sampler.next(srcRow);
         srcRow += sampler.srcDY() * srcRowBytes;
     }
-    return true;
+    return kSuccess;
 }
diff --git a/gfx/skia/skia/src/images/SkImageDecoder_libgif.cpp b/gfx/skia/skia/src/images/SkImageDecoder_libgif.cpp
index 0c8461f893e5..ef55a8f2e0cf 100644
--- a/gfx/skia/skia/src/images/SkImageDecoder_libgif.cpp
+++ b/gfx/skia/skia/src/images/SkImageDecoder_libgif.cpp
@@ -19,12 +19,12 @@
 
 class SkGIFImageDecoder : public SkImageDecoder {
 public:
-    virtual Format getFormat() const SK_OVERRIDE {
+    Format getFormat() const override {
         return kGIF_Format;
     }
 
 protected:
-    virtual bool onDecode(SkStream* stream, SkBitmap* bm, Mode mode) SK_OVERRIDE;
+    Result onDecode(SkStream* stream, SkBitmap* bm, Mode mode) override;
 
 private:
     typedef SkImageDecoder INHERITED;
@@ -77,8 +77,8 @@ public:
             if (gStartingIterlaceYValue +
                     SK_ARRAY_COUNT(gStartingIterlaceYValue) == fStartYPtr) {
                 // we done
-                SkDEBUGCODE(fStartYPtr = NULL;)
-                SkDEBUGCODE(fDeltaYPtr = NULL;)
+                SkDEBUGCODE(fStartYPtr = nullptr;)
+                SkDEBUGCODE(fDeltaYPtr = nullptr;)
                 y = 0;
             } else {
                 y = *fStartYPtr++;
@@ -114,21 +114,21 @@ void CheckFreeExtension(SavedImage* Image) {
     }
 }
 
-// return NULL on failure
+// return nullptr on failure
 static const ColorMapObject* find_colormap(const GifFileType* gif) {
     const ColorMapObject* cmap = gif->Image.ColorMap;
-    if (NULL == cmap) {
+    if (nullptr == cmap) {
         cmap = gif->SColorMap;
     }
 
-    if (NULL == cmap) {
+    if (nullptr == cmap) {
         // no colormap found
-        return NULL;
+        return nullptr;
     }
     // some sanity checks
     if (cmap && ((unsigned)cmap->ColorCount > 256 ||
                  cmap->ColorCount != (1 << cmap->BitsPerPixel))) {
-        cmap = NULL;
+        cmap = nullptr;
     }
     return cmap;
 }
@@ -152,14 +152,15 @@ static int find_transpIndex(const SavedImage& image, int colorCount) {
     return transpIndex;
 }
 
-static bool error_return(const SkBitmap& bm, const char msg[]) {
+static SkImageDecoder::Result error_return(const SkBitmap& bm, const char msg[]) {
     if (!c_suppressGIFImageDecoderWarnings) {
         SkDebugf("libgif error [%s] bitmap [%d %d] pixels %p colortable %p\n",
                  msg, bm.width(), bm.height(), bm.getPixels(),
                  bm.getColorTable());
     }
-    return false;
+    return SkImageDecoder::kFailure;
 }
+
 static void gif_warning(const SkBitmap& bm, const char msg[]) {
     if (!c_suppressGIFImageDecoderWarnings) {
         SkDebugf("libgif warning [%s] bitmap [%d %d] pixels %p colortable %p\n",
@@ -194,9 +195,9 @@ static bool skip_src_rows(GifFileType* gif, uint8_t* dst, int width, int rowsToS
 static void sanitize_indexed_bitmap(SkBitmap* bm) {
     if ((kIndex_8_SkColorType == bm->colorType()) && !(bm->empty())) {
         SkAutoLockPixels alp(*bm);
-        if (NULL != bm->getPixels()) {
+        if (bm->getPixels()) {
             SkColorTable* ct = bm->getColorTable();  // Index8 must have it.
-            SkASSERT(ct != NULL);
+            SkASSERT(ct != nullptr);
             uint32_t count = ct->count();
             SkASSERT(count > 0);
             SkASSERT(count <= 0x100);
@@ -228,20 +229,31 @@ static void sanitize_indexed_bitmap(SkBitmap* bm) {
     }
 }
 
-bool SkGIFImageDecoder::onDecode(SkStream* sk_stream, SkBitmap* bm, Mode mode) {
+namespace {
+// This function is a template argument, so can't be static.
+int close_gif(GifFileType* gif) {
+#if GIFLIB_MAJOR < 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR == 0)
+    return DGifCloseFile(gif);
+#else
+    return DGifCloseFile(gif, nullptr);
+#endif
+}
+}//namespace
+
+SkImageDecoder::Result SkGIFImageDecoder::onDecode(SkStream* sk_stream, SkBitmap* bm, Mode mode) {
 #if GIFLIB_MAJOR < 5
     GifFileType* gif = DGifOpen(sk_stream, DecodeCallBackProc);
 #else
-    GifFileType* gif = DGifOpen(sk_stream, DecodeCallBackProc, NULL);
+    GifFileType* gif = DGifOpen(sk_stream, DecodeCallBackProc, nullptr);
 #endif
-    if (NULL == gif) {
+    if (nullptr == gif) {
         return error_return(*bm, "DGifOpen");
     }
 
-    SkAutoTCallIProc<GifFileType, DGifCloseFile> acp(gif);
+    SkAutoTCallIProc<GifFileType, close_gif> acp(gif);
 
     SavedImage temp_save;
-    temp_save.ExtensionBlocks=NULL;
+    temp_save.ExtensionBlocks=nullptr;
     temp_save.ExtensionBlockCount=0;
     SkAutoTCallVProc<SavedImage, CheckFreeExtension> acp2(&temp_save);
 
@@ -309,20 +321,13 @@ bool SkGIFImageDecoder::onDecode(SkStream* sk_stream, SkBitmap* bm, Mode mode) {
                 imageTop = 0;
             }
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER
-            // FIXME: We could give the caller a choice of images or configs.
-            if (!this->chooseFromOneChoice(kIndex_8_SkColorType, width, height)) {
-                return error_return(*bm, "chooseFromOneChoice");
-            }
-#endif
-
             SkScaledBitmapSampler sampler(width, height, this->getSampleSize());
 
             bm->setInfo(SkImageInfo::Make(sampler.scaledWidth(), sampler.scaledHeight(),
                                           kIndex_8_SkColorType, kPremul_SkAlphaType));
 
             if (SkImageDecoder::kDecodeBounds_Mode == mode) {
-                return true;
+                return kSuccess;
             }
 
 
@@ -332,8 +337,7 @@ bool SkGIFImageDecoder::onDecode(SkStream* sk_stream, SkBitmap* bm, Mode mode) {
                 // Declare colorPtr here for scope.
                 SkPMColor colorPtr[256]; // storage for worst-case
                 const ColorMapObject* cmap = find_colormap(gif);
-                SkAlphaType alphaType = kOpaque_SkAlphaType;
-                if (cmap != NULL) {
+                if (cmap != nullptr) {
                     SkASSERT(cmap->ColorCount == (1 << (cmap->BitsPerPixel)));
                     colorCount = cmap->ColorCount;
                     if (colorCount > 256) {
@@ -346,7 +350,7 @@ bool SkGIFImageDecoder::onDecode(SkStream* sk_stream, SkBitmap* bm, Mode mode) {
                                                        cmap->Colors[index].Blue);
                     }
                 } else {
-                    // find_colormap() returned NULL.  Some (rare, broken)
+                    // find_colormap() returned nullptr.  Some (rare, broken)
                     // GIFs don't have a color table, so we force one.
                     gif_warning(*bm, "missing colormap");
                     colorCount = 256;
@@ -355,16 +359,13 @@ bool SkGIFImageDecoder::onDecode(SkStream* sk_stream, SkBitmap* bm, Mode mode) {
                 transpIndex = find_transpIndex(temp_save, colorCount);
                 if (transpIndex >= 0) {
                     colorPtr[transpIndex] = SK_ColorTRANSPARENT; // ram in a transparent SkPMColor
-                    alphaType = kPremul_SkAlphaType;
                     fillIndex = transpIndex;
                 } else if (fillIndex >= colorCount) {
                     // gif->SBackGroundColor should be less than colorCount.
                     fillIndex = 0;  // If not, fix it.
                 }
 
-                SkAutoTUnref<SkColorTable> ctable(SkNEW_ARGS(SkColorTable,
-                                                  (colorPtr, colorCount,
-                                                   alphaType)));
+                SkAutoTUnref<SkColorTable> ctable(new SkColorTable(colorPtr, colorCount));
                 if (!this->allocPixelRef(bm, ctable)) {
                     return error_return(*bm, "allocPixelRef");
                 }
@@ -427,7 +428,7 @@ bool SkGIFImageDecoder::onDecode(SkStream* sk_stream, SkBitmap* bm, Mode mode) {
                             sampler.sampleInterlaced(scanline, iter.currY());
                             iter.next();
                         }
-                        return true;
+                        return kPartialSuccess;
                     }
                     sampler.sampleInterlaced(scanline, iter.currY());
                     iter.next();
@@ -443,7 +444,7 @@ bool SkGIFImageDecoder::onDecode(SkStream* sk_stream, SkBitmap* bm, Mode mode) {
                         for (; y < outHeight; y++) {
                             sampler.next(scanline);
                         }
-                        return true;
+                        return kPartialSuccess;
                     }
                     // scanline now contains the raw data. Sample it.
                     sampler.next(scanline);
@@ -457,7 +458,7 @@ bool SkGIFImageDecoder::onDecode(SkStream* sk_stream, SkBitmap* bm, Mode mode) {
                 skip_src_rows(gif, scanline, innerWidth, innerHeight - read);
             }
             sanitize_indexed_bitmap(bm);
-            return true;
+            return kSuccess;
             } break;
 
         case EXTENSION_RECORD_TYPE:
@@ -470,14 +471,14 @@ bool SkGIFImageDecoder::onDecode(SkStream* sk_stream, SkBitmap* bm, Mode mode) {
                 return error_return(*bm, "DGifGetExtension");
             }
 
-            while (extData != NULL) {
+            while (extData != nullptr) {
                 /* Create an extension block with our data */
 #if GIFLIB_MAJOR < 5
                 if (AddExtensionBlock(&temp_save, extData[0],
                                       &extData[1]) == GIF_ERROR) {
 #else
-                if (GifAddExtensionBlock(&gif->ExtensionBlockCount,
-                                         &gif->ExtensionBlocks,
+                if (GifAddExtensionBlock(&temp_save.ExtensionBlockCount,
+                                         &temp_save.ExtensionBlocks,
                                          extFunction,
                                          extData[0],
                                          &extData[1]) == GIF_ERROR) {
@@ -502,7 +503,7 @@ bool SkGIFImageDecoder::onDecode(SkStream* sk_stream, SkBitmap* bm, Mode mode) {
     } while (recType != TERMINATE_RECORD_TYPE);
 
     sanitize_indexed_bitmap(bm);
-    return true;
+    return kSuccess;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -523,9 +524,9 @@ static bool is_gif(SkStreamRewindable* stream) {
 
 static SkImageDecoder* sk_libgif_dfactory(SkStreamRewindable* stream) {
     if (is_gif(stream)) {
-        return SkNEW(SkGIFImageDecoder);
+        return new SkGIFImageDecoder;
     }
-    return NULL;
+    return nullptr;
 }
 
 static SkImageDecoder_DecodeReg gReg(sk_libgif_dfactory);
diff --git a/gfx/skia/skia/src/images/SkImageDecoder_libico.cpp b/gfx/skia/skia/src/images/SkImageDecoder_libico.cpp
index 90058d679af3..e8b4bc5c316c 100644
--- a/gfx/skia/skia/src/images/SkImageDecoder_libico.cpp
+++ b/gfx/skia/skia/src/images/SkImageDecoder_libico.cpp
@@ -15,12 +15,12 @@ class SkICOImageDecoder : public SkImageDecoder {
 public:
     SkICOImageDecoder();
 
-    virtual Format getFormat() const SK_OVERRIDE {
+    Format getFormat() const override {
         return kICO_Format;
     }
 
 protected:
-    virtual bool onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE;
+    Result onDecode(SkStream* stream, SkBitmap* bm, Mode) override;
 
 private:
     typedef SkImageDecoder INHERITED;
@@ -72,12 +72,13 @@ static int calculateRowBytesFor8888(int w, int bitCount)
     return 0;
 }
 
-bool SkICOImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode)
+SkImageDecoder::Result SkICOImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode)
 {
     SkAutoMalloc autoMal;
     const size_t length = SkCopyStreamToStorage(&autoMal, stream);
-    if (0 == length) {
-        return false;
+    // Check that the buffer is large enough to read the directory header
+    if (length < 6) {
+        return kFailure;
     }
 
     unsigned char* buf = (unsigned char*)autoMal.get();
@@ -86,87 +87,60 @@ bool SkICOImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode)
     //incorrect values, but still decode properly?
     int reserved = read2Bytes(buf, 0);    // 0
     int type = read2Bytes(buf, 2);        // 1
-    if (reserved != 0 || type != 1)
-        return false;
-    int count = read2Bytes(buf, 4);
-
-    //need to at least have enough space to hold the initial table of info
-    if (length < (size_t)(6 + count*16))
-        return false;
-
-#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER
-    int choice;
-    Chooser* chooser = this->getChooser();
-    //FIXME:if no chooser, consider providing the largest color image
-    //what are the odds that the largest image would be monochrome?
-    if (NULL == chooser) {
-        choice = 0;
-    } else {
-        chooser->begin(count);
-        for (int i = 0; i < count; i++)
-        {
-            //need to find out the config, width, and height from the stream
-            int width = readByte(buf, 6 + i*16);
-            int height = readByte(buf, 7 + i*16);
-            int offset = read4Bytes(buf, 18 + i*16);
-            int bitCount = read2Bytes(buf, offset+14);
-            SkBitmap::Config c;
-            //currently only provide ARGB_8888_, but maybe we want kIndex8_Config for 1 and 4, and possibly 8?
-            //or maybe we'll determine this based on the provided config
-            switch (bitCount)
-            {
-                case 1:
-                case 4:
-                    // In reality, at least for the moment, these will be decoded into kARGB_8888 bitmaps.
-                    // However, this will be used to distinguish between the lower quality 1bpp and 4 bpp
-                    // images and the higher quality images.
-                    c = SkBitmap::kIndex8_Config;
-                    break;
-                case 8:
-                case 24:
-                case 32:
-                    c = SkBitmap::kARGB_8888_Config;
-                    break;
-                default:
-                    SkDEBUGF(("Image with %ibpp not supported\n", bitCount));
-                    continue;
-            }
-            chooser->inspect(i, c, width, height);
-        }
-        choice = chooser->choose();
+    if (reserved != 0 || type != 1) {
+        return kFailure;
     }
 
-    //you never know what the chooser is going to supply
-    if (choice >= count || choice < 0)
-        return false;
-#else
-    const int choice = 0;   // TODO: fold this value into the expressions below
-#endif
+    int count = read2Bytes(buf, 4);
+    // Check that there are directory entries
+    if (count < 1) {
+        return kFailure;
+    }
+
+    // Check that buffer is large enough to read directory entries.
+    // We are guaranteed that count is at least 1.  We might as well assume
+    // count is 1 because this deprecated decoder only looks at the first
+    // directory entry.
+    if (length < (size_t)(6 + count*16)) {
+        return kFailure;
+    }
 
     //skip ahead to the correct header
     //commented out lines are not used, but if i switch to other read method, need to know how many to skip
     //otherwise, they could be used for error checking
-    int w = readByte(buf, 6 + choice*16);
-    int h = readByte(buf, 7 + choice*16);
-    int colorCount = readByte(buf, 8 + choice*16);
+    int w = readByte(buf, 6);
+    int h = readByte(buf, 7);
+    SkASSERT(w >= 0 && h >= 0);
+    int colorCount = readByte(buf, 8);
     //int reservedToo = readByte(buf, 9 + choice*16);   //0
     //int planes = read2Bytes(buf, 10 + choice*16);       //1 - but often 0
     //int fakeBitCount = read2Bytes(buf, 12 + choice*16); //should be real - usually 0
-    const size_t size = read4Bytes(buf, 14 + choice*16);           //matters?
-    const size_t offset = read4Bytes(buf, 18 + choice*16);
-    if ((offset + size) > length) {
-        return false;
+    const size_t size = read4Bytes(buf, 14);           //matters?
+    const size_t offset = read4Bytes(buf, 18);
+    // promote the sum to 64-bits to avoid overflow
+    // Check that buffer is large enough to read image data
+    if (offset > length || size > length || ((uint64_t)offset + size) > length) {
+        return kFailure;
     }
 
     // Check to see if this is a PNG image inside the ICO
     {
         SkMemoryStream subStream(buf + offset, size, false);
         SkAutoTDelete<SkImageDecoder> otherDecoder(SkImageDecoder::Factory(&subStream));
-        if (otherDecoder.get() != NULL) {
+        if (otherDecoder.get() != nullptr) {
+            // Disallow nesting ICO files within one another
+            // FIXME: Can ICO files contain other formats besides PNG?
+            if (otherDecoder->getFormat() == SkImageDecoder::kICO_Format) {
+                return kFailure;
+            }
             // Set fields on the other decoder to be the same as this one.
             this->copyFieldsToOther(otherDecoder.get());
-            if(otherDecoder->decode(&subStream, bm, this->getDefaultPref(), mode)) {
-                return true;
+            const Result result = otherDecoder->decode(&subStream, bm, this->getDefaultPref(),
+                                                       mode);
+            // FIXME: Should we just return result here? Is it possible that data that looked like
+            // a subimage was not, but was actually a valid ICO?
+            if (result != kFailure) {
+                return result;
             }
         }
     }
@@ -175,11 +149,25 @@ bool SkICOImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode)
     //int width = read4Bytes(buf, offset+4);              //should == w
     //int height = read4Bytes(buf, offset+8);             //should == 2*h
     //int planesToo = read2Bytes(buf, offset+12);         //should == 1 (does it?)
+    
+    // For ico images, only a byte is used to store each dimension
+    // 0 is used to represent 256
+    if (w == 0) {
+        w = 256;
+    }
+    if (h == 0) {
+        h = 256;
+    }
+
+    // Check that buffer is large enough to read the bit depth
+    if (length < offset + 16) {
+        return kFailure;
+    }
     int bitCount = read2Bytes(buf, offset+14);
 
     void (*placePixel)(const int pixelNo, const unsigned char* buf,
         const int xorOffset, int& x, int y, const int w,
-        SkBitmap* bm, int alphaByte, int m, int shift, SkPMColor* colors) = NULL;
+        SkBitmap* bm, int alphaByte, int m, int shift, SkPMColor* colors) = nullptr;
     switch (bitCount)
     {
         case 1:
@@ -204,7 +192,7 @@ bool SkICOImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode)
             break;
         default:
             SkDEBUGF(("Decoding %ibpp is unimplemented\n", bitCount));
-            return false;
+            return kFailure;
     }
 
     //these should all be zero, but perhaps are not - need to check
@@ -215,10 +203,16 @@ bool SkICOImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode)
     //int colorsUsed = read4Bytes(buf, offset+32)         //0 - might have an actual value though
     //int colorsImportant = read4Bytes(buf, offset+36);   //0
 
-    int begin = offset + 40;
+    int begin = SkToInt(offset + 40);
+    // Check that the buffer is large enough to read the color table
+    // For bmp-in-icos, there should be 4 bytes per color
+    if (length < (size_t) (begin + 4*colorCount)) {
+        return kFailure;
+    }
+
     //this array represents the colortable
     //if i allow other types of bitmaps, it may actually be used as a part of the bitmap
-    SkPMColor* colors = NULL;
+    SkPMColor* colors = nullptr;
     int blue, green, red;
     if (colorCount)
     {
@@ -255,15 +249,54 @@ bool SkICOImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode)
 
     if (SkImageDecoder::kDecodeBounds_Mode == mode) {
         delete[] colors;
-        return true;
+        return kSuccess;
     }
 
-    if (!this->allocPixelRef(bm, NULL))
+    if (!this->allocPixelRef(bm, nullptr))
     {
         delete[] colors;
-        return false;
+        return kFailure;
     }
 
+    // The AND mask is a 1-bit alpha mask for each pixel that comes after the
+    // XOR mask in the bmp.  If we check that the largest AND offset is safe,
+    // it should mean all other buffer accesses will be at smaller indices and
+    // will therefore be safe.
+    size_t maxAndOffset = andOffset + ((andLineWidth*(h-1)+(w-1)) >> 3);
+    if (length <= maxAndOffset) {
+        return kFailure;
+    }
+
+    // Here we assert that all reads from the buffer using the XOR offset are
+    // less than the AND offset.  This should be guaranteed based on the above
+    // calculations.
+#ifdef SK_DEBUG
+    int maxPixelNum = lineWidth*(h-1)+w-1;
+    int maxByte;
+    switch (bitCount) {
+        case 1:
+            maxByte = maxPixelNum >> 3;
+            break;
+        case 4:
+            maxByte = maxPixelNum >> 1;
+            break;
+        case 8:
+            maxByte = maxPixelNum;
+            break;
+        case 24:
+            maxByte = maxPixelNum * 3 + 2;
+            break;
+        case 32:
+            maxByte = maxPixelNum * 4 + 3;
+            break;
+        default:
+            SkASSERT(false);
+            return kFailure;
+    }
+    int maxXOROffset = xorOffset + maxByte;
+    SkASSERT(maxXOROffset < andOffset);
+#endif
+
     SkAutoLockPixels alp(*bm);
 
     for (int y = 0; y < h; y++)
@@ -291,7 +324,7 @@ bool SkICOImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode)
     //ensure we haven't read off the end?
     //of course this doesn't help us if the andOffset was a lie...
     //return andOffset + (andLineWidth >> 3) <= length;
-    return true;
+    return kSuccess;
 }   //onDecode
 
 //function to place the pixel, determined by the bitCount
@@ -391,23 +424,20 @@ DEFINE_DECODER_CREATOR(ICOImageDecoder);
 static bool is_ico(SkStreamRewindable* stream) {
     // Check to see if the first four bytes are 0,0,1,0
     // FIXME: Is that required and sufficient?
-    SkAutoMalloc autoMal(4);
-    unsigned char* buf = (unsigned char*)autoMal.get();
-    stream->read((void*)buf, 4);
-    int reserved = read2Bytes(buf, 0);
-    int type = read2Bytes(buf, 2);
-    if (reserved != 0 || type != 1) {
-        // This stream does not represent an ICO image.
+    char buf[4];
+    if (stream->read((void*)buf, 4) != 4) {
         return false;
     }
-    return true;
+    int reserved = read2Bytes(buf, 0);
+    int type = read2Bytes(buf, 2);
+    return 0 == reserved && 1 == type;
 }
 
 static SkImageDecoder* sk_libico_dfactory(SkStreamRewindable* stream) {
     if (is_ico(stream)) {
-        return SkNEW(SkICOImageDecoder);
+        return new SkICOImageDecoder;
     }
-    return NULL;
+    return nullptr;
 }
 
 static SkImageDecoder_DecodeReg gReg(sk_libico_dfactory);
diff --git a/gfx/skia/skia/src/images/SkImageDecoder_libjpeg.cpp b/gfx/skia/skia/src/images/SkImageDecoder_libjpeg.cpp
index 9b937162b3e1..58eff75dc94a 100644
--- a/gfx/skia/skia/src/images/SkImageDecoder_libjpeg.cpp
+++ b/gfx/skia/skia/src/images/SkImageDecoder_libjpeg.cpp
@@ -57,22 +57,6 @@ SK_CONF_DECLARE(bool, c_suppressJPEGImageDecoderErrors,
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
 
-static void overwrite_mem_buffer_size(jpeg_decompress_struct* cinfo) {
-#ifdef SK_BUILD_FOR_ANDROID
-    /* Check if the device indicates that it has a large amount of system memory
-     * if so, increase the memory allocation to 30MB instead of the default 5MB.
-     */
-#ifdef ANDROID_LARGE_MEMORY_DEVICE
-    cinfo->mem->max_memory_to_use = 30 * 1024 * 1024;
-#else
-    cinfo->mem->max_memory_to_use = 5 * 1024 * 1024;
-#endif
-#endif // SK_BUILD_FOR_ANDROID
-}
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-
 static void do_nothing_emit_message(jpeg_common_struct*, int) {
     /* do nothing */
 }
@@ -81,10 +65,9 @@ static void do_nothing_output_message(j_common_ptr) {
 }
 
 static void initialize_info(jpeg_decompress_struct* cinfo, skjpeg_source_mgr* src_mgr) {
-    SkASSERT(cinfo != NULL);
-    SkASSERT(src_mgr != NULL);
+    SkASSERT(cinfo != nullptr);
+    SkASSERT(src_mgr != nullptr);
     jpeg_create_decompress(cinfo);
-    overwrite_mem_buffer_size(cinfo);
     cinfo->src = src_mgr;
     /* To suppress warnings with a SK_DEBUG binary, set the
      * environment variable "skia_images_jpeg_suppressDecoderWarnings"
@@ -102,150 +85,20 @@ static void initialize_info(jpeg_decompress_struct* cinfo, skjpeg_source_mgr* sr
     }
 }
 
-#ifdef SK_BUILD_FOR_ANDROID
-class SkJPEGImageIndex {
-public:
-    SkJPEGImageIndex(SkStreamRewindable* stream, SkImageDecoder* decoder)
-        : fSrcMgr(stream, decoder)
-        , fInfoInitialized(false)
-        , fHuffmanCreated(false)
-        , fDecompressStarted(false)
-        {
-            SkDEBUGCODE(fReadHeaderSucceeded = false;)
-        }
-
-    ~SkJPEGImageIndex() {
-        if (fHuffmanCreated) {
-            // Set to false before calling the libjpeg function, in case
-            // the libjpeg function calls longjmp. Our setjmp handler may
-            // attempt to delete this SkJPEGImageIndex, thus entering this
-            // destructor again. Setting fHuffmanCreated to false first
-            // prevents an infinite loop.
-            fHuffmanCreated = false;
-            jpeg_destroy_huffman_index(&fHuffmanIndex);
-        }
-        if (fDecompressStarted) {
-            // Like fHuffmanCreated, set to false before calling libjpeg
-            // function to prevent potential infinite loop.
-            fDecompressStarted = false;
-            jpeg_finish_decompress(&fCInfo);
-        }
-        if (fInfoInitialized) {
-            this->destroyInfo();
-        }
-    }
-
-    /**
-     *  Destroy the cinfo struct.
-     *  After this call, if a huffman index was already built, it
-     *  can be used after calling initializeInfoAndReadHeader
-     *  again. Must not be called after startTileDecompress except
-     *  in the destructor.
-     */
-    void destroyInfo() {
-        SkASSERT(fInfoInitialized);
-        SkASSERT(!fDecompressStarted);
-        // Like fHuffmanCreated, set to false before calling libjpeg
-        // function to prevent potential infinite loop.
-        fInfoInitialized = false;
-        jpeg_destroy_decompress(&fCInfo);
-        SkDEBUGCODE(fReadHeaderSucceeded = false;)
-    }
-
-    /**
-     *  Initialize the cinfo struct.
-     *  Calls jpeg_create_decompress, makes customizations, and
-     *  finally calls jpeg_read_header. Returns true if jpeg_read_header
-     *  returns JPEG_HEADER_OK.
-     *  If cinfo was already initialized, destroyInfo must be called to
-     *  destroy the old one. Must not be called after startTileDecompress.
-     */
-    bool initializeInfoAndReadHeader() {
-        SkASSERT(!fInfoInitialized && !fDecompressStarted);
-        initialize_info(&fCInfo, &fSrcMgr);
-        fInfoInitialized = true;
-        const bool success = (JPEG_HEADER_OK == jpeg_read_header(&fCInfo, true));
-        SkDEBUGCODE(fReadHeaderSucceeded = success;)
-        return success;
-    }
-
-    jpeg_decompress_struct* cinfo() { return &fCInfo; }
-
-    huffman_index* huffmanIndex() { return &fHuffmanIndex; }
-
-    /**
-     *  Build the index to be used for tile based decoding.
-     *  Must only be called after a successful call to
-     *  initializeInfoAndReadHeader and must not be called more
-     *  than once.
-     */
-    bool buildHuffmanIndex() {
-        SkASSERT(fReadHeaderSucceeded);
-        SkASSERT(!fHuffmanCreated);
-        jpeg_create_huffman_index(&fCInfo, &fHuffmanIndex);
-        SkASSERT(1 == fCInfo.scale_num && 1 == fCInfo.scale_denom);
-        fHuffmanCreated = jpeg_build_huffman_index(&fCInfo, &fHuffmanIndex);
-        return fHuffmanCreated;
-    }
-
-    /**
-     *  Start tile based decoding. Must only be called after a
-     *  successful call to buildHuffmanIndex, and must only be
-     *  called once.
-     */
-    bool startTileDecompress() {
-        SkASSERT(fHuffmanCreated);
-        SkASSERT(fReadHeaderSucceeded);
-        SkASSERT(!fDecompressStarted);
-        if (jpeg_start_tile_decompress(&fCInfo)) {
-            fDecompressStarted = true;
-            return true;
-        }
-        return false;
-    }
-
-private:
-    skjpeg_source_mgr  fSrcMgr;
-    jpeg_decompress_struct fCInfo;
-    huffman_index fHuffmanIndex;
-    bool fInfoInitialized;
-    bool fHuffmanCreated;
-    bool fDecompressStarted;
-    SkDEBUGCODE(bool fReadHeaderSucceeded;)
-};
-#endif
-
 class SkJPEGImageDecoder : public SkImageDecoder {
 public:
-#ifdef SK_BUILD_FOR_ANDROID
-    SkJPEGImageDecoder() {
-        fImageIndex = NULL;
-        fImageWidth = 0;
-        fImageHeight = 0;
-    }
 
-    virtual ~SkJPEGImageDecoder() {
-        SkDELETE(fImageIndex);
-    }
-#endif
-
-    virtual Format getFormat() const {
+    Format getFormat() const override {
         return kJPEG_Format;
     }
 
 protected:
-#ifdef SK_BUILD_FOR_ANDROID
-    virtual bool onBuildTileIndex(SkStreamRewindable *stream, int *width, int *height) SK_OVERRIDE;
-    virtual bool onDecodeSubset(SkBitmap* bitmap, const SkIRect& rect) SK_OVERRIDE;
-#endif
-    virtual bool onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE;
+    Result onDecode(SkStream* stream, SkBitmap* bm, Mode) override;
+    bool onDecodeYUV8Planes(SkStream* stream, SkISize componentSizes[3],
+                            void* planes[3], size_t rowBytes[3],
+                            SkYUVColorSpace* colorSpace) override;
 
 private:
-#ifdef SK_BUILD_FOR_ANDROID
-    SkJPEGImageIndex* fImageIndex;
-    int fImageWidth;
-    int fImageHeight;
-#endif
 
     /**
      *  Determine the appropriate bitmap colortype and out_color_space based on
@@ -263,7 +116,7 @@ private:
 /* Automatically clean up after throwing an exception */
 class JPEGAutoClean {
 public:
-    JPEGAutoClean(): cinfo_ptr(NULL) {}
+    JPEGAutoClean(): cinfo_ptr(nullptr) {}
     ~JPEGAutoClean() {
         if (cinfo_ptr) {
             jpeg_destroy_decompress(cinfo_ptr);
@@ -308,33 +161,34 @@ static bool skip_src_rows(jpeg_decompress_struct* cinfo, void* buffer, int count
     return true;
 }
 
-#ifdef SK_BUILD_FOR_ANDROID
-static bool skip_src_rows_tile(jpeg_decompress_struct* cinfo,
-                               huffman_index *index, void* buffer, int count) {
-    for (int i = 0; i < count; i++) {
-        JSAMPLE* rowptr = (JSAMPLE*)buffer;
-        int row_count = jpeg_read_tile_scanline(cinfo, index, &rowptr);
-        if (1 != row_count) {
-            return false;
-        }
-    }
-    return true;
-}
-#endif
+///////////////////////////////////////////////////////////////////////////////
 
 // This guy exists just to aid in debugging, as it allows debuggers to just
 // set a break-point in one place to see all error exists.
-static bool return_false(const jpeg_decompress_struct& cinfo,
-                         const SkBitmap& bm, const char caller[]) {
+static void print_jpeg_decoder_errors(const jpeg_decompress_struct& cinfo,
+                         int width, int height, const char caller[]) {
     if (!(c_suppressJPEGImageDecoderErrors)) {
         char buffer[JMSG_LENGTH_MAX];
         cinfo.err->format_message((const j_common_ptr)&cinfo, buffer);
         SkDebugf("libjpeg error %d <%s> from %s [%d %d]\n",
-                 cinfo.err->msg_code, buffer, caller, bm.width(), bm.height());
+                 cinfo.err->msg_code, buffer, caller, width, height);
     }
-    return false;   // must always return false
 }
 
+static bool return_false(const jpeg_decompress_struct& cinfo,
+                         const char caller[]) {
+    print_jpeg_decoder_errors(cinfo, 0, 0, caller);
+    return false;
+}
+
+static SkImageDecoder::Result return_failure(const jpeg_decompress_struct& cinfo,
+                                             const SkBitmap& bm, const char caller[]) {
+    print_jpeg_decoder_errors(cinfo, bm.width(), bm.height(), caller);
+    return SkImageDecoder::kFailure;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
 // Convert a scanline of CMYK samples to RGBX in place. Note that this
 // method moves the "scanline" pointer in its processing
 static void convert_CMYK_to_RGB(uint8_t* scanline, unsigned int width) {
@@ -362,46 +216,22 @@ static void convert_CMYK_to_RGB(uint8_t* scanline, unsigned int width) {
  *  Common code for setting the error manager.
  */
 static void set_error_mgr(jpeg_decompress_struct* cinfo, skjpeg_error_mgr* errorManager) {
-    SkASSERT(cinfo != NULL);
-    SkASSERT(errorManager != NULL);
+    SkASSERT(cinfo != nullptr);
+    SkASSERT(errorManager != nullptr);
     cinfo->err = jpeg_std_error(errorManager);
     errorManager->error_exit = skjpeg_error_exit;
 }
 
-/**
- *  Common code for turning off upsampling and smoothing. Turning these
- *  off helps performance without showing noticable differences in the
- *  resulting bitmap.
- */
-static void turn_off_visual_optimizations(jpeg_decompress_struct* cinfo) {
-    SkASSERT(cinfo != NULL);
-    /* this gives about 30% performance improvement. In theory it may
-       reduce the visual quality, in practice I'm not seeing a difference
-     */
-    cinfo->do_fancy_upsampling = 0;
-
-    /* this gives another few percents */
-    cinfo->do_block_smoothing = 0;
-}
-
 /**
  * Common code for setting the dct method.
  */
 static void set_dct_method(const SkImageDecoder& decoder, jpeg_decompress_struct* cinfo) {
-    SkASSERT(cinfo != NULL);
-#ifdef DCT_IFAST_SUPPORTED
-    if (decoder.getPreferQualityOverSpeed()) {
-        cinfo->dct_method = JDCT_ISLOW;
-    } else {
-        cinfo->dct_method = JDCT_IFAST;
-    }
-#else
+    SkASSERT(cinfo != nullptr);
     cinfo->dct_method = JDCT_ISLOW;
-#endif
 }
 
 SkColorType SkJPEGImageDecoder::getBitmapColorType(jpeg_decompress_struct* cinfo) {
-    SkASSERT(cinfo != NULL);
+    SkASSERT(cinfo != nullptr);
 
     SrcDepth srcDepth = k32Bit_SrcDepth;
     if (JCS_GRAYSCALE == cinfo->jpeg_color_space) {
@@ -461,7 +291,7 @@ SkColorType SkJPEGImageDecoder::getBitmapColorType(jpeg_decompress_struct* cinfo
 static void adjust_out_color_space_and_dither(jpeg_decompress_struct* cinfo,
                                               SkColorType colorType,
                                               const SkImageDecoder& decoder) {
-    SkASSERT(cinfo != NULL);
+    SkASSERT(cinfo != nullptr);
 #ifdef ANDROID_RGB
     cinfo->dither_mode = JDITHER_NONE;
     if (JCS_CMYK == cinfo->out_color_space) {
@@ -483,7 +313,6 @@ static void adjust_out_color_space_and_dither(jpeg_decompress_struct* cinfo,
 #endif
 }
 
-
 /**
    Sets all pixels in given bitmap to SK_ColorWHITE for all rows >= y.
    Used when decoding fails partway through reading scanlines to fill
@@ -502,7 +331,7 @@ static void fill_below_level(int y, SkBitmap* bitmap) {
 static bool get_src_config(const jpeg_decompress_struct& cinfo,
                            SkScaledBitmapSampler::SrcConfig* sc,
                            int* srcBytesPerPixel) {
-    SkASSERT(sc != NULL && srcBytesPerPixel != NULL);
+    SkASSERT(sc != nullptr && srcBytesPerPixel != nullptr);
     if (JCS_CMYK == cinfo.out_color_space) {
         // In this case we will manually convert the CMYK values to RGB
         *sc = SkScaledBitmapSampler::kRGBX;
@@ -529,7 +358,7 @@ static bool get_src_config(const jpeg_decompress_struct& cinfo,
     return true;
 }
 
-bool SkJPEGImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
+SkImageDecoder::Result SkJPEGImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
 #ifdef TIME_DECODE
     SkAutoTime atm("JPEG Decode");
 #endif
@@ -545,7 +374,7 @@ bool SkJPEGImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
     // All objects need to be instantiated before this setjmp call so that
     // they will be cleaned up properly if an error occurs.
     if (setjmp(errorManager.fJmpBuf)) {
-        return return_false(cinfo, *bm, "setjmp");
+        return return_failure(cinfo, *bm, "setjmp");
     }
 
     initialize_info(&cinfo, &srcManager);
@@ -553,7 +382,7 @@ bool SkJPEGImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
 
     int status = jpeg_read_header(&cinfo, true);
     if (status != JPEG_HEADER_OK) {
-        return return_false(cinfo, *bm, "read_header");
+        return return_failure(cinfo, *bm, "read_header");
     }
 
     /*  Try to fulfill the requested sampleSize. Since jpeg can do it (when it
@@ -567,8 +396,6 @@ bool SkJPEGImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
     SkASSERT(1 == cinfo.scale_num);
     cinfo.scale_denom = sampleSize;
 
-    turn_off_visual_optimizations(&cinfo);
-
     const SkColorType colorType = this->getBitmapColorType(&cinfo);
     const SkAlphaType alphaType = kAlpha_8_SkColorType == colorType ?
                                       kPremul_SkAlphaType : kOpaque_SkAlphaType;
@@ -580,8 +407,9 @@ bool SkJPEGImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
         // individual pixel. It is very unlikely to be opaque, since
         // an opaque A8 bitmap would not be very interesting.
         // Otherwise, a jpeg image is opaque.
-        return bm->setInfo(SkImageInfo::Make(cinfo.image_width, cinfo.image_height,
-                                             colorType, alphaType));
+        bool success = bm->setInfo(SkImageInfo::Make(cinfo.image_width, cinfo.image_height,
+                                                     colorType, alphaType));
+        return success ? kSuccess : kFailure;
     }
 
     /*  image_width and image_height are the original dimensions, available
@@ -605,21 +433,15 @@ bool SkJPEGImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
             // individual pixel. It is very unlikely to be opaque, since
             // an opaque A8 bitmap would not be very interesting.
             // Otherwise, a jpeg image is opaque.
-            return bm->setInfo(SkImageInfo::Make(smpl.scaledWidth(), smpl.scaledHeight(),
-                                                 colorType, alphaType));
+            bool success = bm->setInfo(SkImageInfo::Make(smpl.scaledWidth(), smpl.scaledHeight(),
+                                                         colorType, alphaType));
+            return success ? kSuccess : kFailure;
         } else {
-            return return_false(cinfo, *bm, "start_decompress");
+            return return_failure(cinfo, *bm, "start_decompress");
         }
     }
     sampleSize = recompute_sampleSize(sampleSize, cinfo);
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER
-    // should we allow the Chooser (if present) to pick a colortype for us???
-    if (!this->chooseFromOneChoice(colorType, cinfo.output_width, cinfo.output_height)) {
-        return return_false(cinfo, *bm, "chooseFromOneChoice");
-    }
-#endif
-
     SkScaledBitmapSampler sampler(cinfo.output_width, cinfo.output_height, sampleSize);
     // Assume an A8 bitmap is not opaque to avoid the check of each
     // individual pixel. It is very unlikely to be opaque, since
@@ -628,10 +450,10 @@ bool SkJPEGImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
     bm->setInfo(SkImageInfo::Make(sampler.scaledWidth(), sampler.scaledHeight(),
                                   colorType, alphaType));
     if (SkImageDecoder::kDecodeBounds_Mode == mode) {
-        return true;
+        return kSuccess;
     }
-    if (!this->allocPixelRef(bm, NULL)) {
-        return return_false(cinfo, *bm, "allocPixelRef");
+    if (!this->allocPixelRef(bm, nullptr)) {
+        return return_failure(cinfo, *bm, "allocPixelRef");
     }
 
     SkAutoLockPixels alp(*bm);
@@ -654,15 +476,16 @@ bool SkJPEGImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
                 // so return early.  We will return a partial image.
                 fill_below_level(cinfo.output_scanline, bm);
                 cinfo.output_scanline = cinfo.output_height;
-                break;  // Skip to jpeg_finish_decompress()
+                jpeg_finish_decompress(&cinfo);
+                return kPartialSuccess;
             }
             if (this->shouldCancelDecode()) {
-                return return_false(cinfo, *bm, "shouldCancelDecode");
+                return return_failure(cinfo, *bm, "shouldCancelDecode");
             }
             rowptr += bpr;
         }
         jpeg_finish_decompress(&cinfo);
-        return true;
+        return kSuccess;
     }
 #endif
 
@@ -671,11 +494,11 @@ bool SkJPEGImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
     int srcBytesPerPixel;
 
     if (!get_src_config(cinfo, &sc, &srcBytesPerPixel)) {
-        return return_false(cinfo, *bm, "jpeg colorspace");
+        return return_failure(cinfo, *bm, "jpeg colorspace");
     }
 
     if (!sampler.begin(bm, sc, *this)) {
-        return return_false(cinfo, *bm, "sampler.begin");
+        return return_failure(cinfo, *bm, "sampler.begin");
     }
 
     SkAutoMalloc srcStorage(cinfo.output_width * srcBytesPerPixel);
@@ -683,7 +506,7 @@ bool SkJPEGImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
 
     //  Possibly skip initial rows [sampler.srcY0]
     if (!skip_src_rows(&cinfo, srcRow, sampler.srcY0())) {
-        return return_false(cinfo, *bm, "skip rows");
+        return return_failure(cinfo, *bm, "skip rows");
     }
 
     // now loop through scanlines until y == bm->height() - 1
@@ -695,10 +518,11 @@ bool SkJPEGImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
             // so return early.  We will return a partial image.
             fill_below_level(y, bm);
             cinfo.output_scanline = cinfo.output_height;
-            break;  // Skip to jpeg_finish_decompress()
+            jpeg_finish_decompress(&cinfo);
+            return kPartialSuccess;
         }
         if (this->shouldCancelDecode()) {
-            return return_false(cinfo, *bm, "shouldCancelDecode");
+            return return_failure(cinfo, *bm, "shouldCancelDecode");
         }
 
         if (JCS_CMYK == cinfo.out_color_space) {
@@ -712,250 +536,222 @@ bool SkJPEGImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
         }
 
         if (!skip_src_rows(&cinfo, srcRow, sampler.srcDY() - 1)) {
-            return return_false(cinfo, *bm, "skip rows");
+            return return_failure(cinfo, *bm, "skip rows");
         }
     }
 
     // we formally skip the rest, so we don't get a complaint from libjpeg
     if (!skip_src_rows(&cinfo, srcRow,
                        cinfo.output_height - cinfo.output_scanline)) {
-        return return_false(cinfo, *bm, "skip rows");
+        return return_failure(cinfo, *bm, "skip rows");
     }
     jpeg_finish_decompress(&cinfo);
 
+    return kSuccess;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+enum SizeType {
+    kSizeForMemoryAllocation_SizeType,
+    kActualSize_SizeType
+};
+
+static SkISize compute_yuv_size(const jpeg_decompress_struct& info, int component,
+                                SizeType sizeType) {
+    if (sizeType == kSizeForMemoryAllocation_SizeType) {
+        return SkISize::Make(info.cur_comp_info[component]->width_in_blocks * DCTSIZE,
+                             info.cur_comp_info[component]->height_in_blocks * DCTSIZE);
+    }
+    return SkISize::Make(info.cur_comp_info[component]->downsampled_width,
+                         info.cur_comp_info[component]->downsampled_height);
+}
+
+static bool appears_to_be_yuv(const jpeg_decompress_struct& info) {
+    return (info.jpeg_color_space == JCS_YCbCr)
+        && (DCTSIZE == 8)
+        && (info.num_components == 3)
+        && (info.comps_in_scan >= info.num_components)
+        && (info.scale_denom <= 8)
+        && (info.cur_comp_info[0])
+        && (info.cur_comp_info[1])
+        && (info.cur_comp_info[2])
+        && (info.cur_comp_info[1]->h_samp_factor == 1)
+        && (info.cur_comp_info[1]->v_samp_factor == 1)
+        && (info.cur_comp_info[2]->h_samp_factor == 1)
+        && (info.cur_comp_info[2]->v_samp_factor == 1);
+}
+
+static void update_components_sizes(const jpeg_decompress_struct& cinfo, SkISize componentSizes[3],
+                                    SizeType sizeType) {
+    SkASSERT(appears_to_be_yuv(cinfo));
+    for (int i = 0; i < 3; ++i) {
+        componentSizes[i] = compute_yuv_size(cinfo, i, sizeType);
+    }
+}
+
+static bool output_raw_data(jpeg_decompress_struct& cinfo, void* planes[3], size_t rowBytes[3]) {
+    SkASSERT(appears_to_be_yuv(cinfo));
+    // U size and V size have to be the same if we're calling output_raw_data()
+    SkISize uvSize = compute_yuv_size(cinfo, 1, kSizeForMemoryAllocation_SizeType);
+    SkASSERT(uvSize == compute_yuv_size(cinfo, 2, kSizeForMemoryAllocation_SizeType));
+
+    JSAMPARRAY bufferraw[3];
+    JSAMPROW bufferraw2[32];
+    bufferraw[0] = &bufferraw2[0]; // Y channel rows (8 or 16)
+    bufferraw[1] = &bufferraw2[16]; // U channel rows (8)
+    bufferraw[2] = &bufferraw2[24]; // V channel rows (8)
+    int yWidth = cinfo.output_width;
+    int yHeight = cinfo.output_height;
+    int yMaxH = yHeight - 1;
+    int v = cinfo.cur_comp_info[0]->v_samp_factor;
+    int uvMaxH = uvSize.height() - 1;
+    JSAMPROW outputY = static_cast<JSAMPROW>(planes[0]);
+    JSAMPROW outputU = static_cast<JSAMPROW>(planes[1]);
+    JSAMPROW outputV = static_cast<JSAMPROW>(planes[2]);
+    size_t rowBytesY = rowBytes[0];
+    size_t rowBytesU = rowBytes[1];
+    size_t rowBytesV = rowBytes[2];
+
+    int yScanlinesToRead = DCTSIZE * v;
+    SkAutoMalloc lastRowStorage(rowBytesY * 4);
+    JSAMPROW yLastRow = (JSAMPROW)lastRowStorage.get();
+    JSAMPROW uLastRow = yLastRow + rowBytesY;
+    JSAMPROW vLastRow = uLastRow + rowBytesY;
+    JSAMPROW dummyRow = vLastRow + rowBytesY;
+
+    while (cinfo.output_scanline < cinfo.output_height) {
+        // Request 8 or 16 scanlines: returns 0 or more scanlines.
+        bool hasYLastRow(false), hasUVLastRow(false);
+        // Assign 8 or 16 rows of memory to read the Y channel.
+        for (int i = 0; i < yScanlinesToRead; ++i) {
+            int scanline = (cinfo.output_scanline + i);
+            if (scanline < yMaxH) {
+                bufferraw2[i] = &outputY[scanline * rowBytesY];
+            } else if (scanline == yMaxH) {
+                bufferraw2[i] = yLastRow;
+                hasYLastRow = true;
+            } else {
+                bufferraw2[i] = dummyRow;
+            }
+        }
+        int scaledScanline = cinfo.output_scanline / v;
+        // Assign 8 rows of memory to read the U and V channels.
+        for (int i = 0; i < 8; ++i) {
+            int scanline = (scaledScanline + i);
+            if (scanline < uvMaxH) {
+                bufferraw2[16 + i] = &outputU[scanline * rowBytesU];
+                bufferraw2[24 + i] = &outputV[scanline * rowBytesV];
+            } else if (scanline == uvMaxH) {
+                bufferraw2[16 + i] = uLastRow;
+                bufferraw2[24 + i] = vLastRow;
+                hasUVLastRow = true;
+            } else {
+                bufferraw2[16 + i] = dummyRow;
+                bufferraw2[24 + i] = dummyRow;
+            }
+        }
+        JDIMENSION scanlinesRead = jpeg_read_raw_data(&cinfo, bufferraw, yScanlinesToRead);
+
+        if (scanlinesRead == 0) {
+            return false;
+        }
+
+        if (hasYLastRow) {
+            memcpy(&outputY[yMaxH * rowBytesY], yLastRow, yWidth);
+        }
+        if (hasUVLastRow) {
+            memcpy(&outputU[uvMaxH * rowBytesU], uLastRow, uvSize.width());
+            memcpy(&outputV[uvMaxH * rowBytesV], vLastRow, uvSize.width());
+        }
+    }
+
+    cinfo.output_scanline = SkMin32(cinfo.output_scanline, cinfo.output_height);
+
     return true;
 }
 
-#ifdef SK_BUILD_FOR_ANDROID
-bool SkJPEGImageDecoder::onBuildTileIndex(SkStreamRewindable* stream, int *width, int *height) {
+bool SkJPEGImageDecoder::onDecodeYUV8Planes(SkStream* stream, SkISize componentSizes[3],
+                                            void* planes[3], size_t rowBytes[3],
+                                            SkYUVColorSpace* colorSpace) {
+#ifdef TIME_DECODE
+    SkAutoTime atm("JPEG YUV8 Decode");
+#endif
+    if (this->getSampleSize() != 1) {
+        return false; // Resizing not supported
+    }
 
-    SkAutoTDelete<SkJPEGImageIndex> imageIndex(SkNEW_ARGS(SkJPEGImageIndex, (stream, this)));
-    jpeg_decompress_struct* cinfo = imageIndex->cinfo();
+    JPEGAutoClean autoClean;
 
-    skjpeg_error_mgr sk_err;
-    set_error_mgr(cinfo, &sk_err);
+    jpeg_decompress_struct  cinfo;
+    skjpeg_source_mgr       srcManager(stream, this);
+
+    skjpeg_error_mgr errorManager;
+    set_error_mgr(&cinfo, &errorManager);
 
     // All objects need to be instantiated before this setjmp call so that
     // they will be cleaned up properly if an error occurs.
-    if (setjmp(sk_err.fJmpBuf)) {
-        return false;
-    }
-
-    // create the cinfo used to create/build the huffmanIndex
-    if (!imageIndex->initializeInfoAndReadHeader()) {
-        return false;
-    }
-
-    if (!imageIndex->buildHuffmanIndex()) {
-        return false;
-    }
-
-    // destroy the cinfo used to create/build the huffman index
-    imageIndex->destroyInfo();
-
-    // Init decoder to image decode mode
-    if (!imageIndex->initializeInfoAndReadHeader()) {
-        return false;
-    }
-
-    // FIXME: This sets cinfo->out_color_space, which we may change later
-    // based on the config in onDecodeSubset. This should be fine, since
-    // jpeg_init_read_tile_scanline will check out_color_space again after
-    // that change (when it calls jinit_color_deconverter).
-    (void) this->getBitmapColorType(cinfo);
-
-    turn_off_visual_optimizations(cinfo);
-
-    // instead of jpeg_start_decompress() we start a tiled decompress
-    if (!imageIndex->startTileDecompress()) {
-        return false;
-    }
-
-    SkASSERT(1 == cinfo->scale_num);
-    fImageWidth = cinfo->output_width;
-    fImageHeight = cinfo->output_height;
-
-    if (width) {
-        *width = fImageWidth;
-    }
-    if (height) {
-        *height = fImageHeight;
-    }
-
-    SkDELETE(fImageIndex);
-    fImageIndex = imageIndex.detach();
-
-    return true;
-}
-
-bool SkJPEGImageDecoder::onDecodeSubset(SkBitmap* bm, const SkIRect& region) {
-    if (NULL == fImageIndex) {
-        return false;
-    }
-    jpeg_decompress_struct* cinfo = fImageIndex->cinfo();
-
-    SkIRect rect = SkIRect::MakeWH(fImageWidth, fImageHeight);
-    if (!rect.intersect(region)) {
-        // If the requested region is entirely outside the image return false
-        return false;
-    }
-
-
-    skjpeg_error_mgr errorManager;
-    set_error_mgr(cinfo, &errorManager);
-
     if (setjmp(errorManager.fJmpBuf)) {
+        return return_false(cinfo, "setjmp YUV8");
+    }
+
+    initialize_info(&cinfo, &srcManager);
+    autoClean.set(&cinfo);
+
+    int status = jpeg_read_header(&cinfo, true);
+    if (status != JPEG_HEADER_OK) {
+        return return_false(cinfo, "read_header YUV8");
+    }
+
+    if (!appears_to_be_yuv(cinfo)) {
+        // It's not an error to not be encoded in YUV, so no need to use return_false()
         return false;
     }
 
-    int requestedSampleSize = this->getSampleSize();
-    cinfo->scale_denom = requestedSampleSize;
+    cinfo.out_color_space = JCS_YCbCr;
+    cinfo.raw_data_out = TRUE;
 
-    set_dct_method(*this, cinfo);
-
-    const SkColorType colorType = this->getBitmapColorType(cinfo);
-    adjust_out_color_space_and_dither(cinfo, colorType, *this);
-
-    int startX = rect.fLeft;
-    int startY = rect.fTop;
-    int width = rect.width();
-    int height = rect.height();
-
-    jpeg_init_read_tile_scanline(cinfo, fImageIndex->huffmanIndex(),
-                                 &startX, &startY, &width, &height);
-    int skiaSampleSize = recompute_sampleSize(requestedSampleSize, *cinfo);
-    int actualSampleSize = skiaSampleSize * (DCTSIZE / cinfo->min_DCT_scaled_size);
-
-    SkScaledBitmapSampler sampler(width, height, skiaSampleSize);
-
-    SkBitmap bitmap;
-    // Assume an A8 bitmap is not opaque to avoid the check of each
-    // individual pixel. It is very unlikely to be opaque, since
-    // an opaque A8 bitmap would not be very interesting.
-    // Otherwise, a jpeg image is opaque.
-    bitmap.setInfo(SkImageInfo::Make(sampler.scaledWidth(), sampler.scaledHeight(), colorType,
-                                     kAlpha_8_SkColorType == colorType ?
-                                         kPremul_SkAlphaType : kOpaque_SkAlphaType));
-
-    // Check ahead of time if the swap(dest, src) is possible or not.
-    // If yes, then we will stick to AllocPixelRef since it's cheaper with the
-    // swap happening. If no, then we will use alloc to allocate pixels to
-    // prevent garbage collection.
-    int w = rect.width() / actualSampleSize;
-    int h = rect.height() / actualSampleSize;
-    bool swapOnly = (rect == region) && bm->isNull() &&
-                    (w == bitmap.width()) && (h == bitmap.height()) &&
-                    ((startX - rect.x()) / actualSampleSize == 0) &&
-                    ((startY - rect.y()) / actualSampleSize == 0);
-    if (swapOnly) {
-        if (!this->allocPixelRef(&bitmap, NULL)) {
-            return return_false(*cinfo, bitmap, "allocPixelRef");
-        }
-    } else {
-        if (!bitmap.allocPixels()) {
-            return return_false(*cinfo, bitmap, "allocPixels");
-        }
-    }
-
-    SkAutoLockPixels alp(bitmap);
-
-#ifdef ANDROID_RGB
-    /* short-circuit the SkScaledBitmapSampler when possible, as this gives
-       a significant performance boost.
-    */
-    if (skiaSampleSize == 1 &&
-        ((kN32_SkColorType == colorType && cinfo->out_color_space == JCS_RGBA_8888) ||
-         (kRGB_565_SkColorType == colorType && cinfo->out_color_space == JCS_RGB_565)))
-    {
-        JSAMPLE* rowptr = (JSAMPLE*)bitmap.getPixels();
-        INT32 const bpr = bitmap.rowBytes();
-        int rowTotalCount = 0;
-
-        while (rowTotalCount < height) {
-            int rowCount = jpeg_read_tile_scanline(cinfo,
-                                                   fImageIndex->huffmanIndex(),
-                                                   &rowptr);
-            // if rowCount == 0, then we didn't get a scanline, so abort.
-            // onDecodeSubset() relies on onBuildTileIndex(), which
-            // needs a complete image to succeed.
-            if (0 == rowCount) {
-                return return_false(*cinfo, bitmap, "read_scanlines");
-            }
-            if (this->shouldCancelDecode()) {
-                return return_false(*cinfo, bitmap, "shouldCancelDecode");
-            }
-            rowTotalCount += rowCount;
-            rowptr += bpr;
-        }
-
-        if (swapOnly) {
-            bm->swap(bitmap);
-        } else {
-            cropBitmap(bm, &bitmap, actualSampleSize, region.x(), region.y(),
-                       region.width(), region.height(), startX, startY);
-        }
+    if (!planes || !planes[0] || !rowBytes || !rowBytes[0]) { // Compute size only
+        update_components_sizes(cinfo, componentSizes, kSizeForMemoryAllocation_SizeType);
         return true;
     }
+
+    set_dct_method(*this, &cinfo);
+
+    SkASSERT(1 == cinfo.scale_num);
+    cinfo.scale_denom = 1;
+
+#ifdef ANDROID_RGB
+    cinfo.dither_mode = JDITHER_NONE;
 #endif
 
-    // check for supported formats
-    SkScaledBitmapSampler::SrcConfig sc;
-    int srcBytesPerPixel;
-
-    if (!get_src_config(*cinfo, &sc, &srcBytesPerPixel)) {
-        return return_false(*cinfo, *bm, "jpeg colorspace");
+    /*  image_width and image_height are the original dimensions, available
+        after jpeg_read_header(). To see the scaled dimensions, we have to call
+        jpeg_start_decompress(), and then read output_width and output_height.
+    */
+    if (!jpeg_start_decompress(&cinfo)) {
+        return return_false(cinfo, "start_decompress YUV8");
     }
 
-    if (!sampler.begin(&bitmap, sc, *this)) {
-        return return_false(*cinfo, bitmap, "sampler.begin");
+    // Seems like jpeg_start_decompress is updating our opinion of whether cinfo represents YUV.
+    // Again, not really an error.
+    if (!appears_to_be_yuv(cinfo)) {
+        return false;
     }
 
-    SkAutoMalloc  srcStorage(width * srcBytesPerPixel);
-    uint8_t* srcRow = (uint8_t*)srcStorage.get();
-
-    //  Possibly skip initial rows [sampler.srcY0]
-    if (!skip_src_rows_tile(cinfo, fImageIndex->huffmanIndex(), srcRow, sampler.srcY0())) {
-        return return_false(*cinfo, bitmap, "skip rows");
+    if (!output_raw_data(cinfo, planes, rowBytes)) {
+        return return_false(cinfo, "output_raw_data");
     }
 
-    // now loop through scanlines until y == bitmap->height() - 1
-    for (int y = 0;; y++) {
-        JSAMPLE* rowptr = (JSAMPLE*)srcRow;
-        int row_count = jpeg_read_tile_scanline(cinfo, fImageIndex->huffmanIndex(), &rowptr);
-        // if row_count == 0, then we didn't get a scanline, so abort.
-        // onDecodeSubset() relies on onBuildTileIndex(), which
-        // needs a complete image to succeed.
-        if (0 == row_count) {
-            return return_false(*cinfo, bitmap, "read_scanlines");
-        }
-        if (this->shouldCancelDecode()) {
-            return return_false(*cinfo, bitmap, "shouldCancelDecode");
-        }
+    update_components_sizes(cinfo, componentSizes, kActualSize_SizeType);
+    jpeg_finish_decompress(&cinfo);
 
-        if (JCS_CMYK == cinfo->out_color_space) {
-            convert_CMYK_to_RGB(srcRow, width);
-        }
-
-        sampler.next(srcRow);
-        if (bitmap.height() - 1 == y) {
-            // we're done
-            break;
-        }
-
-        if (!skip_src_rows_tile(cinfo, fImageIndex->huffmanIndex(), srcRow,
-                                sampler.srcDY() - 1)) {
-            return return_false(*cinfo, bitmap, "skip rows");
-        }
-    }
-    if (swapOnly) {
-        bm->swap(bitmap);
-    } else {
-        cropBitmap(bm, &bitmap, actualSampleSize, region.x(), region.y(),
-                   region.width(), region.height(), startX, startY);
+    if (nullptr != colorSpace) {
+        *colorSpace = kJPEG_SkYUVColorSpace;
     }
+
     return true;
 }
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -1119,7 +915,7 @@ static WriteScanline ChooseWriter(const SkBitmap& bm) {
         case kIndex_8_SkColorType:
             return Write_Index_YUV;
         default:
-            return NULL;
+            return nullptr;
     }
 }
 
@@ -1131,7 +927,7 @@ protected:
 #endif
 
         SkAutoLockPixels alp(bm);
-        if (NULL == bm.getPixels()) {
+        if (nullptr == bm.getPixels()) {
             return false;
         }
 
@@ -1141,7 +937,6 @@ protected:
 
         // allocate these before set call setjmp
         SkAutoMalloc    oneRow;
-        SkAutoLockColors ctLocker;
 
         cinfo.err = jpeg_std_error(&sk_err);
         sk_err.error_exit = skjpeg_error_exit;
@@ -1151,7 +946,7 @@ protected:
 
         // Keep after setjmp or mark volatile.
         const WriteScanline writer = ChooseWriter(bm);
-        if (NULL == writer) {
+        if (nullptr == writer) {
             return false;
         }
 
@@ -1178,7 +973,7 @@ protected:
         const int       width = bm.width();
         uint8_t*        oneRowP = (uint8_t*)oneRow.reset(width * 3);
 
-        const SkPMColor* colors = ctLocker.lockColors(bm);
+        const SkPMColor* colors = bm.getColorTable() ? bm.getColorTable()->readColors() : nullptr;
         const void*      srcRow = bm.getPixels();
 
         while (cinfo.next_scanline < cinfo.image_height) {
@@ -1221,9 +1016,9 @@ static bool is_jpeg(SkStreamRewindable* stream) {
 
 static SkImageDecoder* sk_libjpeg_dfactory(SkStreamRewindable* stream) {
     if (is_jpeg(stream)) {
-        return SkNEW(SkJPEGImageDecoder);
+        return new SkJPEGImageDecoder;
     }
-    return NULL;
+    return nullptr;
 }
 
 static SkImageDecoder::Format get_format_jpeg(SkStreamRewindable* stream) {
@@ -1234,7 +1029,7 @@ static SkImageDecoder::Format get_format_jpeg(SkStreamRewindable* stream) {
 }
 
 static SkImageEncoder* sk_libjpeg_efactory(SkImageEncoder::Type t) {
-    return (SkImageEncoder::kJPEG_Type == t) ? SkNEW(SkJPEGImageEncoder) : NULL;
+    return (SkImageEncoder::kJPEG_Type == t) ? new SkJPEGImageEncoder : nullptr;
 }
 
 static SkImageDecoder_DecodeReg gDReg(sk_libjpeg_dfactory);
diff --git a/gfx/skia/skia/src/images/SkImageDecoder_libpng.cpp b/gfx/skia/skia/src/images/SkImageDecoder_libpng.cpp
index 01b7c69c2575..a03ed10453f7 100644
--- a/gfx/skia/skia/src/images/SkImageDecoder_libpng.cpp
+++ b/gfx/skia/skia/src/images/SkImageDecoder_libpng.cpp
@@ -17,25 +17,24 @@
 #include "SkTemplates.h"
 #include "SkUtils.h"
 #include "transform_scanline.h"
-extern "C" {
+
 #include "png.h"
-}
 
 /* These were dropped in libpng >= 1.4 */
 #ifndef png_infopp_NULL
-#define png_infopp_NULL NULL
+#define png_infopp_NULL nullptr
 #endif
 
 #ifndef png_bytepp_NULL
-#define png_bytepp_NULL NULL
+#define png_bytepp_NULL nullptr
 #endif
 
 #ifndef int_p_NULL
-#define int_p_NULL NULL
+#define int_p_NULL nullptr
 #endif
 
 #ifndef png_flush_ptr_NULL
-#define png_flush_ptr_NULL NULL
+#define png_flush_ptr_NULL nullptr
 #endif
 
 #if defined(SK_DEBUG)
@@ -49,25 +48,23 @@ SK_CONF_DECLARE(bool, c_suppressPNGImageDecoderWarnings,
                 "Suppress most PNG warnings when calling image decode "
                 "functions.");
 
-
-
 class SkPNGImageIndex {
 public:
+    // Takes ownership of stream.
     SkPNGImageIndex(SkStreamRewindable* stream, png_structp png_ptr, png_infop info_ptr)
         : fStream(stream)
         , fPng_ptr(png_ptr)
         , fInfo_ptr(info_ptr)
         , fColorType(kUnknown_SkColorType) {
-        SkASSERT(stream != NULL);
-        stream->ref();
+        SkASSERT(stream != nullptr);
     }
     ~SkPNGImageIndex() {
-        if (NULL != fPng_ptr) {
+        if (fPng_ptr) {
             png_destroy_read_struct(&fPng_ptr, &fInfo_ptr, png_infopp_NULL);
         }
     }
 
-    SkAutoTUnref<SkStreamRewindable>    fStream;
+    SkAutoTDelete<SkStreamRewindable>   fStream;
     png_structp                         fPng_ptr;
     png_infop                           fInfo_ptr;
     SkColorType                         fColorType;
@@ -76,28 +73,22 @@ public:
 class SkPNGImageDecoder : public SkImageDecoder {
 public:
     SkPNGImageDecoder() {
-        fImageIndex = NULL;
+        fImageIndex = nullptr;
     }
-    virtual Format getFormat() const SK_OVERRIDE {
+    Format getFormat() const override {
         return kPNG_Format;
     }
 
-    virtual ~SkPNGImageDecoder() {
-        SkDELETE(fImageIndex);
-    }
+    virtual ~SkPNGImageDecoder() { delete fImageIndex; }
 
 protected:
-#ifdef SK_BUILD_FOR_ANDROID
-    virtual bool onBuildTileIndex(SkStreamRewindable *stream, int *width, int *height) SK_OVERRIDE;
-    virtual bool onDecodeSubset(SkBitmap* bitmap, const SkIRect& region) SK_OVERRIDE;
-#endif
-    virtual bool onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE;
+    Result onDecode(SkStream* stream, SkBitmap* bm, Mode) override;
 
 private:
     SkPNGImageIndex* fImageIndex;
 
     bool onDecodeInit(SkStream* stream, png_structp *png_ptrp, png_infop *info_ptrp);
-    bool decodePalette(png_structp png_ptr, png_infop info_ptr,
+    bool decodePalette(png_structp png_ptr, png_infop info_ptr, int bitDepth,
                        bool * SK_RESTRICT hasAlphap, bool *reallyHasAlphap,
                        SkColorTable **colorTablep);
     bool getBitmapColorType(png_structp, png_infop, SkColorType*, bool* hasAlpha,
@@ -131,23 +122,14 @@ static void sk_read_fn(png_structp png_ptr, png_bytep data, png_size_t length) {
     }
 }
 
-#ifdef SK_BUILD_FOR_ANDROID
-static void sk_seek_fn(png_structp png_ptr, png_uint_32 offset) {
-    SkStreamRewindable* sk_stream = (SkStreamRewindable*) png_get_io_ptr(png_ptr);
-    if (!sk_stream->rewind()) {
-        png_error(png_ptr, "Failed to rewind stream!");
-    }
-    (void)sk_stream->skip(offset);
-}
-#endif
-
+#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
 static int sk_read_user_chunk(png_structp png_ptr, png_unknown_chunkp chunk) {
-    SkImageDecoder::Peeker* peeker =
-                    (SkImageDecoder::Peeker*)png_get_user_chunk_ptr(png_ptr);
-    // peek() returning true means continue decoding
-    return peeker->peek((const char*)chunk->name, chunk->data, chunk->size) ?
+    SkPngChunkReader* peeker = (SkPngChunkReader*)png_get_user_chunk_ptr(png_ptr);
+    // readChunk() returning true means continue decoding
+    return peeker->readChunk((const char*)chunk->name, chunk->data, chunk->size) ?
             1 : -1;
 }
+#endif
 
 static void sk_error_fn(png_structp png_ptr, png_const_charp msg) {
     SkDEBUGF(("------ png error %s\n", msg));
@@ -202,7 +184,7 @@ static bool hasTransparencyInPalette(png_structp png_ptr, png_infop info_ptr) {
     int num_trans;
 
     if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
-        png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, NULL);
+        png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, nullptr);
         return num_trans > 0;
     }
     return false;
@@ -216,13 +198,13 @@ bool SkPNGImageDecoder::onDecodeInit(SkStream* sk_stream, png_structp *png_ptrp,
                                      png_infop *info_ptrp) {
     /* Create and initialize the png_struct with the desired error handler
     * functions.  If you want to use the default stderr and longjump method,
-    * you can supply NULL for the last three parameters.  We also supply the
+    * you can supply nullptr for the last three parameters.  We also supply the
     * the compiler header file version, so that we know if the application
     * was compiled with a compatible version of the library.  */
 
     png_error_ptr user_warning_fn =
-        (c_suppressPNGImageDecoderWarnings) ? (&do_nothing_warning_fn) : NULL;
-    /* NULL means to leave as default library behavior. */
+        (c_suppressPNGImageDecoderWarnings) ? (&do_nothing_warning_fn) : nullptr;
+    /* nullptr means to leave as default library behavior. */
     /* c_suppressPNGImageDecoderWarnings default depends on SK_DEBUG. */
     /* To suppress warnings with a SK_DEBUG binary, set the
      * environment variable "skia_images_png_suppressDecoderWarnings"
@@ -230,9 +212,9 @@ bool SkPNGImageDecoder::onDecodeInit(SkStream* sk_stream, png_structp *png_ptrp,
      * SK_CONF_SET("images.png.suppressDecoderWarnings", true); */
 
     png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
-        NULL, sk_error_fn, user_warning_fn);
+        nullptr, sk_error_fn, user_warning_fn);
     //   png_voidp user_error_ptr, user_error_fn, user_warning_fn);
-    if (png_ptr == NULL) {
+    if (png_ptr == nullptr) {
         return false;
     }
 
@@ -240,7 +222,7 @@ bool SkPNGImageDecoder::onDecodeInit(SkStream* sk_stream, png_structp *png_ptrp,
 
     /* Allocate/initialize the memory for image information. */
     png_infop info_ptr = png_create_info_struct(png_ptr);
-    if (info_ptr == NULL) {
+    if (info_ptr == nullptr) {
         png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
         return false;
     }
@@ -259,19 +241,17 @@ bool SkPNGImageDecoder::onDecodeInit(SkStream* sk_stream, png_structp *png_ptrp,
     * png_init_io() here you would call:
     */
     png_set_read_fn(png_ptr, (void *)sk_stream, sk_read_fn);
-#ifdef SK_BUILD_FOR_ANDROID
-    png_set_seek_fn(png_ptr, sk_seek_fn);
-#endif
     /* where user_io_ptr is a structure you want available to the callbacks */
     /* If we have already read some of the signature */
 //  png_set_sig_bytes(png_ptr, 0 /* sig_read */ );
 
+#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
     // hookup our peeker so we can see any user-chunks the caller may be interested in
     png_set_keep_unknown_chunks(png_ptr, PNG_HANDLE_CHUNK_ALWAYS, (png_byte*)"", 0);
     if (this->getPeeker()) {
         png_set_read_user_chunk_fn(png_ptr, (png_voidp)this->getPeeker(), sk_read_user_chunk);
     }
-
+#endif
     /* The call to png_read_info() gives us all of the information from the
     * PNG file before the first IDAT (image data chunk). */
     png_read_info(png_ptr, info_ptr);
@@ -284,11 +264,13 @@ bool SkPNGImageDecoder::onDecodeInit(SkStream* sk_stream, png_structp *png_ptrp,
     if (bitDepth == 16) {
         png_set_strip_16(png_ptr);
     }
+#ifdef PNG_READ_PACK_SUPPORTED
     /* Extract multiple pixels with bit depths of 1, 2, and 4 from a single
      * byte into separate bytes (useful for paletted and grayscale images). */
     if (bitDepth < 8) {
         png_set_packing(png_ptr);
     }
+#endif
     /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */
     if (colorType == PNG_COLOR_TYPE_GRAY && bitDepth < 8) {
         png_set_expand_gray_1_2_4_to_8(png_ptr);
@@ -297,19 +279,19 @@ bool SkPNGImageDecoder::onDecodeInit(SkStream* sk_stream, png_structp *png_ptrp,
     return true;
 }
 
-bool SkPNGImageDecoder::onDecode(SkStream* sk_stream, SkBitmap* decodedBitmap,
-                                 Mode mode) {
+SkImageDecoder::Result SkPNGImageDecoder::onDecode(SkStream* sk_stream, SkBitmap* decodedBitmap,
+                                                   Mode mode) {
     png_structp png_ptr;
     png_infop info_ptr;
 
     if (!onDecodeInit(sk_stream, &png_ptr, &info_ptr)) {
-        return false;
+        return kFailure;
     }
 
     PNGAutoClean autoClean(png_ptr, info_ptr);
 
     if (setjmp(png_jmpbuf(png_ptr))) {
-        return false;
+        return kFailure;
     }
 
     png_uint_32 origWidth, origHeight;
@@ -322,7 +304,7 @@ bool SkPNGImageDecoder::onDecode(SkStream* sk_stream, SkBitmap* decodedBitmap,
     SkPMColor           theTranspColor = 0; // 0 tells us not to try to match
 
     if (!this->getBitmapColorType(png_ptr, info_ptr, &colorType, &hasAlpha, &theTranspColor)) {
-        return false;
+        return kFailure;
     }
 
     SkAlphaType alphaType = this->getRequireUnpremultipliedColors() ?
@@ -333,7 +315,7 @@ bool SkPNGImageDecoder::onDecode(SkStream* sk_stream, SkBitmap* decodedBitmap,
                                              colorType, alphaType));
 
     if (SkImageDecoder::kDecodeBounds_Mode == mode) {
-        return true;
+        return kSuccess;
     }
 
     // from here down we are concerned with colortables and pixels
@@ -342,21 +324,27 @@ bool SkPNGImageDecoder::onDecode(SkStream* sk_stream, SkBitmap* decodedBitmap,
     // to |= PNG_COLOR_MASK_ALPHA, but all of its pixels are in fact opaque. We care, since we
     // draw lots faster if we can flag the bitmap has being opaque
     bool reallyHasAlpha = false;
-    SkColorTable* colorTable = NULL;
+    SkColorTable* colorTable = nullptr;
 
     if (pngColorType == PNG_COLOR_TYPE_PALETTE) {
-        decodePalette(png_ptr, info_ptr, &hasAlpha, &reallyHasAlpha, &colorTable);
+        decodePalette(png_ptr, info_ptr, bitDepth, &hasAlpha, &reallyHasAlpha, &colorTable);
     }
 
     SkAutoUnref aur(colorTable);
 
     if (!this->allocPixelRef(decodedBitmap,
-                             kIndex_8_SkColorType == colorType ? colorTable : NULL)) {
-        return false;
+                             kIndex_8_SkColorType == colorType ? colorTable : nullptr)) {
+        return kFailure;
     }
 
     SkAutoLockPixels alp(*decodedBitmap);
 
+    // Repeat setjmp, otherwise variables declared since the last call (e.g. alp
+    // and aur) won't get their destructors called in case of a failure.
+    if (setjmp(png_jmpbuf(png_ptr))) {
+        return kFailure;
+    }
+
     /* Turn on interlace handling.  REQUIRED if you are not using
     *  png_read_image().  To see how to handle interlacing passes,
     *  see the png_read_row() method below:
@@ -390,7 +378,7 @@ bool SkPNGImageDecoder::onDecode(SkStream* sk_stream, SkBitmap* decodedBitmap,
         SkScaledBitmapSampler::SrcConfig sc;
         int srcBytesPerPixel = 4;
 
-        if (colorTable != NULL) {
+        if (colorTable != nullptr) {
             sc = SkScaledBitmapSampler::kIndex;
             srcBytesPerPixel = 1;
         } else if (kAlpha_8_SkColorType == colorType) {
@@ -408,9 +396,9 @@ bool SkPNGImageDecoder::onDecode(SkStream* sk_stream, SkBitmap* decodedBitmap,
             even if our decodedBitmap doesn't, due to the request that we
             upscale png's palette to a direct model
          */
-        SkAutoLockColors ctLock(colorTable);
-        if (!sampler.begin(decodedBitmap, sc, *this, ctLock.colors())) {
-            return false;
+        const SkPMColor* colors = colorTable ? colorTable->readColors() : nullptr;
+        if (!sampler.begin(decodedBitmap, sc, *this, colors)) {
+            return kFailure;
         }
         const int height = decodedBitmap->height();
 
@@ -467,7 +455,7 @@ bool SkPNGImageDecoder::onDecode(SkStream* sk_stream, SkBitmap* decodedBitmap,
                 // Fall through.
             case kARGB_4444_SkColorType:
                 // We have chosen not to support unpremul for these colortypes.
-                return false;
+                return kFailure;
             default: {
                 // Fall through to finish the decode. This colortype either
                 // supports unpremul or it is irrelevant because it has no
@@ -480,7 +468,7 @@ bool SkPNGImageDecoder::onDecode(SkStream* sk_stream, SkBitmap* decodedBitmap,
     if (!reallyHasAlpha) {
         decodedBitmap->setAlphaType(kOpaque_SkAlphaType);
     }
-    return true;
+    return kSuccess;
 }
 
 
@@ -494,6 +482,7 @@ bool SkPNGImageDecoder::getBitmapColorType(png_structp png_ptr, png_infop info_p
     png_get_IHDR(png_ptr, info_ptr, &origWidth, &origHeight, &bitDepth,
                  &colorType, int_p_NULL, int_p_NULL, int_p_NULL);
 
+#ifdef PNG_sBIT_SUPPORTED
     // check for sBIT chunk data, in case we should disable dithering because
     // our data is not truely 8bits per component
     png_color_8p sig_bit;
@@ -509,6 +498,7 @@ bool SkPNGImageDecoder::getBitmapColorType(png_structp png_ptr, png_infop info_p
             this->setDitherImage(false);
         }
     }
+#endif
 
     if (colorType == PNG_COLOR_TYPE_PALETTE) {
         bool paletteHasAlpha = hasTransparencyInPalette(png_ptr, info_ptr);
@@ -518,14 +508,14 @@ bool SkPNGImageDecoder::getBitmapColorType(png_structp png_ptr, png_infop info_p
             *colorTypep = kIndex_8_SkColorType;
         }
     } else {
-        png_color_16p transpColor = NULL;
+        png_color_16p transpColor = nullptr;
         int numTransp = 0;
 
-        png_get_tRNS(png_ptr, info_ptr, NULL, &numTransp, &transpColor);
+        png_get_tRNS(png_ptr, info_ptr, nullptr, &numTransp, &transpColor);
 
         bool valid = png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS);
 
-        if (valid && numTransp == 1 && transpColor != NULL) {
+        if (valid && numTransp == 1 && transpColor != nullptr) {
             /*  Compute our transparent color, which we'll match against later.
                 We don't really handle 16bit components properly here, since we
                 do our compare *after* the values have been knocked down to 8bit
@@ -607,19 +597,13 @@ bool SkPNGImageDecoder::getBitmapColorType(png_structp png_ptr, png_infop info_p
         }
     }
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER
-    if (!this->chooseFromOneChoice(*colorTypep, origWidth, origHeight)) {
-        return false;
-    }
-#endif
-
     // If the image has alpha and the decoder wants unpremultiplied
     // colors, the only supported colortype is 8888.
     if (this->getRequireUnpremultipliedColors() && *hasAlphap) {
         *colorTypep = kN32_SkColorType;
     }
 
-    if (fImageIndex != NULL) {
+    if (fImageIndex != nullptr) {
         if (kUnknown_SkColorType == fImageIndex->fColorType) {
             // This is the first time for this subset decode. From now on,
             // all decodes must be in the same colortype.
@@ -650,7 +634,8 @@ bool SkPNGImageDecoder::getBitmapColorType(png_structp png_ptr, png_infop info_p
 typedef uint32_t (*PackColorProc)(U8CPU a, U8CPU r, U8CPU g, U8CPU b);
 
 bool SkPNGImageDecoder::decodePalette(png_structp png_ptr, png_infop info_ptr,
-                                      bool *hasAlphap, bool *reallyHasAlphap,
+                                      int bitDepth, bool *hasAlphap,
+                                      bool *reallyHasAlphap,
                                       SkColorTable **colorTablep) {
     int numPalette;
     png_colorp palette;
@@ -659,18 +644,11 @@ bool SkPNGImageDecoder::decodePalette(png_structp png_ptr, png_infop info_ptr,
 
     png_get_PLTE(png_ptr, info_ptr, &palette, &numPalette);
 
-    /*  BUGGY IMAGE WORKAROUND
-
-        We hit some images (e.g. fruit_.png) who contain bytes that are == colortable_count
-        which is a problem since we use the byte as an index. To work around this we grow
-        the colortable by 1 (if its < 256) and duplicate the last color into that slot.
-    */
-    int colorCount = numPalette + (numPalette < 256);
     SkPMColor colorStorage[256];    // worst-case storage
     SkPMColor* colorPtr = colorStorage;
 
     if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
-        png_get_tRNS(png_ptr, info_ptr, &trans, &numTrans, NULL);
+        png_get_tRNS(png_ptr, info_ptr, &trans, &numTrans, nullptr);
         *hasAlphap = (numTrans > 0);
     } else {
         numTrans = 0;
@@ -704,286 +682,26 @@ bool SkPNGImageDecoder::decodePalette(png_structp png_ptr, png_infop info_ptr,
         palette++;
     }
 
-    // see BUGGY IMAGE WORKAROUND comment above
-    if (numPalette < 256) {
-        *colorPtr = colorPtr[-1];
+    /*  BUGGY IMAGE WORKAROUND
+
+        Invalid images could contain pixel values that are greater than the number of palette
+        entries. Since we use pixel values as indices into the palette this could result in reading
+        beyond the end of the palette which could leak the contents of uninitialized memory. To
+        ensure this doesn't happen, we grow the colortable to the maximum size that can be
+        addressed by the bitdepth of the image and fill it with the last palette color or black if
+        the palette is empty (really broken image).
+    */
+    int colorCount = SkTMax(numPalette, 1 << SkTMin(bitDepth, 8));
+    SkPMColor lastColor = index > 0 ? colorPtr[-1] : SkPackARGB32(0xFF, 0, 0, 0);
+    for (; index < colorCount; index++) {
+        *colorPtr++ = lastColor;
     }
 
-    SkAlphaType alphaType = kOpaque_SkAlphaType;
-    if (reallyHasAlpha) {
-        if (this->getRequireUnpremultipliedColors()) {
-            alphaType = kUnpremul_SkAlphaType;
-        } else {
-            alphaType = kPremul_SkAlphaType;
-        }
-    }
-
-    *colorTablep = SkNEW_ARGS(SkColorTable,
-                              (colorStorage, colorCount, alphaType));
+    *colorTablep = new SkColorTable(colorStorage, colorCount);
     *reallyHasAlphap = reallyHasAlpha;
     return true;
 }
 
-#ifdef SK_BUILD_FOR_ANDROID
-
-bool SkPNGImageDecoder::onBuildTileIndex(SkStreamRewindable* sk_stream, int *width, int *height) {
-    png_structp png_ptr;
-    png_infop   info_ptr;
-
-    if (!onDecodeInit(sk_stream, &png_ptr, &info_ptr)) {
-        return false;
-    }
-
-    if (setjmp(png_jmpbuf(png_ptr)) != 0) {
-        png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-        return false;
-    }
-
-    png_uint_32 origWidth, origHeight;
-    int bitDepth, colorType;
-    png_get_IHDR(png_ptr, info_ptr, &origWidth, &origHeight, &bitDepth,
-                 &colorType, int_p_NULL, int_p_NULL, int_p_NULL);
-
-    *width = origWidth;
-    *height = origHeight;
-
-    png_build_index(png_ptr);
-
-    if (fImageIndex) {
-        SkDELETE(fImageIndex);
-    }
-    fImageIndex = SkNEW_ARGS(SkPNGImageIndex, (sk_stream, png_ptr, info_ptr));
-
-    return true;
-}
-
-bool SkPNGImageDecoder::onDecodeSubset(SkBitmap* bm, const SkIRect& region) {
-    if (NULL == fImageIndex) {
-        return false;
-    }
-
-    png_structp png_ptr = fImageIndex->fPng_ptr;
-    png_infop info_ptr = fImageIndex->fInfo_ptr;
-    if (setjmp(png_jmpbuf(png_ptr))) {
-        return false;
-    }
-
-    png_uint_32 origWidth, origHeight;
-    int bitDepth, pngColorType, interlaceType;
-    png_get_IHDR(png_ptr, info_ptr, &origWidth, &origHeight, &bitDepth,
-                 &pngColorType, &interlaceType, int_p_NULL, int_p_NULL);
-
-    SkIRect rect = SkIRect::MakeWH(origWidth, origHeight);
-
-    if (!rect.intersect(region)) {
-        // If the requested region is entirely outside the image, just
-        // returns false
-        return false;
-    }
-
-    SkColorType         colorType;
-    bool                hasAlpha = false;
-    SkPMColor           theTranspColor = 0; // 0 tells us not to try to match
-
-    if (!this->getBitmapColorType(png_ptr, info_ptr, &colorType, &hasAlpha, &theTranspColor)) {
-        return false;
-    }
-
-    const int sampleSize = this->getSampleSize();
-    SkScaledBitmapSampler sampler(origWidth, rect.height(), sampleSize);
-
-    SkBitmap decodedBitmap;
-    decodedBitmap.setInfo(SkImageInfo::Make(sampler.scaledWidth(), sampler.scaledHeight(),
-                                            colorType, kPremul_SkAlphaType));
-
-    // from here down we are concerned with colortables and pixels
-
-    // we track if we actually see a non-opaque pixels, since sometimes a PNG sets its colortype
-    // to |= PNG_COLOR_MASK_ALPHA, but all of its pixels are in fact opaque. We care, since we
-    // draw lots faster if we can flag the bitmap has being opaque
-    bool reallyHasAlpha = false;
-    SkColorTable* colorTable = NULL;
-
-    if (pngColorType == PNG_COLOR_TYPE_PALETTE) {
-        decodePalette(png_ptr, info_ptr, &hasAlpha, &reallyHasAlpha, &colorTable);
-    }
-
-    SkAutoUnref aur(colorTable);
-
-    // Check ahead of time if the swap(dest, src) is possible.
-    // If yes, then we will stick to AllocPixelRef since it's cheaper with the swap happening.
-    // If no, then we will use alloc to allocate pixels to prevent garbage collection.
-    int w = rect.width() / sampleSize;
-    int h = rect.height() / sampleSize;
-    const bool swapOnly = (rect == region) && (w == decodedBitmap.width()) &&
-                          (h == decodedBitmap.height()) && bm->isNull();
-    const bool needColorTable = kIndex_8_SkColorType == colorType;
-    if (swapOnly) {
-        if (!this->allocPixelRef(&decodedBitmap, needColorTable ? colorTable : NULL)) {
-            return false;
-        }
-    } else {
-        if (!decodedBitmap.allocPixels(NULL, needColorTable ? colorTable : NULL)) {
-            return false;
-        }
-    }
-    SkAutoLockPixels alp(decodedBitmap);
-
-    /* Turn on interlace handling.  REQUIRED if you are not using
-    * png_read_image().  To see how to handle interlacing passes,
-    * see the png_read_row() method below:
-    */
-    const int number_passes = (interlaceType != PNG_INTERLACE_NONE) ?
-                              png_set_interlace_handling(png_ptr) : 1;
-
-    /* Optional call to gamma correct and add the background to the palette
-    * and update info structure.  REQUIRED if you are expecting libpng to
-    * update the palette for you (ie you selected such a transform above).
-    */
-
-    // Direct access to png_ptr fields is deprecated in libpng > 1.2.
-#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
-    png_ptr->pass = 0;
-#else
-    // FIXME: This sets pass as desired, but also sets iwidth. Is that ok?
-    png_set_interlaced_pass(png_ptr, 0);
-#endif
-    png_read_update_info(png_ptr, info_ptr);
-
-    int actualTop = rect.fTop;
-
-    if ((kAlpha_8_SkColorType == colorType || kIndex_8_SkColorType == colorType)
-        && 1 == sampleSize) {
-        if (kAlpha_8_SkColorType == colorType) {
-            // For an A8 bitmap, we assume there is an alpha for speed. It is
-            // possible the bitmap is opaque, but that is an unlikely use case
-            // since it would not be very interesting.
-            reallyHasAlpha = true;
-            // A8 is only allowed if the original was GRAY.
-            SkASSERT(PNG_COLOR_TYPE_GRAY == pngColorType);
-        }
-
-        for (int i = 0; i < number_passes; i++) {
-            png_configure_decoder(png_ptr, &actualTop, i);
-            for (int j = 0; j < rect.fTop - actualTop; j++) {
-                uint8_t* bmRow = decodedBitmap.getAddr8(0, 0);
-                png_read_rows(png_ptr, &bmRow, png_bytepp_NULL, 1);
-            }
-            png_uint_32 bitmapHeight = (png_uint_32) decodedBitmap.height();
-            for (png_uint_32 y = 0; y < bitmapHeight; y++) {
-                uint8_t* bmRow = decodedBitmap.getAddr8(0, y);
-                png_read_rows(png_ptr, &bmRow, png_bytepp_NULL, 1);
-            }
-        }
-    } else {
-        SkScaledBitmapSampler::SrcConfig sc;
-        int srcBytesPerPixel = 4;
-
-        if (colorTable != NULL) {
-            sc = SkScaledBitmapSampler::kIndex;
-            srcBytesPerPixel = 1;
-        } else if (kAlpha_8_SkColorType == colorType) {
-            // A8 is only allowed if the original was GRAY.
-            SkASSERT(PNG_COLOR_TYPE_GRAY == pngColorType);
-            sc = SkScaledBitmapSampler::kGray;
-            srcBytesPerPixel = 1;
-        } else if (hasAlpha) {
-            sc = SkScaledBitmapSampler::kRGBA;
-        } else {
-            sc = SkScaledBitmapSampler::kRGBX;
-        }
-
-        /*  We have to pass the colortable explicitly, since we may have one
-            even if our decodedBitmap doesn't, due to the request that we
-            upscale png's palette to a direct model
-         */
-        SkAutoLockColors ctLock(colorTable);
-        if (!sampler.begin(&decodedBitmap, sc, *this, ctLock.colors())) {
-            return false;
-        }
-        const int height = decodedBitmap.height();
-
-        if (number_passes > 1) {
-            SkAutoMalloc storage(origWidth * origHeight * srcBytesPerPixel);
-            uint8_t* base = (uint8_t*)storage.get();
-            size_t rb = origWidth * srcBytesPerPixel;
-
-            for (int i = 0; i < number_passes; i++) {
-                png_configure_decoder(png_ptr, &actualTop, i);
-                for (int j = 0; j < rect.fTop - actualTop; j++) {
-                    png_read_rows(png_ptr, &base, png_bytepp_NULL, 1);
-                }
-                uint8_t* row = base;
-                for (int32_t y = 0; y < rect.height(); y++) {
-                    uint8_t* bmRow = row;
-                    png_read_rows(png_ptr, &bmRow, png_bytepp_NULL, 1);
-                    row += rb;
-                }
-            }
-            // now sample it
-            base += sampler.srcY0() * rb;
-            for (int y = 0; y < height; y++) {
-                reallyHasAlpha |= sampler.next(base);
-                base += sampler.srcDY() * rb;
-            }
-        } else {
-            SkAutoMalloc storage(origWidth * srcBytesPerPixel);
-            uint8_t* srcRow = (uint8_t*)storage.get();
-
-            png_configure_decoder(png_ptr, &actualTop, 0);
-            skip_src_rows(png_ptr, srcRow, sampler.srcY0());
-
-            for (int i = 0; i < rect.fTop - actualTop; i++) {
-                png_read_rows(png_ptr, &srcRow, png_bytepp_NULL, 1);
-            }
-            for (int y = 0; y < height; y++) {
-                uint8_t* tmp = srcRow;
-                png_read_rows(png_ptr, &tmp, png_bytepp_NULL, 1);
-                reallyHasAlpha |= sampler.next(srcRow);
-                if (y < height - 1) {
-                    skip_src_rows(png_ptr, srcRow, sampler.srcDY() - 1);
-                }
-            }
-        }
-    }
-
-    if (0 != theTranspColor) {
-        reallyHasAlpha |= substituteTranspColor(&decodedBitmap, theTranspColor);
-    }
-    if (reallyHasAlpha && this->getRequireUnpremultipliedColors()) {
-        switch (decodedBitmap.colorType()) {
-            case kIndex_8_SkColorType:
-                // Fall through.
-            case kARGB_4444_SkColorType:
-                // We have chosen not to support unpremul for these colortypess.
-                return false;
-            default: {
-                // Fall through to finish the decode. This config either
-                // supports unpremul or it is irrelevant because it has no
-                // alpha (or only alpha).
-                // These brackets prevent a warning.
-            }
-        }
-    }
-    SkAlphaType alphaType = kOpaque_SkAlphaType;
-    if (reallyHasAlpha) {
-        if (this->getRequireUnpremultipliedColors()) {
-            alphaType = kUnpremul_SkAlphaType;
-        } else {
-            alphaType = kPremul_SkAlphaType;
-        }
-    }
-    decodedBitmap.setAlphaType(alphaType);
-
-    if (swapOnly) {
-        bm->swap(decodedBitmap);
-        return true;
-    }
-    return this->cropBitmap(bm, &decodedBitmap, sampleSize, region.x(), region.y(),
-                            region.width(), region.height(), 0, rect.y());
-}
-#endif
-
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "SkColorPriv.h"
@@ -1022,7 +740,7 @@ static transform_scanline_proc choose_proc(SkColorType ct, bool hasAlpha) {
         }
     }
     sk_throw();
-    return NULL;
+    return nullptr;
 }
 
 // return the minimum legal bitdepth (by png standards) for this many colortable
@@ -1050,8 +768,7 @@ static int computeBitDepth(int colorCount) {
 static inline int pack_palette(SkColorTable* ctable,
                                png_color* SK_RESTRICT palette,
                                png_byte* SK_RESTRICT trans, bool hasAlpha) {
-    SkAutoLockColors alc(ctable);
-    const SkPMColor* SK_RESTRICT colors = alc.colors();
+    const SkPMColor* SK_RESTRICT colors = ctable ? ctable->readColors() : nullptr;
     const int ctCount = ctable->count();
     int i, num_trans = 0;
 
@@ -1100,7 +817,7 @@ static inline int pack_palette(SkColorTable* ctable,
 
 class SkPNGImageEncoder : public SkImageEncoder {
 protected:
-    virtual bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality) SK_OVERRIDE;
+    bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality) override;
 private:
     bool doEncode(SkWStream* stream, const SkBitmap& bm,
                   const bool& hasAlpha, int colorType,
@@ -1161,7 +878,7 @@ bool SkPNGImageEncoder::onEncode(SkWStream* stream, const SkBitmap& bitmap, int
 
     // we must do this after we have locked the pixels
     SkColorTable* ctable = bitmap.getColorTable();
-    if (NULL != ctable) {
+    if (ctable) {
         if (ctable->count() == 0) {
             return false;
         }
@@ -1180,14 +897,14 @@ bool SkPNGImageEncoder::doEncode(SkWStream* stream, const SkBitmap& bitmap,
     png_structp png_ptr;
     png_infop info_ptr;
 
-    png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, sk_error_fn,
-                                      NULL);
-    if (NULL == png_ptr) {
+    png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr, sk_error_fn,
+                                      nullptr);
+    if (nullptr == png_ptr) {
         return false;
     }
 
     info_ptr = png_create_info_struct(png_ptr);
-    if (NULL == info_ptr) {
+    if (nullptr == info_ptr) {
         png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
         return false;
     }
@@ -1224,11 +941,12 @@ bool SkPNGImageEncoder::doEncode(SkWStream* stream, const SkBitmap& bitmap,
         int numTrans = pack_palette(ct, paletteColors, trans, hasAlpha);
         png_set_PLTE(png_ptr, info_ptr, paletteColors, ct->count());
         if (numTrans > 0) {
-            png_set_tRNS(png_ptr, info_ptr, trans, numTrans, NULL);
+            png_set_tRNS(png_ptr, info_ptr, trans, numTrans, nullptr);
         }
     }
-
+#ifdef PNG_sBIT_SUPPORTED
     png_set_sBIT(png_ptr, info_ptr, &sig_bit);
+#endif
     png_write_info(png_ptr, info_ptr);
 
     const char* srcImage = (const char*)bitmap.getPixels();
@@ -1266,9 +984,9 @@ static bool is_png(SkStreamRewindable* stream) {
 
 SkImageDecoder* sk_libpng_dfactory(SkStreamRewindable* stream) {
     if (is_png(stream)) {
-        return SkNEW(SkPNGImageDecoder);
+        return new SkPNGImageDecoder;
     }
-    return NULL;
+    return nullptr;
 }
 
 static SkImageDecoder::Format get_format_png(SkStreamRewindable* stream) {
@@ -1279,7 +997,7 @@ static SkImageDecoder::Format get_format_png(SkStreamRewindable* stream) {
 }
 
 SkImageEncoder* sk_libpng_efactory(SkImageEncoder::Type t) {
-    return (SkImageEncoder::kPNG_Type == t) ? SkNEW(SkPNGImageEncoder) : NULL;
+    return (SkImageEncoder::kPNG_Type == t) ? new SkPNGImageEncoder : nullptr;
 }
 
 static SkImageDecoder_DecodeReg gDReg(sk_libpng_dfactory);
diff --git a/gfx/skia/skia/src/images/SkImageDecoder_libwebp.cpp b/gfx/skia/skia/src/images/SkImageDecoder_libwebp.cpp
index f7cfa8b4cca4..07ff83de9bb1 100644
--- a/gfx/skia/skia/src/images/SkImageDecoder_libwebp.cpp
+++ b/gfx/skia/skia/src/images/SkImageDecoder_libwebp.cpp
@@ -59,10 +59,8 @@ static bool webp_parse_header(SkStream* stream, int* width, int* height, int* al
         unsigned char* dst = buffer + totalBytesRead;
         const size_t bytesRead = stream->read(dst, bytesToRead);
         if (0 == bytesRead) {
-            // Could not read any bytes. Check to see if we are at the end (exit
-            // condition), and continue reading if not. Important for streams
-            // that do not have all the data ready.
-            continue;
+            SkASSERT(stream->isAtEnd());
+            break;
         }
         bytesToRead -= bytesRead;
         totalBytesRead += bytesRead;
@@ -95,23 +93,17 @@ static bool webp_parse_header(SkStream* stream, int* width, int* height, int* al
 class SkWEBPImageDecoder: public SkImageDecoder {
 public:
     SkWEBPImageDecoder() {
-        fInputStream = NULL;
         fOrigWidth = 0;
         fOrigHeight = 0;
         fHasAlpha = 0;
     }
-    virtual ~SkWEBPImageDecoder() {
-        SkSafeUnref(fInputStream);
-    }
 
-    virtual Format getFormat() const SK_OVERRIDE {
+    Format getFormat() const override {
         return kWEBP_Format;
     }
 
 protected:
-    virtual bool onBuildTileIndex(SkStreamRewindable *stream, int *width, int *height) SK_OVERRIDE;
-    virtual bool onDecodeSubset(SkBitmap* bitmap, const SkIRect& rect) SK_OVERRIDE;
-    virtual bool onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE;
+    Result onDecode(SkStream* stream, SkBitmap* bm, Mode) override;
 
 private:
     /**
@@ -125,7 +117,7 @@ private:
 
     bool setDecodeConfig(SkBitmap* decodedBitmap, int width, int height);
 
-    SkStream* fInputStream;
+    SkAutoTDelete<SkStream> fInputStream;
     int fOrigWidth;
     int fOrigHeight;
     int fHasAlpha;
@@ -143,7 +135,7 @@ class AutoTimeMillis {
 public:
     AutoTimeMillis(const char label[]) :
         fLabel(label) {
-        if (NULL == fLabel) {
+        if (nullptr == fLabel) {
             fLabel = "";
         }
         fNow = SkTime::GetMSecs();
@@ -162,11 +154,17 @@ private:
 
 // This guy exists just to aid in debugging, as it allows debuggers to just
 // set a break-point in one place to see all error exists.
-static bool return_false(const SkBitmap& bm, const char msg[]) {
+static void print_webp_error(const SkBitmap& bm, const char msg[]) {
     SkDEBUGF(("libwebp error %s [%d %d]", msg, bm.width(), bm.height()));
-    return false; // must always return false
 }
 
+static SkImageDecoder::Result return_failure(const SkBitmap& bm, const char msg[]) {
+    print_webp_error(bm, msg);
+    return SkImageDecoder::kFailure; // must always return kFailure
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
 static WEBP_CSP_MODE webp_decode_mode(const SkBitmap* decodedBitmap, bool premultiply) {
     WEBP_CSP_MODE mode = MODE_LAST;
     const SkColorType ct = decodedBitmap->colorType();
@@ -191,8 +189,8 @@ static WEBP_CSP_MODE webp_decode_mode(const SkBitmap* decodedBitmap, bool premul
 // Incremental WebP image decoding. Reads input buffer of 64K size iteratively
 // and decodes this block to appropriate color-space as per config object.
 static bool webp_idecode(SkStream* stream, WebPDecoderConfig* config) {
-    WebPIDecoder* idec = WebPIDecode(NULL, 0, config);
-    if (NULL == idec) {
+    WebPIDecoder* idec = WebPIDecode(nullptr, 0, config);
+    if (nullptr == idec) {
         WebPFreeDecBuffer(&config->output);
         return false;
     }
@@ -205,7 +203,7 @@ static bool webp_idecode(SkStream* stream, WebPDecoderConfig* config) {
             SkTMin(stream->getLength(), WEBP_IDECODE_BUFFER_SZ) : WEBP_IDECODE_BUFFER_SZ;
     SkAutoMalloc srcStorage(readBufferSize);
     unsigned char* input = (uint8_t*)srcStorage.get();
-    if (NULL == input) {
+    if (nullptr == input) {
         WebPIDelete(idec);
         WebPFreeDecBuffer(&config->output);
         return false;
@@ -260,24 +258,6 @@ static bool webp_get_config_resize(WebPDecoderConfig* config,
     return true;
 }
 
-static bool webp_get_config_resize_crop(WebPDecoderConfig* config,
-                                        SkBitmap* decodedBitmap,
-                                        const SkIRect& region, bool premultiply) {
-
-    if (!webp_get_config_resize(config, decodedBitmap, region.width(),
-                                region.height(), premultiply)) {
-      return false;
-    }
-
-    config->options.use_cropping = 1;
-    config->options.crop_left = region.fLeft;
-    config->options.crop_top = region.fTop;
-    config->options.crop_width = region.width();
-    config->options.crop_height = region.height();
-
-    return true;
-}
-
 bool SkWEBPImageDecoder::setDecodeConfig(SkBitmap* decodedBitmap, int width, int height) {
     SkColorType colorType = this->getPrefColorType(k32Bit_SrcDepth, SkToBool(fHasAlpha));
 
@@ -292,12 +272,6 @@ bool SkWEBPImageDecoder::setDecodeConfig(SkBitmap* decodedBitmap, int width, int
         }
     }
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER
-    if (!this->chooseFromOneChoice(colorType, width, height)) {
-        return false;
-    }
-#endif
-
     SkAlphaType alphaType = kOpaque_SkAlphaType;
     if (SkToBool(fHasAlpha)) {
         if (this->getRequireUnpremultipliedColors()) {
@@ -309,115 +283,15 @@ bool SkWEBPImageDecoder::setDecodeConfig(SkBitmap* decodedBitmap, int width, int
     return decodedBitmap->setInfo(SkImageInfo::Make(width, height, colorType, alphaType));
 }
 
-bool SkWEBPImageDecoder::onBuildTileIndex(SkStreamRewindable* stream,
-                                          int *width, int *height) {
-    int origWidth, origHeight, hasAlpha;
-    if (!webp_parse_header(stream, &origWidth, &origHeight, &hasAlpha)) {
-        return false;
-    }
-
-    if (!stream->rewind()) {
-        SkDebugf("Failed to rewind webp stream!");
-        return false;
-    }
-
-    *width = origWidth;
-    *height = origHeight;
-
-    SkRefCnt_SafeAssign(this->fInputStream, stream);
-    this->fOrigWidth = origWidth;
-    this->fOrigHeight = origHeight;
-    this->fHasAlpha = hasAlpha;
-
-    return true;
-}
-
-static bool is_config_compatible(const SkBitmap& bitmap) {
-    const SkColorType ct = bitmap.colorType();
-    return ct == kARGB_4444_SkColorType || ct == kRGB_565_SkColorType || ct == kN32_SkColorType;
-}
-
-bool SkWEBPImageDecoder::onDecodeSubset(SkBitmap* decodedBitmap,
-                                        const SkIRect& region) {
-    SkIRect rect = SkIRect::MakeWH(fOrigWidth, fOrigHeight);
-
-    if (!rect.intersect(region)) {
-        // If the requested region is entirely outsides the image, return false
-        return false;
-    }
-
-    const int sampleSize = this->getSampleSize();
-    SkScaledBitmapSampler sampler(rect.width(), rect.height(), sampleSize);
-    const int width = sampler.scaledWidth();
-    const int height = sampler.scaledHeight();
-
-    // The image can be decoded directly to decodedBitmap if
-    //   1. the region is within the image range
-    //   2. bitmap's config is compatible
-    //   3. bitmap's size is same as the required region (after sampled)
-    bool directDecode = (rect == region) &&
-                        (decodedBitmap->isNull() ||
-                         (is_config_compatible(*decodedBitmap) &&
-                         (decodedBitmap->width() == width) &&
-                         (decodedBitmap->height() == height)));
-
-    SkBitmap tmpBitmap;
-    SkBitmap *bitmap = decodedBitmap;
-
-    if (!directDecode) {
-        bitmap = &tmpBitmap;
-    }
-
-    if (bitmap->isNull()) {
-        if (!setDecodeConfig(bitmap, width, height)) {
-            return false;
-        }
-        // alloc from native heap if it is a temp bitmap. (prevent GC)
-        bool allocResult = (bitmap == decodedBitmap)
-                               ? allocPixelRef(bitmap, NULL)
-                               : bitmap->allocPixels();
-        if (!allocResult) {
-            return return_false(*decodedBitmap, "allocPixelRef");
-        }
-#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER
-    } else {
-        // This is also called in setDecodeConfig in above block.
-        // i.e., when bitmap->isNull() is true.
-        if (!chooseFromOneChoice(bitmap->colorType(), width, height)) {
-            return false;
-        }
-#endif
-    }
-
-    SkAutoLockPixels alp(*bitmap);
-    WebPDecoderConfig config;
-    if (!webp_get_config_resize_crop(&config, bitmap, rect,
-                                     this->shouldPremultiply())) {
-        return false;
-    }
-
-    // Decode the WebP image data stream using WebP incremental decoding for
-    // the specified cropped image-region.
-    if (!webp_idecode(this->fInputStream, &config)) {
-        return false;
-    }
-
-    if (!directDecode) {
-        cropBitmap(decodedBitmap, bitmap, sampleSize, region.x(), region.y(),
-                   region.width(), region.height(), rect.x(), rect.y());
-    }
-    return true;
-}
-
-bool SkWEBPImageDecoder::onDecode(SkStream* stream, SkBitmap* decodedBitmap,
-                                  Mode mode) {
+SkImageDecoder::Result SkWEBPImageDecoder::onDecode(SkStream* stream, SkBitmap* decodedBitmap,
+                                                    Mode mode) {
 #ifdef TIME_DECODE
     AutoTimeMillis atm("WEBP Decode");
 #endif
 
     int origWidth, origHeight, hasAlpha;
     if (!webp_parse_header(stream, &origWidth, &origHeight, &hasAlpha)) {
-        return false;
+        return kFailure;
     }
     this->fHasAlpha = hasAlpha;
 
@@ -425,16 +299,16 @@ bool SkWEBPImageDecoder::onDecode(SkStream* stream, SkBitmap* decodedBitmap,
     SkScaledBitmapSampler sampler(origWidth, origHeight, sampleSize);
     if (!setDecodeConfig(decodedBitmap, sampler.scaledWidth(),
                          sampler.scaledHeight())) {
-        return false;
+        return kFailure;
     }
 
     // If only bounds are requested, done
     if (SkImageDecoder::kDecodeBounds_Mode == mode) {
-        return true;
+        return kSuccess;
     }
 
-    if (!this->allocPixelRef(decodedBitmap, NULL)) {
-        return return_false(*decodedBitmap, "allocPixelRef");
+    if (!this->allocPixelRef(decodedBitmap, nullptr)) {
+        return return_failure(*decodedBitmap, "allocPixelRef");
     }
 
     SkAutoLockPixels alp(*decodedBitmap);
@@ -442,11 +316,11 @@ bool SkWEBPImageDecoder::onDecode(SkStream* stream, SkBitmap* decodedBitmap,
     WebPDecoderConfig config;
     if (!webp_get_config_resize(&config, decodedBitmap, origWidth, origHeight,
                                 this->shouldPremultiply())) {
-        return false;
+        return kFailure;
     }
 
     // Decode the WebP image data stream using WebP incremental decoding.
-    return webp_idecode(stream, &config);
+    return webp_idecode(stream, &config) ? kSuccess : kFailure;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -579,7 +453,7 @@ static ScanlineImporter ChooseImporter(SkColorType ct, bool  hasAlpha, int*  bpp
             *bpp = 3;
             return Index8_To_RGB;
         default:
-            return NULL;
+            return nullptr;
     }
 }
 
@@ -591,7 +465,7 @@ static int stream_writer(const uint8_t* data, size_t data_size,
 
 class SkWEBPImageEncoder : public SkImageEncoder {
 protected:
-    virtual bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality) SK_OVERRIDE;
+    bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality) override;
 
 private:
     typedef SkImageEncoder INHERITED;
@@ -602,7 +476,7 @@ bool SkWEBPImageEncoder::onEncode(SkWStream* stream, const SkBitmap& bm,
     const bool hasAlpha = !bm.isOpaque();
     int bpp = -1;
     const ScanlineImporter scanline_import = ChooseImporter(bm.colorType(), hasAlpha, &bpp);
-    if (NULL == scanline_import) {
+    if (nullptr == scanline_import) {
         return false;
     }
     if (-1 == bpp) {
@@ -610,8 +484,7 @@ bool SkWEBPImageEncoder::onEncode(SkWStream* stream, const SkBitmap& bm,
     }
 
     SkAutoLockPixels alp(bm);
-    SkAutoLockColors ctLocker;
-    if (NULL == bm.getPixels()) {
+    if (nullptr == bm.getPixels()) {
         return false;
     }
 
@@ -627,7 +500,7 @@ bool SkWEBPImageEncoder::onEncode(SkWStream* stream, const SkBitmap& bm,
     pic.writer = stream_writer;
     pic.custom_ptr = (void*)stream;
 
-    const SkPMColor* colors = ctLocker.lockColors(bm);
+    const SkPMColor* colors = bm.getColorTable() ? bm.getColorTable()->readColors() : nullptr;
     const uint8_t* src = (uint8_t*)bm.getPixels();
     const int rgbStride = pic.width * bpp;
 
@@ -662,11 +535,11 @@ DEFINE_ENCODER_CREATOR(WEBPImageEncoder);
 static SkImageDecoder* sk_libwebp_dfactory(SkStreamRewindable* stream) {
     int width, height, hasAlpha;
     if (!webp_parse_header(stream, &width, &height, &hasAlpha)) {
-        return NULL;
+        return nullptr;
     }
 
     // Magic matches, call decoder
-    return SkNEW(SkWEBPImageDecoder);
+    return new SkWEBPImageDecoder;
 }
 
 static SkImageDecoder::Format get_format_webp(SkStreamRewindable* stream) {
@@ -678,7 +551,7 @@ static SkImageDecoder::Format get_format_webp(SkStreamRewindable* stream) {
 }
 
 static SkImageEncoder* sk_libwebp_efactory(SkImageEncoder::Type t) {
-      return (SkImageEncoder::kWEBP_Type == t) ? SkNEW(SkWEBPImageEncoder) : NULL;
+    return (SkImageEncoder::kWEBP_Type == t) ? new SkWEBPImageEncoder : nullptr;
 }
 
 static SkImageDecoder_DecodeReg gDReg(sk_libwebp_dfactory);
diff --git a/gfx/skia/skia/src/images/SkImageDecoder_pkm.cpp b/gfx/skia/skia/src/images/SkImageDecoder_pkm.cpp
index 738d98ec292c..71004614f518 100644
--- a/gfx/skia/skia/src/images/SkImageDecoder_pkm.cpp
+++ b/gfx/skia/skia/src/images/SkImageDecoder_pkm.cpp
@@ -10,6 +10,7 @@
 #include "SkScaledBitmapSampler.h"
 #include "SkStream.h"
 #include "SkStreamPriv.h"
+#include "SkTextureCompressor.h"
 #include "SkTypes.h"
 
 #include "etc1.h"
@@ -18,12 +19,12 @@ class SkPKMImageDecoder : public SkImageDecoder {
 public:
     SkPKMImageDecoder() { }
 
-    virtual Format getFormat() const SK_OVERRIDE {
+    Format getFormat() const override {
         return kPKM_Format;
     }
 
 protected:
-    virtual bool onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE;
+    Result onDecode(SkStream* stream, SkBitmap* bm, Mode) override;
 
 private:
     typedef SkImageDecoder INHERITED;
@@ -31,11 +32,11 @@ private:
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-bool SkPKMImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
+SkImageDecoder::Result SkPKMImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
     SkAutoMalloc autoMal;
     const size_t length = SkCopyStreamToStorage(&autoMal, stream);
     if (0 == length) {
-        return false;
+        return kFailure;
     }
 
     unsigned char* buf = (unsigned char*)autoMal.get();
@@ -46,13 +47,6 @@ bool SkPKMImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
     const unsigned short width = etc1_pkm_get_width(buf);
     const unsigned short height = etc1_pkm_get_height(buf);
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER
-    // should we allow the Chooser (if present) to pick a config for us???
-    if (!this->chooseFromOneChoice(kN32_SkColorType, width, height)) {
-        return false;
-    }
-#endif
-
     // Setup the sampler...
     SkScaledBitmapSampler sampler(width, height, this->getSampleSize());
 
@@ -60,18 +54,18 @@ bool SkPKMImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
     bm->setInfo(SkImageInfo::MakeN32(sampler.scaledWidth(), sampler.scaledHeight(),
                                      kOpaque_SkAlphaType));
     if (SkImageDecoder::kDecodeBounds_Mode == mode) {
-        return true;
+        return kSuccess;
     }
 
-    if (!this->allocPixelRef(bm, NULL)) {
-        return false;
+    if (!this->allocPixelRef(bm, nullptr)) {
+        return kFailure;
     }
 
     // Lock the pixels, since we're about to write to them...
     SkAutoLockPixels alp(*bm);
 
     if (!sampler.begin(bm, SkScaledBitmapSampler::kRGB, *this)) {
-        return false;
+        return kFailure;
     }
 
     // Advance buffer past the header
@@ -80,11 +74,12 @@ bool SkPKMImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
     // ETC1 Data is encoded as RGB pixels, so we should extract it as such
     int nPixels = width * height;
     SkAutoMalloc outRGBData(nPixels * 3);
-    etc1_byte *outRGBDataPtr = reinterpret_cast<etc1_byte *>(outRGBData.get());
+    uint8_t *outRGBDataPtr = reinterpret_cast<uint8_t *>(outRGBData.get());
 
     // Decode ETC1
-    if (etc1_decode_image(buf, outRGBDataPtr, width, height, 3, width*3)) {
-        return false;
+    if (!SkTextureCompressor::DecompressBufferFromFormat(
+            outRGBDataPtr, width*3, buf, width, height, SkTextureCompressor::kETC1_Format)) {
+        return kFailure;
     }
 
     // Set each of the pixels...
@@ -97,7 +92,7 @@ bool SkPKMImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
         srcRow += sampler.srcDY() * srcRowBytes;
     }
 
-    return true;
+    return kSuccess;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -116,9 +111,9 @@ static bool is_pkm(SkStreamRewindable* stream) {
 
 static SkImageDecoder* sk_libpkm_dfactory(SkStreamRewindable* stream) {
     if (is_pkm(stream)) {
-        return SkNEW(SkPKMImageDecoder);
+        return new SkPKMImageDecoder;
     }
-    return NULL;
+    return nullptr;
 }
 
 static SkImageDecoder_DecodeReg gReg(sk_libpkm_dfactory);
diff --git a/gfx/skia/skia/src/images/SkImageDecoder_wbmp.cpp b/gfx/skia/skia/src/images/SkImageDecoder_wbmp.cpp
index ddb7c3df0262..335966b29aab 100644
--- a/gfx/skia/skia/src/images/SkImageDecoder_wbmp.cpp
+++ b/gfx/skia/skia/src/images/SkImageDecoder_wbmp.cpp
@@ -17,12 +17,12 @@
 
 class SkWBMPImageDecoder : public SkImageDecoder {
 public:
-    virtual Format getFormat() const SK_OVERRIDE {
+    Format getFormat() const override {
         return kWBMP_Format;
     }
 
 protected:
-    virtual bool onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE;
+    Result onDecode(SkStream* stream, SkBitmap* bm, Mode) override;
 
 private:
     typedef SkImageDecoder INHERITED;
@@ -93,19 +93,19 @@ static void expand_bits_to_bytes(uint8_t dst[], const uint8_t src[], int bits)
     if (bits > 0) {
         unsigned mask = *src;
         do {
-            *dst++ = (mask >> 7) & 1;;
+            *dst++ = (mask >> 7) & 1;
             mask <<= 1;
         } while (--bits != 0);
     }
 }
 
-bool SkWBMPImageDecoder::onDecode(SkStream* stream, SkBitmap* decodedBitmap,
-                                  Mode mode)
+SkImageDecoder::Result SkWBMPImageDecoder::onDecode(SkStream* stream, SkBitmap* decodedBitmap,
+                                                    Mode mode)
 {
     wbmp_head   head;
 
     if (!head.init(stream)) {
-        return false;
+        return kFailure;
     }
 
     int width = head.fWidth;
@@ -115,15 +115,15 @@ bool SkWBMPImageDecoder::onDecode(SkStream* stream, SkBitmap* decodedBitmap,
                                              kIndex_8_SkColorType, kOpaque_SkAlphaType));
 
     if (SkImageDecoder::kDecodeBounds_Mode == mode) {
-        return true;
+        return kSuccess;
     }
 
     const SkPMColor colors[] = { SK_ColorBLACK, SK_ColorWHITE };
-    SkColorTable* ct = SkNEW_ARGS(SkColorTable, (colors, 2, kOpaque_SkAlphaType));
+    SkColorTable* ct = new SkColorTable(colors, 2);
     SkAutoUnref   aur(ct);
 
     if (!this->allocPixelRef(decodedBitmap, ct)) {
-        return false;
+        return kFailure;
     }
 
     SkAutoLockPixels alp(*decodedBitmap);
@@ -135,7 +135,7 @@ bool SkWBMPImageDecoder::onDecode(SkStream* stream, SkBitmap* decodedBitmap,
     size_t srcSize = height * srcRB;
     uint8_t* src = dst + decodedBitmap->getSize() - srcSize;
     if (stream->read(src, srcSize) != srcSize) {
-        return false;
+        return kFailure;
     }
 
     for (int y = 0; y < height; y++)
@@ -145,7 +145,7 @@ bool SkWBMPImageDecoder::onDecode(SkStream* stream, SkBitmap* decodedBitmap,
         src += srcRB;
     }
 
-    return true;
+    return kSuccess;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -156,9 +156,9 @@ static SkImageDecoder* sk_wbmp_dfactory(SkStreamRewindable* stream) {
     wbmp_head   head;
 
     if (head.init(stream)) {
-        return SkNEW(SkWBMPImageDecoder);
+        return new SkWBMPImageDecoder;
     }
-    return NULL;
+    return nullptr;
 }
 
 static SkImageDecoder::Format get_format_wbmp(SkStreamRewindable* stream) {
diff --git a/gfx/skia/skia/src/images/SkImageEncoder.cpp b/gfx/skia/skia/src/images/SkImageEncoder.cpp
index 31fdcf96042e..cc1b73baa521 100644
--- a/gfx/skia/skia/src/images/SkImageEncoder.cpp
+++ b/gfx/skia/skia/src/images/SkImageEncoder.cpp
@@ -31,7 +31,7 @@ SkData* SkImageEncoder::encodeData(const SkBitmap& bm, int quality) {
     if (this->onEncode(&stream, bm, quality)) {
         return stream.copyToData();
     }
-    return NULL;
+    return nullptr;
 }
 
 bool SkImageEncoder::EncodeFile(const char file[], const SkBitmap& bm, Type t,
@@ -48,5 +48,15 @@ bool SkImageEncoder::EncodeStream(SkWStream* stream, const SkBitmap& bm, Type t,
 
 SkData* SkImageEncoder::EncodeData(const SkBitmap& bm, Type t, int quality) {
     SkAutoTDelete<SkImageEncoder> enc(SkImageEncoder::Create(t));
-    return enc.get() ? enc.get()->encodeData(bm, quality) : NULL;
+    return enc.get() ? enc.get()->encodeData(bm, quality) : nullptr;
+}
+
+SkData* SkImageEncoder::EncodeData(const SkImageInfo& info, const void* pixels, size_t rowBytes,
+                                   Type t, int quality) {
+    SkBitmap bm;
+    if (!bm.installPixels(info, const_cast<void*>(pixels), rowBytes)) {
+        return nullptr;
+    }
+    SkAutoTDelete<SkImageEncoder> enc(SkImageEncoder::Create(t));
+    return enc.get() ? enc.get()->encodeData(bm, quality) : nullptr;
 }
diff --git a/gfx/skia/skia/src/images/SkImageEncoder_Factory.cpp b/gfx/skia/skia/src/images/SkImageEncoder_Factory.cpp
index 2931d12eae7c..8d4cc6541be0 100644
--- a/gfx/skia/skia/src/images/SkImageEncoder_Factory.cpp
+++ b/gfx/skia/skia/src/images/SkImageEncoder_Factory.cpp
@@ -11,13 +11,13 @@
 template SkImageEncoder_EncodeReg* SkImageEncoder_EncodeReg::gHead;
 
 SkImageEncoder* SkImageEncoder::Create(Type t) {
-    SkImageEncoder* codec = NULL;
+    SkImageEncoder* codec = nullptr;
     const SkImageEncoder_EncodeReg* curr = SkImageEncoder_EncodeReg::Head();
     while (curr) {
-        if ((codec = curr->factory()(t)) != NULL) {
+        if ((codec = curr->factory()(t)) != nullptr) {
             return codec;
         }
         curr = curr->next();
     }
-    return NULL;
+    return nullptr;
 }
diff --git a/gfx/skia/skia/src/images/SkImageEncoder_argb.cpp b/gfx/skia/skia/src/images/SkImageEncoder_argb.cpp
index 296491eef818..3cd038841261 100644
--- a/gfx/skia/skia/src/images/SkImageEncoder_argb.cpp
+++ b/gfx/skia/skia/src/images/SkImageEncoder_argb.cpp
@@ -13,7 +13,7 @@
 
 class SkARGBImageEncoder : public SkImageEncoder {
 protected:
-    virtual bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality) SK_OVERRIDE;
+    bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality) override;
 
 private:
     typedef SkImageEncoder INHERITED;
@@ -82,24 +82,23 @@ static ScanlineImporter ChooseImporter(SkColorType ct) {
         case kIndex_8_SkColorType:
             return Index8_To_ARGB;
         default:
-            return NULL;
+            return nullptr;
     }
 }
 
 bool SkARGBImageEncoder::onEncode(SkWStream* stream, const SkBitmap& bitmap, int) {
     const ScanlineImporter scanline_import = ChooseImporter(bitmap.colorType());
-    if (NULL == scanline_import) {
+    if (nullptr == scanline_import) {
         return false;
     }
 
     SkAutoLockPixels alp(bitmap);
     const uint8_t* src = (uint8_t*)bitmap.getPixels();
-    if (NULL == bitmap.getPixels()) {
+    if (nullptr == bitmap.getPixels()) {
         return false;
     }
 
-    SkAutoLockColors ctLocker;
-    const SkPMColor* colors = ctLocker.lockColors(bitmap);
+    const SkPMColor* colors = bitmap.getColorTable() ? bitmap.getColorTable()->readColors() : nullptr;
 
     const int argbStride = bitmap.width() * 4;
     SkAutoTDeleteArray<uint8_t> ada(new uint8_t[argbStride]);
diff --git a/gfx/skia/skia/src/images/SkJpegUtility.cpp b/gfx/skia/skia/src/images/SkJpegUtility.cpp
index e17b55b31ec2..f1a32cae1007 100644
--- a/gfx/skia/skia/src/images/SkJpegUtility.cpp
+++ b/gfx/skia/skia/src/images/SkJpegUtility.cpp
@@ -13,7 +13,7 @@ static void sk_init_source(j_decompress_ptr cinfo) {
     skjpeg_source_mgr*  src = (skjpeg_source_mgr*)cinfo->src;
     src->next_input_byte = (const JOCTET*)src->fBuffer;
     src->bytes_in_buffer = 0;
-#ifdef SK_BUILD_FOR_ANDROID
+#ifdef SK_JPEG_INDEX_SUPPORTED
     src->current_offset = 0;
 #endif
     if (!src->fStream->rewind()) {
@@ -22,7 +22,7 @@ static void sk_init_source(j_decompress_ptr cinfo) {
     }
 }
 
-#ifdef SK_BUILD_FOR_ANDROID
+#ifdef SK_JPEG_INDEX_SUPPORTED
 static boolean sk_seek_input_data(j_decompress_ptr cinfo, long byte_offset) {
     skjpeg_source_mgr* src = (skjpeg_source_mgr*)cinfo->src;
     size_t bo = (size_t) byte_offset;
@@ -47,7 +47,7 @@ static boolean sk_seek_input_data(j_decompress_ptr cinfo, long byte_offset) {
 
 static boolean sk_fill_input_buffer(j_decompress_ptr cinfo) {
     skjpeg_source_mgr* src = (skjpeg_source_mgr*)cinfo->src;
-    if (src->fDecoder != NULL && src->fDecoder->shouldCancelDecode()) {
+    if (src->fDecoder != nullptr && src->fDecoder->shouldCancelDecode()) {
         return FALSE;
     }
     size_t bytes = src->fStream->read(src->fBuffer, skjpeg_source_mgr::kBufferSize);
@@ -57,7 +57,7 @@ static boolean sk_fill_input_buffer(j_decompress_ptr cinfo) {
         return FALSE;
     }
 
-#ifdef SK_BUILD_FOR_ANDROID
+#ifdef SK_JPEG_INDEX_SUPPORTED
     src->current_offset += bytes;
 #endif
     src->next_input_byte = (const JOCTET*)src->fBuffer;
@@ -77,7 +77,7 @@ static void sk_skip_input_data(j_decompress_ptr cinfo, long num_bytes) {
                 cinfo->err->error_exit((j_common_ptr)cinfo);
                 return;
             }
-#ifdef SK_BUILD_FOR_ANDROID
+#ifdef SK_JPEG_INDEX_SUPPORTED
             src->current_offset += bytes;
 #endif
             bytesToSkip -= bytes;
@@ -96,7 +96,7 @@ static void sk_term_source(j_decompress_ptr /*cinfo*/) {}
 ///////////////////////////////////////////////////////////////////////////////
 
 skjpeg_source_mgr::skjpeg_source_mgr(SkStream* stream, SkImageDecoder* decoder)
-    : fStream(SkRef(stream))
+    : fStream(stream)
     , fDecoder(decoder) {
 
     init_source = sk_init_source;
@@ -104,16 +104,12 @@ skjpeg_source_mgr::skjpeg_source_mgr(SkStream* stream, SkImageDecoder* decoder)
     skip_input_data = sk_skip_input_data;
     resync_to_restart = jpeg_resync_to_restart;
     term_source = sk_term_source;
-#ifdef SK_BUILD_FOR_ANDROID
+#ifdef SK_JPEG_INDEX_SUPPORTED
     seek_input_data = sk_seek_input_data;
 #endif
 //    SkDebugf("**************** use memorybase %p %d\n", fMemoryBase, fMemoryBaseSize);
 }
 
-skjpeg_source_mgr::~skjpeg_source_mgr() {
-    SkSafeUnref(fStream);
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
 static void sk_init_destination(j_compress_ptr cinfo) {
diff --git a/gfx/skia/skia/src/images/SkJpegUtility.h b/gfx/skia/skia/src/images/SkJpegUtility.h
index 69092ef1c381..1a763f843c74 100644
--- a/gfx/skia/skia/src/images/SkJpegUtility.h
+++ b/gfx/skia/skia/src/images/SkJpegUtility.h
@@ -35,9 +35,8 @@ void skjpeg_error_exit(j_common_ptr cinfo);
 */
 struct skjpeg_source_mgr : jpeg_source_mgr {
     skjpeg_source_mgr(SkStream* stream, SkImageDecoder* decoder);
-    ~skjpeg_source_mgr();
 
-    // fStream is ref'ed and unref'ed
+    // Unowned.
     SkStream*       fStream;
     // Unowned pointer to the decoder, used to check if the decoding process
     // has been cancelled.
diff --git a/gfx/skia/skia/src/images/SkMovie.cpp b/gfx/skia/skia/src/images/SkMovie.cpp
index 9a2a71cd57c5..9749011a815d 100644
--- a/gfx/skia/skia/src/images/SkMovie.cpp
+++ b/gfx/skia/skia/src/images/SkMovie.cpp
@@ -90,6 +90,6 @@ SkMovie* SkMovie::DecodeMemory(const void* data, size_t length) {
 }
 
 SkMovie* SkMovie::DecodeFile(const char path[]) {
-    SkAutoTUnref<SkStreamRewindable> stream(SkStream::NewFromFile(path));
-    return stream.get() ? SkMovie::DecodeStream(stream) : NULL;
+    SkAutoTDelete<SkStreamRewindable> stream(SkStream::NewFromFile(path));
+    return stream.get() ? SkMovie::DecodeStream(stream) : nullptr;
 }
diff --git a/gfx/skia/skia/src/images/SkMovie_gif.cpp b/gfx/skia/skia/src/images/SkMovie_gif.cpp
index decefd5acc54..103107961bb9 100644
--- a/gfx/skia/skia/src/images/SkMovie_gif.cpp
+++ b/gfx/skia/skia/src/images/SkMovie_gif.cpp
@@ -16,6 +16,10 @@
 
 #include "gif_lib.h"
 
+#if GIFLIB_MAJOR < 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR == 0)
+#define DGifCloseFile(a, b) DGifCloseFile(a)
+#endif
+
 class SkGIFMovie : public SkMovie {
 public:
     SkGIFMovie(SkStream* stream);
@@ -31,6 +35,7 @@ private:
     int fCurrIndex;
     int fLastDrawIndex;
     SkBitmap fBackup;
+    SkColor fPaintingColor;
 };
 
 static int Decode(GifFileType* fileType, GifByteType* out, int size) {
@@ -43,24 +48,25 @@ SkGIFMovie::SkGIFMovie(SkStream* stream)
 #if GIFLIB_MAJOR < 5
     fGIF = DGifOpen( stream, Decode );
 #else
-    fGIF = DGifOpen( stream, Decode, NULL );
+    fGIF = DGifOpen( stream, Decode, nullptr );
 #endif
-    if (NULL == fGIF)
+    if (nullptr == fGIF)
         return;
 
     if (DGifSlurp(fGIF) != GIF_OK)
     {
-        DGifCloseFile(fGIF);
-        fGIF = NULL;
+        DGifCloseFile(fGIF, nullptr);
+        fGIF = nullptr;
     }
     fCurrIndex = -1;
     fLastDrawIndex = -1;
+    fPaintingColor = SkPackARGB32(0, 0, 0, 0);
 }
 
 SkGIFMovie::~SkGIFMovie()
 {
     if (fGIF)
-        DGifCloseFile(fGIF);
+        DGifCloseFile(fGIF, nullptr);
 }
 
 static SkMSec savedimage_duration(const SavedImage* image)
@@ -79,7 +85,7 @@ static SkMSec savedimage_duration(const SavedImage* image)
 
 bool SkGIFMovie::onGetInfo(Info* info)
 {
-    if (NULL == fGIF)
+    if (nullptr == fGIF)
         return false;
 
     SkMSec dur = 0;
@@ -95,7 +101,7 @@ bool SkGIFMovie::onGetInfo(Info* info)
 
 bool SkGIFMovie::onSetTime(SkMSec time)
 {
-    if (NULL == fGIF)
+    if (nullptr == fGIF)
         return false;
 
     SkMSec dur = 0;
@@ -233,12 +239,12 @@ static void drawFrame(SkBitmap* bm, const SavedImage* frame, const ColorMapObjec
         }
     }
 
-    if (frame->ImageDesc.ColorMap != NULL) {
+    if (frame->ImageDesc.ColorMap != nullptr) {
         // use local color table
         cmap = frame->ImageDesc.ColorMap;
     }
 
-    if (cmap == NULL || cmap->ColorCount != (1 << cmap->BitsPerPixel)) {
+    if (cmap == nullptr || cmap->ColorCount != (1 << cmap->BitsPerPixel)) {
         SkDEBUGFAIL("bad colortable setup");
         return;
     }
@@ -339,7 +345,7 @@ static void disposeFrameIfNeeded(SkBitmap* bm, const SavedImage* cur, const Save
 bool SkGIFMovie::onGetBitmap(SkBitmap* bm)
 {
     const GifFileType* gif = fGIF;
-    if (NULL == gif)
+    if (nullptr == gif)
         return false;
 
     if (gif->ImageCount < 1) {
@@ -364,11 +370,11 @@ bool SkGIFMovie::onGetBitmap(SkBitmap* bm)
         startIndex = 0;
 
         // create bitmap
-        if (!bm->allocPixels(SkImageInfo::MakeN32Premul(width, height))) {
+        if (!bm->tryAllocN32Pixels(width, height)) {
             return false;
         }
         // create bitmap for backup
-        if (!fBackup.allocPixels(SkImageInfo::MakeN32Premul(width, height))) {
+        if (!fBackup.tryAllocN32Pixels(width, height)) {
             return false;
         }
     } else if (startIndex > fCurrIndex) {
@@ -386,12 +392,11 @@ bool SkGIFMovie::onGetBitmap(SkBitmap* bm)
     }
 
     SkColor bgColor = SkPackARGB32(0, 0, 0, 0);
-    if (gif->SColorMap != NULL) {
+    if (gif->SColorMap != nullptr) {
         const GifColorType& col = gif->SColorMap->Colors[fGIF->SBackGroundColor];
         bgColor = SkColorSetARGB(0xFF, col.Red, col.Green, col.Blue);
     }
 
-    static SkColor paintingColor = SkPackARGB32(0, 0, 0, 0);
     // draw each frames - not intelligent way
     for (int i = startIndex; i <= lastIndex; i++) {
         const SavedImage* cur = &fGIF->SavedImages[i];
@@ -399,18 +404,18 @@ bool SkGIFMovie::onGetBitmap(SkBitmap* bm)
             bool trans;
             int disposal;
             getTransparencyAndDisposalMethod(cur, &trans, &disposal);
-            if (!trans && gif->SColorMap != NULL) {
-                paintingColor = bgColor;
+            if (!trans && gif->SColorMap != nullptr) {
+                fPaintingColor = bgColor;
             } else {
-                paintingColor = SkColorSetARGB(0, 0, 0, 0);
+                fPaintingColor = SkColorSetARGB(0, 0, 0, 0);
             }
 
-            bm->eraseColor(paintingColor);
-            fBackup.eraseColor(paintingColor);
+            bm->eraseColor(fPaintingColor);
+            fBackup.eraseColor(fPaintingColor);
         } else {
             // Dispose previous frame before move to next frame.
             const SavedImage* prev = &fGIF->SavedImages[i-1];
-            disposeFrameIfNeeded(bm, prev, cur, &fBackup, paintingColor);
+            disposeFrameIfNeeded(bm, prev, cur, &fBackup, fPaintingColor);
         }
 
         // Draw frame
@@ -438,10 +443,10 @@ SkMovie* Factory(SkStreamRewindable* stream) {
                 memcmp(GIF89_STAMP, buf, GIF_STAMP_LEN) == 0) {
             // must rewind here, since our construct wants to re-read the data
             stream->rewind();
-            return SkNEW_ARGS(SkGIFMovie, (stream));
+            return new SkGIFMovie(stream);
         }
     }
-    return NULL;
+    return nullptr;
 }
 
 static SkTRegistry<SkMovie*(*)(SkStreamRewindable*)> gReg(Factory);
diff --git a/gfx/skia/skia/src/images/SkScaledBitmapSampler.cpp b/gfx/skia/skia/src/images/SkScaledBitmapSampler.cpp
index d78502d2bbd6..5ffd64889396 100644
--- a/gfx/skia/skia/src/images/SkScaledBitmapSampler.cpp
+++ b/gfx/skia/skia/src/images/SkScaledBitmapSampler.cpp
@@ -343,7 +343,7 @@ static SkScaledBitmapSampler::RowProc
 get_RGBA_to_4444_proc(const SkScaledBitmapSampler::Options& opts) {
     if (!opts.fPremultiplyAlpha) {
         // Unpremultiplied is not supported for 4444
-        return NULL;
+        return nullptr;
     }
     if (opts.fSkipZeros) {
         if (opts.fDither) {
@@ -396,10 +396,9 @@ static bool Sample_Index_D8888_SkipZ(void* SK_RESTRICT dstRow,
 
 static SkScaledBitmapSampler::RowProc
 get_index_to_8888_proc(const SkScaledBitmapSampler::Options& opts) {
-    if (!opts.fPremultiplyAlpha) {
-        // Unpremultiplied is not supported for an index source.
-        return NULL;
-    }
+    // The caller is expected to have created the source colortable
+    // properly with respect to opts.fPremultiplyAlpha, so premul makes
+    // no difference here.
     // Dither makes no difference
     if (opts.fSkipZeros) {
         return Sample_Index_D8888_SkipZ;
@@ -516,7 +515,7 @@ static SkScaledBitmapSampler::RowProc
 get_index_to_4444_proc(const SkScaledBitmapSampler::Options& opts) {
     // Unpremul not allowed
     if (!opts.fPremultiplyAlpha) {
-        return NULL;
+        return nullptr;
     }
     if (opts.fSkipZeros) {
         if (opts.fDither) {
@@ -549,7 +548,7 @@ static SkScaledBitmapSampler::RowProc
 get_index_to_index_proc(const SkScaledBitmapSampler::Options& opts) {
     // Unpremul not allowed
     if (!opts.fPremultiplyAlpha) {
-        return NULL;
+        return nullptr;
     }
     // Ignore dither and skip zeroes
     return Sample_Index_DI;
@@ -564,14 +563,14 @@ static bool Sample_Gray_DA8(void* SK_RESTRICT dstRow,
     // except we assume that there is alpha for speed, since an A8
     // bitmap with no alpha is not interesting.
     (void) Sample_Index_DI(dstRow, src, width, deltaSrc, /* y unused */ 0,
-                           /* ctable unused */ NULL);
+                           /* ctable unused */ nullptr);
     return true;
 }
 
 static SkScaledBitmapSampler::RowProc
 get_gray_to_A8_proc(const SkScaledBitmapSampler::Options& opts) {
     if (!opts.fPremultiplyAlpha) {
-        return NULL;
+        return nullptr;
     }
     // Ignore skip and dither.
     return Sample_Gray_DA8;
@@ -584,9 +583,9 @@ typedef SkScaledBitmapSampler::RowProc (*RowProcChooser)(const SkScaledBitmapSam
 
 SkScaledBitmapSampler::SkScaledBitmapSampler(int width, int height,
                                              int sampleSize) {
-    fCTable = NULL;
-    fDstRow = NULL;
-    fRowProc = NULL;
+    fCTable = nullptr;
+    fDstRow = nullptr;
+    fRowProc = nullptr;
 
     if (width <= 0 || height <= 0) {
         sk_throw();
@@ -632,7 +631,7 @@ bool SkScaledBitmapSampler::begin(SkBitmap* dst, SrcConfig sc,
         get_RGBx_to_8888_proc,
         get_RGBA_to_8888_proc,
         get_index_to_8888_proc,
-        NULL, // 565 to 8888
+        nullptr, // 565 to 8888
 
         get_gray_to_565_proc,
         get_RGBx_to_565_proc,
@@ -644,25 +643,25 @@ bool SkScaledBitmapSampler::begin(SkBitmap* dst, SrcConfig sc,
         get_RGBx_to_4444_proc,
         get_RGBA_to_4444_proc,
         get_index_to_4444_proc,
-        NULL, // 565 to 4444
+        nullptr, // 565 to 4444
 
-        NULL, // gray to index
-        NULL, // rgbx to index
-        NULL, // rgba to index
+        nullptr, // gray to index
+        nullptr, // rgbx to index
+        nullptr, // rgba to index
         get_index_to_index_proc,
-        NULL, // 565 to index
+        nullptr, // 565 to index
 
         get_gray_to_A8_proc,
-        NULL, // rgbx to a8
-        NULL, // rgba to a8
-        NULL, // index to a8
-        NULL, // 565 to a8
+        nullptr, // rgbx to a8
+        nullptr, // rgba to a8
+        nullptr, // index to a8
+        nullptr, // 565 to a8
     };
 
     // The jump between dst configs in the table
     static const int gProcDstConfigSpan = 5;
-    SK_COMPILE_ASSERT(SK_ARRAY_COUNT(gProcChoosers) == 5 * gProcDstConfigSpan,
-                      gProcs_has_the_wrong_number_of_entries);
+    static_assert(SK_ARRAY_COUNT(gProcChoosers) == 5 * gProcDstConfigSpan,
+                  "gProcs_has_the_wrong_number_of_entries");
 
     fCTable = ctable;
 
@@ -717,15 +716,15 @@ bool SkScaledBitmapSampler::begin(SkBitmap* dst, SrcConfig sc,
     }
 
     RowProcChooser chooser = gProcChoosers[index];
-    if (NULL == chooser) {
-        fRowProc = NULL;
+    if (nullptr == chooser) {
+        fRowProc = nullptr;
     } else {
         fRowProc = chooser(opts);
     }
     fDstRow = (char*)dst->getPixels();
     fDstRowBytes = dst->rowBytes();
     fCurrY = 0;
-    return fRowProc != NULL;
+    return fRowProc != nullptr;
 }
 
 bool SkScaledBitmapSampler::begin(SkBitmap* dst, SrcConfig sc,
@@ -763,7 +762,9 @@ bool SkScaledBitmapSampler::sampleInterlaced(const uint8_t* SK_RESTRICT src, int
     // of the destination bitmap's pixels, which is used to calculate the destination row
     // each time this function is called.
     const int dstY = srcYMinusY0 / fDY;
-    SkASSERT(dstY < fScaledHeight);
+    if (dstY >= fScaledHeight) {
+        return false;
+    }
     char* dstRow = fDstRow + dstY * fDstRowBytes;
     return fRowProc(dstRow, src + fX0 * fSrcPixelSize, fScaledWidth,
                     fDX * fSrcPixelSize, dstY, fCTable);
@@ -793,41 +794,41 @@ public:
 //  ~D~U                D~U                     ~DU                         DU
 SkScaledBitmapSampler::RowProc gTestProcs[] = {
     // Gray
-    Sample_Gray_DA8,    Sample_Gray_DA8,        NULL,                       NULL,                       // to A8
-    NULL,               NULL,                   NULL,                       NULL,                       // to Index8
+    Sample_Gray_DA8,    Sample_Gray_DA8,        nullptr,                       nullptr,                       // to A8
+    nullptr,               nullptr,                   nullptr,                       nullptr,                       // to Index8
     Sample_Gray_D565,   Sample_Gray_D565_D,     Sample_Gray_D565,           Sample_Gray_D565_D,         // to 565
     Sample_Gray_D4444,  Sample_Gray_D4444_D,    Sample_Gray_D4444,          Sample_Gray_D4444_D,        // to 4444
     Sample_Gray_D8888,  Sample_Gray_D8888,      Sample_Gray_D8888,          Sample_Gray_D8888,          // to 8888
     // Index
-    NULL,               NULL,                   NULL,                       NULL,                       // to A8
-    Sample_Index_DI,    Sample_Index_DI,        NULL,                       NULL,                       // to Index8
+    nullptr,               nullptr,                   nullptr,                       nullptr,                       // to A8
+    Sample_Index_DI,    Sample_Index_DI,        nullptr,                       nullptr,                       // to Index8
     Sample_Index_D565,  Sample_Index_D565_D,    Sample_Index_D565,          Sample_Index_D565_D,        // to 565
-    Sample_Index_D4444, Sample_Index_D4444_D,   NULL,                       NULL,                       // to 4444
-    Sample_Index_D8888, Sample_Index_D8888,     NULL,                       NULL,                       // to 8888
+    Sample_Index_D4444, Sample_Index_D4444_D,   nullptr,                       nullptr,                       // to 4444
+    Sample_Index_D8888, Sample_Index_D8888,     Sample_Index_D8888,         Sample_Index_D8888,         // to 8888
     // RGB
-    NULL,               NULL,                   NULL,                       NULL,                       // to A8
-    NULL,               NULL,                   NULL,                       NULL,                       // to Index8
+    nullptr,               nullptr,                   nullptr,                       nullptr,                       // to A8
+    nullptr,               nullptr,                   nullptr,                       nullptr,                       // to Index8
     Sample_RGBx_D565,   Sample_RGBx_D565_D,     Sample_RGBx_D565,           Sample_RGBx_D565_D,         // to 565
     Sample_RGBx_D4444,  Sample_RGBx_D4444_D,    Sample_RGBx_D4444,          Sample_RGBx_D4444_D,        // to 4444
     Sample_RGBx_D8888,  Sample_RGBx_D8888,      Sample_RGBx_D8888,          Sample_RGBx_D8888,          // to 8888
     // RGBx is the same as RGB
-    NULL,               NULL,                   NULL,                       NULL,                       // to A8
-    NULL,               NULL,                   NULL,                       NULL,                       // to Index8
+    nullptr,               nullptr,                   nullptr,                       nullptr,                       // to A8
+    nullptr,               nullptr,                   nullptr,                       nullptr,                       // to Index8
     Sample_RGBx_D565,   Sample_RGBx_D565_D,     Sample_RGBx_D565,           Sample_RGBx_D565_D,         // to 565
     Sample_RGBx_D4444,  Sample_RGBx_D4444_D,    Sample_RGBx_D4444,          Sample_RGBx_D4444_D,        // to 4444
     Sample_RGBx_D8888,  Sample_RGBx_D8888,      Sample_RGBx_D8888,          Sample_RGBx_D8888,          // to 8888
     // RGBA
-    NULL,               NULL,                   NULL,                       NULL,                       // to A8
-    NULL,               NULL,                   NULL,                       NULL,                       // to Index8
+    nullptr,               nullptr,                   nullptr,                       nullptr,                       // to A8
+    nullptr,               nullptr,                   nullptr,                       nullptr,                       // to Index8
     Sample_RGBx_D565,   Sample_RGBx_D565_D,     Sample_RGBx_D565,           Sample_RGBx_D565_D,         // to 565
-    Sample_RGBA_D4444,  Sample_RGBA_D4444_D,    NULL,                       NULL,                       // to 4444
+    Sample_RGBA_D4444,  Sample_RGBA_D4444_D,    nullptr,                       nullptr,                       // to 4444
     Sample_RGBA_D8888,  Sample_RGBA_D8888,      Sample_RGBA_D8888_Unpremul, Sample_RGBA_D8888_Unpremul, // to 8888
     // RGB_565
-    NULL,               NULL,                   NULL,                       NULL,                       // to A8
-    NULL,               NULL,                   NULL,                       NULL,                       // to Index8
+    nullptr,               nullptr,                   nullptr,                       nullptr,                       // to A8
+    nullptr,               nullptr,                   nullptr,                       nullptr,                       // to Index8
     Sample_D565_D565,   Sample_D565_D565,       Sample_D565_D565,           Sample_D565_D565,           // to 565
-    NULL,               NULL,                   NULL,                       NULL,                       // to 4444
-    NULL,               NULL,                   NULL,                       NULL,                       // to 8888
+    nullptr,               nullptr,                   nullptr,                       nullptr,                       // to 4444
+    nullptr,               nullptr,                   nullptr,                       nullptr,                       // to 8888
 };
 
 // Dummy class that allows instantiation of an ImageDecoder, so begin can query its fields.
@@ -835,8 +836,8 @@ class DummyDecoder : public SkImageDecoder {
 public:
     DummyDecoder() {}
 protected:
-    virtual bool onDecode(SkStream*, SkBitmap*, SkImageDecoder::Mode) SK_OVERRIDE {
-        return false;
+    Result onDecode(SkStream*, SkBitmap*, SkImageDecoder::Mode) override {
+        return kFailure;
     }
 };
 
diff --git a/gfx/skia/skia/src/images/SkScaledBitmapSampler.h b/gfx/skia/skia/src/images/SkScaledBitmapSampler.h
index 90c4142bdfb4..198dc07572c0 100644
--- a/gfx/skia/skia/src/images/SkScaledBitmapSampler.h
+++ b/gfx/skia/skia/src/images/SkScaledBitmapSampler.h
@@ -49,9 +49,9 @@ public:
     // prepares iterator to process the src colors and write them into dst.
     // Returns false if the request cannot be fulfulled.
     bool begin(SkBitmap* dst, SrcConfig sc, const SkImageDecoder& decoder,
-               const SkPMColor* = NULL);
+               const SkPMColor* = nullptr);
     bool begin(SkBitmap* dst, SrcConfig sc, const Options& opts,
-               const SkPMColor* = NULL);
+               const SkPMColor* = nullptr);
     // call with row of src pixels, for y = 0...scaledHeight-1.
     // returns true if the row had non-opaque alpha in it
     bool next(const uint8_t* SK_RESTRICT src);
diff --git a/gfx/skia/skia/src/images/bmpdecoderhelper.cpp b/gfx/skia/skia/src/images/bmpdecoderhelper.cpp
index 5a1b39ac90d3..9171b5d52784 100644
--- a/gfx/skia/skia/src/images/bmpdecoderhelper.cpp
+++ b/gfx/skia/skia/src/images/bmpdecoderhelper.cpp
@@ -163,7 +163,7 @@ bool BmpDecoderHelper::DecodeImage(const char* p,
   }
 
   output_ = callback->SetSize(width_, height_);
-  if (NULL == output_) {
+  if (nullptr == output_) {
     return true;  // meaning we succeeded, but they want us to stop now
   }
 
diff --git a/gfx/skia/skia/src/images/bmpdecoderhelper.h b/gfx/skia/skia/src/images/bmpdecoderhelper.h
index a0116de83374..b448734bbc6a 100644
--- a/gfx/skia/skia/src/images/bmpdecoderhelper.h
+++ b/gfx/skia/skia/src/images/bmpdecoderhelper.h
@@ -57,7 +57,7 @@ class BmpDecoderCallback {
   /**
    * This is called once for an image. It is passed the width and height and
    * should return the address of a buffer that is large enough to store
-   * all of the resulting pixels (widht * height * 3 bytes). If it returns NULL,
+   * all of the resulting pixels (widht * height * 3 bytes). If it returns nullptr,
    * then the decoder will abort, but return true, as the caller has received
    * valid dimensions.
    */
diff --git a/gfx/skia/skia/src/lazy/SkCachingPixelRef.cpp b/gfx/skia/skia/src/lazy/SkCachingPixelRef.cpp
deleted file mode 100644
index 97503e5fcc57..000000000000
--- a/gfx/skia/skia/src/lazy/SkCachingPixelRef.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkCachingPixelRef.h"
-#include "SkScaledImageCache.h"
-
-bool SkCachingPixelRef::Install(SkImageGenerator* generator,
-                                SkBitmap* dst) {
-    SkImageInfo info;
-    SkASSERT(dst != NULL);
-    if ((NULL == generator)
-        || !(generator->getInfo(&info))
-        || !dst->setInfo(info)) {
-        SkDELETE(generator);
-        return false;
-    }
-    SkAutoTUnref<SkCachingPixelRef> ref(SkNEW_ARGS(SkCachingPixelRef,
-                                           (info, generator, dst->rowBytes())));
-    dst->setPixelRef(ref);
-    return true;
-}
-
-SkCachingPixelRef::SkCachingPixelRef(const SkImageInfo& info,
-                                     SkImageGenerator* generator,
-                                     size_t rowBytes)
-    : INHERITED(info)
-    , fImageGenerator(generator)
-    , fErrorInDecoding(false)
-    , fScaledCacheId(NULL)
-    , fRowBytes(rowBytes) {
-    SkASSERT(fImageGenerator != NULL);
-}
-SkCachingPixelRef::~SkCachingPixelRef() {
-    SkDELETE(fImageGenerator);
-    SkASSERT(NULL == fScaledCacheId);
-    // Assert always unlock before unref.
-}
-
-bool SkCachingPixelRef::onNewLockPixels(LockRec* rec) {
-    if (fErrorInDecoding) {
-        return false;  // don't try again.
-    }
-
-    const SkImageInfo& info = this->info();
-    SkBitmap bitmap;
-    SkASSERT(NULL == fScaledCacheId);
-    fScaledCacheId = SkScaledImageCache::FindAndLock(this->getGenerationID(),
-                                                     info.fWidth,
-                                                     info.fHeight,
-                                                     &bitmap);
-    if (NULL == fScaledCacheId) {
-        // Cache has been purged, must re-decode.
-        if (!bitmap.allocPixels(info, fRowBytes)) {
-            fErrorInDecoding = true;
-            return false;
-        }
-        SkAutoLockPixels autoLockPixels(bitmap);
-        if (!fImageGenerator->getPixels(info, bitmap.getPixels(), fRowBytes)) {
-            fErrorInDecoding = true;
-            return false;
-        }
-        fScaledCacheId = SkScaledImageCache::AddAndLock(this->getGenerationID(),
-                                                        info.fWidth,
-                                                        info.fHeight,
-                                                        bitmap);
-        SkASSERT(fScaledCacheId != NULL);
-    }
-
-    // Now bitmap should contain a concrete PixelRef of the decoded
-    // image.
-    SkAutoLockPixels autoLockPixels(bitmap);
-    void* pixels = bitmap.getPixels();
-    SkASSERT(pixels != NULL);
-
-    // At this point, the autoLockPixels will unlockPixels()
-    // to remove bitmap's lock on the pixels.  We will then
-    // destroy bitmap.  The *only* guarantee that this pointer
-    // remains valid is the guarantee made by
-    // SkScaledImageCache that it will not destroy the *other*
-    // bitmap (SkScaledImageCache::Rec.fBitmap) that holds a
-    // reference to the concrete PixelRef while this record is
-    // locked.
-    rec->fPixels = pixels;
-    rec->fColorTable = NULL;
-    rec->fRowBytes = bitmap.rowBytes();
-    return true;
-}
-
-void SkCachingPixelRef::onUnlockPixels() {
-    SkASSERT(fScaledCacheId != NULL);
-    SkScaledImageCache::Unlock( static_cast<SkScaledImageCache::ID*>(fScaledCacheId));
-    fScaledCacheId = NULL;
-}
diff --git a/gfx/skia/skia/src/lazy/SkCachingPixelRef.h b/gfx/skia/skia/src/lazy/SkCachingPixelRef.h
deleted file mode 100644
index 1e87874f74dd..000000000000
--- a/gfx/skia/skia/src/lazy/SkCachingPixelRef.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkCachingPixelRef_DEFINED
-#define SkCachingPixelRef_DEFINED
-
-#include "SkImageInfo.h"
-#include "SkImageGenerator.h"
-#include "SkPixelRef.h"
-
-class SkColorTable;
-
-/**
- *  PixelRef which defers decoding until SkBitmap::lockPixels() is
- *  called.  Caches the decoded images in the global
- *  SkScaledImageCache.  When the pixels are unlocked, this cache may
- *  or be destroyed before the next lock.  If so, onLockPixels will
- *  attempt to re-decode.
- *
- *  Decoding is handled by the SkImageGenerator
- */
-class SkCachingPixelRef : public SkPixelRef {
-public:
-    SK_DECLARE_INST_COUNT(SkCachingPixelRef)
-    /**
-     *  Takes ownership of SkImageGenerator.  If this method fails for
-     *  whatever reason, it will return false and immediatetely delete
-     *  the generator.  If it succeeds, it will modify destination
-     *  bitmap.
-     *
-     *  If Install fails or when the SkCachingPixelRef that is
-     *  installed into destination is destroyed, it will call
-     *  SkDELETE() on the generator.  Therefore, generator should be
-     *  allocated with SkNEW() or SkNEW_ARGS().
-     */
-    static bool Install(SkImageGenerator* gen, SkBitmap* dst);
-
-protected:
-    virtual ~SkCachingPixelRef();
-    virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE;
-    virtual void onUnlockPixels() SK_OVERRIDE;
-    virtual bool onLockPixelsAreWritable() const SK_OVERRIDE { return false; }
-
-    virtual SkData* onRefEncodedData() SK_OVERRIDE {
-        return fImageGenerator->refEncodedData();
-    }
-
-private:
-    SkImageGenerator* const fImageGenerator;
-    bool                    fErrorInDecoding;
-    void*                   fScaledCacheId;
-    const size_t            fRowBytes;
-
-    SkCachingPixelRef(const SkImageInfo&, SkImageGenerator*, size_t rowBytes);
-
-    typedef SkPixelRef INHERITED;
-};
-
-#endif  // SkCachingPixelRef_DEFINED
diff --git a/gfx/skia/skia/src/lazy/SkDiscardableMemoryPool.cpp b/gfx/skia/skia/src/lazy/SkDiscardableMemoryPool.cpp
index a02f73c93829..1f3bcf93e92b 100644
--- a/gfx/skia/skia/src/lazy/SkDiscardableMemoryPool.cpp
+++ b/gfx/skia/skia/src/lazy/SkDiscardableMemoryPool.cpp
@@ -8,9 +8,9 @@
 #include "SkDiscardableMemory.h"
 #include "SkDiscardableMemoryPool.h"
 #include "SkImageGenerator.h"
-#include "SkLazyPtr.h"
+#include "SkMutex.h"
+#include "SkOncePtr.h"
 #include "SkTInternalLList.h"
-#include "SkThread.h"
 
 // Note:
 // A PoolDiscardableMemory is memory that is counted in a pool.
@@ -29,22 +29,22 @@ public:
     /**
      *  Without mutex, will be not be thread safe.
      */
-    DiscardableMemoryPool(size_t budget, SkBaseMutex* mutex = NULL);
+    DiscardableMemoryPool(size_t budget, SkBaseMutex* mutex = nullptr);
     virtual ~DiscardableMemoryPool();
 
-    virtual SkDiscardableMemory* create(size_t bytes) SK_OVERRIDE;
+    SkDiscardableMemory* create(size_t bytes) override;
 
-    virtual size_t getRAMUsed() SK_OVERRIDE;
-    virtual void setRAMBudget(size_t budget) SK_OVERRIDE;
-    virtual size_t getRAMBudget() SK_OVERRIDE { return fBudget; }
+    size_t getRAMUsed() override;
+    void setRAMBudget(size_t budget) override;
+    size_t getRAMBudget() override { return fBudget; }
 
     /** purges all unlocked DMs */
-    virtual void dumpPool() SK_OVERRIDE;
+    void dumpPool() override;
 
     #if SK_LAZY_CACHE_STATS  // Defined in SkDiscardableMemoryPool.h
-    virtual int getCacheHits() SK_OVERRIDE { return fCacheHits; }
-    virtual int getCacheMisses() SK_OVERRIDE { return fCacheMisses; }
-    virtual void resetCacheHitsAndMisses() SK_OVERRIDE {
+    int getCacheHits() override { return fCacheHits; }
+    int getCacheMisses() override { return fCacheMisses; }
+    void resetCacheHitsAndMisses() override {
         fCacheHits = fCacheMisses = 0;
     }
     int          fCacheHits;
@@ -80,9 +80,9 @@ public:
     PoolDiscardableMemory(DiscardableMemoryPool* pool,
                             void* pointer, size_t bytes);
     virtual ~PoolDiscardableMemory();
-    virtual bool lock() SK_OVERRIDE;
-    virtual void* data() SK_OVERRIDE;
-    virtual void unlock() SK_OVERRIDE;
+    bool lock() override;
+    void* data() override;
+    void unlock() override;
     friend class DiscardableMemoryPool;
 private:
     SK_DECLARE_INTERNAL_LLIST_INTERFACE(PoolDiscardableMemory);
@@ -99,8 +99,8 @@ PoolDiscardableMemory::PoolDiscardableMemory(DiscardableMemoryPool* pool,
     , fLocked(true)
     , fPointer(pointer)
     , fBytes(bytes) {
-    SkASSERT(fPool != NULL);
-    SkASSERT(fPointer != NULL);
+    SkASSERT(fPool != nullptr);
+    SkASSERT(fPointer != nullptr);
     SkASSERT(fBytes > 0);
     fPool->ref();
 }
@@ -146,7 +146,7 @@ DiscardableMemoryPool::~DiscardableMemoryPool() {
 }
 
 void DiscardableMemoryPool::dumpDownTo(size_t budget) {
-    if (fMutex != NULL) {
+    if (fMutex != nullptr) {
         fMutex->assertHeld();
     }
     if (fUsed <= budget) {
@@ -155,12 +155,12 @@ void DiscardableMemoryPool::dumpDownTo(size_t budget) {
     typedef SkTInternalLList<PoolDiscardableMemory>::Iter Iter;
     Iter iter;
     PoolDiscardableMemory* cur = iter.init(fList, Iter::kTail_IterStart);
-    while ((fUsed > budget) && (NULL != cur)) {
+    while ((fUsed > budget) && (cur)) {
         if (!cur->fLocked) {
             PoolDiscardableMemory* dm = cur;
-            SkASSERT(dm->fPointer != NULL);
+            SkASSERT(dm->fPointer != nullptr);
             sk_free(dm->fPointer);
-            dm->fPointer = NULL;
+            dm->fPointer = nullptr;
             SkASSERT(fUsed >= dm->fBytes);
             fUsed -= dm->fBytes;
             cur = iter.prev();
@@ -175,11 +175,10 @@ void DiscardableMemoryPool::dumpDownTo(size_t budget) {
 
 SkDiscardableMemory* DiscardableMemoryPool::create(size_t bytes) {
     void* addr = sk_malloc_flags(bytes, 0);
-    if (NULL == addr) {
-        return NULL;
+    if (nullptr == addr) {
+        return nullptr;
     }
-    PoolDiscardableMemory* dm = SkNEW_ARGS(PoolDiscardableMemory,
-                                             (this, addr, bytes));
+    PoolDiscardableMemory* dm = new PoolDiscardableMemory(this, addr, bytes);
     SkAutoMutexAcquire autoMutexAcquire(fMutex);
     fList.addToHead(dm);
     fUsed += bytes;
@@ -188,11 +187,11 @@ SkDiscardableMemory* DiscardableMemoryPool::create(size_t bytes) {
 }
 
 void DiscardableMemoryPool::free(PoolDiscardableMemory* dm) {
+    SkAutoMutexAcquire autoMutexAcquire(fMutex);
     // This is called by dm's destructor.
-    if (dm->fPointer != NULL) {
-        SkAutoMutexAcquire autoMutexAcquire(fMutex);
+    if (dm->fPointer != nullptr) {
         sk_free(dm->fPointer);
-        dm->fPointer = NULL;
+        dm->fPointer = nullptr;
         SkASSERT(fUsed >= dm->fBytes);
         fUsed -= dm->fBytes;
         fList.remove(dm);
@@ -202,16 +201,9 @@ void DiscardableMemoryPool::free(PoolDiscardableMemory* dm) {
 }
 
 bool DiscardableMemoryPool::lock(PoolDiscardableMemory* dm) {
-    SkASSERT(dm != NULL);
-    if (NULL == dm->fPointer) {
-        #if SK_LAZY_CACHE_STATS
-        SkAutoMutexAcquire autoMutexAcquire(fMutex);
-        ++fCacheMisses;
-        #endif  // SK_LAZY_CACHE_STATS
-        return false;
-    }
+    SkASSERT(dm != nullptr);
     SkAutoMutexAcquire autoMutexAcquire(fMutex);
-    if (NULL == dm->fPointer) {
+    if (nullptr == dm->fPointer) {
         // May have been purged while waiting for lock.
         #if SK_LAZY_CACHE_STATS
         ++fCacheMisses;
@@ -228,7 +220,7 @@ bool DiscardableMemoryPool::lock(PoolDiscardableMemory* dm) {
 }
 
 void DiscardableMemoryPool::unlock(PoolDiscardableMemory* dm) {
-    SkASSERT(dm != NULL);
+    SkASSERT(dm != nullptr);
     SkAutoMutexAcquire autoMutexAcquire(fMutex);
     dm->fLocked = false;
     this->dumpDownTo(fBudget);
@@ -247,26 +239,18 @@ void DiscardableMemoryPool::dumpPool() {
     this->dumpDownTo(0);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-SK_DECLARE_STATIC_MUTEX(gMutex);
-SkDiscardableMemoryPool* create_global_pool() {
-    return SkDiscardableMemoryPool::Create(SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE,
-                                           &gMutex);
-}
-
 }  // namespace
 
 SkDiscardableMemoryPool* SkDiscardableMemoryPool::Create(size_t size, SkBaseMutex* mutex) {
-    return SkNEW_ARGS(DiscardableMemoryPool, (size, mutex));
+    return new DiscardableMemoryPool(size, mutex);
 }
 
+SK_DECLARE_STATIC_MUTEX(gMutex);
+SK_DECLARE_STATIC_ONCE_PTR(SkDiscardableMemoryPool, global);
+
 SkDiscardableMemoryPool* SkGetGlobalDiscardableMemoryPool() {
-    SK_DECLARE_STATIC_LAZY_PTR(SkDiscardableMemoryPool, global, create_global_pool);
-    return global.get();
+    return global.get([] {
+        return SkDiscardableMemoryPool::Create(SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE,
+                                               &gMutex);
+    });
 }
-
-// defined in SkImageGenerator.h
-void SkPurgeGlobalDiscardableMemoryPool() {
-    SkGetGlobalDiscardableMemoryPool()->dumpPool();
-}
-////////////////////////////////////////////////////////////////////////////////
diff --git a/gfx/skia/skia/src/lazy/SkDiscardableMemoryPool.h b/gfx/skia/skia/src/lazy/SkDiscardableMemoryPool.h
index d14150700415..92ba48bcb492 100644
--- a/gfx/skia/skia/src/lazy/SkDiscardableMemoryPool.h
+++ b/gfx/skia/skia/src/lazy/SkDiscardableMemoryPool.h
@@ -9,6 +9,7 @@
 #define SkDiscardableMemoryPool_DEFINED
 
 #include "SkDiscardableMemory.h"
+#include "SkMutex.h"
 
 #ifndef SK_LAZY_CACHE_STATS
     #ifdef SK_DEBUG
@@ -52,7 +53,7 @@ public:
      *  Without mutex, will be not be thread safe.
      */
     static SkDiscardableMemoryPool* Create(
-            size_t size, SkBaseMutex* mutex = NULL);
+            size_t size, SkBaseMutex* mutex = nullptr);
 };
 
 /**
diff --git a/gfx/skia/skia/src/lazy/SkDiscardablePixelRef.cpp b/gfx/skia/skia/src/lazy/SkDiscardablePixelRef.cpp
index ce38a4a877b9..0cb0e02c27e9 100644
--- a/gfx/skia/skia/src/lazy/SkDiscardablePixelRef.cpp
+++ b/gfx/skia/skia/src/lazy/SkDiscardablePixelRef.cpp
@@ -17,9 +17,10 @@ SkDiscardablePixelRef::SkDiscardablePixelRef(const SkImageInfo& info,
     , fGenerator(generator)
     , fDMFactory(fact)
     , fRowBytes(rowBytes)
-    , fDiscardableMemory(NULL)
+    , fDiscardableMemory(nullptr)
+    , fDiscardableMemoryIsLocked(false)
 {
-    SkASSERT(fGenerator != NULL);
+    SkASSERT(fGenerator != nullptr);
     SkASSERT(fRowBytes > 0);
     // The SkImageGenerator contract requires fGenerator to always
     // decode the same image on each call to getPixels().
@@ -28,34 +29,40 @@ SkDiscardablePixelRef::SkDiscardablePixelRef(const SkImageInfo& info,
 }
 
 SkDiscardablePixelRef::~SkDiscardablePixelRef() {
-    if (this->isLocked()) {
+    if (fDiscardableMemoryIsLocked) {
         fDiscardableMemory->unlock();
+        fDiscardableMemoryIsLocked = false;
     }
-    SkDELETE(fDiscardableMemory);
+    delete fDiscardableMemory;
     SkSafeUnref(fDMFactory);
-    SkDELETE(fGenerator);
+    delete fGenerator;
 }
 
 bool SkDiscardablePixelRef::onNewLockPixels(LockRec* rec) {
-    if (fDiscardableMemory != NULL) {
+    if (fDiscardableMemory != nullptr) {
         if (fDiscardableMemory->lock()) {
+            fDiscardableMemoryIsLocked = true;
             rec->fPixels = fDiscardableMemory->data();
             rec->fColorTable = fCTable.get();
             rec->fRowBytes = fRowBytes;
             return true;
         }
-        SkDELETE(fDiscardableMemory);
-        fDiscardableMemory = NULL;
+        delete fDiscardableMemory;
+        fDiscardableMemory = nullptr;
+        fDiscardableMemoryIsLocked = false;
     }
 
     const size_t size = this->info().getSafeSize(fRowBytes);
 
-    if (fDMFactory != NULL) {
+    if (fDMFactory != nullptr) {
         fDiscardableMemory = fDMFactory->create(size);
+        fDiscardableMemoryIsLocked = true;
     } else {
         fDiscardableMemory = SkDiscardableMemory::Create(size);
+        fDiscardableMemoryIsLocked = true;
     }
-    if (NULL == fDiscardableMemory) {
+    if (nullptr == fDiscardableMemory) {
+        fDiscardableMemoryIsLocked = false;
         return false;  // Memory allocation failed.
     }
 
@@ -64,26 +71,23 @@ bool SkDiscardablePixelRef::onNewLockPixels(LockRec* rec) {
     SkPMColor colors[256];
     int colorCount = 0;
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEGENERATORAPI
-    if (!fGenerator->getPixels(info, pixels, fRowBytes)) {
-#else
     if (!fGenerator->getPixels(info, pixels, fRowBytes, colors, &colorCount)) {
-#endif
         fDiscardableMemory->unlock();
-        SkDELETE(fDiscardableMemory);
-        fDiscardableMemory = NULL;
+        fDiscardableMemoryIsLocked = false;
+        delete fDiscardableMemory;
+        fDiscardableMemory = nullptr;
         return false;
     }
 
-    // Note: our ctable is not purgable, as it is not stored in the discardablememory block.
+    // Note: our ctable is not purgeable, as it is not stored in the discardablememory block.
     // This is because SkColorTable is refcntable, and therefore our caller could hold onto it
     // beyond the scope of a lock/unlock. If we change the API/lifecycle for SkColorTable, we
     // could move it into the block, but then again perhaps it is small enough that this doesn't
     // really matter.
     if (colorCount > 0) {
-        fCTable.reset(SkNEW_ARGS(SkColorTable, (colors, colorCount)));
+        fCTable.reset(new SkColorTable(colors, colorCount));
     } else {
-        fCTable.reset(NULL);
+        fCTable.reset(nullptr);
     }
 
     rec->fPixels = pixels;
@@ -94,29 +98,58 @@ bool SkDiscardablePixelRef::onNewLockPixels(LockRec* rec) {
 
 void SkDiscardablePixelRef::onUnlockPixels() {
     fDiscardableMemory->unlock();
+    fDiscardableMemoryIsLocked = false;
 }
 
-bool SkInstallDiscardablePixelRef(SkImageGenerator* generator, SkBitmap* dst,
-                                  SkDiscardableMemory::Factory* factory) {
-    SkImageInfo info;
+bool SkDEPRECATED_InstallDiscardablePixelRef(SkImageGenerator* generator, const SkIRect* subset,
+                                             SkBitmap* dst, SkDiscardableMemory::Factory* factory) {
     SkAutoTDelete<SkImageGenerator> autoGenerator(generator);
-    if ((NULL == autoGenerator.get())
-        || (!autoGenerator->getInfo(&info))
-        || (!dst->setInfo(info))) {
+    if (nullptr == autoGenerator.get()) {
         return false;
     }
-    SkASSERT(dst->colorType() != kUnknown_SkColorType);
+
+    SkImageInfo prInfo = autoGenerator->getInfo();
+    if (prInfo.isEmpty()) {
+        return false;
+    }
+
+    SkIPoint origin = SkIPoint::Make(0, 0);
+    SkImageInfo bmInfo = prInfo;
+    if (subset) {
+        const SkIRect prBounds = SkIRect::MakeWH(prInfo.width(), prInfo.height());
+        if (subset->isEmpty() || !prBounds.contains(*subset)) {
+            return false;
+        }
+        bmInfo = prInfo.makeWH(subset->width(), subset->height());
+        origin.set(subset->x(), subset->y());
+    }
+
+    // must compute our desired rowBytes w.r.t. the pixelRef's dimensions, not ours, which may be
+    // smaller.
+    if (!dst->setInfo(bmInfo, prInfo.minRowBytes())) {
+        return false;
+    }
+
+    // Since dst->setInfo() may have changed/fixed-up info, we check from the bitmap
+    SkASSERT(dst->info().colorType() != kUnknown_SkColorType);
+
     if (dst->empty()) {  // Use a normal pixelref.
-        return dst->allocPixels();
+        return dst->tryAllocPixels();
     }
     SkAutoTUnref<SkDiscardablePixelRef> ref(
-        SkNEW_ARGS(SkDiscardablePixelRef,
-                   (info, autoGenerator.detach(), dst->rowBytes(), factory)));
-    dst->setPixelRef(ref);
+            new SkDiscardablePixelRef(prInfo, autoGenerator.detach(), dst->rowBytes(), factory));
+    dst->setPixelRef(ref, origin.x(), origin.y());
     return true;
 }
 
-// This is the public API
-bool SkInstallDiscardablePixelRef(SkImageGenerator* generator, SkBitmap* dst) {
-    return SkInstallDiscardablePixelRef(generator, dst, NULL);
+// These are the public API
+
+bool SkDEPRECATED_InstallDiscardablePixelRef(SkImageGenerator* generator, SkBitmap* dst) {
+    return SkDEPRECATED_InstallDiscardablePixelRef(generator, nullptr, dst, nullptr);
+}
+
+bool SkDEPRECATED_InstallDiscardablePixelRef(SkData* encoded, SkBitmap* dst) {
+    SkImageGenerator* generator = SkImageGenerator::NewFromEncoded(encoded);
+    return generator ?
+            SkDEPRECATED_InstallDiscardablePixelRef(generator, nullptr, dst, nullptr) : false;
 }
diff --git a/gfx/skia/skia/src/lazy/SkDiscardablePixelRef.h b/gfx/skia/skia/src/lazy/SkDiscardablePixelRef.h
index d31a04016484..695d441d2b1a 100644
--- a/gfx/skia/skia/src/lazy/SkDiscardablePixelRef.h
+++ b/gfx/skia/skia/src/lazy/SkDiscardablePixelRef.h
@@ -9,7 +9,7 @@
 #define SkDiscardablePixelRef_DEFINED
 
 #include "SkDiscardableMemory.h"
-#include "SkImageGenerator.h"
+#include "SkImageGeneratorPriv.h"
 #include "SkImageInfo.h"
 #include "SkPixelRef.h"
 
@@ -20,19 +20,24 @@
  */
 class SkDiscardablePixelRef : public SkPixelRef {
 public:
-    SK_DECLARE_INST_COUNT(SkDiscardablePixelRef)
+    
+    SkDiscardableMemory* diagnostic_only_getDiscardable() const override {
+        return fDiscardableMemory;
+    }
 
 protected:
     ~SkDiscardablePixelRef();
 
-    virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE;
-    virtual void onUnlockPixels() SK_OVERRIDE;
-    virtual bool onLockPixelsAreWritable() const SK_OVERRIDE { return false; }
+    bool onNewLockPixels(LockRec*) override;
+    void onUnlockPixels() override;
+    bool onLockPixelsAreWritable() const override { return false; }
 
-    virtual SkData* onRefEncodedData() SK_OVERRIDE {
+    SkData* onRefEncodedData() override {
         return fGenerator->refEncodedData();
     }
 
+    bool onIsLazyGenerated() const override { return true; }
+
 private:
     SkImageGenerator* const fGenerator;
     SkDiscardableMemory::Factory* const fDMFactory;
@@ -41,6 +46,7 @@ private:
     // PixelRef, since the SkBitmap doesn't expect them to change.
 
     SkDiscardableMemory* fDiscardableMemory;
+    bool                 fDiscardableMemoryIsLocked;
     SkAutoTUnref<SkColorTable> fCTable;
 
     /* Takes ownership of SkImageGenerator. */
@@ -48,13 +54,19 @@ private:
                           size_t rowBytes,
                           SkDiscardableMemory::Factory* factory);
 
-    virtual bool onGetYUV8Planes(SkISize sizes[3],
-                                 void* planes[3],
-                                 size_t rowBytes[3]) SK_OVERRIDE {
-        return fGenerator->getYUV8Planes(sizes, planes, rowBytes);
+    bool onGetYUV8Planes(SkISize sizes[3],
+                         void* planes[3],
+                         size_t rowBytes[3],
+                         SkYUVColorSpace* colorSpace) override {
+        // If the image was already decoded with lockPixels(), favor not
+        // re-decoding to YUV8 planes.
+        if (fDiscardableMemory) {
+            return false;
+        }
+        return fGenerator->getYUV8Planes(sizes, planes, rowBytes, colorSpace);
     }
 
-    friend bool SkInstallDiscardablePixelRef(SkImageGenerator*, SkBitmap*,
+    friend bool SkDEPRECATED_InstallDiscardablePixelRef(SkImageGenerator*, const SkIRect*, SkBitmap*,
                                              SkDiscardableMemory::Factory*);
 
     typedef SkPixelRef INHERITED;
diff --git a/gfx/skia/skia/src/opts/Sk4px_NEON.h b/gfx/skia/skia/src/opts/Sk4px_NEON.h
new file mode 100644
index 000000000000..c27bb13764f8
--- /dev/null
+++ b/gfx/skia/skia/src/opts/Sk4px_NEON.h
@@ -0,0 +1,170 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+namespace { // See Sk4px.h
+
+inline Sk4px Sk4px::DupPMColor(SkPMColor px) { return Sk16b((uint8x16_t)vdupq_n_u32(px)); }
+
+inline Sk4px Sk4px::Load4(const SkPMColor px[4]) {
+    return Sk16b((uint8x16_t)vld1q_u32(px));
+}
+inline Sk4px Sk4px::Load2(const SkPMColor px[2]) {
+    uint32x2_t px2 = vld1_u32(px);
+    return Sk16b((uint8x16_t)vcombine_u32(px2, px2));
+}
+inline Sk4px Sk4px::Load1(const SkPMColor px[1]) {
+    return Sk16b((uint8x16_t)vdupq_n_u32(*px));
+}
+
+inline void Sk4px::store4(SkPMColor px[4]) const {
+    vst1q_u32(px, (uint32x4_t)this->fVec);
+}
+inline void Sk4px::store2(SkPMColor px[2]) const {
+    vst1_u32(px, (uint32x2_t)vget_low_u8(this->fVec));
+}
+inline void Sk4px::store1(SkPMColor px[1]) const {
+    vst1q_lane_u32(px, (uint32x4_t)this->fVec, 0);
+}
+
+inline Sk4px::Wide Sk4px::widenLo() const {
+    return Sk16h(vmovl_u8(vget_low_u8 (this->fVec)),
+                 vmovl_u8(vget_high_u8(this->fVec)));
+}
+
+inline Sk4px::Wide Sk4px::widenHi() const {
+    return Sk16h(vshll_n_u8(vget_low_u8 (this->fVec), 8),
+                 vshll_n_u8(vget_high_u8(this->fVec), 8));
+}
+
+inline Sk4px::Wide Sk4px::widenLoHi() const {
+    auto zipped = vzipq_u8(this->fVec, this->fVec);
+    return Sk16h((uint16x8_t)zipped.val[0],
+                 (uint16x8_t)zipped.val[1]);
+}
+
+inline Sk4px::Wide Sk4px::mulWiden(const Sk16b& other) const {
+    return Sk16h(vmull_u8(vget_low_u8 (this->fVec), vget_low_u8 (other.fVec)),
+                 vmull_u8(vget_high_u8(this->fVec), vget_high_u8(other.fVec)));
+}
+
+inline Sk4px Sk4px::Wide::addNarrowHi(const Sk16h& other) const {
+    const Sk4px::Wide o(other);  // Should be no code, but allows us to access fLo, fHi.
+    return Sk16b(vcombine_u8(vaddhn_u16(this->fLo.fVec, o.fLo.fVec),
+                             vaddhn_u16(this->fHi.fVec, o.fHi.fVec)));
+}
+
+inline Sk4px Sk4px::Wide::div255() const {
+    // Calculated as ((x+128) + ((x+128)>>8)) >> 8.
+    auto v = *this + Sk16h(128);
+    return v.addNarrowHi(v>>8);
+}
+
+inline Sk4px Sk4px::alphas() const {
+    auto as = vshrq_n_u32((uint32x4_t)fVec, SK_A32_SHIFT);  // ___3 ___2 ___1 ___0
+    return Sk16b((uint8x16_t)vmulq_n_u32(as, 0x01010101));  // 3333 2222 1111 0000
+}
+
+inline Sk4px Sk4px::Load4Alphas(const SkAlpha a[4]) {
+    uint8x16_t a8 = vdupq_n_u8(0);                           // ____ ____ ____ ____
+    a8 = vld1q_lane_u8(a+0, a8,  0);                         // ____ ____ ____ ___0
+    a8 = vld1q_lane_u8(a+1, a8,  4);                         // ____ ____ ___1 ___0
+    a8 = vld1q_lane_u8(a+2, a8,  8);                         // ____ ___2 ___1 ___0
+    a8 = vld1q_lane_u8(a+3, a8, 12);                         // ___3 ___2 ___1 ___0
+    auto a32 = (uint32x4_t)a8;                               //
+    return Sk16b((uint8x16_t)vmulq_n_u32(a32, 0x01010101));  // 3333 2222 1111 0000
+}
+
+inline Sk4px Sk4px::Load2Alphas(const SkAlpha a[2]) {
+    uint8x16_t a8 = vdupq_n_u8(0);                           // ____ ____ ____ ____
+    a8 = vld1q_lane_u8(a+0, a8,  0);                         // ____ ____ ____ ___0
+    a8 = vld1q_lane_u8(a+1, a8,  4);                         // ____ ____ ___1 ___0
+    auto a32 = (uint32x4_t)a8;                               //
+    return Sk16b((uint8x16_t)vmulq_n_u32(a32, 0x01010101));  // ____ ____ 1111 0000
+}
+
+inline Sk4px Sk4px::zeroColors() const {
+    return Sk16b(vandq_u8(this->fVec, (uint8x16_t)vdupq_n_u32(0xFF << SK_A32_SHIFT)));
+}
+
+inline Sk4px Sk4px::zeroAlphas() const {
+    // vbic(a,b) == a & ~b
+    return Sk16b(vbicq_u8(this->fVec, (uint8x16_t)vdupq_n_u32(0xFF << SK_A32_SHIFT)));
+}
+
+static inline uint8x16_t widen_to_8888(uint16x4_t v) {
+    // RGB565 format:   |R....|G.....|B....|
+    //           Bit:  16    11      5     0
+
+    // First get each pixel into its own 32-bit lane.
+    //      v ==                       rgb3 rgb2  rgb1 rgb0
+    // spread == 0000 rgb3  0000 rgb2  0000 rgb1  0000 rgb0
+    uint32x4_t spread = vmovl_u16(v);
+
+    // Get each color independently, still in 565 precison but down at bit 0.
+    auto r5 = vshrq_n_u32(spread, 11),
+         g6 = vandq_u32(vdupq_n_u32(63), vshrq_n_u32(spread, 5)),
+         b5 = vandq_u32(vdupq_n_u32(31), spread);
+
+    // Scale 565 precision up to 8-bit each, filling low 323 bits with high bits of each component.
+    auto r8 = vorrq_u32(vshlq_n_u32(r5, 3), vshrq_n_u32(r5, 2)),
+         g8 = vorrq_u32(vshlq_n_u32(g6, 2), vshrq_n_u32(g6, 4)),
+         b8 = vorrq_u32(vshlq_n_u32(b5, 3), vshrq_n_u32(b5, 2));
+
+    // Now put all the 8-bit components into SkPMColor order.
+    return (uint8x16_t)vorrq_u32(vshlq_n_u32(r8, SK_R32_SHIFT),   // TODO: one shift is zero...
+                       vorrq_u32(vshlq_n_u32(g8, SK_G32_SHIFT),
+                       vorrq_u32(vshlq_n_u32(b8, SK_B32_SHIFT),
+                                 vdupq_n_u32(0xFF << SK_A32_SHIFT))));
+}
+
+static inline uint16x4_t narrow_to_565(uint8x16_t w8x16) {
+    uint32x4_t w = (uint32x4_t)w8x16;
+
+    // Extract out top RGB 565 bits of each pixel, with no rounding.
+    auto r5 = vandq_u32(vdupq_n_u32(31), vshrq_n_u32(w, SK_R32_SHIFT + 3)),
+         g6 = vandq_u32(vdupq_n_u32(63), vshrq_n_u32(w, SK_G32_SHIFT + 2)),
+         b5 = vandq_u32(vdupq_n_u32(31), vshrq_n_u32(w, SK_B32_SHIFT + 3));
+
+    // Now put the bits in place in the low 16-bits of each 32-bit lane.
+    auto spread = vorrq_u32(vshlq_n_u32(r5, 11),
+                  vorrq_u32(vshlq_n_u32(g6,  5),
+                            b5));
+
+    // Pack the low 16-bits of our 128-bit register down into a 64-bit register.
+    // spread == 0000 rgb3  0000 rgb2  0000 rgb1  0000 rgb0
+    //      v ==                       rgb3 rgb2  rgb1 rgb0
+    auto v = vmovn_u32(spread);
+    return v;
+}
+
+
+inline Sk4px Sk4px::Load4(const SkPMColor16 src[4]) {
+    return Sk16b(widen_to_8888(vld1_u16(src)));
+}
+inline Sk4px Sk4px::Load2(const SkPMColor16 src[2]) {
+    auto src2 = ((uint32_t)src[0]      )
+              | ((uint32_t)src[1] << 16);
+    return Sk16b(widen_to_8888(vcreate_u16(src2)));
+}
+inline Sk4px Sk4px::Load1(const SkPMColor16 src[1]) {
+    return Sk16b(widen_to_8888(vcreate_u16(src[0])));
+}
+
+inline void Sk4px::store4(SkPMColor16 dst[4]) const {
+    vst1_u16(dst, narrow_to_565(this->fVec));
+}
+inline void Sk4px::store2(SkPMColor16 dst[2]) const {
+    auto v = narrow_to_565(this->fVec);
+    dst[0] = vget_lane_u16(v, 0);
+    dst[1] = vget_lane_u16(v, 1);
+}
+inline void Sk4px::store1(SkPMColor16 dst[1]) const {
+    dst[0] = vget_lane_u16(narrow_to_565(this->fVec), 0);
+}
+
+} // namespace
+
diff --git a/gfx/skia/skia/src/opts/Sk4px_SSE2.h b/gfx/skia/skia/src/opts/Sk4px_SSE2.h
new file mode 100644
index 000000000000..96f21db3991a
--- /dev/null
+++ b/gfx/skia/skia/src/opts/Sk4px_SSE2.h
@@ -0,0 +1,179 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+namespace { // See Sk4px.h
+
+inline Sk4px Sk4px::DupPMColor(SkPMColor px) { return Sk16b(_mm_set1_epi32(px)); }
+
+inline Sk4px Sk4px::Load4(const SkPMColor px[4]) {
+    return Sk16b(_mm_loadu_si128((const __m128i*)px));
+}
+inline Sk4px Sk4px::Load2(const SkPMColor px[2]) {
+    return Sk16b(_mm_loadl_epi64((const __m128i*)px));
+}
+inline Sk4px Sk4px::Load1(const SkPMColor px[1]) { return Sk16b(_mm_cvtsi32_si128(*px)); }
+
+inline void Sk4px::store4(SkPMColor px[4]) const { _mm_storeu_si128((__m128i*)px, this->fVec); }
+inline void Sk4px::store2(SkPMColor px[2]) const { _mm_storel_epi64((__m128i*)px, this->fVec); }
+inline void Sk4px::store1(SkPMColor px[1]) const { *px = _mm_cvtsi128_si32(this->fVec); }
+
+inline Sk4px::Wide Sk4px::widenLo() const {
+    return Sk16h(_mm_unpacklo_epi8(this->fVec, _mm_setzero_si128()),
+                 _mm_unpackhi_epi8(this->fVec, _mm_setzero_si128()));
+}
+
+inline Sk4px::Wide Sk4px::widenHi() const {
+    return Sk16h(_mm_unpacklo_epi8(_mm_setzero_si128(), this->fVec),
+                 _mm_unpackhi_epi8(_mm_setzero_si128(), this->fVec));
+}
+
+inline Sk4px::Wide Sk4px::widenLoHi() const {
+    return Sk16h(_mm_unpacklo_epi8(this->fVec, this->fVec),
+                 _mm_unpackhi_epi8(this->fVec, this->fVec));
+}
+
+inline Sk4px::Wide Sk4px::mulWiden(const Sk16b& other) const {
+    return this->widenLo() * Sk4px(other).widenLo();
+}
+
+inline Sk4px Sk4px::Wide::addNarrowHi(const Sk16h& other) const {
+    Sk4px::Wide r = (*this + other) >> 8;
+    return Sk4px(_mm_packus_epi16(r.fLo.fVec, r.fHi.fVec));
+}
+
+inline Sk4px Sk4px::Wide::div255() const {
+    // (x + 127) / 255 == ((x+128) * 257)>>16,
+    // and _mm_mulhi_epu16 makes the (_ * 257)>>16 part very convenient.
+    const __m128i _128 = _mm_set1_epi16(128),
+                  _257 = _mm_set1_epi16(257);
+    return Sk4px(_mm_packus_epi16(_mm_mulhi_epu16(_mm_add_epi16(fLo.fVec, _128), _257),
+                                  _mm_mulhi_epu16(_mm_add_epi16(fHi.fVec, _128), _257)));
+}
+
+// Load4Alphas and Load2Alphas use possibly-unaligned loads (SkAlpha[] -> uint16_t or uint32_t).
+// These are safe on x86, often with no speed penalty.
+
+#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSSE3
+    inline Sk4px Sk4px::alphas() const {
+        static_assert(SK_A32_SHIFT == 24, "Intel's always little-endian.");
+        __m128i splat = _mm_set_epi8(15,15,15,15, 11,11,11,11, 7,7,7,7, 3,3,3,3);
+        return Sk16b(_mm_shuffle_epi8(this->fVec, splat));
+    }
+
+    inline Sk4px Sk4px::Load4Alphas(const SkAlpha a[4]) {
+        uint32_t as = *(const uint32_t*)a;
+        __m128i splat = _mm_set_epi8(3,3,3,3, 2,2,2,2, 1,1,1,1, 0,0,0,0);
+        return Sk16b(_mm_shuffle_epi8(_mm_cvtsi32_si128(as), splat));
+    }
+#else
+    inline Sk4px Sk4px::alphas() const {
+        static_assert(SK_A32_SHIFT == 24, "Intel's always little-endian.");
+        // We exploit that A >= rgb for any premul pixel.
+        __m128i as = fVec;                             // 3xxx 2xxx 1xxx 0xxx
+        as = _mm_max_epu8(as, _mm_srli_epi32(as,  8)); // 33xx 22xx 11xx 00xx
+        as = _mm_max_epu8(as, _mm_srli_epi32(as, 16)); // 3333 2222 1111 0000
+        return Sk16b(as);
+    }
+
+    inline Sk4px Sk4px::Load4Alphas(const SkAlpha a[4]) {
+        __m128i as = _mm_cvtsi32_si128(*(const uint32_t*)a);  // ____ ____ ____ 3210
+        as = _mm_unpacklo_epi8 (as, as);                      // ____ ____ 3322 1100
+        as = _mm_unpacklo_epi16(as, as);                      // 3333 2222 1111 0000
+        return Sk16b(as);
+    }
+#endif
+
+inline Sk4px Sk4px::Load2Alphas(const SkAlpha a[2]) {
+    uint32_t as = *(const uint16_t*)a;   // Aa -> Aa00
+    return Load4Alphas((const SkAlpha*)&as);
+}
+
+inline Sk4px Sk4px::zeroColors() const {
+    return Sk16b(_mm_and_si128(_mm_set1_epi32(0xFF << SK_A32_SHIFT), this->fVec));
+}
+
+inline Sk4px Sk4px::zeroAlphas() const {
+    // andnot(a,b) == ~a & b
+    return Sk16b(_mm_andnot_si128(_mm_set1_epi32(0xFF << SK_A32_SHIFT), this->fVec));
+}
+
+static inline __m128i widen_low_half_to_8888(__m128i v) {
+    // RGB565 format:   |R....|G.....|B....|
+    //           Bit:  16    11      5     0
+
+    // First get each pixel into its own 32-bit lane.
+    //      v == ____ ____  ____ ____  rgb3 rgb2  rgb1 rgb0
+    // spread == 0000 rgb3  0000 rgb2  0000 rgb1  0000 rgb0
+    auto spread = _mm_unpacklo_epi16(v, _mm_setzero_si128());
+
+    // Get each color independently, still in 565 precison but down at bit 0.
+    auto r5 = _mm_srli_epi32(spread, 11),
+         g6 = _mm_and_si128(_mm_set1_epi32(63), _mm_srli_epi32(spread,  5)),
+         b5 = _mm_and_si128(_mm_set1_epi32(31), spread);
+
+    // Scale 565 precision up to 8-bit each, filling low 323 bits with high bits of each component.
+    auto r8 = _mm_or_si128(_mm_slli_epi32(r5, 3), _mm_srli_epi32(r5, 2)),
+         g8 = _mm_or_si128(_mm_slli_epi32(g6, 2), _mm_srli_epi32(g6, 4)),
+         b8 = _mm_or_si128(_mm_slli_epi32(b5, 3), _mm_srli_epi32(b5, 2));
+
+    // Now put all the 8-bit components into SkPMColor order.
+    return _mm_or_si128(_mm_slli_epi32(r8, SK_R32_SHIFT),   // TODO: one of these shifts is zero...
+           _mm_or_si128(_mm_slli_epi32(g8, SK_G32_SHIFT),
+           _mm_or_si128(_mm_slli_epi32(b8, SK_B32_SHIFT),
+                        _mm_set1_epi32(0xFF << SK_A32_SHIFT))));
+}
+
+static inline __m128i narrow_to_565(__m128i w) {
+    // Extract out top RGB 565 bits of each pixel, with no rounding.
+    auto r5 = _mm_and_si128(_mm_set1_epi32(31), _mm_srli_epi32(w, SK_R32_SHIFT + 3)),
+         g6 = _mm_and_si128(_mm_set1_epi32(63), _mm_srli_epi32(w, SK_G32_SHIFT + 2)),
+         b5 = _mm_and_si128(_mm_set1_epi32(31), _mm_srli_epi32(w, SK_B32_SHIFT + 3));
+
+    // Now put the bits in place in the low 16-bits of each 32-bit lane.
+    auto spread = _mm_or_si128(_mm_slli_epi32(r5, 11),
+                  _mm_or_si128(_mm_slli_epi32(g6,  5),
+                               b5));
+
+    // We want to pack the bottom 16-bits of spread down into the low half of the register, v.
+    // spread == 0000 rgb3  0000 rgb2  0000 rgb1  0000 rgb0
+    //      v == ____ ____  ____ ____  rgb3 rgb2  rgb1 rgb0
+
+    // Ideally now we'd use _mm_packus_epi32(spread, <anything>) to pack v.  But that's from SSE4.
+    // With only SSE2, we need to use _mm_packs_epi32.  That does signed saturation, and
+    // we need to preserve all 16 bits.  So we pretend our data is signed by sign-extending first.
+    // TODO: is it faster to just _mm_shuffle_epi8 this when we have SSSE3?
+    auto signExtended = _mm_srai_epi32(_mm_slli_epi32(spread, 16), 16);
+    auto v = _mm_packs_epi32(signExtended, signExtended);
+    return v;
+}
+
+inline Sk4px Sk4px::Load4(const SkPMColor16 src[4]) {
+    return Sk16b(widen_low_half_to_8888(_mm_loadl_epi64((const __m128i*)src)));
+}
+inline Sk4px Sk4px::Load2(const SkPMColor16 src[2]) {
+    auto src2 = ((uint32_t)src[0]      )
+              | ((uint32_t)src[1] << 16);
+    return Sk16b(widen_low_half_to_8888(_mm_cvtsi32_si128(src2)));
+}
+inline Sk4px Sk4px::Load1(const SkPMColor16 src[1]) {
+    return Sk16b(widen_low_half_to_8888(_mm_insert_epi16(_mm_setzero_si128(), src[0], 0)));
+}
+
+inline void Sk4px::store4(SkPMColor16 dst[4]) const {
+    _mm_storel_epi64((__m128i*)dst, narrow_to_565(this->fVec));
+}
+inline void Sk4px::store2(SkPMColor16 dst[2]) const {
+    uint32_t dst2 = _mm_cvtsi128_si32(narrow_to_565(this->fVec));
+    dst[0] = dst2;
+    dst[1] = dst2 >> 16;
+}
+inline void Sk4px::store1(SkPMColor16 dst[1]) const {
+    uint32_t dst2 = _mm_cvtsi128_si32(narrow_to_565(this->fVec));
+    dst[0] = dst2;
+}
+
+}  // namespace
diff --git a/gfx/skia/skia/src/opts/Sk4px_none.h b/gfx/skia/skia/src/opts/Sk4px_none.h
new file mode 100644
index 000000000000..efbd780c9fcf
--- /dev/null
+++ b/gfx/skia/skia/src/opts/Sk4px_none.h
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkUtils.h"
+
+namespace { // See Sk4px.h
+
+static_assert(sizeof(Sk4px) == 16, "This file uses memcpy / sk_memset32, so exact size matters.");
+
+inline Sk4px Sk4px::DupPMColor(SkPMColor px) {
+    Sk4px px4 = Sk16b();
+    sk_memset32((uint32_t*)&px4, px, 4);
+    return px4;
+}
+
+inline Sk4px Sk4px::Load4(const SkPMColor px[4]) {
+    Sk4px px4 = Sk16b();
+    memcpy(&px4, px, 16);
+    return px4;
+}
+
+inline Sk4px Sk4px::Load2(const SkPMColor px[2]) {
+    Sk4px px2 = Sk16b();
+    memcpy(&px2, px, 8);
+    return px2;
+}
+
+inline Sk4px Sk4px::Load1(const SkPMColor px[1]) {
+    Sk4px px1 = Sk16b();
+    memcpy(&px1, px, 4);
+    return px1;
+}
+
+inline void Sk4px::store4(SkPMColor px[4]) const { memcpy(px, this, 16); }
+inline void Sk4px::store2(SkPMColor px[2]) const { memcpy(px, this,  8); }
+inline void Sk4px::store1(SkPMColor px[1]) const { memcpy(px, this,  4); }
+
+inline Sk4px::Wide Sk4px::widenLo() const {
+    return Sk16h(this->kth< 0>(), this->kth< 1>(), this->kth< 2>(), this->kth< 3>(),
+                 this->kth< 4>(), this->kth< 5>(), this->kth< 6>(), this->kth< 7>(),
+                 this->kth< 8>(), this->kth< 9>(), this->kth<10>(), this->kth<11>(),
+                 this->kth<12>(), this->kth<13>(), this->kth<14>(), this->kth<15>());
+}
+
+inline Sk4px::Wide Sk4px::widenHi() const { return this->widenLo() << 8; }
+
+inline Sk4px::Wide Sk4px::widenLoHi() const { return this->widenLo() + this->widenHi(); }
+
+inline Sk4px::Wide Sk4px::mulWiden(const Sk16b& other) const {
+    return this->widenLo() * Sk4px(other).widenLo();
+}
+
+inline Sk4px Sk4px::Wide::addNarrowHi(const Sk16h& other) const {
+    Sk4px::Wide r = (*this + other) >> 8;
+    return Sk16b(r.kth< 0>(), r.kth< 1>(), r.kth< 2>(), r.kth< 3>(),
+                 r.kth< 4>(), r.kth< 5>(), r.kth< 6>(), r.kth< 7>(),
+                 r.kth< 8>(), r.kth< 9>(), r.kth<10>(), r.kth<11>(),
+                 r.kth<12>(), r.kth<13>(), r.kth<14>(), r.kth<15>());
+}
+
+inline Sk4px Sk4px::Wide::div255() const {
+    // Calculated as ((x+128) + ((x+128)>>8)) >> 8.
+    auto v = *this + Sk16h(128);
+    return v.addNarrowHi(v>>8);
+}
+
+inline Sk4px Sk4px::alphas() const {
+    static_assert(SK_A32_SHIFT == 24, "This method assumes little-endian.");
+    return Sk16b(this->kth< 3>(), this->kth< 3>(), this->kth< 3>(), this->kth< 3>(),
+                 this->kth< 7>(), this->kth< 7>(), this->kth< 7>(), this->kth< 7>(),
+                 this->kth<11>(), this->kth<11>(), this->kth<11>(), this->kth<11>(),
+                 this->kth<15>(), this->kth<15>(), this->kth<15>(), this->kth<15>());
+}
+
+inline Sk4px Sk4px::Load4Alphas(const SkAlpha a[4]) {
+    return Sk16b(a[0], a[0], a[0], a[0],
+                 a[1], a[1], a[1], a[1],
+                 a[2], a[2], a[2], a[2],
+                 a[3], a[3], a[3], a[3]);
+}
+
+inline Sk4px Sk4px::Load2Alphas(const SkAlpha a[2]) {
+    return Sk16b(a[0], a[0], a[0], a[0],
+                 a[1], a[1], a[1], a[1],
+                 0,0,0,0,
+                 0,0,0,0);
+}
+
+inline Sk4px Sk4px::zeroAlphas() const {
+    static_assert(SK_A32_SHIFT == 24, "This method assumes little-endian.");
+    return Sk16b(this->kth< 0>(), this->kth< 1>(), this->kth< 2>(), 0,
+                 this->kth< 4>(), this->kth< 5>(), this->kth< 6>(), 0,
+                 this->kth< 8>(), this->kth< 9>(), this->kth<10>(), 0,
+                 this->kth<12>(), this->kth<13>(), this->kth<14>(), 0);
+}
+
+inline Sk4px Sk4px::zeroColors() const {
+    static_assert(SK_A32_SHIFT == 24, "This method assumes little-endian.");
+    return Sk16b(0,0,0, this->kth< 3>(),
+                 0,0,0, this->kth< 7>(),
+                 0,0,0, this->kth<11>(),
+                 0,0,0, this->kth<15>());
+}
+
+inline Sk4px Sk4px::Load4(const SkPMColor16 src[4]) {
+    SkPMColor src32[4];
+    for (int i = 0; i < 4; i++) { src32[i] = SkPixel16ToPixel32(src[i]); }
+    return Load4(src32);
+}
+inline Sk4px Sk4px::Load2(const SkPMColor16 src[2]) {
+    SkPMColor src32[2];
+    for (int i = 0; i < 2; i++) { src32[i] = SkPixel16ToPixel32(src[i]); }
+    return Load2(src32);
+}
+inline Sk4px Sk4px::Load1(const SkPMColor16 src[1]) {
+    SkPMColor src32 = SkPixel16ToPixel32(src[0]);
+    return Load1(&src32);
+}
+
+inline void Sk4px::store4(SkPMColor16 dst[4]) const {
+    SkPMColor dst32[4];
+    this->store4(dst32);
+    for (int i = 0; i < 4; i++) { dst[i] = SkPixel32ToPixel16(dst32[i]); }
+}
+inline void Sk4px::store2(SkPMColor16 dst[2]) const {
+    SkPMColor dst32[2];
+    this->store2(dst32);
+    for (int i = 0; i < 2; i++) { dst[i] = SkPixel32ToPixel16(dst32[i]); }
+}
+inline void Sk4px::store1(SkPMColor16 dst[1]) const {
+    SkPMColor dst32;
+    this->store1(&dst32);
+    dst[0] = SkPixel32ToPixel16(dst32);
+}
+
+}  // namespace
diff --git a/gfx/skia/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp b/gfx/skia/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp
index b0405669218b..ecaad23d76f1 100644
--- a/gfx/skia/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp
+++ b/gfx/skia/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp
@@ -40,142 +40,6 @@ static inline void print128f(__m128 value) {
 }
 #endif
 
-// because the border is handled specially, this is guaranteed to have all 16 pixels
-// available to it without running off the bitmap's edge.
-
-void highQualityFilter_SSE2(const SkBitmapProcState& s, int x, int y,
-                            SkPMColor* SK_RESTRICT colors, int count) {
-
-    const int maxX = s.fBitmap->width() - 1;
-    const int maxY = s.fBitmap->height() - 1;
-
-    while (count-- > 0) {
-        SkPoint srcPt;
-        s.fInvProc(s.fInvMatrix, SkIntToScalar(x),
-                    SkIntToScalar(y), &srcPt);
-        srcPt.fX -= SK_ScalarHalf;
-        srcPt.fY -= SK_ScalarHalf;
-
-        int sx = SkScalarFloorToInt(srcPt.fX);
-        int sy = SkScalarFloorToInt(srcPt.fY);
-
-        __m128 weight = _mm_setzero_ps();
-        __m128 accum = _mm_setzero_ps();
-
-        int y0 = SkTMax(0, int(ceil(sy-s.getBitmapFilter()->width() + 0.5f)));
-        int y1 = SkTMin(maxY, int(floor(sy+s.getBitmapFilter()->width() + 0.5f)));
-        int x0 = SkTMax(0, int(ceil(sx-s.getBitmapFilter()->width() + 0.5f)));
-        int x1 = SkTMin(maxX, int(floor(sx+s.getBitmapFilter()->width() + 0.5f)));
-
-        for (int src_y = y0; src_y <= y1; src_y++) {
-            float yweight = SkScalarToFloat(s.getBitmapFilter()->lookupScalar(srcPt.fY - src_y));
-
-            for (int src_x = x0; src_x <= x1 ; src_x++) {
-                float xweight = SkScalarToFloat(s.getBitmapFilter()->lookupScalar(srcPt.fX - src_x));
-
-                float combined_weight = xweight * yweight;
-
-                SkPMColor color = *s.fBitmap->getAddr32(src_x, src_y);
-
-                __m128i c = _mm_cvtsi32_si128( color );
-                c = _mm_unpacklo_epi8(c, _mm_setzero_si128());
-                c = _mm_unpacklo_epi16(c, _mm_setzero_si128());
-
-                __m128 cfloat = _mm_cvtepi32_ps( c );
-
-                __m128 weightVector = _mm_set1_ps(combined_weight);
-
-                accum = _mm_add_ps(accum, _mm_mul_ps(cfloat, weightVector));
-                weight = _mm_add_ps( weight, weightVector );
-            }
-        }
-
-        accum = _mm_div_ps(accum, weight);
-        accum = _mm_add_ps(accum, _mm_set1_ps(0.5f));
-
-        __m128i accumInt = _mm_cvtps_epi32( accum );
-
-        int localResult[4];
-        _mm_storeu_si128((__m128i *) (localResult), accumInt);
-        int a = SkClampMax(localResult[0], 255);
-        int r = SkClampMax(localResult[1], a);
-        int g = SkClampMax(localResult[2], a);
-        int b = SkClampMax(localResult[3], a);
-
-        *colors++ = SkPackARGB32(a, r, g, b);
-
-        x++;
-    }
-}
-
-void highQualityFilter_ScaleOnly_SSE2(const SkBitmapProcState &s, int x, int y,
-                             SkPMColor *SK_RESTRICT colors, int count) {
-    const int maxX = s.fBitmap->width() - 1;
-    const int maxY = s.fBitmap->height() - 1;
-
-    SkPoint srcPt;
-    s.fInvProc(s.fInvMatrix, SkIntToScalar(x),
-                SkIntToScalar(y), &srcPt);
-    srcPt.fY -= SK_ScalarHalf;
-    int sy = SkScalarFloorToInt(srcPt.fY);
-
-    int y0 = SkTMax(0, int(ceil(sy-s.getBitmapFilter()->width() + 0.5f)));
-    int y1 = SkTMin(maxY, int(floor(sy+s.getBitmapFilter()->width() + 0.5f)));
-
-    while (count-- > 0) {
-        srcPt.fX -= SK_ScalarHalf;
-        srcPt.fY -= SK_ScalarHalf;
-
-        int sx = SkScalarFloorToInt(srcPt.fX);
-
-        float weight = 0;
-        __m128 accum = _mm_setzero_ps();
-
-        int x0 = SkTMax(0, int(ceil(sx-s.getBitmapFilter()->width() + 0.5f)));
-        int x1 = SkTMin(maxX, int(floor(sx+s.getBitmapFilter()->width() + 0.5f)));
-
-        for (int src_y = y0; src_y <= y1; src_y++) {
-            float yweight = SkScalarToFloat(s.getBitmapFilter()->lookupScalar(srcPt.fY - src_y));
-
-            for (int src_x = x0; src_x <= x1 ; src_x++) {
-                float xweight = SkScalarToFloat(s.getBitmapFilter()->lookupScalar(srcPt.fX - src_x));
-
-                float combined_weight = xweight * yweight;
-
-                SkPMColor color = *s.fBitmap->getAddr32(src_x, src_y);
-
-                __m128 c = _mm_set_ps((float)SkGetPackedB32(color),
-                                      (float)SkGetPackedG32(color),
-                                      (float)SkGetPackedR32(color),
-                                      (float)SkGetPackedA32(color));
-
-                __m128 weightVector = _mm_set1_ps(combined_weight);
-
-                accum = _mm_add_ps(accum, _mm_mul_ps(c, weightVector));
-                weight += combined_weight;
-            }
-        }
-
-        __m128 totalWeightVector = _mm_set1_ps(weight);
-        accum = _mm_div_ps(accum, totalWeightVector);
-        accum = _mm_add_ps(accum, _mm_set1_ps(0.5f));
-
-        float localResult[4];
-        _mm_storeu_ps(localResult, accum);
-        int a = SkClampMax(int(localResult[0]), 255);
-        int r = SkClampMax(int(localResult[1]), a);
-        int g = SkClampMax(int(localResult[2]), a);
-        int b = SkClampMax(int(localResult[3]), a);
-
-        *colors++ = SkPackARGB32(a, r, g, b);
-
-        x++;
-
-        s.fInvProc(s.fInvMatrix, SkIntToScalar(x),
-                    SkIntToScalar(y), &srcPt);
-    }
-}
-
 // Convolves horizontally along a single row. The row data is given in
 // |src_data| and continues for the num_values() of the filter.
 void convolveHorizontally_SSE2(const unsigned char* src_data,
@@ -310,7 +174,10 @@ void convolveHorizontally_SSE2(const unsigned char* src_data,
 // refer to that function for detailed comments.
 void convolve4RowsHorizontally_SSE2(const unsigned char* src_data[4],
                                     const SkConvolutionFilter1D& filter,
-                                    unsigned char* out_row[4]) {
+                                    unsigned char* out_row[4],
+                                    size_t outRowBytes) {
+    SkDEBUGCODE(const unsigned char* out_row_0_start = out_row[0];)
+
     int num_values = filter.numValues();
 
     int filter_offset, filter_length;
@@ -411,6 +278,9 @@ void convolve4RowsHorizontally_SSE2(const unsigned char* src_data[4],
         accum3 = _mm_packs_epi32(accum3, zero);
         accum3 = _mm_packus_epi16(accum3, zero);
 
+        // We seem to be running off the edge here (chromium:491660).
+        SkASSERT(((size_t)out_row[0] - (size_t)out_row_0_start) < outRowBytes);
+
         *(reinterpret_cast<int*>(out_row[0])) = _mm_cvtsi128_si32(accum0);
         *(reinterpret_cast<int*>(out_row[1])) = _mm_cvtsi128_si32(accum1);
         *(reinterpret_cast<int*>(out_row[2])) = _mm_cvtsi128_si32(accum2);
diff --git a/gfx/skia/skia/src/opts/SkBitmapFilter_opts_SSE2.h b/gfx/skia/skia/src/opts/SkBitmapFilter_opts_SSE2.h
index 661a824e2273..46ab5c8ae716 100644
--- a/gfx/skia/skia/src/opts/SkBitmapFilter_opts_SSE2.h
+++ b/gfx/skia/skia/src/opts/SkBitmapFilter_opts_SSE2.h
@@ -11,12 +11,6 @@
 #include "SkBitmapProcState.h"
 #include "SkConvolver.h"
 
-void highQualityFilter_ScaleOnly_SSE2(const SkBitmapProcState &s, int x, int y,
-                                      SkPMColor *SK_RESTRICT colors, int count);
-void highQualityFilter_SSE2(const SkBitmapProcState &s, int x, int y,
-                            SkPMColor *SK_RESTRICT colors, int count);
-
-
 void convolveVertically_SSE2(const SkConvolutionFilter1D::ConvolutionFixed* filter_values,
                              int filter_length,
                              unsigned char* const* source_data_rows,
@@ -25,7 +19,8 @@ void convolveVertically_SSE2(const SkConvolutionFilter1D::ConvolutionFixed* filt
                              bool has_alpha);
 void convolve4RowsHorizontally_SSE2(const unsigned char* src_data[4],
                                     const SkConvolutionFilter1D& filter,
-                                    unsigned char* out_row[4]);
+                                    unsigned char* out_row[4],
+                                    size_t outRowBytes);
 void convolveHorizontally_SSE2(const unsigned char* src_data,
                                const SkConvolutionFilter1D& filter,
                                unsigned char* out_row,
diff --git a/gfx/skia/skia/src/opts/SkBitmapProcState_arm_neon.cpp b/gfx/skia/skia/src/opts/SkBitmapProcState_arm_neon.cpp
index 33b362712913..d1f71c270ce3 100644
--- a/gfx/skia/skia/src/opts/SkBitmapProcState_arm_neon.cpp
+++ b/gfx/skia/skia/src/opts/SkBitmapProcState_arm_neon.cpp
@@ -1,10 +1,10 @@
-
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 #include "SkBitmapProcState.h"
 #include "SkBitmapProcState_filter.h"
 #include "SkColorPriv.h"
@@ -66,7 +66,17 @@ const SkBitmapProcState::SampleProc32 gSkBitmapProcStateSample32_neon[] = {
     SA8_alpha_D32_filter_DXDY_neon,
     SA8_alpha_D32_filter_DXDY_neon,
     SA8_alpha_D32_filter_DX_neon,
-    SA8_alpha_D32_filter_DX_neon
+    SA8_alpha_D32_filter_DX_neon,
+
+    // todo: possibly specialize on opaqueness
+    SG8_alpha_D32_nofilter_DXDY_neon,
+    SG8_alpha_D32_nofilter_DXDY_neon,
+    SG8_alpha_D32_nofilter_DX_neon,
+    SG8_alpha_D32_nofilter_DX_neon,
+    SG8_alpha_D32_filter_DXDY_neon,
+    SG8_alpha_D32_filter_DXDY_neon,
+    SG8_alpha_D32_filter_DX_neon,
+    SG8_alpha_D32_filter_DX_neon,
 };
 
 const SkBitmapProcState::SampleProc16 gSkBitmapProcStateSample16_neon[] = {
@@ -86,9 +96,11 @@ const SkBitmapProcState::SampleProc16 gSkBitmapProcStateSample16_neon[] = {
     SI8_D16_filter_DX_neon,
 
     // Don't support 4444 -> 565
-    NULL, NULL, NULL, NULL,
+    nullptr, nullptr, nullptr, nullptr,
     // Don't support A8 -> 565
-    NULL, NULL, NULL, NULL
+    nullptr, nullptr, nullptr, nullptr,
+    // Don't support G8 -> 565 (but we could)
+    nullptr, nullptr, nullptr, nullptr,
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -377,7 +389,8 @@ void convolveVertically_neon(const SkConvolutionFilter1D::ConvolutionFixed* filt
 // refer to that function for detailed comments.
 void convolve4RowsHorizontally_neon(const unsigned char* srcData[4],
                                     const SkConvolutionFilter1D& filter,
-                                    unsigned char* outRow[4]) {
+                                    unsigned char* outRow[4],
+                                    size_t outRowBytes) {
 
     uint8x8_t coeff_mask0 = vcreate_u8(0x0100010001000100);
     uint8x8_t coeff_mask1 = vcreate_u8(0x0302030203020302);
diff --git a/gfx/skia/skia/src/opts/SkBitmapProcState_filter_neon.h b/gfx/skia/skia/src/opts/SkBitmapProcState_filter_neon.h
index 0887145c3d05..5cf0ac46224c 100644
--- a/gfx/skia/skia/src/opts/SkBitmapProcState_filter_neon.h
+++ b/gfx/skia/skia/src/opts/SkBitmapProcState_filter_neon.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2012 The Android Open Source Project
  *
@@ -6,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-
 #include <arm_neon.h>
 #include "SkColorPriv.h"
 
diff --git a/gfx/skia/skia/src/opts/SkBitmapProcState_matrix_neon.h b/gfx/skia/skia/src/opts/SkBitmapProcState_matrix_neon.h
index 72bf1bce3365..fbb2a1e00b5e 100644
--- a/gfx/skia/skia/src/opts/SkBitmapProcState_matrix_neon.h
+++ b/gfx/skia/skia/src/opts/SkBitmapProcState_matrix_neon.h
@@ -1,7 +1,12 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include <arm_neon.h>
 
-
 #define SCALE_NOFILTER_NAME     MAKENAME(_nofilter_scale)
 #define SCALE_FILTER_NAME       MAKENAME(_filter_scale)
 #define AFFINE_NOFILTER_NAME    MAKENAME(_nofilter_affine)
@@ -30,14 +35,14 @@ static void SCALE_NOFILTER_NAME(const SkBitmapProcState& s,
     PREAMBLE(s);
 
     // we store y, x, x, x, x, x
-    const unsigned maxX = s.fBitmap->width() - 1;
+    const unsigned maxX = s.fPixmap.width() - 1;
     SkFractionalInt fx;
     {
         SkPoint pt;
         s.fInvProc(s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf,
                                  SkIntToScalar(y) + SK_ScalarHalf, &pt);
         fx = SkScalarToFractionalInt(pt.fY);
-        const unsigned maxY = s.fBitmap->height() - 1;
+        const unsigned maxY = s.fPixmap.height() - 1;
         *xy++ = TILEY_PROCF(SkFractionalIntToFixed(fx), maxY);
         fx = SkScalarToFractionalInt(pt.fX);
     }
@@ -122,8 +127,8 @@ static void AFFINE_NOFILTER_NAME(const SkBitmapProcState& s,
     SkFractionalInt fy = SkScalarToFractionalInt(srcPt.fY);
     SkFractionalInt dx = s.fInvSxFractionalInt;
     SkFractionalInt dy = s.fInvKyFractionalInt;
-    int maxX = s.fBitmap->width() - 1;
-    int maxY = s.fBitmap->height() - 1;
+    int maxX = s.fPixmap.width() - 1;
+    int maxY = s.fPixmap.height() - 1;
 
     if (count >= 8) {
         SkFractionalInt dx4 = dx * 4;
@@ -187,8 +192,8 @@ static void PERSP_NOFILTER_NAME(const SkBitmapProcState& s,
 
     PREAMBLE(s);
     // max{X,Y} are int here, but later shown/assumed to fit in 16 bits
-    int maxX = s.fBitmap->width() - 1;
-    int maxY = s.fBitmap->height() - 1;
+    int maxX = s.fPixmap.width() - 1;
+    int maxY = s.fPixmap.height() - 1;
 
     SkPerspIter iter(s.fInvMatrix,
                      SkIntToScalar(x) + SK_ScalarHalf,
@@ -293,7 +298,7 @@ static void SCALE_FILTER_NAME(const SkBitmapProcState& s,
 
     PREAMBLE(s);
 
-    const unsigned maxX = s.fBitmap->width() - 1;
+    const unsigned maxX = s.fPixmap.width() - 1;
     const SkFixed one = s.fFilterOneX;
     const SkFractionalInt dx = s.fInvSxFractionalInt;
     SkFractionalInt fx;
@@ -303,7 +308,7 @@ static void SCALE_FILTER_NAME(const SkBitmapProcState& s,
         s.fInvProc(s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf,
                                  SkIntToScalar(y) + SK_ScalarHalf, &pt);
         const SkFixed fy = SkScalarToFixed(pt.fY) - (s.fFilterOneY >> 1);
-        const unsigned maxY = s.fBitmap->height() - 1;
+        const unsigned maxY = s.fPixmap.height() - 1;
         // compute our two Y values up front
         *xy++ = PACK_FILTER_Y_NAME(fy, maxY, s.fFilterOneY PREAMBLE_ARG_Y);
         // now initialize fx
@@ -369,8 +374,8 @@ static void AFFINE_FILTER_NAME(const SkBitmapProcState& s,
     SkFixed fy = SkScalarToFixed(srcPt.fY) - (oneY >> 1);
     SkFixed dx = s.fInvSx;
     SkFixed dy = s.fInvKy;
-    unsigned maxX = s.fBitmap->width() - 1;
-    unsigned maxY = s.fBitmap->height() - 1;
+    unsigned maxX = s.fPixmap.width() - 1;
+    unsigned maxY = s.fPixmap.height() - 1;
 
     if (count >= 4) {
         int32x4_t wide_fy, wide_fx;
@@ -420,8 +425,8 @@ static void PERSP_FILTER_NAME(const SkBitmapProcState& s,
     SkASSERT(s.fInvType & SkMatrix::kPerspective_Mask);
 
     PREAMBLE(s);
-    unsigned maxX = s.fBitmap->width() - 1;
-    unsigned maxY = s.fBitmap->height() - 1;
+    unsigned maxX = s.fPixmap.width() - 1;
+    unsigned maxY = s.fPixmap.height() - 1;
     SkFixed oneX = s.fFilterOneX;
     SkFixed oneY = s.fFilterOneY;
 
diff --git a/gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp
index 1f3bbc1f8f71..68d920d8d81f 100644
--- a/gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp
+++ b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp
@@ -14,13 +14,13 @@
 void S32_opaque_D32_filter_DX_SSE2(const SkBitmapProcState& s,
                                    const uint32_t* xy,
                                    int count, uint32_t* colors) {
-    SkASSERT(count > 0 && colors != NULL);
-    SkASSERT(s.fFilterLevel != SkPaint::kNone_FilterLevel);
-    SkASSERT(kN32_SkColorType == s.fBitmap->colorType());
+    SkASSERT(count > 0 && colors != nullptr);
+    SkASSERT(s.fFilterLevel != kNone_SkFilterQuality);
+    SkASSERT(kN32_SkColorType == s.fPixmap.colorType());
     SkASSERT(s.fAlphaScale == 256);
 
-    const char* srcAddr = static_cast<const char*>(s.fBitmap->getPixels());
-    size_t rb = s.fBitmap->rowBytes();
+    const char* srcAddr = static_cast<const char*>(s.fPixmap.addr());
+    size_t rb = s.fPixmap.rowBytes();
     uint32_t XY = *xy++;
     unsigned y0 = XY >> 14;
     const uint32_t* row0 = reinterpret_cast<const uint32_t*>(srcAddr + (y0 >> 4) * rb);
@@ -120,13 +120,13 @@ void S32_opaque_D32_filter_DX_SSE2(const SkBitmapProcState& s,
 void S32_alpha_D32_filter_DX_SSE2(const SkBitmapProcState& s,
                                   const uint32_t* xy,
                                   int count, uint32_t* colors) {
-    SkASSERT(count > 0 && colors != NULL);
-    SkASSERT(s.fFilterLevel != SkPaint::kNone_FilterLevel);
-    SkASSERT(kN32_SkColorType == s.fBitmap->colorType());
+    SkASSERT(count > 0 && colors != nullptr);
+    SkASSERT(s.fFilterLevel != kNone_SkFilterQuality);
+    SkASSERT(kN32_SkColorType == s.fPixmap.colorType());
     SkASSERT(s.fAlphaScale < 256);
 
-    const char* srcAddr = static_cast<const char*>(s.fBitmap->getPixels());
-    size_t rb = s.fBitmap->rowBytes();
+    const char* srcAddr = static_cast<const char*>(s.fPixmap.addr());
+    size_t rb = s.fPixmap.rowBytes();
     uint32_t XY = *xy++;
     unsigned y0 = XY >> 14;
     const uint32_t* row0 = reinterpret_cast<const uint32_t*>(srcAddr + (y0 >> 4) * rb);
@@ -249,7 +249,7 @@ void ClampX_ClampY_filter_scale_SSE2(const SkBitmapProcState& s, uint32_t xy[],
                              SkMatrix::kScale_Mask)) == 0);
     SkASSERT(s.fInvKy == 0);
 
-    const unsigned maxX = s.fBitmap->width() - 1;
+    const unsigned maxX = s.fPixmap.width() - 1;
     const SkFixed one = s.fFilterOneX;
     const SkFixed dx = s.fInvSx;
     SkFixed fx;
@@ -258,7 +258,7 @@ void ClampX_ClampY_filter_scale_SSE2(const SkBitmapProcState& s, uint32_t xy[],
     s.fInvProc(s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf,
                              SkIntToScalar(y) + SK_ScalarHalf, &pt);
     const SkFixed fy = SkScalarToFixed(pt.fY) - (s.fFilterOneY >> 1);
-    const unsigned maxY = s.fBitmap->height() - 1;
+    const unsigned maxY = s.fPixmap.height() - 1;
     // compute our two Y values up front
     *xy++ = ClampX_ClampY_pack_filter(fy, maxY, s.fFilterOneY);
     // now initialize fx
@@ -373,13 +373,13 @@ void ClampX_ClampY_nofilter_scale_SSE2(const SkBitmapProcState& s,
                              SkMatrix::kScale_Mask)) == 0);
 
     // we store y, x, x, x, x, x
-    const unsigned maxX = s.fBitmap->width() - 1;
+    const unsigned maxX = s.fPixmap.width() - 1;
     SkFixed fx;
     SkPoint pt;
     s.fInvProc(s.fInvMatrix, SkIntToScalar(x) + SK_ScalarHalf,
                              SkIntToScalar(y) + SK_ScalarHalf, &pt);
     fx = SkScalarToFixed(pt.fY);
-    const unsigned maxY = s.fBitmap->height() - 1;
+    const unsigned maxY = s.fPixmap.height() - 1;
     *xy++ = SkClampMax(fx >> 16, maxY);
     fx = SkScalarToFixed(pt.fX);
 
@@ -500,8 +500,8 @@ void ClampX_ClampY_filter_affine_SSE2(const SkBitmapProcState& s,
     SkFixed fy = SkScalarToFixed(srcPt.fY) - (oneY >> 1);
     SkFixed dx = s.fInvSx;
     SkFixed dy = s.fInvKy;
-    unsigned maxX = s.fBitmap->width() - 1;
-    unsigned maxY = s.fBitmap->height() - 1;
+    unsigned maxX = s.fPixmap.width() - 1;
+    unsigned maxY = s.fPixmap.height() - 1;
 
     if (count >= 2 && (maxX <= 0xFFFF)) {
         SkFixed dx2 = dx + dx;
@@ -574,8 +574,8 @@ void ClampX_ClampY_nofilter_affine_SSE2(const SkBitmapProcState& s,
     SkFixed fy = SkScalarToFixed(srcPt.fY);
     SkFixed dx = s.fInvSx;
     SkFixed dy = s.fInvKy;
-    int maxX = s.fBitmap->width() - 1;
-    int maxY = s.fBitmap->height() - 1;
+    int maxX = s.fPixmap.width() - 1;
+    int maxY = s.fPixmap.height() - 1;
 
     if (count >= 4 && (maxX <= 0xFFFF)) {
         while (((size_t)xy & 0x0F) != 0) {
@@ -640,14 +640,14 @@ void ClampX_ClampY_nofilter_affine_SSE2(const SkBitmapProcState& s,
 void S32_D16_filter_DX_SSE2(const SkBitmapProcState& s,
                             const uint32_t* xy,
                             int count, uint16_t* colors) {
-    SkASSERT(count > 0 && colors != NULL);
-    SkASSERT(s.fFilterLevel != SkPaint::kNone_FilterLevel);
-    SkASSERT(kN32_SkColorType == s.fBitmap->colorType());
-    SkASSERT(s.fBitmap->isOpaque());
+    SkASSERT(count > 0 && colors != nullptr);
+    SkASSERT(s.fFilterLevel != kNone_SkFilterQuality);
+    SkASSERT(kN32_SkColorType == s.fPixmap.colorType());
+    SkASSERT(s.fPixmap.isOpaque());
 
     SkPMColor dstColor;
-    const char* srcAddr = static_cast<const char*>(s.fBitmap->getPixels());
-    size_t rb = s.fBitmap->rowBytes();
+    const char* srcAddr = static_cast<const char*>(s.fPixmap.addr());
+    size_t rb = s.fPixmap.rowBytes();
     uint32_t XY = *xy++;
     unsigned y0 = XY >> 14;
     const uint32_t* row0 = reinterpret_cast<const uint32_t*>(srcAddr + (y0 >> 4) * rb);
diff --git a/gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSE2.h b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSE2.h
index 82c5cc8d6e14..82bf2cdae179 100644
--- a/gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSE2.h
+++ b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSE2.h
@@ -16,8 +16,6 @@ void S32_opaque_D32_filter_DX_SSE2(const SkBitmapProcState& s,
 void S32_alpha_D32_filter_DX_SSE2(const SkBitmapProcState& s,
                                   const uint32_t* xy,
                                   int count, uint32_t* colors);
-void Color32_SSE2(SkPMColor dst[], const SkPMColor src[], int count,
-                  SkPMColor color);
 void ClampX_ClampY_filter_scale_SSE2(const SkBitmapProcState& s, uint32_t xy[],
                                      int count, int x, int y);
 void ClampX_ClampY_nofilter_scale_SSE2(const SkBitmapProcState& s,
diff --git a/gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp
index 165f1f5ce068..8e381eb3c27e 100644
--- a/gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp
+++ b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "SkBitmapProcState_opts_SSSE3.h"
+#include "SkColorPriv.h"
 #include "SkPaint.h"
 #include "SkUtils.h"
 
@@ -392,9 +393,9 @@ template<bool has_alpha>
 void S32_generic_D32_filter_DX_SSSE3(const SkBitmapProcState& s,
                                      const uint32_t* xy,
                                      int count, uint32_t* colors) {
-    SkASSERT(count > 0 && colors != NULL);
-    SkASSERT(s.fFilterLevel != SkPaint::kNone_FilterLevel);
-    SkASSERT(kN32_SkColorType == s.fBitmap->colorType());
+    SkASSERT(count > 0 && colors != nullptr);
+    SkASSERT(s.fFilterLevel != kNone_SkFilterQuality);
+    SkASSERT(kN32_SkColorType == s.fPixmap.colorType());
     if (has_alpha) {
         SkASSERT(s.fAlphaScale < 256);
     } else {
@@ -402,8 +403,8 @@ void S32_generic_D32_filter_DX_SSSE3(const SkBitmapProcState& s,
     }
 
     const uint8_t* src_addr =
-            static_cast<const uint8_t*>(s.fBitmap->getPixels());
-    const size_t rb = s.fBitmap->rowBytes();
+            static_cast<const uint8_t*>(s.fPixmap.addr());
+    const size_t rb = s.fPixmap.rowBytes();
     const uint32_t XY = *xy++;
     const unsigned y0 = XY >> 14;
     const uint32_t* row0 =
@@ -584,9 +585,9 @@ template<bool has_alpha>
 void S32_generic_D32_filter_DXDY_SSSE3(const SkBitmapProcState& s,
                                        const uint32_t* xy,
                                        int count, uint32_t* colors) {
-    SkASSERT(count > 0 && colors != NULL);
-    SkASSERT(s.fFilterLevel != SkPaint::kNone_FilterLevel);
-    SkASSERT(kN32_SkColorType == s.fBitmap->colorType());
+    SkASSERT(count > 0 && colors != nullptr);
+    SkASSERT(s.fFilterLevel != kNone_SkFilterQuality);
+    SkASSERT(kN32_SkColorType == s.fPixmap.colorType());
     if (has_alpha) {
         SkASSERT(s.fAlphaScale < 256);
     } else {
@@ -594,8 +595,8 @@ void S32_generic_D32_filter_DXDY_SSSE3(const SkBitmapProcState& s,
     }
 
     const uint8_t* src_addr =
-                        static_cast<const uint8_t*>(s.fBitmap->getPixels());
-    const size_t rb = s.fBitmap->rowBytes();
+                        static_cast<const uint8_t*>(s.fPixmap.addr());
+    const size_t rb = s.fPixmap.rowBytes();
 
     // vector constants
     const __m128i mask_dist_select = _mm_set_epi8(12, 12, 12, 12,
@@ -720,17 +721,39 @@ void S32_alpha_D32_filter_DX_SSSE3(const SkBitmapProcState& s,
 }
 
 void S32_opaque_D32_filter_DXDY_SSSE3(const SkBitmapProcState& s,
-                                    const uint32_t* xy,
-                                    int count, uint32_t* colors) {
+                                      const uint32_t* xy,
+                                      int count, uint32_t* colors) {
     S32_generic_D32_filter_DXDY_SSSE3<false>(s, xy, count, colors);
 }
 
 void S32_alpha_D32_filter_DXDY_SSSE3(const SkBitmapProcState& s,
-                                   const uint32_t* xy,
-                                   int count, uint32_t* colors) {
+                                     const uint32_t* xy,
+                                     int count, uint32_t* colors) {
     S32_generic_D32_filter_DXDY_SSSE3<true>(s, xy, count, colors);
 }
 
+void S32_D16_filter_DX_SSSE3(const SkBitmapProcState& s,
+                             const uint32_t* xy,
+                             int count, uint16_t* colors) {
+    SkASSERT(254 >= count);
+    SkAutoSTMalloc<254, uint32_t> colors32(count);
+    S32_generic_D32_filter_DX_SSSE3<false>(s, xy, count, colors32);
+    for(int i = 0; i < count; i++) {
+        *colors++ = SkPixel32ToPixel16(colors32[i]);
+    }
+}
+
+void S32_D16_filter_DXDY_SSSE3(const SkBitmapProcState& s,
+                               const uint32_t* xy,
+                               int count, uint16_t* colors) {
+    SkASSERT(64 >= count);
+    SkAutoSTMalloc<64, uint32_t> colors32(count);
+    S32_generic_D32_filter_DXDY_SSSE3<false>(s, xy, count, colors32);
+    for(int i = 0; i < count; i++) {
+        *colors++ = SkPixel32ToPixel16(colors32[i]);
+    }
+}
+
 #else // SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSSE3
 
 void S32_opaque_D32_filter_DX_SSSE3(const SkBitmapProcState& s,
@@ -746,14 +769,26 @@ void S32_alpha_D32_filter_DX_SSSE3(const SkBitmapProcState& s,
 }
 
 void S32_opaque_D32_filter_DXDY_SSSE3(const SkBitmapProcState& s,
-                                    const uint32_t* xy,
-                                    int count, uint32_t* colors) {
+                                      const uint32_t* xy,
+                                      int count, uint32_t* colors) {
     sk_throw();
 }
 
 void S32_alpha_D32_filter_DXDY_SSSE3(const SkBitmapProcState& s,
-                                   const uint32_t* xy,
-                                   int count, uint32_t* colors) {
+                                     const uint32_t* xy,
+                                     int count, uint32_t* colors) {
+    sk_throw();
+}
+
+void S32_D16_filter_DX_SSSE3(const SkBitmapProcState& s,
+                             const uint32_t* xy,
+                             int count, uint16_t* colors) {
+    sk_throw();
+}
+
+void S32_D16_filter_DXDY_SSSE3(const SkBitmapProcState& s,
+                               const uint32_t* xy,
+                               int count, uint16_t* colors) {
     sk_throw();
 }
 
diff --git a/gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSSE3.h b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSSE3.h
index 9fd074aacf27..c7a9a899236a 100644
--- a/gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSSE3.h
+++ b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSSE3.h
@@ -23,4 +23,11 @@ void S32_alpha_D32_filter_DXDY_SSSE3(const SkBitmapProcState& s,
                                    const uint32_t* xy,
                                    int count, uint32_t* colors);
 
+void S32_D16_filter_DX_SSSE3(const SkBitmapProcState& s,
+                             const uint32_t* xy,
+                             int count, uint16_t* colors);
+void S32_D16_filter_DXDY_SSSE3(const SkBitmapProcState& s,
+                               const uint32_t* xy,
+                               int count, uint16_t* colors);
+
 #endif
diff --git a/gfx/skia/skia/src/opts/SkBitmapProcState_opts_arm.cpp b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_arm.cpp
index 8f24c39a2e17..e3726e727477 100644
--- a/gfx/skia/skia/src/opts/SkBitmapProcState_opts_arm.cpp
+++ b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_arm.cpp
@@ -16,212 +16,7 @@
 
 #include "SkConvolver.h"
 
-#if !defined(SK_CPU_ARM64) && SK_ARM_ARCH >= 6 && !defined(SK_CPU_BENDIAN)
-void SI8_D16_nofilter_DX_arm(
-    const SkBitmapProcState& s,
-    const uint32_t* SK_RESTRICT xy,
-    int count,
-    uint16_t* SK_RESTRICT colors) SK_ATTRIBUTE_OPTIMIZE_O1;
-
-void SI8_D16_nofilter_DX_arm(const SkBitmapProcState& s,
-                             const uint32_t* SK_RESTRICT xy,
-                             int count, uint16_t* SK_RESTRICT colors) {
-    SkASSERT(count > 0 && colors != NULL);
-    SkASSERT(s.fInvType <= (SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask));
-    SkASSERT(SkPaint::kNone_FilterLevel == s.fFilterLevel);
-
-    const uint16_t* SK_RESTRICT table = s.fBitmap->getColorTable()->lock16BitCache();
-    const uint8_t* SK_RESTRICT srcAddr = (const uint8_t*)s.fBitmap->getPixels();
-
-    // buffer is y32, x16, x16, x16, x16, x16
-    // bump srcAddr to the proper row, since we're told Y never changes
-    SkASSERT((unsigned)xy[0] < (unsigned)s.fBitmap->height());
-    srcAddr = (const uint8_t*)((const char*)srcAddr +
-                               xy[0] * s.fBitmap->rowBytes());
-
-    uint8_t src;
-
-    if (1 == s.fBitmap->width()) {
-        src = srcAddr[0];
-        uint16_t dstValue = table[src];
-        sk_memset16(colors, dstValue, count);
-    } else {
-        int i;
-        int count8 = count >> 3;
-        const uint16_t* SK_RESTRICT xx = (const uint16_t*)(xy + 1);
-
-        asm volatile (
-            "cmp        %[count8], #0                  \n\t"  // compare loop counter with 0
-            "beq        2f                             \n\t"  // if loop counter == 0, exit
-            "1:                                        \n\t"
-            "ldmia      %[xx]!, {r5, r7, r9, r11}      \n\t"  // load ptrs to pixels 0-7
-            "subs       %[count8], %[count8], #1       \n\t"  // decrement loop counter
-            "uxth       r4, r5                         \n\t"  // extract ptr 0
-            "mov        r5, r5, lsr #16                \n\t"  // extract ptr 1
-            "uxth       r6, r7                         \n\t"  // extract ptr 2
-            "mov        r7, r7, lsr #16                \n\t"  // extract ptr 3
-            "ldrb       r4, [%[srcAddr], r4]           \n\t"  // load pixel 0 from image
-            "uxth       r8, r9                         \n\t"  // extract ptr 4
-            "ldrb       r5, [%[srcAddr], r5]           \n\t"  // load pixel 1 from image
-            "mov        r9, r9, lsr #16                \n\t"  // extract ptr 5
-            "ldrb       r6, [%[srcAddr], r6]           \n\t"  // load pixel 2 from image
-            "uxth       r10, r11                       \n\t"  // extract ptr 6
-            "ldrb       r7, [%[srcAddr], r7]           \n\t"  // load pixel 3 from image
-            "mov        r11, r11, lsr #16              \n\t"  // extract ptr 7
-            "ldrb       r8, [%[srcAddr], r8]           \n\t"  // load pixel 4 from image
-            "add        r4, r4, r4                     \n\t"  // double pixel 0 for RGB565 lookup
-            "ldrb       r9, [%[srcAddr], r9]           \n\t"  // load pixel 5 from image
-            "add        r5, r5, r5                     \n\t"  // double pixel 1 for RGB565 lookup
-            "ldrb       r10, [%[srcAddr], r10]         \n\t"  // load pixel 6 from image
-            "add        r6, r6, r6                     \n\t"  // double pixel 2 for RGB565 lookup
-            "ldrb       r11, [%[srcAddr], r11]         \n\t"  // load pixel 7 from image
-            "add        r7, r7, r7                     \n\t"  // double pixel 3 for RGB565 lookup
-            "ldrh       r4, [%[table], r4]             \n\t"  // load pixel 0 RGB565 from colmap
-            "add        r8, r8, r8                     \n\t"  // double pixel 4 for RGB565 lookup
-            "ldrh       r5, [%[table], r5]             \n\t"  // load pixel 1 RGB565 from colmap
-            "add        r9, r9, r9                     \n\t"  // double pixel 5 for RGB565 lookup
-            "ldrh       r6, [%[table], r6]             \n\t"  // load pixel 2 RGB565 from colmap
-            "add        r10, r10, r10                  \n\t"  // double pixel 6 for RGB565 lookup
-            "ldrh       r7, [%[table], r7]             \n\t"  // load pixel 3 RGB565 from colmap
-            "add        r11, r11, r11                  \n\t"  // double pixel 7 for RGB565 lookup
-            "ldrh       r8, [%[table], r8]             \n\t"  // load pixel 4 RGB565 from colmap
-            "ldrh       r9, [%[table], r9]             \n\t"  // load pixel 5 RGB565 from colmap
-            "ldrh       r10, [%[table], r10]           \n\t"  // load pixel 6 RGB565 from colmap
-            "ldrh       r11, [%[table], r11]           \n\t"  // load pixel 7 RGB565 from colmap
-            "pkhbt      r5, r4, r5, lsl #16            \n\t"  // pack pixels 0 and 1
-            "pkhbt      r6, r6, r7, lsl #16            \n\t"  // pack pixels 2 and 3
-            "pkhbt      r8, r8, r9, lsl #16            \n\t"  // pack pixels 4 and 5
-            "pkhbt      r10, r10, r11, lsl #16         \n\t"  // pack pixels 6 and 7
-            "stmia      %[colors]!, {r5, r6, r8, r10}  \n\t"  // store last 8 pixels
-            "bgt        1b                             \n\t"  // loop if counter > 0
-            "2:                                        \n\t"
-            : [xx] "+r" (xx), [count8] "+r" (count8), [colors] "+r" (colors)
-            : [table] "r" (table), [srcAddr] "r" (srcAddr)
-            : "memory", "cc", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11"
-        );
-
-        for (i = (count & 7); i > 0; --i) {
-            src = srcAddr[*xx++]; *colors++ = table[src];
-        }
-    }
-
-    s.fBitmap->getColorTable()->unlock16BitCache();
-}
-
-void SI8_opaque_D32_nofilter_DX_arm(
-    const SkBitmapProcState& s,
-    const uint32_t* SK_RESTRICT xy,
-    int count,
-    SkPMColor* SK_RESTRICT colors) SK_ATTRIBUTE_OPTIMIZE_O1;
-
-void SI8_opaque_D32_nofilter_DX_arm(const SkBitmapProcState& s,
-                                    const uint32_t* SK_RESTRICT xy,
-                                    int count, SkPMColor* SK_RESTRICT colors) {
-    SkASSERT(count > 0 && colors != NULL);
-    SkASSERT(s.fInvType <= (SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask));
-    SkASSERT(SkPaint::kNone_FilterLevel == s.fFilterLevel);
-
-    const SkPMColor* SK_RESTRICT table = s.fBitmap->getColorTable()->lockColors();
-    const uint8_t* SK_RESTRICT srcAddr = (const uint8_t*)s.fBitmap->getPixels();
-
-    // buffer is y32, x16, x16, x16, x16, x16
-    // bump srcAddr to the proper row, since we're told Y never changes
-    SkASSERT((unsigned)xy[0] < (unsigned)s.fBitmap->height());
-    srcAddr = (const uint8_t*)((const char*)srcAddr + xy[0] * s.fBitmap->rowBytes());
-
-    if (1 == s.fBitmap->width()) {
-        uint8_t src = srcAddr[0];
-        SkPMColor dstValue = table[src];
-        sk_memset32(colors, dstValue, count);
-    } else {
-        const uint16_t* xx = (const uint16_t*)(xy + 1);
-
-        asm volatile (
-            "subs       %[count], %[count], #8        \n\t"   // decrement count by 8, set flags
-            "blt        2f                            \n\t"   // if count < 0, branch to singles
-            "1:                                       \n\t"   // eights loop
-            "ldmia      %[xx]!, {r5, r7, r9, r11}     \n\t"   // load ptrs to pixels 0-7
-            "uxth       r4, r5                        \n\t"   // extract ptr 0
-            "mov        r5, r5, lsr #16               \n\t"   // extract ptr 1
-            "uxth       r6, r7                        \n\t"   // extract ptr 2
-            "mov        r7, r7, lsr #16               \n\t"   // extract ptr 3
-            "ldrb       r4, [%[srcAddr], r4]          \n\t"   // load pixel 0 from image
-            "uxth       r8, r9                        \n\t"   // extract ptr 4
-            "ldrb       r5, [%[srcAddr], r5]          \n\t"   // load pixel 1 from image
-            "mov        r9, r9, lsr #16               \n\t"   // extract ptr 5
-            "ldrb       r6, [%[srcAddr], r6]          \n\t"   // load pixel 2 from image
-            "uxth       r10, r11                      \n\t"   // extract ptr 6
-            "ldrb       r7, [%[srcAddr], r7]          \n\t"   // load pixel 3 from image
-            "mov        r11, r11, lsr #16             \n\t"   // extract ptr 7
-            "ldrb       r8, [%[srcAddr], r8]          \n\t"   // load pixel 4 from image
-            "ldrb       r9, [%[srcAddr], r9]          \n\t"   // load pixel 5 from image
-            "ldrb       r10, [%[srcAddr], r10]        \n\t"   // load pixel 6 from image
-            "ldrb       r11, [%[srcAddr], r11]        \n\t"   // load pixel 7 from image
-            "ldr        r4, [%[table], r4, lsl #2]    \n\t"   // load pixel 0 SkPMColor from colmap
-            "ldr        r5, [%[table], r5, lsl #2]    \n\t"   // load pixel 1 SkPMColor from colmap
-            "ldr        r6, [%[table], r6, lsl #2]    \n\t"   // load pixel 2 SkPMColor from colmap
-            "ldr        r7, [%[table], r7, lsl #2]    \n\t"   // load pixel 3 SkPMColor from colmap
-            "ldr        r8, [%[table], r8, lsl #2]    \n\t"   // load pixel 4 SkPMColor from colmap
-            "ldr        r9, [%[table], r9, lsl #2]    \n\t"   // load pixel 5 SkPMColor from colmap
-            "ldr        r10, [%[table], r10, lsl #2]  \n\t"   // load pixel 6 SkPMColor from colmap
-            "ldr        r11, [%[table], r11, lsl #2]  \n\t"   // load pixel 7 SkPMColor from colmap
-            "subs       %[count], %[count], #8        \n\t"   // decrement loop counter
-            "stmia      %[colors]!, {r4-r11}          \n\t"   // store 8 pixels
-            "bge        1b                            \n\t"   // loop if counter >= 0
-            "2:                                       \n\t"
-            "adds       %[count], %[count], #8        \n\t"   // fix up counter, set flags
-            "beq        4f                            \n\t"   // if count == 0, branch to exit
-            "3:                                       \n\t"   // singles loop
-            "ldrh       r4, [%[xx]], #2               \n\t"   // load pixel ptr
-            "subs       %[count], %[count], #1        \n\t"   // decrement loop counter
-            "ldrb       r5, [%[srcAddr], r4]          \n\t"   // load pixel from image
-            "ldr        r6, [%[table], r5, lsl #2]    \n\t"   // load SkPMColor from colmap
-            "str        r6, [%[colors]], #4           \n\t"   // store pixel, update ptr
-            "bne        3b                            \n\t"   // loop if counter != 0
-            "4:                                       \n\t"   // exit
-            : [xx] "+r" (xx), [count] "+r" (count), [colors] "+r" (colors)
-            : [table] "r" (table), [srcAddr] "r" (srcAddr)
-            : "memory", "cc", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11"
-        );
-    }
-
-    s.fBitmap->getColorTable()->unlockColors();
-}
-#endif // !defined(SK_CPU_ARM64) && SK_ARM_ARCH >= 6 && !defined(SK_CPU_BENDIAN)
-
-///////////////////////////////////////////////////////////////////////////////
-
-/*  If we replace a sampleproc, then we null-out the associated shaderproc,
-    otherwise the shader won't even look at the matrix/sampler
- */
-void SkBitmapProcState::platformProcs() {
-#if !defined(SK_CPU_ARM64) && SK_ARM_ARCH >= 6 && !defined(SK_CPU_BENDIAN)
-    bool isOpaque = 256 == fAlphaScale;
-    bool justDx = false;
-
-    if (fInvType <= (SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask)) {
-        justDx = true;
-    }
-
-    switch (fBitmap->colorType()) {
-        case kIndex_8_SkColorType:
-            if (justDx && SkPaint::kNone_FilterLevel == fFilterLevel) {
-#if 0   /* crashing on android device */
-                fSampleProc16 = SI8_D16_nofilter_DX_arm;
-                fShaderProc16 = NULL;
-#endif
-                if (isOpaque) {
-                    // this one is only very slighty faster than the C version
-                    fSampleProc32 = SI8_opaque_D32_nofilter_DX_arm;
-                    fShaderProc32 = NULL;
-                }
-            }
-            break;
-        default:
-            break;
-    }
-#endif
-}
+void SkBitmapProcState::platformProcs() { }
 
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/gfx/skia/skia/src/opts/SkBitmapProcState_opts_mips_dsp.cpp b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_mips_dsp.cpp
index d4f601baa889..dac4e20381fb 100644
--- a/gfx/skia/skia/src/opts/SkBitmapProcState_opts_mips_dsp.cpp
+++ b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_mips_dsp.cpp
@@ -15,16 +15,16 @@
 static void SI8_D16_nofilter_DX_mips_dsp(const SkBitmapProcState& s,
                                          const uint32_t* SK_RESTRICT xy,
                                          int count, uint16_t* SK_RESTRICT colors) {
-    SkASSERT(count > 0 && colors != NULL);
+    SkASSERT(count > 0 && colors != nullptr);
     SkASSERT(s.fInvType <= (SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask));
-    SkASSERT(SkPaint::kNone_FilterLevel == s.fFilterLevel);
-    const uint16_t* SK_RESTRICT table = s.fBitmap->getColorTable()->lock16BitCache();
-    const uint8_t* SK_RESTRICT srcAddr = (const uint8_t*)s.fBitmap->getPixels();
-    SkASSERT((unsigned)xy[0] < (unsigned)s.fBitmap->height());
-    srcAddr = (const uint8_t*)((const char*)srcAddr + xy[0] * s.fBitmap->rowBytes());
+    SkASSERT(kNone_SkFilterQuality == s.fFilterLevel);
+    const uint16_t* SK_RESTRICT table = s.fPixmap.ctable()->read16BitCache();
+    const uint8_t* SK_RESTRICT srcAddr = (const uint8_t*)s.fPixmap.addr();
+    SkASSERT((unsigned)xy[0] < (unsigned)s.fPixmap.height());
+    srcAddr = (const uint8_t*)((const char*)srcAddr + xy[0] * s.fPixmap.rowBytes());
     uint8_t src;
 
-    if (1 == s.fBitmap->width()) {
+    if (1 == s.fPixmap.width()) {
         src = srcAddr[0];
         uint16_t dstValue = table[src];
         sk_memset16(colors, dstValue, count);
@@ -142,20 +142,19 @@ static void SI8_D16_nofilter_DX_mips_dsp(const SkBitmapProcState& s,
             src = srcAddr[*xx++]; *colors++ = table[src];
         }
     }
-    s.fBitmap->getColorTable()->unlock16BitCache();
 }
 
 static void SI8_opaque_D32_nofilter_DX_mips_dsp(const SkBitmapProcState& s,
                                                 const uint32_t* SK_RESTRICT xy,
                                                 int count, SkPMColor* SK_RESTRICT colors) {
-    SkASSERT(count > 0 && colors != NULL);
+    SkASSERT(count > 0 && colors != nullptr);
     SkASSERT(s.fInvType <= (SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask));
-    SkASSERT(SkPaint::kNone_FilterLevel == s.fFilterLevel);
-    const SkPMColor* SK_RESTRICT table = s.fBitmap->getColorTable()->lockColors();
-    const uint8_t* SK_RESTRICT srcAddr = (const uint8_t*)s.fBitmap->getPixels();
-    srcAddr = (const uint8_t*)((const char*)srcAddr + xy[0] * s.fBitmap->rowBytes());
+    SkASSERT(kNone_SkFilterQuality == s.fFilterLevel);
+    const SkPMColor* SK_RESTRICT table = s.fPixmap.ctable()->readColors();
+    const uint8_t* SK_RESTRICT srcAddr = (const uint8_t*)s.fPixmap.addr();
+    srcAddr = (const uint8_t*)((const char*)srcAddr + xy[0] * s.fPixmap.rowBytes());
 
-    if (1 == s.fBitmap->width()) {
+    if (1 == s.fPixmap.width()) {
         uint8_t src = srcAddr[0];
         SkPMColor dstValue = table[src];
         sk_memset32(colors, dstValue, count);
@@ -363,7 +362,6 @@ static void SI8_opaque_D32_nofilter_DX_mips_dsp(const SkBitmapProcState& s,
               "t4", "t5", "t6", "t7", "t8"
         );
     }
-    s.fBitmap->getColorTable()->unlockColors();
 }
 
 /*  If we replace a sampleproc, then we null-out the associated shaderproc,
@@ -378,14 +376,14 @@ void SkBitmapProcState::platformProcs() {
         justDx = true;
     }
 
-    switch (fBitmap->colorType()) {
+    switch (fPixmap.colorType()) {
         case kIndex_8_SkColorType:
-            if (justDx && SkPaint::kNone_FilterLevel == fFilterLevel) {
+            if (justDx && kNone_SkFilterQuality == fFilterLevel) {
                 fSampleProc16 = SI8_D16_nofilter_DX_mips_dsp;
-                fShaderProc16 = NULL;
+                fShaderProc16 = nullptr;
                 if (isOpaque) {
                     fSampleProc32 = SI8_opaque_D32_nofilter_DX_mips_dsp;
-                    fShaderProc32 = NULL;
+                    fShaderProc32 = nullptr;
                 }
             }
             break;
diff --git a/gfx/skia/skia/src/opts/SkBitmapProcState_opts_none.cpp b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_none.cpp
index 88aaa93e21a0..f2217f3503fc 100644
--- a/gfx/skia/skia/src/opts/SkBitmapProcState_opts_none.cpp
+++ b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_none.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
diff --git a/gfx/skia/skia/src/opts/SkBlitMask_opts.h b/gfx/skia/skia/src/opts/SkBlitMask_opts.h
new file mode 100644
index 000000000000..2f4fe6ffb8e0
--- /dev/null
+++ b/gfx/skia/skia/src/opts/SkBlitMask_opts.h
@@ -0,0 +1,206 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkBlitMask_opts_DEFINED
+#define SkBlitMask_opts_DEFINED
+
+#include "Sk4px.h"
+
+namespace SK_OPTS_NS {
+
+#if defined(SK_ARM_HAS_NEON)
+    // The Sk4px versions below will work fine with NEON, but we have had many indications
+    // that it doesn't perform as well as this NEON-specific code.  TODO(mtklein): why?
+    #include "SkColor_opts_neon.h"
+
+    template <bool isColor>
+    static void D32_A8_Opaque_Color_neon(void* SK_RESTRICT dst, size_t dstRB,
+                                         const void* SK_RESTRICT maskPtr, size_t maskRB,
+                                         SkColor color, int width, int height) {
+        SkPMColor pmc = SkPreMultiplyColor(color);
+        SkPMColor* SK_RESTRICT device = (SkPMColor*)dst;
+        const uint8_t* SK_RESTRICT mask = (const uint8_t*)maskPtr;
+        uint8x8x4_t vpmc;
+
+        maskRB -= width;
+        dstRB -= (width << 2);
+
+        if (width >= 8) {
+            vpmc.val[NEON_A] = vdup_n_u8(SkGetPackedA32(pmc));
+            vpmc.val[NEON_R] = vdup_n_u8(SkGetPackedR32(pmc));
+            vpmc.val[NEON_G] = vdup_n_u8(SkGetPackedG32(pmc));
+            vpmc.val[NEON_B] = vdup_n_u8(SkGetPackedB32(pmc));
+        }
+        do {
+            int w = width;
+            while (w >= 8) {
+                uint8x8_t vmask = vld1_u8(mask);
+                uint16x8_t vscale, vmask256 = SkAlpha255To256_neon8(vmask);
+                if (isColor) {
+                    vscale = vsubw_u8(vdupq_n_u16(256),
+                            SkAlphaMul_neon8(vpmc.val[NEON_A], vmask256));
+                } else {
+                    vscale = vsubw_u8(vdupq_n_u16(256), vmask);
+                }
+                uint8x8x4_t vdev = vld4_u8((uint8_t*)device);
+
+                vdev.val[NEON_A] =   SkAlphaMul_neon8(vpmc.val[NEON_A], vmask256)
+                    + SkAlphaMul_neon8(vdev.val[NEON_A], vscale);
+                vdev.val[NEON_R] =   SkAlphaMul_neon8(vpmc.val[NEON_R], vmask256)
+                    + SkAlphaMul_neon8(vdev.val[NEON_R], vscale);
+                vdev.val[NEON_G] =   SkAlphaMul_neon8(vpmc.val[NEON_G], vmask256)
+                    + SkAlphaMul_neon8(vdev.val[NEON_G], vscale);
+                vdev.val[NEON_B] =   SkAlphaMul_neon8(vpmc.val[NEON_B], vmask256)
+                    + SkAlphaMul_neon8(vdev.val[NEON_B], vscale);
+
+                vst4_u8((uint8_t*)device, vdev);
+
+                mask += 8;
+                device += 8;
+                w -= 8;
+            }
+
+            while (w--) {
+                unsigned aa = *mask++;
+                if (isColor) {
+                    *device = SkBlendARGB32(pmc, *device, aa);
+                } else {
+                    *device = SkAlphaMulQ(pmc, SkAlpha255To256(aa))
+                        + SkAlphaMulQ(*device, SkAlpha255To256(255 - aa));
+                }
+                device += 1;
+            };
+
+            device = (uint32_t*)((char*)device + dstRB);
+            mask += maskRB;
+
+        } while (--height != 0);
+    }
+
+    static void blit_mask_d32_a8_general(SkPMColor* dst, size_t dstRB,
+                                         const SkAlpha* mask, size_t maskRB,
+                                         SkColor color, int w, int h) {
+        D32_A8_Opaque_Color_neon<true>(dst, dstRB, mask, maskRB, color, w, h);
+    }
+
+    // As above, but made slightly simpler by requiring that color is opaque.
+    static void blit_mask_d32_a8_opaque(SkPMColor* dst, size_t dstRB,
+                                        const SkAlpha* mask, size_t maskRB,
+                                        SkColor color, int w, int h) {
+        D32_A8_Opaque_Color_neon<false>(dst, dstRB, mask, maskRB, color, w, h);
+    }
+
+    // Same as _opaque, but assumes color == SK_ColorBLACK, a very common and even simpler case.
+    static void blit_mask_d32_a8_black(SkPMColor* dst, size_t dstRB,
+                                       const SkAlpha* maskPtr, size_t maskRB,
+                                       int width, int height) {
+        SkPMColor* SK_RESTRICT device = (SkPMColor*)dst;
+        const uint8_t* SK_RESTRICT mask = (const uint8_t*)maskPtr;
+
+        maskRB -= width;
+        dstRB -= (width << 2);
+        do {
+            int w = width;
+            while (w >= 8) {
+                uint8x8_t vmask = vld1_u8(mask);
+                uint16x8_t vscale = vsubw_u8(vdupq_n_u16(256), vmask);
+                uint8x8x4_t vdevice = vld4_u8((uint8_t*)device);
+
+                vdevice = SkAlphaMulQ_neon8(vdevice, vscale);
+                vdevice.val[NEON_A] += vmask;
+
+                vst4_u8((uint8_t*)device, vdevice);
+
+                mask += 8;
+                device += 8;
+                w -= 8;
+            }
+            while (w-- > 0) {
+                unsigned aa = *mask++;
+                *device = (aa << SK_A32_SHIFT)
+                            + SkAlphaMulQ(*device, SkAlpha255To256(255 - aa));
+                device += 1;
+            };
+            device = (uint32_t*)((char*)device + dstRB);
+            mask += maskRB;
+        } while (--height != 0);
+    }
+
+#else
+    static void blit_mask_d32_a8_general(SkPMColor* dst, size_t dstRB,
+                                         const SkAlpha* mask, size_t maskRB,
+                                         SkColor color, int w, int h) {
+        auto s = Sk4px::DupPMColor(SkPreMultiplyColor(color));
+        auto fn = [&](const Sk4px& d, const Sk4px& aa) {
+            //  = (s + d(1-sa))aa + d(1-aa)
+            //  = s*aa + d(1-sa*aa)
+            auto left  = s.approxMulDiv255(aa),
+                 right = d.approxMulDiv255(left.alphas().inv());
+            return left + right;  // This does not overflow (exhaustively checked).
+        };
+        while (h --> 0) {
+            Sk4px::MapDstAlpha(w, dst, mask, fn);
+            dst  +=  dstRB / sizeof(*dst);
+            mask += maskRB / sizeof(*mask);
+        }
+    }
+
+    // As above, but made slightly simpler by requiring that color is opaque.
+    static void blit_mask_d32_a8_opaque(SkPMColor* dst, size_t dstRB,
+                                        const SkAlpha* mask, size_t maskRB,
+                                        SkColor color, int w, int h) {
+        SkASSERT(SkColorGetA(color) == 0xFF);
+        auto s = Sk4px::DupPMColor(SkPreMultiplyColor(color));
+        auto fn = [&](const Sk4px& d, const Sk4px& aa) {
+            //  = (s + d(1-sa))aa + d(1-aa)
+            //  = s*aa + d(1-sa*aa)
+            //   ~~~>
+            //  = s*aa + d(1-aa)
+            return s.approxMulDiv255(aa) + d.approxMulDiv255(aa.inv());
+        };
+        while (h --> 0) {
+            Sk4px::MapDstAlpha(w, dst, mask, fn);
+            dst  +=  dstRB / sizeof(*dst);
+            mask += maskRB / sizeof(*mask);
+        }
+    }
+
+    // Same as _opaque, but assumes color == SK_ColorBLACK, a very common and even simpler case.
+    static void blit_mask_d32_a8_black(SkPMColor* dst, size_t dstRB,
+                                       const SkAlpha* mask, size_t maskRB,
+                                       int w, int h) {
+        auto fn = [](const Sk4px& d, const Sk4px& aa) {
+            //   = (s + d(1-sa))aa + d(1-aa)
+            //   = s*aa + d(1-sa*aa)
+            //   ~~~>
+            // a = 1*aa + d(1-1*aa) = aa + d(1-aa)
+            // c = 0*aa + d(1-1*aa) =      d(1-aa)
+            return aa.zeroColors() + d.approxMulDiv255(aa.inv());
+        };
+        while (h --> 0) {
+            Sk4px::MapDstAlpha(w, dst, mask, fn);
+            dst  +=  dstRB / sizeof(*dst);
+            mask += maskRB / sizeof(*mask);
+        }
+    }
+#endif
+
+static void blit_mask_d32_a8(SkPMColor* dst, size_t dstRB,
+                             const SkAlpha* mask, size_t maskRB,
+                             SkColor color, int w, int h) {
+    if (color == SK_ColorBLACK) {
+        blit_mask_d32_a8_black(dst, dstRB, mask, maskRB, w, h);
+    } else if (SkColorGetA(color) == 0xFF) {
+        blit_mask_d32_a8_opaque(dst, dstRB, mask, maskRB, color, w, h);
+    } else {
+        blit_mask_d32_a8_general(dst, dstRB, mask, maskRB, color, w, h);
+    }
+}
+
+}  // SK_OPTS_NS
+
+#endif//SkBlitMask_opts_DEFINED
diff --git a/gfx/skia/skia/src/opts/SkBlitMask_opts_arm.cpp b/gfx/skia/skia/src/opts/SkBlitMask_opts_arm.cpp
index 11e172c0d1d3..c5a9ea4f3e60 100644
--- a/gfx/skia/skia/src/opts/SkBlitMask_opts_arm.cpp
+++ b/gfx/skia/skia/src/opts/SkBlitMask_opts_arm.cpp
@@ -11,32 +11,6 @@
 #include "SkUtilsArm.h"
 #include "SkBlitMask_opts_arm_neon.h"
 
-SkBlitMask::ColorProc SkBlitMask::PlatformColorProcs(SkColorType dstCT,
-                                                     SkMask::Format maskFormat,
-                                                     SkColor color) {
-#if SK_ARM_NEON_IS_NONE
-    return NULL;
-#else
-/* ** This has been disabled until we can diagnose and fix the SIGILL generated
-   ** in the NEON code.  See http://skbug.com/2067 for details.
-#if SK_ARM_NEON_IS_DYNAMIC
-    if (!sk_cpu_arm_has_neon()) {
-        return NULL;
-    }
-#endif
-    if ((kN32_SkColorType == dstCT) &&
-        (SkMask::kA8_Format == maskFormat)) {
-            return D32_A8_Factory_neon(color);
-    }
-*/
-#endif
-
-    // We don't need to handle the SkMask::kLCD16_Format case as the default
-    // LCD16 will call us through SkBlitMask::PlatformBlitRowProcs16()
-
-    return NULL;
-}
-
 SkBlitMask::BlitLCD16RowProc SkBlitMask::PlatformBlitRowProcs16(bool isOpaque) {
     if (isOpaque) {
         return SK_ARM_NEON_WRAP(SkBlitLCD16OpaqueRow);
@@ -48,5 +22,5 @@ SkBlitMask::BlitLCD16RowProc SkBlitMask::PlatformBlitRowProcs16(bool isOpaque) {
 SkBlitMask::RowProc SkBlitMask::PlatformRowProcs(SkColorType dstCT,
                                                  SkMask::Format maskFormat,
                                                  RowFlags flags) {
-    return NULL;
+    return nullptr;
 }
diff --git a/gfx/skia/skia/src/opts/SkBlitMask_opts_arm_neon.cpp b/gfx/skia/skia/src/opts/SkBlitMask_opts_arm_neon.cpp
index 84b5c3da5af0..ad12369db69a 100644
--- a/gfx/skia/skia/src/opts/SkBlitMask_opts_arm_neon.cpp
+++ b/gfx/skia/skia/src/opts/SkBlitMask_opts_arm_neon.cpp
@@ -1,130 +1,13 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include "SkBlitMask.h"
 #include "SkColor_opts_neon.h"
 
-static void D32_A8_Black_neon(void* SK_RESTRICT dst, size_t dstRB,
-                              const void* SK_RESTRICT maskPtr, size_t maskRB,
-                              SkColor, int width, int height) {
-    SkPMColor* SK_RESTRICT device = (SkPMColor*)dst;
-    const uint8_t* SK_RESTRICT mask = (const uint8_t*)maskPtr;
-
-    maskRB -= width;
-    dstRB -= (width << 2);
-    do {
-        int w = width;
-        while (w >= 8) {
-            uint8x8_t vmask = vld1_u8(mask);
-            uint16x8_t vscale = vsubw_u8(vdupq_n_u16(256), vmask);
-            uint8x8x4_t vdevice = vld4_u8((uint8_t*)device);
-
-            vdevice = SkAlphaMulQ_neon8(vdevice, vscale);
-            vdevice.val[NEON_A] += vmask;
-
-            vst4_u8((uint8_t*)device, vdevice);
-
-            mask += 8;
-            device += 8;
-            w -= 8;
-        }
-        while (w-- > 0) {
-            unsigned aa = *mask++;
-            *device = (aa << SK_A32_SHIFT)
-                        + SkAlphaMulQ(*device, SkAlpha255To256(255 - aa));
-            device += 1;
-        };
-        device = (uint32_t*)((char*)device + dstRB);
-        mask += maskRB;
-    } while (--height != 0);
-}
-
-template <bool isColor>
-static void D32_A8_Opaque_Color_neon(void* SK_RESTRICT dst, size_t dstRB,
-                                     const void* SK_RESTRICT maskPtr, size_t maskRB,
-                                     SkColor color, int width, int height) {
-    SkPMColor pmc = SkPreMultiplyColor(color);
-    SkPMColor* SK_RESTRICT device = (SkPMColor*)dst;
-    const uint8_t* SK_RESTRICT mask = (const uint8_t*)maskPtr;
-    uint8x8x4_t vpmc;
-
-    maskRB -= width;
-    dstRB -= (width << 2);
-
-    if (width >= 8) {
-        vpmc.val[NEON_A] = vdup_n_u8(SkGetPackedA32(pmc));
-        vpmc.val[NEON_R] = vdup_n_u8(SkGetPackedR32(pmc));
-        vpmc.val[NEON_G] = vdup_n_u8(SkGetPackedG32(pmc));
-        vpmc.val[NEON_B] = vdup_n_u8(SkGetPackedB32(pmc));
-    }
-    do {
-        int w = width;
-        while (w >= 8) {
-            uint8x8_t vmask = vld1_u8(mask);
-            uint16x8_t vscale, vmask256 = SkAlpha255To256_neon8(vmask);
-            if (isColor) {
-                vscale = vsubw_u8(vdupq_n_u16(256),
-                            SkAlphaMul_neon8(vpmc.val[NEON_A], vmask256));
-            } else {
-                vscale = vsubw_u8(vdupq_n_u16(256), vmask);
-            }
-            uint8x8x4_t vdev = vld4_u8((uint8_t*)device);
-
-            vdev.val[NEON_A] =   SkAlphaMul_neon8(vpmc.val[NEON_A], vmask256)
-                               + SkAlphaMul_neon8(vdev.val[NEON_A], vscale);
-            vdev.val[NEON_R] =   SkAlphaMul_neon8(vpmc.val[NEON_R], vmask256)
-                               + SkAlphaMul_neon8(vdev.val[NEON_R], vscale);
-            vdev.val[NEON_G] =   SkAlphaMul_neon8(vpmc.val[NEON_G], vmask256)
-                               + SkAlphaMul_neon8(vdev.val[NEON_G], vscale);
-            vdev.val[NEON_B] =   SkAlphaMul_neon8(vpmc.val[NEON_B], vmask256)
-                               + SkAlphaMul_neon8(vdev.val[NEON_B], vscale);
-
-            vst4_u8((uint8_t*)device, vdev);
-
-            mask += 8;
-            device += 8;
-            w -= 8;
-        }
-
-        while (w--) {
-            unsigned aa = *mask++;
-            if (isColor) {
-                *device = SkBlendARGB32(pmc, *device, aa);
-            } else {
-                *device = SkAlphaMulQ(pmc, SkAlpha255To256(aa))
-                            + SkAlphaMulQ(*device, SkAlpha255To256(255 - aa));
-            }
-            device += 1;
-        };
-
-        device = (uint32_t*)((char*)device + dstRB);
-        mask += maskRB;
-
-    } while (--height != 0);
-}
-
-static void D32_A8_Opaque_neon(void* SK_RESTRICT dst, size_t dstRB,
-                               const void* SK_RESTRICT maskPtr, size_t maskRB,
-                               SkColor color, int width, int height) {
-    D32_A8_Opaque_Color_neon<false>(dst, dstRB, maskPtr, maskRB, color, width, height);
-}
-
-static void D32_A8_Color_neon(void* SK_RESTRICT dst, size_t dstRB,
-                              const void* SK_RESTRICT maskPtr, size_t maskRB,
-                              SkColor color, int width, int height) {
-    D32_A8_Opaque_Color_neon<true>(dst, dstRB, maskPtr, maskRB, color, width, height);
-}
-
-SkBlitMask::ColorProc D32_A8_Factory_neon(SkColor color) {
-    if (SK_ColorBLACK == color) {
-        return D32_A8_Black_neon;
-    } else if (0xFF == SkColorGetA(color)) {
-        return D32_A8_Opaque_neon;
-    } else {
-        return D32_A8_Color_neon;
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
 void SkBlitLCD16OpaqueRow_neon(SkPMColor dst[], const uint16_t src[],
                                         SkColor color, int width,
                                         SkPMColor opaqueDst) {
@@ -252,3 +135,77 @@ void SkBlitLCD16Row_neon(SkPMColor dst[], const uint16_t src[],
         dst[i] = SkBlendLCD16(colA, colR, colG, colB, dst[i], src[i]);
     }
 }
+
+#define LOAD_LANE_16(reg, n) \
+    reg = vld1q_lane_u16(device, reg, n); \
+    device = (uint16_t*)((char*)device + deviceRB);
+
+#define STORE_LANE_16(reg, n) \
+    vst1_lane_u16(dst, reg, n); \
+    dst = (uint16_t*)((char*)dst + deviceRB);
+
+void SkRGB16BlitterBlitV_neon(uint16_t* device,
+                              int height,
+                              size_t deviceRB,
+                              unsigned scale,
+                              uint32_t src32) {
+    if (height >= 8)
+    {
+        uint16_t* dst = device;
+
+        // prepare constants
+        uint16x8_t vdev = vdupq_n_u16(0);
+        uint16x8_t vmaskq_g16 = vdupq_n_u16(SK_G16_MASK_IN_PLACE);
+        uint16x8_t vmaskq_ng16 = vdupq_n_u16(~SK_G16_MASK_IN_PLACE);
+        uint32x4_t vsrc32 = vdupq_n_u32(src32);
+        uint32x4_t vscale5 = vdupq_n_u32((uint32_t)scale);
+
+        while (height >= 8){
+            LOAD_LANE_16(vdev, 0)
+            LOAD_LANE_16(vdev, 1)
+            LOAD_LANE_16(vdev, 2)
+            LOAD_LANE_16(vdev, 3)
+            LOAD_LANE_16(vdev, 4)
+            LOAD_LANE_16(vdev, 5)
+            LOAD_LANE_16(vdev, 6)
+            LOAD_LANE_16(vdev, 7)
+
+            // Expand_rgb_16
+            uint16x8x2_t vdst = vzipq_u16((vdev & vmaskq_ng16), (vdev & vmaskq_g16));
+            uint32x4_t vdst32_lo = vmulq_u32(vreinterpretq_u32_u16(vdst.val[0]), vscale5);
+            uint32x4_t vdst32_hi = vmulq_u32(vreinterpretq_u32_u16(vdst.val[1]), vscale5);
+
+            // Compact_rgb_16
+            vdst32_lo = vaddq_u32(vdst32_lo, vsrc32);
+            vdst32_hi = vaddq_u32(vdst32_hi, vsrc32);
+            vdst32_lo = vshrq_n_u32(vdst32_lo, 5);
+            vdst32_hi = vshrq_n_u32(vdst32_hi, 5);
+
+            uint16x4_t vtmp_lo = vmovn_u32(vdst32_lo) & vget_low_u16(vmaskq_ng16);
+            uint16x4_t vtmp_hi = vshrn_n_u32(vdst32_lo, 16) & vget_low_u16(vmaskq_g16);
+            uint16x4_t vdst16_lo = vorr_u16(vtmp_lo, vtmp_hi);
+            vtmp_lo = vmovn_u32(vdst32_hi) & vget_low_u16(vmaskq_ng16);
+            vtmp_hi = vshrn_n_u32(vdst32_hi, 16) & vget_low_u16(vmaskq_g16);
+            uint16x4_t vdst16_hi = vorr_u16(vtmp_lo, vtmp_hi);
+
+            STORE_LANE_16(vdst16_lo, 0)
+            STORE_LANE_16(vdst16_lo, 1)
+            STORE_LANE_16(vdst16_lo, 2)
+            STORE_LANE_16(vdst16_lo, 3)
+            STORE_LANE_16(vdst16_hi, 0)
+            STORE_LANE_16(vdst16_hi, 1)
+            STORE_LANE_16(vdst16_hi, 2)
+            STORE_LANE_16(vdst16_hi, 3)
+            height -= 8;
+        }
+    }
+    while (height != 0){
+        uint32_t dst32 = SkExpand_rgb_16(*device) * scale;
+        *device = SkCompact_rgb_16((src32 + dst32) >> 5);
+        device = (uint16_t*)((char*)device + deviceRB);
+        height--;
+    }
+}
+
+#undef LOAD_LANE_16
+#undef STORE_LANE_16
diff --git a/gfx/skia/skia/src/opts/SkBlitMask_opts_arm_neon.h b/gfx/skia/skia/src/opts/SkBlitMask_opts_arm_neon.h
index fdbce14f6d34..86366a461adb 100644
--- a/gfx/skia/skia/src/opts/SkBlitMask_opts_arm_neon.h
+++ b/gfx/skia/skia/src/opts/SkBlitMask_opts_arm_neon.h
@@ -1,11 +1,16 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #ifndef SkBlitMask_opts_arm_neon_DEFINED
 #define SkBlitMask_opts_arm_neon_DEFINED
 
 #include "SkColor.h"
 #include "SkBlitMask.h"
 
-extern SkBlitMask::ColorProc D32_A8_Factory_neon(SkColor color);
-
 extern void SkBlitLCD16OpaqueRow_neon(SkPMColor dst[], const uint16_t src[],
                                       SkColor color, int width,
                                       SkPMColor opaqueDst);
diff --git a/gfx/skia/skia/src/opts/SkBlitMask_opts_none.cpp b/gfx/skia/skia/src/opts/SkBlitMask_opts_none.cpp
index 90f89a712920..f26ee783bdba 100644
--- a/gfx/skia/skia/src/opts/SkBlitMask_opts_none.cpp
+++ b/gfx/skia/skia/src/opts/SkBlitMask_opts_none.cpp
@@ -7,18 +7,12 @@
 
 #include "SkBlitMask.h"
 
-SkBlitMask::ColorProc SkBlitMask::PlatformColorProcs(SkColorType dstCT,
-                                                     SkMask::Format maskFormat,
-                                                     SkColor color) {
-    return NULL;
-}
-
 SkBlitMask::BlitLCD16RowProc SkBlitMask::PlatformBlitRowProcs16(bool isOpaque) {
-    return NULL;
+    return nullptr;
 }
 
 SkBlitMask::RowProc SkBlitMask::PlatformRowProcs(SkColorType dstCT,
                                                  SkMask::Format maskFormat,
                                                  RowFlags flags) {
-    return NULL;
+    return nullptr;
 }
diff --git a/gfx/skia/skia/src/opts/SkBlitRect_opts_SSE2.cpp b/gfx/skia/skia/src/opts/SkBlitRect_opts_SSE2.cpp
deleted file mode 100644
index d65a313dadf5..000000000000
--- a/gfx/skia/skia/src/opts/SkBlitRect_opts_SSE2.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <emmintrin.h>
-#include "SkBlitRect_opts_SSE2.h"
-#include "SkBlitRow.h"
-#include "SkColorPriv.h"
-
-/* Simple blitting of opaque rectangles less than 31 pixels wide:
- * inlines and merges sections of Color32_SSE2 and sk_memset32_SSE2.
- */
-static void BlitRect32_OpaqueNarrow_SSE2(SkPMColor* SK_RESTRICT destination,
-                                  int width, int height,
-                                  size_t rowBytes, uint32_t color) {
-    SkASSERT(255 == SkGetPackedA32(color));
-    SkASSERT(width > 0);
-    SkASSERT(width < 31);
-
-    while (--height >= 0) {
-        SkPMColor* dst = destination;
-        int count = width;
-
-        while (count > 4) {
-            *dst++ = color;
-            *dst++ = color;
-            *dst++ = color;
-            *dst++ = color;
-            count -= 4;
-        }
-
-        while (count > 0) {
-            *dst++ = color;
-            --count;
-        }
-
-        destination = (uint32_t*)((char*)destination + rowBytes);
-    }
-}
-
-/*
- * Fast blitting of opaque rectangles at least 31 pixels wide:
- * inlines and merges sections of Color32_SSE2 and sk_memset32_SSE2.
- * A 31 pixel rectangle is guaranteed to have at least one
- * 16-pixel aligned span that can take advantage of mm_store.
- */
-static void BlitRect32_OpaqueWide_SSE2(SkPMColor* SK_RESTRICT destination,
-                                int width, int height,
-                                size_t rowBytes, uint32_t color) {
-    SkASSERT(255 == SkGetPackedA32(color));
-    SkASSERT(width >= 31);
-
-    __m128i color_wide = _mm_set1_epi32(color);
-    while (--height >= 0) {
-        // Prefetching one row ahead to L1 cache can equal hardware
-        // performance for large/tall rects, but never *beats*
-        // hardware performance.
-        SkPMColor* dst = destination;
-        int count = width;
-
-        while (((size_t)dst) & 0x0F) {
-            *dst++ = color;
-            --count;
-        }
-        __m128i *d = reinterpret_cast<__m128i*>(dst);
-
-        // Googling suggests _mm_stream is only going to beat _mm_store
-        // for things that wouldn't fit in L2 cache anyway, typically
-        // >500kB, and precisely fill cache lines.  For us, with
-        // arrays > 100k elements _mm_stream is still 100%+ slower than
-        // mm_store.
-
-        // Unrolling to count >= 64 is a break-even for most
-        // input patterns; we seem to be saturating the bus and having
-        // low enough overhead at 32.
-
-        while (count >= 32) {
-            _mm_store_si128(d++, color_wide);
-            _mm_store_si128(d++, color_wide);
-            _mm_store_si128(d++, color_wide);
-            _mm_store_si128(d++, color_wide);
-            _mm_store_si128(d++, color_wide);
-            _mm_store_si128(d++, color_wide);
-            _mm_store_si128(d++, color_wide);
-            _mm_store_si128(d++, color_wide);
-            count -= 32;
-        }
-        if (count >= 16) {
-            _mm_store_si128(d++, color_wide);
-            _mm_store_si128(d++, color_wide);
-            _mm_store_si128(d++, color_wide);
-            _mm_store_si128(d++, color_wide);
-            count -= 16;
-        }
-        dst = reinterpret_cast<uint32_t*>(d);
-
-        // Unrolling the loop in the Narrow code is a significant performance
-        // gain, but unrolling this loop appears to make no difference in
-        // benchmarks with either mm_store_si128 or individual sets.
-
-        while (count > 0) {
-            *dst++ = color;
-            --count;
-        }
-
-        destination = (uint32_t*)((char*)destination + rowBytes);
-    }
-}
-
-void ColorRect32_SSE2(SkPMColor* destination,
-                      int width, int height,
-                      size_t rowBytes, uint32_t color) {
-    if (0 == height || 0 == width || 0 == color) {
-        return;
-    }
-    unsigned colorA = SkGetPackedA32(color);
-    colorA = 0; // skip below if () for now...(has been disabled since this was added in r3423).
-    if (255 == colorA) {
-        if (width < 31) {
-            BlitRect32_OpaqueNarrow_SSE2(destination, width, height,
-                                         rowBytes, color);
-        } else {
-            BlitRect32_OpaqueWide_SSE2(destination, width, height,
-                                       rowBytes, color);
-        }
-    } else {
-        SkBlitRow::ColorRect32(destination, width, height, rowBytes, color);
-    }
-}
diff --git a/gfx/skia/skia/src/opts/SkBlitRect_opts_SSE2.h b/gfx/skia/skia/src/opts/SkBlitRect_opts_SSE2.h
deleted file mode 100644
index 3d09f5c3abc8..000000000000
--- a/gfx/skia/skia/src/opts/SkBlitRect_opts_SSE2.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkBlitRect_opts_SSE2_DEFINED
-#define SkBlitRect_opts_SSE2_DEFINED
-
-#include "SkColor.h"
-
-/* These functions' implementations copy sections of both
- * SkBlitRow_opts_SSE2 and SkUtils_opts_SSE2.
- */
-void ColorRect32_SSE2(SkPMColor* SK_RESTRICT dst,
-                      int width, int height,
-                      size_t rowBytes, uint32_t color);
-
-
-#endif
diff --git a/gfx/skia/skia/src/opts/SkBlitRow_opts.h b/gfx/skia/skia/src/opts/SkBlitRow_opts.h
new file mode 100644
index 000000000000..f000f30fd09b
--- /dev/null
+++ b/gfx/skia/skia/src/opts/SkBlitRow_opts.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkBlitRow_opts_DEFINED
+#define SkBlitRow_opts_DEFINED
+
+#include "Sk4px.h"
+
+namespace SK_OPTS_NS {
+
+// Color32 uses the blend_256_round_alt algorithm from tests/BlendTest.cpp.
+// It's not quite perfect, but it's never wrong in the interesting edge cases,
+// and it's quite a bit faster than blend_perfect.
+//
+// blend_256_round_alt is our currently blessed algorithm.  Please use it or an analogous one.
+static void blit_row_color32(SkPMColor* dst, const SkPMColor* src, int count, SkPMColor color) {
+    unsigned invA = 255 - SkGetPackedA32(color);
+    invA += invA >> 7;
+    SkASSERT(invA < 256);  // We've should have already handled alpha == 0 externally.
+
+    Sk16h colorHighAndRound = Sk4px::DupPMColor(color).widenHi() + Sk16h(128);
+    Sk16b invA_16x(invA);
+
+    Sk4px::MapSrc(count, dst, src, [&](const Sk4px& src4) -> Sk4px {
+        return (src4 * invA_16x).addNarrowHi(colorHighAndRound);
+    });
+}
+
+}  // SK_OPTS_NS
+
+#endif//SkBlitRow_opts_DEFINED
diff --git a/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE2.cpp b/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE2.cpp
index 391b24c86738..c017f7e4b3d1 100644
--- a/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE2.cpp
+++ b/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE2.cpp
@@ -38,57 +38,14 @@ void S32_Blend_BlitRow32_SSE2(SkPMColor* SK_RESTRICT dst,
 
         const __m128i *s = reinterpret_cast<const __m128i*>(src);
         __m128i *d = reinterpret_cast<__m128i*>(dst);
-        __m128i rb_mask = _mm_set1_epi32(0x00FF00FF);
-        __m128i ag_mask = _mm_set1_epi32(0xFF00FF00);
 
-        // Move scale factors to upper byte of word
-        __m128i src_scale_wide = _mm_set1_epi16(src_scale << 8);
-        __m128i dst_scale_wide = _mm_set1_epi16(dst_scale << 8);
         while (count >= 4) {
             // Load 4 pixels each of src and dest.
             __m128i src_pixel = _mm_loadu_si128(s);
             __m128i dst_pixel = _mm_load_si128(d);
 
-            // Interleave Atom port 0/1 operations based on the execution port
-            // constraints that multiply can only be executed on port 0 (while
-            // boolean operations can be executed on either port 0 or port 1)
-            // because GCC currently doesn't do a good job scheduling
-            // instructions based on these constraints.
-
-            // Get red and blue pixels into lower byte of each word.
-            // (0, r, 0, b, 0, r, 0, b, 0, r, 0, b, 0, r, 0, b)
-            __m128i src_rb = _mm_and_si128(rb_mask, src_pixel);
-
-            // Multiply by scale.
-            // (4 x (0, rs.h, 0, bs.h))
-            // where rs.h stands for the higher byte of r * scale, and
-            // bs.h the higher byte of b * scale.
-            src_rb = _mm_mulhi_epu16(src_rb, src_scale_wide);
-
-            // Get alpha and green pixels into higher byte of each word.
-            // (a, 0, g, 0, a, 0, g, 0, a, 0, g, 0, a, 0, g, 0)
-            __m128i src_ag = _mm_and_si128(ag_mask, src_pixel);
-
-            // Multiply by scale.
-            // (4 x (as.h, as.l, gs.h, gs.l))
-            src_ag = _mm_mulhi_epu16(src_ag, src_scale_wide);
-
-            // Clear the lower byte of the a*scale and g*scale results
-            // (4 x (as.h, 0, gs.h, 0))
-            src_ag = _mm_and_si128(src_ag, ag_mask);
-
-            // Operations the destination pixels are the same as on the
-            // source pixels. See the comments above.
-            __m128i dst_rb = _mm_and_si128(rb_mask, dst_pixel);
-            dst_rb = _mm_mulhi_epu16(dst_rb, dst_scale_wide);
-            __m128i dst_ag = _mm_and_si128(ag_mask, dst_pixel);
-            dst_ag = _mm_mulhi_epu16(dst_ag, dst_scale_wide);
-            dst_ag = _mm_and_si128(dst_ag, ag_mask);
-
-            // Combine back into RGBA.
-            // (4 x (as.h, rs.h, gs.h, bs.h))
-            src_pixel = _mm_or_si128(src_rb, src_ag);
-            dst_pixel = _mm_or_si128(dst_rb, dst_ag);
+            src_pixel = SkAlphaMulQ_SSE2(src_pixel, src_scale);
+            dst_pixel = SkAlphaMulQ_SSE2(dst_pixel, dst_scale);
 
             // Add result
             __m128i result = _mm_add_epi8(src_pixel, dst_pixel);
@@ -117,6 +74,7 @@ void S32A_Opaque_BlitRow32_SSE2(SkPMColor* SK_RESTRICT dst,
         return;
     }
 
+#ifdef SK_USE_ACCURATE_BLENDING
     if (count >= 4) {
         SkASSERT(((size_t)dst & 0x03) == 0);
         while (((size_t)dst & 0x0F) != 0) {
@@ -128,7 +86,6 @@ void S32A_Opaque_BlitRow32_SSE2(SkPMColor* SK_RESTRICT dst,
 
         const __m128i *s = reinterpret_cast<const __m128i*>(src);
         __m128i *d = reinterpret_cast<__m128i*>(dst);
-#ifdef SK_USE_ACCURATE_BLENDING
         __m128i rb_mask = _mm_set1_epi32(0x00FF00FF);
         __m128i c_128 = _mm_set1_epi16(128);  // 8 copies of 128 (16-bit)
         __m128i c_255 = _mm_set1_epi16(255);  // 8 copies of 255 (16-bit)
@@ -177,51 +134,6 @@ void S32A_Opaque_BlitRow32_SSE2(SkPMColor* SK_RESTRICT dst,
             d++;
             count -= 4;
         }
-#else
-        __m128i rb_mask = _mm_set1_epi32(0x00FF00FF);
-        __m128i c_256 = _mm_set1_epi16(0x0100);  // 8 copies of 256 (16-bit)
-        while (count >= 4) {
-            // Load 4 pixels
-            __m128i src_pixel = _mm_loadu_si128(s);
-            __m128i dst_pixel = _mm_load_si128(d);
-
-            __m128i dst_rb = _mm_and_si128(rb_mask, dst_pixel);
-            __m128i dst_ag = _mm_srli_epi16(dst_pixel, 8);
-
-            // (a0, g0, a1, g1, a2, g2, a3, g3)  (low byte of each word)
-            __m128i alpha = _mm_srli_epi16(src_pixel, 8);
-
-            // (a0, a0, a1, a1, a2, g2, a3, g3)
-            alpha = _mm_shufflehi_epi16(alpha, 0xF5);
-
-            // (a0, a0, a1, a1, a2, a2, a3, a3)
-            alpha = _mm_shufflelo_epi16(alpha, 0xF5);
-
-            // Subtract alphas from 256, to get 1..256
-            alpha = _mm_sub_epi16(c_256, alpha);
-
-            // Multiply by red and blue by src alpha.
-            dst_rb = _mm_mullo_epi16(dst_rb, alpha);
-            // Multiply by alpha and green by src alpha.
-            dst_ag = _mm_mullo_epi16(dst_ag, alpha);
-
-            // Divide by 256.
-            dst_rb = _mm_srli_epi16(dst_rb, 8);
-
-            // Mask out high bits (already in the right place)
-            dst_ag = _mm_andnot_si128(rb_mask, dst_ag);
-
-            // Combine back into RGBA.
-            dst_pixel = _mm_or_si128(dst_rb, dst_ag);
-
-            // Add result
-            __m128i result = _mm_add_epi8(src_pixel, dst_pixel);
-            _mm_store_si128(d, result);
-            s++;
-            d++;
-            count -= 4;
-        }
-#endif
         src = reinterpret_cast<const SkPMColor*>(s);
         dst = reinterpret_cast<SkPMColor*>(d);
     }
@@ -232,6 +144,51 @@ void S32A_Opaque_BlitRow32_SSE2(SkPMColor* SK_RESTRICT dst,
         dst++;
         count--;
     }
+#else
+    int count16 = count / 16;
+    __m128i* dst4 = (__m128i*)dst;
+    const __m128i* src4 = (const __m128i*)src;
+
+    for (int i = 0; i < count16 * 4; i += 4) {
+        // Load 16 source pixels.
+        __m128i s0 = _mm_loadu_si128(src4+i+0),
+                s1 = _mm_loadu_si128(src4+i+1),
+                s2 = _mm_loadu_si128(src4+i+2),
+                s3 = _mm_loadu_si128(src4+i+3);
+
+        const __m128i alphaMask = _mm_set1_epi32(0xFF << SK_A32_SHIFT);
+        const __m128i ORed = _mm_or_si128(s3, _mm_or_si128(s2, _mm_or_si128(s1, s0)));
+        __m128i cmp = _mm_cmpeq_epi8(_mm_and_si128(ORed, alphaMask), _mm_setzero_si128());
+        if (0xffff == _mm_movemask_epi8(cmp)) {
+            // All 16 source pixels are fully transparent. There's nothing to do!
+            continue;
+        }
+        const __m128i ANDed = _mm_and_si128(s3, _mm_and_si128(s2, _mm_and_si128(s1, s0)));
+        cmp = _mm_cmpeq_epi8(_mm_and_si128(ANDed, alphaMask), alphaMask);
+        if (0xffff == _mm_movemask_epi8(cmp)) {
+            // All 16 source pixels are fully opaque. There's no need to read dst or blend it.
+            _mm_storeu_si128(dst4+i+0, s0);
+            _mm_storeu_si128(dst4+i+1, s1);
+            _mm_storeu_si128(dst4+i+2, s2);
+            _mm_storeu_si128(dst4+i+3, s3);
+            continue;
+        }
+        // The general slow case: do the blend for all 16 pixels.
+        _mm_storeu_si128(dst4+i+0, SkPMSrcOver_SSE2(s0, _mm_loadu_si128(dst4+i+0)));
+        _mm_storeu_si128(dst4+i+1, SkPMSrcOver_SSE2(s1, _mm_loadu_si128(dst4+i+1)));
+        _mm_storeu_si128(dst4+i+2, SkPMSrcOver_SSE2(s2, _mm_loadu_si128(dst4+i+2)));
+        _mm_storeu_si128(dst4+i+3, SkPMSrcOver_SSE2(s3, _mm_loadu_si128(dst4+i+3)));
+    }
+
+    // Wrap up the last <= 15 pixels.
+    SkASSERT(count - (count16*16) <= 15);
+    for (int i = count16*16; i < count; i++) {
+        // This check is not really necessarily, but it prevents pointless autovectorization.
+        if (src[i] & 0xFF000000) {
+            dst[i] = SkPMSrcOver(src[i], dst[i]);
+        }
+    }
+#endif
 }
 
 void S32A_Blend_BlitRow32_SSE2(SkPMColor* SK_RESTRICT dst,
@@ -250,74 +207,14 @@ void S32A_Blend_BlitRow32_SSE2(SkPMColor* SK_RESTRICT dst,
             count--;
         }
 
-        uint32_t src_scale = SkAlpha255To256(alpha);
-
         const __m128i *s = reinterpret_cast<const __m128i*>(src);
         __m128i *d = reinterpret_cast<__m128i*>(dst);
-        __m128i src_scale_wide = _mm_set1_epi16(src_scale << 8);
-        __m128i rb_mask = _mm_set1_epi32(0x00FF00FF);
-        __m128i c_256 = _mm_set1_epi16(256);  // 8 copies of 256 (16-bit)
         while (count >= 4) {
             // Load 4 pixels each of src and dest.
             __m128i src_pixel = _mm_loadu_si128(s);
             __m128i dst_pixel = _mm_load_si128(d);
 
-            // Get red and blue pixels into lower byte of each word.
-            __m128i dst_rb = _mm_and_si128(rb_mask, dst_pixel);
-            __m128i src_rb = _mm_and_si128(rb_mask, src_pixel);
-
-            // Get alpha and green into lower byte of each word.
-            __m128i dst_ag = _mm_srli_epi16(dst_pixel, 8);
-            __m128i src_ag = _mm_srli_epi16(src_pixel, 8);
-
-            // Put per-pixel alpha in low byte of each word.
-            // After the following two statements, the dst_alpha looks like
-            // (0, a0, 0, a0, 0, a1, 0, a1, 0, a2, 0, a2, 0, a3, 0, a3)
-            __m128i dst_alpha = _mm_shufflehi_epi16(src_ag, 0xF5);
-            dst_alpha = _mm_shufflelo_epi16(dst_alpha, 0xF5);
-
-            // dst_alpha = dst_alpha * src_scale
-            // Because src_scales are in the higher byte of each word and
-            // we use mulhi here, the resulting alpha values are already
-            // in the right place and don't need to be divided by 256.
-            // (0, sa0, 0, sa0, 0, sa1, 0, sa1, 0, sa2, 0, sa2, 0, sa3, 0, sa3)
-            dst_alpha = _mm_mulhi_epu16(dst_alpha, src_scale_wide);
-
-            // Subtract alphas from 256, to get 1..256
-            dst_alpha = _mm_sub_epi16(c_256, dst_alpha);
-
-            // Multiply red and blue by dst pixel alpha.
-            dst_rb = _mm_mullo_epi16(dst_rb, dst_alpha);
-            // Multiply alpha and green by dst pixel alpha.
-            dst_ag = _mm_mullo_epi16(dst_ag, dst_alpha);
-
-            // Multiply red and blue by global alpha.
-            // (4 x (0, rs.h, 0, bs.h))
-            // where rs.h stands for the higher byte of r * src_scale,
-            // and bs.h the higher byte of b * src_scale.
-            // Again, because we use mulhi, the resuling red and blue
-            // values are already in the right place and don't need to
-            // be divided by 256.
-            src_rb = _mm_mulhi_epu16(src_rb, src_scale_wide);
-            // Multiply alpha and green by global alpha.
-            // (4 x (0, as.h, 0, gs.h))
-            src_ag = _mm_mulhi_epu16(src_ag, src_scale_wide);
-
-            // Divide by 256.
-            dst_rb = _mm_srli_epi16(dst_rb, 8);
-
-            // Mask out low bits (goodies already in the right place; no need to divide)
-            dst_ag = _mm_andnot_si128(rb_mask, dst_ag);
-            // Shift alpha and green to higher byte of each word.
-            // (4 x (as.h, 0, gs.h, 0))
-            src_ag = _mm_slli_epi16(src_ag, 8);
-
-            // Combine back into RGBA.
-            dst_pixel = _mm_or_si128(dst_rb, dst_ag);
-            src_pixel = _mm_or_si128(src_rb, src_ag);
-
-            // Add two pixels into result.
-            __m128i result = _mm_add_epi8(src_pixel, dst_pixel);
+            __m128i result = SkBlendARGB32_SSE2(src_pixel, dst_pixel, alpha);
             _mm_store_si128(d, result);
             s++;
             d++;
@@ -335,181 +232,73 @@ void S32A_Blend_BlitRow32_SSE2(SkPMColor* SK_RESTRICT dst,
     }
 }
 
-/* SSE2 version of Color32()
- * portable version is in core/SkBlitRow_D32.cpp
- */
-void Color32_SSE2(SkPMColor dst[], const SkPMColor src[], int count,
-                  SkPMColor color) {
-    if (count <= 0) {
-        return;
-    }
+void Color32A_D565_SSE2(uint16_t dst[], SkPMColor src, int count, int x, int y) {
+    SkASSERT(count > 0);
 
-    if (0 == color) {
-        if (src != dst) {
-            memcpy(dst, src, count * sizeof(SkPMColor));
-        }
-        return;
-    }
+    uint32_t src_expand = (SkGetPackedG32(src) << 24) |
+                          (SkGetPackedR32(src) << 13) |
+                          (SkGetPackedB32(src) << 2);
+    unsigned scale = SkAlpha255To256(0xFF - SkGetPackedA32(src)) >> 3;
 
-    unsigned colorA = SkGetPackedA32(color);
-    if (255 == colorA) {
-        sk_memset32(dst, color, count);
-    } else {
-        unsigned scale = 256 - SkAlpha255To256(colorA);
+    // Check if we have enough pixels to run SIMD
+    if (count >= (int)(8 + (((16 - (size_t)dst) & 0x0F) >> 1))) {
+        __m128i* dst_wide;
+        const __m128i src_R_wide = _mm_set1_epi16(SkGetPackedR32(src) << 2);
+        const __m128i src_G_wide = _mm_set1_epi16(SkGetPackedG32(src) << 3);
+        const __m128i src_B_wide = _mm_set1_epi16(SkGetPackedB32(src) << 2);
+        const __m128i scale_wide = _mm_set1_epi16(scale);
+        const __m128i mask_blue  = _mm_set1_epi16(SK_B16_MASK);
+        const __m128i mask_green = _mm_set1_epi16(SK_G16_MASK << SK_G16_SHIFT);
 
-        if (count >= 4) {
-            SkASSERT(((size_t)dst & 0x03) == 0);
-            while (((size_t)dst & 0x0F) != 0) {
-                *dst = color + SkAlphaMulQ(*src, scale);
-                src++;
-                dst++;
-                count--;
-            }
-
-            const __m128i *s = reinterpret_cast<const __m128i*>(src);
-            __m128i *d = reinterpret_cast<__m128i*>(dst);
-            __m128i rb_mask = _mm_set1_epi32(0x00FF00FF);
-            __m128i src_scale_wide = _mm_set1_epi16(scale);
-            __m128i color_wide = _mm_set1_epi32(color);
-            while (count >= 4) {
-                // Load 4 pixels each of src and dest.
-                __m128i src_pixel = _mm_loadu_si128(s);
-
-                // Get red and blue pixels into lower byte of each word.
-                __m128i src_rb = _mm_and_si128(rb_mask, src_pixel);
-
-                // Get alpha and green into lower byte of each word.
-                __m128i src_ag = _mm_srli_epi16(src_pixel, 8);
-
-                // Multiply by scale.
-                src_rb = _mm_mullo_epi16(src_rb, src_scale_wide);
-                src_ag = _mm_mullo_epi16(src_ag, src_scale_wide);
-
-                // Divide by 256.
-                src_rb = _mm_srli_epi16(src_rb, 8);
-                src_ag = _mm_andnot_si128(rb_mask, src_ag);
-
-                // Combine back into RGBA.
-                src_pixel = _mm_or_si128(src_rb, src_ag);
-
-                // Add color to result.
-                __m128i result = _mm_add_epi8(color_wide, src_pixel);
-
-                // Store result.
-                _mm_store_si128(d, result);
-                s++;
-                d++;
-                count -= 4;
-            }
-            src = reinterpret_cast<const SkPMColor*>(s);
-            dst = reinterpret_cast<SkPMColor*>(d);
-        }
-
-        while (count > 0) {
-            *dst = color + SkAlphaMulQ(*src, scale);
-            src += 1;
+        // Align dst to an even 16 byte address (0-7 pixels)
+        while (((((size_t)dst) & 0x0F) != 0) && (count > 0)) {
+            *dst = SkBlend32_RGB16(src_expand, *dst, scale);
             dst += 1;
             count--;
         }
+
+        dst_wide = reinterpret_cast<__m128i*>(dst);
+        do {
+            // Load eight RGB565 pixels
+            __m128i pixels = _mm_load_si128(dst_wide);
+
+            // Mask out sub-pixels
+            __m128i pixel_R = _mm_srli_epi16(pixels, SK_R16_SHIFT);
+            __m128i pixel_G = _mm_slli_epi16(pixels, SK_R16_BITS);
+            pixel_G = _mm_srli_epi16(pixel_G, SK_R16_BITS + SK_B16_BITS);
+            __m128i pixel_B = _mm_and_si128(pixels, mask_blue);
+
+            // Scale with alpha
+            pixel_R = _mm_mullo_epi16(pixel_R, scale_wide);
+            pixel_G = _mm_mullo_epi16(pixel_G, scale_wide);
+            pixel_B = _mm_mullo_epi16(pixel_B, scale_wide);
+
+            // Add src_X_wide and shift down again
+            pixel_R = _mm_add_epi16(pixel_R, src_R_wide);
+            pixel_R = _mm_srli_epi16(pixel_R, 5);
+            pixel_G = _mm_add_epi16(pixel_G, src_G_wide);
+            pixel_B = _mm_add_epi16(pixel_B, src_B_wide);
+            pixel_B = _mm_srli_epi16(pixel_B, 5);
+
+            // Combine into RGB565 and store
+            pixel_R = _mm_slli_epi16(pixel_R, SK_R16_SHIFT);
+            pixel_G = _mm_and_si128(pixel_G, mask_green);
+            pixels = _mm_or_si128(pixel_R, pixel_G);
+            pixels = _mm_or_si128(pixels, pixel_B);
+            _mm_store_si128(dst_wide, pixels);
+            count -= 8;
+            dst_wide++;
+        } while (count >= 8);
+
+        dst = reinterpret_cast<uint16_t*>(dst_wide);
     }
-}
 
-void SkARGB32_A8_BlitMask_SSE2(void* device, size_t dstRB, const void* maskPtr,
-                               size_t maskRB, SkColor origColor,
-                               int width, int height) {
-    SkPMColor color = SkPreMultiplyColor(origColor);
-    size_t dstOffset = dstRB - (width << 2);
-    size_t maskOffset = maskRB - width;
-    SkPMColor* dst = (SkPMColor *)device;
-    const uint8_t* mask = (const uint8_t*)maskPtr;
-    do {
-        int count = width;
-        if (count >= 4) {
-            while (((size_t)dst & 0x0F) != 0 && (count > 0)) {
-                *dst = SkBlendARGB32(color, *dst, *mask);
-                mask++;
-                dst++;
-                count--;
-            }
-            __m128i *d = reinterpret_cast<__m128i*>(dst);
-            __m128i rb_mask = _mm_set1_epi32(0x00FF00FF);
-            __m128i c_256 = _mm_set1_epi16(256);
-            __m128i c_1 = _mm_set1_epi16(1);
-            __m128i src_pixel = _mm_set1_epi32(color);
-            while (count >= 4) {
-                // Load 4 pixels each of src and dest.
-                __m128i dst_pixel = _mm_load_si128(d);
-
-                //set the aphla value
-                __m128i src_scale_wide =  _mm_set_epi8(0, *(mask+3),\
-                                0, *(mask+3),0, \
-                                *(mask+2),0, *(mask+2),\
-                                0,*(mask+1), 0,*(mask+1),\
-                                0, *mask,0,*mask);
-
-                //call SkAlpha255To256()
-                src_scale_wide = _mm_add_epi16(src_scale_wide, c_1);
-
-                // Get red and blue pixels into lower byte of each word.
-                __m128i dst_rb = _mm_and_si128(rb_mask, dst_pixel);
-                __m128i src_rb = _mm_and_si128(rb_mask, src_pixel);
-
-                // Get alpha and green into lower byte of each word.
-                __m128i dst_ag = _mm_srli_epi16(dst_pixel, 8);
-                __m128i src_ag = _mm_srli_epi16(src_pixel, 8);
-
-                // Put per-pixel alpha in low byte of each word.
-                __m128i dst_alpha = _mm_shufflehi_epi16(src_ag, 0xF5);
-                dst_alpha = _mm_shufflelo_epi16(dst_alpha, 0xF5);
-
-                // dst_alpha = dst_alpha * src_scale
-                dst_alpha = _mm_mullo_epi16(dst_alpha, src_scale_wide);
-
-                // Divide by 256.
-                dst_alpha = _mm_srli_epi16(dst_alpha, 8);
-
-                // Subtract alphas from 256, to get 1..256
-                dst_alpha = _mm_sub_epi16(c_256, dst_alpha);
-                // Multiply red and blue by dst pixel alpha.
-                dst_rb = _mm_mullo_epi16(dst_rb, dst_alpha);
-                // Multiply alpha and green by dst pixel alpha.
-                dst_ag = _mm_mullo_epi16(dst_ag, dst_alpha);
-
-                // Multiply red and blue by global alpha.
-                src_rb = _mm_mullo_epi16(src_rb, src_scale_wide);
-                // Multiply alpha and green by global alpha.
-                src_ag = _mm_mullo_epi16(src_ag, src_scale_wide);
-                // Divide by 256.
-                dst_rb = _mm_srli_epi16(dst_rb, 8);
-                src_rb = _mm_srli_epi16(src_rb, 8);
-
-                // Mask out low bits (goodies already in the right place; no need to divide)
-                dst_ag = _mm_andnot_si128(rb_mask, dst_ag);
-                src_ag = _mm_andnot_si128(rb_mask, src_ag);
-
-                // Combine back into RGBA.
-                dst_pixel = _mm_or_si128(dst_rb, dst_ag);
-                __m128i tmp_src_pixel = _mm_or_si128(src_rb, src_ag);
-
-                // Add two pixels into result.
-                __m128i result = _mm_add_epi8(tmp_src_pixel, dst_pixel);
-                _mm_store_si128(d, result);
-                // load the next 4 pixel
-                mask = mask + 4;
-                d++;
-                count -= 4;
-            }
-            dst = reinterpret_cast<SkPMColor *>(d);
-        }
-        while (count > 0) {
-            *dst= SkBlendARGB32(color, *dst, *mask);
-            dst += 1;
-            mask++;
-            count --;
-        }
-        dst = (SkPMColor *)((char*)dst + dstOffset);
-        mask += maskOffset;
-    } while (--height != 0);
+    // Small loop to handle remaining pixels.
+    while (count > 0) {
+        *dst = SkBlend32_RGB16(src_expand, *dst, scale);
+        dst += 1;
+        count--;
+    }
 }
 
 // The following (left) shifts cause the top 5 bits of the mask components to
@@ -874,44 +663,13 @@ void S32_D565_Opaque_SSE2(uint16_t* SK_RESTRICT dst,
 
         const __m128i* s = reinterpret_cast<const __m128i*>(src);
         __m128i* d = reinterpret_cast<__m128i*>(dst);
-        __m128i r16_mask = _mm_set1_epi32(SK_R16_MASK);
-        __m128i g16_mask = _mm_set1_epi32(SK_G16_MASK);
-        __m128i b16_mask = _mm_set1_epi32(SK_B16_MASK);
 
         while (count >= 8) {
             // Load 8 pixels of src.
             __m128i src_pixel1 = _mm_loadu_si128(s++);
             __m128i src_pixel2 = _mm_loadu_si128(s++);
 
-            // Calculate result r.
-            __m128i r1 = _mm_srli_epi32(src_pixel1,
-                                        SK_R32_SHIFT + (8 - SK_R16_BITS));
-            r1 = _mm_and_si128(r1, r16_mask);
-            __m128i r2 = _mm_srli_epi32(src_pixel2,
-                                        SK_R32_SHIFT + (8 - SK_R16_BITS));
-            r2 = _mm_and_si128(r2, r16_mask);
-            __m128i r = _mm_packs_epi32(r1, r2);
-
-            // Calculate result g.
-            __m128i g1 = _mm_srli_epi32(src_pixel1,
-                                        SK_G32_SHIFT + (8 - SK_G16_BITS));
-            g1 = _mm_and_si128(g1, g16_mask);
-            __m128i g2 = _mm_srli_epi32(src_pixel2,
-                                        SK_G32_SHIFT + (8 - SK_G16_BITS));
-            g2 = _mm_and_si128(g2, g16_mask);
-            __m128i g = _mm_packs_epi32(g1, g2);
-
-            // Calculate result b.
-            __m128i b1 = _mm_srli_epi32(src_pixel1,
-                                        SK_B32_SHIFT + (8 - SK_B16_BITS));
-            b1 = _mm_and_si128(b1, b16_mask);
-            __m128i b2 = _mm_srli_epi32(src_pixel2,
-                                        SK_B32_SHIFT + (8 - SK_B16_BITS));
-            b2 = _mm_and_si128(b2, b16_mask);
-            __m128i b = _mm_packs_epi32(b1, b2);
-
-            // Store 8 16-bit colors in dst.
-            __m128i d_pixel = SkPackRGB16_SSE2(r, g, b);
+            __m128i d_pixel = SkPixel32ToPixel16_ToU16_SSE2(src_pixel1, src_pixel2);
             _mm_store_si128(d++, d_pixel);
             count -= 8;
         }
diff --git a/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE2.h b/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE2.h
index 29fd96e5e915..560edf49235e 100644
--- a/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE2.h
+++ b/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE2.h
@@ -21,9 +21,9 @@ void S32A_Opaque_BlitRow32_SSE2(SkPMColor* SK_RESTRICT dst,
 void S32A_Blend_BlitRow32_SSE2(SkPMColor* SK_RESTRICT dst,
                                const SkPMColor* SK_RESTRICT src,
                                int count, U8CPU alpha);
-void SkARGB32_A8_BlitMask_SSE2(void* device, size_t dstRB, const void* mask,
-                               size_t maskRB, SkColor color,
-                               int width, int height);
+
+void Color32A_D565_SSE2(uint16_t dst[], SkPMColor src, int count, int x,
+                        int y);
 
 void SkBlitLCD16Row_SSE2(SkPMColor dst[], const uint16_t src[],
                          SkColor color, int width, SkPMColor);
@@ -42,5 +42,4 @@ void S32_D565_Opaque_Dither_SSE2(uint16_t* SK_RESTRICT dst,
 void S32A_D565_Opaque_Dither_SSE2(uint16_t* SK_RESTRICT dst,
                                   const SkPMColor* SK_RESTRICT src,
                                   int count, U8CPU alpha, int x, int y);
-
 #endif
diff --git a/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4.cpp b/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4.cpp
new file mode 100644
index 000000000000..02ca54d82081
--- /dev/null
+++ b/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4.cpp
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkBlitRow_opts_SSE4.h"
+
+// Some compilers can't compile SSSE3 or SSE4 intrinsics.  We give them stub methods.
+// The stubs should never be called, so we make them crash just to confirm that.
+#if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSE41
+void S32A_Opaque_BlitRow32_SSE4(SkPMColor* SK_RESTRICT, const SkPMColor* SK_RESTRICT, int, U8CPU) {
+    sk_throw();
+}
+
+#else
+
+#include <smmintrin.h>      // SSE4.1 intrinsics
+#include "SkColorPriv.h"
+#include "SkColor_opts_SSE2.h"
+
+void S32A_Opaque_BlitRow32_SSE4(SkPMColor* SK_RESTRICT dst,
+                                const SkPMColor* SK_RESTRICT src,
+                                int count,
+                                U8CPU alpha) {
+    SkASSERT(alpha == 255);
+    // As long as we can, we'll work on 16 pixel pairs at once.
+    int count16 = count / 16;
+    __m128i* dst4 = (__m128i*)dst;
+    const __m128i* src4 = (const __m128i*)src;
+
+    for (int i = 0; i < count16 * 4; i += 4) {
+        // Load 16 source pixels.
+        __m128i s0 = _mm_loadu_si128(src4+i+0),
+                s1 = _mm_loadu_si128(src4+i+1),
+                s2 = _mm_loadu_si128(src4+i+2),
+                s3 = _mm_loadu_si128(src4+i+3);
+
+        const __m128i alphaMask = _mm_set1_epi32(0xFF << SK_A32_SHIFT);
+        const __m128i ORed = _mm_or_si128(s3, _mm_or_si128(s2, _mm_or_si128(s1, s0)));
+        if (_mm_testz_si128(ORed, alphaMask)) {
+            // All 16 source pixels are fully transparent.  There's nothing to do!
+            continue;
+        }
+        const __m128i ANDed = _mm_and_si128(s3, _mm_and_si128(s2, _mm_and_si128(s1, s0)));
+        if (_mm_testc_si128(ANDed, alphaMask)) {
+            // All 16 source pixels are fully opaque.  There's no need to read dst or blend it.
+            _mm_storeu_si128(dst4+i+0, s0);
+            _mm_storeu_si128(dst4+i+1, s1);
+            _mm_storeu_si128(dst4+i+2, s2);
+            _mm_storeu_si128(dst4+i+3, s3);
+            continue;
+        }
+        // The general slow case: do the blend for all 16 pixels.
+        _mm_storeu_si128(dst4+i+0, SkPMSrcOver_SSE2(s0, _mm_loadu_si128(dst4+i+0)));
+        _mm_storeu_si128(dst4+i+1, SkPMSrcOver_SSE2(s1, _mm_loadu_si128(dst4+i+1)));
+        _mm_storeu_si128(dst4+i+2, SkPMSrcOver_SSE2(s2, _mm_loadu_si128(dst4+i+2)));
+        _mm_storeu_si128(dst4+i+3, SkPMSrcOver_SSE2(s3, _mm_loadu_si128(dst4+i+3)));
+    }
+
+    // Wrap up the last <= 15 pixels.
+    for (int i = count16*16; i < count; i++) {
+        // This check is not really necessarily, but it prevents pointless autovectorization.
+        if (src[i] & 0xFF000000) {
+            dst[i] = SkPMSrcOver(src[i], dst[i]);
+        }
+    }
+}
+
+#endif
diff --git a/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4.h b/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4.h
index f202aa513912..577ace6f8fe4 100644
--- a/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4.h
+++ b/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4.h
@@ -10,20 +10,9 @@
 
 #include "SkBlitRow.h"
 
-/* Check if we are able to build assembly code, GCC/AT&T syntax:
- *  1) Clang and GCC are generally OK.  OS X's old LLVM-GCC 4.2 can't handle it;
- *  2) We're intentionally not linking this in even when supported (Clang) on Windows;
- *  3) MemorySanitizer cannot instrument assembly at all.
- */
-#if /* 1)*/ (defined(__clang__) || (defined(__GNUC__) && !defined(SK_BUILD_FOR_MAC))) \
-    /* 2)*/ && !defined(SK_BUILD_FOR_WIN)                                             \
-    /* 3)*/ && !defined(MEMORY_SANITIZER)
-extern "C" void S32A_Opaque_BlitRow32_SSE4_asm(SkPMColor* SK_RESTRICT dst,
-                                               const SkPMColor* SK_RESTRICT src,
-                                               int count, U8CPU alpha);
-
-#define SK_ATT_ASM_SUPPORTED
-#endif
-
+void S32A_Opaque_BlitRow32_SSE4(SkPMColor* SK_RESTRICT,
+                                const SkPMColor* SK_RESTRICT,
+                                int count,
+                                U8CPU alpha);
 #endif
 
diff --git a/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4_asm.S b/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4_asm.S
deleted file mode 100644
index 41e7ba96a297..000000000000
--- a/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4_asm.S
+++ /dev/null
@@ -1,473 +0,0 @@
-/*
- * Copyright 2014 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <SkPreConfig.h>
-
-#if defined(__clang__) || (defined(__GNUC__) && !defined(SK_BUILD_FOR_MAC))
-
-#define CFI_PUSH(REG) \
-    .cfi_adjust_cfa_offset 4; \
-    .cfi_rel_offset REG, 0
-
-#define CFI_POP(REG) \
-    .cfi_adjust_cfa_offset -4; \
-    .cfi_restore REG
-
-#define PUSH(REG) pushl REG; CFI_PUSH (REG)
-#define POP(REG)  popl REG; CFI_POP (REG)
-#define RETURN    POP(%edi); ret
-
-#define EXTRACT_ALPHA(var1, var2) \
-    movdqa      %var1, %var2;           /* Clone source pixels to extract alpha */\
-    psrlw       $8, %var2;              /* Discard red and blue, leaving alpha and green */\
-    pshufhw     $0xF5, %var2, %var2;    /* Repeat alpha for scaling (high) */\
-    movdqa      %xmm6, %xmm4;           \
-    pshuflw     $0xF5, %var2, %var2;    /* Repeat alpha for scaling (low) */\
-    movdqa      %xmm5, %xmm3;           \
-    psubw       %var2, %xmm4            /* Finalize alpha calculations */
-
-#define SCALE_PIXELS \
-    psllw       $8, %xmm5;              /* Filter out red and blue components */\
-    pmulhuw     %xmm4, %xmm5;           /* Scale red and blue */\
-    psrlw       $8, %xmm3;              /* Filter out alpha and green components */\
-    pmullw      %xmm4, %xmm3            /* Scale alpha and green */
-
-
-/*
- * void S32A_Opaque_BlitRow32_SSE4(SkPMColor* SK_RESTRICT dst,
- *                                 const SkPMColor* SK_RESTRICT src,
- *                                 int count, U8CPU alpha)
- *
- * This function is divided into six blocks: initialization, blit 4-15 pixels,
- * blit 0-3 pixels, align destination for 16+ pixel blits,
- * blit 16+ pixels with source unaligned, blit 16+ pixels with source aligned.
- * There are some code reuse between the blocks.
- *
- * The primary optimization comes from checking the source pixels' alpha value.
- * If the alpha is zero, the pixel can be skipped entirely.
- * If the alpha is fully opaque, the pixel can be copied directly to the destination.
- * According to collected statistics, these two cases are the most common.
- * The main loop(s) uses pre-loading and unrolling in an attempt to reduce the
- * memory latency worse-case.
- */
-
-#ifdef __clang__
-    .text
-#else
-    .section .text.sse4.2,"ax",@progbits
-    .type S32A_Opaque_BlitRow32_SSE4_asm, @function
-#endif
-    .p2align 4
-#if defined(SK_BUILD_FOR_MAC)
-    .global _S32A_Opaque_BlitRow32_SSE4_asm
-    .private_extern _S32A_Opaque_BlitRow32_SSE4_asm
-_S32A_Opaque_BlitRow32_SSE4_asm:
-#else
-    .global S32A_Opaque_BlitRow32_SSE4_asm
-    .hidden S32A_Opaque_BlitRow32_SSE4_asm
-S32A_Opaque_BlitRow32_SSE4_asm:
-#endif
-    .cfi_startproc
-    movl        8(%esp), %eax           // Source pointer
-    movl        12(%esp), %ecx          // Pixel count
-    movl        4(%esp), %edx           // Destination pointer
-    prefetcht0  (%eax)
-
-    // Setup SSE constants
-    pcmpeqd     %xmm7, %xmm7            // 0xFF000000 mask to check alpha
-    pslld       $24, %xmm7
-    pcmpeqw     %xmm6, %xmm6            // 16-bit 256 to calculate inv. alpha
-    psrlw       $15, %xmm6
-    psllw       $8, %xmm6
-    pcmpeqw     %xmm0, %xmm0            // 0x00FF00FF mask (Must be in xmm0 because of pblendvb)
-    psrlw       $8, %xmm0
-    subl        $4, %ecx                // Check if we have only 0-3 pixels
-    js          .LReallySmall
-    PUSH(%edi)
-    cmpl        $11, %ecx               // Do we have enough pixels to run the main loop?
-    ja          .LBigBlit
-
-    // Handle small blits (4-15 pixels)
-    ////////////////////////////////////////////////////////////////////////////////
-    xorl        %edi, %edi              // Reset offset to zero
-
-.LSmallLoop:
-    lddqu       (%eax, %edi), %xmm1     // Load four source pixels
-    ptest       %xmm7, %xmm1            // Check if all alphas are zero or opaque
-    ja          .LSmallAlphaNotOpaqueOrZero
-    jz          .LSmallAlphaZero        // If all alphas are zero, skip the pixels completely
-    movdqu      %xmm1, (%edx, %edi)     // Store four destination pixels
-.LSmallAlphaZero:
-    addl        $16, %edi
-    subl        $4, %ecx                // Check if there are four additional pixels, at least
-    jns         .LSmallLoop
-    jmp         .LSmallRemaining
-
-    // Handle mixed alphas (calculate and scale)
-    .p2align 4
-.LSmallAlphaNotOpaqueOrZero:
-    lddqu       (%edx, %edi), %xmm5     // Load four destination pixels
-    EXTRACT_ALPHA(xmm1, xmm2)           // Extract and clone alpha value
-    SCALE_PIXELS                        // Scale pixels using alpha
-
-    addl        $16, %edi
-    subl        $4, %ecx                // Check if there are four additional pixels, at least
-    pblendvb    %xmm5, %xmm3            // Mask in %xmm0, implicitly
-    paddb       %xmm3, %xmm1            // Add source and destination pixels together
-    movdqu      %xmm1, -16(%edx, %edi)  // Store four destination pixels
-    jns         .LSmallLoop
-
-    // Handle the last 0-3 pixels (also used by the main loops)
-.LSmallRemaining:
-    cmpl        $-4, %ecx               // Check if we are done
-    je          .LSmallExit
-    sall        $2, %ecx                // Calculate offset for last pixels
-    addl        %ecx, %edi
-
-    lddqu       (%eax, %edi), %xmm1     // Load last four source pixels (overlapping)
-    ptest       %xmm7, %xmm1            // Check if all alphas are zero or opaque
-    jc          .LSmallRemainingStoreAll// If all alphas are opaque, just store (overlapping)
-    jz          .LSmallExit             // If all alphas are zero, skip the pixels completely
-
-    // Handle mixed alphas (calculate and scale)
-    lddqu       (%edx, %edi), %xmm5     // Load last four destination pixels (overlapping)
-    EXTRACT_ALPHA(xmm1, xmm2)           // Extract and clone alpha value
-
-    psllw       $8, %xmm3               // Filter out red and blue components
-    pmulhuw     %xmm4, %xmm3            // Scale red and blue
-    movdqa      %xmm5, %xmm2
-    psrlw       $8, %xmm2               // Filter out alpha and green components
-    pmullw      %xmm4, %xmm2            // Scale alpha and green
-
-    cmpl        $-8, %ecx               // Check how many pixels should be written
-    pblendvb    %xmm3, %xmm2            // Combine results (mask in %xmm0, implicitly)
-    paddb       %xmm2, %xmm1            // Add source and destination pixels together
-    jb          .LSmallPixelsLeft1
-    ja          .LSmallPixelsLeft3      // To avoid double-blending the overlapping pixels...
-    pblendw     $0xF0, %xmm1, %xmm5     // Merge only the final two pixels to the destination
-    movdqu      %xmm5, (%edx, %edi)     // Store last two destination pixels
-.LSmallExit:
-    RETURN
-
-.LSmallPixelsLeft1:
-    pblendw     $0xC0, %xmm1, %xmm5     // Merge only the final pixel to the destination
-    movdqu      %xmm5, (%edx, %edi)     // Store last destination pixel
-    RETURN
-
-.LSmallPixelsLeft3:
-    pblendw     $0xFC, %xmm1, %xmm5     // Merge only the final three pixels to the destination
-    movdqu      %xmm5, (%edx, %edi)     // Store last three destination pixels
-    RETURN
-
-.LSmallRemainingStoreAll:
-    movdqu      %xmm1, (%edx, %edi)     // Store last destination pixels (overwrite)
-    RETURN
-
-    // Handle really small blits (0-3 pixels)
-    ////////////////////////////////////////////////////////////////////////////////
-.LReallySmall:
-    addl        $4, %ecx
-    jle         .LReallySmallExit
-    pcmpeqd     %xmm1, %xmm1
-    cmp         $2, %ecx                // Check how many pixels should be read
-    pinsrd      $0x0, (%eax), %xmm1     // Load one source pixel
-    pinsrd      $0x0, (%edx), %xmm5     // Load one destination pixel
-    jb          .LReallySmallCalc
-    pinsrd      $0x1, 4(%eax), %xmm1    // Load second source pixel
-    pinsrd      $0x1, 4(%edx), %xmm5    // Load second destination pixel
-    je          .LReallySmallCalc
-    pinsrd      $0x2, 8(%eax), %xmm1    // Load third source pixel
-    pinsrd      $0x2, 8(%edx), %xmm5    // Load third destination pixel
-
-.LReallySmallCalc:
-    ptest       %xmm7, %xmm1            // Check if all alphas are opaque
-    jc          .LReallySmallStore      // If all alphas are opaque, just store
-
-    // Handle mixed alphas (calculate and scale)
-    EXTRACT_ALPHA(xmm1, xmm2)           // Extract and clone alpha value
-
-    pand        %xmm0, %xmm5            // Filter out red and blue components
-    pmullw      %xmm4, %xmm5            // Scale red and blue
-    psrlw       $8, %xmm3               // Filter out alpha and green components
-    pmullw      %xmm4, %xmm3            // Scale alpha and green
-
-    psrlw       $8, %xmm5               // Combine results
-    pblendvb    %xmm5, %xmm3            // Mask in %xmm0, implicitly
-    paddb       %xmm3, %xmm1            // Add source and destination pixels together
-
-.LReallySmallStore:
-    cmp         $2, %ecx                // Check how many pixels should be written
-    pextrd      $0x0, %xmm1, (%edx)     // Store one destination pixel
-    jb          .LReallySmallExit
-    pextrd      $0x1, %xmm1, 4(%edx)    // Store second destination pixel
-    je          .LReallySmallExit
-    pextrd      $0x2, %xmm1, 8(%edx)    // Store third destination pixel
-.LReallySmallExit:
-    ret
-
-    // Handle bigger blit operations (16+ pixels)
-    ////////////////////////////////////////////////////////////////////////////////
-    .p2align 4
-.LBigBlit:
-    // Align destination?
-    testl       $0xF, %edx
-    lddqu       (%eax), %xmm1           // Pre-load four source pixels
-    jz          .LAligned
-
-    movl        %edx, %edi              // Calculate alignment of destination pointer
-    negl        %edi
-    andl        $0xF, %edi
-
-    // Handle 1-3 pixels to align destination
-    ptest       %xmm7, %xmm1            // Check if all alphas are zero or opaque
-    jz          .LAlignDone             // If all alphas are zero, just skip
-    lddqu       (%edx), %xmm5           // Load four destination pixels
-    jc          .LAlignStore            // If all alphas are opaque, just store
-
-    // Handle mixed alphas (calculate and scale)
-    EXTRACT_ALPHA(xmm1, xmm2)           // Extract and clone alpha value
-
-    psllw       $8, %xmm3               // Filter out red and blue components
-    pmulhuw     %xmm4, %xmm3            // Scale red and blue
-    movdqa      %xmm5, %xmm2
-    psrlw       $8, %xmm2               // Filter out alpha and green components
-    pmullw      %xmm4, %xmm2            // Scale alpha and green
-
-    pblendvb    %xmm3, %xmm2            // Combine results (mask in %xmm0, implicitly)
-    paddb       %xmm2, %xmm1            // Add source and destination pixels together
-
-.LAlignStore:
-    cmp         $8, %edi                // Check how many pixels should be written
-    jb          .LAlignPixelsLeft1
-    ja          .LAlignPixelsLeft3
-    pblendw     $0x0F, %xmm1, %xmm5     // Blend two pixels
-    jmp .LAlignStorePixels
-
-.LAlignPixelsLeft1:
-    pblendw     $0x03, %xmm1, %xmm5     // Blend one pixel
-    jmp .LAlignStorePixels
-
-.LAlignPixelsLeft3:
-    pblendw     $0x3F, %xmm1, %xmm5     // Blend three pixels
-
-.LAlignStorePixels:
-    movdqu      %xmm5, (%edx)           // Store destination pixels
-
-.LAlignDone:
-    addl        %edi, %eax              // Adjust pointers and pixel count
-    addl        %edi, %edx
-    shrl        $2, %edi
-    lddqu       (%eax), %xmm1           // Pre-load new source pixels (after alignment)
-    subl        %edi, %ecx
-
-.LAligned:                              // Destination is guaranteed to be 16 byte aligned
-    xorl        %edi, %edi              // Reset offset to zero
-    subl        $8, %ecx                // Decrease counter (Reserve four pixels for the cleanup)
-    testl       $0xF, %eax              // Check alignment of source pointer
-    jz          .LAlignedLoop
-
-    // Source not aligned to destination
-    ////////////////////////////////////////////////////////////////////////////////
-    .p2align 4
-.LUnalignedLoop:                        // Main loop for unaligned, handles eight pixels per iteration
-    ptest       %xmm7, %xmm1            // Check if all alphas are zero or opaque
-    ja          .LAlphaNotOpaqueOrZero00
-    lddqu       16(%eax, %edi), %xmm2   // Pre-load four source pixels
-    jz          .LAlphaZero00
-    movdqa      %xmm1, (%edx, %edi)     // Store four destination pixels
-
-.LAlphaZero00:
-    ptest       %xmm7, %xmm2            // Check if all alphas are zero or opaque
-    ja          .LAlphaNotOpaqueOrZero01
-    lddqu       32(%eax, %edi), %xmm1   // Pre-load four source pixels
-    jz          .LAlphaZero01
-    movdqa      %xmm2, 16(%edx, %edi)   // Store four destination pixels
-
-.LAlphaZero01:
-    addl        $32, %edi               // Adjust offset and pixel count
-    subl        $8, %ecx
-    jae         .LUnalignedLoop
-    addl        $8, %ecx                // Adjust pixel count
-    jmp         .LLoopCleanup0
-
-    .p2align 4
-.LAlphaNotOpaqueOrZero00:
-    movdqa      (%edx, %edi), %xmm5     // Load four destination pixels
-    EXTRACT_ALPHA(xmm1, xmm2)           // Extract and clone alpha value
-    SCALE_PIXELS                        // Scale pixels using alpha
-
-    lddqu       16(%eax, %edi), %xmm2   // Pre-load four source pixels
-    pblendvb    %xmm5, %xmm3            // Combine results (mask in %xmm0, implicitly)
-    paddb       %xmm3, %xmm1            // Add source and destination pixels together
-    movdqa      %xmm1, (%edx, %edi)     // Store four destination pixels
-
-    // Handle next four pixels
-    ptest       %xmm7, %xmm2            // Check if all alphas are zero or opaque
-    ja          .LAlphaNotOpaqueOrZero01
-    lddqu       32(%eax, %edi), %xmm1   // Pre-load four source pixels
-    jz          .LAlphaZero02
-    movdqa      %xmm2, 16(%edx, %edi)   // Store four destination pixels
-.LAlphaZero02:
-    addl        $32, %edi               // Adjust offset and pixel count
-    subl        $8, %ecx
-    jae         .LUnalignedLoop
-    addl        $8, %ecx                // Adjust pixel count
-    jmp         .LLoopCleanup0
-
-    .p2align 4
-.LAlphaNotOpaqueOrZero01:
-    movdqa      16(%edx, %edi), %xmm5   // Load four destination pixels
-    EXTRACT_ALPHA(xmm2, xmm1)           // Extract and clone alpha value
-    SCALE_PIXELS                        // Scale pixels using alpha
-
-    lddqu       32(%eax, %edi), %xmm1   // Pre-load four source pixels
-    addl        $32, %edi
-    pblendvb    %xmm5, %xmm3            // Combine results (mask in %xmm0, implicitly)
-    paddb       %xmm3, %xmm2            // Add source and destination pixels together
-    subl        $8, %ecx
-    movdqa      %xmm2, -16(%edx, %edi)  // Store four destination pixels
-    jae         .LUnalignedLoop
-    addl        $8, %ecx                // Adjust pixel count
-
-    // Cleanup - handle pending pixels from loop
-.LLoopCleanup0:
-    ptest       %xmm7, %xmm1            // Check if all alphas are zero or opaque
-    ja          .LAlphaNotOpaqueOrZero02
-    jz          .LAlphaZero03
-    movdqa      %xmm1, (%edx, %edi)     // Store four destination pixels
-.LAlphaZero03:
-    addl        $16, %edi
-    subl        $4, %ecx
-    js          .LSmallRemaining        // Reuse code from small loop
-
-.LRemain0:
-    lddqu       (%eax, %edi), %xmm1     // Load four source pixels
-    ptest       %xmm7, %xmm1            // Check if all alphas are zero or opaque
-    ja          .LAlphaNotOpaqueOrZero02
-    jz          .LAlphaZero04
-    movdqa      %xmm1, (%edx, %edi)     // Store four destination pixels
-.LAlphaZero04:
-    addl        $16, %edi
-    subl        $4, %ecx
-    jmp         .LSmallRemaining        // Reuse code from small loop
-
-.LAlphaNotOpaqueOrZero02:
-    movdqa      (%edx, %edi), %xmm5     // Load four destination pixels
-    EXTRACT_ALPHA(xmm1, xmm2)           // Extract and clone alpha value
-    SCALE_PIXELS                        // Scale pixels using alpha
-
-    addl        $16, %edi
-    subl        $4, %ecx
-    pblendvb    %xmm5, %xmm3            // Combine results (mask in %xmm0, implicitly)
-    paddb       %xmm3, %xmm1            // Add source and destination pixels together
-    movdqa      %xmm1, -16(%edx, %edi)  // Store four destination pixels
-    js          .LSmallRemaining        // Reuse code from small loop
-    jmp         .LRemain0
-
-    // Source aligned to destination
-    ////////////////////////////////////////////////////////////////////////////////
-    .p2align 4
-.LAlignedLoop:                          // Main loop for aligned, handles eight pixels per iteration
-    ptest       %xmm7, %xmm1            // Check if all alphas are zero or opaque
-    ja          .LAlphaNotOpaqueOrZero10
-    movdqa      16(%eax, %edi), %xmm2   // Pre-load four source pixels
-    jz          .LAlphaZero10
-    movdqa      %xmm1, (%edx, %edi)     // Store four destination pixels
-
-.LAlphaZero10:
-    ptest       %xmm7, %xmm2            // Check if all alphas are zero or opaque
-    ja          .LAlphaNotOpaqueOrZero11
-    movdqa      32(%eax, %edi), %xmm1   // Pre-load four source pixels
-    jz          .LAlphaZero11
-    movdqa      %xmm2, 16(%edx, %edi)   // Store four destination pixels
-
-.LAlphaZero11:
-    addl        $32, %edi               // Adjust offset and pixel count
-    subl        $8, %ecx
-    jae         .LAlignedLoop
-    addl        $8, %ecx                // Adjust pixel count
-    jmp         .LLoopCleanup1
-
-    .p2align 4
-.LAlphaNotOpaqueOrZero10:
-    movdqa      (%edx, %edi), %xmm5     // Load four destination pixels
-    EXTRACT_ALPHA(xmm1, xmm2)           // Extract and clone alpha value
-    SCALE_PIXELS                        // Scale pixels using alpha
-
-    movdqa      16(%eax, %edi), %xmm2   // Pre-load four source pixels
-    pblendvb    %xmm5, %xmm3            // Combine results (mask in %xmm0, implicitly)
-    paddb       %xmm3, %xmm1            // Add source and destination pixels together
-    movdqa      %xmm1, (%edx, %edi)     // Store four destination pixels
-
-    // Handle next four pixels
-    ptest       %xmm7, %xmm2            // Check if all alphas are zero or opaque
-    ja          .LAlphaNotOpaqueOrZero11
-    movdqa      32(%eax, %edi), %xmm1   // Pre-load four source pixels
-    jz          .LAlphaZero12
-    movdqa      %xmm2, 16(%edx, %edi)   // Store four destination pixels
-.LAlphaZero12:
-    addl        $32, %edi               // Adjust offset and pixel count
-    subl        $8, %ecx
-    jae         .LAlignedLoop
-    addl        $8, %ecx                // Adjust pixel count
-    jmp         .LLoopCleanup1
-
-    .p2align 4
-.LAlphaNotOpaqueOrZero11:
-    movdqa      16(%edx, %edi), %xmm5   // Load four destination pixels
-    EXTRACT_ALPHA(xmm2, xmm1)           // Extract and clone alpha value
-    SCALE_PIXELS                        // Scale pixels using alpha
-    movdqa      32(%eax, %edi), %xmm1   // Pre-load four source pixels
-
-    addl        $32, %edi
-    pblendvb    %xmm5, %xmm3            // Combine results (mask in %xmm0, implicitly)
-    paddb       %xmm3, %xmm2            // Add source and destination pixels together
-    subl        $8, %ecx
-    movdqa      %xmm2, -16(%edx, %edi)  // Store four destination pixels
-    jae         .LAlignedLoop
-    addl        $8, %ecx                // Adjust pixel count
-
-    // Cleanup - handle pending pixels from loop
-.LLoopCleanup1:
-    ptest       %xmm7, %xmm1            // Check if all alphas are zero or opaque
-    ja          .LAlphaNotOpaqueOrZero12
-    jz          .LAlphaZero13
-    movdqa      %xmm1, (%edx, %edi)     // Store four destination pixels
-.LAlphaZero13:
-    addl        $16, %edi
-    subl        $4, %ecx
-    js          .LSmallRemaining        // Reuse code from small loop
-
-.LRemain1:
-    movdqa      (%eax, %edi), %xmm1     // Load four source pixels
-    ptest       %xmm7, %xmm1            // Check if all alphas are zero or opaque
-    ja          .LAlphaNotOpaqueOrZero12
-    jz          .LAlphaZero14
-    movdqa      %xmm1, (%edx, %edi)     // Store four destination pixels
-.LAlphaZero14:
-    addl        $16, %edi
-    subl        $4, %ecx
-    jmp         .LSmallRemaining        // Reuse code from small loop
-
-.LAlphaNotOpaqueOrZero12:
-    movdqa      (%edx, %edi), %xmm5     // Load four destination pixels
-    EXTRACT_ALPHA(xmm1, xmm2)           // Extract and clone alpha value
-    SCALE_PIXELS                        // Scale pixels using alpha
-
-    addl        $16, %edi
-    subl        $4, %ecx
-    pblendvb    %xmm5, %xmm3            // Combine results (mask in %xmm0, implicitly)
-    paddb       %xmm3, %xmm1            // Add source and destination pixels together
-    movdqa      %xmm1, -16(%edx, %edi)  // Store four destination pixels
-    js          .LSmallRemaining        // Reuse code from small loop
-    jmp         .LRemain1
-
-    .cfi_endproc
-#ifndef __clang__
-    .size S32A_Opaque_BlitRow32_SSE4_asm, .-S32A_Opaque_BlitRow32_SSE4_asm
-#endif
-#endif
diff --git a/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4_x64_asm.S b/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4_x64_asm.S
deleted file mode 100644
index e42c34ec59f2..000000000000
--- a/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4_x64_asm.S
+++ /dev/null
@@ -1,470 +0,0 @@
-/*
- * Copyright 2014 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <SkPreConfig.h>
-
-#if defined(__clang__) || (defined(__GNUC__) && !(defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)))
-
-#define EXTRACT_ALPHA(var1, var2) \
-    movdqa      %var1, %var2;           /* Clone source pixels to extract alpha */\
-    psrlw       $8, %var2;              /* Discard red and blue, leaving alpha and green */\
-    pshufhw     $0xF5, %var2, %var2;    /* Repeat alpha for scaling (high) */\
-    movdqa      %xmm6, %xmm4;           \
-    pshuflw     $0xF5, %var2, %var2;    /* Repeat alpha for scaling (low) */\
-    movdqa      %xmm5, %xmm3;           \
-    psubw       %var2, %xmm4            /* Finalize alpha calculations */
-
-#define SCALE_PIXELS \
-    psllw       $8, %xmm5;              /* Filter out red and blue components */\
-    pmulhuw     %xmm4, %xmm5;           /* Scale red and blue */\
-    psrlw       $8, %xmm3;              /* Filter out alpha and green components */\
-    pmullw      %xmm4, %xmm3            /* Scale alpha and green */
-
-
-/*
- * void S32A_Opaque_BlitRow32_SSE4(SkPMColor* SK_RESTRICT dst,
- *                                 const SkPMColor* SK_RESTRICT src,
- *                                 int count, U8CPU alpha)
- *
- * This function is divided into six blocks: initialization, blit 4-15 pixels,
- * blit 0-3 pixels, align destination for 16+ pixel blits,
- * blit 16+ pixels with source unaligned, blit 16+ pixels with source aligned.
- * There are some code reuse between the blocks.
- *
- * The primary optimization comes from checking the source pixels' alpha value.
- * If the alpha is zero, the pixel can be skipped entirely.
- * If the alpha is fully opaque, the pixel can be copied directly to the destination.
- * According to collected statistics, these two cases are the most common.
- * The main loop(s) uses pre-loading and unrolling in an attempt to reduce the
- * memory latency worse-case.
- */
-
-#ifdef __clang__
-    .text
-#else
-    .section .text.sse4.2,"ax",@progbits
-    .type S32A_Opaque_BlitRow32_SSE4_asm, @function
-#endif
-    .p2align 4
-#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
-    .global _S32A_Opaque_BlitRow32_SSE4_asm
-    .private_extern _S32A_Opaque_BlitRow32_SSE4_asm
-_S32A_Opaque_BlitRow32_SSE4_asm:
-#else
-    .global S32A_Opaque_BlitRow32_SSE4_asm
-    .hidden S32A_Opaque_BlitRow32_SSE4_asm
-S32A_Opaque_BlitRow32_SSE4_asm:
-#endif
-    .cfi_startproc
-    prefetcht0  (%rsi)
-    movl        %edx, %ecx              // Pixel count
-    movq        %rdi, %rdx              // Destination pointer
-    movq        %rsi, %rax              // Source pointer
-
-    // Setup SSE constants
-    movdqa      .LAlphaCheckMask(%rip), %xmm7  // 0xFF000000 mask to check alpha
-    movdqa      .LInverseAlphaCalc(%rip), %xmm6// 16-bit 256 to calculate inv. alpha
-    movdqa      .LResultMergeMask(%rip), %xmm0 // 0x00FF00FF mask (Must be in xmm0 because of pblendvb)
-
-    subl        $4, %ecx                // Check if we have only 0-3 pixels
-    js          .LReallySmall
-    cmpl        $11, %ecx               // Do we have enough pixels to run the main loop?
-    ja          .LBigBlit
-
-    // Handle small blits (4-15 pixels)
-    ////////////////////////////////////////////////////////////////////////////////
-    xorq        %rdi, %rdi              // Reset offset to zero
-
-.LSmallLoop:
-    lddqu       (%rax, %rdi), %xmm1     // Load four source pixels
-    ptest       %xmm7, %xmm1            // Check if all alphas are zero or opaque
-    ja          .LSmallAlphaNotOpaqueOrZero
-    jz          .LSmallAlphaZero
-    movdqu      %xmm1, (%rdx, %rdi)     // Store four destination pixels
-.LSmallAlphaZero:
-    addq        $16, %rdi
-    subl        $4, %ecx                // Check if there are four additional pixels, at least
-    jns         .LSmallLoop
-    jmp         .LSmallRemaining
-
-    // Handle mixed alphas (calculate and scale)
-    .p2align 4
-.LSmallAlphaNotOpaqueOrZero:
-    lddqu       (%rdx, %rdi), %xmm5     // Load four destination pixels
-    EXTRACT_ALPHA(xmm1, xmm2)           // Extract and clone alpha value
-    SCALE_PIXELS                        // Scale pixels using alpha
-
-    addq        $16, %rdi
-    subl        $4, %ecx                // Check if there are four additional pixels, at least
-    pblendvb    %xmm5, %xmm3            // Mask in %xmm0, implicitly
-    paddb       %xmm3, %xmm1            // Add source and destination pixels together
-    movdqu      %xmm1, -16(%rdx, %rdi)  // Store four destination pixels
-    jns         .LSmallLoop
-
-    // Handle the last 0-3 pixels (also used by the main loops)
-.LSmallRemaining:
-    cmpl        $-4, %ecx               // Check if we are done
-    je          .LSmallExit
-    sall        $2, %ecx                // Calculate offset for last pixels
-    movslq      %ecx, %rcx
-    addq        %rcx, %rdi
-
-    lddqu       (%rax, %rdi), %xmm1     // Load last four source pixels (overlapping)
-    ptest       %xmm7, %xmm1            // Check if all alphas are zero or opaque
-    jc          .LSmallRemainingStoreAll// If all alphas are opaque, just store (overlapping)
-    jz          .LSmallExit             // If all alphas are zero, skip the pixels completely
-
-    // Handle mixed alphas (calculate and scale)
-    lddqu       (%rdx, %rdi), %xmm5     // Load last four destination pixels (overlapping)
-    EXTRACT_ALPHA(xmm1, xmm2)           // Extract and clone alpha value
-
-    psllw       $8, %xmm3               // Filter out red and blue components
-    pmulhuw     %xmm4, %xmm3            // Scale red and blue
-    movdqa      %xmm5, %xmm2
-    psrlw       $8, %xmm2               // Filter out alpha and green components
-    pmullw      %xmm4, %xmm2            // Scale alpha and green
-
-    cmpl        $-8, %ecx               // Check how many pixels should be written
-    pblendvb    %xmm3, %xmm2            // Combine results (mask in %xmm0, implicitly)
-    paddb       %xmm2, %xmm1            // Add source and destination pixels together
-    jb          .LSmallPixelsLeft1
-    ja          .LSmallPixelsLeft3      // To avoid double-blending the overlapping pixels...
-    pblendw     $0xF0, %xmm1, %xmm5     // Merge only the final two pixels to the destination
-    movdqu      %xmm5, (%rdx, %rdi)     // Store last two destination pixels
-.LSmallExit:
-    ret
-
-.LSmallPixelsLeft1:
-    pblendw     $0xC0, %xmm1, %xmm5     // Merge only the final pixel to the destination
-    movdqu      %xmm5, (%rdx, %rdi)     // Store last destination pixel
-    ret
-
-.LSmallPixelsLeft3:
-    pblendw     $0xFC, %xmm1, %xmm5     // Merge only the final three pixels to the destination
-    movdqu      %xmm5, (%rdx, %rdi)     // Store last three destination pixels
-    ret
-
-.LSmallRemainingStoreAll:
-    movdqu      %xmm1, (%rdx, %rdi)     // Store last destination pixels (overwrite)
-    ret
-
-    // Handle really small blits (0-3 pixels)
-    ////////////////////////////////////////////////////////////////////////////////
-.LReallySmall:
-    addl        $4, %ecx
-    jle         .LReallySmallExit
-    pcmpeqd     %xmm1, %xmm1
-    cmpl        $2, %ecx                // Check how many pixels should be read
-    pinsrd      $0x0, (%rax), %xmm1     // Load one source pixel
-    pinsrd      $0x0, (%rdx), %xmm5     // Load one destination pixel
-    jb          .LReallySmallCalc
-    pinsrd      $0x1, 4(%rax), %xmm1    // Load second source pixel
-    pinsrd      $0x1, 4(%rdx), %xmm5    // Load second destination pixel
-    je          .LReallySmallCalc
-    pinsrd      $0x2, 8(%rax), %xmm1    // Load third source pixel
-    pinsrd      $0x2, 8(%rdx), %xmm5    // Load third destination pixel
-
-.LReallySmallCalc:
-    ptest       %xmm7, %xmm1            // Check if all alphas are opaque
-    jc          .LReallySmallStore      // If all alphas are opaque, just store
-
-    // Handle mixed alphas (calculate and scale)
-    EXTRACT_ALPHA(xmm1, xmm2)           // Extract and clone alpha value
-
-    pand        %xmm0, %xmm5            // Filter out red and blue components
-    pmullw      %xmm4, %xmm5            // Scale red and blue
-    psrlw       $8, %xmm3               // Filter out alpha and green components
-    pmullw      %xmm4, %xmm3            // Scale alpha and green
-
-    psrlw       $8, %xmm5               // Combine results
-    pblendvb    %xmm5, %xmm3            // Mask in %xmm0, implicitly
-    paddb       %xmm3, %xmm1            // Add source and destination pixels together
-
-.LReallySmallStore:
-    cmpl        $2, %ecx                // Check how many pixels should be written
-    pextrd      $0x0, %xmm1, (%rdx)     // Store one destination pixel
-    jb          .LReallySmallExit
-    pextrd      $0x1, %xmm1, 4(%rdx)    // Store second destination pixel
-    je          .LReallySmallExit
-    pextrd      $0x2, %xmm1, 8(%rdx)    // Store third destination pixel
-.LReallySmallExit:
-    ret
-
-    // Handle bigger blit operations (16+ pixels)
-    ////////////////////////////////////////////////////////////////////////////////
-    .p2align 4
-.LBigBlit:
-    // Align destination?
-    testl       $0xF, %edx
-    lddqu       (%rax), %xmm1           // Pre-load four source pixels
-    jz          .LAligned
-
-    movq        %rdx, %rdi              // Calculate alignment of destination pointer
-    negq        %rdi
-    andl        $0xF, %edi
-
-    // Handle 1-3 pixels to align destination
-    ptest       %xmm7, %xmm1            // Check if all alphas are zero or opaque
-    jz          .LAlignDone             // If all alphas are zero, just skip
-    lddqu       (%rdx), %xmm5           // Load four destination pixels
-    jc          .LAlignStore            // If all alphas are opaque, just store
-
-    // Handle mixed alphas (calculate and scale)
-    EXTRACT_ALPHA(xmm1, xmm2)           // Extract and clone alpha value
-
-    psllw       $8, %xmm3               // Filter out red and blue components
-    pmulhuw     %xmm4, %xmm3            // Scale red and blue
-    movdqa      %xmm5, %xmm2
-    psrlw       $8, %xmm2               // Filter out alpha and green components
-    pmullw      %xmm4, %xmm2            // Scale alpha and green
-
-    pblendvb    %xmm3, %xmm2            // Combine results (mask in %xmm0, implicitly)
-    paddb       %xmm2, %xmm1            // Add source and destination pixels together
-
-.LAlignStore:
-    cmpl        $8, %edi                // Check how many pixels should be written
-    jb          .LAlignPixelsLeft1
-    ja          .LAlignPixelsLeft3
-    pblendw     $0x0F, %xmm1, %xmm5     // Blend two pixels
-    jmp .LAlignStorePixels
-
-.LAlignPixelsLeft1:
-    pblendw     $0x03, %xmm1, %xmm5     // Blend one pixel
-    jmp .LAlignStorePixels
-
-.LAlignPixelsLeft3:
-    pblendw     $0x3F, %xmm1, %xmm5     // Blend three pixels
-
-.LAlignStorePixels:
-    movdqu      %xmm5, (%rdx)           // Store destination pixels
-
-.LAlignDone:
-    addq        %rdi, %rax              // Adjust pointers and pixel count
-    addq        %rdi, %rdx
-    shrq        $2, %rdi
-    lddqu       (%rax), %xmm1           // Pre-load new source pixels (after alignment)
-    subl        %edi, %ecx
-
-.LAligned:                              // Destination is guaranteed to be 16 byte aligned
-    xorq        %rdi, %rdi              // Reset offset to zero
-    subl        $8, %ecx                // Decrease counter (Reserve four pixels for the cleanup)
-    testl       $0xF, %eax              // Check alignment of source pointer
-    jz          .LAlignedLoop
-
-    // Source not aligned to destination
-    ////////////////////////////////////////////////////////////////////////////////
-    .p2align 4
-.LUnalignedLoop:                        // Main loop for unaligned, handles eight pixels per iteration
-    ptest       %xmm7, %xmm1            // Check if all alphas are zero or opaque
-    ja          .LAlphaNotOpaqueOrZero00
-    lddqu       16(%rax, %rdi), %xmm2   // Pre-load four source pixels
-    jz          .LAlphaZero00
-    movdqa      %xmm1, (%rdx, %rdi)     // Store four destination pixels
-
-.LAlphaZero00:
-    ptest       %xmm7, %xmm2            // Check if all alphas are zero or opaque
-    ja          .LAlphaNotOpaqueOrZero01
-    lddqu       32(%rax, %rdi), %xmm1   // Pre-load four source pixels
-    jz          .LAlphaZero01
-    movdqa      %xmm2, 16(%rdx, %rdi)   // Store four destination pixels
-
-.LAlphaZero01:
-    addq        $32, %rdi               // Adjust offset and pixel count
-    subl        $8, %ecx
-    jae         .LUnalignedLoop
-    addl        $8, %ecx                // Adjust pixel count
-    jmp         .LLoopCleanup0
-
-    .p2align 4
-.LAlphaNotOpaqueOrZero00:
-    movdqa      (%rdx, %rdi), %xmm5     // Load four destination pixels
-    EXTRACT_ALPHA(xmm1, xmm2)           // Extract and clone alpha value
-    SCALE_PIXELS                        // Scale pixels using alpha
-
-    lddqu       16(%rax, %rdi), %xmm2   // Pre-load four source pixels
-    pblendvb    %xmm5, %xmm3            // Combine results (mask in %xmm0, implicitly)
-    paddb       %xmm3, %xmm1            // Add source and destination pixels together
-    movdqa      %xmm1, (%rdx, %rdi)     // Store four destination pixels
-
-    // Handle next four pixels
-    ptest       %xmm7, %xmm2            // Check if all alphas are zero or opaque
-    ja          .LAlphaNotOpaqueOrZero01
-    lddqu       32(%rax, %rdi), %xmm1   // Pre-load four source pixels
-    jz          .LAlphaZero02
-    movdqa      %xmm2, 16(%rdx, %rdi)   // Store four destination pixels
-.LAlphaZero02:
-    addq        $32, %rdi               // Adjust offset and pixel count
-    subl        $8, %ecx
-    jae         .LUnalignedLoop
-    addl        $8, %ecx                // Adjust pixel count
-    jmp         .LLoopCleanup0
-
-    .p2align 4
-.LAlphaNotOpaqueOrZero01:
-    movdqa      16(%rdx, %rdi), %xmm5   // Load four destination pixels
-    EXTRACT_ALPHA(xmm2, xmm1)           // Extract and clone alpha value
-    SCALE_PIXELS                        // Scale pixels using alpha
-
-    lddqu       32(%rax, %rdi), %xmm1   // Pre-load four source pixels
-    addq        $32, %rdi
-    pblendvb    %xmm5, %xmm3            // Combine results (mask in %xmm0, implicitly)
-    paddb       %xmm3, %xmm2            // Add source and destination pixels together
-    subl        $8, %ecx
-    movdqa      %xmm2, -16(%rdx, %rdi)  // Store four destination pixels
-    jae         .LUnalignedLoop
-    addl        $8, %ecx                // Adjust pixel count
-
-    // Cleanup - handle pending pixels from loop
-.LLoopCleanup0:
-    ptest       %xmm7, %xmm1            // Check if all alphas are zero or opaque
-    ja          .LAlphaNotOpaqueOrZero02
-    jz          .LAlphaZero03
-    movdqa      %xmm1, (%rdx, %rdi)     // Store four destination pixels
-.LAlphaZero03:
-    addq        $16, %rdi
-    subl        $4, %ecx
-    js          .LSmallRemaining        // Reuse code from small loop
-
-.LRemain0:
-    lddqu       (%rax, %rdi), %xmm1     // Load four source pixels
-    ptest       %xmm7, %xmm1            // Check if all alphas are zero or opaque
-    ja          .LAlphaNotOpaqueOrZero02
-    jz          .LAlphaZero04
-    movdqa      %xmm1, (%rdx, %rdi)     // Store four destination pixels
-.LAlphaZero04:
-    addq        $16, %rdi
-    subl        $4, %ecx
-    jmp         .LSmallRemaining        // Reuse code from small loop
-
-.LAlphaNotOpaqueOrZero02:
-    movdqa      (%rdx, %rdi), %xmm5     // Load four destination pixels
-    EXTRACT_ALPHA(xmm1, xmm2)           // Extract and clone alpha value
-    SCALE_PIXELS                        // Scale pixels using alpha
-
-    addq        $16, %rdi
-    subl        $4, %ecx
-    pblendvb    %xmm5, %xmm3            // Combine results (mask in %xmm0, implicitly)
-    paddb       %xmm3, %xmm1            // Add source and destination pixels together
-    movdqa      %xmm1, -16(%rdx, %rdi)  // Store four destination pixels
-    js          .LSmallRemaining        // Reuse code from small loop
-    jmp         .LRemain0
-
-    // Source aligned to destination
-    ////////////////////////////////////////////////////////////////////////////////
-    .p2align 4
-.LAlignedLoop:                          // Main loop for aligned, handles eight pixels per iteration
-    ptest       %xmm7, %xmm1            // Check if all alphas are zero or opaque
-    ja          .LAlphaNotOpaqueOrZero10
-    movdqa      16(%rax, %rdi), %xmm2   // Pre-load four source pixels
-    jz          .LAlphaZero10
-    movdqa      %xmm1, (%rdx, %rdi)     // Store four destination pixels
-
-.LAlphaZero10:
-    ptest       %xmm7, %xmm2            // Check if all alphas are zero or opaque
-    ja          .LAlphaNotOpaqueOrZero11
-    movdqa      32(%rax, %rdi), %xmm1   // Pre-load four source pixels
-    jz          .LAlphaZero11
-    movdqa      %xmm2, 16(%rdx, %rdi)   // Store four destination pixels
-
-.LAlphaZero11:
-    addq        $32, %rdi               // Adjust offset and pixel count
-    subl        $8, %ecx
-    jae         .LAlignedLoop
-    addl        $8, %ecx                // Adjust pixel count
-    jmp         .LLoopCleanup1
-
-    .p2align 4
-.LAlphaNotOpaqueOrZero10:
-    movdqa      (%rdx, %rdi), %xmm5     // Load four destination pixels
-    EXTRACT_ALPHA(xmm1, xmm2)           // Extract and clone alpha value
-    SCALE_PIXELS                        // Scale pixels using alpha
-
-    movdqa      16(%rax, %rdi), %xmm2   // Pre-load four source pixels
-    pblendvb    %xmm5, %xmm3            // Combine results (mask in %xmm0, implicitly)
-    paddb       %xmm3, %xmm1            // Add source and destination pixels together
-    movdqa      %xmm1, (%rdx, %rdi)     // Store four destination pixels
-
-    // Handle next four pixels
-    ptest       %xmm7, %xmm2            // Check if all alphas are zero or opaque
-    ja          .LAlphaNotOpaqueOrZero11
-    movdqa      32(%rax, %rdi), %xmm1   // Pre-load four source pixels
-    jz          .LAlphaZero12
-    movdqa      %xmm2, 16(%rdx, %rdi)   // Store four destination pixels
-.LAlphaZero12:
-    addq        $32, %rdi               // Adjust offset and pixel count
-    subl        $8, %ecx
-    jae         .LAlignedLoop
-    addl        $8, %ecx                // Adjust pixel count
-    jmp         .LLoopCleanup1
-
-    .p2align 4
-.LAlphaNotOpaqueOrZero11:
-    movdqa      16(%rdx, %rdi), %xmm5   // Load four destination pixels
-    EXTRACT_ALPHA(xmm2, xmm1)           // Extract and clone alpha value
-    SCALE_PIXELS                        // Scale pixels using alpha
-    movdqa      32(%rax, %rdi), %xmm1   // Pre-load four source pixels
-
-    addq        $32, %rdi
-    pblendvb    %xmm5, %xmm3            // Combine results (mask in %xmm0, implicitly)
-    paddb       %xmm3, %xmm2            // Add source and destination pixels together
-    subl        $8, %ecx
-    movdqa      %xmm2, -16(%rdx, %rdi)  // Store four destination pixels
-    jae         .LAlignedLoop
-    addl        $8, %ecx                // Adjust pixel count
-
-    // Cleanup - handle four pending pixels from loop
-.LLoopCleanup1:
-    ptest       %xmm7, %xmm1            // Check if all alphas are zero or opaque
-    ja          .LAlphaNotOpaqueOrZero12
-    jz          .LAlphaZero13
-    movdqa      %xmm1, (%rdx, %rdi)     // Store four destination pixels
-.LAlphaZero13:
-    addq        $16, %rdi
-    subl        $4, %ecx
-    js          .LSmallRemaining        // Reuse code from small loop
-
-.LRemain1:
-    movdqa      (%rax, %rdi), %xmm1     // Pre-load four source pixels
-    ptest       %xmm7, %xmm1            // Check if all alphas are zero or opaque
-    ja          .LAlphaNotOpaqueOrZero12
-    jz          .LAlphaZero14
-    movdqa      %xmm1, (%rdx, %rdi)     // Store four destination pixels
-.LAlphaZero14:
-    addq        $16, %rdi
-    subl        $4, %ecx
-    jmp         .LSmallRemaining        // Reuse code from small loop
-
-.LAlphaNotOpaqueOrZero12:
-    movdqa      (%rdx, %rdi), %xmm5     // Load four destination pixels
-    EXTRACT_ALPHA(xmm1, xmm2)           // Extract and clone alpha value
-    SCALE_PIXELS                        // Scale pixels using alpha
-
-    addq        $16, %rdi
-    subl        $4, %ecx
-    pblendvb    %xmm5, %xmm3            // Combine results (mask in %xmm0, implicitly)
-    paddb       %xmm3, %xmm1            // Add source and destination pixels together
-    movdqa      %xmm1, -16(%rdx, %rdi)  // Store four destination pixels
-    js          .LSmallRemaining        // Reuse code from small loop
-    jmp         .LRemain1
-
-    .cfi_endproc
-#ifndef __clang__
-    .size S32A_Opaque_BlitRow32_SSE4_asm, .-S32A_Opaque_BlitRow32_SSE4_asm
-#endif
-
-    // Constants for SSE code
-#ifndef __clang__
-    .section .rodata
-#endif
-    .p2align 4
-.LAlphaCheckMask:
-    .long   0xFF000000, 0xFF000000, 0xFF000000, 0xFF000000
-.LInverseAlphaCalc:
-    .word   256, 256, 256, 256, 256, 256, 256, 256
-.LResultMergeMask:
-    .long   0x00FF00FF, 0x00FF00FF, 0x00FF00FF, 0x00FF00FF
-#endif
diff --git a/gfx/skia/skia/src/opts/SkBlitRow_opts_arm.cpp b/gfx/skia/skia/src/opts/SkBlitRow_opts_arm.cpp
index 473a3e91b189..24566ba6c532 100644
--- a/gfx/skia/skia/src/opts/SkBlitRow_opts_arm.cpp
+++ b/gfx/skia/skia/src/opts/SkBlitRow_opts_arm.cpp
@@ -6,387 +6,30 @@
  */
 
 #include "SkBlitRow.h"
-#include "SkColorPriv.h"
-#include "SkDither.h"
-#include "SkMathPriv.h"
-#include "SkUtils.h"
 #include "SkUtilsArm.h"
 
-// Define USE_NEON_CODE to indicate that we need to build NEON routines
-#define USE_NEON_CODE  (!SK_ARM_NEON_IS_NONE)
+#include "SkBlitRow_opts_arm_neon.h"
 
-// Define USE_ARM_CODE to indicate that we need to build ARM routines
-#define USE_ARM_CODE   (!SK_ARM_NEON_IS_ALWAYS)
+static const SkBlitRow::Proc16 sk_blitrow_platform_565_procs_arm[] = {
+    nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+};
 
-#if USE_NEON_CODE
-  #include "SkBlitRow_opts_arm_neon.h"
-#endif
-
-#if USE_ARM_CODE
-
-static void S32A_D565_Opaque(uint16_t* SK_RESTRICT dst,
-                             const SkPMColor* SK_RESTRICT src, int count,
-                             U8CPU alpha, int /*x*/, int /*y*/) {
-    SkASSERT(255 == alpha);
-
-    asm volatile (
-                  "1:                                   \n\t"
-                  "ldr     r3, [%[src]], #4             \n\t"
-                  "cmp     r3, #0xff000000              \n\t"
-                  "blo     2f                           \n\t"
-                  "and     r4, r3, #0x0000f8            \n\t"
-                  "and     r5, r3, #0x00fc00            \n\t"
-                  "and     r6, r3, #0xf80000            \n\t"
-#ifdef SK_ARM_HAS_EDSP
-                  "pld     [r1, #32]                    \n\t"
-#endif
-                  "lsl     r3, r4, #8                   \n\t"
-                  "orr     r3, r3, r5, lsr #5           \n\t"
-                  "orr     r3, r3, r6, lsr #19          \n\t"
-                  "subs    %[count], %[count], #1       \n\t"
-                  "strh    r3, [%[dst]], #2             \n\t"
-                  "bne     1b                           \n\t"
-                  "b       4f                           \n\t"
-                  "2:                                   \n\t"
-                  "lsrs    r7, r3, #24                  \n\t"
-                  "beq     3f                           \n\t"
-                  "ldrh    r4, [%[dst]]                 \n\t"
-                  "rsb     r7, r7, #255                 \n\t"
-                  "and     r6, r4, #0x001f              \n\t"
-#if SK_ARM_ARCH <= 6
-                  "lsl     r5, r4, #21                  \n\t"
-                  "lsr     r5, r5, #26                  \n\t"
-#else
-                  "ubfx    r5, r4, #5, #6               \n\t"
-#endif
-#ifdef SK_ARM_HAS_EDSP
-                  "pld     [r0, #16]                    \n\t"
-#endif
-                  "lsr     r4, r4, #11                  \n\t"
-#ifdef SK_ARM_HAS_EDSP
-                  "smulbb  r6, r6, r7                   \n\t"
-                  "smulbb  r5, r5, r7                   \n\t"
-                  "smulbb  r4, r4, r7                   \n\t"
-#else
-                  "mul     r6, r6, r7                   \n\t"
-                  "mul     r5, r5, r7                   \n\t"
-                  "mul     r4, r4, r7                   \n\t"
-#endif
-#if SK_ARM_ARCH >= 6
-                  "uxtb    r7, r3, ROR #16              \n\t"
-                  "uxtb    ip, r3, ROR #8               \n\t"
-#else
-                  "mov     ip, #0xff                    \n\t"
-                  "and     r7, ip, r3, ROR #16          \n\t"
-                  "and     ip, ip, r3, ROR #8           \n\t"
-#endif
-                  "and     r3, r3, #0xff                \n\t"
-                  "add     r6, r6, #16                  \n\t"
-                  "add     r5, r5, #32                  \n\t"
-                  "add     r4, r4, #16                  \n\t"
-                  "add     r6, r6, r6, lsr #5           \n\t"
-                  "add     r5, r5, r5, lsr #6           \n\t"
-                  "add     r4, r4, r4, lsr #5           \n\t"
-                  "add     r6, r7, r6, lsr #5           \n\t"
-                  "add     r5, ip, r5, lsr #6           \n\t"
-                  "add     r4, r3, r4, lsr #5           \n\t"
-                  "lsr     r6, r6, #3                   \n\t"
-                  "and     r5, r5, #0xfc                \n\t"
-                  "and     r4, r4, #0xf8                \n\t"
-                  "orr     r6, r6, r5, lsl #3           \n\t"
-                  "orr     r4, r6, r4, lsl #8           \n\t"
-                  "strh    r4, [%[dst]], #2             \n\t"
-#ifdef SK_ARM_HAS_EDSP
-                  "pld     [r1, #32]                    \n\t"
-#endif
-                  "subs    %[count], %[count], #1       \n\t"
-                  "bne     1b                           \n\t"
-                  "b       4f                           \n\t"
-                  "3:                                   \n\t"
-                  "subs    %[count], %[count], #1       \n\t"
-                  "add     %[dst], %[dst], #2           \n\t"
-                  "bne     1b                           \n\t"
-                  "4:                                   \n\t"
-                  : [dst] "+r" (dst), [src] "+r" (src), [count] "+r" (count)
-                  :
-                  : "memory", "cc", "r3", "r4", "r5", "r6", "r7", "ip"
-                  );
-}
-
-static void S32A_Opaque_BlitRow32_arm(SkPMColor* SK_RESTRICT dst,
-                                  const SkPMColor* SK_RESTRICT src,
-                                  int count, U8CPU alpha) {
-
-    SkASSERT(255 == alpha);
-
-    asm volatile (
-                  "cmp    %[count], #0               \n\t" /* comparing count with 0 */
-                  "beq    3f                         \n\t" /* if zero exit */
-
-                  "mov    ip, #0xff                  \n\t" /* load the 0xff mask in ip */
-                  "orr    ip, ip, ip, lsl #16        \n\t" /* convert it to 0xff00ff in ip */
-
-                  "cmp    %[count], #2               \n\t" /* compare count with 2 */
-                  "blt    2f                         \n\t" /* if less than 2 -> single loop */
-
-                  /* Double Loop */
-                  "1:                                \n\t" /* <double loop> */
-                  "ldm    %[src]!, {r5,r6}           \n\t" /* load the src(s) at r5-r6 */
-                  "ldm    %[dst], {r7,r8}            \n\t" /* loading dst(s) into r7-r8 */
-                  "lsr    r4, r5, #24                \n\t" /* extracting the alpha from source and storing it to r4 */
-
-                  /* ----------- */
-                  "and    r9, ip, r7                 \n\t" /* r9 = br masked by ip */
-                  "rsb    r4, r4, #256               \n\t" /* subtracting the alpha from 256 -> r4=scale */
-                  "and    r10, ip, r7, lsr #8        \n\t" /* r10 = ag masked by ip */
-
-                  "mul    r9, r9, r4                 \n\t" /* br = br * scale */
-                  "mul    r10, r10, r4               \n\t" /* ag = ag * scale */
-                  "and    r9, ip, r9, lsr #8         \n\t" /* lsr br by 8 and mask it */
-
-                  "and    r10, r10, ip, lsl #8       \n\t" /* mask ag with reverse mask */
-                  "lsr    r4, r6, #24                \n\t" /* extracting the alpha from source and storing it to r4 */
-                  "orr    r7, r9, r10                \n\t" /* br | ag*/
-
-                  "add    r7, r5, r7                 \n\t" /* dst = src + calc dest(r7) */
-                  "rsb    r4, r4, #256               \n\t" /* subtracting the alpha from 255 -> r4=scale */
-
-                  /* ----------- */
-                  "and    r9, ip, r8                 \n\t" /* r9 = br masked by ip */
-
-                  "and    r10, ip, r8, lsr #8        \n\t" /* r10 = ag masked by ip */
-                  "mul    r9, r9, r4                 \n\t" /* br = br * scale */
-                  "sub    %[count], %[count], #2     \n\t"
-                  "mul    r10, r10, r4               \n\t" /* ag = ag * scale */
-
-                  "and    r9, ip, r9, lsr #8         \n\t" /* lsr br by 8 and mask it */
-                  "and    r10, r10, ip, lsl #8       \n\t" /* mask ag with reverse mask */
-                  "cmp    %[count], #1               \n\t" /* comparing count with 1 */
-                  "orr    r8, r9, r10                \n\t" /* br | ag */
-
-                  "add    r8, r6, r8                 \n\t" /* dst = src + calc dest(r8) */
-
-                  /* ----------------- */
-                  "stm    %[dst]!, {r7,r8}           \n\t" /* *dst = r7, increment dst by two (each times 4) */
-                  /* ----------------- */
-
-                  "bgt    1b                         \n\t" /* if greater than 1 -> reloop */
-                  "blt    3f                         \n\t" /* if less than 1 -> exit */
-
-                  /* Single Loop */
-                  "2:                                \n\t" /* <single loop> */
-                  "ldr    r5, [%[src]], #4           \n\t" /* load the src pointer into r5 r5=src */
-                  "ldr    r7, [%[dst]]               \n\t" /* loading dst into r7 */
-                  "lsr    r4, r5, #24                \n\t" /* extracting the alpha from source and storing it to r4 */
-
-                  /* ----------- */
-                  "and    r9, ip, r7                 \n\t" /* r9 = br masked by ip */
-                  "rsb    r4, r4, #256               \n\t" /* subtracting the alpha from 256 -> r4=scale */
-
-                  "and    r10, ip, r7, lsr #8        \n\t" /* r10 = ag masked by ip */
-                  "mul    r9, r9, r4                 \n\t" /* br = br * scale */
-                  "mul    r10, r10, r4               \n\t" /* ag = ag * scale */
-                  "and    r9, ip, r9, lsr #8         \n\t" /* lsr br by 8 and mask it */
-
-                  "and    r10, r10, ip, lsl #8       \n\t" /* mask ag */
-                  "orr    r7, r9, r10                \n\t" /* br | ag */
-
-                  "add    r7, r5, r7                 \n\t" /* *dst = src + calc dest(r7) */
-
-                  /* ----------------- */
-                  "str    r7, [%[dst]], #4           \n\t" /* *dst = r7, increment dst by one (times 4) */
-                  /* ----------------- */
-
-                  "3:                                \n\t" /* <exit> */
-                  : [dst] "+r" (dst), [src] "+r" (src), [count] "+r" (count)
-                  :
-                  : "cc", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "ip", "memory"
-                  );
-}
-
-/*
- * ARM asm version of S32A_Blend_BlitRow32
- */
-void S32A_Blend_BlitRow32_arm(SkPMColor* SK_RESTRICT dst,
-                              const SkPMColor* SK_RESTRICT src,
-                              int count, U8CPU alpha) {
-    asm volatile (
-                  "cmp    %[count], #0               \n\t" /* comparing count with 0 */
-                  "beq    3f                         \n\t" /* if zero exit */
-
-                  "mov    r12, #0xff                 \n\t" /* load the 0xff mask in r12 */
-                  "orr    r12, r12, r12, lsl #16     \n\t" /* convert it to 0xff00ff in r12 */
-
-                  /* src1,2_scale */
-                  "add    %[alpha], %[alpha], #1     \n\t" /* loading %[alpha]=src_scale=alpha+1 */
-
-                  "cmp    %[count], #2               \n\t" /* comparing count with 2 */
-                  "blt    2f                         \n\t" /* if less than 2 -> single loop */
-
-                  /* Double Loop */
-                  "1:                                \n\t" /* <double loop> */
-                  "ldm    %[src]!, {r5, r6}          \n\t" /* loading src pointers into r5 and r6 */
-                  "ldm    %[dst], {r7, r8}           \n\t" /* loading dst pointers into r7 and r8 */
-
-                  /* dst1_scale and dst2_scale*/
-                  "lsr    r9, r5, #24                \n\t" /* src >> 24 */
-                  "lsr    r10, r6, #24               \n\t" /* src >> 24 */
-#ifdef SK_ARM_HAS_EDSP
-                  "smulbb r9, r9, %[alpha]           \n\t" /* r9 = SkMulS16 r9 with src_scale */
-                  "smulbb r10, r10, %[alpha]         \n\t" /* r10 = SkMulS16 r10 with src_scale */
-#else
-                  "mul    r9, r9, %[alpha]           \n\t" /* r9 = SkMulS16 r9 with src_scale */
-                  "mul    r10, r10, %[alpha]         \n\t" /* r10 = SkMulS16 r10 with src_scale */
-#endif
-                  "lsr    r9, r9, #8                 \n\t" /* r9 >> 8 */
-                  "lsr    r10, r10, #8               \n\t" /* r10 >> 8 */
-                  "rsb    r9, r9, #256               \n\t" /* dst1_scale = r9 = 255 - r9 + 1 */
-                  "rsb    r10, r10, #256             \n\t" /* dst2_scale = r10 = 255 - r10 + 1 */
-
-                  /* ---------------------- */
-
-                  /* src1, src1_scale */
-                  "and    r11, r12, r5, lsr #8       \n\t" /* ag = r11 = r5 masked by r12 lsr by #8 */
-                  "and    r4, r12, r5                \n\t" /* rb = r4 = r5 masked by r12 */
-                  "mul    r11, r11, %[alpha]         \n\t" /* ag = r11 times src_scale */
-                  "mul    r4, r4, %[alpha]           \n\t" /* rb = r4 times src_scale */
-                  "and    r11, r11, r12, lsl #8      \n\t" /* ag masked by reverse mask (r12) */
-                  "and    r4, r12, r4, lsr #8        \n\t" /* rb masked by mask (r12) */
-                  "orr    r5, r11, r4                \n\t" /* r5 = (src1, src_scale) */
-
-                  /* dst1, dst1_scale */
-                  "and    r11, r12, r7, lsr #8       \n\t" /* ag = r11 = r7 masked by r12 lsr by #8 */
-                  "and    r4, r12, r7                \n\t" /* rb = r4 = r7 masked by r12 */
-                  "mul    r11, r11, r9               \n\t" /* ag = r11 times dst_scale (r9) */
-                  "mul    r4, r4, r9                 \n\t" /* rb = r4 times dst_scale (r9) */
-                  "and    r11, r11, r12, lsl #8      \n\t" /* ag masked by reverse mask (r12) */
-                  "and    r4, r12, r4, lsr #8        \n\t" /* rb masked by mask (r12) */
-                  "orr    r9, r11, r4                \n\t" /* r9 = (dst1, dst_scale) */
-
-                  /* ---------------------- */
-                  "add    r9, r5, r9                 \n\t" /* *dst = src plus dst both scaled */
-                  /* ---------------------- */
-
-                  /* ====================== */
-
-                  /* src2, src2_scale */
-                  "and    r11, r12, r6, lsr #8       \n\t" /* ag = r11 = r6 masked by r12 lsr by #8 */
-                  "and    r4, r12, r6                \n\t" /* rb = r4 = r6 masked by r12 */
-                  "mul    r11, r11, %[alpha]         \n\t" /* ag = r11 times src_scale */
-                  "mul    r4, r4, %[alpha]           \n\t" /* rb = r4 times src_scale */
-                  "and    r11, r11, r12, lsl #8      \n\t" /* ag masked by reverse mask (r12) */
-                  "and    r4, r12, r4, lsr #8        \n\t" /* rb masked by mask (r12) */
-                  "orr    r6, r11, r4                \n\t" /* r6 = (src2, src_scale) */
-
-                  /* dst2, dst2_scale */
-                  "and    r11, r12, r8, lsr #8       \n\t" /* ag = r11 = r8 masked by r12 lsr by #8 */
-                  "and    r4, r12, r8                \n\t" /* rb = r4 = r8 masked by r12 */
-                  "mul    r11, r11, r10              \n\t" /* ag = r11 times dst_scale (r10) */
-                  "mul    r4, r4, r10                \n\t" /* rb = r4 times dst_scale (r6) */
-                  "and    r11, r11, r12, lsl #8      \n\t" /* ag masked by reverse mask (r12) */
-                  "and    r4, r12, r4, lsr #8        \n\t" /* rb masked by mask (r12) */
-                  "orr    r10, r11, r4               \n\t" /* r10 = (dst2, dst_scale) */
-
-                  "sub    %[count], %[count], #2     \n\t" /* decrease count by 2 */
-                  /* ---------------------- */
-                  "add    r10, r6, r10               \n\t" /* *dst = src plus dst both scaled */
-                  /* ---------------------- */
-                  "cmp    %[count], #1               \n\t" /* compare count with 1 */
-                  /* ----------------- */
-                  "stm    %[dst]!, {r9, r10}         \n\t" /* copy r9 and r10 to r7 and r8 respectively */
-                  /* ----------------- */
-
-                  "bgt    1b                         \n\t" /* if %[count] greater than 1 reloop */
-                  "blt    3f                         \n\t" /* if %[count] less than 1 exit */
-                                                           /* else get into the single loop */
-                  /* Single Loop */
-                  "2:                                \n\t" /* <single loop> */
-                  "ldr    r5, [%[src]], #4           \n\t" /* loading src pointer into r5: r5=src */
-                  "ldr    r7, [%[dst]]               \n\t" /* loading dst pointer into r7: r7=dst */
-
-                  "lsr    r6, r5, #24                \n\t" /* src >> 24 */
-                  "and    r8, r12, r5, lsr #8        \n\t" /* ag = r8 = r5 masked by r12 lsr by #8 */
-#ifdef SK_ARM_HAS_EDSP
-                  "smulbb r6, r6, %[alpha]           \n\t" /* r6 = SkMulS16 with src_scale */
-#else
-                  "mul    r6, r6, %[alpha]           \n\t" /* r6 = SkMulS16 with src_scale */
-#endif
-                  "and    r9, r12, r5                \n\t" /* rb = r9 = r5 masked by r12 */
-                  "lsr    r6, r6, #8                 \n\t" /* r6 >> 8 */
-                  "mul    r8, r8, %[alpha]           \n\t" /* ag = r8 times scale */
-                  "rsb    r6, r6, #256               \n\t" /* r6 = 255 - r6 + 1 */
-
-                  /* src, src_scale */
-                  "mul    r9, r9, %[alpha]           \n\t" /* rb = r9 times scale */
-                  "and    r8, r8, r12, lsl #8        \n\t" /* ag masked by reverse mask (r12) */
-                  "and    r9, r12, r9, lsr #8        \n\t" /* rb masked by mask (r12) */
-                  "orr    r10, r8, r9                \n\t" /* r10 = (scr, src_scale) */
-
-                  /* dst, dst_scale */
-                  "and    r8, r12, r7, lsr #8        \n\t" /* ag = r8 = r7 masked by r12 lsr by #8 */
-                  "and    r9, r12, r7                \n\t" /* rb = r9 = r7 masked by r12 */
-                  "mul    r8, r8, r6                 \n\t" /* ag = r8 times scale (r6) */
-                  "mul    r9, r9, r6                 \n\t" /* rb = r9 times scale (r6) */
-                  "and    r8, r8, r12, lsl #8        \n\t" /* ag masked by reverse mask (r12) */
-                  "and    r9, r12, r9, lsr #8        \n\t" /* rb masked by mask (r12) */
-                  "orr    r7, r8, r9                 \n\t" /* r7 = (dst, dst_scale) */
-
-                  "add    r10, r7, r10               \n\t" /* *dst = src plus dst both scaled */
-
-                  /* ----------------- */
-                  "str    r10, [%[dst]], #4          \n\t" /* *dst = r10, postincrement dst by one (times 4) */
-                  /* ----------------- */
-
-                  "3:                                \n\t" /* <exit> */
-                  : [dst] "+r" (dst), [src] "+r" (src), [count] "+r" (count), [alpha] "+r" (alpha)
-                  :
-                  : "cc", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12", "memory"
-                  );
-
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-static const SkBlitRow::Proc sk_blitrow_platform_565_procs_arm[] = {
-    // no dither
-    // NOTE: For the functions below, we don't have a special version
-    //       that assumes that each source pixel is opaque. But our S32A is
-    //       still faster than the default, so use it.
-    S32A_D565_Opaque,   // S32_D565_Opaque
-    NULL,               // S32_D565_Blend
-    S32A_D565_Opaque,   // S32A_D565_Opaque
-    NULL,               // S32A_D565_Blend
-
-    // dither
-    NULL,   // S32_D565_Opaque_Dither
-    NULL,   // S32_D565_Blend_Dither
-    NULL,   // S32A_D565_Opaque_Dither
-    NULL,   // S32A_D565_Blend_Dither
+static const SkBlitRow::ColorProc16 sk_blitrow_platform_565_colorprocs_arm[] = {
+    nullptr, nullptr,
 };
 
 static const SkBlitRow::Proc32 sk_blitrow_platform_32_procs_arm[] = {
-    NULL,   // S32_Opaque,
-    NULL,   // S32_Blend,
-    S32A_Opaque_BlitRow32_arm,   // S32A_Opaque,
-    S32A_Blend_BlitRow32_arm     // S32A_Blend
+    nullptr, nullptr, nullptr, nullptr,
 };
 
-#endif // USE_ARM_CODE
-
-SkBlitRow::Proc SkBlitRow::PlatformProcs565(unsigned flags) {
+SkBlitRow::Proc16 SkBlitRow::PlatformFactory565(unsigned flags) {
     return SK_ARM_NEON_WRAP(sk_blitrow_platform_565_procs_arm)[flags];
 }
 
+SkBlitRow::ColorProc16 SkBlitRow::PlatformColorFactory565(unsigned flags) {
+    return SK_ARM_NEON_WRAP(sk_blitrow_platform_565_colorprocs_arm)[flags];
+}
+
 SkBlitRow::Proc32 SkBlitRow::PlatformProcs32(unsigned flags) {
     return SK_ARM_NEON_WRAP(sk_blitrow_platform_32_procs_arm)[flags];
 }
-
-///////////////////////////////////////////////////////////////////////////////
-#define Color32_arm  NULL
-SkBlitRow::ColorProc SkBlitRow::PlatformColorProc() {
-    return SK_ARM_NEON_WRAP(Color32_arm);
-}
-
-SkBlitRow::ColorRectProc PlatformColorRectProcFactory() {
-    return NULL;
-}
diff --git a/gfx/skia/skia/src/opts/SkBlitRow_opts_arm_neon.cpp b/gfx/skia/skia/src/opts/SkBlitRow_opts_arm_neon.cpp
index a8a0535baacf..1f97971ee48a 100644
--- a/gfx/skia/skia/src/opts/SkBlitRow_opts_arm_neon.cpp
+++ b/gfx/skia/skia/src/opts/SkBlitRow_opts_arm_neon.cpp
@@ -246,13 +246,19 @@ void S32A_D565_Opaque_neon(uint16_t* SK_RESTRICT dst,
                       "vaddhn.u16 d6, q14, q8                 \n\t"
                       "vshr.u16   q8, q12, #5                 \n\t"
                       "vaddhn.u16 d5, q13, q9                 \n\t"
-                      "vqadd.u8   d6, d6, d0                  \n\t"  // moved up
                       "vaddhn.u16 d4, q12, q8                 \n\t"
                       // intentionally don't calculate alpha
                       // result in d4-d6
 
+            #ifdef SK_PMCOLOR_IS_RGBA
+                      "vqadd.u8   d6, d6, d0                  \n\t"
                       "vqadd.u8   d5, d5, d1                  \n\t"
                       "vqadd.u8   d4, d4, d2                  \n\t"
+            #else
+                      "vqadd.u8   d6, d6, d2                  \n\t"
+                      "vqadd.u8   d5, d5, d1                  \n\t"
+                      "vqadd.u8   d4, d4, d0                  \n\t"
+            #endif
 
                       // pack 8888 {d4-d6} to 0565 q10
                       "vshll.u8   q10, d6, #8                 \n\t"
@@ -299,7 +305,7 @@ void S32A_D565_Opaque_neon(uint16_t* SK_RESTRICT dst,
 
                       "11:                                        \n\t"
                       // unzips achieve the same as a vld4 operation
-                      "vuzpq.u16  q0, q1                      \n\t"
+                      "vuzp.u16   q0, q1                      \n\t"
                       "vuzp.u8    d0, d1                      \n\t"
                       "vuzp.u8    d2, d3                      \n\t"
                       // expand 0565 q12 to 8888 {d4-d7}
@@ -326,13 +332,19 @@ void S32A_D565_Opaque_neon(uint16_t* SK_RESTRICT dst,
                       "vaddhn.u16 d6, q14, q8                 \n\t"
                       "vshr.u16   q8, q12, #5                 \n\t"
                       "vaddhn.u16 d5, q13, q9                 \n\t"
-                      "vqadd.u8   d6, d6, d0                  \n\t"  // moved up
                       "vaddhn.u16 d4, q12, q8                 \n\t"
                       // intentionally don't calculate alpha
                       // result in d4-d6
 
+            #ifdef SK_PMCOLOR_IS_RGBA
+                      "vqadd.u8   d6, d6, d0                  \n\t"
                       "vqadd.u8   d5, d5, d1                  \n\t"
                       "vqadd.u8   d4, d4, d2                  \n\t"
+            #else
+                      "vqadd.u8   d6, d6, d2                  \n\t"
+                      "vqadd.u8   d5, d5, d1                  \n\t"
+                      "vqadd.u8   d4, d4, d0                  \n\t"
+            #endif
 
                       // pack 8888 {d4-d6} to 0565 q10
                       "vshll.u8   q10, d6, #8                 \n\t"
@@ -423,8 +435,15 @@ void S32A_D565_Opaque_neon(uint16_t* SK_RESTRICT dst,
             "ushr    v5.8h, v22.8h, #5              \t\n"
             "addhn2  v6.16b, v22.8h, v5.8h          \t\n"
             "uqadd   v7.16b, v1.16b, v7.16b         \t\n"
+#if SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
             "uqadd   v20.16b, v2.16b, v20.16b       \t\n"
             "uqadd   v6.16b, v0.16b, v6.16b         \t\n"
+#elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
+            "uqadd   v20.16b, v0.16b, v20.16b       \t\n"
+            "uqadd   v6.16b, v2.16b, v6.16b         \t\n"
+#else
+#error "This function only supports BGRA and RGBA."
+#endif
             "shll    v22.8h, v20.8b, #8             \t\n"
             "shll    v5.8h, v7.8b, #8               \t\n"
             "sri     v22.8h, v5.8h, #5              \t\n"
@@ -458,6 +477,130 @@ void S32A_D565_Opaque_neon(uint16_t* SK_RESTRICT dst,
 }
 #endif // #ifdef SK_CPU_ARM32
 
+static uint32_t pmcolor_to_expand16(SkPMColor c) {
+    unsigned r = SkGetPackedR32(c);
+    unsigned g = SkGetPackedG32(c);
+    unsigned b = SkGetPackedB32(c);
+    return (g << 24) | (r << 13) | (b << 2);
+}
+
+void Color32A_D565_neon(uint16_t dst[], SkPMColor src, int count, int x, int y) {
+    uint32_t src_expand;
+    unsigned scale;
+    uint16x8_t vmask_blue;
+
+    if (count <= 0) return;
+    SkASSERT(((size_t)dst & 0x01) == 0);
+
+    /*
+     * This preamble code is in order to make dst aligned to 8 bytes
+     * in the next mutiple bytes read & write access.
+     */
+    src_expand = pmcolor_to_expand16(src);
+    scale = SkAlpha255To256(0xFF - SkGetPackedA32(src)) >> 3;
+
+#define DST_ALIGN 8
+
+    /*
+     * preamble_size is in byte, meantime, this blend32_16_row_neon updates 2 bytes at a time.
+     */
+    int preamble_size = (DST_ALIGN - (size_t)dst) & (DST_ALIGN - 1);
+
+    for (int i = 0; i < preamble_size; i+=2, dst++) {
+        uint32_t dst_expand = SkExpand_rgb_16(*dst) * scale;
+        *dst = SkCompact_rgb_16((src_expand + dst_expand) >> 5);
+        if (--count == 0)
+            break;
+    }
+
+    int count16 = 0;
+    count16 = count >> 4;
+    vmask_blue = vmovq_n_u16(SK_B16_MASK);
+
+    if (count16) {
+        uint16x8_t wide_sr;
+        uint16x8_t wide_sg;
+        uint16x8_t wide_sb;
+        uint16x8_t wide_256_sa;
+
+        unsigned sr = SkGetPackedR32(src);
+        unsigned sg = SkGetPackedG32(src);
+        unsigned sb = SkGetPackedB32(src);
+        unsigned sa = SkGetPackedA32(src);
+
+        // Operation: dst_rgb = src_rgb + ((256 - src_a) >> 3) x dst_rgb
+        // sr: 8-bit based, dr: 5-bit based, with dr x ((256-sa)>>3), 5-bit left shifted,
+        //thus, for sr, do 2-bit left shift to match MSB : (8 + 2 = 5 + 5)
+        wide_sr = vshlq_n_u16(vmovl_u8(vdup_n_u8(sr)), 2); // widen and src_red shift
+
+        // sg: 8-bit based, dg: 6-bit based, with dg x ((256-sa)>>3), 5-bit left shifted,
+        //thus, for sg, do 3-bit left shift to match MSB : (8 + 3 = 6 + 5)
+        wide_sg = vshlq_n_u16(vmovl_u8(vdup_n_u8(sg)), 3); // widen and src_grn shift
+
+        // sb: 8-bit based, db: 5-bit based, with db x ((256-sa)>>3), 5-bit left shifted,
+        //thus, for sb, do 2-bit left shift to match MSB : (8 + 2 = 5 + 5)
+        wide_sb = vshlq_n_u16(vmovl_u8(vdup_n_u8(sb)), 2); // widen and src blu shift
+
+        wide_256_sa =
+            vshrq_n_u16(vsubw_u8(vdupq_n_u16(256), vdup_n_u8(sa)), 3); // (256 - sa) >> 3
+
+        while (count16-- > 0) {
+            uint16x8_t vdst1, vdst1_r, vdst1_g, vdst1_b;
+            uint16x8_t vdst2, vdst2_r, vdst2_g, vdst2_b;
+            vdst1 = vld1q_u16(dst);
+            dst += 8;
+            vdst2 = vld1q_u16(dst);
+            dst -= 8;    //to store dst again.
+
+            vdst1_g = vshlq_n_u16(vdst1, SK_R16_BITS);                 // shift green to top of lanes
+            vdst1_b = vdst1 & vmask_blue;                              // extract blue
+            vdst1_r = vshrq_n_u16(vdst1, SK_R16_SHIFT);                // extract red
+            vdst1_g = vshrq_n_u16(vdst1_g, SK_R16_BITS + SK_B16_BITS); // extract green
+
+            vdst2_g = vshlq_n_u16(vdst2, SK_R16_BITS);                 // shift green to top of lanes
+            vdst2_b = vdst2 & vmask_blue;                              // extract blue
+            vdst2_r = vshrq_n_u16(vdst2, SK_R16_SHIFT);                // extract red
+            vdst2_g = vshrq_n_u16(vdst2_g, SK_R16_BITS + SK_B16_BITS); // extract green
+
+            vdst1_r = vmlaq_u16(wide_sr, wide_256_sa, vdst1_r);        // sr + (256-sa) x dr1
+            vdst1_g = vmlaq_u16(wide_sg, wide_256_sa, vdst1_g);        // sg + (256-sa) x dg1
+            vdst1_b = vmlaq_u16(wide_sb, wide_256_sa, vdst1_b);        // sb + (256-sa) x db1
+
+            vdst2_r = vmlaq_u16(wide_sr, wide_256_sa, vdst2_r);        // sr + (256-sa) x dr2
+            vdst2_g = vmlaq_u16(wide_sg, wide_256_sa, vdst2_g);        // sg + (256-sa) x dg2
+            vdst2_b = vmlaq_u16(wide_sb, wide_256_sa, vdst2_b);        // sb + (256-sa) x db2
+
+            vdst1_r = vshrq_n_u16(vdst1_r, 5);                         // 5-bit right shift for 5-bit red
+            vdst1_g = vshrq_n_u16(vdst1_g, 5);                         // 5-bit right shift for 6-bit green
+            vdst1_b = vshrq_n_u16(vdst1_b, 5);                         // 5-bit right shift for 5-bit blue
+
+            vdst1 = vsliq_n_u16(vdst1_b, vdst1_g, SK_G16_SHIFT);       // insert green into blue
+            vdst1 = vsliq_n_u16(vdst1, vdst1_r, SK_R16_SHIFT);         // insert red into green/blue
+
+            vdst2_r = vshrq_n_u16(vdst2_r, 5);                         // 5-bit right shift for 5-bit red
+            vdst2_g = vshrq_n_u16(vdst2_g, 5);                         // 5-bit right shift for 6-bit green
+            vdst2_b = vshrq_n_u16(vdst2_b, 5);                         // 5-bit right shift for 5-bit blue
+
+            vdst2 = vsliq_n_u16(vdst2_b, vdst2_g, SK_G16_SHIFT);       // insert green into blue
+            vdst2 = vsliq_n_u16(vdst2, vdst2_r, SK_R16_SHIFT);         // insert red into green/blue
+
+            vst1q_u16(dst, vdst1);
+            dst += 8;
+            vst1q_u16(dst, vdst2);
+            dst += 8;
+        }
+    }
+
+    count &= 0xF;
+    if (count > 0) {
+        do {
+            uint32_t dst_expand = SkExpand_rgb_16(*dst) * scale;
+            *dst = SkCompact_rgb_16((src_expand + dst_expand) >> 5);
+            dst += 1;
+        } while (--count != 0);
+    }
+}
+
 static inline uint16x8_t SkDiv255Round_neon8(uint16x8_t prod) {
     prod += vdupq_n_u16(128);
     prod += vshrq_n_u16(prod, 8);
@@ -492,8 +635,7 @@ void S32A_D565_Blend_neon(uint16_t* SK_RESTRICT dst,
             vdst = vld1q_u16(dst);
 #ifdef SK_CPU_ARM64
             vsrc = sk_vld4_u8_arm64_4(src);
-#else
-#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 6))
+#elif (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 6))
             asm (
                 "vld4.u8 %h[vsrc], [%[src]]!"
                 : [vsrc] "=w" (vsrc), [src] "+&r" (src)
@@ -516,7 +658,6 @@ void S32A_D565_Blend_neon(uint16_t* SK_RESTRICT dst,
             vsrc.val[2] = d2;
             vsrc.val[3] = d3;
 #endif
-#endif // #ifdef SK_CPU_ARM64
 
 
             // deinterleave dst
@@ -573,9 +714,9 @@ void S32A_D565_Blend_neon(uint16_t* SK_RESTRICT dst,
         if (sc) {
             uint16_t dc = *dst;
             unsigned dst_scale = 255 - SkMulDiv255Round(SkGetPackedA32(sc), alpha);
-            unsigned dr = SkMulS16(SkPacked32ToR16(sc), alpha) + SkMulS16(SkGetPackedR16(dc), dst_scale);
-            unsigned dg = SkMulS16(SkPacked32ToG16(sc), alpha) + SkMulS16(SkGetPackedG16(dc), dst_scale);
-            unsigned db = SkMulS16(SkPacked32ToB16(sc), alpha) + SkMulS16(SkGetPackedB16(dc), dst_scale);
+            unsigned dr = (SkPacked32ToR16(sc) * alpha) + (SkGetPackedR16(dc) * dst_scale);
+            unsigned dg = (SkPacked32ToG16(sc) * alpha) + (SkGetPackedG16(dc) * dst_scale);
+            unsigned db = (SkPacked32ToB16(sc) * alpha) + (SkGetPackedB16(dc) * dst_scale);
             *dst = SkPackRGB16(SkDiv255Round(dr), SkDiv255Round(dg), SkDiv255Round(db));
         }
         dst += 1;
@@ -1168,37 +1309,6 @@ void S32A_Blend_BlitRow32_neon(SkPMColor* SK_RESTRICT dst,
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#undef    DEBUG_OPAQUE_DITHER
-
-#if    defined(DEBUG_OPAQUE_DITHER)
-static void showme8(char *str, void *p, int len)
-{
-    static char buf[256];
-    char tbuf[32];
-    int i;
-    char *pc = (char*) p;
-    sprintf(buf,"%8s:", str);
-    for(i=0;i<len;i++) {
-        sprintf(tbuf, "   %02x", pc[i]);
-        strcat(buf, tbuf);
-    }
-    SkDebugf("%s\n", buf);
-}
-static void showme16(char *str, void *p, int len)
-{
-    static char buf[256];
-    char tbuf[32];
-    int i;
-    uint16_t *pc = (uint16_t*) p;
-    sprintf(buf,"%8s:", str);
-    len = (len / sizeof(uint16_t));    /* passed as bytes */
-    for(i=0;i<len;i++) {
-        sprintf(tbuf, " %04x", pc[i]);
-        strcat(buf, tbuf);
-    }
-    SkDebugf("%s\n", buf);
-}
-#endif
 #endif // #ifdef SK_CPU_ARM32
 
 void S32A_D565_Opaque_Dither_neon (uint16_t * SK_RESTRICT dst,
@@ -1210,17 +1320,6 @@ void S32A_D565_Opaque_Dither_neon (uint16_t * SK_RESTRICT dst,
 
     if (count >= UNROLL) {
 
-#if defined(DEBUG_OPAQUE_DITHER)
-    uint16_t tmpbuf[UNROLL];
-    int td[UNROLL];
-    int tdv[UNROLL];
-    int ta[UNROLL];
-    int tap[UNROLL];
-    uint16_t in_dst[UNROLL];
-    int offset = 0;
-    int noisy = 0;
-#endif
-
     uint8x8_t dbase;
     const uint8_t *dstart = &gDitherMatrix_Neon[(y&3)*12 + (x&3)];
     dbase = vld1_u8(dstart);
@@ -1231,52 +1330,6 @@ void S32A_D565_Opaque_Dither_neon (uint16_t * SK_RESTRICT dst,
         uint16x8_t dst8, scale8, alpha8;
         uint16x8_t dst_r, dst_g, dst_b;
 
-#if defined(DEBUG_OPAQUE_DITHER)
-        // calculate 8 elements worth into a temp buffer
-        {
-        int my_y = y;
-        int my_x = x;
-        SkPMColor* my_src = (SkPMColor*)src;
-        uint16_t* my_dst = dst;
-        int i;
-
-        DITHER_565_SCAN(my_y);
-        for(i = 0; i < UNROLL; i++) {
-            SkPMColor c = *my_src++;
-            SkPMColorAssert(c);
-            if (c) {
-                unsigned a = SkGetPackedA32(c);
-
-                int d = SkAlphaMul(DITHER_VALUE(my_x), SkAlpha255To256(a));
-                tdv[i] = DITHER_VALUE(my_x);
-                ta[i] = a;
-                tap[i] = SkAlpha255To256(a);
-                td[i] = d;
-
-                unsigned sr = SkGetPackedR32(c);
-                unsigned sg = SkGetPackedG32(c);
-                unsigned sb = SkGetPackedB32(c);
-                sr = SkDITHER_R32_FOR_565(sr, d);
-                sg = SkDITHER_G32_FOR_565(sg, d);
-                sb = SkDITHER_B32_FOR_565(sb, d);
-
-                uint32_t src_expanded = (sg << 24) | (sr << 13) | (sb << 2);
-                uint32_t dst_expanded = SkExpand_rgb_16(*my_dst);
-                dst_expanded = dst_expanded * (SkAlpha255To256(255 - a) >> 3);
-                // now src and dst expanded are in g:11 r:10 x:1 b:10
-                tmpbuf[i] = SkCompact_rgb_16((src_expanded + dst_expanded) >> 5);
-                td[i] = d;
-            } else {
-                tmpbuf[i] = *my_dst;
-                ta[i] = tdv[i] = td[i] = 0xbeef;
-            }
-            in_dst[i] = *my_dst;
-            my_dst += 1;
-            DITHER_INC_X(my_x);
-        }
-        }
-#endif
-
 #ifdef SK_CPU_ARM64
         vsrc = sk_vld4_u8_arm64_4(src);
 #else
@@ -1346,43 +1399,6 @@ void S32A_D565_Opaque_Dither_neon (uint16_t * SK_RESTRICT dst,
 
         vst1q_u16(dst, dst8);
 
-#if defined(DEBUG_OPAQUE_DITHER)
-        // verify my 8 elements match the temp buffer
-        {
-        int i, bad=0;
-        static int invocation;
-
-        for (i = 0; i < UNROLL; i++) {
-            if (tmpbuf[i] != dst[i]) {
-                bad=1;
-            }
-        }
-        if (bad) {
-            SkDebugf("BAD S32A_D565_Opaque_Dither_neon(); invocation %d offset %d\n",
-                     invocation, offset);
-            SkDebugf("  alpha 0x%x\n", alpha);
-            for (i = 0; i < UNROLL; i++)
-                SkDebugf("%2d: %s %04x w %04x id %04x s %08x d %04x %04x %04x %04x\n",
-                         i, ((tmpbuf[i] != dst[i])?"BAD":"got"), dst[i], tmpbuf[i],
-                         in_dst[i], src[i-8], td[i], tdv[i], tap[i], ta[i]);
-
-            showme16("alpha8", &alpha8, sizeof(alpha8));
-            showme16("scale8", &scale8, sizeof(scale8));
-            showme8("d", &d, sizeof(d));
-            showme16("dst8", &dst8, sizeof(dst8));
-            showme16("dst_b", &dst_b, sizeof(dst_b));
-            showme16("dst_g", &dst_g, sizeof(dst_g));
-            showme16("dst_r", &dst_r, sizeof(dst_r));
-            showme8("sb", &sb, sizeof(sb));
-            showme8("sg", &sg, sizeof(sg));
-            showme8("sr", &sr, sizeof(sr));
-
-            return;
-        }
-        offset += UNROLL;
-        invocation++;
-        }
-#endif
         dst += UNROLL;
         count -= UNROLL;
         // skip x += UNROLL, since it's unchanged mod-4
@@ -1426,8 +1442,6 @@ void S32A_D565_Opaque_Dither_neon (uint16_t * SK_RESTRICT dst,
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#undef    DEBUG_S32_OPAQUE_DITHER
-
 void S32_D565_Opaque_Dither_neon(uint16_t* SK_RESTRICT dst,
                                  const SkPMColor* SK_RESTRICT src,
                                  int count, U8CPU alpha, int x, int y) {
@@ -1494,25 +1508,6 @@ void S32_D565_Opaque_Dither_neon(uint16_t* SK_RESTRICT dst,
         // store it
         vst1q_u16(dst, dst8);
 
-#if    defined(DEBUG_S32_OPAQUE_DITHER)
-        // always good to know if we generated good results
-        {
-        int i, myx = x, myy = y;
-        DITHER_565_SCAN(myy);
-        for (i=0;i<UNROLL;i++) {
-            // the '!' in the asm block above post-incremented src by the 8 pixels it reads.
-            SkPMColor c = src[i-8];
-            unsigned dither = DITHER_VALUE(myx);
-            uint16_t val = SkDitherRGB32To565(c, dither);
-            if (val != dst[i]) {
-            SkDebugf("RBE: src %08x dither %02x, want %04x got %04x dbas[i] %02x\n",
-                c, dither, val, dst[i], dstart[i]);
-            }
-            DITHER_INC_X(myx);
-        }
-        }
-#endif
-
         dst += UNROLL;
         // we don't need to increment src as the asm above has already done it
         count -= UNROLL;
@@ -1536,125 +1531,35 @@ void S32_D565_Opaque_Dither_neon(uint16_t* SK_RESTRICT dst,
     }
 }
 
-void Color32_arm_neon(SkPMColor* dst, const SkPMColor* src, int count,
-                      SkPMColor color) {
-    if (count <= 0) {
-        return;
-    }
-
-    if (0 == color) {
-        if (src != dst) {
-            memcpy(dst, src, count * sizeof(SkPMColor));
-        }
-        return;
-    }
-
-    unsigned colorA = SkGetPackedA32(color);
-    if (255 == colorA) {
-        sk_memset32(dst, color, count);
-        return;
-    }
-
-    unsigned scale = 256 - SkAlpha255To256(colorA);
-
-    if (count >= 8) {
-        uint32x4_t vcolor;
-        uint8x8_t vscale;
-
-        vcolor = vdupq_n_u32(color);
-
-        // scale numerical interval [0-255], so load as 8 bits
-        vscale = vdup_n_u8(scale);
-
-        do {
-            // load src color, 8 pixels, 4 64 bit registers
-            // (and increment src).
-            uint32x2x4_t vsrc;
-#if defined(SK_CPU_ARM32) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 6)))
-            asm (
-                "vld1.32    %h[vsrc], [%[src]]!"
-                : [vsrc] "=w" (vsrc), [src] "+r" (src)
-                : :
-            );
-#else // 64bit targets and Clang
-            vsrc.val[0] = vld1_u32(src);
-            vsrc.val[1] = vld1_u32(src+2);
-            vsrc.val[2] = vld1_u32(src+4);
-            vsrc.val[3] = vld1_u32(src+6);
-            src += 8;
-#endif
-
-            // multiply long by scale, 64 bits at a time,
-            // destination into a 128 bit register.
-            uint16x8x4_t vtmp;
-            vtmp.val[0] = vmull_u8(vreinterpret_u8_u32(vsrc.val[0]), vscale);
-            vtmp.val[1] = vmull_u8(vreinterpret_u8_u32(vsrc.val[1]), vscale);
-            vtmp.val[2] = vmull_u8(vreinterpret_u8_u32(vsrc.val[2]), vscale);
-            vtmp.val[3] = vmull_u8(vreinterpret_u8_u32(vsrc.val[3]), vscale);
-
-            // shift the 128 bit registers, containing the 16
-            // bit scaled values back to 8 bits, narrowing the
-            // results to 64 bit registers.
-            uint8x16x2_t vres;
-            vres.val[0] = vcombine_u8(
-                            vshrn_n_u16(vtmp.val[0], 8),
-                            vshrn_n_u16(vtmp.val[1], 8));
-            vres.val[1] = vcombine_u8(
-                            vshrn_n_u16(vtmp.val[2], 8),
-                            vshrn_n_u16(vtmp.val[3], 8));
-
-            // adding back the color, using 128 bit registers.
-            uint32x4x2_t vdst;
-            vdst.val[0] = vreinterpretq_u32_u8(vres.val[0] +
-                                               vreinterpretq_u8_u32(vcolor));
-            vdst.val[1] = vreinterpretq_u32_u8(vres.val[1] +
-                                               vreinterpretq_u8_u32(vcolor));
-
-            // store back the 8 calculated pixels (2 128 bit
-            // registers), and increment dst.
-#if defined(SK_CPU_ARM32) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 6)))
-            asm (
-                "vst1.32    %h[vdst], [%[dst]]!"
-                : [dst] "+r" (dst)
-                : [vdst] "w" (vdst)
-                : "memory"
-            );
-#else // 64bit targets and Clang
-            vst1q_u32(dst, vdst.val[0]);
-            vst1q_u32(dst+4, vdst.val[1]);
-            dst += 8;
-#endif
-            count -= 8;
-
-        } while (count >= 8);
-    }
-
-    while (count > 0) {
-        *dst = color + SkAlphaMulQ(*src, scale);
-        src += 1;
-        dst += 1;
-        count--;
-    }
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
-const SkBlitRow::Proc sk_blitrow_platform_565_procs_arm_neon[] = {
+const SkBlitRow::Proc16 sk_blitrow_platform_565_procs_arm_neon[] = {
     // no dither
     S32_D565_Opaque_neon,
     S32_D565_Blend_neon,
     S32A_D565_Opaque_neon,
+#if 0
     S32A_D565_Blend_neon,
+#else
+    nullptr,   // https://code.google.com/p/skia/issues/detail?id=2797
+#endif
 
     // dither
     S32_D565_Opaque_Dither_neon,
     S32_D565_Blend_Dither_neon,
     S32A_D565_Opaque_Dither_neon,
-    NULL,   // S32A_D565_Blend_Dither
+    nullptr,   // S32A_D565_Blend_Dither
+};
+
+const SkBlitRow::ColorProc16 sk_blitrow_platform_565_colorprocs_arm_neon[] = {
+    Color32A_D565_neon,    // Color32_D565,
+    Color32A_D565_neon,    // Color32A_D565,
+    Color32A_D565_neon,    // Color32_D565_Dither,
+    Color32A_D565_neon,    // Color32A_D565_Dither
 };
 
 const SkBlitRow::Proc32 sk_blitrow_platform_32_procs_arm_neon[] = {
-    NULL,   // S32_Opaque,
+    nullptr,   // S32_Opaque,
     S32_Blend_BlitRow32_neon,        // S32_Blend,
     /*
      * We have two choices for S32A_Opaque procs. The one reads the src alpha
@@ -1674,6 +1579,6 @@ const SkBlitRow::Proc32 sk_blitrow_platform_32_procs_arm_neon[] = {
 #ifdef SK_CPU_ARM32
     S32A_Blend_BlitRow32_neon        // S32A_Blend
 #else
-    NULL
+    nullptr
 #endif
 };
diff --git a/gfx/skia/skia/src/opts/SkBlitRow_opts_arm_neon.h b/gfx/skia/skia/src/opts/SkBlitRow_opts_arm_neon.h
index 80b875419a97..159a466c988b 100644
--- a/gfx/skia/skia/src/opts/SkBlitRow_opts_arm_neon.h
+++ b/gfx/skia/skia/src/opts/SkBlitRow_opts_arm_neon.h
@@ -9,10 +9,8 @@
 
 #include "SkBlitRow.h"
 
-extern const SkBlitRow::Proc sk_blitrow_platform_565_procs_arm_neon[];
+extern const SkBlitRow::Proc16 sk_blitrow_platform_565_procs_arm_neon[];
+extern const SkBlitRow::ColorProc16 sk_blitrow_platform_565_colorprocs_arm_neon[];
 extern const SkBlitRow::Proc32 sk_blitrow_platform_32_procs_arm_neon[];
 
-extern void Color32_arm_neon(SkPMColor* dst, const SkPMColor* src, int count,
-                             SkPMColor color);
-
 #endif
diff --git a/gfx/skia/skia/src/opts/SkBlitRow_opts_mips_dsp.cpp b/gfx/skia/skia/src/opts/SkBlitRow_opts_mips_dsp.cpp
index 3d4a3a06cd48..e25f7c5f192a 100644
--- a/gfx/skia/skia/src/opts/SkBlitRow_opts_mips_dsp.cpp
+++ b/gfx/skia/skia/src/opts/SkBlitRow_opts_mips_dsp.cpp
@@ -34,7 +34,7 @@ static void S32_D565_Blend_mips_dsp(uint16_t* SK_RESTRICT dst,
             "and             %[t1],    %[s0],    %[s5]     \n\t"
             "shra.ph         %[t0],    %[s0],    5         \n\t"
             "and             %[t2],    %[t0],    %[s6]     \n\t"
-#ifdef SK_MIPS_HAS_DSPR2
+#ifdef __mips_dspr2
             "shrl.ph         %[t3],    %[s0],    11        \n\t"
 #else
             "shra.ph         %[t0],    %[s0],    11        \n\t"
@@ -46,7 +46,7 @@ static void S32_D565_Blend_mips_dsp(uint16_t* SK_RESTRICT dst,
             "ins             %[s2],    %[s1],    16, 16    \n\t"
             "preceu.ph.qbra  %[t0],    %[s2]               \n\t"
             "shrl.qb         %[t6],    %[t0],    3         \n\t"
-#ifdef SK_MIPS_HAS_DSPR2
+#ifdef __mips_dspr2
             "shrl.ph         %[t5],    %[s2],    10        \n\t"
 #else
             "shra.ph         %[t0],    %[s2],    10        \n\t"
@@ -303,7 +303,7 @@ static void S32_D565_Opaque_Dither_mips_dsp(uint16_t* __restrict__ dst,
         "lw              %[t2],    4(%[src])           \n\t"
         "precrq.ph.w     %[t3],    %[t0],    %[t2]     \n\t"
         "preceu.ph.qbra  %[t9],    %[t3]               \n\t"
-#ifdef SK_MIPS_HAS_DSPR2
+#ifdef __mips_dspr2
         "append          %[t0],    %[t2],    16        \n\t"
         "preceu.ph.qbra  %[t4],    %[t0]               \n\t"
         "preceu.ph.qbla  %[t5],    %[t0]               \n\t"
@@ -328,7 +328,7 @@ static void S32_D565_Opaque_Dither_mips_dsp(uint16_t* __restrict__ dst,
         "subu.qb         %[t4],    %[t3],    %[t2]     \n\t"
         "shra.ph         %[t8],    %[t4],    2         \n\t"
         "precrq.ph.w     %[t0],    %[t6],    %[t7]     \n\t"
-#ifdef SK_MIPS_HAS_DSPR2
+#ifdef __mips_dspr2
         "append          %[t6],    %[t7],    16        \n\t"
 #else
         "sll             %[t6],    %[t6],    16        \n\t"
@@ -425,7 +425,7 @@ static void S32_D565_Blend_Dither_mips_dsp(uint16_t* dst,
     "5:                                                    \n\t"
         "sll             %[t3],     %[t0],     7           \n\t"
         "sll             %[t4],     %[t1],     7           \n\t"
-#ifdef SK_MIPS_HAS_DSPR2
+#ifdef __mips_dspr2
         "append          %[t0],     %[t1],     16          \n\t"
 #else
         "sll             %[t0],     %[t0],     8           \n\t"
@@ -442,7 +442,7 @@ static void S32_D565_Blend_Dither_mips_dsp(uint16_t* dst,
         "preceu.ph.qbra  %[t6],     %[t6]                  \n\t"
         "lh              %[t2],     0(%[dst])              \n\t"
         "lh              %[s1],     2(%[dst])              \n\t"
-#ifdef SK_MIPS_HAS_DSPR2
+#ifdef __mips_dspr2
         "append          %[t2],     %[s1],     16          \n\t"
 #else
         "sll             %[s1],     %[s1],     16          \n\t"
@@ -575,7 +575,7 @@ static void S32A_D565_Opaque_mips_dsp(uint16_t* __restrict__ dst,
         "lw             %[t1],    4(%[src])             \n\t"
         "precrq.ph.w    %[t2],    %[t0],    %[t1]       \n\t"
         "preceu.ph.qbra %[t8],    %[t2]                 \n\t"
-#ifdef SK_MIPS_HAS_DSPR2
+#ifdef __mips_dspr2
         "append         %[t0],    %[t1],    16          \n\t"
 #else
         "sll            %[t0],    %[t0],    16          \n\t"
@@ -592,7 +592,7 @@ static void S32A_D565_Opaque_mips_dsp(uint16_t* __restrict__ dst,
         "lh             %[t0],    0(%[dst])             \n\t"
         "lh             %[t1],    2(%[dst])             \n\t"
         "and            %[t1],    %[t1],    0xffff      \n\t"
-#ifdef SK_MIPS_HAS_DSPR2
+#ifdef __mips_dspr2
         "append         %[t0],    %[t1],    16          \n\t"
 #else
         "sll            %[t5],    %[t0],    16          \n\t"
@@ -753,12 +753,9 @@ static void S32A_D565_Blend_mips_dsp(uint16_t* SK_RESTRICT dst,
         if (sc) {
             uint16_t dc = *dst;
             unsigned dst_scale = 255 - SkMulDiv255Round(SkGetPackedA32(sc), alpha);
-            unsigned dr = SkMulS16(SkPacked32ToR16(sc), alpha) +
-                          SkMulS16(SkGetPackedR16(dc), dst_scale);
-            unsigned dg = SkMulS16(SkPacked32ToG16(sc), alpha) +
-                          SkMulS16(SkGetPackedG16(dc), dst_scale);
-            unsigned db = SkMulS16(SkPacked32ToB16(sc), alpha) +
-                          SkMulS16(SkGetPackedB16(dc), dst_scale);
+            unsigned dr = (SkPacked32ToR16(sc) * alpha) + (SkGetPackedR16(dc) * dst_scale);
+            unsigned dg = (SkPacked32ToG16(sc) * alpha) + (SkGetPackedG16(dc) * dst_scale);
+            unsigned db = (SkPacked32ToB16(sc) * alpha) + (SkGetPackedB16(dc) * dst_scale);
             *dst = SkPackRGB16(SkDiv255Round(dr), SkDiv255Round(dg), SkDiv255Round(db));
         }
         dst += 1;
@@ -921,9 +918,9 @@ void blitmask_d565_opaque_mips(int width, int height, uint16_t* device,
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-const SkBlitRow::Proc platform_565_procs_mips_dsp[] = {
+const SkBlitRow::Proc16 platform_565_procs_mips_dsp[] = {
     // no dither
-    NULL,
+    nullptr,
     S32_D565_Blend_mips_dsp,
     S32A_D565_Opaque_mips_dsp,
     S32A_D565_Blend_mips_dsp,
@@ -932,28 +929,24 @@ const SkBlitRow::Proc platform_565_procs_mips_dsp[] = {
     S32_D565_Opaque_Dither_mips_dsp,
     S32_D565_Blend_Dither_mips_dsp,
     S32A_D565_Opaque_Dither_mips_dsp,
-    NULL,
+    nullptr,
 };
 
 static const SkBlitRow::Proc32 platform_32_procs_mips_dsp[] = {
-    NULL,   // S32_Opaque,
+    nullptr,   // S32_Opaque,
     S32_Blend_BlitRow32_mips_dsp,   // S32_Blend,
-    NULL,   // S32A_Opaque,
-    NULL,   // S32A_Blend,
+    nullptr,   // S32A_Opaque,
+    nullptr,   // S32A_Blend,
 };
 
-SkBlitRow::Proc SkBlitRow::PlatformProcs565(unsigned flags) {
+SkBlitRow::Proc16 SkBlitRow::PlatformFactory565(unsigned flags) {
     return platform_565_procs_mips_dsp[flags];
 }
 
+SkBlitRow::ColorProc16 SkBlitRow::PlatformColorFactory565(unsigned flags) {
+    return nullptr;
+}
+
 SkBlitRow::Proc32 SkBlitRow::PlatformProcs32(unsigned flags) {
     return platform_32_procs_mips_dsp[flags];
 }
-
-SkBlitRow::ColorRectProc PlatformColorRectProcFactory() {
-    return NULL;
-}
-
-SkBlitRow::ColorProc SkBlitRow::PlatformColorProc() {
-    return NULL;
-}
diff --git a/gfx/skia/skia/src/opts/SkBlitRow_opts_none.cpp b/gfx/skia/skia/src/opts/SkBlitRow_opts_none.cpp
index 64066f2047d7..a9abe0658020 100644
--- a/gfx/skia/skia/src/opts/SkBlitRow_opts_none.cpp
+++ b/gfx/skia/skia/src/opts/SkBlitRow_opts_none.cpp
@@ -9,18 +9,14 @@
 
 // Platform impl of Platform_procs with no overrides
 
-SkBlitRow::Proc SkBlitRow::PlatformProcs565(unsigned flags) {
-    return NULL;
+SkBlitRow::Proc16 SkBlitRow::PlatformFactory565(unsigned flags) {
+    return nullptr;
+}
+
+SkBlitRow::ColorProc16 SkBlitRow::PlatformColorFactory565(unsigned flags) {
+    return nullptr;
 }
 
 SkBlitRow::Proc32 SkBlitRow::PlatformProcs32(unsigned flags) {
-    return NULL;
-}
-
-SkBlitRow::ColorProc SkBlitRow::PlatformColorProc() {
-    return NULL;
-}
-
-SkBlitRow::ColorRectProc PlatformColorRectProcFactory() {
-    return NULL;
+    return nullptr;
 }
diff --git a/gfx/skia/skia/src/opts/SkBlurImageFilter_opts.h b/gfx/skia/skia/src/opts/SkBlurImageFilter_opts.h
new file mode 100644
index 000000000000..8d22391b5fe1
--- /dev/null
+++ b/gfx/skia/skia/src/opts/SkBlurImageFilter_opts.h
@@ -0,0 +1,318 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkBlurImageFilter_opts_DEFINED
+#define SkBlurImageFilter_opts_DEFINED
+
+#include "SkColorPriv.h"
+#include "SkTypes.h"
+
+namespace SK_OPTS_NS {
+
+enum class BlurDirection { kX, kY };
+
+#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
+#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE41
+// ARGB -> 000A 000R 000G 000B
+static inline __m128i expand(SkPMColor p) {
+    return _mm_cvtepu8_epi32(_mm_cvtsi32_si128(p));
+};
+// Axxx Rxxx Gxxx Bxxx -> ARGB
+static inline SkPMColor repack(__m128i p) {
+    const char _ = ~0;  // Don't care what ends up in these bytes.  This zeros them.
+    p = _mm_shuffle_epi8(p, _mm_set_epi8(_,_,_,_, _,_,_,_, _,_,_,_, 15,11,7,3));
+    return _mm_cvtsi128_si32(p);
+};
+#define mullo_epi32 _mm_mullo_epi32
+
+#else
+// ARGB -> 000A 000R 000G 000B
+static inline __m128i expand(int p) {
+    auto result = _mm_cvtsi32_si128(p);
+    result = _mm_unpacklo_epi8(result, _mm_setzero_si128());
+    result = _mm_unpacklo_epi16(result, _mm_setzero_si128());
+    return result;
+};
+// Axxx Rxxx Gxxx Bxxx -> ARGB
+static inline SkPMColor repack(__m128i p) {
+    p = _mm_srli_epi32(p, 24);  // 000A 000R 000G 000B
+    p = _mm_packs_epi32(p, p);  // xxxx xxxx 0A0R 0G0B
+    p = _mm_packus_epi16(p, p); // xxxx xxxx xxxx ARGB
+    return _mm_cvtsi128_si32(p);
+};
+
+// _mm_mullo_epi32 is not available, so use the standard trick to emulate it.
+static inline __m128i mullo_epi32(__m128i a, __m128i b) {
+    __m128i p02 = _mm_mul_epu32(a, b),
+            p13 = _mm_mul_epu32(_mm_srli_si128(a, 4),
+                                _mm_srli_si128(b, 4));
+    return _mm_unpacklo_epi32(_mm_shuffle_epi32(p02, _MM_SHUFFLE(0,0,2,0)),
+                              _mm_shuffle_epi32(p13, _MM_SHUFFLE(0,0,2,0)));
+};
+#endif
+#define INIT_SCALE const __m128i scale = _mm_set1_epi32((1 << 24) / kernelSize);
+#define INIT_HALF const __m128i half = _mm_set1_epi32(1 << 23);
+#define INIT_SUMS __m128i sum = _mm_setzero_si128();
+#define INCREMENT_SUMS(c) sum = _mm_add_epi32(sum, expand(c))
+#define DECREMENT_SUMS(c) sum = _mm_sub_epi32(sum, expand(c))
+#define STORE_SUMS \
+    auto result = mullo_epi32(sum, scale); \
+    result = _mm_add_epi32(result, half); \
+    *dptr = repack(result);
+#define DOUBLE_ROW_OPTIMIZATION
+
+#elif defined(SK_ARM_HAS_NEON)
+
+// val = (sum * scale * 2 + 0x8000) >> 16
+#define STORE_SUMS_DOUBLE \
+    uint16x8_t resultPixels = vreinterpretq_u16_s16(vqrdmulhq_s16( \
+        vreinterpretq_s16_u16(sum), vreinterpretq_s16_u16(scale))); \
+    if (dstDirection == BlurDirection::kX) { \
+        uint32x2_t px2 = vreinterpret_u32_u8(vmovn_u16(resultPixels)); \
+        vst1_lane_u32(dptr +     0, px2, 0); \
+        vst1_lane_u32(dptr + width, px2, 1); \
+    } else { \
+        vst1_u8((uint8_t*)dptr, vmovn_u16(resultPixels)); \
+    }
+
+#define INCREMENT_SUMS_DOUBLE(p) sum = vaddw_u8(sum, load_2_pixels(p))
+#define DECREMENT_SUMS_DOUBLE(p) sum = vsubw_u8(sum, load_2_pixels(p))
+
+// Fast path for kernel sizes between 2 and 127, working on two rows at a time.
+template<BlurDirection srcDirection, BlurDirection dstDirection>
+int box_blur_double(const SkPMColor** src, int srcStride, const SkIRect& srcBounds, SkPMColor** dst, int kernelSize,
+                     int leftOffset, int rightOffset, int width, int height) {
+    // Load 2 pixels from adjacent rows.
+    auto load_2_pixels = [&](const SkPMColor* s) {
+        if (srcDirection == BlurDirection::kX) {
+            // 10% faster by adding these 2 prefetches
+            SK_PREFETCH(s + 16);
+            SK_PREFETCH(s + 16 + srcStride);
+            auto one = vld1_lane_u32(s +         0, vdup_n_u32(0), 0),
+                 two = vld1_lane_u32(s + srcStride,           one, 1);
+            return vreinterpret_u8_u32(two);
+        } else {
+            return vld1_u8((uint8_t*)s);
+        }
+    };
+    int left = srcBounds.left();
+    int right = srcBounds.right();
+    int top = srcBounds.top();
+    int bottom = srcBounds.bottom();
+    int incrementStart = SkMax32(left - rightOffset - 1, left - right);
+    int incrementEnd = SkMax32(right - rightOffset - 1, 0);
+    int decrementStart = SkMin32(left + leftOffset, width);
+    int decrementEnd = SkMin32(right + leftOffset, width);
+    const int srcStrideX = srcDirection == BlurDirection::kX ? 1 : srcStride;
+    const int dstStrideX = dstDirection == BlurDirection::kX ? 1 : height;
+    const int srcStrideY = srcDirection == BlurDirection::kX ? srcStride : 1;
+    const int dstStrideY = dstDirection == BlurDirection::kX ? width : 1;
+    const uint16x8_t scale = vdupq_n_u16((1 << 15) / kernelSize);
+
+    for (; bottom - top >= 2; top += 2) {
+        uint16x8_t sum = vdupq_n_u16(0);
+        const SkPMColor* lptr = *src;
+        const SkPMColor* rptr = *src;
+        SkPMColor* dptr = *dst;
+        int x;
+        for (x = incrementStart; x < 0; ++x) {
+            INCREMENT_SUMS_DOUBLE(rptr);
+            rptr += srcStrideX;
+        }
+        // Clear to zero when sampling to the left our domain. "sum" is zero here because we
+        // initialized it above, and the preceeding loop has no effect in this case.
+        for (x = 0; x < incrementStart; ++x) {
+            STORE_SUMS_DOUBLE
+            dptr += dstStrideX;
+        }
+        for (; x < decrementStart && x < incrementEnd; ++x) {
+            STORE_SUMS_DOUBLE
+            dptr += dstStrideX;
+            INCREMENT_SUMS_DOUBLE(rptr);
+            rptr += srcStrideX;
+        }
+        for (x = decrementStart; x < incrementEnd; ++x) {
+            STORE_SUMS_DOUBLE
+            dptr += dstStrideX;
+            INCREMENT_SUMS_DOUBLE(rptr);
+            rptr += srcStrideX;
+            DECREMENT_SUMS_DOUBLE(lptr);
+            lptr += srcStrideX;
+        }
+        for (x = incrementEnd; x < decrementStart; ++x) {
+            STORE_SUMS_DOUBLE
+            dptr += dstStrideX;
+        }
+        for (; x < decrementEnd; ++x) {
+            STORE_SUMS_DOUBLE
+            dptr += dstStrideX;
+            DECREMENT_SUMS_DOUBLE(lptr);
+            lptr += srcStrideX;
+        }
+        // Clear to zero when sampling to the right of our domain. "sum" is zero here because we
+        // added on then subtracted off all of the pixels, leaving zero.
+        for (; x < width; ++x) {
+            STORE_SUMS_DOUBLE
+            dptr += dstStrideX;
+        }
+        *src += srcStrideY * 2;
+        *dst += dstStrideY * 2;
+    }
+    return top;
+}
+
+// ARGB -> 0A0R 0G0B
+static inline uint16x4_t expand(SkPMColor p) {
+    return vget_low_u16(vmovl_u8(vreinterpret_u8_u32(vdup_n_u32(p))));
+};
+
+#define INIT_SCALE const uint32x4_t scale = vdupq_n_u32((1 << 24) / kernelSize);
+#define INIT_HALF const uint32x4_t half = vdupq_n_u32(1 << 23);
+#define INIT_SUMS uint32x4_t sum = vdupq_n_u32(0);
+#define INCREMENT_SUMS(c) sum = vaddw_u16(sum, expand(c));
+#define DECREMENT_SUMS(c) sum = vsubw_u16(sum, expand(c));
+
+#define STORE_SUMS \
+    uint32x4_t result = vmlaq_u32(half, sum, scale); \
+    uint16x4_t result16 = vqshrn_n_u32(result, 16); \
+    uint8x8_t result8 = vqshrn_n_u16(vcombine_u16(result16, result16), 8); \
+    vst1_lane_u32(dptr, vreinterpret_u32_u8(result8), 0);
+
+#define DOUBLE_ROW_OPTIMIZATION \
+    if (1 < kernelSize && kernelSize < 128) { \
+        top = box_blur_double<srcDirection, dstDirection>(&src, srcStride, srcBounds, &dst, \
+                                                          kernelSize, leftOffset, rightOffset, \
+                                                          width, height); \
+    }
+
+#else  // Neither NEON nor >=SSE2.
+
+#define INIT_SCALE uint32_t scale = (1 << 24) / kernelSize;
+#define INIT_HALF  uint32_t half = 1 << 23;
+#define INIT_SUMS int sumA = 0, sumR = 0, sumG = 0, sumB = 0;
+#define INCREMENT_SUMS(c) \
+    sumA += SkGetPackedA32(c); \
+    sumR += SkGetPackedR32(c); \
+    sumG += SkGetPackedG32(c); \
+    sumB += SkGetPackedB32(c)
+#define DECREMENT_SUMS(c) \
+    sumA -= SkGetPackedA32(c); \
+    sumR -= SkGetPackedR32(c); \
+    sumG -= SkGetPackedG32(c); \
+    sumB -= SkGetPackedB32(c)
+#define STORE_SUMS \
+    *dptr = SkPackARGB32((sumA * scale + half) >> 24, \
+                         (sumR * scale + half) >> 24, \
+                         (sumG * scale + half) >> 24, \
+                         (sumB * scale + half) >> 24);
+#define DOUBLE_ROW_OPTIMIZATION
+
+#endif
+
+#define PREFETCH_RPTR \
+    if (srcDirection == BlurDirection::kY) { \
+        SK_PREFETCH(rptr); \
+    }
+
+template<BlurDirection srcDirection, BlurDirection dstDirection>
+static void box_blur(const SkPMColor* src, int srcStride, const SkIRect& srcBounds, SkPMColor* dst,
+                     int kernelSize, int leftOffset, int rightOffset, int width, int height) {
+    int left = srcBounds.left();
+    int right = srcBounds.right();
+    int top = srcBounds.top();
+    int bottom = srcBounds.bottom();
+    int incrementStart = SkMax32(left - rightOffset - 1, left - right);
+    int incrementEnd = SkMax32(right - rightOffset - 1, 0);
+    int decrementStart = SkMin32(left + leftOffset, width);
+    int decrementEnd = SkMin32(right + leftOffset, width);
+    int srcStrideX = srcDirection == BlurDirection::kX ? 1 : srcStride;
+    int dstStrideX = dstDirection == BlurDirection::kX ? 1 : height;
+    int srcStrideY = srcDirection == BlurDirection::kX ? srcStride : 1;
+    int dstStrideY = dstDirection == BlurDirection::kX ? width : 1;
+    INIT_SCALE
+    INIT_HALF
+
+    // Clear to zero when sampling above our domain.
+    for (int y = 0; y < top; y++) {
+        SkColor* dptr = dst;
+        for (int x = 0; x < width; ++x) {
+            *dptr = 0;
+            dptr += dstStrideX;
+        }
+        dst += dstStrideY;
+    }
+
+    DOUBLE_ROW_OPTIMIZATION
+
+    for (int y = top; y < bottom; ++y) {
+        INIT_SUMS
+        const SkPMColor* lptr = src;
+        const SkPMColor* rptr = src;
+        SkColor* dptr = dst;
+        int x;
+        for (x = incrementStart; x < 0; ++x) {
+            INCREMENT_SUMS(*rptr);
+            rptr += srcStrideX;
+            PREFETCH_RPTR
+        }
+        // Clear to zero when sampling to the left of our domain.
+        for (x = 0; x < incrementStart; ++x) {
+            *dptr = 0;
+            dptr += dstStrideX;
+        }
+        for (; x < decrementStart && x < incrementEnd; ++x) {
+            STORE_SUMS
+            dptr += dstStrideX;
+            INCREMENT_SUMS(*rptr);
+            rptr += srcStrideX;
+            PREFETCH_RPTR
+        }
+        for (x = decrementStart; x < incrementEnd; ++x) {
+            STORE_SUMS
+            dptr += dstStrideX;
+            INCREMENT_SUMS(*rptr);
+            rptr += srcStrideX;
+            PREFETCH_RPTR
+            DECREMENT_SUMS(*lptr);
+            lptr += srcStrideX;
+        }
+        for (x = incrementEnd; x < decrementStart; ++x) {
+            STORE_SUMS
+            dptr += dstStrideX;
+        }
+        for (; x < decrementEnd; ++x) {
+            STORE_SUMS
+            dptr += dstStrideX;
+            DECREMENT_SUMS(*lptr);
+            lptr += srcStrideX;
+        }
+        // Clear to zero when sampling to the right of our domain.
+        for (; x < width; ++x) {
+            *dptr = 0;
+            dptr += dstStrideX;
+        }
+        src += srcStrideY;
+        dst += dstStrideY;
+    }
+    // Clear to zero when sampling below our domain.
+    for (int y = bottom; y < height; ++y) {
+        SkColor* dptr = dst;
+        for (int x = 0; x < width; ++x) {
+            *dptr = 0;
+            dptr += dstStrideX;
+        }
+        dst += dstStrideY;
+    }
+}
+
+static auto box_blur_xx = &box_blur<BlurDirection::kX, BlurDirection::kX>,
+            box_blur_xy = &box_blur<BlurDirection::kX, BlurDirection::kY>,
+            box_blur_yx = &box_blur<BlurDirection::kY, BlurDirection::kX>;
+
+}  // namespace SK_OPTS_NS
+
+#endif
diff --git a/gfx/skia/skia/src/opts/SkBlurImage_opts.h b/gfx/skia/skia/src/opts/SkBlurImage_opts.h
deleted file mode 100644
index d4006f7e88cd..000000000000
--- a/gfx/skia/skia/src/opts/SkBlurImage_opts.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2013 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkBlurImage_opts_DEFINED
-#define SkBlurImage_opts_DEFINED
-
-#include "SkColorPriv.h"
-
-typedef void (*SkBoxBlurProc)(const SkPMColor* src, int srcStride, SkPMColor* dst, int kernelSize,
-                              int leftOffset, int rightOffset, int width, int height);
-
-bool SkBoxBlurGetPlatformProcs(SkBoxBlurProc* boxBlurX,
-                               SkBoxBlurProc* boxBlurY,
-                               SkBoxBlurProc* boxBlurXY,
-                               SkBoxBlurProc* boxBlurYX);
-#endif
diff --git a/gfx/skia/skia/src/opts/SkBlurImage_opts_SSE2.cpp b/gfx/skia/skia/src/opts/SkBlurImage_opts_SSE2.cpp
deleted file mode 100644
index d2f8882726c2..000000000000
--- a/gfx/skia/skia/src/opts/SkBlurImage_opts_SSE2.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright 2013 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <emmintrin.h>
-#include "SkBitmap.h"
-#include "SkBlurImage_opts_SSE2.h"
-#include "SkColorPriv.h"
-#include "SkRect.h"
-
-namespace {
-enum BlurDirection {
-    kX, kY
-};
-
-/* Helper function to spread the components of a 32-bit integer into the
- * lower 8 bits of each 32-bit element of an SSE register.
- */
-inline __m128i expand(int a) {
-    const __m128i zero = _mm_setzero_si128();
-
-    // 0 0 0 0   0 0 0 0   0 0 0 0   A R G B
-    __m128i result = _mm_cvtsi32_si128(a);
-
-    // 0 0 0 0   0 0 0 0   0 A 0 R   0 G 0 B
-    result = _mm_unpacklo_epi8(result, zero);
-
-    // 0 0 0 A   0 0 0 R   0 0 0 G   0 0 0 B
-    return _mm_unpacklo_epi16(result, zero);
-}
-
-template<BlurDirection srcDirection, BlurDirection dstDirection>
-void SkBoxBlur_SSE2(const SkPMColor* src, int srcStride, SkPMColor* dst, int kernelSize,
-                    int leftOffset, int rightOffset, int width, int height)
-{
-    const int rightBorder = SkMin32(rightOffset + 1, width);
-    const int srcStrideX = srcDirection == kX ? 1 : srcStride;
-    const int dstStrideX = dstDirection == kX ? 1 : height;
-    const int srcStrideY = srcDirection == kX ? srcStride : 1;
-    const int dstStrideY = dstDirection == kX ? width : 1;
-    const __m128i scale = _mm_set1_epi32((1 << 24) / kernelSize);
-    const __m128i half = _mm_set1_epi32(1 << 23);
-    const __m128i zero = _mm_setzero_si128();
-    for (int y = 0; y < height; ++y) {
-        __m128i sum = zero;
-        const SkPMColor* p = src;
-        for (int i = 0; i < rightBorder; ++i) {
-            sum = _mm_add_epi32(sum, expand(*p));
-            p += srcStrideX;
-        }
-
-        const SkPMColor* sptr = src;
-        SkColor* dptr = dst;
-        for (int x = 0; x < width; ++x) {
-            // SSE2 has no PMULLUD, so we must do AG and RB separately.
-            __m128i tmp1 = _mm_mul_epu32(sum, scale);
-            __m128i tmp2 = _mm_mul_epu32(_mm_srli_si128(sum, 4),
-                                         _mm_srli_si128(scale, 4));
-            __m128i result = _mm_unpacklo_epi32(_mm_shuffle_epi32(tmp1, _MM_SHUFFLE(0,0,2,0)),
-                                                _mm_shuffle_epi32(tmp2, _MM_SHUFFLE(0,0,2,0)));
-
-            // sumA*scale+.5 sumB*scale+.5 sumG*scale+.5 sumB*scale+.5
-            result = _mm_add_epi32(result, half);
-
-            // 0 0 0 A   0 0 0 R   0 0 0 G   0 0 0 B
-            result = _mm_srli_epi32(result, 24);
-
-            // 0 0 0 0   0 0 0 0   0 A 0 R   0 G 0 B
-            result = _mm_packs_epi32(result, zero);
-
-            // 0 0 0 0   0 0 0 0   0 0 0 0   A R G B
-            result = _mm_packus_epi16(result, zero);
-            *dptr = _mm_cvtsi128_si32(result);
-            if (x >= leftOffset) {
-                SkColor l = *(sptr - leftOffset * srcStrideX);
-                sum = _mm_sub_epi32(sum, expand(l));
-            }
-            if (x + rightOffset + 1 < width) {
-                SkColor r = *(sptr + (rightOffset + 1) * srcStrideX);
-                sum = _mm_add_epi32(sum, expand(r));
-            }
-            sptr += srcStrideX;
-            if (srcDirection == kY) {
-                _mm_prefetch(reinterpret_cast<const char*>(sptr + (rightOffset + 1) * srcStrideX),
-                             _MM_HINT_T0);
-            }
-            dptr += dstStrideX;
-        }
-        src += srcStrideY;
-        dst += dstStrideY;
-    }
-}
-
-} // namespace
-
-bool SkBoxBlurGetPlatformProcs_SSE2(SkBoxBlurProc* boxBlurX,
-                                    SkBoxBlurProc* boxBlurY,
-                                    SkBoxBlurProc* boxBlurXY,
-                                    SkBoxBlurProc* boxBlurYX) {
-    *boxBlurX = SkBoxBlur_SSE2<kX, kX>;
-    *boxBlurY = SkBoxBlur_SSE2<kY, kY>;
-    *boxBlurXY = SkBoxBlur_SSE2<kX, kY>;
-    *boxBlurYX = SkBoxBlur_SSE2<kY, kX>;
-    return true;
-}
diff --git a/gfx/skia/skia/src/opts/SkBlurImage_opts_SSE2.h b/gfx/skia/skia/src/opts/SkBlurImage_opts_SSE2.h
deleted file mode 100644
index db104bacf4fd..000000000000
--- a/gfx/skia/skia/src/opts/SkBlurImage_opts_SSE2.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2013 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkBlurImage_opts_SSE2_DEFINED
-#define SkBlurImage_opts_SSE2_DEFINED
-
-#include "SkBlurImage_opts.h"
-
-bool SkBoxBlurGetPlatformProcs_SSE2(SkBoxBlurProc* boxBlurX,
-                                    SkBoxBlurProc* boxBlurY,
-                                    SkBoxBlurProc* boxBlurXY,
-                                    SkBoxBlurProc* boxBlurYX);
-
-#endif
diff --git a/gfx/skia/skia/src/opts/SkBlurImage_opts_SSE4.cpp b/gfx/skia/skia/src/opts/SkBlurImage_opts_SSE4.cpp
deleted file mode 100644
index 81748af7b2ec..000000000000
--- a/gfx/skia/skia/src/opts/SkBlurImage_opts_SSE4.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright 2014 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkBitmap.h"
-#include "SkBlurImage_opts_SSE4.h"
-#include "SkColorPriv.h"
-#include "SkRect.h"
-
-/* With the exception of the compilers that don't support it, we always build the
- * SSE4 functions and enable the caller to determine SSE4 support.  However for
- * compilers that do not support SSE4x we provide a stub implementation.
- */
-#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE41
-
-#include <smmintrin.h>
-
-namespace {
-enum BlurDirection {
-    kX, kY
-};
-
-/* Helper function to spread the components of a 32-bit integer into the
- * lower 8 bits of each 32-bit element of an SSE register.
- */
-inline __m128i expand(int a) {
-    const __m128i zero = _mm_setzero_si128();
-
-    // 0 0 0 0   0 0 0 0   0 0 0 0   A R G B
-    __m128i result = _mm_cvtsi32_si128(a);
-
-    // 0 0 0 0   0 0 0 0   0 A 0 R   0 G 0 B
-    result = _mm_unpacklo_epi8(result, zero);
-
-    // 0 0 0 A   0 0 0 R   0 0 0 G   0 0 0 B
-    return _mm_unpacklo_epi16(result, zero);
-}
-
-template<BlurDirection srcDirection, BlurDirection dstDirection>
-void SkBoxBlur_SSE4(const SkPMColor* src, int srcStride, SkPMColor* dst, int kernelSize,
-                    int leftOffset, int rightOffset, int width, int height)
-{
-    const int rightBorder = SkMin32(rightOffset + 1, width);
-    const int srcStrideX = srcDirection == kX ? 1 : srcStride;
-    const int dstStrideX = dstDirection == kX ? 1 : height;
-    const int srcStrideY = srcDirection == kX ? srcStride : 1;
-    const int dstStrideY = dstDirection == kX ? width : 1;
-    const __m128i scale = _mm_set1_epi32((1 << 24) / kernelSize);
-    const __m128i half = _mm_set1_epi32(1 << 23);
-    const __m128i zero = _mm_setzero_si128();
-    for (int y = 0; y < height; ++y) {
-        __m128i sum = zero;
-        const SkPMColor* p = src;
-        for (int i = 0; i < rightBorder; ++i) {
-            sum = _mm_add_epi32(sum, expand(*p));
-            p += srcStrideX;
-        }
-
-        const SkPMColor* sptr = src;
-        SkColor* dptr = dst;
-        for (int x = 0; x < width; ++x) {
-            __m128i result = _mm_mullo_epi32(sum, scale);
-
-            // sumA*scale+.5 sumB*scale+.5 sumG*scale+.5 sumB*scale+.5
-            result = _mm_add_epi32(result, half);
-
-            // 0 0 0 A   0 0 0 R   0 0 0 G   0 0 0 B
-            result = _mm_srli_epi32(result, 24);
-
-            // 0 0 0 0   0 0 0 0   0 A 0 R   0 G 0 B
-            result = _mm_packs_epi32(result, zero);
-
-            // 0 0 0 0   0 0 0 0   0 0 0 0   A R G B
-            result = _mm_packus_epi16(result, zero);
-            *dptr = _mm_cvtsi128_si32(result);
-            if (x >= leftOffset) {
-                SkColor l = *(sptr - leftOffset * srcStrideX);
-                sum = _mm_sub_epi32(sum, expand(l));
-            }
-            if (x + rightOffset + 1 < width) {
-                SkColor r = *(sptr + (rightOffset + 1) * srcStrideX);
-                sum = _mm_add_epi32(sum, expand(r));
-            }
-            sptr += srcStrideX;
-            if (srcDirection == kY) {
-                _mm_prefetch(reinterpret_cast<const char*>(sptr + (rightOffset + 1) * srcStrideX),
-                             _MM_HINT_T0);
-            }
-            dptr += dstStrideX;
-        }
-        src += srcStrideY;
-        dst += dstStrideY;
-    }
-}
-
-} // namespace
-
-bool SkBoxBlurGetPlatformProcs_SSE4(SkBoxBlurProc* boxBlurX,
-                                    SkBoxBlurProc* boxBlurY,
-                                    SkBoxBlurProc* boxBlurXY,
-                                    SkBoxBlurProc* boxBlurYX) {
-    *boxBlurX = SkBoxBlur_SSE4<kX, kX>;
-    *boxBlurY = SkBoxBlur_SSE4<kY, kY>;
-    *boxBlurXY = SkBoxBlur_SSE4<kX, kY>;
-    *boxBlurYX = SkBoxBlur_SSE4<kY, kX>;
-    return true;
-}
-
-#else // SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE41
-
-bool SkBoxBlurGetPlatformProcs_SSE4(SkBoxBlurProc* boxBlurX,
-                                    SkBoxBlurProc* boxBlurY,
-                                    SkBoxBlurProc* boxBlurXY,
-                                    SkBoxBlurProc* boxBlurYX) {
-    sk_throw();
-    return false;
-}
-
-
-#endif
diff --git a/gfx/skia/skia/src/opts/SkBlurImage_opts_SSE4.h b/gfx/skia/skia/src/opts/SkBlurImage_opts_SSE4.h
deleted file mode 100644
index 9f346a97928d..000000000000
--- a/gfx/skia/skia/src/opts/SkBlurImage_opts_SSE4.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2014 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkBlurImage_opts_SSE4_DEFINED
-#define SkBlurImage_opts_SSE4_DEFINED
-
-#include "SkBlurImage_opts.h"
-
-bool SkBoxBlurGetPlatformProcs_SSE4(SkBoxBlurProc* boxBlurX,
-                                    SkBoxBlurProc* boxBlurY,
-                                    SkBoxBlurProc* boxBlurXY,
-                                    SkBoxBlurProc* boxBlurYX);
-
-#endif
diff --git a/gfx/skia/skia/src/opts/SkBlurImage_opts_arm.cpp b/gfx/skia/skia/src/opts/SkBlurImage_opts_arm.cpp
deleted file mode 100644
index 10d595afa591..000000000000
--- a/gfx/skia/skia/src/opts/SkBlurImage_opts_arm.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2014 ARM Ltd.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkBlurImage_opts_neon.h"
-#include "SkUtilsArm.h"
-
-bool SkBoxBlurGetPlatformProcs(SkBoxBlurProc* boxBlurX,
-                               SkBoxBlurProc* boxBlurY,
-                               SkBoxBlurProc* boxBlurXY,
-                               SkBoxBlurProc* boxBlurYX) {
-#if SK_ARM_NEON_IS_NONE
-    return false;
-#else
-#if SK_ARM_NEON_IS_DYNAMIC
-    if (!sk_cpu_arm_has_neon()) {
-        return false;
-    }
-#endif
-    return SkBoxBlurGetPlatformProcs_NEON(boxBlurX, boxBlurY, boxBlurXY, boxBlurYX);
-#endif
-}
diff --git a/gfx/skia/skia/src/opts/SkBlurImage_opts_neon.cpp b/gfx/skia/skia/src/opts/SkBlurImage_opts_neon.cpp
deleted file mode 100644
index 08187f3e55e2..000000000000
--- a/gfx/skia/skia/src/opts/SkBlurImage_opts_neon.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright 2013 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#include "SkBitmap.h"
-#include "SkColorPriv.h"
-#include "SkBlurImage_opts.h"
-#include "SkRect.h"
-
-#include <arm_neon.h>
-
-namespace {
-
-enum BlurDirection {
-    kX, kY
-};
-
-/**
- * Helper function to load 2 pixels from diffent rows to a 8x8 NEON register
- * and also pre-load pixels for future read
- */
-template<BlurDirection srcDirection>
-inline uint8x8_t load_2_pixels(const SkPMColor* src, int srcStride) {
-    if (srcDirection == kX) {
-        uint32x2_t temp = vdup_n_u32(0);
-        // 10% faster by adding these 2 prefetches
-        SK_PREFETCH(src + 16);
-        SK_PREFETCH(src + srcStride + 16);
-        return vreinterpret_u8_u32(vld1_lane_u32(src + srcStride, vld1_lane_u32(src, temp, 0), 1));
-     } else {
-         return vld1_u8((uint8_t*)src);
-     }
-}
-
-/**
- * Helper function to store the low 8-bits from a 16x8 NEON register to 2 rows
- */
-template<BlurDirection dstDirection>
-inline void store_2_pixels(uint16x8_t result16x8, SkPMColor* dst, int dstStride) {
-    if (dstDirection == kX) {
-        uint32x2_t temp = vreinterpret_u32_u8(vmovn_u16(result16x8));
-        vst1_lane_u32(dst, temp, 0);
-        vst1_lane_u32(dst + dstStride, temp, 1);
-    } else {
-        uint8x8_t temp = vmovn_u16(result16x8);
-        vst1_u8((uint8_t*)dst, temp);
-    }
-}
-
-/**
- * fast path for kernel size less than 128
- */
-template<BlurDirection srcDirection, BlurDirection dstDirection>
-void SkDoubleRowBoxBlur_NEON(const SkPMColor** src, int srcStride, SkPMColor** dst, int kernelSize,
-                        int leftOffset, int rightOffset, int width, int* height)
-{
-    const int rightBorder = SkMin32(rightOffset + 1, width);
-    const int srcStrideX = srcDirection == kX ? 1 : srcStride;
-    const int dstStrideX = dstDirection == kX ? 1 : *height;
-    const int srcStrideY = srcDirection == kX ? srcStride : 1;
-    const int dstStrideY = dstDirection == kX ? width : 1;
-    const uint16x8_t scale = vdupq_n_u16((1 << 15) / kernelSize);
-
-    for (; *height >= 2; *height -= 2) {
-        uint16x8_t sum = vdupq_n_u16(0);
-        const SkPMColor* p = *src;
-        for (int i = 0; i < rightBorder; i++) {
-            sum = vaddw_u8(sum,
-                load_2_pixels<srcDirection>(p, srcStride));
-            p += srcStrideX;
-        }
-
-        const SkPMColor* sptr = *src;
-        SkPMColor* dptr = *dst;
-        for (int x = 0; x < width; x++) {
-            // val = (sum * scale * 2 + 0x8000) >> 16
-            uint16x8_t resultPixels = vreinterpretq_u16_s16(vqrdmulhq_s16(
-                vreinterpretq_s16_u16(sum), vreinterpretq_s16_u16(scale)));
-            store_2_pixels<dstDirection>(resultPixels, dptr, width);
-
-            if (x >= leftOffset) {
-                sum = vsubw_u8(sum,
-                    load_2_pixels<srcDirection>(sptr - leftOffset * srcStrideX, srcStride));
-            }
-            if (x + rightOffset + 1 < width) {
-                sum = vaddw_u8(sum,
-                    load_2_pixels<srcDirection>(sptr + (rightOffset + 1) * srcStrideX, srcStride));
-            }
-            sptr += srcStrideX;
-            dptr += dstStrideX;
-        }
-        *src += srcStrideY * 2;
-        *dst += dstStrideY * 2;
-    }
-}
-
-
-/**
- * Helper function to spread the components of a 32-bit integer into the
- * lower 8 bits of each 16-bit element of a NEON register.
- */
-
-static inline uint16x4_t expand(uint32_t a) {
-    // ( ARGB ) -> ( ARGB ARGB ) -> ( A R G B A R G B )
-    uint8x8_t v8 = vreinterpret_u8_u32(vdup_n_u32(a));
-    // ( A R G B A R G B ) -> ( 0A 0R 0G 0B 0A 0R 0G 0B ) -> ( 0A 0R 0G 0B )
-    return vget_low_u16(vmovl_u8(v8));
-}
-
-template<BlurDirection srcDirection, BlurDirection dstDirection>
-void SkBoxBlur_NEON(const SkPMColor* src, int srcStride, SkPMColor* dst, int kernelSize,
-                    int leftOffset, int rightOffset, int width, int height)
-{
-    const int rightBorder = SkMin32(rightOffset + 1, width);
-    const int srcStrideX = srcDirection == kX ? 1 : srcStride;
-    const int dstStrideX = dstDirection == kX ? 1 : height;
-    const int srcStrideY = srcDirection == kX ? srcStride : 1;
-    const int dstStrideY = dstDirection == kX ? width : 1;
-    const uint32x4_t scale = vdupq_n_u32((1 << 24) / kernelSize);
-    const uint32x4_t half = vdupq_n_u32(1 << 23);
-
-    if (kernelSize < 128)
-    {
-        SkDoubleRowBoxBlur_NEON<srcDirection, dstDirection>(&src, srcStride, &dst, kernelSize,
-            leftOffset, rightOffset, width, &height);
-    }
-
-    for (; height > 0; height--) {
-        uint32x4_t sum = vdupq_n_u32(0);
-        const SkPMColor* p = src;
-        for (int i = 0; i < rightBorder; ++i) {
-            sum = vaddw_u16(sum, expand(*p));
-            p += srcStrideX;
-        }
-
-        const SkPMColor* sptr = src;
-        SkPMColor* dptr = dst;
-        for (int x = 0; x < width; ++x) {
-            // ( half+sumA*scale half+sumR*scale half+sumG*scale half+sumB*scale )
-            uint32x4_t result = vmlaq_u32(half, sum, scale);
-
-            // Saturated conversion to 16-bit.
-            // ( AAAA RRRR GGGG BBBB ) -> ( 0A 0R 0G 0B )
-            uint16x4_t result16 = vqshrn_n_u32(result, 16);
-
-            // Saturated conversion to 8-bit.
-            // ( 0A 0R 0G 0B ) -> ( 0A 0R 0G 0B 0A 0R 0G 0B ) -> ( A R G B A R G B )
-            uint8x8_t result8 = vqshrn_n_u16(vcombine_u16(result16, result16), 8);
-
-            // ( A R G B A R G B ) -> ( ARGB ARGB ) -> ( ARGB )
-            // Store low 32 bits to destination.
-            vst1_lane_u32(dptr, vreinterpret_u32_u8(result8), 0);
-
-            if (x >= leftOffset) {
-                const SkPMColor* l = sptr - leftOffset * srcStrideX;
-                sum = vsubw_u16(sum, expand(*l));
-            }
-            if (x + rightOffset + 1 < width) {
-                const SkPMColor* r = sptr + (rightOffset + 1) * srcStrideX;
-                sum = vaddw_u16(sum, expand(*r));
-            }
-            sptr += srcStrideX;
-            if (srcDirection == kX) {
-                SK_PREFETCH(sptr + (rightOffset + 16) * srcStrideX);
-            }
-            dptr += dstStrideX;
-        }
-        src += srcStrideY;
-        dst += dstStrideY;
-    }
-}
-
-} // namespace
-
-bool SkBoxBlurGetPlatformProcs_NEON(SkBoxBlurProc* boxBlurX,
-                                    SkBoxBlurProc* boxBlurY,
-                                    SkBoxBlurProc* boxBlurXY,
-                                    SkBoxBlurProc* boxBlurYX) {
-    *boxBlurX = SkBoxBlur_NEON<kX, kX>;
-    *boxBlurY = SkBoxBlur_NEON<kY, kY>;
-    *boxBlurXY = SkBoxBlur_NEON<kX, kY>;
-    *boxBlurYX = SkBoxBlur_NEON<kY, kX>;
-    return true;
-}
diff --git a/gfx/skia/skia/src/opts/SkBlurImage_opts_neon.h b/gfx/skia/skia/src/opts/SkBlurImage_opts_neon.h
deleted file mode 100644
index 7fbe9633e63d..000000000000
--- a/gfx/skia/skia/src/opts/SkBlurImage_opts_neon.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2013 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkBlurImage_opts.h"
-
-bool SkBoxBlurGetPlatformProcs_NEON(SkBoxBlurProc* boxBlurX,
-                                    SkBoxBlurProc* boxBlurY,
-                                    SkBoxBlurProc* boxBlurXY,
-                                    SkBoxBlurProc* boxBlurYX);
diff --git a/gfx/skia/skia/src/opts/SkBlurImage_opts_none.cpp b/gfx/skia/skia/src/opts/SkBlurImage_opts_none.cpp
deleted file mode 100644
index 6de6419f3687..000000000000
--- a/gfx/skia/skia/src/opts/SkBlurImage_opts_none.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2013 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkBlurImage_opts.h"
-
-bool SkBoxBlurGetPlatformProcs(SkBoxBlurProc* boxBlurX,
-                               SkBoxBlurProc* boxBlurY,
-                               SkBoxBlurProc* boxBlurXY,
-                               SkBoxBlurProc* boxBlurYX) {
-    return false;
-}
diff --git a/gfx/skia/skia/src/opts/SkColorCubeFilter_opts.h b/gfx/skia/skia/src/opts/SkColorCubeFilter_opts.h
new file mode 100644
index 000000000000..4c394051bbae
--- /dev/null
+++ b/gfx/skia/skia/src/opts/SkColorCubeFilter_opts.h
@@ -0,0 +1,84 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef SkColorCubeFilter_opts_DEFINED
+#define SkColorCubeFilter_opts_DEFINED
+
+#include "SkColor.h"
+#include "SkNx.h"
+#include "SkUnPreMultiply.h"
+
+namespace SK_OPTS_NS {
+
+void color_cube_filter_span(const SkPMColor src[],
+                            int count,
+                            SkPMColor dst[],
+                            const int* colorToIndex[2],
+                            const SkScalar* colorToFactors[2],
+                            int dim,
+                            const SkColor* colorCube) {
+    uint8_t r, g, b, a;
+
+    for (int i = 0; i < count; ++i) {
+        const SkPMColor input = src[i];
+        a = input >> SK_A32_SHIFT;
+
+        if (a != 255) {
+            const SkColor source = SkUnPreMultiply::PMColorToColor(input);
+            r = SkColorGetR(source);
+            g = SkColorGetG(source);
+            b = SkColorGetB(source);
+        } else {
+            r = SkGetPackedR32(input);
+            g = SkGetPackedG32(input);
+            b = SkGetPackedB32(input);
+        }
+
+        const SkScalar g0 = colorToFactors[0][g],
+                       g1 = colorToFactors[1][g],
+                       b0 = colorToFactors[0][b],
+                       b1 = colorToFactors[1][b];
+
+        const Sk4f g0b0(g0*b0),
+                   g0b1(g0*b1),
+                   g1b0(g1*b0),
+                   g1b1(g1*b1);
+
+        const int i00 = (colorToIndex[0][g] + colorToIndex[0][b] * dim) * dim;
+        const int i01 = (colorToIndex[0][g] + colorToIndex[1][b] * dim) * dim;
+        const int i10 = (colorToIndex[1][g] + colorToIndex[0][b] * dim) * dim;
+        const int i11 = (colorToIndex[1][g] + colorToIndex[1][b] * dim) * dim;
+
+        Sk4f color(0.5f);  // Starting from 0.5f gets us rounding for free.
+        for (int x = 0; x < 2; ++x) {
+            const int ix = colorToIndex[x][r];
+
+            const SkColor lutColor00 = colorCube[ix + i00];
+            const SkColor lutColor01 = colorCube[ix + i01];
+            const SkColor lutColor10 = colorCube[ix + i10];
+            const SkColor lutColor11 = colorCube[ix + i11];
+
+            Sk4f  sum = Sk4f::FromBytes((const uint8_t*)&lutColor00) * g0b0;
+            sum = sum + Sk4f::FromBytes((const uint8_t*)&lutColor01) * g0b1;
+            sum = sum + Sk4f::FromBytes((const uint8_t*)&lutColor10) * g1b0;
+            sum = sum + Sk4f::FromBytes((const uint8_t*)&lutColor11) * g1b1;
+            color = color + sum * Sk4f((float)colorToFactors[x][r]);
+        }
+        if (a != 255) {
+            color = color * Sk4f(a * (1.0f/255));
+        }
+
+        // color is BGRA (SkColor order), dst is SkPMColor order, so may need to swap R+B.
+    #if defined(SK_PMCOLOR_IS_RGBA)
+        color = SkNx_shuffle<2,1,0,3>(color);
+    #endif
+        uint8_t* dstBytes = (uint8_t*)(dst+i);
+        color.toBytes(dstBytes);
+        dstBytes[SK_A32_SHIFT/8] = a;
+    }
+}
+
+}  // namespace SK_OPTS NS
+
+#endif  // SkColorCubeFilter_opts_DEFINED
diff --git a/gfx/skia/skia/src/opts/SkColor_opts_SSE2.h b/gfx/skia/skia/src/opts/SkColor_opts_SSE2.h
index 7e61d526b3bf..feb1d98f8df3 100644
--- a/gfx/skia/skia/src/opts/SkColor_opts_SSE2.h
+++ b/gfx/skia/skia/src/opts/SkColor_opts_SSE2.h
@@ -10,6 +10,8 @@
 
 #include <emmintrin.h>
 
+#define ASSERT_EQ(a,b) SkASSERT(0xffff == _mm_movemask_epi8(_mm_cmpeq_epi8((a), (b))))
+
 // Because no _mm_mul_epi32() in SSE2, we emulate it here.
 // Multiplies 4 32-bit integers from a by 4 32-bit intergers from b.
 // The 4 multiplication results should be represented within 32-bit
@@ -42,7 +44,7 @@ static inline __m128i SkAlphaMulAlpha_SSE2(const __m128i& a,
 
 // Portable version SkAlphaMulQ is in SkColorPriv.h.
 static inline __m128i SkAlphaMulQ_SSE2(const __m128i& c, const __m128i& scale) {
-    __m128i mask = _mm_set1_epi32(0xFF00FF);
+    const __m128i mask = _mm_set1_epi32(0xFF00FF);
     __m128i s = _mm_or_si128(_mm_slli_epi32(scale, 16), scale);
 
     // uint32_t rb = ((c & mask) * scale) >> 8
@@ -52,18 +54,39 @@ static inline __m128i SkAlphaMulQ_SSE2(const __m128i& c, const __m128i& scale) {
 
     // uint32_t ag = ((c >> 8) & mask) * scale
     __m128i ag = _mm_srli_epi16(c, 8);
-    ag = _mm_and_si128(ag, mask);
+    ASSERT_EQ(ag, _mm_and_si128(mask, ag));  // ag = _mm_srli_epi16(c, 8) did this for us.
     ag = _mm_mullo_epi16(ag, s);
 
     // (rb & mask) | (ag & ~mask)
-    rb = _mm_and_si128(mask, rb);
+    ASSERT_EQ(rb, _mm_and_si128(mask, rb));  // rb = _mm_srli_epi16(rb, 8) did this for us.
     ag = _mm_andnot_si128(mask, ag);
     return _mm_or_si128(rb, ag);
 }
 
+// Fast path for SkAlphaMulQ_SSE2 with a constant scale factor.
+static inline __m128i SkAlphaMulQ_SSE2(const __m128i& c, const unsigned scale) {
+    const __m128i mask = _mm_set1_epi32(0xFF00FF);
+    __m128i s = _mm_set1_epi16(scale << 8); // Move scale factor to upper byte of word.
+
+    // With mulhi, red and blue values are already in the right place and
+    // don't need to be divided by 256.
+    __m128i rb = _mm_and_si128(mask, c);
+    rb = _mm_mulhi_epu16(rb, s);
+
+    __m128i ag = _mm_andnot_si128(mask, c);
+    ag = _mm_mulhi_epu16(ag, s);     // Alpha and green values are in the higher byte of each word.
+    ag = _mm_andnot_si128(mask, ag);
+
+    return _mm_or_si128(rb, ag);
+}
+
 static inline __m128i SkGetPackedA32_SSE2(const __m128i& src) {
+#if SK_A32_SHIFT == 24                // It's very common (universal?) that alpha is the top byte.
+    return _mm_srli_epi32(src, 24);   // You'd hope the compiler would remove the left shift then,
+#else                                 // but I've seen Clang just do a dumb left shift of zero. :(
     __m128i a = _mm_slli_epi32(src, (24 - SK_A32_SHIFT));
     return _mm_srli_epi32(a, 24);
+#endif
 }
 
 static inline __m128i SkGetPackedR32_SSE2(const __m128i& src) {
@@ -183,4 +206,41 @@ static inline __m128i SkPixel32ToPixel16_ToU16_SSE2(const __m128i& src_pixel1,
     return d_pixel;
 }
 
+// Portable version is SkPMSrcOver in SkColorPriv.h.
+static inline __m128i SkPMSrcOver_SSE2(const __m128i& src, const __m128i& dst) {
+    return _mm_add_epi32(src,
+                         SkAlphaMulQ_SSE2(dst, _mm_sub_epi32(_mm_set1_epi32(256),
+                                                             SkGetPackedA32_SSE2(src))));
+}
+
+// Portable version is SkBlendARGB32 in SkColorPriv.h.
+static inline __m128i SkBlendARGB32_SSE2(const __m128i& src, const __m128i& dst,
+                                         const __m128i& aa) {
+    __m128i src_scale = SkAlpha255To256_SSE2(aa);
+    // SkAlpha255To256(255 - SkAlphaMul(SkGetPackedA32(src), src_scale))
+    __m128i dst_scale = SkGetPackedA32_SSE2(src);
+    dst_scale = _mm_mullo_epi16(dst_scale, src_scale);
+    dst_scale = _mm_srli_epi16(dst_scale, 8);
+    dst_scale = _mm_sub_epi32(_mm_set1_epi32(256), dst_scale);
+
+    __m128i result = SkAlphaMulQ_SSE2(src, src_scale);
+    return _mm_add_epi8(result, SkAlphaMulQ_SSE2(dst, dst_scale));
+}
+
+// Fast path for SkBlendARGB32_SSE2 with a constant alpha factor.
+static inline __m128i SkBlendARGB32_SSE2(const __m128i& src, const __m128i& dst,
+                                         const unsigned aa) {
+    unsigned alpha = SkAlpha255To256(aa);
+    __m128i src_scale = _mm_set1_epi32(alpha);
+    // SkAlpha255To256(255 - SkAlphaMul(SkGetPackedA32(src), src_scale))
+    __m128i dst_scale = SkGetPackedA32_SSE2(src);
+    dst_scale = _mm_mullo_epi16(dst_scale, src_scale);
+    dst_scale = _mm_srli_epi16(dst_scale, 8);
+    dst_scale = _mm_sub_epi32(_mm_set1_epi32(256), dst_scale);
+
+    __m128i result = SkAlphaMulQ_SSE2(src, alpha);
+    return _mm_add_epi8(result, SkAlphaMulQ_SSE2(dst, dst_scale));
+}
+
+#undef ASSERT_EQ
 #endif // SkColor_opts_SSE2_DEFINED
diff --git a/gfx/skia/skia/src/opts/SkColor_opts_neon.h b/gfx/skia/skia/src/opts/SkColor_opts_neon.h
index a3430b5c51ce..c316ab403104 100644
--- a/gfx/skia/skia/src/opts/SkColor_opts_neon.h
+++ b/gfx/skia/skia/src/opts/SkColor_opts_neon.h
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #ifndef SkColor_opts_neon_DEFINED
 #define SkColor_opts_neon_DEFINED
 
diff --git a/gfx/skia/skia/src/opts/SkFloatingPoint_opts.h b/gfx/skia/skia/src/opts/SkFloatingPoint_opts.h
new file mode 100644
index 000000000000..8b6536ad7f18
--- /dev/null
+++ b/gfx/skia/skia/src/opts/SkFloatingPoint_opts.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkFloatingPoint_opts_DEFINED
+#define SkFloatingPoint_opts_DEFINED
+
+#include "SkFloatingPoint.h"
+
+namespace SK_OPTS_NS {
+
+#if defined(SK_ARM_HAS_NEON)
+    static float rsqrt(float x) {
+        return sk_float_rsqrt(x);  // This sk_float_rsqrt copy will take the NEON compile-time path.
+    }
+#else
+    static float rsqrt(float x) {
+        // Get initial estimate.
+        int i = *SkTCast<int*>(&x);
+        i = 0x5F1FFFF9 - (i>>1);
+        float estimate = *SkTCast<float*>(&i);
+
+        // One step of Newton's method to refine.
+        const float estimate_sq = estimate*estimate;
+        estimate *= 0.703952253f*(2.38924456f-x*estimate_sq);
+        return estimate;
+    }
+#endif
+
+}  // namespace SK_OPTS_NS
+
+#endif//SkFloatingPoint_opts_DEFINED
diff --git a/gfx/skia/skia/src/opts/SkMath_opts_SSE2.h b/gfx/skia/skia/src/opts/SkMath_opts_SSE2.h
deleted file mode 100644
index 2cc21afa0df4..000000000000
--- a/gfx/skia/skia/src/opts/SkMath_opts_SSE2.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2014 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkMath_opts_SSE2_DEFINED
-#define SkMath_opts_SSE2_DEFINED
-
-#include <emmintrin.h>
-
-// Because no _mm_div_epi32() in SSE2, we use float division to emulate.
-// When using this function, make sure a and b don't exceed float's precision.
-static inline __m128i shim_mm_div_epi32(const __m128i& a, const __m128i& b) {
-    __m128 x = _mm_cvtepi32_ps(a);
-    __m128 y = _mm_cvtepi32_ps(b);
-    return _mm_cvttps_epi32(_mm_div_ps(x, y));
-}
-
-// Portable version of SkSqrtBits is in SkMath.cpp.
-static inline __m128i SkSqrtBits_SSE2(const __m128i& x, int count) {
-    __m128i root =  _mm_setzero_si128();
-    __m128i remHi = _mm_setzero_si128();
-    __m128i remLo = x;
-    __m128i one128 = _mm_set1_epi32(1);
-
-    do {
-        root = _mm_slli_epi32(root, 1);
-
-        remHi = _mm_or_si128(_mm_slli_epi32(remHi, 2),
-                             _mm_srli_epi32(remLo, 30));
-        remLo = _mm_slli_epi32(remLo, 2);
-
-        __m128i testDiv = _mm_slli_epi32(root, 1);
-        testDiv = _mm_add_epi32(testDiv, _mm_set1_epi32(1));
-
-        __m128i cmp = _mm_cmplt_epi32(remHi, testDiv);
-        __m128i remHi1 = _mm_and_si128(cmp, remHi);
-        __m128i root1 = _mm_and_si128(cmp, root);
-        __m128i remHi2 = _mm_andnot_si128(cmp, _mm_sub_epi32(remHi, testDiv));
-        __m128i root2 = _mm_andnot_si128(cmp, _mm_add_epi32(root, one128));
-
-        remHi = _mm_or_si128(remHi1, remHi2);
-        root = _mm_or_si128(root1, root2);
-    } while (--count >= 0);
-
-    return root;
-}
-
-#endif // SkMath_opts_SSE2_DEFINED
diff --git a/gfx/skia/skia/src/opts/SkMatrix_opts.h b/gfx/skia/skia/src/opts/SkMatrix_opts.h
new file mode 100644
index 000000000000..3fb2701e88db
--- /dev/null
+++ b/gfx/skia/skia/src/opts/SkMatrix_opts.h
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkMatrix_opts_DEFINED
+#define SkMatrix_opts_DEFINED
+
+#include "SkMatrix.h"
+#include "SkNx.h"
+
+namespace SK_OPTS_NS {
+
+static void matrix_translate(const SkMatrix& m, SkPoint* dst, const SkPoint* src, int count) {
+    SkASSERT(m.getType() <= SkMatrix::kTranslate_Mask);
+    if (count > 0) {
+        SkScalar tx = m.getTranslateX();
+        SkScalar ty = m.getTranslateY();
+        if (count & 1) {
+            dst->fX = src->fX + tx;
+            dst->fY = src->fY + ty;
+            src += 1;
+            dst += 1;
+        }
+        Sk4s trans4(tx, ty, tx, ty);
+        count >>= 1;
+        if (count & 1) {
+            (Sk4s::Load(&src->fX) + trans4).store(&dst->fX);
+            src += 2;
+            dst += 2;
+        }
+        count >>= 1;
+        for (int i = 0; i < count; ++i) {
+            (Sk4s::Load(&src[0].fX) + trans4).store(&dst[0].fX);
+            (Sk4s::Load(&src[2].fX) + trans4).store(&dst[2].fX);
+            src += 4;
+            dst += 4;
+        }
+    }
+}
+
+static void matrix_scale_translate(const SkMatrix& m, SkPoint* dst, const SkPoint* src, int count) {
+    SkASSERT(m.getType() <= (SkMatrix::kScale_Mask | SkMatrix::kTranslate_Mask));
+    if (count > 0) {
+        SkScalar tx = m.getTranslateX();
+        SkScalar ty = m.getTranslateY();
+        SkScalar sx = m.getScaleX();
+        SkScalar sy = m.getScaleY();
+        if (count & 1) {
+            dst->fX = src->fX * sx + tx;
+            dst->fY = src->fY * sy + ty;
+            src += 1;
+            dst += 1;
+        }
+        Sk4s trans4(tx, ty, tx, ty);
+        Sk4s scale4(sx, sy, sx, sy);
+        count >>= 1;
+        if (count & 1) {
+            (Sk4s::Load(&src->fX) * scale4 + trans4).store(&dst->fX);
+            src += 2;
+            dst += 2;
+        }
+        count >>= 1;
+        for (int i = 0; i < count; ++i) {
+            (Sk4s::Load(&src[0].fX) * scale4 + trans4).store(&dst[0].fX);
+            (Sk4s::Load(&src[2].fX) * scale4 + trans4).store(&dst[2].fX);
+            src += 4;
+            dst += 4;
+        }
+    }
+}
+
+static void matrix_affine(const SkMatrix& m, SkPoint* dst, const SkPoint* src, int count) {
+    SkASSERT(m.getType() != SkMatrix::kPerspective_Mask);
+    if (count > 0) {
+        SkScalar tx = m.getTranslateX();
+        SkScalar ty = m.getTranslateY();
+        SkScalar sx = m.getScaleX();
+        SkScalar sy = m.getScaleY();
+        SkScalar kx = m.getSkewX();
+        SkScalar ky = m.getSkewY();
+        if (count & 1) {
+            dst->set(src->fX * sx + src->fY * kx + tx,
+                     src->fX * ky + src->fY * sy + ty);
+            src += 1;
+            dst += 1;
+        }
+        Sk4s trans4(tx, ty, tx, ty);
+        Sk4s scale4(sx, sy, sx, sy);
+        Sk4s  skew4(kx, ky, kx, ky);    // applied to swizzle of src4
+        count >>= 1;
+        for (int i = 0; i < count; ++i) {
+            Sk4s src4 = Sk4s::Load(&src->fX);
+            Sk4s swz4(src[0].fY, src[0].fX, src[1].fY, src[1].fX);  // need ABCD -> BADC
+            (src4 * scale4 + swz4 * skew4 + trans4).store(&dst->fX);
+            src += 2;
+            dst += 2;
+        }
+    }
+}
+
+} // namespace SK_OPTS_NS
+
+#endif//SkMatrix_opts_DEFINED
diff --git a/gfx/skia/skia/src/opts/SkMorphologyImageFilter_opts.h b/gfx/skia/skia/src/opts/SkMorphologyImageFilter_opts.h
new file mode 100644
index 000000000000..e30a9e49736f
--- /dev/null
+++ b/gfx/skia/skia/src/opts/SkMorphologyImageFilter_opts.h
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkMorphologyImageFilter_opts_DEFINED
+#define SkMorphologyImageFilter_opts_DEFINED
+
+namespace SK_OPTS_NS {
+
+enum MorphType { kDilate, kErode };
+enum class MorphDirection { kX, kY };
+
+#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
+template<MorphType type, MorphDirection direction>
+static void morph(const SkPMColor* src, SkPMColor* dst,
+                  int radius, int width, int height, int srcStride, int dstStride) {
+    const int srcStrideX = direction == MorphDirection::kX ? 1 : srcStride;
+    const int dstStrideX = direction == MorphDirection::kX ? 1 : dstStride;
+    const int srcStrideY = direction == MorphDirection::kX ? srcStride : 1;
+    const int dstStrideY = direction == MorphDirection::kX ? dstStride : 1;
+    radius = SkMin32(radius, width - 1);
+    const SkPMColor* upperSrc = src + radius * srcStrideX;
+    for (int x = 0; x < width; ++x) {
+        const SkPMColor* lp = src;
+        const SkPMColor* up = upperSrc;
+        SkPMColor* dptr = dst;
+        for (int y = 0; y < height; ++y) {
+            __m128i extreme = (type == kDilate) ? _mm_setzero_si128()
+                                                : _mm_set1_epi32(0xFFFFFFFF);
+            for (const SkPMColor* p = lp; p <= up; p += srcStrideX) {
+                __m128i src_pixel = _mm_cvtsi32_si128(*p);
+                extreme = (type == kDilate) ? _mm_max_epu8(src_pixel, extreme)
+                                            : _mm_min_epu8(src_pixel, extreme);
+            }
+            *dptr = _mm_cvtsi128_si32(extreme);
+            dptr += dstStrideY;
+            lp += srcStrideY;
+            up += srcStrideY;
+        }
+        if (x >= radius) { src += srcStrideX; }
+        if (x + radius < width - 1) { upperSrc += srcStrideX; }
+        dst += dstStrideX;
+    }
+}
+
+#elif defined(SK_ARM_HAS_NEON)
+template<MorphType type, MorphDirection direction>
+static void morph(const SkPMColor* src, SkPMColor* dst,
+                  int radius, int width, int height, int srcStride, int dstStride) {
+    const int srcStrideX = direction == MorphDirection::kX ? 1 : srcStride;
+    const int dstStrideX = direction == MorphDirection::kX ? 1 : dstStride;
+    const int srcStrideY = direction == MorphDirection::kX ? srcStride : 1;
+    const int dstStrideY = direction == MorphDirection::kX ? dstStride : 1;
+    radius = SkMin32(radius, width - 1);
+    const SkPMColor* upperSrc = src + radius * srcStrideX;
+    for (int x = 0; x < width; ++x) {
+        const SkPMColor* lp = src;
+        const SkPMColor* up = upperSrc;
+        SkPMColor* dptr = dst;
+        for (int y = 0; y < height; ++y) {
+            uint8x8_t extreme = vdup_n_u8(type == kDilate ? 0 : 255);
+            for (const SkPMColor* p = lp; p <= up; p += srcStrideX) {
+                uint8x8_t src_pixel = vreinterpret_u8_u32(vdup_n_u32(*p));
+                extreme = (type == kDilate) ? vmax_u8(src_pixel, extreme)
+                                            : vmin_u8(src_pixel, extreme);
+            }
+            *dptr = vget_lane_u32(vreinterpret_u32_u8(extreme), 0);
+            dptr += dstStrideY;
+            lp += srcStrideY;
+            up += srcStrideY;
+        }
+        if (x >= radius) src += srcStrideX;
+        if (x + radius < width - 1) upperSrc += srcStrideX;
+        dst += dstStrideX;
+    }
+}
+
+#else
+template<MorphType type, MorphDirection direction>
+static void morph(const SkPMColor* src, SkPMColor* dst,
+                  int radius, int width, int height, int srcStride, int dstStride) {
+    const int srcStrideX = direction == MorphDirection::kX ? 1 : srcStride;
+    const int dstStrideX = direction == MorphDirection::kX ? 1 : dstStride;
+    const int srcStrideY = direction == MorphDirection::kX ? srcStride : 1;
+    const int dstStrideY = direction == MorphDirection::kX ? dstStride : 1;
+    radius = SkMin32(radius, width - 1);
+    const SkPMColor* upperSrc = src + radius * srcStrideX;
+    for (int x = 0; x < width; ++x) {
+        const SkPMColor* lp = src;
+        const SkPMColor* up = upperSrc;
+        SkPMColor* dptr = dst;
+        for (int y = 0; y < height; ++y) {
+            // If we're maxing (dilate), start from 0; if minning (erode), start from 255.
+            const int start = (type == kDilate) ? 0 : 255;
+            int B = start, G = start, R = start, A = start;
+            for (const SkPMColor* p = lp; p <= up; p += srcStrideX) {
+                int b = SkGetPackedB32(*p),
+                    g = SkGetPackedG32(*p),
+                    r = SkGetPackedR32(*p),
+                    a = SkGetPackedA32(*p);
+                if (type == kDilate) {
+                    B = SkTMax(b, B);
+                    G = SkTMax(g, G);
+                    R = SkTMax(r, R);
+                    A = SkTMax(a, A);
+                } else {
+                    B = SkTMin(b, B);
+                    G = SkTMin(g, G);
+                    R = SkTMin(r, R);
+                    A = SkTMin(a, A);
+                }
+            }
+            *dptr = SkPackARGB32(A, R, G, B);
+            dptr += dstStrideY;
+            lp += srcStrideY;
+            up += srcStrideY;
+        }
+        if (x >= radius) { src += srcStrideX; }
+        if (x + radius < width - 1) { upperSrc += srcStrideX; }
+        dst += dstStrideX;
+    }
+}
+
+#endif
+
+static auto dilate_x = &morph<kDilate, MorphDirection::kX>,
+            dilate_y = &morph<kDilate, MorphDirection::kY>,
+             erode_x = &morph<kErode,  MorphDirection::kX>,
+             erode_y = &morph<kErode,  MorphDirection::kY>;
+
+}  // namespace SK_OPTS_NS
+
+#endif//SkMorphologyImageFilter_opts_DEFINED
+
diff --git a/gfx/skia/skia/src/opts/SkMorphology_opts.h b/gfx/skia/skia/src/opts/SkMorphology_opts.h
deleted file mode 100644
index 7ea7c5462312..000000000000
--- a/gfx/skia/skia/src/opts/SkMorphology_opts.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2013 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkMorphology_opts_DEFINED
-#define SkMorphology_opts_DEFINED
-
-#include <SkMorphologyImageFilter.h>
-
-enum SkMorphologyProcType {
-    kDilateX_SkMorphologyProcType,
-    kDilateY_SkMorphologyProcType,
-    kErodeX_SkMorphologyProcType,
-    kErodeY_SkMorphologyProcType
-};
-
-SkMorphologyImageFilter::Proc SkMorphologyGetPlatformProc(SkMorphologyProcType type);
-
-#endif
diff --git a/gfx/skia/skia/src/opts/SkMorphology_opts_SSE2.cpp b/gfx/skia/skia/src/opts/SkMorphology_opts_SSE2.cpp
deleted file mode 100644
index e782950956a5..000000000000
--- a/gfx/skia/skia/src/opts/SkMorphology_opts_SSE2.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2013 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <emmintrin.h>
-#include "SkColorPriv.h"
-#include "SkMorphology_opts_SSE2.h"
-
-/* SSE2 version of dilateX, dilateY, erodeX, erodeY.
- * portable versions are in src/effects/SkMorphologyImageFilter.cpp.
- */
-
-enum MorphType {
-    kDilate, kErode
-};
-
-enum MorphDirection {
-    kX, kY
-};
-
-template<MorphType type, MorphDirection direction>
-static void SkMorph_SSE2(const SkPMColor* src, SkPMColor* dst, int radius,
-                         int width, int height, int srcStride, int dstStride)
-{
-    const int srcStrideX = direction == kX ? 1 : srcStride;
-    const int dstStrideX = direction == kX ? 1 : dstStride;
-    const int srcStrideY = direction == kX ? srcStride : 1;
-    const int dstStrideY = direction == kX ? dstStride : 1;
-    radius = SkMin32(radius, width - 1);
-    const SkPMColor* upperSrc = src + radius * srcStrideX;
-    for (int x = 0; x < width; ++x) {
-        const SkPMColor* lp = src;
-        const SkPMColor* up = upperSrc;
-        SkPMColor* dptr = dst;
-        for (int y = 0; y < height; ++y) {
-            __m128i max = type == kDilate ? _mm_setzero_si128() : _mm_set1_epi32(0xFFFFFFFF);
-            for (const SkPMColor* p = lp; p <= up; p += srcStrideX) {
-                __m128i src_pixel = _mm_cvtsi32_si128(*p);
-                max = type == kDilate ? _mm_max_epu8(src_pixel, max) : _mm_min_epu8(src_pixel, max);
-            }
-            *dptr = _mm_cvtsi128_si32(max);
-            dptr += dstStrideY;
-            lp += srcStrideY;
-            up += srcStrideY;
-        }
-        if (x >= radius) {
-            src += srcStrideX;
-        }
-        if (x + radius < width - 1) {
-            upperSrc += srcStrideX;
-        }
-        dst += dstStrideX;
-    }
-}
-
-void SkDilateX_SSE2(const SkPMColor* src, SkPMColor* dst, int radius,
-                    int width, int height, int srcStride, int dstStride)
-{
-    SkMorph_SSE2<kDilate, kX>(src, dst, radius, width, height, srcStride, dstStride);
-}
-
-void SkErodeX_SSE2(const SkPMColor* src, SkPMColor* dst, int radius,
-                   int width, int height, int srcStride, int dstStride)
-{
-    SkMorph_SSE2<kErode, kX>(src, dst, radius, width, height, srcStride, dstStride);
-}
-
-void SkDilateY_SSE2(const SkPMColor* src, SkPMColor* dst, int radius,
-                    int width, int height, int srcStride, int dstStride)
-{
-    SkMorph_SSE2<kDilate, kY>(src, dst, radius, width, height, srcStride, dstStride);
-}
-
-void SkErodeY_SSE2(const SkPMColor* src, SkPMColor* dst, int radius,
-                   int width, int height, int srcStride, int dstStride)
-{
-    SkMorph_SSE2<kErode, kY>(src, dst, radius, width, height, srcStride, dstStride);
-}
diff --git a/gfx/skia/skia/src/opts/SkMorphology_opts_SSE2.h b/gfx/skia/skia/src/opts/SkMorphology_opts_SSE2.h
deleted file mode 100644
index bf5aa03b092a..000000000000
--- a/gfx/skia/skia/src/opts/SkMorphology_opts_SSE2.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2013 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkMorphology_opts_SSE2_DEFINED
-#define SkMorphology_opts_SSE2_DEFINED
-
-#include "SkColor.h"
-
-void SkDilateX_SSE2(const SkPMColor* src, SkPMColor* dst, int radius,
-                    int width, int height, int srcStride, int dstStride);
-void SkDilateY_SSE2(const SkPMColor* src, SkPMColor* dst, int radius,
-                    int width, int height, int srcStride, int dstStride);
-void SkErodeX_SSE2(const SkPMColor* src, SkPMColor* dst, int radius,
-                   int width, int height, int srcStride, int dstStride);
-void SkErodeY_SSE2(const SkPMColor* src, SkPMColor* dst, int radius,
-                   int width, int height, int srcStride, int dstStride);
-
-#endif
diff --git a/gfx/skia/skia/src/opts/SkMorphology_opts_arm.cpp b/gfx/skia/skia/src/opts/SkMorphology_opts_arm.cpp
deleted file mode 100644
index 2bba4929c220..000000000000
--- a/gfx/skia/skia/src/opts/SkMorphology_opts_arm.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2014 ARM Ltd.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkMorphology_opts.h"
-#include "SkMorphology_opts_neon.h"
-#include "SkUtilsArm.h"
-
-SkMorphologyImageFilter::Proc SkMorphologyGetPlatformProc(SkMorphologyProcType type) {
-#if SK_ARM_NEON_IS_NONE
-    return NULL;
-#else
-#if SK_ARM_NEON_IS_DYNAMIC
-    if (!sk_cpu_arm_has_neon()) {
-        return NULL;
-    }
-#endif
-    switch (type) {
-        case kDilateX_SkMorphologyProcType:
-            return SkDilateX_neon;
-        case kDilateY_SkMorphologyProcType:
-            return SkDilateY_neon;
-        case kErodeX_SkMorphologyProcType:
-            return SkErodeX_neon;
-        case kErodeY_SkMorphologyProcType:
-            return SkErodeY_neon;
-        default:
-            return NULL;
-    }
-#endif
-}
diff --git a/gfx/skia/skia/src/opts/SkMorphology_opts_neon.cpp b/gfx/skia/skia/src/opts/SkMorphology_opts_neon.cpp
deleted file mode 100644
index 571b5c8b178b..000000000000
--- a/gfx/skia/skia/src/opts/SkMorphology_opts_neon.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2013 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#include "SkColorPriv.h"
-#include "SkMorphology_opts.h"
-#include "SkMorphology_opts_neon.h"
-
-#include <arm_neon.h>
-
-/* neon version of dilateX, dilateY, erodeX, erodeY.
- * portable versions are in src/effects/SkMorphologyImageFilter.cpp.
- */
-
-enum MorphType {
-    kDilate, kErode
-};
-
-enum MorphDirection {
-    kX, kY
-};
-
-template<MorphType type, MorphDirection direction>
-static void SkMorph_neon(const SkPMColor* src, SkPMColor* dst, int radius,
-                         int width, int height, int srcStride, int dstStride)
-{
-    const int srcStrideX = direction == kX ? 1 : srcStride;
-    const int dstStrideX = direction == kX ? 1 : dstStride;
-    const int srcStrideY = direction == kX ? srcStride : 1;
-    const int dstStrideY = direction == kX ? dstStride : 1;
-    radius = SkMin32(radius, width - 1);
-    const SkPMColor* upperSrc = src + radius * srcStrideX;
-    for (int x = 0; x < width; ++x) {
-        const SkPMColor* lp = src;
-        const SkPMColor* up = upperSrc;
-        SkPMColor* dptr = dst;
-        for (int y = 0; y < height; ++y) {
-            uint8x8_t max = vdup_n_u8(type == kDilate ? 0 : 255);
-            for (const SkPMColor* p = lp; p <= up; p += srcStrideX) {
-                uint8x8_t src_pixel = vreinterpret_u8_u32(vdup_n_u32(*p));
-                max = type == kDilate ? vmax_u8(src_pixel, max) : vmin_u8(src_pixel, max);
-            }
-            *dptr = vget_lane_u32(vreinterpret_u32_u8(max), 0);
-            dptr += dstStrideY;
-            lp += srcStrideY;
-            up += srcStrideY;
-        }
-        if (x >= radius) src += srcStrideX;
-        if (x + radius < width - 1) upperSrc += srcStrideX;
-        dst += dstStrideX;
-    }
-}
-
-void SkDilateX_neon(const SkPMColor* src, SkPMColor* dst, int radius,
-                    int width, int height, int srcStride, int dstStride)
-{
-    SkMorph_neon<kDilate, kX>(src, dst, radius, width, height, srcStride, dstStride);
-}
-
-void SkErodeX_neon(const SkPMColor* src, SkPMColor* dst, int radius,
-                   int width, int height, int srcStride, int dstStride)
-{
-    SkMorph_neon<kErode, kX>(src, dst, radius, width, height, srcStride, dstStride);
-}
-
-void SkDilateY_neon(const SkPMColor* src, SkPMColor* dst, int radius,
-                    int width, int height, int srcStride, int dstStride)
-{
-    SkMorph_neon<kDilate, kY>(src, dst, radius, width, height, srcStride, dstStride);
-}
-
-void SkErodeY_neon(const SkPMColor* src, SkPMColor* dst, int radius,
-                   int width, int height, int srcStride, int dstStride)
-{
-    SkMorph_neon<kErode, kY>(src, dst, radius, width, height, srcStride, dstStride);
-}
diff --git a/gfx/skia/skia/src/opts/SkMorphology_opts_neon.h b/gfx/skia/skia/src/opts/SkMorphology_opts_neon.h
deleted file mode 100644
index 0b962bdad61d..000000000000
--- a/gfx/skia/skia/src/opts/SkMorphology_opts_neon.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2013 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-void SkDilateX_neon(const SkPMColor* src, SkPMColor* dst, int radius,
-                    int width, int height, int srcStride, int dstStride);
-void SkDilateY_neon(const SkPMColor* src, SkPMColor* dst, int radius,
-                    int width, int height, int srcStride, int dstStride);
-void SkErodeX_neon(const SkPMColor* src, SkPMColor* dst, int radius,
-                   int width, int height, int srcStride, int dstStride);
-void SkErodeY_neon(const SkPMColor* src, SkPMColor* dst, int radius,
-                   int width, int height, int srcStride, int dstStride);
diff --git a/gfx/skia/skia/src/opts/SkMorphology_opts_none.cpp b/gfx/skia/skia/src/opts/SkMorphology_opts_none.cpp
deleted file mode 100644
index ade261fc7d20..000000000000
--- a/gfx/skia/skia/src/opts/SkMorphology_opts_none.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright 2013 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkMorphology_opts.h"
-
-SkMorphologyImageFilter::Proc SkMorphologyGetPlatformProc(SkMorphologyProcType) {
-    return NULL;
-}
diff --git a/gfx/skia/skia/src/opts/SkNx_avx.h b/gfx/skia/skia/src/opts/SkNx_avx.h
new file mode 100644
index 000000000000..9697303e37bc
--- /dev/null
+++ b/gfx/skia/skia/src/opts/SkNx_avx.h
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkNx_avx_DEFINED
+#define SkNx_avx_DEFINED
+
+// This file may assume <= AVX, but must check SK_CPU_SSE_LEVEL for anything more recent.
+
+// All the SSE specializations are still good ideas.  We'll just add Sk8f.
+#include "SkNx_sse.h"
+
+namespace {  // See SkNx.h
+
+template <>
+class SkNx<8, float> {
+public:
+    SkNx(const __m256& vec) : fVec(vec) {}
+
+    SkNx() {}
+    SkNx(float val) : fVec(_mm256_set1_ps(val)) {}
+    static SkNx Load(const float vals[8]) { return _mm256_loadu_ps(vals); }
+
+    static SkNx FromBytes(const uint8_t bytes[8]) {
+        __m128i fix8  = _mm_loadl_epi64((const __m128i*)bytes),
+                fix16 = _mm_unpacklo_epi8 (fix8 , _mm_setzero_si128()),
+                 lo32 = _mm_unpacklo_epi16(fix16, _mm_setzero_si128()),
+                 hi32 = _mm_unpackhi_epi16(fix16, _mm_setzero_si128());
+        __m256i fix32 = _mm256_insertf128_si256(_mm256_castsi128_si256(lo32), hi32, 1);
+        return _mm256_cvtepi32_ps(fix32);
+    }
+
+    SkNx(float a, float b, float c, float d,
+         float e, float f, float g, float h) : fVec(_mm256_setr_ps(a,b,c,d,e,f,g,h)) {}
+
+    void store(float vals[8]) const { _mm256_storeu_ps(vals, fVec); }
+    void toBytes(uint8_t bytes[8]) const {
+        __m256i fix32 = _mm256_cvttps_epi32(fVec);
+        __m128i  lo32 = _mm256_extractf128_si256(fix32, 0),
+                 hi32 = _mm256_extractf128_si256(fix32, 1),
+                fix16 = _mm_packus_epi32(lo32, hi32),
+                fix8  = _mm_packus_epi16(fix16, fix16);
+        _mm_storel_epi64((__m128i*)bytes, fix8);
+    }
+
+    SkNx operator + (const SkNx& o) const { return _mm256_add_ps(fVec, o.fVec); }
+    SkNx operator - (const SkNx& o) const { return _mm256_sub_ps(fVec, o.fVec); }
+    SkNx operator * (const SkNx& o) const { return _mm256_mul_ps(fVec, o.fVec); }
+    SkNx operator / (const SkNx& o) const { return _mm256_div_ps(fVec, o.fVec); }
+
+    SkNx operator == (const SkNx& o) const { return _mm256_cmp_ps(fVec, o.fVec, _CMP_EQ_OQ); }
+    SkNx operator != (const SkNx& o) const { return _mm256_cmp_ps(fVec, o.fVec, _CMP_NEQ_OQ); }
+    SkNx operator  < (const SkNx& o) const { return _mm256_cmp_ps(fVec, o.fVec, _CMP_LT_OQ); }
+    SkNx operator  > (const SkNx& o) const { return _mm256_cmp_ps(fVec, o.fVec, _CMP_GT_OQ); }
+    SkNx operator <= (const SkNx& o) const { return _mm256_cmp_ps(fVec, o.fVec, _CMP_LE_OQ); }
+    SkNx operator >= (const SkNx& o) const { return _mm256_cmp_ps(fVec, o.fVec, _CMP_GE_OQ); }
+
+    static SkNx Min(const SkNx& l, const SkNx& r) { return _mm256_min_ps(l.fVec, r.fVec); }
+    static SkNx Max(const SkNx& l, const SkNx& r) { return _mm256_max_ps(l.fVec, r.fVec); }
+
+    SkNx  sqrt() const { return _mm256_sqrt_ps (fVec);  }
+    SkNx rsqrt0() const { return _mm256_rsqrt_ps(fVec); }
+    SkNx rsqrt1() const { return this->rsqrt0(); }
+    SkNx rsqrt2() const { return this->rsqrt1(); }
+
+    SkNx       invert() const { return SkNx(1) / *this; }
+    SkNx approxInvert() const { return _mm256_rcp_ps(fVec); }
+
+    template <int k> float kth() const {
+        SkASSERT(0 <= k && k < 8);
+        union { __m256 v; float fs[8]; } pun = {fVec};
+        return pun.fs[k&7];
+    }
+
+    bool allTrue() const { return 0xff == _mm256_movemask_ps(fVec); }
+    bool anyTrue() const { return 0x00 != _mm256_movemask_ps(fVec); }
+
+    SkNx thenElse(const SkNx& t, const SkNx& e) const {
+        return _mm256_blendv_ps(e.fVec, t.fVec, fVec);
+    }
+
+    __m256 fVec;
+};
+
+}  // namespace
+
+#endif//SkNx_avx_DEFINED
diff --git a/gfx/skia/skia/src/opts/SkNx_neon.h b/gfx/skia/skia/src/opts/SkNx_neon.h
new file mode 100644
index 000000000000..6fe6137e5fe7
--- /dev/null
+++ b/gfx/skia/skia/src/opts/SkNx_neon.h
@@ -0,0 +1,337 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkNx_neon_DEFINED
+#define SkNx_neon_DEFINED
+
+namespace {  // See SkNx.h
+
+// Well, this is absurd.  The shifts require compile-time constant arguments.
+
+#define SHIFT8(op, v, bits) switch(bits) { \
+    case  1: return op(v,  1);  case  2: return op(v,  2);  case  3: return op(v,  3); \
+    case  4: return op(v,  4);  case  5: return op(v,  5);  case  6: return op(v,  6); \
+    case  7: return op(v,  7); \
+    } return fVec
+
+#define SHIFT16(op, v, bits) if (bits < 8) { SHIFT8(op, v, bits); } switch(bits) { \
+                                case  8: return op(v,  8);  case  9: return op(v,  9); \
+    case 10: return op(v, 10);  case 11: return op(v, 11);  case 12: return op(v, 12); \
+    case 13: return op(v, 13);  case 14: return op(v, 14);  case 15: return op(v, 15); \
+    } return fVec
+
+#define SHIFT32(op, v, bits) if (bits < 16) { SHIFT16(op, v, bits); } switch(bits) { \
+    case 16: return op(v, 16);  case 17: return op(v, 17);  case 18: return op(v, 18); \
+    case 19: return op(v, 19);  case 20: return op(v, 20);  case 21: return op(v, 21); \
+    case 22: return op(v, 22);  case 23: return op(v, 23);  case 24: return op(v, 24); \
+    case 25: return op(v, 25);  case 26: return op(v, 26);  case 27: return op(v, 27); \
+    case 28: return op(v, 28);  case 29: return op(v, 29);  case 30: return op(v, 30); \
+    case 31: return op(v, 31); } return fVec
+
+template <>
+class SkNx<2, float> {
+public:
+    SkNx(float32x2_t vec) : fVec(vec) {}
+
+    SkNx() {}
+    SkNx(float val)           : fVec(vdup_n_f32(val)) {}
+    static SkNx Load(const float vals[2]) { return vld1_f32(vals); }
+    SkNx(float a, float b) { fVec = (float32x2_t) { a, b }; }
+
+    void store(float vals[2]) const { vst1_f32(vals, fVec); }
+
+    SkNx approxInvert() const {
+        float32x2_t est0 = vrecpe_f32(fVec),
+                    est1 = vmul_f32(vrecps_f32(est0, fVec), est0);
+        return est1;
+    }
+    SkNx invert() const {
+        float32x2_t est1 = this->approxInvert().fVec,
+                    est2 = vmul_f32(vrecps_f32(est1, fVec), est1);
+        return est2;
+    }
+
+    SkNx operator + (const SkNx& o) const { return vadd_f32(fVec, o.fVec); }
+    SkNx operator - (const SkNx& o) const { return vsub_f32(fVec, o.fVec); }
+    SkNx operator * (const SkNx& o) const { return vmul_f32(fVec, o.fVec); }
+    SkNx operator / (const SkNx& o) const {
+    #if defined(SK_CPU_ARM64)
+        return vdiv_f32(fVec, o.fVec);
+    #else
+        return vmul_f32(fVec, o.invert().fVec);
+    #endif
+    }
+
+    SkNx operator == (const SkNx& o) const { return vreinterpret_f32_u32(vceq_f32(fVec, o.fVec)); }
+    SkNx operator  < (const SkNx& o) const { return vreinterpret_f32_u32(vclt_f32(fVec, o.fVec)); }
+    SkNx operator  > (const SkNx& o) const { return vreinterpret_f32_u32(vcgt_f32(fVec, o.fVec)); }
+    SkNx operator <= (const SkNx& o) const { return vreinterpret_f32_u32(vcle_f32(fVec, o.fVec)); }
+    SkNx operator >= (const SkNx& o) const { return vreinterpret_f32_u32(vcge_f32(fVec, o.fVec)); }
+    SkNx operator != (const SkNx& o) const {
+        return vreinterpret_f32_u32(vmvn_u32(vceq_f32(fVec, o.fVec)));
+    }
+
+    static SkNx Min(const SkNx& l, const SkNx& r) { return vmin_f32(l.fVec, r.fVec); }
+    static SkNx Max(const SkNx& l, const SkNx& r) { return vmax_f32(l.fVec, r.fVec); }
+
+    SkNx rsqrt0() const { return vrsqrte_f32(fVec); }
+    SkNx rsqrt1() const {
+        float32x2_t est0 = this->rsqrt0().fVec;
+        return vmul_f32(vrsqrts_f32(fVec, vmul_f32(est0, est0)), est0);
+    }
+    SkNx rsqrt2() const {
+        float32x2_t est1 = this->rsqrt1().fVec;
+        return vmul_f32(vrsqrts_f32(fVec, vmul_f32(est1, est1)), est1);
+    }
+
+    SkNx sqrt() const {
+    #if defined(SK_CPU_ARM64)
+        return vsqrt_f32(fVec);
+    #else
+        return *this * this->rsqrt2();
+    #endif
+    }
+
+    template <int k> float kth() const {
+        SkASSERT(0 <= k && k < 2);
+        return vget_lane_f32(fVec, k&1);
+    }
+
+    bool allTrue() const {
+        auto v = vreinterpret_u32_f32(fVec);
+        return vget_lane_u32(v,0) && vget_lane_u32(v,1);
+    }
+    bool anyTrue() const {
+        auto v = vreinterpret_u32_f32(fVec);
+        return vget_lane_u32(v,0) || vget_lane_u32(v,1);
+    }
+
+    float32x2_t fVec;
+};
+
+template <>
+class SkNx<4, int> {
+public:
+    SkNx(const int32x4_t& vec) : fVec(vec) {}
+
+    SkNx() {}
+    SkNx(int val) : fVec(vdupq_n_s32(val)) {}
+    static SkNx Load(const int vals[4]) { return vld1q_s32(vals); }
+    SkNx(int a, int b, int c, int d) { fVec = (int32x4_t) { a, b, c, d }; }
+
+    void store(int vals[4]) const { vst1q_s32(vals, fVec); }
+
+    SkNx operator + (const SkNx& o) const { return vaddq_s32(fVec, o.fVec); }
+    SkNx operator - (const SkNx& o) const { return vsubq_s32(fVec, o.fVec); }
+    SkNx operator * (const SkNx& o) const { return vmulq_s32(fVec, o.fVec); }
+
+    SkNx operator << (int bits) const { SHIFT32(vshlq_n_s32, fVec, bits); }
+    SkNx operator >> (int bits) const { SHIFT32(vshrq_n_s32, fVec, bits); }
+
+    template <int k> int kth() const {
+        SkASSERT(0 <= k && k < 4);
+        return vgetq_lane_s32(fVec, k&3);
+    }
+
+    int32x4_t fVec;
+};
+
+template <>
+class SkNx<4, float> {
+public:
+    SkNx(float32x4_t vec) : fVec(vec) {}
+
+    SkNx() {}
+    SkNx(float val)           : fVec(vdupq_n_f32(val)) {}
+    static SkNx Load(const float vals[4]) { return vld1q_f32(vals); }
+    static SkNx FromBytes(const uint8_t vals[4]) {
+        uint8x8_t   fix8    = (uint8x8_t)vld1_dup_u32((const uint32_t*)vals);
+        uint16x8_t  fix8_16 = vmovl_u8(fix8);
+        uint32x4_t  fix8_32 = vmovl_u16(vget_low_u16(fix8_16));
+        return SkNx(vcvtq_f32_u32(fix8_32));
+    }
+
+    SkNx(float a, float b, float c, float d) { fVec = (float32x4_t) { a, b, c, d }; }
+
+    void store(float vals[4]) const { vst1q_f32(vals, fVec); }
+    void toBytes(uint8_t bytes[4]) const {
+        uint32x4_t  fix8_32 = vcvtq_u32_f32(fVec);
+        uint16x4_t  fix8_16 = vqmovn_u32(fix8_32);
+        uint8x8_t   fix8    = vqmovn_u16(vcombine_u16(fix8_16, vdup_n_u16(0)));
+        vst1_lane_u32((uint32_t*)bytes, (uint32x2_t)fix8, 0);
+    }
+
+    static void ToBytes(uint8_t bytes[16],
+                        const SkNx& a, const SkNx& b, const SkNx& c, const SkNx& d) {
+        vst1q_u8(bytes, vuzpq_u8(vuzpq_u8((uint8x16_t)vcvtq_u32_f32(a.fVec),
+                                          (uint8x16_t)vcvtq_u32_f32(b.fVec)).val[0],
+                                 vuzpq_u8((uint8x16_t)vcvtq_u32_f32(c.fVec),
+                                          (uint8x16_t)vcvtq_u32_f32(d.fVec)).val[0]).val[0]);
+    }
+
+    SkNx approxInvert() const {
+        float32x4_t est0 = vrecpeq_f32(fVec),
+                    est1 = vmulq_f32(vrecpsq_f32(est0, fVec), est0);
+        return est1;
+    }
+    SkNx invert() const {
+        float32x4_t est1 = this->approxInvert().fVec,
+                    est2 = vmulq_f32(vrecpsq_f32(est1, fVec), est1);
+        return est2;
+    }
+
+    SkNx operator + (const SkNx& o) const { return vaddq_f32(fVec, o.fVec); }
+    SkNx operator - (const SkNx& o) const { return vsubq_f32(fVec, o.fVec); }
+    SkNx operator * (const SkNx& o) const { return vmulq_f32(fVec, o.fVec); }
+    SkNx operator / (const SkNx& o) const {
+    #if defined(SK_CPU_ARM64)
+        return vdivq_f32(fVec, o.fVec);
+    #else
+        return vmulq_f32(fVec, o.invert().fVec);
+    #endif
+    }
+
+    SkNx operator==(const SkNx& o) const { return vreinterpretq_f32_u32(vceqq_f32(fVec, o.fVec)); }
+    SkNx operator <(const SkNx& o) const { return vreinterpretq_f32_u32(vcltq_f32(fVec, o.fVec)); }
+    SkNx operator >(const SkNx& o) const { return vreinterpretq_f32_u32(vcgtq_f32(fVec, o.fVec)); }
+    SkNx operator<=(const SkNx& o) const { return vreinterpretq_f32_u32(vcleq_f32(fVec, o.fVec)); }
+    SkNx operator>=(const SkNx& o) const { return vreinterpretq_f32_u32(vcgeq_f32(fVec, o.fVec)); }
+    SkNx operator!=(const SkNx& o) const {
+        return vreinterpretq_f32_u32(vmvnq_u32(vceqq_f32(fVec, o.fVec)));
+    }
+
+    static SkNx Min(const SkNx& l, const SkNx& r) { return vminq_f32(l.fVec, r.fVec); }
+    static SkNx Max(const SkNx& l, const SkNx& r) { return vmaxq_f32(l.fVec, r.fVec); }
+
+    SkNx rsqrt0() const { return vrsqrteq_f32(fVec); }
+    SkNx rsqrt1() const {
+        float32x4_t est0 = this->rsqrt0().fVec;
+        return vmulq_f32(vrsqrtsq_f32(fVec, vmulq_f32(est0, est0)), est0);
+    }
+    SkNx rsqrt2() const {
+        float32x4_t est1 = this->rsqrt1().fVec;
+        return vmulq_f32(vrsqrtsq_f32(fVec, vmulq_f32(est1, est1)), est1);
+    }
+
+    SkNx sqrt() const {
+    #if defined(SK_CPU_ARM64)
+        return vsqrtq_f32(fVec);
+    #else
+        return *this * this->rsqrt2();
+    #endif
+    }
+
+    template <int k> float kth() const {
+        SkASSERT(0 <= k && k < 4);
+        return vgetq_lane_f32(fVec, k&3);
+    }
+
+    bool allTrue() const {
+        auto v = vreinterpretq_u32_f32(fVec);
+        return vgetq_lane_u32(v,0) && vgetq_lane_u32(v,1)
+            && vgetq_lane_u32(v,2) && vgetq_lane_u32(v,3);
+    }
+    bool anyTrue() const {
+        auto v = vreinterpretq_u32_f32(fVec);
+        return vgetq_lane_u32(v,0) || vgetq_lane_u32(v,1)
+            || vgetq_lane_u32(v,2) || vgetq_lane_u32(v,3);
+    }
+
+    SkNx thenElse(const SkNx& t, const SkNx& e) const {
+        return vbslq_f32(vreinterpretq_u32_f32(fVec), t.fVec, e.fVec);
+    }
+
+    float32x4_t fVec;
+};
+
+template <>
+class SkNx<8, uint16_t> {
+public:
+    SkNx(const uint16x8_t& vec) : fVec(vec) {}
+
+    SkNx() {}
+    SkNx(uint16_t val) : fVec(vdupq_n_u16(val)) {}
+    static SkNx Load(const uint16_t vals[8]) { return vld1q_u16(vals); }
+
+    SkNx(uint16_t a, uint16_t b, uint16_t c, uint16_t d,
+         uint16_t e, uint16_t f, uint16_t g, uint16_t h) {
+        fVec = (uint16x8_t) { a,b,c,d, e,f,g,h };
+    }
+
+    void store(uint16_t vals[8]) const { vst1q_u16(vals, fVec); }
+
+    SkNx operator + (const SkNx& o) const { return vaddq_u16(fVec, o.fVec); }
+    SkNx operator - (const SkNx& o) const { return vsubq_u16(fVec, o.fVec); }
+    SkNx operator * (const SkNx& o) const { return vmulq_u16(fVec, o.fVec); }
+
+    SkNx operator << (int bits) const { SHIFT16(vshlq_n_u16, fVec, bits); }
+    SkNx operator >> (int bits) const { SHIFT16(vshrq_n_u16, fVec, bits); }
+
+    static SkNx Min(const SkNx& a, const SkNx& b) { return vminq_u16(a.fVec, b.fVec); }
+
+    template <int k> uint16_t kth() const {
+        SkASSERT(0 <= k && k < 8);
+        return vgetq_lane_u16(fVec, k&7);
+    }
+
+    SkNx thenElse(const SkNx& t, const SkNx& e) const {
+        return vbslq_u16(fVec, t.fVec, e.fVec);
+    }
+
+    uint16x8_t fVec;
+};
+
+template <>
+class SkNx<16, uint8_t> {
+public:
+    SkNx(const uint8x16_t& vec) : fVec(vec) {}
+
+    SkNx() {}
+    SkNx(uint8_t val) : fVec(vdupq_n_u8(val)) {}
+    static SkNx Load(const uint8_t vals[16]) { return vld1q_u8(vals); }
+
+    SkNx(uint8_t a, uint8_t b, uint8_t c, uint8_t d,
+         uint8_t e, uint8_t f, uint8_t g, uint8_t h,
+         uint8_t i, uint8_t j, uint8_t k, uint8_t l,
+         uint8_t m, uint8_t n, uint8_t o, uint8_t p) {
+        fVec = (uint8x16_t) { a,b,c,d, e,f,g,h, i,j,k,l, m,n,o,p };
+    }
+
+    void store(uint8_t vals[16]) const { vst1q_u8(vals, fVec); }
+
+    SkNx saturatedAdd(const SkNx& o) const { return vqaddq_u8(fVec, o.fVec); }
+
+    SkNx operator + (const SkNx& o) const { return vaddq_u8(fVec, o.fVec); }
+    SkNx operator - (const SkNx& o) const { return vsubq_u8(fVec, o.fVec); }
+
+    static SkNx Min(const SkNx& a, const SkNx& b) { return vminq_u8(a.fVec, b.fVec); }
+    SkNx operator < (const SkNx& o) const { return vcltq_u8(fVec, o.fVec); }
+
+    template <int k> uint8_t kth() const {
+        SkASSERT(0 <= k && k < 15);
+        return vgetq_lane_u8(fVec, k&16);
+    }
+
+    SkNx thenElse(const SkNx& t, const SkNx& e) const {
+        return vbslq_u8(fVec, t.fVec, e.fVec);
+    }
+
+    uint8x16_t fVec;
+};
+
+#undef SHIFT32
+#undef SHIFT16
+#undef SHIFT8
+
+template<>
+inline SkNx<4, int> SkNx_cast<int, float, 4>(const SkNx<4, float>& src) {
+    return vcvtq_s32_f32(src.fVec);
+}
+
+}  // namespace
+
+#endif//SkNx_neon_DEFINED
diff --git a/gfx/skia/skia/src/opts/SkNx_sse.h b/gfx/skia/skia/src/opts/SkNx_sse.h
new file mode 100644
index 000000000000..a4f8656536c4
--- /dev/null
+++ b/gfx/skia/skia/src/opts/SkNx_sse.h
@@ -0,0 +1,304 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkNx_sse_DEFINED
+#define SkNx_sse_DEFINED
+
+// This file may assume <= SSE2, but must check SK_CPU_SSE_LEVEL for anything more recent.
+
+namespace {  // See SkNx.h
+
+
+template <>
+class SkNx<2, float> {
+public:
+    SkNx(const __m128& vec) : fVec(vec) {}
+
+    SkNx() {}
+    SkNx(float val) : fVec(_mm_set1_ps(val)) {}
+    static SkNx Load(const float vals[2]) {
+        return _mm_castsi128_ps(_mm_loadl_epi64((const __m128i*)vals));
+    }
+    SkNx(float a, float b) : fVec(_mm_setr_ps(a,b,0,0)) {}
+
+    void store(float vals[2]) const { _mm_storel_pi((__m64*)vals, fVec); }
+
+    SkNx operator + (const SkNx& o) const { return _mm_add_ps(fVec, o.fVec); }
+    SkNx operator - (const SkNx& o) const { return _mm_sub_ps(fVec, o.fVec); }
+    SkNx operator * (const SkNx& o) const { return _mm_mul_ps(fVec, o.fVec); }
+    SkNx operator / (const SkNx& o) const { return _mm_div_ps(fVec, o.fVec); }
+
+    SkNx operator == (const SkNx& o) const { return _mm_cmpeq_ps (fVec, o.fVec); }
+    SkNx operator != (const SkNx& o) const { return _mm_cmpneq_ps(fVec, o.fVec); }
+    SkNx operator  < (const SkNx& o) const { return _mm_cmplt_ps (fVec, o.fVec); }
+    SkNx operator  > (const SkNx& o) const { return _mm_cmpgt_ps (fVec, o.fVec); }
+    SkNx operator <= (const SkNx& o) const { return _mm_cmple_ps (fVec, o.fVec); }
+    SkNx operator >= (const SkNx& o) const { return _mm_cmpge_ps (fVec, o.fVec); }
+
+    static SkNx Min(const SkNx& l, const SkNx& r) { return _mm_min_ps(l.fVec, r.fVec); }
+    static SkNx Max(const SkNx& l, const SkNx& r) { return _mm_max_ps(l.fVec, r.fVec); }
+
+    SkNx  sqrt() const { return _mm_sqrt_ps (fVec);  }
+    SkNx rsqrt0() const { return _mm_rsqrt_ps(fVec); }
+    SkNx rsqrt1() const { return this->rsqrt0(); }
+    SkNx rsqrt2() const { return this->rsqrt1(); }
+
+    SkNx       invert() const { return SkNx(1) / *this; }
+    SkNx approxInvert() const { return _mm_rcp_ps(fVec); }
+
+    template <int k> float kth() const {
+        SkASSERT(0 <= k && k < 2);
+        union { __m128 v; float fs[4]; } pun = {fVec};
+        return pun.fs[k&1];
+    }
+
+    bool allTrue() const { return 0xff == (_mm_movemask_epi8(_mm_castps_si128(fVec)) & 0xff); }
+    bool anyTrue() const { return 0x00 != (_mm_movemask_epi8(_mm_castps_si128(fVec)) & 0xff); }
+
+    __m128 fVec;
+};
+
+template <>
+class SkNx<4, int> {
+public:
+    SkNx(const __m128i& vec) : fVec(vec) {}
+
+    SkNx() {}
+    SkNx(int val) : fVec(_mm_set1_epi32(val)) {}
+    static SkNx Load(const int vals[4]) { return _mm_loadu_si128((const __m128i*)vals); }
+    SkNx(int a, int b, int c, int d) : fVec(_mm_setr_epi32(a,b,c,d)) {}
+
+    void store(int vals[4]) const { _mm_storeu_si128((__m128i*)vals, fVec); }
+
+    SkNx operator + (const SkNx& o) const { return _mm_add_epi32(fVec, o.fVec); }
+    SkNx operator - (const SkNx& o) const { return _mm_sub_epi32(fVec, o.fVec); }
+    SkNx operator * (const SkNx& o) const {
+        __m128i mul20 = _mm_mul_epu32(fVec, o.fVec),
+                mul31 = _mm_mul_epu32(_mm_srli_si128(fVec, 4), _mm_srli_si128(o.fVec, 4));
+        return _mm_unpacklo_epi32(_mm_shuffle_epi32(mul20, _MM_SHUFFLE(0,0,2,0)),
+                                  _mm_shuffle_epi32(mul31, _MM_SHUFFLE(0,0,2,0)));
+    }
+
+    SkNx operator << (int bits) const { return _mm_slli_epi32(fVec, bits); }
+    SkNx operator >> (int bits) const { return _mm_srai_epi32(fVec, bits); }
+
+    template <int k> int kth() const {
+        SkASSERT(0 <= k && k < 4);
+        switch (k) {
+            case 0: return _mm_cvtsi128_si32(fVec);
+            case 1: return _mm_cvtsi128_si32(_mm_srli_si128(fVec,  4));
+            case 2: return _mm_cvtsi128_si32(_mm_srli_si128(fVec,  8));
+            case 3: return _mm_cvtsi128_si32(_mm_srli_si128(fVec, 12));
+            default: SkASSERT(false); return 0;
+        }
+    }
+
+    __m128i fVec;
+};
+
+template <>
+class SkNx<4, float> {
+public:
+    SkNx(const __m128& vec) : fVec(vec) {}
+
+    SkNx() {}
+    SkNx(float val)           : fVec( _mm_set1_ps(val) ) {}
+    static SkNx Load(const float vals[4]) { return _mm_loadu_ps(vals); }
+
+    static SkNx FromBytes(const uint8_t bytes[4]) {
+        __m128i fix8 = _mm_cvtsi32_si128(*(const int*)bytes);
+    #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSSE3
+        const char _ = ~0;  // Zero these bytes.
+        __m128i fix8_32 = _mm_shuffle_epi8(fix8, _mm_setr_epi8(0,_,_,_, 1,_,_,_, 2,_,_,_, 3,_,_,_));
+    #else
+        __m128i fix8_16 = _mm_unpacklo_epi8 (fix8,    _mm_setzero_si128()),
+                fix8_32 = _mm_unpacklo_epi16(fix8_16, _mm_setzero_si128());
+    #endif
+        return SkNx(_mm_cvtepi32_ps(fix8_32));
+        // TODO: use _mm_cvtepu8_epi32 w/SSE4.1?
+    }
+
+    SkNx(float a, float b, float c, float d) : fVec(_mm_setr_ps(a,b,c,d)) {}
+
+    void store(float vals[4]) const { _mm_storeu_ps(vals, fVec); }
+    void toBytes(uint8_t bytes[4]) const {
+        __m128i fix8_32 = _mm_cvttps_epi32(fVec),
+                fix8_16 = _mm_packus_epi16(fix8_32, fix8_32),
+                fix8    = _mm_packus_epi16(fix8_16, fix8_16);
+        *(int*)bytes = _mm_cvtsi128_si32(fix8);
+    }
+
+    static void ToBytes(uint8_t bytes[16],
+                        const SkNx& a, const SkNx& b, const SkNx& c, const SkNx& d) {
+        _mm_storeu_si128((__m128i*)bytes,
+                         _mm_packus_epi16(_mm_packus_epi16(_mm_cvttps_epi32(a.fVec),
+                                                           _mm_cvttps_epi32(b.fVec)),
+                                          _mm_packus_epi16(_mm_cvttps_epi32(c.fVec),
+                                                           _mm_cvttps_epi32(d.fVec))));
+    }
+
+    SkNx operator + (const SkNx& o) const { return _mm_add_ps(fVec, o.fVec); }
+    SkNx operator - (const SkNx& o) const { return _mm_sub_ps(fVec, o.fVec); }
+    SkNx operator * (const SkNx& o) const { return _mm_mul_ps(fVec, o.fVec); }
+    SkNx operator / (const SkNx& o) const { return _mm_div_ps(fVec, o.fVec); }
+
+    SkNx operator == (const SkNx& o) const { return _mm_cmpeq_ps (fVec, o.fVec); }
+    SkNx operator != (const SkNx& o) const { return _mm_cmpneq_ps(fVec, o.fVec); }
+    SkNx operator  < (const SkNx& o) const { return _mm_cmplt_ps (fVec, o.fVec); }
+    SkNx operator  > (const SkNx& o) const { return _mm_cmpgt_ps (fVec, o.fVec); }
+    SkNx operator <= (const SkNx& o) const { return _mm_cmple_ps (fVec, o.fVec); }
+    SkNx operator >= (const SkNx& o) const { return _mm_cmpge_ps (fVec, o.fVec); }
+
+    static SkNx Min(const SkNx& l, const SkNx& r) { return _mm_min_ps(l.fVec, r.fVec); }
+    static SkNx Max(const SkNx& l, const SkNx& r) { return _mm_max_ps(l.fVec, r.fVec); }
+
+    SkNx  sqrt() const { return _mm_sqrt_ps (fVec);  }
+    SkNx rsqrt0() const { return _mm_rsqrt_ps(fVec); }
+    SkNx rsqrt1() const { return this->rsqrt0(); }
+    SkNx rsqrt2() const { return this->rsqrt1(); }
+
+    SkNx       invert() const { return SkNx(1) / *this; }
+    SkNx approxInvert() const { return _mm_rcp_ps(fVec); }
+
+    template <int k> float kth() const {
+        SkASSERT(0 <= k && k < 4);
+        union { __m128 v; float fs[4]; } pun = {fVec};
+        return pun.fs[k&3];
+    }
+
+    bool allTrue() const { return 0xffff == _mm_movemask_epi8(_mm_castps_si128(fVec)); }
+    bool anyTrue() const { return 0x0000 != _mm_movemask_epi8(_mm_castps_si128(fVec)); }
+
+    SkNx thenElse(const SkNx& t, const SkNx& e) const {
+        return _mm_or_ps(_mm_and_ps   (fVec, t.fVec),
+                         _mm_andnot_ps(fVec, e.fVec));
+    }
+
+    __m128 fVec;
+};
+
+template <>
+class SkNx<4, uint16_t> {
+public:
+    SkNx(const __m128i& vec) : fVec(vec) {}
+
+    SkNx() {}
+    SkNx(uint16_t val) : fVec(_mm_set1_epi16(val)) {}
+    static SkNx Load(const uint16_t vals[4]) { return _mm_loadl_epi64((const __m128i*)vals); }
+    SkNx(uint16_t a, uint16_t b, uint16_t c, uint16_t d) : fVec(_mm_setr_epi16(a,b,c,d,0,0,0,0)) {}
+
+    void store(uint16_t vals[4]) const { _mm_storel_epi64((__m128i*)vals, fVec); }
+
+    SkNx operator + (const SkNx& o) const { return _mm_add_epi16(fVec, o.fVec); }
+    SkNx operator - (const SkNx& o) const { return _mm_sub_epi16(fVec, o.fVec); }
+    SkNx operator * (const SkNx& o) const { return _mm_mullo_epi16(fVec, o.fVec); }
+
+    SkNx operator << (int bits) const { return _mm_slli_epi16(fVec, bits); }
+    SkNx operator >> (int bits) const { return _mm_srli_epi16(fVec, bits); }
+
+    template <int k> uint16_t kth() const {
+        SkASSERT(0 <= k && k < 4);
+        return _mm_extract_epi16(fVec, k);
+    }
+
+    __m128i fVec;
+};
+
+template <>
+class SkNx<8, uint16_t> {
+public:
+    SkNx(const __m128i& vec) : fVec(vec) {}
+
+    SkNx() {}
+    SkNx(uint16_t val) : fVec(_mm_set1_epi16(val)) {}
+    static SkNx Load(const uint16_t vals[8]) { return _mm_loadu_si128((const __m128i*)vals); }
+    SkNx(uint16_t a, uint16_t b, uint16_t c, uint16_t d,
+         uint16_t e, uint16_t f, uint16_t g, uint16_t h) : fVec(_mm_setr_epi16(a,b,c,d,e,f,g,h)) {}
+
+    void store(uint16_t vals[8]) const { _mm_storeu_si128((__m128i*)vals, fVec); }
+
+    SkNx operator + (const SkNx& o) const { return _mm_add_epi16(fVec, o.fVec); }
+    SkNx operator - (const SkNx& o) const { return _mm_sub_epi16(fVec, o.fVec); }
+    SkNx operator * (const SkNx& o) const { return _mm_mullo_epi16(fVec, o.fVec); }
+
+    SkNx operator << (int bits) const { return _mm_slli_epi16(fVec, bits); }
+    SkNx operator >> (int bits) const { return _mm_srli_epi16(fVec, bits); }
+
+    static SkNx Min(const SkNx& a, const SkNx& b) {
+        // No unsigned _mm_min_epu16, so we'll shift into a space where we can use the
+        // signed version, _mm_min_epi16, then shift back.
+        const uint16_t top = 0x8000; // Keep this separate from _mm_set1_epi16 or MSVC will whine.
+        const __m128i top_8x = _mm_set1_epi16(top);
+        return _mm_add_epi8(top_8x, _mm_min_epi16(_mm_sub_epi8(a.fVec, top_8x),
+                                                  _mm_sub_epi8(b.fVec, top_8x)));
+    }
+
+    SkNx thenElse(const SkNx& t, const SkNx& e) const {
+        return _mm_or_si128(_mm_and_si128   (fVec, t.fVec),
+                            _mm_andnot_si128(fVec, e.fVec));
+    }
+
+    template <int k> uint16_t kth() const {
+        SkASSERT(0 <= k && k < 8);
+        return _mm_extract_epi16(fVec, k);
+    }
+
+    __m128i fVec;
+};
+
+template <>
+class SkNx<16, uint8_t> {
+public:
+    SkNx(const __m128i& vec) : fVec(vec) {}
+
+    SkNx() {}
+    SkNx(uint8_t val) : fVec(_mm_set1_epi8(val)) {}
+    static SkNx Load(const uint8_t vals[16]) { return _mm_loadu_si128((const __m128i*)vals); }
+    SkNx(uint8_t a, uint8_t b, uint8_t c, uint8_t d,
+         uint8_t e, uint8_t f, uint8_t g, uint8_t h,
+         uint8_t i, uint8_t j, uint8_t k, uint8_t l,
+         uint8_t m, uint8_t n, uint8_t o, uint8_t p)
+        : fVec(_mm_setr_epi8(a,b,c,d, e,f,g,h, i,j,k,l, m,n,o,p)) {}
+
+    void store(uint8_t vals[16]) const { _mm_storeu_si128((__m128i*)vals, fVec); }
+
+    SkNx saturatedAdd(const SkNx& o) const { return _mm_adds_epu8(fVec, o.fVec); }
+
+    SkNx operator + (const SkNx& o) const { return _mm_add_epi8(fVec, o.fVec); }
+    SkNx operator - (const SkNx& o) const { return _mm_sub_epi8(fVec, o.fVec); }
+
+    static SkNx Min(const SkNx& a, const SkNx& b) { return _mm_min_epu8(a.fVec, b.fVec); }
+    SkNx operator < (const SkNx& o) const {
+        // There's no unsigned _mm_cmplt_epu8, so we flip the sign bits then use a signed compare.
+        auto flip = _mm_set1_epi8(char(0x80));
+        return _mm_cmplt_epi8(_mm_xor_si128(flip, fVec), _mm_xor_si128(flip, o.fVec));
+    }
+
+    template <int k> uint8_t kth() const {
+        SkASSERT(0 <= k && k < 16);
+        // SSE4.1 would just `return _mm_extract_epi8(fVec, k)`.  We have to read 16-bits instead.
+        int pair = _mm_extract_epi16(fVec, k/2);
+        return k % 2 == 0 ? pair : (pair >> 8);
+    }
+
+    SkNx thenElse(const SkNx& t, const SkNx& e) const {
+        return _mm_or_si128(_mm_and_si128   (fVec, t.fVec),
+                            _mm_andnot_si128(fVec, e.fVec));
+    }
+
+    __m128i fVec;
+};
+
+
+template<>
+inline SkNx<4, int> SkNx_cast<int, float, 4>(const SkNx<4, float>& src) {
+    return _mm_cvttps_epi32(src.fVec);
+}
+
+}  // namespace
+
+#endif//SkNx_sse_DEFINED
diff --git a/gfx/skia/skia/src/opts/SkOpts_avx.cpp b/gfx/skia/skia/src/opts/SkOpts_avx.cpp
new file mode 100644
index 000000000000..88021530023b
--- /dev/null
+++ b/gfx/skia/skia/src/opts/SkOpts_avx.cpp
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkOpts.h"
+#define SK_OPTS_NS sk_avx
+#include "SkXfermode_opts.h"
+
+namespace SkOpts {
+    void Init_avx() {
+        create_xfermode = sk_avx::create_xfermode;
+    }
+}
+
diff --git a/gfx/skia/skia/src/opts/SkOpts_neon.cpp b/gfx/skia/skia/src/opts/SkOpts_neon.cpp
new file mode 100644
index 000000000000..a0388b06544f
--- /dev/null
+++ b/gfx/skia/skia/src/opts/SkOpts_neon.cpp
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkOpts.h"
+
+#define SK_OPTS_NS sk_neon
+#include "SkBlitMask_opts.h"
+#include "SkBlitRow_opts.h"
+#include "SkBlurImageFilter_opts.h"
+#include "SkColorCubeFilter_opts.h"
+#include "SkFloatingPoint_opts.h"
+#include "SkMatrix_opts.h"
+#include "SkMorphologyImageFilter_opts.h"
+#include "SkTextureCompressor_opts.h"
+#include "SkUtils_opts.h"
+#include "SkXfermode_opts.h"
+
+namespace SkOpts {
+    void Init_neon() {
+        rsqrt           = sk_neon::rsqrt;
+        memset16        = sk_neon::memset16;
+        memset32        = sk_neon::memset32;
+        create_xfermode = sk_neon::create_xfermode;
+
+        box_blur_xx = sk_neon::box_blur_xx;
+        box_blur_xy = sk_neon::box_blur_xy;
+        box_blur_yx = sk_neon::box_blur_yx;
+
+        dilate_x = sk_neon::dilate_x;
+        dilate_y = sk_neon::dilate_y;
+         erode_x = sk_neon::erode_x;
+         erode_y = sk_neon::erode_y;
+
+        texture_compressor    = sk_neon::texture_compressor;
+        fill_block_dimensions = sk_neon::fill_block_dimensions;
+
+        blit_mask_d32_a8 = sk_neon::blit_mask_d32_a8;
+
+        blit_row_color32 = sk_neon::blit_row_color32;
+
+        color_cube_filter_span = sk_neon::color_cube_filter_span;
+
+        matrix_translate       = sk_neon::matrix_translate;
+        matrix_scale_translate = sk_neon::matrix_scale_translate;
+        matrix_affine          = sk_neon::matrix_affine;
+    }
+}
diff --git a/gfx/skia/skia/src/opts/SkOpts_sse41.cpp b/gfx/skia/skia/src/opts/SkOpts_sse41.cpp
new file mode 100644
index 000000000000..bbb77e3b8d52
--- /dev/null
+++ b/gfx/skia/skia/src/opts/SkOpts_sse41.cpp
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkOpts.h"
+
+#define SK_OPTS_NS sk_sse41
+#include "SkBlurImageFilter_opts.h"
+
+namespace SkOpts {
+    void Init_sse41() {
+        box_blur_xx = sk_sse41::box_blur_xx;
+        box_blur_xy = sk_sse41::box_blur_xy;
+        box_blur_yx = sk_sse41::box_blur_yx;
+    }
+}
diff --git a/gfx/skia/skia/src/opts/SkOpts_ssse3.cpp b/gfx/skia/skia/src/opts/SkOpts_ssse3.cpp
new file mode 100644
index 000000000000..675cdaa23e44
--- /dev/null
+++ b/gfx/skia/skia/src/opts/SkOpts_ssse3.cpp
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkOpts.h"
+#define SK_OPTS_NS sk_ssse3
+#include "SkBlitMask_opts.h"
+#include "SkColorCubeFilter_opts.h"
+#include "SkXfermode_opts.h"
+
+namespace SkOpts {
+    void Init_ssse3() {
+        create_xfermode = sk_ssse3::create_xfermode;
+        blit_mask_d32_a8 = sk_ssse3::blit_mask_d32_a8;
+        color_cube_filter_span = sk_ssse3::color_cube_filter_span;
+    }
+}
diff --git a/gfx/skia/skia/src/opts/SkPx_neon.h b/gfx/skia/skia/src/opts/SkPx_neon.h
new file mode 100644
index 000000000000..23a0934ab266
--- /dev/null
+++ b/gfx/skia/skia/src/opts/SkPx_neon.h
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPx_neon_DEFINED
+#define SkPx_neon_DEFINED
+
+// When we have NEON, we like to work 8 pixels at a time.
+// This lets us exploit vld4/vst4 and represent SkPx as planar uint8x8x4_t,
+// Wide as planar uint16x8x4_t, and Alpha as a single uint8x8_t plane.
+
+namespace neon {
+
+struct SkPx {
+    static const int N = 8;
+
+    uint8x8x4_t fVec;
+    SkPx(uint8x8x4_t vec) : fVec(vec) {}
+
+    static SkPx Dup(uint32_t px) { return vld4_dup_u8((const uint8_t*)&px); }
+    static SkPx Load(const uint32_t* px) { return vld4_u8((const uint8_t*)px); }
+    static SkPx Load(const uint32_t* px, int n) {
+        SkASSERT(0 < n && n < 8);
+        uint8x8x4_t v = vld4_dup_u8((const uint8_t*)px);  // n>=1, so start all lanes with pixel 0.
+        switch (n) {
+            case 7: v = vld4_lane_u8((const uint8_t*)(px+6), v, 6);  // fall through
+            case 6: v = vld4_lane_u8((const uint8_t*)(px+5), v, 5);  // fall through
+            case 5: v = vld4_lane_u8((const uint8_t*)(px+4), v, 4);  // fall through
+            case 4: v = vld4_lane_u8((const uint8_t*)(px+3), v, 3);  // fall through
+            case 3: v = vld4_lane_u8((const uint8_t*)(px+2), v, 2);  // fall through
+            case 2: v = vld4_lane_u8((const uint8_t*)(px+1), v, 1);
+        }
+        return v;
+    }
+
+    void store(uint32_t* px) const { vst4_u8((uint8_t*)px, fVec); }
+    void store(uint32_t* px, int n) const {
+        SkASSERT(0 < n && n < 8);
+        switch (n) {
+            case 7: vst4_lane_u8((uint8_t*)(px+6), fVec, 6);
+            case 6: vst4_lane_u8((uint8_t*)(px+5), fVec, 5);
+            case 5: vst4_lane_u8((uint8_t*)(px+4), fVec, 4);
+            case 4: vst4_lane_u8((uint8_t*)(px+3), fVec, 3);
+            case 3: vst4_lane_u8((uint8_t*)(px+2), fVec, 2);
+            case 2: vst4_lane_u8((uint8_t*)(px+1), fVec, 1);
+            case 1: vst4_lane_u8((uint8_t*)(px+0), fVec, 0);
+        }
+    }
+
+    struct Alpha {
+        uint8x8_t fA;
+        Alpha(uint8x8_t a) : fA(a) {}
+
+        static Alpha Dup(uint8_t a) { return vdup_n_u8(a); }
+        static Alpha Load(const uint8_t* a) { return vld1_u8(a); }
+        static Alpha Load(const uint8_t* a, int n) {
+            SkASSERT(0 < n && n < 8);
+            uint8x8_t v = vld1_dup_u8(a);  // n>=1, so start all lanes with alpha 0.
+            switch (n) {
+                case 7: v = vld1_lane_u8(a+6, v, 6);  // fall through
+                case 6: v = vld1_lane_u8(a+5, v, 5);  // fall through
+                case 5: v = vld1_lane_u8(a+4, v, 4);  // fall through
+                case 4: v = vld1_lane_u8(a+3, v, 3);  // fall through
+                case 3: v = vld1_lane_u8(a+2, v, 2);  // fall through
+                case 2: v = vld1_lane_u8(a+1, v, 1);
+            }
+            return v;
+        }
+        Alpha inv() const { return vsub_u8(vdup_n_u8(255), fA); }
+    };
+
+    struct Wide {
+        uint16x8x4_t fVec;
+        Wide(uint16x8x4_t vec) : fVec(vec) {}
+
+        Wide operator+(const Wide& o) const {
+            return (uint16x8x4_t) {{
+                vaddq_u16(fVec.val[0], o.fVec.val[0]),
+                vaddq_u16(fVec.val[1], o.fVec.val[1]),
+                vaddq_u16(fVec.val[2], o.fVec.val[2]),
+                vaddq_u16(fVec.val[3], o.fVec.val[3]),
+            }};
+        }
+        Wide operator-(const Wide& o) const {
+            return (uint16x8x4_t) {{
+                vsubq_u16(fVec.val[0], o.fVec.val[0]),
+                vsubq_u16(fVec.val[1], o.fVec.val[1]),
+                vsubq_u16(fVec.val[2], o.fVec.val[2]),
+                vsubq_u16(fVec.val[3], o.fVec.val[3]),
+            }};
+        }
+
+        template <int bits> Wide shl() const {
+            return (uint16x8x4_t) {{
+                vshlq_n_u16(fVec.val[0], bits),
+                vshlq_n_u16(fVec.val[1], bits),
+                vshlq_n_u16(fVec.val[2], bits),
+                vshlq_n_u16(fVec.val[3], bits),
+            }};
+        }
+        template <int bits> Wide shr() const {
+            return (uint16x8x4_t) {{
+                vshrq_n_u16(fVec.val[0], bits),
+                vshrq_n_u16(fVec.val[1], bits),
+                vshrq_n_u16(fVec.val[2], bits),
+                vshrq_n_u16(fVec.val[3], bits),
+            }};
+        }
+
+        SkPx addNarrowHi(const SkPx& o) const {
+            return (uint8x8x4_t) {{
+                vshrn_n_u16(vaddw_u8(fVec.val[0], o.fVec.val[0]), 8),
+                vshrn_n_u16(vaddw_u8(fVec.val[1], o.fVec.val[1]), 8),
+                vshrn_n_u16(vaddw_u8(fVec.val[2], o.fVec.val[2]), 8),
+                vshrn_n_u16(vaddw_u8(fVec.val[3], o.fVec.val[3]), 8),
+            }};
+        }
+    };
+
+    Alpha alpha() const { return fVec.val[3]; }
+
+    Wide widenLo() const {
+        return (uint16x8x4_t) {{
+            vmovl_u8(fVec.val[0]),
+            vmovl_u8(fVec.val[1]),
+            vmovl_u8(fVec.val[2]),
+            vmovl_u8(fVec.val[3]),
+        }};
+    }
+    // TODO: these two can probably be done faster.
+    Wide widenHi() const { return this->widenLo().shl<8>(); }
+    Wide widenLoHi() const { return this->widenLo() + this->widenHi(); }
+
+    SkPx operator+(const SkPx& o) const {
+        return (uint8x8x4_t) {{
+            vadd_u8(fVec.val[0], o.fVec.val[0]),
+            vadd_u8(fVec.val[1], o.fVec.val[1]),
+            vadd_u8(fVec.val[2], o.fVec.val[2]),
+            vadd_u8(fVec.val[3], o.fVec.val[3]),
+        }};
+    }
+    SkPx operator-(const SkPx& o) const {
+        return (uint8x8x4_t) {{
+            vsub_u8(fVec.val[0], o.fVec.val[0]),
+            vsub_u8(fVec.val[1], o.fVec.val[1]),
+            vsub_u8(fVec.val[2], o.fVec.val[2]),
+            vsub_u8(fVec.val[3], o.fVec.val[3]),
+        }};
+    }
+    SkPx saturatedAdd(const SkPx& o) const {
+        return (uint8x8x4_t) {{
+            vqadd_u8(fVec.val[0], o.fVec.val[0]),
+            vqadd_u8(fVec.val[1], o.fVec.val[1]),
+            vqadd_u8(fVec.val[2], o.fVec.val[2]),
+            vqadd_u8(fVec.val[3], o.fVec.val[3]),
+        }};
+    }
+
+    Wide operator*(const Alpha& a) const {
+        return (uint16x8x4_t) {{
+            vmull_u8(fVec.val[0], a.fA),
+            vmull_u8(fVec.val[1], a.fA),
+            vmull_u8(fVec.val[2], a.fA),
+            vmull_u8(fVec.val[3], a.fA),
+        }};
+    }
+    SkPx approxMulDiv255(const Alpha& a) const {
+        return (*this * a).addNarrowHi(*this);
+    }
+
+    SkPx addAlpha(const Alpha& a) const {
+        return (uint8x8x4_t) {{
+            fVec.val[0],
+            fVec.val[1],
+            fVec.val[2],
+            vadd_u8(fVec.val[3], a.fA),
+        }};
+    }
+};
+
+}  // namespace neon
+
+typedef neon::SkPx SkPx;
+
+#endif//SkPx_neon_DEFINED
diff --git a/gfx/skia/skia/src/opts/SkPx_none.h b/gfx/skia/skia/src/opts/SkPx_none.h
new file mode 100644
index 000000000000..8217eaef3c76
--- /dev/null
+++ b/gfx/skia/skia/src/opts/SkPx_none.h
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPx_none_DEFINED
+#define SkPx_none_DEFINED
+
+// Nothing fancy here.  We're the backup _none case after all.
+// Our declared sweet spot is simply a single pixel at a time.
+
+namespace none {
+
+struct SkPx {
+    static const int N = 1;
+    uint8_t f8[4];
+
+    SkPx(uint32_t px) { memcpy(f8, &px, 4); }
+    SkPx(uint8_t x, uint8_t y, uint8_t z, uint8_t a) {
+        f8[0] = x; f8[1] = y; f8[2] = z; f8[3] = a;
+    }
+
+    static SkPx Dup(uint32_t px) { return px; }
+    static SkPx Load(const uint32_t* px) { return *px; }
+    static SkPx Load(const uint32_t* px, int n) {
+        SkASSERT(false);  // There are no 0<n<1.
+        return 0;
+    }
+
+    void store(uint32_t* px) const { memcpy(px, f8, 4); }
+    void store(uint32_t* px, int n) const {
+        SkASSERT(false);  // There are no 0<n<1.
+    }
+
+    struct Alpha {
+        uint8_t fA;
+        Alpha(uint8_t a) : fA(a) {}
+
+        static Alpha Dup(uint8_t a) { return a; }
+        static Alpha Load(const uint8_t* a) { return *a; }
+        static Alpha Load(const uint8_t* a, int n) {
+            SkASSERT(false);  // There are no 0<n<1.
+            return 0;
+        }
+        Alpha inv() const { return 255 - fA; }
+    };
+
+    struct Wide {
+        uint16_t f16[4];
+
+        Wide(uint16_t x, uint16_t y, uint16_t z, uint16_t a) {
+            f16[0] = x; f16[1] = y; f16[2] = z; f16[3] = a;
+        }
+
+        Wide operator+(const Wide& o) const {
+            return Wide(f16[0]+o.f16[0], f16[1]+o.f16[1], f16[2]+o.f16[2], f16[3]+o.f16[3]);
+        }
+        Wide operator-(const Wide& o) const {
+            return Wide(f16[0]-o.f16[0], f16[1]-o.f16[1], f16[2]-o.f16[2], f16[3]-o.f16[3]);
+        }
+        template <int bits> Wide shl() const {
+            return Wide(f16[0]<<bits, f16[1]<<bits, f16[2]<<bits, f16[3]<<bits);
+        }
+        template <int bits> Wide shr() const {
+            return Wide(f16[0]>>bits, f16[1]>>bits, f16[2]>>bits, f16[3]>>bits);
+        }
+
+        SkPx addNarrowHi(const SkPx& o) const {
+            Wide sum = (*this + o.widenLo()).shr<8>();
+            return SkPx(sum.f16[0], sum.f16[1], sum.f16[2], sum.f16[3]);
+        }
+    };
+
+    Alpha alpha() const { return f8[3]; }
+
+    Wide widenLo() const { return Wide(f8[0], f8[1], f8[2], f8[3]); }
+    Wide widenHi() const { return this->widenLo().shl<8>(); }
+    Wide widenLoHi() const { return this->widenLo() + this->widenHi(); }
+
+    SkPx operator+(const SkPx& o) const {
+        return SkPx(f8[0]+o.f8[0], f8[1]+o.f8[1], f8[2]+o.f8[2], f8[3]+o.f8[3]);
+    }
+    SkPx operator-(const SkPx& o) const {
+        return SkPx(f8[0]-o.f8[0], f8[1]-o.f8[1], f8[2]-o.f8[2], f8[3]-o.f8[3]);
+    }
+    SkPx saturatedAdd(const SkPx& o) const {
+        return SkPx(SkTMax(0, SkTMin(255, f8[0]+o.f8[0])),
+                         SkTMax(0, SkTMin(255, f8[1]+o.f8[1])),
+                         SkTMax(0, SkTMin(255, f8[2]+o.f8[2])),
+                         SkTMax(0, SkTMin(255, f8[3]+o.f8[3])));
+    }
+
+    Wide operator*(const Alpha& a) const {
+        return Wide(f8[0]*a.fA, f8[1]*a.fA, f8[2]*a.fA, f8[3]*a.fA);
+    }
+    SkPx approxMulDiv255(const Alpha& a) const {
+        return (*this * a).addNarrowHi(*this);
+    }
+
+    SkPx addAlpha(const Alpha& a) const {
+        return SkPx(f8[0], f8[1], f8[2], f8[3]+a.fA);
+    }
+};
+
+}  // namespace none
+
+typedef none::SkPx SkPx;
+
+#endif//SkPx_none_DEFINED
diff --git a/gfx/skia/skia/src/opts/SkPx_sse.h b/gfx/skia/skia/src/opts/SkPx_sse.h
new file mode 100644
index 000000000000..2560946edb94
--- /dev/null
+++ b/gfx/skia/skia/src/opts/SkPx_sse.h
@@ -0,0 +1,155 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPx_sse_DEFINED
+#define SkPx_sse_DEFINED
+
+// sse::SkPx's sweet spot is to work with 4 pixels at a time,
+// stored interlaced, just as they sit in memory: rgba rgba rgba rgba.
+
+// sse::SkPx's best way to work with alphas is similar,
+// replicating the 4 alphas 4 times each across the pixel: aaaa aaaa aaaa aaaa.
+
+// When working with fewer than 4 pixels, we load the pixels in the low lanes,
+// usually filling the top lanes with zeros (but who cares, might be junk).
+
+namespace sse {
+
+struct SkPx {
+    static const int N = 4;
+
+    __m128i fVec;
+    SkPx(__m128i vec) : fVec(vec) {}
+
+    static SkPx Dup(uint32_t px) { return _mm_set1_epi32(px); }
+    static SkPx Load(const uint32_t* px) { return _mm_loadu_si128((const __m128i*)px); }
+    static SkPx Load(const uint32_t* px, int n) {
+        SkASSERT(n > 0 && n < 4);
+        switch (n) {
+            case 1: return _mm_cvtsi32_si128(px[0]);
+            case 2: return _mm_loadl_epi64((const __m128i*)px);
+            case 3: return _mm_or_si128(_mm_loadl_epi64((const __m128i*)px),
+                                        _mm_slli_si128(_mm_cvtsi32_si128(px[2]), 8));
+        }
+        return _mm_setzero_si128();  // Not actually reachable.
+    }
+
+    void store(uint32_t* px) const { _mm_storeu_si128((__m128i*)px, fVec); }
+    void store(uint32_t* px, int n) const {
+        SkASSERT(n > 0 && n < 4);
+        __m128i v = fVec;
+        if (n & 1) {
+            *px++ = _mm_cvtsi128_si32(v);
+            v = _mm_srli_si128(v, 4);
+        }
+        if (n & 2) {
+            _mm_storel_epi64((__m128i*)px, v);
+        }
+    }
+
+    struct Alpha {
+        __m128i fVec;
+        Alpha(__m128i vec) : fVec(vec) {}
+
+        static Alpha Dup(uint8_t a) { return _mm_set1_epi8(a); }
+        static Alpha Load(const uint8_t* a) {
+            __m128i as = _mm_cvtsi32_si128(*(const uint32_t*)a);    // ____ ____ ____ 3210
+        #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSSE3
+            return _mm_shuffle_epi8(as, _mm_set_epi8(3,3,3,3, 2,2,2,2, 1,1,1,1, 0,0,0,0));
+        #else
+            as = _mm_unpacklo_epi8 (as, as);                        // ____ ____ 3322 1100
+            as = _mm_unpacklo_epi16(as, as);                        // 3333 2222 1111 0000
+            return as;
+        #endif
+        }
+        static Alpha Load(const uint8_t* a, int n) {
+            SkASSERT(n > 0 && n < 4);
+            uint8_t a4[] = { 0,0,0,0 };
+            switch (n) {
+                case 3: a4[2] = a[2];  // fall through
+                case 2: a4[1] = a[1];  // fall through
+                case 1: a4[0] = a[0];
+            }
+            return Load(a4);
+        }
+
+        Alpha inv() const { return _mm_sub_epi8(_mm_set1_epi8(~0), fVec); }
+    };
+
+    struct Wide {
+        __m128i fLo, fHi;
+        Wide(__m128i lo, __m128i hi) : fLo(lo), fHi(hi) {}
+
+        Wide operator+(const Wide& o) const {
+            return Wide(_mm_add_epi16(fLo, o.fLo), _mm_add_epi16(fHi, o.fHi));
+        }
+        Wide operator-(const Wide& o) const {
+            return Wide(_mm_sub_epi16(fLo, o.fLo), _mm_sub_epi16(fHi, o.fHi));
+        }
+        template <int bits> Wide shl() const {
+            return Wide(_mm_slli_epi16(fLo, bits), _mm_slli_epi16(fHi, bits));
+        }
+        template <int bits> Wide shr() const {
+            return Wide(_mm_srli_epi16(fLo, bits), _mm_srli_epi16(fHi, bits));
+        }
+
+        SkPx addNarrowHi(const SkPx& o) const {
+            Wide sum = (*this + o.widenLo()).shr<8>();
+            return _mm_packus_epi16(sum.fLo, sum.fHi);
+        }
+    };
+
+    Alpha alpha() const {
+    #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSSE3
+        return _mm_shuffle_epi8(fVec, _mm_set_epi8(15,15,15,15, 11,11,11,11, 7,7,7,7, 3,3,3,3));
+    #else
+        // We exploit that A >= rgb for any premul pixel.
+        __m128i as = fVec;                             // 3xxx 2xxx 1xxx 0xxx
+        as = _mm_max_epu8(as, _mm_srli_epi32(as,  8)); // 33xx 22xx 11xx 00xx
+        as = _mm_max_epu8(as, _mm_srli_epi32(as, 16)); // 3333 2222 1111 0000
+        return as;
+    #endif
+    }
+
+    Wide widenLo() const {
+        return Wide(_mm_unpacklo_epi8(fVec, _mm_setzero_si128()),
+                    _mm_unpackhi_epi8(fVec, _mm_setzero_si128()));
+    }
+    Wide widenHi() const {
+        return Wide(_mm_unpacklo_epi8(_mm_setzero_si128(), fVec),
+                    _mm_unpackhi_epi8(_mm_setzero_si128(), fVec));
+    }
+    Wide widenLoHi() const {
+        return Wide(_mm_unpacklo_epi8(fVec, fVec),
+                    _mm_unpackhi_epi8(fVec, fVec));
+    }
+
+    SkPx    operator+(const SkPx& o) const { return _mm_add_epi8(fVec, o.fVec); }
+    SkPx    operator-(const SkPx& o) const { return _mm_sub_epi8(fVec, o.fVec); }
+    SkPx saturatedAdd(const SkPx& o) const { return _mm_adds_epi8(fVec, o.fVec); }
+
+    Wide operator*(const Alpha& a) const {
+        __m128i pLo = _mm_unpacklo_epi8(  fVec, _mm_setzero_si128()),
+                aLo = _mm_unpacklo_epi8(a.fVec, _mm_setzero_si128()),
+                pHi = _mm_unpackhi_epi8(  fVec, _mm_setzero_si128()),
+                aHi = _mm_unpackhi_epi8(a.fVec, _mm_setzero_si128());
+        return Wide(_mm_mullo_epi16(pLo, aLo), _mm_mullo_epi16(pHi, aHi));
+    }
+    SkPx approxMulDiv255(const Alpha& a) const {
+        return (*this * a).addNarrowHi(*this);
+    }
+
+    SkPx addAlpha(const Alpha& a) const {
+        return _mm_add_epi8(fVec, _mm_and_si128(a.fVec, _mm_set1_epi32(0xFF000000)));
+    }
+};
+
+}  // namespace sse
+
+typedef sse::SkPx SkPx;
+
+#endif//SkPx_sse_DEFINED
diff --git a/gfx/skia/skia/src/opts/SkTextureCompression_opts.h b/gfx/skia/skia/src/opts/SkTextureCompression_opts.h
deleted file mode 100644
index e618280835ea..000000000000
--- a/gfx/skia/skia/src/opts/SkTextureCompression_opts.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2014
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkTextureCompression_opts_DEFINED
-#define SkTextureCompression_opts_DEFINED
-
-#include "SkTextureCompressor.h"
-#include "SkImageInfo.h"
-
-SkTextureCompressor::CompressionProc
-SkTextureCompressorGetPlatformProc(SkColorType colorType, SkTextureCompressor::Format fmt);
-
-#endif  // SkTextureCompression_opts_DEFINED
diff --git a/gfx/skia/skia/src/opts/SkTextureCompression_opts_arm.cpp b/gfx/skia/skia/src/opts/SkTextureCompression_opts_arm.cpp
deleted file mode 100644
index 3a97a5ed9a16..000000000000
--- a/gfx/skia/skia/src/opts/SkTextureCompression_opts_arm.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkTextureCompression_opts.h"
-#include "SkTextureCompression_opts_neon.h"
-#include "SkUtilsArm.h"
-
-SkTextureCompressor::CompressionProc
-SkTextureCompressorGetPlatformProc(SkColorType colorType, SkTextureCompressor::Format fmt) {
-#if SK_ARM_NEON_IS_NONE
-    return NULL;
-#else
-#if SK_ARM_NEON_IS_DYNAMIC
-    if (!sk_cpu_arm_has_neon()) {
-        return NULL;
-    }
-#endif
-    switch (colorType) {
-        case kAlpha_8_SkColorType:
-        {
-            switch (fmt) {
-                case SkTextureCompressor::kR11_EAC_Format:
-                    return CompressA8toR11EAC_NEON;
-                default:
-                    return NULL;
-            }
-        }
-        break;
-
-        default:
-            return NULL;
-    }
-#endif
-}
diff --git a/gfx/skia/skia/src/opts/SkTextureCompression_opts_neon.cpp b/gfx/skia/skia/src/opts/SkTextureCompression_opts_neon.cpp
deleted file mode 100644
index bd7469b84ced..000000000000
--- a/gfx/skia/skia/src/opts/SkTextureCompression_opts_neon.cpp
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Copyright 2014
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkTextureCompressor.h"
-#include "SkTextureCompression_opts.h"
-
-#include <arm_neon.h>
-
-// Converts indices in each of the four bits of the register from
-// 0, 1, 2, 3, 4, 5, 6, 7
-// to
-// 3, 2, 1, 0, 4, 5, 6, 7
-//
-// A more detailed explanation can be found in SkTextureCompressor::convert_indices
-static inline uint8x16_t convert_indices(const uint8x16_t &x) {
-    static const int8x16_t kThree = {
-        0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
-        0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
-    };
-
-    static const int8x16_t kZero = {
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    };
-    
-    // Take top three bits
-    int8x16_t sx = vreinterpretq_s8_u8(x);
-
-    // Negate ...
-    sx = vnegq_s8(sx);
-
-    // Add three...
-    sx = vaddq_s8(sx, kThree);
-
-    // Generate negatives mask
-    const int8x16_t mask = vreinterpretq_s8_u8(vcltq_s8(sx, kZero));
-
-    // Absolute value
-    sx = vabsq_s8(sx);
-
-    // Add three to the values that were negative...
-    return vreinterpretq_u8_s8(vaddq_s8(sx, vandq_s8(mask, kThree)));
-}
-
-template<unsigned shift>
-static inline uint64x2_t shift_swap(const uint64x2_t &x, const uint64x2_t &mask) {
-    uint64x2_t t = vandq_u64(mask, veorq_u64(x, vshrq_n_u64(x, shift)));
-    return veorq_u64(x, veorq_u64(t, vshlq_n_u64(t, shift)));
-}
-
-static inline uint64x2_t pack_indices(const uint64x2_t &x) {
-    // x: 00 a e 00 b f 00 c g 00 d h 00 i m 00 j n 00 k o 00 l p
-
-    static const uint64x2_t kMask1 = { 0x3FC0003FC00000ULL, 0x3FC0003FC00000ULL };
-    uint64x2_t ret = shift_swap<10>(x, kMask1);
-
-    // x: b f 00 00 00 a e c g i m 00 00 00 d h j n 00 k o 00 l p
-    static const uint64x2_t kMask2 = { (0x3FULL << 52), (0x3FULL << 52) };
-    static const uint64x2_t kMask3 = { (0x3FULL << 28), (0x3FULL << 28) };
-    const uint64x2_t x1 = vandq_u64(vshlq_n_u64(ret, 52), kMask2);
-    const uint64x2_t x2 = vandq_u64(vshlq_n_u64(ret, 20), kMask3);
-    ret = vshrq_n_u64(vorrq_u64(ret, vorrq_u64(x1, x2)), 16);
-
-    // x: 00 00 00 00 00 00 00 00 b f l p a e c g i m k o d h j n
-
-    static const uint64x2_t kMask4 = { 0xFC0000ULL, 0xFC0000ULL };
-    ret = shift_swap<6>(ret, kMask4);
-
-#if defined (SK_CPU_BENDIAN)
-    // x: 00 00 00 00 00 00 00 00 b f l p a e i m c g k o d h j n
-
-    static const uint64x2_t kMask5 = { 0x3FULL, 0x3FULL };
-    ret = shift_swap<36>(ret, kMask5);
-
-    // x: 00 00 00 00 00 00 00 00 b f j n a e i m c g k o d h l p
-
-    static const uint64x2_t kMask6 = { 0xFFF000000ULL, 0xFFF000000ULL };
-    ret = shift_swap<12>(ret, kMask6);
-#else
-    // x: 00 00 00 00 00 00 00 00 c g i m d h l p b f j n a e k o
-
-    static const uint64x2_t kMask5 = { 0xFC0ULL, 0xFC0ULL };
-    ret = shift_swap<36>(ret, kMask5);
-
-    // x: 00 00 00 00 00 00 00 00 a e i m d h l p b f j n c g k o
-
-    static const uint64x2_t kMask6 = { (0xFFFULL << 36), (0xFFFULL << 36) };
-    static const uint64x2_t kMask7 = { 0xFFFFFFULL, 0xFFFFFFULL };
-    static const uint64x2_t kMask8 = { 0xFFFULL, 0xFFFULL };
-    const uint64x2_t y1 = vandq_u64(ret, kMask6);
-    const uint64x2_t y2 = vshlq_n_u64(vandq_u64(ret, kMask7), 12);
-    const uint64x2_t y3 = vandq_u64(vshrq_n_u64(ret, 24), kMask8);
-    ret = vorrq_u64(y1, vorrq_u64(y2, y3));
-#endif
-
-    // x: 00 00 00 00 00 00 00 00 a e i m b f j n c g k o d h l p
-
-    // Set the header
-    static const uint64x2_t kHeader = { 0x8490000000000000ULL, 0x8490000000000000ULL };
-    return vorrq_u64(kHeader, ret);
-}
-
-// Takes a row of alpha values and places the most significant three bits of each byte into
-// the least significant bits of the same byte
-static inline uint8x16_t make_index_row(const uint8x16_t &x) {
-    static const uint8x16_t kTopThreeMask = {
-        0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0,
-        0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0,
-    };
-    return vshrq_n_u8(vandq_u8(x, kTopThreeMask), 5);
-}
-
-// Returns true if all of the bits in x are 0.
-static inline bool is_zero(uint8x16_t x) {
-// First experiments say that this is way slower than just examining the lanes
-// but it might need a little more investigation.
-#if 0
-    // This code path tests the system register for overflow. We trigger
-    // overflow by adding x to a register with all of its bits set. The
-    // first instruction sets the bits.
-    int reg;
-    asm ("VTST.8   %%q0, %q1, %q1\n"
-         "VQADD.u8 %q1, %%q0\n"
-         "VMRS     %0, FPSCR\n"
-         : "=r"(reg) : "w"(vreinterpretq_f32_u8(x)) : "q0", "q1");
-
-    // Bit 21 corresponds to the overflow flag.
-    return reg & (0x1 << 21);
-#else
-    const uint64x2_t cvt = vreinterpretq_u64_u8(x);
-    const uint64_t l1 = vgetq_lane_u64(cvt, 0);
-    return (l1 == 0) && (l1 == vgetq_lane_u64(cvt, 1));
-#endif
-}
-
-#if defined (SK_CPU_BENDIAN)
-static inline uint64x2_t fix_endianness(uint64x2_t x) {
-    return x;
-}
-#else
-static inline uint64x2_t fix_endianness(uint64x2_t x) {
-    return vreinterpretq_u64_u8(vrev64q_u8(vreinterpretq_u8_u64(x)));
-}
-#endif
-
-static void compress_r11eac_blocks(uint64_t* dst, const uint8_t* src, int rowBytes) {
-
-    // Try to avoid switching between vector and non-vector ops...
-    const uint8_t *const src1 = src;
-    const uint8_t *const src2 = src + rowBytes;
-    const uint8_t *const src3 = src + 2*rowBytes;
-    const uint8_t *const src4 = src + 3*rowBytes;
-    uint64_t *const dst1 = dst;
-    uint64_t *const dst2 = dst + 2;
-
-    const uint8x16_t alphaRow1 = vld1q_u8(src1);
-    const uint8x16_t alphaRow2 = vld1q_u8(src2);
-    const uint8x16_t alphaRow3 = vld1q_u8(src3);
-    const uint8x16_t alphaRow4 = vld1q_u8(src4);
-
-    const uint8x16_t cmp12 = vceqq_u8(alphaRow1, alphaRow2);
-    const uint8x16_t cmp34 = vceqq_u8(alphaRow3, alphaRow4);
-    const uint8x16_t cmp13 = vceqq_u8(alphaRow1, alphaRow3);
-
-    const uint8x16_t cmp = vandq_u8(vandq_u8(cmp12, cmp34), cmp13);
-    const uint8x16_t ncmp = vmvnq_u8(cmp);
-    const uint8x16_t nAlphaRow1 = vmvnq_u8(alphaRow1);
-    if (is_zero(ncmp)) {
-        if (is_zero(alphaRow1)) {
-            static const uint64x2_t kTransparent = { 0x0020000000002000ULL,
-                                                     0x0020000000002000ULL };
-            vst1q_u64(dst1, kTransparent);
-            vst1q_u64(dst2, kTransparent);
-            return;
-        } else if (is_zero(nAlphaRow1)) {
-            vst1q_u64(dst1, vreinterpretq_u64_u8(cmp));
-            vst1q_u64(dst2, vreinterpretq_u64_u8(cmp));
-            return;
-        }
-    }
-
-    const uint8x16_t indexRow1 = convert_indices(make_index_row(alphaRow1));
-    const uint8x16_t indexRow2 = convert_indices(make_index_row(alphaRow2));
-    const uint8x16_t indexRow3 = convert_indices(make_index_row(alphaRow3));
-    const uint8x16_t indexRow4 = convert_indices(make_index_row(alphaRow4));
-
-    const uint64x2_t indexRow12 = vreinterpretq_u64_u8(
-        vorrq_u8(vshlq_n_u8(indexRow1, 3), indexRow2));
-    const uint64x2_t indexRow34 = vreinterpretq_u64_u8(
-        vorrq_u8(vshlq_n_u8(indexRow3, 3), indexRow4));
-
-    const uint32x4x2_t blockIndices = vtrnq_u32(vreinterpretq_u32_u64(indexRow12),
-                                                vreinterpretq_u32_u64(indexRow34));
-    const uint64x2_t blockIndicesLeft = vreinterpretq_u64_u32(vrev64q_u32(blockIndices.val[0]));
-    const uint64x2_t blockIndicesRight = vreinterpretq_u64_u32(vrev64q_u32(blockIndices.val[1]));
-
-    const uint64x2_t indicesLeft = fix_endianness(pack_indices(blockIndicesLeft));
-    const uint64x2_t indicesRight = fix_endianness(pack_indices(blockIndicesRight));
-
-    const uint64x2_t d1 = vcombine_u64(vget_low_u64(indicesLeft), vget_low_u64(indicesRight));
-    const uint64x2_t d2 = vcombine_u64(vget_high_u64(indicesLeft), vget_high_u64(indicesRight));
-    vst1q_u64(dst1, d1);
-    vst1q_u64(dst2, d2);
-}
-
-bool CompressA8toR11EAC_NEON(uint8_t* dst, const uint8_t* src,
-                             int width, int height, int rowBytes) {
-
-    // Since we're going to operate on 4 blocks at a time, the src width
-    // must be a multiple of 16. However, the height only needs to be a
-    // multiple of 4
-    if (0 == width || 0 == height || (width % 16) != 0 || (height % 4) != 0) {
-        return SkTextureCompressor::CompressBufferToFormat(
-            dst, src,
-            kAlpha_8_SkColorType,
-            width, height, rowBytes,
-            SkTextureCompressor::kR11_EAC_Format, false);
-    }
-
-    const int blocksX = width >> 2;
-    const int blocksY = height >> 2;
-
-    SkASSERT((blocksX % 4) == 0);
-
-    uint64_t* encPtr = reinterpret_cast<uint64_t*>(dst);
-    for (int y = 0; y < blocksY; ++y) {
-        for (int x = 0; x < blocksX; x+=4) {
-            // Compress it
-            compress_r11eac_blocks(encPtr, src + 4*x, rowBytes);
-            encPtr += 4;
-        }
-        src += 4 * rowBytes;
-    }
-    return true;
-}
diff --git a/gfx/skia/skia/src/opts/SkTextureCompression_opts_neon.h b/gfx/skia/skia/src/opts/SkTextureCompression_opts_neon.h
deleted file mode 100644
index dd5e75df57d5..000000000000
--- a/gfx/skia/skia/src/opts/SkTextureCompression_opts_neon.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright 2014 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkTextureCompression_opts_neon_h_
-#define SkTextureCompression_opts_neon_h_
-
-bool CompressA8toR11EAC_NEON(uint8_t* dst, const uint8_t* src,
-                             int width, int height, int rowBytes);
-
-#endif  // SkTextureCompression_opts_neon_h_
diff --git a/gfx/skia/skia/src/opts/SkTextureCompression_opts_none.cpp b/gfx/skia/skia/src/opts/SkTextureCompression_opts_none.cpp
deleted file mode 100644
index f86fbf5f297a..000000000000
--- a/gfx/skia/skia/src/opts/SkTextureCompression_opts_none.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2014
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkTextureCompression_opts.h"
-
-SkTextureCompressor::CompressionProc
-SkTextureCompressorGetPlatformProc(SkColorType colorType, SkTextureCompressor::Format fmt) {
-    return NULL;
-}
diff --git a/gfx/skia/skia/src/opts/SkTextureCompressor_opts.h b/gfx/skia/skia/src/opts/SkTextureCompressor_opts.h
new file mode 100644
index 000000000000..4fd123cef5ed
--- /dev/null
+++ b/gfx/skia/skia/src/opts/SkTextureCompressor_opts.h
@@ -0,0 +1,267 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkTextureCompressor_opts_DEFINED
+#define SkTextureCompressor_opts_DEFINED
+
+#include "SkOpts.h"
+
+namespace SK_OPTS_NS {
+
+#if defined(SK_ARM_HAS_NEON)
+    // Converts indices in each of the four bits of the register from
+    // 0, 1, 2, 3, 4, 5, 6, 7
+    // to
+    // 3, 2, 1, 0, 4, 5, 6, 7
+    //
+    // A more detailed explanation can be found in SkTextureCompressor::convert_indices
+    static inline uint8x16_t convert_indices(const uint8x16_t &x) {
+        static const int8x16_t kThree = {
+            0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+            0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+        };
+
+        static const int8x16_t kZero = {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        };
+
+        // Take top three bits
+        int8x16_t sx = vreinterpretq_s8_u8(x);
+
+        // Negate ...
+        sx = vnegq_s8(sx);
+
+        // Add three...
+        sx = vaddq_s8(sx, kThree);
+
+        // Generate negatives mask
+        const int8x16_t mask = vreinterpretq_s8_u8(vcltq_s8(sx, kZero));
+
+        // Absolute value
+        sx = vabsq_s8(sx);
+
+        // Add three to the values that were negative...
+        return vreinterpretq_u8_s8(vaddq_s8(sx, vandq_s8(mask, kThree)));
+    }
+
+    template<unsigned shift>
+    static inline uint64x2_t shift_swap(const uint64x2_t &x, const uint64x2_t &mask) {
+        uint64x2_t t = vandq_u64(mask, veorq_u64(x, vshrq_n_u64(x, shift)));
+        return veorq_u64(x, veorq_u64(t, vshlq_n_u64(t, shift)));
+    }
+
+    static inline uint64x2_t pack_indices(const uint64x2_t &x) {
+        // x: 00 a e 00 b f 00 c g 00 d h 00 i m 00 j n 00 k o 00 l p
+
+        static const uint64x2_t kMask1 = { 0x3FC0003FC00000ULL, 0x3FC0003FC00000ULL };
+        uint64x2_t ret = shift_swap<10>(x, kMask1);
+
+        // x: b f 00 00 00 a e c g i m 00 00 00 d h j n 00 k o 00 l p
+        static const uint64x2_t kMask2 = { (0x3FULL << 52), (0x3FULL << 52) };
+        static const uint64x2_t kMask3 = { (0x3FULL << 28), (0x3FULL << 28) };
+        const uint64x2_t x1 = vandq_u64(vshlq_n_u64(ret, 52), kMask2);
+        const uint64x2_t x2 = vandq_u64(vshlq_n_u64(ret, 20), kMask3);
+        ret = vshrq_n_u64(vorrq_u64(ret, vorrq_u64(x1, x2)), 16);
+
+        // x: 00 00 00 00 00 00 00 00 b f l p a e c g i m k o d h j n
+
+        static const uint64x2_t kMask4 = { 0xFC0000ULL, 0xFC0000ULL };
+        ret = shift_swap<6>(ret, kMask4);
+
+    #if defined (SK_CPU_BENDIAN)
+        // x: 00 00 00 00 00 00 00 00 b f l p a e i m c g k o d h j n
+
+        static const uint64x2_t kMask5 = { 0x3FULL, 0x3FULL };
+        ret = shift_swap<36>(ret, kMask5);
+
+        // x: 00 00 00 00 00 00 00 00 b f j n a e i m c g k o d h l p
+
+        static const uint64x2_t kMask6 = { 0xFFF000000ULL, 0xFFF000000ULL };
+        ret = shift_swap<12>(ret, kMask6);
+    #else
+        // x: 00 00 00 00 00 00 00 00 c g i m d h l p b f j n a e k o
+
+        static const uint64x2_t kMask5 = { 0xFC0ULL, 0xFC0ULL };
+        ret = shift_swap<36>(ret, kMask5);
+
+        // x: 00 00 00 00 00 00 00 00 a e i m d h l p b f j n c g k o
+
+        static const uint64x2_t kMask6 = { (0xFFFULL << 36), (0xFFFULL << 36) };
+        static const uint64x2_t kMask7 = { 0xFFFFFFULL, 0xFFFFFFULL };
+        static const uint64x2_t kMask8 = { 0xFFFULL, 0xFFFULL };
+        const uint64x2_t y1 = vandq_u64(ret, kMask6);
+        const uint64x2_t y2 = vshlq_n_u64(vandq_u64(ret, kMask7), 12);
+        const uint64x2_t y3 = vandq_u64(vshrq_n_u64(ret, 24), kMask8);
+        ret = vorrq_u64(y1, vorrq_u64(y2, y3));
+    #endif
+
+        // x: 00 00 00 00 00 00 00 00 a e i m b f j n c g k o d h l p
+
+        // Set the header
+        static const uint64x2_t kHeader = { 0x8490000000000000ULL, 0x8490000000000000ULL };
+        return vorrq_u64(kHeader, ret);
+    }
+
+    // Takes a row of alpha values and places the most significant three bits of each byte into
+    // the least significant bits of the same byte
+    static inline uint8x16_t make_index_row(const uint8x16_t &x) {
+        static const uint8x16_t kTopThreeMask = {
+            0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0,
+            0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0,
+        };
+        return vshrq_n_u8(vandq_u8(x, kTopThreeMask), 5);
+    }
+
+    // Returns true if all of the bits in x are 0.
+    static inline bool is_zero(uint8x16_t x) {
+    // First experiments say that this is way slower than just examining the lanes
+    // but it might need a little more investigation.
+    #if 0
+        // This code path tests the system register for overflow. We trigger
+        // overflow by adding x to a register with all of its bits set. The
+        // first instruction sets the bits.
+        int reg;
+        asm ("VTST.8   %%q0, %q1, %q1\n"
+             "VQADD.u8 %q1, %%q0\n"
+             "VMRS     %0, FPSCR\n"
+             : "=r"(reg) : "w"(vreinterpretq_f32_u8(x)) : "q0", "q1");
+
+        // Bit 21 corresponds to the overflow flag.
+        return reg & (0x1 << 21);
+    #else
+        const uint64x2_t cvt = vreinterpretq_u64_u8(x);
+        const uint64_t l1 = vgetq_lane_u64(cvt, 0);
+        return (l1 == 0) && (l1 == vgetq_lane_u64(cvt, 1));
+    #endif
+    }
+
+    #if defined (SK_CPU_BENDIAN)
+    static inline uint64x2_t fix_endianness(uint64x2_t x) {
+        return x;
+    }
+    #else
+    static inline uint64x2_t fix_endianness(uint64x2_t x) {
+        return vreinterpretq_u64_u8(vrev64q_u8(vreinterpretq_u8_u64(x)));
+    }
+    #endif
+
+    static void compress_r11eac_blocks(uint64_t* dst, const uint8_t* src, size_t rowBytes) {
+        // Try to avoid switching between vector and non-vector ops...
+        const uint8_t *const src1 = src;
+        const uint8_t *const src2 = src + rowBytes;
+        const uint8_t *const src3 = src + 2*rowBytes;
+        const uint8_t *const src4 = src + 3*rowBytes;
+        uint64_t *const dst1 = dst;
+        uint64_t *const dst2 = dst + 2;
+
+        const uint8x16_t alphaRow1 = vld1q_u8(src1);
+        const uint8x16_t alphaRow2 = vld1q_u8(src2);
+        const uint8x16_t alphaRow3 = vld1q_u8(src3);
+        const uint8x16_t alphaRow4 = vld1q_u8(src4);
+
+        const uint8x16_t cmp12 = vceqq_u8(alphaRow1, alphaRow2);
+        const uint8x16_t cmp34 = vceqq_u8(alphaRow3, alphaRow4);
+        const uint8x16_t cmp13 = vceqq_u8(alphaRow1, alphaRow3);
+
+        const uint8x16_t cmp = vandq_u8(vandq_u8(cmp12, cmp34), cmp13);
+        const uint8x16_t ncmp = vmvnq_u8(cmp);
+        const uint8x16_t nAlphaRow1 = vmvnq_u8(alphaRow1);
+        if (is_zero(ncmp)) {
+            if (is_zero(alphaRow1)) {
+                static const uint64x2_t kTransparent = { 0x0020000000002000ULL,
+                                                         0x0020000000002000ULL };
+                vst1q_u64(dst1, kTransparent);
+                vst1q_u64(dst2, kTransparent);
+                return;
+            } else if (is_zero(nAlphaRow1)) {
+                vst1q_u64(dst1, vreinterpretq_u64_u8(cmp));
+                vst1q_u64(dst2, vreinterpretq_u64_u8(cmp));
+                return;
+            }
+        }
+
+        const uint8x16_t indexRow1 = convert_indices(make_index_row(alphaRow1));
+        const uint8x16_t indexRow2 = convert_indices(make_index_row(alphaRow2));
+        const uint8x16_t indexRow3 = convert_indices(make_index_row(alphaRow3));
+        const uint8x16_t indexRow4 = convert_indices(make_index_row(alphaRow4));
+
+        const uint64x2_t indexRow12 = vreinterpretq_u64_u8(
+            vorrq_u8(vshlq_n_u8(indexRow1, 3), indexRow2));
+        const uint64x2_t indexRow34 = vreinterpretq_u64_u8(
+            vorrq_u8(vshlq_n_u8(indexRow3, 3), indexRow4));
+
+        const uint32x4x2_t blockIndices = vtrnq_u32(vreinterpretq_u32_u64(indexRow12),
+                                                    vreinterpretq_u32_u64(indexRow34));
+        const uint64x2_t blockIndicesLeft = vreinterpretq_u64_u32(vrev64q_u32(blockIndices.val[0]));
+        const uint64x2_t blockIndicesRight = vreinterpretq_u64_u32(vrev64q_u32(blockIndices.val[1]));
+
+        const uint64x2_t indicesLeft = fix_endianness(pack_indices(blockIndicesLeft));
+        const uint64x2_t indicesRight = fix_endianness(pack_indices(blockIndicesRight));
+
+        const uint64x2_t d1 = vcombine_u64(vget_low_u64(indicesLeft), vget_low_u64(indicesRight));
+        const uint64x2_t d2 = vcombine_u64(vget_high_u64(indicesLeft), vget_high_u64(indicesRight));
+        vst1q_u64(dst1, d1);
+        vst1q_u64(dst2, d2);
+    }
+
+    static bool compress_a8_r11eac(uint8_t* dst, const uint8_t* src,
+                                   int width, int height, size_t rowBytes) {
+
+        // Since we're going to operate on 4 blocks at a time, the src width
+        // must be a multiple of 16. However, the height only needs to be a
+        // multiple of 4
+        if (0 == width || 0 == height || (width % 16) != 0 || (height % 4) != 0) {
+            return false;
+        }
+
+        const int blocksX = width >> 2;
+        const int blocksY = height >> 2;
+
+        SkASSERT((blocksX % 4) == 0);
+
+        uint64_t* encPtr = reinterpret_cast<uint64_t*>(dst);
+        for (int y = 0; y < blocksY; ++y) {
+            for (int x = 0; x < blocksX; x+=4) {
+                // Compress it
+                compress_r11eac_blocks(encPtr, src + 4*x, rowBytes);
+                encPtr += 4;
+            }
+            src += 4 * rowBytes;
+        }
+        return true;
+    }
+
+    static SkOpts::TextureCompressor texture_compressor(SkColorType ct,
+                                                        SkTextureCompressor::Format fmt) {
+        if (ct == kAlpha_8_SkColorType && fmt == SkTextureCompressor::kR11_EAC_Format) {
+            return compress_a8_r11eac;
+        }
+        return nullptr;
+    }
+    static bool fill_block_dimensions(SkTextureCompressor::Format fmt, int* x, int* y) {
+        if (fmt == SkTextureCompressor::kR11_EAC_Format) {
+            *x = 16;
+            *y = 4;
+            return true;
+        }
+        return false;
+    }
+
+#else
+    static SkOpts::TextureCompressor texture_compressor(SkColorType, SkTextureCompressor::Format) {
+        return nullptr;
+    }
+    static bool fill_block_dimensions(SkTextureCompressor::Format, int*, int*) {
+        return false;
+    }
+
+#endif
+
+}  // namespace SK_OPTS_NS
+
+#endif//SkTextureCompressor_opts_DEFINED
diff --git a/gfx/skia/skia/src/opts/SkUtils_opts.h b/gfx/skia/skia/src/opts/SkUtils_opts.h
new file mode 100644
index 000000000000..44fe643276cb
--- /dev/null
+++ b/gfx/skia/skia/src/opts/SkUtils_opts.h
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkUtils_opts_DEFINED
+#define SkUtils_opts_DEFINED
+
+namespace SK_OPTS_NS {
+
+#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
+
+static void memset16(uint16_t* dst, uint16_t val, int n) {
+    auto dst8 = (__m128i*)dst;
+    auto val8 = _mm_set1_epi16(val);
+    for ( ; n >= 8; n -= 8) {
+        _mm_storeu_si128(dst8++, val8);
+    }
+    dst = (uint16_t*)dst8;
+    if (n & 4) {
+        _mm_storel_epi64((__m128i*)dst, val8);
+        dst += 4;
+    }
+    if (n & 2) {
+        *(uint32_t*)dst = _mm_cvtsi128_si32(val8);
+        dst += 2;
+    }
+    if (n & 1) {
+        *dst = val;
+    }
+}
+
+static void memset32(uint32_t* dst, uint32_t val, int n) {
+    auto dst4 = (__m128i*)dst;
+    auto val4 = _mm_set1_epi32(val);
+    for ( ; n >= 4; n -= 4) {
+        _mm_storeu_si128(dst4++, val4);
+    }
+    dst = (uint32_t*)dst4;
+    if (n & 2) {
+        _mm_storel_epi64((__m128i*)dst, val4);
+        dst += 2;
+    }
+    if (n & 1) {
+        *dst = val;
+    }
+}
+
+#elif defined(SK_ARM_HAS_NEON)
+
+static void memset16(uint16_t* dst, uint16_t value, int n) {
+    uint16x8_t   v8  = vdupq_n_u16(value);
+    uint16x8x4_t v32 = {{ v8, v8, v8, v8 }};
+
+    while (n >= 32) {
+        vst4q_u16(dst, v32);  // This swizzles, but we don't care: all lanes are the same, value.
+        dst += 32;
+        n   -= 32;
+    }
+    switch (n / 8) {
+        case 3: vst1q_u16(dst, v8); dst += 8;
+        case 2: vst1q_u16(dst, v8); dst += 8;
+        case 1: vst1q_u16(dst, v8); dst += 8;
+    }
+    if (n & 4) {
+        vst1_u16(dst, vget_low_u16(v8));
+        dst += 4;
+    }
+    switch (n & 3) {
+        case 3: *dst++ = value;
+        case 2: *dst++ = value;
+        case 1: *dst   = value;
+    }
+}
+
+static void memset32(uint32_t* dst, uint32_t value, int n) {
+    uint32x4_t   v4  = vdupq_n_u32(value);
+    uint32x4x4_t v16 = {{ v4, v4, v4, v4 }};
+
+    while (n >= 16) {
+        vst4q_u32(dst, v16);  // This swizzles, but we don't care: all lanes are the same, value.
+        dst += 16;
+        n   -= 16;
+    }
+    switch (n / 4) {
+        case 3: vst1q_u32(dst, v4); dst += 4;
+        case 2: vst1q_u32(dst, v4); dst += 4;
+        case 1: vst1q_u32(dst, v4); dst += 4;
+    }
+    if (n & 2) {
+        vst1_u32(dst, vget_low_u32(v4));
+        dst += 2;
+    }
+    if (n & 1) {
+        *dst = value;
+    }
+}
+
+#else // Neither NEON nor SSE2.
+
+static void memset16(uint16_t* dst, uint16_t val, int n) { while (n --> 0) { *dst++ = val; } }
+static void memset32(uint32_t* dst, uint32_t val, int n) { while (n --> 0) { *dst++ = val; } }
+
+#endif
+
+}  // namespace SK_OPTS_NS
+
+#endif//SkUtils_opts_DEFINED
diff --git a/gfx/skia/skia/src/opts/SkUtils_opts_SSE2.cpp b/gfx/skia/skia/src/opts/SkUtils_opts_SSE2.cpp
deleted file mode 100644
index bd2f9b29a44a..000000000000
--- a/gfx/skia/skia/src/opts/SkUtils_opts_SSE2.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2009 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <emmintrin.h>
-#include "SkUtils_opts_SSE2.h"
-
-void sk_memset16_SSE2(uint16_t *dst, uint16_t value, int count)
-{
-    SkASSERT(dst != NULL && count >= 0);
-
-    // dst must be 2-byte aligned.
-    SkASSERT((((size_t) dst) & 0x01) == 0);
-
-    if (count >= 32) {
-        while (((size_t)dst) & 0x0F) {
-            *dst++ = value;
-            --count;
-        }
-        __m128i *d = reinterpret_cast<__m128i*>(dst);
-        __m128i value_wide = _mm_set1_epi16(value);
-        while (count >= 32) {
-            _mm_store_si128(d    , value_wide);
-            _mm_store_si128(d + 1, value_wide);
-            _mm_store_si128(d + 2, value_wide);
-            _mm_store_si128(d + 3, value_wide);
-            d += 4;
-            count -= 32;
-        }
-        dst = reinterpret_cast<uint16_t*>(d);
-    }
-    while (count > 0) {
-        *dst++ = value;
-        --count;
-    }
-}
-
-void sk_memset32_SSE2(uint32_t *dst, uint32_t value, int count)
-{
-    SkASSERT(dst != NULL && count >= 0);
-
-    // dst must be 4-byte aligned.
-    SkASSERT((((size_t) dst) & 0x03) == 0);
-
-    if (count >= 16) {
-        while (((size_t)dst) & 0x0F) {
-            *dst++ = value;
-            --count;
-        }
-        __m128i *d = reinterpret_cast<__m128i*>(dst);
-        __m128i value_wide = _mm_set1_epi32(value);
-        while (count >= 16) {
-            _mm_store_si128(d    , value_wide);
-            _mm_store_si128(d + 1, value_wide);
-            _mm_store_si128(d + 2, value_wide);
-            _mm_store_si128(d + 3, value_wide);
-            d += 4;
-            count -= 16;
-        }
-        dst = reinterpret_cast<uint32_t*>(d);
-    }
-    while (count > 0) {
-        *dst++ = value;
-        --count;
-    }
-}
-
-void sk_memcpy32_SSE2(uint32_t *dst, const uint32_t *src, int count)
-{
-    if (count >= 16) {
-        while (((size_t)dst) & 0x0F) {
-            *dst++ = *src++;
-            --count;
-        }
-        __m128i *dst128 = reinterpret_cast<__m128i*>(dst);
-        const __m128i *src128 = reinterpret_cast<const __m128i*>(src);
-        while (count >= 16) {
-            __m128i a =  _mm_loadu_si128(src128++);
-            __m128i b =  _mm_loadu_si128(src128++);
-            __m128i c =  _mm_loadu_si128(src128++);
-            __m128i d =  _mm_loadu_si128(src128++);
-
-            _mm_store_si128(dst128++, a);
-            _mm_store_si128(dst128++, b);
-            _mm_store_si128(dst128++, c);
-            _mm_store_si128(dst128++, d);
-            count -= 16;
-        }
-        dst = reinterpret_cast<uint32_t*>(dst128);
-        src = reinterpret_cast<const uint32_t*>(src128);
-    }
-    while (count > 0) {
-        *dst++ = *src++;
-        --count;
-    }
-}
diff --git a/gfx/skia/skia/src/opts/SkUtils_opts_SSE2.h b/gfx/skia/skia/src/opts/SkUtils_opts_SSE2.h
deleted file mode 100644
index 009f01894b44..000000000000
--- a/gfx/skia/skia/src/opts/SkUtils_opts_SSE2.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2009 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkUtils_opts_SSE2_DEFINED
-#define SkUtils_opts_SSE2_DEFINED
-
-#include "SkTypes.h"
-
-void sk_memset16_SSE2(uint16_t *dst, uint16_t value, int count);
-void sk_memset32_SSE2(uint32_t *dst, uint32_t value, int count);
-void sk_memcpy32_SSE2(uint32_t *dst, const uint32_t *src, int count);
-
-#endif
diff --git a/gfx/skia/skia/src/opts/SkUtils_opts_arm.cpp b/gfx/skia/skia/src/opts/SkUtils_opts_arm.cpp
deleted file mode 100644
index b1c9d0aa93e1..000000000000
--- a/gfx/skia/skia/src/opts/SkUtils_opts_arm.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2014 ARM Ltd.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkUtils.h"
-#include "SkUtilsArm.h"
-
-#if defined(SK_CPU_LENDIAN) && !SK_ARM_NEON_IS_NONE
-extern "C" void memset16_neon(uint16_t dst[], uint16_t value, int count);
-extern "C" void memset32_neon(uint32_t dst[], uint32_t value, int count);
-#endif
-
-#if defined(SK_CPU_LENDIAN)
-extern "C" void arm_memset16(uint16_t* dst, uint16_t value, int count);
-extern "C" void arm_memset32(uint32_t* dst, uint32_t value, int count);
-#endif
-
-SkMemset16Proc SkMemset16GetPlatformProc() {
-    // FIXME: memset.arm.S is using syntax incompatible with XCode
-#if !defined(SK_CPU_LENDIAN) || defined(SK_BUILD_FOR_IOS)
-    return NULL;
-#elif SK_ARM_NEON_IS_DYNAMIC
-    if (sk_cpu_arm_has_neon()) {
-        return memset16_neon;
-    } else {
-        return arm_memset16;
-    }
-#elif SK_ARM_NEON_IS_ALWAYS
-    return memset16_neon;
-#else
-    return arm_memset16;
-#endif
-}
-
-SkMemset32Proc SkMemset32GetPlatformProc() {
-    // FIXME: memset.arm.S is using syntax incompatible with XCode
-#if !defined(SK_CPU_LENDIAN) || defined(SK_BUILD_FOR_IOS)
-    return NULL;
-#elif SK_ARM_NEON_IS_DYNAMIC
-    if (sk_cpu_arm_has_neon()) {
-        return memset32_neon;
-    } else {
-        return arm_memset32;
-    }
-#elif SK_ARM_NEON_IS_ALWAYS
-    return memset32_neon;
-#else
-    return arm_memset32;
-#endif
-}
-
-SkMemcpy32Proc SkMemcpy32GetPlatformProc() {
-    return NULL;
-}
diff --git a/gfx/skia/skia/src/opts/SkUtils_opts_none.cpp b/gfx/skia/skia/src/opts/SkUtils_opts_none.cpp
deleted file mode 100644
index 18f52496db4a..000000000000
--- a/gfx/skia/skia/src/opts/SkUtils_opts_none.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/*
- * Copyright 2009 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#include "SkUtils.h"
-
-SkMemset16Proc SkMemset16GetPlatformProc() {
-    return NULL;
-}
-
-SkMemset32Proc SkMemset32GetPlatformProc() {
-    return NULL;
-}
-
-SkMemcpy32Proc SkMemcpy32GetPlatformProc() {
-    return NULL;
-}
diff --git a/gfx/skia/skia/src/opts/SkXfermode_opts.h b/gfx/skia/skia/src/opts/SkXfermode_opts.h
new file mode 100644
index 000000000000..69f2b420f5f4
--- /dev/null
+++ b/gfx/skia/skia/src/opts/SkXfermode_opts.h
@@ -0,0 +1,339 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef Sk4pxXfermode_DEFINED
+#define Sk4pxXfermode_DEFINED
+
+#include "Sk4px.h"
+#include "SkNx.h"
+#include "SkXfermode_proccoeff.h"
+
+namespace {
+
+// Most xfermodes can be done most efficiently 4 pixels at a time in 8 or 16-bit fixed point.
+#define XFERMODE(Name) static Sk4px SK_VECTORCALL Name(Sk4px s, Sk4px d)
+
+XFERMODE(Clear) { return Sk4px::DupPMColor(0); }
+XFERMODE(Src)   { return s; }
+XFERMODE(Dst)   { return d; }
+XFERMODE(SrcIn)   { return     s.approxMulDiv255(d.alphas()      ); }
+XFERMODE(SrcOut)  { return     s.approxMulDiv255(d.alphas().inv()); }
+XFERMODE(SrcOver) { return s + d.approxMulDiv255(s.alphas().inv()); }
+XFERMODE(DstIn)   { return SrcIn  (d,s); }
+XFERMODE(DstOut)  { return SrcOut (d,s); }
+XFERMODE(DstOver) { return SrcOver(d,s); }
+
+// [ S * Da + (1 - Sa) * D]
+XFERMODE(SrcATop) { return (s * d.alphas() + d * s.alphas().inv()).div255(); }
+XFERMODE(DstATop) { return SrcATop(d,s); }
+//[ S * (1 - Da) + (1 - Sa) * D ]
+XFERMODE(Xor) { return (s * d.alphas().inv() + d * s.alphas().inv()).div255(); }
+// [S + D ]
+XFERMODE(Plus) { return s.saturatedAdd(d); }
+// [S * D ]
+XFERMODE(Modulate) { return s.approxMulDiv255(d); }
+// [S + D - S * D]
+XFERMODE(Screen) {
+    // Doing the math as S + (1-S)*D or S + (D - S*D) means the add and subtract can be done
+    // in 8-bit space without overflow.  S + (1-S)*D is a touch faster because inv() is cheap.
+    return s + d.approxMulDiv255(s.inv());
+}
+XFERMODE(Multiply) { return (s * d.alphas().inv() + d * s.alphas().inv() + s*d).div255(); }
+// [ Sa + Da - Sa*Da, Sc + Dc - 2*min(Sc*Da, Dc*Sa) ]  (And notice Sa*Da == min(Sa*Da, Da*Sa).)
+XFERMODE(Difference) {
+    auto m = Sk4px::Wide::Min(s * d.alphas(), d * s.alphas()).div255();
+    // There's no chance of underflow, and if we subtract m before adding s+d, no overflow.
+    return (s - m) + (d - m.zeroAlphas());
+}
+// [ Sa + Da - Sa*Da, Sc + Dc - 2*Sc*Dc ]
+XFERMODE(Exclusion) {
+    auto p = s.approxMulDiv255(d);
+    // There's no chance of underflow, and if we subtract p before adding src+dst, no overflow.
+    return (s - p) + (d - p.zeroAlphas());
+}
+
+// We take care to use exact math for these next few modes where alphas
+// and colors are calculated using significantly different math.  We need
+// to preserve premul invariants, and exact math makes this easier.
+//
+// TODO: Some of these implementations might be able to be sped up a bit
+// while maintaining exact math, but let's follow up with that.
+
+XFERMODE(HardLight) {
+    auto sa = s.alphas(),
+         da = d.alphas();
+
+    auto srcover = s + (d * sa.inv()).div255();
+
+    auto isLite = ((sa-s) < s).widenLoHi();
+
+    auto lite = sa*da - ((da-d)*(sa-s) << 1),
+         dark = s*d << 1,
+         both = s*da.inv() + d*sa.inv();
+
+    auto alphas = srcover;
+    auto colors = (both + isLite.thenElse(lite, dark)).div255();
+    return alphas.zeroColors() + colors.zeroAlphas();
+}
+XFERMODE(Overlay) { return HardLight(d,s); }
+
+XFERMODE(Darken) {
+    auto sa = s.alphas(),
+         da = d.alphas();
+
+    auto sda = (s*da).div255(),
+         dsa = (d*sa).div255();
+
+    auto srcover = s + (d * sa.inv()).div255(),
+         dstover = d + (s * da.inv()).div255();
+    auto alphas = srcover,
+         colors = (sda < dsa).thenElse(srcover, dstover);
+    return alphas.zeroColors() + colors.zeroAlphas();
+}
+XFERMODE(Lighten) {
+    auto sa = s.alphas(),
+         da = d.alphas();
+
+    auto sda = (s*da).div255(),
+         dsa = (d*sa).div255();
+
+    auto srcover = s + (d * sa.inv()).div255(),
+         dstover = d + (s * da.inv()).div255();
+    auto alphas = srcover,
+         colors = (dsa < sda).thenElse(srcover, dstover);
+    return alphas.zeroColors() + colors.zeroAlphas();
+}
+#undef XFERMODE
+
+// Some xfermodes use math like divide or sqrt that's best done in floats 1 pixel at a time.
+#define XFERMODE(Name) static Sk4f SK_VECTORCALL Name(Sk4f d, Sk4f s)
+
+static inline Sk4f a_rgb(const Sk4f& a, const Sk4f& rgb) {
+    static_assert(SK_A32_SHIFT == 24, "");
+    return a * Sk4f(0,0,0,1) + rgb * Sk4f(1,1,1,0);
+}
+static inline Sk4f alphas(const Sk4f& f) {
+    return SkNx_dup<SK_A32_SHIFT/8>(f);
+}
+
+XFERMODE(ColorDodge) {
+    auto sa = alphas(s),
+         da = alphas(d),
+         isa = Sk4f(1)-sa,
+         ida = Sk4f(1)-da;
+
+    auto srcover = s + d*isa,
+         dstover = d + s*ida,
+         otherwise = sa * Sk4f::Min(da, (d*sa)*(sa-s).approxInvert()) + s*ida + d*isa;
+
+    // Order matters here, preferring d==0 over s==sa.
+    auto colors = (d == Sk4f(0)).thenElse(dstover,
+                  (s ==      sa).thenElse(srcover,
+                                          otherwise));
+    return a_rgb(srcover, colors);
+}
+XFERMODE(ColorBurn) {
+    auto sa = alphas(s),
+         da = alphas(d),
+         isa = Sk4f(1)-sa,
+         ida = Sk4f(1)-da;
+
+    auto srcover = s + d*isa,
+         dstover = d + s*ida,
+         otherwise = sa*(da-Sk4f::Min(da, (da-d)*sa*s.approxInvert())) + s*ida + d*isa;
+
+    // Order matters here, preferring d==da over s==0.
+    auto colors = (d ==      da).thenElse(dstover,
+                  (s == Sk4f(0)).thenElse(srcover,
+                                          otherwise));
+    return a_rgb(srcover, colors);
+}
+XFERMODE(SoftLight) {
+    auto sa = alphas(s),
+         da = alphas(d),
+         isa = Sk4f(1)-sa,
+         ida = Sk4f(1)-da;
+
+    // Some common terms.
+    auto m  = (da > Sk4f(0)).thenElse(d / da, Sk4f(0)),
+         s2 = Sk4f(2)*s,
+         m4 = Sk4f(4)*m;
+
+    // The logic forks three ways:
+    //    1. dark src?
+    //    2. light src, dark dst?
+    //    3. light src, light dst?
+    auto darkSrc = d*(sa + (s2 - sa)*(Sk4f(1) - m)),        // Used in case 1.
+         darkDst = (m4*m4 + m4)*(m - Sk4f(1)) + Sk4f(7)*m,  // Used in case 2.
+         liteDst = m.sqrt() - m,                            // Used in case 3.
+         liteSrc = d*sa + da*(s2-sa)*(Sk4f(4)*d <= da).thenElse(darkDst, liteDst); // Case 2 or 3?
+
+    auto alpha  = s + d*isa;
+    auto colors = s*ida + d*isa + (s2 <= sa).thenElse(darkSrc, liteSrc);           // Case 1 or 2/3?
+
+    return a_rgb(alpha, colors);
+}
+#undef XFERMODE
+
+// A reasonable fallback mode for doing AA is to simply apply the transfermode first,
+// then linearly interpolate the AA.
+template <Sk4px (SK_VECTORCALL *Mode)(Sk4px, Sk4px)>
+static Sk4px SK_VECTORCALL xfer_aa(Sk4px s, Sk4px d, Sk4px aa) {
+    Sk4px bw = Mode(s, d);
+    return (bw * aa + d * aa.inv()).div255();
+}
+
+// For some transfermodes we specialize AA, either for correctness or performance.
+#define XFERMODE_AA(Name) \
+    template <> Sk4px SK_VECTORCALL xfer_aa<Name>(Sk4px s, Sk4px d, Sk4px aa)
+
+// Plus' clamp needs to happen after AA.  skia:3852
+XFERMODE_AA(Plus) {  // [ clamp( (1-AA)D + (AA)(S+D) ) == clamp(D + AA*S) ]
+    return d.saturatedAdd(s.approxMulDiv255(aa));
+}
+
+#undef XFERMODE_AA
+
+class Sk4pxXfermode : public SkProcCoeffXfermode {
+public:
+    typedef Sk4px (SK_VECTORCALL *Proc4)(Sk4px, Sk4px);
+    typedef Sk4px (SK_VECTORCALL *AAProc4)(Sk4px, Sk4px, Sk4px);
+
+    Sk4pxXfermode(const ProcCoeff& rec, SkXfermode::Mode mode, Proc4 proc4, AAProc4 aaproc4)
+        : INHERITED(rec, mode)
+        , fProc4(proc4)
+        , fAAProc4(aaproc4) {}
+
+    void xfer32(SkPMColor dst[], const SkPMColor src[], int n, const SkAlpha aa[]) const override {
+        if (nullptr == aa) {
+            Sk4px::MapDstSrc(n, dst, src, [&](const Sk4px& dst4, const Sk4px& src4) {
+                return fProc4(src4, dst4);
+            });
+        } else {
+            Sk4px::MapDstSrcAlpha(n, dst, src, aa,
+                    [&](const Sk4px& dst4, const Sk4px& src4, const Sk4px& alpha) {
+                return fAAProc4(src4, dst4, alpha);
+            });
+        }
+    }
+
+    void xfer16(uint16_t dst[], const SkPMColor src[], int n, const SkAlpha aa[]) const override {
+        if (nullptr == aa) {
+            Sk4px::MapDstSrc(n, dst, src, [&](const Sk4px& dst4, const Sk4px& src4) {
+                return fProc4(src4, dst4);
+            });
+        } else {
+            Sk4px::MapDstSrcAlpha(n, dst, src, aa,
+                    [&](const Sk4px& dst4, const Sk4px& src4, const Sk4px& alpha) {
+                return fAAProc4(src4, dst4, alpha);
+            });
+        }
+    }
+
+private:
+    Proc4 fProc4;
+    AAProc4 fAAProc4;
+    typedef SkProcCoeffXfermode INHERITED;
+};
+
+class Sk4fXfermode : public SkProcCoeffXfermode {
+public:
+    typedef Sk4f (SK_VECTORCALL *ProcF)(Sk4f, Sk4f);
+    Sk4fXfermode(const ProcCoeff& rec, SkXfermode::Mode mode, ProcF procf)
+        : INHERITED(rec, mode)
+        , fProcF(procf) {}
+
+    void xfer32(SkPMColor dst[], const SkPMColor src[], int n, const SkAlpha aa[]) const override {
+        for (int i = 0; i < n; i++) {
+            dst[i] = aa ? this->xfer32(dst[i], src[i], aa[i])
+                        : this->xfer32(dst[i], src[i]);
+        }
+    }
+
+    void xfer16(uint16_t dst[], const SkPMColor src[], int n, const SkAlpha aa[]) const override {
+        for (int i = 0; i < n; i++) {
+            SkPMColor dst32 = SkPixel16ToPixel32(dst[i]);
+            dst32 = aa ? this->xfer32(dst32, src[i], aa[i])
+                       : this->xfer32(dst32, src[i]);
+            dst[i] = SkPixel32ToPixel16(dst32);
+        }
+    }
+
+private:
+    static Sk4f Load(SkPMColor c) {
+        return Sk4f::FromBytes((uint8_t*)&c) * Sk4f(1.0f/255);
+    }
+    static SkPMColor Round(const Sk4f& f) {
+        SkPMColor c;
+        (f * Sk4f(255) + Sk4f(0.5f)).toBytes((uint8_t*)&c);
+        return c;
+    }
+    inline SkPMColor xfer32(SkPMColor dst, SkPMColor src) const {
+        return Round(fProcF(Load(dst), Load(src)));
+    }
+
+    inline SkPMColor xfer32(SkPMColor dst, SkPMColor src, SkAlpha aa) const {
+        Sk4f s(Load(src)),
+             d(Load(dst)),
+             b(fProcF(d,s));
+        // We do aa in full float precision before going back down to bytes, because we can!
+        Sk4f a = Sk4f(aa) * Sk4f(1.0f/255);
+        b = b*a + d*(Sk4f(1)-a);
+        return Round(b);
+    }
+
+    ProcF fProcF;
+    typedef SkProcCoeffXfermode INHERITED;
+};
+
+} // namespace
+
+namespace SK_OPTS_NS {
+
+static SkXfermode* create_xfermode(const ProcCoeff& rec, SkXfermode::Mode mode) {
+    switch (mode) {
+#define CASE(Mode) \
+    case SkXfermode::k##Mode##_Mode: return new Sk4pxXfermode(rec, mode, &Mode, &xfer_aa<Mode>)
+        CASE(Clear);
+        CASE(Src);
+        CASE(Dst);
+        CASE(SrcOver);
+        CASE(DstOver);
+        CASE(SrcIn);
+        CASE(DstIn);
+        CASE(SrcOut);
+        CASE(DstOut);
+        CASE(SrcATop);
+        CASE(DstATop);
+        CASE(Xor);
+        CASE(Plus);
+        CASE(Modulate);
+        CASE(Screen);
+        CASE(Multiply);
+        CASE(Difference);
+        CASE(Exclusion);
+        CASE(HardLight);
+        CASE(Overlay);
+        CASE(Darken);
+        CASE(Lighten);
+    #undef CASE
+
+#define CASE(Mode) \
+    case SkXfermode::k##Mode##_Mode: return new Sk4fXfermode(rec, mode, &Mode)
+        CASE(ColorDodge);
+        CASE(ColorBurn);
+        CASE(SoftLight);
+    #undef CASE
+
+        default: break;
+    }
+    return nullptr;
+}
+
+} // namespace SK_OPTS_NS
+
+#endif//Sk4pxXfermode_DEFINED
diff --git a/gfx/skia/skia/src/opts/SkXfermode_opts_SSE2.cpp b/gfx/skia/skia/src/opts/SkXfermode_opts_SSE2.cpp
deleted file mode 100644
index 94f9a4aea3be..000000000000
--- a/gfx/skia/skia/src/opts/SkXfermode_opts_SSE2.cpp
+++ /dev/null
@@ -1,819 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkColorPriv.h"
-#include "SkColor_opts_SSE2.h"
-#include "SkMathPriv.h"
-#include "SkMath_opts_SSE2.h"
-#include "SkXfermode.h"
-#include "SkXfermode_opts_SSE2.h"
-#include "SkXfermode_proccoeff.h"
-
-////////////////////////////////////////////////////////////////////////////////
-// 4 pixels SSE2 version functions
-////////////////////////////////////////////////////////////////////////////////
-
-static inline __m128i SkDiv255Round_SSE2(const __m128i& a) {
-    __m128i prod = _mm_add_epi32(a, _mm_set1_epi32(128)); // prod += 128;
-    prod = _mm_add_epi32(prod, _mm_srli_epi32(prod, 8));  // prod + (prod >> 8)
-    prod = _mm_srli_epi32(prod, 8);                       // >> 8
-
-    return prod;
-}
-
-static inline __m128i saturated_add_SSE2(const __m128i& a, const __m128i& b) {
-    __m128i sum = _mm_add_epi32(a, b);
-    __m128i cmp = _mm_cmpgt_epi32(sum, _mm_set1_epi32(255));
-
-    sum = _mm_or_si128(_mm_and_si128(cmp, _mm_set1_epi32(255)),
-                       _mm_andnot_si128(cmp, sum));
-    return sum;
-}
-
-static inline __m128i clamp_signed_byte_SSE2(const __m128i& n) {
-    __m128i cmp1 = _mm_cmplt_epi32(n, _mm_setzero_si128());
-    __m128i cmp2 = _mm_cmpgt_epi32(n, _mm_set1_epi32(255));
-    __m128i ret = _mm_and_si128(cmp2, _mm_set1_epi32(255));
-
-    __m128i cmp = _mm_or_si128(cmp1, cmp2);
-    ret = _mm_or_si128(_mm_and_si128(cmp, ret), _mm_andnot_si128(cmp, n));
-
-    return ret;
-}
-
-static inline __m128i clamp_div255round_SSE2(const __m128i& prod) {
-    // test if > 0
-    __m128i cmp1 = _mm_cmpgt_epi32(prod, _mm_setzero_si128());
-    // test if < 255*255
-    __m128i cmp2 = _mm_cmplt_epi32(prod, _mm_set1_epi32(255*255));
-
-    __m128i ret = _mm_setzero_si128();
-
-    // if value >= 255*255, value = 255
-    ret = _mm_andnot_si128(cmp2,  _mm_set1_epi32(255));
-
-    __m128i div = SkDiv255Round_SSE2(prod);
-
-    // test if > 0 && < 255*255
-    __m128i cmp = _mm_and_si128(cmp1, cmp2);
-
-    ret = _mm_or_si128(_mm_and_si128(cmp, div), _mm_andnot_si128(cmp, ret));
-
-    return ret;
-}
-
-static __m128i srcover_modeproc_SSE2(const __m128i& src, const __m128i& dst) {
-    __m128i isa = _mm_sub_epi32(_mm_set1_epi32(256), SkGetPackedA32_SSE2(src));
-    return _mm_add_epi32(src, SkAlphaMulQ_SSE2(dst, isa));
-}
-
-static __m128i dstover_modeproc_SSE2(const __m128i& src, const __m128i& dst) {
-    __m128i ida = _mm_sub_epi32(_mm_set1_epi32(256), SkGetPackedA32_SSE2(dst));
-    return _mm_add_epi32(dst, SkAlphaMulQ_SSE2(src, ida));
-}
-
-static __m128i srcin_modeproc_SSE2(const __m128i& src, const __m128i& dst) {
-    __m128i da = SkGetPackedA32_SSE2(dst);
-    return SkAlphaMulQ_SSE2(src, SkAlpha255To256_SSE2(da));
-}
-
-static __m128i dstin_modeproc_SSE2(const __m128i& src, const __m128i& dst) {
-    __m128i sa = SkGetPackedA32_SSE2(src);
-    return SkAlphaMulQ_SSE2(dst, SkAlpha255To256_SSE2(sa));
-}
-
-static __m128i srcout_modeproc_SSE2(const __m128i& src, const __m128i& dst) {
-    __m128i ida = _mm_sub_epi32(_mm_set1_epi32(256), SkGetPackedA32_SSE2(dst));
-    return SkAlphaMulQ_SSE2(src, ida);
-}
-
-static __m128i dstout_modeproc_SSE2(const __m128i& src, const __m128i& dst) {
-    __m128i isa = _mm_sub_epi32(_mm_set1_epi32(256), SkGetPackedA32_SSE2(src));
-    return SkAlphaMulQ_SSE2(dst, isa);
-}
-
-static __m128i srcatop_modeproc_SSE2(const __m128i& src, const __m128i& dst) {
-    __m128i sa = SkGetPackedA32_SSE2(src);
-    __m128i da = SkGetPackedA32_SSE2(dst);
-    __m128i isa = _mm_sub_epi32(_mm_set1_epi32(255), sa);
-
-    __m128i a = da;
-
-    __m128i r1 = SkAlphaMulAlpha_SSE2(da, SkGetPackedR32_SSE2(src));
-    __m128i r2 = SkAlphaMulAlpha_SSE2(isa, SkGetPackedR32_SSE2(dst));
-    __m128i r = _mm_add_epi32(r1, r2);
-
-    __m128i g1 = SkAlphaMulAlpha_SSE2(da, SkGetPackedG32_SSE2(src));
-    __m128i g2 = SkAlphaMulAlpha_SSE2(isa, SkGetPackedG32_SSE2(dst));
-    __m128i g = _mm_add_epi32(g1, g2);
-
-    __m128i b1 = SkAlphaMulAlpha_SSE2(da, SkGetPackedB32_SSE2(src));
-    __m128i b2 = SkAlphaMulAlpha_SSE2(isa, SkGetPackedB32_SSE2(dst));
-    __m128i b = _mm_add_epi32(b1, b2);
-
-    return SkPackARGB32_SSE2(a, r, g, b);
-}
-
-static __m128i dstatop_modeproc_SSE2(const __m128i& src, const __m128i& dst) {
-    __m128i sa = SkGetPackedA32_SSE2(src);
-    __m128i da = SkGetPackedA32_SSE2(dst);
-    __m128i ida = _mm_sub_epi32(_mm_set1_epi32(255), da);
-
-    __m128i a = sa;
-
-    __m128i r1 = SkAlphaMulAlpha_SSE2(ida, SkGetPackedR32_SSE2(src));
-    __m128i r2 = SkAlphaMulAlpha_SSE2(sa, SkGetPackedR32_SSE2(dst));
-    __m128i r = _mm_add_epi32(r1, r2);
-
-    __m128i g1 = SkAlphaMulAlpha_SSE2(ida, SkGetPackedG32_SSE2(src));
-    __m128i g2 = SkAlphaMulAlpha_SSE2(sa, SkGetPackedG32_SSE2(dst));
-    __m128i g = _mm_add_epi32(g1, g2);
-
-    __m128i b1 = SkAlphaMulAlpha_SSE2(ida, SkGetPackedB32_SSE2(src));
-    __m128i b2 = SkAlphaMulAlpha_SSE2(sa, SkGetPackedB32_SSE2(dst));
-    __m128i b = _mm_add_epi32(b1, b2);
-
-    return SkPackARGB32_SSE2(a, r, g, b);
-}
-
-static __m128i xor_modeproc_SSE2(const __m128i& src, const __m128i& dst) {
-    __m128i sa = SkGetPackedA32_SSE2(src);
-    __m128i da = SkGetPackedA32_SSE2(dst);
-    __m128i isa = _mm_sub_epi32(_mm_set1_epi32(255), sa);
-    __m128i ida = _mm_sub_epi32(_mm_set1_epi32(255), da);
-
-    __m128i a1 = _mm_add_epi32(sa, da);
-    __m128i a2 = SkAlphaMulAlpha_SSE2(sa, da);
-    a2 = _mm_slli_epi32(a2, 1);
-    __m128i a = _mm_sub_epi32(a1, a2);
-
-    __m128i r1 = SkAlphaMulAlpha_SSE2(ida, SkGetPackedR32_SSE2(src));
-    __m128i r2 = SkAlphaMulAlpha_SSE2(isa, SkGetPackedR32_SSE2(dst));
-    __m128i r = _mm_add_epi32(r1, r2);
-
-    __m128i g1 = SkAlphaMulAlpha_SSE2(ida, SkGetPackedG32_SSE2(src));
-    __m128i g2 = SkAlphaMulAlpha_SSE2(isa, SkGetPackedG32_SSE2(dst));
-    __m128i g = _mm_add_epi32(g1, g2);
-
-    __m128i b1 = SkAlphaMulAlpha_SSE2(ida, SkGetPackedB32_SSE2(src));
-    __m128i b2 = SkAlphaMulAlpha_SSE2(isa, SkGetPackedB32_SSE2(dst));
-    __m128i b = _mm_add_epi32(b1, b2);
-
-    return SkPackARGB32_SSE2(a, r, g, b);
-}
-
-static __m128i plus_modeproc_SSE2(const __m128i& src, const __m128i& dst) {
-    __m128i b = saturated_add_SSE2(SkGetPackedB32_SSE2(src),
-                                   SkGetPackedB32_SSE2(dst));
-    __m128i g = saturated_add_SSE2(SkGetPackedG32_SSE2(src),
-                                   SkGetPackedG32_SSE2(dst));
-    __m128i r = saturated_add_SSE2(SkGetPackedR32_SSE2(src),
-                                   SkGetPackedR32_SSE2(dst));
-    __m128i a = saturated_add_SSE2(SkGetPackedA32_SSE2(src),
-                                   SkGetPackedA32_SSE2(dst));
-    return SkPackARGB32_SSE2(a, r, g, b);
-}
-
-static __m128i modulate_modeproc_SSE2(const __m128i& src, const __m128i& dst) {
-    __m128i a = SkAlphaMulAlpha_SSE2(SkGetPackedA32_SSE2(src),
-                                     SkGetPackedA32_SSE2(dst));
-    __m128i r = SkAlphaMulAlpha_SSE2(SkGetPackedR32_SSE2(src),
-                                     SkGetPackedR32_SSE2(dst));
-    __m128i g = SkAlphaMulAlpha_SSE2(SkGetPackedG32_SSE2(src),
-                                     SkGetPackedG32_SSE2(dst));
-    __m128i b = SkAlphaMulAlpha_SSE2(SkGetPackedB32_SSE2(src),
-                                     SkGetPackedB32_SSE2(dst));
-    return SkPackARGB32_SSE2(a, r, g, b);
-}
-
-static inline __m128i SkMin32_SSE2(const __m128i& a, const __m128i& b) {
-    __m128i cmp = _mm_cmplt_epi32(a, b);
-    return _mm_or_si128(_mm_and_si128(cmp, a), _mm_andnot_si128(cmp, b));
-}
-
-static inline __m128i srcover_byte_SSE2(const __m128i& a, const __m128i& b) {
-    // a + b - SkAlphaMulAlpha(a, b);
-    return _mm_sub_epi32(_mm_add_epi32(a, b), SkAlphaMulAlpha_SSE2(a, b));
-
-}
-
-static inline __m128i blendfunc_multiply_byte_SSE2(const __m128i& sc, const __m128i& dc,
-                                                   const __m128i& sa, const __m128i& da) {
-    // sc * (255 - da)
-    __m128i ret1 = _mm_sub_epi32(_mm_set1_epi32(255), da);
-    ret1 = _mm_mullo_epi16(sc, ret1);
-
-    // dc * (255 - sa)
-    __m128i ret2 = _mm_sub_epi32(_mm_set1_epi32(255), sa);
-    ret2 = _mm_mullo_epi16(dc, ret2);
-
-    // sc * dc
-    __m128i ret3 = _mm_mullo_epi16(sc, dc);
-
-    __m128i ret = _mm_add_epi32(ret1, ret2);
-    ret = _mm_add_epi32(ret, ret3);
-
-    return clamp_div255round_SSE2(ret);
-}
-
-static __m128i multiply_modeproc_SSE2(const __m128i& src, const __m128i& dst) {
-    __m128i sa = SkGetPackedA32_SSE2(src);
-    __m128i da = SkGetPackedA32_SSE2(dst);
-    __m128i a = srcover_byte_SSE2(sa, da);
-
-    __m128i sr = SkGetPackedR32_SSE2(src);
-    __m128i dr = SkGetPackedR32_SSE2(dst);
-    __m128i r = blendfunc_multiply_byte_SSE2(sr, dr, sa, da);
-
-    __m128i sg = SkGetPackedG32_SSE2(src);
-    __m128i dg = SkGetPackedG32_SSE2(dst);
-    __m128i g = blendfunc_multiply_byte_SSE2(sg, dg, sa, da);
-
-
-    __m128i sb = SkGetPackedB32_SSE2(src);
-    __m128i db = SkGetPackedB32_SSE2(dst);
-    __m128i b = blendfunc_multiply_byte_SSE2(sb, db, sa, da);
-
-    return SkPackARGB32_SSE2(a, r, g, b);
-}
-
-static __m128i screen_modeproc_SSE2(const __m128i& src, const __m128i& dst) {
-    __m128i a = srcover_byte_SSE2(SkGetPackedA32_SSE2(src),
-                                  SkGetPackedA32_SSE2(dst));
-    __m128i r = srcover_byte_SSE2(SkGetPackedR32_SSE2(src),
-                                  SkGetPackedR32_SSE2(dst));
-    __m128i g = srcover_byte_SSE2(SkGetPackedG32_SSE2(src),
-                                  SkGetPackedG32_SSE2(dst));
-    __m128i b = srcover_byte_SSE2(SkGetPackedB32_SSE2(src),
-                                  SkGetPackedB32_SSE2(dst));
-    return SkPackARGB32_SSE2(a, r, g, b);
-}
-
-// Portable version overlay_byte() is in SkXfermode.cpp.
-static inline __m128i overlay_byte_SSE2(const __m128i& sc, const __m128i& dc,
-                                        const __m128i& sa, const __m128i& da) {
-    __m128i ida = _mm_sub_epi32(_mm_set1_epi32(255), da);
-    __m128i tmp1 = _mm_mullo_epi16(sc, ida);
-    __m128i isa = _mm_sub_epi32(_mm_set1_epi32(255), sa);
-    __m128i tmp2 = _mm_mullo_epi16(dc, isa);
-    __m128i tmp = _mm_add_epi32(tmp1, tmp2);
-
-    __m128i cmp = _mm_cmpgt_epi32(_mm_slli_epi32(dc, 1), da);
-    __m128i rc1 = _mm_slli_epi32(sc, 1);                        // 2 * sc
-    rc1 = Multiply32_SSE2(rc1, dc);                             // *dc
-
-    __m128i rc2 = _mm_mullo_epi16(sa, da);                      // sa * da
-    __m128i tmp3 = _mm_slli_epi32(_mm_sub_epi32(da, dc), 1);    // 2 * (da - dc)
-    tmp3 = Multiply32_SSE2(tmp3, _mm_sub_epi32(sa, sc));        // * (sa - sc)
-    rc2 = _mm_sub_epi32(rc2, tmp3);
-
-    __m128i rc = _mm_or_si128(_mm_andnot_si128(cmp, rc1),
-                              _mm_and_si128(cmp, rc2));
-    return clamp_div255round_SSE2(_mm_add_epi32(rc, tmp));
-}
-
-static __m128i overlay_modeproc_SSE2(const __m128i& src, const __m128i& dst) {
-    __m128i sa = SkGetPackedA32_SSE2(src);
-    __m128i da = SkGetPackedA32_SSE2(dst);
-
-    __m128i a = srcover_byte_SSE2(sa, da);
-    __m128i r = overlay_byte_SSE2(SkGetPackedR32_SSE2(src),
-                                  SkGetPackedR32_SSE2(dst), sa, da);
-    __m128i g = overlay_byte_SSE2(SkGetPackedG32_SSE2(src),
-                                  SkGetPackedG32_SSE2(dst), sa, da);
-    __m128i b = overlay_byte_SSE2(SkGetPackedB32_SSE2(src),
-                                  SkGetPackedB32_SSE2(dst), sa, da);
-    return SkPackARGB32_SSE2(a, r, g, b);
-}
-
-static inline __m128i darken_byte_SSE2(const __m128i& sc, const __m128i& dc,
-                                       const __m128i& sa, const __m128i& da) {
-    __m128i sd = _mm_mullo_epi16(sc, da);
-    __m128i ds = _mm_mullo_epi16(dc, sa);
-
-    __m128i cmp = _mm_cmplt_epi32(sd, ds);
-
-    __m128i tmp = _mm_add_epi32(sc, dc);
-    __m128i ret1 = _mm_sub_epi32(tmp, SkDiv255Round_SSE2(ds));
-    __m128i ret2 = _mm_sub_epi32(tmp, SkDiv255Round_SSE2(sd));
-    __m128i ret = _mm_or_si128(_mm_and_si128(cmp, ret1),
-                               _mm_andnot_si128(cmp, ret2));
-    return ret;
-}
-
-static __m128i darken_modeproc_SSE2(const __m128i& src, const __m128i& dst) {
-    __m128i sa = SkGetPackedA32_SSE2(src);
-    __m128i da = SkGetPackedA32_SSE2(dst);
-
-    __m128i a = srcover_byte_SSE2(sa, da);
-    __m128i r = darken_byte_SSE2(SkGetPackedR32_SSE2(src),
-                                 SkGetPackedR32_SSE2(dst), sa, da);
-    __m128i g = darken_byte_SSE2(SkGetPackedG32_SSE2(src),
-                                 SkGetPackedG32_SSE2(dst), sa, da);
-    __m128i b = darken_byte_SSE2(SkGetPackedB32_SSE2(src),
-                                 SkGetPackedB32_SSE2(dst), sa, da);
-    return SkPackARGB32_SSE2(a, r, g, b);
-}
-
-static inline __m128i lighten_byte_SSE2(const __m128i& sc, const __m128i& dc,
-                                        const __m128i& sa, const __m128i& da) {
-    __m128i sd = _mm_mullo_epi16(sc, da);
-    __m128i ds = _mm_mullo_epi16(dc, sa);
-
-    __m128i cmp = _mm_cmpgt_epi32(sd, ds);
-
-    __m128i tmp = _mm_add_epi32(sc, dc);
-    __m128i ret1 = _mm_sub_epi32(tmp, SkDiv255Round_SSE2(ds));
-    __m128i ret2 = _mm_sub_epi32(tmp, SkDiv255Round_SSE2(sd));
-    __m128i ret = _mm_or_si128(_mm_and_si128(cmp, ret1),
-                               _mm_andnot_si128(cmp, ret2));
-    return ret;
-}
-
-static __m128i lighten_modeproc_SSE2(const __m128i& src, const __m128i& dst) {
-    __m128i sa = SkGetPackedA32_SSE2(src);
-    __m128i da = SkGetPackedA32_SSE2(dst);
-
-    __m128i a = srcover_byte_SSE2(sa, da);
-    __m128i r = lighten_byte_SSE2(SkGetPackedR32_SSE2(src),
-                                  SkGetPackedR32_SSE2(dst), sa, da);
-    __m128i g = lighten_byte_SSE2(SkGetPackedG32_SSE2(src),
-                                  SkGetPackedG32_SSE2(dst), sa, da);
-    __m128i b = lighten_byte_SSE2(SkGetPackedB32_SSE2(src),
-                                  SkGetPackedB32_SSE2(dst), sa, da);
-    return SkPackARGB32_SSE2(a, r, g, b);
-}
-
-static inline __m128i colordodge_byte_SSE2(const __m128i& sc, const __m128i& dc,
-                                           const __m128i& sa, const __m128i& da) {
-    __m128i diff = _mm_sub_epi32(sa, sc);
-    __m128i ida = _mm_sub_epi32(_mm_set1_epi32(255), da);
-    __m128i isa = _mm_sub_epi32(_mm_set1_epi32(255), sa);
-
-    // if (0 == dc)
-    __m128i cmp1 = _mm_cmpeq_epi32(dc, _mm_setzero_si128());
-    __m128i rc1 = _mm_and_si128(cmp1, SkAlphaMulAlpha_SSE2(sc, ida));
-
-    // else if (0 == diff)
-    __m128i cmp2 = _mm_cmpeq_epi32(diff, _mm_setzero_si128());
-    __m128i cmp = _mm_andnot_si128(cmp1, cmp2);
-    __m128i tmp1 = _mm_mullo_epi16(sa, da);
-    __m128i tmp2 = _mm_mullo_epi16(sc, ida);
-    __m128i tmp3 = _mm_mullo_epi16(dc, isa);
-    __m128i rc2 = _mm_add_epi32(tmp1, tmp2);
-    rc2 = _mm_add_epi32(rc2, tmp3);
-    rc2 = clamp_div255round_SSE2(rc2);
-    rc2 = _mm_and_si128(cmp, rc2);
-
-    // else
-    __m128i cmp3 = _mm_or_si128(cmp1, cmp2);
-    __m128i value = _mm_mullo_epi16(dc, sa);
-    diff = shim_mm_div_epi32(value, diff);
-
-    __m128i tmp4 = SkMin32_SSE2(da, diff);
-    tmp4 = Multiply32_SSE2(sa, tmp4);
-    __m128i rc3 = _mm_add_epi32(tmp4, tmp2);
-    rc3 = _mm_add_epi32(rc3, tmp3);
-    rc3 = clamp_div255round_SSE2(rc3);
-    rc3 = _mm_andnot_si128(cmp3, rc3);
-
-    __m128i rc = _mm_or_si128(rc1, rc2);
-    rc = _mm_or_si128(rc, rc3);
-
-    return rc;
-}
-
-static __m128i colordodge_modeproc_SSE2(const __m128i& src,
-                                        const __m128i& dst) {
-    __m128i sa = SkGetPackedA32_SSE2(src);
-    __m128i da = SkGetPackedA32_SSE2(dst);
-
-    __m128i a = srcover_byte_SSE2(sa, da);
-    __m128i r = colordodge_byte_SSE2(SkGetPackedR32_SSE2(src),
-                                     SkGetPackedR32_SSE2(dst), sa, da);
-    __m128i g = colordodge_byte_SSE2(SkGetPackedG32_SSE2(src),
-                                     SkGetPackedG32_SSE2(dst), sa, da);
-    __m128i b = colordodge_byte_SSE2(SkGetPackedB32_SSE2(src),
-                                     SkGetPackedB32_SSE2(dst), sa, da);
-    return SkPackARGB32_SSE2(a, r, g, b);
-}
-
-static inline __m128i colorburn_byte_SSE2(const __m128i& sc, const __m128i& dc,
-                                          const __m128i& sa, const __m128i& da) {
-    __m128i ida = _mm_sub_epi32(_mm_set1_epi32(255), da);
-    __m128i isa = _mm_sub_epi32(_mm_set1_epi32(255), sa);
-
-    // if (dc == da)
-    __m128i cmp1 = _mm_cmpeq_epi32(dc, da);
-    __m128i tmp1 = _mm_mullo_epi16(sa, da);
-    __m128i tmp2 = _mm_mullo_epi16(sc, ida);
-    __m128i tmp3 = _mm_mullo_epi16(dc, isa);
-    __m128i rc1 = _mm_add_epi32(tmp1, tmp2);
-    rc1 = _mm_add_epi32(rc1, tmp3);
-    rc1 = clamp_div255round_SSE2(rc1);
-    rc1 = _mm_and_si128(cmp1, rc1);
-
-    // else if (0 == sc)
-    __m128i cmp2 = _mm_cmpeq_epi32(sc, _mm_setzero_si128());
-    __m128i rc2 = SkAlphaMulAlpha_SSE2(dc, isa);
-    __m128i cmp = _mm_andnot_si128(cmp1, cmp2);
-    rc2 = _mm_and_si128(cmp, rc2);
-
-    // else
-    __m128i cmp3 = _mm_or_si128(cmp1, cmp2);
-    __m128i tmp4 = _mm_sub_epi32(da, dc);
-    tmp4 = Multiply32_SSE2(tmp4, sa);
-    tmp4 = shim_mm_div_epi32(tmp4, sc);
-
-    __m128i tmp5 = _mm_sub_epi32(da, SkMin32_SSE2(da, tmp4));
-    tmp5 = Multiply32_SSE2(sa, tmp5);
-    __m128i rc3 = _mm_add_epi32(tmp5, tmp2);
-    rc3 = _mm_add_epi32(rc3, tmp3);
-    rc3 = clamp_div255round_SSE2(rc3);
-    rc3 = _mm_andnot_si128(cmp3, rc3);
-
-    __m128i rc = _mm_or_si128(rc1, rc2);
-    rc = _mm_or_si128(rc, rc3);
-
-    return rc;
-}
-
-static __m128i colorburn_modeproc_SSE2(const __m128i& src, const __m128i& dst) {
-    __m128i sa = SkGetPackedA32_SSE2(src);
-    __m128i da = SkGetPackedA32_SSE2(dst);
-
-    __m128i a = srcover_byte_SSE2(sa, da);
-    __m128i r = colorburn_byte_SSE2(SkGetPackedR32_SSE2(src),
-                                    SkGetPackedR32_SSE2(dst), sa, da);
-    __m128i g = colorburn_byte_SSE2(SkGetPackedG32_SSE2(src),
-                                    SkGetPackedG32_SSE2(dst), sa, da);
-    __m128i b = colorburn_byte_SSE2(SkGetPackedB32_SSE2(src),
-                                    SkGetPackedB32_SSE2(dst), sa, da);
-    return SkPackARGB32_SSE2(a, r, g, b);
-}
-
-static inline __m128i hardlight_byte_SSE2(const __m128i& sc, const __m128i& dc,
-                                          const __m128i& sa, const __m128i& da) {
-    // if (2 * sc <= sa)
-    __m128i tmp1 = _mm_slli_epi32(sc, 1);
-    __m128i cmp1 = _mm_cmpgt_epi32(tmp1, sa);
-    __m128i rc1 = _mm_mullo_epi16(sc, dc);                // sc * dc;
-    rc1 = _mm_slli_epi32(rc1, 1);                         // 2 * sc * dc
-    rc1 = _mm_andnot_si128(cmp1, rc1);
-
-    // else
-    tmp1 = _mm_mullo_epi16(sa, da);
-    __m128i tmp2 = Multiply32_SSE2(_mm_sub_epi32(da, dc),
-                                   _mm_sub_epi32(sa, sc));
-    tmp2 = _mm_slli_epi32(tmp2, 1);
-    __m128i rc2 = _mm_sub_epi32(tmp1, tmp2);
-    rc2 = _mm_and_si128(cmp1, rc2);
-
-    __m128i rc = _mm_or_si128(rc1, rc2);
-
-    __m128i ida = _mm_sub_epi32(_mm_set1_epi32(255), da);
-    tmp1 = _mm_mullo_epi16(sc, ida);
-    __m128i isa = _mm_sub_epi32(_mm_set1_epi32(255), sa);
-    tmp2 = _mm_mullo_epi16(dc, isa);
-    rc = _mm_add_epi32(rc, tmp1);
-    rc = _mm_add_epi32(rc, tmp2);
-    return clamp_div255round_SSE2(rc);
-}
-
-static __m128i hardlight_modeproc_SSE2(const __m128i& src, const __m128i& dst) {
-    __m128i sa = SkGetPackedA32_SSE2(src);
-    __m128i da = SkGetPackedA32_SSE2(dst);
-
-    __m128i a = srcover_byte_SSE2(sa, da);
-    __m128i r = hardlight_byte_SSE2(SkGetPackedR32_SSE2(src),
-                                    SkGetPackedR32_SSE2(dst), sa, da);
-    __m128i g = hardlight_byte_SSE2(SkGetPackedG32_SSE2(src),
-                                    SkGetPackedG32_SSE2(dst), sa, da);
-    __m128i b = hardlight_byte_SSE2(SkGetPackedB32_SSE2(src),
-                                    SkGetPackedB32_SSE2(dst), sa, da);
-    return SkPackARGB32_SSE2(a, r, g, b);
-}
-
-static __m128i sqrt_unit_byte_SSE2(const __m128i& n) {
-    return SkSqrtBits_SSE2(n, 15+4);
-}
-
-static inline __m128i softlight_byte_SSE2(const __m128i& sc, const __m128i& dc,
-                                          const __m128i& sa, const __m128i& da) {
-    __m128i tmp1, tmp2, tmp3;
-
-    // int m = da ? dc * 256 / da : 0;
-    __m128i cmp = _mm_cmpeq_epi32(da, _mm_setzero_si128());
-    __m128i m = _mm_slli_epi32(dc, 8);
-    __m128 x = _mm_cvtepi32_ps(m);
-    __m128 y = _mm_cvtepi32_ps(da);
-    m = _mm_cvttps_epi32(_mm_div_ps(x, y));
-    m = _mm_andnot_si128(cmp, m);
-
-    // if (2 * sc <= sa)
-    tmp1 = _mm_slli_epi32(sc, 1);                      // 2 * sc
-    __m128i cmp1 = _mm_cmpgt_epi32(tmp1, sa);
-    tmp1 = _mm_sub_epi32(tmp1, sa);                    // 2 * sc - sa
-    tmp2 = _mm_sub_epi32(_mm_set1_epi32(256), m);      // 256 - m
-    tmp1 = Multiply32_SSE2(tmp1, tmp2);
-    tmp1 = _mm_srai_epi32(tmp1, 8);
-    tmp1 = _mm_add_epi32(sa, tmp1);
-    tmp1 = Multiply32_SSE2(dc, tmp1);
-    __m128i rc1 = _mm_andnot_si128(cmp1, tmp1);
-
-    // else if (4 * dc <= da)
-    tmp2 = _mm_slli_epi32(dc, 2);                      // dc * 4
-    __m128i cmp2 = _mm_cmpgt_epi32(tmp2, da);
-    __m128i i = _mm_slli_epi32(m, 2);                  // 4 * m
-    __m128i j = _mm_add_epi32(i, _mm_set1_epi32(256)); // 4 * m + 256
-    __m128i k = Multiply32_SSE2(i, j);                 // 4 * m * (4 * m + 256)
-    __m128i t = _mm_sub_epi32(m, _mm_set1_epi32(256)); // m - 256
-    i = Multiply32_SSE2(k, t);                         // 4 * m * (4 * m + 256) * (m - 256)
-    i = _mm_srai_epi32(i, 16);                         // >> 16
-    j = Multiply32_SSE2(_mm_set1_epi32(7), m);         // 7 * m
-    tmp2 = _mm_add_epi32(i, j);
-    i = Multiply32_SSE2(dc, sa);                       // dc * sa
-    j = _mm_slli_epi32(sc, 1);                         // 2 * sc
-    j = _mm_sub_epi32(j, sa);                          // 2 * sc - sa
-    j = Multiply32_SSE2(da, j);                        // da * (2 * sc - sa)
-    tmp2 = Multiply32_SSE2(j, tmp2);                   // * tmp
-    tmp2 = _mm_srai_epi32(tmp2, 8);                    // >> 8
-    tmp2 = _mm_add_epi32(i, tmp2);
-    cmp = _mm_andnot_si128(cmp2, cmp1);
-    __m128i rc2 = _mm_and_si128(cmp, tmp2);
-    __m128i rc = _mm_or_si128(rc1, rc2);
-
-    // else
-    tmp3 = sqrt_unit_byte_SSE2(m);
-    tmp3 = _mm_sub_epi32(tmp3, m);
-    tmp3 = Multiply32_SSE2(j, tmp3);                   // j = da * (2 * sc - sa)
-    tmp3 = _mm_srai_epi32(tmp3, 8);
-    tmp3 = _mm_add_epi32(i, tmp3);                     // i = dc * sa
-    cmp = _mm_and_si128(cmp1, cmp2);
-    __m128i rc3 = _mm_and_si128(cmp, tmp3);
-    rc = _mm_or_si128(rc, rc3);
-
-    tmp1 = _mm_sub_epi32(_mm_set1_epi32(255), da);     // 255 - da
-    tmp1 = _mm_mullo_epi16(sc, tmp1);
-    tmp2 = _mm_sub_epi32(_mm_set1_epi32(255), sa);     // 255 - sa
-    tmp2 = _mm_mullo_epi16(dc, tmp2);
-    rc = _mm_add_epi32(rc, tmp1);
-    rc = _mm_add_epi32(rc, tmp2);
-    return clamp_div255round_SSE2(rc);
-}
-
-static __m128i softlight_modeproc_SSE2(const __m128i& src, const __m128i& dst) {
-    __m128i sa = SkGetPackedA32_SSE2(src);
-    __m128i da = SkGetPackedA32_SSE2(dst);
-
-    __m128i a = srcover_byte_SSE2(sa, da);
-    __m128i r = softlight_byte_SSE2(SkGetPackedR32_SSE2(src),
-                                    SkGetPackedR32_SSE2(dst), sa, da);
-    __m128i g = softlight_byte_SSE2(SkGetPackedG32_SSE2(src),
-                                    SkGetPackedG32_SSE2(dst), sa, da);
-    __m128i b = softlight_byte_SSE2(SkGetPackedB32_SSE2(src),
-                                    SkGetPackedB32_SSE2(dst), sa, da);
-    return SkPackARGB32_SSE2(a, r, g, b);
-}
-
-static inline __m128i difference_byte_SSE2(const __m128i& sc, const __m128i& dc,
-                                           const __m128i& sa, const __m128i& da) {
-    __m128i tmp1 = _mm_mullo_epi16(sc, da);
-    __m128i tmp2 = _mm_mullo_epi16(dc, sa);
-    __m128i tmp = SkMin32_SSE2(tmp1, tmp2);
-
-    __m128i ret1 = _mm_add_epi32(sc, dc);
-    __m128i ret2 = _mm_slli_epi32(SkDiv255Round_SSE2(tmp), 1);
-    __m128i ret = _mm_sub_epi32(ret1, ret2);
-
-    ret = clamp_signed_byte_SSE2(ret);
-    return ret;
-}
-
-static __m128i difference_modeproc_SSE2(const __m128i& src,
-                                        const __m128i& dst) {
-    __m128i sa = SkGetPackedA32_SSE2(src);
-    __m128i da = SkGetPackedA32_SSE2(dst);
-
-    __m128i a = srcover_byte_SSE2(sa, da);
-    __m128i r = difference_byte_SSE2(SkGetPackedR32_SSE2(src),
-                                     SkGetPackedR32_SSE2(dst), sa, da);
-    __m128i g = difference_byte_SSE2(SkGetPackedG32_SSE2(src),
-                                     SkGetPackedG32_SSE2(dst), sa, da);
-    __m128i b = difference_byte_SSE2(SkGetPackedB32_SSE2(src),
-                                     SkGetPackedB32_SSE2(dst), sa, da);
-    return SkPackARGB32_SSE2(a, r, g, b);
-}
-
-static inline __m128i exclusion_byte_SSE2(const __m128i& sc, const __m128i& dc,
-                                          const __m128i&, __m128i&) {
-    __m128i tmp1 = _mm_mullo_epi16(_mm_set1_epi32(255), sc); // 255 * sc
-    __m128i tmp2 = _mm_mullo_epi16(_mm_set1_epi32(255), dc); // 255 * dc
-    tmp1 = _mm_add_epi32(tmp1, tmp2);
-    tmp2 = _mm_mullo_epi16(sc, dc);                          // sc * dc
-    tmp2 = _mm_slli_epi32(tmp2, 1);                          // 2 * sc * dc
-
-    __m128i r = _mm_sub_epi32(tmp1, tmp2);
-    return clamp_div255round_SSE2(r);
-}
-
-static __m128i exclusion_modeproc_SSE2(const __m128i& src, const __m128i& dst) {
-    __m128i sa = SkGetPackedA32_SSE2(src);
-    __m128i da = SkGetPackedA32_SSE2(dst);
-
-    __m128i a = srcover_byte_SSE2(sa, da);
-    __m128i r = exclusion_byte_SSE2(SkGetPackedR32_SSE2(src),
-                                    SkGetPackedR32_SSE2(dst), sa, da);
-    __m128i g = exclusion_byte_SSE2(SkGetPackedG32_SSE2(src),
-                                    SkGetPackedG32_SSE2(dst), sa, da);
-    __m128i b = exclusion_byte_SSE2(SkGetPackedB32_SSE2(src),
-                                    SkGetPackedB32_SSE2(dst), sa, da);
-    return SkPackARGB32_SSE2(a, r, g, b);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-typedef __m128i (*SkXfermodeProcSIMD)(const __m128i& src, const __m128i& dst);
-
-extern SkXfermodeProcSIMD gSSE2XfermodeProcs[];
-
-SkSSE2ProcCoeffXfermode::SkSSE2ProcCoeffXfermode(SkReadBuffer& buffer)
-    : INHERITED(buffer) {
-    fProcSIMD = reinterpret_cast<void*>(gSSE2XfermodeProcs[this->getMode()]);
-    buffer.validate(fProcSIMD != NULL);
-}
-
-void SkSSE2ProcCoeffXfermode::xfer32(SkPMColor dst[], const SkPMColor src[],
-                                     int count, const SkAlpha aa[]) const {
-    SkASSERT(dst && src && count >= 0);
-
-    SkXfermodeProc proc = this->getProc();
-    SkXfermodeProcSIMD procSIMD = reinterpret_cast<SkXfermodeProcSIMD>(fProcSIMD);
-    SkASSERT(procSIMD != NULL);
-
-    if (NULL == aa) {
-        if (count >= 4) {
-            while (((size_t)dst & 0x0F) != 0) {
-                *dst = proc(*src, *dst);
-                dst++;
-                src++;
-                count--;
-            }
-
-            const __m128i* s = reinterpret_cast<const __m128i*>(src);
-            __m128i* d = reinterpret_cast<__m128i*>(dst);
-
-            while (count >= 4) {
-                __m128i src_pixel = _mm_loadu_si128(s++);
-                __m128i dst_pixel = _mm_load_si128(d);
-
-                dst_pixel = procSIMD(src_pixel, dst_pixel);
-                _mm_store_si128(d++, dst_pixel);
-                count -= 4;
-            }
-
-            src = reinterpret_cast<const SkPMColor*>(s);
-            dst = reinterpret_cast<SkPMColor*>(d);
-        }
-
-        for (int i = count - 1; i >= 0; --i) {
-            *dst = proc(*src, *dst);
-            dst++;
-            src++;
-        }
-    } else {
-        for (int i = count - 1; i >= 0; --i) {
-            unsigned a = aa[i];
-            if (0 != a) {
-                SkPMColor dstC = dst[i];
-                SkPMColor C = proc(src[i], dstC);
-                if (a != 0xFF) {
-                    C = SkFourByteInterp(C, dstC, a);
-                }
-                dst[i] = C;
-            }
-        }
-    }
-}
-
-void SkSSE2ProcCoeffXfermode::xfer16(uint16_t dst[], const SkPMColor src[],
-                                     int count, const SkAlpha aa[]) const {
-    SkASSERT(dst && src && count >= 0);
-
-    SkXfermodeProc proc = this->getProc();
-    SkXfermodeProcSIMD procSIMD = reinterpret_cast<SkXfermodeProcSIMD>(fProcSIMD);
-    SkASSERT(procSIMD != NULL);
-
-    if (NULL == aa) {
-        if (count >= 8) {
-            while (((size_t)dst & 0x0F) != 0) {
-                SkPMColor dstC = SkPixel16ToPixel32(*dst);
-                *dst = SkPixel32ToPixel16_ToU16(proc(*src, dstC));
-                dst++;
-                src++;
-                count--;
-            }
-
-            const __m128i* s = reinterpret_cast<const __m128i*>(src);
-            __m128i* d = reinterpret_cast<__m128i*>(dst);
-
-            while (count >= 8) {
-                __m128i src_pixel1 = _mm_loadu_si128(s++);
-                __m128i src_pixel2 = _mm_loadu_si128(s++);
-                __m128i dst_pixel = _mm_load_si128(d);
-
-                __m128i dst_pixel1 = _mm_unpacklo_epi16(dst_pixel, _mm_setzero_si128());
-                __m128i dst_pixel2 = _mm_unpackhi_epi16(dst_pixel, _mm_setzero_si128());
-
-                __m128i dstC1 = SkPixel16ToPixel32_SSE2(dst_pixel1);
-                __m128i dstC2 = SkPixel16ToPixel32_SSE2(dst_pixel2);
-
-                dst_pixel1 = procSIMD(src_pixel1, dstC1);
-                dst_pixel2 = procSIMD(src_pixel2, dstC2);
-                dst_pixel = SkPixel32ToPixel16_ToU16_SSE2(dst_pixel1, dst_pixel2);
-
-                _mm_store_si128(d++, dst_pixel);
-                count -= 8;
-            }
-
-            src = reinterpret_cast<const SkPMColor*>(s);
-            dst = reinterpret_cast<uint16_t*>(d);
-        }
-
-        for (int i = count - 1; i >= 0; --i) {
-            SkPMColor dstC = SkPixel16ToPixel32(*dst);
-            *dst = SkPixel32ToPixel16_ToU16(proc(*src, dstC));
-            dst++;
-            src++;
-        }
-    } else {
-        for (int i = count - 1; i >= 0; --i) {
-            unsigned a = aa[i];
-            if (0 != a) {
-                SkPMColor dstC = SkPixel16ToPixel32(dst[i]);
-                SkPMColor C = proc(src[i], dstC);
-                if (0xFF != a) {
-                    C = SkFourByteInterp(C, dstC, a);
-                }
-                dst[i] = SkPixel32ToPixel16_ToU16(C);
-            }
-        }
-    }
-}
-
-#ifndef SK_IGNORE_TO_STRING
-void SkSSE2ProcCoeffXfermode::toString(SkString* str) const {
-    this->INHERITED::toString(str);
-}
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-
-// 4 pixels modeprocs with SSE2
-SkXfermodeProcSIMD gSSE2XfermodeProcs[] = {
-    NULL, // kClear_Mode
-    NULL, // kSrc_Mode
-    NULL, // kDst_Mode
-    srcover_modeproc_SSE2,
-    dstover_modeproc_SSE2,
-    srcin_modeproc_SSE2,
-    dstin_modeproc_SSE2,
-    srcout_modeproc_SSE2,
-    dstout_modeproc_SSE2,
-    srcatop_modeproc_SSE2,
-    dstatop_modeproc_SSE2,
-    xor_modeproc_SSE2,
-    plus_modeproc_SSE2,
-    modulate_modeproc_SSE2,
-    screen_modeproc_SSE2,
-
-    overlay_modeproc_SSE2,
-    darken_modeproc_SSE2,
-    lighten_modeproc_SSE2,
-    colordodge_modeproc_SSE2,
-    colorburn_modeproc_SSE2,
-    hardlight_modeproc_SSE2,
-    softlight_modeproc_SSE2,
-    difference_modeproc_SSE2,
-    exclusion_modeproc_SSE2,
-    multiply_modeproc_SSE2,
-
-    NULL, // kHue_Mode
-    NULL, // kSaturation_Mode
-    NULL, // kColor_Mode
-    NULL, // kLuminosity_Mode
-};
-
-SkProcCoeffXfermode* SkPlatformXfermodeFactory_impl_SSE2(const ProcCoeff& rec,
-                                                         SkXfermode::Mode mode) {
-    void* procSIMD = reinterpret_cast<void*>(gSSE2XfermodeProcs[mode]);
-
-    if (procSIMD != NULL) {
-        return SkNEW_ARGS(SkSSE2ProcCoeffXfermode, (rec, mode, procSIMD));
-    }
-    return NULL;
-}
diff --git a/gfx/skia/skia/src/opts/SkXfermode_opts_SSE2.h b/gfx/skia/skia/src/opts/SkXfermode_opts_SSE2.h
deleted file mode 100644
index bfc143937a82..000000000000
--- a/gfx/skia/skia/src/opts/SkXfermode_opts_SSE2.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkXfermode_opts_SSE2_DEFINED
-#define SkXfermode_opts_SSE2_DEFINED
-
-#include "SkTypes.h"
-#include "SkXfermode_proccoeff.h"
-
-class SK_API SkSSE2ProcCoeffXfermode : public SkProcCoeffXfermode {
-public:
-    SkSSE2ProcCoeffXfermode(const ProcCoeff& rec, SkXfermode::Mode mode,
-                            void* procSIMD)
-        : INHERITED(rec, mode), fProcSIMD(procSIMD) {}
-
-    virtual void xfer32(SkPMColor dst[], const SkPMColor src[], int count,
-                        const SkAlpha aa[]) const SK_OVERRIDE;
-    virtual void xfer16(uint16_t dst[], const SkPMColor src[],
-                        int count, const SkAlpha aa[]) const SK_OVERRIDE;
-
-    SK_TO_STRING_OVERRIDE()
-    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSSE2ProcCoeffXfermode)
-
-private:
-    SkSSE2ProcCoeffXfermode(SkReadBuffer& buffer);
-
-    void* fProcSIMD;
-    typedef SkProcCoeffXfermode INHERITED;
-};
-
-SkProcCoeffXfermode* SkPlatformXfermodeFactory_impl_SSE2(const ProcCoeff& rec,
-                                                         SkXfermode::Mode mode);
-
-#endif // SkXfermode_opts_SSE2_DEFINED
diff --git a/gfx/skia/skia/src/opts/SkXfermode_opts_arm.cpp b/gfx/skia/skia/src/opts/SkXfermode_opts_arm.cpp
deleted file mode 100644
index 2a796d6f6a41..000000000000
--- a/gfx/skia/skia/src/opts/SkXfermode_opts_arm.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "SkXfermode.h"
-#include "SkXfermode_proccoeff.h"
-#include "SkUtilsArm.h"
-
-extern SkProcCoeffXfermode* SkPlatformXfermodeFactory_impl_neon(const ProcCoeff& rec,
-                                                                SkXfermode::Mode mode);
-
-extern SkXfermodeProc SkPlatformXfermodeProcFactory_impl_neon(SkXfermode::Mode mode);
-
-SkProcCoeffXfermode* SkPlatformXfermodeFactory_impl(const ProcCoeff& rec,
-                                                    SkXfermode::Mode mode) {
-    return NULL;
-}
-
-SkXfermodeProc SkPlatformXfermodeProcFactory_impl(SkXfermode::Mode mode) {
-    return NULL;
-}
-
-SkProcCoeffXfermode* SkPlatformXfermodeFactory(const ProcCoeff& rec,
-                                               SkXfermode::Mode mode) {
-    return SK_ARM_NEON_WRAP(SkPlatformXfermodeFactory_impl)(rec, mode);
-}
-
-SkXfermodeProc SkPlatformXfermodeProcFactory(SkXfermode::Mode mode) {
-    return SK_ARM_NEON_WRAP(SkPlatformXfermodeProcFactory_impl)(mode);
-}
diff --git a/gfx/skia/skia/src/opts/SkXfermode_opts_arm_neon.cpp b/gfx/skia/skia/src/opts/SkXfermode_opts_arm_neon.cpp
deleted file mode 100644
index 88c179d9e827..000000000000
--- a/gfx/skia/skia/src/opts/SkXfermode_opts_arm_neon.cpp
+++ /dev/null
@@ -1,1028 +0,0 @@
-#include "SkXfermode.h"
-#include "SkXfermode_proccoeff.h"
-#include "SkColorPriv.h"
-
-#include <arm_neon.h>
-#include "SkColor_opts_neon.h"
-#include "SkXfermode_opts_arm_neon.h"
-
-#define SkAlphaMulAlpha(a, b)   SkMulDiv255Round(a, b)
-
-
-////////////////////////////////////////////////////////////////////////////////
-// NEONized skia functions
-////////////////////////////////////////////////////////////////////////////////
-
-static inline uint8x8_t SkAlphaMulAlpha_neon8(uint8x8_t color, uint8x8_t alpha) {
-    uint16x8_t tmp;
-    uint8x8_t ret;
-
-    tmp = vmull_u8(color, alpha);
-    tmp = vaddq_u16(tmp, vdupq_n_u16(128));
-    tmp = vaddq_u16(tmp, vshrq_n_u16(tmp, 8));
-
-    ret = vshrn_n_u16(tmp, 8);
-
-    return ret;
-}
-
-static inline uint16x8_t SkAlphaMulAlpha_neon8_16(uint8x8_t color, uint8x8_t alpha) {
-    uint16x8_t ret;
-
-    ret = vmull_u8(color, alpha);
-    ret = vaddq_u16(ret, vdupq_n_u16(128));
-    ret = vaddq_u16(ret, vshrq_n_u16(ret, 8));
-
-    ret = vshrq_n_u16(ret, 8);
-
-    return ret;
-}
-
-static inline uint8x8_t SkDiv255Round_neon8_32_8(int32x4_t p1, int32x4_t p2) {
-    uint16x8_t tmp;
-
-#ifdef SK_CPU_ARM64
-    tmp = vmovn_high_u32(vmovn_u32(vreinterpretq_u32_s32(p1)),
-                         vreinterpretq_u32_s32(p2));
-#else
-    tmp = vcombine_u16(vmovn_u32(vreinterpretq_u32_s32(p1)),
-                       vmovn_u32(vreinterpretq_u32_s32(p2)));
-#endif
-
-    tmp += vdupq_n_u16(128);
-    tmp += vshrq_n_u16(tmp, 8);
-
-    return vshrn_n_u16(tmp, 8);
-}
-
-static inline uint16x8_t SkDiv255Round_neon8_16_16(uint16x8_t prod) {
-    prod += vdupq_n_u16(128);
-    prod += vshrq_n_u16(prod, 8);
-
-    return vshrq_n_u16(prod, 8);
-}
-
-static inline uint8x8_t clamp_div255round_simd8_32(int32x4_t val1, int32x4_t val2) {
-    uint8x8_t ret;
-    uint32x4_t cmp1, cmp2;
-    uint16x8_t cmp16;
-    uint8x8_t cmp8, cmp8_1;
-
-    // Test if <= 0
-    cmp1 = vcleq_s32(val1, vdupq_n_s32(0));
-    cmp2 = vcleq_s32(val2, vdupq_n_s32(0));
-#ifdef SK_CPU_ARM64
-    cmp16 = vmovn_high_u32(vmovn_u32(cmp1), cmp2);
-#else
-    cmp16 = vcombine_u16(vmovn_u32(cmp1), vmovn_u32(cmp2));
-#endif
-    cmp8_1 = vmovn_u16(cmp16);
-
-    // Init to zero
-    ret = vdup_n_u8(0);
-
-    // Test if >= 255*255
-    cmp1 = vcgeq_s32(val1, vdupq_n_s32(255*255));
-    cmp2 = vcgeq_s32(val2, vdupq_n_s32(255*255));
-#ifdef SK_CPU_ARM64
-    cmp16 = vmovn_high_u32(vmovn_u32(cmp1), cmp2);
-#else
-    cmp16 = vcombine_u16(vmovn_u32(cmp1), vmovn_u32(cmp2));
-#endif
-    cmp8 = vmovn_u16(cmp16);
-
-    // Insert 255 where true
-    ret = vbsl_u8(cmp8, vdup_n_u8(255), ret);
-
-    // Calc SkDiv255Round
-    uint8x8_t div = SkDiv255Round_neon8_32_8(val1, val2);
-
-    // Insert where false and previous test false
-    cmp8 = cmp8 | cmp8_1;
-    ret = vbsl_u8(cmp8, ret, div);
-
-    // Return the final combination
-    return ret;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// 1 pixel modeprocs
-////////////////////////////////////////////////////////////////////////////////
-
-//  kSrcATop_Mode,  //!< [Da, Sc * Da + (1 - Sa) * Dc]
-SkPMColor srcatop_modeproc_neon(SkPMColor src, SkPMColor dst) {
-    unsigned sa = SkGetPackedA32(src);
-    unsigned da = SkGetPackedA32(dst);
-    unsigned isa = 255 - sa;
-
-    uint8x8_t vda, visa, vsrc, vdst;
-
-    vda = vdup_n_u8(da);
-    visa = vdup_n_u8(isa);
-
-    uint16x8_t vsrc_wide, vdst_wide;
-    vsrc_wide = vmull_u8(vda, vreinterpret_u8_u32(vdup_n_u32(src)));
-    vdst_wide = vmull_u8(visa, vreinterpret_u8_u32(vdup_n_u32(dst)));
-
-    vsrc_wide += vdupq_n_u16(128);
-    vsrc_wide += vshrq_n_u16(vsrc_wide, 8);
-
-    vdst_wide += vdupq_n_u16(128);
-    vdst_wide += vshrq_n_u16(vdst_wide, 8);
-
-    vsrc = vshrn_n_u16(vsrc_wide, 8);
-    vdst = vshrn_n_u16(vdst_wide, 8);
-
-    vsrc += vdst;
-    vsrc = vset_lane_u8(da, vsrc, 3);
-
-    return vget_lane_u32(vreinterpret_u32_u8(vsrc), 0);
-}
-
-//  kDstATop_Mode,  //!< [Sa, Sa * Dc + Sc * (1 - Da)]
-SkPMColor dstatop_modeproc_neon(SkPMColor src, SkPMColor dst) {
-    unsigned sa = SkGetPackedA32(src);
-    unsigned da = SkGetPackedA32(dst);
-    unsigned ida = 255 - da;
-
-    uint8x8_t vsa, vida, vsrc, vdst;
-
-    vsa = vdup_n_u8(sa);
-    vida = vdup_n_u8(ida);
-
-    uint16x8_t vsrc_wide, vdst_wide;
-    vsrc_wide = vmull_u8(vida, vreinterpret_u8_u32(vdup_n_u32(src)));
-    vdst_wide = vmull_u8(vsa, vreinterpret_u8_u32(vdup_n_u32(dst)));
-
-    vsrc_wide += vdupq_n_u16(128);
-    vsrc_wide += vshrq_n_u16(vsrc_wide, 8);
-
-    vdst_wide += vdupq_n_u16(128);
-    vdst_wide += vshrq_n_u16(vdst_wide, 8);
-
-    vsrc = vshrn_n_u16(vsrc_wide, 8);
-    vdst = vshrn_n_u16(vdst_wide, 8);
-
-    vsrc += vdst;
-    vsrc = vset_lane_u8(sa, vsrc, 3);
-
-    return vget_lane_u32(vreinterpret_u32_u8(vsrc), 0);
-}
-
-//  kXor_Mode   [Sa + Da - 2 * Sa * Da, Sc * (1 - Da) + (1 - Sa) * Dc]
-SkPMColor xor_modeproc_neon(SkPMColor src, SkPMColor dst) {
-    unsigned sa = SkGetPackedA32(src);
-    unsigned da = SkGetPackedA32(dst);
-    unsigned ret_alpha = sa + da - (SkAlphaMulAlpha(sa, da) << 1);
-    unsigned isa = 255 - sa;
-    unsigned ida = 255 - da;
-
-    uint8x8_t vsrc, vdst, visa, vida;
-    uint16x8_t vsrc_wide, vdst_wide;
-
-    visa = vdup_n_u8(isa);
-    vida = vdup_n_u8(ida);
-    vsrc = vreinterpret_u8_u32(vdup_n_u32(src));
-    vdst = vreinterpret_u8_u32(vdup_n_u32(dst));
-
-    vsrc_wide = vmull_u8(vsrc, vida);
-    vdst_wide = vmull_u8(vdst, visa);
-
-    vsrc_wide += vdupq_n_u16(128);
-    vsrc_wide += vshrq_n_u16(vsrc_wide, 8);
-
-    vdst_wide += vdupq_n_u16(128);
-    vdst_wide += vshrq_n_u16(vdst_wide, 8);
-
-    vsrc = vshrn_n_u16(vsrc_wide, 8);
-    vdst = vshrn_n_u16(vdst_wide, 8);
-
-    vsrc += vdst;
-
-    vsrc = vset_lane_u8(ret_alpha, vsrc, 3);
-
-    return vget_lane_u32(vreinterpret_u32_u8(vsrc), 0);
-}
-
-// kPlus_Mode
-SkPMColor plus_modeproc_neon(SkPMColor src, SkPMColor dst) {
-    uint8x8_t vsrc, vdst;
-    vsrc = vreinterpret_u8_u32(vdup_n_u32(src));
-    vdst = vreinterpret_u8_u32(vdup_n_u32(dst));
-    vsrc = vqadd_u8(vsrc, vdst);
-
-    return vget_lane_u32(vreinterpret_u32_u8(vsrc), 0);
-}
-
-// kModulate_Mode
-SkPMColor modulate_modeproc_neon(SkPMColor src, SkPMColor dst) {
-    uint8x8_t vsrc, vdst, vres;
-    uint16x8_t vres_wide;
-
-    vsrc = vreinterpret_u8_u32(vdup_n_u32(src));
-    vdst = vreinterpret_u8_u32(vdup_n_u32(dst));
-
-    vres_wide = vmull_u8(vsrc, vdst);
-
-    vres_wide += vdupq_n_u16(128);
-    vres_wide += vshrq_n_u16(vres_wide, 8);
-
-    vres = vshrn_n_u16(vres_wide, 8);
-
-    return vget_lane_u32(vreinterpret_u32_u8(vres), 0);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// 8 pixels modeprocs
-////////////////////////////////////////////////////////////////////////////////
-
-uint8x8x4_t dstover_modeproc_neon8(uint8x8x4_t src, uint8x8x4_t dst) {
-    uint8x8x4_t ret;
-    uint16x8_t src_scale;
-
-    src_scale = vsubw_u8(vdupq_n_u16(256), dst.val[NEON_A]);
-
-    ret.val[NEON_A] = dst.val[NEON_A] + SkAlphaMul_neon8(src.val[NEON_A], src_scale);
-    ret.val[NEON_R] = dst.val[NEON_R] + SkAlphaMul_neon8(src.val[NEON_R], src_scale);
-    ret.val[NEON_G] = dst.val[NEON_G] + SkAlphaMul_neon8(src.val[NEON_G], src_scale);
-    ret.val[NEON_B] = dst.val[NEON_B] + SkAlphaMul_neon8(src.val[NEON_B], src_scale);
-
-    return ret;
-}
-
-uint8x8x4_t srcin_modeproc_neon8(uint8x8x4_t src, uint8x8x4_t dst) {
-    uint8x8x4_t ret;
-    uint16x8_t scale;
-
-    scale = SkAlpha255To256_neon8(dst.val[NEON_A]);
-
-    ret.val[NEON_A] = SkAlphaMul_neon8(src.val[NEON_A], scale);
-    ret.val[NEON_R] = SkAlphaMul_neon8(src.val[NEON_R], scale);
-    ret.val[NEON_G] = SkAlphaMul_neon8(src.val[NEON_G], scale);
-    ret.val[NEON_B] = SkAlphaMul_neon8(src.val[NEON_B], scale);
-
-    return ret;
-}
-
-uint8x8x4_t dstin_modeproc_neon8(uint8x8x4_t src, uint8x8x4_t dst) {
-    uint8x8x4_t ret;
-    uint16x8_t scale;
-
-    scale = SkAlpha255To256_neon8(src.val[NEON_A]);
-
-    ret = SkAlphaMulQ_neon8(dst, scale);
-
-    return ret;
-}
-
-uint8x8x4_t srcout_modeproc_neon8(uint8x8x4_t src, uint8x8x4_t dst) {
-    uint8x8x4_t ret;
-    uint16x8_t scale = vsubw_u8(vdupq_n_u16(256), dst.val[NEON_A]);
-
-    ret = SkAlphaMulQ_neon8(src, scale);
-
-    return ret;
-}
-
-uint8x8x4_t dstout_modeproc_neon8(uint8x8x4_t src, uint8x8x4_t dst) {
-    uint8x8x4_t ret;
-    uint16x8_t scale = vsubw_u8(vdupq_n_u16(256), src.val[NEON_A]);
-
-    ret = SkAlphaMulQ_neon8(dst, scale);
-
-    return ret;
-}
-
-uint8x8x4_t srcatop_modeproc_neon8(uint8x8x4_t src, uint8x8x4_t dst) {
-    uint8x8x4_t ret;
-    uint8x8_t isa;
-
-    isa = vsub_u8(vdup_n_u8(255), src.val[NEON_A]);
-
-    ret.val[NEON_A] = dst.val[NEON_A];
-    ret.val[NEON_R] = SkAlphaMulAlpha_neon8(src.val[NEON_R], dst.val[NEON_A])
-                      + SkAlphaMulAlpha_neon8(dst.val[NEON_R], isa);
-    ret.val[NEON_G] = SkAlphaMulAlpha_neon8(src.val[NEON_G], dst.val[NEON_A])
-                      + SkAlphaMulAlpha_neon8(dst.val[NEON_G], isa);
-    ret.val[NEON_B] = SkAlphaMulAlpha_neon8(src.val[NEON_B], dst.val[NEON_A])
-                      + SkAlphaMulAlpha_neon8(dst.val[NEON_B], isa);
-
-    return ret;
-}
-
-uint8x8x4_t dstatop_modeproc_neon8(uint8x8x4_t src, uint8x8x4_t dst) {
-    uint8x8x4_t ret;
-    uint8x8_t ida;
-
-    ida = vsub_u8(vdup_n_u8(255), dst.val[NEON_A]);
-
-    ret.val[NEON_A] = src.val[NEON_A];
-    ret.val[NEON_R] = SkAlphaMulAlpha_neon8(src.val[NEON_R], ida)
-                      + SkAlphaMulAlpha_neon8(dst.val[NEON_R], src.val[NEON_A]);
-    ret.val[NEON_G] = SkAlphaMulAlpha_neon8(src.val[NEON_G], ida)
-                      + SkAlphaMulAlpha_neon8(dst.val[NEON_G], src.val[NEON_A]);
-    ret.val[NEON_B] = SkAlphaMulAlpha_neon8(src.val[NEON_B], ida)
-                      + SkAlphaMulAlpha_neon8(dst.val[NEON_B], src.val[NEON_A]);
-
-    return ret;
-}
-
-uint8x8x4_t xor_modeproc_neon8(uint8x8x4_t src, uint8x8x4_t dst) {
-    uint8x8x4_t ret;
-    uint8x8_t isa, ida;
-    uint16x8_t tmp_wide, tmp_wide2;
-
-    isa = vsub_u8(vdup_n_u8(255), src.val[NEON_A]);
-    ida = vsub_u8(vdup_n_u8(255), dst.val[NEON_A]);
-
-    // First calc alpha
-    tmp_wide = vmovl_u8(src.val[NEON_A]);
-    tmp_wide = vaddw_u8(tmp_wide, dst.val[NEON_A]);
-    tmp_wide2 = vshll_n_u8(SkAlphaMulAlpha_neon8(src.val[NEON_A], dst.val[NEON_A]), 1);
-    tmp_wide = vsubq_u16(tmp_wide, tmp_wide2);
-    ret.val[NEON_A] = vmovn_u16(tmp_wide);
-
-    // Then colors
-    ret.val[NEON_R] = SkAlphaMulAlpha_neon8(src.val[NEON_R], ida)
-                      + SkAlphaMulAlpha_neon8(dst.val[NEON_R], isa);
-    ret.val[NEON_G] = SkAlphaMulAlpha_neon8(src.val[NEON_G], ida)
-                      + SkAlphaMulAlpha_neon8(dst.val[NEON_G], isa);
-    ret.val[NEON_B] = SkAlphaMulAlpha_neon8(src.val[NEON_B], ida)
-                      + SkAlphaMulAlpha_neon8(dst.val[NEON_B], isa);
-
-    return ret;
-}
-
-uint8x8x4_t plus_modeproc_neon8(uint8x8x4_t src, uint8x8x4_t dst) {
-    uint8x8x4_t ret;
-
-    ret.val[NEON_A] = vqadd_u8(src.val[NEON_A], dst.val[NEON_A]);
-    ret.val[NEON_R] = vqadd_u8(src.val[NEON_R], dst.val[NEON_R]);
-    ret.val[NEON_G] = vqadd_u8(src.val[NEON_G], dst.val[NEON_G]);
-    ret.val[NEON_B] = vqadd_u8(src.val[NEON_B], dst.val[NEON_B]);
-
-    return ret;
-}
-
-uint8x8x4_t modulate_modeproc_neon8(uint8x8x4_t src, uint8x8x4_t dst) {
-    uint8x8x4_t ret;
-
-    ret.val[NEON_A] = SkAlphaMulAlpha_neon8(src.val[NEON_A], dst.val[NEON_A]);
-    ret.val[NEON_R] = SkAlphaMulAlpha_neon8(src.val[NEON_R], dst.val[NEON_R]);
-    ret.val[NEON_G] = SkAlphaMulAlpha_neon8(src.val[NEON_G], dst.val[NEON_G]);
-    ret.val[NEON_B] = SkAlphaMulAlpha_neon8(src.val[NEON_B], dst.val[NEON_B]);
-
-    return ret;
-}
-
-static inline uint8x8_t srcover_color(uint8x8_t a, uint8x8_t b) {
-    uint16x8_t tmp;
-
-    tmp = vaddl_u8(a, b);
-    tmp -= SkAlphaMulAlpha_neon8_16(a, b);
-
-    return vmovn_u16(tmp);
-}
-
-uint8x8x4_t screen_modeproc_neon8(uint8x8x4_t src, uint8x8x4_t dst) {
-    uint8x8x4_t ret;
-
-    ret.val[NEON_A] = srcover_color(src.val[NEON_A], dst.val[NEON_A]);
-    ret.val[NEON_R] = srcover_color(src.val[NEON_R], dst.val[NEON_R]);
-    ret.val[NEON_G] = srcover_color(src.val[NEON_G], dst.val[NEON_G]);
-    ret.val[NEON_B] = srcover_color(src.val[NEON_B], dst.val[NEON_B]);
-
-    return ret;
-}
-
-template <bool overlay>
-static inline uint8x8_t overlay_hardlight_color(uint8x8_t sc, uint8x8_t dc,
-                                               uint8x8_t sa, uint8x8_t da) {
-    /*
-     * In the end we're gonna use (rc + tmp) with a different rc
-     * coming from an alternative.
-     * The whole value (rc + tmp) can always be expressed as
-     * VAL = COM - SUB in the if case
-     * VAL = COM + SUB - sa*da in the else case
-     *
-     * with COM = 255 * (sc + dc)
-     * and  SUB = sc*da + dc*sa - 2*dc*sc
-     */
-
-    // Prepare common subexpressions
-    uint16x8_t const255 = vdupq_n_u16(255);
-    uint16x8_t sc_plus_dc = vaddl_u8(sc, dc);
-    uint16x8_t scda = vmull_u8(sc, da);
-    uint16x8_t dcsa = vmull_u8(dc, sa);
-    uint16x8_t sada = vmull_u8(sa, da);
-
-    // Prepare non common subexpressions
-    uint16x8_t dc2, sc2;
-    uint32x4_t scdc2_1, scdc2_2;
-    if (overlay) {
-        dc2 = vshll_n_u8(dc, 1);
-        scdc2_1 = vmull_u16(vget_low_u16(dc2), vget_low_u16(vmovl_u8(sc)));
-#ifdef SK_CPU_ARM64
-        scdc2_2 = vmull_high_u16(dc2, vmovl_u8(sc));
-#else
-        scdc2_2 = vmull_u16(vget_high_u16(dc2), vget_high_u16(vmovl_u8(sc)));
-#endif
-    } else {
-        sc2 = vshll_n_u8(sc, 1);
-        scdc2_1 = vmull_u16(vget_low_u16(sc2), vget_low_u16(vmovl_u8(dc)));
-#ifdef SK_CPU_ARM64
-        scdc2_2 = vmull_high_u16(sc2, vmovl_u8(dc));
-#else
-        scdc2_2 = vmull_u16(vget_high_u16(sc2), vget_high_u16(vmovl_u8(dc)));
-#endif
-    }
-
-    // Calc COM
-    int32x4_t com1, com2;
-    com1 = vreinterpretq_s32_u32(
-                vmull_u16(vget_low_u16(const255), vget_low_u16(sc_plus_dc)));
-    com2 = vreinterpretq_s32_u32(
-#ifdef SK_CPU_ARM64
-                vmull_high_u16(const255, sc_plus_dc));
-#else
-                vmull_u16(vget_high_u16(const255), vget_high_u16(sc_plus_dc)));
-#endif
-
-    // Calc SUB
-    int32x4_t sub1, sub2;
-    sub1 = vreinterpretq_s32_u32(vaddl_u16(vget_low_u16(scda), vget_low_u16(dcsa)));
-#ifdef SK_CPU_ARM64
-    sub2 = vreinterpretq_s32_u32(vaddl_high_u16(scda, dcsa));
-#else
-    sub2 = vreinterpretq_s32_u32(vaddl_u16(vget_high_u16(scda), vget_high_u16(dcsa)));
-#endif
-    sub1 = vsubq_s32(sub1, vreinterpretq_s32_u32(scdc2_1));
-    sub2 = vsubq_s32(sub2, vreinterpretq_s32_u32(scdc2_2));
-
-    // Compare 2*dc <= da
-    uint16x8_t cmp;
-
-    if (overlay) {
-        cmp = vcleq_u16(dc2, vmovl_u8(da));
-    } else {
-        cmp = vcleq_u16(sc2, vmovl_u8(sa));
-    }
-
-    // Prepare variables
-    int32x4_t val1_1, val1_2;
-    int32x4_t val2_1, val2_2;
-    uint32x4_t cmp1, cmp2;
-
-    // Doing a signed lengthening allows to save a few instructions
-    // thanks to sign extension.
-    cmp1 = vreinterpretq_u32_s32(vmovl_s16(vreinterpret_s16_u16(vget_low_u16(cmp))));
-#ifdef SK_CPU_ARM64
-    cmp2 = vreinterpretq_u32_s32(vmovl_high_s16(vreinterpretq_s16_u16(cmp)));
-#else
-    cmp2 = vreinterpretq_u32_s32(vmovl_s16(vreinterpret_s16_u16(vget_high_u16(cmp))));
-#endif
-
-    // Calc COM - SUB
-    val1_1 = com1 - sub1;
-    val1_2 = com2 - sub2;
-
-    // Calc COM + SUB - sa*da
-    val2_1 = com1 + sub1;
-    val2_2 = com2 + sub2;
-
-    val2_1 = vsubq_s32(val2_1, vreinterpretq_s32_u32(vmovl_u16(vget_low_u16(sada))));
-#ifdef SK_CPU_ARM64
-    val2_2 = vsubq_s32(val2_2, vreinterpretq_s32_u32(vmovl_high_u16(sada)));
-#else
-    val2_2 = vsubq_s32(val2_2, vreinterpretq_s32_u32(vmovl_u16(vget_high_u16(sada))));
-#endif
-
-    // Insert where needed
-    val1_1 = vbslq_s32(cmp1, val1_1, val2_1);
-    val1_2 = vbslq_s32(cmp2, val1_2, val2_2);
-
-    // Call the clamp_div255round function
-    return clamp_div255round_simd8_32(val1_1, val1_2);
-}
-
-static inline uint8x8_t overlay_color(uint8x8_t sc, uint8x8_t dc,
-                                      uint8x8_t sa, uint8x8_t da) {
-    return overlay_hardlight_color<true>(sc, dc, sa, da);
-}
-
-uint8x8x4_t overlay_modeproc_neon8(uint8x8x4_t src, uint8x8x4_t dst) {
-    uint8x8x4_t ret;
-
-    ret.val[NEON_A] = srcover_color(src.val[NEON_A], dst.val[NEON_A]);
-    ret.val[NEON_R] = overlay_color(src.val[NEON_R], dst.val[NEON_R],
-                                    src.val[NEON_A], dst.val[NEON_A]);
-    ret.val[NEON_G] = overlay_color(src.val[NEON_G], dst.val[NEON_G],
-                                    src.val[NEON_A], dst.val[NEON_A]);
-    ret.val[NEON_B] = overlay_color(src.val[NEON_B], dst.val[NEON_B],
-                                    src.val[NEON_A], dst.val[NEON_A]);
-
-    return ret;
-}
-
-template <bool lighten>
-static inline uint8x8_t lighten_darken_color(uint8x8_t sc, uint8x8_t dc,
-                                             uint8x8_t sa, uint8x8_t da) {
-    uint16x8_t sd, ds, cmp, tmp, tmp2;
-
-    // Prepare
-    sd = vmull_u8(sc, da);
-    ds = vmull_u8(dc, sa);
-
-    // Do test
-    if (lighten) {
-        cmp = vcgtq_u16(sd, ds);
-    } else {
-        cmp = vcltq_u16(sd, ds);
-    }
-
-    // Assign if
-    tmp = vaddl_u8(sc, dc);
-    tmp2 = tmp;
-    tmp -= SkDiv255Round_neon8_16_16(ds);
-
-    // Calc else
-    tmp2 -= SkDiv255Round_neon8_16_16(sd);
-
-    // Insert where needed
-    tmp = vbslq_u16(cmp, tmp, tmp2);
-
-    return vmovn_u16(tmp);
-}
-
-static inline uint8x8_t darken_color(uint8x8_t sc, uint8x8_t dc,
-                                     uint8x8_t sa, uint8x8_t da) {
-    return lighten_darken_color<false>(sc, dc, sa, da);
-}
-
-uint8x8x4_t darken_modeproc_neon8(uint8x8x4_t src, uint8x8x4_t dst) {
-    uint8x8x4_t ret;
-
-    ret.val[NEON_A] = srcover_color(src.val[NEON_A], dst.val[NEON_A]);
-    ret.val[NEON_R] = darken_color(src.val[NEON_R], dst.val[NEON_R],
-                                   src.val[NEON_A], dst.val[NEON_A]);
-    ret.val[NEON_G] = darken_color(src.val[NEON_G], dst.val[NEON_G],
-                                   src.val[NEON_A], dst.val[NEON_A]);
-    ret.val[NEON_B] = darken_color(src.val[NEON_B], dst.val[NEON_B],
-                                   src.val[NEON_A], dst.val[NEON_A]);
-
-    return ret;
-}
-
-static inline uint8x8_t lighten_color(uint8x8_t sc, uint8x8_t dc,
-                                      uint8x8_t sa, uint8x8_t da) {
-    return lighten_darken_color<true>(sc, dc, sa, da);
-}
-
-uint8x8x4_t lighten_modeproc_neon8(uint8x8x4_t src, uint8x8x4_t dst) {
-    uint8x8x4_t ret;
-
-    ret.val[NEON_A] = srcover_color(src.val[NEON_A], dst.val[NEON_A]);
-    ret.val[NEON_R] = lighten_color(src.val[NEON_R], dst.val[NEON_R],
-                                    src.val[NEON_A], dst.val[NEON_A]);
-    ret.val[NEON_G] = lighten_color(src.val[NEON_G], dst.val[NEON_G],
-                                    src.val[NEON_A], dst.val[NEON_A]);
-    ret.val[NEON_B] = lighten_color(src.val[NEON_B], dst.val[NEON_B],
-                                    src.val[NEON_A], dst.val[NEON_A]);
-
-    return ret;
-}
-
-static inline uint8x8_t hardlight_color(uint8x8_t sc, uint8x8_t dc,
-                                        uint8x8_t sa, uint8x8_t da) {
-    return overlay_hardlight_color<false>(sc, dc, sa, da);
-}
-
-uint8x8x4_t hardlight_modeproc_neon8(uint8x8x4_t src, uint8x8x4_t dst) {
-    uint8x8x4_t ret;
-
-    ret.val[NEON_A] = srcover_color(src.val[NEON_A], dst.val[NEON_A]);
-    ret.val[NEON_R] = hardlight_color(src.val[NEON_R], dst.val[NEON_R],
-                                      src.val[NEON_A], dst.val[NEON_A]);
-    ret.val[NEON_G] = hardlight_color(src.val[NEON_G], dst.val[NEON_G],
-                                      src.val[NEON_A], dst.val[NEON_A]);
-    ret.val[NEON_B] = hardlight_color(src.val[NEON_B], dst.val[NEON_B],
-                                      src.val[NEON_A], dst.val[NEON_A]);
-
-    return ret;
-}
-
-static inline uint8x8_t difference_color(uint8x8_t sc, uint8x8_t dc,
-                                         uint8x8_t sa, uint8x8_t da) {
-    uint16x8_t sd, ds, tmp;
-    int16x8_t val;
-
-    sd = vmull_u8(sc, da);
-    ds = vmull_u8(dc, sa);
-
-    tmp = vminq_u16(sd, ds);
-    tmp = SkDiv255Round_neon8_16_16(tmp);
-    tmp = vshlq_n_u16(tmp, 1);
-
-    val = vreinterpretq_s16_u16(vaddl_u8(sc, dc));
-
-    val -= vreinterpretq_s16_u16(tmp);
-
-    val = vmaxq_s16(val, vdupq_n_s16(0));
-    val = vminq_s16(val, vdupq_n_s16(255));
-
-    return vmovn_u16(vreinterpretq_u16_s16(val));
-}
-
-uint8x8x4_t difference_modeproc_neon8(uint8x8x4_t src, uint8x8x4_t dst) {
-    uint8x8x4_t ret;
-
-    ret.val[NEON_A] = srcover_color(src.val[NEON_A], dst.val[NEON_A]);
-    ret.val[NEON_R] = difference_color(src.val[NEON_R], dst.val[NEON_R],
-                                       src.val[NEON_A], dst.val[NEON_A]);
-    ret.val[NEON_G] = difference_color(src.val[NEON_G], dst.val[NEON_G],
-                                       src.val[NEON_A], dst.val[NEON_A]);
-    ret.val[NEON_B] = difference_color(src.val[NEON_B], dst.val[NEON_B],
-                                       src.val[NEON_A], dst.val[NEON_A]);
-
-    return ret;
-}
-
-static inline uint8x8_t exclusion_color(uint8x8_t sc, uint8x8_t dc,
-                                        uint8x8_t sa, uint8x8_t da) {
-    /* The equation can be simplified to 255(sc + dc) - 2 * sc * dc */
-
-    uint16x8_t sc_plus_dc, scdc, const255;
-    int32x4_t term1_1, term1_2, term2_1, term2_2;
-
-    /* Calc (sc + dc) and (sc * dc) */
-    sc_plus_dc = vaddl_u8(sc, dc);
-    scdc = vmull_u8(sc, dc);
-
-    /* Prepare constants */
-    const255 = vdupq_n_u16(255);
-
-    /* Calc the first term */
-    term1_1 = vreinterpretq_s32_u32(
-                vmull_u16(vget_low_u16(const255), vget_low_u16(sc_plus_dc)));
-    term1_2 = vreinterpretq_s32_u32(
-#ifdef SK_CPU_ARM64
-                vmull_high_u16(const255, sc_plus_dc));
-#else
-                vmull_u16(vget_high_u16(const255), vget_high_u16(sc_plus_dc)));
-#endif
-
-    /* Calc the second term */
-    term2_1 = vreinterpretq_s32_u32(vshll_n_u16(vget_low_u16(scdc), 1));
-#ifdef SK_CPU_ARM64
-    term2_2 = vreinterpretq_s32_u32(vshll_high_n_u16(scdc, 1));
-#else
-    term2_2 = vreinterpretq_s32_u32(vshll_n_u16(vget_high_u16(scdc), 1));
-#endif
-
-    return clamp_div255round_simd8_32(term1_1 - term2_1, term1_2 - term2_2);
-}
-
-uint8x8x4_t exclusion_modeproc_neon8(uint8x8x4_t src, uint8x8x4_t dst) {
-    uint8x8x4_t ret;
-
-    ret.val[NEON_A] = srcover_color(src.val[NEON_A], dst.val[NEON_A]);
-    ret.val[NEON_R] = exclusion_color(src.val[NEON_R], dst.val[NEON_R],
-                                      src.val[NEON_A], dst.val[NEON_A]);
-    ret.val[NEON_G] = exclusion_color(src.val[NEON_G], dst.val[NEON_G],
-                                      src.val[NEON_A], dst.val[NEON_A]);
-    ret.val[NEON_B] = exclusion_color(src.val[NEON_B], dst.val[NEON_B],
-                                      src.val[NEON_A], dst.val[NEON_A]);
-
-    return ret;
-}
-
-static inline uint8x8_t blendfunc_multiply_color(uint8x8_t sc, uint8x8_t dc,
-                                                 uint8x8_t sa, uint8x8_t da) {
-    uint32x4_t val1, val2;
-    uint16x8_t scdc, t1, t2;
-
-    t1 = vmull_u8(sc, vdup_n_u8(255) - da);
-    t2 = vmull_u8(dc, vdup_n_u8(255) - sa);
-    scdc = vmull_u8(sc, dc);
-
-    val1 = vaddl_u16(vget_low_u16(t1), vget_low_u16(t2));
-#ifdef SK_CPU_ARM64
-    val2 = vaddl_high_u16(t1, t2);
-#else
-    val2 = vaddl_u16(vget_high_u16(t1), vget_high_u16(t2));
-#endif
-
-    val1 = vaddw_u16(val1, vget_low_u16(scdc));
-#ifdef SK_CPU_ARM64
-    val2 = vaddw_high_u16(val2, scdc);
-#else
-    val2 = vaddw_u16(val2, vget_high_u16(scdc));
-#endif
-
-    return clamp_div255round_simd8_32(
-                vreinterpretq_s32_u32(val1), vreinterpretq_s32_u32(val2));
-}
-
-uint8x8x4_t multiply_modeproc_neon8(uint8x8x4_t src, uint8x8x4_t dst) {
-    uint8x8x4_t ret;
-
-    ret.val[NEON_A] = srcover_color(src.val[NEON_A], dst.val[NEON_A]);
-    ret.val[NEON_R] = blendfunc_multiply_color(src.val[NEON_R], dst.val[NEON_R],
-                                               src.val[NEON_A], dst.val[NEON_A]);
-    ret.val[NEON_G] = blendfunc_multiply_color(src.val[NEON_G], dst.val[NEON_G],
-                                               src.val[NEON_A], dst.val[NEON_A]);
-    ret.val[NEON_B] = blendfunc_multiply_color(src.val[NEON_B], dst.val[NEON_B],
-                                               src.val[NEON_A], dst.val[NEON_A]);
-
-    return ret;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-typedef uint8x8x4_t (*SkXfermodeProcSIMD)(uint8x8x4_t src, uint8x8x4_t dst);
-
-extern SkXfermodeProcSIMD gNEONXfermodeProcs[];
-
-SkNEONProcCoeffXfermode::SkNEONProcCoeffXfermode(SkReadBuffer& buffer)
-        : INHERITED(buffer) {
-    fProcSIMD = reinterpret_cast<void*>(gNEONXfermodeProcs[this->getMode()]);
-}
-
-void SkNEONProcCoeffXfermode::xfer32(SkPMColor* SK_RESTRICT dst,
-                                     const SkPMColor* SK_RESTRICT src, int count,
-                                     const SkAlpha* SK_RESTRICT aa) const {
-    SkASSERT(dst && src && count >= 0);
-
-    SkXfermodeProc proc = this->getProc();
-    SkXfermodeProcSIMD procSIMD = reinterpret_cast<SkXfermodeProcSIMD>(fProcSIMD);
-    SkASSERT(procSIMD != NULL);
-
-    if (NULL == aa) {
-        // Unrolled NEON code
-        // We'd like to just do this (modulo a few casts):
-        // vst4_u8(dst, procSIMD(vld4_u8(src), vld4_u8(dst)));
-        // src += 8;
-        // dst += 8;
-        // but that tends to generate miserable code. Here are a bunch of faster
-        // workarounds for different architectures and compilers.
-        while (count >= 8) {
-
-#ifdef SK_CPU_ARM32
-            uint8x8x4_t vsrc, vdst, vres;
-#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 6))
-            asm volatile (
-                "vld4.u8    %h[vsrc], [%[src]]!  \t\n"
-                "vld4.u8    %h[vdst], [%[dst]]   \t\n"
-                : [vsrc] "=w" (vsrc), [vdst] "=w" (vdst), [src] "+&r" (src)
-                : [dst] "r" (dst)
-                :
-            );
-#else
-            register uint8x8_t d0 asm("d0");
-            register uint8x8_t d1 asm("d1");
-            register uint8x8_t d2 asm("d2");
-            register uint8x8_t d3 asm("d3");
-            register uint8x8_t d4 asm("d4");
-            register uint8x8_t d5 asm("d5");
-            register uint8x8_t d6 asm("d6");
-            register uint8x8_t d7 asm("d7");
-
-            asm volatile (
-                "vld4.u8    {d0-d3},[%[src]]!;"
-                "vld4.u8    {d4-d7},[%[dst]];"
-                : "=w" (d0), "=w" (d1), "=w" (d2), "=w" (d3),
-                  "=w" (d4), "=w" (d5), "=w" (d6), "=w" (d7),
-                  [src] "+&r" (src)
-                : [dst] "r" (dst)
-                :
-            );
-            vsrc.val[0] = d0; vdst.val[0] = d4;
-            vsrc.val[1] = d1; vdst.val[1] = d5;
-            vsrc.val[2] = d2; vdst.val[2] = d6;
-            vsrc.val[3] = d3; vdst.val[3] = d7;
-#endif
-
-            vres = procSIMD(vsrc, vdst);
-
-            vst4_u8((uint8_t*)dst, vres);
-
-            dst += 8;
-
-#else // #ifdef SK_CPU_ARM32
-
-            asm volatile (
-                "ld4    {v0.8b - v3.8b}, [%[src]], #32 \t\n"
-                "ld4    {v4.8b - v7.8b}, [%[dst]]      \t\n"
-                "blr    %[proc]                        \t\n"
-                "st4    {v0.8b - v3.8b}, [%[dst]], #32 \t\n"
-                : [src] "+&r" (src), [dst] "+&r" (dst)
-                : [proc] "r" (procSIMD)
-                : "cc", "memory",
-                  /* We don't know what proc is going to clobber so we must
-                   * add everything that is not callee-saved.
-                   */
-                  "x0", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9",
-                  "x10", "x11", "x12", "x13", "x14", "x15", "x16", "x17", "x18",
-                  "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v16", "v17",
-                  "v18", "v19", "v20", "v21", "v22", "v23", "v24", "v25", "v26",
-                  "v27", "v28", "v29", "v30", "v31"
-            );
-
-#endif // #ifdef SK_CPU_ARM32
-
-            count -= 8;
-        }
-        // Leftovers
-        for (int i = 0; i < count; i++) {
-            dst[i] = proc(src[i], dst[i]);
-        }
-    } else {
-        for (int i = count - 1; i >= 0; --i) {
-            unsigned a = aa[i];
-            if (0 != a) {
-                SkPMColor dstC = dst[i];
-                SkPMColor C = proc(src[i], dstC);
-                if (a != 0xFF) {
-                    C = SkFourByteInterp_neon(C, dstC, a);
-                }
-                dst[i] = C;
-            }
-        }
-    }
-}
-
-void SkNEONProcCoeffXfermode::xfer16(uint16_t* SK_RESTRICT dst,
-                                     const SkPMColor* SK_RESTRICT src, int count,
-                                     const SkAlpha* SK_RESTRICT aa) const {
-    SkASSERT(dst && src && count >= 0);
-
-    SkXfermodeProc proc = this->getProc();
-    SkXfermodeProcSIMD procSIMD = reinterpret_cast<SkXfermodeProcSIMD>(fProcSIMD);
-    SkASSERT(procSIMD != NULL);
-
-    if (NULL == aa) {
-        while(count >= 8) {
-            uint16x8_t vdst, vres16;
-            uint8x8x4_t vdst32, vsrc, vres;
-
-            vdst = vld1q_u16(dst);
-
-#ifdef SK_CPU_ARM64
-            vsrc = vld4_u8((uint8_t*)src);
-#else
-#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 6))
-            asm volatile (
-                "vld4.u8    %h[vsrc], [%[src]]!  \t\n"
-                : [vsrc] "=w" (vsrc), [src] "+&r" (src)
-                : :
-            );
-#else
-            register uint8x8_t d0 asm("d0");
-            register uint8x8_t d1 asm("d1");
-            register uint8x8_t d2 asm("d2");
-            register uint8x8_t d3 asm("d3");
-
-            asm volatile (
-                "vld4.u8    {d0-d3},[%[src]]!;"
-                : "=w" (d0), "=w" (d1), "=w" (d2), "=w" (d3),
-                  [src] "+&r" (src)
-                : :
-            );
-            vsrc.val[0] = d0;
-            vsrc.val[1] = d1;
-            vsrc.val[2] = d2;
-            vsrc.val[3] = d3;
-#endif
-#endif // #ifdef SK_CPU_ARM64
-
-            vdst32 = SkPixel16ToPixel32_neon8(vdst);
-            vres = procSIMD(vsrc, vdst32);
-            vres16 = SkPixel32ToPixel16_neon8(vres);
-
-            vst1q_u16(dst, vres16);
-
-            count -= 8;
-            dst += 8;
-#ifdef SK_CPU_ARM64
-            src += 8;
-#endif
-        }
-        for (int i = 0; i < count; i++) {
-            SkPMColor dstC = SkPixel16ToPixel32(dst[i]);
-            dst[i] = SkPixel32ToPixel16_ToU16(proc(src[i], dstC));
-        }
-    } else {
-        for (int i = count - 1; i >= 0; --i) {
-            unsigned a = aa[i];
-            if (0 != a) {
-                SkPMColor dstC = SkPixel16ToPixel32(dst[i]);
-                SkPMColor C = proc(src[i], dstC);
-                if (0xFF != a) {
-                    C = SkFourByteInterp_neon(C, dstC, a);
-                }
-                dst[i] = SkPixel32ToPixel16_ToU16(C);
-            }
-        }
-    }
-}
-
-#ifndef SK_IGNORE_TO_STRING
-void SkNEONProcCoeffXfermode::toString(SkString* str) const {
-    this->INHERITED::toString(str);
-}
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-
-SkXfermodeProcSIMD gNEONXfermodeProcs[] = {
-    NULL, // kClear_Mode
-    NULL, // kSrc_Mode
-    NULL, // kDst_Mode
-    NULL, // kSrcOver_Mode
-    dstover_modeproc_neon8,
-    srcin_modeproc_neon8,
-    dstin_modeproc_neon8,
-    srcout_modeproc_neon8,
-    dstout_modeproc_neon8,
-    srcatop_modeproc_neon8,
-    dstatop_modeproc_neon8,
-    xor_modeproc_neon8,
-    plus_modeproc_neon8,
-    modulate_modeproc_neon8,
-    screen_modeproc_neon8,
-
-    overlay_modeproc_neon8,
-    darken_modeproc_neon8,
-    lighten_modeproc_neon8,
-    NULL, // kColorDodge_Mode
-    NULL, // kColorBurn_Mode
-    hardlight_modeproc_neon8,
-    NULL, // kSoftLight_Mode
-    difference_modeproc_neon8,
-    exclusion_modeproc_neon8,
-    multiply_modeproc_neon8,
-
-    NULL, // kHue_Mode
-    NULL, // kSaturation_Mode
-    NULL, // kColor_Mode
-    NULL, // kLuminosity_Mode
-};
-
-SK_COMPILE_ASSERT(
-    SK_ARRAY_COUNT(gNEONXfermodeProcs) == SkXfermode::kLastMode + 1,
-    mode_count_arm
-);
-
-SkXfermodeProc gNEONXfermodeProcs1[] = {
-    NULL, // kClear_Mode
-    NULL, // kSrc_Mode
-    NULL, // kDst_Mode
-    NULL, // kSrcOver_Mode
-    NULL, // kDstOver_Mode
-    NULL, // kSrcIn_Mode
-    NULL, // kDstIn_Mode
-    NULL, // kSrcOut_Mode
-    NULL, // kDstOut_Mode
-    srcatop_modeproc_neon,
-    dstatop_modeproc_neon,
-    xor_modeproc_neon,
-    plus_modeproc_neon,
-    modulate_modeproc_neon,
-    NULL, // kScreen_Mode
-
-    NULL, // kOverlay_Mode
-    NULL, // kDarken_Mode
-    NULL, // kLighten_Mode
-    NULL, // kColorDodge_Mode
-    NULL, // kColorBurn_Mode
-    NULL, // kHardLight_Mode
-    NULL, // kSoftLight_Mode
-    NULL, // kDifference_Mode
-    NULL, // kExclusion_Mode
-    NULL, // kMultiply_Mode
-
-    NULL, // kHue_Mode
-    NULL, // kSaturation_Mode
-    NULL, // kColor_Mode
-    NULL, // kLuminosity_Mode
-};
-
-SK_COMPILE_ASSERT(
-    SK_ARRAY_COUNT(gNEONXfermodeProcs1) == SkXfermode::kLastMode + 1,
-    mode1_count_arm
-);
-
-SkProcCoeffXfermode* SkPlatformXfermodeFactory_impl_neon(const ProcCoeff& rec,
-                                                         SkXfermode::Mode mode) {
-
-    void* procSIMD = reinterpret_cast<void*>(gNEONXfermodeProcs[mode]);
-
-    if (procSIMD != NULL) {
-        return SkNEW_ARGS(SkNEONProcCoeffXfermode, (rec, mode, procSIMD));
-    }
-    return NULL;
-}
-
-SkXfermodeProc SkPlatformXfermodeProcFactory_impl_neon(SkXfermode::Mode mode) {
-    return gNEONXfermodeProcs1[mode];
-}
diff --git a/gfx/skia/skia/src/opts/SkXfermode_opts_arm_neon.h b/gfx/skia/skia/src/opts/SkXfermode_opts_arm_neon.h
deleted file mode 100644
index 8f3aaaea9d9b..000000000000
--- a/gfx/skia/skia/src/opts/SkXfermode_opts_arm_neon.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef SkXfermode_opts_arm_neon_DEFINED
-#define SkXfermode_opts_arm_neon_DEFINED
-
-#include "SkXfermode_proccoeff.h"
-
-class SkNEONProcCoeffXfermode : public SkProcCoeffXfermode {
-public:
-    SkNEONProcCoeffXfermode(const ProcCoeff& rec, SkXfermode::Mode mode,
-                            void* procSIMD)
-            : INHERITED(rec, mode), fProcSIMD(procSIMD) {}
-
-    virtual void xfer32(SkPMColor dst[], const SkPMColor src[], int count,
-                        const SkAlpha aa[]) const SK_OVERRIDE;
-    virtual void xfer16(uint16_t* SK_RESTRICT dst, const SkPMColor* SK_RESTRICT src,
-                        int count, const SkAlpha* SK_RESTRICT aa) const SK_OVERRIDE;
-
-    SK_TO_STRING_OVERRIDE()
-    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkNEONProcCoeffXfermode)
-
-private:
-    SkNEONProcCoeffXfermode(SkReadBuffer& buffer);
-
-    // void* is used to avoid pulling arm_neon.h in the core and having to build
-    // it with -mfpu=neon.
-    void* fProcSIMD;
-    typedef SkProcCoeffXfermode INHERITED;
-};
-
-extern SkPMColor srcatop_modeproc_neon(SkPMColor src, SkPMColor dst);
-extern SkPMColor dstatop_modeproc_neon(SkPMColor src, SkPMColor dst);
-extern SkPMColor xor_modeproc_neon(SkPMColor src, SkPMColor dst);
-extern SkPMColor plus_modeproc_neon(SkPMColor src, SkPMColor dst);
-extern SkPMColor modulate_modeproc_neon(SkPMColor src, SkPMColor dst);
-
-#endif //#ifdef SkXfermode_opts_arm_neon_DEFINED
diff --git a/gfx/skia/skia/src/opts/SkXfermode_opts_none.cpp b/gfx/skia/skia/src/opts/SkXfermode_opts_none.cpp
deleted file mode 100644
index 7c46fdd93c21..000000000000
--- a/gfx/skia/skia/src/opts/SkXfermode_opts_none.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "SkXfermode.h"
-#include "SkXfermode_proccoeff.h"
-
-// The prototypes below are for Clang
-extern SkProcCoeffXfermode* SkPlatformXfermodeFactory(const ProcCoeff& rec,
-                                                      SkXfermode::Mode mode);
-
-extern SkXfermodeProc SkPlatformXfermodeProcFactory(SkXfermode::Mode mode);
-
-SkProcCoeffXfermode* SkPlatformXfermodeFactory(const ProcCoeff& rec,
-                                               SkXfermode::Mode mode) {
-    return NULL;
-}
-
-SkXfermodeProc SkPlatformXfermodeProcFactory(SkXfermode::Mode mode) {
-    return NULL;
-}
diff --git a/gfx/skia/skia/src/opts/memset.arm.S b/gfx/skia/skia/src/opts/memset.arm.S
deleted file mode 100644
index 44b75e3dbd1b..000000000000
--- a/gfx/skia/skia/src/opts/memset.arm.S
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright 2010 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/* Changes:
- * 2010-08-11 Steve McIntyre <steve.mcintyre@arm.com>
- *    Added small changes to the two functions to make them work on the
- *    specified number of 16- or 32-bit values rather than the original
- *    code which was specified as a count of bytes. More verbose comments
- *    to aid future maintenance.
- */
-
-    .text
-    .align 4
-    .syntax unified
-
-    .global arm_memset32
-    .type   arm_memset32, %function
-    .global arm_memset16
-    .type   arm_memset16, %function
-
-/*
- * Optimized memset functions for ARM.
- *
- * void arm_memset16(uint16_t* dst, uint16_t value, int count);
- * void arm_memset32(uint32_t* dst, uint32_t value, int count);
- *
- */
-arm_memset16:
-        .fnstart
-        push        {lr}
-
-        /* if count is equal to zero then abort */
-        teq         r2, #0
-        ble         .Lfinish
-
-        /* Multiply count by 2 - go from the number of 16-bit shorts
-         * to the number of bytes desired. */
-        mov         r2, r2, lsl #1
-
-        /* expand the data to 32 bits */
-        orr         r1, r1, r1, lsl #16
-
-        /* align to 32 bits */
-        tst         r0, #2
-        strhne      r1, [r0], #2
-        subne       r2, r2, #2
-
-        /* Now jump into the main loop below. */
-        b           .Lwork_32
-        .fnend
-
-arm_memset32:
-        .fnstart
-        push        {lr}
-
-        /* if count is equal to zero then abort */
-        teq         r2, #0
-        ble         .Lfinish
-
-        /* Multiply count by 4 - go from the number of 32-bit words to
-         * the number of bytes desired. */
-        mov         r2, r2, lsl #2
-
-.Lwork_32:
-        /* Set up registers ready for writing them out. */
-        mov         ip, r1
-        mov         lr, r1
-
-        /* Try to align the destination to a cache line. Assume 32
-         * byte (8 word) cache lines, it's the common case. */
-        rsb         r3, r0, #0
-        ands        r3, r3, #0x1C
-        beq         .Laligned32
-        cmp         r3, r2
-        andhi       r3, r2, #0x1C
-        sub         r2, r2, r3
-
-        /* (Optionally) write any unaligned leading bytes.
-         * (0-28 bytes, length in r3) */
-        movs        r3, r3, lsl #28
-        stmiacs     r0!, {r1, lr}
-        stmiacs     r0!, {r1, lr}
-        stmiami     r0!, {r1, lr}
-        movs        r3, r3, lsl #2
-        strcs       r1, [r0], #4
-
-        /* Now quickly loop through the cache-aligned data. */
-.Laligned32:
-        mov         r3, r1
-1:      subs        r2, r2, #32
-        stmiahs     r0!, {r1,r3,ip,lr}
-        stmiahs     r0!, {r1,r3,ip,lr}
-        bhs         1b
-        add         r2, r2, #32
-
-        /* (Optionally) store any remaining trailing bytes.
-         * (0-30 bytes, length in r2) */
-        movs        r2, r2, lsl #28
-        stmiacs     r0!, {r1,r3,ip,lr}
-        stmiami     r0!, {r1,lr}
-        movs        r2, r2, lsl #2
-        strcs       r1, [r0], #4
-        strhmi      lr, [r0], #2
-
-.Lfinish:
-        pop         {pc}
-        .fnend
diff --git a/gfx/skia/skia/src/opts/memset16_neon.S b/gfx/skia/skia/src/opts/memset16_neon.S
deleted file mode 100644
index b1719fa1fa4d..000000000000
--- a/gfx/skia/skia/src/opts/memset16_neon.S
+++ /dev/null
@@ -1,143 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2009,2010, Code Aurora Forum. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- ***************************************************************************/
-
-/***************************************************************************
-  Neon memset: Attempts to do a memset with Neon registers if possible,
-     Inputs:
-        s: The buffer to write to
-        c: The integer data to write to the buffer
-        n: The size_t count.
-     Outputs:
-
-***************************************************************************/
-
-        .code 32
-        .fpu neon
-        .align 4
-        .globl memset16_neon
-        .func
-
-memset16_neon:
-        cmp             r2, #0
-        bxeq            lr
-
-        /* Keep in mind that r2 -- the count argument -- is for the
-         * number of 16-bit items to copy.
-         */
-        lsl             r2, r2, #1
-
-        push            {r0}
-
-        /* If we have < 8 bytes, just do a quick loop to handle that */
-        cmp             r2, #8
-        bgt             memset_gt4
-memset_smallcopy_loop:
-        strh            r1, [r0], #2
-        subs            r2, r2, #2
-        bne             memset_smallcopy_loop
-memset_smallcopy_done:
-        pop             {r0}
-        bx              lr
-
-memset_gt4:
-        /*
-         * Duplicate the r1 lowest 16-bits across r1. The idea is to have
-         * a register with two 16-bit-values we can copy. We do this by
-         * duplicating lowest 16-bits of r1 to upper 16-bits.
-         */
-        orr             r1, r1, r1, lsl #16
-        /*
-         * If we're copying > 64 bytes, then we may want to get
-         * onto a 16-byte boundary to improve speed even more.
-         */
-        cmp             r2, #64
-        blt             memset_route
-        ands            r12, r0, #0xf
-        beq             memset_route
-        /*
-         * Determine the number of bytes to move forward to get to the 16-byte
-         * boundary.  Note that this will be a multiple of 4, since we
-         * already are word-aligned.
-         */
-        rsb             r12, r12, #16
-        sub             r2, r2, r12
-        lsls            r12, r12, #29
-        strmi           r1, [r0], #4
-        strcs           r1, [r0], #4
-        strcs           r1, [r0], #4
-        lsls            r12, r12, #2
-        strcsh          r1, [r0], #2
-memset_route:
-        /*
-         * Decide where to route for the maximum copy sizes.  Note that we
-         * build q0 and q1 depending on if we'll need it, so that's
-         * interwoven here as well.
-         */
-        vdup.u32        d0, r1
-        cmp             r2, #16
-        blt             memset_8
-        vmov            d1, d0
-        cmp             r2, #64
-        blt             memset_16
-        vmov            q1, q0
-        cmp             r2, #128
-        blt             memset_32
-memset_128:
-        mov             r12, r2, lsr #7
-memset_128_loop:
-        vst1.64         {q0, q1}, [r0]!
-        vst1.64         {q0, q1}, [r0]!
-        vst1.64         {q0, q1}, [r0]!
-        vst1.64         {q0, q1}, [r0]!
-        subs            r12, r12, #1
-        bne             memset_128_loop
-        ands            r2, r2, #0x7f
-        beq             memset_end
-memset_32:
-        movs            r12, r2, lsr #5
-        beq             memset_16
-memset_32_loop:
-        subs            r12, r12, #1
-        vst1.64         {q0, q1}, [r0]!
-        bne             memset_32_loop
-        ands            r2, r2, #0x1f
-        beq             memset_end
-memset_16:
-        movs            r12, r2, lsr #4
-        beq             memset_8
-memset_16_loop:
-        subs            r12, r12, #1
-        vst1.32         {q0}, [r0]!
-        bne             memset_16_loop
-        ands            r2, r2, #0xf
-        beq             memset_end
-        /*
-         * memset_8 isn't a loop, since we try to do our loops at 16
-         * bytes and above.  We should loop there, then drop down here
-         * to finish the <16-byte versions.  Same for memset_4 and
-         * memset_1.
-         */
-memset_8:
-        cmp             r2, #8
-        blt             memset_4
-        subs            r2, r2, #8
-        vst1.32         {d0}, [r0]!
-memset_4:
-        cmp             r2, #4
-        blt             memset_2
-        subs            r2, r2, #4
-        str             r1, [r0], #4
-memset_2:
-        cmp             r2, #0
-        ble             memset_end
-        strh            r1, [r0], #2
-memset_end:
-        pop             {r0}
-        bx              lr
-
-        .endfunc
-        .end
diff --git a/gfx/skia/skia/src/opts/memset32_neon.S b/gfx/skia/skia/src/opts/memset32_neon.S
deleted file mode 100644
index a9eaa0e8307f..000000000000
--- a/gfx/skia/skia/src/opts/memset32_neon.S
+++ /dev/null
@@ -1,113 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2009,2010, Code Aurora Forum. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- ***************************************************************************/
-
-	.code 32
-	.fpu neon
-	.align 4
-	.globl	memset32_neon
-	.func
-
-	/* r0 = buffer, r1 = value, r2 = times to write */
-memset32_neon:
-	cmp		r2, #1
-	streq		r1, [r0], #4
-	bxeq		lr
-
-	cmp		r2, #4
-	bgt		memset32_neon_start
-	cmp		r2, #0
-	bxeq		lr
-memset32_neon_small:
-	str		r1, [r0], #4
-	subs		r2, r2, #1
-	bne		memset32_neon_small
-	bx		lr
-memset32_neon_start:
-	cmp		r2, #16
-	blt		memset32_dropthru
-	vdup.32		q0, r1
-	vmov		q1, q0
-	cmp		r2, #32
-	blt		memset32_16
-	cmp		r2, #64
-	blt		memset32_32
-	cmp		r2, #128
-	blt		memset32_64
-memset32_128:
-	movs		r12, r2, lsr #7
-memset32_loop128:
-	subs		r12, r12, #1
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-	bne		memset32_loop128
-	ands		r2, r2, #0x7f
-	bxeq		lr
-memset32_64:
-	movs		r12, r2, lsr #6
-	beq		memset32_32
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-	ands		r2, r2, #0x3f
-	bxeq		lr
-memset32_32:
-	movs		r12, r2, lsr #5
-	beq		memset32_16
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-	ands		r2, r2, #0x1f
-	bxeq		lr
-memset32_16:
-	movs		r12, r2, lsr #4
-	beq		memset32_dropthru
-	and		r2, r2, #0xf
-	vst1.64		{q0, q1}, [r0]!
-	vst1.64		{q0, q1}, [r0]!
-memset32_dropthru:
-	rsb		r2, r2, #15
-	add		pc, pc, r2, lsl #2
-	nop
-	str		r1, [r0, #56]
-	str		r1, [r0, #52]
-	str		r1, [r0, #48]
-	str		r1, [r0, #44]
-	str		r1, [r0, #40]
-	str		r1, [r0, #36]
-	str		r1, [r0, #32]
-	str		r1, [r0, #28]
-	str		r1, [r0, #24]
-	str		r1, [r0, #20]
-	str		r1, [r0, #16]
-	str		r1, [r0, #12]
-	str		r1, [r0, #8]
-	str		r1, [r0, #4]
-	str		r1, [r0, #0]
-	bx		lr
-
-	.endfunc
-	.end
diff --git a/gfx/skia/skia/src/opts/opts_check_x86.cpp b/gfx/skia/skia/src/opts/opts_check_x86.cpp
index 5bab17aa00d1..3c817e1f0a4e 100644
--- a/gfx/skia/skia/src/opts/opts_check_x86.cpp
+++ b/gfx/skia/skia/src/opts/opts_check_x86.cpp
@@ -10,19 +10,11 @@
 #include "SkBitmapProcState_opts_SSSE3.h"
 #include "SkBitmapScaler.h"
 #include "SkBlitMask.h"
-#include "SkBlitRect_opts_SSE2.h"
 #include "SkBlitRow.h"
 #include "SkBlitRow_opts_SSE2.h"
 #include "SkBlitRow_opts_SSE4.h"
-#include "SkBlurImage_opts_SSE2.h"
-#include "SkBlurImage_opts_SSE4.h"
-#include "SkMorphology_opts.h"
-#include "SkMorphology_opts_SSE2.h"
+#include "SkOncePtr.h"
 #include "SkRTConf.h"
-#include "SkUtils.h"
-#include "SkUtils_opts_SSE2.h"
-#include "SkXfermode.h"
-#include "SkXfermode_proccoeff.h"
 
 #if defined(_MSC_VER) && defined(_WIN64)
 #include <intrin.h>
@@ -79,23 +71,28 @@ static inline void getcpuid(int info_type, int info[4]) {
 /* Fetch the SIMD level directly from the CPU, at run-time.
  * Only checks the levels needed by the optimizations in this file.
  */
-static int get_SIMD_level() {
-    int cpu_info[4] = { 0 };
-
+static int* get_SIMD_level() {
+    int cpu_info[4] = { 0, 0, 0, 0 };
     getcpuid(1, cpu_info);
+
+    int* level = new int;
+
     if ((cpu_info[2] & (1<<20)) != 0) {
-        return SK_CPU_SSE_LEVEL_SSE42;
+        *level = SK_CPU_SSE_LEVEL_SSE42;
     } else if ((cpu_info[2] & (1<<19)) != 0) {
-        return SK_CPU_SSE_LEVEL_SSE41;
+        *level = SK_CPU_SSE_LEVEL_SSE41;
     } else if ((cpu_info[2] & (1<<9)) != 0) {
-        return SK_CPU_SSE_LEVEL_SSSE3;
+        *level = SK_CPU_SSE_LEVEL_SSSE3;
     } else if ((cpu_info[3] & (1<<26)) != 0) {
-        return SK_CPU_SSE_LEVEL_SSE2;
+        *level = SK_CPU_SSE_LEVEL_SSE2;
     } else {
-        return 0;
+        *level = 0;
     }
+    return level;
 }
 
+SK_DECLARE_STATIC_ONCE_PTR(int, gSIMDLevel);
+
 /* Verify that the requested SIMD level is supported in the build.
  * If not, check if the platform supports it.
  */
@@ -115,16 +112,13 @@ static inline bool supports_simd(int minLevel) {
          */
         return false;
 #else
-        static int gSIMDLevel = get_SIMD_level();
-        return (minLevel <= gSIMDLevel);
+        return minLevel <= *gSIMDLevel.get(get_SIMD_level);
 #endif
     }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
-SK_CONF_DECLARE( bool, c_hqfilter_sse, "bitmap.filter.highQualitySSE", false, "Use SSE optimized version of high quality image filters");
-
 void SkBitmapScaler::PlatformConvolutionProcs(SkConvolutionProcs* procs) {
     if (supports_simd(SK_CPU_SSE_LEVEL_SSE2)) {
         procs->fExtraHorizontalReads = 3;
@@ -142,33 +136,40 @@ void SkBitmapProcState::platformProcs() {
     if (!supports_simd(SK_CPU_SSE_LEVEL_SSE2)) {
         return;
     }
+    const bool ssse3 = supports_simd(SK_CPU_SSE_LEVEL_SSSE3);
 
     /* Check fSampleProc32 */
     if (fSampleProc32 == S32_opaque_D32_filter_DX) {
-        if (supports_simd(SK_CPU_SSE_LEVEL_SSSE3)) {
+        if (ssse3) {
             fSampleProc32 = S32_opaque_D32_filter_DX_SSSE3;
         } else {
             fSampleProc32 = S32_opaque_D32_filter_DX_SSE2;
         }
     } else if (fSampleProc32 == S32_opaque_D32_filter_DXDY) {
-        if (supports_simd(SK_CPU_SSE_LEVEL_SSSE3)) {
+        if (ssse3) {
             fSampleProc32 = S32_opaque_D32_filter_DXDY_SSSE3;
         }
     } else if (fSampleProc32 == S32_alpha_D32_filter_DX) {
-        if (supports_simd(SK_CPU_SSE_LEVEL_SSSE3)) {
+        if (ssse3) {
             fSampleProc32 = S32_alpha_D32_filter_DX_SSSE3;
         } else {
             fSampleProc32 = S32_alpha_D32_filter_DX_SSE2;
         }
     } else if (fSampleProc32 == S32_alpha_D32_filter_DXDY) {
-        if (supports_simd(SK_CPU_SSE_LEVEL_SSSE3)) {
+        if (ssse3) {
             fSampleProc32 = S32_alpha_D32_filter_DXDY_SSSE3;
         }
     }
 
     /* Check fSampleProc16 */
     if (fSampleProc16 == S32_D16_filter_DX) {
-        fSampleProc16 = S32_D16_filter_DX_SSE2;
+        if (ssse3) {
+            fSampleProc16 = S32_D16_filter_DX_SSSE3;
+        } else {
+            fSampleProc16 = S32_D16_filter_DX_SSE2;
+        }
+    } else if (ssse3 && fSampleProc16 == S32_D16_filter_DXDY) {
+        fSampleProc16 = S32_D16_filter_DXDY_SSSE3;
     }
 
     /* Check fMatrixProc */
@@ -181,112 +182,74 @@ void SkBitmapProcState::platformProcs() {
     } else if (fMatrixProc == ClampX_ClampY_nofilter_affine) {
         fMatrixProc = ClampX_ClampY_nofilter_affine_SSE2;
     }
-
-    /* Check fShaderProc32 */
-    if (c_hqfilter_sse) {
-        if (fShaderProc32 == highQualityFilter32) {
-            fShaderProc32 = highQualityFilter_SSE2;
-        }
-    }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
-static SkBlitRow::Proc platform_16_procs[] = {
+static const SkBlitRow::Proc16 platform_16_procs[] = {
     S32_D565_Opaque_SSE2,               // S32_D565_Opaque
-    NULL,                               // S32_D565_Blend
+    nullptr,                               // S32_D565_Blend
     S32A_D565_Opaque_SSE2,              // S32A_D565_Opaque
-    NULL,                               // S32A_D565_Blend
+    nullptr,                               // S32A_D565_Blend
     S32_D565_Opaque_Dither_SSE2,        // S32_D565_Opaque_Dither
-    NULL,                               // S32_D565_Blend_Dither
+    nullptr,                               // S32_D565_Blend_Dither
     S32A_D565_Opaque_Dither_SSE2,       // S32A_D565_Opaque_Dither
-    NULL,                               // S32A_D565_Blend_Dither
+    nullptr,                               // S32A_D565_Blend_Dither
 };
 
-SkBlitRow::Proc SkBlitRow::PlatformProcs565(unsigned flags) {
+SkBlitRow::Proc16 SkBlitRow::PlatformFactory565(unsigned flags) {
     if (supports_simd(SK_CPU_SSE_LEVEL_SSE2)) {
         return platform_16_procs[flags];
     } else {
-        return NULL;
+        return nullptr;
     }
 }
 
-static SkBlitRow::Proc32 platform_32_procs_SSE2[] = {
-    NULL,                               // S32_Opaque,
+static const SkBlitRow::ColorProc16 platform_565_colorprocs_SSE2[] = {
+    Color32A_D565_SSE2,                 // Color32A_D565,
+    nullptr,                               // Color32A_D565_Dither
+};
+
+SkBlitRow::ColorProc16 SkBlitRow::PlatformColorFactory565(unsigned flags) {
+/* If you're thinking about writing an SSE4 version of this, do check it's
+ * actually faster on Atom. Our original SSE4 version was slower than this
+ * SSE2 version on Silvermont, and only marginally faster on a Core i7,
+ * mainly due to the MULLD timings.
+ */
+    if (supports_simd(SK_CPU_SSE_LEVEL_SSE2)) {
+        return platform_565_colorprocs_SSE2[flags];
+    } else {
+        return nullptr;
+    }
+}
+
+static const SkBlitRow::Proc32 platform_32_procs_SSE2[] = {
+    nullptr,                               // S32_Opaque,
     S32_Blend_BlitRow32_SSE2,           // S32_Blend,
     S32A_Opaque_BlitRow32_SSE2,         // S32A_Opaque
     S32A_Blend_BlitRow32_SSE2,          // S32A_Blend,
 };
 
-#if defined(SK_ATT_ASM_SUPPORTED)
-static SkBlitRow::Proc32 platform_32_procs_SSE4[] = {
-    NULL,                               // S32_Opaque,
+static const SkBlitRow::Proc32 platform_32_procs_SSE4[] = {
+    nullptr,                               // S32_Opaque,
     S32_Blend_BlitRow32_SSE2,           // S32_Blend,
-    S32A_Opaque_BlitRow32_SSE4_asm,     // S32A_Opaque
+    S32A_Opaque_BlitRow32_SSE4,         // S32A_Opaque
     S32A_Blend_BlitRow32_SSE2,          // S32A_Blend,
 };
-#endif
 
 SkBlitRow::Proc32 SkBlitRow::PlatformProcs32(unsigned flags) {
-#if defined(SK_ATT_ASM_SUPPORTED)
     if (supports_simd(SK_CPU_SSE_LEVEL_SSE41)) {
         return platform_32_procs_SSE4[flags];
     } else
-#endif
     if (supports_simd(SK_CPU_SSE_LEVEL_SSE2)) {
         return platform_32_procs_SSE2[flags];
     } else {
-        return NULL;
+        return nullptr;
     }
 }
 
-SkBlitRow::ColorProc SkBlitRow::PlatformColorProc() {
-    if (supports_simd(SK_CPU_SSE_LEVEL_SSE2)) {
-        return Color32_SSE2;
-    } else {
-        return NULL;
-    }
-}
-
-SkBlitRow::ColorRectProc PlatformColorRectProcFactory(); // suppress warning
-
-SkBlitRow::ColorRectProc PlatformColorRectProcFactory() {
-/* Return NULL for now, since the optimized path in ColorRect32_SSE2 is disabled.
-    if (supports_simd(SK_CPU_SSE_LEVEL_SSE2)) {
-        return ColorRect32_SSE2;
-    } else {
-        return NULL;
-    }
-*/
-    return NULL;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
-SkBlitMask::ColorProc SkBlitMask::PlatformColorProcs(SkColorType dstCT,
-                                                     SkMask::Format maskFormat,
-                                                     SkColor color) {
-    if (SkMask::kA8_Format != maskFormat) {
-        return NULL;
-    }
-
-    ColorProc proc = NULL;
-    if (supports_simd(SK_CPU_SSE_LEVEL_SSE2)) {
-        switch (dstCT) {
-            case kN32_SkColorType:
-                // The SSE2 version is not (yet) faster for black, so we check
-                // for that.
-                if (SK_ColorBLACK != color) {
-                    proc = SkARGB32_A8_BlitMask_SSE2;
-                }
-                break;
-            default:
-                break;
-        }
-    }
-    return proc;
-}
-
 SkBlitMask::BlitLCD16RowProc SkBlitMask::PlatformBlitRowProcs16(bool isOpaque) {
     if (supports_simd(SK_CPU_SSE_LEVEL_SSE2)) {
         if (isOpaque) {
@@ -295,107 +258,11 @@ SkBlitMask::BlitLCD16RowProc SkBlitMask::PlatformBlitRowProcs16(bool isOpaque) {
             return SkBlitLCD16Row_SSE2;
         }
     } else {
-        return NULL;
+        return nullptr;
     }
 
 }
 
 SkBlitMask::RowProc SkBlitMask::PlatformRowProcs(SkColorType, SkMask::Format, RowFlags) {
-    return NULL;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-SkMemset16Proc SkMemset16GetPlatformProc() {
-    if (supports_simd(SK_CPU_SSE_LEVEL_SSE2)) {
-        return sk_memset16_SSE2;
-    } else {
-        return NULL;
-    }
-}
-
-SkMemset32Proc SkMemset32GetPlatformProc() {
-    if (supports_simd(SK_CPU_SSE_LEVEL_SSE2)) {
-        return sk_memset32_SSE2;
-    } else {
-        return NULL;
-    }
-}
-
-SkMemcpy32Proc SkMemcpy32GetPlatformProc() {
-    if (supports_simd(SK_CPU_SSE_LEVEL_SSE2)) {
-        return sk_memcpy32_SSE2;
-    } else {
-        return NULL;
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-SkMorphologyImageFilter::Proc SkMorphologyGetPlatformProc(SkMorphologyProcType type) {
-    if (!supports_simd(SK_CPU_SSE_LEVEL_SSE2)) {
-        return NULL;
-    }
-    switch (type) {
-        case kDilateX_SkMorphologyProcType:
-            return SkDilateX_SSE2;
-        case kDilateY_SkMorphologyProcType:
-            return SkDilateY_SSE2;
-        case kErodeX_SkMorphologyProcType:
-            return SkErodeX_SSE2;
-        case kErodeY_SkMorphologyProcType:
-            return SkErodeY_SSE2;
-        default:
-            return NULL;
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-bool SkBoxBlurGetPlatformProcs(SkBoxBlurProc* boxBlurX,
-                               SkBoxBlurProc* boxBlurY,
-                               SkBoxBlurProc* boxBlurXY,
-                               SkBoxBlurProc* boxBlurYX) {
-#ifdef SK_DISABLE_BLUR_DIVISION_OPTIMIZATION
-    return false;
-#else
-    if (supports_simd(SK_CPU_SSE_LEVEL_SSE41)) {
-        return SkBoxBlurGetPlatformProcs_SSE4(boxBlurX, boxBlurY, boxBlurXY, boxBlurYX);
-    }
-    else if (supports_simd(SK_CPU_SSE_LEVEL_SSE2)) {
-        return SkBoxBlurGetPlatformProcs_SSE2(boxBlurX, boxBlurY, boxBlurXY, boxBlurYX);
-    }
-    return false;
-#endif
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-extern SkProcCoeffXfermode* SkPlatformXfermodeFactory_impl_SSE2(const ProcCoeff& rec,
-                                                                SkXfermode::Mode mode);
-
-SkProcCoeffXfermode* SkPlatformXfermodeFactory_impl(const ProcCoeff& rec,
-                                                    SkXfermode::Mode mode);
-
-SkProcCoeffXfermode* SkPlatformXfermodeFactory_impl(const ProcCoeff& rec,
-                                                    SkXfermode::Mode mode) {
-    return NULL;
-}
-
-SkProcCoeffXfermode* SkPlatformXfermodeFactory(const ProcCoeff& rec,
-                                               SkXfermode::Mode mode);
-
-SkProcCoeffXfermode* SkPlatformXfermodeFactory(const ProcCoeff& rec,
-                                               SkXfermode::Mode mode) {
-    if (supports_simd(SK_CPU_SSE_LEVEL_SSE2)) {
-        return SkPlatformXfermodeFactory_impl_SSE2(rec, mode);
-    } else {
-        return SkPlatformXfermodeFactory_impl(rec, mode);
-    }
-}
-
-SkXfermodeProc SkPlatformXfermodeProcFactory(SkXfermode::Mode mode);
-
-SkXfermodeProc SkPlatformXfermodeProcFactory(SkXfermode::Mode mode) {
-    return NULL;
+    return nullptr;
 }
diff --git a/gfx/skia/skia/src/pathops/SkAddIntersections.cpp b/gfx/skia/skia/src/pathops/SkAddIntersections.cpp
index 52e751bd08d0..43d29d93e091 100644
--- a/gfx/skia/skia/src/pathops/SkAddIntersections.cpp
+++ b/gfx/skia/skia/src/pathops/SkAddIntersections.cpp
@@ -5,6 +5,7 @@
  * found in the LICENSE file.
  */
 #include "SkAddIntersections.h"
+#include "SkOpCoincidence.h"
 #include "SkPathOpsBounds.h"
 
 #if DEBUG_ADD_INTERSECTING_TS
@@ -70,6 +71,67 @@ static void debugShowQuadIntersection(int pts, const SkIntersectionHelper& wt,
     SkDebugf("\n");
 }
 
+static void debugShowConicLineIntersection(int pts, const SkIntersectionHelper& wt,
+        const SkIntersectionHelper& wn, const SkIntersections& i) {
+    SkASSERT(i.used() == pts);
+    if (!pts) {
+        SkDebugf("%s no intersect " CONIC_DEBUG_STR " " LINE_DEBUG_STR "\n",
+                __FUNCTION__, CONIC_DEBUG_DATA(wt.pts(), wt.weight()), LINE_DEBUG_DATA(wn.pts()));
+        return;
+    }
+    SkDebugf("%s " T_DEBUG_STR(wtTs, 0) " " CONIC_DEBUG_STR " " PT_DEBUG_STR, __FUNCTION__,
+            i[0][0], CONIC_DEBUG_DATA(wt.pts(), wt.weight()), PT_DEBUG_DATA(i, 0));
+    for (int n = 1; n < pts; ++n) {
+        SkDebugf(" " TX_DEBUG_STR(wtTs) " " PT_DEBUG_STR, n, i[0][n], PT_DEBUG_DATA(i, n));
+    }
+    SkDebugf(" wnTs[0]=%g " LINE_DEBUG_STR, i[1][0], LINE_DEBUG_DATA(wn.pts()));
+    for (int n = 1; n < pts; ++n) {
+        SkDebugf(" " TX_DEBUG_STR(wnTs), n, i[1][n]);
+    }
+    SkDebugf("\n");
+}
+
+static void debugShowConicQuadIntersection(int pts, const SkIntersectionHelper& wt,
+        const SkIntersectionHelper& wn, const SkIntersections& i) {
+    SkASSERT(i.used() == pts);
+    if (!pts) {
+        SkDebugf("%s no intersect " CONIC_DEBUG_STR " " QUAD_DEBUG_STR "\n",
+                __FUNCTION__, CONIC_DEBUG_DATA(wt.pts(), wt.weight()), QUAD_DEBUG_DATA(wn.pts()));
+        return;
+    }
+    SkDebugf("%s " T_DEBUG_STR(wtTs, 0) " " CONIC_DEBUG_STR " " PT_DEBUG_STR, __FUNCTION__,
+            i[0][0], CONIC_DEBUG_DATA(wt.pts(), wt.weight()), PT_DEBUG_DATA(i, 0));
+    for (int n = 1; n < pts; ++n) {
+        SkDebugf(" " TX_DEBUG_STR(wtTs) " " PT_DEBUG_STR, n, i[0][n], PT_DEBUG_DATA(i, n));
+    }
+    SkDebugf(" wnTs[0]=%g " QUAD_DEBUG_STR, i[1][0], QUAD_DEBUG_DATA(wn.pts()));
+    for (int n = 1; n < pts; ++n) {
+        SkDebugf(" " TX_DEBUG_STR(wnTs), n, i[1][n]);
+    }
+    SkDebugf("\n");
+}
+
+static void debugShowConicIntersection(int pts, const SkIntersectionHelper& wt,
+        const SkIntersectionHelper& wn, const SkIntersections& i) {
+    SkASSERT(i.used() == pts);
+    if (!pts) {
+        SkDebugf("%s no intersect " CONIC_DEBUG_STR " " CONIC_DEBUG_STR "\n",
+                __FUNCTION__, CONIC_DEBUG_DATA(wt.pts(), wt.weight()),
+                CONIC_DEBUG_DATA(wn.pts(), wn.weight()));
+        return;
+    }
+    SkDebugf("%s " T_DEBUG_STR(wtTs, 0) " " CONIC_DEBUG_STR " " PT_DEBUG_STR, __FUNCTION__,
+            i[0][0], CONIC_DEBUG_DATA(wt.pts(), wt.weight()), PT_DEBUG_DATA(i, 0));
+    for (int n = 1; n < pts; ++n) {
+        SkDebugf(" " TX_DEBUG_STR(wtTs) " " PT_DEBUG_STR, n, i[0][n], PT_DEBUG_DATA(i, n));
+    }
+    SkDebugf(" wnTs[0]=%g " CONIC_DEBUG_STR, i[1][0], CONIC_DEBUG_DATA(wn.pts(), wn.weight()));
+    for (int n = 1; n < pts; ++n) {
+        SkDebugf(" " TX_DEBUG_STR(wnTs), n, i[1][n]);
+    }
+    SkDebugf("\n");
+}
+
 static void debugShowCubicLineIntersection(int pts, const SkIntersectionHelper& wt,
         const SkIntersectionHelper& wn, const SkIntersections& i) {
     SkASSERT(i.used() == pts);
@@ -110,6 +172,26 @@ static void debugShowCubicQuadIntersection(int pts, const SkIntersectionHelper&
     SkDebugf("\n");
 }
 
+static void debugShowCubicConicIntersection(int pts, const SkIntersectionHelper& wt,
+        const SkIntersectionHelper& wn, const SkIntersections& i) {
+    SkASSERT(i.used() == pts);
+    if (!pts) {
+        SkDebugf("%s no intersect " CUBIC_DEBUG_STR " " CONIC_DEBUG_STR "\n",
+                __FUNCTION__, CUBIC_DEBUG_DATA(wt.pts()), CONIC_DEBUG_DATA(wn.pts(), wn.weight()));
+        return;
+    }
+    SkDebugf("%s " T_DEBUG_STR(wtTs, 0) " " CUBIC_DEBUG_STR " " PT_DEBUG_STR, __FUNCTION__,
+            i[0][0], CUBIC_DEBUG_DATA(wt.pts()), PT_DEBUG_DATA(i, 0));
+    for (int n = 1; n < pts; ++n) {
+        SkDebugf(" " TX_DEBUG_STR(wtTs) " " PT_DEBUG_STR, n, i[0][n], PT_DEBUG_DATA(i, n));
+    }
+    SkDebugf(" wnTs[0]=%g " CONIC_DEBUG_STR, i[1][0], CONIC_DEBUG_DATA(wn.pts(), wn.weight()));
+    for (int n = 1; n < pts; ++n) {
+        SkDebugf(" " TX_DEBUG_STR(wnTs), n, i[1][n]);
+    }
+    SkDebugf("\n");
+}
+
 static void debugShowCubicIntersection(int pts, const SkIntersectionHelper& wt,
         const SkIntersectionHelper& wn, const SkIntersections& i) {
     SkASSERT(i.used() == pts);
@@ -130,20 +212,6 @@ static void debugShowCubicIntersection(int pts, const SkIntersectionHelper& wt,
     SkDebugf("\n");
 }
 
-static void debugShowCubicIntersection(int pts, const SkIntersectionHelper& wt,
-        const SkIntersections& i) {
-    SkASSERT(i.used() == pts);
-    if (!pts) {
-        SkDebugf("%s no self intersect " CUBIC_DEBUG_STR "\n", __FUNCTION__,
-                CUBIC_DEBUG_DATA(wt.pts()));
-        return;
-    }
-    SkDebugf("%s " T_DEBUG_STR(wtTs, 0) " " CUBIC_DEBUG_STR " " PT_DEBUG_STR, __FUNCTION__,
-            i[0][0], CUBIC_DEBUG_DATA(wt.pts()), PT_DEBUG_DATA(i, 0));
-    SkDebugf(" " T_DEBUG_STR(wtTs, 1), i[1][0]);
-    SkDebugf("\n");
-}
-
 #else
 static void debugShowLineIntersection(int , const SkIntersectionHelper& ,
         const SkIntersectionHelper& , const SkIntersections& ) {
@@ -157,6 +225,18 @@ static void debugShowQuadIntersection(int , const SkIntersectionHelper& ,
         const SkIntersectionHelper& , const SkIntersections& ) {
 }
 
+static void debugShowConicLineIntersection(int , const SkIntersectionHelper& ,
+        const SkIntersectionHelper& , const SkIntersections& ) {
+}
+
+static void debugShowConicQuadIntersection(int , const SkIntersectionHelper& ,
+        const SkIntersectionHelper& , const SkIntersections& ) {
+}
+
+static void debugShowConicIntersection(int , const SkIntersectionHelper& ,
+        const SkIntersectionHelper& , const SkIntersections& ) {
+}
+
 static void debugShowCubicLineIntersection(int , const SkIntersectionHelper& ,
         const SkIntersectionHelper& , const SkIntersections& ) {
 }
@@ -165,16 +245,17 @@ static void debugShowCubicQuadIntersection(int , const SkIntersectionHelper& ,
         const SkIntersectionHelper& , const SkIntersections& ) {
 }
 
-static void debugShowCubicIntersection(int , const SkIntersectionHelper& ,
+static void debugShowCubicConicIntersection(int , const SkIntersectionHelper& ,
         const SkIntersectionHelper& , const SkIntersections& ) {
 }
 
 static void debugShowCubicIntersection(int , const SkIntersectionHelper& ,
-        const SkIntersections& ) {
+        const SkIntersectionHelper& , const SkIntersections& ) {
 }
 #endif
 
-bool AddIntersectTs(SkOpContour* test, SkOpContour* next) {
+bool AddIntersectTs(SkOpContour* test, SkOpContour* next, SkOpCoincidence* coincidence,
+        SkChunkAlloc* allocator) {
     if (test != next) {
         if (AlmostLessUlps(test->bounds().fBottom, next->bounds().fTop)) {
             return false;
@@ -186,10 +267,11 @@ bool AddIntersectTs(SkOpContour* test, SkOpContour* next) {
     }
     SkIntersectionHelper wt;
     wt.init(test);
-    bool foundCommonContour = test == next;
     do {
         SkIntersectionHelper wn;
         wn.init(next);
+        test->debugValidate();
+        next->debugValidate();
         if (test == next && !wn.startAfter(wt)) {
             continue;
         }
@@ -200,30 +282,35 @@ bool AddIntersectTs(SkOpContour* test, SkOpContour* next) {
             int pts = 0;
             SkIntersections ts;
             bool swap = false;
+            SkDQuad quad1, quad2;
+            SkDConic conic1, conic2;
+            SkDCubic cubic1, cubic2;
             switch (wt.segmentType()) {
                 case SkIntersectionHelper::kHorizontalLine_Segment:
                     swap = true;
                     switch (wn.segmentType()) {
                         case SkIntersectionHelper::kHorizontalLine_Segment:
                         case SkIntersectionHelper::kVerticalLine_Segment:
-                        case SkIntersectionHelper::kLine_Segment: {
+                        case SkIntersectionHelper::kLine_Segment:
                             pts = ts.lineHorizontal(wn.pts(), wt.left(),
                                     wt.right(), wt.y(), wt.xFlipped());
                             debugShowLineIntersection(pts, wn, wt, ts);
                             break;
-                        }
-                        case SkIntersectionHelper::kQuad_Segment: {
+                        case SkIntersectionHelper::kQuad_Segment:
                             pts = ts.quadHorizontal(wn.pts(), wt.left(),
                                     wt.right(), wt.y(), wt.xFlipped());
                             debugShowQuadLineIntersection(pts, wn, wt, ts);
                             break;
-                        }
-                        case SkIntersectionHelper::kCubic_Segment: {
+                        case SkIntersectionHelper::kConic_Segment:
+                            pts = ts.conicHorizontal(wn.pts(), wn.weight(), wt.left(),
+                                    wt.right(), wt.y(), wt.xFlipped());
+                            debugShowConicLineIntersection(pts, wn, wt, ts);
+                            break;
+                        case SkIntersectionHelper::kCubic_Segment:
                             pts = ts.cubicHorizontal(wn.pts(), wt.left(),
                                     wt.right(), wt.y(), wt.xFlipped());
                             debugShowCubicLineIntersection(pts, wn, wt, ts);
                             break;
-                        }
                         default:
                             SkASSERT(0);
                     }
@@ -245,6 +332,12 @@ bool AddIntersectTs(SkOpContour* test, SkOpContour* next) {
                             debugShowQuadLineIntersection(pts, wn, wt, ts);
                             break;
                         }
+                        case SkIntersectionHelper::kConic_Segment: {
+                            pts = ts.conicVertical(wn.pts(), wn.weight(), wt.top(),
+                                    wt.bottom(), wt.x(), wt.yFlipped());
+                            debugShowConicLineIntersection(pts, wn, wt, ts);
+                            break;
+                        }
                         case SkIntersectionHelper::kCubic_Segment: {
                             pts = ts.cubicVertical(wn.pts(), wt.top(),
                                     wt.bottom(), wt.x(), wt.yFlipped());
@@ -267,23 +360,25 @@ bool AddIntersectTs(SkOpContour* test, SkOpContour* next) {
                                     wn.bottom(), wn.x(), wn.yFlipped());
                             debugShowLineIntersection(pts, wt, wn, ts);
                             break;
-                        case SkIntersectionHelper::kLine_Segment: {
+                        case SkIntersectionHelper::kLine_Segment:
                             pts = ts.lineLine(wt.pts(), wn.pts());
                             debugShowLineIntersection(pts, wt, wn, ts);
                             break;
-                        }
-                        case SkIntersectionHelper::kQuad_Segment: {
+                        case SkIntersectionHelper::kQuad_Segment:
                             swap = true;
                             pts = ts.quadLine(wn.pts(), wt.pts());
                             debugShowQuadLineIntersection(pts, wn, wt, ts);
                             break;
-                        }
-                        case SkIntersectionHelper::kCubic_Segment: {
+                        case SkIntersectionHelper::kConic_Segment:
+                            swap = true;
+                            pts = ts.conicLine(wn.pts(), wn.weight(), wt.pts());
+                            debugShowConicLineIntersection(pts, wn, wt, ts);
+                            break;
+                        case SkIntersectionHelper::kCubic_Segment:
                             swap = true;
                             pts = ts.cubicLine(wn.pts(), wt.pts());
-                            debugShowCubicLineIntersection(pts, wn, wt,  ts);
+                            debugShowCubicLineIntersection(pts, wn, wt, ts);
                             break;
-                        }
                         default:
                             SkASSERT(0);
                     }
@@ -300,19 +395,25 @@ bool AddIntersectTs(SkOpContour* test, SkOpContour* next) {
                                     wn.bottom(), wn.x(), wn.yFlipped());
                             debugShowQuadLineIntersection(pts, wt, wn, ts);
                             break;
-                        case SkIntersectionHelper::kLine_Segment: {
+                        case SkIntersectionHelper::kLine_Segment:
                             pts = ts.quadLine(wt.pts(), wn.pts());
                             debugShowQuadLineIntersection(pts, wt, wn, ts);
                             break;
-                        }
                         case SkIntersectionHelper::kQuad_Segment: {
-                            pts = ts.quadQuad(wt.pts(), wn.pts());
+                            pts = ts.intersect(quad1.set(wt.pts()), quad2.set(wn.pts()));
                             debugShowQuadIntersection(pts, wt, wn, ts);
                             break;
                         }
+                        case SkIntersectionHelper::kConic_Segment: {
+                            swap = true;
+                            pts = ts.intersect(conic2.set(wn.pts(), wn.weight()),
+                                    quad1.set(wt.pts()));
+                            debugShowConicQuadIntersection(pts, wn, wt, ts);
+                            break;
+                        }
                         case SkIntersectionHelper::kCubic_Segment: {
                             swap = true;
-                            pts = ts.cubicQuad(wn.pts(), wt.pts());
+                            pts = ts.intersect(cubic2.set(wn.pts()), quad1.set(wt.pts()));
                             debugShowCubicQuadIntersection(pts, wn, wt, ts);
                             break;
                         }
@@ -320,6 +421,43 @@ bool AddIntersectTs(SkOpContour* test, SkOpContour* next) {
                             SkASSERT(0);
                     }
                     break;
+                case SkIntersectionHelper::kConic_Segment:
+                    switch (wn.segmentType()) {
+                        case SkIntersectionHelper::kHorizontalLine_Segment:
+                            pts = ts.conicHorizontal(wt.pts(), wt.weight(), wn.left(),
+                                    wn.right(), wn.y(), wn.xFlipped());
+                            debugShowConicLineIntersection(pts, wt, wn, ts);
+                            break;
+                        case SkIntersectionHelper::kVerticalLine_Segment:
+                            pts = ts.conicVertical(wt.pts(), wt.weight(), wn.top(),
+                                    wn.bottom(), wn.x(), wn.yFlipped());
+                            debugShowConicLineIntersection(pts, wt, wn, ts);
+                            break;
+                        case SkIntersectionHelper::kLine_Segment:
+                            pts = ts.conicLine(wt.pts(), wt.weight(), wn.pts());
+                            debugShowConicLineIntersection(pts, wt, wn, ts);
+                            break;
+                        case SkIntersectionHelper::kQuad_Segment: {
+                            pts = ts.intersect(conic1.set(wt.pts(), wt.weight()),
+                                    quad2.set(wn.pts()));
+                            debugShowConicQuadIntersection(pts, wt, wn, ts);
+                            break;
+                        }
+                        case SkIntersectionHelper::kConic_Segment: {
+                            pts = ts.intersect(conic1.set(wt.pts(), wt.weight()),
+                                    conic2.set(wn.pts(), wn.weight()));
+                            debugShowConicIntersection(pts, wt, wn, ts);
+                            break;
+                        }
+                        case SkIntersectionHelper::kCubic_Segment: {
+                            swap = true;
+                            pts = ts.intersect(cubic2.set(wn.pts()),
+                                    conic1.set(wt.pts(), wt.weight()));
+                            debugShowCubicConicIntersection(pts, wn, wt, ts);
+                            break;
+                        }
+                    }
+                    break;
                 case SkIntersectionHelper::kCubic_Segment:
                     switch (wn.segmentType()) {
                         case SkIntersectionHelper::kHorizontalLine_Segment:
@@ -332,18 +470,23 @@ bool AddIntersectTs(SkOpContour* test, SkOpContour* next) {
                                     wn.bottom(), wn.x(), wn.yFlipped());
                             debugShowCubicLineIntersection(pts, wt, wn, ts);
                             break;
-                        case SkIntersectionHelper::kLine_Segment: {
+                        case SkIntersectionHelper::kLine_Segment:
                             pts = ts.cubicLine(wt.pts(), wn.pts());
                             debugShowCubicLineIntersection(pts, wt, wn, ts);
                             break;
-                        }
                         case SkIntersectionHelper::kQuad_Segment: {
-                            pts = ts.cubicQuad(wt.pts(), wn.pts());
+                            pts = ts.intersect(cubic1.set(wt.pts()), quad2.set(wn.pts()));
                             debugShowCubicQuadIntersection(pts, wt, wn, ts);
                             break;
                         }
+                        case SkIntersectionHelper::kConic_Segment: {
+                            pts = ts.intersect(cubic1.set(wt.pts()),
+                                    conic2.set(wn.pts(), wn.weight()));
+                            debugShowCubicConicIntersection(pts, wt, wn, ts);
+                            break;
+                        }
                         case SkIntersectionHelper::kCubic_Segment: {
-                            pts = ts.cubicCubic(wt.pts(), wn.pts());
+                            pts = ts.intersect(cubic1.set(wt.pts()), cubic2.set(wn.pts()));
                             debugShowCubicIntersection(pts, wt, wn, ts);
                             break;
                         }
@@ -354,102 +497,56 @@ bool AddIntersectTs(SkOpContour* test, SkOpContour* next) {
                 default:
                     SkASSERT(0);
             }
-            if (!foundCommonContour && pts > 0) {
-                test->addCross(next);
-                next->addCross(test);
-                foundCommonContour = true;
-            }
-            // in addition to recording T values, record matching segment
-            if (pts == 2) {
-                if (wn.segmentType() <= SkIntersectionHelper::kLine_Segment
-                        && wt.segmentType() <= SkIntersectionHelper::kLine_Segment) {
-                    if (wt.addCoincident(wn, ts, swap)) {
-                        continue;
-                    }
-                    ts.cleanUpCoincidence();  // prefer (t == 0 or t == 1)
-                    pts = 1;
-                } else if (wn.segmentType() >= SkIntersectionHelper::kQuad_Segment
-                        && wt.segmentType() >= SkIntersectionHelper::kQuad_Segment
-                        && ts.isCoincident(0)) {
-                    SkASSERT(ts.coincidentUsed() == 2);
-                    if (wt.addCoincident(wn, ts, swap)) {
-                        continue;
-                    }
-                    ts.cleanUpCoincidence();  // prefer (t == 0 or t == 1)
-                    pts = 1;
-                }
-            }
-            if (pts >= 2) {
-                for (int pt = 0; pt < pts - 1; ++pt) {
-                    const SkDPoint& point = ts.pt(pt);
-                    const SkDPoint& next = ts.pt(pt + 1);
-                    if (wt.isPartial(ts[swap][pt], ts[swap][pt + 1], point, next)
-                            && wn.isPartial(ts[!swap][pt], ts[!swap][pt + 1], point, next)) {
-                        if (!wt.addPartialCoincident(wn, ts, pt, swap)) {
-                            // remove extra point if two map to same float values
-                            ts.cleanUpCoincidence();  // prefer (t == 0 or t == 1)
-                            pts = 1;
-                        }
-                    }
-                }
-            }
+#if DEBUG_T_SECT_LOOP_COUNT
+            test->globalState()->debugAddLoopCount(&ts, wt, wn);
+#endif
+            int coinIndex = -1;
+            SkOpPtT* coinPtT[2];
             for (int pt = 0; pt < pts; ++pt) {
                 SkASSERT(ts[0][pt] >= 0 && ts[0][pt] <= 1);
                 SkASSERT(ts[1][pt] >= 0 && ts[1][pt] <= 1);
-                SkPoint point = ts.pt(pt).asSkPoint();
-                wt.alignTPt(wn, swap, pt, &ts, &point);
-                int testTAt = wt.addT(wn, point, ts[swap][pt]);
-                int nextTAt = wn.addT(wt, point, ts[!swap][pt]);
-                wt.addOtherT(testTAt, ts[!swap][pt], nextTAt);
-                wn.addOtherT(nextTAt, ts[swap][pt], testTAt);
+                wt.segment()->debugValidate();
+                SkOpPtT* testTAt = wt.segment()->addT(ts[swap][pt], SkOpSegment::kAllowAlias,
+                        allocator);
+                wn.segment()->debugValidate();
+                SkOpPtT* nextTAt = wn.segment()->addT(ts[!swap][pt], SkOpSegment::kAllowAlias,
+                        allocator);
+                testTAt->addOpp(nextTAt);
+                if (testTAt->fPt != nextTAt->fPt) {
+                    testTAt->span()->unaligned();
+                    nextTAt->span()->unaligned();
+                }
+                wt.segment()->debugValidate();
+                wn.segment()->debugValidate();
+                if (!ts.isCoincident(pt)) {
+                    continue;
+                }
+                if (coinIndex < 0) {
+                    coinPtT[0] = testTAt;
+                    coinPtT[1] = nextTAt;
+                    coinIndex = pt;
+                    continue;
+                }
+                if (coinPtT[0]->span() == testTAt->span()) {
+                    coinIndex = -1;
+                    continue;
+                }
+                if (coinPtT[1]->span() == nextTAt->span()) {
+                    coinIndex = -1;  // coincidence span collapsed
+                    continue;
+                }
+                if (swap) {
+                    SkTSwap(coinPtT[0], coinPtT[1]);
+                    SkTSwap(testTAt, nextTAt);
+                }
+                SkASSERT(coinPtT[0]->span()->t() < testTAt->span()->t());
+                coincidence->add(coinPtT[0], testTAt, coinPtT[1], nextTAt, allocator);
+                wt.segment()->debugValidate();
+                wn.segment()->debugValidate();
+                coinIndex = -1;
             }
+            SkASSERT(coinIndex < 0);  // expect coincidence to be paired
         } while (wn.advance());
     } while (wt.advance());
     return true;
 }
-
-void AddSelfIntersectTs(SkOpContour* test) {
-    SkIntersectionHelper wt;
-    wt.init(test);
-    do {
-        if (wt.segmentType() != SkIntersectionHelper::kCubic_Segment) {
-            continue;
-        }
-        SkIntersections ts;
-        int pts = ts.cubic(wt.pts());
-        debugShowCubicIntersection(pts, wt, ts);
-        if (!pts) {
-            continue;
-        }
-        SkASSERT(pts == 1);
-        SkASSERT(ts[0][0] >= 0 && ts[0][0] <= 1);
-        SkASSERT(ts[1][0] >= 0 && ts[1][0] <= 1);
-        SkPoint point = ts.pt(0).asSkPoint();
-        int testTAt = wt.addSelfT(point, ts[0][0]);
-        int nextTAt = wt.addSelfT(point, ts[1][0]);
-        wt.addOtherT(testTAt, ts[1][0], nextTAt);
-        wt.addOtherT(nextTAt, ts[0][0], testTAt);
-    } while (wt.advance());
-}
-
-// resolve any coincident pairs found while intersecting, and
-// see if coincidence is formed by clipping non-concident segments
-void CoincidenceCheck(SkTArray<SkOpContour*, true>* contourList, int total) {
-    int contourCount = (*contourList).count();
-    for (int cIndex = 0; cIndex < contourCount; ++cIndex) {
-        SkOpContour* contour = (*contourList)[cIndex];
-        contour->resolveNearCoincidence();
-    }
-    for (int cIndex = 0; cIndex < contourCount; ++cIndex) {
-        SkOpContour* contour = (*contourList)[cIndex];
-        contour->addCoincidentPoints();
-    }
-    for (int cIndex = 0; cIndex < contourCount; ++cIndex) {
-        SkOpContour* contour = (*contourList)[cIndex];
-        contour->calcCoincidentWinding();
-    }
-    for (int cIndex = 0; cIndex < contourCount; ++cIndex) {
-        SkOpContour* contour = (*contourList)[cIndex];
-        contour->calcPartialCoincidentWinding();
-    }
-}
diff --git a/gfx/skia/skia/src/pathops/SkAddIntersections.h b/gfx/skia/skia/src/pathops/SkAddIntersections.h
index 94ea436b734e..23654e5e91d2 100644
--- a/gfx/skia/skia/src/pathops/SkAddIntersections.h
+++ b/gfx/skia/skia/src/pathops/SkAddIntersections.h
@@ -9,10 +9,10 @@
 
 #include "SkIntersectionHelper.h"
 #include "SkIntersections.h"
-#include "SkTArray.h"
 
-bool AddIntersectTs(SkOpContour* test, SkOpContour* next);
-void AddSelfIntersectTs(SkOpContour* test);
-void CoincidenceCheck(SkTArray<SkOpContour*, true>* contourList, int total);
+class SkOpCoincidence;
+
+bool AddIntersectTs(SkOpContour* test, SkOpContour* next, SkOpCoincidence* coincidence,
+        SkChunkAlloc* allocator);
 
 #endif
diff --git a/gfx/skia/skia/src/pathops/SkDConicLineIntersection.cpp b/gfx/skia/skia/src/pathops/SkDConicLineIntersection.cpp
new file mode 100644
index 000000000000..e6d775f76e1b
--- /dev/null
+++ b/gfx/skia/skia/src/pathops/SkDConicLineIntersection.cpp
@@ -0,0 +1,363 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "SkIntersections.h"
+#include "SkPathOpsConic.h"
+#include "SkPathOpsLine.h"
+
+class LineConicIntersections {
+public:
+    enum PinTPoint {
+        kPointUninitialized,
+        kPointInitialized
+    };
+
+    LineConicIntersections(const SkDConic& c, const SkDLine& l, SkIntersections* i)
+        : fConic(c)
+        , fLine(&l)
+        , fIntersections(i)
+        , fAllowNear(true) {
+        i->setMax(3);  // allow short partial coincidence plus discrete intersection
+    }
+
+    LineConicIntersections(const SkDConic& c)
+        : fConic(c)
+        SkDEBUGPARAMS(fLine(nullptr))
+        SkDEBUGPARAMS(fIntersections(nullptr))
+        SkDEBUGPARAMS(fAllowNear(false)) {
+    }
+
+    void allowNear(bool allow) {
+        fAllowNear = allow;
+    }
+
+    void checkCoincident() {
+        int last = fIntersections->used() - 1;
+        for (int index = 0; index < last; ) {
+            double conicMidT = ((*fIntersections)[0][index] + (*fIntersections)[0][index + 1]) / 2;
+            SkDPoint conicMidPt = fConic.ptAtT(conicMidT);
+            double t = fLine->nearPoint(conicMidPt, nullptr);
+            if (t < 0) {
+                ++index;
+                continue;
+            }
+            if (fIntersections->isCoincident(index)) {
+                fIntersections->removeOne(index);
+                --last;
+            } else if (fIntersections->isCoincident(index + 1)) {
+                fIntersections->removeOne(index + 1);
+                --last;
+            } else {
+                fIntersections->setCoincident(index++);
+            }
+            fIntersections->setCoincident(index);
+        }
+    }
+
+#ifdef SK_DEBUG
+    static bool close_to(double a, double b, const double c[3]) {
+        double max = SkTMax(-SkTMin(SkTMin(c[0], c[1]), c[2]), SkTMax(SkTMax(c[0], c[1]), c[2]));
+        return approximately_zero_when_compared_to(a - b, max);
+    }
+#endif
+    int horizontalIntersect(double axisIntercept, double roots[2]) {
+        double conicVals[] = { fConic[0].fY, fConic[1].fY, fConic[2].fY };
+        return this->validT(conicVals, axisIntercept, roots);
+    }
+
+    int horizontalIntersect(double axisIntercept, double left, double right, bool flipped) {
+        this->addExactHorizontalEndPoints(left, right, axisIntercept);
+        if (fAllowNear) {
+            this->addNearHorizontalEndPoints(left, right, axisIntercept);
+        }
+        double roots[2];
+        int count = this->horizontalIntersect(axisIntercept, roots);
+        for (int index = 0; index < count; ++index) {
+            double conicT = roots[index];
+            SkDPoint pt = fConic.ptAtT(conicT);
+            SkDEBUGCODE_(double conicVals[] = { fConic[0].fY, fConic[1].fY, fConic[2].fY });
+            SkASSERT(close_to(pt.fY, axisIntercept, conicVals));
+            double lineT = (pt.fX - left) / (right - left);
+            if (this->pinTs(&conicT, &lineT, &pt, kPointInitialized)
+                    && this->uniqueAnswer(conicT, pt)) {
+                fIntersections->insert(conicT, lineT, pt);
+            }
+        }
+        if (flipped) {
+            fIntersections->flip();
+        }
+        this->checkCoincident();
+        return fIntersections->used();
+    }
+
+    int intersect() {
+        this->addExactEndPoints();
+        if (fAllowNear) {
+            this->addNearEndPoints();
+        }
+        double rootVals[2];
+        int roots = this->intersectRay(rootVals);
+        for (int index = 0; index < roots; ++index) {
+            double conicT = rootVals[index];
+            double lineT = this->findLineT(conicT);
+            SkDEBUGCODE(SkDPoint conicPt = fConic.ptAtT(conicT));
+            SkDEBUGCODE(SkDPoint linePt = fLine->ptAtT(lineT));
+            SkASSERT(conicPt.approximatelyEqual(linePt));
+            SkDPoint pt;
+            if (this->pinTs(&conicT, &lineT, &pt, kPointUninitialized)
+                    && this->uniqueAnswer(conicT, pt)) {
+                fIntersections->insert(conicT, lineT, pt);
+            }
+        }
+        this->checkCoincident();
+        return fIntersections->used();
+    }
+
+    int intersectRay(double roots[2]) {
+        double adj = (*fLine)[1].fX - (*fLine)[0].fX;
+        double opp = (*fLine)[1].fY - (*fLine)[0].fY;
+        double r[3];
+        for (int n = 0; n < 3; ++n) {
+            r[n] = (fConic[n].fY - (*fLine)[0].fY) * adj - (fConic[n].fX - (*fLine)[0].fX) * opp;
+        }
+        return this->validT(r, 0, roots);
+    }
+
+    int validT(double r[3], double axisIntercept, double roots[2]) {
+        double A = r[2];
+        double B = r[1] * fConic.fWeight - axisIntercept * fConic.fWeight + axisIntercept;
+        double C = r[0];
+        A += C - 2 * B;  // A = a + c - 2*(b*w - xCept*w + xCept)
+        B -= C;  // B = b*w - w * xCept + xCept - a
+        C -= axisIntercept;
+        return SkDQuad::RootsValidT(A, 2 * B, C, roots);
+    }
+
+    int verticalIntersect(double axisIntercept, double roots[2]) {
+        double conicVals[] = { fConic[0].fX, fConic[1].fX, fConic[2].fX };
+        return this->validT(conicVals, axisIntercept, roots);
+    }
+
+    int verticalIntersect(double axisIntercept, double top, double bottom, bool flipped) {
+        this->addExactVerticalEndPoints(top, bottom, axisIntercept);
+        if (fAllowNear) {
+            this->addNearVerticalEndPoints(top, bottom, axisIntercept);
+        }
+        double roots[2];
+        int count = this->verticalIntersect(axisIntercept, roots);
+        for (int index = 0; index < count; ++index) {
+            double conicT = roots[index];
+            SkDPoint pt = fConic.ptAtT(conicT);
+            SkDEBUGCODE_(double conicVals[] = { fConic[0].fX, fConic[1].fX, fConic[2].fX });
+            SkASSERT(close_to(pt.fX, axisIntercept, conicVals));
+            double lineT = (pt.fY - top) / (bottom - top);
+            if (this->pinTs(&conicT, &lineT, &pt, kPointInitialized)
+                    && this->uniqueAnswer(conicT, pt)) {
+                fIntersections->insert(conicT, lineT, pt);
+            }
+        }
+        if (flipped) {
+            fIntersections->flip();
+        }
+        this->checkCoincident();
+        return fIntersections->used();
+    }
+
+protected:
+// OPTIMIZE: Functions of the form add .. points are indentical to the conic routines.
+    // add endpoints first to get zero and one t values exactly
+    void addExactEndPoints() {
+        for (int cIndex = 0; cIndex < SkDConic::kPointCount; cIndex += SkDConic::kPointLast) {
+            double lineT = fLine->exactPoint(fConic[cIndex]);
+            if (lineT < 0) {
+                continue;
+            }
+            double conicT = (double) (cIndex >> 1);
+            fIntersections->insert(conicT, lineT, fConic[cIndex]);
+        }
+    }
+
+    void addNearEndPoints() {
+        for (int cIndex = 0; cIndex < SkDConic::kPointCount; cIndex += SkDConic::kPointLast) {
+            double conicT = (double) (cIndex >> 1);
+            if (fIntersections->hasT(conicT)) {
+                continue;
+            }
+            double lineT = fLine->nearPoint(fConic[cIndex], nullptr);
+            if (lineT < 0) {
+                continue;
+            }
+            fIntersections->insert(conicT, lineT, fConic[cIndex]);
+        }
+        // FIXME: see if line end is nearly on conic
+    }
+
+    void addExactHorizontalEndPoints(double left, double right, double y) {
+        for (int cIndex = 0; cIndex < SkDConic::kPointCount; cIndex += SkDConic::kPointLast) {
+            double lineT = SkDLine::ExactPointH(fConic[cIndex], left, right, y);
+            if (lineT < 0) {
+                continue;
+            }
+            double conicT = (double) (cIndex >> 1);
+            fIntersections->insert(conicT, lineT, fConic[cIndex]);
+        }
+    }
+
+    void addNearHorizontalEndPoints(double left, double right, double y) {
+        for (int cIndex = 0; cIndex < SkDConic::kPointCount; cIndex += SkDConic::kPointLast) {
+            double conicT = (double) (cIndex >> 1);
+            if (fIntersections->hasT(conicT)) {
+                continue;
+            }
+            double lineT = SkDLine::NearPointH(fConic[cIndex], left, right, y);
+            if (lineT < 0) {
+                continue;
+            }
+            fIntersections->insert(conicT, lineT, fConic[cIndex]);
+        }
+        // FIXME: see if line end is nearly on conic
+    }
+
+    void addExactVerticalEndPoints(double top, double bottom, double x) {
+        for (int cIndex = 0; cIndex < SkDConic::kPointCount; cIndex += SkDConic::kPointLast) {
+            double lineT = SkDLine::ExactPointV(fConic[cIndex], top, bottom, x);
+            if (lineT < 0) {
+                continue;
+            }
+            double conicT = (double) (cIndex >> 1);
+            fIntersections->insert(conicT, lineT, fConic[cIndex]);
+        }
+    }
+
+    void addNearVerticalEndPoints(double top, double bottom, double x) {
+        for (int cIndex = 0; cIndex < SkDConic::kPointCount; cIndex += SkDConic::kPointLast) {
+            double conicT = (double) (cIndex >> 1);
+            if (fIntersections->hasT(conicT)) {
+                continue;
+            }
+            double lineT = SkDLine::NearPointV(fConic[cIndex], top, bottom, x);
+            if (lineT < 0) {
+                continue;
+            }
+            fIntersections->insert(conicT, lineT, fConic[cIndex]);
+        }
+        // FIXME: see if line end is nearly on conic
+    }
+
+    double findLineT(double t) {
+        SkDPoint xy = fConic.ptAtT(t);
+        double dx = (*fLine)[1].fX - (*fLine)[0].fX;
+        double dy = (*fLine)[1].fY - (*fLine)[0].fY;
+        if (fabs(dx) > fabs(dy)) {
+            return (xy.fX - (*fLine)[0].fX) / dx;
+        }
+        return (xy.fY - (*fLine)[0].fY) / dy;
+    }
+
+    bool pinTs(double* conicT, double* lineT, SkDPoint* pt, PinTPoint ptSet) {
+        if (!approximately_one_or_less_double(*lineT)) {
+            return false;
+        }
+        if (!approximately_zero_or_more_double(*lineT)) {
+            return false;
+        }
+        double qT = *conicT = SkPinT(*conicT);
+        double lT = *lineT = SkPinT(*lineT);
+        if (lT == 0 || lT == 1 || (ptSet == kPointUninitialized && qT != 0 && qT != 1)) {
+            *pt = (*fLine).ptAtT(lT);
+        } else if (ptSet == kPointUninitialized) {
+            *pt = fConic.ptAtT(qT);
+        }
+        SkPoint gridPt = pt->asSkPoint();
+        if (SkDPoint::ApproximatelyEqual(gridPt, (*fLine)[0].asSkPoint())) {
+            *pt = (*fLine)[0];
+            *lineT = 0;
+        } else if (SkDPoint::ApproximatelyEqual(gridPt, (*fLine)[1].asSkPoint())) {
+            *pt = (*fLine)[1];
+            *lineT = 1;
+        }
+        if (fIntersections->used() > 0 && approximately_equal((*fIntersections)[1][0], *lineT)) {
+            return false;
+        }
+        if (gridPt == fConic[0].asSkPoint()) {
+            *pt = fConic[0];
+            *conicT = 0;
+        } else if (gridPt == fConic[2].asSkPoint()) {
+            *pt = fConic[2];
+            *conicT = 1;
+        }
+        return true;
+    }
+
+    bool uniqueAnswer(double conicT, const SkDPoint& pt) {
+        for (int inner = 0; inner < fIntersections->used(); ++inner) {
+            if (fIntersections->pt(inner) != pt) {
+                continue;
+            }
+            double existingConicT = (*fIntersections)[0][inner];
+            if (conicT == existingConicT) {
+                return false;
+            }
+            // check if midway on conic is also same point. If so, discard this
+            double conicMidT = (existingConicT + conicT) / 2;
+            SkDPoint conicMidPt = fConic.ptAtT(conicMidT);
+            if (conicMidPt.approximatelyEqual(pt)) {
+                return false;
+            }
+        }
+#if ONE_OFF_DEBUG
+        SkDPoint qPt = fConic.ptAtT(conicT);
+        SkDebugf("%s pt=(%1.9g,%1.9g) cPt=(%1.9g,%1.9g)\n", __FUNCTION__, pt.fX, pt.fY,
+                qPt.fX, qPt.fY);
+#endif
+        return true;
+    }
+
+private:
+    const SkDConic& fConic;
+    const SkDLine* fLine;
+    SkIntersections* fIntersections;
+    bool fAllowNear;
+};
+
+int SkIntersections::horizontal(const SkDConic& conic, double left, double right, double y,
+                                bool flipped) {
+    SkDLine line = {{{ left, y }, { right, y }}};
+    LineConicIntersections c(conic, line, this);
+    return c.horizontalIntersect(y, left, right, flipped);
+}
+
+int SkIntersections::vertical(const SkDConic& conic, double top, double bottom, double x,
+                              bool flipped) {
+    SkDLine line = {{{ x, top }, { x, bottom }}};
+    LineConicIntersections c(conic, line, this);
+    return c.verticalIntersect(x, top, bottom, flipped);
+}
+
+int SkIntersections::intersect(const SkDConic& conic, const SkDLine& line) {
+    LineConicIntersections c(conic, line, this);
+    c.allowNear(fAllowNear);
+    return c.intersect();
+}
+
+int SkIntersections::intersectRay(const SkDConic& conic, const SkDLine& line) {
+    LineConicIntersections c(conic, line, this);
+    fUsed = c.intersectRay(fT[0]);
+    for (int index = 0; index < fUsed; ++index) {
+        fPt[index] = conic.ptAtT(fT[0][index]);
+    }
+    return fUsed;
+}
+
+int SkIntersections::HorizontalIntercept(const SkDConic& conic, SkScalar y, double* roots) {
+    LineConicIntersections c(conic);
+    return c.horizontalIntersect(y, roots);
+}
+
+int SkIntersections::VerticalIntercept(const SkDConic& conic, SkScalar x, double* roots) {
+    LineConicIntersections c(conic);
+    return c.verticalIntersect(x, roots);
+}
diff --git a/gfx/skia/skia/src/pathops/SkDCubicIntersection.cpp b/gfx/skia/skia/src/pathops/SkDCubicIntersection.cpp
deleted file mode 100644
index 9d83242eda60..000000000000
--- a/gfx/skia/skia/src/pathops/SkDCubicIntersection.cpp
+++ /dev/null
@@ -1,698 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkIntersections.h"
-#include "SkPathOpsCubic.h"
-#include "SkPathOpsLine.h"
-#include "SkPathOpsPoint.h"
-#include "SkPathOpsQuad.h"
-#include "SkPathOpsRect.h"
-#include "SkReduceOrder.h"
-#include "SkTSort.h"
-
-#if ONE_OFF_DEBUG
-static const double tLimits1[2][2] = {{0.3, 0.4}, {0.8, 0.9}};
-static const double tLimits2[2][2] = {{-0.8, -0.9}, {-0.8, -0.9}};
-#endif
-
-#define DEBUG_QUAD_PART ONE_OFF_DEBUG && 1
-#define DEBUG_QUAD_PART_SHOW_SIMPLE DEBUG_QUAD_PART && 0
-#define SWAP_TOP_DEBUG 0
-
-static const int kCubicToQuadSubdivisionDepth = 8; // slots reserved for cubic to quads subdivision
-
-static int quadPart(const SkDCubic& cubic, double tStart, double tEnd, SkReduceOrder* reducer) {
-    SkDCubic part = cubic.subDivide(tStart, tEnd);
-    SkDQuad quad = part.toQuad();
-    // FIXME: should reduceOrder be looser in this use case if quartic is going to blow up on an
-    // extremely shallow quadratic?
-    int order = reducer->reduce(quad);
-#if DEBUG_QUAD_PART
-    SkDebugf("%s cubic=(%1.9g,%1.9g %1.9g,%1.9g %1.9g,%1.9g %1.9g,%1.9g)"
-            " t=(%1.9g,%1.9g)\n", __FUNCTION__, cubic[0].fX, cubic[0].fY,
-            cubic[1].fX, cubic[1].fY, cubic[2].fX, cubic[2].fY,
-            cubic[3].fX, cubic[3].fY, tStart, tEnd);
-    SkDebugf("  {{%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}},\n"
-             "  {{%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}},\n",
-            part[0].fX, part[0].fY, part[1].fX, part[1].fY, part[2].fX, part[2].fY,
-            part[3].fX, part[3].fY, quad[0].fX, quad[0].fY,
-            quad[1].fX, quad[1].fY, quad[2].fX, quad[2].fY);
-#if DEBUG_QUAD_PART_SHOW_SIMPLE
-    SkDebugf("%s simple=(%1.9g,%1.9g", __FUNCTION__, reducer->fQuad[0].fX, reducer->fQuad[0].fY);
-    if (order > 1) {
-        SkDebugf(" %1.9g,%1.9g", reducer->fQuad[1].fX, reducer->fQuad[1].fY);
-    }
-    if (order > 2) {
-        SkDebugf(" %1.9g,%1.9g", reducer->fQuad[2].fX, reducer->fQuad[2].fY);
-    }
-    SkDebugf(")\n");
-    SkASSERT(order < 4 && order > 0);
-#endif
-#endif
-    return order;
-}
-
-static void intersectWithOrder(const SkDQuad& simple1, int order1, const SkDQuad& simple2,
-        int order2, SkIntersections& i) {
-    if (order1 == 3 && order2 == 3) {
-        i.intersect(simple1, simple2);
-    } else if (order1 <= 2 && order2 <= 2) {
-        i.intersect((const SkDLine&) simple1, (const SkDLine&) simple2);
-    } else if (order1 == 3 && order2 <= 2) {
-        i.intersect(simple1, (const SkDLine&) simple2);
-    } else {
-        SkASSERT(order1 <= 2 && order2 == 3);
-        i.intersect(simple2, (const SkDLine&) simple1);
-        i.swapPts();
-    }
-}
-
-// this flavor centers potential intersections recursively. In contrast, '2' may inadvertently
-// chase intersections near quadratic ends, requiring odd hacks to find them.
-static void intersect(const SkDCubic& cubic1, double t1s, double t1e, const SkDCubic& cubic2,
-        double t2s, double t2e, double precisionScale, SkIntersections& i) {
-    i.upDepth();
-    SkDCubic c1 = cubic1.subDivide(t1s, t1e);
-    SkDCubic c2 = cubic2.subDivide(t2s, t2e);
-    SkSTArray<kCubicToQuadSubdivisionDepth, double, true> ts1;
-    // OPTIMIZE: if c1 == c2, call once (happens when detecting self-intersection)
-    c1.toQuadraticTs(c1.calcPrecision() * precisionScale, &ts1);
-    SkSTArray<kCubicToQuadSubdivisionDepth, double, true> ts2;
-    c2.toQuadraticTs(c2.calcPrecision() * precisionScale, &ts2);
-    double t1Start = t1s;
-    int ts1Count = ts1.count();
-    for (int i1 = 0; i1 <= ts1Count; ++i1) {
-        const double tEnd1 = i1 < ts1Count ? ts1[i1] : 1;
-        const double t1 = t1s + (t1e - t1s) * tEnd1;
-        SkReduceOrder s1;
-        int o1 = quadPart(cubic1, t1Start, t1, &s1);
-        double t2Start = t2s;
-        int ts2Count = ts2.count();
-        for (int i2 = 0; i2 <= ts2Count; ++i2) {
-            const double tEnd2 = i2 < ts2Count ? ts2[i2] : 1;
-            const double t2 = t2s + (t2e - t2s) * tEnd2;
-            if (&cubic1 == &cubic2 && t1Start >= t2Start) {
-                t2Start = t2;
-                continue;
-            }
-            SkReduceOrder s2;
-            int o2 = quadPart(cubic2, t2Start, t2, &s2);
-        #if ONE_OFF_DEBUG
-            char tab[] = "                  ";
-            if (tLimits1[0][0] >= t1Start && tLimits1[0][1] <= t1
-                    && tLimits1[1][0] >= t2Start && tLimits1[1][1] <= t2) {
-                SkDebugf("%.*s %s t1=(%1.9g,%1.9g) t2=(%1.9g,%1.9g)", i.depth()*2, tab,
-                        __FUNCTION__, t1Start, t1, t2Start, t2);
-                SkIntersections xlocals;
-                xlocals.allowNear(false);
-                intersectWithOrder(s1.fQuad, o1, s2.fQuad, o2, xlocals);
-                SkDebugf(" xlocals.fUsed=%d\n", xlocals.used());
-            }
-        #endif
-            SkIntersections locals;
-            locals.allowNear(false);
-            intersectWithOrder(s1.fQuad, o1, s2.fQuad, o2, locals);
-            int tCount = locals.used();
-            for (int tIdx = 0; tIdx < tCount; ++tIdx) {
-                double to1 = t1Start + (t1 - t1Start) * locals[0][tIdx];
-                double to2 = t2Start + (t2 - t2Start) * locals[1][tIdx];
-    // if the computed t is not sufficiently precise, iterate
-                SkDPoint p1 = cubic1.ptAtT(to1);
-                SkDPoint p2 = cubic2.ptAtT(to2);
-                if (p1.approximatelyEqual(p2)) {
-    // FIXME: local edge may be coincident -- experiment with not propagating coincidence to caller
-//                    SkASSERT(!locals.isCoincident(tIdx));
-                    if (&cubic1 != &cubic2 || !approximately_equal(to1, to2)) {
-                        if (i.swapped()) {  //  FIXME: insert should respect swap
-                            i.insert(to2, to1, p1);
-                        } else {
-                            i.insert(to1, to2, p1);
-                        }
-                    }
-                } else {
-/*for random cubics, 16 below catches 99.997% of the intersections. To test for the remaining 0.003%
-  look for nearly coincident curves. and check each 1/16th section.
-*/
-                    double offset = precisionScale / 16;  // FIXME: const is arbitrary: test, refine
-                    double c1Bottom = tIdx == 0 ? 0 :
-                            (t1Start + (t1 - t1Start) * locals[0][tIdx - 1] + to1) / 2;
-                    double c1Min = SkTMax(c1Bottom, to1 - offset);
-                    double c1Top = tIdx == tCount - 1 ? 1 :
-                            (t1Start + (t1 - t1Start) * locals[0][tIdx + 1] + to1) / 2;
-                    double c1Max = SkTMin(c1Top, to1 + offset);
-                    double c2Min = SkTMax(0., to2 - offset);
-                    double c2Max = SkTMin(1., to2 + offset);
-                #if ONE_OFF_DEBUG
-                    SkDebugf("%.*s %s 1 contains1=%d/%d contains2=%d/%d\n", i.depth()*2, tab,
-                            __FUNCTION__,
-                            c1Min <= tLimits1[0][1] && tLimits1[0][0] <= c1Max
-                         && c2Min <= tLimits1[1][1] && tLimits1[1][0] <= c2Max,
-                            to1 - offset <= tLimits1[0][1] && tLimits1[0][0] <= to1 + offset
-                         && to2 - offset <= tLimits1[1][1] && tLimits1[1][0] <= to2 + offset,
-                            c1Min <= tLimits2[0][1] && tLimits2[0][0] <= c1Max
-                         && c2Min <= tLimits2[1][1] && tLimits2[1][0] <= c2Max,
-                            to1 - offset <= tLimits2[0][1] && tLimits2[0][0] <= to1 + offset
-                         && to2 - offset <= tLimits2[1][1] && tLimits2[1][0] <= to2 + offset);
-                    SkDebugf("%.*s %s 1 c1Bottom=%1.9g c1Top=%1.9g c2Bottom=%1.9g c2Top=%1.9g"
-                            " 1-o=%1.9g 1+o=%1.9g 2-o=%1.9g 2+o=%1.9g offset=%1.9g\n",
-                            i.depth()*2, tab, __FUNCTION__, c1Bottom, c1Top, 0., 1.,
-                            to1 - offset, to1 + offset, to2 - offset, to2 + offset, offset);
-                    SkDebugf("%.*s %s 1 to1=%1.9g to2=%1.9g c1Min=%1.9g c1Max=%1.9g c2Min=%1.9g"
-                            " c2Max=%1.9g\n", i.depth()*2, tab, __FUNCTION__, to1, to2, c1Min,
-                            c1Max, c2Min, c2Max);
-                #endif
-                    intersect(cubic1, c1Min, c1Max, cubic2, c2Min, c2Max, offset, i);
-                #if ONE_OFF_DEBUG
-                    SkDebugf("%.*s %s 1 i.used=%d t=%1.9g\n", i.depth()*2, tab, __FUNCTION__,
-                            i.used(), i.used() > 0 ? i[0][i.used() - 1] : -1);
-                #endif
-                    if (tCount > 1) {
-                        c1Min = SkTMax(0., to1 - offset);
-                        c1Max = SkTMin(1., to1 + offset);
-                        double c2Bottom = tIdx == 0 ? to2 :
-                                (t2Start + (t2 - t2Start) * locals[1][tIdx - 1] + to2) / 2;
-                        double c2Top = tIdx == tCount - 1 ? to2 :
-                                (t2Start + (t2 - t2Start) * locals[1][tIdx + 1] + to2) / 2;
-                        if (c2Bottom > c2Top) {
-                            SkTSwap(c2Bottom, c2Top);
-                        }
-                        if (c2Bottom == to2) {
-                            c2Bottom = 0;
-                        }
-                        if (c2Top == to2) {
-                            c2Top = 1;
-                        }
-                        c2Min = SkTMax(c2Bottom, to2 - offset);
-                        c2Max = SkTMin(c2Top, to2 + offset);
-                    #if ONE_OFF_DEBUG
-                        SkDebugf("%.*s %s 2 contains1=%d/%d contains2=%d/%d\n", i.depth()*2, tab,
-                            __FUNCTION__,
-                            c1Min <= tLimits1[0][1] && tLimits1[0][0] <= c1Max
-                         && c2Min <= tLimits1[1][1] && tLimits1[1][0] <= c2Max,
-                            to1 - offset <= tLimits1[0][1] && tLimits1[0][0] <= to1 + offset
-                         && to2 - offset <= tLimits1[1][1] && tLimits1[1][0] <= to2 + offset,
-                            c1Min <= tLimits2[0][1] && tLimits2[0][0] <= c1Max
-                         && c2Min <= tLimits2[1][1] && tLimits2[1][0] <= c2Max,
-                            to1 - offset <= tLimits2[0][1] && tLimits2[0][0] <= to1 + offset
-                         && to2 - offset <= tLimits2[1][1] && tLimits2[1][0] <= to2 + offset);
-                        SkDebugf("%.*s %s 2 c1Bottom=%1.9g c1Top=%1.9g c2Bottom=%1.9g c2Top=%1.9g"
-                                " 1-o=%1.9g 1+o=%1.9g 2-o=%1.9g 2+o=%1.9g offset=%1.9g\n",
-                                i.depth()*2, tab, __FUNCTION__, 0., 1., c2Bottom, c2Top,
-                                to1 - offset, to1 + offset, to2 - offset, to2 + offset, offset);
-                        SkDebugf("%.*s %s 2 to1=%1.9g to2=%1.9g c1Min=%1.9g c1Max=%1.9g c2Min=%1.9g"
-                                " c2Max=%1.9g\n", i.depth()*2, tab, __FUNCTION__, to1, to2, c1Min,
-                                c1Max, c2Min, c2Max);
-                    #endif
-                        intersect(cubic1, c1Min, c1Max, cubic2, c2Min, c2Max, offset, i);
-                #if ONE_OFF_DEBUG
-                    SkDebugf("%.*s %s 2 i.used=%d t=%1.9g\n", i.depth()*2, tab, __FUNCTION__,
-                            i.used(), i.used() > 0 ? i[0][i.used() - 1] : -1);
-                #endif
-                        c1Min = SkTMax(c1Bottom, to1 - offset);
-                        c1Max = SkTMin(c1Top, to1 + offset);
-                    #if ONE_OFF_DEBUG
-                        SkDebugf("%.*s %s 3 contains1=%d/%d contains2=%d/%d\n", i.depth()*2, tab,
-                        __FUNCTION__,
-                            c1Min <= tLimits1[0][1] && tLimits1[0][0] <= c1Max
-                         && c2Min <= tLimits1[1][1] && tLimits1[1][0] <= c2Max,
-                            to1 - offset <= tLimits1[0][1] && tLimits1[0][0] <= to1 + offset
-                         && to2 - offset <= tLimits1[1][1] && tLimits1[1][0] <= to2 + offset,
-                            c1Min <= tLimits2[0][1] && tLimits2[0][0] <= c1Max
-                         && c2Min <= tLimits2[1][1] && tLimits2[1][0] <= c2Max,
-                            to1 - offset <= tLimits2[0][1] && tLimits2[0][0] <= to1 + offset
-                         && to2 - offset <= tLimits2[1][1] && tLimits2[1][0] <= to2 + offset);
-                        SkDebugf("%.*s %s 3 c1Bottom=%1.9g c1Top=%1.9g c2Bottom=%1.9g c2Top=%1.9g"
-                                " 1-o=%1.9g 1+o=%1.9g 2-o=%1.9g 2+o=%1.9g offset=%1.9g\n",
-                                i.depth()*2, tab, __FUNCTION__, 0., 1., c2Bottom, c2Top,
-                                to1 - offset, to1 + offset, to2 - offset, to2 + offset, offset);
-                        SkDebugf("%.*s %s 3 to1=%1.9g to2=%1.9g c1Min=%1.9g c1Max=%1.9g c2Min=%1.9g"
-                                " c2Max=%1.9g\n", i.depth()*2, tab, __FUNCTION__, to1, to2, c1Min,
-                                c1Max, c2Min, c2Max);
-                    #endif
-                        intersect(cubic1, c1Min, c1Max, cubic2, c2Min, c2Max, offset, i);
-                #if ONE_OFF_DEBUG
-                    SkDebugf("%.*s %s 3 i.used=%d t=%1.9g\n", i.depth()*2, tab, __FUNCTION__,
-                            i.used(), i.used() > 0 ? i[0][i.used() - 1] : -1);
-                #endif
-                    }
-          //          intersect(cubic1, c1Min, c1Max, cubic2, c2Min, c2Max, offset, i);
-                    // FIXME: if no intersection is found, either quadratics intersected where
-                    // cubics did not, or the intersection was missed. In the former case, expect
-                    // the quadratics to be nearly parallel at the point of intersection, and check
-                    // for that.
-                }
-            }
-            t2Start = t2;
-        }
-        t1Start = t1;
-    }
-    i.downDepth();
-}
-
-    // if two ends intersect, check middle for coincidence
-bool SkIntersections::cubicCheckCoincidence(const SkDCubic& c1, const SkDCubic& c2) {
-    if (fUsed < 2) {
-        return false;
-    }
-    int last = fUsed - 1;
-    double tRange1 = fT[0][last] - fT[0][0];
-    double tRange2 = fT[1][last] - fT[1][0];
-    for (int index = 1; index < 5; ++index) {
-        double testT1 = fT[0][0] + tRange1 * index / 5;
-        double testT2 = fT[1][0] + tRange2 * index / 5;
-        SkDPoint testPt1 = c1.ptAtT(testT1);
-        SkDPoint testPt2 = c2.ptAtT(testT2);
-        if (!testPt1.approximatelyEqual(testPt2)) {
-            return false;
-        }
-    }
-    if (fUsed > 2) {
-        fPt[1] = fPt[last];
-        fT[0][1] = fT[0][last];
-        fT[1][1] = fT[1][last];
-        fUsed = 2;
-    }
-    fIsCoincident[0] = fIsCoincident[1] = 0x03;
-    return true;
-}
-
-#define LINE_FRACTION 0.1
-
-// intersect the end of the cubic with the other. Try lines from the end to control and opposite
-// end to determine range of t on opposite cubic.
-bool SkIntersections::cubicExactEnd(const SkDCubic& cubic1, bool start, const SkDCubic& cubic2) {
-    int t1Index = start ? 0 : 3;
-    double testT = (double) !start;
-    bool swap = swapped();
-    // quad/quad at this point checks to see if exact matches have already been found
-    // cubic/cubic can't reject so easily since cubics can intersect same point more than once
-    SkDLine tmpLine;
-    tmpLine[0] = tmpLine[1] = cubic2[t1Index];
-    tmpLine[1].fX += cubic2[2 - start].fY - cubic2[t1Index].fY;
-    tmpLine[1].fY -= cubic2[2 - start].fX - cubic2[t1Index].fX;
-    SkIntersections impTs;
-    impTs.allowNear(false);
-    impTs.intersectRay(cubic1, tmpLine);
-    for (int index = 0; index < impTs.used(); ++index) {
-        SkDPoint realPt = impTs.pt(index);
-        if (!tmpLine[0].approximatelyEqual(realPt)) {
-            continue;
-        }
-        if (swap) {
-            cubicInsert(testT, impTs[0][index], tmpLine[0], cubic2, cubic1);
-        } else {
-            cubicInsert(impTs[0][index], testT, tmpLine[0], cubic1, cubic2);
-        }
-        return true;
-    }
-    return false;
-}
-
-
-void SkIntersections::cubicInsert(double one, double two, const SkDPoint& pt,
-        const SkDCubic& cubic1, const SkDCubic& cubic2) {
-    for (int index = 0; index < fUsed; ++index) {
-        if (fT[0][index] == one) {
-            double oldTwo = fT[1][index];
-            if (oldTwo == two) {
-                return;
-            }
-            SkDPoint mid = cubic2.ptAtT((oldTwo + two) / 2);
-            if (mid.approximatelyEqual(fPt[index])) {
-                return;
-            }
-        }
-        if (fT[1][index] == two) {
-            SkDPoint mid = cubic1.ptAtT((fT[0][index] + two) / 2);
-            if (mid.approximatelyEqual(fPt[index])) {
-                return;
-            }
-        }
-    }
-    insert(one, two, pt);
-}
-
-void SkIntersections::cubicNearEnd(const SkDCubic& cubic1, bool start, const SkDCubic& cubic2,
-                         const SkDRect& bounds2) {
-    SkDLine line;
-    int t1Index = start ? 0 : 3;
-    double testT = (double) !start;
-   // don't bother if the two cubics are connnected
-    static const int kPointsInCubic = 4; // FIXME: move to DCubic, replace '4' with this
-    static const int kMaxLineCubicIntersections = 3;
-    SkSTArray<(kMaxLineCubicIntersections - 1) * kMaxLineCubicIntersections, double, true> tVals;
-    line[0] = cubic1[t1Index];
-    // this variant looks for intersections with the end point and lines parallel to other points
-    for (int index = 0; index < kPointsInCubic; ++index) {
-        if (index == t1Index) {
-            continue;
-        }
-        SkDVector dxy1 = cubic1[index] - line[0];
-        dxy1 /= SkDCubic::gPrecisionUnit;
-        line[1] = line[0] + dxy1;
-        SkDRect lineBounds;
-        lineBounds.setBounds(line);
-        if (!bounds2.intersects(&lineBounds)) {
-            continue;
-        }
-        SkIntersections local;
-        if (!local.intersect(cubic2, line)) {
-            continue;
-        }
-        for (int idx2 = 0; idx2 < local.used(); ++idx2) {
-            double foundT = local[0][idx2];
-            if (approximately_less_than_zero(foundT)
-                    || approximately_greater_than_one(foundT)) {
-                continue;
-            }
-            if (local.pt(idx2).approximatelyEqual(line[0])) {
-                if (swapped()) {  // FIXME: insert should respect swap
-                    insert(foundT, testT, line[0]);
-                } else {
-                    insert(testT, foundT, line[0]);
-                }
-            } else {
-                tVals.push_back(foundT);
-            }
-        }
-    }
-    if (tVals.count() == 0) {
-        return;
-    }
-    SkTQSort<double>(tVals.begin(), tVals.end() - 1);
-    double tMin1 = start ? 0 : 1 - LINE_FRACTION;
-    double tMax1 = start ? LINE_FRACTION : 1;
-    int tIdx = 0;
-    do {
-        int tLast = tIdx;
-        while (tLast + 1 < tVals.count() && roughly_equal(tVals[tLast + 1], tVals[tIdx])) {
-            ++tLast;
-        }
-        double tMin2 = SkTMax(tVals[tIdx] - LINE_FRACTION, 0.0);
-        double tMax2 = SkTMin(tVals[tLast] + LINE_FRACTION, 1.0);
-        int lastUsed = used();
-        if (start ? tMax1 < tMin2 : tMax2 < tMin1) {
-            ::intersect(cubic1, tMin1, tMax1, cubic2, tMin2, tMax2, 1, *this);
-        }
-        if (lastUsed == used()) {
-            tMin2 = SkTMax(tVals[tIdx] - (1.0 / SkDCubic::gPrecisionUnit), 0.0);
-            tMax2 = SkTMin(tVals[tLast] + (1.0 / SkDCubic::gPrecisionUnit), 1.0);
-            if (start ? tMax1 < tMin2 : tMax2 < tMin1) {
-                ::intersect(cubic1, tMin1, tMax1, cubic2, tMin2, tMax2, 1, *this);
-            }
-        }
-        tIdx = tLast + 1;
-    } while (tIdx < tVals.count());
-    return;
-}
-
-const double CLOSE_ENOUGH = 0.001;
-
-static bool closeStart(const SkDCubic& cubic, int cubicIndex, SkIntersections& i, SkDPoint& pt) {
-    if (i[cubicIndex][0] != 0 || i[cubicIndex][1] > CLOSE_ENOUGH) {
-        return false;
-    }
-    pt = cubic.ptAtT((i[cubicIndex][0] + i[cubicIndex][1]) / 2);
-    return true;
-}
-
-static bool closeEnd(const SkDCubic& cubic, int cubicIndex, SkIntersections& i, SkDPoint& pt) {
-    int last = i.used() - 1;
-    if (i[cubicIndex][last] != 1 || i[cubicIndex][last - 1] < 1 - CLOSE_ENOUGH) {
-        return false;
-    }
-    pt = cubic.ptAtT((i[cubicIndex][last] + i[cubicIndex][last - 1]) / 2);
-    return true;
-}
-
-static bool only_end_pts_in_common(const SkDCubic& c1, const SkDCubic& c2) {
-// the idea here is to see at minimum do a quick reject by rotating all points
-// to either side of the line formed by connecting the endpoints
-// if the opposite curves points are on the line or on the other side, the
-// curves at most intersect at the endpoints
-    for (int oddMan = 0; oddMan < 4; ++oddMan) {
-        const SkDPoint* endPt[3];
-        for (int opp = 1; opp < 4; ++opp) {
-            int end = oddMan ^ opp;  // choose a value not equal to oddMan
-            endPt[opp - 1] = &c1[end];
-        }
-        for (int triTest = 0; triTest < 3; ++triTest) {
-            double origX = endPt[triTest]->fX;
-            double origY = endPt[triTest]->fY;
-            int oppTest = triTest + 1;
-            if (3 == oppTest) {
-                oppTest = 0;
-            }
-            double adj = endPt[oppTest]->fX - origX;
-            double opp = endPt[oppTest]->fY - origY;
-            if (adj == 0 && opp == 0) {  // if the other point equals the test point, ignore it
-                continue;
-            }
-            double sign = (c1[oddMan].fY - origY) * adj - (c1[oddMan].fX - origX) * opp;
-            if (approximately_zero(sign)) {
-                goto tryNextHalfPlane;
-            }
-            for (int n = 0; n < 4; ++n) {
-                double test = (c2[n].fY - origY) * adj - (c2[n].fX - origX) * opp;
-                if (test * sign > 0 && !precisely_zero(test)) {
-                    goto tryNextHalfPlane;
-                }
-            }
-        }
-        return true;
-tryNextHalfPlane:
-        ;
-    }
-    return false;
-}
-
-int SkIntersections::intersect(const SkDCubic& c1, const SkDCubic& c2) {
-    if (fMax == 0) {
-        fMax = 9;
-    }
-    bool selfIntersect = &c1 == &c2;
-    if (selfIntersect) {
-        if (c1[0].approximatelyEqual(c1[3])) {
-            insert(0, 1, c1[0]);
-            return fUsed;
-        }
-    } else {
-        // OPTIMIZATION: set exact end bits here to avoid cubic exact end later
-        for (int i1 = 0; i1 < 4; i1 += 3) {
-            for (int i2 = 0; i2 < 4; i2 += 3) {
-                if (c1[i1].approximatelyEqual(c2[i2])) {
-                    insert(i1 >> 1, i2 >> 1, c1[i1]);
-                }
-            }
-        }
-    }
-    SkASSERT(fUsed < 4);
-    if (!selfIntersect) {
-        if (only_end_pts_in_common(c1, c2)) {
-            return fUsed;
-        }
-        if (only_end_pts_in_common(c2, c1)) {
-            return fUsed;
-        }
-    }
-    // quad/quad does linear test here -- cubic does not
-    // cubics which are really lines should have been detected in reduce step earlier
-    int exactEndBits = 0;
-    if (selfIntersect) {
-        if (fUsed) {
-            return fUsed;
-        }
-    } else {
-        exactEndBits |= cubicExactEnd(c1, false, c2) << 0;
-        exactEndBits |= cubicExactEnd(c1, true, c2) << 1;
-        swap();
-        exactEndBits |= cubicExactEnd(c2, false, c1) << 2;
-        exactEndBits |= cubicExactEnd(c2, true, c1) << 3;
-        swap();
-    }
-    if (cubicCheckCoincidence(c1, c2)) {
-        SkASSERT(!selfIntersect);
-        return fUsed;
-    }
-    // FIXME: pass in cached bounds from caller
-    SkDRect c2Bounds;
-    c2Bounds.setBounds(c2);
-    if (!(exactEndBits & 4)) {
-        cubicNearEnd(c1, false, c2, c2Bounds);
-    }
-    if (!(exactEndBits & 8)) {
-        if (selfIntersect && fUsed) {
-            return fUsed;
-        }
-        cubicNearEnd(c1, true, c2, c2Bounds);
-        if (selfIntersect && fUsed && ((approximately_less_than_zero(fT[0][0])
-                    && approximately_less_than_zero(fT[1][0]))
-                    || (approximately_greater_than_one(fT[0][0])
-                    && approximately_greater_than_one(fT[1][0])))) {
-            SkASSERT(fUsed == 1);
-            fUsed = 0;
-            return fUsed;
-        }
-    }
-    if (!selfIntersect) {
-        SkDRect c1Bounds;
-        c1Bounds.setBounds(c1);  // OPTIMIZE use setRawBounds ?
-        swap();
-        if (!(exactEndBits & 1)) {
-            cubicNearEnd(c2, false, c1, c1Bounds);
-        }
-        if (!(exactEndBits & 2)) {
-            cubicNearEnd(c2, true, c1, c1Bounds);
-        }
-        swap();
-    }
-    if (cubicCheckCoincidence(c1, c2)) {
-        SkASSERT(!selfIntersect);
-        return fUsed;
-    }
-    SkIntersections i;
-    i.fAllowNear = false;
-    i.fMax = 9;
-    ::intersect(c1, 0, 1, c2, 0, 1, 1, i);
-    int compCount = i.used();
-    if (compCount) {
-        int exactCount = used();
-        if (exactCount == 0) {
-            *this = i;
-        } else {
-            // at least one is exact or near, and at least one was computed. Eliminate duplicates
-            for (int exIdx = 0; exIdx < exactCount; ++exIdx) {
-                for (int cpIdx = 0; cpIdx < compCount; ) {
-                    if (fT[0][0] == i[0][0] && fT[1][0] == i[1][0]) {
-                        i.removeOne(cpIdx);
-                        --compCount;
-                        continue;
-                    }
-                    double tAvg = (fT[0][exIdx] + i[0][cpIdx]) / 2;
-                    SkDPoint pt = c1.ptAtT(tAvg);
-                    if (!pt.approximatelyEqual(fPt[exIdx])) {
-                        ++cpIdx;
-                        continue;
-                    }
-                    tAvg = (fT[1][exIdx] + i[1][cpIdx]) / 2;
-                    pt = c2.ptAtT(tAvg);
-                    if (!pt.approximatelyEqual(fPt[exIdx])) {
-                        ++cpIdx;
-                        continue;
-                    }
-                    i.removeOne(cpIdx);
-                    --compCount;
-                }
-            }
-            // if mid t evaluates to nearly the same point, skip the t
-            for (int cpIdx = 0; cpIdx < compCount - 1; ) {
-                double tAvg = (fT[0][cpIdx] + i[0][cpIdx + 1]) / 2;
-                SkDPoint pt = c1.ptAtT(tAvg);
-                if (!pt.approximatelyEqual(fPt[cpIdx])) {
-                    ++cpIdx;
-                    continue;
-                }
-                tAvg = (fT[1][cpIdx] + i[1][cpIdx + 1]) / 2;
-                pt = c2.ptAtT(tAvg);
-                if (!pt.approximatelyEqual(fPt[cpIdx])) {
-                    ++cpIdx;
-                    continue;
-                }
-                i.removeOne(cpIdx);
-                --compCount;
-            }
-            // in addition to adding below missing function, think about how to say
-            append(i);
-        }
-    }
-    // If an end point and a second point very close to the end is returned, the second
-    // point may have been detected because the approximate quads
-    // intersected at the end and close to it. Verify that the second point is valid.
-    if (fUsed <= 1) {
-        return fUsed;
-    }
-    SkDPoint pt[2];
-    if (closeStart(c1, 0, *this, pt[0]) && closeStart(c2, 1, *this, pt[1])
-            && pt[0].approximatelyEqual(pt[1])) {
-        removeOne(1);
-    }
-    if (closeEnd(c1, 0, *this, pt[0]) && closeEnd(c2, 1, *this, pt[1])
-            && pt[0].approximatelyEqual(pt[1])) {
-        removeOne(used() - 2);
-    }
-    // vet the pairs of t values to see if the mid value is also on the curve. If so, mark
-    // the span as coincident
-    if (fUsed >= 2 && !coincidentUsed()) {
-        int last = fUsed - 1;
-        int match = 0;
-        for (int index = 0; index < last; ++index) {
-            double mid1 = (fT[0][index] + fT[0][index + 1]) / 2;
-            double mid2 = (fT[1][index] + fT[1][index + 1]) / 2;
-            pt[0] = c1.ptAtT(mid1);
-            pt[1] = c2.ptAtT(mid2);
-            if (pt[0].approximatelyEqual(pt[1])) {
-                match |= 1 << index;
-            }
-        }
-        if (match) {
-#if DEBUG_CONCIDENT
-            if (((match + 1) & match) != 0) {
-                SkDebugf("%s coincident hole\n", __FUNCTION__);
-            }
-#endif
-            // for now, assume that everything from start to finish is coincident
-            if (fUsed > 2) {
-                  fPt[1] = fPt[last];
-                  fT[0][1] = fT[0][last];
-                  fT[1][1] = fT[1][last];
-                  fIsCoincident[0] = 0x03;
-                  fIsCoincident[1] = 0x03;
-                  fUsed = 2;
-            }
-        }
-    }
-    return fUsed;
-}
-
-// Up promote the quad to a cubic.
-// OPTIMIZATION If this is a common use case, optimize by duplicating
-// the intersect 3 loop to avoid the promotion  / demotion code
-int SkIntersections::intersect(const SkDCubic& cubic, const SkDQuad& quad) {
-    fMax = 6;
-    SkDCubic up = quad.toCubic();
-    (void) intersect(cubic, up);
-    return used();
-}
-
-/* http://www.ag.jku.at/compass/compasssample.pdf
-( Self-Intersection Problems and Approximate Implicitization by Jan B. Thomassen
-Centre of Mathematics for Applications, University of Oslo http://www.cma.uio.no janbth@math.uio.no
-SINTEF Applied Mathematics http://www.sintef.no )
-describes a method to find the self intersection of a cubic by taking the gradient of the implicit
-form dotted with the normal, and solving for the roots. My math foo is too poor to implement this.*/
-
-int SkIntersections::intersect(const SkDCubic& c) {
-    fMax = 1;
-    // check to see if x or y end points are the extrema. Are other quick rejects possible?
-    if (c.endsAreExtremaInXOrY()) {
-        return false;
-    }
-    // OPTIMIZATION: could quick reject if neither end point tangent ray intersected the line
-    // segment formed by the opposite end point to the control point
-    (void) intersect(c, c);
-    if (used() > 0) {
-        if (approximately_equal_double(fT[0][0], fT[1][0])) {
-            fUsed = 0;
-        } else {
-            SkASSERT(used() == 1);
-            if (fT[0][0] > fT[1][0]) {
-                swapPts();
-            }
-        }
-    }
-    return used();
-}
diff --git a/gfx/skia/skia/src/pathops/SkDCubicLineIntersection.cpp b/gfx/skia/skia/src/pathops/SkDCubicLineIntersection.cpp
index 696c42e835a3..cbdce7789a80 100644
--- a/gfx/skia/skia/src/pathops/SkDCubicLineIntersection.cpp
+++ b/gfx/skia/skia/src/pathops/SkDCubicLineIntersection.cpp
@@ -93,6 +93,29 @@ public:
         fAllowNear = allow;
     }
 
+    void checkCoincident() {
+        int last = fIntersections->used() - 1;
+        for (int index = 0; index < last; ) {
+            double cubicMidT = ((*fIntersections)[0][index] + (*fIntersections)[0][index + 1]) / 2;
+            SkDPoint cubicMidPt = fCubic.ptAtT(cubicMidT);
+            double t = fLine.nearPoint(cubicMidPt, nullptr);
+            if (t < 0) {
+                ++index;
+                continue;
+            }
+            if (fIntersections->isCoincident(index)) {
+                fIntersections->removeOne(index);
+                --last;
+            } else if (fIntersections->isCoincident(index + 1)) {
+                fIntersections->removeOne(index + 1);
+                --last;
+            } else {
+                fIntersections->setCoincident(index++);
+            }
+            fIntersections->setCoincident(index);
+        }
+    }
+
     // see parallel routine in line quadratic intersections
     int intersectRay(double roots[3]) {
         double adj = fLine[1].fX - fLine[0].fX;
@@ -112,7 +135,7 @@ public:
                             + (fCubic[n].fX - fLine[0].fX) * adj;
                 }
                 double extremeTs[6];
-                int extrema = SkDCubic::FindExtrema(c[0].fX, c[1].fX, c[2].fX, c[3].fX, extremeTs);
+                int extrema = SkDCubic::FindExtrema(&c[0].fX, extremeTs);
                 count = c.searchRoots(extremeTs, extrema, 0, SkDCubic::kXAxis, roots);
                 break;
             }
@@ -131,32 +154,11 @@ public:
             double cubicT = rootVals[index];
             double lineT = findLineT(cubicT);
             SkDPoint pt;
-            if (pinTs(&cubicT, &lineT, &pt, kPointUninitialized)) {
-    #if ONE_OFF_DEBUG
-                SkDPoint cPt = fCubic.ptAtT(cubicT);
-                SkDebugf("%s pt=(%1.9g,%1.9g) cPt=(%1.9g,%1.9g)\n", __FUNCTION__, pt.fX, pt.fY,
-                        cPt.fX, cPt.fY);
-    #endif
-                for (int inner = 0; inner < fIntersections->used(); ++inner) {
-                    if (fIntersections->pt(inner) != pt) {
-                        continue;
-                    }
-                    double existingCubicT = (*fIntersections)[0][inner];
-                    if (cubicT == existingCubicT) {
-                        goto skipInsert;
-                    }
-                    // check if midway on cubic is also same point. If so, discard this
-                    double cubicMidT = (existingCubicT + cubicT) / 2;
-                    SkDPoint cubicMidPt = fCubic.ptAtT(cubicMidT);
-                    if (cubicMidPt.approximatelyEqual(pt)) {
-                        goto skipInsert;
-                    }
-                }
+            if (pinTs(&cubicT, &lineT, &pt, kPointUninitialized) && uniqueAnswer(cubicT, pt)) {
                 fIntersections->insert(cubicT, lineT, pt);
-        skipInsert:
-                ;
             }
         }
+        checkCoincident();
         return fIntersections->used();
     }
 
@@ -169,7 +171,7 @@ public:
             SkDPoint calcPt = c.ptAtT(roots[index]);
             if (!approximately_equal(calcPt.fY, axisIntercept)) {
                 double extremeTs[6];
-                int extrema = SkDCubic::FindExtrema(c[0].fY, c[1].fY, c[2].fY, c[3].fY, extremeTs);
+                int extrema = SkDCubic::FindExtrema(&c[0].fY, extremeTs);
                 count = c.searchRoots(extremeTs, extrema, axisIntercept, SkDCubic::kYAxis, roots);
                 break;
             }
@@ -186,20 +188,43 @@ public:
         int count = HorizontalIntersect(fCubic, axisIntercept, roots);
         for (int index = 0; index < count; ++index) {
             double cubicT = roots[index];
-            SkDPoint pt;
-            pt.fX = fCubic.ptAtT(cubicT).fX;
-            pt.fY = axisIntercept;
+            SkDPoint pt = { fCubic.ptAtT(cubicT).fX,  axisIntercept };
             double lineT = (pt.fX - left) / (right - left);
-            if (pinTs(&cubicT, &lineT, &pt, kPointInitialized)) {
+            if (pinTs(&cubicT, &lineT, &pt, kPointInitialized) && uniqueAnswer(cubicT, pt)) {
                 fIntersections->insert(cubicT, lineT, pt);
             }
         }
         if (flipped) {
             fIntersections->flip();
         }
+        checkCoincident();
         return fIntersections->used();
     }
 
+        bool uniqueAnswer(double cubicT, const SkDPoint& pt) {
+            for (int inner = 0; inner < fIntersections->used(); ++inner) {
+                if (fIntersections->pt(inner) != pt) {
+                    continue;
+                }
+                double existingCubicT = (*fIntersections)[0][inner];
+                if (cubicT == existingCubicT) {
+                    return false;
+                }
+                // check if midway on cubic is also same point. If so, discard this
+                double cubicMidT = (existingCubicT + cubicT) / 2;
+                SkDPoint cubicMidPt = fCubic.ptAtT(cubicMidT);
+                if (cubicMidPt.approximatelyEqual(pt)) {
+                    return false;
+                }
+            }
+#if ONE_OFF_DEBUG
+            SkDPoint cPt = fCubic.ptAtT(cubicT);
+            SkDebugf("%s pt=(%1.9g,%1.9g) cPt=(%1.9g,%1.9g)\n", __FUNCTION__, pt.fX, pt.fY,
+                    cPt.fX, cPt.fY);
+#endif
+            return true;
+        }
+
     static int VerticalIntersect(const SkDCubic& c, double axisIntercept, double roots[3]) {
         double A, B, C, D;
         SkDCubic::Coefficients(&c[0].fX, &A, &B, &C, &D);
@@ -209,7 +234,7 @@ public:
             SkDPoint calcPt = c.ptAtT(roots[index]);
             if (!approximately_equal(calcPt.fX, axisIntercept)) {
                 double extremeTs[6];
-                int extrema = SkDCubic::FindExtrema(c[0].fX, c[1].fX, c[2].fX, c[3].fX, extremeTs);
+                int extrema = SkDCubic::FindExtrema(&c[0].fX, extremeTs);
                 count = c.searchRoots(extremeTs, extrema, axisIntercept, SkDCubic::kXAxis, roots);
                 break;
             }
@@ -226,17 +251,16 @@ public:
         int count = VerticalIntersect(fCubic, axisIntercept, roots);
         for (int index = 0; index < count; ++index) {
             double cubicT = roots[index];
-            SkDPoint pt;
-            pt.fX = axisIntercept;
-            pt.fY = fCubic.ptAtT(cubicT).fY;
+            SkDPoint pt = { axisIntercept, fCubic.ptAtT(cubicT).fY };
             double lineT = (pt.fY - top) / (bottom - top);
-            if (pinTs(&cubicT, &lineT, &pt, kPointInitialized)) {
+            if (pinTs(&cubicT, &lineT, &pt, kPointInitialized) && uniqueAnswer(cubicT, pt)) {
                 fIntersections->insert(cubicT, lineT, pt);
             }
         }
         if (flipped) {
             fIntersections->flip();
         }
+        checkCoincident();
         return fIntersections->used();
     }
 
@@ -261,7 +285,7 @@ public:
             if (fIntersections->hasT(cubicT)) {
                 continue;
             }
-            double lineT = fLine.nearPoint(fCubic[cIndex], NULL);
+            double lineT = fLine.nearPoint(fCubic[cIndex], nullptr);
             if (lineT < 0) {
                 continue;
             }
@@ -342,7 +366,7 @@ public:
         double lT = *lineT = SkPinT(*lineT);
         SkDPoint lPt = fLine.ptAtT(lT);
         SkDPoint cPt = fCubic.ptAtT(cT);
-        if (!lPt.moreRoughlyEqual(cPt)) {
+        if (!lPt.roughlyEqual(cPt)) {
             return false;
         }
         // FIXME: if points are roughly equal but not approximately equal, need to do
@@ -401,3 +425,13 @@ int SkIntersections::intersectRay(const SkDCubic& cubic, const SkDLine& line) {
     }
     return fUsed;
 }
+
+// SkDCubic accessors to Intersection utilities
+
+int SkDCubic::horizontalIntersect(double yIntercept, double roots[3]) const {
+    return LineCubicIntersections::HorizontalIntersect(*this, yIntercept, roots);
+}
+
+int SkDCubic::verticalIntersect(double xIntercept, double roots[3]) const {
+    return LineCubicIntersections::VerticalIntersect(*this, xIntercept, roots);
+}
diff --git a/gfx/skia/skia/src/pathops/SkDCubicToQuads.cpp b/gfx/skia/skia/src/pathops/SkDCubicToQuads.cpp
index a28564d4c2c8..272b997d6c70 100644
--- a/gfx/skia/skia/src/pathops/SkDCubicToQuads.cpp
+++ b/gfx/skia/skia/src/pathops/SkDCubicToQuads.cpp
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 /*
 http://stackoverflow.com/questions/2009160/how-do-i-convert-the-2-control-points-of-a-cubic-curve-to-the-single-control-poi
 */
@@ -19,63 +26,12 @@ If this is a degree-elevated cubic, then both equations will give the same answe
  it's likely not, your best bet is to average them. So,
 
 P1 = -1/4 Q0 + 3/4 Q1 + 3/4 Q2 - 1/4 Q3
-
-SkDCubic defined by: P1/2 - anchor points, C1/C2 control points
-|x| is the euclidean norm of x
-mid-point approx of cubic: a quad that shares the same anchors with the cubic and has the
- control point at C = (3·C2 - P2 + 3·C1 - P1)/4
-
-Algorithm
-
-pick an absolute precision (prec)
-Compute the Tdiv as the root of (cubic) equation
-sqrt(3)/18 · |P2 - 3·C2 + 3·C1 - P1|/2 · Tdiv ^ 3 = prec
-if Tdiv < 0.5 divide the cubic at Tdiv. First segment [0..Tdiv] can be approximated with by a
- quadratic, with a defect less than prec, by the mid-point approximation.
- Repeat from step 2 with the second resulted segment (corresponding to 1-Tdiv)
-0.5<=Tdiv<1 - simply divide the cubic in two. The two halves can be approximated by the mid-point
- approximation
-Tdiv>=1 - the entire cubic can be approximated by the mid-point approximation
-
-confirmed by (maybe stolen from)
-http://www.caffeineowl.com/graphics/2d/vectorial/cubic2quad01.html
-// maybe in turn derived from  http://www.cccg.ca/proceedings/2004/36.pdf
-// also stored at http://www.cis.usouthal.edu/~hain/general/Publications/Bezier/bezier%20cccg04%20paper.pdf
-
 */
 
 #include "SkPathOpsCubic.h"
-#include "SkPathOpsLine.h"
 #include "SkPathOpsQuad.h"
-#include "SkReduceOrder.h"
-#include "SkTArray.h"
-#include "SkTSort.h"
-
-#define USE_CUBIC_END_POINTS 1
-
-static double calc_t_div(const SkDCubic& cubic, double precision, double start) {
-    const double adjust = sqrt(3.) / 36;
-    SkDCubic sub;
-    const SkDCubic* cPtr;
-    if (start == 0) {
-        cPtr = &cubic;
-    } else {
-        // OPTIMIZE: special-case half-split ?
-        sub = cubic.subDivide(start, 1);
-        cPtr = &sub;
-    }
-    const SkDCubic& c = *cPtr;
-    double dx = c[3].fX - 3 * (c[2].fX - c[1].fX) - c[0].fX;
-    double dy = c[3].fY - 3 * (c[2].fY - c[1].fY) - c[0].fY;
-    double dist = sqrt(dx * dx + dy * dy);
-    double tDiv3 = precision / (adjust * dist);
-    double t = SkDCubeRoot(tDiv3);
-    if (start > 0) {
-        t = start + (1 - start) * t;
-    }
-    return t;
-}
 
+// used for testing only
 SkDQuad SkDCubic::toQuad() const {
     SkDQuad quad;
     quad[0] = fPts[0];
@@ -86,101 +42,3 @@ SkDQuad SkDCubic::toQuad() const {
     quad[2] = fPts[3];
     return quad;
 }
-
-static bool add_simple_ts(const SkDCubic& cubic, double precision, SkTArray<double, true>* ts) {
-    double tDiv = calc_t_div(cubic, precision, 0);
-    if (tDiv >= 1) {
-        return true;
-    }
-    if (tDiv >= 0.5) {
-        ts->push_back(0.5);
-        return true;
-    }
-    return false;
-}
-
-static void addTs(const SkDCubic& cubic, double precision, double start, double end,
-        SkTArray<double, true>* ts) {
-    double tDiv = calc_t_div(cubic, precision, 0);
-    double parts = ceil(1.0 / tDiv);
-    for (double index = 0; index < parts; ++index) {
-        double newT = start + (index / parts) * (end - start);
-        if (newT > 0 && newT < 1) {
-            ts->push_back(newT);
-        }
-    }
-}
-
-// flavor that returns T values only, deferring computing the quads until they are needed
-// FIXME: when called from recursive intersect 2, this could take the original cubic
-// and do a more precise job when calling chop at and sub divide by computing the fractional ts.
-// it would still take the prechopped cubic for reduce order and find cubic inflections
-void SkDCubic::toQuadraticTs(double precision, SkTArray<double, true>* ts) const {
-    SkReduceOrder reducer;
-    int order = reducer.reduce(*this, SkReduceOrder::kAllow_Quadratics);
-    if (order < 3) {
-        return;
-    }
-    double inflectT[5];
-    int inflections = findInflections(inflectT);
-    SkASSERT(inflections <= 2);
-    if (!endsAreExtremaInXOrY()) {
-        inflections += findMaxCurvature(&inflectT[inflections]);
-        SkASSERT(inflections <= 5);
-    }
-    SkTQSort<double>(inflectT, &inflectT[inflections - 1]);
-    // OPTIMIZATION: is this filtering common enough that it needs to be pulled out into its
-    // own subroutine?
-    while (inflections && approximately_less_than_zero(inflectT[0])) {
-        memmove(inflectT, &inflectT[1], sizeof(inflectT[0]) * --inflections);
-    }
-    int start = 0;
-    int next = 1;
-    while (next < inflections) {
-        if (!approximately_equal(inflectT[start], inflectT[next])) {
-            ++start;
-        ++next;
-            continue;
-        }
-        memmove(&inflectT[start], &inflectT[next], sizeof(inflectT[0]) * (--inflections - start));
-    }
-
-    while (inflections && approximately_greater_than_one(inflectT[inflections - 1])) {
-        --inflections;
-    }
-    SkDCubicPair pair;
-    if (inflections == 1) {
-        pair = chopAt(inflectT[0]);
-        int orderP1 = reducer.reduce(pair.first(), SkReduceOrder::kNo_Quadratics);
-        if (orderP1 < 2) {
-            --inflections;
-        } else {
-            int orderP2 = reducer.reduce(pair.second(), SkReduceOrder::kNo_Quadratics);
-            if (orderP2 < 2) {
-                --inflections;
-            }
-        }
-    }
-    if (inflections == 0 && add_simple_ts(*this, precision, ts)) {
-        return;
-    }
-    if (inflections == 1) {
-        pair = chopAt(inflectT[0]);
-        addTs(pair.first(), precision, 0, inflectT[0], ts);
-        addTs(pair.second(), precision, inflectT[0], 1, ts);
-        return;
-    }
-    if (inflections > 1) {
-        SkDCubic part = subDivide(0, inflectT[0]);
-        addTs(part, precision, 0, inflectT[0], ts);
-        int last = inflections - 1;
-        for (int idx = 0; idx < last; ++idx) {
-            part = subDivide(inflectT[idx], inflectT[idx + 1]);
-            addTs(part, precision, inflectT[idx], inflectT[idx + 1], ts);
-        }
-        part = subDivide(inflectT[last], 1);
-        addTs(part, precision, inflectT[last], 1, ts);
-        return;
-    }
-    addTs(*this, precision, 0, 1, ts);
-}
diff --git a/gfx/skia/skia/src/pathops/SkDLineIntersection.cpp b/gfx/skia/skia/src/pathops/SkDLineIntersection.cpp
index b209474066bd..6fbac978b6e8 100644
--- a/gfx/skia/skia/src/pathops/SkDLineIntersection.cpp
+++ b/gfx/skia/skia/src/pathops/SkDLineIntersection.cpp
@@ -7,52 +7,26 @@
 #include "SkIntersections.h"
 #include "SkPathOpsLine.h"
 
-/* Determine the intersection point of two lines. This assumes the lines are not parallel,
-   and that that the lines are infinite.
-   From http://en.wikipedia.org/wiki/Line-line_intersection
- */
-SkDPoint SkIntersections::Line(const SkDLine& a, const SkDLine& b) {
-    double axLen = a[1].fX - a[0].fX;
-    double ayLen = a[1].fY - a[0].fY;
-    double bxLen = b[1].fX - b[0].fX;
-    double byLen = b[1].fY - b[0].fY;
-    double denom = byLen * axLen - ayLen * bxLen;
-    SkASSERT(denom);
-    double term1 = a[1].fX * a[0].fY - a[1].fY * a[0].fX;
-    double term2 = b[1].fX * b[0].fY - b[1].fY * b[0].fX;
-    SkDPoint p;
-    p.fX = (term1 * bxLen - axLen * term2) / denom;
-    p.fY = (term1 * byLen - ayLen * term2) / denom;
-    return p;
-}
-
-void SkIntersections::cleanUpCoincidence() {
-    SkASSERT(fUsed == 2);
-    // both t values are good
-    bool startMatch = fT[0][0] == 0 && (fT[1][0] == 0 || fT[1][0] == 1);
-    bool endMatch = fT[0][1] == 1 && (fT[1][1] == 0 || fT[1][1] == 1);
-    if (startMatch || endMatch) {
-        removeOne(startMatch);
-        return;
-    }
-    // either t value is good
-    bool pStartMatch = fT[0][0] == 0 || fT[1][0] == 0 || fT[1][0] == 1;
-    bool pEndMatch = fT[0][1] == 1 || fT[1][1] == 0 || fT[1][1] == 1;
-    removeOne(pStartMatch || !pEndMatch);
-}
-
 void SkIntersections::cleanUpParallelLines(bool parallel) {
     while (fUsed > 2) {
         removeOne(1);
     }
     if (fUsed == 2 && !parallel) {
-        bool startMatch = fT[0][0] == 0 || fT[1][0] == 0 || fT[1][0] == 1;
-        bool endMatch = fT[0][1] == 1 || fT[1][1] == 0 || fT[1][1] == 1;
+        bool startMatch = fT[0][0] == 0 || zero_or_one(fT[1][0]);
+        bool endMatch = fT[0][1] == 1 || zero_or_one(fT[1][1]);
         if ((!startMatch && !endMatch) || approximately_equal(fT[0][0], fT[0][1])) {
             SkASSERT(startMatch || endMatch);
-            removeOne(endMatch);
+            if (startMatch && endMatch && (fT[0][0] != 0 || !zero_or_one(fT[1][0]))
+                    && fT[0][1] == 1 && zero_or_one(fT[1][1])) {
+                removeOne(0);
+            } else {
+                removeOne(endMatch);
+            }
         }
     }
+    if (fUsed == 2) {
+        fIsCoincident[0] = fIsCoincident[1] = 0x03;
+    }
 }
 
 void SkIntersections::computePoints(const SkDLine& line, int used) {
@@ -76,12 +50,6 @@ int SkIntersections::intersectRay(const SkDLine& a, const SkDLine& b) {
     SkDVector ab0 = a[0] - b[0];
     double numerA = ab0.fY * bLen.fX - bLen.fY * ab0.fX;
     double numerB = ab0.fY * aLen.fX - aLen.fY * ab0.fX;
-#if 0
-    if (!between(0, numerA, denom) || !between(0, numerB, denom)) {
-        fUsed = 0;
-        return 0;
-    }
-#endif
     numerA /= denom;
     numerB /= denom;
     int used;
@@ -185,7 +153,6 @@ int SkIntersections::intersect(const SkDLine& a, const SkDLine& b) {
                     }
                     SkASSERT(a[iA] != b[nearer]);
                     SkASSERT(iA == (bNearA[nearer] > 0.5));
-                    fNearlySame[iA] = true;
                     insertNear(iA, nearer, a[iA], b[nearer]);
                     aNearB[iA] = -1;
                     bNearA[nearer] = -1;
@@ -226,22 +193,10 @@ static int horizontal_coincident(const SkDLine& line, double y) {
     return 1;
 }
 
-static double horizontal_intercept(const SkDLine& line, double y) {
+double SkIntersections::HorizontalIntercept(const SkDLine& line, double y) {
      return SkPinT((y - line[0].fY) / (line[1].fY - line[0].fY));
 }
 
-int SkIntersections::horizontal(const SkDLine& line, double y) {
-    fMax = 2;
-    int horizontalType = horizontal_coincident(line, y);
-    if (horizontalType == 1) {
-        fT[0][0] = horizontal_intercept(line, y);
-    } else if (horizontalType == 2) {
-        fT[0][0] = 0;
-        fT[0][1] = 1;
-    }
-    return fUsed = horizontalType;
-}
-
 int SkIntersections::horizontal(const SkDLine& line, double left, double right,
                                 double y, bool flipped) {
     fMax = 3;  // clean up parallel at the end will limit the result to 2 at the most
@@ -264,7 +219,7 @@ int SkIntersections::horizontal(const SkDLine& line, double left, double right,
     }
     int result = horizontal_coincident(line, y);
     if (result == 1 && fUsed == 0) {
-        fT[0][0] = horizontal_intercept(line, y);
+        fT[0][0] = HorizontalIntercept(line, y);
         double xIntercept = line[0].fX + fT[0][0] * (line[1].fX - line[0].fX);
         if (between(left, xIntercept, right)) {
             fT[1][0] = (xIntercept - left) / (right - left);
@@ -280,12 +235,12 @@ int SkIntersections::horizontal(const SkDLine& line, double left, double right,
         }
     }
     if (fAllowNear || result == 2) {
-        if ((t = line.nearPoint(leftPt, NULL)) >= 0) {
+        if ((t = line.nearPoint(leftPt, nullptr)) >= 0) {
             insert(t, (double) flipped, leftPt);
         }
         if (left != right) {
             const SkDPoint rightPt = { right, y };
-            if ((t = line.nearPoint(rightPt, NULL)) >= 0) {
+            if ((t = line.nearPoint(rightPt, nullptr)) >= 0) {
                 insert(t, (double) !flipped, rightPt);
             }
             for (int index = 0; index < 2; ++index) {
@@ -314,22 +269,10 @@ static int vertical_coincident(const SkDLine& line, double x) {
     return 1;
 }
 
-static double vertical_intercept(const SkDLine& line, double x) {
+double SkIntersections::VerticalIntercept(const SkDLine& line, double x) {
     return SkPinT((x - line[0].fX) / (line[1].fX - line[0].fX));
 }
 
-int SkIntersections::vertical(const SkDLine& line, double x) {
-    fMax = 2;
-    int verticalType = vertical_coincident(line, x);
-    if (verticalType == 1) {
-        fT[0][0] = vertical_intercept(line, x);
-    } else if (verticalType == 2) {
-        fT[0][0] = 0;
-        fT[0][1] = 1;
-    }
-    return fUsed = verticalType;
-}
-
 int SkIntersections::vertical(const SkDLine& line, double top, double bottom,
                               double x, bool flipped) {
     fMax = 3;  // cleanup parallel lines will bring this back line
@@ -352,7 +295,7 @@ int SkIntersections::vertical(const SkDLine& line, double top, double bottom,
     }
     int result = vertical_coincident(line, x);
     if (result == 1 && fUsed == 0) {
-        fT[0][0] = vertical_intercept(line, x);
+        fT[0][0] = VerticalIntercept(line, x);
         double yIntercept = line[0].fY + fT[0][0] * (line[1].fY - line[0].fY);
         if (between(top, yIntercept, bottom)) {
             fT[1][0] = (yIntercept - top) / (bottom - top);
@@ -368,12 +311,12 @@ int SkIntersections::vertical(const SkDLine& line, double top, double bottom,
         }
     }
     if (fAllowNear || result == 2) {
-        if ((t = line.nearPoint(topPt, NULL)) >= 0) {
+        if ((t = line.nearPoint(topPt, nullptr)) >= 0) {
             insert(t, (double) flipped, topPt);
         }
         if (top != bottom) {
             SkDPoint bottomPt = { x, bottom };
-            if ((t = line.nearPoint(bottomPt, NULL)) >= 0) {
+            if ((t = line.nearPoint(bottomPt, nullptr)) >= 0) {
                 insert(t, (double) !flipped, bottomPt);
             }
             for (int index = 0; index < 2; ++index) {
@@ -388,14 +331,3 @@ int SkIntersections::vertical(const SkDLine& line, double top, double bottom,
     return fUsed;
 }
 
-// from http://www.bryceboe.com/wordpress/wp-content/uploads/2006/10/intersect.py
-// 4 subs, 2 muls, 1 cmp
-static bool ccw(const SkDPoint& A, const SkDPoint& B, const SkDPoint& C) {
-    return (C.fY - A.fY) * (B.fX - A.fX) > (B.fY - A.fY) * (C.fX - A.fX);
-}
-
-// 16 subs, 8 muls, 6 cmps
-bool SkIntersections::Test(const SkDLine& a, const SkDLine& b) {
-    return ccw(a[0], b[0], b[1]) != ccw(a[1], b[0], b[1])
-            && ccw(a[0], a[1], b[0]) != ccw(a[0], a[1], b[1]);
-}
diff --git a/gfx/skia/skia/src/pathops/SkDQuadImplicit.cpp b/gfx/skia/skia/src/pathops/SkDQuadImplicit.cpp
deleted file mode 100644
index f0f66d1a10a4..000000000000
--- a/gfx/skia/skia/src/pathops/SkDQuadImplicit.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#include "SkDQuadImplicit.h"
-
-/* from http://tom.cs.byu.edu/~tom/papers/cvgip84.pdf 4.1
- *
- * This paper proves that Syvester's method can compute the implicit form of
- * the quadratic from the parameterized form.
- *
- * Given x = a*t*t + b*t + c  (the parameterized form)
- *       y = d*t*t + e*t + f
- *
- * we want to find an equation of the implicit form:
- *
- * A*x*x + B*x*y + C*y*y + D*x + E*y + F = 0
- *
- * The implicit form can be expressed as a 4x4 determinant, as shown.
- *
- * The resultant obtained by Syvester's method is
- *
- * |   a   b   (c - x)     0     |
- * |   0   a      b     (c - x)  |
- * |   d   e   (f - y)     0     |
- * |   0   d      e     (f - y)  |
- *
- * which expands to
- *
- * d*d*x*x + -2*a*d*x*y + a*a*y*y
- *         + (-2*c*d*d + b*e*d - a*e*e + 2*a*f*d)*x
- *         + (-2*f*a*a + e*b*a - d*b*b + 2*d*c*a)*y
- *         +
- * |   a   b   c   0   |
- * |   0   a   b   c   | == 0.
- * |   d   e   f   0   |
- * |   0   d   e   f   |
- *
- * Expanding the constant determinant results in
- *
- *   | a b c |     | b c 0 |
- * a*| e f 0 | + d*| a b c | ==
- *   | d e f |     | d e f |
- *
- * a*(a*f*f + c*e*e - c*f*d - b*e*f) + d*(b*b*f + c*c*d - c*a*f - c*e*b)
- *
- */
-
-// use the tricky arithmetic path, but leave the original to compare just in case
-static bool straight_forward = false;
-
-SkDQuadImplicit::SkDQuadImplicit(const SkDQuad& q) {
-    double a, b, c;
-    SkDQuad::SetABC(&q[0].fX, &a, &b, &c);
-    double d, e, f;
-    SkDQuad::SetABC(&q[0].fY, &d, &e, &f);
-    // compute the implicit coefficients
-    if (straight_forward) {  // 42 muls, 13 adds
-        fP[kXx_Coeff] = d * d;
-        fP[kXy_Coeff] = -2 * a * d;
-        fP[kYy_Coeff] = a * a;
-        fP[kX_Coeff] = -2*c*d*d + b*e*d - a*e*e + 2*a*f*d;
-        fP[kY_Coeff] = -2*f*a*a + e*b*a - d*b*b + 2*d*c*a;
-        fP[kC_Coeff] = a*(a*f*f + c*e*e - c*f*d - b*e*f)
-                   + d*(b*b*f + c*c*d - c*a*f - c*e*b);
-    } else {  // 26 muls, 11 adds
-        double aa = a * a;
-        double ad = a * d;
-        double dd = d * d;
-        fP[kXx_Coeff] = dd;
-        fP[kXy_Coeff] = -2 * ad;
-        fP[kYy_Coeff] = aa;
-        double be = b * e;
-        double bde = be * d;
-        double cdd = c * dd;
-        double ee = e * e;
-        fP[kX_Coeff] =  -2*cdd + bde - a*ee + 2*ad*f;
-        double aaf = aa * f;
-        double abe = a * be;
-        double ac = a * c;
-        double bb_2ac = b*b - 2*ac;
-        fP[kY_Coeff] = -2*aaf + abe - d*bb_2ac;
-        fP[kC_Coeff] = aaf*f + ac*ee + d*f*bb_2ac - abe*f + c*cdd - c*bde;
-    }
-}
-
- /* Given a pair of quadratics, determine their parametric coefficients.
-  * If the scaled coefficients are nearly equal, then the part of the quadratics
-  * may be coincident.
-  * OPTIMIZATION -- since comparison short-circuits on no match,
-  * lazily compute the coefficients, comparing the easiest to compute first.
-  * xx and yy first; then xy; and so on.
-  */
-bool SkDQuadImplicit::match(const SkDQuadImplicit& p2) const {
-    int first = 0;
-    for (int index = 0; index <= kC_Coeff; ++index) {
-        if (approximately_zero(fP[index]) && approximately_zero(p2.fP[index])) {
-            first += first == index;
-            continue;
-        }
-        if (first == index) {
-            continue;
-        }
-        if (!AlmostDequalUlps(fP[index] * p2.fP[first], fP[first] * p2.fP[index])) {
-            return false;
-        }
-    }
-    return true;
-}
-
-bool SkDQuadImplicit::Match(const SkDQuad& quad1, const SkDQuad& quad2) {
-    SkDQuadImplicit i1(quad1);  // a'xx , b'xy , c'yy , d'x , e'y , f
-    SkDQuadImplicit i2(quad2);
-    return i1.match(i2);
-}
diff --git a/gfx/skia/skia/src/pathops/SkDQuadImplicit.h b/gfx/skia/skia/src/pathops/SkDQuadImplicit.h
deleted file mode 100644
index 24f1aac2ef88..000000000000
--- a/gfx/skia/skia/src/pathops/SkDQuadImplicit.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#ifndef SkDQuadImplicit_DEFINED
-#define SkDQuadImplicit_DEFINED
-
-#include "SkPathOpsQuad.h"
-
-class SkDQuadImplicit {
-public:
-    explicit SkDQuadImplicit(const SkDQuad& q);
-
-    bool match(const SkDQuadImplicit& two) const;
-    static bool Match(const SkDQuad& quad1, const SkDQuad& quad2);
-
-    double x2() const { return fP[kXx_Coeff]; }
-    double xy() const { return fP[kXy_Coeff]; }
-    double y2() const { return fP[kYy_Coeff]; }
-    double x() const { return fP[kX_Coeff]; }
-    double y() const { return fP[kY_Coeff]; }
-    double c() const { return fP[kC_Coeff]; }
-
-private:
-    enum Coeffs {
-        kXx_Coeff,
-        kXy_Coeff,
-        kYy_Coeff,
-        kX_Coeff,
-        kY_Coeff,
-        kC_Coeff,
-    };
-
-    double fP[kC_Coeff + 1];
-};
-
-#endif
diff --git a/gfx/skia/skia/src/pathops/SkDQuadIntersection.cpp b/gfx/skia/skia/src/pathops/SkDQuadIntersection.cpp
deleted file mode 100644
index 5a8bafcdc563..000000000000
--- a/gfx/skia/skia/src/pathops/SkDQuadIntersection.cpp
+++ /dev/null
@@ -1,555 +0,0 @@
-// Another approach is to start with the implicit form of one curve and solve
-// (seek implicit coefficients in QuadraticParameter.cpp
-// by substituting in the parametric form of the other.
-// The downside of this approach is that early rejects are difficult to come by.
-// http://planetmath.org/encyclopedia/GaloisTheoreticDerivationOfTheQuarticFormula.html#step
-
-#include "SkDQuadImplicit.h"
-#include "SkIntersections.h"
-#include "SkPathOpsLine.h"
-#include "SkQuarticRoot.h"
-#include "SkTArray.h"
-#include "SkTSort.h"
-
-/* given the implicit form 0 = Ax^2 + Bxy + Cy^2 + Dx + Ey + F
- * and given x = at^2 + bt + c  (the parameterized form)
- *           y = dt^2 + et + f
- * then
- * 0 = A(at^2+bt+c)(at^2+bt+c)+B(at^2+bt+c)(dt^2+et+f)+C(dt^2+et+f)(dt^2+et+f)+D(at^2+bt+c)+E(dt^2+et+f)+F
- */
-
-static int findRoots(const SkDQuadImplicit& i, const SkDQuad& quad, double roots[4],
-        bool oneHint, bool flip, int firstCubicRoot) {
-    SkDQuad flipped;
-    const SkDQuad& q = flip ? (flipped = quad.flip()) : quad;
-    double a, b, c;
-    SkDQuad::SetABC(&q[0].fX, &a, &b, &c);
-    double d, e, f;
-    SkDQuad::SetABC(&q[0].fY, &d, &e, &f);
-    const double t4 =     i.x2() *  a * a
-                    +     i.xy() *  a * d
-                    +     i.y2() *  d * d;
-    const double t3 = 2 * i.x2() *  a * b
-                    +     i.xy() * (a * e +     b * d)
-                    + 2 * i.y2() *  d * e;
-    const double t2 =     i.x2() * (b * b + 2 * a * c)
-                    +     i.xy() * (c * d +     b * e + a * f)
-                    +     i.y2() * (e * e + 2 * d * f)
-                    +     i.x()  *  a
-                    +     i.y()  *  d;
-    const double t1 = 2 * i.x2() *  b * c
-                    +     i.xy() * (c * e + b * f)
-                    + 2 * i.y2() *  e * f
-                    +     i.x()  *  b
-                    +     i.y()  *  e;
-    const double t0 =     i.x2() *  c * c
-                    +     i.xy() *  c * f
-                    +     i.y2() *  f * f
-                    +     i.x()  *  c
-                    +     i.y()  *  f
-                    +     i.c();
-    int rootCount = SkReducedQuarticRoots(t4, t3, t2, t1, t0, oneHint, roots);
-    if (rootCount < 0) {
-        rootCount = SkQuarticRootsReal(firstCubicRoot, t4, t3, t2, t1, t0, roots);
-    }
-    if (flip) {
-        for (int index = 0; index < rootCount; ++index) {
-            roots[index] = 1 - roots[index];
-        }
-    }
-    return rootCount;
-}
-
-static int addValidRoots(const double roots[4], const int count, double valid[4]) {
-    int result = 0;
-    int index;
-    for (index = 0; index < count; ++index) {
-        if (!approximately_zero_or_more(roots[index]) || !approximately_one_or_less(roots[index])) {
-            continue;
-        }
-        double t = 1 - roots[index];
-        if (approximately_less_than_zero(t)) {
-            t = 0;
-        } else if (approximately_greater_than_one(t)) {
-            t = 1;
-        }
-        valid[result++] = t;
-    }
-    return result;
-}
-
-static bool only_end_pts_in_common(const SkDQuad& q1, const SkDQuad& q2) {
-// the idea here is to see at minimum do a quick reject by rotating all points
-// to either side of the line formed by connecting the endpoints
-// if the opposite curves points are on the line or on the other side, the
-// curves at most intersect at the endpoints
-    for (int oddMan = 0; oddMan < 3; ++oddMan) {
-        const SkDPoint* endPt[2];
-        for (int opp = 1; opp < 3; ++opp) {
-            int end = oddMan ^ opp;  // choose a value not equal to oddMan
-            if (3 == end) {  // and correct so that largest value is 1 or 2
-                end = opp;
-            }
-            endPt[opp - 1] = &q1[end];
-        }
-        double origX = endPt[0]->fX;
-        double origY = endPt[0]->fY;
-        double adj = endPt[1]->fX - origX;
-        double opp = endPt[1]->fY - origY;
-        double sign = (q1[oddMan].fY - origY) * adj - (q1[oddMan].fX - origX) * opp;
-        if (approximately_zero(sign)) {
-            goto tryNextHalfPlane;
-        }
-        for (int n = 0; n < 3; ++n) {
-            double test = (q2[n].fY - origY) * adj - (q2[n].fX - origX) * opp;
-            if (test * sign > 0 && !precisely_zero(test)) {
-                goto tryNextHalfPlane;
-            }
-        }
-        return true;
-tryNextHalfPlane:
-        ;
-    }
-    return false;
-}
-
-// returns false if there's more than one intercept or the intercept doesn't match the point
-// returns true if the intercept was successfully added or if the
-// original quads need to be subdivided
-static bool add_intercept(const SkDQuad& q1, const SkDQuad& q2, double tMin, double tMax,
-                          SkIntersections* i, bool* subDivide) {
-    double tMid = (tMin + tMax) / 2;
-    SkDPoint mid = q2.ptAtT(tMid);
-    SkDLine line;
-    line[0] = line[1] = mid;
-    SkDVector dxdy = q2.dxdyAtT(tMid);
-    line[0] -= dxdy;
-    line[1] += dxdy;
-    SkIntersections rootTs;
-    rootTs.allowNear(false);
-    int roots = rootTs.intersect(q1, line);
-    if (roots == 0) {
-        if (subDivide) {
-            *subDivide = true;
-        }
-        return true;
-    }
-    if (roots == 2) {
-        return false;
-    }
-    SkDPoint pt2 = q1.ptAtT(rootTs[0][0]);
-    if (!pt2.approximatelyEqual(mid)) {
-        return false;
-    }
-    i->insertSwap(rootTs[0][0], tMid, pt2);
-    return true;
-}
-
-static bool is_linear_inner(const SkDQuad& q1, double t1s, double t1e, const SkDQuad& q2,
-                            double t2s, double t2e, SkIntersections* i, bool* subDivide) {
-    SkDQuad hull = q1.subDivide(t1s, t1e);
-    SkDLine line = {{hull[2], hull[0]}};
-    const SkDLine* testLines[] = { &line, (const SkDLine*) &hull[0], (const SkDLine*) &hull[1] };
-    const size_t kTestCount = SK_ARRAY_COUNT(testLines);
-    SkSTArray<kTestCount * 2, double, true> tsFound;
-    for (size_t index = 0; index < kTestCount; ++index) {
-        SkIntersections rootTs;
-        rootTs.allowNear(false);
-        int roots = rootTs.intersect(q2, *testLines[index]);
-        for (int idx2 = 0; idx2 < roots; ++idx2) {
-            double t = rootTs[0][idx2];
-#if 0 // def SK_DEBUG   // FIXME : accurate for error = 16, error of 17.5 seen
-// {{{136.08723965397621, 1648.2814535211637}, {593.49031197259478, 1190.8784277439891}, {593.49031197259478, 544.0128173828125}}}
-// {{{-968.181396484375, 544.0128173828125}, {592.2825927734375, 870.552490234375}, {593.435302734375, 557.8828125}}}
-
-            SkDPoint qPt = q2.ptAtT(t);
-            SkDPoint lPt = testLines[index]->ptAtT(rootTs[1][idx2]);
-            SkASSERT(qPt.approximatelyDEqual(lPt));
-#endif
-            if (approximately_negative(t - t2s) || approximately_positive(t - t2e)) {
-                continue;
-            }
-            tsFound.push_back(rootTs[0][idx2]);
-        }
-    }
-    int tCount = tsFound.count();
-    if (tCount <= 0) {
-        return true;
-    }
-    double tMin, tMax;
-    if (tCount == 1) {
-        tMin = tMax = tsFound[0];
-    } else {
-        SkASSERT(tCount > 1);
-        SkTQSort<double>(tsFound.begin(), tsFound.end() - 1);
-        tMin = tsFound[0];
-        tMax = tsFound[tsFound.count() - 1];
-    }
-    SkDPoint end = q2.ptAtT(t2s);
-    bool startInTriangle = hull.pointInHull(end);
-    if (startInTriangle) {
-        tMin = t2s;
-    }
-    end = q2.ptAtT(t2e);
-    bool endInTriangle = hull.pointInHull(end);
-    if (endInTriangle) {
-        tMax = t2e;
-    }
-    int split = 0;
-    SkDVector dxy1, dxy2;
-    if (tMin != tMax || tCount > 2) {
-        dxy2 = q2.dxdyAtT(tMin);
-        for (int index = 1; index < tCount; ++index) {
-            dxy1 = dxy2;
-            dxy2 = q2.dxdyAtT(tsFound[index]);
-            double dot = dxy1.dot(dxy2);
-            if (dot < 0) {
-                split = index - 1;
-                break;
-            }
-        }
-    }
-    if (split == 0) {  // there's one point
-        if (add_intercept(q1, q2, tMin, tMax, i, subDivide)) {
-            return true;
-        }
-        i->swap();
-        return is_linear_inner(q2, tMin, tMax, q1, t1s, t1e, i, subDivide);
-    }
-    // At this point, we have two ranges of t values -- treat each separately at the split
-    bool result;
-    if (add_intercept(q1, q2, tMin, tsFound[split - 1], i, subDivide)) {
-        result = true;
-    } else {
-        i->swap();
-        result = is_linear_inner(q2, tMin, tsFound[split - 1], q1, t1s, t1e, i, subDivide);
-    }
-    if (add_intercept(q1, q2, tsFound[split], tMax, i, subDivide)) {
-        result = true;
-    } else {
-        i->swap();
-        result |= is_linear_inner(q2, tsFound[split], tMax, q1, t1s, t1e, i, subDivide);
-    }
-    return result;
-}
-
-static double flat_measure(const SkDQuad& q) {
-    SkDVector mid = q[1] - q[0];
-    SkDVector dxy = q[2] - q[0];
-    double length = dxy.length();  // OPTIMIZE: get rid of sqrt
-    return fabs(mid.cross(dxy) / length);
-}
-
-// FIXME ? should this measure both and then use the quad that is the flattest as the line?
-static bool is_linear(const SkDQuad& q1, const SkDQuad& q2, SkIntersections* i) {
-    double measure = flat_measure(q1);
-    // OPTIMIZE: (get rid of sqrt) use approximately_zero
-    if (!approximately_zero_sqrt(measure)) {
-        return false;
-    }
-    return is_linear_inner(q1, 0, 1, q2, 0, 1, i, NULL);
-}
-
-// FIXME: if flat measure is sufficiently large, then probably the quartic solution failed
-// avoid imprecision incurred with chopAt
-static void relaxed_is_linear(const SkDQuad* q1, double s1, double e1, const SkDQuad* q2,
-        double s2, double e2, SkIntersections* i) {
-    double m1 = flat_measure(*q1);
-    double m2 = flat_measure(*q2);
-    i->reset();
-    const SkDQuad* rounder, *flatter;
-    double sf, midf, ef, sr, er;
-    if (m2 < m1) {
-        rounder = q1;
-        sr = s1;
-        er = e1;
-        flatter = q2;
-        sf = s2;
-        midf = (s2 + e2) / 2;
-        ef = e2;
-    } else {
-        rounder = q2;
-        sr = s2;
-        er = e2;
-        flatter = q1;
-        sf = s1;
-        midf = (s1 + e1) / 2;
-        ef = e1;
-    }
-    bool subDivide = false;
-    is_linear_inner(*flatter, sf, ef, *rounder, sr, er, i, &subDivide);
-    if (subDivide) {
-        relaxed_is_linear(flatter, sf, midf, rounder, sr, er, i);
-        relaxed_is_linear(flatter, midf, ef, rounder, sr, er, i);
-    }
-    if (m2 < m1) {
-        i->swapPts();
-    }
-}
-
-// each time through the loop, this computes values it had from the last loop
-// if i == j == 1, the center values are still good
-// otherwise, for i != 1 or j != 1, four of the values are still good
-// and if i == 1 ^ j == 1, an additional value is good
-static bool binary_search(const SkDQuad& quad1, const SkDQuad& quad2, double* t1Seed,
-                          double* t2Seed, SkDPoint* pt) {
-    double tStep = ROUGH_EPSILON;
-    SkDPoint t1[3], t2[3];
-    int calcMask = ~0;
-    do {
-        if (calcMask & (1 << 1)) t1[1] = quad1.ptAtT(*t1Seed);
-        if (calcMask & (1 << 4)) t2[1] = quad2.ptAtT(*t2Seed);
-        if (t1[1].approximatelyEqual(t2[1])) {
-            *pt = t1[1];
-    #if ONE_OFF_DEBUG
-            SkDebugf("%s t1=%1.9g t2=%1.9g (%1.9g,%1.9g) == (%1.9g,%1.9g)\n", __FUNCTION__,
-                    t1Seed, t2Seed, t1[1].fX, t1[1].fY, t2[1].fX, t2[1].fY);
-    #endif
-            return true;
-        }
-        if (calcMask & (1 << 0)) t1[0] = quad1.ptAtT(SkTMax(0., *t1Seed - tStep));
-        if (calcMask & (1 << 2)) t1[2] = quad1.ptAtT(SkTMin(1., *t1Seed + tStep));
-        if (calcMask & (1 << 3)) t2[0] = quad2.ptAtT(SkTMax(0., *t2Seed - tStep));
-        if (calcMask & (1 << 5)) t2[2] = quad2.ptAtT(SkTMin(1., *t2Seed + tStep));
-        double dist[3][3];
-        // OPTIMIZE: using calcMask value permits skipping some distance calcuations
-        //   if prior loop's results are moved to correct slot for reuse
-        dist[1][1] = t1[1].distanceSquared(t2[1]);
-        int best_i = 1, best_j = 1;
-        for (int i = 0; i < 3; ++i) {
-            for (int j = 0; j < 3; ++j) {
-                if (i == 1 && j == 1) {
-                    continue;
-                }
-                dist[i][j] = t1[i].distanceSquared(t2[j]);
-                if (dist[best_i][best_j] > dist[i][j]) {
-                    best_i = i;
-                    best_j = j;
-                }
-            }
-        }
-        if (best_i == 1 && best_j == 1) {
-            tStep /= 2;
-            if (tStep < FLT_EPSILON_HALF) {
-                break;
-            }
-            calcMask = (1 << 0) | (1 << 2) | (1 << 3) | (1 << 5);
-            continue;
-        }
-        if (best_i == 0) {
-            *t1Seed -= tStep;
-            t1[2] = t1[1];
-            t1[1] = t1[0];
-            calcMask = 1 << 0;
-        } else if (best_i == 2) {
-            *t1Seed += tStep;
-            t1[0] = t1[1];
-            t1[1] = t1[2];
-            calcMask = 1 << 2;
-        } else {
-            calcMask = 0;
-        }
-        if (best_j == 0) {
-            *t2Seed -= tStep;
-            t2[2] = t2[1];
-            t2[1] = t2[0];
-            calcMask |= 1 << 3;
-        } else if (best_j == 2) {
-            *t2Seed += tStep;
-            t2[0] = t2[1];
-            t2[1] = t2[2];
-            calcMask |= 1 << 5;
-        }
-    } while (true);
-#if ONE_OFF_DEBUG
-    SkDebugf("%s t1=%1.9g t2=%1.9g (%1.9g,%1.9g) != (%1.9g,%1.9g) %s\n", __FUNCTION__,
-        t1Seed, t2Seed, t1[1].fX, t1[1].fY, t1[2].fX, t1[2].fY);
-#endif
-    return false;
-}
-
-static void lookNearEnd(const SkDQuad& q1, const SkDQuad& q2, int testT,
-        const SkIntersections& orig, bool swap, SkIntersections* i) {
-    if (orig.used() == 1 && orig[!swap][0] == testT) {
-        return;
-    }
-    if (orig.used() == 2 && orig[!swap][1] == testT) {
-        return;
-    }
-    SkDLine tmpLine;
-    int testTIndex = testT << 1;
-    tmpLine[0] = tmpLine[1] = q2[testTIndex];
-    tmpLine[1].fX += q2[1].fY - q2[testTIndex].fY;
-    tmpLine[1].fY -= q2[1].fX - q2[testTIndex].fX;
-    SkIntersections impTs;
-    impTs.intersectRay(q1, tmpLine);
-    for (int index = 0; index < impTs.used(); ++index) {
-        SkDPoint realPt = impTs.pt(index);
-        if (!tmpLine[0].approximatelyPEqual(realPt)) {
-            continue;
-        }
-        if (swap) {
-            i->insert(testT, impTs[0][index], tmpLine[0]);
-        } else {
-            i->insert(impTs[0][index], testT, tmpLine[0]);
-        }
-    }
-}
-
-int SkIntersections::intersect(const SkDQuad& q1, const SkDQuad& q2) {
-    fMax = 4;
-    // if the quads share an end point, check to see if they overlap
-    for (int i1 = 0; i1 < 3; i1 += 2) {
-        for (int i2 = 0; i2 < 3; i2 += 2) {
-            if (q1[i1].asSkPoint() == q2[i2].asSkPoint()) {
-                insert(i1 >> 1, i2 >> 1, q1[i1]);
-            }
-        }
-    }
-    SkASSERT(fUsed < 3);
-    if (only_end_pts_in_common(q1, q2)) {
-        return fUsed;
-    }
-    if (only_end_pts_in_common(q2, q1)) {
-        return fUsed;
-    }
-    // see if either quad is really a line
-    // FIXME: figure out why reduce step didn't find this earlier
-    if (is_linear(q1, q2, this)) {
-        return fUsed;
-    }
-    SkIntersections swapped;
-    swapped.setMax(fMax);
-    if (is_linear(q2, q1, &swapped)) {
-        swapped.swapPts();
-        *this = swapped;
-        return fUsed;
-    }
-    SkIntersections copyI(*this);
-    lookNearEnd(q1, q2, 0, *this, false, &copyI);
-    lookNearEnd(q1, q2, 1, *this, false, &copyI);
-    lookNearEnd(q2, q1, 0, *this, true, &copyI);
-    lookNearEnd(q2, q1, 1, *this, true, &copyI);
-    int innerEqual = 0;
-    if (copyI.fUsed >= 2) {
-        SkASSERT(copyI.fUsed <= 4);
-        double width = copyI[0][1] - copyI[0][0];
-        int midEnd = 1;
-        for (int index = 2; index < copyI.fUsed; ++index) {
-            double testWidth = copyI[0][index] - copyI[0][index - 1];
-            if (testWidth <= width) {
-                continue;
-            }
-            midEnd = index;
-        }
-        for (int index = 0; index < 2; ++index) {
-            double testT = (copyI[0][midEnd] * (index + 1)
-                    + copyI[0][midEnd - 1] * (2 - index)) / 3;
-            SkDPoint testPt1 = q1.ptAtT(testT);
-            testT = (copyI[1][midEnd] * (index + 1) + copyI[1][midEnd - 1] * (2 - index)) / 3;
-            SkDPoint testPt2 = q2.ptAtT(testT);
-            innerEqual += testPt1.approximatelyEqual(testPt2);
-        }
-    }
-    bool expectCoincident = copyI.fUsed >= 2 && innerEqual == 2;
-    if (expectCoincident) {
-        reset();
-        insertCoincident(copyI[0][0], copyI[1][0], copyI.fPt[0]);
-        int last = copyI.fUsed - 1;
-        insertCoincident(copyI[0][last], copyI[1][last], copyI.fPt[last]);
-        return fUsed;
-    }
-    SkDQuadImplicit i1(q1);
-    SkDQuadImplicit i2(q2);
-    int index;
-    bool flip1 = q1[2] == q2[0];
-    bool flip2 = q1[0] == q2[2];
-    bool useCubic = q1[0] == q2[0];
-    double roots1[4];
-    int rootCount = findRoots(i2, q1, roots1, useCubic, flip1, 0);
-    // OPTIMIZATION: could short circuit here if all roots are < 0 or > 1
-    double roots1Copy[4];
-    int r1Count = addValidRoots(roots1, rootCount, roots1Copy);
-    SkDPoint pts1[4];
-    for (index = 0; index < r1Count; ++index) {
-        pts1[index] = q1.ptAtT(roots1Copy[index]);
-    }
-    double roots2[4];
-    int rootCount2 = findRoots(i1, q2, roots2, useCubic, flip2, 0);
-    double roots2Copy[4];
-    int r2Count = addValidRoots(roots2, rootCount2, roots2Copy);
-    SkDPoint pts2[4];
-    for (index = 0; index < r2Count; ++index) {
-        pts2[index] = q2.ptAtT(roots2Copy[index]);
-    }
-    if (r1Count == r2Count && r1Count <= 1) {
-        if (r1Count == 1 && used() == 0) {
-            if (pts1[0].approximatelyEqual(pts2[0])) {
-                insert(roots1Copy[0], roots2Copy[0], pts1[0]);
-            } else if (pts1[0].moreRoughlyEqual(pts2[0])) {
-                // experiment: try to find intersection by chasing t
-                if (binary_search(q1, q2, roots1Copy, roots2Copy, pts1)) {
-                    insert(roots1Copy[0], roots2Copy[0], pts1[0]);
-                }
-            }
-        }
-        return fUsed;
-    }
-    int closest[4];
-    double dist[4];
-    bool foundSomething = false;
-    for (index = 0; index < r1Count; ++index) {
-        dist[index] = DBL_MAX;
-        closest[index] = -1;
-        for (int ndex2 = 0; ndex2 < r2Count; ++ndex2) {
-            if (!pts2[ndex2].approximatelyEqual(pts1[index])) {
-                continue;
-            }
-            double dx = pts2[ndex2].fX - pts1[index].fX;
-            double dy = pts2[ndex2].fY - pts1[index].fY;
-            double distance = dx * dx + dy * dy;
-            if (dist[index] <= distance) {
-                continue;
-            }
-            for (int outer = 0; outer < index; ++outer) {
-                if (closest[outer] != ndex2) {
-                    continue;
-                }
-                if (dist[outer] < distance) {
-                    goto next;
-                }
-                closest[outer] = -1;
-            }
-            dist[index] = distance;
-            closest[index] = ndex2;
-            foundSomething = true;
-        next:
-            ;
-        }
-    }
-    if (r1Count && r2Count && !foundSomething) {
-        relaxed_is_linear(&q1, 0, 1, &q2, 0, 1, this);
-        return fUsed;
-    }
-    int used = 0;
-    do {
-        double lowest = DBL_MAX;
-        int lowestIndex = -1;
-        for (index = 0; index < r1Count; ++index) {
-            if (closest[index] < 0) {
-                continue;
-            }
-            if (roots1Copy[index] < lowest) {
-                lowestIndex = index;
-                lowest = roots1Copy[index];
-            }
-        }
-        if (lowestIndex < 0) {
-            break;
-        }
-        insert(roots1Copy[lowestIndex], roots2Copy[closest[lowestIndex]],
-                pts1[lowestIndex]);
-        closest[lowestIndex] = -1;
-    } while (++used < r1Count);
-    return fUsed;
-}
diff --git a/gfx/skia/skia/src/pathops/SkDQuadLineIntersection.cpp b/gfx/skia/skia/src/pathops/SkDQuadLineIntersection.cpp
index ef8edb02cda0..64eb86848e82 100644
--- a/gfx/skia/skia/src/pathops/SkDQuadLineIntersection.cpp
+++ b/gfx/skia/skia/src/pathops/SkDQuadLineIntersection.cpp
@@ -95,16 +95,46 @@ public:
 
     LineQuadraticIntersections(const SkDQuad& q, const SkDLine& l, SkIntersections* i)
         : fQuad(q)
-        , fLine(l)
+        , fLine(&l)
         , fIntersections(i)
         , fAllowNear(true) {
         i->setMax(3);  // allow short partial coincidence plus discrete intersection
     }
 
+    LineQuadraticIntersections(const SkDQuad& q)
+        : fQuad(q) 
+        SkDEBUGPARAMS(fLine(nullptr))
+        SkDEBUGPARAMS(fIntersections(nullptr))
+        SkDEBUGPARAMS(fAllowNear(false)) {
+    }
+
     void allowNear(bool allow) {
         fAllowNear = allow;
     }
 
+    void checkCoincident() {
+        int last = fIntersections->used() - 1;
+        for (int index = 0; index < last; ) {
+            double quadMidT = ((*fIntersections)[0][index] + (*fIntersections)[0][index + 1]) / 2;
+            SkDPoint quadMidPt = fQuad.ptAtT(quadMidT);
+            double t = fLine->nearPoint(quadMidPt, nullptr);
+            if (t < 0) {
+                ++index;
+                continue;
+            }
+            if (fIntersections->isCoincident(index)) {
+                fIntersections->removeOne(index);
+                --last;
+            } else if (fIntersections->isCoincident(index + 1)) {
+                fIntersections->removeOne(index + 1);
+                --last;
+            } else {
+                fIntersections->setCoincident(index++);
+            }
+            fIntersections->setCoincident(index);
+        }
+    }
+
     int intersectRay(double roots[2]) {
     /*
         solve by rotating line+quad so line is horizontal, then finding the roots
@@ -121,11 +151,11 @@ public:
         for each of the three points (e.g. n = 0 to 2)
         quad[n].fY' = (quad[n].fY - line[0].fY) * A - (quad[n].fX - line[0].fX) * O
     */
-        double adj = fLine[1].fX - fLine[0].fX;
-        double opp = fLine[1].fY - fLine[0].fY;
+        double adj = (*fLine)[1].fX - (*fLine)[0].fX;
+        double opp = (*fLine)[1].fY - (*fLine)[0].fY;
         double r[3];
         for (int n = 0; n < 3; ++n) {
-            r[n] = (fQuad[n].fY - fLine[0].fY) * adj - (fQuad[n].fX - fLine[0].fX) * opp;
+            r[n] = (fQuad[n].fY - (*fLine)[0].fY) * adj - (fQuad[n].fX - (*fLine)[0].fX) * opp;
         }
         double A = r[2];
         double B = r[1];
@@ -140,20 +170,17 @@ public:
         if (fAllowNear) {
             addNearEndPoints();
         }
-        if (fIntersections->used() == 2) {
-            // FIXME : need sharable code that turns spans into coincident if middle point is on
-        } else {
-            double rootVals[2];
-            int roots = intersectRay(rootVals);
-            for (int index = 0; index < roots; ++index) {
-                double quadT = rootVals[index];
-                double lineT = findLineT(quadT);
-                SkDPoint pt;
-                if (pinTs(&quadT, &lineT, &pt, kPointUninitialized)) {
-                    fIntersections->insert(quadT, lineT, pt);
-                }
+        double rootVals[2];
+        int roots = intersectRay(rootVals);
+        for (int index = 0; index < roots; ++index) {
+            double quadT = rootVals[index];
+            double lineT = findLineT(quadT);
+            SkDPoint pt;
+            if (pinTs(&quadT, &lineT, &pt, kPointUninitialized) && uniqueAnswer(quadT, pt)) {
+                fIntersections->insert(quadT, lineT, pt);
             }
         }
+        checkCoincident();
         return fIntersections->used();
     }
 
@@ -178,16 +205,41 @@ public:
             double quadT = rootVals[index];
             SkDPoint pt = fQuad.ptAtT(quadT);
             double lineT = (pt.fX - left) / (right - left);
-            if (pinTs(&quadT, &lineT, &pt, kPointInitialized)) {
+            if (pinTs(&quadT, &lineT, &pt, kPointInitialized) && uniqueAnswer(quadT, pt)) {
                 fIntersections->insert(quadT, lineT, pt);
             }
         }
         if (flipped) {
             fIntersections->flip();
         }
+        checkCoincident();
         return fIntersections->used();
     }
 
+    bool uniqueAnswer(double quadT, const SkDPoint& pt) {
+        for (int inner = 0; inner < fIntersections->used(); ++inner) {
+            if (fIntersections->pt(inner) != pt) {
+                continue;
+            }
+            double existingQuadT = (*fIntersections)[0][inner];
+            if (quadT == existingQuadT) {
+                return false;
+            }
+            // check if midway on quad is also same point. If so, discard this
+            double quadMidT = (existingQuadT + quadT) / 2;
+            SkDPoint quadMidPt = fQuad.ptAtT(quadMidT);
+            if (quadMidPt.approximatelyEqual(pt)) {
+                return false;
+            }
+        }
+#if ONE_OFF_DEBUG
+        SkDPoint qPt = fQuad.ptAtT(quadT);
+        SkDebugf("%s pt=(%1.9g,%1.9g) cPt=(%1.9g,%1.9g)\n", __FUNCTION__, pt.fX, pt.fY,
+                qPt.fX, qPt.fY);
+#endif
+        return true;
+    }
+
     int verticalIntersect(double axisIntercept, double roots[2]) {
         double D = fQuad[2].fX;  // f
         double E = fQuad[1].fX;  // e
@@ -209,13 +261,14 @@ public:
             double quadT = rootVals[index];
             SkDPoint pt = fQuad.ptAtT(quadT);
             double lineT = (pt.fY - top) / (bottom - top);
-            if (pinTs(&quadT, &lineT, &pt, kPointInitialized)) {
+            if (pinTs(&quadT, &lineT, &pt, kPointInitialized) && uniqueAnswer(quadT, pt)) {
                 fIntersections->insert(quadT, lineT, pt);
             }
         }
         if (flipped) {
             fIntersections->flip();
         }
+        checkCoincident();
         return fIntersections->used();
     }
 
@@ -223,7 +276,7 @@ protected:
     // add endpoints first to get zero and one t values exactly
     void addExactEndPoints() {
         for (int qIndex = 0; qIndex < 3; qIndex += 2) {
-            double lineT = fLine.exactPoint(fQuad[qIndex]);
+            double lineT = fLine->exactPoint(fQuad[qIndex]);
             if (lineT < 0) {
                 continue;
             }
@@ -238,7 +291,7 @@ protected:
             if (fIntersections->hasT(quadT)) {
                 continue;
             }
-            double lineT = fLine.nearPoint(fQuad[qIndex], NULL);
+            double lineT = fLine->nearPoint(fQuad[qIndex], nullptr);
             if (lineT < 0) {
                 continue;
             }
@@ -301,12 +354,12 @@ protected:
 
     double findLineT(double t) {
         SkDPoint xy = fQuad.ptAtT(t);
-        double dx = fLine[1].fX - fLine[0].fX;
-        double dy = fLine[1].fY - fLine[0].fY;
+        double dx = (*fLine)[1].fX - (*fLine)[0].fX;
+        double dy = (*fLine)[1].fY - (*fLine)[0].fY;
         if (fabs(dx) > fabs(dy)) {
-            return (xy.fX - fLine[0].fX) / dx;
+            return (xy.fX - (*fLine)[0].fX) / dx;
         }
-        return (xy.fY - fLine[0].fY) / dy;
+        return (xy.fY - (*fLine)[0].fY) / dy;
     }
 
     bool pinTs(double* quadT, double* lineT, SkDPoint* pt, PinTPoint ptSet) {
@@ -319,16 +372,16 @@ protected:
         double qT = *quadT = SkPinT(*quadT);
         double lT = *lineT = SkPinT(*lineT);
         if (lT == 0 || lT == 1 || (ptSet == kPointUninitialized && qT != 0 && qT != 1)) {
-            *pt = fLine.ptAtT(lT);
+            *pt = (*fLine).ptAtT(lT);
         } else if (ptSet == kPointUninitialized) {
             *pt = fQuad.ptAtT(qT);
         }
         SkPoint gridPt = pt->asSkPoint();
-        if (SkDPoint::ApproximatelyEqual(gridPt, fLine[0].asSkPoint())) {
-            *pt = fLine[0];
+        if (SkDPoint::ApproximatelyEqual(gridPt, (*fLine)[0].asSkPoint())) {
+            *pt = (*fLine)[0];
             *lineT = 0;
-        } else if (SkDPoint::ApproximatelyEqual(gridPt, fLine[1].asSkPoint())) {
-            *pt = fLine[1];
+        } else if (SkDPoint::ApproximatelyEqual(gridPt, (*fLine)[1].asSkPoint())) {
+            *pt = (*fLine)[1];
             *lineT = 1;
         }
         if (fIntersections->used() > 0 && approximately_equal((*fIntersections)[1][0], *lineT)) {
@@ -346,7 +399,7 @@ protected:
 
 private:
     const SkDQuad& fQuad;
-    const SkDLine& fLine;
+    const SkDLine* fLine;
     SkIntersections* fIntersections;
     bool fAllowNear;
 };
@@ -379,3 +432,13 @@ int SkIntersections::intersectRay(const SkDQuad& quad, const SkDLine& line) {
     }
     return fUsed;
 }
+
+int SkIntersections::HorizontalIntercept(const SkDQuad& quad, SkScalar y, double* roots) {
+    LineQuadraticIntersections q(quad);
+    return q.horizontalIntersect(y, roots);
+}
+
+int SkIntersections::VerticalIntercept(const SkDQuad& quad, SkScalar x, double* roots) {
+    LineQuadraticIntersections q(quad);
+    return q.verticalIntersect(x, roots);
+}
diff --git a/gfx/skia/skia/src/pathops/SkIntersectionHelper.h b/gfx/skia/skia/src/pathops/SkIntersectionHelper.h
index 3569c934de14..647b94b35f4f 100644
--- a/gfx/skia/skia/src/pathops/SkIntersectionHelper.h
+++ b/gfx/skia/skia/src/pathops/SkIntersectionHelper.h
@@ -5,6 +5,7 @@
  * found in the LICENSE file.
  */
 #include "SkOpContour.h"
+#include "SkOpSegment.h"
 #include "SkPath.h"
 
 #ifdef SK_DEBUG
@@ -18,45 +19,13 @@ public:
         kVerticalLine_Segment = 0,
         kLine_Segment = SkPath::kLine_Verb,
         kQuad_Segment = SkPath::kQuad_Verb,
+        kConic_Segment = SkPath::kConic_Verb,
         kCubic_Segment = SkPath::kCubic_Verb,
     };
 
-    bool addCoincident(SkIntersectionHelper& other, const SkIntersections& ts, bool swap) {
-        return fContour->addCoincident(fIndex, other.fContour, other.fIndex, ts, swap);
-    }
-
-    // FIXME: does it make sense to write otherIndex now if we're going to
-    // fix it up later?
-    void addOtherT(int index, double otherT, int otherIndex) {
-        fContour->addOtherT(fIndex, index, otherT, otherIndex);
-    }
-
-    bool addPartialCoincident(SkIntersectionHelper& other, const SkIntersections& ts, int index,
-            bool swap) {
-        return fContour->addPartialCoincident(fIndex, other.fContour, other.fIndex, ts, index,
-                swap);
-    }
-
-    // Avoid collapsing t values that are close to the same since
-    // we walk ts to describe consecutive intersections. Since a pair of ts can
-    // be nearly equal, any problems caused by this should be taken care
-    // of later.
-    // On the edge or out of range values are negative; add 2 to get end
-    int addT(const SkIntersectionHelper& other, const SkPoint& pt, double newT) {
-        return fContour->addT(fIndex, other.fContour, other.fIndex, pt, newT);
-    }
-
-    int addSelfT(const SkPoint& pt, double newT) {
-        return fContour->addSelfT(fIndex, pt, newT);
-    }
-
     bool advance() {
-        return ++fIndex < fLast;
-    }
-
-    void alignTPt(SkIntersectionHelper& other, bool swap, int index,
-            SkIntersections* ts, SkPoint* point) {
-        fContour->alignTPt(fIndex, other.fContour, other.fIndex, swap, index, ts, point);
+        fSegment = fSegment->next();
+        return fSegment != nullptr;
     }
 
     SkScalar bottom() const {
@@ -64,30 +33,15 @@ public:
     }
 
     const SkPathOpsBounds& bounds() const {
-        return fContour->segments()[fIndex].bounds();
+        return fSegment->bounds();
+    }
+
+    SkOpContour* contour() const {
+        return fSegment->contour();
     }
 
     void init(SkOpContour* contour) {
-        fContour = contour;
-        fIndex = 0;
-        fLast = contour->segments().count();
-    }
-
-    bool isAdjacent(const SkIntersectionHelper& next) {
-        return fContour == next.fContour && fIndex + 1 == next.fIndex;
-    }
-
-    bool isFirstLast(const SkIntersectionHelper& next) {
-        return fContour == next.fContour && fIndex == 0
-                && next.fIndex == fLast - 1;
-    }
-
-    bool isPartial(double t1, double t2, const SkDPoint& pt1, const SkDPoint& pt2) const {
-        const SkOpSegment& segment = fContour->segments()[fIndex];
-        double mid = (t1 + t2) / 2;
-        SkDPoint midPtByT = segment.dPtAtT(mid);
-        SkDPoint midPtByAvg = SkDPoint::Mid(pt1, pt2);
-        return midPtByT.approximatelyPEqual(midPtByAvg);
+        fSegment = contour->first();
     }
 
     SkScalar left() const {
@@ -95,39 +49,42 @@ public:
     }
 
     const SkPoint* pts() const {
-        return fContour->segments()[fIndex].pts();
+        return fSegment->pts();
     }
 
     SkScalar right() const {
         return bounds().fRight;
     }
 
+    SkOpSegment* segment() const {
+        return fSegment;
+    }
+
     SegmentType segmentType() const {
-        const SkOpSegment& segment = fContour->segments()[fIndex];
-        SegmentType type = (SegmentType) segment.verb();
+        SegmentType type = (SegmentType) fSegment->verb();
         if (type != kLine_Segment) {
             return type;
         }
-        if (segment.isHorizontal()) {
+        if (fSegment->isHorizontal()) {
             return kHorizontalLine_Segment;
         }
-        if (segment.isVertical()) {
+        if (fSegment->isVertical()) {
             return kVerticalLine_Segment;
         }
         return kLine_Segment;
     }
 
     bool startAfter(const SkIntersectionHelper& after) {
-        fIndex = after.fIndex;
-        return advance();
+        fSegment = after.fSegment->next();
+        return fSegment != nullptr;
     }
 
     SkScalar top() const {
         return bounds().fTop;
     }
 
-    SkPath::Verb verb() const {
-        return fContour->segments()[fIndex].verb();
+    SkScalar weight() const {
+        return fSegment->weight();
     }
 
     SkScalar x() const {
@@ -147,10 +104,5 @@ public:
     }
 
 private:
-    // utility callable by the user from the debugger when the implementation code is linked in
-    void dump() const;
-
-    SkOpContour* fContour;
-    int fIndex;
-    int fLast;
+    SkOpSegment* fSegment;
 };
diff --git a/gfx/skia/skia/src/pathops/SkIntersections.cpp b/gfx/skia/skia/src/pathops/SkIntersections.cpp
index 56eba2717b73..9683796a5b52 100644
--- a/gfx/skia/skia/src/pathops/SkIntersections.cpp
+++ b/gfx/skia/skia/src/pathops/SkIntersections.cpp
@@ -7,52 +7,22 @@
 
 #include "SkIntersections.h"
 
-void SkIntersections::append(const SkIntersections& i) {
-    for (int index = 0; index < i.fUsed; ++index) {
-        insert(i[0][index], i[1][index], i.pt(index));
-    }
-}
-
-int (SkIntersections::*CurveVertical[])(const SkPoint[], SkScalar, SkScalar, SkScalar, bool) = {
-    NULL,
-    &SkIntersections::verticalLine,
-    &SkIntersections::verticalQuad,
-    &SkIntersections::verticalCubic
-};
-
-int (SkIntersections::*CurveRay[])(const SkPoint[], const SkDLine&) = {
-    NULL,
-    &SkIntersections::lineRay,
-    &SkIntersections::quadRay,
-    &SkIntersections::cubicRay
-};
-
-int SkIntersections::coincidentUsed() const {
-    if (!fIsCoincident[0]) {
-        SkASSERT(!fIsCoincident[1]);
-        return 0;
-    }
-    int count = 0;
-    SkDEBUGCODE(int count2 = 0;)
+int SkIntersections::closestTo(double rangeStart, double rangeEnd, const SkDPoint& testPt,
+        double* closestDist) const {
+    int closest = -1;
+    *closestDist = SK_ScalarMax;
     for (int index = 0; index < fUsed; ++index) {
-        if (fIsCoincident[0] & (1 << index)) {
-            ++count;
+        if (!between(rangeStart, fT[0][index], rangeEnd)) {
+            continue;
         }
-#ifdef SK_DEBUG
-        if (fIsCoincident[1] & (1 << index)) {
-            ++count2;
+        const SkDPoint& iPt = fPt[index];
+        double dist = testPt.distanceSquared(iPt);
+        if (*closestDist > dist) {
+            *closestDist = dist;
+            closest = index;
         }
-#endif
     }
-    SkASSERT(count == count2);
-    return count;
-}
-
-int SkIntersections::cubicRay(const SkPoint pts[4], const SkDLine& line) {
-    SkDCubic cubic;
-    cubic.set(pts);
-    fMax = 3;
-    return intersectRay(cubic, line);
+    return closest;
 }
 
 void SkIntersections::flip() {
@@ -79,6 +49,8 @@ int SkIntersections::insert(double one, double two, const SkDPoint& pt) {
                     || (precisely_equal(one, 1) && !precisely_equal(oldOne, 1))
                     || (precisely_zero(two) && !precisely_zero(oldTwo))
                     || (precisely_equal(two, 1) && !precisely_equal(oldTwo, 1))) {
+                SkASSERT(one >= 0 && one <= 1);
+                SkASSERT(two >= 0 && two <= 1);
                 fT[0][index] = one;
                 fT[1][index] = two;
                 fPt[index] = pt;
@@ -103,7 +75,6 @@ int SkIntersections::insert(double one, double two, const SkDPoint& pt) {
     int remaining = fUsed - index;
     if (remaining > 0) {
         memmove(&fPt[index + 1], &fPt[index], sizeof(fPt[0]) * remaining);
-        memmove(&fPt2[index + 1], &fPt2[index], sizeof(fPt2[0]) * remaining);
         memmove(&fT[0][index + 1], &fT[0][index], sizeof(fT[0][0]) * remaining);
         memmove(&fT[1][index + 1], &fT[1][index], sizeof(fT[1][0]) * remaining);
         int clearMask = ~((1 << index) - 1);
@@ -111,9 +82,12 @@ int SkIntersections::insert(double one, double two, const SkDPoint& pt) {
         fIsCoincident[1] += fIsCoincident[1] & clearMask;
     }
     fPt[index] = pt;
+    SkASSERT(one >= 0 && one <= 1);
+    SkASSERT(two >= 0 && two <= 1);
     fT[0][index] = one;
     fT[1][index] = two;
     ++fUsed;
+    SkASSERT(fUsed <= SK_ARRAY_COUNT(fPt));
     return index;
 }
 
@@ -121,45 +95,53 @@ void SkIntersections::insertNear(double one, double two, const SkDPoint& pt1, co
     SkASSERT(one == 0 || one == 1);
     SkASSERT(two == 0 || two == 1);
     SkASSERT(pt1 != pt2);
-    SkASSERT(fNearlySame[(int) one]);
+    fNearlySame[one ? 1 : 0] = true;
     (void) insert(one, two, pt1);
-    fPt2[one ? fUsed - 1 : 0] = pt2;
+    fPt2[one ? 1 : 0] = pt2;
 }
 
-void SkIntersections::insertCoincident(double one, double two, const SkDPoint& pt) {
+int SkIntersections::insertCoincident(double one, double two, const SkDPoint& pt) {
     int index = insertSwap(one, two, pt);
+    if (index >= 0) {
+        setCoincident(index);
+    }
+    return index;
+}
+
+void SkIntersections::setCoincident(int index) {
+    SkASSERT(index >= 0);
     int bit = 1 << index;
     fIsCoincident[0] |= bit;
     fIsCoincident[1] |= bit;
 }
 
-int SkIntersections::lineRay(const SkPoint pts[2], const SkDLine& line) {
-    SkDLine l;
-    l.set(pts);
-    fMax = 2;
-    return intersectRay(l, line);
+void SkIntersections::merge(const SkIntersections& a, int aIndex, const SkIntersections& b,
+        int bIndex) {
+    this->reset();
+    fT[0][0] = a.fT[0][aIndex];
+    fT[1][0] = b.fT[0][bIndex];
+    fPt[0] = a.fPt[aIndex];
+    fPt2[0] = b.fPt[bIndex];
+    fUsed = 1;
 }
 
-void SkIntersections::offset(int base, double start, double end) {
-    for (int index = base; index < fUsed; ++index) {
-        double val = fT[fSwap][index];
-        val *= end - start;
-        val += start;
-        fT[fSwap][index] = val;
-    }
-}
-
-int SkIntersections::quadRay(const SkPoint pts[3], const SkDLine& line) {
-    SkDQuad quad;
-    quad.set(pts);
-    fMax = 2;
-    return intersectRay(quad, line);
-}
-
-void SkIntersections::quickRemoveOne(int index, int replace) {
-    if (index < replace) {
-        fT[0][index] = fT[0][replace];
+int SkIntersections::mostOutside(double rangeStart, double rangeEnd, const SkDPoint& origin) const {
+    int result = -1;
+    for (int index = 0; index < fUsed; ++index) {
+        if (!between(rangeStart, fT[0][index], rangeEnd)) {
+            continue;
+        }
+        if (result < 0) {
+            result = index;
+            continue;
+        }
+        SkDVector best = fPt[result] - origin;
+        SkDVector test = fPt[index] - origin;
+        if (test.crossCheck(best) < 0) {
+            result = index;
+        }
     }
+    return result;
 }
 
 void SkIntersections::removeOne(int index) {
@@ -168,40 +150,11 @@ void SkIntersections::removeOne(int index) {
         return;
     }
     memmove(&fPt[index], &fPt[index + 1], sizeof(fPt[0]) * remaining);
-    memmove(&fPt2[index], &fPt2[index + 1], sizeof(fPt2[0]) * remaining);
     memmove(&fT[0][index], &fT[0][index + 1], sizeof(fT[0][0]) * remaining);
     memmove(&fT[1][index], &fT[1][index + 1], sizeof(fT[1][0]) * remaining);
-    SkASSERT(fIsCoincident[0] == 0);
+//    SkASSERT(fIsCoincident[0] == 0);
     int coBit = fIsCoincident[0] & (1 << index);
     fIsCoincident[0] -= ((fIsCoincident[0] >> 1) & ~((1 << index) - 1)) + coBit;
     SkASSERT(!(coBit ^ (fIsCoincident[1] & (1 << index))));
     fIsCoincident[1] -= ((fIsCoincident[1] >> 1) & ~((1 << index) - 1)) + coBit;
 }
-
-void SkIntersections::swapPts() {
-    int index;
-    for (index = 0; index < fUsed; ++index) {
-        SkTSwap(fT[0][index], fT[1][index]);
-    }
-}
-
-int SkIntersections::verticalLine(const SkPoint a[2], SkScalar top, SkScalar bottom,
-        SkScalar x, bool flipped) {
-    SkDLine line;
-    line.set(a);
-    return vertical(line, top, bottom, x, flipped);
-}
-
-int SkIntersections::verticalQuad(const SkPoint a[3], SkScalar top, SkScalar bottom,
-        SkScalar x, bool flipped) {
-    SkDQuad quad;
-    quad.set(a);
-    return vertical(quad, top, bottom, x, flipped);
-}
-
-int SkIntersections::verticalCubic(const SkPoint a[4], SkScalar top, SkScalar bottom,
-        SkScalar x, bool flipped) {
-    SkDCubic cubic;
-    cubic.set(a);
-    return vertical(cubic, top, bottom, x, flipped);
-}
diff --git a/gfx/skia/skia/src/pathops/SkIntersections.h b/gfx/skia/skia/src/pathops/SkIntersections.h
index 0186b3797d51..b733ed0ea7f6 100644
--- a/gfx/skia/skia/src/pathops/SkIntersections.h
+++ b/gfx/skia/skia/src/pathops/SkIntersections.h
@@ -7,6 +7,7 @@
 #ifndef SkIntersections_DEFINE
 #define SkIntersections_DEFINE
 
+#include "SkPathOpsConic.h"
 #include "SkPathOpsCubic.h"
 #include "SkPathOpsLine.h"
 #include "SkPathOpsPoint.h"
@@ -23,15 +24,17 @@ public:
         sk_bzero(fPt, sizeof(fPt));
         sk_bzero(fPt2, sizeof(fPt2));
         sk_bzero(fT, sizeof(fT));
-        sk_bzero(fIsCoincident, sizeof(fIsCoincident));
         sk_bzero(fNearlySame, sizeof(fNearlySame));
+#if DEBUG_T_SECT_LOOP_COUNT
+        sk_bzero(fDebugLoopCount, sizeof(fDebugLoopCount));
+#endif
         reset();
         fMax = 0;  // require that the caller set the max
     }
 
     class TArray {
     public:
-        explicit TArray(const double ts[9]) : fTArray(ts) {}
+        explicit TArray(const double ts[10]) : fTArray(ts) {}
         double operator[](int n) const {
             return fTArray[n];
         }
@@ -43,20 +46,36 @@ public:
         fAllowNear = nearAllowed;
     }
 
-    int cubic(const SkPoint a[4]) {
-        SkDCubic cubic;
-        cubic.set(a);
-        fMax = 1;  // self intersect
-        return intersect(cubic);
+    void clearCoincidence(int index) {
+        SkASSERT(index >= 0);
+        int bit = 1 << index;
+        fIsCoincident[0] &= ~bit;
+        fIsCoincident[1] &= ~bit;
     }
 
-    int cubicCubic(const SkPoint a[4], const SkPoint b[4]) {
-        SkDCubic aCubic;
-        aCubic.set(a);
-        SkDCubic bCubic;
-        bCubic.set(b);
-        fMax = 9;
-        return intersect(aCubic, bCubic);
+    int conicHorizontal(const SkPoint a[3], SkScalar weight, SkScalar left, SkScalar right,
+                SkScalar y, bool flipped) {
+        SkDConic conic;
+        conic.set(a, weight);
+        fMax = 2;
+        return horizontal(conic, left, right, y, flipped);
+    }
+
+    int conicVertical(const SkPoint a[3], SkScalar weight, SkScalar top, SkScalar bottom,
+            SkScalar x, bool flipped) {
+        SkDConic conic;
+        conic.set(a, weight);
+        fMax = 2;
+        return vertical(conic, top, bottom, x, flipped);
+    }
+
+    int conicLine(const SkPoint a[3], SkScalar weight, const SkPoint b[2]) {
+        SkDConic conic;
+        conic.set(a, weight);
+        SkDLine line;
+        line.set(b);
+        fMax = 3; // 2;  permit small coincident segment + non-coincident intersection
+        return intersect(conic, line);
     }
 
     int cubicHorizontal(const SkPoint a[4], SkScalar left, SkScalar right, SkScalar y,
@@ -83,15 +102,6 @@ public:
         return intersect(cubic, line);
     }
 
-    int cubicQuad(const SkPoint a[4], const SkPoint b[3]) {
-        SkDCubic cubic;
-        cubic.set(a);
-        SkDQuad quad;
-        quad.set(b);
-        fMax = 6;
-        return intersect(cubic, quad);
-    }
-
     bool hasT(double t) const {
         SkASSERT(t == 0 || t == 1);
         return fUsed > 0 && (t == 0 ? fT[0][0] == 0 : fT[0][fUsed - 1] == 1);
@@ -169,19 +179,11 @@ public:
         return intersect(quad, line);
     }
 
-    int quadQuad(const SkPoint a[3], const SkPoint b[3]) {
-        SkDQuad aQuad;
-        aQuad.set(a);
-        SkDQuad bQuad;
-        bQuad.set(b);
-        fMax = 4;
-        return intersect(aQuad, bQuad);
-    }
-
     // leaves swap, max alone
     void reset() {
         fAllowNear = true;
         fUsed = 0;
+        sk_bzero(fIsCoincident, sizeof(fIsCoincident));
     }
 
     void set(bool swap, int tIndex, double t) {
@@ -189,6 +191,7 @@ public:
     }
 
     void setMax(int max) {
+        SkASSERT(max <= (int) SK_ARRAY_COUNT(fPt));
         fMax = max;
     }
 
@@ -196,12 +199,10 @@ public:
         fSwap ^= true;
     }
 
-    void swapPts();
-
     bool swapped() const {
         return fSwap;
     }
-
+    
     int used() const {
         return fUsed;
     }
@@ -210,53 +211,66 @@ public:
         SkASSERT(--fDepth >= 0);
     }
 
+    bool unBumpT(int index) {
+        SkASSERT(fUsed == 1);
+        fT[0][index] = fT[0][index] * (1 + BUMP_EPSILON * 2) - BUMP_EPSILON;
+        if (!between(0, fT[0][index], 1)) {
+            fUsed = 0;
+            return false;
+        }
+        return true;
+    }
+
     void upDepth() {
         SkASSERT(++fDepth < 16);
     }
 
-    void append(const SkIntersections& );
-    void cleanUpCoincidence();
-    int coincidentUsed() const;
+    void alignQuadPts(const SkPoint a[3], const SkPoint b[3]);
+    int cleanUpCoincidence();
+    int closestTo(double rangeStart, double rangeEnd, const SkDPoint& testPt, double* dist) const;
     void cubicInsert(double one, double two, const SkDPoint& pt, const SkDCubic& c1,
                      const SkDCubic& c2);
-    int cubicRay(const SkPoint pts[4], const SkDLine& line);
     void flip();
-    int horizontal(const SkDLine&, double y);
     int horizontal(const SkDLine&, double left, double right, double y, bool flipped);
     int horizontal(const SkDQuad&, double left, double right, double y, bool flipped);
     int horizontal(const SkDQuad&, double left, double right, double y, double tRange[2]);
     int horizontal(const SkDCubic&, double y, double tRange[3]);
+    int horizontal(const SkDConic&, double left, double right, double y, bool flipped);
     int horizontal(const SkDCubic&, double left, double right, double y, bool flipped);
     int horizontal(const SkDCubic&, double left, double right, double y, double tRange[3]);
+    static double HorizontalIntercept(const SkDLine& line, double y);
+    static int HorizontalIntercept(const SkDQuad& quad, SkScalar y, double* roots);
+    static int HorizontalIntercept(const SkDConic& conic, SkScalar y, double* roots);
     // FIXME : does not respect swap
     int insert(double one, double two, const SkDPoint& pt);
     void insertNear(double one, double two, const SkDPoint& pt1, const SkDPoint& pt2);
     // start if index == 0 : end if index == 1
-    void insertCoincident(double one, double two, const SkDPoint& pt);
+    int insertCoincident(double one, double two, const SkDPoint& pt);
     int intersect(const SkDLine&, const SkDLine&);
     int intersect(const SkDQuad&, const SkDLine&);
     int intersect(const SkDQuad&, const SkDQuad&);
-    int intersect(const SkDCubic&);  // return true if cubic self-intersects
+    int intersect(const SkDConic&, const SkDLine&);
+    int intersect(const SkDConic&, const SkDQuad&);
+    int intersect(const SkDConic&, const SkDConic&);
     int intersect(const SkDCubic&, const SkDLine&);
     int intersect(const SkDCubic&, const SkDQuad&);
+    int intersect(const SkDCubic&, const SkDConic&);
     int intersect(const SkDCubic&, const SkDCubic&);
     int intersectRay(const SkDLine&, const SkDLine&);
     int intersectRay(const SkDQuad&, const SkDLine&);
+    int intersectRay(const SkDConic&, const SkDLine&);
     int intersectRay(const SkDCubic&, const SkDLine&);
-    static SkDPoint Line(const SkDLine&, const SkDLine&);
-    int lineRay(const SkPoint pts[2], const SkDLine& line);
-    void offset(int base, double start, double end);
-    void quickRemoveOne(int index, int replace);
-    int quadRay(const SkPoint pts[3], const SkDLine& line);
+    void merge(const SkIntersections& , int , const SkIntersections& , int );
+    int mostOutside(double rangeStart, double rangeEnd, const SkDPoint& origin) const;
     void removeOne(int index);
-    static bool Test(const SkDLine& , const SkDLine&);
-    int vertical(const SkDLine&, double x);
+    void setCoincident(int index);
     int vertical(const SkDLine&, double top, double bottom, double x, bool flipped);
     int vertical(const SkDQuad&, double top, double bottom, double x, bool flipped);
+    int vertical(const SkDConic&, double top, double bottom, double x, bool flipped);
     int vertical(const SkDCubic&, double top, double bottom, double x, bool flipped);
-    int verticalCubic(const SkPoint a[4], SkScalar top, SkScalar bottom, SkScalar x, bool flipped);
-    int verticalLine(const SkPoint a[2], SkScalar top, SkScalar bottom, SkScalar x, bool flipped);
-    int verticalQuad(const SkPoint a[3], SkScalar top, SkScalar bottom, SkScalar x, bool flipped);
+    static double VerticalIntercept(const SkDLine& line, double x);
+    static int VerticalIntercept(const SkDQuad& quad, SkScalar x, double* roots);
+    static int VerticalIntercept(const SkDConic& conic, SkScalar x, double* roots);
 
     int depth() const {
 #ifdef SK_DEBUG
@@ -266,6 +280,18 @@ public:
 #endif
     }
 
+    enum DebugLoop {
+        kIterations_DebugLoop,
+        kCoinCheck_DebugLoop,
+        kComputePerp_DebugLoop,
+    };
+
+    void debugBumpLoopCount(DebugLoop );
+    int debugCoincidentUsed() const;
+    int debugLoopCount(DebugLoop ) const;
+    void debugResetLoopCount();
+    void dump() const;  // implemented for testing only
+
 private:
     bool cubicCheckCoincidence(const SkDCubic& c1, const SkDCubic& c2);
     bool cubicExactEnd(const SkDCubic& cubic1, bool start, const SkDCubic& cubic2);
@@ -273,9 +299,9 @@ private:
     void cleanUpParallelLines(bool parallel);
     void computePoints(const SkDLine& line, int used);
 
-    SkDPoint fPt[9];  // FIXME: since scans store points as SkPoint, this should also
-    SkDPoint fPt2[9];  // used by nearly same to store alternate intersection point
-    double fT[2][9];
+    SkDPoint fPt[12];  // FIXME: since scans store points as SkPoint, this should also
+    SkDPoint fPt2[2];  // used by nearly same to store alternate intersection point
+    double fT[2][12];
     uint16_t fIsCoincident[2];  // bit set for each curve's coincident T
     bool fNearlySame[2];  // true if end points nearly match
     unsigned char fUsed;
@@ -285,10 +311,9 @@ private:
 #ifdef SK_DEBUG
     int fDepth;
 #endif
+#if DEBUG_T_SECT_LOOP_COUNT
+    int fDebugLoopCount[3];
+#endif
 };
 
-extern int (SkIntersections::*CurveRay[])(const SkPoint[], const SkDLine& );
-extern int (SkIntersections::*CurveVertical[])(const SkPoint[], SkScalar top, SkScalar bottom,
-            SkScalar x, bool flipped);
-
 #endif
diff --git a/gfx/skia/skia/src/pathops/SkOpAngle.cpp b/gfx/skia/skia/src/pathops/SkOpAngle.cpp
index 894758cfe810..655df45b15fa 100644
--- a/gfx/skia/skia/src/pathops/SkOpAngle.cpp
+++ b/gfx/skia/skia/src/pathops/SkOpAngle.cpp
@@ -4,26 +4,26 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "SkIntersections.h"
 #include "SkOpAngle.h"
 #include "SkOpSegment.h"
 #include "SkPathOpsCurve.h"
 #include "SkTSort.h"
 
-#if DEBUG_ANGLE
-#include "SkString.h"
-#endif
-
 /* Angles are sorted counterclockwise. The smallest angle has a positive x and the smallest
    positive y. The largest angle has a positive x and a zero y. */
 
 #if DEBUG_ANGLE
-    static bool CompareResult(SkString* bugOut, int append, bool compare) {
+    static bool CompareResult(const char* func, SkString* bugOut, SkString* bugPart, int append,
+             bool compare) {
         SkDebugf("%s %c %d\n", bugOut->c_str(), compare ? 'T' : 'F', append);
+        SkDebugf("%sPart %s\n", func, bugPart[0].c_str());
+        SkDebugf("%sPart %s\n", func, bugPart[1].c_str());
+        SkDebugf("%sPart %s\n", func, bugPart[2].c_str());
         return compare;
     }
 
-    #define COMPARE_RESULT(append, compare) CompareResult(&bugOut, append, compare)
+    #define COMPARE_RESULT(append, compare) CompareResult(__FUNCTION__, &bugOut, bugPart, append, \
+            compare)
 #else
     #define COMPARE_RESULT(append, compare) compare
 #endif
@@ -58,51 +58,50 @@
 */
 
 // return true if lh < this < rh
-bool SkOpAngle::after(const SkOpAngle* test) const {
-    const SkOpAngle& lh = *test;
-    const SkOpAngle& rh = *lh.fNext;
-    SkASSERT(&lh != &rh);
+bool SkOpAngle::after(SkOpAngle* test) {
+    SkOpAngle* lh = test;
+    SkOpAngle* rh = lh->fNext;
+    SkASSERT(lh != rh);
 #if DEBUG_ANGLE
     SkString bugOut;
     bugOut.printf("%s [%d/%d] %d/%d tStart=%1.9g tEnd=%1.9g"
                   " < [%d/%d] %d/%d tStart=%1.9g tEnd=%1.9g"
                   " < [%d/%d] %d/%d tStart=%1.9g tEnd=%1.9g ", __FUNCTION__,
-            lh.fSegment->debugID(), lh.debugID(), lh.fSectorStart, lh.fSectorEnd,
-            lh.fSegment->t(lh.fStart), lh.fSegment->t(lh.fEnd),
-            fSegment->debugID(), debugID(), fSectorStart, fSectorEnd, fSegment->t(fStart),
-            fSegment->t(fEnd),
-            rh.fSegment->debugID(), rh.debugID(), rh.fSectorStart, rh.fSectorEnd,
-            rh.fSegment->t(rh.fStart), rh.fSegment->t(rh.fEnd));
+            lh->segment()->debugID(), lh->debugID(), lh->fSectorStart, lh->fSectorEnd,
+            lh->fStart->t(), lh->fEnd->t(),
+            segment()->debugID(), debugID(), fSectorStart, fSectorEnd, fStart->t(), fEnd->t(),
+            rh->segment()->debugID(), rh->debugID(), rh->fSectorStart, rh->fSectorEnd,
+            rh->fStart->t(), rh->fEnd->t());
+    SkString bugPart[3] = { lh->debugPart(), this->debugPart(), rh->debugPart() };
 #endif
-    if (lh.fComputeSector && !const_cast<SkOpAngle&>(lh).computeSector()) {
+    if (lh->fComputeSector && !lh->computeSector()) {
         return COMPARE_RESULT(1, true);
     }
-    if (fComputeSector && !const_cast<SkOpAngle*>(this)->computeSector()) {
+    if (fComputeSector && !this->computeSector()) {
         return COMPARE_RESULT(2, true);
     }
-    if (rh.fComputeSector && !const_cast<SkOpAngle&>(rh).computeSector()) {
+    if (rh->fComputeSector && !rh->computeSector()) {
         return COMPARE_RESULT(3, true);
     }
 #if DEBUG_ANGLE  // reset bugOut with computed sectors
     bugOut.printf("%s [%d/%d] %d/%d tStart=%1.9g tEnd=%1.9g"
                   " < [%d/%d] %d/%d tStart=%1.9g tEnd=%1.9g"
                   " < [%d/%d] %d/%d tStart=%1.9g tEnd=%1.9g ", __FUNCTION__,
-            lh.fSegment->debugID(), lh.debugID(), lh.fSectorStart, lh.fSectorEnd,
-            lh.fSegment->t(lh.fStart), lh.fSegment->t(lh.fEnd),
-            fSegment->debugID(), debugID(), fSectorStart, fSectorEnd, fSegment->t(fStart),
-            fSegment->t(fEnd),
-            rh.fSegment->debugID(), rh.debugID(), rh.fSectorStart, rh.fSectorEnd,
-            rh.fSegment->t(rh.fStart), rh.fSegment->t(rh.fEnd));
+            lh->segment()->debugID(), lh->debugID(), lh->fSectorStart, lh->fSectorEnd,
+            lh->fStart->t(), lh->fEnd->t(),
+            segment()->debugID(), debugID(), fSectorStart, fSectorEnd, fStart->t(), fEnd->t(),
+            rh->segment()->debugID(), rh->debugID(), rh->fSectorStart, rh->fSectorEnd,
+            rh->fStart->t(), rh->fEnd->t());
 #endif
-    bool ltrOverlap = (lh.fSectorMask | rh.fSectorMask) & fSectorMask;
-    bool lrOverlap = lh.fSectorMask & rh.fSectorMask;
+    bool ltrOverlap = (lh->fSectorMask | rh->fSectorMask) & fSectorMask;
+    bool lrOverlap = lh->fSectorMask & rh->fSectorMask;
     int lrOrder;  // set to -1 if either order works
     if (!lrOverlap) {  // no lh/rh sector overlap
         if (!ltrOverlap) {  // no lh/this/rh sector overlap
-            return COMPARE_RESULT(4,  (lh.fSectorEnd > rh.fSectorStart)
-                    ^ (fSectorStart > lh.fSectorEnd) ^ (fSectorStart > rh.fSectorStart));
+            return COMPARE_RESULT(4,  (lh->fSectorEnd > rh->fSectorStart)
+                    ^ (fSectorStart > lh->fSectorEnd) ^ (fSectorStart > rh->fSectorStart));
         }
-        int lrGap = (rh.fSectorStart - lh.fSectorStart + 32) & 0x1f;
+        int lrGap = (rh->fSectorStart - lh->fSectorStart + 32) & 0x1f;
         /* A tiny change can move the start +/- 4. The order can only be determined if
            lr gap is not 12 to 20 or -12 to -20.
                -31 ..-21      1
@@ -115,24 +114,24 @@ bool SkOpAngle::after(const SkOpAngle* test) const {
          */
         lrOrder = lrGap > 20 ? 0 : lrGap > 11 ? -1 : 1;
     } else {
-        lrOrder = (int) lh.orderable(rh);
+        lrOrder = (int) lh->orderable(rh);
         if (!ltrOverlap) {
             return COMPARE_RESULT(5, !lrOrder);
         }
     }
     int ltOrder;
-    SkASSERT((lh.fSectorMask & fSectorMask) || (rh.fSectorMask & fSectorMask));
-    if (lh.fSectorMask & fSectorMask) {
-        ltOrder = (int) lh.orderable(*this);
+    SkASSERT((lh->fSectorMask & fSectorMask) || (rh->fSectorMask & fSectorMask));
+    if (lh->fSectorMask & fSectorMask) {
+        ltOrder = (int) lh->orderable(this);
     } else {
-        int ltGap = (fSectorStart - lh.fSectorStart + 32) & 0x1f;
+        int ltGap = (fSectorStart - lh->fSectorStart + 32) & 0x1f;
         ltOrder = ltGap > 20 ? 0 : ltGap > 11 ? -1 : 1;
     }
     int trOrder;
-    if (rh.fSectorMask & fSectorMask) {
+    if (rh->fSectorMask & fSectorMask) {
         trOrder = (int) orderable(rh);
     } else {
-        int trGap = (rh.fSectorStart - fSectorStart + 32) & 0x1f;
+        int trGap = (rh->fSectorStart - fSectorStart + 32) & 0x1f;
         trOrder = trGap > 20 ? 0 : trGap > 11 ? -1 : 1;
     }
     if (lrOrder >= 0 && ltOrder >= 0 && trOrder >= 0) {
@@ -145,20 +144,20 @@ bool SkOpAngle::after(const SkOpAngle* test) const {
     if (ltOrder == 0 && lrOrder == 0) {
         SkASSERT(trOrder < 0);
         // FIXME : once this is verified to work, remove one opposite angle call
-        SkDEBUGCODE(bool lrOpposite = lh.oppositePlanes(rh));
-        bool ltOpposite = lh.oppositePlanes(*this);
+        SkDEBUGCODE(bool lrOpposite = lh->oppositePlanes(rh));
+        bool ltOpposite = lh->oppositePlanes(this);
         SkASSERT(lrOpposite != ltOpposite);
         return COMPARE_RESULT(8, ltOpposite);
     } else if (ltOrder == 1 && trOrder == 0) {
         SkASSERT(lrOrder < 0);
-        SkDEBUGCODE(bool ltOpposite = lh.oppositePlanes(*this));
+        SkDEBUGCODE(bool ltOpposite = lh->oppositePlanes(this));
         bool trOpposite = oppositePlanes(rh);
         SkASSERT(ltOpposite != trOpposite);
         return COMPARE_RESULT(9, trOpposite);
     } else if (lrOrder == 1 && trOrder == 1) {
         SkASSERT(ltOrder < 0);
         SkDEBUGCODE(bool trOpposite = oppositePlanes(rh));
-        bool lrOpposite = lh.oppositePlanes(rh);
+        bool lrOpposite = lh->oppositePlanes(rh);
         SkASSERT(lrOpposite != trOpposite);
         return COMPARE_RESULT(10, lrOpposite);
     }
@@ -173,77 +172,49 @@ bool SkOpAngle::after(const SkOpAngle* test) const {
 
 // given a line, see if the opposite curve's convex hull is all on one side
 // returns -1=not on one side    0=this CW of test   1=this CCW of test
-int SkOpAngle::allOnOneSide(const SkOpAngle& test) const {
+int SkOpAngle::allOnOneSide(const SkOpAngle* test) {
     SkASSERT(!fIsCurve);
-    SkASSERT(test.fIsCurve);
-    const SkDPoint& origin = test.fCurvePart[0];
+    SkASSERT(test->fIsCurve);
+    const SkDPoint& origin = test->fCurvePart[0];
     SkVector line;
-    if (fSegment->verb() == SkPath::kLine_Verb) {
-        const SkPoint* linePts = fSegment->pts();
-        int lineStart = fStart < fEnd ? 0 : 1;
+    if (segment()->verb() == SkPath::kLine_Verb) {
+        const SkPoint* linePts = segment()->pts();
+        int lineStart = fStart->t() < fEnd->t() ? 0 : 1;
         line = linePts[lineStart ^ 1] - linePts[lineStart];
     } else {
-        SkPoint shortPts[2] = { fCurvePart[0].asSkPoint(), fCurvePart[1].asSkPoint() };
-        line = shortPts[1] - shortPts[0];
+        line = (fCurvePart[1] - fCurvePart[0]).asSkVector();
     }
     float crosses[3];
-    SkPath::Verb testVerb = test.fSegment->verb();
+    SkPath::Verb testVerb = test->segment()->verb();
     int iMax = SkPathOpsVerbToPoints(testVerb);
 //    SkASSERT(origin == test.fCurveHalf[0]);
-    const SkDCubic& testCurve = test.fCurvePart;
-//    do {
-        for (int index = 1; index <= iMax; ++index) {
-            float xy1 = (float) (line.fX * (testCurve[index].fY - origin.fY));
-            float xy2 = (float) (line.fY * (testCurve[index].fX - origin.fX));
-            crosses[index - 1] = AlmostEqualUlps(xy1, xy2) ? 0 : xy1 - xy2;
-        }
-        if (crosses[0] * crosses[1] < 0) {
+    const SkDCurve& testCurve = test->fCurvePart;
+    for (int index = 1; index <= iMax; ++index) {
+        float xy1 = (float) (line.fX * (testCurve[index].fY - origin.fY));
+        float xy2 = (float) (line.fY * (testCurve[index].fX - origin.fX));
+        crosses[index - 1] = AlmostEqualUlps(xy1, xy2) ? 0 : xy1 - xy2;
+    }
+    if (crosses[0] * crosses[1] < 0) {
+        return -1;
+    }
+    if (SkPath::kCubic_Verb == testVerb) {
+        if (crosses[0] * crosses[2] < 0 || crosses[1] * crosses[2] < 0) {
             return -1;
         }
-        if (SkPath::kCubic_Verb == testVerb) {
-            if (crosses[0] * crosses[2] < 0 || crosses[1] * crosses[2] < 0) {
-                return -1;
-            }
-        }
-        if (crosses[0]) {
-            return crosses[0] < 0;
-        }
-        if (crosses[1]) {
-            return crosses[1] < 0;
-        }
-        if (SkPath::kCubic_Verb == testVerb && crosses[2]) {
-            return crosses[2] < 0;
-        }
+    }
+    if (crosses[0]) {
+        return crosses[0] < 0;
+    }
+    if (crosses[1]) {
+        return crosses[1] < 0;
+    }
+    if (SkPath::kCubic_Verb == testVerb && crosses[2]) {
+        return crosses[2] < 0;
+    }
     fUnorderable = true;
     return -1;
 }
 
-bool SkOpAngle::calcSlop(double x, double y, double rx, double ry, bool* result) const {
-    double absX = fabs(x);
-    double absY = fabs(y);
-    double length = absX < absY ? absX / 2 + absY : absX + absY / 2;
-    int exponent;
-    (void) frexp(length, &exponent);
-    double epsilon = ldexp(FLT_EPSILON, exponent);
-    SkPath::Verb verb = fSegment->verb();
-    SkASSERT(verb == SkPath::kQuad_Verb || verb == SkPath::kCubic_Verb);
-    // FIXME: the quad and cubic factors are made up ; determine actual values
-    double slop = verb == SkPath::kQuad_Verb ? 4 * epsilon : 512 * epsilon;
-    double xSlop = slop;
-    double ySlop = x * y < 0 ? -xSlop : xSlop; // OPTIMIZATION: use copysign / _copysign ?
-    double x1 = x - xSlop;
-    double y1 = y + ySlop;
-    double x_ry1 = x1 * ry;
-    double rx_y1 = rx * y1;
-    *result = x_ry1 < rx_y1;
-    double x2 = x + xSlop;
-    double y2 = y - ySlop;
-    double x_ry2 = x2 * ry;
-    double rx_y2 = rx * y2;
-    bool less2 = x_ry2 < rx_y2;
-    return *result == less2;
-}
-
 bool SkOpAngle::checkCrossesZero() const {
     int start = SkTMin(fSectorStart, fSectorEnd);
     int end = SkTMax(fSectorStart, fSectorEnd);
@@ -251,31 +222,50 @@ bool SkOpAngle::checkCrossesZero() const {
     return crossesZero;
 }
 
-bool SkOpAngle::checkParallel(const SkOpAngle& rh) const {
+bool SkOpAngle::checkParallel(SkOpAngle* rh) {
     SkDVector scratch[2];
     const SkDVector* sweep, * tweep;
-    if (!fUnorderedSweep) {
-        sweep = fSweep;
+    if (!this->fUnorderedSweep) {
+        sweep = this->fSweep;
     } else {
-        scratch[0] = fCurvePart[1] - fCurvePart[0];
+        scratch[0] = this->fCurvePart[1] - this->fCurvePart[0];
         sweep = &scratch[0];
     }
-    if (!rh.fUnorderedSweep) {
-        tweep = rh.fSweep;
+    if (!rh->fUnorderedSweep) {
+        tweep = rh->fSweep;
     } else {
-        scratch[1] = rh.fCurvePart[1] - rh.fCurvePart[0];
+        scratch[1] = rh->fCurvePart[1] - rh->fCurvePart[0];
         tweep = &scratch[1];
     }
     double s0xt0 = sweep->crossCheck(*tweep);
     if (tangentsDiverge(rh, s0xt0)) {
         return s0xt0 < 0;
     }
-    SkDVector m0 = fSegment->dPtAtT(midT()) - fCurvePart[0];
-    SkDVector m1 = rh.fSegment->dPtAtT(rh.midT()) - rh.fCurvePart[0];
+    // compute the perpendicular to the endpoints and see where it intersects the opposite curve
+    // if the intersections within the t range, do a cross check on those
+    bool inside;
+    if (!fCurvePart[SkPathOpsVerbToPoints(this->segment()->verb())].approximatelyEqual(
+            rh->fCurvePart[SkPathOpsVerbToPoints(rh->segment()->verb())])) {
+        if (this->endToSide(rh, &inside)) {
+            return inside;
+        }
+        if (rh->endToSide(this, &inside)) {
+            return !inside;
+        }
+    }
+    if (this->midToSide(rh, &inside)) {
+        return inside;
+    }
+    if (rh->midToSide(this, &inside)) {
+        return !inside;
+    }
+    // compute the cross check from the mid T values (last resort)
+    SkDVector m0 = segment()->dPtAtT(this->midT()) - this->fCurvePart[0];
+    SkDVector m1 = rh->segment()->dPtAtT(rh->midT()) - rh->fCurvePart[0];
     double m0xm1 = m0.crossCheck(m1);
     if (m0xm1 == 0) {
-        fUnorderable = true;
-        rh.fUnorderable = true;
+        this->fUnorderable = true;
+        rh->fUnorderable = true;
         return true;
     }
     return m0xm1 < 0;
@@ -286,53 +276,57 @@ bool SkOpAngle::checkParallel(const SkOpAngle& rh) const {
 // would cause it to intersect one of the adjacent angles
 bool SkOpAngle::computeSector() {
     if (fComputedSector) {
-        // FIXME: logically, this should return !fUnorderable, but doing so breaks testQuadratic51
-        // -- but in general, this code may not work so this may be the least of problems
-        // adding the bang fixes testQuads46x in release, however
         return !fUnorderable;
     }
-    SkASSERT(fSegment->verb() != SkPath::kLine_Verb && small());
     fComputedSector = true;
-    int step = fStart < fEnd ? 1 : -1;
-    int limit = step > 0 ? fSegment->count() : -1;
-    int checkEnd = fEnd;
-    do {
-// advance end
-        const SkOpSpan& span = fSegment->span(checkEnd);
-        const SkOpSegment* other = span.fOther;
-        int oCount = other->count();
-        for (int oIndex = 0; oIndex < oCount; ++oIndex) {
-            const SkOpSpan& oSpan = other->span(oIndex);
-            if (oSpan.fOther != fSegment) {
-                continue;
-            }
-            if (oSpan.fOtherIndex == checkEnd) {
-                continue;
-            }
-            if (!approximately_equal(oSpan.fOtherT, span.fT)) {
-                continue;
-            }
-            goto recomputeSector;
-        }
-        checkEnd += step;
-    } while (checkEnd != limit);
-recomputeSector:
-    if (checkEnd == fEnd || checkEnd - step == fEnd) {
+    bool stepUp = fStart->t() < fEnd->t();
+    const SkOpSpanBase* checkEnd = fEnd;
+    if (checkEnd->final() && stepUp) {
         fUnorderable = true;
         return false;
     }
-    int saveEnd = fEnd;
-    fComputedEnd = fEnd = checkEnd - step;
+    do {
+// advance end
+        const SkOpSegment* other = checkEnd->segment();
+        const SkOpSpanBase* oSpan = other->head();
+        do {
+            if (oSpan->segment() != segment()) {
+                continue;
+            }
+            if (oSpan == checkEnd) {
+                continue;
+            }
+            if (!approximately_equal(oSpan->t(), checkEnd->t())) {
+                continue;
+            }
+            goto recomputeSector;
+        } while (!oSpan->final() && (oSpan = oSpan->upCast()->next()));
+        checkEnd = stepUp ? !checkEnd->final()
+                ? checkEnd->upCast()->next() : nullptr
+                : checkEnd->prev();
+    } while (checkEnd);
+recomputeSector:
+    SkOpSpanBase* computedEnd = stepUp ? checkEnd ? checkEnd->prev() : fEnd->segment()->head() 
+            : checkEnd ? checkEnd->upCast()->next() : fEnd->segment()->tail();
+    if (checkEnd == fEnd || computedEnd == fEnd || computedEnd == fStart) {
+        fUnorderable = true;
+        return false;
+    }
+    if (stepUp != (fStart->t() < computedEnd->t())) {
+        fUnorderable = true;
+        return false;
+    }
+    SkOpSpanBase* saveEnd = fEnd;
+    fComputedEnd = fEnd = computedEnd;
     setSpans();
     setSector();
     fEnd = saveEnd;
     return !fUnorderable;
 }
 
-// returns -1 if overlaps   0 if no overlap cw    1 if no overlap ccw
-int SkOpAngle::convexHullOverlaps(const SkOpAngle& rh) const {
-    const SkDVector* sweep = fSweep;
-    const SkDVector* tweep = rh.fSweep;
+int SkOpAngle::convexHullOverlaps(const SkOpAngle* rh) const {
+    const SkDVector* sweep = this->fSweep;
+    const SkDVector* tweep = rh->fSweep;
     double s0xs1 = sweep[0].crossCheck(sweep[1]);
     double s0xt0 = sweep[0].crossCheck(tweep[0]);
     double s1xt0 = sweep[1].crossCheck(tweep[0]);
@@ -362,8 +356,8 @@ int SkOpAngle::convexHullOverlaps(const SkOpAngle& rh) const {
     // if the outside sweeps are greater than 180 degress:
         // first assume the inital tangents are the ordering
         // if the midpoint direction matches the inital order, that is enough
-    SkDVector m0 = fSegment->dPtAtT(midT()) - fCurvePart[0];
-    SkDVector m1 = rh.fSegment->dPtAtT(rh.midT()) - rh.fCurvePart[0];
+    SkDVector m0 = this->segment()->dPtAtT(this->midT()) - this->fCurvePart[0];
+    SkDVector m1 = rh->segment()->dPtAtT(rh->midT()) - rh->fCurvePart[0];
     double m0xm1 = m0.crossCheck(m1);
     if (s0xt0 > 0 && m0xm1 > 0) {
         return 0;
@@ -397,29 +391,30 @@ double SkOpAngle::distEndRatio(double dist) const {
     return sqrt(longest) / dist;
 }
 
-bool SkOpAngle::endsIntersect(const SkOpAngle& rh) const {
-    SkPath::Verb lVerb = fSegment->verb();
-    SkPath::Verb rVerb = rh.fSegment->verb();
+bool SkOpAngle::endsIntersect(SkOpAngle* rh) {
+    SkPath::Verb lVerb = this->segment()->verb();
+    SkPath::Verb rVerb = rh->segment()->verb();
     int lPts = SkPathOpsVerbToPoints(lVerb);
     int rPts = SkPathOpsVerbToPoints(rVerb);
-    SkDLine rays[] = {{{fCurvePart[0], rh.fCurvePart[rPts]}},
-            {{fCurvePart[0], fCurvePart[lPts]}}};
+    SkDLine rays[] = {{{this->fCurvePart[0], rh->fCurvePart[rPts]}},
+            {{this->fCurvePart[0], this->fCurvePart[lPts]}}};
     if (rays[0][1] == rays[1][1]) {
         return checkParallel(rh);
     }
     double smallTs[2] = {-1, -1};
     bool limited[2] = {false, false};
     for (int index = 0; index < 2; ++index) {
-        const SkOpSegment& segment = index ? *rh.fSegment : *fSegment;
+        SkPath::Verb cVerb = index ? rVerb : lVerb;
+        // if the curve is a line, then the line and the ray intersect only at their crossing
+        if (cVerb == SkPath::kLine_Verb) {
+            continue;
+        }
+        const SkOpSegment& segment = index ? *rh->segment() : *this->segment();
         SkIntersections i;
-        (*CurveIntersectRay[index ? rPts : lPts])(segment.pts(), rays[index], &i);
-//      SkASSERT(i.used() >= 1);
-//        if (i.used() <= 1) {
-//            continue;
-//        }
-        double tStart = segment.t(index ? rh.fStart : fStart);
-        double tEnd = segment.t(index ? rh.fComputedEnd : fComputedEnd);
-        bool testAscends = index ? rh.fStart < rh.fComputedEnd : fStart < fComputedEnd;
+        (*CurveIntersectRay[cVerb])(segment.pts(), segment.weight(), rays[index], &i);
+        double tStart = index ? rh->fStart->t() : this->fStart->t();
+        double tEnd = index ? rh->fComputedEnd->t() : this->fComputedEnd->t();
+        bool testAscends = tStart < (index ? rh->fComputedEnd->t() : this->fComputedEnd->t());
         double t = testAscends ? 0 : 1;
         for (int idx2 = 0; idx2 < i.used(); ++idx2) {
             double testT = i[0][idx2];
@@ -433,29 +428,6 @@ bool SkOpAngle::endsIntersect(const SkOpAngle& rh) const {
             limited[index] = approximately_equal_orderable(t, tEnd);
         }
     }
-#if 0
-    if (smallTs[0] < 0 && smallTs[1] < 0) {  // if neither ray intersects, do endpoint sort
-        double m0xm1 = 0;
-        if (lVerb == SkPath::kLine_Verb) {
-            SkASSERT(rVerb != SkPath::kLine_Verb);
-            SkDVector m0 = rays[1][1] - fCurvePart[0];
-            SkDPoint endPt;
-            endPt.set(rh.fSegment->pts()[rh.fStart < rh.fEnd ? rPts : 0]);
-            SkDVector m1 = endPt - fCurvePart[0];
-            m0xm1 = m0.crossCheck(m1);
-        }
-        if (rVerb == SkPath::kLine_Verb) {
-            SkDPoint endPt;
-            endPt.set(fSegment->pts()[fStart < fEnd ? lPts : 0]);
-            SkDVector m0 = endPt - fCurvePart[0];
-            SkDVector m1 = rays[0][1] - fCurvePart[0];
-            m0xm1 = m0.crossCheck(m1);
-        }
-        if (m0xm1 != 0) {
-            return m0xm1 < 0;
-        }
-    }
-#endif
     bool sRayLonger = false;
     SkDVector sCept = {0, 0};
     double sCeptT = -1;
@@ -465,7 +437,7 @@ bool SkOpAngle::endsIntersect(const SkOpAngle& rh) const {
         if (smallTs[index] < 0) {
             continue;
         }
-        const SkOpSegment& segment = index ? *rh.fSegment : *fSegment;
+        const SkOpSegment& segment = index ? *rh->segment() : *this->segment();
         const SkDPoint& dPt = segment.dPtAtT(smallTs[index]);
         SkDVector cept = dPt - rays[index][0];
         // If this point is on the curve, it should have been detected earlier by ordinary
@@ -496,7 +468,7 @@ bool SkOpAngle::endsIntersect(const SkOpAngle& rh) const {
         double minX, minY, maxX, maxY;
         minX = minY = SK_ScalarInfinity;
         maxX = maxY = -SK_ScalarInfinity;
-        const SkDCubic& curve = index ? rh.fCurvePart : fCurvePart;
+        const SkDCurve& curve = index ? rh->fCurvePart : this->fCurvePart;
         int ptCount = index ? rPts : lPts;
         for (int idx2 = 0; idx2 <= ptCount; ++idx2) {
             minX = SkTMin(minX, curve[idx2].fX);
@@ -506,7 +478,7 @@ bool SkOpAngle::endsIntersect(const SkOpAngle& rh) const {
         }
         double maxWidth = SkTMax(maxX - minX, maxY - minY);
         delta /= maxWidth;
-        if (delta > 1e-4 && (useIntersect ^= true)) {  // FIXME: move this magic number
+        if (delta > 1e-3 && (useIntersect ^= true)) {  // FIXME: move this magic number
             sRayLonger = rayLonger;
             sCept = cept;
             sCeptT = smallTs[index];
@@ -514,9 +486,9 @@ bool SkOpAngle::endsIntersect(const SkOpAngle& rh) const {
         }
     }
     if (useIntersect) {
-        const SkDCubic& curve = sIndex ? rh.fCurvePart : fCurvePart;
-        const SkOpSegment& segment = sIndex ? *rh.fSegment : *fSegment;
-        double tStart = segment.t(sIndex ? rh.fStart : fStart);
+        const SkDCurve& curve = sIndex ? rh->fCurvePart : this->fCurvePart;
+        const SkOpSegment& segment = sIndex ? *rh->segment() : *this->segment();
+        double tStart = sIndex ? rh->fStart->t() : fStart->t();
         SkDVector mid = segment.dPtAtT(tStart + (sCeptT - tStart) / 2) - curve[0];
         double septDir = mid.crossCheck(sCept);
         if (!septDir) {
@@ -528,76 +500,57 @@ bool SkOpAngle::endsIntersect(const SkOpAngle& rh) const {
     }
 }
 
-// Most of the time, the first one can be found trivially by detecting the smallest sector value.
-// If all angles have the same sector value, actual sorting is required.
-const SkOpAngle* SkOpAngle::findFirst() const {
-    const SkOpAngle* best = this;
-    int bestStart = SkTMin(fSectorStart, fSectorEnd);
-    const SkOpAngle* angle = this;
-    while ((angle = angle->fNext) != this) {
-        int angleEnd = SkTMax(angle->fSectorStart, angle->fSectorEnd);
-        if (angleEnd < bestStart) {
-            return angle;    // we wrapped around
-        }
-        int angleStart = SkTMin(angle->fSectorStart, angle->fSectorEnd);
-        if (bestStart > angleStart) {
-            best = angle;
-            bestStart = angleStart;
-        }
+bool SkOpAngle::endToSide(const SkOpAngle* rh, bool* inside) const {
+    const SkOpSegment* segment = this->segment();
+    SkPath::Verb verb = segment->verb();
+    SkDLine rayEnd;
+    rayEnd[0].set(this->fEnd->pt());
+    rayEnd[1] = rayEnd[0];
+    SkDVector slopeAtEnd = (*CurveDSlopeAtT[verb])(segment->pts(), segment->weight(),
+            this->fEnd->t());
+    rayEnd[1].fX += slopeAtEnd.fY;
+    rayEnd[1].fY -= slopeAtEnd.fX;
+    SkIntersections iEnd;
+    const SkOpSegment* oppSegment = rh->segment();
+    SkPath::Verb oppVerb = oppSegment->verb();
+    (*CurveIntersectRay[oppVerb])(oppSegment->pts(), oppSegment->weight(), rayEnd, &iEnd);
+    double endDist;
+    int closestEnd = iEnd.closestTo(rh->fStart->t(), rh->fEnd->t(), rayEnd[0], &endDist);
+    if (closestEnd < 0) {
+        return false;
     }
-    // back up to the first possible angle
-    const SkOpAngle* firstBest = best;
-    angle = best;
-    int bestEnd = SkTMax(best->fSectorStart, best->fSectorEnd);
-    while ((angle = angle->previous()) != firstBest) {
-        if (angle->fStop) {
-            break;
-        }
-        int angleStart = SkTMin(angle->fSectorStart, angle->fSectorEnd);
-        // angles that are smaller by one aren't necessary better, since the larger may be a line
-        // and the smaller may be a curve that curls to the other side of the line.
-        if (bestEnd + 1 < angleStart) {
-            return best;
-        }
-        best = angle;
-        bestEnd = SkTMax(angle->fSectorStart, angle->fSectorEnd);
+    if (!endDist) {
+        return false;
     }
-    // in the case where all angles are nearly in the same sector, check the order to find the best
-    firstBest = best;
-    angle = best;
-    do {
-        angle = angle->fNext;
-        if (angle->fStop) {
-            return firstBest;
-        }
-        bool orderable = best->orderable(*angle);  // note: may return an unorderable angle
-        if (orderable == 0) {
-            return angle;
-        }
-        best = angle;
-    } while (angle != firstBest);
-    // if the angles are equally ordered, fall back on the initial tangent
-    bool foundBelow = false;
-    while ((angle = angle->fNext)) {
-        SkDVector scratch[2];
-        const SkDVector* sweep;
-        if (!angle->fUnorderedSweep) {
-            sweep = angle->fSweep;
-        } else {
-            scratch[0] = angle->fCurvePart[1] - angle->fCurvePart[0];
-            sweep = &scratch[0];
-        }
-        bool isAbove = sweep->fY <= 0;
-        if (isAbove && foundBelow) {
-            return angle;
-        }
-        foundBelow |= !isAbove;
-        if (angle == firstBest) {
-            return NULL; // should not loop around
-        }
+    SkDPoint start;
+    start.set(this->fStart->pt());
+    // OPTIMIZATION: multiple times in the code we find the max scalar
+    double minX, minY, maxX, maxY;
+    minX = minY = SK_ScalarInfinity;
+    maxX = maxY = -SK_ScalarInfinity;
+    const SkDCurve& curve = rh->fCurvePart;
+    int oppPts = SkPathOpsVerbToPoints(oppVerb);
+    for (int idx2 = 0; idx2 <= oppPts; ++idx2) {
+        minX = SkTMin(minX, curve[idx2].fX);
+        minY = SkTMin(minY, curve[idx2].fY);
+        maxX = SkTMax(maxX, curve[idx2].fX);
+        maxY = SkTMax(maxY, curve[idx2].fY);
     }
-    SkASSERT(0);  // should never get here
-    return NULL;
+    double maxWidth = SkTMax(maxX - minX, maxY - minY);
+    endDist /= maxWidth;
+    if (endDist < 5e-11) {  // empirically found
+        return false;
+    }
+    const SkDPoint* endPt = &rayEnd[0];
+    SkDPoint oppPt = iEnd.pt(closestEnd);
+    SkDVector vLeft = *endPt - start;
+    SkDVector vRight = oppPt - start;
+    double dir = vLeft.crossCheck(vRight);
+    if (!dir) {
+        return false;
+    }
+    *inside = dir < 0;
+    return true;
 }
 
 /*      y<0 y==0 y>0  x<0 x==0 x>0 xy<0 xy==0 xy>0
@@ -633,10 +586,15 @@ int SkOpAngle::findSector(SkPath::Verb verb, double x, double y) const {
         {{ 6,  3,  0}, { 7, -1, 15}, { 8, 11, 14}},  // abs(x) >  abs(y)
     };
     int sector = sedecimant[(xy >= 0) + (xy > 0)][(y >= 0) + (y > 0)][(x >= 0) + (x > 0)] * 2 + 1;
-    SkASSERT(SkPath::kLine_Verb == verb || sector >= 0);
+//    SkASSERT(SkPath::kLine_Verb == verb || sector >= 0);
     return sector;
 }
 
+SkOpGlobalState* SkOpAngle::globalState() const {
+    return this->segment()->globalState();
+}
+
+
 // OPTIMIZE: if this loops to only one other angle, after first compare fails, insert on other side
 // OPTIMIZE: return where insertion succeeded. Then, start next insertion on opposite side
 void SkOpAngle::insert(SkOpAngle* angle) {
@@ -654,15 +612,12 @@ void SkOpAngle::insert(SkOpAngle* angle) {
         }
         return;
     }
-    bool singleton = NULL == fNext;
+    bool singleton = nullptr == fNext;
     if (singleton) {
         fNext = this;
     }
     SkOpAngle* next = fNext;
     if (next->fNext == this) {
-        if (angle->overlap(*this)) {
-            return;
-        }
         if (singleton || angle->after(this)) {
             this->fNext = angle;
             angle->fNext = next;
@@ -676,9 +631,6 @@ void SkOpAngle::insert(SkOpAngle* angle) {
     SkOpAngle* last = this;
     do {
         SkASSERT(last->fNext == next);
-        if (angle->overlap(*last) || angle->overlap(*next)) {
-            return;
-        }
         if (angle->after(last)) {
             last->fNext = angle;
             angle->fNext = next;
@@ -687,48 +639,49 @@ void SkOpAngle::insert(SkOpAngle* angle) {
         }
         last = next;
         next = next->fNext;
-        if (last == this && next->fUnorderable) {
-            fUnorderable = true;
+        if (last == this) {
+            if (next->fUnorderable) {
+                fUnorderable = true;
+            } else {
+                globalState()->setAngleCoincidence();
+                this->fNext = angle;
+                angle->fNext = next;
+                angle->fCheckCoincidence = true;
+            }
             return;
         }
-        SkASSERT(last != this);
     } while (true);
 }
 
-bool SkOpAngle::isHorizontal() const {
-    return !fIsCurve && fSweep[0].fY == 0;
-}
-
-SkOpSpan* SkOpAngle::lastMarked() const {
+SkOpSpanBase* SkOpAngle::lastMarked() const {
     if (fLastMarked) {
-        if (fLastMarked->fChased) {
-            return NULL;
+        if (fLastMarked->chased()) {
+            return nullptr;
         }
-        fLastMarked->fChased = true;
+        fLastMarked->setChased(true);
     }
     return fLastMarked;
 }
 
-bool SkOpAngle::loopContains(const SkOpAngle& test) const {
+bool SkOpAngle::loopContains(const SkOpAngle* angle) const {
     if (!fNext) {
         return false;
     }
     const SkOpAngle* first = this;
     const SkOpAngle* loop = this;
-    const SkOpSegment* tSegment = test.fSegment;
-    double tStart = tSegment->span(test.fStart).fT;
-    double tEnd = tSegment->span(test.fEnd).fT;
+    const SkOpSegment* tSegment = angle->fStart->segment();
+    double tStart = angle->fStart->t();
+    double tEnd = angle->fEnd->t();
     do {
-        const SkOpSegment* lSegment = loop->fSegment;
-        // FIXME : use precisely_equal ? or compare points exactly ?
+        const SkOpSegment* lSegment = loop->fStart->segment();
         if (lSegment != tSegment) {
             continue;
         }
-        double lStart = lSegment->span(loop->fStart).fT;
+        double lStart = loop->fStart->t();
         if (lStart != tEnd) {
             continue;
         }
-        double lEnd = lSegment->span(loop->fEnd).fT;
+        double lEnd = loop->fEnd->t();
         if (lEnd == tStart) {
             return true;
         }
@@ -747,22 +700,6 @@ int SkOpAngle::loopCount() const {
     return count;
 }
 
-// OPTIMIZATION: can this be done better in after when angles are sorted?
-void SkOpAngle::markStops() {
-    SkOpAngle* angle = this;
-    int lastEnd = SkTMax(fSectorStart, fSectorEnd);
-    do {
-        angle = angle->fNext;
-        int angleStart = SkTMin(angle->fSectorStart, angle->fSectorEnd);
-        // angles that are smaller by one aren't necessary better, since the larger may be a line
-        // and the smaller may be a curve that curls to the other side of the line.
-        if (lastEnd + 1 < angleStart) {
-            angle->fStop = true;
-        }
-        lastEnd = SkTMax(angle->fSectorStart, angle->fSectorEnd);
-    } while (angle != this);
-}
-
 bool SkOpAngle::merge(SkOpAngle* angle) {
     SkASSERT(fNext);
     SkASSERT(angle->fNext);
@@ -775,44 +712,68 @@ bool SkOpAngle::merge(SkOpAngle* angle) {
     } while (working != angle);
     do {
         SkOpAngle* next = working->fNext;
-        working->fNext = NULL;
+        working->fNext = nullptr;
         insert(working);
         working = next;
     } while (working != angle);
     // it's likely that a pair of the angles are unorderable
-#if DEBUG_ANGLE
-    SkOpAngle* last = angle;
-    working = angle->fNext;
-    do {
-        SkASSERT(last->fNext == working);
-        last->fNext = working->fNext;
-        SkASSERT(working->after(last));
-        last->fNext = working;
-        last = working;
-        working = working->fNext;
-    } while (last != angle);
-#endif
     debugValidateNext();
     return true;
 }
 
 double SkOpAngle::midT() const {
-    return (fSegment->t(fStart) + fSegment->t(fEnd)) / 2;
+    return (fStart->t() + fEnd->t()) / 2;
 }
 
-bool SkOpAngle::oppositePlanes(const SkOpAngle& rh) const {
-    int startSpan = abs(rh.fSectorStart - fSectorStart);
+bool SkOpAngle::midToSide(const SkOpAngle* rh, bool* inside) const {
+    const SkOpSegment* segment = this->segment();
+    SkPath::Verb verb = segment->verb();
+    const SkPoint& startPt = this->fStart->pt();
+    const SkPoint& endPt = this->fEnd->pt();
+    SkDPoint dStartPt;
+    dStartPt.set(startPt);
+    SkDLine rayMid;
+    rayMid[0].fX = (startPt.fX + endPt.fX) / 2;
+    rayMid[0].fY = (startPt.fY + endPt.fY) / 2;
+    rayMid[1].fX = rayMid[0].fX + (endPt.fY - startPt.fY);
+    rayMid[1].fY = rayMid[0].fY - (endPt.fX - startPt.fX);
+    SkIntersections iMid;
+    (*CurveIntersectRay[verb])(segment->pts(), segment->weight(), rayMid, &iMid);
+    int iOutside = iMid.mostOutside(this->fStart->t(), this->fEnd->t(), dStartPt);
+    if (iOutside < 0) {
+        return false;
+    }
+    const SkOpSegment* oppSegment = rh->segment();
+    SkPath::Verb oppVerb = oppSegment->verb();
+    SkIntersections oppMid;
+    (*CurveIntersectRay[oppVerb])(oppSegment->pts(), oppSegment->weight(), rayMid, &oppMid);
+    int oppOutside = oppMid.mostOutside(rh->fStart->t(), rh->fEnd->t(), dStartPt);
+    if (oppOutside < 0) {
+        return false;
+    }
+    SkDVector iSide = iMid.pt(iOutside) - dStartPt;
+    SkDVector oppSide = oppMid.pt(oppOutside) - dStartPt;
+    double dir = iSide.crossCheck(oppSide);
+    if (!dir) {
+        return false;
+    }
+    *inside = dir < 0;
+    return true;
+}
+
+bool SkOpAngle::oppositePlanes(const SkOpAngle* rh) const {
+    int startSpan = SkTAbs(rh->fSectorStart - fSectorStart);
     return startSpan >= 8;
 }
 
-bool SkOpAngle::orderable(const SkOpAngle& rh) const {
+bool SkOpAngle::orderable(SkOpAngle* rh) {
     int result;
     if (!fIsCurve) {
-        if (!rh.fIsCurve) {
+        if (!rh->fIsCurve) {
             double leftX = fTangentHalf.dx();
             double leftY = fTangentHalf.dy();
-            double rightX = rh.fTangentHalf.dx();
-            double rightY = rh.fTangentHalf.dy();
+            double rightX = rh->fTangentHalf.dx();
+            double rightY = rh->fTangentHalf.dy();
             double x_ry = leftX * rightY;
             double rx_y = rightX * leftY;
             if (x_ry == rx_y) {
@@ -827,14 +788,14 @@ bool SkOpAngle::orderable(const SkOpAngle& rh) const {
         if ((result = allOnOneSide(rh)) >= 0) {
             return result;
         }
-        if (fUnorderable || approximately_zero(rh.fSide)) {
+        if (fUnorderable || approximately_zero(rh->fSide)) {
             goto unorderable;
         }
-    } else if (!rh.fIsCurve) {
-        if ((result = rh.allOnOneSide(*this)) >= 0) {
+    } else if (!rh->fIsCurve) {
+        if ((result = rh->allOnOneSide(this)) >= 0) {
             return !result;
         }
-        if (rh.fUnorderable || approximately_zero(fSide)) {
+        if (rh->fUnorderable || approximately_zero(fSide)) {
             goto unorderable;
         }
     }
@@ -844,27 +805,10 @@ bool SkOpAngle::orderable(const SkOpAngle& rh) const {
     return endsIntersect(rh);
 unorderable:
     fUnorderable = true;
-    rh.fUnorderable = true;
+    rh->fUnorderable = true;
     return true;
 }
 
-bool SkOpAngle::overlap(const SkOpAngle& other) const {
-    int min = SkTMin(fStart, fEnd);
-    const SkOpSpan& span = fSegment->span(min);
-    const SkOpSegment* oSeg = other.fSegment;
-    int oMin = SkTMin(other.fStart, other.fEnd);
-    const SkOpSpan& oSpan = oSeg->span(oMin);
-    if (!span.fSmall && !oSpan.fSmall) {
-        return false;
-    }
-    if (fSegment->span(fStart).fPt != oSeg->span(other.fStart).fPt) {
-        return false;
-    }
-    // see if small span is contained by opposite span
-    return span.fSmall ? oSeg->containsPt(fSegment->span(fEnd).fPt, other.fEnd, other.fStart)
-            : fSegment->containsPt(oSeg->span(other.fEnd).fPt, fEnd, fStart);
-}
-
 // OPTIMIZE: if this shows up in a profile, add a previous pointer
 // as is, this should be rarely called
 SkOpAngle* SkOpAngle::previous() const {
@@ -878,26 +822,31 @@ SkOpAngle* SkOpAngle::previous() const {
     } while (true);
 }
 
-void SkOpAngle::set(const SkOpSegment* segment, int start, int end) {
-    fSegment = segment;
+SkOpSegment* SkOpAngle::segment() const {
+    return fStart->segment();
+}
+
+void SkOpAngle::set(SkOpSpanBase* start, SkOpSpanBase* end) {
     fStart = start;
     fComputedEnd = fEnd = end;
-    fNext = NULL;
-    fComputeSector = fComputedSector = false;
-    fStop = false;
+    SkASSERT(start != end);
+    fNext = nullptr;
+    fComputeSector = fComputedSector = fCheckCoincidence = false;
     setSpans();
     setSector();
+    SkDEBUGCODE(fID = start ? start->globalState()->nextAngleID() : -1);
 }
 
 void SkOpAngle::setCurveHullSweep() {
     fUnorderedSweep = false;
     fSweep[0] = fCurvePart[1] - fCurvePart[0];
-    if (SkPath::kLine_Verb == fSegment->verb()) {
+    const SkOpSegment* segment = fStart->segment();
+    if (SkPath::kLine_Verb == segment->verb()) {
         fSweep[1] = fSweep[0];
         return;
     }
     fSweep[1] = fCurvePart[2] - fCurvePart[0];
-    if (SkPath::kCubic_Verb != fSegment->verb()) {
+    if (SkPath::kCubic_Verb != segment->verb()) {
         if (!fSweep[0].fX && !fSweep[0].fY) {
             fSweep[0] = fSweep[1];
         }
@@ -931,57 +880,22 @@ void SkOpAngle::setCurveHullSweep() {
     fSweep[1] = thirdSweep;
 }
 
-void SkOpAngle::setSector() {
-    SkPath::Verb verb = fSegment->verb();
-    if (SkPath::kLine_Verb != verb && small()) {
-        fSectorStart = fSectorEnd = -1;
-        fSectorMask = 0;
-        fComputeSector = true;  // can't determine sector until segment length can be found
-        return;
-    }
-    fSectorStart = findSector(verb, fSweep[0].fX, fSweep[0].fY);
-    if (!fIsCurve) {  // if it's a line or line-like, note that both sectors are the same
-        SkASSERT(fSectorStart >= 0);
-        fSectorEnd = fSectorStart;
-        fSectorMask = 1 << fSectorStart;
-        return;
-    }
-    SkASSERT(SkPath::kLine_Verb != verb);
-    fSectorEnd = findSector(verb, fSweep[1].fX, fSweep[1].fY);
-    if (fSectorEnd == fSectorStart) {
-        SkASSERT((fSectorStart & 3) != 3);  // if the sector has no span, it can't be an exact angle
-        fSectorMask = 1 << fSectorStart;
-        return;
-    }
-    bool crossesZero = checkCrossesZero();
-    int start = SkTMin(fSectorStart, fSectorEnd);
-    bool curveBendsCCW = (fSectorStart == start) ^ crossesZero;
-    // bump the start and end of the sector span if they are on exact compass points
-    if ((fSectorStart & 3) == 3) {
-        fSectorStart = (fSectorStart + (curveBendsCCW ? 1 : 31)) & 0x1f;
-    }
-    if ((fSectorEnd & 3) == 3) {
-        fSectorEnd = (fSectorEnd + (curveBendsCCW ? 31 : 1)) & 0x1f;
-    }
-    crossesZero = checkCrossesZero();
-    start = SkTMin(fSectorStart, fSectorEnd);
-    int end = SkTMax(fSectorStart, fSectorEnd);
-    if (!crossesZero) {
-        fSectorMask = (unsigned) -1 >> (31 - end + start) << start;
-    } else {
-        fSectorMask = (unsigned) -1 >> (31 - start) | (-1 << end);
-    }
-}
-
 void SkOpAngle::setSpans() {
-    fUnorderable = fSegment->isTiny(this);
-    fLastMarked = NULL;
-    const SkPoint* pts = fSegment->pts();
+    fUnorderable = false;
+    fLastMarked = nullptr;
+    if (!fStart) {
+        fUnorderable = true;
+        return;
+    }
+    const SkOpSegment* segment = fStart->segment();
+    const SkPoint* pts = segment->pts();
+    SkDEBUGCODE(fCurvePart.fVerb = SkPath::kCubic_Verb);
     SkDEBUGCODE(fCurvePart[2].fX = fCurvePart[2].fY = fCurvePart[3].fX = fCurvePart[3].fY
             = SK_ScalarNaN);
-    fSegment->subDivide(fStart, fEnd, &fCurvePart);
+    SkDEBUGCODE(fCurvePart.fVerb = segment->verb());
+    segment->subDivide(fStart, fEnd, &fCurvePart);
     setCurveHullSweep();
-    const SkPath::Verb verb = fSegment->verb();
+    const SkPath::Verb verb = segment->verb();
     if (verb != SkPath::kLine_Verb
             && !(fIsCurve = fSweep[0].crossCheck(fSweep[1]) != 0)) {
         SkDLine lineHalf;
@@ -993,29 +907,29 @@ void SkOpAngle::setSpans() {
     switch (verb) {
     case SkPath::kLine_Verb: {
         SkASSERT(fStart != fEnd);
-        const SkPoint& cP1 = pts[fStart < fEnd];
+        const SkPoint& cP1 = pts[fStart->t() < fEnd->t()];
         SkDLine lineHalf;
-        lineHalf[0].set(fSegment->span(fStart).fPt);
+        lineHalf[0].set(fStart->pt());
         lineHalf[1].set(cP1);
         fTangentHalf.lineEndPoints(lineHalf);
         fSide = 0;
         fIsCurve = false;
         } return;
-    case SkPath::kQuad_Verb: {
+    case SkPath::kQuad_Verb:
+    case SkPath::kConic_Verb: {
         SkLineParameters tangentPart;
-        SkDQuad& quad2 = *SkTCast<SkDQuad*>(&fCurvePart);
-        (void) tangentPart.quadEndPoints(quad2);
+        (void) tangentPart.quadEndPoints(fCurvePart.fQuad);
         fSide = -tangentPart.pointDistance(fCurvePart[2]);  // not normalized -- compare sign only
         } break;
     case SkPath::kCubic_Verb: {
         SkLineParameters tangentPart;
-        (void) tangentPart.cubicPart(fCurvePart);
+        (void) tangentPart.cubicPart(fCurvePart.fCubic);
         fSide = -tangentPart.pointDistance(fCurvePart[3]);
         double testTs[4];
         // OPTIMIZATION: keep inflections precomputed with cubic segment?
         int testCount = SkDCubic::FindInflections(pts, testTs);
-        double startT = fSegment->t(fStart);
-        double endT = fSegment->t(fEnd);
+        double startT = fStart->t();
+        double endT = fEnd->t();
         double limitT = endT;
         int index;
         for (index = 0; index < testCount; ++index) {
@@ -1040,9 +954,9 @@ void SkOpAngle::setSpans() {
                 testT = (testT + testTs[testIndex + 1]) / 2;
             }
             // OPTIMIZE: could avoid call for t == startT, endT
-            SkDPoint pt = dcubic_xy_at_t(pts, testT);
+            SkDPoint pt = dcubic_xy_at_t(pts, segment->weight(), testT);
             SkLineParameters tangentPart;
-            tangentPart.cubicEndPoints(fCurvePart);
+            tangentPart.cubicEndPoints(fCurvePart.fCubic);
             double testSide = tangentPart.pointDistance(pt);
             if (fabs(bestSide) < fabs(testSide)) {
                 bestSide = testSide;
@@ -1055,19 +969,62 @@ void SkOpAngle::setSpans() {
     }
 }
 
-bool SkOpAngle::small() const {
-    int min = SkMin32(fStart, fEnd);
-    int max = SkMax32(fStart, fEnd);
-    for (int index = min; index < max; ++index) {
-        const SkOpSpan& mSpan = fSegment->span(index);
-        if (!mSpan.fSmall) {
-            return false;
-        }
+void SkOpAngle::setSector() {
+    if (!fStart) {
+        fUnorderable = true;
+        return;
+    }
+    const SkOpSegment* segment = fStart->segment();
+    SkPath::Verb verb = segment->verb();
+    fSectorStart = this->findSector(verb, fSweep[0].fX, fSweep[0].fY);
+    if (fSectorStart < 0) {
+        goto deferTilLater;
+    }
+    if (!fIsCurve) {  // if it's a line or line-like, note that both sectors are the same
+        SkASSERT(fSectorStart >= 0);
+        fSectorEnd = fSectorStart;
+        fSectorMask = 1 << fSectorStart;
+        return;
+    }
+    SkASSERT(SkPath::kLine_Verb != verb);
+    fSectorEnd = this->findSector(verb, fSweep[1].fX, fSweep[1].fY);
+    if (fSectorEnd < 0) {
+deferTilLater:
+        fSectorStart = fSectorEnd = -1;
+        fSectorMask = 0;
+        fComputeSector = true;  // can't determine sector until segment length can be found
+        return;
+    }
+    if (fSectorEnd == fSectorStart
+            && (fSectorStart & 3) != 3) { // if the sector has no span, it can't be an exact angle
+        fSectorMask = 1 << fSectorStart;
+        return;
+    }
+    bool crossesZero = this->checkCrossesZero();
+    int start = SkTMin(fSectorStart, fSectorEnd);
+    bool curveBendsCCW = (fSectorStart == start) ^ crossesZero;
+    // bump the start and end of the sector span if they are on exact compass points
+    if ((fSectorStart & 3) == 3) {
+        fSectorStart = (fSectorStart + (curveBendsCCW ? 1 : 31)) & 0x1f;
+    }
+    if ((fSectorEnd & 3) == 3) {
+        fSectorEnd = (fSectorEnd + (curveBendsCCW ? 31 : 1)) & 0x1f;
+    }
+    crossesZero = this->checkCrossesZero();
+    start = SkTMin(fSectorStart, fSectorEnd);
+    int end = SkTMax(fSectorStart, fSectorEnd);
+    if (!crossesZero) {
+        fSectorMask = (unsigned) -1 >> (31 - end + start) << start;
+    } else {
+        fSectorMask = (unsigned) -1 >> (31 - start) | (-1 << end);
     }
-    return true;
 }
 
-bool SkOpAngle::tangentsDiverge(const SkOpAngle& rh, double s0xt0) const {
+SkOpSpan* SkOpAngle::starter() {
+    return fStart->starter(fEnd);
+}
+
+bool SkOpAngle::tangentsDiverge(const SkOpAngle* rh, double s0xt0) const {
     if (s0xt0 == 0) {
         return false;
     }
@@ -1081,7 +1038,7 @@ bool SkOpAngle::tangentsDiverge(const SkOpAngle& rh, double s0xt0) const {
     // m = (v2.y * v1.x - v2.x * v1.y) / (v2.x * v1.x + v2.y * v1.y)
     // m = v1.cross(v2) / v1.dot(v2)
     const SkDVector* sweep = fSweep;
-    const SkDVector* tweep = rh.fSweep;
+    const SkDVector* tweep = rh->fSweep;
     double s0dt0 = sweep[0].dot(tweep[0]);
     if (!s0dt0) {
         return true;
@@ -1091,36 +1048,6 @@ bool SkOpAngle::tangentsDiverge(const SkOpAngle& rh, double s0xt0) const {
     double sDist = sweep[0].length() * m;
     double tDist = tweep[0].length() * m;
     bool useS = fabs(sDist) < fabs(tDist);
-    double mFactor = fabs(useS ? distEndRatio(sDist) : rh.distEndRatio(tDist));
-    return mFactor < 5000;  // empirically found limit
-}
-
-SkOpAngleSet::SkOpAngleSet() 
-    : fAngles(NULL)
-#if DEBUG_ANGLE
-    , fCount(0)
-#endif
-{
-}
-
-SkOpAngleSet::~SkOpAngleSet() {
-    SkDELETE(fAngles);
-}
-
-SkOpAngle& SkOpAngleSet::push_back() {
-    if (!fAngles) {
-        fAngles = SkNEW_ARGS(SkChunkAlloc, (2));
-    }
-    void* ptr = fAngles->allocThrow(sizeof(SkOpAngle));
-    SkOpAngle* angle = (SkOpAngle*) ptr;
-#if DEBUG_ANGLE
-    angle->setID(++fCount);
-#endif
-    return *angle;
-}
-
-void SkOpAngleSet::reset() {
-    if (fAngles) {
-        fAngles->reset();
-    }
+    double mFactor = fabs(useS ? this->distEndRatio(sDist) : rh->distEndRatio(tDist));
+    return mFactor < 2400;  // empirically found limit
 }
diff --git a/gfx/skia/skia/src/pathops/SkOpAngle.h b/gfx/skia/skia/src/pathops/SkOpAngle.h
index 63d378d73ce6..4b209de32da3 100644
--- a/gfx/skia/skia/src/pathops/SkOpAngle.h
+++ b/gfx/skia/skia/src/pathops/SkOpAngle.h
@@ -7,17 +7,19 @@
 #ifndef SkOpAngle_DEFINED
 #define SkOpAngle_DEFINED
 
-#include "SkChunkAlloc.h"
 #include "SkLineParameters.h"
+#include "SkPathOpsCurve.h"
+#if DEBUG_ANGLE
+#include "SkString.h"
+#endif
 
+class SkOpContour;
+class SkOpPtT;
 class SkOpSegment;
-struct SkOpSpan;
+class SkOpSpanBase;
+class SkOpSpan;
 
-// sorting angles
-// given angles of {dx dy ddx ddy dddx dddy} sort them
-class SkOpAngle {
-public:
-    enum { kStackBasedCount = 8 }; // FIXME: determine what this should be
+struct SkOpAngle {
     enum IncludeType {
         kUnaryWinding,
         kUnaryXor,
@@ -25,145 +27,124 @@ public:
         kBinaryOpp,
     };
 
+    bool after(SkOpAngle* test);
+    int allOnOneSide(const SkOpAngle* test);
+    bool checkCrossesZero() const;
+    bool checkParallel(SkOpAngle* );
+    bool computeSector();
+    int convexHullOverlaps(const SkOpAngle* ) const;
 
-    int end() const {
+    const SkOpAngle* debugAngle(int id) const;
+    SkOpContour* debugContour(int id);
+
+    int debugID() const {
+        return SkDEBUGRELEASE(fID, -1);
+    }
+
+#if DEBUG_SORT
+    void debugLoop() const;
+#endif
+
+#if DEBUG_ANGLE
+    void debugCheckNearCoincidence() const;
+    SkString debugPart() const;
+#endif
+    const SkOpPtT* debugPtT(int id) const;
+    const SkOpSegment* debugSegment(int id) const;
+    int debugSign() const;
+    const SkOpSpanBase* debugSpan(int id) const;
+    void debugValidate() const; 
+    void debugValidateNext() const;  // in debug builds, verify that angle loop is uncorrupted
+    double distEndRatio(double dist) const;
+    // available to testing only
+    void dump() const;
+    void dumpCurves() const;
+    void dumpLoop() const;
+    void dumpOne(bool functionHeader) const;
+    void dumpTo(const SkOpSegment* fromSeg, const SkOpAngle* ) const;
+    void dumpTest() const;
+
+    SkOpSpanBase* end() const {
         return fEnd;
     }
 
-    const SkOpAngle* findFirst() const;
-
-    bool inLoop() const {
-        return !!fNext;
-    }
-
+    bool endsIntersect(SkOpAngle* );
+    bool endToSide(const SkOpAngle* rh, bool* inside) const;
+    int findSector(SkPath::Verb verb, double x, double y) const;
+    SkOpGlobalState* globalState() const;
     void insert(SkOpAngle* );
-    bool isHorizontal() const;
-    SkOpSpan* lastMarked() const;
-    bool loopContains(const SkOpAngle& ) const;
+    SkOpSpanBase* lastMarked() const;
+    bool loopContains(const SkOpAngle* ) const;
     int loopCount() const;
-    void markStops();
     bool merge(SkOpAngle* );
+    double midT() const;
+    bool midToSide(const SkOpAngle* rh, bool* inside) const;
 
     SkOpAngle* next() const {
         return fNext;
     }
 
+    bool oppositePlanes(const SkOpAngle* rh) const;
+    bool orderable(SkOpAngle* rh);  // false == this < rh ; true == this > rh
     SkOpAngle* previous() const;
 
-    void set(const SkOpSegment* segment, int start, int end);
+    int sectorEnd() const {
+        return fSectorEnd;
+    }
 
-    void setLastMarked(SkOpSpan* marked) {
+    int sectorStart() const {
+        return fSectorStart;
+    }
+
+    SkOpSegment* segment() const;
+
+    void set(SkOpSpanBase* start, SkOpSpanBase* end);
+    void setCurveHullSweep();
+
+    void setID(int id) {
+        SkDEBUGCODE(fID = id);
+    }
+
+    void setLastMarked(SkOpSpanBase* marked) {
         fLastMarked = marked;
     }
 
-    SkOpSegment* segment() const {
-        return const_cast<SkOpSegment*>(fSegment);
-    }
+    void setSector();
+    void setSpans();
 
-    int sign() const {
-        return SkSign32(fStart - fEnd);
-    }
-
-    bool small() const;
-
-    int start() const {
+    SkOpSpanBase* start() const {
         return fStart;
     }
 
+    SkOpSpan* starter();
+    bool tangentsDiverge(const SkOpAngle* rh, double s0xt0) const;
+
     bool unorderable() const {
         return fUnorderable;
     }
 
-    // available to testing only
-#if DEBUG_SORT
-    void debugLoop() const;  // called by code during run
-#endif
-#if DEBUG_ANGLE
-    void debugSameAs(const SkOpAngle* compare) const;
-#endif
-    void dump() const;
-    void dumpLoop() const;
-    void dumpTo(const SkOpSegment* fromSeg, const SkOpAngle* ) const;
-
-#if DEBUG_ANGLE
-    int debugID() const { return fID; }
-
-    void setID(int id) {
-        fID = id;
-    }
-#else
-    int debugID() const { return 0; }
-#endif
-
-#if DEBUG_VALIDATE
-    void debugValidateLoop() const;
-#endif
-
-private:
-    bool after(const SkOpAngle* test) const;
-    int allOnOneSide(const SkOpAngle& test) const;
-    bool calcSlop(double x, double y, double rx, double ry, bool* result) const;
-    bool checkCrossesZero() const;
-    bool checkParallel(const SkOpAngle& ) const;
-    bool computeSector();
-    int convexHullOverlaps(const SkOpAngle& ) const;
-    double distEndRatio(double dist) const;
-    int findSector(SkPath::Verb verb, double x, double y) const;
-    bool endsIntersect(const SkOpAngle& ) const;
-    double midT() const;
-    bool oppositePlanes(const SkOpAngle& rh) const;
-    bool orderable(const SkOpAngle& rh) const;  // false == this < rh ; true == this > rh
-    bool overlap(const SkOpAngle& test) const;
-    void setCurveHullSweep();
-    void setSector();
-    void setSpans();
-    bool tangentsDiverge(const SkOpAngle& rh, double s0xt0) const;
-
-    SkDCubic fCurvePart; // the curve from start to end
+    SkDCurve fCurvePart;  // the curve from start to end
     double fSide;
     SkLineParameters fTangentHalf;  // used only to sort a pair of lines or line-like sections
-    const SkOpSegment* fSegment;
     SkOpAngle* fNext;
-    SkOpSpan* fLastMarked;
+    SkOpSpanBase* fLastMarked;
     SkDVector fSweep[2];
-    int fStart;
-    int fEnd;
-    int fComputedEnd;
+    SkOpSpanBase* fStart;
+    SkOpSpanBase* fEnd;
+    SkOpSpanBase* fComputedEnd;
     int fSectorMask;
     int8_t fSectorStart;  // in 32nds of a circle
     int8_t fSectorEnd;
     bool fIsCurve;
-    bool fStop; // set if ordered angle is greater than the previous
-    mutable bool fUnorderable;  // this is editable by orderable()
+    bool fUnorderable;
     bool fUnorderedSweep;  // set when a cubic's first control point between the sweep vectors
     bool fComputeSector;
     bool fComputedSector;
+    bool fCheckCoincidence;
+    SkDEBUGCODE(int fID);
 
-#if DEBUG_ANGLE
-    int fID;
-#endif
-#if DEBUG_VALIDATE
-    void debugValidateNext() const;  // in debug builds, verify that angle loop is uncorrupted
-#else
-    void debugValidateNext() const {}
-#endif
-    void dumpOne(bool showFunc) const;  // available to testing only
-    void dumpPartials() const;  // utility to be called by user from debugger
-    friend class PathOpsAngleTester;
 };
 
-class SkOpAngleSet {
-public:
-    SkOpAngleSet();
-    ~SkOpAngleSet();
-    SkOpAngle& push_back();
-    void reset();
-private:
-    void dump() const;  // utility to be called by user from debugger
-#if DEBUG_ANGLE
-    int fCount;
-#endif
-    SkChunkAlloc* fAngles;
-};
+
 
 #endif
diff --git a/gfx/skia/skia/src/pathops/SkOpBuilder.cpp b/gfx/skia/skia/src/pathops/SkOpBuilder.cpp
new file mode 100644
index 000000000000..4f53dee05664
--- /dev/null
+++ b/gfx/skia/skia/src/pathops/SkOpBuilder.cpp
@@ -0,0 +1,173 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkMatrix.h"
+#include "SkOpEdgeBuilder.h"
+#include "SkPathPriv.h"
+#include "SkPathOps.h"
+#include "SkPathOpsCommon.h"
+
+static bool one_contour(const SkPath& path) {
+    SkChunkAlloc allocator(256);
+    int verbCount = path.countVerbs();
+    uint8_t* verbs = (uint8_t*) allocator.alloc(sizeof(uint8_t) * verbCount,
+            SkChunkAlloc::kThrow_AllocFailType);
+    (void) path.getVerbs(verbs, verbCount);
+    for (int index = 1; index < verbCount; ++index) {
+        if (verbs[index] == SkPath::kMove_Verb) {
+            return false;
+        }
+    }
+    return true;
+}
+
+void FixWinding(SkPath* path) {
+    SkPath::FillType fillType = path->getFillType();
+    if (fillType == SkPath::kInverseEvenOdd_FillType) {
+        fillType = SkPath::kInverseWinding_FillType;
+    } else if (fillType == SkPath::kEvenOdd_FillType) {
+        fillType = SkPath::kWinding_FillType;
+    }
+    SkPathPriv::FirstDirection dir;
+    if (one_contour(*path) && SkPathPriv::CheapComputeFirstDirection(*path, &dir)) {
+        if (dir != SkPathPriv::kCCW_FirstDirection) {
+            SkPath temp;
+            temp.reverseAddPath(*path);
+            *path = temp;
+        }
+        path->setFillType(fillType);
+        return;
+    }
+    SkChunkAlloc allocator(4096);
+    SkOpContourHead contourHead;
+    SkOpGlobalState globalState(nullptr, &contourHead  SkDEBUGPARAMS(nullptr));
+    SkOpEdgeBuilder builder(*path, &contourHead, &allocator, &globalState);
+    builder.finish(&allocator);
+    SkASSERT(contourHead.next());
+    contourHead.resetReverse();
+    bool writePath = false;
+    SkOpSpan* topSpan;
+    globalState.setPhase(SkOpGlobalState::kFixWinding);
+    while ((topSpan = FindSortableTop(&contourHead))) {
+        SkOpSegment* topSegment = topSpan->segment();
+        SkOpContour* topContour = topSegment->contour();
+        SkASSERT(topContour->isCcw() >= 0);
+#if DEBUG_WINDING
+        SkDebugf("%s id=%d nested=%d ccw=%d\n",  __FUNCTION__,
+                topSegment->debugID(), globalState.nested(), topContour->isCcw());
+#endif
+        if ((globalState.nested() & 1) != SkToBool(topContour->isCcw())) {
+            topContour->setReverse();
+            writePath = true;
+        }
+        topContour->markDone();
+        globalState.clearNested();
+    }
+    if (!writePath) {
+        path->setFillType(fillType);
+        return;
+    }
+    SkPath empty;
+    SkPathWriter woundPath(empty);
+    SkOpContour* test = &contourHead;
+    do {
+        if (test->reversed()) {
+            test->toReversePath(&woundPath);
+        } else {
+            test->toPath(&woundPath);
+        }
+    } while ((test = test->next()));
+    *path = *woundPath.nativePath();
+    path->setFillType(fillType);
+}
+
+void SkOpBuilder::add(const SkPath& path, SkPathOp op) {
+    if (0 == fOps.count() && op != kUnion_SkPathOp) {
+        fPathRefs.push_back() = SkPath();
+        *fOps.append() = kUnion_SkPathOp;
+    }
+    fPathRefs.push_back() = path;
+    *fOps.append() = op;
+}
+
+void SkOpBuilder::reset() {
+    fPathRefs.reset();
+    fOps.reset();
+}
+
+/* OPTIMIZATION: Union doesn't need to be all-or-nothing. A run of three or more convex
+   paths with union ops could be locally resolved and still improve over doing the
+   ops one at a time. */
+bool SkOpBuilder::resolve(SkPath* result) {
+    SkPath original = *result;
+    int count = fOps.count();
+    bool allUnion = true;
+    SkPathPriv::FirstDirection firstDir = SkPathPriv::kUnknown_FirstDirection;
+    for (int index = 0; index < count; ++index) {
+        SkPath* test = &fPathRefs[index];
+        if (kUnion_SkPathOp != fOps[index] || test->isInverseFillType()) {
+            allUnion = false;
+            break;
+        }
+        // If all paths are convex, track direction, reversing as needed.
+        if (test->isConvex()) {
+            SkPathPriv::FirstDirection dir;
+            if (!SkPathPriv::CheapComputeFirstDirection(*test, &dir)) {
+                allUnion = false;
+                break;
+            }
+            if (firstDir == SkPathPriv::kUnknown_FirstDirection) {
+                firstDir = dir;
+            } else if (firstDir != dir) {
+                SkPath temp;
+                temp.reverseAddPath(*test);
+                *test = temp;
+            }
+            continue;
+        }
+        // If the path is not convex but its bounds do not intersect the others, simplify is enough.
+        const SkRect& testBounds = test->getBounds();
+        for (int inner = 0; inner < index; ++inner) {
+            // OPTIMIZE: check to see if the contour bounds do not intersect other contour bounds?
+            if (SkRect::Intersects(fPathRefs[inner].getBounds(), testBounds)) {
+                allUnion = false;
+                break;
+            }
+        }
+    }
+    if (!allUnion) {
+        *result = fPathRefs[0];
+        for (int index = 1; index < count; ++index) {
+            if (!Op(*result, fPathRefs[index], fOps[index], result)) {
+                reset();
+                *result = original;
+                return false;
+            }
+        }
+        reset();
+        return true;
+    }
+    SkPath sum;
+    for (int index = 0; index < count; ++index) {
+        if (!Simplify(fPathRefs[index], &fPathRefs[index])) {
+            reset();
+            *result = original;
+            return false;
+        }
+        if (!fPathRefs[index].isEmpty()) {
+            // convert the even odd result back to winding form before accumulating it
+            FixWinding(&fPathRefs[index]);
+            sum.addPath(fPathRefs[index]);
+        }
+    }
+    reset();
+    bool success = Simplify(sum, result);
+    if (!success) {
+        *result = original;
+    }
+    return success;
+}
diff --git a/gfx/skia/skia/src/pathops/SkOpCoincidence.cpp b/gfx/skia/skia/src/pathops/SkOpCoincidence.cpp
new file mode 100755
index 000000000000..87bb91386975
--- /dev/null
+++ b/gfx/skia/skia/src/pathops/SkOpCoincidence.cpp
@@ -0,0 +1,676 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "SkOpCoincidence.h"
+#include "SkOpSegment.h"
+#include "SkPathOpsTSect.h"
+
+bool SkOpCoincidence::extend(SkOpPtT* coinPtTStart, SkOpPtT* coinPtTEnd, SkOpPtT* oppPtTStart,
+        SkOpPtT* oppPtTEnd) {
+    // if there is an existing pair that overlaps the addition, extend it
+    SkCoincidentSpans* coinRec = fHead;
+    if (coinRec) {
+        do {
+            if (coinRec->fCoinPtTStart->segment() != coinPtTStart->segment()) {
+                continue;
+            }
+            if (coinRec->fOppPtTStart->segment() != oppPtTStart->segment()) {
+                continue;
+            }
+            if (coinRec->fCoinPtTStart->fT > coinPtTEnd->fT) {
+                continue;
+            }
+            if (coinRec->fCoinPtTEnd->fT < coinPtTStart->fT) {
+                continue;
+            }
+            if (coinRec->fCoinPtTStart->fT > coinPtTStart->fT) {
+                coinRec->fCoinPtTStart = coinPtTStart;
+                coinRec->fOppPtTStart = oppPtTStart;
+            }
+            if (coinRec->fCoinPtTEnd->fT < coinPtTEnd->fT) {
+                coinRec->fCoinPtTEnd = coinPtTEnd;
+                coinRec->fOppPtTEnd = oppPtTEnd;
+            }
+            return true;
+        } while ((coinRec = coinRec->fNext));
+    }
+    return false;
+}
+
+void SkOpCoincidence::add(SkOpPtT* coinPtTStart, SkOpPtT* coinPtTEnd, SkOpPtT* oppPtTStart,
+        SkOpPtT* oppPtTEnd, SkChunkAlloc* allocator) {
+    SkASSERT(coinPtTStart->fT < coinPtTEnd->fT);
+    bool flipped = oppPtTStart->fT > oppPtTEnd->fT;
+    SkCoincidentSpans* coinRec = SkOpTAllocator<SkCoincidentSpans>::Allocate(allocator);
+    coinRec->fNext = this->fHead;
+    coinRec->fCoinPtTStart = coinPtTStart;
+    coinRec->fCoinPtTEnd = coinPtTEnd;
+    coinRec->fOppPtTStart = oppPtTStart;
+    coinRec->fOppPtTEnd = oppPtTEnd;
+    coinRec->fFlipped = flipped;
+    SkDEBUGCODE(coinRec->fID = fDebugState->nextCoinID());
+
+    this->fHead = coinRec;
+}
+
+static void t_range(const SkOpPtT* overS, const SkOpPtT* overE, double tStart, double tEnd,
+        const SkOpPtT* coinPtTStart, const SkOpPtT* coinPtTEnd, double* coinTs, double* coinTe) {
+    double denom = overE->fT - overS->fT;
+    double start = 0 < denom ? tStart : tEnd;
+    double end = 0 < denom ? tEnd : tStart;
+    double sRatio = (start - overS->fT) / denom;
+    double eRatio = (end - overS->fT) / denom;
+    *coinTs = coinPtTStart->fT + (coinPtTEnd->fT - coinPtTStart->fT) * sRatio;
+    *coinTe = coinPtTStart->fT + (coinPtTEnd->fT - coinPtTStart->fT) * eRatio;
+}
+
+bool SkOpCoincidence::addExpanded(SkChunkAlloc* allocator
+        PATH_OPS_DEBUG_VALIDATE_PARAMS(SkOpGlobalState* globalState)) {
+#if DEBUG_VALIDATE
+    globalState->setPhase(SkOpGlobalState::kIntersecting);
+#endif
+    // for each coincident pair, match the spans
+    // if the spans don't match, add the mssing pt to the segment and loop it in the opposite span
+    SkCoincidentSpans* coin = this->fHead;
+    SkASSERT(coin);
+    do {
+        SkOpPtT* startPtT = coin->fCoinPtTStart;
+        SkOpPtT* oStartPtT = coin->fOppPtTStart;
+        SkASSERT(startPtT->contains(oStartPtT));
+        SkASSERT(coin->fCoinPtTEnd->contains(coin->fOppPtTEnd));
+        SkOpSpanBase* start = startPtT->span();
+        SkOpSpanBase* oStart = oStartPtT->span();
+        const SkOpSpanBase* end = coin->fCoinPtTEnd->span();
+        const SkOpSpanBase* oEnd = coin->fOppPtTEnd->span();
+        if (oEnd->deleted()) {
+            return false;
+        }
+        SkOpSpanBase* test = start->upCast()->next();
+        SkOpSpanBase* oTest = coin->fFlipped ? oStart->prev() : oStart->upCast()->next();
+        while (test != end || oTest != oEnd) {
+            if (!test->ptT()->contains(oTest->ptT())) {
+                // use t ranges to guess which one is missing
+                double startRange = coin->fCoinPtTEnd->fT - startPtT->fT;
+                if (!startRange) {
+                    return false;
+                }
+                double startPart = (test->t() - startPtT->fT) / startRange;
+                double oStartRange = coin->fOppPtTEnd->fT - oStartPtT->fT;
+                if (!oStartRange) {
+                    return false;
+                }
+                double oStartPart = (oTest->t() - oStartPtT->fT) / oStartRange;
+                if (startPart == oStartPart) {
+                    return false;
+                }
+                SkOpPtT* newPt;
+                if (startPart < oStartPart) {
+                    double newT = oStartPtT->fT + oStartRange * startPart;
+                    newPt = oStart->segment()->addT(newT, SkOpSegment::kAllowAlias, allocator);
+                    newPt->fPt = test->pt();
+                    test->ptT()->addOpp(newPt);
+                } else {
+                    double newT = startPtT->fT + startRange * oStartPart;
+                    newPt = start->segment()->addT(newT, SkOpSegment::kAllowAlias, allocator);
+                    newPt->fPt = oTest->pt();
+                    oTest->ptT()->addOpp(newPt);
+                }
+                // start over
+                test = start;
+                oTest = oStart;
+            }
+            if (test != end) {
+                test = test->upCast()->next();
+            }
+            if (oTest != oEnd) {
+                oTest = coin->fFlipped ? oTest->prev() : oTest->upCast()->next();
+            }
+        }
+    } while ((coin = coin->fNext));
+#if DEBUG_VALIDATE
+    globalState->setPhase(SkOpGlobalState::kWalking);
+#endif
+    return true;
+}
+
+bool SkOpCoincidence::addIfMissing(const SkCoincidentSpans* outer, SkOpPtT* over1s,
+            SkOpPtT* over1e, SkChunkAlloc* allocator) {
+    SkCoincidentSpans* check = this->fTop;
+    do {
+        if (check->fCoinPtTStart->span() == over1s->span()
+                && check->fOppPtTStart->span() == outer->fOppPtTStart->span()) {
+            SkASSERT(check->fCoinPtTEnd->span() == over1e->span()
+                    || !fDebugState->debugRunFail());
+            SkASSERT(check->fOppPtTEnd->span() == outer->fOppPtTEnd->span()
+                    || !fDebugState->debugRunFail());
+            return false;
+        }
+        if (check->fCoinPtTStart->span() == outer->fCoinPtTStart->span()
+                && check->fOppPtTStart->span() == over1s->span()) {
+            SkASSERT(check->fCoinPtTEnd->span() == outer->fCoinPtTEnd->span()
+                    || !fDebugState->debugRunFail());
+            SkASSERT(check->fOppPtTEnd->span() == over1e->span()
+                    || !fDebugState->debugRunFail());
+            return false;
+        }
+    } while ((check = check->fNext));
+    this->add(outer->fCoinPtTStart, outer->fCoinPtTEnd, over1s, over1e, allocator);
+#if 0
+    // FIXME: up to four flavors could be added -- do we need only one?
+#endif
+    return true;
+}
+
+bool SkOpCoincidence::addIfMissing(const SkOpPtT* over1s, const SkOpPtT* over1e,
+                      const SkOpPtT* over2s, const SkOpPtT* over2e, double tStart, double tEnd,
+        SkOpPtT* coinPtTStart, const SkOpPtT* coinPtTEnd,
+        SkOpPtT* oppPtTStart, const SkOpPtT* oppPtTEnd, SkChunkAlloc* allocator) {
+    double coinTs, coinTe, oppTs, oppTe;
+    t_range(over1s, over1e, tStart, tEnd, coinPtTStart, coinPtTEnd, &coinTs, &coinTe);
+    t_range(over2s, over2e, tStart, tEnd, oppPtTStart, oppPtTEnd, &oppTs, &oppTe);
+    SkOpSegment* coinSeg = coinPtTStart->segment();
+    SkOpSegment* oppSeg = oppPtTStart->segment();
+    SkASSERT(coinSeg != oppSeg);
+    SkCoincidentSpans* check = this->fTop;
+    do {
+        const SkOpSegment* checkCoinSeg = check->fCoinPtTStart->segment();
+        if (checkCoinSeg != coinSeg && checkCoinSeg != oppSeg) {
+            continue;
+        }
+        const SkOpSegment* checkOppSeg = check->fOppPtTStart->segment();
+        if (checkOppSeg != coinSeg && checkOppSeg != oppSeg) {
+            continue;
+        }
+        int cTs = coinTs;
+        int cTe = coinTe;
+        int oTs = oppTs;
+        int oTe = oppTe;
+        if (checkCoinSeg != coinSeg) {
+            SkASSERT(checkOppSeg != oppSeg);
+            SkTSwap(cTs, oTs);
+            SkTSwap(cTe, oTe);
+        }
+        int tweenCount = (int) between(check->fCoinPtTStart->fT, cTs, check->fCoinPtTEnd->fT)
+                       + (int) between(check->fCoinPtTStart->fT, cTe, check->fCoinPtTEnd->fT)
+                       + (int) between(check->fOppPtTStart->fT, oTs, check->fOppPtTEnd->fT)
+                       + (int) between(check->fOppPtTStart->fT, oTe, check->fOppPtTEnd->fT);
+//        SkASSERT(tweenCount == 0 || tweenCount == 4);
+        if (tweenCount) {
+            return false;
+        }
+    } while ((check = check->fNext));
+    if ((over1s->fT < over1e->fT) != (over2s->fT < over2e->fT)) {
+        SkTSwap(oppTs, oppTe);
+    }
+    if (coinTs > coinTe) {
+        SkTSwap(coinTs, coinTe);
+        SkTSwap(oppTs, oppTe);
+    }
+    SkOpPtT* cs = coinSeg->addMissing(coinTs, oppSeg, allocator);
+    SkOpPtT* ce = coinSeg->addMissing(coinTe, oppSeg, allocator);
+    SkASSERT(cs != ce);
+    SkOpPtT* os = oppSeg->addMissing(oppTs, coinSeg, allocator);
+    SkOpPtT* oe = oppSeg->addMissing(oppTe, coinSeg, allocator);
+//    SkASSERT(os != oe);
+    cs->addOpp(os);
+    ce->addOpp(oe);
+    this->add(cs, ce, os, oe, allocator);
+    return true;
+}
+
+/* detects overlaps of different coincident runs on same segment */
+/* does not detect overlaps for pairs without any segments in common */
+bool SkOpCoincidence::addMissing(SkChunkAlloc* allocator) {
+    SkCoincidentSpans* outer = fHead;
+    if (!outer) {
+        return true;
+    }
+    bool added = false;
+    fTop = outer;
+    fHead = nullptr;
+    do {
+    // addifmissing can modify the list that this is walking
+    // save head so that walker can iterate over old data unperturbed
+    // addifmissing adds to head freely then add saved head in the end
+        const SkOpSegment* outerCoin = outer->fCoinPtTStart->segment();
+        SkASSERT(outerCoin == outer->fCoinPtTEnd->segment());
+        const SkOpSegment* outerOpp = outer->fOppPtTStart->segment();
+        SkASSERT(outerOpp == outer->fOppPtTEnd->segment());
+        SkCoincidentSpans* inner = outer;
+        while ((inner = inner->fNext)) {
+            double overS, overE;
+            const SkOpSegment* innerCoin = inner->fCoinPtTStart->segment();
+            SkASSERT(innerCoin == inner->fCoinPtTEnd->segment());
+            const SkOpSegment* innerOpp = inner->fOppPtTStart->segment();
+            SkASSERT(innerOpp == inner->fOppPtTEnd->segment());
+            if (outerCoin == innerCoin
+                    && this->overlap(outer->fCoinPtTStart, outer->fCoinPtTEnd,
+                    inner->fCoinPtTStart, inner->fCoinPtTEnd, &overS, &overE)) {
+                added |= this->addIfMissing(outer->fCoinPtTStart, outer->fCoinPtTEnd,
+                        inner->fCoinPtTStart, inner->fCoinPtTEnd, overS, overE,
+                        outer->fOppPtTStart, outer->fOppPtTEnd,
+                        inner->fOppPtTStart, inner->fOppPtTEnd, allocator);
+            } else if (outerCoin == innerOpp
+                    && this->overlap(outer->fCoinPtTStart, outer->fCoinPtTEnd,
+                    inner->fOppPtTStart, inner->fOppPtTEnd, &overS, &overE)) {
+                added |= this->addIfMissing(outer->fCoinPtTStart, outer->fCoinPtTEnd,
+                        inner->fOppPtTStart, inner->fOppPtTEnd, overS, overE,
+                        outer->fOppPtTStart, outer->fOppPtTEnd,
+                        inner->fCoinPtTStart, inner->fCoinPtTEnd, allocator);
+            } else if (outerOpp == innerCoin
+                    && this->overlap(outer->fOppPtTStart, outer->fOppPtTEnd,
+                    inner->fCoinPtTStart, inner->fCoinPtTEnd, &overS, &overE)) {
+                added |= this->addIfMissing(outer->fOppPtTStart, outer->fOppPtTEnd,
+                        inner->fCoinPtTStart, inner->fCoinPtTEnd, overS, overE,
+                        outer->fCoinPtTStart, outer->fCoinPtTEnd,
+                        inner->fOppPtTStart, inner->fOppPtTEnd, allocator);
+            } else if (outerOpp == innerOpp
+                    && this->overlap(outer->fOppPtTStart, outer->fOppPtTEnd,
+                    inner->fOppPtTStart, inner->fOppPtTEnd, &overS, &overE)) {
+                added |= this->addIfMissing(outer->fOppPtTStart, outer->fOppPtTEnd,
+                        inner->fOppPtTStart, inner->fOppPtTEnd, overS, overE,
+                        outer->fCoinPtTStart, outer->fCoinPtTEnd,
+                        inner->fCoinPtTStart, inner->fCoinPtTEnd, allocator);
+            } else if (outerCoin != innerCoin) {
+                // check to see if outer span overlaps the inner span
+                    // look for inner segment in pt-t list
+                    // if present, and if t values are in coincident range
+                    // add two pairs of new coincidence
+                SkOpPtT* testS = outer->fCoinPtTStart->contains(innerCoin);
+                SkOpPtT* testE = outer->fCoinPtTEnd->contains(innerCoin);
+                if (testS && testS->fT >= inner->fCoinPtTStart->fT
+                        && testE && testE->fT <= inner->fCoinPtTEnd->fT
+                        && this->testForCoincidence(outer, testS, testE)) {
+                    added |= this->addIfMissing(outer, testS, testE, allocator);
+                } else {
+                    testS = inner->fCoinPtTStart->contains(outerCoin);
+                    testE = inner->fCoinPtTEnd->contains(outerCoin);
+                    if (testS && testS->fT >= outer->fCoinPtTStart->fT
+                            && testE && testE->fT <= outer->fCoinPtTEnd->fT
+                            && this->testForCoincidence(inner, testS, testE)) {
+                        added |= this->addIfMissing(inner, testS, testE, allocator);
+                    }
+                }
+            }
+#if 0 && DEBUG_COINCIDENCE
+            SkString miss;
+            miss.printf("addMissing inner=%d outer=%d", inner->debugID(), outer->debugID());
+            DEBUG_COINCIDENCE_HEALTH(fDebugState->contourHead(), miss.c_str());
+#endif
+        }
+    } while ((outer = outer->fNext));
+    SkCoincidentSpans** headPtr = &fHead;
+    while (*headPtr) {
+        SkCoincidentSpans** headNext = &(*headPtr)->fNext;
+        if (*headNext) {
+            break;
+        }
+        headPtr = headNext;
+    }
+    *headPtr = fTop;
+    return added;
+}
+
+void SkOpCoincidence::addOverlap(SkOpSegment* seg1, SkOpSegment* seg1o, SkOpSegment* seg2,
+        SkOpSegment* seg2o, SkOpPtT* overS, SkOpPtT* overE, SkChunkAlloc* allocator) {
+    SkOpPtT* s1 = overS->find(seg1);
+    SkOpPtT* e1 = overE->find(seg1);
+    if (!s1->starter(e1)->span()->upCast()->windValue()) {
+        s1 = overS->find(seg1o);
+        e1 = overE->find(seg1o);
+        if (!s1->starter(e1)->span()->upCast()->windValue()) {
+            return;
+        }
+    }
+    SkOpPtT* s2 = overS->find(seg2);
+    SkOpPtT* e2 = overE->find(seg2);
+    if (!s2->starter(e2)->span()->upCast()->windValue()) {
+        s2 = overS->find(seg2o);
+        e2 = overE->find(seg2o);
+        if (!s2->starter(e2)->span()->upCast()->windValue()) {
+            return;
+        }
+    }
+    if (s1->segment() == s2->segment()) {
+        return;
+    }
+    if (s1->fT > e1->fT) {
+        SkTSwap(s1, e1);
+        SkTSwap(s2, e2);
+    }
+    this->add(s1, e1, s2, e2, allocator);
+}
+
+bool SkOpCoincidence::contains(const SkOpPtT* coinPtTStart, const SkOpPtT* coinPtTEnd,
+        const SkOpPtT* oppPtTStart, const SkOpPtT* oppPtTEnd, bool flipped) const {
+    const SkCoincidentSpans* coin = fHead;
+    if (!coin) {
+        return false;
+    }
+    do {
+        if (coin->fCoinPtTStart == coinPtTStart &&  coin->fCoinPtTEnd == coinPtTEnd
+                && coin->fOppPtTStart == oppPtTStart && coin->fOppPtTEnd == oppPtTEnd
+                && coin->fFlipped == flipped) {
+            return true;
+        }
+    } while ((coin = coin->fNext));
+    return false;
+}
+
+// walk span sets in parallel, moving winding from one to the other
+bool SkOpCoincidence::apply() {
+    SkCoincidentSpans* coin = fHead;
+    if (!coin) {
+        return true;
+    }
+    do {
+        SkOpSpan* start = coin->fCoinPtTStart->span()->upCast();
+        if (start->deleted()) {
+            continue;
+        }
+        SkOpSpanBase* end = coin->fCoinPtTEnd->span();
+        SkASSERT(start == start->starter(end));
+        bool flipped = coin->fFlipped;
+        SkOpSpan* oStart = (flipped ? coin->fOppPtTEnd : coin->fOppPtTStart)->span()->upCast();
+        if (oStart->deleted()) {
+            continue;
+        }
+        SkOpSpanBase* oEnd = (flipped ? coin->fOppPtTStart : coin->fOppPtTEnd)->span();
+        SkASSERT(oStart == oStart->starter(oEnd));
+        SkOpSegment* segment = start->segment();
+        SkOpSegment* oSegment = oStart->segment();
+        bool operandSwap = segment->operand() != oSegment->operand();
+        if (flipped) {
+            do {
+                SkOpSpanBase* oNext = oStart->next();
+                if (oNext == oEnd) {
+                    break;
+                }
+                oStart = oNext->upCast();
+            } while (true);
+        }
+        do {
+            int windValue = start->windValue();
+            int oppValue = start->oppValue();
+            int oWindValue = oStart->windValue();
+            int oOppValue = oStart->oppValue();
+            // winding values are added or subtracted depending on direction and wind type
+            // same or opposite values are summed depending on the operand value
+            int windDiff = operandSwap ? oOppValue : oWindValue;
+            int oWindDiff = operandSwap ? oppValue : windValue;
+            if (!flipped) {
+                windDiff = -windDiff;
+                oWindDiff = -oWindDiff;
+            }
+            if (windValue && (windValue > windDiff || (windValue == windDiff
+                    && oWindValue <= oWindDiff))) {
+                if (operandSwap) {
+                    SkTSwap(oWindValue, oOppValue);
+                }
+                if (flipped) {
+                    windValue -= oWindValue;
+                    oppValue -= oOppValue;
+                } else {
+                    windValue += oWindValue;
+                    oppValue += oOppValue;
+                }
+                if (segment->isXor()) {
+                    windValue &= 1;
+                }
+                if (segment->oppXor()) {
+                    oppValue &= 1;
+                }
+                oWindValue = oOppValue = 0;
+            } else {
+                if (operandSwap) {
+                    SkTSwap(windValue, oppValue);
+                }
+                if (flipped) {
+                    oWindValue -= windValue;
+                    oOppValue -= oppValue;
+                } else {
+                    oWindValue += windValue;
+                    oOppValue += oppValue;
+                }
+                if (oSegment->isXor()) {
+                    oWindValue &= 1;
+                }
+                if (oSegment->oppXor()) {
+                    oOppValue &= 1;
+                }
+                windValue = oppValue = 0;
+            }
+            start->setWindValue(windValue);
+            start->setOppValue(oppValue);
+            oStart->setWindValue(oWindValue);
+            oStart->setOppValue(oOppValue);
+            if (!windValue && !oppValue) {
+                segment->markDone(start);
+            }
+            if (!oWindValue && !oOppValue) {
+                oSegment->markDone(oStart);
+            }
+            SkOpSpanBase* next = start->next();
+            SkOpSpanBase* oNext = flipped ? oStart->prev() : oStart->next();
+            if (next == end) {
+                break;
+            }
+            if (!next->upCastable()) {
+                return false;
+            }
+            start = next->upCast();
+            // if the opposite ran out too soon, just reuse the last span
+            if (!oNext || !oNext->upCastable()) {
+               oNext = oStart;
+            }
+            oStart = oNext->upCast();
+        } while (true);
+    } while ((coin = coin->fNext));
+    return true;
+}
+
+void SkOpCoincidence::detach(SkCoincidentSpans* remove) {
+    SkCoincidentSpans* coin = fHead;
+    SkCoincidentSpans* prev = nullptr;
+    SkCoincidentSpans* next;
+    do {
+        next = coin->fNext;
+        if (coin == remove) {
+            if (prev) {
+                prev->fNext = next;
+            } else {
+                fHead = next;
+            }
+            break;
+        }
+        prev = coin;
+    } while ((coin = next));
+    SkASSERT(coin);
+}
+
+bool SkOpCoincidence::expand() {
+    SkCoincidentSpans* coin = fHead;
+    if (!coin) {
+        return false;
+    }
+    bool expanded = false;
+    do {
+        SkOpSpan* start = coin->fCoinPtTStart->span()->upCast();
+        SkOpSpanBase* end = coin->fCoinPtTEnd->span();
+        SkOpSegment* segment = coin->fCoinPtTStart->segment();
+        SkOpSegment* oppSegment = coin->fOppPtTStart->segment();
+        SkOpSpan* prev = start->prev();
+        SkOpPtT* oppPtT;
+        if (prev && (oppPtT = prev->contains(oppSegment))) {
+            double midT = (prev->t() + start->t()) / 2;
+            if (segment->isClose(midT, oppSegment)) {
+                coin->fCoinPtTStart = prev->ptT();
+                coin->fOppPtTStart = oppPtT;
+                expanded = true;
+            }
+        }
+        SkOpSpanBase* next = end->final() ? nullptr : end->upCast()->next();
+        if (next && (oppPtT = next->contains(oppSegment))) {
+            double midT = (end->t() + next->t()) / 2;
+            if (segment->isClose(midT, oppSegment)) {
+                coin->fCoinPtTEnd = next->ptT();
+                coin->fOppPtTEnd = oppPtT;
+                expanded = true;
+            }
+        }
+    } while ((coin = coin->fNext));
+    return expanded;
+}
+
+void SkOpCoincidence::findOverlaps(SkOpCoincidence* overlaps, SkChunkAlloc* allocator) const {
+    overlaps->fHead = overlaps->fTop = nullptr;
+    SkDEBUGCODE_(overlaps->debugSetGlobalState(fDebugState));
+    SkCoincidentSpans* outer = fHead;
+    while (outer) {
+        SkOpSegment* outerCoin = outer->fCoinPtTStart->segment();
+        SkOpSegment* outerOpp = outer->fOppPtTStart->segment();
+        SkCoincidentSpans* inner = outer;
+        while ((inner = inner->fNext)) {
+            SkOpSegment* innerCoin = inner->fCoinPtTStart->segment();
+            if (outerCoin == innerCoin) {
+                continue;  // both winners are the same segment, so there's no additional overlap
+            }
+            SkOpSegment* innerOpp = inner->fOppPtTStart->segment();
+            SkOpPtT* overlapS, * overlapE;
+            if ((outerOpp == innerCoin && SkOpPtT::Overlaps(outer->fOppPtTStart, outer->fOppPtTEnd,
+                    inner->fCoinPtTStart, inner->fCoinPtTEnd, &overlapS, &overlapE))
+                    || (outerCoin == innerOpp && SkOpPtT::Overlaps(outer->fCoinPtTStart,
+                    outer->fCoinPtTEnd, inner->fOppPtTStart, inner->fOppPtTEnd,
+                    &overlapS, &overlapE))
+                    || (outerOpp == innerOpp && SkOpPtT::Overlaps(outer->fOppPtTStart,
+                    outer->fOppPtTEnd, inner->fOppPtTStart, inner->fOppPtTEnd,
+                    &overlapS, &overlapE))) {
+                overlaps->addOverlap(outerCoin, outerOpp, innerCoin, innerOpp,
+                        overlapS, overlapE, allocator);
+            }
+        }
+        outer = outer->fNext;
+    }
+}
+
+void SkOpCoincidence::fixAligned() {
+    SkCoincidentSpans* coin = fHead;
+    if (!coin) {
+        return;
+    }
+    do {
+        if (coin->fCoinPtTStart->deleted()) {
+            coin->fCoinPtTStart = coin->fCoinPtTStart->doppelganger();
+        }
+        if (coin->fCoinPtTEnd->deleted()) {
+            coin->fCoinPtTEnd = coin->fCoinPtTEnd->doppelganger();
+        }
+        if (coin->fOppPtTStart->deleted()) {
+            coin->fOppPtTStart = coin->fOppPtTStart->doppelganger();
+        }
+        if (coin->fOppPtTEnd->deleted()) {
+            coin->fOppPtTEnd = coin->fOppPtTEnd->doppelganger();
+        }
+    } while ((coin = coin->fNext));
+    coin = fHead;
+    SkCoincidentSpans** priorPtr = &fHead;
+    do {
+        if (coin->fCoinPtTStart->collapsed(coin->fCoinPtTEnd)
+                || coin->fOppPtTStart->collapsed(coin->fOppPtTEnd)) {
+            *priorPtr = coin->fNext;
+            continue;
+        }
+        priorPtr = &coin->fNext;
+    } while ((coin = coin->fNext));
+}
+
+void SkOpCoincidence::fixUp(SkOpPtT* deleted, SkOpPtT* kept) {
+    SkCoincidentSpans* coin = fHead;
+    if (!coin) {
+        return;
+    }
+    do {
+        if (coin->fCoinPtTStart == deleted) {
+            if (coin->fCoinPtTEnd->span() == kept->span()) {
+                this->detach(coin);
+                continue;
+            }
+            coin->fCoinPtTStart = kept;
+        }
+        if (coin->fCoinPtTEnd == deleted) {
+            if (coin->fCoinPtTStart->span() == kept->span()) {
+                this->detach(coin);
+                continue;
+            }
+            coin->fCoinPtTEnd = kept;
+        }
+        if (coin->fOppPtTStart == deleted) {
+            if (coin->fOppPtTEnd->span() == kept->span()) {
+                this->detach(coin);
+                continue;
+            }
+            coin->fOppPtTStart = kept;
+        }
+        if (coin->fOppPtTEnd == deleted) {
+            if (coin->fOppPtTStart->span() == kept->span()) {
+                this->detach(coin);
+                continue;
+            }
+            coin->fOppPtTEnd = kept;
+        }
+    } while ((coin = coin->fNext));
+}
+
+/* this sets up the coincidence links in the segments when the coincidence crosses multiple spans */
+void SkOpCoincidence::mark() {
+    SkCoincidentSpans* coin = fHead;
+    if (!coin) {
+        return;
+    }
+    do {
+        SkOpSpanBase* end = coin->fCoinPtTEnd->span();
+        SkOpSpanBase* oldEnd = end;
+        SkOpSpan* start = coin->fCoinPtTStart->span()->starter(&end);
+        SkOpSpanBase* oEnd = coin->fOppPtTEnd->span();
+        SkOpSpanBase* oOldEnd = oEnd;
+        SkOpSpanBase* oStart = coin->fOppPtTStart->span()->starter(&oEnd);
+        bool flipped = (end == oldEnd) != (oEnd == oOldEnd);
+        if (flipped) {
+            SkTSwap(oStart, oEnd);
+        }
+        SkOpSpanBase* next = start;
+        SkOpSpanBase* oNext = oStart;
+        do {
+            next = next->upCast()->next();
+            oNext = flipped ? oNext->prev() : oNext->upCast()->next();
+            if (next == end || oNext == oEnd) {
+                break;
+            }
+            if (!next->containsCoinEnd(oNext)) {
+                next->insertCoinEnd(oNext);
+            }
+            SkOpSpan* nextSpan = next->upCast();
+            SkOpSpan* oNextSpan = oNext->upCast();
+            if (!nextSpan->containsCoincidence(oNextSpan)) {
+                nextSpan->insertCoincidence(oNextSpan);
+            }
+        } while (true);
+    } while ((coin = coin->fNext));
+}
+
+bool SkOpCoincidence::overlap(const SkOpPtT* coin1s, const SkOpPtT* coin1e, 
+        const SkOpPtT* coin2s, const SkOpPtT* coin2e, double* overS, double* overE) const {
+    SkASSERT(coin1s->segment() == coin2s->segment());
+    *overS = SkTMax(SkTMin(coin1s->fT, coin1e->fT), SkTMin(coin2s->fT, coin2e->fT));
+    *overE = SkTMin(SkTMax(coin1s->fT, coin1e->fT), SkTMax(coin2s->fT, coin2e->fT));
+    return *overS < *overE;
+}
+
+bool SkOpCoincidence::testForCoincidence(const SkCoincidentSpans* outer, const SkOpPtT* testS,
+        const SkOpPtT* testE) const {
+    return testS->segment()->testForCoincidence(testS, testE, testS->span(),
+            testE->span(), outer->fCoinPtTStart->segment(), 120000);  // FIXME: replace with tuned
+}
diff --git a/gfx/skia/skia/src/pathops/SkOpCoincidence.h b/gfx/skia/skia/src/pathops/SkOpCoincidence.h
new file mode 100644
index 000000000000..91da2e16bf55
--- /dev/null
+++ b/gfx/skia/skia/src/pathops/SkOpCoincidence.h
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef SkOpCoincidence_DEFINED
+#define SkOpCoincidence_DEFINED
+
+#include "SkOpTAllocator.h"
+#include "SkOpSpan.h"
+#include "SkPathOpsTypes.h"
+
+class SkOpPtT;
+
+struct SkCoincidentSpans {
+    SkCoincidentSpans* fNext;
+    SkOpPtT* fCoinPtTStart;
+    SkOpPtT* fCoinPtTEnd;
+    SkOpPtT* fOppPtTStart;
+    SkOpPtT* fOppPtTEnd;
+    bool fFlipped;
+    SkDEBUGCODE(int fID);
+
+    int debugID() const {
+        return SkDEBUGRELEASE(fID, -1);
+    }
+
+    void dump() const;
+};
+
+class SkOpCoincidence {
+public:
+    SkOpCoincidence()
+        : fHead(nullptr)
+        , fTop(nullptr)
+        SkDEBUGPARAMS(fDebugState(nullptr))
+        {
+    }
+
+    void add(SkOpPtT* coinPtTStart, SkOpPtT* coinPtTEnd, SkOpPtT* oppPtTStart,
+             SkOpPtT* oppPtTEnd, SkChunkAlloc* allocator);
+    bool addExpanded(SkChunkAlloc* allocator  PATH_OPS_DEBUG_VALIDATE_PARAMS(SkOpGlobalState* ));
+    bool addMissing(SkChunkAlloc* allocator);
+    bool apply();
+    bool contains(const SkOpPtT* coinPtTStart, const SkOpPtT* coinPtTEnd,
+                  const SkOpPtT* oppPtTStart, const SkOpPtT* oppPtTEnd, bool flipped) const;
+
+    void debugAddExpanded(const char* id, SkPathOpsDebug::GlitchLog* ) const;
+    void debugAddMissing(const char* id, SkPathOpsDebug::GlitchLog* ) const;
+
+    const SkOpAngle* debugAngle(int id) const {
+        return SkDEBUGRELEASE(fDebugState->debugAngle(id), nullptr);
+    }
+
+    SkOpContour* debugContour(int id) {
+        return SkDEBUGRELEASE(fDebugState->debugContour(id), nullptr);
+    }
+
+    bool debugExpand(const char* id, SkPathOpsDebug::GlitchLog* ) const;
+    void debugMark(const char* id, SkPathOpsDebug::GlitchLog* ) const;
+
+    const SkOpPtT* debugPtT(int id) const {
+        return SkDEBUGRELEASE(fDebugState->debugPtT(id), nullptr);
+    }
+
+    const SkOpSegment* debugSegment(int id) const {
+        return SkDEBUGRELEASE(fDebugState->debugSegment(id), nullptr);
+    }
+
+    void debugSetGlobalState(SkOpGlobalState* debugState) {
+        SkDEBUGCODE(fDebugState = debugState);
+    }
+
+    void debugFixAligned(const char* id, SkPathOpsDebug::GlitchLog* ) const;
+    void debugShowCoincidence() const;
+
+    const SkOpSpanBase* debugSpan(int id) const {
+        return SkDEBUGRELEASE(fDebugState->debugSpan(id), nullptr);
+    }
+
+    void detach(SkCoincidentSpans* );
+    void dump() const;
+    bool expand();
+    bool extend(SkOpPtT* coinPtTStart, SkOpPtT* coinPtTEnd, SkOpPtT* oppPtTStart,
+        SkOpPtT* oppPtTEnd);
+    void findOverlaps(SkOpCoincidence* , SkChunkAlloc* allocator) const;
+    void fixAligned();
+    void fixUp(SkOpPtT* deleted, SkOpPtT* kept);
+
+    bool isEmpty() const {
+        return !fHead;
+    }
+
+    void mark();
+
+private:
+    bool addIfMissing(const SkCoincidentSpans* outer, SkOpPtT* over1s, SkOpPtT* over1e,
+                      SkChunkAlloc* );
+    bool addIfMissing(const SkOpPtT* over1s, const SkOpPtT* over1e,
+                      const SkOpPtT* over2s, const SkOpPtT* over2e,
+                      double tStart, double tEnd,
+                      SkOpPtT* coinPtTStart, const SkOpPtT* coinPtTEnd,
+                      SkOpPtT* oppPtTStart, const SkOpPtT* oppPtTEnd,
+                      SkChunkAlloc* );
+    void addOverlap(SkOpSegment* seg1, SkOpSegment* seg1o, SkOpSegment* seg2, SkOpSegment* seg2o,
+                    SkOpPtT* overS, SkOpPtT* overE, SkChunkAlloc* );
+    bool debugAddIfMissing(const SkCoincidentSpans* outer, const SkOpPtT* over1s, 
+                           const SkOpPtT* over1e) const;
+    bool debugAddIfMissing(const SkOpPtT* over1s, const SkOpPtT* over1e,
+                           const SkOpPtT* over2s, const SkOpPtT* over2e,
+                           double tStart, double tEnd,
+                           SkOpPtT* coinPtTStart, const SkOpPtT* coinPtTEnd,
+                           SkOpPtT* oppPtTStart, const SkOpPtT* oppPtTEnd) const;
+    bool overlap(const SkOpPtT* coinStart1, const SkOpPtT* coinEnd1,
+                 const SkOpPtT* coinStart2, const SkOpPtT* coinEnd2,
+                 double* overS, double* overE) const;
+
+    bool testForCoincidence(const SkCoincidentSpans* outer, const SkOpPtT* testS,
+                            const SkOpPtT* testE) const;
+    SkCoincidentSpans* fHead;
+    SkCoincidentSpans* fTop;
+    SkDEBUGCODE_(SkOpGlobalState* fDebugState);
+};
+
+#endif
diff --git a/gfx/skia/skia/src/pathops/SkOpContour.cpp b/gfx/skia/skia/src/pathops/SkOpContour.cpp
index 5ef702d4c10c..df65437c97d1 100644
--- a/gfx/skia/skia/src/pathops/SkOpContour.cpp
+++ b/gfx/skia/skia/src/pathops/SkOpContour.cpp
@@ -4,747 +4,67 @@
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.
 */
-#include "SkIntersections.h"
 #include "SkOpContour.h"
+#include "SkOpTAllocator.h"
 #include "SkPathWriter.h"
+#include "SkReduceOrder.h"
 #include "SkTSort.h"
 
-bool SkOpContour::addCoincident(int index, SkOpContour* other, int otherIndex,
-        const SkIntersections& ts, bool swap) {
-    SkPoint pt0 = ts.pt(0).asSkPoint();
-    SkPoint pt1 = ts.pt(1).asSkPoint();
-    if (pt0 == pt1) {
-        // FIXME: one could imagine a case where it would be incorrect to ignore this
-        // suppose two self-intersecting cubics overlap to be coincident --
-        // this needs to check that by some measure the t values are far enough apart
-        // or needs to check to see if the self-intersection bit was set on the cubic segment
-        return false;
+SkOpSegment* SkOpContour::addCurve(SkPath::Verb verb, const SkPoint pts[4],
+        SkChunkAlloc* allocator) {
+    switch (verb) {
+        case SkPath::kLine_Verb: {
+            SkPoint* ptStorage = SkOpTAllocator<SkPoint>::AllocateArray(allocator, 2);
+            memcpy(ptStorage, pts, sizeof(SkPoint) * 2);
+            return appendSegment(allocator).addLine(ptStorage, this);
+        } break;
+        case SkPath::kQuad_Verb: {
+            SkPoint* ptStorage = SkOpTAllocator<SkPoint>::AllocateArray(allocator, 3);
+            memcpy(ptStorage, pts, sizeof(SkPoint) * 3);
+            return appendSegment(allocator).addQuad(ptStorage, this);
+        } break;
+        case SkPath::kConic_Verb: {
+            SkASSERT(0);  // the original curve is a cubic, which will never reduce to a conic
+        } break;
+        case SkPath::kCubic_Verb: {
+            SkPoint* ptStorage = SkOpTAllocator<SkPoint>::AllocateArray(allocator, 4);
+            memcpy(ptStorage, pts, sizeof(SkPoint) * 4);
+            return appendSegment(allocator).addCubic(ptStorage, this);
+        } break;
+        default:
+            SkASSERT(0);
     }
-    SkCoincidence& coincidence = fCoincidences.push_back();
-    coincidence.fOther = other;
-    coincidence.fSegments[0] = index;
-    coincidence.fSegments[1] = otherIndex;
-    coincidence.fTs[swap][0] = ts[0][0];
-    coincidence.fTs[swap][1] = ts[0][1];
-    coincidence.fTs[!swap][0] = ts[1][0];
-    coincidence.fTs[!swap][1] = ts[1][1];
-    coincidence.fPts[swap][0] = pt0;
-    coincidence.fPts[swap][1] = pt1;
-    bool nearStart = ts.nearlySame(0);
-    bool nearEnd = ts.nearlySame(1);
-    coincidence.fPts[!swap][0] = nearStart ? ts.pt2(0).asSkPoint() : pt0;
-    coincidence.fPts[!swap][1] = nearEnd ? ts.pt2(1).asSkPoint() : pt1;
-    coincidence.fNearly[0] = nearStart;
-    coincidence.fNearly[1] = nearEnd;
-    return true;
-}
-
-SkOpSegment* SkOpContour::nonVerticalSegment(int* start, int* end) {
-    int segmentCount = fSortedSegments.count();
-    SkASSERT(segmentCount > 0);
-    for (int sortedIndex = fFirstSorted; sortedIndex < segmentCount; ++sortedIndex) {
-        SkOpSegment* testSegment = fSortedSegments[sortedIndex];
-        if (testSegment->done()) {
-            continue;
-        }
-        *start = *end = 0;
-        while (testSegment->nextCandidate(start, end)) {
-            if (!testSegment->isVertical(*start, *end)) {
-                return testSegment;
-            }
-        }
-    }
-    return NULL;
-}
-
-// first pass, add missing T values
-// second pass, determine winding values of overlaps
-void SkOpContour::addCoincidentPoints() {
-    int count = fCoincidences.count();
-    for (int index = 0; index < count; ++index) {
-        SkCoincidence& coincidence = fCoincidences[index];
-        int thisIndex = coincidence.fSegments[0];
-        SkOpSegment& thisOne = fSegments[thisIndex];
-        SkOpContour* otherContour = coincidence.fOther;
-        int otherIndex = coincidence.fSegments[1];
-        SkOpSegment& other = otherContour->fSegments[otherIndex];
-        if ((thisOne.done() || other.done()) && thisOne.complete() && other.complete()) {
-            // OPTIMIZATION: remove from array
-            continue;
-        }
-    #if DEBUG_CONCIDENT
-        thisOne.debugShowTs("-");
-        other.debugShowTs("o");
-    #endif
-        double startT = coincidence.fTs[0][0];
-        double endT = coincidence.fTs[0][1];
-        bool startSwapped, oStartSwapped, cancelers;
-        if ((cancelers = startSwapped = startT > endT)) {
-            SkTSwap(startT, endT);
-        }
-        if (startT == endT) { // if one is very large the smaller may have collapsed to nothing
-            if (endT <= 1 - FLT_EPSILON) {
-                endT += FLT_EPSILON;
-                SkASSERT(endT <= 1);
-            } else {
-                startT -= FLT_EPSILON;
-                SkASSERT(startT >= 0);
-            }
-        }
-        SkASSERT(!approximately_negative(endT - startT));
-        double oStartT = coincidence.fTs[1][0];
-        double oEndT = coincidence.fTs[1][1];
-        if ((oStartSwapped = oStartT > oEndT)) {
-            SkTSwap(oStartT, oEndT);
-            cancelers ^= true;
-        }
-        SkASSERT(!approximately_negative(oEndT - oStartT));
-        const SkPoint& startPt = coincidence.fPts[0][startSwapped];
-        if (cancelers) {
-            // make sure startT and endT have t entries
-            if (startT > 0 || oEndT < 1
-                    || thisOne.isMissing(startT, startPt) || other.isMissing(oEndT, startPt)) {
-                thisOne.addTPair(startT, &other, oEndT, true, startPt,
-                        coincidence.fPts[1][startSwapped]);
-            }
-            const SkPoint& oStartPt = coincidence.fPts[1][oStartSwapped];
-            if (oStartT > 0 || endT < 1
-                    || thisOne.isMissing(endT, oStartPt) || other.isMissing(oStartT, oStartPt)) {
-                other.addTPair(oStartT, &thisOne, endT, true, oStartPt,
-                        coincidence.fPts[0][oStartSwapped]);
-            }
-        } else {
-            if (startT > 0 || oStartT > 0
-                    || thisOne.isMissing(startT, startPt) || other.isMissing(oStartT, startPt)) {
-                thisOne.addTPair(startT, &other, oStartT, true, startPt,
-                        coincidence.fPts[1][startSwapped]);
-            }
-            const SkPoint& oEndPt = coincidence.fPts[1][!oStartSwapped];
-            if (endT < 1 || oEndT < 1
-                    || thisOne.isMissing(endT, oEndPt) || other.isMissing(oEndT, oEndPt)) {
-                other.addTPair(oEndT, &thisOne, endT, true, oEndPt,
-                        coincidence.fPts[0][!oStartSwapped]);
-            }
-        }
-    #if DEBUG_CONCIDENT
-        thisOne.debugShowTs("+");
-        other.debugShowTs("o");
-    #endif
-    }
-    // if there are multiple pairs of coincidence that share an edge, see if the opposite
-    // are also coincident
-    for (int index = 0; index < count - 1; ++index) {
-        const SkCoincidence& coincidence = fCoincidences[index];
-        int thisIndex = coincidence.fSegments[0];
-        SkOpContour* otherContour = coincidence.fOther;
-        int otherIndex = coincidence.fSegments[1];
-        for (int idx2 = 1; idx2 < count; ++idx2) {
-            const SkCoincidence& innerCoin = fCoincidences[idx2];
-            int innerThisIndex = innerCoin.fSegments[0];
-            if (thisIndex == innerThisIndex) {
-                checkCoincidentPair(coincidence, 1, innerCoin, 1, false);
-            }
-            if (this == otherContour && otherIndex == innerThisIndex) {
-                checkCoincidentPair(coincidence, 0, innerCoin, 1, false);
-            }
-            SkOpContour* innerOtherContour = innerCoin.fOther;
-            innerThisIndex = innerCoin.fSegments[1];
-            if (this == innerOtherContour && thisIndex == innerThisIndex) {
-                checkCoincidentPair(coincidence, 1, innerCoin, 0, false);
-            }
-            if (otherContour == innerOtherContour && otherIndex == innerThisIndex) {
-                checkCoincidentPair(coincidence, 0, innerCoin, 0, false);
-            }
-        }
-    }
-}
-
-bool SkOpContour::addPartialCoincident(int index, SkOpContour* other, int otherIndex,
-        const SkIntersections& ts, int ptIndex, bool swap) {
-    SkPoint pt0 = ts.pt(ptIndex).asSkPoint();
-    SkPoint pt1 = ts.pt(ptIndex + 1).asSkPoint();
-    if (SkDPoint::ApproximatelyEqual(pt0, pt1)) {
-        // FIXME: one could imagine a case where it would be incorrect to ignore this
-        // suppose two self-intersecting cubics overlap to form a partial coincidence --
-        // although it isn't clear why the regular coincidence could wouldn't pick this up
-        // this is exceptional enough to ignore for now
-        return false;
-    }
-    SkCoincidence& coincidence = fPartialCoincidences.push_back();
-    coincidence.fOther = other;
-    coincidence.fSegments[0] = index;
-    coincidence.fSegments[1] = otherIndex;
-    coincidence.fTs[swap][0] = ts[0][ptIndex];
-    coincidence.fTs[swap][1] = ts[0][ptIndex + 1];
-    coincidence.fTs[!swap][0] = ts[1][ptIndex];
-    coincidence.fTs[!swap][1] = ts[1][ptIndex + 1];
-    coincidence.fPts[0][0] = coincidence.fPts[1][0] = pt0;
-    coincidence.fPts[0][1] = coincidence.fPts[1][1] = pt1;
-    coincidence.fNearly[0] = 0;
-    coincidence.fNearly[1] = 0;
-    return true;
-}
-
-void SkOpContour::align(const SkOpSegment::AlignedSpan& aligned, bool swap,
-        SkCoincidence* coincidence) {
-    for (int idx2 = 0; idx2 < 2; ++idx2) {
-        if (coincidence->fPts[0][idx2] == aligned.fOldPt
-                && coincidence->fTs[swap][idx2] == aligned.fOldT) {
-            SkASSERT(SkDPoint::RoughlyEqual(coincidence->fPts[0][idx2], aligned.fPt));
-            coincidence->fPts[0][idx2] = aligned.fPt;
-            SkASSERT(way_roughly_equal(coincidence->fTs[swap][idx2], aligned.fT));
-            coincidence->fTs[swap][idx2] = aligned.fT;
-        }
-    }
-}
-
-void SkOpContour::alignCoincidence(const SkOpSegment::AlignedSpan& aligned,
-        SkTArray<SkCoincidence, true>* coincidences) {
-    int count = coincidences->count();
-    for (int index = 0; index < count; ++index) {
-        SkCoincidence& coincidence = (*coincidences)[index];
-        int thisIndex = coincidence.fSegments[0];
-        const SkOpSegment* thisOne = &fSegments[thisIndex];
-        const SkOpContour* otherContour = coincidence.fOther;
-        int otherIndex = coincidence.fSegments[1];
-        const SkOpSegment* other = &otherContour->fSegments[otherIndex];
-        if (thisOne == aligned.fOther1 && other == aligned.fOther2) {
-            align(aligned, false, &coincidence);
-        } else if (thisOne == aligned.fOther2 && other == aligned.fOther1) {
-            align(aligned, true, &coincidence);
-        }
-    }
-}
-
-void SkOpContour::alignTPt(int segmentIndex, const SkOpContour* other, int otherIndex, 
-        bool swap, int tIndex, SkIntersections* ts, SkPoint* point) const {
-    int zeroPt;
-    if ((zeroPt = alignT(swap, tIndex, ts)) >= 0) {
-        alignPt(segmentIndex, point, zeroPt);
-    }
-    if ((zeroPt = other->alignT(!swap, tIndex, ts)) >= 0) {
-        other->alignPt(otherIndex, point, zeroPt);
-    }
-}
-
-void SkOpContour::alignPt(int index, SkPoint* point, int zeroPt) const {
-    const SkOpSegment& segment = fSegments[index];
-    if (0 == zeroPt) {     
-        *point = segment.pts()[0];
-    } else {
-        *point = segment.pts()[SkPathOpsVerbToPoints(segment.verb())];
-    }
-}
-
-int SkOpContour::alignT(bool swap, int tIndex, SkIntersections* ts) const {
-    double tVal = (*ts)[swap][tIndex];
-    if (tVal != 0 && precisely_zero(tVal)) {
-        ts->set(swap, tIndex, 0);
-        return 0;
-    } 
-     if (tVal != 1 && precisely_equal(tVal, 1)) {
-        ts->set(swap, tIndex, 1);
-        return 1;
-    }
-    return -1;
-}
-
-bool SkOpContour::calcAngles() {
-    int segmentCount = fSegments.count();
-    for (int test = 0; test < segmentCount; ++test) {
-        if (!fSegments[test].calcAngles()) {
-            return false;
-        }
-    }
-    return true;
-}
-
-void SkOpContour::calcCoincidentWinding() {
-    int count = fCoincidences.count();
-#if DEBUG_CONCIDENT
-    if (count > 0) {
-        SkDebugf("%s count=%d\n", __FUNCTION__, count);
-    }
-#endif
-    for (int index = 0; index < count; ++index) {
-        SkCoincidence& coincidence = fCoincidences[index];
-         calcCommonCoincidentWinding(coincidence);
-    }
-}
-
-void SkOpContour::calcPartialCoincidentWinding() {
-    int count = fPartialCoincidences.count();
-#if DEBUG_CONCIDENT
-    if (count > 0) {
-        SkDebugf("%s count=%d\n", __FUNCTION__, count);
-    }
-#endif
-    for (int index = 0; index < count; ++index) {
-        SkCoincidence& coincidence = fPartialCoincidences[index];
-        calcCommonCoincidentWinding(coincidence);
-    }
-    // if there are multiple pairs of partial coincidence that share an edge, see if the opposite
-    // are also coincident
-    for (int index = 0; index < count - 1; ++index) {
-        const SkCoincidence& coincidence = fPartialCoincidences[index];
-        int thisIndex = coincidence.fSegments[0];
-        SkOpContour* otherContour = coincidence.fOther;
-        int otherIndex = coincidence.fSegments[1];
-        for (int idx2 = 1; idx2 < count; ++idx2) {
-            const SkCoincidence& innerCoin = fPartialCoincidences[idx2];
-            int innerThisIndex = innerCoin.fSegments[0];
-            if (thisIndex == innerThisIndex) {
-                checkCoincidentPair(coincidence, 1, innerCoin, 1, true);
-            }
-            if (this == otherContour && otherIndex == innerThisIndex) {
-                checkCoincidentPair(coincidence, 0, innerCoin, 1, true);
-            }
-            SkOpContour* innerOtherContour = innerCoin.fOther;
-            innerThisIndex = innerCoin.fSegments[1];
-            if (this == innerOtherContour && thisIndex == innerThisIndex) {
-                checkCoincidentPair(coincidence, 1, innerCoin, 0, true);
-            }
-            if (otherContour == innerOtherContour && otherIndex == innerThisIndex) {
-                checkCoincidentPair(coincidence, 0, innerCoin, 0, true);
-            }
-        }
-    }
-}
-
-void SkOpContour::checkCoincidentPair(const SkCoincidence& oneCoin, int oneIdx,
-        const SkCoincidence& twoCoin, int twoIdx, bool partial) {
-    SkASSERT((oneIdx ? this : oneCoin.fOther) == (twoIdx ? this : twoCoin.fOther));
-    SkASSERT(oneCoin.fSegments[!oneIdx] == twoCoin.fSegments[!twoIdx]);
-    // look for common overlap
-    double min = SK_ScalarMax;
-    double max = SK_ScalarMin;
-    double min1 = oneCoin.fTs[!oneIdx][0];
-    double max1 = oneCoin.fTs[!oneIdx][1];
-    double min2 = twoCoin.fTs[!twoIdx][0];
-    double max2 = twoCoin.fTs[!twoIdx][1];
-    bool cancelers = (min1 < max1) != (min2 < max2);
-    if (min1 > max1) {
-        SkTSwap(min1, max1);
-    }
-    if (min2 > max2) {
-        SkTSwap(min2, max2);
-    }
-    if (between(min1, min2, max1)) {
-        min = min2;
-    }
-    if (between(min1, max2, max1)) {
-        max = max2;
-    }
-    if (between(min2, min1, max2)) {
-        min = SkTMin(min, min1);
-    }
-    if (between(min2, max1, max2)) {
-        max = SkTMax(max, max1);
-    }
-    if (min >= max) {
-        return;  // no overlap
-    }
-    // look to see if opposite are different segments
-    int seg1Index = oneCoin.fSegments[oneIdx];
-    int seg2Index = twoCoin.fSegments[twoIdx];
-    if (seg1Index == seg2Index) {
-        return;
-    }
-    SkOpContour* contour1 = oneIdx ? oneCoin.fOther : this;
-    SkOpContour* contour2 = twoIdx ? twoCoin.fOther : this;
-    SkOpSegment* segment1 = &contour1->fSegments[seg1Index];
-    SkOpSegment* segment2 = &contour2->fSegments[seg2Index];
-    // find opposite t value ranges corresponding to reference min/max range
-    const SkOpContour* refContour = oneIdx ? this : oneCoin.fOther;
-    const int refSegIndex = oneCoin.fSegments[!oneIdx];
-    const SkOpSegment* refSegment = &refContour->fSegments[refSegIndex];
-    int seg1Start = segment1->findOtherT(min, refSegment);
-    int seg1End = segment1->findOtherT(max, refSegment);
-    int seg2Start = segment2->findOtherT(min, refSegment);
-    int seg2End = segment2->findOtherT(max, refSegment);
-    // if the opposite pairs already contain min/max, we're done
-    if (seg1Start >= 0 && seg1End >= 0 && seg2Start >= 0 && seg2End >= 0) {
-        return;
-    }
-    double loEnd = SkTMin(min1, min2);
-    double hiEnd = SkTMax(max1, max2);
-    // insert the missing coincident point(s)
-    double missingT1 = -1;
-    double otherT1 = -1;
-    if (seg1Start < 0) {
-        if (seg2Start < 0) {
-            return;
-        }
-        missingT1 = segment1->calcMissingTStart(refSegment, loEnd, min, max, hiEnd,
-                segment2, seg1End);
-        if (missingT1 < 0) {
-            return;
-        }
-        const SkOpSpan* missingSpan = &segment2->span(seg2Start);
-        otherT1 = missingSpan->fT;
-    } else if (seg2Start < 0) {
-        SkASSERT(seg1Start >= 0);
-        missingT1 = segment2->calcMissingTStart(refSegment, loEnd, min, max, hiEnd,
-                segment1, seg2End);
-        if (missingT1 < 0) {
-            return;
-        }
-        const SkOpSpan* missingSpan = &segment1->span(seg1Start);
-        otherT1 = missingSpan->fT;
-    }
-    SkPoint missingPt1;
-    SkOpSegment* addTo1 = NULL;
-    SkOpSegment* addOther1 = seg1Start < 0 ? segment2 : segment1;
-    int minTIndex = refSegment->findExactT(min, addOther1);
-    SkASSERT(minTIndex >= 0);
-    if (missingT1 >= 0) {
-        missingPt1 = refSegment->span(minTIndex).fPt;
-        addTo1 = seg1Start < 0 ? segment1 : segment2;
-    }
-    double missingT2 = -1;
-    double otherT2 = -1;
-    if (seg1End < 0) {
-        if (seg2End < 0) {
-            return;
-        }
-        missingT2 = segment1->calcMissingTEnd(refSegment, loEnd, min, max, hiEnd,
-                segment2, seg1Start);
-        if (missingT2 < 0) {
-            return;
-        }
-        const SkOpSpan* missingSpan = &segment2->span(seg2End);
-        otherT2 = missingSpan->fT;
-    } else if (seg2End < 0) {
-        SkASSERT(seg1End >= 0);
-        missingT2 = segment2->calcMissingTEnd(refSegment, loEnd, min, max, hiEnd,
-                segment1, seg2Start);
-        if (missingT2 < 0) {
-            return;
-        }
-        const SkOpSpan* missingSpan = &segment1->span(seg1End);
-        otherT2 = missingSpan->fT;
-    }
-    SkPoint missingPt2;
-    SkOpSegment* addTo2 = NULL;
-    SkOpSegment* addOther2 = seg1End < 0 ? segment2 : segment1;
-    int maxTIndex = refSegment->findExactT(max, addOther2);
-    SkASSERT(maxTIndex >= 0);
-    if (missingT2 >= 0) {
-        missingPt2 = refSegment->span(maxTIndex).fPt;
-        addTo2 = seg1End < 0 ? segment1 : segment2;
-    }
-    if (missingT1 >= 0) {
-        addTo1->pinT(missingPt1, &missingT1);
-        addTo1->addTPair(missingT1, addOther1, otherT1, false, missingPt1);
-    } else {
-        SkASSERT(minTIndex >= 0);
-        missingPt1 = refSegment->span(minTIndex).fPt;
-    }
-    if (missingT2 >= 0) {
-        addTo2->pinT(missingPt2, &missingT2);
-        addTo2->addTPair(missingT2, addOther2, otherT2, false, missingPt2);
-    } else {
-        SkASSERT(minTIndex >= 0);
-        missingPt2 = refSegment->span(maxTIndex).fPt;
-    }
-    if (!partial) {
-        return;
-    }
-    if (cancelers) {
-        if (missingT1 >= 0) {
-            addTo1->addTCancel(missingPt1, missingPt2, addOther1);
-        } else {
-            addTo2->addTCancel(missingPt1, missingPt2, addOther2);
-        }
-    } else if (missingT1 >= 0) {
-        addTo1->addTCoincident(missingPt1, missingPt2, addTo1 == addTo2 ? missingT2 : otherT2,
-                addOther1);
-    } else {
-        addTo2->addTCoincident(missingPt2, missingPt1, addTo2 == addTo1 ? missingT1 : otherT1,
-                addOther2);
-    }
-}
-
-void SkOpContour::joinCoincidence(const SkTArray<SkCoincidence, true>& coincidences, bool partial) {
-    int count = coincidences.count();
-#if DEBUG_CONCIDENT
-    if (count > 0) {
-        SkDebugf("%s count=%d\n", __FUNCTION__, count);
-    }
-#endif
-    // look for a lineup where the partial implies another adjoining coincidence
-    for (int index = 0; index < count; ++index) {
-        const SkCoincidence& coincidence = coincidences[index];
-        int thisIndex = coincidence.fSegments[0];
-        SkOpSegment& thisOne = fSegments[thisIndex];
-        if (thisOne.done()) {
-            continue;
-        }
-        SkOpContour* otherContour = coincidence.fOther;
-        int otherIndex = coincidence.fSegments[1];
-        SkOpSegment& other = otherContour->fSegments[otherIndex];
-        if (other.done()) {
-            continue;
-        }
-        double startT = coincidence.fTs[0][0];
-        double endT = coincidence.fTs[0][1];
-        if (startT == endT) {  // this can happen in very large compares
-            continue;
-        }
-        double oStartT = coincidence.fTs[1][0];
-        double oEndT = coincidence.fTs[1][1];
-        if (oStartT == oEndT) {
-            continue;
-        }
-        bool swapStart = startT > endT;
-        bool swapOther = oStartT > oEndT;
-        const SkPoint* startPt = &coincidence.fPts[0][0];
-        const SkPoint* endPt = &coincidence.fPts[0][1];
-        if (swapStart) {
-            SkTSwap(startT, endT);
-            SkTSwap(oStartT, oEndT);
-            SkTSwap(startPt, endPt);
-        }
-        bool cancel = swapOther != swapStart;
-        int step = swapStart ? -1 : 1;
-        int oStep = swapOther ? -1 : 1;
-        double oMatchStart = cancel ? oEndT : oStartT;
-        if (partial ? startT != 0 || oMatchStart != 0 : (startT == 0) != (oMatchStart == 0)) {
-            bool added = false;
-            if (oMatchStart != 0) {
-                const SkPoint& oMatchStartPt = cancel ? *endPt : *startPt;
-                added = thisOne.joinCoincidence(&other, oMatchStart, oMatchStartPt, oStep, cancel);
-            }
-            if (!cancel && startT != 0 && !added) {
-                (void) other.joinCoincidence(&thisOne, startT, *startPt, step, cancel);
-            }
-        }
-        double oMatchEnd = cancel ? oStartT : oEndT;
-        if (partial ? endT != 1 || oMatchEnd != 1 : (endT == 1) != (oMatchEnd == 1)) {
-            bool added = false;
-            if (cancel && endT != 1 && !added) {
-                (void) other.joinCoincidence(&thisOne, endT, *endPt, -step, cancel);
-            }
-        }
-    }
-}
-
-void SkOpContour::calcCommonCoincidentWinding(const SkCoincidence& coincidence) {
-    if (coincidence.fNearly[0] && coincidence.fNearly[1]) {
-        return;
-    }
-    int thisIndex = coincidence.fSegments[0];
-    SkOpSegment& thisOne = fSegments[thisIndex];
-    if (thisOne.done()) {
-        return;
-    }
-    SkOpContour* otherContour = coincidence.fOther;
-    int otherIndex = coincidence.fSegments[1];
-    SkOpSegment& other = otherContour->fSegments[otherIndex];
-    if (other.done()) {
-        return;
-    }
-    double startT = coincidence.fTs[0][0];
-    double endT = coincidence.fTs[0][1];
-    const SkPoint* startPt = &coincidence.fPts[0][0];
-    const SkPoint* endPt = &coincidence.fPts[0][1];
-    bool cancelers;
-    if ((cancelers = startT > endT)) {
-        SkTSwap<double>(startT, endT);
-        SkTSwap<const SkPoint*>(startPt, endPt);
-    }
-    if (startT == endT) { // if span is very large, the smaller may have collapsed to nothing
-        if (endT <= 1 - FLT_EPSILON) {
-            endT += FLT_EPSILON;
-            SkASSERT(endT <= 1);
-        } else {
-            startT -= FLT_EPSILON;
-            SkASSERT(startT >= 0);
-        }
-    }
-    SkASSERT(!approximately_negative(endT - startT));
-    double oStartT = coincidence.fTs[1][0];
-    double oEndT = coincidence.fTs[1][1];
-    if (oStartT > oEndT) {
-        SkTSwap<double>(oStartT, oEndT);
-        cancelers ^= true;
-    }
-    SkASSERT(!approximately_negative(oEndT - oStartT));
-    if (cancelers) {
-        thisOne.addTCancel(*startPt, *endPt, &other);
-    } else {
-        thisOne.addTCoincident(*startPt, *endPt, endT, &other);
-    }
-#if DEBUG_CONCIDENT
-    thisOne.debugShowTs("p");
-    other.debugShowTs("o");
-#endif
-}
-
-void SkOpContour::resolveNearCoincidence() {
-    int count = fCoincidences.count();
-    for (int index = 0; index < count; ++index) {
-        SkCoincidence& coincidence = fCoincidences[index];
-        if (!coincidence.fNearly[0] || !coincidence.fNearly[1]) {
-            continue;
-        }
-        int thisIndex = coincidence.fSegments[0];
-        SkOpSegment& thisOne = fSegments[thisIndex];
-        SkOpContour* otherContour = coincidence.fOther;
-        int otherIndex = coincidence.fSegments[1];
-        SkOpSegment& other = otherContour->fSegments[otherIndex];
-        if ((thisOne.done() || other.done()) && thisOne.complete() && other.complete()) {
-            // OPTIMIZATION: remove from coincidence array
-            continue;
-        }
-    #if DEBUG_CONCIDENT
-        thisOne.debugShowTs("-");
-        other.debugShowTs("o");
-    #endif
-        double startT = coincidence.fTs[0][0];
-        double endT = coincidence.fTs[0][1];
-        bool cancelers;
-        if ((cancelers = startT > endT)) {
-            SkTSwap<double>(startT, endT);
-        }
-        if (startT == endT) { // if span is very large, the smaller may have collapsed to nothing
-            if (endT <= 1 - FLT_EPSILON) {
-                endT += FLT_EPSILON;
-                SkASSERT(endT <= 1);
-            } else {
-                startT -= FLT_EPSILON;
-                SkASSERT(startT >= 0);
-            }
-        }
-        SkASSERT(!approximately_negative(endT - startT));
-        double oStartT = coincidence.fTs[1][0];
-        double oEndT = coincidence.fTs[1][1];
-        if (oStartT > oEndT) {
-            SkTSwap<double>(oStartT, oEndT);
-            cancelers ^= true;
-        }
-        SkASSERT(!approximately_negative(oEndT - oStartT));
-        if (cancelers) {
-            thisOne.blindCancel(coincidence, &other);
-        } else {
-            thisOne.blindCoincident(coincidence, &other);
-        }
-    }
-}
-
-void SkOpContour::sortAngles() {
-    int segmentCount = fSegments.count();
-    for (int test = 0; test < segmentCount; ++test) {
-        fSegments[test].sortAngles();
-    }
-}
-
-void SkOpContour::sortSegments() {
-    int segmentCount = fSegments.count();
-    fSortedSegments.push_back_n(segmentCount);
-    for (int test = 0; test < segmentCount; ++test) {
-        fSortedSegments[test] = &fSegments[test];
-    }
-    SkTQSort<SkOpSegment>(fSortedSegments.begin(), fSortedSegments.end() - 1);
-    fFirstSorted = 0;
+    return nullptr;
 }
 
 void SkOpContour::toPath(SkPathWriter* path) const {
-    int segmentCount = fSegments.count();
-    const SkPoint& pt = fSegments.front().pts()[0];
+    const SkPoint& pt = fHead.pts()[0];
     path->deferredMove(pt);
-    for (int test = 0; test < segmentCount; ++test) {
-        fSegments[test].addCurveTo(0, 1, path, true);
-    }
+    const SkOpSegment* segment = &fHead;
+    do {
+        SkAssertResult(segment->addCurveTo(segment->head(), segment->tail(), path));
+    } while ((segment = segment->next()));
     path->close();
 }
 
-void SkOpContour::topSortableSegment(const SkPoint& topLeft, SkPoint* bestXY,
-        SkOpSegment** topStart) {
-    int segmentCount = fSortedSegments.count();
-    SkASSERT(segmentCount > 0);
-    int sortedIndex = fFirstSorted;
-    fDone = true;  // may be cleared below
-    for ( ; sortedIndex < segmentCount; ++sortedIndex) {
-        SkOpSegment* testSegment = fSortedSegments[sortedIndex];
-        if (testSegment->done()) {
-            if (sortedIndex == fFirstSorted) {
-                ++fFirstSorted;
-            }
+void SkOpContour::toReversePath(SkPathWriter* path) const {
+    const SkPoint& pt = fTail->pts()[0];
+    path->deferredMove(pt);
+    const SkOpSegment* segment = fTail;
+    do {
+        SkAssertResult(segment->addCurveTo(segment->tail(), segment->head(), path));
+    } while ((segment = segment->prev()));
+    path->close();
+}
+
+SkOpSegment* SkOpContour::undoneSegment(SkOpSpanBase** startPtr, SkOpSpanBase** endPtr) {
+    SkOpSegment* segment = &fHead;
+    do {
+        if (segment->done()) {
             continue;
         }
-        fDone = false;
-        SkPoint testXY = testSegment->activeLeftTop(NULL);
-        if (*topStart) {
-            if (testXY.fY < topLeft.fY) {
-                continue;
-            }
-            if (testXY.fY == topLeft.fY && testXY.fX < topLeft.fX) {
-                continue;
-            }
-            if (bestXY->fY < testXY.fY) {
-                continue;
-            }
-            if (bestXY->fY == testXY.fY && bestXY->fX < testXY.fX) {
-                continue;
-            }
-        }
-        *topStart = testSegment;
-        *bestXY = testXY;
-    }
-}
-
-SkOpSegment* SkOpContour::undoneSegment(int* start, int* end) {
-    int segmentCount = fSegments.count();
-    for (int test = 0; test < segmentCount; ++test) {
-        SkOpSegment* testSegment = &fSegments[test];
-        if (testSegment->done()) {
-            continue;
-        }
-        testSegment->undoneSpan(start, end);
-        return testSegment;
-    }
-    return NULL;
-}
-
-#if DEBUG_SHOW_WINDING
-int SkOpContour::debugShowWindingValues(int totalSegments, int ofInterest) {
-    int count = fSegments.count();
-    int sum = 0;
-    for (int index = 0; index < count; ++index) {
-        sum += fSegments[index].debugShowWindingValues(totalSegments, ofInterest);
-    }
-//      SkDebugf("%s sum=%d\n", __FUNCTION__, sum);
-    return sum;
-}
-
-void SkOpContour::debugShowWindingValues(const SkTArray<SkOpContour*, true>& contourList) {
-//     int ofInterest = 1 << 1 | 1 << 5 | 1 << 9 | 1 << 13;
-//    int ofInterest = 1 << 4 | 1 << 8 | 1 << 12 | 1 << 16;
-    int ofInterest = 1 << 5 | 1 << 8;
-    int total = 0;
-    int index;
-    for (index = 0; index < contourList.count(); ++index) {
-        total += contourList[index]->segments().count();
-    }
-    int sum = 0;
-    for (index = 0; index < contourList.count(); ++index) {
-        sum += contourList[index]->debugShowWindingValues(total, ofInterest);
-    }
-//       SkDebugf("%s total=%d\n", __FUNCTION__, sum);
-}
-#endif
-
-void SkOpContour::setBounds() {
-    int count = fSegments.count();
-    if (count == 0) {
-        SkDebugf("%s empty contour\n", __FUNCTION__);
-        SkASSERT(0);
-        // FIXME: delete empty contour?
-        return;
-    }
-    fBounds = fSegments.front().bounds();
-    for (int index = 1; index < count; ++index) {
-        fBounds.add(fSegments[index].bounds());
-    }
+        segment->undoneSpan(startPtr, endPtr);
+        return segment;
+    } while ((segment = segment->next()));
+    return nullptr;
 }
diff --git a/gfx/skia/skia/src/pathops/SkOpContour.h b/gfx/skia/skia/src/pathops/SkOpContour.h
index d1b3cd0179da..d0e09a3a7045 100644
--- a/gfx/skia/skia/src/pathops/SkOpContour.h
+++ b/gfx/skia/skia/src/pathops/SkOpContour.h
@@ -8,31 +8,24 @@
 #define SkOpContour_DEFINED
 
 #include "SkOpSegment.h"
-#include "SkTArray.h"
+#include "SkTDArray.h"
+#include "SkTSort.h"
 
-#if defined(SK_DEBUG) || !FORCE_RELEASE
-#include "SkThread.h"
-#endif
-
-class SkIntersections;
-class SkOpContour;
+class SkChunkAlloc;
+enum class SkOpRayDir;
+struct SkOpRayHit;
 class SkPathWriter;
 
-struct SkCoincidence {
-    SkOpContour* fOther;
-    int fSegments[2];
-    double fTs[2][2];
-    SkPoint fPts[2][2];
-    int fNearly[2];
-};
-
 class SkOpContour {
 public:
     SkOpContour() {
         reset();
-#if defined(SK_DEBUG) || !FORCE_RELEASE
-        fID = sk_atomic_inc(&SkPathOpsDebug::gContourID);
-#endif
+    }
+
+    ~SkOpContour() {
+        if (fNext) {
+            fNext->~SkOpContour();
+        }
     }
 
     bool operator<(const SkOpContour& rh) const {
@@ -41,208 +34,334 @@ public:
                 : fBounds.fTop < rh.fBounds.fTop;
     }
 
-    bool addCoincident(int index, SkOpContour* other, int otherIndex,
-                       const SkIntersections& ts, bool swap);
-    void addCoincidentPoints();
+    void addAlignIntersections(SkOpContourHead* contourList, SkChunkAlloc* allocator) {
+        SkASSERT(fCount > 0);
+        SkOpSegment* segment = &fHead;
+        do {
+            segment->addAlignIntersections(contourList, allocator);
+        } while ((segment = segment->next()));
+    }
 
-    void addCross(const SkOpContour* crosser) {
-#ifdef DEBUG_CROSS
-        for (int index = 0; index < fCrosses.count(); ++index) {
-            SkASSERT(fCrosses[index] != crosser);
+    void addConic(SkPoint pts[3], SkScalar weight, SkChunkAlloc* allocator) {
+        appendSegment(allocator).addConic(pts, weight, this);
+    }
+
+    void addCubic(SkPoint pts[4], SkChunkAlloc* allocator) {
+        appendSegment(allocator).addCubic(pts, this);
+    }
+
+    SkOpSegment* addCurve(SkPath::Verb verb, const SkPoint pts[4], SkChunkAlloc* allocator);
+
+    void addLine(SkPoint pts[2], SkChunkAlloc* allocator) {
+        appendSegment(allocator).addLine(pts, this);
+    }
+
+    void addQuad(SkPoint pts[3], SkChunkAlloc* allocator) {
+        appendSegment(allocator).addQuad(pts, this);
+    }
+
+    void align() {
+        SkASSERT(fCount > 0);
+        SkOpSegment* segment = &fHead;
+        do {
+            segment->align();
+        } while ((segment = segment->next()));
+    }
+
+    SkOpSegment& appendSegment(SkChunkAlloc* allocator) {
+        SkOpSegment* result = fCount++
+                ? SkOpTAllocator<SkOpSegment>::Allocate(allocator) : &fHead;
+        result->setPrev(fTail);
+        if (fTail) {
+            fTail->setNext(result);
         }
-#endif
-        fCrosses.push_back(crosser);
+        fTail = result;
+        return *result;
     }
 
-    void addCubic(const SkPoint pts[4]) {
-        fSegments.push_back().addCubic(pts, fOperand, fXor);
-        fContainsCurves = fContainsCubics = true;
-    }
-
-    int addLine(const SkPoint pts[2]) {
-        fSegments.push_back().addLine(pts, fOperand, fXor);
-        return fSegments.count();
-    }
-
-    void addOtherT(int segIndex, int tIndex, double otherT, int otherIndex) {
-        fSegments[segIndex].addOtherT(tIndex, otherT, otherIndex);
-    }
-
-    bool addPartialCoincident(int index, SkOpContour* other, int otherIndex,
-                       const SkIntersections& ts, int ptIndex, bool swap);
-
-    int addQuad(const SkPoint pts[3]) {
-        fSegments.push_back().addQuad(pts, fOperand, fXor);
-        fContainsCurves = true;
-        return fSegments.count();
-    }
-
-    int addT(int segIndex, SkOpContour* other, int otherIndex, const SkPoint& pt, double newT) {
-        setContainsIntercepts();
-        return fSegments[segIndex].addT(&other->fSegments[otherIndex], pt, newT);
-    }
-
-    int addSelfT(int segIndex, const SkPoint& pt, double newT) {
-        setContainsIntercepts();
-        return fSegments[segIndex].addSelfT(pt, newT);
-    }
-
-    void align(const SkOpSegment::AlignedSpan& aligned, bool swap, SkCoincidence* coincidence);
-    void alignCoincidence(const SkOpSegment::AlignedSpan& aligned,
-            SkTArray<SkCoincidence, true>* coincidences);
-
-    void alignCoincidence(const SkOpSegment::AlignedSpan& aligned) {
-        alignCoincidence(aligned, &fCoincidences);
-        alignCoincidence(aligned, &fPartialCoincidences);
-    }
-
-    void alignMultiples(SkTDArray<SkOpSegment::AlignedSpan>* aligned) {
-        int segmentCount = fSegments.count();
-        for (int sIndex = 0; sIndex < segmentCount; ++sIndex) {
-            SkOpSegment& segment = fSegments[sIndex];
-            if (segment.hasMultiples()) {
-                segment.alignMultiples(aligned);
-            }
+    SkOpContour* appendContour(SkChunkAlloc* allocator) {
+        SkOpContour* contour = SkOpTAllocator<SkOpContour>::New(allocator);
+        contour->setNext(nullptr);
+        SkOpContour* prev = this;
+        SkOpContour* next;
+        while ((next = prev->next())) {
+            prev = next;
         }
+        prev->setNext(contour);
+        return contour;
     }
-
-    void alignTPt(int segmentIndex, const SkOpContour* other, int otherIndex,
-                  bool swap, int tIndex, SkIntersections* ts, SkPoint* point) const;
-
+    
     const SkPathOpsBounds& bounds() const {
         return fBounds;
     }
 
-    bool calcAngles();
-    void calcCoincidentWinding();
-    void calcPartialCoincidentWinding();
-
-    void checkDuplicates() {
-        int segmentCount = fSegments.count();
-        for (int sIndex = 0; sIndex < segmentCount; ++sIndex) {
-            SkOpSegment& segment = fSegments[sIndex];
-            if (segment.count() > 2) {
-                segment.checkDuplicates();
-            }
-        }
-    }
-
-    void checkEnds() {
-        if (!fContainsCurves) {
-            return;
-        }
-        int segmentCount = fSegments.count();
-        for (int sIndex = 0; sIndex < segmentCount; ++sIndex) {
-            SkOpSegment* segment = &fSegments[sIndex];
-            if (segment->verb() == SkPath::kLine_Verb) {
-                continue;
-            }
-            if (segment->done()) {
-                continue;   // likely coincident, nothing to do
-            }
-            segment->checkEnds();
-        }
-    }
-
-    void checkMultiples() {
-        int segmentCount = fSegments.count();
-        for (int sIndex = 0; sIndex < segmentCount; ++sIndex) {
-            SkOpSegment& segment = fSegments[sIndex];
-            if (segment.count() > 2) {
-                segment.checkMultiples();
-                fMultiples |= segment.hasMultiples();
-            }
-        }
-    }
-
-    void checkSmall() {
-        int segmentCount = fSegments.count();
-        for (int sIndex = 0; sIndex < segmentCount; ++sIndex) {
-            SkOpSegment& segment = fSegments[sIndex];
-            // OPTIMIZATION : skip segments that are done?
-            if (segment.hasSmall()) {
-                segment.checkSmall();
-            }
-        }
-    }
-
-    // if same point has different T values, choose a common T
-    void checkTiny() {
-        int segmentCount = fSegments.count();
-        if (segmentCount <= 2) {
-            return;
-        }
-        for (int sIndex = 0; sIndex < segmentCount; ++sIndex) {
-            SkOpSegment& segment = fSegments[sIndex];
-            if (segment.hasTiny()) {
-                segment.checkTiny();
-            }
-        }
+    void calcAngles(SkChunkAlloc* allocator) {
+        SkASSERT(fCount > 0);
+        SkOpSegment* segment = &fHead;
+        do {
+            segment->calcAngles(allocator);
+        } while ((segment = segment->next()));
     }
 
     void complete() {
         setBounds();
-        fContainsIntercepts = false;
     }
 
-    bool containsCubics() const {
-        return fContainsCubics;
+    int count() const {
+        return fCount;
     }
 
-    bool crosses(const SkOpContour* crosser) const {
-        for (int index = 0; index < fCrosses.count(); ++index) {
-            if (fCrosses[index] == crosser) {
-                return true;
-            }
-        }
-        return false;
+    int debugID() const {
+        return SkDEBUGRELEASE(fID, -1);
+    }
+
+    int debugIndent() const {
+        return SkDEBUGRELEASE(fDebugIndent, 0);
+    }
+
+#if DEBUG_ACTIVE_SPANS
+    void debugShowActiveSpans() {
+        SkOpSegment* segment = &fHead;
+        do {
+            segment->debugShowActiveSpans();
+        } while ((segment = segment->next()));
+    }
+#endif
+
+    const SkOpAngle* debugAngle(int id) const {
+        return SkDEBUGRELEASE(this->globalState()->debugAngle(id), nullptr);
+    }
+
+    void debugCheckHealth(const char* id, SkPathOpsDebug::GlitchLog* ) const;
+
+    SkOpContour* debugContour(int id) {
+        return SkDEBUGRELEASE(this->globalState()->debugContour(id), nullptr);
+    }
+
+    void debugMissingCoincidence(const char* id, SkPathOpsDebug::GlitchLog* log,
+                                 const SkOpCoincidence* coincidence) const;
+
+    const SkOpPtT* debugPtT(int id) const {
+        return SkDEBUGRELEASE(this->globalState()->debugPtT(id), nullptr);
+    }
+
+    const SkOpSegment* debugSegment(int id) const {
+        return SkDEBUGRELEASE(this->globalState()->debugSegment(id), nullptr);
+    }
+
+    const SkOpSpanBase* debugSpan(int id) const {
+        return SkDEBUGRELEASE(this->globalState()->debugSpan(id), nullptr);
+    }
+
+    SkOpGlobalState* globalState() const {
+        return fState; 
+    }
+
+    void debugValidate() const {
+#if DEBUG_VALIDATE
+        const SkOpSegment* segment = &fHead;
+        const SkOpSegment* prior = nullptr;
+        do {
+            segment->debugValidate();
+            SkASSERT(segment->prev() == prior);
+            prior = segment;
+        } while ((segment = segment->next()));
+        SkASSERT(prior == fTail);
+#endif
     }
 
     bool done() const {
         return fDone;
     }
 
+    void dump() const;
+    void dumpAll() const;
+    void dumpAngles() const;
+    void dumpContours() const;
+    void dumpContoursAll() const;
+    void dumpContoursAngles() const;
+    void dumpContoursPts() const;
+    void dumpContoursPt(int segmentID) const;
+    void dumpContoursSegment(int segmentID) const;
+    void dumpContoursSpan(int segmentID) const;
+    void dumpContoursSpans() const;
+    void dumpPt(int ) const;
+    void dumpPts(const char* prefix = "seg") const;
+    void dumpPtsX(const char* prefix) const;
+    void dumpSegment(int ) const;
+    void dumpSegments(const char* prefix = "seg", SkPathOp op = (SkPathOp) -1) const;
+    void dumpSpan(int ) const;
+    void dumpSpans() const;
+
     const SkPoint& end() const {
-        const SkOpSegment& segment = fSegments.back();
-        return segment.pts()[SkPathOpsVerbToPoints(segment.verb())];
+        return fTail->pts()[SkPathOpsVerbToPoints(fTail->verb())];
     }
 
-    void fixOtherTIndex() {
-        int segmentCount = fSegments.count();
-        for (int sIndex = 0; sIndex < segmentCount; ++sIndex) {
-            fSegments[sIndex].fixOtherTIndex();
-        }
+    bool findCollapsed() {
+        SkASSERT(fCount > 0);
+        SkOpSegment* segment = &fHead;
+        do {
+            segment->findCollapsed();
+        } while ((segment = segment->next()));
+        return true;
     }
 
-    bool hasMultiples() const {
-        return fMultiples;
+    SkOpSpan* findSortableTop(SkOpContour* );
+
+    SkOpSegment* first() {
+        SkASSERT(fCount > 0);
+        return &fHead;
     }
 
-    void joinCoincidence() {
-        joinCoincidence(fCoincidences, false);
-        joinCoincidence(fPartialCoincidences, true);
+    const SkOpSegment* first() const {
+        SkASSERT(fCount > 0);
+        return &fHead;
     }
 
-    SkOpSegment* nonVerticalSegment(int* start, int* end);
+    void indentDump() const {
+        SkDEBUGCODE(fDebugIndent += 2);
+    }
+
+    void init(SkOpGlobalState* globalState, bool operand, bool isXor) {
+        fState = globalState;
+        fOperand = operand;
+        fXor = isXor;
+        SkDEBUGCODE(fID = globalState->nextContourID());
+    }
+
+    int isCcw() const {
+        return fCcw;
+    }
+
+    bool isXor() const {
+        return fXor;
+    }
+
+    void markDone() {
+        SkOpSegment* segment = &fHead;
+        do {
+            segment->markAllDone();
+        } while ((segment = segment->next()));
+    }
+
+    bool missingCoincidence(SkOpCoincidence* coincidences, SkChunkAlloc* allocator) {
+        SkASSERT(fCount > 0);
+        SkOpSegment* segment = &fHead;
+        bool result = false;
+        do {
+            if (fState->angleCoincidence()) {
+#if DEBUG_ANGLE
+                segment->debugCheckAngleCoin();
+#endif
+            } else if (segment->missingCoincidence(coincidences, allocator)) {
+                result = true;
+    // FIXME: trying again loops forever in issue3651_6
+    // The continue below is speculative -- once there's an actual case that requires it,
+    // add the plumbing necessary to look for another missing coincidence in the same segment
+         //       continue; // try again in case another missing coincidence is further along
+            }
+            segment = segment->next();
+        } while (segment);
+        return result;
+    }
+
+    bool moveMultiples() {
+        SkASSERT(fCount > 0);
+        SkOpSegment* segment = &fHead;
+        do {
+            segment->moveMultiples();
+        } while ((segment = segment->next()));
+        return true;
+    }
+
+    void moveNearby() {
+        SkASSERT(fCount > 0);
+        SkOpSegment* segment = &fHead;
+        do {
+            segment->moveNearby();
+        } while ((segment = segment->next()));
+    }
+
+    SkOpContour* next() {
+        return fNext;
+    }
+
+    const SkOpContour* next() const {
+        return fNext;
+    }
 
     bool operand() const {
         return fOperand;
     }
 
+    bool oppXor() const {
+        return fOppXor;
+    }
+
+    void outdentDump() const {
+        SkDEBUGCODE(fDebugIndent -= 2);
+    }
+
+    void rayCheck(const SkOpRayHit& base, SkOpRayDir dir, SkOpRayHit** hits, SkChunkAlloc* );
+
+    void remove(SkOpContour* contour) {
+        if (contour == this) {
+            SkASSERT(fCount == 0);
+            return;
+        }
+        SkASSERT(contour->fNext == nullptr);
+        SkOpContour* prev = this;
+        SkOpContour* next;
+        while ((next = prev->next()) != contour) {
+            SkASSERT(next);
+            prev = next;
+        }
+        SkASSERT(prev);
+        prev->setNext(nullptr);
+    }
+
     void reset() {
-        fSegments.reset();
-        fBounds.set(SK_ScalarMax, SK_ScalarMax, SK_ScalarMax, SK_ScalarMax);
-        fContainsCurves = fContainsCubics = fContainsIntercepts = fDone = fMultiples = false;
+        fTail = nullptr;
+        fNext = nullptr;
+        fCount = 0;
+        fDone = false;
+        SkDEBUGCODE(fBounds.set(SK_ScalarMax, SK_ScalarMax, SK_ScalarMin, SK_ScalarMin));
+        SkDEBUGCODE(fFirstSorted = -1);
+        SkDEBUGCODE(fDebugIndent = 0);
     }
 
-    void resolveNearCoincidence();
-
-    SkTArray<SkOpSegment>& segments() {
-        return fSegments;
+    void resetReverse() {
+        SkOpContour* next = this;
+        do {
+            next->fCcw = -1;
+            next->fReverse = false;
+        } while ((next = next->next()));
     }
 
-    void setContainsIntercepts() {
-        fContainsIntercepts = true;
+    bool reversed() const {
+        return fReverse;
+    }
+
+    void setBounds() {
+        SkASSERT(fCount > 0);
+        const SkOpSegment* segment = &fHead;
+        fBounds = segment->bounds();
+        while ((segment = segment->next())) {
+            fBounds.add(segment->bounds());
+        }
+    }
+
+    void setCcw(int ccw) {
+        fCcw = ccw;
+    }
+
+    void setGlobalState(SkOpGlobalState* state) {
+        fState = state;
+    }
+
+    void setNext(SkOpContour* contour) {
+//        SkASSERT(!fNext == !!contour);
+        fNext = contour;
     }
 
     void setOperand(bool isOp) {
@@ -251,107 +370,67 @@ public:
 
     void setOppXor(bool isOppXor) {
         fOppXor = isOppXor;
-        int segmentCount = fSegments.count();
-        for (int test = 0; test < segmentCount; ++test) {
-            fSegments[test].setOppXor(isOppXor);
-        }
+    }
+
+    void setReverse() {
+        fReverse = true;
     }
 
     void setXor(bool isXor) {
         fXor = isXor;
     }
 
-    void sortAngles();
-    void sortSegments();
+    SkPath::Verb simplifyCubic(SkPoint pts[4]);
 
-    const SkPoint& start() const {
-        return fSegments.front().pts()[0];
+    void sortAngles() {
+        SkASSERT(fCount > 0);
+        SkOpSegment* segment = &fHead;
+        do {
+            segment->sortAngles();
+        } while ((segment = segment->next()));
     }
 
-    void toPath(SkPathWriter* path) const;
+    const SkPoint& start() const {
+        return fHead.pts()[0];
+    }
 
     void toPartialBackward(SkPathWriter* path) const {
-        int segmentCount = fSegments.count();
-        for (int test = segmentCount - 1; test >= 0; --test) {
-            fSegments[test].addCurveTo(1, 0, path, true);
-        }
+        const SkOpSegment* segment = fTail;
+        do {
+            SkAssertResult(segment->addCurveTo(segment->tail(), segment->head(), path));
+        } while ((segment = segment->prev()));
     }
 
     void toPartialForward(SkPathWriter* path) const {
-        int segmentCount = fSegments.count();
-        for (int test = 0; test < segmentCount; ++test) {
-            fSegments[test].addCurveTo(0, 1, path, true);
-        }
+        const SkOpSegment* segment = &fHead;
+        do {
+            SkAssertResult(segment->addCurveTo(segment->head(), segment->tail(), path));
+        } while ((segment = segment->next()));
     }
 
-    void topSortableSegment(const SkPoint& topLeft, SkPoint* bestXY, SkOpSegment** topStart);
-    SkOpSegment* undoneSegment(int* start, int* end);
-
-    int updateSegment(int index, const SkPoint* pts) {
-        SkOpSegment& segment = fSegments[index];
-        segment.updatePts(pts);
-        return SkPathOpsVerbToPoints(segment.verb()) + 1;
-    }
-
-#if DEBUG_TEST
-    SkTArray<SkOpSegment>& debugSegments() {
-        return fSegments;
-    }
-#endif
-
-#if DEBUG_ACTIVE_SPANS || DEBUG_ACTIVE_SPANS_FIRST_ONLY
-    void debugShowActiveSpans() {
-        for (int index = 0; index < fSegments.count(); ++index) {
-            fSegments[index].debugShowActiveSpans();
-        }
-    }
-#endif
-
-#if DEBUG_SHOW_WINDING
-    int debugShowWindingValues(int totalSegments, int ofInterest);
-    static void debugShowWindingValues(const SkTArray<SkOpContour*, true>& contourList);
-#endif
-
-    // available to test routines only
-    void dump() const;
-    void dumpAngles() const;
-    void dumpCoincidence(const SkCoincidence& ) const;
-    void dumpCoincidences() const;
-    void dumpPt(int ) const;
-    void dumpPts() const;
-    void dumpSpan(int ) const;
-    void dumpSpans() const;
+    void toReversePath(SkPathWriter* path) const;
+    void toPath(SkPathWriter* path) const;
+    SkOpSegment* undoneSegment(SkOpSpanBase** startPtr, SkOpSpanBase** endPtr);
 
 private:
-    void alignPt(int index, SkPoint* point, int zeroPt) const;
-    int alignT(bool swap, int tIndex, SkIntersections* ts) const;
-    void calcCommonCoincidentWinding(const SkCoincidence& );
-    void checkCoincidentPair(const SkCoincidence& oneCoin, int oneIdx,
-                             const SkCoincidence& twoCoin, int twoIdx, bool partial);
-    void joinCoincidence(const SkTArray<SkCoincidence, true>& , bool partial);
-    void setBounds();
-
-    SkTArray<SkOpSegment> fSegments;
-    SkTArray<SkOpSegment*, true> fSortedSegments;
-    int fFirstSorted;
-    SkTArray<SkCoincidence, true> fCoincidences;
-    SkTArray<SkCoincidence, true> fPartialCoincidences;
-    SkTArray<const SkOpContour*, true> fCrosses;
+    SkOpGlobalState* fState;
+    SkOpSegment fHead;
+    SkOpSegment* fTail;
+    SkOpContour* fNext;
     SkPathOpsBounds fBounds;
-    bool fContainsIntercepts;  // FIXME: is this used by anybody?
-    bool fContainsCubics;
-    bool fContainsCurves;
-    bool fDone;
-    bool fMultiples;  // set if some segment has multiple identical intersections with other curves
+    int fCcw;
+    int fCount;
+    int fFirstSorted;
+    bool fDone;  // set by find top segment
     bool fOperand;  // true for the second argument to a binary operator
-    bool fXor;
-    bool fOppXor;
-#if defined(SK_DEBUG) || !FORCE_RELEASE
-    int debugID() const { return fID; }
-    int fID;
-#else
-    int debugID() const { return -1; }
-#endif
+    bool fReverse;  // true if contour should be reverse written to path (used only by fix winding)
+    bool fXor;  // set if original path had even-odd fill
+    bool fOppXor;  // set if opposite path had even-odd fill
+    SkDEBUGCODE(int fID);
+    SkDEBUGCODE(mutable int fDebugIndent);
+};
+
+class SkOpContourHead : public SkOpContour {
 };
 
 #endif
diff --git a/gfx/skia/skia/src/pathops/SkOpCubicHull.cpp b/gfx/skia/skia/src/pathops/SkOpCubicHull.cpp
new file mode 100644
index 000000000000..6b17608e8442
--- /dev/null
+++ b/gfx/skia/skia/src/pathops/SkOpCubicHull.cpp
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "SkPathOpsCubic.h"
+
+static bool rotate(const SkDCubic& cubic, int zero, int index, SkDCubic& rotPath) {
+    double dy = cubic[index].fY - cubic[zero].fY;
+    double dx = cubic[index].fX - cubic[zero].fX;
+    if (approximately_zero(dy)) {
+        if (approximately_zero(dx)) {
+            return false;
+        }
+        rotPath = cubic;
+        if (dy) {
+            rotPath[index].fY = cubic[zero].fY;
+            int mask = other_two(index, zero);
+            int side1 = index ^ mask;
+            int side2 = zero ^ mask;
+            if (approximately_equal(cubic[side1].fY, cubic[zero].fY)) {
+                rotPath[side1].fY = cubic[zero].fY;
+            }
+            if (approximately_equal(cubic[side2].fY, cubic[zero].fY)) {
+                rotPath[side2].fY = cubic[zero].fY;
+            }
+        }
+        return true;
+    }
+    for (int index = 0; index < 4; ++index) {
+        rotPath[index].fX = cubic[index].fX * dx + cubic[index].fY * dy;
+        rotPath[index].fY = cubic[index].fY * dx - cubic[index].fX * dy;
+    }
+    return true;
+}
+
+
+// Returns 0 if negative, 1 if zero, 2 if positive
+static int side(double x) {
+    return (x > 0) + (x >= 0);
+}
+
+/* Given a cubic, find the convex hull described by the end and control points.
+   The hull may have 3 or 4 points. Cubics that degenerate into a point or line
+   are not considered.
+
+   The hull is computed by assuming that three points, if unique and non-linear,
+   form a triangle. The fourth point may replace one of the first three, may be
+   discarded if in the triangle or on an edge, or may be inserted between any of
+   the three to form a convex quadralateral.
+
+   The indices returned in order describe the convex hull.
+*/
+int SkDCubic::convexHull(char order[4]) const {
+    size_t index;
+    // find top point
+    size_t yMin = 0;
+    for (index = 1; index < 4; ++index) {
+        if (fPts[yMin].fY > fPts[index].fY || (fPts[yMin].fY == fPts[index].fY
+                && fPts[yMin].fX > fPts[index].fX)) {
+            yMin = index;
+        }
+    }
+    order[0] = yMin;
+    int midX = -1;
+    int backupYMin = -1;
+    for (int pass = 0; pass < 2; ++pass) {
+        for (index = 0; index < 4; ++index) {
+            if (index == yMin) {
+                continue;
+            }
+            // rotate line from (yMin, index) to axis
+            // see if remaining two points are both above or below
+            // use this to find mid
+            int mask = other_two(yMin, index);
+            int side1 = yMin ^ mask;
+            int side2 = index ^ mask;
+            SkDCubic rotPath;
+            if (!rotate(*this, yMin, index, rotPath)) { // ! if cbc[yMin]==cbc[idx]
+                order[1] = side1;
+                order[2] = side2;
+                return 3;
+            }
+            int sides = side(rotPath[side1].fY - rotPath[yMin].fY);
+            sides ^= side(rotPath[side2].fY - rotPath[yMin].fY);
+            if (sides == 2) { // '2' means one remaining point <0, one >0
+                if (midX >= 0) {
+                    // one of the control points is equal to an end point
+                    order[0] = 0;
+                    order[1] = 3;
+                    if (fPts[1] == fPts[0] || fPts[1] == fPts[3]) {
+                        order[2] = 2;
+                        return 3;
+                    }
+                    if (fPts[2] == fPts[0] || fPts[2] == fPts[3]) {
+                        order[2] = 1;
+                        return 3;
+                    }
+                    // one of the control points may be very nearly but not exactly equal -- 
+                    double dist1_0 = fPts[1].distanceSquared(fPts[0]);
+                    double dist1_3 = fPts[1].distanceSquared(fPts[3]);
+                    double dist2_0 = fPts[2].distanceSquared(fPts[0]);
+                    double dist2_3 = fPts[2].distanceSquared(fPts[3]);
+                    double smallest1distSq = SkTMin(dist1_0, dist1_3);
+                    double smallest2distSq = SkTMin(dist2_0, dist2_3);
+                    if (approximately_zero(SkTMin(smallest1distSq, smallest2distSq))) {
+                        order[2] = smallest1distSq < smallest2distSq ? 2 : 1;
+                        return 3;
+                    }
+                }
+                midX = index;
+            } else if (sides == 0) { // '0' means both to one side or the other
+                backupYMin = index;
+            }
+        }
+        if (midX >= 0) {
+            break;
+        }
+        if (backupYMin < 0) {
+            break;
+        }
+        yMin = backupYMin;
+        backupYMin = -1;
+    }
+    if (midX < 0) {
+        midX = yMin ^ 3; // choose any other point
+    }
+    int mask = other_two(yMin, midX);
+    int least = yMin ^ mask;
+    int most = midX ^ mask;
+    order[0] = yMin;
+    order[1] = least;
+
+    // see if mid value is on same side of line (least, most) as yMin
+    SkDCubic midPath;
+    if (!rotate(*this, least, most, midPath)) { // ! if cbc[least]==cbc[most]
+        order[2] = midX;
+        return 3;
+    }
+    int midSides = side(midPath[yMin].fY - midPath[least].fY);
+    midSides ^= side(midPath[midX].fY - midPath[least].fY);
+    if (midSides != 2) {  // if mid point is not between
+        order[2] = most;
+        return 3; // result is a triangle
+    }
+    order[2] = midX;
+    order[3] = most;
+    return 4; // result is a quadralateral
+}
diff --git a/gfx/skia/skia/src/pathops/SkOpEdgeBuilder.cpp b/gfx/skia/skia/src/pathops/SkOpEdgeBuilder.cpp
index 31a446b32b38..24ca9b1f5687 100644
--- a/gfx/skia/skia/src/pathops/SkOpEdgeBuilder.cpp
+++ b/gfx/skia/skia/src/pathops/SkOpEdgeBuilder.cpp
@@ -9,7 +9,7 @@
 #include "SkReduceOrder.h"
 
 void SkOpEdgeBuilder::init() {
-    fCurrentContour = NULL;
+    fCurrentContour = fContoursHead;
     fOperand = false;
     fXorMask[0] = fXorMask[1] = (fPath->getFillType() & 1) ? kEvenOdd_PathOpsMask
             : kWinding_PathOpsMask;
@@ -19,32 +19,53 @@ void SkOpEdgeBuilder::init() {
 
 void SkOpEdgeBuilder::addOperand(const SkPath& path) {
     SkASSERT(fPathVerbs.count() > 0 && fPathVerbs.end()[-1] == SkPath::kDone_Verb);
-    fPathVerbs.pop_back();
+    fPathVerbs.pop();
     fPath = &path;
     fXorMask[1] = (fPath->getFillType() & 1) ? kEvenOdd_PathOpsMask
             : kWinding_PathOpsMask;
     preFetch();
 }
 
-bool SkOpEdgeBuilder::finish() {
-    if (fUnparseable || !walk()) {
+int SkOpEdgeBuilder::count() const {
+    SkOpContour* contour = fContoursHead;
+    int count = 0;
+    while (contour) {
+        count += contour->count() > 0;
+        contour = contour->next();
+    }
+    return count;
+}
+
+bool SkOpEdgeBuilder::finish(SkChunkAlloc* allocator) {
+    fOperand = false;
+    if (fUnparseable || !walk(allocator)) {
         return false;
     }
     complete();
-    if (fCurrentContour && !fCurrentContour->segments().count()) {
-        fContours.pop_back();
+    if (fCurrentContour && !fCurrentContour->count()) {
+        fContoursHead->remove(fCurrentContour);
     }
     return true;
 }
 
 void SkOpEdgeBuilder::closeContour(const SkPoint& curveEnd, const SkPoint& curveStart) {
     if (!SkDPoint::ApproximatelyEqual(curveEnd, curveStart)) {
-        fPathVerbs.push_back(SkPath::kLine_Verb);
-        fPathPts.push_back_n(1, &curveStart);
+        *fPathVerbs.append() = SkPath::kLine_Verb;
+        *fPathPts.append() = curveStart;
     } else {
         fPathPts[fPathPts.count() - 1] = curveStart;
     }
-    fPathVerbs.push_back(SkPath::kClose_Verb);
+    *fPathVerbs.append() = SkPath::kClose_Verb;
+}
+
+// very tiny points cause numerical instability : don't allow them
+static void force_small_to_zero(SkPoint* pt) {
+    if (SkScalarAbs(pt->fX) < FLT_EPSILON_ORDERABLE_ERR) {
+        pt->fX = 0;
+    }
+    if (SkScalarAbs(pt->fY) < FLT_EPSILON_ORDERABLE_ERR) {
+        pt->fY = 0;
+    }
 }
 
 int SkOpEdgeBuilder::preFetch() {
@@ -52,8 +73,6 @@ int SkOpEdgeBuilder::preFetch() {
         fUnparseable = true;
         return 0;
     }
-    SkAutoConicToQuads quadder;
-    const SkScalar quadderTol = SK_Scalar1 / 16;
     SkPath::RawIter iter(*fPath);
     SkPoint curveStart;
     SkPoint curve[4];
@@ -67,21 +86,25 @@ int SkOpEdgeBuilder::preFetch() {
                 if (!fAllowOpenContours && lastCurve) {
                     closeContour(curve[0], curveStart);
                 }
-                fPathVerbs.push_back(verb);
-                fPathPts.push_back(pts[0]);
+                *fPathVerbs.append() = verb;
+                force_small_to_zero(&pts[0]);
+                *fPathPts.append() = pts[0];
                 curveStart = curve[0] = pts[0];
                 lastCurve = false;
                 continue;
             case SkPath::kLine_Verb:
+                force_small_to_zero(&pts[1]);
                 if (SkDPoint::ApproximatelyEqual(curve[0], pts[1])) {
-                    uint8_t lastVerb = fPathVerbs.back();
+                    uint8_t lastVerb = fPathVerbs.top();
                     if (lastVerb != SkPath::kLine_Verb && lastVerb != SkPath::kMove_Verb) {
-                        fPathPts.back() = pts[1];
+                        fPathPts.top() = pts[1];
                     }
                     continue;  // skip degenerate points
                 }
                 break;
             case SkPath::kQuad_Verb:
+                force_small_to_zero(&pts[1]);
+                force_small_to_zero(&pts[2]);
                 curve[1] = pts[1];
                 curve[2] = pts[2];
                 verb = SkReduceOrder::Quad(curve, pts);
@@ -89,19 +112,20 @@ int SkOpEdgeBuilder::preFetch() {
                     continue;  // skip degenerate points
                 }
                 break;
-            case SkPath::kConic_Verb: {
-                    const SkPoint* quadPts = quadder.computeQuads(pts, iter.conicWeight(),
-                            quadderTol);
-                    const int nQuads = quadder.countQuads();
-                    for (int i = 0; i < nQuads; ++i) {
-                       fPathVerbs.push_back(SkPath::kQuad_Verb);
-                    }
-                    fPathPts.push_back_n(nQuads * 2, quadPts);
-                    curve[0] = quadPts[nQuads * 2 - 1];
-                    lastCurve = true;
+            case SkPath::kConic_Verb:
+                force_small_to_zero(&pts[1]);
+                force_small_to_zero(&pts[2]);
+                curve[1] = pts[1];
+                curve[2] = pts[2];
+                verb = SkReduceOrder::Conic(curve, iter.conicWeight(), pts);
+                if (verb == SkPath::kMove_Verb) {
+                    continue;  // skip degenerate points
                 }
-                continue;
+                break;
             case SkPath::kCubic_Verb:
+                force_small_to_zero(&pts[1]);
+                force_small_to_zero(&pts[2]);
+                force_small_to_zero(&pts[3]);
                 curve[1] = pts[1];
                 curve[2] = pts[2];
                 curve[3] = pts[3];
@@ -117,16 +141,19 @@ int SkOpEdgeBuilder::preFetch() {
             case SkPath::kDone_Verb:
                 continue;
         }
-        fPathVerbs.push_back(verb);
+        *fPathVerbs.append() = verb;
         int ptCount = SkPathOpsVerbToPoints(verb);
-        fPathPts.push_back_n(ptCount, &pts[1]);
+        fPathPts.append(ptCount, &pts[1]);
+        if (verb == SkPath::kConic_Verb) {
+            *fWeights.append() = iter.conicWeight();
+        }
         curve[0] = pts[ptCount];
         lastCurve = true;
     } while (verb != SkPath::kDone_Verb);
     if (!fAllowOpenContours && lastCurve) {
         closeContour(curve[0], curveStart);
     }
-    fPathVerbs.push_back(SkPath::kDone_Verb);
+    *fPathVerbs.append() = SkPath::kDone_Verb;
     return fPathVerbs.count() - 1;
 }
 
@@ -135,10 +162,11 @@ bool SkOpEdgeBuilder::close() {
     return true;
 }
 
-bool SkOpEdgeBuilder::walk() {
+bool SkOpEdgeBuilder::walk(SkChunkAlloc* allocator) {
     uint8_t* verbPtr = fPathVerbs.begin();
     uint8_t* endOfFirstHalf = &verbPtr[fSecondHalf];
-    const SkPoint* pointsPtr = fPathPts.begin() - 1;
+    SkPoint* pointsPtr = fPathPts.begin() - 1;
+    SkScalar* weightPtr = fWeights.begin();
     SkPath::Verb verb;
     while ((verb = (SkPath::Verb) *verbPtr) != SkPath::kDone_Verb) {
         if (verbPtr == endOfFirstHalf) {
@@ -147,7 +175,7 @@ bool SkOpEdgeBuilder::walk() {
         verbPtr++;
         switch (verb) {
             case SkPath::kMove_Verb:
-                if (fCurrentContour) {
+                if (fCurrentContour && fCurrentContour->count()) {
                     if (fAllowOpenContours) {
                         complete();
                     } else if (!close()) {
@@ -155,21 +183,52 @@ bool SkOpEdgeBuilder::walk() {
                     }
                 }
                 if (!fCurrentContour) {
-                    fCurrentContour = fContours.push_back_n(1);
-                    fCurrentContour->setOperand(fOperand);
-                    fCurrentContour->setXor(fXorMask[fOperand] == kEvenOdd_PathOpsMask);
+                    fCurrentContour = fContoursHead->appendContour(allocator);
                 }
+                fCurrentContour->init(fGlobalState, fOperand,
+                    fXorMask[fOperand] == kEvenOdd_PathOpsMask);
                 pointsPtr += 1;
                 continue;
             case SkPath::kLine_Verb:
-                fCurrentContour->addLine(pointsPtr);
+                fCurrentContour->addLine(pointsPtr, fAllocator);
                 break;
             case SkPath::kQuad_Verb:
-                fCurrentContour->addQuad(pointsPtr);
+                fCurrentContour->addQuad(pointsPtr, fAllocator);
                 break;
-            case SkPath::kCubic_Verb:
-                fCurrentContour->addCubic(pointsPtr);
+            case SkPath::kConic_Verb:
+                fCurrentContour->addConic(pointsPtr, *weightPtr++, fAllocator);
                 break;
+            case SkPath::kCubic_Verb: {
+                // split self-intersecting cubics in two before proceeding
+                // if the cubic is convex, it doesn't self intersect.
+                SkScalar loopT;
+                if (SkDCubic::ComplexBreak(pointsPtr, &loopT)) {
+                    SkPoint cubicPair[7]; 
+                    SkChopCubicAt(pointsPtr, cubicPair, loopT);
+                    if (!SkScalarsAreFinite(&cubicPair[0].fX, SK_ARRAY_COUNT(cubicPair) * 2)) {
+                        return false;
+                    }
+                    SkPoint cStorage[2][4];
+                    SkPath::Verb v1 = SkReduceOrder::Cubic(&cubicPair[0], cStorage[0]);
+                    SkPath::Verb v2 = SkReduceOrder::Cubic(&cubicPair[3], cStorage[1]);
+                    if (v1 != SkPath::kMove_Verb && v2 != SkPath::kMove_Verb) {
+                        SkPoint* curve1 = v1 == SkPath::kCubic_Verb ? &cubicPair[0] : cStorage[0];
+                        SkPoint* curve2 = v2 == SkPath::kCubic_Verb ? &cubicPair[3] : cStorage[1];
+                        for (int index = 0; index < SkPathOpsVerbToPoints(v1); ++index) {
+                            force_small_to_zero(&curve1[index]);
+                        }
+                        for (int index = 0; index < SkPathOpsVerbToPoints(v2); ++index) {
+                            force_small_to_zero(&curve2[index]);
+                        }
+                        fCurrentContour->addCurve(v1, curve1, fAllocator);
+                        fCurrentContour->addCurve(v2, curve2, fAllocator);
+                    } else {
+                        fCurrentContour->addCubic(pointsPtr, fAllocator);
+                    }
+                } else {
+                    fCurrentContour->addCubic(pointsPtr, fAllocator);
+                }
+                } break;
             case SkPath::kClose_Verb:
                 SkASSERT(fCurrentContour);
                 if (!close()) {
@@ -180,10 +239,11 @@ bool SkOpEdgeBuilder::walk() {
                 SkDEBUGFAIL("bad verb");
                 return false;
         }
-        pointsPtr += SkPathOpsVerbToPoints(verb);
         SkASSERT(fCurrentContour);
+        fCurrentContour->debugValidate();
+        pointsPtr += SkPathOpsVerbToPoints(verb);
     }
-   if (fCurrentContour && !fAllowOpenContours && !close()) {
+   if (fCurrentContour && fCurrentContour->count() &&!fAllowOpenContours && !close()) {
        return false;
    }
    return true;
diff --git a/gfx/skia/skia/src/pathops/SkOpEdgeBuilder.h b/gfx/skia/skia/src/pathops/SkOpEdgeBuilder.h
index df0795b0c858..f11e0e4c8993 100644
--- a/gfx/skia/skia/src/pathops/SkOpEdgeBuilder.h
+++ b/gfx/skia/skia/src/pathops/SkOpEdgeBuilder.h
@@ -9,50 +9,63 @@
 
 #include "SkOpContour.h"
 #include "SkPathWriter.h"
-#include "SkTArray.h"
 
 class SkOpEdgeBuilder {
 public:
-    SkOpEdgeBuilder(const SkPathWriter& path, SkTArray<SkOpContour>& contours)
-        : fPath(path.nativePath())
-        , fContours(contours)
+    SkOpEdgeBuilder(const SkPathWriter& path, SkOpContour* contours2, SkChunkAlloc* allocator,
+            SkOpGlobalState* globalState)
+        : fAllocator(allocator)  // FIXME: replace with const, tune this
+        , fGlobalState(globalState)
+        , fPath(path.nativePath())
+        , fContoursHead(contours2)
         , fAllowOpenContours(true) {
         init();
     }
 
-    SkOpEdgeBuilder(const SkPath& path, SkTArray<SkOpContour>& contours)
-        : fPath(&path)
-        , fContours(contours)
+    SkOpEdgeBuilder(const SkPath& path, SkOpContour* contours2, SkChunkAlloc* allocator,
+            SkOpGlobalState* globalState)
+        : fAllocator(allocator)
+        , fGlobalState(globalState)
+        , fPath(&path)
+        , fContoursHead(contours2)
         , fAllowOpenContours(false) {
         init();
     }
 
+    void addOperand(const SkPath& path);
+
     void complete() {
-        if (fCurrentContour && fCurrentContour->segments().count()) {
+        if (fCurrentContour && fCurrentContour->count()) {
             fCurrentContour->complete();
-            fCurrentContour = NULL;
+            fCurrentContour = nullptr;
         }
     }
 
-    SkPathOpsMask xorMask() const {
-        return fXorMask[fOperand];
+    int count() const;
+    bool finish(SkChunkAlloc* );
+
+    const SkOpContour* head() const {
+        return fContoursHead;
     }
 
-    void addOperand(const SkPath& path);
-    bool finish();
     void init();
+    bool unparseable() const { return fUnparseable; }
+    SkPathOpsMask xorMask() const { return fXorMask[fOperand]; }
 
 private:
     void closeContour(const SkPoint& curveEnd, const SkPoint& curveStart);
     bool close();
     int preFetch();
-    bool walk();
+    bool walk(SkChunkAlloc* );
 
+    SkChunkAlloc* fAllocator;
+    SkOpGlobalState* fGlobalState;
     const SkPath* fPath;
-    SkTArray<SkPoint, true> fPathPts;
-    SkTArray<uint8_t, true> fPathVerbs;
+    SkTDArray<SkPoint> fPathPts;
+    SkTDArray<SkScalar> fWeights;
+    SkTDArray<uint8_t> fPathVerbs;
     SkOpContour* fCurrentContour;
-    SkTArray<SkOpContour>& fContours;
+    SkOpContour* fContoursHead;
     SkPathOpsMask fXorMask[2];
     int fSecondHalf;
     bool fOperand;
diff --git a/gfx/skia/skia/src/pathops/SkOpSegment.cpp b/gfx/skia/skia/src/pathops/SkOpSegment.cpp
index f6d989b18a10..3b81cf2eed13 100644
--- a/gfx/skia/skia/src/pathops/SkOpSegment.cpp
+++ b/gfx/skia/skia/src/pathops/SkOpSegment.cpp
@@ -4,11 +4,20 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "SkIntersections.h"
+#include "SkOpCoincidence.h"
 #include "SkOpContour.h"
 #include "SkOpSegment.h"
 #include "SkPathWriter.h"
-#include "SkTSort.h"
+
+/*
+After computing raw intersections, post process all segments to:
+- find small collections of points that can be collapsed to a single point
+- find missing intersections to resolve differences caused by different algorithms
+
+Consider segments containing tiny or small intervals. Consider coincident segments
+because coincidence finds intersections through distance measurement that non-coincident
+intersection tests cannot.
+ */
 
 #define F (false)      // discard the edge
 #define T (true)       // keep the edge
@@ -19,7 +28,7 @@ static const bool gUnaryActiveEdge[2][2] = {
     {F, T}, {T, F},
 };
 
-static const bool gActiveEdge[kXOR_PathOp + 1][2][2][2][2] = {
+static const bool gActiveEdge[kXOR_SkPathOp + 1][2][2][2][2] = {
 //                 miFrom=0                              miFrom=1
 //         miTo=0             miTo=1             miTo=0             miTo=1
 //     suFrom=0    1      suFrom=0    1      suFrom=0    1      suFrom=0    1
@@ -33,143 +42,84 @@ static const bool gActiveEdge[kXOR_PathOp + 1][2][2][2][2] = {
 #undef F
 #undef T
 
-enum {
-    kOutsideTrackedTCount = 16,  // FIXME: determine what this should be
-    kMissingSpanCount = 4,  // FIXME: determine what this should be
-};
-
-const SkOpAngle* SkOpSegment::activeAngle(int index, int* start, int* end, bool* done,
-        bool* sortable) const {
-    if (const SkOpAngle* result = activeAngleInner(index, start, end, done, sortable)) {
+SkOpAngle* SkOpSegment::activeAngle(SkOpSpanBase* start, SkOpSpanBase** startPtr,
+        SkOpSpanBase** endPtr, bool* done) {
+    if (SkOpAngle* result = activeAngleInner(start, startPtr, endPtr, done)) {
         return result;
     }
-    double referenceT = fTs[index].fT;
-    int lesser = index;
-    while (--lesser >= 0
-            && (precisely_negative(referenceT - fTs[lesser].fT) || fTs[lesser].fTiny)) {
-        if (const SkOpAngle* result = activeAngleOther(lesser, start, end, done, sortable)) {
-            return result;
-        }
+    if (SkOpAngle* result = activeAngleOther(start, startPtr, endPtr, done)) {
+        return result;
     }
-    do {
-        if (const SkOpAngle* result = activeAngleOther(index, start, end, done, sortable)) {
-            return result;
-        }
-        if (++index == fTs.count()) {
-            break;
-        }
-        if (fTs[index - 1].fTiny) {
-            referenceT = fTs[index].fT;
-            continue;
-        }
-    } while (precisely_negative(fTs[index].fT - referenceT));
-    return NULL;
+    return nullptr;
 }
 
-const SkOpAngle* SkOpSegment::activeAngleInner(int index, int* start, int* end, bool* done,
-        bool* sortable) const {
-    int next = nextExactSpan(index, 1);
-    if (next > 0) {
-        const SkOpSpan& upSpan = fTs[index];
-        if (upSpan.fWindValue || upSpan.fOppValue) {
-            if (*end < 0) {
-                *start = index;
-                *end = next;
+SkOpAngle* SkOpSegment::activeAngleInner(SkOpSpanBase* start, SkOpSpanBase** startPtr,
+        SkOpSpanBase** endPtr, bool* done) {
+    SkOpSpan* upSpan = start->upCastable();
+    if (upSpan) {
+        if (upSpan->windValue() || upSpan->oppValue()) {
+            SkOpSpanBase* next = upSpan->next();
+            if (!*endPtr) {
+                *startPtr = start;
+                *endPtr = next;
             }
-            if (!upSpan.fDone) {
-                if (upSpan.fWindSum != SK_MinS32) {
-                    return spanToAngle(index, next);
+            if (!upSpan->done()) {
+                if (upSpan->windSum() != SK_MinS32) {
+                    return spanToAngle(start, next);
                 }
                 *done = false;
             }
         } else {
-            SkASSERT(upSpan.fDone);
+            SkASSERT(upSpan->done());
         }
     }
-    int prev = nextExactSpan(index, -1);
+    SkOpSpan* downSpan = start->prev();
     // edge leading into junction
-    if (prev >= 0) {
-        const SkOpSpan& downSpan = fTs[prev];
-        if (downSpan.fWindValue || downSpan.fOppValue) {
-            if (*end < 0) {
-                *start = index;
-                *end = prev;
+    if (downSpan) {
+        if (downSpan->windValue() || downSpan->oppValue()) {
+            if (!*endPtr) {
+                *startPtr = start;
+                *endPtr = downSpan;
             }
-            if (!downSpan.fDone) {
-                if (downSpan.fWindSum != SK_MinS32) {
-                    return spanToAngle(index, prev);
+            if (!downSpan->done()) {
+                if (downSpan->windSum() != SK_MinS32) {
+                    return spanToAngle(start, downSpan);
                 }
                 *done = false;
             }
         } else {
-            SkASSERT(downSpan.fDone);
+            SkASSERT(downSpan->done());
         }
     }
-    return NULL;
+    return nullptr;
 }
 
-const SkOpAngle* SkOpSegment::activeAngleOther(int index, int* start, int* end, bool* done,
-        bool* sortable) const {
-    const SkOpSpan* span = &fTs[index];
-    SkOpSegment* other = span->fOther;
-    int oIndex = span->fOtherIndex;
-    return other->activeAngleInner(oIndex, start, end, done, sortable);
+SkOpAngle* SkOpSegment::activeAngleOther(SkOpSpanBase* start, SkOpSpanBase** startPtr,
+        SkOpSpanBase** endPtr, bool* done) {
+    SkOpPtT* oPtT = start->ptT()->next();
+    SkOpSegment* other = oPtT->segment();
+    SkOpSpanBase* oSpan = oPtT->span();
+    return other->activeAngleInner(oSpan, startPtr, endPtr, done);
 }
 
-SkPoint SkOpSegment::activeLeftTop(int* firstT) const {
-    SkASSERT(!done());
-    SkPoint topPt = {SK_ScalarMax, SK_ScalarMax};
-    int count = fTs.count();
-    // see if either end is not done since we want smaller Y of the pair
-    bool lastDone = true;
-    double lastT = -1;
-    for (int index = 0; index < count; ++index) {
-        const SkOpSpan& span = fTs[index];
-        if (span.fDone && lastDone) {
-            goto next;
-        }
-        if (approximately_negative(span.fT - lastT)) {
-            goto next;
-        }
-        {
-            const SkPoint& xy = xyAtT(&span);
-            if (topPt.fY > xy.fY || (topPt.fY == xy.fY && topPt.fX > xy.fX)) {
-                topPt = xy;
-                if (firstT) {
-                    *firstT = index;
-                }
-            }
-            if (fVerb != SkPath::kLine_Verb && !lastDone) {
-                SkPoint curveTop = (*CurveTop[SkPathOpsVerbToPoints(fVerb)])(fPts, lastT, span.fT);
-                if (topPt.fY > curveTop.fY || (topPt.fY == curveTop.fY
-                        && topPt.fX > curveTop.fX)) {
-                    topPt = curveTop;
-                    if (firstT) {
-                        *firstT = index;
-                    }
-                }
-            }
-            lastT = span.fT;
-        }
-next:
-        lastDone = span.fDone;
-    }
-    return topPt;
-}
-
-bool SkOpSegment::activeOp(int index, int endIndex, int xorMiMask, int xorSuMask, SkPathOp op) {
-    int sumMiWinding = updateWinding(endIndex, index);
-    int sumSuWinding = updateOppWinding(endIndex, index);
-    if (fOperand) {
+bool SkOpSegment::activeOp(SkOpSpanBase* start, SkOpSpanBase* end, int xorMiMask, int xorSuMask,
+        SkPathOp op) {
+    int sumMiWinding = this->updateWinding(end, start);
+    int sumSuWinding = this->updateOppWinding(end, start);
+#if DEBUG_LIMIT_WIND_SUM
+    SkASSERT(abs(sumMiWinding) <= DEBUG_LIMIT_WIND_SUM);
+    SkASSERT(abs(sumSuWinding) <= DEBUG_LIMIT_WIND_SUM);
+#endif
+    if (this->operand()) {
         SkTSwap<int>(sumMiWinding, sumSuWinding);
     }
-    return activeOp(xorMiMask, xorSuMask, index, endIndex, op, &sumMiWinding, &sumSuWinding);
+    return this->activeOp(xorMiMask, xorSuMask, start, end, op, &sumMiWinding, &sumSuWinding);
 }
 
-bool SkOpSegment::activeOp(int xorMiMask, int xorSuMask, int index, int endIndex, SkPathOp op,
-        int* sumMiWinding, int* sumSuWinding) {
+bool SkOpSegment::activeOp(int xorMiMask, int xorSuMask, SkOpSpanBase* start, SkOpSpanBase* end,
+        SkPathOp op, int* sumMiWinding, int* sumSuWinding) {
     int maxWinding, sumWinding, oppMaxWinding, oppSumWinding;
-    setUpWindings(index, endIndex, sumMiWinding, sumSuWinding,
+    this->setUpWindings(start, end, sumMiWinding, sumSuWinding,
             &maxWinding, &sumWinding, &oppMaxWinding, &oppSumWinding);
     bool miFrom;
     bool miTo;
@@ -189,1382 +139,370 @@ bool SkOpSegment::activeOp(int xorMiMask, int xorSuMask, int index, int endIndex
     bool result = gActiveEdge[op][miFrom][miTo][suFrom][suTo];
 #if DEBUG_ACTIVE_OP
     SkDebugf("%s id=%d t=%1.9g tEnd=%1.9g op=%s miFrom=%d miTo=%d suFrom=%d suTo=%d result=%d\n",
-            __FUNCTION__, debugID(), span(index).fT, span(endIndex).fT,
+            __FUNCTION__, debugID(), start->t(), end->t(),
             SkPathOpsDebug::kPathOpStr[op], miFrom, miTo, suFrom, suTo, result);
 #endif
     return result;
 }
 
-bool SkOpSegment::activeWinding(int index, int endIndex) {
-    int sumWinding = updateWinding(endIndex, index);
-    return activeWinding(index, endIndex, &sumWinding);
+bool SkOpSegment::activeWinding(SkOpSpanBase* start, SkOpSpanBase* end) {
+    int sumWinding = updateWinding(end, start);
+    return activeWinding(start, end, &sumWinding);
 }
 
-bool SkOpSegment::activeWinding(int index, int endIndex, int* sumWinding) {
+bool SkOpSegment::activeWinding(SkOpSpanBase* start, SkOpSpanBase* end, int* sumWinding) {
     int maxWinding;
-    setUpWinding(index, endIndex, &maxWinding, sumWinding);
+    setUpWinding(start, end, &maxWinding, sumWinding);
     bool from = maxWinding != 0;
     bool to = *sumWinding  != 0;
     bool result = gUnaryActiveEdge[from][to];
     return result;
 }
 
-void SkOpSegment::addCancelOutsides(const SkPoint& startPt, const SkPoint& endPt,
-        SkOpSegment* other) {
-    int tIndex = -1;
-    int tCount = fTs.count();
-    int oIndex = -1;
-    int oCount = other->fTs.count();
-    do {
-        ++tIndex;
-    } while (startPt != fTs[tIndex].fPt && tIndex < tCount);
-    int tIndexStart = tIndex;
-    do {
-        ++oIndex;
-    } while (endPt != other->fTs[oIndex].fPt && oIndex < oCount);
-    int oIndexStart = oIndex;
-    const SkPoint* nextPt;
-    do {
-        nextPt = &fTs[++tIndex].fPt;
-        SkASSERT(fTs[tIndex].fT < 1 || startPt != *nextPt);
-    } while (startPt == *nextPt);
-    double nextT = fTs[tIndex].fT;
-    const SkPoint* oNextPt;
-    do {
-        oNextPt = &other->fTs[++oIndex].fPt;
-        SkASSERT(other->fTs[oIndex].fT < 1 || endPt != *oNextPt);
-    } while (endPt == *oNextPt);
-    double oNextT = other->fTs[oIndex].fT;
-    // at this point, spans before and after are at:
-    //  fTs[tIndexStart - 1], fTs[tIndexStart], fTs[tIndex]
-    // if tIndexStart == 0, no prior span
-    // if nextT == 1, no following span
-
-    // advance the span with zero winding
-    // if the following span exists (not past the end, non-zero winding)
-    // connect the two edges
-    if (!fTs[tIndexStart].fWindValue) {
-        if (tIndexStart > 0 && fTs[tIndexStart - 1].fWindValue) {
-#if DEBUG_CONCIDENT
-            SkDebugf("%s 1 this=%d other=%d t [%d] %1.9g (%1.9g,%1.9g)\n",
-                    __FUNCTION__, fID, other->fID, tIndexStart - 1,
-                    fTs[tIndexStart].fT, xyAtT(tIndexStart).fX,
-                    xyAtT(tIndexStart).fY);
-#endif
-            addTPair(fTs[tIndexStart].fT, other, other->fTs[oIndex].fT, false,
-                    fTs[tIndexStart].fPt);
-        }
-        if (nextT < 1 && fTs[tIndex].fWindValue) {
-#if DEBUG_CONCIDENT
-            SkDebugf("%s 2 this=%d other=%d t [%d] %1.9g (%1.9g,%1.9g)\n",
-                    __FUNCTION__, fID, other->fID, tIndex,
-                    fTs[tIndex].fT, xyAtT(tIndex).fX,
-                    xyAtT(tIndex).fY);
-#endif
-            addTPair(fTs[tIndex].fT, other, other->fTs[oIndexStart].fT, false, fTs[tIndex].fPt);
-        }
-    } else {
-        SkASSERT(!other->fTs[oIndexStart].fWindValue);
-        if (oIndexStart > 0 && other->fTs[oIndexStart - 1].fWindValue) {
-#if DEBUG_CONCIDENT
-            SkDebugf("%s 3 this=%d other=%d t [%d] %1.9g (%1.9g,%1.9g)\n",
-                    __FUNCTION__, fID, other->fID, oIndexStart - 1,
-                    other->fTs[oIndexStart].fT, other->xyAtT(oIndexStart).fX,
-                    other->xyAtT(oIndexStart).fY);
-            other->debugAddTPair(other->fTs[oIndexStart].fT, *this, fTs[tIndex].fT);
-#endif
-        }
-        if (oNextT < 1 && other->fTs[oIndex].fWindValue) {
-#if DEBUG_CONCIDENT
-            SkDebugf("%s 4 this=%d other=%d t [%d] %1.9g (%1.9g,%1.9g)\n",
-                    __FUNCTION__, fID, other->fID, oIndex,
-                    other->fTs[oIndex].fT, other->xyAtT(oIndex).fX,
-                    other->xyAtT(oIndex).fY);
-            other->debugAddTPair(other->fTs[oIndex].fT, *this, fTs[tIndexStart].fT);
-#endif
-        }
+void SkOpSegment::addAlignIntersection(SkOpPtT& endPtT, SkPoint& oldPt,
+        SkOpContourHead* contourList, SkChunkAlloc* allocator) {
+    const SkPoint& newPt = endPtT.fPt;
+    if (newPt == oldPt) {
+        return;
     }
-}
-
-void SkOpSegment::addCoinOutsides(const SkPoint& startPt, const SkPoint& endPt,
-        SkOpSegment* other) {
-    // walk this to startPt
-    // walk other to startPt
-    // if either is > 0, add a pointer to the other, copying adjacent winding
-    int tIndex = -1;
-    int oIndex = -1;
+    SkPoint line[2] = { newPt, oldPt };
+    SkPathOpsBounds lineBounds;
+    lineBounds.setBounds(line, 2);
+    SkDLine aLine;
+    aLine.set(line);
+    SkOpContour* current = contourList;
     do {
-        ++tIndex;
-    } while (startPt != fTs[tIndex].fPt);
-    int ttIndex = tIndex;
-    bool checkOtherTMatch = false;
-    do {
-        const SkOpSpan& span = fTs[ttIndex];
-        if (startPt != span.fPt) {
-            break;
+        if (!SkPathOpsBounds::Intersects(current->bounds(), lineBounds)) {
+            continue;
         }
-        if (span.fOther == other && span.fPt == startPt) {
-            checkOtherTMatch = true;
-            break;
-        }
-    } while (++ttIndex < count());
-    do {
-        ++oIndex;
-    } while (startPt != other->fTs[oIndex].fPt);
-    bool skipAdd = false;
-    if (checkOtherTMatch) {
-        int ooIndex = oIndex;
+        SkOpSegment* segment = current->first();
         do {
-            const SkOpSpan& oSpan = other->fTs[ooIndex];
-            if (startPt != oSpan.fPt) {
-                break;
+            if (!SkPathOpsBounds::Intersects(segment->bounds(), lineBounds)) {
+                continue;
             }
-            if (oSpan.fT == fTs[ttIndex].fOtherT) {
-                skipAdd = true;
-                break;
+            if (newPt == segment->fPts[0]) {
+                continue;
             }
-        } while (++ooIndex < other->count());
-    }
-    if ((tIndex > 0 || oIndex > 0 || fOperand != other->fOperand) && !skipAdd) {
-        addTPair(fTs[tIndex].fT, other, other->fTs[oIndex].fT, false, startPt);
-    }
-    SkPoint nextPt = startPt;
-    do {
-        const SkPoint* workPt;
-        do {
-            workPt = &fTs[++tIndex].fPt;
-        } while (nextPt == *workPt);
-        const SkPoint* oWorkPt;
-        do {
-            oWorkPt = &other->fTs[++oIndex].fPt;
-        } while (nextPt == *oWorkPt);
-        nextPt = *workPt;
-        double tStart = fTs[tIndex].fT;
-        double oStart = other->fTs[oIndex].fT;
-        if (tStart == 1 && oStart == 1 && fOperand == other->fOperand) {
-            break;
-        }
-        if (*workPt == *oWorkPt) {
-            addTPair(tStart, other, oStart, false, nextPt);
-        }
-    } while (endPt != nextPt);
+            if (newPt == segment->fPts[SkPathOpsVerbToPoints(segment->fVerb)]) {
+                continue;
+            }
+            if (oldPt == segment->fPts[0]) {
+                continue;
+            }
+            if (oldPt == segment->fPts[SkPathOpsVerbToPoints(segment->fVerb)]) {
+                continue;
+            }
+            if (endPtT.contains(segment)) {
+                continue;
+            }
+            SkIntersections i;
+            switch (segment->fVerb) {
+                case SkPath::kLine_Verb: {
+                    SkDLine bLine;
+                    bLine.set(segment->fPts);
+                    i.intersect(bLine, aLine);
+                    } break;
+                case SkPath::kQuad_Verb: {
+                    SkDQuad bQuad;
+                    bQuad.set(segment->fPts);
+                    i.intersect(bQuad, aLine);
+                    } break;
+                case SkPath::kConic_Verb: {
+                    SkDConic bConic;
+                    bConic.set(segment->fPts, segment->fWeight);
+                    i.intersect(bConic, aLine);
+                    } break;
+                case SkPath::kCubic_Verb: {
+                    SkDCubic bCubic;
+                    bCubic.set(segment->fPts);
+                    i.intersect(bCubic, aLine);
+                    } break;
+                default:
+                    SkASSERT(0);
+            }
+            if (i.used()) {
+                SkASSERT(i.used() == 1);
+                SkASSERT(!zero_or_one(i[0][0]));
+                SkOpSpanBase* checkSpan = fHead.next();
+                while (!checkSpan->final()) {
+                    if (checkSpan->contains(segment)) {
+                        goto nextSegment;
+                    }
+                    checkSpan = checkSpan->upCast()->next();
+                }
+                SkOpPtT* ptT = segment->addT(i[0][0], SkOpSegment::kAllowAlias, allocator);
+                ptT->fPt = newPt;
+                endPtT.addOpp(ptT);
+            }
+    nextSegment:
+            ;
+        } while ((segment = segment->next()));
+    } while ((current = current->next()));
 }
 
-void SkOpSegment::addCubic(const SkPoint pts[4], bool operand, bool evenOdd) {
-    init(pts, SkPath::kCubic_Verb, operand, evenOdd);
-    fBounds.setCubicBounds(pts);
-}
-
-void SkOpSegment::addCurveTo(int start, int end, SkPathWriter* path, bool active) const {
-    SkPoint edge[4];
+bool SkOpSegment::addCurveTo(const SkOpSpanBase* start, const SkOpSpanBase* end,
+        SkPathWriter* path) const {
+    if (start->starter(end)->alreadyAdded()) {
+        return false;
+    }
+    SkOpCurve edge;
     const SkPoint* ePtr;
-    int lastT = fTs.count() - 1;
-    if (lastT < 0 || (start == 0 && end == lastT) || (start == lastT && end == 0)) {
+    SkScalar eWeight;
+    if ((start == &fHead && end == &fTail) || (start == &fTail && end == &fHead)) {
         ePtr = fPts;
+        eWeight = fWeight;
     } else {
     // OPTIMIZE? if not active, skip remainder and return xyAtT(end)
-        subDivide(start, end, edge);
-        ePtr = edge;
+        subDivide(start, end, &edge);
+        ePtr = edge.fPts;
+        eWeight = edge.fWeight;
     }
-    if (active) {
-        bool reverse = ePtr == fPts && start != 0;
-        if (reverse) {
-            path->deferredMoveLine(ePtr[SkPathOpsVerbToPoints(fVerb)]);
-            switch (fVerb) {
-                case SkPath::kLine_Verb:
-                    path->deferredLine(ePtr[0]);
-                    break;
-                case SkPath::kQuad_Verb:
-                    path->quadTo(ePtr[1], ePtr[0]);
-                    break;
-                case SkPath::kCubic_Verb:
-                    path->cubicTo(ePtr[2], ePtr[1], ePtr[0]);
-                    break;
-                default:
-                    SkASSERT(0);
-            }
-   //         return ePtr[0];
-       } else {
-            path->deferredMoveLine(ePtr[0]);
-            switch (fVerb) {
-                case SkPath::kLine_Verb:
-                    path->deferredLine(ePtr[1]);
-                    break;
-                case SkPath::kQuad_Verb:
-                    path->quadTo(ePtr[1], ePtr[2]);
-                    break;
-                case SkPath::kCubic_Verb:
-                    path->cubicTo(ePtr[1], ePtr[2], ePtr[3]);
-                    break;
-                default:
-                    SkASSERT(0);
-            }
+    bool reverse = ePtr == fPts && start != &fHead;
+    if (reverse) {
+        path->deferredMoveLine(ePtr[SkPathOpsVerbToPoints(fVerb)]);
+        switch (fVerb) {
+            case SkPath::kLine_Verb:
+                path->deferredLine(ePtr[0]);
+                break;
+            case SkPath::kQuad_Verb:
+                path->quadTo(ePtr[1], ePtr[0]);
+                break;
+            case SkPath::kConic_Verb:
+                path->conicTo(ePtr[1], ePtr[0], eWeight);
+                break;
+            case SkPath::kCubic_Verb:
+                path->cubicTo(ePtr[2], ePtr[1], ePtr[0]);
+                break;
+            default:
+                SkASSERT(0);
         }
-    }
-  //  return ePtr[SkPathOpsVerbToPoints(fVerb)];
-}
-
-void SkOpSegment::addEndSpan(int endIndex) {
-    SkASSERT(span(endIndex).fT == 1 || (span(endIndex).fTiny
-            && approximately_greater_than_one(span(endIndex).fT)));
-    int spanCount = fTs.count();
-    int startIndex = endIndex - 1;
-    while (fTs[startIndex].fT == 1 || fTs[startIndex].fTiny) {
-        --startIndex;
-        SkASSERT(startIndex > 0);
-        --endIndex;
-    }
-    SkOpAngle& angle = fAngles.push_back();
-    angle.set(this, spanCount - 1, startIndex);
-#if DEBUG_ANGLE
-    debugCheckPointsEqualish(endIndex, spanCount);
-#endif
-    setFromAngle(endIndex, &angle);
-}
-
-void SkOpSegment::setFromAngle(int endIndex, SkOpAngle* angle) {
-    int spanCount = fTs.count();
-    do {
-        fTs[endIndex].fFromAngle = angle;
-    } while (++endIndex < spanCount);
-}
-
-void SkOpSegment::addLine(const SkPoint pts[2], bool operand, bool evenOdd) {
-    init(pts, SkPath::kLine_Verb, operand, evenOdd);
-    fBounds.set(pts, 2);
-}
-
-// add 2 to edge or out of range values to get T extremes
-void SkOpSegment::addOtherT(int index, double otherT, int otherIndex) {
-    SkOpSpan& span = fTs[index];
-    if (precisely_zero(otherT)) {
-        otherT = 0;
-    } else if (precisely_equal(otherT, 1)) {
-        otherT = 1;
-    }
-    span.fOtherT = otherT;
-    span.fOtherIndex = otherIndex;
-}
-
-void SkOpSegment::addQuad(const SkPoint pts[3], bool operand, bool evenOdd) {
-    init(pts, SkPath::kQuad_Verb, operand, evenOdd);
-    fBounds.setQuadBounds(pts);
-}
-
-SkOpAngle* SkOpSegment::addSingletonAngleDown(SkOpSegment** otherPtr, SkOpAngle** anglePtr) {
-    int spanIndex = count() - 1;
-    int startIndex = nextExactSpan(spanIndex, -1);
-    SkASSERT(startIndex >= 0);
-    SkOpAngle& angle = fAngles.push_back();
-    *anglePtr = &angle;
-    angle.set(this, spanIndex, startIndex);
-    setFromAngle(spanIndex, &angle);
-    SkOpSegment* other;
-    int oStartIndex, oEndIndex;
-    do {
-        const SkOpSpan& span = fTs[spanIndex];
-        SkASSERT(span.fT > 0);
-        other = span.fOther;
-        oStartIndex = span.fOtherIndex;
-        oEndIndex = other->nextExactSpan(oStartIndex, 1);
-        if (oEndIndex > 0 && other->span(oStartIndex).fWindValue) {
-            break;
-        }
-        oEndIndex = oStartIndex;
-        oStartIndex = other->nextExactSpan(oEndIndex, -1);
-        --spanIndex;
-    } while (oStartIndex < 0 || !other->span(oStartIndex).fWindSum);
-    SkOpAngle& oAngle = other->fAngles.push_back();
-    oAngle.set(other, oStartIndex, oEndIndex);
-    other->setToAngle(oEndIndex, &oAngle);
-    *otherPtr = other;
-    return &oAngle;
-}
-
-SkOpAngle* SkOpSegment::addSingletonAngleUp(SkOpSegment** otherPtr, SkOpAngle** anglePtr) {
-    int endIndex = nextExactSpan(0, 1);
-    SkASSERT(endIndex > 0);
-    SkOpAngle& angle = fAngles.push_back();
-    *anglePtr = &angle;
-    angle.set(this, 0, endIndex);
-    setToAngle(endIndex, &angle);
-    int spanIndex = 0;
-    SkOpSegment* other;
-    int oStartIndex, oEndIndex;
-    do {
-        const SkOpSpan& span = fTs[spanIndex];
-        SkASSERT(span.fT < 1);
-        other = span.fOther;
-        oEndIndex = span.fOtherIndex;
-        oStartIndex = other->nextExactSpan(oEndIndex, -1);
-        if (oStartIndex >= 0 && other->span(oStartIndex).fWindValue) {
-            break;
-        }
-        oStartIndex = oEndIndex;
-        oEndIndex = other->nextExactSpan(oStartIndex, 1);
-        ++spanIndex;
-    } while (oEndIndex < 0 || !other->span(oStartIndex).fWindValue);
-    SkOpAngle& oAngle = other->fAngles.push_back();
-    oAngle.set(other, oEndIndex, oStartIndex);
-    other->setFromAngle(oEndIndex, &oAngle);
-    *otherPtr = other;
-    return &oAngle;
-}
-
-SkOpAngle* SkOpSegment::addSingletonAngles(int step) {
-    SkOpSegment* other;
-    SkOpAngle* angle, * otherAngle;
-    if (step > 0) {
-        otherAngle = addSingletonAngleUp(&other, &angle);
     } else {
-        otherAngle = addSingletonAngleDown(&other, &angle);
-    }
-    angle->insert(otherAngle);
-    return angle;
-}
-
-void SkOpSegment::addStartSpan(int endIndex) {
-    int index = 0;
-    SkOpAngle& angle = fAngles.push_back();
-    angle.set(this, index, endIndex);
-#if DEBUG_ANGLE
-    debugCheckPointsEqualish(index, endIndex);
-#endif
-    setToAngle(endIndex, &angle);
-}
-
-void SkOpSegment::setToAngle(int endIndex, SkOpAngle* angle) {
-    int index = 0;
-    do {
-        fTs[index].fToAngle = angle;
-    } while (++index < endIndex);
-}
-
-    // Defer all coincident edge processing until
-    // after normal intersections have been computed
-
-// no need to be tricky; insert in normal T order
-// resolve overlapping ts when considering coincidence later
-
-    // add non-coincident intersection. Resulting edges are sorted in T.
-int SkOpSegment::addT(SkOpSegment* other, const SkPoint& pt, double newT) {
-    SkASSERT(this != other || fVerb == SkPath::kCubic_Verb);
- #if 0  // this needs an even rougher association to be useful
-    SkASSERT(SkDPoint::RoughlyEqual(ptAtT(newT), pt));
- #endif
-    const SkPoint& firstPt = fPts[0];
-    const SkPoint& lastPt = fPts[SkPathOpsVerbToPoints(fVerb)];
-    SkASSERT(newT == 0 || !precisely_zero(newT));
-    SkASSERT(newT == 1 || !precisely_equal(newT, 1));
-    // FIXME: in the pathological case where there is a ton of intercepts,
-    //  binary search?
-    int insertedAt = -1;
-    int tCount = fTs.count();
-    for (int index = 0; index < tCount; ++index) {
-        // OPTIMIZATION: if there are three or more identical Ts, then
-        // the fourth and following could be further insertion-sorted so
-        // that all the edges are clockwise or counterclockwise.
-        // This could later limit segment tests to the two adjacent
-        // neighbors, although it doesn't help with determining which
-        // circular direction to go in.
-        const SkOpSpan& span = fTs[index];
-        if (newT < span.fT) {
-            insertedAt = index;
-            break;
-        }
-        if (newT == span.fT) {
-            if (pt == span.fPt) {
-                insertedAt = index;
+        path->deferredMoveLine(ePtr[0]);
+        switch (fVerb) {
+            case SkPath::kLine_Verb:
+                path->deferredLine(ePtr[1]);
                 break;
-            }
-            if ((pt == firstPt && newT == 0) || (span.fPt == lastPt && newT == 1)) {
-                insertedAt = index;
+            case SkPath::kQuad_Verb:
+                path->quadTo(ePtr[1], ePtr[2]);
                 break;
-            }
-        }
-    }
-    SkOpSpan* span;
-    if (insertedAt >= 0) {
-        span = fTs.insert(insertedAt);
-    } else {
-        insertedAt = tCount;
-        span = fTs.append();
-    }
-    span->fT = newT;
-    span->fOtherT = -1;
-    span->fOther = other;
-    span->fPt = pt;
-#if 0
-    // cubics, for instance, may not be exact enough to satisfy this check (e.g., cubicOp69d)
-    SkASSERT(approximately_equal(xyAtT(newT).fX, pt.fX)
-            && approximately_equal(xyAtT(newT).fY, pt.fY));
-#endif
-    span->fFromAngle = NULL;
-    span->fToAngle = NULL;
-    span->fWindSum = SK_MinS32;
-    span->fOppSum = SK_MinS32;
-    span->fWindValue = 1;
-    span->fOppValue = 0;
-    span->fChased = false;
-    span->fCoincident = false;
-    span->fLoop = false;
-    span->fNear = false;
-    span->fMultiple = false;
-    span->fSmall = false;
-    span->fTiny = false;
-    if ((span->fDone = newT == 1)) {
-        ++fDoneSpans;
-    }
-    int less = -1;
-// FIXME: note that this relies on spans being a continguous array
-// find range of spans with nearly the same point as this one
-    while (&span[less + 1] - fTs.begin() > 0 && AlmostEqualUlps(span[less].fPt, pt)) {
-        if (fVerb == SkPath::kCubic_Verb) {
-            double tInterval = newT - span[less].fT;
-            double tMid = newT - tInterval / 2;
-            SkDPoint midPt = dcubic_xy_at_t(fPts, tMid);
-            if (!midPt.approximatelyEqual(xyAtT(span))) {
+            case SkPath::kConic_Verb:
+                path->conicTo(ePtr[1], ePtr[2], eWeight);
                 break;
-            }
-        }
-        --less;
-    }
-    int more = 1;
-    while (fTs.end() - &span[more - 1] > 1 && AlmostEqualUlps(span[more].fPt, pt)) {
-        if (fVerb == SkPath::kCubic_Verb) {
-            double tEndInterval = span[more].fT - newT;
-            double tMid = newT - tEndInterval / 2;
-            SkDPoint midEndPt = dcubic_xy_at_t(fPts, tMid);
-            if (!midEndPt.approximatelyEqual(xyAtT(span))) {
+            case SkPath::kCubic_Verb:
+                path->cubicTo(ePtr[1], ePtr[2], ePtr[3]);
                 break;
-            }
+            default:
+                SkASSERT(0);
         }
-        ++more;
-    }
-    ++less;
-    --more;
-    while (more - 1 > less && span[more].fPt == span[more - 1].fPt
-            && span[more].fT == span[more - 1].fT) {
-        --more;
-    }
-    if (less == more) {
-        return insertedAt;
-    }
-    if (precisely_negative(span[more].fT - span[less].fT)) {
-        return insertedAt;
-    }
-// if the total range of t values is big enough, mark all tiny
-    bool tiny = span[less].fPt == span[more].fPt;
-    int index = less;
-    do {
-        fSmall = span[index].fSmall = true;
-        fTiny |= span[index].fTiny = tiny;
-        if (!span[index].fDone) {
-            span[index].fDone = true;
-            ++fDoneSpans;
-        }
-    } while (++index < more);
-    return insertedAt;
-}
-
-// set spans from start to end to decrement by one
-// note this walks other backwards
-// FIXME: there's probably an edge case that can be constructed where
-// two span in one segment are separated by float epsilon on one span but
-// not the other, if one segment is very small. For this
-// case the counts asserted below may or may not be enough to separate the
-// spans. Even if the counts work out, what if the spans aren't correctly
-// sorted? It feels better in such a case to match the span's other span
-// pointer since both coincident segments must contain the same spans.
-// FIXME? It seems that decrementing by one will fail for complex paths that
-// have three or more coincident edges. Shouldn't this subtract the difference
-// between the winding values?
-/*                                      |-->                           |-->
-this     0>>>>1>>>>2>>>>3>>>4      0>>>>1>>>>2>>>>3>>>4      0>>>>1>>>>2>>>>3>>>4
-other         2<<<<1<<<<0               2<<<<1<<<<0               2<<<<1<<<<0
-              ^         ^                 <--|                           <--|
-           startPt    endPt        test/oTest first pos      test/oTest final pos
-*/
-void SkOpSegment::addTCancel(const SkPoint& startPt, const SkPoint& endPt, SkOpSegment* other) {
-    bool binary = fOperand != other->fOperand;
-    int index = 0;
-    while (startPt != fTs[index].fPt) {
-        SkASSERT(index < fTs.count());
-        ++index;
-    }
-    while (index > 0 && precisely_equal(fTs[index].fT, fTs[index - 1].fT)) {
-        --index;
-    }
-    bool oFoundEnd = false;
-    int oIndex = other->fTs.count();
-    while (startPt != other->fTs[--oIndex].fPt) {  // look for startPt match
-        SkASSERT(oIndex > 0);
-    }
-    double oStartT = other->fTs[oIndex].fT;
-    // look for first point beyond match
-    while (startPt == other->fTs[--oIndex].fPt || precisely_equal(oStartT, other->fTs[oIndex].fT)) {
-        SkASSERT(oIndex > 0);
-    }
-    SkOpSpan* test = &fTs[index];
-    SkOpSpan* oTest = &other->fTs[oIndex];
-    SkSTArray<kOutsideTrackedTCount, SkPoint, true> outsidePts;
-    SkSTArray<kOutsideTrackedTCount, SkPoint, true> oOutsidePts;
-    bool decrement, track, bigger;
-    int originalWindValue;
-    const SkPoint* testPt;
-    const SkPoint* oTestPt;
-    do {
-        SkASSERT(test->fT < 1);
-        SkASSERT(oTest->fT < 1);
-        decrement = test->fWindValue && oTest->fWindValue;
-        track = test->fWindValue || oTest->fWindValue;
-        bigger = test->fWindValue >= oTest->fWindValue;
-        testPt = &test->fPt;
-        double testT = test->fT;
-        oTestPt = &oTest->fPt;
-        double oTestT = oTest->fT;
-        do {
-            if (decrement) {
-                if (binary && bigger) {
-                    test->fOppValue--;
-                } else {
-                    decrementSpan(test);
-                }
-            } else if (track) {
-                TrackOutsidePair(&outsidePts, *testPt, *oTestPt);
-            }
-            SkASSERT(index < fTs.count() - 1);
-            test = &fTs[++index];
-        } while (*testPt == test->fPt || precisely_equal(testT, test->fT));
-        originalWindValue = oTest->fWindValue;
-        do {
-            SkASSERT(oTest->fT < 1);
-            SkASSERT(originalWindValue == oTest->fWindValue);
-            if (decrement) {
-                if (binary && !bigger) {
-                    oTest->fOppValue--;
-                } else {
-                    other->decrementSpan(oTest);
-                }
-            } else if (track) {
-                TrackOutsidePair(&oOutsidePts, *oTestPt, *testPt);
-            }
-            if (!oIndex) {
-                break;
-            }
-            oFoundEnd |= endPt == oTest->fPt;
-            oTest = &other->fTs[--oIndex];
-        } while (*oTestPt == oTest->fPt || precisely_equal(oTestT, oTest->fT));
-    } while (endPt != test->fPt && test->fT < 1);
-    // FIXME: determine if canceled edges need outside ts added
-    if (!oFoundEnd) {
-        for (int oIdx2 = oIndex; oIdx2 >= 0; --oIdx2) {
-            SkOpSpan* oTst2 = &other->fTs[oIdx2];            
-            if (originalWindValue != oTst2->fWindValue) {
-                goto skipAdvanceOtherCancel;
-            }
-            if (!oTst2->fWindValue) {
-                goto skipAdvanceOtherCancel;
-            }
-            if (endPt == other->fTs[oIdx2].fPt) {
-                break;
-            }
-        }
-        do {
-            SkASSERT(originalWindValue == oTest->fWindValue);
-            if (decrement) {
-                if (binary && !bigger) {
-                    oTest->fOppValue--;
-                } else {
-                    other->decrementSpan(oTest);
-                }
-            } else if (track) {
-                TrackOutsidePair(&oOutsidePts, *oTestPt, *testPt);
-            }
-            if (!oIndex) {
-                break;
-            }
-            oTest = &other->fTs[--oIndex];
-            oFoundEnd |= endPt == oTest->fPt;
-        } while (!oFoundEnd || endPt == oTest->fPt);
-    }
-skipAdvanceOtherCancel:
-    int outCount = outsidePts.count();
-    if (!done() && outCount) {
-        addCancelOutsides(outsidePts[0], outsidePts[1], other);
-        if (outCount > 2) {
-            addCancelOutsides(outsidePts[outCount - 2], outsidePts[outCount - 1], other);
-        }
-    }
-    if (!other->done() && oOutsidePts.count()) {
-        other->addCancelOutsides(oOutsidePts[0], oOutsidePts[1], this);
-    }
-    setCoincidentRange(startPt, endPt, other);
-    other->setCoincidentRange(startPt, endPt, this);
-}
-
-int SkOpSegment::addSelfT(const SkPoint& pt, double newT) {
-    // if the tail nearly intersects itself but not quite, the caller records this separately
-    int result = addT(this, pt, newT);
-    SkOpSpan* span = &fTs[result];
-    fLoop = span->fLoop = true;
-    return result;
-}
-
-// find the starting or ending span with an existing loop of angles
-// FIXME? replicate for all identical starting/ending spans?
-// OPTIMIZE? remove the spans pointing to windValue==0 here or earlier?
-// FIXME? assert that only one other span has a valid windValue or oppValue
-void SkOpSegment::addSimpleAngle(int index) {
-    SkOpSpan* span = &fTs[index];
-    int idx;
-    int start, end;
-    if (span->fT == 0) {
-        idx = 0;
-        span = &fTs[0];
-        do {
-            if (span->fToAngle) {
-                SkASSERT(span->fToAngle->loopCount() == 2);
-                SkASSERT(!span->fFromAngle);
-                span->fFromAngle = span->fToAngle->next();
-                return;
-            }
-            span = &fTs[++idx];
-        } while (span->fT == 0);
-        SkASSERT(!fTs[0].fTiny && fTs[idx].fT > 0);
-        addStartSpan(idx);
-        start = 0;
-        end = idx;
-    } else {
-        idx = count() - 1;
-        span = &fTs[idx];
-        do {
-            if (span->fFromAngle) {
-                SkASSERT(span->fFromAngle->loopCount() == 2);
-                SkASSERT(!span->fToAngle);
-                span->fToAngle = span->fFromAngle->next();
-                return;
-            }
-            span = &fTs[--idx];
-        } while (span->fT == 1);
-        SkASSERT(!fTs[idx].fTiny && fTs[idx].fT < 1);
-        addEndSpan(++idx);
-        start = idx;
-        end = count();
-    }
-    SkOpSegment* other;
-    SkOpSpan* oSpan;
-    index = start;
-    do {
-        span = &fTs[index];
-        other = span->fOther;
-        int oFrom = span->fOtherIndex;
-        oSpan = &other->fTs[oFrom];
-        if (oSpan->fT < 1 && oSpan->fWindValue) {
-            break;
-        }
-        if (oSpan->fT == 0) {
-            continue;
-        }
-        oFrom = other->nextExactSpan(oFrom, -1);
-        SkOpSpan* oFromSpan = &other->fTs[oFrom];
-        SkASSERT(oFromSpan->fT < 1);
-        if (oFromSpan->fWindValue) {
-            break;
-        }
-    } while (++index < end);
-    SkOpAngle* angle, * oAngle;
-    if (span->fT == 0) {
-        SkASSERT(span->fOtherIndex - 1 >= 0);
-        SkASSERT(span->fOtherT == 1);
-        SkDEBUGCODE(int oPriorIndex = other->nextExactSpan(span->fOtherIndex, -1));
-        SkDEBUGCODE(const SkOpSpan& oPrior = other->span(oPriorIndex));
-        SkASSERT(!oPrior.fTiny && oPrior.fT < 1);
-        other->addEndSpan(span->fOtherIndex);
-        angle = span->fToAngle;
-        oAngle = oSpan->fFromAngle;
-    } else {
-        SkASSERT(span->fOtherIndex + 1 < other->count());
-        SkASSERT(span->fOtherT == 0);
-        SkASSERT(!oSpan->fTiny && (other->fTs[span->fOtherIndex + 1].fT > 0
-                || (other->fTs[span->fOtherIndex + 1].fFromAngle == NULL
-                && other->fTs[span->fOtherIndex + 1].fToAngle == NULL)));
-        int oIndex = 1;
-        do {
-            const SkOpSpan& osSpan = other->span(oIndex);
-            if (osSpan.fFromAngle || osSpan.fT > 0) {
-                break;
-            }
-            ++oIndex;
-            SkASSERT(oIndex < other->count());
-        } while (true);
-        other->addStartSpan(oIndex);
-        angle = span->fFromAngle;
-        oAngle = oSpan->fToAngle;
-    }
-    angle->insert(oAngle);
-}
-
-void SkOpSegment::alignMultiples(SkTDArray<AlignedSpan>* alignedArray) {
-    debugValidate();
-    int count = this->count();
-    for (int index = 0; index < count; ++index) {
-        SkOpSpan& span = fTs[index];
-        if (!span.fMultiple) {
-            continue;
-        }
-        int end = nextExactSpan(index, 1);
-        SkASSERT(end > index + 1);
-        const SkPoint& thisPt = span.fPt;
-        while (index < end - 1) {
-            SkOpSegment* other1 = span.fOther;
-            int oCnt = other1->count();
-            for (int idx2 = index + 1; idx2 < end; ++idx2) {
-                SkOpSpan& span2 = fTs[idx2];
-                SkOpSegment* other2 = span2.fOther;
-                for (int oIdx = 0; oIdx < oCnt; ++oIdx) {
-                    SkOpSpan& oSpan = other1->fTs[oIdx];
-                    if (oSpan.fOther != other2) {
-                        continue;
-                    }
-                    if (oSpan.fPt == thisPt) {
-                        goto skipExactMatches;
-                    }
-                }
-                for (int oIdx = 0; oIdx < oCnt; ++oIdx) {
-                    SkOpSpan& oSpan = other1->fTs[oIdx];
-                    if (oSpan.fOther != other2) {
-                        continue;
-                    }
-                    if (SkDPoint::RoughlyEqual(oSpan.fPt, thisPt)) {
-                        SkOpSpan& oSpan2 = other2->fTs[oSpan.fOtherIndex];
-                        if (zero_or_one(span.fOtherT) || zero_or_one(oSpan.fT)
-                                || zero_or_one(span2.fOtherT) || zero_or_one(oSpan2.fT)) {
-                            return;
-                        }
-                        if (!way_roughly_equal(span.fOtherT, oSpan.fT)
-                                || !way_roughly_equal(span2.fOtherT, oSpan2.fT)
-                                || !way_roughly_equal(span2.fOtherT, oSpan.fOtherT)
-                                || !way_roughly_equal(span.fOtherT, oSpan2.fOtherT)) {
-                            return;
-                        }
-                        alignSpan(thisPt, span.fOtherT, other1, span2.fOtherT,
-                                other2, &oSpan, alignedArray);
-                        alignSpan(thisPt, span2.fOtherT, other2, span.fOtherT, 
-                                other1, &oSpan2, alignedArray);
-                        break;
-                    }
-                }
-        skipExactMatches:
-                ;
-            }
-            ++index;
-        }
-    }
-    debugValidate();
-}
-
-void SkOpSegment::alignSpan(const SkPoint& newPt, double newT, const SkOpSegment* other,
-        double otherT, const SkOpSegment* other2, SkOpSpan* oSpan,
-        SkTDArray<AlignedSpan>* alignedArray) {
-    AlignedSpan* aligned = alignedArray->append();
-    aligned->fOldPt = oSpan->fPt;
-    aligned->fPt = newPt;
-    aligned->fOldT = oSpan->fT;
-    aligned->fT = newT;
-    aligned->fSegment = this;  // OPTIMIZE: may be unused, can remove
-    aligned->fOther1 = other;
-    aligned->fOther2 = other2;
-    SkASSERT(SkDPoint::RoughlyEqual(oSpan->fPt, newPt));
-    oSpan->fPt = newPt;
-//    SkASSERT(way_roughly_equal(oSpan->fT, newT));
-    oSpan->fT = newT;
-//    SkASSERT(way_roughly_equal(oSpan->fOtherT, otherT));
-    oSpan->fOtherT = otherT;
-}
-
-bool SkOpSegment::alignSpan(int index, double thisT, const SkPoint& thisPt) {
-    bool aligned = false;
-    SkOpSpan* span = &fTs[index];
-    SkOpSegment* other = span->fOther;
-    int oIndex = span->fOtherIndex;
-    SkOpSpan* oSpan = &other->fTs[oIndex];
-    if (span->fT != thisT) {
-        span->fT = thisT;
-        oSpan->fOtherT = thisT;
-        aligned = true;
-    }
-    if (span->fPt != thisPt) {
-        span->fPt = thisPt;
-        oSpan->fPt = thisPt;
-        aligned = true;
-    }
-    double oT = oSpan->fT;
-    if (oT == 0) {
-        return aligned;
-    }
-    int oStart = other->nextSpan(oIndex, -1) + 1;
-    oSpan = &other->fTs[oStart];
-    int otherIndex = oStart;
-    if (oT == 1) {
-        if (aligned) {
-            while (oSpan->fPt == thisPt && oSpan->fT != 1) {
-                oSpan->fTiny = true;
-                ++oSpan;
-            }
-        }
-        return aligned;
-    }
-    oT = oSpan->fT;
-    int oEnd = other->nextSpan(oIndex, 1);
-    bool oAligned = false;
-    if (oSpan->fPt != thisPt) {
-        oAligned |= other->alignSpan(oStart, oT, thisPt);
-    }
-    while (++otherIndex < oEnd) {
-        SkOpSpan* oNextSpan = &other->fTs[otherIndex];
-        if (oNextSpan->fT != oT || oNextSpan->fPt != thisPt) {
-            oAligned |= other->alignSpan(otherIndex, oT, thisPt);
-        }
-    }
-    if (oAligned) {
-        other->alignSpanState(oStart, oEnd);
-    }
-    return aligned;
-}
-
-void SkOpSegment::alignSpanState(int start, int end) {
-    SkOpSpan* lastSpan = &fTs[--end];
-    bool allSmall = lastSpan->fSmall;
-    bool allTiny = lastSpan->fTiny;
-    bool allDone = lastSpan->fDone;
-    SkDEBUGCODE(int winding = lastSpan->fWindValue);
-    SkDEBUGCODE(int oppWinding = lastSpan->fOppValue);
-    int index = start;
-    while (index < end) {
-        SkOpSpan* span = &fTs[index];
-        span->fSmall = allSmall;
-        span->fTiny = allTiny;
-        if (span->fDone != allDone) {
-            span->fDone = allDone;
-            fDoneSpans += allDone ? 1 : -1;
-        }
-        SkASSERT(span->fWindValue == winding);
-        SkASSERT(span->fOppValue == oppWinding);
-        ++index;
-    }
-}
-
-void SkOpSegment::blindCancel(const SkCoincidence& coincidence, SkOpSegment* other) {
-    bool binary = fOperand != other->fOperand;
-    int index = 0;
-    int last = this->count();
-    do {
-        SkOpSpan& span = this->fTs[--last];
-        if (span.fT != 1 && !span.fSmall) {
-            break;
-        }
-        span.fCoincident = true;
-    } while (true);
-    int oIndex = other->count();
-    do {
-        SkOpSpan& oSpan = other->fTs[--oIndex];
-        if (oSpan.fT != 1 && !oSpan.fSmall) {
-            break;
-        }
-        oSpan.fCoincident = true;
-    } while (true);
-    do {
-        SkOpSpan* test = &this->fTs[index];
-        int baseWind = test->fWindValue;
-        int baseOpp = test->fOppValue;
-        int endIndex = index;
-        while (++endIndex <= last) {
-            SkOpSpan* endSpan = &this->fTs[endIndex];
-            SkASSERT(endSpan->fT < 1);
-            if (endSpan->fWindValue != baseWind || endSpan->fOppValue != baseOpp) {
-                break;
-            }
-            endSpan->fCoincident = true;
-        }
-        SkOpSpan* oTest = &other->fTs[oIndex];
-        int oBaseWind = oTest->fWindValue;
-        int oBaseOpp = oTest->fOppValue;
-        int oStartIndex = oIndex;
-        while (--oStartIndex >= 0) {
-            SkOpSpan* oStartSpan = &other->fTs[oStartIndex];
-            if (oStartSpan->fWindValue != oBaseWind || oStartSpan->fOppValue != oBaseOpp) {
-                break;
-            }
-            oStartSpan->fCoincident = true;
-        }
-        bool decrement = baseWind && oBaseWind;
-        bool bigger = baseWind >= oBaseWind;
-        do {
-            SkASSERT(test->fT < 1);
-            if (decrement) {
-                if (binary && bigger) {
-                    test->fOppValue--;
-                } else {
-                    decrementSpan(test);
-                }
-            }
-            test->fCoincident = true;
-            test = &fTs[++index];
-        } while (index < endIndex);
-        do {
-            SkASSERT(oTest->fT < 1);
-            if (decrement) {
-                if (binary && !bigger) {
-                    oTest->fOppValue--;
-                } else {
-                    other->decrementSpan(oTest);
-                }
-            }
-            oTest->fCoincident = true;
-            oTest = &other->fTs[--oIndex];
-        } while (oIndex > oStartIndex);
-    } while (index <= last && oIndex >= 0);
-    SkASSERT(index > last);
-    SkASSERT(oIndex < 0);
-}
-
-void SkOpSegment::blindCoincident(const SkCoincidence& coincidence, SkOpSegment* other) {
-    bool binary = fOperand != other->fOperand;
-    int index = 0;
-    int last = this->count();
-    do {
-        SkOpSpan& span = this->fTs[--last];
-        if (span.fT != 1 && !span.fSmall) {
-            break;
-        }
-        span.fCoincident = true;
-    } while (true);
-    int oIndex = 0;
-    int oLast = other->count();
-    do {
-        SkOpSpan& oSpan = other->fTs[--oLast];
-        if (oSpan.fT != 1 && !oSpan.fSmall) {
-            break;
-        }
-        oSpan.fCoincident = true;
-    } while (true);
-    do {
-        SkOpSpan* test = &this->fTs[index];
-        int baseWind = test->fWindValue;
-        int baseOpp = test->fOppValue;
-        int endIndex = index;
-        SkOpSpan* endSpan;
-        while (++endIndex <= last) {
-            endSpan = &this->fTs[endIndex];
-            SkASSERT(endSpan->fT < 1);
-            if (endSpan->fWindValue != baseWind || endSpan->fOppValue != baseOpp) {
-                break;
-            }
-            endSpan->fCoincident = true;
-        }
-        SkOpSpan* oTest = &other->fTs[oIndex];
-        int oBaseWind = oTest->fWindValue;
-        int oBaseOpp = oTest->fOppValue;
-        int oEndIndex = oIndex;
-        SkOpSpan* oEndSpan;
-        while (++oEndIndex <= oLast) {
-            oEndSpan = &this->fTs[oEndIndex];
-            SkASSERT(oEndSpan->fT < 1);
-            if (oEndSpan->fWindValue != oBaseWind || oEndSpan->fOppValue != oBaseOpp) {
-                break;
-            }
-            oEndSpan->fCoincident = true;
-        }
-        // consolidate the winding count even if done
-        if ((test->fWindValue || test->fOppValue) && (oTest->fWindValue || oTest->fOppValue)) {
-            if (!binary || test->fWindValue + oTest->fOppValue >= 0) {
-                bumpCoincidentBlind(binary, index, endIndex);
-                other->bumpCoincidentOBlind(oIndex, oEndIndex);
-            } else {
-                other->bumpCoincidentBlind(binary, oIndex, oEndIndex);
-                bumpCoincidentOBlind(index, endIndex);
-            }
-        }
-        index = endIndex;
-        oIndex = oEndIndex;
-    } while (index <= last && oIndex <= oLast);
-    SkASSERT(index > last);
-    SkASSERT(oIndex > oLast);
-}
-
-void SkOpSegment::bumpCoincidentBlind(bool binary, int index, int endIndex) {
-    const SkOpSpan& oTest = fTs[index];
-    int oWindValue = oTest.fWindValue;
-    int oOppValue = oTest.fOppValue;
-    if (binary) {
-        SkTSwap<int>(oWindValue, oOppValue);
-    }
-    do {
-        (void) bumpSpan(&fTs[index], oWindValue, oOppValue);
-    } while (++index < endIndex);
-}
-
-void SkOpSegment::bumpCoincidentThis(const SkOpSpan& oTest, bool binary, int* indexPtr,
-        SkTArray<SkPoint, true>* outsideTs) {
-    int index = *indexPtr;
-    int oWindValue = oTest.fWindValue;
-    int oOppValue = oTest.fOppValue;
-    if (binary) {
-        SkTSwap<int>(oWindValue, oOppValue);
-    }
-    SkOpSpan* const test = &fTs[index];
-    SkOpSpan* end = test;
-    const SkPoint& oStartPt = oTest.fPt;
-    do {
-        if (bumpSpan(end, oWindValue, oOppValue)) {
-            TrackOutside(outsideTs, oStartPt);
-        }
-        end = &fTs[++index];
-    } while ((end->fPt == test->fPt || precisely_equal(end->fT, test->fT)) && end->fT < 1);
-    *indexPtr = index;
-}
-
-void SkOpSegment::bumpCoincidentOBlind(int index, int endIndex) {
-    do {
-        zeroSpan(&fTs[index]);
-    } while (++index < endIndex);
-}
-
-// because of the order in which coincidences are resolved, this and other
-// may not have the same intermediate points. Compute the corresponding
-// intermediate T values (using this as the master, other as the follower)
-// and walk other conditionally -- hoping that it catches up in the end
-void SkOpSegment::bumpCoincidentOther(const SkOpSpan& test, int* oIndexPtr,
-        SkTArray<SkPoint, true>* oOutsidePts) {
-    int oIndex = *oIndexPtr;
-    SkOpSpan* const oTest = &fTs[oIndex];
-    SkOpSpan* oEnd = oTest;
-    const SkPoint& oStartPt = oTest->fPt;
-    double oStartT = oTest->fT;
-#if 0  // FIXME : figure out what disabling this breaks
-    const SkPoint& startPt = test.fPt;
-    // this is always true since oEnd == oTest && oStartPt == oTest->fPt -- find proper condition
-    if (oStartPt == oEnd->fPt || precisely_equal(oStartT, oEnd->fT)) {
-        TrackOutside(oOutsidePts, startPt);
-    }
-#endif
-    while (oStartPt == oEnd->fPt || precisely_equal(oStartT, oEnd->fT)) {
-        zeroSpan(oEnd);
-        oEnd = &fTs[++oIndex];
-    }
-    *oIndexPtr = oIndex;
-}
-
-// FIXME: need to test this case:
-// contourA has two segments that are coincident
-// contourB has two segments that are coincident in the same place
-// each ends up with +2/0 pairs for winding count
-// since logic below doesn't transfer count (only increments/decrements) can this be
-// resolved to +4/0 ?
-
-// set spans from start to end to increment the greater by one and decrement
-// the lesser
-void SkOpSegment::addTCoincident(const SkPoint& startPt, const SkPoint& endPt, double endT,
-        SkOpSegment* other) {
-    bool binary = fOperand != other->fOperand;
-    int index = 0;
-    while (startPt != fTs[index].fPt) {
-        SkASSERT(index < fTs.count());
-        ++index;
-    }
-    double startT = fTs[index].fT;
-    while (index > 0 && precisely_equal(fTs[index - 1].fT, startT)) {
-        --index;
-    }
-    int oIndex = 0;
-    while (startPt != other->fTs[oIndex].fPt) {
-        SkASSERT(oIndex < other->fTs.count());
-        ++oIndex;
-    }
-    double oStartT = other->fTs[oIndex].fT;
-    while (oIndex > 0 && precisely_equal(other->fTs[oIndex - 1].fT, oStartT)) {
-        --oIndex;
-    }
-    SkSTArray<kOutsideTrackedTCount, SkPoint, true> outsidePts;
-    SkSTArray<kOutsideTrackedTCount, SkPoint, true> oOutsidePts;
-    SkOpSpan* test = &fTs[index];
-    const SkPoint* testPt = &test->fPt;
-    double testT = test->fT;
-    SkOpSpan* oTest = &other->fTs[oIndex];
-    const SkPoint* oTestPt = &oTest->fPt;
-    SkASSERT(AlmostEqualUlps(*testPt, *oTestPt));
-    do {
-        SkASSERT(test->fT < 1);
-        SkASSERT(oTest->fT < 1);
-
-        // consolidate the winding count even if done
-        if ((test->fWindValue == 0 && test->fOppValue == 0)
-                || (oTest->fWindValue == 0 && oTest->fOppValue == 0)) {
-            SkDEBUGCODE(int firstWind = test->fWindValue);
-            SkDEBUGCODE(int firstOpp = test->fOppValue);
-            do {
-                SkASSERT(firstWind == fTs[index].fWindValue);
-                SkASSERT(firstOpp == fTs[index].fOppValue);
-                ++index;
-                SkASSERT(index < fTs.count());
-            } while (*testPt == fTs[index].fPt);
-            SkDEBUGCODE(firstWind = oTest->fWindValue);
-            SkDEBUGCODE(firstOpp = oTest->fOppValue);
-            do {
-                SkASSERT(firstWind == other->fTs[oIndex].fWindValue);
-                SkASSERT(firstOpp == other->fTs[oIndex].fOppValue);
-                ++oIndex;
-                SkASSERT(oIndex < other->fTs.count());
-            } while (*oTestPt == other->fTs[oIndex].fPt);
-        } else {
-            if (!binary || test->fWindValue + oTest->fOppValue >= 0) {
-                bumpCoincidentThis(*oTest, binary, &index, &outsidePts);
-                other->bumpCoincidentOther(*test, &oIndex, &oOutsidePts);
-            } else {
-                other->bumpCoincidentThis(*test, binary, &oIndex, &oOutsidePts);
-                bumpCoincidentOther(*oTest, &index, &outsidePts);
-            }
-        }
-        test = &fTs[index];
-        testPt = &test->fPt;
-        testT = test->fT;
-        oTest = &other->fTs[oIndex];
-        oTestPt = &oTest->fPt;
-        if (endPt == *testPt || precisely_equal(endT, testT)) {
-            break;
-        }
-//        SkASSERT(AlmostEqualUlps(*testPt, *oTestPt));
-    } while (endPt != *oTestPt);
-    // in rare cases, one may have ended before the other
-    if (endPt != *testPt && !precisely_equal(endT, testT)) {
-        int lastWind = test[-1].fWindValue;
-        int lastOpp = test[-1].fOppValue;
-        bool zero = lastWind == 0 && lastOpp == 0;
-        do {
-            if (test->fWindValue || test->fOppValue) {
-                test->fWindValue = lastWind;
-                test->fOppValue = lastOpp;
-                if (zero) {
-                    test->fDone = true;
-                    ++fDoneSpans;
-                }
-            }
-            test = &fTs[++index];
-            testPt = &test->fPt;
-        } while (endPt != *testPt);
-    }
-    if (endPt != *oTestPt) {
-        // look ahead to see if zeroing more spans will allows us to catch up
-        int oPeekIndex = oIndex;
-        bool success = true;
-        SkOpSpan* oPeek;
-        int oCount = other->count();
-        do {
-            oPeek = &other->fTs[oPeekIndex];
-            if (++oPeekIndex == oCount) {
-                success = false;
-                break;
-            }
-        } while (endPt != oPeek->fPt);
-        if (success) {
-            // make sure the matching point completes the coincidence span
-            success = false;
-            do {
-                if (oPeek->fOther == this) {
-                    success = true;
-                    break;
-                }
-                if (++oPeekIndex == oCount) {
-                    break;
-                }
-                oPeek = &other->fTs[oPeekIndex];
-            } while (endPt == oPeek->fPt);
-        }
-        if (success) {
-            do {
-                if (!binary || test->fWindValue + oTest->fOppValue >= 0) {
-                    other->bumpCoincidentOther(*test, &oIndex, &oOutsidePts);
-                } else {
-                    other->bumpCoincidentThis(*test, binary, &oIndex, &oOutsidePts);
-                }
-                oTest = &other->fTs[oIndex];
-                oTestPt = &oTest->fPt;
-            } while (endPt != *oTestPt);
-        }
-    }
-    int outCount = outsidePts.count();
-    if (!done() && outCount) {
-        addCoinOutsides(outsidePts[0], endPt, other);
-    }
-    if (!other->done() && oOutsidePts.count()) {
-        other->addCoinOutsides(oOutsidePts[0], endPt, this);
-    }
-    setCoincidentRange(startPt, endPt, other);
-    other->setCoincidentRange(startPt, endPt, this);
-}
-
-// FIXME: this doesn't prevent the same span from being added twice
-// fix in caller, SkASSERT here?
-const SkOpSpan* SkOpSegment::addTPair(double t, SkOpSegment* other, double otherT, bool borrowWind,
-        const SkPoint& pt, const SkPoint& pt2) {
-    int tCount = fTs.count();
-    for (int tIndex = 0; tIndex < tCount; ++tIndex) {
-        const SkOpSpan& span = fTs[tIndex];
-        if (!approximately_negative(span.fT - t)) {
-            break;
-        }
-        if (approximately_negative(span.fT - t) && span.fOther == other
-                && approximately_equal(span.fOtherT, otherT)) {
-#if DEBUG_ADD_T_PAIR
-            SkDebugf("%s addTPair duplicate this=%d %1.9g other=%d %1.9g\n",
-                    __FUNCTION__, fID, t, other->fID, otherT);
-#endif
-            return NULL;
-        }
-    }
-#if DEBUG_ADD_T_PAIR
-    SkDebugf("%s addTPair this=%d %1.9g other=%d %1.9g\n",
-            __FUNCTION__, fID, t, other->fID, otherT);
-#endif
-    int insertedAt = addT(other, pt, t);
-    int otherInsertedAt = other->addT(this, pt2, otherT);
-    addOtherT(insertedAt, otherT, otherInsertedAt);
-    other->addOtherT(otherInsertedAt, t, insertedAt);
-    matchWindingValue(insertedAt, t, borrowWind);
-    other->matchWindingValue(otherInsertedAt, otherT, borrowWind);
-    SkOpSpan& span = this->fTs[insertedAt];
-    if (pt != pt2) {
-        span.fNear = true;
-        SkOpSpan& oSpan = other->fTs[otherInsertedAt];
-        oSpan.fNear = true;
-    }
-    return &span;
-}
-
-const SkOpSpan* SkOpSegment::addTPair(double t, SkOpSegment* other, double otherT, bool borrowWind,
-                           const SkPoint& pt) {
-    return addTPair(t, other, otherT, borrowWind, pt, pt);
-}
-
-bool SkOpSegment::betweenPoints(double midT, const SkPoint& pt1, const SkPoint& pt2) const {
-    const SkPoint midPt = ptAtT(midT);
-    SkPathOpsBounds bounds;
-    bounds.set(pt1.fX, pt1.fY, pt2.fX, pt2.fY);
-    bounds.sort();
-    return bounds.almostContains(midPt);
-}
-
-bool SkOpSegment::betweenTs(int lesser, double testT, int greater) const {
-    if (lesser > greater) {
-        SkTSwap<int>(lesser, greater);
-    }
-    return approximately_between(fTs[lesser].fT, testT, fTs[greater].fT);
-}
-
-// in extreme cases (like the buffer overflow test) return false to abort
-// for now, if one t value represents two different points, then the values are too extreme
-// to generate meaningful results
-bool SkOpSegment::calcAngles() {
-    int spanCount = fTs.count();
-    if (spanCount <= 2) {
-        return spanCount == 2;
-    }
-    int index = 1;
-    const SkOpSpan* firstSpan = &fTs[index];
-    int activePrior = checkSetAngle(0);
-    const SkOpSpan* span = &fTs[0];
-    if (firstSpan->fT == 0 || span->fTiny || span->fOtherT != 1 || span->fOther->multipleEnds()) {
-        index = findStartSpan(0);  // curve start intersects
-        SkASSERT(index > 0);
-        if (activePrior >= 0) {
-            addStartSpan(index);
-        }
-    }
-    bool addEnd;
-    int endIndex = spanCount - 1;
-    span = &fTs[endIndex - 1];
-    if ((addEnd = span->fT == 1 || span->fTiny)) {  // if curve end intersects
-        endIndex = findEndSpan(endIndex);
-        SkASSERT(endIndex > 0);
-    } else {
-        addEnd = fTs[endIndex].fOtherT != 0 || fTs[endIndex].fOther->multipleStarts();
-    }
-    SkASSERT(endIndex >= index);
-    int prior = 0;
-    while (index < endIndex) {
-        const SkOpSpan& fromSpan = fTs[index];  // for each intermediate intersection
-        const SkOpSpan* lastSpan;
-        span = &fromSpan;
-        int start = index;
-        do {
-            lastSpan = span;
-            span = &fTs[++index];
-            SkASSERT(index < spanCount);
-            if (!precisely_negative(span->fT - lastSpan->fT) && !lastSpan->fTiny) {
-                break;
-            }
-            if (!SkDPoint::ApproximatelyEqual(lastSpan->fPt, span->fPt)) {
-                return false;
-            }
-        } while (true);
-        SkOpAngle* angle = NULL;
-        SkOpAngle* priorAngle;
-        if (activePrior >= 0) {
-            int pActive = firstActive(prior);
-            SkASSERT(pActive < start);
-            priorAngle = &fAngles.push_back();
-            priorAngle->set(this, start, pActive);
-        }
-        int active = checkSetAngle(start);
-        if (active >= 0) {
-            SkASSERT(active < index);
-            angle = &fAngles.push_back();
-            angle->set(this, active, index);
-        }
-    #if DEBUG_ANGLE
-        debugCheckPointsEqualish(start, index);
-    #endif
-        prior = start;
-        do {
-            const SkOpSpan* startSpan = &fTs[start - 1];
-            if (!startSpan->fSmall || isCanceled(start - 1) || startSpan->fFromAngle
-                    || startSpan->fToAngle) {
-                break;
-            }
-            --start;
-        } while (start > 0);
-        do {
-            if (activePrior >= 0) {
-                SkASSERT(fTs[start].fFromAngle == NULL);
-                fTs[start].fFromAngle = priorAngle;
-            }
-            if (active >= 0) {
-                SkASSERT(fTs[start].fToAngle == NULL);
-                fTs[start].fToAngle = angle;
-            }
-        } while (++start < index);
-        activePrior = active;
-    }
-    if (addEnd && activePrior >= 0) {
-        addEndSpan(endIndex);
     }
     return true;
 }
 
-int SkOpSegment::checkSetAngle(int tIndex) const {
-    const SkOpSpan* span = &fTs[tIndex];
-    while (span->fTiny /* || span->fSmall */) {
-        span = &fTs[++tIndex];
+SkOpPtT* SkOpSegment::addMissing(double t, SkOpSegment* opp, SkChunkAlloc* allocator) {
+    SkOpSpanBase* existing = nullptr;
+    SkOpSpanBase* test = &fHead;
+    double testT;
+    do {
+        if ((testT = test->ptT()->fT) >= t) {
+            if (testT == t) {
+                existing = test;
+            }
+            break;
+        }
+    } while ((test = test->upCast()->next()));
+    SkOpPtT* result;
+    if (existing && existing->contains(opp)) {
+        result = existing->ptT();
+    } else {
+        result = this->addT(t, SkOpSegment::kNoAlias, allocator);
     }
-    return isCanceled(tIndex) ? -1 : tIndex;
+    SkASSERT(result);
+    return result;
+}
+
+SkOpPtT* SkOpSegment::addT(double t, AllowAlias allowAlias, SkChunkAlloc* allocator) {
+    debugValidate();
+    SkPoint pt = this->ptAtT(t);
+    SkOpSpanBase* span = &fHead;
+    do {
+        SkOpPtT* result = span->ptT();
+        SkOpPtT* loop;
+        bool duplicatePt;
+        if (t == result->fT) {
+            goto bumpSpan;
+        }
+        if (this->match(result, this, t, pt)) {
+            // see if any existing alias matches segment, pt, and t
+           loop = result->next();
+            duplicatePt = false;
+            while (loop != result) {
+                bool ptMatch = loop->fPt == pt;
+                if (loop->segment() == this && loop->fT == t && ptMatch) {
+                    goto bumpSpan;
+                }
+                duplicatePt |= ptMatch;
+                loop = loop->next();
+            }
+            if (kNoAlias == allowAlias) {
+    bumpSpan:
+                span->bumpSpanAdds();
+                return result;
+            }
+            SkOpPtT* alias = SkOpTAllocator<SkOpPtT>::Allocate(allocator);
+            alias->init(result->span(), t, pt, duplicatePt);
+            result->insert(alias);
+            result->span()->unaligned();
+            this->debugValidate();
+#if DEBUG_ADD_T
+            SkDebugf("%s alias t=%1.9g segID=%d spanID=%d\n",  __FUNCTION__, t,
+                    alias->segment()->debugID(), alias->span()->debugID());
+#endif
+            span->bumpSpanAdds();
+            return alias;
+        }
+        if (t < result->fT) {
+            SkOpSpan* prev = result->span()->prev();
+            SkOpSpan* span = insert(prev, allocator);
+            span->init(this, prev, t, pt);
+            this->debugValidate();
+#if DEBUG_ADD_T
+            SkDebugf("%s insert t=%1.9g segID=%d spanID=%d\n", __FUNCTION__, t,
+                    span->segment()->debugID(), span->debugID());
+#endif
+            span->bumpSpanAdds();
+            return span->ptT();
+        }
+        SkASSERT(span != &fTail);
+    } while ((span = span->upCast()->next()));
+    SkASSERT(0);
+    return nullptr;
+}
+
+// choose a solitary t and pt value; remove aliases; align the opposite ends
+void SkOpSegment::align() {
+    debugValidate();
+    SkOpSpanBase* span = &fHead;
+    if (!span->aligned()) {
+        span->alignEnd(0, fPts[0]);
+    }
+    while ((span = span->upCast()->next())) {
+        if (span == &fTail) {
+            break;
+        }
+        span->align();
+    }
+    if (!span->aligned()) {
+        span->alignEnd(1, fPts[SkPathOpsVerbToPoints(fVerb)]);
+    }
+    if (this->collapsed()) {
+        SkOpSpan* span = &fHead;
+        do {
+            span->setWindValue(0);
+            span->setOppValue(0);
+            this->markDone(span);
+        } while ((span = span->next()->upCastable()));
+    }
+    debugValidate();
+}
+
+void SkOpSegment::calcAngles(SkChunkAlloc* allocator) {
+    bool activePrior = !fHead.isCanceled();
+    if (activePrior && !fHead.simple()) {
+        addStartSpan(allocator);
+    }
+    SkOpSpan* prior = &fHead;
+    SkOpSpanBase* spanBase = fHead.next();
+    while (spanBase != &fTail) {
+        if (activePrior) {
+            SkOpAngle* priorAngle = SkOpTAllocator<SkOpAngle>::Allocate(allocator);
+            priorAngle->set(spanBase, prior);
+            spanBase->setFromAngle(priorAngle);
+        }
+        SkOpSpan* span = spanBase->upCast();
+        bool active = !span->isCanceled();
+        SkOpSpanBase* next = span->next();
+        if (active) {
+            SkOpAngle* angle = SkOpTAllocator<SkOpAngle>::Allocate(allocator);
+            angle->set(span, next);
+            span->setToAngle(angle);
+        }
+        activePrior = active;
+        prior = span;
+        spanBase = next;
+    }
+    if (activePrior && !fTail.simple()) {
+        addEndSpan(allocator);
+    }
+}
+
+bool SkOpSegment::collapsed() const {
+    return fVerb == SkPath::kLine_Verb && fHead.pt() == fTail.pt();
+}
+
+void SkOpSegment::ComputeOneSum(const SkOpAngle* baseAngle, SkOpAngle* nextAngle,
+        SkOpAngle::IncludeType includeType) {
+    SkOpSegment* baseSegment = baseAngle->segment();
+    int sumMiWinding = baseSegment->updateWindingReverse(baseAngle);
+    int sumSuWinding;
+    bool binary = includeType >= SkOpAngle::kBinarySingle;
+    if (binary) {
+        sumSuWinding = baseSegment->updateOppWindingReverse(baseAngle);
+        if (baseSegment->operand()) {
+            SkTSwap<int>(sumMiWinding, sumSuWinding);
+        }
+    }
+    SkOpSegment* nextSegment = nextAngle->segment();
+    int maxWinding, sumWinding;
+    SkOpSpanBase* last;
+    if (binary) {
+        int oppMaxWinding, oppSumWinding;
+        nextSegment->setUpWindings(nextAngle->start(), nextAngle->end(), &sumMiWinding,
+                &sumSuWinding, &maxWinding, &sumWinding, &oppMaxWinding, &oppSumWinding);
+        last = nextSegment->markAngle(maxWinding, sumWinding, oppMaxWinding, oppSumWinding,
+                nextAngle);
+    } else {
+        nextSegment->setUpWindings(nextAngle->start(), nextAngle->end(), &sumMiWinding,
+                &maxWinding, &sumWinding);
+        last = nextSegment->markAngle(maxWinding, sumWinding, nextAngle);
+    }
+    nextAngle->setLastMarked(last);
+}
+
+void SkOpSegment::ComputeOneSumReverse(SkOpAngle* baseAngle, SkOpAngle* nextAngle,
+        SkOpAngle::IncludeType includeType) {
+    SkOpSegment* baseSegment = baseAngle->segment();
+    int sumMiWinding = baseSegment->updateWinding(baseAngle);
+    int sumSuWinding;
+    bool binary = includeType >= SkOpAngle::kBinarySingle;
+    if (binary) {
+        sumSuWinding = baseSegment->updateOppWinding(baseAngle);
+        if (baseSegment->operand()) {
+            SkTSwap<int>(sumMiWinding, sumSuWinding);
+        }
+    }
+    SkOpSegment* nextSegment = nextAngle->segment();
+    int maxWinding, sumWinding;
+    SkOpSpanBase* last;
+    if (binary) {
+        int oppMaxWinding, oppSumWinding;
+        nextSegment->setUpWindings(nextAngle->end(), nextAngle->start(), &sumMiWinding,
+                &sumSuWinding, &maxWinding, &sumWinding, &oppMaxWinding, &oppSumWinding);
+        last = nextSegment->markAngle(maxWinding, sumWinding, oppMaxWinding, oppSumWinding,
+                nextAngle);
+    } else {
+        nextSegment->setUpWindings(nextAngle->end(), nextAngle->start(), &sumMiWinding,
+                &maxWinding, &sumWinding);
+        last = nextSegment->markAngle(maxWinding, sumWinding, nextAngle);
+    }
+    nextAngle->setLastMarked(last);
 }
 
 // at this point, the span is already ordered, or unorderable
-int SkOpSegment::computeSum(int startIndex, int endIndex, SkOpAngle::IncludeType includeType) {
+int SkOpSegment::computeSum(SkOpSpanBase* start, SkOpSpanBase* end,
+        SkOpAngle::IncludeType includeType) {
     SkASSERT(includeType != SkOpAngle::kUnaryXor);
-    SkOpAngle* firstAngle = spanToAngle(endIndex, startIndex);
-    if (NULL == firstAngle) {
+    SkOpAngle* firstAngle = this->spanToAngle(end, start);
+    if (nullptr == firstAngle || nullptr == firstAngle->next()) {
         return SK_NaN32;
     }
     // if all angles have a computed winding,
@@ -1573,7 +511,7 @@ int SkOpSegment::computeSum(int startIndex, int endIndex, SkOpAngle::IncludeType
     //  there's nothing to do
     // if two orderable angles are adjacent, and both are next to orderable angles,
     //  and one has winding computed, transfer to the other
-    SkOpAngle* baseAngle = NULL;
+    SkOpAngle* baseAngle = nullptr;
     bool tryReverse = false;
     // look for counterclockwise transfers
     SkOpAngle* angle = firstAngle->previous();
@@ -1586,10 +524,10 @@ int SkOpSegment::computeSum(int startIndex, int endIndex, SkOpAngle::IncludeType
         SkASSERT(prior->next() == angle);
         SkASSERT(angle->next() == next);
         if (prior->unorderable() || angle->unorderable() || next->unorderable()) {
-            baseAngle = NULL;
+            baseAngle = nullptr;
             continue;
         }
-        int testWinding = angle->segment()->windSum(angle);
+        int testWinding = angle->starter()->windSum();
         if (SK_MinS32 != testWinding) {
             baseAngle = angle;
             tryReverse = true;
@@ -1597,15 +535,15 @@ int SkOpSegment::computeSum(int startIndex, int endIndex, SkOpAngle::IncludeType
         }
         if (baseAngle) {
             ComputeOneSum(baseAngle, angle, includeType);
-            baseAngle = SK_MinS32 != angle->segment()->windSum(angle) ? angle : NULL;
+            baseAngle = SK_MinS32 != angle->starter()->windSum() ? angle : nullptr;
         }
     } while (next != firstAngle);
-    if (baseAngle && SK_MinS32 == firstAngle->segment()->windSum(firstAngle)) {
+    if (baseAngle && SK_MinS32 == firstAngle->starter()->windSum()) {
         firstAngle = baseAngle;
         tryReverse = true;
     }
     if (tryReverse) {
-        baseAngle = NULL;
+        baseAngle = nullptr;
         SkOpAngle* prior = firstAngle;
         do {
             angle = prior;
@@ -1613,1085 +551,60 @@ int SkOpSegment::computeSum(int startIndex, int endIndex, SkOpAngle::IncludeType
             SkASSERT(prior->next() == angle);
             next = angle->next();
             if (prior->unorderable() || angle->unorderable() || next->unorderable()) {
-                baseAngle = NULL;
+                baseAngle = nullptr;
                 continue;
             }
-            int testWinding = angle->segment()->windSum(angle);
+            int testWinding = angle->starter()->windSum();
             if (SK_MinS32 != testWinding) {
                 baseAngle = angle;
                 continue;
             }
             if (baseAngle) {
                 ComputeOneSumReverse(baseAngle, angle, includeType);
-                baseAngle = SK_MinS32 != angle->segment()->windSum(angle) ? angle : NULL;
+                baseAngle = SK_MinS32 != angle->starter()->windSum() ? angle : nullptr;
             }
         } while (prior != firstAngle);
     }
-    int minIndex = SkMin32(startIndex, endIndex);
-    return windSum(minIndex);
+    return start->starter(end)->windSum();
 }
 
-void SkOpSegment::ComputeOneSum(const SkOpAngle* baseAngle, SkOpAngle* nextAngle,
-        SkOpAngle::IncludeType includeType) {
-    const SkOpSegment* baseSegment = baseAngle->segment();
-    int sumMiWinding = baseSegment->updateWindingReverse(baseAngle);
-    int sumSuWinding;
-    bool binary = includeType >= SkOpAngle::kBinarySingle;
-    if (binary) {
-        sumSuWinding = baseSegment->updateOppWindingReverse(baseAngle);
-        if (baseSegment->operand()) {
-            SkTSwap<int>(sumMiWinding, sumSuWinding);
-        }
+void SkOpSegment::detach(const SkOpSpan* span) {
+    if (span->done()) {
+        --fDoneCount;
     }
-    SkOpSegment* nextSegment = nextAngle->segment();
-    int maxWinding, sumWinding;
-    SkOpSpan* last;
-    if (binary) {
-        int oppMaxWinding, oppSumWinding;
-        nextSegment->setUpWindings(nextAngle->start(), nextAngle->end(), &sumMiWinding,
-                &sumSuWinding, &maxWinding, &sumWinding, &oppMaxWinding, &oppSumWinding);
-        last = nextSegment->markAngle(maxWinding, sumWinding, oppMaxWinding, oppSumWinding,
-                nextAngle);
-    } else {
-        nextSegment->setUpWindings(nextAngle->start(), nextAngle->end(), &sumMiWinding,
-                &maxWinding, &sumWinding);
-        last = nextSegment->markAngle(maxWinding, sumWinding, nextAngle);
-    }
-    nextAngle->setLastMarked(last);
+    --fCount;
+    SkASSERT(fCount >= fDoneCount);
 }
 
-void SkOpSegment::ComputeOneSumReverse(const SkOpAngle* baseAngle, SkOpAngle* nextAngle,
-        SkOpAngle::IncludeType includeType) {
-    const SkOpSegment* baseSegment = baseAngle->segment();
-    int sumMiWinding = baseSegment->updateWinding(baseAngle);
-    int sumSuWinding;
-    bool binary = includeType >= SkOpAngle::kBinarySingle;
-    if (binary) {
-        sumSuWinding = baseSegment->updateOppWinding(baseAngle);
-        if (baseSegment->operand()) {
-            SkTSwap<int>(sumMiWinding, sumSuWinding);
-        }
-    }
-    SkOpSegment* nextSegment = nextAngle->segment();
-    int maxWinding, sumWinding;
-    SkOpSpan* last;
-    if (binary) {
-        int oppMaxWinding, oppSumWinding;
-        nextSegment->setUpWindings(nextAngle->end(), nextAngle->start(), &sumMiWinding,
-                &sumSuWinding, &maxWinding, &sumWinding, &oppMaxWinding, &oppSumWinding);
-        last = nextSegment->markAngle(maxWinding, sumWinding, oppMaxWinding, oppSumWinding,
-                nextAngle);
-    } else {
-        nextSegment->setUpWindings(nextAngle->end(), nextAngle->start(), &sumMiWinding,
-                &maxWinding, &sumWinding);
-        last = nextSegment->markAngle(maxWinding, sumWinding, nextAngle);
-    }
-    nextAngle->setLastMarked(last);
-}
-
-bool SkOpSegment::containsPt(const SkPoint& pt, int index, int endIndex) const {
-    int step = index < endIndex ? 1 : -1;
-    do {
-        const SkOpSpan& span = this->span(index);
-        if (span.fPt == pt) {
-            const SkOpSpan& endSpan = this->span(endIndex);
-            return span.fT == endSpan.fT && pt != endSpan.fPt;
-        }
-        index += step;
-    } while (index != endIndex);
-    return false;
-}
-
-bool SkOpSegment::containsT(double t, const SkOpSegment* other, double otherT) const {
-    int count = this->count();
-    for (int index = 0; index < count; ++index) {
-        const SkOpSpan& span = fTs[index];
-        if (t < span.fT) {
-            return false;
-        }
-        if (t == span.fT) {
-            if (other != span.fOther) {
-                continue;
-            }
-            if (other->fVerb != SkPath::kCubic_Verb) {
-                return true;
-            }
-            if (!other->fLoop) {
-                return true;
-            }
-            double otherMidT = (otherT + span.fOtherT) / 2;
-            SkPoint otherPt = other->ptAtT(otherMidT);
-            return SkDPoint::ApproximatelyEqual(span.fPt, otherPt);
-        }
-    }
-    return false;
-}
-
-int SkOpSegment::crossedSpanY(const SkPoint& basePt, SkScalar* bestY, double* hitT,
-                              bool* hitSomething, double mid, bool opp, bool current) const {
-    SkScalar bottom = fBounds.fBottom;
-    int bestTIndex = -1;
-    if (bottom <= *bestY) {
-        return bestTIndex;
-    }
-    SkScalar top = fBounds.fTop;
-    if (top >= basePt.fY) {
-        return bestTIndex;
-    }
-    if (fBounds.fLeft > basePt.fX) {
-        return bestTIndex;
-    }
-    if (fBounds.fRight < basePt.fX) {
-        return bestTIndex;
-    }
-    if (fBounds.fLeft == fBounds.fRight) {
-        // if vertical, and directly above test point, wait for another one
-        return AlmostEqualUlps(basePt.fX, fBounds.fLeft) ? SK_MinS32 : bestTIndex;
-    }
-    // intersect ray starting at basePt with edge
-    SkIntersections intersections;
-    // OPTIMIZE: use specialty function that intersects ray with curve,
-    // returning t values only for curve (we don't care about t on ray)
-    intersections.allowNear(false);
-    int pts = (intersections.*CurveVertical[SkPathOpsVerbToPoints(fVerb)])
-            (fPts, top, bottom, basePt.fX, false);
-    if (pts == 0 || (current && pts == 1)) {
-        return bestTIndex;
-    }
-    if (current) {
-        SkASSERT(pts > 1);
-        int closestIdx = 0;
-        double closest = fabs(intersections[0][0] - mid);
-        for (int idx = 1; idx < pts; ++idx) {
-            double test = fabs(intersections[0][idx] - mid);
-            if (closest > test) {
-                closestIdx = idx;
-                closest = test;
-            }
-        }
-        intersections.quickRemoveOne(closestIdx, --pts);
-    }
-    double bestT = -1;
-    for (int index = 0; index < pts; ++index) {
-        double foundT = intersections[0][index];
-        if (approximately_less_than_zero(foundT)
-                    || approximately_greater_than_one(foundT)) {
+double SkOpSegment::distSq(double t, const SkOpAngle* oppAngle) const {
+    SkDPoint testPt = this->dPtAtT(t);
+    SkDLine testPerp = {{ testPt, testPt }};
+    SkDVector slope = this->dSlopeAtT(t);
+    testPerp[1].fX += slope.fY;
+    testPerp[1].fY -= slope.fX;
+    SkIntersections i;
+    const SkOpSegment* oppSegment = oppAngle->segment();
+    (*CurveIntersectRay[oppSegment->verb()])(oppSegment->pts(), oppSegment->weight(), testPerp, &i);
+    double closestDistSq = SK_ScalarInfinity;
+    for (int index = 0; index < i.used(); ++index) {
+        if (!between(oppAngle->start()->t(), i[0][index], oppAngle->end()->t())) {
             continue;
         }
-        SkScalar testY = (*CurvePointAtT[SkPathOpsVerbToPoints(fVerb)])(fPts, foundT).fY;
-        if (approximately_negative(testY - *bestY)
-                || approximately_negative(basePt.fY - testY)) {
-            continue;
+        double testDistSq = testPt.distanceSquared(i.pt(index));
+        if (closestDistSq > testDistSq) {
+            closestDistSq = testDistSq;
         }
-        if (pts > 1 && fVerb == SkPath::kLine_Verb) {
-            return SK_MinS32;  // if the intersection is edge on, wait for another one
-        }
-        if (fVerb > SkPath::kLine_Verb) {
-            SkScalar dx = (*CurveSlopeAtT[SkPathOpsVerbToPoints(fVerb)])(fPts, foundT).fX;
-            if (approximately_zero(dx)) {
-                return SK_MinS32;  // hit vertical, wait for another one
-            }
-        }
-        *bestY = testY;
-        bestT = foundT;
     }
-    if (bestT < 0) {
-        return bestTIndex;
-    }
-    SkASSERT(bestT >= 0);
-    SkASSERT(bestT <= 1);
-    int start;
-    int end = 0;
-    do {
-        start = end;
-        end = nextSpan(start, 1);
-    } while (fTs[end].fT < bestT);
-    // FIXME: see next candidate for a better pattern to find the next start/end pair
-    while (start + 1 < end && fTs[start].fDone) {
-        ++start;
-    }
-    if (!isCanceled(start)) {
-        *hitT = bestT;
-        bestTIndex = start;
-        *hitSomething = true;
-    }
-    return bestTIndex;
+    return closestDistSq;
 }
 
-bool SkOpSegment::decrementSpan(SkOpSpan* span) {
-    SkASSERT(span->fWindValue > 0);
-    if (--(span->fWindValue) == 0) {
-        if (!span->fOppValue && !span->fDone) {
-            span->fDone = true;
-            ++fDoneSpans;
-            return true;
-        }
+void SkOpSegment::findCollapsed() {
+    if (fHead.contains(&fTail)) {
+        markAllDone();
+        // move start and end to the same point
+        fHead.alignEnd(0, fHead.pt());
+        fTail.setAligned();
     }
-    return false;
-}
-
-bool SkOpSegment::bumpSpan(SkOpSpan* span, int windDelta, int oppDelta) {
-    SkASSERT(!span->fDone || span->fTiny || span->fSmall);
-    span->fWindValue += windDelta;
-    SkASSERT(span->fWindValue >= 0);
-    span->fOppValue += oppDelta;
-    SkASSERT(span->fOppValue >= 0);
-    if (fXor) {
-        span->fWindValue &= 1;
-    }
-    if (fOppXor) {
-        span->fOppValue &= 1;
-    }
-    if (!span->fWindValue && !span->fOppValue) {
-        span->fDone = true;
-        ++fDoneSpans;
-        return true;
-    }
-    return false;
-}
-
-const SkOpSpan& SkOpSegment::firstSpan(const SkOpSpan& thisSpan) const {
-    const SkOpSpan* firstSpan = &thisSpan; // rewind to the start
-    const SkOpSpan* beginSpan = fTs.begin();
-    const SkPoint& testPt = thisSpan.fPt;
-    while (firstSpan > beginSpan && firstSpan[-1].fPt == testPt) {
-        --firstSpan;
-    }
-    return *firstSpan;
-}
-
-const SkOpSpan& SkOpSegment::lastSpan(const SkOpSpan& thisSpan) const {
-    const SkOpSpan* endSpan = fTs.end() - 1;  // last can't be small
-    const SkOpSpan* lastSpan = &thisSpan;  // find the end
-    const SkPoint& testPt = thisSpan.fPt;
-    while (lastSpan < endSpan && lastSpan[1].fPt == testPt) {
-        ++lastSpan;
-    }
-    return *lastSpan;
-}
-
-// with a loop, the comparison is move involved
-// scan backwards and forwards to count all matching points
-// (verify that there are twp scans marked as loops)
-// compare that against 2 matching scans for loop plus other results
-bool SkOpSegment::calcLoopSpanCount(const SkOpSpan& thisSpan, int* smallCounts) {
-    const SkOpSpan& firstSpan = this->firstSpan(thisSpan); // rewind to the start
-    const SkOpSpan& lastSpan = this->lastSpan(thisSpan);  // find the end
-    double firstLoopT = -1, lastLoopT = -1;
-    const SkOpSpan* testSpan = &firstSpan - 1;
-    while (++testSpan <= &lastSpan) {
-        if (testSpan->fLoop) {
-            firstLoopT = testSpan->fT;
-            break;
-        }
-    }
-    testSpan = &lastSpan + 1;
-    while (--testSpan >= &firstSpan) {
-        if (testSpan->fLoop) {
-            lastLoopT = testSpan->fT;
-            break;
-        }
-    }
-    SkASSERT((firstLoopT == -1) == (lastLoopT == -1));
-    if (firstLoopT == -1) {
-        return false;
-    }
-    SkASSERT(firstLoopT < lastLoopT);
-    testSpan = &firstSpan - 1;
-    smallCounts[0] = smallCounts[1] = 0;
-    while (++testSpan <= &lastSpan) {
-        SkASSERT(approximately_equal(testSpan->fT, firstLoopT) +
-                approximately_equal(testSpan->fT, lastLoopT) == 1);
-        smallCounts[approximately_equal(testSpan->fT, lastLoopT)]++;
-    }
-    return true;
-}
-
-double SkOpSegment::calcMissingTEnd(const SkOpSegment* ref, double loEnd, double min, double max,
-        double hiEnd, const SkOpSegment* other, int thisStart) {
-    if (max >= hiEnd) {
-        return -1;
-    }
-    int end = findOtherT(hiEnd, ref);
-    if (end < 0) {
-        return -1;
-    }
-    double tHi = span(end).fT;
-    double tLo, refLo;
-    if (thisStart >= 0) {
-        tLo = span(thisStart).fT;
-        refLo = min;
-    } else {
-        int start1 = findOtherT(loEnd, ref);
-        SkASSERT(start1 >= 0);
-        tLo = span(start1).fT;
-        refLo = loEnd;
-    }
-    double missingT = (max - refLo) / (hiEnd - refLo);
-    missingT = tLo + missingT * (tHi - tLo);
-    return missingT;
-}
-
-double SkOpSegment::calcMissingTStart(const SkOpSegment* ref, double loEnd, double min, double max,
-        double hiEnd, const SkOpSegment* other, int thisEnd) {
-    if (min <= loEnd) {
-        return -1;
-    }
-    int start = findOtherT(loEnd, ref);
-    if (start < 0) {
-        return -1;
-    }
-    double tLo = span(start).fT;
-    double tHi, refHi;
-    if (thisEnd >= 0) {
-        tHi = span(thisEnd).fT;
-        refHi = max;
-    } else {
-        int end1 = findOtherT(hiEnd, ref);
-        if (end1 < 0) {
-            return -1;
-        }
-        tHi = span(end1).fT;
-        refHi = hiEnd;
-    }
-    double missingT = (min - loEnd) / (refHi - loEnd);
-    missingT = tLo + missingT * (tHi - tLo);
-    return missingT;
-}
-
-// see if spans with two or more intersections have the same number on the other end
-void SkOpSegment::checkDuplicates() {
-    debugValidate();
-    SkSTArray<kMissingSpanCount, MissingSpan, true> missingSpans;
-    int index;
-    int endIndex = 0;
-    bool endFound;
-    do {
-        index = endIndex;
-        endIndex = nextExactSpan(index, 1);
-        if ((endFound = endIndex < 0)) {
-            endIndex = count();
-        }
-        int dupCount = endIndex - index;
-        if (dupCount < 2) {
-            continue;
-        }
-        do {
-            const SkOpSpan* thisSpan = &fTs[index];
-            if (thisSpan->fNear) {
-                continue;
-            }
-            SkOpSegment* other = thisSpan->fOther;
-            int oIndex = thisSpan->fOtherIndex;
-            int oStart = other->nextExactSpan(oIndex, -1) + 1;
-            int oEnd = other->nextExactSpan(oIndex, 1);
-            if (oEnd < 0) {
-                oEnd = other->count();
-            }
-            int oCount = oEnd - oStart;
-            // force the other to match its t and this pt if not on an end point
-            if (oCount != dupCount) {
-                MissingSpan& missing = missingSpans.push_back();
-                missing.fOther = NULL;
-                SkDEBUGCODE(sk_bzero(&missing, sizeof(missing)));
-                missing.fPt = thisSpan->fPt;
-                const SkOpSpan& oSpan = other->span(oIndex);
-                if (oCount > dupCount) {
-                    missing.fSegment = this;
-                    missing.fT = thisSpan->fT;
-                    other->checkLinks(&oSpan, &missingSpans);
-                } else {
-                    missing.fSegment = other;
-                    missing.fT = oSpan.fT;
-                    checkLinks(thisSpan, &missingSpans);
-                }
-                if (!missingSpans.back().fOther) {
-                    missingSpans.pop_back();
-                }
-            }
-        } while (++index < endIndex);
-    } while (!endFound);
-    int missingCount = missingSpans.count();
-    if (missingCount == 0) {
-        return;
-    }
-    SkSTArray<kMissingSpanCount, MissingSpan, true> missingCoincidence;
-    for (index = 0; index < missingCount; ++index)  {
-        MissingSpan& missing = missingSpans[index];
-        SkOpSegment* missingOther = missing.fOther;
-        if (missing.fSegment == missing.fOther) {
-            continue;
-        }
-#if 0  // FIXME: this eliminates spurious data from skpwww_argus_presse_fr_41 but breaks
-       // skpwww_fashionscandal_com_94 -- calcAngles complains, but I don't understand why
-        if (missing.fSegment->containsT(missing.fT, missing.fOther, missing.fOtherT)) {
-#if DEBUG_DUPLICATES
-            SkDebugf("skip 1 id=%d t=%1.9g other=%d otherT=%1.9g\n", missing.fSegment->fID,
-                    missing.fT, missing.fOther->fID, missing.fOtherT);
-#endif
-            continue;
-        }
-        if (missing.fOther->containsT(missing.fOtherT, missing.fSegment, missing.fT)) {
-#if DEBUG_DUPLICATES
-            SkDebugf("skip 2 id=%d t=%1.9g other=%d otherT=%1.9g\n", missing.fOther->fID,
-                    missing.fOtherT, missing.fSegment->fID, missing.fT);
-#endif
-            continue;
-        }
-#endif
-        // skip if adding would insert point into an existing coincindent span
-        if (missing.fSegment->inCoincidentSpan(missing.fT, missingOther)
-                && missingOther->inCoincidentSpan(missing.fOtherT, this)) {
-            continue;
-        }
-        // skip if the created coincident spans are small
-        if (missing.fSegment->coincidentSmall(missing.fPt, missing.fT, missingOther)
-                && missingOther->coincidentSmall(missing.fPt, missing.fOtherT, missing.fSegment)) {
-            continue;
-        }
-        const SkOpSpan* added = missing.fSegment->addTPair(missing.fT, missingOther,
-                missing.fOtherT, false, missing.fPt);
-        if (added && added->fSmall) {
-            missing.fSegment->checkSmallCoincidence(*added, &missingCoincidence);
-        }
-    }
-    for (index = 0; index < missingCount; ++index)  {
-        MissingSpan& missing = missingSpans[index];
-        missing.fSegment->fixOtherTIndex();
-        missing.fOther->fixOtherTIndex();
-    }
-    for (index = 0; index < missingCoincidence.count(); ++index) {
-        MissingSpan& missing = missingCoincidence[index];
-        missing.fSegment->fixOtherTIndex();
-    }
-    debugValidate();
-}
-
-// look to see if the curve end intersects an intermediary that intersects the other
-void SkOpSegment::checkEnds() {
-    debugValidate();
-    SkSTArray<kMissingSpanCount, MissingSpan, true> missingSpans;
-    int count = fTs.count();
-    for (int index = 0; index < count; ++index) {
-        const SkOpSpan& span = fTs[index];
-        double otherT = span.fOtherT;
-        if (otherT != 0 && otherT != 1) { // only check ends
-            continue;
-        }
-        const SkOpSegment* other = span.fOther;
-        // peek start/last describe the range of spans that match the other t of this span
-        int peekStart = span.fOtherIndex;
-        while (--peekStart >= 0 && other->fTs[peekStart].fT == otherT)
-            ;
-        int otherCount = other->fTs.count();
-        int peekLast = span.fOtherIndex;
-        while (++peekLast < otherCount && other->fTs[peekLast].fT == otherT)
-            ;
-        if (++peekStart == --peekLast) { // if there isn't a range, there's nothing to do
-            continue;
-        }
-        // t start/last describe the range of spans that match the t of this span
-        double t = span.fT;
-        double tBottom = -1;
-        int tStart = -1;
-        int tLast = count;
-        bool lastSmall = false;
-        double afterT = t;
-        for (int inner = 0; inner < count; ++inner) {
-            double innerT = fTs[inner].fT;
-            if (innerT <= t && innerT > tBottom) {
-                if (innerT < t || !lastSmall) {
-                    tStart = inner - 1;
-                }
-                tBottom = innerT;
-            }
-            if (innerT > afterT) {
-                if (t == afterT && lastSmall) {
-                    afterT = innerT;
-                } else {
-                    tLast = inner;
-                    break;
-                }
-            }
-            lastSmall = innerT <= t ? fTs[inner].fSmall : false;
-        }
-        for (int peekIndex = peekStart; peekIndex <= peekLast; ++peekIndex) {
-            if (peekIndex == span.fOtherIndex) {  // skip the other span pointed to by this span
-                continue;
-            }
-            const SkOpSpan& peekSpan = other->fTs[peekIndex];
-            SkOpSegment* match = peekSpan.fOther;
-            if (match->done()) {
-                continue;  // if the edge has already been eaten (likely coincidence), ignore it
-            }
-            const double matchT = peekSpan.fOtherT;
-            // see if any of the spans match the other spans
-            for (int tIndex = tStart + 1; tIndex < tLast; ++tIndex) {
-                const SkOpSpan& tSpan = fTs[tIndex];
-                if (tSpan.fOther == match) {
-                    if (tSpan.fOtherT == matchT) {
-                        goto nextPeekIndex;
-                    }
-                    double midT = (tSpan.fOtherT + matchT) / 2;
-                    if (match->betweenPoints(midT, tSpan.fPt, peekSpan.fPt)) {
-                        goto nextPeekIndex;
-                    }
-                }
-            }
-            if (missingSpans.count() > 0) {
-                const MissingSpan& lastMissing = missingSpans.back();
-                if (lastMissing.fT == t
-                        && lastMissing.fOther == match
-                        && lastMissing.fOtherT == matchT) {
-                    SkASSERT(lastMissing.fPt == peekSpan.fPt);
-                    continue;
-                }
-            }
-#if DEBUG_CHECK_ENDS
-            SkDebugf("%s id=%d missing t=%1.9g other=%d otherT=%1.9g pt=(%1.9g,%1.9g)\n",
-                    __FUNCTION__, fID, t, match->fID, matchT, peekSpan.fPt.fX, peekSpan.fPt.fY);
-#endif
-            // this segment is missing a entry that the other contains
-            // remember so we can add the missing one and recompute the indices
-            {
-                MissingSpan& missing = missingSpans.push_back();
-                SkDEBUGCODE(sk_bzero(&missing, sizeof(missing)));
-                missing.fT = t;
-                missing.fOther = match;
-                missing.fOtherT = matchT;
-                missing.fPt = peekSpan.fPt;
-            }
-            break;
-nextPeekIndex:
-            ;
-        }
-    }
-    if (missingSpans.count() == 0) {
-        debugValidate();
-        return;
-    }
-    debugValidate();
-    int missingCount = missingSpans.count();
-    for (int index = 0; index < missingCount; ++index)  {
-        MissingSpan& missing = missingSpans[index];
-        if (this != missing.fOther) {
-            addTPair(missing.fT, missing.fOther, missing.fOtherT, false, missing.fPt);
-        }
-    }
-    fixOtherTIndex();
-    // OPTIMIZATION: this may fix indices more than once. Build an array of unique segments to
-    // avoid this
-    for (int index = 0; index < missingCount; ++index)  {
-        missingSpans[index].fOther->fixOtherTIndex();
-    }
-    debugValidate();
-}
-
-void SkOpSegment::checkLinks(const SkOpSpan* base,
-        SkTArray<MissingSpan, true>* missingSpans) const {
-    const SkOpSpan* first = fTs.begin();
-    const SkOpSpan* last = fTs.end() - 1;
-    SkASSERT(base >= first && last >= base);
-    const SkOpSegment* other = base->fOther;
-    const SkOpSpan* oFirst = other->fTs.begin();
-    const SkOpSpan* oLast = other->fTs.end() - 1;
-    const SkOpSpan* oSpan = &other->fTs[base->fOtherIndex];
-    const SkOpSpan* test = base;
-    const SkOpSpan* missing = NULL;
-    while (test > first && (--test)->fPt == base->fPt) {
-        CheckOneLink(test, oSpan, oFirst, oLast, &missing, missingSpans);
-    }
-    test = base;
-    while (test < last && (++test)->fPt == base->fPt) {
-        CheckOneLink(test, oSpan, oFirst, oLast, &missing, missingSpans);
-    }
-}
-
-// see if spans with two or more intersections all agree on common t and point values
-void SkOpSegment::checkMultiples() {
-    debugValidate();
-    int index;
-    int end = 0;
-    while (fTs[++end].fT == 0)
-        ;
-    while (fTs[end].fT < 1) {
-        int start = index = end;
-        end = nextExactSpan(index, 1);
-        if (end <= index) {
-            return;  // buffer overflow example triggers this
-        }
-        if (index + 1 == end) {
-            continue;
-        }
-        // force the duplicates to agree on t and pt if not on the end
-        SkOpSpan& span = fTs[index];
-        double thisT = span.fT;
-        const SkPoint& thisPt = span.fPt;
-        span.fMultiple = true;
-        bool aligned = false;
-        while (++index < end) {
-            aligned |= alignSpan(index, thisT, thisPt);
-        }
-        if (aligned) {
-            alignSpanState(start, end);
-        }
-        fMultiples = true;
-    }
-    debugValidate();
-}
-
-void SkOpSegment::CheckOneLink(const SkOpSpan* test, const SkOpSpan* oSpan,
-        const SkOpSpan* oFirst, const SkOpSpan* oLast, const SkOpSpan** missingPtr,
-        SkTArray<MissingSpan, true>* missingSpans) {
-    SkASSERT(oSpan->fPt == test->fPt);
-    const SkOpSpan* oTest = oSpan;
-    while (oTest > oFirst && (--oTest)->fPt == test->fPt) {
-        if (oTest->fOther == test->fOther && oTest->fOtherT == test->fOtherT) {
-            return;
-        }
-    }
-    oTest = oSpan;
-    while (oTest < oLast && (++oTest)->fPt == test->fPt) {
-        if (oTest->fOther == test->fOther && oTest->fOtherT == test->fOtherT) {
-            return;
-        }
-    }
-    if (*missingPtr) {
-        missingSpans->push_back();
-    }
-    MissingSpan& lastMissing = missingSpans->back();
-    if (*missingPtr) {
-        lastMissing = missingSpans->end()[-2];
-    }
-    *missingPtr = test;
-    lastMissing.fOther = test->fOther;
-    lastMissing.fOtherT = test->fOtherT;
-}
-
-bool SkOpSegment::checkSmall(int index) const {
-    if (fTs[index].fSmall) {
-        return true;
-    }
-    double tBase = fTs[index].fT;
-    while (index > 0 && precisely_negative(tBase - fTs[--index].fT))
-        ;
-    return fTs[index].fSmall;
-}
-
-// a pair of curves may turn into coincident lines -- small may be a hint that that happened
-// if a cubic contains a loop, the counts must be adjusted
-void SkOpSegment::checkSmall() {
-    SkSTArray<kMissingSpanCount, MissingSpan, true> missingSpans;
-    const SkOpSpan* beginSpan = fTs.begin();
-    const SkOpSpan* thisSpan = beginSpan - 1;
-    const SkOpSpan* endSpan = fTs.end() - 1;  // last can't be small
-    while (++thisSpan < endSpan) {
-        if (!thisSpan->fSmall) {
-            continue;
-        }
-        if (!thisSpan->fWindValue) {
-            continue;
-        }
-        const SkOpSpan& firstSpan = this->firstSpan(*thisSpan);
-        const SkOpSpan& lastSpan = this->lastSpan(*thisSpan);
-        ptrdiff_t smallCount = &lastSpan - &firstSpan + 1;
-        SkASSERT(1 <= smallCount && smallCount < count());
-        if (smallCount <= 1) {
-            SkASSERT(1 == smallCount);
-            checkSmallCoincidence(firstSpan, NULL);
-            continue;
-        }
-        // at this point, check for missing computed intersections
-        const SkPoint& testPt = firstSpan.fPt;
-        thisSpan = &firstSpan - 1;
-        SkOpSegment* other = NULL;
-        while (++thisSpan <= &lastSpan) {
-            other = thisSpan->fOther;
-            if (other != this) {
-                break;
-            }
-        }
-        SkASSERT(other != this);
-        int oIndex = thisSpan->fOtherIndex;
-        const SkOpSpan& oSpan = other->span(oIndex);
-        const SkOpSpan& oFirstSpan = other->firstSpan(oSpan);
-        const SkOpSpan& oLastSpan = other->lastSpan(oSpan);
-        ptrdiff_t oCount = &oLastSpan - &oFirstSpan + 1;
-        if (fLoop) {
-            int smallCounts[2];
-            SkASSERT(!other->fLoop);  // FIXME: we need more complicated logic for pair of loops
-            if (calcLoopSpanCount(*thisSpan, smallCounts)) {
-                if (smallCounts[0] && oCount != smallCounts[0]) {
-                    SkASSERT(0);  // FIXME: need a working test case to properly code & debug
-                }
-                if (smallCounts[1] && oCount != smallCounts[1]) {
-                    SkASSERT(0);  // FIXME: need a working test case to properly code & debug
-                }
-                goto nextSmallCheck;
-            }
-        }
-        if (other->fLoop) {
-            int otherCounts[2];
-            if (other->calcLoopSpanCount(other->span(oIndex), otherCounts)) {
-                if (otherCounts[0] && otherCounts[0] != smallCount) {
-                    SkASSERT(0);  // FIXME: need a working test case to properly code & debug
-                }
-                if (otherCounts[1] && otherCounts[1] != smallCount) {
-                    SkASSERT(0);  // FIXME: need a working test case to properly code & debug
-                }
-                goto nextSmallCheck;
-            }
-        }
-        if (oCount != smallCount) {  // check if number of pts in this match other
-            MissingSpan& missing = missingSpans.push_back();
-            missing.fOther = NULL;
-            SkDEBUGCODE(sk_bzero(&missing, sizeof(missing)));
-            missing.fPt = testPt;
-            const SkOpSpan& oSpan = other->span(oIndex);
-            if (oCount > smallCount) {
-                missing.fSegment = this;
-                missing.fT = thisSpan->fT;
-                other->checkLinks(&oSpan, &missingSpans);
-            } else {
-                missing.fSegment = other;
-                missing.fT = oSpan.fT;
-                checkLinks(thisSpan, &missingSpans);
-            }
-            if (!missingSpans.back().fOther || missing.fSegment->done()) {
-                missingSpans.pop_back();
-            }
-        }
-nextSmallCheck:
-        thisSpan = &lastSpan;
-    }
-    int missingCount = missingSpans.count();
-    for (int index = 0; index < missingCount; ++index)  {
-        MissingSpan& missing = missingSpans[index];
-        SkOpSegment* missingOther = missing.fOther;
-        // note that add t pair may edit span arrays, so prior pointers to spans are no longer valid
-        if (!missing.fSegment->addTPair(missing.fT, missingOther, missing.fOtherT, false,
-                missing.fPt)) {
-            continue;
-        }
-        int otherTIndex = missingOther->findT(missing.fOtherT, missing.fPt, missing.fSegment);
-        const SkOpSpan& otherSpan = missingOther->span(otherTIndex);
-        if (otherSpan.fSmall) {
-            const SkOpSpan* nextSpan = &otherSpan;
-            do {
-                ++nextSpan;
-            } while (nextSpan->fSmall);
-            missing.fSegment->addTCoincident(missing.fPt, nextSpan->fPt, nextSpan->fT,
-                    missingOther);
-        } else if (otherSpan.fT > 0) {
-            const SkOpSpan* priorSpan = &otherSpan;
-            do {
-                --priorSpan;
-            } while (priorSpan->fT == otherSpan.fT);
-            if (priorSpan->fSmall) {
-                missing.fSegment->addTCancel(missing.fPt, priorSpan->fPt, missingOther);
-            }
-        }
-    }
-    // OPTIMIZATION: this may fix indices more than once. Build an array of unique segments to
-    // avoid this
-    for (int index = 0; index < missingCount; ++index)  {
-        MissingSpan& missing = missingSpans[index];
-        missing.fSegment->fixOtherTIndex();
-        missing.fOther->fixOtherTIndex();
-    }
-    debugValidate();
-}
-
-void SkOpSegment::checkSmallCoincidence(const SkOpSpan& span,
-        SkTArray<MissingSpan, true>* checkMultiple) {
-    SkASSERT(span.fSmall);
-    if (0 && !span.fWindValue) {
-        return;
-    }
-    SkASSERT(&span < fTs.end() - 1);
-    const SkOpSpan* next = &span + 1;
-    SkASSERT(!next->fSmall || checkMultiple);
-    if (checkMultiple) {
-        while (next->fSmall) {
-            ++next;
-            SkASSERT(next < fTs.end());
-        }
-    }
-    SkOpSegment* other = span.fOther;
-    while (other != next->fOther) {
-        if (!checkMultiple) {
-            return;
-        }
-        const SkOpSpan* test = next + 1;
-        if (test == fTs.end()) {
-            return;
-        }
-        if (test->fPt != next->fPt || !precisely_equal(test->fT, next->fT)) {
-            return;
-        }
-        next = test;
-    }
-    SkASSERT(span.fT < next->fT);
-    int oStartIndex = other->findExactT(span.fOtherT, this);
-    int oEndIndex = other->findExactT(next->fOtherT, this);
-    // FIXME: be overly conservative by limiting this to the caller that allows multiple smalls
-    if (!checkMultiple || fVerb != SkPath::kLine_Verb || other->fVerb != SkPath::kLine_Verb) {
-        SkPoint mid = ptAtT((span.fT + next->fT) / 2);
-        const SkOpSpan& oSpanStart = other->fTs[oStartIndex];
-        const SkOpSpan& oSpanEnd = other->fTs[oEndIndex];
-        SkPoint oMid = other->ptAtT((oSpanStart.fT + oSpanEnd.fT) / 2);
-        if (!SkDPoint::ApproximatelyEqual(mid, oMid)) {
-            return;
-        }
-    }
-    // FIXME: again, be overly conservative to avoid breaking existing tests
-    const SkOpSpan& oSpan = oStartIndex < oEndIndex ? other->fTs[oStartIndex]
-            : other->fTs[oEndIndex];
-    if (checkMultiple && !oSpan.fSmall) {
-        return;
-    }
-    SkASSERT(oSpan.fSmall);
-    if (oStartIndex < oEndIndex) {
-        addTCoincident(span.fPt, next->fPt, next->fT, other);
-    } else {
-        addTCancel(span.fPt, next->fPt, other);
-    }
-    if (!checkMultiple) {
-        return;
-    }
-    // check to see if either segment is coincident with a third segment -- if it is, and if
-    // the opposite segment is not already coincident with the third, make it so
-    // OPTIMIZE: to make this check easier, add coincident and cancel could set a coincident bit
-    if (span.fWindValue != 1 || span.fOppValue != 0) {
-//        start here;
-        // iterate through the spans, looking for the third coincident case
-        // if we find one, we need to return state to the caller so that the indices can be fixed
-        // this also suggests that all of this function is fragile since it relies on a valid index
-    }
-    // probably should make this a common function rather than copy/paste code
-    if (oSpan.fWindValue != 1 || oSpan.fOppValue != 0) {
-        const SkOpSpan* oTest = &oSpan;
-        while (--oTest >= other->fTs.begin()) {
-            if (oTest->fPt != oSpan.fPt || !precisely_equal(oTest->fT, oSpan.fT)) {
-                break;
-            }
-            SkOpSegment* testOther = oTest->fOther;
-            SkASSERT(testOther != this);
-            // look in both directions to see if there is a coincident span
-            const SkOpSpan* tTest = testOther->fTs.begin();
-            for (int testIndex = 0; testIndex < testOther->count(); ++testIndex) {
-                if (tTest->fPt != span.fPt) {
-                    ++tTest;
-                    continue;
-                }
-                if (testOther->verb() != SkPath::kLine_Verb
-                        || other->verb() != SkPath::kLine_Verb) {
-                    SkPoint mid = ptAtT((span.fT + next->fT) / 2);
-                    SkPoint oMid = other->ptAtT((oTest->fOtherT + tTest->fT) / 2);
-                    if (!SkDPoint::ApproximatelyEqual(mid, oMid)) {
-                        continue;
-                    }
-                }
-#if DEBUG_CONCIDENT
-                SkDebugf("%s coincident found=%d %1.9g %1.9g\n", __FUNCTION__, testOther->fID,
-                        oTest->fOtherT, tTest->fT);
-#endif
-                if (tTest->fT < oTest->fOtherT) {
-                    addTCoincident(span.fPt, next->fPt, next->fT, testOther);
-                } else {
-                    addTCancel(span.fPt, next->fPt, testOther);
-                }
-                MissingSpan missing;
-                missing.fSegment = testOther;
-                checkMultiple->push_back(missing);
-                break;
-            }
-        }
-        oTest = &oSpan;
-        while (++oTest < other->fTs.end()) {
-            if (oTest->fPt != oSpan.fPt || !precisely_equal(oTest->fT, oSpan.fT)) {
-                break;
-            }
-
-        }
-    }
-}
-
-// if pair of spans on either side of tiny have the same end point and mid point, mark
-// them as parallel
-void SkOpSegment::checkTiny() {
-    SkSTArray<kMissingSpanCount, MissingSpan, true> missingSpans;
-    SkOpSpan* thisSpan = fTs.begin() - 1;
-    const SkOpSpan* endSpan = fTs.end() - 1;  // last can't be tiny
-    while (++thisSpan < endSpan) {
-        if (!thisSpan->fTiny) {
-            continue;
-        }
-        SkOpSpan* nextSpan = thisSpan + 1;
-        double thisT = thisSpan->fT;
-        double nextT = nextSpan->fT;
-        if (thisT == nextT) {
-            continue;
-        }
-        SkASSERT(thisT < nextT);
-        SkASSERT(thisSpan->fPt == nextSpan->fPt);
-        SkOpSegment* thisOther = thisSpan->fOther;
-        SkOpSegment* nextOther = nextSpan->fOther;
-        int oIndex = thisSpan->fOtherIndex;
-        for (int oStep = -1; oStep <= 1; oStep += 2) {
-            int oEnd = thisOther->nextExactSpan(oIndex, oStep);
-            if (oEnd < 0) {
-                continue;
-            }
-            const SkOpSpan& oSpan = thisOther->span(oEnd);
-            int nIndex = nextSpan->fOtherIndex;
-            for (int nStep = -1; nStep <= 1; nStep += 2) {
-                int nEnd = nextOther->nextExactSpan(nIndex, nStep);
-                if (nEnd < 0) {
-                    continue;
-                }
-                const SkOpSpan& nSpan = nextOther->span(nEnd);
-                if (oSpan.fPt != nSpan.fPt) {
-                    continue;
-                }
-                double oMidT = (thisSpan->fOtherT + oSpan.fT) / 2;
-                const SkPoint& oPt = thisOther->ptAtT(oMidT);
-                double nMidT = (nextSpan->fOtherT + nSpan.fT) / 2;
-                const SkPoint& nPt = nextOther->ptAtT(nMidT);
-                if (!AlmostEqualUlps(oPt, nPt)) {
-                    continue;
-                }
-#if DEBUG_CHECK_TINY
-                SkDebugf("%s [%d] add coincidence [%d] [%d]\n", __FUNCTION__, fID,
-                    thisOther->fID, nextOther->fID);
-#endif
-                // this segment is missing a entry that the other contains
-                // remember so we can add the missing one and recompute the indices
-                MissingSpan& missing = missingSpans.push_back();
-                SkDEBUGCODE(sk_bzero(&missing, sizeof(missing)));
-                missing.fSegment = thisOther;
-                missing.fT = thisSpan->fOtherT;
-                missing.fOther = nextOther;
-                missing.fOtherT = nextSpan->fOtherT;
-                missing.fPt = thisSpan->fPt;
-            }
-        }
-    }
-    int missingCount = missingSpans.count();
-    if (!missingCount) {
-        return;
-    }
-    for (int index = 0; index < missingCount; ++index)  {
-        MissingSpan& missing = missingSpans[index];
-        if (missing.fSegment != missing.fOther) {
-            missing.fSegment->addTPair(missing.fT, missing.fOther, missing.fOtherT, false,
-                    missing.fPt);
-        }
-    }
-    // OPTIMIZE: consolidate to avoid multiple calls to fix index
-    for (int index = 0; index < missingCount; ++index)  {
-        MissingSpan& missing = missingSpans[index];
-        missing.fSegment->fixOtherTIndex();
-        missing.fOther->fixOtherTIndex();
-    }
-}
-
-bool SkOpSegment::coincidentSmall(const SkPoint& pt, double t, const SkOpSegment* other) const {
-    int count = this->count();
-    for (int index = 0; index < count; ++index) {
-        const SkOpSpan& span = this->span(index);
-        if (span.fOther != other) {
-            continue;
-        }
-        if (span.fPt == pt) {
-            continue;
-        }
-        if (!AlmostEqualUlps(span.fPt, pt)) {
-            continue;
-        }
-        if (fVerb != SkPath::kCubic_Verb) {
-            return true;
-        }
-        double tInterval = t - span.fT;
-        double tMid = t - tInterval / 2;
-        SkDPoint midPt = dcubic_xy_at_t(fPts, tMid);
-        return midPt.approximatelyEqual(xyAtT(t));
-    }
-    return false;
-}
-
-bool SkOpSegment::findCoincidentMatch(const SkOpSpan* span, const SkOpSegment* other, int oStart,
-        int oEnd, int step, SkPoint* startPt, SkPoint* endPt, double* endT) const {
-    SkASSERT(span->fT == 0 || span->fT == 1);
-    SkASSERT(span->fOtherT == 0 || span->fOtherT == 1);
-    const SkOpSpan* otherSpan = &other->span(oEnd);
-    double refT = otherSpan->fT;
-    const SkPoint& refPt = otherSpan->fPt;
-    const SkOpSpan* lastSpan = &other->span(step > 0 ? other->count() - 1 : 0);
-    do {
-        const SkOpSegment* match = span->fOther;
-        if (match == otherSpan->fOther) {
-            // find start of respective spans and see if both have winding
-            int startIndex, endIndex;
-            if (span->fOtherT == 1) {
-                endIndex = span->fOtherIndex;
-                startIndex = match->nextExactSpan(endIndex, -1);
-            } else {
-                startIndex = span->fOtherIndex;
-                endIndex = match->nextExactSpan(startIndex, 1);
-            }
-            const SkOpSpan& startSpan = match->span(startIndex);
-            if (startSpan.fWindValue != 0) {
-                // draw ray from endSpan.fPt perpendicular to end tangent and measure distance
-                // to other segment.
-                const SkOpSpan& endSpan = match->span(endIndex);
-                SkDLine ray;
-                SkVector dxdy;
-                if (span->fOtherT == 1) {
-                    ray.fPts[0].set(startSpan.fPt);
-                    dxdy = match->dxdy(startIndex);
-                } else {
-                    ray.fPts[0].set(endSpan.fPt);
-                    dxdy = match->dxdy(endIndex);
-                }
-                ray.fPts[1].fX = ray.fPts[0].fX + dxdy.fY;
-                ray.fPts[1].fY = ray.fPts[0].fY - dxdy.fX;
-                SkIntersections i;
-                int roots = (i.*CurveRay[SkPathOpsVerbToPoints(other->verb())])(other->pts(), ray);
-                for (int index = 0; index < roots; ++index) {
-                    if (ray.fPts[0].approximatelyEqual(i.pt(index))) {
-                        double matchMidT = (match->span(startIndex).fT
-                                + match->span(endIndex).fT) / 2;
-                        SkPoint matchMidPt = match->ptAtT(matchMidT);
-                        double otherMidT = (i[0][index] + other->span(oStart).fT) / 2;
-                        SkPoint otherMidPt = other->ptAtT(otherMidT);
-                        if (SkDPoint::ApproximatelyEqual(matchMidPt, otherMidPt)) {
-                            *startPt = startSpan.fPt;
-                            *endPt = endSpan.fPt;
-                            *endT = endSpan.fT;
-                            return true;
-                        }
-                    }
-                }
-            }
-            return false;
-        }
-        if (otherSpan == lastSpan) {
-            break;
-        }
-        otherSpan += step;
-    } while (otherSpan->fT == refT || otherSpan->fPt == refPt);
-    return false;
-}
-
-int SkOpSegment::findEndSpan(int endIndex) const {
-    const SkOpSpan* span = &fTs[--endIndex];
-    const SkPoint& lastPt = span->fPt;
-    double endT = span->fT;
-    do {
-        span = &fTs[--endIndex];
-    } while (SkDPoint::ApproximatelyEqual(span->fPt, lastPt) && (span->fT == endT || span->fTiny));
-    return endIndex + 1;
 }
 
 /*
@@ -2701,76 +614,62 @@ int SkOpSegment::findEndSpan(int endIndex) const {
  The Opp variable name part designates that the value is for the Opposite operator.
  Opposite values result from combining coincident spans.
  */
-SkOpSegment* SkOpSegment::findNextOp(SkTDArray<SkOpSpan*>* chase, int* nextStart, int* nextEnd,
-                                     bool* unsortable, SkPathOp op, const int xorMiMask,
-                                     const int xorSuMask) {
-    const int startIndex = *nextStart;
-    const int endIndex = *nextEnd;
-    SkASSERT(startIndex != endIndex);
-    SkDEBUGCODE(const int count = fTs.count());
-    SkASSERT(startIndex < endIndex ? startIndex < count - 1 : startIndex > 0);
-    int step = SkSign32(endIndex - startIndex);
-    *nextStart = startIndex;
-    SkOpSegment* other = isSimple(nextStart, &step);
-    if (other) 
-    {
+SkOpSegment* SkOpSegment::findNextOp(SkTDArray<SkOpSpanBase*>* chase, SkOpSpanBase** nextStart,
+        SkOpSpanBase** nextEnd, bool* unsortable, SkPathOp op, int xorMiMask, int xorSuMask) {
+    SkOpSpanBase* start = *nextStart;
+    SkOpSpanBase* end = *nextEnd;
+    SkASSERT(start != end);
+    int step = start->step(end);
+    SkOpSegment* other = this->isSimple(nextStart, &step);  // advances nextStart
+    if (other) {
     // mark the smaller of startIndex, endIndex done, and all adjacent
     // spans with the same T value (but not 'other' spans)
 #if DEBUG_WINDING
         SkDebugf("%s simple\n", __FUNCTION__);
 #endif
-        int min = SkMin32(startIndex, endIndex);
-        if (fTs[min].fDone) {
-            return NULL;
-        }
-        markDoneBinary(min);
-        double startT = other->fTs[*nextStart].fT;
-        *nextEnd = *nextStart;
-        do {
-            *nextEnd += step;
-        } while (precisely_zero(startT - other->fTs[*nextEnd].fT));
-        SkASSERT(step < 0 ? *nextEnd >= 0 : *nextEnd < other->fTs.count());
-        if (other->isTiny(SkMin32(*nextStart, *nextEnd))) {
-            *unsortable = true;
-            return NULL;
+        SkOpSpan* startSpan = start->starter(end);
+        if (startSpan->done()) {
+            return nullptr;
         }
+        markDone(startSpan);
+        *nextEnd = step > 0 ? (*nextStart)->upCast()->next() : (*nextStart)->prev();
         return other;
     }
-    const int end = nextExactSpan(startIndex, step);
-    SkASSERT(end >= 0);
-    SkASSERT(startIndex - endIndex != 0);
-    SkASSERT((startIndex - endIndex < 0) ^ (step < 0));
+    SkOpSpanBase* endNear = step > 0 ? (*nextStart)->upCast()->next() : (*nextStart)->prev();
+    SkASSERT(endNear == end);  // is this ever not end?
+    SkASSERT(endNear);
+    SkASSERT(start != endNear);
+    SkASSERT((start->t() < endNear->t()) ^ (step < 0));
     // more than one viable candidate -- measure angles to find best
-
-    int calcWinding = computeSum(startIndex, end, SkOpAngle::kBinaryOpp);
+    int calcWinding = computeSum(start, endNear, SkOpAngle::kBinaryOpp);
     bool sortable = calcWinding != SK_NaN32;
     if (!sortable) {
         *unsortable = true;
-        markDoneBinary(SkMin32(startIndex, endIndex));
-        return NULL;
+        markDone(start->starter(end));
+        return nullptr;
     }
-    SkOpAngle* angle = spanToAngle(end, startIndex);
+    SkOpAngle* angle = this->spanToAngle(end, start);
     if (angle->unorderable()) {
         *unsortable = true;
-        markDoneBinary(SkMin32(startIndex, endIndex));
-        return NULL;
+        markDone(start->starter(end));
+        return nullptr;
     }
 #if DEBUG_SORT
     SkDebugf("%s\n", __FUNCTION__);
     angle->debugLoop();
 #endif
-    int sumMiWinding = updateWinding(endIndex, startIndex);
+    int sumMiWinding = updateWinding(end, start);
     if (sumMiWinding == SK_MinS32) {
         *unsortable = true;
-        markDoneBinary(SkMin32(startIndex, endIndex));
-        return NULL;
+        markDone(start->starter(end));
+        return nullptr;
     }
-    int sumSuWinding = updateOppWinding(endIndex, startIndex);
+    int sumSuWinding = updateOppWinding(end, start);
     if (operand()) {
         SkTSwap<int>(sumMiWinding, sumSuWinding);
     }
     SkOpAngle* nextAngle = angle->next();
-    const SkOpAngle* foundAngle = NULL;
+    const SkOpAngle* foundAngle = nullptr;
     bool foundDone = false;
     // iterate through the angle, and compute everyone's winding
     SkOpSegment* nextSegment;
@@ -2782,11 +681,6 @@ SkOpSegment* SkOpSegment::findNextOp(SkTDArray<SkOpSpan*>* chase, int* nextStart
         if (activeAngle) {
             ++activeCount;
             if (!foundAngle || (foundDone && activeCount & 1)) {
-                if (nextSegment->isTiny(nextAngle)) {
-                    *unsortable = true;
-                    markDoneBinary(SkMin32(startIndex, endIndex));
-                    return NULL;
-                }
                 foundAngle = nextAngle;
                 foundDone = nextSegment->done(nextAngle);
             }
@@ -2794,32 +688,26 @@ SkOpSegment* SkOpSegment::findNextOp(SkTDArray<SkOpSpan*>* chase, int* nextStart
         if (nextSegment->done()) {
             continue;
         }
-        if (nextSegment->isTiny(nextAngle)) {
-            continue;
-        }
         if (!activeAngle) {
-            (void) nextSegment->markAndChaseDoneBinary(nextAngle->start(), nextAngle->end());
+            (void) nextSegment->markAndChaseDone(nextAngle->start(), nextAngle->end());
         }
-        SkOpSpan* last = nextAngle->lastMarked();
+        SkOpSpanBase* last = nextAngle->lastMarked();
         if (last) {
             SkASSERT(!SkPathOpsDebug::ChaseContains(*chase, last));
             *chase->append() = last;
 #if DEBUG_WINDING
-            SkDebugf("%s chase.append id=%d windSum=%d small=%d\n", __FUNCTION__,
-                    last->fOther->fTs[last->fOtherIndex].fOther->debugID(), last->fWindSum,
-                    last->fSmall);
+            SkDebugf("%s chase.append segment=%d span=%d", __FUNCTION__,
+                    last->segment()->debugID(), last->debugID());
+            if (!last->final()) {
+                SkDebugf(" windSum=%d", last->upCast()->windSum());
+            }
+            SkDebugf("\n");
 #endif
         }
     } while ((nextAngle = nextAngle->next()) != angle);
-#if DEBUG_ANGLE
-    if (foundAngle) {
-        foundAngle->debugSameAs(foundAngle);
-    }
-#endif
-
-    markDoneBinary(SkMin32(startIndex, endIndex));
+    start->segment()->markDone(start->starter(end));
     if (!foundAngle) {
-        return NULL;
+        return nullptr;
     }
     *nextStart = foundAngle->start();
     *nextEnd = foundAngle->end();
@@ -2831,62 +719,55 @@ SkOpSegment* SkOpSegment::findNextOp(SkTDArray<SkOpSpan*>* chase, int* nextStart
     return nextSegment;
 }
 
-SkOpSegment* SkOpSegment::findNextWinding(SkTDArray<SkOpSpan*>* chase, int* nextStart,
-                                          int* nextEnd, bool* unsortable) {
-    const int startIndex = *nextStart;
-    const int endIndex = *nextEnd;
-    SkASSERT(startIndex != endIndex);
-    SkDEBUGCODE(const int count = fTs.count());
-    SkASSERT(startIndex < endIndex ? startIndex < count - 1 : startIndex > 0);
-    int step = SkSign32(endIndex - startIndex);
-    *nextStart = startIndex;
-    SkOpSegment* other = isSimple(nextStart, &step);
-    if (other) 
-    {
+SkOpSegment* SkOpSegment::findNextWinding(SkTDArray<SkOpSpanBase*>* chase,
+        SkOpSpanBase** nextStart, SkOpSpanBase** nextEnd, bool* unsortable) {
+    SkOpSpanBase* start = *nextStart;
+    SkOpSpanBase* end = *nextEnd;
+    SkASSERT(start != end);
+    int step = start->step(end);
+    SkOpSegment* other = this->isSimple(nextStart, &step);  // advances nextStart
+    if (other) {
     // mark the smaller of startIndex, endIndex done, and all adjacent
     // spans with the same T value (but not 'other' spans)
 #if DEBUG_WINDING
         SkDebugf("%s simple\n", __FUNCTION__);
 #endif
-        int min = SkMin32(startIndex, endIndex);
-        if (fTs[min].fDone) {
-            return NULL;
-        }
-        markDoneUnary(min);
-        double startT = other->fTs[*nextStart].fT;
-        *nextEnd = *nextStart;
-        do {
-            *nextEnd += step;
-        } while (precisely_zero(startT - other->fTs[*nextEnd].fT));
-        SkASSERT(step < 0 ? *nextEnd >= 0 : *nextEnd < other->fTs.count());
-        if (other->isTiny(SkMin32(*nextStart, *nextEnd))) {
-            *unsortable = true;
-            return NULL;
+        SkOpSpan* startSpan = start->starter(end);
+        if (startSpan->done()) {
+            return nullptr;
         }
+        markDone(startSpan);
+        *nextEnd = step > 0 ? (*nextStart)->upCast()->next() : (*nextStart)->prev();
         return other;
     }
-    const int end = nextExactSpan(startIndex, step);
-    SkASSERT(end >= 0);
-    SkASSERT(startIndex - endIndex != 0);
-    SkASSERT((startIndex - endIndex < 0) ^ (step < 0));
+    SkOpSpanBase* endNear = step > 0 ? (*nextStart)->upCast()->next() : (*nextStart)->prev();
+    SkASSERT(endNear == end);  // is this ever not end?
+    SkASSERT(endNear);
+    SkASSERT(start != endNear);
+    SkASSERT((start->t() < endNear->t()) ^ (step < 0));
     // more than one viable candidate -- measure angles to find best
-
-    int calcWinding = computeSum(startIndex, end, SkOpAngle::kUnaryWinding);
+    int calcWinding = computeSum(start, endNear, SkOpAngle::kUnaryWinding);
     bool sortable = calcWinding != SK_NaN32;
     if (!sortable) {
         *unsortable = true;
-        markDoneUnary(SkMin32(startIndex, endIndex));
-        return NULL;
+        markDone(start->starter(end));
+        return nullptr;
+    }
+    SkOpAngle* angle = this->spanToAngle(end, start);
+    if (angle->unorderable()) {
+        *unsortable = true;
+        markDone(start->starter(end));
+        return nullptr;
     }
-    SkOpAngle* angle = spanToAngle(end, startIndex);
 #if DEBUG_SORT
     SkDebugf("%s\n", __FUNCTION__);
     angle->debugLoop();
 #endif
-    int sumWinding = updateWinding(endIndex, startIndex);
+    int sumWinding = updateWinding(end, start);
     SkOpAngle* nextAngle = angle->next();
-    const SkOpAngle* foundAngle = NULL;
+    const SkOpAngle* foundAngle = nullptr;
     bool foundDone = false;
+    // iterate through the angle, and compute everyone's winding
     SkOpSegment* nextSegment;
     int activeCount = 0;
     do {
@@ -2896,11 +777,6 @@ SkOpSegment* SkOpSegment::findNextWinding(SkTDArray<SkOpSpan*>* chase, int* next
         if (activeAngle) {
             ++activeCount;
             if (!foundAngle || (foundDone && activeCount & 1)) {
-                if (nextSegment->isTiny(nextAngle)) {
-                    *unsortable = true;
-                    markDoneUnary(SkMin32(startIndex, endIndex));
-                    return NULL;
-                }
                 foundAngle = nextAngle;
                 foundDone = nextSegment->done(nextAngle);
             }
@@ -2908,26 +784,26 @@ SkOpSegment* SkOpSegment::findNextWinding(SkTDArray<SkOpSpan*>* chase, int* next
         if (nextSegment->done()) {
             continue;
         }
-        if (nextSegment->isTiny(nextAngle)) {
-            continue;
-        }
         if (!activeAngle) {
-            nextSegment->markAndChaseDoneUnary(nextAngle->start(), nextAngle->end());
+            (void) nextSegment->markAndChaseDone(nextAngle->start(), nextAngle->end());
         }
-        SkOpSpan* last = nextAngle->lastMarked();
+        SkOpSpanBase* last = nextAngle->lastMarked();
         if (last) {
             SkASSERT(!SkPathOpsDebug::ChaseContains(*chase, last));
             *chase->append() = last;
 #if DEBUG_WINDING
-            SkDebugf("%s chase.append id=%d windSum=%d small=%d\n", __FUNCTION__,
-                    last->fOther->fTs[last->fOtherIndex].fOther->debugID(), last->fWindSum,
-                    last->fSmall);
+            SkDebugf("%s chase.append segment=%d span=%d", __FUNCTION__,
+                    last->segment()->debugID(), last->debugID());
+            if (!last->final()) {
+                SkDebugf(" windSum=%d", last->upCast()->windSum());
+            }
+            SkDebugf("\n");
 #endif
         }
     } while ((nextAngle = nextAngle->next()) != angle);
-    markDoneUnary(SkMin32(startIndex, endIndex));
+    start->segment()->markDone(start->starter(end));
     if (!foundAngle) {
-        return NULL;
+        return nullptr;
     }
     *nextStart = foundAngle->start();
     *nextEnd = foundAngle->end();
@@ -2939,74 +815,53 @@ SkOpSegment* SkOpSegment::findNextWinding(SkTDArray<SkOpSpan*>* chase, int* next
     return nextSegment;
 }
 
-SkOpSegment* SkOpSegment::findNextXor(int* nextStart, int* nextEnd, bool* unsortable) {
-    const int startIndex = *nextStart;
-    const int endIndex = *nextEnd;
-    SkASSERT(startIndex != endIndex);
-    SkDEBUGCODE(int count = fTs.count());
-    SkASSERT(startIndex < endIndex ? startIndex < count - 1 : startIndex > 0);
-    int step = SkSign32(endIndex - startIndex);
-// Detect cases where all the ends canceled out (e.g.,
-// there is no angle) and therefore there's only one valid connection 
-    *nextStart = startIndex;
-    SkOpSegment* other = isSimple(nextStart, &step);
-    if (other)
-    {
+SkOpSegment* SkOpSegment::findNextXor(SkOpSpanBase** nextStart, SkOpSpanBase** nextEnd,
+        bool* unsortable) {
+    SkOpSpanBase* start = *nextStart;
+    SkOpSpanBase* end = *nextEnd;
+    SkASSERT(start != end);
+    int step = start->step(end);
+    SkOpSegment* other = this->isSimple(nextStart, &step);  // advances nextStart
+    if (other) {
+    // mark the smaller of startIndex, endIndex done, and all adjacent
+    // spans with the same T value (but not 'other' spans)
 #if DEBUG_WINDING
         SkDebugf("%s simple\n", __FUNCTION__);
 #endif
-        int min = SkMin32(startIndex, endIndex);
-        if (fTs[min].fDone) {
-            return NULL;
+        SkOpSpan* startSpan = start->starter(end);
+        if (startSpan->done()) {
+            return nullptr;
         }
-        markDone(min, 1);
-        double startT = other->fTs[*nextStart].fT;
-        // FIXME: I don't know why the logic here is difference from the winding case
-        SkDEBUGCODE(bool firstLoop = true;)
-        if ((approximately_less_than_zero(startT) && step < 0)
-                || (approximately_greater_than_one(startT) && step > 0)) {
-            step = -step;
-            SkDEBUGCODE(firstLoop = false;)
-        }
-        do {
-            *nextEnd = *nextStart;
-            do {
-                *nextEnd += step;
-            } while (precisely_zero(startT - other->fTs[*nextEnd].fT));
-            if (other->fTs[SkMin32(*nextStart, *nextEnd)].fWindValue) {
-                break;
-            }
-            SkASSERT(firstLoop);
-            SkDEBUGCODE(firstLoop = false;)
-            step = -step;
-        } while (true);
-        SkASSERT(step < 0 ? *nextEnd >= 0 : *nextEnd < other->fTs.count());
+        markDone(startSpan);
+        *nextEnd = step > 0 ? (*nextStart)->upCast()->next() : (*nextStart)->prev();
         return other;
     }
-    SkASSERT(startIndex - endIndex != 0);
-    SkASSERT((startIndex - endIndex < 0) ^ (step < 0));
-    // parallel block above with presorted version
-    int end = nextExactSpan(startIndex, step);
-    SkASSERT(end >= 0);
-    SkOpAngle* angle = spanToAngle(end, startIndex);
-    SkASSERT(angle);
+    SkDEBUGCODE(SkOpSpanBase* endNear = step > 0 ? (*nextStart)->upCast()->next() \
+            : (*nextStart)->prev());
+    SkASSERT(endNear == end);  // is this ever not end?
+    SkASSERT(endNear);
+    SkASSERT(start != endNear);
+    SkASSERT((start->t() < endNear->t()) ^ (step < 0));
+    SkOpAngle* angle = this->spanToAngle(end, start);
+    if (!angle || angle->unorderable()) {
+        *unsortable = true;
+        markDone(start->starter(end));
+        return nullptr;
+    }
 #if DEBUG_SORT
     SkDebugf("%s\n", __FUNCTION__);
     angle->debugLoop();
 #endif
     SkOpAngle* nextAngle = angle->next();
-    const SkOpAngle* foundAngle = NULL;
+    const SkOpAngle* foundAngle = nullptr;
     bool foundDone = false;
+    // iterate through the angle, and compute everyone's winding
     SkOpSegment* nextSegment;
     int activeCount = 0;
     do {
         nextSegment = nextAngle->segment();
         ++activeCount;
         if (!foundAngle || (foundDone && activeCount & 1)) {
-            if (nextSegment->isTiny(nextAngle)) {
-                *unsortable = true;
-                return NULL;
-            }
             foundAngle = nextAngle;
             if (!(foundDone = nextSegment->done(nextAngle))) {
                 break;
@@ -3014,9 +869,9 @@ SkOpSegment* SkOpSegment::findNextXor(int* nextStart, int* nextEnd, bool* unsort
         }
         nextAngle = nextAngle->next();
     } while (nextAngle != angle);
-    markDone(SkMin32(startIndex, endIndex), 1);
+    start->segment()->markDone(start->starter(end));
     if (!foundAngle) {
-        return NULL;
+        return nullptr;
     }
     *nextStart = foundAngle->start();
     *nextEnd = foundAngle->end();
@@ -3028,495 +883,148 @@ SkOpSegment* SkOpSegment::findNextXor(int* nextStart, int* nextEnd, bool* unsort
     return nextSegment;
 }
 
-int SkOpSegment::findStartSpan(int startIndex) const {
-    int index = startIndex;
-    const SkOpSpan* span = &fTs[index];
-    const SkPoint& firstPt = span->fPt;
-    double firstT = span->fT;
-    const SkOpSpan* prior;
-    do {
-        prior = span;
-        span = &fTs[++index];
-    } while (SkDPoint::ApproximatelyEqual(span->fPt, firstPt)
-            && (span->fT == firstT || prior->fTiny));
-    return index;
+SkOpGlobalState* SkOpSegment::globalState() const {
+    return contour()->globalState(); 
 }
 
-int SkOpSegment::findExactT(double t, const SkOpSegment* match) const {
-    int count = this->count();
-    for (int index = 0; index < count; ++index) {
-        const SkOpSpan& span = fTs[index];
-        if (span.fT == t && span.fOther == match) {
-            return index;
-        }
-    }
-    SkASSERT(0);
-    return -1;
-}
-
-int SkOpSegment::findOtherT(double t, const SkOpSegment* match) const {
-    int count = this->count();
-    for (int index = 0; index < count; ++index) {
-        const SkOpSpan& span = fTs[index];
-        if (span.fOtherT == t && span.fOther == match) {
-            return index;
-        }
-    }
-    return -1;
-}
-
-int SkOpSegment::findT(double t, const SkPoint& pt, const SkOpSegment* match) const {
-    int count = this->count();
-    for (int index = 0; index < count; ++index) {
-        const SkOpSpan& span = fTs[index];
-        if (approximately_equal_orderable(span.fT, t) && span.fOther == match) {
-            return index;
-        }
-    }
-    // Usually, the pair of ts are an exact match. It's possible that the t values have
-    // been adjusted to make multiple intersections align. In this rare case, look for a
-    // matching point / match pair instead.
-    for (int index = 0; index < count; ++index) {
-        const SkOpSpan& span = fTs[index];
-        if (span.fPt == pt && span.fOther == match) {
-            return index;
-        }
-    }
-    SkASSERT(0);
-    return -1;
-}
-
-SkOpSegment* SkOpSegment::findTop(int* tIndexPtr, int* endIndexPtr, bool* unsortable,
-        bool firstPass) {
-    // iterate through T intersections and return topmost
-    // topmost tangent from y-min to first pt is closer to horizontal
-    SkASSERT(!done());
-    int firstT = -1;
-    /* SkPoint topPt = */ activeLeftTop(&firstT);
-    if (firstT < 0) {
-        *unsortable = !firstPass;
-        firstT = 0;
-        while (fTs[firstT].fDone) {
-            SkASSERT(firstT < fTs.count());
-            ++firstT;
-        }
-        *tIndexPtr = firstT;
-        *endIndexPtr = nextExactSpan(firstT, 1);
-        return this;
-    }
-    // sort the edges to find the leftmost
-    int step = 1;
-    int end;
-    if (span(firstT).fDone || (end = nextSpan(firstT, step)) == -1) {
-        step = -1;
-        end = nextSpan(firstT, step);
-        SkASSERT(end != -1);
-    }
-    // if the topmost T is not on end, or is three-way or more, find left
-    // look for left-ness from tLeft to firstT (matching y of other)
-    SkASSERT(firstT - end != 0);
-    SkOpAngle* markAngle = spanToAngle(firstT, end);
-    if (!markAngle) {
-        markAngle = addSingletonAngles(step);
-    }
-    markAngle->markStops();
-    const SkOpAngle* baseAngle = markAngle->next() == markAngle && !isVertical() ? markAngle
-            : markAngle->findFirst();
-    if (!baseAngle) {
-        return NULL;  // nothing to do
-    }
-    SkScalar top = SK_ScalarMax;
-    const SkOpAngle* firstAngle = NULL;
-    const SkOpAngle* angle = baseAngle;
-    do {
-        if (!angle->unorderable()) {
-            SkOpSegment* next = angle->segment();
-            SkPathOpsBounds bounds;
-            next->subDivideBounds(angle->end(), angle->start(), &bounds);
-            if (approximately_greater(top, bounds.fTop)) {
-                top = bounds.fTop;
-                firstAngle = angle;
-            }
-        }
-        angle = angle->next();
-    } while (angle != baseAngle);
-    SkASSERT(firstAngle);
-#if DEBUG_SORT
-    SkDebugf("%s\n", __FUNCTION__);
-    firstAngle->debugLoop();
-#endif
-    // skip edges that have already been processed
-    angle = firstAngle;
-    SkOpSegment* leftSegment = NULL;
-    bool looped = false;
-    do {
-        *unsortable = angle->unorderable();
-        if (firstPass || !*unsortable) {
-            leftSegment = angle->segment();
-            *tIndexPtr = angle->end();
-            *endIndexPtr = angle->start();
-            if (!leftSegment->fTs[SkMin32(*tIndexPtr, *endIndexPtr)].fDone) {
-                break;
-            }
-        }
-        angle = angle->next();
-        looped = true;
-    } while (angle != firstAngle);
-    if (angle == firstAngle && looped) {
-        return NULL;
-    }
-    if (leftSegment->verb() >= SkPath::kQuad_Verb) {
-        const int tIndex = *tIndexPtr;
-        const int endIndex = *endIndexPtr;
-        bool swap;
-        if (!leftSegment->clockwise(tIndex, endIndex, &swap)) {
-    #if DEBUG_SWAP_TOP
-            SkDebugf("%s swap=%d inflections=%d serpentine=%d controlledbyends=%d monotonic=%d\n",
-                    __FUNCTION__,
-                    swap, leftSegment->debugInflections(tIndex, endIndex),
-                    leftSegment->serpentine(tIndex, endIndex),
-                    leftSegment->controlsContainedByEnds(tIndex, endIndex),
-                    leftSegment->monotonicInY(tIndex, endIndex));
-    #endif
-            if (swap) {
-    // FIXME: I doubt it makes sense to (necessarily) swap if the edge was not the first
-    // sorted but merely the first not already processed (i.e., not done)
-                SkTSwap(*tIndexPtr, *endIndexPtr);
-            }
-        }
-    }
-    SkASSERT(!leftSegment->fTs[SkMin32(*tIndexPtr, *endIndexPtr)].fTiny);
-    return leftSegment;
-}
-
-int SkOpSegment::firstActive(int tIndex) const {
-    while (fTs[tIndex].fTiny) {
-        SkASSERT(!isCanceled(tIndex));
-        ++tIndex;
-    }
-    return tIndex;
-}
-
-// FIXME: not crazy about this
-// when the intersections are performed, the other index is into an
-// incomplete array. As the array grows, the indices become incorrect
-// while the following fixes the indices up again, it isn't smart about
-// skipping segments whose indices are already correct
-// assuming we leave the code that wrote the index in the first place
-// FIXME: if called after remove, this needs to correct tiny
-void SkOpSegment::fixOtherTIndex() {
-    int iCount = fTs.count();
-    for (int i = 0; i < iCount; ++i) {
-        SkOpSpan& iSpan = fTs[i];
-        double oT = iSpan.fOtherT;
-        SkOpSegment* other = iSpan.fOther;
-        int oCount = other->fTs.count();
-        SkDEBUGCODE(iSpan.fOtherIndex = -1);
-        for (int o = 0; o < oCount; ++o) {
-            SkOpSpan& oSpan = other->fTs[o];
-            if (oT == oSpan.fT && this == oSpan.fOther && oSpan.fOtherT == iSpan.fT) {
-                iSpan.fOtherIndex = o;
-                oSpan.fOtherIndex = i;
-                break;
-            }
-        }
-        SkASSERT(iSpan.fOtherIndex >= 0);
-    }
-}
-
-bool SkOpSegment::inCoincidentSpan(double t, const SkOpSegment* other) const {
-    int foundEnds = 0;
-    int count = this->count();
-    for (int index = 0; index < count; ++index) {
-        const SkOpSpan& span = this->span(index);
-        if (span.fCoincident) {
-            foundEnds |= (span.fOther == other) << ((t > span.fT) + (t >= span.fT));
-        }
-    }
-    SkASSERT(foundEnds != 7);
-    return foundEnds == 0x3 || foundEnds == 0x5 || foundEnds == 0x6;  // two bits set
-}
-
-void SkOpSegment::init(const SkPoint pts[], SkPath::Verb verb, bool operand, bool evenOdd) {
-    fDoneSpans = 0;
-    fOperand = operand;
-    fXor = evenOdd;
+void SkOpSegment::init(SkPoint pts[], SkScalar weight, SkOpContour* contour, SkPath::Verb verb) {
+    fContour = contour;
+    fNext = nullptr;
+    fOriginal[0] = pts[0];
+    fOriginal[1] = pts[SkPathOpsVerbToPoints(verb)];
     fPts = pts;
+    fWeight = weight;
     fVerb = verb;
-    fLoop = fMultiples = fSmall = fTiny = false;
+    fCount = 0;
+    fDoneCount = 0;
+    fVisited = false;
+    SkOpSpan* zeroSpan = &fHead;
+    zeroSpan->init(this, nullptr, 0, fPts[0]);
+    SkOpSpanBase* oneSpan = &fTail;
+    zeroSpan->setNext(oneSpan);
+    oneSpan->initBase(this, zeroSpan, 1, fPts[SkPathOpsVerbToPoints(fVerb)]);
+    SkDEBUGCODE(fID = globalState()->nextSegmentID());
 }
 
-void SkOpSegment::initWinding(int start, int end, SkOpAngle::IncludeType angleIncludeType) {
-    int local = spanSign(start, end);
-    if (angleIncludeType == SkOpAngle::kBinarySingle) {
-        int oppLocal = oppSign(start, end);
-        (void) markAndChaseWinding(start, end, local, oppLocal);
-    // OPTIMIZATION: the reverse mark and chase could skip the first marking
-        (void) markAndChaseWinding(end, start, local, oppLocal);
-    } else {
-        (void) markAndChaseWinding(start, end, local);
-    // OPTIMIZATION: the reverse mark and chase could skip the first marking
-        (void) markAndChaseWinding(end, start, local);
-    }
-}
-
-/*
-when we start with a vertical intersect, we try to use the dx to determine if the edge is to
-the left or the right of vertical. This determines if we need to add the span's
-sign or not. However, this isn't enough.
-If the supplied sign (winding) is zero, then we didn't hit another vertical span, so dx is needed.
-If there was a winding, then it may or may not need adjusting. If the span the winding was borrowed
-from has the same x direction as this span, the winding should change. If the dx is opposite, then
-the same winding is shared by both.
-*/
-void SkOpSegment::initWinding(int start, int end, double tHit, int winding, SkScalar hitDx,
-                              int oppWind, SkScalar hitOppDx) {
-    SkASSERT(hitDx || !winding);
-    SkScalar dx = (*CurveSlopeAtT[SkPathOpsVerbToPoints(fVerb)])(fPts, tHit).fX;
-    SkASSERT(dx);
-    int windVal = windValue(SkMin32(start, end));
-#if DEBUG_WINDING_AT_T
-    SkDebugf("%s id=%d oldWinding=%d hitDx=%c dx=%c windVal=%d", __FUNCTION__, debugID(), winding,
-            hitDx ? hitDx > 0 ? '+' : '-' : '0', dx > 0 ? '+' : '-', windVal);
-#endif
-    int sideWind = winding + (dx < 0 ? windVal : -windVal);
-    if (abs(winding) < abs(sideWind)) {
-        winding = sideWind;
-    }
-    SkDEBUGCODE(int oppLocal = oppSign(start, end));
-    SkASSERT(hitOppDx || !oppWind || !oppLocal);
-    int oppWindVal = oppValue(SkMin32(start, end));
-    if (!oppWind) {
-        oppWind = dx < 0 ? oppWindVal : -oppWindVal;
-    } else if (hitOppDx * dx >= 0) {
-        int oppSideWind = oppWind + (dx < 0 ? oppWindVal : -oppWindVal);
-        if (abs(oppWind) < abs(oppSideWind)) {
-            oppWind = oppSideWind;
-        }
-    }
-#if DEBUG_WINDING_AT_T
-    SkDebugf(" winding=%d oppWind=%d\n", winding, oppWind);
-#endif
-    (void) markAndChaseWinding(start, end, winding, oppWind);
-    // OPTIMIZATION: the reverse mark and chase could skip the first marking
-    (void) markAndChaseWinding(end, start, winding, oppWind);
-}
-
-bool SkOpSegment::inLoop(const SkOpAngle* baseAngle, int spanCount, int* indexPtr) const {
-    if (!baseAngle->inLoop()) {
-        return false;
-    }
-    int index = *indexPtr;
-    SkOpAngle* from = fTs[index].fFromAngle;
-    SkOpAngle* to = fTs[index].fToAngle;
-    while (++index < spanCount) {
-        SkOpAngle* nextFrom = fTs[index].fFromAngle;
-        SkOpAngle* nextTo = fTs[index].fToAngle;
-        if (from != nextFrom || to != nextTo) {
-            break;
-        }
-    }
-    *indexPtr = index;
-    return true;
-}
-
-// OPTIMIZE: successive calls could start were the last leaves off
-// or calls could specialize to walk forwards or backwards
-bool SkOpSegment::isMissing(double startT, const SkPoint& pt) const {
-    int tCount = fTs.count();
-    for (int index = 0; index < tCount; ++index) {
-        const SkOpSpan& span = fTs[index];
-        if (approximately_zero(startT - span.fT) && pt == span.fPt) {
-            return false;
-        }
-    }
-    return true;
-}
-
-
-SkOpSegment* SkOpSegment::isSimple(int* end, int* step) {
-    return nextChase(end, step, NULL, NULL);
-}
-
-bool SkOpSegment::isTiny(const SkOpAngle* angle) const {
-    int start = angle->start();
-    int end = angle->end();
-    const SkOpSpan& mSpan = fTs[SkMin32(start, end)];
-    return mSpan.fTiny;
-}
-
-bool SkOpSegment::isTiny(int index) const {
-    return fTs[index].fTiny;
-}
-
-// look pair of active edges going away from coincident edge
-// one of them should be the continuation of other
-// if both are active, look to see if they both the connect to another coincident pair
-// if at least one is a line, then make the pair coincident
-// if neither is a line, test for coincidence
-bool SkOpSegment::joinCoincidence(SkOpSegment* other, double otherT, const SkPoint& otherPt,
-        int step, bool cancel) {
-    int otherTIndex = other->findT(otherT, otherPt, this);
-    int next = other->nextExactSpan(otherTIndex, step);
-    int otherMin = SkMin32(otherTIndex, next);
-    int otherWind = other->span(otherMin).fWindValue;
-    if (otherWind == 0) {
-        return false;
-    }
-    SkASSERT(next >= 0);
-    int tIndex = 0;
-    do {
-        SkOpSpan* test = &fTs[tIndex];
-        SkASSERT(test->fT == 0);
-        if (test->fOther == other || test->fOtherT != 1) {
-            continue;
-        }
-        SkPoint startPt, endPt;
-        double endT;
-        if (findCoincidentMatch(test, other, otherTIndex, next, step, &startPt, &endPt, &endT)) {
-            SkOpSegment* match = test->fOther;
-            if (cancel) {
-                match->addTCancel(startPt, endPt, other);
-            } else {
-                match->addTCoincident(startPt, endPt, endT, other);
-            }
+bool SkOpSegment::isClose(double t, const SkOpSegment* opp) const {
+    SkDPoint cPt = this->dPtAtT(t);
+    SkDVector dxdy = (*CurveDSlopeAtT[this->verb()])(this->pts(), this->weight(), t);
+    SkDLine perp = {{ cPt, {cPt.fX + dxdy.fY, cPt.fY - dxdy.fX} }};
+    SkIntersections i;
+    (*CurveIntersectRay[opp->verb()])(opp->pts(), opp->weight(), perp, &i);
+    int used = i.used();
+    for (int index = 0; index < used; ++index) {
+        if (cPt.roughlyEqual(i.pt(index))) {
             return true;
         }
-    } while (fTs[++tIndex].fT == 0);
+    }
     return false;
 }
 
-// this span is excluded by the winding rule -- chase the ends
-// as long as they are unambiguous to mark connections as done
-// and give them the same winding value
+bool SkOpSegment::isXor() const {
+    return fContour->isXor();
+}
 
-SkOpSpan* SkOpSegment::markAndChaseDoneBinary(int index, int endIndex) {
-    int step = SkSign32(endIndex - index);
-    int min = SkMin32(index, endIndex);
-    markDoneBinary(min);
-    SkOpSpan* last = NULL;
+void SkOpSegment::markAllDone() {
+    SkOpSpan* span = this->head();
+    do {
+        this->markDone(span);
+    } while ((span = span->next()->upCastable()));
+}
+
+SkOpSpanBase* SkOpSegment::markAndChaseDone(SkOpSpanBase* start, SkOpSpanBase* end) {
+    int step = start->step(end);
+    SkOpSpan* minSpan = start->starter(end);
+    markDone(minSpan);
+    SkOpSpanBase* last = nullptr;
     SkOpSegment* other = this;
-    while ((other = other->nextChase(&index, &step, &min, &last))) {
+    while ((other = other->nextChase(&start, &step, &minSpan, &last))) {
         if (other->done()) {
             SkASSERT(!last);
             break;
         }
-        other->markDoneBinary(min);
+        other->markDone(minSpan);
     }
     return last;
 }
 
-SkOpSpan* SkOpSegment::markAndChaseDoneUnary(int index, int endIndex) {
-    int step = SkSign32(endIndex - index);
-    int min = SkMin32(index, endIndex);
-    markDoneUnary(min);
-    SkOpSpan* last = NULL;
+bool SkOpSegment::markAndChaseWinding(SkOpSpanBase* start, SkOpSpanBase* end, int winding,
+        SkOpSpanBase** lastPtr) {
+    SkOpSpan* spanStart = start->starter(end);
+    int step = start->step(end);
+    bool success = markWinding(spanStart, winding);
+    SkOpSpanBase* last = nullptr;
     SkOpSegment* other = this;
-    while ((other = other->nextChase(&index, &step, &min, &last))) {
-        if (other->done()) {
+    while ((other = other->nextChase(&start, &step, &spanStart, &last))) {
+        if (spanStart->windSum() != SK_MinS32) {
+            SkASSERT(spanStart->windSum() == winding);
             SkASSERT(!last);
             break;
         }
-        other->markDoneUnary(min);
+        (void) other->markWinding(spanStart, winding);
     }
-    return last;
+    if (lastPtr) {
+        *lastPtr = last;
+    }
+    return success;
 }
 
-SkOpSpan* SkOpSegment::markAndChaseWinding(const SkOpAngle* angle, int winding) {
-    int index = angle->start();
-    int endIndex = angle->end();
-    int step = SkSign32(endIndex - index);
-    int min = SkMin32(index, endIndex);
-    markWinding(min, winding);
-    SkOpSpan* last = NULL;
+bool SkOpSegment::markAndChaseWinding(SkOpSpanBase* start, SkOpSpanBase* end,
+        int winding, int oppWinding, SkOpSpanBase** lastPtr) {
+    SkOpSpan* spanStart = start->starter(end);
+    int step = start->step(end);
+    bool success = markWinding(spanStart, winding, oppWinding);
+    SkOpSpanBase* last = nullptr;
     SkOpSegment* other = this;
-    while ((other = other->nextChase(&index, &step, &min, &last))) {
-        if (other->fTs[min].fWindSum != SK_MinS32) {
-//            SkASSERT(other->fTs[min].fWindSum == winding);
-            SkASSERT(!last);
-            break;
-        }
-        other->markWinding(min, winding);
-    }
-    return last;
-}
-
-SkOpSpan* SkOpSegment::markAndChaseWinding(int index, int endIndex, int winding) {
-    int min = SkMin32(index, endIndex);
-    int step = SkSign32(endIndex - index);
-    markWinding(min, winding);
-    SkOpSpan* last = NULL;
-    SkOpSegment* other = this;
-    while ((other = other->nextChase(&index, &step, &min, &last))) {
-        if (other->fTs[min].fWindSum != SK_MinS32) {
-            SkASSERT(other->fTs[min].fWindSum == winding || other->fTs[min].fLoop);
-            SkASSERT(!last);
-            break;
-        }
-        other->markWinding(min, winding);
-    }
-    return last;
-}
-
-SkOpSpan* SkOpSegment::markAndChaseWinding(int index, int endIndex, int winding, int oppWinding) {
-    int min = SkMin32(index, endIndex);
-    int step = SkSign32(endIndex - index);
-    markWinding(min, winding, oppWinding);
-    SkOpSpan* last = NULL;
-    SkOpSegment* other = this;
-    while ((other = other->nextChase(&index, &step, &min, &last))) {
-        if (other->fTs[min].fWindSum != SK_MinS32) {
-#ifdef SK_DEBUG
-            if (!other->fTs[min].fLoop) {
-                if (fOperand == other->fOperand) {
-// FIXME: this is probably a bug -- rects4 asserts here
-//                    SkASSERT(other->fTs[min].fWindSum == winding);
-// FIXME: this is probably a bug -- rects3 asserts here
-//                    SkASSERT(other->fTs[min].fOppSum == oppWinding);
-                } else {
-                    SkASSERT(other->fTs[min].fWindSum == oppWinding);
-// FIXME: this is probably a bug -- skpwww_joomla_org_23 asserts here
-//                    SkASSERT(other->fTs[min].fOppSum == winding);
+    while ((other = other->nextChase(&start, &step, &spanStart, &last))) {
+        if (spanStart->windSum() != SK_MinS32) {
+            if (this->operand() == other->operand()) {
+                if (spanStart->windSum() != winding || spanStart->oppSum() != oppWinding) {
+                    this->globalState()->setWindingFailed();
+                    return false;
                 }
+            } else {
+                SkASSERT(spanStart->windSum() == oppWinding);
+                SkASSERT(spanStart->oppSum() == winding);
             }
             SkASSERT(!last);
-#endif
             break;
         }
-        if (fOperand == other->fOperand) {
-            other->markWinding(min, winding, oppWinding);
+        if (this->operand() == other->operand()) {
+            (void) other->markWinding(spanStart, winding, oppWinding);
         } else {
-            other->markWinding(min, oppWinding, winding);
+            (void) other->markWinding(spanStart, oppWinding, winding);
         }
     }
-    return last;
+    if (lastPtr) {
+        *lastPtr = last;
+    }
+    return success;
 }
 
-SkOpSpan* SkOpSegment::markAndChaseWinding(const SkOpAngle* angle, int winding, int oppWinding) {
-    int start = angle->start();
-    int end = angle->end();
-    return markAndChaseWinding(start, end, winding, oppWinding);
-}
-
-SkOpSpan* SkOpSegment::markAngle(int maxWinding, int sumWinding, const SkOpAngle* angle) {
+SkOpSpanBase* SkOpSegment::markAngle(int maxWinding, int sumWinding, const SkOpAngle* angle) {
     SkASSERT(angle->segment() == this);
     if (UseInnerWinding(maxWinding, sumWinding)) {
         maxWinding = sumWinding;
     }
-    SkOpSpan* last = markAndChaseWinding(angle, maxWinding);
+    SkOpSpanBase* last;
+    (void) markAndChaseWinding(angle->start(), angle->end(), maxWinding, &last);
 #if DEBUG_WINDING
     if (last) {
-        SkDebugf("%s last id=%d windSum=", __FUNCTION__,
-                last->fOther->fTs[last->fOtherIndex].fOther->debugID());
-        SkPathOpsDebug::WindingPrintf(last->fWindSum);
-        SkDebugf(" small=%d\n", last->fSmall);
+        SkDebugf("%s last seg=%d span=%d", __FUNCTION__,
+                last->segment()->debugID(), last->debugID());
+        if (!last->final()) {
+            SkDebugf(" windSum=");
+            SkPathOpsDebug::WindingPrintf(last->upCast()->windSum());
+        }
+        SkDebugf("\n");
     }
 #endif
     return last;
 }
 
-SkOpSpan* SkOpSegment::markAngle(int maxWinding, int sumWinding, int oppMaxWinding,
-                                 int oppSumWinding, const SkOpAngle* angle) {
+SkOpSpanBase* SkOpSegment::markAngle(int maxWinding, int sumWinding, int oppMaxWinding,
+                                   int oppSumWinding, const SkOpAngle* angle) {
     SkASSERT(angle->segment() == this);
     if (UseInnerWinding(maxWinding, sumWinding)) {
         maxWinding = sumWinding;
@@ -3524,399 +1032,137 @@ SkOpSpan* SkOpSegment::markAngle(int maxWinding, int sumWinding, int oppMaxWindi
     if (oppMaxWinding != oppSumWinding && UseInnerWinding(oppMaxWinding, oppSumWinding)) {
         oppMaxWinding = oppSumWinding;
     }
-    SkOpSpan* last = markAndChaseWinding(angle, maxWinding, oppMaxWinding);
+    SkOpSpanBase* last = nullptr;
+    // caller doesn't require that this marks anything
+    (void) markAndChaseWinding(angle->start(), angle->end(), maxWinding, oppMaxWinding, &last);
 #if DEBUG_WINDING
     if (last) {
-        SkDebugf("%s last id=%d windSum=", __FUNCTION__,
-                last->fOther->fTs[last->fOtherIndex].fOther->debugID());
-        SkPathOpsDebug::WindingPrintf(last->fWindSum);
-        SkDebugf(" small=%d\n", last->fSmall);
+        SkDebugf("%s last segment=%d span=%d", __FUNCTION__,
+                last->segment()->debugID(), last->debugID());
+        if (!last->final()) {
+            SkDebugf(" windSum=");
+            SkPathOpsDebug::WindingPrintf(last->upCast()->windSum());
+        }
+        SkDebugf(" \n");
     }
 #endif
     return last;
 }
 
-// FIXME: this should also mark spans with equal (x,y)
-// This may be called when the segment is already marked done. While this
-// wastes time, it shouldn't do any more than spin through the T spans.
-// OPTIMIZATION: abort on first done found (assuming that this code is
-// always called to mark segments done).
-void SkOpSegment::markDone(int index, int winding) {
-  //  SkASSERT(!done());
+void SkOpSegment::markDone(SkOpSpan* span) {
+    SkASSERT(this == span->segment());
+    if (span->done()) {
+        return;
+    }
+#if DEBUG_MARK_DONE
+    debugShowNewWinding(__FUNCTION__, span, span->windSum(), span->oppSum());
+#endif
+    span->setDone(true);
+    ++fDoneCount;
+    debugValidate();
+}
+
+bool SkOpSegment::markWinding(SkOpSpan* span, int winding) {
+    SkASSERT(this == span->segment());
     SkASSERT(winding);
-    double referenceT = fTs[index].fT;
-    int lesser = index;
-    while (--lesser >= 0 && precisely_negative(referenceT - fTs[lesser].fT)) {
-        markOneDone(__FUNCTION__, lesser, winding);
-    }
-    do {
-        markOneDone(__FUNCTION__, index, winding);
-    } while (++index < fTs.count() && precisely_negative(fTs[index].fT - referenceT));
-    debugValidate();
-}
-
-void SkOpSegment::markDoneBinary(int index) {
-    double referenceT = fTs[index].fT;
-    int lesser = index;
-    while (--lesser >= 0 && precisely_negative(referenceT - fTs[lesser].fT)) {
-        markOneDoneBinary(__FUNCTION__, lesser);
-    }
-    do {
-        markOneDoneBinary(__FUNCTION__, index);
-    } while (++index < fTs.count() && precisely_negative(fTs[index].fT - referenceT));
-    debugValidate();
-}
-
-void SkOpSegment::markDoneUnary(int index) {
-    double referenceT = fTs[index].fT;
-    int lesser = index;
-    while (--lesser >= 0 && precisely_negative(referenceT - fTs[lesser].fT)) {
-        markOneDoneUnary(__FUNCTION__, lesser);
-    }
-    do {
-        markOneDoneUnary(__FUNCTION__, index);
-    } while (++index < fTs.count() && precisely_negative(fTs[index].fT - referenceT));
-    debugValidate();
-}
-
-void SkOpSegment::markOneDone(const char* funName, int tIndex, int winding) {
-    SkOpSpan* span = markOneWinding(funName, tIndex, winding);
-    if (!span || span->fDone) {
-        return;
-    }
-    span->fDone = true;
-    fDoneSpans++;
-}
-
-void SkOpSegment::markOneDoneBinary(const char* funName, int tIndex) {
-    SkOpSpan* span = verifyOneWinding(funName, tIndex);
-    if (!span) {
-        return;
-    }
-    SkASSERT(!span->fDone);
-    span->fDone = true;
-    fDoneSpans++;
-}
-
-void SkOpSegment::markOneDoneUnary(const char* funName, int tIndex) {
-    SkOpSpan* span = verifyOneWindingU(funName, tIndex);
-    if (!span) {
-        return;
-    }
-    if (span->fWindSum == SK_MinS32) {
-        SkDebugf("%s uncomputed\n", __FUNCTION__);
-    }
-    SkASSERT(!span->fDone);
-    span->fDone = true;
-    fDoneSpans++;
-}
-
-SkOpSpan* SkOpSegment::markOneWinding(const char* funName, int tIndex, int winding) {
-    SkOpSpan& span = fTs[tIndex];
-    if (span.fDone && !span.fSmall) {
-        return NULL;
-    }
-#if DEBUG_MARK_DONE
-    debugShowNewWinding(funName, span, winding);
-#endif
-    SkASSERT(span.fWindSum == SK_MinS32 || span.fWindSum == winding);
-#if DEBUG_LIMIT_WIND_SUM
-    SkASSERT(abs(winding) <= DEBUG_LIMIT_WIND_SUM);
-#endif
-    span.fWindSum = winding;
-    return &span;
-}
-
-SkOpSpan* SkOpSegment::markOneWinding(const char* funName, int tIndex, int winding,
-                                      int oppWinding) {
-    SkOpSpan& span = fTs[tIndex];
-    if (span.fDone && !span.fSmall) {
-        return NULL;
-    }
-#if DEBUG_MARK_DONE
-    debugShowNewWinding(funName, span, winding, oppWinding);
-#endif
-    SkASSERT(span.fWindSum == SK_MinS32 || span.fWindSum == winding);
-#if DEBUG_LIMIT_WIND_SUM
-    SkASSERT(abs(winding) <= DEBUG_LIMIT_WIND_SUM);
-#endif
-    span.fWindSum = winding;
-    SkASSERT(span.fOppSum == SK_MinS32 || span.fOppSum == oppWinding);
-#if DEBUG_LIMIT_WIND_SUM
-    SkASSERT(abs(oppWinding) <= DEBUG_LIMIT_WIND_SUM);
-#endif
-    span.fOppSum = oppWinding;
-    debugValidate();
-    return &span;
-}
-
-// from http://stackoverflow.com/questions/1165647/how-to-determine-if-a-list-of-polygon-points-are-in-clockwise-order
-bool SkOpSegment::clockwise(int tStart, int tEnd, bool* swap) const {
-    SkASSERT(fVerb != SkPath::kLine_Verb);
-    SkPoint edge[4];
-    subDivide(tStart, tEnd, edge);
-    int points = SkPathOpsVerbToPoints(fVerb);
-    double sum = (edge[0].fX - edge[points].fX) * (edge[0].fY + edge[points].fY);
-    bool sumSet = false;
-    if (fVerb == SkPath::kCubic_Verb) {
-        SkDCubic cubic;
-        cubic.set(edge);
-        double inflectionTs[2];
-        int inflections = cubic.findInflections(inflectionTs);
-        // FIXME: this fixes cubicOp114 and breaks cubicOp58d
-        // the trouble is that cubics with inflections confuse whether the curve breaks towards
-        // or away, which in turn is used to determine if it is on the far right or left.
-        // Probably a totally different approach is in order. At one time I tried to project a
-        // horizontal ray to determine winding, but was confused by how to map the vertically
-        // oriented winding computation over. 
-        if (0 && inflections) {
-            double tLo = this->span(tStart).fT;
-            double tHi = this->span(tEnd).fT;
-            double tLoStart = tLo;
-            for (int index = 0; index < inflections; ++index) {
-                if (between(tLo, inflectionTs[index], tHi)) {
-                    tLo = inflectionTs[index];
-                }
-            }
-            if (tLo != tLoStart && tLo != tHi) {
-                SkDPoint sub[2];
-                sub[0] = cubic.ptAtT(tLo);
-                sub[1].set(edge[3]);
-                SkDPoint ctrl[2];
-                SkDCubic::SubDivide(fPts, sub[0], sub[1], tLo, tHi, ctrl);
-                edge[0] = sub[0].asSkPoint();
-                edge[1] = ctrl[0].asSkPoint();
-                edge[2] = ctrl[1].asSkPoint();
-                sum = (edge[0].fX - edge[3].fX) * (edge[0].fY + edge[3].fY);
-            }
-        }
-        SkScalar lesser = SkTMin<SkScalar>(edge[0].fY, edge[3].fY);
-        if (edge[1].fY < lesser && edge[2].fY < lesser) {
-            SkDLine tangent1 = {{ {edge[0].fX, edge[0].fY}, {edge[1].fX, edge[1].fY} }};
-            SkDLine tangent2 = {{ {edge[2].fX, edge[2].fY}, {edge[3].fX, edge[3].fY} }};
-            if (SkIntersections::Test(tangent1, tangent2)) {
-                SkPoint topPt = cubic_top(fPts, fTs[tStart].fT, fTs[tEnd].fT);
-                sum += (topPt.fX - edge[0].fX) * (topPt.fY + edge[0].fY);
-                sum += (edge[3].fX - topPt.fX) * (edge[3].fY + topPt.fY);
-                sumSet = true;
-            }
-        }
-    }
-    if (!sumSet) {
-        for (int idx = 0; idx < points; ++idx){
-            sum += (edge[idx + 1].fX - edge[idx].fX) * (edge[idx + 1].fY + edge[idx].fY);
-        }
-    }
-    if (fVerb == SkPath::kCubic_Verb) {
-        SkDCubic cubic;
-        cubic.set(edge);
-         *swap = sum > 0 && !cubic.monotonicInY() && !cubic.serpentine();
-    } else {
-        SkDQuad quad;
-        quad.set(edge);
-        *swap = sum > 0 && !quad.monotonicInY();
-    }
-    return sum <= 0;
-}
-
-bool SkOpSegment::monotonicInY(int tStart, int tEnd) const {
-    SkASSERT(fVerb != SkPath::kLine_Verb);
-    if (fVerb == SkPath::kQuad_Verb) {
-        SkDQuad dst = SkDQuad::SubDivide(fPts, fTs[tStart].fT, fTs[tEnd].fT);
-        return dst.monotonicInY();
-    }
-    SkASSERT(fVerb == SkPath::kCubic_Verb);
-    SkDCubic dst = SkDCubic::SubDivide(fPts, fTs[tStart].fT, fTs[tEnd].fT);
-    return dst.monotonicInY();
-}
-
-bool SkOpSegment::serpentine(int tStart, int tEnd) const {
-    if (fVerb != SkPath::kCubic_Verb) {
+    if (span->done()) {
         return false;
     }
-    SkDCubic dst = SkDCubic::SubDivide(fPts, fTs[tStart].fT, fTs[tEnd].fT);
-    return dst.serpentine();
-}
-
-SkOpSpan* SkOpSegment::verifyOneWinding(const char* funName, int tIndex) {
-    SkOpSpan& span = fTs[tIndex];
-    if (span.fDone) {
-        return NULL;
-    }
 #if DEBUG_MARK_DONE
-    debugShowNewWinding(funName, span, span.fWindSum, span.fOppSum);
+    debugShowNewWinding(__FUNCTION__, span, winding);
 #endif
-// If the prior angle in the sort is unorderable, the winding sum may not be computable.
-// To enable the assert, the 'prior is unorderable' state could be
-// piped down to this test, but not sure it's worth it.
-// (Once the sort order is stored in the span, this test may be feasible.)
-//    SkASSERT(span.fWindSum != SK_MinS32);
-//    SkASSERT(span.fOppSum != SK_MinS32);
-    return &span;
-}
-
-SkOpSpan* SkOpSegment::verifyOneWindingU(const char* funName, int tIndex) {
-    SkOpSpan& span = fTs[tIndex];
-    if (span.fDone) {
-        return NULL;
-    }
-#if DEBUG_MARK_DONE
-    debugShowNewWinding(funName, span, span.fWindSum);
-#endif
-// If the prior angle in the sort is unorderable, the winding sum may not be computable.
-// To enable the assert, the 'prior is unorderable' state could be
-// piped down to this test, but not sure it's worth it.
-// (Once the sort order is stored in the span, this test may be feasible.)
-//    SkASSERT(span.fWindSum != SK_MinS32);
-    return &span;
-}
-
-void SkOpSegment::markWinding(int index, int winding) {
-//    SkASSERT(!done());
-    SkASSERT(winding);
-    double referenceT = fTs[index].fT;
-    int lesser = index;
-    while (--lesser >= 0 && precisely_negative(referenceT - fTs[lesser].fT)) {
-        markOneWinding(__FUNCTION__, lesser, winding);
-    }
-    do {
-        markOneWinding(__FUNCTION__, index, winding);
-   } while (++index < fTs.count() && precisely_negative(fTs[index].fT - referenceT));
+    span->setWindSum(winding);
     debugValidate();
-}
-
-void SkOpSegment::markWinding(int index, int winding, int oppWinding) {
-//    SkASSERT(!done());
-    SkASSERT(winding || oppWinding);
-    double referenceT = fTs[index].fT;
-    int lesser = index;
-    while (--lesser >= 0 && precisely_negative(referenceT - fTs[lesser].fT)) {
-        markOneWinding(__FUNCTION__, lesser, winding, oppWinding);
-    }
-    do {
-        markOneWinding(__FUNCTION__, index, winding, oppWinding);
-   } while (++index < fTs.count() && precisely_negative(fTs[index].fT - referenceT));
-    debugValidate();
-}
-
-void SkOpSegment::matchWindingValue(int tIndex, double t, bool borrowWind) {
-    int nextDoorWind = SK_MaxS32;
-    int nextOppWind = SK_MaxS32;
-    // prefer exact matches
-    if (tIndex > 0) {
-        const SkOpSpan& below = fTs[tIndex - 1];
-        if (below.fT == t) {
-            nextDoorWind = below.fWindValue;
-            nextOppWind = below.fOppValue;
-        }
-    }
-    if (nextDoorWind == SK_MaxS32 && tIndex + 1 < fTs.count()) {
-        const SkOpSpan& above = fTs[tIndex + 1];
-        if (above.fT == t) {
-            nextDoorWind = above.fWindValue;
-            nextOppWind = above.fOppValue;
-        }
-    }
-    if (nextDoorWind == SK_MaxS32 && tIndex > 0) {
-        const SkOpSpan& below = fTs[tIndex - 1];
-        if (approximately_negative(t - below.fT)) {
-            nextDoorWind = below.fWindValue;
-            nextOppWind = below.fOppValue;
-        }
-    }
-    if (nextDoorWind == SK_MaxS32 && tIndex + 1 < fTs.count()) {
-        const SkOpSpan& above = fTs[tIndex + 1];
-        if (approximately_negative(above.fT - t)) {
-            nextDoorWind = above.fWindValue;
-            nextOppWind = above.fOppValue;
-        }
-    }
-    if (nextDoorWind == SK_MaxS32 && borrowWind && tIndex > 0 && t < 1) {
-        const SkOpSpan& below = fTs[tIndex - 1];
-        nextDoorWind = below.fWindValue;
-        nextOppWind = below.fOppValue;
-    }
-    if (nextDoorWind != SK_MaxS32) {
-        SkOpSpan& newSpan = fTs[tIndex];
-        newSpan.fWindValue = nextDoorWind;
-        newSpan.fOppValue = nextOppWind;
-        if (!nextDoorWind && !nextOppWind && !newSpan.fDone) {
-            newSpan.fDone = true;
-            ++fDoneSpans;
-        }
-    }
-}
-
-bool SkOpSegment::nextCandidate(int* start, int* end) const {
-    while (fTs[*end].fDone) {
-        if (fTs[*end].fT == 1) {
-            return false;
-        }
-        ++(*end);
-    }
-    *start = *end;
-    *end = nextExactSpan(*start, 1);
     return true;
 }
 
-static SkOpSegment* set_last(SkOpSpan** last, SkOpSpan* endSpan) {
-    if (last && !endSpan->fSmall) {
-        *last = endSpan;
+bool SkOpSegment::markWinding(SkOpSpan* span, int winding, int oppWinding) {
+    SkASSERT(this == span->segment());
+    SkASSERT(winding || oppWinding);
+    if (span->done()) {
+        return false;
     }
-    return NULL;
+#if DEBUG_MARK_DONE
+    debugShowNewWinding(__FUNCTION__, span, winding, oppWinding);
+#endif
+    span->setWindSum(winding);
+    span->setOppSum(oppWinding);
+    debugValidate();
+    return true;
 }
 
-SkOpSegment* SkOpSegment::nextChase(int* indexPtr, int* stepPtr, int* minPtr, SkOpSpan** last) {
-    int origIndex = *indexPtr;
+bool SkOpSegment::match(const SkOpPtT* base, const SkOpSegment* testParent, double testT,
+        const SkPoint& testPt) const {
+    const SkOpSegment* baseParent = base->segment();
+    if (this == baseParent && this == testParent && precisely_equal(base->fT, testT)) {
+        return true;
+    }
+    if (!SkDPoint::ApproximatelyEqual(testPt, base->fPt)) {
+        return false;
+    }
+    return !this->ptsDisjoint(base->fT, base->fPt, testT, testPt);
+}
+
+static SkOpSegment* set_last(SkOpSpanBase** last, SkOpSpanBase* endSpan) {
+    if (last) {
+        *last = endSpan;
+    }
+    return nullptr;
+}
+
+SkOpSegment* SkOpSegment::nextChase(SkOpSpanBase** startPtr, int* stepPtr, SkOpSpan** minPtr,
+        SkOpSpanBase** last) const {
+    SkOpSpanBase* origStart = *startPtr;
     int step = *stepPtr;
-    int end = nextExactSpan(origIndex, step);
-    SkASSERT(end >= 0);
-    SkOpSpan& endSpan = fTs[end];
-    SkOpAngle* angle = step > 0 ? endSpan.fFromAngle : endSpan.fToAngle;
-    int foundIndex;
-    int otherEnd;
+    SkOpSpanBase* endSpan = step > 0 ? origStart->upCast()->next() : origStart->prev();
+    SkASSERT(endSpan);
+    SkOpAngle* angle = step > 0 ? endSpan->fromAngle() : endSpan->upCast()->toAngle();
+    SkOpSpanBase* foundSpan;
+    SkOpSpanBase* otherEnd;
     SkOpSegment* other;
-    if (angle == NULL) {
-        if (endSpan.fT != 0 && endSpan.fT != 1) {
-            return NULL;
+    if (angle == nullptr) {
+        if (endSpan->t() != 0 && endSpan->t() != 1) {
+            return nullptr;
         }
-        other = endSpan.fOther;
-        foundIndex = endSpan.fOtherIndex;
-        otherEnd = other->nextExactSpan(foundIndex, step);
+        SkOpPtT* otherPtT = endSpan->ptT()->next();
+        other = otherPtT->segment();
+        foundSpan = otherPtT->span();
+        otherEnd = step > 0 ? foundSpan->upCast()->next() : foundSpan->prev();
     } else {
         int loopCount = angle->loopCount();
         if (loopCount > 2) {
-            return set_last(last, &endSpan);
+            return set_last(last, endSpan);
         }
         const SkOpAngle* next = angle->next();
-        if (angle->sign() != next->sign()) {
-#if DEBUG_WINDING
-            SkDebugf("%s mismatched signs\n", __FUNCTION__);
-#endif
-        //    return set_last(last, &endSpan);
+        if (nullptr == next) {
+            return nullptr;
         }
+#if DEBUG_WINDING
+        if (angle->debugSign() != next->debugSign() && !angle->segment()->contour()->isXor()
+                && !next->segment()->contour()->isXor()) {
+            SkDebugf("%s mismatched signs\n", __FUNCTION__);
+        }
+#endif
         other = next->segment();
-        foundIndex = end = next->start();
+        foundSpan = endSpan = next->start();
         otherEnd = next->end();
     }
-    int foundStep = foundIndex < otherEnd ? 1 : -1;
+    int foundStep = foundSpan->step(otherEnd);
     if (*stepPtr != foundStep) {
-        return set_last(last, &endSpan);
+        return set_last(last, endSpan);
     }
-    SkASSERT(*indexPtr >= 0);
-    SkASSERT(otherEnd >= 0);
-#if 1
-    int origMin = origIndex + (step < 0 ? step : 0);
-    const SkOpSpan& orig = this->span(origMin);
-#endif
-    int foundMin = SkMin32(foundIndex, otherEnd);
-#if 1
-    const SkOpSpan& found = other->span(foundMin);
-    if (found.fWindValue != orig.fWindValue || found.fOppValue != orig.fOppValue) {
-          return set_last(last, &endSpan);
+    SkASSERT(*startPtr);
+    if (!otherEnd) {
+        return nullptr;
     }
-#endif
-    *indexPtr = foundIndex;
+//    SkASSERT(otherEnd >= 0);
+    SkOpSpan* origMin = step < 0 ? origStart->prev() : origStart->upCast();
+    SkOpSpan* foundMin = foundSpan->starter(otherEnd);
+    if (foundMin->windValue() != origMin->windValue()
+            || foundMin->oppValue() != origMin->oppValue()) {
+          return set_last(last, endSpan);
+    }
+    *startPtr = foundSpan;
     *stepPtr = foundStep;
     if (minPtr) {
         *minPtr = foundMin;
@@ -3924,83 +1170,317 @@ SkOpSegment* SkOpSegment::nextChase(int* indexPtr, int* stepPtr, int* minPtr, Sk
     return other;
 }
 
-// This has callers for two different situations: one establishes the end
-// of the current span, and one establishes the beginning of the next span
-// (thus the name). When this is looking for the end of the current span,
-// coincidence is found when the beginning Ts contain -step and the end
-// contains step. When it is looking for the beginning of the next, the
-// first Ts found can be ignored and the last Ts should contain -step.
-// OPTIMIZATION: probably should split into two functions
-int SkOpSegment::nextSpan(int from, int step) const {
-    const SkOpSpan& fromSpan = fTs[from];
-    int count = fTs.count();
-    int to = from;
-    while (step > 0 ? ++to < count : --to >= 0) {
-        const SkOpSpan& span = fTs[to];
-        if (approximately_zero(span.fT - fromSpan.fT)) {
+static void clear_visited(SkOpSpanBase* span) {
+    // reset visited flag back to false
+    do {
+        SkOpPtT* ptT = span->ptT(), * stopPtT = ptT;
+        while ((ptT = ptT->next()) != stopPtT) {
+            SkOpSegment* opp = ptT->segment();
+            opp->resetVisited();
+        }
+    } while (!span->final() && (span = span->upCast()->next()));
+}
+
+// look for pairs of undetected coincident curves
+// assumes that segments going in have visited flag clear
+// curve/curve intersection should now do a pretty good job of finding coincident runs so 
+// this may be only be necessary for line/curve pairs -- so skip unless this is a line and the
+// the opp is not a line
+bool SkOpSegment::missingCoincidence(SkOpCoincidence* coincidences, SkChunkAlloc* allocator) {
+    if (this->verb() != SkPath::kLine_Verb) {
+        return false;
+    }
+    if (this->done()) {
+        return false;
+    }
+    SkOpSpan* prior = nullptr;
+    SkOpSpanBase* spanBase = &fHead;
+    do {
+        SkOpPtT* ptT = spanBase->ptT(), * spanStopPtT = ptT;
+        SkASSERT(ptT->span() == spanBase);
+        while ((ptT = ptT->next()) != spanStopPtT) {
+            if (ptT->deleted()) {
+                continue;
+            }
+            SkOpSegment* opp = ptT->span()->segment();
+//            if (opp->verb() == SkPath::kLine_Verb) {
+//                continue;
+//            }
+            if (opp->done()) {
+                continue;
+            }
+            // when opp is encounted the 1st time, continue; on 2nd encounter, look for coincidence
+            if (!opp->visited()) {
+                continue;
+            }
+            if (spanBase == &fHead) {
+                continue;
+            }
+            SkOpSpan* span = spanBase->upCastable();
+            // FIXME?: this assumes that if the opposite segment is coincident then no more
+            // coincidence needs to be detected. This may not be true.
+            if (span && span->containsCoincidence(opp)) { 
+                continue;
+            }
+            if (spanBase->segment() == opp) {
+                continue;
+            }
+            if (spanBase->containsCoinEnd(opp)) {
+                continue;
+            } 
+            SkOpPtT* priorPtT = nullptr, * priorStopPtT;
+            // find prior span containing opp segment
+            SkOpSegment* priorOpp = nullptr;
+            SkOpSpan* priorTest = spanBase->prev();
+            while (!priorOpp && priorTest) {
+                priorStopPtT = priorPtT = priorTest->ptT();
+                while ((priorPtT = priorPtT->next()) != priorStopPtT) {
+                    if (priorPtT->deleted()) {
+                        continue;
+                    }
+                    SkOpSegment* segment = priorPtT->span()->segment();
+                    if (segment == opp) {
+                        prior = priorTest;
+                        priorOpp = opp;
+                        break;
+                    }
+                }
+                priorTest = priorTest->prev();
+            }
+            if (!priorOpp) {
+                continue;
+            }
+            if (priorPtT == ptT) {
+                continue;
+            }
+            SkOpPtT* oppStart = prior->ptT();
+            SkOpPtT* oppEnd = spanBase->ptT();
+            bool swapped = priorPtT->fT > ptT->fT;
+            if (swapped) {
+                SkTSwap(priorPtT, ptT);
+                SkTSwap(oppStart, oppEnd);
+            }
+            bool flipped = oppStart->fT > oppEnd->fT;
+            bool coincident = false;
+            if (coincidences->contains(priorPtT, ptT, oppStart, oppEnd, flipped)) {
+                goto swapBack;
+            }
+            if (opp->verb() == SkPath::kLine_Verb) {
+                coincident = (SkDPoint::ApproximatelyEqual(priorPtT->fPt, oppStart->fPt) ||
+                        SkDPoint::ApproximatelyEqual(priorPtT->fPt, oppEnd->fPt)) &&
+                        (SkDPoint::ApproximatelyEqual(ptT->fPt, oppStart->fPt) ||
+                        SkDPoint::ApproximatelyEqual(ptT->fPt, oppEnd->fPt));
+            }
+            if (!coincident) {
+                coincident = testForCoincidence(priorPtT, ptT, prior, spanBase, opp, 5000);
+            }
+            if (coincident) {
+            // mark coincidence
+                if (!coincidences->extend(priorPtT, ptT, oppStart, oppEnd)
+                        && !coincidences->extend(oppStart, oppEnd, priorPtT, ptT)) {
+                    coincidences->add(priorPtT, ptT, oppStart, oppEnd, allocator);
+                }
+                clear_visited(&fHead);
+                return true;
+            }
+    swapBack:
+            if (swapped) {
+                SkTSwap(priorPtT, ptT);
+            }
+        }
+    } while ((spanBase = spanBase->final() ? nullptr : spanBase->upCast()->next()));
+    clear_visited(&fHead);
+    return false;
+}
+
+// if a span has more than one intersection, merge the other segments' span as needed
+void SkOpSegment::moveMultiples() {
+    debugValidate();
+    SkOpSpanBase* test = &fHead;
+    do {
+        int addCount = test->spanAddsCount();
+        SkASSERT(addCount >= 1);
+        if (addCount == 1) {
             continue;
         }
-        return to;
-    }
-    return -1;
-}
-
-// FIXME
-// this returns at any difference in T, vs. a preset minimum. It may be
-// that all callers to nextSpan should use this instead.
-int SkOpSegment::nextExactSpan(int from, int step) const {
-    int to = from;
-    if (step < 0) {
-        const SkOpSpan& fromSpan = fTs[from];
-        while (--to >= 0) {
-            const SkOpSpan& span = fTs[to];
-            if (precisely_negative(fromSpan.fT - span.fT) || span.fTiny) {
+        SkOpPtT* startPtT = test->ptT();
+        SkOpPtT* testPtT = startPtT;
+        do {  // iterate through all spans associated with start
+            SkOpSpanBase* oppSpan = testPtT->span();
+            if (oppSpan->spanAddsCount() == addCount) {
                 continue;
             }
-            return to;
-        }
-    } else {
-        while (fTs[from].fTiny) {
-            from++;
-        }
-        const SkOpSpan& fromSpan = fTs[from];
-        int count = fTs.count();
-        while (++to < count) {
-            const SkOpSpan& span = fTs[to];
-            if (precisely_negative(span.fT - fromSpan.fT)) {
+            if (oppSpan->deleted()) {
+                continue;
+            }
+            SkOpSegment* oppSegment = oppSpan->segment();
+            if (oppSegment == this) {
+                continue;
+            }
+            // find range of spans to consider merging
+            SkOpSpanBase* oppPrev = oppSpan;
+            SkOpSpanBase* oppFirst = oppSpan;
+            while ((oppPrev = oppPrev->prev())) {
+                if (!roughly_equal(oppPrev->t(), oppSpan->t())) {
+                    break;
+                }
+                if (oppPrev->spanAddsCount() == addCount) {
+                    continue;
+                }
+                if (oppPrev->deleted()) {
+                    continue;
+                }
+                oppFirst = oppPrev;
+            }
+            SkOpSpanBase* oppNext = oppSpan;
+            SkOpSpanBase* oppLast = oppSpan;
+            while ((oppNext = oppNext->final() ? nullptr : oppNext->upCast()->next())) {
+                if (!roughly_equal(oppNext->t(), oppSpan->t())) {
+                    break;
+                }
+                if (oppNext->spanAddsCount() == addCount) {
+                    continue;
+                }
+                if (oppNext->deleted()) {
+                    continue;
+                }
+                oppLast = oppNext;
+            }
+            if (oppFirst == oppLast) {
+                continue;
+            }
+            SkOpSpanBase* oppTest = oppFirst;
+            do {
+                if (oppTest == oppSpan) {
+                    continue;
+                }
+                // check to see if the candidate meets specific criteria:
+                // it contains spans of segments in test's loop but not including 'this'
+                SkOpPtT* oppStartPtT = oppTest->ptT();
+                SkOpPtT* oppPtT = oppStartPtT;
+                while ((oppPtT = oppPtT->next()) != oppStartPtT) {
+                    SkOpSegment* oppPtTSegment = oppPtT->segment();
+                    if (oppPtTSegment == this) {
+                        goto tryNextSpan;
+                    }
+                    SkOpPtT* matchPtT = startPtT;
+                    do {
+                        if (matchPtT->segment() == oppPtTSegment) {
+                            goto foundMatch;
+                        }
+                    } while ((matchPtT = matchPtT->next()) != startPtT);
+                    goto tryNextSpan;
+            foundMatch:  // merge oppTest and oppSpan
+                    oppSegment->debugValidate();
+                    if (oppTest == &oppSegment->fTail || oppTest == &oppSegment->fHead) {
+                        SkASSERT(oppSpan != &oppSegment->fHead); // don't expect collapse
+                        SkASSERT(oppSpan != &oppSegment->fTail);
+                        oppTest->merge(oppSpan->upCast());
+                    } else {
+                        oppSpan->merge(oppTest->upCast());
+                    }
+                    oppSegment->debugValidate();
+                    goto checkNextSpan;
+                }
+        tryNextSpan: 
+                ;
+            } while (oppTest != oppLast && (oppTest = oppTest->upCast()->next()));
+        } while ((testPtT = testPtT->next()) != startPtT);
+checkNextSpan: 
+        ;
+    } while ((test = test->final() ? nullptr : test->upCast()->next()));
+    debugValidate();
+}
+
+// Move nearby t values and pts so they all hang off the same span. Alignment happens later.
+void SkOpSegment::moveNearby() {
+    debugValidate();
+    SkOpSpanBase* spanS = &fHead;
+    do {
+        SkOpSpanBase* test = spanS->upCast()->next();
+        SkOpSpanBase* next;
+        if (spanS->contains(test)) {
+            if (!test->final()) {
+                test->upCast()->detach(spanS->ptT());
+                continue;
+            } else if (spanS != &fHead) {
+                spanS->upCast()->detach(test->ptT());
+                spanS = test;
                 continue;
             }
-            return to;
         }
-    }
-    return -1;
+        do {  // iterate through all spans associated with start
+            SkOpPtT* startBase = spanS->ptT();
+            next = test->final() ? nullptr : test->upCast()->next();
+            do {
+                SkOpPtT* testBase = test->ptT();
+                do {
+                    if (startBase == testBase) {
+                        goto checkNextSpan;
+                    }
+                    if (testBase->duplicate()) {
+                        continue;
+                    }
+                    if (this->match(startBase, testBase->segment(), testBase->fT, testBase->fPt)) {
+                        if (test == &this->fTail) {
+                            if (spanS == &fHead) {
+                                debugValidate();
+                                return;  // if this span has collapsed, remove it from parent
+                            }
+                            this->fTail.merge(spanS->upCast());
+                            debugValidate();
+                            return;
+                        }
+                        spanS->merge(test->upCast());
+                        goto checkNextSpan;
+                    }
+                } while ((testBase = testBase->next()) != test->ptT());
+            } while ((startBase = startBase->next()) != spanS->ptT());
+    checkNextSpan:
+            ;
+        } while ((test = next));
+        spanS = spanS->upCast()->next();
+    } while (!spanS->final());
+    debugValidate();
 }
 
-void SkOpSegment::pinT(const SkPoint& pt, double* t) {
-    if (pt == fPts[0]) {
-        *t = 0;
-    }
-    int count = SkPathOpsVerbToPoints(fVerb);
-    if (pt == fPts[count]) {
-        *t = 1;
-    }
+bool SkOpSegment::operand() const {
+    return fContour->operand();
 }
 
-void SkOpSegment::setCoincidentRange(const SkPoint& startPt, const SkPoint& endPt, 
-        SkOpSegment* other) {
-    int count = this->count();
-    for (int index = 0; index < count; ++index) {
-        SkOpSpan &span = fTs[index];
-        if ((startPt == span.fPt || endPt == span.fPt) && other == span.fOther) {
-            span.fCoincident = true;
-        }
-    }
+bool SkOpSegment::oppXor() const {
+    return fContour->oppXor();
 }
 
-void SkOpSegment::setUpWindings(int index, int endIndex, int* sumMiWinding, int* sumSuWinding,
-        int* maxWinding, int* sumWinding, int* oppMaxWinding, int* oppSumWinding) {
-    int deltaSum = spanSign(index, endIndex);
-    int oppDeltaSum = oppSign(index, endIndex);
+bool SkOpSegment::ptsDisjoint(double t1, const SkPoint& pt1, double t2, const SkPoint& pt2) const {
+    if (fVerb == SkPath::kLine_Verb) {
+        return false;
+    }
+    // quads (and cubics) can loop back to nearly a line so that an opposite curve
+    // hits in two places with very different t values.
+    // OPTIMIZATION: curves could be preflighted so that, for example, something like
+    // 'controls contained by ends' could avoid this check for common curves
+    // 'ends are extremes in x or y' is cheaper to compute and real-world common
+    // on the other hand, the below check is relatively inexpensive
+    double midT = (t1 + t2) / 2;
+    SkPoint midPt = this->ptAtT(midT);
+    double seDistSq = SkTMax(pt1.distanceToSqd(pt2) * 2, FLT_EPSILON * 2);
+    return midPt.distanceToSqd(pt1) > seDistSq || midPt.distanceToSqd(pt2) > seDistSq;
+}
+
+void SkOpSegment::setUpWindings(SkOpSpanBase* start, SkOpSpanBase* end, int* sumMiWinding,
+        int* maxWinding, int* sumWinding) {
+    int deltaSum = SpanSign(start, end);
+    *maxWinding = *sumMiWinding;
+    *sumWinding = *sumMiWinding -= deltaSum;
+    SkASSERT(!DEBUG_LIMIT_WIND_SUM || SkTAbs(*sumWinding) <= DEBUG_LIMIT_WIND_SUM);
+}
+
+void SkOpSegment::setUpWindings(SkOpSpanBase* start, SkOpSpanBase* end, int* sumMiWinding,
+        int* sumSuWinding, int* maxWinding, int* sumWinding, int* oppMaxWinding,
+        int* oppSumWinding) {
+    int deltaSum = SpanSign(start, end);
+    int oppDeltaSum = OppSign(start, end);
     if (operand()) {
         *maxWinding = *sumSuWinding;
         *sumWinding = *sumSuWinding -= deltaSum;
@@ -4012,238 +1492,228 @@ void SkOpSegment::setUpWindings(int index, int endIndex, int* sumMiWinding, int*
         *oppMaxWinding = *sumSuWinding;
         *oppSumWinding = *sumSuWinding -= oppDeltaSum;
     }
-#if DEBUG_LIMIT_WIND_SUM
-    SkASSERT(abs(*sumWinding) <= DEBUG_LIMIT_WIND_SUM);
-    SkASSERT(abs(*oppSumWinding) <= DEBUG_LIMIT_WIND_SUM);
-#endif
-}
-
-void SkOpSegment::setUpWindings(int index, int endIndex, int* sumMiWinding,
-        int* maxWinding, int* sumWinding) {
-    int deltaSum = spanSign(index, endIndex);
-    *maxWinding = *sumMiWinding;
-    *sumWinding = *sumMiWinding -= deltaSum;
-#if DEBUG_LIMIT_WIND_SUM
-    SkASSERT(abs(*sumWinding) <= DEBUG_LIMIT_WIND_SUM);
-#endif
+    SkASSERT(!DEBUG_LIMIT_WIND_SUM || SkTAbs(*sumWinding) <= DEBUG_LIMIT_WIND_SUM);
+    SkASSERT(!DEBUG_LIMIT_WIND_SUM || SkTAbs(*oppSumWinding) <= DEBUG_LIMIT_WIND_SUM);
 }
 
 void SkOpSegment::sortAngles() {
-    int spanCount = fTs.count();
-    if (spanCount <= 2) {
-        return;
-    }
-    int index = 0;
+    SkOpSpanBase* span = &this->fHead;
     do {
-        SkOpAngle* fromAngle = fTs[index].fFromAngle;
-        SkOpAngle* toAngle = fTs[index].fToAngle;
+        SkOpAngle* fromAngle = span->fromAngle();
+        SkOpAngle* toAngle = span->final() ? nullptr : span->upCast()->toAngle();
         if (!fromAngle && !toAngle) {
-            index += 1;
             continue;
         }
-        SkOpAngle* baseAngle = NULL;
-        if (fromAngle) {
-            baseAngle = fromAngle;
-            if (inLoop(baseAngle, spanCount, &index)) {
-                continue;
-            }
-        }
 #if DEBUG_ANGLE
         bool wroteAfterHeader = false;
 #endif
-        if (toAngle) {
-            if (!baseAngle) {
-                baseAngle = toAngle;
-                if (inLoop(baseAngle, spanCount, &index)) {
-                    continue;
-                }
-            } else {
-                SkDEBUGCODE(int newIndex = index);
-                SkASSERT(!inLoop(baseAngle, spanCount, &newIndex) && newIndex == index);
+        SkOpAngle* baseAngle = fromAngle;
+        if (fromAngle && toAngle) {
 #if DEBUG_ANGLE
-                SkDebugf("%s [%d] tStart=%1.9g [%d]\n", __FUNCTION__, debugID(), fTs[index].fT,
-                        index);
-                wroteAfterHeader = true;
+            SkDebugf("%s [%d] tStart=%1.9g [%d]\n", __FUNCTION__, debugID(), span->t(),
+                    span->debugID());
+            wroteAfterHeader = true;
 #endif
-                baseAngle->insert(toAngle);
-            }
+            fromAngle->insert(toAngle);
+        } else if (!fromAngle) {
+            baseAngle = toAngle;
         }
-        SkOpAngle* nextFrom, * nextTo;
-        int firstIndex = index;
+        SkOpPtT* ptT = span->ptT(), * stopPtT = ptT;
         do {
-            SkOpSpan& span = fTs[index];
-            SkOpSegment* other = span.fOther;
-            SkOpSpan& oSpan = other->fTs[span.fOtherIndex];
-            SkOpAngle* oAngle = oSpan.fFromAngle;
+            SkOpSpanBase* oSpan = ptT->span();
+            if (oSpan == span) {
+                continue;
+            }
+            SkOpAngle* oAngle = oSpan->fromAngle();
             if (oAngle) {
 #if DEBUG_ANGLE
                 if (!wroteAfterHeader) {
-                    SkDebugf("%s [%d] tStart=%1.9g [%d]\n", __FUNCTION__, debugID(), fTs[index].fT,
-                            index);
+                    SkDebugf("%s [%d] tStart=%1.9g [%d]\n", __FUNCTION__, debugID(),
+                            span->t(), span->debugID());
                     wroteAfterHeader = true;
                 }
 #endif
-                if (!oAngle->loopContains(*baseAngle)) {
+                if (!oAngle->loopContains(baseAngle)) {
                     baseAngle->insert(oAngle);
                 }
             }
-            oAngle = oSpan.fToAngle;
-            if (oAngle) {
+            if (!oSpan->final()) {
+                oAngle = oSpan->upCast()->toAngle();
+                if (oAngle) {
 #if DEBUG_ANGLE
-                if (!wroteAfterHeader) {
-                    SkDebugf("%s [%d] tStart=%1.9g [%d]\n", __FUNCTION__, debugID(), fTs[index].fT,
-                            index);
-                    wroteAfterHeader = true;
-                }
+                    if (!wroteAfterHeader) {
+                        SkDebugf("%s [%d] tStart=%1.9g [%d]\n", __FUNCTION__, debugID(),
+                                span->t(), span->debugID());
+                        wroteAfterHeader = true;
+                    }
 #endif
-                if (!oAngle->loopContains(*baseAngle)) {
-                    baseAngle->insert(oAngle);
+                    if (!oAngle->loopContains(baseAngle)) {
+                        baseAngle->insert(oAngle);
+                    }
                 }
             }
-            if (++index == spanCount) {
-                break;
+        } while ((ptT = ptT->next()) != stopPtT);
+        if (baseAngle->loopCount() == 1) {
+            span->setFromAngle(nullptr);
+            if (toAngle) {
+                span->upCast()->setToAngle(nullptr);
             }
-            nextFrom = fTs[index].fFromAngle;
-            nextTo = fTs[index].fToAngle;
-        } while (fromAngle == nextFrom && toAngle == nextTo);
-        if (baseAngle && baseAngle->loopCount() == 1) {
-            index = firstIndex;
-            do {
-                SkOpSpan& span = fTs[index];
-                span.fFromAngle = span.fToAngle = NULL;
-                if (++index == spanCount) {
-                    break;
-                }
-                nextFrom = fTs[index].fFromAngle;
-                nextTo = fTs[index].fToAngle;
-            } while (fromAngle == nextFrom && toAngle == nextTo);
-            baseAngle = NULL;
+            baseAngle = nullptr;
         }
 #if DEBUG_SORT
         SkASSERT(!baseAngle || baseAngle->loopCount() > 1);
 #endif
-    } while (index < spanCount);
+    } while (!span->final() && (span = span->upCast()->next()));
 }
 
 // return true if midpoints were computed
-bool SkOpSegment::subDivide(int start, int end, SkPoint edge[4]) const {
+bool SkOpSegment::subDivide(const SkOpSpanBase* start, const SkOpSpanBase* end,
+        SkOpCurve* edge) const {
     SkASSERT(start != end);
-    edge[0] = fTs[start].fPt;
+    const SkOpPtT& startPtT = *start->ptT();
+    const SkOpPtT& endPtT = *end->ptT();
+    SkDEBUGCODE(edge->fVerb = fVerb);
+    edge->fPts[0] = startPtT.fPt;
     int points = SkPathOpsVerbToPoints(fVerb);
-    edge[points] = fTs[end].fPt;
+    edge->fPts[points] = endPtT.fPt;
+    edge->fWeight = 1;
     if (fVerb == SkPath::kLine_Verb) {
         return false;
     }
-    double startT = fTs[start].fT;
-    double endT = fTs[end].fT;
+    double startT = startPtT.fT;
+    double endT = endPtT.fT;
     if ((startT == 0 || endT == 0) && (startT == 1 || endT == 1)) {
         // don't compute midpoints if we already have them
         if (fVerb == SkPath::kQuad_Verb) {
-            edge[1] = fPts[1];
+            edge->fPts[1] = fPts[1];
+            return false;
+        }
+        if (fVerb == SkPath::kConic_Verb) {
+            edge->fPts[1] = fPts[1];
+            edge->fWeight = fWeight;
             return false;
         }
         SkASSERT(fVerb == SkPath::kCubic_Verb);
         if (start < end) {
-            edge[1] = fPts[1];
-            edge[2] = fPts[2];
+            edge->fPts[1] = fPts[1];
+            edge->fPts[2] = fPts[2];
             return false;
         }
-        edge[1] = fPts[2];
-        edge[2] = fPts[1];
+        edge->fPts[1] = fPts[2];
+        edge->fPts[2] = fPts[1];
         return false;
     }
-    const SkDPoint sub[2] = {{ edge[0].fX, edge[0].fY}, {edge[points].fX, edge[points].fY }};
+    const SkDPoint sub[2] = {{ edge->fPts[0].fX, edge->fPts[0].fY},
+            {edge->fPts[points].fX, edge->fPts[points].fY }};
     if (fVerb == SkPath::kQuad_Verb) {
-        edge[1] = SkDQuad::SubDivide(fPts, sub[0], sub[1], startT, endT).asSkPoint();
+        edge->fPts[1] = SkDQuad::SubDivide(fPts, sub[0], sub[1], startT, endT).asSkPoint();
+    } else if (fVerb == SkPath::kConic_Verb) {
+        edge->fPts[1] = SkDConic::SubDivide(fPts, fWeight, sub[0], sub[1],
+                startT, endT, &edge->fWeight).asSkPoint();
     } else {
         SkASSERT(fVerb == SkPath::kCubic_Verb);
         SkDPoint ctrl[2];
         SkDCubic::SubDivide(fPts, sub[0], sub[1], startT, endT, ctrl);
-        edge[1] = ctrl[0].asSkPoint();
-        edge[2] = ctrl[1].asSkPoint();
+        edge->fPts[1] = ctrl[0].asSkPoint();
+        edge->fPts[2] = ctrl[1].asSkPoint();
     }
     return true;
 }
 
-// return true if midpoints were computed
-bool SkOpSegment::subDivide(int start, int end, SkDCubic* result) const {
+bool SkOpSegment::subDivide(const SkOpSpanBase* start, const SkOpSpanBase* end,
+        SkDCurve* edge) const {
     SkASSERT(start != end);
-    (*result)[0].set(fTs[start].fPt);
+    const SkOpPtT& startPtT = *start->ptT();
+    const SkOpPtT& endPtT = *end->ptT();
+    SkDEBUGCODE(edge->fVerb = fVerb);
+    edge->fCubic[0].set(startPtT.fPt);
     int points = SkPathOpsVerbToPoints(fVerb);
-    (*result)[points].set(fTs[end].fPt);
+    edge->fCubic[points].set(endPtT.fPt);
     if (fVerb == SkPath::kLine_Verb) {
         return false;
     }
-    double startT = fTs[start].fT;
-    double endT = fTs[end].fT;
+    double startT = startPtT.fT;
+    double endT = endPtT.fT;
     if ((startT == 0 || endT == 0) && (startT == 1 || endT == 1)) {
         // don't compute midpoints if we already have them
         if (fVerb == SkPath::kQuad_Verb) {
-            (*result)[1].set(fPts[1]);
+            edge->fLine[1].set(fPts[1]);
+            return false;
+        }
+        if (fVerb == SkPath::kConic_Verb) {
+            edge->fConic[1].set(fPts[1]);
+            edge->fConic.fWeight = fWeight;
             return false;
         }
         SkASSERT(fVerb == SkPath::kCubic_Verb);
-        if (start < end) {
-            (*result)[1].set(fPts[1]);
-            (*result)[2].set(fPts[2]);
+        if (startT == 0) {
+            edge->fCubic[1].set(fPts[1]);
+            edge->fCubic[2].set(fPts[2]);
             return false;
         }
-        (*result)[1].set(fPts[2]);
-        (*result)[2].set(fPts[1]);
+        edge->fCubic[1].set(fPts[2]);
+        edge->fCubic[2].set(fPts[1]);
         return false;
     }
     if (fVerb == SkPath::kQuad_Verb) {
-        (*result)[1] = SkDQuad::SubDivide(fPts, (*result)[0], (*result)[2], startT, endT);
+        edge->fQuad[1] = SkDQuad::SubDivide(fPts, edge->fQuad[0], edge->fQuad[2], startT, endT);
+    } else if (fVerb == SkPath::kConic_Verb) {
+        edge->fConic[1] = SkDConic::SubDivide(fPts, fWeight, edge->fQuad[0], edge->fQuad[2],
+            startT, endT, &edge->fConic.fWeight);
     } else {
         SkASSERT(fVerb == SkPath::kCubic_Verb);
-        SkDCubic::SubDivide(fPts, (*result)[0], (*result)[3], startT, endT, &(*result)[1]);
+        SkDCubic::SubDivide(fPts, edge->fCubic[0], edge->fCubic[3], startT, endT, &edge->fCubic[1]);
     }
     return true;
 }
 
-void SkOpSegment::subDivideBounds(int start, int end, SkPathOpsBounds* bounds) const {
-    SkPoint edge[4];
-    subDivide(start, end, edge);
-    (bounds->*SetCurveBounds[SkPathOpsVerbToPoints(fVerb)])(edge);
-}
-
-void SkOpSegment::TrackOutsidePair(SkTArray<SkPoint, true>* outsidePts, const SkPoint& endPt,
-        const SkPoint& startPt) {
-    int outCount = outsidePts->count();
-    if (outCount == 0 || endPt != (*outsidePts)[outCount - 2]) {
-        outsidePts->push_back(endPt);
-        outsidePts->push_back(startPt);
-    }
-}
-
-void SkOpSegment::TrackOutside(SkTArray<SkPoint, true>* outsidePts, const SkPoint& startPt) {
-    int outCount = outsidePts->count();
-    if (outCount == 0 || startPt != (*outsidePts)[outCount - 1]) {
-        outsidePts->push_back(startPt);
-    }
-}
-
-void SkOpSegment::undoneSpan(int* start, int* end) {
-    int tCount = fTs.count();
-    int index;
-    for (index = 0; index < tCount; ++index) {
-        if (!fTs[index].fDone) {
-            break;
+bool SkOpSegment::testForCoincidence(const SkOpPtT* priorPtT, const SkOpPtT* ptT,
+        const SkOpSpanBase* prior, const SkOpSpanBase* spanBase, const SkOpSegment* opp,
+        SkScalar flatnessLimit) const {
+    // average t, find mid pt
+    double midT = (prior->t() + spanBase->t()) / 2;
+    SkPoint midPt = this->ptAtT(midT);
+    bool coincident = true;
+    // if the mid pt is not near either end pt, project perpendicular through opp seg
+    if (!SkDPoint::ApproximatelyEqual(priorPtT->fPt, midPt)
+            && !SkDPoint::ApproximatelyEqual(ptT->fPt, midPt)) {
+        coincident = false;
+        SkIntersections i;
+        SkVector dxdy = (*CurveSlopeAtT[fVerb])(this->pts(), this->weight(), midT);
+        SkDLine ray = {{{midPt.fX, midPt.fY}, {midPt.fX + dxdy.fY, midPt.fY - dxdy.fX}}};
+        (*CurveIntersectRay[opp->verb()])(opp->pts(), opp->weight(), ray, &i);
+        // measure distance and see if it's small enough to denote coincidence
+        for (int index = 0; index < i.used(); ++index) {
+            SkDPoint oppPt = i.pt(index);
+            if (oppPt.approximatelyEqual(midPt)) {
+                SkVector oppDxdy = (*CurveSlopeAtT[opp->verb()])(opp->pts(),
+                        opp->weight(), i[index][0]);
+                oppDxdy.normalize();
+                dxdy.normalize();
+                SkScalar flatness = SkScalarAbs(dxdy.cross(oppDxdy) / FLT_EPSILON);
+                coincident |= flatness < flatnessLimit;
+            }
         }
     }
-    SkASSERT(index < tCount - 1);
-    *start = index;
-    double startT = fTs[index].fT;
-    while (approximately_negative(fTs[++index].fT - startT))
-        SkASSERT(index < tCount);
-    SkASSERT(index < tCount);
-    *end = index;
+    return coincident;
 }
 
-int SkOpSegment::updateOppWinding(int index, int endIndex) const {
-    int lesser = SkMin32(index, endIndex);
-    int oppWinding = oppSum(lesser);
-    int oppSpanWinding = oppSign(index, endIndex);
+void SkOpSegment::undoneSpan(SkOpSpanBase** start, SkOpSpanBase** end) {
+    SkOpSpan* span = this->head();
+    do {
+        if (!span->done()) {
+            break;
+        }
+    } while ((span = span->next()->upCastable()));
+    SkASSERT(span);
+    *start = span;
+    *end = span->next();
+}
+
+int SkOpSegment::updateOppWinding(const SkOpSpanBase* start, const SkOpSpanBase* end) const {
+    const SkOpSpan* lesser = start->starter(end);
+    int oppWinding = lesser->oppSum();
+    int oppSpanWinding = SkOpSegment::OppSign(start, end);
     if (oppSpanWinding && UseInnerWinding(oppWinding - oppSpanWinding, oppWinding)
             && oppWinding != SK_MaxS32) {
         oppWinding -= oppSpanWinding;
@@ -4252,24 +1722,27 @@ int SkOpSegment::updateOppWinding(int index, int endIndex) const {
 }
 
 int SkOpSegment::updateOppWinding(const SkOpAngle* angle) const {
-    int startIndex = angle->start();
-    int endIndex = angle->end();
-    return updateOppWinding(endIndex, startIndex);
+    const SkOpSpanBase* startSpan = angle->start();
+    const SkOpSpanBase* endSpan = angle->end();
+    return updateOppWinding(endSpan, startSpan);
 }
 
 int SkOpSegment::updateOppWindingReverse(const SkOpAngle* angle) const {
-    int startIndex = angle->start();
-    int endIndex = angle->end();
-    return updateOppWinding(startIndex, endIndex);
+    const SkOpSpanBase* startSpan = angle->start();
+    const SkOpSpanBase* endSpan = angle->end();
+    return updateOppWinding(startSpan, endSpan);
 }
 
-int SkOpSegment::updateWinding(int index, int endIndex) const {
-    int lesser = SkMin32(index, endIndex);
-    int winding = windSum(lesser);
+int SkOpSegment::updateWinding(SkOpSpanBase* start, SkOpSpanBase* end) {
+    SkOpSpan* lesser = start->starter(end);
+    int winding = lesser->windSum();
+    if (winding == SK_MinS32) {
+        winding = lesser->computeWindSum();
+    }
     if (winding == SK_MinS32) {
         return winding;
     }
-    int spanWinding = spanSign(index, endIndex);
+    int spanWinding = SkOpSegment::SpanSign(start, end);
     if (winding && UseInnerWinding(winding - spanWinding, winding)
             && winding != SK_MaxS32) {
         winding -= spanWinding;
@@ -4277,27 +1750,16 @@ int SkOpSegment::updateWinding(int index, int endIndex) const {
     return winding;
 }
 
-int SkOpSegment::updateWinding(const SkOpAngle* angle) const {
-    int startIndex = angle->start();
-    int endIndex = angle->end();
-    return updateWinding(endIndex, startIndex);
+int SkOpSegment::updateWinding(SkOpAngle* angle) {
+    SkOpSpanBase* startSpan = angle->start();
+    SkOpSpanBase* endSpan = angle->end();
+    return updateWinding(endSpan, startSpan);
 }
 
-int SkOpSegment::updateWindingReverse(int index, int endIndex) const {
-    int lesser = SkMin32(index, endIndex);
-    int winding = windSum(lesser);
-    int spanWinding = spanSign(endIndex, index);
-    if (winding && UseInnerWindingReverse(winding - spanWinding, winding)
-            && winding != SK_MaxS32) {
-        winding -= spanWinding;
-    }
-    return winding;
-}
-
-int SkOpSegment::updateWindingReverse(const SkOpAngle* angle) const {
-    int startIndex = angle->start();
-    int endIndex = angle->end();
-    return updateWindingReverse(endIndex, startIndex);
+int SkOpSegment::updateWindingReverse(const SkOpAngle* angle) {
+    SkOpSpanBase* startSpan = angle->start();
+    SkOpSpanBase* endSpan = angle->end();
+    return updateWinding(startSpan, endSpan);
 }
 
 // OPTIMIZATION: does the following also work, and is it any faster?
@@ -4306,70 +1768,13 @@ int SkOpSegment::updateWindingReverse(const SkOpAngle* angle) const {
 bool SkOpSegment::UseInnerWinding(int outerWinding, int innerWinding) {
     SkASSERT(outerWinding != SK_MaxS32);
     SkASSERT(innerWinding != SK_MaxS32);
-    int absOut = abs(outerWinding);
-    int absIn = abs(innerWinding);
+    int absOut = SkTAbs(outerWinding);
+    int absIn = SkTAbs(innerWinding);
     bool result = absOut == absIn ? outerWinding < 0 : absOut < absIn;
     return result;
 }
 
-bool SkOpSegment::UseInnerWindingReverse(int outerWinding, int innerWinding) {
-    SkASSERT(outerWinding != SK_MaxS32);
-    SkASSERT(innerWinding != SK_MaxS32);
-    int absOut = abs(outerWinding);
-    int absIn = abs(innerWinding);
-    bool result = absOut == absIn ? true : absOut < absIn;
-    return result;
-}
-
-int SkOpSegment::windingAtT(double tHit, int tIndex, bool crossOpp, SkScalar* dx) const {
-    if (approximately_zero(tHit - t(tIndex))) {  // if we hit the end of a span, disregard
-        return SK_MinS32;
-    }
-    int winding = crossOpp ? oppSum(tIndex) : windSum(tIndex);
-    SkASSERT(winding != SK_MinS32);
-    int windVal = crossOpp ? oppValue(tIndex) : windValue(tIndex);
-#if DEBUG_WINDING_AT_T
-    SkDebugf("%s id=%d opp=%d tHit=%1.9g t=%1.9g oldWinding=%d windValue=%d", __FUNCTION__,
-            debugID(), crossOpp, tHit, t(tIndex), winding, windVal);
-#endif
-    // see if a + change in T results in a +/- change in X (compute x'(T))
-    *dx = (*CurveSlopeAtT[SkPathOpsVerbToPoints(fVerb)])(fPts, tHit).fX;
-    if (fVerb > SkPath::kLine_Verb && approximately_zero(*dx)) {
-        *dx = fPts[2].fX - fPts[1].fX - *dx;
-    }
-    if (*dx == 0) {
-#if DEBUG_WINDING_AT_T
-        SkDebugf(" dx=0 winding=SK_MinS32\n");
-#endif
-        return SK_MinS32;
-    }
-    if (windVal < 0) {  // reverse sign if opp contour traveled in reverse
-            *dx = -*dx;
-    }
-    if (winding * *dx > 0) {  // if same signs, result is negative
-        winding += *dx > 0 ? -windVal : windVal;
-    }
-#if DEBUG_WINDING_AT_T
-    SkDebugf(" dx=%c winding=%d\n", *dx > 0 ? '+' : '-', winding);
-#endif
-    return winding;
-}
-
 int SkOpSegment::windSum(const SkOpAngle* angle) const {
-    int start = angle->start();
-    int end = angle->end();
-    int index = SkMin32(start, end);
-    return windSum(index);
-}
-
-void SkOpSegment::zeroSpan(SkOpSpan* span) {
-    SkASSERT(span->fWindValue > 0 || span->fOppValue != 0);
-    span->fWindValue = 0;
-    span->fOppValue = 0;
-    if (span->fTiny || span->fSmall) {
-        return;
-    }
-    SkASSERT(!span->fDone);
-    span->fDone = true;
-    ++fDoneSpans;
+    const SkOpSpan* minSpan = angle->start()->starter(angle->end());
+    return minSpan->windSum();
 }
diff --git a/gfx/skia/skia/src/pathops/SkOpSegment.h b/gfx/skia/skia/src/pathops/SkOpSegment.h
index d191e88af26a..06649aa2be20 100644
--- a/gfx/skia/skia/src/pathops/SkOpSegment.h
+++ b/gfx/skia/skia/src/pathops/SkOpSegment.h
@@ -9,545 +9,417 @@
 
 #include "SkOpAngle.h"
 #include "SkOpSpan.h"
+#include "SkOpTAllocator.h"
 #include "SkPathOpsBounds.h"
+#include "SkPathOpsCubic.h"
 #include "SkPathOpsCurve.h"
-#include "SkTArray.h"
-#include "SkTDArray.h"
 
-#if defined(SK_DEBUG) || !FORCE_RELEASE
-#include "SkThread.h"
-#endif
-
-struct SkCoincidence;
+struct SkDCurve;
+class SkOpCoincidence;
+class SkOpContour;
+enum class SkOpRayDir;
+struct SkOpRayHit;
 class SkPathWriter;
 
 class SkOpSegment {
 public:
-    SkOpSegment() {
-#if defined(SK_DEBUG) || !FORCE_RELEASE
-        fID = sk_atomic_inc(&SkPathOpsDebug::gSegmentID);
-#endif
-    }
+    enum AllowAlias {
+        kAllowAlias,
+        kNoAlias
+    };
 
     bool operator<(const SkOpSegment& rh) const {
         return fBounds.fTop < rh.fBounds.fTop;
     }
 
-    struct AlignedSpan  {
-        double fOldT;
-        double fT;
-        SkPoint fOldPt;
-        SkPoint fPt;
-        const SkOpSegment* fSegment;
-        const SkOpSegment* fOther1;
-        const SkOpSegment* fOther2;
-    };
+    SkOpAngle* activeAngle(SkOpSpanBase* start, SkOpSpanBase** startPtr, SkOpSpanBase** endPtr,
+                            bool* done);
+    SkOpAngle* activeAngleInner(SkOpSpanBase* start, SkOpSpanBase** startPtr,
+                                       SkOpSpanBase** endPtr, bool* done);
+    SkOpAngle* activeAngleOther(SkOpSpanBase* start, SkOpSpanBase** startPtr,
+                                       SkOpSpanBase** endPtr, bool* done);
+    bool activeOp(SkOpSpanBase* start, SkOpSpanBase* end, int xorMiMask, int xorSuMask,
+                  SkPathOp op);
+    bool activeOp(int xorMiMask, int xorSuMask, SkOpSpanBase* start, SkOpSpanBase* end, SkPathOp op,
+                  int* sumMiWinding, int* sumSuWinding);
+
+    bool activeWinding(SkOpSpanBase* start, SkOpSpanBase* end);
+    bool activeWinding(SkOpSpanBase* start, SkOpSpanBase* end, int* sumWinding);
+    void addAlignIntersection(SkOpPtT& endPtT, SkPoint& oldPt,
+        SkOpContourHead* contourList, SkChunkAlloc* allocator);
+
+    void addAlignIntersections(SkOpContourHead* contourList, SkChunkAlloc* allocator) {
+        this->addAlignIntersection(*fHead.ptT(), fOriginal[0], contourList, allocator);
+        this->addAlignIntersection(*fTail.ptT(), fOriginal[1], contourList, allocator);
+    }
+
+    SkOpSegment* addConic(SkPoint pts[3], SkScalar weight, SkOpContour* parent) {
+        init(pts, weight, parent, SkPath::kConic_Verb);
+        SkDCurve curve;
+        curve.fConic.set(pts, weight);
+        curve.setConicBounds(pts, weight, 0, 1, &fBounds);
+        return this;
+    }
+
+    SkOpSegment* addCubic(SkPoint pts[4], SkOpContour* parent) {
+        init(pts, 1, parent, SkPath::kCubic_Verb);
+        SkDCurve curve;
+        curve.fCubic.set(pts);
+        curve.setCubicBounds(pts, 1, 0, 1, &fBounds);
+        return this;
+    }
+
+    bool addCurveTo(const SkOpSpanBase* start, const SkOpSpanBase* end, SkPathWriter* path) const;
+
+    SkOpAngle* addEndSpan(SkChunkAlloc* allocator) {
+        SkOpAngle* angle = SkOpTAllocator<SkOpAngle>::Allocate(allocator);
+        angle->set(&fTail, fTail.prev());
+        fTail.setFromAngle(angle);
+        return angle;
+    }
+
+    SkOpSegment* addLine(SkPoint pts[2], SkOpContour* parent) {
+        init(pts, 1, parent, SkPath::kLine_Verb);
+        fBounds.set(pts, 2);
+        return this;
+    }
+
+    SkOpPtT* addMissing(double t, SkOpSegment* opp, SkChunkAlloc* );
+
+    SkOpAngle* addStartSpan(SkChunkAlloc* allocator) {
+        SkOpAngle* angle = SkOpTAllocator<SkOpAngle>::Allocate(allocator);
+        angle->set(&fHead, fHead.next());
+        fHead.setToAngle(angle);
+        return angle;
+    }
+
+    SkOpSegment* addQuad(SkPoint pts[3], SkOpContour* parent) {
+        init(pts, 1, parent, SkPath::kQuad_Verb);
+        SkDCurve curve;
+        curve.fQuad.set(pts);
+        curve.setQuadBounds(pts, 1, 0, 1, &fBounds);
+        return this;
+    }
+
+    SkOpPtT* addT(double t, AllowAlias , SkChunkAlloc* );
+
+    void align();
 
     const SkPathOpsBounds& bounds() const {
         return fBounds;
     }
 
-    // OPTIMIZE
-    // when the edges are initially walked, they don't automatically get the prior and next
-    // edges assigned to positions t=0 and t=1. Doing that would remove the need for this check,
-    // and would additionally remove the need for similar checks in condition edges. It would
-    // also allow intersection code to assume end of segment intersections (maybe?)
-    bool complete() const {
-        int count = fTs.count();
-        return count > 1 && fTs[0].fT == 0 && fTs[--count].fT == 1;
+    void bumpCount() {
+        ++fCount;
+    }
+
+    void calcAngles(SkChunkAlloc*);
+    bool collapsed() const;
+    static void ComputeOneSum(const SkOpAngle* baseAngle, SkOpAngle* nextAngle,
+                              SkOpAngle::IncludeType );
+    static void ComputeOneSumReverse(SkOpAngle* baseAngle, SkOpAngle* nextAngle,
+                                     SkOpAngle::IncludeType );
+    int computeSum(SkOpSpanBase* start, SkOpSpanBase* end, SkOpAngle::IncludeType includeType);
+
+    SkOpContour* contour() const {
+        return fContour;
     }
 
     int count() const {
-        return fTs.count();
+        return fCount;
     }
 
+    void debugAddAngle(double startT, double endT, SkChunkAlloc*);
+    void debugAddAlignIntersection(const char* id, SkPathOpsDebug::GlitchLog* glitches,
+                                   const SkOpPtT& endPtT, const SkPoint& oldPt,
+                                   const SkOpContourHead* ) const;
+
+    void debugAddAlignIntersections(const char* id, SkPathOpsDebug::GlitchLog* glitches,
+                                    SkOpContourHead* contourList) const {
+        this->debugAddAlignIntersection(id, glitches, *fHead.ptT(), fOriginal[0], contourList);
+        this->debugAddAlignIntersection(id, glitches, *fTail.ptT(), fOriginal[1], contourList);
+    }
+
+    bool debugAddMissing(double t, const SkOpSegment* opp) const;
+    void debugAlign(const char* id, SkPathOpsDebug::GlitchLog* glitches) const;
+    const SkOpAngle* debugAngle(int id) const;
+#if DEBUG_ANGLE
+    void debugCheckAngleCoin() const;
+#endif
+    void debugCheckHealth(const char* id, SkPathOpsDebug::GlitchLog* ) const;
+    SkOpContour* debugContour(int id);
+    void debugFindCollapsed(const char* id, SkPathOpsDebug::GlitchLog* glitches) const;
+
+    int debugID() const {
+        return SkDEBUGRELEASE(fID, -1);
+    }
+
+    SkOpAngle* debugLastAngle();
+    void debugMissingCoincidence(const char* id, SkPathOpsDebug::GlitchLog* glitches,
+                                 const SkOpCoincidence* coincidences) const;
+    void debugMoveMultiples(const char* id, SkPathOpsDebug::GlitchLog* glitches) const;
+    void debugMoveNearby(const char* id, SkPathOpsDebug::GlitchLog* glitches) const;
+    const SkOpPtT* debugPtT(int id) const;
+    void debugReset();
+    const SkOpSegment* debugSegment(int id) const;
+
+#if DEBUG_ACTIVE_SPANS
+    void debugShowActiveSpans() const;
+#endif
+#if DEBUG_MARK_DONE
+    void debugShowNewWinding(const char* fun, const SkOpSpan* span, int winding);
+    void debugShowNewWinding(const char* fun, const SkOpSpan* span, int winding, int oppWinding);
+#endif
+
+    const SkOpSpanBase* debugSpan(int id) const;
+    void debugValidate() const;
+    void detach(const SkOpSpan* );
+    double distSq(double t, const SkOpAngle* opp) const;
+
     bool done() const {
-        SkASSERT(fDoneSpans <= fTs.count());
-        return fDoneSpans == fTs.count();
-    }
-
-    bool done(int min) const {
-        return fTs[min].fDone;
+        SkASSERT(fDoneCount <= fCount);
+        return fDoneCount == fCount;
     }
 
     bool done(const SkOpAngle* angle) const {
-        return done(SkMin32(angle->start(), angle->end()));
+        return angle->start()->starter(angle->end())->done();
     }
 
     SkDPoint dPtAtT(double mid) const {
-        return (*CurveDPointAtT[SkPathOpsVerbToPoints(fVerb)])(fPts, mid);
+        return (*CurveDPointAtT[fVerb])(fPts, fWeight, mid);
     }
 
-    SkVector dxdy(int index) const {
-        return (*CurveSlopeAtT[SkPathOpsVerbToPoints(fVerb)])(fPts, fTs[index].fT);
+    SkDVector dSlopeAtT(double mid) const {
+        return (*CurveDSlopeAtT[fVerb])(fPts, fWeight, mid);
     }
 
-    SkScalar dy(int index) const {
-        return dxdy(index).fY;
+    void dump() const;
+    void dumpAll() const;
+    void dumpAngles() const;
+    void dumpCoin() const;
+    void dumpPts(const char* prefix = "seg") const;
+    void dumpPtsInner(const char* prefix = "seg") const;
+
+    void findCollapsed();
+    SkOpSegment* findNextOp(SkTDArray<SkOpSpanBase*>* chase, SkOpSpanBase** nextStart,
+                             SkOpSpanBase** nextEnd, bool* unsortable, SkPathOp op,
+                             int xorMiMask, int xorSuMask);
+    SkOpSegment* findNextWinding(SkTDArray<SkOpSpanBase*>* chase, SkOpSpanBase** nextStart,
+                                  SkOpSpanBase** nextEnd, bool* unsortable);
+    SkOpSegment* findNextXor(SkOpSpanBase** nextStart, SkOpSpanBase** nextEnd, bool* unsortable);
+    SkOpSpan* findSortableTop(SkOpContour* );
+    SkOpGlobalState* globalState() const;
+
+    const SkOpSpan* head() const {
+        return &fHead;
     }
 
-    bool hasMultiples() const {
-        return fMultiples;
+    SkOpSpan* head() {
+        return &fHead;
     }
 
-    bool hasSmall() const {
-        return fSmall;
+    void init(SkPoint pts[], SkScalar weight, SkOpContour* parent, SkPath::Verb verb);
+
+    SkOpSpan* insert(SkOpSpan* prev, SkChunkAlloc* allocator) {
+        SkOpSpan* result = SkOpTAllocator<SkOpSpan>::Allocate(allocator);
+        SkOpSpanBase* next = prev->next();
+        result->setPrev(prev);
+        prev->setNext(result);
+        SkDEBUGCODE(result->ptT()->fT = 0);
+        result->setNext(next);
+        if (next) {
+            next->setPrev(result);
+        }
+        return result;
     }
 
-    bool hasTiny() const {
-        return fTiny;
-    }
-
-    bool intersected() const {
-        return fTs.count() > 0;
-    }
-
-    bool isCanceled(int tIndex) const {
-        return fTs[tIndex].fWindValue == 0 && fTs[tIndex].fOppValue == 0;
-    }
-
-    bool isConnected(int startIndex, int endIndex) const {
-        return fTs[startIndex].fWindSum != SK_MinS32 || fTs[endIndex].fWindSum != SK_MinS32;
-    }
+    bool isClose(double t, const SkOpSegment* opp) const;
 
     bool isHorizontal() const {
         return fBounds.fTop == fBounds.fBottom;
     }
 
+    SkOpSegment* isSimple(SkOpSpanBase** end, int* step) {
+        return nextChase(end, step, nullptr, nullptr);
+    }
+
     bool isVertical() const {
         return fBounds.fLeft == fBounds.fRight;
     }
 
-    bool isVertical(int start, int end) const {
-        return (*CurveIsVertical[SkPathOpsVerbToPoints(fVerb)])(fPts, start, end);
+    bool isVertical(SkOpSpanBase* start, SkOpSpanBase* end) const {
+        return (*CurveIsVertical[fVerb])(fPts, fWeight, start->t(), end->t());
     }
 
-    bool operand() const {
-        return fOperand;
+    bool isXor() const;
+
+    const SkPoint& lastPt() const {
+        return fPts[SkPathOpsVerbToPoints(fVerb)];
     }
 
-    int oppSign(const SkOpAngle* angle) const {
-        SkASSERT(angle->segment() == this);
-        return oppSign(angle->start(), angle->end());
+    void markAllDone();
+    SkOpSpanBase* markAndChaseDone(SkOpSpanBase* start, SkOpSpanBase* end);
+    bool markAndChaseWinding(SkOpSpanBase* start, SkOpSpanBase* end, int winding,
+            SkOpSpanBase** lastPtr);
+    bool markAndChaseWinding(SkOpSpanBase* start, SkOpSpanBase* end, int winding,
+            int oppWinding, SkOpSpanBase** lastPtr);
+    SkOpSpanBase* markAngle(int maxWinding, int sumWinding, const SkOpAngle* angle);
+    SkOpSpanBase* markAngle(int maxWinding, int sumWinding, int oppMaxWinding, int oppSumWinding,
+                         const SkOpAngle* angle);
+    void markDone(SkOpSpan* );
+    bool markWinding(SkOpSpan* , int winding);
+    bool markWinding(SkOpSpan* , int winding, int oppWinding);
+    bool match(const SkOpPtT* span, const SkOpSegment* parent, double t, const SkPoint& pt) const;
+    bool missingCoincidence(SkOpCoincidence* coincidences, SkChunkAlloc* allocator);
+    void moveMultiples();
+    void moveNearby();
+
+    SkOpSegment* next() const {
+        return fNext;
     }
 
-    int oppSign(int startIndex, int endIndex) const {
-        int result = startIndex < endIndex ? -fTs[startIndex].fOppValue : fTs[endIndex].fOppValue;
-#if DEBUG_WIND_BUMP
-        SkDebugf("%s oppSign=%d\n", __FUNCTION__, result);
-#endif
+    SkOpSegment* nextChase(SkOpSpanBase** , int* step, SkOpSpan** , SkOpSpanBase** last) const;
+    bool operand() const;
+
+    static int OppSign(const SkOpSpanBase* start, const SkOpSpanBase* end) {
+        int result = start->t() < end->t() ? -start->upCast()->oppValue()
+                : end->upCast()->oppValue();
         return result;
     }
 
-    int oppSum(int tIndex) const {
-        return fTs[tIndex].fOppSum;
-    }
+    bool oppXor() const;
 
-    int oppSum(const SkOpAngle* angle) const {
-        int lesser = SkMin32(angle->start(), angle->end());
-        return fTs[lesser].fOppSum;
+    const SkOpSegment* prev() const {
+        return fPrev;
     }
 
-    int oppValue(int tIndex) const {
-        return fTs[tIndex].fOppValue;
-    }
-
-    int oppValue(const SkOpAngle* angle) const {
-        int lesser = SkMin32(angle->start(), angle->end());
-        return fTs[lesser].fOppValue;
-    }
-
-#if DEBUG_VALIDATE
-    bool oppXor() const {
-        return fOppXor;
-    }
-#endif
-
     SkPoint ptAtT(double mid) const {
-        return (*CurvePointAtT[SkPathOpsVerbToPoints(fVerb)])(fPts, mid);
+        return (*CurvePointAtT[fVerb])(fPts, fWeight, mid);
     }
 
     const SkPoint* pts() const {
         return fPts;
     }
 
-    void reset() {
-        init(NULL, (SkPath::Verb) -1, false, false);
-        fBounds.set(SK_ScalarMax, SK_ScalarMax, SK_ScalarMax, SK_ScalarMax);
-        fTs.reset();
+    bool ptsDisjoint(const SkOpPtT& span, const SkOpPtT& test) const {
+        return ptsDisjoint(span.fT, span.fPt, test.fT, test.fPt);
     }
 
-    void setOppXor(bool isOppXor) {
-        fOppXor = isOppXor;
+    bool ptsDisjoint(const SkOpPtT& span, double t, const SkPoint& pt) const {
+        return ptsDisjoint(span.fT, span.fPt, t, pt);
     }
 
-    void setUpWinding(int index, int endIndex, int* maxWinding, int* sumWinding) {
-        int deltaSum = spanSign(index, endIndex);
+    bool ptsDisjoint(double t1, const SkPoint& pt1, double t2, const SkPoint& pt2) const;
+
+    void rayCheck(const SkOpRayHit& base, SkOpRayDir dir, SkOpRayHit** hits,
+                  SkChunkAlloc* allocator);
+
+    void resetVisited() {
+        fVisited = false;
+    }
+
+    void setContour(SkOpContour* contour) {
+        fContour = contour;
+    }
+
+    void setNext(SkOpSegment* next) {
+        fNext = next;
+    }
+
+    void setPrev(SkOpSegment* prev) {
+        fPrev = prev;
+    }
+
+    void setVisited() {
+        fVisited = true;
+    }
+
+    void setUpWinding(SkOpSpanBase* start, SkOpSpanBase* end, int* maxWinding, int* sumWinding) {
+        int deltaSum = SpanSign(start, end);
         *maxWinding = *sumWinding;
         *sumWinding -= deltaSum;
     }
 
-    const SkOpSpan& span(int tIndex) const {
-        return fTs[tIndex];
-    }
+    void setUpWindings(SkOpSpanBase* start, SkOpSpanBase* end, int* sumMiWinding,
+                       int* maxWinding, int* sumWinding);
+    void setUpWindings(SkOpSpanBase* start, SkOpSpanBase* end, int* sumMiWinding, int* sumSuWinding,
+                       int* maxWinding, int* sumWinding, int* oppMaxWinding, int* oppSumWinding);
+    void sortAngles();
 
-    const SkOpAngle* spanToAngle(int tStart, int tEnd) const {
-        SkASSERT(tStart != tEnd);
-        const SkOpSpan& span = fTs[tStart];
-        return tStart < tEnd ? span.fToAngle : span.fFromAngle;
-    }
-
-    // FIXME: create some sort of macro or template that avoids casting
-    SkOpAngle* spanToAngle(int tStart, int tEnd) {
-        const SkOpAngle* cAngle = (const_cast<const SkOpSegment*>(this))->spanToAngle(tStart, tEnd);
-        return const_cast<SkOpAngle*>(cAngle);
-    }
-
-    int spanSign(const SkOpAngle* angle) const {
-        SkASSERT(angle->segment() == this);
-        return spanSign(angle->start(), angle->end());
-    }
-
-    int spanSign(int startIndex, int endIndex) const {
-        int result = startIndex < endIndex ? -fTs[startIndex].fWindValue : fTs[endIndex].fWindValue;
-#if DEBUG_WIND_BUMP
-        SkDebugf("%s spanSign=%d\n", __FUNCTION__, result);
-#endif
+    static int SpanSign(const SkOpSpanBase* start, const SkOpSpanBase* end) {
+        int result = start->t() < end->t() ? -start->upCast()->windValue()
+                : end->upCast()->windValue();
         return result;
     }
 
-    double t(int tIndex) const {
-        return fTs[tIndex].fT;
+    SkOpAngle* spanToAngle(SkOpSpanBase* start, SkOpSpanBase* end) {
+        SkASSERT(start != end);
+        return start->t() < end->t() ? start->upCast()->toAngle() : start->fromAngle();
     }
 
-    double tAtMid(int start, int end, double mid) const {
-        return fTs[start].fT * (1 - mid) + fTs[end].fT * mid;
+    bool subDivide(const SkOpSpanBase* start, const SkOpSpanBase* end, SkDCurve* result) const;
+    bool subDivide(const SkOpSpanBase* start, const SkOpSpanBase* end, SkOpCurve* result) const;
+
+    const SkOpSpanBase* tail() const {
+        return &fTail;
     }
 
-    void updatePts(const SkPoint pts[]) {
-        fPts = pts;
+    SkOpSpanBase* tail() {
+        return &fTail;
     }
 
+    bool testForCoincidence(const SkOpPtT* priorPtT, const SkOpPtT* ptT, const SkOpSpanBase* prior,
+            const SkOpSpanBase* spanBase, const SkOpSegment* opp, SkScalar flatnessLimit) const;
+
+    void undoneSpan(SkOpSpanBase** start, SkOpSpanBase** end);
+    int updateOppWinding(const SkOpSpanBase* start, const SkOpSpanBase* end) const;
+    int updateOppWinding(const SkOpAngle* angle) const;
+    int updateOppWindingReverse(const SkOpAngle* angle) const;
+    int updateWinding(SkOpSpanBase* start, SkOpSpanBase* end);
+    int updateWinding(SkOpAngle* angle);
+    int updateWindingReverse(const SkOpAngle* angle);
+
+    static bool UseInnerWinding(int outerWinding, int innerWinding);
+
     SkPath::Verb verb() const {
         return fVerb;
     }
 
-    int windSum(int tIndex) const {
-        return fTs[tIndex].fWindSum;
+    // look for two different spans that point to the same opposite segment
+    bool visited() {
+        if (!fVisited) {
+            fVisited = true;
+            return false;
+        }
+        return true;
     }
 
-    int windValue(int tIndex) const {
-        return fTs[tIndex].fWindValue;
+    SkScalar weight() const {
+        return fWeight;
     }
 
-#if defined(SK_DEBUG) || DEBUG_WINDING
-    SkScalar xAtT(int index) const {
-        return xAtT(&fTs[index]);
-    }
-#endif
-
-#if DEBUG_VALIDATE
-    bool _xor() const {  // FIXME: used only by SkOpAngle::debugValidateLoop()
-        return fXor;
-    }
-#endif
-
-    const SkPoint& xyAtT(const SkOpSpan* span) const {
-        return span->fPt;
-    }
-
-    const SkPoint& xyAtT(int index) const {
-        return xyAtT(&fTs[index]);
-    }
-
-#if defined(SK_DEBUG) || DEBUG_WINDING
-    SkScalar yAtT(int index) const {
-        return yAtT(&fTs[index]);
-    }
-#endif
-
-    const SkOpAngle* activeAngle(int index, int* start, int* end, bool* done,
-                                 bool* sortable) const;
-    SkPoint activeLeftTop(int* firstT) const;
-    bool activeOp(int index, int endIndex, int xorMiMask, int xorSuMask, SkPathOp op);
-    bool activeWinding(int index, int endIndex);
-    void addCubic(const SkPoint pts[4], bool operand, bool evenOdd);
-    void addCurveTo(int start, int end, SkPathWriter* path, bool active) const;
-    void addEndSpan(int endIndex);
-    void addLine(const SkPoint pts[2], bool operand, bool evenOdd);
-    void addOtherT(int index, double otherT, int otherIndex);
-    void addQuad(const SkPoint pts[3], bool operand, bool evenOdd);
-    void addSimpleAngle(int endIndex);
-    int addSelfT(const SkPoint& pt, double newT);
-    void addStartSpan(int endIndex);
-    int addT(SkOpSegment* other, const SkPoint& pt, double newT);
-    void addTCancel(const SkPoint& startPt, const SkPoint& endPt, SkOpSegment* other);
-    void addTCoincident(const SkPoint& startPt, const SkPoint& endPt, double endT,
-                        SkOpSegment* other);
-    const SkOpSpan* addTPair(double t, SkOpSegment* other, double otherT, bool borrowWind,
-                             const SkPoint& pt);
-    const SkOpSpan* addTPair(double t, SkOpSegment* other, double otherT, bool borrowWind,
-                             const SkPoint& pt, const SkPoint& oPt);
-    void alignMultiples(SkTDArray<AlignedSpan>* aligned);
-    bool alignSpan(int index, double thisT, const SkPoint& thisPt);
-    void alignSpanState(int start, int end);
-    bool betweenTs(int lesser, double testT, int greater) const;
-    void blindCancel(const SkCoincidence& coincidence, SkOpSegment* other);
-    void blindCoincident(const SkCoincidence& coincidence, SkOpSegment* other);
-    bool calcAngles();
-    double calcMissingTEnd(const SkOpSegment* ref, double loEnd, double min, double max,
-                           double hiEnd, const SkOpSegment* other, int thisEnd);
-    double calcMissingTStart(const SkOpSegment* ref, double loEnd, double min, double max,
-                             double hiEnd, const SkOpSegment* other, int thisEnd);
-    void checkDuplicates();
-    void checkEnds();
-    void checkMultiples();
-    void checkSmall();
-    bool checkSmall(int index) const;
-    void checkTiny();
-    int computeSum(int startIndex, int endIndex, SkOpAngle::IncludeType includeType);
-    bool containsPt(const SkPoint& , int index, int endIndex) const;
-    int crossedSpanY(const SkPoint& basePt, SkScalar* bestY, double* hitT, bool* hitSomething,
-                     double mid, bool opp, bool current) const;
-    bool findCoincidentMatch(const SkOpSpan* span, const SkOpSegment* other, int oStart, int oEnd,
-                             int step, SkPoint* startPt, SkPoint* endPt, double* endT) const;
-    SkOpSegment* findNextOp(SkTDArray<SkOpSpan*>* chase, int* nextStart, int* nextEnd,
-                            bool* unsortable, SkPathOp op, int xorMiMask, int xorSuMask);
-    SkOpSegment* findNextWinding(SkTDArray<SkOpSpan*>* chase, int* nextStart, int* nextEnd,
-                                 bool* unsortable);
-    SkOpSegment* findNextXor(int* nextStart, int* nextEnd, bool* unsortable);
-    int findExactT(double t, const SkOpSegment* ) const;
-    int findOtherT(double t, const SkOpSegment* ) const;
-    int findT(double t, const SkPoint& , const SkOpSegment* ) const;
-    SkOpSegment* findTop(int* tIndex, int* endIndex, bool* unsortable, bool firstPass);
-    void fixOtherTIndex();
-    void initWinding(int start, int end, SkOpAngle::IncludeType angleIncludeType);
-    void initWinding(int start, int end, double tHit, int winding, SkScalar hitDx, int oppWind,
-                     SkScalar hitOppDx);
-    bool isMissing(double startT, const SkPoint& pt) const;
-    bool isTiny(const SkOpAngle* angle) const;
-    bool joinCoincidence(SkOpSegment* other, double otherT, const SkPoint& otherPt, int step,
-                         bool cancel);
-    SkOpSpan* markAndChaseDoneBinary(int index, int endIndex);
-    SkOpSpan* markAndChaseDoneUnary(int index, int endIndex);
-    SkOpSpan* markAndChaseWinding(const SkOpAngle* angle, int winding, int oppWinding);
-    SkOpSpan* markAngle(int maxWinding, int sumWinding, int oppMaxWinding, int oppSumWinding,
-                        const SkOpAngle* angle);
-    void markDone(int index, int winding);
-    void markDoneBinary(int index);
-    void markDoneUnary(int index);
-    bool nextCandidate(int* start, int* end) const;
-    int nextSpan(int from, int step) const;
-    void pinT(const SkPoint& pt, double* t);
-    void setUpWindings(int index, int endIndex, int* sumMiWinding, int* sumSuWinding,
-            int* maxWinding, int* sumWinding, int* oppMaxWinding, int* oppSumWinding);
-    void sortAngles();
-    bool subDivide(int start, int end, SkPoint edge[4]) const;
-    bool subDivide(int start, int end, SkDCubic* result) const;
-    void undoneSpan(int* start, int* end);
-    int updateOppWindingReverse(const SkOpAngle* angle) const;
-    int updateWindingReverse(const SkOpAngle* angle) const;
-    static bool UseInnerWinding(int outerWinding, int innerWinding);
-    static bool UseInnerWindingReverse(int outerWinding, int innerWinding);
-    int windingAtT(double tHit, int tIndex, bool crossOpp, SkScalar* dx) const;
+    SkOpSpan* windingSpanAtT(double tHit);
     int windSum(const SkOpAngle* angle) const;
-// available for testing only
-#if defined(SK_DEBUG) || !FORCE_RELEASE
-    int debugID() const {
-        return fID;
+
+    SkPoint* writablePt(bool end) {
+        return &fPts[end ? SkPathOpsVerbToPoints(fVerb) : 0];
     }
-#else
-    int debugID() const {
-        return -1;
-    }
-#endif
-#if DEBUG_ACTIVE_SPANS || DEBUG_ACTIVE_SPANS_FIRST_ONLY
-    void debugShowActiveSpans() const;
-#endif
-#if DEBUG_CONCIDENT
-    void debugShowTs(const char* prefix) const;
-#endif
-#if DEBUG_SHOW_WINDING
-    int debugShowWindingValues(int slotCount, int ofInterest) const;
-#endif
-    const SkTDArray<SkOpSpan>& debugSpans() const;
-    void debugValidate() const;
-    // available to testing only
-    const SkOpAngle* debugLastAngle() const;
-    void dumpAngles() const;
-    void dumpContour(int firstID, int lastID) const;
-    void dumpPts() const;
-    void dumpSpans() const;
 
 private:
-    struct MissingSpan  {
-        double fT;
-        double fEndT;
-        SkOpSegment* fSegment;
-        SkOpSegment* fOther;
-        double fOtherT;
-        SkPoint fPt;
-    };
-
-    const SkOpAngle* activeAngleInner(int index, int* start, int* end, bool* done,
-                                      bool* sortable) const;
-    const SkOpAngle* activeAngleOther(int index, int* start, int* end, bool* done,
-                                      bool* sortable) const;
-    bool activeOp(int xorMiMask, int xorSuMask, int index, int endIndex, SkPathOp op,
-                  int* sumMiWinding, int* sumSuWinding);
-    bool activeWinding(int index, int endIndex, int* sumWinding);
-    void addCancelOutsides(const SkPoint& startPt, const SkPoint& endPt, SkOpSegment* other);
-    void addCoinOutsides(const SkPoint& startPt, const SkPoint& endPt, SkOpSegment* other);
-    SkOpAngle* addSingletonAngleDown(SkOpSegment** otherPtr, SkOpAngle** );
-    SkOpAngle* addSingletonAngleUp(SkOpSegment** otherPtr, SkOpAngle** );
-    SkOpAngle* addSingletonAngles(int step);
-    void alignSpan(const SkPoint& newPt, double newT, const SkOpSegment* other, double otherT,
-                   const SkOpSegment* other2, SkOpSpan* oSpan, SkTDArray<AlignedSpan>* );
-    bool betweenPoints(double midT, const SkPoint& pt1, const SkPoint& pt2) const;
-    void bumpCoincidentBlind(bool binary, int index, int last);
-    void bumpCoincidentThis(const SkOpSpan& oTest, bool binary, int* index,
-                           SkTArray<SkPoint, true>* outsideTs);
-    void bumpCoincidentOBlind(int index, int last);
-    void bumpCoincidentOther(const SkOpSpan& oTest, int* index,
-                           SkTArray<SkPoint, true>* outsideTs);
-    bool bumpSpan(SkOpSpan* span, int windDelta, int oppDelta);
-    bool calcLoopSpanCount(const SkOpSpan& thisSpan, int* smallCounts);
-    bool checkForSmall(const SkOpSpan* span, const SkPoint& pt, double newT,
-                       int* less, int* more) const;
-    void checkLinks(const SkOpSpan* ,
-                    SkTArray<MissingSpan, true>* missingSpans) const;
-    static void CheckOneLink(const SkOpSpan* test, const SkOpSpan* oSpan,
-                             const SkOpSpan* oFirst, const SkOpSpan* oLast,
-                             const SkOpSpan** missingPtr,
-                             SkTArray<MissingSpan, true>* missingSpans);
-    int checkSetAngle(int tIndex) const;
-    void checkSmallCoincidence(const SkOpSpan& span, SkTArray<MissingSpan, true>* );
-    bool coincidentSmall(const SkPoint& pt, double t, const SkOpSegment* other) const;
-    bool clockwise(int tStart, int tEnd, bool* swap) const;
-    static void ComputeOneSum(const SkOpAngle* baseAngle, SkOpAngle* nextAngle,
-                              SkOpAngle::IncludeType );
-    static void ComputeOneSumReverse(const SkOpAngle* baseAngle, SkOpAngle* nextAngle,
-                                     SkOpAngle::IncludeType );
-    bool containsT(double t, const SkOpSegment* other, double otherT) const;
-    bool decrementSpan(SkOpSpan* span);
-    int findEndSpan(int endIndex) const;
-    int findStartSpan(int startIndex) const;
-    int firstActive(int tIndex) const;
-    const SkOpSpan& firstSpan(const SkOpSpan& thisSpan) const;
-    void init(const SkPoint pts[], SkPath::Verb verb, bool operand, bool evenOdd);
-    bool inCoincidentSpan(double t, const SkOpSegment* other) const;
-    bool inLoop(const SkOpAngle* baseAngle, int spanCount, int* indexPtr) const;
-#if OLD_CHASE
-    bool isSimple(int end) const;
-#else
-    SkOpSegment* isSimple(int* end, int* step);
-#endif
-    bool isTiny(int index) const;
-    const SkOpSpan& lastSpan(const SkOpSpan& thisSpan) const;
-    void matchWindingValue(int tIndex, double t, bool borrowWind);
-    SkOpSpan* markAndChaseDone(int index, int endIndex, int winding);
-    SkOpSpan* markAndChaseDoneBinary(const SkOpAngle* angle, int winding, int oppWinding);
-    SkOpSpan* markAndChaseWinding(const SkOpAngle* angle, int winding);
-    SkOpSpan* markAndChaseWinding(int index, int endIndex, int winding);
-    SkOpSpan* markAndChaseWinding(int index, int endIndex, int winding, int oppWinding);
-    SkOpSpan* markAngle(int maxWinding, int sumWinding, const SkOpAngle* angle);
-    void markDoneBinary(int index, int winding, int oppWinding);
-    SkOpSpan* markAndChaseDoneUnary(const SkOpAngle* angle, int winding);
-    void markOneDone(const char* funName, int tIndex, int winding);
-    void markOneDoneBinary(const char* funName, int tIndex);
-    void markOneDoneBinary(const char* funName, int tIndex, int winding, int oppWinding);
-    void markOneDoneUnary(const char* funName, int tIndex);
-    SkOpSpan* markOneWinding(const char* funName, int tIndex, int winding);
-    SkOpSpan* markOneWinding(const char* funName, int tIndex, int winding, int oppWinding);
-    void markWinding(int index, int winding);
-    void markWinding(int index, int winding, int oppWinding);
-    bool monotonicInY(int tStart, int tEnd) const;
-
-    bool multipleEnds() const { return fTs[count() - 2].fT == 1; }
-    bool multipleStarts() const { return fTs[1].fT == 0; }
-
-    SkOpSegment* nextChase(int* index, int* step, int* min, SkOpSpan** last);
-    int nextExactSpan(int from, int step) const;
-    bool serpentine(int tStart, int tEnd) const;
-    void setCoincidentRange(const SkPoint& startPt, const SkPoint& endPt,  SkOpSegment* other);
-    void setFromAngle(int endIndex, SkOpAngle* );
-    void setToAngle(int endIndex, SkOpAngle* );
-    void setUpWindings(int index, int endIndex, int* sumMiWinding,
-            int* maxWinding, int* sumWinding);
-    void subDivideBounds(int start, int end, SkPathOpsBounds* bounds) const;
-    static void TrackOutsidePair(SkTArray<SkPoint, true>* outsideTs, const SkPoint& endPt,
-            const SkPoint& startPt);
-    static void TrackOutside(SkTArray<SkPoint, true>* outsideTs, const SkPoint& startPt);
-    int updateOppWinding(int index, int endIndex) const;
-    int updateOppWinding(const SkOpAngle* angle) const;
-    int updateWinding(int index, int endIndex) const;
-    int updateWinding(const SkOpAngle* angle) const;
-    int updateWindingReverse(int index, int endIndex) const;
-    SkOpSpan* verifyOneWinding(const char* funName, int tIndex);
-    SkOpSpan* verifyOneWindingU(const char* funName, int tIndex);
-
-    SkScalar xAtT(const SkOpSpan* span) const {
-        return xyAtT(span).fX;
-    }
-
-    SkScalar yAtT(const SkOpSpan* span) const {
-        return xyAtT(span).fY;
-    }
-
-    void zeroSpan(SkOpSpan* span);
-
-#if DEBUG_SWAP_TOP
-    bool controlsContainedByEnds(int tStart, int tEnd) const;
-#endif
-    void debugAddAngle(int start, int end);
-#if DEBUG_CONCIDENT
-    void debugAddTPair(double t, const SkOpSegment& other, double otherT) const;
-#endif
-#if DEBUG_ANGLE
-    void debugCheckPointsEqualish(int tStart, int tEnd) const;
-#endif
-#if DEBUG_SWAP_TOP
-    int debugInflections(int index, int endIndex) const;
-#endif
-#if DEBUG_MARK_DONE || DEBUG_UNSORTABLE
-    void debugShowNewWinding(const char* fun, const SkOpSpan& span, int winding);
-    void debugShowNewWinding(const char* fun, const SkOpSpan& span, int winding, int oppWinding);
-#endif
-#if DEBUG_WINDING
-    static char as_digit(int value) {
-        return value < 0 ? '?' : value <= 9 ? '0' + value : '+';
-    }
-#endif
-    // available to testing only
-    void debugConstruct();
-    void debugConstructCubic(SkPoint shortQuad[4]);
-    void debugConstructLine(SkPoint shortQuad[2]);
-    void debugConstructQuad(SkPoint shortQuad[3]);
-    void debugReset();
-    void dumpDPts() const;
-    void dumpSpan(int index) const;
-
-    const SkPoint* fPts;
-    SkPathOpsBounds fBounds;
-    // FIXME: can't convert to SkTArray because it uses insert
-    SkTDArray<SkOpSpan> fTs;  // 2+ (always includes t=0 t=1) -- at least (number of spans) + 1
-    SkOpAngleSet fAngles;  // empty or 2+ -- (number of non-zero spans) * 2
-    // OPTIMIZATION: could pack donespans, verb, operand, xor into 1 int-sized value
-    int fDoneSpans;  // quick check that segment is finished
-    // OPTIMIZATION: force the following to be byte-sized
+    SkOpSpan fHead;  // the head span always has its t set to zero
+    SkOpSpanBase fTail;  // the tail span always has its t set to one
+    SkOpContour* fContour;
+    SkOpSegment* fNext;  // forward-only linked list used by contour to walk the segments
+    const SkOpSegment* fPrev;
+    SkPoint fOriginal[2];  // if aligned, the original unaligned points are here
+    SkPoint* fPts;  // pointer into array of points owned by edge builder that may be tweaked
+    SkPathOpsBounds fBounds;  // tight bounds
+    SkScalar fWeight;
+    int fCount;  // number of spans (one for a non-intersecting segment)
+    int fDoneCount;  // number of processed spans (zero initially)
     SkPath::Verb fVerb;
-    bool fLoop;   // set if cubic intersects itself
-    bool fMultiples;  // set if curve intersects multiple other curves at one interior point
-    bool fOperand;
-    bool fXor;  // set if original contour had even-odd fill
-    bool fOppXor;  // set if opposite operand had even-odd fill
-    bool fSmall;  // set if some span is small
-    bool fTiny;  // set if some span is tiny
-#if defined(SK_DEBUG) || !FORCE_RELEASE
-    int fID;
-#endif
-
-    friend class PathOpsSegmentTester;
+    bool fVisited;  // used by missing coincidence check
+    SkDEBUGCODE(int fID);
 };
 
 #endif
diff --git a/gfx/skia/skia/src/pathops/SkOpSpan.cpp b/gfx/skia/skia/src/pathops/SkOpSpan.cpp
new file mode 100755
index 000000000000..7c98e1dcc6b0
--- /dev/null
+++ b/gfx/skia/skia/src/pathops/SkOpSpan.cpp
@@ -0,0 +1,385 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "SkOpCoincidence.h"
+#include "SkOpContour.h"
+#include "SkOpSegment.h"
+#include "SkPathWriter.h"
+
+bool SkOpPtT::alias() const {
+    return this->span()->ptT() != this;
+}
+
+bool SkOpPtT::collapsed(const SkOpPtT* check) const {
+    if (fPt != check->fPt) {
+        return false;
+    }
+    SkASSERT(this != check);
+    const SkOpSegment* segment = this->segment();
+    SkASSERT(segment == check->segment());
+    return segment->collapsed();
+}
+
+bool SkOpPtT::contains(const SkOpPtT* check) const {
+    SkASSERT(this != check);
+    const SkOpPtT* ptT = this;
+    const SkOpPtT* stopPtT = ptT;
+    while ((ptT = ptT->next()) != stopPtT) {
+        if (ptT == check) {
+            return true;
+        }
+    }
+    return false;
+}
+
+SkOpPtT* SkOpPtT::contains(const SkOpSegment* check) {
+    SkASSERT(this->segment() != check);
+    SkOpPtT* ptT = this;
+    const SkOpPtT* stopPtT = ptT;
+    while ((ptT = ptT->next()) != stopPtT) {
+        if (ptT->segment() == check) {
+            return ptT;
+        }
+    }
+    return nullptr;
+}
+
+SkOpContour* SkOpPtT::contour() const {
+    return segment()->contour();
+}
+
+SkOpPtT* SkOpPtT::doppelganger() {
+    SkASSERT(fDeleted);
+    SkOpPtT* ptT = fNext;
+    while (ptT->fDeleted) {
+        ptT = ptT->fNext;
+    }
+    const SkOpPtT* stopPtT = ptT;
+    do {
+        if (ptT->fSpan == fSpan) {
+            return ptT;
+        }
+        ptT = ptT->fNext;
+    } while (stopPtT != ptT);
+    SkASSERT(0);
+    return nullptr;
+}
+
+SkOpPtT* SkOpPtT::find(SkOpSegment* segment) {
+    SkOpPtT* ptT = this;
+    const SkOpPtT* stopPtT = ptT;
+    do {
+        if (ptT->segment() == segment) {
+            return ptT;
+        }
+        ptT = ptT->fNext;
+    } while (stopPtT != ptT);
+    SkASSERT(0);
+    return nullptr;
+}
+
+SkOpGlobalState* SkOpPtT::globalState() const {
+    return contour()->globalState(); 
+}
+
+void SkOpPtT::init(SkOpSpanBase* span, double t, const SkPoint& pt, bool duplicate) {
+    fT = t;
+    fPt = pt;
+    fSpan = span;
+    fNext = this;
+    fDuplicatePt = duplicate;
+    fDeleted = false;
+    SkDEBUGCODE(fID = span->globalState()->nextPtTID());
+}
+
+bool SkOpPtT::onEnd() const {
+    const SkOpSpanBase* span = this->span();
+    if (span->ptT() != this) {
+        return false;
+    }
+    const SkOpSegment* segment = this->segment();
+    return span == segment->head() || span == segment->tail();
+}
+
+SkOpPtT* SkOpPtT::prev() {
+    SkOpPtT* result = this;
+    SkOpPtT* next = this;
+    while ((next = next->fNext) != this) {
+        result = next;
+    }
+    SkASSERT(result->fNext == this);
+    return result;
+}
+
+SkOpPtT* SkOpPtT::remove() {
+    SkOpPtT* prev = this;
+    do {
+        SkOpPtT* next = prev->fNext;
+        if (next == this) {
+            prev->removeNext(this);
+            SkASSERT(prev->fNext != prev);
+            fDeleted = true;
+            return prev;
+        }
+        prev = next;
+    } while (prev != this);
+    SkASSERT(0);
+    return nullptr;
+}
+
+void SkOpPtT::removeNext(SkOpPtT* kept) {
+    SkASSERT(this->fNext);
+    SkOpPtT* next = this->fNext;
+    SkASSERT(this != next->fNext);
+    this->fNext = next->fNext;
+    SkOpSpanBase* span = next->span();
+    next->setDeleted();
+    if (span->ptT() == next) {
+        span->upCast()->detach(kept);
+    }
+}
+
+const SkOpSegment* SkOpPtT::segment() const {
+    return span()->segment();
+}
+
+SkOpSegment* SkOpPtT::segment() {
+    return span()->segment();
+}
+
+void SkOpSpanBase::align() {
+    if (this->fAligned) {
+        return;
+    }
+    SkASSERT(!zero_or_one(this->fPtT.fT));
+    SkASSERT(this->fPtT.next());
+    // if a linked pt/t pair has a t of zero or one, use it as the base for alignment
+    SkOpPtT* ptT = &this->fPtT, * stopPtT = ptT;
+    while ((ptT = ptT->next()) != stopPtT) {
+        if (zero_or_one(ptT->fT)) {
+            SkOpSegment* segment = ptT->segment();
+            SkASSERT(this->segment() != segment);
+            SkASSERT(segment->head()->ptT() == ptT || segment->tail()->ptT() == ptT);
+            if (ptT->fT) {
+                segment->tail()->alignEnd(1, segment->lastPt());
+            } else {
+                segment->head()->alignEnd(0, segment->pts()[0]);
+            }
+            return;
+        }
+    }
+    alignInner();
+    this->fAligned = true;
+}
+
+
+// FIXME: delete spans that collapse
+// delete segments that collapse
+// delete contours that collapse
+void SkOpSpanBase::alignEnd(double t, const SkPoint& pt) {
+    SkASSERT(zero_or_one(t));
+    SkOpSegment* segment = this->segment();
+    SkASSERT(t ? segment->lastPt() == pt : segment->pts()[0] == pt);
+    alignInner();
+    *segment->writablePt(!!t) = pt;
+    SkOpPtT* ptT = &this->fPtT;
+    SkASSERT(t == ptT->fT);
+    SkASSERT(pt == ptT->fPt);
+    SkOpPtT* test = ptT, * stopPtT = ptT;
+    while ((test = test->next()) != stopPtT) {
+        SkOpSegment* other = test->segment();
+        if (other == this->segment()) {
+            continue;
+        }
+        if (!zero_or_one(test->fT)) {
+            continue;
+        }
+        *other->writablePt(!!test->fT) = pt;
+    }
+    this->fAligned = true;
+}
+
+void SkOpSpanBase::alignInner() {
+    // force the spans to share points and t values
+    SkOpPtT* ptT = &this->fPtT, * stopPtT = ptT;
+    const SkPoint& pt = ptT->fPt;
+    do {
+        ptT->fPt = pt;
+        const SkOpSpanBase* span = ptT->span();
+        SkOpPtT* test = ptT;
+        do {
+            SkOpPtT* prev = test;
+            if ((test = test->next()) == stopPtT) {
+                break;
+            }
+            if (span == test->span() && !span->segment()->ptsDisjoint(*ptT, *test)) {
+                // omit aliases that alignment makes redundant
+                if ((!ptT->alias() || test->alias()) && (ptT->onEnd() || !test->onEnd())) {
+                    SkASSERT(test->alias());
+                    prev->removeNext(ptT);
+                    test = prev;
+                } else {
+                    SkASSERT(ptT->alias());
+                    stopPtT = ptT = ptT->remove();
+                    break;
+                }
+            }
+        } while (true);
+    } while ((ptT = ptT->next()) != stopPtT);
+}
+
+bool SkOpSpanBase::contains(const SkOpSpanBase* span) const {
+    const SkOpPtT* start = &fPtT;
+    const SkOpPtT* check = &span->fPtT;
+    SkASSERT(start != check);
+    const SkOpPtT* walk = start;
+    while ((walk = walk->next()) != start) {
+        if (walk == check) {
+            return true;
+        }
+    }
+    return false;
+}
+
+SkOpPtT* SkOpSpanBase::contains(const SkOpSegment* segment) {
+    SkOpPtT* start = &fPtT;
+    SkOpPtT* walk = start;
+    while ((walk = walk->next()) != start) {
+        if (walk->segment() == segment) {
+            return walk;
+        }
+    }
+    return nullptr;
+}
+
+bool SkOpSpanBase::containsCoinEnd(const SkOpSegment* segment) const {
+    SkASSERT(this->segment() != segment);
+    const SkOpSpanBase* next = this;
+    while ((next = next->fCoinEnd) != this) {
+        if (next->segment() == segment) {
+            return true;
+        }
+    }
+    return false;
+}
+
+SkOpContour* SkOpSpanBase::contour() const {
+    return segment()->contour();
+}
+
+SkOpGlobalState* SkOpSpanBase::globalState() const {
+    return contour()->globalState(); 
+}
+
+void SkOpSpanBase::initBase(SkOpSegment* segment, SkOpSpan* prev, double t, const SkPoint& pt) {
+    fSegment = segment;
+    fPtT.init(this, t, pt, false);
+    fCoinEnd = this;
+    fFromAngle = nullptr;
+    fPrev = prev;
+    fSpanAdds = 0;
+    fAligned = true;
+    fChased = false;
+    SkDEBUGCODE(fCount = 1);
+    SkDEBUGCODE(fID = globalState()->nextSpanID());
+}
+
+// this pair of spans share a common t value or point; merge them and eliminate duplicates
+// this does not compute the best t or pt value; this merely moves all data into a single list
+void SkOpSpanBase::merge(SkOpSpan* span) {
+    SkOpPtT* spanPtT = span->ptT();
+    SkASSERT(this->t() != spanPtT->fT);
+    SkASSERT(!zero_or_one(spanPtT->fT));
+    span->detach(this->ptT());
+    SkOpPtT* remainder = spanPtT->next();
+    ptT()->insert(spanPtT);
+    while (remainder != spanPtT) {
+        SkOpPtT* next = remainder->next();
+        SkOpPtT* compare = spanPtT->next();
+        while (compare != spanPtT) {
+            SkOpPtT* nextC = compare->next();
+            if (nextC->span() == remainder->span() && nextC->fT == remainder->fT) {
+                goto tryNextRemainder;
+            }
+            compare = nextC;
+        }
+        spanPtT->insert(remainder);
+tryNextRemainder:
+        remainder = next;
+    }
+    fSpanAdds += span->fSpanAdds;
+}
+
+int SkOpSpan::computeWindSum() {
+    SkOpGlobalState* globals = this->globalState();
+    SkOpContour* contourHead = globals->contourHead();
+    int windTry = 0;
+    while (!this->sortableTop(contourHead) && ++windTry < SkOpGlobalState::kMaxWindingTries) {
+        ;
+    }
+    return this->windSum();
+}
+
+bool SkOpSpan::containsCoincidence(const SkOpSegment* segment) const {
+    SkASSERT(this->segment() != segment);
+    const SkOpSpan* next = fCoincident;
+    do {
+        if (next->segment() == segment) {
+            return true;
+        }
+    } while ((next = next->fCoincident) != this);
+    return false;
+}
+
+void SkOpSpan::detach(SkOpPtT* kept) {
+    SkASSERT(!final());
+    SkOpSpan* prev = this->prev();
+    SkASSERT(prev);
+    SkOpSpanBase* next = this->next();
+    SkASSERT(next);
+    prev->setNext(next);
+    next->setPrev(prev);
+    this->segment()->detach(this);
+    SkOpCoincidence* coincidence = this->globalState()->coincidence();
+    if (coincidence) {
+        coincidence->fixUp(this->ptT(), kept);
+    }
+    this->ptT()->setDeleted();
+}
+
+void SkOpSpan::init(SkOpSegment* segment, SkOpSpan* prev, double t, const SkPoint& pt) {
+    SkASSERT(t != 1);
+    initBase(segment, prev, t, pt);
+    fCoincident = this;
+    fToAngle = nullptr;
+    fWindSum = fOppSum = SK_MinS32;
+    fWindValue = 1;
+    fOppValue = 0;
+    fTopTTry = 0;
+    fChased = fDone = false;
+    segment->bumpCount();
+    fAlreadyAdded = false;
+}
+
+void SkOpSpan::setOppSum(int oppSum) {
+    SkASSERT(!final());
+    if (fOppSum != SK_MinS32 && fOppSum != oppSum) {
+        this->globalState()->setWindingFailed();
+        return;
+    }
+    SkASSERT(!DEBUG_LIMIT_WIND_SUM || SkTAbs(oppSum) <= DEBUG_LIMIT_WIND_SUM);
+    fOppSum = oppSum;
+}
+
+void SkOpSpan::setWindSum(int windSum) {
+    SkASSERT(!final());
+    if (fWindSum != SK_MinS32 && fWindSum != windSum) {
+        this->globalState()->setWindingFailed();
+        return;
+    }
+    SkASSERT(!DEBUG_LIMIT_WIND_SUM || SkTAbs(windSum) <= DEBUG_LIMIT_WIND_SUM);
+    fWindSum = windSum;
+}
diff --git a/gfx/skia/skia/src/pathops/SkOpSpan.h b/gfx/skia/skia/src/pathops/SkOpSpan.h
index d9ce44eb7720..e512554cc6f4 100644
--- a/gfx/skia/skia/src/pathops/SkOpSpan.h
+++ b/gfx/skia/skia/src/pathops/SkOpSpan.h
@@ -7,36 +7,514 @@
 #ifndef SkOpSpan_DEFINED
 #define SkOpSpan_DEFINED
 
+#include "SkPathOpsDebug.h"
+#include "SkPathOpsTypes.h"
 #include "SkPoint.h"
 
-class SkOpAngle;
+class SkChunkAlloc;
+struct SkOpAngle;
+class SkOpContour;
+class SkOpGlobalState;
 class SkOpSegment;
+class SkOpSpanBase;
+class SkOpSpan;
 
-struct SkOpSpan {
-    SkPoint fPt;  // computed when the curves are intersected
-    double fT;
-    double fOtherT;  // value at fOther[fOtherIndex].fT
-    SkOpSegment* fOther;
-    SkOpAngle* fFromAngle;  // (if t > 0) index into segment's angle array going negative in t
-    SkOpAngle* fToAngle;  // (if t < 1) index into segment's angle array going positive in t
-    int fOtherIndex;  // can't be used during intersection
+// subset of op span used by terminal span (when t is equal to one)
+class SkOpPtT {
+public:
+    enum {
+        kIsAlias = 1,
+        kIsDuplicate = 1
+    };
+
+    void addOpp(SkOpPtT* opp) {
+        // find the fOpp ptr to opp
+        SkOpPtT* oppPrev = opp->fNext;
+        if (oppPrev == this) {
+            return;
+        }
+        while (oppPrev->fNext != opp) {
+            oppPrev = oppPrev->fNext;
+             if (oppPrev == this) {
+                 return;
+             }
+        }
+        
+        SkOpPtT* oldNext = this->fNext;
+        SkASSERT(this != opp);
+        this->fNext = opp;
+        SkASSERT(oppPrev != oldNext);
+        oppPrev->fNext = oldNext;
+    }
+
+    bool alias() const;
+    bool collapsed(const SkOpPtT* ) const;
+    bool contains(const SkOpPtT* ) const;
+    SkOpPtT* contains(const SkOpSegment* );
+    SkOpContour* contour() const;
+
+    int debugID() const {
+        return SkDEBUGRELEASE(fID, -1);
+    }
+
+    const SkOpAngle* debugAngle(int id) const;
+    bool debugContains(const SkOpPtT* ) const;
+    const SkOpPtT* debugContains(const SkOpSegment* check) const;
+    SkOpContour* debugContour(int id);
+    int debugLoopLimit(bool report) const;
+    bool debugMatchID(int id) const;
+    const SkOpPtT* debugPtT(int id) const;
+    const SkOpSegment* debugSegment(int id) const;
+    const SkOpSpanBase* debugSpan(int id) const;
+    void debugValidate() const;
+
+    bool deleted() const {
+        return fDeleted;
+    }
+
+    SkOpPtT* doppelganger();
+
+    bool duplicate() const {
+        return fDuplicatePt;
+    }
+
+    void dump() const;  // available to testing only
+    void dumpAll() const;
+    void dumpBase() const;
+
+    SkOpPtT* find(SkOpSegment* );
+    SkOpGlobalState* globalState() const;
+    void init(SkOpSpanBase* , double t, const SkPoint& , bool dup);
+
+    void insert(SkOpPtT* span) {
+        SkASSERT(span != this);
+        span->fNext = fNext;
+        fNext = span;
+    }
+
+    const SkOpPtT* next() const {
+        return fNext;
+    }
+
+    SkOpPtT* next() {
+        return fNext;
+    }
+
+    bool onEnd() const;
+
+    static bool Overlaps(SkOpPtT* s1, SkOpPtT* e1, SkOpPtT* s2, SkOpPtT* e2,
+            SkOpPtT** sOut, SkOpPtT** eOut) {
+        SkOpPtT* start1 = s1->fT < e1->fT ? s1 : e1;
+        SkOpPtT* start2 = s2->fT < e2->fT ? s2 : e2;
+        *sOut = between(s1->fT, start2->fT, e1->fT) ? start2
+                : between(s2->fT, start1->fT, e2->fT) ? start1 : nullptr;
+        SkOpPtT* end1 = s1->fT < e1->fT ? e1 : s1;
+        SkOpPtT* end2 = s2->fT < e2->fT ? e2 : s2;
+        *eOut = between(s1->fT, end2->fT, e1->fT) ? end2
+                : between(s2->fT, end1->fT, e2->fT) ? end1 : nullptr;
+        if (*sOut == *eOut) {
+            SkASSERT(start1->fT >= end2->fT || start2->fT >= end1->fT);
+            return false;
+        }
+        SkASSERT(!*sOut || *sOut != *eOut);
+        return *sOut && *eOut;
+    }
+
+    SkOpPtT* prev();
+    SkOpPtT* remove();
+    void removeNext(SkOpPtT* kept);
+
+    const SkOpSegment* segment() const;
+    SkOpSegment* segment();
+
+    void setDeleted() {
+        SkASSERT(!fDeleted);
+        fDeleted = true;
+    }
+
+    const SkOpSpanBase* span() const {
+        return fSpan;
+    }
+
+    SkOpSpanBase* span() {
+        return fSpan;
+    }
+
+    const SkOpPtT* starter(const SkOpPtT* end) const {
+        return fT < end->fT ? this : end;
+    }
+
+    double fT; 
+    SkPoint fPt;   // cache of point value at this t
+protected:
+    SkOpSpanBase* fSpan;  // contains winding data
+    SkOpPtT* fNext;  // intersection on opposite curve or alias on this curve
+    bool fDeleted;  // set if removed from span list 
+    bool fDuplicatePt;  // set if identical pt is somewhere in the next loop
+    SkDEBUGCODE(int fID);
+};
+
+class SkOpSpanBase {
+public:
+    void align();
+
+    bool aligned() const {
+        return fAligned;
+    }
+
+    void alignEnd(double t, const SkPoint& pt);
+
+    void bumpSpanAdds() {
+        ++fSpanAdds;
+    }
+
+    bool chased() const {
+        return fChased;
+    }
+
+    void clearCoinEnd() {
+        SkASSERT(fCoinEnd != this);
+        fCoinEnd = this;
+    }
+
+    const SkOpSpanBase* coinEnd() const {
+        return fCoinEnd;
+    }
+
+    bool contains(const SkOpSpanBase* ) const;
+    SkOpPtT* contains(const SkOpSegment* );
+
+    bool containsCoinEnd(const SkOpSpanBase* coin) const {
+        SkASSERT(this != coin);
+        const SkOpSpanBase* next = this;
+        while ((next = next->fCoinEnd) != this) {
+            if (next == coin) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    bool containsCoinEnd(const SkOpSegment* ) const;
+    SkOpContour* contour() const;
+
+    int debugBumpCount() {
+        return SkDEBUGRELEASE(++fCount, -1);
+    }
+
+    int debugID() const {
+        return SkDEBUGRELEASE(fID, -1);
+    }
+
+    bool debugAlignedEnd(double t, const SkPoint& pt) const;
+    bool debugAlignedInner() const;
+    const SkOpAngle* debugAngle(int id) const;
+    bool debugCoinEndLoopCheck() const;
+    bool debugContains(const SkOpSegment* ) const;
+    SkOpContour* debugContour(int id);
+    const SkOpPtT* debugPtT(int id) const;
+    const SkOpSegment* debugSegment(int id) const;
+    const SkOpSpanBase* debugSpan(int id) const;
+    const SkOpSpan* debugStarter(SkOpSpanBase const** endPtr) const;
+    SkOpGlobalState* globalState() const;
+    void debugValidate() const;
+
+    bool deleted() const {
+        return fPtT.deleted();
+    }
+
+    void dump() const;  // available to testing only
+    void dumpCoin() const;
+    void dumpAll() const;
+    void dumpBase() const;
+
+    bool final() const {
+        return fPtT.fT == 1;
+    }
+
+    SkOpAngle* fromAngle() const {
+        return fFromAngle;
+    }
+
+    void initBase(SkOpSegment* parent, SkOpSpan* prev, double t, const SkPoint& pt);
+
+    void insertCoinEnd(SkOpSpanBase* coin) {
+        if (containsCoinEnd(coin)) {
+            SkASSERT(coin->containsCoinEnd(this));
+            return;
+        }
+        debugValidate();
+        SkASSERT(this != coin);
+        SkOpSpanBase* coinNext = coin->fCoinEnd;
+        coin->fCoinEnd = this->fCoinEnd;
+        this->fCoinEnd = coinNext;
+        debugValidate();
+    }
+
+    void merge(SkOpSpan* span);
+
+    SkOpSpan* prev() const {
+        return fPrev;
+    }
+
+    const SkPoint& pt() const {
+        return fPtT.fPt;
+    }
+
+    const SkOpPtT* ptT() const {
+        return &fPtT;
+    }
+
+    SkOpPtT* ptT() {
+        return &fPtT;
+    }
+
+    SkOpSegment* segment() const {
+        return fSegment;
+    }
+
+    void setAligned() {
+        fAligned = true;
+    }
+
+    void setChased(bool chased) {
+        fChased = chased;
+    }
+
+    SkOpPtT* setCoinEnd(SkOpSpanBase* oldCoinEnd, SkOpSegment* oppSegment);
+
+    void setFromAngle(SkOpAngle* angle) {
+        fFromAngle = angle;
+    }
+
+    void setPrev(SkOpSpan* prev) {
+        fPrev = prev;
+    }
+
+    bool simple() const {
+        fPtT.debugValidate();
+        return fPtT.next()->next() == &fPtT; 
+    }
+
+    int spanAddsCount() const {
+        return fSpanAdds;
+    }
+
+    const SkOpSpan* starter(const SkOpSpanBase* end) const {
+        const SkOpSpanBase* result = t() < end->t() ? this : end;
+        return result->upCast();
+    }
+
+    SkOpSpan* starter(SkOpSpanBase* end) {
+        SkASSERT(this->segment() == end->segment());
+        SkOpSpanBase* result = t() < end->t() ? this : end;
+        return result->upCast();
+    }
+
+    SkOpSpan* starter(SkOpSpanBase** endPtr) {
+        SkOpSpanBase* end = *endPtr;
+        SkASSERT(this->segment() == end->segment());
+        SkOpSpanBase* result;
+        if (t() < end->t()) {
+            result = this;
+        } else {
+            result = end;
+            *endPtr = this;
+        }
+        return result->upCast();
+    }
+
+    int step(const SkOpSpanBase* end) const {
+        return t() < end->t() ? 1 : -1;
+    }
+
+    double t() const {
+        return fPtT.fT;
+    }
+
+    void unaligned() {
+        fAligned = false;
+    }
+
+    SkOpSpan* upCast() {
+        SkASSERT(!final());
+        return (SkOpSpan*) this;
+    }
+
+    const SkOpSpan* upCast() const {
+        SkASSERT(!final());
+        return (const SkOpSpan*) this;
+    }
+
+    SkOpSpan* upCastable() {
+        return final() ? nullptr : upCast();
+    }
+
+    const SkOpSpan* upCastable() const {
+        return final() ? nullptr : upCast();
+    }
+
+private:
+    void alignInner();
+
+protected:  // no direct access to internals to avoid treating a span base as a span
+    SkOpPtT fPtT;  // list of points and t values associated with the start of this span
+    SkOpSegment* fSegment;  // segment that contains this span
+    SkOpSpanBase* fCoinEnd;  // linked list of coincident spans that end here (may point to itself)
+    SkOpAngle* fFromAngle;  // points to next angle from span start to end
+    SkOpSpan* fPrev;  // previous intersection point
+    int fSpanAdds;  // number of times intersections have been added to span
+    bool fAligned;
+    bool fChased;  // set after span has been added to chase array
+    SkDEBUGCODE(int fCount);  // number of pt/t pairs added
+    SkDEBUGCODE(int fID);
+};
+
+class SkOpSpan : public SkOpSpanBase {
+public:
+    bool alreadyAdded() const {
+        if (fAlreadyAdded) {
+            return true;
+        }
+        fAlreadyAdded = true;
+        return false;
+    }
+
+    bool clearCoincident() {
+        SkASSERT(!final());
+        if (fCoincident == this) {
+            return false;
+        }
+        fCoincident = this;
+        return true;
+    }
+
+    int computeWindSum();
+    bool containsCoincidence(const SkOpSegment* ) const;
+
+    bool containsCoincidence(const SkOpSpan* coin) const {
+        SkASSERT(this != coin);
+        const SkOpSpan* next = this;
+        while ((next = next->fCoincident) != this) {
+            if (next == coin) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    bool debugCoinLoopCheck() const;
+    void detach(SkOpPtT* );
+
+    bool done() const {
+        SkASSERT(!final());
+        return fDone;
+    }
+
+    void dumpCoin() const;
+    bool dumpSpan() const;
+    void init(SkOpSegment* parent, SkOpSpan* prev, double t, const SkPoint& pt);
+
+    void insertCoincidence(SkOpSpan* coin) {
+        if (containsCoincidence(coin)) {
+            SkASSERT(coin->containsCoincidence(this));
+            return;
+        }
+        debugValidate();
+        SkASSERT(this != coin);
+        SkOpSpan* coinNext = coin->fCoincident;
+        coin->fCoincident = this->fCoincident;
+        this->fCoincident = coinNext;
+        debugValidate();
+    }
+
+    bool isCanceled() const {
+        SkASSERT(!final());
+        return fWindValue == 0 && fOppValue == 0;
+    }
+
+    bool isCoincident() const {
+        SkASSERT(!final());
+        return fCoincident != this;
+    }
+
+    SkOpSpanBase* next() const {
+        SkASSERT(!final());
+        return fNext;
+    }
+
+    int oppSum() const {
+        SkASSERT(!final());
+        return fOppSum;
+    }
+
+    int oppValue() const {
+        SkASSERT(!final());
+        return fOppValue;
+    }
+
+    SkOpPtT* setCoinStart(SkOpSpan* oldCoinStart, SkOpSegment* oppSegment);
+
+    void setDone(bool done) {
+        SkASSERT(!final());
+        fDone = done;
+    }
+
+    void setNext(SkOpSpanBase* nextT) {
+        SkASSERT(!final());
+        fNext = nextT;
+    }
+
+    void setOppSum(int oppSum);
+
+    void setOppValue(int oppValue) {
+        SkASSERT(!final());
+        SkASSERT(fOppSum == SK_MinS32);
+        fOppValue = oppValue;
+    }
+
+    void setToAngle(SkOpAngle* angle) {
+        SkASSERT(!final());
+        fToAngle = angle;
+    }
+
+    void setWindSum(int windSum);
+
+    void setWindValue(int windValue) {
+        SkASSERT(!final());
+        SkASSERT(windValue >= 0);
+        SkASSERT(fWindSum == SK_MinS32);
+        fWindValue = windValue;
+    }
+
+    bool sortableTop(SkOpContour* );
+
+    SkOpAngle* toAngle() const {
+        SkASSERT(!final());
+        return fToAngle;
+    }
+
+    int windSum() const {
+        SkASSERT(!final());
+        return fWindSum;
+    }
+
+    int windValue() const {
+        SkASSERT(!final());
+        return fWindValue;
+    }
+
+private:  // no direct access to internals to avoid treating a span base as a span
+    SkOpSpan* fCoincident;  // linked list of spans coincident with this one (may point to itself)
+    SkOpAngle* fToAngle;  // points to next angle from span start to end
+    SkOpSpanBase* fNext;  // next intersection point
     int fWindSum;  // accumulated from contours surrounding this one.
     int fOppSum;  // for binary operators: the opposite winding sum
     int fWindValue;  // 0 == canceled; 1 == normal; >1 == coincident
     int fOppValue;  // normally 0 -- when binary coincident edges combine, opp value goes here
-    bool fChased;  // set after span has been added to chase array
-    bool fCoincident;  // set if span is bumped -- if set additional points aren't inserted
+    int fTopTTry; // specifies direction and t value to try next
     bool fDone;  // if set, this span to next higher T has been processed
-    bool fLoop;  // set when a cubic loops back to this point
-    bool fMultiple;  // set if this is one of mutiple spans with identical t and pt values
-    bool fNear;  // set if opposite end point is near but not equal to this one
-    bool fSmall;   // if set, consecutive points are almost equal
-    bool fTiny;  // if set, consecutive points are equal but consecutive ts are not precisely equal
-
-    // available to testing only
-    const SkOpSegment* debugToSegment(ptrdiff_t* ) const;
-    void dump() const;
-    void dumpOne() const;
+    mutable bool fAlreadyAdded;
 };
 
 #endif
diff --git a/gfx/skia/skia/src/pathops/SkOpTAllocator.h b/gfx/skia/skia/src/pathops/SkOpTAllocator.h
new file mode 100644
index 000000000000..e8835f02e6cb
--- /dev/null
+++ b/gfx/skia/skia/src/pathops/SkOpTAllocator.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef SkOpTAllocator_DEFINED
+#define SkOpTAllocator_DEFINED
+
+#include "SkChunkAlloc.h"
+
+// T is SkOpAngle2, SkOpSpan2, or SkOpSegment2
+template<typename T>
+class SkOpTAllocator {
+public:
+    static T* Allocate(SkChunkAlloc* allocator) {
+        void* ptr = allocator->allocThrow(sizeof(T));
+        T* record = (T*) ptr;
+        return record;
+    }
+
+    static T* AllocateArray(SkChunkAlloc* allocator, int count) {
+        void* ptr = allocator->allocThrow(sizeof(T) * count);
+        T* record = (T*) ptr;
+        return record;
+    }
+
+    static T* New(SkChunkAlloc* allocator) {
+        return new (Allocate(allocator)) T();
+    }
+};
+
+#endif
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsBounds.cpp b/gfx/skia/skia/src/pathops/SkPathOpsBounds.cpp
deleted file mode 100644
index 106cd30076ca..000000000000
--- a/gfx/skia/skia/src/pathops/SkPathOpsBounds.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#include "SkPathOpsBounds.h"
-#include "SkPathOpsCubic.h"
-#include "SkPathOpsLine.h"
-#include "SkPathOpsQuad.h"
-
-void SkPathOpsBounds::setCubicBounds(const SkPoint a[4]) {
-    SkDCubic cubic;
-    cubic.set(a);
-    SkDRect dRect;
-    dRect.setBounds(cubic);
-    set(SkDoubleToScalar(dRect.fLeft), SkDoubleToScalar(dRect.fTop),
-            SkDoubleToScalar(dRect.fRight), SkDoubleToScalar(dRect.fBottom));
-}
-
-void SkPathOpsBounds::setLineBounds(const SkPoint a[2]) {
-    setPointBounds(a[0]);
-    add(a[1]);
-}
-
-void SkPathOpsBounds::setQuadBounds(const SkPoint a[3]) {
-    SkDQuad quad;
-    quad.set(a);
-    SkDRect dRect;
-    dRect.setBounds(quad);
-    set(SkDoubleToScalar(dRect.fLeft), SkDoubleToScalar(dRect.fTop),
-            SkDoubleToScalar(dRect.fRight), SkDoubleToScalar(dRect.fBottom));
-}
-
-void (SkPathOpsBounds::*SetCurveBounds[])(const SkPoint[]) = {
-    NULL,
-    &SkPathOpsBounds::setLineBounds,
-    &SkPathOpsBounds::setQuadBounds,
-    &SkPathOpsBounds::setCubicBounds
-};
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsBounds.h b/gfx/skia/skia/src/pathops/SkPathOpsBounds.h
index 07ad5d4ba9d0..b99f36f5d969 100644
--- a/gfx/skia/skia/src/pathops/SkPathOpsBounds.h
+++ b/gfx/skia/skia/src/pathops/SkPathOpsBounds.h
@@ -33,11 +33,11 @@ struct SkPathOpsBounds : public SkRect {
         add(toAdd.fLeft, toAdd.fTop, toAdd.fRight, toAdd.fBottom);
     }
 
-    void add(const SkPoint& pt) {
-        if (pt.fX < fLeft) fLeft = pt.fX;
-        if (pt.fY < fTop) fTop = pt.fY;
-        if (pt.fX > fRight) fRight = pt.fX;
-        if (pt.fY > fBottom) fBottom = pt.fY;
+    void add(const SkDPoint& pt) {
+        if (pt.fX < fLeft) fLeft = SkDoubleToScalar(pt.fX);
+        if (pt.fY < fTop) fTop = SkDoubleToScalar(pt.fY);
+        if (pt.fX > fRight) fRight = SkDoubleToScalar(pt.fX);
+        if (pt.fY > fBottom) fBottom = SkDoubleToScalar(pt.fY);
     }
 
     bool almostContains(const SkPoint& pt) {
@@ -47,26 +47,7 @@ struct SkPathOpsBounds : public SkRect {
                 && AlmostLessOrEqualUlps(pt.fY, fBottom);
     }
 
-    // unlike isEmpty(), this permits lines, but not points
-    // FIXME: unused for now
-    bool isReallyEmpty() const {
-        // use !<= instead of > to detect NaN values
-        return !(fLeft <= fRight) || !(fTop <= fBottom)
-                || (fLeft == fRight && fTop == fBottom);
-    }
-
-    void setCubicBounds(const SkPoint a[4]);
-    void setLineBounds(const SkPoint a[2]);
-    void setQuadBounds(const SkPoint a[3]);
-
-    void setPointBounds(const SkPoint& pt) {
-        fLeft = fRight = pt.fX;
-        fTop = fBottom = pt.fY;
-    }
-
     typedef SkRect INHERITED;
 };
 
-extern void (SkPathOpsBounds::*SetCurveBounds[])(const SkPoint[]);
-
 #endif
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsCommon.cpp b/gfx/skia/skia/src/pathops/SkPathOpsCommon.cpp
index 9a8a2cf4e31d..0060db2f30d3 100644
--- a/gfx/skia/skia/src/pathops/SkPathOpsCommon.cpp
+++ b/gfx/skia/skia/src/pathops/SkPathOpsCommon.cpp
@@ -5,149 +5,86 @@
  * found in the LICENSE file.
  */
 #include "SkAddIntersections.h"
+#include "SkOpCoincidence.h"
 #include "SkOpEdgeBuilder.h"
 #include "SkPathOpsCommon.h"
 #include "SkPathWriter.h"
 #include "SkTSort.h"
 
-static void alignMultiples(SkTArray<SkOpContour*, true>* contourList,
-        SkTDArray<SkOpSegment::AlignedSpan>* aligned) {
-    int contourCount = (*contourList).count();
-    for (int cTest = 0; cTest < contourCount; ++cTest) {
-        SkOpContour* contour = (*contourList)[cTest];
-        if (contour->hasMultiples()) {
-            contour->alignMultiples(aligned);
-        }
+const SkOpAngle* AngleWinding(SkOpSpanBase* start, SkOpSpanBase* end, int* windingPtr,
+        bool* sortablePtr) {
+    // find first angle, initialize winding to computed fWindSum
+    SkOpSegment* segment = start->segment();
+    const SkOpAngle* angle = segment->spanToAngle(start, end);
+    if (!angle) {
+        *windingPtr = SK_MinS32;
+        return nullptr;
     }
-}
-
-static void alignCoincidence(SkTArray<SkOpContour*, true>* contourList,
-        const SkTDArray<SkOpSegment::AlignedSpan>& aligned) {
-    int contourCount = (*contourList).count();
-    for (int cTest = 0; cTest < contourCount; ++cTest) {
-        SkOpContour* contour = (*contourList)[cTest];
-        int count = aligned.count();
-        for (int index = 0; index < count; ++index) {
-            contour->alignCoincidence(aligned[index]);
+    bool computeWinding = false;
+    const SkOpAngle* firstAngle = angle;
+    bool loop = false;
+    bool unorderable = false;
+    int winding = SK_MinS32;
+    do {
+        angle = angle->next();
+        unorderable |= angle->unorderable();
+        if ((computeWinding = unorderable || (angle == firstAngle && loop))) {
+            break;    // if we get here, there's no winding, loop is unorderable
         }
-    }    
-}
-
-static int contourRangeCheckY(const SkTArray<SkOpContour*, true>& contourList, SkOpSegment** currentPtr,
-                              int* indexPtr, int* endIndexPtr, double* bestHit, SkScalar* bestDx,
-                              bool* tryAgain, double* midPtr, bool opp) {
-    const int index = *indexPtr;
-    const int endIndex = *endIndexPtr;
-    const double mid = *midPtr;
-    const SkOpSegment* current = *currentPtr;
-    double tAtMid = current->tAtMid(index, endIndex, mid);
-    SkPoint basePt = current->ptAtT(tAtMid);
-    int contourCount = contourList.count();
-    SkScalar bestY = SK_ScalarMin;
-    SkOpSegment* bestSeg = NULL;
-    int bestTIndex = 0;
-    bool bestOpp;
-    bool hitSomething = false;
-    for (int cTest = 0; cTest < contourCount; ++cTest) {
-        SkOpContour* contour = contourList[cTest];
-        bool testOpp = contour->operand() ^ current->operand() ^ opp;
-        if (basePt.fY < contour->bounds().fTop) {
-            continue;
-        }
-        if (bestY > contour->bounds().fBottom) {
-            continue;
-        }
-        int segmentCount = contour->segments().count();
-        for (int test = 0; test < segmentCount; ++test) {
-            SkOpSegment* testSeg = &contour->segments()[test];
-            SkScalar testY = bestY;
-            double testHit;
-            int testTIndex = testSeg->crossedSpanY(basePt, &testY, &testHit, &hitSomething, tAtMid,
-                    testOpp, testSeg == current);
-            if (testTIndex < 0) {
-                if (testTIndex == SK_MinS32) {
-                    hitSomething = true;
-                    bestSeg = NULL;
-                    goto abortContours;  // vertical encountered, return and try different point
-                }
-                continue;
+        loop |= angle == firstAngle;
+        segment = angle->segment();
+        winding = segment->windSum(angle);
+    } while (winding == SK_MinS32);
+    // if the angle loop contains an unorderable span, the angle order may be useless
+    // directly compute the winding in this case for each span
+    if (computeWinding) {
+        firstAngle = angle;
+        winding = SK_MinS32;
+        do {
+            SkOpSpanBase* startSpan = angle->start();
+            SkOpSpanBase* endSpan = angle->end();
+            SkOpSpan* lesser = startSpan->starter(endSpan);
+            int testWinding = lesser->windSum();
+            if (testWinding == SK_MinS32) {
+                testWinding = lesser->computeWindSum();
             }
-            if (testSeg == current && current->betweenTs(index, testHit, endIndex)) {
-                double baseT = current->t(index);
-                double endT = current->t(endIndex);
-                double newMid = (testHit - baseT) / (endT - baseT);
-#if DEBUG_WINDING
-                double midT = current->tAtMid(index, endIndex, mid);
-                SkPoint midXY = current->xyAtT(midT);
-                double newMidT = current->tAtMid(index, endIndex, newMid);
-                SkPoint newXY = current->xyAtT(newMidT);
-                SkDebugf("%s [%d] mid=%1.9g->%1.9g s=%1.9g (%1.9g,%1.9g) m=%1.9g (%1.9g,%1.9g)"
-                        " n=%1.9g (%1.9g,%1.9g) e=%1.9g (%1.9g,%1.9g)\n", __FUNCTION__,
-                        current->debugID(), mid, newMid,
-                        baseT, current->xAtT(index), current->yAtT(index),
-                        baseT + mid * (endT - baseT), midXY.fX, midXY.fY,
-                        baseT + newMid * (endT - baseT), newXY.fX, newXY.fY,
-                        endT, current->xAtT(endIndex), current->yAtT(endIndex));
-#endif
-                *midPtr = newMid * 2;  // calling loop with divide by 2 before continuing
-                return SK_MinS32;
+            if (testWinding != SK_MinS32) {
+                segment = angle->segment();
+                winding = testWinding;
             }
-            bestSeg = testSeg;
-            *bestHit = testHit;
-            bestOpp = testOpp;
-            bestTIndex = testTIndex;
-            bestY = testY;
-        }
+            angle = angle->next();
+        } while (angle != firstAngle);
     }
-abortContours:
-    int result;
-    if (!bestSeg) {
-        result = hitSomething ? SK_MinS32 : 0;
-    } else {
-        if (bestSeg->windSum(bestTIndex) == SK_MinS32) {
-            *currentPtr = bestSeg;
-            *indexPtr = bestTIndex;
-            *endIndexPtr = bestSeg->nextSpan(bestTIndex, 1);
-            SkASSERT(*indexPtr != *endIndexPtr && *indexPtr >= 0 && *endIndexPtr >= 0);
-            *tryAgain = true;
-            return 0;
-        }
-        result = bestSeg->windingAtT(*bestHit, bestTIndex, bestOpp, bestDx);
-        SkASSERT(result == SK_MinS32 || *bestDx);
-    }
-    double baseT = current->t(index);
-    double endT = current->t(endIndex);
-    *bestHit = baseT + mid * (endT - baseT);
-    return result;
+    *sortablePtr = !unorderable;
+    *windingPtr = winding;
+    return angle;
 }
 
-SkOpSegment* FindUndone(SkTArray<SkOpContour*, true>& contourList, int* start, int* end) {
-    int contourCount = contourList.count();
+SkOpSegment* FindUndone(SkOpContourHead* contourList, SkOpSpanBase** startPtr,
+         SkOpSpanBase** endPtr) {
     SkOpSegment* result;
-    for (int cIndex = 0; cIndex < contourCount; ++cIndex) {
-        SkOpContour* contour = contourList[cIndex];
-        result = contour->undoneSegment(start, end);
+    SkOpContour* contour = contourList;
+    do {
+        result = contour->undoneSegment(startPtr, endPtr);
         if (result) {
             return result;
         }
-    }
-    return NULL;
+    } while ((contour = contour->next()));
+    return nullptr;
 }
 
-SkOpSegment* FindChase(SkTDArray<SkOpSpan*>* chase, int* tIndex, int* endIndex) {
+SkOpSegment* FindChase(SkTDArray<SkOpSpanBase*>* chase, SkOpSpanBase** startPtr,
+        SkOpSpanBase** endPtr) {
     while (chase->count()) {
-        SkOpSpan* span;
+        SkOpSpanBase* span;
         chase->pop(&span);
-        const SkOpSpan& backPtr = span->fOther->span(span->fOtherIndex);
-        SkOpSegment* segment = backPtr.fOther;
-        *tIndex = backPtr.fOtherIndex;
-        bool sortable = true;
+        SkOpSegment* segment = span->segment();
+        *startPtr = span->ptT()->next()->span();
         bool done = true;
-        *endIndex = -1;
-        if (const SkOpAngle* last = segment->activeAngle(*tIndex, tIndex, endIndex, &done,
-                &sortable)) {
-            *tIndex = last->start();
-            *endIndex = last->end();
+        *endPtr = nullptr;
+        if (SkOpAngle* last = segment->activeAngle(*startPtr, startPtr, endPtr, &done)) {
+            *startPtr = last->start();
+            *endPtr = last->end();
     #if TRY_ROTATE
             *chase->insert(0) = span;
     #else
@@ -158,338 +95,90 @@ SkOpSegment* FindChase(SkTDArray<SkOpSpan*>* chase, int* tIndex, int* endIndex)
         if (done) {
             continue;
         }
-        if (!sortable) {
+        // find first angle, initialize winding to computed wind sum
+        int winding;
+        bool sortable;
+        const SkOpAngle* angle = AngleWinding(*startPtr, *endPtr, &winding, &sortable);
+        if (winding == SK_MinS32) {
             continue;
         }
-        // find first angle, initialize winding to computed fWindSum
-        const SkOpAngle* angle = segment->spanToAngle(*tIndex, *endIndex);
-        const SkOpAngle* firstAngle;
-        SkDEBUGCODE(firstAngle = angle);
-        SkDEBUGCODE(bool loop = false);
-        int winding;
-        do {
-            angle = angle->next();
-            SkASSERT(angle != firstAngle || !loop);
-            SkDEBUGCODE(loop |= angle == firstAngle);
+        int sumWinding SK_INIT_TO_AVOID_WARNING;
+        if (sortable) {
             segment = angle->segment();
-            winding = segment->windSum(angle);
-        } while (winding == SK_MinS32);
-        int spanWinding = segment->spanSign(angle->start(), angle->end());
-    #if DEBUG_WINDING
-        SkDebugf("%s winding=%d spanWinding=%d\n", __FUNCTION__, winding, spanWinding);
-    #endif
-        // turn span winding into contour winding
-        if (spanWinding * winding < 0) {
-            winding += spanWinding;
+            sumWinding = segment->updateWindingReverse(angle);
         }
-        // we care about first sign and whether wind sum indicates this
-        // edge is inside or outside. Maybe need to pass span winding
-        // or first winding or something into this function?
-        // advance to first undone angle, then return it and winding
-        // (to set whether edges are active or not)
-        firstAngle = angle;
-        winding -= firstAngle->segment()->spanSign(firstAngle);
+        SkOpSegment* first = nullptr;
+        const SkOpAngle* firstAngle = angle;
         while ((angle = angle->next()) != firstAngle) {
             segment = angle->segment();
-            int maxWinding = winding;
-            winding -= segment->spanSign(angle);
-    #if DEBUG_SORT
-            SkDebugf("%s id=%d maxWinding=%d winding=%d sign=%d\n", __FUNCTION__,
-                    segment->debugID(), maxWinding, winding, angle->sign());
-    #endif
-            *tIndex = angle->start();
-            *endIndex = angle->end();
-            int lesser = SkMin32(*tIndex, *endIndex);
-            const SkOpSpan& nextSpan = segment->span(lesser);
-            if (!nextSpan.fDone) {
-            // FIXME: this be wrong? assign startWinding if edge is in
-            // same direction. If the direction is opposite, winding to
-            // assign is flipped sign or +/- 1?
-                if (SkOpSegment::UseInnerWinding(maxWinding, winding)) {
-                    maxWinding = winding;
+            SkOpSpanBase* start = angle->start();
+            SkOpSpanBase* end = angle->end();
+            int maxWinding;
+            if (sortable) {
+                segment->setUpWinding(start, end, &maxWinding, &sumWinding);
+            }
+            if (!segment->done(angle)) {
+                if (!first && (sortable || start->starter(end)->windSum() != SK_MinS32)) {
+                    first = segment;
+                    *startPtr = start;
+                    *endPtr = end;
+                }
+                // OPTIMIZATION: should this also add to the chase?
+                if (sortable) {
+                    (void) segment->markAngle(maxWinding, sumWinding, angle);
                 }
-                (void) segment->markAndChaseWinding(angle, maxWinding, 0);
-                break;
             }
         }
-        *chase->insert(0) = span;
-        return segment;
+        if (first) {
+       #if TRY_ROTATE
+            *chase->insert(0) = span;
+       #else
+            *chase->append() = span;
+       #endif
+            return first;
+        }
     }
-    return NULL;
+    return nullptr;
 }
 
-#if DEBUG_ACTIVE_SPANS || DEBUG_ACTIVE_SPANS_FIRST_ONLY
-void DebugShowActiveSpans(SkTArray<SkOpContour*, true>& contourList) {
-    int index;
-    for (index = 0; index < contourList.count(); ++ index) {
-        contourList[index]->debugShowActiveSpans();
-    }
+#if DEBUG_ACTIVE_SPANS
+void DebugShowActiveSpans(SkOpContourHead* contourList) {
+    SkOpContour* contour = contourList;
+    do {
+        contour->debugShowActiveSpans();
+    } while ((contour = contour->next()));
 }
 #endif
 
-static SkOpSegment* findTopSegment(const SkTArray<SkOpContour*, true>& contourList, int* index,
-        int* endIndex, SkPoint* topLeft, bool* unsortable, bool* done, bool firstPass) {
-    SkOpSegment* result;
-    const SkOpSegment* lastTopStart = NULL;
-    int lastIndex = -1, lastEndIndex = -1;
+bool SortContourList(SkOpContourHead** contourList, bool evenOdd, bool oppEvenOdd) {
+    SkTDArray<SkOpContour* > list;
+    SkOpContour* contour = *contourList;
     do {
-        SkPoint bestXY = {SK_ScalarMax, SK_ScalarMax};
-        int contourCount = contourList.count();
-        SkOpSegment* topStart = NULL;
-        *done = true;
-        for (int cIndex = 0; cIndex < contourCount; ++cIndex) {
-            SkOpContour* contour = contourList[cIndex];
-            if (contour->done()) {
-                continue;
-            }
-            const SkPathOpsBounds& bounds = contour->bounds();
-            if (bounds.fBottom < topLeft->fY) {
-                *done = false;
-                continue;
-            }
-            if (bounds.fBottom == topLeft->fY && bounds.fRight < topLeft->fX) {
-                *done = false;
-                continue;
-            }
-            contour->topSortableSegment(*topLeft, &bestXY, &topStart);
-            if (!contour->done()) {
-                *done = false;
-            }
+        if (contour->count()) {
+            contour->setOppXor(contour->operand() ? evenOdd : oppEvenOdd);
+            *list.append() = contour;
         }
-        if (!topStart) {
-            return NULL;
-        }
-        *topLeft = bestXY;
-        result = topStart->findTop(index, endIndex, unsortable, firstPass);
-        if (!result) {
-            if (lastTopStart == topStart && lastIndex == *index && lastEndIndex == *endIndex) {
-                *done = true;
-                return NULL;
-            }
-            lastTopStart = topStart;
-            lastIndex = *index;
-            lastEndIndex = *endIndex;
-        }
-    } while (!result);
-    return result;
-}
-
-static int rightAngleWinding(const SkTArray<SkOpContour*, true>& contourList,
-        SkOpSegment** currentPtr, int* indexPtr, int* endIndexPtr, double* tHit,
-        SkScalar* hitDx, bool* tryAgain, bool* onlyVertical, bool opp) {
-    double test = 0.9;
-    int contourWinding;
-    do {
-        contourWinding = contourRangeCheckY(contourList, currentPtr, indexPtr, endIndexPtr,
-                tHit, hitDx, tryAgain, &test, opp);
-        if (contourWinding != SK_MinS32 || *tryAgain) {
-            return contourWinding;
-        }
-        if (*currentPtr && (*currentPtr)->isVertical()) {
-            *onlyVertical = true;
-            return contourWinding;
-        }
-        test /= 2;
-    } while (!approximately_negative(test));
-    SkASSERT(0);  // FIXME: incomplete functionality
-    return contourWinding;
-}
-
-static void skipVertical(const SkTArray<SkOpContour*, true>& contourList,
-        SkOpSegment** current, int* index, int* endIndex) {
-    if (!(*current)->isVertical(*index, *endIndex)) {
-        return;
+    } while ((contour = contour->next()));
+    int count = list.count();
+    if (!count) {
+        return false;
     }
-    int contourCount = contourList.count();
-    for (int cIndex = 0; cIndex < contourCount; ++cIndex) {
-        SkOpContour* contour = contourList[cIndex];
-        if (contour->done()) {
-            continue;
-        }
-        SkOpSegment* nonVertical = contour->nonVerticalSegment(index, endIndex);
-        if (nonVertical) {
-            *current = nonVertical;
-            return;
-        }
+    if (count > 1) {
+        SkTQSort<SkOpContour>(list.begin(), list.end() - 1);
     }
-    return;
-}
-
-SkOpSegment* FindSortableTop(const SkTArray<SkOpContour*, true>& contourList,
-        SkOpAngle::IncludeType angleIncludeType, bool* firstContour, int* indexPtr,
-        int* endIndexPtr, SkPoint* topLeft, bool* unsortable, bool* done, bool* onlyVertical,
-        bool firstPass) {
-    SkOpSegment* current = findTopSegment(contourList, indexPtr, endIndexPtr, topLeft, unsortable,
-            done, firstPass);
-    if (!current) {
-        return NULL;
-    }
-    const int startIndex = *indexPtr;
-    const int endIndex = *endIndexPtr;
-    if (*firstContour) {
-        current->initWinding(startIndex, endIndex, angleIncludeType);
-        *firstContour = false;
-        return current;
-    }
-    int minIndex = SkMin32(startIndex, endIndex);
-    int sumWinding = current->windSum(minIndex);
-    if (sumWinding == SK_MinS32) {
-        int index = endIndex;
-        int oIndex = startIndex;
-        do { 
-            const SkOpSpan& span = current->span(index);
-            if ((oIndex < index ? span.fFromAngle : span.fToAngle) == NULL) {
-                current->addSimpleAngle(index);
-            }
-            sumWinding = current->computeSum(oIndex, index, angleIncludeType);
-            SkTSwap(index, oIndex);
-        } while (sumWinding == SK_MinS32 && index == startIndex);
-    }
-    if (sumWinding != SK_MinS32 && sumWinding != SK_NaN32) {
-        return current;
-    }
-    int contourWinding;
-    int oppContourWinding = 0;
-    // the simple upward projection of the unresolved points hit unsortable angles
-    // shoot rays at right angles to the segment to find its winding, ignoring angle cases
-    bool tryAgain;
-    double tHit;
-    SkScalar hitDx = 0;
-    SkScalar hitOppDx = 0;
-    do {
-        // if current is vertical, find another candidate which is not
-        // if only remaining candidates are vertical, then they can be marked done
-        SkASSERT(*indexPtr != *endIndexPtr && *indexPtr >= 0 && *endIndexPtr >= 0);
-        skipVertical(contourList, &current, indexPtr, endIndexPtr);
-        SkASSERT(current);  // FIXME: if null, all remaining are vertical
-        SkASSERT(*indexPtr != *endIndexPtr && *indexPtr >= 0 && *endIndexPtr >= 0);
-        tryAgain = false;
-        contourWinding = rightAngleWinding(contourList, &current, indexPtr, endIndexPtr, &tHit,
-                &hitDx, &tryAgain, onlyVertical, false);
-        if (*onlyVertical) {
-            return current;
-        }
-        if (tryAgain) {
-            continue;
-        }
-        if (angleIncludeType < SkOpAngle::kBinarySingle) {
-            break;
-        }
-        oppContourWinding = rightAngleWinding(contourList, &current, indexPtr, endIndexPtr, &tHit,
-                &hitOppDx, &tryAgain, NULL, true);
-    } while (tryAgain);
-    current->initWinding(*indexPtr, *endIndexPtr, tHit, contourWinding, hitDx, oppContourWinding,
-            hitOppDx);
-    if (current->done()) {
-        return NULL;
-    }
-    return current;
-}
-
-static bool calcAngles(SkTArray<SkOpContour*, true>* contourList) {
-    int contourCount = (*contourList).count();
-    for (int cTest = 0; cTest < contourCount; ++cTest) {
-        SkOpContour* contour = (*contourList)[cTest];
-        if (!contour->calcAngles()) {
-            return false;
-        }
+    contour = list[0];
+    SkOpContourHead* contourHead = static_cast<SkOpContourHead*>(contour);
+    contour->globalState()->setContourHead(contourHead);
+    *contourList = contourHead;
+    for (int index = 1; index < count; ++index) {
+        SkOpContour* next = list[index];
+        contour->setNext(next);
+        contour = next;
     }
+    contour->setNext(nullptr);
     return true;
 }
 
-static void checkDuplicates(SkTArray<SkOpContour*, true>* contourList) {
-    int contourCount = (*contourList).count();
-    for (int cTest = 0; cTest < contourCount; ++cTest) {
-        SkOpContour* contour = (*contourList)[cTest];
-        contour->checkDuplicates();
-    }
-}
-
-static void checkEnds(SkTArray<SkOpContour*, true>* contourList) {
-    // it's hard to determine if the end of a cubic or conic nearly intersects another curve.
-    // instead, look to see if the connecting curve intersected at that same end.
-    int contourCount = (*contourList).count();
-    for (int cTest = 0; cTest < contourCount; ++cTest) {
-        SkOpContour* contour = (*contourList)[cTest];
-        contour->checkEnds();
-    }
-}
-
-static bool checkMultiples(SkTArray<SkOpContour*, true>* contourList) {
-    bool hasMultiples = false;
-    int contourCount = (*contourList).count();
-    for (int cTest = 0; cTest < contourCount; ++cTest) {
-        SkOpContour* contour = (*contourList)[cTest];
-        contour->checkMultiples();
-        hasMultiples |= contour->hasMultiples();
-    }
-    return hasMultiples;
-}
-
-// A small interval of a pair of curves may collapse to lines for each, triggering coincidence
-static void checkSmall(SkTArray<SkOpContour*, true>* contourList) {
-    int contourCount = (*contourList).count();
-    for (int cTest = 0; cTest < contourCount; ++cTest) {
-        SkOpContour* contour = (*contourList)[cTest];
-        contour->checkSmall();
-    }
-}
-
-// A tiny interval may indicate an undiscovered coincidence. Find and fix.
-static void checkTiny(SkTArray<SkOpContour*, true>* contourList) {
-    int contourCount = (*contourList).count();
-    for (int cTest = 0; cTest < contourCount; ++cTest) {
-        SkOpContour* contour = (*contourList)[cTest];
-        contour->checkTiny();
-    }
-}
-
-static void fixOtherTIndex(SkTArray<SkOpContour*, true>* contourList) {
-    int contourCount = (*contourList).count();
-    for (int cTest = 0; cTest < contourCount; ++cTest) {
-        SkOpContour* contour = (*contourList)[cTest];
-        contour->fixOtherTIndex();
-    }
-}
-
-static void joinCoincidence(SkTArray<SkOpContour*, true>* contourList) {
-    int contourCount = (*contourList).count();
-    for (int cTest = 0; cTest < contourCount; ++cTest) {
-        SkOpContour* contour = (*contourList)[cTest];
-        contour->joinCoincidence();
-    }
-}
-
-static void sortAngles(SkTArray<SkOpContour*, true>* contourList) {
-    int contourCount = (*contourList).count();
-    for (int cTest = 0; cTest < contourCount; ++cTest) {
-        SkOpContour* contour = (*contourList)[cTest];
-        contour->sortAngles();
-    }
-}
-
-static void sortSegments(SkTArray<SkOpContour*, true>* contourList) {
-    int contourCount = (*contourList).count();
-    for (int cTest = 0; cTest < contourCount; ++cTest) {
-        SkOpContour* contour = (*contourList)[cTest];
-        contour->sortSegments();
-    }
-}
-
-void MakeContourList(SkTArray<SkOpContour>& contours, SkTArray<SkOpContour*, true>& list,
-                     bool evenOdd, bool oppEvenOdd) {
-    int count = contours.count();
-    if (count == 0) {
-        return;
-    }
-    for (int index = 0; index < count; ++index) {
-        SkOpContour& contour = contours[index];
-        contour.setOppXor(contour.operand() ? evenOdd : oppEvenOdd);
-        list.push_back(&contour);
-    }
-    SkTQSort<SkOpContour>(list.begin(), list.end() - 1);
-}
-
 class DistanceLessThan {
 public:
     DistanceLessThan(double* distances) : fDistances(distances) { }
@@ -507,19 +196,25 @@ public:
         reassemble contour pieces into new path
     */
 void Assemble(const SkPathWriter& path, SkPathWriter* simple) {
+    SkChunkAlloc allocator(4096);  // FIXME: constant-ize, tune
+    SkOpContourHead contour;
+    SkOpGlobalState globalState(nullptr, &contour  SkDEBUGPARAMS(nullptr));
+#if DEBUG_SHOW_TEST_NAME
+    SkDebugf("</div>\n");
+#endif
 #if DEBUG_PATH_CONSTRUCTION
     SkDebugf("%s\n", __FUNCTION__);
 #endif
-    SkTArray<SkOpContour> contours;
-    SkOpEdgeBuilder builder(path, contours);
-    builder.finish();
-    int count = contours.count();
-    int outer;
-    SkTArray<int, true> runs(count);  // indices of partial contours
-    for (outer = 0; outer < count; ++outer) {
-        const SkOpContour& eContour = contours[outer];
-        const SkPoint& eStart = eContour.start();
-        const SkPoint& eEnd = eContour.end();
+    SkOpEdgeBuilder builder(path, &contour, &allocator, &globalState);
+    builder.finish(&allocator);
+    SkTDArray<const SkOpContour* > runs;  // indices of partial contours
+    const SkOpContour* eContour = builder.head();
+    do {
+        if (!eContour->count()) {
+            continue;
+        }
+        const SkPoint& eStart = eContour->start();
+        const SkPoint& eEnd = eContour->end();
 #if DEBUG_ASSEMBLE
         SkDebugf("%s contour", __FUNCTION__);
         if (!SkDPoint::ApproximatelyEqual(eStart, eEnd)) {
@@ -531,44 +226,42 @@ void Assemble(const SkPathWriter& path, SkPathWriter* simple) {
                 eStart.fX, eStart.fY, eEnd.fX, eEnd.fY);
 #endif
         if (SkDPoint::ApproximatelyEqual(eStart, eEnd)) {
-            eContour.toPath(simple);
+            eContour->toPath(simple);
             continue;
         }
-        runs.push_back(outer);
-    }
-    count = runs.count();
+        *runs.append() = eContour;
+    } while ((eContour = eContour->next()));
+    int count = runs.count();
     if (count == 0) {
         return;
     }
-    SkTArray<int, true> sLink, eLink;
-    sLink.push_back_n(count);
-    eLink.push_back_n(count);
+    SkTDArray<int> sLink, eLink;
+    sLink.append(count);
+    eLink.append(count);
     int rIndex, iIndex;
     for (rIndex = 0; rIndex < count; ++rIndex) {
         sLink[rIndex] = eLink[rIndex] = SK_MaxS32;
     }
     const int ends = count * 2;  // all starts and ends
     const int entries = (ends - 1) * count;  // folded triangle : n * (n - 1) / 2
-    SkTArray<double, true> distances;
-    distances.push_back_n(entries);
+    SkTDArray<double> distances;
+    distances.append(entries);
     for (rIndex = 0; rIndex < ends - 1; ++rIndex) {
-        outer = runs[rIndex >> 1];
-        const SkOpContour& oContour = contours[outer];
-        const SkPoint& oPt = rIndex & 1 ? oContour.end() : oContour.start();
+        const SkOpContour* oContour = runs[rIndex >> 1];
+        const SkPoint& oPt = rIndex & 1 ? oContour->end() : oContour->start();
         const int row = rIndex < count - 1 ? rIndex * ends : (ends - rIndex - 2)
                 * ends - rIndex - 1;
         for (iIndex = rIndex + 1; iIndex < ends; ++iIndex) {
-            int inner = runs[iIndex >> 1];
-            const SkOpContour& iContour = contours[inner];
-            const SkPoint& iPt = iIndex & 1 ? iContour.end() : iContour.start();
+            const SkOpContour* iContour = runs[iIndex >> 1];
+            const SkPoint& iPt = iIndex & 1 ? iContour->end() : iContour->start();
             double dx = iPt.fX - oPt.fX;
             double dy = iPt.fY - oPt.fY;
             double dist = dx * dx + dy * dy;
             distances[row + iIndex] = dist;  // oStart distance from iStart
         }
     }
-    SkTArray<int, true> sortedDist;
-    sortedDist.push_back_n(entries);
+    SkTDArray<int> sortedDist;
+    sortedDist.append(entries);
     for (rIndex = 0; rIndex < entries; ++rIndex) {
         sortedDist[rIndex] = rIndex;
     }
@@ -631,17 +324,16 @@ void Assemble(const SkPathWriter& path, SkPathWriter* simple) {
                     eIndex < 0 ? ~eIndex : eIndex);
 #endif
         do {
-            outer = runs[rIndex];
-            const SkOpContour& contour = contours[outer];
+            const SkOpContour* contour = runs[rIndex];
             if (first) {
                 first = false;
-                const SkPoint* startPtr = &contour.start();
+                const SkPoint* startPtr = &contour->start();
                 simple->deferredMove(startPtr[0]);
             }
             if (forward) {
-                contour.toPartialForward(simple);
+                contour->toPartialForward(simple);
             } else {
-                contour.toPartialBackward(simple);
+                contour->toPartialBackward(simple);
             }
 #if DEBUG_ASSEMBLE
             SkDebugf("%s rIndex=%d eIndex=%s%d close=%d\n", __FUNCTION__, rIndex,
@@ -695,33 +387,145 @@ void Assemble(const SkPathWriter& path, SkPathWriter* simple) {
 #endif
 }
 
-bool HandleCoincidence(SkTArray<SkOpContour*, true>* contourList, int total) {
-#if DEBUG_SHOW_WINDING
-    SkOpContour::debugShowWindingValues(contourList);
+static void align(SkOpContourHead* contourList) {
+    SkOpContour* contour = contourList;
+    do {
+        contour->align();
+    } while ((contour = contour->next()));
+}
+
+static void addAlignIntersections(SkOpContourHead* contourList, SkChunkAlloc* allocator) {
+    SkOpContour* contour = contourList;
+    do {
+        contour->addAlignIntersections(contourList, allocator);
+    } while ((contour = contour->next()));
+}
+
+static void calcAngles(SkOpContourHead* contourList, SkChunkAlloc* allocator) {
+    SkOpContour* contour = contourList;
+    do {
+        contour->calcAngles(allocator);
+    } while ((contour = contour->next()));
+}
+
+static void findCollapsed(SkOpContourHead* contourList) {
+    SkOpContour* contour = contourList;
+    do {
+        contour->findCollapsed();
+    } while ((contour = contour->next()));
+}
+
+static bool missingCoincidence(SkOpContourHead* contourList,
+        SkOpCoincidence* coincidence, SkChunkAlloc* allocator) {
+    SkOpContour* contour = contourList;
+    bool result = false;
+    do {
+        result |= contour->missingCoincidence(coincidence, allocator);
+    } while ((contour = contour->next()));
+    return result;
+}
+
+static void moveMultiples(SkOpContourHead* contourList) {
+    SkOpContour* contour = contourList;
+    do {
+        contour->moveMultiples();
+    } while ((contour = contour->next()));
+}
+
+static void moveNearby(SkOpContourHead* contourList) {
+    SkOpContour* contour = contourList;
+    do {
+        contour->moveNearby();
+    } while ((contour = contour->next()));
+}
+
+static void sortAngles(SkOpContourHead* contourList) {
+    SkOpContour* contour = contourList;
+    do {
+        contour->sortAngles();
+    } while ((contour = contour->next()));
+}
+
+bool HandleCoincidence(SkOpContourHead* contourList, SkOpCoincidence* coincidence,
+        SkChunkAlloc* allocator) {
+    SkOpGlobalState* globalState = contourList->globalState();
+    // combine t values when multiple intersections occur on some segments but not others
+    DEBUG_COINCIDENCE_HEALTH(contourList, "start");
+    moveMultiples(contourList);
+    DEBUG_COINCIDENCE_HEALTH(contourList, "moveMultiples");
+    findCollapsed(contourList);
+    DEBUG_COINCIDENCE_HEALTH(contourList, "findCollapsed");
+    // move t values and points together to eliminate small/tiny gaps
+    moveNearby(contourList);
+    DEBUG_COINCIDENCE_HEALTH(contourList, "moveNearby");
+    align(contourList);  // give all span members common values
+    DEBUG_COINCIDENCE_HEALTH(contourList, "align");
+    coincidence->fixAligned();  // aligning may have marked a coincidence pt-t deleted
+    DEBUG_COINCIDENCE_HEALTH(contourList, "fixAligned");
+#if DEBUG_VALIDATE
+    globalState->setPhase(SkOpGlobalState::kIntersecting);
 #endif
-    CoincidenceCheck(contourList, total);
-#if DEBUG_SHOW_WINDING
-    SkOpContour::debugShowWindingValues(contourList);
+    // look for intersections on line segments formed by moving end points
+    addAlignIntersections(contourList, allocator);
+    DEBUG_COINCIDENCE_HEALTH(contourList, "addAlignIntersections");
+    if (coincidence->addMissing(allocator)) {
+        DEBUG_COINCIDENCE_HEALTH(contourList, "addMissing");
+        moveNearby(contourList);
+        DEBUG_COINCIDENCE_HEALTH(contourList, "moveNearby2");
+        align(contourList);  // give all span members common values
+        DEBUG_COINCIDENCE_HEALTH(contourList, "align2");
+        coincidence->fixAligned();  // aligning may have marked a coincidence pt-t deleted
+        DEBUG_COINCIDENCE_HEALTH(contourList, "fixAligned2");
+    }
+#if DEBUG_VALIDATE
+    globalState->setPhase(SkOpGlobalState::kWalking);
 #endif
-    fixOtherTIndex(contourList);
-    checkEnds(contourList);  // check if connecting curve intersected at the same end
-    bool hasM = checkMultiples(contourList);  // check if intersections agree on t and point values
-    SkTDArray<SkOpSegment::AlignedSpan> aligned;
-    if (hasM) {
-        alignMultiples(contourList, &aligned);  // align pairs of identical points
-        alignCoincidence(contourList, aligned);
+    // check to see if, loosely, coincident ranges may be expanded
+    if (coincidence->expand()) {
+        DEBUG_COINCIDENCE_HEALTH(contourList, "expand1");
+        if (!coincidence->addExpanded(allocator  PATH_OPS_DEBUG_VALIDATE_PARAMS(globalState))) {
+            return false;
+        }
     }
-    checkDuplicates(contourList);  // check if spans have the same number on the other end
-    checkTiny(contourList);  // if pair have the same end points, mark them as parallel
-    checkSmall(contourList);  // a pair of curves with a small span may turn into coincident lines
-    joinCoincidence(contourList);  // join curves that connect to a coincident pair
-    sortSegments(contourList);
-    if (!calcAngles(contourList)) {
-        return false;
+    DEBUG_COINCIDENCE_HEALTH(contourList, "expand2");
+    // the expanded ranges may not align -- add the missing spans
+    coincidence->mark();  // mark spans of coincident segments as coincident
+    DEBUG_COINCIDENCE_HEALTH(contourList, "mark1");
+    // look for coincidence missed earlier
+    if (missingCoincidence(contourList, coincidence, allocator)) {
+        DEBUG_COINCIDENCE_HEALTH(contourList, "missingCoincidence1");
+        (void) coincidence->expand();
+        DEBUG_COINCIDENCE_HEALTH(contourList, "expand3");
+        if (!coincidence->addExpanded(allocator  PATH_OPS_DEBUG_VALIDATE_PARAMS(globalState))) {
+            return false;
+        }
+        DEBUG_COINCIDENCE_HEALTH(contourList, "addExpanded2");
+        coincidence->mark();
     }
+    DEBUG_COINCIDENCE_HEALTH(contourList, "missingCoincidence2");
+    SkOpCoincidence overlaps;
+    do {
+        SkOpCoincidence* pairs = overlaps.isEmpty() ? coincidence : &overlaps;
+        if (!pairs->apply()) {  // adjust the winding value to account for coincident edges
+            return false;
+        }
+        DEBUG_COINCIDENCE_HEALTH(contourList, "pairs->apply");
+        // For each coincident pair that overlaps another, when the receivers (the 1st of the pair)
+        // are different, construct a new pair to resolve their mutual span
+        pairs->findOverlaps(&overlaps, allocator);
+        DEBUG_COINCIDENCE_HEALTH(contourList, "pairs->findOverlaps");
+    } while (!overlaps.isEmpty());
+    calcAngles(contourList, allocator);
     sortAngles(contourList);
-#if DEBUG_ACTIVE_SPANS || DEBUG_ACTIVE_SPANS_FIRST_ONLY
-    DebugShowActiveSpans(*contourList);
+    if (globalState->angleCoincidence()) {
+        (void) missingCoincidence(contourList, coincidence, allocator);
+        if (!coincidence->apply()) {
+            return false;
+        }
+    }
+#if DEBUG_ACTIVE_SPANS
+    coincidence->debugShowCoincidence();
+    DebugShowActiveSpans(contourList);
 #endif
     return true;
 }
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsCommon.h b/gfx/skia/skia/src/pathops/SkPathOpsCommon.h
index 0d8cfc42f9fd..73bc0f42ccd4 100644
--- a/gfx/skia/skia/src/pathops/SkPathOpsCommon.h
+++ b/gfx/skia/skia/src/pathops/SkPathOpsCommon.h
@@ -8,24 +8,27 @@
 #define SkPathOpsCommon_DEFINED
 
 #include "SkOpAngle.h"
-#include "SkOpContour.h"
 #include "SkTDArray.h"
 
+class SkOpCoincidence;
+class SkOpContour;
 class SkPathWriter;
 
+const SkOpAngle* AngleWinding(SkOpSpanBase* start, SkOpSpanBase* end, int* windingPtr,
+                              bool* sortable);
 void Assemble(const SkPathWriter& path, SkPathWriter* simple);
-// FIXME: find chase uses insert, so it can't be converted to SkTArray yet
-SkOpSegment* FindChase(SkTDArray<SkOpSpan*>* chase, int* tIndex, int* endIndex);
-SkOpSegment* FindSortableTop(const SkTArray<SkOpContour*, true>& , SkOpAngle::IncludeType ,
-                             bool* firstContour, int* index, int* endIndex, SkPoint* topLeft,
-                             bool* unsortable, bool* done, bool* onlyVertical, bool firstPass);
-SkOpSegment* FindUndone(SkTArray<SkOpContour*, true>& contourList, int* start, int* end);
-void MakeContourList(SkTArray<SkOpContour>& contours, SkTArray<SkOpContour*, true>& list,
-                     bool evenOdd, bool oppEvenOdd);
-bool HandleCoincidence(SkTArray<SkOpContour*, true>* , int );
-
-#if DEBUG_ACTIVE_SPANS || DEBUG_ACTIVE_SPANS_FIRST_ONLY
-void DebugShowActiveSpans(SkTArray<SkOpContour*, true>& contourList);
+SkOpSegment* FindChase(SkTDArray<SkOpSpanBase*>* chase, SkOpSpanBase** startPtr,
+                       SkOpSpanBase** endPtr);
+SkOpSpan* FindSortableTop(SkOpContourHead* );
+SkOpSegment* FindUndone(SkOpContourHead* , SkOpSpanBase** startPtr,
+                        SkOpSpanBase** endPtr);
+void FixWinding(SkPath* path);
+bool SortContourList(SkOpContourHead** , bool evenOdd, bool oppEvenOdd);
+bool HandleCoincidence(SkOpContourHead* , SkOpCoincidence* , SkChunkAlloc* );
+bool OpDebug(const SkPath& one, const SkPath& two, SkPathOp op, SkPath* result,
+             bool expectSuccess  SkDEBUGPARAMS(const char* testName));
+#if DEBUG_ACTIVE_SPANS
+void DebugShowActiveSpans(SkOpContourHead* );
 #endif
 
 #endif
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsConic.cpp b/gfx/skia/skia/src/pathops/SkPathOpsConic.cpp
new file mode 100644
index 000000000000..86bad262e32b
--- /dev/null
+++ b/gfx/skia/skia/src/pathops/SkPathOpsConic.cpp
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "SkIntersections.h"
+#include "SkLineParameters.h"
+#include "SkPathOpsConic.h"
+#include "SkPathOpsCubic.h"
+#include "SkPathOpsQuad.h"
+
+// cribbed from the float version in SkGeometry.cpp
+static void conic_deriv_coeff(const double src[],
+                              SkScalar w,
+                              double coeff[3]) {
+    const double P20 = src[4] - src[0];
+    const double P10 = src[2] - src[0];
+    const double wP10 = w * P10;
+    coeff[0] = w * P20 - P20;
+    coeff[1] = P20 - 2 * wP10;
+    coeff[2] = wP10;
+}
+
+static double conic_eval_tan(const double coord[], SkScalar w, double t) {
+    double coeff[3];
+    conic_deriv_coeff(coord, w, coeff);
+    return t * (t * coeff[0] + coeff[1]) + coeff[2];
+}
+
+int SkDConic::FindExtrema(const double src[], SkScalar w, double t[1]) {
+    double coeff[3];
+    conic_deriv_coeff(src, w, coeff);
+
+    double tValues[2];
+    int roots = SkDQuad::RootsValidT(coeff[0], coeff[1], coeff[2], tValues);
+    SkASSERT(0 == roots || 1 == roots);
+
+    if (1 == roots) {
+        t[0] = tValues[0];
+        return 1;
+    }
+    return 0;
+}
+
+SkDVector SkDConic::dxdyAtT(double t) const {
+    SkDVector result = {
+        conic_eval_tan(&fPts[0].fX, fWeight, t),
+        conic_eval_tan(&fPts[0].fY, fWeight, t)
+    };
+    if (result.fX == 0 && result.fY == 0) {
+        if (zero_or_one(t)) {
+            result = fPts[2] - fPts[0];
+        } else {
+            // incomplete
+            SkDebugf("!k");
+        }
+    }
+    return result;
+}
+
+static double conic_eval_numerator(const double src[], SkScalar w, double t) {
+    SkASSERT(src);
+    SkASSERT(t >= 0 && t <= 1);
+    double src2w = src[2] * w;
+    double C = src[0];
+    double A = src[4] - 2 * src2w + C;
+    double B = 2 * (src2w - C);
+    return (A * t + B) * t + C;
+}
+
+
+static double conic_eval_denominator(SkScalar w, double t) {
+    double B = 2 * (w - 1);
+    double C = 1;
+    double A = -B;
+    return (A * t + B) * t + C;
+}
+
+bool SkDConic::hullIntersects(const SkDCubic& cubic, bool* isLinear) const {
+    return cubic.hullIntersects(*this, isLinear);
+}
+
+SkDPoint SkDConic::ptAtT(double t) const {
+    if (t == 0) {
+        return fPts[0];
+    }
+    if (t == 1) {
+        return fPts[2];
+    }
+    double denominator = conic_eval_denominator(fWeight, t);
+    SkDPoint result = {
+        conic_eval_numerator(&fPts[0].fX, fWeight, t) / denominator,
+        conic_eval_numerator(&fPts[0].fY, fWeight, t) / denominator
+    };
+    return result;
+}
+
+/* see quad subdivide for point rationale */
+/* w rationale : the mid point between t1 and t2 could be determined from the computed a/b/c
+   values if the computed w was known. Since we know the mid point at (t1+t2)/2, we'll assume
+   that it is the same as the point on the new curve t==(0+1)/2.
+
+    d / dz == conic_poly(dst, unknownW, .5) / conic_weight(unknownW, .5);
+
+    conic_poly(dst, unknownW, .5)
+                  =   a / 4 + (b * unknownW) / 2 + c / 4
+                  =  (a + c) / 4 + (bx * unknownW) / 2
+
+    conic_weight(unknownW, .5)
+                  =   unknownW / 2 + 1 / 2
+
+    d / dz                  == ((a + c) / 2 + b * unknownW) / (unknownW + 1)
+    d / dz * (unknownW + 1) ==  (a + c) / 2 + b * unknownW
+              unknownW       = ((a + c) / 2 - d / dz) / (d / dz - b)
+
+    Thus, w is the ratio of the distance from the mid of end points to the on-curve point, and the
+    distance of the on-curve point to the control point.
+ */
+SkDConic SkDConic::subDivide(double t1, double t2) const {
+    double ax, ay, az;
+    if (t1 == 0) {
+        ax = fPts[0].fX;
+        ay = fPts[0].fY;
+        az = 1;
+    } else if (t1 != 1) {
+        ax = conic_eval_numerator(&fPts[0].fX, fWeight, t1);
+        ay = conic_eval_numerator(&fPts[0].fY, fWeight, t1);
+        az = conic_eval_denominator(fWeight, t1);
+    } else {
+        ax = fPts[2].fX;
+        ay = fPts[2].fY;
+        az = 1;
+    }
+    double midT = (t1 + t2) / 2;
+    double dx = conic_eval_numerator(&fPts[0].fX, fWeight, midT);
+    double dy = conic_eval_numerator(&fPts[0].fY, fWeight, midT);
+    double dz = conic_eval_denominator(fWeight, midT);
+    double cx, cy, cz;
+    if (t2 == 1) {
+        cx = fPts[2].fX;
+        cy = fPts[2].fY;
+        cz = 1;
+    } else if (t2 != 0) {
+        cx = conic_eval_numerator(&fPts[0].fX, fWeight, t2);
+        cy = conic_eval_numerator(&fPts[0].fY, fWeight, t2);
+        cz = conic_eval_denominator(fWeight, t2);
+    } else {
+        cx = fPts[0].fX;
+        cy = fPts[0].fY;
+        cz = 1;
+    }
+    double bx = 2 * dx - (ax + cx) / 2;
+    double by = 2 * dy - (ay + cy) / 2;
+    double bz = 2 * dz - (az + cz) / 2;
+    SkDConic dst = {{{{ax / az, ay / az}, {bx / bz, by / bz}, {cx / cz, cy / cz}}},
+            SkDoubleToScalar(bz / sqrt(az * cz)) };
+    return dst;
+}
+
+SkDPoint SkDConic::subDivide(const SkDPoint& a, const SkDPoint& c, double t1, double t2,
+        SkScalar* weight) const {
+    SkDConic chopped = this->subDivide(t1, t2);
+    *weight = chopped.fWeight;
+    return chopped[1];
+}
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsConic.h b/gfx/skia/skia/src/pathops/SkPathOpsConic.h
new file mode 100644
index 000000000000..4cbe147b49e4
--- /dev/null
+++ b/gfx/skia/skia/src/pathops/SkPathOpsConic.h
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPathOpsConic_DEFINED
+#define SkPathOpsConic_DEFINED
+
+#include "SkPathOpsPoint.h"
+#include "SkPathOpsQuad.h"
+
+struct SkDConic {
+    static const int kPointCount = 3;
+    static const int kPointLast = kPointCount - 1;
+    static const int kMaxIntersections = 4;
+
+    SkDQuad fPts;
+    SkScalar fWeight;
+
+    bool collapsed() const {
+        return fPts.collapsed();
+    }
+
+    bool controlsInside() const {
+        return fPts.controlsInside();
+    }
+
+    void debugInit() {
+        fPts.debugInit();
+    }
+
+    SkDConic flip() const {
+        SkDConic result = {{{fPts[2], fPts[1], fPts[0]}}, fWeight};
+        return result;
+    }
+
+    static bool IsConic() { return true; }
+
+    const SkDConic& set(const SkPoint pts[kPointCount], SkScalar weight) {
+        fPts.set(pts);
+        fWeight = weight;
+        return *this;
+    }
+
+    const SkDPoint& operator[](int n) const { return fPts[n]; }
+    SkDPoint& operator[](int n) { return fPts[n]; }
+
+    static int AddValidTs(double s[], int realRoots, double* t) {
+        return SkDQuad::AddValidTs(s, realRoots, t);
+    }
+
+    void align(int endIndex, SkDPoint* dstPt) const {
+        fPts.align(endIndex, dstPt);
+    }
+
+    SkDVector dxdyAtT(double t) const;
+    static int FindExtrema(const double src[], SkScalar weight, double tValue[1]);
+
+    bool hullIntersects(const SkDQuad& quad, bool* isLinear) const {
+        return fPts.hullIntersects(quad, isLinear);
+    }
+
+    bool hullIntersects(const SkDConic& conic, bool* isLinear) const {
+        return fPts.hullIntersects(conic.fPts, isLinear);
+    }
+
+    bool hullIntersects(const SkDCubic& cubic, bool* isLinear) const;
+
+    bool isLinear(int startIndex, int endIndex) const {
+        return fPts.isLinear(startIndex, endIndex);
+    }
+
+    bool monotonicInX() const {
+        return fPts.monotonicInX();
+    }
+
+    bool monotonicInY() const {
+        return fPts.monotonicInY();
+    }
+
+    void otherPts(int oddMan, const SkDPoint* endPt[2]) const {
+        fPts.otherPts(oddMan, endPt);
+    }
+
+    SkDPoint ptAtT(double t) const;
+
+    static int RootsReal(double A, double B, double C, double t[2]) {
+        return SkDQuad::RootsReal(A, B, C, t);
+    }
+
+    static int RootsValidT(const double A, const double B, const double C, double s[2]) {
+        return SkDQuad::RootsValidT(A, B, C, s);
+    }
+
+    SkDConic subDivide(double t1, double t2) const;
+
+    static SkDConic SubDivide(const SkPoint a[kPointCount], SkScalar weight, double t1, double t2) {
+        SkDConic conic;
+        conic.set(a, weight);
+        return conic.subDivide(t1, t2);
+    }
+
+    SkDPoint subDivide(const SkDPoint& a, const SkDPoint& c, double t1, double t2,
+            SkScalar* weight) const;
+
+    static SkDPoint SubDivide(const SkPoint pts[kPointCount], SkScalar weight,
+                              const SkDPoint& a, const SkDPoint& c,
+                              double t1, double t2, SkScalar* newWeight) {
+        SkDConic conic;
+        conic.set(pts, weight);
+        return conic.subDivide(a, c, t1, t2, newWeight);
+    }
+
+    // utilities callable by the user from the debugger when the implementation code is linked in
+    void dump() const;
+    void dumpID(int id) const;
+    void dumpInner() const;
+};
+
+
+#endif
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsCubic.cpp b/gfx/skia/skia/src/pathops/SkPathOpsCubic.cpp
index 9d70d58ec15d..2542ca58848c 100644
--- a/gfx/skia/skia/src/pathops/SkPathOpsCubic.cpp
+++ b/gfx/skia/skia/src/pathops/SkPathOpsCubic.cpp
@@ -4,8 +4,11 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#include "SkGeometry.h"
 #include "SkLineParameters.h"
+#include "SkPathOpsConic.h"
 #include "SkPathOpsCubic.h"
+#include "SkPathOpsCurve.h"
 #include "SkPathOpsLine.h"
 #include "SkPathOpsQuad.h"
 #include "SkPathOpsRect.h"
@@ -13,6 +16,15 @@
 
 const int SkDCubic::gPrecisionUnit = 256;  // FIXME: test different values in test framework
 
+void SkDCubic::align(int endIndex, int ctrlIndex, SkDPoint* dstPt) const {
+    if (fPts[endIndex].fX == fPts[ctrlIndex].fX) {
+        dstPt->fX = fPts[endIndex].fX;
+    }
+    if (fPts[endIndex].fY == fPts[ctrlIndex].fY) {
+        dstPt->fY = fPts[endIndex].fY;
+    }
+}
+
 // give up when changing t no longer moves point
 // also, copy point rather than recompute it when it does change
 double SkDCubic::binarySearch(double min, double max, double axisIntercept,
@@ -26,8 +38,8 @@ double SkDCubic::binarySearch(double min, double max, double axisIntercept,
         double priorT = t - step;
         SkASSERT(priorT >= min);
         SkDPoint lessPt = ptAtT(priorT);
-        if (approximately_equal(lessPt.fX, cubicAtT.fX)
-                && approximately_equal(lessPt.fY, cubicAtT.fY)) {
+        if (approximately_equal_half(lessPt.fX, cubicAtT.fX)
+                && approximately_equal_half(lessPt.fY, cubicAtT.fY)) {
             return -1;  // binary search found no point at this axis intercept
         }
         double lessDist = (&lessPt.fX)[xAxis] - axisIntercept;
@@ -41,10 +53,12 @@ double SkDCubic::binarySearch(double min, double max, double axisIntercept,
             t = priorT;
         } else {
             double nextT = t + lastStep;
-            SkASSERT(nextT <= max);
+            if (nextT > max) {
+                return -1;
+            }
             SkDPoint morePt = ptAtT(nextT);
-            if (approximately_equal(morePt.fX, cubicAtT.fX)
-                    && approximately_equal(morePt.fY, cubicAtT.fY)) {
+            if (approximately_equal_half(morePt.fX, cubicAtT.fX)
+                    && approximately_equal_half(morePt.fY, cubicAtT.fY)) {
                 return -1;  // binary search found no point at this axis intercept
             }
             double moreDist = (&morePt.fX)[xAxis] - axisIntercept;
@@ -70,12 +84,45 @@ double SkDCubic::calcPrecision() const {
     return (width > height ? width : height) / gPrecisionUnit;
 }
 
-bool SkDCubic::clockwise() const {
-    double sum = (fPts[0].fX - fPts[3].fX) * (fPts[0].fY + fPts[3].fY);
-    for (int idx = 0; idx < 3; ++idx) {
-        sum += (fPts[idx + 1].fX - fPts[idx].fX) * (fPts[idx + 1].fY + fPts[idx].fY);
+
+/* classic one t subdivision */
+static void interp_cubic_coords(const double* src, double* dst, double t) {
+    double ab = SkDInterp(src[0], src[2], t);
+    double bc = SkDInterp(src[2], src[4], t);
+    double cd = SkDInterp(src[4], src[6], t);
+    double abc = SkDInterp(ab, bc, t);
+    double bcd = SkDInterp(bc, cd, t);
+    double abcd = SkDInterp(abc, bcd, t);
+
+    dst[0] = src[0];
+    dst[2] = ab;
+    dst[4] = abc;
+    dst[6] = abcd;
+    dst[8] = bcd;
+    dst[10] = cd;
+    dst[12] = src[6];
+}
+
+SkDCubicPair SkDCubic::chopAt(double t) const {
+    SkDCubicPair dst;
+    if (t == 0.5) {
+        dst.pts[0] = fPts[0];
+        dst.pts[1].fX = (fPts[0].fX + fPts[1].fX) / 2;
+        dst.pts[1].fY = (fPts[0].fY + fPts[1].fY) / 2;
+        dst.pts[2].fX = (fPts[0].fX + 2 * fPts[1].fX + fPts[2].fX) / 4;
+        dst.pts[2].fY = (fPts[0].fY + 2 * fPts[1].fY + fPts[2].fY) / 4;
+        dst.pts[3].fX = (fPts[0].fX + 3 * (fPts[1].fX + fPts[2].fX) + fPts[3].fX) / 8;
+        dst.pts[3].fY = (fPts[0].fY + 3 * (fPts[1].fY + fPts[2].fY) + fPts[3].fY) / 8;
+        dst.pts[4].fX = (fPts[1].fX + 2 * fPts[2].fX + fPts[3].fX) / 4;
+        dst.pts[4].fY = (fPts[1].fY + 2 * fPts[2].fY + fPts[3].fY) / 4;
+        dst.pts[5].fX = (fPts[2].fX + fPts[3].fX) / 2;
+        dst.pts[5].fY = (fPts[2].fY + fPts[3].fY) / 2;
+        dst.pts[6] = fPts[3];
+        return dst;
     }
-    return sum <= 0;
+    interp_cubic_coords(&fPts[0].fX, &dst.pts[0].fX, t);
+    interp_cubic_coords(&fPts[0].fY, &dst.pts[0].fY, t);
+    return dst;
 }
 
 void SkDCubic::Coefficients(const double* src, double* A, double* B, double* C, double* D) {
@@ -88,35 +135,6 @@ void SkDCubic::Coefficients(const double* src, double* A, double* B, double* C,
     *C -= 3 * *D;           // C = -3*a + 3*b
 }
 
-bool SkDCubic::controlsContainedByEnds() const {
-    SkDVector startTan = fPts[1] - fPts[0];
-    if (startTan.fX == 0 && startTan.fY == 0) {
-        startTan = fPts[2] - fPts[0];
-    }
-    SkDVector endTan = fPts[2] - fPts[3];
-    if (endTan.fX == 0 && endTan.fY == 0) {
-        endTan = fPts[1] - fPts[3];
-    }
-    if (startTan.dot(endTan) >= 0) {
-        return false;
-    }
-    SkDLine startEdge = {{fPts[0], fPts[0]}};
-    startEdge[1].fX -= startTan.fY;
-    startEdge[1].fY += startTan.fX;
-    SkDLine endEdge = {{fPts[3], fPts[3]}};
-    endEdge[1].fX -= endTan.fY;
-    endEdge[1].fY += endTan.fX;
-    double leftStart1 = startEdge.isLeft(fPts[1]);
-    if (leftStart1 * startEdge.isLeft(fPts[2]) < 0) {
-        return false;
-    }
-    double leftEnd1 = endEdge.isLeft(fPts[1]);
-    if (leftEnd1 * endEdge.isLeft(fPts[2]) < 0) {
-        return false;
-    }
-    return leftStart1 * leftEnd1 >= 0;
-}
-
 bool SkDCubic::endsAreExtremaInXOrY() const {
     return (between(fPts[0].fX, fPts[1].fX, fPts[3].fX)
             && between(fPts[0].fX, fPts[2].fX, fPts[3].fX))
@@ -124,22 +142,167 @@ bool SkDCubic::endsAreExtremaInXOrY() const {
             && between(fPts[0].fY, fPts[2].fY, fPts[3].fY));
 }
 
+// Do a quick reject by rotating all points relative to a line formed by
+// a pair of one cubic's points. If the 2nd cubic's points
+// are on the line or on the opposite side from the 1st cubic's 'odd man', the
+// curves at most intersect at the endpoints.
+/* if returning true, check contains true if cubic's hull collapsed, making the cubic linear
+   if returning false, check contains true if the the cubic pair have only the end point in common
+*/
+bool SkDCubic::hullIntersects(const SkDPoint* pts, int ptCount, bool* isLinear) const {
+    bool linear = true;
+    char hullOrder[4];
+    int hullCount = convexHull(hullOrder);
+    int end1 = hullOrder[0];
+    int hullIndex = 0;
+    const SkDPoint* endPt[2];
+    endPt[0] = &fPts[end1];
+    do {
+        hullIndex = (hullIndex + 1) % hullCount;
+        int end2 = hullOrder[hullIndex];
+        endPt[1] = &fPts[end2];
+        double origX = endPt[0]->fX;
+        double origY = endPt[0]->fY;
+        double adj = endPt[1]->fX - origX;
+        double opp = endPt[1]->fY - origY;
+        int oddManMask = other_two(end1, end2);
+        int oddMan = end1 ^ oddManMask;
+        double sign = (fPts[oddMan].fY - origY) * adj - (fPts[oddMan].fX - origX) * opp;
+        int oddMan2 = end2 ^ oddManMask;
+        double sign2 = (fPts[oddMan2].fY - origY) * adj - (fPts[oddMan2].fX - origX) * opp;
+        if (sign * sign2 < 0) {
+            continue;
+        }
+        if (approximately_zero(sign)) {
+            sign = sign2;
+            if (approximately_zero(sign)) {
+                continue;
+            }
+        }
+        linear = false;
+        bool foundOutlier = false;
+        for (int n = 0; n < ptCount; ++n) {
+            double test = (pts[n].fY - origY) * adj - (pts[n].fX - origX) * opp;
+            if (test * sign > 0 && !precisely_zero(test)) {
+                foundOutlier = true;
+                break;
+            }
+        }
+        if (!foundOutlier) {
+            return false;
+        }
+        endPt[0] = endPt[1];
+        end1 = end2;
+    } while (hullIndex);
+    *isLinear = linear;
+    return true;
+}
+
+bool SkDCubic::hullIntersects(const SkDCubic& c2, bool* isLinear) const {
+    return hullIntersects(c2.fPts, c2.kPointCount, isLinear);
+}
+
+bool SkDCubic::hullIntersects(const SkDQuad& quad, bool* isLinear) const {
+    return hullIntersects(quad.fPts, quad.kPointCount, isLinear);
+}
+
+bool SkDCubic::hullIntersects(const SkDConic& conic, bool* isLinear) const {
+
+    return hullIntersects(conic.fPts, isLinear);
+}
+
 bool SkDCubic::isLinear(int startIndex, int endIndex) const {
     SkLineParameters lineParameters;
     lineParameters.cubicEndPoints(*this, startIndex, endIndex);
     // FIXME: maybe it's possible to avoid this and compare non-normalized
     lineParameters.normalize();
+    double tiniest = SkTMin(SkTMin(SkTMin(SkTMin(SkTMin(SkTMin(SkTMin(fPts[0].fX, fPts[0].fY),
+            fPts[1].fX), fPts[1].fY), fPts[2].fX), fPts[2].fY), fPts[3].fX), fPts[3].fY);
+    double largest = SkTMax(SkTMax(SkTMax(SkTMax(SkTMax(SkTMax(SkTMax(fPts[0].fX, fPts[0].fY),
+            fPts[1].fX), fPts[1].fY), fPts[2].fX), fPts[2].fY), fPts[3].fX), fPts[3].fY);
+    largest = SkTMax(largest, -tiniest);
     double distance = lineParameters.controlPtDistance(*this, 1);
-    if (!approximately_zero(distance)) {
+    if (!approximately_zero_when_compared_to(distance, largest)) {
         return false;
     }
     distance = lineParameters.controlPtDistance(*this, 2);
-    return approximately_zero(distance);
+    return approximately_zero_when_compared_to(distance, largest);
+}
+
+bool SkDCubic::ComplexBreak(const SkPoint pointsPtr[4], SkScalar* t) {
+    SkScalar d[3];
+    SkCubicType cubicType = SkClassifyCubic(pointsPtr, d);
+    if (cubicType == kLoop_SkCubicType) {
+        // crib code from gpu path utils that finds t values where loop self-intersects
+        // use it to find mid of t values which should be a friendly place to chop
+        SkScalar tempSqrt = SkScalarSqrt(4.f * d[0] * d[2] - 3.f * d[1] * d[1]);
+        SkScalar ls = d[1] - tempSqrt;
+        SkScalar lt = 2.f * d[0];
+        SkScalar ms = d[1] + tempSqrt;
+        SkScalar mt = 2.f * d[0];
+        if (between(0, ls, lt) || between(0, ms, mt)) {
+            ls = ls / lt;
+            ms = ms / mt;
+            SkScalar smaller = SkTMax(0.f, SkTMin(ls, ms));
+            SkScalar larger = SkTMin(1.f, SkTMax(ls, ms));
+            *t = (smaller + larger) / 2;
+            return *t > 0 && *t < 1;
+        }
+    } else if (kSerpentine_SkCubicType == cubicType || kCusp_SkCubicType == cubicType) {
+        SkDCubic cubic;
+        cubic.set(pointsPtr);
+        double inflectionTs[2];
+        int infTCount = cubic.findInflections(inflectionTs);
+        if (infTCount == 2) {
+            double maxCurvature[3];
+            int roots = cubic.findMaxCurvature(maxCurvature);
+#if DEBUG_CUBIC_SPLIT
+            SkDebugf("%s\n", __FUNCTION__);
+            cubic.dump();
+            for (int index = 0; index < infTCount; ++index) {
+                SkDebugf("inflectionsTs[%d]=%1.9g ", index, inflectionTs[index]);
+                SkDPoint pt = cubic.ptAtT(inflectionTs[index]);
+                SkDVector dPt = cubic.dxdyAtT(inflectionTs[index]);
+                SkDLine perp = {{pt - dPt, pt + dPt}};
+                perp.dump();
+            }
+            for (int index = 0; index < roots; ++index) {
+                SkDebugf("maxCurvature[%d]=%1.9g ", index, maxCurvature[index]);
+                SkDPoint pt = cubic.ptAtT(maxCurvature[index]);
+                SkDVector dPt = cubic.dxdyAtT(maxCurvature[index]);
+                SkDLine perp = {{pt - dPt, pt + dPt}};
+                perp.dump();
+            }
+#endif
+            for (int index = 0; index < roots; ++index) {
+                if (between(inflectionTs[0], maxCurvature[index], inflectionTs[1])) {
+                    *t = maxCurvature[index];
+                    return true;
+                }
+            }
+        } else if (infTCount == 1) {
+            *t = inflectionTs[0];
+            return *t > 0 && *t < 1;
+        }
+    }
+    return false;
+}
+
+bool SkDCubic::monotonicInX() const {
+    return precisely_between(fPts[0].fX, fPts[1].fX, fPts[3].fX)
+            && precisely_between(fPts[0].fX, fPts[2].fX, fPts[3].fX);
 }
 
 bool SkDCubic::monotonicInY() const {
-    return between(fPts[0].fY, fPts[1].fY, fPts[3].fY)
-            && between(fPts[0].fY, fPts[2].fY, fPts[3].fY);
+    return precisely_between(fPts[0].fY, fPts[1].fY, fPts[3].fY)
+            && precisely_between(fPts[0].fY, fPts[2].fY, fPts[3].fY);
+}
+
+void SkDCubic::otherPts(int index, const SkDPoint* o1Pts[kPointCount - 1]) const {
+    int offset = (int) !SkToBool(index);
+    o1Pts[0] = &fPts[offset];
+    o1Pts[1] = &fPts[++offset];
+    o1Pts[2] = &fPts[++offset];
 }
 
 int SkDCubic::searchRoots(double extremeTs[6], int extrema, double axisIntercept,
@@ -163,26 +326,6 @@ int SkDCubic::searchRoots(double extremeTs[6], int extrema, double axisIntercept
     return validCount;
 }
 
-bool SkDCubic::serpentine() const {
-#if 0  // FIXME: enabling this fixes cubicOp114 but breaks cubicOp58d and cubicOp53d
-    double tValues[2];
-    // OPTIMIZATION : another case where caching the present of cubic inflections would be useful
-    return findInflections(tValues) > 1;
-#endif
-    if (!controlsContainedByEnds()) {
-        return false;
-    }
-    double wiggle = (fPts[0].fX - fPts[2].fX) * (fPts[0].fY + fPts[2].fY);
-    for (int idx = 0; idx < 2; ++idx) {
-        wiggle += (fPts[idx + 1].fX - fPts[idx].fX) * (fPts[idx + 1].fY + fPts[idx].fY);
-    }
-    double waggle = (fPts[1].fX - fPts[3].fX) * (fPts[1].fY + fPts[3].fY);
-    for (int idx = 1; idx < 3; ++idx) {
-        waggle += (fPts[idx + 1].fX - fPts[idx].fX) * (fPts[idx + 1].fY + fPts[idx].fY);
-    }
-    return wiggle * waggle < 0;
-}
-
 // cubic roots
 
 static const double PI = 3.141592653589793;
@@ -192,6 +335,28 @@ int SkDCubic::RootsValidT(double A, double B, double C, double D, double t[3]) {
     double s[3];
     int realRoots = RootsReal(A, B, C, D, s);
     int foundRoots = SkDQuad::AddValidTs(s, realRoots, t);
+    for (int index = 0; index < realRoots; ++index) {
+        double tValue = s[index];
+        if (!approximately_one_or_less(tValue) && between(1, tValue, 1.00005)) {
+            for (int idx2 = 0; idx2 < foundRoots; ++idx2) {
+                if (approximately_equal(t[idx2], 1)) {
+                    goto nextRoot;
+                }
+            }
+            SkASSERT(foundRoots < 3);
+            t[foundRoots++] = 1;
+        } else if (!approximately_zero_or_more(tValue) && between(-0.00005, tValue, 0)) {
+            for (int idx2 = 0; idx2 < foundRoots; ++idx2) {
+                if (approximately_equal(t[idx2], 0)) {
+                    goto nextRoot;
+                }
+            }
+            SkASSERT(foundRoots < 3);
+            t[foundRoots++] = 0;
+        }
+nextRoot:
+        ;
+    }
     return foundRoots;
 }
 
@@ -306,6 +471,19 @@ static double derivative_at_t(const double* src, double t) {
 // OPTIMIZE? compute t^2, t(1-t), and (1-t)^2 and pass them to another version of derivative at t?
 SkDVector SkDCubic::dxdyAtT(double t) const {
     SkDVector result = { derivative_at_t(&fPts[0].fX, t), derivative_at_t(&fPts[0].fY, t) };
+    if (result.fX == 0 && result.fY == 0) {
+        if (t == 0) {
+            result = fPts[2] - fPts[0];
+        } else if (t == 1) {
+            result = fPts[3] - fPts[1];
+        } else {
+            // incomplete
+            SkDebugf("!c");
+        }
+        if (result.fX == 0 && result.fY == 0 && zero_or_one(t)) {
+            result = fPts[3] - fPts[0];
+        }
+    }
     return result;
 }
 
@@ -336,10 +514,14 @@ static void formulate_F1DotF2(const double src[], double coeff[4]) {
     C = 3(b - a)
     Solve for t, keeping only those that fit between 0 < t < 1
 */
-int SkDCubic::FindExtrema(double a, double b, double c, double d, double tValues[2]) {
+int SkDCubic::FindExtrema(const double src[], double tValues[2]) {
     // we divide A,B,C by 3 to simplify
-    double A = d - a + 3*(b - c);
-    double B = 2*(a - b - b + c);
+    double a = src[0];
+    double b = src[2];
+    double c = src[4];
+    double d = src[6];
+    double A = d - a + 3 * (b - c);
+    double B = 2 * (a - b - b + c);
     double C = b - a;
 
     return SkDQuad::RootsValidT(A, B, C, tValues);
@@ -368,26 +550,6 @@ int SkDCubic::findMaxCurvature(double tValues[]) const {
     return RootsValidT(coeffX[0], coeffX[1], coeffX[2], coeffX[3], tValues);
 }
 
-SkDPoint SkDCubic::top(double startT, double endT) const {
-    SkDCubic sub = subDivide(startT, endT);
-    SkDPoint topPt = sub[0];
-    if (topPt.fY > sub[3].fY || (topPt.fY == sub[3].fY && topPt.fX > sub[3].fX)) {
-        topPt = sub[3];
-    }
-    double extremeTs[2];
-    if (!sub.monotonicInY()) {
-        int roots = FindExtrema(sub[0].fY, sub[1].fY, sub[2].fY, sub[3].fY, extremeTs);
-        for (int index = 0; index < roots; ++index) {
-            double t = startT + (endT - startT) * extremeTs[index];
-            SkDPoint mid = ptAtT(t);
-            if (topPt.fY > mid.fY || (topPt.fY == mid.fY && topPt.fX > mid.fX)) {
-                topPt = mid;
-            }
-        }
-    }
-    return topPt;
-}
-
 SkDPoint SkDCubic::ptAtT(double t) const {
     if (0 == t) {
         return fPts[0];
@@ -493,37 +655,13 @@ SkDCubic SkDCubic::subDivide(double t1, double t2) const {
     return dst;
 }
 
-void SkDCubic::align(int endIndex, int ctrlIndex, SkDPoint* dstPt) const {
-    if (fPts[endIndex].fX == fPts[ctrlIndex].fX) {
-        dstPt->fX = fPts[endIndex].fX;
-    }
-    if (fPts[endIndex].fY == fPts[ctrlIndex].fY) {
-        dstPt->fY = fPts[endIndex].fY;
-    }
-}
-
 void SkDCubic::subDivide(const SkDPoint& a, const SkDPoint& d,
                          double t1, double t2, SkDPoint dst[2]) const {
     SkASSERT(t1 != t2);
-#if 0
-    double ex = interp_cubic_coords(&fPts[0].fX, (t1 * 2 + t2) / 3);
-    double ey = interp_cubic_coords(&fPts[0].fY, (t1 * 2 + t2) / 3);
-    double fx = interp_cubic_coords(&fPts[0].fX, (t1 + t2 * 2) / 3);
-    double fy = interp_cubic_coords(&fPts[0].fY, (t1 + t2 * 2) / 3);
-    double mx = ex * 27 - a.fX * 8 - d.fX;
-    double my = ey * 27 - a.fY * 8 - d.fY;
-    double nx = fx * 27 - a.fX - d.fX * 8;
-    double ny = fy * 27 - a.fY - d.fY * 8;
-    /* bx = */ dst[0].fX = (mx * 2 - nx) / 18;
-    /* by = */ dst[0].fY = (my * 2 - ny) / 18;
-    /* cx = */ dst[1].fX = (nx * 2 - mx) / 18;
-    /* cy = */ dst[1].fY = (ny * 2 - my) / 18;
-#else
     // this approach assumes that the control points computed directly are accurate enough
     SkDCubic sub = subDivide(t1, t2);
     dst[0] = sub[1] + (a - sub[0]);
     dst[1] = sub[2] + (d - sub[3]);
-#endif
     if (t1 == 0 || t2 == 0) {
         align(0, 1, t1 == 0 ? &dst[0] : &dst[1]);
     }
@@ -544,42 +682,17 @@ void SkDCubic::subDivide(const SkDPoint& a, const SkDPoint& d,
     }
 }
 
-/* classic one t subdivision */
-static void interp_cubic_coords(const double* src, double* dst, double t) {
-    double ab = SkDInterp(src[0], src[2], t);
-    double bc = SkDInterp(src[2], src[4], t);
-    double cd = SkDInterp(src[4], src[6], t);
-    double abc = SkDInterp(ab, bc, t);
-    double bcd = SkDInterp(bc, cd, t);
-    double abcd = SkDInterp(abc, bcd, t);
-
-    dst[0] = src[0];
-    dst[2] = ab;
-    dst[4] = abc;
-    dst[6] = abcd;
-    dst[8] = bcd;
-    dst[10] = cd;
-    dst[12] = src[6];
-}
-
-SkDCubicPair SkDCubic::chopAt(double t) const {
-    SkDCubicPair dst;
-    if (t == 0.5) {
-        dst.pts[0] = fPts[0];
-        dst.pts[1].fX = (fPts[0].fX + fPts[1].fX) / 2;
-        dst.pts[1].fY = (fPts[0].fY + fPts[1].fY) / 2;
-        dst.pts[2].fX = (fPts[0].fX + 2 * fPts[1].fX + fPts[2].fX) / 4;
-        dst.pts[2].fY = (fPts[0].fY + 2 * fPts[1].fY + fPts[2].fY) / 4;
-        dst.pts[3].fX = (fPts[0].fX + 3 * (fPts[1].fX + fPts[2].fX) + fPts[3].fX) / 8;
-        dst.pts[3].fY = (fPts[0].fY + 3 * (fPts[1].fY + fPts[2].fY) + fPts[3].fY) / 8;
-        dst.pts[4].fX = (fPts[1].fX + 2 * fPts[2].fX + fPts[3].fX) / 4;
-        dst.pts[4].fY = (fPts[1].fY + 2 * fPts[2].fY + fPts[3].fY) / 4;
-        dst.pts[5].fX = (fPts[2].fX + fPts[3].fX) / 2;
-        dst.pts[5].fY = (fPts[2].fY + fPts[3].fY) / 2;
-        dst.pts[6] = fPts[3];
-        return dst;
+double SkDCubic::top(const SkDCubic& dCurve, double startT, double endT, SkDPoint*topPt) const {
+    double extremeTs[2];
+    double topT = -1;
+    int roots = SkDCubic::FindExtrema(&fPts[0].fY, extremeTs);
+    for (int index = 0; index < roots; ++index) {
+        double t = startT + (endT - startT) * extremeTs[index];
+        SkDPoint mid = dCurve.ptAtT(t);
+        if (topPt->fY > mid.fY || (topPt->fY == mid.fY && topPt->fX > mid.fX)) {
+            topT = t;
+            *topPt = mid;
+        }
     }
-    interp_cubic_coords(&fPts[0].fX, &dst.pts[0].fX, t);
-    interp_cubic_coords(&fPts[0].fY, &dst.pts[0].fY, t);
-    return dst;
+    return topT;
 }
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsCubic.h b/gfx/skia/skia/src/pathops/SkPathOpsCubic.h
index 1037cae4f759..16bca7953319 100644
--- a/gfx/skia/skia/src/pathops/SkPathOpsCubic.h
+++ b/gfx/skia/skia/src/pathops/SkPathOpsCubic.h
@@ -10,7 +10,6 @@
 
 #include "SkPath.h"
 #include "SkPathOpsPoint.h"
-#include "SkTArray.h"
 
 struct SkDCubicPair {
     const SkDCubic& first() const { return (const SkDCubic&) pts[0]; }
@@ -19,78 +18,133 @@ struct SkDCubicPair {
 };
 
 struct SkDCubic {
+    static const int kPointCount = 4;
+    static const int kPointLast = kPointCount - 1;
+    static const int kMaxIntersections = 9;
+
     enum SearchAxis {
         kXAxis,
         kYAxis
     };
 
-    const SkDPoint& operator[](int n) const { SkASSERT(n >= 0 && n < 4); return fPts[n]; }
-    SkDPoint& operator[](int n) { SkASSERT(n >= 0 && n < 4); return fPts[n]; }
+    bool collapsed() const {
+        return fPts[0].approximatelyEqual(fPts[1]) && fPts[0].approximatelyEqual(fPts[2])
+                && fPts[0].approximatelyEqual(fPts[3]);
+    }
+
+    bool controlsInside() const {
+        SkDVector v01 = fPts[0] - fPts[1];
+        SkDVector v02 = fPts[0] - fPts[2];
+        SkDVector v03 = fPts[0] - fPts[3];
+        SkDVector v13 = fPts[1] - fPts[3];
+        SkDVector v23 = fPts[2] - fPts[3];
+        return v03.dot(v01) > 0 && v03.dot(v02) > 0 && v03.dot(v13) > 0 && v03.dot(v23) > 0;
+    }
+
+    static bool IsConic() { return false; }
+
+    const SkDPoint& operator[](int n) const { SkASSERT(n >= 0 && n < kPointCount); return fPts[n]; }
+    SkDPoint& operator[](int n) { SkASSERT(n >= 0 && n < kPointCount); return fPts[n]; }
 
     void align(int endIndex, int ctrlIndex, SkDPoint* dstPt) const;
     double binarySearch(double min, double max, double axisIntercept, SearchAxis xAxis) const;
     double calcPrecision() const;
     SkDCubicPair chopAt(double t) const;
-    bool clockwise() const;
     static void Coefficients(const double* cubic, double* A, double* B, double* C, double* D);
-    bool controlsContainedByEnds() const;
+    static bool ComplexBreak(const SkPoint pts[4], SkScalar* t);
+    int convexHull(char order[kPointCount]) const;
+
+    void debugInit() {
+        sk_bzero(fPts, sizeof(fPts));
+    }
+
+    void dump() const;  // callable from the debugger when the implementation code is linked in
+    void dumpID(int id) const;
+    void dumpInner() const;
     SkDVector dxdyAtT(double t) const;
     bool endsAreExtremaInXOrY() const;
-    static int FindExtrema(double a, double b, double c, double d, double tValue[2]);
+    static int FindExtrema(const double src[], double tValue[2]);
     int findInflections(double tValues[2]) const;
 
-    static int FindInflections(const SkPoint a[4], double tValues[2]) {
+    static int FindInflections(const SkPoint a[kPointCount], double tValues[2]) {
         SkDCubic cubic;
-        cubic.set(a);
-        return cubic.findInflections(tValues);
+        return cubic.set(a).findInflections(tValues);
     }
 
     int findMaxCurvature(double tValues[]) const;
+    bool hullIntersects(const SkDCubic& c2, bool* isLinear) const;
+    bool hullIntersects(const SkDConic& c, bool* isLinear) const;
+    bool hullIntersects(const SkDQuad& c2, bool* isLinear) const;
+    bool hullIntersects(const SkDPoint* pts, int ptCount, bool* isLinear) const;
     bool isLinear(int startIndex, int endIndex) const;
+    bool monotonicInX() const;
     bool monotonicInY() const;
+    void otherPts(int index, const SkDPoint* o1Pts[kPointCount - 1]) const;
     SkDPoint ptAtT(double t) const;
     static int RootsReal(double A, double B, double C, double D, double t[3]);
     static int RootsValidT(const double A, const double B, const double C, double D, double s[3]);
 
     int searchRoots(double extremes[6], int extrema, double axisIntercept,
                     SearchAxis xAxis, double* validRoots) const;
-    bool serpentine() const;
 
-    void set(const SkPoint pts[4]) {
+    /**
+     *  Return the number of valid roots (0 < root < 1) for this cubic intersecting the
+     *  specified horizontal line.
+     */
+    int horizontalIntersect(double yIntercept, double roots[3]) const;
+    /**
+     *  Return the number of valid roots (0 < root < 1) for this cubic intersecting the
+     *  specified vertical line.
+     */
+    int verticalIntersect(double xIntercept, double roots[3]) const;
+
+    const SkDCubic& set(const SkPoint pts[kPointCount]) {
         fPts[0] = pts[0];
         fPts[1] = pts[1];
         fPts[2] = pts[2];
         fPts[3] = pts[3];
+        return *this;
     }
 
     SkDCubic subDivide(double t1, double t2) const;
 
-    static SkDCubic SubDivide(const SkPoint a[4], double t1, double t2) {
+    static SkDCubic SubDivide(const SkPoint a[kPointCount], double t1, double t2) {
         SkDCubic cubic;
-        cubic.set(a);
-        return cubic.subDivide(t1, t2);
+        return cubic.set(a).subDivide(t1, t2);
     }
 
     void subDivide(const SkDPoint& a, const SkDPoint& d, double t1, double t2, SkDPoint p[2]) const;
 
-    static void SubDivide(const SkPoint pts[4], const SkDPoint& a, const SkDPoint& d, double t1,
+    static void SubDivide(const SkPoint pts[kPointCount], const SkDPoint& a, const SkDPoint& d, double t1,
                           double t2, SkDPoint p[2]) {
         SkDCubic cubic;
-        cubic.set(pts);
-        cubic.subDivide(a, d, t1, t2, p);
+        cubic.set(pts).subDivide(a, d, t1, t2, p);
     }
 
-    SkDPoint top(double startT, double endT) const;
-    void toQuadraticTs(double precision, SkTArray<double, true>* ts) const;
+    double top(const SkDCubic& dCurve, double startT, double endT, SkDPoint*topPt) const;
     SkDQuad toQuad() const;
 
-    // utilities callable by the user from the debugger when the implementation code is linked in
-    void dump() const;
-    void dumpNumber() const;
-
     static const int gPrecisionUnit;
 
-    SkDPoint fPts[4];
+    SkDPoint fPts[kPointCount];
 };
 
+/* Given the set [0, 1, 2, 3], and two of the four members, compute an XOR mask
+   that computes the other two. Note that:
+
+   one ^ two == 3 for (0, 3), (1, 2)
+   one ^ two <  3 for (0, 1), (0, 2), (1, 3), (2, 3)
+   3 - (one ^ two) is either 0, 1, or 2
+   1 >> (3 - (one ^ two)) is either 0 or 1
+thus:
+   returned == 2 for (0, 3), (1, 2)
+   returned == 3 for (0, 1), (0, 2), (1, 3), (2, 3)
+given that:
+   (0, 3) ^ 2 -> (2, 1)  (1, 2) ^ 2 -> (3, 0)
+   (0, 1) ^ 3 -> (3, 2)  (0, 2) ^ 3 -> (3, 1)  (1, 3) ^ 3 -> (2, 0)  (2, 3) ^ 3 -> (1, 0)
+*/
+inline int other_two(int one, int two) {
+    return 1 >> (3 - (one ^ two)) ^ 3;
+}
+
 #endif
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsCurve.cpp b/gfx/skia/skia/src/pathops/SkPathOpsCurve.cpp
new file mode 100644
index 000000000000..bf44d25e17c9
--- /dev/null
+++ b/gfx/skia/skia/src/pathops/SkPathOpsCurve.cpp
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "SkPathOpsBounds.h"
+#include "SkPathOpsRect.h"
+#include "SkPathOpsCurve.h"
+
+void SkDCurve::setConicBounds(const SkPoint curve[3], SkScalar curveWeight,
+        double tStart, double tEnd, SkPathOpsBounds* bounds) {
+    SkDConic dCurve;
+    dCurve.set(curve, curveWeight);
+    SkDRect dRect;
+    dRect.setBounds(dCurve, fConic, tStart, tEnd);
+    bounds->set(SkDoubleToScalar(dRect.fLeft), SkDoubleToScalar(dRect.fTop),
+            SkDoubleToScalar(dRect.fRight), SkDoubleToScalar(dRect.fBottom));
+}
+
+void SkDCurve::setCubicBounds(const SkPoint curve[4], SkScalar , 
+        double tStart, double tEnd, SkPathOpsBounds* bounds) {
+    SkDCubic dCurve;
+    dCurve.set(curve);
+    SkDRect dRect;
+    dRect.setBounds(dCurve, fCubic, tStart, tEnd);
+    bounds->set(SkDoubleToScalar(dRect.fLeft), SkDoubleToScalar(dRect.fTop),
+            SkDoubleToScalar(dRect.fRight), SkDoubleToScalar(dRect.fBottom));
+}
+
+void SkDCurve::setQuadBounds(const SkPoint curve[3], SkScalar ,
+        double tStart, double tEnd, SkPathOpsBounds* bounds) {
+    SkDQuad dCurve;
+    dCurve.set(curve);
+    SkDRect dRect;
+    dRect.setBounds(dCurve, fQuad, tStart, tEnd);
+    bounds->set(SkDoubleToScalar(dRect.fLeft), SkDoubleToScalar(dRect.fTop),
+            SkDoubleToScalar(dRect.fRight), SkDoubleToScalar(dRect.fBottom));
+}
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsCurve.h b/gfx/skia/skia/src/pathops/SkPathOpsCurve.h
index a7d3e8163814..97e20be2b138 100644
--- a/gfx/skia/skia/src/pathops/SkPathOpsCurve.h
+++ b/gfx/skia/skia/src/pathops/SkPathOpsCurve.h
@@ -8,134 +8,215 @@
 #define SkPathOpsCurve_DEFINE
 
 #include "SkIntersections.h"
-#include "SkPathOpsCubic.h"
-#include "SkPathOpsLine.h"
-#include "SkPathOpsQuad.h"
 
-static SkDPoint dline_xy_at_t(const SkPoint a[2], double t) {
+#ifndef SK_RELEASE
+#include "SkPath.h"
+#endif
+
+struct SkPathOpsBounds;
+
+struct SkOpCurve {
+    SkPoint fPts[4];
+    SkScalar fWeight;
+    SkDEBUGCODE(SkPath::Verb fVerb);
+
+    const SkPoint& operator[](int n) const {
+        SkASSERT(n >= 0 && n <= SkPathOpsVerbToPoints(fVerb));
+        return fPts[n];
+    }
+
+    void dump() const;
+
+    void set(const SkDQuad& quad) {
+        for (int index = 0; index < SkDQuad::kPointCount; ++index) {
+            fPts[index] = quad[index].asSkPoint();
+        }
+        SkDEBUGCODE(fWeight = 1);
+        SkDEBUGCODE(fVerb = SkPath::kQuad_Verb);
+    }
+
+    void set(const SkDCubic& cubic) {
+        for (int index = 0; index < SkDCubic::kPointCount; ++index) {
+            fPts[index] = cubic[index].asSkPoint();
+        }
+        SkDEBUGCODE(fWeight = 1);
+        SkDEBUGCODE(fVerb = SkPath::kCubic_Verb);
+    }
+
+};
+
+struct SkDCurve {
+    union {
+        SkDLine fLine;
+        SkDQuad fQuad;
+        SkDConic fConic;
+        SkDCubic fCubic;
+    };
+    SkDEBUGCODE(SkPath::Verb fVerb);
+
+    const SkDPoint& operator[](int n) const {
+        SkASSERT(n >= 0 && n <= SkPathOpsVerbToPoints(fVerb));
+        return fCubic[n];
+    }
+
+    SkDPoint& operator[](int n) {
+        SkASSERT(n >= 0 && n <= SkPathOpsVerbToPoints(fVerb));
+        return fCubic[n];
+    }
+
+    SkDPoint conicTop(const SkPoint curve[3], SkScalar curveWeight, 
+                      double s, double e, double* topT);
+    SkDPoint cubicTop(const SkPoint curve[4], SkScalar , double s, double e, double* topT);
+    void dumpID(int ) const;
+    SkDPoint lineTop(const SkPoint[2], SkScalar , double , double , double* topT);
+    SkDPoint quadTop(const SkPoint curve[3], SkScalar , double s, double e, double* topT);
+
+    void setConicBounds(const SkPoint curve[3], SkScalar curveWeight, 
+                        double s, double e, SkPathOpsBounds* );
+    void setCubicBounds(const SkPoint curve[4], SkScalar ,
+                        double s, double e, SkPathOpsBounds* );
+    void setQuadBounds(const SkPoint curve[3], SkScalar ,
+                       double s, double e, SkPathOpsBounds*);
+};
+
+
+extern SkDPoint (SkDCurve::* const Top[])(const SkPoint curve[], SkScalar cWeight,
+    double tStart, double tEnd, double* topT);
+
+static SkDPoint dline_xy_at_t(const SkPoint a[2], SkScalar , double t) {
     SkDLine line;
     line.set(a);
     return line.ptAtT(t);
 }
 
-static SkDPoint dquad_xy_at_t(const SkPoint a[3], double t) {
+static SkDPoint dquad_xy_at_t(const SkPoint a[3], SkScalar , double t) {
     SkDQuad quad;
     quad.set(a);
     return quad.ptAtT(t);
 }
 
-static SkDPoint dcubic_xy_at_t(const SkPoint a[4], double t) {
+static SkDPoint dconic_xy_at_t(const SkPoint a[3], SkScalar weight, double t) {
+    SkDConic conic;
+    conic.set(a, weight);
+    return conic.ptAtT(t);
+}
+
+static SkDPoint dcubic_xy_at_t(const SkPoint a[4], SkScalar , double t) {
     SkDCubic cubic;
     cubic.set(a);
     return cubic.ptAtT(t);
 }
 
-static SkDPoint (* const CurveDPointAtT[])(const SkPoint[], double ) = {
-    NULL,
+static SkDPoint (* const CurveDPointAtT[])(const SkPoint[], SkScalar , double ) = {
+    nullptr,
     dline_xy_at_t,
     dquad_xy_at_t,
+    dconic_xy_at_t,
     dcubic_xy_at_t
 };
 
-static SkPoint fline_xy_at_t(const SkPoint a[2], double t) {
-    return dline_xy_at_t(a, t).asSkPoint();
+static SkPoint fline_xy_at_t(const SkPoint a[2], SkScalar weight, double t) {
+    return dline_xy_at_t(a, weight, t).asSkPoint();
 }
 
-static SkPoint fquad_xy_at_t(const SkPoint a[3], double t) {
-    return dquad_xy_at_t(a, t).asSkPoint();
+static SkPoint fquad_xy_at_t(const SkPoint a[3], SkScalar weight, double t) {
+    return dquad_xy_at_t(a, weight, t).asSkPoint();
 }
 
-static SkPoint fcubic_xy_at_t(const SkPoint a[4], double t) {
-    return dcubic_xy_at_t(a, t).asSkPoint();
+static SkPoint fconic_xy_at_t(const SkPoint a[3], SkScalar weight, double t) {
+    return dconic_xy_at_t(a, weight, t).asSkPoint();
 }
 
-static SkPoint (* const CurvePointAtT[])(const SkPoint[], double ) = {
-    NULL,
+static SkPoint fcubic_xy_at_t(const SkPoint a[4], SkScalar weight, double t) {
+    return dcubic_xy_at_t(a, weight, t).asSkPoint();
+}
+
+static SkPoint (* const CurvePointAtT[])(const SkPoint[], SkScalar , double ) = {
+    nullptr,
     fline_xy_at_t,
     fquad_xy_at_t,
+    fconic_xy_at_t,
     fcubic_xy_at_t
 };
 
-static SkDVector dline_dxdy_at_t(const SkPoint a[2], double ) {
+static SkDVector dline_dxdy_at_t(const SkPoint a[2], SkScalar , double ) {
     SkDLine line;
     line.set(a);
     return line[1] - line[0];
 }
 
-static SkDVector dquad_dxdy_at_t(const SkPoint a[3], double t) {
+static SkDVector dquad_dxdy_at_t(const SkPoint a[3], SkScalar , double t) {
     SkDQuad quad;
     quad.set(a);
     return quad.dxdyAtT(t);
 }
 
-static SkDVector dcubic_dxdy_at_t(const SkPoint a[4], double t) {
+static SkDVector dconic_dxdy_at_t(const SkPoint a[3], SkScalar weight, double t) {
+    SkDConic conic;
+    conic.set(a, weight);
+    return conic.dxdyAtT(t);
+}
+
+static SkDVector dcubic_dxdy_at_t(const SkPoint a[4], SkScalar , double t) {
     SkDCubic cubic;
     cubic.set(a);
     return cubic.dxdyAtT(t);
 }
 
-static SkDVector (* const CurveDSlopeAtT[])(const SkPoint[], double ) = {
-    NULL,
+static SkDVector (* const CurveDSlopeAtT[])(const SkPoint[], SkScalar , double ) = {
+    nullptr,
     dline_dxdy_at_t,
     dquad_dxdy_at_t,
+    dconic_dxdy_at_t,
     dcubic_dxdy_at_t
 };
 
-static SkVector fline_dxdy_at_t(const SkPoint a[2], double ) {
+static SkVector fline_dxdy_at_t(const SkPoint a[2], SkScalar , double ) {
     return a[1] - a[0];
 }
 
-static SkVector fquad_dxdy_at_t(const SkPoint a[3], double t) {
-    return dquad_dxdy_at_t(a, t).asSkVector();
+static SkVector fquad_dxdy_at_t(const SkPoint a[3], SkScalar weight, double t) {
+    return dquad_dxdy_at_t(a, weight, t).asSkVector();
 }
 
-static SkVector fcubic_dxdy_at_t(const SkPoint a[4], double t) {
-    return dcubic_dxdy_at_t(a, t).asSkVector();
+static SkVector fconic_dxdy_at_t(const SkPoint a[3], SkScalar weight, double t) {
+    return dconic_dxdy_at_t(a, weight, t).asSkVector();
 }
 
-static SkVector (* const CurveSlopeAtT[])(const SkPoint[], double ) = {
-    NULL,
+static SkVector fcubic_dxdy_at_t(const SkPoint a[4], SkScalar weight, double t) {
+    return dcubic_dxdy_at_t(a, weight, t).asSkVector();
+}
+
+static SkVector (* const CurveSlopeAtT[])(const SkPoint[], SkScalar , double ) = {
+    nullptr,
     fline_dxdy_at_t,
     fquad_dxdy_at_t,
+    fconic_dxdy_at_t,
     fcubic_dxdy_at_t
 };
 
-static SkPoint quad_top(const SkPoint a[3], double startT, double endT) {
-    SkDQuad quad;
-    quad.set(a);
-    SkDPoint topPt = quad.top(startT, endT);
-    return topPt.asSkPoint();
-}
-
-static SkPoint cubic_top(const SkPoint a[4], double startT, double endT) {
-    SkDCubic cubic;
-    cubic.set(a);
-    SkDPoint topPt = cubic.top(startT, endT);
-    return topPt.asSkPoint();
-}
-
-static SkPoint (* const CurveTop[])(const SkPoint[], double , double ) = {
-    NULL,
-    NULL,
-    quad_top,
-    cubic_top
-};
-
-static bool line_is_vertical(const SkPoint a[2], double startT, double endT) {
+static bool line_is_vertical(const SkPoint a[2], SkScalar , double startT, double endT) {
     SkDLine line;
     line.set(a);
     SkDPoint dst[2] = { line.ptAtT(startT), line.ptAtT(endT) };
     return AlmostEqualUlps(dst[0].fX, dst[1].fX);
 }
 
-static bool quad_is_vertical(const SkPoint a[3], double startT, double endT) {
+static bool quad_is_vertical(const SkPoint a[3], SkScalar , double startT, double endT) {
     SkDQuad quad;
     quad.set(a);
     SkDQuad dst = quad.subDivide(startT, endT);
     return AlmostEqualUlps(dst[0].fX, dst[1].fX) && AlmostEqualUlps(dst[1].fX, dst[2].fX);
 }
 
-static bool cubic_is_vertical(const SkPoint a[4], double startT, double endT) {
+static bool conic_is_vertical(const SkPoint a[3], SkScalar weight, double startT, double endT) {
+    SkDConic conic;
+    conic.set(a, weight);
+    SkDConic dst = conic.subDivide(startT, endT);
+    return AlmostEqualUlps(dst[0].fX, dst[1].fX) && AlmostEqualUlps(dst[1].fX, dst[2].fX);
+}
+
+static bool cubic_is_vertical(const SkPoint a[4], SkScalar , double startT, double endT) {
     SkDCubic cubic;
     cubic.set(a);
     SkDCubic dst = cubic.subDivide(startT, endT);
@@ -143,36 +224,104 @@ static bool cubic_is_vertical(const SkPoint a[4], double startT, double endT) {
             && AlmostEqualUlps(dst[2].fX, dst[3].fX);
 }
 
-static bool (* const CurveIsVertical[])(const SkPoint[], double , double) = {
-    NULL,
+static bool (* const CurveIsVertical[])(const SkPoint[], SkScalar , double , double) = {
+    nullptr,
     line_is_vertical,
     quad_is_vertical,
+    conic_is_vertical,
     cubic_is_vertical
 };
 
-static void line_intersect_ray(const SkPoint a[2], const SkDLine& ray, SkIntersections* i) {
+static void line_intersect_ray(const SkPoint a[2], SkScalar , const SkDLine& ray,
+        SkIntersections* i) {
     SkDLine line;
     line.set(a);
     i->intersectRay(line, ray);
 }
 
-static void quad_intersect_ray(const SkPoint a[3], const SkDLine& ray, SkIntersections* i) {
+static void quad_intersect_ray(const SkPoint a[3], SkScalar , const SkDLine& ray,
+        SkIntersections* i) {
     SkDQuad quad;
     quad.set(a);
     i->intersectRay(quad, ray);
 }
 
-static void cubic_intersect_ray(const SkPoint a[4], const SkDLine& ray, SkIntersections* i) {
+static void conic_intersect_ray(const SkPoint a[3], SkScalar weight, const SkDLine& ray,
+        SkIntersections* i) {
+    SkDConic conic;
+    conic.set(a, weight);
+    i->intersectRay(conic, ray);
+}
+
+static void cubic_intersect_ray(const SkPoint a[4], SkScalar , const SkDLine& ray,
+        SkIntersections* i) {
     SkDCubic cubic;
     cubic.set(a);
     i->intersectRay(cubic, ray);
 }
 
-static void (* const CurveIntersectRay[])(const SkPoint[] , const SkDLine& , SkIntersections* ) = {
-    NULL,
+static void (* const CurveIntersectRay[])(const SkPoint[] , SkScalar , const SkDLine& ,
+        SkIntersections* ) = {
+    nullptr,
     line_intersect_ray,
     quad_intersect_ray,
+    conic_intersect_ray,
     cubic_intersect_ray
 };
 
+static int line_intercept_h(const SkPoint a[2], SkScalar , SkScalar y, double* roots) {
+    SkDLine line;
+    roots[0] = SkIntersections::HorizontalIntercept(line.set(a), y);
+    return between(0, roots[0], 1);
+}
+
+static int line_intercept_v(const SkPoint a[2], SkScalar , SkScalar x, double* roots) {
+    SkDLine line;
+    roots[0] = SkIntersections::VerticalIntercept(line.set(a), x);
+    return between(0, roots[0], 1);
+}
+
+static int quad_intercept_h(const SkPoint a[2], SkScalar , SkScalar y, double* roots) {
+    SkDQuad quad;
+    return SkIntersections::HorizontalIntercept(quad.set(a), y, roots);
+}
+
+static int quad_intercept_v(const SkPoint a[2], SkScalar , SkScalar x, double* roots) {
+    SkDQuad quad;
+    return SkIntersections::VerticalIntercept(quad.set(a), x, roots);
+}
+
+static int conic_intercept_h(const SkPoint a[2], SkScalar w, SkScalar y, double* roots) {
+    SkDConic conic;
+    return SkIntersections::HorizontalIntercept(conic.set(a, w), y, roots);
+}
+
+static int conic_intercept_v(const SkPoint a[2], SkScalar w, SkScalar x, double* roots) {
+    SkDConic conic;
+    return SkIntersections::VerticalIntercept(conic.set(a, w), x, roots);
+}
+
+static int cubic_intercept_h(const SkPoint a[3], SkScalar , SkScalar y, double* roots) {
+    SkDCubic cubic;
+    return cubic.set(a).horizontalIntersect(y, roots);
+}
+
+static int cubic_intercept_v(const SkPoint a[3], SkScalar , SkScalar x, double* roots) {
+    SkDCubic cubic;
+    return cubic.set(a).verticalIntersect(x, roots);
+}
+
+static int (* const CurveIntercept[])(const SkPoint[] , SkScalar , SkScalar , double* ) = {
+    nullptr,
+    nullptr,
+    line_intercept_h,
+    line_intercept_v,
+    quad_intercept_h,
+    quad_intercept_v,
+    conic_intercept_h,
+    conic_intercept_v,
+    cubic_intercept_h,
+    cubic_intercept_v,
+};
+
 #endif
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsDebug.cpp b/gfx/skia/skia/src/pathops/SkPathOpsDebug.cpp
index 7db93f5e969b..6dd9edd64e8a 100644
--- a/gfx/skia/skia/src/pathops/SkPathOpsDebug.cpp
+++ b/gfx/skia/skia/src/pathops/SkPathOpsDebug.cpp
@@ -5,19 +5,20 @@
  * found in the LICENSE file.
  */
 
-#include "SkPathOpsDebug.h"
+#include "SkMutex.h"
+#include "SkOpCoincidence.h"
+#include "SkOpContour.h"
 #include "SkPath.h"
+#include "SkPathOpsDebug.h"
+#include "SkString.h"
 
-#if defined SK_DEBUG || !FORCE_RELEASE
+struct SkCoincidentSpans;
 
-const char* SkPathOpsDebug::kLVerbStr[] = {"", "line", "quad", "cubic"};
-
-#if defined(SK_DEBUG) || !FORCE_RELEASE
-int SkPathOpsDebug::gContourID = 0;
-int SkPathOpsDebug::gSegmentID = 0;
+#if DEBUG_VALIDATE
+extern bool FLAGS_runFail;
 #endif
 
-#if DEBUG_SORT || DEBUG_SWAP_TOP
+#if DEBUG_SORT
 int SkPathOpsDebug::gSortCountDefault = SK_MaxS32;
 int SkPathOpsDebug::gSortCount;
 #endif
@@ -26,17 +27,169 @@ int SkPathOpsDebug::gSortCount;
 const char* SkPathOpsDebug::kPathOpStr[] = {"diff", "sect", "union", "xor"};
 #endif
 
-bool SkPathOpsDebug::ChaseContains(const SkTDArray<SkOpSpan *>& chaseArray,
-        const SkOpSpan* span) {
+#if defined SK_DEBUG || !FORCE_RELEASE
+
+const char* SkPathOpsDebug::kLVerbStr[] = {"", "line", "quad", "cubic"};
+
+int SkPathOpsDebug::gContourID = 0;
+int SkPathOpsDebug::gSegmentID = 0;
+
+bool SkPathOpsDebug::ChaseContains(const SkTDArray<SkOpSpanBase* >& chaseArray,
+        const SkOpSpanBase* span) {
     for (int index = 0; index < chaseArray.count(); ++index) {
-        const SkOpSpan* entry = chaseArray[index];
+        const SkOpSpanBase* entry = chaseArray[index];
         if (entry == span) {
             return true;
         }
     }
     return false;
 }
+#endif
 
+#if DEBUG_COINCIDENCE
+enum GlitchType {
+    kAddCorruptCoin_Glitch,
+    kAddExpandedCoin_Glitch,
+    kAddMissingCoin_Glitch,
+    kCollapsedCoin_Glitch,
+    kCollapsedDone_Glitch,
+    kCollapsedOppValue_Glitch,
+    kCollapsedSpan_Glitch,
+    kCollapsedWindValue_Glitch,
+    kDeletedCoin_Glitch,
+    kExpandCoin_Glitch,
+    kMarkCoinEnd_Glitch,
+    kMarkCoinInsert_Glitch,
+    kMissingCoin_Glitch,
+    kMissingDone_Glitch,
+    kMissingIntersection_Glitch,
+    kMoveMultiple_Glitch,
+    kUnaligned_Glitch,
+    kUnalignedHead_Glitch,
+    kUnalignedTail_Glitch,
+    kUndetachedSpan_Glitch,
+    kUnmergedSpan_Glitch,
+};
+
+static const int kGlitchType_Count = kUnmergedSpan_Glitch + 1;
+
+struct SpanGlitch {
+    const char* fStage;
+    const SkOpSpanBase* fBase;
+    const SkOpSpanBase* fSuspect;
+    const SkCoincidentSpans* fCoin;
+    const SkOpSegment* fSegment;
+    const SkOpPtT* fCoinSpan;
+    const SkOpPtT* fEndSpan;
+    const SkOpPtT* fOppSpan;
+    const SkOpPtT* fOppEndSpan;
+    double fT;
+    SkPoint fPt;
+    GlitchType fType;
+};
+
+struct SkPathOpsDebug::GlitchLog {
+    SpanGlitch* recordCommon(GlitchType type, const char* stage) {
+        SpanGlitch* glitch = fGlitches.push();
+        glitch->fStage = stage;
+        glitch->fBase = nullptr;
+        glitch->fSuspect = nullptr;
+        glitch->fCoin = nullptr;
+        glitch->fSegment = nullptr;
+        glitch->fCoinSpan = nullptr;
+        glitch->fEndSpan = nullptr;
+        glitch->fOppSpan = nullptr;
+        glitch->fOppEndSpan = nullptr;
+        glitch->fT = SK_ScalarNaN;
+        glitch->fPt = { SK_ScalarNaN, SK_ScalarNaN };
+        glitch->fType = type;
+        return glitch;
+    }
+
+    void record(GlitchType type, const char* stage, const SkOpSpanBase* base,
+            const SkOpSpanBase* suspect = NULL) {
+        SpanGlitch* glitch = recordCommon(type, stage);
+        glitch->fBase = base;
+        glitch->fSuspect = suspect;
+    }
+
+    void record(GlitchType type, const char* stage, const SkCoincidentSpans* coin,
+            const SkOpPtT* coinSpan) {
+        SpanGlitch* glitch = recordCommon(type, stage);
+        glitch->fCoin = coin;
+        glitch->fCoinSpan = coinSpan;
+    }
+
+    void record(GlitchType type, const char* stage, const SkOpSpanBase* base,
+            const SkOpSegment* seg, double t, SkPoint pt) {
+        SpanGlitch* glitch = recordCommon(type, stage);
+        glitch->fBase = base;
+        glitch->fSegment = seg;
+        glitch->fT = t;
+        glitch->fPt = pt;
+    }
+
+    void record(GlitchType type, const char* stage, const SkOpSpanBase* base, double t,
+            SkPoint pt) {
+        SpanGlitch* glitch = recordCommon(type, stage);
+        glitch->fBase = base;
+        glitch->fT = t;
+        glitch->fPt = pt;
+    }
+
+    void record(GlitchType type, const char* stage, const SkCoincidentSpans* coin,
+            const SkOpPtT* coinSpan, const SkOpPtT* endSpan) {
+        SpanGlitch* glitch = recordCommon(type, stage);
+        glitch->fCoin = coin;
+        glitch->fCoinSpan = coinSpan;
+        glitch->fEndSpan = endSpan;
+    }
+
+    void record(GlitchType type, const char* stage, const SkCoincidentSpans* coin,
+            const SkOpSpanBase* suspect) {
+        SpanGlitch* glitch = recordCommon(type, stage);
+        glitch->fSuspect = suspect;
+        glitch->fCoin = coin;
+    }
+
+    void record(GlitchType type, const char* stage, const SkOpPtT* ptTS, const SkOpPtT* ptTE,
+            const SkOpPtT* oPtTS, const SkOpPtT* oPtTE) {
+        SpanGlitch* glitch = recordCommon(type, stage);
+        glitch->fCoinSpan = ptTS;
+        glitch->fEndSpan = ptTE;
+        glitch->fOppSpan = oPtTS;
+        glitch->fOppEndSpan = oPtTE;
+    }
+
+    SkTDArray<SpanGlitch> fGlitches;
+};
+
+void SkPathOpsDebug::CheckHealth(SkOpContourHead* contourList, const char* id) {
+    GlitchLog glitches;
+    const SkOpContour* contour = contourList;
+    const SkOpCoincidence* coincidence = contour->globalState()->coincidence();
+    do {
+        contour->debugCheckHealth(id, &glitches);
+        contour->debugMissingCoincidence(id, &glitches, coincidence);
+    } while ((contour = contour->next()));
+    coincidence->debugFixAligned(id, &glitches);
+    coincidence->debugAddMissing(id, &glitches);
+    coincidence->debugExpand(id, &glitches);
+    coincidence->debugAddExpanded(id, &glitches);
+    coincidence->debugMark(id, &glitches);
+    unsigned mask = 0;
+    for (int index = 0; index < glitches.fGlitches.count(); ++index) {
+        const SpanGlitch& glitch = glitches.fGlitches[index];
+        mask |= 1 << glitch.fType;
+    }
+    for (int index = 0; index < kGlitchType_Count; ++index) {
+        SkDebugf(mask & (1 << index) ? "x" : "-");
+    }
+    SkDebugf("  %s\n", id);
+}
+#endif
+
+#if defined SK_DEBUG || !FORCE_RELEASE
 void SkPathOpsDebug::MathematicaIze(char* str, size_t bufferLen) {
     size_t len = strlen(str);
     bool num = false;
@@ -65,15 +218,13 @@ void SkPathOpsDebug::WindingPrintf(int wind) {
         SkDebugf("%d", wind);
     }
 }
+#endif //  defined SK_DEBUG || !FORCE_RELEASE
+
 
 #if DEBUG_SHOW_TEST_NAME
-void* SkPathOpsDebug::CreateNameStr() {
-    return SkNEW_ARRAY(char, DEBUG_FILENAME_STRING_LENGTH);
-}
+void* SkPathOpsDebug::CreateNameStr() { return new char[DEBUG_FILENAME_STRING_LENGTH]; }
 
-void SkPathOpsDebug::DeleteNameStr(void* v) {
-    SkDELETE_ARRAY(reinterpret_cast<char* >(v));
-}
+void SkPathOpsDebug::DeleteNameStr(void* v) { delete[] reinterpret_cast<char*>(v); }
 
 void SkPathOpsDebug::BumpTestName(char* test) {
     char* num = test + strlen(test);
@@ -92,16 +243,791 @@ void SkPathOpsDebug::BumpTestName(char* test) {
 }
 #endif
 
-#if !DEBUG_SHOW_TEST_NAME  // enable when building without extended test
-void SkPathOpsDebug::ShowPath(const SkPath& one, const SkPath& two, SkPathOp op, const char* name) {
+static void show_function_header(const char* functionName) {
+    SkDebugf("\nstatic void %s(skiatest::Reporter* reporter, const char* filename) {\n", functionName);
+    if (strcmp("skphealth_com76", functionName) == 0) {
+        SkDebugf("found it\n");
+    }
+}
+
+static const char* gOpStrs[] = {
+    "kDifference_SkPathOp",
+    "kIntersect_SkPathOp",
+    "kUnion_SkPathOp",
+    "kXor_PathOp",
+    "kReverseDifference_SkPathOp",
+};
+
+const char* SkPathOpsDebug::OpStr(SkPathOp op) {
+    return gOpStrs[op];
+}
+
+static void show_op(SkPathOp op, const char* pathOne, const char* pathTwo) {
+    SkDebugf("    testPathOp(reporter, %s, %s, %s, filename);\n", pathOne, pathTwo, gOpStrs[op]);
+    SkDebugf("}\n");
+}
+
+SK_DECLARE_STATIC_MUTEX(gTestMutex);
+
+void SkPathOpsDebug::ShowPath(const SkPath& a, const SkPath& b, SkPathOp shapeOp,
+        const char* testName) {
+    SkAutoMutexAcquire ac(gTestMutex);
+    show_function_header(testName);
+    ShowOnePath(a, "path", true);
+    ShowOnePath(b, "pathB", true);
+    show_op(shapeOp, "path", "pathB");
+}
+
+#include "SkPathOpsTypes.h"
+#include "SkIntersectionHelper.h"
+#include "SkIntersections.h"
+
+#if DEBUG_T_SECT_LOOP_COUNT
+void SkOpGlobalState::debugAddLoopCount(SkIntersections* i, const SkIntersectionHelper& wt,
+        const SkIntersectionHelper& wn) {
+    for (int index = 0; index < (int) SK_ARRAY_COUNT(fDebugLoopCount); ++index) {
+        SkIntersections::DebugLoop looper = (SkIntersections::DebugLoop) index;
+        if (fDebugLoopCount[index] >= i->debugLoopCount(looper)) {
+            continue;
+        }
+        fDebugLoopCount[index] = i->debugLoopCount(looper);
+        fDebugWorstVerb[index * 2] = wt.segment()->verb();
+        fDebugWorstVerb[index * 2 + 1] = wn.segment()->verb();
+        sk_bzero(&fDebugWorstPts[index * 8], sizeof(SkPoint) * 8);
+        memcpy(&fDebugWorstPts[index * 2 * 4], wt.pts(),
+                (SkPathOpsVerbToPoints(wt.segment()->verb()) + 1) * sizeof(SkPoint));
+        memcpy(&fDebugWorstPts[(index * 2 + 1) * 4], wn.pts(),
+                (SkPathOpsVerbToPoints(wn.segment()->verb()) + 1) * sizeof(SkPoint));
+        fDebugWorstWeight[index * 2] = wt.weight();
+        fDebugWorstWeight[index * 2 + 1] = wn.weight();
+    }
+    i->debugResetLoopCount();
+}
+
+void SkOpGlobalState::debugDoYourWorst(SkOpGlobalState* local) {
+    for (int index = 0; index < (int) SK_ARRAY_COUNT(fDebugLoopCount); ++index) {
+        if (fDebugLoopCount[index] >= local->fDebugLoopCount[index]) {
+            continue;
+        }
+        fDebugLoopCount[index] = local->fDebugLoopCount[index];
+        fDebugWorstVerb[index * 2] = local->fDebugWorstVerb[index * 2];
+        fDebugWorstVerb[index * 2 + 1] = local->fDebugWorstVerb[index * 2 + 1];
+        memcpy(&fDebugWorstPts[index * 2 * 4], &local->fDebugWorstPts[index * 2 * 4],
+                sizeof(SkPoint) * 8);
+        fDebugWorstWeight[index * 2] = local->fDebugWorstWeight[index * 2];
+        fDebugWorstWeight[index * 2 + 1] = local->fDebugWorstWeight[index * 2 + 1];
+    }
+    local->debugResetLoopCounts();
+}
+
+static void dump_curve(SkPath::Verb verb, const SkPoint& pts, float weight) {
+    if (!verb) {
+        return;
+    }
+    const char* verbs[] = { "", "line", "quad", "conic", "cubic" };
+    SkDebugf("%s: {{", verbs[verb]);
+    int ptCount = SkPathOpsVerbToPoints(verb);
+    for (int index = 0; index <= ptCount; ++index) {
+        SkDPoint::Dump((&pts)[index]);
+        if (index < ptCount - 1) {
+            SkDebugf(", ");
+        }
+    }
+    SkDebugf("}");
+    if (weight != 1) {
+        SkDebugf(", ");
+        if (weight == floorf(weight)) {
+            SkDebugf("%.0f", weight);
+        } else {
+            SkDebugf("%1.9gf", weight);
+        }
+    }
+    SkDebugf("}\n");
+}
+
+void SkOpGlobalState::debugLoopReport() {
+    const char* loops[] = { "iterations", "coinChecks", "perpCalcs" };
+    SkDebugf("\n");
+    for (int index = 0; index < (int) SK_ARRAY_COUNT(fDebugLoopCount); ++index) {
+        SkDebugf("%s: %d\n", loops[index], fDebugLoopCount[index]);
+        dump_curve(fDebugWorstVerb[index * 2], fDebugWorstPts[index * 2 * 4],
+                fDebugWorstWeight[index * 2]);
+        dump_curve(fDebugWorstVerb[index * 2 + 1], fDebugWorstPts[(index * 2 + 1) * 4],
+                fDebugWorstWeight[index * 2 + 1]);
+    }
+}
+
+void SkOpGlobalState::debugResetLoopCounts() {
+    sk_bzero(fDebugLoopCount, sizeof(fDebugLoopCount));
+    sk_bzero(fDebugWorstVerb, sizeof(fDebugWorstVerb));
+    sk_bzero(fDebugWorstPts, sizeof(fDebugWorstPts));
+    sk_bzero(fDebugWorstWeight, sizeof(fDebugWorstWeight));
 }
 #endif
 
-#endif //  defined SK_DEBUG || !FORCE_RELEASE
+#ifdef SK_DEBUG
+bool SkOpGlobalState::debugRunFail() const {
+#if DEBUG_VALIDATE
+    return FLAGS_runFail;
+#else
+    return false;
+#endif
+}
+#endif
+
+#if DEBUG_T_SECT_LOOP_COUNT
+void SkIntersections::debugBumpLoopCount(DebugLoop index) {
+    fDebugLoopCount[index]++;
+}
+
+int SkIntersections::debugLoopCount(DebugLoop index) const {
+    return fDebugLoopCount[index];
+}
+
+void SkIntersections::debugResetLoopCount() {
+    sk_bzero(fDebugLoopCount, sizeof(fDebugLoopCount));
+}
+#endif
+
+#include "SkPathOpsCubic.h"
+#include "SkPathOpsQuad.h"
+
+SkDCubic SkDQuad::debugToCubic() const {
+    SkDCubic cubic;
+    cubic[0] = fPts[0];
+    cubic[2] = fPts[1];
+    cubic[3] = fPts[2];
+    cubic[1].fX = (cubic[0].fX + cubic[2].fX * 2) / 3;
+    cubic[1].fY = (cubic[0].fY + cubic[2].fY * 2) / 3;
+    cubic[2].fX = (cubic[3].fX + cubic[2].fX * 2) / 3;
+    cubic[2].fY = (cubic[3].fY + cubic[2].fY * 2) / 3;
+    return cubic;
+}
+
+void SkDRect::debugInit() {
+    fLeft = fTop = fRight = fBottom = SK_ScalarNaN;
+}
 
 #include "SkOpAngle.h"
 #include "SkOpSegment.h"
 
+#if DEBUG_COINCIDENCE
+void SkOpSegment::debugAddAlignIntersection(const char* id, SkPathOpsDebug::GlitchLog* log,
+        const SkOpPtT& endPtT, const SkPoint& oldPt,  const SkOpContourHead* contourList) const {
+    const SkPoint& newPt = endPtT.fPt;
+    if (newPt == oldPt) {
+        return;
+    }
+    SkPoint line[2] = { newPt, oldPt };
+    SkPathOpsBounds lineBounds;
+    lineBounds.setBounds(line, 2);
+    SkDLine aLine;
+    aLine.set(line);
+    const SkOpContour* current = contourList;
+    do {
+        if (!SkPathOpsBounds::Intersects(current->bounds(), lineBounds)) {
+            continue;
+        }
+        const SkOpSegment* segment = current->first();
+        do {
+            if (!SkPathOpsBounds::Intersects(segment->bounds(), lineBounds)) {
+                continue;
+            }
+            if (newPt == segment->fPts[0]) {
+                continue;
+            }
+            if (newPt == segment->fPts[SkPathOpsVerbToPoints(segment->fVerb)]) {
+                continue;
+            }
+            if (oldPt == segment->fPts[0]) {
+                continue;
+            }
+            if (oldPt == segment->fPts[SkPathOpsVerbToPoints(segment->fVerb)]) {
+                continue;
+            }
+            if (endPtT.debugContains(segment)) {
+                continue;
+            }
+            SkIntersections i;
+            switch (segment->fVerb) {
+                case SkPath::kLine_Verb: {
+                    SkDLine bLine;
+                    bLine.set(segment->fPts);
+                    i.intersect(bLine, aLine);
+                    } break;
+                case SkPath::kQuad_Verb: {
+                    SkDQuad bQuad;
+                    bQuad.set(segment->fPts);
+                    i.intersect(bQuad, aLine);
+                    } break;
+                case SkPath::kConic_Verb: {
+                    SkDConic bConic;
+                    bConic.set(segment->fPts, segment->fWeight);
+                    i.intersect(bConic, aLine);
+                    } break;
+                case SkPath::kCubic_Verb: {
+                    SkDCubic bCubic;
+                    bCubic.set(segment->fPts);
+                    i.intersect(bCubic, aLine);
+                    } break;
+                default:
+                    SkASSERT(0);
+            }
+            if (i.used()) {
+                SkASSERT(i.used() == 1);
+                SkASSERT(!zero_or_one(i[0][0]));
+                SkOpSpanBase* checkSpan = fHead.next();
+                while (!checkSpan->final()) {
+                    if (checkSpan->contains(segment)) {
+                        goto nextSegment;
+                    }
+                    checkSpan = checkSpan->upCast()->next();
+                }
+                log->record(kMissingIntersection_Glitch, id, checkSpan, segment, i[0][0], newPt);
+            }
+    nextSegment:
+            ;
+        } while ((segment = segment->next()));
+    } while ((current = current->next()));
+}
+
+bool SkOpSegment::debugAddMissing(double t, const SkOpSegment* opp) const {
+    const SkOpSpanBase* existing = nullptr;
+    const SkOpSpanBase* test = &fHead;
+    double testT;
+    do {
+        if ((testT = test->ptT()->fT) >= t) {
+            if (testT == t) {
+                existing = test;
+            }
+            break;
+        }
+    } while ((test = test->upCast()->next()));
+    return !existing || !existing->debugContains(opp);
+}
+
+void SkOpSegment::debugAlign(const char* id, SkPathOpsDebug::GlitchLog* glitches) const {
+    const SkOpSpanBase* span = &fHead;
+    if (!span->aligned()) {
+        if (!span->debugAlignedEnd(0, fPts[0])) {
+            glitches->record(kUnalignedHead_Glitch, id, span);
+        }
+    }
+    while ((span = span->upCast()->next())) {
+        if (span == &fTail) {
+            break;
+        }
+        if (!span->aligned()) {
+            glitches->record(kUnaligned_Glitch, id, span);
+        }
+    }
+    if (!span->aligned()) {
+        span->debugAlignedEnd(1, fPts[SkPathOpsVerbToPoints(fVerb)]);
+    }
+    if (this->collapsed()) {
+        const SkOpSpan* span = &fHead;
+        do {
+            if (span->windValue()) {
+                glitches->record(kCollapsedWindValue_Glitch, id, span);
+            }
+            if (span->oppValue()) {
+                glitches->record(kCollapsedOppValue_Glitch, id, span);
+            }
+            if (!span->done()) {
+                glitches->record(kCollapsedDone_Glitch, id, span);
+            }
+        } while ((span = span->next()->upCastable()));
+    }
+}
+#endif
+
+#if DEBUG_ANGLE
+void SkOpSegment::debugCheckAngleCoin() const {
+    const SkOpSpanBase* base = &fHead;
+    const SkOpSpan* span;
+    do {
+        const SkOpAngle* angle = base->fromAngle();
+        if (angle && angle->fCheckCoincidence) {
+            angle->debugCheckNearCoincidence();
+        }
+        if (base->final()) {
+             break;
+        }
+        span = base->upCast();
+        angle = span->toAngle();
+        if (angle && angle->fCheckCoincidence) {
+            angle->debugCheckNearCoincidence();
+        }
+    } while ((base = span->next()));
+}
+#endif
+
+#if DEBUG_COINCIDENCE
+// this mimics the order of the checks in handle coincidence
+void SkOpSegment::debugCheckHealth(const char* id, SkPathOpsDebug::GlitchLog* glitches) const {
+    debugMoveMultiples(id, glitches);
+    debugFindCollapsed(id, glitches);
+    debugMoveNearby(id, glitches);
+    debugAlign(id, glitches);
+    debugAddAlignIntersections(id, glitches, this->globalState()->contourHead());
+
+}
+
+void SkOpSegment::debugFindCollapsed(const char* id, SkPathOpsDebug::GlitchLog* glitches) const {
+    if (fHead.contains(&fTail)) {
+        const SkOpSpan* span = this->head();
+        bool missingDone = false;
+        do {
+            missingDone |= !span->done();
+        } while ((span = span->next()->upCastable()));
+        if (missingDone) {
+            glitches->record(kMissingDone_Glitch, id, &fHead);
+        }
+        if (!fHead.debugAlignedEnd(0, fHead.pt())) {
+            glitches->record(kUnalignedHead_Glitch, id, &fHead);
+        }
+        if (!fTail.aligned()) {
+            glitches->record(kUnalignedTail_Glitch, id, &fTail);
+        }
+    }
+}
+#endif
+
+SkOpAngle* SkOpSegment::debugLastAngle() {
+    SkOpAngle* result = nullptr;
+    SkOpSpan* span = this->head();
+    do {
+        if (span->toAngle()) {
+            SkASSERT(!result);
+            result = span->toAngle();
+        }
+    } while ((span = span->next()->upCastable()));
+    SkASSERT(result);
+    return result;
+}
+
+#if DEBUG_COINCIDENCE
+void SkOpSegment::debugMissingCoincidence(const char* id, SkPathOpsDebug::GlitchLog* log,
+        const SkOpCoincidence* coincidences) const {
+    if (this->verb() != SkPath::kLine_Verb) {
+        return;
+    }
+    if (this->done()) {
+        return;
+    }
+    const SkOpSpan* prior = nullptr;
+    const SkOpSpanBase* spanBase = &fHead;
+    do {
+        const SkOpPtT* ptT = spanBase->ptT(), * spanStopPtT = ptT;
+        SkASSERT(ptT->span() == spanBase);
+        while ((ptT = ptT->next()) != spanStopPtT) {
+            if (ptT->deleted()) {
+                continue;
+            }
+            SkOpSegment* opp = ptT->span()->segment();
+//            if (opp->verb() == SkPath::kLine_Verb) {
+//                continue;
+//            }
+            if (opp->done()) {
+                continue;
+            }
+            // when opp is encounted the 1st time, continue; on 2nd encounter, look for coincidence
+            if (!opp->visited()) {
+                continue;
+            }
+            if (spanBase == &fHead) {
+                continue;
+            }
+            const SkOpSpan* span = spanBase->upCastable();
+            // FIXME?: this assumes that if the opposite segment is coincident then no more
+            // coincidence needs to be detected. This may not be true.
+            if (span && span->segment() != opp && span->containsCoincidence(opp)) {
+                continue;
+            }
+            if (spanBase->segment() != opp && spanBase->containsCoinEnd(opp)) {
+                continue;
+            } 
+            const SkOpPtT* priorPtT = nullptr, * priorStopPtT;
+            // find prior span containing opp segment
+            const SkOpSegment* priorOpp = nullptr;
+            const SkOpSpan* priorTest = spanBase->prev();
+            while (!priorOpp && priorTest) {
+                priorStopPtT = priorPtT = priorTest->ptT();
+                while ((priorPtT = priorPtT->next()) != priorStopPtT) {
+                    if (priorPtT->deleted()) {
+                        continue;
+                    }
+                    SkOpSegment* segment = priorPtT->span()->segment();
+                    if (segment == opp) {
+                        prior = priorTest;
+                        priorOpp = opp;
+                        break;
+                    }
+                }
+                priorTest = priorTest->prev();
+            }
+            if (!priorOpp) {
+                continue;
+            }
+            const SkOpPtT* oppStart = prior->ptT();
+            const SkOpPtT* oppEnd = spanBase->ptT();
+            bool swapped = priorPtT->fT > ptT->fT;
+            if (swapped) {
+                SkTSwap(priorPtT, ptT);
+                SkTSwap(oppStart, oppEnd);
+            }
+            bool flipped = oppStart->fT > oppEnd->fT;
+            bool coincident = false;
+            if (coincidences->contains(priorPtT, ptT, oppStart, oppEnd, flipped)) {
+                goto swapBack;
+            }
+            if (opp->verb() == SkPath::kLine_Verb) {
+                coincident = (SkDPoint::ApproximatelyEqual(priorPtT->fPt, oppStart->fPt) ||
+                        SkDPoint::ApproximatelyEqual(priorPtT->fPt, oppEnd->fPt)) &&
+                        (SkDPoint::ApproximatelyEqual(ptT->fPt, oppStart->fPt) ||
+                        SkDPoint::ApproximatelyEqual(ptT->fPt, oppEnd->fPt));
+            }
+            if (!coincident) {
+                coincident = testForCoincidence(priorPtT, ptT, prior, spanBase, opp, 5000);
+            }
+            if (coincident) {
+                log->record(kMissingCoin_Glitch, id, priorPtT, ptT, oppStart, oppEnd);
+            }
+    swapBack:
+            if (swapped) {
+                SkTSwap(priorPtT, ptT);
+            }
+        }
+    } while ((spanBase = spanBase->final() ? nullptr : spanBase->upCast()->next()));
+}
+
+void SkOpSegment::debugMoveMultiples(const char* id, SkPathOpsDebug::GlitchLog* glitches) const {
+    const SkOpSpanBase* test = &fHead;
+    do {
+        int addCount = test->spanAddsCount();
+        SkASSERT(addCount >= 1);
+        if (addCount == 1) {
+            continue;
+        }
+        const SkOpPtT* startPtT = test->ptT();
+        const SkOpPtT* testPtT = startPtT;
+        do {  // iterate through all spans associated with start
+            const SkOpSpanBase* oppSpan = testPtT->span();
+            if (oppSpan->spanAddsCount() == addCount) {
+                continue;
+            }
+            if (oppSpan->deleted()) {
+                continue;
+            }
+            const SkOpSegment* oppSegment = oppSpan->segment();
+            if (oppSegment == this) {
+                continue;
+            }
+            // find range of spans to consider merging
+            const SkOpSpanBase* oppPrev = oppSpan;
+            const SkOpSpanBase* oppFirst = oppSpan;
+            while ((oppPrev = oppPrev->prev())) {
+                if (!roughly_equal(oppPrev->t(), oppSpan->t())) {
+                    break;
+                }
+                if (oppPrev->spanAddsCount() == addCount) {
+                    continue;
+                }
+                if (oppPrev->deleted()) {
+                    continue;
+                }
+                oppFirst = oppPrev;
+            }
+            const SkOpSpanBase* oppNext = oppSpan;
+            const SkOpSpanBase* oppLast = oppSpan;
+            while ((oppNext = oppNext->final() ? nullptr : oppNext->upCast()->next())) {
+                if (!roughly_equal(oppNext->t(), oppSpan->t())) {
+                    break;
+                }
+                if (oppNext->spanAddsCount() == addCount) {
+                    continue;
+                }
+                if (oppNext->deleted()) {
+                    continue;
+                }
+                oppLast = oppNext;
+            }
+            if (oppFirst == oppLast) {
+                continue;
+            }
+            const SkOpSpanBase* oppTest = oppFirst;
+            do {
+                if (oppTest == oppSpan) {
+                    continue;
+                }
+                // check to see if the candidate meets specific criteria:
+                // it contains spans of segments in test's loop but not including 'this'
+                const SkOpPtT* oppStartPtT = oppTest->ptT();
+                const SkOpPtT* oppPtT = oppStartPtT;
+                while ((oppPtT = oppPtT->next()) != oppStartPtT) {
+                    const SkOpSegment* oppPtTSegment = oppPtT->segment();
+                    if (oppPtTSegment == this) {
+                        goto tryNextSpan;
+                    }
+                    const SkOpPtT* matchPtT = startPtT;
+                    do {
+                        if (matchPtT->segment() == oppPtTSegment) {
+                            goto foundMatch;
+                        }
+                    } while ((matchPtT = matchPtT->next()) != startPtT);
+                    goto tryNextSpan;
+            foundMatch:  // merge oppTest and oppSpan
+                    if (oppTest == &oppSegment->fTail || oppTest == &oppSegment->fHead) {
+                        SkASSERT(oppSpan != &oppSegment->fHead); // don't expect collapse
+                        SkASSERT(oppSpan != &oppSegment->fTail);
+                        glitches->record(kMoveMultiple_Glitch, id, oppTest, oppSpan);
+                    } else {
+                        glitches->record(kMoveMultiple_Glitch, id, oppSpan, oppTest);
+                    }
+                    goto checkNextSpan;
+                }
+        tryNextSpan: 
+                ;
+            } while (oppTest != oppLast && (oppTest = oppTest->upCast()->next()));
+        } while ((testPtT = testPtT->next()) != startPtT);
+checkNextSpan: 
+        ;
+    } while ((test = test->final() ? nullptr : test->upCast()->next()));
+}
+
+void SkOpSegment::debugMoveNearby(const char* id, SkPathOpsDebug::GlitchLog* glitches) const {
+        const SkOpSpanBase* spanS = &fHead;
+    do {
+        const SkOpSpanBase* test = spanS->upCast()->next();
+        const SkOpSpanBase* next;
+        if (spanS->contains(test)) {
+            if (!test->final()) {
+                glitches->record(kUndetachedSpan_Glitch, id, test, spanS);
+            } else if (spanS != &fHead) {
+                glitches->record(kUndetachedSpan_Glitch, id, spanS, test);
+            }
+        }
+        do {  // iterate through all spans associated with start
+            const SkOpPtT* startBase = spanS->ptT();
+            next = test->final() ? nullptr : test->upCast()->next();
+            do {
+                const SkOpPtT* testBase = test->ptT();
+                do {
+                    if (startBase == testBase) {
+                        goto checkNextSpan;
+                    }
+                    if (testBase->duplicate()) {
+                        continue;
+                    }
+                    if (this->match(startBase, testBase->segment(), testBase->fT, testBase->fPt)) {
+                        if (test == &this->fTail) {
+                            if (spanS == &fHead) {
+                                glitches->record(kCollapsedSpan_Glitch, id, spanS);
+                            } else {
+                                glitches->record(kUnmergedSpan_Glitch, id, &this->fTail, spanS);
+                            }
+                        } else {
+                            glitches->record(kUnmergedSpan_Glitch, id, spanS, test);
+                            goto checkNextSpan;
+                        }
+                    }
+                } while ((testBase = testBase->next()) != test->ptT());
+            } while ((startBase = startBase->next()) != spanS->ptT());
+    checkNextSpan:
+            ;
+        } while ((test = next));
+        spanS = spanS->upCast()->next();
+    } while (!spanS->final());
+}
+#endif
+
+void SkOpSegment::debugReset() {
+    this->init(this->fPts, this->fWeight, this->contour(), this->verb());
+}
+
+#if DEBUG_ACTIVE_SPANS
+void SkOpSegment::debugShowActiveSpans() const {
+    debugValidate();
+    if (done()) {
+        return;
+    }
+    int lastId = -1;
+    double lastT = -1;
+    const SkOpSpan* span = &fHead;
+    do {
+        if (span->done()) {
+            continue;
+        }
+        if (lastId == this->debugID() && lastT == span->t()) {
+            continue;
+        }
+        lastId = this->debugID();
+        lastT = span->t();
+        SkDebugf("%s id=%d", __FUNCTION__, this->debugID());
+        SkDebugf(" (%1.9g,%1.9g", fPts[0].fX, fPts[0].fY);
+        for (int vIndex = 1; vIndex <= SkPathOpsVerbToPoints(fVerb); ++vIndex) {
+            SkDebugf(" %1.9g,%1.9g", fPts[vIndex].fX, fPts[vIndex].fY);
+        }
+        if (SkPath::kConic_Verb == fVerb) {
+            SkDebugf(" %1.9gf", fWeight);
+        }
+        const SkOpPtT* ptT = span->ptT();
+        SkDebugf(") t=%1.9g (%1.9g,%1.9g)", ptT->fT, ptT->fPt.fX, ptT->fPt.fY);
+        SkDebugf(" tEnd=%1.9g", span->next()->t());
+        if (span->windSum() == SK_MinS32) {
+            SkDebugf(" windSum=?");
+        } else {
+            SkDebugf(" windSum=%d", span->windSum());
+        }
+        if (span->oppValue() && span->oppSum() == SK_MinS32) {
+            SkDebugf(" oppSum=?");
+        } else if (span->oppValue() || span->oppSum() != SK_MinS32) {
+            SkDebugf(" oppSum=%d", span->oppSum());
+        }
+        SkDebugf(" windValue=%d", span->windValue());
+        if (span->oppValue() || span->oppSum() != SK_MinS32) {
+            SkDebugf(" oppValue=%d", span->oppValue());
+        }
+        SkDebugf("\n");
+   } while ((span = span->next()->upCastable()));
+}
+#endif
+
+#if DEBUG_MARK_DONE
+void SkOpSegment::debugShowNewWinding(const char* fun, const SkOpSpan* span, int winding) {
+    const SkPoint& pt = span->ptT()->fPt;
+    SkDebugf("%s id=%d", fun, this->debugID());
+    SkDebugf(" (%1.9g,%1.9g", fPts[0].fX, fPts[0].fY);
+    for (int vIndex = 1; vIndex <= SkPathOpsVerbToPoints(fVerb); ++vIndex) {
+        SkDebugf(" %1.9g,%1.9g", fPts[vIndex].fX, fPts[vIndex].fY);
+    }
+    SkDebugf(") t=%1.9g [%d] (%1.9g,%1.9g) tEnd=%1.9g newWindSum=",
+            span->t(), span->debugID(), pt.fX, pt.fY, span->next()->t());
+    if (winding == SK_MinS32) {
+        SkDebugf("?");
+    } else {
+        SkDebugf("%d", winding);
+    }
+    SkDebugf(" windSum=");
+    if (span->windSum() == SK_MinS32) {
+        SkDebugf("?");
+    } else {
+        SkDebugf("%d", span->windSum());
+    }
+    SkDebugf(" windValue=%d\n", span->windValue());
+}
+
+void SkOpSegment::debugShowNewWinding(const char* fun, const SkOpSpan* span, int winding,
+                                      int oppWinding) {
+    const SkPoint& pt = span->ptT()->fPt;
+    SkDebugf("%s id=%d", fun, this->debugID());
+    SkDebugf(" (%1.9g,%1.9g", fPts[0].fX, fPts[0].fY);
+    for (int vIndex = 1; vIndex <= SkPathOpsVerbToPoints(fVerb); ++vIndex) {
+        SkDebugf(" %1.9g,%1.9g", fPts[vIndex].fX, fPts[vIndex].fY);
+    }
+    SkDebugf(") t=%1.9g [%d] (%1.9g,%1.9g) tEnd=%1.9g newWindSum=",
+            span->t(), span->debugID(), pt.fX, pt.fY, span->next()->t(), winding, oppWinding);
+    if (winding == SK_MinS32) {
+        SkDebugf("?");
+    } else {
+        SkDebugf("%d", winding);
+    }
+    SkDebugf(" newOppSum=");
+    if (oppWinding == SK_MinS32) {
+        SkDebugf("?");
+    } else {
+        SkDebugf("%d", oppWinding);
+    }
+    SkDebugf(" oppSum=");
+    if (span->oppSum() == SK_MinS32) {
+        SkDebugf("?");
+    } else {
+        SkDebugf("%d", span->oppSum());
+    }
+    SkDebugf(" windSum=");
+    if (span->windSum() == SK_MinS32) {
+        SkDebugf("?");
+    } else {
+        SkDebugf("%d", span->windSum());
+    }
+    SkDebugf(" windValue=%d oppValue=%d\n", span->windValue(), span->oppValue());
+}
+
+#endif
+
+// loop looking for a pair of angle parts that are too close to be sorted
+/* This is called after other more simple intersection and angle sorting tests have been exhausted.
+   This should be rarely called -- the test below is thorough and time consuming.
+   This checks the distance between start points; the distance between 
+*/
+#if DEBUG_ANGLE
+void SkOpAngle::debugCheckNearCoincidence() const {
+    const SkOpAngle* test = this;
+    do {
+        const SkOpSegment* testSegment = test->segment();
+        double testStartT = test->start()->t();
+        SkDPoint testStartPt = testSegment->dPtAtT(testStartT);
+        double testEndT = test->end()->t();
+        SkDPoint testEndPt = testSegment->dPtAtT(testEndT);
+        double testLenSq = testStartPt.distanceSquared(testEndPt);
+        SkDebugf("%s testLenSq=%1.9g id=%d\n", __FUNCTION__, testLenSq, testSegment->debugID());
+        double testMidT = (testStartT + testEndT) / 2;
+        const SkOpAngle* next = test;
+        while ((next = next->fNext) != this) {
+            SkOpSegment* nextSegment = next->segment();
+            double testMidDistSq = testSegment->distSq(testMidT, next);
+            double testEndDistSq = testSegment->distSq(testEndT, next);
+            double nextStartT = next->start()->t();
+            SkDPoint nextStartPt = nextSegment->dPtAtT(nextStartT);
+            double distSq = testStartPt.distanceSquared(nextStartPt);
+            double nextEndT = next->end()->t();
+            double nextMidT = (nextStartT + nextEndT) / 2;
+            double nextMidDistSq = nextSegment->distSq(nextMidT, test);
+            double nextEndDistSq = nextSegment->distSq(nextEndT, test);
+            SkDebugf("%s distSq=%1.9g testId=%d nextId=%d\n", __FUNCTION__, distSq,
+                    testSegment->debugID(), nextSegment->debugID());
+            SkDebugf("%s testMidDistSq=%1.9g\n", __FUNCTION__, testMidDistSq);
+            SkDebugf("%s testEndDistSq=%1.9g\n", __FUNCTION__, testEndDistSq);
+            SkDebugf("%s nextMidDistSq=%1.9g\n", __FUNCTION__, nextMidDistSq);
+            SkDebugf("%s nextEndDistSq=%1.9g\n", __FUNCTION__, nextEndDistSq);
+            SkDPoint nextEndPt = nextSegment->dPtAtT(nextEndT);
+            double nextLenSq = nextStartPt.distanceSquared(nextEndPt);
+            SkDebugf("%s nextLenSq=%1.9g\n", __FUNCTION__, nextLenSq);
+            SkDebugf("\n");
+        }
+        test = test->fNext;
+    } while (test->fNext != this); 
+}
+#endif
+
+#if DEBUG_ANGLE
+SkString SkOpAngle::debugPart() const {
+    SkString result;
+    switch (this->segment()->verb()) {
+        case SkPath::kLine_Verb:
+            result.printf(LINE_DEBUG_STR " id=%d", LINE_DEBUG_DATA(fCurvePart),
+                    this->segment()->debugID());
+            break;
+        case SkPath::kQuad_Verb:
+            result.printf(QUAD_DEBUG_STR " id=%d", QUAD_DEBUG_DATA(fCurvePart),
+                    this->segment()->debugID());
+            break;
+        case SkPath::kConic_Verb:
+            result.printf(CONIC_DEBUG_STR " id=%d",
+                    CONIC_DEBUG_DATA(fCurvePart, fCurvePart.fConic.fWeight),
+                    this->segment()->debugID());
+            break;
+        case SkPath::kCubic_Verb:
+            result.printf(CUBIC_DEBUG_STR " id=%d", CUBIC_DEBUG_DATA(fCurvePart),
+                    this->segment()->debugID());
+            break;
+        default:
+            SkASSERT(0);
+    }
+    return result;
+}
+#endif
+
 #if DEBUG_SORT
 void SkOpAngle::debugLoop() const {
     const SkOpAngle* first = this;
@@ -111,25 +1037,59 @@ void SkOpAngle::debugLoop() const {
         SkDebugf("\n");
         next = next->fNext;
     } while (next && next != first);
+    next = first;
+    do {
+        next->debugValidate();
+        next = next->fNext;
+    } while (next && next != first);
 }
 #endif
 
-#if DEBUG_ANGLE
-void SkOpAngle::debugSameAs(const SkOpAngle* compare) const {
-    SK_ALWAYSBREAK(fSegment == compare->fSegment);
-    const SkOpSpan& startSpan = fSegment->span(fStart);
-    const SkOpSpan& oStartSpan = fSegment->span(compare->fStart);
-    SK_ALWAYSBREAK(startSpan.fToAngle == oStartSpan.fToAngle);
-    SK_ALWAYSBREAK(startSpan.fFromAngle == oStartSpan.fFromAngle);
-    const SkOpSpan& endSpan = fSegment->span(fEnd);
-    const SkOpSpan& oEndSpan = fSegment->span(compare->fEnd);
-    SK_ALWAYSBREAK(endSpan.fToAngle == oEndSpan.fToAngle);
-    SK_ALWAYSBREAK(endSpan.fFromAngle == oEndSpan.fFromAngle);
-}
-#endif
-
+void SkOpAngle::debugValidate() const {
 #if DEBUG_VALIDATE
+    const SkOpAngle* first = this;
+    const SkOpAngle* next = this;
+    int wind = 0;
+    int opp = 0;
+    int lastXor = -1;
+    int lastOppXor = -1;
+    do {
+        if (next->unorderable()) {
+            return;
+        }
+        const SkOpSpan* minSpan = next->start()->starter(next->end());
+        if (minSpan->windValue() == SK_MinS32) {
+            return;
+        }
+        bool op = next->segment()->operand();
+        bool isXor = next->segment()->isXor();
+        bool oppXor = next->segment()->oppXor();
+        SkASSERT(!DEBUG_LIMIT_WIND_SUM || between(0, minSpan->windValue(), DEBUG_LIMIT_WIND_SUM));
+        SkASSERT(!DEBUG_LIMIT_WIND_SUM
+                || between(-DEBUG_LIMIT_WIND_SUM, minSpan->oppValue(), DEBUG_LIMIT_WIND_SUM));
+        bool useXor = op ? oppXor : isXor;
+        SkASSERT(lastXor == -1 || lastXor == (int) useXor);
+        lastXor = (int) useXor;
+        wind += next->debugSign() * (op ? minSpan->oppValue() : minSpan->windValue());
+        if (useXor) {
+            wind &= 1;
+        }
+        useXor = op ? isXor : oppXor;
+        SkASSERT(lastOppXor == -1 || lastOppXor == (int) useXor);
+        lastOppXor = (int) useXor;
+        opp += next->debugSign() * (op ? minSpan->windValue() : minSpan->oppValue());
+        if (useXor) {
+            opp &= 1;
+        }
+        next = next->fNext;
+    } while (next && next != first);
+    SkASSERT(wind == 0 || !FLAGS_runFail);
+    SkASSERT(opp == 0 || !FLAGS_runFail);
+#endif
+}
+
 void SkOpAngle::debugValidateNext() const {
+#if !FORCE_RELEASE
     const SkOpAngle* first = this;
     const SkOpAngle* next = first;
     SkTDArray<const SkOpAngle*>(angles);
@@ -145,422 +1105,750 @@ void SkOpAngle::debugValidateNext() const {
             return;
         }
     } while (true);
+#endif
 }
 
-void SkOpAngle::debugValidateLoop() const {
-    const SkOpAngle* first = this;
-    const SkOpAngle* next = first;
-    SK_ALWAYSBREAK(first->next() != first);
-    int signSum = 0;
-    int oppSum = 0;
-    bool firstOperand = fSegment->operand();
-    bool unorderable = false;
-    do {
-        unorderable |= next->fUnorderable;
-        const SkOpSegment* segment = next->fSegment;
-        bool operandsMatch = firstOperand == segment->operand();
-        signSum += operandsMatch ? segment->spanSign(next) : segment->oppSign(next);
-        oppSum += operandsMatch ? segment->oppSign(next) : segment->spanSign(next);
-        const SkOpSpan& span = segment->span(SkMin32(next->fStart, next->fEnd));
-        if (segment->_xor()) {
-//            SK_ALWAYSBREAK(span.fWindValue == 1);
-//            SK_ALWAYSBREAK(span.fWindSum == SK_MinS32 || span.fWindSum == 1);
-        }
-        if (segment->oppXor()) {
-            SK_ALWAYSBREAK(span.fOppValue == 0 || abs(span.fOppValue) == 1);
-//            SK_ALWAYSBREAK(span.fOppSum == SK_MinS32 || span.fOppSum == 0 || abs(span.fOppSum) == 1);
-        }
-        next = next->next();
-        if (!next) {
-            return;
-        }
-    } while (next != first);
-    if (unorderable) {
+
+#if DEBUG_COINCIDENCE
+void SkOpCoincidence::debugAddExpanded(const char* id, SkPathOpsDebug::GlitchLog* log) const {
+    // for each coincident pair, match the spans
+    // if the spans don't match, add the mssing pt to the segment and loop it in the opposite span
+    const SkCoincidentSpans* coin = this->fHead;
+    if (!coin) {
+        coin = this->fTop;
+    }
+    if (!coin) {
         return;
     }
-    SK_ALWAYSBREAK(!signSum || fSegment->_xor());
-    SK_ALWAYSBREAK(!oppSum || fSegment->oppXor());
-    int lastWinding;
-    int lastOppWinding;
-    int winding;
-    int oppWinding;
     do {
-        const SkOpSegment* segment = next->fSegment;
-        const SkOpSpan& span = segment->span(SkMin32(next->fStart, next->fEnd));
-        winding = span.fWindSum;
-        if (winding != SK_MinS32) {
-//            SK_ALWAYSBREAK(winding != 0);
-            SK_ALWAYSBREAK(SkPathOpsDebug::ValidWind(winding));
-            lastWinding = winding;
-            int diffWinding = segment->spanSign(next);
-            if (!segment->_xor()) {
-                SK_ALWAYSBREAK(diffWinding != 0);
-                bool sameSign = (winding > 0) == (diffWinding > 0);
-                winding -= sameSign ? diffWinding : -diffWinding;
-                SK_ALWAYSBREAK(SkPathOpsDebug::ValidWind(winding));
-                SK_ALWAYSBREAK(abs(winding) <= abs(lastWinding));
-                if (!sameSign) {
-                    SkTSwap(winding, lastWinding);
+        const SkOpPtT* startPtT = coin->fCoinPtTStart;
+        const SkOpPtT* oStartPtT = coin->fOppPtTStart;
+        SkASSERT(startPtT->contains(oStartPtT));
+        SkASSERT(coin->fCoinPtTEnd->contains(coin->fOppPtTEnd));
+        const SkOpSpanBase* start = startPtT->span();
+        const SkOpSpanBase* oStart = oStartPtT->span();
+        const SkOpSpanBase* end = coin->fCoinPtTEnd->span();
+        const SkOpSpanBase* oEnd = coin->fOppPtTEnd->span();
+        const SkOpSpanBase* test = start->upCast()->next();
+        const SkOpSpanBase* oTest = coin->fFlipped ? oStart->prev() : oStart->upCast()->next();
+        while (test != end || oTest != oEnd) {
+            bool bumpTest = true;
+            bool bumpOTest = true;
+            if (!test->ptT()->contains(oTest->ptT())) {
+                // use t ranges to guess which one is missing
+                double startRange = coin->fCoinPtTEnd->fT - startPtT->fT;
+                double startPart = (test->t() - startPtT->fT) / startRange;
+                double oStartRange = coin->fOppPtTEnd->fT - oStartPtT->fT;
+                double oStartPart = (oTest->t() - oStartPtT->fT) / oStartRange;
+                if (startPart == oStartPart) {
+                    // data is corrupt
+                    log->record(kAddCorruptCoin_Glitch, id, start, oStart);
+                    break;
+                }
+                if (startPart < oStartPart) {
+                    double newT = oStartPtT->fT + oStartRange * startPart;
+                    log->record(kAddExpandedCoin_Glitch, id, oStart, newT, test->pt());
+                    bumpOTest = false;
+                } else {
+                    double newT = startPtT->fT + startRange * oStartPart;
+                    log->record(kAddExpandedCoin_Glitch, id, start, newT, oTest->pt());
+                    bumpTest = false;
                 }
             }
-            lastOppWinding = oppWinding = span.fOppSum;
-            if (oppWinding != SK_MinS32 && !segment->oppXor()) {
-                int oppDiffWinding = segment->oppSign(next);
-//                SK_ALWAYSBREAK(abs(oppDiffWinding) <= abs(diffWinding) || segment->_xor());
-                if (oppDiffWinding) {
-                    bool oppSameSign = (oppWinding > 0) == (oppDiffWinding > 0);
-                    oppWinding -= oppSameSign ? oppDiffWinding : -oppDiffWinding;
-                    SK_ALWAYSBREAK(SkPathOpsDebug::ValidWind(oppWinding));
-                    SK_ALWAYSBREAK(abs(oppWinding) <= abs(lastOppWinding));
-                    if (!oppSameSign) {
-                        SkTSwap(oppWinding, lastOppWinding);
+            if (bumpTest && test != end) {
+                test = test->upCast()->next();
+            }
+            if (bumpOTest && oTest != oEnd) {
+                oTest = coin->fFlipped ? oTest->prev() : oTest->upCast()->next();
+            }
+        }
+    } while ((coin = coin->fNext));
+}
+
+static void t_range(const SkOpPtT* overS, const SkOpPtT* overE, double tStart, double tEnd,
+        const SkOpPtT* coinPtTStart, const SkOpPtT* coinPtTEnd, double* coinTs, double* coinTe) {
+    double denom = overE->fT - overS->fT;
+    double start = 0 < denom ? tStart : tEnd;
+    double end = 0 < denom ? tEnd : tStart;
+    double sRatio = (start - overS->fT) / denom;
+    double eRatio = (end - overS->fT) / denom;
+    *coinTs = coinPtTStart->fT + (coinPtTEnd->fT - coinPtTStart->fT) * sRatio;
+    *coinTe = coinPtTStart->fT + (coinPtTEnd->fT - coinPtTStart->fT) * eRatio;
+}
+
+bool SkOpCoincidence::debugAddIfMissing(const SkCoincidentSpans* outer, const SkOpPtT* over1s,
+            const SkOpPtT* over1e) const {
+    const SkCoincidentSpans* check = this->fTop;
+    while (check) {
+        if (check->fCoinPtTStart->span() == over1s->span()
+                && check->fOppPtTStart->span() == outer->fOppPtTStart->span()) {
+            SkASSERT(check->fCoinPtTEnd->span() == over1e->span()
+                    || !fDebugState->debugRunFail());
+            SkASSERT(check->fOppPtTEnd->span() == outer->fOppPtTEnd->span()
+                    || !fDebugState->debugRunFail());
+            return false;
+        }
+        if (check->fCoinPtTStart->span() == outer->fCoinPtTStart->span()
+                && check->fOppPtTStart->span() == over1s->span()) {
+            SkASSERT(check->fCoinPtTEnd->span() == outer->fCoinPtTEnd->span()
+                    || !fDebugState->debugRunFail());
+            SkASSERT(check->fOppPtTEnd->span() == over1e->span()
+                    || !fDebugState->debugRunFail());
+            return false;
+        }
+        check = check->fNext;
+    }
+    return true;
+}
+
+bool SkOpCoincidence::debugAddIfMissing(const SkOpPtT* over1s, const SkOpPtT* over1e,
+                      const SkOpPtT* over2s, const SkOpPtT* over2e, double tStart, double tEnd,
+        SkOpPtT* coinPtTStart, const SkOpPtT* coinPtTEnd,
+        SkOpPtT* oppPtTStart, const SkOpPtT* oppPtTEnd) const {
+    double coinTs, coinTe, oppTs, oppTe;
+    t_range(over1s, over1e, tStart, tEnd, coinPtTStart, coinPtTEnd, &coinTs, &coinTe);
+    t_range(over2s, over2e, tStart, tEnd, oppPtTStart, oppPtTEnd, &oppTs, &oppTe);
+    const SkOpSegment* coinSeg = coinPtTStart->segment();
+    const SkOpSegment* oppSeg = oppPtTStart->segment();
+    SkASSERT(coinSeg != oppSeg);
+    const SkCoincidentSpans* check = this->fTop;
+    ;
+    while (check) {
+        const SkOpSegment* checkCoinSeg = check->fCoinPtTStart->segment();
+        const SkOpSegment* checkOppSeg;
+        if (checkCoinSeg != coinSeg && checkCoinSeg != oppSeg) {
+            goto next;
+        }
+        checkOppSeg = check->fOppPtTStart->segment();
+        if (checkOppSeg != coinSeg && checkOppSeg != oppSeg) {
+            goto next;
+        }
+        {
+            int cTs = coinTs;
+            int cTe = coinTe;
+            int oTs = oppTs;
+            int oTe = oppTe;
+            if (checkCoinSeg != coinSeg) {
+                SkASSERT(checkOppSeg != oppSeg);
+                SkTSwap(cTs, oTs);
+                SkTSwap(cTe, oTe);
+            }
+            int tweenCount = (int) between(check->fCoinPtTStart->fT, cTs, check->fCoinPtTEnd->fT)
+                           + (int) between(check->fCoinPtTStart->fT, cTe, check->fCoinPtTEnd->fT)
+                           + (int) between(check->fOppPtTStart->fT, oTs, check->fOppPtTEnd->fT)
+                           + (int) between(check->fOppPtTStart->fT, oTe, check->fOppPtTEnd->fT);
+    //        SkASSERT(tweenCount == 0 || tweenCount == 4);
+            if (tweenCount) {
+                return true;
+            }
+        }
+next:
+        check = check->fNext;
+    }
+    if ((over1s->fT < over1e->fT) != (over2s->fT < over2e->fT)) {
+        SkTSwap(oppTs, oppTe);
+    }
+    if (coinTs > coinTe) {
+        SkTSwap(coinTs, coinTe);
+        SkTSwap(oppTs, oppTe);
+    }
+    bool cs = coinSeg->debugAddMissing(coinTs, oppSeg);
+    bool ce = coinSeg->debugAddMissing(coinTe, oppSeg);
+    if (cs == ce) {
+        return false;
+    }
+    return true;
+}
+
+void SkOpCoincidence::debugAddMissing(const char* id, SkPathOpsDebug::GlitchLog* log) const {
+    const SkCoincidentSpans* outer = fHead;
+    if (!outer) {
+        return;
+    }
+    do {
+    // addifmissing can modify the list that this is walking
+    // save head so that walker can iterate over old data unperturbed
+    // addifmissing adds to head freely then add saved head in the end
+        const SkOpSegment* outerCoin = outer->fCoinPtTStart->segment();
+        SkASSERT(outerCoin == outer->fCoinPtTEnd->segment());
+        const SkOpSegment* outerOpp = outer->fOppPtTStart->segment();
+        SkASSERT(outerOpp == outer->fOppPtTEnd->segment());
+        const SkCoincidentSpans* inner = outer;
+        while ((inner = inner->fNext)) {
+            double overS, overE;
+            const SkOpSegment* innerCoin = inner->fCoinPtTStart->segment();
+            SkASSERT(innerCoin == inner->fCoinPtTEnd->segment());
+            const SkOpSegment* innerOpp = inner->fOppPtTStart->segment();
+            SkASSERT(innerOpp == inner->fOppPtTEnd->segment());
+            if (outerCoin == innerCoin
+                    && this->overlap(outer->fCoinPtTStart, outer->fCoinPtTEnd,
+                    inner->fCoinPtTStart, inner->fCoinPtTEnd, &overS, &overE)) {
+                if (this->debugAddIfMissing(outer->fCoinPtTStart, outer->fCoinPtTEnd,
+                        inner->fCoinPtTStart, inner->fCoinPtTEnd, overS, overE,
+                        outer->fOppPtTStart, outer->fOppPtTEnd,
+                        inner->fOppPtTStart, inner->fOppPtTEnd)) {
+                    log->record(kAddMissingCoin_Glitch, id, outer, inner->fCoinPtTStart);
+                }
+            } else if (outerCoin == innerOpp
+                    && this->overlap(outer->fCoinPtTStart, outer->fCoinPtTEnd,
+                    inner->fOppPtTStart, inner->fOppPtTEnd, &overS, &overE)) {
+                if (this->debugAddIfMissing(outer->fCoinPtTStart, outer->fCoinPtTEnd,
+                        inner->fOppPtTStart, inner->fOppPtTEnd, overS, overE,
+                        outer->fOppPtTStart, outer->fOppPtTEnd,
+                        inner->fCoinPtTStart, inner->fCoinPtTEnd)) {
+                    log->record(kAddMissingCoin_Glitch, id, outer, inner->fOppPtTStart);
+                }
+            } else if (outerOpp == innerCoin
+                    && this->overlap(outer->fOppPtTStart, outer->fOppPtTEnd,
+                    inner->fCoinPtTStart, inner->fCoinPtTEnd, &overS, &overE)) {
+                if (this->debugAddIfMissing(outer->fOppPtTStart, outer->fOppPtTEnd,
+                        inner->fCoinPtTStart, inner->fCoinPtTEnd, overS, overE,
+                        outer->fCoinPtTStart, outer->fCoinPtTEnd,
+                        inner->fOppPtTStart, inner->fOppPtTEnd)) {
+                    log->record(kAddMissingCoin_Glitch, id, outer, inner->fCoinPtTStart);
+                }
+            } else if (outerOpp == innerOpp
+                    && this->overlap(outer->fOppPtTStart, outer->fOppPtTEnd,
+                    inner->fOppPtTStart, inner->fOppPtTEnd, &overS, &overE)) {
+                if (this->debugAddIfMissing(outer->fOppPtTStart, outer->fOppPtTEnd,
+                        inner->fOppPtTStart, inner->fOppPtTEnd, overS, overE,
+                        outer->fCoinPtTStart, outer->fCoinPtTEnd,
+                        inner->fCoinPtTStart, inner->fCoinPtTEnd)) {
+                    log->record(kAddMissingCoin_Glitch, id, outer, inner->fOppPtTStart);
+                }
+            } else if (outerCoin != innerCoin) {
+                // check to see if outer span overlaps the inner span
+                    // look for inner segment in pt-t list
+                    // if present, and if t values are in coincident range
+                    // add two pairs of new coincidence
+                const SkOpPtT* testS = outer->fCoinPtTStart->debugContains(innerCoin);
+                const SkOpPtT* testE = outer->fCoinPtTEnd->debugContains(innerCoin);
+                if (testS && testS->fT >= inner->fCoinPtTStart->fT
+                        && testE && testE->fT <= inner->fCoinPtTEnd->fT
+                        && this->testForCoincidence(outer, testS, testE)) {
+                    if (this->debugAddIfMissing(outer, testS, testE)) {
+                        log->record(kAddMissingCoin_Glitch, id, outer, testS, testE);
+                    }
+                } else {
+                    testS = inner->fCoinPtTStart->debugContains(outerCoin);
+                    testE = inner->fCoinPtTEnd->debugContains(outerCoin);
+                    if (testS && testS->fT >= outer->fCoinPtTStart->fT
+                            && testE && testE->fT <= outer->fCoinPtTEnd->fT
+                            && this->testForCoincidence(inner, testS, testE)) {
+                        if (this->debugAddIfMissing(inner, testS, testE)) {
+                            log->record(kAddMissingCoin_Glitch, id, inner, testS, testE);
+                        }
                     }
                 }
             }
-            firstOperand = segment->operand();
-            break;
         }
-        SK_ALWAYSBREAK(span.fOppSum == SK_MinS32);
-        next = next->next();
-    } while (next != first);
-    if (winding == SK_MinS32) {
-        return;
+    } while ((outer = outer->fNext));
+}
+
+bool SkOpCoincidence::debugExpand(const char* id, SkPathOpsDebug::GlitchLog* log) const {
+    const SkCoincidentSpans* coin = fHead;
+    if (!coin) {
+        return false;
     }
-    SK_ALWAYSBREAK(oppWinding == SK_MinS32 || SkPathOpsDebug::ValidWind(oppWinding));
-    first = next;
-    next = next->next();
+    bool expanded = false;
     do {
-        const SkOpSegment* segment = next->fSegment;
-        lastWinding = winding;
-        lastOppWinding = oppWinding;
-        bool operandsMatch = firstOperand == segment->operand();
-        if (operandsMatch) {
-            if (!segment->_xor()) {
-                winding -= segment->spanSign(next);
-                SK_ALWAYSBREAK(winding != lastWinding);
-                SK_ALWAYSBREAK(SkPathOpsDebug::ValidWind(winding));
-            }
-            if (!segment->oppXor()) {
-                int oppDiffWinding = segment->oppSign(next);
-                if (oppWinding != SK_MinS32) {
-                    oppWinding -= oppDiffWinding;
-                    SK_ALWAYSBREAK(SkPathOpsDebug::ValidWind(oppWinding));
-                } else {
-                    SK_ALWAYSBREAK(oppDiffWinding == 0);
-                }
-            }
-        } else {
-            if (!segment->oppXor()) {
-                winding -= segment->oppSign(next);
-                SK_ALWAYSBREAK(SkPathOpsDebug::ValidWind(winding));
-            }
-            if (!segment->_xor()) {
-                oppWinding -= segment->spanSign(next);
-                SK_ALWAYSBREAK(oppWinding != lastOppWinding);
-                SK_ALWAYSBREAK(SkPathOpsDebug::ValidWind(oppWinding));
+        const SkOpSpan* start = coin->fCoinPtTStart->span()->upCast();
+        const SkOpSpanBase* end = coin->fCoinPtTEnd->span();
+        const SkOpSegment* segment = coin->fCoinPtTStart->segment();
+        const SkOpSegment* oppSegment = coin->fOppPtTStart->segment();
+        const SkOpSpan* prev = start->prev();
+        if (prev && prev->debugContains(oppSegment)) {
+            double midT = (prev->t() + start->t()) / 2;
+            if (segment->isClose(midT, oppSegment)) {
+                log->record(kExpandCoin_Glitch, id, coin, prev);
             }
         }
-        bool useInner = SkOpSegment::UseInnerWinding(lastWinding, winding);
-        int sumWinding = useInner ? winding : lastWinding;
-        bool oppUseInner = SkOpSegment::UseInnerWinding(lastOppWinding, oppWinding);
-        int oppSumWinding = oppUseInner ? oppWinding : lastOppWinding;
-        if (!operandsMatch) {
-            SkTSwap(useInner, oppUseInner);
-            SkTSwap(sumWinding, oppSumWinding);
-        }
-        const SkOpSpan& span = segment->span(SkMin32(next->fStart, next->fEnd));
-        if (winding == -lastWinding) {
-            if (span.fWindSum != SK_MinS32) {
-                SkDebugf("%s useInner=%d spanSign=%d lastWinding=%d winding=%d windSum=%d\n",
-                        __FUNCTION__,
-                        useInner, segment->spanSign(next), lastWinding, winding, span.fWindSum);
+        SkOpSpanBase* next = end->final() ? nullptr : end->upCast()->next();
+        if (next && next->debugContains(oppSegment)) {
+            double midT = (end->t() + next->t()) / 2;
+            if (segment->isClose(midT, oppSegment)) {
+                log->record(kExpandCoin_Glitch, id, coin, next);
             }
         }
-        if (oppWinding != SK_MinS32) {
-            if (span.fOppSum != SK_MinS32) {
-                SK_ALWAYSBREAK(span.fOppSum == oppSumWinding || segment->oppXor() || segment->_xor());
-            }
-        } else {
-            SK_ALWAYSBREAK(!firstOperand);
-            SK_ALWAYSBREAK(!segment->operand());
-            SK_ALWAYSBREAK(!span.fOppValue);
-        }
-        next = next->next();
-    } while (next != first);
-}
-#endif
-
-#if DEBUG_SWAP_TOP
-bool SkOpSegment::controlsContainedByEnds(int tStart, int tEnd) const {
-    if (fVerb != SkPath::kCubic_Verb) {
-        return false;
-    }
-    SkDCubic dst = SkDCubic::SubDivide(fPts, fTs[tStart].fT, fTs[tEnd].fT);
-    return dst.controlsContainedByEnds();
-}
-#endif
-
-#if DEBUG_CONCIDENT
-// SK_ALWAYSBREAK if pair has not already been added
-void SkOpSegment::debugAddTPair(double t, const SkOpSegment& other, double otherT) const {
-    for (int i = 0; i < fTs.count(); ++i) {
-        if (fTs[i].fT == t && fTs[i].fOther == &other && fTs[i].fOtherT == otherT) {
-            return;
-        }
-    }
-    SK_ALWAYSBREAK(0);
-}
-#endif
-
-#if DEBUG_ANGLE
-void SkOpSegment::debugCheckPointsEqualish(int tStart, int tEnd) const {
-    const SkPoint& basePt = fTs[tStart].fPt;
-    while (++tStart < tEnd) {
-       const SkPoint& cmpPt = fTs[tStart].fPt;
-       SK_ALWAYSBREAK(SkDPoint::ApproximatelyEqual(basePt, cmpPt));
-    }
-}
-#endif
-
-#if DEBUG_SWAP_TOP
-int SkOpSegment::debugInflections(int tStart, int tEnd) const {
-    if (fVerb != SkPath::kCubic_Verb) {
-        return false;
-    }
-    SkDCubic dst = SkDCubic::SubDivide(fPts, fTs[tStart].fT, fTs[tEnd].fT);
-    double inflections[2];
-    return dst.findInflections(inflections);
-}
-#endif
-
-const SkOpAngle* SkOpSegment::debugLastAngle() const {
-    const SkOpAngle* result = NULL;
-    for (int index = 0; index < count(); ++index) {
-        const SkOpSpan& span = this->span(index);
-        if (span.fToAngle) {
-            SkASSERT(!result);
-            result = span.fToAngle;
-        }
-    }
-    SkASSERT(result);
-    return result;
+    } while ((coin = coin->fNext));
+    return expanded;
 }
 
-void SkOpSegment::debugReset() {
-    fTs.reset();
-    fAngles.reset();
-}
-
-#if DEBUG_CONCIDENT
-void SkOpSegment::debugShowTs(const char* prefix) const {
-    SkDebugf("%s %s id=%d", __FUNCTION__, prefix, fID);
-    int lastWind = -1;
-    int lastOpp = -1;
-    double lastT = -1;
-    int i;
-    for (i = 0; i < fTs.count(); ++i) {
-        bool change = lastT != fTs[i].fT || lastWind != fTs[i].fWindValue
-                || lastOpp != fTs[i].fOppValue;
-        if (change && lastWind >= 0) {
-            SkDebugf(" t=%1.3g %1.9g,%1.9g w=%d o=%d]",
-                    lastT, xyAtT(i - 1).fX, xyAtT(i - 1).fY, lastWind, lastOpp);
-        }
-        if (change) {
-            SkDebugf(" [o=%d", fTs[i].fOther->fID);
-            lastWind = fTs[i].fWindValue;
-            lastOpp = fTs[i].fOppValue;
-            lastT = fTs[i].fT;
-        } else {
-            SkDebugf(",%d", fTs[i].fOther->fID);
-        }
-    }
-    if (i <= 0) {
+void SkOpCoincidence::debugFixAligned(const char* id, SkPathOpsDebug::GlitchLog* log) const {
+    const SkCoincidentSpans* coin = fHead;
+    if (!coin) {
         return;
     }
-    SkDebugf(" t=%1.3g %1.9g,%1.9g w=%d o=%d]",
-            lastT, xyAtT(i - 1).fX, xyAtT(i - 1).fY, lastWind, lastOpp);
-    if (fOperand) {
-        SkDebugf(" operand");
-    }
-    if (done()) {
-        SkDebugf(" done");
-    }
-    SkDebugf("\n");
+    do {
+        if (coin->fCoinPtTStart->deleted()) {
+            log->record(kDeletedCoin_Glitch, id, coin, coin->fCoinPtTStart);
+        }
+        if (coin->fCoinPtTEnd->deleted()) {
+            log->record(kDeletedCoin_Glitch, id, coin, coin->fCoinPtTEnd);
+        }
+        if (coin->fOppPtTStart->deleted()) {
+            log->record(kDeletedCoin_Glitch, id, coin, coin->fOppPtTStart);
+        }
+        if (coin->fOppPtTEnd->deleted()) {
+            log->record(kDeletedCoin_Glitch, id, coin, coin->fOppPtTEnd);
+        }
+    } while ((coin = coin->fNext));
+    coin = fHead;
+    do {
+        if (coin->fCoinPtTStart->collapsed(coin->fCoinPtTEnd)) {
+            log->record(kCollapsedCoin_Glitch, id, coin, coin->fCoinPtTStart);
+        }
+        if (coin->fOppPtTStart->collapsed(coin->fOppPtTEnd)) {
+            log->record(kCollapsedCoin_Glitch, id, coin, coin->fOppPtTStart);
+        }
+    } while ((coin = coin->fNext));
 }
-#endif
 
-#if DEBUG_ACTIVE_SPANS || DEBUG_ACTIVE_SPANS_FIRST_ONLY
-void SkOpSegment::debugShowActiveSpans() const {
-    debugValidate();
-    if (done()) {
+void SkOpCoincidence::debugMark(const char* id, SkPathOpsDebug::GlitchLog* log) const {
+    const SkCoincidentSpans* coin = fHead;
+    if (!coin) {
         return;
     }
-#if DEBUG_ACTIVE_SPANS_SHORT_FORM
-    int lastId = -1;
-    double lastT = -1;
-#endif
-    for (int i = 0; i < fTs.count(); ++i) {
-        if (fTs[i].fDone) {
-            continue;
+    do {
+        const SkOpSpanBase* end = coin->fCoinPtTEnd->span();
+        const SkOpSpanBase* oldEnd = end;
+        const SkOpSpan* start = coin->fCoinPtTStart->span()->debugStarter(&end);
+        const SkOpSpanBase* oEnd = coin->fOppPtTEnd->span();
+        const SkOpSpanBase* oOldEnd = oEnd;
+        const SkOpSpanBase* oStart = coin->fOppPtTStart->span()->debugStarter(&oEnd);
+        bool flipped = (end == oldEnd) != (oEnd == oOldEnd);
+        if (flipped) {
+            SkTSwap(oStart, oEnd);
         }
-        SK_ALWAYSBREAK(i < fTs.count() - 1);
-#if DEBUG_ACTIVE_SPANS_SHORT_FORM
-        if (lastId == fID && lastT == fTs[i].fT) {
-            continue;
-        }
-        lastId = fID;
-        lastT = fTs[i].fT;
-#endif
-        SkDebugf("%s id=%d", __FUNCTION__, fID);
-        SkDebugf(" (%1.9g,%1.9g", fPts[0].fX, fPts[0].fY);
-        for (int vIndex = 1; vIndex <= SkPathOpsVerbToPoints(fVerb); ++vIndex) {
-            SkDebugf(" %1.9g,%1.9g", fPts[vIndex].fX, fPts[vIndex].fY);
-        }
-        const SkOpSpan* span = &fTs[i];
-        SkDebugf(") t=%1.9g (%1.9g,%1.9g)", span->fT, xAtT(span), yAtT(span));
-        int iEnd = i + 1;
-        while (fTs[iEnd].fT < 1 && approximately_equal(fTs[i].fT, fTs[iEnd].fT)) {
-            ++iEnd;
-        }
-        SkDebugf(" tEnd=%1.9g", fTs[iEnd].fT);
-        const SkOpSegment* other = fTs[i].fOther;
-        SkDebugf(" other=%d otherT=%1.9g otherIndex=%d windSum=",
-                other->fID, fTs[i].fOtherT, fTs[i].fOtherIndex);
-        if (fTs[i].fWindSum == SK_MinS32) {
-            SkDebugf("?");
-        } else {
-            SkDebugf("%d", fTs[i].fWindSum);
-        }
-        SkDebugf(" windValue=%d oppValue=%d\n", fTs[i].fWindValue, fTs[i].fOppValue);
-    }
+        const SkOpSpanBase* next = start;
+        const SkOpSpanBase* oNext = oStart;
+        do {
+            next = next->upCast()->next();
+            oNext = flipped ? oNext->prev() : oNext->upCast()->next();
+            if (next == end || oNext == oEnd) {
+                break;
+            }
+            if (!next->containsCoinEnd(oNext)) {
+                log->record(kMarkCoinEnd_Glitch, id, next, oNext);
+            }
+            const SkOpSpan* nextSpan = next->upCast();
+            const SkOpSpan* oNextSpan = oNext->upCast();
+            if (!nextSpan->containsCoincidence(oNextSpan)) {
+                log->record(kMarkCoinInsert_Glitch, id, nextSpan, oNextSpan);
+            }
+        } while (true);
+    } while ((coin = coin->fNext));
 }
 #endif
 
-#if DEBUG_MARK_DONE || DEBUG_UNSORTABLE
-void SkOpSegment::debugShowNewWinding(const char* fun, const SkOpSpan& span, int winding) {
-    const SkPoint& pt = xyAtT(&span);
-    SkDebugf("%s id=%d", fun, fID);
-    SkDebugf(" (%1.9g,%1.9g", fPts[0].fX, fPts[0].fY);
-    for (int vIndex = 1; vIndex <= SkPathOpsVerbToPoints(fVerb); ++vIndex) {
-        SkDebugf(" %1.9g,%1.9g", fPts[vIndex].fX, fPts[vIndex].fY);
+void SkOpCoincidence::debugShowCoincidence() const {
+    SkCoincidentSpans* span = fHead;
+    while (span) {
+        SkDebugf("%s - id=%d t=%1.9g tEnd=%1.9g\n", __FUNCTION__,
+                span->fCoinPtTStart->segment()->debugID(),
+                span->fCoinPtTStart->fT, span->fCoinPtTEnd->fT);
+        SkDebugf("%s + id=%d t=%1.9g tEnd=%1.9g\n", __FUNCTION__,
+                span->fOppPtTStart->segment()->debugID(),
+                span->fOppPtTStart->fT, span->fOppPtTEnd->fT);
+        span = span->fNext;
     }
-    SK_ALWAYSBREAK(&span == &span.fOther->fTs[span.fOtherIndex].fOther->
-            fTs[span.fOther->fTs[span.fOtherIndex].fOtherIndex]);
-    SkDebugf(") t=%1.9g [%d] (%1.9g,%1.9g) tEnd=%1.9g newWindSum=%d windSum=",
-            span.fT, span.fOther->fTs[span.fOtherIndex].fOtherIndex, pt.fX, pt.fY,
-            (&span)[1].fT, winding);
-    if (span.fWindSum == SK_MinS32) {
-        SkDebugf("?");
-    } else {
-        SkDebugf("%d", span.fWindSum);
-    }
-    SkDebugf(" windValue=%d\n", span.fWindValue);
 }
 
-void SkOpSegment::debugShowNewWinding(const char* fun, const SkOpSpan& span, int winding,
-                                      int oppWinding) {
-    const SkPoint& pt = xyAtT(&span);
-    SkDebugf("%s id=%d", fun, fID);
-    SkDebugf(" (%1.9g,%1.9g", fPts[0].fX, fPts[0].fY);
-    for (int vIndex = 1; vIndex <= SkPathOpsVerbToPoints(fVerb); ++vIndex) {
-        SkDebugf(" %1.9g,%1.9g", fPts[vIndex].fX, fPts[vIndex].fY);
-    }
-    SK_ALWAYSBREAK(&span == &span.fOther->fTs[span.fOtherIndex].fOther->
-            fTs[span.fOther->fTs[span.fOtherIndex].fOtherIndex]);
-    SkDebugf(") t=%1.9g [%d] (%1.9g,%1.9g) tEnd=%1.9g newWindSum=%d newOppSum=%d oppSum=",
-            span.fT, span.fOther->fTs[span.fOtherIndex].fOtherIndex, pt.fX, pt.fY,
-            (&span)[1].fT, winding, oppWinding);
-    if (span.fOppSum == SK_MinS32) {
-        SkDebugf("?");
-    } else {
-        SkDebugf("%d", span.fOppSum);
-    }
-    SkDebugf(" windSum=");
-    if (span.fWindSum == SK_MinS32) {
-        SkDebugf("?");
-    } else {
-        SkDebugf("%d", span.fWindSum);
-    }
-    SkDebugf(" windValue=%d oppValue=%d\n", span.fWindValue, span.fOppValue);
+#if DEBUG_COINCIDENCE
+void SkOpContour::debugCheckHealth(const char* id, SkPathOpsDebug::GlitchLog* log) const {
+    const SkOpSegment* segment = &fHead;
+    do {
+        segment->debugCheckHealth(id, log);
+    } while ((segment = segment->next()));
 }
-#endif
 
-#if DEBUG_SHOW_WINDING
-int SkOpSegment::debugShowWindingValues(int slotCount, int ofInterest) const {
-    if (!(1 << fID & ofInterest)) {
-        return 0;
-    }
-    int sum = 0;
-    SkTArray<char, true> slots(slotCount * 2);
-    memset(slots.begin(), ' ', slotCount * 2);
-    for (int i = 0; i < fTs.count(); ++i) {
-   //     if (!(1 << fTs[i].fOther->fID & ofInterest)) {
-   //         continue;
-   //     }
-        sum += fTs[i].fWindValue;
-        slots[fTs[i].fOther->fID - 1] = as_digit(fTs[i].fWindValue);
-        sum += fTs[i].fOppValue;
-        slots[slotCount + fTs[i].fOther->fID - 1] = as_digit(fTs[i].fOppValue);
-    }
-    SkDebugf("%s id=%2d %.*s | %.*s\n", __FUNCTION__, fID, slotCount, slots.begin(), slotCount,
-            slots.begin() + slotCount);
-    return sum;
+void SkOpContour::debugMissingCoincidence(const char* id, SkPathOpsDebug::GlitchLog* log,
+        const SkOpCoincidence* coincidence) const {
+    const SkOpSegment* segment = &fHead;
+    do {
+        segment->debugMissingCoincidence(id, log, coincidence);
+    } while ((segment = segment->next()));
 }
 #endif
 
 void SkOpSegment::debugValidate() const {
 #if DEBUG_VALIDATE
-    int count = fTs.count();
-    SK_ALWAYSBREAK(count >= 2);
-    SK_ALWAYSBREAK(fTs[0].fT == 0);
-    SK_ALWAYSBREAK(fTs[count - 1].fT == 1);
+    const SkOpSpanBase* span = &fHead;
+    double lastT = -1;
+    const SkOpSpanBase* prev = nullptr;
+    int count = 0;
     int done = 0;
-    double t = -1;
-    const SkOpSpan* last = NULL;
-    bool tinyTFound = false;
-    bool hasLoop = false;
-    for (int i = 0; i < count; ++i) {
-        const SkOpSpan& span = fTs[i];
-        SK_ALWAYSBREAK(t <= span.fT);
-        t = span.fT;
-        int otherIndex = span.fOtherIndex;
-        const SkOpSegment* other = span.fOther;
-        SK_ALWAYSBREAK(other != this || fVerb == SkPath::kCubic_Verb);
-        const SkOpSpan& otherSpan = other->fTs[otherIndex];
-        SK_ALWAYSBREAK(otherSpan.fPt == span.fPt);
-        SK_ALWAYSBREAK(otherSpan.fOtherT == t);
-        SK_ALWAYSBREAK(&fTs[i] == &otherSpan.fOther->fTs[otherSpan.fOtherIndex]);
-        done += span.fDone;
-        if (last) {
-            SK_ALWAYSBREAK(last->fT != span.fT || last->fOther != span.fOther);
-            bool tsEqual = last->fT == span.fT;
-            bool tsPreciselyEqual = precisely_equal(last->fT, span.fT);
-            SK_ALWAYSBREAK(!tsEqual || tsPreciselyEqual);
-            bool pointsEqual = last->fPt == span.fPt;
-            bool pointsNearlyEqual = AlmostEqualUlps(last->fPt, span.fPt);
-#if 0  // bufferOverflow test triggers this
-            SK_ALWAYSBREAK(!tsPreciselyEqual || pointsNearlyEqual);
-#endif
-//            SK_ALWAYSBREAK(!last->fTiny || !tsPreciselyEqual || span.fTiny || tinyTFound);
-            SK_ALWAYSBREAK(last->fTiny || tsPreciselyEqual || !pointsEqual || hasLoop);
-            SK_ALWAYSBREAK(!last->fTiny || pointsEqual);
-            SK_ALWAYSBREAK(!last->fTiny || last->fDone);
-            SK_ALWAYSBREAK(!last->fSmall || pointsNearlyEqual);
-            SK_ALWAYSBREAK(!last->fSmall || last->fDone);
-//            SK_ALWAYSBREAK(!last->fSmall || last->fTiny);
-//            SK_ALWAYSBREAK(last->fTiny || !pointsEqual || last->fDone == span.fDone);
-            if (last->fTiny) {
-                tinyTFound |= !tsPreciselyEqual;
-            } else {
-                tinyTFound = false;
-            }
+    do {
+        if (!span->final()) {
+            ++count;
+            done += span->upCast()->done() ? 1 : 0;
         }
-        last = &span;
-        hasLoop |= last->fLoop;
-    }
-    SK_ALWAYSBREAK(done == fDoneSpans);
-//    if (fAngles.count() ) {
-//        fAngles.begin()->debugValidateLoop();
-//    }
+        SkASSERT(span->segment() == this);
+        SkASSERT(!prev || prev->upCast()->next() == span);
+        SkASSERT(!prev || prev == span->prev());
+        prev = span;
+        double t = span->ptT()->fT;
+        SkASSERT(lastT < t);
+        lastT = t;
+        span->debugValidate();
+    } while (!span->final() && (span = span->upCast()->next()));
+    SkASSERT(count == fCount);
+    SkASSERT(done == fDoneCount);
+    SkASSERT(count >= fDoneCount);
+    SkASSERT(span->final());
+    span->debugValidate();
 #endif
 }
+
+bool SkOpSpanBase::debugAlignedEnd(double t, const SkPoint& pt) const {
+    SkASSERT(zero_or_one(t));
+    const SkOpSegment* segment = this->segment();
+    SkASSERT(t ? segment->lastPt() == pt : segment->pts()[0] == pt);
+    if (!debugAlignedInner()) {
+          return false;
+    }
+    if ((t ? segment->lastPt() : segment->pts()[0]) != pt) {
+        return false;
+    }
+    const SkOpPtT* ptT = &this->fPtT;
+    SkASSERT(t == ptT->fT);
+    SkASSERT(pt == ptT->fPt);
+    const SkOpPtT* test = ptT, * stopPtT = ptT;
+    while ((test = test->next()) != stopPtT) {
+        const SkOpSegment* other = test->segment();
+        if (other == this->segment()) {
+            continue;
+        }
+        if (!zero_or_one(test->fT)) {
+            continue;
+        }
+        if ((test->fT ? other->lastPt() : other->pts()[0]) != pt) {
+            return false;
+        }
+    }
+    return this->fAligned;
+}
+
+bool SkOpSpanBase::debugAlignedInner() const {
+    // force the spans to share points and t values
+    const SkOpPtT* ptT = &this->fPtT, * stopPtT = ptT;
+    const SkPoint& pt = ptT->fPt;
+    do {
+        if (ptT->fPt != pt) {
+            return false;
+        }
+        const SkOpSpanBase* span = ptT->span();
+        const SkOpPtT* test = ptT;
+        do {
+            if ((test = test->next()) == stopPtT) {
+                break;
+            }
+            if (span == test->span() && !span->segment()->ptsDisjoint(*ptT, *test)) {
+                return false;
+            }
+        } while (true);
+    } while ((ptT = ptT->next()) != stopPtT);
+    return true;
+}
+
+bool SkOpSpanBase::debugCoinEndLoopCheck() const {
+    int loop = 0;
+    const SkOpSpanBase* next = this;
+    SkOpSpanBase* nextCoin;
+    do {
+        nextCoin = next->fCoinEnd;
+        SkASSERT(nextCoin == this || nextCoin->fCoinEnd != nextCoin);
+        for (int check = 1; check < loop - 1; ++check) {
+            const SkOpSpanBase* checkCoin = this->fCoinEnd;
+            const SkOpSpanBase* innerCoin = checkCoin;
+            for (int inner = check + 1; inner < loop; ++inner) {
+                innerCoin = innerCoin->fCoinEnd;
+                if (checkCoin == innerCoin) {
+                    SkDebugf("*** bad coincident end loop ***\n");
+                    return false;
+                }
+            }
+        }
+        ++loop;
+    } while ((next = nextCoin) && next != this);
+    return true;
+}
+
+bool SkOpSpanBase::debugContains(const SkOpSegment* segment) const {
+    const SkOpPtT* start = &fPtT;
+    const SkOpPtT* walk = start;
+    while ((walk = walk->next()) != start) {
+        if (walk->segment() == segment) {
+            return true;
+        }
+    }
+    return false;
+}
+
+const SkOpSpan* SkOpSpanBase::debugStarter(SkOpSpanBase const** endPtr) const {
+    const SkOpSpanBase* end = *endPtr;
+    SkASSERT(this->segment() == end->segment());
+    const SkOpSpanBase* result;
+    if (t() < end->t()) {
+        result = this;
+    } else {
+        result = end;
+        *endPtr = this;
+    }
+    return result->upCast();
+}
+
+void SkOpSpanBase::debugValidate() const {
+#if DEBUG_VALIDATE
+    const SkOpPtT* ptT = &fPtT;
+    SkASSERT(ptT->span() == this);
+    do {
+//        SkASSERT(SkDPoint::RoughlyEqual(fPtT.fPt, ptT->fPt));
+        ptT->debugValidate();
+        ptT = ptT->next();
+    } while (ptT != &fPtT);
+    SkASSERT(this->debugCoinEndLoopCheck());
+    if (!this->final()) {
+        SkASSERT(this->upCast()->debugCoinLoopCheck());
+    }
+    if (fFromAngle) {
+        fFromAngle->debugValidate();
+    }
+    if (!this->final() && this->upCast()->toAngle()) {
+        this->upCast()->toAngle()->debugValidate();
+    }
+#endif
+}
+
+bool SkOpSpan::debugCoinLoopCheck() const {
+    int loop = 0;
+    const SkOpSpan* next = this;
+    SkOpSpan* nextCoin;
+    do {
+        nextCoin = next->fCoincident;
+        SkASSERT(nextCoin == this || nextCoin->fCoincident != nextCoin);
+        for (int check = 1; check < loop - 1; ++check) {
+            const SkOpSpan* checkCoin = this->fCoincident;
+            const SkOpSpan* innerCoin = checkCoin;
+            for (int inner = check + 1; inner < loop; ++inner) {
+                innerCoin = innerCoin->fCoincident;
+                if (checkCoin == innerCoin) {
+                    SkDebugf("*** bad coincident loop ***\n");
+                    return false;
+                }
+            }
+        }
+        ++loop;
+    } while ((next = nextCoin) && next != this);
+    return true;
+}
+
+// called only by test code
+int SkIntersections::debugCoincidentUsed() const {
+    if (!fIsCoincident[0]) {
+        SkASSERT(!fIsCoincident[1]);
+        return 0;
+    }
+    int count = 0;
+    SkDEBUGCODE(int count2 = 0;)
+    for (int index = 0; index < fUsed; ++index) {
+        if (fIsCoincident[0] & (1 << index)) {
+            ++count;
+        }
+#ifdef SK_DEBUG
+        if (fIsCoincident[1] & (1 << index)) {
+            ++count2;
+        }
+#endif
+    }
+    SkASSERT(count == count2);
+    return count;
+}
+
+#include "SkOpContour.h"
+
+bool SkOpPtT::debugContains(const SkOpPtT* check) const {
+    SkASSERT(this != check);
+    const SkOpPtT* ptT = this;
+    int links = 0;
+    do {
+        ptT = ptT->next();
+        if (ptT == check) {
+            return true;
+        }
+        ++links;
+        const SkOpPtT* test = this;
+        for (int index = 0; index < links; ++index) {
+            if (ptT == test) {
+                return false;
+            }
+            test = test->next();
+        }
+    } while (true);
+}
+
+const SkOpPtT* SkOpPtT::debugContains(const SkOpSegment* check) const {
+    SkASSERT(this->segment() != check);
+    const SkOpPtT* ptT = this;
+    int links = 0;
+    do {
+        ptT = ptT->next();
+        if (ptT->segment() == check) {
+            return ptT;
+        }
+        ++links;
+        const SkOpPtT* test = this;
+        for (int index = 0; index < links; ++index) {
+            if (ptT == test) {
+                return nullptr;
+            }
+            test = test->next();
+        }
+    } while (true);
+}
+
+int SkOpPtT::debugLoopLimit(bool report) const {
+    int loop = 0;
+    const SkOpPtT* next = this;
+    do {
+        for (int check = 1; check < loop - 1; ++check) {
+            const SkOpPtT* checkPtT = this->fNext;
+            const SkOpPtT* innerPtT = checkPtT;
+            for (int inner = check + 1; inner < loop; ++inner) {
+                innerPtT = innerPtT->fNext;
+                if (checkPtT == innerPtT) {
+                    if (report) {
+                        SkDebugf("*** bad ptT loop ***\n");
+                    }
+                    return loop;
+                }
+            }
+        }
+        // there's nothing wrong with extremely large loop counts -- but this may appear to hang
+        // by taking a very long time to figure out that no loop entry is a duplicate
+        // -- and it's likely that a large loop count is indicative of a bug somewhere
+        if (++loop > 1000) {
+            SkDebugf("*** loop count exceeds 1000 ***\n");
+            return 1000;
+        }
+    } while ((next = next->fNext) && next != this);
+    return 0;
+}
+
+void SkOpPtT::debugValidate() const {
+#if DEBUG_VALIDATE
+    SkOpGlobalState::Phase phase = contour()->globalState()->phase();
+    if (phase == SkOpGlobalState::kIntersecting
+            || phase == SkOpGlobalState::kFixWinding) {
+        return;
+    }
+    SkASSERT(fNext);
+    SkASSERT(fNext != this);
+    SkASSERT(fNext->fNext);
+    SkASSERT(debugLoopLimit(false) == 0);
+#endif
+}
+
+static void output_scalar(SkScalar num) {
+    if (num == (int) num) {
+        SkDebugf("%d", (int) num);
+    } else {
+        SkString str;
+        str.printf("%1.9g", num);
+        int width = (int) str.size();
+        const char* cStr = str.c_str();
+        while (cStr[width - 1] == '0') {
+            --width;
+        }
+        str.resize(width);
+        SkDebugf("%sf", str.c_str());
+    }
+}
+
+static void output_points(const SkPoint* pts, int count) {
+    for (int index = 0; index < count; ++index) {
+        output_scalar(pts[index].fX);
+        SkDebugf(", ");
+        output_scalar(pts[index].fY);
+        if (index + 1 < count) {
+            SkDebugf(", ");
+        }
+    }
+}
+
+static void showPathContours(SkPath::RawIter& iter, const char* pathName) {
+    uint8_t verb;
+    SkPoint pts[4];
+    while ((verb = iter.next(pts)) != SkPath::kDone_Verb) {
+        switch (verb) {
+            case SkPath::kMove_Verb:
+                SkDebugf("    %s.moveTo(", pathName);
+                output_points(&pts[0], 1);
+                SkDebugf(");\n");
+                continue;
+            case SkPath::kLine_Verb:
+                SkDebugf("    %s.lineTo(", pathName);
+                output_points(&pts[1], 1);
+                SkDebugf(");\n");
+                break;
+            case SkPath::kQuad_Verb:
+                SkDebugf("    %s.quadTo(", pathName);
+                output_points(&pts[1], 2);
+                SkDebugf(");\n");
+                break;
+            case SkPath::kConic_Verb:
+                SkDebugf("    %s.conicTo(", pathName);
+                output_points(&pts[1], 2);
+                SkDebugf(", %1.9gf);\n", iter.conicWeight());
+                break;
+            case SkPath::kCubic_Verb:
+                SkDebugf("    %s.cubicTo(", pathName);
+                output_points(&pts[1], 3);
+                SkDebugf(");\n");
+                break;
+            case SkPath::kClose_Verb:
+                SkDebugf("    %s.close();\n", pathName);
+                break;
+            default:
+                SkDEBUGFAIL("bad verb");
+                return;
+        }
+    }
+}
+
+static const char* gFillTypeStr[] = {
+    "kWinding_FillType",
+    "kEvenOdd_FillType",
+    "kInverseWinding_FillType",
+    "kInverseEvenOdd_FillType"
+};
+
+void SkPathOpsDebug::ShowOnePath(const SkPath& path, const char* name, bool includeDeclaration) {
+    SkPath::RawIter iter(path);
+#define SUPPORT_RECT_CONTOUR_DETECTION 0
+#if SUPPORT_RECT_CONTOUR_DETECTION
+    int rectCount = path.isRectContours() ? path.rectContours(nullptr, nullptr) : 0;
+    if (rectCount > 0) {
+        SkTDArray<SkRect> rects;
+        SkTDArray<SkPath::Direction> directions;
+        rects.setCount(rectCount);
+        directions.setCount(rectCount);
+        path.rectContours(rects.begin(), directions.begin());
+        for (int contour = 0; contour < rectCount; ++contour) {
+            const SkRect& rect = rects[contour];
+            SkDebugf("path.addRect(%1.9g, %1.9g, %1.9g, %1.9g, %s);\n", rect.fLeft, rect.fTop,
+                    rect.fRight, rect.fBottom, directions[contour] == SkPath::kCCW_Direction
+                    ? "SkPath::kCCW_Direction" : "SkPath::kCW_Direction");
+        }
+        return;
+    }
+#endif
+    SkPath::FillType fillType = path.getFillType();
+    SkASSERT(fillType >= SkPath::kWinding_FillType && fillType <= SkPath::kInverseEvenOdd_FillType);
+    if (includeDeclaration) {
+        SkDebugf("    SkPath %s;\n", name);
+    }
+    SkDebugf("    %s.setFillType(SkPath::%s);\n", name, gFillTypeStr[fillType]);
+    iter.setPath(path);
+    showPathContours(iter, name);
+}
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsDebug.h b/gfx/skia/skia/src/pathops/SkPathOpsDebug.h
index 211c503aadb6..bd27e7df2dd5 100644
--- a/gfx/skia/skia/src/pathops/SkPathOpsDebug.h
+++ b/gfx/skia/skia/src/pathops/SkPathOpsDebug.h
@@ -9,6 +9,8 @@
 
 #include "SkPathOps.h"
 #include "SkTypes.h"
+
+#include <stdlib.h>
 #include <stdio.h>
 
 #ifdef SK_RELEASE
@@ -39,90 +41,106 @@
 
 #define DEBUG_ACTIVE_OP 0
 #define DEBUG_ACTIVE_SPANS 0
-#define DEBUG_ACTIVE_SPANS_FIRST_ONLY 0
-#define DEBUG_ACTIVE_SPANS_SHORT_FORM 1
 #define DEBUG_ADD_INTERSECTING_TS 0
-#define DEBUG_ADD_T_PAIR 0
+#define DEBUG_ADD_T 0
+#define DEBUG_ALIGNMENT 0
 #define DEBUG_ANGLE 0
-#define DEBUG_AS_C_CODE 1
 #define DEBUG_ASSEMBLE 0
-#define DEBUG_CHECK_ENDS 0
-#define DEBUG_CHECK_TINY 0
-#define DEBUG_CONCIDENT 0
-#define DEBUG_CROSS 0
+#define DEBUG_COINCIDENCE 0
 #define DEBUG_CUBIC_BINARY_SEARCH 0
-#define DEBUG_DUPLICATES 0
-#define DEBUG_FLAT_QUADS 0
+#define DEBUG_CUBIC_SPLIT 0
+#define DEBUG_DUMP_SEGMENTS 0
 #define DEBUG_FLOW 0
 #define DEBUG_LIMIT_WIND_SUM 0
 #define DEBUG_MARK_DONE 0
 #define DEBUG_PATH_CONSTRUCTION 0
+#define DEBUG_PERP 0
 #define DEBUG_SHOW_TEST_NAME 0
-#define DEBUG_SHOW_TEST_PROGRESS 0
-#define DEBUG_SHOW_WINDING 0
 #define DEBUG_SORT 0
-#define DEBUG_SORT_COMPACT 0
-#define DEBUG_SORT_RAW 0
-#define DEBUG_SORT_SINGLE 0
-#define DEBUG_SWAP_TOP 0
-#define DEBUG_UNSORTABLE 0
+#define DEBUG_T_SECT 0
+#define DEBUG_T_SECT_DUMP 0
+#define DEBUG_T_SECT_LOOP_COUNT 0
 #define DEBUG_VALIDATE 0
-#define DEBUG_WIND_BUMP 0
 #define DEBUG_WINDING 0
 #define DEBUG_WINDING_AT_T 0
 
+
 #else
 
 #define DEBUG_ACTIVE_OP 1
 #define DEBUG_ACTIVE_SPANS 1
-#define DEBUG_ACTIVE_SPANS_FIRST_ONLY 0
-#define DEBUG_ACTIVE_SPANS_SHORT_FORM 1
 #define DEBUG_ADD_INTERSECTING_TS 1
-#define DEBUG_ADD_T_PAIR 1
+#define DEBUG_ADD_T 1
+#define DEBUG_ALIGNMENT 0
 #define DEBUG_ANGLE 1
-#define DEBUG_AS_C_CODE 1
 #define DEBUG_ASSEMBLE 1
-#define DEBUG_CHECK_ENDS 1
-#define DEBUG_CHECK_TINY 1
-#define DEBUG_CONCIDENT 1
-#define DEBUG_CROSS 01
-#define DEBUG_CUBIC_BINARY_SEARCH 1
-#define DEBUG_DUPLICATES 1
-#define DEBUG_FLAT_QUADS 0
+#define DEBUG_COINCIDENCE 0
+#define DEBUG_CUBIC_BINARY_SEARCH 0
+#define DEBUG_CUBIC_SPLIT 1
+#define DEBUG_DUMP_SEGMENTS 1
 #define DEBUG_FLOW 1
-#define DEBUG_LIMIT_WIND_SUM 4
+#define DEBUG_LIMIT_WIND_SUM 5
 #define DEBUG_MARK_DONE 1
 #define DEBUG_PATH_CONSTRUCTION 1
+#define DEBUG_PERP 1
 #define DEBUG_SHOW_TEST_NAME 1
-#define DEBUG_SHOW_TEST_PROGRESS 1
-#define DEBUG_SHOW_WINDING 0
 #define DEBUG_SORT 1
-#define DEBUG_SORT_COMPACT 0
-#define DEBUG_SORT_RAW 0
-#define DEBUG_SORT_SINGLE 0
-#define DEBUG_SWAP_TOP 1
-#define DEBUG_UNSORTABLE 1
-#define DEBUG_VALIDATE 0
-#define DEBUG_WIND_BUMP 0
+#define DEBUG_T_SECT 0
+#define DEBUG_T_SECT_DUMP 0
+#define DEBUG_T_SECT_LOOP_COUNT 0
+#define DEBUG_VALIDATE 1
 #define DEBUG_WINDING 1
 #define DEBUG_WINDING_AT_T 1
 
 #endif
 
-#if DEBUG_AS_C_CODE
-#define CUBIC_DEBUG_STR "{{%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}}"
-#define QUAD_DEBUG_STR  "{{%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}}"
-#define LINE_DEBUG_STR  "{{%1.9g,%1.9g}, {%1.9g,%1.9g}}"
-#define PT_DEBUG_STR "{{%1.9g,%1.9g}}"
+#ifdef SK_RELEASE
+    #define SkDEBUGRELEASE(a, b) b
+    #define SkDEBUGPARAMS(...)
+    #define SkDEBUGCODE_(...)
 #else
-#define CUBIC_DEBUG_STR "(%1.9g,%1.9g %1.9g,%1.9g %1.9g,%1.9g %1.9g,%1.9g)"
-#define QUAD_DEBUG_STR  "(%1.9g,%1.9g %1.9g,%1.9g %1.9g,%1.9g)"
-#define LINE_DEBUG_STR  "(%1.9g,%1.9g %1.9g,%1.9g)"
-#define PT_DEBUG_STR "(%1.9g,%1.9g)"
+    #define SkDEBUGRELEASE(a, b) a
+    #define SkDEBUGPARAMS(...) , __VA_ARGS__
+    #define SkDEBUGCODE_(...) __VA_ARGS__  // temporary until SkDEBUGCODE is fixed
 #endif
+
+#if DEBUG_VALIDATE == 0
+    #define PATH_OPS_DEBUG_VALIDATE_PARAMS(...)
+#else
+    #define PATH_OPS_DEBUG_VALIDATE_PARAMS(...) , __VA_ARGS__
+#endif
+
+#if DEBUG_T_SECT == 0
+    #define PATH_OPS_DEBUG_T_SECT_RELEASE(a, b) b
+    #define PATH_OPS_DEBUG_T_SECT_PARAMS(...)
+    #define PATH_OPS_DEBUG_T_SECT_CODE(...)
+#else
+    #define PATH_OPS_DEBUG_T_SECT_RELEASE(a, b) a
+    #define PATH_OPS_DEBUG_T_SECT_PARAMS(...) , __VA_ARGS__
+    #define PATH_OPS_DEBUG_T_SECT_CODE(...) __VA_ARGS__
+#endif
+
+#if DEBUG_T_SECT_DUMP > 1
+    extern int gDumpTSectNum;
+#endif
+
+#if DEBUG_COINCIDENCE
+    #define DEBUG_COINCIDENCE_HEALTH(contourList, id) \
+            SkPathOpsDebug::CheckHealth(contourList, id)
+#else
+    #define DEBUG_COINCIDENCE_HEALTH(contourList, id)
+#endif
+
+#define CUBIC_DEBUG_STR  "{{{%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}}}"
+#define CONIC_DEBUG_STR "{{{{%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}}}, %1.9g}"
+#define QUAD_DEBUG_STR   "{{{%1.9g,%1.9g}, {%1.9g,%1.9g}, {%1.9g,%1.9g}}}"
+#define LINE_DEBUG_STR   "{{{%1.9g,%1.9g}, {%1.9g,%1.9g}}}"
+#define PT_DEBUG_STR "{{%1.9g,%1.9g}}"
+
 #define T_DEBUG_STR(t, n) #t "[" #n "]=%1.9g"
 #define TX_DEBUG_STR(t) #t "[%d]=%1.9g"
 #define CUBIC_DEBUG_DATA(c) c[0].fX, c[0].fY, c[1].fX, c[1].fY, c[2].fX, c[2].fY, c[3].fX, c[3].fY
+#define CONIC_DEBUG_DATA(c, w) c[0].fX, c[0].fY, c[1].fX, c[1].fY, c[2].fX, c[2].fY, w
 #define QUAD_DEBUG_DATA(q)  q[0].fX, q[0].fY, q[1].fX, q[1].fY, q[2].fX, q[2].fY
 #define LINE_DEBUG_DATA(l)  l[0].fX, l[0].fY, l[1].fX, l[1].fY
 #define PT_DEBUG_DATA(i, n) i.pt(n).asSkPoint().fX, i.pt(n).asSkPoint().fY
@@ -135,19 +153,17 @@
 #include "SkTLS.h"
 #endif
 
-#include "SkTArray.h"
-#include "SkTDArray.h"
-
 class SkPathOpsDebug {
 public:
     static const char* kLVerbStr[];
+    struct GlitchLog;
 
 #if defined(SK_DEBUG) || !FORCE_RELEASE
     static int gContourID;
     static int gSegmentID;
 #endif
 
-#if DEBUG_SORT || DEBUG_SWAP_TOP
+#if DEBUG_SORT
     static int gSortCountDefault;
     static int gSortCount;
 #endif
@@ -156,7 +172,7 @@ public:
     static const char* kPathOpStr[];
 #endif
 
-    static bool ChaseContains(const SkTDArray<struct SkOpSpan *>& , const struct SkOpSpan * );
+    static void CoincidentHealth(class SkOpContourHead* contourList, const char* id);
     static void MathematicaIze(char* str, size_t bufferSize);
     static bool ValidWind(int winding);
     static void WindingPrintf(int winding);
@@ -169,68 +185,55 @@ public:
         SkPathOpsDebug::DeleteNameStr)))
     static void BumpTestName(char* );
 #endif
+    static const char* OpStr(SkPathOp );
     static void ShowOnePath(const SkPath& path, const char* name, bool includeDeclaration);
     static void ShowPath(const SkPath& one, const SkPath& two, SkPathOp op, const char* name);
-    static void DumpCoincidence(const SkTArray<class SkOpContour, true>& contours);
-    static void DumpCoincidence(const SkTArray<class SkOpContour* , true>& contours);
-    static void DumpContours(const SkTArray<class SkOpContour, true>& contours);
-    static void DumpContours(const SkTArray<class SkOpContour* , true>& contours);
-    static void DumpContourAngles(const SkTArray<class SkOpContour, true>& contours);
-    static void DumpContourAngles(const SkTArray<class SkOpContour* , true>& contours);
-    static void DumpContourPt(const SkTArray<class SkOpContour, true>& contours, int id);
-    static void DumpContourPt(const SkTArray<class SkOpContour* , true>& contours, int id);
-    static void DumpContourPts(const SkTArray<class SkOpContour, true>& contours);
-    static void DumpContourPts(const SkTArray<class SkOpContour* , true>& contours);
-    static void DumpContourSpan(const SkTArray<class SkOpContour, true>& contours, int id);
-    static void DumpContourSpan(const SkTArray<class SkOpContour* , true>& contours, int id);
-    static void DumpContourSpans(const SkTArray<class SkOpContour, true>& contours);
-    static void DumpContourSpans(const SkTArray<class SkOpContour* , true>& contours);
-    static void DumpSpans(const SkTDArray<struct SkOpSpan *>& );
-    static void DumpSpans(const SkTDArray<struct SkOpSpan *>* );
+
+    static bool ChaseContains(const SkTDArray<class SkOpSpanBase*>& , const class SkOpSpanBase* );
+
+    static void CheckHealth(class SkOpContourHead* contourList, const char* id);
+
+    static const struct SkOpAngle* DebugAngleAngle(const struct SkOpAngle*, int id);
+    static class SkOpContour* DebugAngleContour(struct SkOpAngle*, int id);
+    static const class SkOpPtT* DebugAnglePtT(const struct SkOpAngle*, int id);
+    static const class SkOpSegment* DebugAngleSegment(const struct SkOpAngle*, int id);
+    static const class SkOpSpanBase* DebugAngleSpan(const struct SkOpAngle*, int id);
+
+    static const struct SkOpAngle* DebugContourAngle(class SkOpContour*, int id);
+    static class SkOpContour* DebugContourContour(class SkOpContour*, int id);
+    static const class SkOpPtT* DebugContourPtT(class SkOpContour*, int id);
+    static const class SkOpSegment* DebugContourSegment(class SkOpContour*, int id);
+    static const class SkOpSpanBase* DebugContourSpan(class SkOpContour*, int id);
+
+    static const struct SkOpAngle* DebugCoincidenceAngle(class SkOpCoincidence*, int id);
+    static class SkOpContour* DebugCoincidenceContour(class SkOpCoincidence*, int id);
+    static const class SkOpPtT* DebugCoincidencePtT(class SkOpCoincidence*, int id);
+    static const class SkOpSegment* DebugCoincidenceSegment(class SkOpCoincidence*, int id);
+    static const class SkOpSpanBase* DebugCoincidenceSpan(class SkOpCoincidence*, int id);
+
+    static const struct SkOpAngle* DebugPtTAngle(const class SkOpPtT*, int id);
+    static class SkOpContour* DebugPtTContour(class SkOpPtT*, int id);
+    static const class SkOpPtT* DebugPtTPtT(const class SkOpPtT*, int id);
+    static const class SkOpSegment* DebugPtTSegment(const class SkOpPtT*, int id);
+    static const class SkOpSpanBase* DebugPtTSpan(const class SkOpPtT*, int id);
+
+    static const struct SkOpAngle* DebugSegmentAngle(const class SkOpSegment*, int id);
+    static class SkOpContour* DebugSegmentContour(class SkOpSegment*, int id);
+    static const class SkOpPtT* DebugSegmentPtT(const class SkOpSegment*, int id);
+    static const class SkOpSegment* DebugSegmentSegment(const class SkOpSegment*, int id);
+    static const class SkOpSpanBase* DebugSegmentSpan(const class SkOpSegment*, int id);
+
+    static const struct SkOpAngle* DebugSpanAngle(const class SkOpSpanBase*, int id);
+    static class SkOpContour* DebugSpanContour(class SkOpSpanBase*, int id);
+    static const class SkOpPtT* DebugSpanPtT(const class SkOpSpanBase*, int id);
+    static const class SkOpSegment* DebugSpanSegment(const class SkOpSpanBase*, int id);
+    static const class SkOpSpanBase* DebugSpanSpan(const class SkOpSpanBase*, int id);
 };
 
-// shorthand for calling from debugger
-void Dump(const SkTArray<class SkOpContour, true>& contours);
-void Dump(const SkTArray<class SkOpContour* , true>& contours);
-void Dump(const SkTArray<class SkOpContour, true>* contours);
-void Dump(const SkTArray<class SkOpContour* , true>* contours);
-
-void Dump(const SkTDArray<SkOpSpan* >& chase);
-void Dump(const SkTDArray<SkOpSpan* >* chase);
-
-void DumpAngles(const SkTArray<class SkOpContour, true>& contours);
-void DumpAngles(const SkTArray<class SkOpContour* , true>& contours);
-void DumpAngles(const SkTArray<class SkOpContour, true>* contours);
-void DumpAngles(const SkTArray<class SkOpContour* , true>* contours);
-
-void DumpCoin(const SkTArray<class SkOpContour, true>& contours);
-void DumpCoin(const SkTArray<class SkOpContour* , true>& contours);
-void DumpCoin(const SkTArray<class SkOpContour, true>* contours);
-void DumpCoin(const SkTArray<class SkOpContour* , true>* contours);
-
-void DumpPts(const SkTArray<class SkOpContour, true>& contours);
-void DumpPts(const SkTArray<class SkOpContour* , true>& contours);
-void DumpPts(const SkTArray<class SkOpContour, true>* contours);
-void DumpPts(const SkTArray<class SkOpContour* , true>* contours);
-
-void DumpPt(const SkTArray<class SkOpContour, true>& contours, int segmentID);
-void DumpPt(const SkTArray<class SkOpContour* , true>& contours, int segmentID);
-void DumpPt(const SkTArray<class SkOpContour, true>* contours, int segmentID);
-void DumpPt(const SkTArray<class SkOpContour* , true>* contours, int segmentID);
-
-void DumpSpans(const SkTArray<class SkOpContour, true>& contours);
-void DumpSpans(const SkTArray<class SkOpContour* , true>& contours);
-void DumpSpans(const SkTArray<class SkOpContour, true>* contours);
-void DumpSpans(const SkTArray<class SkOpContour* , true>* contours);
-
-void DumpSpan(const SkTArray<class SkOpContour, true>& contours, int segmentID);
-void DumpSpan(const SkTArray<class SkOpContour* , true>& contours, int segmentID);
-void DumpSpan(const SkTArray<class SkOpContour, true>* contours, int segmentID);
-void DumpSpan(const SkTArray<class SkOpContour* , true>* contours, int segmentID);
+struct SkDQuad;
 
 // generates tools/path_sorter.htm and path_visualizer.htm compatible data
-void DumpQ(const struct SkDQuad& quad1, const struct SkDQuad& quad2, int testNo);
-
-void DumpT(const struct SkDQuad& quad, double t);
+void DumpQ(const SkDQuad& quad1, const SkDQuad& quad2, int testNo);
+void DumpT(const SkDQuad& quad, double t);
 
 #endif
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsLine.cpp b/gfx/skia/skia/src/pathops/SkPathOpsLine.cpp
index 622961911a4d..cad54eb263ad 100644
--- a/gfx/skia/skia/src/pathops/SkPathOpsLine.cpp
+++ b/gfx/skia/skia/src/pathops/SkPathOpsLine.cpp
@@ -6,41 +6,6 @@
  */
 #include "SkPathOpsLine.h"
 
-SkDLine SkDLine::subDivide(double t1, double t2) const {
-    SkDVector delta = tangent();
-    SkDLine dst = {{{
-            fPts[0].fX - t1 * delta.fX, fPts[0].fY - t1 * delta.fY}, {
-            fPts[0].fX - t2 * delta.fX, fPts[0].fY - t2 * delta.fY}}};
-    return dst;
-}
-
-// may have this below somewhere else already:
-// copying here because I thought it was clever
-
-// Copyright 2001, softSurfer (www.softsurfer.com)
-// This code may be freely used and modified for any purpose
-// providing that this copyright notice is included with it.
-// SoftSurfer makes no warranty for this code, and cannot be held
-// liable for any real or imagined damage resulting from its use.
-// Users of this code must verify correctness for their application.
-
-// Assume that a class is already given for the object:
-//    Point with coordinates {float x, y;}
-//===================================================================
-
-// isLeft(): tests if a point is Left|On|Right of an infinite line.
-//    Input:  three points P0, P1, and P2
-//    Return: >0 for P2 left of the line through P0 and P1
-//            =0 for P2 on the line
-//            <0 for P2 right of the line
-//    See: the January 2001 Algorithm on Area of Triangles
-//    return (float) ((P1.x - P0.x)*(P2.y - P0.y) - (P2.x - P0.x)*(P1.y - P0.y));
-double SkDLine::isLeft(const SkDPoint& pt) const {
-    SkDVector p0 = fPts[1] - fPts[0];
-    SkDVector p2 = pt - fPts[0];
-    return p0.cross(p2);
-}
-
 SkDPoint SkDLine::ptAtT(double t) const {
     if (0 == t) {
         return fPts[0];
@@ -89,7 +54,7 @@ double SkDLine::nearPoint(const SkDPoint& xy, bool* unequal) const {
     if (unequal) {
         *unequal = (float) largest != (float) (largest + dist);
     }
-    t = SkPinT(t);
+    t = SkPinT(t);  // a looser pin breaks skpwww_lptemp_com_3
     SkASSERT(between(0, t, 1));
     return t;
 }
@@ -110,19 +75,6 @@ bool SkDLine::nearRay(const SkDPoint& xy) const {
     return RoughlyEqualUlps(largest, largest + dist); // is the dist within ULPS tolerance?
 }
 
-// Returns true if a ray from (0,0) to (x1,y1) is coincident with a ray (0,0) to (x2,y2)
-// OPTIMIZE: a specialty routine could speed this up -- may not be called very often though
-bool SkDLine::NearRay(double x1, double y1, double x2, double y2) {
-    double denom1 = x1 * x1 + y1 * y1;
-    double denom2 = x2 * x2 + y2 * y2;
-    SkDLine line = {{{0, 0}, {x1, y1}}};
-    SkDPoint pt = {x2, y2};
-    if (denom2 > denom1) {
-        SkTSwap(line[1], pt);
-    }
-    return line.nearRay(pt);
-}
-
 double SkDLine::ExactPointH(const SkDPoint& xy, double left, double right, double y) {
     if (xy.fY == y) {
         if (xy.fX == left) {
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsLine.h b/gfx/skia/skia/src/pathops/SkPathOpsLine.h
index 74eb61534888..882dadc1f8b5 100644
--- a/gfx/skia/skia/src/pathops/SkPathOpsLine.h
+++ b/gfx/skia/skia/src/pathops/SkPathOpsLine.h
@@ -15,32 +15,25 @@ struct SkDLine {
     const SkDPoint& operator[](int n) const { SkASSERT(n >= 0 && n < 2); return fPts[n]; }
     SkDPoint& operator[](int n) { SkASSERT(n >= 0 && n < 2); return fPts[n]; }
 
-    void set(const SkPoint pts[2]) {
+    const SkDLine& set(const SkPoint pts[2]) {
         fPts[0] = pts[0];
         fPts[1] = pts[1];
-    }
-
-    static SkDLine SubDivide(const SkPoint a[2], double t1, double t2) {
-        SkDLine line;
-        line.set(a);
-        return line.subDivide(t1, t2);
+        return *this;
     }
 
     double exactPoint(const SkDPoint& xy) const;
     static double ExactPointH(const SkDPoint& xy, double left, double right, double y);
     static double ExactPointV(const SkDPoint& xy, double top, double bottom, double x);
-    double isLeft(const SkDPoint& pt) const;
+
     double nearPoint(const SkDPoint& xy, bool* unequal) const;
     bool nearRay(const SkDPoint& xy) const;
     static double NearPointH(const SkDPoint& xy, double left, double right, double y);
     static double NearPointV(const SkDPoint& xy, double top, double bottom, double x);
-    static bool NearRay(double dx1, double dy1, double dx2, double dy2);
     SkDPoint ptAtT(double t) const;
-    SkDLine subDivide(double t1, double t2) const;
 
     void dump() const;
-private:
-    SkDVector tangent() const { return fPts[0] - fPts[1]; }
+    void dumpID(int ) const;
+    void dumpInner() const;
 };
 
 #endif
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsOp.cpp b/gfx/skia/skia/src/pathops/SkPathOpsOp.cpp
index 4c6923abb60b..257cb8ee69b6 100644
--- a/gfx/skia/skia/src/pathops/SkPathOpsOp.cpp
+++ b/gfx/skia/skia/src/pathops/SkPathOpsOp.cpp
@@ -5,27 +5,24 @@
  * found in the LICENSE file.
  */
 #include "SkAddIntersections.h"
+#include "SkOpCoincidence.h"
 #include "SkOpEdgeBuilder.h"
 #include "SkPathOpsCommon.h"
 #include "SkPathWriter.h"
 
-static SkOpSegment* findChaseOp(SkTDArray<SkOpSpan*>& chase, int* tIndex, int* endIndex) {
+static SkOpSegment* findChaseOp(SkTDArray<SkOpSpanBase*>& chase, SkOpSpanBase** startPtr,
+        SkOpSpanBase** endPtr) {
     while (chase.count()) {
-        SkOpSpan* span;
+        SkOpSpanBase* span;
         chase.pop(&span);
-        const SkOpSpan& backPtr = span->fOther->span(span->fOtherIndex);
-        SkOpSegment* segment = backPtr.fOther;
-        *tIndex = backPtr.fOtherIndex;
-        bool sortable = true;
+        // OPTIMIZE: prev makes this compatible with old code -- but is it necessary?
+        *startPtr = span->ptT()->prev()->span();
+        SkOpSegment* segment = (*startPtr)->segment();
         bool done = true;
-        *endIndex = -1;
-        if (const SkOpAngle* last = segment->activeAngle(*tIndex, tIndex, endIndex, &done,
-                &sortable)) {
-            if (last->unorderable()) {
-                continue;
-            }
-            *tIndex = last->start();
-            *endIndex = last->end();
+        *endPtr = nullptr;
+        if (SkOpAngle* last = segment->activeAngle(*startPtr, startPtr, endPtr, &done)) {
+            *startPtr = last->start();
+            *endPtr = last->end();
    #if TRY_ROTATE
             *chase.insert(0) = span;
    #else
@@ -36,46 +33,43 @@ static SkOpSegment* findChaseOp(SkTDArray<SkOpSpan*>& chase, int* tIndex, int* e
         if (done) {
             continue;
         }
-        if (!sortable) {
-            continue;
-        }
-        // find first angle, initialize winding to computed fWindSum
-        const SkOpAngle* angle = segment->spanToAngle(*tIndex, *endIndex);
-        if (!angle) {
-            continue;
-        }
-        const SkOpAngle* firstAngle = angle;
-        SkDEBUGCODE(bool loop = false);
         int winding;
-        do {
-            angle = angle->next();
-            SkASSERT(angle != firstAngle || !loop);
-            SkDEBUGCODE(loop |= angle == firstAngle);
-            segment = angle->segment();
-            winding = segment->windSum(angle);
-        } while (winding == SK_MinS32);
-        int sumMiWinding = segment->updateWindingReverse(angle);
-        int sumSuWinding = segment->updateOppWindingReverse(angle);
-        if (segment->operand()) {
-            SkTSwap<int>(sumMiWinding, sumSuWinding);
+        bool sortable;
+        const SkOpAngle* angle = AngleWinding(*startPtr, *endPtr, &winding, &sortable);
+        if (winding == SK_MinS32) {
+            continue;
         }
-        SkOpSegment* first = NULL;
+        int sumMiWinding, sumSuWinding;
+        if (sortable) {
+            segment = angle->segment();
+            sumMiWinding = segment->updateWindingReverse(angle);
+            sumSuWinding = segment->updateOppWindingReverse(angle);
+            if (segment->operand()) {
+                SkTSwap<int>(sumMiWinding, sumSuWinding);
+            }
+        }
+        SkOpSegment* first = nullptr;
+        const SkOpAngle* firstAngle = angle;
         while ((angle = angle->next()) != firstAngle) {
             segment = angle->segment();
-            int start = angle->start();
-            int end = angle->end();
+            SkOpSpanBase* start = angle->start();
+            SkOpSpanBase* end = angle->end();
             int maxWinding, sumWinding, oppMaxWinding, oppSumWinding;
-            segment->setUpWindings(start, end, &sumMiWinding, &sumSuWinding,
-                    &maxWinding, &sumWinding, &oppMaxWinding, &oppSumWinding);
+            if (sortable) {
+                segment->setUpWindings(start, end, &sumMiWinding, &sumSuWinding,
+                        &maxWinding, &sumWinding, &oppMaxWinding, &oppSumWinding);
+            }
             if (!segment->done(angle)) {
-                if (!first) {
+                if (!first && (sortable || start->starter(end)->windSum() != SK_MinS32)) {
                     first = segment;
-                    *tIndex = start;
-                    *endIndex = end;
+                    *startPtr = start;
+                    *endPtr = end;
                 }
                 // OPTIMIZATION: should this also add to the chase?
-                (void) segment->markAngle(maxWinding, sumWinding, oppMaxWinding,
-                    oppSumWinding, angle);
+                if (sortable) {
+                    (void) segment->markAngle(maxWinding, sumWinding, oppMaxWinding,
+                        oppSumWinding, angle);
+                }
             }
         }
         if (first) {
@@ -87,133 +81,85 @@ static SkOpSegment* findChaseOp(SkTDArray<SkOpSpan*>& chase, int* tIndex, int* e
             return first;
         }
     }
-    return NULL;
+    return nullptr;
 }
 
-/*
-static bool windingIsActive(int winding, int oppWinding, int spanWinding, int oppSpanWinding,
-        bool windingIsOp, PathOp op) {
-    bool active = windingIsActive(winding, spanWinding);
-    if (!active) {
-        return false;
-    }
-    if (oppSpanWinding && windingIsActive(oppWinding, oppSpanWinding)) {
-        switch (op) {
-            case kIntersect_Op:
-            case kUnion_Op:
-                return true;
-            case kDifference_Op: {
-                int absSpan = abs(spanWinding);
-                int absOpp = abs(oppSpanWinding);
-                return windingIsOp ? absSpan < absOpp : absSpan > absOpp;
-            }
-            case kXor_Op:
-                return spanWinding != oppSpanWinding;
-            default:
-                SkASSERT(0);
-        }
-    }
-    bool opActive = oppWinding != 0;
-    return gOpLookup[op][opActive][windingIsOp];
-}
-*/
-
-static bool bridgeOp(SkTArray<SkOpContour*, true>& contourList, const SkPathOp op,
-        const int xorMask, const int xorOpMask, SkPathWriter* simple) {
-    bool firstContour = true;
+static bool bridgeOp(SkOpContourHead* contourList, const SkPathOp op,
+        const int xorMask, const int xorOpMask, SkPathWriter* simple, SkChunkAlloc* allocator) {
     bool unsortable = false;
-    bool topUnsortable = false;
-    bool firstPass = true;
-    SkPoint lastTopLeft;
-    SkPoint topLeft = {SK_ScalarMin, SK_ScalarMin};
     do {
-        int index, endIndex;
-        bool topDone;
-        bool onlyVertical = false;
-        lastTopLeft = topLeft;
-        SkOpSegment* current = FindSortableTop(contourList, SkOpAngle::kBinarySingle, &firstContour,
-                &index, &endIndex, &topLeft, &topUnsortable, &topDone, &onlyVertical, firstPass);
-        if (!current) {
-            if ((!topUnsortable || firstPass) && !topDone) {
-                SkASSERT(topLeft.fX != SK_ScalarMin && topLeft.fY != SK_ScalarMin);
-                if (lastTopLeft.fX == SK_ScalarMin && lastTopLeft.fY == SK_ScalarMin) {
-                    if (firstPass) {
-                        firstPass = false;
-                    } else {
-                        break;
-                    }
-                }
-                topLeft.fX = topLeft.fY = SK_ScalarMin;
-                continue;
-            }
-            break;
-        } else if (onlyVertical) {
+        SkOpSpan* span = FindSortableTop(contourList);
+        if (!span) {
             break;
         }
-        firstPass = !topUnsortable || lastTopLeft != topLeft;
-        SkTDArray<SkOpSpan*> chase;
+        SkOpSegment* current = span->segment();
+        SkOpSpanBase* start = span->next();
+        SkOpSpanBase* end = span;
+        SkTDArray<SkOpSpanBase*> chase;
         do {
-            if (current->activeOp(index, endIndex, xorMask, xorOpMask, op)) {
+            if (current->activeOp(start, end, xorMask, xorOpMask, op)) {
                 do {
                     if (!unsortable && current->done()) {
                         break;
                     }
                     SkASSERT(unsortable || !current->done());
-                    int nextStart = index;
-                    int nextEnd = endIndex;
+                    SkOpSpanBase* nextStart = start;
+                    SkOpSpanBase* nextEnd = end;
                     SkOpSegment* next = current->findNextOp(&chase, &nextStart, &nextEnd,
                             &unsortable, op, xorMask, xorOpMask);
                     if (!next) {
                         if (!unsortable && simple->hasMove()
                                 && current->verb() != SkPath::kLine_Verb
                                 && !simple->isClosed()) {
-                            current->addCurveTo(index, endIndex, simple, true);
+                            if (!current->addCurveTo(start, end, simple)) {
+                                return false;
+                            }
                     #if DEBUG_ACTIVE_SPANS
                             if (!simple->isClosed()) {
                                 DebugShowActiveSpans(contourList);
                             }
                     #endif
-//                            SkASSERT(simple->isClosed());
                         }
                         break;
                     }
         #if DEBUG_FLOW
-            SkDebugf("%s current id=%d from=(%1.9g,%1.9g) to=(%1.9g,%1.9g)\n", __FUNCTION__,
-                    current->debugID(), current->xyAtT(index).fX, current->xyAtT(index).fY,
-                    current->xyAtT(endIndex).fX, current->xyAtT(endIndex).fY);
+                    SkDebugf("%s current id=%d from=(%1.9g,%1.9g) to=(%1.9g,%1.9g)\n", __FUNCTION__,
+                            current->debugID(), start->pt().fX, start->pt().fY,
+                            end->pt().fX, end->pt().fY);
         #endif
-                    current->addCurveTo(index, endIndex, simple, true);
-                    current = next;
-                    index = nextStart;
-                    endIndex = nextEnd;
-                } while (!simple->isClosed() && (!unsortable
-                        || !current->done(SkMin32(index, endIndex))));
-                if (current->activeWinding(index, endIndex) && !simple->isClosed()) {
-                    // FIXME : add to simplify, xor cpaths
-                    int min = SkMin32(index, endIndex);
-                    if (!unsortable && !simple->isEmpty()) {
-                        unsortable = current->checkSmall(min);
+                    if (!current->addCurveTo(start, end, simple)) {
+                        return false;
                     }
-                    if (!current->done(min)) {
-                        current->addCurveTo(index, endIndex, simple, true);
-                        current->markDoneBinary(min);
+                    current = next;
+                    start = nextStart;
+                    end = nextEnd;
+                } while (!simple->isClosed() && (!unsortable || !start->starter(end)->done()));
+                if (current->activeWinding(start, end) && !simple->isClosed()) {
+                    SkOpSpan* spanStart = start->starter(end);
+                    if (!spanStart->done()) {
+                        if (!current->addCurveTo(start, end, simple)) {
+                            return false;
+                        }
+                        current->markDone(spanStart);
                     }
                 }
                 simple->close();
             } else {
-                SkOpSpan* last = current->markAndChaseDoneBinary(index, endIndex);
-                if (last && !last->fChased && !last->fLoop) {
-                    last->fChased = true;
+                SkOpSpanBase* last = current->markAndChaseDone(start, end);
+                if (last && !last->chased()) {
+                    last->setChased(true);
                     SkASSERT(!SkPathOpsDebug::ChaseContains(chase, last));
                     *chase.append() = last;
 #if DEBUG_WINDING
-                    SkDebugf("%s chase.append id=%d windSum=%d small=%d\n", __FUNCTION__,
-                            last->fOther->span(last->fOtherIndex).fOther->debugID(), last->fWindSum,
-                            last->fSmall);
+                    SkDebugf("%s chase.append id=%d", __FUNCTION__, last->segment()->debugID());
+                    if (!last->final()) {
+                         SkDebugf(" windSum=%d", last->upCast()->windSum());
+                    }
+                    SkDebugf("\n");
 #endif
                 }
             }
-            current = findChaseOp(chase, &index, &endIndex);
+            current = findChaseOp(chase, &start, &end);
         #if DEBUG_ACTIVE_SPANS
             DebugShowActiveSpans(contourList);
         #endif
@@ -227,17 +173,17 @@ static bool bridgeOp(SkTArray<SkOpContour*, true>& contourList, const SkPathOp o
 
 // pretty picture:
 // https://docs.google.com/a/google.com/drawings/d/1sPV8rPfpEFXymBp3iSbDRWAycp1b-7vD9JP2V-kn9Ss/edit?usp=sharing
-static const SkPathOp gOpInverse[kReverseDifference_PathOp + 1][2][2] = {
+static const SkPathOp gOpInverse[kReverseDifference_SkPathOp + 1][2][2] = {
 //                  inside minuend                               outside minuend
 //     inside subtrahend     outside subtrahend      inside subtrahend     outside subtrahend
-    {{ kDifference_PathOp,    kIntersect_PathOp }, { kUnion_PathOp, kReverseDifference_PathOp }},
-    {{ kIntersect_PathOp,    kDifference_PathOp }, { kReverseDifference_PathOp, kUnion_PathOp }},
-    {{ kUnion_PathOp, kReverseDifference_PathOp }, { kDifference_PathOp,    kIntersect_PathOp }},
-    {{ kXOR_PathOp,                 kXOR_PathOp }, { kXOR_PathOp,                 kXOR_PathOp }},
-    {{ kReverseDifference_PathOp, kUnion_PathOp }, { kIntersect_PathOp,    kDifference_PathOp }},
+{{ kDifference_SkPathOp,   kIntersect_SkPathOp }, { kUnion_SkPathOp, kReverseDifference_SkPathOp }},
+{{ kIntersect_SkPathOp,   kDifference_SkPathOp }, { kReverseDifference_SkPathOp, kUnion_SkPathOp }},
+{{ kUnion_SkPathOp, kReverseDifference_SkPathOp }, { kDifference_SkPathOp,   kIntersect_SkPathOp }},
+{{ kXOR_SkPathOp,                 kXOR_SkPathOp }, { kXOR_SkPathOp,                kXOR_SkPathOp }},
+{{ kReverseDifference_SkPathOp, kUnion_SkPathOp }, { kIntersect_SkPathOp,   kDifference_SkPathOp }},
 };
 
-static const bool gOutInverse[kReverseDifference_PathOp + 1][2][2] = {
+static const bool gOutInverse[kReverseDifference_SkPathOp + 1][2][2] = {
     {{ false, false }, { true, false }},  // diff
     {{ false, false }, { false, true }},  // sect
     {{ false, true }, { true, true }},    // union
@@ -245,8 +191,71 @@ static const bool gOutInverse[kReverseDifference_PathOp + 1][2][2] = {
     {{ false, true }, { false, false }},  // rev diff
 };
 
-bool Op(const SkPath& one, const SkPath& two, SkPathOp op, SkPath* result) {
-#if DEBUG_SHOW_TEST_NAME
+#define DEBUGGING_PATHOPS_FROM_HOST 0  // enable to debug svg in chrome -- note path hardcoded below
+#if DEBUGGING_PATHOPS_FROM_HOST
+#include "SkData.h"
+#include "SkStream.h"
+
+static void dump_path(FILE* file, const SkPath& path, bool force, bool dumpAsHex) {
+    SkDynamicMemoryWStream wStream;
+    path.dump(&wStream, force, dumpAsHex);
+    SkAutoDataUnref data(wStream.copyToData());
+    fprintf(file, "%.*s\n", (int) data->size(), data->data());
+}
+
+static int dumpID = 0;
+
+static void dump_op(const SkPath& one, const SkPath& two, SkPathOp op) {
+#if SK_BUILD_FOR_MAC
+    FILE* file = fopen("/Users/caryclark/Documents/svgop.txt", "w");
+#else
+    FILE* file = fopen("/usr/local/google/home/caryclark/Documents/svgop.txt", "w");
+#endif
+    fprintf(file,
+            "\nstatic void fuzz763_%d(skiatest::Reporter* reporter, const char* filename) {\n",
+            ++dumpID);
+    fprintf(file, "    SkPath path;\n");
+    fprintf(file, "    path.setFillType((SkPath::FillType) %d);\n", one.getFillType());
+    dump_path(file, one, false, true);
+    fprintf(file, "    SkPath path1(path);\n");
+    fprintf(file, "    path.reset();\n");
+    fprintf(file, "    path.setFillType((SkPath::FillType) %d);\n", two.getFillType());
+    dump_path(file, two, false, true);
+    fprintf(file, "    SkPath path2(path);\n");
+    fprintf(file, "    testPathOp(reporter, path1, path2, (SkPathOp) %d, filename);\n", op);
+    fprintf(file, "}\n");    
+    fclose(file);
+}
+#endif
+
+
+#if DEBUG_T_SECT_LOOP_COUNT
+
+#include "SkMutex.h"
+
+SK_DECLARE_STATIC_MUTEX(debugWorstLoop);
+
+SkOpGlobalState debugWorstState(nullptr, nullptr  SkDEBUGPARAMS(nullptr));
+
+void ReportPathOpsDebugging() {
+    debugWorstState.debugLoopReport();
+}
+
+extern void (*gVerboseFinalize)();
+
+#endif
+
+bool OpDebug(const SkPath& one, const SkPath& two, SkPathOp op, SkPath* result,
+        bool expectSuccess  SkDEBUGPARAMS(const char* testName)) {
+    SkChunkAlloc allocator(4096);  // FIXME: add a constant expression here, tune
+    SkOpContour contour;
+    SkOpContourHead* contourList = static_cast<SkOpContourHead*>(&contour);
+    SkOpCoincidence coincidence;
+    SkOpGlobalState globalState(&coincidence, contourList  SkDEBUGPARAMS(testName));
+#if DEBUGGING_PATHOPS_FROM_HOST
+    dump_op(one, two, op);
+#endif    
+#if 0 && DEBUG_SHOW_TEST_NAME
     char* debugName = DEBUG_FILENAME_STRING;
     if (debugName && debugName[0]) {
         SkPathOpsDebug::BumpTestName(debugName);
@@ -258,59 +267,57 @@ bool Op(const SkPath& one, const SkPath& two, SkPathOp op, SkPath* result) {
             ? SkPath::kInverseEvenOdd_FillType : SkPath::kEvenOdd_FillType;
     const SkPath* minuend = &one;
     const SkPath* subtrahend = &two;
-    if (op == kReverseDifference_PathOp) {
+    if (op == kReverseDifference_SkPathOp) {
         minuend = &two;
         subtrahend = &one;
-        op = kDifference_PathOp;
+        op = kDifference_SkPathOp;
     }
-#if DEBUG_SORT || DEBUG_SWAP_TOP
+#if DEBUG_SORT
     SkPathOpsDebug::gSortCount = SkPathOpsDebug::gSortCountDefault;
 #endif
     // turn path into list of segments
-    SkTArray<SkOpContour> contours;
-    // FIXME: add self-intersecting cubics' T values to segment
-    SkOpEdgeBuilder builder(*minuend, contours);
+    SkOpEdgeBuilder builder(*minuend, &contour, &allocator, &globalState);
+    if (builder.unparseable()) {
+        return false;
+    }
     const int xorMask = builder.xorMask();
     builder.addOperand(*subtrahend);
-    if (!builder.finish()) {
+    if (!builder.finish(&allocator)) {
         return false;
     }
-    result->reset();
-    result->setFillType(fillType);
+#if DEBUG_DUMP_SEGMENTS
+    contourList->dumpSegments("seg", op);
+#endif
+
     const int xorOpMask = builder.xorMask();
-    SkTArray<SkOpContour*, true> contourList;
-    MakeContourList(contours, contourList, xorMask == kEvenOdd_PathOpsMask,
-            xorOpMask == kEvenOdd_PathOpsMask);
-    SkOpContour** currentPtr = contourList.begin();
-    if (!currentPtr) {
+    if (!SortContourList(&contourList, xorMask == kEvenOdd_PathOpsMask,
+            xorOpMask == kEvenOdd_PathOpsMask)) {
+        result->reset();
+        result->setFillType(fillType);
         return true;
     }
-    SkOpContour** listEnd = contourList.end();
     // find all intersections between segments
+    SkOpContour* current = contourList;
     do {
-        SkOpContour** nextPtr = currentPtr;
-        SkOpContour* current = *currentPtr++;
-        if (current->containsCubics()) {
-            AddSelfIntersectTs(current);
-        }
-        SkOpContour* next;
-        do {
-            next = *nextPtr++;
-        } while (AddIntersectTs(current, next) && nextPtr != listEnd);
-    } while (currentPtr != listEnd);
-    // eat through coincident edges
-
-    int total = 0;
-    int index;
-    for (index = 0; index < contourList.count(); ++index) {
-        total += contourList[index]->segments().count();
-    }
-    if (!HandleCoincidence(&contourList, total)) {
+        SkOpContour* next = current;
+        while (AddIntersectTs(current, next, &coincidence, &allocator)
+                && (next = next->next()))
+            ;
+    } while ((current = current->next()));
+#if DEBUG_VALIDATE
+    globalState.setPhase(SkOpGlobalState::kWalking);
+#endif
+    if (!HandleCoincidence(contourList, &coincidence, &allocator)) {
         return false;
     }
+#if DEBUG_ALIGNMENT
+    contourList->dumpSegments("aligned");
+#endif
     // construct closed contours
+    result->reset();
+    result->setFillType(fillType);
     SkPathWriter wrapper(*result);
-    bridgeOp(contourList, op, xorMask, xorOpMask, &wrapper);
+    bridgeOp(contourList, op, xorMask, xorOpMask, &wrapper, &allocator);
     {  // if some edges could not be resolved, assemble remaining fragments
         SkPath temp;
         temp.setFillType(fillType);
@@ -319,5 +326,134 @@ bool Op(const SkPath& one, const SkPath& two, SkPathOp op, SkPath* result) {
         *result = *assembled.nativePath();
         result->setFillType(fillType);
     }
+#if DEBUG_T_SECT_LOOP_COUNT
+    {
+        SkAutoMutexAcquire autoM(debugWorstLoop);
+        if (!gVerboseFinalize) {
+            gVerboseFinalize = &ReportPathOpsDebugging;
+        }
+        debugWorstState.debugDoYourWorst(&globalState);
+    }
+#endif
     return true;
 }
+
+#define DEBUG_VERIFY 0
+
+#if DEBUG_VERIFY
+#include "SkBitmap.h"
+#include "SkCanvas.h"
+#include "SkPaint.h"
+
+const int bitWidth = 64;
+const int bitHeight = 64;
+
+static void debug_scale_matrix(const SkPath& one, const SkPath& two, SkMatrix& scale) {
+    SkRect larger = one.getBounds();
+    larger.join(two.getBounds());
+    SkScalar largerWidth = larger.width();
+    if (largerWidth < 4) {
+        largerWidth = 4;
+    }
+    SkScalar largerHeight = larger.height();
+    if (largerHeight < 4) {
+        largerHeight = 4;
+    }
+    SkScalar hScale = (bitWidth - 2) / largerWidth;
+    SkScalar vScale = (bitHeight - 2) / largerHeight;
+    scale.reset();
+    scale.preScale(hScale, vScale);
+    larger.fLeft *= hScale;
+    larger.fRight *= hScale;
+    larger.fTop *= vScale;
+    larger.fBottom *= vScale;
+    SkScalar dx = -16000 > larger.fLeft ? -16000 - larger.fLeft
+            : 16000 < larger.fRight ? 16000 - larger.fRight : 0;
+    SkScalar dy = -16000 > larger.fTop ? -16000 - larger.fTop
+            : 16000 < larger.fBottom ? 16000 - larger.fBottom : 0;
+    scale.preTranslate(dx, dy);
+}
+
+static int debug_paths_draw_the_same(const SkPath& one, const SkPath& two, SkBitmap& bits) {
+    if (bits.width() == 0) {
+        bits.allocN32Pixels(bitWidth * 2, bitHeight);
+    }
+    SkCanvas canvas(bits);
+    canvas.drawColor(SK_ColorWHITE);
+    SkPaint paint;
+    canvas.save();
+    const SkRect& bounds1 = one.getBounds();
+    canvas.translate(-bounds1.fLeft + 1, -bounds1.fTop + 1);
+    canvas.drawPath(one, paint);
+    canvas.restore();
+    canvas.save();
+    canvas.translate(-bounds1.fLeft + 1 + bitWidth, -bounds1.fTop + 1);
+    canvas.drawPath(two, paint);
+    canvas.restore();
+    int errors = 0;
+    for (int y = 0; y < bitHeight - 1; ++y) {
+        uint32_t* addr1 = bits.getAddr32(0, y);
+        uint32_t* addr2 = bits.getAddr32(0, y + 1);
+        uint32_t* addr3 = bits.getAddr32(bitWidth, y);
+        uint32_t* addr4 = bits.getAddr32(bitWidth, y + 1);
+        for (int x = 0; x < bitWidth - 1; ++x) {
+            // count 2x2 blocks
+            bool err = addr1[x] != addr3[x];
+            if (err) {
+                errors += addr1[x + 1] != addr3[x + 1]
+                        && addr2[x] != addr4[x] && addr2[x + 1] != addr4[x + 1];
+            }
+        }
+    }
+    return errors;
+}
+
+#endif
+
+bool Op(const SkPath& one, const SkPath& two, SkPathOp op, SkPath* result) {
+#if DEBUG_VERIFY
+    if (!OpDebug(one, two, op, result, true  SkDEBUGPARAMS(nullptr))) {
+        SkDebugf("%s did not expect failure\none: fill=%d\n", __FUNCTION__, one.getFillType());
+        one.dumpHex();
+        SkDebugf("two: fill=%d\n", two.getFillType());
+        two.dumpHex();
+        SkASSERT(0);
+        return false;
+    }
+    SkPath pathOut, scaledPathOut;
+    SkRegion rgnA, rgnB, openClip, rgnOut;
+    openClip.setRect(-16000, -16000, 16000, 16000);
+    rgnA.setPath(one, openClip);
+    rgnB.setPath(two, openClip);
+    rgnOut.op(rgnA, rgnB, (SkRegion::Op) op);
+    rgnOut.getBoundaryPath(&pathOut);
+    SkMatrix scale;
+    debug_scale_matrix(one, two, scale);
+    SkRegion scaledRgnA, scaledRgnB, scaledRgnOut;
+    SkPath scaledA, scaledB;
+    scaledA.addPath(one, scale);
+    scaledA.setFillType(one.getFillType());
+    scaledB.addPath(two, scale);
+    scaledB.setFillType(two.getFillType());
+    scaledRgnA.setPath(scaledA, openClip);
+    scaledRgnB.setPath(scaledB, openClip);
+    scaledRgnOut.op(scaledRgnA, scaledRgnB, (SkRegion::Op) op);
+    scaledRgnOut.getBoundaryPath(&scaledPathOut);
+    SkBitmap bitmap;
+    SkPath scaledOut;
+    scaledOut.addPath(*result, scale);
+    scaledOut.setFillType(result->getFillType());
+    int errors = debug_paths_draw_the_same(scaledPathOut, scaledOut, bitmap);
+    const int MAX_ERRORS = 9;
+    if (errors > MAX_ERRORS) {
+        SkDebugf("%s did not expect failure\none: fill=%d\n", __FUNCTION__, one.getFillType());
+        one.dumpHex();
+        SkDebugf("two: fill=%d\n", two.getFillType());
+        two.dumpHex();
+        SkASSERT(0);
+    }
+    return true;
+#else
+    return OpDebug(one, two, op, result, true  SkDEBUGPARAMS(nullptr));
+#endif
+}
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsPoint.cpp b/gfx/skia/skia/src/pathops/SkPathOpsPoint.cpp
index dc9cde55a3a1..e0f175dac5c3 100644
--- a/gfx/skia/skia/src/pathops/SkPathOpsPoint.cpp
+++ b/gfx/skia/skia/src/pathops/SkPathOpsPoint.cpp
@@ -10,8 +10,3 @@ SkDVector operator-(const SkDPoint& a, const SkDPoint& b) {
     SkDVector v = {a.fX - b.fX, a.fY - b.fY};
     return v;
 }
-
-SkDPoint operator+(const SkDPoint& a, const SkDVector& b) {
-    SkDPoint v = {a.fX + b.fX, a.fY + b.fY};
-    return v;
-}
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsPoint.h b/gfx/skia/skia/src/pathops/SkPathOpsPoint.h
index 5c2e3a50ddd2..e3f722bede18 100644
--- a/gfx/skia/skia/src/pathops/SkPathOpsPoint.h
+++ b/gfx/skia/skia/src/pathops/SkPathOpsPoint.h
@@ -23,23 +23,25 @@ struct SkDVector {
         fY = pt.fY;
     }
 
-    friend SkDPoint operator+(const SkDPoint& a, const SkDVector& b);
-
+    // only used by testing
     void operator+=(const SkDVector& v) {
         fX += v.fX;
         fY += v.fY;
     }
 
+    // only called by nearestT, which is currently only used by testing
     void operator-=(const SkDVector& v) {
         fX -= v.fX;
         fY -= v.fY;
     }
 
+    // only used by testing
     void operator/=(const double s) {
         fX /= s;
         fY /= s;
     }
 
+    // only used by testing
     void operator*=(const double s) {
         fX *= s;
         fY *= s;
@@ -50,6 +52,7 @@ struct SkDVector {
         return v;
     }
 
+    // only used by testing
     double cross(const SkDVector& a) const {
         return fX * a.fY - fY * a.fX;
     }
@@ -98,16 +101,32 @@ struct SkDPoint {
         fY = pt.fY;
     }
 
+    // only used by testing
     void operator+=(const SkDVector& v) {
         fX += v.fX;
         fY += v.fY;
     }
 
+    // only used by testing
     void operator-=(const SkDVector& v) {
         fX -= v.fX;
         fY -= v.fY;
     }
 
+    // only used by testing
+    SkDPoint operator+(const SkDVector& v) {
+        SkDPoint result = *this;
+        result += v;
+        return result;
+    }
+
+    // only used by testing
+    SkDPoint operator-(const SkDVector& v) {
+        SkDPoint result = *this;
+        result -= v;
+        return result;
+    }
+
     // note: this can not be implemented with
     // return approximately_equal(a.fY, fY) && approximately_equal(a.fX, fX);
     // because that will not take the magnitude of the values into account
@@ -122,7 +141,7 @@ struct SkDPoint {
         double tiniest = SkTMin(SkTMin(SkTMin(fX, a.fX), fY), a.fY);
         double largest = SkTMax(SkTMax(SkTMax(fX, a.fX), fY), a.fY);
         largest = SkTMax(largest, -tiniest);
-        return AlmostBequalUlps(largest, largest + dist); // is the dist within ULPS tolerance?
+        return AlmostPequalUlps(largest, largest + dist); // is the dist within ULPS tolerance?
     }
 
     bool approximatelyEqual(const SkPoint& a) const {
@@ -145,44 +164,10 @@ struct SkDPoint {
         float tiniest = SkTMin(SkTMin(SkTMin(a.fX, b.fX), a.fY), b.fY);
         float largest = SkTMax(SkTMax(SkTMax(a.fX, b.fX), a.fY), b.fY);
         largest = SkTMax(largest, -tiniest);
-        return AlmostBequalUlps((double) largest, largest + dist); // is dist within ULPS tolerance?
-    }
-
-    static bool RoughlyEqual(const SkPoint& a, const SkPoint& b) {
-        if (approximately_equal(a.fX, b.fX) && approximately_equal(a.fY, b.fY)) {
-            return true;
-        }
-        return RoughlyEqualUlps(a.fX, b.fX) && RoughlyEqualUlps(a.fY, b.fY);
-    }
-
-    bool approximatelyPEqual(const SkDPoint& a) const {
-        if (approximately_equal(fX, a.fX) && approximately_equal(fY, a.fY)) {
-            return true;
-        }
-        if (!RoughlyEqualUlps(fX, a.fX) || !RoughlyEqualUlps(fY, a.fY)) {
-            return false;
-        }
-        double dist = distance(a);  // OPTIMIZATION: can we compare against distSq instead ?
-        double tiniest = SkTMin(SkTMin(SkTMin(fX, a.fX), fY), a.fY);
-        double largest = SkTMax(SkTMax(SkTMax(fX, a.fX), fY), a.fY);
-        largest = SkTMax(largest, -tiniest);
-        return AlmostPequalUlps(largest, largest + dist); // is the dist within ULPS tolerance?
-    }
-
-    bool approximatelyDEqual(const SkDPoint& a) const {
-        if (approximately_equal(fX, a.fX) && approximately_equal(fY, a.fY)) {
-            return true;
-        }
-        if (!RoughlyEqualUlps(fX, a.fX) || !RoughlyEqualUlps(fY, a.fY)) {
-            return false;
-        }
-        double dist = distance(a);  // OPTIMIZATION: can we compare against distSq instead ?
-        double tiniest = SkTMin(SkTMin(SkTMin(fX, a.fX), fY), a.fY);
-        double largest = SkTMax(SkTMax(SkTMax(fX, a.fX), fY), a.fY);
-        largest = SkTMax(largest, -tiniest);
-        return AlmostDequalUlps(largest, largest + dist); // is the dist within ULPS tolerance?
+        return AlmostPequalUlps((double) largest, largest + dist); // is dist within ULPS tolerance?
     }
 
+    // only used by testing
     bool approximatelyZero() const {
         return approximately_zero(fX) && approximately_zero(fY);
     }
@@ -209,7 +194,7 @@ struct SkDPoint {
         return result;
     }
 
-    bool moreRoughlyEqual(const SkDPoint& a) const {
+    bool roughlyEqual(const SkDPoint& a) const {
         if (roughly_equal(fX, a.fX) && roughly_equal(fY, a.fY)) {
             return true;
         }
@@ -220,13 +205,24 @@ struct SkDPoint {
         return RoughlyEqualUlps(largest, largest + dist); // is the dist within ULPS tolerance?
     }
 
-    bool roughlyEqual(const SkDPoint& a) const {
-        return roughly_equal(a.fY, fY) && roughly_equal(a.fX, fX);
+    static bool RoughlyEqual(const SkPoint& a, const SkPoint& b) {
+        if (!RoughlyEqualUlps(a.fX, b.fX) && !RoughlyEqualUlps(a.fY, b.fY)) {
+            return false;
+        }
+        SkDPoint dA, dB;
+        dA.set(a);
+        dB.set(b);
+        double dist = dA.distance(dB);  // OPTIMIZATION: can we compare against distSq instead ?
+        float tiniest = SkTMin(SkTMin(SkTMin(a.fX, b.fX), a.fY), b.fY);
+        float largest = SkTMax(SkTMax(SkTMax(a.fX, b.fX), a.fY), b.fY);
+        largest = SkTMax(largest, -tiniest);
+        return RoughlyEqualUlps((double) largest, largest + dist); // is dist within ULPS tolerance?
     }
 
     // utilities callable by the user from the debugger when the implementation code is linked in
     void dump() const;
     static void Dump(const SkPoint& pt);
+    static void DumpHex(const SkPoint& pt);
 };
 
 #endif
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsQuad.cpp b/gfx/skia/skia/src/pathops/SkPathOpsQuad.cpp
index c1d068af3457..12b9658ce7cd 100644
--- a/gfx/skia/skia/src/pathops/SkPathOpsQuad.cpp
+++ b/gfx/skia/skia/src/pathops/SkPathOpsQuad.cpp
@@ -7,63 +7,70 @@
 #include "SkIntersections.h"
 #include "SkLineParameters.h"
 #include "SkPathOpsCubic.h"
+#include "SkPathOpsCurve.h"
 #include "SkPathOpsQuad.h"
-#include "SkPathOpsTriangle.h"
 
-// from http://blog.gludion.com/2009/08/distance-to-quadratic-bezier-curve.html
-// (currently only used by testing)
-double SkDQuad::nearestT(const SkDPoint& pt) const {
-    SkDVector pos = fPts[0] - pt;
-    // search points P of bezier curve with PM.(dP / dt) = 0
-    // a calculus leads to a 3d degree equation :
-    SkDVector A = fPts[1] - fPts[0];
-    SkDVector B = fPts[2] - fPts[1];
-    B -= A;
-    double a = B.dot(B);
-    double b = 3 * A.dot(B);
-    double c = 2 * A.dot(A) + pos.dot(B);
-    double d = pos.dot(A);
-    double ts[3];
-    int roots = SkDCubic::RootsValidT(a, b, c, d, ts);
-    double d0 = pt.distanceSquared(fPts[0]);
-    double d2 = pt.distanceSquared(fPts[2]);
-    double distMin = SkTMin(d0, d2);
-    int bestIndex = -1;
-    for (int index = 0; index < roots; ++index) {
-        SkDPoint onQuad = ptAtT(ts[index]);
-        double dist = pt.distanceSquared(onQuad);
-        if (distMin > dist) {
-            distMin = dist;
-            bestIndex = index;
+/* started with at_most_end_pts_in_common from SkDQuadIntersection.cpp */
+// Do a quick reject by rotating all points relative to a line formed by
+// a pair of one quad's points. If the 2nd quad's points
+// are on the line or on the opposite side from the 1st quad's 'odd man', the
+// curves at most intersect at the endpoints.
+/* if returning true, check contains true if quad's hull collapsed, making the cubic linear
+   if returning false, check contains true if the the quad pair have only the end point in common
+*/
+bool SkDQuad::hullIntersects(const SkDQuad& q2, bool* isLinear) const {
+    bool linear = true;
+    for (int oddMan = 0; oddMan < kPointCount; ++oddMan) {
+        const SkDPoint* endPt[2];
+        this->otherPts(oddMan, endPt);
+        double origX = endPt[0]->fX;
+        double origY = endPt[0]->fY;
+        double adj = endPt[1]->fX - origX;
+        double opp = endPt[1]->fY - origY;
+        double sign = (fPts[oddMan].fY - origY) * adj - (fPts[oddMan].fX - origX) * opp;
+        if (approximately_zero(sign)) {
+            continue;
         }
-    }
-    if (bestIndex >= 0) {
-        return ts[bestIndex];
-    }
-    return d0 < d2 ? 0 : 1;
-}
-
-bool SkDQuad::pointInHull(const SkDPoint& pt) const {
-    return ((const SkDTriangle&) fPts).contains(pt);
-}
-
-SkDPoint SkDQuad::top(double startT, double endT) const {
-    SkDQuad sub = subDivide(startT, endT);
-    SkDPoint topPt = sub[0];
-    if (topPt.fY > sub[2].fY || (topPt.fY == sub[2].fY && topPt.fX > sub[2].fX)) {
-        topPt = sub[2];
-    }
-    if (!between(sub[0].fY, sub[1].fY, sub[2].fY)) {
-        double extremeT;
-        if (FindExtrema(sub[0].fY, sub[1].fY, sub[2].fY, &extremeT)) {
-            extremeT = startT + (endT - startT) * extremeT;
-            SkDPoint test = ptAtT(extremeT);
-            if (topPt.fY > test.fY || (topPt.fY == test.fY && topPt.fX > test.fX)) {
-                topPt = test;
+        linear = false;
+        bool foundOutlier = false;
+        for (int n = 0; n < kPointCount; ++n) {
+            double test = (q2[n].fY - origY) * adj - (q2[n].fX - origX) * opp;
+            if (test * sign > 0 && !precisely_zero(test)) {
+                foundOutlier = true;
+                break;
             }
         }
+        if (!foundOutlier) {
+            return false;
+        }
+    }
+    *isLinear = linear;
+    return true;
+}
+
+bool SkDQuad::hullIntersects(const SkDConic& conic, bool* isLinear) const {
+    return conic.hullIntersects(*this, isLinear);
+}
+
+bool SkDQuad::hullIntersects(const SkDCubic& cubic, bool* isLinear) const {
+    return cubic.hullIntersects(*this, isLinear);
+}
+
+/* bit twiddling for finding the off curve index (x&~m is the pair in [0,1,2] excluding oddMan)
+oddMan    opp   x=oddMan^opp  x=x-oddMan  m=x>>2   x&~m
+    0       1         1            1         0       1
+            2         2            2         0       2
+    1       1         0           -1        -1       0
+            2         3            2         0       2
+    2       1         3            1         0       1
+            2         0           -2        -1       0
+*/
+void SkDQuad::otherPts(int oddMan, const SkDPoint* endPt[2]) const {
+    for (int opp = 1; opp < kPointCount; ++opp) {
+        int end = (oddMan ^ opp) - oddMan;  // choose a value not equal to oddMan
+        end &= ~(end >> 2);  // if the value went negative, set it to zero
+        endPt[opp - 1] = &fPts[end];
     }
-    return topPt;
 }
 
 int SkDQuad::AddValidTs(double s[], int realRoots, double* t) {
@@ -140,19 +147,12 @@ bool SkDQuad::isLinear(int startIndex, int endIndex) const {
     // FIXME: maybe it's possible to avoid this and compare non-normalized
     lineParameters.normalize();
     double distance = lineParameters.controlPtDistance(*this);
-    return approximately_zero(distance);
-}
-
-SkDCubic SkDQuad::toCubic() const {
-    SkDCubic cubic;
-    cubic[0] = fPts[0];
-    cubic[2] = fPts[1];
-    cubic[3] = fPts[2];
-    cubic[1].fX = (cubic[0].fX + cubic[2].fX * 2) / 3;
-    cubic[1].fY = (cubic[0].fY + cubic[2].fY * 2) / 3;
-    cubic[2].fX = (cubic[3].fX + cubic[2].fX * 2) / 3;
-    cubic[2].fY = (cubic[3].fY + cubic[2].fY * 2) / 3;
-    return cubic;
+    double tiniest = SkTMin(SkTMin(SkTMin(SkTMin(SkTMin(fPts[0].fX, fPts[0].fY),
+            fPts[1].fX), fPts[1].fY), fPts[2].fX), fPts[2].fY);
+    double largest = SkTMax(SkTMax(SkTMax(SkTMax(SkTMax(fPts[0].fX, fPts[0].fY),
+            fPts[1].fX), fPts[1].fY), fPts[2].fX), fPts[2].fY);
+    largest = SkTMax(largest, -tiniest);
+    return approximately_zero_when_compared_to(distance, largest);
 }
 
 SkDVector SkDQuad::dxdyAtT(double t) const {
@@ -161,6 +161,14 @@ SkDVector SkDQuad::dxdyAtT(double t) const {
     double c = t;
     SkDVector result = { a * fPts[0].fX + b * fPts[1].fX + c * fPts[2].fX,
             a * fPts[0].fY + b * fPts[1].fY + c * fPts[2].fY };
+    if (result.fX == 0 && result.fY == 0) {
+        if (zero_or_one(t)) {
+            result = fPts[2] - fPts[0];
+        } else {
+            // incomplete
+            SkDebugf("!q");
+        }
+    }
     return result;
 }
 
@@ -181,6 +189,21 @@ SkDPoint SkDQuad::ptAtT(double t) const {
     return result;
 }
 
+static double interp_quad_coords(const double* src, double t) {
+    double ab = SkDInterp(src[0], src[2], t);
+    double bc = SkDInterp(src[2], src[4], t);
+    double abc = SkDInterp(ab, bc, t);
+    return abc;
+}
+
+bool SkDQuad::monotonicInX() const {
+    return between(fPts[0].fX, fPts[1].fX, fPts[2].fX);
+}
+
+bool SkDQuad::monotonicInY() const {
+    return between(fPts[0].fY, fPts[1].fY, fPts[2].fY);
+}
+
 /*
 Given a quadratic q, t1, and t2, find a small quadratic segment.
 
@@ -204,17 +227,7 @@ Group the known values on one side:
 B   = D*2 - A/2 - C/2
 */
 
-static double interp_quad_coords(const double* src, double t) {
-    double ab = SkDInterp(src[0], src[2], t);
-    double bc = SkDInterp(src[2], src[4], t);
-    double abc = SkDInterp(ab, bc, t);
-    return abc;
-}
-
-bool SkDQuad::monotonicInY() const {
-    return between(fPts[0].fY, fPts[1].fY, fPts[2].fY);
-}
-
+// OPTIMIZE : special case either or both of t1 = 0, t2 = 1 
 SkDQuad SkDQuad::subDivide(double t1, double t2) const {
     SkDQuad dst;
     double ax = dst[0].fX = interp_quad_coords(&fPts[0].fX, t1);
@@ -223,8 +236,8 @@ SkDQuad SkDQuad::subDivide(double t1, double t2) const {
     double dy = interp_quad_coords(&fPts[0].fY, (t1 + t2) / 2);
     double cx = dst[2].fX = interp_quad_coords(&fPts[0].fX, t2);
     double cy = dst[2].fY = interp_quad_coords(&fPts[0].fY, t2);
-    /* bx = */ dst[1].fX = 2*dx - (ax + cx)/2;
-    /* by = */ dst[1].fY = 2*dy - (ay + cy)/2;
+    /* bx = */ dst[1].fX = 2 * dx - (ax + cx) / 2;
+    /* by = */ dst[1].fY = 2 * dy - (ay + cy) / 2;
     return dst;
 }
 
@@ -240,13 +253,6 @@ void SkDQuad::align(int endIndex, SkDPoint* dstPt) const {
 SkDPoint SkDQuad::subDivide(const SkDPoint& a, const SkDPoint& c, double t1, double t2) const {
     SkASSERT(t1 != t2);
     SkDPoint b;
-#if 0
-    // this approach assumes that the control point computed directly is accurate enough
-    double dx = interp_quad_coords(&fPts[0].fX, (t1 + t2) / 2);
-    double dy = interp_quad_coords(&fPts[0].fY, (t1 + t2) / 2);
-    b.fX = 2 * dx - (a.fX + c.fX) / 2;
-    b.fY = 2 * dy - (a.fY + c.fY) / 2;
-#else
     SkDQuad sub = subDivide(t1, t2);
     SkDLine b0 = {{a, sub[1] + (a - sub[0])}};
     SkDLine b1 = {{c, sub[1] + (c - sub[2])}};
@@ -258,7 +264,6 @@ SkDPoint SkDQuad::subDivide(const SkDPoint& a, const SkDPoint& c, double t1, dou
         SkASSERT(i.used() <= 2);
         b = SkDPoint::Mid(b0[1], b1[1]);
     }
-#endif
     if (t1 == 0 || t2 == 0) {
         align(0, &b);
     }
@@ -319,10 +324,13 @@ static int valid_unit_divide(double numer, double denom, double* ratio)
     B = 2(b - a)
     Solve for t, only if it fits between 0 < t < 1
 */
-int SkDQuad::FindExtrema(double a, double b, double c, double tValue[1]) {
+int SkDQuad::FindExtrema(const double src[], double tValue[1]) {
     /*  At + B == 0
         t = -B / A
     */
+    double a = src[0];
+    double b = src[2];
+    double c = src[4];
     return valid_unit_divide(a - b, a - b - b + c, tValue);
 }
 
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsQuad.h b/gfx/skia/skia/src/pathops/SkPathOpsQuad.h
index 932c5fbe75d9..f20bf6faea5c 100644
--- a/gfx/skia/skia/src/pathops/SkPathOpsQuad.h
+++ b/gfx/skia/skia/src/pathops/SkPathOpsQuad.h
@@ -10,6 +10,8 @@
 
 #include "SkPathOpsPoint.h"
 
+struct SkOpCurve;
+
 struct SkDQuadPair {
     const SkDQuad& first() const { return (const SkDQuad&) pts[0]; }
     const SkDQuad& second() const { return (const SkDQuad&) pts[2]; }
@@ -17,54 +19,79 @@ struct SkDQuadPair {
 };
 
 struct SkDQuad {
-    SkDPoint fPts[3];
+    static const int kPointCount = 3;
+    static const int kPointLast = kPointCount - 1;
+    static const int kMaxIntersections = 4;
+
+    SkDPoint fPts[kPointCount];
+
+    bool collapsed() const {
+        return fPts[0].approximatelyEqual(fPts[1]) && fPts[0].approximatelyEqual(fPts[2]);
+    }
+
+    bool controlsInside() const {
+        SkDVector v01 = fPts[0] - fPts[1];
+        SkDVector v02 = fPts[0] - fPts[2];
+        SkDVector v12 = fPts[1] - fPts[2];
+        return v02.dot(v01) > 0 && v02.dot(v12) > 0;
+    }
+
+    void debugInit() {
+        sk_bzero(fPts, sizeof(fPts));
+    }
 
     SkDQuad flip() const {
         SkDQuad result = {{fPts[2], fPts[1], fPts[0]}};
         return result;
     }
 
-    void set(const SkPoint pts[3]) {
+    static bool IsConic() { return false; }
+
+    const SkDQuad& set(const SkPoint pts[kPointCount]) {
         fPts[0] = pts[0];
         fPts[1] = pts[1];
         fPts[2] = pts[2];
+        return *this;
     }
 
-    const SkDPoint& operator[](int n) const { SkASSERT(n >= 0 && n < 3); return fPts[n]; }
-    SkDPoint& operator[](int n) { SkASSERT(n >= 0 && n < 3); return fPts[n]; }
+    const SkDPoint& operator[](int n) const { SkASSERT(n >= 0 && n < kPointCount); return fPts[n]; }
+    SkDPoint& operator[](int n) { SkASSERT(n >= 0 && n < kPointCount); return fPts[n]; }
 
     static int AddValidTs(double s[], int realRoots, double* t);
     void align(int endIndex, SkDPoint* dstPt) const;
     SkDQuadPair chopAt(double t) const;
     SkDVector dxdyAtT(double t) const;
-    static int FindExtrema(double a, double b, double c, double tValue[1]);
+    static int FindExtrema(const double src[], double tValue[1]);
+    bool hullIntersects(const SkDQuad& , bool* isLinear) const;
+    bool hullIntersects(const SkDConic& , bool* isLinear) const;
+    bool hullIntersects(const SkDCubic& , bool* isLinear) const;
     bool isLinear(int startIndex, int endIndex) const;
+    bool monotonicInX() const;
     bool monotonicInY() const;
-    double nearestT(const SkDPoint&) const;
-    bool pointInHull(const SkDPoint&) const;
+    void otherPts(int oddMan, const SkDPoint* endPt[2]) const;
     SkDPoint ptAtT(double t) const;
     static int RootsReal(double A, double B, double C, double t[2]);
     static int RootsValidT(const double A, const double B, const double C, double s[2]);
     static void SetABC(const double* quad, double* a, double* b, double* c);
     SkDQuad subDivide(double t1, double t2) const;
-    static SkDQuad SubDivide(const SkPoint a[3], double t1, double t2) {
+    static SkDQuad SubDivide(const SkPoint a[kPointCount], double t1, double t2) {
         SkDQuad quad;
         quad.set(a);
         return quad.subDivide(t1, t2);
     }
     SkDPoint subDivide(const SkDPoint& a, const SkDPoint& c, double t1, double t2) const;
-    static SkDPoint SubDivide(const SkPoint pts[3], const SkDPoint& a, const SkDPoint& c,
+    static SkDPoint SubDivide(const SkPoint pts[kPointCount], const SkDPoint& a, const SkDPoint& c,
                               double t1, double t2) {
         SkDQuad quad;
         quad.set(pts);
         return quad.subDivide(a, c, t1, t2);
     }
-    SkDCubic toCubic() const;
-    SkDPoint top(double startT, double endT) const;
 
+    SkDCubic debugToCubic() const;
     // utilities callable by the user from the debugger when the implementation code is linked in
     void dump() const;
-    void dumpComma(const char*) const;
+    void dumpID(int id) const;
+    void dumpInner() const;
 
 private:
 //  static double Tangent(const double* quadratic, double t);  // uncalled
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsRect.cpp b/gfx/skia/skia/src/pathops/SkPathOpsRect.cpp
index 2ceed32900a3..8c0115353298 100644
--- a/gfx/skia/skia/src/pathops/SkPathOpsRect.cpp
+++ b/gfx/skia/skia/src/pathops/SkPathOpsRect.cpp
@@ -4,62 +4,59 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#include "SkPathOpsConic.h"
 #include "SkPathOpsCubic.h"
 #include "SkPathOpsLine.h"
 #include "SkPathOpsQuad.h"
 #include "SkPathOpsRect.h"
 
-void SkDRect::setBounds(const SkDLine& line) {
-    set(line[0]);
-    add(line[1]);
-}
-
-void SkDRect::setBounds(const SkDQuad& quad) {
-    set(quad[0]);
-    add(quad[2]);
+void SkDRect::setBounds(const SkDQuad& curve, const SkDQuad& sub, double startT, double endT) {
+    set(sub[0]);
+    add(sub[2]);
     double tValues[2];
     int roots = 0;
-    if (!between(quad[0].fX, quad[1].fX, quad[2].fX)) {
-        roots = SkDQuad::FindExtrema(quad[0].fX, quad[1].fX, quad[2].fX, tValues);
+    if (!sub.monotonicInX()) {
+        roots = SkDQuad::FindExtrema(&sub[0].fX, tValues);
     }
-    if (!between(quad[0].fY, quad[1].fY, quad[2].fY)) {
-        roots += SkDQuad::FindExtrema(quad[0].fY, quad[1].fY, quad[2].fY, &tValues[roots]);
+    if (!sub.monotonicInY()) {
+        roots += SkDQuad::FindExtrema(&sub[0].fY, &tValues[roots]);
     }
-    for (int x = 0; x < roots; ++x) {
-        add(quad.ptAtT(tValues[x]));
+    for (int index = 0; index < roots; ++index) {
+        double t = startT + (endT - startT) * tValues[index];
+        add(curve.ptAtT(t));
     }
 }
 
-void SkDRect::setRawBounds(const SkDQuad& quad) {
-    set(quad[0]);
-    for (int x = 1; x < 3; ++x) {
-        add(quad[x]);
+void SkDRect::setBounds(const SkDConic& curve, const SkDConic& sub, double startT, double endT) {
+    set(sub[0]);
+    add(sub[2]);
+    double tValues[2];
+    int roots = 0;
+    if (!sub.monotonicInX()) {
+        roots = SkDConic::FindExtrema(&sub[0].fX, sub.fWeight, tValues);
+    }
+    if (!sub.monotonicInY()) {
+        roots += SkDConic::FindExtrema(&sub[0].fY, sub.fWeight, &tValues[roots]);
+    }
+    for (int index = 0; index < roots; ++index) {
+        double t = startT + (endT - startT) * tValues[index];
+        add(curve.ptAtT(t));
     }
 }
 
-static bool is_bounded_by_end_points(double a, double b, double c, double d) {
-    return between(a, b, d) && between(a, c, d);
-}
-
-void SkDRect::setBounds(const SkDCubic& c) {
-    set(c[0]);
-    add(c[3]);
+void SkDRect::setBounds(const SkDCubic& curve, const SkDCubic& sub, double startT, double endT) {
+    set(sub[0]);
+    add(sub[3]);
     double tValues[4];
     int roots = 0;
-    if (!is_bounded_by_end_points(c[0].fX, c[1].fX, c[2].fX, c[3].fX)) {
-        roots = SkDCubic::FindExtrema(c[0].fX, c[1].fX, c[2].fX, c[3].fX, tValues);
+    if (!sub.monotonicInX()) {
+        roots = SkDCubic::FindExtrema(&sub[0].fX, tValues);
     }
-    if (!is_bounded_by_end_points(c[0].fY, c[1].fY, c[2].fY, c[3].fY)) {
-        roots += SkDCubic::FindExtrema(c[0].fY, c[1].fY, c[2].fY, c[3].fY, &tValues[roots]);
+    if (!sub.monotonicInY()) {
+        roots += SkDCubic::FindExtrema(&sub[0].fY, &tValues[roots]);
     }
-    for (int x = 0; x < roots; ++x) {
-        add(c.ptAtT(tValues[x]));
-    }
-}
-
-void SkDRect::setRawBounds(const SkDCubic& cubic) {
-    set(cubic[0]);
-    for (int x = 1; x < 4; ++x) {
-        add(cubic[x]);
+    for (int index = 0; index < roots; ++index) {
+        double t = startT + (endT - startT) * tValues[index];
+        add(curve.ptAtT(t));
     }
 }
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsRect.h b/gfx/skia/skia/src/pathops/SkPathOpsRect.h
index 2c47f43b8879..d4e5f5489a4f 100644
--- a/gfx/skia/skia/src/pathops/SkPathOpsRect.h
+++ b/gfx/skia/skia/src/pathops/SkPathOpsRect.h
@@ -13,18 +13,10 @@ struct SkDRect {
     double fLeft, fTop, fRight, fBottom;
 
     void add(const SkDPoint& pt) {
-        if (fLeft > pt.fX) {
-            fLeft = pt.fX;
-        }
-        if (fTop > pt.fY) {
-            fTop = pt.fY;
-        }
-        if (fRight < pt.fX) {
-            fRight = pt.fX;
-        }
-        if (fBottom < pt.fY) {
-            fBottom = pt.fY;
-        }
+        fLeft = SkTMin(fLeft, pt.fX);
+        fTop = SkTMin(fTop, pt.fY);
+        fRight = SkTMax(fRight, pt.fX);
+        fBottom = SkTMax(fBottom, pt.fY);
     }
 
     bool contains(const SkDPoint& pt) const {
@@ -32,12 +24,14 @@ struct SkDRect {
                 && approximately_between(fTop, pt.fY, fBottom);
     }
 
-    bool intersects(SkDRect* r) const {
+    void debugInit();
+
+    bool intersects(const SkDRect& r) const {
         SkASSERT(fLeft <= fRight);
         SkASSERT(fTop <= fBottom);
-        SkASSERT(r->fLeft <= r->fRight);
-        SkASSERT(r->fTop <= r->fBottom);
-        return r->fLeft <= fRight && fLeft <= r->fRight && r->fTop <= fBottom && fTop <= r->fBottom;
+        SkASSERT(r.fLeft <= r.fRight);
+        SkASSERT(r.fTop <= r.fBottom);
+        return r.fLeft <= fRight && fLeft <= r.fRight && r.fTop <= fBottom && fTop <= r.fBottom;
     }
 
     void set(const SkDPoint& pt) {
@@ -53,11 +47,23 @@ struct SkDRect {
         return fBottom - fTop;
     }
 
-    void setBounds(const SkDLine&);
-    void setBounds(const SkDCubic&);
-    void setBounds(const SkDQuad&);
-    void setRawBounds(const SkDCubic&);
-    void setRawBounds(const SkDQuad&);
+    void setBounds(const SkDConic& curve) {
+        setBounds(curve, curve, 0, 1);
+    }
+
+    void setBounds(const SkDConic& curve, const SkDConic& sub, double tStart, double tEnd);
+
+    void setBounds(const SkDCubic& curve) {
+        setBounds(curve, curve, 0, 1);
+    }
+
+    void setBounds(const SkDCubic& curve, const SkDCubic& sub, double tStart, double tEnd);
+
+    void setBounds(const SkDQuad& curve) {
+        setBounds(curve, curve, 0, 1);
+    }
+
+    void setBounds(const SkDQuad& curve, const SkDQuad& sub, double tStart, double tEnd);
 };
 
 #endif
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsSimplify.cpp b/gfx/skia/skia/src/pathops/SkPathOpsSimplify.cpp
index 57090ac4238b..08bb26d9a912 100644
--- a/gfx/skia/skia/src/pathops/SkPathOpsSimplify.cpp
+++ b/gfx/skia/skia/src/pathops/SkPathOpsSimplify.cpp
@@ -5,91 +5,87 @@
  * found in the LICENSE file.
  */
 #include "SkAddIntersections.h"
+#include "SkOpCoincidence.h"
 #include "SkOpEdgeBuilder.h"
 #include "SkPathOpsCommon.h"
 #include "SkPathWriter.h"
 
-static bool bridgeWinding(SkTArray<SkOpContour*, true>& contourList, SkPathWriter* simple) {
-    bool firstContour = true;
+static bool bridgeWinding(SkOpContourHead* contourList, SkPathWriter* simple,
+        SkChunkAlloc* allocator, bool* closable) {
     bool unsortable = false;
-    bool topUnsortable = false;
-    bool firstPass = true;
-    SkPoint lastTopLeft;
-    SkPoint topLeft = {SK_ScalarMin, SK_ScalarMin};
     do {
-        int index, endIndex;
-        bool topDone;
-        bool onlyVertical = false;
-        lastTopLeft = topLeft;
-        SkOpSegment* current = FindSortableTop(contourList, SkOpAngle::kUnaryWinding, &firstContour,
-                &index, &endIndex, &topLeft, &topUnsortable, &topDone, &onlyVertical, firstPass);
-        if (!current) {
-            if ((!topUnsortable || firstPass) && !topDone) {
-                SkASSERT(topLeft.fX != SK_ScalarMin && topLeft.fY != SK_ScalarMin);
-                topLeft.fX = topLeft.fY = SK_ScalarMin;
-                continue;
-            }
-            break;
-        } else if (onlyVertical) {
+        SkOpSpan* span = FindSortableTop(contourList);
+        if (!span) {
             break;
         }
-        firstPass = !topUnsortable || lastTopLeft != topLeft;
-        SkTDArray<SkOpSpan*> chase;
+        SkOpSegment* current = span->segment();
+        SkOpSpanBase* start = span->next();
+        SkOpSpanBase* end = span;
+        SkTDArray<SkOpSpanBase*> chase;
         do {
-            if (current->activeWinding(index, endIndex)) {
+            if (current->activeWinding(start, end)) {
                 do {
                     if (!unsortable && current->done()) {
                           break;
                     }
                     SkASSERT(unsortable || !current->done());
-                    int nextStart = index;
-                    int nextEnd = endIndex;
+                    SkOpSpanBase* nextStart = start;
+                    SkOpSpanBase* nextEnd = end;
                     SkOpSegment* next = current->findNextWinding(&chase, &nextStart, &nextEnd,
                             &unsortable);
                     if (!next) {
                         if (!unsortable && simple->hasMove()
                                 && current->verb() != SkPath::kLine_Verb
                                 && !simple->isClosed()) {
-                            current->addCurveTo(index, endIndex, simple, true);
-                            SkASSERT(simple->isClosed());
+                            if (!current->addCurveTo(start, end, simple)) {
+                                return false;
+                            }
+                    #if DEBUG_ACTIVE_SPANS
+                            if (!simple->isClosed()) {
+                                DebugShowActiveSpans(contourList);
+                            }
+                    #endif
                         }
                         break;
                     }
         #if DEBUG_FLOW
             SkDebugf("%s current id=%d from=(%1.9g,%1.9g) to=(%1.9g,%1.9g)\n", __FUNCTION__,
-                    current->debugID(), current->xyAtT(index).fX, current->xyAtT(index).fY,
-                    current->xyAtT(endIndex).fX, current->xyAtT(endIndex).fY);
+                    current->debugID(), start->pt().fX, start->pt().fY,
+                    end->pt().fX, end->pt().fY);
         #endif
-                    current->addCurveTo(index, endIndex, simple, true);
+                    if (!current->addCurveTo(start, end, simple)) {
+                        return false;
+                    }
                     current = next;
-                    index = nextStart;
-                    endIndex = nextEnd;
-                } while (!simple->isClosed() && (!unsortable
-                        || !current->done(SkMin32(index, endIndex))));
-                if (current->activeWinding(index, endIndex) && !simple->isClosed()) {
-//                    SkASSERT(unsortable || simple->isEmpty());
-                    int min = SkMin32(index, endIndex);
-                    if (!current->done(min)) {
-                        current->addCurveTo(index, endIndex, simple, true);
-                        current->markDoneUnary(min);
+                    start = nextStart;
+                    end = nextEnd;
+                } while (!simple->isClosed() && (!unsortable || !start->starter(end)->done()));
+                if (current->activeWinding(start, end) && !simple->isClosed()) {
+                    SkOpSpan* spanStart = start->starter(end);
+                    if (!spanStart->done()) {
+                        if (!current->addCurveTo(start, end, simple)) {
+                            return false;
+                        }
+                        current->markDone(spanStart);
                     }
                 }
                 simple->close();
             } else {
-                SkOpSpan* last = current->markAndChaseDoneUnary(index, endIndex);
-                if (last && !last->fChased && !last->fLoop) {
-                    last->fChased = true;
+                SkOpSpanBase* last = current->markAndChaseDone(start, end);
+                if (last && !last->chased()) {
+                    last->setChased(true);
                     SkASSERT(!SkPathOpsDebug::ChaseContains(chase, last));
-                    // assert that last isn't already in array
                     *chase.append() = last;
 #if DEBUG_WINDING
-                    SkDebugf("%s chase.append id=%d windSum=%d small=%d\n", __FUNCTION__,
-                            last->fOther->span(last->fOtherIndex).fOther->debugID(), last->fWindSum,
-                            last->fSmall);
+                    SkDebugf("%s chase.append id=%d", __FUNCTION__, last->segment()->debugID());
+                    if (!last->final()) {
+                         SkDebugf(" windSum=%d", last->upCast()->windSum());
+                    }
+                    SkDebugf("\n");
 #endif
                 }
             }
-            current = FindChase(&chase, &index, &endIndex);
+            current = FindChase(&chase, &start, &end);
         #if DEBUG_ACTIVE_SPANS
             DebugShowActiveSpans(contourList);
         #endif
@@ -98,15 +94,18 @@ static bool bridgeWinding(SkTArray<SkOpContour*, true>& contourList, SkPathWrite
             }
         } while (true);
     } while (true);
-    return simple->someAssemblyRequired();
+    *closable = !simple->someAssemblyRequired();
+    return true;
 }
 
 // returns true if all edges were processed
-static bool bridgeXor(SkTArray<SkOpContour*, true>& contourList, SkPathWriter* simple) {
+static bool bridgeXor(SkOpContourHead* contourList, SkPathWriter* simple,
+        SkChunkAlloc* allocator, bool* closable) {
     SkOpSegment* current;
-    int start, end;
+    SkOpSpanBase* start;
+    SkOpSpanBase* end;
     bool unsortable = false;
-    bool closable = true;
+    *closable = true;
     while ((current = FindUndone(contourList, &start, &end))) {
         do {
     #if DEBUG_ACTIVE_SPANS
@@ -115,95 +114,123 @@ static bool bridgeXor(SkTArray<SkOpContour*, true>& contourList, SkPathWriter* s
             }
     #endif
             SkASSERT(unsortable || !current->done());
-            int nextStart = start;
-            int nextEnd = end;
+            SkOpSpanBase* nextStart = start;
+            SkOpSpanBase* nextEnd = end;
             SkOpSegment* next = current->findNextXor(&nextStart, &nextEnd, &unsortable);
             if (!next) {
                 if (!unsortable && simple->hasMove()
                         && current->verb() != SkPath::kLine_Verb
                         && !simple->isClosed()) {
-                    current->addCurveTo(start, end, simple, true);
-                    SkASSERT(simple->isClosed());
+                    if (!current->addCurveTo(start, end, simple)) {
+                        return false;
+                    }
+            #if DEBUG_ACTIVE_SPANS
+                    if (!simple->isClosed()) {
+                        DebugShowActiveSpans(contourList);
+                    }
+            #endif
                 }
                 break;
             }
         #if DEBUG_FLOW
             SkDebugf("%s current id=%d from=(%1.9g,%1.9g) to=(%1.9g,%1.9g)\n", __FUNCTION__,
-                    current->debugID(), current->xyAtT(start).fX, current->xyAtT(start).fY,
-                    current->xyAtT(end).fX, current->xyAtT(end).fY);
+                    current->debugID(), start->pt().fX, start->pt().fY,
+                    end->pt().fX, end->pt().fY);
         #endif
-            current->addCurveTo(start, end, simple, true);
+            if (!current->addCurveTo(start, end, simple)) {
+                return false;
+            }
             current = next;
             start = nextStart;
             end = nextEnd;
-        } while (!simple->isClosed() && (!unsortable || !current->done(SkMin32(start, end))));
+        } while (!simple->isClosed() && (!unsortable || !start->starter(end)->done()));
         if (!simple->isClosed()) {
             SkASSERT(unsortable);
-            int min = SkMin32(start, end);
-            if (!current->done(min)) {
-                current->addCurveTo(start, end, simple, true);
-                current->markDone(min, 1);
+            SkOpSpan* spanStart = start->starter(end);
+            if (!spanStart->done()) {
+                if (!current->addCurveTo(start, end, simple)) {
+                    return false;
+                }
+                current->markDone(spanStart);
             }
-            closable = false;
+            *closable = false;
         }
         simple->close();
     #if DEBUG_ACTIVE_SPANS
         DebugShowActiveSpans(contourList);
     #endif
     }
-    return closable;
+    return true;
 }
 
 // FIXME : add this as a member of SkPath
 bool Simplify(const SkPath& path, SkPath* result) {
-#if DEBUG_SORT || DEBUG_SWAP_TOP
-    SkPathOpsDebug::gSortCount = SkPathOpsDebug::gSortCountDefault;
-#endif
+    SkChunkAlloc allocator(4096);  // FIXME: constant-ize, tune
     // returns 1 for evenodd, -1 for winding, regardless of inverse-ness
     SkPath::FillType fillType = path.isInverseFillType() ? SkPath::kInverseEvenOdd_FillType
             : SkPath::kEvenOdd_FillType;
-
-    // turn path into list of segments
-    SkTArray<SkOpContour> contours;
-    SkOpEdgeBuilder builder(path, contours);
-    if (!builder.finish()) {
-        return false;
-    }
-    SkTArray<SkOpContour*, true> contourList;
-    MakeContourList(contours, contourList, false, false);
-    SkOpContour** currentPtr = contourList.begin();
-    result->reset();
-    result->setFillType(fillType);
-    if (!currentPtr) {
+    if (path.isConvex()) {
+        if (result != &path) {
+            *result = path;
+        }
+        result->setFillType(fillType);
         return true;
     }
-    SkOpContour** listEnd = contourList.end();
-    // find all intersections between segments
-    do {
-        SkOpContour** nextPtr = currentPtr;
-        SkOpContour* current = *currentPtr++;
-        if (current->containsCubics()) {
-            AddSelfIntersectTs(current);
-        }
-        SkOpContour* next;
-        do {
-            next = *nextPtr++;
-        } while (AddIntersectTs(current, next) && nextPtr != listEnd);
-    } while (currentPtr != listEnd);
-    if (!HandleCoincidence(&contourList, 0)) {
+    // turn path into list of segments
+    SkOpCoincidence coincidence;
+    SkOpContour contour;
+    SkOpContourHead* contourList = static_cast<SkOpContourHead*>(&contour);
+    SkOpGlobalState globalState(&coincidence, contourList  SkDEBUGPARAMS(nullptr));
+#if DEBUG_SORT
+    SkPathOpsDebug::gSortCount = SkPathOpsDebug::gSortCountDefault;
+#endif
+    SkOpEdgeBuilder builder(path, &contour, &allocator, &globalState);
+    if (!builder.finish(&allocator)) {
         return false;
     }
+#if DEBUG_DUMP_SEGMENTS
+    contour.dumpSegments();
+#endif
+    if (!SortContourList(&contourList, false, false)) {
+        result->reset();
+        result->setFillType(fillType);
+        return true;
+    }
+    // find all intersections between segments
+    SkOpContour* current = contourList;
+    do {
+        SkOpContour* next = current;
+        while (AddIntersectTs(current, next, &coincidence, &allocator)
+                && (next = next->next()));
+    } while ((current = current->next()));
+#if DEBUG_VALIDATE
+    globalState.setPhase(SkOpGlobalState::kWalking);
+#endif
+    if (!HandleCoincidence(contourList, &coincidence, &allocator)) {
+        return false;
+    }
+#if DEBUG_DUMP_ALIGNMENT
+    contour.dumpSegments("aligned");
+#endif
     // construct closed contours
-    SkPathWriter simple(*result);
-    if (builder.xorMask() == kWinding_PathOpsMask ? bridgeWinding(contourList, &simple)
-                : !bridgeXor(contourList, &simple))
+    result->reset();
+    result->setFillType(fillType);
+    SkPathWriter wrapper(*result);
+    bool closable;
+    if (builder.xorMask() == kWinding_PathOpsMask
+            ? !bridgeWinding(contourList, &wrapper, &allocator, &closable)
+            : !bridgeXor(contourList, &wrapper, &allocator, &closable)) {
+        return false;
+    }
+    if (!closable)
     {  // if some edges could not be resolved, assemble remaining fragments
         SkPath temp;
         temp.setFillType(fillType);
         SkPathWriter assembled(temp);
-        Assemble(simple, &assembled);
+        Assemble(wrapper, &assembled);
         *result = *assembled.nativePath();
         result->setFillType(fillType);
     }
     return true;
 }
+
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsTSect.cpp b/gfx/skia/skia/src/pathops/SkPathOpsTSect.cpp
new file mode 100644
index 000000000000..1549e6b8fde0
--- /dev/null
+++ b/gfx/skia/skia/src/pathops/SkPathOpsTSect.cpp
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkPathOpsTSect.h"
+
+int SkIntersections::intersect(const SkDQuad& quad1, const SkDQuad& quad2) {
+    SkTSect<SkDQuad, SkDQuad> sect1(quad1 PATH_OPS_DEBUG_T_SECT_PARAMS(1));
+    SkTSect<SkDQuad, SkDQuad> sect2(quad2 PATH_OPS_DEBUG_T_SECT_PARAMS(2));
+    SkTSect<SkDQuad, SkDQuad>::BinarySearch(&sect1, &sect2, this);
+    return used();
+}
+
+int SkIntersections::intersect(const SkDConic& conic, const SkDQuad& quad) {
+    SkTSect<SkDConic, SkDQuad> sect1(conic PATH_OPS_DEBUG_T_SECT_PARAMS(1));
+    SkTSect<SkDQuad, SkDConic> sect2(quad PATH_OPS_DEBUG_T_SECT_PARAMS(2));
+    SkTSect<SkDConic, SkDQuad>::BinarySearch(&sect1, &sect2, this);
+    return used();
+}
+
+int SkIntersections::intersect(const SkDConic& conic1, const SkDConic& conic2) {
+    SkTSect<SkDConic, SkDConic> sect1(conic1 PATH_OPS_DEBUG_T_SECT_PARAMS(1));
+    SkTSect<SkDConic, SkDConic> sect2(conic2 PATH_OPS_DEBUG_T_SECT_PARAMS(2));
+    SkTSect<SkDConic, SkDConic>::BinarySearch(&sect1, &sect2, this);
+    return used();
+}
+
+int SkIntersections::intersect(const SkDCubic& cubic, const SkDQuad& quad) {
+    SkTSect<SkDCubic, SkDQuad> sect1(cubic PATH_OPS_DEBUG_T_SECT_PARAMS(1));
+    SkTSect<SkDQuad, SkDCubic> sect2(quad PATH_OPS_DEBUG_T_SECT_PARAMS(2));
+    SkTSect<SkDCubic, SkDQuad>::BinarySearch(&sect1, &sect2, this);
+    return used();
+}
+
+int SkIntersections::intersect(const SkDCubic& cubic, const SkDConic& conic) {
+    SkTSect<SkDCubic, SkDConic> sect1(cubic PATH_OPS_DEBUG_T_SECT_PARAMS(1));
+    SkTSect<SkDConic, SkDCubic> sect2(conic PATH_OPS_DEBUG_T_SECT_PARAMS(2));
+    SkTSect<SkDCubic, SkDConic>::BinarySearch(&sect1, &sect2, this);
+    return used();
+}
+
+int SkIntersections::intersect(const SkDCubic& cubic1, const SkDCubic& cubic2) {
+    SkTSect<SkDCubic, SkDCubic> sect1(cubic1 PATH_OPS_DEBUG_T_SECT_PARAMS(1));
+    SkTSect<SkDCubic, SkDCubic> sect2(cubic2 PATH_OPS_DEBUG_T_SECT_PARAMS(2));
+    SkTSect<SkDCubic, SkDCubic>::BinarySearch(&sect1, &sect2, this);
+    return used();
+}
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsTSect.h b/gfx/skia/skia/src/pathops/SkPathOpsTSect.h
new file mode 100644
index 000000000000..bebdf40208cb
--- /dev/null
+++ b/gfx/skia/skia/src/pathops/SkPathOpsTSect.h
@@ -0,0 +1,2237 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkChunkAlloc.h"
+#include "SkPathOpsBounds.h"
+#include "SkPathOpsRect.h"
+#include "SkIntersections.h"
+#include "SkTSort.h"
+
+#ifdef SK_DEBUG
+typedef uint8_t SkOpDebugBool;
+#else
+typedef bool SkOpDebugBool;
+#endif
+
+/* TCurve and OppCurve are one of { SkDQuadratic, SkDConic, SkDCubic } */
+template<typename TCurve, typename OppCurve>
+class SkTCoincident {
+public:
+    SkTCoincident() {
+        this->init();
+    }
+
+    void debugInit() {
+#ifdef SK_DEBUG
+        this->fPerpPt.fX = this->fPerpPt.fY = SK_ScalarNaN;
+        this->fPerpT = SK_ScalarNaN;
+        this->fCoincident = 0xFF;
+#endif
+    }
+
+    char dumpIsCoincidentStr() const;
+    void dump() const;
+
+    bool isCoincident() const {
+        SkASSERT(!!fCoincident == fCoincident);
+        return SkToBool(fCoincident);
+    }
+
+    void init() {
+        fPerpT = -1;
+        fCoincident = false;
+        fPerpPt.fX = fPerpPt.fY = SK_ScalarNaN;
+    }
+
+    void markCoincident() {
+        if (!fCoincident) {
+            fPerpT = -1;
+        }
+        fCoincident = true;
+    }
+
+    const SkDPoint& perpPt() const {
+        return fPerpPt;
+    }
+
+    double perpT() const {
+        return fPerpT;
+    }
+
+    void setPerp(const TCurve& c1, double t, const SkDPoint& cPt, const OppCurve& );
+
+private:
+    SkDPoint fPerpPt;
+    double fPerpT;  // perpendicular intersection on opposite curve
+    SkOpDebugBool fCoincident;
+};
+
+template<typename TCurve, typename OppCurve> class SkTSect;
+template<typename TCurve, typename OppCurve> class SkTSpan;
+
+template<typename TCurve, typename OppCurve>
+struct SkTSpanBounded {
+    SkTSpan<TCurve, OppCurve>* fBounded;
+    SkTSpanBounded* fNext;
+};
+
+/* Curve is either TCurve or SkDCubic */
+template<typename TCurve, typename OppCurve>
+class SkTSpan {
+public:
+    void addBounded(SkTSpan<OppCurve, TCurve>* , SkChunkAlloc* );
+    double closestBoundedT(const SkDPoint& pt) const;
+    bool contains(double t) const;
+
+    void debugInit() {
+        TCurve dummy;
+        dummy.debugInit();
+        init(dummy);
+        initBounds(dummy);
+        fCoinStart.init();
+        fCoinEnd.init();
+    }
+
+    const SkTSect<OppCurve, TCurve>* debugOpp() const;
+    const SkTSpan* debugSpan(int ) const;
+    const SkTSpan* debugT(double t) const;
+#ifdef SK_DEBUG
+    bool debugIsBefore(const SkTSpan* span) const;
+#endif
+    void dump() const;
+    void dumpAll() const;
+    void dumpBounded(int id) const;
+    void dumpBounds() const;
+    void dumpCoin() const;
+
+    double endT() const {
+        return fEndT;
+    }
+
+    SkTSpan<OppCurve, TCurve>* findOppSpan(const SkTSpan<OppCurve, TCurve>* opp) const;
+
+    SkTSpan<OppCurve, TCurve>* findOppT(double t) const {
+        SkTSpan<OppCurve, TCurve>* result = oppT(t);
+        SkASSERT(result);
+        return result;
+    }
+
+    bool hasOppT(double t) const {
+        return SkToBool(oppT(t));
+    }
+
+    int hullsIntersect(SkTSpan<OppCurve, TCurve>* span, bool* start, bool* oppStart);
+    void init(const TCurve& );
+    void initBounds(const TCurve& );
+
+    bool isBounded() const {
+        return fBounded != nullptr;
+    }
+
+    bool linearsIntersect(SkTSpan<OppCurve, TCurve>* span);
+    double linearT(const SkDPoint& ) const;
+
+    void markCoincident() {
+        fCoinStart.markCoincident();
+        fCoinEnd.markCoincident();
+    }
+
+    const SkTSpan* next() const {
+        return fNext;
+    }
+
+    bool onlyEndPointsInCommon(const SkTSpan<OppCurve, TCurve>* opp, bool* start,
+            bool* oppStart, bool* ptsInCommon);
+
+    const TCurve& part() const {
+        return fPart;
+    }
+
+    bool removeAllBounded();
+    bool removeBounded(const SkTSpan<OppCurve, TCurve>* opp);
+
+    void reset() {
+        fBounded = nullptr;
+    }
+
+    void resetBounds(const TCurve& curve) {
+        fIsLinear = fIsLine = false;
+        initBounds(curve);
+    }
+
+    bool split(SkTSpan* work, SkChunkAlloc* heap) {
+        return splitAt(work, (work->fStartT + work->fEndT) * 0.5, heap);
+    }
+
+    bool splitAt(SkTSpan* work, double t, SkChunkAlloc* heap);
+
+    double startT() const {
+        return fStartT;
+    }
+
+private:
+
+    // implementation is for testing only
+    int debugID() const {
+        return PATH_OPS_DEBUG_T_SECT_RELEASE(fID, -1);
+    }
+
+    void dumpID() const;
+
+    int hullCheck(const SkTSpan<OppCurve, TCurve>* opp, bool* start, bool* oppStart);
+    int linearIntersects(const OppCurve& ) const;
+    SkTSpan<OppCurve, TCurve>* oppT(double t) const;
+
+    void validate() const;
+    void validateBounded() const;
+    void validatePerpT(double oppT) const;
+    void validatePerpPt(double t, const SkDPoint& ) const;
+
+    TCurve fPart;
+    SkTCoincident<TCurve, OppCurve> fCoinStart;
+    SkTCoincident<TCurve, OppCurve> fCoinEnd;
+    SkTSpanBounded<OppCurve, TCurve>* fBounded;
+    SkTSpan* fPrev;
+    SkTSpan* fNext;
+    SkDRect fBounds;
+    double fStartT;
+    double fEndT;
+    double fBoundsMax;
+    SkOpDebugBool fCollapsed;
+    SkOpDebugBool fHasPerp;
+    SkOpDebugBool fIsLinear;
+    SkOpDebugBool fIsLine;
+    SkOpDebugBool fDeleted;
+    SkDEBUGCODE_(SkTSect<TCurve, OppCurve>* fDebugSect);
+    PATH_OPS_DEBUG_T_SECT_CODE(int fID);
+    friend class SkTSect<TCurve, OppCurve>;
+    friend class SkTSect<OppCurve, TCurve>;
+    friend class SkTSpan<OppCurve, TCurve>;
+};
+
+template<typename TCurve, typename OppCurve>
+class SkTSect {
+public:
+    SkTSect(const TCurve& c  PATH_OPS_DEBUG_T_SECT_PARAMS(int id));
+    static void BinarySearch(SkTSect* sect1, SkTSect<OppCurve, TCurve>* sect2,
+            SkIntersections* intersections);
+
+    // for testing only
+    bool debugHasBounded(const SkTSpan<OppCurve, TCurve>* ) const;
+
+    const SkTSect<OppCurve, TCurve>* debugOpp() const {
+        return SkDEBUGRELEASE(fOppSect, nullptr);
+    }
+
+    const SkTSpan<TCurve, OppCurve>* debugSpan(int id) const;
+    const SkTSpan<TCurve, OppCurve>* debugT(double t) const;
+    void dump() const;
+    void dumpBoth(SkTSect<OppCurve, TCurve>* ) const;
+    void dumpBounded(int id) const;
+    void dumpBounds() const;
+    void dumpCoin() const;
+    void dumpCoinCurves() const;
+    void dumpCurves() const;
+
+private:
+    enum {
+        kZeroS1Set = 1,
+        kOneS1Set = 2,
+        kZeroS2Set = 4,
+        kOneS2Set = 8
+    };
+
+    SkTSpan<TCurve, OppCurve>* addFollowing(SkTSpan<TCurve, OppCurve>* prior);
+    void addForPerp(SkTSpan<OppCurve, TCurve>* span, double t);
+    SkTSpan<TCurve, OppCurve>* addOne();
+    
+    SkTSpan<TCurve, OppCurve>* addSplitAt(SkTSpan<TCurve, OppCurve>* span, double t) {
+        SkTSpan<TCurve, OppCurve>* result = this->addOne();
+        result->splitAt(span, t, &fHeap);
+        result->initBounds(fCurve);
+        span->initBounds(fCurve);
+        return result;
+    }
+
+    bool binarySearchCoin(SkTSect<OppCurve, TCurve>* , double tStart, double tStep, double* t,
+                          double* oppT);
+    SkTSpan<TCurve, OppCurve>* boundsMax() const;
+    void coincidentCheck(SkTSect<OppCurve, TCurve>* sect2);
+    void coincidentForce(SkTSect<OppCurve, TCurve>* sect2, double start1s, double start1e);
+    bool coincidentHasT(double t);
+    int collapsed() const;
+    void computePerpendiculars(SkTSect<OppCurve, TCurve>* sect2, SkTSpan<TCurve, OppCurve>* first,
+                               SkTSpan<TCurve, OppCurve>* last);
+    int countConsecutiveSpans(SkTSpan<TCurve, OppCurve>* first,
+                              SkTSpan<TCurve, OppCurve>** last) const;
+
+    int debugID() const {
+        return PATH_OPS_DEBUG_T_SECT_RELEASE(fID, -1);
+    }
+
+    void deleteEmptySpans();
+    void dumpCommon(const SkTSpan<TCurve, OppCurve>* ) const;
+    void dumpCommonCurves(const SkTSpan<TCurve, OppCurve>* ) const;
+    static int EndsEqual(const SkTSect* sect1, const SkTSect<OppCurve, TCurve>* sect2,
+                         SkIntersections* );
+    SkTSpan<TCurve, OppCurve>* extractCoincident(SkTSect<OppCurve, TCurve>* sect2,
+                                                  SkTSpan<TCurve, OppCurve>* first,
+                                                  SkTSpan<TCurve, OppCurve>* last);
+    SkTSpan<TCurve, OppCurve>* findCoincidentRun(SkTSpan<TCurve, OppCurve>* first,
+                                                  SkTSpan<TCurve, OppCurve>** lastPtr);
+    int intersects(SkTSpan<TCurve, OppCurve>* span, SkTSect<OppCurve, TCurve>* opp,
+                   SkTSpan<OppCurve, TCurve>* oppSpan, int* oppResult);
+    bool isParallel(const SkDLine& thisLine, const SkTSect<OppCurve, TCurve>* opp) const;
+    int linesIntersect(SkTSpan<TCurve, OppCurve>* span, SkTSect<OppCurve, TCurve>* opp,
+                       SkTSpan<OppCurve, TCurve>* oppSpan, SkIntersections* );
+    void markSpanGone(SkTSpan<TCurve, OppCurve>* span);
+    bool matchedDirection(double t, const SkTSect<OppCurve, TCurve>* sect2, double t2) const;
+    void matchedDirCheck(double t, const SkTSect<OppCurve, TCurve>* sect2, double t2,
+                         bool* calcMatched, bool* oppMatched) const;
+    void mergeCoincidence(SkTSect<OppCurve, TCurve>* sect2);
+    SkTSpan<TCurve, OppCurve>* prev(SkTSpan<TCurve, OppCurve>* ) const;
+    void removeByPerpendicular(SkTSect<OppCurve, TCurve>* opp);
+    void recoverCollapsed();
+    void removeCoincident(SkTSpan<TCurve, OppCurve>* span, bool isBetween);
+    void removeAllBut(const SkTSpan<OppCurve, TCurve>* keep, SkTSpan<TCurve, OppCurve>* span,
+                      SkTSect<OppCurve, TCurve>* opp);
+    void removeSpan(SkTSpan<TCurve, OppCurve>* span);
+    void removeSpanRange(SkTSpan<TCurve, OppCurve>* first, SkTSpan<TCurve, OppCurve>* last);
+    void removeSpans(SkTSpan<TCurve, OppCurve>* span, SkTSect<OppCurve, TCurve>* opp);
+    SkTSpan<TCurve, OppCurve>* spanAtT(double t, SkTSpan<TCurve, OppCurve>** priorSpan);
+    SkTSpan<TCurve, OppCurve>* tail();
+    void trim(SkTSpan<TCurve, OppCurve>* span, SkTSect<OppCurve, TCurve>* opp);
+    void unlinkSpan(SkTSpan<TCurve, OppCurve>* span);
+    bool updateBounded(SkTSpan<TCurve, OppCurve>* first, SkTSpan<TCurve, OppCurve>* last,
+                       SkTSpan<OppCurve, TCurve>* oppFirst);
+    void validate() const;
+    void validateBounded() const;
+
+    const TCurve& fCurve;
+    SkChunkAlloc fHeap;
+    SkTSpan<TCurve, OppCurve>* fHead;
+    SkTSpan<TCurve, OppCurve>* fCoincident;
+    SkTSpan<TCurve, OppCurve>* fDeleted;
+    int fActiveCount;
+    SkDEBUGCODE_(SkTSect<OppCurve, TCurve>* fOppSect);
+    PATH_OPS_DEBUG_T_SECT_CODE(int fID);
+    PATH_OPS_DEBUG_T_SECT_CODE(int fDebugCount);
+#if DEBUG_T_SECT
+    int fDebugAllocatedCount;
+#endif
+    friend class SkTSpan<TCurve, OppCurve>;
+    friend class SkTSpan<OppCurve, TCurve>;
+    friend class SkTSect<OppCurve, TCurve>;
+};
+
+#define COINCIDENT_SPAN_COUNT 9
+
+template<typename TCurve, typename OppCurve>
+void SkTCoincident<TCurve, OppCurve>::setPerp(const TCurve& c1, double t,
+        const SkDPoint& cPt, const OppCurve& c2) {
+    SkDVector dxdy = c1.dxdyAtT(t);
+    SkDLine perp = {{ cPt, {cPt.fX + dxdy.fY, cPt.fY - dxdy.fX} }};
+    SkIntersections i;
+    int used = i.intersectRay(c2, perp);
+    // only keep closest
+    if (used == 0 || used == 3) {
+        this->init();
+        return;
+    } 
+    fPerpT = i[0][0];
+    fPerpPt = i.pt(0);
+    SkASSERT(used <= 2);
+    if (used == 2) {
+        double distSq = (fPerpPt - cPt).lengthSquared();
+        double dist2Sq = (i.pt(1) - cPt).lengthSquared();
+        if (dist2Sq < distSq) {
+            fPerpT = i[0][1];
+            fPerpPt = i.pt(1);
+        }
+    }
+#if DEBUG_T_SECT
+    SkDebugf("setPerp t=%1.9g cPt=(%1.9g,%1.9g) %s oppT=%1.9g fPerpPt=(%1.9g,%1.9g)\n",
+            t, cPt.fX, cPt.fY,
+            cPt.approximatelyEqual(fPerpPt) ? "==" : "!=", fPerpT, fPerpPt.fX, fPerpPt.fY);
+#endif
+    fCoincident = cPt.approximatelyEqual(fPerpPt);
+#if DEBUG_T_SECT
+    if (fCoincident) {
+        SkDebugf("");  // allow setting breakpoint
+    }
+#endif
+}
+
+template<typename TCurve, typename OppCurve>
+void SkTSpan<TCurve, OppCurve>::addBounded(SkTSpan<OppCurve, TCurve>* span, SkChunkAlloc* heap) {
+    SkTSpanBounded<OppCurve, TCurve>* bounded = new (heap->allocThrow(
+            sizeof(SkTSpanBounded<OppCurve, TCurve>)))(SkTSpanBounded<OppCurve, TCurve>);
+    bounded->fBounded = span;
+    bounded->fNext = fBounded;
+    fBounded = bounded;
+}
+
+template<typename TCurve, typename OppCurve>
+SkTSpan<TCurve, OppCurve>* SkTSect<TCurve, OppCurve>::addFollowing(
+        SkTSpan<TCurve, OppCurve>* prior) {
+    SkTSpan<TCurve, OppCurve>* result = this->addOne();
+    result->fStartT = prior ? prior->fEndT : 0;
+    SkTSpan<TCurve, OppCurve>* next = prior ? prior->fNext : fHead;
+    result->fEndT = next ? next->fStartT : 1;
+    result->fPrev = prior;
+    result->fNext = next;
+    if (prior) {
+        prior->fNext = result;
+    } else {
+        fHead = result;
+    }
+    if (next) {
+        next->fPrev = result;
+    }
+    result->resetBounds(fCurve);
+    return result;
+}
+
+template<typename TCurve, typename OppCurve>
+void SkTSect<TCurve, OppCurve>::addForPerp(SkTSpan<OppCurve, TCurve>* span, double t) {
+    if (!span->hasOppT(t)) {
+        SkTSpan<TCurve, OppCurve>* priorSpan;
+        SkTSpan<TCurve, OppCurve>* opp = this->spanAtT(t, &priorSpan);
+        if (!opp) {
+            opp = this->addFollowing(priorSpan);
+#if DEBUG_PERP
+            SkDebugf("%s priorSpan=%d t=%1.9g opp=%d\n", __FUNCTION__, priorSpan ?
+                    priorSpan->debugID() : -1, t, opp->debugID());
+#endif
+        }
+#if DEBUG_PERP
+        opp->dump(); SkDebugf("\n");
+        SkDebugf("%s addBounded span=%d opp=%d\n", __FUNCTION__, priorSpan ?
+                priorSpan->debugID() : -1, opp->debugID());
+#endif
+        opp->addBounded(span, &fHeap);
+        span->addBounded(opp, &fHeap);
+    }
+    this->validate();
+#if DEBUG_T_SECT
+    span->validatePerpT(t);
+#endif
+}
+
+template<typename TCurve, typename OppCurve>
+double SkTSpan<TCurve, OppCurve>::closestBoundedT(const SkDPoint& pt) const {
+    double result = -1;
+    double closest = FLT_MAX;
+    const SkTSpanBounded<OppCurve, TCurve>* testBounded = fBounded;
+    while (testBounded) {
+        const SkTSpan<OppCurve, TCurve>* test = testBounded->fBounded;
+        double startDist = test->fPart[0].distanceSquared(pt);
+        if (closest > startDist) {
+            closest = startDist;
+            result = test->fStartT;
+        }
+        double endDist = test->fPart[OppCurve::kPointLast].distanceSquared(pt);
+        if (closest > endDist) {
+            closest = endDist;
+            result = test->fEndT;
+        }
+        testBounded = testBounded->fNext;
+    }
+    SkASSERT(between(0, result, 1));
+    return result;
+}
+
+#ifdef SK_DEBUG
+template<typename TCurve, typename OppCurve>
+bool SkTSpan<TCurve, OppCurve>::debugIsBefore(const SkTSpan* span) const {
+    const SkTSpan* work = this;
+    do {
+        if (span == work) {
+            return true;
+        }
+    } while ((work = work->fNext));
+    return false;
+}
+#endif
+
+template<typename TCurve, typename OppCurve>
+bool SkTSpan<TCurve, OppCurve>::contains(double t) const {
+    const SkTSpan* work = this;
+    do {
+        if (between(work->fStartT, t, work->fEndT)) {
+            return true;
+        }
+    } while ((work = work->fNext));
+    return false;
+}
+
+template<typename TCurve, typename OppCurve>
+const SkTSect<OppCurve, TCurve>* SkTSpan<TCurve, OppCurve>::debugOpp() const {
+    return SkDEBUGRELEASE(fDebugSect->debugOpp(), nullptr);
+}
+
+template<typename TCurve, typename OppCurve>
+SkTSpan<OppCurve, TCurve>* SkTSpan<TCurve, OppCurve>::findOppSpan(
+        const SkTSpan<OppCurve, TCurve>* opp) const {
+    SkTSpanBounded<OppCurve, TCurve>* bounded = fBounded;
+    while (bounded) {
+        SkTSpan<OppCurve, TCurve>* test = bounded->fBounded;
+        if (opp == test) {
+            return test;
+        }
+        bounded = bounded->fNext;
+    }
+    return nullptr;
+}
+
+// returns 0 if no hull intersection
+//         1 if hulls intersect
+//         2 if hulls only share a common endpoint
+//        -1 if linear and further checking is required
+template<typename TCurve, typename OppCurve>
+int SkTSpan<TCurve, OppCurve>::hullCheck(const SkTSpan<OppCurve, TCurve>* opp,
+        bool* start, bool* oppStart) {
+    if (fIsLinear) {
+        return -1;
+    }
+    bool ptsInCommon;
+    if (onlyEndPointsInCommon(opp, start, oppStart, &ptsInCommon)) {
+        SkASSERT(ptsInCommon);
+        return 2;
+    }
+    bool linear;
+    if (fPart.hullIntersects(opp->fPart, &linear)) {
+        if (!linear) {  // check set true if linear
+            return 1;
+        }
+        fIsLinear = true;
+        fIsLine = fPart.controlsInside();
+        return ptsInCommon ? 2 : -1;
+    } else {  // hull is not linear; check set true if intersected at the end points
+        return ((int) ptsInCommon) << 1;  // 0 or 2
+    }
+    return 0;
+}
+
+// OPTIMIZE ? If at_most_end_pts_in_common detects that one quad is near linear,
+// use line intersection to guess a better split than 0.5
+// OPTIMIZE Once at_most_end_pts_in_common detects linear, mark span so all future splits are linear
+template<typename TCurve, typename OppCurve>
+int SkTSpan<TCurve, OppCurve>::hullsIntersect(SkTSpan<OppCurve, TCurve>* opp,
+        bool* start, bool* oppStart) {
+    if (!fBounds.intersects(opp->fBounds)) {
+        return 0;
+    }
+    int hullSect = this->hullCheck(opp, start, oppStart);
+    if (hullSect >= 0) {
+        return hullSect;
+    }
+    hullSect = opp->hullCheck(this, oppStart, start);
+    if (hullSect >= 0) {
+        return hullSect;
+    }
+    return -1;
+}
+
+template<typename TCurve, typename OppCurve>
+void SkTSpan<TCurve, OppCurve>::init(const TCurve& c) {
+    fPrev = fNext = nullptr;
+    fStartT = 0;
+    fEndT = 1;
+    fBounded = nullptr;
+    resetBounds(c);
+}
+
+template<typename TCurve, typename OppCurve>
+void SkTSpan<TCurve, OppCurve>::initBounds(const TCurve& c) {
+    fPart = c.subDivide(fStartT, fEndT);
+    fBounds.setBounds(fPart);
+    fCoinStart.init();
+    fCoinEnd.init();
+    fBoundsMax = SkTMax(fBounds.width(), fBounds.height());
+    fCollapsed = fPart.collapsed();
+    fHasPerp = false;
+    fDeleted = false;
+#if DEBUG_T_SECT
+    if (fCollapsed) {
+        SkDebugf("");  // for convenient breakpoints
+    }
+#endif
+}
+
+template<typename TCurve, typename OppCurve>
+bool SkTSpan<TCurve, OppCurve>::linearsIntersect(SkTSpan<OppCurve, TCurve>* span) {
+    int result = this->linearIntersects(span->fPart);
+    if (result <= 1) {
+        return SkToBool(result);
+    }
+    SkASSERT(span->fIsLinear);
+    result = span->linearIntersects(this->fPart);
+//    SkASSERT(result <= 1);
+    return SkToBool(result);
+}
+
+template<typename TCurve, typename OppCurve>
+double SkTSpan<TCurve, OppCurve>::linearT(const SkDPoint& pt) const {
+    SkDVector len = fPart[TCurve::kPointLast] - fPart[0];
+    return fabs(len.fX) > fabs(len.fY)
+            ? (pt.fX - fPart[0].fX) / len.fX
+            : (pt.fY - fPart[0].fY) / len.fY;
+}
+
+template<typename TCurve, typename OppCurve>
+int SkTSpan<TCurve, OppCurve>::linearIntersects(const OppCurve& q2) const {
+    // looks like q1 is near-linear
+    int start = 0, end = TCurve::kPointLast;  // the outside points are usually the extremes
+    if (!fPart.controlsInside()) {
+        double dist = 0;  // if there's any question, compute distance to find best outsiders
+        for (int outer = 0; outer < TCurve::kPointCount - 1; ++outer) {
+            for (int inner = outer + 1; inner < TCurve::kPointCount; ++inner) {
+                double test = (fPart[outer] - fPart[inner]).lengthSquared();
+                if (dist > test) {
+                    continue;
+                }
+                dist = test;
+                start = outer;
+                end = inner;
+            }
+        }
+    }
+    // see if q2 is on one side of the line formed by the extreme points
+    double origX = fPart[start].fX;
+    double origY = fPart[start].fY;
+    double adj = fPart[end].fX - origX;
+    double opp = fPart[end].fY - origY;
+    double maxPart = SkTMax(fabs(adj), fabs(opp));
+    double sign = 0;  // initialization to shut up warning in release build
+    for (int n = 0; n < OppCurve::kPointCount; ++n) {
+        double dx = q2[n].fY - origY;
+        double dy = q2[n].fX - origX;
+        double maxVal = SkTMax(maxPart, SkTMax(fabs(dx), fabs(dy)));
+        double test = (q2[n].fY - origY) * adj - (q2[n].fX - origX) * opp;
+        if (precisely_zero_when_compared_to(test, maxVal)) {
+            return 1;
+        }
+        if (approximately_zero_when_compared_to(test, maxVal)) {
+            return 3;
+        }
+        if (n == 0) {
+            sign = test;
+            continue;
+        }
+        if (test * sign < 0) {
+            return 1;
+        }
+    }
+    return 0;
+}
+
+template<typename TCurve, typename OppCurve>
+bool SkTSpan<TCurve, OppCurve>::onlyEndPointsInCommon(const SkTSpan<OppCurve, TCurve>* opp,
+        bool* start, bool* oppStart, bool* ptsInCommon) {
+    if (opp->fPart[0] == fPart[0]) {
+        *start = *oppStart = true;
+    } else if (opp->fPart[0] == fPart[TCurve::kPointLast]) {
+        *start = false;
+        *oppStart = true;
+    } else if (opp->fPart[OppCurve::kPointLast] == fPart[0]) {
+        *start = true;
+        *oppStart = false;
+    } else if (opp->fPart[OppCurve::kPointLast] == fPart[TCurve::kPointLast]) {
+        *start = *oppStart = false;
+    } else {
+        *ptsInCommon = false;
+        return false;
+    }
+    *ptsInCommon = true;
+    const SkDPoint* otherPts[TCurve::kPointCount - 1], * oppOtherPts[OppCurve::kPointCount - 1];
+    int baseIndex = *start ? 0 : TCurve::kPointLast;
+    fPart.otherPts(baseIndex, otherPts);
+    opp->fPart.otherPts(*oppStart ? 0 : OppCurve::kPointLast, oppOtherPts);
+    const SkDPoint& base = fPart[baseIndex];
+    for (int o1 = 0; o1 < (int) SK_ARRAY_COUNT(otherPts); ++o1) {
+        SkDVector v1 = *otherPts[o1] - base;
+        for (int o2 = 0; o2 < (int) SK_ARRAY_COUNT(oppOtherPts); ++o2) {
+            SkDVector v2 = *oppOtherPts[o2] - base;
+            if (v2.dot(v1) >= 0) {
+                return false;
+            }
+        }
+    }
+    return true;
+}
+
+template<typename TCurve, typename OppCurve>
+SkTSpan<OppCurve, TCurve>* SkTSpan<TCurve, OppCurve>::oppT(double t) const {
+    SkTSpanBounded<OppCurve, TCurve>* bounded = fBounded;
+    while (bounded) {
+        SkTSpan<OppCurve, TCurve>* test = bounded->fBounded;
+        if (between(test->fStartT, t, test->fEndT)) {
+            return test;
+        }
+        bounded = bounded->fNext;
+    }
+    return nullptr;
+}
+
+template<typename TCurve, typename OppCurve>
+bool SkTSpan<TCurve, OppCurve>::removeAllBounded() {
+    bool deleteSpan = false;
+    SkTSpanBounded<OppCurve, TCurve>* bounded = fBounded;
+    while (bounded) {
+        SkTSpan<OppCurve, TCurve>* opp = bounded->fBounded;
+        deleteSpan |= opp->removeBounded(this);
+        bounded = bounded->fNext;
+    }
+    return deleteSpan;
+}
+
+template<typename TCurve, typename OppCurve>
+bool SkTSpan<TCurve, OppCurve>::removeBounded(const SkTSpan<OppCurve, TCurve>* opp) {
+    if (fHasPerp) {
+        bool foundStart = false;
+        bool foundEnd = false;
+        SkTSpanBounded<OppCurve, TCurve>* bounded = fBounded;
+        while (bounded) {
+            SkTSpan<OppCurve, TCurve>* test = bounded->fBounded;
+            if (opp != test) {
+                foundStart |= between(test->fStartT, fCoinStart.perpT(), test->fEndT);
+                foundEnd |= between(test->fStartT, fCoinEnd.perpT(), test->fEndT);
+            }
+            bounded = bounded->fNext;
+        }
+        if (!foundStart || !foundEnd) {
+            fHasPerp = false;
+            fCoinStart.init();
+            fCoinEnd.init();
+        }
+    }
+    SkTSpanBounded<OppCurve, TCurve>* bounded = fBounded;
+    SkTSpanBounded<OppCurve, TCurve>* prev = nullptr;
+    while (bounded) {
+        SkTSpanBounded<OppCurve, TCurve>* boundedNext = bounded->fNext;
+        if (opp == bounded->fBounded) {
+            if (prev) {
+                prev->fNext = boundedNext;
+                return false;
+            } else {
+                fBounded = boundedNext;
+                return fBounded == nullptr;
+            }
+        }
+        prev = bounded;
+        bounded = boundedNext;
+    }
+    SkASSERT(0);
+    return false;
+}
+
+template<typename TCurve, typename OppCurve>
+bool SkTSpan<TCurve, OppCurve>::splitAt(SkTSpan* work, double t, SkChunkAlloc* heap) {
+    fStartT = t;
+    fEndT = work->fEndT;
+    if (fStartT == fEndT) {
+        fCollapsed = true;
+        return false;
+    }
+    work->fEndT = t;
+    if (work->fStartT == work->fEndT) {
+        work->fCollapsed = true;
+        return false;
+    }
+    fPrev = work;
+    fNext = work->fNext;
+    fIsLinear = work->fIsLinear;
+    fIsLine = work->fIsLine;
+
+    work->fNext = this;
+    if (fNext) {
+        fNext->fPrev = this;
+    }
+    SkTSpanBounded<OppCurve, TCurve>* bounded = work->fBounded;
+    fBounded = nullptr;
+    while (bounded) {
+        this->addBounded(bounded->fBounded, heap);
+        bounded = bounded->fNext;
+    }
+    bounded = fBounded;
+    while (bounded) {
+        bounded->fBounded->addBounded(this, heap);
+        bounded = bounded->fNext;
+    }
+    return true;
+}
+
+template<typename TCurve, typename OppCurve>
+void SkTSpan<TCurve, OppCurve>::validate() const {
+#if DEBUG_T_SECT
+    SkASSERT(fNext == nullptr || fNext != fPrev);
+    SkASSERT(fNext == nullptr || this == fNext->fPrev);
+    SkASSERT(fPrev == nullptr || this == fPrev->fNext);
+    SkASSERT(fBounds.width() || fBounds.height() || fCollapsed);
+    SkASSERT(fBoundsMax == SkTMax(fBounds.width(), fBounds.height()));
+    SkASSERT(0 <= fStartT);
+    SkASSERT(fEndT <= 1);
+    SkASSERT(fStartT <= fEndT);
+    SkASSERT(fBounded);
+    this->validateBounded();
+    if (fHasPerp) {
+        if (fCoinStart.isCoincident()) {
+            validatePerpT(fCoinStart.perpT());
+            validatePerpPt(fCoinStart.perpT(), fCoinStart.perpPt());
+        }
+        if (fCoinEnd.isCoincident()) {
+            validatePerpT(fCoinEnd.perpT());
+            validatePerpPt(fCoinEnd.perpT(), fCoinEnd.perpPt());
+        }
+    }
+#endif
+}
+
+template<typename TCurve, typename OppCurve>
+void SkTSpan<TCurve, OppCurve>::validateBounded() const {
+#if DEBUG_VALIDATE
+    const SkTSpanBounded<OppCurve, TCurve>* testBounded = fBounded;
+    while (testBounded) {
+        SkDEBUGCODE_(const SkTSpan<OppCurve, TCurve>* overlap = testBounded->fBounded);
+        SkASSERT(!overlap->fDeleted);
+        SkASSERT(((this->debugID() ^ overlap->debugID()) & 1) == 1);
+        SkASSERT(overlap->findOppSpan(this));
+        testBounded = testBounded->fNext;
+    }
+#endif
+}
+
+template<typename TCurve, typename OppCurve>
+void SkTSpan<TCurve, OppCurve>::validatePerpT(double oppT) const {
+    const SkTSpanBounded<OppCurve, TCurve>* testBounded = fBounded;
+    while (testBounded) {
+        const SkTSpan<OppCurve, TCurve>* overlap = testBounded->fBounded;
+        if (precisely_between(overlap->fStartT, oppT, overlap->fEndT)) {
+            return;
+        }
+        testBounded = testBounded->fNext;
+    }
+    SkASSERT(0);
+}
+
+template<typename TCurve, typename OppCurve>
+void SkTSpan<TCurve, OppCurve>::validatePerpPt(double t, const SkDPoint& pt) const {
+    SkASSERT(fDebugSect->fOppSect->fCurve.ptAtT(t) == pt);
+}
+
+
+template<typename TCurve, typename OppCurve>
+SkTSect<TCurve, OppCurve>::SkTSect(const TCurve& c PATH_OPS_DEBUG_T_SECT_PARAMS(int id))
+    : fCurve(c)
+    , fHeap(sizeof(SkTSpan<TCurve, OppCurve>) * 4)
+    , fCoincident(nullptr)
+    , fDeleted(nullptr)
+    , fActiveCount(0)
+    PATH_OPS_DEBUG_T_SECT_PARAMS(fID(id))
+    PATH_OPS_DEBUG_T_SECT_PARAMS(fDebugCount(0))
+    PATH_OPS_DEBUG_T_SECT_PARAMS(fDebugAllocatedCount(0))
+{
+    fHead = addOne();
+    fHead->init(c);
+}
+
+template<typename TCurve, typename OppCurve>
+SkTSpan<TCurve, OppCurve>* SkTSect<TCurve, OppCurve>::addOne() {
+    SkTSpan<TCurve, OppCurve>* result;
+    if (fDeleted) {
+        result = fDeleted;
+        fDeleted = result->fNext;
+    } else {
+        result = new (fHeap.allocThrow(sizeof(SkTSpan<TCurve, OppCurve>)))(
+                SkTSpan<TCurve, OppCurve>);
+#if DEBUG_T_SECT
+        ++fDebugAllocatedCount;
+#endif
+    }
+    result->reset();
+    result->fHasPerp = false;
+    result->fDeleted = false;
+    ++fActiveCount; 
+    PATH_OPS_DEBUG_T_SECT_CODE(result->fID = fDebugCount++ * 2 + fID);
+    SkDEBUGCODE(result->fDebugSect = this);
+#ifdef SK_DEBUG
+    result->fPart.debugInit();
+    result->fCoinStart.debugInit();
+    result->fCoinEnd.debugInit();
+    result->fPrev = result->fNext = nullptr;
+    result->fBounds.debugInit();
+    result->fStartT = result->fEndT = result->fBoundsMax = SK_ScalarNaN;
+    result->fCollapsed = result->fIsLinear = result->fIsLine = 0xFF;
+#endif
+    return result;
+}
+
+template<typename TCurve, typename OppCurve>
+bool SkTSect<TCurve, OppCurve>::binarySearchCoin(SkTSect<OppCurve, TCurve>* sect2, double tStart,
+        double tStep, double* resultT, double* oppT) {
+    SkTSpan<TCurve, OppCurve> work;
+    double result = work.fStartT = work.fEndT = tStart;
+    SkDEBUGCODE(work.fDebugSect = this);
+    SkDPoint last = fCurve.ptAtT(tStart);
+    SkDPoint oppPt;
+    bool flip = false;
+    SkDEBUGCODE(bool down = tStep < 0);
+    const OppCurve& opp = sect2->fCurve;
+    do {
+        tStep *= 0.5;
+        work.fStartT += tStep;
+        if (flip) {
+            tStep = -tStep;
+            flip = false;
+        }
+        work.initBounds(fCurve);
+        if (work.fCollapsed) {
+            return false;
+        }
+        if (last.approximatelyEqual(work.fPart[0])) {
+            break;
+        }
+        last = work.fPart[0];
+        work.fCoinStart.setPerp(fCurve, work.fStartT, last, opp);
+        if (work.fCoinStart.isCoincident()) {
+#if DEBUG_T_SECT
+            work.validatePerpPt(work.fCoinStart.perpT(), work.fCoinStart.perpPt());
+#endif
+            double oppTTest = work.fCoinStart.perpT();
+            if (sect2->fHead->contains(oppTTest)) {
+                *oppT = oppTTest;
+                oppPt = work.fCoinStart.perpPt();
+                SkASSERT(down ? result > work.fStartT : result < work.fStartT);
+                result = work.fStartT;
+                continue;
+            }
+        }
+        tStep = -tStep;
+        flip = true;
+    } while (true);
+    if (last.approximatelyEqual(fCurve[0])) {
+        result = 0;
+    } else if (last.approximatelyEqual(fCurve[TCurve::kPointLast])) {
+        result = 1;
+    }
+    if (oppPt.approximatelyEqual(opp[0])) {
+        *oppT = 0;
+    } else if (oppPt.approximatelyEqual(opp[OppCurve::kPointLast])) {
+        *oppT = 1;
+    }
+    *resultT = result;
+    return true;
+}
+
+// OPTIMIZE ? keep a sorted list of sizes in the form of a doubly-linked list in quad span
+//            so that each quad sect has a pointer to the largest, and can update it as spans
+//            are split
+template<typename TCurve, typename OppCurve>
+SkTSpan<TCurve, OppCurve>* SkTSect<TCurve, OppCurve>::boundsMax() const {
+    SkTSpan<TCurve, OppCurve>* test = fHead;
+    SkTSpan<TCurve, OppCurve>* largest = fHead;
+    bool lCollapsed = largest->fCollapsed;
+    while ((test = test->fNext)) {
+        bool tCollapsed = test->fCollapsed;
+        if ((lCollapsed && !tCollapsed) || (lCollapsed == tCollapsed &&
+                largest->fBoundsMax < test->fBoundsMax)) {
+            largest = test;
+            lCollapsed = test->fCollapsed;
+        }
+    }
+    return largest;
+}
+
+template<typename TCurve, typename OppCurve>
+void SkTSect<TCurve, OppCurve>::coincidentCheck(SkTSect<OppCurve, TCurve>* sect2) {
+    SkTSpan<TCurve, OppCurve>* first = fHead;
+    SkTSpan<TCurve, OppCurve>* last, * next;
+    do {
+        int consecutive = this->countConsecutiveSpans(first, &last);
+        next = last->fNext;
+        if (consecutive < COINCIDENT_SPAN_COUNT) {
+            continue;
+        }
+        this->validate();
+        sect2->validate();
+        this->computePerpendiculars(sect2, first, last);
+        this->validate();
+        sect2->validate();
+        // check to see if a range of points are on the curve
+        SkTSpan<TCurve, OppCurve>* coinStart = first;
+        do {
+            coinStart = this->extractCoincident(sect2, coinStart, last);
+        } while (coinStart && !last->fDeleted);
+    } while ((first = next));
+}
+
+template<typename TCurve, typename OppCurve>
+void SkTSect<TCurve, OppCurve>::coincidentForce(SkTSect<OppCurve, TCurve>* sect2,
+        double start1s, double start1e) {
+    SkTSpan<TCurve, OppCurve>* first = fHead;
+    SkTSpan<TCurve, OppCurve>* last = this->tail();
+    SkTSpan<OppCurve, TCurve>* oppFirst = sect2->fHead;
+    SkTSpan<OppCurve, TCurve>* oppLast = sect2->tail();
+    bool deleteEmptySpans = this->updateBounded(first, last, oppFirst);
+    deleteEmptySpans |= sect2->updateBounded(oppFirst, oppLast, first);
+    this->removeSpanRange(first, last);
+    sect2->removeSpanRange(oppFirst, oppLast);
+    first->fStartT = start1s;
+    first->fEndT = start1e;
+    first->resetBounds(fCurve);
+    first->fCoinStart.setPerp(fCurve, start1s, fCurve[0], sect2->fCurve);
+    first->fCoinEnd.setPerp(fCurve, start1e, fCurve[TCurve::kPointLast], sect2->fCurve);
+    bool oppMatched = first->fCoinStart.perpT() < first->fCoinEnd.perpT();
+    double oppStartT = first->fCoinStart.perpT() == -1 ? 0 : SkTMax(0., first->fCoinStart.perpT());
+    double oppEndT = first->fCoinEnd.perpT() == -1 ? 1 : SkTMin(1., first->fCoinEnd.perpT());
+    if (!oppMatched) {
+        SkTSwap(oppStartT, oppEndT);
+    }
+    oppFirst->fStartT = oppStartT;
+    oppFirst->fEndT = oppEndT;
+    oppFirst->resetBounds(sect2->fCurve);
+    this->removeCoincident(first, false);
+    sect2->removeCoincident(oppFirst, true);
+    if (deleteEmptySpans) {
+        this->deleteEmptySpans();
+        sect2->deleteEmptySpans();
+    }
+}
+
+template<typename TCurve, typename OppCurve>
+bool SkTSect<TCurve, OppCurve>::coincidentHasT(double t) {
+    SkTSpan<TCurve, OppCurve>* test = fCoincident;
+    while (test) {
+        if (between(test->fStartT, t, test->fEndT)) {
+            return true;
+        }
+        test = test->fNext;
+    }
+    return false;
+}
+
+template<typename TCurve, typename OppCurve>
+int SkTSect<TCurve, OppCurve>::collapsed() const {
+    int result = 0;
+    const SkTSpan<TCurve, OppCurve>* test = fHead;
+    while (test) {
+        if (test->fCollapsed) {
+            ++result;
+        }
+        test = test->next();
+    }
+    return result;
+}
+
+template<typename TCurve, typename OppCurve>
+void SkTSect<TCurve, OppCurve>::computePerpendiculars(SkTSect<OppCurve, TCurve>* sect2,
+        SkTSpan<TCurve, OppCurve>* first, SkTSpan<TCurve, OppCurve>* last) {
+    const OppCurve& opp = sect2->fCurve;
+    SkTSpan<TCurve, OppCurve>* work = first;
+    SkTSpan<TCurve, OppCurve>* prior = nullptr;
+    do {
+        if (!work->fHasPerp && !work->fCollapsed) {
+            if (prior) {
+                work->fCoinStart = prior->fCoinEnd;
+            } else {
+                work->fCoinStart.setPerp(fCurve, work->fStartT, work->fPart[0], opp);
+            }
+            if (work->fCoinStart.isCoincident()) {
+                double perpT = work->fCoinStart.perpT();
+                if (sect2->coincidentHasT(perpT)) {
+                    work->fCoinStart.init();
+                } else {
+                    sect2->addForPerp(work, perpT);
+                }
+            }
+            work->fCoinEnd.setPerp(fCurve, work->fEndT, work->fPart[TCurve::kPointLast], opp);
+            if (work->fCoinEnd.isCoincident()) {
+                double perpT = work->fCoinEnd.perpT();
+                if (sect2->coincidentHasT(perpT)) {
+                    work->fCoinEnd.init();
+                } else {
+                    sect2->addForPerp(work, perpT);
+                }
+            }
+            work->fHasPerp = true;
+        }
+        if (work == last) {
+            break;
+        }
+        prior = work;
+        work = work->fNext;
+        SkASSERT(work);
+    } while (true);
+}
+
+template<typename TCurve, typename OppCurve>
+int SkTSect<TCurve, OppCurve>::countConsecutiveSpans(SkTSpan<TCurve, OppCurve>* first,
+        SkTSpan<TCurve, OppCurve>** lastPtr) const {
+    int consecutive = 1;
+    SkTSpan<TCurve, OppCurve>* last = first;
+    do {
+        SkTSpan<TCurve, OppCurve>* next = last->fNext;
+        if (!next) {
+            break;
+        }
+        if (next->fStartT > last->fEndT) {
+            break;
+        }
+        ++consecutive;
+        last = next;
+    } while (true);
+    *lastPtr = last;
+    return consecutive;
+}
+
+template<typename TCurve, typename OppCurve>
+bool SkTSect<TCurve, OppCurve>::debugHasBounded(const SkTSpan<OppCurve, TCurve>* span) const {
+    const SkTSpan<TCurve, OppCurve>* test = fHead;
+    if (!test) {
+        return false;
+    }
+    do {
+        if (test->findOppSpan(span)) {
+            return true;
+        }
+    } while ((test = test->next()));
+    return false;
+}
+
+template<typename TCurve, typename OppCurve>
+void SkTSect<TCurve, OppCurve>::deleteEmptySpans() {
+    SkTSpan<TCurve, OppCurve>* test;
+    SkTSpan<TCurve, OppCurve>* next = fHead;
+    while ((test = next)) {
+        next = test->fNext;
+        if (!test->fBounded) {
+            this->removeSpan(test);
+        }
+    }
+}
+
+template<typename TCurve, typename OppCurve>
+SkTSpan<TCurve, OppCurve>* SkTSect<TCurve, OppCurve>::extractCoincident(
+        SkTSect<OppCurve, TCurve>* sect2,
+        SkTSpan<TCurve, OppCurve>* first, SkTSpan<TCurve, OppCurve>* last) {
+    first = findCoincidentRun(first, &last);
+    if (!first) {
+        return nullptr;
+    }
+    // march outwards to find limit of coincidence from here to previous and next spans
+    double startT = first->fStartT;
+    double oppStartT SK_INIT_TO_AVOID_WARNING;
+    double oppEndT SK_INIT_TO_AVOID_WARNING;
+    SkTSpan<TCurve, OppCurve>* prev = first->fPrev;
+    SkASSERT(first->fCoinStart.isCoincident());
+    SkTSpan<OppCurve, TCurve>* oppFirst = first->findOppT(first->fCoinStart.perpT());
+    SkASSERT(last->fCoinEnd.isCoincident());
+    bool oppMatched = first->fCoinStart.perpT() < first->fCoinEnd.perpT();
+    double coinStart;
+    SkDEBUGCODE(double coinEnd);
+    SkTSpan<OppCurve, TCurve>* cutFirst;
+    if (prev && prev->fEndT == startT
+            && this->binarySearchCoin(sect2, startT, prev->fStartT - startT, &coinStart,
+                                      &oppStartT)
+            && prev->fStartT < coinStart && coinStart < startT
+            && (cutFirst = prev->oppT(oppStartT))) {
+        oppFirst = cutFirst;
+        first = this->addSplitAt(prev, coinStart);
+        first->markCoincident();
+        prev->fCoinEnd.markCoincident();
+        if (oppFirst->fStartT < oppStartT && oppStartT < oppFirst->fEndT) {
+            SkTSpan<OppCurve, TCurve>* oppHalf = sect2->addSplitAt(oppFirst, oppStartT);
+            if (oppMatched) {
+                oppFirst->fCoinEnd.markCoincident();
+                oppHalf->markCoincident();
+                oppFirst = oppHalf;
+            } else {
+                oppFirst->markCoincident();
+                oppHalf->fCoinStart.markCoincident();
+            }
+        }
+    } else {
+        SkDEBUGCODE(coinStart = first->fStartT);
+        SkDEBUGCODE(oppStartT = oppMatched ? oppFirst->fStartT : oppFirst->fEndT);
+    }
+    // FIXME: incomplete : if we're not at the end, find end of coin
+    SkTSpan<OppCurve, TCurve>* oppLast;
+    SkASSERT(last->fCoinEnd.isCoincident());
+    oppLast = last->findOppT(last->fCoinEnd.perpT());
+    SkDEBUGCODE(coinEnd = last->fEndT);
+    SkDEBUGCODE(oppEndT = oppMatched ? oppLast->fEndT : oppLast->fStartT);
+    if (!oppMatched) {
+        SkTSwap(oppFirst, oppLast);
+        SkTSwap(oppStartT, oppEndT);
+    }
+    SkASSERT(oppStartT < oppEndT);
+    SkASSERT(coinStart == first->fStartT);
+    SkASSERT(coinEnd == last->fEndT);
+    SkASSERT(oppStartT == oppFirst->fStartT);
+    SkASSERT(oppEndT == oppLast->fEndT);
+    // reduce coincident runs to single entries
+    this->validate();
+    sect2->validate();
+    bool deleteEmptySpans = this->updateBounded(first, last, oppFirst);
+    deleteEmptySpans |= sect2->updateBounded(oppFirst, oppLast, first);
+    this->removeSpanRange(first, last);
+    sect2->removeSpanRange(oppFirst, oppLast);
+    first->fEndT = last->fEndT;
+    first->resetBounds(this->fCurve);
+    first->fCoinStart.setPerp(fCurve, first->fStartT, first->fPart[0], sect2->fCurve);
+    first->fCoinEnd.setPerp(fCurve, first->fEndT, first->fPart[TCurve::kPointLast], sect2->fCurve);
+    oppStartT = first->fCoinStart.perpT();
+    oppEndT = first->fCoinEnd.perpT();
+    if (between(0, oppStartT, 1) && between(0, oppEndT, 1)) {
+        if (!oppMatched) {
+            SkTSwap(oppStartT, oppEndT);
+        }
+        oppFirst->fStartT = oppStartT;
+        oppFirst->fEndT = oppEndT;
+        oppFirst->resetBounds(sect2->fCurve);
+    }
+    this->validateBounded();
+    sect2->validateBounded();
+    last = first->fNext;
+    this->removeCoincident(first, false);
+    sect2->removeCoincident(oppFirst, true);
+    if (deleteEmptySpans) {
+        this->deleteEmptySpans();
+        sect2->deleteEmptySpans();
+    }
+    this->validate();
+    sect2->validate();
+    return last && !last->fDeleted ? last : nullptr;
+}
+
+template<typename TCurve, typename OppCurve>
+SkTSpan<TCurve, OppCurve>* SkTSect<TCurve, OppCurve>::findCoincidentRun(
+        SkTSpan<TCurve, OppCurve>* first, SkTSpan<TCurve, OppCurve>** lastPtr) {
+    SkTSpan<TCurve, OppCurve>* work = first;
+    SkTSpan<TCurve, OppCurve>* lastCandidate = nullptr;
+    first = nullptr;
+    // find the first fully coincident span
+    do {
+        if (work->fCoinStart.isCoincident()) {
+#if DEBUG_T_SECT
+            work->validatePerpT(work->fCoinStart.perpT());
+            work->validatePerpPt(work->fCoinStart.perpT(), work->fCoinStart.perpPt());
+#endif
+            SkASSERT(work->hasOppT(work->fCoinStart.perpT()));
+            if (!work->fCoinEnd.isCoincident()) {
+                break;
+            }
+            lastCandidate = work;
+            if (!first) {
+                first = work;
+            }
+        } else if (first && work->fCollapsed) {
+            *lastPtr = lastCandidate;
+            return first;
+        } else {
+            lastCandidate = nullptr;
+            SkASSERT(!first);
+        }
+        if (work == *lastPtr) {
+            return first;
+        }
+        work = work->fNext;
+        SkASSERT(work);
+    } while (true);
+    if (lastCandidate) {
+        *lastPtr = lastCandidate;
+    }
+    return first;
+}
+
+template<typename TCurve, typename OppCurve>
+int SkTSect<TCurve, OppCurve>::intersects(SkTSpan<TCurve, OppCurve>* span,
+        SkTSect<OppCurve, TCurve>* opp,
+        SkTSpan<OppCurve, TCurve>* oppSpan, int* oppResult) {
+    bool spanStart, oppStart;
+    int hullResult = span->hullsIntersect(oppSpan, &spanStart, &oppStart);
+    if (hullResult >= 0) {
+        if (hullResult == 2) {  // hulls have one point in common
+            if (!span->fBounded || !span->fBounded->fNext) {
+                SkASSERT(!span->fBounded || span->fBounded->fBounded == oppSpan);
+                if (spanStart) {
+                    span->fEndT = span->fStartT;
+                } else {
+                    span->fStartT = span->fEndT;
+                }
+            } else {
+                hullResult = 1;
+            }
+            if (!oppSpan->fBounded || !oppSpan->fBounded->fNext) {
+                SkASSERT(!oppSpan->fBounded || oppSpan->fBounded->fBounded == span);
+                if (oppStart) {
+                    oppSpan->fEndT = oppSpan->fStartT;
+                } else {
+                    oppSpan->fStartT = oppSpan->fEndT;
+                }
+                *oppResult = 2;
+            } else {
+                *oppResult = 1;
+            }
+        } else {
+            *oppResult = 1;
+        }
+        return hullResult;
+    }
+    if (span->fIsLine && oppSpan->fIsLine) {
+        SkIntersections i;
+        int sects = this->linesIntersect(span, opp, oppSpan, &i);
+        if (sects == 2) {
+            return *oppResult = 1;
+        }
+        if (!sects) {
+            return -1;
+        }
+        span->fStartT = span->fEndT = i[0][0];
+        oppSpan->fStartT = oppSpan->fEndT = i[1][0];
+        return *oppResult = 2;
+    }
+    if (span->fIsLinear || oppSpan->fIsLinear) {
+        return *oppResult = (int) span->linearsIntersect(oppSpan);
+    }
+    return *oppResult = 1;
+}
+
+template<typename TCurve>
+static bool is_parallel(const SkDLine& thisLine, const TCurve& opp) {
+    if (!opp.IsConic()) {
+        return false; // FIXME : breaks a lot of stuff now
+    }
+    int finds = 0;
+    SkDLine thisPerp;
+    thisPerp.fPts[0].fX = thisLine.fPts[1].fX + (thisLine.fPts[1].fY - thisLine.fPts[0].fY);
+    thisPerp.fPts[0].fY = thisLine.fPts[1].fY + (thisLine.fPts[0].fX - thisLine.fPts[1].fX);
+    thisPerp.fPts[1] = thisLine.fPts[1];
+    SkIntersections perpRayI;
+    perpRayI.intersectRay(opp, thisPerp);
+    for (int pIndex = 0; pIndex < perpRayI.used(); ++pIndex) {
+        finds += perpRayI.pt(pIndex).approximatelyEqual(thisPerp.fPts[1]);
+    }
+    thisPerp.fPts[1].fX = thisLine.fPts[0].fX + (thisLine.fPts[1].fY - thisLine.fPts[0].fY);
+    thisPerp.fPts[1].fY = thisLine.fPts[0].fY + (thisLine.fPts[0].fX - thisLine.fPts[1].fX);
+    thisPerp.fPts[0] = thisLine.fPts[0];
+    perpRayI.intersectRay(opp, thisPerp);
+    for (int pIndex = 0; pIndex < perpRayI.used(); ++pIndex) {
+        finds += perpRayI.pt(pIndex).approximatelyEqual(thisPerp.fPts[0]);
+    }
+    return finds >= 2;
+}
+
+// while the intersection points are sufficiently far apart:
+// construct the tangent lines from the intersections
+// find the point where the tangent line intersects the opposite curve
+template<typename TCurve, typename OppCurve>
+int SkTSect<TCurve, OppCurve>::linesIntersect(SkTSpan<TCurve, OppCurve>* span,
+        SkTSect<OppCurve, TCurve>* opp,
+        SkTSpan<OppCurve, TCurve>* oppSpan, SkIntersections* i) {
+    SkIntersections thisRayI, oppRayI;
+    SkDLine thisLine = {{ span->fPart[0], span->fPart[TCurve::kPointLast] }};
+    SkDLine oppLine = {{ oppSpan->fPart[0], oppSpan->fPart[OppCurve::kPointLast] }};
+    int loopCount = 0;
+    double bestDistSq = DBL_MAX;
+    if (!thisRayI.intersectRay(opp->fCurve, thisLine)) {
+        return 0;
+    }
+    if (!oppRayI.intersectRay(this->fCurve, oppLine)) {
+        return 0;
+    }
+    // if the ends of each line intersect the opposite curve, the lines are coincident
+    if (thisRayI.used() > 1) {
+        int ptMatches = 0;
+        for (int tIndex = 0; tIndex < thisRayI.used(); ++tIndex) {
+            for (int lIndex = 0; lIndex < (int) SK_ARRAY_COUNT(thisLine.fPts); ++lIndex) {
+                ptMatches += thisRayI.pt(tIndex).approximatelyEqual(thisLine.fPts[lIndex]);
+            }
+        }
+        if (ptMatches == 2 || is_parallel(thisLine, opp->fCurve)) {
+            return 2;
+        }
+    }
+    if (oppRayI.used() > 1) {
+        int ptMatches = 0;
+        for (int oIndex = 0; oIndex < oppRayI.used(); ++oIndex) {
+            for (int lIndex = 0; lIndex < (int) SK_ARRAY_COUNT(thisLine.fPts); ++lIndex) {
+                ptMatches += oppRayI.pt(oIndex).approximatelyEqual(oppLine.fPts[lIndex]);
+            }
+        }
+        if (ptMatches == 2|| is_parallel(oppLine, this->fCurve)) {
+            return 2;
+        }
+    }
+    do {
+        // pick the closest pair of points
+        double closest = DBL_MAX;
+        int closeIndex SK_INIT_TO_AVOID_WARNING;
+        int oppCloseIndex SK_INIT_TO_AVOID_WARNING;
+        for (int index = 0; index < oppRayI.used(); ++index) {
+            if (!roughly_between(span->fStartT, oppRayI[0][index], span->fEndT)) {
+                continue;
+            }
+            for (int oIndex = 0; oIndex < thisRayI.used(); ++oIndex) {
+                if (!roughly_between(oppSpan->fStartT, thisRayI[0][oIndex], oppSpan->fEndT)) {
+                    continue;
+                }
+                double distSq = thisRayI.pt(index).distanceSquared(oppRayI.pt(oIndex));
+                if (closest > distSq) {
+                    closest = distSq;
+                    closeIndex = index;
+                    oppCloseIndex = oIndex;
+                }
+            }
+        }
+        if (closest == DBL_MAX) {
+            break;
+        }
+        const SkDPoint& oppIPt = thisRayI.pt(oppCloseIndex);
+        const SkDPoint& iPt = oppRayI.pt(closeIndex);
+        if (between(span->fStartT, oppRayI[0][closeIndex], span->fEndT)
+                && between(oppSpan->fStartT, thisRayI[0][oppCloseIndex], oppSpan->fEndT)
+                && oppIPt.approximatelyEqual(iPt)) {
+            i->merge(oppRayI, closeIndex, thisRayI, oppCloseIndex);
+            return i->used();
+        }
+        double distSq = oppIPt.distanceSquared(iPt);
+        if (bestDistSq < distSq || ++loopCount > 5) {
+            return 0;
+        }
+        bestDistSq = distSq;
+        double oppStart = oppRayI[0][closeIndex];
+        thisLine[0] = fCurve.ptAtT(oppStart);
+        thisLine[1] = thisLine[0] + fCurve.dxdyAtT(oppStart);
+        if (!thisRayI.intersectRay(opp->fCurve, thisLine)) {
+            break;
+        }
+        double start = thisRayI[0][oppCloseIndex];
+        oppLine[0] = opp->fCurve.ptAtT(start);
+        oppLine[1] = oppLine[0] + opp->fCurve.dxdyAtT(start);
+        if (!oppRayI.intersectRay(this->fCurve, oppLine)) {
+            break;
+        }
+    } while (true);
+    // convergence may fail if the curves are nearly coincident
+    SkTCoincident<OppCurve, TCurve> oCoinS, oCoinE;
+    oCoinS.setPerp(opp->fCurve, oppSpan->fStartT, oppSpan->fPart[0], fCurve);
+    oCoinE.setPerp(opp->fCurve, oppSpan->fEndT, oppSpan->fPart[OppCurve::kPointLast], fCurve);
+    double tStart = oCoinS.perpT();
+    double tEnd = oCoinE.perpT();
+    bool swap = tStart > tEnd;
+    if (swap) {
+        SkTSwap(tStart, tEnd);
+    }
+    tStart = SkTMax(tStart, span->fStartT);
+    tEnd = SkTMin(tEnd, span->fEndT);
+    if (tStart > tEnd) {
+        return 0;
+    }
+    SkDVector perpS, perpE;
+    if (tStart == span->fStartT) {
+        SkTCoincident<TCurve, OppCurve> coinS;
+        coinS.setPerp(fCurve, span->fStartT, span->fPart[0], opp->fCurve);
+        perpS = span->fPart[0] - coinS.perpPt();
+    } else if (swap) {
+        perpS = oCoinE.perpPt() - oppSpan->fPart[OppCurve::kPointLast];
+    } else {
+        perpS = oCoinS.perpPt() - oppSpan->fPart[0];
+    }
+    if (tEnd == span->fEndT) {
+        SkTCoincident<TCurve, OppCurve> coinE;
+        coinE.setPerp(fCurve, span->fEndT, span->fPart[TCurve::kPointLast], opp->fCurve);
+        perpE = span->fPart[TCurve::kPointLast] - coinE.perpPt();
+    } else if (swap) {
+        perpE = oCoinS.perpPt() - oppSpan->fPart[0];
+    } else {
+        perpE = oCoinE.perpPt() - oppSpan->fPart[OppCurve::kPointLast];
+    }
+    if (perpS.dot(perpE) >= 0) {
+        return 0;
+    }
+    SkTCoincident<TCurve, OppCurve> coinW;
+    double workT = tStart;
+    double tStep = tEnd - tStart;
+    SkDPoint workPt;
+    do {
+        tStep *= 0.5;
+        if (precisely_zero(tStep)) {
+            return 0;
+        }
+        workT += tStep;
+        workPt = fCurve.ptAtT(workT);
+        coinW.setPerp(fCurve, workT, workPt, opp->fCurve);
+        SkDVector perpW = workPt - coinW.perpPt();
+        if ((perpS.dot(perpW) >= 0) == (tStep < 0)) {
+            tStep = -tStep;
+        }
+    } while (!workPt.approximatelyEqual(coinW.perpPt()));
+    double oppTTest = coinW.perpT();
+    if (!opp->fHead->contains(oppTTest)) {
+        return 0;
+    }
+    i->setMax(1);
+    i->insert(workT, oppTTest, workPt);
+    return 1;
+}
+
+
+template<typename TCurve, typename OppCurve>
+void SkTSect<TCurve, OppCurve>::markSpanGone(SkTSpan<TCurve, OppCurve>* span) {
+    --fActiveCount;
+    span->fNext = fDeleted;
+    fDeleted = span;
+    SkASSERT(!span->fDeleted);
+    span->fDeleted = true;
+}
+
+template<typename TCurve, typename OppCurve>
+bool SkTSect<TCurve, OppCurve>::matchedDirection(double t, const SkTSect<OppCurve, TCurve>* sect2,
+        double t2) const {
+    SkDVector dxdy = this->fCurve.dxdyAtT(t);
+    SkDVector dxdy2 = sect2->fCurve.dxdyAtT(t2);
+    return dxdy.dot(dxdy2) >= 0;
+}
+
+template<typename TCurve, typename OppCurve>
+void SkTSect<TCurve, OppCurve>::matchedDirCheck(double t, const SkTSect<OppCurve, TCurve>* sect2,
+        double t2, bool* calcMatched, bool* oppMatched) const {
+    if (*calcMatched) {
+        SkASSERT(*oppMatched == this->matchedDirection(t, sect2, t2)); 
+    } else {
+        *oppMatched = this->matchedDirection(t, sect2, t2);
+        *calcMatched = true;
+    }
+}
+
+template<typename TCurve, typename OppCurve>
+void SkTSect<TCurve, OppCurve>::mergeCoincidence(SkTSect<OppCurve, TCurve>* sect2) {
+    double smallLimit = 0;
+    do {
+        // find the smallest unprocessed span
+        SkTSpan<TCurve, OppCurve>* smaller = nullptr;
+        SkTSpan<TCurve, OppCurve>* test = fCoincident;
+        do {
+            if (test->fStartT < smallLimit) {
+                continue;
+            }
+            if (smaller && smaller->fEndT < test->fStartT) {
+                continue;
+            }
+            smaller = test;
+        } while ((test = test->fNext));
+        if (!smaller) {
+            return;
+        }
+        smallLimit = smaller->fEndT;
+        // find next larger span
+        SkTSpan<TCurve, OppCurve>* prior = nullptr;
+        SkTSpan<TCurve, OppCurve>* larger = nullptr;
+        SkTSpan<TCurve, OppCurve>* largerPrior = nullptr;
+        test = fCoincident;
+        do {
+            if (test->fStartT < smaller->fEndT) {
+                continue;
+            }
+            SkASSERT(test->fStartT != smaller->fEndT);
+            if (larger && larger->fStartT < test->fStartT) {
+                continue;
+            }
+            largerPrior = prior;
+            larger = test;
+        } while ((prior = test), (test = test->fNext));
+        if (!larger) {
+            continue;
+        }
+        // check middle t value to see if it is coincident as well
+        double midT = (smaller->fEndT + larger->fStartT) / 2;
+        SkDPoint midPt = fCurve.ptAtT(midT);
+        SkTCoincident<TCurve, OppCurve> coin;
+        coin.setPerp(fCurve, midT, midPt, sect2->fCurve);
+        if (coin.isCoincident()) {
+            smaller->fEndT = larger->fEndT;
+            smaller->fCoinEnd = larger->fCoinEnd;
+            if (largerPrior) {
+                largerPrior->fNext = larger->fNext;
+            } else {
+                fCoincident = larger->fNext;
+            }
+        }
+    } while (true);
+}
+
+template<typename TCurve, typename OppCurve>
+SkTSpan<TCurve, OppCurve>* SkTSect<TCurve, OppCurve>::prev(
+        SkTSpan<TCurve, OppCurve>* span) const {
+    SkTSpan<TCurve, OppCurve>* result = nullptr;
+    SkTSpan<TCurve, OppCurve>* test = fHead;
+    while (span != test) {
+        result = test;
+        test = test->fNext;
+        SkASSERT(test);
+    }
+    return result; 
+}
+
+template<typename TCurve, typename OppCurve>
+void SkTSect<TCurve, OppCurve>::recoverCollapsed() {
+    SkTSpan<TCurve, OppCurve>* deleted = fDeleted;
+    while (deleted) {
+        SkTSpan<TCurve, OppCurve>* delNext = deleted->fNext;
+        if (deleted->fCollapsed) {
+            SkTSpan<TCurve, OppCurve>** spanPtr = &fHead;
+            while (*spanPtr && (*spanPtr)->fEndT <= deleted->fStartT) {
+                spanPtr = &(*spanPtr)->fNext;
+            }
+            deleted->fNext = *spanPtr;
+            *spanPtr = deleted;
+        }
+        deleted = delNext;
+    }
+}
+
+template<typename TCurve, typename OppCurve>
+void SkTSect<TCurve, OppCurve>::removeAllBut(const SkTSpan<OppCurve, TCurve>* keep,
+        SkTSpan<TCurve, OppCurve>* span, SkTSect<OppCurve, TCurve>* opp) {
+    const SkTSpanBounded<OppCurve, TCurve>* testBounded = span->fBounded;
+    while (testBounded) {
+        SkTSpan<OppCurve, TCurve>* bounded = testBounded->fBounded;
+        const SkTSpanBounded<OppCurve, TCurve>* next = testBounded->fNext;
+        // may have been deleted when opp did 'remove all but'
+        if (bounded != keep && !bounded->fDeleted) {
+            SkAssertResult(SkDEBUGCODE(!) span->removeBounded(bounded));
+            if (bounded->removeBounded(span)) {
+                opp->removeSpan(bounded);
+            }
+        }
+        testBounded = next;
+    }
+    SkASSERT(!span->fDeleted);
+    SkASSERT(span->findOppSpan(keep));
+    SkASSERT(keep->findOppSpan(span));
+}
+
+template<typename TCurve, typename OppCurve>
+void SkTSect<TCurve, OppCurve>::removeByPerpendicular(SkTSect<OppCurve, TCurve>* opp) {
+    SkTSpan<TCurve, OppCurve>* test = fHead;
+    SkTSpan<TCurve, OppCurve>* next;
+    do {
+        next = test->fNext;
+        if (test->fCoinStart.perpT() < 0 || test->fCoinEnd.perpT() < 0) {
+            continue;
+        }
+        SkDVector startV = test->fCoinStart.perpPt() - test->fPart[0];
+        SkDVector endV = test->fCoinEnd.perpPt() - test->fPart[TCurve::kPointLast];
+#if DEBUG_T_SECT
+        SkDebugf("%s startV=(%1.9g,%1.9g) endV=(%1.9g,%1.9g) dot=%1.9g\n", __FUNCTION__,
+                startV.fX, startV.fY, endV.fX, endV.fY, startV.dot(endV));
+#endif
+        if (startV.dot(endV) <= 0) {
+            continue;
+        }
+        this->removeSpans(test, opp);
+    } while ((test = next));
+}
+
+template<typename TCurve, typename OppCurve>
+void SkTSect<TCurve, OppCurve>::removeCoincident(SkTSpan<TCurve, OppCurve>* span, bool isBetween) {
+    this->unlinkSpan(span);
+    if (isBetween || between(0, span->fCoinStart.perpT(), 1)) {
+        --fActiveCount;
+        span->fNext = fCoincident;
+        fCoincident = span;
+    } else {
+        this->markSpanGone(span);
+    }
+}
+
+template<typename TCurve, typename OppCurve>
+void SkTSect<TCurve, OppCurve>::removeSpan(SkTSpan<TCurve, OppCurve>* span) {
+    this->unlinkSpan(span);
+    this->markSpanGone(span);
+}
+
+template<typename TCurve, typename OppCurve>
+void SkTSect<TCurve, OppCurve>::removeSpanRange(SkTSpan<TCurve, OppCurve>* first,
+        SkTSpan<TCurve, OppCurve>* last) {
+    if (first == last) {
+        return;
+    }
+    SkTSpan<TCurve, OppCurve>* span = first;
+    SkASSERT(span);
+    SkTSpan<TCurve, OppCurve>* final = last->fNext;
+    SkTSpan<TCurve, OppCurve>* next = span->fNext;
+    while ((span = next) && span != final) {
+        next = span->fNext;
+        this->markSpanGone(span);
+    }
+    if (final) {
+        final->fPrev = first;
+    }
+    first->fNext = final;
+}
+
+template<typename TCurve, typename OppCurve>
+void SkTSect<TCurve, OppCurve>::removeSpans(SkTSpan<TCurve, OppCurve>* span,
+        SkTSect<OppCurve, TCurve>* opp) {
+    SkTSpanBounded<OppCurve, TCurve>* bounded = span->fBounded;
+    while (bounded) {
+        SkTSpan<OppCurve, TCurve>* spanBounded = bounded->fBounded;
+        SkTSpanBounded<OppCurve, TCurve>* next = bounded->fNext;
+        if (span->removeBounded(spanBounded)) {  // shuffles last into position 0
+            this->removeSpan(span);
+        }
+        if (spanBounded->removeBounded(span)) {
+            opp->removeSpan(spanBounded);
+        }
+        SkASSERT(!span->fDeleted || !opp->debugHasBounded(span));
+        bounded = next;
+    }
+}
+
+template<typename TCurve, typename OppCurve>
+SkTSpan<TCurve, OppCurve>* SkTSect<TCurve, OppCurve>::spanAtT(double t,
+        SkTSpan<TCurve, OppCurve>** priorSpan) {
+    SkTSpan<TCurve, OppCurve>* test = fHead;
+    SkTSpan<TCurve, OppCurve>* prev = nullptr;
+    while (test && test->fEndT < t) {
+        prev = test;
+        test = test->fNext;
+    }
+    *priorSpan = prev;
+    return test && test->fStartT <= t ? test : nullptr;
+}
+
+template<typename TCurve, typename OppCurve>
+SkTSpan<TCurve, OppCurve>* SkTSect<TCurve, OppCurve>::tail() {
+    SkTSpan<TCurve, OppCurve>* result = fHead;
+    SkTSpan<TCurve, OppCurve>* next = fHead;
+    while ((next = next->fNext)) {
+        if (next->fEndT > result->fEndT) {
+            result = next;
+        }
+    }
+    return result;
+}
+
+/* Each span has a range of opposite spans it intersects. After the span is split in two,
+    adjust the range to its new size */
+template<typename TCurve, typename OppCurve>
+void SkTSect<TCurve, OppCurve>::trim(SkTSpan<TCurve, OppCurve>* span,
+        SkTSect<OppCurve, TCurve>* opp) {
+    span->initBounds(fCurve);
+    const SkTSpanBounded<OppCurve, TCurve>* testBounded = span->fBounded;
+    while (testBounded) {
+        SkTSpan<OppCurve, TCurve>* test = testBounded->fBounded;
+        const SkTSpanBounded<OppCurve, TCurve>* next = testBounded->fNext;
+        int oppSects, sects = this->intersects(span, opp, test, &oppSects);
+        if (sects >= 1) {
+            if (oppSects == 2) {
+                test->initBounds(opp->fCurve);
+                opp->removeAllBut(span, test, this);
+            }
+            if (sects == 2) {
+                span->initBounds(fCurve);
+                this->removeAllBut(test, span, opp);
+                return;
+            }
+        } else {
+            if (span->removeBounded(test)) {
+                this->removeSpan(span);
+            }
+            if (test->removeBounded(span)) {
+                opp->removeSpan(test);
+            }
+        }
+        testBounded = next;
+    }
+}
+
+template<typename TCurve, typename OppCurve>
+void SkTSect<TCurve, OppCurve>::unlinkSpan(SkTSpan<TCurve, OppCurve>* span) {
+    SkTSpan<TCurve, OppCurve>* prev = span->fPrev;
+    SkTSpan<TCurve, OppCurve>* next = span->fNext;
+    if (prev) {
+        prev->fNext = next;
+        if (next) {
+            next->fPrev = prev;
+        }
+    } else {
+        fHead = next;
+        if (next) {
+            next->fPrev = nullptr;
+        }
+    }
+}
+
+template<typename TCurve, typename OppCurve>
+bool SkTSect<TCurve, OppCurve>::updateBounded(SkTSpan<TCurve, OppCurve>* first,
+        SkTSpan<TCurve, OppCurve>* last, SkTSpan<OppCurve, TCurve>* oppFirst) {
+    SkTSpan<TCurve, OppCurve>* test = first;
+    const SkTSpan<TCurve, OppCurve>* final = last->next();
+    bool deleteSpan = false;
+    do {
+        deleteSpan |= test->removeAllBounded();
+    } while ((test = test->fNext) != final);
+    first->fBounded = nullptr;
+    first->addBounded(oppFirst, &fHeap);
+    // cannot call validate until remove span range is called
+    return deleteSpan;
+}
+
+
+template<typename TCurve, typename OppCurve>
+void SkTSect<TCurve, OppCurve>::validate() const {
+#if DEBUG_T_SECT
+    int count = 0;
+    if (fHead) {
+        const SkTSpan<TCurve, OppCurve>* span = fHead;
+        SkASSERT(!span->fPrev);
+        SkDEBUGCODE(double last = 0);
+        do {
+            span->validate();
+            SkASSERT(span->fStartT >= last);
+            SkDEBUGCODE(last = span->fEndT);
+            ++count;
+        } while ((span = span->fNext) != nullptr);
+    }
+    SkASSERT(count == fActiveCount);
+    SkASSERT(fActiveCount <= fDebugAllocatedCount);
+    int deletedCount = 0;
+    const SkTSpan<TCurve, OppCurve>* deleted = fDeleted;
+    while (deleted) {
+        ++deletedCount;
+        deleted = deleted->fNext;
+    }
+    const SkTSpan<TCurve, OppCurve>* coincident = fCoincident;
+    while (coincident) {
+        ++deletedCount;
+        coincident = coincident->fNext;
+    }
+    SkASSERT(fActiveCount + deletedCount == fDebugAllocatedCount);
+#endif
+}
+
+template<typename TCurve, typename OppCurve>
+void SkTSect<TCurve, OppCurve>::validateBounded() const {
+#if DEBUG_T_SECT
+    if (!fHead) {
+        return;
+    }
+    const SkTSpan<TCurve, OppCurve>* span = fHead;
+    do {
+        span->validateBounded();
+    } while ((span = span->fNext) != nullptr);
+#endif
+}
+
+template<typename TCurve, typename OppCurve>
+int SkTSect<TCurve, OppCurve>::EndsEqual(const SkTSect<TCurve, OppCurve>* sect1,
+        const SkTSect<OppCurve, TCurve>* sect2, SkIntersections* intersections) {
+    int zeroOneSet = 0;
+    if (sect1->fCurve[0] == sect2->fCurve[0]) {
+        zeroOneSet |= kZeroS1Set | kZeroS2Set;
+        intersections->insert(0, 0, sect1->fCurve[0]);
+    }
+    if (sect1->fCurve[0] == sect2->fCurve[OppCurve::kPointLast]) {
+        zeroOneSet |= kZeroS1Set | kOneS2Set;
+        intersections->insert(0, 1, sect1->fCurve[0]);
+    }
+    if (sect1->fCurve[TCurve::kPointLast] == sect2->fCurve[0]) {
+        zeroOneSet |= kOneS1Set | kZeroS2Set;
+        intersections->insert(1, 0, sect1->fCurve[TCurve::kPointLast]);
+    }
+    if (sect1->fCurve[TCurve::kPointLast] == sect2->fCurve[OppCurve::kPointLast]) {
+        zeroOneSet |= kOneS1Set | kOneS2Set;
+            intersections->insert(1, 1, sect1->fCurve[TCurve::kPointLast]);
+    }
+    // check for zero
+    if (!(zeroOneSet & (kZeroS1Set | kZeroS2Set))
+            && sect1->fCurve[0].approximatelyEqual(sect2->fCurve[0])) {
+        zeroOneSet |= kZeroS1Set | kZeroS2Set;
+        intersections->insertNear(0, 0, sect1->fCurve[0], sect2->fCurve[0]);
+    }
+    if (!(zeroOneSet & (kZeroS1Set | kOneS2Set))
+            && sect1->fCurve[0].approximatelyEqual(sect2->fCurve[OppCurve::kPointLast])) {
+        zeroOneSet |= kZeroS1Set | kOneS2Set;
+        intersections->insertNear(0, 1, sect1->fCurve[0], sect2->fCurve[OppCurve::kPointLast]);
+    }
+    // check for one
+    if (!(zeroOneSet & (kOneS1Set | kZeroS2Set))
+            && sect1->fCurve[TCurve::kPointLast].approximatelyEqual(sect2->fCurve[0])) {
+        zeroOneSet |= kOneS1Set | kZeroS2Set;
+        intersections->insertNear(1, 0, sect1->fCurve[TCurve::kPointLast], sect2->fCurve[0]);
+    }
+    if (!(zeroOneSet & (kOneS1Set | kOneS2Set))
+            && sect1->fCurve[TCurve::kPointLast].approximatelyEqual(sect2->fCurve[
+            OppCurve::kPointLast])) {
+        zeroOneSet |= kOneS1Set | kOneS2Set;
+        intersections->insertNear(1, 1, sect1->fCurve[TCurve::kPointLast],
+                sect2->fCurve[OppCurve::kPointLast]);
+    }
+    return zeroOneSet;
+}
+
+template<typename TCurve, typename OppCurve>
+struct SkClosestRecord {
+    bool operator<(const SkClosestRecord& rh) const {
+        return fClosest < rh.fClosest;
+    }
+
+    void addIntersection(SkIntersections* intersections) const {
+        double r1t = fC1Index ? fC1Span->endT() : fC1Span->startT();
+        double r2t = fC2Index ? fC2Span->endT() : fC2Span->startT();
+        intersections->insert(r1t, r2t, fC1Span->part()[fC1Index]);
+    }
+
+    void findEnd(const SkTSpan<TCurve, OppCurve>* span1, const SkTSpan<OppCurve, TCurve>* span2,
+            int c1Index, int c2Index) {
+        const TCurve& c1 = span1->part();
+        const OppCurve& c2 = span2->part();
+        if (!c1[c1Index].approximatelyEqual(c2[c2Index])) {
+            return;
+        }
+        double dist = c1[c1Index].distanceSquared(c2[c2Index]);
+        if (fClosest < dist) {
+            return;
+        }
+        fC1Span = span1;
+        fC2Span = span2;
+        fC1StartT = span1->startT();
+        fC1EndT = span1->endT();
+        fC2StartT = span2->startT();
+        fC2EndT = span2->endT();
+        fC1Index = c1Index;
+        fC2Index = c2Index;
+        fClosest = dist;
+    }
+
+    bool matesWith(const SkClosestRecord& mate) const {
+        SkASSERT(fC1Span == mate.fC1Span || fC1Span->endT() <= mate.fC1Span->startT()
+                || mate.fC1Span->endT() <= fC1Span->startT());
+        SkASSERT(fC2Span == mate.fC2Span || fC2Span->endT() <= mate.fC2Span->startT()
+                || mate.fC2Span->endT() <= fC2Span->startT());
+        return fC1Span == mate.fC1Span || fC1Span->endT() == mate.fC1Span->startT()
+                || fC1Span->startT() == mate.fC1Span->endT()
+                || fC2Span == mate.fC2Span
+                || fC2Span->endT() == mate.fC2Span->startT()
+                || fC2Span->startT() == mate.fC2Span->endT();
+    }
+
+    void merge(const SkClosestRecord& mate) {
+        fC1Span = mate.fC1Span;
+        fC2Span = mate.fC2Span;
+        fClosest = mate.fClosest;
+        fC1Index = mate.fC1Index;
+        fC2Index = mate.fC2Index;
+    }
+    
+    void reset() {
+        fClosest = FLT_MAX;
+        SkDEBUGCODE(fC1Span = nullptr);
+        SkDEBUGCODE(fC2Span = nullptr);
+        SkDEBUGCODE(fC1Index = fC2Index = -1);
+    }
+
+    void update(const SkClosestRecord& mate) {
+        fC1StartT = SkTMin(fC1StartT, mate.fC1StartT);
+        fC1EndT = SkTMax(fC1EndT, mate.fC1EndT);
+        fC2StartT = SkTMin(fC2StartT, mate.fC2StartT);
+        fC2EndT = SkTMax(fC2EndT, mate.fC2EndT);
+    }
+
+    const SkTSpan<TCurve, OppCurve>* fC1Span;
+    const SkTSpan<OppCurve, TCurve>* fC2Span;
+    double fC1StartT;
+    double fC1EndT;
+    double fC2StartT;
+    double fC2EndT;
+    double fClosest;
+    int fC1Index;
+    int fC2Index;
+};
+
+template<typename TCurve, typename OppCurve>
+struct SkClosestSect {
+    SkClosestSect()
+        : fUsed(0) {
+        fClosest.push_back().reset();
+    }
+
+    bool find(const SkTSpan<TCurve, OppCurve>* span1, const SkTSpan<OppCurve, TCurve>* span2) {
+        SkClosestRecord<TCurve, OppCurve>* record = &fClosest[fUsed];
+        record->findEnd(span1, span2, 0, 0);
+        record->findEnd(span1, span2, 0, OppCurve::kPointLast);
+        record->findEnd(span1, span2, TCurve::kPointLast, 0);
+        record->findEnd(span1, span2, TCurve::kPointLast, OppCurve::kPointLast);
+        if (record->fClosest == FLT_MAX) {
+            return false;
+        }
+        for (int index = 0; index < fUsed; ++index) {
+            SkClosestRecord<TCurve, OppCurve>* test = &fClosest[index];
+            if (test->matesWith(*record)) {
+                if (test->fClosest > record->fClosest) {
+                    test->merge(*record);
+                }
+                test->update(*record);
+                record->reset();
+                return false;
+            }
+        }
+        ++fUsed;
+        fClosest.push_back().reset();
+        return true;
+    }
+
+    void finish(SkIntersections* intersections) const {
+        SkSTArray<TCurve::kMaxIntersections * 3,
+                const SkClosestRecord<TCurve, OppCurve>*, true> closestPtrs;
+        for (int index = 0; index < fUsed; ++index) {
+            closestPtrs.push_back(&fClosest[index]);
+        }
+        SkTQSort<const SkClosestRecord<TCurve, OppCurve> >(closestPtrs.begin(), closestPtrs.end()
+                - 1);
+        for (int index = 0; index < fUsed; ++index) {
+            const SkClosestRecord<TCurve, OppCurve>* test = closestPtrs[index];
+            test->addIntersection(intersections);
+        }
+    }
+
+    // this is oversized so that an extra records can merge into final one
+    SkSTArray<TCurve::kMaxIntersections * 2, SkClosestRecord<TCurve, OppCurve>, true> fClosest;
+    int fUsed;
+};
+
+// returns true if the rect is too small to consider
+template<typename TCurve, typename OppCurve>
+void SkTSect<TCurve, OppCurve>::BinarySearch(SkTSect<TCurve, OppCurve>* sect1,
+        SkTSect<OppCurve, TCurve>* sect2, SkIntersections* intersections) {
+#if DEBUG_T_SECT_DUMP > 1
+    gDumpTSectNum = 0;
+#endif
+    SkDEBUGCODE(sect1->fOppSect = sect2);
+    SkDEBUGCODE(sect2->fOppSect = sect1);
+    intersections->reset();
+    intersections->setMax(TCurve::kMaxIntersections + 3);  // give extra for slop
+    SkTSpan<TCurve, OppCurve>* span1 = sect1->fHead;
+    SkTSpan<OppCurve, TCurve>* span2 = sect2->fHead;
+    int oppSect, sect = sect1->intersects(span1, sect2, span2, &oppSect);
+//    SkASSERT(between(0, sect, 2));
+    if (!sect) {
+        return;
+    }
+    if (sect == 2 && oppSect == 2) {
+        (void) EndsEqual(sect1, sect2, intersections);
+        return;
+    }
+    span1->addBounded(span2, &sect1->fHeap);
+    span2->addBounded(span1, &sect2->fHeap);
+    const int kMaxCoinLoopCount = 8;
+    int coinLoopCount = kMaxCoinLoopCount;
+    double start1s SK_INIT_TO_AVOID_WARNING;
+    double start1e SK_INIT_TO_AVOID_WARNING;
+    do {
+        // find the largest bounds
+        SkTSpan<TCurve, OppCurve>* largest1 = sect1->boundsMax();
+        if (!largest1) {
+            break;
+        }
+        SkTSpan<OppCurve, TCurve>* largest2 = sect2->boundsMax();
+        // split it
+        if (!largest2 || (largest1 && (largest1->fBoundsMax > largest2->fBoundsMax
+                || (!largest1->fCollapsed && largest2->fCollapsed)))) {
+            if (largest1->fCollapsed) {
+                break;
+            }
+            // trim parts that don't intersect the opposite
+            SkTSpan<TCurve, OppCurve>* half1 = sect1->addOne();
+            if (!half1->split(largest1, &sect1->fHeap)) {
+                break;
+            }
+            sect1->trim(largest1, sect2);
+            sect1->trim(half1, sect2);
+        } else {
+            if (largest2->fCollapsed) {
+                break;
+            }
+            // trim parts that don't intersect the opposite
+            SkTSpan<OppCurve, TCurve>* half2 = sect2->addOne();
+            if (!half2->split(largest2, &sect2->fHeap)) {
+                break;
+            }
+            sect2->trim(largest2, sect1);
+            sect2->trim(half2, sect1);
+        }
+        sect1->validate();
+        sect2->validate();
+#if DEBUG_T_SECT_LOOP_COUNT
+        intersections->debugBumpLoopCount(SkIntersections::kIterations_DebugLoop);
+#endif
+        // if there are 9 or more continuous spans on both sects, suspect coincidence
+        if (sect1->fActiveCount >= COINCIDENT_SPAN_COUNT
+                && sect2->fActiveCount >= COINCIDENT_SPAN_COUNT) {
+            if (coinLoopCount == kMaxCoinLoopCount) {
+                start1s = sect1->fHead->fStartT;
+                start1e = sect1->tail()->fEndT;
+            }
+            sect1->coincidentCheck(sect2);
+            sect1->validate();
+            sect2->validate();
+#if DEBUG_T_SECT_LOOP_COUNT
+            intersections->debugBumpLoopCount(SkIntersections::kCoinCheck_DebugLoop);
+#endif
+            if (!--coinLoopCount && sect1->fHead && sect2->fHead) {
+                /* All known working cases resolve in two tries. Sadly, cubicConicTests[0]
+                   gets stuck in a loop. It adds an extension to allow a coincident end
+                   perpendicular to track its intersection in the opposite curve. However,
+                   the bounding box of the extension does not intersect the original curve,
+                   so the extension is discarded, only to be added again the next time around. */ 
+                sect1->coincidentForce(sect2, start1s, start1e);
+                sect1->validate();
+                sect2->validate();
+            }
+        }
+        if (sect1->fActiveCount >= COINCIDENT_SPAN_COUNT
+                && sect2->fActiveCount >= COINCIDENT_SPAN_COUNT) {
+            sect1->computePerpendiculars(sect2, sect1->fHead, sect1->tail());
+            sect2->computePerpendiculars(sect1, sect2->fHead, sect2->tail());
+            sect1->removeByPerpendicular(sect2);
+            sect1->validate();
+            sect2->validate();
+#if DEBUG_T_SECT_LOOP_COUNT
+            intersections->debugBumpLoopCount(SkIntersections::kComputePerp_DebugLoop);
+#endif
+            if (sect1->collapsed() > TCurve::kMaxIntersections) {
+                break;
+            }
+        }
+#if DEBUG_T_SECT_DUMP
+        sect1->dumpBoth(sect2);
+#endif
+        if (!sect1->fHead || !sect2->fHead) {
+            break;
+        }
+    } while (true);
+    SkTSpan<TCurve, OppCurve>* coincident = sect1->fCoincident;
+    if (coincident) {
+        // if there is more than one coincident span, check loosely to see if they should be joined
+        if (coincident->fNext) {
+            sect1->mergeCoincidence(sect2);
+            coincident = sect1->fCoincident;
+        }
+        SkASSERT(sect2->fCoincident);  // courtesy check : coincidence only looks at sect 1
+        do {
+            if (!coincident->fCoinStart.isCoincident()) {
+                continue;
+            }
+            if (!coincident->fCoinEnd.isCoincident()) {
+                continue;
+            }
+            int index = intersections->insertCoincident(coincident->fStartT,
+                    coincident->fCoinStart.perpT(), coincident->fPart[0]);
+            if ((intersections->insertCoincident(coincident->fEndT,
+                    coincident->fCoinEnd.perpT(),
+                    coincident->fPart[TCurve::kPointLast]) < 0) && index >= 0) {
+                intersections->clearCoincidence(index);
+            }
+        } while ((coincident = coincident->fNext));
+    }
+    int zeroOneSet = EndsEqual(sect1, sect2, intersections);
+    if (!sect1->fHead || !sect2->fHead) {
+        return;
+    }
+    sect1->recoverCollapsed();
+    sect2->recoverCollapsed();
+    SkTSpan<TCurve, OppCurve>* result1 = sect1->fHead;
+    // check heads and tails for zero and ones and insert them if we haven't already done so
+    const SkTSpan<TCurve, OppCurve>* head1 = result1;
+    if (!(zeroOneSet & kZeroS1Set) && approximately_less_than_zero(head1->fStartT)) {
+        const SkDPoint& start1 = sect1->fCurve[0];
+        if (head1->isBounded()) {
+            double t = head1->closestBoundedT(start1);
+            if (sect2->fCurve.ptAtT(t).approximatelyEqual(start1)) {
+                intersections->insert(0, t, start1);
+            }
+        }
+    }
+    const SkTSpan<OppCurve, TCurve>* head2 = sect2->fHead;
+    if (!(zeroOneSet & kZeroS2Set) && approximately_less_than_zero(head2->fStartT)) {
+        const SkDPoint& start2 = sect2->fCurve[0];
+        if (head2->isBounded()) {
+            double t = head2->closestBoundedT(start2);
+            if (sect1->fCurve.ptAtT(t).approximatelyEqual(start2)) {
+                intersections->insert(t, 0, start2);
+            }
+        }
+    }
+    const SkTSpan<TCurve, OppCurve>* tail1 = sect1->tail();
+    if (!(zeroOneSet & kOneS1Set) && approximately_greater_than_one(tail1->fEndT)) {
+        const SkDPoint& end1 = sect1->fCurve[TCurve::kPointLast];
+        if (tail1->isBounded()) {
+            double t = tail1->closestBoundedT(end1);
+            if (sect2->fCurve.ptAtT(t).approximatelyEqual(end1)) {
+                intersections->insert(1, t, end1);
+            }
+        }
+    }
+    const SkTSpan<OppCurve, TCurve>* tail2 = sect2->tail();
+    if (!(zeroOneSet & kOneS2Set) && approximately_greater_than_one(tail2->fEndT)) {
+        const SkDPoint& end2 = sect2->fCurve[OppCurve::kPointLast];
+        if (tail2->isBounded()) {
+            double t = tail2->closestBoundedT(end2);
+            if (sect1->fCurve.ptAtT(t).approximatelyEqual(end2)) {
+                intersections->insert(t, 1, end2);
+            }
+        }
+    }
+    SkClosestSect<TCurve, OppCurve> closest;
+    do {
+        while (result1 && result1->fCoinStart.isCoincident() && result1->fCoinEnd.isCoincident()) {
+            result1 = result1->fNext;
+        }
+        if (!result1) {
+            break;
+        }
+        SkTSpan<OppCurve, TCurve>* result2 = sect2->fHead;
+        bool found = false;
+        while (result2) {
+            found |= closest.find(result1, result2);
+            result2 = result2->fNext;
+        }
+    } while ((result1 = result1->fNext));
+    closest.finish(intersections);
+    // if there is more than one intersection and it isn't already coincident, check
+    int last = intersections->used() - 1;
+    for (int index = 0; index < last; ) {
+        if (intersections->isCoincident(index) && intersections->isCoincident(index + 1)) {
+            ++index;
+            continue;
+        }
+        double midT = ((*intersections)[0][index] + (*intersections)[0][index + 1]) / 2;
+        SkDPoint midPt = sect1->fCurve.ptAtT(midT);
+        // intersect perpendicular with opposite curve
+        SkTCoincident<TCurve, OppCurve> perp;
+        perp.setPerp(sect1->fCurve, midT, midPt, sect2->fCurve);
+        if (!perp.isCoincident()) {
+            ++index;
+            continue;
+        }
+        if (intersections->isCoincident(index)) {
+            intersections->removeOne(index);
+            --last;
+        } else if (intersections->isCoincident(index + 1)) {
+            intersections->removeOne(index + 1);
+            --last;
+        } else {
+            intersections->setCoincident(index++);
+        }
+        intersections->setCoincident(index);
+    }
+    SkASSERT(intersections->used() <= TCurve::kMaxIntersections);
+}
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsTightBounds.cpp b/gfx/skia/skia/src/pathops/SkPathOpsTightBounds.cpp
index 0f63f396e7ed..ac5d6aae0b3e 100644
--- a/gfx/skia/skia/src/pathops/SkPathOpsTightBounds.cpp
+++ b/gfx/skia/skia/src/pathops/SkPathOpsTightBounds.cpp
@@ -8,24 +8,22 @@
 #include "SkPathOpsCommon.h"
 
 bool TightBounds(const SkPath& path, SkRect* result) {
+    SkChunkAlloc allocator(4096);  // FIXME: constant-ize, tune
+    SkOpContour contour;
+    SkOpContourHead* contourList = static_cast<SkOpContourHead*>(&contour);
+    SkOpGlobalState globalState(nullptr, contourList  SkDEBUGPARAMS(nullptr));
     // turn path into list of segments
-    SkTArray<SkOpContour> contours;
-    SkOpEdgeBuilder builder(path, contours);
-    if (!builder.finish()) {
+    SkOpEdgeBuilder builder(path, &contour, &allocator, &globalState);
+    if (!builder.finish(&allocator)) {
         return false;
     }
-    SkTArray<SkOpContour*, true> contourList;
-    MakeContourList(contours, contourList, false, false);
-    SkOpContour** currentPtr = contourList.begin();
-    result->setEmpty();
-    if (!currentPtr) {
+    if (!SortContourList(&contourList, false, false)) {
+        result->setEmpty();
         return true;
     }
-    SkOpContour** listEnd = contourList.end();
-    SkOpContour* current = *currentPtr++;
+    SkOpContour* current = contourList;
     SkPathOpsBounds bounds = current->bounds();
-    while (currentPtr != listEnd) {
-        current = *currentPtr++;
+    while ((current = current->next())) {
         bounds.add(current->bounds());
     }
     *result = bounds;
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsTriangle.cpp b/gfx/skia/skia/src/pathops/SkPathOpsTriangle.cpp
deleted file mode 100644
index 77845e067309..000000000000
--- a/gfx/skia/skia/src/pathops/SkPathOpsTriangle.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkPathOpsTriangle.h"
-
-// http://www.blackpawn.com/texts/pointinpoly/default.html
-// return true if pt is inside triangle; false if outside or on the line
-bool SkDTriangle::contains(const SkDPoint& pt) const {
-// Compute vectors
-    SkDVector v0 = fPts[2] - fPts[0];
-    SkDVector v1 = fPts[1] - fPts[0];
-    SkDVector v2 = pt - fPts[0];
-
-// Compute dot products
-    double dot00 = v0.dot(v0);
-    double dot01 = v0.dot(v1);
-    double dot02 = v0.dot(v2);
-    double dot11 = v1.dot(v1);
-    double dot12 = v1.dot(v2);
-
-// original code doesn't handle degenerate input; isn't symmetric with inclusion of corner pts;
-// introduces error with divide; doesn't short circuit on early answer
-#if 0
-// Compute barycentric coordinates
-    double invDenom = 1 / (dot00 * dot11 - dot01 * dot01);
-    double u = (dot11 * dot02 - dot01 * dot12) * invDenom;
-    double v = (dot00 * dot12 - dot01 * dot02) * invDenom;
-
-// Check if point is in triangle
-    return (u >= 0) && (v >= 0) && (u + v <= 1);
-#else
-    double w = dot00 * dot11 - dot01 * dot01;
-    if (w == 0) {
-        return false;
-    }
-    double wSign = w < 0 ? -1 : 1;
-    double u = (dot11 * dot02 - dot01 * dot12) * wSign;
-    if (u <= 0) {
-        return false;
-    }
-    double v = (dot00 * dot12 - dot01 * dot02) * wSign;
-    if (v <= 0) {
-        return false;
-    }
-    return u + v < w * wSign;
-#endif
-}
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsTriangle.h b/gfx/skia/skia/src/pathops/SkPathOpsTriangle.h
deleted file mode 100644
index 8cc8c6d3b5e4..000000000000
--- a/gfx/skia/skia/src/pathops/SkPathOpsTriangle.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkPathOpsTriangle_DEFINED
-#define SkPathOpsTriangle_DEFINED
-
-#include "SkPathOpsPoint.h"
-
-struct SkDTriangle {
-    SkDPoint fPts[3];
-
-    bool contains(const SkDPoint& pt) const;
-
-};
-
-#endif
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsTypes.cpp b/gfx/skia/skia/src/pathops/SkPathOpsTypes.cpp
index 2c8d778c6957..ca84405aa780 100644
--- a/gfx/skia/skia/src/pathops/SkPathOpsTypes.cpp
+++ b/gfx/skia/skia/src/pathops/SkPathOpsTypes.cpp
@@ -5,6 +5,7 @@
  * found in the LICENSE file.
  */
 #include "SkFloatBits.h"
+#include "SkOpCoincidence.h"
 #include "SkPathOpsTypes.h"
 
 static bool arguments_denormalized(float a, float b, int epsilon) {
@@ -159,7 +160,7 @@ int UlpsDistance(float a, float b) {
         return a == b ? 0 : SK_MaxS32;
     }
     // Find the difference in ULPs.
-    return abs(floatIntA.fSignBitInt - floatIntB.fSignBitInt);
+    return SkTAbs(floatIntA.fSignBitInt - floatIntB.fSignBitInt);
 }
 
 // cube root approximation using bit hack for 64-bit float
@@ -198,3 +199,27 @@ double SkDCubeRoot(double x) {
     }
     return result;
 }
+
+SkOpGlobalState::SkOpGlobalState(SkOpCoincidence* coincidence, SkOpContourHead* head
+                                 SkDEBUGPARAMS(const char* testName))
+    : fCoincidence(coincidence)
+    , fContourHead(head)
+    , fNested(0)
+    , fWindingFailed(false)
+    , fAngleCoincidence(false)
+    , fPhase(kIntersecting)
+    SkDEBUGPARAMS(fDebugTestName(testName))
+    SkDEBUGPARAMS(fAngleID(0))
+    SkDEBUGPARAMS(fCoinID(0))
+    SkDEBUGPARAMS(fContourID(0))
+    SkDEBUGPARAMS(fPtTID(0))
+    SkDEBUGPARAMS(fSegmentID(0))
+    SkDEBUGPARAMS(fSpanID(0)) {
+    if (coincidence) {
+        coincidence->debugSetGlobalState(this);
+    }
+#if DEBUG_T_SECT_LOOP_COUNT
+    debugResetLoopCounts();
+#endif
+}
+
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsTypes.h b/gfx/skia/skia/src/pathops/SkPathOpsTypes.h
index 96627842b370..f85c6653eb05 100644
--- a/gfx/skia/skia/src/pathops/SkPathOpsTypes.h
+++ b/gfx/skia/skia/src/pathops/SkPathOpsTypes.h
@@ -22,6 +22,145 @@ enum SkPathOpsMask {
     kEvenOdd_PathOpsMask = 1
 };
 
+class SkOpCoincidence;
+class SkOpContour;
+class SkOpContourHead;
+class SkIntersections;
+class SkIntersectionHelper;
+
+class SkOpGlobalState {
+public:
+    SkOpGlobalState(SkOpCoincidence* coincidence, SkOpContourHead* head
+                    SkDEBUGPARAMS(const char* testName));
+
+    enum Phase {
+        kIntersecting,
+        kWalking,
+        kFixWinding,
+    };
+
+    enum {
+        kMaxWindingTries = 10
+    };
+
+    bool angleCoincidence() const {
+        return fAngleCoincidence;
+    }
+
+    void bumpNested() {
+        ++fNested;
+    }
+
+    void clearNested() {
+        fNested = 0;
+    }
+
+    SkOpCoincidence* coincidence() {
+        return fCoincidence;
+    }
+
+    SkOpContourHead* contourHead() {
+        return fContourHead;
+    }
+
+#ifdef SK_DEBUG
+    const struct SkOpAngle* debugAngle(int id) const;
+    SkOpContour* debugContour(int id);
+    const class SkOpPtT* debugPtT(int id) const;
+    bool debugRunFail() const;
+    const class SkOpSegment* debugSegment(int id) const;
+    const class SkOpSpanBase* debugSpan(int id) const;
+    const char* debugTestName() const { return fDebugTestName; }
+#endif
+
+#if DEBUG_T_SECT_LOOP_COUNT
+    void debugAddLoopCount(SkIntersections* , const SkIntersectionHelper& ,
+        const SkIntersectionHelper& );
+    void debugDoYourWorst(SkOpGlobalState* );
+    void debugLoopReport();
+    void debugResetLoopCounts();
+#endif
+
+    int nested() const {
+        return fNested;
+    }
+
+#ifdef SK_DEBUG
+    int nextAngleID() {
+        return ++fAngleID;
+    }
+
+    int nextCoinID() {
+        return ++fCoinID;
+    }
+
+    int nextContourID() {
+        return ++fContourID;
+    }
+
+    int nextPtTID() {
+        return ++fPtTID;
+    }
+
+    int nextSegmentID() {
+        return ++fSegmentID;
+    }
+
+    int nextSpanID() {
+        return ++fSpanID;
+    }
+#endif
+
+    Phase phase() const {
+        return fPhase;
+    }
+
+    void setAngleCoincidence() {
+        fAngleCoincidence = true;
+    }
+    
+    void setContourHead(SkOpContourHead* contourHead) {
+        fContourHead = contourHead;
+    }
+
+    void setPhase(Phase phase) {
+        SkASSERT(fPhase != phase);
+        fPhase = phase;
+    }
+
+    // called in very rare cases where angles are sorted incorrectly -- signfies op will fail
+    void setWindingFailed() {
+        fWindingFailed = true;
+    }
+
+    bool windingFailed() const {
+        return fWindingFailed;
+    }
+
+private:
+    SkOpCoincidence* fCoincidence;
+    SkOpContourHead* fContourHead;
+    int fNested;
+    bool fWindingFailed;
+    bool fAngleCoincidence;
+    Phase fPhase;
+#ifdef SK_DEBUG
+    const char* fDebugTestName;
+    int fAngleID;
+    int fCoinID;
+    int fContourID;
+    int fPtTID;
+    int fSegmentID;
+    int fSpanID;
+#endif
+#if DEBUG_T_SECT_LOOP_COUNT
+    int fDebugLoopCount[3];
+    SkPath::Verb fDebugWorstVerb[6];
+    SkPoint fDebugWorstPts[24];
+    float fDebugWorstWeight[6];
+#endif
+};
+
 // Use Almost Equal when comparing coordinates. Use epsilon to compare T values.
 bool AlmostEqualUlps(float a, float b);
 inline bool AlmostEqualUlps(double a, double b) {
@@ -92,6 +231,7 @@ const double DBL_EPSILON_SUBDIVIDE_ERR = DBL_EPSILON * 16;
 const double ROUGH_EPSILON = FLT_EPSILON * 64;
 const double MORE_ROUGH_EPSILON = FLT_EPSILON * 256;
 const double WAY_ROUGH_EPSILON = FLT_EPSILON * 2048;
+const double BUMP_EPSILON = FLT_EPSILON * 4096;
 
 inline bool zero_or_one(double x) {
     return x == 0 || x == 1;
@@ -150,6 +290,10 @@ inline bool approximately_zero_when_compared_to(double x, double y) {
     return x == 0 || fabs(x) < fabs(y * FLT_EPSILON);
 }
 
+inline bool precisely_zero_when_compared_to(double x, double y) {
+    return x == 0 || fabs(x) < fabs(y * DBL_EPSILON);
+}
+
 // Use this for comparing Ts in the range of 0 to 1. For general numbers (larger and smaller) use
 // AlmostEqualUlps instead.
 inline bool approximately_equal(double x, double y) {
@@ -298,7 +442,8 @@ inline bool precisely_between(double a, double b, double c) {
 
 // returns true if (a <= b <= c) || (a >= b >= c)
 inline bool between(double a, double b, double c) {
-    SkASSERT(((a <= b && b <= c) || (a >= b && b >= c)) == ((a - b) * (c - b) <= 0));
+    SkASSERT(((a <= b && b <= c) || (a >= b && b >= c)) == ((a - b) * (c - b) <= 0)
+            || (precisely_zero(a) && precisely_zero(b) && precisely_zero(c)));
     return (a - b) * (c - b) <= 0;
 }
 
@@ -306,6 +451,15 @@ inline bool roughly_equal(double x, double y) {
     return fabs(x - y) < ROUGH_EPSILON;
 }
 
+inline bool roughly_negative(double x) {
+    return x < ROUGH_EPSILON;
+}
+
+inline bool roughly_between(double a, double b, double c) {
+    return a <= c ? roughly_negative(a - b) && roughly_negative(b - c)
+            : roughly_negative(b - a) && roughly_negative(c - b);
+}
+
 inline bool more_roughly_equal(double x, double y) {
     return fabs(x - y) < MORE_ROUGH_EPSILON;
 }
@@ -318,7 +472,7 @@ struct SkDPoint;
 struct SkDVector;
 struct SkDLine;
 struct SkDQuad;
-struct SkDTriangle;
+struct SkDConic;
 struct SkDCubic;
 struct SkDRect;
 
@@ -337,11 +491,12 @@ inline SkPath::Verb SkPathOpsPointsToVerb(int points) {
 }
 
 inline int SkPathOpsVerbToPoints(SkPath::Verb verb) {
-    int points = (int) verb - ((int) verb >> 2);
+    int points = (int) verb - (((int) verb + 1) >> 2);
 #ifdef SK_DEBUG
     switch (verb) {
         case SkPath::kLine_Verb: SkASSERT(1 == points); break;
         case SkPath::kQuad_Verb: SkASSERT(2 == points); break;
+        case SkPath::kConic_Verb: SkASSERT(2 == points); break;
         case SkPath::kCubic_Verb: SkASSERT(3 == points); break;
         default: SkDEBUGFAIL("should not get here");
     }
diff --git a/gfx/skia/skia/src/pathops/SkPathOpsWinding.cpp b/gfx/skia/skia/src/pathops/SkPathOpsWinding.cpp
new file mode 100644
index 000000000000..0abffb05862a
--- /dev/null
+++ b/gfx/skia/skia/src/pathops/SkPathOpsWinding.cpp
@@ -0,0 +1,407 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+// given a prospective edge, compute its initial winding by projecting a ray
+// if the ray hits another edge
+    // if the edge doesn't have a winding yet, hop up to that edge and start over
+        // concern : check for hops forming a loop
+    // if the edge is unsortable, or
+    // the intersection is nearly at the ends, or
+    // the tangent at the intersection is nearly coincident to the ray,
+        // choose a different ray and try again
+            // concern : if it is unable to succeed after N tries, try another edge? direction?
+// if no edge is hit, compute the winding directly
+
+// given the top span, project the most perpendicular ray and look for intersections
+    // let's try up and then down. What the hey
+
+// bestXY is initialized by caller with basePt
+
+#include "SkOpContour.h"
+#include "SkOpSegment.h"
+#include "SkPathOpsCurve.h"
+
+enum class SkOpRayDir {
+    kLeft,
+    kTop,
+    kRight,
+    kBottom,
+};
+
+#if DEBUG_WINDING
+const char* gDebugRayDirName[] = {
+    "kLeft",
+    "kTop",
+    "kRight",
+    "kBottom"
+};
+#endif
+
+static int xy_index(SkOpRayDir dir) {
+    return static_cast<int>(dir) & 1;
+}
+
+static SkScalar pt_xy(const SkPoint& pt, SkOpRayDir dir) {
+    return (&pt.fX)[xy_index(dir)];
+}
+
+static SkScalar pt_yx(const SkPoint& pt, SkOpRayDir dir) {
+    return (&pt.fX)[!xy_index(dir)];
+}
+
+static double pt_dxdy(const SkDVector& v, SkOpRayDir dir) {
+    return (&v.fX)[xy_index(dir)];
+}
+
+static double pt_dydx(const SkDVector& v, SkOpRayDir dir) {
+    return (&v.fX)[!xy_index(dir)];
+}
+
+static SkScalar rect_side(const SkRect& r, SkOpRayDir dir) {
+    return (&r.fLeft)[static_cast<int>(dir)];
+}
+
+static bool sideways_overlap(const SkRect& rect, const SkPoint& pt, SkOpRayDir dir) {
+    int i = !xy_index(dir);
+    return approximately_between((&rect.fLeft)[i], (&pt.fX)[i], (&rect.fRight)[i]);
+}
+
+static bool less_than(SkOpRayDir dir) {
+    return static_cast<bool>((static_cast<int>(dir) & 2) == 0);
+}
+
+static bool ccw_dxdy(const SkDVector& v, SkOpRayDir dir) {
+    bool vPartPos = pt_dydx(v, dir) > 0;
+    bool leftBottom = ((static_cast<int>(dir) + 1) & 2) != 0;
+    return vPartPos == leftBottom;
+}
+
+struct SkOpRayHit {
+    SkOpRayDir makeTestBase(SkOpSpan* span, double t) {
+        fNext = nullptr;
+        fSpan = span;
+        fT = span->t() * (1 - t) + span->next()->t() * t;
+        SkOpSegment* segment = span->segment();
+        fSlope = segment->dSlopeAtT(fT);
+        fPt = segment->ptAtT(fT);
+        fValid = true;
+        return fabs(fSlope.fX) < fabs(fSlope.fY) ? SkOpRayDir::kLeft : SkOpRayDir::kTop;
+    }
+
+    SkOpRayHit* fNext;
+    SkOpSpan* fSpan;
+    SkPoint fPt;
+    double fT;
+    SkDVector fSlope;
+    bool fValid;
+};
+
+void SkOpContour::rayCheck(const SkOpRayHit& base, SkOpRayDir dir, SkOpRayHit** hits,
+        SkChunkAlloc* allocator) {
+    // if the bounds extreme is outside the best, we're done
+    SkScalar baseXY = pt_xy(base.fPt, dir);
+    SkScalar boundsXY = rect_side(fBounds, dir);
+    bool checkLessThan = less_than(dir);
+    if (!approximately_equal(baseXY, boundsXY) && (baseXY < boundsXY) == checkLessThan) {
+        return;
+    }
+    SkOpSegment* testSegment = &fHead;
+    do {
+        testSegment->rayCheck(base, dir, hits, allocator);
+    } while ((testSegment = testSegment->next()));
+}
+
+void SkOpSegment::rayCheck(const SkOpRayHit& base, SkOpRayDir dir, SkOpRayHit** hits,
+        SkChunkAlloc* allocator) {
+    if (!sideways_overlap(fBounds, base.fPt, dir)) {
+        return;
+    }
+    SkScalar baseXY = pt_xy(base.fPt, dir);
+    SkScalar boundsXY = rect_side(fBounds, dir);
+    bool checkLessThan = less_than(dir);
+    if (!approximately_equal(baseXY, boundsXY) && (baseXY < boundsXY) == checkLessThan) {
+        return;
+    }
+    double tVals[3];
+    SkScalar baseYX = pt_yx(base.fPt, dir);
+    int roots = (*CurveIntercept[fVerb * 2 + xy_index(dir)])(fPts, fWeight, baseYX, tVals);
+    for (int index = 0; index < roots; ++index) {
+        double t = tVals[index];
+        if (base.fSpan->segment() == this && approximately_equal(base.fT, t)) {
+            continue;
+        }
+        SkDVector slope;
+        SkPoint pt;
+        SkDEBUGCODE(sk_bzero(&slope, sizeof(slope)));
+        bool valid = false;
+        if (approximately_zero(t)) {
+            pt = fPts[0];
+        } else if (approximately_equal(t, 1)) {
+            pt = fPts[SkPathOpsVerbToPoints(fVerb)];
+        } else {
+            SkASSERT(between(0, t, 1));
+            pt = this->ptAtT(t);
+            if (SkDPoint::ApproximatelyEqual(pt, base.fPt)) {
+                if (base.fSpan->segment() == this) {
+                    continue;
+                }
+            } else {
+                SkScalar ptXY = pt_xy(pt, dir);
+                if (!approximately_equal(baseXY, ptXY) && (baseXY < ptXY) == checkLessThan) {
+                    continue;
+                }
+                slope = this->dSlopeAtT(t);
+                if (fVerb == SkPath::kCubic_Verb && base.fSpan->segment() == this
+                        && roughly_equal(base.fT, t)
+                        && SkDPoint::RoughlyEqual(pt, base.fPt)) {
+    #if DEBUG_WINDING
+                    SkDebugf("%s (rarely expect this)\n", __FUNCTION__);
+    #endif
+                    continue;
+                }
+                if (fabs(pt_dydx(slope, dir) * 10000) > fabs(pt_dxdy(slope, dir))) {
+                    valid = true;
+                }
+            }
+        }
+        SkOpSpan* span = this->windingSpanAtT(t);
+        if (!span) {
+            valid = false;
+        } else if (!span->windValue() && !span->oppValue()) {
+            continue;
+        }
+        SkOpRayHit* newHit = SkOpTAllocator<SkOpRayHit>::Allocate(allocator);
+        newHit->fNext = *hits;
+        newHit->fPt = pt;
+        newHit->fSlope = slope;
+        newHit->fSpan = span;
+        newHit->fT = t;
+        newHit->fValid = valid;
+        *hits = newHit;
+    }
+}
+
+SkOpSpan* SkOpSegment::windingSpanAtT(double tHit) {
+    SkOpSpan* span = &fHead;
+    SkOpSpanBase* next;
+    do {
+        next = span->next();
+        if (approximately_equal(tHit, next->t())) {
+            return nullptr;
+        } 
+        if (tHit < next->t()) {
+            return span;
+        }
+    } while (!next->final() && (span = next->upCast()));
+    return nullptr;
+}
+
+static bool hit_compare_x(const SkOpRayHit* a, const SkOpRayHit* b) {
+    return a->fPt.fX < b->fPt.fX;
+}
+
+static bool reverse_hit_compare_x(const SkOpRayHit* a, const SkOpRayHit* b) {
+    return b->fPt.fX  < a->fPt.fX;
+}
+
+static bool hit_compare_y(const SkOpRayHit* a, const SkOpRayHit* b) {
+    return a->fPt.fY < b->fPt.fY;
+}
+
+static bool reverse_hit_compare_y(const SkOpRayHit* a, const SkOpRayHit* b) {
+    return b->fPt.fY  < a->fPt.fY;
+}
+
+static double get_t_guess(int tTry, int* dirOffset) {
+    double t = 0.5;
+    *dirOffset = tTry & 1;
+    int tBase = tTry >> 1;
+    int tBits = 0;
+    while (tTry >>= 1) {
+        t /= 2;
+        ++tBits;
+    }
+    if (tBits) {
+        int tIndex = (tBase - 1) & ((1 << tBits) - 1);
+        t += t * 2 * tIndex;
+    }
+    return t;
+}
+
+bool SkOpSpan::sortableTop(SkOpContour* contourHead) {
+    SkChunkAlloc allocator(1024);
+    int dirOffset;
+    double t = get_t_guess(fTopTTry++, &dirOffset);
+    SkOpRayHit hitBase;
+    SkOpRayDir dir = hitBase.makeTestBase(this, t);
+    if (hitBase.fSlope.fX == 0 && hitBase.fSlope.fY == 0) {
+        return false;
+    }
+    SkOpRayHit* hitHead = &hitBase;
+    dir = static_cast<SkOpRayDir>(static_cast<int>(dir) + dirOffset);
+    SkOpContour* contour = contourHead;
+    do {
+        contour->rayCheck(hitBase, dir, &hitHead, &allocator);
+    } while ((contour = contour->next()));
+    // sort hits
+    SkSTArray<1, SkOpRayHit*> sorted;
+    SkOpRayHit* hit = hitHead;
+    while (hit) {
+        sorted.push_back(hit);
+        hit = hit->fNext;
+    }
+    int count = sorted.count();
+    SkTQSort(sorted.begin(), sorted.end() - 1, xy_index(dir)
+            ? less_than(dir) ? hit_compare_y : reverse_hit_compare_y 
+            : less_than(dir) ? hit_compare_x : reverse_hit_compare_x);
+    // verify windings
+#if DEBUG_WINDING
+    SkDebugf("%s dir=%s seg=%d t=%1.9g pt=(%1.9g,%1.9g)\n", __FUNCTION__, 
+            gDebugRayDirName[static_cast<int>(dir)], hitBase.fSpan->segment()->debugID(),
+            hitBase.fT, hitBase.fPt.fX, hitBase.fPt.fY);
+    for (int index = 0; index < count; ++index) {
+        hit = sorted[index];
+        SkOpSpan* span = hit->fSpan;
+        SkOpSegment* hitSegment = span ? span->segment() : nullptr;
+        bool operand = span ? hitSegment->operand() : false;
+        bool ccw = ccw_dxdy(hit->fSlope, dir);
+        SkDebugf("%s [%d] valid=%d operand=%d span=%d ccw=%d ", __FUNCTION__, index,
+                hit->fValid, operand, span ? span->debugID() : -1, ccw);
+        if (span) {
+            hitSegment->dumpPtsInner();
+        }
+        SkDebugf(" t=%1.9g pt=(%1.9g,%1.9g) slope=(%1.9g,%1.9g)\n", hit->fT,
+                hit->fPt.fX, hit->fPt.fY, hit->fSlope.fX, hit->fSlope.fY);
+    }
+#endif
+    const SkPoint* last = nullptr;
+    int wind = 0;
+    int oppWind = 0;
+    for (int index = 0; index < count; ++index) {
+        hit = sorted[index];
+        if (!hit->fValid) {
+            return false;
+        }
+        bool ccw = ccw_dxdy(hit->fSlope, dir);
+//        SkASSERT(!approximately_zero(hit->fT) || !hit->fValid);
+        SkOpSpan* span = hit->fSpan;
+        SkOpSegment* hitSegment = span->segment();
+        if (!span) {
+            return false;
+        }
+        if (span->windValue() == 0 && span->oppValue() == 0) {
+            continue;
+        }
+        if (last && SkDPoint::ApproximatelyEqual(*last, hit->fPt)) {
+            return false;
+        }
+        if (index < count - 1) {
+            const SkPoint& next = sorted[index + 1]->fPt;
+            if (SkDPoint::ApproximatelyEqual(next, hit->fPt)) {
+                return false;
+            }
+        }
+        bool operand = hitSegment->operand();
+        if (operand) {
+            SkTSwap(wind, oppWind);
+        }
+        int lastWind = wind;
+        int lastOpp = oppWind;
+        int windValue = ccw ? -span->windValue() : span->windValue();
+        int oppValue = ccw ? -span->oppValue() : span->oppValue();
+        wind += windValue;
+        oppWind += oppValue;
+        bool sumSet = false;
+        int spanSum = span->windSum();
+        int windSum = SkOpSegment::UseInnerWinding(lastWind, wind) ? wind : lastWind;
+        if (spanSum == SK_MinS32) {
+            span->setWindSum(windSum);
+            sumSet = true;
+        } else {
+            // the need for this condition suggests that UseInnerWinding is flawed
+            // happened when last = 1 wind = -1
+#if 0
+            SkASSERT((hitSegment->isXor() ? (windSum & 1) == (spanSum & 1) : windSum == spanSum)
+                    || (abs(wind) == abs(lastWind)
+                    && (windSum ^ wind ^ lastWind) == spanSum));
+#endif
+        }
+        int oSpanSum = span->oppSum();
+        int oppSum = SkOpSegment::UseInnerWinding(lastOpp, oppWind) ? oppWind : lastOpp;
+        if (oSpanSum == SK_MinS32) {
+            span->setOppSum(oppSum);
+        } else {
+#if 0
+            SkASSERT(hitSegment->oppXor() ? (oppSum & 1) == (oSpanSum & 1) : oppSum == oSpanSum
+                    || (abs(oppWind) == abs(lastOpp)
+                    && (oppSum ^ oppWind ^ lastOpp) == oSpanSum));
+#endif
+        }
+        if (sumSet) {
+            if (this->globalState()->phase() == SkOpGlobalState::kFixWinding) {
+                hitSegment->contour()->setCcw(ccw);
+            } else {
+                (void) hitSegment->markAndChaseWinding(span, span->next(), windSum, oppSum, nullptr);
+                (void) hitSegment->markAndChaseWinding(span->next(), span, windSum, oppSum, nullptr);
+            }
+        }
+        if (operand) {
+            SkTSwap(wind, oppWind);
+        }
+        last = &hit->fPt;
+        this->globalState()->bumpNested();
+    }
+    return true;
+}
+
+SkOpSpan* SkOpSegment::findSortableTop(SkOpContour* contourHead) {
+    SkOpSpan* span = &fHead;
+    SkOpSpanBase* next;
+    do {
+        next = span->next();
+        if (span->done()) {
+            continue;
+        }
+        if (span->windSum() != SK_MinS32) {
+            return span;
+        }
+        if (span->sortableTop(contourHead)) {
+            return span;
+        }
+    } while (!next->final() && (span = next->upCast()));
+    return nullptr;
+}
+
+SkOpSpan* SkOpContour::findSortableTop(SkOpContour* contourHead) {
+    SkOpSegment* testSegment = &fHead;
+    do {
+        if (testSegment->done()) {
+            continue;
+        }
+        SkOpSpan* result = testSegment->findSortableTop(contourHead);
+        if (result) {
+            return result;
+        }
+    } while ((testSegment = testSegment->next()));
+    return nullptr;
+}
+
+SkOpSpan* FindSortableTop(SkOpContourHead* contourHead) {
+    for (int index = 0; index < SkOpGlobalState::kMaxWindingTries; ++index) {
+        SkOpContour* contour = contourHead;
+        do {
+            if (contour->done()) {
+                continue;
+            }
+            SkOpSpan* result = contour->findSortableTop(contourHead);
+            if (result) {
+                return result;
+            }
+        } while ((contour = contour->next()));
+    }
+    return nullptr;
+}
diff --git a/gfx/skia/skia/src/pathops/SkPathWriter.cpp b/gfx/skia/skia/src/pathops/SkPathWriter.cpp
index 46ec7b9131f6..bd8c72134c1c 100644
--- a/gfx/skia/skia/src/pathops/SkPathWriter.cpp
+++ b/gfx/skia/skia/src/pathops/SkPathWriter.cpp
@@ -35,6 +35,24 @@ void SkPathWriter::close() {
     init();
 }
 
+void SkPathWriter::conicTo(const SkPoint& pt1, const SkPoint& pt2, SkScalar weight) {
+    lineTo();
+    if (fEmpty && AlmostEqualUlps(fDefer[0], pt1) && AlmostEqualUlps(pt1, pt2)) {
+        deferredLine(pt2);
+        return;
+    }
+    moveTo();
+    fDefer[1] = pt2;
+    nudge();
+    fDefer[0] = fDefer[1];
+#if DEBUG_PATH_CONSTRUCTION
+    SkDebugf("path.conicTo(%1.9g,%1.9g, %1.9g,%1.9g, %1.9g);\n",
+            pt1.fX, pt1.fY, fDefer[1].fX, fDefer[1].fY, weight);
+#endif
+    fPathPtr->conicTo(pt1.fX, pt1.fY, fDefer[1].fX, fDefer[1].fY, weight);
+    fEmpty = false;
+}
+
 void SkPathWriter::cubicTo(const SkPoint& pt1, const SkPoint& pt2, const SkPoint& pt3) {
     lineTo();
     if (fEmpty && AlmostEqualUlps(fDefer[0], pt1) && AlmostEqualUlps(pt1, pt2)
diff --git a/gfx/skia/skia/src/pathops/SkPathWriter.h b/gfx/skia/skia/src/pathops/SkPathWriter.h
index f32074d3cde8..820ddc52b6f3 100644
--- a/gfx/skia/skia/src/pathops/SkPathWriter.h
+++ b/gfx/skia/skia/src/pathops/SkPathWriter.h
@@ -13,6 +13,7 @@ class SkPathWriter {
 public:
     SkPathWriter(SkPath& path);
     void close();
+    void conicTo(const SkPoint& pt1, const SkPoint& pt2, SkScalar weight);
     void cubicTo(const SkPoint& pt1, const SkPoint& pt2, const SkPoint& pt3);
     void deferredLine(const SkPoint& pt);
     void deferredMove(const SkPoint& pt);
diff --git a/gfx/skia/skia/src/pathops/SkQuarticRoot.cpp b/gfx/skia/skia/src/pathops/SkQuarticRoot.cpp
deleted file mode 100644
index f9a7bf517990..000000000000
--- a/gfx/skia/skia/src/pathops/SkQuarticRoot.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-// from http://tog.acm.org/resources/GraphicsGems/gems/Roots3And4.c
-/*
- *  Roots3And4.c
- *
- *  Utility functions to find cubic and quartic roots,
- *  coefficients are passed like this:
- *
- *      c[0] + c[1]*x + c[2]*x^2 + c[3]*x^3 + c[4]*x^4 = 0
- *
- *  The functions return the number of non-complex roots and
- *  put the values into the s array.
- *
- *  Author:         Jochen Schwarze (schwarze@isa.de)
- *
- *  Jan 26, 1990    Version for Graphics Gems
- *  Oct 11, 1990    Fixed sign problem for negative q's in SolveQuartic
- *                  (reported by Mark Podlipec),
- *                  Old-style function definitions,
- *                  IsZero() as a macro
- *  Nov 23, 1990    Some systems do not declare acos() and cbrt() in
- *                  <math.h>, though the functions exist in the library.
- *                  If large coefficients are used, EQN_EPS should be
- *                  reduced considerably (e.g. to 1E-30), results will be
- *                  correct but multiple roots might be reported more
- *                  than once.
- */
-
-#include "SkPathOpsCubic.h"
-#include "SkPathOpsQuad.h"
-#include "SkQuarticRoot.h"
-
-int SkReducedQuarticRoots(const double t4, const double t3, const double t2, const double t1,
-        const double t0, const bool oneHint, double roots[4]) {
-#ifdef SK_DEBUG
-    // create a string mathematica understands
-    // GDB set print repe 15 # if repeated digits is a bother
-    //     set print elements 400 # if line doesn't fit
-    char str[1024];
-    sk_bzero(str, sizeof(str));
-    SK_SNPRINTF(str, sizeof(str),
-            "Solve[%1.19g x^4 + %1.19g x^3 + %1.19g x^2 + %1.19g x + %1.19g == 0, x]",
-            t4, t3, t2, t1, t0);
-    SkPathOpsDebug::MathematicaIze(str, sizeof(str));
-#if ONE_OFF_DEBUG && ONE_OFF_DEBUG_MATHEMATICA
-    SkDebugf("%s\n", str);
-#endif
-#endif
-    if (approximately_zero_when_compared_to(t4, t0)  // 0 is one root
-            && approximately_zero_when_compared_to(t4, t1)
-            && approximately_zero_when_compared_to(t4, t2)) {
-        if (approximately_zero_when_compared_to(t3, t0)
-            && approximately_zero_when_compared_to(t3, t1)
-            && approximately_zero_when_compared_to(t3, t2)) {
-            return SkDQuad::RootsReal(t2, t1, t0, roots);
-        }
-        if (approximately_zero_when_compared_to(t4, t3)) {
-            return SkDCubic::RootsReal(t3, t2, t1, t0, roots);
-        }
-    }
-    if ((approximately_zero_when_compared_to(t0, t1) || approximately_zero(t1))  // 0 is one root
-      //      && approximately_zero_when_compared_to(t0, t2)
-            && approximately_zero_when_compared_to(t0, t3)
-            && approximately_zero_when_compared_to(t0, t4)) {
-        int num = SkDCubic::RootsReal(t4, t3, t2, t1, roots);
-        for (int i = 0; i < num; ++i) {
-            if (approximately_zero(roots[i])) {
-                return num;
-            }
-        }
-        roots[num++] = 0;
-        return num;
-    }
-    if (oneHint) {
-        SkASSERT(approximately_zero_double(t4 + t3 + t2 + t1 + t0) ||
-                approximately_zero_when_compared_to(t4 + t3 + t2 + t1 + t0,  // 1 is one root
-                SkTMax(fabs(t4), SkTMax(fabs(t3), SkTMax(fabs(t2), SkTMax(fabs(t1), fabs(t0)))))));
-        // note that -C == A + B + D + E
-        int num = SkDCubic::RootsReal(t4, t4 + t3, -(t1 + t0), -t0, roots);
-        for (int i = 0; i < num; ++i) {
-            if (approximately_equal(roots[i], 1)) {
-                return num;
-            }
-        }
-        roots[num++] = 1;
-        return num;
-    }
-    return -1;
-}
-
-int SkQuarticRootsReal(int firstCubicRoot, const double A, const double B, const double C,
-        const double D, const double E, double s[4]) {
-    double  u, v;
-    /* normal form: x^4 + Ax^3 + Bx^2 + Cx + D = 0 */
-    const double invA = 1 / A;
-    const double a = B * invA;
-    const double b = C * invA;
-    const double c = D * invA;
-    const double d = E * invA;
-    /*  substitute x = y - a/4 to eliminate cubic term:
-    x^4 + px^2 + qx + r = 0 */
-    const double a2 = a * a;
-    const double p = -3 * a2 / 8 + b;
-    const double q = a2 * a / 8 - a * b / 2 + c;
-    const double r = -3 * a2 * a2 / 256 + a2 * b / 16 - a * c / 4 + d;
-    int num;
-    double largest = SkTMax(fabs(p), fabs(q));
-    if (approximately_zero_when_compared_to(r, largest)) {
-    /* no absolute term: y(y^3 + py + q) = 0 */
-        num = SkDCubic::RootsReal(1, 0, p, q, s);
-        s[num++] = 0;
-    } else {
-        /* solve the resolvent cubic ... */
-        double cubicRoots[3];
-        int roots = SkDCubic::RootsReal(1, -p / 2, -r, r * p / 2 - q * q / 8, cubicRoots);
-        int index;
-        /* ... and take one real solution ... */
-        double z;
-        num = 0;
-        int num2 = 0;
-        for (index = firstCubicRoot; index < roots; ++index) {
-            z = cubicRoots[index];
-            /* ... to build two quadric equations */
-            u = z * z - r;
-            v = 2 * z - p;
-            if (approximately_zero_squared(u)) {
-                u = 0;
-            } else if (u > 0) {
-                u = sqrt(u);
-            } else {
-                continue;
-            }
-            if (approximately_zero_squared(v)) {
-                v = 0;
-            } else if (v > 0) {
-                v = sqrt(v);
-            } else {
-                continue;
-            }
-            num = SkDQuad::RootsReal(1, q < 0 ? -v : v, z - u, s);
-            num2 = SkDQuad::RootsReal(1, q < 0 ? v : -v, z + u, s + num);
-            if (!((num | num2) & 1)) {
-                break;  // prefer solutions without single quad roots
-            }
-        }
-        num += num2;
-        if (!num) {
-            return 0;  // no valid cubic root
-        }
-    }
-    /* resubstitute */
-    const double sub = a / 4;
-    for (int i = 0; i < num; ++i) {
-        s[i] -= sub;
-    }
-    // eliminate duplicates
-    for (int i = 0; i < num - 1; ++i) {
-        for (int j = i + 1; j < num; ) {
-            if (AlmostDequalUlps(s[i], s[j])) {
-                if (j < --num) {
-                    s[j] = s[num];
-                }
-            } else {
-                ++j;
-            }
-        }
-    }
-    return num;
-}
diff --git a/gfx/skia/skia/src/pathops/SkQuarticRoot.h b/gfx/skia/skia/src/pathops/SkQuarticRoot.h
deleted file mode 100644
index 6ce08671e249..000000000000
--- a/gfx/skia/skia/src/pathops/SkQuarticRoot.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#ifndef SkDQuarticRoot_DEFINED
-#define SkDQuarticRoot_DEFINED
-
-int SkReducedQuarticRoots(const double t4, const double t3, const double t2, const double t1,
-        const double t0, const bool oneHint, double s[4]);
-
-int SkQuarticRootsReal(int firstCubicRoot, const double A, const double B, const double C,
-        const double D, const double E, double s[4]);
-
-#endif
diff --git a/gfx/skia/skia/src/pathops/SkReduceOrder.cpp b/gfx/skia/skia/src/pathops/SkReduceOrder.cpp
index bb2038b45f2e..43a91901f76f 100644
--- a/gfx/skia/skia/src/pathops/SkReduceOrder.cpp
+++ b/gfx/skia/skia/src/pathops/SkReduceOrder.cpp
@@ -36,16 +36,7 @@ static int horizontal_line(const SkDQuad& quad, SkDQuad& reduction) {
 
 static int check_linear(const SkDQuad& quad,
         int minX, int maxX, int minY, int maxY, SkDQuad& reduction) {
-    int startIndex = 0;
-    int endIndex = 2;
-    while (quad[startIndex].approximatelyEqual(quad[endIndex])) {
-        --endIndex;
-        if (endIndex == 0) {
-            SkDebugf("%s shouldn't get here if all four points are about equal", __FUNCTION__);
-            SkASSERT(0);
-        }
-    }
-    if (!quad.isLinear(startIndex, endIndex)) {
+    if (!quad.isLinear(0, 2)) {
         return 0;
     }
     // four are colinear: return line formed by outside
@@ -88,12 +79,12 @@ int SkReduceOrder::reduce(const SkDQuad& quad) {
         }
     }
     if (minXSet == 0x7) {  // test for vertical line
-        if (minYSet == 0x7) {  // return 1 if all four are coincident
+        if (minYSet == 0x7) {  // return 1 if all three are coincident
             return coincident_line(quad, fQuad);
         }
         return vertical_line(quad, fQuad);
     }
-    if (minYSet == 0xF) {  // test for horizontal line
+    if (minYSet == 0x7) {  // test for horizontal line
         return horizontal_line(quad, fQuad);
     }
     int result = check_linear(quad, minX, maxX, minY, maxY, fQuad);
@@ -156,16 +147,7 @@ static int check_quadratic(const SkDCubic& cubic, SkDCubic& reduction) {
 
 static int check_linear(const SkDCubic& cubic,
         int minX, int maxX, int minY, int maxY, SkDCubic& reduction) {
-    int startIndex = 0;
-    int endIndex = 3;
-    while (cubic[startIndex].approximatelyEqual(cubic[endIndex])) {
-        --endIndex;
-        if (endIndex == 0) {
-            endIndex = 3;
-            break;
-        }
-    }
-    if (!cubic.isLinear(startIndex, endIndex)) {
+    if (!cubic.isLinear(0, 3)) {
         return 0;
     }
     // four are colinear: return line formed by outside
@@ -271,7 +253,20 @@ SkPath::Verb SkReduceOrder::Quad(const SkPoint a[3], SkPoint* reducePts) {
     return SkPathOpsPointsToVerb(order - 1);
 }
 
+SkPath::Verb SkReduceOrder::Conic(const SkPoint a[3], SkScalar weight, SkPoint* reducePts) {
+    SkPath::Verb verb = SkReduceOrder::Quad(a, reducePts);
+    if (verb > SkPath::kLine_Verb && weight == 1) {
+        return SkPath::kQuad_Verb;
+    }
+    return verb == SkPath::kQuad_Verb ? SkPath::kConic_Verb : verb;
+}
+
 SkPath::Verb SkReduceOrder::Cubic(const SkPoint a[4], SkPoint* reducePts) {
+    if (SkDPoint::ApproximatelyEqual(a[0], a[1]) && SkDPoint::ApproximatelyEqual(a[0], a[2])
+            && SkDPoint::ApproximatelyEqual(a[0], a[3])) {
+        reducePts[0] = a[0];
+        return SkPath::kMove_Verb;
+    }
     SkDCubic cubic;
     cubic.set(a);
     SkReduceOrder reducer;
diff --git a/gfx/skia/skia/src/pathops/SkReduceOrder.h b/gfx/skia/skia/src/pathops/SkReduceOrder.h
index 4ff9a1d127e6..e9e4090deb30 100644
--- a/gfx/skia/skia/src/pathops/SkReduceOrder.h
+++ b/gfx/skia/skia/src/pathops/SkReduceOrder.h
@@ -7,11 +7,9 @@
 #ifndef SkReduceOrder_DEFINED
 #define SkReduceOrder_DEFINED
 
-#include "SkPath.h"
 #include "SkPathOpsCubic.h"
 #include "SkPathOpsLine.h"
 #include "SkPathOpsQuad.h"
-#include "SkTArray.h"
 
 union SkReduceOrder {
     enum Quadratics {
@@ -23,6 +21,7 @@ union SkReduceOrder {
     int reduce(const SkDLine& line);
     int reduce(const SkDQuad& quad);
 
+    static SkPath::Verb Conic(const SkPoint pts[3], SkScalar weight, SkPoint* reducePts);
     static SkPath::Verb Cubic(const SkPoint pts[4], SkPoint* reducePts);
     static SkPath::Verb Quad(const SkPoint pts[3], SkPoint* reducePts);
 
diff --git a/gfx/skia/skia/src/pdf/SkDeflate.cpp b/gfx/skia/skia/src/pdf/SkDeflate.cpp
new file mode 100644
index 000000000000..0a5b6f964add
--- /dev/null
+++ b/gfx/skia/skia/src/pdf/SkDeflate.cpp
@@ -0,0 +1,119 @@
+
+/*
+ * Copyright 2010 The Android Open Source Project
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+
+#include "SkData.h"
+#include "SkDeflate.h"
+#include "SkStream.h"
+
+#ifdef ZLIB_INCLUDE
+    #include ZLIB_INCLUDE
+#else
+    #include "zlib.h"
+#endif
+
+namespace {
+
+// Different zlib implementations use different T.
+// We've seen size_t and unsigned.
+template <typename T> void* skia_alloc_func(void*, T items, T size) {
+    return sk_calloc_throw(SkToSizeT(items) * SkToSizeT(size));
+}
+
+void skia_free_func(void*, void* address) { sk_free(address); }
+
+}  // namespace
+
+#define SKDEFLATEWSTREAM_INPUT_BUFFER_SIZE 4096
+#define SKDEFLATEWSTREAM_OUTPUT_BUFFER_SIZE 4224  // 4096 + 128, usually big
+                                                  // enough to always do a
+                                                  // single loop.
+
+// called by both write() and finalize()
+static void do_deflate(int flush,
+                       z_stream* zStream,
+                       SkWStream* out,
+                       unsigned char* inBuffer,
+                       size_t inBufferSize) {
+    zStream->next_in = inBuffer;
+    zStream->avail_in = SkToInt(inBufferSize);
+    unsigned char outBuffer[SKDEFLATEWSTREAM_OUTPUT_BUFFER_SIZE];
+    SkDEBUGCODE(int returnValue;)
+    do {
+        zStream->next_out = outBuffer;
+        zStream->avail_out = sizeof(outBuffer);
+        SkDEBUGCODE(returnValue =) deflate(zStream, flush);
+        SkASSERT(!zStream->msg);
+
+        out->write(outBuffer, sizeof(outBuffer) - zStream->avail_out);
+    } while (zStream->avail_in || !zStream->avail_out);
+    SkASSERT(flush == Z_FINISH
+                 ? returnValue == Z_STREAM_END
+                 : returnValue == Z_OK);
+}
+
+// Hide all zlib impl details.
+struct SkDeflateWStream::Impl {
+    SkWStream* fOut;
+    unsigned char fInBuffer[SKDEFLATEWSTREAM_INPUT_BUFFER_SIZE];
+    size_t fInBufferIndex;
+    z_stream fZStream;
+};
+
+SkDeflateWStream::SkDeflateWStream(SkWStream* out) : fImpl(new SkDeflateWStream::Impl) {
+    fImpl->fOut = out;
+    fImpl->fInBufferIndex = 0;
+    if (!fImpl->fOut) {
+        return;
+    }
+    fImpl->fZStream.zalloc = &skia_alloc_func;
+    fImpl->fZStream.zfree = &skia_free_func;
+    fImpl->fZStream.opaque = nullptr;
+    SkDEBUGCODE(int r =) deflateInit(&fImpl->fZStream, Z_DEFAULT_COMPRESSION);
+    SkASSERT(Z_OK == r);
+}
+
+SkDeflateWStream::~SkDeflateWStream() { this->finalize(); }
+
+void SkDeflateWStream::finalize() {
+    if (!fImpl->fOut) {
+        return;
+    }
+    do_deflate(Z_FINISH, &fImpl->fZStream, fImpl->fOut, fImpl->fInBuffer,
+               fImpl->fInBufferIndex);
+    (void)deflateEnd(&fImpl->fZStream);
+    fImpl->fOut = nullptr;
+}
+
+bool SkDeflateWStream::write(const void* void_buffer, size_t len) {
+    if (!fImpl->fOut) {
+        return false;
+    }
+    const char* buffer = (const char*)void_buffer;
+    while (len > 0) {
+        size_t tocopy =
+                SkTMin(len, sizeof(fImpl->fInBuffer) - fImpl->fInBufferIndex);
+        memcpy(fImpl->fInBuffer + fImpl->fInBufferIndex, buffer, tocopy);
+        len -= tocopy;
+        buffer += tocopy;
+        fImpl->fInBufferIndex += tocopy;
+        SkASSERT(fImpl->fInBufferIndex <= sizeof(fImpl->fInBuffer));
+
+        // if the buffer isn't filled, don't call into zlib yet.
+        if (sizeof(fImpl->fInBuffer) == fImpl->fInBufferIndex) {
+            do_deflate(Z_NO_FLUSH, &fImpl->fZStream, fImpl->fOut,
+                       fImpl->fInBuffer, fImpl->fInBufferIndex);
+            fImpl->fInBufferIndex = 0;
+        }
+    }
+    return true;
+}
+
+size_t SkDeflateWStream::bytesWritten() const {
+    return fImpl->fZStream.total_in + fImpl->fInBufferIndex;
+}
diff --git a/gfx/skia/skia/src/pdf/SkDeflate.h b/gfx/skia/skia/src/pdf/SkDeflate.h
new file mode 100644
index 000000000000..129d1bf8c3c7
--- /dev/null
+++ b/gfx/skia/skia/src/pdf/SkDeflate.h
@@ -0,0 +1,45 @@
+
+/*
+ * Copyright 2010 The Android Open Source Project
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+
+#ifndef SkFlate_DEFINED
+#define SkFlate_DEFINED
+
+#include "SkTypes.h"
+
+#include "SkStream.h"
+
+/**
+  * Wrap a stream in this class to compress the information written to
+  * this stream using the Deflate algorithm.  Uses Zlib's
+  * Z_DEFAULT_COMPRESSION level.
+  *
+  * See http://en.wikipedia.org/wiki/DEFLATE
+  */
+class SkDeflateWStream final : public SkWStream {
+public:
+    /** Does not take ownership of the stream. */
+    SkDeflateWStream(SkWStream*);
+
+    /** The destructor calls finalize(). */
+    ~SkDeflateWStream();
+
+    /** Write the end of the compressed stream.  All subsequent calls to
+        write() will fail. Subsequent calls to finalize() do nothing. */
+    void finalize();
+
+    // The SkWStream interface:
+    bool write(const void*, size_t) override;
+    size_t bytesWritten() const override;
+
+private:
+    struct Impl;
+    SkAutoTDelete<Impl> fImpl;
+};
+
+#endif  // SkFlate_DEFINED
diff --git a/gfx/skia/skia/src/pdf/SkJpegInfo.cpp b/gfx/skia/skia/src/pdf/SkJpegInfo.cpp
new file mode 100644
index 000000000000..3c52a102db66
--- /dev/null
+++ b/gfx/skia/skia/src/pdf/SkJpegInfo.cpp
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkData.h"
+#include "SkJpegInfo.h"
+
+namespace {
+class JpegSegment {
+public:
+    JpegSegment(const SkData* skdata)
+        : fData(static_cast<const char*>(skdata->data()))
+        , fSize(skdata->size())
+        , fOffset(0)
+        , fLength(0) {}
+    bool read() {
+        if (!this->readBigendianUint16(&fMarker)) {
+            return false;
+        }
+        if (JpegSegment::StandAloneMarker(fMarker)) {
+            fLength = 0;
+            fBuffer = nullptr;
+            return true;
+        }
+        if (!this->readBigendianUint16(&fLength) || fLength < 2) {
+            return false;
+        }
+        fLength -= 2;  // Length includes itself for some reason.
+        if (fOffset + fLength > fSize) {
+            return false;  // Segment too long.
+        }
+        fBuffer = &fData[fOffset];
+        fOffset += fLength;
+        return true;
+    }
+
+    bool isSOF() {
+        return (fMarker & 0xFFF0) == 0xFFC0 && fMarker != 0xFFC4 &&
+               fMarker != 0xFFC8 && fMarker != 0xFFCC;
+    }
+    uint16_t marker() { return fMarker; }
+    uint16_t length() { return fLength; }
+    const char* data() { return fBuffer; }
+
+    static uint16_t GetBigendianUint16(const char* ptr) {
+        // "the most significant byte shall come first"
+        return (static_cast<uint8_t>(ptr[0]) << 8) |
+            static_cast<uint8_t>(ptr[1]);
+    }
+
+private:
+    const char* const fData;
+    const size_t fSize;
+    size_t fOffset;
+    const char* fBuffer;
+    uint16_t fMarker;
+    uint16_t fLength;
+
+    bool readBigendianUint16(uint16_t* value) {
+        if (fOffset + 2 > fSize) {
+            return false;
+        }
+        *value = JpegSegment::GetBigendianUint16(&fData[fOffset]);
+        fOffset += 2;
+        return true;
+    }
+    static bool StandAloneMarker(uint16_t marker) {
+        // RST[m] markers or SOI, EOI, TEM
+        return (marker & 0xFFF8) == 0xFFD0 || marker == 0xFFD8 ||
+               marker == 0xFFD9 || marker == 0xFF01;
+    }
+};
+}  // namespace
+
+bool SkIsJFIF(const SkData* skdata, SkJFIFInfo* info) {
+    static const uint16_t kSOI = 0xFFD8;
+    static const uint16_t kAPP0 = 0xFFE0;
+    JpegSegment segment(skdata);
+    if (!segment.read() || segment.marker() != kSOI) {
+        return false;  // not a JPEG
+    }
+    if (!segment.read() || segment.marker() != kAPP0) {
+        return false;  // not an APP0 segment
+    }
+    static const char kJfif[] = {'J', 'F', 'I', 'F', '\0'};
+    SkASSERT(segment.data());
+    if (SkToSizeT(segment.length()) < sizeof(kJfif) ||
+        0 != memcmp(segment.data(), kJfif, sizeof(kJfif))) {
+        return false;  // Not JFIF JPEG
+    }
+    do {
+        if (!segment.read()) {
+            return false;  // malformed JPEG
+        }
+    } while (!segment.isSOF());
+    if (segment.length() < 6) {
+        return false;  // SOF segment is short
+    }
+    if (8 != segment.data()[0]) {
+        return false;  // Only support 8-bit precision
+    }
+    int numberOfComponents = segment.data()[5];
+    if (numberOfComponents != 1 && numberOfComponents != 3) {
+        return false;  // Invalid JFIF
+    }
+    if (info) {
+        info->fSize.set(JpegSegment::GetBigendianUint16(&segment.data()[3]),
+                        JpegSegment::GetBigendianUint16(&segment.data()[1]));
+        if (numberOfComponents == 3) {
+            info->fType = SkJFIFInfo::kYCbCr;
+        } else {
+            info->fType = SkJFIFInfo::kGrayscale;
+        }
+    }
+    return true;
+}
+
+
diff --git a/gfx/skia/skia/src/pdf/SkJpegInfo.h b/gfx/skia/skia/src/pdf/SkJpegInfo.h
new file mode 100644
index 000000000000..1b03e45b105e
--- /dev/null
+++ b/gfx/skia/skia/src/pdf/SkJpegInfo.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef SkJpegInfo_DEFINED
+#define SkJpegInfo_DEFINED
+
+#include "SkSize.h"
+
+class SkData;
+
+struct SkJFIFInfo {
+    SkISize fSize;
+    enum Type {
+        kGrayscale,
+        kYCbCr,
+    } fType;
+};
+
+/** Returns true iff the data seems to be a valid JFIF JPEG image.  
+    If so and if info is not nullptr, populate info.
+
+    JPEG/JFIF References:
+        http://www.w3.org/Graphics/JPEG/itu-t81.pdf
+        http://www.w3.org/Graphics/JPEG/jfif3.pdf
+*/
+bool SkIsJFIF(const SkData* skdata, SkJFIFInfo* info);
+
+#endif  // SkJpegInfo_DEFINED
diff --git a/gfx/skia/skia/src/pdf/SkPDFBitmap.cpp b/gfx/skia/skia/src/pdf/SkPDFBitmap.cpp
new file mode 100644
index 000000000000..0c53da69743c
--- /dev/null
+++ b/gfx/skia/skia/src/pdf/SkPDFBitmap.cpp
@@ -0,0 +1,490 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkColorPriv.h"
+#include "SkData.h"
+#include "SkDeflate.h"
+#include "SkImage_Base.h"
+#include "SkJpegInfo.h"
+#include "SkPDFBitmap.h"
+#include "SkPDFCanon.h"
+#include "SkStream.h"
+#include "SkUnPreMultiply.h"
+
+void image_get_ro_pixels(const SkImage* image, SkBitmap* dst) {
+    if(as_IB(image)->getROPixels(dst)
+       && dst->dimensions() == image->dimensions()) {
+        if (dst->colorType() != kIndex_8_SkColorType) {
+            return;
+        }
+        // We must check to see if the bitmap has a color table.
+        SkAutoLockPixels autoLockPixels(*dst);
+        if (!dst->getColorTable()) {
+            // We can't use an indexed bitmap with no colortable.
+            dst->reset();
+        } else {
+            return;
+        }
+    }
+    // no pixels or wrong size: fill with zeros.
+    SkAlphaType at = image->isOpaque() ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
+    dst->setInfo(SkImageInfo::MakeN32(image->width(), image->height(), at));
+}
+
+bool image_compute_is_opaque(const SkImage* image) {
+    if (image->isOpaque()) {
+        return true;
+    }
+    // keep output PDF small at cost of possible resource use.
+    SkBitmap bm;
+    image_get_ro_pixels(image, &bm);
+    return SkBitmap::ComputeIsOpaque(bm);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+static void pdf_stream_begin(SkWStream* stream) {
+    static const char streamBegin[] = " stream\n";
+    stream->write(streamBegin, strlen(streamBegin));
+}
+
+static void pdf_stream_end(SkWStream* stream) {
+    static const char streamEnd[] = "\nendstream";
+    stream->write(streamEnd, strlen(streamEnd));
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+// write a single byte to a stream n times.
+static void fill_stream(SkWStream* out, char value, size_t n) {
+    char buffer[4096];
+    memset(buffer, value, sizeof(buffer));
+    for (size_t i = 0; i < n / sizeof(buffer); ++i) {
+        out->write(buffer, sizeof(buffer));
+    }
+    out->write(buffer, n % sizeof(buffer));
+}
+
+// TODO(reed@): Decide if these five functions belong in SkColorPriv.h
+static bool SkIsBGRA(SkColorType ct) {
+    SkASSERT(kBGRA_8888_SkColorType == ct || kRGBA_8888_SkColorType == ct);
+    return kBGRA_8888_SkColorType == ct;
+}
+
+// Interpret value as the given 4-byte SkColorType (BGRA_8888 or
+// RGBA_8888) and return the appropriate component.  Each component
+// should be interpreted according to the associated SkAlphaType and
+// SkColorProfileType.
+static U8CPU SkGetA32Component(uint32_t value, SkColorType ct) {
+    return (value >> (SkIsBGRA(ct) ? SK_BGRA_A32_SHIFT : SK_RGBA_A32_SHIFT)) & 0xFF;
+}
+static U8CPU SkGetR32Component(uint32_t value, SkColorType ct) {
+    return (value >> (SkIsBGRA(ct) ? SK_BGRA_R32_SHIFT : SK_RGBA_R32_SHIFT)) & 0xFF;
+}
+static U8CPU SkGetG32Component(uint32_t value, SkColorType ct) {
+    return (value >> (SkIsBGRA(ct) ? SK_BGRA_G32_SHIFT : SK_RGBA_G32_SHIFT)) & 0xFF;
+}
+static U8CPU SkGetB32Component(uint32_t value, SkColorType ct) {
+    return (value >> (SkIsBGRA(ct) ? SK_BGRA_B32_SHIFT : SK_RGBA_B32_SHIFT)) & 0xFF;
+}
+
+
+// unpremultiply and extract R, G, B components.
+static void pmcolor_to_rgb24(uint32_t color, uint8_t* rgb, SkColorType ct) {
+    uint32_t s = SkUnPreMultiply::GetScale(SkGetA32Component(color, ct));
+    rgb[0] = SkUnPreMultiply::ApplyScale(s, SkGetR32Component(color, ct));
+    rgb[1] = SkUnPreMultiply::ApplyScale(s, SkGetG32Component(color, ct));
+    rgb[2] = SkUnPreMultiply::ApplyScale(s, SkGetB32Component(color, ct));
+}
+
+/* It is necessary to average the color component of transparent
+   pixels with their surrounding neighbors since the PDF renderer may
+   separately re-sample the alpha and color channels when the image is
+   not displayed at its native resolution. Since an alpha of zero
+   gives no information about the color component, the pathological
+   case is a white image with sharp transparency bounds - the color
+   channel goes to black, and the should-be-transparent pixels are
+   rendered as grey because of the separate soft mask and color
+   resizing. e.g.: gm/bitmappremul.cpp */
+static void get_neighbor_avg_color(const SkBitmap& bm,
+                                   int xOrig,
+                                   int yOrig,
+                                   uint8_t rgb[3],
+                                   SkColorType ct) {
+    unsigned a = 0, r = 0, g = 0, b = 0;
+    // Clamp the range to the edge of the bitmap.
+    int ymin = SkTMax(0, yOrig - 1);
+    int ymax = SkTMin(yOrig + 1, bm.height() - 1);
+    int xmin = SkTMax(0, xOrig - 1);
+    int xmax = SkTMin(xOrig + 1, bm.width() - 1);
+    for (int y = ymin; y <= ymax; ++y) {
+        uint32_t* scanline = bm.getAddr32(0, y);
+        for (int x = xmin; x <= xmax; ++x) {
+            uint32_t color = scanline[x];
+            a += SkGetA32Component(color, ct);
+            r += SkGetR32Component(color, ct);
+            g += SkGetG32Component(color, ct);
+            b += SkGetB32Component(color, ct);
+        }
+    }
+    if (a > 0) {
+        rgb[0] = SkToU8(255 * r / a);
+        rgb[1] = SkToU8(255 * g / a);
+        rgb[2] = SkToU8(255 * b / a);
+    } else {
+        rgb[0] = rgb[1] = rgb[2] = 0;
+    }
+}
+
+static size_t pixel_count(const SkBitmap& bm) {
+    return SkToSizeT(bm.width()) * SkToSizeT(bm.height());
+}
+
+static const SkBitmap& not4444(const SkBitmap& input, SkBitmap* copy) {
+    if (input.colorType() != kARGB_4444_SkColorType) {
+        return input;
+    }
+    // ARGB_4444 is rarely used, so we can do a wasteful tmp copy.
+    SkAssertResult(input.copyTo(copy, kN32_SkColorType));
+    copy->setImmutable();
+    return *copy;
+}
+
+static size_t pdf_color_component_count(SkColorType ct) {
+    switch (ct) {
+        case kRGB_565_SkColorType:
+        case kARGB_4444_SkColorType:
+        case kRGBA_8888_SkColorType:
+        case kBGRA_8888_SkColorType:
+            return 3;
+        case kAlpha_8_SkColorType:
+        case kIndex_8_SkColorType:
+        case kGray_8_SkColorType:
+            return 1;
+        case kUnknown_SkColorType:
+        default:
+            SkDEBUGFAIL("unexpected color type");
+            return 0;
+    }
+}
+
+static void bitmap_to_pdf_pixels(const SkBitmap& bitmap, SkWStream* out) {
+    if (!bitmap.getPixels()) {
+        size_t size = pixel_count(bitmap) *
+                      pdf_color_component_count(bitmap.colorType());
+        fill_stream(out, '\x00', size);
+        return;
+    }
+    SkBitmap copy;
+    const SkBitmap& bm = not4444(bitmap, &copy);
+    SkAutoLockPixels autoLockPixels(bm);
+    SkColorType colorType = bm.colorType();
+    switch (colorType) {
+        case kRGBA_8888_SkColorType:
+        case kBGRA_8888_SkColorType: {
+            SkASSERT(3 == pdf_color_component_count(colorType));
+            SkAutoTMalloc<uint8_t> scanline(3 * bm.width());
+            for (int y = 0; y < bm.height(); ++y) {
+                const uint32_t* src = bm.getAddr32(0, y);
+                uint8_t* dst = scanline.get();
+                for (int x = 0; x < bm.width(); ++x) {
+                    uint32_t color = *src++;
+                    U8CPU alpha = SkGetA32Component(color, colorType);
+                    if (alpha != SK_AlphaTRANSPARENT) {
+                        pmcolor_to_rgb24(color, dst, colorType);
+                    } else {
+                        get_neighbor_avg_color(bm, x, y, dst, colorType);
+                    }
+                    dst += 3;
+                }
+                out->write(scanline.get(), 3 * bm.width());
+            }
+            return;
+        }
+        case kRGB_565_SkColorType: {
+            SkASSERT(3 == pdf_color_component_count(colorType));
+            SkAutoTMalloc<uint8_t> scanline(3 * bm.width());
+            for (int y = 0; y < bm.height(); ++y) {
+                const uint16_t* src = bm.getAddr16(0, y);
+                uint8_t* dst = scanline.get();
+                for (int x = 0; x < bm.width(); ++x) {
+                    U16CPU color565 = *src++;
+                    *dst++ = SkPacked16ToR32(color565);
+                    *dst++ = SkPacked16ToG32(color565);
+                    *dst++ = SkPacked16ToB32(color565);
+                }
+                out->write(scanline.get(), 3 * bm.width());
+            }
+            return;
+        }
+        case kAlpha_8_SkColorType:
+            SkASSERT(1 == pdf_color_component_count(colorType));
+            fill_stream(out, '\x00', pixel_count(bm));
+            return;
+        case kGray_8_SkColorType:
+        case kIndex_8_SkColorType:
+            SkASSERT(1 == pdf_color_component_count(colorType));
+            // these two formats need no transformation to serialize.
+            for (int y = 0; y < bm.height(); ++y) {
+                out->write(bm.getAddr8(0, y), bm.width());
+            }
+            return;
+        case kUnknown_SkColorType:
+        case kARGB_4444_SkColorType:
+        default:
+            SkDEBUGFAIL("unexpected color type");
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+static void bitmap_alpha_to_a8(const SkBitmap& bitmap, SkWStream* out) {
+    if (!bitmap.getPixels()) {
+        fill_stream(out, '\xFF', pixel_count(bitmap));
+        return;
+    }
+    SkBitmap copy;
+    const SkBitmap& bm = not4444(bitmap, &copy);
+    SkAutoLockPixels autoLockPixels(bm);
+    SkColorType colorType = bm.colorType();
+    switch (colorType) {
+        case kRGBA_8888_SkColorType:
+        case kBGRA_8888_SkColorType: {
+            SkAutoTMalloc<uint8_t> scanline(bm.width());
+            for (int y = 0; y < bm.height(); ++y) {
+                uint8_t* dst = scanline.get();
+                const SkPMColor* src = bm.getAddr32(0, y);
+                for (int x = 0; x < bm.width(); ++x) {
+                    *dst++ = SkGetA32Component(*src++, colorType);
+                }
+                out->write(scanline.get(), bm.width());
+            }
+            return;
+        }
+        case kAlpha_8_SkColorType:
+            for (int y = 0; y < bm.height(); ++y) {
+                out->write(bm.getAddr8(0, y), bm.width());
+            }
+            return;
+        case kIndex_8_SkColorType: {
+            SkColorTable* ct = bm.getColorTable();
+            SkASSERT(ct);
+            SkAutoTMalloc<uint8_t> scanline(bm.width());
+            for (int y = 0; y < bm.height(); ++y) {
+                uint8_t* dst = scanline.get();
+                const uint8_t* src = bm.getAddr8(0, y);
+                for (int x = 0; x < bm.width(); ++x) {
+                    *dst++ = SkGetPackedA32((*ct)[*src++]);
+                }
+                out->write(scanline.get(), bm.width());
+            }
+            return;
+        }
+        case kRGB_565_SkColorType:
+        case kGray_8_SkColorType:
+            SkDEBUGFAIL("color type has no alpha");
+            return;
+        case kARGB_4444_SkColorType:
+            SkDEBUGFAIL("4444 color type should have been converted to N32");
+            return;
+        case kUnknown_SkColorType:
+        default:
+            SkDEBUGFAIL("unexpected color type");
+    }
+}
+
+static SkPDFArray* make_indexed_color_space(const SkColorTable* table) {
+    SkPDFArray* result = new SkPDFArray;
+    result->reserve(4);
+    result->appendName("Indexed");
+    result->appendName("DeviceRGB");
+    SkASSERT(table);
+    if (table->count() < 1) {
+        result->appendInt(0);
+        char shortTableArray[3] = {0, 0, 0};
+        SkString tableString(shortTableArray, SK_ARRAY_COUNT(shortTableArray));
+        result->appendString(tableString);
+        return result;
+    }
+    result->appendInt(table->count() - 1);  // maximum color index.
+
+    // Potentially, this could be represented in fewer bytes with a stream.
+    // Max size as a string is 1.5k.
+    char tableArray[256 * 3];
+    SkASSERT(3u * table->count() <= SK_ARRAY_COUNT(tableArray));
+    uint8_t* tablePtr = reinterpret_cast<uint8_t*>(tableArray);
+    const SkPMColor* colors = table->readColors();
+    for (int i = 0; i < table->count(); i++) {
+        pmcolor_to_rgb24(colors[i], tablePtr, kN32_SkColorType);
+        tablePtr += 3;
+    }
+    SkString tableString(tableArray, 3 * table->count());
+    result->appendString(tableString);
+    return result;
+}
+
+static void emit_image_xobject(SkWStream* stream,
+                               const SkImage* image,
+                               bool alpha,
+                               SkPDFObject* smask,
+                               const SkPDFObjNumMap& objNumMap,
+                               const SkPDFSubstituteMap& substitutes) {
+    SkBitmap bitmap;
+    image_get_ro_pixels(image, &bitmap);      // TODO(halcanary): test
+    SkAutoLockPixels autoLockPixels(bitmap);  // with malformed images.
+
+    // Write to a temporary buffer to get the compressed length.
+    SkDynamicMemoryWStream buffer;
+    SkDeflateWStream deflateWStream(&buffer);
+    if (alpha) {
+        bitmap_alpha_to_a8(bitmap, &deflateWStream);
+    } else {
+        bitmap_to_pdf_pixels(bitmap, &deflateWStream);
+    }
+    deflateWStream.finalize();  // call before detachAsStream().
+    SkAutoTDelete<SkStreamAsset> asset(buffer.detachAsStream());
+
+    SkPDFDict pdfDict("XObject");
+    pdfDict.insertName("Subtype", "Image");
+    pdfDict.insertInt("Width", bitmap.width());
+    pdfDict.insertInt("Height", bitmap.height());
+    if (alpha) {
+        pdfDict.insertName("ColorSpace", "DeviceGray");
+    } else if (bitmap.colorType() == kIndex_8_SkColorType) {
+        SkASSERT(1 == pdf_color_component_count(bitmap.colorType()));
+        pdfDict.insertObject("ColorSpace",
+                             make_indexed_color_space(bitmap.getColorTable()));
+    } else if (1 == pdf_color_component_count(bitmap.colorType())) {
+        pdfDict.insertName("ColorSpace", "DeviceGray");
+    } else {
+        pdfDict.insertName("ColorSpace", "DeviceRGB");
+    }
+    if (smask) {
+        pdfDict.insertObjRef("SMask", SkRef(smask));
+    }
+    pdfDict.insertInt("BitsPerComponent", 8);
+    pdfDict.insertName("Filter", "FlateDecode");
+    pdfDict.insertInt("Length", asset->getLength());
+    pdfDict.emitObject(stream, objNumMap, substitutes);
+
+    pdf_stream_begin(stream);
+    stream->writeStream(asset.get(), asset->getLength());
+    pdf_stream_end(stream);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+namespace {
+// This SkPDFObject only outputs the alpha layer of the given bitmap.
+class PDFAlphaBitmap final : public SkPDFObject {
+public:
+    PDFAlphaBitmap(const SkImage* image) : fImage(SkRef(image)) {}
+    ~PDFAlphaBitmap() {}
+    void emitObject(SkWStream*  stream,
+                    const SkPDFObjNumMap& objNumMap,
+                    const SkPDFSubstituteMap& subs) const override {
+        emit_image_xobject(stream, fImage, true, nullptr, objNumMap, subs);
+    }
+
+private:
+    SkAutoTUnref<const SkImage> fImage;
+};
+
+}  // namespace
+
+////////////////////////////////////////////////////////////////////////////////
+
+namespace {
+class PDFDefaultBitmap final : public SkPDFObject {
+public:
+    void emitObject(SkWStream* stream,
+                    const SkPDFObjNumMap& objNumMap,
+                    const SkPDFSubstituteMap& subs) const override {
+        emit_image_xobject(stream, fImage, false, fSMask, objNumMap, subs);
+    }
+    void addResources(SkPDFObjNumMap* catalog,
+                      const SkPDFSubstituteMap& subs) const override {
+        if (fSMask.get()) {
+            SkPDFObject* obj = subs.getSubstitute(fSMask.get());
+            SkASSERT(obj);
+            catalog->addObjectRecursively(obj, subs);
+        }
+    }
+    PDFDefaultBitmap(const SkImage* image, SkPDFObject* smask)
+        : fImage(SkRef(image)), fSMask(smask) {}
+
+private:
+    SkAutoTUnref<const SkImage> fImage;
+    const SkAutoTUnref<SkPDFObject> fSMask;
+};
+}  // namespace
+
+////////////////////////////////////////////////////////////////////////////////
+
+namespace {
+/**
+ *  This PDFObject assumes that its constructor was handed YUV or
+ *  Grayscale JFIF Jpeg-encoded data that can be directly embedded
+ *  into a PDF.
+ */
+class PDFJpegBitmap final : public SkPDFObject {
+public:
+    SkISize fSize;
+    SkAutoTUnref<SkData> fData;
+    bool fIsYUV;
+    PDFJpegBitmap(SkISize size, SkData* data, bool isYUV)
+        : fSize(size), fData(SkRef(data)), fIsYUV(isYUV) {}
+    void emitObject(SkWStream*,
+                    const SkPDFObjNumMap&,
+                    const SkPDFSubstituteMap&) const override;
+};
+
+void PDFJpegBitmap::emitObject(SkWStream* stream,
+                               const SkPDFObjNumMap& objNumMap,
+                               const SkPDFSubstituteMap& substituteMap) const {
+    SkPDFDict pdfDict("XObject");
+    pdfDict.insertName("Subtype", "Image");
+    pdfDict.insertInt("Width", fSize.width());
+    pdfDict.insertInt("Height", fSize.height());
+    if (fIsYUV) {
+        pdfDict.insertName("ColorSpace", "DeviceRGB");
+    } else {
+        pdfDict.insertName("ColorSpace", "DeviceGray");
+    }
+    pdfDict.insertInt("BitsPerComponent", 8);
+    pdfDict.insertName("Filter", "DCTDecode");
+    pdfDict.insertInt("ColorTransform", 0);
+    pdfDict.insertInt("Length", SkToInt(fData->size()));
+    pdfDict.emitObject(stream, objNumMap, substituteMap);
+    pdf_stream_begin(stream);
+    stream->write(fData->data(), fData->size());
+    pdf_stream_end(stream);
+}
+}  // namespace
+
+////////////////////////////////////////////////////////////////////////////////
+
+SkPDFObject* SkPDFCreateBitmapObject(const SkImage* image) {
+    SkAutoTUnref<SkData> data(image->refEncoded());
+    SkJFIFInfo info;
+    if (data && SkIsJFIF(data, &info)) {
+        bool yuv = info.fType == SkJFIFInfo::kYCbCr;
+        if (info.fSize == image->dimensions()) {  // Sanity check.
+            // hold on to data, not image.
+            #ifdef SK_PDF_IMAGE_STATS
+            gJpegImageObjects.fetch_add(1);
+            #endif
+            return new PDFJpegBitmap(info.fSize, data, yuv);
+        }
+    }
+    SkPDFObject* smask =
+            image_compute_is_opaque(image) ? nullptr : new PDFAlphaBitmap(image);
+    #ifdef SK_PDF_IMAGE_STATS
+    gRegularImageObjects.fetch_add(1);
+    #endif
+    return new PDFDefaultBitmap(image, smask);
+}
diff --git a/gfx/skia/skia/src/pdf/SkPDFBitmap.h b/gfx/skia/skia/src/pdf/SkPDFBitmap.h
new file mode 100644
index 000000000000..d93133143118
--- /dev/null
+++ b/gfx/skia/skia/src/pdf/SkPDFBitmap.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef SkPDFBitmap_DEFINED
+#define SkPDFBitmap_DEFINED
+
+#include "SkPDFTypes.h"
+
+class SkImage;
+
+/**
+ * SkPDFBitmap wraps a SkImage and serializes it as an image Xobject.
+ * It is designed to use a minimal amout of memory, aside from refing
+ * the image, and its emitObject() does not cache any data.
+ */
+SkPDFObject* SkPDFCreateBitmapObject(const SkImage*);
+
+#endif  // SkPDFBitmap_DEFINED
diff --git a/gfx/skia/skia/src/pdf/SkPDFCanon.cpp b/gfx/skia/skia/src/pdf/SkPDFCanon.cpp
new file mode 100644
index 000000000000..4fdaa0db628c
--- /dev/null
+++ b/gfx/skia/skia/src/pdf/SkPDFCanon.cpp
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkImage.h"
+#include "SkPDFBitmap.h"
+#include "SkPDFCanon.h"
+#include "SkPDFFont.h"
+#include "SkPDFShader.h"
+
+////////////////////////////////////////////////////////////////////////////////
+
+void SkPDFCanon::reset() {
+    for (int i = 0; i < fFontRecords.count(); ++i) {
+        fFontRecords[i].fFont->unref();
+    }
+    fFontRecords.reset();
+    fFunctionShaderRecords.unrefAll();
+    fFunctionShaderRecords.reset();
+    fAlphaShaderRecords.unrefAll();
+    fAlphaShaderRecords.reset();
+    fImageShaderRecords.unrefAll();
+    fImageShaderRecords.reset();
+    fGraphicStateRecords.foreach ([](WrapGS w) { w.fPtr->unref(); });
+    fGraphicStateRecords.reset();
+
+    fBitmapToImageMap.foreach(
+            [](SkBitmapKey, const SkImage** p) { SkSafeUnref(*p); });
+    fBitmapToImageMap.reset();
+
+    fPDFBitmapMap.foreach([](uint32_t, SkPDFObject** p) { SkSafeUnref(*p); });
+    fPDFBitmapMap.reset();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+template <class T> T* assert_ptr(T* p) { SkASSERT(p); return p; }
+
+// requires `bool T::equals(const U&) const`
+template <typename T, typename U>
+T* find_item(const SkTDArray<T*>& ptrArray, const U& object) {
+    for (int i = 0; i < ptrArray.count(); ++i) {
+        if (ptrArray[i]->equals(object)) {
+            return ptrArray[i];
+        }
+    }
+    return nullptr;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+SkPDFFont* SkPDFCanon::findFont(uint32_t fontID,
+                                uint16_t glyphID,
+                                SkPDFFont** relatedFontPtr) const {
+    SkASSERT(relatedFontPtr);
+
+    SkPDFFont* relatedFont = nullptr;
+    for (int i = 0; i < fFontRecords.count(); ++i) {
+        SkPDFFont::Match match = SkPDFFont::IsMatch(
+                fFontRecords[i].fFont, fFontRecords[i].fFontID,
+                fFontRecords[i].fGlyphID, fontID, glyphID);
+        if (SkPDFFont::kExact_Match == match) {
+            return fFontRecords[i].fFont;
+        } else if (!relatedFont && SkPDFFont::kRelated_Match == match) {
+            relatedFont = fFontRecords[i].fFont;
+        }
+    }
+    *relatedFontPtr = relatedFont;  // May still be nullptr.
+    return nullptr;
+}
+
+void SkPDFCanon::addFont(SkPDFFont* font, uint32_t fontID, uint16_t fGlyphID) {
+    SkPDFCanon::FontRec* rec = fFontRecords.push();
+    rec->fFont = SkRef(font);
+    rec->fFontID = fontID;
+    rec->fGlyphID = fGlyphID;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+SkPDFFunctionShader* SkPDFCanon::findFunctionShader(
+        const SkPDFShader::State& state) const {
+    return find_item(fFunctionShaderRecords, state);
+}
+void SkPDFCanon::addFunctionShader(SkPDFFunctionShader* pdfShader) {
+    fFunctionShaderRecords.push(SkRef(pdfShader));
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+SkPDFAlphaFunctionShader* SkPDFCanon::findAlphaShader(
+        const SkPDFShader::State& state) const {
+    return find_item(fAlphaShaderRecords, state);
+}
+void SkPDFCanon::addAlphaShader(SkPDFAlphaFunctionShader* pdfShader) {
+    fAlphaShaderRecords.push(SkRef(pdfShader));
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+SkPDFImageShader* SkPDFCanon::findImageShader(
+        const SkPDFShader::State& state) const {
+    return find_item(fImageShaderRecords, state);
+}
+
+void SkPDFCanon::addImageShader(SkPDFImageShader* pdfShader) {
+    fImageShaderRecords.push(SkRef(pdfShader));
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+const SkPDFGraphicState* SkPDFCanon::findGraphicState(
+        const SkPDFGraphicState& key) const {
+    const WrapGS* ptr = fGraphicStateRecords.find(WrapGS(&key));
+    return ptr ? ptr->fPtr : nullptr;
+}
+
+void SkPDFCanon::addGraphicState(const SkPDFGraphicState* state) {
+    SkASSERT(state);
+    WrapGS w(SkRef(state));
+    SkASSERT(!fGraphicStateRecords.contains(w));
+    fGraphicStateRecords.add(w);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+SkPDFObject* SkPDFCanon::findPDFBitmap(const SkImage* image) const {
+    SkPDFObject** ptr = fPDFBitmapMap.find(image->uniqueID());
+    return ptr ? *ptr : nullptr;
+}
+
+void SkPDFCanon::addPDFBitmap(uint32_t imageUniqueID, SkPDFObject* pdfBitmap) {
+    fPDFBitmapMap.set(imageUniqueID, SkRef(pdfBitmap));
+}
+
+const SkImage* SkPDFCanon::bitmapToImage(const SkBitmap& bm) {
+    // reference remains owned by the fBitmapToImageMap!
+    SkBitmapKey key(bm);
+    if (const SkImage** img = fBitmapToImageMap.find(key)) {
+        return *img;
+    }
+    if (SkImage* image = SkImage::NewFromBitmap(bm)) {
+        return *fBitmapToImageMap.set(key, image);
+    }
+    SkBitmap n32bitmap;  // SkImage::NewFromBitmap can be finicky.
+    bm.copyTo(&n32bitmap, kN32_SkColorType);
+    return *fBitmapToImageMap.set(key, SkImage::NewFromBitmap(n32bitmap));
+}
diff --git a/gfx/skia/skia/src/pdf/SkPDFCanon.h b/gfx/skia/skia/src/pdf/SkPDFCanon.h
new file mode 100644
index 000000000000..3d2ba6a77d1b
--- /dev/null
+++ b/gfx/skia/skia/src/pdf/SkPDFCanon.h
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef SkPDFCanon_DEFINED
+#define SkPDFCanon_DEFINED
+
+#include "SkBitmap.h"
+#include "SkPDFGraphicState.h"
+#include "SkPDFShader.h"
+#include "SkTDArray.h"
+#include "SkTHash.h"
+
+class SkPDFFont;
+class SkPaint;
+class SkImage;
+
+class SkBitmapKey {
+public:
+    SkBitmapKey() : fSubset(SkIRect::MakeEmpty()), fGenID(0) {}
+    explicit SkBitmapKey(const SkBitmap& bm)
+        : fSubset(bm.getSubset()), fGenID(bm.getGenerationID()) {}
+    bool operator==(const SkBitmapKey& rhs) const {
+        return fGenID == rhs.fGenID && fSubset == rhs.fSubset;
+    }
+
+private:
+    SkIRect fSubset;
+    uint32_t fGenID;
+};
+
+/**
+ *  The SkPDFCanon canonicalizes objects across PDF pages(SkPDFDevices).
+ *
+ *  The PDF backend works correctly if:
+ *  -  There is no more than one SkPDFCanon for each thread.
+ *  -  Every SkPDFDevice is given a pointer to a SkPDFCanon on creation.
+ *  -  All SkPDFDevices in a document share the same SkPDFCanon.
+ *  The SkDocument_PDF class makes this happen by owning a single
+ *  SkPDFCanon.
+ *
+ *  The addFoo() methods will ref the Foo; the canon's destructor will
+ *  call foo->unref() on all of these objects.
+ *
+ *  The findFoo() methods do not change the ref count of the Foo
+ *  objects.
+ */
+class SkPDFCanon : SkNoncopyable {
+public:
+    ~SkPDFCanon() { this->reset(); }
+
+    // reset to original setting, unrefs all objects.
+    void reset();
+
+    // Returns exact match if there is one.  If not, it returns nullptr.
+    // If there is no exact match, but there is a related font, we
+    // still return nullptr, but also set *relatedFont.
+    SkPDFFont* findFont(uint32_t fontID,
+                        uint16_t glyphID,
+                        SkPDFFont** relatedFont) const;
+    void addFont(SkPDFFont* font, uint32_t fontID, uint16_t fGlyphID);
+
+    SkPDFFunctionShader* findFunctionShader(const SkPDFShader::State&) const;
+    void addFunctionShader(SkPDFFunctionShader*);
+
+    SkPDFAlphaFunctionShader* findAlphaShader(const SkPDFShader::State&) const;
+    void addAlphaShader(SkPDFAlphaFunctionShader*);
+
+    SkPDFImageShader* findImageShader(const SkPDFShader::State&) const;
+    void addImageShader(SkPDFImageShader*);
+
+    const SkPDFGraphicState* findGraphicState(const SkPDFGraphicState&) const;
+    void addGraphicState(const SkPDFGraphicState*);
+
+    SkPDFObject* findPDFBitmap(const SkImage* image) const;
+    void addPDFBitmap(uint32_t imageUniqueID, SkPDFObject*);
+    const SkImage* bitmapToImage(const SkBitmap&);
+
+    SkTHashMap<uint32_t, bool> fCanEmbedTypeface;
+
+private:
+    struct FontRec {
+        SkPDFFont* fFont;
+        uint32_t fFontID;
+        uint16_t fGlyphID;
+    };
+    SkTDArray<FontRec> fFontRecords;
+
+    SkTDArray<SkPDFFunctionShader*> fFunctionShaderRecords;
+
+    SkTDArray<SkPDFAlphaFunctionShader*> fAlphaShaderRecords;
+
+    SkTDArray<SkPDFImageShader*> fImageShaderRecords;
+
+    struct WrapGS {
+        explicit WrapGS(const SkPDFGraphicState* ptr = nullptr) : fPtr(ptr) {}
+        const SkPDFGraphicState* fPtr;
+        bool operator==(const WrapGS& rhs) const {
+            SkASSERT(fPtr);
+            SkASSERT(rhs.fPtr);
+            return *fPtr == *rhs.fPtr;
+        }
+        struct Hash {
+            uint32_t operator()(const WrapGS& w) const {
+                SkASSERT(w.fPtr);
+                return w.fPtr->hash();
+            }
+        };
+    };
+    SkTHashSet<WrapGS, WrapGS::Hash> fGraphicStateRecords;
+
+    SkTHashMap<SkBitmapKey, const SkImage*> fBitmapToImageMap;
+    SkTHashMap<uint32_t /*ImageUniqueID*/, SkPDFObject*> fPDFBitmapMap;
+};
+#endif  // SkPDFCanon_DEFINED
diff --git a/gfx/skia/skia/src/pdf/SkPDFCatalog.cpp b/gfx/skia/skia/src/pdf/SkPDFCatalog.cpp
deleted file mode 100644
index 8690b3eaea7b..000000000000
--- a/gfx/skia/skia/src/pdf/SkPDFCatalog.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-
-/*
- * Copyright 2010 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#include "SkPDFCatalog.h"
-#include "SkPDFTypes.h"
-#include "SkStream.h"
-#include "SkTypes.h"
-
-SkPDFCatalog::SkPDFCatalog(SkPDFDocument::Flags flags)
-    : fFirstPageCount(0),
-      fNextObjNum(1),
-      fNextFirstPageObjNum(0),
-      fDocumentFlags(flags) {
-}
-
-SkPDFCatalog::~SkPDFCatalog() {
-    fSubstituteResourcesRemaining.safeUnrefAll();
-    fSubstituteResourcesFirstPage.safeUnrefAll();
-}
-
-SkPDFObject* SkPDFCatalog::addObject(SkPDFObject* obj, bool onFirstPage) {
-    if (findObjectIndex(obj) != -1) {  // object already added
-        return obj;
-    }
-    SkASSERT(fNextFirstPageObjNum == 0);
-    if (onFirstPage) {
-        fFirstPageCount++;
-    }
-
-    struct Rec newEntry(obj, onFirstPage);
-    fCatalog.append(1, &newEntry);
-    return obj;
-}
-
-size_t SkPDFCatalog::setFileOffset(SkPDFObject* obj, off_t offset) {
-    int objIndex = assignObjNum(obj) - 1;
-    SkASSERT(fCatalog[objIndex].fObjNumAssigned);
-    SkASSERT(fCatalog[objIndex].fFileOffset == 0);
-    fCatalog[objIndex].fFileOffset = offset;
-
-    return getSubstituteObject(obj)->getOutputSize(this, true);
-}
-
-void SkPDFCatalog::emitObjectNumber(SkWStream* stream, SkPDFObject* obj) {
-    stream->writeDecAsText(assignObjNum(obj));
-    stream->writeText(" 0");  // Generation number is always 0.
-}
-
-size_t SkPDFCatalog::getObjectNumberSize(SkPDFObject* obj) {
-    SkDynamicMemoryWStream buffer;
-    emitObjectNumber(&buffer, obj);
-    return buffer.getOffset();
-}
-
-int SkPDFCatalog::findObjectIndex(SkPDFObject* obj) const {
-    for (int i = 0; i < fCatalog.count(); i++) {
-        if (fCatalog[i].fObject == obj) {
-            return i;
-        }
-    }
-    // If it's not in the main array, check if it's a substitute object.
-    for (int i = 0; i < fSubstituteMap.count(); ++i) {
-        if (fSubstituteMap[i].fSubstitute == obj) {
-            return findObjectIndex(fSubstituteMap[i].fOriginal);
-        }
-    }
-    return -1;
-}
-
-int SkPDFCatalog::assignObjNum(SkPDFObject* obj) {
-    int pos = findObjectIndex(obj);
-    // If this assert fails, it means you probably forgot to add an object
-    // to the resource list.
-    SkASSERT(pos >= 0);
-    uint32_t currentIndex = pos;
-    if (fCatalog[currentIndex].fObjNumAssigned) {
-        return currentIndex + 1;
-    }
-
-    // First assignment.
-    if (fNextFirstPageObjNum == 0) {
-        fNextFirstPageObjNum = fCatalog.count() - fFirstPageCount + 1;
-    }
-
-    uint32_t objNum;
-    if (fCatalog[currentIndex].fOnFirstPage) {
-        objNum = fNextFirstPageObjNum;
-        fNextFirstPageObjNum++;
-    } else {
-        objNum = fNextObjNum;
-        fNextObjNum++;
-    }
-
-    // When we assign an object an object number, we put it in that array
-    // offset (minus 1 because object number 0 is reserved).
-    SkASSERT(!fCatalog[objNum - 1].fObjNumAssigned);
-    if (objNum - 1 != currentIndex) {
-        SkTSwap(fCatalog[objNum - 1], fCatalog[currentIndex]);
-    }
-    fCatalog[objNum - 1].fObjNumAssigned = true;
-    return objNum;
-}
-
-int32_t SkPDFCatalog::emitXrefTable(SkWStream* stream, bool firstPage) {
-    int first = -1;
-    int last = fCatalog.count() - 1;
-    // TODO(vandebo): Support linearized format.
-    // int last = fCatalog.count() - fFirstPageCount - 1;
-    // if (firstPage) {
-    //     first = fCatalog.count() - fFirstPageCount;
-    //     last = fCatalog.count() - 1;
-    // }
-
-    stream->writeText("xref\n");
-    stream->writeDecAsText(first + 1);
-    stream->writeText(" ");
-    stream->writeDecAsText(last - first + 1);
-    stream->writeText("\n");
-
-    if (first == -1) {
-        stream->writeText("0000000000 65535 f \n");
-        first++;
-    }
-    for (int i = first; i <= last; i++) {
-        // For 32 bits platforms, the maximum offset has to fit within off_t
-        // which is a 32 bits signed integer on these platforms.
-        SkDEBUGCODE(static const off_t kMaxOff = SK_MaxS32;)
-        SkASSERT(fCatalog[i].fFileOffset > 0);
-        SkASSERT(fCatalog[i].fFileOffset < kMaxOff);
-        stream->writeBigDecAsText(fCatalog[i].fFileOffset, 10);
-        stream->writeText(" 00000 n \n");
-    }
-
-    return fCatalog.count() + 1;
-}
-
-void SkPDFCatalog::setSubstitute(SkPDFObject* original,
-                                 SkPDFObject* substitute) {
-#if defined(SK_DEBUG)
-    // Sanity check: is the original already in substitute list?
-    for (int i = 0; i < fSubstituteMap.count(); ++i) {
-        if (original == fSubstituteMap[i].fSubstitute ||
-            original == fSubstituteMap[i].fOriginal) {
-            SkASSERT(false);
-            return;
-        }
-    }
-#endif
-    // Check if the original is on first page.
-    bool onFirstPage = false;
-    for (int i = 0; i < fCatalog.count(); ++i) {
-        if (fCatalog[i].fObject == original) {
-            onFirstPage = fCatalog[i].fOnFirstPage;
-            break;
-        }
-#if defined(SK_DEBUG)
-        if (i == fCatalog.count() - 1) {
-            SkASSERT(false);  // original not in catalog
-            return;
-        }
-#endif
-    }
-
-    SubstituteMapping newMapping(original, substitute);
-    fSubstituteMap.append(1, &newMapping);
-
-    // Add resource objects of substitute object to catalog.
-    SkTSet<SkPDFObject*>* targetSet = getSubstituteList(onFirstPage);
-    SkTSet<SkPDFObject*> newResourceObjects;
-    newMapping.fSubstitute->getResources(*targetSet, &newResourceObjects);
-    for (int i = 0; i < newResourceObjects.count(); ++i) {
-        addObject(newResourceObjects[i], onFirstPage);
-    }
-    // mergeInto returns the number of duplicates.
-    // If there are duplicates, there is a bug and we mess ref counting.
-    SkDEBUGCODE(int duplicates =) targetSet->mergeInto(newResourceObjects);
-    SkASSERT(duplicates == 0);
-}
-
-SkPDFObject* SkPDFCatalog::getSubstituteObject(SkPDFObject* object) {
-    for (int i = 0; i < fSubstituteMap.count(); ++i) {
-        if (object == fSubstituteMap[i].fOriginal) {
-            return fSubstituteMap[i].fSubstitute;
-        }
-    }
-    return object;
-}
-
-off_t SkPDFCatalog::setSubstituteResourcesOffsets(off_t fileOffset,
-                                                  bool firstPage) {
-    SkTSet<SkPDFObject*>* targetSet = getSubstituteList(firstPage);
-    off_t offsetSum = fileOffset;
-    for (int i = 0; i < targetSet->count(); ++i) {
-        offsetSum += setFileOffset((*targetSet)[i], offsetSum);
-    }
-    return offsetSum - fileOffset;
-}
-
-void SkPDFCatalog::emitSubstituteResources(SkWStream *stream, bool firstPage) {
-    SkTSet<SkPDFObject*>* targetSet = getSubstituteList(firstPage);
-    for (int i = 0; i < targetSet->count(); ++i) {
-        (*targetSet)[i]->emit(stream, this, true);
-    }
-}
-
-SkTSet<SkPDFObject*>* SkPDFCatalog::getSubstituteList(bool firstPage) {
-    return firstPage ? &fSubstituteResourcesFirstPage :
-                       &fSubstituteResourcesRemaining;
-}
diff --git a/gfx/skia/skia/src/pdf/SkPDFCatalog.h b/gfx/skia/skia/src/pdf/SkPDFCatalog.h
deleted file mode 100644
index c7c6d6e29956..000000000000
--- a/gfx/skia/skia/src/pdf/SkPDFCatalog.h
+++ /dev/null
@@ -1,137 +0,0 @@
-
-/*
- * Copyright 2010 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#ifndef SkPDFCatalog_DEFINED
-#define SkPDFCatalog_DEFINED
-
-#include <sys/types.h>
-
-#include "SkPDFDocument.h"
-#include "SkPDFTypes.h"
-#include "SkRefCnt.h"
-#include "SkTDArray.h"
-
-/** \class SkPDFCatalog
-
-    The PDF catalog manages object numbers and file offsets.  It is used
-    to create the PDF cross reference table.
-*/
-class SkPDFCatalog {
-public:
-    /** Create a PDF catalog.
-     */
-    explicit SkPDFCatalog(SkPDFDocument::Flags flags);
-    ~SkPDFCatalog();
-
-    /** Add the passed object to the catalog.  Refs obj.
-     *  @param obj         The object to add.
-     *  @param onFirstPage Is the object on the first page.
-     *  @return The obj argument is returned.
-     */
-    SkPDFObject* addObject(SkPDFObject* obj, bool onFirstPage);
-
-    /** Inform the catalog of the object's position in the final stream.
-     *  The object should already have been added to the catalog.  Returns
-     *  the object's size.
-     *  @param obj         The object to add.
-     *  @param offset      The byte offset in the output stream of this object.
-     */
-    size_t setFileOffset(SkPDFObject* obj, off_t offset);
-
-    /** Output the object number for the passed object.
-     *  @param obj         The object of interest.
-     *  @param stream      The writable output stream to send the output to.
-     */
-    void emitObjectNumber(SkWStream* stream, SkPDFObject* obj);
-
-    /** Return the number of bytes that would be emitted for the passed
-     *  object's object number.
-     *  @param obj         The object of interest
-     */
-    size_t getObjectNumberSize(SkPDFObject* obj);
-
-    /** Return the document flags in effect for this catalog/document.
-     */
-    SkPDFDocument::Flags getDocumentFlags() const { return fDocumentFlags; }
-
-    /** Output the cross reference table for objects in the catalog.
-     *  Returns the total number of objects.
-     *  @param stream      The writable output stream to send the output to.
-     *  @param firstPage   If true, include first page objects only, otherwise
-     *                     include all objects not on the first page.
-     */
-    int32_t emitXrefTable(SkWStream* stream, bool firstPage);
-
-    /** Set substitute object for the passed object.
-     */
-    void setSubstitute(SkPDFObject* original, SkPDFObject* substitute);
-
-    /** Find and return any substitute object set for the passed object. If
-     *  there is none, return the passed object.
-     */
-    SkPDFObject* getSubstituteObject(SkPDFObject* object);
-
-    /** Set file offsets for the resources of substitute objects.
-     *  @param fileOffset Accumulated offset of current document.
-     *  @param firstPage  Indicate whether this is for the first page only.
-     *  @return           Total size of resources of substitute objects.
-     */
-    off_t setSubstituteResourcesOffsets(off_t fileOffset, bool firstPage);
-
-    /** Emit the resources of substitute objects.
-     */
-    void emitSubstituteResources(SkWStream* stream, bool firstPage);
-
-private:
-    struct Rec {
-        Rec(SkPDFObject* object, bool onFirstPage)
-            : fObject(object),
-              fFileOffset(0),
-              fObjNumAssigned(false),
-              fOnFirstPage(onFirstPage) {
-        }
-        SkPDFObject* fObject;
-        off_t fFileOffset;
-        bool fObjNumAssigned;
-        bool fOnFirstPage;
-    };
-
-    struct SubstituteMapping {
-        SubstituteMapping(SkPDFObject* original, SkPDFObject* substitute)
-            : fOriginal(original), fSubstitute(substitute) {
-        }
-        SkPDFObject* fOriginal;
-        SkPDFObject* fSubstitute;
-    };
-
-    // TODO(vandebo): Make this a hash if it's a performance problem.
-    SkTDArray<struct Rec> fCatalog;
-
-    // TODO(arthurhsu): Make this a hash if it's a performance problem.
-    SkTDArray<SubstituteMapping> fSubstituteMap;
-    SkTSet<SkPDFObject*> fSubstituteResourcesFirstPage;
-    SkTSet<SkPDFObject*> fSubstituteResourcesRemaining;
-
-    // Number of objects on the first page.
-    uint32_t fFirstPageCount;
-    // Next object number to assign (on page > 1).
-    uint32_t fNextObjNum;
-    // Next object number to assign on the first page.
-    uint32_t fNextFirstPageObjNum;
-
-    SkPDFDocument::Flags fDocumentFlags;
-
-    int findObjectIndex(SkPDFObject* obj) const;
-
-    int assignObjNum(SkPDFObject* obj);
-
-    SkTSet<SkPDFObject*>* getSubstituteList(bool firstPage);
-};
-
-#endif
diff --git a/gfx/skia/skia/src/pdf/SkPDFDevice.cpp b/gfx/skia/skia/src/pdf/SkPDFDevice.cpp
index e571477e439f..1c5b4da07065 100644
--- a/gfx/skia/skia/src/pdf/SkPDFDevice.cpp
+++ b/gfx/skia/skia/src/pdf/SkPDFDevice.cpp
@@ -5,27 +5,30 @@
  * found in the LICENSE file.
  */
 
+#include <tuple>
 #include "SkPDFDevice.h"
 
 #include "SkAnnotation.h"
 #include "SkColor.h"
+#include "SkColorFilter.h"
 #include "SkClipStack.h"
 #include "SkData.h"
 #include "SkDraw.h"
-#include "SkFontHost.h"
 #include "SkGlyphCache.h"
 #include "SkPaint.h"
 #include "SkPath.h"
 #include "SkPathOps.h"
+#include "SkPDFBitmap.h"
+#include "SkPDFCanon.h"
 #include "SkPDFFont.h"
 #include "SkPDFFormXObject.h"
 #include "SkPDFGraphicState.h"
-#include "SkPDFImage.h"
 #include "SkPDFResourceDict.h"
 #include "SkPDFShader.h"
 #include "SkPDFStream.h"
 #include "SkPDFTypes.h"
 #include "SkPDFUtils.h"
+#include "SkRasterClip.h"
 #include "SkRect.h"
 #include "SkRRect.h"
 #include "SkString.h"
@@ -33,39 +36,46 @@
 #include "SkTextFormatParams.h"
 #include "SkTemplates.h"
 #include "SkTypefacePriv.h"
-#include "SkTSet.h"
-
-#ifdef SK_BUILD_FOR_ANDROID
-#include "SkTypeface_android.h"
-
-struct TypefaceFallbackData {
-    SkTypeface* typeface;
-    int lowerBounds;
-    int upperBounds;
-
-    bool operator==(const TypefaceFallbackData& b) const {
-        return typeface == b.typeface &&
-               lowerBounds == b.lowerBounds &&
-               upperBounds == b.upperBounds;
-    }
-};
-#endif
+#include "SkXfermodeInterpretation.h"
 
 #define DPI_FOR_RASTER_SCALE_ONE 72
 
 // Utility functions
 
+static bool excessive_translation(const SkMatrix& m) {
+    const SkScalar kExcessiveTranslation = 8192.0f;
+    return SkScalarAbs(m.getTranslateX()) > kExcessiveTranslation
+        || SkScalarAbs(m.getTranslateY()) > kExcessiveTranslation;
+}
+
+static std::tuple<SkMatrix, SkVector> untranslate(const SkDraw& d) {
+    // https://bug.skia.org/257 If the translation is too large,
+    // PDF can't exactly represent the float values as numbers.
+    SkScalar translateX = d.fMatrix->getTranslateX() / d.fMatrix->getScaleX();
+    SkScalar translateY = d.fMatrix->getTranslateY() / d.fMatrix->getScaleY();
+    SkMatrix mat = *d.fMatrix;
+    mat.preTranslate(-translateX, -translateY);
+    SkASSERT(SkScalarAbs(mat.getTranslateX()) <= 1.0);
+    return std::make_tuple(mat, SkVector::Make(translateX, translateY));
+}
+
+// If the paint will definitely draw opaquely, replace kSrc_Mode with
+// kSrcOver_Mode.  http://crbug.com/473572
+static void replace_srcmode_on_opaque_paint(SkPaint* paint) {
+    if (kSrcOver_SkXfermodeInterpretation
+        == SkInterpretXfermode(*paint, false)) {
+        paint->setXfermode(nullptr);
+    }
+}
+
 static void emit_pdf_color(SkColor color, SkWStream* result) {
     SkASSERT(SkColorGetA(color) == 0xFF);  // We handle alpha elsewhere.
-    SkScalar colorMax = SkIntToScalar(0xFF);
-    SkPDFScalar::Append(
-            SkScalarDiv(SkIntToScalar(SkColorGetR(color)), colorMax), result);
+    SkScalar colorScale = SkScalarInvert(0xFF);
+    SkPDFUtils::AppendScalar(SkColorGetR(color) * colorScale, result);
     result->writeText(" ");
-    SkPDFScalar::Append(
-            SkScalarDiv(SkIntToScalar(SkColorGetG(color)), colorMax), result);
+    SkPDFUtils::AppendScalar(SkColorGetG(color) * colorScale, result);
     result->writeText(" ");
-    SkPDFScalar::Append(
-            SkScalarDiv(SkIntToScalar(SkColorGetB(color)), colorMax), result);
+    SkPDFUtils::AppendScalar(SkColorGetB(color) * colorScale, result);
     result->writeText(" ");
 }
 
@@ -97,7 +107,7 @@ static void align_text(SkDrawCacheProc glyphCacheProc, const SkPaint& paint,
 
     SkMatrix ident;
     ident.reset();
-    SkAutoGlyphCache autoCache(paint, NULL, &ident);
+    SkAutoGlyphCache autoCache(paint, nullptr, &ident);
     SkGlyphCache* cache = autoCache.getCache();
 
     const char* start = reinterpret_cast<const char*>(glyphs);
@@ -134,10 +144,10 @@ typedef SkAutoSTMalloc<128, uint16_t> SkGlyphStorage;
 
 static int force_glyph_encoding(const SkPaint& paint, const void* text,
                                 size_t len, SkGlyphStorage* storage,
-                                uint16_t** glyphIDs) {
+                                const uint16_t** glyphIDs) {
     // Make sure we have a glyph id encoding.
     if (paint.getTextEncoding() != SkPaint::kGlyphID_TextEncoding) {
-        int numGlyphs = paint.textToGlyphs(text, len, NULL);
+        int numGlyphs = paint.textToGlyphs(text, len, nullptr);
         storage->reset(numGlyphs);
         paint.textToGlyphs(text, len, storage->get());
         *glyphIDs = storage->get();
@@ -147,8 +157,7 @@ static int force_glyph_encoding(const SkPaint& paint, const void* text,
     // For user supplied glyph ids we need to validate them.
     SkASSERT((len & 1) == 0);
     int numGlyphs = SkToInt(len / 2);
-    const uint16_t* input =
-        reinterpret_cast<uint16_t*>(const_cast<void*>((text)));
+    const uint16_t* input = static_cast<const uint16_t*>(text);
 
     int maxGlyphID = max_glyphid_for_typeface(paint.getTypeface());
     int validated;
@@ -158,7 +167,7 @@ static int force_glyph_encoding(const SkPaint& paint, const void* text,
         }
     }
     if (validated >= numGlyphs) {
-        *glyphIDs = reinterpret_cast<uint16_t*>(const_cast<void*>((text)));
+        *glyphIDs = static_cast<const uint16_t*>(text);
         return numGlyphs;
     }
 
@@ -183,11 +192,11 @@ static void set_text_transform(SkScalar x, SkScalar y, SkScalar textSkewX,
     // Flip the text about the x-axis to account for origin swap and include
     // the passed parameters.
     content->writeText("1 0 ");
-    SkPDFScalar::Append(0 - textSkewX, content);
+    SkPDFUtils::AppendScalar(0 - textSkewX, content);
     content->writeText(" -1 ");
-    SkPDFScalar::Append(x, content);
+    SkPDFUtils::AppendScalar(x, content);
     content->writeText(" ");
-    SkPDFScalar::Append(y, content);
+    SkPDFUtils::AppendScalar(y, content);
     content->writeText(" Tm\n");
 }
 
@@ -216,10 +225,10 @@ struct GraphicStateEntry {
     int fGraphicStateIndex;
 
     // We may change the font (i.e. for Type1 support) within a
-    // ContentEntry.  This is the one currently in effect, or NULL if none.
+    // ContentEntry.  This is the one currently in effect, or nullptr if none.
     SkPDFFont* fFont;
     // In PDF, text size has no default value. It is only valid if fFont is
-    // not NULL.
+    // not nullptr.
     SkScalar fTextSize;
 };
 
@@ -228,7 +237,7 @@ GraphicStateEntry::GraphicStateEntry() : fColor(SK_ColorBLACK),
                                          fTextFill(SkPaint::kFill_Style),
                                          fShaderIndex(-1),
                                          fGraphicStateIndex(-1),
-                                         fFont(NULL),
+                                         fFont(nullptr),
                                          fTextSize(SK_ScalarNaN) {
     fMatrix.reset();
 }
@@ -321,7 +330,7 @@ static void skip_clip_stack_prefix(const SkClipStack& prefix,
         }
     }
 
-    SkASSERT(prefixEntry == NULL);
+    SkASSERT(prefixEntry == nullptr);
 }
 
 static void emit_clip(SkPath* clipPath, SkRect* clipRect,
@@ -346,7 +355,6 @@ static void emit_clip(SkPath* clipPath, SkRect* clipRect,
     }
 }
 
-#ifdef SK_PDF_USE_PATHOPS
 /* Calculate an inverted path's equivalent non-inverted path, given the
  * canvas bounds.
  * outPath may alias with invPath (since this is supported by PathOps).
@@ -358,24 +366,20 @@ static bool calculate_inverse_path(const SkRect& bounds, const SkPath& invPath,
     SkPath clipPath;
     clipPath.addRect(bounds);
 
-    return Op(clipPath, invPath, kIntersect_PathOp, outPath);
+    return Op(clipPath, invPath, kIntersect_SkPathOp, outPath);
 }
 
+#ifdef SK_PDF_USE_PATHOPS_CLIPPING
 // Sanity check the numerical values of the SkRegion ops and PathOps ops
 // enums so region_op_to_pathops_op can do a straight passthrough cast.
 // If these are failing, it may be necessary to make region_op_to_pathops_op
 // do more.
-SK_COMPILE_ASSERT(SkRegion::kDifference_Op == (int)kDifference_PathOp,
-                  region_pathop_mismatch);
-SK_COMPILE_ASSERT(SkRegion::kIntersect_Op == (int)kIntersect_PathOp,
-                  region_pathop_mismatch);
-SK_COMPILE_ASSERT(SkRegion::kUnion_Op == (int)kUnion_PathOp,
-                  region_pathop_mismatch);
-SK_COMPILE_ASSERT(SkRegion::kXOR_Op == (int)kXOR_PathOp,
-                  region_pathop_mismatch);
-SK_COMPILE_ASSERT(SkRegion::kReverseDifference_Op ==
-                  (int)kReverseDifference_PathOp,
-                  region_pathop_mismatch);
+static_assert(SkRegion::kDifference_Op == (int)kDifference_SkPathOp, "region_pathop_mismatch");
+static_assert(SkRegion::kIntersect_Op == (int)kIntersect_SkPathOp, "region_pathop_mismatch");
+static_assert(SkRegion::kUnion_Op == (int)kUnion_SkPathOp, "region_pathop_mismatch");
+static_assert(SkRegion::kXOR_Op == (int)kXOR_SkPathOp, "region_pathop_mismatch");
+static_assert(SkRegion::kReverseDifference_Op == (int)kReverseDifference_SkPathOp,
+              "region_pathop_mismatch");
 
 static SkPathOp region_op_to_pathops_op(SkRegion::Op op) {
     SkASSERT(op >= 0);
@@ -458,10 +462,10 @@ void GraphicStackState::updateClip(const SkClipStack& clipStack,
     SkMatrix transform;
     transform.setTranslate(translation.fX, translation.fY);
 
-#ifdef SK_PDF_USE_PATHOPS
+#ifdef SK_PDF_USE_PATHOPS_CLIPPING
     SkPath clipPath;
     if (get_clip_stack_path(transform, clipStack, clipRegion, &clipPath)) {
-        emit_clip(&clipPath, NULL, fContentStream);
+        emit_clip(&clipPath, nullptr, fContentStream);
         return;
     }
 #endif
@@ -491,7 +495,7 @@ void GraphicStackState::updateClip(const SkClipStack& clipStack,
     if (needRegion) {
         SkPath clipPath;
         SkAssertResult(clipRegion.getBoundaryPath(&clipPath));
-        emit_clip(&clipPath, NULL, fContentStream);
+        emit_clip(&clipPath, nullptr, fContentStream);
     } else {
         skip_clip_stack_prefix(fEntries[0].fClipStack, clipStack, &iter);
         const SkClipStack::Element* clipEntry;
@@ -501,14 +505,14 @@ void GraphicStackState::updateClip(const SkClipStack& clipStack,
                 case SkClipStack::Element::kRect_Type: {
                     SkRect translatedClip;
                     transform.mapRect(&translatedClip, clipEntry->getRect());
-                    emit_clip(NULL, &translatedClip, fContentStream);
+                    emit_clip(nullptr, &translatedClip, fContentStream);
                     break;
                 }
                 default: {
                     SkPath translatedPath;
                     clipEntry->asPath(&translatedPath);
                     translatedPath.transform(transform, &translatedPath);
-                    emit_clip(&translatedPath, NULL, fContentStream);
+                    emit_clip(&translatedPath, nullptr, fContentStream);
                     break;
                 }
             }
@@ -566,16 +570,14 @@ void GraphicStackState::updateDrawingState(const GraphicStateEntry& state) {
         if (state.fTextScaleX != currentEntry()->fTextScaleX) {
             SkScalar pdfScale = SkScalarMul(state.fTextScaleX,
                                             SkIntToScalar(100));
-            SkPDFScalar::Append(pdfScale, fContentStream);
+            SkPDFUtils::AppendScalar(pdfScale, fContentStream);
             fContentStream->writeText(" Tz\n");
             currentEntry()->fTextScaleX = state.fTextScaleX;
         }
         if (state.fTextFill != currentEntry()->fTextFill) {
-            SK_COMPILE_ASSERT(SkPaint::kFill_Style == 0, enum_must_match_value);
-            SK_COMPILE_ASSERT(SkPaint::kStroke_Style == 1,
-                              enum_must_match_value);
-            SK_COMPILE_ASSERT(SkPaint::kStrokeAndFill_Style == 2,
-                              enum_must_match_value);
+            static_assert(SkPaint::kFill_Style == 0, "enum_must_match_value");
+            static_assert(SkPaint::kStroke_Style == 1, "enum_must_match_value");
+            static_assert(SkPaint::kStrokeAndFill_Style == 2, "enum_must_match_value");
             fContentStream->writeDecAsText(state.fTextFill);
             fContentStream->writeText(" Tr\n");
             currentEntry()->fTextFill = state.fTextFill;
@@ -583,11 +585,24 @@ void GraphicStackState::updateDrawingState(const GraphicStateEntry& state) {
     }
 }
 
-SkBaseDevice* SkPDFDevice::onCreateDevice(const SkImageInfo& info, Usage usage) {
-    SkMatrix initialTransform;
-    initialTransform.reset();
-    SkISize size = SkISize::Make(info.width(), info.height());
-    return SkNEW_ARGS(SkPDFDevice, (size, size, initialTransform));
+static bool not_supported_for_layers(const SkPaint& layerPaint) {
+    // PDF does not support image filters, so render them on CPU.
+    // Note that this rendering is done at "screen" resolution (100dpi), not
+    // printer resolution.
+    // TODO: It may be possible to express some filters natively using PDF
+    // to improve quality and file size (https://bug.skia.org/3043)
+
+    // TODO: should we return true if there is a colorfilter?
+    return layerPaint.getImageFilter() != nullptr;
+}
+
+SkBaseDevice* SkPDFDevice::onCreateDevice(const CreateInfo& cinfo, const SkPaint* layerPaint) {
+    if (cinfo.fForImageFilter ||
+        (layerPaint && not_supported_for_layers(*layerPaint))) {
+        return nullptr;
+    }
+    SkISize size = SkISize::Make(cinfo.fInfo.width(), cinfo.fInfo.height());
+    return SkPDFDevice::Create(size, fRasterDpi, fCanon);
 }
 
 
@@ -600,9 +615,9 @@ struct ContentEntry {
     // So we manually destruct the object.
     ~ContentEntry() {
         ContentEntry* val = fNext.detach();
-        while (val != NULL) {
+        while (val != nullptr) {
             ContentEntry* valNext = val->fNext.detach();
-            // When the destructor is called, fNext is NULL and exits.
+            // When the destructor is called, fNext is nullptr and exits.
             delete val;
             val = valNext;
         }
@@ -616,18 +631,18 @@ public:
     ScopedContentEntry(SkPDFDevice* device, const SkDraw& draw,
                        const SkPaint& paint, bool hasText = false)
         : fDevice(device),
-          fContentEntry(NULL),
+          fContentEntry(nullptr),
           fXfermode(SkXfermode::kSrcOver_Mode),
-          fDstFormXObject(NULL) {
+          fDstFormXObject(nullptr) {
         init(draw.fClipStack, *draw.fClip, *draw.fMatrix, paint, hasText);
     }
     ScopedContentEntry(SkPDFDevice* device, const SkClipStack* clipStack,
                        const SkRegion& clipRegion, const SkMatrix& matrix,
                        const SkPaint& paint, bool hasText = false)
         : fDevice(device),
-          fContentEntry(NULL),
+          fContentEntry(nullptr),
           fXfermode(SkXfermode::kSrcOver_Mode),
-          fDstFormXObject(NULL) {
+          fDstFormXObject(nullptr) {
         init(clipStack, clipRegion, matrix, paint, hasText);
     }
 
@@ -635,7 +650,7 @@ public:
         if (fContentEntry) {
             SkPath* shape = &fShape;
             if (shape->isEmpty()) {
-                shape = NULL;
+                shape = nullptr;
             }
             fDevice->finishContentEntry(fXfermode, fDstFormXObject, shape);
         }
@@ -703,78 +718,32 @@ private:
 
 ////////////////////////////////////////////////////////////////////////////////
 
-static inline SkImageInfo make_content_info(const SkISize& contentSize,
-                                            const SkMatrix* initialTransform) {
-    SkImageInfo info;
-    if (initialTransform) {
-        // Compute the size of the drawing area.
-        SkVector drawingSize;
-        SkMatrix inverse;
-        drawingSize.set(SkIntToScalar(contentSize.fWidth),
-                        SkIntToScalar(contentSize.fHeight));
-        if (!initialTransform->invert(&inverse)) {
-            // This shouldn't happen, initial transform should be invertible.
-            SkASSERT(false);
-            inverse.reset();
-        }
-        inverse.mapVectors(&drawingSize, 1);
-        SkISize size = SkSize::Make(drawingSize.fX, drawingSize.fY).toRound();
-        info = SkImageInfo::MakeUnknown(abs(size.fWidth), abs(size.fHeight));
+SkPDFDevice::SkPDFDevice(SkISize pageSize, SkScalar rasterDpi, SkPDFCanon* canon, bool flip)
+    : INHERITED(SkSurfaceProps(0, kUnknown_SkPixelGeometry))
+    , fPageSize(pageSize)
+    , fContentSize(pageSize)
+    , fExistingClipRegion(SkIRect::MakeSize(pageSize))
+    , fLastContentEntry(nullptr)
+    , fLastMarginContentEntry(nullptr)
+    , fDrawingArea(kContent_DrawingArea)
+    , fClipStack(nullptr)
+    , fFontGlyphUsage(new SkPDFGlyphSetMap)
+    , fRasterDpi(rasterDpi)
+    , fCanon(canon) {
+    SkASSERT(pageSize.width() > 0);
+    SkASSERT(pageSize.height() > 0);
+    fLegacyBitmap.setInfo(
+            SkImageInfo::MakeUnknown(pageSize.width(), pageSize.height()));
+    if (flip) {
+        // Skia generally uses the top left as the origin but PDF
+        // natively has the origin at the bottom left. This matrix
+        // corrects for that.  But that only needs to be done once, we
+        // don't do it when layering.
+        fInitialTransform.setTranslate(0, SkIntToScalar(pageSize.fHeight));
+        fInitialTransform.preScale(SK_Scalar1, -SK_Scalar1);
     } else {
-        info = SkImageInfo::MakeUnknown(abs(contentSize.fWidth),
-                                        abs(contentSize.fHeight));
+        fInitialTransform.setIdentity();
     }
-    return info;
-}
-
-// TODO(vandebo) change pageSize to SkSize.
-SkPDFDevice::SkPDFDevice(const SkISize& pageSize, const SkISize& contentSize,
-                         const SkMatrix& initialTransform)
-    : fPageSize(pageSize)
-    , fContentSize(contentSize)
-    , fLastContentEntry(NULL)
-    , fLastMarginContentEntry(NULL)
-    , fClipStack(NULL)
-    , fEncoder(NULL)
-    , fRasterDpi(72.0f)
-{
-    const SkImageInfo info = make_content_info(contentSize, &initialTransform);
-
-    // Just report that PDF does not supports perspective in the
-    // initial transform.
-    NOT_IMPLEMENTED(initialTransform.hasPerspective(), true);
-
-    // Skia generally uses the top left as the origin but PDF natively has the
-    // origin at the bottom left. This matrix corrects for that.  But that only
-    // needs to be done once, we don't do it when layering.
-    fInitialTransform.setTranslate(0, SkIntToScalar(pageSize.fHeight));
-    fInitialTransform.preScale(SK_Scalar1, -SK_Scalar1);
-    fInitialTransform.preConcat(initialTransform);
-    fLegacyBitmap.setInfo(info);
-
-    SkIRect existingClip = SkIRect::MakeWH(info.width(), info.height());
-    fExistingClipRegion.setRect(existingClip);
-    this->init();
-}
-
-// TODO(vandebo) change layerSize to SkSize.
-SkPDFDevice::SkPDFDevice(const SkISize& layerSize,
-                         const SkClipStack& existingClipStack,
-                         const SkRegion& existingClipRegion)
-    : fPageSize(layerSize)
-    , fContentSize(layerSize)
-    , fExistingClipStack(existingClipStack)
-    , fExistingClipRegion(existingClipRegion)
-    , fLastContentEntry(NULL)
-    , fLastMarginContentEntry(NULL)
-    , fClipStack(NULL)
-    , fEncoder(NULL)
-    , fRasterDpi(72.0f)
-{
-    fInitialTransform.reset();
-    fLegacyBitmap.setInfo(make_content_info(layerSize, NULL));
-
-    this->init();
 }
 
 SkPDFDevice::~SkPDFDevice() {
@@ -782,15 +751,13 @@ SkPDFDevice::~SkPDFDevice() {
 }
 
 void SkPDFDevice::init() {
-    fAnnotations = NULL;
-    fResourceDict = NULL;
     fContentEntries.free();
-    fLastContentEntry = NULL;
+    fLastContentEntry = nullptr;
     fMarginContentEntries.free();
-    fLastMarginContentEntry = NULL;
+    fLastMarginContentEntry = nullptr;
     fDrawingArea = kContent_DrawingArea;
-    if (fFontGlyphUsage.get() == NULL) {
-        fFontGlyphUsage.reset(new SkPDFGlyphSetMap());
+    if (fFontGlyphUsage.get() == nullptr) {
+        fFontGlyphUsage.reset(new SkPDFGlyphSetMap);
     }
 }
 
@@ -799,8 +766,8 @@ void SkPDFDevice::cleanUp(bool clearFontUsage) {
     fXObjectResources.unrefAll();
     fFontResources.unrefAll();
     fShaderResources.unrefAll();
-    SkSafeUnref(fAnnotations);
-    SkSafeUnref(fResourceDict);
+    fLinkToURLs.deleteAll();
+    fLinkToDestinations.deleteAll();
     fNamedDestinations.deleteAll();
 
     if (clearFontUsage) {
@@ -808,22 +775,10 @@ void SkPDFDevice::cleanUp(bool clearFontUsage) {
     }
 }
 
-void SkPDFDevice::clear(SkColor color) {
-    this->cleanUp(true);
-    this->init();
-
-    SkPaint paint;
-    paint.setColor(color);
-    paint.setStyle(SkPaint::kFill_Style);
-    SkMatrix identity;
-    identity.reset();
-    ScopedContentEntry content(this, &fExistingClipStack, fExistingClipRegion,
-                               identity, paint);
-    internalDrawPaint(paint, content.entry());
-}
-
 void SkPDFDevice::drawPaint(const SkDraw& d, const SkPaint& paint) {
     SkPaint newPaint = paint;
+    replace_srcmode_on_opaque_paint(&newPaint);
+
     newPaint.setStyle(SkPaint::kFill_Style);
     ScopedContentEntry content(this, d, newPaint);
     internalDrawPaint(newPaint, content.entry());
@@ -847,15 +802,32 @@ void SkPDFDevice::internalDrawPaint(const SkPaint& paint,
                           &contentEntry->fContent);
 }
 
-void SkPDFDevice::drawPoints(const SkDraw& d, SkCanvas::PointMode mode,
-                             size_t count, const SkPoint* points,
-                             const SkPaint& passedPaint) {
+void SkPDFDevice::drawPoints(const SkDraw& d,
+                             SkCanvas::PointMode mode,
+                             size_t count,
+                             const SkPoint* points,
+                             const SkPaint& srcPaint) {
+    SkPaint passedPaint = srcPaint;
+    replace_srcmode_on_opaque_paint(&passedPaint);
+
     if (count == 0) {
         return;
     }
 
-    if (handlePointAnnotation(points, count, *d.fMatrix, passedPaint)) {
-        return;
+    if (SkAnnotation* annotation = passedPaint.getAnnotation()) {
+        if (handlePointAnnotation(points, count, *d.fMatrix, annotation)) {
+            return;
+        }
+    }
+    if (excessive_translation(*d.fMatrix)) {
+        SkVector translate; SkMatrix translateMatrix;
+        std::tie(translateMatrix, translate) = untranslate(d);
+        SkDraw drawCopy(d);
+        drawCopy.fMatrix = &translateMatrix;
+        SkTArray<SkPoint> pointsCopy(points, SkToInt(count));
+        SkPoint::Offset(&pointsCopy[0], SkToInt(count), translate);
+        this->drawPoints(drawCopy, mode, count, &pointsCopy[0], srcPaint);
+        return;  // NOTE: shader behavior will be off.
     }
 
     // SkDraw::drawPoints converts to multiple calls to fDevice->drawPath.
@@ -934,23 +906,84 @@ void SkPDFDevice::drawPoints(const SkDraw& d, SkCanvas::PointMode mode,
     }
 }
 
-void SkPDFDevice::drawRect(const SkDraw& d, const SkRect& rect,
-                           const SkPaint& paint) {
+static SkPDFDict* create_link_annotation(const SkRect& translatedRect) {
+    SkAutoTUnref<SkPDFDict> annotation(new SkPDFDict("Annot"));
+    annotation->insertName("Subtype", "Link");
+
+    SkAutoTUnref<SkPDFArray> border(new SkPDFArray);
+    border->reserve(3);
+    border->appendInt(0);  // Horizontal corner radius.
+    border->appendInt(0);  // Vertical corner radius.
+    border->appendInt(0);  // Width, 0 = no border.
+    annotation->insertObject("Border", border.detach());
+
+    SkAutoTUnref<SkPDFArray> rect(new SkPDFArray);
+    rect->reserve(4);
+    rect->appendScalar(translatedRect.fLeft);
+    rect->appendScalar(translatedRect.fTop);
+    rect->appendScalar(translatedRect.fRight);
+    rect->appendScalar(translatedRect.fBottom);
+    annotation->insertObject("Rect", rect.detach());
+
+    return annotation.detach();
+}
+
+static SkPDFDict* create_link_to_url(const SkData* urlData, const SkRect& r) {
+    SkAutoTUnref<SkPDFDict> annotation(create_link_annotation(r));
+
+    SkString url(static_cast<const char *>(urlData->data()),
+                 urlData->size() - 1);
+    SkAutoTUnref<SkPDFDict> action(new SkPDFDict("Action"));
+    action->insertName("S", "URI");
+    action->insertString("URI", url);
+    annotation->insertObject("A", action.detach());
+    return annotation.detach();
+}
+
+static SkPDFDict* create_link_named_dest(const SkData* nameData,
+                                         const SkRect& r) {
+    SkAutoTUnref<SkPDFDict> annotation(create_link_annotation(r));
+    SkString name(static_cast<const char *>(nameData->data()),
+                  nameData->size() - 1);
+    annotation->insertName("Dest", name);
+    return annotation.detach();
+}
+
+void SkPDFDevice::drawRect(const SkDraw& d,
+                           const SkRect& rect,
+                           const SkPaint& srcPaint) {
+    SkPaint paint = srcPaint;
+    replace_srcmode_on_opaque_paint(&paint);
     SkRect r = rect;
     r.sort();
 
+    if (excessive_translation(*d.fMatrix)) {
+        SkVector translate; SkMatrix translateMatrix;
+        std::tie(translateMatrix, translate) = untranslate(d);
+        SkDraw drawCopy(d);
+        drawCopy.fMatrix = &translateMatrix;
+        SkRect rectCopy = rect;
+        rectCopy.offset(translate.x(), translate.y());
+        this->drawRect(drawCopy, rectCopy, srcPaint);
+        return;  // NOTE: shader behavior will be off.
+    }
+
     if (paint.getPathEffect()) {
         if (d.fClip->isEmpty()) {
             return;
         }
         SkPath path;
         path.addRect(r);
-        drawPath(d, path, paint, NULL, true);
+        drawPath(d, path, paint, nullptr, true);
         return;
     }
 
-    if (handleRectAnnotation(r, *d.fMatrix, paint)) {
-        return;
+    if (SkAnnotation* annotation = paint.getAnnotation()) {
+        SkPath path;
+        path.addRect(rect);
+        if (handlePathAnnotation(path, d, annotation)) {
+            return;
+        }
     }
 
     ScopedContentEntry content(this, d, paint);
@@ -962,21 +995,44 @@ void SkPDFDevice::drawRect(const SkDraw& d, const SkRect& rect,
                           &content.entry()->fContent);
 }
 
-void SkPDFDevice::drawRRect(const SkDraw& draw, const SkRRect& rrect, const SkPaint& paint) {
+void SkPDFDevice::drawRRect(const SkDraw& draw,
+                            const SkRRect& rrect,
+                            const SkPaint& srcPaint) {
+    SkPaint paint = srcPaint;
+    replace_srcmode_on_opaque_paint(&paint);
     SkPath  path;
     path.addRRect(rrect);
-    this->drawPath(draw, path, paint, NULL, true);
+    this->drawPath(draw, path, paint, nullptr, true);
 }
 
-void SkPDFDevice::drawOval(const SkDraw& draw, const SkRect& oval, const SkPaint& paint) {
+void SkPDFDevice::drawOval(const SkDraw& draw,
+                           const SkRect& oval,
+                           const SkPaint& srcPaint) {
+    SkPaint paint = srcPaint;
+    replace_srcmode_on_opaque_paint(&paint);
     SkPath  path;
     path.addOval(oval);
-    this->drawPath(draw, path, paint, NULL, true);
+    this->drawPath(draw, path, paint, nullptr, true);
 }
 
-void SkPDFDevice::drawPath(const SkDraw& d, const SkPath& origPath,
-                           const SkPaint& paint, const SkMatrix* prePathMatrix,
+void SkPDFDevice::drawPath(const SkDraw& d,
+                           const SkPath& origPath,
+                           const SkPaint& srcPaint,
+                           const SkMatrix* prePathMatrix,
                            bool pathIsMutable) {
+    if (excessive_translation(*d.fMatrix)) {
+        SkVector translate; SkMatrix translateMatrix;
+        std::tie(translateMatrix, translate) = untranslate(d);
+        SkDraw drawCopy(d);
+        drawCopy.fMatrix = &translateMatrix;
+        SkPath pathCopy(origPath);
+        pathCopy.offset(translate.x(), translate.y());
+        this->drawPath(drawCopy, pathCopy, srcPaint, prePathMatrix, true);
+        return;  // NOTE: shader behavior will be off.
+    }
+
+    SkPaint paint = srcPaint;
+    replace_srcmode_on_opaque_paint(&paint);
     SkPath modifiedPath;
     SkPath* pathPtr = const_cast<SkPath*>(&origPath);
 
@@ -1004,63 +1060,159 @@ void SkPDFDevice::drawPath(const SkDraw& d, const SkPath& origPath,
         bool fill = paint.getFillPath(origPath, pathPtr);
 
         SkPaint noEffectPaint(paint);
-        noEffectPaint.setPathEffect(NULL);
+        noEffectPaint.setPathEffect(nullptr);
         if (fill) {
             noEffectPaint.setStyle(SkPaint::kFill_Style);
         } else {
             noEffectPaint.setStyle(SkPaint::kStroke_Style);
             noEffectPaint.setStrokeWidth(0);
         }
-        drawPath(d, *pathPtr, noEffectPaint, NULL, true);
+        drawPath(d, *pathPtr, noEffectPaint, nullptr, true);
         return;
     }
 
-#ifdef SK_PDF_USE_PATHOPS
     if (handleInversePath(d, origPath, paint, pathIsMutable, prePathMatrix)) {
         return;
     }
-#endif
 
-    if (handleRectAnnotation(pathPtr->getBounds(), matrix, paint)) {
-        return;
+    if (SkAnnotation* annotation = paint.getAnnotation()) {
+        if (handlePathAnnotation(*pathPtr, d, annotation)) {
+            return;
+        }
     }
 
     ScopedContentEntry content(this, d.fClipStack, *d.fClip, matrix, paint);
     if (!content.entry()) {
         return;
     }
+    bool consumeDegeratePathSegments =
+           paint.getStyle() == SkPaint::kFill_Style ||
+           (paint.getStrokeCap() != SkPaint::kRound_Cap &&
+            paint.getStrokeCap() != SkPaint::kSquare_Cap);
     SkPDFUtils::EmitPath(*pathPtr, paint.getStyle(),
+                         consumeDegeratePathSegments,
                          &content.entry()->fContent);
     SkPDFUtils::PaintPath(paint.getStyle(), pathPtr->getFillType(),
                           &content.entry()->fContent);
 }
 
-void SkPDFDevice::drawBitmapRect(const SkDraw& draw, const SkBitmap& bitmap,
-                                 const SkRect* src, const SkRect& dst,
-                                 const SkPaint& paint,
-                                 SkCanvas::DrawBitmapRectFlags flags) {
-    // TODO: this code path must be updated to respect the flags parameter
-    SkMatrix    matrix;
-    SkRect      bitmapBounds, tmpSrc, tmpDst;
-    SkBitmap    tmpBitmap;
+void SkPDFDevice::drawBitmapRect(const SkDraw& draw,
+                                 const SkBitmap& bitmap,
+                                 const SkRect* src,
+                                 const SkRect& dst,
+                                 const SkPaint& srcPaint,
+                                 SkCanvas::SrcRectConstraint constraint) {
+    const SkImage* image = fCanon->bitmapToImage(bitmap);
+    if (!image) {
+        return;
+    }
+    // ownership of this image is retained by the canon.
+    this->drawImageRect(draw, image, src, dst, srcPaint, constraint);
+}
 
-    bitmapBounds.isetWH(bitmap.width(), bitmap.height());
+void SkPDFDevice::drawBitmap(const SkDraw& d,
+                             const SkBitmap& bitmap,
+                             const SkMatrix& matrix,
+                             const SkPaint& srcPaint) {
+    SkPaint paint = srcPaint;
+    if (bitmap.isOpaque()) {
+        replace_srcmode_on_opaque_paint(&paint);
+    }
+
+    if (d.fClip->isEmpty()) {
+        return;
+    }
+
+    SkMatrix transform = matrix;
+    transform.postConcat(*d.fMatrix);
+    const SkImage* image = fCanon->bitmapToImage(bitmap);
+    if (!image) {
+        return;
+    }
+    this->internalDrawImage(transform, d.fClipStack, *d.fClip, image, nullptr,
+                            paint);
+}
+
+void SkPDFDevice::drawSprite(const SkDraw& d,
+                             const SkBitmap& bitmap,
+                             int x,
+                             int y,
+                             const SkPaint& srcPaint) {
+    SkPaint paint = srcPaint;
+    if (bitmap.isOpaque()) {
+        replace_srcmode_on_opaque_paint(&paint);
+    }
+
+    if (d.fClip->isEmpty()) {
+        return;
+    }
+
+    SkMatrix matrix;
+    matrix.setTranslate(SkIntToScalar(x), SkIntToScalar(y));
+    const SkImage* image = fCanon->bitmapToImage(bitmap);
+    if (!image) {
+        return;
+    }
+    this->internalDrawImage(matrix, d.fClipStack, *d.fClip, image, nullptr,
+                            paint);
+}
+
+void SkPDFDevice::drawImage(const SkDraw& draw,
+                            const SkImage* image,
+                            SkScalar x,
+                            SkScalar y,
+                            const SkPaint& srcPaint) {
+    SkPaint paint = srcPaint;
+    if (!image) {
+        return;
+    }
+    if (image->isOpaque()) {
+        replace_srcmode_on_opaque_paint(&paint);
+    }
+    if (draw.fClip->isEmpty()) {
+        return;
+    }
+    SkMatrix transform = SkMatrix::MakeTrans(x, y);
+    transform.postConcat(*draw.fMatrix);
+    this->internalDrawImage(transform, draw.fClipStack, *draw.fClip, image,
+                            nullptr, paint);
+}
+
+void SkPDFDevice::drawImageRect(const SkDraw& draw,
+                                const SkImage* image,
+                                const SkRect* src,
+                                const SkRect& dst,
+                                const SkPaint& srcPaint,
+                                SkCanvas::SrcRectConstraint constraint) {
+    if (!image) {
+        return;
+    }
+    if (draw.fClip->isEmpty()) {
+        return;
+    }
+    SkPaint paint = srcPaint;
+    if (image->isOpaque()) {
+        replace_srcmode_on_opaque_paint(&paint);
+    }
+    // TODO: this code path must be updated to respect the flags parameter
+    SkMatrix matrix;
+    SkRect tmpSrc, tmpDst;
+    SkRect imageBounds = SkRect::Make(image->bounds());
 
     // Compute matrix from the two rectangles
     if (src) {
         tmpSrc = *src;
     } else {
-        tmpSrc = bitmapBounds;
+        tmpSrc = imageBounds;
     }
     matrix.setRectToRect(tmpSrc, dst, SkMatrix::kFill_ScaleToFit);
 
-    const SkBitmap* bitmapPtr = &bitmap;
-
     // clip the tmpSrc to the bounds of the bitmap, and recompute dstRect if
     // needed (if the src was clipped). No check needed if src==null.
+    SkAutoTUnref<const SkImage> autoImageUnref;
     if (src) {
-        if (!bitmapBounds.contains(*src)) {
-            if (!tmpSrc.intersect(bitmapBounds)) {
+        if (!imageBounds.contains(*src)) {
+            if (!tmpSrc.intersect(imageBounds)) {
                 return; // nothing to draw
             }
             // recompute dst, based on the smaller tmpSrc
@@ -1069,14 +1221,14 @@ void SkPDFDevice::drawBitmapRect(const SkDraw& draw, const SkBitmap& bitmap,
 
         // since we may need to clamp to the borders of the src rect within
         // the bitmap, we extract a subset.
-        // TODO: make sure this is handled in drawBitmap and remove from here.
         SkIRect srcIR;
         tmpSrc.roundOut(&srcIR);
-        if (!bitmap.extractSubset(&tmpBitmap, srcIR)) {
+
+        autoImageUnref.reset(image->newSubset(srcIR));
+        if (!autoImageUnref) {
             return;
         }
-        bitmapPtr = &tmpBitmap;
-
+        image = autoImageUnref;
         // Since we did an extract, we need to adjust the matrix accordingly
         SkScalar dx = 0, dy = 0;
         if (srcIR.fLeft > 0) {
@@ -1089,37 +1241,112 @@ void SkPDFDevice::drawBitmapRect(const SkDraw& draw, const SkBitmap& bitmap,
             matrix.preTranslate(dx, dy);
         }
     }
-    this->drawBitmap(draw, *bitmapPtr, matrix, paint);
+    matrix.postConcat(*draw.fMatrix);
+    this->internalDrawImage(matrix, draw.fClipStack, *draw.fClip, image,
+                            nullptr, paint);
 }
 
-void SkPDFDevice::drawBitmap(const SkDraw& d, const SkBitmap& bitmap,
-                             const SkMatrix& matrix, const SkPaint& paint) {
-    if (d.fClip->isEmpty()) {
-        return;
+//  Create a PDF string. Maximum length (in bytes) is 65,535.
+//  @param input     A string value.
+//  @param len       The length of the input array.
+//  @param wideChars True iff the upper byte in each uint16_t is
+//                   significant and should be encoded and not
+//                   discarded.  If true, the upper byte is encoded
+//                   first.  Otherwise, we assert the upper byte is
+//                   zero.
+static SkString format_wide_string(const uint16_t* input,
+                                   size_t len,
+                                   bool wideChars) {
+    if (wideChars) {
+        SkASSERT(2 * len < 65535);
+        static const char gHex[] = "0123456789ABCDEF";
+        SkString result(4 * len + 2);
+        result[0] = '<';
+        for (size_t i = 0; i < len; i++) {
+            result[4 * i + 1] = gHex[(input[i] >> 12) & 0xF];
+            result[4 * i + 2] = gHex[(input[i] >>  8) & 0xF];
+            result[4 * i + 3] = gHex[(input[i] >>  4) & 0xF];
+            result[4 * i + 4] = gHex[(input[i]      ) & 0xF];
+        }
+        result[4 * len + 1] = '>';
+        return result;
+    } else {
+        SkASSERT(len <= 65535);
+        SkString tmp(len);
+        for (size_t i = 0; i < len; i++) {
+            SkASSERT(0 == input[i] >> 8);
+            tmp[i] = static_cast<uint8_t>(input[i]);
+        }
+        return SkPDFUtils::FormatString(tmp.c_str(), tmp.size());
     }
-
-    SkMatrix transform = matrix;
-    transform.postConcat(*d.fMatrix);
-    this->internalDrawBitmap(transform, d.fClipStack, *d.fClip, bitmap, NULL,
-                             paint);
 }
 
-void SkPDFDevice::drawSprite(const SkDraw& d, const SkBitmap& bitmap,
-                             int x, int y, const SkPaint& paint) {
-    if (d.fClip->isEmpty()) {
-        return;
+static void draw_transparent_text(SkPDFDevice* device,
+                                  const SkDraw& d,
+                                  const void* text, size_t len,
+                                  SkScalar x, SkScalar y,
+                                  const SkPaint& srcPaint) {
+
+    SkPaint transparent;
+    if (!SkPDFFont::CanEmbedTypeface(transparent.getTypeface(),
+                                     device->getCanon())) {
+        SkDEBUGFAIL("default typeface should be embeddable");
+        return;  // Avoid infinite loop in release.
+    }
+    transparent.setTextSize(srcPaint.getTextSize());
+    transparent.setColor(SK_ColorTRANSPARENT);
+    switch (srcPaint.getTextEncoding()) {
+        case SkPaint::kGlyphID_TextEncoding: {
+            // Since a glyphId<->Unicode mapping is typeface-specific,
+            // map back to Unicode first.
+            size_t glyphCount = len / 2;
+            SkAutoTMalloc<SkUnichar> unichars(glyphCount);
+            srcPaint.glyphsToUnichars(
+                    (const uint16_t*)text, SkToInt(glyphCount), &unichars[0]);
+            transparent.setTextEncoding(SkPaint::kUTF32_TextEncoding);
+            device->drawText(d, &unichars[0],
+                             glyphCount * sizeof(SkUnichar),
+                             x, y, transparent);
+            break;
+        }
+        case SkPaint::kUTF8_TextEncoding:
+        case SkPaint::kUTF16_TextEncoding:
+        case SkPaint::kUTF32_TextEncoding:
+            transparent.setTextEncoding(srcPaint.getTextEncoding());
+            device->drawText(d, text, len, x, y, transparent);
+            break;
+        default:
+            SkFAIL("unknown text encoding");
     }
-
-    SkMatrix matrix;
-    matrix.setTranslate(SkIntToScalar(x), SkIntToScalar(y));
-    this->internalDrawBitmap(matrix, d.fClipStack, *d.fClip, bitmap, NULL,
-                             paint);
 }
 
+
 void SkPDFDevice::drawText(const SkDraw& d, const void* text, size_t len,
-                           SkScalar x, SkScalar y, const SkPaint& paint) {
-    NOT_IMPLEMENTED(paint.getMaskFilter() != NULL, false);
-    if (paint.getMaskFilter() != NULL) {
+                           SkScalar x, SkScalar y, const SkPaint& srcPaint) {
+    if (excessive_translation(*d.fMatrix)) {
+        SkVector translate; SkMatrix translateMatrix;
+        std::tie(translateMatrix, translate) = untranslate(d);
+        SkDraw drawCopy(d);
+        drawCopy.fMatrix = &translateMatrix;
+        this->drawText(drawCopy, text, len, x + translate.x(),
+                       y + translate.y(), srcPaint);
+        return;  // NOTE: shader behavior will be off.
+    }
+
+    if (!SkPDFFont::CanEmbedTypeface(srcPaint.getTypeface(), fCanon)) {
+        // https://bug.skia.org/3866
+        SkPath path;
+        srcPaint.getTextPath(text, len, x, y, &path);
+        this->drawPath(d, path, srcPaint, &SkMatrix::I(), true);
+        // Draw text transparently to make it copyable/searchable/accessable.
+        draw_transparent_text(this, d, text, len, x, y, srcPaint);
+        return;
+    }
+    SkPaint paint = srcPaint;
+    replace_srcmode_on_opaque_paint(&paint);
+
+    NOT_IMPLEMENTED(paint.getMaskFilter() != nullptr, false);
+    if (paint.getMaskFilter() != nullptr) {
         // Don't pretend we support drawing MaskFilters, it makes for artifacts
         // making text unreadable (e.g. same text twice when using CSS shadows).
         return;
@@ -1131,7 +1358,7 @@ void SkPDFDevice::drawText(const SkDraw& d, const void* text, size_t len,
     }
 
     SkGlyphStorage storage(0);
-    uint16_t* glyphIDs = NULL;
+    const uint16_t* glyphIDs = nullptr;
     int numGlyphs = force_glyph_encoding(paint, text, len, &storage, &glyphIDs);
     textPaint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
 
@@ -1141,17 +1368,22 @@ void SkPDFDevice::drawText(const SkDraw& d, const void* text, size_t len,
     set_text_transform(x, y, textPaint.getTextSkewX(),
                        &content.entry()->fContent);
     int consumedGlyphCount = 0;
+
+    SkTDArray<uint16_t> glyphIDsCopy(glyphIDs, numGlyphs);
+
     while (numGlyphs > consumedGlyphCount) {
-        updateFont(textPaint, glyphIDs[consumedGlyphCount], content.entry());
+        this->updateFont(textPaint, glyphIDs[consumedGlyphCount], content.entry());
         SkPDFFont* font = content.entry()->fState.fFont;
-        int availableGlyphs =
-            font->glyphsToPDFFontEncoding(glyphIDs + consumedGlyphCount,
-                                          numGlyphs - consumedGlyphCount);
-        fFontGlyphUsage->noteGlyphUsage(font, glyphIDs + consumedGlyphCount,
-                                        availableGlyphs);
+
+        int availableGlyphs = font->glyphsToPDFFontEncoding(
+                glyphIDsCopy.begin() + consumedGlyphCount,
+                numGlyphs - consumedGlyphCount);
+        fFontGlyphUsage->noteGlyphUsage(
+                font,  glyphIDsCopy.begin() + consumedGlyphCount,
+                availableGlyphs);
         SkString encodedString =
-            SkPDFString::FormatString(glyphIDs + consumedGlyphCount,
-                                      availableGlyphs, font->multiByteGlyphs());
+                format_wide_string(glyphIDsCopy.begin() + consumedGlyphCount,
+                                   availableGlyphs, font->multiByteGlyphs());
         content.entry()->fContent.writeText(encodedString.c_str());
         consumedGlyphCount += availableGlyphs;
         content.entry()->fContent.writeText(" Tj\n");
@@ -1160,10 +1392,48 @@ void SkPDFDevice::drawText(const SkDraw& d, const void* text, size_t len,
 }
 
 void SkPDFDevice::drawPosText(const SkDraw& d, const void* text, size_t len,
-                              const SkScalar pos[], SkScalar constY,
-                              int scalarsPerPos, const SkPaint& paint) {
-    NOT_IMPLEMENTED(paint.getMaskFilter() != NULL, false);
-    if (paint.getMaskFilter() != NULL) {
+                              const SkScalar pos[], int scalarsPerPos,
+                              const SkPoint& offset, const SkPaint& srcPaint) {
+    if (excessive_translation(*d.fMatrix)) {
+        SkVector translate; SkMatrix translateMatrix;
+        std::tie(translateMatrix, translate) = untranslate(d);
+        SkDraw drawCopy(d);
+        drawCopy.fMatrix = &translateMatrix;
+        SkPoint offsetCopy = offset;
+        SkPoint::Offset(&offsetCopy, 1, translate.x(), translate.y());
+        this->drawPosText(drawCopy, text, len, pos, scalarsPerPos, offsetCopy,
+                          srcPaint);
+        return;  // NOTE: shader behavior will be off.
+    }
+
+    if (!SkPDFFont::CanEmbedTypeface(srcPaint.getTypeface(), fCanon)) {
+        const SkPoint* positions = reinterpret_cast<const SkPoint*>(pos);
+        SkAutoTMalloc<SkPoint> positionsBuffer;
+        if (2 != scalarsPerPos) {
+            int glyphCount = srcPaint.textToGlyphs(text, len, NULL);
+            positionsBuffer.reset(glyphCount);
+            for (int  i = 0; i < glyphCount; ++i) {
+                positionsBuffer[i].set(pos[i], 0.0f);
+            }
+            positions = &positionsBuffer[0];
+        }
+        SkPath path;
+        srcPaint.getPosTextPath(text, len, positions, &path);
+        SkMatrix matrix;
+        matrix.setTranslate(offset);
+        this->drawPath(d, path, srcPaint, &matrix, true);
+        // Draw text transparently to make it copyable/searchable/accessable.
+        draw_transparent_text(
+                this, d, text, len, offset.x() + positions[0].x(),
+                offset.y() + positions[0].y(), srcPaint);
+        return;
+    }
+
+    SkPaint paint = srcPaint;
+    replace_srcmode_on_opaque_paint(&paint);
+
+    NOT_IMPLEMENTED(paint.getMaskFilter() != nullptr, false);
+    if (paint.getMaskFilter() != nullptr) {
         // Don't pretend we support drawing MaskFilters, it makes for artifacts
         // making text unreadable (e.g. same text twice when using CSS shadows).
         return;
@@ -1175,157 +1445,42 @@ void SkPDFDevice::drawPosText(const SkDraw& d, const void* text, size_t len,
         return;
     }
 
-#ifdef SK_BUILD_FOR_ANDROID
-    /*
-     * In the case that we have enabled fallback fonts on Android we need to
-     * take the following steps to ensure that the PDF draws all characters,
-     * regardless of their underlying font file, correctly.
-     *
-     * 1. Convert input into GlyphID encoding if it currently is not
-     * 2. Iterate over the glyphIDs and identify the actual typeface that each
-     *    glyph resolves to
-     * 3. Iterate over those typefaces and recursively call this function with
-     *    only the glyphs (and their positions) that the typeface is capable of
-     *    resolving.
-     */
-    if (paint.getPaintOptionsAndroid().isUsingFontFallbacks()) {
-        uint16_t* glyphIDs = NULL;
-        SkGlyphStorage tmpStorage(0);
-        size_t numGlyphs = 0;
-
-        // convert to glyphIDs
-        if (paint.getTextEncoding() == SkPaint::kGlyphID_TextEncoding) {
-            numGlyphs = len / 2;
-            glyphIDs = reinterpret_cast<uint16_t*>(const_cast<void*>(text));
-        } else {
-            numGlyphs = paint.textToGlyphs(text, len, NULL);
-            tmpStorage.reset(numGlyphs);
-            paint.textToGlyphs(text, len, tmpStorage.get());
-            glyphIDs = tmpStorage.get();
-        }
-
-        // if no typeface is provided in the paint get the default
-        SkAutoTUnref<SkTypeface> origFace(SkSafeRef(paint.getTypeface()));
-        if (NULL == origFace.get()) {
-            origFace.reset(SkTypeface::RefDefault());
-        }
-        const uint16_t origGlyphCount = origFace->countGlyphs();
-
-        // keep a list of the already visited typefaces and some data about them
-        SkTDArray<TypefaceFallbackData> visitedTypefaces;
-
-        // find all the typefaces needed to resolve this run of text
-        bool usesOriginalTypeface = false;
-        for (uint16_t x = 0; x < numGlyphs; ++x) {
-            // optimization that checks to see if original typeface can resolve
-            // the glyph
-            if (glyphIDs[x] < origGlyphCount) {
-                usesOriginalTypeface = true;
-                continue;
-            }
-
-            // find the fallback typeface that supports this glyph
-            TypefaceFallbackData data;
-            data.typeface =
-                    SkGetTypefaceForGlyphID(glyphIDs[x], origFace.get(),
-                                            paint.getPaintOptionsAndroid(),
-                                            &data.lowerBounds,
-                                            &data.upperBounds);
-            // add the typeface and its data if we don't have it
-            if (data.typeface && !visitedTypefaces.contains(data)) {
-                visitedTypefaces.push(data);
-            }
-        }
-
-        // if the original font was used then add it to the list as well
-        if (usesOriginalTypeface) {
-            TypefaceFallbackData* data = visitedTypefaces.push();
-            data->typeface = origFace.get();
-            data->lowerBounds = 0;
-            data->upperBounds = origGlyphCount;
-        }
-
-        // keep a scratch glyph and pos storage
-        SkAutoTMalloc<SkScalar> posStorage(len * scalarsPerPos);
-        SkScalar* tmpPos = posStorage.get();
-        SkGlyphStorage glyphStorage(numGlyphs);
-        uint16_t* tmpGlyphIDs = glyphStorage.get();
-
-        // loop through all the valid typefaces, trim the glyphs to only those
-        // resolved by the typeface, and then draw that run of glyphs
-        for (int x = 0; x < visitedTypefaces.count(); ++x) {
-            const TypefaceFallbackData& data = visitedTypefaces[x];
-
-            int tmpGlyphCount = 0;
-            for (uint16_t y = 0; y < numGlyphs; ++y) {
-                if (glyphIDs[y] >= data.lowerBounds &&
-                        glyphIDs[y] < data.upperBounds) {
-                    tmpGlyphIDs[tmpGlyphCount] = glyphIDs[y] - data.lowerBounds;
-                    memcpy(&(tmpPos[tmpGlyphCount * scalarsPerPos]),
-                           &(pos[y * scalarsPerPos]),
-                           scalarsPerPos * sizeof(SkScalar));
-                    tmpGlyphCount++;
-                }
-            }
-
-            // recursively call this function with the right typeface
-            SkPaint tmpPaint = paint;
-            tmpPaint.setTypeface(data.typeface);
-            tmpPaint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
-
-            // turn off fallback chaining
-            SkPaintOptionsAndroid paintOpts = tmpPaint.getPaintOptionsAndroid();
-            paintOpts.setUseFontFallbacks(false);
-            tmpPaint.setPaintOptionsAndroid(paintOpts);
-
-            this->drawPosText(d, tmpGlyphIDs, tmpGlyphCount * 2, tmpPos, constY,
-                              scalarsPerPos, tmpPaint);
-        }
-        return;
-    }
-#endif
-
     SkGlyphStorage storage(0);
-    uint16_t* glyphIDs = NULL;
-    size_t numGlyphs = force_glyph_encoding(paint, text, len, &storage,
-                                            &glyphIDs);
+    const uint16_t* glyphIDs = nullptr;
+    size_t numGlyphs = force_glyph_encoding(paint, text, len, &storage, &glyphIDs);
     textPaint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
 
     SkDrawCacheProc glyphCacheProc = textPaint.getDrawCacheProc();
     content.entry()->fContent.writeText("BT\n");
-    updateFont(textPaint, glyphIDs[0], content.entry());
+    this->updateFont(textPaint, glyphIDs[0], content.entry());
     for (size_t i = 0; i < numGlyphs; i++) {
         SkPDFFont* font = content.entry()->fState.fFont;
         uint16_t encodedValue = glyphIDs[i];
         if (font->glyphsToPDFFontEncoding(&encodedValue, 1) != 1) {
-            updateFont(textPaint, glyphIDs[i], content.entry());
-            i--;
-            continue;
+            // The current pdf font cannot encode the current glyph.
+            // Try to get a pdf font which can encode the current glyph.
+            this->updateFont(textPaint, glyphIDs[i], content.entry());
+            font = content.entry()->fState.fFont;
+            if (font->glyphsToPDFFontEncoding(&encodedValue, 1) != 1) {
+                SkDEBUGFAIL("PDF could not encode glyph.");
+                continue;
+            }
         }
+
         fFontGlyphUsage->noteGlyphUsage(font, &encodedValue, 1);
-        SkScalar x = pos[i * scalarsPerPos];
-        SkScalar y = scalarsPerPos == 1 ? constY : pos[i * scalarsPerPos + 1];
+        SkScalar x = offset.x() + pos[i * scalarsPerPos];
+        SkScalar y = offset.y() + (2 == scalarsPerPos ? pos[i * scalarsPerPos + 1] : 0);
+
         align_text(glyphCacheProc, textPaint, glyphIDs + i, 1, &x, &y);
-        set_text_transform(x, y, textPaint.getTextSkewX(),
-                           &content.entry()->fContent);
+        set_text_transform(x, y, textPaint.getTextSkewX(), &content.entry()->fContent);
         SkString encodedString =
-            SkPDFString::FormatString(&encodedValue, 1,
-                                      font->multiByteGlyphs());
+                format_wide_string(&encodedValue, 1, font->multiByteGlyphs());
         content.entry()->fContent.writeText(encodedString.c_str());
         content.entry()->fContent.writeText(" Tj\n");
     }
     content.entry()->fContent.writeText("ET\n");
 }
 
-void SkPDFDevice::drawTextOnPath(const SkDraw& d, const void* text, size_t len,
-                                 const SkPath& path, const SkMatrix* matrix,
-                                 const SkPaint& paint) {
-    if (d.fClip->isEmpty()) {
-        return;
-    }
-    d.drawTextOnPath((const char*)text, len, path, matrix, paint);
-}
-
 void SkPDFDevice::drawVertices(const SkDraw& d, SkCanvas::VertexMode,
                                int vertexCount, const SkPoint verts[],
                                const SkPoint texs[], const SkColor colors[],
@@ -1337,10 +1492,42 @@ void SkPDFDevice::drawVertices(const SkDraw& d, SkCanvas::VertexMode,
     // TODO: implement drawVertices
 }
 
+struct RectWithData {
+    SkRect rect;
+    SkAutoTUnref<const SkData> data;
+
+    RectWithData(const SkRect& rect, const SkData* data)
+        : rect(rect), data(SkRef(data)) {}
+};
+
+struct NamedDestination {
+    SkAutoTUnref<const SkData> nameData;
+    SkPoint point;
+
+    NamedDestination(const SkData* nameData, const SkPoint& point)
+        : nameData(SkRef(nameData)), point(point) {}
+};
+
 void SkPDFDevice::drawDevice(const SkDraw& d, SkBaseDevice* device,
                              int x, int y, const SkPaint& paint) {
-    // our onCreateDevice() always creates SkPDFDevice subclasses.
+    // our onCreateCompatibleDevice() always creates SkPDFDevice subclasses.
     SkPDFDevice* pdfDevice = static_cast<SkPDFDevice*>(device);
+
+    SkScalar scalarX = SkIntToScalar(x);
+    SkScalar scalarY = SkIntToScalar(y);
+    for (RectWithData* link : pdfDevice->fLinkToURLs) {
+        fLinkToURLs.push(new RectWithData(
+                link->rect.makeOffset(scalarX, scalarY), link->data));
+    }
+    for (RectWithData* link : pdfDevice->fLinkToDestinations) {
+        fLinkToDestinations.push(new RectWithData(
+                link->rect.makeOffset(scalarX, scalarY), link->data));
+    }
+    for (NamedDestination* d : pdfDevice->fNamedDestinations) {
+        fNamedDestinations.push(new NamedDestination(
+                d->nameData, d->point + SkPoint::Make(scalarX, scalarY)));
+    }
+
     if (pdfDevice->isContentEmpty()) {
         return;
     }
@@ -1384,11 +1571,11 @@ void SkPDFDevice::onAttachToCanvas(SkCanvas* canvas) {
 void SkPDFDevice::onDetachFromCanvas() {
     INHERITED::onDetachFromCanvas();
 
-    fClipStack = NULL;
+    fClipStack = nullptr;
 }
 
-SkSurface* SkPDFDevice::newSurface(const SkImageInfo& info) {
-    return SkSurface::NewRaster(info);
+SkSurface* SkPDFDevice::newSurface(const SkImageInfo& info, const SkSurfaceProps& props) {
+    return SkSurface::NewRaster(info, &props);
 }
 
 ContentEntry* SkPDFDevice::getLastContentEntry() {
@@ -1421,44 +1608,17 @@ void SkPDFDevice::setDrawingArea(DrawingArea drawingArea) {
     fDrawingArea = drawingArea;
 }
 
-SkPDFResourceDict* SkPDFDevice::getResourceDict() {
-    if (NULL == fResourceDict) {
-        fResourceDict = SkNEW(SkPDFResourceDict);
-
-        if (fGraphicStateResources.count()) {
-            for (int i = 0; i < fGraphicStateResources.count(); i++) {
-                fResourceDict->insertResourceAsReference(
-                        SkPDFResourceDict::kExtGState_ResourceType,
-                        i, fGraphicStateResources[i]);
-            }
-        }
-
-        if (fXObjectResources.count()) {
-            for (int i = 0; i < fXObjectResources.count(); i++) {
-                fResourceDict->insertResourceAsReference(
-                        SkPDFResourceDict::kXObject_ResourceType,
-                        i, fXObjectResources[i]);
-            }
-        }
-
-        if (fFontResources.count()) {
-            for (int i = 0; i < fFontResources.count(); i++) {
-                fResourceDict->insertResourceAsReference(
-                        SkPDFResourceDict::kFont_ResourceType,
-                        i, fFontResources[i]);
-            }
-        }
-
-        if (fShaderResources.count()) {
-            SkAutoTUnref<SkPDFDict> patterns(new SkPDFDict());
-            for (int i = 0; i < fShaderResources.count(); i++) {
-                fResourceDict->insertResourceAsReference(
-                        SkPDFResourceDict::kPattern_ResourceType,
-                        i, fShaderResources[i]);
-            }
-        }
+SkPDFDict* SkPDFDevice::createResourceDict() const {
+    SkTDArray<SkPDFObject*> fonts;
+    fonts.setReserve(fFontResources.count());
+    for (SkPDFFont* font : fFontResources) {
+        fonts.push(font);
     }
-    return fResourceDict;
+    return SkPDFResourceDict::Create(
+            &fGraphicStateResources,
+            &fShaderResources,
+            &fXObjectResources,
+            &fonts);
 }
 
 const SkTDArray<SkPDFFont*>& SkPDFDevice::getFontResources() const {
@@ -1467,21 +1627,22 @@ const SkTDArray<SkPDFFont*>& SkPDFDevice::getFontResources() const {
 
 SkPDFArray* SkPDFDevice::copyMediaBox() const {
     // should this be a singleton?
-    SkAutoTUnref<SkPDFInt> zero(SkNEW_ARGS(SkPDFInt, (0)));
 
-    SkPDFArray* mediaBox = SkNEW(SkPDFArray);
+    SkAutoTUnref<SkPDFArray> mediaBox(new SkPDFArray);
     mediaBox->reserve(4);
-    mediaBox->append(zero.get());
-    mediaBox->append(zero.get());
+    mediaBox->appendInt(0);
+    mediaBox->appendInt(0);
     mediaBox->appendInt(fPageSize.fWidth);
     mediaBox->appendInt(fPageSize.fHeight);
-    return mediaBox;
+    return mediaBox.detach();
 }
 
-SkStream* SkPDFDevice::content() const {
-    SkMemoryStream* result = new SkMemoryStream;
-    result->setData(this->copyContentToData())->unref();
-    return result;
+SkStreamAsset* SkPDFDevice::content() const {
+    SkDynamicMemoryWStream buffer;
+    this->writeContent(&buffer);
+    return buffer.bytesWritten() > 0
+        ? buffer.detachAsStream()
+        : new SkMemoryStream;
 }
 
 void SkPDFDevice::copyContentEntriesToData(ContentEntry* entry,
@@ -1489,7 +1650,7 @@ void SkPDFDevice::copyContentEntriesToData(ContentEntry* entry,
     // TODO(ctguil): For margins, I'm not sure fExistingClipStack/Region is the
     // right thing to pass here.
     GraphicStackState gsState(fExistingClipStack, fExistingClipRegion, data);
-    while (entry != NULL) {
+    while (entry != nullptr) {
         SkPoint translation;
         translation.iset(this->getOrigin());
         translation.negate();
@@ -1498,17 +1659,15 @@ void SkPDFDevice::copyContentEntriesToData(ContentEntry* entry,
         gsState.updateMatrix(entry->fState.fMatrix);
         gsState.updateDrawingState(entry->fState);
 
-        SkAutoDataUnref copy(entry->fContent.copyToData());
-        data->write(copy->data(), copy->size());
+        entry->fContent.writeToStream(data);
         entry = entry->fNext.get();
     }
     gsState.drainStack();
 }
 
-SkData* SkPDFDevice::copyContentToData() const {
-    SkDynamicMemoryWStream data;
+void SkPDFDevice::writeContent(SkWStream* out) const {
     if (fInitialTransform.getType() != SkMatrix::kIdentity_Mask) {
-        SkPDFUtils::AppendTransform(fInitialTransform, &data);
+        SkPDFUtils::AppendTransform(fInitialTransform, out);
     }
 
     // TODO(aayushkumar): Apply clip along the margins.  Currently, webkit
@@ -1516,7 +1675,7 @@ SkData* SkPDFDevice::copyContentToData() const {
     // that currently acts as our clip.
     // Also, think about adding a transform here (or assume that the values
     // sent across account for that)
-    SkPDFDevice::copyContentEntriesToData(fMarginContentEntries.get(), &data);
+    SkPDFDevice::copyContentEntriesToData(fMarginContentEntries.get(), out);
 
     // If the content area is the entire page, then we don't need to clip
     // the content area (PDF area clips to the page size).  Otherwise,
@@ -1525,17 +1684,12 @@ SkData* SkPDFDevice::copyContentToData() const {
     if (fPageSize != fContentSize) {
         SkRect r = SkRect::MakeWH(SkIntToScalar(this->width()),
                                   SkIntToScalar(this->height()));
-        emit_clip(NULL, &r, &data);
+        emit_clip(nullptr, &r, out);
     }
 
-    SkPDFDevice::copyContentEntriesToData(fContentEntries.get(), &data);
-
-    // potentially we could cache this SkData, and only rebuild it if we
-    // see that our state has changed.
-    return data.copyToData();
+    SkPDFDevice::copyContentEntriesToData(fContentEntries.get(), out);
 }
 
-#ifdef SK_PDF_USE_PATHOPS
 /* Draws an inverse filled path by using Path Ops to compute the positive
  * inverse using the current clip as the inverse bounds.
  * Return true if this was an inverse path and was properly handled,
@@ -1570,7 +1724,7 @@ bool SkPDFDevice::handleInversePath(const SkDraw& d, const SkPath& origPath,
             // To be consistent with the raster output, hairline strokes
             // are rendered as non-inverted.
             modifiedPath.toggleInverseFillType();
-            drawPath(d, modifiedPath, paint, NULL, true);
+            drawPath(d, modifiedPath, paint, nullptr, true);
             return true;
         }
     }
@@ -1601,140 +1755,85 @@ bool SkPDFDevice::handleInversePath(const SkDraw& d, const SkPath& origPath,
     drawPath(d, modifiedPath, noInversePaint, prePathMatrix, true);
     return true;
 }
-#endif
-
-bool SkPDFDevice::handleRectAnnotation(const SkRect& r, const SkMatrix& matrix,
-                                       const SkPaint& p) {
-    SkAnnotation* annotationInfo = p.getAnnotation();
-    if (!annotationInfo) {
-        return false;
-    }
-    SkData* urlData = annotationInfo->find(SkAnnotationKeys::URL_Key());
-    if (urlData) {
-        handleLinkToURL(urlData, r, matrix);
-        return p.getAnnotation() != NULL;
-    }
-    SkData* linkToName = annotationInfo->find(
-            SkAnnotationKeys::Link_Named_Dest_Key());
-    if (linkToName) {
-        handleLinkToNamedDest(linkToName, r, matrix);
-        return p.getAnnotation() != NULL;
-    }
-    return false;
-}
 
 bool SkPDFDevice::handlePointAnnotation(const SkPoint* points, size_t count,
                                         const SkMatrix& matrix,
-                                        const SkPaint& paint) {
-    SkAnnotation* annotationInfo = paint.getAnnotation();
-    if (!annotationInfo) {
-        return false;
-    }
+                                        SkAnnotation* annotationInfo) {
     SkData* nameData = annotationInfo->find(
             SkAnnotationKeys::Define_Named_Dest_Key());
     if (nameData) {
         for (size_t i = 0; i < count; i++) {
-            defineNamedDestination(nameData, points[i], matrix);
+            SkPoint transformedPoint;
+            matrix.mapXY(points[i].x(), points[i].y(), &transformedPoint);
+            fNamedDestinations.push(new NamedDestination(nameData, transformedPoint));
         }
-        return paint.getAnnotation() != NULL;
+        return true;
     }
     return false;
 }
 
-SkPDFDict* SkPDFDevice::createLinkAnnotation(const SkRect& r,
-                                             const SkMatrix& matrix) {
-    SkMatrix transform = matrix;
-    transform.postConcat(fInitialTransform);
-    SkRect translatedRect;
-    transform.mapRect(&translatedRect, r);
+bool SkPDFDevice::handlePathAnnotation(const SkPath& path,
+                                       const SkDraw& d,
+                                       SkAnnotation* annotation) {
+    SkASSERT(annotation);
 
-    if (NULL == fAnnotations) {
-        fAnnotations = SkNEW(SkPDFArray);
-    }
-    SkPDFDict* annotation(SkNEW_ARGS(SkPDFDict, ("Annot")));
-    annotation->insertName("Subtype", "Link");
-    fAnnotations->append(annotation);
+    SkPath transformedPath = path;
+    transformedPath.transform(*d.fMatrix);
+    SkRasterClip clip = *d.fRC;
+    clip.op(transformedPath, SkISize::Make(width(), height()), SkRegion::kIntersect_Op, false);
+    SkRect transformedRect = SkRect::Make(clip.getBounds());
 
-    SkAutoTUnref<SkPDFArray> border(SkNEW(SkPDFArray));
-    border->reserve(3);
-    border->appendInt(0);  // Horizontal corner radius.
-    border->appendInt(0);  // Vertical corner radius.
-    border->appendInt(0);  // Width, 0 = no border.
-    annotation->insert("Border", border.get());
-
-    SkAutoTUnref<SkPDFArray> rect(SkNEW(SkPDFArray));
-    rect->reserve(4);
-    rect->appendScalar(translatedRect.fLeft);
-    rect->appendScalar(translatedRect.fTop);
-    rect->appendScalar(translatedRect.fRight);
-    rect->appendScalar(translatedRect.fBottom);
-    annotation->insert("Rect", rect.get());
-
-    return annotation;
-}
-
-void SkPDFDevice::handleLinkToURL(SkData* urlData, const SkRect& r,
-                                  const SkMatrix& matrix) {
-    SkAutoTUnref<SkPDFDict> annotation(createLinkAnnotation(r, matrix));
-
-    SkString url(static_cast<const char *>(urlData->data()),
-                 urlData->size() - 1);
-    SkAutoTUnref<SkPDFDict> action(SkNEW_ARGS(SkPDFDict, ("Action")));
-    action->insertName("S", "URI");
-    action->insert("URI", SkNEW_ARGS(SkPDFString, (url)))->unref();
-    annotation->insert("A", action.get());
-}
-
-void SkPDFDevice::handleLinkToNamedDest(SkData* nameData, const SkRect& r,
-                                        const SkMatrix& matrix) {
-    SkAutoTUnref<SkPDFDict> annotation(createLinkAnnotation(r, matrix));
-    SkString name(static_cast<const char *>(nameData->data()),
-                  nameData->size() - 1);
-    annotation->insert("Dest", SkNEW_ARGS(SkPDFName, (name)))->unref();
-}
-
-struct NamedDestination {
-    const SkData* nameData;
-    SkPoint point;
-
-    NamedDestination(const SkData* nameData, const SkPoint& point)
-        : nameData(nameData), point(point) {
-        nameData->ref();
+    SkData* urlData = annotation->find(SkAnnotationKeys::URL_Key());
+    if (urlData) {
+        if (!transformedRect.isEmpty()) {
+            fLinkToURLs.push(new RectWithData(transformedRect, urlData));
+        }
+        return true;
     }
 
-    ~NamedDestination() {
-        nameData->unref();
+    SkData* linkToDestination =
+            annotation->find(SkAnnotationKeys::Link_Named_Dest_Key());
+    if (linkToDestination) {
+        if (!transformedRect.isEmpty()) {
+            fLinkToDestinations.push(new RectWithData(transformedRect, linkToDestination));
+        }
+        return true;
     }
-};
 
-void SkPDFDevice::defineNamedDestination(SkData* nameData, const SkPoint& point,
-                                         const SkMatrix& matrix) {
-    SkMatrix transform = matrix;
-    transform.postConcat(fInitialTransform);
-    SkPoint translatedPoint;
-    transform.mapXY(point.x(), point.y(), &translatedPoint);
-    fNamedDestinations.push(
-        SkNEW_ARGS(NamedDestination, (nameData, translatedPoint)));
+    return false;
 }
 
-void SkPDFDevice::appendDestinations(SkPDFDict* dict, SkPDFObject* page) {
-    int nDest = fNamedDestinations.count();
-    for (int i = 0; i < nDest; i++) {
-        NamedDestination* dest = fNamedDestinations[i];
-        SkAutoTUnref<SkPDFArray> pdfDest(SkNEW(SkPDFArray));
+void SkPDFDevice::appendAnnotations(SkPDFArray* array) const {
+    array->reserve(fLinkToURLs.count() + fLinkToDestinations.count());
+    for (RectWithData* rectWithURL : fLinkToURLs) {
+        SkRect r;
+        fInitialTransform.mapRect(&r, rectWithURL->rect);
+        array->appendObject(create_link_to_url(rectWithURL->data, r));
+    }
+    for (RectWithData* linkToDestination : fLinkToDestinations) {
+        SkRect r;
+        fInitialTransform.mapRect(&r, linkToDestination->rect);
+        array->appendObject(create_link_named_dest(linkToDestination->data, r));
+    }
+}
+
+void SkPDFDevice::appendDestinations(SkPDFDict* dict, SkPDFObject* page) const {
+    for (NamedDestination* dest : fNamedDestinations) {
+        SkAutoTUnref<SkPDFArray> pdfDest(new SkPDFArray);
         pdfDest->reserve(5);
-        pdfDest->append(SkNEW_ARGS(SkPDFObjRef, (page)))->unref();
+        pdfDest->appendObjRef(SkRef(page));
         pdfDest->appendName("XYZ");
-        pdfDest->appendScalar(dest->point.x());
-        pdfDest->appendScalar(dest->point.y());
+        SkPoint p = fInitialTransform.mapXY(dest->point.x(), dest->point.y());
+        pdfDest->appendScalar(p.x());
+        pdfDest->appendScalar(p.y());
         pdfDest->appendInt(0);  // Leave zoom unchanged
-        dict->insert(static_cast<const char *>(dest->nameData->data()),
-                     pdfDest);
+        SkString name(static_cast<const char*>(dest->nameData->data()));
+        dict->insertObject(name, pdfDest.detach());
     }
 }
 
 SkPDFFormXObject* SkPDFDevice::createFormXObjectFromDevice() {
-    SkPDFFormXObject* xobject = SkNEW_ARGS(SkPDFFormXObject, (this));
+    SkPDFFormXObject* xobject = new SkPDFFormXObject(this);
     // We always draw the form xobjects that we create back into the device, so
     // we simply preserve the font usage instead of pulling it out and merging
     // it back in later.
@@ -1753,8 +1852,7 @@ void SkPDFDevice::drawFormXObjectWithMask(int xObjectIndex,
         return;
     }
 
-    SkAutoTUnref<SkPDFGraphicState> sMaskGS(
-        SkPDFGraphicState::GetSMaskGraphicState(
+    SkAutoTUnref<SkPDFObject> sMaskGS(SkPDFGraphicState::GetSMaskGraphicState(
             mask, invertClip, SkPDFGraphicState::kAlpha_SMaskMode));
 
     SkMatrix identity;
@@ -1780,14 +1878,14 @@ ContentEntry* SkPDFDevice::setUpContentEntry(const SkClipStack* clipStack,
                                              const SkPaint& paint,
                                              bool hasText,
                                              SkPDFFormXObject** dst) {
-    *dst = NULL;
+    *dst = nullptr;
     if (clipRegion.isEmpty()) {
-        return NULL;
+        return nullptr;
     }
 
     // The clip stack can come from an SkDraw where it is technically optional.
     SkClipStack synthesizedClipStack;
-    if (clipStack == NULL) {
+    if (clipStack == nullptr) {
         if (clipRegion == fExistingClipRegion) {
             clipStack = &fExistingClipStack;
         } else {
@@ -1826,7 +1924,7 @@ ContentEntry* SkPDFDevice::setUpContentEntry(const SkClipStack* clipStack,
                    xfermode != SkXfermode::kSrcOut_Mode) {
             // Except for Src and SrcOut, if there isn't anything already there,
             // then we're done.
-            return NULL;
+            return nullptr;
         }
     }
     // TODO(vandebo): Figure out how/if we can handle the following modes:
@@ -1834,7 +1932,7 @@ ContentEntry* SkPDFDevice::setUpContentEntry(const SkClipStack* clipStack,
 
     // Dst xfer mode doesn't draw source at all.
     if (xfermode == SkXfermode::kDst_Mode) {
-        return NULL;
+        return nullptr;
     }
 
     ContentEntry* entry;
@@ -1925,7 +2023,7 @@ void SkPDFDevice::finishContentEntry(SkXfermode::Mode xfermode,
         // If there is shape, then an empty source with Src, SrcIn, SrcOut,
         // DstIn, DstAtop or Modulate reduces to Clear and DstOut or SrcAtop
         // reduces to Dst.
-        if (shape == NULL || xfermode == SkXfermode::kDstOut_Mode ||
+        if (shape == nullptr || xfermode == SkXfermode::kDstOut_Mode ||
                 xfermode == SkXfermode::kSrcATop_Mode) {
             ScopedContentEntry content(this, &fExistingClipStack,
                                        fExistingClipRegion, identity,
@@ -1954,7 +2052,7 @@ void SkPDFDevice::finishContentEntry(SkXfermode::Mode xfermode,
     } else {
         SkAutoTUnref<SkPDFFormXObject> dstMaskStorage;
         SkPDFFormXObject* dstMask = srcFormXObject.get();
-        if (shape != NULL) {
+        if (shape != nullptr) {
             // Draw shape into a form-xobject.
             SkDraw d;
             d.fMatrix = &identity;
@@ -1963,7 +2061,7 @@ void SkPDFDevice::finishContentEntry(SkXfermode::Mode xfermode,
             SkPaint filledPaint;
             filledPaint.setColor(SK_ColorBLACK);
             filledPaint.setStyle(SkPaint::kFill_Style);
-            this->drawPath(d, *shape, filledPaint, NULL, true);
+            this->drawPath(d, *shape, filledPaint, nullptr, true);
 
             dstMaskStorage.reset(createFormXObjectFromDevice());
             dstMask = dstMaskStorage.get();
@@ -2042,9 +2140,9 @@ void SkPDFDevice::populateGraphicStateEntryFromPaint(
         const SkPaint& paint,
         bool hasText,
         GraphicStateEntry* entry) {
-    NOT_IMPLEMENTED(paint.getPathEffect() != NULL, false);
-    NOT_IMPLEMENTED(paint.getMaskFilter() != NULL, false);
-    NOT_IMPLEMENTED(paint.getColorFilter() != NULL, false);
+    NOT_IMPLEMENTED(paint.getPathEffect() != nullptr, false);
+    NOT_IMPLEMENTED(paint.getMaskFilter() != nullptr, false);
+    NOT_IMPLEMENTED(paint.getColorFilter() != nullptr, false);
 
     entry->fMatrix = matrix;
     entry->fClipStack = clipStack;
@@ -2073,7 +2171,10 @@ void SkPDFDevice::populateGraphicStateEntryFromPaint(
         fInitialTransform.mapRect(&boundsTemp);
         boundsTemp.roundOut(&bounds);
 
-        pdfShader.reset(SkPDFShader::GetPDFShader(*shader, transform, bounds));
+        SkScalar rasterScale =
+                SkIntToScalar(fRasterDpi) / DPI_FOR_RASTER_SCALE_ONE;
+        pdfShader.reset(SkPDFShader::GetPDFShader(
+                fCanon, fRasterDpi, *shader, transform, bounds, rasterScale));
 
         if (pdfShader.get()) {
             // pdfShader has been canonicalized so we can directly compare
@@ -2091,7 +2192,7 @@ void SkPDFDevice::populateGraphicStateEntryFromPaint(
             SkShader::GradientInfo gradientInfo;
             SkColor gradientColor;
             gradientInfo.fColors = &gradientColor;
-            gradientInfo.fColorOffsets = NULL;
+            gradientInfo.fColorOffsets = nullptr;
             gradientInfo.fColorCount = 1;
             if (shader->asAGradient(&gradientInfo) ==
                     SkShader::kColor_GradientType) {
@@ -2104,12 +2205,12 @@ void SkPDFDevice::populateGraphicStateEntryFromPaint(
     SkAutoTUnref<SkPDFGraphicState> newGraphicState;
     if (color == paint.getColor()) {
         newGraphicState.reset(
-                SkPDFGraphicState::GetGraphicStateForPaint(paint));
+                SkPDFGraphicState::GetGraphicStateForPaint(fCanon, paint));
     } else {
         SkPaint newPaint = paint;
         newPaint.setColor(color);
         newGraphicState.reset(
-                SkPDFGraphicState::GetGraphicStateForPaint(newPaint));
+                SkPDFGraphicState::GetGraphicStateForPaint(fCanon, newPaint));
     }
     int resourceIndex = addGraphicStateResource(newGraphicState.get());
     entry->fGraphicStateIndex = resourceIndex;
@@ -2122,7 +2223,7 @@ void SkPDFDevice::populateGraphicStateEntryFromPaint(
     }
 }
 
-int SkPDFDevice::addGraphicStateResource(SkPDFGraphicState* gs) {
+int SkPDFDevice::addGraphicStateResource(SkPDFObject* gs) {
     // Assumes that gs has been canonicalized (so we can directly compare
     // pointers).
     int result = fGraphicStateResources.find(gs);
@@ -2149,7 +2250,7 @@ int SkPDFDevice::addXObjectResource(SkPDFObject* xObject) {
 void SkPDFDevice::updateFont(const SkPaint& paint, uint16_t glyphID,
                              ContentEntry* contentEntry) {
     SkTypeface* typeface = paint.getTypeface();
-    if (contentEntry->fState.fFont == NULL ||
+    if (contentEntry->fState.fFont == nullptr ||
             contentEntry->fState.fTextSize != paint.getTextSize() ||
             !contentEntry->fState.fFont->hasGlyph(glyphID)) {
         int fontIndex = getFontResourceIndex(typeface, glyphID);
@@ -2158,15 +2259,15 @@ void SkPDFDevice::updateFont(const SkPaint& paint, uint16_t glyphID,
                 SkPDFResourceDict::kFont_ResourceType,
                 fontIndex).c_str());
         contentEntry->fContent.writeText(" ");
-        SkPDFScalar::Append(paint.getTextSize(), &contentEntry->fContent);
+        SkPDFUtils::AppendScalar(paint.getTextSize(), &contentEntry->fContent);
         contentEntry->fContent.writeText(" Tf\n");
         contentEntry->fState.fFont = fFontResources[fontIndex];
     }
 }
 
 int SkPDFDevice::getFontResourceIndex(SkTypeface* typeface, uint16_t glyphID) {
-    SkAutoTUnref<SkPDFFont> newFont(SkPDFFont::GetFontResource(typeface,
-                                                               glyphID));
+    SkAutoTUnref<SkPDFFont> newFont(
+            SkPDFFont::GetFontResource(fCanon, typeface, glyphID));
     int resourceIndex = fFontResources.find(newFont.get());
     if (resourceIndex < 0) {
         resourceIndex = fFontResources.count();
@@ -2176,42 +2277,59 @@ int SkPDFDevice::getFontResourceIndex(SkTypeface* typeface, uint16_t glyphID) {
     return resourceIndex;
 }
 
-void SkPDFDevice::internalDrawBitmap(const SkMatrix& origMatrix,
-                                     const SkClipStack* clipStack,
-                                     const SkRegion& origClipRegion,
-                                     const SkBitmap& origBitmap,
-                                     const SkIRect* srcRect,
-                                     const SkPaint& paint) {
+static SkSize rect_to_size(const SkRect& r) {
+    return SkSize::Make(r.width(), r.height());
+}
+
+static const SkImage* color_filter(const SkImage* image,
+                                   SkColorFilter* colorFilter) {
+    SkAutoTUnref<SkSurface> surface(SkSurface::NewRaster(
+            SkImageInfo::MakeN32Premul(image->dimensions())));
+    if (!surface) {
+        return image;
+    }
+    SkCanvas* canvas = surface->getCanvas();
+    canvas->clear(SK_ColorTRANSPARENT);
+    SkPaint paint;
+    paint.setColorFilter(colorFilter);
+    canvas->drawImage(image, 0, 0, &paint);
+    canvas->flush();
+    return surface->newImageSnapshot();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void SkPDFDevice::internalDrawImage(const SkMatrix& origMatrix,
+                                    const SkClipStack* clipStack,
+                                    const SkRegion& origClipRegion,
+                                    const SkImage* image,
+                                    const SkIRect* srcRect,
+                                    const SkPaint& paint) {
+    SkASSERT(image);
+    #ifdef SK_PDF_IMAGE_STATS
+    gDrawImageCalls.fetch_add(1);
+    #endif
     SkMatrix matrix = origMatrix;
     SkRegion perspectiveBounds;
     const SkRegion* clipRegion = &origClipRegion;
-    SkBitmap perspectiveBitmap;
-    const SkBitmap* bitmap = &origBitmap;
-    SkBitmap tmpSubsetBitmap;
+    SkAutoTUnref<const SkImage> autoImageUnref;
 
+    if (srcRect) {
+        autoImageUnref.reset(image->newSubset(*srcRect));
+        if (!autoImageUnref) {
+            return;
+        }
+        image = autoImageUnref;
+    }
     // Rasterize the bitmap using perspective in a new bitmap.
     if (origMatrix.hasPerspective()) {
         if (fRasterDpi == 0) {
             return;
         }
-        SkBitmap* subsetBitmap;
-        if (srcRect) {
-            if (!origBitmap.extractSubset(&tmpSubsetBitmap, *srcRect)) {
-               return;
-            }
-            subsetBitmap = &tmpSubsetBitmap;
-        } else {
-            subsetBitmap = &tmpSubsetBitmap;
-            *subsetBitmap = origBitmap;
-        }
-        srcRect = NULL;
-
         // Transform the bitmap in the new space, without taking into
         // account the initial transform.
         SkPath perspectiveOutline;
-        perspectiveOutline.addRect(
-                SkRect::MakeWH(SkIntToScalar(subsetBitmap->width()),
-                               SkIntToScalar(subsetBitmap->height())));
+        SkRect imageBounds = SkRect::Make(image->bounds());
+        perspectiveOutline.addRect(imageBounds);
         perspectiveOutline.transform(origMatrix);
 
         // TODO(edisonn): perf - use current clip too.
@@ -2222,20 +2340,18 @@ void SkPDFDevice::internalDrawBitmap(const SkMatrix& origMatrix,
         // account the initial transform.
         SkMatrix total = origMatrix;
         total.postConcat(fInitialTransform);
-        total.postScale(SkIntToScalar(fRasterDpi) /
-                            SkIntToScalar(DPI_FOR_RASTER_SCALE_ONE),
-                        SkIntToScalar(fRasterDpi) /
-                            SkIntToScalar(DPI_FOR_RASTER_SCALE_ONE));
+        SkScalar dpiScale = SkIntToScalar(fRasterDpi) /
+                            SkIntToScalar(DPI_FOR_RASTER_SCALE_ONE);
+        total.postScale(dpiScale, dpiScale);
+
         SkPath physicalPerspectiveOutline;
-        physicalPerspectiveOutline.addRect(
-                SkRect::MakeWH(SkIntToScalar(subsetBitmap->width()),
-                               SkIntToScalar(subsetBitmap->height())));
+        physicalPerspectiveOutline.addRect(imageBounds);
         physicalPerspectiveOutline.transform(total);
 
-        SkScalar scaleX = physicalPerspectiveOutline.getBounds().width() /
-                              bounds.width();
-        SkScalar scaleY = physicalPerspectiveOutline.getBounds().height() /
-                              bounds.height();
+        SkRect physicalPerspectiveBounds =
+                physicalPerspectiveOutline.getBounds();
+        SkScalar scaleX = physicalPerspectiveBounds.width() / bounds.width();
+        SkScalar scaleY = physicalPerspectiveBounds.height() / bounds.height();
 
         // TODO(edisonn): A better approach would be to use a bitmap shader
         // (in clamp mode) and draw a rect over the entire bounding box. Then
@@ -2244,14 +2360,15 @@ void SkPDFDevice::internalDrawBitmap(const SkMatrix& origMatrix,
         // the image.  Avoiding alpha will reduce the pdf size and generation
         // CPU time some.
 
-        const int w = SkScalarCeilToInt(physicalPerspectiveOutline.getBounds().width());
-        const int h = SkScalarCeilToInt(physicalPerspectiveOutline.getBounds().height());
-        if (!perspectiveBitmap.allocPixels(SkImageInfo::MakeN32Premul(w, h))) {
+        SkISize wh = rect_to_size(physicalPerspectiveBounds).toCeil();
+
+        SkAutoTUnref<SkSurface> surface(
+                SkSurface::NewRaster(SkImageInfo::MakeN32Premul(wh)));
+        if (!surface) {
             return;
         }
-        perspectiveBitmap.eraseColor(SK_ColorTRANSPARENT);
-
-        SkCanvas canvas(perspectiveBitmap);
+        SkCanvas* canvas = surface->getCanvas();
+        canvas->clear(SK_ColorTRANSPARENT);
 
         SkScalar deltaX = bounds.left();
         SkScalar deltaY = bounds.top();
@@ -2262,26 +2379,22 @@ void SkPDFDevice::internalDrawBitmap(const SkMatrix& origMatrix,
 
         // Translate the draw in the new canvas, so we perfectly fit the
         // shape in the bitmap.
-        canvas.setMatrix(offsetMatrix);
-
-        canvas.drawBitmap(*subsetBitmap, SkIntToScalar(0), SkIntToScalar(0));
-
+        canvas->setMatrix(offsetMatrix);
+        canvas->drawImage(image, 0, 0, nullptr);
         // Make sure the final bits are in the bitmap.
-        canvas.flush();
+        canvas->flush();
 
         // In the new space, we use the identity matrix translated
         // and scaled to reflect DPI.
         matrix.setScale(1 / scaleX, 1 / scaleY);
         matrix.postTranslate(deltaX, deltaY);
 
-        perspectiveBounds.setRect(
-                SkIRect::MakeXYWH(SkScalarFloorToInt(bounds.x()),
-                                  SkScalarFloorToInt(bounds.y()),
-                                  SkScalarCeilToInt(bounds.width()),
-                                  SkScalarCeilToInt(bounds.height())));
+        perspectiveBounds.setRect(bounds.roundOut());
         clipRegion = &perspectiveBounds;
-        srcRect = NULL;
-        bitmap = &perspectiveBitmap;
+        srcRect = nullptr;
+
+        autoImageUnref.reset(surface->newImageSnapshot());
+        image = autoImageUnref;
     }
 
     SkMatrix scaled;
@@ -2289,9 +2402,9 @@ void SkPDFDevice::internalDrawBitmap(const SkMatrix& origMatrix,
     scaled.setScale(SK_Scalar1, -SK_Scalar1);
     scaled.postTranslate(0, SK_Scalar1);
     // Scale the image up from 1x1 to WxH.
-    SkIRect subset = SkIRect::MakeWH(bitmap->width(), bitmap->height());
-    scaled.postScale(SkIntToScalar(subset.width()),
-                     SkIntToScalar(subset.height()));
+    SkIRect subset = image->bounds();
+    scaled.postScale(SkIntToScalar(image->width()),
+                     SkIntToScalar(image->height()));
     scaled.postConcat(matrix);
     ScopedContentEntry content(this, clipStack, *clipRegion, scaled, paint);
     if (!content.entry() || (srcRect && !subset.intersect(*srcRect))) {
@@ -2299,8 +2412,7 @@ void SkPDFDevice::internalDrawBitmap(const SkMatrix& origMatrix,
     }
     if (content.needShape()) {
         SkPath shape;
-        shape.addRect(SkRect::MakeWH(SkIntToScalar(subset.width()),
-                                     SkIntToScalar( subset.height())));
+        shape.addRect(SkRect::Make(subset));
         shape.transform(matrix);
         content.setShape(shape);
     }
@@ -2308,13 +2420,25 @@ void SkPDFDevice::internalDrawBitmap(const SkMatrix& origMatrix,
         return;
     }
 
-    SkAutoTUnref<SkPDFImage> image(
-        SkPDFImage::CreateImage(*bitmap, subset, fEncoder));
-    if (!image) {
-        return;
+    if (SkColorFilter* colorFilter = paint.getColorFilter()) {
+        // TODO(https://bug.skia.org/4378): implement colorfilter on other
+        // draw calls.  This code here works for all
+        // drawBitmap*()/drawImage*() calls amd ImageFilters (which
+        // rasterize a layer on this backend).  Fortuanely, this seems
+        // to be how Chromium impements most color-filters.
+        autoImageUnref.reset(color_filter(image, colorFilter));
+        image = autoImageUnref;
+        // TODO(halcanary): de-dupe this by caching filtered images.
+        // (maybe in the resource cache?)
     }
-
-    SkPDFUtils::DrawFormXObject(this->addXObjectResource(image.get()),
+    SkAutoTUnref<SkPDFObject> pdfimage(SkSafeRef(fCanon->findPDFBitmap(image)));
+    if (!pdfimage) {
+        pdfimage.reset(SkPDFCreateBitmapObject(image));
+        if (!pdfimage) {
+            return;
+        }
+        fCanon->addPDFBitmap(image->uniqueID(), pdfimage);
+    }
+    SkPDFUtils::DrawFormXObject(this->addXObjectResource(pdfimage.get()),
                                 &content.entry()->fContent);
 }
-
diff --git a/gfx/skia/skia/src/pdf/SkPDFDevice.h b/gfx/skia/skia/src/pdf/SkPDFDevice.h
new file mode 100644
index 000000000000..31f6de11eefd
--- /dev/null
+++ b/gfx/skia/skia/src/pdf/SkPDFDevice.h
@@ -0,0 +1,319 @@
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPDFDevice_DEFINED
+#define SkPDFDevice_DEFINED
+
+#include "SkBitmap.h"
+#include "SkCanvas.h"
+#include "SkClipStack.h"
+#include "SkDevice.h"
+#include "SkPaint.h"
+#include "SkPath.h"
+#include "SkPicture.h"
+#include "SkRect.h"
+#include "SkRefCnt.h"
+#include "SkStream.h"
+#include "SkTDArray.h"
+#include "SkTemplates.h"
+
+class SkPDFArray;
+class SkPDFCanon;
+class SkPDFDevice;
+class SkPDFDict;
+class SkPDFFont;
+class SkPDFFormXObject;
+class SkPDFGlyphSetMap;
+class SkPDFGraphicState;
+class SkPDFObject;
+class SkPDFShader;
+class SkPDFStream;
+class SkRRect;
+
+// Private classes.
+struct ContentEntry;
+struct GraphicStateEntry;
+struct NamedDestination;
+struct RectWithData;
+
+/** \class SkPDFDevice
+
+    The drawing context for the PDF backend.
+*/
+class SkPDFDevice final : public SkBaseDevice {
+public:
+    /** Create a PDF drawing context.  SkPDFDevice applies a
+     *  scale-and-translate transform to move the origin from the
+     *  bottom left (PDF default) to the top left (Skia default).
+     *  @param pageSize Page size in point units.
+     *         1 point == 127/360 mm == 1/72 inch
+     *  @param rasterDpi the DPI at which features without native PDF
+     *         support will be rasterized (e.g. draw image with
+     *         perspective, draw text with perspective, ...).  A
+     *         larger DPI would create a PDF that reflects the
+     *         original intent with better fidelity, but it can make
+     *         for larger PDF files too, which would use more memory
+     *         while rendering, and it would be slower to be processed
+     *         or sent online or to printer.  A good choice is
+     *         SK_ScalarDefaultRasterDPI(72.0f).
+     *  @param SkPDFCanon.  Should be non-null, and shared by all
+     *         devices in a document.
+     */
+    static SkPDFDevice* Create(SkISize pageSize,
+                               SkScalar rasterDpi,
+                               SkPDFCanon* canon) {
+        return new SkPDFDevice(pageSize, rasterDpi, canon, true);
+    }
+
+    /** Create a PDF drawing context without fipping the y-axis. */
+    static SkPDFDevice* CreateUnflipped(SkISize pageSize,
+                                        SkScalar rasterDpi,
+                                        SkPDFCanon* canon) {
+        return new SkPDFDevice(pageSize, rasterDpi, canon, false);
+    }
+
+    virtual ~SkPDFDevice();
+
+    /** These are called inside the per-device-layer loop for each draw call.
+     When these are called, we have already applied any saveLayer operations,
+     and are handling any looping from the paint, and any effects from the
+     DrawFilter.
+     */
+    void drawPaint(const SkDraw&, const SkPaint& paint) override;
+    void drawPoints(const SkDraw&, SkCanvas::PointMode mode,
+                    size_t count, const SkPoint[],
+                    const SkPaint& paint) override;
+    void drawRect(const SkDraw&, const SkRect& r, const SkPaint& paint) override;
+    void drawOval(const SkDraw&, const SkRect& oval, const SkPaint& paint) override;
+    void drawRRect(const SkDraw&, const SkRRect& rr, const SkPaint& paint) override;
+    void drawPath(const SkDraw&, const SkPath& origpath,
+                  const SkPaint& paint, const SkMatrix* prePathMatrix,
+                  bool pathIsMutable) override;
+    void drawBitmapRect(const SkDraw& draw, const SkBitmap& bitmap, const SkRect* src,
+                        const SkRect& dst, const SkPaint&, SkCanvas::SrcRectConstraint) override;
+    void drawBitmap(const SkDraw&, const SkBitmap& bitmap,
+                    const SkMatrix& matrix, const SkPaint&) override;
+    void drawSprite(const SkDraw&, const SkBitmap& bitmap, int x, int y,
+                    const SkPaint& paint) override;
+    void drawImage(const SkDraw&,
+                   const SkImage*,
+                   SkScalar x,
+                   SkScalar y,
+                   const SkPaint&) override;
+    void drawImageRect(const SkDraw&,
+                       const SkImage*,
+                       const SkRect* src,
+                       const SkRect& dst,
+                       const SkPaint&,
+                       SkCanvas::SrcRectConstraint) override;
+    void drawText(const SkDraw&, const void* text, size_t len,
+                  SkScalar x, SkScalar y, const SkPaint&) override;
+    void drawPosText(const SkDraw&, const void* text, size_t len,
+                     const SkScalar pos[], int scalarsPerPos,
+                     const SkPoint& offset, const SkPaint&) override;
+    void drawVertices(const SkDraw&, SkCanvas::VertexMode,
+                      int vertexCount, const SkPoint verts[],
+                      const SkPoint texs[], const SkColor colors[],
+                      SkXfermode* xmode, const uint16_t indices[],
+                      int indexCount, const SkPaint& paint) override;
+    void drawDevice(const SkDraw&, SkBaseDevice*, int x, int y,
+                    const SkPaint&) override;
+
+    void onAttachToCanvas(SkCanvas* canvas) override;
+    void onDetachFromCanvas() override;
+    SkImageInfo imageInfo() const override;
+
+    enum DrawingArea {
+        kContent_DrawingArea,  // Drawing area for the page content.
+        kMargin_DrawingArea,   // Drawing area for the margin content.
+    };
+
+    /** Sets the drawing area for the device. Subsequent draw calls are directed
+     *  to the specific drawing area (margin or content). The default drawing
+     *  area is the content drawing area.
+     *
+     *  Currently if margin content is drawn and then a complex (for PDF) xfer
+     *  mode is used, like SrcIn, Clear, etc, the margin content will get
+     *  clipped. A simple way to avoid the bug is to always draw the margin
+     *  content last.
+     */
+    void setDrawingArea(DrawingArea drawingArea);
+
+    // PDF specific methods.
+
+    /** Create the resource dictionary for this device.
+     */
+    SkPDFDict* createResourceDict() const;
+
+    /** Get the fonts used on this device.
+     */
+    const SkTDArray<SkPDFFont*>& getFontResources() const;
+
+    /** Add our annotations (link to urls and destinations) to the supplied
+     *  array.
+     *  @param array Array to add annotations to.
+     */
+    void appendAnnotations(SkPDFArray* array) const;
+
+    /** Add our named destinations to the supplied dictionary.
+     *  @param dict  Dictionary to add destinations to.
+     *  @param page  The PDF object representing the page for this device.
+     */
+    void appendDestinations(SkPDFDict* dict, SkPDFObject* page) const;
+
+    /** Returns a copy of the media box for this device. The caller is required
+     *  to unref() this when it is finished.
+     */
+    SkPDFArray* copyMediaBox() const;
+
+    /** Returns a SkStream with the page contents.  The caller is responsible
+     *  for a deleting the returned value.
+     */
+    SkStreamAsset* content() const;
+
+    /** Writes the page contents to the stream. */
+    void writeContent(SkWStream*) const;
+
+    const SkMatrix& initialTransform() const {
+        return fInitialTransform;
+    }
+
+    /** Returns a SkPDFGlyphSetMap which represents glyph usage of every font
+     *  that shows on this device.
+     */
+    const SkPDFGlyphSetMap& getFontGlyphUsage() const {
+        return *(fFontGlyphUsage.get());
+    }
+
+    SkPDFCanon* getCanon() const { return fCanon; }
+
+protected:
+    const SkBitmap& onAccessBitmap() override {
+        return fLegacyBitmap;
+    }
+
+    SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&) override;
+
+private:
+    // TODO(vandebo): push most of SkPDFDevice's state into a core object in
+    // order to get the right access levels without using friend.
+    friend class ScopedContentEntry;
+
+    SkISize fPageSize;
+    SkISize fContentSize;
+    SkMatrix fInitialTransform;
+    SkClipStack fExistingClipStack;
+    SkRegion fExistingClipRegion;
+
+    SkTDArray<RectWithData*> fLinkToURLs;
+    SkTDArray<RectWithData*> fLinkToDestinations;
+    SkTDArray<NamedDestination*> fNamedDestinations;
+
+    SkTDArray<SkPDFObject*> fGraphicStateResources;
+    SkTDArray<SkPDFObject*> fXObjectResources;
+    SkTDArray<SkPDFFont*> fFontResources;
+    SkTDArray<SkPDFObject*> fShaderResources;
+
+    SkAutoTDelete<ContentEntry> fContentEntries;
+    ContentEntry* fLastContentEntry;
+    SkAutoTDelete<ContentEntry> fMarginContentEntries;
+    ContentEntry* fLastMarginContentEntry;
+    DrawingArea fDrawingArea;
+
+    const SkClipStack* fClipStack;
+
+    // Accessor and setter functions based on the current DrawingArea.
+    SkAutoTDelete<ContentEntry>* getContentEntries();
+
+    // Glyph ids used for each font on this device.
+    SkAutoTDelete<SkPDFGlyphSetMap> fFontGlyphUsage;
+
+    SkScalar fRasterDpi;
+
+    SkBitmap fLegacyBitmap;
+
+    SkPDFCanon* fCanon;  // Owned by SkDocument_PDF
+    ////////////////////////////////////////////////////////////////////////////
+
+    SkPDFDevice(SkISize pageSize,
+                SkScalar rasterDpi,
+                SkPDFCanon* canon,
+                bool flip);
+
+    ContentEntry* getLastContentEntry();
+    void setLastContentEntry(ContentEntry* contentEntry);
+
+    SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) override;
+
+    void init();
+    void cleanUp(bool clearFontUsage);
+    SkPDFFormXObject* createFormXObjectFromDevice();
+
+    void drawFormXObjectWithMask(int xObjectIndex,
+                                 SkPDFFormXObject* mask,
+                                 const SkClipStack* clipStack,
+                                 const SkRegion& clipRegion,
+                                 SkXfermode::Mode mode,
+                                 bool invertClip);
+
+    // If the paint or clip is such that we shouldn't draw anything, this
+    // returns nullptr and does not create a content entry.
+    // setUpContentEntry and finishContentEntry can be used directly, but
+    // the preferred method is to use the ScopedContentEntry helper class.
+    ContentEntry* setUpContentEntry(const SkClipStack* clipStack,
+                                    const SkRegion& clipRegion,
+                                    const SkMatrix& matrix,
+                                    const SkPaint& paint,
+                                    bool hasText,
+                                    SkPDFFormXObject** dst);
+    void finishContentEntry(SkXfermode::Mode xfermode,
+                            SkPDFFormXObject* dst,
+                            SkPath* shape);
+    bool isContentEmpty();
+
+    void populateGraphicStateEntryFromPaint(const SkMatrix& matrix,
+                                            const SkClipStack& clipStack,
+                                            const SkRegion& clipRegion,
+                                            const SkPaint& paint,
+                                            bool hasText,
+                                            GraphicStateEntry* entry);
+    int addGraphicStateResource(SkPDFObject* gs);
+    int addXObjectResource(SkPDFObject* xObject);
+
+    void updateFont(const SkPaint& paint, uint16_t glyphID, ContentEntry* contentEntry);
+    int getFontResourceIndex(SkTypeface* typeface, uint16_t glyphID);
+
+    void internalDrawPaint(const SkPaint& paint, ContentEntry* contentEntry);
+    void internalDrawImage(const SkMatrix& matrix,
+                           const SkClipStack* clipStack,
+                           const SkRegion& clipRegion,
+                           const SkImage* image,
+                           const SkIRect* srcRect,
+                           const SkPaint& paint);
+
+    /** Helper method for copyContentToData. It is responsible for copying the
+     *  list of content entries |entry| to |data|.
+     */
+    void copyContentEntriesToData(ContentEntry* entry, SkWStream* data) const;
+
+    bool handleInversePath(const SkDraw& d, const SkPath& origPath,
+                           const SkPaint& paint, bool pathIsMutable,
+                           const SkMatrix* prePathMatrix = nullptr);
+    bool handlePointAnnotation(const SkPoint* points, size_t count,
+                               const SkMatrix& matrix, SkAnnotation* annot);
+    bool handlePathAnnotation(const SkPath& path, const SkDraw& d,
+                              SkAnnotation* annot);
+
+    typedef SkBaseDevice INHERITED;
+
+    // TODO(edisonn): Only SkDocument_PDF and SkPDFImageShader should be able to create
+    // an SkPDFDevice
+    //friend class SkDocument_PDF;
+    //friend class SkPDFImageShader;
+};
+
+#endif
diff --git a/gfx/skia/skia/src/pdf/SkPDFDeviceFlattener.cpp b/gfx/skia/skia/src/pdf/SkPDFDeviceFlattener.cpp
deleted file mode 100644
index aea87f6546aa..000000000000
--- a/gfx/skia/skia/src/pdf/SkPDFDeviceFlattener.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkPDFDeviceFlattener.h"
-#include "SkDraw.h"
-
-static SkISize SkSizeToISize(const SkSize& size) {
-    return SkISize::Make(SkScalarRoundToInt(size.width()), SkScalarRoundToInt(size.height()));
-}
-
-SkPDFDeviceFlattener::SkPDFDeviceFlattener(const SkSize& pageSize, const SkRect* trimBox)
-            : SkPDFDevice(SkSizeToISize(pageSize),
-                          SkSizeToISize(pageSize),
-                          SkMatrix::I()) {
-    // TODO(edisonn): store the trimbox on emit.
-}
-
-SkPDFDeviceFlattener::~SkPDFDeviceFlattener() {
-}
-
-static void flattenPaint(const SkDraw& d, SkPaint* paint) {
-    if (paint->getShader()) {
-        SkAutoTUnref<SkShader> lms(SkShader::CreateLocalMatrixShader(paint->getShader(),
-                                                                     *d.fMatrix));
-        paint->setShader(lms);
-    }
-}
-
-void SkPDFDeviceFlattener::drawPoints(const SkDraw& d, SkCanvas::PointMode mode,
-                                      size_t count, const SkPoint points[],
-                                      const SkPaint& paint) {
-    if (!mustFlatten(d)) {
-        INHERITED::drawPoints(d, mode, count, points, paint);
-        return;
-    }
-
-    SkPaint paintFlatten(paint);
-    flattenPaint(d, &paintFlatten);
-
-    SkPoint* flattenedPoints = SkNEW_ARRAY(SkPoint, count);
-    d.fMatrix->mapPoints(flattenedPoints, points, SkToS32(count));
-    SkDraw draw(d);
-    SkMatrix identity = SkMatrix::I();
-    draw.fMatrix = &identity;
-    INHERITED::drawPoints(draw, mode, count, flattenedPoints, paintFlatten);
-    SkDELETE_ARRAY(flattenedPoints);
-}
-
-void SkPDFDeviceFlattener::drawRect(const SkDraw& d, const SkRect& r, const SkPaint& paint) {
-    if (!mustFlatten(d)) {
-        INHERITED::drawRect(d, r, paint);
-        return;
-    }
-
-    SkPath path;
-    path.addRect(r);
-    path.transform(*d.fMatrix);
-    SkDraw draw(d);
-    SkMatrix matrix = SkMatrix::I();
-    draw.fMatrix = &matrix;
-
-    SkPaint paintFlatten(paint);
-    flattenPaint(d, &paintFlatten);
-
-    INHERITED::drawPath(draw, path, paintFlatten, NULL, true);
-}
-
-void SkPDFDeviceFlattener::drawPath(const SkDraw& d, const SkPath& origPath,
-                                    const SkPaint& paint, const SkMatrix* prePathMatrix,
-                                    bool pathIsMutable) {
-    if (!mustFlatten(d) && !(prePathMatrix && prePathMatrix->hasPerspective())) {
-        INHERITED::drawPath(d, origPath, paint, prePathMatrix, pathIsMutable);
-        return;
-    }
-
-    SkPath* pathPtr = (SkPath*)&origPath;
-    SkPath tmpPath;
-
-    if (!pathIsMutable) {
-        tmpPath = origPath;
-        pathPtr = &tmpPath;
-    }
-
-    if (prePathMatrix) {
-        pathPtr->transform(*prePathMatrix);
-    }
-
-    SkPaint paintFlatten(paint);
-    flattenPaint(d, &paintFlatten);
-
-    bool fill = paintFlatten.getFillPath(*pathPtr, &tmpPath);
-    SkDEBUGCODE(pathPtr = (SkPath*)0x12345678);  // Don't use pathPtr after this point.
-
-    paintFlatten.setPathEffect(NULL);
-    if (fill) {
-        paintFlatten.setStyle(SkPaint::kFill_Style);
-    } else {
-        paintFlatten.setStyle(SkPaint::kStroke_Style);
-        paintFlatten.setStrokeWidth(0);
-    }
-
-    tmpPath.transform(*d.fMatrix);
-
-    SkDraw draw(d);
-    SkMatrix matrix = SkMatrix::I();
-    draw.fMatrix = &matrix;
-
-    INHERITED::drawPath(draw, tmpPath, paintFlatten, NULL, true);
-}
-
-void SkPDFDeviceFlattener::drawText(const SkDraw& d, const void* text, size_t len,
-                                    SkScalar x, SkScalar y, const SkPaint& paint) {
-    if (mustPathText(d, paint)) {
-        d.drawText_asPaths((const char*)text, len, x, y, paint);
-        return;
-    }
-
-    INHERITED::drawText(d, text, len, x, y, paint);
-}
-
-void SkPDFDeviceFlattener::drawPosText(const SkDraw& d, const void* text, size_t len,
-                                       const SkScalar pos[], SkScalar constY,
-                                       int scalarsPerPos, const SkPaint& paint) {
-    if (mustPathText(d, paint)) {
-        d.drawPosText_asPaths((const char*)text, len, pos, constY, scalarsPerPos, paint);
-        return;
-    }
-    INHERITED::drawPosText(d, text, len, pos, constY,scalarsPerPos, paint);
-}
-
-void SkPDFDeviceFlattener::drawTextOnPath(const SkDraw& d, const void* text, size_t len,
-                                          const SkPath& path, const SkMatrix* matrix,
-                                          const SkPaint& paint) {
-    if (mustPathText(d, paint) || (matrix && matrix->hasPerspective())) {
-        d.drawTextOnPath((const char*)text, len, path, matrix, paint);
-        return;
-    }
-    INHERITED::drawTextOnPath(d, text, len, path, matrix, paint);
-}
-
-bool SkPDFDeviceFlattener::mustFlatten(const SkDraw& d) const {
-    // TODO(edisonn): testability, add flag to force return true.
-    return d.fMatrix->hasPerspective();
-}
-
-bool SkPDFDeviceFlattener::mustPathText(const SkDraw& d, const SkPaint&) {
-    // TODO(edisonn): testability, add flag to force return true.
-    // TODO(edisonn): TBD: How to flatten MaskFilter.
-    return d.fMatrix->hasPerspective();
-}
diff --git a/gfx/skia/skia/src/pdf/SkPDFDeviceFlattener.h b/gfx/skia/skia/src/pdf/SkPDFDeviceFlattener.h
deleted file mode 100644
index f1047db3fc19..000000000000
--- a/gfx/skia/skia/src/pdf/SkPDFDeviceFlattener.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkPDFDeviceFlattener_DEFINED
-#define SkPDFDeviceFlattener_DEFINED
-
-#include "SkPDFDevice.h"
-
-
-/** \class SkPDFDeviceFlattener
-
-    The PDF Device Flattener is used to flatten features without native support in PDF.
-    For now, the only one implemented is Perspective.
-
-    TODO(edisonn): Rename the class once we know all the things it will do.
-*/
-class SkPDFDeviceFlattener : public SkPDFDevice {
-private:
-    typedef SkPDFDevice INHERITED;
-
-    SK_API SkPDFDeviceFlattener(const SkSize& pageSize, const SkRect* trimBox = NULL);
-
-public:
-    SK_API virtual ~SkPDFDeviceFlattener();
-
-    virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode,
-                            size_t count, const SkPoint[],
-                            const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawRect(const SkDraw&, const SkRect& r, const SkPaint& paint);
-    virtual void drawPath(const SkDraw&, const SkPath& origpath,
-                          const SkPaint& paint, const SkMatrix* prePathMatrix,
-                          bool pathIsMutable) SK_OVERRIDE;
-    virtual void drawText(const SkDraw&, const void* text, size_t len,
-                          SkScalar x, SkScalar y, const SkPaint&) SK_OVERRIDE;
-    virtual void drawPosText(const SkDraw&, const void* text, size_t len,
-                             const SkScalar pos[], SkScalar constY,
-                             int scalarsPerPos, const SkPaint&) SK_OVERRIDE;
-    virtual void drawTextOnPath(const SkDraw&, const void* text, size_t len,
-                                const SkPath& path, const SkMatrix* matrix,
-                                const SkPaint& paint) SK_OVERRIDE;
-private:
-
-    bool mustFlatten(const SkDraw& d) const;
-    bool mustPathText(const SkDraw& d, const SkPaint& paint);
-
-    friend class SkDocument_PDF;
-};
-
-#endif  // SkPDFDeviceFlattener_DEFINED
diff --git a/gfx/skia/skia/src/pdf/SkPDFDocument.cpp b/gfx/skia/skia/src/pdf/SkPDFDocument.cpp
deleted file mode 100644
index 79699a0292f1..000000000000
--- a/gfx/skia/skia/src/pdf/SkPDFDocument.cpp
+++ /dev/null
@@ -1,351 +0,0 @@
-
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#include "SkPDFCatalog.h"
-#include "SkPDFDevice.h"
-#include "SkPDFDocument.h"
-#include "SkPDFFont.h"
-#include "SkPDFPage.h"
-#include "SkPDFTypes.h"
-#include "SkStream.h"
-#include "SkTSet.h"
-
-static void addResourcesToCatalog(bool firstPage,
-                                  SkTSet<SkPDFObject*>* resourceSet,
-                                  SkPDFCatalog* catalog) {
-    for (int i = 0; i < resourceSet->count(); i++) {
-        catalog->addObject((*resourceSet)[i], firstPage);
-    }
-}
-
-static void perform_font_subsetting(SkPDFCatalog* catalog,
-                                    const SkTDArray<SkPDFPage*>& pages,
-                                    SkTDArray<SkPDFObject*>* substitutes) {
-    SkASSERT(catalog);
-    SkASSERT(substitutes);
-
-    SkPDFGlyphSetMap usage;
-    for (int i = 0; i < pages.count(); ++i) {
-        usage.merge(pages[i]->getFontGlyphUsage());
-    }
-    SkPDFGlyphSetMap::F2BIter iterator(usage);
-    const SkPDFGlyphSetMap::FontGlyphSetPair* entry = iterator.next();
-    while (entry) {
-        SkPDFFont* subsetFont =
-            entry->fFont->getFontSubset(entry->fGlyphSet);
-        if (subsetFont) {
-            catalog->setSubstitute(entry->fFont, subsetFont);
-            substitutes->push(subsetFont);  // Transfer ownership to substitutes
-        }
-        entry = iterator.next();
-    }
-}
-
-SkPDFDocument::SkPDFDocument(Flags flags)
-        : fXRefFileOffset(0),
-          fTrailerDict(NULL) {
-    fCatalog.reset(new SkPDFCatalog(flags));
-    fDocCatalog = SkNEW_ARGS(SkPDFDict, ("Catalog"));
-    fCatalog->addObject(fDocCatalog, true);
-    fFirstPageResources = NULL;
-    fOtherPageResources = NULL;
-}
-
-SkPDFDocument::~SkPDFDocument() {
-    fPages.safeUnrefAll();
-
-    // The page tree has both child and parent pointers, so it creates a
-    // reference cycle.  We must clear that cycle to properly reclaim memory.
-    for (int i = 0; i < fPageTree.count(); i++) {
-        fPageTree[i]->clear();
-    }
-    fPageTree.safeUnrefAll();
-
-    if (fFirstPageResources) {
-        fFirstPageResources->safeUnrefAll();
-    }
-    if (fOtherPageResources) {
-        fOtherPageResources->safeUnrefAll();
-    }
-
-    fSubstitutes.safeUnrefAll();
-
-    fDocCatalog->unref();
-    SkSafeUnref(fTrailerDict);
-    SkDELETE(fFirstPageResources);
-    SkDELETE(fOtherPageResources);
-}
-
-bool SkPDFDocument::emitPDF(SkWStream* stream) {
-    if (fPages.isEmpty()) {
-        return false;
-    }
-    for (int i = 0; i < fPages.count(); i++) {
-        if (fPages[i] == NULL) {
-            return false;
-        }
-    }
-
-    fFirstPageResources = SkNEW(SkTSet<SkPDFObject*>);
-    fOtherPageResources = SkNEW(SkTSet<SkPDFObject*>);
-
-    // We haven't emitted the document before if fPageTree is empty.
-    if (fPageTree.isEmpty()) {
-        SkPDFDict* pageTreeRoot;
-        SkPDFPage::GeneratePageTree(fPages, fCatalog.get(), &fPageTree,
-                                    &pageTreeRoot);
-        fDocCatalog->insert("Pages", new SkPDFObjRef(pageTreeRoot))->unref();
-
-        /* TODO(vandebo): output intent
-        SkAutoTUnref<SkPDFDict> outputIntent = new SkPDFDict("OutputIntent");
-        outputIntent->insert("S", new SkPDFName("GTS_PDFA1"))->unref();
-        outputIntent->insert("OutputConditionIdentifier",
-                             new SkPDFString("sRGB"))->unref();
-        SkAutoTUnref<SkPDFArray> intentArray = new SkPDFArray;
-        intentArray->append(outputIntent.get());
-        fDocCatalog->insert("OutputIntent", intentArray.get());
-        */
-
-        SkAutoTUnref<SkPDFDict> dests(SkNEW(SkPDFDict));
-
-        bool firstPage = true;
-        /* The references returned in newResources are transfered to
-         * fFirstPageResources or fOtherPageResources depending on firstPage and
-         * knownResources doesn't have a reference but just relies on the other
-         * two sets to maintain a reference.
-         */
-        SkTSet<SkPDFObject*> knownResources;
-
-        // mergeInto returns the number of duplicates.
-        // If there are duplicates, there is a bug and we mess ref counting.
-        SkDEBUGCODE(int duplicates =) knownResources.mergeInto(*fFirstPageResources);
-        SkASSERT(duplicates == 0);
-
-        for (int i = 0; i < fPages.count(); i++) {
-            if (i == 1) {
-                firstPage = false;
-                SkDEBUGCODE(duplicates =) knownResources.mergeInto(*fOtherPageResources);
-            }
-            SkTSet<SkPDFObject*> newResources;
-            fPages[i]->finalizePage(
-                fCatalog.get(), firstPage, knownResources, &newResources);
-            addResourcesToCatalog(firstPage, &newResources, fCatalog.get());
-            if (firstPage) {
-                SkDEBUGCODE(duplicates =) fFirstPageResources->mergeInto(newResources);
-            } else {
-                SkDEBUGCODE(duplicates =) fOtherPageResources->mergeInto(newResources);
-            }
-            SkASSERT(duplicates == 0);
-
-            SkDEBUGCODE(duplicates =) knownResources.mergeInto(newResources);
-            SkASSERT(duplicates == 0);
-
-            fPages[i]->appendDestinations(dests);
-        }
-
-        if (dests->size() > 0) {
-            SkPDFDict* raw_dests = dests.get();
-            fFirstPageResources->add(dests.detach());  // Transfer ownership.
-            fCatalog->addObject(raw_dests, true /* onFirstPage */);
-            fDocCatalog->insert("Dests", SkNEW_ARGS(SkPDFObjRef, (raw_dests)))->unref();
-        }
-
-        // Build font subsetting info before proceeding.
-        perform_font_subsetting(fCatalog.get(), fPages, &fSubstitutes);
-
-        // Figure out the size of things and inform the catalog of file offsets.
-        off_t fileOffset = headerSize();
-        fileOffset += fCatalog->setFileOffset(fDocCatalog, fileOffset);
-        fileOffset += fCatalog->setFileOffset(fPages[0], fileOffset);
-        fileOffset += fPages[0]->getPageSize(fCatalog.get(),
-                (size_t) fileOffset);
-        for (int i = 0; i < fFirstPageResources->count(); i++) {
-            fileOffset += fCatalog->setFileOffset((*fFirstPageResources)[i],
-                                                  fileOffset);
-        }
-        // Add the size of resources of substitute objects used on page 1.
-        fileOffset += fCatalog->setSubstituteResourcesOffsets(fileOffset, true);
-        if (fPages.count() > 1) {
-            // TODO(vandebo): For linearized format, save the start of the
-            // first page xref table and calculate the size.
-        }
-
-        for (int i = 0; i < fPageTree.count(); i++) {
-            fileOffset += fCatalog->setFileOffset(fPageTree[i], fileOffset);
-        }
-
-        for (int i = 1; i < fPages.count(); i++) {
-            fileOffset += fPages[i]->getPageSize(fCatalog.get(), fileOffset);
-        }
-
-        for (int i = 0; i < fOtherPageResources->count(); i++) {
-            fileOffset += fCatalog->setFileOffset(
-                (*fOtherPageResources)[i], fileOffset);
-        }
-
-        fileOffset += fCatalog->setSubstituteResourcesOffsets(fileOffset,
-                                                              false);
-        fXRefFileOffset = fileOffset;
-    }
-
-    emitHeader(stream);
-    fDocCatalog->emitObject(stream, fCatalog.get(), true);
-    fPages[0]->emitObject(stream, fCatalog.get(), true);
-    fPages[0]->emitPage(stream, fCatalog.get());
-    for (int i = 0; i < fFirstPageResources->count(); i++) {
-        (*fFirstPageResources)[i]->emit(stream, fCatalog.get(), true);
-    }
-    fCatalog->emitSubstituteResources(stream, true);
-    // TODO(vandebo): Support linearized format
-    // if (fPages.size() > 1) {
-    //     // TODO(vandebo): Save the file offset for the first page xref table.
-    //     fCatalog->emitXrefTable(stream, true);
-    // }
-
-    for (int i = 0; i < fPageTree.count(); i++) {
-        fPageTree[i]->emitObject(stream, fCatalog.get(), true);
-    }
-
-    for (int i = 1; i < fPages.count(); i++) {
-        fPages[i]->emitPage(stream, fCatalog.get());
-    }
-
-    for (int i = 0; i < fOtherPageResources->count(); i++) {
-        (*fOtherPageResources)[i]->emit(stream, fCatalog.get(), true);
-    }
-
-    fCatalog->emitSubstituteResources(stream, false);
-    int64_t objCount = fCatalog->emitXrefTable(stream, fPages.count() > 1);
-    emitFooter(stream, objCount);
-    return true;
-}
-
-bool SkPDFDocument::setPage(int pageNumber, SkPDFDevice* pdfDevice) {
-    if (!fPageTree.isEmpty()) {
-        return false;
-    }
-
-    pageNumber--;
-    SkASSERT(pageNumber >= 0);
-
-    if (pageNumber >= fPages.count()) {
-        int oldSize = fPages.count();
-        fPages.setCount(pageNumber + 1);
-        for (int i = oldSize; i <= pageNumber; i++) {
-            fPages[i] = NULL;
-        }
-    }
-
-    SkPDFPage* page = new SkPDFPage(pdfDevice);
-    SkSafeUnref(fPages[pageNumber]);
-    fPages[pageNumber] = page;  // Reference from new passed to fPages.
-    return true;
-}
-
-bool SkPDFDocument::appendPage(SkPDFDevice* pdfDevice) {
-    if (!fPageTree.isEmpty()) {
-        return false;
-    }
-
-    SkPDFPage* page = new SkPDFPage(pdfDevice);
-    fPages.push(page);  // Reference from new passed to fPages.
-    return true;
-}
-
-// Deprecated.
-void SkPDFDocument::getCountOfFontTypes(
-        int counts[SkAdvancedTypefaceMetrics::kOther_Font + 2]) const {
-    sk_bzero(counts, sizeof(int) *
-                     (SkAdvancedTypefaceMetrics::kOther_Font + 2));
-    SkTDArray<SkFontID> seenFonts;
-    int notEmbeddable = 0;
-
-    for (int pageNumber = 0; pageNumber < fPages.count(); pageNumber++) {
-        const SkTDArray<SkPDFFont*>& fontResources =
-                fPages[pageNumber]->getFontResources();
-        for (int font = 0; font < fontResources.count(); font++) {
-            SkFontID fontID = fontResources[font]->typeface()->uniqueID();
-            if (seenFonts.find(fontID) == -1) {
-                counts[fontResources[font]->getType()]++;
-                seenFonts.push(fontID);
-                if (!fontResources[font]->canEmbed()) {
-                    notEmbeddable++;
-                }
-            }
-        }
-    }
-    counts[SkAdvancedTypefaceMetrics::kOther_Font + 1] = notEmbeddable;
-}
-
-void SkPDFDocument::getCountOfFontTypes(
-        int counts[SkAdvancedTypefaceMetrics::kOther_Font + 1],
-        int* notSubsettableCount,
-        int* notEmbeddableCount) const {
-    sk_bzero(counts, sizeof(int) *
-                     (SkAdvancedTypefaceMetrics::kOther_Font + 1));
-    SkTDArray<SkFontID> seenFonts;
-    int notSubsettable = 0;
-    int notEmbeddable = 0;
-
-    for (int pageNumber = 0; pageNumber < fPages.count(); pageNumber++) {
-        const SkTDArray<SkPDFFont*>& fontResources =
-                fPages[pageNumber]->getFontResources();
-        for (int font = 0; font < fontResources.count(); font++) {
-            SkFontID fontID = fontResources[font]->typeface()->uniqueID();
-            if (seenFonts.find(fontID) == -1) {
-                counts[fontResources[font]->getType()]++;
-                seenFonts.push(fontID);
-                if (!fontResources[font]->canSubset()) {
-                    notSubsettable++;
-                }
-                if (!fontResources[font]->canEmbed()) {
-                    notEmbeddable++;
-                }
-            }
-        }
-    }
-    if (notSubsettableCount) {
-        *notSubsettableCount = notSubsettable;
-
-    }
-    if (notEmbeddableCount) {
-        *notEmbeddableCount = notEmbeddable;
-    }
-}
-
-void SkPDFDocument::emitHeader(SkWStream* stream) {
-    stream->writeText("%PDF-1.4\n%");
-    // The PDF spec recommends including a comment with four bytes, all
-    // with their high bits set.  This is "Skia" with the high bits set.
-    stream->write32(0xD3EBE9E1);
-    stream->writeText("\n");
-}
-
-size_t SkPDFDocument::headerSize() {
-    SkDynamicMemoryWStream buffer;
-    emitHeader(&buffer);
-    return buffer.getOffset();
-}
-
-void SkPDFDocument::emitFooter(SkWStream* stream, int64_t objCount) {
-    if (NULL == fTrailerDict) {
-        fTrailerDict = SkNEW(SkPDFDict);
-
-        // TODO(vandebo): Linearized format will take a Prev entry too.
-        // TODO(vandebo): PDF/A requires an ID entry.
-        fTrailerDict->insertInt("Size", int(objCount));
-        fTrailerDict->insert("Root", new SkPDFObjRef(fDocCatalog))->unref();
-    }
-
-    stream->writeText("trailer\n");
-    fTrailerDict->emitObject(stream, fCatalog.get(), false);
-    stream->writeText("\nstartxref\n");
-    stream->writeBigDecAsText(fXRefFileOffset);
-    stream->writeText("\n%%EOF");
-}
diff --git a/gfx/skia/skia/src/pdf/SkPDFFont.cpp b/gfx/skia/skia/src/pdf/SkPDFFont.cpp
index 652b56d70668..0d6f31879955 100644
--- a/gfx/skia/skia/src/pdf/SkPDFFont.cpp
+++ b/gfx/skia/skia/src/pdf/SkPDFFont.cpp
@@ -8,10 +8,9 @@
 #include <ctype.h>
 
 #include "SkData.h"
-#include "SkFontHost.h"
 #include "SkGlyphCache.h"
 #include "SkPaint.h"
-#include "SkPDFCatalog.h"
+#include "SkPDFCanon.h"
 #include "SkPDFDevice.h"
 #include "SkPDFFont.h"
 #include "SkPDFFontImpl.h"
@@ -25,8 +24,14 @@
 #include "SkTypes.h"
 #include "SkUtils.h"
 
-#if defined (SK_SFNTLY_SUBSETTER)
-#include SK_SFNTLY_SUBSETTER
+#if defined (GOOGLE3)
+    #if !defined (SK_BUILD_FOR_ANDROID)
+        // #including #defines doesn't work with this build system.
+        #include "typography/font/sfntly/src/sample/chromium/font_subsetter.h"
+        #define SK_SFNTLY_SUBSETTER  // For the benefit of #ifdefs below.
+    #endif
+#elif defined (SK_SFNTLY_SUBSETTER)
+    #include SK_SFNTLY_SUBSETTER
 #endif
 
 // PDF's notion of symbolic vs non-symbolic is related to the character set, not
@@ -74,7 +79,7 @@ bool parsePFB(const uint8_t* src, size_t size, size_t* headerLen,
     return parsePFBSection(&srcPtr, &remaining, 1, headerLen) &&
            parsePFBSection(&srcPtr, &remaining, 2, dataLen) &&
            parsePFBSection(&srcPtr, &remaining, 1, trailerLen) &&
-           parsePFBSection(&srcPtr, &remaining, 3, NULL);
+           parsePFBSection(&srcPtr, &remaining, 3, nullptr);
 }
 
 /* The sections of a PFA file are implicitly defined.  The body starts
@@ -158,14 +163,14 @@ static SkData* handle_type1_stream(SkStream* srcStream, size_t* headerLen,
     // if the data was NUL terminated so that we can use strstr() to search it.
     // Make as few copies as possible given these constraints.
     SkDynamicMemoryWStream dynamicStream;
-    SkAutoTUnref<SkMemoryStream> staticStream;
-    SkData* data = NULL;
+    SkAutoTDelete<SkMemoryStream> staticStream;
+    SkData* data = nullptr;
     const uint8_t* src;
     size_t srcLen;
     if ((srcLen = srcStream->getLength()) > 0) {
         staticStream.reset(new SkMemoryStream(srcLen + 1));
         src = (const uint8_t*)staticStream->getMemoryBase();
-        if (srcStream->getMemoryBase() != NULL) {
+        if (srcStream->getMemoryBase() != nullptr) {
             memcpy((void *)src, srcStream->getMemoryBase(), srcLen);
         } else {
             size_t read = 0;
@@ -173,7 +178,7 @@ static SkData* handle_type1_stream(SkStream* srcStream, size_t* headerLen,
                 size_t got = srcStream->read((void *)staticStream->getAtPos(),
                                              srcLen - read);
                 if (got == 0) {
-                    return NULL;
+                    return nullptr;
                 }
                 read += got;
                 staticStream->seek(read);
@@ -188,7 +193,7 @@ static SkData* handle_type1_stream(SkStream* srcStream, size_t* headerLen,
             dynamicStream.write(buf, amount);
         }
         amount = 0;
-        dynamicStream.write(&amount, 1);  // NULL terminator.
+        dynamicStream.write(&amount, 1);  // nullptr terminator.
         data = dynamicStream.copyToData();
         src = data->bytes();
         srcLen = data->size() - 1;
@@ -204,16 +209,15 @@ static SkData* handle_type1_stream(SkStream* srcStream, size_t* headerLen,
         SkASSERT(length > 0);
         SkASSERT(length + (2 * kPFBSectionHeaderLength) <= srcLen);
 
-        SkAutoTMalloc<uint8_t> buffer(length);
+        SkData* data = SkData::NewUninitialized(length);
 
         const uint8_t* const srcHeader = src + kPFBSectionHeaderLength;
         // There is a six-byte section header before header and data
         // (but not trailer) that we're not going to copy.
-        const uint8_t* const srcData
-            = srcHeader + *headerLen + kPFBSectionHeaderLength;
+        const uint8_t* const srcData = srcHeader + *headerLen + kPFBSectionHeaderLength;
         const uint8_t* const srcTrailer = srcData + *headerLen;
 
-        uint8_t* const resultHeader = buffer.get();
+        uint8_t* const resultHeader = (uint8_t*)data->writable_data();
         uint8_t* const resultData = resultHeader + *headerLen;
         uint8_t* const resultTrailer = resultData + *dataLen;
 
@@ -223,7 +227,7 @@ static SkData* handle_type1_stream(SkStream* srcStream, size_t* headerLen,
         memcpy(resultData,    srcData,    *dataLen);
         memcpy(resultTrailer, srcTrailer, *trailerLen);
 
-        return SkData::NewFromMalloc(buffer.detach(), length);
+        return data;
     }
 
     // A PFA has to be converted for PDF.
@@ -235,7 +239,7 @@ static SkData* handle_type1_stream(SkStream* srcStream, size_t* headerLen,
         SkAutoTMalloc<uint8_t> buffer(length);
 
         memcpy(buffer.get(), src, *headerLen);
-        uint8_t* const resultData = &(buffer[*headerLen]);
+        uint8_t* const resultData = &(buffer[SkToInt(*headerLen)]);
 
         const uint8_t* hexData = src + *headerLen;
         const uint8_t* trailer = hexData + hexDataLen;
@@ -261,12 +265,12 @@ static SkData* handle_type1_stream(SkStream* srcStream, size_t* headerLen,
         }
         SkASSERT(outputOffset == *dataLen);
 
-        uint8_t* const resultTrailer = &(buffer[*headerLen + outputOffset]);
+        uint8_t* const resultTrailer = &(buffer[SkToInt(*headerLen + outputOffset)]);
         memcpy(resultTrailer, src + *headerLen + hexDataLen, *trailerLen);
 
         return SkData::NewFromMalloc(buffer.detach(), length);
     }
-    return NULL;
+    return nullptr;
 }
 
 // scale from em-units to base-1000, returning as a SkScalar
@@ -282,7 +286,7 @@ SkScalar scaleFromFontUnits(int16_t val, uint16_t emSize) {
 void setGlyphWidthAndBoundingBox(SkScalar width, SkIRect box,
                                  SkWStream* content) {
     // Specify width and bounding box for the glyph.
-    SkPDFScalar::Append(width, content);
+    SkPDFUtils::AppendScalar(width, content);
     content->writeText(" 0 ");
     content->writeDecAsText(box.fLeft);
     content->writeText(" ");
@@ -327,7 +331,7 @@ SkPDFArray* composeAdvanceData(
                                      SkPDFArray* array),
         Data* defaultAdvance) {
     SkPDFArray* result = new SkPDFArray();
-    for (; advanceInfo != NULL; advanceInfo = advanceInfo->fNext.get()) {
+    for (; advanceInfo != nullptr; advanceInfo = advanceInfo->fNext.get()) {
         switch (advanceInfo->fType) {
             case SkAdvancedTypefaceMetrics::WidthRange::kDefault: {
                 SkASSERT(advanceInfo->fAdvance.count() == 1);
@@ -340,7 +344,7 @@ SkPDFArray* composeAdvanceData(
                     appendAdvance(advanceInfo->fAdvance[j], emSize,
                                   advanceArray.get());
                 result->appendInt(advanceInfo->fStartId);
-                result->append(advanceArray.get());
+                result->appendObject(advanceArray.detach());
                 break;
             }
             case SkAdvancedTypefaceMetrics::WidthRange::kRun: {
@@ -518,7 +522,7 @@ void append_cmap_sections(const SkTDArray<SkUnichar>& glyphToUnicode,
 
     for (int i = firstGlyphID - glyphOffset; i < limit + 1; ++i) {
         bool inSubset = i < limit &&
-                        (subset == NULL || subset->has(i + glyphOffset));
+                        (subset == nullptr || subset->has(i + glyphOffset));
         if (!rangeEmpty) {
             // PDF spec requires bfrange not changing the higher byte,
             // e.g. <1035> <10FF> <2222> is ok, but
@@ -576,44 +580,43 @@ static SkPDFStream* generate_tounicode_cmap(
 }
 
 #if defined (SK_SFNTLY_SUBSETTER)
-static void sk_delete_array(const void* ptr, size_t, void*) {
+static void sk_delete_array(const void* ptr, void*) {
     // Use C-style cast to cast away const and cast type simultaneously.
     delete[] (unsigned char*)ptr;
 }
 #endif
 
+#if defined(SK_SFNTLY_SUBSETTER)
 static size_t get_subset_font_stream(const char* fontName,
                                      const SkTypeface* typeface,
                                      const SkTDArray<uint32_t>& subset,
                                      SkPDFStream** fontStream) {
     int ttcIndex;
-    SkAutoTUnref<SkStream> fontData(typeface->openStream(&ttcIndex));
+    SkAutoTDelete<SkStream> fontData(typeface->openStream(&ttcIndex));
     SkASSERT(fontData.get());
 
     size_t fontSize = fontData->getLength();
 
-#if defined (SK_SFNTLY_SUBSETTER)
     // Read font into buffer.
-    SkPDFStream* subsetFontStream = NULL;
+    SkPDFStream* subsetFontStream = nullptr;
     SkTDArray<unsigned char> originalFont;
     originalFont.setCount(SkToInt(fontSize));
     if (fontData->read(originalFont.begin(), fontSize) == fontSize) {
-        unsigned char* subsetFont = NULL;
+        unsigned char* subsetFont = nullptr;
         // sfntly requires unsigned int* to be passed in, as far as we know,
         // unsigned int is equivalent to uint32_t on all platforms.
-        SK_COMPILE_ASSERT(sizeof(unsigned int) == sizeof(uint32_t),
-                          unsigned_int_not_32_bits);
+        static_assert(sizeof(unsigned int) == sizeof(uint32_t), "unsigned_int_not_32_bits");
         int subsetFontSize = SfntlyWrapper::SubsetFont(fontName,
                                                        originalFont.begin(),
                                                        fontSize,
                                                        subset.begin(),
                                                        subset.count(),
                                                        &subsetFont);
-        if (subsetFontSize > 0 && subsetFont != NULL) {
+        if (subsetFontSize > 0 && subsetFont != nullptr) {
             SkAutoDataUnref data(SkData::NewWithProc(subsetFont,
                                                      subsetFontSize,
                                                      sk_delete_array,
-                                                     NULL));
+                                                     nullptr));
             subsetFontStream = new SkPDFStream(data.get());
             fontSize = subsetFontSize;
         }
@@ -623,15 +626,12 @@ static size_t get_subset_font_stream(const char* fontName,
         return fontSize;
     }
     fontData->rewind();
-#else
-    sk_ignore_unused_variable(fontName);
-    sk_ignore_unused_variable(subset);
-#endif
 
     // Fail over: just embed the whole font.
     *fontStream = new SkPDFStream(fontData.get());
     return fontSize;
 }
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // class SkPDFGlyphSet
@@ -673,7 +673,7 @@ SkPDFGlyphSetMap::F2BIter::F2BIter(const SkPDFGlyphSetMap& map) {
 
 const SkPDFGlyphSetMap::FontGlyphSetPair* SkPDFGlyphSetMap::F2BIter::next() const {
     if (fIndex >= fMap->count()) {
-        return NULL;
+        return nullptr;
     }
     return &((*fMap)[fIndex++]);
 }
@@ -699,7 +699,7 @@ void SkPDFGlyphSetMap::merge(const SkPDFGlyphSetMap& usage) {
 
 void SkPDFGlyphSetMap::reset() {
     for (int i = 0; i < fMap.count(); ++i) {
-        delete fMap[i].fGlyphSet;  // Should not be NULL.
+        delete fMap[i].fGlyphSet;  // Should not be nullptr.
     }
     fMap.reset();
 }
@@ -742,31 +742,7 @@ SkPDFGlyphSet* SkPDFGlyphSetMap::getGlyphSetForFont(SkPDFFont* font) {
  * from each page and combine it and ask for a resource with that subset.
  */
 
-SkPDFFont::~SkPDFFont() {
-    SkAutoMutexAcquire lock(CanonicalFontsMutex());
-    int index = -1;
-    for (int i = 0 ; i < CanonicalFonts().count() ; i++) {
-        if (CanonicalFonts()[i].fFont == this) {
-            index = i;
-        }
-    }
-
-    SkDEBUGCODE(int indexFound;)
-    SkASSERT(index == -1 ||
-             (Find(fTypeface->uniqueID(),
-                   fFirstGlyphID,
-                   &indexFound) &&
-             index == indexFound));
-    if (index >= 0) {
-        CanonicalFonts().removeShuffle(index);
-    }
-    fResources.unrefAll();
-}
-
-void SkPDFFont::getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
-                             SkTSet<SkPDFObject*>* newResourceObjects) {
-    GetResourcesHelper(&fResources, knownResourceObjects, newResourceObjects);
-}
+SkPDFFont::~SkPDFFont() {}
 
 SkTypeface* SkPDFFont::typeface() {
     return fTypeface.get();
@@ -818,25 +794,23 @@ int SkPDFFont::glyphsToPDFFontEncoding(uint16_t* glyphIDs, int numGlyphs) {
 }
 
 // static
-SkPDFFont* SkPDFFont::GetFontResource(SkTypeface* typeface, uint16_t glyphID) {
-    SkAutoMutexAcquire lock(CanonicalFontsMutex());
-
+SkPDFFont* SkPDFFont::GetFontResource(SkPDFCanon* canon,
+                                      SkTypeface* typeface,
+                                      uint16_t glyphID) {
+    SkASSERT(canon);
     SkAutoResolveDefaultTypeface autoResolve(typeface);
     typeface = autoResolve.get();
-
     const uint32_t fontID = typeface->uniqueID();
-    int relatedFontIndex;
-    if (Find(fontID, glyphID, &relatedFontIndex)) {
-        CanonicalFonts()[relatedFontIndex].fFont->ref();
-        return CanonicalFonts()[relatedFontIndex].fFont;
+
+    SkPDFFont* relatedFont;
+    if (SkPDFFont* pdfFont = canon->findFont(fontID, glyphID, &relatedFont)) {
+        return SkRef(pdfFont);
     }
 
     SkAutoTUnref<const SkAdvancedTypefaceMetrics> fontMetrics;
-    SkPDFDict* relatedFontDescriptor = NULL;
-    if (relatedFontIndex >= 0) {
-        SkPDFFont* relatedFont = CanonicalFonts()[relatedFontIndex].fFont;
-        fontMetrics.reset(relatedFont->fontInfo());
-        SkSafeRef(fontMetrics.get());
+    SkPDFDict* relatedFontDescriptor = nullptr;
+    if (relatedFont) {
+        fontMetrics.reset(SkSafeRef(relatedFont->fontInfo()));
         relatedFontDescriptor = relatedFont->getFontDescriptor();
 
         // This only is to catch callers who pass invalid glyph ids.
@@ -848,79 +822,51 @@ SkPDFFont* SkPDFFont::GetFontResource(SkTypeface* typeface, uint16_t glyphID) {
 
         if (fontType == SkAdvancedTypefaceMetrics::kType1CID_Font ||
             fontType == SkAdvancedTypefaceMetrics::kTrueType_Font) {
-            CanonicalFonts()[relatedFontIndex].fFont->ref();
-            return CanonicalFonts()[relatedFontIndex].fFont;
+            return SkRef(relatedFont);
         }
     } else {
-        SkAdvancedTypefaceMetrics::PerGlyphInfo info;
-        info = SkAdvancedTypefaceMetrics::kGlyphNames_PerGlyphInfo;
-        info = SkTBitOr<SkAdvancedTypefaceMetrics::PerGlyphInfo>(
-                  info, SkAdvancedTypefaceMetrics::kToUnicode_PerGlyphInfo);
+        SkTypeface::PerGlyphInfo info;
+        info = SkTypeface::kGlyphNames_PerGlyphInfo;
+        info = SkTBitOr<SkTypeface::PerGlyphInfo>(
+                  info, SkTypeface::kToUnicode_PerGlyphInfo);
 #if !defined (SK_SFNTLY_SUBSETTER)
-        info = SkTBitOr<SkAdvancedTypefaceMetrics::PerGlyphInfo>(
-                  info, SkAdvancedTypefaceMetrics::kHAdvance_PerGlyphInfo);
+        info = SkTBitOr<SkTypeface::PerGlyphInfo>(
+                  info, SkTypeface::kHAdvance_PerGlyphInfo);
 #endif
         fontMetrics.reset(
-            typeface->getAdvancedTypefaceMetrics(info, NULL, 0));
+            typeface->getAdvancedTypefaceMetrics(info, nullptr, 0));
 #if defined (SK_SFNTLY_SUBSETTER)
         if (fontMetrics.get() &&
             fontMetrics->fType != SkAdvancedTypefaceMetrics::kTrueType_Font) {
             // Font does not support subsetting, get new info with advance.
-            info = SkTBitOr<SkAdvancedTypefaceMetrics::PerGlyphInfo>(
-                      info, SkAdvancedTypefaceMetrics::kHAdvance_PerGlyphInfo);
+            info = SkTBitOr<SkTypeface::PerGlyphInfo>(
+                      info, SkTypeface::kHAdvance_PerGlyphInfo);
             fontMetrics.reset(
-                typeface->getAdvancedTypefaceMetrics(info, NULL, 0));
+                typeface->getAdvancedTypefaceMetrics(info, nullptr, 0));
         }
 #endif
     }
 
-    SkPDFFont* font = Create(fontMetrics.get(), typeface, glyphID,
-                             relatedFontDescriptor);
-    FontRec newEntry(font, fontID, font->fFirstGlyphID);
-    CanonicalFonts().push(newEntry);
-    return font;  // Return the reference new SkPDFFont() created.
+    SkPDFFont* font = SkPDFFont::Create(canon, fontMetrics.get(), typeface,
+                                        glyphID, relatedFontDescriptor);
+    canon->addFont(font, fontID, font->fFirstGlyphID);
+    return font;
 }
 
 SkPDFFont* SkPDFFont::getFontSubset(const SkPDFGlyphSet*) {
-    return NULL;  // Default: no support.
-}
-
-// static
-SkTDArray<SkPDFFont::FontRec>& SkPDFFont::CanonicalFonts() {
-    SkPDFFont::CanonicalFontsMutex().assertHeld();
-    static SkTDArray<FontRec> gCanonicalFonts;
-    return gCanonicalFonts;
-}
-
-SK_DECLARE_STATIC_MUTEX(gCanonicalFontsMutex);
-// static
-SkBaseMutex& SkPDFFont::CanonicalFontsMutex() {
-    return gCanonicalFontsMutex;
-}
-
-// static
-bool SkPDFFont::Find(uint32_t fontID, uint16_t glyphID, int* index) {
-    // TODO(vandebo): Optimize this, do only one search?
-    FontRec search(NULL, fontID, glyphID);
-    *index = CanonicalFonts().find(search);
-    if (*index >= 0) {
-        return true;
-    }
-    search.fGlyphID = 0;
-    *index = CanonicalFonts().find(search);
-    return false;
+    return nullptr;  // Default: no support.
 }
 
 SkPDFFont::SkPDFFont(const SkAdvancedTypefaceMetrics* info,
                      SkTypeface* typeface,
                      SkPDFDict* relatedFontDescriptor)
-        : SkPDFDict("Font"),
-          fTypeface(ref_or_default(typeface)),
-          fFirstGlyphID(1),
-          fLastGlyphID(info ? info->fLastGlyphID : 0),
-          fFontInfo(SkSafeRef(info)),
-          fDescriptor(SkSafeRef(relatedFontDescriptor)) {
-    if (info == NULL ||
+    : SkPDFDict("Font")
+    , fTypeface(ref_or_default(typeface))
+    , fFirstGlyphID(1)
+    , fLastGlyphID(info ? info->fLastGlyphID : 0)
+    , fFontInfo(SkSafeRef(info))
+    , fDescriptor(SkSafeRef(relatedFontDescriptor)) {
+    if (info == nullptr ||
             info->fFlags & SkAdvancedTypefaceMetrics::kMultiMaster_FontFlag) {
         fFontType = SkAdvancedTypefaceMetrics::kOther_Font;
     } else {
@@ -929,29 +875,24 @@ SkPDFFont::SkPDFFont(const SkAdvancedTypefaceMetrics* info,
 }
 
 // static
-SkPDFFont* SkPDFFont::Create(const SkAdvancedTypefaceMetrics* info,
-                             SkTypeface* typeface, uint16_t glyphID,
+SkPDFFont* SkPDFFont::Create(SkPDFCanon* canon,
+                             const SkAdvancedTypefaceMetrics* info,
+                             SkTypeface* typeface,
+                             uint16_t glyphID,
                              SkPDFDict* relatedFontDescriptor) {
     SkAdvancedTypefaceMetrics::FontType type =
         info ? info->fType : SkAdvancedTypefaceMetrics::kOther_Font;
 
-    if (info &&
-            (info->fFlags & SkAdvancedTypefaceMetrics::kMultiMaster_FontFlag)) {
-        NOT_IMPLEMENTED(true, true);
-        return new SkPDFType3Font(info,
-                                  typeface,
-                                  glyphID);
+    if (info && (info->fFlags & SkAdvancedTypefaceMetrics::kMultiMaster_FontFlag)) {
+        return new SkPDFType3Font(info, typeface, glyphID);
     }
     if (type == SkAdvancedTypefaceMetrics::kType1CID_Font ||
         type == SkAdvancedTypefaceMetrics::kTrueType_Font) {
-        SkASSERT(relatedFontDescriptor == NULL);
+        SkASSERT(relatedFontDescriptor == nullptr);
         return new SkPDFType0Font(info, typeface);
     }
     if (type == SkAdvancedTypefaceMetrics::kType1_Font) {
-        return new SkPDFType1Font(info,
-                                  typeface,
-                                  glyphID,
-                                  relatedFontDescriptor);
+        return new SkPDFType1Font(info, typeface, glyphID, relatedFontDescriptor);
     }
 
     SkASSERT(type == SkAdvancedTypefaceMetrics::kCFF_Font ||
@@ -965,7 +906,7 @@ const SkAdvancedTypefaceMetrics* SkPDFFont::fontInfo() {
 }
 
 void SkPDFFont::setFontInfo(const SkAdvancedTypefaceMetrics* info) {
-    if (info == NULL || info == fFontInfo.get()) {
+    if (info == nullptr || info == fFontInfo.get()) {
         return;
     }
     fFontInfo.reset(info);
@@ -984,12 +925,6 @@ void SkPDFFont::setLastGlyphID(uint16_t glyphID) {
     fLastGlyphID = glyphID;
 }
 
-void SkPDFFont::addResource(SkPDFObject* object) {
-    SkASSERT(object != NULL);
-    fResources.push(object);
-    object->ref();
-}
-
 SkPDFDict* SkPDFFont::getFontDescriptor() {
     return fDescriptor.get();
 }
@@ -1000,7 +935,7 @@ void SkPDFFont::setFontDescriptor(SkPDFDict* descriptor) {
 }
 
 bool SkPDFFont::addCommonFontDescriptorEntries(int16_t defaultWidth) {
-    if (fDescriptor.get() == NULL) {
+    if (fDescriptor.get() == nullptr) {
         return false;
     }
 
@@ -1018,8 +953,8 @@ bool SkPDFFont::addCommonFontDescriptorEntries(int16_t defaultWidth) {
     fDescriptor->insertScalar("CapHeight",
             scaleFromFontUnits(fFontInfo->fCapHeight, emSize));
     fDescriptor->insertInt("ItalicAngle", fFontInfo->fItalicAngle);
-    fDescriptor->insert("FontBBox", makeFontBBox(fFontInfo->fBBox,
-                                                 fFontInfo->fEmSize))->unref();
+    fDescriptor->insertObject(
+            "FontBBox", makeFontBBox(fFontInfo->fBBox, fFontInfo->fEmSize));
 
     if (defaultWidth > 0) {
         fDescriptor->insertScalar("MissingWidth",
@@ -1028,7 +963,7 @@ bool SkPDFFont::addCommonFontDescriptorEntries(int16_t defaultWidth) {
     return true;
 }
 
-void SkPDFFont::adjustGlyphRangeForSingleByteEncoding(int16_t glyphID) {
+void SkPDFFont::adjustGlyphRangeForSingleByteEncoding(uint16_t glyphID) {
     // Single byte glyph encoding supports a max of 255 glyphs.
     fFirstGlyphID = glyphID - (glyphID - 1) % 255;
     if (fLastGlyphID > fFirstGlyphID + 255 - 1) {
@@ -1036,56 +971,27 @@ void SkPDFFont::adjustGlyphRangeForSingleByteEncoding(int16_t glyphID) {
     }
 }
 
-bool SkPDFFont::FontRec::operator==(const SkPDFFont::FontRec& b) const {
-    if (fFontID != b.fFontID) {
-        return false;
-    }
-    if (fFont != NULL && b.fFont != NULL) {
-        return fFont->fFirstGlyphID == b.fFont->fFirstGlyphID &&
-            fFont->fLastGlyphID == b.fFont->fLastGlyphID;
-    }
-    if (fGlyphID == 0 || b.fGlyphID == 0) {
-        return true;
-    }
-
-    if (fFont != NULL) {
-        return fFont->fFirstGlyphID <= b.fGlyphID &&
-            b.fGlyphID <= fFont->fLastGlyphID;
-    } else if (b.fFont != NULL) {
-        return b.fFont->fFirstGlyphID <= fGlyphID &&
-            fGlyphID <= b.fFont->fLastGlyphID;
-    }
-    return fGlyphID == b.fGlyphID;
-}
-
-SkPDFFont::FontRec::FontRec(SkPDFFont* font, uint32_t fontID, uint16_t glyphID)
-    : fFont(font),
-      fFontID(fontID),
-      fGlyphID(glyphID) {
-}
-
 void SkPDFFont::populateToUnicodeTable(const SkPDFGlyphSet* subset) {
-    if (fFontInfo == NULL || fFontInfo->fGlyphToUnicode.begin() == NULL) {
+    if (fFontInfo == nullptr || fFontInfo->fGlyphToUnicode.begin() == nullptr) {
         return;
     }
-    SkAutoTUnref<SkPDFStream> pdfCmap(
-        generate_tounicode_cmap(fFontInfo->fGlyphToUnicode, subset,
-                                multiByteGlyphs(), firstGlyphID(),
-                                lastGlyphID()));
-    addResource(pdfCmap.get());
-    insert("ToUnicode", new SkPDFObjRef(pdfCmap.get()))->unref();
+    this->insertObjRef("ToUnicode",
+                       generate_tounicode_cmap(fFontInfo->fGlyphToUnicode,
+                                               subset,
+                                               multiByteGlyphs(),
+                                               firstGlyphID(),
+                                               lastGlyphID()));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // class SkPDFType0Font
 ///////////////////////////////////////////////////////////////////////////////
 
-SkPDFType0Font::SkPDFType0Font(const SkAdvancedTypefaceMetrics* info,
-                               SkTypeface* typeface)
-        : SkPDFFont(info, typeface, NULL) {
+SkPDFType0Font::SkPDFType0Font(const SkAdvancedTypefaceMetrics* info, SkTypeface* typeface)
+    : SkPDFFont(info, typeface, nullptr) {
     SkDEBUGCODE(fPopulated = false);
     if (!canSubset()) {
-        populate(NULL);
+        this->populate(nullptr);
     }
 }
 
@@ -1093,7 +999,7 @@ SkPDFType0Font::~SkPDFType0Font() {}
 
 SkPDFFont* SkPDFType0Font::getFontSubset(const SkPDFGlyphSet* subset) {
     if (!canSubset()) {
-        return NULL;
+        return nullptr;
     }
     SkPDFType0Font* newSubset = new SkPDFType0Font(fontInfo(), typeface());
     newSubset->populate(subset);
@@ -1101,10 +1007,11 @@ SkPDFFont* SkPDFType0Font::getFontSubset(const SkPDFGlyphSet* subset) {
 }
 
 #ifdef SK_DEBUG
-void SkPDFType0Font::emitObject(SkWStream* stream, SkPDFCatalog* catalog,
-                                bool indirect) {
+void SkPDFType0Font::emitObject(SkWStream* stream,
+                                const SkPDFObjNumMap& objNumMap,
+                                const SkPDFSubstituteMap& substitutes) const {
     SkASSERT(fPopulated);
-    return INHERITED::emitObject(stream, catalog, indirect);
+    return INHERITED::emitObject(stream, objNumMap, substitutes);
 }
 #endif
 
@@ -1115,12 +1022,11 @@ bool SkPDFType0Font::populate(const SkPDFGlyphSet* subset) {
 
     SkAutoTUnref<SkPDFCIDFont> newCIDFont(
             new SkPDFCIDFont(fontInfo(), typeface(), subset));
-    addResource(newCIDFont.get());
     SkAutoTUnref<SkPDFArray> descendantFonts(new SkPDFArray());
-    descendantFonts->append(new SkPDFObjRef(newCIDFont.get()))->unref();
-    insert("DescendantFonts", descendantFonts.get());
+    descendantFonts->appendObjRef(newCIDFont.detach());
+    this->insertObject("DescendantFonts", descendantFonts.detach());
 
-    populateToUnicodeTable(subset);
+    this->populateToUnicodeTable(subset);
 
     SkDEBUGCODE(fPopulated = true);
     return true;
@@ -1131,9 +1037,10 @@ bool SkPDFType0Font::populate(const SkPDFGlyphSet* subset) {
 ///////////////////////////////////////////////////////////////////////////////
 
 SkPDFCIDFont::SkPDFCIDFont(const SkAdvancedTypefaceMetrics* info,
-                           SkTypeface* typeface, const SkPDFGlyphSet* subset)
-        : SkPDFFont(info, typeface, NULL) {
-    populate(subset);
+                           SkTypeface* typeface,
+                           const SkPDFGlyphSet* subset)
+    : SkPDFFont(info, typeface, nullptr) {
+    this->populate(subset);
 }
 
 SkPDFCIDFont::~SkPDFCIDFont() {}
@@ -1142,62 +1049,59 @@ bool SkPDFCIDFont::addFontDescriptor(int16_t defaultWidth,
                                      const SkTDArray<uint32_t>* subset) {
     SkAutoTUnref<SkPDFDict> descriptor(new SkPDFDict("FontDescriptor"));
     setFontDescriptor(descriptor.get());
-    addResource(descriptor.get());
-    insert("FontDescriptor", new SkPDFObjRef(descriptor.get()))->unref();
     if (!addCommonFontDescriptorEntries(defaultWidth)) {
+        this->insertObjRef("FontDescriptor", descriptor.detach());
         return false;
     }
-    if (!canEmbed()) {
-        return true;
-    }
+    SkASSERT(this->canEmbed());
 
     switch (getType()) {
         case SkAdvancedTypefaceMetrics::kTrueType_Font: {
-            SkAutoTUnref<SkPDFStream> fontStream;
             size_t fontSize = 0;
-            if (canSubset()) {
-                SkPDFStream* rawStream = NULL;
+#if defined(SK_SFNTLY_SUBSETTER)
+            if (this->canSubset()) {
+                SkAutoTUnref<SkPDFStream> fontStream;
+                SkPDFStream* rawStream = nullptr;
                 fontSize = get_subset_font_stream(fontInfo()->fFontName.c_str(),
                                                   typeface(),
                                                   *subset,
                                                   &rawStream);
-                fontStream.reset(rawStream);
-            } else {
-                int ttcIndex;
-                SkAutoTUnref<SkStream> fontData(
-                        typeface()->openStream(&ttcIndex));
-                fontStream.reset(new SkPDFStream(fontData.get()));
-                fontSize = fontData->getLength();
+                if (rawStream) {
+                    fontStream.reset(rawStream);
+                    fontStream->insertInt("Length1", fontSize);
+                    descriptor->insertObjRef("FontFile2", fontStream.detach());
+                    break;
+                }
             }
-            SkASSERT(fontSize);
-            SkASSERT(fontStream.get());
-            addResource(fontStream.get());
-
-            fontStream->insertInt("Length1", fontSize);
-            descriptor->insert("FontFile2",
-                               new SkPDFObjRef(fontStream.get()))->unref();
+#endif
+            SkAutoTUnref<SkPDFSharedStream> fontStream;
+            SkAutoTDelete<SkStreamAsset> fontData(
+                    this->typeface()->openStream(nullptr));
+            SkASSERT(fontData);
+            fontSize = fontData->getLength();
+            SkASSERT(fontSize > 0);
+            fontStream.reset(new SkPDFSharedStream(fontData.detach()));
+            fontStream->dict()->insertInt("Length1", fontSize);
+            descriptor->insertObjRef("FontFile2", fontStream.detach());
             break;
         }
         case SkAdvancedTypefaceMetrics::kCFF_Font:
         case SkAdvancedTypefaceMetrics::kType1CID_Font: {
-            int ttcIndex;
-            SkAutoTUnref<SkStream> fontData(typeface()->openStream(&ttcIndex));
-            SkAutoTUnref<SkPDFStream> fontStream(
-                new SkPDFStream(fontData.get()));
-            addResource(fontStream.get());
+            SkAutoTUnref<SkPDFSharedStream> fontStream(
+                    new SkPDFSharedStream(this->typeface()->openStream(nullptr)));
 
             if (getType() == SkAdvancedTypefaceMetrics::kCFF_Font) {
-                fontStream->insertName("Subtype", "Type1C");
+                fontStream->dict()->insertName("Subtype", "Type1C");
             } else {
-                fontStream->insertName("Subtype", "CIDFontType0c");
+                fontStream->dict()->insertName("Subtype", "CIDFontType0c");
             }
-            descriptor->insert("FontFile3",
-                                new SkPDFObjRef(fontStream.get()))->unref();
+            descriptor->insertObjRef("FontFile3", fontStream.detach());
             break;
         }
         default:
             SkASSERT(false);
     }
+    this->insertObjRef("FontDescriptor", descriptor.detach());
     return true;
 }
 
@@ -1214,11 +1118,11 @@ bool SkPDFCIDFont::populate(const SkPDFGlyphSet* subset) {
             subset->exportTo(&glyphIDs);
         }
 
-        SkAdvancedTypefaceMetrics::PerGlyphInfo info;
-        info = SkAdvancedTypefaceMetrics::kGlyphNames_PerGlyphInfo;
-        info = SkTBitOr<SkAdvancedTypefaceMetrics::PerGlyphInfo>(
-                  info, SkAdvancedTypefaceMetrics::kHAdvance_PerGlyphInfo);
-        uint32_t* glyphs = (glyphIDs.count() == 0) ? NULL : glyphIDs.begin();
+        SkTypeface::PerGlyphInfo info;
+        info = SkTypeface::kGlyphNames_PerGlyphInfo;
+        info = SkTBitOr<SkTypeface::PerGlyphInfo>(
+                  info, SkTypeface::kHAdvance_PerGlyphInfo);
+        uint32_t* glyphs = (glyphIDs.count() == 0) ? nullptr : glyphIDs.begin();
         uint32_t glyphsCount = glyphs ? glyphIDs.count() : 0;
         SkAutoTUnref<const SkAdvancedTypefaceMetrics> fontMetrics(
             typeface()->getAdvancedTypefaceMetrics(info, glyphs, glyphsCount));
@@ -1226,7 +1130,7 @@ bool SkPDFCIDFont::populate(const SkPDFGlyphSet* subset) {
         addFontDescriptor(0, &glyphIDs);
     } else {
         // Other CID fonts
-        addFontDescriptor(0, NULL);
+        addFontDescriptor(0, nullptr);
     }
 
     insertName("BaseFont", fontInfo()->fFontName);
@@ -1241,10 +1145,10 @@ bool SkPDFCIDFont::populate(const SkPDFGlyphSet* subset) {
     }
 
     SkAutoTUnref<SkPDFDict> sysInfo(new SkPDFDict);
-    sysInfo->insert("Registry", new SkPDFString("Adobe"))->unref();
-    sysInfo->insert("Ordering", new SkPDFString("Identity"))->unref();
+    sysInfo->insertString("Registry", "Adobe");
+    sysInfo->insertString("Ordering", "Identity");
     sysInfo->insertInt("Supplement", 0);
-    insert("CIDSystemInfo", sysInfo.get());
+    this->insertObject("CIDSystemInfo", sysInfo.detach());
 
     if (fontInfo()->fGlyphWidths.get()) {
         int16_t defaultWidth = 0;
@@ -1253,10 +1157,11 @@ bool SkPDFCIDFont::populate(const SkPDFGlyphSet* subset) {
                                fontInfo()->fEmSize, &appendWidth,
                                &defaultWidth));
         if (widths->size())
-            insert("W", widths.get());
+            this->insertObject("W", widths.detach());
         if (defaultWidth != 0) {
-            insertScalar("DW", scaleFromFontUnits(defaultWidth,
-                                                  fontInfo()->fEmSize));
+            this->insertScalar(
+                    "DW",
+                    scaleFromFontUnits(defaultWidth, fontInfo()->fEmSize));
         }
     }
     if (fontInfo()->fVerticalMetrics.get()) {
@@ -1269,13 +1174,14 @@ bool SkPDFCIDFont::populate(const SkPDFGlyphSet* subset) {
                                fontInfo()->fEmSize, &appendVerticalAdvance,
                                &defaultAdvance));
         if (advances->size())
-            insert("W2", advances.get());
+            this->insertObject("W2", advances.detach());
         if (defaultAdvance.fVerticalAdvance ||
                 defaultAdvance.fOriginXDisp ||
                 defaultAdvance.fOriginYDisp) {
-            insert("DW2", appendVerticalAdvance(defaultAdvance,
-                                                fontInfo()->fEmSize,
-                                                new SkPDFArray))->unref();
+            this->insertObject("DW2",
+                               appendVerticalAdvance(defaultAdvance,
+                                                     fontInfo()->fEmSize,
+                                                     new SkPDFArray));
         }
     }
 
@@ -1290,17 +1196,15 @@ SkPDFType1Font::SkPDFType1Font(const SkAdvancedTypefaceMetrics* info,
                                SkTypeface* typeface,
                                uint16_t glyphID,
                                SkPDFDict* relatedFontDescriptor)
-        : SkPDFFont(info, typeface, relatedFontDescriptor) {
-    populate(glyphID);
+    : SkPDFFont(info, typeface, relatedFontDescriptor) {
+    this->populate(glyphID);
 }
 
 SkPDFType1Font::~SkPDFType1Font() {}
 
 bool SkPDFType1Font::addFontDescriptor(int16_t defaultWidth) {
-    if (getFontDescriptor() != NULL) {
-        SkPDFDict* descriptor = getFontDescriptor();
-        addResource(descriptor);
-        insert("FontDescriptor", new SkPDFObjRef(descriptor))->unref();
+    if (SkPDFDict* descriptor = getFontDescriptor()) {
+        this->insertObjRef("FontDescriptor", SkRef(descriptor));
         return true;
     }
 
@@ -1311,24 +1215,20 @@ bool SkPDFType1Font::addFontDescriptor(int16_t defaultWidth) {
     size_t header SK_INIT_TO_AVOID_WARNING;
     size_t data SK_INIT_TO_AVOID_WARNING;
     size_t trailer SK_INIT_TO_AVOID_WARNING;
-    SkAutoTUnref<SkStream> rawFontData(typeface()->openStream(&ttcIndex));
-    SkData* fontData = handle_type1_stream(rawFontData.get(), &header, &data,
-                                           &trailer);
-    if (fontData == NULL) {
+    SkAutoTDelete<SkStream> rawFontData(typeface()->openStream(&ttcIndex));
+    SkAutoTUnref<SkData> fontData(handle_type1_stream(rawFontData.get(), &header,
+                                                      &data, &trailer));
+    if (fontData.get() == nullptr) {
         return false;
     }
-    if (canEmbed()) {
-        SkAutoTUnref<SkPDFStream> fontStream(new SkPDFStream(fontData));
-        addResource(fontStream.get());
-        fontStream->insertInt("Length1", header);
-        fontStream->insertInt("Length2", data);
-        fontStream->insertInt("Length3", trailer);
-        descriptor->insert("FontFile",
-                           new SkPDFObjRef(fontStream.get()))->unref();
-    }
+    SkASSERT(this->canEmbed());
+    SkAutoTUnref<SkPDFStream> fontStream(new SkPDFStream(fontData.get()));
+    fontStream->insertInt("Length1", header);
+    fontStream->insertInt("Length2", data);
+    fontStream->insertInt("Length3", trailer);
+    descriptor->insertObjRef("FontFile", fontStream.detach());
 
-    addResource(descriptor.get());
-    insert("FontDescriptor", new SkPDFObjRef(descriptor.get()))->unref();
+    this->insertObjRef("FontDescriptor", descriptor.detach());
 
     return addCommonFontDescriptorEntries(defaultWidth);
 }
@@ -1340,10 +1240,10 @@ bool SkPDFType1Font::populate(int16_t glyphID) {
     adjustGlyphRangeForSingleByteEncoding(glyphID);
 
     int16_t defaultWidth = 0;
-    const SkAdvancedTypefaceMetrics::WidthRange* widthRangeEntry = NULL;
+    const SkAdvancedTypefaceMetrics::WidthRange* widthRangeEntry = nullptr;
     const SkAdvancedTypefaceMetrics::WidthRange* widthEntry;
     for (widthEntry = fontInfo()->fGlyphWidths.get();
-            widthEntry != NULL;
+            widthEntry != nullptr;
             widthEntry = widthEntry->fNext.get()) {
         switch (widthEntry->fType) {
             case SkAdvancedTypefaceMetrics::WidthRange::kDefault:
@@ -1353,7 +1253,7 @@ bool SkPDFType1Font::populate(int16_t glyphID) {
                 SkASSERT(false);
                 break;
             case SkAdvancedTypefaceMetrics::WidthRange::kRange:
-                SkASSERT(widthRangeEntry == NULL);
+                SkASSERT(widthRangeEntry == nullptr);
                 widthRangeEntry = widthEntry;
                 break;
         }
@@ -1368,18 +1268,17 @@ bool SkPDFType1Font::populate(int16_t glyphID) {
 
     addWidthInfoFromRange(defaultWidth, widthRangeEntry);
 
-    SkAutoTUnref<SkPDFDict> encoding(new SkPDFDict("Encoding"));
-    insert("Encoding", encoding.get());
 
     SkAutoTUnref<SkPDFArray> encDiffs(new SkPDFArray);
-    encoding->insert("Differences", encDiffs.get());
-
     encDiffs->reserve(lastGlyphID() - firstGlyphID() + 2);
     encDiffs->appendInt(1);
     for (int gID = firstGlyphID(); gID <= lastGlyphID(); gID++) {
         encDiffs->appendName(fontInfo()->fGlyphNames->get()[gID].c_str());
     }
 
+    SkAutoTUnref<SkPDFDict> encoding(new SkPDFDict("Encoding"));
+    encoding->insertObject("Differences", encDiffs.detach());
+    this->insertObject("Encoding", encoding.detach());
     return true;
 }
 
@@ -1407,9 +1306,9 @@ void SkPDFType1Font::addWidthInfoFromRange(
     } else {
         appendWidth(defaultWidth, 1000, widthArray.get());
     }
-    insertInt("FirstChar", firstChar);
-    insertInt("LastChar", firstChar + widthArray->size() - 1);
-    insert("Widths", widthArray.get());
+    this->insertInt("FirstChar", firstChar);
+    this->insertInt("LastChar", firstChar + widthArray->size() - 1);
+    this->insertObject("Widths", widthArray.detach());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1419,17 +1318,18 @@ void SkPDFType1Font::addWidthInfoFromRange(
 SkPDFType3Font::SkPDFType3Font(const SkAdvancedTypefaceMetrics* info,
                                SkTypeface* typeface,
                                uint16_t glyphID)
-        : SkPDFFont(info, typeface, NULL) {
-    populate(glyphID);
+    : SkPDFFont(info, typeface, nullptr) {
+    this->populate(glyphID);
 }
 
 SkPDFType3Font::~SkPDFType3Font() {}
 
-bool SkPDFType3Font::populate(int16_t glyphID) {
+bool SkPDFType3Font::populate(uint16_t glyphID) {
     SkPaint paint;
     paint.setTypeface(typeface());
     paint.setTextSize(1000);
-    SkAutoGlyphCache autoCache(paint, NULL, NULL);
+    const SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
+    SkAutoGlyphCache autoCache(paint, &props, nullptr);
     SkGlyphCache* cache = autoCache.getCache();
     // If fLastGlyphID isn't set (because there is not fFontInfo), look it up.
     if (lastGlyphID() == 0) {
@@ -1442,16 +1342,12 @@ bool SkPDFType3Font::populate(int16_t glyphID) {
     // Flip about the x-axis and scale by 1/1000.
     SkMatrix fontMatrix;
     fontMatrix.setScale(SkScalarInvert(1000), -SkScalarInvert(1000));
-    insert("FontMatrix", SkPDFUtils::MatrixToArray(fontMatrix))->unref();
+    this->insertObject("FontMatrix", SkPDFUtils::MatrixToArray(fontMatrix));
 
     SkAutoTUnref<SkPDFDict> charProcs(new SkPDFDict);
-    insert("CharProcs", charProcs.get());
-
     SkAutoTUnref<SkPDFDict> encoding(new SkPDFDict("Encoding"));
-    insert("Encoding", encoding.get());
 
     SkAutoTUnref<SkPDFArray> encDiffs(new SkPDFArray);
-    encoding->insert("Differences", encDiffs.get());
     encDiffs->reserve(lastGlyphID() - firstGlyphID() + 2);
     encDiffs->appendInt(1);
 
@@ -1478,22 +1374,64 @@ bool SkPDFType3Font::populate(int16_t glyphID) {
             SkPDFUtils::PaintPath(paint.getStyle(), path->getFillType(),
                                   &content);
         }
-        SkAutoTUnref<SkMemoryStream> glyphStream(new SkMemoryStream());
+        SkAutoTDelete<SkMemoryStream> glyphStream(new SkMemoryStream());
         glyphStream->setData(content.copyToData())->unref();
 
-        SkAutoTUnref<SkPDFStream> glyphDescription(
-            new SkPDFStream(glyphStream.get()));
-        addResource(glyphDescription.get());
-        charProcs->insert(characterName.c_str(),
-                          new SkPDFObjRef(glyphDescription.get()))->unref();
+        charProcs->insertObjRef(characterName,
+                                new SkPDFStream(glyphStream.get()));
     }
 
-    insert("FontBBox", makeFontBBox(bbox, 1000))->unref();
-    insertInt("FirstChar", 1);
-    insertInt("LastChar", lastGlyphID() - firstGlyphID() + 1);
-    insert("Widths", widthArray.get());
-    insertName("CIDToGIDMap", "Identity");
+    encoding->insertObject("Differences", encDiffs.detach());
 
-    populateToUnicodeTable(NULL);
+    this->insertObject("CharProcs", charProcs.detach());
+    this->insertObject("Encoding", encoding.detach());
+
+    this->insertObject("FontBBox", makeFontBBox(bbox, 1000));
+    this->insertInt("FirstChar", 1);
+    this->insertInt("LastChar", lastGlyphID() - firstGlyphID() + 1);
+    this->insertObject("Widths", widthArray.detach());
+    this->insertName("CIDToGIDMap", "Identity");
+
+    this->populateToUnicodeTable(nullptr);
     return true;
 }
+
+SkPDFFont::Match SkPDFFont::IsMatch(SkPDFFont* existingFont,
+                                    uint32_t existingFontID,
+                                    uint16_t existingGlyphID,
+                                    uint32_t searchFontID,
+                                    uint16_t searchGlyphID) {
+    if (existingFontID != searchFontID) {
+        return SkPDFFont::kNot_Match;
+    }
+    if (existingGlyphID == 0 || searchGlyphID == 0) {
+        return SkPDFFont::kExact_Match;
+    }
+    if (existingFont != nullptr) {
+        return (existingFont->fFirstGlyphID <= searchGlyphID &&
+                searchGlyphID <= existingFont->fLastGlyphID)
+                       ? SkPDFFont::kExact_Match
+                       : SkPDFFont::kRelated_Match;
+    }
+    return (existingGlyphID == searchGlyphID) ? SkPDFFont::kExact_Match
+                                              : SkPDFFont::kRelated_Match;
+}
+
+//  Since getAdvancedTypefaceMetrics is expensive, cache the result.
+bool SkPDFFont::CanEmbedTypeface(SkTypeface* typeface, SkPDFCanon* canon) {
+    SkAutoResolveDefaultTypeface face(typeface);
+    uint32_t id = face->uniqueID();
+    if (bool* value = canon->fCanEmbedTypeface.find(id)) {
+        return *value;
+    }
+    bool canEmbed = true;
+    SkAutoTUnref<const SkAdvancedTypefaceMetrics> fontMetrics(
+            face->getAdvancedTypefaceMetrics(
+                    SkTypeface::kNo_PerGlyphInfo, nullptr, 0));
+    if (fontMetrics) {
+        canEmbed = !SkToBool(
+                fontMetrics->fFlags &
+                SkAdvancedTypefaceMetrics::kNotEmbeddable_FontFlag);
+    }
+    return *canon->fCanEmbedTypeface.set(id, canEmbed);
+}
diff --git a/gfx/skia/skia/src/pdf/SkPDFFont.h b/gfx/skia/skia/src/pdf/SkPDFFont.h
index 48d9c30b815f..ca0a51fca4dc 100644
--- a/gfx/skia/skia/src/pdf/SkPDFFont.h
+++ b/gfx/skia/skia/src/pdf/SkPDFFont.h
@@ -14,11 +14,11 @@
 #include "SkBitSet.h"
 #include "SkPDFTypes.h"
 #include "SkTDArray.h"
-#include "SkThread.h"
 #include "SkTypeface.h"
 
 class SkPaint;
-class SkPDFCatalog;
+class SkPDFCanon;
+class SkPDFObjNumMap;
 class SkPDFFont;
 
 class SkPDFGlyphSet : SkNoncopyable {
@@ -78,14 +78,11 @@ private:
     reference to each instantiated class.
 */
 class SkPDFFont : public SkPDFDict {
-    SK_DECLARE_INST_COUNT(SkPDFFont)
+    
 public:
     virtual ~SkPDFFont();
 
-    virtual void getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
-                              SkTSet<SkPDFObject*>* newResourceObjects);
-
-    /** Returns the typeface represented by this class. Returns NULL for the
+    /** Returns the typeface represented by this class. Returns nullptr for the
      *  default typeface.
      */
     SkTypeface* typeface();
@@ -129,19 +126,39 @@ public:
      *  @param typeface  The typeface to find.
      *  @param glyphID   Specify which section of a large font is of interest.
      */
-    static SkPDFFont* GetFontResource(SkTypeface* typeface, uint16_t glyphID);
+    static SkPDFFont* GetFontResource(SkPDFCanon* canon,
+                                      SkTypeface* typeface,
+                                      uint16_t glyphID);
 
     /** Subset the font based on usage set. Returns a SkPDFFont instance with
      *  subset.
      *  @param usage  Glyph subset requested.
-     *  @return       NULL if font does not support subsetting, a new instance
+     *  @return       nullptr if font does not support subsetting, a new instance
      *                of SkPDFFont otherwise.
      */
     virtual SkPDFFont* getFontSubset(const SkPDFGlyphSet* usage);
 
+    enum Match {
+        kExact_Match,
+        kRelated_Match,
+        kNot_Match,
+    };
+    static Match IsMatch(SkPDFFont* existingFont,
+                         uint32_t existingFontID,
+                         uint16_t existingGlyphID,
+                         uint32_t searchFontID,
+                         uint16_t searchGlyphID);
+
+    /**
+     *  Return false iff the typeface has its NotEmbeddable flag set.
+     *  If typeface is NULL, the default typeface is checked.
+     */
+    static bool CanEmbedTypeface(SkTypeface*, SkPDFCanon*);
+
 protected:
     // Common constructor to handle common members.
-    SkPDFFont(const SkAdvancedTypefaceMetrics* fontInfo, SkTypeface* typeface,
+    SkPDFFont(const SkAdvancedTypefaceMetrics* fontInfo,
+              SkTypeface* typeface,
               SkPDFDict* relatedFontDescriptor);
 
     // Accessors for subclass.
@@ -151,9 +168,6 @@ protected:
     uint16_t lastGlyphID() const;
     void setLastGlyphID(uint16_t glyphID);
 
-    // Add object to resource list.
-    void addResource(SkPDFObject* object);
-
     // Accessors for FontDescriptor associated with this object.
     SkPDFDict* getFontDescriptor();
     void setFontDescriptor(SkPDFDict* descriptor);
@@ -164,31 +178,22 @@ protected:
     /** Set fFirstGlyphID and fLastGlyphID to span at most 255 glyphs,
      *  including the passed glyphID.
      */
-    void adjustGlyphRangeForSingleByteEncoding(int16_t glyphID);
+    void adjustGlyphRangeForSingleByteEncoding(uint16_t glyphID);
 
     // Generate ToUnicode table according to glyph usage subset.
-    // If subset is NULL, all available glyph ids will be used.
+    // If subset is nullptr, all available glyph ids will be used.
     void populateToUnicodeTable(const SkPDFGlyphSet* subset);
 
     // Create instances of derived types based on fontInfo.
-    static SkPDFFont* Create(const SkAdvancedTypefaceMetrics* fontInfo,
-                             SkTypeface* typeface, uint16_t glyphID,
+    static SkPDFFont* Create(SkPDFCanon* canon,
+                             const SkAdvancedTypefaceMetrics* fontInfo,
+                             SkTypeface* typeface,
+                             uint16_t glyphID,
                              SkPDFDict* relatedFontDescriptor);
 
     static bool Find(uint32_t fontID, uint16_t glyphID, int* index);
 
 private:
-    class FontRec {
-    public:
-        SkPDFFont* fFont;
-        uint32_t fFontID;
-        uint16_t fGlyphID;
-
-        // A fGlyphID of 0 with no fFont always matches.
-        bool operator==(const FontRec& b) const;
-        FontRec(SkPDFFont* font, uint32_t fontID, uint16_t fGlyphID);
-    };
-
     SkAutoTUnref<SkTypeface> fTypeface;
 
     // The glyph IDs accessible with this font.  For Type1 (non CID) fonts,
@@ -196,14 +201,10 @@ private:
     uint16_t fFirstGlyphID;
     uint16_t fLastGlyphID;
     SkAutoTUnref<const SkAdvancedTypefaceMetrics> fFontInfo;
-    SkTDArray<SkPDFObject*> fResources;
     SkAutoTUnref<SkPDFDict> fDescriptor;
 
     SkAdvancedTypefaceMetrics::FontType fFontType;
 
-    // This should be made a hash table if performance is a problem.
-    static SkTDArray<FontRec>& CanonicalFonts();
-    static SkBaseMutex& CanonicalFontsMutex();
     typedef SkPDFDict INHERITED;
 };
 
diff --git a/gfx/skia/skia/src/pdf/SkPDFFontImpl.h b/gfx/skia/skia/src/pdf/SkPDFFontImpl.h
index 99f1941a8cab..71f78bd4a676 100644
--- a/gfx/skia/skia/src/pdf/SkPDFFontImpl.h
+++ b/gfx/skia/skia/src/pdf/SkPDFFontImpl.h
@@ -12,14 +12,15 @@
 
 #include "SkPDFFont.h"
 
-class SkPDFType0Font : public SkPDFFont {
+class SkPDFType0Font final : public SkPDFFont {
 public:
     virtual ~SkPDFType0Font();
-    virtual bool multiByteGlyphs() const { return true; }
-    SK_API virtual SkPDFFont* getFontSubset(const SkPDFGlyphSet* usage);
+    bool multiByteGlyphs() const override { return true; }
+    SkPDFFont* getFontSubset(const SkPDFGlyphSet* usage) override;
 #ifdef SK_DEBUG
-    virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog,
-                            bool indirect);
+    void emitObject(SkWStream*,
+                    const SkPDFObjNumMap&,
+                    const SkPDFSubstituteMap&) const override;
 #endif
 
 private:
@@ -29,12 +30,13 @@ private:
     typedef SkPDFDict INHERITED;
 #endif
 
-    SkPDFType0Font(const SkAdvancedTypefaceMetrics* info, SkTypeface* typeface);
+    SkPDFType0Font(const SkAdvancedTypefaceMetrics* info,
+                   SkTypeface* typeface);
 
     bool populate(const SkPDFGlyphSet* subset);
 };
 
-class SkPDFCIDFont : public SkPDFFont {
+class SkPDFCIDFont final : public SkPDFFont {
 public:
     virtual ~SkPDFCIDFont();
     virtual bool multiByteGlyphs() const { return true; }
@@ -42,7 +44,8 @@ public:
 private:
     friend class SkPDFType0Font;  // to access the constructor
 
-    SkPDFCIDFont(const SkAdvancedTypefaceMetrics* info, SkTypeface* typeface,
+    SkPDFCIDFont(const SkAdvancedTypefaceMetrics* info,
+                 SkTypeface* typeface,
                  const SkPDFGlyphSet* subset);
 
     bool populate(const SkPDFGlyphSet* subset);
@@ -50,7 +53,7 @@ private:
                            const SkTDArray<uint32_t>* subset);
 };
 
-class SkPDFType1Font : public SkPDFFont {
+class SkPDFType1Font final : public SkPDFFont {
 public:
     virtual ~SkPDFType1Font();
     virtual bool multiByteGlyphs() const { return false; }
@@ -58,8 +61,10 @@ public:
 private:
     friend class SkPDFFont;  // to access the constructor
 
-    SkPDFType1Font(const SkAdvancedTypefaceMetrics* info, SkTypeface* typeface,
-                   uint16_t glyphID, SkPDFDict* relatedFontDescriptor);
+    SkPDFType1Font(const SkAdvancedTypefaceMetrics* info,
+                   SkTypeface* typeface,
+                   uint16_t glyphID,
+                   SkPDFDict* relatedFontDescriptor);
 
     bool populate(int16_t glyphID);
     bool addFontDescriptor(int16_t defaultWidth);
@@ -67,7 +72,7 @@ private:
         const SkAdvancedTypefaceMetrics::WidthRange* widthRangeEntry);
 };
 
-class SkPDFType3Font : public SkPDFFont {
+class SkPDFType3Font final : public SkPDFFont {
 public:
     virtual ~SkPDFType3Font();
     virtual bool multiByteGlyphs() const { return false; }
@@ -76,9 +81,10 @@ private:
     friend class SkPDFFont;  // to access the constructor
 
     SkPDFType3Font(const SkAdvancedTypefaceMetrics* info,
-                   SkTypeface* typeface, uint16_t glyphID);
+                   SkTypeface* typeface,
+                   uint16_t glyphID);
 
-    bool populate(int16_t glyphID);
+    bool populate(uint16_t glyphID);
 };
 
 #endif
diff --git a/gfx/skia/skia/src/pdf/SkPDFFormXObject.cpp b/gfx/skia/skia/src/pdf/SkPDFFormXObject.cpp
index 1635b0ff9649..09db1404c9b2 100644
--- a/gfx/skia/skia/src/pdf/SkPDFFormXObject.cpp
+++ b/gfx/skia/skia/src/pdf/SkPDFFormXObject.cpp
@@ -10,9 +10,7 @@
 #include "SkPDFFormXObject.h"
 
 #include "SkMatrix.h"
-#include "SkPDFCatalog.h"
 #include "SkPDFDevice.h"
-#include "SkPDFResourceDict.h"
 #include "SkPDFUtils.h"
 #include "SkStream.h"
 #include "SkTypes.h"
@@ -21,15 +19,13 @@ SkPDFFormXObject::SkPDFFormXObject(SkPDFDevice* device) {
     // We don't want to keep around device because we'd have two copies
     // of content, so reference or copy everything we need (content and
     // resources).
-    SkTSet<SkPDFObject*> emptySet;
-    SkPDFResourceDict* resourceDict = device->getResourceDict();
-    resourceDict->getReferencedResources(emptySet, &fResources, false);
+    SkAutoTUnref<SkPDFDict> resourceDict(device->createResourceDict());
 
-    SkAutoTUnref<SkStream> content(device->content());
-    setData(content.get());
+    SkAutoTDelete<SkStreamAsset> content(device->content());
+    this->setData(content.get());
 
     SkAutoTUnref<SkPDFArray> bboxArray(device->copyMediaBox());
-    init(NULL, resourceDict, bboxArray);
+    this->init(nullptr, resourceDict.get(), bboxArray);
 
     // We invert the initial transform and apply that to the xobject so that
     // it doesn't get applied twice. We can't just undo it because it's
@@ -41,7 +37,7 @@ SkPDFFormXObject::SkPDFFormXObject(SkPDFDevice* device) {
             SkASSERT(false);
             inverse.reset();
         }
-        insert("Matrix", SkPDFUtils::MatrixToArray(inverse))->unref();
+        this->insertObject("Matrix", SkPDFUtils::MatrixToArray(inverse));
     }
 }
 
@@ -49,10 +45,7 @@ SkPDFFormXObject::SkPDFFormXObject(SkPDFDevice* device) {
  * Creates a FormXObject from a content stream and associated resources.
  */
 SkPDFFormXObject::SkPDFFormXObject(SkStream* content, SkRect bbox,
-                                   SkPDFResourceDict* resourceDict) {
-    SkTSet<SkPDFObject*> emptySet;
-    resourceDict->getReferencedResources(emptySet, &fResources, false);
-
+                                   SkPDFDict* resourceDict) {
     setData(content);
 
     SkAutoTUnref<SkPDFArray> bboxArray(SkPDFUtils::RectToArray(bbox));
@@ -65,31 +58,21 @@ SkPDFFormXObject::SkPDFFormXObject(SkStream* content, SkRect bbox,
  */
 void SkPDFFormXObject::init(const char* colorSpace,
                             SkPDFDict* resourceDict, SkPDFArray* bbox) {
-    insertName("Type", "XObject");
-    insertName("Subtype", "Form");
-    insert("Resources", resourceDict);
-    insert("BBox", bbox);
+    this->insertName("Type", "XObject");
+    this->insertName("Subtype", "Form");
+    this->insertObject("Resources", SkRef(resourceDict));
+    this->insertObject("BBox", SkRef(bbox));
 
     // Right now SkPDFFormXObject is only used for saveLayer, which implies
     // isolated blending.  Do this conditionally if that changes.
     SkAutoTUnref<SkPDFDict> group(new SkPDFDict("Group"));
     group->insertName("S", "Transparency");
 
-    if (colorSpace != NULL) {
+    if (colorSpace != nullptr) {
         group->insertName("CS", colorSpace);
     }
-    group->insert("I", new SkPDFBool(true))->unref();  // Isolated.
-    insert("Group", group.get());
+    group->insertBool("I", true);  // Isolated.
+    this->insertObject("Group", group.detach());
 }
 
-SkPDFFormXObject::~SkPDFFormXObject() {
-    fResources.unrefAll();
-}
-
-void SkPDFFormXObject::getResources(
-        const SkTSet<SkPDFObject*>& knownResourceObjects,
-        SkTSet<SkPDFObject*>* newResourceObjects) {
-    GetResourcesHelper(&fResources.toArray(),
-                       knownResourceObjects,
-                       newResourceObjects);
-}
+SkPDFFormXObject::~SkPDFFormXObject() {}
diff --git a/gfx/skia/skia/src/pdf/SkPDFFormXObject.h b/gfx/skia/skia/src/pdf/SkPDFFormXObject.h
index 38c04b1fd0e4..32d9e4090493 100644
--- a/gfx/skia/skia/src/pdf/SkPDFFormXObject.h
+++ b/gfx/skia/skia/src/pdf/SkPDFFormXObject.h
@@ -14,12 +14,11 @@
 #include "SkPDFTypes.h"
 #include "SkRect.h"
 #include "SkRefCnt.h"
-#include "SkPDFResourceDict.h"
 #include "SkString.h"
 
 class SkMatrix;
 class SkPDFDevice;
-class SkPDFCatalog;
+class SkPDFObjNumMap;
 
 /** \class SkPDFFormXObject
 
@@ -31,7 +30,7 @@ class SkPDFCatalog;
 // The caller could keep track of the form XObjects it creates and
 // canonicalize them, but the Skia API doesn't provide enough context to
 // automatically do it (trivially).
-class SkPDFFormXObject : public SkPDFStream {
+class SkPDFFormXObject final : public SkPDFStream {
 public:
     /** Create a PDF form XObject. Entries for the dictionary entries are
      *  automatically added.
@@ -44,18 +43,12 @@ public:
      */
     explicit SkPDFFormXObject(SkStream* content,
                               SkRect bbox,
-                              SkPDFResourceDict* resourceDict);
+                              SkPDFDict* resourceDict);
     virtual ~SkPDFFormXObject();
 
-    // The SkPDFObject interface.
-    virtual void getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
-                              SkTSet<SkPDFObject*>* newResourceObjects);
-
 private:
     void init(const char* colorSpace,
               SkPDFDict* resourceDict, SkPDFArray* bbox);
-
-    SkTSet<SkPDFObject*> fResources;
 };
 
 #endif
diff --git a/gfx/skia/skia/src/pdf/SkPDFGraphicState.cpp b/gfx/skia/skia/src/pdf/SkPDFGraphicState.cpp
index bd8afe068436..0ad1853f3e9b 100644
--- a/gfx/skia/skia/src/pdf/SkPDFGraphicState.cpp
+++ b/gfx/skia/skia/src/pdf/SkPDFGraphicState.cpp
@@ -6,29 +6,47 @@
  */
 
 #include "SkData.h"
+#include "SkOncePtr.h"
+#include "SkPDFCanon.h"
 #include "SkPDFFormXObject.h"
 #include "SkPDFGraphicState.h"
 #include "SkPDFUtils.h"
 #include "SkTypes.h"
 
-static const char* blend_mode_from_xfermode(SkXfermode::Mode mode) {
+static const char* as_blend_mode(SkXfermode::Mode mode) {
     switch (mode) {
-        case SkXfermode::kSrcOver_Mode:    return "Normal";
-        case SkXfermode::kMultiply_Mode:   return "Multiply";
-        case SkXfermode::kScreen_Mode:     return "Screen";
-        case SkXfermode::kOverlay_Mode:    return "Overlay";
-        case SkXfermode::kDarken_Mode:     return "Darken";
-        case SkXfermode::kLighten_Mode:    return "Lighten";
-        case SkXfermode::kColorDodge_Mode: return "ColorDodge";
-        case SkXfermode::kColorBurn_Mode:  return "ColorBurn";
-        case SkXfermode::kHardLight_Mode:  return "HardLight";
-        case SkXfermode::kSoftLight_Mode:  return "SoftLight";
-        case SkXfermode::kDifference_Mode: return "Difference";
-        case SkXfermode::kExclusion_Mode:  return "Exclusion";
-        case SkXfermode::kHue_Mode:        return "Hue";
-        case SkXfermode::kSaturation_Mode: return "Saturation";
-        case SkXfermode::kColor_Mode:      return "Color";
-        case SkXfermode::kLuminosity_Mode: return "Luminosity";
+        case SkXfermode::kSrcOver_Mode:
+            return "Normal";
+        case SkXfermode::kMultiply_Mode:
+            return "Multiply";
+        case SkXfermode::kScreen_Mode:
+            return "Screen";
+        case SkXfermode::kOverlay_Mode:
+            return "Overlay";
+        case SkXfermode::kDarken_Mode:
+            return "Darken";
+        case SkXfermode::kLighten_Mode:
+            return "Lighten";
+        case SkXfermode::kColorDodge_Mode:
+            return "ColorDodge";
+        case SkXfermode::kColorBurn_Mode:
+            return "ColorBurn";
+        case SkXfermode::kHardLight_Mode:
+            return "HardLight";
+        case SkXfermode::kSoftLight_Mode:
+            return "SoftLight";
+        case SkXfermode::kDifference_Mode:
+            return "Difference";
+        case SkXfermode::kExclusion_Mode:
+            return "Exclusion";
+        case SkXfermode::kHue_Mode:
+            return "Hue";
+        case SkXfermode::kSaturation_Mode:
+            return "Saturation";
+        case SkXfermode::kColor_Mode:
+            return "Color";
+        case SkXfermode::kLuminosity_Mode:
+            return "Luminosity";
 
         // These are handled in SkPDFDevice::setUpContentEntry.
         case SkXfermode::kClear_Mode:
@@ -47,241 +65,155 @@ static const char* blend_mode_from_xfermode(SkXfermode::Mode mode) {
         // TODO(vandebo): Figure out if we can support more of these modes.
         case SkXfermode::kXor_Mode:
         case SkXfermode::kPlus_Mode:
-            return NULL;
+            return nullptr;
     }
-    return NULL;
+    return nullptr;
 }
 
-SkPDFGraphicState::~SkPDFGraphicState() {
-    SkAutoMutexAcquire lock(CanonicalPaintsMutex());
-    if (!fSMask) {
-        int index = Find(fPaint);
-        SkASSERT(index >= 0);
-        SkASSERT(CanonicalPaints()[index].fGraphicState == this);
-        CanonicalPaints().removeShuffle(index);
+// If a SkXfermode is unsupported in PDF, this function returns
+// SrcOver, otherwise, it returns that Xfermode as a Mode.
+static SkXfermode::Mode mode_for_pdf(const SkXfermode* xfermode) {
+    SkXfermode::Mode mode = SkXfermode::kSrcOver_Mode;
+    if (xfermode) {
+        xfermode->asMode(&mode);
     }
-    fResources.unrefAll();
-}
-
-void SkPDFGraphicState::getResources(
-        const SkTSet<SkPDFObject*>& knownResourceObjects,
-        SkTSet<SkPDFObject*>* newResourceObjects) {
-    GetResourcesHelper(&fResources, knownResourceObjects, newResourceObjects);
-}
-
-void SkPDFGraphicState::emitObject(SkWStream* stream, SkPDFCatalog* catalog,
-                                   bool indirect) {
-    populateDict();
-    SkPDFDict::emitObject(stream, catalog, indirect);
-}
-
-// static
-size_t SkPDFGraphicState::getOutputSize(SkPDFCatalog* catalog, bool indirect) {
-    populateDict();
-    return SkPDFDict::getOutputSize(catalog, indirect);
-}
-
-// static
-SkTDArray<SkPDFGraphicState::GSCanonicalEntry>& SkPDFGraphicState::CanonicalPaints() {
-    CanonicalPaintsMutex().assertHeld();
-    static SkTDArray<SkPDFGraphicState::GSCanonicalEntry> gCanonicalPaints;
-    return gCanonicalPaints;
-}
-
-SK_DECLARE_STATIC_MUTEX(gCanonicalPaintsMutex);
-// static
-SkBaseMutex& SkPDFGraphicState::CanonicalPaintsMutex() {
-    return gCanonicalPaintsMutex;
-}
-
-// static
-SkPDFGraphicState* SkPDFGraphicState::GetGraphicStateForPaint(const SkPaint& paint) {
-    SkAutoMutexAcquire lock(CanonicalPaintsMutex());
-    int index = Find(paint);
-    if (index >= 0) {
-        CanonicalPaints()[index].fGraphicState->ref();
-        return CanonicalPaints()[index].fGraphicState;
+    switch (mode) {
+        case SkXfermode::kSrcOver_Mode:
+        case SkXfermode::kMultiply_Mode:
+        case SkXfermode::kScreen_Mode:
+        case SkXfermode::kOverlay_Mode:
+        case SkXfermode::kDarken_Mode:
+        case SkXfermode::kLighten_Mode:
+        case SkXfermode::kColorDodge_Mode:
+        case SkXfermode::kColorBurn_Mode:
+        case SkXfermode::kHardLight_Mode:
+        case SkXfermode::kSoftLight_Mode:
+        case SkXfermode::kDifference_Mode:
+        case SkXfermode::kExclusion_Mode:
+        case SkXfermode::kHue_Mode:
+        case SkXfermode::kSaturation_Mode:
+        case SkXfermode::kColor_Mode:
+        case SkXfermode::kLuminosity_Mode:
+            // Mode is suppported and handled by pdf graphics state.
+            return mode;
+        default:
+            return SkXfermode::kSrcOver_Mode;  // Default mode.
     }
-    GSCanonicalEntry newEntry(new SkPDFGraphicState(paint));
-    CanonicalPaints().push(newEntry);
-    return newEntry.fGraphicState;
 }
 
+SkPDFGraphicState::SkPDFGraphicState(const SkPaint& p)
+    : fStrokeWidth(p.getStrokeWidth())
+    , fStrokeMiter(p.getStrokeMiter())
+    , fAlpha(p.getAlpha())
+    , fStrokeCap(SkToU8(p.getStrokeCap()))
+    , fStrokeJoin(SkToU8(p.getStrokeJoin()))
+    , fMode(SkToU8(mode_for_pdf(p.getXfermode()))) {}
+
 // static
-SkPDFObject* SkPDFGraphicState::GetInvertFunction() {
-    // This assumes that canonicalPaintsMutex is held.
-    CanonicalPaintsMutex().assertHeld();
-    static SkPDFStream* invertFunction = NULL;
-    if (!invertFunction) {
-        // Acrobat crashes if we use a type 0 function, kpdf crashes if we use
-        // a type 2 function, so we use a type 4 function.
-        SkAutoTUnref<SkPDFArray> domainAndRange(new SkPDFArray);
-        domainAndRange->reserve(2);
-        domainAndRange->appendInt(0);
-        domainAndRange->appendInt(1);
-
-        static const char psInvert[] = "{1 exch sub}";
-        // Do not copy the trailing '\0' into the SkData.
-        SkAutoTUnref<SkData> psInvertStream(
-                SkData::NewWithCopy(psInvert, strlen(psInvert)));
-
-        invertFunction = new SkPDFStream(psInvertStream.get());
-        invertFunction->insertInt("FunctionType", 4);
-        invertFunction->insert("Domain", domainAndRange.get());
-        invertFunction->insert("Range", domainAndRange.get());
+SkPDFGraphicState* SkPDFGraphicState::GetGraphicStateForPaint(
+        SkPDFCanon* canon, const SkPaint& paint) {
+    SkASSERT(canon);
+    SkPDFGraphicState key(paint);
+    if (const SkPDFGraphicState* canonGS = canon->findGraphicState(key)) {
+        // The returned SkPDFGraphicState must be made non-const,
+        // since the emitObject() interface is non-const.  But We
+        // promise that there is no way to mutate this object from
+        // here on out.
+        return SkRef(const_cast<SkPDFGraphicState*>(canonGS));
     }
+    SkPDFGraphicState* pdfGraphicState = new SkPDFGraphicState(paint);
+    canon->addGraphicState(pdfGraphicState);
+    return pdfGraphicState;
+}
+
+static SkPDFObject* create_invert_function() {
+    // Acrobat crashes if we use a type 0 function, kpdf crashes if we use
+    // a type 2 function, so we use a type 4 function.
+    SkAutoTUnref<SkPDFArray> domainAndRange(new SkPDFArray);
+    domainAndRange->reserve(2);
+    domainAndRange->appendInt(0);
+    domainAndRange->appendInt(1);
+
+    static const char psInvert[] = "{1 exch sub}";
+    // Do not copy the trailing '\0' into the SkData.
+    SkAutoTUnref<SkData> psInvertStream(
+            SkData::NewWithoutCopy(psInvert, strlen(psInvert)));
+
+    SkPDFStream* invertFunction = new SkPDFStream(psInvertStream.get());
+    invertFunction->insertInt("FunctionType", 4);
+    invertFunction->insertObject("Domain", SkRef(domainAndRange.get()));
+    invertFunction->insertObject("Range", domainAndRange.detach());
     return invertFunction;
 }
 
+SK_DECLARE_STATIC_ONCE_PTR(SkPDFObject, invertFunction);
+
 // static
-SkPDFGraphicState* SkPDFGraphicState::GetSMaskGraphicState(
-        SkPDFFormXObject* sMask, bool invert, SkPDFSMaskMode sMaskMode) {
+SkPDFDict* SkPDFGraphicState::GetSMaskGraphicState(SkPDFFormXObject* sMask,
+                                                   bool invert,
+                                                   SkPDFSMaskMode sMaskMode) {
     // The practical chances of using the same mask more than once are unlikely
     // enough that it's not worth canonicalizing.
-    SkAutoMutexAcquire lock(CanonicalPaintsMutex());
-
     SkAutoTUnref<SkPDFDict> sMaskDict(new SkPDFDict("Mask"));
     if (sMaskMode == kAlpha_SMaskMode) {
         sMaskDict->insertName("S", "Alpha");
     } else if (sMaskMode == kLuminosity_SMaskMode) {
         sMaskDict->insertName("S", "Luminosity");
     }
-    sMaskDict->insert("G", new SkPDFObjRef(sMask))->unref();
-
-    SkPDFGraphicState* result = new SkPDFGraphicState;
-    result->fPopulated = true;
-    result->fSMask = true;
-    result->insertName("Type", "ExtGState");
-    result->insert("SMask", sMaskDict.get());
-    result->fResources.push(sMask);
-    sMask->ref();
-
+    sMaskDict->insertObjRef("G", SkRef(sMask));
     if (invert) {
-        SkPDFObject* invertFunction = GetInvertFunction();
-        result->fResources.push(invertFunction);
-        invertFunction->ref();
-        sMaskDict->insert("TR", new SkPDFObjRef(invertFunction))->unref();
+        sMaskDict->insertObjRef("TR", SkRef(invertFunction.get(create_invert_function)));
     }
 
+    SkPDFDict* result = new SkPDFDict("ExtGState");
+    result->insertObject("SMask", sMaskDict.detach());
     return result;
 }
 
-// static
-SkPDFGraphicState* SkPDFGraphicState::GetNoSMaskGraphicState() {
-    SkAutoMutexAcquire lock(CanonicalPaintsMutex());
-    static SkPDFGraphicState* noSMaskGS = NULL;
-    if (!noSMaskGS) {
-        noSMaskGS = new SkPDFGraphicState;
-        noSMaskGS->fPopulated = true;
-        noSMaskGS->fSMask = true;
-        noSMaskGS->insertName("Type", "ExtGState");
-        noSMaskGS->insertName("SMask", "None");
-    }
-    noSMaskGS->ref();
+static SkPDFDict* create_no_smask_graphic_state() {
+    SkPDFDict* noSMaskGS = new SkPDFDict("ExtGState");
+    noSMaskGS->insertName("SMask", "None");
     return noSMaskGS;
 }
+SK_DECLARE_STATIC_ONCE_PTR(SkPDFDict, noSMaskGraphicState);
 
 // static
-int SkPDFGraphicState::Find(const SkPaint& paint) {
-    CanonicalPaintsMutex().assertHeld();
-    GSCanonicalEntry search(&paint);
-    return CanonicalPaints().find(search);
+SkPDFDict* SkPDFGraphicState::GetNoSMaskGraphicState() {
+    return SkRef(noSMaskGraphicState.get(create_no_smask_graphic_state));
 }
 
-SkPDFGraphicState::SkPDFGraphicState()
-    : fPopulated(false),
-      fSMask(false) {
-}
-
-SkPDFGraphicState::SkPDFGraphicState(const SkPaint& paint)
-    : fPaint(paint),
-      fPopulated(false),
-      fSMask(false) {
-}
-
-// populateDict and operator== have to stay in sync with each other.
-void SkPDFGraphicState::populateDict() {
-    if (!fPopulated) {
-        fPopulated = true;
-        insertName("Type", "ExtGState");
-
-        SkAutoTUnref<SkPDFScalar> alpha(
-            new SkPDFScalar(SkScalarDiv(fPaint.getAlpha(), 0xFF)));
-        insert("CA", alpha.get());
-        insert("ca", alpha.get());
-
-        SK_COMPILE_ASSERT(SkPaint::kButt_Cap == 0, paint_cap_mismatch);
-        SK_COMPILE_ASSERT(SkPaint::kRound_Cap == 1, paint_cap_mismatch);
-        SK_COMPILE_ASSERT(SkPaint::kSquare_Cap == 2, paint_cap_mismatch);
-        SK_COMPILE_ASSERT(SkPaint::kCapCount == 3, paint_cap_mismatch);
-        SkASSERT(fPaint.getStrokeCap() >= 0 && fPaint.getStrokeCap() <= 2);
-        insertInt("LC", fPaint.getStrokeCap());
-
-        SK_COMPILE_ASSERT(SkPaint::kMiter_Join == 0, paint_join_mismatch);
-        SK_COMPILE_ASSERT(SkPaint::kRound_Join == 1, paint_join_mismatch);
-        SK_COMPILE_ASSERT(SkPaint::kBevel_Join == 2, paint_join_mismatch);
-        SK_COMPILE_ASSERT(SkPaint::kJoinCount == 3, paint_join_mismatch);
-        SkASSERT(fPaint.getStrokeJoin() >= 0 && fPaint.getStrokeJoin() <= 2);
-        insertInt("LJ", fPaint.getStrokeJoin());
-
-        insertScalar("LW", fPaint.getStrokeWidth());
-        insertScalar("ML", fPaint.getStrokeMiter());
-        insert("SA", new SkPDFBool(true))->unref();  // Auto stroke adjustment.
-
-        SkXfermode::Mode xfermode = SkXfermode::kSrcOver_Mode;
-        // If asMode fails, default to kSrcOver_Mode.
-        if (fPaint.getXfermode())
-            fPaint.getXfermode()->asMode(&xfermode);
-        // If we don't support the mode, just use kSrcOver_Mode.
-        if (xfermode < 0 || xfermode > SkXfermode::kLastMode ||
-                blend_mode_from_xfermode(xfermode) == NULL) {
-            xfermode = SkXfermode::kSrcOver_Mode;
-            NOT_IMPLEMENTED("unsupported xfermode", false);
-        }
-        insertName("BM", blend_mode_from_xfermode(xfermode));
-    }
-}
-
-// We're only interested in some fields of the SkPaint, so we have a custom
-// operator== function.
-bool SkPDFGraphicState::GSCanonicalEntry::operator==(
-        const SkPDFGraphicState::GSCanonicalEntry& gs) const {
-    const SkPaint* a = fPaint;
-    const SkPaint* b = gs.fPaint;
-    SkASSERT(a != NULL);
-    SkASSERT(b != NULL);
-
-    if (SkColorGetA(a->getColor()) != SkColorGetA(b->getColor()) ||
-           a->getStrokeCap() != b->getStrokeCap() ||
-           a->getStrokeJoin() != b->getStrokeJoin() ||
-           a->getStrokeWidth() != b->getStrokeWidth() ||
-           a->getStrokeMiter() != b->getStrokeMiter()) {
-        return false;
-    }
-
-    SkXfermode::Mode aXfermodeName = SkXfermode::kSrcOver_Mode;
-    SkXfermode* aXfermode = a->getXfermode();
-    if (aXfermode) {
-        aXfermode->asMode(&aXfermodeName);
-    }
-    if (aXfermodeName < 0 || aXfermodeName > SkXfermode::kLastMode ||
-            blend_mode_from_xfermode(aXfermodeName) == NULL) {
-        aXfermodeName = SkXfermode::kSrcOver_Mode;
-    }
-    const char* aXfermodeString = blend_mode_from_xfermode(aXfermodeName);
-    SkASSERT(aXfermodeString != NULL);
-
-    SkXfermode::Mode bXfermodeName = SkXfermode::kSrcOver_Mode;
-    SkXfermode* bXfermode = b->getXfermode();
-    if (bXfermode) {
-        bXfermode->asMode(&bXfermodeName);
-    }
-    if (bXfermodeName < 0 || bXfermodeName > SkXfermode::kLastMode ||
-            blend_mode_from_xfermode(bXfermodeName) == NULL) {
-        bXfermodeName = SkXfermode::kSrcOver_Mode;
-    }
-    const char* bXfermodeString = blend_mode_from_xfermode(bXfermodeName);
-    SkASSERT(bXfermodeString != NULL);
-
-    return strcmp(aXfermodeString, bXfermodeString) == 0;
+void SkPDFGraphicState::emitObject(
+        SkWStream* stream,
+        const SkPDFObjNumMap& objNumMap,
+        const SkPDFSubstituteMap& substitutes) const {
+    SkAutoTUnref<SkPDFDict> dict(new SkPDFDict("ExtGState"));
+    dict->insertName("Type", "ExtGState");
+
+    SkScalar alpha = SkIntToScalar(fAlpha) / 0xFF;
+    dict->insertScalar("CA", alpha);
+    dict->insertScalar("ca", alpha);
+
+    SkPaint::Cap strokeCap = (SkPaint::Cap)fStrokeCap;
+    SkPaint::Join strokeJoin = (SkPaint::Join)fStrokeJoin;
+    SkXfermode::Mode xferMode = (SkXfermode::Mode)fMode;
+
+    static_assert(SkPaint::kButt_Cap == 0, "paint_cap_mismatch");
+    static_assert(SkPaint::kRound_Cap == 1, "paint_cap_mismatch");
+    static_assert(SkPaint::kSquare_Cap == 2, "paint_cap_mismatch");
+    static_assert(SkPaint::kCapCount == 3, "paint_cap_mismatch");
+    SkASSERT(strokeCap >= 0 && strokeCap <= 2);
+    dict->insertInt("LC", strokeCap);
+
+    static_assert(SkPaint::kMiter_Join == 0, "paint_join_mismatch");
+    static_assert(SkPaint::kRound_Join == 1, "paint_join_mismatch");
+    static_assert(SkPaint::kBevel_Join == 2, "paint_join_mismatch");
+    static_assert(SkPaint::kJoinCount == 3, "paint_join_mismatch");
+    SkASSERT(strokeJoin >= 0 && strokeJoin <= 2);
+    dict->insertInt("LJ", strokeJoin);
+
+    dict->insertScalar("LW", fStrokeWidth);
+    dict->insertScalar("ML", fStrokeMiter);
+    dict->insertBool("SA", true);  // SA = Auto stroke adjustment.
+    dict->insertName("BM", as_blend_mode(xferMode));
+    dict->emitObject(stream, objNumMap, substitutes);
 }
diff --git a/gfx/skia/skia/src/pdf/SkPDFGraphicState.h b/gfx/skia/skia/src/pdf/SkPDFGraphicState.h
index 9182efeffb02..d816f721201d 100644
--- a/gfx/skia/skia/src/pdf/SkPDFGraphicState.h
+++ b/gfx/skia/skia/src/pdf/SkPDFGraphicState.h
@@ -12,38 +12,29 @@
 
 #include "SkPaint.h"
 #include "SkPDFTypes.h"
-#include "SkTemplates.h"
-#include "SkThread.h"
+#include "SkChecksum.h"
 
+class SkPDFCanon;
 class SkPDFFormXObject;
 
 /** \class SkPDFGraphicState
     SkPaint objects roughly correspond to graphic state dictionaries that can
     be installed. So that a given dictionary is only output to the pdf file
-    once, we want to canonicalize them. Static methods in this class manage
-    a weakly referenced set of SkPDFGraphicState objects: when the last
-    reference to a SkPDFGraphicState is removed, it removes itself from the
-    static set of objects.
-
+    once, we want to canonicalize them.
 */
-class SkPDFGraphicState : public SkPDFDict {
-    SK_DECLARE_INST_COUNT(SkPDFGraphicState)
+class SkPDFGraphicState final : public SkPDFObject {
+    
 public:
     enum SkPDFSMaskMode {
         kAlpha_SMaskMode,
         kLuminosity_SMaskMode
     };
 
-    virtual ~SkPDFGraphicState();
-
-    virtual void getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
-                              SkTSet<SkPDFObject*>* newResourceObjects);
-
-    // Override emitObject and getOutputSize so that we can populate
-    // the dictionary on demand.
-    virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog,
-                            bool indirect);
-    virtual size_t getOutputSize(SkPDFCatalog* catalog, bool indirect);
+    // Override emitObject so that we can populate the dictionary on
+    // demand.
+    void emitObject(SkWStream* stream,
+                    const SkPDFObjNumMap& objNumMap,
+                    const SkPDFSubstituteMap& substitutes) const override;
 
     /** Get the graphic state for the passed SkPaint. The reference count of
      *  the object is incremented and it is the caller's responsibility to
@@ -52,7 +43,8 @@ public:
      *  other references.
      *  @param paint  The SkPaint to emulate.
      */
-    static SkPDFGraphicState* GetGraphicStateForPaint(const SkPaint& paint);
+    static SkPDFGraphicState* GetGraphicStateForPaint(SkPDFCanon* canon,
+                                                      const SkPaint& paint);
 
     /** Make a graphic state that only sets the passed soft mask. The
      *  reference count of the object is incremented and it is the caller's
@@ -60,51 +52,38 @@ public:
      *  @param sMask     The form xobject to use as a soft mask.
      *  @param invert    Indicates if the alpha of the sMask should be inverted.
      *  @param sMaskMode Whether to use alpha or luminosity for the sMask.
+     *
+     *  These are not de-duped.
      */
-    static SkPDFGraphicState* GetSMaskGraphicState(SkPDFFormXObject* sMask,
-                                                   bool invert,
-                                                   SkPDFSMaskMode sMaskMode);
+    static SkPDFDict* GetSMaskGraphicState(SkPDFFormXObject* sMask,
+                                           bool invert,
+                                           SkPDFSMaskMode sMaskMode);
 
     /** Get a graphic state that only unsets the soft mask. The reference
      *  count of the object is incremented and it is the caller's responsibility
      *  to unreference it when done. This is needed to accommodate the weak
      *  reference pattern used when the returned object is new and has no
      *  other references.
+     *
+     *  The returned object is a singleton.
      */
-    static SkPDFGraphicState* GetNoSMaskGraphicState();
+    static SkPDFDict* GetNoSMaskGraphicState();
+
+    bool operator==(const SkPDFGraphicState& rhs) const {
+        return 0 == memcmp(&fStrokeWidth, &rhs.fStrokeWidth, 12);
+    }
+    uint32_t hash() const { return SkChecksum::Murmur3(&fStrokeWidth, 12); }
 
 private:
-    const SkPaint fPaint;
-    SkTDArray<SkPDFObject*> fResources;
-    bool fPopulated;
-    bool fSMask;
+    const SkScalar fStrokeWidth;
+    const SkScalar fStrokeMiter;
+    const uint8_t fAlpha;
+    const uint8_t fStrokeCap;   // SkPaint::Cap
+    const uint8_t fStrokeJoin;  // SkPaint::Join
+    const uint8_t fMode;        // SkXfermode::Mode
 
-    class GSCanonicalEntry {
-    public:
-        SkPDFGraphicState* fGraphicState;
-        const SkPaint* fPaint;
+    SkPDFGraphicState(const SkPaint&);
 
-        bool operator==(const GSCanonicalEntry& b) const;
-        explicit GSCanonicalEntry(SkPDFGraphicState* gs)
-            : fGraphicState(gs),
-              fPaint(&gs->fPaint) {}
-        explicit GSCanonicalEntry(const SkPaint* paint)
-            : fGraphicState(NULL),
-              fPaint(paint) {}
-    };
-
-    // This should be made a hash table if performance is a problem.
-    static SkTDArray<GSCanonicalEntry>& CanonicalPaints();
-    static SkBaseMutex& CanonicalPaintsMutex();
-
-    SkPDFGraphicState();
-    explicit SkPDFGraphicState(const SkPaint& paint);
-
-    void populateDict();
-
-    static SkPDFObject* GetInvertFunction();
-
-    static int Find(const SkPaint& paint);
     typedef SkPDFDict INHERITED;
 };
 
diff --git a/gfx/skia/skia/src/pdf/SkPDFImage.cpp b/gfx/skia/skia/src/pdf/SkPDFImage.cpp
deleted file mode 100644
index 7e17f98a1577..000000000000
--- a/gfx/skia/skia/src/pdf/SkPDFImage.cpp
+++ /dev/null
@@ -1,631 +0,0 @@
-/*
- * Copyright 2010 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkPDFImage.h"
-
-#include "SkBitmap.h"
-#include "SkColor.h"
-#include "SkColorPriv.h"
-#include "SkData.h"
-#include "SkFlate.h"
-#include "SkPDFCatalog.h"
-#include "SkRect.h"
-#include "SkStream.h"
-#include "SkString.h"
-#include "SkUnPreMultiply.h"
-
-static const int kNoColorTransform = 0;
-
-static bool skip_compression(SkPDFCatalog* catalog) {
-    return SkToBool(catalog->getDocumentFlags() &
-                    SkPDFDocument::kFavorSpeedOverSize_Flags);
-}
-
-static size_t get_uncompressed_size(const SkBitmap& bitmap,
-                                    const SkIRect& srcRect) {
-    switch (bitmap.colorType()) {
-        case kIndex_8_SkColorType:
-            return srcRect.width() * srcRect.height();
-        case kARGB_4444_SkColorType:
-            return ((srcRect.width() * 3 + 1) / 2) * srcRect.height();
-        case kRGB_565_SkColorType:
-            return srcRect.width() * 3 * srcRect.height();
-        case kRGBA_8888_SkColorType:
-        case kBGRA_8888_SkColorType:
-            return srcRect.width() * 3 * srcRect.height();
-        case kAlpha_8_SkColorType:
-            return 1;
-        default:
-            SkASSERT(false);
-            return 0;
-    }
-}
-
-static SkStream* extract_index8_image(const SkBitmap& bitmap,
-                                      const SkIRect& srcRect) {
-    const int rowBytes = srcRect.width();
-    SkStream* stream = SkNEW_ARGS(SkMemoryStream,
-                                  (get_uncompressed_size(bitmap, srcRect)));
-    uint8_t* dst = (uint8_t*)stream->getMemoryBase();
-
-    for (int y = srcRect.fTop; y < srcRect.fBottom; y++) {
-        memcpy(dst, bitmap.getAddr8(srcRect.fLeft, y), rowBytes);
-        dst += rowBytes;
-    }
-    return stream;
-}
-
-static SkStream* extract_argb4444_data(const SkBitmap& bitmap,
-                                       const SkIRect& srcRect,
-                                       bool extractAlpha,
-                                       bool* isOpaque,
-                                       bool* isTransparent) {
-    SkStream* stream;
-    uint8_t* dst = NULL;
-    if (extractAlpha) {
-        const int alphaRowBytes = (srcRect.width() + 1) / 2;
-        stream = SkNEW_ARGS(SkMemoryStream,
-                            (alphaRowBytes * srcRect.height()));
-    } else {
-        stream = SkNEW_ARGS(SkMemoryStream,
-                            (get_uncompressed_size(bitmap, srcRect)));
-    }
-    dst = (uint8_t*)stream->getMemoryBase();
-
-    for (int y = srcRect.fTop; y < srcRect.fBottom; y++) {
-        uint16_t* src = bitmap.getAddr16(0, y);
-        int x;
-        for (x = srcRect.fLeft; x + 1 < srcRect.fRight; x += 2) {
-            if (extractAlpha) {
-                dst[0] = (SkGetPackedA4444(src[x]) << 4) |
-                    SkGetPackedA4444(src[x + 1]);
-                *isOpaque &= dst[0] == SK_AlphaOPAQUE;
-                *isTransparent &= dst[0] == SK_AlphaTRANSPARENT;
-                dst++;
-            } else {
-                dst[0] = (SkGetPackedR4444(src[x]) << 4) |
-                    SkGetPackedG4444(src[x]);
-                dst[1] = (SkGetPackedB4444(src[x]) << 4) |
-                    SkGetPackedR4444(src[x + 1]);
-                dst[2] = (SkGetPackedG4444(src[x + 1]) << 4) |
-                    SkGetPackedB4444(src[x + 1]);
-                dst += 3;
-            }
-        }
-        if (srcRect.width() & 1) {
-            if (extractAlpha) {
-                dst[0] = (SkGetPackedA4444(src[x]) << 4);
-                *isOpaque &= dst[0] == (SK_AlphaOPAQUE & 0xF0);
-                *isTransparent &= dst[0] == (SK_AlphaTRANSPARENT & 0xF0);
-                dst++;
-
-            } else {
-                dst[0] = (SkGetPackedR4444(src[x]) << 4) |
-                    SkGetPackedG4444(src[x]);
-                dst[1] = (SkGetPackedB4444(src[x]) << 4);
-                dst += 2;
-            }
-        }
-    }
-    return stream;
-}
-
-static SkStream* extract_rgb565_image(const SkBitmap& bitmap,
-                                      const SkIRect& srcRect) {
-    SkStream* stream = SkNEW_ARGS(SkMemoryStream,
-                                  (get_uncompressed_size(bitmap,
-                                                     srcRect)));
-    uint8_t* dst = (uint8_t*)stream->getMemoryBase();
-    for (int y = srcRect.fTop; y < srcRect.fBottom; y++) {
-        uint16_t* src = bitmap.getAddr16(0, y);
-        for (int x = srcRect.fLeft; x < srcRect.fRight; x++) {
-            dst[0] = SkGetPackedR16(src[x]);
-            dst[1] = SkGetPackedG16(src[x]);
-            dst[2] = SkGetPackedB16(src[x]);
-            dst += 3;
-        }
-    }
-    return stream;
-}
-
-static SkStream* extract_argb8888_data(const SkBitmap& bitmap,
-                                       const SkIRect& srcRect,
-                                       bool extractAlpha,
-                                       bool* isOpaque,
-                                       bool* isTransparent) {
-    SkStream* stream;
-    if (extractAlpha) {
-        stream = SkNEW_ARGS(SkMemoryStream,
-                            (srcRect.width() * srcRect.height()));
-    } else {
-        stream = SkNEW_ARGS(SkMemoryStream,
-                            (get_uncompressed_size(bitmap, srcRect)));
-    }
-    uint8_t* dst = (uint8_t*)stream->getMemoryBase();
-
-    for (int y = srcRect.fTop; y < srcRect.fBottom; y++) {
-        uint32_t* src = bitmap.getAddr32(0, y);
-        for (int x = srcRect.fLeft; x < srcRect.fRight; x++) {
-            if (extractAlpha) {
-                dst[0] = SkGetPackedA32(src[x]);
-                *isOpaque &= dst[0] == SK_AlphaOPAQUE;
-                *isTransparent &= dst[0] == SK_AlphaTRANSPARENT;
-                dst++;
-            } else {
-                dst[0] = SkGetPackedR32(src[x]);
-                dst[1] = SkGetPackedG32(src[x]);
-                dst[2] = SkGetPackedB32(src[x]);
-                dst += 3;
-            }
-        }
-    }
-    return stream;
-}
-
-static SkStream* extract_a8_alpha(const SkBitmap& bitmap,
-                                  const SkIRect& srcRect,
-                                  bool* isOpaque,
-                                  bool* isTransparent) {
-    const int alphaRowBytes = srcRect.width();
-    SkStream* stream = SkNEW_ARGS(SkMemoryStream,
-                                  (alphaRowBytes * srcRect.height()));
-    uint8_t* alphaDst = (uint8_t*)stream->getMemoryBase();
-
-    for (int y = srcRect.fTop; y < srcRect.fBottom; y++) {
-        uint8_t* src = bitmap.getAddr8(0, y);
-        for (int x = srcRect.fLeft; x < srcRect.fRight; x++) {
-            alphaDst[0] = src[x];
-            *isOpaque &= alphaDst[0] == SK_AlphaOPAQUE;
-            *isTransparent &= alphaDst[0] == SK_AlphaTRANSPARENT;
-            alphaDst++;
-        }
-    }
-    return stream;
-}
-
-static SkStream* create_black_image() {
-    SkStream* stream = SkNEW_ARGS(SkMemoryStream, (1));
-    ((uint8_t*)stream->getMemoryBase())[0] = 0;
-    return stream;
-}
-
-/**
- * Extract either the color or image data from a SkBitmap into a SkStream.
- * @param bitmap        Bitmap to extract data from.
- * @param srcRect       Region in the bitmap to extract.
- * @param extractAlpha  Set to true to extract the alpha data or false to
- *                      extract the color data.
- * @param isTransparent Pointer to a bool to output whether the alpha is
- *                      completely transparent. May be NULL. Only valid when
- *                      extractAlpha == true.
- * @return              Unencoded image data, or NULL if either data was not
- *                      available or alpha data was requested but the image was
- *                      entirely transparent or opaque.
- */
-static SkStream* extract_image_data(const SkBitmap& bitmap,
-                                    const SkIRect& srcRect,
-                                    bool extractAlpha, bool* isTransparent) {
-    SkColorType colorType = bitmap.colorType();
-    if (extractAlpha && (kIndex_8_SkColorType == colorType ||
-                         kRGB_565_SkColorType == colorType)) {
-        if (isTransparent != NULL) {
-            *isTransparent = false;
-        }
-        return NULL;
-    }
-    bool isOpaque = true;
-    bool transparent = extractAlpha;
-    SkStream* stream = NULL;
-
-    bitmap.lockPixels();
-    switch (colorType) {
-        case kIndex_8_SkColorType:
-            if (!extractAlpha) {
-                stream = extract_index8_image(bitmap, srcRect);
-            }
-            break;
-        case kARGB_4444_SkColorType:
-            stream = extract_argb4444_data(bitmap, srcRect, extractAlpha,
-                                           &isOpaque, &transparent);
-            break;
-        case kRGB_565_SkColorType:
-            if (!extractAlpha) {
-                stream = extract_rgb565_image(bitmap, srcRect);
-            }
-            break;
-        case kN32_SkColorType:
-            stream = extract_argb8888_data(bitmap, srcRect, extractAlpha,
-                                           &isOpaque, &transparent);
-            break;
-        case kAlpha_8_SkColorType:
-            if (!extractAlpha) {
-                stream = create_black_image();
-            } else {
-                stream = extract_a8_alpha(bitmap, srcRect,
-                                          &isOpaque, &transparent);
-            }
-            break;
-        default:
-            SkASSERT(false);
-    }
-    bitmap.unlockPixels();
-
-    if (isTransparent != NULL) {
-        *isTransparent = transparent;
-    }
-    if (extractAlpha && (transparent || isOpaque)) {
-        SkSafeUnref(stream);
-        return NULL;
-    }
-    return stream;
-}
-
-static SkPDFArray* make_indexed_color_space(SkColorTable* table) {
-    SkPDFArray* result = new SkPDFArray();
-    result->reserve(4);
-    result->appendName("Indexed");
-    result->appendName("DeviceRGB");
-    result->appendInt(table->count() - 1);
-
-    // Potentially, this could be represented in fewer bytes with a stream.
-    // Max size as a string is 1.5k.
-    SkString index;
-    for (int i = 0; i < table->count(); i++) {
-        char buf[3];
-        SkColor color = SkUnPreMultiply::PMColorToColor((*table)[i]);
-        buf[0] = SkGetPackedR32(color);
-        buf[1] = SkGetPackedG32(color);
-        buf[2] = SkGetPackedB32(color);
-        index.append(buf, 3);
-    }
-    result->append(new SkPDFString(index))->unref();
-    return result;
-}
-
-/**
- * Removes the alpha component of an ARGB color (including unpremultiply) while
- * keeping the output in the same format as the input.
- */
-static uint32_t remove_alpha_argb8888(uint32_t pmColor) {
-    SkColor color = SkUnPreMultiply::PMColorToColor(pmColor);
-    return SkPackARGB32NoCheck(SK_AlphaOPAQUE,
-                               SkColorGetR(color),
-                               SkColorGetG(color),
-                               SkColorGetB(color));
-}
-
-static uint16_t remove_alpha_argb4444(uint16_t pmColor) {
-    return SkPixel32ToPixel4444(
-            remove_alpha_argb8888(SkPixel4444ToPixel32(pmColor)));
-}
-
-static uint32_t get_argb8888_neighbor_avg_color(const SkBitmap& bitmap,
-                                                int xOrig, int yOrig) {
-    uint8_t count = 0;
-    uint16_t r = 0;
-    uint16_t g = 0;
-    uint16_t b = 0;
-
-    for (int y = yOrig - 1; y <= yOrig + 1; y++) {
-        if (y < 0 || y >= bitmap.height()) {
-            continue;
-        }
-        uint32_t* src = bitmap.getAddr32(0, y);
-        for (int x = xOrig - 1; x <= xOrig + 1; x++) {
-            if (x < 0 || x >= bitmap.width()) {
-                continue;
-            }
-            if (SkGetPackedA32(src[x]) != SK_AlphaTRANSPARENT) {
-                uint32_t color = remove_alpha_argb8888(src[x]);
-                r += SkGetPackedR32(color);
-                g += SkGetPackedG32(color);
-                b += SkGetPackedB32(color);
-                count++;
-            }
-        }
-    }
-
-    if (count == 0) {
-        return SkPackARGB32NoCheck(SK_AlphaOPAQUE, 0, 0, 0);
-    } else {
-        return SkPackARGB32NoCheck(SK_AlphaOPAQUE,
-                                   r / count, g / count, b / count);
-    }
-}
-
-static uint16_t get_argb4444_neighbor_avg_color(const SkBitmap& bitmap,
-                                                int xOrig, int yOrig) {
-    uint8_t count = 0;
-    uint8_t r = 0;
-    uint8_t g = 0;
-    uint8_t b = 0;
-
-    for (int y = yOrig - 1; y <= yOrig + 1; y++) {
-        if (y < 0 || y >= bitmap.height()) {
-            continue;
-        }
-        uint16_t* src = bitmap.getAddr16(0, y);
-        for (int x = xOrig - 1; x <= xOrig + 1; x++) {
-            if (x < 0 || x >= bitmap.width()) {
-                continue;
-            }
-            if ((SkGetPackedA4444(src[x]) & 0x0F) != SK_AlphaTRANSPARENT) {
-                uint16_t color = remove_alpha_argb4444(src[x]);
-                r += SkGetPackedR4444(color);
-                g += SkGetPackedG4444(color);
-                b += SkGetPackedB4444(color);
-                count++;
-            }
-        }
-    }
-
-    if (count == 0) {
-        return SkPackARGB4444(SK_AlphaOPAQUE & 0x0F, 0, 0, 0);
-    } else {
-        return SkPackARGB4444(SK_AlphaOPAQUE & 0x0F,
-                                   r / count, g / count, b / count);
-    }
-}
-
-static SkBitmap unpremultiply_bitmap(const SkBitmap& bitmap,
-                                     const SkIRect& srcRect) {
-    SkBitmap outBitmap;
-    outBitmap.allocPixels(bitmap.info().makeWH(srcRect.width(), srcRect.height()));
-    int dstRow = 0;
-
-    outBitmap.lockPixels();
-    bitmap.lockPixels();
-    switch (bitmap.colorType()) {
-        case kARGB_4444_SkColorType: {
-            for (int y = srcRect.fTop; y < srcRect.fBottom; y++) {
-                uint16_t* dst = outBitmap.getAddr16(0, dstRow);
-                uint16_t* src = bitmap.getAddr16(0, y);
-                for (int x = srcRect.fLeft; x < srcRect.fRight; x++) {
-                    uint8_t a = SkGetPackedA4444(src[x]);
-                    // It is necessary to average the color component of
-                    // transparent pixels with their surrounding neighbors
-                    // since the PDF renderer may separately re-sample the
-                    // alpha and color channels when the image is not
-                    // displayed at its native resolution. Since an alpha of
-                    // zero gives no information about the color component,
-                    // the pathological case is a white image with sharp
-                    // transparency bounds - the color channel goes to black,
-                    // and the should-be-transparent pixels are rendered
-                    // as grey because of the separate soft mask and color
-                    // resizing.
-                    if (a == (SK_AlphaTRANSPARENT & 0x0F)) {
-                        *dst = get_argb4444_neighbor_avg_color(bitmap, x, y);
-                    } else {
-                        *dst = remove_alpha_argb4444(src[x]);
-                    }
-                    dst++;
-                }
-                dstRow++;
-            }
-            break;
-        }
-        case kN32_SkColorType: {
-            for (int y = srcRect.fTop; y < srcRect.fBottom; y++) {
-                uint32_t* dst = outBitmap.getAddr32(0, dstRow);
-                uint32_t* src = bitmap.getAddr32(0, y);
-                for (int x = srcRect.fLeft; x < srcRect.fRight; x++) {
-                    uint8_t a = SkGetPackedA32(src[x]);
-                    if (a == SK_AlphaTRANSPARENT) {
-                        *dst = get_argb8888_neighbor_avg_color(bitmap, x, y);
-                    } else {
-                        *dst = remove_alpha_argb8888(src[x]);
-                    }
-                    dst++;
-                }
-                dstRow++;
-            }
-            break;
-        }
-        default:
-            SkASSERT(false);
-    }
-    bitmap.unlockPixels();
-    outBitmap.unlockPixels();
-
-    outBitmap.setImmutable();
-
-    return outBitmap;
-}
-
-// static
-SkPDFImage* SkPDFImage::CreateImage(const SkBitmap& bitmap,
-                                    const SkIRect& srcRect,
-                                    SkPicture::EncodeBitmap encoder) {
-    if (bitmap.colorType() == kUnknown_SkColorType) {
-        return NULL;
-    }
-
-    bool isTransparent = false;
-    SkAutoTUnref<SkStream> alphaData;
-    if (!bitmap.isOpaque()) {
-        // Note that isOpaque is not guaranteed to return false for bitmaps
-        // with alpha support but a completely opaque alpha channel,
-        // so alphaData may still be NULL if we have a completely opaque
-        // (or transparent) bitmap.
-        alphaData.reset(
-                extract_image_data(bitmap, srcRect, true, &isTransparent));
-    }
-    if (isTransparent) {
-        return NULL;
-    }
-
-    SkPDFImage* image;
-    SkColorType colorType = bitmap.colorType();
-    if (alphaData.get() != NULL && (kN32_SkColorType == colorType ||
-                                    kARGB_4444_SkColorType == colorType)) {
-        SkBitmap unpremulBitmap = unpremultiply_bitmap(bitmap, srcRect);
-        image = SkNEW_ARGS(SkPDFImage, (NULL, unpremulBitmap, false,
-                           SkIRect::MakeWH(srcRect.width(), srcRect.height()),
-                           encoder));
-    } else {
-        image = SkNEW_ARGS(SkPDFImage, (NULL, bitmap, false, srcRect, encoder));
-    }
-    if (alphaData.get() != NULL) {
-        SkAutoTUnref<SkPDFImage> mask(
-                SkNEW_ARGS(SkPDFImage, (alphaData.get(), bitmap,
-                                        true, srcRect, NULL)));
-        image->addSMask(mask);
-    }
-
-    return image;
-}
-
-SkPDFImage::~SkPDFImage() {
-    fResources.unrefAll();
-}
-
-SkPDFImage* SkPDFImage::addSMask(SkPDFImage* mask) {
-    fResources.push(mask);
-    mask->ref();
-    insert("SMask", new SkPDFObjRef(mask))->unref();
-    return mask;
-}
-
-void SkPDFImage::getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
-                              SkTSet<SkPDFObject*>* newResourceObjects) {
-    GetResourcesHelper(&fResources, knownResourceObjects, newResourceObjects);
-}
-
-SkPDFImage::SkPDFImage(SkStream* stream,
-                       const SkBitmap& bitmap,
-                       bool isAlpha,
-                       const SkIRect& srcRect,
-                       SkPicture::EncodeBitmap encoder)
-    : fIsAlpha(isAlpha),
-      fSrcRect(srcRect),
-      fEncoder(encoder) {
-
-    if (bitmap.isImmutable()) {
-        fBitmap = bitmap;
-    } else {
-        bitmap.deepCopyTo(&fBitmap);
-        fBitmap.setImmutable();
-    }
-
-    if (stream != NULL) {
-        this->setData(stream);
-        fStreamValid = true;
-    } else {
-        fStreamValid = false;
-    }
-
-    SkColorType colorType = fBitmap.colorType();
-
-    insertName("Type", "XObject");
-    insertName("Subtype", "Image");
-
-    bool alphaOnly = (kAlpha_8_SkColorType == colorType);
-
-    if (!isAlpha && alphaOnly) {
-        // For alpha only images, we stretch a single pixel of black for
-        // the color/shape part.
-        SkAutoTUnref<SkPDFInt> one(new SkPDFInt(1));
-        insert("Width", one.get());
-        insert("Height", one.get());
-    } else {
-        insertInt("Width", fSrcRect.width());
-        insertInt("Height", fSrcRect.height());
-    }
-
-    if (isAlpha || alphaOnly) {
-        insertName("ColorSpace", "DeviceGray");
-    } else if (kIndex_8_SkColorType == colorType) {
-        SkAutoLockPixels alp(fBitmap);
-        insert("ColorSpace",
-               make_indexed_color_space(fBitmap.getColorTable()))->unref();
-    } else {
-        insertName("ColorSpace", "DeviceRGB");
-    }
-
-    int bitsPerComp = 8;
-    if (kARGB_4444_SkColorType == colorType) {
-        bitsPerComp = 4;
-    }
-    insertInt("BitsPerComponent", bitsPerComp);
-
-    if (kRGB_565_SkColorType == colorType) {
-        SkASSERT(!isAlpha);
-        SkAutoTUnref<SkPDFInt> zeroVal(new SkPDFInt(0));
-        SkAutoTUnref<SkPDFScalar> scale5Val(
-                new SkPDFScalar(8.2258f));  // 255/2^5-1
-        SkAutoTUnref<SkPDFScalar> scale6Val(
-                new SkPDFScalar(4.0476f));  // 255/2^6-1
-        SkAutoTUnref<SkPDFArray> decodeValue(new SkPDFArray());
-        decodeValue->reserve(6);
-        decodeValue->append(zeroVal.get());
-        decodeValue->append(scale5Val.get());
-        decodeValue->append(zeroVal.get());
-        decodeValue->append(scale6Val.get());
-        decodeValue->append(zeroVal.get());
-        decodeValue->append(scale5Val.get());
-        insert("Decode", decodeValue.get());
-    }
-}
-
-SkPDFImage::SkPDFImage(SkPDFImage& pdfImage)
-    : SkPDFStream(pdfImage),
-      fBitmap(pdfImage.fBitmap),
-      fIsAlpha(pdfImage.fIsAlpha),
-      fSrcRect(pdfImage.fSrcRect),
-      fEncoder(pdfImage.fEncoder),
-      fStreamValid(pdfImage.fStreamValid) {
-    // Nothing to do here - the image params are already copied in SkPDFStream's
-    // constructor, and the bitmap will be regenerated and encoded in
-    // populate.
-}
-
-bool SkPDFImage::populate(SkPDFCatalog* catalog) {
-    if (getState() == kUnused_State) {
-        // Initializing image data for the first time.
-        SkDynamicMemoryWStream dctCompressedWStream;
-        if (!skip_compression(catalog) && fEncoder &&
-                get_uncompressed_size(fBitmap, fSrcRect) > 1) {
-            SkBitmap subset;
-            // Extract subset
-            if (!fBitmap.extractSubset(&subset, fSrcRect)) {
-                return false;
-            }
-            size_t pixelRefOffset = 0;
-            SkAutoTUnref<SkData> data(fEncoder(&pixelRefOffset, subset));
-            if (data.get() && data->size() < get_uncompressed_size(fBitmap,
-                                                                   fSrcRect)) {
-                this->setData(data.get());
-
-                insertName("Filter", "DCTDecode");
-                insertInt("ColorTransform", kNoColorTransform);
-                insertInt("Length", this->dataSize());
-                setState(kCompressed_State);
-                return true;
-            }
-        }
-        // Fallback method
-        if (!fStreamValid) {
-            SkAutoTUnref<SkStream> stream(
-                    extract_image_data(fBitmap, fSrcRect, fIsAlpha, NULL));
-            this->setData(stream);
-            fStreamValid = true;
-        }
-        return INHERITED::populate(catalog);
-    } else if (getState() == kNoCompression_State &&
-            !skip_compression(catalog) &&
-            (SkFlate::HaveFlate() || fEncoder)) {
-        // Compression has not been requested when the stream was first created,
-        // but the new catalog wants it compressed.
-        if (!getSubstitute()) {
-            SkPDFStream* substitute = SkNEW_ARGS(SkPDFImage, (*this));
-            setSubstitute(substitute);
-            catalog->setSubstitute(this, substitute);
-        }
-        return false;
-    }
-    return true;
-}
diff --git a/gfx/skia/skia/src/pdf/SkPDFImage.h b/gfx/skia/skia/src/pdf/SkPDFImage.h
deleted file mode 100644
index 10f8be627077..000000000000
--- a/gfx/skia/skia/src/pdf/SkPDFImage.h
+++ /dev/null
@@ -1,98 +0,0 @@
-
-/*
- * Copyright 2010 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#ifndef SkPDFImage_DEFINED
-#define SkPDFImage_DEFINED
-
-#include "SkPicture.h"
-#include "SkPDFDevice.h"
-#include "SkPDFStream.h"
-#include "SkPDFTypes.h"
-#include "SkRefCnt.h"
-
-class SkBitmap;
-class SkPDFCatalog;
-struct SkIRect;
-
-/** \class SkPDFImage
-
-    An image XObject.
-*/
-
-// We could play the same trick here as is done in SkPDFGraphicState, storing
-// a copy of the Bitmap object (not the pixels), the pixel generation number,
-// and settings used from the paint to canonicalize image objects.
-class SkPDFImage : public SkPDFStream {
-public:
-    /** Create a new Image XObject to represent the passed bitmap.
-     *  @param bitmap   The image to encode.
-     *  @param srcRect  The rectangle to cut out of bitmap.
-     *  @param paint    Used to calculate alpha, masks, etc.
-     *  @return  The image XObject or NUll if there is nothing to draw for
-     *           the given parameters.
-     */
-    static SkPDFImage* CreateImage(const SkBitmap& bitmap,
-                                   const SkIRect& srcRect,
-                                   SkPicture::EncodeBitmap encoder);
-
-    virtual ~SkPDFImage();
-
-    /** Add a Soft Mask (alpha or shape channel) to the image.  Refs mask.
-     *  @param mask A gray scale image representing the mask.
-     *  @return The mask argument is returned.
-     */
-    SkPDFImage* addSMask(SkPDFImage* mask);
-
-    bool isEmpty() {
-        return fSrcRect.isEmpty();
-    }
-
-    // The SkPDFObject interface.
-    virtual void getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
-                              SkTSet<SkPDFObject*>* newResourceObjects);
-
-private:
-    SkBitmap fBitmap;
-    bool fIsAlpha;
-    SkIRect fSrcRect;
-    SkPicture::EncodeBitmap fEncoder;
-    bool fStreamValid;
-
-    SkTDArray<SkPDFObject*> fResources;
-
-    /** Create a PDF image XObject. Entries for the image properties are
-     *  automatically added to the stream dictionary.
-     *  @param stream     The image stream. May be NULL. Otherwise, this
-     *                    (instead of the input bitmap) will be used as the
-     *                    PDF's content stream, possibly with lossless encoding.
-     *  @param bitmap     The image. If a stream is not given, its color data
-     *                    will be used as the image. If a stream is given, this
-     *                    is used for configuration only.
-     *  @param isAlpha    Whether or not this is the alpha of an image.
-     *  @param srcRect    The clipping applied to bitmap before generating
-     *                    imageData.
-     *  @param encoder    A function used to encode the bitmap for compression.
-     *                    May be NULL.
-     */
-    SkPDFImage(SkStream* stream, const SkBitmap& bitmap, bool isAlpha,
-               const SkIRect& srcRect, SkPicture::EncodeBitmap encoder);
-
-    /** Copy constructor, used to generate substitutes.
-     *  @param image      The SkPDFImage to copy.
-     */
-    SkPDFImage(SkPDFImage& pdfImage);
-
-    // Populate the stream dictionary.  This method returns false if
-    // fSubstitute should be used.
-    virtual bool populate(SkPDFCatalog* catalog);
-
-    typedef SkPDFStream INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/pdf/SkPDFMetadata.cpp b/gfx/skia/skia/src/pdf/SkPDFMetadata.cpp
new file mode 100644
index 000000000000..3f181f5d73b9
--- /dev/null
+++ b/gfx/skia/skia/src/pdf/SkPDFMetadata.cpp
@@ -0,0 +1,350 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkPDFMetadata.h"
+#include "SkPDFTypes.h"
+
+#ifdef SK_PDF_GENERATE_PDFA
+#include "SkMD5.h"
+#endif
+
+static SkString pdf_date(const SkTime::DateTime& dt) {
+    int timeZoneMinutes = SkToInt(dt.fTimeZoneMinutes);
+    char timezoneSign = timeZoneMinutes >= 0 ? '+' : '-';
+    int timeZoneHours = SkTAbs(timeZoneMinutes) / 60;
+    timeZoneMinutes = SkTAbs(timeZoneMinutes) % 60;
+    return SkStringPrintf(
+            "D:%04u%02u%02u%02u%02u%02u%c%02d'%02d'",
+            static_cast<unsigned>(dt.fYear), static_cast<unsigned>(dt.fMonth),
+            static_cast<unsigned>(dt.fDay), static_cast<unsigned>(dt.fHour),
+            static_cast<unsigned>(dt.fMinute),
+            static_cast<unsigned>(dt.fSecond), timezoneSign, timeZoneHours,
+            timeZoneMinutes);
+}
+
+SkPDFObject* SkPDFMetadata::createDocumentInformationDict() const {
+    SkAutoTUnref<SkPDFDict> dict(new SkPDFDict);
+    static const char* keys[] = {
+            "Title", "Author", "Subject", "Keywords", "Creator"};
+    for (const char* key : keys) {
+        for (const SkDocument::Attribute& keyValue : fInfo) {
+            if (keyValue.fKey.equals(key)) {
+                dict->insertString(key, keyValue.fValue);
+            }
+        }
+    }
+    dict->insertString("Producer", "Skia/PDF");
+    if (fCreation) {
+        dict->insertString("CreationDate", pdf_date(*fCreation.get()));
+    }
+    if (fModified) {
+        dict->insertString("ModDate", pdf_date(*fModified.get()));
+    }
+    return dict.detach();
+}
+
+#ifdef SK_PDF_GENERATE_PDFA
+SkPDFMetadata::UUID SkPDFMetadata::uuid() const {
+    // The main requirement is for the UUID to be unique; the exact
+    // format of the data that will be hashed is not important.
+    SkMD5 md5;
+    const char uuidNamespace[] = "org.skia.pdf\n";
+    md5.write(uuidNamespace, strlen(uuidNamespace));
+    SkMSec msec = SkTime::GetMSecs();
+    md5.write(&msec, sizeof(msec));
+    SkTime::DateTime dateTime;
+    SkTime::GetDateTime(&dateTime);
+    md5.write(&dateTime, sizeof(dateTime));
+    if (fCreation) {
+        md5.write(fCreation.get(), sizeof(fCreation));
+    }
+    if (fModified) {
+        md5.write(fModified.get(), sizeof(fModified));
+    }
+    for (const auto& kv : fInfo) {
+        md5.write(kv.fKey.c_str(), kv.fKey.size());
+        md5.write("\037", 1);
+        md5.write(kv.fValue.c_str(), kv.fValue.size());
+        md5.write("\036", 1);
+    }
+    SkMD5::Digest digest;
+    md5.finish(digest);
+    // See RFC 4122, page 6-7.
+    digest.data[6] = (digest.data[6] & 0x0F) | 0x30;
+    digest.data[8] = (digest.data[6] & 0x3F) | 0x80;
+    static_assert(sizeof(digest) == sizeof(UUID), "uuid_size");
+    SkPDFMetadata::UUID uuid;
+    memcpy(&uuid, &digest, sizeof(digest));
+    return uuid;
+}
+
+SkPDFObject* SkPDFMetadata::CreatePdfId(const UUID& doc, const UUID& instance) {
+    // /ID [ <81b14aafa313db63dbd6f981e49f94f4>
+    //       <81b14aafa313db63dbd6f981e49f94f4> ]
+    SkAutoTUnref<SkPDFArray> array(new SkPDFArray);
+    static_assert(sizeof(UUID) == 16, "uuid_size");
+    array->appendString(
+            SkString(reinterpret_cast<const char*>(&doc), sizeof(UUID)));
+    array->appendString(
+            SkString(reinterpret_cast<const char*>(&instance), sizeof(UUID)));
+    return array.detach();
+}
+
+// Improvement on SkStringPrintf to allow for arbitrarily long output.
+// TODO: replace SkStringPrintf.
+static SkString sk_string_printf(const char* format, ...) {
+#ifdef SK_BUILD_FOR_WIN
+    va_list args;
+    va_start(args, format);
+    char buffer[1024];
+    int length = _vsnprintf_s(buffer, sizeof(buffer), _TRUNCATE, format, args);
+    va_end(args);
+    if (length >= 0 && length < (int)sizeof(buffer)) {
+        return SkString(buffer, length);
+    }
+    va_start(args, format);
+    length = _vscprintf(format, args);
+    va_end(args);
+
+    SkString string((size_t)length);
+    va_start(args, format);
+    SkDEBUGCODE(int check = ) _vsnprintf_s(string.writable_str(), length + 1,
+                                           _TRUNCATE, format, args);
+    va_end(args);
+    SkASSERT(check == length);
+    SkASSERT(string[length] == '\0');
+    return skstd::move(string);
+#else  // C99/C++11 standard vsnprintf
+    // TODO: When all compilers support this, remove windows-specific code.
+    va_list args;
+    va_start(args, format);
+    char buffer[1024];
+    int length = vsnprintf(buffer, sizeof(buffer), format, args);
+    va_end(args);
+    if (length < 0) {
+        return SkString();
+    }
+    if (length < (int)sizeof(buffer)) {
+        return SkString(buffer, length);
+    }
+    SkString string((size_t)length);
+    va_start(args, format);
+    SkDEBUGCODE(int check = )
+            vsnprintf(string.writable_str(), length + 1, format, args);
+    va_end(args);
+    SkASSERT(check == length);
+    SkASSERT(string[length] == '\0');
+    return skstd::move(string);
+#endif
+}
+
+static const SkString get(const SkTArray<SkDocument::Attribute>& info,
+                          const char* key) {
+    for (const auto& keyValue : info) {
+        if (keyValue.fKey.equals(key)) {
+            return keyValue.fValue;
+        }
+    }
+    return SkString();
+}
+
+#define HEXIFY(INPUT_PTR, OUTPUT_PTR, HEX_STRING, BYTE_COUNT) \
+    do {                                                      \
+        for (int i = 0; i < (BYTE_COUNT); ++i) {              \
+            uint8_t value = *(INPUT_PTR)++;                   \
+            *(OUTPUT_PTR)++ = (HEX_STRING)[value >> 4];       \
+            *(OUTPUT_PTR)++ = (HEX_STRING)[value & 0xF];      \
+        }                                                     \
+    } while (false)
+static SkString uuid_to_string(const SkPDFMetadata::UUID& uuid) {
+    //  8-4-4-4-12
+    char buffer[36];  // [32 + 4]
+    static const char gHex[] = "0123456789abcdef";
+    SkASSERT(strlen(gHex) == 16);
+    char* ptr = buffer;
+    const uint8_t* data = uuid.fData;
+    HEXIFY(data, ptr, gHex, 4);
+    *ptr++ = '-';
+    HEXIFY(data, ptr, gHex, 2);
+    *ptr++ = '-';
+    HEXIFY(data, ptr, gHex, 2);
+    *ptr++ = '-';
+    HEXIFY(data, ptr, gHex, 2);
+    *ptr++ = '-';
+    HEXIFY(data, ptr, gHex, 6);
+    SkASSERT(ptr == buffer + 36);
+    SkASSERT(data == uuid.fData + 16);
+    return SkString(buffer, 36);
+}
+#undef HEXIFY
+
+namespace {
+class PDFXMLObject final : public SkPDFObject {
+public:
+    PDFXMLObject(SkString xml) : fXML(skstd::move(xml)) {}
+    void emitObject(SkWStream* stream,
+                    const SkPDFObjNumMap& omap,
+                    const SkPDFSubstituteMap& smap) const override {
+        SkPDFDict dict("Metadata");
+        dict.insertName("Subtype", "XML");
+        dict.insertInt("Length", fXML.size());
+        dict.emitObject(stream, omap, smap);
+        static const char streamBegin[] = " stream\n";
+        stream->write(streamBegin, strlen(streamBegin));
+        // Do not compress this.  The standard requires that a
+        // program that does not understand PDF can grep for
+        // "<?xpacket" and extracť the entire XML.
+        stream->write(fXML.c_str(), fXML.size());
+        static const char streamEnd[] = "\nendstream";
+        stream->write(streamEnd, strlen(streamEnd));
+    }
+
+private:
+    const SkString fXML;
+};
+}  // namespace
+
+static int count_xml_escape_size(const SkString& input) {
+    int extra = 0;
+    for (size_t i = 0; i < input.size(); ++i) {
+        if (input[i] == '&') {
+            extra += 4;  // strlen("&amp;") - strlen("&")
+        } else if (input[i] == '<') {
+            extra += 3;  // strlen("&lt;") - strlen("<")
+        }
+    }
+    return extra;
+}
+
+const SkString escape_xml(const SkString& input,
+                          const char* before = nullptr,
+                          const char* after = nullptr) {
+    if (input.size() == 0) {
+        return input;
+    }
+    // "&" --> "&amp;" and  "<" --> "&lt;"
+    // text is assumed to be in UTF-8
+    // all strings are xml content, not attribute values.
+    size_t beforeLen = before ? strlen(before) : 0;
+    size_t afterLen = after ? strlen(after) : 0;
+    int extra = count_xml_escape_size(input);
+    SkString output(input.size() + extra + beforeLen + afterLen);
+    char* out = output.writable_str();
+    if (before) {
+        strncpy(out, before, beforeLen);
+        out += beforeLen;
+    }
+    static const char kAmp[] = "&amp;";
+    static const char kLt[] = "&lt;";
+    for (size_t i = 0; i < input.size(); ++i) {
+        if (input[i] == '&') {
+            strncpy(out, kAmp, strlen(kAmp));
+            out += strlen(kAmp);
+        } else if (input[i] == '<') {
+            strncpy(out, kLt, strlen(kLt));
+            out += strlen(kLt);
+        } else {
+            *out++ = input[i];
+        }
+    }
+    if (after) {
+        strncpy(out, after, afterLen);
+        out += afterLen;
+    }
+    // Validate that we haven't written outside of our string.
+    SkASSERT(out == &output.writable_str()[output.size()]);
+    *out = '\0';
+    return skstd::move(output);
+}
+
+SkPDFObject* SkPDFMetadata::createXMPObject(const UUID& doc,
+                                            const UUID& instance) const {
+    static const char templateString[] =
+            "<?xpacket begin=\"\" id=\"W5M0MpCehiHzreSzNTczkc9d\"?>\n"
+            "<x:xmpmeta xmlns:x=\"adobe:ns:meta/\"\n"
+            " x:xmptk=\"Adobe XMP Core 5.4-c005 78.147326, "
+            "2012/08/23-13:03:03\">\n"
+            "<rdf:RDF "
+            "xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n"
+            "<rdf:Description rdf:about=\"\"\n"
+            " xmlns:xmp=\"http://ns.adobe.com/xap/1.0/\"\n"
+            " xmlns:dc=\"http://purl.org/dc/elements/1.1/\"\n"
+            " xmlns:xmpMM=\"http://ns.adobe.com/xap/1.0/mm/\"\n"
+            " xmlns:pdf=\"http://ns.adobe.com/pdf/1.3/\"\n"
+            " xmlns:pdfaid=\"http://www.aiim.org/pdfa/ns/id/\">\n"
+            "<pdfaid:part>2</pdfaid:part>\n"
+            "<pdfaid:conformance>B</pdfaid:conformance>\n"
+            "%s"  // ModifyDate
+            "%s"  // CreateDate
+            "%s"  // MetadataDate
+            "%s"  // xmp:CreatorTool
+            "<dc:format>application/pdf</dc:format>\n"
+            "%s"  // dc:title
+            "%s"  // dc:description
+            "%s"  // author
+            "%s"  // keywords
+            "<xmpMM:DocumentID>uuid:%s</xmpMM:DocumentID>\n"
+            "<xmpMM:InstanceID>uuid:%s</xmpMM:InstanceID>\n"
+            "<pdf:Producer>Skia/PDF</pdf:Producer>\n"
+            "%s"  // pdf:Keywords
+            "</rdf:Description>\n"
+            "</rdf:RDF>\n"
+            "</x:xmpmeta>\n"  // Note:  the standard suggests 4k of padding.
+            "<?xpacket end=\"w\"?>\n";
+
+    SkString creationDate;
+    SkString modificationDate;
+    SkString metadataDate;
+    if (fCreation) {
+        SkString tmp;
+        fCreation->toISO8601(&tmp);
+        SkASSERT(0 == count_xml_escape_size(tmp));
+        // YYYY-mm-ddTHH:MM:SS[+|-]ZZ:ZZ; no need to escape
+        creationDate = sk_string_printf("<xmp:CreateDate>%s</xmp:CreateDate>\n",
+                                        tmp.c_str());
+    }
+    if (fModified) {
+        SkString tmp;
+        fModified->toISO8601(&tmp);
+        SkASSERT(0 == count_xml_escape_size(tmp));
+        modificationDate = sk_string_printf(
+                "<xmp:ModifyDate>%s</xmp:ModifyDate>\n", tmp.c_str());
+        metadataDate = sk_string_printf(
+                "<xmp:MetadataDate>%s</xmp:MetadataDate>\n", tmp.c_str());
+    }
+
+    SkString title =
+            escape_xml(get(fInfo, "Title"), "<dc:title><rdf:Alt><rdf:li>",
+                       "</rdf:li></rdf:Alt></dc:title>\n");
+    SkString author =
+            escape_xml(get(fInfo, "Author"), "<dc:creator><rdf:Bag><rdf:li>",
+                       "</rdf:li></rdf:Bag></dc:creator>\n");
+    // TODO: in theory, XMP can support multiple authors.  Split on a delimiter?
+    SkString subject = escape_xml(get(fInfo, "Subject"),
+                                  "<dc:description><rdf:Alt><rdf:li>",
+                                  "</rdf:li></rdf:Alt></dc:description>\n");
+    SkString keywords1 =
+            escape_xml(get(fInfo, "Keywords"), "<dc:subject><rdf:Bag><rdf:li>",
+                       "</rdf:li></rdf:Bag></dc:subject>\n");
+    SkString keywords2 = escape_xml(get(fInfo, "Keywords"), "<pdf:Keywords>",
+                                    "</pdf:Keywords>\n");
+
+    // TODO: in theory, keywords can be a list too.
+    SkString creator = escape_xml(get(fInfo, "Creator"), "<xmp:CreatorTool>",
+                                  "</xmp:CreatorTool>\n");
+    SkString documentID = uuid_to_string(doc);  // no need to escape
+    SkASSERT(0 == count_xml_escape_size(documentID));
+    SkString instanceID = uuid_to_string(instance);
+    SkASSERT(0 == count_xml_escape_size(instanceID));
+    return new PDFXMLObject(sk_string_printf(
+            templateString, modificationDate.c_str(), creationDate.c_str(),
+            metadataDate.c_str(), creator.c_str(), title.c_str(),
+            subject.c_str(), author.c_str(), keywords1.c_str(),
+            documentID.c_str(), instanceID.c_str(), keywords2.c_str()));
+}
+
+#endif  // SK_PDF_GENERATE_PDFA
diff --git a/gfx/skia/skia/src/pdf/SkPDFMetadata.h b/gfx/skia/skia/src/pdf/SkPDFMetadata.h
new file mode 100644
index 000000000000..180d03befe67
--- /dev/null
+++ b/gfx/skia/skia/src/pdf/SkPDFMetadata.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPDFMetadata_DEFINED
+#define SkPDFMetadata_DEFINED
+
+#include "SkDocument.h"
+#include "SkTime.h"
+
+class SkPDFObject;
+
+struct SkPDFMetadata {
+    SkTArray<SkDocument::Attribute> fInfo;
+    SkAutoTDelete<const SkTime::DateTime> fCreation;
+    SkAutoTDelete<const SkTime::DateTime> fModified;
+
+    SkPDFObject* createDocumentInformationDict() const;
+
+#ifdef SK_PDF_GENERATE_PDFA
+    struct UUID {
+        uint8_t fData[16];
+    };
+    UUID uuid() const;
+    static SkPDFObject* CreatePdfId(const UUID& doc, const UUID& instance);
+    SkPDFObject* createXMPObject(const UUID& doc, const UUID& instance) const;
+#endif  // SK_PDF_GENERATE_PDFA
+};
+
+#endif  // SkPDFMetadata_DEFINED
diff --git a/gfx/skia/skia/src/pdf/SkPDFPage.cpp b/gfx/skia/skia/src/pdf/SkPDFPage.cpp
deleted file mode 100644
index cfb6790876f1..000000000000
--- a/gfx/skia/skia/src/pdf/SkPDFPage.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-
-/*
- * Copyright 2010 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#include "SkData.h"
-#include "SkPDFCatalog.h"
-#include "SkPDFDevice.h"
-#include "SkPDFPage.h"
-#include "SkPDFResourceDict.h"
-
-SkPDFPage::SkPDFPage(SkPDFDevice* content)
-    : SkPDFDict("Page"),
-      fDevice(content) {
-  SkSafeRef(content);
-}
-
-SkPDFPage::~SkPDFPage() {}
-
-void SkPDFPage::finalizePage(SkPDFCatalog* catalog, bool firstPage,
-                             const SkTSet<SkPDFObject*>& knownResourceObjects,
-                             SkTSet<SkPDFObject*>* newResourceObjects) {
-    SkPDFResourceDict* resourceDict = fDevice->getResourceDict();
-    if (fContentStream.get() == NULL) {
-        insert("Resources", resourceDict);
-        SkSafeUnref(this->insert("MediaBox", fDevice->copyMediaBox()));
-        if (!SkToBool(catalog->getDocumentFlags() &
-                      SkPDFDocument::kNoLinks_Flags)) {
-            SkPDFArray* annots = fDevice->getAnnotations();
-            if (annots && annots->size() > 0) {
-                insert("Annots", annots);
-            }
-        }
-
-        SkAutoTUnref<SkData> content(fDevice->copyContentToData());
-        fContentStream.reset(new SkPDFStream(content.get()));
-        insert("Contents", new SkPDFObjRef(fContentStream.get()))->unref();
-    }
-    catalog->addObject(fContentStream.get(), firstPage);
-    resourceDict->getReferencedResources(knownResourceObjects,
-                                         newResourceObjects,
-                                         true);
-}
-
-off_t SkPDFPage::getPageSize(SkPDFCatalog* catalog, off_t fileOffset) {
-    SkASSERT(fContentStream.get() != NULL);
-    catalog->setFileOffset(fContentStream.get(), fileOffset);
-    return fContentStream->getOutputSize(catalog, true);
-}
-
-void SkPDFPage::emitPage(SkWStream* stream, SkPDFCatalog* catalog) {
-    SkASSERT(fContentStream.get() != NULL);
-    fContentStream->emitObject(stream, catalog, true);
-}
-
-// static
-void SkPDFPage::GeneratePageTree(const SkTDArray<SkPDFPage*>& pages,
-                                 SkPDFCatalog* catalog,
-                                 SkTDArray<SkPDFDict*>* pageTree,
-                                 SkPDFDict** rootNode) {
-    // PDF wants a tree describing all the pages in the document.  We arbitrary
-    // choose 8 (kNodeSize) as the number of allowed children.  The internal
-    // nodes have type "Pages" with an array of children, a parent pointer, and
-    // the number of leaves below the node as "Count."  The leaves are passed
-    // into the method, have type "Page" and need a parent pointer. This method
-    // builds the tree bottom up, skipping internal nodes that would have only
-    // one child.
-    static const int kNodeSize = 8;
-
-    SkAutoTUnref<SkPDFName> kidsName(new SkPDFName("Kids"));
-    SkAutoTUnref<SkPDFName> countName(new SkPDFName("Count"));
-    SkAutoTUnref<SkPDFName> parentName(new SkPDFName("Parent"));
-
-    // curNodes takes a reference to its items, which it passes to pageTree.
-    SkTDArray<SkPDFDict*> curNodes;
-    curNodes.setReserve(pages.count());
-    for (int i = 0; i < pages.count(); i++) {
-        SkSafeRef(pages[i]);
-        curNodes.push(pages[i]);
-    }
-
-    // nextRoundNodes passes its references to nodes on to curNodes.
-    SkTDArray<SkPDFDict*> nextRoundNodes;
-    nextRoundNodes.setReserve((pages.count() + kNodeSize - 1)/kNodeSize);
-
-    int treeCapacity = kNodeSize;
-    do {
-        for (int i = 0; i < curNodes.count(); ) {
-            if (i > 0 && i + 1 == curNodes.count()) {
-                nextRoundNodes.push(curNodes[i]);
-                break;
-            }
-
-            SkPDFDict* newNode = new SkPDFDict("Pages");
-            SkAutoTUnref<SkPDFObjRef> newNodeRef(new SkPDFObjRef(newNode));
-
-            SkAutoTUnref<SkPDFArray> kids(new SkPDFArray);
-            kids->reserve(kNodeSize);
-
-            int count = 0;
-            for (; i < curNodes.count() && count < kNodeSize; i++, count++) {
-                curNodes[i]->insert(parentName.get(), newNodeRef.get());
-                kids->append(new SkPDFObjRef(curNodes[i]))->unref();
-
-                // TODO(vandebo): put the objects in strict access order.
-                // Probably doesn't matter because they are so small.
-                if (curNodes[i] != pages[0]) {
-                    pageTree->push(curNodes[i]);  // Transfer reference.
-                    catalog->addObject(curNodes[i], false);
-                } else {
-                    SkSafeUnref(curNodes[i]);
-                    catalog->addObject(curNodes[i], true);
-                }
-            }
-
-            // treeCapacity is the number of leaf nodes possible for the
-            // current set of subtrees being generated. (i.e. 8, 64, 512, ...).
-            // It is hard to count the number of leaf nodes in the current
-            // subtree. However, by construction, we know that unless it's the
-            // last subtree for the current depth, the leaf count will be
-            // treeCapacity, otherwise it's what ever is left over after
-            // consuming treeCapacity chunks.
-            int pageCount = treeCapacity;
-            if (i == curNodes.count()) {
-                pageCount = ((pages.count() - 1) % treeCapacity) + 1;
-            }
-            newNode->insert(countName.get(), new SkPDFInt(pageCount))->unref();
-            newNode->insert(kidsName.get(), kids.get());
-            nextRoundNodes.push(newNode);  // Transfer reference.
-        }
-
-        curNodes = nextRoundNodes;
-        nextRoundNodes.rewind();
-        treeCapacity *= kNodeSize;
-    } while (curNodes.count() > 1);
-
-    pageTree->push(curNodes[0]);  // Transfer reference.
-    catalog->addObject(curNodes[0], false);
-    if (rootNode) {
-        *rootNode = curNodes[0];
-    }
-}
-
-const SkTDArray<SkPDFFont*>& SkPDFPage::getFontResources() const {
-    return fDevice->getFontResources();
-}
-
-const SkPDFGlyphSetMap& SkPDFPage::getFontGlyphUsage() const {
-    return fDevice->getFontGlyphUsage();
-}
-
-void SkPDFPage::appendDestinations(SkPDFDict* dict) {
-    fDevice->appendDestinations(dict, this);
-}
diff --git a/gfx/skia/skia/src/pdf/SkPDFPage.h b/gfx/skia/skia/src/pdf/SkPDFPage.h
deleted file mode 100644
index 47573c7438d8..000000000000
--- a/gfx/skia/skia/src/pdf/SkPDFPage.h
+++ /dev/null
@@ -1,109 +0,0 @@
-
-/*
- * Copyright 2010 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#ifndef SkPDFPage_DEFINED
-#define SkPDFPage_DEFINED
-
-#include "SkPDFTypes.h"
-#include "SkPDFStream.h"
-#include "SkRefCnt.h"
-#include "SkTDArray.h"
-
-class SkPDFCatalog;
-class SkPDFDevice;
-class SkWStream;
-
-/** \class SkPDFPage
-
-    A SkPDFPage contains meta information about a page, is used in the page
-    tree and points to the content of the page.
-*/
-class SkPDFPage : public SkPDFDict {
-    SK_DECLARE_INST_COUNT(SkPDFPage)
-public:
-    /** Create a PDF page with the passed PDF device.  The device need not
-     *  have content on it yet.
-     *  @param content    The page content.
-     */
-    explicit SkPDFPage(SkPDFDevice* content);
-    ~SkPDFPage();
-
-    /** Before a page and its contents can be sized and emitted, it must
-     *  be finalized.  No changes to the PDFDevice will be honored after
-     *  finalizePage has been called.  This function adds the page content
-     *  to the passed catalog, so it must be called for each document
-     *  that the page is part of.
-     *  @param catalog         The catalog to add page content objects to.
-     *  @param firstPage       Indicate if this is the first page of a document.
-     *  @param newResourceObjects All the resource objects (recursively) used on
-     *                         the page are added to this array.  This gives
-     *                         the caller a chance to deduplicate resources
-     *                         across pages.
-     *  @param knownResourceObjects  The set of resources to be ignored.
-     */
-    void finalizePage(SkPDFCatalog* catalog, bool firstPage,
-                      const SkTSet<SkPDFObject*>& knownResourceObjects,
-                      SkTSet<SkPDFObject*>* newResourceObjects);
-
-    /** Add destinations for this page to the supplied dictionary.
-     *  @param dict       Dictionary to add destinations to.
-     */
-    void appendDestinations(SkPDFDict* dict);
-
-    /** Determine the size of the page content and store to the catalog
-     *  the offsets of all nonresource-indirect objects that make up the page
-     *  content.  This must be called before emitPage(), but after finalizePage.
-     *  @param catalog    The catalog to add the object offsets to.
-     *  @param fileOffset The file offset where the page content will be
-     *                    emitted.
-     */
-    off_t getPageSize(SkPDFCatalog* catalog, off_t fileOffset);
-
-    /** Output the page content to the passed stream.
-     *  @param stream     The writable output stream to send the content to.
-     *  @param catalog    The active object catalog.
-     */
-    void emitPage(SkWStream* stream, SkPDFCatalog* catalog);
-
-    /** Generate a page tree for the passed vector of pages.  New objects are
-     *  added to the catalog.  The pageTree vector is populated with all of
-     *  the 'Pages' dictionaries as well as the 'Page' objects.  Page trees
-     *  have both parent and children links, creating reference cycles, so
-     *  it must be torn down explicitly.  The first page is not added to
-     *  the pageTree dictionary array so the caller can handle it specially.
-     *  @param pages      The ordered vector of page objects.
-     *  @param catalog    The catalog to add new objects into.
-     *  @param pageTree   An output vector with all of the internal and leaf
-     *                    nodes of the pageTree.
-     *  @param rootNode   An output parameter set to the root node.
-     */
-    static void GeneratePageTree(const SkTDArray<SkPDFPage*>& pages,
-                                 SkPDFCatalog* catalog,
-                                 SkTDArray<SkPDFDict*>* pageTree,
-                                 SkPDFDict** rootNode);
-
-    /** Get the fonts used on this page.
-     */
-    const SkTDArray<SkPDFFont*>& getFontResources() const;
-
-    /** Returns a SkPDFGlyphSetMap which represents glyph usage of every font
-     *  that shows on this page.
-     */
-    const SkPDFGlyphSetMap& getFontGlyphUsage() const;
-
-private:
-    // Multiple pages may reference the content.
-    SkAutoTUnref<SkPDFDevice> fDevice;
-
-    // Once the content is finalized, put it into a stream for output.
-    SkAutoTUnref<SkPDFStream> fContentStream;
-    typedef SkPDFDict INHERITED;
-};
-
-#endif
diff --git a/gfx/skia/skia/src/pdf/SkPDFResourceDict.cpp b/gfx/skia/skia/src/pdf/SkPDFResourceDict.cpp
index 8a0208d64a00..2f9abca8b692 100644
--- a/gfx/skia/skia/src/pdf/SkPDFResourceDict.cpp
+++ b/gfx/skia/skia/src/pdf/SkPDFResourceDict.cpp
@@ -12,14 +12,10 @@
 // expected values as defined in the arrays below.
 // If these are failing, you may need to update the resource_type_prefixes
 // and resource_type_names arrays below.
-SK_COMPILE_ASSERT(SkPDFResourceDict::kExtGState_ResourceType == 0,
-                  resource_type_mismatch);
-SK_COMPILE_ASSERT(SkPDFResourceDict::kPattern_ResourceType == 1,
-                  resource_type_mismatch);
-SK_COMPILE_ASSERT(SkPDFResourceDict::kXObject_ResourceType == 2,
-                  resource_type_mismatch);
-SK_COMPILE_ASSERT(SkPDFResourceDict::kFont_ResourceType == 3,
-                  resource_type_mismatch);
+static_assert(SkPDFResourceDict::kExtGState_ResourceType == 0, "resource_type_mismatch");
+static_assert(SkPDFResourceDict::kPattern_ResourceType == 1, "resource_type_mismatch");
+static_assert(SkPDFResourceDict::kXObject_ResourceType == 2, "resource_type_mismatch");
+static_assert(SkPDFResourceDict::kFont_ResourceType == 3, "resource_type_mismatch");
 
 static const char resource_type_prefixes[] = {
         'G',
@@ -46,79 +42,60 @@ static char get_resource_type_prefix(
 static const char* get_resource_type_name(
         SkPDFResourceDict::SkPDFResourceType type) {
     SkASSERT(type >= 0);
-    SkASSERT(type < SkPDFResourceDict::kResourceTypeCount);
+    SkASSERT(type < SK_ARRAY_COUNT(resource_type_names));
 
     return resource_type_names[type];
 }
 
-SkPDFResourceDict::SkPDFResourceDict() : SkPDFDict() {
-    const char procs[][7] = {"PDF", "Text", "ImageB", "ImageC", "ImageI"};
-    SkPDFArray* procSets = SkNEW(SkPDFArray());
-
-    procSets->reserve(SK_ARRAY_COUNT(procs));
-    for (size_t i = 0; i < SK_ARRAY_COUNT(procs); i++) {
-        procSets->appendName(procs[i]);
-    }
-    insert("ProcSets", procSets)->unref();
-
-    // Actual sub-dicts will be lazily added later
-    fTypes.setCount(kResourceTypeCount);
-    for (int i=0; i < kResourceTypeCount; i++) {
-        fTypes[i] = NULL;
-    }
-}
-
-SkPDFObject* SkPDFResourceDict::insertResourceAsReference(
-        SkPDFResourceType type, int key, SkPDFObject* value) {
-    SkAutoTUnref<SkPDFObjRef> ref(SkNEW_ARGS(SkPDFObjRef, (value)));
-    insertResource(type, key, ref);
-    fResources.add(value);
-
-    return value;
-}
-
-void SkPDFResourceDict::getReferencedResources(
-        const SkTSet<SkPDFObject*>& knownResourceObjects,
-        SkTSet<SkPDFObject*>* newResourceObjects,
-        bool recursive) const {
-    // TODO: reserve not correct if we need to recursively explore.
-    newResourceObjects->setReserve(newResourceObjects->count() +
-                                   fResources.count());
-
-    for (int i = 0; i < fResources.count(); i++) {
-        if (!knownResourceObjects.contains(fResources[i]) &&
-                !newResourceObjects->contains(fResources[i])) {
-            newResourceObjects->add(fResources[i]);
-            fResources[i]->ref();
-            if (recursive) {
-                fResources[i]->getResources(knownResourceObjects,
-                                            newResourceObjects);
-            }
-        }
-    }
-}
-
 SkString SkPDFResourceDict::getResourceName(
-        SkPDFResourceType type, int key) {
+        SkPDFResourceDict::SkPDFResourceType type, int key) {
     SkString keyString;
     keyString.printf("%c%d", get_resource_type_prefix(type), key);
     return keyString;
 }
 
-SkPDFObject* SkPDFResourceDict::insertResource(
-        SkPDFResourceType type, int key, SkPDFObject* value) {
-    SkPDFDict* typeDict = fTypes[type];
-    if (NULL == typeDict) {
-        SkAutoTUnref<SkPDFDict> newDict(SkNEW(SkPDFDict()));
-        SkAutoTUnref<SkPDFName> typeName(
-                SkNEW_ARGS(SkPDFName, (get_resource_type_name(type))));
-        insert(typeName, newDict);  // ref counting handled here
-        fTypes[type] = newDict;
-        typeDict = newDict.get();
+static void add_subdict(
+        const SkTDArray<SkPDFObject*>& resourceList,
+        SkPDFResourceDict::SkPDFResourceType type,
+        SkPDFDict* dst) {
+    if (0 == resourceList.count()) {
+        return;
     }
-
-    SkAutoTUnref<SkPDFName> keyName(
-            SkNEW_ARGS(SkPDFName, (getResourceName(type, key))));
-    typeDict->insert(keyName, value);
-    return value;
+    SkAutoTUnref<SkPDFDict> resources(new SkPDFDict);
+    for (int i = 0; i < resourceList.count(); i++) {
+        resources->insertObjRef(SkPDFResourceDict::getResourceName(type, i),
+                                SkRef(resourceList[i]));
+    }
+    dst->insertObject(get_resource_type_name(type), resources.detach());
+}
+
+SkPDFDict* SkPDFResourceDict::Create(
+        const SkTDArray<SkPDFObject*>* gStateResources,
+        const SkTDArray<SkPDFObject*>* patternResources,
+        const SkTDArray<SkPDFObject*>* xObjectResources,
+        const SkTDArray<SkPDFObject*>* fontResources) {
+    SkAutoTUnref<SkPDFDict> dict(new SkPDFDict);
+    static const char kProcs[][7] = {
+        "PDF", "Text", "ImageB", "ImageC", "ImageI"};
+    SkAutoTUnref<SkPDFArray> procSets(new SkPDFArray);
+
+    procSets->reserve(SK_ARRAY_COUNT(kProcs));
+    for (size_t i = 0; i < SK_ARRAY_COUNT(kProcs); i++) {
+        procSets->appendName(kProcs[i]);
+    }
+    dict->insertObject("ProcSets", procSets.detach());
+
+    if (gStateResources) {
+        add_subdict(*gStateResources, kExtGState_ResourceType, dict);
+    }
+    if (patternResources) {
+        add_subdict(*patternResources, kPattern_ResourceType, dict);
+    }
+    if (xObjectResources) {
+        add_subdict(*xObjectResources, kXObject_ResourceType, dict);
+    }
+    if (fontResources) {
+        add_subdict(*fontResources, kFont_ResourceType, dict);
+    }
+    return dict.detach();
 }
diff --git a/gfx/skia/skia/src/pdf/SkPDFResourceDict.h b/gfx/skia/skia/src/pdf/SkPDFResourceDict.h
index 17ea338f59a3..698823b36ced 100644
--- a/gfx/skia/skia/src/pdf/SkPDFResourceDict.h
+++ b/gfx/skia/skia/src/pdf/SkPDFResourceDict.h
@@ -10,7 +10,6 @@
 
 #include "SkPDFTypes.h"
 #include "SkTDArray.h"
-#include "SkTSet.h"
 #include "SkTypes.h"
 
 /** \class SkPDFResourceDict
@@ -19,11 +18,9 @@
     allows generation of a list of referenced SkPDFObjects inserted with
     insertResourceAsRef.
 */
-class SkPDFResourceDict : public SkPDFDict {
+class SkPDFResourceDict {
 public:
-    SK_DECLARE_INST_COUNT(SkPDFResourceDict)
-
-     enum SkPDFResourceType{
+    enum SkPDFResourceType {
         kExtGState_ResourceType,
         kPattern_ResourceType,
         kXObject_ResourceType,
@@ -31,42 +28,19 @@ public:
         // These additional types are defined by the spec, but not
         // currently used by Skia: ColorSpace, Shading, Properties
         kResourceTypeCount
-     };
+    };
 
     /** Create a PDF resource dictionary.
      *  The full set of ProcSet entries is automatically created for backwards
      *  compatibility, as recommended by the PDF spec.
-     */
-    SkPDFResourceDict();
-
-    /** Add the value SkPDFObject as a reference to the resource dictionary
-     *  with the give type and key.
-     *  The relevant sub-dicts will be automatically generated, and the
-     *  resource will be named by concatenating a type-specific prefix and
-     *  the input key.
-     *  This object will be part of the resource list when requested later.
-     *  @param type  The type of resource being entered, like
-     *    kPattern_ResourceType or kExtGState_ResourceType.
-     *  @param key   The resource key, should be unique within its type.
-     *  @param value The resource itself.
-     *  @return The value argument is returned.
-     */
-    SkPDFObject* insertResourceAsReference(SkPDFResourceType type, int key,
-                                           SkPDFObject* value);
-
-    /**
-     * Gets resources inserted into this dictionary as a reference.
      *
-     * @param knownResourceObjects Set containing currently known resources.
-     *     Resources in the dict and this set will not be added to the output.
-     * @param newResourceObjects   Output set to which non-preexisting resources
-     *     will be added.
-     * @param recursive            Whether or not to add resources of resources.
+     *  Any arguments can be nullptr.
      */
-    void getReferencedResources(
-            const SkTSet<SkPDFObject*>& knownResourceObjects,
-            SkTSet<SkPDFObject*>* newResourceObjects,
-            bool recursive) const;
+    static SkPDFDict* Create(
+        const SkTDArray<SkPDFObject*>* gStateResources,
+        const SkTDArray<SkPDFObject*>* patternResources,
+        const SkTDArray<SkPDFObject*>* xObjectResources,
+        const SkTDArray<SkPDFObject*>* fontResources);
 
     /**
      * Returns the name for the resource that will be generated by the resource
@@ -77,25 +51,6 @@ public:
      *  @param key   The resource key, should be unique within its type.
      */
     static SkString getResourceName(SkPDFResourceType type, int key);
-
-private:
-    /** Add the value to the dictionary with the given key.  Refs value.
-     *  The relevant sub-dicts will be automatically generated, and the
-     *  resource will be named by concatenating a type-specific prefix and
-     *  the input key.
-     *  The object will NOT be part of the resource list when requested later.
-     *  @param type  The type of resource being entered.
-     *  @param key   The resource key, should be unique within its type.
-     *  @param value The resource itself.
-     *  @return The value argument is returned.
-     */
-    SkPDFObject* insertResource(SkPDFResourceType type, int key,
-                                SkPDFObject* value);
-
-    SkTSet<SkPDFObject*> fResources;
-
-    SkTDArray<SkPDFDict*> fTypes;
-    typedef SkPDFDict INHERITED;
 };
 
 #endif
diff --git a/gfx/skia/skia/src/pdf/SkPDFShader.cpp b/gfx/skia/skia/src/pdf/SkPDFShader.cpp
index afe6bb06b337..fe6e47c1db0f 100644
--- a/gfx/skia/skia/src/pdf/SkPDFShader.cpp
+++ b/gfx/skia/skia/src/pdf/SkPDFShader.cpp
@@ -10,7 +10,8 @@
 #include "SkPDFShader.h"
 
 #include "SkData.h"
-#include "SkPDFCatalog.h"
+#include "SkOncePtr.h"
+#include "SkPDFCanon.h"
 #include "SkPDFDevice.h"
 #include "SkPDFFormXObject.h"
 #include "SkPDFGraphicState.h"
@@ -19,11 +20,9 @@
 #include "SkScalar.h"
 #include "SkStream.h"
 #include "SkTemplates.h"
-#include "SkThread.h"
-#include "SkTSet.h"
 #include "SkTypes.h"
 
-static bool inverseTransformBBox(const SkMatrix& matrix, SkRect* bbox) {
+static bool inverse_transform_bbox(const SkMatrix& matrix, SkRect* bbox) {
     SkMatrix inverse;
     if (!matrix.invert(&inverse)) {
         return false;
@@ -60,7 +59,7 @@ static void interpolateColorCode(SkScalar range, SkScalar* curColor,
     // Figure out how to scale each color component.
     SkScalar multiplier[kColorComponents];
     for (int i = 0; i < kColorComponents; i++) {
-        multiplier[i] = SkScalarDiv(curColor[i] - prevColor[i], range);
+        multiplier[i] = (curColor[i] - prevColor[i]) / range;
     }
 
     // Calculate when we no longer need to keep a copy of the input parameter t.
@@ -292,58 +291,6 @@ static SkString radialCode(const SkShader::GradientInfo& info,
     return function;
 }
 
-/* The math here is all based on the description in Two_Point_Radial_Gradient,
-   with one simplification, the coordinate space has been scaled so that
-   Dr = 1.  This means we don't need to scale the entire equation by 1/Dr^2.
- */
-static SkString twoPointRadialCode(const SkShader::GradientInfo& info,
-                                   const SkMatrix& perspectiveRemover) {
-    SkScalar dx = info.fPoint[0].fX - info.fPoint[1].fX;
-    SkScalar dy = info.fPoint[0].fY - info.fPoint[1].fY;
-    SkScalar sr = info.fRadius[0];
-    SkScalar a = SkScalarMul(dx, dx) + SkScalarMul(dy, dy) - SK_Scalar1;
-    bool posRoot = info.fRadius[1] > info.fRadius[0];
-
-    // We start with a stack of (x y), copy it and then consume one copy in
-    // order to calculate b and the other to calculate c.
-    SkString function("{");
-
-    function.append(apply_perspective_to_coordinates(perspectiveRemover));
-
-    function.append("2 copy ");
-
-    // Calculate -b and b^2.
-    function.appendScalar(dy);
-    function.append(" mul exch ");
-    function.appendScalar(dx);
-    function.append(" mul add ");
-    function.appendScalar(sr);
-    function.append(" sub 2 mul neg dup dup mul\n");
-
-    // Calculate c
-    function.append("4 2 roll dup mul exch dup mul add ");
-    function.appendScalar(SkScalarMul(sr, sr));
-    function.append(" sub\n");
-
-    // Calculate the determinate
-    function.appendScalar(SkScalarMul(SkIntToScalar(4), a));
-    function.append(" mul sub abs sqrt\n");
-
-    // And then the final value of t.
-    if (posRoot) {
-        function.append("sub ");
-    } else {
-        function.append("add ");
-    }
-    function.appendScalar(SkScalarMul(SkIntToScalar(2), a));
-    function.append(" div\n");
-
-    tileModeCode(info.fTileMode, &function);
-    gradientFunctionCode(info, &function);
-    function.append("}");
-    return function;
-}
-
 /* Conical gradient shader, based on the Canvas spec for radial gradients
    See: http://www.w3.org/TR/2dcontext/#dom-context-2d-createradialgradient
  */
@@ -469,6 +416,12 @@ static SkString sweepCode(const SkShader::GradientInfo& info,
     return function;
 }
 
+static void drawBitmapMatrix(SkCanvas* canvas, const SkBitmap& bm, const SkMatrix& matrix) {
+    SkAutoCanvasRestore acr(canvas, true);
+    canvas->concat(matrix);
+    canvas->drawBitmap(bm, 0, 0);
+}
+
 class SkPDFShader::State {
 public:
     SkShader::GradientType fType;
@@ -483,7 +436,7 @@ public:
     SkShader::TileMode fImageTileModes[2];
 
     State(const SkShader& shader, const SkMatrix& canvasTransform,
-          const SkIRect& bbox);
+          const SkIRect& bbox, SkScalar rasterScale);
 
     bool operator==(const State& b) const;
 
@@ -498,217 +451,96 @@ private:
     void AllocateGradientInfoStorage();
 };
 
-class SkPDFFunctionShader : public SkPDFDict, public SkPDFShader {
-    SK_DECLARE_INST_COUNT(SkPDFFunctionShader)
-public:
-    explicit SkPDFFunctionShader(SkPDFShader::State* state);
-    virtual ~SkPDFFunctionShader() {
-        if (isValid()) {
-            RemoveShader(this);
-        }
-        fResources.unrefAll();
-    }
+////////////////////////////////////////////////////////////////////////////////
 
-    virtual bool isValid() { return fResources.count() > 0; }
+SkPDFFunctionShader::SkPDFFunctionShader(SkPDFShader::State* state)
+    : SkPDFDict("Pattern"), fShaderState(state) {}
 
-    void getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
-                      SkTSet<SkPDFObject*>* newResourceObjects) {
-        GetResourcesHelper(&fResources,
-                           knownResourceObjects,
-                           newResourceObjects);
-    }
+SkPDFFunctionShader::~SkPDFFunctionShader() {}
 
-private:
-    static SkPDFObject* RangeObject();
+bool SkPDFFunctionShader::equals(const SkPDFShader::State& state) const {
+    return state == *fShaderState;
+}
 
-    SkTDArray<SkPDFObject*> fResources;
-    SkAutoTDelete<const SkPDFShader::State> fState;
+////////////////////////////////////////////////////////////////////////////////
 
-    SkPDFStream* makePSFunction(const SkString& psCode, SkPDFArray* domain);
-    typedef SkPDFDict INHERITED;
-};
+SkPDFAlphaFunctionShader::SkPDFAlphaFunctionShader(SkPDFShader::State* state)
+    : fShaderState(state) {}
 
-/**
- * A shader for PDF gradients. This encapsulates the function shader
- * inside a tiling pattern while providing a common pattern interface.
- * The encapsulation allows the use of a SMask for transparency gradients.
- */
-class SkPDFAlphaFunctionShader : public SkPDFStream, public SkPDFShader {
-public:
-    explicit SkPDFAlphaFunctionShader(SkPDFShader::State* state);
-    virtual ~SkPDFAlphaFunctionShader() {
-        if (isValid()) {
-            RemoveShader(this);
-        }
-    }
+bool SkPDFAlphaFunctionShader::equals(const SkPDFShader::State& state) const {
+    return state == *fShaderState;
+}
 
-    virtual bool isValid() {
-        return fColorShader.get() != NULL;
-    }
+SkPDFAlphaFunctionShader::~SkPDFAlphaFunctionShader() {}
 
-private:
-    SkAutoTDelete<const SkPDFShader::State> fState;
+////////////////////////////////////////////////////////////////////////////////
 
-    SkPDFGraphicState* CreateSMaskGraphicState();
+SkPDFImageShader::SkPDFImageShader(SkPDFShader::State* state)
+    : fShaderState(state) {}
 
-    void getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
-                      SkTSet<SkPDFObject*>* newResourceObjects) {
-        fResourceDict->getReferencedResources(knownResourceObjects,
-                                              newResourceObjects,
-                                              true);
-    }
+bool SkPDFImageShader::equals(const SkPDFShader::State& state) const {
+    return state == *fShaderState;
+}
 
-    SkAutoTUnref<SkPDFObject> fColorShader;
-    SkAutoTUnref<SkPDFResourceDict> fResourceDict;
-};
+SkPDFImageShader::~SkPDFImageShader() {}
 
-class SkPDFImageShader : public SkPDFStream, public SkPDFShader {
-public:
-    explicit SkPDFImageShader(SkPDFShader::State* state);
-    virtual ~SkPDFImageShader() {
-        if (isValid()) {
-            RemoveShader(this);
-        }
-        fResources.unrefAll();
-    }
+////////////////////////////////////////////////////////////////////////////////
 
-    virtual bool isValid() { return size() > 0; }
-
-    void getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
-                      SkTSet<SkPDFObject*>* newResourceObjects) {
-        GetResourcesHelper(&fResources.toArray(),
-                           knownResourceObjects,
-                           newResourceObjects);
-    }
-
-private:
-    SkTSet<SkPDFObject*> fResources;
-    SkAutoTDelete<const SkPDFShader::State> fState;
-};
-
-SkPDFShader::SkPDFShader() {}
-
-// static
-SkPDFObject* SkPDFShader::GetPDFShaderByState(State* inState) {
-    SkPDFObject* result;
-
-    SkAutoTDelete<State> shaderState(inState);
-    if (shaderState.get()->fType == SkShader::kNone_GradientType &&
-            shaderState.get()->fImage.isNull()) {
+static SkPDFObject* get_pdf_shader_by_state(
+        SkPDFCanon* canon,
+        SkScalar dpi,
+        SkAutoTDelete<SkPDFShader::State>* autoState) {
+    const SkPDFShader::State& state = **autoState;
+    if (state.fType == SkShader::kNone_GradientType && state.fImage.isNull()) {
         // TODO(vandebo) This drops SKComposeShader on the floor.  We could
         // handle compose shader by pulling things up to a layer, drawing with
         // the first shader, applying the xfer mode and drawing again with the
         // second shader, then applying the layer to the original drawing.
-        return NULL;
-    }
-
-    ShaderCanonicalEntry entry(NULL, shaderState.get());
-    int index = CanonicalShaders().find(entry);
-    if (index >= 0) {
-        result = CanonicalShaders()[index].fPDFShader;
-        result->ref();
-        return result;
-    }
-
-    bool valid = false;
-    // The PDFShader takes ownership of the shaderSate.
-    if (shaderState.get()->fType == SkShader::kNone_GradientType) {
-        SkPDFImageShader* imageShader =
-            new SkPDFImageShader(shaderState.detach());
-        valid = imageShader->isValid();
-        result = imageShader;
+        return nullptr;
+    } else if (state.fType == SkShader::kNone_GradientType) {
+        SkPDFObject* shader = canon->findImageShader(state);
+        return shader ? SkRef(shader)
+                      : SkPDFImageShader::Create(canon, dpi, autoState);
+    } else if (state.GradientHasAlpha()) {
+        SkPDFObject* shader = canon->findAlphaShader(state);
+        return shader ? SkRef(shader)
+                      : SkPDFAlphaFunctionShader::Create(canon, dpi, autoState);
     } else {
-        if (shaderState.get()->GradientHasAlpha()) {
-            SkPDFAlphaFunctionShader* gradientShader =
-                SkNEW_ARGS(SkPDFAlphaFunctionShader, (shaderState.detach()));
-            valid = gradientShader->isValid();
-            result = gradientShader;
-        } else {
-            SkPDFFunctionShader* functionShader =
-                SkNEW_ARGS(SkPDFFunctionShader, (shaderState.detach()));
-            valid = functionShader->isValid();
-            result = functionShader;
-        }
+        SkPDFObject* shader = canon->findFunctionShader(state);
+        return shader ? SkRef(shader)
+                      : SkPDFFunctionShader::Create(canon, autoState);
     }
-    if (!valid) {
-        delete result;
-        return NULL;
-    }
-    entry.fPDFShader = result;
-    CanonicalShaders().push(entry);
-    return result;  // return the reference that came from new.
 }
 
 // static
-void SkPDFShader::RemoveShader(SkPDFObject* shader) {
-    SkAutoMutexAcquire lock(CanonicalShadersMutex());
-    ShaderCanonicalEntry entry(shader, NULL);
-    int index = CanonicalShaders().find(entry);
-    SkASSERT(index >= 0);
-    CanonicalShaders().removeShuffle(index);
-}
-
-// static
-SkPDFObject* SkPDFShader::GetPDFShader(const SkShader& shader,
+SkPDFObject* SkPDFShader::GetPDFShader(SkPDFCanon* canon,
+                                       SkScalar dpi,
+                                       const SkShader& shader,
                                        const SkMatrix& matrix,
-                                       const SkIRect& surfaceBBox) {
-    SkAutoMutexAcquire lock(CanonicalShadersMutex());
-    return GetPDFShaderByState(
-            SkNEW_ARGS(State, (shader, matrix, surfaceBBox)));
+                                       const SkIRect& surfaceBBox,
+                                       SkScalar rasterScale) {
+    SkAutoTDelete<SkPDFShader::State> state(new State(shader, matrix, surfaceBBox, rasterScale));
+    return get_pdf_shader_by_state(canon, dpi, &state);
 }
 
-// static
-SkTDArray<SkPDFShader::ShaderCanonicalEntry>& SkPDFShader::CanonicalShaders() {
-    SkPDFShader::CanonicalShadersMutex().assertHeld();
-    static SkTDArray<ShaderCanonicalEntry> gCanonicalShaders;
-    return gCanonicalShaders;
-}
-
-SK_DECLARE_STATIC_MUTEX(gCanonicalShadersMutex);
-// static
-SkBaseMutex& SkPDFShader::CanonicalShadersMutex() {
-    return gCanonicalShadersMutex;
-}
-
-// static
-SkPDFObject* SkPDFFunctionShader::RangeObject() {
-    SkPDFShader::CanonicalShadersMutex().assertHeld();
-    static SkPDFArray* range = NULL;
-    // This method is only used with CanonicalShadersMutex, so it's safe to
-    // populate domain.
-    if (range == NULL) {
-        range = new SkPDFArray;
-        range->reserve(6);
-        range->appendInt(0);
-        range->appendInt(1);
-        range->appendInt(0);
-        range->appendInt(1);
-        range->appendInt(0);
-        range->appendInt(1);
-    }
-    return range;
-}
-
-static SkPDFResourceDict* get_gradient_resource_dict(
+static SkPDFDict* get_gradient_resource_dict(
         SkPDFObject* functionShader,
         SkPDFObject* gState) {
-    SkPDFResourceDict* dict = new SkPDFResourceDict();
-
-    if (functionShader != NULL) {
-        dict->insertResourceAsReference(
-                SkPDFResourceDict::kPattern_ResourceType, 0, functionShader);
+    SkTDArray<SkPDFObject*> patterns;
+    if (functionShader) {
+        patterns.push(functionShader);
     }
-    if (gState != NULL) {
-        dict->insertResourceAsReference(
-                SkPDFResourceDict::kExtGState_ResourceType, 0, gState);
+    SkTDArray<SkPDFObject*> graphicStates;
+    if (gState) {
+        graphicStates.push(gState);
     }
-
-    return dict;
+    return SkPDFResourceDict::Create(&graphicStates, &patterns, nullptr, nullptr);
 }
 
 static void populate_tiling_pattern_dict(SkPDFDict* pattern,
-                                      SkRect& bbox, SkPDFDict* resources,
-                                      const SkMatrix& matrix) {
+                                         SkRect& bbox,
+                                         SkPDFDict* resources,
+                                         const SkMatrix& matrix) {
     const int kTiling_PatternType = 1;
     const int kColoredTilingPattern_PaintType = 1;
     const int kConstantSpacing_TilingType = 1;
@@ -717,12 +549,12 @@ static void populate_tiling_pattern_dict(SkPDFDict* pattern,
     pattern->insertInt("PatternType", kTiling_PatternType);
     pattern->insertInt("PaintType", kColoredTilingPattern_PaintType);
     pattern->insertInt("TilingType", kConstantSpacing_TilingType);
-    pattern->insert("BBox", SkPDFUtils::RectToArray(bbox))->unref();
+    pattern->insertObject("BBox", SkPDFUtils::RectToArray(bbox));
     pattern->insertScalar("XStep", bbox.width());
     pattern->insertScalar("YStep", bbox.height());
-    pattern->insert("Resources", resources);
+    pattern->insertObject("Resources", SkRef(resources));
     if (!matrix.isIdentity()) {
-        pattern->insert("Matrix", SkPDFUtils::MatrixToArray(matrix))->unref();
+        pattern->insertObject("Matrix", SkPDFUtils::MatrixToArray(matrix));
     }
 }
 
@@ -748,18 +580,20 @@ static SkStream* create_pattern_fill_content(int gsIndex, SkRect& bounds) {
  * Creates a ExtGState with the SMask set to the luminosityShader in
  * luminosity mode. The shader pattern extends to the bbox.
  */
-SkPDFGraphicState* SkPDFAlphaFunctionShader::CreateSMaskGraphicState() {
+static SkPDFObject* create_smask_graphic_state(
+        SkPDFCanon* canon, SkScalar dpi, const SkPDFShader::State& state) {
     SkRect bbox;
-    bbox.set(fState.get()->fBBox);
+    bbox.set(state.fBBox);
 
+    SkAutoTDelete<SkPDFShader::State> alphaToLuminosityState(
+            state.CreateAlphaToLuminosityState());
     SkAutoTUnref<SkPDFObject> luminosityShader(
-            SkPDFShader::GetPDFShaderByState(
-                 fState->CreateAlphaToLuminosityState()));
+            get_pdf_shader_by_state(canon, dpi, &alphaToLuminosityState));
 
-    SkAutoTUnref<SkStream> alphaStream(create_pattern_fill_content(-1, bbox));
+    SkAutoTDelete<SkStream> alphaStream(create_pattern_fill_content(-1, bbox));
 
-    SkAutoTUnref<SkPDFResourceDict>
-        resources(get_gradient_resource_dict(luminosityShader, NULL));
+    SkAutoTUnref<SkPDFDict>
+        resources(get_gradient_resource_dict(luminosityShader, nullptr));
 
     SkAutoTUnref<SkPDFFormXObject> alphaMask(
             new SkPDFFormXObject(alphaStream.get(), bbox, resources.get()));
@@ -769,26 +603,41 @@ SkPDFGraphicState* SkPDFAlphaFunctionShader::CreateSMaskGraphicState() {
             SkPDFGraphicState::kLuminosity_SMaskMode);
 }
 
-SkPDFAlphaFunctionShader::SkPDFAlphaFunctionShader(SkPDFShader::State* state)
-        : fState(state) {
+SkPDFAlphaFunctionShader* SkPDFAlphaFunctionShader::Create(
+        SkPDFCanon* canon,
+        SkScalar dpi,
+        SkAutoTDelete<SkPDFShader::State>* autoState) {
+    const SkPDFShader::State& state = **autoState;
     SkRect bbox;
-    bbox.set(fState.get()->fBBox);
+    bbox.set(state.fBBox);
 
-    fColorShader.reset(
-            SkPDFShader::GetPDFShaderByState(state->CreateOpaqueState()));
+    SkAutoTDelete<SkPDFShader::State> opaqueState(state.CreateOpaqueState());
+
+    SkAutoTUnref<SkPDFObject> colorShader(
+            get_pdf_shader_by_state(canon, dpi, &opaqueState));
+    if (!colorShader) {
+        return nullptr;
+    }
 
     // Create resource dict with alpha graphics state as G0 and
     // pattern shader as P0, then write content stream.
-    SkAutoTUnref<SkPDFGraphicState> alphaGs(CreateSMaskGraphicState());
-    fResourceDict.reset(
-            get_gradient_resource_dict(fColorShader.get(), alphaGs.get()));
+    SkAutoTUnref<SkPDFObject> alphaGs(
+            create_smask_graphic_state(canon, dpi, state));
 
-    SkAutoTUnref<SkStream> colorStream(
+    SkPDFAlphaFunctionShader* alphaFunctionShader =
+            new SkPDFAlphaFunctionShader(autoState->detach());
+
+    SkAutoTUnref<SkPDFDict> resourceDict(
+            get_gradient_resource_dict(colorShader.get(), alphaGs.get()));
+
+    SkAutoTDelete<SkStream> colorStream(
             create_pattern_fill_content(0, bbox));
-    setData(colorStream.get());
+    alphaFunctionShader->setData(colorStream.get());
 
-    populate_tiling_pattern_dict(this, bbox, fResourceDict.get(),
+    populate_tiling_pattern_dict(alphaFunctionShader, bbox, resourceDict.get(),
                                  SkMatrix::I());
+    canon->addAlphaShader(alphaFunctionShader);
+    return alphaFunctionShader;
 }
 
 // Finds affine and persp such that in = affine * persp.
@@ -829,19 +678,44 @@ static bool split_perspective(const SkMatrix in, SkMatrix* affine,
     return true;
 }
 
-SkPDFFunctionShader::SkPDFFunctionShader(SkPDFShader::State* state)
-        : SkPDFDict("Pattern"),
-          fState(state) {
+static SkPDFObject* create_range_object() {
+    SkPDFArray* range = new SkPDFArray;
+    range->reserve(6);
+    range->appendInt(0);
+    range->appendInt(1);
+    range->appendInt(0);
+    range->appendInt(1);
+    range->appendInt(0);
+    range->appendInt(1);
+    return range;
+}
+SK_DECLARE_STATIC_ONCE_PTR(SkPDFObject, rangeObject);
+
+static SkPDFStream* make_ps_function(const SkString& psCode,
+                                     SkPDFArray* domain) {
+    SkAutoDataUnref funcData(
+            SkData::NewWithCopy(psCode.c_str(), psCode.size()));
+    SkPDFStream* result = new SkPDFStream(funcData.get());
+    result->insertInt("FunctionType", 4);
+    result->insertObject("Domain", SkRef(domain));
+    result->insertObject("Range", SkRef(rangeObject.get(create_range_object)));
+    return result;
+}
+
+SkPDFFunctionShader* SkPDFFunctionShader::Create(
+        SkPDFCanon* canon, SkAutoTDelete<SkPDFShader::State>* autoState) {
+    const SkPDFShader::State& state = **autoState;
+
     SkString (*codeFunction)(const SkShader::GradientInfo& info,
-                             const SkMatrix& perspectiveRemover) = NULL;
+                             const SkMatrix& perspectiveRemover) = nullptr;
     SkPoint transformPoints[2];
 
     // Depending on the type of the gradient, we want to transform the
     // coordinate space in different ways.
-    const SkShader::GradientInfo* info = &fState.get()->fInfo;
+    const SkShader::GradientInfo* info = &state.fInfo;
     transformPoints[0] = info->fPoint[0];
     transformPoints[1] = info->fPoint[1];
-    switch (fState.get()->fType) {
+    switch (state.fType) {
         case SkShader::kLinear_GradientType:
             codeFunction = &linearCode;
             break;
@@ -850,18 +724,6 @@ SkPDFFunctionShader::SkPDFFunctionShader(SkPDFShader::State* state)
             transformPoints[1].fX += info->fRadius[0];
             codeFunction = &radialCode;
             break;
-        case SkShader::kRadial2_GradientType: {
-            // Bail out if the radii are the same.  Empty fResources signals
-            // an error and isValid will return false.
-            if (info->fRadius[0] == info->fRadius[1]) {
-                return;
-            }
-            transformPoints[1] = transformPoints[0];
-            SkScalar dr = info->fRadius[1] - info->fRadius[0];
-            transformPoints[1].fX += dr;
-            codeFunction = &twoPointRadialCode;
-            break;
-        }
         case SkShader::kConical_GradientType: {
             transformPoints[1] = transformPoints[0];
             transformPoints[1].fX += SK_Scalar1;
@@ -876,7 +738,7 @@ SkPDFFunctionShader::SkPDFFunctionShader(SkPDFShader::State* state)
         case SkShader::kColor_GradientType:
         case SkShader::kNone_GradientType:
         default:
-            return;
+            return nullptr;
     }
 
     // Move any scaling (assuming a unit gradient) or translation
@@ -886,8 +748,8 @@ SkPDFFunctionShader::SkPDFFunctionShader(SkPDFShader::State* state)
     SkMatrix mapperMatrix;
     unitToPointsMatrix(transformPoints, &mapperMatrix);
 
-    SkMatrix finalMatrix = fState.get()->fCanvasTransform;
-    finalMatrix.preConcat(fState.get()->fShaderTransform);
+    SkMatrix finalMatrix = state.fCanvasTransform;
+    finalMatrix.preConcat(state.fShaderTransform);
     finalMatrix.preConcat(mapperMatrix);
 
     // Preserves as much as posible in the final matrix, and only removes
@@ -899,14 +761,14 @@ SkPDFFunctionShader::SkPDFFunctionShader(SkPDFShader::State* state)
     if (finalMatrix.hasPerspective()) {
         if (!split_perspective(finalMatrix,
                                &finalMatrix, &perspectiveInverseOnly)) {
-            return;
+            return nullptr;
         }
     }
 
     SkRect bbox;
-    bbox.set(fState.get()->fBBox);
-    if (!inverseTransformBBox(finalMatrix, &bbox)) {
-        return;
+    bbox.set(state.fBBox);
+    if (!inverse_transform_bbox(finalMatrix, &bbox)) {
+        return nullptr;
     }
 
     SkAutoTUnref<SkPDFArray> domain(new SkPDFArray);
@@ -917,14 +779,15 @@ SkPDFFunctionShader::SkPDFFunctionShader(SkPDFShader::State* state)
     domain->appendScalar(bbox.fBottom);
 
     SkString functionCode;
-    // The two point radial gradient further references fState.get()->fInfo
+    // The two point radial gradient further references
+    // state.fInfo
     // in translating from x, y coordinates to the t parameter. So, we have
     // to transform the points and radii according to the calculated matrix.
-    if (fState.get()->fType == SkShader::kRadial2_GradientType) {
+    if (state.fType == SkShader::kConical_GradientType) {
         SkShader::GradientInfo twoPointRadialInfo = *info;
         SkMatrix inverseMapperMatrix;
         if (!mapperMatrix.invert(&inverseMapperMatrix)) {
-            return;
+            return nullptr;
         }
         inverseMapperMatrix.mapPoints(twoPointRadialInfo.fPoint, 2);
         twoPointRadialInfo.fRadius[0] =
@@ -939,19 +802,30 @@ SkPDFFunctionShader::SkPDFFunctionShader(SkPDFShader::State* state)
     SkAutoTUnref<SkPDFDict> pdfShader(new SkPDFDict);
     pdfShader->insertInt("ShadingType", 1);
     pdfShader->insertName("ColorSpace", "DeviceRGB");
-    pdfShader->insert("Domain", domain.get());
+    pdfShader->insertObject("Domain", SkRef(domain.get()));
 
-    SkPDFStream* function = makePSFunction(functionCode, domain.get());
-    pdfShader->insert("Function", new SkPDFObjRef(function))->unref();
-    fResources.push(function);  // Pass ownership to resource list.
+    SkAutoTUnref<SkPDFStream> function(
+            make_ps_function(functionCode, domain.get()));
+    pdfShader->insertObjRef("Function", function.detach());
 
-    insertInt("PatternType", 2);
-    insert("Matrix", SkPDFUtils::MatrixToArray(finalMatrix))->unref();
-    insert("Shading", pdfShader.get());
+    SkPDFFunctionShader* pdfFunctionShader = new SkPDFFunctionShader(autoState->detach());
+
+    pdfFunctionShader->insertInt("PatternType", 2);
+    pdfFunctionShader->insertObject("Matrix",
+                                    SkPDFUtils::MatrixToArray(finalMatrix));
+    pdfFunctionShader->insertObject("Shading", pdfShader.detach());
+
+    canon->addFunctionShader(pdfFunctionShader);
+    return pdfFunctionShader;
 }
 
-SkPDFImageShader::SkPDFImageShader(SkPDFShader::State* state) : fState(state) {
-    fState.get()->fImage.lockPixels();
+SkPDFImageShader* SkPDFImageShader::Create(
+        SkPDFCanon* canon,
+        SkScalar dpi,
+        SkAutoTDelete<SkPDFShader::State>* autoState) {
+    const SkPDFShader::State& state = **autoState;
+
+    state.fImage.lockPixels();
 
     // The image shader pattern cell will be drawn into a separate device
     // in pattern cell space (no scaling on the bitmap, though there may be
@@ -959,15 +833,15 @@ SkPDFImageShader::SkPDFImageShader(SkPDFShader::State* state) : fState(state) {
 
     // Map clip bounds to shader space to ensure the device is large enough
     // to handle fake clamping.
-    SkMatrix finalMatrix = fState.get()->fCanvasTransform;
-    finalMatrix.preConcat(fState.get()->fShaderTransform);
+    SkMatrix finalMatrix = state.fCanvasTransform;
+    finalMatrix.preConcat(state.fShaderTransform);
     SkRect deviceBounds;
-    deviceBounds.set(fState.get()->fBBox);
-    if (!inverseTransformBBox(finalMatrix, &deviceBounds)) {
-        return;
+    deviceBounds.set(state.fBBox);
+    if (!inverse_transform_bbox(finalMatrix, &deviceBounds)) {
+        return nullptr;
     }
 
-    const SkBitmap* image = &fState.get()->fImage;
+    const SkBitmap* image = &state.fImage;
     SkRect bitmapBounds;
     image->getBounds(&bitmapBounds);
 
@@ -976,22 +850,18 @@ SkPDFImageShader::SkPDFImageShader(SkPDFShader::State* state) : fState(state) {
     // For clamp modes, we're only interested in the clip region, whether
     // or not the main bitmap is in it.
     SkShader::TileMode tileModes[2];
-    tileModes[0] = fState.get()->fImageTileModes[0];
-    tileModes[1] = fState.get()->fImageTileModes[1];
+    tileModes[0] = state.fImageTileModes[0];
+    tileModes[1] = state.fImageTileModes[1];
     if (tileModes[0] != SkShader::kClamp_TileMode ||
             tileModes[1] != SkShader::kClamp_TileMode) {
         deviceBounds.join(bitmapBounds);
     }
 
-    SkMatrix unflip;
-    unflip.setTranslate(0, SkScalarRoundToScalar(deviceBounds.height()));
-    unflip.preScale(SK_Scalar1, -SK_Scalar1);
     SkISize size = SkISize::Make(SkScalarRoundToInt(deviceBounds.width()),
                                  SkScalarRoundToInt(deviceBounds.height()));
-    // TODO(edisonn): should we pass here the DCT encoder of the destination device?
-    // TODO(edisonn): NYI Perspective, use SkPDFDeviceFlattener.
-    SkPDFDevice pattern(size, size, unflip);
-    SkCanvas canvas(&pattern);
+    SkAutoTUnref<SkPDFDevice> patternDevice(
+            SkPDFDevice::CreateUnflipped(size, dpi, canon));
+    SkCanvas canvas(patternDevice.get());
 
     SkRect patternBBox;
     image->getBounds(&patternBBox);
@@ -1015,14 +885,14 @@ SkPDFImageShader::SkPDFImageShader(SkPDFShader::State* state) : fState(state) {
         SkMatrix xMirror;
         xMirror.setScale(-1, 1);
         xMirror.postTranslate(2 * width, 0);
-        canvas.drawBitmapMatrix(*image, xMirror);
+        drawBitmapMatrix(&canvas, *image, xMirror);
         patternBBox.fRight += width;
     }
     if (tileModes[1] == SkShader::kMirror_TileMode) {
         SkMatrix yMirror;
         yMirror.setScale(SK_Scalar1, -SK_Scalar1);
         yMirror.postTranslate(0, 2 * height);
-        canvas.drawBitmapMatrix(*image, yMirror);
+        drawBitmapMatrix(&canvas, *image, yMirror);
         patternBBox.fBottom += height;
     }
     if (tileModes[0] == SkShader::kMirror_TileMode &&
@@ -1030,7 +900,7 @@ SkPDFImageShader::SkPDFImageShader(SkPDFShader::State* state) : fState(state) {
         SkMatrix mirror;
         mirror.setScale(-1, -1);
         mirror.postTranslate(2 * width, 2 * height);
-        canvas.drawBitmapMatrix(*image, mirror);
+        drawBitmapMatrix(&canvas, *image, mirror);
     }
 
     // Then handle Clamping, which requires expanding the pattern canvas to
@@ -1081,12 +951,12 @@ SkPDFImageShader::SkPDFImageShader(SkPDFShader::State* state) : fState(state) {
             SkMatrix leftMatrix;
             leftMatrix.setScale(-deviceBounds.left(), 1);
             leftMatrix.postTranslate(deviceBounds.left(), 0);
-            canvas.drawBitmapMatrix(left, leftMatrix);
+            drawBitmapMatrix(&canvas, left, leftMatrix);
 
             if (tileModes[1] == SkShader::kMirror_TileMode) {
                 leftMatrix.postScale(SK_Scalar1, -SK_Scalar1);
                 leftMatrix.postTranslate(0, 2 * height);
-                canvas.drawBitmapMatrix(left, leftMatrix);
+                drawBitmapMatrix(&canvas, left, leftMatrix);
             }
             patternBBox.fLeft = 0;
         }
@@ -1099,12 +969,12 @@ SkPDFImageShader::SkPDFImageShader(SkPDFShader::State* state) : fState(state) {
             SkMatrix rightMatrix;
             rightMatrix.setScale(deviceBounds.right() - width, 1);
             rightMatrix.postTranslate(width, 0);
-            canvas.drawBitmapMatrix(right, rightMatrix);
+            drawBitmapMatrix(&canvas, right, rightMatrix);
 
             if (tileModes[1] == SkShader::kMirror_TileMode) {
                 rightMatrix.postScale(SK_Scalar1, -SK_Scalar1);
                 rightMatrix.postTranslate(0, 2 * height);
-                canvas.drawBitmapMatrix(right, rightMatrix);
+                drawBitmapMatrix(&canvas, right, rightMatrix);
             }
             patternBBox.fRight = deviceBounds.width();
         }
@@ -1119,12 +989,12 @@ SkPDFImageShader::SkPDFImageShader(SkPDFShader::State* state) : fState(state) {
             SkMatrix topMatrix;
             topMatrix.setScale(SK_Scalar1, -deviceBounds.top());
             topMatrix.postTranslate(0, deviceBounds.top());
-            canvas.drawBitmapMatrix(top, topMatrix);
+            drawBitmapMatrix(&canvas, top, topMatrix);
 
             if (tileModes[0] == SkShader::kMirror_TileMode) {
                 topMatrix.postScale(-1, 1);
                 topMatrix.postTranslate(2 * width, 0);
-                canvas.drawBitmapMatrix(top, topMatrix);
+                drawBitmapMatrix(&canvas, top, topMatrix);
             }
             patternBBox.fTop = 0;
         }
@@ -1137,50 +1007,32 @@ SkPDFImageShader::SkPDFImageShader(SkPDFShader::State* state) : fState(state) {
             SkMatrix bottomMatrix;
             bottomMatrix.setScale(SK_Scalar1, deviceBounds.bottom() - height);
             bottomMatrix.postTranslate(0, height);
-            canvas.drawBitmapMatrix(bottom, bottomMatrix);
+            drawBitmapMatrix(&canvas, bottom, bottomMatrix);
 
             if (tileModes[0] == SkShader::kMirror_TileMode) {
                 bottomMatrix.postScale(-1, 1);
                 bottomMatrix.postTranslate(2 * width, 0);
-                canvas.drawBitmapMatrix(bottom, bottomMatrix);
+                drawBitmapMatrix(&canvas, bottom, bottomMatrix);
             }
             patternBBox.fBottom = deviceBounds.height();
         }
     }
 
     // Put the canvas into the pattern stream (fContent).
-    SkAutoTUnref<SkStream> content(pattern.content());
-    setData(content.get());
-    SkPDFResourceDict* resourceDict = pattern.getResourceDict();
-    resourceDict->getReferencedResources(fResources, &fResources, false);
+    SkAutoTDelete<SkStreamAsset> content(patternDevice->content());
 
-    populate_tiling_pattern_dict(this, patternBBox,
-                                 pattern.getResourceDict(), finalMatrix);
+    SkPDFImageShader* imageShader = new SkPDFImageShader(autoState->detach());
+    imageShader->setData(content.get());
 
-    fState.get()->fImage.unlockPixels();
-}
+    SkAutoTUnref<SkPDFDict> resourceDict(
+            patternDevice->createResourceDict());
+    populate_tiling_pattern_dict(imageShader, patternBBox,
+                                 resourceDict.get(), finalMatrix);
 
-SkPDFStream* SkPDFFunctionShader::makePSFunction(const SkString& psCode,
-                                                 SkPDFArray* domain) {
-    SkAutoDataUnref funcData(SkData::NewWithCopy(psCode.c_str(),
-                                                 psCode.size()));
-    SkPDFStream* result = new SkPDFStream(funcData.get());
-    result->insertInt("FunctionType", 4);
-    result->insert("Domain", domain);
-    result->insert("Range", RangeObject());
-    return result;
-}
+    imageShader->fShaderState->fImage.unlockPixels();
 
-SkPDFShader::ShaderCanonicalEntry::ShaderCanonicalEntry(SkPDFObject* pdfShader,
-                                                        const State* state)
-    : fPDFShader(pdfShader),
-      fState(state) {
-}
-
-bool SkPDFShader::ShaderCanonicalEntry::operator==(
-        const ShaderCanonicalEntry& b) const {
-    return fPDFShader == b.fPDFShader ||
-           (fState != NULL && b.fState != NULL && *fState == *b.fState);
+    canon->addImageShader(imageShader);
+    return imageShader;
 }
 
 bool SkPDFShader::State::operator==(const SkPDFShader::State& b) const {
@@ -1220,7 +1072,6 @@ bool SkPDFShader::State::operator==(const SkPDFShader::State& b) const {
                     return false;
                 }
                 break;
-            case SkShader::kRadial2_GradientType:
             case SkShader::kConical_GradientType:
                 if (fInfo.fPoint[1] != b.fInfo.fPoint[1] ||
                         fInfo.fRadius[0] != b.fInfo.fRadius[0] ||
@@ -1237,28 +1088,64 @@ bool SkPDFShader::State::operator==(const SkPDFShader::State& b) const {
     return true;
 }
 
-SkPDFShader::State::State(const SkShader& shader,
-                          const SkMatrix& canvasTransform, const SkIRect& bbox)
+SkPDFShader::State::State(const SkShader& shader, const SkMatrix& canvasTransform,
+                          const SkIRect& bbox, SkScalar rasterScale)
         : fCanvasTransform(canvasTransform),
           fBBox(bbox),
           fPixelGeneration(0) {
     fInfo.fColorCount = 0;
-    fInfo.fColors = NULL;
-    fInfo.fColorOffsets = NULL;
+    fInfo.fColors = nullptr;
+    fInfo.fColorOffsets = nullptr;
     fShaderTransform = shader.getLocalMatrix();
     fImageTileModes[0] = fImageTileModes[1] = SkShader::kClamp_TileMode;
 
     fType = shader.asAGradient(&fInfo);
 
     if (fType == SkShader::kNone_GradientType) {
-        SkShader::BitmapType bitmapType;
         SkMatrix matrix;
-        bitmapType = shader.asABitmap(&fImage, &matrix, fImageTileModes);
-        if (bitmapType != SkShader::kDefault_BitmapType) {
-            fImage.reset();
-            return;
+        if (shader.isABitmap(&fImage, &matrix, fImageTileModes)) {
+            SkASSERT(matrix.isIdentity());
+        } else {
+            // Generic fallback for unsupported shaders:
+            //  * allocate a bbox-sized bitmap
+            //  * shade the whole area
+            //  * use the result as a bitmap shader
+
+            // bbox is in device space. While that's exactly what we want for sizing our bitmap,
+            // we need to map it into shader space for adjustments (to match
+            // SkPDFImageShader::Create's behavior).
+            SkRect shaderRect = SkRect::Make(bbox);
+            if (!inverse_transform_bbox(canvasTransform, &shaderRect)) {
+                fImage.reset();
+                return;
+            }
+
+            // Clamp the bitmap size to about 1M pixels
+            static const SkScalar kMaxBitmapArea = 1024 * 1024;
+            SkScalar bitmapArea = rasterScale * bbox.width() * rasterScale * bbox.height();
+            if (bitmapArea > kMaxBitmapArea) {
+                rasterScale *= SkScalarSqrt(kMaxBitmapArea / bitmapArea);
+            }
+
+            SkISize size = SkISize::Make(SkScalarRoundToInt(rasterScale * bbox.width()),
+                                         SkScalarRoundToInt(rasterScale * bbox.height()));
+            SkSize scale = SkSize::Make(SkIntToScalar(size.width()) / shaderRect.width(),
+                                        SkIntToScalar(size.height()) / shaderRect.height());
+
+            fImage.allocN32Pixels(size.width(), size.height());
+            fImage.eraseColor(SK_ColorTRANSPARENT);
+
+            SkPaint p;
+            p.setShader(const_cast<SkShader*>(&shader));
+
+            SkCanvas canvas(fImage);
+            canvas.scale(scale.width(), scale.height());
+            canvas.translate(-shaderRect.x(), -shaderRect.y());
+            canvas.drawPaint(p);
+
+            fShaderTransform.setTranslate(shaderRect.x(), shaderRect.y());
+            fShaderTransform.preScale(1 / scale.width(), 1 / scale.height());
         }
-        SkASSERT(matrix.isIdentity());
         fPixelGeneration = fImage.getGenerationID();
     } else {
         AllocateGradientInfoStorage();
diff --git a/gfx/skia/skia/src/pdf/SkPDFShader.h b/gfx/skia/skia/src/pdf/SkPDFShader.h
index 0b292e932a3c..3de17cdc509c 100644
--- a/gfx/skia/skia/src/pdf/SkPDFShader.h
+++ b/gfx/skia/skia/src/pdf/SkPDFShader.h
@@ -12,12 +12,11 @@
 
 #include "SkPDFStream.h"
 #include "SkPDFTypes.h"
-#include "SkMatrix.h"
-#include "SkRefCnt.h"
-#include "SkShader.h"
 
-class SkObjRef;
-class SkPDFCatalog;
+class SkPDFCanon;
+class SkMatrix;
+class SkShader;
+struct SkIRect;
 
 /** \class SkPDFShader
 
@@ -27,47 +26,76 @@ class SkPDFCatalog;
 
 class SkPDFShader {
 public:
+    class State;
+
     /** Get the PDF shader for the passed SkShader. If the SkShader is
-     *  invalid in some way, returns NULL. The reference count of
+     *  invalid in some way, returns nullptr. The reference count of
      *  the object is incremented and it is the caller's responsibility to
      *  unreference it when done.  This is needed to accommodate the weak
      *  reference pattern used when the returned object is new and has no
      *  other references.
-     *  @param shader     The SkShader to emulate.
-     *  @param matrix     The current transform. (PDF shaders are absolutely
-     *                    positioned, relative to where the page is drawn.)
-     *  @param surfceBBox The bounding box of the drawing surface (with matrix
-     *                    already applied).
+     *  @param shader      The SkShader to emulate.
+     *  @param matrix      The current transform. (PDF shaders are absolutely
+     *                     positioned, relative to where the page is drawn.)
+     *  @param surfceBBox  The bounding box of the drawing surface (with matrix
+     *                     already applied).
+     *  @param rasterScale Additional scale to be applied for early
+     *                     rasterization.
      */
-    static SkPDFObject* GetPDFShader(const SkShader& shader,
+    static SkPDFObject* GetPDFShader(SkPDFCanon* canon,
+                                     SkScalar dpi,
+                                     const SkShader& shader,
                                      const SkMatrix& matrix,
-                                     const SkIRect& surfaceBBox);
+                                     const SkIRect& surfaceBBox,
+                                     SkScalar rasterScale);
+};
 
-protected:
-    class State;
+class SkPDFFunctionShader final : public SkPDFDict {
+    
 
-    class ShaderCanonicalEntry {
-    public:
-        ShaderCanonicalEntry(SkPDFObject* pdfShader, const State* state);
-        bool operator==(const ShaderCanonicalEntry& b) const;
+public:
+    static SkPDFFunctionShader* Create(SkPDFCanon*,
+                                       SkAutoTDelete<SkPDFShader::State>*);
+    virtual ~SkPDFFunctionShader();
+    bool equals(const SkPDFShader::State&) const;
 
-        SkPDFObject* fPDFShader;
-        const State* fState;
-    };
-    // This should be made a hash table if performance is a problem.
-    static SkTDArray<ShaderCanonicalEntry>& CanonicalShaders();
-    static SkBaseMutex& CanonicalShadersMutex();
+private:
+    SkAutoTDelete<const SkPDFShader::State> fShaderState;
+    SkPDFFunctionShader(SkPDFShader::State*);
+    typedef SkPDFDict INHERITED;
+};
 
-    // This is an internal method.
-    // CanonicalShadersMutex() should already be acquired.
-    // This also takes ownership of shaderState.
-    static SkPDFObject* GetPDFShaderByState(State* shaderState);
-    static void RemoveShader(SkPDFObject* shader);
+/**
+ * A shader for PDF gradients. This encapsulates the function shader
+ * inside a tiling pattern while providing a common pattern interface.
+ * The encapsulation allows the use of a SMask for transparency gradients.
+ */
+class SkPDFAlphaFunctionShader final : public SkPDFStream {
+public:
+    static SkPDFAlphaFunctionShader* Create(SkPDFCanon*,
+                                            SkScalar dpi,
+                                            SkAutoTDelete<SkPDFShader::State>*);
+    virtual ~SkPDFAlphaFunctionShader();
+    bool equals(const SkPDFShader::State&) const;
 
-    SkPDFShader();
-    virtual ~SkPDFShader() {};
+private:
+    SkAutoTDelete<const SkPDFShader::State> fShaderState;
+    SkPDFAlphaFunctionShader(SkPDFShader::State*);
+    typedef SkPDFStream INHERITED;
+};
 
-    virtual bool isValid() = 0;
+class SkPDFImageShader final : public SkPDFStream {
+public:
+    static SkPDFImageShader* Create(SkPDFCanon*,
+                                    SkScalar dpi,
+                                    SkAutoTDelete<SkPDFShader::State>*);
+    virtual ~SkPDFImageShader();
+    bool equals(const SkPDFShader::State&) const;
+
+private:
+    SkAutoTDelete<const SkPDFShader::State> fShaderState;
+    SkPDFImageShader(SkPDFShader::State*);
+    typedef SkPDFStream INHERITED;
 };
 
 #endif
diff --git a/gfx/skia/skia/src/pdf/SkPDFStream.cpp b/gfx/skia/skia/src/pdf/SkPDFStream.cpp
index c310998a57b3..b8f2e4e92b89 100644
--- a/gfx/skia/skia/src/pdf/SkPDFStream.cpp
+++ b/gfx/skia/skia/src/pdf/SkPDFStream.cpp
@@ -8,129 +8,48 @@
 
 
 #include "SkData.h"
-#include "SkFlate.h"
-#include "SkPDFCatalog.h"
+#include "SkDeflate.h"
 #include "SkPDFStream.h"
 #include "SkStream.h"
 #include "SkStreamPriv.h"
 
-static bool skip_compression(SkPDFCatalog* catalog) {
-    return SkToBool(catalog->getDocumentFlags() &
-                    SkPDFDocument::kFavorSpeedOverSize_Flags);
-}
-
-SkPDFStream::SkPDFStream(SkStream* stream) : fState(kUnused_State) {
-    this->setData(stream);
-}
-
-SkPDFStream::SkPDFStream(SkData* data) : fState(kUnused_State) {
-    this->setData(data);
-}
-
-SkPDFStream::SkPDFStream(const SkPDFStream& pdfStream)
-        : SkPDFDict(),
-          fState(kUnused_State) {
-    this->setData(pdfStream.fDataStream.get());
-    bool removeLength = true;
-    // Don't uncompress an already compressed stream, but we could.
-    if (pdfStream.fState == kCompressed_State) {
-        fState = kCompressed_State;
-        removeLength = false;
-    }
-    this->mergeFrom(pdfStream);
-    if (removeLength) {
-        this->remove("Length");
-    }
-}
-
 SkPDFStream::~SkPDFStream() {}
 
-void SkPDFStream::emitObject(SkWStream* stream, SkPDFCatalog* catalog,
-                             bool indirect) {
-    if (indirect) {
-        return emitIndirectObject(stream, catalog);
-    }
-    SkAutoMutexAcquire lock(fMutex);  // multiple threads could be calling emit
-    if (!this->populate(catalog)) {
-        return fSubstitute->emitObject(stream, catalog, indirect);
-    }
-
-    this->INHERITED::emitObject(stream, catalog, false);
+void SkPDFStream::emitObject(SkWStream* stream,
+                             const SkPDFObjNumMap& objNumMap,
+                             const SkPDFSubstituteMap& substitutes) const {
+    SkASSERT(fCompressedData);
+    this->INHERITED::emitObject(stream, objNumMap, substitutes);
+    // duplicate (a cheap operation) preserves const on fCompressedData.
+    SkAutoTDelete<SkStreamRewindable> dup(fCompressedData->duplicate());
+    SkASSERT(dup);
+    SkASSERT(dup->hasLength());
     stream->writeText(" stream\n");
-    stream->writeStream(fDataStream.get(), fDataStream->getLength());
-    SkAssertResult(fDataStream->rewind());
+    stream->writeStream(dup.get(), dup->getLength());
     stream->writeText("\nendstream");
 }
 
-size_t SkPDFStream::getOutputSize(SkPDFCatalog* catalog, bool indirect) {
-    if (indirect) {
-        return getIndirectOutputSize(catalog);
-    }
-    SkAutoMutexAcquire lock(fMutex);  // multiple threads could be calling emit
-    if (!this->populate(catalog)) {
-        return fSubstitute->getOutputSize(catalog, indirect);
-    }
-
-    return this->INHERITED::getOutputSize(catalog, false) +
-        strlen(" stream\n\nendstream") + this->dataSize();
-}
-
-SkPDFStream::SkPDFStream() : fState(kUnused_State) {}
-
-void SkPDFStream::setData(SkData* data) {
-    fMemoryStream.setData(data);
-    if (&fMemoryStream != fDataStream.get()) {
-        fDataStream.reset(SkRef(&fMemoryStream));
-    }
-}
-
 void SkPDFStream::setData(SkStream* stream) {
-    // Code assumes that the stream starts at the beginning and is rewindable.
-    if (&fMemoryStream == fDataStream.get()) {
-        SkASSERT(&fMemoryStream != stream);
-        fMemoryStream.setData(NULL);
-    }
-    SkASSERT(0 == fMemoryStream.getLength());
-    if (stream) {
-        // SkStreamRewindableFromSkStream will try stream->duplicate().
-        fDataStream.reset(SkStreamRewindableFromSkStream(stream));
-        SkASSERT(fDataStream.get());
-    } else {
-        fDataStream.reset(SkRef(&fMemoryStream));
-    }
-}
+    SkASSERT(!fCompressedData);  // Only call this function once.
+    SkASSERT(stream);
+    // Code assumes that the stream starts at the beginning.
 
-size_t SkPDFStream::dataSize() const {
-    SkASSERT(fDataStream->hasLength());
-    return fDataStream->getLength();
-}
+    SkDynamicMemoryWStream compressedData;
+    SkDeflateWStream deflateWStream(&compressedData);
+    SkStreamCopy(&deflateWStream, stream);
+    deflateWStream.finalize();
+    size_t length = compressedData.bytesWritten();
 
-bool SkPDFStream::populate(SkPDFCatalog* catalog) {
-    if (fState == kUnused_State) {
-        if (!skip_compression(catalog) && SkFlate::HaveFlate()) {
-            SkDynamicMemoryWStream compressedData;
-
-            SkAssertResult(
-                    SkFlate::Deflate(fDataStream.get(), &compressedData));
-            SkAssertResult(fDataStream->rewind());
-            if (compressedData.getOffset() < this->dataSize()) {
-                SkAutoTUnref<SkStream> compressed(
-                        compressedData.detachAsStream());
-                this->setData(compressed.get());
-                insertName("Filter", "FlateDecode");
-            }
-            fState = kCompressed_State;
-        } else {
-            fState = kNoCompression_State;
+    if (stream->hasLength()) {
+        SkAutoTDelete<SkStreamRewindable> dup(stream->duplicate());
+        if (dup && dup->hasLength() &&
+            dup->getLength() <= length + strlen("/Filter_/FlateDecode_")) {
+            this->insertInt("Length", dup->getLength());
+            fCompressedData.reset(dup.detach());
+            return;
         }
-        insertInt("Length", this->dataSize());
-    } else if (fState == kNoCompression_State && !skip_compression(catalog) &&
-               SkFlate::HaveFlate()) {
-        if (!fSubstitute.get()) {
-            fSubstitute.reset(new SkPDFStream(*this));
-            catalog->setSubstitute(this, fSubstitute.get());
-        }
-        return false;
     }
-    return true;
+    fCompressedData.reset(compressedData.detachAsStream());
+    this->insertName("Filter", "FlateDecode");
+    this->insertInt("Length", length);
 }
diff --git a/gfx/skia/skia/src/pdf/SkPDFStream.h b/gfx/skia/skia/src/pdf/SkPDFStream.h
index f908fbf2f320..c5961d42b1a6 100644
--- a/gfx/skia/skia/src/pdf/SkPDFStream.h
+++ b/gfx/skia/skia/src/pdf/SkPDFStream.h
@@ -15,7 +15,7 @@
 #include "SkStream.h"
 #include "SkTemplates.h"
 
-class SkPDFCatalog;
+class SkPDFObjNumMap;
 
 /** \class SkPDFStream
 
@@ -23,83 +23,42 @@ class SkPDFCatalog;
     SkObjRef).
 */
 class SkPDFStream : public SkPDFDict {
-    SK_DECLARE_INST_COUNT(SkPDFStream)
+    
 public:
     /** Create a PDF stream. A Length entry is automatically added to the
      *  stream dictionary.
-     *  @param data   The data part of the stream.  Will be ref()ed.
+     *  @param data   The data part of the stream.  Will not take ownership.
      */
-    explicit SkPDFStream(SkData* data);
+    explicit SkPDFStream(SkData* data) { this->setData(data); }
 
     /** Create a PDF stream. A Length entry is automatically added to the
      *  stream dictionary.
-     *  @param stream The data part of the stream.  Will be duplicate()d.
+     *  @param stream The data part of the stream.  Will not take ownership.
      */
-    explicit SkPDFStream(SkStream* stream);
+    explicit SkPDFStream(SkStream* stream) { this->setData(stream); }
 
     virtual ~SkPDFStream();
 
-    // The SkPDFObject interface.  These two methods use a mutex to
-    // allow multiple threads to call at the same time.
-    virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog,
-                            bool indirect);
-    virtual size_t getOutputSize(SkPDFCatalog* catalog, bool indirect);
+    // The SkPDFObject interface.
+    void emitObject(SkWStream* stream,
+                    const SkPDFObjNumMap& objNumMap,
+                    const SkPDFSubstituteMap& substitutes) const override;
 
 protected:
-    enum State {
-        kUnused_State,         //!< The stream hasn't been requested yet.
-        kNoCompression_State,  //!< The stream's been requested in an
-                               //   uncompressed form.
-        kCompressed_State,     //!< The stream's already been compressed.
-    };
-
-    /** Create a PDF stream with the same content and dictionary entries
-     *  as the passed one.
-     */
-    explicit SkPDFStream(const SkPDFStream& pdfStream);
-
     /* Create a PDF stream with no data.  The setData method must be called to
      * set the data.
      */
-    SkPDFStream();
+    SkPDFStream() {}
 
-    // Populate the stream dictionary.  This method returns false if
-    // fSubstitute should be used.
-    virtual bool populate(SkPDFCatalog* catalog);
-
-    void setSubstitute(SkPDFStream* stream) {
-        fSubstitute.reset(stream);
-    }
-
-    SkPDFStream* getSubstitute() const {
-        return fSubstitute.get();
-    }
-
-    void setData(SkData* data);
+    /** Only call this function once. */
     void setData(SkStream* stream);
-
-    size_t dataSize() const;
-
-    void setState(State state) {
-        fState = state;
-    }
-
-    State getState() const {
-        return fState;
+    void setData(SkData* data) {
+        SkMemoryStream memoryStream(data);
+        this->setData(&memoryStream);
     }
 
 private:
-    // Indicates what form (or if) the stream has been requested.
-    State fState;
-
-    // Mutex guards fState, fDataStream, and fSubstitute in public interface.
-    SkMutex fMutex;
-
-    SkMemoryStream fMemoryStream;  // Used by fDataStream when
-                                   // fDataStream needs to be backed
-                                   // by SkData.
-    SkAutoTUnref<SkStreamRewindable> fDataStream;
-    SkAutoTUnref<SkPDFStream> fSubstitute;
+    SkAutoTDelete<SkStreamRewindable> fCompressedData;
 
     typedef SkPDFDict INHERITED;
 };
diff --git a/gfx/skia/skia/src/pdf/SkPDFTypes.cpp b/gfx/skia/skia/src/pdf/SkPDFTypes.cpp
index ee3895f4ae21..faa08372e5e8 100644
--- a/gfx/skia/skia/src/pdf/SkPDFTypes.cpp
+++ b/gfx/skia/skia/src/pdf/SkPDFTypes.cpp
@@ -6,507 +6,522 @@
  * found in the LICENSE file.
  */
 
-
-#include "SkPDFCatalog.h"
+#include "SkDeflate.h"
 #include "SkPDFTypes.h"
-#include "SkStream.h"
+#include "SkPDFUtils.h"
+#include "SkStreamPriv.h"
 
-#if defined(_MSC_VER) && _MSC_VER < 1900
-    #define SNPRINTF    _snprintf
-#else
-    #define SNPRINTF    snprintf
+////////////////////////////////////////////////////////////////////////////////
+
+SkString* pun(char* x) { return reinterpret_cast<SkString*>(x); }
+const SkString* pun(const char* x) {
+    return reinterpret_cast<const SkString*>(x);
+}
+
+SkPDFUnion::SkPDFUnion(Type t) : fType(t) {}
+
+SkPDFUnion::~SkPDFUnion() {
+    switch (fType) {
+        case Type::kNameSkS:
+        case Type::kStringSkS:
+            pun(fSkString)->~SkString();
+            return;
+        case Type::kObjRef:
+        case Type::kObject:
+            SkSafeUnref(fObject);
+            return;
+        default:
+            return;
+    }
+}
+
+SkPDFUnion& SkPDFUnion::operator=(SkPDFUnion&& other) {
+    if (this != &other) {
+        this->~SkPDFUnion();
+        new (this) SkPDFUnion(other.move());
+    }
+    return *this;
+}
+
+SkPDFUnion::SkPDFUnion(SkPDFUnion&& other) {
+    SkASSERT(this != &other);
+    memcpy(this, &other, sizeof(*this));
+    other.fType = Type::kDestroyed;
+}
+
+#if 0
+SkPDFUnion SkPDFUnion::copy() const {
+    SkPDFUnion u(fType);
+    memcpy(&u, this, sizeof(u));
+    switch (fType) {
+        case Type::kNameSkS:
+        case Type::kStringSkS:
+            new (pun(u.fSkString))  SkString                                   (*pun(fSkString));
+            return u.move();
+        case Type::kObjRef:
+        case Type::kObject:
+            SkRef(u.fObject);
+            return u.move();
+        default:
+            return u.move();
+    }
+}
+SkPDFUnion& SkPDFUnion::operator=(const SkPDFUnion& other) {
+    return *this = other.copy();
+}
+SkPDFUnion::SkPDFUnion(const SkPDFUnion& other) {
+    *this = other.copy();
+}
 #endif
 
-///////////////////////////////////////////////////////////////////////////////
-
-void SkPDFObject::emit(SkWStream* stream, SkPDFCatalog* catalog,
-                       bool indirect) {
-    SkPDFObject* realObject = catalog->getSubstituteObject(this);
-    return realObject->emitObject(stream, catalog, indirect);
+bool SkPDFUnion::isName() const {
+    return Type::kName == fType || Type::kNameSkS == fType;
 }
 
-size_t SkPDFObject::getOutputSize(SkPDFCatalog* catalog, bool indirect) {
-    SkDynamicMemoryWStream buffer;
-    emit(&buffer, catalog, indirect);
-    return buffer.getOffset();
-}
-
-void SkPDFObject::getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
-                               SkTSet<SkPDFObject*>* newResourceObjects) {}
-
-void SkPDFObject::emitIndirectObject(SkWStream* stream, SkPDFCatalog* catalog) {
-    catalog->emitObjectNumber(stream, this);
-    stream->writeText(" obj\n");
-    emit(stream, catalog, false);
-    stream->writeText("\nendobj\n");
-}
-
-size_t SkPDFObject::getIndirectOutputSize(SkPDFCatalog* catalog) {
-    return catalog->getObjectNumberSize(this) + strlen(" obj\n") +
-        this->getOutputSize(catalog, false) + strlen("\nendobj\n");
-}
-
-void SkPDFObject::AddResourceHelper(SkPDFObject* resource,
-                                    SkTDArray<SkPDFObject*>* list) {
-    list->push(resource);
-    resource->ref();
-}
-
-void SkPDFObject::GetResourcesHelper(
-        const SkTDArray<SkPDFObject*>* resources,
-        const SkTSet<SkPDFObject*>& knownResourceObjects,
-        SkTSet<SkPDFObject*>* newResourceObjects) {
-    if (resources->count()) {
-        newResourceObjects->setReserve(
-            newResourceObjects->count() + resources->count());
-        for (int i = 0; i < resources->count(); i++) {
-            if (!knownResourceObjects.contains((*resources)[i]) &&
-                    !newResourceObjects->contains((*resources)[i])) {
-                newResourceObjects->add((*resources)[i]);
-                (*resources)[i]->ref();
-                (*resources)[i]->getResources(knownResourceObjects,
-                                              newResourceObjects);
-            }
+#ifdef SK_DEBUG
+// Most names need no escaping.  Such names are handled as static
+// const strings.
+bool is_valid_name(const char* n) {
+    static const char kControlChars[] = "/%()<>[]{}";
+    while (*n) {
+        if (*n < '!' || *n > '~' || strchr(kControlChars, *n)) {
+            return false;
         }
+        ++n;
     }
+    return true;
 }
+#endif  // SK_DEBUG
 
-SkPDFObjRef::SkPDFObjRef(SkPDFObject* obj) : fObj(obj) {
-    SkSafeRef(obj);
-}
-
-SkPDFObjRef::~SkPDFObjRef() {}
-
-void SkPDFObjRef::emitObject(SkWStream* stream, SkPDFCatalog* catalog,
-                             bool indirect) {
-    SkASSERT(!indirect);
-    catalog->emitObjectNumber(stream, fObj.get());
-    stream->writeText(" R");
-}
-
-size_t SkPDFObjRef::getOutputSize(SkPDFCatalog* catalog, bool indirect) {
-    SkASSERT(!indirect);
-    return catalog->getObjectNumberSize(fObj.get()) + strlen(" R");
-}
-
-SkPDFInt::SkPDFInt(int32_t value) : fValue(value) {}
-SkPDFInt::~SkPDFInt() {}
-
-void SkPDFInt::emitObject(SkWStream* stream, SkPDFCatalog* catalog,
-                          bool indirect) {
-    if (indirect) {
-        return emitIndirectObject(stream, catalog);
-    }
-    stream->writeDecAsText(fValue);
-}
-
-SkPDFBool::SkPDFBool(bool value) : fValue(value) {}
-SkPDFBool::~SkPDFBool() {}
-
-void SkPDFBool::emitObject(SkWStream* stream, SkPDFCatalog* catalog,
-                          bool indirect) {
-    SkASSERT(!indirect);
-    if (fValue) {
-        stream->writeText("true");
-    } else {
-        stream->writeText("false");
-    }
-}
-
-size_t SkPDFBool::getOutputSize(SkPDFCatalog* catalog, bool indirect) {
-    SkASSERT(!indirect);
-    if (fValue) {
-        return strlen("true");
-    }
-    return strlen("false");
-}
-
-SkPDFScalar::SkPDFScalar(SkScalar value) : fValue(value) {}
-SkPDFScalar::~SkPDFScalar() {}
-
-void SkPDFScalar::emitObject(SkWStream* stream, SkPDFCatalog* catalog,
-                             bool indirect) {
-    if (indirect) {
-        return emitIndirectObject(stream, catalog);
-    }
-
-    Append(fValue, stream);
-}
-
-// static
-void SkPDFScalar::Append(SkScalar value, SkWStream* stream) {
-    // The range of reals in PDF/A is the same as SkFixed: +/- 32,767 and
-    // +/- 1/65,536 (though integers can range from 2^31 - 1 to -2^31).
-    // When using floats that are outside the whole value range, we can use
-    // integers instead.
-
-#if !defined(SK_ALLOW_LARGE_PDF_SCALARS)
-    if (value > 32767 || value < -32767) {
-        stream->writeDecAsText(SkScalarRoundToInt(value));
-        return;
-    }
-
-    char buffer[SkStrAppendScalar_MaxSize];
-    char* end = SkStrAppendFixed(buffer, SkScalarToFixed(value));
-    stream->write(buffer, end - buffer);
-    return;
-#endif  // !SK_ALLOW_LARGE_PDF_SCALARS
-
-#if defined(SK_ALLOW_LARGE_PDF_SCALARS)
-    // Floats have 24bits of significance, so anything outside that range is
-    // no more precise than an int. (Plus PDF doesn't support scientific
-    // notation, so this clamps to SK_Max/MinS32).
-    if (value > (1 << 24) || value < -(1 << 24)) {
-        stream->writeDecAsText(value);
-        return;
-    }
-    // Continue to enforce the PDF limits for small floats.
-    if (value < 1.0f/65536 && value > -1.0f/65536) {
-        stream->writeDecAsText(0);
-        return;
-    }
-    // SkStrAppendFloat might still use scientific notation, so use snprintf
-    // directly..
-    static const int kFloat_MaxSize = 19;
-    char buffer[kFloat_MaxSize];
-    int len = SNPRINTF(buffer, kFloat_MaxSize, "%#.8f", value);
-    // %f always prints trailing 0s, so strip them.
-    for (; buffer[len - 1] == '0' && len > 0; len--) {
-        buffer[len - 1] = '\0';
-    }
-    if (buffer[len - 1] == '.') {
-        buffer[len - 1] = '\0';
-    }
-    stream->writeText(buffer);
-    return;
-#endif  // SK_ALLOW_LARGE_PDF_SCALARS
-}
-
-SkPDFString::SkPDFString(const char value[])
-    : fValue(FormatString(value, strlen(value))) {
-}
-
-SkPDFString::SkPDFString(const SkString& value)
-    : fValue(FormatString(value.c_str(), value.size())) {
-}
-
-SkPDFString::SkPDFString(const uint16_t* value, size_t len, bool wideChars)
-    : fValue(FormatString(value, len, wideChars)) {
-}
-
-SkPDFString::~SkPDFString() {}
-
-void SkPDFString::emitObject(SkWStream* stream, SkPDFCatalog* catalog,
-                             bool indirect) {
-    if (indirect)
-        return emitIndirectObject(stream, catalog);
-    stream->write(fValue.c_str(), fValue.size());
-}
-
-size_t SkPDFString::getOutputSize(SkPDFCatalog* catalog, bool indirect) {
-    if (indirect)
-        return getIndirectOutputSize(catalog);
-    return fValue.size();
-}
-
-// static
-SkString SkPDFString::FormatString(const char* input, size_t len) {
-    return DoFormatString(input, len, false, false);
-}
-
-SkString SkPDFString::FormatString(const uint16_t* input, size_t len,
-                                   bool wideChars) {
-    return DoFormatString(input, len, true, wideChars);
-}
-
-// static
-SkString SkPDFString::DoFormatString(const void* input, size_t len,
-                                     bool wideInput, bool wideOutput) {
-    SkASSERT(len <= kMaxLen);
-    const uint16_t* win = (const uint16_t*) input;
-    const char* cin = (const char*) input;
-
-    if (wideOutput) {
-        SkASSERT(wideInput);
-        SkString result;
-        result.append("<");
-        for (size_t i = 0; i < len; i++) {
-            result.appendHex(win[i], 4);
-        }
-        result.append(">");
-        return result;
-    }
-
-    // 7-bit clean is a heuristic to decide what string format to use;
-    // a 7-bit clean string should require little escaping.
-    bool sevenBitClean = true;
-    for (size_t i = 0; i < len; i++) {
-        SkASSERT(!wideInput || !(win[i] & ~0xFF));
-        char val = wideInput ? win[i] : cin[i];
-        if (val > '~' || val < ' ') {
-            sevenBitClean = false;
-            break;
-        }
-    }
-
-    SkString result;
-    if (sevenBitClean) {
-        result.append("(");
-        for (size_t i = 0; i < len; i++) {
-            SkASSERT(!wideInput || !(win[i] & ~0xFF));
-            char val = wideInput ? win[i] : cin[i];
-            if (val == '\\' || val == '(' || val == ')') {
-                result.append("\\");
-            }
-            result.append(&val, 1);
-        }
-        result.append(")");
-    } else {
-        result.append("<");
-        for (size_t i = 0; i < len; i++) {
-            SkASSERT(!wideInput || !(win[i] & ~0xFF));
-            unsigned char val = wideInput ? win[i] : cin[i];
-            result.appendHex(val, 2);
-        }
-        result.append(">");
-    }
-
-    return result;
-}
-
-SkPDFName::SkPDFName(const char name[]) : fValue(FormatName(SkString(name))) {}
-SkPDFName::SkPDFName(const SkString& name) : fValue(FormatName(name)) {}
-SkPDFName::~SkPDFName() {}
-
-bool SkPDFName::operator==(const SkPDFName& b) const {
-    return fValue == b.fValue;
-}
-
-void SkPDFName::emitObject(SkWStream* stream, SkPDFCatalog* catalog,
-                           bool indirect) {
-    SkASSERT(!indirect);
-    stream->write(fValue.c_str(), fValue.size());
-}
-
-size_t SkPDFName::getOutputSize(SkPDFCatalog* catalog, bool indirect) {
-    SkASSERT(!indirect);
-    return fValue.size();
-}
-
-// static
-SkString SkPDFName::FormatName(const SkString& input) {
-    SkASSERT(input.size() <= kMaxLen);
-    // TODO(vandebo) If more escaping is needed, improve the linear scan.
-    static const char escaped[] = "#/%()<>[]{}";
-
-    SkString result("/");
-    for (size_t i = 0; i < input.size(); i++) {
-        if (input[i] & 0x80 || input[i] < '!' || strchr(escaped, input[i])) {
-            result.append("#");
-            // Mask with 0xFF to avoid sign extension. i.e. #FFFFFF81
-            result.appendHex(input[i] & 0xFF, 2);
+// Given an arbitrary string, write it as a valid name (not including
+// leading slash).
+static void write_name_escaped(SkWStream* o, const char* name) {
+    static const char kToEscape[] = "#/%()<>[]{}";
+    static const char kHex[] = "0123456789ABCDEF";
+    for (const uint8_t* n = reinterpret_cast<const uint8_t*>(name); *n; ++n) {
+        if (*n < '!' || *n > '~' || strchr(kToEscape, *n)) {
+            char buffer[3] = {'#', '\0', '\0'};
+            buffer[1] = kHex[(*n >> 4) & 0xF];
+            buffer[2] = kHex[*n & 0xF];
+            o->write(buffer, sizeof(buffer));
         } else {
-            result.append(input.c_str() + i, 1);
+            o->write(n, 1);
         }
     }
-
-    return result;
 }
 
+static void write_string(SkWStream* o, const SkString& s) {
+    o->write(s.c_str(), s.size());
+}
+
+static SkString format_string(const SkString& s) {
+    return SkPDFUtils::FormatString(s.c_str(), s.size());
+}
+
+static SkString format_string(const char* s) {
+    return SkPDFUtils::FormatString(s, strlen(s));
+}
+
+void SkPDFUnion::emitObject(SkWStream* stream,
+                            const SkPDFObjNumMap& objNumMap,
+                            const SkPDFSubstituteMap& substitutes) const {
+    switch (fType) {
+        case Type::kInt:
+            stream->writeDecAsText(fIntValue);
+            return;
+        case Type::kBool:
+            stream->writeText(fBoolValue ? "true" : "false");
+            return;
+        case Type::kScalar:
+            SkPDFUtils::AppendScalar(fScalarValue, stream);
+            return;
+        case Type::kName:
+            stream->writeText("/");
+            SkASSERT(is_valid_name(fStaticString));
+            stream->writeText(fStaticString);
+            return;
+        case Type::kString:
+            SkASSERT(fStaticString);
+            write_string(stream, format_string(fStaticString));
+            return;
+        case Type::kNameSkS:
+            stream->writeText("/");
+            write_name_escaped(stream, pun(fSkString)->c_str());
+            return;
+        case Type::kStringSkS:
+            write_string(stream, format_string(*pun(fSkString)));
+            return;
+        case Type::kObjRef:
+            stream->writeDecAsText(objNumMap.getObjectNumber(
+                    substitutes.getSubstitute(fObject)));
+            stream->writeText(" 0 R");  // Generation number is always 0.
+            return;
+        case Type::kObject:
+            fObject->emitObject(stream, objNumMap, substitutes);
+            return;
+        default:
+            SkDEBUGFAIL("SkPDFUnion::emitObject with bad type");
+    }
+}
+
+void SkPDFUnion::addResources(SkPDFObjNumMap* objNumMap,
+                              const SkPDFSubstituteMap& substituteMap) const {
+    switch (fType) {
+        case Type::kInt:
+        case Type::kBool:
+        case Type::kScalar:
+        case Type::kName:
+        case Type::kString:
+        case Type::kNameSkS:
+        case Type::kStringSkS:
+            return;  // These have no resources.
+        case Type::kObjRef: {
+            SkPDFObject* obj = substituteMap.getSubstitute(fObject);
+            objNumMap->addObjectRecursively(obj, substituteMap);
+            return;
+        }
+        case Type::kObject:
+            fObject->addResources(objNumMap, substituteMap);
+            return;
+        default:
+            SkDEBUGFAIL("SkPDFUnion::addResources with bad type");
+    }
+}
+
+SkPDFUnion SkPDFUnion::Int(int32_t value) {
+    SkPDFUnion u(Type::kInt);
+    u.fIntValue = value;
+    return u.move();
+}
+
+SkPDFUnion SkPDFUnion::Bool(bool value) {
+    SkPDFUnion u(Type::kBool);
+    u.fBoolValue = value;
+    return u.move();
+}
+
+SkPDFUnion SkPDFUnion::Scalar(SkScalar value) {
+    SkPDFUnion u(Type::kScalar);
+    u.fScalarValue = value;
+    return u.move();
+}
+
+SkPDFUnion SkPDFUnion::Name(const char* value) {
+    SkPDFUnion u(Type::kName);
+    SkASSERT(value);
+    SkASSERT(is_valid_name(value));
+    u.fStaticString = value;
+    return u.move();
+}
+
+SkPDFUnion SkPDFUnion::String(const char* value) {
+    SkPDFUnion u(Type::kString);
+    SkASSERT(value);
+    u.fStaticString = value;
+    return u.move();
+}
+
+SkPDFUnion SkPDFUnion::Name(const SkString& s) {
+    SkPDFUnion u(Type::kNameSkS);
+    new (pun(u.fSkString)) SkString(s);
+    return u.move();
+}
+
+SkPDFUnion SkPDFUnion::String(const SkString& s) {
+    SkPDFUnion u(Type::kStringSkS);
+    new (pun(u.fSkString)) SkString(s);
+    return u.move();
+}
+
+SkPDFUnion SkPDFUnion::ObjRef(SkPDFObject* ptr) {
+    SkPDFUnion u(Type::kObjRef);
+    SkASSERT(ptr);
+    u.fObject = ptr;
+    return u.move();
+}
+
+SkPDFUnion SkPDFUnion::Object(SkPDFObject* ptr) {
+    SkPDFUnion u(Type::kObject);
+    SkASSERT(ptr);
+    u.fObject = ptr;
+    return u.move();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+#if 0  // Enable if needed.
+void SkPDFAtom::emitObject(SkWStream* stream,
+                           const SkPDFObjNumMap& objNumMap,
+                           const SkPDFSubstituteMap& substitutes) const {
+    fValue.emitObject(stream, objNumMap, substitutes);
+}
+void SkPDFAtom::addResources(SkPDFObjNumMap* map,
+                             const SkPDFSubstituteMap& substitutes) const {
+    fValue.addResources(map, substitutes);
+}
+#endif  // 0
+
+////////////////////////////////////////////////////////////////////////////////
+
 SkPDFArray::SkPDFArray() {}
 SkPDFArray::~SkPDFArray() {
-    fValue.unrefAll();
+    for (SkPDFUnion& value : fValues) {
+        value.~SkPDFUnion();
+    }
+    fValues.reset();
 }
 
-void SkPDFArray::emitObject(SkWStream* stream, SkPDFCatalog* catalog,
-                            bool indirect) {
-    if (indirect) {
-        return emitIndirectObject(stream, catalog);
-    }
+int SkPDFArray::size() const { return fValues.count(); }
 
+void SkPDFArray::reserve(int length) { fValues.setReserve(length); }
+
+void SkPDFArray::emitObject(SkWStream* stream,
+                            const SkPDFObjNumMap& objNumMap,
+                            const SkPDFSubstituteMap& substitutes) const {
     stream->writeText("[");
-    for (int i = 0; i < fValue.count(); i++) {
-        fValue[i]->emit(stream, catalog, false);
-        if (i + 1 < fValue.count()) {
+    for (int i = 0; i < fValues.count(); i++) {
+        fValues[i].emitObject(stream, objNumMap, substitutes);
+        if (i + 1 < fValues.count()) {
             stream->writeText(" ");
         }
     }
     stream->writeText("]");
 }
 
-size_t SkPDFArray::getOutputSize(SkPDFCatalog* catalog, bool indirect) {
-    if (indirect) {
-        return getIndirectOutputSize(catalog);
+void SkPDFArray::addResources(SkPDFObjNumMap* catalog,
+                              const SkPDFSubstituteMap& substitutes) const {
+    for (const SkPDFUnion& value : fValues) {
+        value.addResources(catalog, substitutes);
     }
-
-    size_t result = strlen("[]");
-    if (fValue.count()) {
-        result += fValue.count() - 1;
-    }
-    for (int i = 0; i < fValue.count(); i++) {
-        result += fValue[i]->getOutputSize(catalog, false);
-    }
-    return result;
 }
 
-void SkPDFArray::reserve(int length) {
-    SkASSERT(length <= kMaxLen);
-    fValue.setReserve(length);
-}
-
-SkPDFObject* SkPDFArray::setAt(int offset, SkPDFObject* value) {
-    SkASSERT(offset < fValue.count());
-    value->ref();
-    fValue[offset]->unref();
-    fValue[offset] = value;
-    return value;
-}
-
-SkPDFObject* SkPDFArray::append(SkPDFObject* value) {
-    SkASSERT(fValue.count() < kMaxLen);
-    value->ref();
-    fValue.push(value);
-    return value;
-}
+void SkPDFArray::append(SkPDFUnion&& value) { new (fValues.append()) SkPDFUnion(value.move()); }
 
 void SkPDFArray::appendInt(int32_t value) {
-    SkASSERT(fValue.count() < kMaxLen);
-    fValue.push(new SkPDFInt(value));
+    this->append(SkPDFUnion::Int(value));
+}
+
+void SkPDFArray::appendBool(bool value) {
+    this->append(SkPDFUnion::Bool(value));
 }
 
 void SkPDFArray::appendScalar(SkScalar value) {
-    SkASSERT(fValue.count() < kMaxLen);
-    fValue.push(new SkPDFScalar(value));
+    this->append(SkPDFUnion::Scalar(value));
 }
 
 void SkPDFArray::appendName(const char name[]) {
-    SkASSERT(fValue.count() < kMaxLen);
-    fValue.push(new SkPDFName(name));
+    this->append(SkPDFUnion::Name(SkString(name)));
+}
+
+void SkPDFArray::appendName(const SkString& name) {
+    this->append(SkPDFUnion::Name(name));
+}
+
+void SkPDFArray::appendString(const SkString& value) {
+    this->append(SkPDFUnion::String(value));
+}
+
+void SkPDFArray::appendString(const char value[]) {
+    this->append(SkPDFUnion::String(value));
+}
+
+void SkPDFArray::appendObject(SkPDFObject* value) {
+    this->append(SkPDFUnion::Object(value));
+}
+
+void SkPDFArray::appendObjRef(SkPDFObject* value) {
+    this->append(SkPDFUnion::ObjRef(value));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkPDFDict::SkPDFDict() {}
 
-SkPDFDict::SkPDFDict(const char type[]) {
-    insertName("Type", type);
-}
+SkPDFDict::~SkPDFDict() { this->clear(); }
 
-SkPDFDict::~SkPDFDict() {
-    clear();
-}
+SkPDFDict::SkPDFDict(const char type[]) { this->insertName("Type", type); }
 
-int SkPDFDict::size() const {
-    SkAutoMutexAcquire lock(fMutex);
-    return fValue.count();
-}
-
-
-void SkPDFDict::emitObject(SkWStream* stream, SkPDFCatalog* catalog,
-                           bool indirect) {
-    if (indirect) {
-        return emitIndirectObject(stream, catalog);
-    }
-
-    SkAutoMutexAcquire lock(fMutex); // If another thread triggers a
-                                     // resize while this thread is in
-                                     // the for-loop, we can be left
-                                     // with a bad fValue[i] reference.
+void SkPDFDict::emitObject(SkWStream* stream,
+                           const SkPDFObjNumMap& objNumMap,
+                           const SkPDFSubstituteMap& substitutes) const {
     stream->writeText("<<");
-    for (int i = 0; i < fValue.count(); i++) {
-        SkASSERT(fValue[i].key);
-        SkASSERT(fValue[i].value);
-        fValue[i].key->emitObject(stream, catalog, false);
-        stream->writeText(" ");
-        fValue[i].value->emit(stream, catalog, false);
-        stream->writeText("\n");
-    }
+    this->emitAll(stream, objNumMap, substitutes);
     stream->writeText(">>");
 }
 
-size_t SkPDFDict::getOutputSize(SkPDFCatalog* catalog, bool indirect) {
-    if (indirect) {
-        return getIndirectOutputSize(catalog);
-    }
-
-    SkAutoMutexAcquire lock(fMutex); // If another thread triggers a
-                                     // resize while this thread is in
-                                     // the for-loop, we can be left
-                                     // with a bad fValue[i] reference.
-    size_t result = strlen("<<>>") + (fValue.count() * 2);
-    for (int i = 0; i < fValue.count(); i++) {
-        SkASSERT(fValue[i].key);
-        SkASSERT(fValue[i].value);
-        result += fValue[i].key->getOutputSize(catalog, false);
-        result += fValue[i].value->getOutputSize(catalog, false);
-    }
-    return result;
-}
-
-SkPDFObject*  SkPDFDict::append(SkPDFName* key, SkPDFObject* value) {
-    SkASSERT(key);
-    SkASSERT(value);
-    SkAutoMutexAcquire lock(fMutex); // If the SkTDArray resizes while
-                                     // two threads access array, one
-                                     // is left with a bad pointer.
-    *(fValue.append()) = Rec(key, value);
-    return value;
-}
-
-SkPDFObject* SkPDFDict::insert(SkPDFName* key, SkPDFObject* value) {
-    return this->append(SkRef(key), SkRef(value));
-}
-
-SkPDFObject* SkPDFDict::insert(const char key[], SkPDFObject* value) {
-    return this->append(new SkPDFName(key), SkRef(value));
-}
-
-void SkPDFDict::insertInt(const char key[], int32_t value) {
-    (void)this->append(new SkPDFName(key), new SkPDFInt(value));
-}
-
-void SkPDFDict::insertScalar(const char key[], SkScalar value) {
-    (void)this->append(new SkPDFName(key), new SkPDFScalar(value));
-}
-
-void SkPDFDict::insertName(const char key[], const char name[]) {
-    (void)this->append(new SkPDFName(key), new SkPDFName(name));
-}
-
-void SkPDFDict::clear() {
-    SkAutoMutexAcquire lock(fMutex);
-    for (int i = 0; i < fValue.count(); i++) {
-        SkASSERT(fValue[i].key);
-        SkASSERT(fValue[i].value);
-        fValue[i].key->unref();
-        fValue[i].value->unref();
-    }
-    fValue.reset();
-}
-
-void SkPDFDict::remove(const char key[]) {
-    SkASSERT(key);
-    SkPDFName name(key);
-    SkAutoMutexAcquire lock(fMutex);
-    for (int i = 0; i < fValue.count(); i++) {
-        SkASSERT(fValue[i].key);
-        if (*(fValue[i].key) == name) {
-            fValue[i].key->unref();
-            SkASSERT(fValue[i].value);
-            fValue[i].value->unref();
-            fValue.removeShuffle(i);
-            return;
+void SkPDFDict::emitAll(SkWStream* stream,
+                        const SkPDFObjNumMap& objNumMap,
+                        const SkPDFSubstituteMap& substitutes) const {
+    for (int i = 0; i < fRecords.count(); i++) {
+        fRecords[i].fKey.emitObject(stream, objNumMap, substitutes);
+        stream->writeText(" ");
+        fRecords[i].fValue.emitObject(stream, objNumMap, substitutes);
+        if (i + 1 < fRecords.count()) {
+            stream->writeText("\n");
         }
     }
 }
 
-void SkPDFDict::mergeFrom(const SkPDFDict& other) {
-    SkAutoMutexAcquire lockOther(other.fMutex);
-    SkTDArray<Rec> copy(other.fValue);
-    lockOther.release();  // Do not hold both mutexes at once.
-
-    SkAutoMutexAcquire lock(fMutex);
-    for (int i = 0; i < copy.count(); i++) {
-        *(fValue.append()) = Rec(SkRef(copy[i].key), SkRef(copy[i].value));
+void SkPDFDict::addResources(SkPDFObjNumMap* catalog,
+                             const SkPDFSubstituteMap& substitutes) const {
+    for (int i = 0; i < fRecords.count(); i++) {
+        fRecords[i].fKey.addResources(catalog, substitutes);
+        fRecords[i].fValue.addResources(catalog, substitutes);
     }
 }
+
+void SkPDFDict::set(SkPDFUnion&& name, SkPDFUnion&& value) {
+    Record* rec = fRecords.append();
+    SkASSERT(name.isName());
+    new (&rec->fKey) SkPDFUnion(name.move());
+    new (&rec->fValue) SkPDFUnion(value.move());
+}
+
+int SkPDFDict::size() const { return fRecords.count(); }
+
+void SkPDFDict::insertObjRef(const char key[], SkPDFObject* value) {
+    this->set(SkPDFUnion::Name(key), SkPDFUnion::ObjRef(value));
+}
+void SkPDFDict::insertObjRef(const SkString& key, SkPDFObject* value) {
+    this->set(SkPDFUnion::Name(key), SkPDFUnion::ObjRef(value));
+}
+
+void SkPDFDict::insertObject(const char key[], SkPDFObject* value) {
+    this->set(SkPDFUnion::Name(key), SkPDFUnion::Object(value));
+}
+void SkPDFDict::insertObject(const SkString& key, SkPDFObject* value) {
+    this->set(SkPDFUnion::Name(key), SkPDFUnion::Object(value));
+}
+
+void SkPDFDict::insertBool(const char key[], bool value) {
+    this->set(SkPDFUnion::Name(key), SkPDFUnion::Bool(value));
+}
+
+void SkPDFDict::insertInt(const char key[], int32_t value) {
+    this->set(SkPDFUnion::Name(key), SkPDFUnion::Int(value));
+}
+
+void SkPDFDict::insertInt(const char key[], size_t value) {
+    this->insertInt(key, SkToS32(value));
+}
+
+void SkPDFDict::insertScalar(const char key[], SkScalar value) {
+    this->set(SkPDFUnion::Name(key), SkPDFUnion::Scalar(value));
+}
+
+void SkPDFDict::insertName(const char key[], const char name[]) {
+    this->set(SkPDFUnion::Name(key), SkPDFUnion::Name(name));
+}
+
+void SkPDFDict::insertName(const char key[], const SkString& name) {
+    this->set(SkPDFUnion::Name(key), SkPDFUnion::Name(name));
+}
+
+void SkPDFDict::insertString(const char key[], const char value[]) {
+    this->set(SkPDFUnion::Name(key), SkPDFUnion::String(value));
+}
+
+void SkPDFDict::insertString(const char key[], const SkString& value) {
+    this->set(SkPDFUnion::Name(key), SkPDFUnion::String(value));
+}
+
+void SkPDFDict::clear() {
+    for (Record& rec : fRecords) {
+        rec.fKey.~SkPDFUnion();
+        rec.fValue.~SkPDFUnion();
+    }
+    fRecords.reset();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+void SkPDFSharedStream::emitObject(
+        SkWStream* stream,
+        const SkPDFObjNumMap& objNumMap,
+        const SkPDFSubstituteMap& substitutes) const {
+    SkDynamicMemoryWStream buffer;
+    SkDeflateWStream deflateWStream(&buffer);
+    // Since emitObject is const, this function doesn't change the dictionary.
+    SkAutoTDelete<SkStreamAsset> dup(fAsset->duplicate());  // Cheap copy
+    SkASSERT(dup);
+    SkStreamCopy(&deflateWStream, dup.get());
+    deflateWStream.finalize();
+    size_t length = buffer.bytesWritten();
+    stream->writeText("<<");
+    fDict->emitAll(stream, objNumMap, substitutes);
+    stream->writeText("\n");
+    SkPDFUnion::Name("Length").emitObject(stream, objNumMap, substitutes);
+    stream->writeText(" ");
+    SkPDFUnion::Int(length).emitObject(stream, objNumMap, substitutes);
+    stream->writeText("\n");
+    SkPDFUnion::Name("Filter").emitObject(stream, objNumMap, substitutes);
+    stream->writeText(" ");
+    SkPDFUnion::Name("FlateDecode").emitObject(stream, objNumMap, substitutes);
+    stream->writeText(">>");
+    stream->writeText(" stream\n");
+    buffer.writeToStream(stream);
+    stream->writeText("\nendstream");
+}
+
+void SkPDFSharedStream::addResources(
+        SkPDFObjNumMap* catalog, const SkPDFSubstituteMap& substitutes) const {
+    fDict->addResources(catalog, substitutes);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+SkPDFSubstituteMap::~SkPDFSubstituteMap() {
+    fSubstituteMap.foreach(
+            [](SkPDFObject*, SkPDFObject** v) { (*v)->unref(); });
+}
+
+void SkPDFSubstituteMap::setSubstitute(SkPDFObject* original,
+                                       SkPDFObject* substitute) {
+    SkASSERT(original != substitute);
+    SkASSERT(!fSubstituteMap.find(original));
+    fSubstituteMap.set(original, SkRef(substitute));
+}
+
+SkPDFObject* SkPDFSubstituteMap::getSubstitute(SkPDFObject* object) const {
+    SkPDFObject** found = fSubstituteMap.find(object);
+    return found ? *found : object;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+bool SkPDFObjNumMap::addObject(SkPDFObject* obj) {
+    if (fObjectNumbers.find(obj)) {
+        return false;
+    }
+    fObjectNumbers.set(obj, fObjectNumbers.count() + 1);
+    fObjects.push(obj);
+    return true;
+}
+
+void SkPDFObjNumMap::addObjectRecursively(SkPDFObject* obj,
+                                          const SkPDFSubstituteMap& subs) {
+    if (obj && this->addObject(obj)) {
+        obj->addResources(this, subs);
+    }
+}
+
+int32_t SkPDFObjNumMap::getObjectNumber(SkPDFObject* obj) const {
+    int32_t* objectNumberFound = fObjectNumbers.find(obj);
+    SkASSERT(objectNumberFound);
+    return *objectNumberFound;
+}
+
+#ifdef SK_PDF_IMAGE_STATS
+SkAtomic<int> gDrawImageCalls(0);
+SkAtomic<int> gJpegImageObjects(0);
+SkAtomic<int> gRegularImageObjects(0);
+
+void SkPDFImageDumpStats() {
+    SkDebugf("\ntotal PDF drawImage/drawBitmap calls: %d\n"
+             "total PDF jpeg images: %d\n"
+             "total PDF regular images: %d\n",
+             gDrawImageCalls.load(),
+             gJpegImageObjects.load(),
+             gRegularImageObjects.load());
+}
+#endif // SK_PDF_IMAGE_STATS
diff --git a/gfx/skia/skia/src/pdf/SkPDFTypes.h b/gfx/skia/skia/src/pdf/SkPDFTypes.h
index 004c767843a5..99320b1efc77 100644
--- a/gfx/skia/skia/src/pdf/SkPDFTypes.h
+++ b/gfx/skia/skia/src/pdf/SkPDFTypes.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2010 The Android Open Source Project
  *
@@ -12,277 +11,186 @@
 
 #include "SkRefCnt.h"
 #include "SkScalar.h"
+#include "SkStream.h"
 #include "SkString.h"
 #include "SkTDArray.h"
-#include "SkTSet.h"
+#include "SkTHash.h"
 #include "SkTypes.h"
 
-class SkPDFCatalog;
-class SkWStream;
+class SkPDFObjNumMap;
+class SkPDFObject;
+class SkPDFSubstituteMap;
+
+#ifdef SK_PDF_IMAGE_STATS
+#include "SkAtomics.h"
+#endif
 
 /** \class SkPDFObject
 
     A PDF Object is the base class for primitive elements in a PDF file.  A
     common subtype is used to ease the use of indirect object references,
     which are common in the PDF format.
+
 */
 class SkPDFObject : public SkRefCnt {
 public:
-    SK_DECLARE_INST_COUNT(SkPDFObject)
-
-    /** Return the size (number of bytes) of this object in the final output
-     *  file. Compound objects or objects that are computationally intensive
-     *  to output should override this method.
-     *  @param catalog  The object catalog to use.
-     *  @param indirect If true, output an object identifier with the object.
-     */
-    virtual size_t getOutputSize(SkPDFCatalog* catalog, bool indirect);
-
-    /** For non-primitive objects (i.e. objects defined outside this file),
-     *  this method will add to newResourceObjects any objects that this method
-     *  depends on, but not already in knownResourceObjects. This operates
-     *  recursively so if this object depends on another object and that object
-     *  depends on two more, all three objects will be added.
-     *
-     *  @param knownResourceObjects  The set of resources to be ignored.
-     *  @param newResourceObjects  The set to append dependant resources to.
-     */
-    virtual void getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
-                              SkTSet<SkPDFObject*>* newResourceObjects);
-
-    /** Emit this object unless the catalog has a substitute object, in which
-     *  case emit that.
-     *  @see emitObject
-     */
-    void emit(SkWStream* stream, SkPDFCatalog* catalog, bool indirect);
-
-    /** Helper function to output an indirect object.
-     *  @param catalog The object catalog to use.
-     *  @param stream  The writable output stream to send the output to.
-     */
-    void emitIndirectObject(SkWStream* stream, SkPDFCatalog* catalog);
-
-    /** Helper function to find the size of an indirect object.
-     *  @param catalog The object catalog to use.
-     */
-    size_t getIndirectOutputSize(SkPDFCatalog* catalog);
-
-    /** Static helper function to add a resource to a list.  The list takes
-     *  a reference.
-     * @param resource  The resource to add.
-     * @param list      The list to add the resource to.
-     */
-    static void AddResourceHelper(SkPDFObject* resource,
-                                  SkTDArray<SkPDFObject*>* list);
-
-    /** Static helper function to copy and reference the resources (and all
-     *   their subresources) into a new list.
-     * @param resources The resource list.
-     * @param newResourceObjects All the resource objects (recursively) used on
-     *                         the page are added to this array.  This gives
-     *                         the caller a chance to deduplicate resources
-     *                         across pages.
-     * @param knownResourceObjects  The set of resources to be ignored.
-     */
-    static void GetResourcesHelper(
-            const SkTDArray<SkPDFObject*>* resources,
-            const SkTSet<SkPDFObject*>& knownResourceObjects,
-            SkTSet<SkPDFObject*>* newResourceObjects);
-
-protected:
     /** Subclasses must implement this method to print the object to the
      *  PDF file.
      *  @param catalog  The object catalog to use.
-     *  @param indirect If true, output an object identifier with the object.
      *  @param stream   The writable output stream to send the output to.
      */
-    virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog,
-                            bool indirect) = 0;
+    // TODO(halcanary): make this method const
+    virtual void emitObject(SkWStream* stream,
+                            const SkPDFObjNumMap& objNumMap,
+                            const SkPDFSubstituteMap& substitutes) const = 0;
 
-        typedef SkRefCnt INHERITED;
-};
-
-/** \class SkPDFObjRef
-
-    An indirect reference to a PDF object.
-*/
-class SkPDFObjRef : public SkPDFObject {
-public:
-    SK_DECLARE_INST_COUNT(SkPDFObjRef)
-
-    /** Create a reference to an existing SkPDFObject.
-     *  @param obj The object to reference.
+    /**
+     *  Adds all transitive dependencies of this object to the
+     *  catalog.  Implementations should respect the catalog's object
+     *  substitution map.
      */
-    explicit SkPDFObjRef(SkPDFObject* obj);
-    virtual ~SkPDFObjRef();
-
-    // The SkPDFObject interface.
-    virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog,
-                            bool indirect);
-    virtual size_t getOutputSize(SkPDFCatalog* catalog, bool indirect);
+    virtual void addResources(SkPDFObjNumMap* catalog,
+                              const SkPDFSubstituteMap& substitutes) const {}
 
 private:
-    SkAutoTUnref<SkPDFObject> fObj;
-
-    typedef SkPDFObject INHERITED;
+    typedef SkRefCnt INHERITED;
 };
 
-/** \class SkPDFInt
+////////////////////////////////////////////////////////////////////////////////
 
-    An integer object in a PDF.
-*/
-class SkPDFInt : public SkPDFObject {
+/**
+   A SkPDFUnion is a non-virtualized implementation of the
+   non-compound, non-specialized PDF Object types: Name, String,
+   Number, Boolean.
+ */
+class SkPDFUnion {
 public:
-    SK_DECLARE_INST_COUNT(SkPDFInt)
+    // u.move() is analogous to std::move(u). It returns an rvalue.
+    SkPDFUnion move() { return static_cast<SkPDFUnion&&>(*this); }
+    // Move contstructor and assignemnt operator destroy the argument
+    // and steal their references (if needed).
+    SkPDFUnion(SkPDFUnion&& other);
+    SkPDFUnion& operator=(SkPDFUnion&& other);
 
-    /** Create a PDF integer (usually for indirect reference purposes).
-     *  @param value An integer value between 2^31 - 1 and -2^31.
-     */
-    explicit SkPDFInt(int32_t value);
-    virtual ~SkPDFInt();
+    ~SkPDFUnion();
 
-    // The SkPDFObject interface.
-    virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog,
-                            bool indirect);
+    /** The following nine functions are the standard way of creating
+        SkPDFUnion objects. */
+
+    static SkPDFUnion Int(int32_t);
+
+    static SkPDFUnion Int(size_t v) { return SkPDFUnion::Int(SkToS32(v)); }
+
+    static SkPDFUnion Bool(bool);
+
+    static SkPDFUnion Scalar(SkScalar);
+
+    /** These two functions do NOT take ownership of ptr, and do NOT
+        copy the string.  Suitable for passing in static const
+        strings. For example:
+          SkPDFUnion n = SkPDFUnion::Name("Length");
+          SkPDFUnion u = SkPDFUnion::String("Identity"); */
+
+    /** SkPDFUnion::Name(const char*) assumes that the passed string
+        is already a valid name (that is: it has no control or
+        whitespace characters).  This will not copy the name. */
+    static SkPDFUnion Name(const char*);
+
+    /** SkPDFUnion::String will encode the passed string.  This will
+        not copy the name. */
+    static SkPDFUnion String(const char*);
+
+    /** SkPDFUnion::Name(const SkString&) does not assume that the
+        passed string is already a valid name and it will escape the
+        string. */
+    static SkPDFUnion Name(const SkString&);
+
+    /** SkPDFUnion::String will encode the passed string. */
+    static SkPDFUnion String(const SkString&);
+
+    /** This function DOES take ownership of the object. E.g.
+          SkAutoTUnref<SkPDFDict> dict(new SkPDFDict);
+          dict->insert(.....);
+          SkPDFUnion u = SkPDFUnion::Object(dict.detach()) */
+    static SkPDFUnion Object(SkPDFObject*);
+
+    /** This function DOES take ownership of the object. E.g.
+          SkAutoTUnref<SkPDFBitmap> image(
+                 SkPDFBitmap::Create(fCanon, bitmap));
+          SkPDFUnion u = SkPDFUnion::ObjRef(image.detach()) */
+    static SkPDFUnion ObjRef(SkPDFObject*);
+
+    /** These two non-virtual methods mirror SkPDFObject's
+        corresponding virtuals. */
+    void emitObject(SkWStream*,
+                    const SkPDFObjNumMap&,
+                    const SkPDFSubstituteMap&) const;
+    void addResources(SkPDFObjNumMap*, const SkPDFSubstituteMap&) const;
+
+    bool isName() const;
 
 private:
-    int32_t fValue;
+    union {
+        int32_t fIntValue;
+        bool fBoolValue;
+        SkScalar fScalarValue;
+        const char* fStaticString;
+        char fSkString[sizeof(SkString)];
+        SkPDFObject* fObject;
+    };
+    enum class Type : char {
+        /** It is an error to call emitObject() or addResources() on an
+            kDestroyed object. */
+        kDestroyed = 0,
+        kInt,
+        kBool,
+        kScalar,
+        kName,
+        kString,
+        kNameSkS,
+        kStringSkS,
+        kObjRef,
+        kObject,
+    };
+    Type fType;
 
-    typedef SkPDFObject INHERITED;
+    SkPDFUnion(Type);
+    // We do not now need copy constructor and copy assignment, so we
+    // will disable this functionality.
+    SkPDFUnion& operator=(const SkPDFUnion&) = delete;
+    SkPDFUnion(const SkPDFUnion&) = delete;
 };
+static_assert(sizeof(SkString) == sizeof(void*), "SkString_size");
 
-/** \class SkPDFBool
+////////////////////////////////////////////////////////////////////////////////
 
-    An boolean value in a PDF.
-*/
-class SkPDFBool : public SkPDFObject {
+#if 0  // Enable if needed.
+/** This class is a SkPDFUnion with SkPDFObject virtuals attached.
+    The only use case of this is when a non-compound PDF object is
+    referenced indirectly. */
+class SkPDFAtom final : public SkPDFObject {
 public:
-    SK_DECLARE_INST_COUNT(SkPDFBool)
-
-    /** Create a PDF boolean.
-     *  @param value true or false.
-     */
-    explicit SkPDFBool(bool value);
-    virtual ~SkPDFBool();
-
-    // The SkPDFObject interface.
-    virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog,
-                            bool indirect);
-    virtual size_t getOutputSize(SkPDFCatalog* catalog, bool indirect);
+    void emitObject(SkWStream* stream,
+                    const SkPDFObjNumMap& objNumMap,
+                    const SkPDFSubstituteMap& substitutes) final;
+    void addResources(SkPDFObjNumMap*, const SkPDFSubstituteMap&) const final;
+    SkPDFAtom(SkPDFUnion&& v) : fValue(v.move()) {}
 
 private:
-    bool fValue;
-
+    const SkPDFUnion fValue;
     typedef SkPDFObject INHERITED;
 };
+#endif  // 0
 
-/** \class SkPDFScalar
-
-    A real number object in a PDF.
-*/
-class SkPDFScalar : public SkPDFObject {
-public:
-    SK_DECLARE_INST_COUNT(SkPDFScalar)
-
-    /** Create a PDF real number.
-     *  @param value A real value.
-     */
-    explicit SkPDFScalar(SkScalar value);
-    virtual ~SkPDFScalar();
-
-    static void Append(SkScalar value, SkWStream* stream);
-
-    // The SkPDFObject interface.
-    virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog,
-                            bool indirect);
-
-private:
-    SkScalar fValue;
-
-    typedef SkPDFObject INHERITED;
-};
-
-/** \class SkPDFString
-
-    A string object in a PDF.
-*/
-class SkPDFString : public SkPDFObject {
-public:
-    SK_DECLARE_INST_COUNT(SkPDFString)
-
-    /** Create a PDF string. Maximum length (in bytes) is 65,535.
-     *  @param value A string value.
-     */
-    explicit SkPDFString(const char value[]);
-    explicit SkPDFString(const SkString& value);
-
-    /** Create a PDF string. Maximum length (in bytes) is 65,535.
-     *  @param value     A string value.
-     *  @param len       The length of value.
-     *  @param wideChars Indicates if the top byte in value is significant and
-     *                   should be encoded (true) or not (false).
-     */
-    SkPDFString(const uint16_t* value, size_t len, bool wideChars);
-    virtual ~SkPDFString();
-
-    // The SkPDFObject interface.
-    virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog,
-                            bool indirect);
-    virtual size_t getOutputSize(SkPDFCatalog* catalog, bool indirect);
-
-    static SkString FormatString(const char* input, size_t len);
-    static SkString FormatString(const uint16_t* input, size_t len,
-                                 bool wideChars);
-private:
-    static const size_t kMaxLen = 65535;
-
-    const SkString fValue;
-
-    static SkString DoFormatString(const void* input, size_t len,
-                                 bool wideInput, bool wideOutput);
-
-    typedef SkPDFObject INHERITED;
-};
-
-/** \class SkPDFName
-
-    A name object in a PDF.
-*/
-class SkPDFName : public SkPDFObject {
-public:
-    SK_DECLARE_INST_COUNT(SkPDFName)
-
-    /** Create a PDF name object. Maximum length is 127 bytes.
-     *  @param value The name.
-     */
-    explicit SkPDFName(const char name[]);
-    explicit SkPDFName(const SkString& name);
-    virtual ~SkPDFName();
-
-    bool operator==(const SkPDFName& b) const;
-
-    // The SkPDFObject interface.
-    virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog,
-                            bool indirect);
-    virtual size_t getOutputSize(SkPDFCatalog* catalog, bool indirect);
-
-private:
-    static const size_t kMaxLen = 127;
-
-    const SkString fValue;
-
-    static SkString FormatName(const SkString& input);
-
-    typedef SkPDFObject INHERITED;
-};
+////////////////////////////////////////////////////////////////////////////////
 
 /** \class SkPDFArray
 
     An array object in a PDF.
 */
-class SkPDFArray : public SkPDFObject {
+class SkPDFArray final : public SkPDFObject {
 public:
-    SK_DECLARE_INST_COUNT(SkPDFArray)
+    static const int kMaxLen = 8191;
 
     /** Create a PDF array. Maximum length is 8191.
      */
@@ -290,56 +198,38 @@ public:
     virtual ~SkPDFArray();
 
     // The SkPDFObject interface.
-    virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog,
-                            bool indirect);
-    virtual size_t getOutputSize(SkPDFCatalog* catalog, bool indirect);
+    void emitObject(SkWStream* stream,
+                    const SkPDFObjNumMap& objNumMap,
+                    const SkPDFSubstituteMap& substitutes) const override;
+    void addResources(SkPDFObjNumMap*,
+                      const SkPDFSubstituteMap&) const override;
 
     /** The size of the array.
      */
-    int size() { return fValue.count(); }
+    int size() const;
 
     /** Preallocate space for the given number of entries.
      *  @param length The number of array slots to preallocate.
      */
     void reserve(int length);
 
-    /** Returns the object at the given offset in the array.
-     *  @param index The index into the array to retrieve.
-     */
-    SkPDFObject* getAt(int index) { return fValue[index]; }
-
-    /** Set the object at the given offset in the array. Ref's value.
-     *  @param index The index into the array to set.
-     *  @param value The value to add to the array.
-     *  @return The value argument is returned.
-     */
-    SkPDFObject* setAt(int index, SkPDFObject* value);
-
-    /** Append the object to the end of the array and increments its ref count.
-     *  @param value The value to add to the array.
-     *  @return The value argument is returned.
-     */
-    SkPDFObject* append(SkPDFObject* value);
-
-    /** Creates a SkPDFInt object and appends it to the array.
+    /** Appends a value to the end of the array.
      *  @param value The value to add to the array.
      */
-    void appendInt(int32_t value);
-
-    /** Creates a SkPDFScalar object and appends it to the array.
-     *  @param value The value to add to the array.
-     */
-    void appendScalar(SkScalar value);
-
-    /** Creates a SkPDFName object and appends it to the array.
-     *  @param value The value to add to the array.
-     */
-    void appendName(const char name[]);
+    void appendInt(int32_t);
+    void appendBool(bool);
+    void appendScalar(SkScalar);
+    void appendName(const char[]);
+    void appendName(const SkString&);
+    void appendString(const char[]);
+    void appendString(const SkString&);
+    /** appendObject and appendObjRef take ownership of the passed object */
+    void appendObject(SkPDFObject*);
+    void appendObjRef(SkPDFObject*);
 
 private:
-    static const int kMaxLen = 8191;
-    SkTDArray<SkPDFObject*> fValue;
-
+    SkTDArray<SkPDFUnion> fValues;
+    void append(SkPDFUnion&& value);
     typedef SkPDFObject INHERITED;
 };
 
@@ -349,8 +239,6 @@ private:
 */
 class SkPDFDict : public SkPDFObject {
 public:
-    SK_DECLARE_INST_COUNT(SkPDFDict)
-
     /** Create a PDF dictionary. Maximum number of entries is 4095.
      */
     SkPDFDict();
@@ -363,92 +251,152 @@ public:
     virtual ~SkPDFDict();
 
     // The SkPDFObject interface.
-    virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog,
-                            bool indirect);
-    virtual size_t getOutputSize(SkPDFCatalog* catalog, bool indirect);
+    void emitObject(SkWStream* stream,
+                    const SkPDFObjNumMap& objNumMap,
+                    const SkPDFSubstituteMap& substitutes) const override;
+    void addResources(SkPDFObjNumMap*,
+                      const SkPDFSubstituteMap&) const override;
 
     /** The size of the dictionary.
      */
     int size() const;
 
-    /** Add the value to the dictionary with the given key.  Refs value.
-     *  @param key   The key for this dictionary entry.
-     *  @param value The value for this dictionary entry.
-     *  @return The value argument is returned.
-     */
-    SkPDFObject* insert(SkPDFName* key, SkPDFObject* value);
-
-    /** Add the value to the dictionary with the given key.  Refs value.  The
-     *  method will create the SkPDFName object.
+    /** Add the value to the dictionary with the given key.  Takes
+     *  ownership of the object.
      *  @param key   The text of the key for this dictionary entry.
      *  @param value The value for this dictionary entry.
-     *  @return The value argument is returned.
      */
-    SkPDFObject* insert(const char key[], SkPDFObject* value);
+    void insertObject(const char key[], SkPDFObject* value);
+    void insertObject(const SkString& key, SkPDFObject* value);
+    void insertObjRef(const char key[], SkPDFObject* value);
+    void insertObjRef(const SkString& key, SkPDFObject* value);
 
-    /** Add the int to the dictionary with the given key.
+    /** Add the value to the dictionary with the given key.
      *  @param key   The text of the key for this dictionary entry.
-     *  @param value The int value for this dictionary entry.
+     *  @param value The value for this dictionary entry.
      */
+    void insertBool(const char key[], bool value);
     void insertInt(const char key[], int32_t value);
-
-    /**
-     *  Calls insertInt() but asserts in debug builds that the value can be represented
-     *  by an int32_t.
-     */
-    void insertInt(const char key[], size_t value) {
-        this->insertInt(key, SkToS32(value));
-    }
-
-    /** Add the scalar to the dictionary with the given key.
-     *  @param key   The text of the key for this dictionary entry.
-     *  @param value The scalar value for this dictionary entry.
-     */
+    void insertInt(const char key[], size_t value);
     void insertScalar(const char key[], SkScalar value);
-
-    /** Add the name to the dictionary with the given key.
-     *  @param key   The text of the key for this dictionary entry.
-     *  @param name  The name for this dictionary entry.
-     */
-    void insertName(const char key[], const char name[]);
-
-    /** Add the name to the dictionary with the given key.
-     *  @param key   The text of the key for this dictionary entry.
-     *  @param name  The name for this dictionary entry.
-     */
-    void insertName(const char key[], const SkString& name) {
-        this->insertName(key, name.c_str());
-    }
+    void insertName(const char key[], const char nameValue[]);
+    void insertName(const char key[], const SkString& nameValue);
+    void insertString(const char key[], const char value[]);
+    void insertString(const char key[], const SkString& value);
 
     /** Remove all entries from the dictionary.
      */
     void clear();
 
-protected:
-    /** Use to remove a single key from the dictionary.
+    /** Emit the dictionary, without the "<<" and ">>".
      */
-    void remove(const char key[]);
-
-    /** Insert references to all of the key-value pairs from the other
-     *  dictionary into this one.
-     */
-    void mergeFrom(const SkPDFDict& other);
+    void emitAll(SkWStream* stream,
+                 const SkPDFObjNumMap& objNumMap,
+                 const SkPDFSubstituteMap& substitutes) const;
 
 private:
-    struct Rec {
-        SkPDFName* key;
-        SkPDFObject* value;
-        Rec(SkPDFName* k, SkPDFObject* v) : key(k), value(v) {}
+    struct Record {
+        SkPDFUnion fKey;
+        SkPDFUnion fValue;
     };
-
+    SkTDArray<Record> fRecords;
     static const int kMaxLen = 4095;
 
-    mutable SkMutex fMutex;  // protects modifications to fValue
-    SkTDArray<struct Rec> fValue;
-
-    SkPDFObject* append(SkPDFName* key, SkPDFObject* value);
+    void set(SkPDFUnion&& name, SkPDFUnion&& value);
 
     typedef SkPDFObject INHERITED;
 };
 
+/** \class SkPDFSharedStream
+
+    This class takes an asset and assumes that it is backed by
+    long-lived shared data (for example, an open file
+    descriptor). That is: no memory savings can be made by holding on
+    to a compressed version instead.
+ */
+class SkPDFSharedStream final : public SkPDFObject {
+public:
+    // Takes ownership of asset.
+    SkPDFSharedStream(SkStreamAsset* data) : fAsset(data), fDict(new SkPDFDict) { SkASSERT(data); }
+    SkPDFDict* dict() { return fDict; }
+    void emitObject(SkWStream*,
+                    const SkPDFObjNumMap&,
+                    const SkPDFSubstituteMap&) const override;
+    void addResources(SkPDFObjNumMap*,
+                      const SkPDFSubstituteMap&) const override;
+
+private:
+    SkAutoTDelete<SkStreamAsset> fAsset;
+    SkAutoTUnref<SkPDFDict> fDict;
+    typedef SkPDFObject INHERITED;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+
+/** \class SkPDFObjNumMap
+
+    The PDF Object Number Map manages object numbers.  It is used to
+    create the PDF cross reference table.
+*/
+class SkPDFObjNumMap : SkNoncopyable {
+public:
+    /** Add the passed object to the catalog.
+     *  @param obj         The object to add.
+     *  @return True iff the object was not already added to the catalog.
+     */
+    bool addObject(SkPDFObject* obj);
+
+    /** Add the passed object to the catalog, as well as all its dependencies.
+     *  @param obj   The object to add.  If nullptr, this is a noop.
+     *  @param subs  Will be passed to obj->addResources().
+     */
+    void addObjectRecursively(SkPDFObject* obj, const SkPDFSubstituteMap& subs);
+
+    /** Get the object number for the passed object.
+     *  @param obj         The object of interest.
+     */
+    int32_t getObjectNumber(SkPDFObject* obj) const;
+
+    const SkTDArray<SkPDFObject*>& objects() const { return fObjects; }
+
+private:
+    SkTDArray<SkPDFObject*> fObjects;
+    SkTHashMap<SkPDFObject*, int32_t> fObjectNumbers;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+
+/** \class SkPDFSubstituteMap
+
+    The PDF Substitute Map manages substitute objects and owns the
+    substitutes.
+*/
+class SkPDFSubstituteMap : SkNoncopyable {
+public:
+    ~SkPDFSubstituteMap();
+    /** Set substitute object for the passed object.
+        Refs substitute.
+     */
+    void setSubstitute(SkPDFObject* original, SkPDFObject* substitute);
+
+    /** Find and return any substitute object set for the passed object. If
+     *  there is none, return the passed object.
+     */
+    SkPDFObject* getSubstitute(SkPDFObject* object) const;
+
+    SkPDFObject* operator()(SkPDFObject* o) const {
+        return this->getSubstitute(o);
+    }
+
+private:
+    SkTHashMap<SkPDFObject*, SkPDFObject*> fSubstituteMap;
+};
+
+#ifdef SK_PDF_IMAGE_STATS
+extern SkAtomic<int> gDrawImageCalls;
+extern SkAtomic<int> gJpegImageObjects;
+extern SkAtomic<int> gRegularImageObjects;
+extern void SkPDFImageDumpStats();
+#endif // SK_PDF_IMAGE_STATS
+
 #endif
diff --git a/gfx/skia/skia/src/pdf/SkPDFUtils.cpp b/gfx/skia/skia/src/pdf/SkPDFUtils.cpp
index d034270e0744..108f2c10abd5 100644
--- a/gfx/skia/skia/src/pdf/SkPDFUtils.cpp
+++ b/gfx/skia/skia/src/pdf/SkPDFUtils.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
@@ -50,7 +49,7 @@ void SkPDFUtils::AppendTransform(const SkMatrix& matrix, SkWStream* content) {
         SkMatrix::SetAffineIdentity(values);
     }
     for (size_t i = 0; i < SK_ARRAY_COUNT(values); i++) {
-        SkPDFScalar::Append(values[i], content);
+        SkPDFUtils::AppendScalar(values[i], content);
         content->writeText(" ");
     }
     content->writeText("cm\n");
@@ -58,17 +57,17 @@ void SkPDFUtils::AppendTransform(const SkMatrix& matrix, SkWStream* content) {
 
 // static
 void SkPDFUtils::MoveTo(SkScalar x, SkScalar y, SkWStream* content) {
-    SkPDFScalar::Append(x, content);
+    SkPDFUtils::AppendScalar(x, content);
     content->writeText(" ");
-    SkPDFScalar::Append(y, content);
+    SkPDFUtils::AppendScalar(y, content);
     content->writeText(" m\n");
 }
 
 // static
 void SkPDFUtils::AppendLine(SkScalar x, SkScalar y, SkWStream* content) {
-    SkPDFScalar::Append(x, content);
+    SkPDFUtils::AppendScalar(x, content);
     content->writeText(" ");
-    SkPDFScalar::Append(y, content);
+    SkPDFUtils::AppendScalar(y, content);
     content->writeText(" l\n");
 }
 
@@ -77,62 +76,69 @@ void SkPDFUtils::AppendCubic(SkScalar ctl1X, SkScalar ctl1Y,
                              SkScalar ctl2X, SkScalar ctl2Y,
                              SkScalar dstX, SkScalar dstY, SkWStream* content) {
     SkString cmd("y\n");
-    SkPDFScalar::Append(ctl1X, content);
+    SkPDFUtils::AppendScalar(ctl1X, content);
     content->writeText(" ");
-    SkPDFScalar::Append(ctl1Y, content);
+    SkPDFUtils::AppendScalar(ctl1Y, content);
     content->writeText(" ");
     if (ctl2X != dstX || ctl2Y != dstY) {
         cmd.set("c\n");
-        SkPDFScalar::Append(ctl2X, content);
+        SkPDFUtils::AppendScalar(ctl2X, content);
         content->writeText(" ");
-        SkPDFScalar::Append(ctl2Y, content);
+        SkPDFUtils::AppendScalar(ctl2Y, content);
         content->writeText(" ");
     }
-    SkPDFScalar::Append(dstX, content);
+    SkPDFUtils::AppendScalar(dstX, content);
     content->writeText(" ");
-    SkPDFScalar::Append(dstY, content);
+    SkPDFUtils::AppendScalar(dstY, content);
     content->writeText(" ");
     content->writeText(cmd.c_str());
 }
 
+static void append_quad(const SkPoint quad[], SkWStream* content) {
+    SkPoint cubic[4];
+    SkConvertQuadToCubic(quad, cubic);
+    SkPDFUtils::AppendCubic(cubic[1].fX, cubic[1].fY, cubic[2].fX, cubic[2].fY,
+                            cubic[3].fX, cubic[3].fY, content);
+}
+
 // static
 void SkPDFUtils::AppendRectangle(const SkRect& rect, SkWStream* content) {
     // Skia has 0,0 at top left, pdf at bottom left.  Do the right thing.
     SkScalar bottom = SkMinScalar(rect.fBottom, rect.fTop);
 
-    SkPDFScalar::Append(rect.fLeft, content);
+    SkPDFUtils::AppendScalar(rect.fLeft, content);
     content->writeText(" ");
-    SkPDFScalar::Append(bottom, content);
+    SkPDFUtils::AppendScalar(bottom, content);
     content->writeText(" ");
-    SkPDFScalar::Append(rect.width(), content);
+    SkPDFUtils::AppendScalar(rect.width(), content);
     content->writeText(" ");
-    SkPDFScalar::Append(rect.height(), content);
+    SkPDFUtils::AppendScalar(rect.height(), content);
     content->writeText(" re\n");
 }
 
 // static
 void SkPDFUtils::EmitPath(const SkPath& path, SkPaint::Style paintStyle,
-                          SkWStream* content) {
+                          bool doConsumeDegerates, SkWStream* content) {
     // Filling a path with no area results in a drawing in PDF renderers but
     // Chrome expects to be able to draw some such entities with no visible
     // result, so we detect those cases and discard the drawing for them.
     // Specifically: moveTo(X), lineTo(Y) and moveTo(X), lineTo(X), lineTo(Y).
     enum SkipFillState {
-        kEmpty_SkipFillState         = 0,
-        kSingleLine_SkipFillState    = 1,
-        kNonSingleLine_SkipFillState = 2,
+        kEmpty_SkipFillState,
+        kSingleLine_SkipFillState,
+        kNonSingleLine_SkipFillState,
     };
     SkipFillState fillState = kEmpty_SkipFillState;
-    if (paintStyle != SkPaint::kFill_Style) {
-        fillState = kNonSingleLine_SkipFillState;
-    }
+    //if (paintStyle != SkPaint::kFill_Style) {
+    //    fillState = kNonSingleLine_SkipFillState;
+    //}
     SkPoint lastMovePt = SkPoint::Make(0,0);
     SkDynamicMemoryWStream currentSegment;
     SkPoint args[4];
     SkPath::Iter iter(path, false);
-    for (SkPath::Verb verb = iter.next(args);
+    for (SkPath::Verb verb = iter.next(args, doConsumeDegerates);
          verb != SkPath::kDone_Verb;
-         verb = iter.next(args)) {
+         verb = iter.next(args, doConsumeDegerates)) {
         // args gets all the points, even the implicit first point.
         switch (verb) {
             case SkPath::kMove_Verb:
@@ -142,34 +148,35 @@ void SkPDFUtils::EmitPath(const SkPath& path, SkPaint::Style paintStyle,
                 break;
             case SkPath::kLine_Verb:
                 AppendLine(args[1].fX, args[1].fY, &currentSegment);
-                if (fillState == kEmpty_SkipFillState) {
-                   if (args[0] != lastMovePt) {
-                       fillState = kSingleLine_SkipFillState;
-                   }
-                } else if (fillState == kSingleLine_SkipFillState) {
-                    fillState = kNonSingleLine_SkipFillState;
+                if ((fillState == kEmpty_SkipFillState) && (args[0] != lastMovePt)) {
+                    fillState = kSingleLine_SkipFillState;
+                    break;
                 }
-                break;
-            case SkPath::kQuad_Verb: {
-                SkPoint cubic[4];
-                SkConvertQuadToCubic(args, cubic);
-                AppendCubic(cubic[1].fX, cubic[1].fY, cubic[2].fX, cubic[2].fY,
-                            cubic[3].fX, cubic[3].fY, &currentSegment);
                 fillState = kNonSingleLine_SkipFillState;
                 break;
-            }
+            case SkPath::kQuad_Verb:
+                append_quad(args, &currentSegment);
+                fillState = kNonSingleLine_SkipFillState;
+                break;
+            case SkPath::kConic_Verb: {
+                const SkScalar tol = SK_Scalar1 / 4;
+                SkAutoConicToQuads converter;
+                const SkPoint* quads = converter.computeQuads(args, iter.conicWeight(), tol);
+                for (int i = 0; i < converter.countQuads(); ++i) {
+                    append_quad(&quads[i * 2], &currentSegment);
+                }
+                fillState = kNonSingleLine_SkipFillState;
+            } break;
             case SkPath::kCubic_Verb:
                 AppendCubic(args[1].fX, args[1].fY, args[2].fX, args[2].fY,
                             args[3].fX, args[3].fY, &currentSegment);
                 fillState = kNonSingleLine_SkipFillState;
                 break;
             case SkPath::kClose_Verb:
-                if (fillState != kSingleLine_SkipFillState) {
+
                     ClosePath(&currentSegment);
-                    SkData* data = currentSegment.copyToData();
-                    content->write(data->data(), data->size());
-                    data->unref();
-                }
+
+                currentSegment.writeToStream(content);
                 currentSegment.reset();
                 break;
             default:
@@ -178,9 +185,7 @@ void SkPDFUtils::EmitPath(const SkPath& path, SkPaint::Style paintStyle,
         }
     }
     if (currentSegment.bytesWritten() > 0) {
-        SkData* data = currentSegment.copyToData();
-        content->write(data->data(), data->size());
-        data->unref();
+        currentSegment.writeToStream(content);
     }
 }
 
@@ -247,3 +252,95 @@ void SkPDFUtils::ApplyPattern(int objectIndex, SkWStream* content) {
     content->writeText(resourceName.c_str());
     content->writeText(" scn\n");
 }
+
+void SkPDFUtils::AppendScalar(SkScalar value, SkWStream* stream) {
+    // The range of reals in PDF/A is the same as SkFixed: +/- 32,767 and
+    // +/- 1/65,536 (though integers can range from 2^31 - 1 to -2^31).
+    // When using floats that are outside the whole value range, we can use
+    // integers instead.
+
+#if !defined(SK_ALLOW_LARGE_PDF_SCALARS)
+    if (value > 32767 || value < -32767) {
+        stream->writeDecAsText(SkScalarRoundToInt(value));
+        return;
+    }
+
+    char buffer[SkStrAppendScalar_MaxSize];
+    char* end = SkStrAppendFixed(buffer, SkScalarToFixed(value));
+    stream->write(buffer, end - buffer);
+    return;
+#endif  // !SK_ALLOW_LARGE_PDF_SCALARS
+
+#if defined(SK_ALLOW_LARGE_PDF_SCALARS)
+    // Floats have 24bits of significance, so anything outside that range is
+    // no more precise than an int. (Plus PDF doesn't support scientific
+    // notation, so this clamps to SK_Max/MinS32).
+    if (value > (1 << 24) || value < -(1 << 24)) {
+        stream->writeDecAsText(value);
+        return;
+    }
+    // Continue to enforce the PDF limits for small floats.
+    if (value < 1.0f/65536 && value > -1.0f/65536) {
+        stream->writeDecAsText(0);
+        return;
+    }
+    // SkStrAppendFloat might still use scientific notation, so use snprintf
+    // directly..
+    static const int kFloat_MaxSize = 19;
+    char buffer[kFloat_MaxSize];
+    int len = SNPRINTF(buffer, kFloat_MaxSize, "%#.8f", value);
+    // %f always prints trailing 0s, so strip them.
+    for (; buffer[len - 1] == '0' && len > 0; len--) {
+        buffer[len - 1] = '\0';
+    }
+    if (buffer[len - 1] == '.') {
+        buffer[len - 1] = '\0';
+    }
+    stream->writeText(buffer);
+    return;
+#endif  // SK_ALLOW_LARGE_PDF_SCALARS
+}
+
+SkString SkPDFUtils::FormatString(const char* cin, size_t len) {
+    SkDEBUGCODE(static const size_t kMaxLen = 65535;)
+    SkASSERT(len <= kMaxLen);
+
+    // 7-bit clean is a heuristic to decide what string format to use;
+    // a 7-bit clean string should require little escaping.
+    bool sevenBitClean = true;
+    size_t characterCount = 2 + len;
+    for (size_t i = 0; i < len; i++) {
+        if (cin[i] > '~' || cin[i] < ' ') {
+            sevenBitClean = false;
+            break;
+        }
+        if (cin[i] == '\\' || cin[i] == '(' || cin[i] == ')') {
+            ++characterCount;
+        }
+    }
+    SkString result;
+    if (sevenBitClean) {
+        result.resize(characterCount);
+        char* str = result.writable_str();
+        *str++ = '(';
+        for (size_t i = 0; i < len; i++) {
+            if (cin[i] == '\\' || cin[i] == '(' || cin[i] == ')') {
+                *str++ = '\\';
+            }
+            *str++ = cin[i];
+        }
+        *str++ = ')';
+    } else {
+        result.resize(2 * len + 2);
+        char* str = result.writable_str();
+        *str++ = '<';
+        for (size_t i = 0; i < len; i++) {
+            uint8_t c = static_cast<uint8_t>(cin[i]);
+            static const char gHex[] = "0123456789ABCDEF";
+            *str++ = gHex[(c >> 4) & 0xF];
+            *str++ = gHex[(c     ) & 0xF];
+        }
+        *str++ = '>';
+    }
+    return result;
+}
diff --git a/gfx/skia/skia/src/pdf/SkPDFUtils.h b/gfx/skia/skia/src/pdf/SkPDFUtils.h
index b30821dcd926..0aa05a088a8e 100644
--- a/gfx/skia/skia/src/pdf/SkPDFUtils.h
+++ b/gfx/skia/skia/src/pdf/SkPDFUtils.h
@@ -46,7 +46,11 @@ public:
                             SkScalar dstX, SkScalar dstY, SkWStream* content);
     static void AppendRectangle(const SkRect& rect, SkWStream* content);
     static void EmitPath(const SkPath& path, SkPaint::Style paintStyle,
-                         SkWStream* content);
+                         bool doConsumeDegerates, SkWStream* content);
+    static void EmitPath(const SkPath& path, SkPaint::Style paintStyle,
+                         SkWStream* content) {
+        SkPDFUtils::EmitPath(path, paintStyle, true, content);
+    }
     static void ClosePath(SkWStream* content);
     static void PaintPath(SkPaint::Style style, SkPath::FillType fill,
                           SkWStream* content);
@@ -54,6 +58,8 @@ public:
     static void DrawFormXObject(int objectIndex, SkWStream* content);
     static void ApplyGraphicState(int objectIndex, SkWStream* content);
     static void ApplyPattern(int objectIndex, SkWStream* content);
+    static void AppendScalar(SkScalar value, SkWStream* stream);
+    static SkString FormatString(const char* input, size_t len);
 };
 
 #endif
diff --git a/gfx/skia/skia/src/pdf/SkTSet.h b/gfx/skia/skia/src/pdf/SkTSet.h
deleted file mode 100644
index f57d30eccb85..000000000000
--- a/gfx/skia/skia/src/pdf/SkTSet.h
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkTSet_DEFINED
-#define SkTSet_DEFINED
-
-#include "SkTSort.h"
-#include "SkTDArray.h"
-#include "SkTypes.h"
-
-/** \class SkTSet<T>
-
-    The SkTSet template class defines a set. Elements are additionally
-    guaranteed to be sorted by their insertion order.
-    Main operations supported now are: add, merge, find and contains.
-
-    TSet<T> is mutable.
-*/
-
-// TODO: Add remove, intersect and difference operations.
-// TODO: Add bench tests.
-template <typename T> class SkTSet {
-public:
-    SkTSet() {
-        fSetArray = SkNEW(SkTDArray<T>);
-        fOrderedArray = SkNEW(SkTDArray<T>);
-    }
-
-    ~SkTSet() {
-        SkASSERT(fSetArray);
-        SkDELETE(fSetArray);
-        SkASSERT(fOrderedArray);
-        SkDELETE(fOrderedArray);
-    }
-
-    SkTSet(const SkTSet<T>& src) {
-        this->fSetArray = SkNEW_ARGS(SkTDArray<T>, (*src.fSetArray));
-        this->fOrderedArray = SkNEW_ARGS(SkTDArray<T>, (*src.fOrderedArray));
-#ifdef SK_DEBUG
-        validate();
-#endif
-    }
-
-    SkTSet<T>& operator=(const SkTSet<T>& src) {
-        *this->fSetArray = *src.fSetArray;
-        *this->fOrderedArray = *src.fOrderedArray;
-#ifdef SK_DEBUG
-        validate();
-#endif
-        return *this;
-    }
-
-    /** Merges src elements into this, and returns the number of duplicates
-     * found. Elements from src will retain their ordering and will be ordered
-     * after the elements currently in this set.
-     *
-     * Implementation note: this uses a 2-stage merge to obtain O(n log n) time.
-     * The first stage goes through src.fOrderedArray, checking if
-     * this->contains() is false before adding to this.fOrderedArray.
-     * The second stage does a standard sorted list merge on the fSetArrays.
-     */
-    int mergeInto(const SkTSet<T>& src) {
-        SkASSERT(fSetArray);
-        SkASSERT(fOrderedArray);
-
-        // Do fOrderedArray merge.
-        for (int i = 0; i < src.count(); ++i) {
-            if (!contains((*src.fOrderedArray)[i])) {
-                fOrderedArray->push((*src.fOrderedArray)[i]);
-            }
-        }
-
-        // Do fSetArray merge.
-        int duplicates = 0;
-
-        SkTDArray<T>* fArrayNew = new SkTDArray<T>();
-        fArrayNew->setReserve(fOrderedArray->count());
-        int i = 0;
-        int j = 0;
-
-        while (i < fSetArray->count() && j < src.count()) {
-            if ((*fSetArray)[i] < (*src.fSetArray)[j]) {
-                fArrayNew->push((*fSetArray)[i]);
-                i++;
-            } else if ((*fSetArray)[i] > (*src.fSetArray)[j]) {
-                fArrayNew->push((*src.fSetArray)[j]);
-                j++;
-            } else {
-                duplicates++;
-                j++; // Skip one of the duplicates.
-            }
-        }
-
-        while (i < fSetArray->count()) {
-            fArrayNew->push((*fSetArray)[i]);
-            i++;
-        }
-
-        while (j < src.count()) {
-            fArrayNew->push((*src.fSetArray)[j]);
-            j++;
-        }
-        SkDELETE(fSetArray);
-        fSetArray = fArrayNew;
-        fArrayNew = NULL;
-
-#ifdef SK_DEBUG
-        validate();
-#endif
-        return duplicates;
-    }
-
-    /** Adds a new element into set and returns false if the element is already
-     * in this set.
-    */
-    bool add(const T& elem) {
-        SkASSERT(fSetArray);
-        SkASSERT(fOrderedArray);
-
-        int pos = 0;
-        int i = find(elem, &pos);
-        if (i >= 0) {
-            return false;
-        }
-        *fSetArray->insert(pos) = elem;
-        fOrderedArray->push(elem);
-#ifdef SK_DEBUG
-        validate();
-#endif
-        return true;
-    }
-
-    /** Returns true if this set is empty.
-    */
-    bool isEmpty() const {
-        SkASSERT(fOrderedArray);
-        SkASSERT(fSetArray);
-        SkASSERT(fSetArray->isEmpty() == fOrderedArray->isEmpty());
-        return fOrderedArray->isEmpty();
-    }
-
-    /** Return the number of elements in the set.
-     */
-    int count() const {
-        SkASSERT(fOrderedArray);
-        SkASSERT(fSetArray);
-        SkASSERT(fSetArray->count() == fOrderedArray->count());
-        return fOrderedArray->count();
-    }
-
-    /** Return the number of bytes in the set: count * sizeof(T).
-     */
-    size_t bytes() const {
-        SkASSERT(fOrderedArray);
-        return fOrderedArray->bytes();
-    }
-
-    /** Return the beginning of a set iterator.
-     * Elements in the iterator will be sorted ascending.
-     */
-    const T*  begin() const {
-        SkASSERT(fOrderedArray);
-        return fOrderedArray->begin();
-    }
-
-    /** Return the end of a set iterator.
-     */
-    const T*  end() const {
-        SkASSERT(fOrderedArray);
-        return fOrderedArray->end();
-    }
-
-    const T&  operator[](int index) const {
-        SkASSERT(fOrderedArray);
-        return (*fOrderedArray)[index];
-    }
-
-    /** Resets the set (deletes memory and initiates an empty set).
-     */
-    void reset() {
-        SkASSERT(fSetArray);
-        SkASSERT(fOrderedArray);
-        fSetArray->reset();
-        fOrderedArray->reset();
-    }
-
-    /** Rewinds the set (preserves memory and initiates an empty set).
-     */
-    void rewind() {
-        SkASSERT(fSetArray);
-        SkASSERT(fOrderedArray);
-        fSetArray->rewind();
-        fOrderedArray->rewind();
-    }
-
-    /** Reserves memory for the set.
-     */
-    void setReserve(int reserve) {
-        SkASSERT(fSetArray);
-        SkASSERT(fOrderedArray);
-        fSetArray->setReserve(reserve);
-        fOrderedArray->setReserve(reserve);
-    }
-
-    /** Returns true if the array contains this element.
-     */
-    bool contains(const T& elem) const {
-        SkASSERT(fSetArray);
-        return (this->find(elem) >= 0);
-    }
-
-    /** Copies internal array to destination.
-     */
-    void copy(T* dst) const {
-        SkASSERT(fOrderedArray);
-        fOrderedArray->copyRange(dst, 0, fOrderedArray->count());
-    }
-
-    /** Returns a const reference to the internal vector.
-     */
-    const SkTDArray<T>& toArray() {
-        SkASSERT(fOrderedArray);
-        return *fOrderedArray;
-    }
-
-    /** Unref all elements in the set.
-     */
-    void unrefAll() {
-        SkASSERT(fSetArray);
-        SkASSERT(fOrderedArray);
-        fOrderedArray->unrefAll();
-        // Also reset the other array, as SkTDArray::unrefAll does an
-        // implcit reset
-        fSetArray->reset();
-    }
-
-    /** safeUnref all elements in the set.
-     */
-    void safeUnrefAll() {
-        SkASSERT(fSetArray);
-        SkASSERT(fOrderedArray);
-        fOrderedArray->safeUnrefAll();
-        // Also reset the other array, as SkTDArray::safeUnrefAll does an
-        // implcit reset
-        fSetArray->reset();
-    }
-
-#ifdef SK_DEBUG
-    void validate() const {
-        SkASSERT(fSetArray);
-        SkASSERT(fOrderedArray);
-        fSetArray->validate();
-        fOrderedArray->validate();
-        SkASSERT(isSorted() && !hasDuplicates() && arraysConsistent());
-    }
-
-    bool hasDuplicates() const {
-        for (int i = 0; i < fSetArray->count() - 1; ++i) {
-            if ((*fSetArray)[i] == (*fSetArray)[i + 1]) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    bool isSorted() const {
-        for (int i = 0; i < fSetArray->count() - 1; ++i) {
-            // Use only < operator
-            if (!((*fSetArray)[i] < (*fSetArray)[i + 1])) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /** Checks if fSetArray is consistent with fOrderedArray
-     */
-    bool arraysConsistent() const {
-        if (fSetArray->count() != fOrderedArray->count()) {
-            return false;
-        }
-        if (fOrderedArray->count() == 0) {
-            return true;
-        }
-
-        // Copy and sort fOrderedArray, then compare to fSetArray.
-        // A O(n log n) algorithm is necessary as O(n^2) will choke some GMs.
-        SkAutoMalloc sortedArray(fOrderedArray->bytes());
-        T* sortedBase = reinterpret_cast<T*>(sortedArray.get());
-        int count = fOrderedArray->count();
-        fOrderedArray->copyRange(sortedBase, 0, count);
-
-        SkTQSort<T>(sortedBase, sortedBase + count - 1);
-
-        for (int i = 0; i < count; ++i) {
-            if (sortedBase[i] != (*fSetArray)[i]) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-#endif
-
-private:
-    SkTDArray<T>* fSetArray;        // Sorted by pointer address for fast
-                                    // lookup.
-    SkTDArray<T>* fOrderedArray;    // Sorted by insertion order for
-                                    // deterministic output.
-
-    /** Returns the index in fSetArray where an element was found.
-     * Returns -1 if the element was not found, and it fills *posToInsertSorted
-     * with the index of the place where elem should be inserted to preserve the
-     * internal array sorted.
-     * If element was found, *posToInsertSorted is undefined.
-     */
-    int find(const T& elem, int* posToInsertSorted = NULL) const {
-        SkASSERT(fSetArray);
-
-        if (fSetArray->count() == 0) {
-            if (posToInsertSorted) {
-                *posToInsertSorted = 0;
-            }
-            return -1;
-        }
-        int iMin = 0;
-        int iMax = fSetArray->count();
-
-        while (iMin < iMax - 1) {
-            int iMid = (iMin + iMax) / 2;
-            if (elem < (*fSetArray)[iMid]) {
-                iMax = iMid;
-            } else {
-                iMin = iMid;
-            }
-        }
-        if (elem == (*fSetArray)[iMin]) {
-            return iMin;
-        }
-        if (posToInsertSorted) {
-            if (elem < (*fSetArray)[iMin]) {
-                *posToInsertSorted = iMin;
-            } else {
-                *posToInsertSorted = iMin + 1;
-            }
-        }
-
-        return -1;
-    }
-};
-
-#endif
diff --git a/gfx/skia/skia/src/pipe/SkGPipePriv.h b/gfx/skia/skia/src/pipe/SkGPipePriv.h
index 58cafe80b13e..c4217f3bf9c4 100644
--- a/gfx/skia/skia/src/pipe/SkGPipePriv.h
+++ b/gfx/skia/skia/src/pipe/SkGPipePriv.h
@@ -39,15 +39,17 @@ enum DrawOps {
     kClipRect_DrawOp,
     kClipRRect_DrawOp,
     kConcat_DrawOp,
+    kDrawAtlas_DrawOp,
     kDrawBitmap_DrawOp,
-    kDrawBitmapMatrix_DrawOp,
     kDrawBitmapNine_DrawOp,
-    kDrawBitmapRectToRect_DrawOp,
-    kDrawClear_DrawOp,
-    kDrawData_DrawOp,
+    kDrawBitmapRect_DrawOp,
     kDrawDRRect_DrawOp,
+    kDrawImage_DrawOp,
+    kDrawImageRect_DrawOp,
+    kDrawImageNine_DrawOp,
     kDrawOval_DrawOp,
     kDrawPaint_DrawOp,
+    kDrawPatch_DrawOp,
     kDrawPath_DrawOp,
     kDrawPicture_DrawOp,
     kDrawPoints_DrawOp,
@@ -57,6 +59,7 @@ enum DrawOps {
     kDrawRRect_DrawOp,
     kDrawSprite_DrawOp,
     kDrawText_DrawOp,
+    kDrawTextBlob_DrawOp,
     kDrawTextOnPath_DrawOp,
     kDrawVertices_DrawOp,
     kRestore_DrawOp,
@@ -80,6 +83,7 @@ enum DrawOps {
     // these are signals to playback, not drawing verbs
     kReportFlags_DrawOp,
     kShareBitmapHeap_DrawOp,
+    kShareImageHeap_DrawOp,
     kDone_DrawOp,
 };
 
@@ -133,9 +137,6 @@ enum {
     kSaveLayer_HasBounds_DrawOpFlag = 1 << 0,
     kSaveLayer_HasPaint_DrawOpFlag = 1 << 1,
 };
-enum {
-    kClear_HasColor_DrawOpFlag  = 1 << 0
-};
 enum {
     kDrawTextOnPath_HasMatrix_DrawOpFlag = 1 << 0
 };
@@ -145,6 +146,12 @@ enum {
     kDrawVertices_HasIndices_DrawOpFlag  = 1 << 2,
     kDrawVertices_HasXfermode_DrawOpFlag = 1 << 3,
 };
+enum {
+    kDrawAtlas_HasPaint_DrawOpFlag      = 1 << 0,
+    kDrawAtlas_HasColors_DrawOpFlag     = 1 << 1,
+    kDrawAtlas_HasCull_DrawOpFlag       = 1 << 2,
+};
+// These are shared between drawbitmap and drawimage
 enum {
     kDrawBitmap_HasPaint_DrawOpFlag   = 1 << 0,
     // Specific to drawBitmapRect, but needs to be different from HasPaint,
@@ -165,14 +172,14 @@ public:
         : fBitmap(bitmap)
         , fGenID(genID)
         , fBytesAllocated(0)
-        , fMoreRecentlyUsed(NULL)
-        , fLessRecentlyUsed(NULL)
+        , fMoreRecentlyUsed(nullptr)
+        , fLessRecentlyUsed(nullptr)
         , fToBeDrawnCount(toBeDrawnCount)
     {}
 
     ~BitmapInfo() {
         SkASSERT(0 == fToBeDrawnCount);
-        SkDELETE(fBitmap);
+        delete fBitmap;
     }
 
     void addDraws(int drawsToAdd) {
@@ -217,6 +224,25 @@ static inline bool shouldFlattenBitmaps(uint32_t flags) {
             && !(flags & SkGPipeWriter::kSharedAddressSpace_Flag));
 }
 
+class SkImageHeap : public SkRefCnt {
+public:
+    SkImageHeap();
+    virtual ~SkImageHeap();
+
+    size_t bytesInCache() const { return fBytesInCache; }
+    void reset();
+    // slot must be "valid" -- 0 is never valid
+    const SkImage* get(int32_t slot) const;
+    // returns 0 if not found, else returns slot
+    int32_t find(const SkImage*) const;
+    // returns non-zero value for where the image was stored
+    int32_t insert(const SkImage*);
+
+private:
+    SkTDArray<const SkImage*> fArray;
+    size_t fBytesInCache;
+};
+
 ///////////////////////////////////////////////////////////////////////////////
 
 enum PaintOps {
diff --git a/gfx/skia/skia/src/pipe/SkGPipeRead.cpp b/gfx/skia/skia/src/pipe/SkGPipeRead.cpp
index 9047e8293fe5..4d57a6cca9db 100644
--- a/gfx/skia/skia/src/pipe/SkGPipeRead.cpp
+++ b/gfx/skia/skia/src/pipe/SkGPipeRead.cpp
@@ -20,11 +20,14 @@
 #include "SkDrawLooper.h"
 #include "SkImageFilter.h"
 #include "SkMaskFilter.h"
-#include "SkReadBuffer.h"
+#include "SkPatchUtils.h"
 #include "SkPathEffect.h"
 #include "SkRasterizer.h"
+#include "SkReadBuffer.h"
 #include "SkRRect.h"
+#include "SkRSXform.h"
 #include "SkShader.h"
+#include "SkTextBlob.h"
 #include "SkTypeface.h"
 #include "SkXfermode.h"
 
@@ -115,7 +118,7 @@ public:
 
     SkFlattenable* getFlat(unsigned index) const {
         if (0 == index) {
-            return NULL;
+            return nullptr;
         }
         return fFlatArray[index - 1];
     }
@@ -147,7 +150,7 @@ public:
         SkASSERT(shouldFlattenBitmaps(fFlags));
         SkBitmap* bm;
         if(fBitmaps.count() == index) {
-            bm = SkNEW(SkBitmap);
+            bm = new SkBitmap;
             *fBitmaps.append() = bm;
         } else {
             bm = fBitmaps[index];
@@ -160,7 +163,7 @@ public:
      * these SkBitmaps for bitmap shaders. Used only in cross process mode
      * without a shared heap.
      */
-    virtual SkBitmap* getBitmap(int32_t index) const SK_OVERRIDE {
+    SkBitmap* getBitmap(int32_t index) const override {
         SkASSERT(shouldFlattenBitmaps(fFlags));
         return fBitmaps[index];
     }
@@ -168,14 +171,18 @@ public:
     /**
      * Needed to be a non-abstract subclass of SkBitmapHeapReader.
      */
-    virtual void releaseRef(int32_t) SK_OVERRIDE {}
+    void releaseRef(int32_t) override {}
 
     void setSharedHeap(SkBitmapHeap* heap) {
-        SkASSERT(!shouldFlattenBitmaps(fFlags) || NULL == heap);
+        SkASSERT(!shouldFlattenBitmaps(fFlags) || nullptr == heap);
         SkRefCnt_SafeAssign(fSharedHeap, heap);
         this->updateReader();
     }
 
+    void setImageHeap(SkImageHeap* heap) {
+        fImageHeap.reset(SkRef(heap));
+    }
+
     /**
      * Access the shared heap. Only used in the case when bitmaps are not
      * flattened.
@@ -192,13 +199,17 @@ public:
         *fTypefaces.append() = SkTypeface::Deserialize(&stream);
     }
 
-    void setTypeface(SkPaint* paint, unsigned id) {
-        paint->setTypeface(id ? fTypefaces[id - 1] : NULL);
+    SkTypeface* getTypeface(unsigned id) const {
+        return id ? fTypefaces[id - 1] : nullptr;
+    }
+
+    const SkImage* getImage(int32_t slot) const {
+        return fImageHeap->get(slot);
     }
 
 private:
     void updateReader() {
-        if (NULL == fReader) {
+        if (nullptr == fReader) {
             return;
         }
         bool crossProcess = SkToBool(fFlags & SkGPipeWriter::kCrossProcess_Flag);
@@ -207,7 +218,7 @@ private:
         if (crossProcess) {
             fReader->setFactoryArray(&fFactoryArray);
         } else {
-            fReader->setFactoryArray(NULL);
+            fReader->setFactoryArray(nullptr);
         }
 
         if (shouldFlattenBitmaps(fFlags)) {
@@ -225,6 +236,7 @@ private:
     bool                      fSilent;
     // Only used when sharing bitmaps with the writer.
     SkBitmapHeap*             fSharedHeap;
+    SkAutoTUnref<SkImageHeap> fImageHeap;
     unsigned                  fFlags;
 };
 
@@ -325,11 +337,11 @@ static void saveLayer_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
     unsigned flags = DrawOp_unpackFlags(op32);
     SkCanvas::SaveFlags saveFlags = (SkCanvas::SaveFlags)DrawOp_unpackData(op32);
 
-    const SkRect* bounds = NULL;
+    const SkRect* bounds = nullptr;
     if (flags & kSaveLayer_HasBounds_DrawOpFlag) {
         bounds = skip<SkRect>(reader);
     }
-    const SkPaint* paint = NULL;
+    const SkPaint* paint = nullptr;
     if (flags & kSaveLayer_HasPaint_DrawOpFlag) {
         paint = &state->paint();
     }
@@ -343,15 +355,6 @@ static void restore_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static void drawClear_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
-                         SkGPipeState* state) {
-    SkColor color = 0;
-    if (DrawOp_unpackFlags(op32) & kClear_HasColor_DrawOpFlag) {
-        color = reader->readU32();
-    }
-    canvas->clear(color);
-}
-
 static void drawPaint_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
                          SkGPipeState* state) {
     if (state->shouldDraw()) {
@@ -404,6 +407,34 @@ static void drawDRRect_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
     }
 }
 
+static void drawPatch_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
+                         SkGPipeState* state) {
+    
+    unsigned flags = DrawOp_unpackFlags(op32);
+    
+    const SkPoint* cubics = skip<SkPoint>(reader, SkPatchUtils::kNumCtrlPts);
+    
+    const SkColor* colors = nullptr;
+    if (flags & kDrawVertices_HasColors_DrawOpFlag) {
+        colors = skip<SkColor>(reader, SkPatchUtils::kNumCorners);
+    }
+    const SkPoint* texCoords = nullptr;
+    if (flags & kDrawVertices_HasTexs_DrawOpFlag) {
+        texCoords = skip<SkPoint>(reader, SkPatchUtils::kNumCorners);
+    }
+    SkAutoTUnref<SkXfermode> xfer;
+    if (flags & kDrawVertices_HasXfermode_DrawOpFlag) {
+        int mode = reader->readInt();
+        if (mode < 0 || mode > SkXfermode::kLastMode) {
+            mode = SkXfermode::kModulate_Mode;
+        }
+        xfer.reset(SkXfermode::Create((SkXfermode::Mode)mode));
+    }
+    if (state->shouldDraw()) {
+        canvas->drawPatch(cubics, colors, texCoords, xfer, state->paint());
+    }
+}
+
 static void drawPath_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
                         SkGPipeState* state) {
     SkPath path;
@@ -421,12 +452,12 @@ static void drawVertices_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
     int vertexCount = reader->readU32();
     const SkPoint* verts = skip<SkPoint>(reader, vertexCount);
 
-    const SkPoint* texs = NULL;
+    const SkPoint* texs = nullptr;
     if (flags & kDrawVertices_HasTexs_DrawOpFlag) {
         texs = skip<SkPoint>(reader, vertexCount);
     }
 
-    const SkColor* colors = NULL;
+    const SkColor* colors = nullptr;
     if (flags & kDrawVertices_HasColors_DrawOpFlag) {
         colors = skip<SkColor>(reader, vertexCount);
     }
@@ -438,7 +469,7 @@ static void drawVertices_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
     }
 
     int indexCount = 0;
-    const uint16_t* indices = NULL;
+    const uint16_t* indices = nullptr;
     if (flags & kDrawVertices_HasIndices_DrawOpFlag) {
         indexCount = reader->readU32();
         indices = skipAlign<uint16_t>(reader, indexCount);
@@ -449,6 +480,33 @@ static void drawVertices_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
     }
 }
 
+static void drawAtlas_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32, SkGPipeState* state) {
+    unsigned flags = DrawOp_unpackFlags(op32);
+
+    const SkPaint* paint = nullptr;
+    if (flags & kDrawAtlas_HasPaint_DrawOpFlag) {
+        paint = &state->paint();
+    }
+    const int slot = reader->readU32();
+    const SkImage* atlas = state->getImage(slot);
+    const int count = reader->readU32();
+    SkXfermode::Mode mode = (SkXfermode::Mode)reader->readU32();
+    const SkRSXform* xform = skip<SkRSXform>(reader, count);
+    const SkRect* tex = skip<SkRect>(reader, count);
+    const SkColor* colors = nullptr;
+    if (flags & kDrawAtlas_HasColors_DrawOpFlag) {
+        colors = skip<SkColor>(reader, count);
+    }
+    const SkRect* cull = nullptr;
+    if (flags & kDrawAtlas_HasCull_DrawOpFlag) {
+        cull = skip<SkRect>(reader, 1);
+    }
+
+    if (state->shouldDraw()) {
+        canvas->drawAtlas(atlas, xform, tex, colors, count, mode, cull, paint);
+    }
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 static void drawText_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
@@ -493,7 +551,7 @@ static void drawTextOnPath_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op3
     reader->readPath(&path);
 
     SkMatrix matrixStorage;
-    const SkMatrix* matrix = NULL;
+    const SkMatrix* matrix = nullptr;
     if (DrawOp_unpackFlags(op32) & kDrawTextOnPath_HasMatrix_DrawOpFlag) {
         reader->readMatrix(&matrixStorage);
         matrix = &matrixStorage;
@@ -509,7 +567,7 @@ class BitmapHolder : SkNoncopyable {
 public:
     BitmapHolder(SkReader32* reader, uint32_t op32, SkGPipeState* state);
     ~BitmapHolder() {
-        if (fHeapEntry != NULL) {
+        if (fHeapEntry != nullptr) {
             fHeapEntry->releaseRef();
         }
     }
@@ -527,7 +585,7 @@ BitmapHolder::BitmapHolder(SkReader32* reader, uint32_t op32,
     const unsigned flags = state->getFlags();
     const unsigned index = DrawOp_unpackData(op32);
     if (shouldFlattenBitmaps(flags)) {
-        fHeapEntry = NULL;
+        fHeapEntry = nullptr;
         fBitmap = state->getBitmap(index);
     } else {
         SkBitmapHeapEntry* entry = state->getSharedHeap()->getEntry(index);
@@ -538,7 +596,7 @@ BitmapHolder::BitmapHolder(SkReader32* reader, uint32_t op32,
             fBitmap = &fBitmapStorage;
             // Release the ref on the bitmap now, since we made our own copy.
             entry->releaseRef();
-            fHeapEntry = NULL;
+            fHeapEntry = nullptr;
         } else {
             SkASSERT(!shouldFlattenBitmaps(flags));
             SkASSERT(!SkToBool(flags & SkGPipeWriter::kSimultaneousReaders_Flag));
@@ -556,20 +614,7 @@ static void drawBitmap_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
     SkScalar top = reader->readScalar();
     const SkBitmap* bitmap = holder.getBitmap();
     if (state->shouldDraw()) {
-        canvas->drawBitmap(*bitmap, left, top, hasPaint ? &state->paint() : NULL);
-    }
-}
-
-static void drawBitmapMatrix_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
-                                SkGPipeState* state) {
-    BitmapHolder holder(reader, op32, state);
-    bool hasPaint = SkToBool(DrawOp_unpackFlags(op32) & kDrawBitmap_HasPaint_DrawOpFlag);
-    SkMatrix matrix;
-    reader->readMatrix(&matrix);
-    const SkBitmap* bitmap = holder.getBitmap();
-    if (state->shouldDraw()) {
-        canvas->drawBitmapMatrix(*bitmap, matrix,
-                                 hasPaint ? &state->paint() : NULL);
+        canvas->drawBitmap(*bitmap, left, top, hasPaint ? &state->paint() : nullptr);
     }
 }
 
@@ -582,7 +627,7 @@ static void drawBitmapNine_rp(SkCanvas* canvas, SkReader32* reader,
     const SkBitmap* bitmap = holder.getBitmap();
     if (state->shouldDraw()) {
         canvas->drawBitmapNine(*bitmap, *center, *dst,
-                               hasPaint ? &state->paint() : NULL);
+                               hasPaint ? &state->paint() : nullptr);
     }
 }
 
@@ -596,17 +641,16 @@ static void drawBitmapRect_rp(SkCanvas* canvas, SkReader32* reader,
     if (hasSrc) {
         src = skip<SkRect>(reader);
     } else {
-        src = NULL;
+        src = nullptr;
     }
-    SkCanvas::DrawBitmapRectFlags dbmrFlags = SkCanvas::kNone_DrawBitmapRectFlag;
+    SkCanvas::SrcRectConstraint constraint = SkCanvas::kStrict_SrcRectConstraint;
     if (flags & kDrawBitmap_Bleed_DrawOpFlag) {
-        dbmrFlags = (SkCanvas::DrawBitmapRectFlags)(dbmrFlags|SkCanvas::kBleed_DrawBitmapRectFlag);
+        constraint = SkCanvas::kFast_SrcRectConstraint;
     }
     const SkRect* dst = skip<SkRect>(reader);
     const SkBitmap* bitmap = holder.getBitmap();
     if (state->shouldDraw()) {
-        canvas->drawBitmapRectToRect(*bitmap, src, *dst,
-                                     hasPaint ? &state->paint() : NULL, dbmrFlags);
+        canvas->legacy_drawBitmapRect(*bitmap, src, *dst, hasPaint ? &state->paint() : nullptr, constraint);
     }
 }
 
@@ -617,30 +661,88 @@ static void drawSprite_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
     const SkIPoint* point = skip<SkIPoint>(reader);
     const SkBitmap* bitmap = holder.getBitmap();
     if (state->shouldDraw()) {
-        canvas->drawSprite(*bitmap, point->fX, point->fY, hasPaint ? &state->paint() : NULL);
+        canvas->drawSprite(*bitmap, point->fX, point->fY, hasPaint ? &state->paint() : nullptr);
+    }
+}
+
+static void drawImage_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32, SkGPipeState* state) {
+    unsigned slot = DrawOp_unpackData(op32);
+    unsigned flags = DrawOp_unpackFlags(op32);
+    bool hasPaint = SkToBool(flags & kDrawBitmap_HasPaint_DrawOpFlag);
+    SkScalar x = reader->readScalar();
+    SkScalar y = reader->readScalar();
+    const SkImage* image = state->getImage(slot);
+    if (state->shouldDraw()) {
+        canvas->drawImage(image, x, y, hasPaint ? &state->paint() : nullptr);
+    }
+}
+
+static void drawImageRect_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
+                             SkGPipeState* state) {
+    unsigned slot = DrawOp_unpackData(op32);
+    unsigned flags = DrawOp_unpackFlags(op32);
+    bool hasPaint = SkToBool(flags & kDrawBitmap_HasPaint_DrawOpFlag);
+    bool hasSrc = SkToBool(flags & kDrawBitmap_HasSrcRect_DrawOpFlag);
+    const SkRect* src = nullptr;
+    if (hasSrc) {
+        src = skip<SkRect>(reader);
+    }
+    const SkRect* dst = skip<SkRect>(reader);
+    SkCanvas::SrcRectConstraint constraint = (SkCanvas::SrcRectConstraint)reader->readInt();
+
+    const SkImage* image = state->getImage(slot);
+    if (state->shouldDraw()) {
+        canvas->legacy_drawImageRect(image, src, *dst, hasPaint ? &state->paint() : nullptr, constraint);
+    }
+}
+
+static void drawImageNine_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
+                             SkGPipeState* state) {
+    unsigned slot = DrawOp_unpackData(op32);
+    unsigned flags = DrawOp_unpackFlags(op32);
+    bool hasPaint = SkToBool(flags & kDrawBitmap_HasPaint_DrawOpFlag);
+    const SkIRect* center = skip<SkIRect>(reader);
+    const SkRect* dst = skip<SkRect>(reader);
+    const SkImage* image = state->getImage(slot);
+    if (state->shouldDraw()) {
+        canvas->drawImageNine(image, *center, *dst, hasPaint ? &state->paint() : nullptr);
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static void drawData_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
-                        SkGPipeState* state) {
-    // since we don't have a paint, we can use data for our (small) sizes
-    size_t size = DrawOp_unpackData(op32);
-    if (0 == size) {
-        size = reader->readU32();
-    }
-    const void* data = reader->skip(SkAlign4(size));
-    if (state->shouldDraw()) {
-        canvas->drawData(data, size);
-    }
-}
-
 static void drawPicture_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
                            SkGPipeState* state) {
     UNIMPLEMENTED
 }
 
+static void drawTextBlob_rp(SkCanvas* canvas, SkReader32* reader, uint32_t op32,
+                            SkGPipeState* state) {
+    SkScalar x = reader->readScalar();
+    SkScalar y = reader->readScalar();
+
+    int typefaceCount = reader->readU32();
+    SkAutoSTMalloc<16, SkTypeface*> typefaceArray(typefaceCount);
+    if (state->getFlags() & SkGPipeWriter::kCrossProcess_Flag) {
+        for (int i = 0; i < typefaceCount; ++i) {
+            typefaceArray[i] = state->getTypeface(reader->readU32());
+        }
+    } else {
+        reader->read(typefaceArray.get(), typefaceCount * sizeof(SkTypeface*));
+    }
+
+    size_t blobSize = reader->readU32();
+    const void* data = reader->skip(SkAlign4(blobSize));
+
+    if (state->shouldDraw()) {
+        SkReadBuffer blobBuffer(data, blobSize);
+        blobBuffer.setTypefaceArray(typefaceArray.get(), typefaceCount);
+        SkAutoTUnref<const SkTextBlob> blob(SkTextBlob::CreateFromBuffer(blobBuffer));
+        SkASSERT(blob.get());
+
+        canvas->drawTextBlob(blob, x, y, state->paint());
+    }
+}
 ///////////////////////////////////////////////////////////////////////////////
 
 static void paintOp_rp(SkCanvas*, SkReader32* reader, uint32_t op32,
@@ -660,7 +762,7 @@ static void paintOp_rp(SkCanvas*, SkReader32* reader, uint32_t op32,
             case kReset_PaintOp: p->reset(); break;
             case kFlags_PaintOp: p->setFlags(data); break;
             case kColor_PaintOp: p->setColor(reader->readU32()); break;
-            case kFilterLevel_PaintOp: p->setFilterLevel((SkPaint::FilterLevel)data); break;
+            case kFilterLevel_PaintOp: p->setFilterQuality((SkFilterQuality)data); break;
             case kStyle_PaintOp: p->setStyle((SkPaint::Style)data); break;
             case kJoin_PaintOp: p->setStrokeJoin((SkPaint::Join)data); break;
             case kCap_PaintOp: p->setStrokeCap((SkPaint::Cap)data); break;
@@ -685,7 +787,8 @@ static void paintOp_rp(SkCanvas*, SkReader32* reader, uint32_t op32,
             case kTypeface_PaintOp:
                 SkASSERT(SkToBool(state->getFlags() &
                                   SkGPipeWriter::kCrossProcess_Flag));
-                state->setTypeface(p, data); break;
+                p->setTypeface(state->getTypeface(data));
+                break;
             default: SkDEBUGFAIL("bad paintop"); return;
         }
         SkASSERT(reader->offset() <= stop);
@@ -709,7 +812,7 @@ static void annotation_rp(SkCanvas*, SkReader32* reader, uint32_t op32,
         p->setAnnotation(SkAnnotation::Create(buffer))->unref();
         SkASSERT(buffer.offset() == size);
     } else {
-        p->setAnnotation(NULL);
+        p->setAnnotation(nullptr);
     }
 }
 
@@ -751,10 +854,14 @@ static void reportFlags_rp(SkCanvas*, SkReader32*, uint32_t op32,
 }
 
 static void shareBitmapHeap_rp(SkCanvas*, SkReader32* reader, uint32_t,
-                           SkGPipeState* state) {
+                               SkGPipeState* state) {
     state->setSharedHeap(static_cast<SkBitmapHeap*>(reader->readPtr()));
 }
 
+static void shareImageHeap_rp(SkCanvas*, SkReader32* reader, uint32_t, SkGPipeState* state) {
+    state->setImageHeap(static_cast<SkImageHeap*>(reader->readPtr()));
+}
+
 static void done_rp(SkCanvas*, SkReader32*, uint32_t, SkGPipeState*) {}
 
 typedef void (*ReadProc)(SkCanvas*, SkReader32*, uint32_t op32, SkGPipeState*);
@@ -766,15 +873,17 @@ static const ReadProc gReadTable[] = {
     clipRect_rp,
     clipRRect_rp,
     concat_rp,
+    drawAtlas_rp,
     drawBitmap_rp,
-    drawBitmapMatrix_rp,
     drawBitmapNine_rp,
     drawBitmapRect_rp,
-    drawClear_rp,
-    drawData_rp,
     drawDRRect_rp,
+    drawImage_rp,
+    drawImageRect_rp,
+    drawImageNine_rp,
     drawOval_rp,
     drawPaint_rp,
+    drawPatch_rp,
     drawPath_rp,
     drawPicture_rp,
     drawPoints_rp,
@@ -784,6 +893,7 @@ static const ReadProc gReadTable[] = {
     drawRRect_rp,
     drawSprite_rp,
     drawText_rp,
+    drawTextBlob_rp,
     drawTextOnPath_rp,
     drawVertices_rp,
     restore_rp,
@@ -806,6 +916,7 @@ static const ReadProc gReadTable[] = {
 
     reportFlags_rp,
     shareBitmapHeap_rp,
+    shareImageHeap_rp,
     done_rp
 };
 
@@ -814,7 +925,7 @@ static const ReadProc gReadTable[] = {
 SkGPipeState::SkGPipeState()
     : fReader(0)
     , fSilent(false)
-    , fSharedHeap(NULL)
+    , fSharedHeap(nullptr)
     , fFlags(0) {
 
 }
@@ -831,16 +942,16 @@ SkGPipeState::~SkGPipeState() {
 #include "SkGPipe.h"
 
 SkGPipeReader::SkGPipeReader() {
-    fCanvas = NULL;
-    fState = NULL;
-    fProc = NULL;
+    fCanvas = nullptr;
+    fState = nullptr;
+    fProc = nullptr;
 }
 
 SkGPipeReader::SkGPipeReader(SkCanvas* target) {
-    fCanvas = NULL;
+    fCanvas = nullptr;
     this->setCanvas(target);
-    fState = NULL;
-    fProc = NULL;
+    fState = nullptr;
+    fProc = nullptr;
 }
 
 void SkGPipeReader::setCanvas(SkCanvas *target) {
@@ -854,11 +965,11 @@ SkGPipeReader::~SkGPipeReader() {
 
 SkGPipeReader::Status SkGPipeReader::playback(const void* data, size_t length,
                                               uint32_t playbackFlags, size_t* bytesRead) {
-    if (NULL == fCanvas) {
+    if (nullptr == fCanvas) {
         return kError_Status;
     }
 
-    if (NULL == fState) {
+    if (nullptr == fState) {
         fState = new SkGPipeState;
     }
 
diff --git a/gfx/skia/skia/src/pipe/SkGPipeWrite.cpp b/gfx/skia/skia/src/pipe/SkGPipeWrite.cpp
index 6711eb06640b..0fccb80d0a16 100644
--- a/gfx/skia/skia/src/pipe/SkGPipeWrite.cpp
+++ b/gfx/skia/skia/src/pipe/SkGPipeWrite.cpp
@@ -7,7 +7,6 @@
  */
 
 #include "SkAnnotation.h"
-#include "SkBitmapDevice.h"
 #include "SkBitmapHeap.h"
 #include "SkCanvas.h"
 #include "SkColorFilter.h"
@@ -17,14 +16,18 @@
 #include "SkGPipePriv.h"
 #include "SkImageFilter.h"
 #include "SkMaskFilter.h"
+#include "SkRSXform.h"
 #include "SkWriteBuffer.h"
 #include "SkPaint.h"
+#include "SkPatchUtils.h"
 #include "SkPathEffect.h"
 #include "SkPictureFlat.h"
+#include "SkPtrRecorder.h"
 #include "SkRasterizer.h"
 #include "SkRRect.h"
 #include "SkShader.h"
 #include "SkStream.h"
+#include "SkTextBlob.h"
 #include "SkTSearch.h"
 #include "SkTypeface.h"
 #include "SkWriter32.h"
@@ -33,7 +36,7 @@ enum {
     kSizeOfFlatRRect = sizeof(SkRect) + 4 * sizeof(SkVector)
 };
 
-static bool isCrossProcess(uint32_t flags) {
+static bool is_cross_process(uint32_t flags) {
     return SkToBool(flags & SkGPipeWriter::kCrossProcess_Flag);
 }
 
@@ -50,7 +53,7 @@ static SkFlattenable* get_paintflat(const SkPaint& paint, unsigned paintFlat) {
         case kXfermode_PaintFlat:       return paint.getXfermode();
     }
     SkDEBUGFAIL("never gets here");
-    return NULL;
+    return nullptr;
 }
 
 static size_t writeTypeface(SkWriter32* writer, SkTypeface* typeface) {
@@ -73,7 +76,7 @@ public:
     FlattenableHeap(int numFlatsToKeep, SkNamedFactorySet* fset, bool isCrossProcess)
     : INHERITED(isCrossProcess ? SkWriteBuffer::kCrossProcess_Flag : 0)
     , fNumFlatsToKeep(numFlatsToKeep) {
-        SkASSERT((isCrossProcess && fset != NULL) || (!isCrossProcess && NULL == fset));
+        SkASSERT((isCrossProcess && fset != nullptr) || (!isCrossProcess && nullptr == fset));
         if (isCrossProcess) {
             this->setNamedFactorySet(fset);
         }
@@ -83,9 +86,9 @@ public:
         fPointers.freeAll();
     }
 
-    virtual void* allocThrow(size_t bytes) SK_OVERRIDE;
+    void* allocThrow(size_t bytes) override;
 
-    virtual void unalloc(void* ptr) SK_OVERRIDE;
+    void unalloc(void* ptr) override;
 
     void setBitmapStorage(SkBitmapHeap* heap) {
         this->setBitmapHeap(heap);
@@ -147,7 +150,7 @@ const SkFlatData* FlattenableHeap::flatToReplace() const {
             }
         }
     }
-    return NULL;
+    return nullptr;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -172,7 +175,7 @@ public:
 
     ~BitmapShuttle();
 
-    virtual bool insert(const SkBitmap& bitmap, int32_t slot) SK_OVERRIDE;
+    bool insert(const SkBitmap& bitmap, int32_t slot) override;
 
     /**
      *  Remove the SkGPipeCanvas used for insertion. After this, calls to
@@ -225,82 +228,85 @@ public:
     size_t freeMemoryIfPossible(size_t bytesToFree);
 
     size_t storageAllocatedForRecording() {
-        return (NULL == fBitmapHeap) ? 0 : fBitmapHeap->bytesAllocated();
+        size_t bytesAllocated = 0;
+        if (nullptr != fBitmapHeap) {
+            bytesAllocated += fBitmapHeap->bytesAllocated();
+        }
+        if (nullptr != fImageHeap) {
+            bytesAllocated += fImageHeap->bytesInCache();
+        }
+        return bytesAllocated;
     }
 
-    // overrides from SkCanvas
-    virtual bool isDrawingToLayer() const SK_OVERRIDE;
-    virtual void clear(SkColor) SK_OVERRIDE;
-    virtual void drawPaint(const SkPaint& paint) SK_OVERRIDE;
-    virtual void drawPoints(PointMode, size_t count, const SkPoint pts[],
-                            const SkPaint&) SK_OVERRIDE;
-    virtual void drawOval(const SkRect&, const SkPaint&) SK_OVERRIDE;
-    virtual void drawRect(const SkRect& rect, const SkPaint&) SK_OVERRIDE;
-    virtual void drawRRect(const SkRRect&, const SkPaint&) SK_OVERRIDE;
-    virtual void drawPath(const SkPath& path, const SkPaint&) SK_OVERRIDE;
-    virtual void drawBitmap(const SkBitmap&, SkScalar left, SkScalar top,
-                            const SkPaint*) SK_OVERRIDE;
-    virtual void drawBitmapRectToRect(const SkBitmap&, const SkRect* src,
-                                      const SkRect& dst, const SkPaint* paint,
-                                      DrawBitmapRectFlags flags) SK_OVERRIDE;
-    virtual void drawBitmapMatrix(const SkBitmap&, const SkMatrix&,
-                                  const SkPaint*) SK_OVERRIDE;
-    virtual void drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
-                                const SkRect& dst, const SkPaint* paint = NULL) SK_OVERRIDE;
-    virtual void drawSprite(const SkBitmap&, int left, int top,
-                            const SkPaint*) SK_OVERRIDE;
-    virtual void drawVertices(VertexMode, int vertexCount,
-                          const SkPoint vertices[], const SkPoint texs[],
-                          const SkColor colors[], SkXfermode*,
-                          const uint16_t indices[], int indexCount,
-                              const SkPaint&) SK_OVERRIDE;
-    virtual void drawData(const void*, size_t) SK_OVERRIDE;
-    virtual void beginCommentGroup(const char* description) SK_OVERRIDE;
-    virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE;
-    virtual void endCommentGroup() SK_OVERRIDE;
-
     /**
      * Flatten an SkBitmap to send to the reader, where it will be referenced
      * according to slot.
      */
     bool shuttleBitmap(const SkBitmap&, int32_t slot);
 
+    void resetImageHeap();
+
 protected:
-    virtual void willSave() SK_OVERRIDE;
-    virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE;
-    virtual void willRestore() SK_OVERRIDE;
+    void willSave() override;
+    SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) override;
+    void willRestore() override;
 
-    virtual void didConcat(const SkMatrix&) SK_OVERRIDE;
-    virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE;
+    void didConcat(const SkMatrix&) override;
+    void didSetMatrix(const SkMatrix&) override;
 
-    virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE;
-    virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
-                            const SkPaint&) SK_OVERRIDE;
-    virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
-                               const SkPaint&) SK_OVERRIDE;
-    virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
-                                SkScalar constY, const SkPaint&) SK_OVERRIDE;
-    virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
-                                  const SkMatrix* matrix, const SkPaint&) SK_OVERRIDE;
+    void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override;
+    void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
+                    const SkPaint&) override;
+    void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
+                       const SkPaint&) override;
+    void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
+                        SkScalar constY, const SkPaint&) override;
+    void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
+                          const SkMatrix* matrix, const SkPaint&) override;
+    void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
+                        const SkPaint& paint) override;
+    void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
+                     const SkPoint texCoords[4], SkXfermode* xmode,
+                     const SkPaint& paint) override;
+    void onDrawPaint(const SkPaint&) override;
+    void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override;
+    void onDrawRect(const SkRect&, const SkPaint&) override;
+    void onDrawOval(const SkRect&, const SkPaint&) override;
+    void onDrawRRect(const SkRRect&, const SkPaint&) override;
+    void onDrawPath(const SkPath&, const SkPaint&) override;
+    void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) override;
+    void onDrawBitmapRect(const SkBitmap&, const SkRect* src, const SkRect& dst, const SkPaint*,
+                          SrcRectConstraint) override;
+    void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) override;
+    void onDrawImageRect(const SkImage*, const SkRect* src, const SkRect& dst,
+                         const SkPaint*, SrcRectConstraint) override;
+    void onDrawImageNine(const SkImage*, const SkIRect& center, const SkRect& dst,
+                         const SkPaint*) override;
+    void onDrawBitmapNine(const SkBitmap&, const SkIRect& center, const SkRect& dst,
+                          const SkPaint*) override;
+    void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) override;
+    void onDrawVertices(VertexMode vmode, int vertexCount,
+                        const SkPoint vertices[], const SkPoint texs[],
+                        const SkColor colors[], SkXfermode* xmode,
+                        const uint16_t indices[], int indexCount,
+                        const SkPaint&) override;
+    void onDrawAtlas(const SkImage*, const SkRSXform[], const SkRect[], const SkColor[],
+                     int count, SkXfermode::Mode, const SkRect* cull, const SkPaint*) override;
+    void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) override;
+    void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) override;
+    void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) override;
+    void onClipRegion(const SkRegion&, SkRegion::Op) override;
 
-    virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE;
-
-    virtual void onDrawPicture(const SkPicture* picture) SK_OVERRIDE;
+    void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
 
 private:
     void recordTranslate(const SkMatrix&);
     void recordScale(const SkMatrix&);
     void recordConcat(const SkMatrix&);
 
-    enum {
-        kNoSaveLayer = -1,
-    };
     SkNamedFactorySet* fFactorySet;
-    int                fFirstSaveLayerStackLevel;
     SkBitmapHeap*      fBitmapHeap;
+    SkImageHeap*       fImageHeap;
     SkGPipeController* fController;
     SkWriter32&        fWriter;
     size_t             fBlockSize; // amount allocated for writer
@@ -332,6 +338,10 @@ private:
         }
     }
 
+    typedef SkAutoSTMalloc<128, uint8_t> TypefaceBuffer;
+    size_t getInProcessTypefaces(const SkRefCntSet& typefaceSet, TypefaceBuffer*);
+    size_t getCrossProcessTypefaces(const SkRefCntSet& typefaceSet, TypefaceBuffer*);
+
     // Should be called after any calls to an SkFlatDictionary::findAndReplace
     // if a new SkFlatData was added when in cross process mode
     void flattenFactoryNames();
@@ -345,8 +355,8 @@ private:
 
     // Common code used by drawBitmap*. Behaves differently depending on the
     // type of SkBitmapHeap being used, which is determined by the flags used.
-    bool commonDrawBitmap(const SkBitmap& bm, DrawOps op, unsigned flags,
-                          size_t opBytesNeeded, const SkPaint* paint);
+    bool commonDrawBitmap(const SkBitmap&, DrawOps, unsigned flags, size_t bytes, const SkPaint*);
+    bool commonDrawImage(const SkImage*, DrawOps, unsigned flags, size_t bytes, const SkPaint*);
 
     SkPaint fPaint;
     void writePaint(const SkPaint&);
@@ -365,7 +375,7 @@ private:
 
 void SkGPipeCanvas::flattenFactoryNames() {
     const char* name;
-    while ((name = fFactorySet->getNextAddedFactoryName()) != NULL) {
+    while ((name = fFactorySet->getNextAddedFactoryName()) != nullptr) {
         size_t len = strlen(name);
         if (this->needOpBytes(SkWriter32::WriteStringSize(name, len))) {
             this->writeOp(kDef_Factory_DrawOp);
@@ -390,11 +400,11 @@ bool SkGPipeCanvas::shuttleBitmap(const SkBitmap& bm, int32_t slot) {
     return false;
 }
 
-// return 0 for NULL (or unflattenable obj), or index-base-1
+// return 0 for nullptr (or unflattenable obj), or index-base-1
 // return ~(index-base-1) if an old flattenable was replaced
 int SkGPipeCanvas::flattenToIndex(SkFlattenable* obj, PaintFlats paintflat) {
-    SkASSERT(!fDone && fBitmapHeap != NULL);
-    if (NULL == obj) {
+    SkASSERT(!fDone && fBitmapHeap != nullptr);
+    if (nullptr == obj) {
         return 0;
     }
 
@@ -405,7 +415,7 @@ int SkGPipeCanvas::flattenToIndex(SkFlattenable* obj, PaintFlats paintflat) {
     fBitmapHeap->endAddingOwnersDeferral(added);
     int index = flat->index();
     if (added) {
-        if (isCrossProcess(fFlags)) {
+        if (is_cross_process(fFlags)) {
             this->flattenFactoryNames();
         }
         size_t flatSize = flat->flatSize();
@@ -427,20 +437,20 @@ int SkGPipeCanvas::flattenToIndex(SkFlattenable* obj, PaintFlats paintflat) {
 #define FLATTENABLES_TO_KEEP 10
 
 SkGPipeCanvas::SkGPipeCanvas(SkGPipeController* controller,
-                             SkWriter32* writer, uint32_t flags,
-                             uint32_t width, uint32_t height)
+                             SkWriter32* writer,
+                             uint32_t flags,
+                             uint32_t width,
+                             uint32_t height)
     : SkCanvas(width, height)
-    , fFactorySet(isCrossProcess(flags) ? SkNEW(SkNamedFactorySet) : NULL)
+    , fFactorySet(is_cross_process(flags) ? new SkNamedFactorySet : nullptr)
     , fWriter(*writer)
     , fFlags(flags)
-    , fFlattenableHeap(FLATTENABLES_TO_KEEP, fFactorySet, isCrossProcess(flags))
-    , fFlatDictionary(&fFlattenableHeap)
-{
+    , fFlattenableHeap(FLATTENABLES_TO_KEEP, fFactorySet, is_cross_process(flags))
+    , fFlatDictionary(&fFlattenableHeap) {
     fController = controller;
     fDone = false;
     fBlockSize = 0; // need first block from controller
     fBytesNotified = 0;
-    fFirstSaveLayerStackLevel = kNoSaveLayer;
     sk_bzero(fCurrFlatIndex, sizeof(fCurrFlatIndex));
 
     // Tell the reader the appropriate flags to use.
@@ -449,17 +459,23 @@ SkGPipeCanvas::SkGPipeCanvas(SkGPipeController* controller,
     }
 
     if (shouldFlattenBitmaps(flags)) {
-        fBitmapShuttle.reset(SkNEW_ARGS(BitmapShuttle, (this)));
-        fBitmapHeap = SkNEW_ARGS(SkBitmapHeap, (fBitmapShuttle.get(), BITMAPS_TO_KEEP));
+        fBitmapShuttle.reset(new BitmapShuttle(this));
+        fBitmapHeap = new SkBitmapHeap(fBitmapShuttle.get(), BITMAPS_TO_KEEP);
     } else {
-        fBitmapHeap = SkNEW_ARGS(SkBitmapHeap,
-                                 (BITMAPS_TO_KEEP, controller->numberOfReaders()));
+        fBitmapHeap = new SkBitmapHeap(BITMAPS_TO_KEEP, controller->numberOfReaders());
         if (this->needOpBytes(sizeof(void*))) {
             this->writeOp(kShareBitmapHeap_DrawOp);
             fWriter.writePtr(static_cast<void*>(fBitmapHeap));
         }
     }
     fFlattenableHeap.setBitmapStorage(fBitmapHeap);
+
+    fImageHeap = new SkImageHeap;
+    if (this->needOpBytes(sizeof(void*))) {
+        this->writeOp(kShareImageHeap_DrawOp);
+        fWriter.writePtr(static_cast<void*>(fImageHeap));
+    }
+
     this->doNotify();
 }
 
@@ -467,6 +483,7 @@ SkGPipeCanvas::~SkGPipeCanvas() {
     this->finish(true);
     SkSafeUnref(fFactorySet);
     SkSafeUnref(fBitmapHeap);
+    SkSafeUnref(fImageHeap);
 }
 
 bool SkGPipeCanvas::needOpBytes(size_t needed) {
@@ -475,14 +492,16 @@ bool SkGPipeCanvas::needOpBytes(size_t needed) {
     }
 
     needed += 4;  // size of DrawOp atom
-    needed = SkTMax<size_t>(MIN_BLOCK_SIZE, needed);
     needed = SkAlign4(needed);
     if (fWriter.bytesWritten() + needed > fBlockSize) {
-        // Before we wipe out any data that has already been written, read it
-        // out.
+        // Before we wipe out any data that has already been written, read it out.
         this->doNotify();
+
+        // If we're going to allocate a new block, allocate enough to make it worthwhile.
+        needed = SkTMax<size_t>(MIN_BLOCK_SIZE, needed);
+
         void* block = fController->requestBlock(needed, &fBlockSize);
-        if (NULL == block) {
+        if (nullptr == block) {
             // Do not notify the readers, which would call this function again.
             this->finish(false);
             return false;
@@ -500,7 +519,7 @@ uint32_t SkGPipeCanvas::getTypefaceID(SkTypeface* face) {
         id = fTypefaceSet.find(face);
         if (0 == id) {
             id = fTypefaceSet.add(face);
-            size_t size = writeTypeface(NULL, face);
+            size_t size = writeTypeface(nullptr, face);
             if (this->needOpBytes(size)) {
                 this->writeOp(kDef_Typeface_DrawOp);
                 writeTypeface(&fWriter, face);
@@ -546,10 +565,6 @@ SkCanvas::SaveLayerStrategy SkGPipeCanvas::willSaveLayer(const SkRect* bounds, c
         }
     }
 
-    if (kNoSaveLayer == fFirstSaveLayerStackLevel){
-        fFirstSaveLayerStackLevel = this->getSaveCount();
-    }
-
     this->INHERITED::willSaveLayer(bounds, paint, saveFlags);
     // we don't create a layer
     return kNoLayer_SaveLayerStrategy;
@@ -561,17 +576,9 @@ void SkGPipeCanvas::willRestore() {
         this->writeOp(kRestore_DrawOp);
     }
 
-    if (this->getSaveCount() - 1 == fFirstSaveLayerStackLevel){
-        fFirstSaveLayerStackLevel = kNoSaveLayer;
-    }
-
     this->INHERITED::willRestore();
 }
 
-bool SkGPipeCanvas::isDrawingToLayer() const {
-    return kNoSaveLayer != fFirstSaveLayerStackLevel;
-}
-
 void SkGPipeCanvas::recordTranslate(const SkMatrix& m) {
     if (this->needOpBytes(2 * sizeof(SkScalar))) {
         this->writeOp(kTranslate_DrawOp);
@@ -589,7 +596,7 @@ void SkGPipeCanvas::recordScale(const SkMatrix& m) {
 }
 
 void SkGPipeCanvas::recordConcat(const SkMatrix& m) {
-    if (this->needOpBytes(m.writeToMemory(NULL))) {
+    if (this->needOpBytes(m.writeToMemory(nullptr))) {
         this->writeOp(kConcat_DrawOp);
         fWriter.writeMatrix(m);
     }
@@ -616,7 +623,7 @@ void SkGPipeCanvas::didConcat(const SkMatrix& matrix) {
 
 void SkGPipeCanvas::didSetMatrix(const SkMatrix& matrix) {
     NOTIFY_SETUP(this);
-    if (this->needOpBytes(matrix.writeToMemory(NULL))) {
+    if (this->needOpBytes(matrix.writeToMemory(nullptr))) {
         this->writeOp(kSetMatrix_DrawOp);
         fWriter.writeMatrix(matrix);
     }
@@ -654,7 +661,7 @@ void SkGPipeCanvas::onClipRRect(const SkRRect& rrect, SkRegion::Op rgnOp,
 void SkGPipeCanvas::onClipPath(const SkPath& path, SkRegion::Op rgnOp,
                                ClipEdgeStyle edgeStyle) {
     NOTIFY_SETUP(this);
-    if (this->needOpBytes(path.writeToMemory(NULL))) {
+    if (this->needOpBytes(path.writeToMemory(nullptr))) {
         unsigned flags = 0;
         if (kSoft_ClipEdgeStyle == edgeStyle) {
             flags = kClip_HasAntiAlias_DrawOpFlag;
@@ -668,7 +675,7 @@ void SkGPipeCanvas::onClipPath(const SkPath& path, SkRegion::Op rgnOp,
 
 void SkGPipeCanvas::onClipRegion(const SkRegion& region, SkRegion::Op rgnOp) {
     NOTIFY_SETUP(this);
-    if (this->needOpBytes(region.writeToMemory(NULL))) {
+    if (this->needOpBytes(region.writeToMemory(nullptr))) {
         this->writeOp(kClipRegion_DrawOp, 0, rgnOp);
         fWriter.writeRegion(region);
     }
@@ -677,21 +684,7 @@ void SkGPipeCanvas::onClipRegion(const SkRegion& region, SkRegion::Op rgnOp) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void SkGPipeCanvas::clear(SkColor color) {
-    NOTIFY_SETUP(this);
-    unsigned flags = 0;
-    if (color) {
-        flags |= kClear_HasColor_DrawOpFlag;
-    }
-    if (this->needOpBytes(sizeof(SkColor))) {
-        this->writeOp(kDrawClear_DrawOp, flags, 0);
-        if (color) {
-            fWriter.write32(color);
-        }
-    }
-}
-
-void SkGPipeCanvas::drawPaint(const SkPaint& paint) {
+void SkGPipeCanvas::onDrawPaint(const SkPaint& paint) {
     NOTIFY_SETUP(this);
     this->writePaint(paint);
     if (this->needOpBytes()) {
@@ -699,8 +692,8 @@ void SkGPipeCanvas::drawPaint(const SkPaint& paint) {
     }
 }
 
-void SkGPipeCanvas::drawPoints(PointMode mode, size_t count,
-                               const SkPoint pts[], const SkPaint& paint) {
+void SkGPipeCanvas::onDrawPoints(PointMode mode, size_t count,
+                                 const SkPoint pts[], const SkPaint& paint) {
     if (count) {
         NOTIFY_SETUP(this);
         this->writePaint(paint);
@@ -712,7 +705,7 @@ void SkGPipeCanvas::drawPoints(PointMode mode, size_t count,
     }
 }
 
-void SkGPipeCanvas::drawOval(const SkRect& rect, const SkPaint& paint) {
+void SkGPipeCanvas::onDrawOval(const SkRect& rect, const SkPaint& paint) {
     NOTIFY_SETUP(this);
     this->writePaint(paint);
     if (this->needOpBytes(sizeof(SkRect))) {
@@ -721,7 +714,7 @@ void SkGPipeCanvas::drawOval(const SkRect& rect, const SkPaint& paint) {
     }
 }
 
-void SkGPipeCanvas::drawRect(const SkRect& rect, const SkPaint& paint) {
+void SkGPipeCanvas::onDrawRect(const SkRect& rect, const SkPaint& paint) {
     NOTIFY_SETUP(this);
     this->writePaint(paint);
     if (this->needOpBytes(sizeof(SkRect))) {
@@ -730,7 +723,7 @@ void SkGPipeCanvas::drawRect(const SkRect& rect, const SkPaint& paint) {
     }
 }
 
-void SkGPipeCanvas::drawRRect(const SkRRect& rrect, const SkPaint& paint) {
+void SkGPipeCanvas::onDrawRRect(const SkRRect& rrect, const SkPaint& paint) {
     NOTIFY_SETUP(this);
     this->writePaint(paint);
     if (this->needOpBytes(kSizeOfFlatRRect)) {
@@ -750,10 +743,10 @@ void SkGPipeCanvas::onDrawDRRect(const SkRRect& outer, const SkRRect& inner,
     }
 }
 
-void SkGPipeCanvas::drawPath(const SkPath& path, const SkPaint& paint) {
+void SkGPipeCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) {
     NOTIFY_SETUP(this);
     this->writePaint(paint);
-    if (this->needOpBytes(path.writeToMemory(NULL))) {
+    if (this->needOpBytes(path.writeToMemory(nullptr))) {
         this->writeOp(kDrawPath_DrawOp);
         fWriter.writePath(path);
     }
@@ -767,13 +760,13 @@ bool SkGPipeCanvas::commonDrawBitmap(const SkBitmap& bm, DrawOps op,
         return false;
     }
 
-    if (paint != NULL) {
+    if (paint != nullptr) {
         flags |= kDrawBitmap_HasPaint_DrawOpFlag;
         this->writePaint(*paint);
     }
     // This needs to run first so its calls to needOpBytes() and its writes
     // don't interlace with the needOpBytes() and write below.
-    SkASSERT(fBitmapHeap != NULL);
+    SkASSERT(fBitmapHeap != nullptr);
     int32_t bitmapIndex = fBitmapHeap->insert(bm);
     if (SkBitmapHeap::INVALID_SLOT == bitmapIndex) {
         return false;
@@ -786,8 +779,8 @@ bool SkGPipeCanvas::commonDrawBitmap(const SkBitmap& bm, DrawOps op,
     return false;
 }
 
-void SkGPipeCanvas::drawBitmap(const SkBitmap& bm, SkScalar left, SkScalar top,
-                               const SkPaint* paint) {
+void SkGPipeCanvas::onDrawBitmap(const SkBitmap& bm, SkScalar left, SkScalar top,
+                                 const SkPaint* paint) {
     NOTIFY_SETUP(this);
     size_t opBytesNeeded = sizeof(SkScalar) * 2;
 
@@ -797,12 +790,11 @@ void SkGPipeCanvas::drawBitmap(const SkBitmap& bm, SkScalar left, SkScalar top,
     }
 }
 
-void SkGPipeCanvas::drawBitmapRectToRect(const SkBitmap& bm, const SkRect* src,
-                                         const SkRect& dst, const SkPaint* paint,
-                                         DrawBitmapRectFlags dbmrFlags) {
+void SkGPipeCanvas::onDrawBitmapRect(const SkBitmap& bm, const SkRect* src, const SkRect& dst,
+                                     const SkPaint* paint, SrcRectConstraint constraint) {
     NOTIFY_SETUP(this);
     size_t opBytesNeeded = sizeof(SkRect);
-    bool hasSrc = src != NULL;
+    bool hasSrc = src != nullptr;
     unsigned flags;
     if (hasSrc) {
         flags = kDrawBitmap_HasSrcRect_DrawOpFlag;
@@ -810,11 +802,11 @@ void SkGPipeCanvas::drawBitmapRectToRect(const SkBitmap& bm, const SkRect* src,
     } else {
         flags = 0;
     }
-    if (dbmrFlags & kBleed_DrawBitmapRectFlag) {
+    if (kFast_SrcRectConstraint == constraint) {
         flags |= kDrawBitmap_Bleed_DrawOpFlag;
     }
 
-    if (this->commonDrawBitmap(bm, kDrawBitmapRectToRect_DrawOp, flags, opBytesNeeded, paint)) {
+    if (this->commonDrawBitmap(bm, kDrawBitmapRect_DrawOp, flags, opBytesNeeded, paint)) {
         if (hasSrc) {
             fWriter.writeRect(*src);
         }
@@ -822,18 +814,8 @@ void SkGPipeCanvas::drawBitmapRectToRect(const SkBitmap& bm, const SkRect* src,
     }
 }
 
-void SkGPipeCanvas::drawBitmapMatrix(const SkBitmap& bm, const SkMatrix& matrix,
-                                     const SkPaint* paint) {
-    NOTIFY_SETUP(this);
-    size_t opBytesNeeded = matrix.writeToMemory(NULL);
-
-    if (this->commonDrawBitmap(bm, kDrawBitmapMatrix_DrawOp, 0, opBytesNeeded, paint)) {
-        fWriter.writeMatrix(matrix);
-    }
-}
-
-void SkGPipeCanvas::drawBitmapNine(const SkBitmap& bm, const SkIRect& center,
-                                   const SkRect& dst, const SkPaint* paint) {
+void SkGPipeCanvas::onDrawBitmapNine(const SkBitmap& bm, const SkIRect& center,
+                                     const SkRect& dst, const SkPaint* paint) {
     NOTIFY_SETUP(this);
     size_t opBytesNeeded = sizeof(int32_t) * 4 + sizeof(SkRect);
 
@@ -846,8 +828,7 @@ void SkGPipeCanvas::drawBitmapNine(const SkBitmap& bm, const SkIRect& center,
     }
 }
 
-void SkGPipeCanvas::drawSprite(const SkBitmap& bm, int left, int top,
-                                   const SkPaint* paint) {
+void SkGPipeCanvas::onDrawSprite(const SkBitmap& bm, int left, int top, const SkPaint* paint) {
     NOTIFY_SETUP(this);
     size_t opBytesNeeded = sizeof(int32_t) * 2;
 
@@ -857,6 +838,64 @@ void SkGPipeCanvas::drawSprite(const SkBitmap& bm, int left, int top,
     }
 }
 
+bool SkGPipeCanvas::commonDrawImage(const SkImage* image, DrawOps op, unsigned flags,
+                                    size_t opBytesNeeded, const SkPaint* paint) {
+    if (fDone) {
+        return false;
+    }
+    
+    if (paint != nullptr) {
+        flags |= kDrawBitmap_HasPaint_DrawOpFlag;
+        this->writePaint(*paint);
+    }
+    // This needs to run first so its calls to needOpBytes() and its writes
+    // don't interlace with the needOpBytes() and write below.
+    int32_t slot = fImageHeap->insert(image);
+    SkASSERT(slot != 0);
+    if (this->needOpBytes(opBytesNeeded)) {
+        this->writeOp(op, flags, slot);
+        return true;
+    }
+    return false;
+}
+
+void SkGPipeCanvas::onDrawImage(const SkImage* image, SkScalar x, SkScalar y,
+                                const SkPaint* paint) {
+    NOTIFY_SETUP(this);
+    if (this->commonDrawImage(image, kDrawImage_DrawOp, 0, sizeof(SkScalar) * 2, paint)) {
+        fWriter.writeScalar(x);
+        fWriter.writeScalar(y);
+    }
+}
+
+void SkGPipeCanvas::onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
+                                    const SkPaint* paint, SrcRectConstraint constraint) {
+    NOTIFY_SETUP(this);
+    unsigned flags = 0;
+    size_t opBytesNeeded = sizeof(SkRect);  // dst
+    if (src) {
+        flags |= kDrawBitmap_HasSrcRect_DrawOpFlag;
+        opBytesNeeded += sizeof(SkRect);    // src
+    }
+    if (this->commonDrawImage(image, kDrawImageRect_DrawOp, flags, opBytesNeeded, paint)) {
+        if (src) {
+            fWriter.writeRect(*src);
+        }
+        fWriter.writeRect(dst);
+        fWriter.writeInt(constraint);
+    }
+}
+
+void SkGPipeCanvas::onDrawImageNine(const SkImage* image, const SkIRect& center, const SkRect& dst,
+                                    const SkPaint* paint) {
+    NOTIFY_SETUP(this);
+    size_t opBytesNeeded = sizeof(SkIRect) + sizeof(SkRect);  // center + dst
+    if (this->commonDrawImage(image, kDrawImageNine_DrawOp, 0, opBytesNeeded, paint)) {
+        fWriter.writeIRect(center);
+        fWriter.writeRect(dst);
+    }
+}
+
 void SkGPipeCanvas::onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
                                const SkPaint& paint) {
     if (byteLength) {
@@ -877,7 +916,7 @@ void SkGPipeCanvas::onDrawPosText(const void* text, size_t byteLength, const SkP
     if (byteLength) {
         NOTIFY_SETUP(this);
         this->writePaint(paint);
-        int count = paint.textToGlyphs(text, byteLength, NULL);
+        int count = paint.textToGlyphs(text, byteLength, nullptr);
         if (this->needOpBytes(4 + SkAlign4(byteLength) + 4 + count * sizeof(SkPoint))) {
             this->writeOp(kDrawPosText_DrawOp);
             fWriter.write32(SkToU32(byteLength));
@@ -893,7 +932,7 @@ void SkGPipeCanvas::onDrawPosTextH(const void* text, size_t byteLength, const Sk
     if (byteLength) {
         NOTIFY_SETUP(this);
         this->writePaint(paint);
-        int count = paint.textToGlyphs(text, byteLength, NULL);
+        int count = paint.textToGlyphs(text, byteLength, nullptr);
         if (this->needOpBytes(4 + SkAlign4(byteLength) + 4 + count * sizeof(SkScalar) + 4)) {
             this->writeOp(kDrawPosTextH_DrawOp);
             fWriter.write32(SkToU32(byteLength));
@@ -910,10 +949,10 @@ void SkGPipeCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const
     if (byteLength) {
         NOTIFY_SETUP(this);
         unsigned flags = 0;
-        size_t size = 4 + SkAlign4(byteLength) + path.writeToMemory(NULL);
+        size_t size = 4 + SkAlign4(byteLength) + path.writeToMemory(nullptr);
         if (matrix) {
             flags |= kDrawTextOnPath_HasMatrix_DrawOpFlag;
-            size += matrix->writeToMemory(NULL);
+            size += matrix->writeToMemory(nullptr);
         }
         this->writePaint(paint);
         if (this->needOpBytes(size)) {
@@ -930,16 +969,94 @@ void SkGPipeCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const
     }
 }
 
-void SkGPipeCanvas::onDrawPicture(const SkPicture* picture) {
-    // we want to playback the picture into individual draw calls
-    this->INHERITED::onDrawPicture(picture);
+size_t SkGPipeCanvas::getInProcessTypefaces(const SkRefCntSet& typefaceSet,
+                                            TypefaceBuffer* buffer) {
+    // When in-process, we simply write out the typeface pointers.
+    size_t size = typefaceSet.count() * sizeof(SkTypeface*);
+    buffer->reset(size);
+    typefaceSet.copyToArray(reinterpret_cast<SkRefCnt**>(buffer->get()));
+
+    return size;
 }
 
-void SkGPipeCanvas::drawVertices(VertexMode vmode, int vertexCount,
-                                 const SkPoint vertices[], const SkPoint texs[],
-                                 const SkColor colors[], SkXfermode* xfer,
-                                 const uint16_t indices[], int indexCount,
-                                 const SkPaint& paint) {
+size_t SkGPipeCanvas::getCrossProcessTypefaces(const SkRefCntSet& typefaceSet,
+                                               TypefaceBuffer* buffer) {
+    // For cross-process we use typeface IDs.
+    size_t size = typefaceSet.count() * sizeof(uint32_t);
+    buffer->reset(size);
+
+    uint32_t* idBuffer = reinterpret_cast<uint32_t*>(buffer->get());
+    SkRefCntSet::Iter iter(typefaceSet);
+    int i = 0;
+
+    for (void* setPtr = iter.next(); setPtr; setPtr = iter.next()) {
+        idBuffer[i++] = this->getTypefaceID(reinterpret_cast<SkTypeface*>(setPtr));
+    }
+
+    SkASSERT(i == typefaceSet.count());
+
+    return size;
+}
+
+void SkGPipeCanvas::onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
+                                   const SkPaint& paint) {
+    NOTIFY_SETUP(this);
+    this->writePaint(paint);
+
+    // FIXME: this is inefficient but avoids duplicating the blob serialization logic.
+    SkRefCntSet typefaceSet;
+    SkWriteBuffer blobBuffer;
+    blobBuffer.setTypefaceRecorder(&typefaceSet);
+    blob->flatten(blobBuffer);
+
+    // Unlike most draw ops (which only use one paint/typeface), text blobs may reference
+    // an arbitrary number of typefaces. Since the one-paint-per-op model is not applicable,
+    // we need to serialize these explicitly.
+    TypefaceBuffer typefaceBuffer;
+    size_t typefaceSize = is_cross_process(fFlags)
+        ? this->getCrossProcessTypefaces(typefaceSet, &typefaceBuffer)
+        : this->getInProcessTypefaces(typefaceSet, &typefaceBuffer);
+
+    // blob byte count + typeface count + x + y + blob data + an index (cross-process)
+    // or pointer (in-process) for each typeface
+    size_t size = 2 * sizeof(uint32_t)
+                + 2 * sizeof(SkScalar)
+                + blobBuffer.bytesWritten()
+                + typefaceSize;
+
+    if (this->needOpBytes(size)) {
+        this->writeOp(kDrawTextBlob_DrawOp);
+        SkDEBUGCODE(size_t initialOffset = fWriter.bytesWritten();)
+
+        fWriter.writeScalar(x);
+        fWriter.writeScalar(y);
+
+        fWriter.write32(typefaceSet.count());
+        fWriter.write(typefaceBuffer.get(), typefaceSize);
+
+        fWriter.write32(SkToU32(blobBuffer.bytesWritten()));
+        uint32_t* pad = fWriter.reservePad(blobBuffer.bytesWritten());
+        blobBuffer.writeToMemory(pad);
+
+        SkASSERT(initialOffset + size == fWriter.bytesWritten());
+    }
+}
+
+void SkGPipeCanvas::onDrawPicture(const SkPicture* picture, const SkMatrix* matrix,
+                                  const SkPaint* paint) {
+    // we want to playback the picture into individual draw calls
+    //
+    // todo: do we always have to unroll? If the pipe is not cross-process, seems like
+    // we could just ref the picture and move on...? <reed, scroggo>
+    //
+    this->INHERITED::onDrawPicture(picture, matrix, paint);
+}
+
+void SkGPipeCanvas::onDrawVertices(VertexMode vmode, int vertexCount,
+                                   const SkPoint vertices[], const SkPoint texs[],
+                                   const SkColor colors[], SkXfermode* xfer,
+                                   const uint16_t indices[], int indexCount,
+                                   const SkPaint& paint) {
     if (0 == vertexCount) {
         return;
     }
@@ -995,33 +1112,91 @@ void SkGPipeCanvas::drawVertices(VertexMode vmode, int vertexCount,
     }
 }
 
-void SkGPipeCanvas::drawData(const void* ptr, size_t size) {
-    if (size && ptr) {
-        NOTIFY_SETUP(this);
-        unsigned data = 0;
-        if (size < (1 << DRAWOPS_DATA_BITS)) {
-            data = (unsigned)size;
+void SkGPipeCanvas::onDrawAtlas(const SkImage* atlas, const SkRSXform xform[], const SkRect tex[],
+                                const SkColor colors[], int count, SkXfermode::Mode mode,
+                                const SkRect* cull, const SkPaint* paint) {
+    NOTIFY_SETUP(this);
+    unsigned flags = 0;  // packs with the op, so needs no extra space
+
+    if (paint) {
+        flags |= kDrawAtlas_HasPaint_DrawOpFlag;
+        this->writePaint(*paint);
+    }
+
+    size_t size = 4;                        // image-slot
+    size += 4;                              // count
+    size += 4;                              // mode
+    size += count * sizeof(SkRSXform);      // xform
+    size += count * sizeof(SkRect);         // tex
+    if (colors) {
+        flags |= kDrawAtlas_HasColors_DrawOpFlag;
+        size += count * sizeof(SkColor);    // colors
+    }
+    if (cull) {
+        flags |= kDrawAtlas_HasCull_DrawOpFlag;
+        size += sizeof(SkRect);             // cull
+    }
+    
+    if (this->needOpBytes(size)) {
+        this->writeOp(kDrawAtlas_DrawOp, flags, 0);
+        int32_t slot = fImageHeap->insert(atlas);
+        fWriter.write32(slot);
+        fWriter.write32(count);
+        fWriter.write32(mode);
+        fWriter.write(xform, count * sizeof(SkRSXform));
+        fWriter.write(tex, count * sizeof(SkRect));
+        if (colors) {
+            fWriter.write(colors, count * sizeof(SkColor));
         }
-        if (this->needOpBytes(4 + SkAlign4(size))) {
-            this->writeOp(kDrawData_DrawOp, 0, data);
-            if (0 == data) {
-                fWriter.write32(SkToU32(size));
-            }
-            fWriter.writePad(ptr, size);
+        if (cull) {
+            fWriter.writeRect(*cull);
         }
     }
 }
 
-void SkGPipeCanvas::beginCommentGroup(const char* description) {
-    // ignore for now
-}
-
-void SkGPipeCanvas::addComment(const char* kywd, const char* value) {
-    // ignore for now
-}
-
-void SkGPipeCanvas::endCommentGroup() {
-    // ignore for now
+void SkGPipeCanvas::onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
+                                const SkPoint texCoords[4], SkXfermode* xmode,
+                                const SkPaint& paint) {
+    NOTIFY_SETUP(this);
+    
+    size_t size = SkPatchUtils::kNumCtrlPts * sizeof(SkPoint);
+    unsigned flags = 0;
+    if (colors) {
+        flags |= kDrawVertices_HasColors_DrawOpFlag;
+        size += SkPatchUtils::kNumCorners * sizeof(SkColor);
+    }
+    if (texCoords) {
+        flags |= kDrawVertices_HasTexs_DrawOpFlag;
+        size += SkPatchUtils::kNumCorners * sizeof(SkPoint);
+    }
+    if (xmode) {
+        SkXfermode::Mode mode;
+        if (xmode->asMode(&mode) && SkXfermode::kModulate_Mode != mode) {
+            flags |= kDrawVertices_HasXfermode_DrawOpFlag;
+            size += sizeof(int32_t);
+        }
+    }
+    
+    this->writePaint(paint);
+    if (this->needOpBytes(size)) {
+        this->writeOp(kDrawPatch_DrawOp, flags, 0);
+        
+        fWriter.write(cubics, SkPatchUtils::kNumCtrlPts * sizeof(SkPoint));
+        
+        if (colors) {
+            fWriter.write(colors, SkPatchUtils::kNumCorners * sizeof(SkColor));
+        }
+        
+        if (texCoords) {
+            fWriter.write(texCoords, SkPatchUtils::kNumCorners * sizeof(SkPoint));
+        }
+        
+        if (flags & kDrawVertices_HasXfermode_DrawOpFlag) {
+            SkXfermode::Mode mode = SkXfermode::kModulate_Mode;
+            SkAssertResult(xmode->asMode(&mode));
+            fWriter.write32(mode);
+        }
+    }
 }
 
 void SkGPipeCanvas::flushRecording(bool detachCurrentBlock) {
@@ -1032,8 +1207,14 @@ void SkGPipeCanvas::flushRecording(bool detachCurrentBlock) {
     }
 }
 
+void SkGPipeCanvas::resetImageHeap() {
+    if (fImageHeap) {
+        fImageHeap->reset();
+    }
+}
+
 size_t SkGPipeCanvas::freeMemoryIfPossible(size_t bytesToFree) {
-    return (NULL == fBitmapHeap) ? 0 : fBitmapHeap->freeMemoryIfPossible(bytesToFree);
+    return (nullptr == fBitmapHeap) ? 0 : fBitmapHeap->freeMemoryIfPossible(bytesToFree);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1064,9 +1245,9 @@ void SkGPipeCanvas::writePaint(const SkPaint& paint) {
         *ptr++ = paint.getColor();
         base.setColor(paint.getColor());
     }
-    if (base.getFilterLevel() != paint.getFilterLevel()) {
-        *ptr++ = PaintOp_packOpData(kFilterLevel_PaintOp, paint.getFilterLevel());
-        base.setFilterLevel(paint.getFilterLevel());
+    if (base.getFilterQuality() != paint.getFilterQuality()) {
+        *ptr++ = PaintOp_packOpData(kFilterLevel_PaintOp, paint.getFilterQuality());
+        base.setFilterQuality(paint.getFilterQuality());
     }
     if (base.getStyle() != paint.getStyle()) {
         *ptr++ = PaintOp_packOpData(kStyle_PaintOp, paint.getStyle());
@@ -1119,7 +1300,7 @@ void SkGPipeCanvas::writePaint(const SkPaint& paint) {
     }
 
     if (!SkTypeface::Equal(base.getTypeface(), paint.getTypeface())) {
-        if (isCrossProcess(fFlags)) {
+        if (is_cross_process(fFlags)) {
             uint32_t id = this->getTypefaceID(paint.getTypeface());
             *ptr++ = PaintOp_packOpData(kTypeface_PaintOp, id);
         } else if (this->needOpBytes(sizeof(void*))) {
@@ -1166,7 +1347,7 @@ void SkGPipeCanvas::writePaint(const SkPaint& paint) {
     //  Do these after we've written kPaintOp_DrawOp
 
     if (base.getAnnotation() != paint.getAnnotation()) {
-        if (NULL == paint.getAnnotation()) {
+        if (nullptr == paint.getAnnotation()) {
             if (this->needOpBytes()) {
                 this->writeOp(kSetAnnotation_DrawOp, 0, 0);
             }
@@ -1195,11 +1376,19 @@ void SkGPipeController::setCanvas(SkGPipeCanvas* canvas) {
     SkRefCnt_SafeAssign(fCanvas, canvas);
 }
 
+void SkGPipeController::purgeCaches()
+{
+    fCanvas->resetImageHeap();
+    // Other caches are self-purging with a small MRU pool
+    // We could purge them as well, but it is not clear whether
+    // that would be a win.
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 SkGPipeWriter::SkGPipeWriter()
 : fWriter(0) {
-    fCanvas = NULL;
+    fCanvas = nullptr;
 }
 
 SkGPipeWriter::~SkGPipeWriter() {
@@ -1208,9 +1397,9 @@ SkGPipeWriter::~SkGPipeWriter() {
 
 SkCanvas* SkGPipeWriter::startRecording(SkGPipeController* controller, uint32_t flags,
                                         uint32_t width, uint32_t height) {
-    if (NULL == fCanvas) {
-        fWriter.reset(NULL, 0);
-        fCanvas = SkNEW_ARGS(SkGPipeCanvas, (controller, &fWriter, flags, width, height));
+    if (nullptr == fCanvas) {
+        fWriter.reset(nullptr, 0);
+        fCanvas = new SkGPipeCanvas(controller, &fWriter, flags, width, height);
     }
     controller->setCanvas(fCanvas);
     return fCanvas;
@@ -1220,7 +1409,7 @@ void SkGPipeWriter::endRecording() {
     if (fCanvas) {
         fCanvas->finish(true);
         fCanvas->unref();
-        fCanvas = NULL;
+        fCanvas = nullptr;
     }
 }
 
@@ -1238,13 +1427,13 @@ size_t SkGPipeWriter::freeMemoryIfPossible(size_t bytesToFree) {
 }
 
 size_t SkGPipeWriter::storageAllocatedForRecording() const {
-    return NULL == fCanvas ? 0 : fCanvas->storageAllocatedForRecording();
+    return nullptr == fCanvas ? 0 : fCanvas->storageAllocatedForRecording();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 BitmapShuttle::BitmapShuttle(SkGPipeCanvas* canvas) {
-    SkASSERT(canvas != NULL);
+    SkASSERT(canvas != nullptr);
     fCanvas = canvas;
     fCanvas->ref();
 }
@@ -1254,14 +1443,53 @@ BitmapShuttle::~BitmapShuttle() {
 }
 
 bool BitmapShuttle::insert(const SkBitmap& bitmap, int32_t slot) {
-    SkASSERT(fCanvas != NULL);
+    SkASSERT(fCanvas != nullptr);
     return fCanvas->shuttleBitmap(bitmap, slot);
 }
 
 void BitmapShuttle::removeCanvas() {
-    if (NULL == fCanvas) {
+    if (nullptr == fCanvas) {
         return;
     }
     fCanvas->unref();
-    fCanvas = NULL;
+    fCanvas = nullptr;
 }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+SkImageHeap::SkImageHeap() : fBytesInCache (0) {}
+
+SkImageHeap::~SkImageHeap() {
+    fArray.unrefAll();
+}
+
+void SkImageHeap::reset() {
+    fArray.unrefAll();
+    fArray.rewind();
+    fBytesInCache = 0;
+}
+
+const SkImage* SkImageHeap::get(int32_t slot) const {
+    SkASSERT(slot > 0);
+    return fArray[slot - 1];
+}
+
+int32_t SkImageHeap::find(const SkImage* img) const {
+    int index = fArray.find(img);
+    if (index >= 0) {
+        return index + 1;   // found
+    }
+    return 0;   // not found
+}
+
+int32_t SkImageHeap::insert(const SkImage* img) {
+    int32_t slot = this->find(img);
+    if (slot) {
+        return slot;
+    }
+    // TODO: SkImage does not expose bytes per pixel, 4 is just a best guess.
+    fBytesInCache += img->width() * img->height() * 4;
+    *fArray.append() = SkRef(img);
+    return fArray.count();  // slot is always index+1
+}
+
diff --git a/gfx/skia/skia/src/pipe/utils/SamplePipeControllers.cpp b/gfx/skia/skia/src/pipe/utils/SamplePipeControllers.cpp
index ea2c39cff0cb..fea9d6842b7f 100644
--- a/gfx/skia/skia/src/pipe/utils/SamplePipeControllers.cpp
+++ b/gfx/skia/skia/src/pipe/utils/SamplePipeControllers.cpp
@@ -7,14 +7,13 @@
 
 #include "SamplePipeControllers.h"
 
-#include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkGPipe.h"
 #include "SkMatrix.h"
 
 PipeController::PipeController(SkCanvas* target, SkPicture::InstallPixelRefProc proc)
 :fReader(target) {
-    fBlock = NULL;
+    fBlock = nullptr;
     fBlockSize = fBytesWritten = 0;
     fReader.setBitmapDecoder(proc);
 }
@@ -43,7 +42,7 @@ void PipeController::notifyWritten(size_t bytes) {
 TiledPipeController::TiledPipeController(const SkBitmap& bitmap,
                                          SkPicture::InstallPixelRefProc proc,
                                          const SkMatrix* initial)
-: INHERITED(NULL, proc) {
+: INHERITED(nullptr, proc) {
     int32_t top = 0;
     int32_t bottom;
     int32_t height = bitmap.height() / NumberOfTiles;
@@ -55,10 +54,8 @@ TiledPipeController::TiledPipeController(const SkBitmap& bitmap,
 
         SkDEBUGCODE(bool extracted = )bitmap.extractSubset(&fBitmaps[i], rect);
         SkASSERT(extracted);
-        SkBaseDevice* device = new SkBitmapDevice(fBitmaps[i]);
-        SkCanvas* canvas = new SkCanvas(device);
-        device->unref();
-        if (initial != NULL) {
+        SkCanvas* canvas = new SkCanvas(fBitmaps[i]);
+        if (initial != nullptr) {
             canvas->setMatrix(*initial);
         }
         canvas->translate(SkIntToScalar(-rect.left()),
@@ -85,7 +82,7 @@ void TiledPipeController::notifyWritten(size_t bytes) {
 ThreadSafePipeController::ThreadSafePipeController(int numberOfReaders)
 : fAllocator(kMinBlockSize)
 , fNumberOfReaders(numberOfReaders) {
-    fBlock = NULL;
+    fBlock = nullptr;
     fBytesWritten = 0;
 }
 
diff --git a/gfx/skia/skia/src/pipe/utils/SamplePipeControllers.h b/gfx/skia/skia/src/pipe/utils/SamplePipeControllers.h
index 35cfba73b65e..b3f057fa8c54 100644
--- a/gfx/skia/skia/src/pipe/utils/SamplePipeControllers.h
+++ b/gfx/skia/skia/src/pipe/utils/SamplePipeControllers.h
@@ -16,10 +16,10 @@ class SkMatrix;
 
 class PipeController : public SkGPipeController {
 public:
-    PipeController(SkCanvas* target, SkPicture::InstallPixelRefProc proc = NULL);
+    PipeController(SkCanvas* target, SkPicture::InstallPixelRefProc proc = nullptr);
     virtual ~PipeController();
-    virtual void* requestBlock(size_t minRequest, size_t* actual) SK_OVERRIDE;
-    virtual void notifyWritten(size_t bytes) SK_OVERRIDE;
+    void* requestBlock(size_t minRequest, size_t* actual) override;
+    void notifyWritten(size_t bytes) override;
 protected:
     const void* getData() { return (const char*) fBlock + fBytesWritten; }
     SkGPipeReader fReader;
@@ -34,11 +34,11 @@ private:
 
 class TiledPipeController : public PipeController {
 public:
-    TiledPipeController(const SkBitmap&, SkPicture::InstallPixelRefProc proc = NULL,
-                        const SkMatrix* initialMatrix = NULL);
+    TiledPipeController(const SkBitmap&, SkPicture::InstallPixelRefProc proc = nullptr,
+                        const SkMatrix* initialMatrix = nullptr);
     virtual ~TiledPipeController() {};
-    virtual void notifyWritten(size_t bytes) SK_OVERRIDE;
-    virtual int numberOfReaders() const SK_OVERRIDE { return NumberOfTiles; }
+    void notifyWritten(size_t bytes) override;
+    int numberOfReaders() const override { return NumberOfTiles; }
 private:
     enum {
         NumberOfTiles = 10
@@ -57,9 +57,9 @@ private:
 class ThreadSafePipeController : public SkGPipeController {
 public:
     ThreadSafePipeController(int numberOfReaders);
-    virtual void* requestBlock(size_t minRequest, size_t* actual) SK_OVERRIDE;
-    virtual void notifyWritten(size_t bytes) SK_OVERRIDE;
-    virtual int numberOfReaders() const SK_OVERRIDE { return fNumberOfReaders; }
+    void* requestBlock(size_t minRequest, size_t* actual) override;
+    void notifyWritten(size_t bytes) override;
+    int numberOfReaders() const override { return fNumberOfReaders; }
 
     /**
      * Play the stored drawing commands to the specified canvas. If SkGPipeWriter::startRecording
diff --git a/gfx/skia/skia/src/ports/SkAtomics_sync.h b/gfx/skia/skia/src/ports/SkAtomics_sync.h
deleted file mode 100644
index 9389c00103a0..000000000000
--- a/gfx/skia/skia/src/ports/SkAtomics_sync.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkAtomics_sync_DEFINED
-#define SkAtomics_sync_DEFINED
-
-/** GCC/Clang __sync based atomics. */
-
-#include <stdint.h>
-
-static inline __attribute__((always_inline)) int32_t sk_atomic_inc(int32_t* addr) {
-    return __sync_fetch_and_add(addr, 1);
-}
-
-static inline __attribute__((always_inline)) int64_t sk_atomic_inc(int64_t* addr) {
-#if defined(__mips__) && !defined(__LP64__) && !defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8)
-    /** Some versions of the GCC 32-bit MIPS toolchains (e.g. 4.8) for android are missing
-     * support for the __sync* functions that operate on 64-bit values. The workaround
-     * is to use __atomic* functions until we can move everything to <stdatomic.h>.
-     */
-    return __atomic_fetch_add(addr, 1, __ATOMIC_SEQ_CST);
-#else
-    return __sync_fetch_and_add(addr, 1);
-#endif
-}
-
-static inline __attribute__((always_inline)) int32_t sk_atomic_add(int32_t* addr, int32_t inc) {
-    return __sync_fetch_and_add(addr, inc);
-}
-
-static inline __attribute__((always_inline)) int32_t sk_atomic_dec(int32_t* addr) {
-    return __sync_fetch_and_add(addr, -1);
-}
-
-static inline __attribute__((always_inline)) void sk_membar_acquire__after_atomic_dec() { }
-
-static inline __attribute__((always_inline)) bool sk_atomic_cas(int32_t* addr,
-                                                                int32_t before,
-                                                                int32_t after) {
-    return __sync_bool_compare_and_swap(addr, before, after);
-}
-
-static inline __attribute__((always_inline)) void* sk_atomic_cas(void** addr,
-                                                                 void* before,
-                                                                 void* after) {
-    return __sync_val_compare_and_swap(addr, before, after);
-}
-
-static inline __attribute__((always_inline)) void sk_membar_acquire__after_atomic_conditional_inc() { }
-
-#endif
diff --git a/gfx/skia/skia/src/ports/SkAtomics_win.h b/gfx/skia/skia/src/ports/SkAtomics_win.h
deleted file mode 100644
index a1876d269b88..000000000000
--- a/gfx/skia/skia/src/ports/SkAtomics_win.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkAtomics_win_DEFINED
-#define SkAtomics_win_DEFINED
-
-/** Windows Interlocked atomics. */
-
-#include <intrin.h>
-#include <stdint.h>
-
-//MSDN says in order to declare an interlocked function for use as an
-//intrinsic, include intrin.h and put the function in a #pragma intrinsic
-//directive.
-//The pragma appears to be unnecessary, but doesn't hurt.
-#pragma intrinsic(_InterlockedIncrement, _InterlockedExchangeAdd, _InterlockedDecrement)
-#pragma intrinsic(_InterlockedCompareExchange)
-
-static inline int32_t sk_atomic_inc(int32_t* addr) {
-    // InterlockedIncrement returns the new value, we want to return the old.
-    return _InterlockedIncrement(reinterpret_cast<long*>(addr)) - 1;
-}
-
-static inline int64_t sk_atomic_inc(int64_t* addr) {
-    // InterlockedIncrement returns the new value, we want to return the old.
-    return InterlockedIncrement64(addr) - 1;
-}
-
-static inline int32_t sk_atomic_add(int32_t* addr, int32_t inc) {
-    return _InterlockedExchangeAdd(reinterpret_cast<long*>(addr), static_cast<long>(inc));
-}
-
-static inline int32_t sk_atomic_dec(int32_t* addr) {
-    // InterlockedDecrement returns the new value, we want to return the old.
-    return _InterlockedDecrement(reinterpret_cast<long*>(addr)) + 1;
-}
-
-static inline void sk_membar_acquire__after_atomic_dec() { }
-
-static inline bool sk_atomic_cas(int32_t* addr, int32_t before, int32_t after) {
-    return _InterlockedCompareExchange(reinterpret_cast<long*>(addr), after, before) == before;
-}
-
-static inline void* sk_atomic_cas(void** addr, void* before, void* after) {
-    return InterlockedCompareExchangePointer(addr, after, before);
-}
-
-static inline void sk_membar_acquire__after_atomic_conditional_inc() { }
-
-#endif
diff --git a/gfx/skia/skia/src/ports/SkBarriers_arm.h b/gfx/skia/skia/src/ports/SkBarriers_arm.h
deleted file mode 100644
index 386294e9b1fc..000000000000
--- a/gfx/skia/skia/src/ports/SkBarriers_arm.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkBarriers_arm_DEFINED
-#define SkBarriers_arm_DEFINED
-
-static inline void sk_compiler_barrier() { asm volatile("" : : : "memory"); }
-
-template <typename T>
-T sk_acquire_load(T* ptr) {
-    T val = *ptr;
-    __sync_synchronize();  // Issue a full barrier, which is an overkill acquire barrier.
-    return val;
-}
-
-template <typename T>
-T sk_consume_load(T* ptr) {
-    T val = *ptr;
-    // Unlike acquire, consume loads (data-dependent loads) are guaranteed not to reorder on ARM.
-    // No memory barrier is needed, so we just use a compiler barrier.
-    // C.f. http://preshing.com/20140709/the-purpose-of-memory_order_consume-in-cpp11/
-    sk_compiler_barrier();
-    return val;
-}
-
-template <typename T>
-void sk_release_store(T* ptr, T val) {
-    __sync_synchronize();  // Issue a full barrier, which is an overkill release barrier.
-    *ptr = val;
-}
-
-#endif//SkBarriers_x86_DEFINED
diff --git a/gfx/skia/skia/src/ports/SkBarriers_tsan.h b/gfx/skia/skia/src/ports/SkBarriers_tsan.h
deleted file mode 100644
index d72dbfd390ef..000000000000
--- a/gfx/skia/skia/src/ports/SkBarriers_tsan.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkBarriers_tsan_DEFINED
-#define SkBarriers_tsan_DEFINED
-
-static inline void sk_compiler_barrier() { asm volatile("" : : : "memory"); }
-
-template <typename T>
-T sk_acquire_load(T* ptr) {
-    SkASSERT(__atomic_always_lock_free(sizeof(T), ptr));
-    return __atomic_load_n(ptr, __ATOMIC_ACQUIRE);
-}
-
-template <typename T>
-T sk_consume_load(T* ptr) {
-    SkASSERT(__atomic_always_lock_free(sizeof(T), ptr));
-    return __atomic_load_n(ptr, __ATOMIC_CONSUME);
-}
-
-template <typename T>
-void sk_release_store(T* ptr, T val) {
-    SkASSERT(__atomic_always_lock_free(sizeof(T), ptr));
-    return __atomic_store_n(ptr, val, __ATOMIC_RELEASE);
-}
-
-#endif//SkBarriers_tsan_DEFINED
diff --git a/gfx/skia/skia/src/ports/SkBarriers_x86.h b/gfx/skia/skia/src/ports/SkBarriers_x86.h
deleted file mode 100644
index 56e2658e9723..000000000000
--- a/gfx/skia/skia/src/ports/SkBarriers_x86.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkBarriers_x86_DEFINED
-#define SkBarriers_x86_DEFINED
-
-#ifdef SK_BUILD_FOR_WIN
-#  include <intrin.h>
-static inline void sk_compiler_barrier() { _ReadWriteBarrier(); }
-#else
-static inline void sk_compiler_barrier() { asm volatile("" : : : "memory"); }
-#endif
-
-template <typename T>
-T sk_acquire_load(T* ptr) {
-    T val = *ptr;
-    // On x86, all loads are acquire loads, so we only need a compiler barrier.
-    sk_compiler_barrier();
-    return val;
-}
-
-template <typename T>
-T sk_consume_load(T* ptr) {
-    // On x86, consume is the same as acquire, i.e. a normal load.
-    return sk_acquire_load(ptr);
-}
-
-template <typename T>
-void sk_release_store(T* ptr, T val) {
-    // On x86, all stores are release stores, so we only need a compiler barrier.
-    sk_compiler_barrier();
-    *ptr = val;
-}
-
-#endif//SkBarriers_x86_DEFINED
diff --git a/gfx/skia/skia/src/ports/SkDebug_android.cpp b/gfx/skia/skia/src/ports/SkDebug_android.cpp
index b41abd309110..0a1b59a2cd0a 100644
--- a/gfx/skia/skia/src/ports/SkDebug_android.cpp
+++ b/gfx/skia/skia/src/ports/SkDebug_android.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,33 +5,32 @@
  * found in the LICENSE file.
  */
 
-
 #include "SkTypes.h"
-#include <stdio.h>
+#if defined(SK_BUILD_FOR_ANDROID)
 
-static const size_t kBufferSize = 256;
+#include <stdio.h>
 
 #define LOG_TAG "skia"
 #include <android/log.h>
 
-static bool gSkDebugToStdOut = false;
-
-extern "C" void AndroidSkDebugToStdOut(bool debugToStdOut) {
-    gSkDebugToStdOut = debugToStdOut;
-}
+// Print debug output to stdout as well.  This is useful for command line
+// applications (e.g. skia_launcher). To enable, include android_output as a
+// gyp dependency.
+bool gSkDebugToStdOut = false;
 
 void SkDebugf(const char format[], ...) {
     va_list args1, args2;
     va_start(args1, format);
-    va_copy(args2, args1);
-    __android_log_vprint(ANDROID_LOG_DEBUG, LOG_TAG, format, args1);
 
-    // Print debug output to stdout as well.  This is useful for command
-    // line applications (e.g. skia_launcher)
     if (gSkDebugToStdOut) {
+        va_copy(args2, args1);
         vprintf(format, args2);
+        va_end(args2);
     }
 
+    __android_log_vprint(ANDROID_LOG_DEBUG, LOG_TAG, format, args1);
+
     va_end(args1);
-    va_end(args2);
 }
+
+#endif//defined(SK_BUILD_FOR_ANDROID)
diff --git a/gfx/skia/skia/src/ports/SkDebug_nacl.cpp b/gfx/skia/skia/src/ports/SkDebug_nacl.cpp
deleted file mode 100644
index 6e35f0965ae6..000000000000
--- a/gfx/skia/skia/src/ports/SkDebug_nacl.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-
-#include "SkTypes.h"
-
-static const size_t kBufferSize = 2048;
-
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "ppapi/cpp/instance.h"
-#include "ppapi/cpp/var.h"
-
-extern pp::Instance* gPluginInstance;
-
-namespace {
-static const char* kLogPrefix = "SkDebugf:";
-}
-
-void SkDebugf(const char format[], ...) {
-    if (gPluginInstance) {
-        char buffer[kBufferSize + 1];
-        va_list args;
-        va_start(args, format);
-        sprintf(buffer, kLogPrefix);
-        vsnprintf(buffer + strlen(kLogPrefix), kBufferSize, format, args);
-        va_end(args);
-        pp::Var msg = pp::Var(buffer);
-        gPluginInstance->PostMessage(msg);
-    }
-}
diff --git a/gfx/skia/skia/src/ports/SkDebug_stdio.cpp b/gfx/skia/skia/src/ports/SkDebug_stdio.cpp
index 8ff27ade3ccf..230c5f2c5d42 100644
--- a/gfx/skia/skia/src/ports/SkDebug_stdio.cpp
+++ b/gfx/skia/skia/src/ports/SkDebug_stdio.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-
 #include "SkTypes.h"
+#if !defined(SK_BUILD_FOR_WIN32) && !defined(SK_BUILD_FOR_ANDROID)
 
 #include <stdarg.h>
 #include <stdio.h>
@@ -18,3 +17,4 @@ void SkDebugf(const char format[], ...) {
     vfprintf(stderr, format, args);
     va_end(args);
 }
+#endif//!defined(SK_BUILD_FOR_WIN32) && !defined(SK_BUILD_FOR_ANDROID)
diff --git a/gfx/skia/skia/src/ports/SkDebug_win.cpp b/gfx/skia/skia/src/ports/SkDebug_win.cpp
index fe28ee27b1ce..6e0576652f54 100644
--- a/gfx/skia/skia/src/ports/SkDebug_win.cpp
+++ b/gfx/skia/skia/src/ports/SkDebug_win.cpp
@@ -9,6 +9,7 @@
 
 
 #include "SkTypes.h"
+#if defined(SK_BUILD_FOR_WIN32)
 
 static const size_t kBufferSize = 2048;
 
@@ -21,11 +22,9 @@ void SkDebugf(const char format[], ...) {
     va_list args;
 
     va_start(args, format);
-    vprintf(format, args);
+    vfprintf(stderr, format, args);
     va_end(args);
-    // When we crash on Windows we often are missing a lot of prints. Since we don't really care
-    // about SkDebugf performance we flush after every print.
-    fflush(stdout);
+    fflush(stderr);  // stderr seems to be buffered on Windows.
 
     va_start(args, format);
     vsnprintf(buffer, kBufferSize, format, args);
@@ -33,3 +32,4 @@ void SkDebugf(const char format[], ...) {
 
     OutputDebugStringA(buffer);
 }
+#endif//defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/src/ports/SkDiscardableMemory_none.cpp b/gfx/skia/skia/src/ports/SkDiscardableMemory_none.cpp
index 51c3164dfa6e..7e5c0aeadec6 100644
--- a/gfx/skia/skia/src/ports/SkDiscardableMemory_none.cpp
+++ b/gfx/skia/skia/src/ports/SkDiscardableMemory_none.cpp
@@ -5,6 +5,7 @@
  * found in the LICENSE file.
  */
 
+#include "SkDiscardableMemory.h"
 #include "SkDiscardableMemoryPool.h"
 #include "SkTypes.h"
 
diff --git a/gfx/skia/skia/src/ports/SkFontConfigInterface_android.cpp b/gfx/skia/skia/src/ports/SkFontConfigInterface_android.cpp
deleted file mode 100644
index bdc3d5092a53..000000000000
--- a/gfx/skia/skia/src/ports/SkFontConfigInterface_android.cpp
+++ /dev/null
@@ -1,743 +0,0 @@
-
-/*
- * Copyright 2013 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkFontConfigInterface.h"
-#include "SkTypeface_android.h"
-
-#include "SkFontConfigParser_android.h"
-#include "SkFontConfigTypeface.h"
-#include "SkFontHost_FreeType_common.h"
-#include "SkFontMgr.h"
-#include "SkGlyphCache.h"
-#include "SkPaint.h"
-#include "SkString.h"
-#include "SkStream.h"
-#include "SkThread.h"
-#include "SkTypefaceCache.h"
-#include "SkTArray.h"
-#include "SkTDict.h"
-#include "SkTSearch.h"
-
-#include <stdio.h>
-#include <string.h>
-
-#ifndef SK_DEBUG_FONTS
-    #define SK_DEBUG_FONTS 0
-#endif
-
-#if SK_DEBUG_FONTS
-    #define DEBUG_FONT(args) SkDebugf args
-#else
-    #define DEBUG_FONT(args)
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-
-// For test only.
-static const char* gTestMainConfigFile = NULL;
-static const char* gTestFallbackConfigFile = NULL;
-static const char* gTestFontFilePrefix = NULL;
-
-///////////////////////////////////////////////////////////////////////////////
-
-typedef int32_t FontRecID;
-#define INVALID_FONT_REC_ID -1
-
-typedef int32_t FamilyRecID;
-#define INVALID_FAMILY_REC_ID -1
-
-// used to record our notion of the pre-existing fonts
-struct FontRec {
-    SkAutoTUnref<SkTypeface> fTypeface;
-    SkString fFileName;
-    SkTypeface::Style fStyle;
-    bool fIsValid;
-    FamilyRecID fFamilyRecID;
-};
-
-struct FamilyRec {
-    FamilyRec() {
-        memset(fFontRecID, INVALID_FONT_REC_ID, sizeof(fFontRecID));
-    }
-
-    static const int FONT_STYLE_COUNT = 4;
-    FontRecID fFontRecID[FONT_STYLE_COUNT];
-    bool fIsFallbackFont;
-    SkString fFallbackName;
-    SkPaintOptionsAndroid fPaintOptions;
-};
-
-
-typedef SkTDArray<FamilyRecID> FallbackFontList;
-
-class SkFontConfigInterfaceAndroid : public SkFontConfigInterface {
-public:
-    SkFontConfigInterfaceAndroid(SkTDArray<FontFamily*>& fontFamilies);
-    virtual ~SkFontConfigInterfaceAndroid();
-
-    virtual bool matchFamilyName(const char familyName[],
-                                 SkTypeface::Style requested,
-                                 FontIdentity* outFontIdentifier,
-                                 SkString* outFamilyName,
-                                 SkTypeface::Style* outStyle) SK_OVERRIDE;
-    virtual SkStream* openStream(const FontIdentity&) SK_OVERRIDE;
-
-    // new APIs
-    virtual SkDataTable* getFamilyNames() SK_OVERRIDE;
-    virtual bool matchFamilySet(const char inFamilyName[],
-                                SkString* outFamilyName,
-                                SkTArray<FontIdentity>*) SK_OVERRIDE;
-
-    /**
-     *  Get the family name of the font in the default fallback font list that
-     *  contains the specified chararacter. if no font is found, returns false.
-     */
-    bool getFallbackFamilyNameForChar(SkUnichar uni, const char* lang, SkString* name);
-    /**
-     *
-     */
-    SkTypeface* nextLogicalTypeface(SkFontID currFontID, SkFontID origFontID,
-                                    const SkPaintOptionsAndroid& options);
-    SkTypeface* getTypefaceForGlyphID(uint16_t glyphID, const SkTypeface* origTypeface,
-                                      const SkPaintOptionsAndroid& options,
-                                      int* lowerBounds, int* upperBounds);
-
-private:
-    void addFallbackFamily(FamilyRecID fontRecID);
-    SkTypeface* getTypefaceForFontRec(FontRecID fontRecID);
-    FallbackFontList* getCurrentLocaleFallbackFontList();
-    FallbackFontList* findFallbackFontList(const SkLanguage& lang, bool isOriginal = true);
-
-    SkTArray<FontRec, true> fFonts;
-    SkTArray<FamilyRec, true> fFontFamilies;
-    SkTDict<FamilyRecID> fFamilyNameDict;
-    FamilyRecID fDefaultFamilyRecID;
-
-    // (SkLanguage)<->(fallback chain index) translation
-    SkTDict<FallbackFontList*> fFallbackFontDict;
-    SkTDict<FallbackFontList*> fFallbackFontAliasDict;
-    FallbackFontList fDefaultFallbackList;
-
-    // fallback info for current locale
-    SkString fCachedLocale;
-    FallbackFontList* fLocaleFallbackFontList;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
-SK_DECLARE_STATIC_MUTEX(gGetSingletonInterfaceMutex);
-static SkFontConfigInterfaceAndroid* getSingletonInterface() {
-    static SkFontConfigInterfaceAndroid* gFontConfigInterface;
-
-    SkAutoMutexAcquire ac(gGetSingletonInterfaceMutex);
-    if (NULL == gFontConfigInterface) {
-        // load info from a configuration file that we can use to populate the
-        // system/fallback font structures
-        SkTDArray<FontFamily*> fontFamilies;
-        if (!gTestMainConfigFile) {
-            SkFontConfigParser::GetFontFamilies(fontFamilies);
-        } else {
-            SkFontConfigParser::GetTestFontFamilies(fontFamilies, gTestMainConfigFile,
-                                                    gTestFallbackConfigFile);
-        }
-
-        gFontConfigInterface = new SkFontConfigInterfaceAndroid(fontFamilies);
-
-        // cleanup the data we received from the parser
-        fontFamilies.deleteAll();
-    }
-    return gFontConfigInterface;
-}
-
-SkFontConfigInterface* SkFontConfigInterface::GetSingletonDirectInterface(SkBaseMutex*) {
-    // Doesn't need passed-in mutex because getSingletonInterface() uses one
-    return getSingletonInterface();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-static bool has_font(const SkTArray<FontRec, true>& array, const SkString& filename) {
-    for (int i = 0; i < array.count(); i++) {
-        if (array[i].fFileName == filename) {
-            return true;
-        }
-    }
-    return false;
-}
-
-#ifndef SK_FONT_FILE_PREFIX
-    #define SK_FONT_FILE_PREFIX          "/fonts/"
-#endif
-
-static void get_path_for_sys_fonts(SkString* full, const SkString& name) {
-    if (gTestFontFilePrefix) {
-        full->set(gTestFontFilePrefix);
-    } else {
-        full->set(getenv("ANDROID_ROOT"));
-        full->append(SK_FONT_FILE_PREFIX);
-    }
-    full->append(name);
-}
-
-static void insert_into_name_dict(SkTDict<FamilyRecID>& familyNameDict,
-                                  const char* name, FamilyRecID familyRecID) {
-    SkAutoAsciiToLC tolc(name);
-    if (familyNameDict.find(tolc.lc())) {
-        SkDebugf("---- system font attempting to use a the same name [%s] for"
-                 "multiple families. skipping subsequent occurrences", tolc.lc());
-    } else {
-        familyNameDict.set(tolc.lc(), familyRecID);
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-SkFontConfigInterfaceAndroid::SkFontConfigInterfaceAndroid(SkTDArray<FontFamily*>& fontFamilies) :
-        fFonts(fontFamilies.count()),
-        fFontFamilies(fontFamilies.count() / FamilyRec::FONT_STYLE_COUNT),
-        fFamilyNameDict(1024),
-        fDefaultFamilyRecID(INVALID_FAMILY_REC_ID),
-        fFallbackFontDict(128),
-        fFallbackFontAliasDict(128),
-        fLocaleFallbackFontList(NULL) {
-
-    for (int i = 0; i < fontFamilies.count(); ++i) {
-        FontFamily* family = fontFamilies[i];
-
-        // defer initializing the familyRec until we can be sure that at least
-        // one of it's children contains a valid font file
-        FamilyRec* familyRec = NULL;
-        FamilyRecID familyRecID = INVALID_FAMILY_REC_ID;
-
-        for (int j = 0; j < family->fFontFiles.count(); ++j) {
-            SkString filename;
-            get_path_for_sys_fonts(&filename, family->fFontFiles[j].fFileName);
-
-            if (has_font(fFonts, filename)) {
-                SkDebugf("---- system font and fallback font files specify a duplicate "
-                        "font %s, skipping the second occurrence", filename.c_str());
-                continue;
-            }
-
-            FontRec& fontRec = fFonts.push_back();
-            fontRec.fFileName = filename;
-            fontRec.fStyle = SkTypeface::kNormal;
-            fontRec.fIsValid = false;
-            fontRec.fFamilyRecID = familyRecID;
-
-            const FontRecID fontRecID = fFonts.count() - 1;
-
-            SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(filename.c_str()));
-            if (stream.get() != NULL) {
-                bool isFixedWidth;
-                SkString name;
-                fontRec.fIsValid = SkTypeface_FreeType::ScanFont(stream.get(), 0,
-                                                                 &name, &fontRec.fStyle,
-                                                                 &isFixedWidth);
-            } else {
-                if (!family->fIsFallbackFont) {
-                    SkDebugf("---- failed to open <%s> as a font\n", filename.c_str());
-                }
-            }
-
-            if (fontRec.fIsValid) {
-                DEBUG_FONT(("---- SystemFonts[%d][%d] fallback=%d file=%s",
-                           i, fFonts.count() - 1, family->fIsFallbackFont, filename.c_str()));
-            } else {
-                DEBUG_FONT(("---- SystemFonts[%d][%d] fallback=%d file=%s (INVALID)",
-                           i, fFonts.count() - 1, family->fIsFallbackFont, filename.c_str()));
-                continue;
-            }
-
-            // create a familyRec now that we know that at least one font in
-            // the family is valid
-            if (familyRec == NULL) {
-                familyRec = &fFontFamilies.push_back();
-                familyRecID = fFontFamilies.count() - 1;
-                fontRec.fFamilyRecID = familyRecID;
-
-                familyRec->fIsFallbackFont = family->fIsFallbackFont;
-                familyRec->fPaintOptions = family->fFontFiles[j].fPaintOptions;
-
-            } else if (familyRec->fPaintOptions != family->fFontFiles[j].fPaintOptions) {
-                SkDebugf("Every font file within a family must have identical"
-                         "language and variant attributes");
-                sk_throw();
-            }
-
-            // add this font to the current familyRec
-            if (INVALID_FONT_REC_ID != familyRec->fFontRecID[fontRec.fStyle]) {
-                DEBUG_FONT(("Overwriting familyRec for style[%d] old,new:(%d,%d)",
-                            fontRec.fStyle, familyRec->fFontRecID[fontRec.fStyle],
-                            fontRecID));
-            }
-            familyRec->fFontRecID[fontRec.fStyle] = fontRecID;
-        }
-
-        if (familyRec) {
-            if (familyRec->fIsFallbackFont) {
-                // add the font to the appropriate fallback chains and also insert a
-                // unique name into the familyNameDict for internal usage
-                addFallbackFamily(familyRecID);
-            } else {
-                // add the names that map to this family to the dictionary for easy lookup
-                const SkTArray<SkString>& names = family->fNames;
-                if (names.empty()) {
-                    SkDEBUGFAIL("ERROR: non-fallback font with no name");
-                    continue;
-                }
-
-                for (int i = 0; i < names.count(); i++) {
-                    insert_into_name_dict(fFamilyNameDict, names[i].c_str(), familyRecID);
-                }
-            }
-        }
-    }
-
-    DEBUG_FONT(("---- We have %d system fonts", fFonts.count()));
-
-    if (fFontFamilies.count() > 0) {
-        fDefaultFamilyRecID = 0;
-    }
-
-    // scans the default fallback font chain, adding every entry to every other
-    // fallback font chain to which it does not belong. this results in every
-    // language-specific fallback font chain having all of its fallback fonts at
-    // the front of the chain, and everything else at the end.
-    FallbackFontList* fallbackList;
-    SkTDict<FallbackFontList*>::Iter iter(fFallbackFontDict);
-    const char* fallbackLang = iter.next(&fallbackList);
-    while(fallbackLang != NULL) {
-        for (int i = 0; i < fDefaultFallbackList.count(); i++) {
-            FamilyRecID familyRecID = fDefaultFallbackList[i];
-            const SkString& fontLang = fFontFamilies[familyRecID].fPaintOptions.getLanguage().getTag();
-            if (strcmp(fallbackLang, fontLang.c_str()) != 0) {
-                fallbackList->push(familyRecID);
-            }
-        }
-        // move to the next fallback list in the dictionary
-        fallbackLang = iter.next(&fallbackList);
-    }
-}
-
-SkFontConfigInterfaceAndroid::~SkFontConfigInterfaceAndroid() {
-    // iterate through and cleanup fFallbackFontDict
-    SkTDict<FallbackFontList*>::Iter iter(fFallbackFontDict);
-    FallbackFontList* fallbackList;
-    while(iter.next(&fallbackList) != NULL) {
-        SkDELETE(fallbackList);
-    }
-}
-
-void SkFontConfigInterfaceAndroid::addFallbackFamily(FamilyRecID familyRecID) {
-    SkASSERT(familyRecID < fFontFamilies.count());
-    FamilyRec& familyRec = fFontFamilies[familyRecID];
-    SkASSERT(familyRec.fIsFallbackFont);
-
-    // add the fallback family to the name dictionary.  This is
-    // needed by getFallbackFamilyNameForChar() so that fallback
-    // families can be identified by a unique name. The unique
-    // identifier that we've chosen is the familyID in hex (e.g. '0F##fallback').
-    familyRec.fFallbackName.printf("%.2x##fallback", familyRecID);
-    insert_into_name_dict(fFamilyNameDict, familyRec.fFallbackName.c_str(), familyRecID);
-
-    // add to the default fallback list
-    fDefaultFallbackList.push(familyRecID);
-
-    // stop here if it is the default language tag
-    const SkString& languageTag = familyRec.fPaintOptions.getLanguage().getTag();
-    if (languageTag.isEmpty()) {
-        return;
-    }
-
-    // add to the appropriate language's custom fallback list
-    FallbackFontList* customList = NULL;
-    if (!fFallbackFontDict.find(languageTag.c_str(), &customList)) {
-        DEBUG_FONT(("----  Created fallback list for \"%s\"", languageTag.c_str()));
-        customList = SkNEW(FallbackFontList);
-        fFallbackFontDict.set(languageTag.c_str(), customList);
-    }
-    SkASSERT(customList != NULL);
-    customList->push(familyRecID);
-}
-
-
-static FontRecID find_best_style(const FamilyRec& family, SkTypeface::Style style) {
-
-    const FontRecID* fontRecIDs = family.fFontRecID;
-
-    if (fontRecIDs[style] != INVALID_FONT_REC_ID) { // exact match
-        return fontRecIDs[style];
-    }
-    // look for a matching bold
-    style = (SkTypeface::Style)(style ^ SkTypeface::kItalic);
-    if (fontRecIDs[style] != INVALID_FONT_REC_ID) {
-        return fontRecIDs[style];
-    }
-    // look for the plain
-    if (fontRecIDs[SkTypeface::kNormal] != INVALID_FONT_REC_ID) {
-        return fontRecIDs[SkTypeface::kNormal];
-    }
-    // look for anything
-    for (int i = 0; i < FamilyRec::FONT_STYLE_COUNT; i++) {
-        if (fontRecIDs[i] != INVALID_FONT_REC_ID) {
-            return fontRecIDs[i];
-        }
-    }
-    // should never get here, since the fontRecID list should not be empty
-    SkDEBUGFAIL("No valid fonts exist for this family");
-    return -1;
-}
-
-bool SkFontConfigInterfaceAndroid::matchFamilyName(const char familyName[],
-                                                   SkTypeface::Style style,
-                                                   FontIdentity* outFontIdentifier,
-                                                   SkString* outFamilyName,
-                                                   SkTypeface::Style* outStyle) {
-    // clip to legal style bits
-    style = (SkTypeface::Style)(style & SkTypeface::kBoldItalic);
-
-    bool exactNameMatch = false;
-
-    FamilyRecID familyRecID = INVALID_FAMILY_REC_ID;
-    if (NULL != familyName) {
-        SkAutoAsciiToLC tolc(familyName);
-        if (fFamilyNameDict.find(tolc.lc(), &familyRecID)) {
-            exactNameMatch = true;
-        }
-    } else {
-        familyRecID = fDefaultFamilyRecID;
-
-    }
-
-    // If no matching family name is found then return false. This allows clients
-    // to be able to search for other fonts instead of forcing them to use the
-    // default font.
-    if (INVALID_FAMILY_REC_ID == familyRecID) {
-        return false;
-    }
-
-    FontRecID fontRecID = find_best_style(fFontFamilies[familyRecID], style);
-    FontRec& fontRec = fFonts[fontRecID];
-
-    if (NULL != outFontIdentifier) {
-        outFontIdentifier->fID = fontRecID;
-        outFontIdentifier->fTTCIndex = 0;
-        outFontIdentifier->fString.set(fontRec.fFileName);
-//        outFontIdentifier->fStyle = fontRec.fStyle;
-    }
-
-    if (NULL != outFamilyName) {
-        if (exactNameMatch) {
-            outFamilyName->set(familyName);
-        } else {
-            // find familyName from list of names
-            const char* familyName = NULL;
-            SkAssertResult(fFamilyNameDict.findKey(familyRecID, &familyName));
-            SkASSERT(familyName);
-            outFamilyName->set(familyName);
-        }
-    }
-
-    if (NULL != outStyle) {
-        *outStyle = fontRec.fStyle;
-    }
-
-    return true;
-}
-
-SkStream* SkFontConfigInterfaceAndroid::openStream(const FontIdentity& identity) {
-    return SkStream::NewFromFile(identity.fString.c_str());
-}
-
-SkDataTable* SkFontConfigInterfaceAndroid::getFamilyNames() {
-    SkTDArray<const char*> names;
-    SkTDArray<size_t> sizes;
-
-    SkTDict<FamilyRecID>::Iter iter(fFamilyNameDict);
-    const char* familyName = iter.next(NULL);
-    while(familyName != NULL) {
-        *names.append() = familyName;
-        *sizes.append() = strlen(familyName) + 1;
-
-        // move to the next familyName in the dictionary
-        familyName = iter.next(NULL);
-    }
-
-    return SkDataTable::NewCopyArrays((const void*const*)names.begin(),
-                                      sizes.begin(), names.count());
-}
-
-bool SkFontConfigInterfaceAndroid::matchFamilySet(const char inFamilyName[],
-                                                  SkString* outFamilyName,
-                                                  SkTArray<FontIdentity>*) {
-    return false;
-}
-
-static bool find_proc(SkTypeface* face, SkTypeface::Style style, void* ctx) {
-    const FontRecID* fontRecID = (const FontRecID*)ctx;
-    FontRecID currFontRecID = ((FontConfigTypeface*)face)->getIdentity().fID;
-    return currFontRecID == *fontRecID;
-}
-
-SkTypeface* SkFontConfigInterfaceAndroid::getTypefaceForFontRec(FontRecID fontRecID) {
-    FontRec& fontRec = fFonts[fontRecID];
-    SkTypeface* face = fontRec.fTypeface.get();
-    if (!face) {
-        // look for it in the typeface cache
-        face = SkTypefaceCache::FindByProcAndRef(find_proc, &fontRecID);
-
-        // if it is not in the cache then create it
-        if (!face) {
-            const char* familyName = NULL;
-            SkAssertResult(fFamilyNameDict.findKey(fontRec.fFamilyRecID, &familyName));
-            SkASSERT(familyName);
-            face = SkTypeface::CreateFromName(familyName, fontRec.fStyle);
-        }
-
-        // store the result for subsequent lookups
-        fontRec.fTypeface.reset(face);
-    }
-    SkASSERT(face);
-    return face;
-}
-
-bool SkFontConfigInterfaceAndroid::getFallbackFamilyNameForChar(SkUnichar uni,
-                                                                const char* lang,
-                                                                SkString* name) {
-    FallbackFontList* fallbackFontList = NULL;
-    const SkString langTag(lang);
-    if (langTag.isEmpty()) {
-        fallbackFontList = this->getCurrentLocaleFallbackFontList();
-    } else {
-        fallbackFontList = this->findFallbackFontList(langTag);
-    }
-
-    for (int i = 0; i < fallbackFontList->count(); i++) {
-        FamilyRecID familyRecID = fallbackFontList->getAt(i);
-
-        // if it is not one of the accepted variants then move to the next family
-        int32_t acceptedVariants = SkPaintOptionsAndroid::kDefault_Variant |
-                                   SkPaintOptionsAndroid::kElegant_Variant;
-        if (!(fFontFamilies[familyRecID].fPaintOptions.getFontVariant() & acceptedVariants)) {
-            continue;
-        }
-
-        FontRecID fontRecID = find_best_style(fFontFamilies[familyRecID], SkTypeface::kNormal);
-        SkTypeface* face = this->getTypefaceForFontRec(fontRecID);
-
-        SkPaint paint;
-        paint.setTypeface(face);
-        paint.setTextEncoding(SkPaint::kUTF32_TextEncoding);
-
-        uint16_t glyphID;
-        paint.textToGlyphs(&uni, sizeof(uni), &glyphID);
-        if (glyphID != 0) {
-            name->set(fFontFamilies[familyRecID].fFallbackName);
-            return true;
-        }
-    }
-    return false;
-}
-
-FallbackFontList* SkFontConfigInterfaceAndroid::getCurrentLocaleFallbackFontList() {
-    SkString locale = SkFontConfigParser::GetLocale();
-    if (NULL == fLocaleFallbackFontList || locale != fCachedLocale) {
-        fCachedLocale = locale;
-        fLocaleFallbackFontList = this->findFallbackFontList(locale);
-    }
-    return fLocaleFallbackFontList;
-}
-
-FallbackFontList* SkFontConfigInterfaceAndroid::findFallbackFontList(const SkLanguage& lang,
-                                                                     bool isOriginal) {
-    const SkString& langTag = lang.getTag();
-    if (langTag.isEmpty()) {
-        return &fDefaultFallbackList;
-    }
-
-    FallbackFontList* fallbackFontList;
-    if (fFallbackFontDict.find(langTag.c_str(), langTag.size(), &fallbackFontList) ||
-        fFallbackFontAliasDict.find(langTag.c_str(), langTag.size(), &fallbackFontList)) {
-        return fallbackFontList;
-    }
-
-    // attempt a recursive fuzzy match
-    SkLanguage parent = lang.getParent();
-    fallbackFontList = findFallbackFontList(parent, false);
-
-    // cache the original lang so we don't have to do the recursion again.
-    if (isOriginal) {
-        DEBUG_FONT(("----  Created fallback list alias for \"%s\"", langTag.c_str()));
-        fFallbackFontAliasDict.set(langTag.c_str(), fallbackFontList);
-    }
-    return fallbackFontList;
-}
-
-SkTypeface* SkFontConfigInterfaceAndroid::nextLogicalTypeface(SkFontID currFontID,
-                                                              SkFontID origFontID,
-                                                              const SkPaintOptionsAndroid& opts) {
-    // Skia does not support font fallback by default. This enables clients such
-    // as WebKit to customize their font selection. In any case, clients can use
-    // GetFallbackFamilyNameForChar() to get the fallback font for individual
-    // characters.
-    if (!opts.isUsingFontFallbacks()) {
-        return NULL;
-    }
-
-    FallbackFontList* currentFallbackList = findFallbackFontList(opts.getLanguage());
-    SkASSERT(currentFallbackList);
-
-    SkTypeface::Style origStyle = SkTypeface::kNormal;
-    const SkTypeface* origTypeface = SkTypefaceCache::FindByID(origFontID);
-    if (NULL != origTypeface) {
-        origStyle = origTypeface->style();
-    }
-
-    // we must convert currTypeface into a FontRecID
-    FontRecID currFontRecID = INVALID_FONT_REC_ID;
-    const SkTypeface* currTypeface = SkTypefaceCache::FindByID(currFontID);
-    // non-system fonts are not in the font cache so if we are asked to fallback
-    // for a non-system font we will start at the front of the chain.
-    if (NULL != currTypeface) {
-        currFontRecID = ((FontConfigTypeface*)currTypeface)->getIdentity().fID;
-        SkASSERT(INVALID_FONT_REC_ID != currFontRecID);
-    }
-
-    FamilyRecID currFamilyRecID = INVALID_FAMILY_REC_ID;
-    if (INVALID_FONT_REC_ID != currFontRecID) {
-        currFamilyRecID = fFonts[currFontRecID].fFamilyRecID;
-    }
-
-    // lookup the index next font in the chain
-    int currFallbackFontIndex = currentFallbackList->find(currFamilyRecID);
-    // We add 1 to the returned index for 2 reasons: (1) if find succeeds it moves
-    // our index to the next entry in the list; (2) if find() fails it returns
-    // -1 and incrementing it will set our starting index to 0 (the head of the list)
-    int nextFallbackFontIndex = currFallbackFontIndex + 1;
-
-    if(nextFallbackFontIndex >= currentFallbackList->count()) {
-        return NULL;
-    }
-
-    // If a rec object is set to prefer "kDefault_Variant" it means they have no preference
-    // In this case, we set the value to "kCompact_Variant"
-    SkPaintOptionsAndroid::FontVariant variant = opts.getFontVariant();
-    if (variant == SkPaintOptionsAndroid::kDefault_Variant) {
-        variant = SkPaintOptionsAndroid::kCompact_Variant;
-    }
-
-    int32_t acceptedVariants = SkPaintOptionsAndroid::kDefault_Variant | variant;
-
-    SkTypeface* nextLogicalTypeface = 0;
-    while (nextFallbackFontIndex < currentFallbackList->count()) {
-        FamilyRecID familyRecID = currentFallbackList->getAt(nextFallbackFontIndex);
-        if ((fFontFamilies[familyRecID].fPaintOptions.getFontVariant() & acceptedVariants) != 0) {
-            FontRecID matchedFont = find_best_style(fFontFamilies[familyRecID], origStyle);
-            nextLogicalTypeface = this->getTypefaceForFontRec(matchedFont);
-            break;
-        }
-        nextFallbackFontIndex++;
-    }
-
-    DEBUG_FONT(("---- nextLogicalFont: currFontID=%d, origFontID=%d, currRecID=%d, "
-                "lang=%s, variant=%d, nextFallbackIndex[%d,%d] => nextLogicalTypeface=%d",
-                currFontID, origFontID, currFontRecID, opts.getLanguage().getTag().c_str(),
-                variant, nextFallbackFontIndex, currentFallbackList->getAt(nextFallbackFontIndex),
-                (nextLogicalTypeface) ? nextLogicalTypeface->uniqueID() : 0));
-    return SkSafeRef(nextLogicalTypeface);
-}
-
-SkTypeface* SkFontConfigInterfaceAndroid::getTypefaceForGlyphID(uint16_t glyphID,
-                                                                const SkTypeface* origTypeface,
-                                                                const SkPaintOptionsAndroid& opts,
-                                                                int* lBounds, int* uBounds) {
-    // If we aren't using fallbacks then we shouldn't be calling this
-    SkASSERT(opts.isUsingFontFallbacks());
-    SkASSERT(origTypeface);
-
-    SkTypeface* currentTypeface = NULL;
-    int lowerBounds = 0; //inclusive
-    int upperBounds = origTypeface->countGlyphs(); //exclusive
-
-    // check to see if the glyph is in the bounds of the origTypeface
-    if (glyphID < upperBounds) {
-        currentTypeface = const_cast<SkTypeface*>(origTypeface);
-    } else {
-        FallbackFontList* currentFallbackList = findFallbackFontList(opts.getLanguage());
-        SkASSERT(currentFallbackList);
-
-        // If an object is set to prefer "kDefault_Variant" it means they have no preference
-        // In this case, we set the value to "kCompact_Variant"
-        SkPaintOptionsAndroid::FontVariant variant = opts.getFontVariant();
-        if (variant == SkPaintOptionsAndroid::kDefault_Variant) {
-            variant = SkPaintOptionsAndroid::kCompact_Variant;
-        }
-
-        int32_t acceptedVariants = SkPaintOptionsAndroid::kDefault_Variant | variant;
-        SkTypeface::Style origStyle = origTypeface->style();
-
-        for (int x = 0; x < currentFallbackList->count(); ++x) {
-            const FamilyRecID familyRecID = currentFallbackList->getAt(x);
-            const SkPaintOptionsAndroid& familyOptions = fFontFamilies[familyRecID].fPaintOptions;
-            if ((familyOptions.getFontVariant() & acceptedVariants) != 0) {
-                FontRecID matchedFont = find_best_style(fFontFamilies[familyRecID], origStyle);
-                currentTypeface = this->getTypefaceForFontRec(matchedFont);
-                lowerBounds = upperBounds;
-                upperBounds += currentTypeface->countGlyphs();
-                if (glyphID < upperBounds) {
-                    break;
-                }
-            }
-        }
-    }
-
-    if (NULL != currentTypeface) {
-        if (lBounds) {
-            *lBounds = lowerBounds;
-        }
-        if (uBounds) {
-            *uBounds = upperBounds;
-        }
-    }
-    return currentTypeface;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-bool SkGetFallbackFamilyNameForChar(SkUnichar uni, const char* lang, SkString* name) {
-    SkFontConfigInterfaceAndroid* fontConfig = getSingletonInterface();
-    return fontConfig->getFallbackFamilyNameForChar(uni, lang, name);
-}
-
-void SkUseTestFontConfigFile(const char* mainconf, const char* fallbackconf,
-                             const char* fontsdir) {
-    gTestMainConfigFile = mainconf;
-    gTestFallbackConfigFile = fallbackconf;
-    gTestFontFilePrefix = fontsdir;
-    SkASSERT(gTestMainConfigFile);
-    SkASSERT(gTestFallbackConfigFile);
-    SkASSERT(gTestFontFilePrefix);
-    SkDEBUGF(("Use Test Config File Main %s, Fallback %s, Font Dir %s",
-              gTestMainConfigFile, gTestFallbackConfigFile, gTestFontFilePrefix));
-}
-
-SkTypeface* SkAndroidNextLogicalTypeface(SkFontID currFontID, SkFontID origFontID,
-                                         const SkPaintOptionsAndroid& options) {
-    SkFontConfigInterfaceAndroid* fontConfig = getSingletonInterface();
-    return fontConfig->nextLogicalTypeface(currFontID, origFontID, options);
-
-}
-
-SkTypeface* SkGetTypefaceForGlyphID(uint16_t glyphID, const SkTypeface* origTypeface,
-                                    const SkPaintOptionsAndroid& options,
-                                    int* lowerBounds, int* upperBounds) {
-    SkFontConfigInterfaceAndroid* fontConfig = getSingletonInterface();
-    return fontConfig->getTypefaceForGlyphID(glyphID, origTypeface, options,
-                                             lowerBounds, upperBounds);
-}
diff --git a/gfx/skia/skia/src/ports/SkFontConfigInterface_direct.cpp b/gfx/skia/skia/src/ports/SkFontConfigInterface_direct.cpp
index c0cfd8fdcf9c..a25bfbdc07a8 100644
--- a/gfx/skia/skia/src/ports/SkFontConfigInterface_direct.cpp
+++ b/gfx/skia/skia/src/ports/SkFontConfigInterface_direct.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Google Inc.
+ * Copyright 2009-2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
@@ -7,16 +7,21 @@
 
 /* migrated from chrome/src/skia/ext/SkFontHost_fontconfig_direct.cpp */
 
-#include <string>
-#include <unistd.h>
-#include <fcntl.h>
+#include "SkBuffer.h"
+#include "SkDataTable.h"
+#include "SkFontConfigInterface_direct.h"
+#include "SkFontStyle.h"
+#include "SkMutex.h"
+#include "SkStream.h"
+#include "SkString.h"
+#include "SkTArray.h"
+#include "SkTDArray.h"
+#include "SkTemplates.h"
+#include "SkTypeface.h"
+#include "SkTypes.h"
 
 #include <fontconfig/fontconfig.h>
-
-#include "SkBuffer.h"
-#include "SkFontConfigInterface.h"
-#include "SkLazyPtr.h"
-#include "SkStream.h"
+#include <unistd.h>
 
 size_t SkFontConfigInterface::FontIdentity::writeToMemory(void* addr) const {
     size_t size = sizeof(fID) + sizeof(fTTCIndex);
@@ -72,7 +77,7 @@ static void test_writeToMemory(const SkFontConfigInterface::FontIdentity& iden0,
                                int initValue) {
     SkFontConfigInterface::FontIdentity iden1;
 
-    size_t size0 = iden0.writeToMemory(NULL);
+    size_t size0 = iden0.writeToMemory(nullptr);
 
     SkAutoMalloc storage(size0);
     memset(storage.get(), initValue, size0);
@@ -102,46 +107,15 @@ static void fontconfiginterface_unittest() {
 }
 #endif
 
-class SkFontConfigInterfaceDirect : public SkFontConfigInterface {
-public:
-            SkFontConfigInterfaceDirect();
-    virtual ~SkFontConfigInterfaceDirect();
-
-    virtual bool matchFamilyName(const char familyName[],
-                                 SkTypeface::Style requested,
-                                 FontIdentity* outFontIdentifier,
-                                 SkString* outFamilyName,
-                                 SkTypeface::Style* outStyle) SK_OVERRIDE;
-    virtual SkStream* openStream(const FontIdentity&) SK_OVERRIDE;
-
-    // new APIs
-    virtual SkDataTable* getFamilyNames() SK_OVERRIDE;
-    virtual bool matchFamilySet(const char inFamilyName[],
-                                SkString* outFamilyName,
-                                SkTArray<FontIdentity>*) SK_OVERRIDE;
-
-private:
-    SkMutex mutex_;
-};
-
-SkFontConfigInterface* SkFontConfigInterface::GetSingletonDirectInterface(SkBaseMutex* mutex) {
-    SkAutoMutexAcquire ac(mutex);
-    static SkFontConfigInterfaceDirect* singleton = NULL;
-    if (singleton == NULL) {
-        singleton = SkNEW(SkFontConfigInterfaceDirect);
-    }
-    return singleton;
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
-// Returns the string from the pattern, or NULL
+// Returns the string from the pattern, or nullptr
 static const char* get_name(FcPattern* pattern, const char field[],
                             int index = 0) {
     const char* name;
     if (FcPatternGetString(pattern, field, index,
                            (FcChar8**)&name) != FcResultMatch) {
-        name = NULL;
+        name = nullptr;
     }
     return name;
 }
@@ -221,6 +195,7 @@ FontEquivClass GetFontEquivClass(const char* fontname)
         { PGOTHIC, "MS PGothic" },
         { PGOTHIC, "\xef\xbc\xad\xef\xbc\xb3 \xef\xbc\xb0"
                    "\xe3\x82\xb4\xe3\x82\xb7\xe3\x83\x83\xe3\x82\xaf" },
+        { PGOTHIC, "Noto Sans CJK JP" },
         { PGOTHIC, "IPAPGothic" },
         { PGOTHIC, "MotoyaG04Gothic" },
 
@@ -228,6 +203,7 @@ FontEquivClass GetFontEquivClass(const char* fontname)
         { GOTHIC, "MS Gothic" },
         { GOTHIC, "\xef\xbc\xad\xef\xbc\xb3 "
                   "\xe3\x82\xb4\xe3\x82\xb7\xe3\x83\x83\xe3\x82\xaf" },
+        { GOTHIC, "Noto Sans Mono CJK JP" },
         { GOTHIC, "IPAGothic" },
         { GOTHIC, "MotoyaG04GothicMono" },
 
@@ -259,6 +235,7 @@ FontEquivClass GetFontEquivClass(const char* fontname)
         // 黑体
         { SIMHEI, "Simhei" },
         { SIMHEI, "\xe9\xbb\x91\xe4\xbd\x93" },
+        { SIMHEI, "Noto Sans CJK SC" },
         { SIMHEI, "MYingHeiGB18030" },
         { SIMHEI, "MYingHeiB5HK" },
 
@@ -318,74 +295,14 @@ bool IsMetricCompatibleReplacement(const char* font_a, const char* font_b)
 // cases, the request either doesn't specify a font or is one of the
 // basic font names like "Sans", "Serif" or "Monospace". This function
 // tells you whether a given request is for such a fallback.
-bool IsFallbackFontAllowed(const std::string& family) {
+bool IsFallbackFontAllowed(const SkString& family) {
   const char* family_cstr = family.c_str();
-  return family.empty() ||
+  return family.isEmpty() ||
          strcasecmp(family_cstr, "sans") == 0 ||
          strcasecmp(family_cstr, "serif") == 0 ||
          strcasecmp(family_cstr, "monospace") == 0;
 }
 
-static bool valid_pattern(FcPattern* pattern) {
-#ifdef SK_FONT_CONFIG_ONLY_ALLOW_SCALABLE_FONTS
-    FcBool is_scalable;
-    if (FcPatternGetBool(pattern, FC_SCALABLE, 0, &is_scalable) != FcResultMatch
-        || !is_scalable) {
-        return false;
-    }
-#endif
-
-    // fontconfig can also return fonts which are unreadable
-    const char* c_filename = get_name(pattern, FC_FILE);
-    if (!c_filename) {
-        return false;
-    }
-    if (access(c_filename, R_OK) != 0) {
-        return false;
-    }
-    return true;
-}
-
-// Find matching font from |font_set| for the given font family.
-FcPattern* MatchFont(FcFontSet* font_set,
-                     const char* post_config_family,
-                     const std::string& family) {
-  // Older versions of fontconfig have a bug where they cannot select
-  // only scalable fonts so we have to manually filter the results.
-  FcPattern* match = NULL;
-  for (int i = 0; i < font_set->nfont; ++i) {
-    FcPattern* current = font_set->fonts[i];
-    if (valid_pattern(current)) {
-      match = current;
-      break;
-    }
-  }
-
-  if (match && !IsFallbackFontAllowed(family)) {
-    bool acceptable_substitute = false;
-    for (int id = 0; id < 255; ++id) {
-      const char* post_match_family = get_name(match, FC_FAMILY, id);
-      if (!post_match_family)
-        break;
-      acceptable_substitute =
-          (strcasecmp(post_config_family, post_match_family) == 0 ||
-           // Workaround for Issue 12530:
-           //   requested family: "Bitstream Vera Sans"
-           //   post_config_family: "Arial"
-           //   post_match_family: "Bitstream Vera Sans"
-           // -> We should treat this case as a good match.
-           strcasecmp(family.c_str(), post_match_family) == 0) ||
-           IsMetricCompatibleReplacement(family.c_str(), post_match_family);
-      if (acceptable_substitute)
-        break;
-    }
-    if (!acceptable_substitute)
-      return NULL;
-  }
-
-  return match;
-}
-
 // Retrieves |is_bold|, |is_italic| and |font_family| properties from |font|.
 SkTypeface::Style GetFontStyle(FcPattern* font) {
     int resulting_bold;
@@ -436,13 +353,77 @@ SkFontConfigInterfaceDirect::SkFontConfigInterfaceDirect() {
 SkFontConfigInterfaceDirect::~SkFontConfigInterfaceDirect() {
 }
 
+bool SkFontConfigInterfaceDirect::isAccessible(const char* filename) {
+    if (access(filename, R_OK) != 0) {
+        return false;
+    }
+    return true;
+}
+
+bool SkFontConfigInterfaceDirect::isValidPattern(FcPattern* pattern) {
+#ifdef SK_FONT_CONFIG_ONLY_ALLOW_SCALABLE_FONTS
+    FcBool is_scalable;
+    if (FcPatternGetBool(pattern, FC_SCALABLE, 0, &is_scalable) != FcResultMatch
+        || !is_scalable) {
+        return false;
+    }
+#endif
+
+    // fontconfig can also return fonts which are unreadable
+    const char* c_filename = get_name(pattern, FC_FILE);
+    if (!c_filename) {
+        return false;
+    }
+    return this->isAccessible(c_filename);
+}
+
+// Find matching font from |font_set| for the given font family.
+FcPattern* SkFontConfigInterfaceDirect::MatchFont(FcFontSet* font_set,
+                                                  const char* post_config_family,
+                                                  const SkString& family) {
+  // Older versions of fontconfig have a bug where they cannot select
+  // only scalable fonts so we have to manually filter the results.
+  FcPattern* match = nullptr;
+  for (int i = 0; i < font_set->nfont; ++i) {
+    FcPattern* current = font_set->fonts[i];
+    if (this->isValidPattern(current)) {
+      match = current;
+      break;
+    }
+  }
+
+  if (match && !IsFallbackFontAllowed(family)) {
+    bool acceptable_substitute = false;
+    for (int id = 0; id < 255; ++id) {
+      const char* post_match_family = get_name(match, FC_FAMILY, id);
+      if (!post_match_family)
+        break;
+      acceptable_substitute =
+          (strcasecmp(post_config_family, post_match_family) == 0 ||
+           // Workaround for Issue 12530:
+           //   requested family: "Bitstream Vera Sans"
+           //   post_config_family: "Arial"
+           //   post_match_family: "Bitstream Vera Sans"
+           // -> We should treat this case as a good match.
+           strcasecmp(family.c_str(), post_match_family) == 0) ||
+           IsMetricCompatibleReplacement(family.c_str(), post_match_family);
+      if (acceptable_substitute)
+        break;
+    }
+    if (!acceptable_substitute)
+      return nullptr;
+  }
+
+  return match;
+}
+
 bool SkFontConfigInterfaceDirect::matchFamilyName(const char familyName[],
                                                   SkTypeface::Style style,
                                                   FontIdentity* outIdentity,
                                                   SkString* outFamilyName,
                                                   SkTypeface::Style* outStyle) {
-    std::string familyStr(familyName ? familyName : "");
-    if (familyStr.length() > kMaxFontFamilyLength) {
+    SkString familyStr(familyName ? familyName : "");
+    if (familyStr.size() > kMaxFontFamilyLength) {
         return false;
     }
 
@@ -461,7 +442,7 @@ bool SkFontConfigInterfaceDirect::matchFamilyName(const char familyName[],
                                                       : FC_SLANT_ROMAN);
     FcPatternAddBool(pattern, FC_SCALABLE, FcTrue);
 
-    FcConfigSubstitute(NULL, pattern, FcMatchPattern);
+    FcConfigSubstitute(nullptr, pattern, FcMatchPattern);
     FcDefaultSubstitute(pattern);
 
     // Font matching:
@@ -469,7 +450,7 @@ bool SkFontConfigInterfaceDirect::matchFamilyName(const char familyName[],
     //    font-family: a, b, c, serif;
     // However, fontconfig will always do its best to find *a* font when asked
     // for something so we need a way to tell if the match which it has found is
-    // "good enough" for us. Otherwise, we can return NULL which gets piped up
+    // "good enough" for us. Otherwise, we can return nullptr which gets piped up
     // and lets WebKit know to try the next CSS family name. However, fontconfig
     // configs allow substitutions (mapping "Arial -> Helvetica" etc) and we
     // wish to support that.
@@ -506,7 +487,7 @@ bool SkFontConfigInterfaceDirect::matchFamilyName(const char familyName[],
         return false;
     }
 
-    FcPattern* match = MatchFont(font_set, post_config_family, familyStr);
+    FcPattern* match = this->MatchFont(font_set, post_config_family, familyStr);
     if (!match) {
         FcPatternDestroy(pattern);
         FcFontSetDestroy(font_set);
@@ -550,7 +531,7 @@ bool SkFontConfigInterfaceDirect::matchFamilyName(const char familyName[],
     return true;
 }
 
-SkStream* SkFontConfigInterfaceDirect::openStream(const FontIdentity& identity) {
+SkStreamAsset* SkFontConfigInterfaceDirect::openStream(const FontIdentity& identity) {
     return SkStream::NewFromFile(identity.fString.c_str());
 }
 
@@ -571,20 +552,20 @@ SkDataTable* SkFontConfigInterfaceDirect::getFamilyNames() {
 
     FcPattern* pat = FcPatternCreate();
     SkAutoTCallVProc<FcPattern, FcPatternDestroy> autoDestroyPat(pat);
-    if (NULL == pat) {
-        return NULL;
+    if (nullptr == pat) {
+        return nullptr;
     }
 
     FcObjectSet* os = FcObjectSetBuild(FC_FAMILY, (char *)0);
     SkAutoTCallVProc<FcObjectSet, FcObjectSetDestroy> autoDestroyOs(os);
-    if (NULL == os) {
-        return NULL;
+    if (nullptr == os) {
+        return nullptr;
     }
 
-    FcFontSet* fs = FcFontList(NULL, pat, os);
+    FcFontSet* fs = FcFontList(nullptr, pat, os);
     SkAutoTCallVProc<FcFontSet, FcFontSetDestroy> autoDestroyFs(fs);
-    if (NULL == fs) {
-        return NULL;
+    if (nullptr == fs) {
+        return nullptr;
     }
 
     SkTDArray<const char*> names;
@@ -608,8 +589,8 @@ bool SkFontConfigInterfaceDirect::matchFamilySet(const char inFamilyName[],
     SkAutoMutexAcquire ac(mutex_);
 
 #if 0
-    std::string familyStr(familyName ? familyName : "");
-    if (familyStr.length() > kMaxFontFamilyLength) {
+    SkString familyStr(familyName ? familyName : "");
+    if (familyStr.size() > kMaxFontFamilyLength) {
         return false;
     }
 
@@ -622,7 +603,7 @@ bool SkFontConfigInterfaceDirect::matchFamilySet(const char inFamilyName[],
     }
     FcPatternAddBool(pattern, FC_SCALABLE, FcTrue);
 
-    FcConfigSubstitute(NULL, pattern, FcMatchPattern);
+    FcConfigSubstitute(nullptr, pattern, FcMatchPattern);
     FcDefaultSubstitute(pattern);
 
     // Font matching:
@@ -630,7 +611,7 @@ bool SkFontConfigInterfaceDirect::matchFamilySet(const char inFamilyName[],
     //    font-family: a, b, c, serif;
     // However, fontconfig will always do its best to find *a* font when asked
     // for something so we need a way to tell if the match which it has found is
-    // "good enough" for us. Otherwise, we can return NULL which gets piped up
+    // "good enough" for us. Otherwise, we can return nullptr which gets piped up
     // and lets WebKit know to try the next CSS family name. However, fontconfig
     // configs allow substitutions (mapping "Arial -> Helvetica" etc) and we
     // wish to support that.
@@ -663,7 +644,7 @@ bool SkFontConfigInterfaceDirect::matchFamilySet(const char inFamilyName[],
         return false;
     }
 
-    FcPattern* match = MatchFont(font_set, post_config_family, familyStr);
+    FcPattern* match = this->MatchFont(font_set, post_config_family, familyStr);
     if (!match) {
         FcPatternDestroy(pattern);
         FcFontSetDestroy(font_set);
@@ -708,11 +689,11 @@ bool SkFontConfigInterfaceDirect::matchFamilySet(const char inFamilyName[],
 ////////////////////
 
         int count;
-        FcPattern** match = MatchFont(font_set, post_config_family, &count);
+        FcPattern** match = this->MatchFont(font_set, post_config_family, &count);
         if (!match) {
             FcPatternDestroy(pattern);
             FcFontSetDestroy(font_set);
-            return NULL;
+            return nullptr;
         }
 
         FcPatternDestroy(pattern);
@@ -725,9 +706,7 @@ bool SkFontConfigInterfaceDirect::matchFamilySet(const char inFamilyName[],
             }
         }
 
-        SkFontStyleSet_FC* sset = SkNEW_ARGS(SkFontStyleSet_FC,
-                                             (trimmedMatches.begin(),
-                                              trimmedMatches.count()));
+        SkFontStyleSet_FC* sset = new SkFontStyleSet_FC                                               (trimmedMatches.begin(),                                               trimmedMatches.count());
 #endif
     return false;
 }
diff --git a/gfx/skia/skia/src/ports/SkFontConfigInterface_direct.h b/gfx/skia/skia/src/ports/SkFontConfigInterface_direct.h
new file mode 100644
index 000000000000..450a3f0c318c
--- /dev/null
+++ b/gfx/skia/skia/src/ports/SkFontConfigInterface_direct.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2009-2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* migrated from chrome/src/skia/ext/SkFontHost_fontconfig_direct.cpp */
+
+#include "SkFontConfigInterface.h"
+#include "SkMutex.h"
+
+#include <fontconfig/fontconfig.h>
+
+class SkFontConfigInterfaceDirect : public SkFontConfigInterface {
+public:
+    SkFontConfigInterfaceDirect();
+    ~SkFontConfigInterfaceDirect() override;
+
+    bool matchFamilyName(const char familyName[],
+                         SkTypeface::Style requested,
+                         FontIdentity* outFontIdentifier,
+                         SkString* outFamilyName,
+                         SkTypeface::Style* outStyle) override;
+    SkStreamAsset* openStream(const FontIdentity&) override;
+
+    // new APIs
+    SkDataTable* getFamilyNames() override;
+    bool matchFamilySet(const char inFamilyName[],
+                        SkString* outFamilyName,
+                        SkTArray<FontIdentity>*) override;
+
+protected:
+    virtual bool isAccessible(const char* filename);
+
+private:
+    SkMutex mutex_;
+
+    bool isValidPattern(FcPattern* pattern);
+    FcPattern* MatchFont(FcFontSet* font_set, const char* post_config_family,
+                         const SkString& family);
+    typedef SkFontConfigInterface INHERITED;
+};
diff --git a/gfx/skia/skia/src/ports/SkFontConfigInterface_direct_factory.cpp b/gfx/skia/skia/src/ports/SkFontConfigInterface_direct_factory.cpp
new file mode 100644
index 000000000000..58dddab1b0c1
--- /dev/null
+++ b/gfx/skia/skia/src/ports/SkFontConfigInterface_direct_factory.cpp
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2009-2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* migrated from chrome/src/skia/ext/SkFontHost_fontconfig_direct.cpp */
+
+#include "SkFontConfigInterface_direct.h"
+#include "SkMutex.h"
+
+SkFontConfigInterface* SkFontConfigInterface::GetSingletonDirectInterface(SkBaseMutex* mutex) {
+    SkAutoMutexAcquire ac(mutex);
+    static SkFontConfigInterfaceDirect* singleton = nullptr;
+    if (singleton == nullptr) {
+        singleton = new SkFontConfigInterfaceDirect;
+    }
+    return singleton;
+}
diff --git a/gfx/skia/skia/src/ports/SkFontConfigInterface_direct_google3.cpp b/gfx/skia/skia/src/ports/SkFontConfigInterface_direct_google3.cpp
new file mode 100644
index 000000000000..d3f34d0abcff
--- /dev/null
+++ b/gfx/skia/skia/src/ports/SkFontConfigInterface_direct_google3.cpp
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2009-2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* migrated from chrome/src/skia/ext/SkFontHost_fontconfig_direct.cpp */
+
+#include "google_font_file_buffering.h"
+
+#include "SkFontConfigInterface_direct_google3.h"
+#include "SkStream.h"
+#include "SkString.h"
+#include "SkTypes.h"
+
+bool SkFontConfigInterfaceDirectGoogle3::isAccessible(const char* filename) {
+    // Check if this font has been pre-loaded into memory.
+    const char* unused;
+    if (GoogleFreeType::GoogleFt2ReadFontFromMemory(filename, &unused) >= 0) {
+        return true;
+    }
+    return this->INHERITED::isAccessible(filename);
+}
+
+SkStreamAsset* SkFontConfigInterfaceDirectGoogle3::openStream(const FontIdentity& identity) {
+    const char* c_filename = identity.fString.c_str();
+    // Read the system fonts from the fonts we've pre-loaded into memory.
+    const char* buffer;
+    int length = GoogleFreeType::GoogleFt2ReadFontFromMemory(
+        c_filename, &buffer);
+    if (length >= 0) return new SkMemoryStream(buffer, length);
+    return this->INHERITED::openStream(identity);
+}
diff --git a/gfx/skia/skia/src/ports/SkFontConfigInterface_direct_google3.h b/gfx/skia/skia/src/ports/SkFontConfigInterface_direct_google3.h
new file mode 100644
index 000000000000..fd5c5e2feda8
--- /dev/null
+++ b/gfx/skia/skia/src/ports/SkFontConfigInterface_direct_google3.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2009-2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* migrated from chrome/src/skia/ext/SkFontHost_fontconfig_direct.cpp */
+
+#include "SkFontConfigInterface_direct.h"
+#include "SkStream.h"
+#include "SkTypes.h"
+
+// Loads fonts using GoogleFt2ReadFontFromMemory.
+class SkFontConfigInterfaceDirectGoogle3 : public SkFontConfigInterfaceDirect {
+public:
+    SkFontConfigInterfaceDirectGoogle3() {}
+    ~SkFontConfigInterfaceDirectGoogle3() override {}
+
+    SkStreamAsset* openStream(const FontIdentity&) override;
+protected:
+    // Override isAccessible to return true if the font is in the cache.
+    bool isAccessible(const char* filename) override;
+private:
+    typedef SkFontConfigInterfaceDirect INHERITED;
+};
diff --git a/gfx/skia/skia/src/ports/SkFontConfigInterface_direct_google3_factory.cpp b/gfx/skia/skia/src/ports/SkFontConfigInterface_direct_google3_factory.cpp
new file mode 100644
index 000000000000..f0ac53fd8b5e
--- /dev/null
+++ b/gfx/skia/skia/src/ports/SkFontConfigInterface_direct_google3_factory.cpp
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2009-2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* migrated from chrome/src/skia/ext/SkFontHost_fontconfig_direct.cpp */
+
+#include "SkFontConfigInterface_direct_google3.h"
+#include "SkMutex.h"
+
+SkFontConfigInterface* SkFontConfigInterface::GetSingletonDirectInterface(SkBaseMutex* mutex) {
+    SkAutoMutexAcquire ac(mutex);
+    static SkFontConfigInterfaceDirectGoogle3* singleton = nullptr;
+    if (singleton == nullptr) {
+        singleton = new SkFontConfigInterfaceDirectGoogle3;
+    }
+    return singleton;
+}
diff --git a/gfx/skia/skia/src/ports/SkFontConfigParser_android.cpp b/gfx/skia/skia/src/ports/SkFontConfigParser_android.cpp
deleted file mode 100644
index cc2ca8cad92f..000000000000
--- a/gfx/skia/skia/src/ports/SkFontConfigParser_android.cpp
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
- * Copyright 2011 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkFontConfigParser_android.h"
-#include "SkTDArray.h"
-#include "SkTSearch.h"
-#include "SkTypeface.h"
-
-#include <expat.h>
-#include <stdio.h>
-#include <sys/system_properties.h>
-
-#include <limits>
-
-#define SYSTEM_FONTS_FILE "/system/etc/system_fonts.xml"
-#define FALLBACK_FONTS_FILE "/system/etc/fallback_fonts.xml"
-#define VENDOR_FONTS_FILE "/vendor/etc/fallback_fonts.xml"
-
-// These defines are used to determine the kind of tag that we're currently
-// populating with data. We only care about the sibling tags nameset and fileset
-// for now.
-#define NO_TAG 0
-#define NAMESET_TAG 1
-#define FILESET_TAG 2
-
-/**
- * The FamilyData structure is passed around by the parser so that each handler
- * can read these variables that are relevant to the current parsing.
- */
-struct FamilyData {
-    FamilyData(XML_Parser *parserRef, SkTDArray<FontFamily*> &familiesRef) :
-        parser(parserRef),
-        families(familiesRef),
-        currentFamily(NULL),
-        currentFontInfo(NULL),
-        currentTag(NO_TAG) {};
-
-    XML_Parser *parser;                // The expat parser doing the work
-    SkTDArray<FontFamily*> &families;  // The array that each family is put into as it is parsed
-    FontFamily *currentFamily;         // The current family being created
-    FontFileInfo *currentFontInfo;     // The current fontInfo being created
-    int currentTag;                    // A flag to indicate whether we're in nameset/fileset tags
-};
-
-/**
- * Handler for arbitrary text. This is used to parse the text inside each name
- * or file tag. The resulting strings are put into the fNames or FontFileInfo arrays.
- */
-static void textHandler(void *data, const char *s, int len) {
-    FamilyData *familyData = (FamilyData*) data;
-    // Make sure we're in the right state to store this name information
-    if (familyData->currentFamily &&
-            (familyData->currentTag == NAMESET_TAG || familyData->currentTag == FILESET_TAG)) {
-        switch (familyData->currentTag) {
-        case NAMESET_TAG: {
-            SkAutoAsciiToLC tolc(s, len);
-            familyData->currentFamily->fNames.push_back().set(tolc.lc(), len);
-            break;
-        }
-        case FILESET_TAG:
-            if (familyData->currentFontInfo) {
-                familyData->currentFontInfo->fFileName.set(s, len);
-            }
-            break;
-        default:
-            // Noop - don't care about any text that's not in the Fonts or Names list
-            break;
-        }
-    }
-}
-
-/** http://www.w3.org/TR/html-markup/datatypes.html#common.data.integer.non-negative-def */
-template <typename T> static bool parseNonNegativeInteger(const char* s, T* value) {
-    SK_COMPILE_ASSERT(std::numeric_limits<T>::is_integer, T_must_be_integer);
-    const T nMax = std::numeric_limits<T>::max() / 10;
-    const T dMax = std::numeric_limits<T>::max() - (nMax * 10);
-    T n = 0;
-    for (; *s; ++s) {
-        // Check if digit
-        if (*s < '0' || '9' < *s) {
-            return false;
-        }
-        int d = *s - '0';
-        // Check for overflow
-        if (n > nMax || (n == nMax && d > dMax)) {
-            return false;
-        }
-        n = (n * 10) + d;
-    }
-    *value = n;
-    return true;
-}
-
-/**
- * Handler for font files. This processes the attributes for language and
- * variants then lets textHandler handle the actual file name
- */
-static void fontFileElementHandler(FamilyData *familyData, const char **attributes) {
-
-    FontFileInfo& newFileInfo = familyData->currentFamily->fFontFiles.push_back();
-    if (attributes) {
-        int currentAttributeIndex = 0;
-        while (attributes[currentAttributeIndex]) {
-            const char* attributeName = attributes[currentAttributeIndex];
-            const char* attributeValue = attributes[currentAttributeIndex+1];
-            int nameLength = strlen(attributeName);
-            int valueLength = strlen(attributeValue);
-            if (strncmp(attributeName, "variant", nameLength) == 0) {
-                if (strncmp(attributeValue, "elegant", valueLength) == 0) {
-                    newFileInfo.fPaintOptions.setFontVariant(SkPaintOptionsAndroid::kElegant_Variant);
-                } else if (strncmp(attributeValue, "compact", valueLength) == 0) {
-                    newFileInfo.fPaintOptions.setFontVariant(SkPaintOptionsAndroid::kCompact_Variant);
-                }
-            } else if (strncmp(attributeName, "lang", nameLength) == 0) {
-                newFileInfo.fPaintOptions.setLanguage(attributeValue);
-            } else if (strncmp(attributeName, "index", nameLength) == 0) {
-                int value;
-                if (parseNonNegativeInteger(attributeValue, &value)) {
-                    newFileInfo.fIndex = value;
-                } else {
-                    SkDebugf("---- SystemFonts index=%s (INVALID)", attributeValue);
-                }
-            }
-            //each element is a pair of attributeName/attributeValue string pairs
-            currentAttributeIndex += 2;
-        }
-    }
-    familyData->currentFontInfo = &newFileInfo;
-    XML_SetCharacterDataHandler(*familyData->parser, textHandler);
-}
-
-/**
- * Handler for the start of a tag. The only tags we expect are family, nameset,
- * fileset, name, and file.
- */
-static void startElementHandler(void *data, const char *tag, const char **atts) {
-    FamilyData *familyData = (FamilyData*) data;
-    int len = strlen(tag);
-    if (strncmp(tag, "family", len)== 0) {
-        familyData->currentFamily = new FontFamily();
-        familyData->currentFamily->order = -1;
-        // The Family tag has an optional "order" attribute with an integer value >= 0
-        // If this attribute does not exist, the default value is -1
-        for (int i = 0; atts[i] != NULL; i += 2) {
-            const char* valueString = atts[i+1];
-            int value;
-            int len = sscanf(valueString, "%d", &value);
-            if (len > 0) {
-                familyData->currentFamily->order = value;
-            }
-        }
-    } else if (len == 7 && strncmp(tag, "nameset", len) == 0) {
-        familyData->currentTag = NAMESET_TAG;
-    } else if (len == 7 && strncmp(tag, "fileset", len) == 0) {
-        familyData->currentTag = FILESET_TAG;
-    } else if (strncmp(tag, "name", len) == 0 && familyData->currentTag == NAMESET_TAG) {
-        // If it's a Name, parse the text inside
-        XML_SetCharacterDataHandler(*familyData->parser, textHandler);
-    } else if (strncmp(tag, "file", len) == 0 && familyData->currentTag == FILESET_TAG) {
-        // If it's a file, parse the attributes, then parse the text inside
-        fontFileElementHandler(familyData, atts);
-    }
-}
-
-/**
- * Handler for the end of tags. We only care about family, nameset, fileset,
- * name, and file.
- */
-static void endElementHandler(void *data, const char *tag) {
-    FamilyData *familyData = (FamilyData*) data;
-    int len = strlen(tag);
-    if (strncmp(tag, "family", len)== 0) {
-        // Done parsing a Family - store the created currentFamily in the families array
-        *familyData->families.append() = familyData->currentFamily;
-        familyData->currentFamily = NULL;
-    } else if (len == 7 && strncmp(tag, "nameset", len) == 0) {
-        familyData->currentTag = NO_TAG;
-    } else if (len == 7 && strncmp(tag, "fileset", len) == 0) {
-        familyData->currentTag = NO_TAG;
-    } else if ((strncmp(tag, "name", len) == 0 && familyData->currentTag == NAMESET_TAG) ||
-            (strncmp(tag, "file", len) == 0 && familyData->currentTag == FILESET_TAG)) {
-        // Disable the arbitrary text handler installed to load Name data
-        XML_SetCharacterDataHandler(*familyData->parser, NULL);
-    }
-}
-
-/**
- * This function parses the given filename and stores the results in the given
- * families array.
- */
-static void parseConfigFile(const char *filename, SkTDArray<FontFamily*> &families) {
-
-    FILE* file = NULL;
-
-#if !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
-    // if we are using a version of Android prior to Android 4.2 (JellyBean MR1
-    // at API Level 17) then we need to look for files with a different suffix.
-    char sdkVersion[PROP_VALUE_MAX];
-    __system_property_get("ro.build.version.sdk", sdkVersion);
-    const int sdkVersionInt = atoi(sdkVersion);
-
-    if (0 != *sdkVersion && sdkVersionInt < 17) {
-        SkString basename;
-        SkString updatedFilename;
-        SkString locale = SkFontConfigParser::GetLocale();
-
-        basename.set(filename);
-        // Remove the .xml suffix. We'll add it back in a moment.
-        if (basename.endsWith(".xml")) {
-            basename.resize(basename.size()-4);
-        }
-        // Try first with language and region
-        updatedFilename.printf("%s-%s.xml", basename.c_str(), locale.c_str());
-        file = fopen(updatedFilename.c_str(), "r");
-        if (!file) {
-            // If not found, try next with just language
-            updatedFilename.printf("%s-%.2s.xml", basename.c_str(), locale.c_str());
-            file = fopen(updatedFilename.c_str(), "r");
-        }
-    }
-#endif
-
-    if (NULL == file) {
-        file = fopen(filename, "r");
-    }
-
-    // Some of the files we attempt to parse (in particular, /vendor/etc/fallback_fonts.xml)
-    // are optional - failure here is okay because one of these optional files may not exist.
-    if (NULL == file) {
-        return;
-    }
-
-    XML_Parser parser = XML_ParserCreate(NULL);
-    FamilyData *familyData = new FamilyData(&parser, families);
-    XML_SetUserData(parser, familyData);
-    XML_SetElementHandler(parser, startElementHandler, endElementHandler);
-
-    char buffer[512];
-    bool done = false;
-    while (!done) {
-        fgets(buffer, sizeof(buffer), file);
-        int len = strlen(buffer);
-        if (feof(file) != 0) {
-            done = true;
-        }
-        XML_Parse(parser, buffer, len, done);
-    }
-    XML_ParserFree(parser);
-    fclose(file);
-}
-
-static void getSystemFontFamilies(SkTDArray<FontFamily*> &fontFamilies) {
-    parseConfigFile(SYSTEM_FONTS_FILE, fontFamilies);
-}
-
-static void getFallbackFontFamilies(SkTDArray<FontFamily*> &fallbackFonts) {
-    SkTDArray<FontFamily*> vendorFonts;
-    parseConfigFile(FALLBACK_FONTS_FILE, fallbackFonts);
-    parseConfigFile(VENDOR_FONTS_FILE, vendorFonts);
-
-    // This loop inserts the vendor fallback fonts in the correct order in the
-    // overall fallbacks list.
-    int currentOrder = -1;
-    for (int i = 0; i < vendorFonts.count(); ++i) {
-        FontFamily* family = vendorFonts[i];
-        int order = family->order;
-        if (order < 0) {
-            if (currentOrder < 0) {
-                // Default case - just add it to the end of the fallback list
-                *fallbackFonts.append() = family;
-            } else {
-                // no order specified on this font, but we're incrementing the order
-                // based on an earlier order insertion request
-                *fallbackFonts.insert(currentOrder++) = family;
-            }
-        } else {
-            // Add the font into the fallback list in the specified order. Set
-            // currentOrder for correct placement of other fonts in the vendor list.
-            *fallbackFonts.insert(order) = family;
-            currentOrder = order + 1;
-        }
-    }
-}
-
-/**
- * Loads data on font families from various expected configuration files. The
- * resulting data is returned in the given fontFamilies array.
- */
-void SkFontConfigParser::GetFontFamilies(SkTDArray<FontFamily*> &fontFamilies) {
-
-    getSystemFontFamilies(fontFamilies);
-
-    // Append all the fallback fonts to system fonts
-    SkTDArray<FontFamily*> fallbackFonts;
-    getFallbackFontFamilies(fallbackFonts);
-    for (int i = 0; i < fallbackFonts.count(); ++i) {
-        fallbackFonts[i]->fIsFallbackFont = true;
-        *fontFamilies.append() = fallbackFonts[i];
-    }
-}
-
-void SkFontConfigParser::GetTestFontFamilies(SkTDArray<FontFamily*> &fontFamilies,
-                                             const char* testMainConfigFile,
-                                             const char* testFallbackConfigFile) {
-    parseConfigFile(testMainConfigFile, fontFamilies);
-
-    SkTDArray<FontFamily*> fallbackFonts;
-    parseConfigFile(testFallbackConfigFile, fallbackFonts);
-
-    // Append all fallback fonts to system fonts
-    for (int i = 0; i < fallbackFonts.count(); ++i) {
-        fallbackFonts[i]->fIsFallbackFont = true;
-        *fontFamilies.append() = fallbackFonts[i];
-    }
-}
-
-/**
- * Read the persistent locale.
- */
-SkString SkFontConfigParser::GetLocale()
-{
-    char propLang[PROP_VALUE_MAX], propRegn[PROP_VALUE_MAX];
-    __system_property_get("persist.sys.language", propLang);
-    __system_property_get("persist.sys.country", propRegn);
-
-    if (*propLang == 0 && *propRegn == 0) {
-        /* Set to ro properties, default is en_US */
-        __system_property_get("ro.product.locale.language", propLang);
-        __system_property_get("ro.product.locale.region", propRegn);
-        if (*propLang == 0 && *propRegn == 0) {
-            strcpy(propLang, "en");
-            strcpy(propRegn, "US");
-        }
-    }
-
-    SkString locale(6);
-    char* localeCStr = locale.writable_str();
-
-    strncpy(localeCStr, propLang, 2);
-    localeCStr[2] = '-';
-    strncpy(&localeCStr[3], propRegn, 2);
-    localeCStr[5] = '\0';
-
-    return locale;
-}
diff --git a/gfx/skia/skia/src/ports/SkFontConfigParser_android.h b/gfx/skia/skia/src/ports/SkFontConfigParser_android.h
deleted file mode 100644
index 8119fd7558e3..000000000000
--- a/gfx/skia/skia/src/ports/SkFontConfigParser_android.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2011 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SKFONTCONFIGPARSER_ANDROID_H_
-#define SKFONTCONFIGPARSER_ANDROID_H_
-
-#include "SkTypes.h"
-
-#include "SkPaintOptionsAndroid.h"
-#include "SkString.h"
-#include "SkTDArray.h"
-
-struct FontFileInfo {
-    FontFileInfo() : fIndex(0) { }
-
-    SkString              fFileName;
-    int                   fIndex;
-    SkPaintOptionsAndroid fPaintOptions;
-};
-
-/**
- * The FontFamily data structure is created during parsing and handed back to
- * Skia to fold into its representation of font families. fNames is the list of
- * font names that alias to a font family. fontFileArray is the list of information
- * about each file.  Order is the priority order for the font. This is
- * used internally to determine the order in which to place fallback fonts as
- * they are read from the configuration files.
- */
-struct FontFamily {
-    FontFamily() : fIsFallbackFont(false), order(-1) {}
-
-    SkTArray<SkString> fNames;
-    SkTArray<FontFileInfo> fFontFiles;
-    bool fIsFallbackFont;
-    int order; // only used internally by SkFontConfigParser
-};
-
-namespace SkFontConfigParser {
-
-/**
- * Parses all system font configuration files and returns the results in an
- * array of FontFamily structures.
- */
-void GetFontFamilies(SkTDArray<FontFamily*> &fontFamilies);
-
-/**
- * Parses all test font configuration files and returns the results in an
- * array of FontFamily structures.
- */
-void GetTestFontFamilies(SkTDArray<FontFamily*> &fontFamilies,
-                         const char* testMainConfigFile,
-                         const char* testFallbackConfigFile);
-
-SkString GetLocale();
-
-} // SkFontConfigParser namespace
-
-#endif /* SKFONTCONFIGPARSER_ANDROID_H_ */
diff --git a/gfx/skia/skia/src/ports/SkFontConfigTypeface.h b/gfx/skia/skia/src/ports/SkFontConfigTypeface.h
index b6f8797eb7c9..a6dc6cae7984 100644
--- a/gfx/skia/skia/src/ports/SkFontConfigTypeface.h
+++ b/gfx/skia/skia/src/ports/SkFontConfigTypeface.h
@@ -15,58 +15,50 @@ class SkFontDescriptor;
 class FontConfigTypeface : public SkTypeface_FreeType {
     SkFontConfigInterface::FontIdentity fIdentity;
     SkString fFamilyName;
-    SkStream* fLocalStream;
+    SkAutoTDelete<SkStreamAsset> fLocalStream;
 
 public:
-    static FontConfigTypeface* Create(Style style,
+    static FontConfigTypeface* Create(const SkFontStyle& style,
                                       const SkFontConfigInterface::FontIdentity& fi,
                                       const SkString& familyName) {
-        return SkNEW_ARGS(FontConfigTypeface, (style, fi, familyName));
+        return new FontConfigTypeface(style, fi, familyName);
     }
 
-    static FontConfigTypeface* Create(Style style, bool fixedWidth, SkStream* localStream) {
-        return SkNEW_ARGS(FontConfigTypeface, (style, fixedWidth, localStream));
-    }
-
-    virtual ~FontConfigTypeface() {
-        SkSafeUnref(fLocalStream);
+    static FontConfigTypeface* Create(const SkFontStyle& style, bool fixedWidth,
+                                      SkStreamAsset* localStream) {
+        return new FontConfigTypeface(style, fixedWidth, localStream);
     }
 
     const SkFontConfigInterface::FontIdentity& getIdentity() const {
         return fIdentity;
     }
 
-    const char* getFamilyName() const { return fFamilyName.c_str(); }
-    SkStream*   getLocalStream() const { return fLocalStream; }
+    SkStreamAsset* getLocalStream() const { return fLocalStream.get(); }
 
     bool isFamilyName(const char* name) const {
         return fFamilyName.equals(name);
     }
 
-    static SkTypeface* LegacyCreateTypeface(const SkTypeface* family,
-                                            const char familyName[],
-                                            SkTypeface::Style);
+    static SkTypeface* LegacyCreateTypeface(const char familyName[], SkTypeface::Style);
 
 protected:
-    friend class SkFontHost;    // hack until we can make public versions
-
-    FontConfigTypeface(Style style,
+    FontConfigTypeface(const SkFontStyle& style,
                        const SkFontConfigInterface::FontIdentity& fi,
                        const SkString& familyName)
             : INHERITED(style, SkTypefaceCache::NewFontID(), false)
             , fIdentity(fi)
             , fFamilyName(familyName)
-            , fLocalStream(NULL) {}
+            , fLocalStream(nullptr) {}
 
-    FontConfigTypeface(Style style, bool fixedWidth, SkStream* localStream)
-            : INHERITED(style, SkTypefaceCache::NewFontID(), fixedWidth) {
+    FontConfigTypeface(const SkFontStyle& style, bool fixedWidth, SkStreamAsset* localStream)
+            : INHERITED(style, SkTypefaceCache::NewFontID(), fixedWidth)
+            , fLocalStream(localStream) {
         // we default to empty fFamilyName and fIdentity
-        fLocalStream = localStream;
-        SkSafeRef(localStream);
     }
 
-    virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE;
-    virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE;
+    void onGetFamilyName(SkString* familyName) const override;
+    void onGetFontDescriptor(SkFontDescriptor*, bool*) const override;
+    SkStreamAsset* onOpenStream(int* ttcIndex) const override;
 
 private:
     typedef SkTypeface_FreeType INHERITED;
diff --git a/gfx/skia/skia/src/ports/SkFontHost_FreeType.cpp b/gfx/skia/skia/src/ports/SkFontHost_FreeType.cpp
index eada11205f2a..e8b72b5e090f 100644
--- a/gfx/skia/skia/src/ports/SkFontHost_FreeType.cpp
+++ b/gfx/skia/skia/src/ports/SkFontHost_FreeType.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -12,55 +11,37 @@
 #include "SkColorPriv.h"
 #include "SkDescriptor.h"
 #include "SkFDot6.h"
-#include "SkFloatingPoint.h"
-#include "SkFontHost.h"
+#include "SkFontDescriptor.h"
 #include "SkFontHost_FreeType_common.h"
 #include "SkGlyph.h"
 #include "SkMask.h"
 #include "SkMaskGamma.h"
 #include "SkMatrix22.h"
+#include "SkMutex.h"
 #include "SkOTUtils.h"
-#include "SkOnce.h"
+#include "SkPath.h"
 #include "SkScalerContext.h"
 #include "SkStream.h"
 #include "SkString.h"
 #include "SkTemplates.h"
-#include "SkThread.h"
+#include "SkTypes.h"
 
 #if defined(SK_CAN_USE_DLOPEN)
 #include <dlfcn.h>
 #endif
 #include <ft2build.h>
+#include FT_ADVANCES_H
+#include FT_BITMAP_H
 #include FT_FREETYPE_H
+#include FT_LCD_FILTER_H
+#include FT_MODULE_H
+#include FT_MULTIPLE_MASTERS_H
 #include FT_OUTLINE_H
 #include FT_SIZES_H
+#include FT_SYSTEM_H
 #include FT_TRUETYPE_TABLES_H
 #include FT_TYPE1_TABLES_H
-#include FT_BITMAP_H
-// In the past, FT_GlyphSlot_Own_Bitmap was defined in this header file.
-#include FT_SYNTHESIS_H
 #include FT_XFREE86_H
-#ifdef FT_LCD_FILTER_H
-#include FT_LCD_FILTER_H
-#endif
-
-// Defined in FreeType 2.3.8 and later.
-// This is a silly build time check, we would need a runtime check if we really cared.
-#ifdef   FT_ADVANCES_H
-#include FT_ADVANCES_H
-#endif
-
-#if 0
-// Also include the files by name for build tools which require this.
-#include <freetype/freetype.h>
-#include <freetype/ftoutln.h>
-#include <freetype/ftsizes.h>
-#include <freetype/tttables.h>
-#include <freetype/ftadvanc.h>
-#include <freetype/ftlcdfil.h>
-#include <freetype/ftbitmap.h>
-#include <freetype/ftsynth.h>
-#endif
 
 // FT_LOAD_COLOR and the corresponding FT_Pixel_Mode::FT_PIXEL_MODE_BGRA
 // were introduced in FreeType 2.5.0.
@@ -70,116 +51,130 @@
 #    define FT_PIXEL_MODE_BGRA 7
 #endif
 
-// FT_HAS_COLOR and the corresponding FT_FACE_FLAG_COLOR
-// were introduced in FreeType 2.5.1
-// The following may be removed once FreeType 2.5.1 is required to build.
-#ifndef FT_HAS_COLOR
-#    define FT_HAS_COLOR(face) false
-#endif
-
 //#define ENABLE_GLYPH_SPEW     // for tracing calls
 //#define DUMP_STRIKE_CREATION
-
+//#define SK_FONTHOST_FREETYPE_USE_NORMAL_LCD_FILTER
+//#define SK_FONTHOST_FREETYPE_RUNTIME_VERSION
 //#define SK_GAMMA_APPLY_TO_A8
 
 using namespace skia_advanced_typeface_metrics_utils;
 
 static bool isLCD(const SkScalerContext::Rec& rec) {
-    switch (rec.fMaskFormat) {
-        case SkMask::kLCD16_Format:
-        case SkMask::kLCD32_Format:
-            return true;
-        default:
-            return false;
-    }
+    return SkMask::kLCD16_Format == rec.fMaskFormat;
 }
 
 //////////////////////////////////////////////////////////////////////////
 
+extern "C" {
+    static void* sk_ft_alloc(FT_Memory, long size) {
+        return sk_malloc_throw(size);
+    }
+    static void sk_ft_free(FT_Memory, void* block) {
+        sk_free(block);
+    }
+    static void* sk_ft_realloc(FT_Memory, long cur_size, long new_size, void* block) {
+        return sk_realloc_throw(block, new_size);
+    }
+};
+FT_MemoryRec_ gFTMemory = { nullptr, sk_ft_alloc, sk_ft_free, sk_ft_realloc };
+
+class FreeTypeLibrary : SkNoncopyable {
+public:
+    FreeTypeLibrary() : fLibrary(nullptr), fIsLCDSupported(false), fLCDExtra(0) {
+        if (FT_New_Library(&gFTMemory, &fLibrary)) {
+            return;
+        }
+        FT_Add_Default_Modules(fLibrary);
+
+        // Setup LCD filtering. This reduces color fringes for LCD smoothed glyphs.
+        // Default { 0x10, 0x40, 0x70, 0x40, 0x10 } adds up to 0x110, simulating ink spread.
+        // SetLcdFilter must be called before SetLcdFilterWeights.
+        if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) {
+            fIsLCDSupported = true;
+            fLCDExtra = 2; //Using a filter adds one full pixel to each side.
+
+#ifdef SK_FONTHOST_FREETYPE_USE_NORMAL_LCD_FILTER
+            // Adds to 0x110 simulating ink spread, but provides better results than default.
+            static unsigned char gGaussianLikeHeavyWeights[] = { 0x1A, 0x43, 0x56, 0x43, 0x1A, };
+
+#    if SK_FONTHOST_FREETYPE_RUNTIME_VERSION > 0x020400
+            FT_Library_SetLcdFilterWeights(fLibrary, gGaussianLikeHeavyWeights);
+#    elif SK_CAN_USE_DLOPEN == 1
+            //The FreeType library is already loaded, so symbols are available in process.
+            void* self = dlopen(nullptr, RTLD_LAZY);
+            if (self) {
+                FT_Library_SetLcdFilterWeightsProc setLcdFilterWeights;
+                //The following cast is non-standard, but safe for POSIX.
+                *reinterpret_cast<void**>(&setLcdFilterWeights) =
+                        dlsym(self, "FT_Library_SetLcdFilterWeights");
+                dlclose(self);
+
+                if (setLcdFilterWeights) {
+                    setLcdFilterWeights(fLibrary, gGaussianLikeHeavyWeights);
+                }
+            }
+#    endif
+#endif
+        }
+    }
+    ~FreeTypeLibrary() {
+        if (fLibrary) {
+            FT_Done_Library(fLibrary);
+        }
+    }
+
+    FT_Library library() { return fLibrary; }
+    bool isLCDSupported() { return fIsLCDSupported; }
+    int lcdExtra() { return fLCDExtra; }
+
+private:
+    FT_Library fLibrary;
+    bool fIsLCDSupported;
+    int fLCDExtra;
+
+    // FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0.
+    // The following platforms provide FreeType of at least 2.4.0.
+    // Ubuntu >= 11.04 (previous deprecated April 2013)
+    // Debian >= 6.0 (good)
+    // OpenSuse >= 11.4 (previous deprecated January 2012 / Nov 2013 for Evergreen 11.2)
+    // Fedora >= 14 (good)
+    // Android >= Gingerbread (good)
+    typedef FT_Error (*FT_Library_SetLcdFilterWeightsProc)(FT_Library, unsigned char*);
+};
+
 struct SkFaceRec;
 
 SK_DECLARE_STATIC_MUTEX(gFTMutex);
-static int          gFTCount;
-static FT_Library   gFTLibrary;
-static SkFaceRec*   gFaceRecHead;
-static bool         gLCDSupportValid;  // true iff |gLCDSupport| has been set.
-static bool         gLCDSupport;  // true iff LCD is supported by the runtime.
-static int          gLCDExtra;  // number of extra pixels for filtering.
+static FreeTypeLibrary* gFTLibrary;
+static SkFaceRec* gFaceRecHead;
 
-/////////////////////////////////////////////////////////////////////////
-
-// FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0.
-// The following platforms provide FreeType of at least 2.4.0.
-// Ubuntu >= 11.04 (previous deprecated April 2013)
-// Debian >= 6.0 (good)
-// OpenSuse >= 11.4 (previous deprecated January 2012 / Nov 2013 for Evergreen 11.2)
-// Fedora >= 14 (good)
-// Android >= Gingerbread (good)
-typedef FT_Error (*FT_Library_SetLcdFilterWeightsProc)(FT_Library, unsigned char*);
+// Private to RefFreeType and UnrefFreeType
+static int gFTCount;
 
 // Caller must lock gFTMutex before calling this function.
-static bool InitFreetype() {
-    FT_Error err = FT_Init_FreeType(&gFTLibrary);
-    if (err) {
-        return false;
+static bool ref_ft_library() {
+    gFTMutex.assertHeld();
+    SkASSERT(gFTCount >= 0);
+
+    if (0 == gFTCount) {
+        SkASSERT(nullptr == gFTLibrary);
+        gFTLibrary = new FreeTypeLibrary;
     }
-
-    // Setup LCD filtering. This reduces color fringes for LCD smoothed glyphs.
-#ifdef FT_LCD_FILTER_H
-    // Use default { 0x10, 0x40, 0x70, 0x40, 0x10 }, as it adds up to 0x110, simulating ink spread.
-    // SetLcdFilter must be called before SetLcdFilterWeights.
-    err = FT_Library_SetLcdFilter(gFTLibrary, FT_LCD_FILTER_DEFAULT);
-    if (0 == err) {
-        gLCDSupport = true;
-        gLCDExtra = 2; //Using a filter adds one full pixel to each side.
-
-#ifdef SK_FONTHOST_FREETYPE_USE_NORMAL_LCD_FILTER
-        // This also adds to 0x110 simulating ink spread, but provides better results than default.
-        static unsigned char gGaussianLikeHeavyWeights[] = { 0x1A, 0x43, 0x56, 0x43, 0x1A, };
-
-#if defined(SK_FONTHOST_FREETYPE_RUNTIME_VERSION) && \
-            SK_FONTHOST_FREETYPE_RUNTIME_VERSION > 0x020400
-        err = FT_Library_SetLcdFilterWeights(gFTLibrary, gGaussianLikeHeavyWeights);
-#elif defined(SK_CAN_USE_DLOPEN) && SK_CAN_USE_DLOPEN == 1
-        //The FreeType library is already loaded, so symbols are available in process.
-        void* self = dlopen(NULL, RTLD_LAZY);
-        if (NULL != self) {
-            FT_Library_SetLcdFilterWeightsProc setLcdFilterWeights;
-            //The following cast is non-standard, but safe for POSIX.
-            *reinterpret_cast<void**>(&setLcdFilterWeights) = dlsym(self, "FT_Library_SetLcdFilterWeights");
-            dlclose(self);
-
-            if (NULL != setLcdFilterWeights) {
-                err = setLcdFilterWeights(gFTLibrary, gGaussianLikeHeavyWeights);
-            }
-        }
-#endif
-#endif
-    }
-#else
-    gLCDSupport = false;
-#endif
-    gLCDSupportValid = true;
-
-    return true;
+    ++gFTCount;
+    return gFTLibrary->library();
 }
 
-// Called while holding gFTMutex.
-static void determine_lcd_support(bool* lcdSupported) {
-    if (!gLCDSupportValid) {
-        // This will determine LCD support as a side effect.
-        InitFreetype();
-        FT_Done_FreeType(gFTLibrary);
-    }
-    SkASSERT(gLCDSupportValid);
-    *lcdSupported = gLCDSupport;
-}
+// Caller must lock gFTMutex before calling this function.
+static void unref_ft_library() {
+    gFTMutex.assertHeld();
+    SkASSERT(gFTCount > 0);
 
-// Lazy, once, wrapper to ask the FreeType Library if it can support LCD text
-static bool is_lcd_supported() {
-    static bool lcdSupported = false;
-    SkOnce(&gLCDSupportValid, &gFTMutex, determine_lcd_support, &lcdSupported);
-    return lcdSupported;
+    --gFTCount;
+    if (0 == gFTCount) {
+        SkASSERT(nullptr != gFTLibrary);
+        delete gFTLibrary;
+        SkDEBUGCODE(gFTLibrary = nullptr;)
+    }
 }
 
 class SkScalerContext_FreeType : public SkScalerContext_FreeType_Base {
@@ -188,23 +183,20 @@ public:
     virtual ~SkScalerContext_FreeType();
 
     bool success() const {
-        return fFaceRec != NULL &&
-               fFTSize != NULL &&
-               fFace != NULL;
+        return fFTSize != nullptr && fFace != nullptr;
     }
 
 protected:
-    virtual unsigned generateGlyphCount() SK_OVERRIDE;
-    virtual uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE;
-    virtual void generateAdvance(SkGlyph* glyph) SK_OVERRIDE;
-    virtual void generateMetrics(SkGlyph* glyph) SK_OVERRIDE;
-    virtual void generateImage(const SkGlyph& glyph) SK_OVERRIDE;
-    virtual void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE;
-    virtual void generateFontMetrics(SkPaint::FontMetrics*) SK_OVERRIDE;
-    virtual SkUnichar generateGlyphToChar(uint16_t glyph) SK_OVERRIDE;
+    unsigned generateGlyphCount() override;
+    uint16_t generateCharToGlyph(SkUnichar uni) override;
+    void generateAdvance(SkGlyph* glyph) override;
+    void generateMetrics(SkGlyph* glyph) override;
+    void generateImage(const SkGlyph& glyph) override;
+    void generatePath(const SkGlyph& glyph, SkPath* path) override;
+    void generateFontMetrics(SkPaint::FontMetrics*) override;
+    SkUnichar generateGlyphToChar(uint16_t glyph) override;
 
 private:
-    SkFaceRec*  fFaceRec;
     FT_Face     fFace;              // reference to shared face in gFaceRecHead
     FT_Size     fFTSize;            // our own copy
     FT_Int      fStrikeIndex;
@@ -233,118 +225,145 @@ private:
 ///////////////////////////////////////////////////////////////////////////
 
 struct SkFaceRec {
-    SkFaceRec*      fNext;
-    FT_Face         fFace;
-    FT_StreamRec    fFTStream;
-    SkStream*       fSkStream;
-    uint32_t        fRefCnt;
-    uint32_t        fFontID;
+    SkFaceRec* fNext;
+    FT_Face fFace;
+    FT_StreamRec fFTStream;
+    SkAutoTDelete<SkStreamAsset> fSkStream;
+    uint32_t fRefCnt;
+    uint32_t fFontID;
 
-    // assumes ownership of the stream, will call unref() when its done
-    SkFaceRec(SkStream* strm, uint32_t fontID);
-    ~SkFaceRec() {
-        fSkStream->unref();
-    }
+    // assumes ownership of the stream, will delete when its done
+    SkFaceRec(SkStreamAsset* strm, uint32_t fontID);
 };
 
 extern "C" {
-    static unsigned long sk_stream_read(FT_Stream       stream,
-                                        unsigned long   offset,
-                                        unsigned char*  buffer,
-                                        unsigned long   count ) {
-        SkStream* str = (SkStream*)stream->descriptor.pointer;
+    static unsigned long sk_ft_stream_io(FT_Stream ftStream,
+                                         unsigned long offset,
+                                         unsigned char* buffer,
+                                         unsigned long count)
+    {
+        SkStreamAsset* stream = static_cast<SkStreamAsset*>(ftStream->descriptor.pointer);
 
         if (count) {
-            if (!str->rewind()) {
+            if (!stream->seek(offset)) {
                 return 0;
-            } else {
-                unsigned long ret;
-                if (offset) {
-                    ret = str->read(NULL, offset);
-                    if (ret != offset) {
-                        return 0;
-                    }
-                }
-                ret = str->read(buffer, count);
-                if (ret != count) {
-                    return 0;
-                }
-                count = ret;
             }
+            count = stream->read(buffer, count);
         }
         return count;
     }
 
-    static void sk_stream_close(FT_Stream) {}
+    static void sk_ft_stream_close(FT_Stream) {}
 }
 
-SkFaceRec::SkFaceRec(SkStream* strm, uint32_t fontID)
-        : fNext(NULL), fSkStream(strm), fRefCnt(1), fFontID(fontID) {
-//    SkDEBUGF(("SkFaceRec: opening %s (%p)\n", key.c_str(), strm));
-
+SkFaceRec::SkFaceRec(SkStreamAsset* stream, uint32_t fontID)
+        : fNext(nullptr), fSkStream(stream), fRefCnt(1), fFontID(fontID)
+{
     sk_bzero(&fFTStream, sizeof(fFTStream));
     fFTStream.size = fSkStream->getLength();
     fFTStream.descriptor.pointer = fSkStream;
-    fFTStream.read  = sk_stream_read;
-    fFTStream.close = sk_stream_close;
+    fFTStream.read  = sk_ft_stream_io;
+    fFTStream.close = sk_ft_stream_close;
+}
+
+static void ft_face_setup_axes(FT_Face face, const SkFontData& data) {
+    if (!(face->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS)) {
+        return;
+    }
+
+    SkDEBUGCODE(
+        FT_MM_Var* variations = nullptr;
+        if (FT_Get_MM_Var(face, &variations)) {
+            SkDEBUGF(("INFO: font %s claims variations, but none found.\n", face->family_name));
+            return;
+        }
+        SkAutoFree autoFreeVariations(variations);
+
+        if (static_cast<FT_UInt>(data.getAxisCount()) != variations->num_axis) {
+            SkDEBUGF(("INFO: font %s has %d variations, but %d were specified.\n",
+                    face->family_name, variations->num_axis, data.getAxisCount()));
+            return;
+        }
+    )
+
+    SkAutoSTMalloc<4, FT_Fixed> coords(data.getAxisCount());
+    for (int i = 0; i < data.getAxisCount(); ++i) {
+        coords[i] = data.getAxis()[i];
+    }
+    if (FT_Set_Var_Design_Coordinates(face, data.getAxisCount(), coords.get())) {
+        SkDEBUGF(("INFO: font %s has variations, but specified variations could not be set.\n",
+                  face->family_name));
+        return;
+    }
 }
 
 // Will return 0 on failure
 // Caller must lock gFTMutex before calling this function.
-static SkFaceRec* ref_ft_face(const SkTypeface* typeface) {
+static FT_Face ref_ft_face(const SkTypeface* typeface) {
+    gFTMutex.assertHeld();
+
     const SkFontID fontID = typeface->uniqueID();
     SkFaceRec* rec = gFaceRecHead;
     while (rec) {
         if (rec->fFontID == fontID) {
             SkASSERT(rec->fFace);
             rec->fRefCnt += 1;
-            return rec;
+            return rec->fFace;
         }
         rec = rec->fNext;
     }
 
-    int face_index;
-    SkStream* strm = typeface->openStream(&face_index);
-    if (NULL == strm) {
-        return NULL;
+    SkAutoTDelete<SkFontData> data(typeface->createFontData());
+    if (nullptr == data || !data->hasStream()) {
+        return nullptr;
     }
 
-    // this passes ownership of strm to the rec
-    rec = SkNEW_ARGS(SkFaceRec, (strm, fontID));
+    // this passes ownership of stream to the rec
+    rec = new SkFaceRec(data->detachStream(), fontID);
 
-    FT_Open_Args    args;
+    FT_Open_Args args;
     memset(&args, 0, sizeof(args));
-    const void* memoryBase = strm->getMemoryBase();
-
-    if (NULL != memoryBase) {
-//printf("mmap(%s)\n", keyString.c_str());
+    const void* memoryBase = rec->fSkStream->getMemoryBase();
+    if (memoryBase) {
         args.flags = FT_OPEN_MEMORY;
         args.memory_base = (const FT_Byte*)memoryBase;
-        args.memory_size = strm->getLength();
+        args.memory_size = rec->fSkStream->getLength();
     } else {
-//printf("fopen(%s)\n", keyString.c_str());
         args.flags = FT_OPEN_STREAM;
         args.stream = &rec->fFTStream;
     }
 
-    FT_Error err = FT_Open_Face(gFTLibrary, &args, face_index, &rec->fFace);
-    if (err) {    // bad filename, try the default font
-        fprintf(stderr, "ERROR: unable to open font '%x'\n", fontID);
-        SkDELETE(rec);
-        return NULL;
-    } else {
-        SkASSERT(rec->fFace);
-        //fprintf(stderr, "Opened font '%s'\n", filename.c_str());
-        rec->fNext = gFaceRecHead;
-        gFaceRecHead = rec;
-        return rec;
+    FT_Error err = FT_Open_Face(gFTLibrary->library(), &args, data->getIndex(), &rec->fFace);
+    if (err) {
+        SkDEBUGF(("ERROR: unable to open font '%x'\n", fontID));
+        delete rec;
+        return nullptr;
     }
+    SkASSERT(rec->fFace);
+
+    ft_face_setup_axes(rec->fFace, *data);
+
+    // FreeType will set the charmap to the "most unicode" cmap if it exists.
+    // If there are no unicode cmaps, the charmap is set to nullptr.
+    // However, "symbol" cmaps should also be considered "fallback unicode" cmaps
+    // because they are effectively private use area only (even if they aren't).
+    // This is the last on the fallback list at
+    // https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6cmap.html
+    if (!rec->fFace->charmap) {
+        FT_Select_Charmap(rec->fFace, FT_ENCODING_MS_SYMBOL);
+    }
+
+    rec->fNext = gFaceRecHead;
+    gFaceRecHead = rec;
+    return rec->fFace;
 }
 
 // Caller must lock gFTMutex before calling this function.
 static void unref_ft_face(FT_Face face) {
+    gFTMutex.assertHeld();
+
     SkFaceRec*  rec = gFaceRecHead;
-    SkFaceRec*  prev = NULL;
+    SkFaceRec*  prev = nullptr;
     while (rec) {
         SkFaceRec* next = rec->fNext;
         if (rec->fFace == face) {
@@ -355,7 +374,7 @@ static void unref_ft_face(FT_Face face) {
                     gFaceRecHead = next;
                 }
                 FT_Done_Face(face);
-                SkDELETE(rec);
+                delete rec;
             }
             return;
         }
@@ -367,90 +386,39 @@ static void unref_ft_face(FT_Face face) {
 
 class AutoFTAccess {
 public:
-    AutoFTAccess(const SkTypeface* tf) : fRec(NULL), fFace(NULL) {
+    AutoFTAccess(const SkTypeface* tf) : fFace(nullptr) {
         gFTMutex.acquire();
-        if (1 == ++gFTCount) {
-            if (!InitFreetype()) {
-                sk_throw();
-            }
-        }
-        fRec = ref_ft_face(tf);
-        if (fRec) {
-            fFace = fRec->fFace;
+        if (!ref_ft_library()) {
+            sk_throw();
         }
+        fFace = ref_ft_face(tf);
     }
 
     ~AutoFTAccess() {
         if (fFace) {
             unref_ft_face(fFace);
         }
-        if (0 == --gFTCount) {
-            FT_Done_FreeType(gFTLibrary);
-        }
+        unref_ft_library();
         gFTMutex.release();
     }
 
-    SkFaceRec* rec() { return fRec; }
     FT_Face face() { return fFace; }
 
 private:
-    SkFaceRec*  fRec;
     FT_Face     fFace;
 };
 
 ///////////////////////////////////////////////////////////////////////////
 
-// Work around for old versions of freetype.
-static FT_Error getAdvances(FT_Face face, FT_UInt start, FT_UInt count,
-                           FT_Int32 loadFlags, FT_Fixed* advances) {
-#ifdef FT_ADVANCES_H
-    return FT_Get_Advances(face, start, count, loadFlags, advances);
-#else
-    if (!face || start >= face->num_glyphs ||
-            start + count > face->num_glyphs || loadFlags != FT_LOAD_NO_SCALE) {
-        return 6;  // "Invalid argument."
-    }
-    if (count == 0)
-        return 0;
-
-    for (int i = 0; i < count; i++) {
-        FT_Error err = FT_Load_Glyph(face, start + i, FT_LOAD_NO_SCALE);
-        if (err)
-            return err;
-        advances[i] = face->glyph->advance.x;
-    }
-
-    return 0;
-#endif
-}
-
 static bool canEmbed(FT_Face face) {
-#ifdef FT_FSTYPE_RESTRICTED_LICENSE_EMBEDDING
     FT_UShort fsType = FT_Get_FSType_Flags(face);
     return (fsType & (FT_FSTYPE_RESTRICTED_LICENSE_EMBEDDING |
                       FT_FSTYPE_BITMAP_EMBEDDING_ONLY)) == 0;
-#else
-    // No embedding is 0x2 and bitmap embedding only is 0x200.
-    TT_OS2* os2_table;
-    if ((os2_table = (TT_OS2*)FT_Get_Sfnt_Table(face, ft_sfnt_os2)) != NULL) {
-        return (os2_table->fsType & 0x202) == 0;
-    }
-    return false;  // We tried, fail safe.
-#endif
 }
 
 static bool canSubset(FT_Face face) {
-#ifdef FT_FSTYPE_NO_SUBSETTING
     FT_UShort fsType = FT_Get_FSType_Flags(face);
     return (fsType & FT_FSTYPE_NO_SUBSETTING) == 0;
-#else
-    // No subset is 0x100.
-    TT_OS2* os2_table;
-    if ((os2_table = (TT_OS2*)FT_Get_Sfnt_Table(face, ft_sfnt_os2)) != NULL) {
-        return (os2_table->fsType & 0x100) == 0;
-    }
-    return false;  // We tried, fail safe.
-#endif
 }
 
 static bool GetLetterCBox(FT_Face face, char letter, FT_BBox* bbox) {
@@ -465,7 +433,7 @@ static bool GetLetterCBox(FT_Face face, char letter, FT_BBox* bbox) {
 
 static bool getWidthAdvance(FT_Face face, int gId, int16_t* data) {
     FT_Fixed advance = 0;
-    if (getAdvances(face, gId, 1, FT_LOAD_NO_SCALE, &advance)) {
+    if (FT_Get_Advances(face, gId, 1, FT_LOAD_NO_SCALE, &advance)) {
         return false;
     }
     SkASSERT(data);
@@ -473,67 +441,29 @@ static bool getWidthAdvance(FT_Face face, int gId, int16_t* data) {
     return true;
 }
 
-static void populate_glyph_to_unicode(FT_Face& face,
-                                      SkTDArray<SkUnichar>* glyphToUnicode) {
-    // Check and see if we have Unicode cmaps.
-    for (int i = 0; i < face->num_charmaps; ++i) {
-        // CMaps known to support Unicode:
-        // Platform ID   Encoding ID   Name
-        // -----------   -----------   -----------------------------------
-        // 0             0,1           Apple Unicode
-        // 0             3             Apple Unicode 2.0 (preferred)
-        // 3             1             Microsoft Unicode UCS-2
-        // 3             10            Microsoft Unicode UCS-4 (preferred)
-        //
-        // See Apple TrueType Reference Manual
-        // http://developer.apple.com/fonts/TTRefMan/RM06/Chap6cmap.html
-        // http://developer.apple.com/fonts/TTRefMan/RM06/Chap6name.html#ID
-        // Microsoft OpenType Specification
-        // http://www.microsoft.com/typography/otspec/cmap.htm
+static void populate_glyph_to_unicode(FT_Face& face, SkTDArray<SkUnichar>* glyphToUnicode) {
+    glyphToUnicode->setCount(face->num_glyphs);
+    sk_bzero(glyphToUnicode->begin(), sizeof((*glyphToUnicode)[0]) * face->num_glyphs);
 
-        FT_UShort platformId = face->charmaps[i]->platform_id;
-        FT_UShort encodingId = face->charmaps[i]->encoding_id;
-
-        if (platformId != 0 && platformId != 3) {
-            continue;
-        }
-        if (platformId == 3 && encodingId != 1 && encodingId != 10) {
-            continue;
-        }
-        bool preferredMap = ((platformId == 3 && encodingId == 10) ||
-                             (platformId == 0 && encodingId == 3));
-
-        FT_Set_Charmap(face, face->charmaps[i]);
-        if (glyphToUnicode->isEmpty()) {
-            glyphToUnicode->setCount(face->num_glyphs);
-            memset(glyphToUnicode->begin(), 0,
-                   sizeof(SkUnichar) * face->num_glyphs);
-        }
-
-        // Iterate through each cmap entry.
-        FT_UInt glyphIndex;
-        for (SkUnichar charCode = FT_Get_First_Char(face, &glyphIndex);
-             glyphIndex != 0;
-             charCode = FT_Get_Next_Char(face, charCode, &glyphIndex)) {
-            if (charCode &&
-                    ((*glyphToUnicode)[glyphIndex] == 0 || preferredMap)) {
-                (*glyphToUnicode)[glyphIndex] = charCode;
-            }
-        }
+    FT_UInt glyphIndex;
+    SkUnichar charCode = FT_Get_First_Char(face, &glyphIndex);
+    while (glyphIndex) {
+        (*glyphToUnicode)[glyphIndex] = charCode;
+        charCode = FT_Get_Next_Char(face, charCode, &glyphIndex);
     }
 }
 
 SkAdvancedTypefaceMetrics* SkTypeface_FreeType::onGetAdvancedTypefaceMetrics(
-        SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo,
+        PerGlyphInfo perGlyphInfo,
         const uint32_t* glyphIDs,
         uint32_t glyphIDsCount) const {
 #if defined(SK_BUILD_FOR_MAC)
-    return NULL;
+    return nullptr;
 #else
     AutoFTAccess fta(this);
     FT_Face face = fta.face();
     if (!face) {
-        return NULL;
+        return nullptr;
     }
 
     SkAdvancedTypefaceMetrics* info = new SkAdvancedTypefaceMetrics;
@@ -570,7 +500,7 @@ SkAdvancedTypefaceMetrics* SkTypeface_FreeType::onGetAdvancedTypefaceMetrics(
         cid = true;
         TT_Header* ttHeader;
         if ((ttHeader = (TT_Header*)FT_Get_Sfnt_Table(face,
-                                                      ft_sfnt_head)) != NULL) {
+                                                      ft_sfnt_head)) != nullptr) {
             info->fEmSize = ttHeader->Units_Per_EM;
         }
     } else {
@@ -589,7 +519,7 @@ SkAdvancedTypefaceMetrics* SkTypeface_FreeType::onGetAdvancedTypefaceMetrics(
         info->fItalicAngle = ps_info.italic_angle;
     } else if ((tt_info =
                 (TT_Postscript*)FT_Get_Sfnt_Table(face,
-                                                  ft_sfnt_post)) != NULL) {
+                                                  ft_sfnt_post)) != nullptr) {
         info->fItalicAngle = SkFixedToScalar(tt_info->italicAngle);
     } else {
         info->fItalicAngle = 0;
@@ -616,14 +546,14 @@ SkAdvancedTypefaceMetrics* SkTypeface_FreeType::onGetAdvancedTypefaceMetrics(
 
     TT_PCLT* pclt_info;
     TT_OS2* os2_table;
-    if ((pclt_info = (TT_PCLT*)FT_Get_Sfnt_Table(face, ft_sfnt_pclt)) != NULL) {
+    if ((pclt_info = (TT_PCLT*)FT_Get_Sfnt_Table(face, ft_sfnt_pclt)) != nullptr) {
         info->fCapHeight = pclt_info->CapHeight;
         uint8_t serif_style = pclt_info->SerifStyle & 0x3F;
         if (serif_style >= 2 && serif_style <= 6)
             info->fStyle |= SkAdvancedTypefaceMetrics::kSerif_Style;
         else if (serif_style >= 9 && serif_style <= 12)
             info->fStyle |= SkAdvancedTypefaceMetrics::kScript_Style;
-    } else if (((os2_table = (TT_OS2*)FT_Get_Sfnt_Table(face, ft_sfnt_os2)) != NULL) &&
+    } else if (((os2_table = (TT_OS2*)FT_Get_Sfnt_Table(face, ft_sfnt_os2)) != nullptr) &&
                // sCapHeight is available only when version 2 or later.
                os2_table->version != 0xFFFF &&
                os2_table->version >= 2) {
@@ -651,10 +581,10 @@ SkAdvancedTypefaceMetrics* SkTypeface_FreeType::onGetAdvancedTypefaceMetrics(
                                     face->bbox.xMax, face->bbox.yMin);
 
     if (!FT_IS_SCALABLE(face)) {
-        perGlyphInfo = SkAdvancedTypefaceMetrics::kNo_PerGlyphInfo;
+        perGlyphInfo = kNo_PerGlyphInfo;
     }
 
-    if (perGlyphInfo & SkAdvancedTypefaceMetrics::kHAdvance_PerGlyphInfo) {
+    if (perGlyphInfo & kHAdvance_PerGlyphInfo) {
         if (FT_IS_FIXED_WIDTH(face)) {
             appendRange(&info->fGlyphWidths, 0);
             int16_t advance = face->max_advance_width;
@@ -667,10 +597,10 @@ SkAdvancedTypefaceMetrics* SkTypeface_FreeType::onGetAdvancedTypefaceMetrics(
             for (int gID = 0; gID < face->num_glyphs; gID += 128) {
                 FT_Fixed advances[128];
                 int advanceCount = 128;
-                if (gID + advanceCount > face->num_glyphs)
+                if (gID + advanceCount > face->num_glyphs) {
                     advanceCount = face->num_glyphs - gID;
-                getAdvances(face, gID, advanceCount, FT_LOAD_NO_SCALE,
-                            advances);
+                }
+                FT_Get_Advances(face, gID, advanceCount, FT_LOAD_NO_SCALE, advances);
                 for (int i = 0; i < advanceCount; i++) {
                     int16_t advance = advances[i];
                     info->fGlyphWidths->fAdvance.append(1, &advance);
@@ -688,12 +618,12 @@ SkAdvancedTypefaceMetrics* SkTypeface_FreeType::onGetAdvancedTypefaceMetrics(
         }
     }
 
-    if (perGlyphInfo & SkAdvancedTypefaceMetrics::kVAdvance_PerGlyphInfo &&
+    if (perGlyphInfo & kVAdvance_PerGlyphInfo &&
             FT_HAS_VERTICAL(face)) {
         SkASSERT(false);  // Not implemented yet.
     }
 
-    if (perGlyphInfo & SkAdvancedTypefaceMetrics::kGlyphNames_PerGlyphInfo &&
+    if (perGlyphInfo & kGlyphNames_PerGlyphInfo &&
             info->fType == SkAdvancedTypefaceMetrics::kType1_Font) {
         // Postscript fonts may contain more than 255 glyphs, so we end up
         // using multiple font descriptions with a glyph ordering.  Record
@@ -707,7 +637,7 @@ SkAdvancedTypefaceMetrics* SkTypeface_FreeType::onGetAdvancedTypefaceMetrics(
         }
     }
 
-    if (perGlyphInfo & SkAdvancedTypefaceMetrics::kToUnicode_PerGlyphInfo &&
+    if (perGlyphInfo & kToUnicode_PerGlyphInfo &&
            info->fType != SkAdvancedTypefaceMetrics::kType1_Font &&
            face->num_charmaps) {
         populate_glyph_to_unicode(face, &(info->fGlyphToUnicode));
@@ -732,12 +662,11 @@ static bool isAxisAligned(const SkScalerContext::Rec& rec) {
 
 SkScalerContext* SkTypeface_FreeType::onCreateScalerContext(
                                                const SkDescriptor* desc) const {
-    SkScalerContext_FreeType* c = SkNEW_ARGS(SkScalerContext_FreeType,
-                                        (const_cast<SkTypeface_FreeType*>(this),
-                                         desc));
+    SkScalerContext_FreeType* c =
+            new SkScalerContext_FreeType(const_cast<SkTypeface_FreeType*>(this), desc);
     if (!c->success()) {
-        SkDELETE(c);
-        c = NULL;
+        delete c;
+        c = nullptr;
     }
     return c;
 }
@@ -750,10 +679,15 @@ void SkTypeface_FreeType::onFilterRec(SkScalerContextRec* rec) const {
         rec->fTextSize = SkIntToScalar(1 << 14);
     }
 
-    if (!is_lcd_supported() && isLCD(*rec)) {
-        // If the runtime Freetype library doesn't support LCD mode, we disable
-        // it here.
-        rec->fMaskFormat = SkMask::kA8_Format;
+    if (isLCD(*rec)) {
+        // TODO: re-work so that FreeType is set-up and selected by the SkFontMgr.
+        SkAutoMutexAcquire ama(gFTMutex);
+        ref_ft_library();
+        if (!gFTLibrary->isLCDSupported()) {
+            // If the runtime Freetype library doesn't support LCD, disable it here.
+            rec->fMaskFormat = SkMask::kA8_Format;
+        }
+        unref_ft_library();
     }
 
     SkPaint::Hinting h = rec->getHinting();
@@ -808,8 +742,8 @@ bool SkTypeface_FreeType::onGetKerningPairAdjustments(const uint16_t glyphs[],
 
 static FT_Int chooseBitmapStrike(FT_Face face, SkFixed scaleY) {
     // early out if face is bad
-    if (face == NULL) {
-        SkDEBUGF(("chooseBitmapStrike aborted due to NULL face\n"));
+    if (face == nullptr) {
+        SkDEBUGF(("chooseBitmapStrike aborted due to nullptr face\n"));
         return -1;
     }
     // determine target ppem
@@ -850,78 +784,29 @@ static FT_Int chooseBitmapStrike(FT_Face face, SkFixed scaleY) {
     return chosenStrikeIndex;
 }
 
-SkScalerContext_FreeType::SkScalerContext_FreeType(SkTypeface* typeface,
-                                                   const SkDescriptor* desc)
-        : SkScalerContext_FreeType_Base(typeface, desc) {
+SkScalerContext_FreeType::SkScalerContext_FreeType(SkTypeface* typeface, const SkDescriptor* desc)
+    : SkScalerContext_FreeType_Base(typeface, desc)
+{
     SkAutoMutexAcquire  ac(gFTMutex);
 
-    if (gFTCount == 0) {
-        if (!InitFreetype()) {
-            sk_throw();
-        }
+    if (!ref_ft_library()) {
+        sk_throw();
     }
-    ++gFTCount;
 
     // load the font file
     fStrikeIndex = -1;
-    fFTSize = NULL;
-    fFace = NULL;
-    fFaceRec = ref_ft_face(typeface);
-    if (NULL == fFaceRec) {
+    fFTSize = nullptr;
+    fFace = ref_ft_face(typeface);
+    if (nullptr == fFace) {
         return;
     }
-    fFace = fFaceRec->fFace;
 
-    // A is the total matrix.
-    SkMatrix A;
-    fRec.getSingleMatrix(&A);
+    fRec.computeMatrices(SkScalerContextRec::kFull_PreMatrixScale, &fScale, &fMatrix22Scalar);
+    fMatrix22Scalar.setSkewX(-fMatrix22Scalar.getSkewX());
+    fMatrix22Scalar.setSkewY(-fMatrix22Scalar.getSkewY());
 
-    SkScalar sx = A.getScaleX();
-    SkScalar sy = A.getScaleY();
-    fMatrix22Scalar.reset();
-
-    // In GDI, the hinter is aware of the current transformation
-    // (the transform is in some sense applied before/with the hinting).
-    // The bytecode can then test if it is rotated or stretched and decide
-    // to apply instructions or not.
-    //
-    // FreeType, however, always does the transformation strictly after hinting.
-    // It just sets 'rotated' and 'stretched' to false and only applies the
-    // size before hinting.
-    //
-    // Also, FreeType respects the head::flags::IntegerScaling flag,
-    // (although this is patched out on most major distros)
-    // so it is critical to get the size correct on the request.
-    //
-    // This also gets us the actual closest size on bitmap fonts as well.
-    if (A.getSkewX() || A.getSkewY() || sx < 0 || sy < 0) {
-        // h is where A maps the horizontal baseline.
-        SkPoint h = SkPoint::Make(SK_Scalar1, 0);
-        A.mapPoints(&h, 1);
-
-        // G is the Givens Matrix for A (rotational matrix where GA[0][1] == 0).
-        SkMatrix G;
-        SkComputeGivensRotation(h, &G);
-
-        // GA is the matrix A with rotation removed.
-        SkMatrix GA(G);
-        GA.preConcat(A);
-
-        sx = SkScalarAbs(GA.get(SkMatrix::kMScaleX));
-        sy = SkScalarAbs(GA.get(SkMatrix::kMScaleY));
-
-        // sA is the total matrix A without the text scale.
-        SkMatrix sA(A);
-        sA.preScale(SkScalarInvert(sx), SkScalarInvert(sy)); //remove text size
-
-        fMatrix22Scalar.setScaleX(sA.getScaleX());
-        fMatrix22Scalar.setSkewX(-sA.getSkewX());
-        fMatrix22Scalar.setSkewY(-sA.getSkewY());
-        fMatrix22Scalar.setScaleY(sA.getScaleY());
-    }
-    fScale.set(sx, sy);
-    fScaleX = SkScalarToFixed(sx);
-    fScaleY = SkScalarToFixed(sy);
+    fScaleX = SkScalarToFixed(fScale.fX);
+    fScaleY = SkScalarToFixed(fScale.fY);
     fMatrix22.xx = SkScalarToFixed(fMatrix22Scalar.getScaleX());
     fMatrix22.xy = SkScalarToFixed(fMatrix22Scalar.getSkewX());
     fMatrix22.yx = SkScalarToFixed(fMatrix22Scalar.getSkewY());
@@ -953,6 +838,10 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(SkTypeface* typeface,
             case SkPaint::kNormal_Hinting:
                 if (fRec.fFlags & SkScalerContext::kForceAutohinting_Flag) {
                     loadFlags = FT_LOAD_FORCE_AUTOHINT;
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+                } else {
+                    loadFlags = FT_LOAD_NO_AUTOHINT;
+#endif
                 }
                 break;
             case SkPaint::kFull_Hinting:
@@ -997,14 +886,14 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(SkTypeface* typeface,
     FT_Error err = FT_New_Size(fFace, &fFTSize);
     if (err != 0) {
         SkDEBUGF(("FT_New_Size returned %x for face %s\n", err, fFace->family_name));
-        fFace = NULL;
+        fFace = nullptr;
         return;
     }
     err = FT_Activate_Size(fFTSize);
     if (err != 0) {
         SkDEBUGF(("FT_Activate_Size(%08x, 0x%x, 0x%x) returned 0x%x\n", fFace, fScaleX, fScaleY,
                   err));
-        fFTSize = NULL;
+        fFTSize = nullptr;
         return;
     }
 
@@ -1013,10 +902,10 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(SkTypeface* typeface,
         if (err != 0) {
             SkDEBUGF(("FT_Set_CharSize(%08x, 0x%x, 0x%x) returned 0x%x\n",
                                     fFace, fScaleX, fScaleY,      err));
-            fFace = NULL;
+            fFace = nullptr;
             return;
         }
-        FT_Set_Transform(fFace, &fMatrix22, NULL);
+        FT_Set_Transform(fFace, &fMatrix22, nullptr);
     } else if (FT_HAS_FIXED_SIZES(fFace)) {
         fStrikeIndex = chooseBitmapStrike(fFace, fScaleY);
         if (fStrikeIndex == -1) {
@@ -1045,34 +934,33 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(SkTypeface* typeface,
 SkScalerContext_FreeType::~SkScalerContext_FreeType() {
     SkAutoMutexAcquire  ac(gFTMutex);
 
-    if (fFTSize != NULL) {
+    if (fFTSize != nullptr) {
         FT_Done_Size(fFTSize);
     }
 
-    if (fFace != NULL) {
+    if (fFace != nullptr) {
         unref_ft_face(fFace);
     }
-    if (--gFTCount == 0) {
-        FT_Done_FreeType(gFTLibrary);
-        SkDEBUGCODE(gFTLibrary = NULL;)
-    }
+
+    unref_ft_library();
 }
 
 /*  We call this before each use of the fFace, since we may be sharing
     this face with other context (at different sizes).
 */
 FT_Error SkScalerContext_FreeType::setupSize() {
+    gFTMutex.assertHeld();
     FT_Error err = FT_Activate_Size(fFTSize);
     if (err != 0) {
-        SkDEBUGF(("SkScalerContext_FreeType::FT_Activate_Size(%x, 0x%x, 0x%x) returned 0x%x\n",
-                  fFaceRec->fFontID, fScaleX, fScaleY, err));
-        fFTSize = NULL;
+        SkDEBUGF(("SkScalerContext_FreeType::FT_Activate_Size(%s %s, 0x%x, 0x%x) returned 0x%x\n",
+                  fFace->family_name, fFace->style_name, fScaleX, fScaleY, err));
+        fFTSize = nullptr;
         return err;
     }
 
     // seems we need to reset this every time (not sure why, but without it
     // I get random italics from some other fFTSize)
-    FT_Set_Transform(fFace, &fMatrix22, NULL);
+    FT_Set_Transform(fFace, &fMatrix22, nullptr);
     return 0;
 }
 
@@ -1081,10 +969,12 @@ unsigned SkScalerContext_FreeType::generateGlyphCount() {
 }
 
 uint16_t SkScalerContext_FreeType::generateCharToGlyph(SkUnichar uni) {
+    SkAutoMutexAcquire  ac(gFTMutex);
     return SkToU16(FT_Get_Char_Index( fFace, uni ));
 }
 
 SkUnichar SkScalerContext_FreeType::generateGlyphToChar(uint16_t glyph) {
+    SkAutoMutexAcquire  ac(gFTMutex);
     // iterate through each cmap entry, looking for matching glyph indices
     FT_UInt glyphIndex;
     SkUnichar charCode = FT_Get_First_Char( fFace, &glyphIndex );
@@ -1100,7 +990,6 @@ SkUnichar SkScalerContext_FreeType::generateGlyphToChar(uint16_t glyph) {
 }
 
 void SkScalerContext_FreeType::generateAdvance(SkGlyph* glyph) {
-#ifdef FT_ADVANCES_H
    /* unhinted and light hinted text have linearly scaled advances
     * which are very cheap to compute with some font formats...
     */
@@ -1115,7 +1004,7 @@ void SkScalerContext_FreeType::generateAdvance(SkGlyph* glyph) {
         FT_Error    error;
         FT_Fixed    advance;
 
-        error = FT_Get_Advance( fFace, glyph->getGlyphID(fBaseGlyphCount),
+        error = FT_Get_Advance( fFace, glyph->getGlyphID(),
                                 fLoadGlyphFlags | FT_ADVANCE_FLAG_FAST_ONLY,
                                 &advance );
         if (0 == error) {
@@ -1126,7 +1015,7 @@ void SkScalerContext_FreeType::generateAdvance(SkGlyph* glyph) {
             return;
         }
     }
-#endif /* FT_ADVANCES_H */
+
     /* otherwise, we need to load/hint the glyph, which is slower */
     this->generateMetrics(glyph);
     return;
@@ -1173,10 +1062,12 @@ void SkScalerContext_FreeType::getBBoxForCurrentGlyph(SkGlyph* glyph,
 
 bool SkScalerContext_FreeType::getCBoxForLetter(char letter, FT_BBox* bbox) {
     const FT_UInt glyph_id = FT_Get_Char_Index(fFace, letter);
-    if (!glyph_id)
+    if (!glyph_id) {
         return false;
-    if (FT_Load_Glyph(fFace, glyph_id, fLoadGlyphFlags) != 0)
+    }
+    if (FT_Load_Glyph(fFace, glyph_id, fLoadGlyphFlags) != 0) {
         return false;
+    }
     emboldenIfNeeded(fFace, fFace->glyph);
     FT_Outline_Get_CBox(&fFace->glyph->outline, bbox);
     return true;
@@ -1185,11 +1076,11 @@ bool SkScalerContext_FreeType::getCBoxForLetter(char letter, FT_BBox* bbox) {
 void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) {
     if (isLCD(fRec)) {
         if (fLCDIsVert) {
-            glyph->fHeight += gLCDExtra;
-            glyph->fTop -= gLCDExtra >> 1;
+            glyph->fHeight += gFTLibrary->lcdExtra();
+            glyph->fTop -= gFTLibrary->lcdExtra() >> 1;
         } else {
-            glyph->fWidth += gLCDExtra;
-            glyph->fLeft -= gLCDExtra >> 1;
+            glyph->fWidth += gFTLibrary->lcdExtra();
+            glyph->fLeft -= gFTLibrary->lcdExtra() >> 1;
         }
     }
 }
@@ -1214,16 +1105,12 @@ void SkScalerContext_FreeType::generateMetrics(SkGlyph* glyph) {
     FT_Error    err;
 
     if (this->setupSize()) {
-        goto ERROR;
+        glyph->zeroMetrics();
+        return;
     }
 
-    err = FT_Load_Glyph( fFace, glyph->getGlyphID(fBaseGlyphCount), fLoadGlyphFlags );
+    err = FT_Load_Glyph( fFace, glyph->getGlyphID(), fLoadGlyphFlags );
     if (err != 0) {
-#if 0
-        SkDEBUGF(("SkScalerContext_FreeType::generateMetrics(%x): FT_Load_Glyph(glyph:%d flags:%x) returned 0x%x\n",
-                    fFaceRec->fFontID, glyph->getGlyphID(fBaseGlyphCount), fLoadGlyphFlags, err));
-#endif
-    ERROR:
         glyph->zeroMetrics();
         return;
     }
@@ -1271,7 +1158,8 @@ void SkScalerContext_FreeType::generateMetrics(SkGlyph* glyph) {
 
       default:
         SkDEBUGFAIL("unknown glyph format");
-        goto ERROR;
+        glyph->zeroMetrics();
+        return;
     }
 
     if (fRec.fFlags & SkScalerContext::kVertical_Flag) {
@@ -1297,34 +1185,36 @@ void SkScalerContext_FreeType::generateMetrics(SkGlyph* glyph) {
         }
     }
 
-    if (fFace->glyph->format == FT_GLYPH_FORMAT_BITMAP && fScaleY && fFace->size->metrics.y_ppem) {
+    // If the font isn't scalable, scale the metrics from the non-scalable strike.
+    // This means do not try to scale embedded bitmaps; only scale bitmaps in bitmap only fonts.
+    if (!FT_IS_SCALABLE(fFace) && fScaleY && fFace->size->metrics.y_ppem) {
         // NOTE: both dimensions are scaled by y_ppem. this is WAI.
-        scaleGlyphMetrics(*glyph, SkScalarDiv(SkFixedToScalar(fScaleY),
-                                              SkIntToScalar(fFace->size->metrics.y_ppem)));
+        scaleGlyphMetrics(*glyph, SkFixedToScalar(fScaleY) / fFace->size->metrics.y_ppem);
     }
 
 #ifdef ENABLE_GLYPH_SPEW
     SkDEBUGF(("FT_Set_Char_Size(this:%p sx:%x sy:%x ", this, fScaleX, fScaleY));
-    SkDEBUGF(("Metrics(glyph:%d flags:0x%x) w:%d\n", glyph->getGlyphID(fBaseGlyphCount), fLoadGlyphFlags, glyph->fWidth));
+    SkDEBUGF(("Metrics(glyph:%d flags:0x%x) w:%d\n", glyph->getGlyphID(), fLoadGlyphFlags, glyph->fWidth));
 #endif
 }
 
+static void clear_glyph_image(const SkGlyph& glyph) {
+    sk_bzero(glyph.fImage, glyph.rowBytes() * glyph.fHeight);
+}
 
 void SkScalerContext_FreeType::generateImage(const SkGlyph& glyph) {
     SkAutoMutexAcquire  ac(gFTMutex);
 
-    FT_Error    err;
-
     if (this->setupSize()) {
-        goto ERROR;
+        clear_glyph_image(glyph);
+        return;
     }
 
-    err = FT_Load_Glyph( fFace, glyph.getGlyphID(fBaseGlyphCount), fLoadGlyphFlags);
+    FT_Error err = FT_Load_Glyph(fFace, glyph.getGlyphID(), fLoadGlyphFlags);
     if (err != 0) {
         SkDEBUGF(("SkScalerContext_FreeType::generateImage: FT_Load_Glyph(glyph:%d width:%d height:%d rb:%d flags:%d) returned 0x%x\n",
-                    glyph.getGlyphID(fBaseGlyphCount), glyph.fWidth, glyph.fHeight, glyph.rowBytes(), fLoadGlyphFlags, err));
-    ERROR:
-        memset(glyph.fImage, 0, glyph.rowBytes() * glyph.fHeight);
+                  glyph.getGlyphID(), glyph.fWidth, glyph.fHeight, glyph.rowBytes(), fLoadGlyphFlags, err));
+        clear_glyph_image(glyph);
         return;
     }
 
@@ -1333,8 +1223,7 @@ void SkScalerContext_FreeType::generateImage(const SkGlyph& glyph) {
 }
 
 
-void SkScalerContext_FreeType::generatePath(const SkGlyph& glyph,
-                                            SkPath* path) {
+void SkScalerContext_FreeType::generatePath(const SkGlyph& glyph, SkPath* path) {
     SkAutoMutexAcquire  ac(gFTMutex);
 
     SkASSERT(path);
@@ -1348,11 +1237,11 @@ void SkScalerContext_FreeType::generatePath(const SkGlyph& glyph,
     flags |= FT_LOAD_NO_BITMAP; // ignore embedded bitmaps so we're sure to get the outline
     flags &= ~FT_LOAD_RENDER;   // don't scan convert (we just want the outline)
 
-    FT_Error err = FT_Load_Glyph( fFace, glyph.getGlyphID(fBaseGlyphCount), flags);
+    FT_Error err = FT_Load_Glyph( fFace, glyph.getGlyphID(), flags);
 
     if (err != 0) {
         SkDEBUGF(("SkScalerContext_FreeType::generatePath: FT_Load_Glyph(glyph:%d flags:%d) returned 0x%x\n",
-                    glyph.getGlyphID(fBaseGlyphCount), flags, err));
+                    glyph.getGlyphID(), flags, err));
         path->reset();
         return;
     }
@@ -1372,7 +1261,7 @@ void SkScalerContext_FreeType::generatePath(const SkGlyph& glyph,
 }
 
 void SkScalerContext_FreeType::generateFontMetrics(SkPaint::FontMetrics* metrics) {
-    if (NULL == metrics) {
+    if (nullptr == metrics) {
         return;
     }
 
@@ -1416,9 +1305,20 @@ void SkScalerContext_FreeType::generateFontMetrics(SkPaint::FontMetrics* metrics
     SkScalar ascent, descent, leading, xmin, xmax, ymin, ymax;
     SkScalar underlineThickness, underlinePosition;
     if (face->face_flags & FT_FACE_FLAG_SCALABLE) { // scalable outline font
-        ascent = -SkIntToScalar(face->ascender) / upem;
-        descent = -SkIntToScalar(face->descender) / upem;
-        leading = SkIntToScalar(face->height + (face->descender - face->ascender)) / upem;
+        // FreeType will always use HHEA metrics if they're not zero.
+        // It completely ignores the OS/2 fsSelection::UseTypoMetrics bit.
+        // It also ignores the VDMX tables, which are also of interest here
+        // (and override everything else when they apply).
+        static const int kUseTypoMetricsMask = (1 << 7);
+        if (os2 && os2->version != 0xFFFF && (os2->fsSelection & kUseTypoMetricsMask)) {
+            ascent = -SkIntToScalar(os2->sTypoAscender) / upem;
+            descent = -SkIntToScalar(os2->sTypoDescender) / upem;
+            leading = SkIntToScalar(os2->sTypoLineGap) / upem;
+        } else {
+            ascent = -SkIntToScalar(face->ascender) / upem;
+            descent = -SkIntToScalar(face->descender) / upem;
+            leading = SkIntToScalar(face->height + (face->descender - face->ascender)) / upem;
+        }
         xmin = SkIntToScalar(face->bbox.xMin) / upem;
         xmax = SkIntToScalar(face->bbox.xMax) / upem;
         ymin = -SkIntToScalar(face->bbox.yMin) / upem;
@@ -1489,14 +1389,27 @@ void SkScalerContext_FreeType::generateFontMetrics(SkPaint::FontMetrics* metrics
     metrics->fBottom = ymin * scale;
     metrics->fLeading = leading * scale;
     metrics->fAvgCharWidth = avgCharWidth * scale;
-    metrics->fXMin = xmin;
-    metrics->fXMax = xmax;
+    metrics->fXMin = xmin * scale;
+    metrics->fXMax = xmax * scale;
     metrics->fXHeight = x_height;
     metrics->fCapHeight = cap_height;
     metrics->fUnderlineThickness = underlineThickness * scale;
     metrics->fUnderlinePosition = underlinePosition * scale;
 }
 
+///////////////////////////////////////////////////////////////////////////////
+
+// hand-tuned value to reduce outline embolden strength
+#ifndef SK_OUTLINE_EMBOLDEN_DIVISOR
+    #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+        #define SK_OUTLINE_EMBOLDEN_DIVISOR   34
+    #else
+        #define SK_OUTLINE_EMBOLDEN_DIVISOR   24
+    #endif
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+
 void SkScalerContext_FreeType::emboldenIfNeeded(FT_Face face, FT_GlyphSlot glyph)
 {
     // check to see if the embolden bit is set
@@ -1504,17 +1417,11 @@ void SkScalerContext_FreeType::emboldenIfNeeded(FT_Face face, FT_GlyphSlot glyph
         return;
     }
 
-#if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
-    // Android doesn't want to embolden a font that is already bold.
-    if ((fFace->style_flags & FT_STYLE_FLAG_BOLD)) {
-        return;
-    }
-#endif
-
     switch (glyph->format) {
         case FT_GLYPH_FORMAT_OUTLINE:
             FT_Pos strength;
-            strength = FT_MulFix(face->units_per_EM, face->size->metrics.y_scale) / 24;
+            strength = FT_MulFix(face->units_per_EM, face->size->metrics.y_scale)
+                       / SK_OUTLINE_EMBOLDEN_DIVISOR;
             FT_Outline_Embolden(&glyph->outline, strength);
             break;
         case FT_GLYPH_FORMAT_BITMAP:
@@ -1556,7 +1463,8 @@ static EncodingProc find_encoding_proc(SkTypeface::Encoding enc) {
 }
 
 int SkTypeface_FreeType::onCharsToGlyphs(const void* chars, Encoding encoding,
-                                      uint16_t glyphs[], int glyphCount) const {
+                                         uint16_t glyphs[], int glyphCount) const
+{
     AutoFTAccess fta(this);
     FT_Face face = fta.face();
     if (!face) {
@@ -1568,7 +1476,7 @@ int SkTypeface_FreeType::onCharsToGlyphs(const void* chars, Encoding encoding,
 
     EncodingProc next_uni_proc = find_encoding_proc(encoding);
 
-    if (NULL == glyphs) {
+    if (nullptr == glyphs) {
         for (int i = 0; i < glyphCount; ++i) {
             if (0 == FT_Get_Char_Index(face, next_uni_proc(&chars))) {
                 return i;
@@ -1602,7 +1510,7 @@ int SkTypeface_FreeType::onCountGlyphs() const {
 SkTypeface::LocalizedStrings* SkTypeface_FreeType::onCreateFamilyNameIterator() const {
     SkTypeface::LocalizedStrings* nameIter =
         SkOTUtils::LocalizedStrings_NameTable::CreateForFamilyNames(*this);
-    if (NULL == nameIter) {
+    if (nullptr == nameIter) {
         SkString familyName;
         this->getFamilyName(&familyName);
         SkString language("und"); //undetermined
@@ -1618,8 +1526,8 @@ int SkTypeface_FreeType::onGetTableTags(SkFontTableTag tags[]) const {
     FT_ULong tableCount = 0;
     FT_Error error;
 
-    // When 'tag' is NULL, returns number of tables in 'length'.
-    error = FT_Sfnt_Table_Info(face, 0, NULL, &tableCount);
+    // When 'tag' is nullptr, returns number of tables in 'length'.
+    error = FT_Sfnt_Table_Info(face, 0, nullptr, &tableCount);
     if (error) {
         return 0;
     }
@@ -1648,7 +1556,7 @@ size_t SkTypeface_FreeType::onGetTableData(SkFontTableTag tag, size_t offset,
     FT_Error error;
 
     // When 'length' is 0 it is overwritten with the full table length; 'offset' is ignored.
-    error = FT_Load_Sfnt_Table(face, tag, 0, NULL, &tableLength);
+    error = FT_Load_Sfnt_Table(face, tag, 0, nullptr, &tableLength);
     if (error) {
         return 0;
     }
@@ -1657,7 +1565,7 @@ size_t SkTypeface_FreeType::onGetTableData(SkFontTableTag tag, size_t offset,
         return 0;
     }
     FT_ULong size = SkTMin((FT_ULong)length, tableLength - (FT_ULong)offset);
-    if (NULL != data) {
+    if (data) {
         error = FT_Load_Sfnt_Table(face, tag, offset, reinterpret_cast<FT_Byte*>(data), &size);
         if (error) {
             return 0;
@@ -1670,60 +1578,166 @@ size_t SkTypeface_FreeType::onGetTableData(SkFontTableTag tag, size_t offset,
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
-/*static*/ bool SkTypeface_FreeType::ScanFont(
-    SkStream* stream, int ttcIndex, SkString* name, SkTypeface::Style* style, bool* isFixedPitch)
+SkTypeface_FreeType::Scanner::Scanner() : fLibrary(nullptr) {
+    if (FT_New_Library(&gFTMemory, &fLibrary)) {
+        return;
+    }
+    FT_Add_Default_Modules(fLibrary);
+}
+SkTypeface_FreeType::Scanner::~Scanner() {
+    if (fLibrary) {
+        FT_Done_Library(fLibrary);
+    }
+}
+
+FT_Face SkTypeface_FreeType::Scanner::openFace(SkStream* stream, int ttcIndex,
+                                               FT_Stream ftStream) const
 {
-    FT_Library  library;
-    if (FT_Init_FreeType(&library)) {
-        return false;
+    if (fLibrary == nullptr) {
+        return nullptr;
     }
 
-    FT_Open_Args    args;
+    FT_Open_Args args;
     memset(&args, 0, sizeof(args));
 
     const void* memoryBase = stream->getMemoryBase();
-    FT_StreamRec    streamRec;
 
-    if (NULL != memoryBase) {
+    if (memoryBase) {
         args.flags = FT_OPEN_MEMORY;
         args.memory_base = (const FT_Byte*)memoryBase;
         args.memory_size = stream->getLength();
     } else {
-        memset(&streamRec, 0, sizeof(streamRec));
-        streamRec.size = stream->getLength();
-        streamRec.descriptor.pointer = stream;
-        streamRec.read  = sk_stream_read;
-        streamRec.close = sk_stream_close;
+        memset(ftStream, 0, sizeof(*ftStream));
+        ftStream->size = stream->getLength();
+        ftStream->descriptor.pointer = stream;
+        ftStream->read  = sk_ft_stream_io;
+        ftStream->close = sk_ft_stream_close;
 
         args.flags = FT_OPEN_STREAM;
-        args.stream = &streamRec;
+        args.stream = ftStream;
     }
 
     FT_Face face;
-    if (FT_Open_Face(library, &args, ttcIndex, &face)) {
-        FT_Done_FreeType(library);
+    if (FT_Open_Face(fLibrary, &args, ttcIndex, &face)) {
+        return nullptr;
+    }
+    return face;
+}
+
+bool SkTypeface_FreeType::Scanner::recognizedFont(SkStream* stream, int* numFaces) const {
+    SkAutoMutexAcquire libraryLock(fLibraryMutex);
+
+    FT_StreamRec streamRec;
+    FT_Face face = this->openFace(stream, -1, &streamRec);
+    if (nullptr == face) {
         return false;
     }
 
-    int tempStyle = SkTypeface::kNormal;
+    *numFaces = face->num_faces;
+
+    FT_Done_Face(face);
+    return true;
+}
+
+#include "SkTSearch.h"
+bool SkTypeface_FreeType::Scanner::scanFont(
+    SkStream* stream, int ttcIndex,
+    SkString* name, SkFontStyle* style, bool* isFixedPitch, AxisDefinitions* axes) const
+{
+    SkAutoMutexAcquire libraryLock(fLibraryMutex);
+
+    FT_StreamRec streamRec;
+    FT_Face face = this->openFace(stream, ttcIndex, &streamRec);
+    if (nullptr == face) {
+        return false;
+    }
+
+    int weight = SkFontStyle::kNormal_Weight;
+    int width = SkFontStyle::kNormal_Width;
+    SkFontStyle::Slant slant = SkFontStyle::kUpright_Slant;
     if (face->style_flags & FT_STYLE_FLAG_BOLD) {
-        tempStyle |= SkTypeface::kBold;
+        weight = SkFontStyle::kBold_Weight;
     }
     if (face->style_flags & FT_STYLE_FLAG_ITALIC) {
-        tempStyle |= SkTypeface::kItalic;
+        slant = SkFontStyle::kItalic_Slant;
+    }
+
+    PS_FontInfoRec psFontInfo;
+    TT_OS2* os2 = static_cast<TT_OS2*>(FT_Get_Sfnt_Table(face, ft_sfnt_os2));
+    if (os2 && os2->version != 0xffff) {
+        weight = os2->usWeightClass;
+        width = os2->usWidthClass;
+    } else if (0 == FT_Get_PS_Font_Info(face, &psFontInfo) && psFontInfo.weight) {
+        static const struct {
+            char const * const name;
+            int const weight;
+        } commonWeights [] = {
+            // There are probably more common names, but these are known to exist.
+            { "all", SkFontStyle::kNormal_Weight }, // Multiple Masters usually default to normal.
+            { "black", SkFontStyle::kBlack_Weight },
+            { "bold", SkFontStyle::kBold_Weight },
+            { "book", (SkFontStyle::kNormal_Weight + SkFontStyle::kLight_Weight)/2 },
+            { "demi", SkFontStyle::kSemiBold_Weight },
+            { "demibold", SkFontStyle::kSemiBold_Weight },
+            { "extra", SkFontStyle::kExtraBold_Weight },
+            { "extrabold", SkFontStyle::kExtraBold_Weight },
+            { "extralight", SkFontStyle::kExtraLight_Weight },
+            { "hairline", SkFontStyle::kThin_Weight },
+            { "heavy", SkFontStyle::kBlack_Weight },
+            { "light", SkFontStyle::kLight_Weight },
+            { "medium", SkFontStyle::kMedium_Weight },
+            { "normal", SkFontStyle::kNormal_Weight },
+            { "plain", SkFontStyle::kNormal_Weight },
+            { "regular", SkFontStyle::kNormal_Weight },
+            { "roman", SkFontStyle::kNormal_Weight },
+            { "semibold", SkFontStyle::kSemiBold_Weight },
+            { "standard", SkFontStyle::kNormal_Weight },
+            { "thin", SkFontStyle::kThin_Weight },
+            { "ultra", SkFontStyle::kExtraBold_Weight },
+            { "ultrablack", 1000 },
+            { "ultrabold", SkFontStyle::kExtraBold_Weight },
+            { "ultraheavy", 1000 },
+            { "ultralight", SkFontStyle::kExtraLight_Weight },
+        };
+        int const index = SkStrLCSearch(&commonWeights[0].name, SK_ARRAY_COUNT(commonWeights),
+                                        psFontInfo.weight, sizeof(commonWeights[0]));
+        if (index >= 0) {
+            weight = commonWeights[index].weight;
+        } else {
+            SkDEBUGF(("Do not know weight for: %s (%s) \n", face->family_name, psFontInfo.weight));
+        }
     }
 
     if (name) {
         name->set(face->family_name);
     }
     if (style) {
-        *style = (SkTypeface::Style) tempStyle;
+        *style = SkFontStyle(weight, width, slant);
     }
     if (isFixedPitch) {
         *isFixedPitch = FT_IS_FIXED_WIDTH(face);
     }
 
+    if (axes && face->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS) {
+        FT_MM_Var* variations = nullptr;
+        FT_Error err = FT_Get_MM_Var(face, &variations);
+        if (err) {
+            SkDEBUGF(("INFO: font %s claims to have variations, but none found.\n",
+                      face->family_name));
+            return false;
+        }
+        SkAutoFree autoFreeVariations(variations);
+
+        axes->reset(variations->num_axis);
+        for (FT_UInt i = 0; i < variations->num_axis; ++i) {
+            const FT_Var_Axis& ftAxis = variations->axis[i];
+            (*axes)[i].fTag = ftAxis.tag;
+            (*axes)[i].fMinimum = ftAxis.minimum;
+            (*axes)[i].fDefault = ftAxis.def;
+            (*axes)[i].fMaximum = ftAxis.maximum;
+        }
+    }
+
     FT_Done_Face(face);
-    FT_Done_FreeType(library);
     return true;
 }
diff --git a/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp b/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp
index b27ae96fff28..245ded128357 100644
--- a/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp
+++ b/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp
@@ -80,10 +80,10 @@ static void copyFT2LCD16(const FT_Bitmap& bitmap, const SkMask& mask, int lcdIsB
 {
     SkASSERT(SkMask::kLCD16_Format == mask.fFormat);
     if (FT_PIXEL_MODE_LCD != bitmap.pixel_mode) {
-        SkASSERT(mask.fBounds.width() == bitmap.width);
+        SkASSERT(mask.fBounds.width() == static_cast<int>(bitmap.width));
     }
     if (FT_PIXEL_MODE_LCD_V != bitmap.pixel_mode) {
-        SkASSERT(mask.fBounds.height() == bitmap.rows);
+        SkASSERT(mask.fBounds.height() == static_cast<int>(bitmap.rows));
     }
 
     const uint8_t* src = bitmap.buffer;
@@ -113,7 +113,7 @@ static void copyFT2LCD16(const FT_Bitmap& bitmap, const SkMask& mask, int lcdIsB
             }
             break;
         case FT_PIXEL_MODE_LCD:
-            SkASSERT(3 * mask.fBounds.width() == bitmap.width);
+            SkASSERT(3 * mask.fBounds.width() == static_cast<int>(bitmap.width));
             for (int y = height; y --> 0;) {
                 const uint8_t* triple = src;
                 if (lcdIsBGR) {
@@ -136,7 +136,7 @@ static void copyFT2LCD16(const FT_Bitmap& bitmap, const SkMask& mask, int lcdIsB
             }
             break;
         case FT_PIXEL_MODE_LCD_V:
-            SkASSERT(3 * mask.fBounds.height() == bitmap.rows);
+            SkASSERT(3 * mask.fBounds.height() == static_cast<int>(bitmap.rows));
             for (int y = height; y --> 0;) {
                 const uint8_t* srcR = src;
                 const uint8_t* srcG = srcR + bitmap.pitch;
@@ -165,20 +165,20 @@ static void copyFT2LCD16(const FT_Bitmap& bitmap, const SkMask& mask, int lcdIsB
  *
  *  Yes, No, Never Requested, Never Produced
  *
- *                        kBW kA8 k3D kARGB32 kLCD16 kLCD32
- *  FT_PIXEL_MODE_MONO     Y   Y  NR     N       Y     NR
- *  FT_PIXEL_MODE_GRAY     N   Y  NR     N       Y     NR
- *  FT_PIXEL_MODE_GRAY2   NP  NP  NR    NP      NP     NR
- *  FT_PIXEL_MODE_GRAY4   NP  NP  NR    NP      NP     NR
- *  FT_PIXEL_MODE_LCD     NP  NP  NR    NP      NP     NR
- *  FT_PIXEL_MODE_LCD_V   NP  NP  NR    NP      NP     NR
- *  FT_PIXEL_MODE_BGRA     N   N  NR     Y       N     NR
+ *                        kBW kA8 k3D kARGB32 kLCD16
+ *  FT_PIXEL_MODE_MONO     Y   Y  NR     N       Y
+ *  FT_PIXEL_MODE_GRAY     N   Y  NR     N       Y
+ *  FT_PIXEL_MODE_GRAY2   NP  NP  NR    NP      NP
+ *  FT_PIXEL_MODE_GRAY4   NP  NP  NR    NP      NP
+ *  FT_PIXEL_MODE_LCD     NP  NP  NR    NP      NP
+ *  FT_PIXEL_MODE_LCD_V   NP  NP  NR    NP      NP
+ *  FT_PIXEL_MODE_BGRA     N   N  NR     Y       N
  *
  *  TODO: All of these N need to be Y or otherwise ruled out.
  */
 static void copyFTBitmap(const FT_Bitmap& srcFTBitmap, SkMask& dstMask) {
-    SkASSERT(dstMask.fBounds.width() == srcFTBitmap.width);
-    SkASSERT(dstMask.fBounds.height() == srcFTBitmap.rows);
+    SkASSERT(dstMask.fBounds.width() == static_cast<int>(srcFTBitmap.width));
+    SkASSERT(dstMask.fBounds.height() == static_cast<int>(srcFTBitmap.rows));
 
     const uint8_t* src = reinterpret_cast<const uint8_t*>(srcFTBitmap.buffer);
     const FT_Pixel_Mode srcFormat = static_cast<FT_Pixel_Mode>(srcFTBitmap.pixel_mode);
@@ -194,7 +194,7 @@ static void copyFTBitmap(const FT_Bitmap& srcFTBitmap, SkMask& dstMask) {
     const size_t height = srcFTBitmap.rows;
 
     if (SkMask::kLCD16_Format == dstFormat) {
-        copyFT2LCD16<false>(srcFTBitmap, dstMask, false, NULL, NULL, NULL);
+        copyFT2LCD16<false>(srcFTBitmap, dstMask, false, nullptr, nullptr, nullptr);
         return;
     }
 
@@ -463,7 +463,7 @@ void SkScalerContext_FreeType_Base::generateGlyphImage(FT_Face face, const SkGly
             canvas.scale(SkIntToScalar(glyph.fWidth) / SkIntToScalar(face->glyph->bitmap.width),
                          SkIntToScalar(glyph.fHeight) / SkIntToScalar(face->glyph->bitmap.rows));
             SkPaint paint;
-            paint.setFilterLevel(SkPaint::kLow_FilterLevel);
+            paint.setFilterQuality(kMedium_SkFilterQuality);
             canvas.drawBitmap(unscaledBitmap, 0, 0, &paint);
 
             // If the destination is BW or LCD, convert from A8.
diff --git a/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.h b/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.h
index f093dba8a575..a9ca42b35fef 100644
--- a/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.h
+++ b/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.h
@@ -10,22 +10,14 @@
 #define SKFONTHOST_FREETYPE_COMMON_H_
 
 #include "SkGlyph.h"
+#include "SkMutex.h"
 #include "SkScalerContext.h"
 #include "SkTypeface.h"
+#include "SkTypes.h"
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
-#ifdef SK_DEBUG
-    #define SkASSERT_CONTINUE(pred)                                                         \
-        do {                                                                                \
-            if (!(pred))                                                                    \
-                SkDebugf("file %s:%d: assert failed '" #pred "'\n", __FILE__, __LINE__);    \
-        } while (false)
-#else
-    #define SkASSERT_CONTINUE(pred)
-#endif
-
 class SkScalerContext_FreeType_Base : public SkScalerContext {
 protected:
     // See http://freetype.sourceforge.net/freetype2/docs/reference/ft2-bitmap_handling.html#FT_Bitmap_Embolden
@@ -48,33 +40,50 @@ public:
     /** For SkFontMgrs to make use of our ability to extract
      *  name and style from a stream, using FreeType's API.
      */
-    static bool ScanFont(SkStream* stream, int ttcIndex,
-                         SkString* name, SkTypeface::Style* style, bool* isFixedPitch);
+    class Scanner : ::SkNoncopyable {
+    public:
+        Scanner();
+        ~Scanner();
+        struct AxisDefinition {
+            SkFourByteTag fTag;
+            SkFixed fMinimum;
+            SkFixed fDefault;
+            SkFixed fMaximum;
+        };
+        using AxisDefinitions = SkSTArray<4, AxisDefinition, true>;
+        bool recognizedFont(SkStream* stream, int* numFonts) const;
+        bool scanFont(SkStream* stream, int ttcIndex,
+                      SkString* name, SkFontStyle* style, bool* isFixedPitch,
+                      AxisDefinitions* axes) const;
+    private:
+        FT_Face openFace(SkStream* stream, int ttcIndex, FT_Stream ftStream) const;
+        FT_Library fLibrary;
+        mutable SkMutex fLibraryMutex;
+    };
 
 protected:
-    SkTypeface_FreeType(Style style, SkFontID uniqueID, bool isFixedPitch)
+    SkTypeface_FreeType(const SkFontStyle& style, SkFontID uniqueID, bool isFixedPitch)
         : INHERITED(style, uniqueID, isFixedPitch)
         , fGlyphCount(-1)
     {}
 
     virtual SkScalerContext* onCreateScalerContext(
-                                        const SkDescriptor*) const SK_OVERRIDE;
-    virtual void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE;
-    virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
-                                SkAdvancedTypefaceMetrics::PerGlyphInfo,
-                                const uint32_t*, uint32_t) const SK_OVERRIDE;
-    virtual int onGetUPEM() const SK_OVERRIDE;
+                                        const SkDescriptor*) const override;
+    void onFilterRec(SkScalerContextRec*) const override;
+    SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
+                        PerGlyphInfo, const uint32_t*, uint32_t) const override;
+    int onGetUPEM() const override;
     virtual bool onGetKerningPairAdjustments(const uint16_t glyphs[], int count,
-                                       int32_t adjustments[]) const SK_OVERRIDE;
+                                       int32_t adjustments[]) const override;
     virtual int onCharsToGlyphs(const void* chars, Encoding, uint16_t glyphs[],
-                                int glyphCount) const SK_OVERRIDE;
-    virtual int onCountGlyphs() const SK_OVERRIDE;
+                                int glyphCount) const override;
+    int onCountGlyphs() const override;
 
-    virtual LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE;
+    LocalizedStrings* onCreateFamilyNameIterator() const override;
 
-    virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE;
+    int onGetTableTags(SkFontTableTag tags[]) const override;
     virtual size_t onGetTableData(SkFontTableTag, size_t offset,
-                                  size_t length, void* data) const SK_OVERRIDE;
+                                  size_t length, void* data) const override;
 
 private:
     mutable int fGlyphCount;
diff --git a/gfx/skia/skia/src/ports/SkFontHost_android_old.cpp b/gfx/skia/skia/src/ports/SkFontHost_android_old.cpp
deleted file mode 100644
index 5079c54e8c0f..000000000000
--- a/gfx/skia/skia/src/ports/SkFontHost_android_old.cpp
+++ /dev/null
@@ -1,585 +0,0 @@
-
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#include "SkFontDescriptor.h"
-#include "SkFontHost.h"
-#include "SkFontHost_FreeType_common.h"
-#include "SkDescriptor.h"
-#include "SkStream.h"
-#include "SkPaint.h"
-#include "SkString.h"
-#include "SkStream.h"
-#include "SkThread.h"
-#include "SkTSearch.h"
-#include <stdio.h>
-
-#define FONT_CACHE_MEMORY_BUDGET    (768 * 1024)
-
-#ifndef SK_FONT_FILE_PREFIX
-    #define SK_FONT_FILE_PREFIX          "/fonts/"
-#endif
-
-static void GetFullPathForSysFonts(SkString* full, const char name[]) {
-    full->set(getenv("ANDROID_ROOT"));
-    full->append(SK_FONT_FILE_PREFIX);
-    full->append(name);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-struct FamilyRec;
-
-/*  This guy holds a mapping of a name -> family, used for looking up fonts.
-    Since it is stored in a stretchy array that doesn't preserve object
-    semantics, we don't use constructor/destructors, but just have explicit
-    helpers to manage our internal bookkeeping.
-*/
-struct NameFamilyPair {
-    const char* fName;      // we own this
-    FamilyRec*  fFamily;    // we don't own this, we just reference it
-
-    void construct(const char name[], FamilyRec* family) {
-        fName = strdup(name);
-        fFamily = family;   // we don't own this, so just record the referene
-    }
-
-    void destruct() {
-        free((char*)fName);
-        // we don't own family, so just ignore our reference
-    }
-};
-
-// we use atomic_inc to grow this for each typeface we create
-static int32_t gUniqueFontID;
-
-// this is the mutex that protects these globals
-static SkMutex gFamilyMutex;
-static FamilyRec* gFamilyHead;
-static SkTDArray<NameFamilyPair> gNameList;
-
-struct FamilyRec {
-    FamilyRec*  fNext;
-    SkTypeface* fFaces[4];
-
-    FamilyRec()
-    {
-        fNext = gFamilyHead;
-        memset(fFaces, 0, sizeof(fFaces));
-        gFamilyHead = this;
-    }
-};
-
-static SkTypeface* find_best_face(const FamilyRec* family,
-                                  SkTypeface::Style style) {
-    SkTypeface* const* faces = family->fFaces;
-
-    if (faces[style] != NULL) { // exact match
-        return faces[style];
-    }
-    // look for a matching bold
-    style = (SkTypeface::Style)(style ^ SkTypeface::kItalic);
-    if (faces[style] != NULL) {
-        return faces[style];
-    }
-    // look for the plain
-    if (faces[SkTypeface::kNormal] != NULL) {
-        return faces[SkTypeface::kNormal];
-    }
-    // look for anything
-    for (int i = 0; i < 4; i++) {
-        if (faces[i] != NULL) {
-            return faces[i];
-        }
-    }
-    // should never get here, since the faces list should not be empty
-    SkASSERT(!"faces list is empty");
-    return NULL;
-}
-
-static FamilyRec* find_family(const SkTypeface* member) {
-    FamilyRec* curr = gFamilyHead;
-    while (curr != NULL) {
-        for (int i = 0; i < 4; i++) {
-            if (curr->fFaces[i] == member) {
-                return curr;
-            }
-        }
-        curr = curr->fNext;
-    }
-    return NULL;
-}
-
-/*  Returns the matching typeface, or NULL. If a typeface is found, its refcnt
-    is not modified.
- */
-static SkTypeface* find_from_uniqueID(uint32_t uniqueID) {
-    FamilyRec* curr = gFamilyHead;
-    while (curr != NULL) {
-        for (int i = 0; i < 4; i++) {
-            SkTypeface* face = curr->fFaces[i];
-            if (face != NULL && face->uniqueID() == uniqueID) {
-                return face;
-            }
-        }
-        curr = curr->fNext;
-    }
-    return NULL;
-}
-
-/*  Remove reference to this face from its family. If the resulting family
-    is empty (has no faces), return that family, otherwise return NULL
-*/
-static FamilyRec* remove_from_family(const SkTypeface* face) {
-    FamilyRec* family = find_family(face);
-    SkASSERT(family->fFaces[face->style()] == face);
-    family->fFaces[face->style()] = NULL;
-
-    for (int i = 0; i < 4; i++) {
-        if (family->fFaces[i] != NULL) {    // family is non-empty
-            return NULL;
-        }
-    }
-    return family;  // return the empty family
-}
-
-// maybe we should make FamilyRec be doubly-linked
-static void detach_and_delete_family(FamilyRec* family) {
-    FamilyRec* curr = gFamilyHead;
-    FamilyRec* prev = NULL;
-
-    while (curr != NULL) {
-        FamilyRec* next = curr->fNext;
-        if (curr == family) {
-            if (prev == NULL) {
-                gFamilyHead = next;
-            } else {
-                prev->fNext = next;
-            }
-            SkDELETE(family);
-            return;
-        }
-        prev = curr;
-        curr = next;
-    }
-    SkASSERT(!"Yikes, couldn't find family in our list to remove/delete");
-}
-
-static SkTypeface* find_typeface(const char name[], SkTypeface::Style style) {
-    NameFamilyPair* list = gNameList.begin();
-    int             count = gNameList.count();
-
-    int index = SkStrLCSearch(&list[0].fName, count, name, sizeof(list[0]));
-
-    if (index >= 0) {
-        return find_best_face(list[index].fFamily, style);
-    }
-    return NULL;
-}
-
-static SkTypeface* find_typeface(const SkTypeface* familyMember,
-                                 SkTypeface::Style style) {
-    const FamilyRec* family = find_family(familyMember);
-    return family ? find_best_face(family, style) : NULL;
-}
-
-static void add_name(const char name[], FamilyRec* family) {
-    SkAutoAsciiToLC tolc(name);
-    name = tolc.lc();
-
-    NameFamilyPair* list = gNameList.begin();
-    int             count = gNameList.count();
-
-    int index = SkStrLCSearch(&list[0].fName, count, name, sizeof(list[0]));
-
-    if (index < 0) {
-        list = gNameList.insert(~index);
-        list->construct(name, family);
-    }
-}
-
-static void remove_from_names(FamilyRec* emptyFamily)
-{
-#ifdef SK_DEBUG
-    for (int i = 0; i < 4; i++) {
-        SkASSERT(emptyFamily->fFaces[i] == NULL);
-    }
-#endif
-
-    SkTDArray<NameFamilyPair>& list = gNameList;
-
-    // must go backwards when removing
-    for (int i = list.count() - 1; i >= 0; --i) {
-        NameFamilyPair* pair = &list[i];
-        if (pair->fFamily == emptyFamily) {
-            pair->destruct();
-            list.remove(i);
-        }
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-class FamilyTypeface : public SkTypeface_FreeType {
-public:
-    FamilyTypeface(Style style, bool sysFont, SkTypeface* familyMember,
-                   bool isFixedWidth)
-    : SkTypeface_FreeType(style, sk_atomic_inc(&gUniqueFontID) + 1, isFixedWidth) {
-        fIsSysFont = sysFont;
-
-        SkAutoMutexAcquire  ac(gFamilyMutex);
-
-        FamilyRec* rec = NULL;
-        if (familyMember) {
-            rec = find_family(familyMember);
-            SkASSERT(rec);
-        } else {
-            rec = SkNEW(FamilyRec);
-        }
-        rec->fFaces[style] = this;
-    }
-
-    virtual ~FamilyTypeface() {
-        SkAutoMutexAcquire  ac(gFamilyMutex);
-
-        // remove us from our family. If the family is now empty, we return
-        // that and then remove that family from the name list
-        FamilyRec* family = remove_from_family(this);
-        if (NULL != family) {
-            remove_from_names(family);
-            detach_and_delete_family(family);
-        }
-    }
-
-    bool isSysFont() const { return fIsSysFont; }
-
-    virtual const char* getUniqueString() const = 0;
-    virtual const char* getFilePath() const = 0;
-
-protected:
-    virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE;
-
-private:
-    bool    fIsSysFont;
-
-    typedef SkTypeface INHERITED;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
-class StreamTypeface : public FamilyTypeface {
-public:
-    StreamTypeface(Style style, bool sysFont, SkTypeface* familyMember,
-                   SkStream* stream, bool isFixedWidth)
-    : INHERITED(style, sysFont, familyMember, isFixedWidth) {
-        SkASSERT(stream);
-        stream->ref();
-        fStream = stream;
-    }
-    virtual ~StreamTypeface() {
-        fStream->unref();
-    }
-
-    // overrides
-    virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE {
-        *ttcIndex = 0;
-        // we just ref our existing stream, since the caller will call unref()
-        // when they are through
-        fStream->ref();
-        // must rewind each time, since the caller assumes a "new" stream
-        fStream->rewind();
-        return fStream;
-    }
-    virtual const char* getUniqueString() const { return NULL; }
-    virtual const char* getFilePath() const { return NULL; }
-
-private:
-    SkStream* fStream;
-
-    typedef FamilyTypeface INHERITED;
-};
-
-class FileTypeface : public FamilyTypeface {
-public:
-    FileTypeface(Style style, bool sysFont, SkTypeface* familyMember,
-                 const char path[], bool isFixedWidth)
-    : INHERITED(style, sysFont, familyMember, isFixedWidth) {
-        SkString fullpath;
-
-        if (sysFont) {
-            GetFullPathForSysFonts(&fullpath, path);
-            path = fullpath.c_str();
-        }
-        fPath.set(path);
-    }
-
-    // overrides
-    virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE {
-        *ttcIndex = 0;
-        SkStream* stream = SkNEW_ARGS(SkFILEStream, (fPath.c_str()));
-
-        // check for failure
-        if (stream->getLength() <= 0) {
-            SkDELETE(stream);
-            stream = NULL;
-        }
-        return stream;
-    }
-    virtual const char* getUniqueString() const {
-        const char* str = strrchr(fPath.c_str(), '/');
-        if (str) {
-            str += 1;   // skip the '/'
-        }
-        return str;
-    }
-    virtual const char* getFilePath() const {
-        return fPath.c_str();
-    }
-
-private:
-    SkString fPath;
-
-    typedef FamilyTypeface INHERITED;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-static bool get_name_and_style(const char path[], SkString* name,
-                               SkTypeface::Style* style,
-                               bool* isFixedWidth, bool isExpected) {
-    SkString        fullpath;
-    GetFullPathForSysFonts(&fullpath, path);
-
-    SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(fullpath.c_str()));
-    if (stream.get()) {
-        return SkTypeface_FreeType::ScanFont(stream, 0, name, style, isFixedWidth);
-    }
-
-    if (isExpected) {
-        SkDebugf("---- failed to open <%s> as a font\n", fullpath.c_str());
-    }
-    return false;
-}
-
-// used to record our notion of the pre-existing fonts
-struct FontInitRec {
-    const char*         fFileName;
-    const char* const*  fNames;     // null-terminated list
-};
-
-static const char* gSansNames[] = {
-    "sans-serif", "arial", "helvetica", "tahoma", "verdana", NULL
-};
-
-static const char* gSerifNames[] = {
-    "serif", "times", "times new roman", "palatino", "georgia", "baskerville",
-    "goudy", "fantasy", "cursive", "ITC Stone Serif", NULL
-};
-
-static const char* gMonoNames[] = {
-    "monospace", "courier", "courier new", "monaco", NULL
-};
-
-// deliberately empty, but we use the address to identify fallback fonts
-static const char* gFBNames[] = { NULL };
-
-/*  Fonts must be grouped by family, with the first font in a family having the
-    list of names (even if that list is empty), and the following members having
-    null for the list. The names list must be NULL-terminated
-*/
-static const FontInitRec gSystemFonts[] = {
-    { "DroidSans.ttf",              gSansNames  },
-    { "DroidSans-Bold.ttf",         NULL        },
-    { "DroidSerif-Regular.ttf",     gSerifNames },
-    { "DroidSerif-Bold.ttf",        NULL        },
-    { "DroidSerif-Italic.ttf",      NULL        },
-    { "DroidSerif-BoldItalic.ttf",  NULL        },
-    { "DroidSansMono.ttf",          gMonoNames  },
-    /*  These are optional, and can be ignored if not found in the file system.
-        These are appended to gFallbackFonts[] as they are seen, so we list
-        them in the order we want them to be accessed by NextLogicalFont().
-     */
-    { "DroidSansArabic.ttf",        gFBNames    },
-    { "DroidSansHebrew.ttf",        gFBNames    },
-    { "DroidSansThai.ttf",          gFBNames    },
-    { "MTLmr3m.ttf",                gFBNames    }, // Motoya Japanese Font
-    { "MTLc3m.ttf",                 gFBNames    }, // Motoya Japanese Font
-    { "DroidSansJapanese.ttf",      gFBNames    },
-    { "DroidSansFallback.ttf",      gFBNames    }
-};
-
-#define DEFAULT_NAMES   gSansNames
-
-// these globals are assigned (once) by load_system_fonts()
-static FamilyRec* gDefaultFamily;
-static SkTypeface* gDefaultNormal;
-
-/*  This is sized conservatively, assuming that it will never be a size issue.
-    It will be initialized in load_system_fonts(), and will be filled with the
-    fontIDs that can be used for fallback consideration, in sorted order (sorted
-    meaning element[0] should be used first, then element[1], etc. When we hit
-    a fontID==0 in the array, the list is done, hence our allocation size is
-    +1 the total number of possible system fonts. Also see NextLogicalFont().
- */
-static uint32_t gFallbackFonts[SK_ARRAY_COUNT(gSystemFonts)+1];
-
-/*  Called once (ensured by the sentinel check at the beginning of our body).
-    Initializes all the globals, and register the system fonts.
- */
-static void load_system_fonts() {
-    // check if we've already be called
-    if (NULL != gDefaultNormal) {
-        return;
-    }
-
-    const FontInitRec* rec = gSystemFonts;
-    SkTypeface* firstInFamily = NULL;
-    int fallbackCount = 0;
-
-    for (size_t i = 0; i < SK_ARRAY_COUNT(gSystemFonts); i++) {
-        // if we're the first in a new family, clear firstInFamily
-        if (rec[i].fNames != NULL) {
-            firstInFamily = NULL;
-        }
-
-        bool isFixedWidth;
-        SkString name;
-        SkTypeface::Style style;
-
-        // we expect all the fonts, except the "fallback" fonts
-        bool isExpected = (rec[i].fNames != gFBNames);
-        if (!get_name_and_style(rec[i].fFileName, &name, &style,
-                                &isFixedWidth, isExpected)) {
-            continue;
-        }
-
-        SkTypeface* tf = SkNEW_ARGS(FileTypeface,
-                                    (style,
-                                     true,  // system-font (cannot delete)
-                                     firstInFamily, // what family to join
-                                     rec[i].fFileName,
-                                     isFixedWidth) // filename
-                                    );
-
-        if (rec[i].fNames != NULL) {
-            // see if this is one of our fallback fonts
-            if (rec[i].fNames == gFBNames) {
-            //    SkDebugf("---- adding %s as fallback[%d] fontID %d\n",
-            //             rec[i].fFileName, fallbackCount, tf->uniqueID());
-                gFallbackFonts[fallbackCount++] = tf->uniqueID();
-            }
-
-            firstInFamily = tf;
-            FamilyRec* family = find_family(tf);
-            const char* const* names = rec[i].fNames;
-
-            // record the default family if this is it
-            if (names == DEFAULT_NAMES) {
-                gDefaultFamily = family;
-            }
-            // add the names to map to this family
-            while (*names) {
-                add_name(*names, family);
-                names += 1;
-            }
-        }
-    }
-
-    // do this after all fonts are loaded. This is our default font, and it
-    // acts as a sentinel so we only execute load_system_fonts() once
-    gDefaultNormal = find_best_face(gDefaultFamily, SkTypeface::kNormal);
-    // now terminate our fallback list with the sentinel value
-    gFallbackFonts[fallbackCount] = 0;
-}
-
-void FamilyTypeface::onGetFontDescriptor(SkFontDescriptor* desc,
-                                         bool* isLocalStream) const {
-    {
-        SkAutoMutexAcquire ac(gFamilyMutex);
-        //desc->setFamilyName(find_family_name(this));
-        desc->setFontFileName(this->getUniqueString());
-    }
-    *isLocalStream = !this->isSysFont();
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-SkTypeface* SkFontHost::CreateTypeface(const SkTypeface* familyFace,
-                                       const char familyName[],
-                                       SkTypeface::Style style) {
-    load_system_fonts();
-
-    SkAutoMutexAcquire  ac(gFamilyMutex);
-
-    // clip to legal style bits
-    style = (SkTypeface::Style)(style & SkTypeface::kBoldItalic);
-
-    SkTypeface* tf = NULL;
-
-    if (NULL != familyFace) {
-        tf = find_typeface(familyFace, style);
-    } else if (NULL != familyName) {
-//        SkDebugf("======= familyName <%s>\n", familyName);
-        tf = find_typeface(familyName, style);
-    }
-
-    if (NULL == tf) {
-        tf = find_best_face(gDefaultFamily, style);
-    }
-
-    // we ref(), since the symantic is to return a new instance
-    tf->ref();
-    return tf;
-}
-
-SkTypeface* SkAndroidNextLogicalTypeface(SkFontID currFontID, SkFontID origFontID,
-                                         const SkPaintOptionsAndroid& options) {
-    load_system_fonts();
-
-    /*  First see if fontID is already one of our fallbacks. If so, return
-        its successor. If fontID is not in our list, then return the first one
-        in our list. Note: list is zero-terminated, and returning zero means
-        we have no more fonts to use for fallbacks.
-     */
-    const uint32_t* list = gFallbackFonts;
-    for (int i = 0; list[i] != 0; i++) {
-        if (list[i] == currFontID) {
-            return find_from_uniqueID(list[i+1]);
-        }
-    }
-    return find_from_uniqueID(list[0]);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) {
-    if (NULL == stream || stream->getLength() <= 0) {
-        return NULL;
-    }
-
-    bool isFixedWidth;
-    SkString name;
-    SkTypeface::Style style;
-    SkTypeface_FreeType::ScanFont(stream, 0, &name, &style, &isFixedWidth);
-
-    if (!name.isEmpty()) {
-        return SkNEW_ARGS(StreamTypeface, (style, false, NULL, stream, isFixedWidth));
-    } else {
-        return NULL;
-    }
-}
-
-SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) {
-    SkStream* stream = SkNEW_ARGS(SkFILEStream, (path));
-    SkTypeface* face = SkFontHost::CreateTypefaceFromStream(stream);
-    // since we created the stream, we let go of our ref() here
-    stream->unref();
-    return face;
-}
-
diff --git a/gfx/skia/skia/src/ports/SkFontHost_cairo.cpp b/gfx/skia/skia/src/ports/SkFontHost_cairo.cpp
index 22cfb58810b1..e820d0d0e5c0 100644
--- a/gfx/skia/skia/src/ports/SkFontHost_cairo.cpp
+++ b/gfx/skia/skia/src/ports/SkFontHost_cairo.cpp
@@ -32,14 +32,14 @@ public:
     virtual ~SkScalerContext_CairoFT();
 
 protected:
-    virtual unsigned generateGlyphCount() SK_OVERRIDE;
-    virtual uint16_t generateCharToGlyph(SkUnichar uniChar) SK_OVERRIDE;
-    virtual void generateAdvance(SkGlyph* glyph) SK_OVERRIDE;
-    virtual void generateMetrics(SkGlyph* glyph) SK_OVERRIDE;
-    virtual void generateImage(const SkGlyph& glyph) SK_OVERRIDE;
-    virtual void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE;
-    virtual void generateFontMetrics(SkPaint::FontMetrics* metrics) SK_OVERRIDE;
-    virtual SkUnichar generateGlyphToChar(uint16_t glyph) SK_OVERRIDE;
+    virtual unsigned generateGlyphCount() override;
+    virtual uint16_t generateCharToGlyph(SkUnichar uniChar) override;
+    virtual void generateAdvance(SkGlyph* glyph) override;
+    virtual void generateMetrics(SkGlyph* glyph) override;
+    virtual void generateImage(const SkGlyph& glyph) override;
+    virtual void generatePath(const SkGlyph& glyph, SkPath* path) override;
+    virtual void generateFontMetrics(SkPaint::FontMetrics* metrics) override;
+    virtual SkUnichar generateGlyphToChar(uint16_t glyph) override;
 private:
     cairo_scaled_font_t* fScaledFont;
     uint32_t fLoadGlyphFlags;
@@ -69,77 +69,82 @@ private:
 
 class SkCairoFTTypeface : public SkTypeface {
 public:
-    static SkTypeface* CreateTypeface(cairo_font_face_t* fontFace, SkTypeface::Style style, bool isFixedWidth) {
+    static SkTypeface* CreateTypeface(cairo_font_face_t* fontFace, const SkFontStyle& style, bool isFixedWidth) {
         SkASSERT(fontFace != NULL);
         SkASSERT(cairo_font_face_get_type(fontFace) == CAIRO_FONT_TYPE_FT);
 
         SkFontID newId = SkTypefaceCache::NewFontID();
 
-        return SkNEW_ARGS(SkCairoFTTypeface, (fontFace, style, newId, isFixedWidth));
+        return new SkCairoFTTypeface(fontFace, style, newId, isFixedWidth);
     }
 
     cairo_font_face_t* getFontFace() {
         return fFontFace;
     }
 
-    virtual SkStream* onOpenStream(int*) const SK_OVERRIDE { return NULL; }
+    virtual SkStreamAsset* onOpenStream(int*) const override { return NULL; }
 
     virtual SkAdvancedTypefaceMetrics*
-        onGetAdvancedTypefaceMetrics(SkAdvancedTypefaceMetrics::PerGlyphInfo,
-                                     const uint32_t*, uint32_t) const SK_OVERRIDE
+        onGetAdvancedTypefaceMetrics(PerGlyphInfo,
+                                     const uint32_t*, uint32_t) const override
     {
         SkDEBUGCODE(SkDebugf("SkCairoFTTypeface::onGetAdvancedTypefaceMetrics unimplemented\n"));
         return NULL;
     }
 
-    virtual SkScalerContext* onCreateScalerContext(const SkDescriptor* desc) const SK_OVERRIDE
+    virtual SkScalerContext* onCreateScalerContext(const SkDescriptor* desc) const override
     {
-        return SkNEW_ARGS(SkScalerContext_CairoFT, (const_cast<SkCairoFTTypeface*>(this), desc));
+        return new SkScalerContext_CairoFT(const_cast<SkCairoFTTypeface*>(this), desc);
     }
 
-    virtual void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE
+    virtual void onFilterRec(SkScalerContextRec*) const override
     {
         SkDEBUGCODE(SkDebugf("SkCairoFTTypeface::onFilterRec unimplemented\n"));
     }
 
-    virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE
+    virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const override
     {
         SkDEBUGCODE(SkDebugf("SkCairoFTTypeface::onGetFontDescriptor unimplemented\n"));
     }
 
-    virtual int onCharsToGlyphs(void const*, SkTypeface::Encoding, uint16_t*, int) const SK_OVERRIDE
+    virtual int onCharsToGlyphs(void const*, SkTypeface::Encoding, uint16_t*, int) const override
     {
         return 0;
     }
 
-    virtual int onCountGlyphs() const SK_OVERRIDE
+    virtual int onCountGlyphs() const override
     {
         return 0;
     }
 
-    virtual int onGetUPEM() const SK_OVERRIDE
+    virtual int onGetUPEM() const override
     {
         return 0;
     }
 
-    virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE
+    virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override
     {
         return NULL;
     }
 
-    virtual int onGetTableTags(SkFontTableTag*) const SK_OVERRIDE
+    virtual void onGetFamilyName(SkString* familyName) const override
+    {
+        familyName->reset();
+    }
+
+    virtual int onGetTableTags(SkFontTableTag*) const override
     {
         return 0;
     }
 
-    virtual size_t onGetTableData(SkFontTableTag, size_t, size_t, void*) const SK_OVERRIDE
+    virtual size_t onGetTableData(SkFontTableTag, size_t, size_t, void*) const override
     {
         return 0;
     }
 
 private:
 
-    SkCairoFTTypeface(cairo_font_face_t* fontFace, SkTypeface::Style style, SkFontID id, bool isFixedWidth)
+    SkCairoFTTypeface(cairo_font_face_t* fontFace, const SkFontStyle& style, SkFontID id, bool isFixedWidth)
         : SkTypeface(style, id, isFixedWidth)
         , fFontFace(fontFace)
     {
@@ -156,7 +161,7 @@ private:
     cairo_font_face_t* fFontFace;
 };
 
-SkTypeface* SkCreateTypefaceFromCairoFont(cairo_font_face_t* fontFace, SkTypeface::Style style, bool isFixedWidth)
+SkTypeface* SkCreateTypefaceFromCairoFont(cairo_font_face_t* fontFace, const SkFontStyle& style, bool isFixedWidth)
 {
     SkTypeface* typeface = reinterpret_cast<SkTypeface*>(cairo_font_face_get_user_data(fontFace, &kSkTypefaceKey));
 
@@ -170,38 +175,10 @@ SkTypeface* SkCreateTypefaceFromCairoFont(cairo_font_face_t* fontFace, SkTypefac
     return typeface;
 }
 
-#if defined(SK_FONTHOST_DOES_NOT_USE_FONTMGR) && SK_FONTHOST_CAIRO_STANDALONE
-SkTypeface* SkFontHost::CreateTypeface(const SkTypeface* familyFace,
-                                     const char famillyName[],
-                                     SkTypeface::Style style)
-{
-    SkDEBUGFAIL("SkFontHost::FindTypeface unimplemented");
-    return NULL;
-}
-
-SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream*)
-{
-    SkDEBUGFAIL("SkFontHost::CreateTypeface unimplemented");
-    return NULL;
-}
-
-SkTypeface* SkFontHost::CreateTypefaceFromFile(char const*)
-{
-    SkDEBUGFAIL("SkFontHost::CreateTypefaceFromFile unimplemented");
-    return NULL;
-}
-#endif
-
 ///////////////////////////////////////////////////////////////////////////////
 
 static bool isLCD(const SkScalerContext::Rec& rec) {
-    switch (rec.fMaskFormat) {
-        case SkMask::kLCD16_Format:
-        case SkMask::kLCD32_Format:
-            return true;
-        default:
-            return false;
-    }
+    return SkMask::kLCD16_Format == rec.fMaskFormat;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -266,6 +243,7 @@ SkScalerContext_CairoFT::SkScalerContext_CairoFT(SkTypeface* typeface, const SkD
     }
 
     fScaledFont = cairo_scaled_font_create(fontFace, &fontMatrix, &ctMatrix, fontOptions);
+    cairo_font_options_destroy(fontOptions);
 
     if ((fRec.fFlags & SkScalerContext::kEmbeddedBitmapText_Flag) == 0) {
         loadFlags |= FT_LOAD_NO_BITMAP;
@@ -309,7 +287,7 @@ void SkScalerContext_CairoFT::generateMetrics(SkGlyph* glyph)
 {
     SkASSERT(fScaledFont != NULL);
     cairo_text_extents_t extents;
-    cairo_glyph_t cairoGlyph = { glyph->getGlyphID(fBaseGlyphCount), 0.0, 0.0 };
+    cairo_glyph_t cairoGlyph = { glyph->getGlyphID(), 0.0, 0.0 };
     cairo_scaled_font_glyph_extents(fScaledFont, &cairoGlyph, 1, &extents);
 
     glyph->fAdvanceX = SkDoubleToFixed(extents.x_advance);
@@ -328,7 +306,7 @@ void SkScalerContext_CairoFT::generateImage(const SkGlyph& glyph)
     CairoLockedFTFace faceLock(fScaledFont);
     FT_Face face = faceLock.getFace();
 
-    FT_Error err = FT_Load_Glyph(face, glyph.getGlyphID(fBaseGlyphCount), fLoadGlyphFlags);
+    FT_Error err = FT_Load_Glyph(face, glyph.getGlyphID(), fLoadGlyphFlags);
 
     if (err != 0) {
         memset(glyph.fImage, 0, glyph.rowBytes() * glyph.fHeight);
@@ -350,7 +328,7 @@ void SkScalerContext_CairoFT::generatePath(const SkGlyph& glyph, SkPath* path)
     flags |= FT_LOAD_NO_BITMAP; // ignore embedded bitmaps so we're sure to get the outline
     flags &= ~FT_LOAD_RENDER;   // don't scan convert (we just want the outline)
 
-    FT_Error err = FT_Load_Glyph(face, glyph.getGlyphID(fBaseGlyphCount), flags);
+    FT_Error err = FT_Load_Glyph(face, glyph.getGlyphID(), flags);
 
     if (err != 0) {
         path->reset();
diff --git a/gfx/skia/skia/src/ports/SkFontHost_fontconfig.cpp b/gfx/skia/skia/src/ports/SkFontHost_fontconfig.cpp
index 6f24afc57399..5c9e89661790 100644
--- a/gfx/skia/skia/src/ports/SkFontHost_fontconfig.cpp
+++ b/gfx/skia/skia/src/ports/SkFontHost_fontconfig.cpp
@@ -8,9 +8,6 @@
 #include "SkFontConfigInterface.h"
 #include "SkFontConfigTypeface.h"
 #include "SkFontDescriptor.h"
-#include "SkFontHost.h"
-#include "SkFontHost_FreeType_common.h"
-#include "SkFontStream.h"
 #include "SkStream.h"
 #include "SkTypeface.h"
 #include "SkTypefaceCache.h"
@@ -59,150 +56,102 @@ SkFontConfigInterface* SkFontHost_fontconfig_ref_global() {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-struct FindRec {
-    FindRec(const char* name, SkTypeface::Style style)
+struct NameStyle {
+    NameStyle(const char* name, const SkFontStyle& style)
         : fFamilyName(name)  // don't need to make a deep copy
         , fStyle(style) {}
 
     const char* fFamilyName;
-    SkTypeface::Style fStyle;
+    SkFontStyle fStyle;
 };
 
-static bool find_proc(SkTypeface* face, SkTypeface::Style style, void* ctx) {
-    FontConfigTypeface* fci = (FontConfigTypeface*)face;
-    const FindRec* rec = (const FindRec*)ctx;
+static bool find_by_NameStyle(SkTypeface* cachedTypeface,
+                              const SkFontStyle& cachedStyle,
+                              void* ctx)
+{
+    FontConfigTypeface* cachedFCTypeface = static_cast<FontConfigTypeface*>(cachedTypeface);
+    const NameStyle* nameStyle = static_cast<const NameStyle*>(ctx);
 
-    return rec->fStyle == style && fci->isFamilyName(rec->fFamilyName);
+    return nameStyle->fStyle == cachedStyle &&
+           cachedFCTypeface->isFamilyName(nameStyle->fFamilyName);
 }
 
-SkTypeface* FontConfigTypeface::LegacyCreateTypeface(
-                const SkTypeface* familyFace,
-                const char familyName[],
-                SkTypeface::Style style) {
+static bool find_by_FontIdentity(SkTypeface* cachedTypeface, const SkFontStyle&, void* ctx) {
+    typedef SkFontConfigInterface::FontIdentity FontIdentity;
+    FontConfigTypeface* cachedFCTypeface = static_cast<FontConfigTypeface*>(cachedTypeface);
+    FontIdentity* indentity = static_cast<FontIdentity*>(ctx);
+
+    return cachedFCTypeface->getIdentity() == *indentity;
+}
+
+SkTypeface* FontConfigTypeface::LegacyCreateTypeface(const char familyName[],
+                                                     SkTypeface::Style style)
+{
     SkAutoTUnref<SkFontConfigInterface> fci(RefFCI());
-    if (NULL == fci.get()) {
-        return NULL;
+    if (nullptr == fci.get()) {
+        return nullptr;
     }
 
-    if (familyFace) {
-        FontConfigTypeface* fct = (FontConfigTypeface*)familyFace;
-        familyName = fct->getFamilyName();
-    }
-
-    FindRec rec(familyName, style);
-    SkTypeface* face = SkTypefaceCache::FindByProcAndRef(find_proc, &rec);
+    // Check if requested NameStyle is in the NameStyle cache.
+    SkFontStyle requestedStyle(style);
+    NameStyle nameStyle(familyName, requestedStyle);
+    SkTypeface* face = SkTypefaceCache::FindByProcAndRef(find_by_NameStyle, &nameStyle);
     if (face) {
-//        SkDebugf("found cached face <%s> <%s> %p [%d]\n", familyName, ((FontConfigTypeface*)face)->getFamilyName(), face, face->getRefCnt());
+        //SkDebugf("found cached face <%s> <%s> %p [%d]\n",
+        //         familyName, ((FontConfigTypeface*)face)->getFamilyName(),
+        //         face, face->getRefCnt());
         return face;
     }
 
     SkFontConfigInterface::FontIdentity indentity;
-    SkString                            outFamilyName;
-    SkTypeface::Style                   outStyle;
-
-    if (!fci->matchFamilyName(familyName, style,
-                              &indentity, &outFamilyName, &outStyle)) {
-        return NULL;
+    SkString outFamilyName;
+    SkTypeface::Style outStyle;
+    if (!fci->matchFamilyName(familyName, style, &indentity, &outFamilyName, &outStyle)) {
+        return nullptr;
     }
 
-    // check if we, in fact, already have this. perhaps fontconfig aliased the
-    // requested name to some other name we actually have...
-    rec.fFamilyName = outFamilyName.c_str();
-    rec.fStyle = outStyle;
-    face = SkTypefaceCache::FindByProcAndRef(find_proc, &rec);
-    if (face) {
-        return face;
+    // Check if a typeface with this FontIdentity is already in the FontIdentity cache.
+    face = SkTypefaceCache::FindByProcAndRef(find_by_FontIdentity, &indentity);
+    if (!face) {
+        face = FontConfigTypeface::Create(SkFontStyle(outStyle), indentity, outFamilyName);
+        // Add this FontIdentity to the FontIdentity cache.
+        SkTypefaceCache::Add(face, requestedStyle);
     }
+    // TODO: Ensure requested NameStyle and resolved NameStyle are both in the NameStyle cache.
 
-    face = FontConfigTypeface::Create(outStyle, indentity, outFamilyName);
-    SkTypefaceCache::Add(face, style);
-//    SkDebugf("add face <%s> <%s> %p [%d]\n", familyName, outFamilyName.c_str(), face, face->getRefCnt());
+    //SkDebugf("add face <%s> <%s> %p [%d]\n",
+    //         familyName, outFamilyName.c_str(),
+    //         face, face->getRefCnt());
     return face;
 }
 
-#ifdef SK_FONTHOST_DOES_NOT_USE_FONTMGR
-
-SkTypeface* SkFontHost::CreateTypeface(const SkTypeface* familyFace,
-                                       const char familyName[],
-                                       SkTypeface::Style style) {
-    return FontConfigTypeface::LegacyCreateTypeface(familyFace, familyName,
-                                                    style);
-}
-
-SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) {
-    if (!stream) {
-        return NULL;
-    }
-    const size_t length = stream->getLength();
-    if (!length) {
-        return NULL;
-    }
-    if (length >= 1024 * 1024 * 1024) {
-        return NULL;  // don't accept too large fonts (>= 1GB) for safety.
-    }
-
-    // ask freetype for reported style and if it is a fixed width font
-    SkTypeface::Style style = SkTypeface::kNormal;
-    bool isFixedWidth = false;
-    if (!SkTypeface_FreeType::ScanFont(stream, 0, NULL, &style, &isFixedWidth)) {
-        return NULL;
-    }
-
-    SkTypeface* face = SkNEW_ARGS(FontConfigTypeface, (style, isFixedWidth, stream));
-    return face;
-}
-
-SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) {
-    SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path));
-    return stream.get() ? CreateTypefaceFromStream(stream) : NULL;
-}
-
-#endif
-
 ///////////////////////////////////////////////////////////////////////////////
 
-SkStream* FontConfigTypeface::onOpenStream(int* ttcIndex) const {
-    SkStream* stream = this->getLocalStream();
+SkStreamAsset* FontConfigTypeface::onOpenStream(int* ttcIndex) const {
+    SkStreamAsset* stream = this->getLocalStream();
     if (stream) {
-        // should have been provided by CreateFromStream()
+        // TODO: should have been provided by CreateFromStream()
         *ttcIndex = 0;
-
-        SkAutoTUnref<SkStream> dupStream(stream->duplicate());
-        if (dupStream) {
-            return dupStream.detach();
-        }
-
-        // TODO: update interface use, remove the following code in this block.
-        size_t length = stream->getLength();
-
-        const void* memory = stream->getMemoryBase();
-        if (NULL != memory) {
-            return new SkMemoryStream(memory, length, true);
-        }
-
-        SkAutoTMalloc<uint8_t> allocMemory(length);
-        stream->rewind();
-        if (length == stream->read(allocMemory.get(), length)) {
-            SkAutoTUnref<SkMemoryStream> copyStream(new SkMemoryStream());
-            copyStream->setMemoryOwned(allocMemory.detach(), length);
-            return copyStream.detach();
-        }
-
-        stream->rewind();
-        stream->ref();
-    } else {
-        SkAutoTUnref<SkFontConfigInterface> fci(RefFCI());
-        if (NULL == fci.get()) {
-            return NULL;
-        }
-        stream = fci->openStream(this->getIdentity());
-        *ttcIndex = this->getIdentity().fTTCIndex;
+        return stream->duplicate();
     }
-    return stream;
+
+    SkAutoTUnref<SkFontConfigInterface> fci(RefFCI());
+    if (nullptr == fci.get()) {
+        return nullptr;
+    }
+
+    *ttcIndex = this->getIdentity().fTTCIndex;
+    return fci->openStream(this->getIdentity());
+}
+
+void FontConfigTypeface::onGetFamilyName(SkString* familyName) const {
+    *familyName = fFamilyName;
 }
 
 void FontConfigTypeface::onGetFontDescriptor(SkFontDescriptor* desc,
                                              bool* isLocalStream) const {
-    desc->setFamilyName(this->getFamilyName());
+    SkString name;
+    this->getFamilyName(&name);
+    desc->setFamilyName(name.c_str());
     *isLocalStream = SkToBool(this->getLocalStream());
 }
diff --git a/gfx/skia/skia/src/ports/SkFontHost_linux.cpp b/gfx/skia/skia/src/ports/SkFontHost_linux.cpp
deleted file mode 100644
index 498d69ffe03f..000000000000
--- a/gfx/skia/skia/src/ports/SkFontHost_linux.cpp
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkFontHost.h"
-#include "SkFontHost_FreeType_common.h"
-#include "SkFontDescriptor.h"
-#include "SkFontMgr.h"
-#include "SkDescriptor.h"
-#include "SkOSFile.h"
-#include "SkPaint.h"
-#include "SkString.h"
-#include "SkStream.h"
-#include "SkThread.h"
-#include "SkTSearch.h"
-#include "SkTypefaceCache.h"
-#include "SkTArray.h"
-
-#include <limits>
-
-#ifndef SK_FONT_FILE_PREFIX
-#    define SK_FONT_FILE_PREFIX "/usr/share/fonts/truetype/"
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-
-/** The base SkTypeface implementation for the custom font manager. */
-class SkTypeface_Custom : public SkTypeface_FreeType {
-public:
-    SkTypeface_Custom(Style style, bool isFixedPitch, bool sysFont, const SkString familyName)
-        : INHERITED(style, SkTypefaceCache::NewFontID(), isFixedPitch)
-        , fIsSysFont(sysFont), fFamilyName(familyName)
-    { }
-
-    bool isSysFont() const { return fIsSysFont; }
-
-    virtual const char* getUniqueString() const = 0;
-
-protected:
-    virtual void onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const SK_OVERRIDE {
-        desc->setFamilyName(fFamilyName.c_str());
-        desc->setFontFileName(this->getUniqueString());
-        *isLocal = !this->isSysFont();
-    }
-
-private:
-    bool fIsSysFont;
-    SkString fFamilyName;
-
-    typedef SkTypeface_FreeType INHERITED;
-};
-
-/** The empty SkTypeface implementation for the custom font manager.
- *  Used as the last resort fallback typeface.
- */
-class SkTypeface_Empty : public SkTypeface_Custom {
-public:
-    SkTypeface_Empty() : INHERITED(SkTypeface::kNormal, false, true, SkString()) {}
-
-    virtual const char* getUniqueString() const SK_OVERRIDE { return NULL; }
-
-protected:
-    virtual SkStream* onOpenStream(int*) const SK_OVERRIDE { return NULL; }
-
-private:
-    typedef SkTypeface_Custom INHERITED;
-};
-
-/** The stream SkTypeface implementation for the custom font manager. */
-class SkTypeface_Stream : public SkTypeface_Custom {
-public:
-    SkTypeface_Stream(Style style, bool isFixedPitch, bool sysFont, const SkString familyName,
-                      SkStream* stream, int ttcIndex)
-        : INHERITED(style, isFixedPitch, sysFont, familyName)
-        , fStream(SkRef(stream)), fTtcIndex(ttcIndex)
-    { }
-
-    virtual const char* getUniqueString() const SK_OVERRIDE { return NULL; }
-
-protected:
-    virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE {
-        *ttcIndex = 0;
-        return fStream->duplicate();
-    }
-
-private:
-    SkAutoTUnref<SkStream> fStream;
-    int fTtcIndex;
-
-    typedef SkTypeface_Custom INHERITED;
-};
-
-/** The file SkTypeface implementation for the custom font manager. */
-class SkTypeface_File : public SkTypeface_Custom {
-public:
-    SkTypeface_File(Style style, bool isFixedPitch, bool sysFont, const SkString familyName,
-                    const char path[])
-        : INHERITED(style, isFixedPitch, sysFont, familyName)
-        , fPath(path)
-    { }
-
-    virtual const char* getUniqueString() const SK_OVERRIDE {
-        const char* str = strrchr(fPath.c_str(), '/');
-        if (str) {
-            str += 1;   // skip the '/'
-        }
-        return str;
-    }
-
-protected:
-    virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE {
-        *ttcIndex = 0;
-        return SkStream::NewFromFile(fPath.c_str());
-    }
-
-private:
-    SkString fPath;
-
-    typedef SkTypeface_Custom INHERITED;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
-/**
- *  SkFontStyleSet_Custom
- *
- *  This class is used by SkFontMgr_Custom to hold SkTypeface_Custom families.
- */
-class SkFontStyleSet_Custom : public SkFontStyleSet {
-public:
-    explicit SkFontStyleSet_Custom(const SkString familyName) : fFamilyName(familyName) { }
-
-    virtual int count() SK_OVERRIDE {
-        return fStyles.count();
-    }
-
-    virtual void getStyle(int index, SkFontStyle* style, SkString* name) SK_OVERRIDE {
-        SkASSERT(index < fStyles.count());
-        bool bold = fStyles[index]->isBold();
-        bool italic = fStyles[index]->isItalic();
-        *style = SkFontStyle(bold ? SkFontStyle::kBold_Weight : SkFontStyle::kNormal_Weight,
-                             SkFontStyle::kNormal_Width,
-                             italic ? SkFontStyle::kItalic_Slant : SkFontStyle::kUpright_Slant);
-        name->reset();
-    }
-
-    virtual SkTypeface* createTypeface(int index) SK_OVERRIDE {
-        SkASSERT(index < fStyles.count());
-        return SkRef(fStyles[index].get());
-    }
-
-    static int match_score(const SkFontStyle& pattern, const SkFontStyle& candidate) {
-        int score = 0;
-        score += (pattern.width() - candidate.width()) * 100;
-        score += (pattern.isItalic() == candidate.isItalic()) ? 0 : 1000;
-        score += pattern.weight() - candidate.weight();
-        return score;
-    }
-
-    virtual SkTypeface* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE {
-        if (0 == fStyles.count()) {
-            return NULL;
-        }
-
-        SkTypeface_Custom* closest = fStyles[0];
-        int minScore = std::numeric_limits<int>::max();
-        for (int i = 0; i < fStyles.count(); ++i) {
-            bool bold = fStyles[i]->isBold();
-            bool italic = fStyles[i]->isItalic();
-            SkFontStyle style = SkFontStyle(bold ? SkFontStyle::kBold_Weight
-                                                 : SkFontStyle::kNormal_Weight,
-                                            SkFontStyle::kNormal_Width,
-                                            italic ? SkFontStyle::kItalic_Slant
-                                                   : SkFontStyle::kUpright_Slant);
-
-            int score = match_score(pattern, style);
-            if (score < minScore) {
-                closest = fStyles[i];
-                minScore = score;
-            }
-        }
-        return SkRef(closest);
-    }
-
-private:
-    SkTArray<SkAutoTUnref<SkTypeface_Custom>, true> fStyles;
-    SkString fFamilyName;
-
-    void appendTypeface(SkTypeface_Custom* typeface) {
-        fStyles.push_back().reset(typeface);
-    }
-
-    friend class SkFontMgr_Custom;
-};
-
-/**
- *  SkFontMgr_Custom
- *
- *  This class is essentially a collection of SkFontStyleSet_Custom,
- *  one SkFontStyleSet_Custom for each family. This class may be modified
- *  to load fonts from any source by changing the initialization.
- */
-class SkFontMgr_Custom : public SkFontMgr {
-public:
-    explicit SkFontMgr_Custom(const char* dir) {
-        this->load_system_fonts(dir);
-    }
-
-protected:
-    virtual int onCountFamilies() const SK_OVERRIDE {
-        return fFamilies.count();
-    }
-
-    virtual void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE {
-        SkASSERT(index < fFamilies.count());
-        familyName->set(fFamilies[index]->fFamilyName);
-    }
-
-    virtual SkFontStyleSet_Custom* onCreateStyleSet(int index) const SK_OVERRIDE {
-        SkASSERT(index < fFamilies.count());
-        return SkRef(fFamilies[index].get());
-    }
-
-    virtual SkFontStyleSet_Custom* onMatchFamily(const char familyName[]) const SK_OVERRIDE {
-        for (int i = 0; i < fFamilies.count(); ++i) {
-            if (fFamilies[i]->fFamilyName.equals(familyName)) {
-                return SkRef(fFamilies[i].get());
-            }
-        }
-        return NULL;
-    }
-
-    virtual SkTypeface* onMatchFamilyStyle(const char familyName[],
-                                           const SkFontStyle& fontStyle) const SK_OVERRIDE
-    {
-        SkAutoTUnref<SkFontStyleSet> sset(this->matchFamily(familyName));
-        return sset->matchStyle(fontStyle);
-    }
-
-    virtual SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember,
-                                         const SkFontStyle& fontStyle) const SK_OVERRIDE
-    {
-        for (int i = 0; i < fFamilies.count(); ++i) {
-            for (int j = 0; j < fFamilies[i]->fStyles.count(); ++j) {
-                if (fFamilies[i]->fStyles[j] == familyMember) {
-                    return fFamilies[i]->matchStyle(fontStyle);
-                }
-            }
-        }
-        return NULL;
-    }
-
-    virtual SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE {
-        SkAutoTUnref<SkStream> stream(new SkMemoryStream(data));
-        return this->createFromStream(stream, ttcIndex);
-    }
-
-    virtual SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE {
-        if (NULL == stream || stream->getLength() <= 0) {
-            SkDELETE(stream);
-            return NULL;
-        }
-
-        bool isFixedPitch;
-        SkTypeface::Style style;
-        SkString name;
-        if (SkTypeface_FreeType::ScanFont(stream, ttcIndex, &name, &style, &isFixedPitch)) {
-            return SkNEW_ARGS(SkTypeface_Stream, (style, isFixedPitch, false, name,
-                                                  stream, ttcIndex));
-        } else {
-            return NULL;
-        }
-    }
-
-    virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE {
-        SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path));
-        return stream.get() ? this->createFromStream(stream, ttcIndex) : NULL;
-    }
-
-    virtual SkTypeface* onLegacyCreateTypeface(const char familyName[],
-                                               unsigned styleBits) const SK_OVERRIDE
-    {
-        SkTypeface::Style oldStyle = (SkTypeface::Style)styleBits;
-        SkFontStyle style = SkFontStyle(oldStyle & SkTypeface::kBold
-                                                 ? SkFontStyle::kBold_Weight
-                                                 : SkFontStyle::kNormal_Weight,
-                                        SkFontStyle::kNormal_Width,
-                                        oldStyle & SkTypeface::kItalic
-                                                 ? SkFontStyle::kItalic_Slant
-                                                 : SkFontStyle::kUpright_Slant);
-        SkTypeface* tf = NULL;
-
-        if (NULL != familyName) {
-            tf = this->onMatchFamilyStyle(familyName, style);
-        }
-
-        if (NULL == tf) {
-            tf = gDefaultFamily->matchStyle(style);
-        }
-
-        return SkSafeRef(tf);
-    }
-
-private:
-
-    static bool get_name_and_style(const char path[], SkString* name,
-                                   SkTypeface::Style* style, bool* isFixedPitch) {
-        SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path));
-        if (stream.get()) {
-            return SkTypeface_FreeType::ScanFont(stream, 0, name, style, isFixedPitch);
-        } else {
-            SkDebugf("---- failed to open <%s> as a font\n", path);
-            return false;
-        }
-    }
-
-    void load_directory_fonts(const SkString& directory) {
-        SkOSFile::Iter iter(directory.c_str(), ".ttf");
-        SkString name;
-
-        while (iter.next(&name, false)) {
-            SkString filename(
-                SkOSPath::SkPathJoin(directory.c_str(), name.c_str()));
-
-            bool isFixedPitch;
-            SkString realname;
-            SkTypeface::Style style = SkTypeface::kNormal; // avoid uninitialized warning
-
-            if (!get_name_and_style(filename.c_str(), &realname, &style, &isFixedPitch)) {
-                SkDebugf("------ can't load <%s> as a font\n", filename.c_str());
-                continue;
-            }
-
-            SkTypeface_Custom* tf = SkNEW_ARGS(SkTypeface_File, (
-                                                style,
-                                                isFixedPitch,
-                                                true,  // system-font (cannot delete)
-                                                realname,
-                                                filename.c_str()));
-
-            SkFontStyleSet_Custom* addTo = this->onMatchFamily(realname.c_str());
-            if (NULL == addTo) {
-                addTo = new SkFontStyleSet_Custom(realname);
-                fFamilies.push_back().reset(addTo);
-            }
-            addTo->appendTypeface(tf);
-        }
-
-        SkOSFile::Iter dirIter(directory.c_str());
-        while (dirIter.next(&name, true)) {
-            if (name.startsWith(".")) {
-                continue;
-            }
-            SkString dirname(
-                SkOSPath::SkPathJoin(directory.c_str(), name.c_str()));
-            load_directory_fonts(dirname);
-        }
-    }
-
-    void load_system_fonts(const char* dir) {
-        SkString baseDirectory(dir);
-        load_directory_fonts(baseDirectory);
-
-        if (fFamilies.empty()) {
-            SkFontStyleSet_Custom* family = new SkFontStyleSet_Custom(SkString());
-            fFamilies.push_back().reset(family);
-            family->appendTypeface(SkNEW(SkTypeface_Empty));
-        }
-
-        // Try to pick a default font.
-        static const char* gDefaultNames[] = {
-            "Arial", "Verdana", "Times New Roman", "Droid Sans", NULL
-        };
-        for (size_t i = 0; i < SK_ARRAY_COUNT(gDefaultNames); ++i) {
-            SkFontStyleSet_Custom* set = this->onMatchFamily(gDefaultNames[i]);
-            if (NULL == set) {
-                continue;
-            }
-
-            SkTypeface* tf = set->matchStyle(SkFontStyle(SkFontStyle::kNormal_Weight,
-                                                         SkFontStyle::kNormal_Width,
-                                                         SkFontStyle::kUpright_Slant));
-            if (NULL == tf) {
-                continue;
-            }
-
-            gDefaultFamily = set;
-            gDefaultNormal = tf;
-            break;
-        }
-        if (NULL == gDefaultNormal) {
-            gDefaultFamily = fFamilies[0];
-            gDefaultNormal = gDefaultFamily->fStyles[0];
-        }
-    }
-
-    SkTArray<SkAutoTUnref<SkFontStyleSet_Custom>, true> fFamilies;
-    SkFontStyleSet_Custom* gDefaultFamily;
-    SkTypeface* gDefaultNormal;
-};
-
-SkFontMgr* SkFontMgr::Factory() {
-    return new SkFontMgr_Custom(SK_FONT_FILE_PREFIX);
-}
diff --git a/gfx/skia/skia/src/ports/SkFontHost_mac.cpp b/gfx/skia/skia/src/ports/SkFontHost_mac.cpp
old mode 100755
new mode 100644
index 4cd378e2748f..25030be41329
--- a/gfx/skia/skia/src/ports/SkFontHost_mac.cpp
+++ b/gfx/skia/skia/src/ports/SkFontHost_mac.cpp
@@ -6,7 +6,9 @@
  * found in the LICENSE file.
  */
 
-#include <vector>
+#include "SkTypes.h"  // Keep this before any #ifdef ...
+#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
+
 #ifdef SK_BUILD_FOR_MAC
 #import <ApplicationServices/ApplicationServices.h>
 #endif
@@ -18,33 +20,48 @@
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 
-#include "SkFontHost.h"
+#include "SkAdvancedTypefaceMetrics.h"
 #include "SkCGUtils.h"
 #include "SkColorPriv.h"
 #include "SkDescriptor.h"
 #include "SkEndian.h"
-#include "SkFontDescriptor.h"
 #include "SkFloatingPoint.h"
+#include "SkFontDescriptor.h"
+#include "SkFontMgr.h"
 #include "SkGlyph.h"
 #include "SkMaskGamma.h"
-#include "SkSFNTHeader.h"
+#include "SkMutex.h"
 #include "SkOTTable_glyf.h"
 #include "SkOTTable_head.h"
 #include "SkOTTable_hhea.h"
 #include "SkOTTable_loca.h"
 #include "SkOTUtils.h"
+#include "SkOncePtr.h"
 #include "SkPaint.h"
 #include "SkPath.h"
-#include "SkString.h"
+#include "SkSFNTHeader.h"
 #include "SkStream.h"
-#include "SkThread.h"
+#include "SkString.h"
+#include "SkTypefaceCache.h"
 #include "SkTypeface_mac.h"
 #include "SkUtils.h"
-#include "SkTypefaceCache.h"
-#include "SkFontMgr.h"
 #include "SkUtils.h"
 
-//#define HACK_COLORGLYPHS
+#include <dlfcn.h>
+
+// Experimental code to use a global lock whenever we access CG, to see if this reduces
+// crashes in Chrome
+#define USE_GLOBAL_MUTEX_FOR_CG_ACCESS
+
+#ifdef USE_GLOBAL_MUTEX_FOR_CG_ACCESS
+    SK_DECLARE_STATIC_MUTEX(gCGMutex);
+    #define AUTO_CG_LOCK()  SkAutoMutexAcquire amc(gCGMutex)
+#else
+    #define AUTO_CG_LOCK()
+#endif
+
+// Set to make glyph bounding boxes visible.
+#define SK_SHOW_TEXT_BLIT_COVERAGE 0
 
 class SkScalerContext_Mac;
 
@@ -52,7 +69,7 @@ class SkScalerContext_Mac;
 // provide a wrapper here that will return an empty array if need be.
 static CFArrayRef SkCTFontManagerCopyAvailableFontFamilyNames() {
 #ifdef SK_BUILD_FOR_IOS
-    return CFArrayCreate(NULL, NULL, 0, NULL);
+    return CFArrayCreate(nullptr, nullptr, 0, nullptr);
 #else
     return CTFontManagerCopyAvailableFontFamilyNames();
 #endif
@@ -78,26 +95,32 @@ template <typename T> static void CFSafeRetain(/*CFTypeRef*/const T* cfTypeRef)
 /** Acts like a CFRef, but calls CFSafeRelease when it goes out of scope. */
 template<typename CFRef> class AutoCFRelease : private SkNoncopyable {
 public:
-    explicit AutoCFRelease(CFRef cfRef = NULL) : fCFRef(cfRef) { }
+    explicit AutoCFRelease(CFRef cfRef = nullptr) : fCFRef(cfRef) { }
     ~AutoCFRelease() { CFSafeRelease(fCFRef); }
 
-    void reset(CFRef that = NULL) {
+    void reset(CFRef that = nullptr) {
         if (that != fCFRef) {
             CFSafeRelease(fCFRef);
             fCFRef = that;
         }
     }
 
+    CFRef detach() {
+        CFRef self = fCFRef;
+        fCFRef = nullptr;
+        return self;
+    }
+
     operator CFRef() const { return fCFRef; }
     CFRef get() const { return fCFRef; }
 
-    CFRef* operator&() { SkASSERT(fCFRef == NULL); return &fCFRef; }
+    CFRef* operator&() { SkASSERT(fCFRef == nullptr); return &fCFRef; }
 private:
     CFRef fCFRef;
 };
 
 static CFStringRef make_CFString(const char str[]) {
-    return CFStringCreateWithCString(NULL, str, kCFStringEncodingUTF8);
+    return CFStringCreateWithCString(nullptr, str, kCFStringEncodingUTF8);
 }
 
 template<typename T> class AutoCGTable : SkNoncopyable {
@@ -105,7 +128,7 @@ public:
     AutoCGTable(CGFontRef font)
     //Undocumented: the tag parameter in this call is expected in machine order and not BE order.
     : fCFData(CGFontCopyTableForTag(font, SkSetFourByteTag(T::TAG0, T::TAG1, T::TAG2, T::TAG3)))
-    , fData(fCFData ? reinterpret_cast<const T*>(CFDataGetBytePtr(fCFData)) : NULL)
+    , fData(fCFData ? reinterpret_cast<const T*>(CFDataGetBytePtr(fCFData)) : nullptr)
     { }
 
     const T* operator->() const { return fData; }
@@ -196,22 +219,6 @@ static unsigned CGRGBPixel_getAlpha(CGRGBPixel pixel) {
     return pixel & 0xFF;
 }
 
-// The calls to support subpixel are present in 10.5, but are not included in
-// the 10.5 SDK. The needed calls have been extracted from the 10.6 SDK and are
-// included below. To verify that CGContextSetShouldSubpixelQuantizeFonts, for
-// instance, is present in the 10.5 CoreGraphics libary, use:
-//   cd /Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/
-//   cd ApplicationServices.framework/Frameworks/CoreGraphics.framework/
-//   nm CoreGraphics | grep CGContextSetShouldSubpixelQuantizeFonts
-
-#if !defined(MAC_OS_X_VERSION_10_6) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6)
-CG_EXTERN void CGContextSetAllowsFontSmoothing(CGContextRef context, bool value);
-CG_EXTERN void CGContextSetAllowsFontSubpixelPositioning(CGContextRef context, bool value);
-CG_EXTERN void CGContextSetShouldSubpixelPositionFonts(CGContextRef context, bool value);
-CG_EXTERN void CGContextSetAllowsFontSubpixelQuantization(CGContextRef context, bool value);
-CG_EXTERN void CGContextSetShouldSubpixelQuantizeFonts(CGContextRef context, bool value);
-#endif
-
 static const char FONT_DEFAULT_NAME[] = "Lucida Sans";
 
 // See Source/WebKit/chromium/base/mac/mac_util.mm DarwinMajorVersionInternal for original source.
@@ -255,7 +262,7 @@ static bool isMountainLion() {
 }
 
 static bool isLCDFormat(unsigned format) {
-    return SkMask::kLCD16_Format == format || SkMask::kLCD32_Format == format;
+    return SkMask::kLCD16_Format == format;
 }
 
 static CGFloat ScalarToCG(SkScalar scalar) {
@@ -290,7 +297,6 @@ static CGAffineTransform MatrixToCGAffineTransform(const SkMatrix& matrix,
 ///////////////////////////////////////////////////////////////////////////////
 
 #define BITMAP_INFO_RGB (kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Host)
-#define BITMAP_INFO_GRAY (kCGImageAlphaNone)
 
 /**
  * There does not appear to be a publicly accessable API for determining if lcd
@@ -321,7 +327,14 @@ static bool supports_LCD() {
 
 class Offscreen {
 public:
-    Offscreen();
+    Offscreen()
+        : fRGBSpace(nullptr)
+        , fCG(nullptr)
+        , fDoAA(false)
+        , fDoLCD(false)
+    {
+        fSize.set(0, 0);
+    }
 
     CGRGBPixel* getCG(const SkScalerContext_Mac& context, const SkGlyph& glyph,
                       CGGlyph glyphID, size_t* rowBytesPtr,
@@ -345,12 +358,58 @@ private:
     }
 };
 
-Offscreen::Offscreen() : fRGBSpace(NULL), fCG(NULL),
-                         fDoAA(false), fDoLCD(false) {
-    fSize.set(0, 0);
+///////////////////////////////////////////////////////////////////////////////
+
+static bool find_dict_float(CFDictionaryRef dict, CFStringRef name, float* value) {
+    CFNumberRef num;
+    return CFDictionaryGetValueIfPresent(dict, name, (const void**)&num)
+    && CFNumberIsFloatType(num)
+    && CFNumberGetValue(num, kCFNumberFloatType, value);
 }
 
-///////////////////////////////////////////////////////////////////////////////
+static int unit_weight_to_fontstyle(float unit) {
+    float value;
+    if (unit < 0) {
+        value = 100 + (1 + unit) * 300;
+    } else {
+        value = 400 + unit * 500;
+    }
+    return sk_float_round2int(value);
+}
+
+static int unit_width_to_fontstyle(float unit) {
+    float value;
+    if (unit < 0) {
+        value = 1 + (1 + unit) * 4;
+    } else {
+        value = 5 + unit * 4;
+    }
+    return sk_float_round2int(value);
+}
+
+static SkFontStyle fontstyle_from_descriptor(CTFontDescriptorRef desc) {
+    AutoCFRelease<CFDictionaryRef> dict(
+            (CFDictionaryRef)CTFontDescriptorCopyAttribute(desc, kCTFontTraitsAttribute));
+    if (nullptr == dict.get()) {
+        return SkFontStyle();
+    }
+
+    float weight, width, slant;
+    if (!find_dict_float(dict, kCTFontWeightTrait, &weight)) {
+        weight = 0;
+    }
+    if (!find_dict_float(dict, kCTFontWidthTrait, &width)) {
+        width = 0;
+    }
+    if (!find_dict_float(dict, kCTFontSlantTrait, &slant)) {
+        slant = 0;
+    }
+
+    return SkFontStyle(unit_weight_to_fontstyle(weight),
+                       unit_width_to_fontstyle(width),
+                       slant ? SkFontStyle::kItalic_Slant
+                       : SkFontStyle::kUpright_Slant);
+}
 
 static SkTypeface::Style computeStyleBits(CTFontRef font, bool* isFixedPitch) {
     unsigned style = SkTypeface::kNormal;
@@ -368,103 +427,54 @@ static SkTypeface::Style computeStyleBits(CTFontRef font, bool* isFixedPitch) {
     return (SkTypeface::Style)style;
 }
 
-static SkFontID CTFontRef_to_SkFontID(CTFontRef fontRef) {
-    SkFontID id = 0;
-// CTFontGetPlatformFont and ATSFontRef are not supported on iOS, so we have to
-// bracket this to be Mac only.
-#ifdef SK_BUILD_FOR_MAC
-    ATSFontRef ats = CTFontGetPlatformFont(fontRef, NULL);
-    id = (SkFontID)ats;
-    if (id != 0) {
-        id &= 0x3FFFFFFF; // make top two bits 00
-        return id;
-    }
-#endif
-    // CTFontGetPlatformFont returns NULL if the font is local
-    // (e.g., was created by a CSS3 @font-face rule).
-    AutoCFRelease<CGFontRef> cgFont(CTFontCopyGraphicsFont(fontRef, NULL));
-    AutoCGTable<SkOTTableHead> headTable(cgFont);
-    if (headTable.fData) {
-        id = (SkFontID) headTable->checksumAdjustment;
-        id = (id & 0x3FFFFFFF) | 0x40000000; // make top two bits 01
-    }
-    // well-formed fonts have checksums, but as a last resort, use the pointer.
-    if (id == 0) {
-        id = (SkFontID) (uintptr_t) fontRef;
-        id = (id & 0x3FFFFFFF) | 0x80000000; // make top two bits 10
-    }
-    return id;
-}
-
-static SkFontStyle stylebits2fontstyle(SkTypeface::Style styleBits) {
-    return SkFontStyle((styleBits & SkTypeface::kBold)
-                           ? SkFontStyle::kBold_Weight
-                           : SkFontStyle::kNormal_Weight,
-                       SkFontStyle::kNormal_Width,
-                       (styleBits & SkTypeface::kItalic)
-                           ? SkFontStyle::kItalic_Slant
-                           : SkFontStyle::kUpright_Slant);
-}
-
 #define WEIGHT_THRESHOLD    ((SkFontStyle::kNormal_Weight + SkFontStyle::kBold_Weight)/2)
 
-static SkTypeface::Style fontstyle2stylebits(const SkFontStyle& fs) {
-    unsigned style = 0;
-    if (fs.width() >= WEIGHT_THRESHOLD) {
-        style |= SkTypeface::kBold;
-    }
-    if (fs.isItalic()) {
-        style |= SkTypeface::kItalic;
-    }
-    return (SkTypeface::Style)style;
-}
+// kCTFontColorGlyphsTrait was added in the Mac 10.7 and iPhone 4.3 SDKs.
+// Being an enum value it is not guarded by version macros, but old SDKs must still be supported.
+#if defined(__MAC_10_7) || defined(__IPHONE_4_3)
+static const uint32_t SkCTFontColorGlyphsTrait = kCTFontColorGlyphsTrait;
+#else
+static const uint32_t SkCTFontColorGlyphsTrait = (1 << 13);
+#endif
 
 class SkTypeface_Mac : public SkTypeface {
 public:
-    SkTypeface_Mac(SkTypeface::Style style, SkFontID fontID, bool isFixedPitch,
-                   CTFontRef fontRef, const char name[], bool isLocalStream)
-        : SkTypeface(style, fontID, isFixedPitch)
-        , fName(name)
+    SkTypeface_Mac(CTFontRef fontRef, CFTypeRef resourceRef,
+                   const SkFontStyle& fs, bool isFixedPitch,
+                   const char requestedName[], bool isLocalStream)
+        : SkTypeface(fs, SkTypefaceCache::NewFontID(), isFixedPitch)
+        , fRequestedName(requestedName)
         , fFontRef(fontRef) // caller has already called CFRetain for us
-        , fFontStyle(stylebits2fontstyle(style))
+        , fOriginatingCFTypeRef(resourceRef) // caller has already called CFRetain for us
+        , fHasColorGlyphs(SkToBool(CTFontGetSymbolicTraits(fFontRef) & SkCTFontColorGlyphsTrait))
         , fIsLocalStream(isLocalStream)
     {
         SkASSERT(fontRef);
     }
 
-    SkTypeface_Mac(const SkFontStyle& fs, SkFontID fontID, bool isFixedPitch,
-                   CTFontRef fontRef, const char name[], bool isLocalStream)
-        : SkTypeface(fontstyle2stylebits(fs), fontID, isFixedPitch)
-        , fName(name)
-        , fFontRef(fontRef) // caller has already called CFRetain for us
-        , fFontStyle(fs)
-        , fIsLocalStream(isLocalStream)
-    {
-        SkASSERT(fontRef);
-    }
-
-    SkString fName;
+    SkString fRequestedName;
     AutoCFRelease<CTFontRef> fFontRef;
-    SkFontStyle fFontStyle;
+    AutoCFRelease<CFTypeRef> fOriginatingCFTypeRef;
+    const bool fHasColorGlyphs;
 
 protected:
-    friend class SkFontHost;    // to access our protected members for deprecated methods
-
-    virtual int onGetUPEM() const SK_OVERRIDE;
-    virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE;
-    virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE;
-    virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE;
+    int onGetUPEM() const override;
+    SkStreamAsset* onOpenStream(int* ttcIndex) const override;
+    SkFontData* onCreateFontData() const override;
+    void onGetFamilyName(SkString* familyName) const override;
+    SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override;
+    int onGetTableTags(SkFontTableTag tags[]) const override;
     virtual size_t onGetTableData(SkFontTableTag, size_t offset,
-                                  size_t length, void* data) const SK_OVERRIDE;
-    virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE;
-    virtual void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE;
-    virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE;
+                                  size_t length, void* data) const override;
+    SkScalerContext* onCreateScalerContext(const SkDescriptor*) const override;
+    void onFilterRec(SkScalerContextRec*) const override;
+    void onGetFontDescriptor(SkFontDescriptor*, bool*) const override;
     virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
-                                SkAdvancedTypefaceMetrics::PerGlyphInfo,
-                                const uint32_t*, uint32_t) const SK_OVERRIDE;
+                                PerGlyphInfo,
+                                const uint32_t*, uint32_t) const override;
     virtual int onCharsToGlyphs(const void* chars, Encoding, uint16_t glyphs[],
-                                int glyphCount) const SK_OVERRIDE;
-    virtual int onCountGlyphs() const SK_OVERRIDE;
+                                int glyphCount) const override;
+    int onCountGlyphs() const override;
 
 private:
     bool fIsLocalStream;
@@ -472,26 +482,36 @@ private:
     typedef SkTypeface INHERITED;
 };
 
-static SkTypeface* NewFromFontRef(CTFontRef fontRef, const char name[], bool isLocalStream) {
+/** Creates a typeface without searching the cache. Takes ownership of the CTFontRef. */
+static SkTypeface* NewFromFontRef(CTFontRef fontRef, CFTypeRef resourceRef,
+                                  const char name[], bool isLocalStream)
+{
     SkASSERT(fontRef);
     bool isFixedPitch;
-    SkTypeface::Style style = computeStyleBits(fontRef, &isFixedPitch);
-    SkFontID fontID = CTFontRef_to_SkFontID(fontRef);
+    SkFontStyle style = SkFontStyle(computeStyleBits(fontRef, &isFixedPitch));
 
-    return new SkTypeface_Mac(style, fontID, isFixedPitch, fontRef, name, isLocalStream);
+    return new SkTypeface_Mac(fontRef, resourceRef, style, isFixedPitch, name, isLocalStream);
 }
 
-static SkTypeface* NewFromName(const char familyName[], SkTypeface::Style theStyle) {
-    CTFontRef ctFont = NULL;
+static bool find_by_CTFontRef(SkTypeface* cached, const SkFontStyle&, void* context) {
+    CTFontRef self = (CTFontRef)context;
+    CTFontRef other = ((SkTypeface_Mac*)cached)->fFontRef;
 
+    return CFEqual(self, other);
+}
+
+/** Creates a typeface from a name, searching the cache. */
+static SkTypeface* NewFromName(const char familyName[], const SkFontStyle& theStyle) {
     CTFontSymbolicTraits ctFontTraits = 0;
-    if (theStyle & SkTypeface::kBold) {
+    if (theStyle.weight() >= SkFontStyle::kBold_Weight) {
         ctFontTraits |= kCTFontBoldTrait;
     }
-    if (theStyle & SkTypeface::kItalic) {
+    if (theStyle.slant() != SkFontStyle::kUpright_Slant) {
         ctFontTraits |= kCTFontItalicTrait;
     }
 
+    //TODO: add weight width slant
+
     // Create the font info
     AutoCFRelease<CFStringRef> cfFontName(make_CFString(familyName));
 
@@ -508,22 +528,32 @@ static SkTypeface* NewFromName(const char familyName[], SkTypeface::Style theSty
                                       &kCFTypeDictionaryKeyCallBacks,
                                       &kCFTypeDictionaryValueCallBacks));
 
-    // Create the font
-    if (cfFontName != NULL && cfFontTraits != NULL && cfAttributes != NULL && cfTraits != NULL) {
-        CFDictionaryAddValue(cfTraits, kCTFontSymbolicTrait, cfFontTraits);
-
-        CFDictionaryAddValue(cfAttributes, kCTFontFamilyNameAttribute, cfFontName);
-        CFDictionaryAddValue(cfAttributes, kCTFontTraitsAttribute, cfTraits);
-
-        AutoCFRelease<CTFontDescriptorRef> ctFontDesc(
-                CTFontDescriptorCreateWithAttributes(cfAttributes));
-
-        if (ctFontDesc != NULL) {
-            ctFont = CTFontCreateWithFontDescriptor(ctFontDesc, 0, NULL);
-        }
+    if (!cfFontName || !cfFontTraits || !cfAttributes || !cfTraits) {
+        return nullptr;
     }
 
-    return ctFont ? NewFromFontRef(ctFont, familyName, false) : NULL;
+    CFDictionaryAddValue(cfTraits, kCTFontSymbolicTrait, cfFontTraits);
+
+    CFDictionaryAddValue(cfAttributes, kCTFontFamilyNameAttribute, cfFontName);
+    CFDictionaryAddValue(cfAttributes, kCTFontTraitsAttribute, cfTraits);
+
+    AutoCFRelease<CTFontDescriptorRef> ctFontDesc(
+            CTFontDescriptorCreateWithAttributes(cfAttributes));
+    if (!ctFontDesc) {
+        return nullptr;
+    }
+
+    AutoCFRelease<CTFontRef> ctFont(CTFontCreateWithFontDescriptor(ctFontDesc, 0, nullptr));
+    if (!ctFont) {
+        return nullptr;
+    }
+
+    SkTypeface* face = SkTypefaceCache::FindByProcAndRef(find_by_CTFontRef, (void*)ctFont.get());
+    if (!face) {
+        face = NewFromFontRef(ctFont.detach(), nullptr, nullptr, false);
+        SkTypefaceCache::Add(face, face->fontStyle());
+    }
+    return face;
 }
 
 SK_DECLARE_STATIC_MUTEX(gGetDefaultFaceMutex);
@@ -532,9 +562,9 @@ static SkTypeface* GetDefaultFace() {
 
     static SkTypeface* gDefaultFace;
 
-    if (NULL == gDefaultFace) {
-        gDefaultFace = NewFromName(FONT_DEFAULT_NAME, SkTypeface::kNormal);
-        SkTypefaceCache::Add(gDefaultFace, SkTypeface::kNormal);
+    if (nullptr == gDefaultFace) {
+        gDefaultFace = NewFromName(FONT_DEFAULT_NAME, SkFontStyle());
+        SkTypefaceCache::Add(gDefaultFace, SkFontStyle());
     }
     return gDefaultFace;
 }
@@ -544,40 +574,36 @@ static SkTypeface* GetDefaultFace() {
 extern CTFontRef SkTypeface_GetCTFontRef(const SkTypeface* face);
 CTFontRef SkTypeface_GetCTFontRef(const SkTypeface* face) {
     const SkTypeface_Mac* macface = (const SkTypeface_Mac*)face;
-    return macface ? macface->fFontRef.get() : NULL;
+    return macface ? macface->fFontRef.get() : nullptr;
 }
 
 /*  This function is visible on the outside. It first searches the cache, and if
  *  not found, returns a new entry (after adding it to the cache).
  */
-SkTypeface* SkCreateTypefaceFromCTFont(CTFontRef fontRef) {
-    SkFontID fontID = CTFontRef_to_SkFontID(fontRef);
-    SkTypeface* face = SkTypefaceCache::FindByID(fontID);
-    if (face) {
-        face->ref();
-    } else {
-        face = NewFromFontRef(fontRef, NULL, false);
-        SkTypefaceCache::Add(face, face->style());
-        // NewFromFontRef doesn't retain the parameter, but the typeface it
-        // creates does release it in its destructor, so we balance that with
-        // a retain call here.
+SkTypeface* SkCreateTypefaceFromCTFont(CTFontRef fontRef, CFTypeRef resourceRef) {
+    SkTypeface* face = SkTypefaceCache::FindByProcAndRef(find_by_CTFontRef, (void*)fontRef);
+    if (!face) {
         CFRetain(fontRef);
+        if (resourceRef) {
+            CFRetain(resourceRef);
+        }
+        face = NewFromFontRef(fontRef, resourceRef, nullptr, false);
+        SkTypefaceCache::Add(face, face->fontStyle());
     }
-    SkASSERT(face->getRefCnt() > 1);
     return face;
 }
 
-struct NameStyleRec {
-    const char*         fName;
-    SkTypeface::Style   fStyle;
+struct NameStyle {
+    const char* fName;
+    SkFontStyle fStyle;
 };
 
-static bool FindByNameStyle(SkTypeface* face, SkTypeface::Style style,
-                            void* ctx) {
-    const SkTypeface_Mac* mface = reinterpret_cast<SkTypeface_Mac*>(face);
-    const NameStyleRec* rec = reinterpret_cast<const NameStyleRec*>(ctx);
+static bool find_by_NameStyle(SkTypeface* cachedFace, const SkFontStyle& cachedStyle, void* ctx) {
+    const SkTypeface_Mac* cachedMacFace = static_cast<SkTypeface_Mac*>(cachedFace);
+    const NameStyle* requested = static_cast<const NameStyle*>(ctx);
 
-    return rec->fStyle == style && mface->fName.equals(rec->fName);
+    return cachedStyle == requested->fStyle
+        && cachedMacFace->fRequestedName.equals(requested->fName);
 }
 
 static const char* map_css_names(const char* name) {
@@ -598,39 +624,6 @@ static const char* map_css_names(const char* name) {
     return name;    // no change
 }
 
-static SkTypeface* create_typeface(const SkTypeface* familyFace,
-                                   const char familyName[],
-                                   SkTypeface::Style style) {
-    if (familyName) {
-        familyName = map_css_names(familyName);
-    }
-
-    // Clone an existing typeface
-    // TODO: only clone if style matches the familyFace's style...
-    if (familyName == NULL && familyFace != NULL) {
-        familyFace->ref();
-        return const_cast<SkTypeface*>(familyFace);
-    }
-
-    if (!familyName || !*familyName) {
-        familyName = FONT_DEFAULT_NAME;
-    }
-
-    NameStyleRec rec = { familyName, style };
-    SkTypeface* face = SkTypefaceCache::FindByProcAndRef(FindByNameStyle, &rec);
-
-    if (NULL == face) {
-        face = NewFromName(familyName, style);
-        if (face) {
-            SkTypefaceCache::Add(face, style);
-        } else {
-            face = GetDefaultFace();
-            face->ref();
-        }
-    }
-    return face;
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
 /** GlyphRect is in FUnits (em space, y up). */
@@ -646,13 +639,13 @@ public:
     SkScalerContext_Mac(SkTypeface_Mac*, const SkDescriptor*);
 
 protected:
-    unsigned generateGlyphCount(void) SK_OVERRIDE;
-    uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE;
-    void generateAdvance(SkGlyph* glyph) SK_OVERRIDE;
-    void generateMetrics(SkGlyph* glyph) SK_OVERRIDE;
-    void generateImage(const SkGlyph& glyph) SK_OVERRIDE;
-    void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE;
-    void generateFontMetrics(SkPaint::FontMetrics*) SK_OVERRIDE;
+    unsigned generateGlyphCount(void) override;
+    uint16_t generateCharToGlyph(SkUnichar uni) override;
+    void generateAdvance(SkGlyph* glyph) override;
+    void generateMetrics(SkGlyph* glyph) override;
+    void generateImage(const SkGlyph& glyph) override;
+    void generatePath(const SkGlyph& glyph, SkPath* path) override;
+    void generateFontMetrics(SkPaint::FontMetrics*) override;
 
 private:
     static void CTPathElement(void *info, const CGPathElement *element);
@@ -692,16 +685,30 @@ private:
     SkMatrix fFUnitMatrix;
 
     Offscreen fOffscreen;
-    AutoCFRelease<CTFontRef> fCTFont;
 
-    /** Vertical variant of fCTFont.
+    /** Unrotated variant of fCTFont.
+     *
+     *  In 10.10.1 CTFontGetAdvancesForGlyphs applies the font transform to the width of the
+     *  advances, but always sets the height to 0. This font is used to get the advances of the
+     *  unrotated glyph, and then the rotation is applied separately.
      *
      *  CT vertical metrics are pre-rotated (in em space, before transform) 90deg clock-wise.
      *  This makes kCTFontDefaultOrientation dangerous, because the metrics from
      *  kCTFontHorizontalOrientation are in a different space from kCTFontVerticalOrientation.
-     *  Use fCTVerticalFont with kCTFontVerticalOrientation to get metrics in the same space.
+     *  With kCTFontVerticalOrientation the advances must be unrotated.
+     *
+     *  Sometimes, creating a copy of a CTFont with the same size but different trasform will select
+     *  different underlying font data. As a result, avoid ever creating more than one CTFont per
+     *  SkScalerContext to ensure that only one CTFont is used.
+     *
+     *  As a result of the above (and other constraints) this font contains the size, but not the
+     *  transform. The transform must always be applied separately.
      */
-    AutoCFRelease<CTFontRef> fCTVerticalFont;
+    AutoCFRelease<CTFontRef> fCTFont;
+
+    /** The transform without the font size. */
+    CGAffineTransform fTransform;
+    CGAffineTransform fInvTransform;
 
     AutoCFRelease<CGFontRef> fCGFont;
     SkAutoTMalloc<GlyphRect> fFBoundingBoxes;
@@ -716,6 +723,27 @@ private:
     typedef SkScalerContext INHERITED;
 };
 
+// CTFontCreateCopyWithAttributes or CTFontCreateCopyWithSymbolicTraits cannot be used on 10.10
+// and later, as they will return different underlying fonts depending on the size requested.
+// It is not possible to use descriptors with CTFontCreateWithFontDescriptor, since that does not
+// work with non-system fonts. As a result, create the strike specific CTFonts from the underlying
+// CGFont.
+static CTFontRef ctfont_create_exact_copy(CTFontRef baseFont, CGFloat textSize,
+                                          const CGAffineTransform* transform)
+{
+    AutoCFRelease<CGFontRef> baseCGFont(CTFontCopyGraphicsFont(baseFont, nullptr));
+
+    // The last parameter (CTFontDescriptorRef attributes) *must* be nullptr.
+    // If non-nullptr then with fonts with variation axes, the copy will fail in
+    // CGFontVariationFromDictCallback when it assumes kCGFontVariationAxisName is CFNumberRef
+    // which it quite obviously is not.
+
+    // Because we cannot setup the CTFont descriptor to match, the same restriction applies here
+    // as other uses of CTFontCreateWithGraphicsFont which is that such CTFonts should not escape
+    // the scaler context, since they aren't 'normal'.
+    return CTFontCreateWithGraphicsFont(baseCGFont, textSize, transform, nullptr);
+}
+
 SkScalerContext_Mac::SkScalerContext_Mac(SkTypeface_Mac* typeface,
                                          const SkDescriptor* desc)
         : INHERITED(typeface, desc)
@@ -726,44 +754,55 @@ SkScalerContext_Mac::SkScalerContext_Mac(SkTypeface_Mac* typeface,
         , fVertical(SkToBool(fRec.fFlags & kVertical_Flag))
 
 {
+    AUTO_CG_LOCK();
+
     CTFontRef ctFont = typeface->fFontRef.get();
     CFIndex numGlyphs = CTFontGetGlyphCount(ctFont);
     SkASSERT(numGlyphs >= 1 && numGlyphs <= 0xFFFF);
     fGlyphCount = SkToU16(numGlyphs);
 
-    fRec.getSingleMatrix(&fFUnitMatrix);
-    CGAffineTransform transform = MatrixToCGAffineTransform(fFUnitMatrix);
+    // CT on (at least) 10.9 will size color glyphs down from the requested size, but not up.
+    // As a result, it is necessary to know the actual device size and request that.
+    SkVector scale;
+    SkMatrix skTransform;
+    fRec.computeMatrices(SkScalerContextRec::kVertical_PreMatrixScale, &scale, &skTransform,
+                         nullptr, nullptr, &fFUnitMatrix);
+    fTransform = MatrixToCGAffineTransform(skTransform);
+    fInvTransform = CGAffineTransformInvert(fTransform);
 
-    AutoCFRelease<CTFontDescriptorRef> ctFontDesc;
-    if (fVertical) {
-        AutoCFRelease<CFMutableDictionaryRef> cfAttributes(CFDictionaryCreateMutable(
-                kCFAllocatorDefault, 0,
-                &kCFTypeDictionaryKeyCallBacks,
-                &kCFTypeDictionaryValueCallBacks));
-        if (cfAttributes) {
-            CTFontOrientation ctOrientation = kCTFontVerticalOrientation;
-            AutoCFRelease<CFNumberRef> cfVertical(CFNumberCreate(
-                    kCFAllocatorDefault, kCFNumberSInt32Type, &ctOrientation));
-            CFDictionaryAddValue(cfAttributes, kCTFontOrientationAttribute, cfVertical);
-            ctFontDesc.reset(CTFontDescriptorCreateWithAttributes(cfAttributes));
-        }
-    }
-    // Since our matrix includes everything, we pass 1 for size.
-    fCTFont.reset(CTFontCreateCopyWithAttributes(ctFont, 1, &transform, ctFontDesc));
-    fCGFont.reset(CTFontCopyGraphicsFont(fCTFont, NULL));
-    if (fVertical) {
-        CGAffineTransform rotateLeft = CGAffineTransformMake(0, -1, 1, 0, 0, 0);
-        transform = CGAffineTransformConcat(rotateLeft, transform);
-        fCTVerticalFont.reset(CTFontCreateCopyWithAttributes(ctFont, 1, &transform, NULL));
-    }
+    // The transform contains everything except the requested text size.
+    // Some properties, like 'trak', are based on the text size (before applying the matrix).
+    CGFloat textSize = ScalarToCG(scale.y());
+    fCTFont.reset(ctfont_create_exact_copy(ctFont, textSize, nullptr));
+    fCGFont.reset(CTFontCopyGraphicsFont(fCTFont, nullptr));
 
+    // The fUnitMatrix includes the text size (and em) as it is used to scale the raw font data.
     SkScalar emPerFUnit = SkScalarInvert(SkIntToScalar(CGFontGetUnitsPerEm(fCGFont)));
     fFUnitMatrix.preScale(emPerFUnit, -emPerFUnit);
 }
 
+/** This is an implementation of CTFontDrawGlyphs for 10.6; it was introduced in 10.7. */
+static void legacy_CTFontDrawGlyphs(CTFontRef, const CGGlyph glyphs[], const CGPoint points[],
+                                    size_t count, CGContextRef cg) {
+    CGContextShowGlyphsAtPositions(cg, glyphs, points, count);
+}
+
+typedef decltype(legacy_CTFontDrawGlyphs) CTFontDrawGlyphsProc;
+
+static CTFontDrawGlyphsProc* choose_CTFontDrawGlyphs() {
+    if (void* real = dlsym(RTLD_DEFAULT, "CTFontDrawGlyphs")) {
+        return (CTFontDrawGlyphsProc*)real;
+    }
+    return &legacy_CTFontDrawGlyphs;
+}
+
+SK_DECLARE_STATIC_ONCE_PTR(CTFontDrawGlyphsProc, gCTFontDrawGlyphs);
+
 CGRGBPixel* Offscreen::getCG(const SkScalerContext_Mac& context, const SkGlyph& glyph,
                              CGGlyph glyphID, size_t* rowBytesPtr,
                              bool generateA8FromLCD) {
+    auto ctFontDrawGlyphs = gCTFontDrawGlyphs.get(choose_CTFontDrawGlyphs);
+
     if (!fRGBSpace) {
         //It doesn't appear to matter what color space is specified.
         //Regular blends and antialiased text are always (s*a + d*(1-a))
@@ -786,6 +825,13 @@ CGRGBPixel* Offscreen::getCG(const SkScalerContext_Mac& context, const SkGlyph&
         doAA = true;
     }
 
+    // If this font might have color glyphs, disable LCD as there's no way to support it.
+    // CoreText doesn't tell us which format it ended up using, so we can't detect it.
+    // A8 will be ugly too (white on transparent), but TODO: we can detect gray and set to A8.
+    if (SkMask::kARGB32_Format == glyph.fMaskFormat) {
+        doLCD = false;
+    }
+
     size_t rowBytes = fSize.fWidth * sizeof(CGRGBPixel);
     if (!fCG || fSize.fWidth < glyph.fWidth || fSize.fHeight < glyph.fHeight) {
         if (fSize.fWidth < glyph.fWidth) {
@@ -797,24 +843,25 @@ CGRGBPixel* Offscreen::getCG(const SkScalerContext_Mac& context, const SkGlyph&
 
         rowBytes = fSize.fWidth * sizeof(CGRGBPixel);
         void* image = fImageStorage.reset(rowBytes * fSize.fHeight);
+        const CGImageAlphaInfo alpha = (SkMask::kARGB32_Format == glyph.fMaskFormat)
+                                     ? kCGImageAlphaPremultipliedFirst
+                                     : kCGImageAlphaNoneSkipFirst;
+        const CGBitmapInfo bitmapInfo = kCGBitmapByteOrder32Host | alpha;
         fCG.reset(CGBitmapContextCreate(image, fSize.fWidth, fSize.fHeight, 8,
-                                        rowBytes, fRGBSpace, BITMAP_INFO_RGB));
+                                        rowBytes, fRGBSpace, bitmapInfo));
 
-        // skia handles quantization itself, so we disable this for cg to get
-        // full fractional data from them.
+        // Skia handles quantization and subpixel positioning,
+        // so disable quantization and enabe subpixel positioning in CG.
         CGContextSetAllowsFontSubpixelQuantization(fCG, false);
         CGContextSetShouldSubpixelQuantizeFonts(fCG, false);
 
-        CGContextSetTextDrawingMode(fCG, kCGTextFill);
-        CGContextSetFont(fCG, context.fCGFont);
-        CGContextSetFontSize(fCG, 1 /*CTFontGetSize(context.fCTFont)*/);
-        CGContextSetTextMatrix(fCG, CTFontGetMatrix(context.fCTFont));
-
         // Because CG always draws from the horizontal baseline,
         // if there is a non-integral translation from the horizontal origin to the vertical origin,
         // then CG cannot draw the glyph in the correct location without subpixel positioning.
-        CGContextSetAllowsFontSubpixelPositioning(fCG, context.fDoSubPosition || context.fVertical);
-        CGContextSetShouldSubpixelPositionFonts(fCG, context.fDoSubPosition || context.fVertical);
+        CGContextSetAllowsFontSubpixelPositioning(fCG, true);
+        CGContextSetShouldSubpixelPositionFonts(fCG, true);
+
+        CGContextSetTextDrawingMode(fCG, kCGTextFill);
 
         // Draw white on black to create mask.
         // TODO: Draw black on white and invert, CG has a special case codepath.
@@ -823,6 +870,14 @@ CGRGBPixel* Offscreen::getCG(const SkScalerContext_Mac& context, const SkGlyph&
         // force our checks below to happen
         fDoAA = !doAA;
         fDoLCD = !doLCD;
+
+        if (legacy_CTFontDrawGlyphs == ctFontDrawGlyphs) {
+            // CTFontDrawGlyphs will apply the font, font size, and font matrix to the CGContext.
+            // Our 'fake' one does not, so set up the CGContext here.
+            CGContextSetFont(fCG, context.fCGFont);
+            CGContextSetFontSize(fCG, CTFontGetSize(context.fCTFont));
+        }
+        CGContextSetTextMatrix(fCG, context.fTransform);
     }
 
     if (fDoAA != doAA) {
@@ -848,7 +903,7 @@ CGRGBPixel* Offscreen::getCG(const SkScalerContext_Mac& context, const SkGlyph&
         subY = SkFixedToFloat(glyph.getSubYFixed());
     }
 
-    // CGContextShowGlyphsAtPoint always draws using the horizontal baseline origin.
+    // CoreText and CoreGraphics always draw using the horizontal baseline origin.
     if (context.fVertical) {
         SkPoint offset;
         context.getVerticalOffset(glyphID, &offset);
@@ -856,9 +911,17 @@ CGRGBPixel* Offscreen::getCG(const SkScalerContext_Mac& context, const SkGlyph&
         subY += offset.fY;
     }
 
-    CGContextShowGlyphsAtPoint(fCG, -glyph.fLeft + subX,
-                               glyph.fTop + glyph.fHeight - subY,
-                               &glyphID, 1);
+    CGPoint point = CGPointMake(-glyph.fLeft + subX, glyph.fTop + glyph.fHeight - subY);
+    // Prior to 10.10, CTFontDrawGlyphs acted like CGContextShowGlyphsAtPositions and took
+    // 'positions' which are in text space. The glyph location (in device space) must be
+    // mapped into text space, so that CG can convert it back into device space.
+    // In 10.10.1, this is handled directly in CTFontDrawGlyphs.
+    //
+    // However, in 10.10.2 color glyphs no longer rotate based on the font transform.
+    // So always make the font transform identity and place the transform on the context.
+    point = CGPointApplyAffineTransform(point, context.fInvTransform);
+
+    ctFontDrawGlyphs(context.fCTFont, &glyphID, &point, 1, fCG);
 
     SkASSERT(rowBytesPtr);
     *rowBytesPtr = rowBytes;
@@ -870,16 +933,17 @@ void SkScalerContext_Mac::getVerticalOffset(CGGlyph glyphID, SkPoint* offset) co
     // Lion and Leopard return cgVertOffset in CG units (pixels, y up).
     CGSize cgVertOffset;
     CTFontGetVerticalTranslationsForGlyphs(fCTFont, &glyphID, &cgVertOffset, 1);
-
-    SkPoint skVertOffset = { CGToScalar(cgVertOffset.width), CGToScalar(cgVertOffset.height) };
     if (isSnowLeopard()) {
+        SkPoint skVertOffset = { CGToScalar(cgVertOffset.width), CGToScalar(cgVertOffset.height) };
         // From FUnits (em space, y up) to SkGlyph units (pixels, y down).
         fFUnitMatrix.mapPoints(&skVertOffset, 1);
-    } else {
-        // From CG units (pixels, y up) to SkGlyph units (pixels, y down).
-        skVertOffset.fY = -skVertOffset.fY;
+        *offset = skVertOffset;
+        return;
     }
-
+    cgVertOffset = CGSizeApplyAffineTransform(cgVertOffset, fTransform);
+    SkPoint skVertOffset = { CGToScalar(cgVertOffset.width), CGToScalar(cgVertOffset.height) };
+    // From CG units (pixels, y up) to SkGlyph units (pixels, y down).
+    skVertOffset.fY = -skVertOffset.fY;
     *offset = skVertOffset;
 }
 
@@ -897,7 +961,7 @@ uint16_t SkScalerContext_Mac::getFBoundingBoxesGlyphOffset() {
 
 bool SkScalerContext_Mac::generateBBoxes() {
     if (fGeneratedFBoundingBoxes) {
-        return NULL != fFBoundingBoxes.get();
+        return SkToBool(fFBoundingBoxes.get());
     }
     fGeneratedFBoundingBoxes = true;
 
@@ -939,6 +1003,8 @@ unsigned SkScalerContext_Mac::generateGlyphCount(void) {
 }
 
 uint16_t SkScalerContext_Mac::generateCharToGlyph(SkUnichar uni) {
+    AUTO_CG_LOCK();
+
     CGGlyph cgGlyph[2];
     UniChar theChar[2]; // UniChar is a UTF-16 16-bit code unit.
 
@@ -958,18 +1024,24 @@ void SkScalerContext_Mac::generateAdvance(SkGlyph* glyph) {
 }
 
 void SkScalerContext_Mac::generateMetrics(SkGlyph* glyph) {
-    const CGGlyph cgGlyph = (CGGlyph) glyph->getGlyphID(fBaseGlyphCount);
+    AUTO_CG_LOCK();
+
+    const CGGlyph cgGlyph = (CGGlyph) glyph->getGlyphID();
     glyph->zeroMetrics();
 
     // The following block produces cgAdvance in CG units (pixels, y up).
     CGSize cgAdvance;
     if (fVertical) {
-        CTFontGetAdvancesForGlyphs(fCTVerticalFont, kCTFontVerticalOrientation,
+        CTFontGetAdvancesForGlyphs(fCTFont, kCTFontVerticalOrientation,
                                    &cgGlyph, &cgAdvance, 1);
+        // Vertical advances are returned as widths instead of heights.
+        SkTSwap(cgAdvance.height, cgAdvance.width);
+        cgAdvance.height = -cgAdvance.height;
     } else {
         CTFontGetAdvancesForGlyphs(fCTFont, kCTFontHorizontalOrientation,
                                    &cgGlyph, &cgAdvance, 1);
     }
+    cgAdvance = CGSizeApplyAffineTransform(cgAdvance, fTransform);
     glyph->fAdvanceX =  SkFloatToFixed_Check(cgAdvance.width);
     glyph->fAdvanceY = -SkFloatToFixed_Check(cgAdvance.height);
 
@@ -1014,6 +1086,7 @@ void SkScalerContext_Mac::generateMetrics(SkGlyph* glyph) {
         CGRect cgBounds;
         CTFontGetBoundingRectsForGlyphs(fCTFont, kCTFontHorizontalOrientation,
                                         &cgGlyph, &cgBounds, 1);
+        cgBounds = CGRectApplyAffineTransform(cgBounds, fTransform);
 
         // BUG?
         // 0x200B (zero-advance space) seems to return a huge (garbage) bounds, when
@@ -1021,8 +1094,8 @@ void SkScalerContext_Mac::generateMetrics(SkGlyph* glyph) {
         // empty path or not, and if so, we jam the bounds to 0. Hopefully a zero-advance
         // is rare, so we won't incur a big performance cost for this extra check.
         if (0 == cgAdvance.width && 0 == cgAdvance.height) {
-            AutoCFRelease<CGPathRef> path(CTFontCreatePathForGlyph(fCTFont, cgGlyph, NULL));
-            if (NULL == path || CGPathIsEmpty(path)) {
+            AutoCFRelease<CGPathRef> path(CTFontCreatePathForGlyph(fCTFont, cgGlyph, nullptr));
+            if (nullptr == path || CGPathIsEmpty(path)) {
                 return;
             }
         }
@@ -1062,10 +1135,6 @@ void SkScalerContext_Mac::generateMetrics(SkGlyph* glyph) {
     glyph->fTop = SkToS16(skIBounds.fTop);
     glyph->fWidth = SkToU16(skIBounds.width());
     glyph->fHeight = SkToU16(skIBounds.height());
-
-#ifdef HACK_COLORGLYPHS
-    glyph->fMaskFormat = SkMask::kARGB32_Format;
-#endif
 }
 
 #include "SkColorPriv.h"
@@ -1114,7 +1183,11 @@ static inline uint8_t rgb_to_a8(CGRGBPixel rgb, const uint8_t* table8) {
     U8CPU r = (rgb >> 16) & 0xFF;
     U8CPU g = (rgb >>  8) & 0xFF;
     U8CPU b = (rgb >>  0) & 0xFF;
-    return sk_apply_lut_if<APPLY_PREBLEND>(SkComputeLuminance(r, g, b), table8);
+    U8CPU lum = sk_apply_lut_if<APPLY_PREBLEND>(SkComputeLuminance(r, g, b), table8);
+#if SK_SHOW_TEXT_BLIT_COVERAGE
+    lum = SkTMax(lum, (U8CPU)0x30);
+#endif
+    return lum;
 }
 template<bool APPLY_PREBLEND>
 static void rgb_to_a8(const CGRGBPixel* SK_RESTRICT cgPixels, size_t cgRowBytes,
@@ -1139,6 +1212,11 @@ static inline uint16_t rgb_to_lcd16(CGRGBPixel rgb, const uint8_t* tableR,
     U8CPU r = sk_apply_lut_if<APPLY_PREBLEND>((rgb >> 16) & 0xFF, tableR);
     U8CPU g = sk_apply_lut_if<APPLY_PREBLEND>((rgb >>  8) & 0xFF, tableG);
     U8CPU b = sk_apply_lut_if<APPLY_PREBLEND>((rgb >>  0) & 0xFF, tableB);
+#if SK_SHOW_TEXT_BLIT_COVERAGE
+    r = SkTMax(r, (U8CPU)0x30);
+    g = SkTMax(g, (U8CPU)0x30);
+    b = SkTMax(b, (U8CPU)0x30);
+#endif
     return SkPack888ToRGB16(r, g, b);
 }
 template<bool APPLY_PREBLEND>
@@ -1157,53 +1235,23 @@ static void rgb_to_lcd16(const CGRGBPixel* SK_RESTRICT cgPixels, size_t cgRowByt
     }
 }
 
-template<bool APPLY_PREBLEND>
-static inline uint32_t rgb_to_lcd32(CGRGBPixel rgb, const uint8_t* tableR,
-                                                    const uint8_t* tableG,
-                                                    const uint8_t* tableB) {
-    U8CPU r = sk_apply_lut_if<APPLY_PREBLEND>((rgb >> 16) & 0xFF, tableR);
-    U8CPU g = sk_apply_lut_if<APPLY_PREBLEND>((rgb >>  8) & 0xFF, tableG);
-    U8CPU b = sk_apply_lut_if<APPLY_PREBLEND>((rgb >>  0) & 0xFF, tableB);
-    return SkPackARGB32(0xFF, r, g, b);
-}
-template<bool APPLY_PREBLEND>
-static void rgb_to_lcd32(const CGRGBPixel* SK_RESTRICT cgPixels, size_t cgRowBytes, const SkGlyph& glyph,
-                         const uint8_t* tableR, const uint8_t* tableG, const uint8_t* tableB) {
-    const int width = glyph.fWidth;
-    size_t dstRB = glyph.rowBytes();
-    uint32_t* SK_RESTRICT dst = (uint32_t*)glyph.fImage;
-    for (int y = 0; y < glyph.fHeight; y++) {
-        for (int i = 0; i < width; i++) {
-            dst[i] = rgb_to_lcd32<APPLY_PREBLEND>(cgPixels[i], tableR, tableG, tableB);
-        }
-        cgPixels = (CGRGBPixel*)((char*)cgPixels + cgRowBytes);
-        dst = (uint32_t*)((char*)dst + dstRB);
-    }
-}
-
-#ifdef HACK_COLORGLYPHS
-// hack to colorize the output for testing kARGB32_Format
-static SkPMColor cgpixels_to_pmcolor(CGRGBPixel rgb, const SkGlyph& glyph,
-                                     int x, int y) {
+static SkPMColor cgpixels_to_pmcolor(CGRGBPixel rgb) {
+    U8CPU a = (rgb >> 24) & 0xFF;
     U8CPU r = (rgb >> 16) & 0xFF;
     U8CPU g = (rgb >>  8) & 0xFF;
     U8CPU b = (rgb >>  0) & 0xFF;
-    unsigned a = SkComputeLuminance(r, g, b);
-
-    // compute gradient from x,y
-    r = x * 255 / glyph.fWidth;
-    g = 0;
-    b = (glyph.fHeight - y) * 255 / glyph.fHeight;
-    return SkPreMultiplyARGB(a, r, g, b);    // red
-}
+#if SK_SHOW_TEXT_BLIT_COVERAGE
+    a = SkTMax(a, (U8CPU)0x30);
 #endif
+    return SkPackARGB32(a, r, g, b);
+}
 
 template <typename T> T* SkTAddByteOffset(T* ptr, size_t byteOffset) {
     return (T*)((char*)ptr + byteOffset);
 }
 
 void SkScalerContext_Mac::generateImage(const SkGlyph& glyph) {
-    CGGlyph cgGlyph = (CGGlyph) glyph.getGlyphID(fBaseGlyphCount);
+    CGGlyph cgGlyph = (CGGlyph) glyph.getGlyphID();
 
     // FIXME: lcd smoothed un-hinted rasterization unsupported.
     bool generateA8FromLCD = fRec.getHinting() != SkPaint::kNo_Hinting;
@@ -1211,7 +1259,7 @@ void SkScalerContext_Mac::generateImage(const SkGlyph& glyph) {
     // Draw the glyph
     size_t cgRowBytes;
     CGRGBPixel* cgPixels = fOffscreen.getCG(*this, glyph, cgGlyph, &cgRowBytes, generateA8FromLCD);
-    if (cgPixels == NULL) {
+    if (cgPixels == nullptr) {
         return;
     }
 
@@ -1243,15 +1291,6 @@ void SkScalerContext_Mac::generateImage(const SkGlyph& glyph) {
 
     // Convert glyph to mask
     switch (glyph.fMaskFormat) {
-        case SkMask::kLCD32_Format: {
-            if (fPreBlend.isApplicable()) {
-                rgb_to_lcd32<true>(cgPixels, cgRowBytes, glyph,
-                                   fPreBlend.fR, fPreBlend.fG, fPreBlend.fB);
-            } else {
-                rgb_to_lcd32<false>(cgPixels, cgRowBytes, glyph,
-                                    fPreBlend.fR, fPreBlend.fG, fPreBlend.fB);
-            }
-        } break;
         case SkMask::kLCD16_Format: {
             if (fPreBlend.isApplicable()) {
                 rgb_to_lcd16<true>(cgPixels, cgRowBytes, glyph,
@@ -1278,20 +1317,18 @@ void SkScalerContext_Mac::generateImage(const SkGlyph& glyph) {
                 dst += dstRB;
             }
         } break;
-#ifdef HACK_COLORGLYPHS
         case SkMask::kARGB32_Format: {
             const int width = glyph.fWidth;
             size_t dstRB = glyph.rowBytes();
             SkPMColor* dst = (SkPMColor*)glyph.fImage;
             for (int y = 0; y < glyph.fHeight; y++) {
                 for (int x = 0; x < width; ++x) {
-                    dst[x] = cgpixels_to_pmcolor(cgPixels[x], glyph, x, y);
+                    dst[x] = cgpixels_to_pmcolor(cgPixels[x]);
                 }
                 cgPixels = (CGRGBPixel*)((char*)cgPixels + cgRowBytes);
                 dst = (SkPMColor*)((char*)dst + dstRB);
             }
         } break;
-#endif
         default:
             SkDEBUGFAIL("unexpected mask format");
             break;
@@ -1306,10 +1343,12 @@ void SkScalerContext_Mac::generateImage(const SkGlyph& glyph) {
 #define kScaleForSubPixelPositionHinting (4.0f)
 
 void SkScalerContext_Mac::generatePath(const SkGlyph& glyph, SkPath* path) {
-    CTFontRef font = fCTFont;
+    AUTO_CG_LOCK();
+
     SkScalar scaleX = SK_Scalar1;
     SkScalar scaleY = SK_Scalar1;
 
+    CGAffineTransform xform = fTransform;
     /*
      *  For subpixel positioning, we want to return an unhinted outline, so it
      *  can be positioned nicely at fractional offsets. However, we special-case
@@ -1319,7 +1358,7 @@ void SkScalerContext_Mac::generatePath(const SkGlyph& glyph, SkPath* path) {
      *  The way we remove hinting is to scale the font by some value (4) in that
      *  direction, ask for the path, and then scale the path back down.
      */
-    if (fRec.fFlags & SkScalerContext::kSubpixelPositioning_Flag) {
+    if (fDoSubPosition) {
         SkMatrix m;
         fRec.getSingleMatrix(&m);
 
@@ -1337,16 +1376,15 @@ void SkScalerContext_Mac::generatePath(const SkGlyph& glyph, SkPath* path) {
                 break;
         }
 
-        CGAffineTransform xform = MatrixToCGAffineTransform(m, scaleX, scaleY);
-        // need to release font when we're done
-        font = CTFontCreateCopyWithAttributes(fCTFont, 1, &xform, NULL);
+        CGAffineTransform scale(CGAffineTransformMakeScale(ScalarToCG(scaleX), ScalarToCG(scaleY)));
+        xform = CGAffineTransformConcat(fTransform, scale);
     }
 
-    CGGlyph cgGlyph = (CGGlyph)glyph.getGlyphID(fBaseGlyphCount);
-    AutoCFRelease<CGPathRef> cgPath(CTFontCreatePathForGlyph(font, cgGlyph, NULL));
+    CGGlyph cgGlyph = (CGGlyph)glyph.getGlyphID();
+    AutoCFRelease<CGPathRef> cgPath(CTFontCreatePathForGlyph(fCTFont, cgGlyph, &xform));
 
     path->reset();
-    if (cgPath != NULL) {
+    if (cgPath != nullptr) {
         CGPathApply(cgPath, path, SkScalerContext_Mac::CTPathElement);
     }
 
@@ -1354,8 +1392,6 @@ void SkScalerContext_Mac::generatePath(const SkGlyph& glyph, SkPath* path) {
         SkMatrix m;
         m.setScale(SkScalarInvert(scaleX), SkScalarInvert(scaleY));
         path->transform(m);
-        // balance the call to CTFontCreateCopyWithAttributes
-        CFSafeRelease(font);
     }
     if (fVertical) {
         SkPoint offset;
@@ -1365,10 +1401,12 @@ void SkScalerContext_Mac::generatePath(const SkGlyph& glyph, SkPath* path) {
 }
 
 void SkScalerContext_Mac::generateFontMetrics(SkPaint::FontMetrics* metrics) {
-    if (NULL == metrics) {
+    if (nullptr == metrics) {
         return;
     }
 
+    AUTO_CG_LOCK();
+
     CGRect theBounds = CTFontGetBoundingBox(fCTFont);
 
     metrics->fTop          = CGToScalar(-CGRectGetMaxY_inline(theBounds));
@@ -1379,7 +1417,9 @@ void SkScalerContext_Mac::generateFontMetrics(SkPaint::FontMetrics* metrics) {
     metrics->fAvgCharWidth = CGToScalar( CGRectGetWidth_inline(theBounds));
     metrics->fXMin         = CGToScalar( CGRectGetMinX_inline(theBounds));
     metrics->fXMax         = CGToScalar( CGRectGetMaxX_inline(theBounds));
+    metrics->fMaxCharWidth = metrics->fXMax - metrics->fXMin;
     metrics->fXHeight      = CGToScalar( CTFontGetXHeight(fCTFont));
+    metrics->fCapHeight    = CGToScalar( CTFontGetCapHeight(fCTFont));
     metrics->fUnderlineThickness = CGToScalar( CTFontGetUnderlineThickness(fCTFont));
     metrics->fUnderlinePosition = -CGToScalar( CTFontGetUnderlinePosition(fCTFont));
 
@@ -1424,15 +1464,15 @@ void SkScalerContext_Mac::CTPathElement(void *info, const CGPathElement *element
 
 ///////////////////////////////////////////////////////////////////////////////
 
-// Returns NULL on failure
+// Returns nullptr on failure
 // Call must still manage its ownership of provider
 static SkTypeface* create_from_dataProvider(CGDataProviderRef provider) {
     AutoCFRelease<CGFontRef> cg(CGFontCreateWithDataProvider(provider));
-    if (NULL == cg) {
-        return NULL;
+    if (nullptr == cg) {
+        return nullptr;
     }
-    CTFontRef ct = CTFontCreateWithGraphicsFont(cg, 0, NULL, NULL);
-    return ct ? NewFromFontRef(ct, NULL, true) : NULL;
+    CTFontRef ct = CTFontCreateWithGraphicsFont(cg, 0, nullptr, nullptr);
+    return ct ? NewFromFontRef(ct, nullptr, nullptr, true) : nullptr;
 }
 
 // Web fonts added to the the CTFont registry do not return their character set.
@@ -1511,7 +1551,7 @@ static bool getWidthAdvance(CTFontRef ctFont, int gId, int16_t* data) {
     return true;
 }
 
-/** Assumes src and dst are not NULL. */
+/** Assumes src and dst are not nullptr. */
 static void CFStringToSkString(CFStringRef src, SkString* dst) {
     // Reserve enough room for the worst-case string,
     // plus 1 byte for the trailing null.
@@ -1524,13 +1564,16 @@ static void CFStringToSkString(CFStringRef src, SkString* dst) {
 }
 
 SkAdvancedTypefaceMetrics* SkTypeface_Mac::onGetAdvancedTypefaceMetrics(
-        SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo,
+        PerGlyphInfo perGlyphInfo,
         const uint32_t* glyphIDs,
         uint32_t glyphIDsCount) const {
 
+    AUTO_CG_LOCK();
+
     CTFontRef originalCTFont = fFontRef.get();
-    AutoCFRelease<CTFontRef> ctFont(CTFontCreateCopyWithAttributes(
-            originalCTFont, CTFontGetUnitsPerEm(originalCTFont), NULL, NULL));
+    AutoCFRelease<CTFontRef> ctFont(ctfont_create_exact_copy(
+            originalCTFont, CTFontGetUnitsPerEm(originalCTFont), nullptr));
+
     SkAdvancedTypefaceMetrics* info = new SkAdvancedTypefaceMetrics;
 
     {
@@ -1543,10 +1586,8 @@ SkAdvancedTypefaceMetrics* SkTypeface_Mac::onGetAdvancedTypefaceMetrics(
     CFIndex glyphCount = CTFontGetGlyphCount(ctFont);
     info->fLastGlyphID = SkToU16(glyphCount - 1);
     info->fEmSize = CTFontGetUnitsPerEm(ctFont);
-    info->fFlags = SkAdvancedTypefaceMetrics::kEmpty_FontFlag;
-    info->fStyle = 0;
 
-    if (perGlyphInfo & SkAdvancedTypefaceMetrics::kToUnicode_PerGlyphInfo) {
+    if (perGlyphInfo & kToUnicode_PerGlyphInfo) {
         populate_glyph_to_unicode(ctFont, glyphCount, &info->fGlyphToUnicode);
     }
 
@@ -1555,13 +1596,6 @@ SkAdvancedTypefaceMetrics* SkTypeface_Mac::onGetAdvancedTypefaceMetrics(
     // sfntly needs to subset the font. CTFontCopyAttribute() does not always
     // succeed in determining this directly.
     if (!this->getTableSize('glyf') || !this->getTableSize('loca')) {
-        info->fType = SkAdvancedTypefaceMetrics::kOther_Font;
-        info->fItalicAngle = 0;
-        info->fAscent = 0;
-        info->fDescent = 0;
-        info->fStemV = 0;
-        info->fCapHeight = 0;
-        info->fBBox = SkIRect::MakeEmpty();
         return info;
     }
 
@@ -1613,7 +1647,7 @@ SkAdvancedTypefaceMetrics* SkTypeface_Mac::onGetAdvancedTypefaceMetrics(
         }
     }
 
-    if (perGlyphInfo & SkAdvancedTypefaceMetrics::kHAdvance_PerGlyphInfo) {
+    if (perGlyphInfo & kHAdvance_PerGlyphInfo) {
         if (info->fStyle & SkAdvancedTypefaceMetrics::kFixedPitch_Style) {
             skia_advanced_typeface_metrics_utils::appendRange(&info->fGlyphWidths, 0);
             info->fGlyphWidths->fAdvance.append(1, &min_width);
@@ -1666,10 +1700,10 @@ static SK_SFNT_ULONG get_font_type_tag(const SkTypeface_Mac* typeface) {
     }
 }
 
-SkStream* SkTypeface_Mac::onOpenStream(int* ttcIndex) const {
+SkStreamAsset* SkTypeface_Mac::onOpenStream(int* ttcIndex) const {
     SK_SFNT_ULONG fontType = get_font_type_tag(this);
     if (0 == fontType) {
-        return NULL;
+        return nullptr;
     }
 
     // get table tags
@@ -1728,21 +1762,131 @@ SkStream* SkTypeface_Mac::onOpenStream(int* ttcIndex) const {
         ++entry;
     }
 
+    *ttcIndex = 0;
     return stream;
 }
 
+struct NonDefaultAxesContext {
+    SkFixed* axisValue;
+    CFArrayRef cgAxes;
+};
+static void set_non_default_axes(CFTypeRef key, CFTypeRef value, void* context) {
+    NonDefaultAxesContext* self = static_cast<NonDefaultAxesContext*>(context);
+
+    if (CFGetTypeID(key) != CFStringGetTypeID() || CFGetTypeID(value) != CFNumberGetTypeID()) {
+        return;
+    }
+
+    // The key is a CFString which is a string from the 'name' table.
+    // Search the cgAxes for an axis with this name, and use its index to store the value.
+    CFIndex keyIndex = -1;
+    CFStringRef keyString = static_cast<CFStringRef>(key);
+    for (CFIndex i = 0; i < CFArrayGetCount(self->cgAxes); ++i) {
+        CFTypeRef cgAxis = CFArrayGetValueAtIndex(self->cgAxes, i);
+        if (CFGetTypeID(cgAxis) != CFDictionaryGetTypeID()) {
+            continue;
+        }
+
+        CFDictionaryRef cgAxisDict = static_cast<CFDictionaryRef>(cgAxis);
+        CFTypeRef cgAxisName = CFDictionaryGetValue(cgAxisDict, kCGFontVariationAxisName);
+        if (!cgAxisName || CFGetTypeID(cgAxisName) != CFStringGetTypeID()) {
+            continue;
+        }
+        CFStringRef cgAxisNameString = static_cast<CFStringRef>(cgAxisName);
+        if (CFStringCompare(keyString, cgAxisNameString, 0) == kCFCompareEqualTo) {
+            keyIndex = i;
+            break;
+        }
+    }
+    if (keyIndex == -1) {
+        return;
+    }
+
+    CFNumberRef valueNumber = static_cast<CFNumberRef>(value);
+    double valueDouble;
+    if (!CFNumberGetValue(valueNumber, kCFNumberDoubleType, &valueDouble) ||
+        valueDouble < SkFixedToDouble(SK_FixedMin) || SkFixedToDouble(SK_FixedMax) < valueDouble)
+    {
+        return;
+    }
+    self->axisValue[keyIndex] = SkDoubleToFixed(valueDouble);
+}
+static bool get_variations(CTFontRef fFontRef, CFIndex* cgAxisCount,
+                           SkAutoSTMalloc<4, SkFixed>* axisValues)
+{
+    // CTFontCopyVariationAxes and CTFontCopyVariation do not work when applied to fonts which
+    // started life with CGFontCreateWithDataProvider (they simply always return nullptr).
+    // As a result, we are limited to CGFontCopyVariationAxes and CGFontCopyVariations.
+    AutoCFRelease<CGFontRef> cgFont(CTFontCopyGraphicsFont(fFontRef, nullptr));
+
+    AutoCFRelease<CFDictionaryRef> cgVariations(CGFontCopyVariations(cgFont));
+    // If a font has no variations CGFontCopyVariations returns nullptr (instead of an empty dict).
+    if (!cgVariations.get()) {
+        return false;
+    }
+
+    AutoCFRelease<CFArrayRef> cgAxes(CGFontCopyVariationAxes(cgFont));
+    *cgAxisCount = CFArrayGetCount(cgAxes);
+    axisValues->reset(*cgAxisCount);
+
+    // Set all of the axes to their default values.
+    // Fail if any default value cannot be determined.
+    for (CFIndex i = 0; i < *cgAxisCount; ++i) {
+        CFTypeRef cgAxis = CFArrayGetValueAtIndex(cgAxes, i);
+        if (CFGetTypeID(cgAxis) != CFDictionaryGetTypeID()) {
+            return false;
+        }
+
+        CFDictionaryRef cgAxisDict = static_cast<CFDictionaryRef>(cgAxis);
+        CFTypeRef axisDefaultValue = CFDictionaryGetValue(cgAxisDict,
+                                                          kCGFontVariationAxisDefaultValue);
+        if (!axisDefaultValue || CFGetTypeID(axisDefaultValue) != CFNumberGetTypeID()) {
+            return false;
+        }
+        CFNumberRef axisDefaultValueNumber = static_cast<CFNumberRef>(axisDefaultValue);
+        double axisDefaultValueDouble;
+        if (!CFNumberGetValue(axisDefaultValueNumber, kCFNumberDoubleType, &axisDefaultValueDouble))
+        {
+            return false;
+        }
+        if (axisDefaultValueDouble < SkFixedToDouble(SK_FixedMin) ||
+                                     SkFixedToDouble(SK_FixedMax) < axisDefaultValueDouble)
+        {
+            return false;
+        }
+        (*axisValues)[(int)i] = SkDoubleToFixed(axisDefaultValueDouble);
+    }
+
+    // Override the default values with the given font's stated axis values.
+    NonDefaultAxesContext c = { axisValues->get(), cgAxes.get() };
+    CFDictionaryApplyFunction(cgVariations, set_non_default_axes, &c);
+
+    return true;
+}
+SkFontData* SkTypeface_Mac::onCreateFontData() const {
+    int index;
+    SkAutoTDelete<SkStreamAsset> stream(this->onOpenStream(&index));
+
+    CFIndex cgAxisCount;
+    SkAutoSTMalloc<4, SkFixed> axisValues;
+    if (get_variations(fFontRef, &cgAxisCount, &axisValues)) {
+        return new SkFontData(stream.detach(), index, axisValues.get(), cgAxisCount);
+    }
+    return new SkFontData(stream.detach(), index, nullptr, 0);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
 int SkTypeface_Mac::onGetUPEM() const {
-    AutoCFRelease<CGFontRef> cgFont(CTFontCopyGraphicsFont(fFontRef, NULL));
+    AutoCFRelease<CGFontRef> cgFont(CTFontCopyGraphicsFont(fFontRef, nullptr));
     return CGFontGetUnitsPerEm(cgFont);
 }
 
 SkTypeface::LocalizedStrings* SkTypeface_Mac::onCreateFamilyNameIterator() const {
     SkTypeface::LocalizedStrings* nameIter =
         SkOTUtils::LocalizedStrings_NameTable::CreateForFamilyNames(*this);
-    if (NULL == nameIter) {
+    if (nullptr == nameIter) {
         AutoCFRelease<CFStringRef> cfLanguage;
         AutoCFRelease<CFStringRef> cfFamilyName(
             CTFontCopyLocalizedName(fFontRef, kCTFontFamilyNameKey, &cfLanguage));
@@ -1769,8 +1913,8 @@ SkTypeface::LocalizedStrings* SkTypeface_Mac::onCreateFamilyNameIterator() const
 static CFDataRef copyTableFromFont(CTFontRef ctFont, SkFontTableTag tag) {
     CFDataRef data = CTFontCopyTable(ctFont, (CTFontTableTag) tag,
                                      kCTFontTableOptionNoOptions);
-    if (NULL == data) {
-        AutoCFRelease<CGFontRef> cgFont(CTFontCopyGraphicsFont(ctFont, NULL));
+    if (nullptr == data) {
+        AutoCFRelease<CGFontRef> cgFont(CTFontCopyGraphicsFont(ctFont, nullptr));
         data = CGFontCopyTableForTag(cgFont, tag);
     }
     return data;
@@ -1779,7 +1923,7 @@ static CFDataRef copyTableFromFont(CTFontRef ctFont, SkFontTableTag tag) {
 int SkTypeface_Mac::onGetTableTags(SkFontTableTag tags[]) const {
     AutoCFRelease<CFArrayRef> cfArray(CTFontCopyAvailableTables(fFontRef,
                                                 kCTFontTableOptionNoOptions));
-    if (NULL == cfArray) {
+    if (nullptr == cfArray) {
         return 0;
     }
     int count = SkToInt(CFArrayGetCount(cfArray));
@@ -1795,7 +1939,7 @@ int SkTypeface_Mac::onGetTableTags(SkFontTableTag tags[]) const {
 size_t SkTypeface_Mac::onGetTableData(SkFontTableTag tag, size_t offset,
                                       size_t length, void* dstData) const {
     AutoCFRelease<CFDataRef> srcData(copyTableFromFont(fFontRef, tag));
-    if (NULL == srcData) {
+    if (nullptr == srcData) {
         return 0;
     }
 
@@ -1878,6 +2022,13 @@ void SkTypeface_Mac::onFilterRec(SkScalerContextRec* rec) const {
         }
     }
 
+    // CoreText provides no information as to whether a glyph will be color or not.
+    // Fonts may mix outlines and bitmaps, so information is needed on a glyph by glyph basis.
+    // If a font contains an 'sbix' table, consider it to be a color font, and disable lcd.
+    if (fHasColorGlyphs) {
+        rec->fMaskFormat = SkMask::kARGB32_Format;
+    }
+
     // Unhinted A8 masks (those not derived from LCD masks) must respect SK_GAMMA_APPLY_TO_A8.
     // All other masks can use regular gamma.
     if (SkMask::kA8_Format == rec->fMaskFormat && SkPaint::kNo_Hinting == hinting) {
@@ -1892,14 +2043,18 @@ void SkTypeface_Mac::onFilterRec(SkScalerContextRec* rec) const {
 
 // we take ownership of the ref
 static const char* get_str(CFStringRef ref, SkString* str) {
-    if (NULL == ref) {
-        return NULL;
+    if (nullptr == ref) {
+        return nullptr;
     }
     CFStringToSkString(ref, str);
     CFSafeRelease(ref);
     return str->c_str();
 }
 
+void SkTypeface_Mac::onGetFamilyName(SkString* familyName) const {
+    get_str(CTFontCopyFamilyName(fFontRef), familyName);
+}
+
 void SkTypeface_Mac::onGetFontDescriptor(SkFontDescriptor* desc,
                                          bool* isLocalStream) const {
     SkString tmpStr;
@@ -1955,31 +2110,31 @@ int SkTypeface_Mac::onCharsToGlyphs(const void* chars, Encoding encoding,
         }
     }
 
-    // If glyphs is NULL, CT still needs glyph storage for finding the first failure.
+    // If glyphs is nullptr, CT still needs glyph storage for finding the first failure.
     // Also, if there are any non-bmp code points, the provided 'glyphs' storage will be inadequate.
     SkAutoSTMalloc<1024, uint16_t> glyphStorage;
     uint16_t* macGlyphs = glyphs;
-    if (NULL == macGlyphs || srcCount > glyphCount) {
+    if (nullptr == macGlyphs || srcCount > glyphCount) {
         macGlyphs = glyphStorage.reset(srcCount);
     }
 
     bool allEncoded = CTFontGetGlyphsForCharacters(fFontRef, src, macGlyphs, srcCount);
 
     // If there were any non-bmp, then copy and compact.
-    // If 'glyphs' is NULL, then compact glyphStorage in-place.
-    // If all are bmp and 'glyphs' is non-NULL, 'glyphs' already contains the compact glyphs.
-    // If some are non-bmp and 'glyphs' is non-NULL, copy and compact into 'glyphs'.
+    // If 'glyphs' is nullptr, then compact glyphStorage in-place.
+    // If all are bmp and 'glyphs' is non-nullptr, 'glyphs' already contains the compact glyphs.
+    // If some are non-bmp and 'glyphs' is non-nullptr, copy and compact into 'glyphs'.
     uint16_t* compactedGlyphs = glyphs;
-    if (NULL == compactedGlyphs) {
+    if (nullptr == compactedGlyphs) {
         compactedGlyphs = macGlyphs;
     }
     if (srcCount > glyphCount) {
         int extra = 0;
         for (int i = 0; i < glyphCount; ++i) {
+            compactedGlyphs[i] = macGlyphs[i + extra];
             if (SkUTF16_IsHighSurrogate(src[i + extra])) {
                 ++extra;
             }
-            compactedGlyphs[i] = macGlyphs[i + extra];
         }
     }
 
@@ -2003,46 +2158,18 @@ int SkTypeface_Mac::onCountGlyphs() const {
 
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
-#if 1
 
 static bool find_desc_str(CTFontDescriptorRef desc, CFStringRef name, SkString* value) {
     AutoCFRelease<CFStringRef> ref((CFStringRef)CTFontDescriptorCopyAttribute(desc, name));
-    if (NULL == ref.get()) {
+    if (nullptr == ref.get()) {
         return false;
     }
     CFStringToSkString(ref, value);
     return true;
 }
 
-static bool find_dict_float(CFDictionaryRef dict, CFStringRef name, float* value) {
-    CFNumberRef num;
-    return CFDictionaryGetValueIfPresent(dict, name, (const void**)&num)
-    && CFNumberIsFloatType(num)
-    && CFNumberGetValue(num, kCFNumberFloatType, value);
-}
-
 #include "SkFontMgr.h"
 
-static int unit_weight_to_fontstyle(float unit) {
-    float value;
-    if (unit < 0) {
-        value = 100 + (1 + unit) * 300;
-    } else {
-        value = 400 + unit * 500;
-    }
-    return sk_float_round2int(value);
-}
-
-static int unit_width_to_fontstyle(float unit) {
-    float value;
-    if (unit < 0) {
-        value = 1 + (1 + unit) * 4;
-    } else {
-        value = 5 + unit * 4;
-    }
-    return sk_float_round2int(value);
-}
-
 static inline int sqr(int value) {
     SkASSERT(SkAbs32(value) < 0x7FFF);  // check for overflow
     return value * value;
@@ -2055,91 +2182,41 @@ static int compute_metric(const SkFontStyle& a, const SkFontStyle& b) {
            sqr((a.isItalic() != b.isItalic()) * 900);
 }
 
-static SkFontStyle desc2fontstyle(CTFontDescriptorRef desc) {
-    AutoCFRelease<CFDictionaryRef> dict(
-        (CFDictionaryRef)CTFontDescriptorCopyAttribute(desc,
-                                                       kCTFontTraitsAttribute));
-    if (NULL == dict.get()) {
-        return SkFontStyle();
-    }
+static SkTypeface* createFromDesc(CFStringRef cfFamilyName, CTFontDescriptorRef desc) {
+    NameStyle cacheRequest;
+    SkString skFamilyName;
+    CFStringToSkString(cfFamilyName, &skFamilyName);
+    cacheRequest.fName = skFamilyName.c_str();
+    cacheRequest.fStyle = fontstyle_from_descriptor(desc);
 
-    float weight, width, slant;
-    if (!find_dict_float(dict, kCTFontWeightTrait, &weight)) {
-        weight = 0;
-    }
-    if (!find_dict_float(dict, kCTFontWidthTrait, &width)) {
-        width = 0;
-    }
-    if (!find_dict_float(dict, kCTFontSlantTrait, &slant)) {
-        slant = 0;
-    }
-
-    return SkFontStyle(unit_weight_to_fontstyle(weight),
-                       unit_width_to_fontstyle(width),
-                       slant ? SkFontStyle::kItalic_Slant
-                       : SkFontStyle::kUpright_Slant);
-}
-
-struct NameFontStyleRec {
-    SkString    fFamilyName;
-    SkFontStyle fFontStyle;
-};
-
-static bool nameFontStyleProc(SkTypeface* face, SkTypeface::Style,
-                              void* ctx) {
-    SkTypeface_Mac* macFace = (SkTypeface_Mac*)face;
-    const NameFontStyleRec* rec = (const NameFontStyleRec*)ctx;
-
-    return macFace->fFontStyle == rec->fFontStyle &&
-           macFace->fName == rec->fFamilyName;
-}
-
-static SkTypeface* createFromDesc(CFStringRef cfFamilyName,
-                                  CTFontDescriptorRef desc) {
-    NameFontStyleRec rec;
-    CFStringToSkString(cfFamilyName, &rec.fFamilyName);
-    rec.fFontStyle = desc2fontstyle(desc);
-
-    SkTypeface* face = SkTypefaceCache::FindByProcAndRef(nameFontStyleProc,
-                                                         &rec);
+    SkTypeface* face = SkTypefaceCache::FindByProcAndRef(find_by_NameStyle, &cacheRequest);
     if (face) {
         return face;
     }
 
-    AutoCFRelease<CFDictionaryRef> fontFamilyNameDictionary(
-        CFDictionaryCreate(kCFAllocatorDefault,
-                           (const void**)&kCTFontFamilyNameAttribute, (const void**)&cfFamilyName,
-                           1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
-    AutoCFRelease<CTFontDescriptorRef> fontDescriptor(
-        CTFontDescriptorCreateWithAttributes(fontFamilyNameDictionary));
-    AutoCFRelease<CTFontRef> ctNamed(CTFontCreateWithFontDescriptor(fontDescriptor, 0, NULL));
-    CTFontRef ctFont = CTFontCreateCopyWithAttributes(ctNamed, 1, NULL, desc);
-    if (NULL == ctFont) {
-        return NULL;
+    AutoCFRelease<CTFontRef> ctFont(CTFontCreateWithFontDescriptor(desc, 0, nullptr));
+    if (!ctFont) {
+        return nullptr;
     }
 
-    SkString str;
-    CFStringToSkString(cfFamilyName, &str);
-
     bool isFixedPitch;
     (void)computeStyleBits(ctFont, &isFixedPitch);
-    SkFontID fontID = CTFontRef_to_SkFontID(ctFont);
 
-    face = SkNEW_ARGS(SkTypeface_Mac, (rec.fFontStyle, fontID, isFixedPitch,
-                                       ctFont, str.c_str(), false));
-    SkTypefaceCache::Add(face, face->style());
+    face = new SkTypeface_Mac(ctFont.detach(), nullptr, cacheRequest.fStyle, isFixedPitch,
+                              skFamilyName.c_str(), false);
+    SkTypefaceCache::Add(face, face->fontStyle());
     return face;
 }
 
 class SkFontStyleSet_Mac : public SkFontStyleSet {
 public:
     SkFontStyleSet_Mac(CFStringRef familyName, CTFontDescriptorRef desc)
-        : fArray(CTFontDescriptorCreateMatchingFontDescriptors(desc, NULL))
+        : fArray(CTFontDescriptorCreateMatchingFontDescriptors(desc, nullptr))
         , fFamilyName(familyName)
         , fCount(0) {
         CFRetain(familyName);
-        if (NULL == fArray) {
-            fArray = CFArrayCreate(NULL, NULL, 0, NULL);
+        if (nullptr == fArray) {
+            fArray = CFArrayCreate(nullptr, nullptr, 0, nullptr);
         }
         fCount = SkToInt(CFArrayGetCount(fArray));
     }
@@ -2149,16 +2226,15 @@ public:
         CFRelease(fFamilyName);
     }
 
-    virtual int count() SK_OVERRIDE {
+    int count() override {
         return fCount;
     }
 
-    virtual void getStyle(int index, SkFontStyle* style,
-                          SkString* name) SK_OVERRIDE {
+    void getStyle(int index, SkFontStyle* style, SkString* name) override {
         SkASSERT((unsigned)index < (unsigned)fCount);
         CTFontDescriptorRef desc = (CTFontDescriptorRef)CFArrayGetValueAtIndex(fArray, index);
         if (style) {
-            *style = desc2fontstyle(desc);
+            *style = fontstyle_from_descriptor(desc);
         }
         if (name) {
             if (!find_desc_str(desc, kCTFontStyleNameAttribute, name)) {
@@ -2167,16 +2243,16 @@ public:
         }
     }
 
-    virtual SkTypeface* createTypeface(int index) SK_OVERRIDE {
+    SkTypeface* createTypeface(int index) override {
         SkASSERT((unsigned)index < (unsigned)CFArrayGetCount(fArray));
         CTFontDescriptorRef desc = (CTFontDescriptorRef)CFArrayGetValueAtIndex(fArray, index);
 
         return createFromDesc(fFamilyName, desc);
     }
 
-    virtual SkTypeface* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE {
+    SkTypeface* matchStyle(const SkFontStyle& pattern) override {
         if (0 == fCount) {
-            return NULL;
+            return nullptr;
         }
         return createFromDesc(fFamilyName, findMatchingDesc(pattern));
     }
@@ -2188,11 +2264,11 @@ private:
 
     CTFontDescriptorRef findMatchingDesc(const SkFontStyle& pattern) const {
         int bestMetric = SK_MaxS32;
-        CTFontDescriptorRef bestDesc = NULL;
+        CTFontDescriptorRef bestDesc = nullptr;
 
         for (int i = 0; i < fCount; ++i) {
             CTFontDescriptorRef desc = (CTFontDescriptorRef)CFArrayGetValueAtIndex(fArray, i);
-            int metric = compute_metric(pattern, desc2fontstyle(desc));
+            int metric = compute_metric(pattern, fontstyle_from_descriptor(desc));
             if (0 == metric) {
                 return desc;
             }
@@ -2225,7 +2301,7 @@ class SkFontMgr_Mac : public SkFontMgr {
 
         AutoCFRelease<CTFontDescriptorRef> desc(
                                 CTFontDescriptorCreateWithAttributes(cfAttr));
-        return SkNEW_ARGS(SkFontStyleSet_Mac, (cfFamilyName, desc));
+        return new SkFontStyleSet_Mac(cfFamilyName, desc);
     }
 
 public:
@@ -2238,11 +2314,11 @@ public:
     }
 
 protected:
-    virtual int onCountFamilies() const SK_OVERRIDE {
+    int onCountFamilies() const override {
         return fCount;
     }
 
-    virtual void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE {
+    void onGetFamilyName(int index, SkString* familyName) const override {
         if ((unsigned)index < (unsigned)fCount) {
             CFStringToSkString(this->stringAt(index), familyName);
         } else {
@@ -2250,85 +2326,171 @@ protected:
         }
     }
 
-    virtual SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE {
+    SkFontStyleSet* onCreateStyleSet(int index) const override {
         if ((unsigned)index >= (unsigned)fCount) {
-            return NULL;
+            return nullptr;
         }
         return CreateSet(this->stringAt(index));
     }
 
-    virtual SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE {
+    SkFontStyleSet* onMatchFamily(const char familyName[]) const override {
         AutoCFRelease<CFStringRef> cfName(make_CFString(familyName));
         return CreateSet(cfName);
     }
 
     virtual SkTypeface* onMatchFamilyStyle(const char familyName[],
-                                           const SkFontStyle&) const SK_OVERRIDE {
-        return NULL;
+                                           const SkFontStyle&) const override {
+        return nullptr;
+    }
+
+    virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[], const SkFontStyle&,
+                                                    const char* bcp47[], int bcp47Count,
+                                                    SkUnichar character) const override {
+        return nullptr;
     }
 
     virtual SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember,
-                                         const SkFontStyle&) const SK_OVERRIDE {
-        return NULL;
+                                         const SkFontStyle&) const override {
+        return nullptr;
     }
 
-    virtual SkTypeface* onCreateFromData(SkData* data,
-                                         int ttcIndex) const SK_OVERRIDE {
+    SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const override {
         AutoCFRelease<CGDataProviderRef> pr(SkCreateDataProviderFromData(data));
-        if (NULL == pr) {
-            return NULL;
+        if (nullptr == pr) {
+            return nullptr;
         }
         return create_from_dataProvider(pr);
     }
 
-    virtual SkTypeface* onCreateFromStream(SkStream* stream,
-                                           int ttcIndex) const SK_OVERRIDE {
+    SkTypeface* onCreateFromStream(SkStreamAsset* stream, int ttcIndex) const override {
         AutoCFRelease<CGDataProviderRef> pr(SkCreateDataProviderFromStream(stream));
-        if (NULL == pr) {
-            return NULL;
+        if (nullptr == pr) {
+            return nullptr;
         }
         return create_from_dataProvider(pr);
     }
 
-    virtual SkTypeface* onCreateFromFile(const char path[],
-                                         int ttcIndex) const SK_OVERRIDE {
+    static CFDictionaryRef get_axes(CGFontRef cg, SkFontData* fontData) {
+        AutoCFRelease<CFArrayRef> cgAxes(CGFontCopyVariationAxes(cg));
+        if (!cgAxes) {
+            return nullptr;
+        }
+
+        CFIndex axisCount = CFArrayGetCount(cgAxes);
+        if (0 == axisCount || axisCount != fontData->getAxisCount()) {
+            return nullptr;
+        }
+
+        CFMutableDictionaryRef dict = CFDictionaryCreateMutable(kCFAllocatorDefault, axisCount,
+                                                                &kCFTypeDictionaryKeyCallBacks,
+                                                                &kCFTypeDictionaryValueCallBacks);
+        for (int i = 0; i < fontData->getAxisCount(); ++i) {
+            CFTypeRef axisInfo = CFArrayGetValueAtIndex(cgAxes, i);
+            if (CFDictionaryGetTypeID() != CFGetTypeID(axisInfo)) {
+                return nullptr;
+            }
+            CFDictionaryRef axisInfoDict = static_cast<CFDictionaryRef>(axisInfo);
+
+            CFTypeRef axisName = CFDictionaryGetValue(axisInfoDict, kCGFontVariationAxisName);
+            if (!axisName || CFGetTypeID(axisName) != CFStringGetTypeID()) {
+                return nullptr;
+            }
+
+            // The variation axes can be set to any value, but cg will effectively pin them.
+            // Pin them here to normalize.
+            CFTypeRef min = CFDictionaryGetValue(axisInfoDict, kCGFontVariationAxisMinValue);
+            CFTypeRef max = CFDictionaryGetValue(axisInfoDict, kCGFontVariationAxisMaxValue);
+            if (!min || CFGetTypeID(min) != CFNumberGetTypeID() ||
+                !max || CFGetTypeID(max) != CFNumberGetTypeID())
+            {
+                return nullptr;
+            }
+            CFNumberRef minNumber = static_cast<CFNumberRef>(min);
+            CFNumberRef maxNumber = static_cast<CFNumberRef>(max);
+            double minDouble;
+            double maxDouble;
+            if (!CFNumberGetValue(minNumber, kCFNumberDoubleType, &minDouble) ||
+                !CFNumberGetValue(maxNumber, kCFNumberDoubleType, &maxDouble))
+            {
+                return nullptr;
+            }
+            double value = SkTPin(SkFixedToDouble(fontData->getAxis()[i]), minDouble, maxDouble);
+            CFNumberRef valueNumber = CFNumberCreate(kCFAllocatorDefault, kCFNumberDoubleType,
+                                                     &value);
+
+            CFDictionaryAddValue(dict, axisName, valueNumber);
+            CFRelease(valueNumber);
+        }
+        return dict;
+    }
+    SkTypeface* onCreateFromFontData(SkFontData* data) const override {
+        SkAutoTDelete<SkFontData> fontData(data);
+        SkStreamAsset* stream = fontData->detachStream();
+        AutoCFRelease<CGDataProviderRef> provider(SkCreateDataProviderFromStream(stream));
+        if (nullptr == provider) {
+            return nullptr;
+        }
+        AutoCFRelease<CGFontRef> cg(CGFontCreateWithDataProvider(provider));
+        if (nullptr == cg) {
+            return nullptr;
+        }
+
+        AutoCFRelease<CFDictionaryRef> cgVariations(get_axes(cg, fontData));
+        // The CGFontRef returned by CGFontCreateCopyWithVariations when the passed CGFontRef was
+        // created from a data provider does not appear to have any ownership of the underlying
+        // data. The original CGFontRef must be kept alive until the copy will no longer be used.
+        AutoCFRelease<CGFontRef> cgVariant;
+        if (cgVariations) {
+            cgVariant.reset(CGFontCreateCopyWithVariations(cg, cgVariations));
+        } else {
+            cgVariant.reset(cg.detach());
+        }
+
+        CTFontRef ct = CTFontCreateWithGraphicsFont(cgVariant, 0, nullptr, nullptr);
+        if (!ct) {
+            return nullptr;
+        }
+        return NewFromFontRef(ct, cg.detach(), nullptr, true);
+    }
+
+    SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const override {
         AutoCFRelease<CGDataProviderRef> pr(CGDataProviderCreateWithFilename(path));
-        if (NULL == pr) {
-            return NULL;
+        if (nullptr == pr) {
+            return nullptr;
         }
         return create_from_dataProvider(pr);
     }
 
     virtual SkTypeface* onLegacyCreateTypeface(const char familyName[],
-                                               unsigned styleBits) const SK_OVERRIDE {
-        return create_typeface(NULL, familyName, (SkTypeface::Style)styleBits);
+                                               unsigned styleBits) const override {
+
+        SkFontStyle style = SkFontStyle((SkTypeface::Style)styleBits);
+        if (familyName) {
+            familyName = map_css_names(familyName);
+        }
+
+        if (!familyName || !*familyName) {
+            familyName = FONT_DEFAULT_NAME;
+        }
+
+        NameStyle cacheRequest = { familyName, style };
+        SkTypeface* face = SkTypefaceCache::FindByProcAndRef(find_by_NameStyle, &cacheRequest);
+
+        if (nullptr == face) {
+            face = NewFromName(familyName, style);
+            if (face) {
+                SkTypefaceCache::Add(face, style);
+            } else {
+                face = GetDefaultFace();
+                face->ref();
+            }
+        }
+        return face;
     }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkFontMgr* SkFontMgr::Factory() {
-    return SkNEW(SkFontMgr_Mac);
-}
-#endif
-
-SkTypeface* SkFontHost::CreateTypeface(const SkTypeface* familyFace,
-                                       const char famillyName[],
-                                       SkTypeface::Style style)
-{
-    SkDEBUGFAIL("SkFontHost::FindTypeface unimplemented");
-    return NULL;
-}
-
-SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream*)
-{
-    SkDEBUGFAIL("SkFontHost::CreateTypeface unimplemented");
-    return NULL;
-}
-
-SkTypeface* SkFontHost::CreateTypefaceFromFile(char const*)
-{
-    SkDEBUGFAIL("SkFontHost::CreateTypefaceFromFile unimplemented");
-    return NULL;
-}
+SkFontMgr* SkFontMgr::Factory() { return new SkFontMgr_Mac; }
 
+#endif//defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
diff --git a/gfx/skia/skia/src/ports/SkFontHost_win.cpp b/gfx/skia/skia/src/ports/SkFontHost_win.cpp
old mode 100755
new mode 100644
index e4aab81b150a..2e03a44578a8
--- a/gfx/skia/skia/src/ports/SkFontHost_win.cpp
+++ b/gfx/skia/skia/src/ports/SkFontHost_win.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,13 +5,15 @@
  * found in the LICENSE file.
  */
 
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_WIN32)
+
 #include "SkAdvancedTypefaceMetrics.h"
 #include "SkBase64.h"
 #include "SkColorPriv.h"
 #include "SkData.h"
 #include "SkDescriptor.h"
 #include "SkFontDescriptor.h"
-#include "SkFontHost.h"
 #include "SkGlyph.h"
 #include "SkHRESULT.h"
 #include "SkMaskGamma.h"
@@ -25,7 +26,6 @@
 #include "SkStream.h"
 #include "SkString.h"
 #include "SkTemplates.h"
-#include "SkThread.h"
 #include "SkTypeface_win.h"
 #include "SkTypefaceCache.h"
 #include "SkUtils.h"
@@ -58,8 +58,7 @@ typedef uint32_t SkGdiRGB;
 //#define SK_ENFORCE_ROTATED_TEXT_AA_ON_WINDOWS
 
 static bool isLCD(const SkScalerContext::Rec& rec) {
-    return SkMask::kLCD16_Format == rec.fMaskFormat ||
-           SkMask::kLCD32_Format == rec.fMaskFormat;
+    return SkMask::kLCD16_Format == rec.fMaskFormat;
 }
 
 static bool bothZero(SkScalar a, SkScalar b) {
@@ -91,9 +90,9 @@ using namespace skia_advanced_typeface_metrics_utils;
 
 static void tchar_to_skstring(const TCHAR t[], SkString* s) {
 #ifdef UNICODE
-    size_t sSize = WideCharToMultiByte(CP_UTF8, 0, t, -1, NULL, 0, NULL, NULL);
+    size_t sSize = WideCharToMultiByte(CP_UTF8, 0, t, -1, nullptr, 0, nullptr, nullptr);
     s->resize(sSize);
-    WideCharToMultiByte(CP_UTF8, 0, t, -1, s->writable_str(), sSize, NULL, NULL);
+    WideCharToMultiByte(CP_UTF8, 0, t, -1, s->writable_str(), sSize, nullptr, nullptr);
 #else
     s->set(t);
 #endif
@@ -101,9 +100,9 @@ static void tchar_to_skstring(const TCHAR t[], SkString* s) {
 
 static void dcfontname_to_skstring(HDC deviceContext, const LOGFONT& lf, SkString* familyName) {
     int fontNameLen; //length of fontName in TCHARS.
-    if (0 == (fontNameLen = GetTextFace(deviceContext, 0, NULL))) {
+    if (0 == (fontNameLen = GetTextFace(deviceContext, 0, nullptr))) {
         call_ensure_accessible(lf);
-        if (0 == (fontNameLen = GetTextFace(deviceContext, 0, NULL))) {
+        if (0 == (fontNameLen = GetTextFace(deviceContext, 0, nullptr))) {
             fontNameLen = 0;
         }
     }
@@ -126,20 +125,10 @@ static void make_canonical(LOGFONT* lf) {
 //    lf->lfClipPrecision = 64;
 }
 
-static SkTypeface::Style get_style(const LOGFONT& lf) {
-    unsigned style = 0;
-    if (lf.lfWeight >= FW_BOLD) {
-        style |= SkTypeface::kBold;
-    }
-    if (lf.lfItalic) {
-        style |= SkTypeface::kItalic;
-    }
-    return static_cast<SkTypeface::Style>(style);
-}
-
-static void setStyle(LOGFONT* lf, SkTypeface::Style style) {
-    lf->lfWeight = (style & SkTypeface::kBold) != 0 ? FW_BOLD : FW_NORMAL ;
-    lf->lfItalic = ((style & SkTypeface::kItalic) != 0);
+static SkFontStyle get_style(const LOGFONT& lf) {
+    return SkFontStyle(lf.lfWeight,
+                       lf.lfWidth,
+                       lf.lfItalic ? SkFontStyle::kItalic_Slant : SkFontStyle::kUpright_Slant);
 }
 
 static inline FIXED SkFixedToFIXED(SkFixed x) {
@@ -183,7 +172,7 @@ static unsigned calculateGlyphCount(HDC hdc, const LOGFONT& lf) {
     while (min < max) {
         int32_t mid = min + ((max - min) / 2);
         if (GetGlyphOutlineW(hdc, mid, GGO_METRICS | GGO_GLYPH_INDEX, &gm, 0,
-                             NULL, &mat2) == GDI_ERROR) {
+                             nullptr, &mat2) == GDI_ERROR) {
             max = mid;
         } else {
             min = mid + 1;
@@ -217,13 +206,16 @@ static unsigned calculateUPEM(HDC hdc, const LOGFONT& lf) {
 
 class LogFontTypeface : public SkTypeface {
 public:
-    LogFontTypeface(SkTypeface::Style style, SkFontID fontID, const LOGFONT& lf, bool serializeAsStream = false) :
-        SkTypeface(style, fontID, false), fLogFont(lf), fSerializeAsStream(serializeAsStream) {
+    LogFontTypeface(const SkFontStyle& style, const LOGFONT& lf, bool serializeAsStream)
+        : SkTypeface(style, SkTypefaceCache::NewFontID(), false)
+        , fLogFont(lf)
+        , fSerializeAsStream(serializeAsStream)
+    {
 
         // If the font has cubic outlines, it will not be rendered with ClearType.
         HFONT font = CreateFontIndirect(&lf);
 
-        HDC deviceContext = ::CreateCompatibleDC(NULL);
+        HDC deviceContext = ::CreateCompatibleDC(nullptr);
         HFONT savefont = (HFONT)SelectObject(deviceContext, font);
 
         TEXTMETRIC textMetric;
@@ -255,9 +247,7 @@ public:
     bool fCanBeLCD;
 
     static LogFontTypeface* Create(const LOGFONT& lf) {
-        SkTypeface::Style style = get_style(lf);
-        SkFontID fontID = SkTypefaceCache::NewFontID();
-        return new LogFontTypeface(style, fontID, lf);
+        return new LogFontTypeface(get_style(lf), lf, false);
     }
 
     static void EnsureAccessible(const SkTypeface* face) {
@@ -265,21 +255,21 @@ public:
     }
 
 protected:
-    virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE;
-    virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE;
-    virtual void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE;
-    virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
-                                SkAdvancedTypefaceMetrics::PerGlyphInfo,
-                                const uint32_t*, uint32_t) const SK_OVERRIDE;
-    virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE;
+    SkStreamAsset* onOpenStream(int* ttcIndex) const override;
+    SkScalerContext* onCreateScalerContext(const SkDescriptor*) const override;
+    void onFilterRec(SkScalerContextRec*) const override;
+    SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
+                                PerGlyphInfo, const uint32_t*, uint32_t) const override;
+    void onGetFontDescriptor(SkFontDescriptor*, bool*) const override;
     virtual int onCharsToGlyphs(const void* chars, Encoding encoding,
-                                uint16_t glyphs[], int glyphCount) const SK_OVERRIDE;
-    virtual int onCountGlyphs() const SK_OVERRIDE;
-    virtual int onGetUPEM() const SK_OVERRIDE;
-    virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE;
-    virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE;
+                                uint16_t glyphs[], int glyphCount) const override;
+    int onCountGlyphs() const override;
+    int onGetUPEM() const override;
+    void onGetFamilyName(SkString* familyName) const override;
+    SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override;
+    int onGetTableTags(SkFontTableTag tags[]) const override;
     virtual size_t onGetTableData(SkFontTableTag, size_t offset,
-                                  size_t length, void* data) const SK_OVERRIDE;
+                                  size_t length, void* data) const override;
 };
 
 class FontMemResourceTypeface : public LogFontTypeface {
@@ -288,13 +278,11 @@ public:
      *  The created FontMemResourceTypeface takes ownership of fontMemResource.
      */
     static FontMemResourceTypeface* Create(const LOGFONT& lf, HANDLE fontMemResource) {
-        SkTypeface::Style style = get_style(lf);
-        SkFontID fontID = SkTypefaceCache::NewFontID();
-        return new FontMemResourceTypeface(style, fontID, lf, fontMemResource);
+        return new FontMemResourceTypeface(get_style(lf), lf, fontMemResource);
     }
 
 protected:
-    virtual void weak_dispose() const SK_OVERRIDE {
+    void weak_dispose() const override {
         RemoveFontMemResourceEx(fFontMemResource);
         //SkTypefaceCache::Remove(this);
         INHERITED::weak_dispose();
@@ -304,9 +292,9 @@ private:
     /**
      *  Takes ownership of fontMemResource.
      */
-    FontMemResourceTypeface(SkTypeface::Style style, SkFontID fontID, const LOGFONT& lf, HANDLE fontMemResource) :
-        LogFontTypeface(style, fontID, lf, true), fFontMemResource(fontMemResource) {
-    }
+    FontMemResourceTypeface(const SkFontStyle& style, const LOGFONT& lf, HANDLE fontMemResource)
+        : LogFontTypeface(style, lf, true), fFontMemResource(fontMemResource)
+    { }
 
     HANDLE fFontMemResource;
 
@@ -318,7 +306,7 @@ static const LOGFONT& get_default_font() {
     return gDefaultFont;
 }
 
-static bool FindByLogFont(SkTypeface* face, SkTypeface::Style requestedStyle, void* ctx) {
+static bool FindByLogFont(SkTypeface* face, const SkFontStyle& requestedStyle, void* ctx) {
     LogFontTypeface* lface = static_cast<LogFontTypeface*>(face);
     const LOGFONT* lf = reinterpret_cast<const LOGFONT*>(ctx);
 
@@ -335,7 +323,7 @@ SkTypeface* SkCreateTypefaceFromLOGFONT(const LOGFONT& origLF) {
     LOGFONT lf = origLF;
     make_canonical(&lf);
     SkTypeface* face = SkTypefaceCache::FindByProcAndRef(FindByLogFont, &lf);
-    if (NULL == face) {
+    if (nullptr == face) {
         face = LogFontTypeface::Create(lf);
         SkTypefaceCache::Add(face, get_style(lf));
     }
@@ -348,16 +336,15 @@ SkTypeface* SkCreateTypefaceFromLOGFONT(const LOGFONT& origLF) {
 SkTypeface* SkCreateFontMemResourceTypefaceFromLOGFONT(const LOGFONT& origLF, HANDLE fontMemResource) {
     LOGFONT lf = origLF;
     make_canonical(&lf);
-    FontMemResourceTypeface* face = FontMemResourceTypeface::Create(lf, fontMemResource);
-    SkTypefaceCache::Add(face, get_style(lf), false);
-    return face;
+    // We'll never get a cache hit, so no point in putting this in SkTypefaceCache.
+    return FontMemResourceTypeface::Create(lf, fontMemResource);
 }
 
 /**
  *  This guy is public
  */
 void SkLOGFONTFromTypeface(const SkTypeface* face, LOGFONT* lf) {
-    if (NULL == face) {
+    if (nullptr == face) {
         *lf = get_default_font();
     } else {
         *lf = static_cast<const LogFontTypeface*>(face)->fLogFont;
@@ -372,7 +359,7 @@ void SkLOGFONTFromTypeface(const SkTypeface* face, LOGFONT* lf) {
 // of calling GetFontUnicodeRange().
 static void populate_glyph_to_unicode(HDC fontHdc, const unsigned glyphCount,
                                       SkTDArray<SkUnichar>* glyphToUnicode) {
-    DWORD glyphSetBufferSize = GetFontUnicodeRanges(fontHdc, NULL);
+    DWORD glyphSetBufferSize = GetFontUnicodeRanges(fontHdc, nullptr);
     if (!glyphSetBufferSize) {
         return;
     }
@@ -432,7 +419,7 @@ public:
         fFont = 0;
         fDC = 0;
         fBM = 0;
-        fBits = NULL;
+        fBits = nullptr;
         fWidth = fHeight = 0;
         fIsBW = false;
     }
@@ -471,7 +458,7 @@ const void* HDCOffscreen::draw(const SkGlyph& glyph, bool isBW,
     if (0 == fDC) {
         fDC = CreateCompatibleDC(0);
         if (0 == fDC) {
-            return NULL;
+            return nullptr;
         }
         SetGraphicsMode(fDC, GM_ADVANCED);
         SetBkMode(fDC, TRANSPARENT);
@@ -514,7 +501,7 @@ const void* HDCOffscreen::draw(const SkGlyph& glyph, bool isBW,
         }
         fBM = CreateDIBSection(fDC, &info, DIB_RGB_COLORS, &fBits, 0, 0);
         if (0 == fBM) {
-            return NULL;
+            return nullptr;
         }
         SelectObject(fDC, fBM);
     }
@@ -530,10 +517,10 @@ const void* HDCOffscreen::draw(const SkGlyph& glyph, bool isBW,
     SetWorldTransform(fDC, &xform);
 
     uint16_t glyphID = glyph.getGlyphID();
-    BOOL ret = ExtTextOutW(fDC, 0, 0, ETO_GLYPH_INDEX, NULL, reinterpret_cast<LPCWSTR>(&glyphID), 1, NULL);
+    BOOL ret = ExtTextOutW(fDC, 0, 0, ETO_GLYPH_INDEX, nullptr, reinterpret_cast<LPCWSTR>(&glyphID), 1, nullptr);
     GdiFlush();
     if (0 == ret) {
-        return NULL;
+        return nullptr;
     }
     *srcRBPtr = srcRB;
     // offset to the start of the image
@@ -553,13 +540,13 @@ public:
     bool isValid() const;
 
 protected:
-    virtual unsigned generateGlyphCount() SK_OVERRIDE;
-    virtual uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE;
-    virtual void generateAdvance(SkGlyph* glyph) SK_OVERRIDE;
-    virtual void generateMetrics(SkGlyph* glyph) SK_OVERRIDE;
-    virtual void generateImage(const SkGlyph& glyph) SK_OVERRIDE;
-    virtual void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE;
-    virtual void generateFontMetrics(SkPaint::FontMetrics*) SK_OVERRIDE;
+    unsigned generateGlyphCount() override;
+    uint16_t generateCharToGlyph(SkUnichar uni) override;
+    void generateAdvance(SkGlyph* glyph) override;
+    void generateMetrics(SkGlyph* glyph) override;
+    void generateImage(const SkGlyph& glyph) override;
+    void generatePath(const SkGlyph& glyph, SkPath* path) override;
+    void generateFontMetrics(SkPaint::FontMetrics*) override;
 
 private:
     DWORD getGDIGlyphPath(const SkGlyph& glyph, UINT flags,
@@ -601,7 +588,6 @@ static BYTE compute_quality(const SkScalerContext::Rec& rec) {
         case SkMask::kBW_Format:
             return NONANTIALIASED_QUALITY;
         case SkMask::kLCD16_Format:
-        case SkMask::kLCD32_Format:
             return CLEARTYPE_QUALITY;
         default:
             if (rec.fFlags & SkScalerContext::kGenA8FromLCD_Flag) {
@@ -623,62 +609,46 @@ SkScalerContext_GDI::SkScalerContext_GDI(SkTypeface* rawTypeface,
 {
     LogFontTypeface* typeface = reinterpret_cast<LogFontTypeface*>(rawTypeface);
 
-    fDDC = ::CreateCompatibleDC(NULL);
+    fDDC = ::CreateCompatibleDC(nullptr);
     if (!fDDC) {
         return;
     }
     SetGraphicsMode(fDDC, GM_ADVANCED);
     SetBkMode(fDDC, TRANSPARENT);
 
-    SkPoint h = SkPoint::Make(SK_Scalar1, 0);
-    // A is the total matrix.
+    // When GDI hinting, remove the entire Y scale from sA and GsA. (Prevents 'linear' metrics.)
+    // When not hinting, remove only the integer Y scale from sA and GsA. (Applied by GDI.)
+    SkScalerContextRec::PreMatrixScale scaleConstraints =
+        (fRec.getHinting() == SkPaint::kNo_Hinting || fRec.getHinting() == SkPaint::kSlight_Hinting)
+                   ? SkScalerContextRec::kVerticalInteger_PreMatrixScale
+                   : SkScalerContextRec::kVertical_PreMatrixScale;
+    SkVector scale;
+    SkMatrix sA;
+    SkMatrix GsA;
     SkMatrix A;
-    fRec.getSingleMatrix(&A);
-    A.mapPoints(&h, 1);
-
-    // G is the Givens Matrix for A (rotational matrix where GA[0][1] == 0).
-    SkMatrix G;
-    SkComputeGivensRotation(h, &G);
-
-    // GA is the matrix A with rotation removed.
-    SkMatrix GA(G);
-    GA.preConcat(A);
-
-    // realTextSize is the actual device size we want (as opposed to the size the user requested).
-    // gdiTextSize is the size we request from GDI.
-    // If the scale is negative, this means the matrix will do the flip anyway.
-    SkScalar realTextSize = SkScalarAbs(GA.get(SkMatrix::kMScaleY));
-    SkScalar gdiTextSize = SkScalarRoundToScalar(realTextSize);
-    if (gdiTextSize == 0) {
-        gdiTextSize = SK_Scalar1;
-    }
-
-    // When not hinting, remove only the gdiTextSize scale which will be applied by GDI.
-    // When GDI hinting, remove the entire Y scale to prevent 'subpixel' metrics.
-    SkScalar scale = (fRec.getHinting() == SkPaint::kNo_Hinting ||
-                      fRec.getHinting() == SkPaint::kSlight_Hinting)
-                   ? SkScalarInvert(gdiTextSize)
-                   : SkScalarInvert(realTextSize);
-
-    // sA is the total matrix A without the textSize (so GDI knows the text size separately).
-    // When this matrix is used with GetGlyphOutline, no further processing is needed.
-    SkMatrix sA(A);
-    sA.preScale(scale, scale); //remove text size
-
-    // GsA is the non-rotational part of A without the text height scale.
-    // This is what is used to find the magnitude of advances.
-    SkMatrix GsA(GA);
-    GsA.preScale(scale, scale); //remove text size, G is rotational so reorders with the scale.
+    fRec.computeMatrices(scaleConstraints, &scale, &sA, &GsA, &fG_inv, &A);
 
     fGsA.eM11 = SkScalarToFIXED(GsA.get(SkMatrix::kMScaleX));
     fGsA.eM12 = SkScalarToFIXED(-GsA.get(SkMatrix::kMSkewY)); // This should be ~0.
     fGsA.eM21 = SkScalarToFIXED(-GsA.get(SkMatrix::kMSkewX));
     fGsA.eM22 = SkScalarToFIXED(GsA.get(SkMatrix::kMScaleY));
 
-    // fG_inv is G inverse, which is fairly simple since G is 2x2 rotational.
-    fG_inv.setAll(G.get(SkMatrix::kMScaleX), -G.get(SkMatrix::kMSkewX), G.get(SkMatrix::kMTransX),
-                  -G.get(SkMatrix::kMSkewY), G.get(SkMatrix::kMScaleY), G.get(SkMatrix::kMTransY),
-                  G.get(SkMatrix::kMPersp0), G.get(SkMatrix::kMPersp1), G.get(SkMatrix::kMPersp2));
+    // When not hinting, scale was computed with kVerticalInteger, so is already an integer.
+    // The sA and GsA transforms will be used to create 'linear' metrics.
+
+    // When hinting, scale was computed with kVertical, stating that our port can handle
+    // non-integer scales. This is done so that sA and GsA are computed without any 'residual'
+    // scale in them, preventing 'linear' metrics. However, GDI cannot actually handle non-integer
+    // scales so we need to round in this case. This is fine, since all of the scale has been
+    // removed from sA and GsA, so GDI will be handling the scale completely.
+    SkScalar gdiTextSize = SkScalarRoundToScalar(scale.fY);
+
+    // GDI will not accept a size of zero, so round the range [0, 1] to 1.
+    // If the size was non-zero, the scale factors will also be non-zero and 1px tall text is drawn.
+    // If the size actually was zero, the scale factors will also be zero, so GDI will draw nothing.
+    if (gdiTextSize == 0) {
+        gdiTextSize = SK_Scalar1;
+    }
 
     LOGFONT lf = typeface->fLogFont;
     lf.lfHeight = -SkScalarTruncToInt(gdiTextSize);
@@ -839,13 +809,13 @@ uint16_t SkScalerContext_GDI::generateCharToGlyph(SkUnichar utf32) {
         // Use uniscribe to detemine glyph index for non-BMP characters.
         static const int numWCHAR = 2;
         static const int maxItems = 2;
-        // MSDN states that this can be NULL, but some things don't work then.
+        // MSDN states that this can be nullptr, but some things don't work then.
         SCRIPT_CONTROL sc = { 0 };
         // Add extra item to SCRIPT_ITEM to work around a bug (now documented).
         // https://bugzilla.mozilla.org/show_bug.cgi?id=366643
         SCRIPT_ITEM si[maxItems + 1];
         int numItems;
-        HRZM(ScriptItemize(utf16, numWCHAR, maxItems, &sc, NULL, si, &numItems),
+        HRZM(ScriptItemize(utf16, numWCHAR, maxItems, &sc, nullptr, si, &numItems),
              "Could not itemize character.");
 
         // Sometimes ScriptShape cannot find a glyph for a non-BMP and returns 2 space glyphs.
@@ -873,7 +843,7 @@ void SkScalerContext_GDI::generateMetrics(SkGlyph* glyph) {
 
     if (fType == SkScalerContext_GDI::kBitmap_Type || fType == SkScalerContext_GDI::kLine_Type) {
         SIZE size;
-        WORD glyphs = glyph->getGlyphID(0);
+        WORD glyphs = glyph->getGlyphID();
         if (0 == GetTextExtentPointI(fDDC, &glyphs, 1, &size)) {
             glyph->fWidth = SkToS16(fTM.tmMaxCharWidth);
         } else {
@@ -895,9 +865,9 @@ void SkScalerContext_GDI::generateMetrics(SkGlyph* glyph) {
             SkMatrix m;
             m.setAll(SkFIXEDToScalar(fMat22.eM11), -SkFIXEDToScalar(fMat22.eM21), 0,
                      -SkFIXEDToScalar(fMat22.eM12), SkFIXEDToScalar(fMat22.eM22), 0,
-                     0,  0, SkScalarToPersp(SK_Scalar1));
+                     0,  0, 1);
             m.mapRect(&bounds);
-            bounds.roundOut();
+            bounds.roundOut(&bounds);
             glyph->fLeft = SkScalarTruncToInt(bounds.fLeft);
             glyph->fTop = SkScalarTruncToInt(bounds.fTop);
             glyph->fWidth = SkScalarTruncToInt(bounds.width());
@@ -911,15 +881,15 @@ void SkScalerContext_GDI::generateMetrics(SkGlyph* glyph) {
         return;
     }
 
-    UINT glyphId = glyph->getGlyphID(0);
+    UINT glyphId = glyph->getGlyphID();
 
     GLYPHMETRICS gm;
     sk_bzero(&gm, sizeof(gm));
 
-    DWORD status = GetGlyphOutlineW(fDDC, glyphId, GGO_METRICS | GGO_GLYPH_INDEX, &gm, 0, NULL, &fMat22);
+    DWORD status = GetGlyphOutlineW(fDDC, glyphId, GGO_METRICS | GGO_GLYPH_INDEX, &gm, 0, nullptr, &fMat22);
     if (GDI_ERROR == status) {
         LogFontTypeface::EnsureAccessible(this->getTypeface());
-        status = GetGlyphOutlineW(fDDC, glyphId, GGO_METRICS | GGO_GLYPH_INDEX, &gm, 0, NULL, &fMat22);
+        status = GetGlyphOutlineW(fDDC, glyphId, GGO_METRICS | GGO_GLYPH_INDEX, &gm, 0, nullptr, &fMat22);
         if (GDI_ERROR == status) {
             glyph->zeroMetrics();
             return;
@@ -932,7 +902,7 @@ void SkScalerContext_GDI::generateMetrics(SkGlyph* glyph) {
     // is to be drawn, like a '.'. We need to outset '.' but do not wish to outset ' '.
     if (1 == gm.gmBlackBoxX && 1 == gm.gmBlackBoxY) {
         // If GetGlyphOutline with GGO_NATIVE returns 0, we know there was no outline.
-        DWORD bufferSize = GetGlyphOutlineW(fDDC, glyphId, GGO_NATIVE | GGO_GLYPH_INDEX, &gm, 0, NULL, &fMat22);
+        DWORD bufferSize = GetGlyphOutlineW(fDDC, glyphId, GGO_NATIVE | GGO_GLYPH_INDEX, &gm, 0, nullptr, &fMat22);
         empty = (0 == bufferSize);
     }
 
@@ -958,7 +928,7 @@ void SkScalerContext_GDI::generateMetrics(SkGlyph* glyph) {
 
     if (this->isSubpixel()) {
         sk_bzero(&gm, sizeof(gm));
-        status = GetGlyphOutlineW(fDDC, glyphId, GGO_METRICS | GGO_GLYPH_INDEX, &gm, 0, NULL, &fHighResMat22);
+        status = GetGlyphOutlineW(fDDC, glyphId, GGO_METRICS | GGO_GLYPH_INDEX, &gm, 0, nullptr, &fHighResMat22);
         if (GDI_ERROR != status) {
             SkPoint advance;
             fHiResMatrix.mapXY(SkIntToScalar(gm.gmCellIncX), SkIntToScalar(gm.gmCellIncY), &advance);
@@ -966,7 +936,7 @@ void SkScalerContext_GDI::generateMetrics(SkGlyph* glyph) {
             glyph->fAdvanceY = SkScalarToFixed(advance.fY);
         }
     } else if (!isAxisAligned(this->fRec)) {
-        status = GetGlyphOutlineW(fDDC, glyphId, GGO_METRICS | GGO_GLYPH_INDEX, &gm, 0, NULL, &fGsA);
+        status = GetGlyphOutlineW(fDDC, glyphId, GGO_METRICS | GGO_GLYPH_INDEX, &gm, 0, nullptr, &fGsA);
         if (GDI_ERROR != status) {
             SkPoint advance;
             fG_inv.mapXY(SkIntToScalar(gm.gmCellIncX), SkIntToScalar(gm.gmCellIncY), &advance);
@@ -978,7 +948,7 @@ void SkScalerContext_GDI::generateMetrics(SkGlyph* glyph) {
 
 static const MAT2 gMat2Identity = {{0, 1}, {0, 0}, {0, 0}, {0, 1}};
 void SkScalerContext_GDI::generateFontMetrics(SkPaint::FontMetrics* metrics) {
-    if (NULL == metrics) {
+    if (nullptr == metrics) {
         return;
     }
     sk_bzero(metrics, sizeof(*metrics));
@@ -1144,19 +1114,6 @@ static inline uint16_t rgb_to_lcd16(SkGdiRGB rgb, const uint8_t* tableR,
     return SkPack888ToRGB16(r, g, b);
 }
 
-template<bool APPLY_PREBLEND>
-static inline SkPMColor rgb_to_lcd32(SkGdiRGB rgb, const uint8_t* tableR,
-                                                   const uint8_t* tableG,
-                                                   const uint8_t* tableB) {
-    U8CPU r = sk_apply_lut_if<APPLY_PREBLEND>((rgb >> 16) & 0xFF, tableR);
-    U8CPU g = sk_apply_lut_if<APPLY_PREBLEND>((rgb >>  8) & 0xFF, tableG);
-    U8CPU b = sk_apply_lut_if<APPLY_PREBLEND>((rgb >>  0) & 0xFF, tableB);
-#if SK_SHOW_TEXT_BLIT_COVERAGE
-    r = SkMax32(r, 10); g = SkMax32(g, 10); b = SkMax32(b, 10);
-#endif
-    return SkPackARGB32(0xFF, r, g, b);
-}
-
 // Is this GDI color neither black nor white? If so, we have to keep this
 // image as is, rather than smashing it down to a BW mask.
 //
@@ -1269,27 +1226,6 @@ static void rgb_to_lcd16(const SkGdiRGB* SK_RESTRICT src, size_t srcRB, const Sk
     }
 }
 
-template<bool APPLY_PREBLEND>
-static void rgb_to_lcd32(const SkGdiRGB* SK_RESTRICT src, size_t srcRB, const SkGlyph& glyph,
-                         const uint8_t* tableR, const uint8_t* tableG, const uint8_t* tableB) {
-    const size_t dstRB = glyph.rowBytes();
-    const int width = glyph.fWidth;
-    uint32_t* SK_RESTRICT dst = (uint32_t*)((char*)glyph.fImage + (glyph.fHeight - 1) * dstRB);
-
-    for (int y = 0; y < glyph.fHeight; y++) {
-        for (int i = 0; i < width; i++) {
-            dst[i] = rgb_to_lcd32<APPLY_PREBLEND>(src[i], tableR, tableG, tableB);
-        }
-        src = SkTAddOffset<const SkGdiRGB>(src, srcRB);
-        dst = (uint32_t*)((char*)dst - dstRB);
-    }
-}
-
-static inline unsigned clamp255(unsigned x) {
-    SkASSERT(x <= 256);
-    return x - (x >> 8);
-}
-
 void SkScalerContext_GDI::generateImage(const SkGlyph& glyph) {
     SkASSERT(fDDC);
 
@@ -1298,10 +1234,10 @@ void SkScalerContext_GDI::generateImage(const SkGlyph& glyph) {
 
     size_t srcRB;
     const void* bits = fOffscreen.draw(glyph, isBW, &srcRB);
-    if (NULL == bits) {
+    if (nullptr == bits) {
         LogFontTypeface::EnsureAccessible(this->getTypeface());
         bits = fOffscreen.draw(glyph, isBW, &srcRB);
-        if (NULL == bits) {
+        if (nullptr == bits) {
             sk_bzero(glyph.fImage, glyph.computeImageSize());
             return;
         }
@@ -1367,23 +1303,13 @@ void SkScalerContext_GDI::generateImage(const SkGlyph& glyph) {
             rgb_to_bw(src, srcRB, glyph);
             ((SkGlyph*)&glyph)->fMaskFormat = SkMask::kBW_Format;
         } else {
-            if (SkMask::kLCD16_Format == glyph.fMaskFormat) {
-                if (fPreBlend.isApplicable()) {
-                    rgb_to_lcd16<true>(src, srcRB, glyph,
-                                       fPreBlend.fR, fPreBlend.fG, fPreBlend.fB);
-                } else {
-                    rgb_to_lcd16<false>(src, srcRB, glyph,
-                                        fPreBlend.fR, fPreBlend.fG, fPreBlend.fB);
-                }
+            SkASSERT(SkMask::kLCD16_Format == glyph.fMaskFormat);
+            if (fPreBlend.isApplicable()) {
+                rgb_to_lcd16<true>(src, srcRB, glyph,
+                                   fPreBlend.fR, fPreBlend.fG, fPreBlend.fB);
             } else {
-                SkASSERT(SkMask::kLCD32_Format == glyph.fMaskFormat);
-                if (fPreBlend.isApplicable()) {
-                    rgb_to_lcd32<true>(src, srcRB, glyph,
-                                       fPreBlend.fR, fPreBlend.fG, fPreBlend.fB);
-                } else {
-                    rgb_to_lcd32<false>(src, srcRB, glyph,
-                                        fPreBlend.fR, fPreBlend.fG, fPreBlend.fB);
-                }
+                rgb_to_lcd16<false>(src, srcRB, glyph,
+                                    fPreBlend.fR, fPreBlend.fG, fPreBlend.fB);
             }
         }
     }
@@ -1399,22 +1325,22 @@ public:
 nextHeader:
         if (!fCurveIter.isSet()) {
             const TTPOLYGONHEADER* header = fHeaderIter.next();
-            if (NULL == header) {
-                return NULL;
+            if (nullptr == header) {
+                return nullptr;
             }
             fCurveIter.set(header);
             const TTPOLYCURVE* curve = fCurveIter.next();
-            if (NULL == curve) {
-                return NULL;
+            if (nullptr == curve) {
+                return nullptr;
             }
             fPointIter.set(curve);
             return &header->pfxStart;
         }
 
         const POINTFX* nextPoint = fPointIter.next();
-        if (NULL == nextPoint) {
+        if (nullptr == nextPoint) {
             const TTPOLYCURVE* curve = fCurveIter.next();
-            if (NULL == curve) {
+            if (nullptr == curve) {
                 fCurveIter.set();
                 goto nextHeader;
             } else {
@@ -1440,7 +1366,7 @@ private:
 
         const TTPOLYGONHEADER* next() {
             if (fCurPolygon >= fEndPolygon) {
-                return NULL;
+                return nullptr;
             }
             const TTPOLYGONHEADER* thisPolygon = fCurPolygon;
             fCurPolygon = SkTAddOffset<const TTPOLYGONHEADER>(fCurPolygon, fCurPolygon->cb);
@@ -1454,27 +1380,27 @@ private:
     /** Iterates over all of the polygon curves in a polygon header. */
     class GDIPolygonCurveIter {
     public:
-        GDIPolygonCurveIter() : fCurCurve(NULL), fEndCurve(NULL) { }
+        GDIPolygonCurveIter() : fCurCurve(nullptr), fEndCurve(nullptr) { }
 
         GDIPolygonCurveIter(const TTPOLYGONHEADER* curPolygon)
             : fCurCurve(SkTAddOffset<const TTPOLYCURVE>(curPolygon, sizeof(TTPOLYGONHEADER)))
             , fEndCurve(SkTAddOffset<const TTPOLYCURVE>(curPolygon, curPolygon->cb))
         { }
 
-        bool isSet() { return fCurCurve != NULL; }
+        bool isSet() { return fCurCurve != nullptr; }
 
         void set(const TTPOLYGONHEADER* curPolygon) {
             fCurCurve = SkTAddOffset<const TTPOLYCURVE>(curPolygon, sizeof(TTPOLYGONHEADER));
             fEndCurve = SkTAddOffset<const TTPOLYCURVE>(curPolygon, curPolygon->cb);
         }
         void set() {
-            fCurCurve = NULL;
-            fEndCurve = NULL;
+            fCurCurve = nullptr;
+            fEndCurve = nullptr;
         }
 
         const TTPOLYCURVE* next() {
             if (fCurCurve >= fEndCurve) {
-                return NULL;
+                return nullptr;
             }
             const TTPOLYCURVE* thisCurve = fCurCurve;
             fCurCurve = SkTAddOffset<const TTPOLYCURVE>(fCurCurve, size_of_TTPOLYCURVE(*fCurCurve));
@@ -1491,7 +1417,7 @@ private:
     /** Iterates over all of the polygon points in a polygon curve. */
     class GDIPolygonCurvePointIter {
     public:
-        GDIPolygonCurvePointIter() : fCurveType(0), fCurPoint(NULL), fEndPoint(NULL) { }
+        GDIPolygonCurvePointIter() : fCurveType(0), fCurPoint(nullptr), fEndPoint(nullptr) { }
 
         GDIPolygonCurvePointIter(const TTPOLYCURVE* curPolygon)
             : fCurveType(curPolygon->wType)
@@ -1499,7 +1425,7 @@ private:
             , fEndPoint(&curPolygon->apfx[curPolygon->cpfx])
         { }
 
-        bool isSet() { return fCurPoint != NULL; }
+        bool isSet() { return fCurPoint != nullptr; }
 
         void set(const TTPOLYCURVE* curPolygon) {
             fCurveType = curPolygon->wType;
@@ -1507,13 +1433,13 @@ private:
             fEndPoint = &curPolygon->apfx[curPolygon->cpfx];
         }
         void set() {
-            fCurPoint = NULL;
-            fEndPoint = NULL;
+            fCurPoint = nullptr;
+            fEndPoint = nullptr;
         }
 
         const POINTFX* next() {
             if (fCurPoint >= fEndPoint) {
-                return NULL;
+                return nullptr;
             }
             const POINTFX* thisPoint = fCurPoint;
             ++fCurPoint;
@@ -1582,7 +1508,7 @@ static void sk_path_from_gdi_path(SkPath* path, const uint8_t* glyphbuf, DWORD t
 
 #define move_next_expected_hinted_point(iter, pElem) do {\
     pElem = iter.next(); \
-    if (NULL == pElem) return false; \
+    if (nullptr == pElem) return false; \
 } while(0)
 
 // It is possible for the hinted and unhinted versions of the same path to have
@@ -1661,17 +1587,17 @@ DWORD SkScalerContext_GDI::getGDIGlyphPath(const SkGlyph& glyph, UINT flags,
 {
     GLYPHMETRICS gm;
 
-    DWORD total_size = GetGlyphOutlineW(fDDC, glyph.fID, flags, &gm, BUFFERSIZE, glyphbuf->get(), &fMat22);
+    DWORD total_size = GetGlyphOutlineW(fDDC, glyph.getGlyphID(), flags, &gm, BUFFERSIZE, glyphbuf->get(), &fMat22);
     // Sometimes GetGlyphOutlineW returns a number larger than BUFFERSIZE even if BUFFERSIZE > 0.
     // It has been verified that this does not involve a buffer overrun.
     if (GDI_ERROR == total_size || total_size > BUFFERSIZE) {
         // GDI_ERROR because the BUFFERSIZE was too small, or because the data was not accessible.
         // When the data is not accessable GetGlyphOutlineW fails rather quickly,
         // so just try to get the size. If that fails then ensure the data is accessible.
-        total_size = GetGlyphOutlineW(fDDC, glyph.fID, flags, &gm, 0, NULL, &fMat22);
+        total_size = GetGlyphOutlineW(fDDC, glyph.getGlyphID(), flags, &gm, 0, nullptr, &fMat22);
         if (GDI_ERROR == total_size) {
             LogFontTypeface::EnsureAccessible(this->getTypeface());
-            total_size = GetGlyphOutlineW(fDDC, glyph.fID, flags, &gm, 0, NULL, &fMat22);
+            total_size = GetGlyphOutlineW(fDDC, glyph.getGlyphID(), flags, &gm, 0, nullptr, &fMat22);
             if (GDI_ERROR == total_size) {
                 // GetGlyphOutlineW is known to fail for some characters, such as spaces.
                 // In these cases, just return that the glyph does not have a shape.
@@ -1681,10 +1607,10 @@ DWORD SkScalerContext_GDI::getGDIGlyphPath(const SkGlyph& glyph, UINT flags,
 
         glyphbuf->reset(total_size);
 
-        DWORD ret = GetGlyphOutlineW(fDDC, glyph.fID, flags, &gm, total_size, glyphbuf->get(), &fMat22);
+        DWORD ret = GetGlyphOutlineW(fDDC, glyph.getGlyphID(), flags, &gm, total_size, glyphbuf->get(), &fMat22);
         if (GDI_ERROR == ret) {
             LogFontTypeface::EnsureAccessible(this->getTypeface());
-            ret = GetGlyphOutlineW(fDDC, glyph.fID, flags, &gm, total_size, glyphbuf->get(), &fMat22);
+            ret = GetGlyphOutlineW(fDDC, glyph.getGlyphID(), flags, &gm, total_size, glyphbuf->get(), &fMat22);
             if (GDI_ERROR == ret) {
                 SkASSERT(false);
                 return 0;
@@ -1695,7 +1621,7 @@ DWORD SkScalerContext_GDI::getGDIGlyphPath(const SkGlyph& glyph, UINT flags,
 }
 
 void SkScalerContext_GDI::generatePath(const SkGlyph& glyph, SkPath* path) {
-    SkASSERT(&glyph && path);
+    SkASSERT(path);
     SkASSERT(fDDC);
 
     path->reset();
@@ -1745,7 +1671,7 @@ static void logfont_for_name(const char* familyName, LOGFONT* lf) {
 #ifdef UNICODE
     // Get the buffer size needed first.
     size_t str_len = ::MultiByteToWideChar(CP_UTF8, 0, familyName,
-                                            -1, NULL, 0);
+                                            -1, nullptr, 0);
     // Allocate a buffer (str_len already has terminating null
     // accounted for).
     wchar_t *wideFamilyName = new wchar_t[str_len];
@@ -1761,16 +1687,14 @@ static void logfont_for_name(const char* familyName, LOGFONT* lf) {
 #endif
 }
 
-void LogFontTypeface::onGetFontDescriptor(SkFontDescriptor* desc,
-                                          bool* isLocalStream) const {
+void LogFontTypeface::onGetFamilyName(SkString* familyName) const {
     // Get the actual name of the typeface. The logfont may not know this.
     HFONT font = CreateFontIndirect(&fLogFont);
 
-    HDC deviceContext = ::CreateCompatibleDC(NULL);
+    HDC deviceContext = ::CreateCompatibleDC(nullptr);
     HFONT savefont = (HFONT)SelectObject(deviceContext, font);
 
-    SkString familyName;
-    dcfontname_to_skstring(deviceContext, fLogFont, &familyName);
+    dcfontname_to_skstring(deviceContext, fLogFont, familyName);
 
     if (deviceContext) {
         ::SelectObject(deviceContext, savefont);
@@ -1779,7 +1703,12 @@ void LogFontTypeface::onGetFontDescriptor(SkFontDescriptor* desc,
     if (font) {
         ::DeleteObject(font);
     }
+}
 
+void LogFontTypeface::onGetFontDescriptor(SkFontDescriptor* desc,
+                                          bool* isLocalStream) const {
+    SkString familyName;
+    this->onGetFamilyName(&familyName);
     desc->setFamilyName(familyName.c_str());
     *isLocalStream = this->fSerializeAsStream;
 }
@@ -1790,7 +1719,7 @@ static bool getWidthAdvance(HDC hdc, int gId, int16_t* advance) {
                         SkScalarToFIXED(0), SkScalarToFIXED(1)};
     int flags = GGO_METRICS | GGO_GLYPH_INDEX;
     GLYPHMETRICS gm;
-    if (GDI_ERROR == GetGlyphOutline(hdc, gId, flags, &gm, 0, NULL, &mat2)) {
+    if (GDI_ERROR == GetGlyphOutline(hdc, gId, flags, &gm, 0, nullptr, &mat2)) {
         return false;
     }
     SkASSERT(advance);
@@ -1799,16 +1728,16 @@ static bool getWidthAdvance(HDC hdc, int gId, int16_t* advance) {
 }
 
 SkAdvancedTypefaceMetrics* LogFontTypeface::onGetAdvancedTypefaceMetrics(
-        SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo,
+        PerGlyphInfo perGlyphInfo,
         const uint32_t* glyphIDs,
         uint32_t glyphIDsCount) const {
     LOGFONT lf = fLogFont;
-    SkAdvancedTypefaceMetrics* info = NULL;
+    SkAdvancedTypefaceMetrics* info = nullptr;
 
-    HDC hdc = CreateCompatibleDC(NULL);
+    HDC hdc = CreateCompatibleDC(nullptr);
     HFONT font = CreateFontIndirect(&lf);
     HFONT savefont = (HFONT)SelectObject(hdc, font);
-    HFONT designFont = NULL;
+    HFONT designFont = nullptr;
 
     const char stem_chars[] = {'i', 'I', '!', '1'};
     int16_t min_width;
@@ -1836,9 +1765,7 @@ SkAdvancedTypefaceMetrics* LogFontTypeface::onGetAdvancedTypefaceMetrics(
     info = new SkAdvancedTypefaceMetrics;
     info->fEmSize = otm.otmEMSquare;
     info->fLastGlyphID = SkToU16(glyphCount - 1);
-    info->fStyle = 0;
     tchar_to_skstring(lf.lfFaceName, &info->fFontName);
-    info->fFlags = SkAdvancedTypefaceMetrics::kEmpty_FontFlag;
     // If bit 1 is set, the font may not be embedded in a document.
     // If bit 1 is clear, the font can be embedded.
     // If bit 2 is set, the embedding is read-only.
@@ -1848,7 +1775,7 @@ SkAdvancedTypefaceMetrics* LogFontTypeface::onGetAdvancedTypefaceMetrics(
                 SkAdvancedTypefaceMetrics::kNotEmbeddable_FontFlag);
     }
 
-    if (perGlyphInfo & SkAdvancedTypefaceMetrics::kToUnicode_PerGlyphInfo) {
+    if (perGlyphInfo & kToUnicode_PerGlyphInfo) {
         populate_glyph_to_unicode(hdc, glyphCount, &(info->fGlyphToUnicode));
     }
 
@@ -1856,13 +1783,6 @@ SkAdvancedTypefaceMetrics* LogFontTypeface::onGetAdvancedTypefaceMetrics(
         (otm.otmTextMetrics.tmPitchAndFamily & TMPF_TRUETYPE)) {
         info->fType = SkAdvancedTypefaceMetrics::kTrueType_Font;
     } else {
-        info->fType = SkAdvancedTypefaceMetrics::kOther_Font;
-        info->fItalicAngle = 0;
-        info->fAscent = 0;
-        info->fDescent = 0;
-        info->fStemV = 0;
-        info->fCapHeight = 0;
-        info->fBBox = SkIRect::MakeEmpty();
         goto ReturnInfo;
     }
 
@@ -1907,7 +1827,7 @@ SkAdvancedTypefaceMetrics* LogFontTypeface::onGetAdvancedTypefaceMetrics(
         }
     }
 
-    if (perGlyphInfo & SkAdvancedTypefaceMetrics::kHAdvance_PerGlyphInfo) {
+    if (perGlyphInfo & kHAdvance_PerGlyphInfo) {
         if (info->fStyle & SkAdvancedTypefaceMetrics::kFixedPitch_Style) {
             appendRange(&info->fGlyphWidths, 0);
             info->fGlyphWidths->fAdvance.append(1, &min_width);
@@ -1935,10 +1855,10 @@ ReturnInfo:
 
 //Dummy representation of a Base64 encoded GUID from create_unique_font_name.
 #define BASE64_GUID_ID "XXXXXXXXXXXXXXXXXXXXXXXX"
-//Length of GUID representation from create_id, including NULL terminator.
+//Length of GUID representation from create_id, including nullptr terminator.
 #define BASE64_GUID_ID_LEN SK_ARRAY_COUNT(BASE64_GUID_ID)
 
-SK_COMPILE_ASSERT(BASE64_GUID_ID_LEN < LF_FACESIZE, GUID_longer_than_facesize);
+static_assert(BASE64_GUID_ID_LEN < LF_FACESIZE, "GUID_longer_than_facesize");
 
 /**
    NameID 6 Postscript names cannot have the character '/'.
@@ -1982,7 +1902,7 @@ static HRESULT create_unique_font_name(char* buffer, size_t bufferSize) {
 }
 
 /**
-   Introduces a font to GDI. On failure will return NULL. The returned handle
+   Introduces a font to GDI. On failure will return nullptr. The returned handle
    should eventually be passed to RemoveFontMemResourceEx.
 */
 static HANDLE activate_font(SkData* fontData) {
@@ -1993,33 +1913,34 @@ static HANDLE activate_font(SkData* fontData) {
                                              0,
                                              &numFonts);
 
-    if (fontHandle != NULL && numFonts < 1) {
+    if (fontHandle != nullptr && numFonts < 1) {
         RemoveFontMemResourceEx(fontHandle);
-        return NULL;
+        return nullptr;
     }
 
     return fontHandle;
 }
 
-static SkTypeface* create_from_stream(SkStream* stream) {
+// Does not affect ownership of stream.
+static SkTypeface* create_from_stream(SkStreamAsset* stream) {
     // Create a unique and unpredictable font name.
     // Avoids collisions and access from CSS.
     char familyName[BASE64_GUID_ID_LEN];
     const int familyNameSize = SK_ARRAY_COUNT(familyName);
     if (FAILED(create_unique_font_name(familyName, familyNameSize))) {
-        return NULL;
+        return nullptr;
     }
 
     // Change the name of the font.
     SkAutoTUnref<SkData> rewrittenFontData(SkOTUtils::RenameFont(stream, familyName, familyNameSize-1));
-    if (NULL == rewrittenFontData.get()) {
-        return NULL;
+    if (nullptr == rewrittenFontData.get()) {
+        return nullptr;
     }
 
     // Register the font with GDI.
     HANDLE fontReference = activate_font(rewrittenFontData.get());
-    if (NULL == fontReference) {
-        return NULL;
+    if (nullptr == fontReference) {
+        return nullptr;
     }
 
     // Create the typeface.
@@ -2029,24 +1950,24 @@ static SkTypeface* create_from_stream(SkStream* stream) {
     return SkCreateFontMemResourceTypefaceFromLOGFONT(lf, fontReference);
 }
 
-SkStream* LogFontTypeface::onOpenStream(int* ttcIndex) const {
+SkStreamAsset* LogFontTypeface::onOpenStream(int* ttcIndex) const {
     *ttcIndex = 0;
 
     const DWORD kTTCTag =
         SkEndian_SwapBE32(SkSetFourByteTag('t', 't', 'c', 'f'));
     LOGFONT lf = fLogFont;
 
-    HDC hdc = ::CreateCompatibleDC(NULL);
+    HDC hdc = ::CreateCompatibleDC(nullptr);
     HFONT font = CreateFontIndirect(&lf);
     HFONT savefont = (HFONT)SelectObject(hdc, font);
 
-    SkMemoryStream* stream = NULL;
+    SkMemoryStream* stream = nullptr;
     DWORD tables[2] = {kTTCTag, 0};
     for (int i = 0; i < SK_ARRAY_COUNT(tables); i++) {
-        DWORD bufferSize = GetFontData(hdc, tables[i], 0, NULL, 0);
+        DWORD bufferSize = GetFontData(hdc, tables[i], 0, nullptr, 0);
         if (bufferSize == GDI_ERROR) {
             call_ensure_accessible(lf);
-            bufferSize = GetFontData(hdc, tables[i], 0, NULL, 0);
+            bufferSize = GetFontData(hdc, tables[i], 0, nullptr, 0);
         }
         if (bufferSize != GDI_ERROR) {
             stream = new SkMemoryStream(bufferSize);
@@ -2054,7 +1975,7 @@ SkStream* LogFontTypeface::onOpenStream(int* ttcIndex) const {
                 break;
             } else {
                 delete stream;
-                stream = NULL;
+                stream = nullptr;
             }
         }
     }
@@ -2097,13 +2018,13 @@ static uint16_t nonBmpCharToGlyph(HDC hdc, SCRIPT_CACHE* scriptCache, const WCHA
     // Use uniscribe to detemine glyph index for non-BMP characters.
     static const int numWCHAR = 2;
     static const int maxItems = 2;
-    // MSDN states that this can be NULL, but some things don't work then.
+    // MSDN states that this can be nullptr, but some things don't work then.
     SCRIPT_CONTROL scriptControl = { 0 };
     // Add extra item to SCRIPT_ITEM to work around a bug (now documented).
     // https://bugzilla.mozilla.org/show_bug.cgi?id=366643
     SCRIPT_ITEM si[maxItems + 1];
     int numItems;
-    HRZM(ScriptItemize(utf16, numWCHAR, maxItems, &scriptControl, NULL, si, &numItems),
+    HRZM(ScriptItemize(utf16, numWCHAR, maxItems, &scriptControl, nullptr, si, &numItems),
          "Could not itemize character.");
 
     // Sometimes ScriptShape cannot find a glyph for a non-BMP and returns 2 space glyphs.
@@ -2124,7 +2045,7 @@ static uint16_t nonBmpCharToGlyph(HDC hdc, SCRIPT_CACHE* scriptCache, const WCHA
 class SkAutoHDC {
 public:
     SkAutoHDC(const LOGFONT& lf)
-        : fHdc(::CreateCompatibleDC(NULL))
+        : fHdc(::CreateCompatibleDC(nullptr))
         , fFont(::CreateFontIndirect(&lf))
         , fSavefont((HFONT)SelectObject(fHdc, fFont))
     { }
@@ -2157,7 +2078,7 @@ int LogFontTypeface::onCharsToGlyphs(const void* chars, Encoding encoding,
 
     SkAutoSTMalloc<256, uint16_t> scratchGlyphs;
     uint16_t* glyphs;
-    if (userGlyphs != NULL) {
+    if (userGlyphs != nullptr) {
         glyphs = userGlyphs;
     } else {
         glyphs = scratchGlyphs.reset(glyphCount);
@@ -2271,7 +2192,7 @@ int LogFontTypeface::onCharsToGlyphs(const void* chars, Encoding encoding,
 }
 
 int LogFontTypeface::onCountGlyphs() const {
-    HDC hdc = ::CreateCompatibleDC(NULL);
+    HDC hdc = ::CreateCompatibleDC(nullptr);
     HFONT font = CreateFontIndirect(&fLogFont);
     HFONT savefont = (HFONT)SelectObject(hdc, font);
 
@@ -2285,7 +2206,7 @@ int LogFontTypeface::onCountGlyphs() const {
 }
 
 int LogFontTypeface::onGetUPEM() const {
-    HDC hdc = ::CreateCompatibleDC(NULL);
+    HDC hdc = ::CreateCompatibleDC(nullptr);
     HFONT font = CreateFontIndirect(&fLogFont);
     HFONT savefont = (HFONT)SelectObject(hdc, font);
 
@@ -2301,7 +2222,7 @@ int LogFontTypeface::onGetUPEM() const {
 SkTypeface::LocalizedStrings* LogFontTypeface::onCreateFamilyNameIterator() const {
     SkTypeface::LocalizedStrings* nameIter =
         SkOTUtils::LocalizedStrings_NameTable::CreateForFamilyNames(*this);
-    if (NULL == nameIter) {
+    if (nullptr == nameIter) {
         SkString familyName;
         this->getFamilyName(&familyName);
         SkString language("und"); //undetermined
@@ -2337,12 +2258,12 @@ size_t LogFontTypeface::onGetTableData(SkFontTableTag tag, size_t offset,
 {
     LOGFONT lf = fLogFont;
 
-    HDC hdc = ::CreateCompatibleDC(NULL);
+    HDC hdc = ::CreateCompatibleDC(nullptr);
     HFONT font = CreateFontIndirect(&lf);
     HFONT savefont = (HFONT)SelectObject(hdc, font);
 
     tag = SkEndian_SwapBE32(tag);
-    if (NULL == data) {
+    if (nullptr == data) {
         length = 0;
     }
     DWORD bufferSize = GetFontData(hdc, tag, (DWORD) offset, data, (DWORD) length);
@@ -2359,11 +2280,10 @@ size_t LogFontTypeface::onGetTableData(SkFontTableTag tag, size_t offset,
 }
 
 SkScalerContext* LogFontTypeface::onCreateScalerContext(const SkDescriptor* desc) const {
-    SkScalerContext_GDI* ctx = SkNEW_ARGS(SkScalerContext_GDI,
-                                                (const_cast<LogFontTypeface*>(this), desc));
+    SkScalerContext_GDI* ctx = new SkScalerContext_GDI(const_cast<LogFontTypeface*>(this), desc);
     if (!ctx->isValid()) {
-        SkDELETE(ctx);
-        ctx = NULL;
+        delete ctx;
+        ctx = nullptr;
     }
     return ctx;
 }
@@ -2453,12 +2373,6 @@ static int CALLBACK enum_family_proc(const LOGFONT* lf, const TEXTMETRIC*,
     return 1; // non-zero means continue
 }
 
-static SkFontStyle compute_fontstyle(const LOGFONT& lf) {
-    return SkFontStyle(lf.lfWeight, SkFontStyle::kNormal_Width,
-                       lf.lfItalic ? SkFontStyle::kItalic_Slant
-                                   : SkFontStyle::kUpright_Slant);
-}
-
 class SkFontStyleSetGDI : public SkFontStyleSet {
 public:
     SkFontStyleSetGDI(const TCHAR familyName[]) {
@@ -2467,18 +2381,18 @@ public:
         lf.lfCharSet = DEFAULT_CHARSET;
         _tcscpy_s(lf.lfFaceName, familyName);
 
-        HDC hdc = ::CreateCompatibleDC(NULL);
+        HDC hdc = ::CreateCompatibleDC(nullptr);
         ::EnumFontFamiliesEx(hdc, &lf, enum_family_proc, (LPARAM)&fArray, 0);
         ::DeleteDC(hdc);
     }
 
-    virtual int count() SK_OVERRIDE {
+    int count() override {
         return fArray.count();
     }
 
-    virtual void getStyle(int index, SkFontStyle* fs, SkString* styleName) SK_OVERRIDE {
+    void getStyle(int index, SkFontStyle* fs, SkString* styleName) override {
         if (fs) {
-            *fs = compute_fontstyle(fArray[index].elfLogFont);
+            *fs = get_style(fArray[index].elfLogFont);
         }
         if (styleName) {
             const ENUMLOGFONTEX& ref = fArray[index];
@@ -2493,13 +2407,12 @@ public:
         }
     }
 
-    virtual SkTypeface* createTypeface(int index) SK_OVERRIDE {
+    SkTypeface* createTypeface(int index) override {
         return SkCreateTypefaceFromLOGFONT(fArray[index].elfLogFont);
     }
 
-    virtual SkTypeface* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE {
-        // todo:
-        return SkCreateTypefaceFromLOGFONT(fArray[0].elfLogFont);
+    SkTypeface* matchStyle(const SkFontStyle& pattern) override {
+        return this->matchStyleCSS3(pattern);
     }
 
 private:
@@ -2513,75 +2426,83 @@ public:
         sk_bzero(&lf, sizeof(lf));
         lf.lfCharSet = DEFAULT_CHARSET;
 
-        HDC hdc = ::CreateCompatibleDC(NULL);
+        HDC hdc = ::CreateCompatibleDC(nullptr);
         ::EnumFontFamiliesEx(hdc, &lf, enum_family_proc, (LPARAM)&fLogFontArray, 0);
         ::DeleteDC(hdc);
     }
 
 protected:
-    virtual int onCountFamilies() const SK_OVERRIDE {
+    int onCountFamilies() const override {
         return fLogFontArray.count();
     }
 
-    virtual void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE {
+    void onGetFamilyName(int index, SkString* familyName) const override {
         SkASSERT((unsigned)index < (unsigned)fLogFontArray.count());
         tchar_to_skstring(fLogFontArray[index].elfLogFont.lfFaceName, familyName);
     }
 
-    virtual SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE {
+    SkFontStyleSet* onCreateStyleSet(int index) const override {
         SkASSERT((unsigned)index < (unsigned)fLogFontArray.count());
-        return SkNEW_ARGS(SkFontStyleSetGDI, (fLogFontArray[index].elfLogFont.lfFaceName));
+        return new SkFontStyleSetGDI(fLogFontArray[index].elfLogFont.lfFaceName);
     }
 
-    virtual SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE {
-        if (NULL == familyName) {
+    SkFontStyleSet* onMatchFamily(const char familyName[]) const override {
+        if (nullptr == familyName) {
             familyName = "";    // do we need this check???
         }
         LOGFONT lf;
         logfont_for_name(familyName, &lf);
-        return SkNEW_ARGS(SkFontStyleSetGDI, (lf.lfFaceName));
+        return new SkFontStyleSetGDI(lf.lfFaceName);
     }
 
     virtual SkTypeface* onMatchFamilyStyle(const char familyName[],
-                                           const SkFontStyle& fontstyle) const SK_OVERRIDE {
+                                           const SkFontStyle& fontstyle) const override {
         // could be in base impl
         SkAutoTUnref<SkFontStyleSet> sset(this->matchFamily(familyName));
         return sset->matchStyle(fontstyle);
     }
 
+    virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[], const SkFontStyle&,
+                                                    const char* bcp47[], int bcp47Count,
+                                                    SkUnichar character) const override {
+        return nullptr;
+    }
+
     virtual SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember,
-                                         const SkFontStyle& fontstyle) const SK_OVERRIDE {
+                                         const SkFontStyle& fontstyle) const override {
         // could be in base impl
         SkString familyName;
         ((LogFontTypeface*)familyMember)->getFamilyName(&familyName);
         return this->matchFamilyStyle(familyName.c_str(), fontstyle);
     }
 
-    virtual SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE {
+    SkTypeface* onCreateFromStream(SkStreamAsset* bareStream, int ttcIndex) const override {
+        SkAutoTDelete<SkStreamAsset> stream(bareStream);
         return create_from_stream(stream);
     }
 
-    virtual SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE {
+    SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const override {
         // could be in base impl
-        SkAutoTUnref<SkStream> stream(SkNEW_ARGS(SkMemoryStream, (data)));
-        return this->createFromStream(stream);
+        return this->createFromStream(new SkMemoryStream(data));
     }
 
-    virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE {
+    SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const override {
         // could be in base impl
-        SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path));
-        return this->createFromStream(stream);
+        return this->createFromStream(SkStream::NewFromFile(path));
     }
 
     virtual SkTypeface* onLegacyCreateTypeface(const char familyName[],
-                                               unsigned styleBits) const SK_OVERRIDE {
+                                               unsigned styleBits) const override {
         LOGFONT lf;
-        if (NULL == familyName) {
+        if (nullptr == familyName) {
             lf = get_default_font();
         } else {
             logfont_for_name(familyName, &lf);
         }
-        setStyle(&lf, (SkTypeface::Style)styleBits);
+
+        SkTypeface::Style style = (SkTypeface::Style)styleBits;
+        lf.lfWeight = (style & SkTypeface::kBold) != 0 ? FW_BOLD : FW_NORMAL;
+        lf.lfItalic = ((style & SkTypeface::kItalic) != 0);
         return SkCreateTypefaceFromLOGFONT(lf);
     }
 
@@ -2591,6 +2512,6 @@ private:
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkFontMgr* SkFontMgr_New_GDI() {
-    return SkNEW(SkFontMgrGDI);
-}
+SkFontMgr* SkFontMgr_New_GDI() { return new SkFontMgrGDI; }
+
+#endif//defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/src/ports/SkFontMgr_android.cpp b/gfx/skia/skia/src/ports/SkFontMgr_android.cpp
index ba3846c412c5..11244c55ee94 100644
--- a/gfx/skia/skia/src/ports/SkFontMgr_android.cpp
+++ b/gfx/skia/skia/src/ports/SkFontMgr_android.cpp
@@ -5,49 +5,44 @@
  * found in the LICENSE file.
  */
 
-#include "SkFontConfigParser_android.h"
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_ANDROID)
+
+#include "SkFixed.h"
 #include "SkFontDescriptor.h"
 #include "SkFontHost_FreeType_common.h"
 #include "SkFontMgr.h"
+#include "SkFontMgr_android.h"
+#include "SkFontMgr_android_parser.h"
 #include "SkFontStyle.h"
+#include "SkPaint.h"
+#include "SkRefCnt.h"
+#include "SkString.h"
 #include "SkStream.h"
+#include "SkTArray.h"
 #include "SkTDArray.h"
 #include "SkTSearch.h"
-#include "SkTypeface.h"
+#include "SkTemplates.h"
 #include "SkTypefaceCache.h"
 
 #include <limits>
-#include <stdlib.h>
 
-#ifndef SK_FONT_FILE_PREFIX
-#    define SK_FONT_FILE_PREFIX "/fonts/"
-#endif
-
-#ifndef SK_DEBUG_FONTS
-    #define SK_DEBUG_FONTS 0
-#endif
-
-#if SK_DEBUG_FONTS
-#    define DEBUG_FONT(args) SkDebugf args
-#else
-#    define DEBUG_FONT(args)
-#endif
+class SkData;
 
 class SkTypeface_Android : public SkTypeface_FreeType {
 public:
-    SkTypeface_Android(int index,
-                       Style style,
+    SkTypeface_Android(const SkFontStyle& style,
                        bool isFixedPitch,
-                       const SkString familyName)
+                       const SkString& familyName)
         : INHERITED(style, SkTypefaceCache::NewFontID(), isFixedPitch)
-        , fIndex(index)
         , fFamilyName(familyName)
-    { }
-
-    const SkString& name() const { return fFamilyName; }
+        { }
 
 protected:
-    int fIndex;
+    void onGetFamilyName(SkString* familyName) const override {
+        *familyName = fFamilyName;
+    }
+
     SkString fFamilyName;
 
 private:
@@ -56,108 +51,190 @@ private:
 
 class SkTypeface_AndroidSystem : public SkTypeface_Android {
 public:
-    SkTypeface_AndroidSystem(const SkString pathName,
+    SkTypeface_AndroidSystem(const SkString& pathName,
                              int index,
-                             Style style,
+                             const SkFixed* axes, int axesCount,
+                             const SkFontStyle& style,
                              bool isFixedPitch,
-                             const SkString familyName)
-        : INHERITED(index, style, isFixedPitch, familyName)
+                             const SkString& familyName,
+                             const SkLanguage& lang,
+                             FontVariant variantStyle)
+        : INHERITED(style, isFixedPitch, familyName)
         , fPathName(pathName)
-    { }
+        , fIndex(index)
+        , fAxes(axes, axesCount)
+        , fLang(lang)
+        , fVariantStyle(variantStyle) { }
 
-    virtual void onGetFontDescriptor(SkFontDescriptor* desc,
-                                     bool* serialize) const SK_OVERRIDE
-    {
+    virtual void onGetFontDescriptor(SkFontDescriptor* desc, bool* serialize) const override {
         SkASSERT(desc);
         SkASSERT(serialize);
         desc->setFamilyName(fFamilyName.c_str());
-        desc->setFontFileName(fPathName.c_str());
         *serialize = false;
     }
-    virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE {
+    SkStreamAsset* onOpenStream(int* ttcIndex) const override {
         *ttcIndex = fIndex;
         return SkStream::NewFromFile(fPathName.c_str());
     }
+    SkFontData* onCreateFontData() const override {
+        return new SkFontData(SkStream::NewFromFile(fPathName.c_str()), fIndex,
+                              fAxes.begin(), fAxes.count());
+    }
 
-private:
-    SkString fPathName;
+    const SkString fPathName;
+    int fIndex;
+    const SkSTArray<4, SkFixed, true> fAxes;
+    const SkLanguage fLang;
+    const FontVariant fVariantStyle;
 
     typedef SkTypeface_Android INHERITED;
 };
 
 class SkTypeface_AndroidStream : public SkTypeface_Android {
 public:
-    SkTypeface_AndroidStream(SkStream* stream,
-                             int index,
-                             Style style,
+    SkTypeface_AndroidStream(SkFontData* data,
+                             const SkFontStyle& style,
                              bool isFixedPitch,
-                             const SkString familyName)
-        : INHERITED(index, style, isFixedPitch, familyName)
-        , fStream(stream)
+                             const SkString& familyName)
+        : INHERITED(style, isFixedPitch, familyName)
+        , fData(data)
     { }
 
     virtual void onGetFontDescriptor(SkFontDescriptor* desc,
-                                     bool* serialize) const SK_OVERRIDE {
+                                     bool* serialize) const override {
         SkASSERT(desc);
         SkASSERT(serialize);
         desc->setFamilyName(fFamilyName.c_str());
-        desc->setFontFileName(NULL);
         *serialize = true;
     }
 
-    virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE {
-        *ttcIndex = fIndex;
-        return fStream->duplicate();
+    SkStreamAsset* onOpenStream(int* ttcIndex) const override {
+        *ttcIndex = fData->getIndex();
+        return fData->duplicateStream();
+    }
+
+    SkFontData* onCreateFontData() const override {
+        return new SkFontData(*fData.get());
     }
 
 private:
-    SkAutoTUnref<SkStream> fStream;
-
+    const SkAutoTDelete<const SkFontData> fData;
     typedef SkTypeface_Android INHERITED;
 };
 
-void get_path_for_sys_fonts(SkString* full, const SkString& name) {
-    full->set(getenv("ANDROID_ROOT"));
-    full->append(SK_FONT_FILE_PREFIX);
-    full->append(name);
-}
-
 class SkFontStyleSet_Android : public SkFontStyleSet {
+    typedef SkTypeface_FreeType::Scanner Scanner;
+
 public:
-    explicit SkFontStyleSet_Android(FontFamily* family) : fFontFamily(family) {
+    explicit SkFontStyleSet_Android(const FontFamily& family, const Scanner& scanner) {
+        const SkString* cannonicalFamilyName = nullptr;
+        if (family.fNames.count() > 0) {
+            cannonicalFamilyName = &family.fNames[0];
+        }
         // TODO? make this lazy
-        for (int i = 0; i < family->fFontFiles.count(); ++i) {
-            const SkString& fileName = family->fFontFiles[i].fFileName;
+        for (int i = 0; i < family.fFonts.count(); ++i) {
+            const FontFileInfo& fontFile = family.fFonts[i];
 
-            SkString pathName;
-            get_path_for_sys_fonts(&pathName, fileName);
+            SkString pathName(family.fBasePath);
+            pathName.append(fontFile.fFileName);
 
-            SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(pathName.c_str()));
+            SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(pathName.c_str()));
             if (!stream.get()) {
-                DEBUG_FONT(("---- SystemFonts[%d] file=%s (NOT EXIST)", i, filename.c_str()));
+                SkDEBUGF(("Requested font file %s does not exist or cannot be opened.\n",
+                          pathName.c_str()));
                 continue;
             }
 
-            SkString fontName;
-            SkTypeface::Style style;
+            const int ttcIndex = fontFile.fIndex;
+            SkString familyName;
+            SkFontStyle style;
             bool isFixedWidth;
-            if (!SkTypeface_FreeType::ScanFont(stream.get(), family->fFontFiles[i].fIndex,
-                                               &fontName, &style, &isFixedWidth))
+            Scanner::AxisDefinitions axisDefinitions;
+            if (!scanner.scanFont(stream.get(), ttcIndex,
+                                  &familyName, &style, &isFixedWidth, &axisDefinitions))
             {
-                DEBUG_FONT(("---- SystemFonts[%d] file=%s (INVALID)", i, filename.c_str()));
+                SkDEBUGF(("Requested font file %s exists, but is not a valid font.\n",
+                          pathName.c_str()));
                 continue;
             }
 
-            fStyles.push_back().reset(SkNEW_ARGS(SkTypeface_AndroidSystem,
-                                                 (pathName, 0,
-                                                  style, isFixedWidth, fontName)));
+            int weight = fontFile.fWeight != 0 ? fontFile.fWeight : style.weight();
+            SkFontStyle::Slant slant = style.slant();
+            switch (fontFile.fStyle) {
+                case FontFileInfo::Style::kAuto: slant = style.slant(); break;
+                case FontFileInfo::Style::kNormal: slant = SkFontStyle::kUpright_Slant; break;
+                case FontFileInfo::Style::kItalic: slant = SkFontStyle::kItalic_Slant; break;
+                default: SkASSERT(false); break;
+            }
+            style = SkFontStyle(weight, style.width(), slant);
+
+            const SkLanguage& lang = family.fLanguage;
+            uint32_t variant = family.fVariant;
+            if (kDefault_FontVariant == variant) {
+                variant = kCompact_FontVariant | kElegant_FontVariant;
+            }
+
+            // The first specified family name overrides the family name found in the font.
+            // TODO: SkTypeface_AndroidSystem::onCreateFamilyNameIterator should return
+            // all of the specified family names in addition to the names found in the font.
+            if (cannonicalFamilyName != nullptr) {
+                familyName = *cannonicalFamilyName;
+            }
+
+            SkAutoSTMalloc<4, SkFixed> axisValues(axisDefinitions.count());
+            for (int i = 0; i < axisDefinitions.count(); ++i) {
+                const Scanner::AxisDefinition& axisDefinition = axisDefinitions[i];
+                axisValues[i] = axisDefinition.fDefault;
+                for (int j = 0; j < fontFile.fAxes.count(); ++j) {
+                    const FontFileInfo::Axis& axisSpecified = fontFile.fAxes[j];
+                    if (axisDefinition.fTag == axisSpecified.fTag) {
+                        axisValues[i] = SkTPin(axisSpecified.fValue, axisDefinition.fMinimum,
+                                                                     axisDefinition.fMaximum);
+                        if (axisValues[i] != axisSpecified.fValue) {
+                            SkDEBUGF(("Requested font axis value out of range: "
+                                      "%s '%c%c%c%c' %f; pinned to %f.\n",
+                                      familyName.c_str(),
+                                      (axisDefinition.fTag >> 24) & 0xFF,
+                                      (axisDefinition.fTag >> 16) & 0xFF,
+                                      (axisDefinition.fTag >>  8) & 0xFF,
+                                      (axisDefinition.fTag      ) & 0xFF,
+                                      SkFixedToDouble(axisSpecified.fValue),
+                                      SkFixedToDouble(axisValues[i])));
+                        }
+                        break;
+                    }
+                }
+                // TODO: warn on defaulted axis?
+            }
+
+            SkDEBUGCODE(
+                    // Check for axis specified, but not matched in font.
+                    for (int i = 0; i < fontFile.fAxes.count(); ++i) {
+                        SkFourByteTag skTag = fontFile.fAxes[i].fTag;
+                        bool found = false;
+                        for (int j = 0; j < axisDefinitions.count(); ++j) {
+                            if (skTag == axisDefinitions[j].fTag) {
+                                found = true;
+                                break;
+                            }
+                        }
+                        if (!found) {
+                            SkDEBUGF(("Requested font axis not found: %s '%c%c%c%c'\n",
+                                      familyName.c_str(), (skTag >> 24) & 0xFF,
+                                      (skTag >> 16) & 0xFF, (skTag >> 8) & 0xFF, (skTag)&0xFF));
+                        }
+                    })
+
+                    fStyles.push_back().reset(new SkTypeface_AndroidSystem(
+                            pathName, ttcIndex, axisValues.get(), axisDefinitions.count(), style,
+                            isFixedWidth, familyName, lang, variant));
         }
     }
 
-    virtual int count() SK_OVERRIDE {
+    int count() override {
         return fStyles.count();
     }
-    virtual void getStyle(int index, SkFontStyle* style, SkString* name) SK_OVERRIDE {
+    void getStyle(int index, SkFontStyle* style, SkString* name) override {
         if (index < 0 || fStyles.count() <= index) {
             return;
         }
@@ -168,9 +245,9 @@ public:
             name->reset();
         }
     }
-    virtual SkTypeface* createTypeface(int index) SK_OVERRIDE {
+    SkTypeface_AndroidSystem* createTypeface(int index) override {
         if (index < 0 || fStyles.count() <= index) {
-            return NULL;
+            return nullptr;
         }
         return SkRef(fStyles[index].get());
     }
@@ -179,11 +256,11 @@ public:
      *  TODO: consider replacing with SkStyleSet_Indirect::matchStyle();
      *  this simpler version using match_score() passes all our tests.
      */
-    virtual SkTypeface* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE {
+    SkTypeface_AndroidSystem* matchStyle(const SkFontStyle& pattern) override {
         if (0 == fStyles.count()) {
-            return NULL;
+            return nullptr;
         }
-        SkTypeface* closest = fStyles[0];
+        SkTypeface_AndroidSystem* closest = fStyles[0];
         int minScore = std::numeric_limits<int>::max();
         for (int i = 0; i < fStyles.count(); ++i) {
             SkFontStyle style = this->style(i);
@@ -198,28 +275,17 @@ public:
 
 private:
     SkFontStyle style(int index) {
-        return SkFontStyle(this->weight(index), SkFontStyle::kNormal_Width,
-                           this->slant(index));
-    }
-    SkFontStyle::Weight weight(int index) {
-        if (fStyles[index]->isBold()) return SkFontStyle::kBold_Weight;
-        return SkFontStyle::kNormal_Weight;
-    }
-    SkFontStyle::Slant slant(int index) {
-        if (fStyles[index]->isItalic()) return SkFontStyle::kItalic_Slant;
-        return SkFontStyle::kUpright_Slant;
+        return fStyles[index]->fontStyle();
     }
     static int match_score(const SkFontStyle& pattern, const SkFontStyle& candidate) {
         int score = 0;
-        score += abs((pattern.width() - candidate.width()) * 100);
-        score += abs((pattern.isItalic() == candidate.isItalic()) ? 0 : 1000);
-        score += abs(pattern.weight() - candidate.weight());
+        score += SkTAbs((pattern.width() - candidate.width()) * 100);
+        score += SkTAbs((pattern.isItalic() == candidate.isItalic()) ? 0 : 1000);
+        score += SkTAbs(pattern.weight() - candidate.weight());
         return score;
     }
 
-
-    FontFamily* fFontFamily;
-    SkTArray<SkAutoTUnref<SkTypeface>, true> fStyles;
+    SkTArray<SkAutoTUnref<SkTypeface_AndroidSystem>, true> fStyles;
 
     friend struct NameToFamily;
     friend class SkFontMgr_Android;
@@ -239,22 +305,37 @@ struct NameToFamily {
 
 class SkFontMgr_Android : public SkFontMgr {
 public:
-    SkFontMgr_Android() {
-        SkTDArray<FontFamily*> fontFamilies;
-        SkFontConfigParser::GetFontFamilies(fontFamilies);
-        this->buildNameToFamilyMap(fontFamilies);
+    SkFontMgr_Android(const SkFontMgr_Android_CustomFonts* custom) {
+        SkTDArray<FontFamily*> families;
+        if (custom && SkFontMgr_Android_CustomFonts::kPreferSystem != custom->fSystemFontUse) {
+            SkString base(custom->fBasePath);
+            SkFontMgr_Android_Parser::GetCustomFontFamilies(
+                families, base, custom->fFontsXml, custom->fFallbackFontsXml);
+        }
+        if (!custom ||
+            (custom && SkFontMgr_Android_CustomFonts::kOnlyCustom != custom->fSystemFontUse))
+        {
+            SkFontMgr_Android_Parser::GetSystemFontFamilies(families);
+        }
+        if (custom && SkFontMgr_Android_CustomFonts::kPreferSystem == custom->fSystemFontUse) {
+            SkString base(custom->fBasePath);
+            SkFontMgr_Android_Parser::GetCustomFontFamilies(
+                families, base, custom->fFontsXml, custom->fFallbackFontsXml);
+        }
+        this->buildNameToFamilyMap(families);
         this->findDefaultFont();
+        families.deleteAll();
     }
 
 protected:
     /** Returns not how many families we have, but how many unique names
      *  exist among the families.
      */
-    virtual int onCountFamilies() const SK_OVERRIDE {
+    int onCountFamilies() const override {
         return fNameToFamilyMap.count();
     }
 
-    virtual void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE {
+    void onGetFamilyName(int index, SkString* familyName) const override {
         if (index < 0 || fNameToFamilyMap.count() <= index) {
             familyName->reset();
             return;
@@ -262,16 +343,16 @@ protected:
         familyName->set(fNameToFamilyMap[index].name);
     }
 
-    virtual SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE {
+    SkFontStyleSet* onCreateStyleSet(int index) const override {
         if (index < 0 || fNameToFamilyMap.count() <= index) {
-            return NULL;
+            return nullptr;
         }
         return SkRef(fNameToFamilyMap[index].styleSet);
     }
 
-    virtual SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE {
+    SkFontStyleSet* onMatchFamily(const char familyName[]) const override {
         if (!familyName) {
-            return NULL;
+            return nullptr;
         }
         SkAutoAsciiToLC tolc(familyName);
         for (int i = 0; i < fNameToFamilyMap.count(); ++i) {
@@ -279,17 +360,23 @@ protected:
                 return SkRef(fNameToFamilyMap[i].styleSet);
             }
         }
-        return NULL;
+        // TODO: eventually we should not need to name fallback families.
+        for (int i = 0; i < fFallbackNameToFamilyMap.count(); ++i) {
+            if (fFallbackNameToFamilyMap[i].name.equals(tolc.lc())) {
+                return SkRef(fFallbackNameToFamilyMap[i].styleSet);
+            }
+        }
+        return nullptr;
     }
 
     virtual SkTypeface* onMatchFamilyStyle(const char familyName[],
-                                           const SkFontStyle& style) const SK_OVERRIDE {
+                                           const SkFontStyle& style) const override {
         SkAutoTUnref<SkFontStyleSet> sset(this->matchFamily(familyName));
         return sset->matchStyle(style);
     }
 
     virtual SkTypeface* onMatchFaceStyle(const SkTypeface* typeface,
-                                         const SkFontStyle& style) const SK_OVERRIDE {
+                                         const SkFontStyle& style) const override {
         for (int i = 0; i < fFontStyleSets.count(); ++i) {
             for (int j = 0; j < fFontStyleSets[i]->fStyles.count(); ++j) {
                 if (fFontStyleSets[i]->fStyles[j] == typeface) {
@@ -297,76 +384,161 @@ protected:
                 }
             }
         }
-        return NULL;
+        return nullptr;
     }
 
-    virtual SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE {
-        SkAutoTUnref<SkStream> stream(new SkMemoryStream(data));
-        return this->createFromStream(stream, ttcIndex);
-    }
+    static SkTypeface_AndroidSystem* find_family_style_character(
+            const SkTDArray<NameToFamily>& fallbackNameToFamilyMap,
+            const SkFontStyle& style, bool elegant,
+            const SkString& langTag, SkUnichar character)
+    {
+        for (int i = 0; i < fallbackNameToFamilyMap.count(); ++i) {
+            SkFontStyleSet_Android* family = fallbackNameToFamilyMap[i].styleSet;
+            SkAutoTUnref<SkTypeface_AndroidSystem> face(family->matchStyle(style));
 
-    virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE {
-        SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path));
-        return stream.get() ? this->createFromStream(stream, ttcIndex) : NULL;
-    }
+            if (!langTag.isEmpty() && !face->fLang.getTag().startsWith(langTag.c_str())) {
+                continue;
+            }
 
-    virtual SkTypeface* onCreateFromStream(SkStream* s, int ttcIndex) const SK_OVERRIDE {
-        SkAutoTUnref<SkStream> stream(s);
+            if (SkToBool(face->fVariantStyle & kElegant_FontVariant) != elegant) {
+                continue;
+            }
 
-        bool isFixedPitch;
-        SkTypeface::Style style;
-        SkString name;
-        if (!SkTypeface_FreeType::ScanFont(stream, ttcIndex, &name, &style, &isFixedPitch)) {
-            return NULL;
+            SkPaint paint;
+            paint.setTypeface(face);
+            paint.setTextEncoding(SkPaint::kUTF32_TextEncoding);
+
+            uint16_t glyphID;
+            paint.textToGlyphs(&character, sizeof(character), &glyphID);
+            if (glyphID != 0) {
+                return face.detach();
+            }
         }
-        return SkNEW_ARGS(SkTypeface_AndroidStream, (stream.detach(), ttcIndex,
-                                                     style, isFixedPitch, name));
+        return nullptr;
+    }
+
+    virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[],
+                                                    const SkFontStyle& style,
+                                                    const char* bcp47[],
+                                                    int bcp47Count,
+                                                    SkUnichar character) const override
+    {
+        // The variant 'elegant' is 'not squashed', 'compact' is 'stays in ascent/descent'.
+        // The variant 'default' means 'compact and elegant'.
+        // As a result, it is not possible to know the variant context from the font alone.
+        // TODO: add 'is_elegant' and 'is_compact' bits to 'style' request.
+
+        // The first time match anything elegant, second time anything not elegant.
+        for (int elegant = 2; elegant --> 0;) {
+            for (int bcp47Index = bcp47Count; bcp47Index --> 0;) {
+                SkLanguage lang(bcp47[bcp47Index]);
+                while (!lang.getTag().isEmpty()) {
+                    SkTypeface_AndroidSystem* matchingTypeface =
+                        find_family_style_character(fFallbackNameToFamilyMap,
+                                                    style, SkToBool(elegant),
+                                                    lang.getTag(), character);
+                    if (matchingTypeface) {
+                        return matchingTypeface;
+                    }
+
+                    lang = lang.getParent();
+                }
+            }
+            SkTypeface_AndroidSystem* matchingTypeface =
+                find_family_style_character(fFallbackNameToFamilyMap,
+                                            style, SkToBool(elegant),
+                                            SkString(), character);
+            if (matchingTypeface) {
+                return matchingTypeface;
+            }
+        }
+        return nullptr;
+    }
+
+    SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const override {
+        return this->createFromStream(new SkMemoryStream(data), ttcIndex);
+    }
+
+    SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const override {
+        SkAutoTDelete<SkStreamAsset> stream(SkStream::NewFromFile(path));
+        return stream.get() ? this->createFromStream(stream.detach(), ttcIndex) : nullptr;
+    }
+
+    SkTypeface* onCreateFromStream(SkStreamAsset* bareStream, int ttcIndex) const override {
+        SkAutoTDelete<SkStreamAsset> stream(bareStream);
+        bool isFixedPitch;
+        SkFontStyle style;
+        SkString name;
+        if (!fScanner.scanFont(stream, ttcIndex, &name, &style, &isFixedPitch, nullptr)) {
+            return nullptr;
+        }
+        SkFontData* data(new SkFontData(stream.detach(), ttcIndex, nullptr, 0));
+        return new SkTypeface_AndroidStream(data, style, isFixedPitch, name);
+    }
+
+    SkTypeface* onCreateFromFontData(SkFontData* data) const override {
+        SkStreamAsset* stream(data->getStream());
+        bool isFixedPitch;
+        SkFontStyle style;
+        SkString name;
+        if (!fScanner.scanFont(stream, data->getIndex(), &name, &style, &isFixedPitch, nullptr)) {
+            return nullptr;
+        }
+        return new SkTypeface_AndroidStream(data, style, isFixedPitch, name);
     }
 
 
     virtual SkTypeface* onLegacyCreateTypeface(const char familyName[],
-                                               unsigned styleBits) const SK_OVERRIDE {
-        SkTypeface::Style oldStyle = (SkTypeface::Style)styleBits;
-        SkFontStyle style = SkFontStyle(oldStyle & SkTypeface::kBold
-                                                 ? SkFontStyle::kBold_Weight
-                                                 : SkFontStyle::kNormal_Weight,
-                                        SkFontStyle::kNormal_Width,
-                                        oldStyle & SkTypeface::kItalic
-                                                 ? SkFontStyle::kItalic_Slant
-                                                 : SkFontStyle::kUpright_Slant);
-        SkTypeface* tf = NULL;
+                                               unsigned styleBits) const override {
+        SkFontStyle style = SkFontStyle(styleBits);
 
-        if (NULL != familyName) {
-            // On Android, we must return NULL when we can't find the requested
+        if (familyName) {
+            // On Android, we must return nullptr when we can't find the requested
             // named typeface so that the system/app can provide their own recovery
             // mechanism. On other platforms we'd provide a typeface from the
             // default family instead.
-            tf = this->onMatchFamilyStyle(familyName, style);
-        } else {
-            tf = fDefaultFamily->matchStyle(style);
+            return this->onMatchFamilyStyle(familyName, style);
         }
-
-        // TODO: double ref? qv matchStyle()
-        return SkSafeRef(tf);
+        return fDefaultFamily->matchStyle(style);
     }
 
 
 private:
 
+    SkTypeface_FreeType::Scanner fScanner;
+
     SkTArray<SkAutoTUnref<SkFontStyleSet_Android>, true> fFontStyleSets;
     SkFontStyleSet* fDefaultFamily;
     SkTypeface* fDefaultTypeface;
 
     SkTDArray<NameToFamily> fNameToFamilyMap;
+    SkTDArray<NameToFamily> fFallbackNameToFamilyMap;
 
     void buildNameToFamilyMap(SkTDArray<FontFamily*> families) {
         for (int i = 0; i < families.count(); i++) {
-            fFontStyleSets.push_back().reset(
-                SkNEW_ARGS(SkFontStyleSet_Android, (families[i])));
-            for (int j = 0; j < families[i]->fNames.count(); j++) {
-                NameToFamily* nextEntry = fNameToFamilyMap.append();
-                SkNEW_PLACEMENT_ARGS(&nextEntry->name, SkString, (families[i]->fNames[j]));
-                nextEntry->styleSet = fFontStyleSets.back().get();
+            FontFamily& family = *families[i];
+
+            SkTDArray<NameToFamily>* nameToFamily = &fNameToFamilyMap;
+            if (family.fIsFallbackFont) {
+                nameToFamily = &fFallbackNameToFamilyMap;
+
+                if (0 == family.fNames.count()) {
+                    SkString& fallbackName = family.fNames.push_back();
+                    fallbackName.printf("%.2x##fallback", i);
+                }
+            }
+
+            SkFontStyleSet_Android* newSet = new SkFontStyleSet_Android(family, fScanner);
+            if (0 == newSet->count()) {
+                delete newSet;
+                continue;
+            }
+            fFontStyleSets.push_back().reset(newSet);
+
+            for (int j = 0; j < family.fNames.count(); j++) {
+                NameToFamily* nextEntry = nameToFamily->append();
+                new (&nextEntry->name) SkString(family.fNames[j]);
+                nextEntry->styleSet = newSet;
             }
         }
     }
@@ -377,18 +549,18 @@ private:
         static const char* gDefaultNames[] = { "sans-serif" };
         for (size_t i = 0; i < SK_ARRAY_COUNT(gDefaultNames); ++i) {
             SkFontStyleSet* set = this->onMatchFamily(gDefaultNames[i]);
-            if (NULL == set) {
+            if (nullptr == set) {
                 continue;
             }
             SkTypeface* tf = set->matchStyle(SkFontStyle());
-            if (NULL == tf) {
+            if (nullptr == tf) {
                 continue;
             }
             fDefaultFamily = set;
             fDefaultTypeface = tf;
             break;
         }
-        if (NULL == fDefaultTypeface) {
+        if (nullptr == fDefaultTypeface) {
             fDefaultFamily = fFontStyleSets[0];
             fDefaultTypeface = fDefaultFamily->createTypeface(0);
         }
@@ -399,8 +571,23 @@ private:
     typedef SkFontMgr INHERITED;
 };
 
-///////////////////////////////////////////////////////////////////////////////
+#ifdef SK_DEBUG
+static char const * const gSystemFontUseStrings[] = {
+    "OnlyCustom", "PreferCustom", "PreferSystem"
+};
+#endif
+SkFontMgr* SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* custom) {
+    if (custom) {
+        SkASSERT(0 <= custom->fSystemFontUse);
+        SkASSERT(custom->fSystemFontUse < SK_ARRAY_COUNT(gSystemFontUseStrings));
+        SkDEBUGF(("SystemFontUse: %s BasePath: %s Fonts: %s FallbackFonts: %s\n",
+                  gSystemFontUseStrings[custom->fSystemFontUse],
+                  custom->fBasePath,
+                  custom->fFontsXml,
+                  custom->fFallbackFontsXml));
+    }
 
-SkFontMgr* SkFontMgr::Factory() {
-    return SkNEW(SkFontMgr_Android);
+    return new SkFontMgr_Android(custom);
 }
+
+#endif//defined(SK_BUILD_FOR_ANDROID)
diff --git a/gfx/skia/skia/src/ports/SkFontMgr_android_factory.cpp b/gfx/skia/skia/src/ports/SkFontMgr_android_factory.cpp
new file mode 100644
index 000000000000..99f654d83859
--- /dev/null
+++ b/gfx/skia/skia/src/ports/SkFontMgr_android_factory.cpp
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_ANDROID)
+
+#include "SkFontMgr.h"
+#include "SkFontMgr_android.h"
+
+// For test only.
+static const char* gTestFontsXml = nullptr;
+static const char* gTestFallbackFontsXml = nullptr;
+static const char* gTestBasePath = nullptr;
+
+void SkUseTestFontConfigFile(const char* fontsXml, const char* fallbackFontsXml,
+                             const char* basePath)
+{
+    gTestFontsXml = fontsXml;
+    gTestFallbackFontsXml = fallbackFontsXml;
+    gTestBasePath = basePath;
+    SkASSERT(gTestFontsXml);
+    SkASSERT(gTestFallbackFontsXml);
+    SkASSERT(gTestBasePath);
+    SkDEBUGF(("Test BasePath: %s Fonts: %s FallbackFonts: %s\n",
+              gTestBasePath, gTestFontsXml, gTestFallbackFontsXml));
+}
+
+SkFontMgr* SkFontMgr::Factory() {
+    // These globals exist so that Chromium can override the environment.
+    // TODO: these globals need to be removed, and Chromium use SkFontMgr_New_Android instead.
+    if ((gTestFontsXml || gTestFallbackFontsXml) && gTestBasePath) {
+        SkFontMgr_Android_CustomFonts custom = {
+            SkFontMgr_Android_CustomFonts::kOnlyCustom,
+            gTestBasePath,
+            gTestFontsXml,
+            gTestFallbackFontsXml
+        };
+        return SkFontMgr_New_Android(&custom);
+    }
+
+    return SkFontMgr_New_Android(nullptr);
+}
+
+#endif//defined(SK_BUILD_FOR_ANDROID)
diff --git a/gfx/skia/skia/src/ports/SkFontMgr_android_parser.cpp b/gfx/skia/skia/src/ports/SkFontMgr_android_parser.cpp
new file mode 100644
index 000000000000..ba2296bffa67
--- /dev/null
+++ b/gfx/skia/skia/src/ports/SkFontMgr_android_parser.cpp
@@ -0,0 +1,799 @@
+/*
+ * Copyright 2011 The Android Open Source Project
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+// Despite the name and location, this is portable code.
+
+#include "SkFontMgr_android_parser.h"
+#include "SkStream.h"
+#include "SkTDArray.h"
+#include "SkTSearch.h"
+#include "SkTemplates.h"
+
+#include <dirent.h>
+#include <expat.h>
+
+#include <stdlib.h>
+#include <string.h>
+
+#define LMP_SYSTEM_FONTS_FILE "/system/etc/fonts.xml"
+#define OLD_SYSTEM_FONTS_FILE "/system/etc/system_fonts.xml"
+#define FALLBACK_FONTS_FILE "/system/etc/fallback_fonts.xml"
+#define VENDOR_FONTS_FILE "/vendor/etc/fallback_fonts.xml"
+
+#define LOCALE_FALLBACK_FONTS_SYSTEM_DIR "/system/etc"
+#define LOCALE_FALLBACK_FONTS_VENDOR_DIR "/vendor/etc"
+#define LOCALE_FALLBACK_FONTS_PREFIX "fallback_fonts-"
+#define LOCALE_FALLBACK_FONTS_SUFFIX ".xml"
+
+#ifndef SK_FONT_FILE_PREFIX
+#    define SK_FONT_FILE_PREFIX "/fonts/"
+#endif
+
+/**
+ * This file contains TWO 'familyset' handlers:
+ * One for JB and earlier which works with
+ *   /system/etc/system_fonts.xml
+ *   /system/etc/fallback_fonts.xml
+ *   /vendor/etc/fallback_fonts.xml
+ *   /system/etc/fallback_fonts-XX.xml
+ *   /vendor/etc/fallback_fonts-XX.xml
+ * and the other for LMP and later which works with
+ *   /system/etc/fonts.xml
+ *
+ * If the 'familyset' 'version' attribute is 21 or higher the LMP parser is used, otherwise the JB.
+ */
+
+struct FamilyData;
+
+struct TagHandler {
+    /** Called at the start tag.
+     *  Called immediately after the parent tag retuns this handler from a call to 'tag'.
+     *  Allows setting up for handling the tag content and processing attributes.
+     *  If nullptr, will not be called.
+     */
+    void (*start)(FamilyData* data, const char* tag, const char** attributes);
+
+    /** Called at the end tag.
+     *  Allows post-processing of any accumulated information.
+     *  This will be the last call made in relation to the current tag.
+     *  If nullptr, will not be called.
+     */
+    void (*end)(FamilyData* data, const char* tag);
+
+    /** Called when a nested tag is encountered.
+     *  This is responsible for determining how to handle the tag.
+     *  If the tag is not recognized, return nullptr to skip the tag.
+     *  If nullptr, all nested tags will be skipped.
+     */
+    const TagHandler* (*tag)(FamilyData* data, const char* tag, const char** attributes);
+
+    /** The character handler for this tag.
+     *  This is only active for character data contained directly in this tag (not sub-tags).
+     *  The first parameter will be castable to a FamilyData*.
+     *  If nullptr, any character data in this tag will be ignored.
+     */
+    XML_CharacterDataHandler chars;
+};
+
+/** Represents the current parsing state. */
+struct FamilyData {
+    FamilyData(XML_Parser parser, SkTDArray<FontFamily*>& families,
+               const SkString& basePath, bool isFallback, const char* filename,
+               const TagHandler* topLevelHandler)
+        : fParser(parser)
+        , fFamilies(families)
+        , fCurrentFamily(nullptr)
+        , fCurrentFontInfo(nullptr)
+        , fVersion(0)
+        , fBasePath(basePath)
+        , fIsFallback(isFallback)
+        , fFilename(filename)
+        , fDepth(1)
+        , fSkip(0)
+        , fHandler(&topLevelHandler, 1)
+    { };
+
+    XML_Parser fParser;                       // The expat parser doing the work, owned by caller
+    SkTDArray<FontFamily*>& fFamilies;        // The array to append families, owned by caller
+    SkAutoTDelete<FontFamily> fCurrentFamily; // The family being created, owned by this
+    FontFileInfo* fCurrentFontInfo;           // The fontInfo being created, owned by fCurrentFamily
+    int fVersion;                             // The version of the file parsed.
+    const SkString& fBasePath;                // The current base path.
+    const bool fIsFallback;                   // Indicates the file being parsed is a fallback file
+    const char* fFilename;                    // The name of the file currently being parsed.
+
+    int fDepth;                               // The current element depth of the parse.
+    int fSkip;                                // The depth to stop skipping, 0 if not skipping.
+    SkTDArray<const TagHandler*> fHandler;    // The stack of current tag handlers.
+};
+
+static bool memeq(const char* s1, const char* s2, size_t n1, size_t n2) {
+    return n1 == n2 && 0 == memcmp(s1, s2, n1);
+}
+#define MEMEQ(c, s, n) memeq(c, s, sizeof(c) - 1, n)
+
+#define ATTS_NON_NULL(a, i) (a[i] != nullptr && a[i+1] != nullptr)
+
+#define SK_FONTMGR_ANDROID_PARSER_PREFIX "[SkFontMgr Android Parser] "
+
+#define SK_FONTCONFIGPARSER_WARNING(message, ...) SkDebugf( \
+    SK_FONTMGR_ANDROID_PARSER_PREFIX "%s:%d:%d: warning: " message "\n", \
+    self->fFilename, \
+    XML_GetCurrentLineNumber(self->fParser), \
+    XML_GetCurrentColumnNumber(self->fParser), \
+    ##__VA_ARGS__);
+
+static bool is_whitespace(char c) {
+    return c == ' ' || c == '\n'|| c == '\r' || c == '\t';
+}
+
+static void trim_string(SkString* s) {
+    char* str = s->writable_str();
+    const char* start = str;  // start is inclusive
+    const char* end = start + s->size();  // end is exclusive
+    while (is_whitespace(*start)) { ++start; }
+    if (start != end) {
+        --end;  // make end inclusive
+        while (is_whitespace(*end)) { --end; }
+        ++end;  // make end exclusive
+    }
+    size_t len = end - start;
+    memmove(str, start, len);
+    s->resize(len);
+}
+
+namespace lmpParser {
+
+static const TagHandler axisHandler = {
+    /*start*/[](FamilyData* self, const char* tag, const char** attributes) {
+        FontFileInfo& file = *self->fCurrentFontInfo;
+        FontFileInfo::Axis& axis = file.fAxes.push_back();
+        for (size_t i = 0; ATTS_NON_NULL(attributes, i); i += 2) {
+            const char* name = attributes[i];
+            const char* value = attributes[i+1];
+            size_t nameLen = strlen(name);
+            if (MEMEQ("tag", name, nameLen)) {
+                size_t valueLen = strlen(value);
+                if (valueLen == 4) {
+                    SkFourByteTag tag = SkSetFourByteTag(value[0], value[1], value[2], value[3]);
+                    for (int j = 0; j < file.fAxes.count() - 1; ++j) {
+                        if (file.fAxes[j].fTag == tag) {
+                            SK_FONTCONFIGPARSER_WARNING("'%c%c%c%c' axis specified more than once",
+                                                        (tag >> 24) & 0xFF,
+                                                        (tag >> 16) & 0xFF,
+                                                        (tag >>  8) & 0xFF,
+                                                        (tag      ) & 0xFF);
+                        }
+                    }
+                    axis.fTag = SkSetFourByteTag(value[0], value[1], value[2], value[3]);
+                } else {
+                    SK_FONTCONFIGPARSER_WARNING("'%s' is an invalid axis tag", value);
+                }
+            } else if (MEMEQ("stylevalue", name, nameLen)) {
+                if (!parse_fixed<16>(value, &axis.fValue)) {
+                    SK_FONTCONFIGPARSER_WARNING("'%s' is an invalid axis stylevalue", value);
+                }
+            }
+        }
+    },
+    /*end*/nullptr,
+    /*tag*/nullptr,
+    /*chars*/nullptr,
+};
+
+static const TagHandler fontHandler = {
+    /*start*/[](FamilyData* self, const char* tag, const char** attributes) {
+        // 'weight' (non-negative integer) [default 0]
+        // 'style' ("normal", "italic") [default "auto"]
+        // 'index' (non-negative integer) [default 0]
+        // The character data should be a filename.
+        FontFileInfo& file = self->fCurrentFamily->fFonts.push_back();
+        self->fCurrentFontInfo = &file;
+        for (size_t i = 0; ATTS_NON_NULL(attributes, i); i += 2) {
+            const char* name = attributes[i];
+            const char* value = attributes[i+1];
+            size_t nameLen = strlen(name);
+            if (MEMEQ("weight", name, nameLen)) {
+                if (!parse_non_negative_integer(value, &file.fWeight)) {
+                    SK_FONTCONFIGPARSER_WARNING("'%s' is an invalid weight", value);
+                }
+            } else if (MEMEQ("style", name, nameLen)) {
+                size_t valueLen = strlen(value);
+                if (MEMEQ("normal", value, valueLen)) {
+                    file.fStyle = FontFileInfo::Style::kNormal;
+                } else if (MEMEQ("italic", value, valueLen)) {
+                    file.fStyle = FontFileInfo::Style::kItalic;
+                }
+            } else if (MEMEQ("index", name, nameLen)) {
+                if (!parse_non_negative_integer(value, &file.fIndex)) {
+                    SK_FONTCONFIGPARSER_WARNING("'%s' is an invalid index", value);
+                }
+            }
+        }
+    },
+    /*end*/[](FamilyData* self, const char* tag) {
+        trim_string(&self->fCurrentFontInfo->fFileName);
+    },
+    /*tag*/[](FamilyData* self, const char* tag, const char** attributes) -> const TagHandler* {
+        size_t len = strlen(tag);
+        if (MEMEQ("axis", tag, len)) {
+            return &axisHandler;
+        }
+        return nullptr;
+    },
+    /*chars*/[](void* data, const char* s, int len) {
+        FamilyData* self = static_cast<FamilyData*>(data);
+        self->fCurrentFontInfo->fFileName.append(s, len);
+    }
+};
+
+static const TagHandler familyHandler = {
+    /*start*/[](FamilyData* self, const char* tag, const char** attributes) {
+        // 'name' (string) [optional]
+        // 'lang' (string) [default ""]
+        // 'variant' ("elegant", "compact") [default "default"]
+        // If there is no name, this is a fallback only font.
+        FontFamily* family = new FontFamily(self->fBasePath, true);
+        self->fCurrentFamily.reset(family);
+        for (size_t i = 0; ATTS_NON_NULL(attributes, i); i += 2) {
+            const char* name = attributes[i];
+            const char* value = attributes[i+1];
+            size_t nameLen = strlen(name);
+            size_t valueLen = strlen(value);
+            if (MEMEQ("name", name, nameLen)) {
+                SkAutoAsciiToLC tolc(value);
+                family->fNames.push_back().set(tolc.lc());
+                family->fIsFallbackFont = false;
+            } else if (MEMEQ("lang", name, nameLen)) {
+                family->fLanguage = SkLanguage(value, valueLen);
+            } else if (MEMEQ("variant", name, nameLen)) {
+                if (MEMEQ("elegant", value, valueLen)) {
+                    family->fVariant = kElegant_FontVariant;
+                } else if (MEMEQ("compact", value, valueLen)) {
+                    family->fVariant = kCompact_FontVariant;
+                }
+            }
+        }
+    },
+    /*end*/[](FamilyData* self, const char* tag) {
+        *self->fFamilies.append() = self->fCurrentFamily.detach();
+    },
+    /*tag*/[](FamilyData* self, const char* tag, const char** attributes) -> const TagHandler* {
+        size_t len = strlen(tag);
+        if (MEMEQ("font", tag, len)) {
+            return &fontHandler;
+        }
+        return nullptr;
+    },
+    /*chars*/nullptr,
+};
+
+static FontFamily* find_family(FamilyData* self, const SkString& familyName) {
+    for (int i = 0; i < self->fFamilies.count(); i++) {
+        FontFamily* candidate = self->fFamilies[i];
+        for (int j = 0; j < candidate->fNames.count(); j++) {
+            if (candidate->fNames[j] == familyName) {
+                return candidate;
+            }
+        }
+    }
+    return nullptr;
+}
+
+static const TagHandler aliasHandler = {
+    /*start*/[](FamilyData* self, const char* tag, const char** attributes) {
+        // 'name' (string) introduces a new family name.
+        // 'to' (string) specifies which (previous) family to alias
+        // 'weight' (non-negative integer) [optional]
+        // If it *does not* have a weight, 'name' is an alias for the entire 'to' family.
+        // If it *does* have a weight, 'name' is a new family consisting of
+        // the font(s) with 'weight' from the 'to' family.
+
+        SkString aliasName;
+        SkString to;
+        int weight = 0;
+        for (size_t i = 0; ATTS_NON_NULL(attributes, i); i += 2) {
+            const char* name = attributes[i];
+            const char* value = attributes[i+1];
+            size_t nameLen = strlen(name);
+            if (MEMEQ("name", name, nameLen)) {
+                SkAutoAsciiToLC tolc(value);
+                aliasName.set(tolc.lc());
+            } else if (MEMEQ("to", name, nameLen)) {
+                to.set(value);
+            } else if (MEMEQ("weight", name, nameLen)) {
+                if (!parse_non_negative_integer(value, &weight)) {
+                    SK_FONTCONFIGPARSER_WARNING("'%s' is an invalid weight", value);
+                }
+            }
+        }
+
+        // Assumes that the named family is already declared
+        FontFamily* targetFamily = find_family(self, to);
+        if (!targetFamily) {
+            SK_FONTCONFIGPARSER_WARNING("'%s' alias target not found", to.c_str());
+            return;
+        }
+
+        if (weight) {
+            FontFamily* family = new FontFamily(targetFamily->fBasePath, self->fIsFallback);
+            family->fNames.push_back().set(aliasName);
+
+            for (int i = 0; i < targetFamily->fFonts.count(); i++) {
+                if (targetFamily->fFonts[i].fWeight == weight) {
+                    family->fFonts.push_back(targetFamily->fFonts[i]);
+                }
+            }
+            *self->fFamilies.append() = family;
+        } else {
+            targetFamily->fNames.push_back().set(aliasName);
+        }
+    },
+    /*end*/nullptr,
+    /*tag*/nullptr,
+    /*chars*/nullptr,
+};
+
+static const TagHandler familySetHandler = {
+    /*start*/[](FamilyData* self, const char* tag, const char** attributes) { },
+    /*end*/nullptr,
+    /*tag*/[](FamilyData* self, const char* tag, const char** attributes) -> const TagHandler* {
+        size_t len = strlen(tag);
+        if (MEMEQ("family", tag, len)) {
+            return &familyHandler;
+        } else if (MEMEQ("alias", tag, len)) {
+            return &aliasHandler;
+        }
+        return nullptr;
+    },
+    /*chars*/nullptr,
+};
+
+} // lmpParser
+
+namespace jbParser {
+
+static const TagHandler fileHandler = {
+    /*start*/[](FamilyData* self, const char* tag, const char** attributes) {
+        // 'variant' ("elegant", "compact") [default "default"]
+        // 'lang' (string) [default ""]
+        // 'index' (non-negative integer) [default 0]
+        // The character data should be a filename.
+        FontFamily& currentFamily = *self->fCurrentFamily.get();
+        FontFileInfo& newFileInfo = currentFamily.fFonts.push_back();
+        if (attributes) {
+            for (size_t i = 0; ATTS_NON_NULL(attributes, i); i += 2) {
+                const char* name = attributes[i];
+                const char* value = attributes[i+1];
+                size_t nameLen = strlen(name);
+                size_t valueLen = strlen(value);
+                if (MEMEQ("variant", name, nameLen)) {
+                    const FontVariant prevVariant = currentFamily.fVariant;
+                    if (MEMEQ("elegant", value, valueLen)) {
+                        currentFamily.fVariant = kElegant_FontVariant;
+                    } else if (MEMEQ("compact", value, valueLen)) {
+                        currentFamily.fVariant = kCompact_FontVariant;
+                    }
+                    if (currentFamily.fFonts.count() > 1 && currentFamily.fVariant != prevVariant) {
+                        SK_FONTCONFIGPARSER_WARNING("'%s' unexpected variant found\n"
+                            "Note: Every font file within a family must have identical variants.",
+                            value);
+                    }
+
+                } else if (MEMEQ("lang", name, nameLen)) {
+                    SkLanguage prevLang = currentFamily.fLanguage;
+                    currentFamily.fLanguage = SkLanguage(value, valueLen);
+                    if (currentFamily.fFonts.count() > 1 && currentFamily.fLanguage != prevLang) {
+                        SK_FONTCONFIGPARSER_WARNING("'%s' unexpected language found\n"
+                            "Note: Every font file within a family must have identical languages.",
+                            value);
+                    }
+
+                } else if (MEMEQ("index", name, nameLen)) {
+                    if (!parse_non_negative_integer(value, &newFileInfo.fIndex)) {
+                        SK_FONTCONFIGPARSER_WARNING("'%s' is an invalid index", value);
+                    }
+                }
+            }
+        }
+        self->fCurrentFontInfo = &newFileInfo;
+    },
+    /*end*/nullptr,
+    /*tag*/nullptr,
+    /*chars*/[](void* data, const char* s, int len) {
+        FamilyData* self = static_cast<FamilyData*>(data);
+        self->fCurrentFontInfo->fFileName.append(s, len);
+    }
+};
+
+static const TagHandler fileSetHandler = {
+    /*start*/nullptr,
+    /*end*/nullptr,
+    /*tag*/[](FamilyData* self, const char* tag, const char** attributes) -> const TagHandler* {
+        size_t len = strlen(tag);
+        if (MEMEQ("file", tag, len)) {
+            return &fileHandler;
+        }
+        return nullptr;
+    },
+    /*chars*/nullptr,
+};
+
+static const TagHandler nameHandler = {
+    /*start*/[](FamilyData* self, const char* tag, const char** attributes) {
+        // The character data should be a name for the font.
+        self->fCurrentFamily->fNames.push_back();
+    },
+    /*end*/nullptr,
+    /*tag*/nullptr,
+    /*chars*/[](void* data, const char* s, int len) {
+        FamilyData* self = static_cast<FamilyData*>(data);
+        SkAutoAsciiToLC tolc(s, len);
+        self->fCurrentFamily->fNames.back().append(tolc.lc(), len);
+    }
+};
+
+static const TagHandler nameSetHandler = {
+    /*start*/nullptr,
+    /*end*/nullptr,
+    /*tag*/[](FamilyData* self, const char* tag, const char** attributes) -> const TagHandler* {
+        size_t len = strlen(tag);
+        if (MEMEQ("name", tag, len)) {
+            return &nameHandler;
+        }
+        return nullptr;
+    },
+    /*chars*/nullptr,
+};
+
+static const TagHandler familyHandler = {
+    /*start*/[](FamilyData* self, const char* tag, const char** attributes) {
+        self->fCurrentFamily.reset(new FontFamily(self->fBasePath, self->fIsFallback));
+        // 'order' (non-negative integer) [default -1]
+        for (size_t i = 0; ATTS_NON_NULL(attributes, i); i += 2) {
+            const char* value = attributes[i+1];
+            parse_non_negative_integer(value, &self->fCurrentFamily->fOrder);
+        }
+    },
+    /*end*/[](FamilyData* self, const char* tag) {
+        *self->fFamilies.append() = self->fCurrentFamily.detach();
+    },
+    /*tag*/[](FamilyData* self, const char* tag, const char** attributes) -> const TagHandler* {
+        size_t len = strlen(tag);
+        if (MEMEQ("nameset", tag, len)) {
+            return &nameSetHandler;
+        } else if (MEMEQ("fileset", tag, len)) {
+            return &fileSetHandler;
+        }
+        return nullptr;
+    },
+    /*chars*/nullptr,
+};
+
+static const TagHandler familySetHandler = {
+    /*start*/nullptr,
+    /*end*/nullptr,
+    /*tag*/[](FamilyData* self, const char* tag, const char** attributes) -> const TagHandler* {
+        size_t len = strlen(tag);
+        if (MEMEQ("family", tag, len)) {
+            return &familyHandler;
+        }
+        return nullptr;
+    },
+    /*chars*/nullptr,
+};
+
+} // namespace jbParser
+
+static const TagHandler topLevelHandler = {
+    /*start*/nullptr,
+    /*end*/nullptr,
+    /*tag*/[](FamilyData* self, const char* tag, const char** attributes) -> const TagHandler* {
+        size_t len = strlen(tag);
+        if (MEMEQ("familyset", tag, len)) {
+            // 'version' (non-negative integer) [default 0]
+            for (size_t i = 0; ATTS_NON_NULL(attributes, i); i += 2) {
+                const char* name = attributes[i];
+                size_t nameLen = strlen(name);
+                if (MEMEQ("version", name, nameLen)) {
+                    const char* value = attributes[i+1];
+                    if (parse_non_negative_integer(value, &self->fVersion)) {
+                        if (self->fVersion >= 21) {
+                            return &lmpParser::familySetHandler;
+                        }
+                    }
+                }
+            }
+            return &jbParser::familySetHandler;
+        }
+        return nullptr;
+    },
+    /*chars*/nullptr,
+};
+
+static void XMLCALL start_element_handler(void *data, const char *tag, const char **attributes) {
+    FamilyData* self = static_cast<FamilyData*>(data);
+
+    if (!self->fSkip) {
+        const TagHandler* parent = self->fHandler.top();
+        const TagHandler* child = parent->tag ? parent->tag(self, tag, attributes) : nullptr;
+        if (child) {
+            if (child->start) {
+                child->start(self, tag, attributes);
+            }
+            self->fHandler.push(child);
+            XML_SetCharacterDataHandler(self->fParser, child->chars);
+        } else {
+            SK_FONTCONFIGPARSER_WARNING("'%s' tag not recognized, skipping", tag);
+            XML_SetCharacterDataHandler(self->fParser, nullptr);
+            self->fSkip = self->fDepth;
+        }
+    }
+
+    ++self->fDepth;
+}
+
+static void XMLCALL end_element_handler(void* data, const char* tag) {
+    FamilyData* self = static_cast<FamilyData*>(data);
+    --self->fDepth;
+
+    if (!self->fSkip) {
+        const TagHandler* child = self->fHandler.top();
+        if (child->end) {
+            child->end(self, tag);
+        }
+        self->fHandler.pop();
+        const TagHandler* parent = self->fHandler.top();
+        XML_SetCharacterDataHandler(self->fParser, parent->chars);
+    }
+
+    if (self->fSkip == self->fDepth) {
+        self->fSkip = 0;
+        const TagHandler* parent = self->fHandler.top();
+        XML_SetCharacterDataHandler(self->fParser, parent->chars);
+    }
+}
+
+static void XMLCALL xml_entity_decl_handler(void *data,
+                                            const XML_Char *entityName,
+                                            int is_parameter_entity,
+                                            const XML_Char *value,
+                                            int value_length,
+                                            const XML_Char *base,
+                                            const XML_Char *systemId,
+                                            const XML_Char *publicId,
+                                            const XML_Char *notationName)
+{
+    FamilyData* self = static_cast<FamilyData*>(data);
+    SK_FONTCONFIGPARSER_WARNING("'%s' entity declaration found, stopping processing", entityName);
+    XML_StopParser(self->fParser, XML_FALSE);
+}
+
+static const XML_Memory_Handling_Suite sk_XML_alloc = {
+    sk_malloc_throw,
+    sk_realloc_throw,
+    sk_free
+};
+
+template<typename T> struct remove_ptr {typedef T type;};
+template<typename T> struct remove_ptr<T*> {typedef T type;};
+
+/**
+ * This function parses the given filename and stores the results in the given
+ * families array. Returns the version of the file, negative if the file does not exist.
+ */
+static int parse_config_file(const char* filename, SkTDArray<FontFamily*>& families,
+                             const SkString& basePath, bool isFallback)
+{
+    SkFILEStream file(filename);
+
+    // Some of the files we attempt to parse (in particular, /vendor/etc/fallback_fonts.xml)
+    // are optional - failure here is okay because one of these optional files may not exist.
+    if (!file.isValid()) {
+        SkDebugf(SK_FONTMGR_ANDROID_PARSER_PREFIX "'%s' could not be opened\n", filename);
+        return -1;
+    }
+
+    SkAutoTCallVProc<remove_ptr<XML_Parser>::type, XML_ParserFree> parser(
+        XML_ParserCreate_MM(nullptr, &sk_XML_alloc, nullptr));
+    if (!parser) {
+        SkDebugf(SK_FONTMGR_ANDROID_PARSER_PREFIX "could not create XML parser\n");
+        return -1;
+    }
+
+    FamilyData self(parser, families, basePath, isFallback, filename, &topLevelHandler);
+    XML_SetUserData(parser, &self);
+
+    // Disable entity processing, to inhibit internal entity expansion. See expat CVE-2013-0340
+    XML_SetEntityDeclHandler(parser, xml_entity_decl_handler);
+
+    // Start parsing oldschool; switch these in flight if we detect a newer version of the file.
+    XML_SetElementHandler(parser, start_element_handler, end_element_handler);
+
+    // One would assume it would be faster to have a buffer on the stack and call XML_Parse.
+    // But XML_Parse will call XML_GetBuffer anyway and memmove the passed buffer into it.
+    // (Unless XML_CONTEXT_BYTES is undefined, but all users define it.)
+    // In debug, buffer a small odd number of bytes to detect slicing in XML_CharacterDataHandler.
+    static const int bufferSize = 512 SkDEBUGCODE( - 507);
+    bool done = false;
+    while (!done) {
+        void* buffer = XML_GetBuffer(parser, bufferSize);
+        if (!buffer) {
+            SkDebugf(SK_FONTMGR_ANDROID_PARSER_PREFIX "could not buffer enough to continue\n");
+            return -1;
+        }
+        size_t len = file.read(buffer, bufferSize);
+        done = file.isAtEnd();
+        XML_Status status = XML_ParseBuffer(parser, len, done);
+        if (XML_STATUS_ERROR == status) {
+            XML_Error error = XML_GetErrorCode(parser);
+            int line = XML_GetCurrentLineNumber(parser);
+            int column = XML_GetCurrentColumnNumber(parser);
+            const XML_LChar* errorString = XML_ErrorString(error);
+            SkDebugf(SK_FONTMGR_ANDROID_PARSER_PREFIX "%s:%d:%d error %d: %s.\n",
+                     filename, line, column, error, errorString);
+            return -1;
+        }
+    }
+    return self.fVersion;
+}
+
+/** Returns the version of the system font file actually found, negative if none. */
+static int append_system_font_families(SkTDArray<FontFamily*>& fontFamilies,
+                                       const SkString& basePath)
+{
+    int initialCount = fontFamilies.count();
+    int version = parse_config_file(LMP_SYSTEM_FONTS_FILE, fontFamilies, basePath, false);
+    if (version < 0 || fontFamilies.count() == initialCount) {
+        version = parse_config_file(OLD_SYSTEM_FONTS_FILE, fontFamilies, basePath, false);
+    }
+    return version;
+}
+
+/**
+ * In some versions of Android prior to Android 4.2 (JellyBean MR1 at API
+ * Level 17) the fallback fonts for certain locales were encoded in their own
+ * XML files with a suffix that identified the locale.  We search the provided
+ * directory for those files,add all of their entries to the fallback chain, and
+ * include the locale as part of each entry.
+ */
+static void append_fallback_font_families_for_locale(SkTDArray<FontFamily*>& fallbackFonts,
+                                                     const char* dir,
+                                                     const SkString& basePath)
+{
+#if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
+    // The framework is beyond Android 4.2 and can therefore skip this function
+    return;
+#endif
+
+    SkAutoTCallIProc<DIR, closedir> fontDirectory(opendir(dir));
+    if (nullptr == fontDirectory) {
+        return;
+    }
+
+    for (struct dirent* dirEntry; (dirEntry = readdir(fontDirectory));) {
+        // The size of the prefix and suffix.
+        static const size_t fixedLen = sizeof(LOCALE_FALLBACK_FONTS_PREFIX) - 1
+                                     + sizeof(LOCALE_FALLBACK_FONTS_SUFFIX) - 1;
+
+        // The size of the prefix, suffix, and a minimum valid language code
+        static const size_t minSize = fixedLen + 2;
+
+        SkString fileName(dirEntry->d_name);
+        if (fileName.size() < minSize ||
+            !fileName.startsWith(LOCALE_FALLBACK_FONTS_PREFIX) ||
+            !fileName.endsWith(LOCALE_FALLBACK_FONTS_SUFFIX))
+        {
+            continue;
+        }
+
+        SkString locale(fileName.c_str() + sizeof(LOCALE_FALLBACK_FONTS_PREFIX) - 1,
+                        fileName.size() - fixedLen);
+
+        SkString absoluteFilename;
+        absoluteFilename.printf("%s/%s", dir, fileName.c_str());
+
+        SkTDArray<FontFamily*> langSpecificFonts;
+        parse_config_file(absoluteFilename.c_str(), langSpecificFonts, basePath, true);
+
+        for (int i = 0; i < langSpecificFonts.count(); ++i) {
+            FontFamily* family = langSpecificFonts[i];
+            family->fLanguage = SkLanguage(locale);
+            *fallbackFonts.append() = family;
+        }
+    }
+}
+
+static void append_system_fallback_font_families(SkTDArray<FontFamily*>& fallbackFonts,
+                                                 const SkString& basePath)
+{
+    parse_config_file(FALLBACK_FONTS_FILE, fallbackFonts, basePath, true);
+    append_fallback_font_families_for_locale(fallbackFonts,
+                                             LOCALE_FALLBACK_FONTS_SYSTEM_DIR,
+                                             basePath);
+}
+
+static void mixin_vendor_fallback_font_families(SkTDArray<FontFamily*>& fallbackFonts,
+                                                const SkString& basePath)
+{
+    SkTDArray<FontFamily*> vendorFonts;
+    parse_config_file(VENDOR_FONTS_FILE, vendorFonts, basePath, true);
+    append_fallback_font_families_for_locale(vendorFonts,
+                                             LOCALE_FALLBACK_FONTS_VENDOR_DIR,
+                                             basePath);
+
+    // This loop inserts the vendor fallback fonts in the correct order in the
+    // overall fallbacks list.
+    int currentOrder = -1;
+    for (int i = 0; i < vendorFonts.count(); ++i) {
+        FontFamily* family = vendorFonts[i];
+        int order = family->fOrder;
+        if (order < 0) {
+            if (currentOrder < 0) {
+                // Default case - just add it to the end of the fallback list
+                *fallbackFonts.append() = family;
+            } else {
+                // no order specified on this font, but we're incrementing the order
+                // based on an earlier order insertion request
+                *fallbackFonts.insert(currentOrder++) = family;
+            }
+        } else {
+            // Add the font into the fallback list in the specified order. Set
+            // currentOrder for correct placement of other fonts in the vendor list.
+            *fallbackFonts.insert(order) = family;
+            currentOrder = order + 1;
+        }
+    }
+}
+
+void SkFontMgr_Android_Parser::GetSystemFontFamilies(SkTDArray<FontFamily*>& fontFamilies) {
+    // Version 21 of the system font configuration does not need any fallback configuration files.
+    SkString basePath(getenv("ANDROID_ROOT"));
+    basePath.append(SK_FONT_FILE_PREFIX, sizeof(SK_FONT_FILE_PREFIX) - 1);
+
+    if (append_system_font_families(fontFamilies, basePath) >= 21) {
+        return;
+    }
+
+    // Append all the fallback fonts to system fonts
+    SkTDArray<FontFamily*> fallbackFonts;
+    append_system_fallback_font_families(fallbackFonts, basePath);
+    mixin_vendor_fallback_font_families(fallbackFonts, basePath);
+    fontFamilies.append(fallbackFonts.count(), fallbackFonts.begin());
+}
+
+void SkFontMgr_Android_Parser::GetCustomFontFamilies(SkTDArray<FontFamily*>& fontFamilies,
+                                                     const SkString& basePath,
+                                                     const char* fontsXml,
+                                                     const char* fallbackFontsXml,
+                                                     const char* langFallbackFontsDir)
+{
+    if (fontsXml) {
+        parse_config_file(fontsXml, fontFamilies, basePath, false);
+    }
+    if (fallbackFontsXml) {
+        parse_config_file(fallbackFontsXml, fontFamilies, basePath, true);
+    }
+    if (langFallbackFontsDir) {
+        append_fallback_font_families_for_locale(fontFamilies,
+                                                 langFallbackFontsDir,
+                                                 basePath);
+    }
+}
+
+SkLanguage SkLanguage::getParent() const {
+    SkASSERT(!fTag.isEmpty());
+    const char* tag = fTag.c_str();
+
+    // strip off the rightmost "-.*"
+    const char* parentTagEnd = strrchr(tag, '-');
+    if (parentTagEnd == nullptr) {
+        return SkLanguage();
+    }
+    size_t parentTagLen = parentTagEnd - tag;
+    return SkLanguage(tag, parentTagLen);
+}
diff --git a/gfx/skia/skia/src/ports/SkFontMgr_android_parser.h b/gfx/skia/skia/src/ports/SkFontMgr_android_parser.h
new file mode 100644
index 000000000000..aca1573952d1
--- /dev/null
+++ b/gfx/skia/skia/src/ports/SkFontMgr_android_parser.h
@@ -0,0 +1,218 @@
+/*
+ * Copyright 2011 The Android Open Source Project
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkFontMgr_android_parser_DEFINED
+#define SkFontMgr_android_parser_DEFINED
+
+#include "SkFixed.h"
+#include "SkString.h"
+#include "SkTArray.h"
+#include "SkTDArray.h"
+#include "SkTypes.h"
+
+#include <climits>
+#include <limits>
+
+/** \class SkLanguage
+
+    The SkLanguage class represents a human written language, and is used by
+    text draw operations to determine which glyph to draw when drawing
+    characters with variants (ie Han-derived characters).
+*/
+class SkLanguage {
+public:
+    SkLanguage() { }
+    SkLanguage(const SkString& tag) : fTag(tag) { }
+    SkLanguage(const char* tag) : fTag(tag) { }
+    SkLanguage(const char* tag, size_t len) : fTag(tag, len) { }
+    SkLanguage(const SkLanguage& b) : fTag(b.fTag) { }
+
+    /** Gets a BCP 47 language identifier for this SkLanguage.
+        @return a BCP 47 language identifier representing this language
+    */
+    const SkString& getTag() const { return fTag; }
+
+    /** Performs BCP 47 fallback to return an SkLanguage one step more general.
+        @return an SkLanguage one step more general
+    */
+    SkLanguage getParent() const;
+
+    bool operator==(const SkLanguage& b) const {
+        return fTag == b.fTag;
+    }
+    bool operator!=(const SkLanguage& b) const {
+        return fTag != b.fTag;
+    }
+    SkLanguage& operator=(const SkLanguage& b) {
+        fTag = b.fTag;
+        return *this;
+    }
+
+private:
+    //! BCP 47 language identifier
+    SkString fTag;
+};
+
+enum FontVariants {
+   kDefault_FontVariant = 0x01,
+   kCompact_FontVariant = 0x02,
+   kElegant_FontVariant = 0x04,
+   kLast_FontVariant = kElegant_FontVariant,
+};
+typedef uint32_t FontVariant;
+
+// Must remain trivially movable (can be memmoved).
+struct FontFileInfo {
+    FontFileInfo() : fIndex(0), fWeight(0), fStyle(Style::kAuto) { }
+
+    SkString fFileName;
+    int fIndex;
+    int fWeight;
+    enum class Style { kAuto, kNormal, kItalic } fStyle;
+    struct Axis {
+        Axis() : fTag(SkSetFourByteTag('\0','\0','\0','\0')), fValue(0) { }
+        SkFourByteTag fTag;
+        SkFixed fValue;
+    };
+    SkTArray<Axis, true> fAxes;
+};
+
+/**
+ * A font family provides one or more names for a collection of fonts, each of
+ * which has a different style (normal, italic) or weight (thin, light, bold,
+ * etc).
+ * Some fonts may occur in compact variants for use in the user interface.
+ * Android distinguishes "fallback" fonts to support non-ASCII character sets.
+ */
+struct FontFamily {
+    FontFamily(const SkString& basePath, bool isFallbackFont)
+        : fVariant(kDefault_FontVariant)
+        , fOrder(-1)
+        , fIsFallbackFont(isFallbackFont)
+        , fBasePath(basePath)
+    { }
+
+    SkTArray<SkString, true> fNames;
+    SkTArray<FontFileInfo, true> fFonts;
+    SkLanguage fLanguage;
+    FontVariant fVariant;
+    int fOrder; // internal to the parser, not useful to users.
+    bool fIsFallbackFont;
+    const SkString fBasePath;
+};
+
+namespace SkFontMgr_Android_Parser {
+
+/** Parses system font configuration files and appends result to fontFamilies. */
+void GetSystemFontFamilies(SkTDArray<FontFamily*>& fontFamilies);
+
+/** Parses font configuration files and appends result to fontFamilies. */
+void GetCustomFontFamilies(SkTDArray<FontFamily*>& fontFamilies,
+                           const SkString& basePath,
+                           const char* fontsXml,
+                           const char* fallbackFontsXml,
+                           const char* langFallbackFontsDir = nullptr);
+
+} // SkFontMgr_Android_Parser namespace
+
+
+/** Parses a null terminated string into an integer type, checking for overflow.
+ *  http://www.w3.org/TR/html-markup/datatypes.html#common.data.integer.non-negative-def
+ *
+ *  If the string cannot be parsed into 'value', returns false and does not change 'value'.
+ */
+template <typename T> static bool parse_non_negative_integer(const char* s, T* value) {
+    static_assert(std::numeric_limits<T>::is_integer, "T_must_be_integer");
+
+    if (*s == '\0') {
+        return false;
+    }
+
+    const T nMax = std::numeric_limits<T>::max() / 10;
+    const T dMax = std::numeric_limits<T>::max() - (nMax * 10);
+    T n = 0;
+    for (; *s; ++s) {
+        // Check if digit
+        if (*s < '0' || '9' < *s) {
+            return false;
+        }
+        T d = *s - '0';
+        // Check for overflow
+        if (n > nMax || (n == nMax && d > dMax)) {
+            return false;
+        }
+        n = (n * 10) + d;
+    }
+    *value = n;
+    return true;
+}
+
+/** Parses a null terminated string into a signed fixed point value with bias N.
+ *
+ *  Like http://www.w3.org/TR/html-markup/datatypes.html#common.data.float-def ,
+ *  but may start with '.' and does not support 'e'. '-?((:digit:+(.:digit:+)?)|(.:digit:+))'
+ *
+ *  Checks for overflow.
+ *  Low bit rounding is not defined (is currently truncate).
+ *  Bias (N) required to allow for the sign bit and 4 bits of integer.
+ *
+ *  If the string cannot be parsed into 'value', returns false and does not change 'value'.
+ */
+template <int N, typename T> static bool parse_fixed(const char* s, T* value) {
+    static_assert(std::numeric_limits<T>::is_integer, "T_must_be_integer");
+    static_assert(std::numeric_limits<T>::is_signed, "T_must_be_signed");
+    static_assert(sizeof(T) * CHAR_BIT - N >= 5, "N_must_leave_four_bits_plus_sign");
+
+    bool negate = false;
+    if (*s == '-') {
+        ++s;
+        negate = true;
+    }
+    if (*s == '\0') {
+        return false;
+    }
+
+    const T nMax = (std::numeric_limits<T>::max() >> N) / 10;
+    const T dMax = (std::numeric_limits<T>::max() >> N) - (nMax * 10);
+    T n = 0;
+    T frac = 0;
+    for (; *s; ++s) {
+        // Check if digit
+        if (*s < '0' || '9' < *s) {
+            // If it wasn't a digit, check if it is a '.' followed by something.
+            if (*s != '.' || s[1] == '\0') {
+                return false;
+            }
+            // Find the end, verify digits.
+            for (++s; *s; ++s) {
+                if (*s < '0' || '9' < *s) {
+                    return false;
+                }
+            }
+            // Read back toward the '.'.
+            for (--s; *s != '.'; --s) {
+                T d = *s - '0';
+                frac = (frac + (d << N)) / 10; // This requires four bits overhead.
+            }
+            break;
+        }
+        T d = *s - '0';
+        // Check for overflow
+        if (n > nMax || (n == nMax && d > dMax)) {
+            return false;
+        }
+        n = (n * 10) + d;
+    }
+    if (negate) {
+        n = -n;
+        frac = -frac;
+    }
+    *value = (n << N) + frac;
+    return true;
+}
+
+#endif /* SkFontMgr_android_parser_DEFINED */
diff --git a/gfx/skia/skia/src/ports/SkFontMgr_custom.cpp b/gfx/skia/skia/src/ports/SkFontMgr_custom.cpp
new file mode 100644
index 000000000000..7f3ce6b03208
--- /dev/null
+++ b/gfx/skia/skia/src/ports/SkFontMgr_custom.cpp
@@ -0,0 +1,508 @@
+/*
+ * Copyright 2006 The Android Open Source Project
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkFontDescriptor.h"
+#include "SkFontHost_FreeType_common.h"
+#include "SkFontMgr.h"
+#include "SkFontMgr_custom.h"
+#include "SkFontStyle.h"
+#include "SkOSFile.h"
+#include "SkRefCnt.h"
+#include "SkStream.h"
+#include "SkString.h"
+#include "SkTArray.h"
+#include "SkTemplates.h"
+#include "SkTypeface.h"
+#include "SkTypefaceCache.h"
+#include "SkTypes.h"
+
+#include <limits>
+
+class SkData;
+
+/** The base SkTypeface implementation for the custom font manager. */
+class SkTypeface_Custom : public SkTypeface_FreeType {
+public:
+    SkTypeface_Custom(const SkFontStyle& style, bool isFixedPitch,
+                      bool sysFont, const SkString familyName, int index)
+        : INHERITED(style, SkTypefaceCache::NewFontID(), isFixedPitch)
+        , fIsSysFont(sysFont), fFamilyName(familyName), fIndex(index)
+    { }
+
+    bool isSysFont() const { return fIsSysFont; }
+
+protected:
+    void onGetFamilyName(SkString* familyName) const override {
+        *familyName = fFamilyName;
+    }
+
+    void onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const override {
+        desc->setFamilyName(fFamilyName.c_str());
+        *isLocal = !this->isSysFont();
+    }
+
+    int getIndex() const { return fIndex; }
+
+private:
+    const bool fIsSysFont;
+    const SkString fFamilyName;
+    const int fIndex;
+
+    typedef SkTypeface_FreeType INHERITED;
+};
+
+/** The empty SkTypeface implementation for the custom font manager.
+ *  Used as the last resort fallback typeface.
+ */
+class SkTypeface_Empty : public SkTypeface_Custom {
+public:
+    SkTypeface_Empty() : INHERITED(SkFontStyle(), false, true, SkString(), 0) {}
+
+protected:
+    SkStreamAsset* onOpenStream(int*) const override { return nullptr; }
+
+private:
+    typedef SkTypeface_Custom INHERITED;
+};
+
+/** The stream SkTypeface implementation for the custom font manager. */
+class SkTypeface_Stream : public SkTypeface_Custom {
+public:
+    SkTypeface_Stream(const SkFontStyle& style, bool isFixedPitch, bool sysFont,
+                      const SkString familyName, SkStreamAsset* stream, int index)
+        : INHERITED(style, isFixedPitch, sysFont, familyName, index)
+        , fStream(stream)
+    { }
+
+protected:
+    SkStreamAsset* onOpenStream(int* ttcIndex) const override {
+        *ttcIndex = this->getIndex();
+        return fStream->duplicate();
+    }
+
+private:
+    const SkAutoTDelete<const SkStreamAsset> fStream;
+
+    typedef SkTypeface_Custom INHERITED;
+};
+
+/** The file SkTypeface implementation for the custom font manager. */
+class SkTypeface_File : public SkTypeface_Custom {
+public:
+    SkTypeface_File(const SkFontStyle& style, bool isFixedPitch, bool sysFont,
+                    const SkString familyName, const char path[], int index)
+        : INHERITED(style, isFixedPitch, sysFont, familyName, index)
+        , fPath(path)
+    { }
+
+protected:
+    SkStreamAsset* onOpenStream(int* ttcIndex) const override {
+        *ttcIndex = this->getIndex();
+        return SkStream::NewFromFile(fPath.c_str());
+    }
+
+private:
+    SkString fPath;
+
+    typedef SkTypeface_Custom INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ *  SkFontStyleSet_Custom
+ *
+ *  This class is used by SkFontMgr_Custom to hold SkTypeface_Custom families.
+ */
+class SkFontStyleSet_Custom : public SkFontStyleSet {
+public:
+    explicit SkFontStyleSet_Custom(const SkString familyName) : fFamilyName(familyName) { }
+
+    /** Should only be called during the inital build phase. */
+    void appendTypeface(SkTypeface_Custom* typeface) {
+        fStyles.push_back().reset(typeface);
+    }
+
+    int count() override {
+        return fStyles.count();
+    }
+
+    void getStyle(int index, SkFontStyle* style, SkString* name) override {
+        SkASSERT(index < fStyles.count());
+        bool bold = fStyles[index]->isBold();
+        bool italic = fStyles[index]->isItalic();
+        *style = SkFontStyle(bold ? SkFontStyle::kBold_Weight : SkFontStyle::kNormal_Weight,
+                             SkFontStyle::kNormal_Width,
+                             italic ? SkFontStyle::kItalic_Slant : SkFontStyle::kUpright_Slant);
+        name->reset();
+    }
+
+    SkTypeface* createTypeface(int index) override {
+        SkASSERT(index < fStyles.count());
+        return SkRef(fStyles[index].get());
+    }
+
+    static int match_score(const SkFontStyle& pattern, const SkFontStyle& candidate) {
+        int score = 0;
+        score += (pattern.width() - candidate.width()) * 100;
+        score += (pattern.isItalic() == candidate.isItalic()) ? 0 : 1000;
+        score += pattern.weight() - candidate.weight();
+        return score;
+    }
+
+    SkTypeface* matchStyle(const SkFontStyle& pattern) override {
+        if (0 == fStyles.count()) {
+            return nullptr;
+        }
+
+        SkTypeface_Custom* closest = fStyles[0];
+        int minScore = std::numeric_limits<int>::max();
+        for (int i = 0; i < fStyles.count(); ++i) {
+            bool bold = fStyles[i]->isBold();
+            bool italic = fStyles[i]->isItalic();
+            SkFontStyle style = SkFontStyle(bold ? SkFontStyle::kBold_Weight
+                                                 : SkFontStyle::kNormal_Weight,
+                                            SkFontStyle::kNormal_Width,
+                                            italic ? SkFontStyle::kItalic_Slant
+                                                   : SkFontStyle::kUpright_Slant);
+
+            int score = match_score(pattern, style);
+            if (score < minScore) {
+                closest = fStyles[i];
+                minScore = score;
+            }
+        }
+        return SkRef(closest);
+    }
+
+    SkString getFamilyName() { return fFamilyName; }
+
+private:
+    SkTArray<SkAutoTUnref<SkTypeface_Custom>, true> fStyles;
+    SkString fFamilyName;
+
+    friend class SkFontMgr_Custom;
+};
+
+/**
+ *  SkFontMgr_Custom
+ *
+ *  This class is essentially a collection of SkFontStyleSet_Custom,
+ *  one SkFontStyleSet_Custom for each family. This class may be modified
+ *  to load fonts from any source by changing the initialization.
+ */
+class SkFontMgr_Custom : public SkFontMgr {
+public:
+    typedef SkTArray<SkAutoTUnref<SkFontStyleSet_Custom>, true> Families;
+    class SystemFontLoader {
+    public:
+        virtual ~SystemFontLoader() { }
+        virtual void loadSystemFonts(const SkTypeface_FreeType::Scanner&, Families*) const = 0;
+    };
+    explicit SkFontMgr_Custom(const SystemFontLoader& loader) : fDefaultFamily(nullptr) {
+        loader.loadSystemFonts(fScanner, &fFamilies);
+
+        // Try to pick a default font.
+        static const char* defaultNames[] = {
+            "Arial", "Verdana", "Times New Roman", "Droid Sans", nullptr
+        };
+        for (size_t i = 0; i < SK_ARRAY_COUNT(defaultNames); ++i) {
+            SkFontStyleSet_Custom* set = this->onMatchFamily(defaultNames[i]);
+            if (nullptr == set) {
+                continue;
+            }
+
+            SkTypeface* tf = set->matchStyle(SkFontStyle(SkFontStyle::kNormal_Weight,
+                                                         SkFontStyle::kNormal_Width,
+                                                         SkFontStyle::kUpright_Slant));
+            if (nullptr == tf) {
+                continue;
+            }
+
+            fDefaultFamily = set;
+            break;
+        }
+        if (nullptr == fDefaultFamily) {
+            fDefaultFamily = fFamilies[0];
+        }
+    }
+
+protected:
+    int onCountFamilies() const override {
+        return fFamilies.count();
+    }
+
+    void onGetFamilyName(int index, SkString* familyName) const override {
+        SkASSERT(index < fFamilies.count());
+        familyName->set(fFamilies[index]->getFamilyName());
+    }
+
+    SkFontStyleSet_Custom* onCreateStyleSet(int index) const override {
+        SkASSERT(index < fFamilies.count());
+        return SkRef(fFamilies[index].get());
+    }
+
+    SkFontStyleSet_Custom* onMatchFamily(const char familyName[]) const override {
+        for (int i = 0; i < fFamilies.count(); ++i) {
+            if (fFamilies[i]->getFamilyName().equals(familyName)) {
+                return SkRef(fFamilies[i].get());
+            }
+        }
+        return nullptr;
+    }
+
+    SkTypeface* onMatchFamilyStyle(const char familyName[],
+                                   const SkFontStyle& fontStyle) const override
+    {
+        SkAutoTUnref<SkFontStyleSet> sset(this->matchFamily(familyName));
+        return sset->matchStyle(fontStyle);
+    }
+
+    SkTypeface* onMatchFamilyStyleCharacter(const char familyName[], const SkFontStyle&,
+                                            const char* bcp47[], int bcp47Count,
+                                            SkUnichar character) const override
+    {
+        return nullptr;
+    }
+
+    SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember,
+                                 const SkFontStyle& fontStyle) const override
+    {
+        for (int i = 0; i < fFamilies.count(); ++i) {
+            for (int j = 0; j < fFamilies[i]->fStyles.count(); ++j) {
+                if (fFamilies[i]->fStyles[j] == familyMember) {
+                    return fFamilies[i]->matchStyle(fontStyle);
+                }
+            }
+        }
+        return nullptr;
+    }
+
+    SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const override {
+        return this->createFromStream(new SkMemoryStream(data), ttcIndex);
+    }
+
+    SkTypeface* onCreateFromStream(SkStreamAsset* bareStream, int ttcIndex) const override {
+        SkAutoTDelete<SkStreamAsset> stream(bareStream);
+        if (nullptr == stream || stream->getLength() <= 0) {
+            return nullptr;
+        }
+
+        bool isFixedPitch;
+        SkFontStyle style;
+        SkString name;
+        if (fScanner.scanFont(stream, ttcIndex, &name, &style, &isFixedPitch, nullptr)) {
+            return new SkTypeface_Stream(style, isFixedPitch, false, name, stream.detach(),
+                                         ttcIndex);
+        } else {
+            return nullptr;
+        }
+    }
+
+    SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const override {
+        SkAutoTDelete<SkStreamAsset> stream(SkStream::NewFromFile(path));
+        return stream.get() ? this->createFromStream(stream.detach(), ttcIndex) : nullptr;
+    }
+
+    SkTypeface* onLegacyCreateTypeface(const char familyName[], unsigned styleBits) const override {
+        SkTypeface::Style oldStyle = (SkTypeface::Style)styleBits;
+        SkFontStyle style = SkFontStyle(oldStyle & SkTypeface::kBold
+                                                 ? SkFontStyle::kBold_Weight
+                                                 : SkFontStyle::kNormal_Weight,
+                                        SkFontStyle::kNormal_Width,
+                                        oldStyle & SkTypeface::kItalic
+                                                 ? SkFontStyle::kItalic_Slant
+                                                 : SkFontStyle::kUpright_Slant);
+        SkTypeface* tf = nullptr;
+
+        if (familyName) {
+            tf = this->onMatchFamilyStyle(familyName, style);
+        }
+
+        if (nullptr == tf) {
+            tf = fDefaultFamily->matchStyle(style);
+        }
+
+        return SkSafeRef(tf);
+    }
+
+private:
+    Families fFamilies;
+    SkFontStyleSet_Custom* fDefaultFamily;
+    SkTypeface_FreeType::Scanner fScanner;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+class DirectorySystemFontLoader : public SkFontMgr_Custom::SystemFontLoader {
+public:
+    DirectorySystemFontLoader(const char* dir) : fBaseDirectory(dir) { }
+
+    void loadSystemFonts(const SkTypeface_FreeType::Scanner& scanner,
+                         SkFontMgr_Custom::Families* families) const override
+    {
+        load_directory_fonts(scanner, fBaseDirectory, ".ttf", families);
+        load_directory_fonts(scanner, fBaseDirectory, ".ttc", families);
+        load_directory_fonts(scanner, fBaseDirectory, ".otf", families);
+        load_directory_fonts(scanner, fBaseDirectory, ".pfb", families);
+
+        if (families->empty()) {
+            SkFontStyleSet_Custom* family = new SkFontStyleSet_Custom(SkString());
+            families->push_back().reset(family);
+            family->appendTypeface(new SkTypeface_Empty);
+        }
+    }
+
+private:
+    static SkFontStyleSet_Custom* find_family(SkFontMgr_Custom::Families& families,
+                                              const char familyName[])
+    {
+       for (int i = 0; i < families.count(); ++i) {
+            if (families[i]->getFamilyName().equals(familyName)) {
+                return families[i].get();
+            }
+        }
+        return nullptr;
+    }
+
+    static void load_directory_fonts(const SkTypeface_FreeType::Scanner& scanner,
+                                     const SkString& directory, const char* suffix,
+                                     SkFontMgr_Custom::Families* families)
+    {
+        SkOSFile::Iter iter(directory.c_str(), suffix);
+        SkString name;
+
+        while (iter.next(&name, false)) {
+            SkString filename(SkOSPath::Join(directory.c_str(), name.c_str()));
+            SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(filename.c_str()));
+            if (!stream.get()) {
+                SkDebugf("---- failed to open <%s>\n", filename.c_str());
+                continue;
+            }
+
+            int numFaces;
+            if (!scanner.recognizedFont(stream, &numFaces)) {
+                SkDebugf("---- failed to open <%s> as a font\n", filename.c_str());
+                continue;
+            }
+
+            for (int faceIndex = 0; faceIndex < numFaces; ++faceIndex) {
+                bool isFixedPitch;
+                SkString realname;
+                SkFontStyle style = SkFontStyle(); // avoid uninitialized warning
+                if (!scanner.scanFont(stream, faceIndex, &realname, &style, &isFixedPitch, nullptr)) {
+                    SkDebugf("---- failed to open <%s> <%d> as a font\n",
+                             filename.c_str(), faceIndex);
+                    continue;
+                }
+
+                SkTypeface_Custom* tf = new SkTypeface_File(style, isFixedPitch,
+                                                            true,  // system-font (cannot delete)
+                                                            realname, filename.c_str(), faceIndex);
+
+                SkFontStyleSet_Custom* addTo = find_family(*families, realname.c_str());
+                if (nullptr == addTo) {
+                    addTo = new SkFontStyleSet_Custom(realname);
+                    families->push_back().reset(addTo);
+                }
+                addTo->appendTypeface(tf);
+            }
+        }
+
+        SkOSFile::Iter dirIter(directory.c_str());
+        while (dirIter.next(&name, true)) {
+            if (name.startsWith(".")) {
+                continue;
+            }
+            SkString dirname(SkOSPath::Join(directory.c_str(), name.c_str()));
+            load_directory_fonts(scanner, dirname, suffix, families);
+        }
+    }
+
+    SkString fBaseDirectory;
+};
+
+SK_API SkFontMgr* SkFontMgr_New_Custom_Directory(const char* dir) {
+    return new SkFontMgr_Custom(DirectorySystemFontLoader(dir));
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+struct SkEmbeddedResource { const uint8_t* data; size_t size; };
+struct SkEmbeddedResourceHeader { const SkEmbeddedResource* entries; int count; };
+
+class EmbeddedSystemFontLoader : public SkFontMgr_Custom::SystemFontLoader {
+public:
+    EmbeddedSystemFontLoader(const SkEmbeddedResourceHeader* header) : fHeader(header) { }
+
+    void loadSystemFonts(const SkTypeface_FreeType::Scanner& scanner,
+                         SkFontMgr_Custom::Families* families) const override
+    {
+        for (int i = 0; i < fHeader->count; ++i) {
+            const SkEmbeddedResource& fontEntry = fHeader->entries[i];
+            load_embedded_font(scanner, fontEntry.data, fontEntry.size, i, families);
+        }
+
+        if (families->empty()) {
+            SkFontStyleSet_Custom* family = new SkFontStyleSet_Custom(SkString());
+            families->push_back().reset(family);
+            family->appendTypeface(new SkTypeface_Empty);
+        }
+    }
+
+private:
+    static SkFontStyleSet_Custom* find_family(SkFontMgr_Custom::Families& families,
+                                              const char familyName[])
+    {
+       for (int i = 0; i < families.count(); ++i) {
+            if (families[i]->getFamilyName().equals(familyName)) {
+                return families[i].get();
+            }
+        }
+        return nullptr;
+    }
+
+    static void load_embedded_font(const SkTypeface_FreeType::Scanner& scanner,
+                                   const uint8_t* data, size_t size, int index,
+                                   SkFontMgr_Custom::Families* families)
+    {
+        SkAutoTDelete<SkMemoryStream> stream(new SkMemoryStream(data, size, false));
+
+        int numFaces;
+        if (!scanner.recognizedFont(stream, &numFaces)) {
+            SkDebugf("---- failed to open <%d> as a font\n", index);
+            return;
+        }
+
+        for (int faceIndex = 0; faceIndex < numFaces; ++faceIndex) {
+            bool isFixedPitch;
+            SkString realname;
+            SkFontStyle style = SkFontStyle(); // avoid uninitialized warning
+            if (!scanner.scanFont(stream, faceIndex, &realname, &style, &isFixedPitch, nullptr)) {
+                SkDebugf("---- failed to open <%d> <%d> as a font\n", index, faceIndex);
+                return;
+            }
+
+            SkTypeface_Custom* tf =
+                    new SkTypeface_Stream(style, isFixedPitch, true,  // system-font (cannot delete)
+                                          realname, stream.detach(), faceIndex);
+
+            SkFontStyleSet_Custom* addTo = find_family(*families, realname.c_str());
+            if (nullptr == addTo) {
+                addTo = new SkFontStyleSet_Custom(realname);
+                families->push_back().reset(addTo);
+            }
+            addTo->appendTypeface(tf);
+        }
+    }
+
+    const SkEmbeddedResourceHeader* fHeader;
+};
+
+SkFontMgr* SkFontMgr_New_Custom_Embedded(const SkEmbeddedResourceHeader* header) {
+    return new SkFontMgr_Custom(EmbeddedSystemFontLoader(header));
+}
diff --git a/gfx/skia/skia/src/ports/SkFontMgr_custom_directory_factory.cpp b/gfx/skia/skia/src/ports/SkFontMgr_custom_directory_factory.cpp
new file mode 100644
index 000000000000..0ca6f4b3b4b6
--- /dev/null
+++ b/gfx/skia/skia/src/ports/SkFontMgr_custom_directory_factory.cpp
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkFontMgr.h"
+#include "SkFontMgr_custom.h"
+
+#ifndef SK_FONT_FILE_PREFIX
+#    define SK_FONT_FILE_PREFIX "/usr/share/fonts/"
+#endif
+
+SkFontMgr* SkFontMgr::Factory() {
+    return SkFontMgr_New_Custom_Directory(SK_FONT_FILE_PREFIX);
+}
diff --git a/gfx/skia/skia/src/ports/SkFontMgr_custom_embedded_factory.cpp b/gfx/skia/skia/src/ports/SkFontMgr_custom_embedded_factory.cpp
new file mode 100644
index 000000000000..6ea6a2d2af22
--- /dev/null
+++ b/gfx/skia/skia/src/ports/SkFontMgr_custom_embedded_factory.cpp
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkFontMgr.h"
+
+struct SkEmbeddedResource { const uint8_t* data; size_t size; };
+struct SkEmbeddedResourceHeader { const SkEmbeddedResource* entries; int count; };
+SkFontMgr* SkFontMgr_New_Custom_Embedded(const SkEmbeddedResourceHeader* header);
+
+extern "C" const SkEmbeddedResourceHeader SK_EMBEDDED_FONTS;
+SkFontMgr* SkFontMgr::Factory() {
+    return SkFontMgr_New_Custom_Embedded(&SK_EMBEDDED_FONTS);
+}
diff --git a/gfx/skia/skia/src/ports/SkFontMgr_default_dw.cpp b/gfx/skia/skia/src/ports/SkFontMgr_default_dw.cpp
deleted file mode 100644
index e9ad295d6d72..000000000000
--- a/gfx/skia/skia/src/ports/SkFontMgr_default_dw.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "SkFontMgr.h"
-#include "SkTypeface_win.h"
-
-SkFontMgr* SkFontMgr::Factory() {
-    return SkFontMgr_New_DirectWrite();
-}
diff --git a/gfx/skia/skia/src/ports/SkFontMgr_default_gdi.cpp b/gfx/skia/skia/src/ports/SkFontMgr_default_gdi.cpp
deleted file mode 100644
index c39ab8112029..000000000000
--- a/gfx/skia/skia/src/ports/SkFontMgr_default_gdi.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "SkFontMgr.h"
-#include "SkTypeface_win.h"
-
-SkFontMgr* SkFontMgr::Factory() {
-    return SkFontMgr_New_GDI();
-}
diff --git a/gfx/skia/skia/src/ports/SkFontHost_none.cpp b/gfx/skia/skia/src/ports/SkFontMgr_empty_factory.cpp
similarity index 67%
rename from gfx/skia/skia/src/ports/SkFontHost_none.cpp
rename to gfx/skia/skia/src/ports/SkFontMgr_empty_factory.cpp
index f76910d97ff1..b4232cde1270 100644
--- a/gfx/skia/skia/src/ports/SkFontHost_none.cpp
+++ b/gfx/skia/skia/src/ports/SkFontMgr_empty_factory.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2008 The Android Open Source Project
  *
@@ -7,9 +6,8 @@
  */
 
 #include "SkFontMgr.h"
-#include "SkScalerContext.h"
 
 SkFontMgr* SkFontMgr::Factory() {
-    // Always return NULL, an empty SkFontMgr will be used.
-    return NULL;
+    // Always return nullptr, an empty SkFontMgr will be used.
+    return nullptr;
 }
diff --git a/gfx/skia/skia/src/ports/SkFontMgr_fontconfig.cpp b/gfx/skia/skia/src/ports/SkFontMgr_fontconfig.cpp
new file mode 100644
index 000000000000..88d4de59297b
--- /dev/null
+++ b/gfx/skia/skia/src/ports/SkFontMgr_fontconfig.cpp
@@ -0,0 +1,882 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkDataTable.h"
+#include "SkFixed.h"
+#include "SkFontDescriptor.h"
+#include "SkFontHost_FreeType_common.h"
+#include "SkFontMgr.h"
+#include "SkFontStyle.h"
+#include "SkMath.h"
+#include "SkMutex.h"
+#include "SkOSFile.h"
+#include "SkRefCnt.h"
+#include "SkStream.h"
+#include "SkString.h"
+#include "SkTDArray.h"
+#include "SkTemplates.h"
+#include "SkTypeface.h"
+#include "SkTypefaceCache.h"
+#include "SkTypes.h"
+
+#include <fontconfig/fontconfig.h>
+#include <string.h>
+
+class SkData;
+
+// FC_POSTSCRIPT_NAME was added with b561ff20 which ended up in 2.10.92
+// Ubuntu 12.04 is on 2.8.0, 13.10 is on 2.10.93
+// Debian 7 is on 2.9.0, 8 is on 2.11
+// OpenSUSE 12.2 is on 2.9.0, 12.3 is on 2.10.2, 13.1 2.11.0
+// Fedora 19 is on 2.10.93
+#ifndef FC_POSTSCRIPT_NAME
+#    define FC_POSTSCRIPT_NAME  "postscriptname"
+#endif
+
+#ifdef SK_DEBUG
+#    include "SkTLS.h"
+#endif
+
+/** Since FontConfig is poorly documented, this gives a high level overview:
+ *
+ *  FcConfig is a handle to a FontConfig configuration instance. Each 'configuration' is independent
+ *  from any others which may exist. There exists a default global configuration which is created
+ *  and destroyed by FcInit and FcFini, but this default should not normally be used.
+ *  Instead, one should use FcConfigCreate and FcInit* to have a named local state.
+ *
+ *  FcPatterns are {objectName -> [element]} (maps from object names to a list of elements).
+ *  Each element is some internal data plus an FcValue which is a variant (a union with a type tag).
+ *  Lists of elements are not typed, except by convention. Any collection of FcValues must be
+ *  assumed to be heterogeneous by the code, but the code need not do anything particularly
+ *  interesting if the values go against convention.
+ *
+ *  Somewhat like DirectWrite, FontConfig supports synthetics through FC_EMBOLDEN and FC_MATRIX.
+ *  Like all synthetic information, such information must be passed with the font data.
+ */
+
+namespace {
+
+// Fontconfig is not threadsafe before 2.10.91. Before that, we lock with a global mutex.
+// See https://bug.skia.org/1497 for background.
+SK_DECLARE_STATIC_MUTEX(gFCMutex);
+
+#ifdef SK_DEBUG
+void* CreateThreadFcLocked() { return new bool(false); }
+void DeleteThreadFcLocked(void* v) { delete static_cast<bool*>(v); }
+#   define THREAD_FC_LOCKED \
+        static_cast<bool*>(SkTLS::Get(CreateThreadFcLocked, DeleteThreadFcLocked))
+#endif
+
+struct FCLocker {
+    // Assume FcGetVersion() has always been thread safe.
+
+    FCLocker() {
+        if (FcGetVersion() < 21091) {
+            gFCMutex.acquire();
+        } else {
+            SkDEBUGCODE(bool* threadLocked = THREAD_FC_LOCKED);
+            SkASSERT(false == *threadLocked);
+            SkDEBUGCODE(*threadLocked = true);
+        }
+    }
+
+    ~FCLocker() {
+        AssertHeld();
+        if (FcGetVersion() < 21091) {
+            gFCMutex.release();
+        } else {
+            SkDEBUGCODE(*THREAD_FC_LOCKED = false);
+        }
+    }
+
+    static void AssertHeld() { SkDEBUGCODE(
+        if (FcGetVersion() < 21091) {
+            gFCMutex.assertHeld();
+        } else {
+            SkASSERT(true == *THREAD_FC_LOCKED);
+        }
+    ) }
+};
+
+} // namespace
+
+template<typename T, void (*D)(T*)> void FcTDestroy(T* t) {
+    FCLocker::AssertHeld();
+    D(t);
+}
+template <typename T, T* (*C)(), void (*D)(T*)> class SkAutoFc
+    : public SkAutoTCallVProc<T, FcTDestroy<T, D> > {
+public:
+    SkAutoFc() : SkAutoTCallVProc<T, FcTDestroy<T, D> >(C()) {
+        T* obj = this->operator T*();
+        SK_ALWAYSBREAK(nullptr != obj);
+    }
+    explicit SkAutoFc(T* obj) : SkAutoTCallVProc<T, FcTDestroy<T, D> >(obj) {}
+};
+
+typedef SkAutoFc<FcCharSet, FcCharSetCreate, FcCharSetDestroy> SkAutoFcCharSet;
+typedef SkAutoFc<FcConfig, FcConfigCreate, FcConfigDestroy> SkAutoFcConfig;
+typedef SkAutoFc<FcFontSet, FcFontSetCreate, FcFontSetDestroy> SkAutoFcFontSet;
+typedef SkAutoFc<FcLangSet, FcLangSetCreate, FcLangSetDestroy> SkAutoFcLangSet;
+typedef SkAutoFc<FcObjectSet, FcObjectSetCreate, FcObjectSetDestroy> SkAutoFcObjectSet;
+typedef SkAutoFc<FcPattern, FcPatternCreate, FcPatternDestroy> SkAutoFcPattern;
+
+static int get_int(FcPattern* pattern, const char object[], int missing) {
+    int value;
+    if (FcPatternGetInteger(pattern, object, 0, &value) != FcResultMatch) {
+        return missing;
+    }
+    return value;
+}
+
+static const char* get_string(FcPattern* pattern, const char object[], const char* missing = "") {
+    FcChar8* value;
+    if (FcPatternGetString(pattern, object, 0, &value) != FcResultMatch) {
+        return missing;
+    }
+    return (const char*)value;
+}
+
+enum SkWeakReturn {
+    kIsWeak_WeakReturn,
+    kIsStrong_WeakReturn,
+    kNoId_WeakReturn
+};
+/** Ideally there  would exist a call like
+ *  FcResult FcPatternIsWeak(pattern, object, id, FcBool* isWeak);
+ *
+ *  However, there is no such call and as of Fc 2.11.0 even FcPatternEquals ignores the weak bit.
+ *  Currently, the only reliable way of finding the weak bit is by its effect on matching.
+ *  The weak bit only affects the matching of FC_FAMILY and FC_POSTSCRIPT_NAME object values.
+ *  A element with the weak bit is scored after FC_LANG, without the weak bit is scored before.
+ *  Note that the weak bit is stored on the element, not on the value it holds.
+ */
+static SkWeakReturn is_weak(FcPattern* pattern, const char object[], int id) {
+    FCLocker::AssertHeld();
+
+    FcResult result;
+
+    // Create a copy of the pattern with only the value 'pattern'['object'['id']] in it.
+    // Internally, FontConfig pattern objects are linked lists, so faster to remove from head.
+    SkAutoFcObjectSet requestedObjectOnly(FcObjectSetBuild(object, nullptr));
+    SkAutoFcPattern minimal(FcPatternFilter(pattern, requestedObjectOnly));
+    FcBool hasId = true;
+    for (int i = 0; hasId && i < id; ++i) {
+        hasId = FcPatternRemove(minimal, object, 0);
+    }
+    if (!hasId) {
+        return kNoId_WeakReturn;
+    }
+    FcValue value;
+    result = FcPatternGet(minimal, object, 0, &value);
+    if (result != FcResultMatch) {
+        return kNoId_WeakReturn;
+    }
+    while (hasId) {
+        hasId = FcPatternRemove(minimal, object, 1);
+    }
+
+    // Create a font set with two patterns.
+    // 1. the same 'object' as minimal and a lang object with only 'nomatchlang'.
+    // 2. a different 'object' from minimal and a lang object with only 'matchlang'.
+    SkAutoFcFontSet fontSet;
+
+    SkAutoFcLangSet strongLangSet;
+    FcLangSetAdd(strongLangSet, (const FcChar8*)"nomatchlang");
+    SkAutoFcPattern strong(FcPatternDuplicate(minimal));
+    FcPatternAddLangSet(strong, FC_LANG, strongLangSet);
+
+    SkAutoFcLangSet weakLangSet;
+    FcLangSetAdd(weakLangSet, (const FcChar8*)"matchlang");
+    SkAutoFcPattern weak;
+    FcPatternAddString(weak, object, (const FcChar8*)"nomatchstring");
+    FcPatternAddLangSet(weak, FC_LANG, weakLangSet);
+
+    FcFontSetAdd(fontSet, strong.detach());
+    FcFontSetAdd(fontSet, weak.detach());
+
+    // Add 'matchlang' to the copy of the pattern.
+    FcPatternAddLangSet(minimal, FC_LANG, weakLangSet);
+
+    // Run a match against the copy of the pattern.
+    // If the 'id' was weak, then we should match the pattern with 'matchlang'.
+    // If the 'id' was strong, then we should match the pattern with 'nomatchlang'.
+
+    // Note that this config is only used for FcFontRenderPrepare, which we don't even want.
+    // However, there appears to be no way to match/sort without it.
+    SkAutoFcConfig config;
+    FcFontSet* fontSets[1] = { fontSet };
+    SkAutoFcPattern match(FcFontSetMatch(config, fontSets, SK_ARRAY_COUNT(fontSets),
+                                         minimal, &result));
+
+    FcLangSet* matchLangSet;
+    FcPatternGetLangSet(match, FC_LANG, 0, &matchLangSet);
+    return FcLangEqual == FcLangSetHasLang(matchLangSet, (const FcChar8*)"matchlang")
+                        ? kIsWeak_WeakReturn : kIsStrong_WeakReturn;
+}
+
+/** Removes weak elements from either FC_FAMILY or FC_POSTSCRIPT_NAME objects in the property.
+ *  This can be quite expensive, and should not be used more than once per font lookup.
+ *  This removes all of the weak elements after the last strong element.
+ */
+static void remove_weak(FcPattern* pattern, const char object[]) {
+    FCLocker::AssertHeld();
+
+    SkAutoFcObjectSet requestedObjectOnly(FcObjectSetBuild(object, nullptr));
+    SkAutoFcPattern minimal(FcPatternFilter(pattern, requestedObjectOnly));
+
+    int lastStrongId = -1;
+    int numIds;
+    SkWeakReturn result;
+    for (int id = 0; ; ++id) {
+        result = is_weak(minimal, object, 0);
+        if (kNoId_WeakReturn == result) {
+            numIds = id;
+            break;
+        }
+        if (kIsStrong_WeakReturn == result) {
+            lastStrongId = id;
+        }
+        SkAssertResult(FcPatternRemove(minimal, object, 0));
+    }
+
+    // If they were all weak, then leave the pattern alone.
+    if (lastStrongId < 0) {
+        return;
+    }
+
+    // Remove everything after the last strong.
+    for (int id = lastStrongId + 1; id < numIds; ++id) {
+        SkAssertResult(FcPatternRemove(pattern, object, lastStrongId + 1));
+    }
+}
+
+static int map_range(SkFixed value,
+                     SkFixed old_min, SkFixed old_max,
+                     SkFixed new_min, SkFixed new_max)
+{
+    SkASSERT(old_min < old_max);
+    SkASSERT(new_min <= new_max);
+    return new_min + SkMulDiv(value - old_min, new_max - new_min, old_max - old_min);
+}
+
+static int ave(SkFixed a, SkFixed b) {
+    return SkFixedAve(a, b);
+}
+
+struct MapRanges {
+    SkFixed old_val;
+    SkFixed new_val;
+};
+
+static SkFixed map_ranges_fixed(SkFixed val, MapRanges const ranges[], int rangesCount) {
+    // -Inf to [0]
+    if (val < ranges[0].old_val) {
+        return ranges[0].new_val;
+    }
+
+    // Linear from [i] to ave([i], [i+1]), then from ave([i], [i+1]) to [i+1]
+    for (int i = 0; i < rangesCount - 1; ++i) {
+        if (val < ave(ranges[i].old_val, ranges[i+1].old_val)) {
+            return map_range(val, ranges[i].old_val, ave(ranges[i].old_val, ranges[i+1].old_val),
+                                  ranges[i].new_val, ave(ranges[i].new_val, ranges[i+1].new_val));
+        }
+        if (val < ranges[i+1].old_val) {
+            return map_range(val, ave(ranges[i].old_val, ranges[i+1].old_val), ranges[i+1].old_val,
+                                  ave(ranges[i].new_val, ranges[i+1].new_val), ranges[i+1].new_val);
+        }
+    }
+
+    // From [n] to +Inf
+    // if (fcweight < Inf)
+    return ranges[rangesCount-1].new_val;
+}
+
+static int map_ranges(int val, MapRanges const ranges[], int rangesCount) {
+    return SkFixedRoundToInt(map_ranges_fixed(SkIntToFixed(val), ranges, rangesCount));
+}
+
+template<int n> struct SkTFixed {
+    static_assert(-32768 <= n && n <= 32767, "SkTFixed_n_not_in_range");
+    static const SkFixed value = static_cast<SkFixed>(n << 16);
+};
+
+static SkFontStyle skfontstyle_from_fcpattern(FcPattern* pattern) {
+    typedef SkFontStyle SkFS;
+
+    static const MapRanges weightRanges[] = {
+        { SkTFixed<FC_WEIGHT_THIN>::value,       SkTFixed<SkFS::kThin_Weight>::value },
+        { SkTFixed<FC_WEIGHT_EXTRALIGHT>::value, SkTFixed<SkFS::kExtraLight_Weight>::value },
+        { SkTFixed<FC_WEIGHT_LIGHT>::value,      SkTFixed<SkFS::kLight_Weight>::value },
+        { SkTFixed<FC_WEIGHT_REGULAR>::value,    SkTFixed<SkFS::kNormal_Weight>::value },
+        { SkTFixed<FC_WEIGHT_MEDIUM>::value,     SkTFixed<SkFS::kMedium_Weight>::value },
+        { SkTFixed<FC_WEIGHT_DEMIBOLD>::value,   SkTFixed<SkFS::kSemiBold_Weight>::value },
+        { SkTFixed<FC_WEIGHT_BOLD>::value,       SkTFixed<SkFS::kBold_Weight>::value },
+        { SkTFixed<FC_WEIGHT_EXTRABOLD>::value,  SkTFixed<SkFS::kExtraBold_Weight>::value },
+        { SkTFixed<FC_WEIGHT_BLACK>::value,      SkTFixed<SkFS::kBlack_Weight>::value },
+        { SkTFixed<FC_WEIGHT_EXTRABLACK>::value, SkTFixed<1000>::value },
+    };
+    int weight = map_ranges(get_int(pattern, FC_WEIGHT, FC_WEIGHT_REGULAR),
+                            weightRanges, SK_ARRAY_COUNT(weightRanges));
+
+    static const MapRanges widthRanges[] = {
+        { SkTFixed<FC_WIDTH_ULTRACONDENSED>::value, SkTFixed<SkFS::kUltraCondensed_Width>::value },
+        { SkTFixed<FC_WIDTH_EXTRACONDENSED>::value, SkTFixed<SkFS::kExtraCondensed_Width>::value },
+        { SkTFixed<FC_WIDTH_CONDENSED>::value,      SkTFixed<SkFS::kCondensed_Width>::value },
+        { SkTFixed<FC_WIDTH_SEMICONDENSED>::value,  SkTFixed<SkFS::kSemiCondensed_Width>::value },
+        { SkTFixed<FC_WIDTH_NORMAL>::value,         SkTFixed<SkFS::kNormal_Width>::value },
+        { SkTFixed<FC_WIDTH_SEMIEXPANDED>::value,   SkTFixed<SkFS::kSemiExpanded_Width>::value },
+        { SkTFixed<FC_WIDTH_EXPANDED>::value,       SkTFixed<SkFS::kExpanded_Width>::value },
+        { SkTFixed<FC_WIDTH_EXTRAEXPANDED>::value,  SkTFixed<SkFS::kExtraExpanded_Width>::value },
+        { SkTFixed<FC_WIDTH_ULTRAEXPANDED>::value,  SkTFixed<SkFS::kUltaExpanded_Width>::value },
+    };
+    int width = map_ranges(get_int(pattern, FC_WIDTH, FC_WIDTH_NORMAL),
+                           widthRanges, SK_ARRAY_COUNT(widthRanges));
+
+    SkFS::Slant slant = get_int(pattern, FC_SLANT, FC_SLANT_ROMAN) > 0
+                             ? SkFS::kItalic_Slant
+                             : SkFS::kUpright_Slant;
+
+    return SkFontStyle(weight, width, slant);
+}
+
+static void fcpattern_from_skfontstyle(SkFontStyle style, FcPattern* pattern) {
+    FCLocker::AssertHeld();
+
+    typedef SkFontStyle SkFS;
+
+    static const MapRanges weightRanges[] = {
+        { SkTFixed<SkFS::kThin_Weight>::value,       SkTFixed<FC_WEIGHT_THIN>::value },
+        { SkTFixed<SkFS::kExtraLight_Weight>::value, SkTFixed<FC_WEIGHT_EXTRALIGHT>::value },
+        { SkTFixed<SkFS::kLight_Weight>::value,      SkTFixed<FC_WEIGHT_LIGHT>::value },
+        { SkTFixed<SkFS::kNormal_Weight>::value,     SkTFixed<FC_WEIGHT_REGULAR>::value },
+        { SkTFixed<SkFS::kMedium_Weight>::value,     SkTFixed<FC_WEIGHT_MEDIUM>::value },
+        { SkTFixed<SkFS::kSemiBold_Weight>::value,   SkTFixed<FC_WEIGHT_DEMIBOLD>::value },
+        { SkTFixed<SkFS::kBold_Weight>::value,       SkTFixed<FC_WEIGHT_BOLD>::value },
+        { SkTFixed<SkFS::kExtraBold_Weight>::value,  SkTFixed<FC_WEIGHT_EXTRABOLD>::value },
+        { SkTFixed<SkFS::kBlack_Weight>::value,      SkTFixed<FC_WEIGHT_BLACK>::value },
+        { SkTFixed<1000>::value,                     SkTFixed<FC_WEIGHT_EXTRABLACK>::value },
+    };
+    int weight = map_ranges(style.weight(), weightRanges, SK_ARRAY_COUNT(weightRanges));
+
+    static const MapRanges widthRanges[] = {
+        { SkTFixed<SkFS::kUltraCondensed_Width>::value, SkTFixed<FC_WIDTH_ULTRACONDENSED>::value },
+        { SkTFixed<SkFS::kExtraCondensed_Width>::value, SkTFixed<FC_WIDTH_EXTRACONDENSED>::value },
+        { SkTFixed<SkFS::kCondensed_Width>::value,      SkTFixed<FC_WIDTH_CONDENSED>::value },
+        { SkTFixed<SkFS::kSemiCondensed_Width>::value,  SkTFixed<FC_WIDTH_SEMICONDENSED>::value },
+        { SkTFixed<SkFS::kNormal_Width>::value,         SkTFixed<FC_WIDTH_NORMAL>::value },
+        { SkTFixed<SkFS::kSemiExpanded_Width>::value,   SkTFixed<FC_WIDTH_SEMIEXPANDED>::value },
+        { SkTFixed<SkFS::kExpanded_Width>::value,       SkTFixed<FC_WIDTH_EXPANDED>::value },
+        { SkTFixed<SkFS::kExtraExpanded_Width>::value,  SkTFixed<FC_WIDTH_EXTRAEXPANDED>::value },
+        { SkTFixed<SkFS::kUltaExpanded_Width>::value,   SkTFixed<FC_WIDTH_ULTRAEXPANDED>::value },
+    };
+    int width = map_ranges(style.width(), widthRanges, SK_ARRAY_COUNT(widthRanges));
+
+    FcPatternAddInteger(pattern, FC_WEIGHT, weight);
+    FcPatternAddInteger(pattern, FC_WIDTH, width);
+    FcPatternAddInteger(pattern, FC_SLANT, style.isItalic() ? FC_SLANT_ITALIC : FC_SLANT_ROMAN);
+}
+
+class SkTypeface_stream : public SkTypeface_FreeType {
+public:
+    /** @param data takes ownership of the font data.*/
+    SkTypeface_stream(SkFontData* data, const SkFontStyle& style, bool fixedWidth)
+        : INHERITED(style, SkTypefaceCache::NewFontID(), fixedWidth)
+        , fData(data)
+    { };
+
+    void onGetFamilyName(SkString* familyName) const override {
+        familyName->reset();
+    }
+
+    void onGetFontDescriptor(SkFontDescriptor* desc, bool* serialize) const override {
+        *serialize = true;
+    }
+
+    SkStreamAsset* onOpenStream(int* ttcIndex) const override {
+        *ttcIndex = fData->getIndex();
+        return fData->duplicateStream();
+    }
+
+    SkFontData* onCreateFontData() const override {
+        return new SkFontData(*fData.get());
+    }
+
+private:
+    const SkAutoTDelete<const SkFontData> fData;
+
+    typedef SkTypeface_FreeType INHERITED;
+};
+
+class SkTypeface_fontconfig : public SkTypeface_FreeType {
+public:
+    /** @param pattern takes ownership of the reference. */
+    static SkTypeface_fontconfig* Create(FcPattern* pattern) {
+        return new SkTypeface_fontconfig(pattern);
+    }
+    mutable SkAutoFcPattern fPattern;
+
+    void onGetFamilyName(SkString* familyName) const override {
+        *familyName = get_string(fPattern, FC_FAMILY);
+    }
+
+    void onGetFontDescriptor(SkFontDescriptor* desc, bool* serialize) const override {
+        FCLocker lock;
+        desc->setFamilyName(get_string(fPattern, FC_FAMILY));
+        desc->setFullName(get_string(fPattern, FC_FULLNAME));
+        desc->setPostscriptName(get_string(fPattern, FC_POSTSCRIPT_NAME));
+        *serialize = false;
+    }
+
+    SkStreamAsset* onOpenStream(int* ttcIndex) const override {
+        FCLocker lock;
+        *ttcIndex = get_int(fPattern, FC_INDEX, 0);
+        return SkStream::NewFromFile(get_string(fPattern, FC_FILE));
+    }
+
+    virtual ~SkTypeface_fontconfig() {
+        // Hold the lock while unrefing the pattern.
+        FCLocker lock;
+        fPattern.reset();
+    }
+
+private:
+    /** @param pattern takes ownership of the reference. */
+    SkTypeface_fontconfig(FcPattern* pattern)
+        : INHERITED(skfontstyle_from_fcpattern(pattern),
+                    SkTypefaceCache::NewFontID(),
+                    FC_PROPORTIONAL != get_int(pattern, FC_SPACING, FC_PROPORTIONAL))
+        , fPattern(pattern)
+    { };
+
+    typedef SkTypeface_FreeType INHERITED;
+};
+
+class SkFontMgr_fontconfig : public SkFontMgr {
+    mutable SkAutoFcConfig fFC;
+    SkAutoTUnref<SkDataTable> fFamilyNames;
+    SkTypeface_FreeType::Scanner fScanner;
+
+    class StyleSet : public SkFontStyleSet {
+    public:
+        /** @param parent does not take ownership of the reference.
+         *  @param fontSet takes ownership of the reference.
+         */
+        StyleSet(const SkFontMgr_fontconfig* parent, FcFontSet* fontSet)
+            : fFontMgr(SkRef(parent)), fFontSet(fontSet)
+        { }
+
+        virtual ~StyleSet() {
+            // Hold the lock while unrefing the font set.
+            FCLocker lock;
+            fFontSet.reset();
+        }
+
+        int count() override { return fFontSet->nfont; }
+
+        void getStyle(int index, SkFontStyle* style, SkString* styleName) override {
+            if (index < 0 || fFontSet->nfont <= index) {
+                return;
+            }
+
+            FCLocker lock;
+            if (style) {
+                *style = skfontstyle_from_fcpattern(fFontSet->fonts[index]);
+            }
+            if (styleName) {
+                *styleName = get_string(fFontSet->fonts[index], FC_STYLE);
+            }
+        }
+
+        SkTypeface* createTypeface(int index) override {
+            FCLocker lock;
+
+            FcPattern* match = fFontSet->fonts[index];
+            return fFontMgr->createTypefaceFromFcPattern(match);
+        }
+
+        SkTypeface* matchStyle(const SkFontStyle& style) override {
+            FCLocker lock;
+
+            SkAutoFcPattern pattern;
+            fcpattern_from_skfontstyle(style, pattern);
+            FcConfigSubstitute(fFontMgr->fFC, pattern, FcMatchPattern);
+            FcDefaultSubstitute(pattern);
+
+            FcResult result;
+            FcFontSet* fontSets[1] = { fFontSet };
+            SkAutoFcPattern match(FcFontSetMatch(fFontMgr->fFC,
+                                                 fontSets, SK_ARRAY_COUNT(fontSets),
+                                                 pattern, &result));
+            if (nullptr == match) {
+                return nullptr;
+            }
+
+            return fFontMgr->createTypefaceFromFcPattern(match);
+        }
+
+    private:
+        SkAutoTUnref<const SkFontMgr_fontconfig> fFontMgr;
+        SkAutoFcFontSet fFontSet;
+    };
+
+    static bool FindName(const SkTDArray<const char*>& list, const char* str) {
+        int count = list.count();
+        for (int i = 0; i < count; ++i) {
+            if (!strcmp(list[i], str)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    static SkDataTable* GetFamilyNames(FcConfig* fcconfig) {
+        FCLocker lock;
+
+        SkTDArray<const char*> names;
+        SkTDArray<size_t> sizes;
+
+        static const FcSetName fcNameSet[] = { FcSetSystem, FcSetApplication };
+        for (int setIndex = 0; setIndex < (int)SK_ARRAY_COUNT(fcNameSet); ++setIndex) {
+            // Return value of FcConfigGetFonts must not be destroyed.
+            FcFontSet* allFonts(FcConfigGetFonts(fcconfig, fcNameSet[setIndex]));
+            if (nullptr == allFonts) {
+                continue;
+            }
+
+            for (int fontIndex = 0; fontIndex < allFonts->nfont; ++fontIndex) {
+                FcPattern* current = allFonts->fonts[fontIndex];
+                for (int id = 0; ; ++id) {
+                    FcChar8* fcFamilyName;
+                    FcResult result = FcPatternGetString(current, FC_FAMILY, id, &fcFamilyName);
+                    if (FcResultNoId == result) {
+                        break;
+                    }
+                    if (FcResultMatch != result) {
+                        continue;
+                    }
+                    const char* familyName = reinterpret_cast<const char*>(fcFamilyName);
+                    if (familyName && !FindName(names, familyName)) {
+                        *names.append() = familyName;
+                        *sizes.append() = strlen(familyName) + 1;
+                    }
+                }
+            }
+        }
+
+        return SkDataTable::NewCopyArrays((void const *const *)names.begin(),
+                                          sizes.begin(), names.count());
+    }
+
+    static bool FindByFcPattern(SkTypeface* cached, const SkFontStyle&, void* ctx) {
+        SkTypeface_fontconfig* cshFace = static_cast<SkTypeface_fontconfig*>(cached);
+        FcPattern* ctxPattern = static_cast<FcPattern*>(ctx);
+        return FcTrue == FcPatternEqual(cshFace->fPattern, ctxPattern);
+    }
+
+    mutable SkMutex fTFCacheMutex;
+    mutable SkTypefaceCache fTFCache;
+    /** Creates a typeface using a typeface cache.
+     *  @param pattern a complete pattern from FcFontRenderPrepare.
+     */
+    SkTypeface* createTypefaceFromFcPattern(FcPattern* pattern) const {
+        FCLocker::AssertHeld();
+        SkAutoMutexAcquire ama(fTFCacheMutex);
+        SkTypeface* face = fTFCache.findByProcAndRef(FindByFcPattern, pattern);
+        if (nullptr == face) {
+            FcPatternReference(pattern);
+            face = SkTypeface_fontconfig::Create(pattern);
+            if (face) {
+                fTFCache.add(face, SkFontStyle());
+            }
+        }
+        return face;
+    }
+
+public:
+    /** Takes control of the reference to 'config'. */
+    explicit SkFontMgr_fontconfig(FcConfig* config)
+        : fFC(config ? config : FcInitLoadConfigAndFonts())
+        , fFamilyNames(GetFamilyNames(fFC)) { }
+
+    virtual ~SkFontMgr_fontconfig() {
+        // Hold the lock while unrefing the config.
+        FCLocker lock;
+        fFC.reset();
+    }
+
+protected:
+    int onCountFamilies() const override {
+        return fFamilyNames->count();
+    }
+
+    void onGetFamilyName(int index, SkString* familyName) const override {
+        familyName->set(fFamilyNames->atStr(index));
+    }
+
+    SkFontStyleSet* onCreateStyleSet(int index) const override {
+        return this->onMatchFamily(fFamilyNames->atStr(index));
+    }
+
+    /** True if any string object value in the font is the same
+     *         as a string object value in the pattern.
+     */
+    static bool AnyMatching(FcPattern* font, FcPattern* pattern, const char* object) {
+        FcChar8* fontString;
+        FcChar8* patternString;
+        FcResult result;
+        // Set an arbitrary limit on the number of pattern object values to consider.
+        // TODO: re-write this to avoid N*M
+        static const int maxId = 16;
+        for (int patternId = 0; patternId < maxId; ++patternId) {
+            result = FcPatternGetString(pattern, object, patternId, &patternString);
+            if (FcResultNoId == result) {
+                break;
+            }
+            if (FcResultMatch != result) {
+                continue;
+            }
+            for (int fontId = 0; fontId < maxId; ++fontId) {
+                result = FcPatternGetString(font, object, fontId, &fontString);
+                if (FcResultNoId == result) {
+                    break;
+                }
+                if (FcResultMatch != result) {
+                    continue;
+                }
+                if (0 == FcStrCmpIgnoreCase(patternString, fontString)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    static bool FontAccessible(FcPattern* font) {
+        // FontConfig can return fonts which are unreadable.
+        const char* filename = get_string(font, FC_FILE, nullptr);
+        if (nullptr == filename) {
+            return false;
+        }
+        return sk_exists(filename, kRead_SkFILE_Flag);
+    }
+
+    static bool FontFamilyNameMatches(FcPattern* font, FcPattern* pattern) {
+        return AnyMatching(font, pattern, FC_FAMILY);
+    }
+
+    static bool FontContainsCharacter(FcPattern* font, uint32_t character) {
+        FcResult result;
+        FcCharSet* matchCharSet;
+        for (int charSetId = 0; ; ++charSetId) {
+            result = FcPatternGetCharSet(font, FC_CHARSET, charSetId, &matchCharSet);
+            if (FcResultNoId == result) {
+                break;
+            }
+            if (FcResultMatch != result) {
+                continue;
+            }
+            if (FcCharSetHasChar(matchCharSet, character)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    SkFontStyleSet* onMatchFamily(const char familyName[]) const override {
+        FCLocker lock;
+
+        SkAutoFcPattern pattern;
+        FcPatternAddString(pattern, FC_FAMILY, (FcChar8*)familyName);
+        FcConfigSubstitute(fFC, pattern, FcMatchPattern);
+        FcDefaultSubstitute(pattern);
+
+        FcPattern* matchPattern;
+        SkAutoFcPattern strongPattern(nullptr);
+        if (familyName) {
+            strongPattern.reset(FcPatternDuplicate(pattern));
+            remove_weak(strongPattern, FC_FAMILY);
+            matchPattern = strongPattern;
+        } else {
+            matchPattern = pattern;
+        }
+
+        SkAutoFcFontSet matches;
+        // TODO: Some families have 'duplicates' due to symbolic links.
+        // The patterns are exactly the same except for the FC_FILE.
+        // It should be possible to collapse these patterns by normalizing.
+        static const FcSetName fcNameSet[] = { FcSetSystem, FcSetApplication };
+        for (int setIndex = 0; setIndex < (int)SK_ARRAY_COUNT(fcNameSet); ++setIndex) {
+            // Return value of FcConfigGetFonts must not be destroyed.
+            FcFontSet* allFonts(FcConfigGetFonts(fFC, fcNameSet[setIndex]));
+            if (nullptr == allFonts) {
+                continue;
+            }
+
+            for (int fontIndex = 0; fontIndex < allFonts->nfont; ++fontIndex) {
+                FcPattern* font = allFonts->fonts[fontIndex];
+                if (FontAccessible(font) && FontFamilyNameMatches(font, matchPattern)) {
+                    FcFontSetAdd(matches, FcFontRenderPrepare(fFC, pattern, font));
+                }
+            }
+        }
+
+        return new StyleSet(this, matches.detach());
+    }
+
+    virtual SkTypeface* onMatchFamilyStyle(const char familyName[],
+                                           const SkFontStyle& style) const override
+    {
+        FCLocker lock;
+
+        SkAutoFcPattern pattern;
+        FcPatternAddString(pattern, FC_FAMILY, (FcChar8*)familyName);
+        fcpattern_from_skfontstyle(style, pattern);
+        FcConfigSubstitute(fFC, pattern, FcMatchPattern);
+        FcDefaultSubstitute(pattern);
+
+        // We really want to match strong (prefered) and same (acceptable) only here.
+        // If a family name was specified, assume that any weak matches after the last strong match
+        // are weak (default) and ignore them.
+        // The reason for is that after substitution the pattern for 'sans-serif' looks like
+        // "wwwwwwwwwwwwwwswww" where there are many weak but preferred names, followed by defaults.
+        // So it is possible to have weakly matching but preferred names.
+        // In aliases, bindings are weak by default, so this is easy and common.
+        // If no family name was specified, we'll probably only get weak matches, but that's ok.
+        FcPattern* matchPattern;
+        SkAutoFcPattern strongPattern(nullptr);
+        if (familyName) {
+            strongPattern.reset(FcPatternDuplicate(pattern));
+            remove_weak(strongPattern, FC_FAMILY);
+            matchPattern = strongPattern;
+        } else {
+            matchPattern = pattern;
+        }
+
+        FcResult result;
+        SkAutoFcPattern font(FcFontMatch(fFC, pattern, &result));
+        if (nullptr == font || !FontAccessible(font) || !FontFamilyNameMatches(font, matchPattern)) {
+            return nullptr;
+        }
+
+        return createTypefaceFromFcPattern(font);
+    }
+
+    virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[],
+                                                    const SkFontStyle& style,
+                                                    const char* bcp47[],
+                                                    int bcp47Count,
+                                                    SkUnichar character) const override
+    {
+        FCLocker lock;
+
+        SkAutoFcPattern pattern;
+        if (familyName) {
+            FcValue familyNameValue;
+            familyNameValue.type = FcTypeString;
+            familyNameValue.u.s = reinterpret_cast<const FcChar8*>(familyName);
+            FcPatternAddWeak(pattern, FC_FAMILY, familyNameValue, FcFalse);
+        }
+        fcpattern_from_skfontstyle(style, pattern);
+
+        SkAutoFcCharSet charSet;
+        FcCharSetAddChar(charSet, character);
+        FcPatternAddCharSet(pattern, FC_CHARSET, charSet);
+
+        if (bcp47Count > 0) {
+            SkASSERT(bcp47);
+            SkAutoFcLangSet langSet;
+            for (int i = bcp47Count; i --> 0;) {
+                FcLangSetAdd(langSet, (const FcChar8*)bcp47[i]);
+            }
+            FcPatternAddLangSet(pattern, FC_LANG, langSet);
+        }
+
+        FcConfigSubstitute(fFC, pattern, FcMatchPattern);
+        FcDefaultSubstitute(pattern);
+
+        FcResult result;
+        SkAutoFcPattern font(FcFontMatch(fFC, pattern, &result));
+        if (nullptr == font || !FontAccessible(font) || !FontContainsCharacter(font, character)) {
+            return nullptr;
+        }
+
+        return createTypefaceFromFcPattern(font);
+    }
+
+    virtual SkTypeface* onMatchFaceStyle(const SkTypeface* typeface,
+                                         const SkFontStyle& style) const override
+    {
+        //TODO: should the SkTypeface_fontconfig know its family?
+        const SkTypeface_fontconfig* fcTypeface =
+                static_cast<const SkTypeface_fontconfig*>(typeface);
+        return this->matchFamilyStyle(get_string(fcTypeface->fPattern, FC_FAMILY), style);
+    }
+
+    SkTypeface* onCreateFromStream(SkStreamAsset* bareStream, int ttcIndex) const override {
+        SkAutoTDelete<SkStreamAsset> stream(bareStream);
+        const size_t length = stream->getLength();
+        if (length <= 0 || (1u << 30) < length) {
+            return nullptr;
+        }
+
+        SkFontStyle style;
+        bool isFixedWidth = false;
+        if (!fScanner.scanFont(stream, ttcIndex, nullptr, &style, &isFixedWidth, nullptr)) {
+            return nullptr;
+        }
+
+        return new SkTypeface_stream(new SkFontData(stream.detach(), ttcIndex, nullptr, 0), style,
+                                     isFixedWidth);
+    }
+
+    SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const override {
+        return this->createFromStream(new SkMemoryStream(data), ttcIndex);
+    }
+
+    SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const override {
+        return this->createFromStream(SkStream::NewFromFile(path), ttcIndex);
+    }
+
+    SkTypeface* onCreateFromFontData(SkFontData* fontData) const override {
+        SkStreamAsset* stream(fontData->getStream());
+        const size_t length = stream->getLength();
+        if (length <= 0 || (1u << 30) < length) {
+            return nullptr;
+        }
+
+        const int ttcIndex = fontData->getIndex();
+        SkFontStyle style;
+        bool isFixedWidth = false;
+        if (!fScanner.scanFont(stream, ttcIndex, nullptr, &style, &isFixedWidth, nullptr)) {
+            return nullptr;
+        }
+
+        return new SkTypeface_stream(fontData, style, isFixedWidth);
+    }
+
+    virtual SkTypeface* onLegacyCreateTypeface(const char familyName[],
+                                               unsigned styleBits) const override {
+        bool bold = styleBits & SkTypeface::kBold;
+        bool italic = styleBits & SkTypeface::kItalic;
+        SkFontStyle style = SkFontStyle(bold ? SkFontStyle::kBold_Weight
+                                             : SkFontStyle::kNormal_Weight,
+                                        SkFontStyle::kNormal_Width,
+                                        italic ? SkFontStyle::kItalic_Slant
+                                               : SkFontStyle::kUpright_Slant);
+        SkAutoTUnref<SkTypeface> typeface(this->matchFamilyStyle(familyName, style));
+        if (typeface.get()) {
+            return typeface.detach();
+        }
+
+        return this->matchFamilyStyle(nullptr, style);
+    }
+};
+
+SK_API SkFontMgr* SkFontMgr_New_FontConfig(FcConfig* fc) {
+    return new SkFontMgr_fontconfig(fc);
+}
diff --git a/gfx/skia/skia/src/ports/SkFontMgr_fontconfig_factory.cpp b/gfx/skia/skia/src/ports/SkFontMgr_fontconfig_factory.cpp
new file mode 100644
index 000000000000..cdf055608d54
--- /dev/null
+++ b/gfx/skia/skia/src/ports/SkFontMgr_fontconfig_factory.cpp
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkFontMgr.h"
+#include "SkFontMgr_fontconfig.h"
+#include "SkTypes.h"
+
+SkFontMgr* SkFontMgr::Factory() {
+    return SkFontMgr_New_FontConfig(nullptr);
+}
diff --git a/gfx/skia/skia/src/ports/SkFontMgr_win_dw.cpp b/gfx/skia/skia/src/ports/SkFontMgr_win_dw.cpp
index ecca57ff513d..585d809406a7 100644
--- a/gfx/skia/skia/src/ports/SkFontMgr_win_dw.cpp
+++ b/gfx/skia/skia/src/ports/SkFontMgr_win_dw.cpp
@@ -5,20 +5,28 @@
  * found in the LICENSE file.
  */
 
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_WIN32)
+
 #include "SkDWrite.h"
 #include "SkDWriteFontFileStream.h"
 #include "SkFontMgr.h"
 #include "SkHRESULT.h"
+#include "SkMutex.h"
 #include "SkStream.h"
 #include "SkTScopedComPtr.h"
-#include "SkThread.h"
 #include "SkTypeface.h"
 #include "SkTypefaceCache.h"
 #include "SkTypeface_win_dw.h"
 #include "SkTypes.h"
+#include "SkUtils.h"
 
 #include <dwrite.h>
 
+#if SK_HAS_DWRITE_2_H
+#include <dwrite_2.h>
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////
 
 class StreamFontFileLoader : public IDWriteFontFileLoader {
@@ -34,18 +42,19 @@ public:
         UINT32 fontFileReferenceKeySize,
         IDWriteFontFileStream** fontFileStream);
 
-    static HRESULT Create(SkStream* stream, StreamFontFileLoader** streamFontFileLoader) {
+    // Takes ownership of stream.
+    static HRESULT Create(SkStreamAsset* stream, StreamFontFileLoader** streamFontFileLoader) {
         *streamFontFileLoader = new StreamFontFileLoader(stream);
-        if (NULL == streamFontFileLoader) {
+        if (nullptr == streamFontFileLoader) {
             return E_OUTOFMEMORY;
         }
         return S_OK;
     }
 
-    SkAutoTUnref<SkStream> fStream;
+    SkAutoTDelete<SkStreamAsset> fStream;
 
 private:
-    StreamFontFileLoader(SkStream* stream) : fRefCount(1), fStream(SkRef(stream)) { }
+    StreamFontFileLoader(SkStreamAsset* stream) : fStream(stream), fRefCount(1) { }
     virtual ~StreamFontFileLoader() { }
 
     ULONG fRefCount;
@@ -57,7 +66,7 @@ HRESULT StreamFontFileLoader::QueryInterface(REFIID iid, void** ppvObject) {
         AddRef();
         return S_OK;
     } else {
-        *ppvObject = NULL;
+        *ppvObject = nullptr;
         return E_NOINTERFACE;
     }
 }
@@ -80,7 +89,7 @@ HRESULT StreamFontFileLoader::CreateStreamFromKey(
     IDWriteFontFileStream** fontFileStream)
 {
     SkTScopedComPtr<SkDWriteFontFileStreamWrapper> stream;
-    HR(SkDWriteFontFileStreamWrapper::Create(fStream, &stream));
+    HR(SkDWriteFontFileStreamWrapper::Create(fStream->duplicate(), &stream));
     *fontFileStream = stream.release();
     return S_OK;
 }
@@ -101,7 +110,7 @@ public:
     static HRESULT Create(IDWriteFactory* factory, IDWriteFontFileLoader* fontFileLoader,
                           StreamFontFileEnumerator** streamFontFileEnumerator) {
         *streamFontFileEnumerator = new StreamFontFileEnumerator(factory, fontFileLoader);
-        if (NULL == streamFontFileEnumerator) {
+        if (nullptr == streamFontFileEnumerator) {
             return E_OUTOFMEMORY;
         }
         return S_OK;
@@ -133,7 +142,7 @@ HRESULT StreamFontFileEnumerator::QueryInterface(REFIID iid, void** ppvObject) {
         AddRef();
         return S_OK;
     } else {
-        *ppvObject = NULL;
+        *ppvObject = nullptr;
         return E_NOINTERFACE;
     }
 }
@@ -160,7 +169,7 @@ HRESULT StreamFontFileEnumerator::MoveNext(BOOL* hasCurrentFile) {
 
     UINT32 dummy = 0;
     HR(fFactory->CreateCustomFontFileReference(
-            &dummy, //cannot be NULL
+            &dummy, //cannot be nullptr
             sizeof(dummy), //even if this is 0
             fFontFileLoader.get(),
             &fCurrentFile));
@@ -170,8 +179,8 @@ HRESULT StreamFontFileEnumerator::MoveNext(BOOL* hasCurrentFile) {
 }
 
 HRESULT StreamFontFileEnumerator::GetCurrentFontFile(IDWriteFontFile** fontFile) {
-    if (fCurrentFile.get() == NULL) {
-        *fontFile = NULL;
+    if (fCurrentFile.get() == nullptr) {
+        *fontFile = nullptr;
         return E_FAIL;
     }
 
@@ -198,7 +207,7 @@ public:
     static HRESULT Create(IDWriteFontFileLoader* fontFileLoader,
                           StreamFontCollectionLoader** streamFontCollectionLoader) {
         *streamFontCollectionLoader = new StreamFontCollectionLoader(fontFileLoader);
-        if (NULL == streamFontCollectionLoader) {
+        if (nullptr == streamFontCollectionLoader) {
             return E_OUTOFMEMORY;
         }
         return S_OK;
@@ -220,7 +229,7 @@ HRESULT StreamFontCollectionLoader::QueryInterface(REFIID iid, void** ppvObject)
         AddRef();
         return S_OK;
     } else {
-        *ppvObject = NULL;
+        *ppvObject = nullptr;
         return E_NOINTERFACE;
     }
 }
@@ -260,23 +269,33 @@ public:
         , fFontCollection(SkRefComPtr(fontCollection))
         , fLocaleName(localeNameLength)
     {
+#if SK_HAS_DWRITE_2_H
+        if (!SUCCEEDED(fFactory->QueryInterface(&fFactory2))) {
+            // IUnknown::QueryInterface states that if it fails, punk will be set to nullptr.
+            // http://blogs.msdn.com/b/oldnewthing/archive/2004/03/26/96777.aspx
+            SK_ALWAYSBREAK(nullptr == fFactory2.get());
+        }
+#endif
         memcpy(fLocaleName.get(), localeName, localeNameLength * sizeof(WCHAR));
     }
 
 protected:
-    virtual int onCountFamilies() const SK_OVERRIDE;
-    virtual void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE;
-    virtual SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE;
-    virtual SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE;
+    int onCountFamilies() const override;
+    void onGetFamilyName(int index, SkString* familyName) const override;
+    SkFontStyleSet* onCreateStyleSet(int index) const override;
+    SkFontStyleSet* onMatchFamily(const char familyName[]) const override;
     virtual SkTypeface* onMatchFamilyStyle(const char familyName[],
-                                           const SkFontStyle& fontstyle) const SK_OVERRIDE;
+                                           const SkFontStyle& fontstyle) const override;
+    virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[], const SkFontStyle&,
+                                                    const char* bcp47[], int bcp47Count,
+                                                    SkUnichar character) const override;
     virtual SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember,
-                                         const SkFontStyle& fontstyle) const SK_OVERRIDE;
-    virtual SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE;
-    virtual SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE;
-    virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE;
+                                         const SkFontStyle& fontstyle) const override;
+    SkTypeface* onCreateFromStream(SkStreamAsset* stream, int ttcIndex) const override;
+    SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const override;
+    SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const override;
     virtual SkTypeface* onLegacyCreateTypeface(const char familyName[],
-                                               unsigned styleBits) const SK_OVERRIDE;
+                                               unsigned styleBits) const override;
 
 private:
     HRESULT getByFamilyName(const WCHAR familyName[], IDWriteFontFamily** fontFamily) const;
@@ -288,12 +307,16 @@ private:
                                              IDWriteFontFamily* fontFamily) const;
 
     SkTScopedComPtr<IDWriteFactory> fFactory;
+#if SK_HAS_DWRITE_2_H
+    SkTScopedComPtr<IDWriteFactory2> fFactory2;
+#endif
     SkTScopedComPtr<IDWriteFontCollection> fFontCollection;
     SkSMallocWCHAR fLocaleName;
     mutable SkMutex fTFCacheMutex;
     mutable SkTypefaceCache fTFCache;
 
     friend class SkFontStyleSet_DirectWrite;
+    friend class FontFallbackRenderer;
 };
 
 class SkFontStyleSet_DirectWrite : public SkFontStyleSet {
@@ -304,10 +327,10 @@ public:
         , fFontFamily(SkRefComPtr(fontFamily))
     { }
 
-    virtual int count() SK_OVERRIDE;
-    virtual void getStyle(int index, SkFontStyle* fs, SkString* styleName) SK_OVERRIDE;
-    virtual SkTypeface* createTypeface(int index) SK_OVERRIDE;
-    virtual SkTypeface* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE;
+    int count() override;
+    void getStyle(int index, SkFontStyle* fs, SkString* styleName) override;
+    SkTypeface* createTypeface(int index) override;
+    SkTypeface* matchStyle(const SkFontStyle& pattern) override;
 
 private:
     SkAutoTUnref<const SkFontMgr_DirectWrite> fFontMgr;
@@ -331,7 +354,7 @@ struct ProtoDWriteTypeface {
     IDWriteFontFamily* fDWriteFontFamily;
 };
 
-static bool FindByDWriteFont(SkTypeface* cached, SkTypeface::Style, void* ctx) {
+static bool FindByDWriteFont(SkTypeface* cached, const SkFontStyle&, void* ctx) {
     DWriteFontTypeface* cshFace = reinterpret_cast<DWriteFontTypeface*>(cached);
     ProtoDWriteTypeface* ctxFace = reinterpret_cast<ProtoDWriteTypeface*>(ctx);
     bool same;
@@ -350,8 +373,8 @@ static bool FindByDWriteFont(SkTypeface* cached, SkTypeface::Style, void* ctx) {
     //Check if the two fonts share the same loader and have the same key.
     UINT32 cshNumFiles;
     UINT32 ctxNumFiles;
-    HRB(cshFace->fDWriteFontFace->GetFiles(&cshNumFiles, NULL));
-    HRB(ctxFace->fDWriteFontFace->GetFiles(&ctxNumFiles, NULL));
+    HRB(cshFace->fDWriteFontFace->GetFiles(&cshNumFiles, nullptr));
+    HRB(ctxFace->fDWriteFontFace->GetFiles(&ctxNumFiles, nullptr));
     if (cshNumFiles != ctxNumFiles) {
         return false;
     }
@@ -432,10 +455,10 @@ SkTypeface* SkFontMgr_DirectWrite::createTypefaceFromDWriteFont(
     SkAutoMutexAcquire ama(fTFCacheMutex);
     ProtoDWriteTypeface spec = { fontFace, font, fontFamily };
     SkTypeface* face = fTFCache.findByProcAndRef(FindByDWriteFont, &spec);
-    if (NULL == face) {
+    if (nullptr == face) {
         face = DWriteFontTypeface::Create(fFactory.get(), fontFace, font, fontFamily);
         if (face) {
-            fTFCache.add(face, get_style(font), true);
+            fTFCache.add(face, get_style(font));
         }
     }
     return face;
@@ -459,7 +482,7 @@ SkFontStyleSet* SkFontMgr_DirectWrite::onCreateStyleSet(int index) const {
     SkTScopedComPtr<IDWriteFontFamily> fontFamily;
     HRNM(fFontCollection->GetFontFamily(index, &fontFamily), "Could not get requested family.");
 
-    return SkNEW_ARGS(SkFontStyleSet_DirectWrite, (this, fontFamily.get()));
+    return new SkFontStyleSet_DirectWrite(this, fontFamily.get());
 }
 
 SkFontStyleSet* SkFontMgr_DirectWrite::onMatchFamily(const char familyName[]) const {
@@ -471,7 +494,7 @@ SkFontStyleSet* SkFontMgr_DirectWrite::onMatchFamily(const char familyName[]) co
     HRNM(fFontCollection->FindFamilyName(dwFamilyName.get(), &index, &exists),
             "Failed while finding family by name.");
     if (!exists) {
-        return NULL;
+        return nullptr;
     }
 
     return this->onCreateStyleSet(index);
@@ -483,6 +506,329 @@ SkTypeface* SkFontMgr_DirectWrite::onMatchFamilyStyle(const char familyName[],
     return sset->matchStyle(fontstyle);
 }
 
+class FontFallbackRenderer : public IDWriteTextRenderer {
+public:
+    FontFallbackRenderer(const SkFontMgr_DirectWrite* outer, UINT32 character)
+        : fRefCount(1), fOuter(SkSafeRef(outer)), fCharacter(character), fResolvedTypeface(nullptr) {
+    }
+
+    virtual ~FontFallbackRenderer() { }
+
+    // IDWriteTextRenderer methods
+    virtual HRESULT STDMETHODCALLTYPE DrawGlyphRun(
+        void* clientDrawingContext,
+        FLOAT baselineOriginX,
+        FLOAT baselineOriginY,
+        DWRITE_MEASURING_MODE measuringMode,
+        DWRITE_GLYPH_RUN const* glyphRun,
+        DWRITE_GLYPH_RUN_DESCRIPTION const* glyphRunDescription,
+        IUnknown* clientDrawingEffect) override
+    {
+        SkTScopedComPtr<IDWriteFont> font;
+        HRM(fOuter->fFontCollection->GetFontFromFontFace(glyphRun->fontFace, &font),
+            "Could not get font from font face.");
+
+        // It is possible that the font passed does not actually have the requested character,
+        // due to no font being found and getting the fallback font.
+        // Check that the font actually contains the requested character.
+        BOOL exists;
+        HRM(font->HasCharacter(fCharacter, &exists), "Could not find character.");
+
+        if (exists) {
+            SkTScopedComPtr<IDWriteFontFamily> fontFamily;
+            HRM(font->GetFontFamily(&fontFamily), "Could not get family.");
+            fResolvedTypeface = fOuter->createTypefaceFromDWriteFont(glyphRun->fontFace,
+                                                                     font.get(),
+                                                                     fontFamily.get());
+        }
+
+        return S_OK;
+    }
+
+    virtual HRESULT STDMETHODCALLTYPE DrawUnderline(
+        void* clientDrawingContext,
+        FLOAT baselineOriginX,
+        FLOAT baselineOriginY,
+        DWRITE_UNDERLINE const* underline,
+        IUnknown* clientDrawingEffect) override
+    { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE DrawStrikethrough(
+        void* clientDrawingContext,
+        FLOAT baselineOriginX,
+        FLOAT baselineOriginY,
+        DWRITE_STRIKETHROUGH const* strikethrough,
+        IUnknown* clientDrawingEffect) override
+    { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE DrawInlineObject(
+        void* clientDrawingContext,
+        FLOAT originX,
+        FLOAT originY,
+        IDWriteInlineObject* inlineObject,
+        BOOL isSideways,
+        BOOL isRightToLeft,
+        IUnknown* clientDrawingEffect) override
+    { return E_NOTIMPL; }
+
+    // IDWritePixelSnapping methods
+    virtual HRESULT STDMETHODCALLTYPE IsPixelSnappingDisabled(
+        void* clientDrawingContext,
+        BOOL* isDisabled) override
+    {
+        *isDisabled = FALSE;
+        return S_OK;
+    }
+
+    virtual HRESULT STDMETHODCALLTYPE GetCurrentTransform(
+        void* clientDrawingContext,
+        DWRITE_MATRIX* transform) override
+    {
+        const DWRITE_MATRIX ident = { 1.0, 0.0, 0.0, 1.0, 0.0, 0.0 };
+        *transform = ident;
+        return S_OK;
+    }
+
+    virtual HRESULT STDMETHODCALLTYPE GetPixelsPerDip(
+        void* clientDrawingContext,
+        FLOAT* pixelsPerDip) override
+    {
+        *pixelsPerDip = 1.0f;
+        return S_OK;
+    }
+
+    // IUnknown methods
+    ULONG STDMETHODCALLTYPE AddRef() override {
+        return InterlockedIncrement(&fRefCount);
+    }
+
+    ULONG STDMETHODCALLTYPE Release() override {
+        ULONG newCount = InterlockedDecrement(&fRefCount);
+        if (0 == newCount) {
+            delete this;
+        }
+        return newCount;
+    }
+
+    virtual HRESULT STDMETHODCALLTYPE QueryInterface(IID const& riid, void** ppvObject) override{
+        if (__uuidof(IUnknown) == riid ||
+            __uuidof(IDWritePixelSnapping) == riid ||
+            __uuidof(IDWriteTextRenderer) == riid)
+        {
+            *ppvObject = this;
+            this->AddRef();
+            return S_OK;
+        }
+        *ppvObject = nullptr;
+        return E_FAIL;
+    }
+
+    SkTypeface* FallbackTypeface() { return fResolvedTypeface; }
+
+protected:
+    ULONG fRefCount;
+    SkAutoTUnref<const SkFontMgr_DirectWrite> fOuter;
+    UINT32 fCharacter;
+    SkTypeface* fResolvedTypeface;
+};
+
+class FontFallbackSource : public IDWriteTextAnalysisSource {
+public:
+    FontFallbackSource(const WCHAR* string, UINT32 length, const WCHAR* locale,
+                       IDWriteNumberSubstitution* numberSubstitution)
+        : fString(string)
+        , fLength(length)
+        , fLocale(locale)
+        , fNumberSubstitution(numberSubstitution)
+    { }
+
+    virtual ~FontFallbackSource() { }
+
+    // IDWriteTextAnalysisSource methods
+    virtual HRESULT STDMETHODCALLTYPE GetTextAtPosition(
+        UINT32 textPosition,
+        WCHAR const** textString,
+        UINT32* textLength) override
+    {
+        if (fLength <= textPosition) {
+            *textString = nullptr;
+            *textLength = 0;
+            return S_OK;
+        }
+        *textString = fString + textPosition;
+        *textLength = fLength - textPosition;
+        return S_OK;
+    }
+
+    virtual HRESULT STDMETHODCALLTYPE GetTextBeforePosition(
+        UINT32 textPosition,
+        WCHAR const** textString,
+        UINT32* textLength) override
+    {
+        if (textPosition < 1 || fLength <= textPosition) {
+            *textString = nullptr;
+            *textLength = 0;
+            return S_OK;
+        }
+        *textString = fString;
+        *textLength = textPosition;
+        return S_OK;
+    }
+
+    virtual DWRITE_READING_DIRECTION STDMETHODCALLTYPE GetParagraphReadingDirection() override {
+        // TODO: this is also interesting.
+        return DWRITE_READING_DIRECTION_LEFT_TO_RIGHT;
+    }
+
+    virtual HRESULT STDMETHODCALLTYPE GetLocaleName(
+        UINT32 textPosition,
+        UINT32* textLength,
+        WCHAR const** localeName) override
+    {
+        *localeName = fLocale;
+        return S_OK;
+    }
+
+    virtual HRESULT STDMETHODCALLTYPE GetNumberSubstitution(
+        UINT32 textPosition,
+        UINT32* textLength,
+        IDWriteNumberSubstitution** numberSubstitution) override
+    {
+        *numberSubstitution = fNumberSubstitution;
+        return S_OK;
+    }
+
+    // IUnknown methods
+    ULONG STDMETHODCALLTYPE AddRef() override {
+        return InterlockedIncrement(&fRefCount);
+    }
+
+    ULONG STDMETHODCALLTYPE Release() override {
+        ULONG newCount = InterlockedDecrement(&fRefCount);
+        if (0 == newCount) {
+            delete this;
+        }
+        return newCount;
+    }
+
+    virtual HRESULT STDMETHODCALLTYPE QueryInterface(IID const& riid, void** ppvObject) override{
+        if (__uuidof(IUnknown) == riid ||
+            __uuidof(IDWriteTextAnalysisSource) == riid)
+        {
+            *ppvObject = this;
+            this->AddRef();
+            return S_OK;
+        }
+        *ppvObject = nullptr;
+        return E_FAIL;
+    }
+
+protected:
+    ULONG fRefCount;
+    const WCHAR* fString;
+    UINT32 fLength;
+    const WCHAR* fLocale;
+    IDWriteNumberSubstitution* fNumberSubstitution;
+};
+
+SkTypeface* SkFontMgr_DirectWrite::onMatchFamilyStyleCharacter(const char familyName[],
+                                                               const SkFontStyle& style,
+                                                               const char* bcp47[], int bcp47Count,
+                                                               SkUnichar character) const
+{
+    const DWriteStyle dwStyle(style);
+
+    const WCHAR* dwFamilyName = nullptr;
+    SkSMallocWCHAR dwFamilyNameLocal;
+    if (familyName) {
+        HRN(sk_cstring_to_wchar(familyName, &dwFamilyNameLocal));
+        dwFamilyName = dwFamilyNameLocal;
+    }
+
+    WCHAR str[16];
+    UINT32 strLen = static_cast<UINT32>(
+        SkUTF16_FromUnichar(character, reinterpret_cast<uint16_t*>(str)));
+
+    const SkSMallocWCHAR* dwBcp47;
+    SkSMallocWCHAR dwBcp47Local;
+    if (bcp47Count < 1) {
+        dwBcp47 = &fLocaleName;
+    } else {
+        // TODO: support fallback stack.
+        // TODO: DirectWrite supports 'zh-CN' or 'zh-Hans', but 'zh' misses completely
+        // and may produce a Japanese font.
+        HRN(sk_cstring_to_wchar(bcp47[bcp47Count - 1], &dwBcp47Local));
+        dwBcp47 = &dwBcp47Local;
+    }
+
+#if SK_HAS_DWRITE_2_H
+    if (fFactory2.get()) {
+        SkTScopedComPtr<IDWriteFontFallback> fontFallback;
+        HRNM(fFactory2->GetSystemFontFallback(&fontFallback), "Could not get system fallback.");
+
+        SkTScopedComPtr<IDWriteNumberSubstitution> numberSubstitution;
+        HRNM(fFactory2->CreateNumberSubstitution(DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE, nullptr, TRUE,
+                                                 &numberSubstitution),
+             "Could not create number substitution.");
+        SkTScopedComPtr<FontFallbackSource> fontFallbackSource(
+            new FontFallbackSource(str, strLen, *dwBcp47, numberSubstitution.get()));
+
+        UINT32 mappedLength;
+        SkTScopedComPtr<IDWriteFont> font;
+        FLOAT scale;
+        HRNM(fontFallback->MapCharacters(fontFallbackSource.get(),
+                                         0, // textPosition,
+                                         strLen,
+                                         fFontCollection.get(),
+                                         dwFamilyName,
+                                         dwStyle.fWeight,
+                                         dwStyle.fSlant,
+                                         dwStyle.fWidth,
+                                         &mappedLength,
+                                         &font,
+                                         &scale),
+             "Could not map characters");
+        if (!font.get()) {
+            return nullptr;
+        }
+
+        SkTScopedComPtr<IDWriteFontFace> fontFace;
+        HRNM(font->CreateFontFace(&fontFace), "Could not get font face from font.");
+
+        SkTScopedComPtr<IDWriteFontFamily> fontFamily;
+        HRNM(font->GetFontFamily(&fontFamily), "Could not get family from font.");
+        return this->createTypefaceFromDWriteFont(fontFace.get(), font.get(), fontFamily.get());
+    }
+#else
+#  pragma message("No dwrite_2.h is available, font fallback may be affected.")
+#endif
+
+    SkTScopedComPtr<IDWriteTextFormat> fallbackFormat;
+    HRNM(fFactory->CreateTextFormat(dwFamilyName ? dwFamilyName : L"",
+                                    fFontCollection.get(),
+                                    dwStyle.fWeight,
+                                    dwStyle.fSlant,
+                                    dwStyle.fWidth,
+                                    72.0f,
+                                    *dwBcp47,
+                                    &fallbackFormat),
+         "Could not create text format.");
+
+    SkTScopedComPtr<IDWriteTextLayout> fallbackLayout;
+    HRNM(fFactory->CreateTextLayout(str, strLen, fallbackFormat.get(),
+                                    200.0f, 200.0f,
+                                    &fallbackLayout),
+         "Could not create text layout.");
+
+    SkTScopedComPtr<FontFallbackRenderer> fontFallbackRenderer(
+        new FontFallbackRenderer(this, character));
+
+    HRNM(fallbackLayout->Draw(nullptr, fontFallbackRenderer.get(), 50.0f, 50.0f),
+         "Could not draw layout with renderer.");
+
+    return fontFallbackRenderer->FallbackTypeface();
+}
+
 SkTypeface* SkFontMgr_DirectWrite::onMatchFaceStyle(const SkTypeface* familyMember,
                                                     const SkFontStyle& fontstyle) const {
     SkString familyName;
@@ -506,7 +852,7 @@ public:
 
     T* detatch() {
         T* old = fUnregister;
-        fUnregister = NULL;
+        fUnregister = nullptr;
         return old;
     }
 
@@ -523,8 +869,9 @@ private:
     T* fUnregister;
 };
 
-SkTypeface* SkFontMgr_DirectWrite::onCreateFromStream(SkStream* stream, int ttcIndex) const {
+SkTypeface* SkFontMgr_DirectWrite::onCreateFromStream(SkStreamAsset* stream, int ttcIndex) const {
     SkTScopedComPtr<StreamFontFileLoader> fontFileLoader;
+    // This transfers ownership of stream to the new object.
     HRN(StreamFontFileLoader::Create(stream, &fontFileLoader));
     HRN(fFactory->RegisterFontFileLoader(fontFileLoader.get()));
     SkAutoIDWriteUnregister<StreamFontFileLoader> autoUnregisterFontFileLoader(
@@ -537,7 +884,7 @@ SkTypeface* SkFontMgr_DirectWrite::onCreateFromStream(SkStream* stream, int ttcI
         fFactory.get(), fontCollectionLoader.get());
 
     SkTScopedComPtr<IDWriteFontCollection> fontCollection;
-    HRN(fFactory->CreateCustomFontCollection(fontCollectionLoader.get(), NULL, 0, &fontCollection));
+    HRN(fFactory->CreateCustomFontCollection(fontCollectionLoader.get(), nullptr, 0, &fontCollection));
 
     // Find the first non-simulated font which has the given ttc index.
     UINT32 familyCount = fontCollection->GetFontFamilyCount();
@@ -566,17 +913,15 @@ SkTypeface* SkFontMgr_DirectWrite::onCreateFromStream(SkStream* stream, int ttcI
         }
     }
 
-    return NULL;
+    return nullptr;
 }
 
 SkTypeface* SkFontMgr_DirectWrite::onCreateFromData(SkData* data, int ttcIndex) const {
-    SkAutoTUnref<SkStream> stream(SkNEW_ARGS(SkMemoryStream, (data)));
-    return this->createFromStream(stream, ttcIndex);
+    return this->createFromStream(new SkMemoryStream(data), ttcIndex);
 }
 
 SkTypeface* SkFontMgr_DirectWrite::onCreateFromFile(const char path[], int ttcIndex) const {
-    SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path));
-    return this->createFromStream(stream, ttcIndex);
+    return this->createFromStream(SkStream::NewFromFile(path), ttcIndex);
 }
 
 HRESULT SkFontMgr_DirectWrite::getByFamilyName(const WCHAR wideFamilyName[],
@@ -615,12 +960,12 @@ SkTypeface* SkFontMgr_DirectWrite::onLegacyCreateTypeface(const char familyName[
         }
     }
 
-    if (NULL == fontFamily.get()) {
+    if (nullptr == fontFamily.get()) {
         // No family with given name, try default.
         HRNM(this->getDefaultFontFamily(&fontFamily), "Could not get default font family.");
     }
 
-    if (NULL == fontFamily.get()) {
+    if (nullptr == fontFamily.get()) {
         // Could not obtain the default font.
         HRNM(fFontCollection->GetFontFamily(0, &fontFamily),
              "Could not get default-default font family.");
@@ -723,10 +1068,10 @@ SkTypeface* SkFontStyleSet_DirectWrite::matchStyle(const SkFontStyle& pattern) {
 #include "SkTypeface_win.h"
 
 SK_API SkFontMgr* SkFontMgr_New_DirectWrite(IDWriteFactory* factory) {
-    if (NULL == factory) {
+    if (nullptr == factory) {
         factory = sk_get_dwrite_factory();
-        if (NULL == factory) {
-            return NULL;
+        if (nullptr == factory) {
+            return nullptr;
         }
     }
 
@@ -735,13 +1080,13 @@ SK_API SkFontMgr* SkFontMgr_New_DirectWrite(IDWriteFactory* factory) {
          "Could not get system font collection.");
 
     WCHAR localeNameStorage[LOCALE_NAME_MAX_LENGTH];
-    WCHAR* localeName = NULL;
+    WCHAR* localeName = nullptr;
     int localeNameLen = 0;
 
     // Dynamically load GetUserDefaultLocaleName function, as it is not available on XP.
-    SkGetUserDefaultLocaleNameProc getUserDefaultLocaleNameProc = NULL;
+    SkGetUserDefaultLocaleNameProc getUserDefaultLocaleNameProc = nullptr;
     HRESULT hr = SkGetGetUserDefaultLocaleNameProc(&getUserDefaultLocaleNameProc);
-    if (NULL == getUserDefaultLocaleNameProc) {
+    if (nullptr == getUserDefaultLocaleNameProc) {
         SK_TRACEHR(hr, "Could not get GetUserDefaultLocaleName.");
     } else {
         localeNameLen = getUserDefaultLocaleNameProc(localeNameStorage, LOCALE_NAME_MAX_LENGTH);
@@ -750,15 +1095,15 @@ SK_API SkFontMgr* SkFontMgr_New_DirectWrite(IDWriteFactory* factory) {
         };
     }
 
-    return SkNEW_ARGS(SkFontMgr_DirectWrite, (factory, sysFontCollection.get(),
-                                              localeName, localeNameLen));
+    return new SkFontMgr_DirectWrite(factory, sysFontCollection.get(), localeName, localeNameLen);
 }
 
 #include "SkFontMgr_indirect.h"
 SK_API SkFontMgr* SkFontMgr_New_DirectWriteRenderer(SkRemotableFontMgr* proxy) {
     SkAutoTUnref<SkFontMgr> impl(SkFontMgr_New_DirectWrite());
-    if (impl.get() == NULL) {
-        return NULL;
+    if (impl.get() == nullptr) {
+        return nullptr;
     }
-    return SkNEW_ARGS(SkFontMgr_Indirect, (impl.get(), proxy));
+    return new SkFontMgr_Indirect(impl.get(), proxy);
 }
+#endif//defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/src/ports/SkFontMgr_win_dw_factory.cpp b/gfx/skia/skia/src/ports/SkFontMgr_win_dw_factory.cpp
new file mode 100644
index 000000000000..52e22aec5268
--- /dev/null
+++ b/gfx/skia/skia/src/ports/SkFontMgr_win_dw_factory.cpp
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_WIN32)  // And !SKIA_GDI?
+
+#include "SkFontMgr.h"
+#include "SkTypeface_win.h"
+
+SkFontMgr* SkFontMgr::Factory() {
+    return SkFontMgr_New_DirectWrite();
+}
+
+#endif//defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/src/ports/SkFontMgr_win_gdi_factory.cpp b/gfx/skia/skia/src/ports/SkFontMgr_win_gdi_factory.cpp
new file mode 100644
index 000000000000..c1ca822c28f6
--- /dev/null
+++ b/gfx/skia/skia/src/ports/SkFontMgr_win_gdi_factory.cpp
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_WIN32)  // And SKIA_GDI?
+
+#include "SkFontMgr.h"
+#include "SkTypeface_win.h"
+
+SkFontMgr* SkFontMgr::Factory() {
+    return SkFontMgr_New_GDI();
+}
+
+#endif//defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/src/ports/SkGlobalInitialization_chromium.cpp b/gfx/skia/skia/src/ports/SkGlobalInitialization_chromium.cpp
index 137120d6b73a..8ff43f78e8d8 100644
--- a/gfx/skia/skia/src/ports/SkGlobalInitialization_chromium.cpp
+++ b/gfx/skia/skia/src/ports/SkGlobalInitialization_chromium.cpp
@@ -16,11 +16,12 @@
 #include "Sk1DPathEffect.h"
 #include "Sk2DPathEffect.h"
 #include "SkArithmeticMode.h"
-#include "SkAvoidXfermode.h"
-#include "SkBitmapSource.h"
+#include "SkArcToPathEffect.h"
+#include "SkBitmapSourceDeserializer.h"
 #include "SkBlurDrawLooper.h"
 #include "SkBlurImageFilter.h"
 #include "SkBlurMaskFilter.h"
+#include "SkColorCubeFilter.h"
 #include "SkColorFilter.h"
 #include "SkColorFilterImageFilter.h"
 #include "SkColorMatrixFilter.h"
@@ -36,15 +37,18 @@
 #include "SkEmbossMaskFilter.h"
 #include "SkFlattenable.h"
 #include "SkGradientShader.h"
+#include "SkImageSource.h"
 #include "SkLayerDrawLooper.h"
 #include "SkLayerRasterizer.h"
 #include "SkLerpXfermode.h"
 #include "SkLightingImageFilter.h"
+#include "SkLightingShader.h"
 #include "SkLocalMatrixShader.h"
 #include "SkLumaColorFilter.h"
 #include "SkMagnifierImageFilter.h"
 #include "SkMatrixConvolutionImageFilter.h"
 #include "SkMergeImageFilter.h"
+#include "SkModeColorFilter.h"
 #include "SkMorphologyImageFilter.h"
 #include "SkOffsetImageFilter.h"
 #include "SkOnce.h"
@@ -53,69 +57,91 @@
 #include "SkPictureShader.h"
 #include "SkPixelXorXfermode.h"
 #include "SkRectShaderImageFilter.h"
-#include "SkStippleMaskFilter.h"
 #include "SkTableColorFilter.h"
 #include "SkTestImageFilters.h"
 #include "SkTileImageFilter.h"
 #include "SkMatrixImageFilter.h"
 #include "SkXfermodeImageFilter.h"
 
-static void InitializeFlattenables() {
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkAvoidXfermode)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapProcShader)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapSource)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurDrawLooper)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorMatrixFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorShader)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposePathEffect)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeShader)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkCornerPathEffect)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDashPathEffect)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDilateImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDiscretePathEffect)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDisplacementMapEffect)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDropShadowImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkEmbossMaskFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkEmptyShader)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkErodeImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLayerDrawLooper)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLayerRasterizer)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLerpXfermode)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLocalMatrixShader)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLumaColorFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPath1DPathEffect)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLine2DPathEffect)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPath2DPathEffect)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPerlinNoiseShader)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPictureImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPictureShader)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPixelXorXfermode)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkRectShaderImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkStippleMaskFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkSumPathEffect)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkTileImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMatrixImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkXfermodeImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMagnifierImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMatrixConvolutionImageFilter)
+//  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+//
+//  Adding new classes to Init() below has security consequences in Chrome.
+//
+//  In particular, it is important that we don't create code paths that
+//  deserialize untrusted data as SkImageFilters; SkImageFilters are sent from
+//  Chrome renderers (untrusted) to the main (trusted) process.
+//
+//  If you add a new SkImageFilter here _or_ other effect that can be part of
+//  an SkImageFilter, it's a good idea to have chrome-security@google.com sign
+//  off on the CL, and at minimum extend SampleFilterFuzz.cpp to fuzz it.
+//
+//  SkPictures are untrusted data.  Please be extremely careful not to allow
+//  SkPictures created in a Chrome renderer to be deserialized in the main process.
+//
+//  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkOffsetImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMergeImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorFilterImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDownSampleImageFilter)
+class SkPrivateEffectInitializer {
+public:
+    static void Init() {
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkArcToPathEffect)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapProcShader)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapSourceDeserializer)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurDrawLooper)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorCubeFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorMatrixFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorShader)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposePathEffect)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeShader)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkCornerPathEffect)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDashPathEffect)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDilateImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDiscretePathEffect)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDisplacementMapEffect)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDropShadowImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkEmbossMaskFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkEmptyShader)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkErodeImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkImageSource)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLayerDrawLooper)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLayerRasterizer)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLerpXfermode)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLocalMatrixShader)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLumaColorFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPath1DPathEffect)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLine2DPathEffect)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkModeColorFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPath2DPathEffect)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPerlinNoiseShader)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPictureImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPictureShader)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPixelXorXfermode)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkRectShaderImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkSumPathEffect)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkTileImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMatrixImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkXfermodeImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMagnifierImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMatrixConvolutionImageFilter)
 
-    SkArithmeticMode::InitializeFlattenables();
-    SkBlurMaskFilter::InitializeFlattenables();
-    SkColorFilter::InitializeFlattenables();
-    SkGradientShader::InitializeFlattenables();
-    SkLightingImageFilter::InitializeFlattenables();
-    SkTableColorFilter::InitializeFlattenables();
-    SkXfermode::InitializeFlattenables();
-}
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkOffsetImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMergeImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorFilterImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDownSampleImageFilter)
 
+        SkArithmeticMode::InitializeFlattenables();
+        SkBlurMaskFilter::InitializeFlattenables();
+        SkColorFilter::InitializeFlattenables();
+        SkGradientShader::InitializeFlattenables();
+        SkLightingImageFilter::InitializeFlattenables();
+        SkLightingShader::InitializeFlattenables();
+        SkTableColorFilter::InitializeFlattenables();
+        SkXfermode::InitializeFlattenables();
+    }
+};
+
+SK_DECLARE_STATIC_ONCE(once);
 void SkFlattenable::InitializeFlattenablesIfNeeded() {
-    SK_DECLARE_STATIC_ONCE(once);
-    SkOnce(&once, InitializeFlattenables);
+    SkOnce(&once, SkPrivateEffectInitializer::Init);
 }
diff --git a/gfx/skia/skia/src/ports/SkGlobalInitialization_default.cpp b/gfx/skia/skia/src/ports/SkGlobalInitialization_default.cpp
index 5d82cd944994..3038e25c5d4f 100644
--- a/gfx/skia/skia/src/ports/SkGlobalInitialization_default.cpp
+++ b/gfx/skia/skia/src/ports/SkGlobalInitialization_default.cpp
@@ -5,22 +5,19 @@
  * found in the LICENSE file.
  */
 
-#include "SkTypes.h"
-
 #include "SkBitmapProcShader.h"
-#include "SkMallocPixelRef.h"
 #include "SkPathEffect.h"
-#include "SkPixelRef.h"
 #include "SkXfermode.h"
 
 #include "Sk1DPathEffect.h"
 #include "Sk2DPathEffect.h"
 #include "SkArithmeticMode.h"
-#include "SkAvoidXfermode.h"
-#include "SkBitmapSource.h"
+#include "SkArcToPathEffect.h"
+#include "SkBitmapSourceDeserializer.h"
 #include "SkBlurDrawLooper.h"
 #include "SkBlurImageFilter.h"
 #include "SkBlurMaskFilter.h"
+#include "SkColorCubeFilter.h"
 #include "SkColorFilter.h"
 #include "SkColorFilterImageFilter.h"
 #include "SkColorMatrixFilter.h"
@@ -36,15 +33,18 @@
 #include "SkEmbossMaskFilter.h"
 #include "SkFlattenable.h"
 #include "SkGradientShader.h"
+#include "SkImageSource.h"
 #include "SkLayerDrawLooper.h"
 #include "SkLayerRasterizer.h"
 #include "SkLerpXfermode.h"
 #include "SkLightingImageFilter.h"
+#include "SkLightingShader.h"
 #include "SkLocalMatrixShader.h"
 #include "SkLumaColorFilter.h"
 #include "SkMagnifierImageFilter.h"
 #include "SkMatrixConvolutionImageFilter.h"
 #include "SkMergeImageFilter.h"
+#include "SkModeColorFilter.h"
 #include "SkMorphologyImageFilter.h"
 #include "SkOffsetImageFilter.h"
 #include "SkOnce.h"
@@ -53,70 +53,74 @@
 #include "SkPictureShader.h"
 #include "SkPixelXorXfermode.h"
 #include "SkRectShaderImageFilter.h"
-#include "SkStippleMaskFilter.h"
 #include "SkTableColorFilter.h"
 #include "SkTestImageFilters.h"
 #include "SkTileImageFilter.h"
 #include "SkMatrixImageFilter.h"
 #include "SkXfermodeImageFilter.h"
 
-static void InitializeFlattenables() {
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkAvoidXfermode)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapProcShader)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapSource)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurDrawLooper)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorMatrixFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorShader)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposePathEffect)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeShader)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkCornerPathEffect)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDashPathEffect)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDilateImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDiscretePathEffect)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDisplacementMapEffect)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDropShadowImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkEmbossMaskFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkEmptyShader)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkErodeImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLayerDrawLooper)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLayerRasterizer)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLerpXfermode)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLocalMatrixShader)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLumaColorFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPath1DPathEffect)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLine2DPathEffect)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPath2DPathEffect)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPerlinNoiseShader)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPictureImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPictureShader)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPixelXorXfermode)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkRectShaderImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkStippleMaskFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkSumPathEffect)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkTileImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMatrixImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkXfermodeImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMagnifierImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMatrixConvolutionImageFilter)
+class SkPrivateEffectInitializer {
+public:
+    static void Init() {
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkArcToPathEffect)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapProcShader)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapSourceDeserializer)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurDrawLooper)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorCubeFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorMatrixFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorShader)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposePathEffect)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeShader)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkCornerPathEffect)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDashPathEffect)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDilateImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDiscretePathEffect)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDisplacementMapEffect)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDropShadowImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkEmbossMaskFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkEmptyShader)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkErodeImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkImageSource)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLayerDrawLooper)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLayerRasterizer)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLerpXfermode)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLocalMatrixShader)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLumaColorFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPath1DPathEffect)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLine2DPathEffect)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkModeColorFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPath2DPathEffect)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPerlinNoiseShader)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPictureImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPictureShader)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPixelXorXfermode)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkRectShaderImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkSumPathEffect)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkTileImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMatrixImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkXfermodeImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMagnifierImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMatrixConvolutionImageFilter)
 
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkOffsetImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMergeImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorFilterImageFilter)
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDownSampleImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkOffsetImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMergeImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorFilterImageFilter)
+        SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDownSampleImageFilter)
 
-    SkArithmeticMode::InitializeFlattenables();
-    SkBlurMaskFilter::InitializeFlattenables();
-    SkColorFilter::InitializeFlattenables();
-    SkGradientShader::InitializeFlattenables();
-    SkLightingImageFilter::InitializeFlattenables();
-    SkTableColorFilter::InitializeFlattenables();
-    SkXfermode::InitializeFlattenables();
-
-}
+        SkArithmeticMode::InitializeFlattenables();
+        SkBlurMaskFilter::InitializeFlattenables();
+        SkColorFilter::InitializeFlattenables();
+        SkGradientShader::InitializeFlattenables();
+        SkLightingImageFilter::InitializeFlattenables();
+        SkLightingShader::InitializeFlattenables();
+        SkTableColorFilter::InitializeFlattenables();
+        SkXfermode::InitializeFlattenables();
+    }
+};
 
+SK_DECLARE_STATIC_ONCE(once);
 void SkFlattenable::InitializeFlattenablesIfNeeded() {
-    SK_DECLARE_STATIC_ONCE(once);
-    SkOnce(&once, InitializeFlattenables);
+    SkOnce(&once, SkPrivateEffectInitializer::Init);
 }
diff --git a/gfx/skia/skia/src/ports/SkImageDecoder_CG.cpp b/gfx/skia/skia/src/ports/SkImageDecoder_CG.cpp
index 5b32502d8efa..4be587425373 100644
--- a/gfx/skia/skia/src/ports/SkImageDecoder_CG.cpp
+++ b/gfx/skia/skia/src/ports/SkImageDecoder_CG.cpp
@@ -5,6 +5,9 @@
  * found in the LICENSE file.
  */
 
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
+
 #include "SkCGUtils.h"
 #include "SkColorPriv.h"
 #include "SkImageDecoder.h"
@@ -40,6 +43,9 @@ static CGDataProviderRef SkStreamToDataProvider(SkStream* stream) {
 
 static CGImageSourceRef SkStreamToCGImageSource(SkStream* stream) {
     CGDataProviderRef data = SkStreamToDataProvider(stream);
+    if (!data) {
+        return nullptr;
+    }
     CGImageSourceRef imageSrc = CGImageSourceCreateWithDataProvider(data, 0);
     CGDataProviderRelease(data);
     return imageSrc;
@@ -47,7 +53,7 @@ static CGImageSourceRef SkStreamToCGImageSource(SkStream* stream) {
 
 class SkImageDecoder_CG : public SkImageDecoder {
 protected:
-    virtual bool onDecode(SkStream* stream, SkBitmap* bm, Mode);
+    virtual Result onDecode(SkStream* stream, SkBitmap* bm, Mode);
 };
 
 static void argb_4444_force_opaque(void* row, int count) {
@@ -102,36 +108,82 @@ static void force_opaque(SkBitmap* bm) {
 
 #define BITMAP_INFO (kCGBitmapByteOrder32Big | kCGImageAlphaPremultipliedLast)
 
-bool SkImageDecoder_CG::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
+class AutoCFDataRelease {
+    CFDataRef fDR;
+public:
+    AutoCFDataRelease(CFDataRef dr) : fDR(dr) {}
+    ~AutoCFDataRelease() { if (fDR) { CFRelease(fDR); } }
+
+    operator CFDataRef () { return fDR; }
+};
+
+static bool colorspace_is_sRGB(CGColorSpaceRef cs) {
+#ifdef SK_BUILD_FOR_IOS
+    return true;    // iOS seems to define itself to always return sRGB <reed>
+#else
+    AutoCFDataRelease data(CGColorSpaceCopyICCProfile(cs));
+    if (data) {
+        // found by inspection -- need a cleaner way to sniff a profile
+        const CFIndex ICC_PROFILE_OFFSET_TO_SRGB_TAG = 52;
+
+        if (CFDataGetLength(data) >= ICC_PROFILE_OFFSET_TO_SRGB_TAG + 4) {
+            return !memcmp(CFDataGetBytePtr(data) + ICC_PROFILE_OFFSET_TO_SRGB_TAG, "sRGB", 4);
+        }
+    }
+    return false;
+#endif
+}
+
+SkImageDecoder::Result SkImageDecoder_CG::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
     CGImageSourceRef imageSrc = SkStreamToCGImageSource(stream);
 
-    if (NULL == imageSrc) {
-        return false;
+    if (nullptr == imageSrc) {
+        return kFailure;
     }
     SkAutoTCallVProc<const void, CFRelease> arsrc(imageSrc);
 
-    CGImageRef image = CGImageSourceCreateImageAtIndex(imageSrc, 0, NULL);
-    if (NULL == image) {
-        return false;
+    CGImageRef image = CGImageSourceCreateImageAtIndex(imageSrc, 0, nullptr);
+    if (nullptr == image) {
+        return kFailure;
     }
     SkAutoTCallVProc<CGImage, CGImageRelease> arimage(image);
 
     const int width = SkToInt(CGImageGetWidth(image));
     const int height = SkToInt(CGImageGetHeight(image));
+    SkColorProfileType cpType = kLinear_SkColorProfileType;
 
-    bm->setInfo(SkImageInfo::MakeN32Premul(width, height));
-    if (SkImageDecoder::kDecodeBounds_Mode == mode) {
-        return true;
+    CGColorSpaceRef cs = CGImageGetColorSpace(image);
+    if (cs) {
+        CGColorSpaceModel m = CGColorSpaceGetModel(cs);
+        if (kCGColorSpaceModelRGB == m && colorspace_is_sRGB(cs)) {
+            cpType = kSRGB_SkColorProfileType;
+        }
     }
 
-    if (!this->allocPixelRef(bm, NULL)) {
-        return false;
+    SkAlphaType at = kPremul_SkAlphaType;
+    switch (CGImageGetAlphaInfo(image)) {
+        case kCGImageAlphaNone:
+        case kCGImageAlphaNoneSkipLast:
+        case kCGImageAlphaNoneSkipFirst:
+            at = kOpaque_SkAlphaType;
+            break;
+        default:
+            break;
+    }
+
+    bm->setInfo(SkImageInfo::Make(width, height, kN32_SkColorType, at, cpType));
+    if (SkImageDecoder::kDecodeBounds_Mode == mode) {
+        return kSuccess;
+    }
+
+    if (!this->allocPixelRef(bm, nullptr)) {
+        return kFailure;
     }
 
     SkAutoLockPixels alp(*bm);
 
     if (!SkCopyPixelsFromCGImage(bm->info(), bm->rowBytes(), bm->getPixels(), image)) {
-        return false;
+        return kFailure;
     }
 
     CGImageAlphaInfo info = CGImageGetAlphaInfo(image);
@@ -161,7 +213,7 @@ bool SkImageDecoder_CG::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
         }
         bm->setAlphaType(kUnpremul_SkAlphaType);
     }
-    return true;
+    return kSuccess;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -170,9 +222,9 @@ extern SkImageDecoder* image_decoder_from_stream(SkStreamRewindable*);
 
 SkImageDecoder* SkImageDecoder::Factory(SkStreamRewindable* stream) {
     SkImageDecoder* decoder = image_decoder_from_stream(stream);
-    if (NULL == decoder) {
+    if (nullptr == decoder) {
         // If no image decoder specific to the stream exists, use SkImageDecoder_CG.
-        return SkNEW(SkImageDecoder_CG);
+        return new SkImageDecoder_CG;
     } else {
         return decoder;
     }
@@ -181,7 +233,7 @@ SkImageDecoder* SkImageDecoder::Factory(SkStreamRewindable* stream) {
 /////////////////////////////////////////////////////////////////////////
 
 SkMovie* SkMovie::DecodeStream(SkStreamRewindable* stream) {
-    return NULL;
+    return nullptr;
 }
 
 /////////////////////////////////////////////////////////////////////////
@@ -207,12 +259,12 @@ static CGDataConsumerRef SkStreamToCGDataConsumer(SkWStream* stream) {
 static CGImageDestinationRef SkStreamToImageDestination(SkWStream* stream,
                                                         CFStringRef type) {
     CGDataConsumerRef consumer = SkStreamToCGDataConsumer(stream);
-    if (NULL == consumer) {
-        return NULL;
+    if (nullptr == consumer) {
+        return nullptr;
     }
     SkAutoTCallVProc<const void, CFRelease> arconsumer(consumer);
 
-    return CGImageDestinationCreateWithDataConsumer(consumer, type, 1, NULL);
+    return CGImageDestinationCreateWithDataConsumer(consumer, type, 1, nullptr);
 }
 
 class SkImageEncoder_CG : public SkImageEncoder {
@@ -267,18 +319,18 @@ bool SkImageEncoder_CG::onEncode(SkWStream* stream, const SkBitmap& bm,
     }
 
     CGImageDestinationRef dst = SkStreamToImageDestination(stream, type);
-    if (NULL == dst) {
+    if (nullptr == dst) {
         return false;
     }
     SkAutoTCallVProc<const void, CFRelease> ardst(dst);
 
     CGImageRef image = SkCreateCGImageRef(*bmPtr);
-    if (NULL == image) {
+    if (nullptr == image) {
         return false;
     }
     SkAutoTCallVProc<CGImage, CGImageRelease> agimage(image);
 
-    CGImageDestinationAddImage(dst, image, NULL);
+    CGImageDestinationAddImage(dst, image, nullptr);
     return CGImageDestinationFinalize(dst);
 }
 
@@ -293,9 +345,9 @@ static SkImageEncoder* sk_imageencoder_cg_factory(SkImageEncoder::Type t) {
         case SkImageEncoder::kPNG_Type:
             break;
         default:
-            return NULL;
+            return nullptr;
     }
-    return SkNEW_ARGS(SkImageEncoder_CG, (t));
+    return new SkImageEncoder_CG(t);
 }
 
 static SkImageEncoder_EncodeReg gEReg(sk_imageencoder_cg_factory);
@@ -339,16 +391,18 @@ static SkImageDecoder::Format UTType_to_Format(const CFStringRef uttype) {
 static SkImageDecoder::Format get_format_cg(SkStreamRewindable* stream) {
     CGImageSourceRef imageSrc = SkStreamToCGImageSource(stream);
 
-    if (NULL == imageSrc) {
+    if (nullptr == imageSrc) {
         return SkImageDecoder::kUnknown_Format;
     }
 
     SkAutoTCallVProc<const void, CFRelease> arsrc(imageSrc);
     const CFStringRef name = CGImageSourceGetType(imageSrc);
-    if (NULL == name) {
+    if (nullptr == name) {
         return SkImageDecoder::kUnknown_Format;
     }
     return UTType_to_Format(name);
 }
 
 static SkImageDecoder_FormatReg gFormatReg(get_format_cg);
+
+#endif//defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
diff --git a/gfx/skia/skia/src/ports/SkImageDecoder_WIC.cpp b/gfx/skia/skia/src/ports/SkImageDecoder_WIC.cpp
index 3309af4685cc..fa408836a4a4 100644
--- a/gfx/skia/skia/src/ports/SkImageDecoder_WIC.cpp
+++ b/gfx/skia/skia/src/ports/SkImageDecoder_WIC.cpp
@@ -8,6 +8,8 @@
 
 #include "SkTypes.h"
 
+#if defined(SK_BUILD_FOR_WIN32)
+
 // Workaround for:
 // http://connect.microsoft.com/VisualStudio/feedback/details/621653/
 // http://crbug.com/225822
@@ -60,14 +62,14 @@ public:
      *  Helper function to decode an SkStream.
      *  @param stream SkStream to decode. Must be at the beginning.
      *  @param bm   SkBitmap to decode into. Only used if wicMode is kDecodeBounds_WICMode or
-     *      kDecodePixels_WICMode, in which case it must not be NULL.
+     *      kDecodePixels_WICMode, in which case it must not be nullptr.
      *  @param format Out parameter for the SkImageDecoder::Format of the SkStream. Only used if
      *      wicMode is kDecodeFormat_WICMode.
      */
     bool decodeStream(SkStream* stream, SkBitmap* bm, WICModes wicMode, Format* format) const;
 
 protected:
-    virtual bool onDecode(SkStream* stream, SkBitmap* bm, Mode mode) SK_OVERRIDE;
+    Result onDecode(SkStream* stream, SkBitmap* bm, Mode mode) override;
 };
 
 struct FormatConversion {
@@ -92,7 +94,7 @@ static SkImageDecoder::Format GuidContainerFormat_to_Format(REFGUID guid) {
     return SkImageDecoder::kUnknown_Format;
 }
 
-bool SkImageDecoder_WIC::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
+SkImageDecoder::Result SkImageDecoder_WIC::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
     WICModes wicMode;
     switch (mode) {
         case SkImageDecoder::kDecodeBounds_Mode:
@@ -102,7 +104,7 @@ bool SkImageDecoder_WIC::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
             wicMode = kDecodePixels_WICMode;
             break;
     }
-    return this->decodeStream(stream, bm, wicMode, NULL);
+    return this->decodeStream(stream, bm, wicMode, nullptr) ? kSuccess : kFailure;
 }
 
 bool SkImageDecoder_WIC::decodeStream(SkStream* stream, SkBitmap* bm, WICModes wicMode,
@@ -120,7 +122,7 @@ bool SkImageDecoder_WIC::decodeStream(SkStream* stream, SkBitmap* bm, WICModes w
     if (SUCCEEDED(hr)) {
         hr = CoCreateInstance(
             CLSID_WICImagingFactory
-            , NULL
+            , nullptr
             , CLSCTX_INPROC_SERVER
             , IID_PPV_ARGS(&piImagingFactory)
         );
@@ -135,7 +137,7 @@ bool SkImageDecoder_WIC::decodeStream(SkStream* stream, SkBitmap* bm, WICModes w
     //Make sure we're at the beginning of the stream.
     if (SUCCEEDED(hr)) {
         LARGE_INTEGER liBeginning = { 0 };
-        hr = piStream->Seek(liBeginning, STREAM_SEEK_SET, NULL);
+        hr = piStream->Seek(liBeginning, STREAM_SEEK_SET, nullptr);
     }
 
     //Create the decoder from the stream content.
@@ -143,14 +145,14 @@ bool SkImageDecoder_WIC::decodeStream(SkStream* stream, SkBitmap* bm, WICModes w
     if (SUCCEEDED(hr)) {
         hr = piImagingFactory->CreateDecoderFromStream(
             piStream.get()                    //Image to be decoded
-            , NULL                            //No particular vendor
+            , nullptr                            //No particular vendor
             , WICDecodeMetadataCacheOnDemand  //Cache metadata when needed
             , &piBitmapDecoder                //Pointer to the decoder
         );
     }
 
     if (kDecodeFormat_WICMode == wicMode) {
-        SkASSERT(format != NULL);
+        SkASSERT(format != nullptr);
         //Get the format
         if (SUCCEEDED(hr)) {
             GUID guidFormat;
@@ -190,7 +192,7 @@ bool SkImageDecoder_WIC::decodeStream(SkStream* stream, SkBitmap* bm, WICModes w
         if (kDecodeBounds_WICMode == wicMode) {
             return true;
         }
-        if (!this->allocPixelRef(bm, NULL)) {
+        if (!this->allocPixelRef(bm, nullptr)) {
             return false;
         }
     }
@@ -213,7 +215,7 @@ bool SkImageDecoder_WIC::decodeStream(SkStream* stream, SkBitmap* bm, WICModes w
             piBitmapSourceOriginal.get()      //Input bitmap to convert
             , destinationPixelFormat          //Destination pixel format
             , WICBitmapDitherTypeNone         //Specified dither patterm
-            , NULL                            //Specify a particular palette
+            , nullptr                            //Specify a particular palette
             , 0.f                             //Alpha threshold
             , WICBitmapPaletteTypeCustom      //Palette translation type
         );
@@ -233,7 +235,7 @@ bool SkImageDecoder_WIC::decodeStream(SkStream* stream, SkBitmap* bm, WICModes w
         bm->eraseColor(SK_ColorTRANSPARENT);
         const UINT stride = (UINT) bm->rowBytes();
         hr = piBitmapSourceConverted->CopyPixels(
-            NULL,                             //Get all the pixels
+            nullptr,                             //Get all the pixels
             stride,
             stride * height,
             reinterpret_cast<BYTE *>(bm->getPixels())
@@ -254,9 +256,9 @@ extern SkImageDecoder* image_decoder_from_stream(SkStreamRewindable*);
 
 SkImageDecoder* SkImageDecoder::Factory(SkStreamRewindable* stream) {
     SkImageDecoder* decoder = image_decoder_from_stream(stream);
-    if (NULL == decoder) {
+    if (nullptr == decoder) {
         // If no image decoder specific to the stream exists, use SkImageDecoder_WIC.
-        return SkNEW(SkImageDecoder_WIC);
+        return new SkImageDecoder_WIC;
     } else {
         return decoder;
     }
@@ -265,7 +267,7 @@ SkImageDecoder* SkImageDecoder::Factory(SkStreamRewindable* stream) {
 /////////////////////////////////////////////////////////////////////////
 
 SkMovie* SkMovie::DecodeStream(SkStreamRewindable* stream) {
-    return NULL;
+    return nullptr;
 }
 
 /////////////////////////////////////////////////////////////////////////
@@ -345,7 +347,7 @@ bool SkImageEncoder_WIC::onEncode(SkWStream* stream
     if (SUCCEEDED(hr)) {
         hr = CoCreateInstance(
             CLSID_WICImagingFactory
-            , NULL
+            , nullptr
             , CLSCTX_INPROC_SERVER
             , IID_PPV_ARGS(&piImagingFactory)
         );
@@ -360,7 +362,7 @@ bool SkImageEncoder_WIC::onEncode(SkWStream* stream
     //Create an encode of the appropriate type.
     SkTScopedComPtr<IWICBitmapEncoder> piEncoder;
     if (SUCCEEDED(hr)) {
-        hr = piImagingFactory->CreateEncoder(type, NULL, &piEncoder);
+        hr = piImagingFactory->CreateEncoder(type, nullptr, &piEncoder);
     }
 
     if (SUCCEEDED(hr)) {
@@ -445,9 +447,9 @@ static SkImageEncoder* sk_imageencoder_wic_factory(SkImageEncoder::Type t) {
         case SkImageEncoder::kPNG_Type:
             break;
         default:
-            return NULL;
+            return nullptr;
     }
-    return SkNEW_ARGS(SkImageEncoder_WIC, (t));
+    return new SkImageEncoder_WIC(t);
 }
 
 static SkImageEncoder_EncodeReg gEReg(sk_imageencoder_wic_factory);
@@ -455,10 +457,12 @@ static SkImageEncoder_EncodeReg gEReg(sk_imageencoder_wic_factory);
 static SkImageDecoder::Format get_format_wic(SkStreamRewindable* stream) {
     SkImageDecoder::Format format;
     SkImageDecoder_WIC codec;
-    if (!codec.decodeStream(stream, NULL, SkImageDecoder_WIC::kDecodeFormat_WICMode, &format)) {
+    if (!codec.decodeStream(stream, nullptr, SkImageDecoder_WIC::kDecodeFormat_WICMode, &format)) {
         format = SkImageDecoder::kUnknown_Format;
     }
     return format;
 }
 
 static SkImageDecoder_FormatReg gFormatReg(get_format_wic);
+
+#endif // defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/src/ports/SkImageDecoder_empty.cpp b/gfx/skia/skia/src/ports/SkImageDecoder_empty.cpp
index 7824732bb932..11c3db1afc51 100644
--- a/gfx/skia/skia/src/ports/SkImageDecoder_empty.cpp
+++ b/gfx/skia/skia/src/ports/SkImageDecoder_empty.cpp
@@ -11,10 +11,10 @@
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkMovie.h"
+#include "SkStream.h"
 
 class SkColorTable;
-class SkStream;
-class SkStreamRewindable;
+class SkPngChunkReader;
 
 // Empty implementations for SkImageDecoder.
 
@@ -23,7 +23,7 @@ SkImageDecoder::SkImageDecoder() {}
 SkImageDecoder::~SkImageDecoder() {}
 
 SkImageDecoder* SkImageDecoder::Factory(SkStreamRewindable*) {
-    return NULL;
+    return nullptr;
 }
 
 void SkImageDecoder::copyFieldsToOther(SkImageDecoder* ) {}
@@ -32,8 +32,8 @@ bool SkImageDecoder::DecodeFile(const char[], SkBitmap*, SkColorType, Mode, Form
     return false;
 }
 
-bool SkImageDecoder::decode(SkStream*, SkBitmap*, SkColorType, Mode) {
-    return false;
+SkImageDecoder::Result SkImageDecoder::decode(SkStream*, SkBitmap*, SkColorType, Mode) {
+    return kFailure;
 }
 
 bool SkImageDecoder::DecodeStream(SkStreamRewindable*, SkBitmap*, SkColorType, Mode, Format*) {
@@ -44,11 +44,8 @@ bool SkImageDecoder::DecodeMemory(const void*, size_t, SkBitmap*, SkColorType, M
     return false;
 }
 
-bool SkImageDecoder::buildTileIndex(SkStreamRewindable*, int *width, int *height) {
-    return false;
-}
-
-bool SkImageDecoder::decodeSubset(SkBitmap*, const SkIRect&, SkColorType) {
+bool SkImageDecoder::decodeYUV8Planes(SkStream*, SkISize[3], void*[3],
+                                      size_t[3], SkYUVColorSpace*) {
     return false;
 }
 
@@ -61,36 +58,19 @@ SkImageDecoder::Format SkImageDecoder::GetStreamFormat(SkStreamRewindable*) {
 }
 
 const char* SkImageDecoder::GetFormatName(Format) {
-    return NULL;
+    return nullptr;
 }
 
-SkImageDecoder::Peeker* SkImageDecoder::setPeeker(Peeker*) {
-    return NULL;
+SkPngChunkReader* SkImageDecoder::setPeeker(SkPngChunkReader*) {
+    return nullptr;
 }
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER
-SkImageDecoder::Chooser* SkImageDecoder::setChooser(Chooser*) {
-    return NULL;
-}
-#endif
-
 SkBitmap::Allocator* SkImageDecoder::setAllocator(SkBitmap::Allocator*) {
-    return NULL;
+    return nullptr;
 }
 
 void SkImageDecoder::setSampleSize(int) {}
 
-bool SkImageDecoder::cropBitmap(SkBitmap*, SkBitmap*, int, int, int, int, int,
-                    int, int) {
-    return false;
-}
-
-#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER
-bool SkImageDecoder::chooseFromOneChoice(SkColorType, int, int) const {
-    return false;
-}
-#endif
-
 bool SkImageDecoder::allocPixelRef(SkBitmap*, SkColorTable*) const {
     return false;
 }
@@ -100,7 +80,7 @@ bool SkImageDecoder::allocPixelRef(SkBitmap*, SkColorTable*) const {
 // Empty implementation for SkMovie.
 
 SkMovie* SkMovie::DecodeStream(SkStreamRewindable* stream) {
-    return NULL;
+    return nullptr;
 }
 
 /////////////////////////////////////////////////////////////////////////
@@ -108,7 +88,7 @@ SkMovie* SkMovie::DecodeStream(SkStreamRewindable* stream) {
 // Empty implementations for SkImageEncoder.
 
 SkImageEncoder* SkImageEncoder::Create(Type t) {
-    return NULL;
+    return nullptr;
 }
 
 bool SkImageEncoder::EncodeFile(const char file[], const SkBitmap&, Type, int quality) {
@@ -120,7 +100,12 @@ bool SkImageEncoder::EncodeStream(SkWStream*, const SkBitmap&, SkImageEncoder::T
 }
 
 SkData* SkImageEncoder::EncodeData(const SkBitmap&, Type, int quality) {
-    return NULL;
+    return nullptr;
+}
+
+SkData* SkImageEncoder::EncodeData(const SkImageInfo&, const void* pixels, size_t rowBytes,
+                                   Type, int quality) {
+    return nullptr;
 }
 
 bool SkImageEncoder::encodeStream(SkWStream*, const SkBitmap&, int) {
@@ -128,7 +113,7 @@ bool SkImageEncoder::encodeStream(SkWStream*, const SkBitmap&, int) {
 }
 
 SkData* SkImageEncoder::encodeData(const SkBitmap&, int) {
-    return NULL;
+    return nullptr;
 }
 
 bool SkImageEncoder::encodeFile(const char file[], const SkBitmap& bm, int quality) {
diff --git a/gfx/skia/skia/src/ports/SkImageGenerator_none.cpp b/gfx/skia/skia/src/ports/SkImageGenerator_none.cpp
new file mode 100644
index 000000000000..2dce1c2dc4ce
--- /dev/null
+++ b/gfx/skia/skia/src/ports/SkImageGenerator_none.cpp
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2015 The Android Open Source Project
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkImageGenerator.h"
+
+SkImageGenerator* SkImageGenerator::NewFromEncodedImpl(SkData*) {
+    return nullptr;
+}
diff --git a/gfx/skia/skia/src/ports/SkImageGenerator_skia.cpp b/gfx/skia/skia/src/ports/SkImageGenerator_skia.cpp
new file mode 100644
index 000000000000..afcd4b4a924c
--- /dev/null
+++ b/gfx/skia/skia/src/ports/SkImageGenerator_skia.cpp
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2015 The Android Open Source Project
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkData.h"
+#include "SkImageDecoder.h"
+#include "SkImageGenerator.h"
+#include "SkStream.h"
+
+class BareMemoryAllocator : public SkBitmap::Allocator {
+    const SkImageInfo   fInfo;
+    void* const         fMemory;
+    const size_t        fRowBytes;
+
+public:
+    BareMemoryAllocator(const SkImageInfo& info, void* memory, size_t rowBytes)
+        : fInfo(info), fMemory(memory), fRowBytes(rowBytes)
+    {}
+
+protected:
+    bool allocPixelRef(SkBitmap* bm, SkColorTable* ctable) override {
+        const SkImageInfo bmi = bm->info();
+        if (bmi.width() != fInfo.width() || bmi.height() != fInfo.height() ||
+            bmi.colorType() != fInfo.colorType())
+        {
+            return false;
+        }
+        return bm->installPixels(bmi, fMemory, fRowBytes, ctable, nullptr, nullptr);
+    }
+};
+
+class SkImageDecoderGenerator : public SkImageGenerator {
+    const SkImageInfo               fInfo;
+    SkAutoTDelete<SkImageDecoder>   fDecoder;
+    SkAutoTUnref<SkData>            fData;
+
+public:
+    SkImageDecoderGenerator(const SkImageInfo& info, SkImageDecoder* decoder, SkData* data)
+        : INHERITED(info), fInfo(info), fDecoder(decoder), fData(SkRef(data))
+    {}
+
+protected:
+    SkData* onRefEncodedData() override {
+        return SkRef(fData.get());
+    }
+    bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
+                     SkPMColor ctableEntries[], int* ctableCount) override {
+        SkMemoryStream stream(fData->data(), fData->size(), false);
+        SkAutoTUnref<BareMemoryAllocator> allocator(
+                new BareMemoryAllocator(info, pixels, rowBytes));
+        fDecoder->setAllocator(allocator);
+        fDecoder->setRequireUnpremultipliedColors(kUnpremul_SkAlphaType == info.alphaType());
+
+        SkBitmap bm;
+        const SkImageDecoder::Result result = fDecoder->decode(&stream, &bm, info.colorType(),
+                                                               SkImageDecoder::kDecodePixels_Mode);
+        if (SkImageDecoder::kFailure == result) {
+            return false;
+        }
+
+        SkASSERT(info.colorType() == bm.info().colorType());
+
+        if (kIndex_8_SkColorType == info.colorType()) {
+            SkASSERT(ctableEntries);
+
+            SkColorTable* ctable = bm.getColorTable();
+            if (nullptr == ctable) {
+                return false;
+            }
+            const int count = ctable->count();
+            memcpy(ctableEntries, ctable->readColors(), count * sizeof(SkPMColor));
+            *ctableCount = count;
+        }
+        return true;
+    }
+
+    bool onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3],
+                         SkYUVColorSpace* colorSpace) override {
+        SkMemoryStream stream(fData->data(), fData->size(), false);
+        return fDecoder->decodeYUV8Planes(&stream, sizes, planes, rowBytes, colorSpace);
+    }
+
+private:
+    typedef SkImageGenerator INHERITED;
+};
+
+SkImageGenerator* SkImageGenerator::NewFromEncodedImpl(SkData* data) {
+    SkMemoryStream stream(data->data(), data->size(), false);
+    SkImageDecoder* decoder = SkImageDecoder::Factory(&stream);
+    if (nullptr == decoder) {
+        return nullptr;
+    }
+
+    SkBitmap bm;
+    stream.rewind();
+    if (!decoder->decode(&stream, &bm, kUnknown_SkColorType, SkImageDecoder::kDecodeBounds_Mode)) {
+        delete decoder;
+        return nullptr;
+    }
+
+    return new SkImageDecoderGenerator(bm.info(), decoder, data);
+}
diff --git a/gfx/skia/skia/src/ports/SkMemory_malloc.cpp b/gfx/skia/skia/src/ports/SkMemory_malloc.cpp
index 0b936c9f8cdd..6ad01daca0fe 100644
--- a/gfx/skia/skia/src/ports/SkMemory_malloc.cpp
+++ b/gfx/skia/skia/src/ports/SkMemory_malloc.cpp
@@ -1,12 +1,12 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 #include "SkTypes.h"
-#include <stdio.h>
+
 #include <stdlib.h>
 
 #define SK_DEBUGFAILF(fmt, ...) \
@@ -19,8 +19,8 @@ static inline void sk_out_of_memory(size_t size) {
 }
 
 static inline void* throw_on_failure(size_t size, void* p) {
-    if (size > 0 && p == NULL) {
-        // If we've got a NULL here, the only reason we should have failed is running out of RAM.
+    if (size > 0 && p == nullptr) {
+        // If we've got a nullptr here, the only reason we should have failed is running out of RAM.
         sk_out_of_memory(size);
     }
     return p;
diff --git a/gfx/skia/skia/src/ports/SkMutex_pthread.h b/gfx/skia/skia/src/ports/SkMutex_pthread.h
deleted file mode 100644
index 9aaa0612e769..000000000000
--- a/gfx/skia/skia/src/ports/SkMutex_pthread.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkMutex_pthread_DEFINED
-#define SkMutex_pthread_DEFINED
-
-/** Posix pthread_mutex based mutex. */
-
-#include <errno.h>
-#include <pthread.h>
-
-// This isn't technically portable, but on Linux and Android pthread_t is some sort of int, and
-// on Darwin it's a pointer.  So assuming pthread_self() never returns 0, it works as a sentinel.
-SkDEBUGCODE(static const pthread_t kNoOwner = 0;)
-
-// A SkBaseMutex is a POD structure that can be directly initialized
-// at declaration time with SK_DECLARE_STATIC/GLOBAL_MUTEX. This avoids the
-// generation of a static initializer in the final machine code (and
-// a corresponding static finalizer).
-struct SkBaseMutex {
-    void acquire() {
-        SkASSERT(0 == pthread_equal(fOwner, pthread_self()));  // SkMutex is not re-entrant
-        pthread_mutex_lock(&fMutex);
-        SkDEBUGCODE(fOwner = pthread_self();)
-    }
-    void release() {
-        this->assertHeld();
-        SkDEBUGCODE(fOwner = kNoOwner;)
-        pthread_mutex_unlock(&fMutex);
-    }
-    void assertHeld() {
-        SkASSERT(0 != pthread_equal(fOwner, pthread_self()));
-    }
-
-    pthread_mutex_t fMutex;
-    SkDEBUGCODE(pthread_t fOwner;)
-};
-
-// A normal mutex that requires to be initialized through normal C++ construction,
-// i.e. when it's a member of another class, or allocated on the heap.
-class SkMutex : public SkBaseMutex {
-public:
-    SkMutex() {
-        SkDEBUGCODE(int status = )pthread_mutex_init(&fMutex, NULL);
-        SkDEBUGCODE(
-            if (status != 0) {
-                print_pthread_error(status);
-                SkASSERT(0 == status);
-            }
-            fOwner = kNoOwner;
-        )
-    }
-
-    ~SkMutex() {
-        SkDEBUGCODE(int status = )pthread_mutex_destroy(&fMutex);
-        SkDEBUGCODE(
-            if (status != 0) {
-                print_pthread_error(status);
-                SkASSERT(0 == status);
-            }
-        )
-    }
-
-private:
-    SkMutex(const SkMutex&);
-    SkMutex& operator=(const SkMutex&);
-
-    static void print_pthread_error(int status) {
-        switch (status) {
-        case 0: // success
-            break;
-        case EINVAL:
-            SkDebugf("pthread error [%d] EINVAL\n", status);
-            break;
-        case EBUSY:
-            SkDebugf("pthread error [%d] EBUSY\n", status);
-            break;
-        default:
-            SkDebugf("pthread error [%d] unknown\n", status);
-            break;
-        }
-    }
-};
-
-#define SK_BASE_MUTEX_INIT { PTHREAD_MUTEX_INITIALIZER, SkDEBUGCODE(0) }
-
-// Using POD-style initialization prevents the generation of a static initializer.
-//
-// Without magic statics there are no thread safety guarantees on initialization
-// of local statics (even POD). As a result, it is illegal to use
-// SK_DECLARE_STATIC_MUTEX in a function.
-//
-// Because SkBaseMutex is not a primitive, a static SkBaseMutex cannot be
-// initialized in a class with this macro.
-#define SK_DECLARE_STATIC_MUTEX(name) namespace {} static SkBaseMutex name = SK_BASE_MUTEX_INIT
-
-#endif
diff --git a/gfx/skia/skia/src/ports/SkMutex_win.h b/gfx/skia/skia/src/ports/SkMutex_win.h
deleted file mode 100644
index fe06336a90a0..000000000000
--- a/gfx/skia/skia/src/ports/SkMutex_win.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkMutex_win_DEFINED
-#define SkMutex_win_DEFINED
-
-/** Windows CriticalSection based mutex. */
-
-#ifndef WIN32_LEAN_AND_MEAN
-#  define WIN32_LEAN_AND_MEAN
-#  define WIN32_IS_MEAN_WAS_LOCALLY_DEFINED
-#endif
-#ifndef NOMINMAX
-#  define NOMINMAX
-#  define NOMINMAX_WAS_LOCALLY_DEFINED
-#endif
-#
-#include <windows.h>
-#
-#ifdef WIN32_IS_MEAN_WAS_LOCALLY_DEFINED
-#  undef WIN32_IS_MEAN_WAS_LOCALLY_DEFINED
-#  undef WIN32_LEAN_AND_MEAN
-#endif
-#ifdef NOMINMAX_WAS_LOCALLY_DEFINED
-#  undef NOMINMAX_WAS_LOCALLY_DEFINED
-#  undef NOMINMAX
-#endif
-
-// On Windows, SkBaseMutex and SkMutex are the same thing,
-// we can't easily get rid of static initializers. However,
-// we preserve the same inheritance pattern as other platforms
-// so that we can forward-declare cleanly.
-struct SkBaseMutex {
-public:
-    SkBaseMutex() {
-        InitializeCriticalSection(&fStorage);
-        SkDEBUGCODE(fOwner = 0;)
-    }
-
-    ~SkBaseMutex() {
-        SkASSERT(0 == fOwner);
-        DeleteCriticalSection(&fStorage);
-    }
-
-    void acquire() {
-        EnterCriticalSection(&fStorage);
-        SkDEBUGCODE(fOwner = GetCurrentThreadId();)
-    }
-
-    void release() {
-        this->assertHeld();
-        SkDEBUGCODE(fOwner = 0;)
-        LeaveCriticalSection(&fStorage);
-    }
-
-    void assertHeld() {
-        SkASSERT(GetCurrentThreadId() == fOwner);
-    }
-
-protected:
-    CRITICAL_SECTION fStorage;
-    SkDEBUGCODE(DWORD fOwner;)
-
-private:
-    SkBaseMutex(const SkBaseMutex&);
-    SkBaseMutex& operator=(const SkBaseMutex&);
-};
-
-class SkMutex : public SkBaseMutex { };
-
-// Windows currently provides no documented means of POD initializing a CRITICAL_SECTION.
-// As a result, it is illegal to SK_DECLARE_STATIC_MUTEX in a function.
-#define SK_DECLARE_STATIC_MUTEX(name) namespace{} static SkBaseMutex name
-
-#endif
diff --git a/gfx/skia/skia/src/ports/SkOSFile_none.cpp b/gfx/skia/skia/src/ports/SkOSFile_none.cpp
deleted file mode 100644
index 11723c24f311..000000000000
--- a/gfx/skia/skia/src/ports/SkOSFile_none.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkOSFile.h"
-
-bool sk_exists(const char *path, SkFILE_Flags flags) {
-    return false;
-}
-
-bool sk_fidentical(SkFILE* a, SkFILE* b) {
-    return false;
-}
-
-int sk_fileno(SkFILE* f) {
-    return -1;
-}
-
-void sk_fmunmap(const void* addr, size_t length) { }
-
-void* sk_fdmmap(int fd, size_t* size) {
-    return NULL;
-}
-
-void* sk_fmmap(SkFILE* f, size_t* size) {
-    return NULL;
-}
diff --git a/gfx/skia/skia/src/ports/SkOSFile_posix.cpp b/gfx/skia/skia/src/ports/SkOSFile_posix.cpp
index b5dc4ac09b0f..396de68bbe8e 100644
--- a/gfx/skia/skia/src/ports/SkOSFile_posix.cpp
+++ b/gfx/skia/skia/src/ports/SkOSFile_posix.cpp
@@ -6,10 +6,14 @@
  */
 
 #include "SkOSFile.h"
-
+#include "SkString.h"
 #include "SkTFitsIn.h"
+#include "SkTemplates.h"
+#include "SkTypes.h"
 
+#include <dirent.h>
 #include <stdio.h>
+#include <string.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -31,8 +35,8 @@ typedef struct {
     ino_t ino;
 } SkFILEID;
 
-static bool sk_ino(SkFILE* a, SkFILEID* id) {
-    int fd = fileno((FILE*)a);
+static bool sk_ino(FILE* a, SkFILEID* id) {
+    int fd = fileno(a);
     if (fd < 0) {
         return 0;
     }
@@ -45,7 +49,7 @@ static bool sk_ino(SkFILE* a, SkFILEID* id) {
     return true;
 }
 
-bool sk_fidentical(SkFILE* a, SkFILE* b) {
+bool sk_fidentical(FILE* a, FILE* b) {
     SkFILEID aID, bID;
     return sk_ino(a, &aID) && sk_ino(b, &bID)
            && aID.ino == bID.ino
@@ -59,34 +63,119 @@ void sk_fmunmap(const void* addr, size_t length) {
 void* sk_fdmmap(int fd, size_t* size) {
     struct stat status;
     if (0 != fstat(fd, &status)) {
-        return NULL;
+        return nullptr;
     }
     if (!S_ISREG(status.st_mode)) {
-        return NULL;
+        return nullptr;
     }
     if (!SkTFitsIn<size_t>(status.st_size)) {
-        return NULL;
+        return nullptr;
     }
     size_t fileSize = static_cast<size_t>(status.st_size);
 
-    void* addr = mmap(NULL, fileSize, PROT_READ, MAP_PRIVATE, fd, 0);
+    void* addr = mmap(nullptr, fileSize, PROT_READ, MAP_PRIVATE, fd, 0);
     if (MAP_FAILED == addr) {
-        return NULL;
+        return nullptr;
     }
 
     *size = fileSize;
     return addr;
 }
 
-int sk_fileno(SkFILE* f) {
-    return fileno((FILE*)f);
+int sk_fileno(FILE* f) {
+    return fileno(f);
 }
 
-void* sk_fmmap(SkFILE* f, size_t* size) {
+void* sk_fmmap(FILE* f, size_t* size) {
     int fd = sk_fileno(f);
     if (fd < 0) {
-        return NULL;
+        return nullptr;
     }
 
     return sk_fdmmap(fd, size);
 }
+
+////////////////////////////////////////////////////////////////////////////
+
+struct SkOSFileIterData {
+    SkOSFileIterData() : fDIR(0) { }
+    DIR* fDIR;
+    SkString fPath, fSuffix;
+};
+static_assert(sizeof(SkOSFileIterData) <= SkOSFile::Iter::kStorageSize, "not_enough_space");
+
+SkOSFile::Iter::Iter() { new (fSelf.get()) SkOSFileIterData; }
+
+SkOSFile::Iter::Iter(const char path[], const char suffix[]) {
+    new (fSelf.get()) SkOSFileIterData;
+    this->reset(path, suffix);
+}
+
+SkOSFile::Iter::~Iter() {
+    SkOSFileIterData& self = *static_cast<SkOSFileIterData*>(fSelf.get());
+    if (self.fDIR) {
+        ::closedir(self.fDIR);
+    }
+    self.~SkOSFileIterData();
+}
+
+void SkOSFile::Iter::reset(const char path[], const char suffix[]) {
+    SkOSFileIterData& self = *static_cast<SkOSFileIterData*>(fSelf.get());
+    if (self.fDIR) {
+        ::closedir(self.fDIR);
+        self.fDIR = 0;
+    }
+
+    self.fPath.set(path);
+    if (path) {
+        self.fDIR = ::opendir(path);
+        self.fSuffix.set(suffix);
+    } else {
+        self.fSuffix.reset();
+    }
+}
+
+// returns true if suffix is empty, or if str ends with suffix
+static bool issuffixfor(const SkString& suffix, const char str[]) {
+    size_t  suffixLen = suffix.size();
+    size_t  strLen = strlen(str);
+
+    return  strLen >= suffixLen &&
+            memcmp(suffix.c_str(), str + strLen - suffixLen, suffixLen) == 0;
+}
+
+bool SkOSFile::Iter::next(SkString* name, bool getDir) {
+    SkOSFileIterData& self = *static_cast<SkOSFileIterData*>(fSelf.get());
+    if (self.fDIR) {
+        dirent* entry;
+
+        while ((entry = ::readdir(self.fDIR)) != nullptr) {
+            struct stat s;
+            SkString str(self.fPath);
+
+            if (!str.endsWith("/") && !str.endsWith("\\")) {
+                str.append("/");
+            }
+            str.append(entry->d_name);
+
+            if (0 == stat(str.c_str(), &s)) {
+                if (getDir) {
+                    if (s.st_mode & S_IFDIR) {
+                        break;
+                    }
+                } else {
+                    if (!(s.st_mode & S_IFDIR) && issuffixfor(self.fSuffix, entry->d_name)) {
+                        break;
+                    }
+                }
+            }
+        }
+        if (entry) { // we broke out with a file
+            if (name) {
+                name->set(entry->d_name);
+            }
+            return true;
+        }
+    }
+    return false;
+}
diff --git a/gfx/skia/skia/src/ports/SkOSFile_stdio.cpp b/gfx/skia/skia/src/ports/SkOSFile_stdio.cpp
index d63462549c33..3371bb7031b7 100644
--- a/gfx/skia/skia/src/ports/SkOSFile_stdio.cpp
+++ b/gfx/skia/skia/src/ports/SkOSFile_stdio.cpp
@@ -6,18 +6,46 @@
  */
 
 #include "SkOSFile.h"
+#include "SkTypes.h"
 
 #include <errno.h>
 #include <stdio.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 
 #ifdef _WIN32
 #include <direct.h>
 #include <io.h>
 #endif
 
-SkFILE* sk_fopen(const char path[], SkFILE_Flags flags) {
+#ifdef SK_BUILD_FOR_IOS
+#import <CoreFoundation/CoreFoundation.h>
+
+static FILE* ios_open_from_bundle(const char path[], const char* perm) {
+    // Get a reference to the main bundle
+    CFBundleRef mainBundle = CFBundleGetMainBundle();
+    
+    // Get a reference to the file's URL
+    CFStringRef pathRef = CFStringCreateWithCString(NULL, path, kCFStringEncodingUTF8);
+    CFURLRef imageURL = CFBundleCopyResourceURL(mainBundle, pathRef, NULL, NULL);
+    if (!imageURL) {
+        return nullptr;
+    }
+    
+    // Convert the URL reference into a string reference
+    CFStringRef imagePath = CFURLCopyFileSystemPath(imageURL, kCFURLPOSIXPathStyle);
+    
+    // Get the system encoding method
+    CFStringEncoding encodingMethod = CFStringGetSystemEncoding();
+    
+    // Convert the string reference into a C string
+    const char *finalPath = CFStringGetCStringPtr(imagePath, encodingMethod);
+   
+    return fopen(finalPath, perm);
+}
+#endif
+
+
+FILE* sk_fopen(const char path[], SkFILE_Flags flags) {
     char    perm[4];
     char*   p = perm;
 
@@ -29,96 +57,113 @@ SkFILE* sk_fopen(const char path[], SkFILE_Flags flags) {
     }
     *p++ = 'b';
     *p = 0;
-
+    
     //TODO: on Windows fopen is just ASCII or the current code page,
     //convert to utf16 and use _wfopen
-    return (SkFILE*)::fopen(path, perm);
+    FILE* file = nullptr;
+#ifdef SK_BUILD_FOR_IOS
+    // if read-only, try to open from bundle first
+    if (kRead_SkFILE_Flag == flags) {
+        file = ios_open_from_bundle(path, perm);
+    }
+    // otherwise just read from the Documents directory (default)
+    if (!file) {
+#endif
+        file = ::fopen(path, perm);
+#ifdef SK_BUILD_FOR_IOS
+    }
+#endif
+    if (nullptr == file && (flags & kWrite_SkFILE_Flag)) {
+        SkDEBUGF(("sk_fopen: fopen(\"%s\", \"%s\") returned NULL (errno:%d): %s\n",
+                  path, perm, errno, strerror(errno)));
+    }
+    return file;
 }
 
-char* sk_fgets(char* str, int size, SkFILE* f) {
+char* sk_fgets(char* str, int size, FILE* f) {
     return ::fgets(str, size, (FILE *)f);
 }
 
-int sk_feof(SkFILE *f) {
+int sk_feof(FILE *f) {
     // no :: namespace qualifier because it breaks android
     return feof((FILE *)f);
 }
 
-size_t sk_fgetsize(SkFILE* f) {
+size_t sk_fgetsize(FILE* f) {
     SkASSERT(f);
 
-    long curr = ::ftell((FILE*)f); // remember where we are
+    long curr = ::ftell(f); // remember where we are
     if (curr < 0) {
         return 0;
     }
 
-    ::fseek((FILE*)f, 0, SEEK_END); // go to the end
-    long size = ::ftell((FILE*)f); // record the size
+    ::fseek(f, 0, SEEK_END); // go to the end
+    long size = ::ftell(f); // record the size
     if (size < 0) {
         size = 0;
     }
 
-    ::fseek((FILE*)f, curr, SEEK_SET); // go back to our prev location
+    ::fseek(f, curr, SEEK_SET); // go back to our prev location
     return size;
 }
 
-bool sk_frewind(SkFILE* f) {
+bool sk_frewind(FILE* f) {
     SkASSERT(f);
-    ::rewind((FILE*)f);
+    ::rewind(f);
     return true;
 }
 
-size_t sk_fread(void* buffer, size_t byteCount, SkFILE* f) {
+size_t sk_fread(void* buffer, size_t byteCount, FILE* f) {
     SkASSERT(f);
-    if (buffer == NULL) {
-        size_t curr = ::ftell((FILE*)f);
+    if (buffer == nullptr) {
+        size_t curr = ::ftell(f);
         if ((long)curr == -1) {
-            SkDEBUGF(("sk_fread: ftell(%p) returned -1 feof:%d ferror:%d\n", f, feof((FILE*)f), ferror((FILE*)f)));
+            SkDEBUGF(("sk_fread: ftell(%p) returned -1 feof:%d ferror:%d\n", f, feof(f), ferror(f)));
             return 0;
         }
-        int err = ::fseek((FILE*)f, (long)byteCount, SEEK_CUR);
+        int err = ::fseek(f, (long)byteCount, SEEK_CUR);
         if (err != 0) {
             SkDEBUGF(("sk_fread: fseek(%d) tell:%d failed with feof:%d ferror:%d returned:%d\n",
-                        byteCount, curr, feof((FILE*)f), ferror((FILE*)f), err));
+                        byteCount, curr, feof(f), ferror(f), err));
             return 0;
         }
         return byteCount;
     }
     else
-        return ::fread(buffer, 1, byteCount, (FILE*)f);
+        return ::fread(buffer, 1, byteCount, f);
 }
 
-size_t sk_fwrite(const void* buffer, size_t byteCount, SkFILE* f) {
+size_t sk_fwrite(const void* buffer, size_t byteCount, FILE* f) {
     SkASSERT(f);
-    return ::fwrite(buffer, 1, byteCount, (FILE*)f);
+    return ::fwrite(buffer, 1, byteCount, f);
 }
 
-void sk_fflush(SkFILE* f) {
+void sk_fflush(FILE* f) {
     SkASSERT(f);
-    ::fflush((FILE*)f);
+    ::fflush(f);
 }
 
-bool sk_fseek(SkFILE* f, size_t byteCount) {
-    int err = ::fseek((FILE*)f, (long)byteCount, SEEK_SET);
+bool sk_fseek(FILE* f, size_t byteCount) {
+    int err = ::fseek(f, (long)byteCount, SEEK_SET);
     return err == 0;
 }
 
-bool sk_fmove(SkFILE* f, long byteCount) {
-    int err = ::fseek((FILE*)f, byteCount, SEEK_CUR);
+bool sk_fmove(FILE* f, long byteCount) {
+    int err = ::fseek(f, byteCount, SEEK_CUR);
     return err == 0;
 }
 
-size_t sk_ftell(SkFILE* f) {
-    long curr = ::ftell((FILE*)f);
+size_t sk_ftell(FILE* f) {
+    long curr = ::ftell(f);
     if (curr < 0) {
         return 0;
     }
     return curr;
 }
 
-void sk_fclose(SkFILE* f) {
+void sk_fclose(FILE* f) {
     SkASSERT(f);
-    ::fclose((FILE*)f);
+    ::fclose(f);
 }
 
 bool sk_isdir(const char *path) {
diff --git a/gfx/skia/skia/src/ports/SkOSFile_win.cpp b/gfx/skia/skia/src/ports/SkOSFile_win.cpp
index 1430d7f03bf3..6bdf9ab1637e 100644
--- a/gfx/skia/skia/src/ports/SkOSFile_win.cpp
+++ b/gfx/skia/skia/src/ports/SkOSFile_win.cpp
@@ -5,6 +5,9 @@
  * found in the LICENSE file.
  */
 
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_WIN32)
+
 #include "SkOSFile.h"
 
 #include "SkTFitsIn.h"
@@ -30,7 +33,7 @@ typedef struct {
     ULONGLONG fMsbSize;
 } SkFILEID;
 
-static bool sk_ino(SkFILE* f, SkFILEID* id) {
+static bool sk_ino(FILE* f, SkFILEID* id) {
     int fileno = _fileno((FILE*)f);
     if (fileno < 0) {
         return false;
@@ -53,7 +56,7 @@ static bool sk_ino(SkFILE* f, SkFILEID* id) {
     return true;
 }
 
-bool sk_fidentical(SkFILE* a, SkFILE* b) {
+bool sk_fidentical(FILE* a, FILE* b) {
     SkFILEID aID, bID;
     return sk_ino(a, &aID) && sk_ino(b, &bID)
            && aID.fLsbSize == bID.fLsbSize
@@ -66,7 +69,7 @@ public:
     SkAutoNullKernelHandle(const HANDLE handle) : fHandle(handle) { }
     ~SkAutoNullKernelHandle() { CloseHandle(fHandle); }
     operator HANDLE() const { return fHandle; }
-    bool isValid() const { return NULL != fHandle; }
+    bool isValid() const { return SkToBool(fHandle); }
 private:
     HANDLE fHandle;
 };
@@ -79,44 +82,166 @@ void sk_fmunmap(const void* addr, size_t) {
 void* sk_fdmmap(int fileno, size_t* length) {
     HANDLE file = (HANDLE)_get_osfhandle(fileno);
     if (INVALID_HANDLE_VALUE == file) {
-        return NULL;
+        return nullptr;
     }
 
     LARGE_INTEGER fileSize;
     if (0 == GetFileSizeEx(file, &fileSize)) {
         //TODO: use SK_TRACEHR(GetLastError(), "Could not get file size.") to report.
-        return NULL;
+        return nullptr;
     }
     if (!SkTFitsIn<size_t>(fileSize.QuadPart)) {
-        return NULL;
+        return nullptr;
     }
 
-    SkAutoWinMMap mmap(CreateFileMapping(file, NULL, PAGE_READONLY, 0, 0, NULL));
+    SkAutoWinMMap mmap(CreateFileMapping(file, nullptr, PAGE_READONLY, 0, 0, nullptr));
     if (!mmap.isValid()) {
         //TODO: use SK_TRACEHR(GetLastError(), "Could not create file mapping.") to report.
-        return NULL;
+        return nullptr;
     }
 
     // Eventually call UnmapViewOfFile
     void* addr = MapViewOfFile(mmap, FILE_MAP_READ, 0, 0, 0);
-    if (NULL == addr) {
+    if (nullptr == addr) {
         //TODO: use SK_TRACEHR(GetLastError(), "Could not map view of file.") to report.
-        return NULL;
+        return nullptr;
     }
 
     *length = static_cast<size_t>(fileSize.QuadPart);
     return addr;
 }
 
-int sk_fileno(SkFILE* f) {
+int sk_fileno(FILE* f) {
     return _fileno((FILE*)f);
 }
 
-void* sk_fmmap(SkFILE* f, size_t* length) {
+void* sk_fmmap(FILE* f, size_t* length) {
     int fileno = sk_fileno(f);
     if (fileno < 0) {
-        return NULL;
+        return nullptr;
     }
 
     return sk_fdmmap(fileno, length);
 }
+
+////////////////////////////////////////////////////////////////////////////
+
+struct SkOSFileIterData {
+    SkOSFileIterData() : fHandle(0), fPath16(nullptr) { }
+    HANDLE fHandle;
+    uint16_t* fPath16;
+};
+static_assert(sizeof(SkOSFileIterData) <= SkOSFile::Iter::kStorageSize, "not_enough_space");
+
+static uint16_t* concat_to_16(const char src[], const char suffix[]) {
+    size_t  i, len = strlen(src);
+    size_t  len2 = 3 + (suffix ? strlen(suffix) : 0);
+    uint16_t* dst = (uint16_t*)sk_malloc_throw((len + len2) * sizeof(uint16_t));
+
+    for (i = 0; i < len; i++) {
+        dst[i] = src[i];
+    }
+
+    if (i > 0 && dst[i-1] != '/') {
+        dst[i++] = '/';
+    }
+    dst[i++] = '*';
+
+    if (suffix) {
+        while (*suffix) {
+            dst[i++] = *suffix++;
+        }
+    }
+    dst[i] = 0;
+    SkASSERT(i + 1 <= len + len2);
+
+    return dst;
+}
+
+SkOSFile::Iter::Iter() { new (fSelf.get()) SkOSFileIterData; }
+
+SkOSFile::Iter::Iter(const char path[], const char suffix[]) {
+    new (fSelf.get()) SkOSFileIterData;
+    this->reset(path, suffix);
+}
+
+SkOSFile::Iter::~Iter() {
+    SkOSFileIterData& self = *static_cast<SkOSFileIterData*>(fSelf.get());
+    sk_free(self.fPath16);
+    if (self.fHandle) {
+        ::FindClose(self.fHandle);
+    }
+    self.~SkOSFileIterData();
+}
+
+void SkOSFile::Iter::reset(const char path[], const char suffix[]) {
+    SkOSFileIterData& self = *static_cast<SkOSFileIterData*>(fSelf.get());
+    if (self.fHandle) {
+        ::FindClose(self.fHandle);
+        self.fHandle = 0;
+    }
+    if (nullptr == path) {
+        path = "";
+    }
+
+    sk_free(self.fPath16);
+    self.fPath16 = concat_to_16(path, suffix);
+}
+
+static bool is_magic_dir(const uint16_t dir[]) {
+    // return true for "." and ".."
+    return dir[0] == '.' && (dir[1] == 0 || (dir[1] == '.' && dir[2] == 0));
+}
+
+static bool get_the_file(HANDLE handle, SkString* name, WIN32_FIND_DATAW* dataPtr, bool getDir) {
+    WIN32_FIND_DATAW    data;
+
+    if (nullptr == dataPtr) {
+        if (::FindNextFileW(handle, &data))
+            dataPtr = &data;
+        else
+            return false;
+    }
+
+    for (;;) {
+        if (getDir) {
+            if ((dataPtr->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) &&
+                !is_magic_dir((uint16_t*)dataPtr->cFileName))
+            {
+                break;
+            }
+        } else {
+            if (!(dataPtr->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
+                break;
+            }
+        }
+        if (!::FindNextFileW(handle, dataPtr)) {
+            return false;
+        }
+    }
+    // if we get here, we've found a file/dir
+    if (name) {
+        name->setUTF16((uint16_t*)dataPtr->cFileName);
+    }
+    return true;
+}
+
+bool SkOSFile::Iter::next(SkString* name, bool getDir) {
+    SkOSFileIterData& self = *static_cast<SkOSFileIterData*>(fSelf.get());
+    WIN32_FIND_DATAW    data;
+    WIN32_FIND_DATAW*   dataPtr = nullptr;
+
+    if (self.fHandle == 0) {  // our first time
+        if (self.fPath16 == nullptr || *self.fPath16 == 0) {  // check for no path
+            return false;
+        }
+
+        self.fHandle = ::FindFirstFileW((LPCWSTR)self.fPath16, &data);
+        if (self.fHandle != 0 && self.fHandle != (HANDLE)~0) {
+            dataPtr = &data;
+        }
+    }
+    return self.fHandle != (HANDLE)~0 && get_the_file(self.fHandle, name, dataPtr, getDir);
+}
+
+#endif//defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/src/ports/SkOSLibrary.h b/gfx/skia/skia/src/ports/SkOSLibrary.h
new file mode 100644
index 000000000000..7de2b902e3aa
--- /dev/null
+++ b/gfx/skia/skia/src/ports/SkOSLibrary.h
@@ -0,0 +1,16 @@
+
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkOSLibrary_DEFINED
+#define SkOSLibrary_DEFINED
+
+void* DynamicLoadLibrary(const char* libraryName);
+void* GetProcedureAddress(void* library, const char* functionName);
+
+#endif
+
diff --git a/gfx/skia/skia/src/ports/SkOSLibrary_posix.cpp b/gfx/skia/skia/src/ports/SkOSLibrary_posix.cpp
new file mode 100644
index 000000000000..1571e2008588
--- /dev/null
+++ b/gfx/skia/skia/src/ports/SkOSLibrary_posix.cpp
@@ -0,0 +1,22 @@
+
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "SkTypes.h"
+#if !defined(SK_BUILD_FOR_WIN32)
+
+#include "SkOSLibrary.h"
+
+#include <dlfcn.h>
+
+void* DynamicLoadLibrary(const char* libraryName) {
+    return dlopen(libraryName, RTLD_LAZY);
+}
+
+void* GetProcedureAddress(void* library, const char* functionName) {
+    return dlsym(library, functionName);
+}
+#endif//!defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/src/ports/SkOSLibrary_win.cpp b/gfx/skia/skia/src/ports/SkOSLibrary_win.cpp
new file mode 100644
index 000000000000..69754db375c7
--- /dev/null
+++ b/gfx/skia/skia/src/ports/SkOSLibrary_win.cpp
@@ -0,0 +1,22 @@
+
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_WIN32)
+
+#include "SkOSLibrary.h"
+#include <windows.h>
+
+void* DynamicLoadLibrary(const char* libraryName) {
+    return LoadLibrary(libraryName);
+}
+
+void* GetProcedureAddress(void* library, const char* functionName) {
+    return ::GetProcAddress((HMODULE)library, functionName);
+}
+
+#endif//defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/src/ports/SkRemotableFontMgr_win_dw.cpp b/gfx/skia/skia/src/ports/SkRemotableFontMgr_win_dw.cpp
index d97968327394..6c021a1ca682 100644
--- a/gfx/skia/skia/src/ports/SkRemotableFontMgr_win_dw.cpp
+++ b/gfx/skia/skia/src/ports/SkRemotableFontMgr_win_dw.cpp
@@ -4,16 +4,18 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_WIN32)
 
-#include "SkDataTable.h"
 #include "SkDWrite.h"
 #include "SkDWriteFontFileStream.h"
+#include "SkDataTable.h"
 #include "SkHRESULT.h"
+#include "SkMutex.h"
 #include "SkRemotableFontMgr.h"
 #include "SkStream.h"
 #include "SkString.h"
 #include "SkTArray.h"
-#include "SkThread.h"
 #include "SkTScopedComPtr.h"
 #include "SkTypeface_win.h"
 #include "SkTypes.h"
@@ -21,27 +23,6 @@
 
 #include <dwrite.h>
 
-struct DWriteStyle {
-    explicit DWriteStyle(const SkFontStyle& pattern) {
-        switch (pattern.slant()) {
-        case SkFontStyle::kUpright_Slant:
-            fSlant = DWRITE_FONT_STYLE_NORMAL;
-            break;
-        case SkFontStyle::kItalic_Slant:
-            fSlant = DWRITE_FONT_STYLE_ITALIC;
-            break;
-        default:
-            SkASSERT(false);
-        }
-
-        fWeight = (DWRITE_FONT_WEIGHT)pattern.weight();
-        fWidth = (DWRITE_FONT_STRETCH)pattern.width();
-    }
-    DWRITE_FONT_STYLE fSlant;
-    DWRITE_FONT_WEIGHT fWeight;
-    DWRITE_FONT_STRETCH fWidth;
-};
-
 class SK_API SkRemotableFontMgr_DirectWrite : public SkRemotableFontMgr {
 private:
     struct DataId {
@@ -55,8 +36,8 @@ private:
         explicit DataId(DataId& that)
             : fLoader(that.fLoader), fKey(that.fKey), fKeySize(that.fKeySize)
         {
-            that.fLoader = NULL;
-            that.fKey = NULL;
+            that.fLoader = nullptr;
+            that.fKey = nullptr;
             SkDEBUGCODE(that.fKeySize = 0xFFFFFFFF;)
         }
 
@@ -101,7 +82,7 @@ private:
     }
 
 public:
-    SK_DECLARE_INST_COUNT(SkRemotableFontMgr_DirectWrite)
+
 
     /** localeNameLength must include the null terminator. */
     SkRemotableFontMgr_DirectWrite(IDWriteFontCollection* fontCollection,
@@ -112,7 +93,7 @@ public:
         memcpy(fLocaleName.get(), localeName, localeNameLength * sizeof(WCHAR));
     }
 
-    virtual SkDataTable* getFamilyNames() const SK_OVERRIDE {
+    SkDataTable* getFamilyNames() const override {
         int count = fFontCollection->GetFontFamilyCount();
 
         SkDataTableBuilder names(1024);
@@ -137,7 +118,7 @@ public:
         HRM(font->CreateFontFace(&fontFace), "Could not create font face.");
 
         UINT32 numFiles;
-        HR(fontFace->GetFiles(&numFiles, NULL));
+        HR(fontFace->GetFiles(&numFiles, nullptr));
         if (numFiles > 1) {
             return E_FAIL;
         }
@@ -179,7 +160,7 @@ public:
         return S_OK;
     }
 
-    virtual SkRemotableFontIdentitySet* getIndex(int familyIndex) const SK_OVERRIDE {
+    SkRemotableFontIdentitySet* getIndex(int familyIndex) const override {
         SkTScopedComPtr<IDWriteFontFamily> fontFamily;
         HRNM(fFontCollection->GetFontFamily(familyIndex, &fontFamily),
              "Could not get requested family.");
@@ -198,7 +179,7 @@ public:
     }
 
     virtual SkFontIdentity matchIndexStyle(int familyIndex,
-                                           const SkFontStyle& pattern) const SK_OVERRIDE
+                                           const SkFontStyle& pattern) const override
     {
         SkFontIdentity identity = { SkFontIdentity::kInvalidDataId };
 
@@ -214,7 +195,7 @@ public:
                    "Could not match font in family.",
                    identity);
 
-        HR_GENERAL(FontToIdentity(font.get(), &identity), NULL, identity);
+        HR_GENERAL(FontToIdentity(font.get(), &identity), nullptr, identity);
 
         return identity;
     }
@@ -237,14 +218,14 @@ public:
         return S_OK;
     }
 
-    virtual SkRemotableFontIdentitySet* matchName(const char familyName[]) const SK_OVERRIDE {
+    SkRemotableFontIdentitySet* matchName(const char familyName[]) const override {
         SkSMallocWCHAR dwFamilyName;
-        if (NULL == familyName) {
+        if (nullptr == familyName) {
             HR_GENERAL(getDefaultFontFamilyName(&dwFamilyName),
-                       NULL, SkRemotableFontIdentitySet::NewEmpty());
+                       nullptr, SkRemotableFontIdentitySet::NewEmpty());
         } else {
             HR_GENERAL(sk_cstring_to_wchar(familyName, &dwFamilyName),
-                       NULL, SkRemotableFontIdentitySet::NewEmpty());
+                       nullptr, SkRemotableFontIdentitySet::NewEmpty());
         }
 
         UINT32 index;
@@ -260,15 +241,15 @@ public:
     }
 
     virtual SkFontIdentity matchNameStyle(const char familyName[],
-                                          const SkFontStyle& style) const SK_OVERRIDE
+                                          const SkFontStyle& style) const override
     {
         SkFontIdentity identity = { SkFontIdentity::kInvalidDataId };
 
         SkSMallocWCHAR dwFamilyName;
-        if (NULL == familyName) {
-            HR_GENERAL(getDefaultFontFamilyName(&dwFamilyName), NULL, identity);
+        if (nullptr == familyName) {
+            HR_GENERAL(getDefaultFontFamilyName(&dwFamilyName), nullptr, identity);
         } else {
-            HR_GENERAL(sk_cstring_to_wchar(familyName, &dwFamilyName), NULL, identity);
+            HR_GENERAL(sk_cstring_to_wchar(familyName, &dwFamilyName), nullptr, identity);
         }
 
         UINT32 index;
@@ -300,7 +281,7 @@ public:
             DWRITE_MEASURING_MODE measuringMode,
             DWRITE_GLYPH_RUN const* glyphRun,
             DWRITE_GLYPH_RUN_DESCRIPTION const* glyphRunDescription,
-            IUnknown* clientDrawingEffect) SK_OVERRIDE
+            IUnknown* clientDrawingEffect) override
         {
             SkTScopedComPtr<IDWriteFont> font;
             HRM(fOuter->fFontCollection->GetFontFromFontFace(glyphRun->fontFace, &font),
@@ -324,7 +305,7 @@ public:
             FLOAT baselineOriginX,
             FLOAT baselineOriginY,
             DWRITE_UNDERLINE const* underline,
-            IUnknown* clientDrawingEffect) SK_OVERRIDE
+            IUnknown* clientDrawingEffect) override
         { return E_NOTIMPL; }
 
         virtual HRESULT STDMETHODCALLTYPE DrawStrikethrough(
@@ -332,7 +313,7 @@ public:
             FLOAT baselineOriginX,
             FLOAT baselineOriginY,
             DWRITE_STRIKETHROUGH const* strikethrough,
-            IUnknown* clientDrawingEffect) SK_OVERRIDE
+            IUnknown* clientDrawingEffect) override
         { return E_NOTIMPL; }
 
         virtual HRESULT STDMETHODCALLTYPE DrawInlineObject(
@@ -342,13 +323,13 @@ public:
             IDWriteInlineObject* inlineObject,
             BOOL isSideways,
             BOOL isRightToLeft,
-            IUnknown* clientDrawingEffect) SK_OVERRIDE
+            IUnknown* clientDrawingEffect) override
         { return E_NOTIMPL; }
 
         // IDWritePixelSnapping methods
         virtual HRESULT STDMETHODCALLTYPE IsPixelSnappingDisabled(
             void* clientDrawingContext,
-            BOOL* isDisabled) SK_OVERRIDE
+            BOOL* isDisabled) override
         {
             *isDisabled = FALSE;
             return S_OK;
@@ -356,7 +337,7 @@ public:
 
         virtual HRESULT STDMETHODCALLTYPE GetCurrentTransform(
             void* clientDrawingContext,
-            DWRITE_MATRIX* transform) SK_OVERRIDE
+            DWRITE_MATRIX* transform) override
         {
             const DWRITE_MATRIX ident = {1.0, 0.0, 0.0, 1.0, 0.0, 0.0};
             *transform = ident;
@@ -365,18 +346,18 @@ public:
 
         virtual HRESULT STDMETHODCALLTYPE GetPixelsPerDip(
             void* clientDrawingContext,
-            FLOAT* pixelsPerDip) SK_OVERRIDE
+            FLOAT* pixelsPerDip) override
         {
             *pixelsPerDip = 1.0f;
             return S_OK;
         }
 
         // IUnknown methods
-        virtual ULONG STDMETHODCALLTYPE AddRef() SK_OVERRIDE {
+        ULONG STDMETHODCALLTYPE AddRef() override {
             return InterlockedIncrement(&fRefCount);
         }
 
-        virtual ULONG STDMETHODCALLTYPE Release() SK_OVERRIDE {
+        ULONG STDMETHODCALLTYPE Release() override {
             ULONG newCount = InterlockedDecrement(&fRefCount);
             if (0 == newCount) {
                 delete this;
@@ -385,7 +366,7 @@ public:
         }
 
         virtual HRESULT STDMETHODCALLTYPE QueryInterface(
-            IID const& riid, void** ppvObject) SK_OVERRIDE
+            IID const& riid, void** ppvObject) override
         {
             if (__uuidof(IUnknown) == riid ||
                 __uuidof(IDWritePixelSnapping) == riid ||
@@ -395,7 +376,7 @@ public:
                 this->AddRef();
                 return S_OK;
             }
-            *ppvObject = NULL;
+            *ppvObject = nullptr;
             return E_FAIL;
         }
 
@@ -410,13 +391,13 @@ public:
 
     virtual SkFontIdentity matchNameStyleCharacter(const char familyName[],
                                                    const SkFontStyle& pattern,
-                                                   const char bpc47[],
-                                                   SkUnichar character) const  SK_OVERRIDE
+                                                   const char* bcp47[], int bcp47Count,
+                                                   SkUnichar character) const override
     {
         SkFontIdentity identity = { SkFontIdentity::kInvalidDataId };
 
         IDWriteFactory* dwFactory = sk_get_dwrite_factory();
-        if (NULL == dwFactory) {
+        if (nullptr == dwFactory) {
             return identity;
         }
 
@@ -425,19 +406,20 @@ public:
         const DWriteStyle dwStyle(pattern);
 
         SkSMallocWCHAR dwFamilyName;
-        if (NULL == familyName) {
-            HR_GENERAL(getDefaultFontFamilyName(&dwFamilyName), NULL, identity);
+        if (nullptr == familyName) {
+            HR_GENERAL(getDefaultFontFamilyName(&dwFamilyName), nullptr, identity);
         } else {
-            HR_GENERAL(sk_cstring_to_wchar(familyName, &dwFamilyName), NULL, identity);
+            HR_GENERAL(sk_cstring_to_wchar(familyName, &dwFamilyName), nullptr, identity);
         }
 
-        const SkSMallocWCHAR* dwBpc47;
-        SkSMallocWCHAR dwBpc47Local;
-        if (NULL == bpc47) {
-            dwBpc47 = &fLocaleName;
+        const SkSMallocWCHAR* dwBcp47;
+        SkSMallocWCHAR dwBcp47Local;
+        if (bcp47Count < 1) {
+            dwBcp47 = &fLocaleName;
         } else {
-            HR_GENERAL(sk_cstring_to_wchar(bpc47, &dwBpc47Local), NULL, identity);
-            dwBpc47 = &dwBpc47Local;
+            //TODO: support fallback stack.
+            HR_GENERAL(sk_cstring_to_wchar(bcp47[bcp47Count-1], &dwBcp47Local), nullptr, identity);
+            dwBcp47 = &dwBcp47Local;
         }
 
         SkTScopedComPtr<IDWriteTextFormat> fallbackFormat;
@@ -447,7 +429,7 @@ public:
                                                dwStyle.fSlant,
                                                dwStyle.fWidth,
                                                72.0f,
-                                               *dwBpc47,
+                                               *dwBcp47,
                                                &fallbackFormat),
                    "Could not create text format.",
                    identity);
@@ -465,17 +447,17 @@ public:
         SkTScopedComPtr<FontFallbackRenderer> fontFallbackRenderer(
             new FontFallbackRenderer(this, character));
 
-        HR_GENERAL(fallbackLayout->Draw(NULL, fontFallbackRenderer.get(), 50.0f, 50.0f),
+        HR_GENERAL(fallbackLayout->Draw(nullptr, fontFallbackRenderer.get(), 50.0f, 50.0f),
                    "Could not draw layout with renderer.",
                    identity);
 
         return fontFallbackRenderer->FallbackIdentity();
     }
 
-    virtual SkStreamAsset* getData(int dataId) const SK_OVERRIDE {
+    SkStreamAsset* getData(int dataId) const override {
         SkAutoMutexAcquire ama(fDataIdCacheMutex);
         if (dataId >= fDataIdCache.count()) {
-            return NULL;
+            return nullptr;
         }
         const DataId& id = fDataIdCache[dataId];
 
@@ -486,7 +468,7 @@ public:
         HRNM(loader->CreateStreamFromKey(id.fKey, id.fKeySize, &fontFileStream),
              "Could not create font file stream.");
 
-        return SkNEW_ARGS(SkDWriteFontFileStream, (fontFileStream.get()));
+        return new SkDWriteFontFileStream(fontFileStream.get());
     }
 
 private:
@@ -498,8 +480,8 @@ private:
 
 SkRemotableFontMgr* SkRemotableFontMgr_New_DirectWrite() {
     IDWriteFactory* factory = sk_get_dwrite_factory();
-    if (NULL == factory) {
-        return NULL;
+    if (nullptr == factory) {
+        return nullptr;
     }
 
     SkTScopedComPtr<IDWriteFontCollection> sysFontCollection;
@@ -507,13 +489,13 @@ SkRemotableFontMgr* SkRemotableFontMgr_New_DirectWrite() {
          "Could not get system font collection.");
 
     WCHAR localeNameStorage[LOCALE_NAME_MAX_LENGTH];
-    WCHAR* localeName = NULL;
+    WCHAR* localeName = nullptr;
     int localeNameLen = 0;
 
     // Dynamically load GetUserDefaultLocaleName function, as it is not available on XP.
-    SkGetUserDefaultLocaleNameProc getUserDefaultLocaleNameProc = NULL;
+    SkGetUserDefaultLocaleNameProc getUserDefaultLocaleNameProc = nullptr;
     HRESULT hr = SkGetGetUserDefaultLocaleNameProc(&getUserDefaultLocaleNameProc);
-    if (NULL == getUserDefaultLocaleNameProc) {
+    if (nullptr == getUserDefaultLocaleNameProc) {
         SK_TRACEHR(hr, "Could not get GetUserDefaultLocaleName.");
     } else {
         localeNameLen = getUserDefaultLocaleNameProc(localeNameStorage, LOCALE_NAME_MAX_LENGTH);
@@ -522,6 +504,6 @@ SkRemotableFontMgr* SkRemotableFontMgr_New_DirectWrite() {
         };
     }
 
-    return SkNEW_ARGS(SkRemotableFontMgr_DirectWrite, (sysFontCollection.get(),
-                                                       localeName, localeNameLen));
+    return new SkRemotableFontMgr_DirectWrite(sysFontCollection.get(), localeName, localeNameLen);
 }
+#endif//defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/src/ports/SkScalerContext_win_dw.cpp b/gfx/skia/skia/src/ports/SkScalerContext_win_dw.cpp
index 4cd5efd3834f..097db865e192 100644
--- a/gfx/skia/skia/src/ports/SkScalerContext_win_dw.cpp
+++ b/gfx/skia/skia/src/ports/SkScalerContext_win_dw.cpp
@@ -6,6 +6,8 @@
  */
 
 #include "SkTypes.h"
+#if defined(SK_BUILD_FOR_WIN32)
+
 #undef GetGlyphIndices
 
 #include "SkDWrite.h"
@@ -15,6 +17,7 @@
 #include "SkHRESULT.h"
 #include "SkMaskGamma.h"
 #include "SkMatrix22.h"
+#include "SkMutex.h"
 #include "SkOTTable_EBLC.h"
 #include "SkOTTable_EBSC.h"
 #include "SkOTTable_gasp.h"
@@ -22,6 +25,7 @@
 #include "SkPath.h"
 #include "SkScalerContext.h"
 #include "SkScalerContext_win_dw.h"
+#include "SkSharedMutex.h"
 #include "SkTScopedComPtr.h"
 #include "SkTypeface_win_dw.h"
 
@@ -30,12 +34,21 @@
 #  include <dwrite_1.h>
 #endif
 
+/* Note:
+ * In versions 8 and 8.1 of Windows, some calls in DWrite are not thread safe.
+ * The DWriteFactoryMutex protects the calls that are problematic.
+ */
+static SkSharedMutex DWriteFactoryMutex;
+
+typedef SkAutoTExclusive<SkSharedMutex> Exclusive;
+typedef SkAutoSharedMutexShared Shared;
+
 static bool isLCD(const SkScalerContext::Rec& rec) {
-    return SkMask::kLCD16_Format == rec.fMaskFormat ||
-           SkMask::kLCD32_Format == rec.fMaskFormat;
+    return SkMask::kLCD16_Format == rec.fMaskFormat;
 }
 
 static bool is_hinted_without_gasp(DWriteFontTypeface* typeface) {
+    Exclusive l(DWriteFactoryMutex);
     AutoTDWriteTable<SkOTTableMaximumProfile> maxp(typeface->fDWriteFontFace.get());
     if (!maxp.fExists) {
         return false;
@@ -105,6 +118,7 @@ static void expand_range_if_gridfit_only(DWriteFontTypeface* typeface, int size,
 }
 
 static bool has_bitmap_strike(DWriteFontTypeface* typeface, PPEMRange range) {
+    Exclusive l(DWriteFactoryMutex);
     {
         AutoTDWriteTable<SkOTTableEmbeddedBitmapLocation> eblc(typeface->fDWriteFontFace.get());
         if (!eblc.fExists) {
@@ -211,26 +225,29 @@ SkScalerContext_DW::SkScalerContext_DW(DWriteFontTypeface* typeface,
     // Also, rotated glyphs should have the same absolute advance widths as
     // horizontal glyphs and the subpixel flag should not affect glyph shapes.
 
-    // A is the total matrix.
-    SkMatrix A;
-    fRec.getSingleMatrix(&A);
+    SkVector scale;
+    SkMatrix GsA;
+    fRec.computeMatrices(SkScalerContextRec::kVertical_PreMatrixScale,
+                         &scale, &fSkXform, &GsA, &fG_inv);
 
-    // h is where A maps the horizontal baseline.
-    SkPoint h = SkPoint::Make(SK_Scalar1, 0);
-    A.mapPoints(&h, 1);
+    fXform.m11 = SkScalarToFloat(fSkXform.getScaleX());
+    fXform.m12 = SkScalarToFloat(fSkXform.getSkewY());
+    fXform.m21 = SkScalarToFloat(fSkXform.getSkewX());
+    fXform.m22 = SkScalarToFloat(fSkXform.getScaleY());
+    fXform.dx = 0;
+    fXform.dy = 0;
 
-    // G is the Givens Matrix for A (rotational matrix where GA[0][1] == 0).
-    SkMatrix G;
-    SkComputeGivensRotation(h, &G);
-
-    // GA is the matrix A with rotation removed.
-    SkMatrix GA(G);
-    GA.preConcat(A);
+    fGsA.m11 = SkScalarToFloat(GsA.get(SkMatrix::kMScaleX));
+    fGsA.m12 = SkScalarToFloat(GsA.get(SkMatrix::kMSkewY)); // This should be ~0.
+    fGsA.m21 = SkScalarToFloat(GsA.get(SkMatrix::kMSkewX));
+    fGsA.m22 = SkScalarToFloat(GsA.get(SkMatrix::kMScaleY));
+    fGsA.dx = 0;
+    fGsA.dy = 0;
 
     // realTextSize is the actual device size we want (as opposed to the size the user requested).
     // gdiTextSize is the size we request when GDI compatible.
     // If the scale is negative, this means the matrix will do the flip anyway.
-    SkScalar realTextSize = SkScalarAbs(GA.get(SkMatrix::kMScaleY));
+    const SkScalar realTextSize = scale.fY;
     // Due to floating point math, the lower bits are suspect. Round carefully.
     SkScalar gdiTextSize = SkScalarRoundToScalar(realTextSize * 64.0f) / 64.0f;
     if (gdiTextSize == 0) {
@@ -301,36 +318,6 @@ SkScalerContext_DW::SkScalerContext_DW(DWriteFontTypeface* typeface,
         fTextSizeMeasure = realTextSize;
         fMeasuringMode = DWRITE_MEASURING_MODE_NATURAL;
     }
-
-    // Remove the realTextSize, as that is the text height scale currently in A.
-    SkScalar scale = SkScalarInvert(realTextSize);
-
-    // fSkXform is the total matrix A without the text height scale.
-    fSkXform = A;
-    fSkXform.preScale(scale, scale); //remove the text height scale.
-
-    fXform.m11 = SkScalarToFloat(fSkXform.getScaleX());
-    fXform.m12 = SkScalarToFloat(fSkXform.getSkewY());
-    fXform.m21 = SkScalarToFloat(fSkXform.getSkewX());
-    fXform.m22 = SkScalarToFloat(fSkXform.getScaleY());
-    fXform.dx = 0;
-    fXform.dy = 0;
-
-    // GsA is the non-rotational part of A without the text height scale.
-    SkMatrix GsA(GA);
-    GsA.preScale(scale, scale); //remove text height scale, G is rotational so reorders with scale.
-
-    fGsA.m11 = SkScalarToFloat(GsA.get(SkMatrix::kMScaleX));
-    fGsA.m12 = SkScalarToFloat(GsA.get(SkMatrix::kMSkewY)); // This should be ~0.
-    fGsA.m21 = SkScalarToFloat(GsA.get(SkMatrix::kMSkewX));
-    fGsA.m22 = SkScalarToFloat(GsA.get(SkMatrix::kMScaleY));
-    fGsA.dx = 0;
-    fGsA.dy = 0;
-
-    // fG_inv is G inverse, which is fairly simple since G is 2x2 rotational.
-    fG_inv.setAll(G.get(SkMatrix::kMScaleX), -G.get(SkMatrix::kMSkewX), G.get(SkMatrix::kMTransX),
-                  -G.get(SkMatrix::kMSkewY), G.get(SkMatrix::kMScaleY), G.get(SkMatrix::kMTransY),
-                  G.get(SkMatrix::kMPersp0), G.get(SkMatrix::kMPersp1), G.get(SkMatrix::kMPersp2));
 }
 
 SkScalerContext_DW::~SkScalerContext_DW() {
@@ -365,6 +352,7 @@ void SkScalerContext_DW::generateAdvance(SkGlyph* glyph) {
     if (DWRITE_MEASURING_MODE_GDI_CLASSIC == fMeasuringMode ||
         DWRITE_MEASURING_MODE_GDI_NATURAL == fMeasuringMode)
     {
+        Exclusive l(DWriteFactoryMutex);
         HRVM(fTypeface->fDWriteFontFace->GetGdiCompatibleGlyphMetrics(
                  fTextSizeMeasure,
                  1.0f, // pixelsPerDip
@@ -374,12 +362,16 @@ void SkScalerContext_DW::generateAdvance(SkGlyph* glyph) {
                  &gm),
              "Could not get gdi compatible glyph metrics.");
     } else {
+        Exclusive l(DWriteFactoryMutex);
         HRVM(fTypeface->fDWriteFontFace->GetDesignGlyphMetrics(&glyphId, 1, &gm),
              "Could not get design metrics.");
     }
 
     DWRITE_FONT_METRICS dwfm;
-    fTypeface->fDWriteFontFace->GetMetrics(&dwfm);
+    {
+        Shared l(DWriteFactoryMutex);
+        fTypeface->fDWriteFontFace->GetMetrics(&dwfm);
+    }
     SkScalar advanceX = SkScalarMulDiv(fTextSizeMeasure,
                                        SkIntToScalar(gm.advanceWidth),
                                        SkIntToScalar(dwfm.designUnitsPerEm));
@@ -400,11 +392,11 @@ void SkScalerContext_DW::generateAdvance(SkGlyph* glyph) {
     glyph->fAdvanceY = SkScalarToFixed(vecs[0].fY);
 }
 
-void SkScalerContext_DW::generateMetrics(SkGlyph* glyph) {
-    glyph->fWidth = 0;
-
-    this->generateAdvance(glyph);
-
+HRESULT SkScalerContext_DW::getBoundingBox(SkGlyph* glyph,
+                                           DWRITE_RENDERING_MODE renderingMode,
+                                           DWRITE_TEXTURE_TYPE textureType,
+                                           RECT* bbox)
+{
     //Measure raster size.
     fXform.dx = SkFixedToFloat(glyph->getSubXFixed());
     fXform.dy = SkFixedToFloat(glyph->getSubYFixed());
@@ -428,29 +420,78 @@ void SkScalerContext_DW::generateMetrics(SkGlyph* glyph) {
     run.glyphOffsets = &offset;
 
     SkTScopedComPtr<IDWriteGlyphRunAnalysis> glyphRunAnalysis;
-    HRVM(fTypeface->fFactory->CreateGlyphRunAnalysis(
-             &run,
-             1.0f, // pixelsPerDip,
-             &fXform,
-             fRenderingMode,
-             fMeasuringMode,
-             0.0f, // baselineOriginX,
-             0.0f, // baselineOriginY,
-             &glyphRunAnalysis),
-         "Could not create glyph run analysis.");
-
-    RECT bbox;
-    HRVM(glyphRunAnalysis->GetAlphaTextureBounds(fTextureType, &bbox),
-         "Could not get texture bounds.");
+    {
+        Exclusive l(DWriteFactoryMutex);
+        HRM(fTypeface->fFactory->CreateGlyphRunAnalysis(
+            &run,
+            1.0f, // pixelsPerDip,
+            &fXform,
+            renderingMode,
+            fMeasuringMode,
+            0.0f, // baselineOriginX,
+            0.0f, // baselineOriginY,
+            &glyphRunAnalysis),
+            "Could not create glyph run analysis.");
+    }
+    {
+        Shared l(DWriteFactoryMutex);
+        HRM(glyphRunAnalysis->GetAlphaTextureBounds(textureType, bbox),
+            "Could not get texture bounds.");
+    }
+    return S_OK;
+}
 
+/** GetAlphaTextureBounds succeeds but sometimes returns empty bounds like
+ *  { 0x80000000, 0x80000000, 0x80000000, 0x80000000 }
+ *  for small, but not quite zero, sized glyphs.
+ *  Only set as non-empty if the returned bounds are non-empty.
+ */
+static bool glyph_check_and_set_bounds(SkGlyph* glyph, const RECT& bbox) {
+    if (bbox.left >= bbox.right || bbox.top >= bbox.bottom) {
+        return false;
+    }
     glyph->fWidth = SkToU16(bbox.right - bbox.left);
     glyph->fHeight = SkToU16(bbox.bottom - bbox.top);
     glyph->fLeft = SkToS16(bbox.left);
     glyph->fTop = SkToS16(bbox.top);
+    return true;
+}
+
+void SkScalerContext_DW::generateMetrics(SkGlyph* glyph) {
+    glyph->fWidth = 0;
+    glyph->fHeight = 0;
+    glyph->fLeft = 0;
+    glyph->fTop = 0;
+
+    this->generateAdvance(glyph);
+
+    RECT bbox;
+    HRVM(this->getBoundingBox(glyph, fRenderingMode, fTextureType, &bbox),
+         "Requested bounding box could not be determined.");
+
+    if (glyph_check_and_set_bounds(glyph, bbox)) {
+        return;
+    }
+
+    // GetAlphaTextureBounds succeeds but returns an empty RECT if there are no
+    // glyphs of the specified texture type. When this happens, try with the
+    // alternate texture type.
+    if (DWRITE_TEXTURE_CLEARTYPE_3x1 == fTextureType) {
+        HRVM(this->getBoundingBox(glyph,
+                                  DWRITE_RENDERING_MODE_ALIASED,
+                                  DWRITE_TEXTURE_ALIASED_1x1,
+                                  &bbox),
+             "Fallback bounding box could not be determined.");
+        if (glyph_check_and_set_bounds(glyph, bbox)) {
+            glyph->fForceBW = 1;
+        }
+    }
+    // TODO: handle the case where a request for DWRITE_TEXTURE_ALIASED_1x1
+    // fails, and try DWRITE_TEXTURE_CLEARTYPE_3x1.
 }
 
 void SkScalerContext_DW::generateFontMetrics(SkPaint::FontMetrics* metrics) {
-    if (NULL == metrics) {
+    if (nullptr == metrics) {
         return;
     }
 
@@ -482,7 +523,7 @@ void SkScalerContext_DW::generateFontMetrics(SkPaint::FontMetrics* metrics) {
     metrics->fFlags |= SkPaint::FontMetrics::kUnderlinePositionIsValid_Flag;
 
 #if SK_HAS_DWRITE_1_H
-    if (NULL != fTypeface->fDWriteFontFace1.get()) {
+    if (fTypeface->fDWriteFontFace1.get()) {
         DWRITE_FONT_METRICS1 dwfm1;
         fTypeface->fDWriteFontFace1->GetMetrics(&dwfm1);
         metrics->fTop = -fTextSizeRender * SkIntToScalar(dwfm1.glyphBoxTop) / upem;
@@ -574,7 +615,7 @@ static void rgb_to_a8(const uint8_t* SK_RESTRICT src, const SkGlyph& glyph, cons
     }
 }
 
-template<bool APPLY_PREBLEND>
+template<bool APPLY_PREBLEND, bool RGB>
 static void rgb_to_lcd16(const uint8_t* SK_RESTRICT src, const SkGlyph& glyph,
                          const uint8_t* tableR, const uint8_t* tableG, const uint8_t* tableB) {
     const size_t dstRB = glyph.rowBytes();
@@ -583,36 +624,28 @@ static void rgb_to_lcd16(const uint8_t* SK_RESTRICT src, const SkGlyph& glyph,
 
     for (U16CPU y = 0; y < glyph.fHeight; y++) {
         for (U16CPU i = 0; i < width; i++) {
-            U8CPU r = sk_apply_lut_if<APPLY_PREBLEND>(*(src++), tableR);
-            U8CPU g = sk_apply_lut_if<APPLY_PREBLEND>(*(src++), tableG);
-            U8CPU b = sk_apply_lut_if<APPLY_PREBLEND>(*(src++), tableB);
+            U8CPU r, g, b;
+            if (RGB) {
+                r = sk_apply_lut_if<APPLY_PREBLEND>(*(src++), tableR);
+                g = sk_apply_lut_if<APPLY_PREBLEND>(*(src++), tableG);
+                b = sk_apply_lut_if<APPLY_PREBLEND>(*(src++), tableB);
+            } else {
+                b = sk_apply_lut_if<APPLY_PREBLEND>(*(src++), tableB);
+                g = sk_apply_lut_if<APPLY_PREBLEND>(*(src++), tableG);
+                r = sk_apply_lut_if<APPLY_PREBLEND>(*(src++), tableR);
+            }
             dst[i] = SkPack888ToRGB16(r, g, b);
         }
         dst = (uint16_t*)((char*)dst + dstRB);
     }
 }
 
-template<bool APPLY_PREBLEND>
-static void rgb_to_lcd32(const uint8_t* SK_RESTRICT src, const SkGlyph& glyph,
-                         const uint8_t* tableR, const uint8_t* tableG, const uint8_t* tableB) {
-    const size_t dstRB = glyph.rowBytes();
-    const U16CPU width = glyph.fWidth;
-    SkPMColor* SK_RESTRICT dst = static_cast<SkPMColor*>(glyph.fImage);
-
-    for (U16CPU y = 0; y < glyph.fHeight; y++) {
-        for (U16CPU i = 0; i < width; i++) {
-            U8CPU r = sk_apply_lut_if<APPLY_PREBLEND>(*(src++), tableR);
-            U8CPU g = sk_apply_lut_if<APPLY_PREBLEND>(*(src++), tableG);
-            U8CPU b = sk_apply_lut_if<APPLY_PREBLEND>(*(src++), tableB);
-            dst[i] = SkPackARGB32(0xFF, r, g, b);
-        }
-        dst = (SkPMColor*)((char*)dst + dstRB);
-    }
-}
-
-const void* SkScalerContext_DW::drawDWMask(const SkGlyph& glyph) {
+const void* SkScalerContext_DW::drawDWMask(const SkGlyph& glyph,
+                                           DWRITE_RENDERING_MODE renderingMode,
+                                           DWRITE_TEXTURE_TYPE textureType)
+{
     int sizeNeeded = glyph.fWidth * glyph.fHeight;
-    if (DWRITE_RENDERING_MODE_ALIASED != fRenderingMode) {
+    if (DWRITE_RENDERING_MODE_ALIASED != renderingMode) {
         sizeNeeded *= 3;
     }
     if (sizeNeeded > fBits.count()) {
@@ -642,36 +675,49 @@ const void* SkScalerContext_DW::drawDWMask(const SkGlyph& glyph) {
     run.glyphIndices = &index;
     run.isSideways = FALSE;
     run.glyphOffsets = &offset;
+    {
 
-    SkTScopedComPtr<IDWriteGlyphRunAnalysis> glyphRunAnalysis;
-    HRNM(fTypeface->fFactory->CreateGlyphRunAnalysis(&run,
-                                          1.0f, // pixelsPerDip,
-                                          &fXform,
-                                          fRenderingMode,
-                                          fMeasuringMode,
-                                          0.0f, // baselineOriginX,
-                                          0.0f, // baselineOriginY,
-                                          &glyphRunAnalysis),
-         "Could not create glyph run analysis.");
-
-    //NOTE: this assumes that the glyph has already been measured
-    //with an exact same glyph run analysis.
-    RECT bbox;
-    bbox.left = glyph.fLeft;
-    bbox.top = glyph.fTop;
-    bbox.right = glyph.fLeft + glyph.fWidth;
-    bbox.bottom = glyph.fTop + glyph.fHeight;
-    HRNM(glyphRunAnalysis->CreateAlphaTexture(fTextureType,
-                                              &bbox,
-                                              fBits.begin(),
-                                              sizeNeeded),
-         "Could not draw mask.");
+        SkTScopedComPtr<IDWriteGlyphRunAnalysis> glyphRunAnalysis;
+        {
+            Exclusive l(DWriteFactoryMutex);
+            HRNM(fTypeface->fFactory->CreateGlyphRunAnalysis(&run,
+                1.0f, // pixelsPerDip,
+                &fXform,
+                renderingMode,
+                fMeasuringMode,
+                0.0f, // baselineOriginX,
+                0.0f, // baselineOriginY,
+                &glyphRunAnalysis),
+                "Could not create glyph run analysis.");
+        }
+        //NOTE: this assumes that the glyph has already been measured
+        //with an exact same glyph run analysis.
+        RECT bbox;
+        bbox.left = glyph.fLeft;
+        bbox.top = glyph.fTop;
+        bbox.right = glyph.fLeft + glyph.fWidth;
+        bbox.bottom = glyph.fTop + glyph.fHeight;
+        {
+            Shared l(DWriteFactoryMutex);
+            HRNM(glyphRunAnalysis->CreateAlphaTexture(textureType,
+                &bbox,
+                fBits.begin(),
+                sizeNeeded),
+                "Could not draw mask.");
+        }
+    }
     return fBits.begin();
 }
 
 void SkScalerContext_DW::generateImage(const SkGlyph& glyph) {
     //Create the mask.
-    const void* bits = this->drawDWMask(glyph);
+    DWRITE_RENDERING_MODE renderingMode = fRenderingMode;
+    DWRITE_TEXTURE_TYPE textureType = fTextureType;
+    if (glyph.fForceBW) {
+        renderingMode = DWRITE_RENDERING_MODE_ALIASED;
+        textureType = DWRITE_TEXTURE_ALIASED_1x1;
+    }
+    const void* bits = this->drawDWMask(glyph, renderingMode, textureType);
     if (!bits) {
         sk_bzero(glyph.fImage, glyph.computeImageSize());
         return;
@@ -679,7 +725,7 @@ void SkScalerContext_DW::generateImage(const SkGlyph& glyph) {
 
     //Copy the mask into the glyph.
     const uint8_t* src = (const uint8_t*)bits;
-    if (DWRITE_RENDERING_MODE_ALIASED == fRenderingMode) {
+    if (DWRITE_RENDERING_MODE_ALIASED == renderingMode) {
         bilevel_to_bw(src, glyph);
         const_cast<SkGlyph&>(glyph).fMaskFormat = SkMask::kBW_Format;
     } else if (!isLCD(fRec)) {
@@ -688,24 +734,26 @@ void SkScalerContext_DW::generateImage(const SkGlyph& glyph) {
         } else {
             rgb_to_a8<false>(src, glyph, fPreBlend.fG);
         }
-    } else if (SkMask::kLCD16_Format == glyph.fMaskFormat) {
-        if (fPreBlend.isApplicable()) {
-            rgb_to_lcd16<true>(src, glyph, fPreBlend.fR, fPreBlend.fG, fPreBlend.fB);
-        } else {
-            rgb_to_lcd16<false>(src, glyph, fPreBlend.fR, fPreBlend.fG, fPreBlend.fB);
-        }
     } else {
-        SkASSERT(SkMask::kLCD32_Format == glyph.fMaskFormat);
+        SkASSERT(SkMask::kLCD16_Format == glyph.fMaskFormat);
         if (fPreBlend.isApplicable()) {
-            rgb_to_lcd32<true>(src, glyph, fPreBlend.fR, fPreBlend.fG, fPreBlend.fB);
+            if (fRec.fFlags & SkScalerContext::kLCD_BGROrder_Flag) {
+                rgb_to_lcd16<true, false>(src, glyph, fPreBlend.fR, fPreBlend.fG, fPreBlend.fB);
+            } else {
+                rgb_to_lcd16<true, true>(src, glyph, fPreBlend.fR, fPreBlend.fG, fPreBlend.fB);
+            }
         } else {
-            rgb_to_lcd32<false>(src, glyph, fPreBlend.fR, fPreBlend.fG, fPreBlend.fB);
+            if (fRec.fFlags & SkScalerContext::kLCD_BGROrder_Flag) {
+                rgb_to_lcd16<false, false>(src, glyph, fPreBlend.fR, fPreBlend.fG, fPreBlend.fB);
+            } else {
+                rgb_to_lcd16<false, true>(src, glyph, fPreBlend.fR, fPreBlend.fG, fPreBlend.fB);
+            }
         }
     }
 }
 
 void SkScalerContext_DW::generatePath(const SkGlyph& glyph, SkPath* path) {
-    SkASSERT(&glyph && path);
+    SkASSERT(path);
 
     path->reset();
 
@@ -713,17 +761,22 @@ void SkScalerContext_DW::generatePath(const SkGlyph& glyph, SkPath* path) {
     HRVM(SkDWriteGeometrySink::Create(path, &geometryToPath),
          "Could not create geometry to path converter.");
     uint16_t glyphId = glyph.getGlyphID();
-    //TODO: convert to<->from DIUs? This would make a difference if hinting.
-    //It may not be needed, it appears that DirectWrite only hints at em size.
-    HRVM(fTypeface->fDWriteFontFace->GetGlyphRunOutline(SkScalarToFloat(fTextSizeRender),
-                                       &glyphId,
-                                       NULL, //advances
-                                       NULL, //offsets
-                                       1, //num glyphs
-                                       FALSE, //sideways
-                                       FALSE, //rtl
-                                       geometryToPath.get()),
-         "Could not create glyph outline.");
+    {
+        Exclusive l(DWriteFactoryMutex);
+        //TODO: convert to<->from DIUs? This would make a difference if hinting.
+        //It may not be needed, it appears that DirectWrite only hints at em size.
+        HRVM(fTypeface->fDWriteFontFace->GetGlyphRunOutline(SkScalarToFloat(fTextSizeRender),
+            &glyphId,
+            nullptr, //advances
+            nullptr, //offsets
+            1, //num glyphs
+            FALSE, //sideways
+            FALSE, //rtl
+            geometryToPath.get()),
+            "Could not create glyph outline.");
+    }
 
     path->transform(fSkXform);
 }
+
+#endif//defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/src/ports/SkScalerContext_win_dw.h b/gfx/skia/skia/src/ports/SkScalerContext_win_dw.h
index e8eff0d6ce91..abf2bc9aa02e 100644
--- a/gfx/skia/skia/src/ports/SkScalerContext_win_dw.h
+++ b/gfx/skia/skia/src/ports/SkScalerContext_win_dw.h
@@ -15,7 +15,7 @@
 
 #include <dwrite.h>
 
-struct SkGlyph;
+class SkGlyph;
 class SkDescriptor;
 
 class SkScalerContext_DW : public SkScalerContext {
@@ -24,16 +24,23 @@ public:
     virtual ~SkScalerContext_DW();
 
 protected:
-    virtual unsigned generateGlyphCount() SK_OVERRIDE;
-    virtual uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE;
-    virtual void generateAdvance(SkGlyph* glyph) SK_OVERRIDE;
-    virtual void generateMetrics(SkGlyph* glyph) SK_OVERRIDE;
-    virtual void generateImage(const SkGlyph& glyph) SK_OVERRIDE;
-    virtual void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE;
-    virtual void generateFontMetrics(SkPaint::FontMetrics*) SK_OVERRIDE;
+    unsigned generateGlyphCount() override;
+    uint16_t generateCharToGlyph(SkUnichar uni) override;
+    void generateAdvance(SkGlyph* glyph) override;
+    void generateMetrics(SkGlyph* glyph) override;
+    void generateImage(const SkGlyph& glyph) override;
+    void generatePath(const SkGlyph& glyph, SkPath* path) override;
+    void generateFontMetrics(SkPaint::FontMetrics*) override;
 
 private:
-    const void* drawDWMask(const SkGlyph& glyph);
+    const void* drawDWMask(const SkGlyph& glyph,
+                           DWRITE_RENDERING_MODE renderingMode,
+                           DWRITE_TEXTURE_TYPE textureType);
+
+    HRESULT getBoundingBox(SkGlyph* glyph,
+                           DWRITE_RENDERING_MODE renderingMode,
+                           DWRITE_TEXTURE_TYPE textureType,
+                           RECT* bbox);
 
     SkTDArray<uint8_t> fBits;
     /** The total matrix without the text height scale. */
diff --git a/gfx/skia/skia/src/ports/SkTLS_none.cpp b/gfx/skia/skia/src/ports/SkTLS_none.cpp
index 95f6e370379e..d655560c22ee 100644
--- a/gfx/skia/skia/src/ports/SkTLS_none.cpp
+++ b/gfx/skia/skia/src/ports/SkTLS_none.cpp
@@ -7,7 +7,7 @@
 
 #include "SkTLS.h"
 
-static void* gSpecific = NULL;
+static void* gSpecific = nullptr;
 
 void* SkTLS::PlatformGetSpecific(bool) {
     return gSpecific;
diff --git a/gfx/skia/skia/src/ports/SkTLS_pthread.cpp b/gfx/skia/skia/src/ports/SkTLS_pthread.cpp
index 4264890217a6..ac558a81965b 100644
--- a/gfx/skia/skia/src/ports/SkTLS_pthread.cpp
+++ b/gfx/skia/skia/src/ports/SkTLS_pthread.cpp
@@ -18,7 +18,7 @@ static void sk_tls_make_key() {
 
 void* SkTLS::PlatformGetSpecific(bool forceCreateTheSlot) {
     // should we use forceCreateTheSlot to potentially skip calling pthread_once
-    // and just return NULL if we've never been called with
+    // and just return nullptr if we've never been called with
     // forceCreateTheSlot==true ?
 
     (void)pthread_once(&gSkTLSKey_Once, sk_tls_make_key);
diff --git a/gfx/skia/skia/src/ports/SkTLS_win.cpp b/gfx/skia/skia/src/ports/SkTLS_win.cpp
index dea8cd4d6bd2..8bc55a0f2cfe 100644
--- a/gfx/skia/skia/src/ports/SkTLS_win.cpp
+++ b/gfx/skia/skia/src/ports/SkTLS_win.cpp
@@ -4,9 +4,11 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_WIN32)
 
 #include "SkTLS.h"
-#include "SkThread.h"
+#include "SkMutex.h"
 
 static bool gOnce = false;
 static DWORD gTlsIndex;
@@ -14,7 +16,7 @@ SK_DECLARE_STATIC_MUTEX(gMutex);
 
 void* SkTLS::PlatformGetSpecific(bool forceCreateTheSlot) {
     if (!forceCreateTheSlot && !gOnce) {
-        return NULL;
+        return nullptr;
     }
 
     if (!gOnce) {
@@ -49,9 +51,9 @@ void SkTLS::PlatformSetSpecific(void* ptr) {
 void NTAPI onTLSCallback(PVOID unused, DWORD reason, PVOID unused2) {
     if ((DLL_THREAD_DETACH == reason || DLL_PROCESS_DETACH == reason) && gOnce) {
         void* ptr = TlsGetValue(gTlsIndex);
-        if (ptr != NULL) {
+        if (ptr != nullptr) {
             SkTLS::Destructor(ptr);
-            TlsSetValue(gTlsIndex, NULL);
+            TlsSetValue(gTlsIndex, nullptr);
         }
     }
 }
@@ -73,3 +75,5 @@ PIMAGE_TLS_CALLBACK skia_tls_callback = onTLSCallback;
 
 #endif
 }
+
+#endif//defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/src/ports/SkTime_Unix.cpp b/gfx/skia/skia/src/ports/SkTime_Unix.cpp
index f519a69d07c2..1ea3b8fbd0f5 100644
--- a/gfx/skia/skia/src/ports/SkTime_Unix.cpp
+++ b/gfx/skia/skia/src/ports/SkTime_Unix.cpp
@@ -6,8 +6,8 @@
  * found in the LICENSE file.
  */
 
-
 #include "SkTime.h"
+#include "SkTypes.h"
 
 #include <sys/time.h>
 #include <time.h>
@@ -16,12 +16,16 @@ void SkTime::GetDateTime(DateTime* dt)
 {
     if (dt)
     {
+        tzset();  // initialize timezone variable;
         time_t m_time;
         time(&m_time);
         struct tm* tstruct;
         tstruct = localtime(&m_time);
+        int offset = tstruct->tm_isdst == 1 ? 60 : 0;
 
-        dt->fYear       = tstruct->tm_year;
+        // http://pubs.opengroup.org/onlinepubs/009695399/basedefs/time.h.html
+        dt->fTimeZoneMinutes = SkToS16(offset - timezone / 60);
+        dt->fYear       = tstruct->tm_year + 1900;
         dt->fMonth      = SkToU8(tstruct->tm_mon + 1);
         dt->fDayOfWeek  = SkToU8(tstruct->tm_wday);
         dt->fDay        = SkToU8(tstruct->tm_mday);
@@ -30,10 +34,3 @@ void SkTime::GetDateTime(DateTime* dt)
         dt->fSecond     = SkToU8(tstruct->tm_sec);
     }
 }
-
-SkMSec SkTime::GetMSecs()
-{
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    return (SkMSec) (tv.tv_sec * 1000 + tv.tv_usec / 1000 ); // microseconds to milliseconds
-}
diff --git a/gfx/skia/skia/src/ports/SkTime_win.cpp b/gfx/skia/skia/src/ports/SkTime_win.cpp
index 37af9f29f5bb..2589d43d44d1 100644
--- a/gfx/skia/skia/src/ports/SkTime_win.cpp
+++ b/gfx/skia/skia/src/ports/SkTime_win.cpp
@@ -5,6 +5,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_WIN32)
 
 
 #include "SkTime.h"
@@ -14,10 +16,24 @@ void SkTime::GetDateTime(DateTime* dt)
     if (dt)
     {
         SYSTEMTIME      st;
-        GetSystemTime(&st);
-
+        TIME_ZONE_INFORMATION timeZoneInfo;
+        int tz_bias;
+        GetLocalTime(&st);
+        // https://gist.github.com/wrl/8924636
+        switch (GetTimeZoneInformation(&timeZoneInfo)) {
+            case TIME_ZONE_ID_STANDARD:
+                tz_bias = -timeZoneInfo.Bias - timeZoneInfo.StandardBias;
+                break;
+            case TIME_ZONE_ID_DAYLIGHT:
+                tz_bias = -timeZoneInfo.Bias - timeZoneInfo.DaylightBias;
+                break;
+            default:
+                tz_bias = -timeZoneInfo.Bias;
+                break;
+        }
+        dt->fTimeZoneMinutes = SkToS16(tz_bias);
         dt->fYear       = st.wYear;
-        dt->fMonth      = SkToU8(st.wMonth + 1);
+        dt->fMonth      = SkToU8(st.wMonth);
         dt->fDayOfWeek  = SkToU8(st.wDayOfWeek);
         dt->fDay        = SkToU8(st.wDay);
         dt->fHour       = SkToU8(st.wHour);
@@ -25,14 +41,4 @@ void SkTime::GetDateTime(DateTime* dt)
         dt->fSecond     = SkToU8(st.wSecond);
     }
 }
-
-SkMSec SkTime::GetMSecs()
-{
-    FILETIME        ft;
-    LARGE_INTEGER   li;
-    GetSystemTimeAsFileTime(&ft);
-    li.LowPart  = ft.dwLowDateTime;
-    li.HighPart = ft.dwHighDateTime;
-    __int64 t  = li.QuadPart;       /* In 100-nanosecond intervals */
-    return (SkMSec)(t / 10000);               /* In milliseconds */
-}
+#endif//defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/src/ports/SkTypeface_win_dw.cpp b/gfx/skia/skia/src/ports/SkTypeface_win_dw.cpp
index 503106069559..38d09e85ecf2 100644
--- a/gfx/skia/skia/src/ports/SkTypeface_win_dw.cpp
+++ b/gfx/skia/skia/src/ports/SkTypeface_win_dw.cpp
@@ -5,6 +5,16 @@
  * found in the LICENSE file.
  */
 
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_WIN32)
+
+// SkTypes will include Windows.h, which will pull in all of the GDI defines.
+// GDI #defines GetGlyphIndices to GetGlyphIndicesA or GetGlyphIndicesW, but
+// IDWriteFontFace has a method called GetGlyphIndices. Since this file does
+// not use GDI, undefing GetGlyphIndices makes things less confusing.
+#undef GetGlyphIndices
+
+#include "SkDWrite.h"
 #include "SkDWriteFontFileStream.h"
 #include "SkFontDescriptor.h"
 #include "SkFontStream.h"
@@ -12,26 +22,27 @@
 #include "SkOTTable_hhea.h"
 #include "SkOTTable_OS_2.h"
 #include "SkOTTable_post.h"
+#include "SkOTUtils.h"
 #include "SkScalerContext.h"
 #include "SkScalerContext_win_dw.h"
 #include "SkTypeface_win_dw.h"
-#include "SkTypes.h"
 #include "SkUtils.h"
 
+void DWriteFontTypeface::onGetFamilyName(SkString* familyName) const {
+    SkTScopedComPtr<IDWriteLocalizedStrings> familyNames;
+    HRV(fDWriteFontFamily->GetFamilyNames(&familyNames));
+
+    sk_get_locale_string(familyNames.get(), nullptr/*fMgr->fLocaleName.get()*/, familyName);
+}
+
 void DWriteFontTypeface::onGetFontDescriptor(SkFontDescriptor* desc,
                                              bool* isLocalStream) const {
     // Get the family name.
-    SkTScopedComPtr<IDWriteLocalizedStrings> dwFamilyNames;
-    HRV(fDWriteFontFamily->GetFamilyNames(&dwFamilyNames));
-
-    UINT32 dwFamilyNamesLength;
-    HRV(dwFamilyNames->GetStringLength(0, &dwFamilyNamesLength));
-
-    SkSMallocWCHAR dwFamilyNameChar(dwFamilyNamesLength+1);
-    HRV(dwFamilyNames->GetString(0, dwFamilyNameChar.get(), dwFamilyNamesLength+1));
+    SkTScopedComPtr<IDWriteLocalizedStrings> familyNames;
+    HRV(fDWriteFontFamily->GetFamilyNames(&familyNames));
 
     SkString utf8FamilyName;
-    HRV(sk_wchar_to_skstring(dwFamilyNameChar.get(), &utf8FamilyName));
+    sk_get_locale_string(familyNames.get(), nullptr/*fMgr->fLocaleName.get()*/, &utf8FamilyName);
 
     desc->setFamilyName(utf8FamilyName.c_str());
     *isLocalStream = SkToBool(fDWriteFontFileLoader.get());
@@ -65,7 +76,7 @@ static EncodingProc find_encoding_proc(SkTypeface::Encoding enc) {
 int DWriteFontTypeface::onCharsToGlyphs(const void* chars, Encoding encoding,
                                         uint16_t glyphs[], int glyphCount) const
 {
-    if (NULL == glyphs) {
+    if (nullptr == glyphs) {
         EncodingProc next_ucs4_proc = find_encoding_proc(encoding);
         for (int i = 0; i < glyphCount; ++i) {
             const SkUnichar c = next_ucs4_proc(&chars);
@@ -128,30 +139,28 @@ public:
         : fIndex(0), fStrings(strings)
     { }
 
-    virtual bool next(SkTypeface::LocalizedString* localizedString) SK_OVERRIDE {
+    bool next(SkTypeface::LocalizedString* localizedString) override {
         if (fIndex >= fStrings->GetCount()) {
             return false;
         }
 
         // String
-        UINT32 stringLength;
-        HRBM(fStrings->GetStringLength(fIndex, &stringLength), "Could not get string length.");
-        stringLength += 1;
+        UINT32 stringLen;
+        HRBM(fStrings->GetStringLength(fIndex, &stringLen), "Could not get string length.");
 
-        SkSMallocWCHAR wString(stringLength);
-        HRBM(fStrings->GetString(fIndex, wString.get(), stringLength), "Could not get string.");
+        SkSMallocWCHAR wString(stringLen+1);
+        HRBM(fStrings->GetString(fIndex, wString.get(), stringLen+1), "Could not get string.");
 
-        HRB(sk_wchar_to_skstring(wString.get(), &localizedString->fString));
+        HRB(sk_wchar_to_skstring(wString.get(), stringLen, &localizedString->fString));
 
         // Locale
-        UINT32 localeLength;
-        HRBM(fStrings->GetLocaleNameLength(fIndex, &localeLength), "Could not get locale length.");
-        localeLength += 1;
+        UINT32 localeLen;
+        HRBM(fStrings->GetLocaleNameLength(fIndex, &localeLen), "Could not get locale length.");
 
-        SkSMallocWCHAR wLocale(localeLength);
-        HRBM(fStrings->GetLocaleName(fIndex, wLocale.get(), localeLength), "Could not get locale.");
+        SkSMallocWCHAR wLocale(localeLen+1);
+        HRBM(fStrings->GetLocaleName(fIndex, wLocale.get(), localeLen+1), "Could not get locale.");
 
-        HRB(sk_wchar_to_skstring(wLocale.get(), &localizedString->fLanguage));
+        HRB(sk_wchar_to_skstring(wLocale.get(), localeLen, &localizedString->fLanguage));
 
         ++fIndex;
         return true;
@@ -163,10 +172,14 @@ private:
 };
 
 SkTypeface::LocalizedStrings* DWriteFontTypeface::onCreateFamilyNameIterator() const {
-    SkTScopedComPtr<IDWriteLocalizedStrings> familyNames;
-    HRNM(fDWriteFontFamily->GetFamilyNames(&familyNames), "Could not obtain family names.");
-
-    return new LocalizedStrings_IDWriteLocalizedStrings(familyNames.release());
+    SkTypeface::LocalizedStrings* nameIter =
+        SkOTUtils::LocalizedStrings_NameTable::CreateForFamilyNames(*this);
+    if (nullptr == nameIter) {
+        SkTScopedComPtr<IDWriteLocalizedStrings> familyNames;
+        HRNM(fDWriteFontFamily->GetFamilyNames(&familyNames), "Could not obtain family names.");
+        nameIter = new LocalizedStrings_IDWriteLocalizedStrings(familyNames.release());
+    }
+    return nameIter;
 }
 
 int DWriteFontTypeface::onGetTableTags(SkFontTableTag tags[]) const {
@@ -179,7 +192,7 @@ int DWriteFontTypeface::onGetTableTags(SkFontTableTag tags[]) const {
     }
 
     int ttcIndex;
-    SkAutoTUnref<SkStream> stream(this->openStream(&ttcIndex));
+    SkAutoTDelete<SkStream> stream(this->openStream(&ttcIndex));
     return stream.get() ? SkFontStream::GetTableTags(stream, ttcIndex, tags) : 0;
 }
 
@@ -195,21 +208,21 @@ size_t DWriteFontTypeface::onGetTableData(SkFontTableTag tag, size_t offset,
         return 0;
     }
     size_t size = SkTMin(length, table.fSize - offset);
-    if (NULL != data) {
+    if (data) {
         memcpy(data, table.fData + offset, size);
     }
 
     return size;
 }
 
-SkStream* DWriteFontTypeface::onOpenStream(int* ttcIndex) const {
+SkStreamAsset* DWriteFontTypeface::onOpenStream(int* ttcIndex) const {
     *ttcIndex = fDWriteFontFace->GetIndex();
 
     UINT32 numFiles;
-    HRNM(fDWriteFontFace->GetFiles(&numFiles, NULL),
+    HRNM(fDWriteFontFace->GetFiles(&numFiles, nullptr),
          "Could not get number of font files.");
     if (numFiles != 1) {
-        return NULL;
+        return nullptr;
     }
 
     SkTScopedComPtr<IDWriteFontFile> fontFile;
@@ -228,17 +241,15 @@ SkStream* DWriteFontTypeface::onOpenStream(int* ttcIndex) const {
                                              &fontFileStream),
          "Could not create font file stream.");
 
-    return SkNEW_ARGS(SkDWriteFontFileStream, (fontFileStream.get()));
+    return new SkDWriteFontFileStream(fontFileStream.get());
 }
 
 SkScalerContext* DWriteFontTypeface::onCreateScalerContext(const SkDescriptor* desc) const {
-    return SkNEW_ARGS(SkScalerContext_DW, (const_cast<DWriteFontTypeface*>(this), desc));
+    return new SkScalerContext_DW(const_cast<DWriteFontTypeface*>(this), desc);
 }
 
 void DWriteFontTypeface::onFilterRec(SkScalerContext::Rec* rec) const {
-    if (rec->fFlags & SkScalerContext::kLCD_BGROrder_Flag ||
-        rec->fFlags & SkScalerContext::kLCD_Vertical_Flag)
-    {
+    if (rec->fFlags & SkScalerContext::kLCD_Vertical_Flag) {
         rec->fMaskFormat = SkMask::kA8_Format;
     }
 
@@ -246,7 +257,6 @@ void DWriteFontTypeface::onFilterRec(SkScalerContext::Rec* rec) const {
                                   SkScalerContext::kDevKernText_Flag |
                                   SkScalerContext::kForceAutohinting_Flag |
                                   SkScalerContext::kEmbolden_Flag |
-                                  SkScalerContext::kLCD_BGROrder_Flag |
                                   SkScalerContext::kLCD_Vertical_Flag;
     rec->fFlags &= ~flagsWeDontSupport;
 
@@ -257,7 +267,7 @@ void DWriteFontTypeface::onFilterRec(SkScalerContext::Rec* rec) const {
 
 #if SK_FONT_HOST_USE_SYSTEM_SETTINGS
     IDWriteFactory* factory = get_dwrite_factory();
-    if (factory != NULL) {
+    if (factory != nullptr) {
         SkTScopedComPtr<IDWriteRenderingParams> defaultRenderingParams;
         if (SUCCEEDED(factory->CreateRenderingParams(&defaultRenderingParams))) {
             float gamma = defaultRenderingParams->GetGamma();
@@ -278,56 +288,29 @@ using namespace skia_advanced_typeface_metrics_utils;
 // Construct Glyph to Unicode table.
 // Unicode code points that require conjugate pairs in utf16 are not
 // supported.
-// TODO(arthurhsu): Add support for conjugate pairs. It looks like that may
-// require parsing the TTF cmap table (platform 4, encoding 12) directly instead
-// of calling GetFontUnicodeRange().
 // TODO(bungeman): This never does what anyone wants.
 // What is really wanted is the text to glyphs mapping
 static void populate_glyph_to_unicode(IDWriteFontFace* fontFace,
                                       const unsigned glyphCount,
                                       SkTDArray<SkUnichar>* glyphToUnicode) {
-    HRESULT hr = S_OK;
-
     //Do this like free type instead
-    UINT32 count = 0;
+    SkAutoTMalloc<SkUnichar> glyphToUni(glyphCount);
+    int maxGlyph = -1;
     for (UINT32 c = 0; c < 0x10FFFF; ++c) {
-        UINT16 glyph;
-        hr = fontFace->GetGlyphIndices(&c, 1, &glyph);
-        if (glyph > 0) {
-            ++count;
+        UINT16 glyph = 0;
+        HRVM(fontFace->GetGlyphIndices(&c, 1, &glyph),
+             "Failed to get glyph index.");
+        // Intermittent DW bug on Windows 10. See crbug.com/470146.
+        if (glyph >= glyphCount) {
+          return;
+        }
+        if (0 < glyph) {
+            maxGlyph = SkTMax(static_cast<int>(glyph), maxGlyph);
+            glyphToUni[glyph] = c;
         }
     }
 
-    SkAutoTArray<UINT32> chars(count);
-    count = 0;
-    for (UINT32 c = 0; c < 0x10FFFF; ++c) {
-        UINT16 glyph;
-        hr = fontFace->GetGlyphIndices(&c, 1, &glyph);
-        if (glyph > 0) {
-            chars[count] = c;
-            ++count;
-        }
-    }
-
-    SkAutoTArray<UINT16> glyph(count);
-    fontFace->GetGlyphIndices(chars.get(), count, glyph.get());
-
-    USHORT maxGlyph = 0;
-    for (USHORT j = 0; j < count; ++j) {
-        if (glyph[j] > maxGlyph) maxGlyph = glyph[j];
-    }
-
-    glyphToUnicode->setCount(maxGlyph+1);
-    for (USHORT j = 0; j < maxGlyph+1u; ++j) {
-        (*glyphToUnicode)[j] = 0;
-    }
-
-    //'invert'
-    for (USHORT j = 0; j < count; ++j) {
-        if (glyph[j] < glyphCount && (*glyphToUnicode)[glyph[j]] == 0) {
-            (*glyphToUnicode)[glyph[j]] = chars[j];
-        }
-    }
+    SkTDArray<SkUnichar>(glyphToUni, maxGlyph + 1).swap(*glyphToUnicode);
 }
 
 static bool getWidthAdvance(IDWriteFontFace* fontFace, int gId, int16_t* advance) {
@@ -347,11 +330,11 @@ static bool getWidthAdvance(IDWriteFontFace* fontFace, int gId, int16_t* advance
 }
 
 SkAdvancedTypefaceMetrics* DWriteFontTypeface::onGetAdvancedTypefaceMetrics(
-        SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo,
+        PerGlyphInfo perGlyphInfo,
         const uint32_t* glyphIDs,
         uint32_t glyphIDsCount) const {
 
-    SkAdvancedTypefaceMetrics* info = NULL;
+    SkAdvancedTypefaceMetrics* info = nullptr;
 
     HRESULT hr = S_OK;
 
@@ -363,8 +346,6 @@ SkAdvancedTypefaceMetrics* DWriteFontTypeface::onGetAdvancedTypefaceMetrics(
     info = new SkAdvancedTypefaceMetrics;
     info->fEmSize = dwfm.designUnitsPerEm;
     info->fLastGlyphID = SkToU16(glyphCount - 1);
-    info->fStyle = 0;
-    info->fFlags = SkAdvancedTypefaceMetrics::kEmpty_FontFlag;
 
     // SkAdvancedTypefaceMetrics::fFontName is in theory supposed to be
     // the PostScript name of the font. However, due to the way it is currently
@@ -372,16 +353,15 @@ SkAdvancedTypefaceMetrics* DWriteFontTypeface::onGetAdvancedTypefaceMetrics(
     SkTScopedComPtr<IDWriteLocalizedStrings> familyNames;
     hr = fDWriteFontFamily->GetFamilyNames(&familyNames);
 
-    UINT32 familyNameLength;
-    hr = familyNames->GetStringLength(0, &familyNameLength);
+    UINT32 familyNameLen;
+    hr = familyNames->GetStringLength(0, &familyNameLen);
 
-    UINT32 size = familyNameLength+1;
-    SkSMallocWCHAR wFamilyName(size);
-    hr = familyNames->GetString(0, wFamilyName.get(), size);
+    SkSMallocWCHAR familyName(familyNameLen+1);
+    hr = familyNames->GetString(0, familyName.get(), familyNameLen+1);
 
-    hr = sk_wchar_to_skstring(wFamilyName.get(), &info->fFontName);
+    hr = sk_wchar_to_skstring(familyName.get(), familyNameLen, &info->fFontName);
 
-    if (perGlyphInfo & SkAdvancedTypefaceMetrics::kToUnicode_PerGlyphInfo) {
+    if (perGlyphInfo & kToUnicode_PerGlyphInfo) {
         populate_glyph_to_unicode(fDWriteFontFace.get(), glyphCount, &(info->fGlyphToUnicode));
     }
 
@@ -390,13 +370,9 @@ SkAdvancedTypefaceMetrics* DWriteFontTypeface::onGetAdvancedTypefaceMetrics(
         fontType == DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION) {
         info->fType = SkAdvancedTypefaceMetrics::kTrueType_Font;
     } else {
-        info->fType = SkAdvancedTypefaceMetrics::kOther_Font;
-        info->fItalicAngle = 0;
-        info->fAscent = dwfm.ascent;;
+        info->fAscent = dwfm.ascent;
         info->fDescent = dwfm.descent;
-        info->fStemV = 0;
         info->fCapHeight = dwfm.capHeight;
-        info->fBBox = SkIRect::MakeEmpty();
         return info;
     }
 
@@ -405,12 +381,9 @@ SkAdvancedTypefaceMetrics* DWriteFontTypeface::onGetAdvancedTypefaceMetrics(
     AutoTDWriteTable<SkOTTableHorizontalHeader> hheaTable(fDWriteFontFace.get());
     AutoTDWriteTable<SkOTTableOS2> os2Table(fDWriteFontFace.get());
     if (!headTable.fExists || !postTable.fExists || !hheaTable.fExists || !os2Table.fExists) {
-        info->fItalicAngle = 0;
-        info->fAscent = dwfm.ascent;;
+        info->fAscent = dwfm.ascent;
         info->fDescent = dwfm.descent;
-        info->fStemV = 0;
         info->fCapHeight = dwfm.capHeight;
-        info->fBBox = SkIRect::MakeEmpty();
         return info;
     }
 
@@ -468,7 +441,7 @@ SkAdvancedTypefaceMetrics* DWriteFontTypeface::onGetAdvancedTypefaceMetrics(
     }
     */
 
-    if (perGlyphInfo & SkAdvancedTypefaceMetrics::kHAdvance_PerGlyphInfo) {
+    if (perGlyphInfo & kHAdvance_PerGlyphInfo) {
         if (fixedWidth) {
             appendRange(&info->fGlyphWidths, 0);
             int16_t advance;
@@ -488,3 +461,4 @@ SkAdvancedTypefaceMetrics* DWriteFontTypeface::onGetAdvancedTypefaceMetrics(
 
     return info;
 }
+#endif//defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/src/ports/SkTypeface_win_dw.h b/gfx/skia/skia/src/ports/SkTypeface_win_dw.h
index 650685825dab..3d6fce0a32a3 100644
--- a/gfx/skia/skia/src/ports/SkTypeface_win_dw.h
+++ b/gfx/skia/skia/src/ports/SkTypeface_win_dw.h
@@ -24,28 +24,25 @@
 class SkFontDescriptor;
 struct SkScalerContextRec;
 
-static SkTypeface::Style get_style(IDWriteFont* font) {
-    int style = SkTypeface::kNormal;
-    DWRITE_FONT_WEIGHT weight = font->GetWeight();
-    if (DWRITE_FONT_WEIGHT_DEMI_BOLD <= weight) {
-        style |= SkTypeface::kBold;
-    }
-    DWRITE_FONT_STYLE angle = font->GetStyle();
-    if (DWRITE_FONT_STYLE_OBLIQUE == angle || DWRITE_FONT_STYLE_ITALIC == angle) {
-        style |= SkTypeface::kItalic;
-    }
-    return static_cast<SkTypeface::Style>(style);
+static SkFontStyle get_style(IDWriteFont* font) {
+    DWRITE_FONT_STYLE dwStyle = font->GetStyle();
+    return SkFontStyle(font->GetWeight(),
+                       font->GetStretch(),
+                       (DWRITE_FONT_STYLE_OBLIQUE == dwStyle ||
+                        DWRITE_FONT_STYLE_ITALIC  == dwStyle)
+                                                   ? SkFontStyle::kItalic_Slant
+                                                   : SkFontStyle::kUpright_Slant);
 }
 
 class DWriteFontTypeface : public SkTypeface {
 private:
-    DWriteFontTypeface(SkTypeface::Style style, SkFontID fontID,
+    DWriteFontTypeface(const SkFontStyle& style, SkFontID fontID,
                        IDWriteFactory* factory,
                        IDWriteFontFace* fontFace,
                        IDWriteFont* font,
                        IDWriteFontFamily* fontFamily,
-                       IDWriteFontFileLoader* fontFileLoader = NULL,
-                       IDWriteFontCollectionLoader* fontCollectionLoader = NULL)
+                       IDWriteFontFileLoader* fontFileLoader = nullptr,
+                       IDWriteFontCollectionLoader* fontCollectionLoader = nullptr)
         : SkTypeface(style, fontID, false)
         , fFactory(SkRefComPtr(factory))
         , fDWriteFontCollectionLoader(SkSafeRefComPtr(fontCollectionLoader))
@@ -56,9 +53,9 @@ private:
     {
 #if SK_HAS_DWRITE_1_H
         if (!SUCCEEDED(fDWriteFontFace->QueryInterface(&fDWriteFontFace1))) {
-            // IUnknown::QueryInterface states that if it fails, punk will be set to NULL.
+            // IUnknown::QueryInterface states that if it fails, punk will be set to nullptr.
             // http://blogs.msdn.com/b/oldnewthing/archive/2004/03/26/96777.aspx
-            SK_ALWAYSBREAK(NULL == fDWriteFontFace1.get());
+            SK_ALWAYSBREAK(nullptr == fDWriteFontFace1.get());
         }
 #endif
     }
@@ -78,17 +75,15 @@ public:
                                       IDWriteFontFace* fontFace,
                                       IDWriteFont* font,
                                       IDWriteFontFamily* fontFamily,
-                                      IDWriteFontFileLoader* fontFileLoader = NULL,
-                                      IDWriteFontCollectionLoader* fontCollectionLoader = NULL) {
-        SkTypeface::Style style = get_style(font);
+                                      IDWriteFontFileLoader* fontFileLoader = nullptr,
+                                      IDWriteFontCollectionLoader* fontCollectionLoader = nullptr) {
         SkFontID fontID = SkTypefaceCache::NewFontID();
-        return SkNEW_ARGS(DWriteFontTypeface, (style, fontID,
-                                               factory, fontFace, font, fontFamily,
-                                               fontFileLoader, fontCollectionLoader));
+        return new DWriteFontTypeface(get_style(font), fontID, factory, fontFace, font, fontFamily,
+                                      fontFileLoader, fontCollectionLoader);
     }
 
 protected:
-    virtual void weak_dispose() const SK_OVERRIDE {
+    void weak_dispose() const override {
         if (fDWriteFontCollectionLoader.get()) {
             HRV(fFactory->UnregisterFontCollectionLoader(fDWriteFontCollectionLoader.get()));
         }
@@ -100,21 +95,21 @@ protected:
         INHERITED::weak_dispose();
     }
 
-    virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE;
-    virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE;
-    virtual void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE;
-    virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
-                                SkAdvancedTypefaceMetrics::PerGlyphInfo,
-                                const uint32_t*, uint32_t) const SK_OVERRIDE;
-    virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE;
+    SkStreamAsset* onOpenStream(int* ttcIndex) const override;
+    SkScalerContext* onCreateScalerContext(const SkDescriptor*) const override;
+    void onFilterRec(SkScalerContextRec*) const override;
+    SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
+                                PerGlyphInfo, const uint32_t*, uint32_t) const override;
+    void onGetFontDescriptor(SkFontDescriptor*, bool*) const override;
     virtual int onCharsToGlyphs(const void* chars, Encoding encoding,
-                                uint16_t glyphs[], int glyphCount) const SK_OVERRIDE;
-    virtual int onCountGlyphs() const SK_OVERRIDE;
-    virtual int onGetUPEM() const SK_OVERRIDE;
-    virtual SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE;
-    virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE;
+                                uint16_t glyphs[], int glyphCount) const override;
+    int onCountGlyphs() const override;
+    int onGetUPEM() const override;
+    void onGetFamilyName(SkString* familyName) const override;
+    SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override;
+    int onGetTableTags(SkFontTableTag tags[]) const override;
     virtual size_t onGetTableData(SkFontTableTag, size_t offset,
-                                  size_t length, void* data) const SK_OVERRIDE;
+                                  size_t length, void* data) const override;
 
 private:
     typedef SkTypeface INHERITED;
diff --git a/gfx/skia/skia/src/ports/SkXMLParser_empty.cpp b/gfx/skia/skia/src/ports/SkXMLParser_empty.cpp
deleted file mode 100644
index 09b222e89973..000000000000
--- a/gfx/skia/skia/src/ports/SkXMLParser_empty.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkXMLParser.h"
-
-bool SkXMLParser::parse(SkStream& docStream)
-{
-    return false;
-}
-
-bool SkXMLParser::parse(const char doc[], size_t len)
-{
-    return false;
-}
-
-void SkXMLParser::GetNativeErrorString(int error, SkString* str)
-{
-
-}
diff --git a/gfx/skia/skia/src/sfnt/SkIBMFamilyClass.h b/gfx/skia/skia/src/sfnt/SkIBMFamilyClass.h
index 45d9822f506f..157201121583 100644
--- a/gfx/skia/skia/src/sfnt/SkIBMFamilyClass.h
+++ b/gfx/skia/skia/src/sfnt/SkIBMFamilyClass.h
@@ -169,6 +169,6 @@ struct SkIBMFamilyClass {
 #pragma pack(pop)
 
 
-SK_COMPILE_ASSERT(sizeof(SkIBMFamilyClass) == 2, sizeof_SkIBMFamilyClass_not_2);
+static_assert(sizeof(SkIBMFamilyClass) == 2, "sizeof_SkIBMFamilyClass_not_2");
 
 #endif
diff --git a/gfx/skia/skia/src/sfnt/SkOTTableTypes.h b/gfx/skia/skia/src/sfnt/SkOTTableTypes.h
index 1f49518d5915..119f17ef77c9 100644
--- a/gfx/skia/skia/src/sfnt/SkOTTableTypes.h
+++ b/gfx/skia/skia/src/sfnt/SkOTTableTypes.h
@@ -8,7 +8,6 @@
 #ifndef SkOTTableTypes_DEFINED
 #define SkOTTableTypes_DEFINED
 
-#include "SkTemplates.h"
 #include "SkTypes.h"
 #include "SkEndian.h"
 
@@ -48,14 +47,14 @@ public:
 
 /** SkOTSetUSHORTBit<N>::value is an SK_OT_USHORT with the Nth BE bit set. */
 template <unsigned N> struct SkOTSetUSHORTBit {
-    SK_COMPILE_ASSERT(N < 16, NTooBig);
+    static_assert(N < 16, "NTooBig");
     static const uint16_t bit = 1u << N;
     static const SK_OT_USHORT value = SkTEndian_SwapBE16(bit);
 };
 
 /** SkOTSetULONGBit<N>::value is an SK_OT_ULONG with the Nth BE bit set. */
 template <unsigned N> struct SkOTSetULONGBit {
-    SK_COMPILE_ASSERT(N < 32, NTooBig);
+    static_assert(N < 32, "NTooBig");
     static const uint32_t bit = 1u << N;
     static const SK_OT_ULONG value = SkTEndian_SwapBE32(bit);
 };
diff --git a/gfx/skia/skia/src/sfnt/SkOTTable_OS_2.h b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2.h
index c4dbc5336c0e..4a09a78605cc 100644
--- a/gfx/skia/skia/src/sfnt/SkOTTable_OS_2.h
+++ b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2.h
@@ -42,11 +42,11 @@ struct SkOTTableOS2 {
 #pragma pack(pop)
 
 
-SK_COMPILE_ASSERT(sizeof(SkOTTableOS2::Version::VA) == 68, sizeof_SkOTTableOS2__VA_not_68);
-SK_COMPILE_ASSERT(sizeof(SkOTTableOS2::Version::V0) == 78, sizeof_SkOTTableOS2__V0_not_78);
-SK_COMPILE_ASSERT(sizeof(SkOTTableOS2::Version::V1) == 86, sizeof_SkOTTableOS2__V1_not_86);
-SK_COMPILE_ASSERT(sizeof(SkOTTableOS2::Version::V2) == 96, sizeof_SkOTTableOS2__V2_not_96);
-SK_COMPILE_ASSERT(sizeof(SkOTTableOS2::Version::V3) == 96, sizeof_SkOTTableOS2__V3_not_96);
-SK_COMPILE_ASSERT(sizeof(SkOTTableOS2::Version::V4) == 96, sizeof_SkOTTableOS2__V4_not_96);
+static_assert(sizeof(SkOTTableOS2::Version::VA) == 68, "sizeof_SkOTTableOS2__VA_not_68");
+static_assert(sizeof(SkOTTableOS2::Version::V0) == 78, "sizeof_SkOTTableOS2__V0_not_78");
+static_assert(sizeof(SkOTTableOS2::Version::V1) == 86, "sizeof_SkOTTableOS2__V1_not_86");
+static_assert(sizeof(SkOTTableOS2::Version::V2) == 96, "sizeof_SkOTTableOS2__V2_not_96");
+static_assert(sizeof(SkOTTableOS2::Version::V3) == 96, "sizeof_SkOTTableOS2__V3_not_96");
+static_assert(sizeof(SkOTTableOS2::Version::V4) == 96, "sizeof_SkOTTableOS2__V4_not_96");
 
 #endif
diff --git a/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V0.h b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V0.h
index b65bcf7f6319..4dff4137704a 100644
--- a/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V0.h
+++ b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V0.h
@@ -144,6 +144,6 @@ struct SkOTTableOS2_V0 {
 #pragma pack(pop)
 
 
-SK_COMPILE_ASSERT(sizeof(SkOTTableOS2_V0) == 78, sizeof_SkOTTableOS2_V0_not_78);
+static_assert(sizeof(SkOTTableOS2_V0) == 78, "sizeof_SkOTTableOS2_V0_not_78");
 
 #endif
diff --git a/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V1.h b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V1.h
index e53c0e67a5e5..43e61d41cc47 100644
--- a/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V1.h
+++ b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V1.h
@@ -513,6 +513,6 @@ struct SkOTTableOS2_V1 {
 #pragma pack(pop)
 
 
-SK_COMPILE_ASSERT(sizeof(SkOTTableOS2_V1) == 86, sizeof_SkOTTableOS2_V1_not_86);
+static_assert(sizeof(SkOTTableOS2_V1) == 86, "sizeof_SkOTTableOS2_V1_not_86");
 
 #endif
diff --git a/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V2.h b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V2.h
index 52f946057a85..30ad01679022 100644
--- a/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V2.h
+++ b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V2.h
@@ -535,6 +535,6 @@ struct SkOTTableOS2_V2 {
 #pragma pack(pop)
 
 
-SK_COMPILE_ASSERT(sizeof(SkOTTableOS2_V2) == 96, sizeof_SkOTTableOS2_V2_not_96);
+static_assert(sizeof(SkOTTableOS2_V2) == 96, "sizeof_SkOTTableOS2_V2_not_96");
 
 #endif
diff --git a/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V3.h b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V3.h
index 8d4fa6b574c1..00df2891f140 100644
--- a/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V3.h
+++ b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V3.h
@@ -545,6 +545,6 @@ struct SkOTTableOS2_V3 {
 #pragma pack(pop)
 
 
-SK_COMPILE_ASSERT(sizeof(SkOTTableOS2_V3) == 96, sizeof_SkOTTableOS2_V3_not_96);
+static_assert(sizeof(SkOTTableOS2_V3) == 96, "sizeof_SkOTTableOS2_V3_not_96");
 
 #endif
diff --git a/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V4.h b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V4.h
index fc64b2257bbf..3d22a1b2d1a2 100644
--- a/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V4.h
+++ b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V4.h
@@ -580,6 +580,6 @@ struct SkOTTableOS2_V4 {
 #pragma pack(pop)
 
 
-SK_COMPILE_ASSERT(sizeof(SkOTTableOS2_V4) == 96, sizeof_SkOTTableOS2_V4_not_96);
+static_assert(sizeof(SkOTTableOS2_V4) == 96, "sizeof_SkOTTableOS2_V4_not_96");
 
 #endif
diff --git a/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_VA.h b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_VA.h
index bc45da20217c..1dc95b5af7ec 100644
--- a/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_VA.h
+++ b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_VA.h
@@ -137,6 +137,6 @@ struct SkOTTableOS2_VA {
 #pragma pack(pop)
 
 
-SK_COMPILE_ASSERT(sizeof(SkOTTableOS2_VA) == 68, sizeof_SkOTTableOS2_VA_not_68);
+static_assert(sizeof(SkOTTableOS2_VA) == 68, "sizeof_SkOTTableOS2_VA_not_68");
 
 #endif
diff --git a/gfx/skia/skia/src/sfnt/SkOTTable_gasp.h b/gfx/skia/skia/src/sfnt/SkOTTable_gasp.h
index ca2d265e22ed..c6d8aa655064 100644
--- a/gfx/skia/skia/src/sfnt/SkOTTable_gasp.h
+++ b/gfx/skia/skia/src/sfnt/SkOTTable_gasp.h
@@ -67,7 +67,7 @@ struct SkOTTableGridAndScanProcedure {
 
 
 #include <stddef.h>
-SK_COMPILE_ASSERT(offsetof(SkOTTableGridAndScanProcedure, numRanges) == 2, SkOTTableGridAndScanProcedure_numRanges_not_at_2);
-SK_COMPILE_ASSERT(sizeof(SkOTTableGridAndScanProcedure) == 4, sizeof_SkOTTableGridAndScanProcedure_not_4);
+static_assert(offsetof(SkOTTableGridAndScanProcedure, numRanges) == 2, "SkOTTableGridAndScanProcedure_numRanges_not_at_2");
+static_assert(sizeof(SkOTTableGridAndScanProcedure) == 4, "sizeof_SkOTTableGridAndScanProcedure_not_4");
 
 #endif
diff --git a/gfx/skia/skia/src/sfnt/SkOTTable_head.h b/gfx/skia/skia/src/sfnt/SkOTTable_head.h
index 3d2c0f111338..52970b0f3b4b 100644
--- a/gfx/skia/skia/src/sfnt/SkOTTable_head.h
+++ b/gfx/skia/skia/src/sfnt/SkOTTable_head.h
@@ -144,7 +144,7 @@ struct SkOTTableHead {
 
 
 #include <stddef.h>
-SK_COMPILE_ASSERT(offsetof(SkOTTableHead, glyphDataFormat) == 52, SkOTTableHead_glyphDataFormat_not_at_52);
-SK_COMPILE_ASSERT(sizeof(SkOTTableHead) == 54, sizeof_SkOTTableHead_not_54);
+static_assert(offsetof(SkOTTableHead, glyphDataFormat) == 52, "SkOTTableHead_glyphDataFormat_not_at_52");
+static_assert(sizeof(SkOTTableHead) == 54, "sizeof_SkOTTableHead_not_54");
 
 #endif
diff --git a/gfx/skia/skia/src/sfnt/SkOTTable_hhea.h b/gfx/skia/skia/src/sfnt/SkOTTable_hhea.h
index b8a20701991c..a3b9cad7257b 100644
--- a/gfx/skia/skia/src/sfnt/SkOTTable_hhea.h
+++ b/gfx/skia/skia/src/sfnt/SkOTTable_hhea.h
@@ -50,7 +50,7 @@ struct SkOTTableHorizontalHeader {
 
 
 #include <stddef.h>
-SK_COMPILE_ASSERT(offsetof(SkOTTableHorizontalHeader, numberOfHMetrics) == 34, SkOTTableHorizontalHeader_numberOfHMetrics_not_at_34);
-SK_COMPILE_ASSERT(sizeof(SkOTTableHorizontalHeader) == 36, sizeof_SkOTTableHorizontalHeader_not_36);
+static_assert(offsetof(SkOTTableHorizontalHeader, numberOfHMetrics) == 34, "SkOTTableHorizontalHeader_numberOfHMetrics_not_at_34");
+static_assert(sizeof(SkOTTableHorizontalHeader) == 36, "sizeof_SkOTTableHorizontalHeader_not_36");
 
 #endif
diff --git a/gfx/skia/skia/src/sfnt/SkOTTable_maxp_CFF.h b/gfx/skia/skia/src/sfnt/SkOTTable_maxp_CFF.h
index f97bff9efc7f..435d823886f8 100644
--- a/gfx/skia/skia/src/sfnt/SkOTTable_maxp_CFF.h
+++ b/gfx/skia/skia/src/sfnt/SkOTTable_maxp_CFF.h
@@ -24,7 +24,7 @@ struct SkOTTableMaximumProfile_CFF {
 
 
 #include <stddef.h>
-SK_COMPILE_ASSERT(offsetof(SkOTTableMaximumProfile_CFF, numGlyphs) == 4, SkOTTableMaximumProfile_CFF_numGlyphs_not_at_4);
-SK_COMPILE_ASSERT(sizeof(SkOTTableMaximumProfile_CFF) == 6, sizeof_SkOTTableMaximumProfile_CFF_not_6);
+static_assert(offsetof(SkOTTableMaximumProfile_CFF, numGlyphs) == 4, "SkOTTableMaximumProfile_CFF_numGlyphs_not_at_4");
+static_assert(sizeof(SkOTTableMaximumProfile_CFF) == 6, "sizeof_SkOTTableMaximumProfile_CFF_not_6");
 
 #endif
diff --git a/gfx/skia/skia/src/sfnt/SkOTTable_maxp_TT.h b/gfx/skia/skia/src/sfnt/SkOTTable_maxp_TT.h
index 9aa557ff30af..1fdd0edc8352 100644
--- a/gfx/skia/skia/src/sfnt/SkOTTable_maxp_TT.h
+++ b/gfx/skia/skia/src/sfnt/SkOTTable_maxp_TT.h
@@ -44,7 +44,7 @@ struct SkOTTableMaximumProfile_TT {
 
 
 #include <stddef.h>
-SK_COMPILE_ASSERT(offsetof(SkOTTableMaximumProfile_TT, maxComponentDepth) == 30, SkOTTableMaximumProfile_TT_maxComponentDepth_not_at_30);
-SK_COMPILE_ASSERT(sizeof(SkOTTableMaximumProfile_TT) == 32, sizeof_SkOTTableMaximumProfile_TT_not_32);
+static_assert(offsetof(SkOTTableMaximumProfile_TT, maxComponentDepth) == 30, "SkOTTableMaximumProfile_TT_maxComponentDepth_not_at_30");
+static_assert(sizeof(SkOTTableMaximumProfile_TT) == 32, "sizeof_SkOTTableMaximumProfile_TT_not_32");
 
 #endif
diff --git a/gfx/skia/skia/src/sfnt/SkOTTable_name.cpp b/gfx/skia/skia/src/sfnt/SkOTTable_name.cpp
index 897b2358f27f..4e26759cdc34 100644
--- a/gfx/skia/skia/src/sfnt/SkOTTable_name.cpp
+++ b/gfx/skia/skia/src/sfnt/SkOTTable_name.cpp
@@ -31,7 +31,7 @@ static SkUnichar SkUTF16BE_NextUnichar(const uint16_t** srcPtr) {
 }
 
 static void SkStringFromUTF16BE(const uint16_t* utf16be, size_t length, SkString& utf8) {
-    SkASSERT(utf16be != NULL);
+    SkASSERT(utf16be != nullptr);
 
     utf8.reset();
     size_t numberOf16BitValues = length / 2;
diff --git a/gfx/skia/skia/src/sfnt/SkOTTable_name.h b/gfx/skia/skia/src/sfnt/SkOTTable_name.h
index f3dae4085a4a..6b25a2d1c8c6 100644
--- a/gfx/skia/skia/src/sfnt/SkOTTable_name.h
+++ b/gfx/skia/skia/src/sfnt/SkOTTable_name.h
@@ -560,9 +560,9 @@ struct SkOTTableName {
         }
 
         struct Record {
-            SK_OT_USHORT type;
             SkString name;
             SkString language;
+            SK_OT_USHORT type;
         };
         bool next(Record&);
 
@@ -576,9 +576,9 @@ struct SkOTTableName {
 #pragma pack(pop)
 
 
-SK_COMPILE_ASSERT(sizeof(SkOTTableName) == 6, sizeof_SkOTTableName_not_6);
-SK_COMPILE_ASSERT(sizeof(SkOTTableName::Format1Ext) == 2, sizeof_SkOTTableNameF1_not_2);
-SK_COMPILE_ASSERT(sizeof(SkOTTableName::Format1Ext::LangTagRecord) == 4, sizeof_SkOTTableNameLangTagRecord_not_4);
-SK_COMPILE_ASSERT(sizeof(SkOTTableName::Record) == 12, sizeof_SkOTTableNameRecord_not_12);
+static_assert(sizeof(SkOTTableName) == 6, "sizeof_SkOTTableName_not_6");
+static_assert(sizeof(SkOTTableName::Format1Ext) == 2, "sizeof_SkOTTableNameF1_not_2");
+static_assert(sizeof(SkOTTableName::Format1Ext::LangTagRecord) == 4, "sizeof_SkOTTableNameLangTagRecord_not_4");
+static_assert(sizeof(SkOTTableName::Record) == 12, "sizeof_SkOTTableNameRecord_not_12");
 
 #endif
diff --git a/gfx/skia/skia/src/sfnt/SkOTTable_post.h b/gfx/skia/skia/src/sfnt/SkOTTable_post.h
index f563b08b229a..7461d5283eb5 100644
--- a/gfx/skia/skia/src/sfnt/SkOTTable_post.h
+++ b/gfx/skia/skia/src/sfnt/SkOTTable_post.h
@@ -46,7 +46,7 @@ struct SkOTTablePostScript {
 
 
 #include <stddef.h>
-SK_COMPILE_ASSERT(offsetof(SkOTTablePostScript, maxMemType1) == 28, SkOTTablePostScript_maxMemType1_not_at_28);
-SK_COMPILE_ASSERT(sizeof(SkOTTablePostScript) == 32, sizeof_SkOTTablePostScript_not_32);
+static_assert(offsetof(SkOTTablePostScript, maxMemType1) == 28, "SkOTTablePostScript_maxMemType1_not_at_28");
+static_assert(sizeof(SkOTTablePostScript) == 32, "sizeof_SkOTTablePostScript_not_32");
 
 #endif
diff --git a/gfx/skia/skia/src/sfnt/SkOTUtils.cpp b/gfx/skia/skia/src/sfnt/SkOTUtils.cpp
index e76d1da08c42..52d996fbc59c 100644
--- a/gfx/skia/skia/src/sfnt/SkOTUtils.cpp
+++ b/gfx/skia/skia/src/sfnt/SkOTUtils.cpp
@@ -33,12 +33,12 @@ uint32_t SkOTUtils::CalcTableChecksum(SK_OT_ULONG *data, size_t length) {
     return sum;
 }
 
-SkData* SkOTUtils::RenameFont(SkStream* fontData, const char* fontName, int fontNameLen) {
+SkData* SkOTUtils::RenameFont(SkStreamAsset* fontData, const char* fontName, int fontNameLen) {
 
     // Get the sfnt header.
     SkSFNTHeader sfntHeader;
     if (fontData->read(&sfntHeader, sizeof(sfntHeader)) < sizeof(sfntHeader)) {
-        return NULL;
+        return nullptr;
     }
 
     // Find the existing 'name' table.
@@ -47,18 +47,18 @@ SkData* SkOTUtils::RenameFont(SkStream* fontData, const char* fontName, int font
     int numTables = SkEndian_SwapBE16(sfntHeader.numTables);
     for (tableIndex = 0; tableIndex < numTables; ++tableIndex) {
         if (fontData->read(&tableEntry, sizeof(tableEntry)) < sizeof(tableEntry)) {
-            return NULL;
+            return nullptr;
         }
         if (SkOTTableName::TAG == tableEntry.tag) {
             break;
         }
     }
     if (tableIndex == numTables) {
-        return NULL;
+        return nullptr;
     }
 
     if (!fontData->rewind()) {
-        return NULL;
+        return nullptr;
     }
 
     // The required 'name' record types: Family, Style, Unique, Full and PostScript.
@@ -83,23 +83,23 @@ SkData* SkOTUtils::RenameFont(SkStream* fontData, const char* fontName, int font
     size_t originalDataSize = fontData->getLength() - oldNameTablePhysicalSize;
     size_t newDataSize = originalDataSize + nameTablePhysicalSize;
 
-    SK_OT_BYTE* data = static_cast<SK_OT_BYTE*>(sk_malloc_throw(newDataSize));
-    SkAutoTUnref<SkData> rewrittenFontData(SkData::NewFromMalloc(data, newDataSize));
+    SkAutoTUnref<SkData> rewrittenFontData(SkData::NewUninitialized(newDataSize));
+    SK_OT_BYTE* data = static_cast<SK_OT_BYTE*>(rewrittenFontData->writable_data());
 
     if (fontData->read(data, oldNameTableOffset) < oldNameTableOffset) {
-        return NULL;
+        return nullptr;
     }
     if (fontData->skip(oldNameTablePhysicalSize) < oldNameTablePhysicalSize) {
-        return NULL;
+        return nullptr;
     }
     if (fontData->read(data + oldNameTableOffset, originalDataSize - oldNameTableOffset) < originalDataSize - oldNameTableOffset) {
-        return NULL;
+        return nullptr;
     }
 
     //Fix up the offsets of the directory entries after the old 'name' table entry.
     SkSFNTHeader::TableDirectoryEntry* currentEntry = reinterpret_cast<SkSFNTHeader::TableDirectoryEntry*>(data + sizeof(SkSFNTHeader));
     SkSFNTHeader::TableDirectoryEntry* endEntry = currentEntry + numTables;
-    SkSFNTHeader::TableDirectoryEntry* headTableEntry = NULL;
+    SkSFNTHeader::TableDirectoryEntry* headTableEntry = nullptr;
     for (; currentEntry < endEntry; ++currentEntry) {
         uint32_t oldOffset = SkEndian_SwapBE32(currentEntry->offset);
         if (oldOffset > oldNameTableOffset) {
@@ -129,7 +129,7 @@ SkData* SkOTUtils::RenameFont(SkStream* fontData, const char* fontName, int font
         nameRecords[i].languageID.windows.value = SkOTTableName::Record::LanguageID::Windows::English_UnitedStates;
         nameRecords[i].nameID.predefined.value = namesToCreate[i];
         nameRecords[i].offset = SkEndian_SwapBE16(0);
-        nameRecords[i].length = SkEndian_SwapBE16(fontNameLen * sizeof(wchar_t));
+        nameRecords[i].length = SkEndian_SwapBE16(SkToU16(fontNameLen * sizeof(wchar_t)));
     }
 
     SK_OT_USHORT* nameString = reinterpret_cast<SK_OT_USHORT*>(data + originalDataSize + stringOffset);
@@ -166,12 +166,12 @@ SkOTUtils::LocalizedStrings_NameTable::CreateForFamilyNames(const SkTypeface& ty
     static const SkFontTableTag nameTag = SkSetFourByteTag('n','a','m','e');
     size_t nameTableSize = typeface.getTableSize(nameTag);
     if (0 == nameTableSize) {
-        return NULL;
+        return nullptr;
     }
     SkAutoTDeleteArray<uint8_t> nameTableData(new uint8_t[nameTableSize]);
     size_t copied = typeface.getTableData(nameTag, 0, nameTableSize, nameTableData.get());
     if (copied != nameTableSize) {
-        return NULL;
+        return nullptr;
     }
 
     return new SkOTUtils::LocalizedStrings_NameTable((SkOTTableName*)nameTableData.detach(),
diff --git a/gfx/skia/skia/src/sfnt/SkOTUtils.h b/gfx/skia/skia/src/sfnt/SkOTUtils.h
index 4825fbeb2f74..1773e69ab6c3 100644
--- a/gfx/skia/skia/src/sfnt/SkOTUtils.h
+++ b/gfx/skia/skia/src/sfnt/SkOTUtils.h
@@ -23,7 +23,7 @@ struct SkOTUtils {
 
     /**
       *  Renames an sfnt font. On failure (invalid data or not an sfnt font)
-      *  returns NULL.
+      *  returns nullptr.
       *
       *  Essentially, this removes any existing 'name' table and replaces it
       *  with a new one in which FontFamilyName, FontSubfamilyName,
@@ -33,8 +33,10 @@ struct SkOTUtils {
       *  UnicodeBMPUCS2, and English_UnitedStates settings.
       *
       *  fontName and fontNameLen must be specified in terms of ASCII chars.
+      *
+      *  Does not affect fontData's ownership.
       */
-    static SkData* RenameFont(SkStream* fontData, const char* fontName, int fontNameLen);
+    static SkData* RenameFont(SkStreamAsset* fontData, const char* fontName, int fontNameLen);
 
     /** An implementation of LocalizedStrings which obtains it's data from a 'name' table. */
     class LocalizedStrings_NameTable : public SkTypeface::LocalizedStrings {
@@ -48,11 +50,11 @@ struct SkOTUtils {
         { }
 
         /** Creates an iterator over all the family names in the 'name' table of a typeface.
-         *  If no valid 'name' table can be found, returns NULL.
+         *  If no valid 'name' table can be found, returns nullptr.
          */
         static LocalizedStrings_NameTable* CreateForFamilyNames(const SkTypeface& typeface);
 
-        virtual bool next(SkTypeface::LocalizedString* localizedString) SK_OVERRIDE;
+        bool next(SkTypeface::LocalizedString* localizedString) override;
     private:
         static SkOTTableName::Record::NameID::Predefined::Value familyNameTypes[3];
 
@@ -70,7 +72,7 @@ struct SkOTUtils {
             : fName(name), fLanguage(language), fHasNext(true)
         { }
 
-        virtual bool next(SkTypeface::LocalizedString* localizedString) SK_OVERRIDE {
+        bool next(SkTypeface::LocalizedString* localizedString) override {
             localizedString->fString = fName;
             localizedString->fLanguage = fLanguage;
 
diff --git a/gfx/skia/skia/src/sfnt/SkPanose.h b/gfx/skia/skia/src/sfnt/SkPanose.h
index 873c093f5e07..9561e56fb078 100644
--- a/gfx/skia/skia/src/sfnt/SkPanose.h
+++ b/gfx/skia/skia/src/sfnt/SkPanose.h
@@ -634,6 +634,6 @@ struct SkPanose {
 #pragma pack(pop)
 
 
-SK_COMPILE_ASSERT(sizeof(SkPanose) == 10, sizeof_SkPanose_not_10);
+static_assert(sizeof(SkPanose) == 10, "sizeof_SkPanose_not_10");
 
 #endif
diff --git a/gfx/skia/skia/src/sfnt/SkSFNTHeader.h b/gfx/skia/skia/src/sfnt/SkSFNTHeader.h
index 9071696c99c7..c2ea1e0b2576 100644
--- a/gfx/skia/skia/src/sfnt/SkSFNTHeader.h
+++ b/gfx/skia/skia/src/sfnt/SkSFNTHeader.h
@@ -64,7 +64,7 @@ struct SkSFNTHeader {
 #pragma pack(pop)
 
 
-SK_COMPILE_ASSERT(sizeof(SkSFNTHeader) == 12, sizeof_SkSFNTHeader_not_12);
-SK_COMPILE_ASSERT(sizeof(SkSFNTHeader::TableDirectoryEntry) == 16, sizeof_SkSFNTHeader_TableDirectoryEntry_not_16);
+static_assert(sizeof(SkSFNTHeader) == 12, "sizeof_SkSFNTHeader_not_12");
+static_assert(sizeof(SkSFNTHeader::TableDirectoryEntry) == 16, "sizeof_SkSFNTHeader_TableDirectoryEntry_not_16");
 
 #endif
diff --git a/gfx/skia/skia/src/sfnt/SkTTCFHeader.h b/gfx/skia/skia/src/sfnt/SkTTCFHeader.h
index 8f53c0322988..2dc77eea57fe 100644
--- a/gfx/skia/skia/src/sfnt/SkTTCFHeader.h
+++ b/gfx/skia/skia/src/sfnt/SkTTCFHeader.h
@@ -51,6 +51,6 @@ struct SkTTCFHeader {
 #pragma pack(pop)
 
 
-SK_COMPILE_ASSERT(sizeof(SkTTCFHeader) == 12, sizeof_SkTTCFHeader_not_12);
+static_assert(sizeof(SkTTCFHeader) == 12, "sizeof_SkTTCFHeader_not_12");
 
 #endif
diff --git a/gfx/skia/skia/src/svg/SkSVGCanvas.cpp b/gfx/skia/skia/src/svg/SkSVGCanvas.cpp
new file mode 100644
index 000000000000..b6634b8a1db5
--- /dev/null
+++ b/gfx/skia/skia/src/svg/SkSVGCanvas.cpp
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkSVGCanvas.h"
+#include "SkSVGDevice.h"
+
+SkCanvas* SkSVGCanvas::Create(const SkRect& bounds, SkXMLWriter* writer) {
+    // TODO: pass full bounds to the device
+    SkISize size = bounds.roundOut().size();
+    SkAutoTUnref<SkBaseDevice> device(SkSVGDevice::Create(size, writer));
+
+    return new SkCanvas(device);
+}
diff --git a/gfx/skia/skia/src/svg/SkSVGDevice.cpp b/gfx/skia/skia/src/svg/SkSVGDevice.cpp
new file mode 100644
index 000000000000..4c679dfee709
--- /dev/null
+++ b/gfx/skia/skia/src/svg/SkSVGDevice.cpp
@@ -0,0 +1,818 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkSVGDevice.h"
+
+#include "SkBase64.h"
+#include "SkBitmap.h"
+#include "SkChecksum.h"
+#include "SkClipStack.h"
+#include "SkData.h"
+#include "SkDraw.h"
+#include "SkImageEncoder.h"
+#include "SkPaint.h"
+#include "SkParsePath.h"
+#include "SkShader.h"
+#include "SkStream.h"
+#include "SkTHash.h"
+#include "SkTypeface.h"
+#include "SkUtils.h"
+#include "SkXMLWriter.h"
+
+namespace {
+
+static SkString svg_color(SkColor color) {
+    return SkStringPrintf("rgb(%u,%u,%u)",
+                          SkColorGetR(color),
+                          SkColorGetG(color),
+                          SkColorGetB(color));
+}
+
+static SkScalar svg_opacity(SkColor color) {
+    return SkIntToScalar(SkColorGetA(color)) / SK_AlphaOPAQUE;
+}
+
+// Keep in sync with SkPaint::Cap
+static const char* cap_map[]  = {
+    nullptr,    // kButt_Cap (default)
+    "round", // kRound_Cap
+    "square" // kSquare_Cap
+};
+static_assert(SK_ARRAY_COUNT(cap_map) == SkPaint::kCapCount, "missing_cap_map_entry");
+
+static const char* svg_cap(SkPaint::Cap cap) {
+    SkASSERT(cap < SK_ARRAY_COUNT(cap_map));
+    return cap_map[cap];
+}
+
+// Keep in sync with SkPaint::Join
+static const char* join_map[] = {
+    nullptr,    // kMiter_Join (default)
+    "round", // kRound_Join
+    "bevel"  // kBevel_Join
+};
+static_assert(SK_ARRAY_COUNT(join_map) == SkPaint::kJoinCount, "missing_join_map_entry");
+
+static const char* svg_join(SkPaint::Join join) {
+    SkASSERT(join < SK_ARRAY_COUNT(join_map));
+    return join_map[join];
+}
+
+// Keep in sync with SkPaint::Align
+static const char* text_align_map[] = {
+    nullptr,     // kLeft_Align (default)
+    "middle", // kCenter_Align
+    "end"     // kRight_Align
+};
+static_assert(SK_ARRAY_COUNT(text_align_map) == SkPaint::kAlignCount,
+              "missing_text_align_map_entry");
+static const char* svg_text_align(SkPaint::Align align) {
+    SkASSERT(align < SK_ARRAY_COUNT(text_align_map));
+    return text_align_map[align];
+}
+
+static SkString svg_transform(const SkMatrix& t) {
+    SkASSERT(!t.isIdentity());
+
+    SkString tstr;
+    switch (t.getType()) {
+    case SkMatrix::kPerspective_Mask:
+        SkDebugf("Can't handle perspective matrices.");
+        break;
+    case SkMatrix::kTranslate_Mask:
+        tstr.printf("translate(%g %g)", t.getTranslateX(), t.getTranslateY());
+        break;
+    case SkMatrix::kScale_Mask:
+        tstr.printf("scale(%g %g)", t.getScaleX(), t.getScaleY());
+        break;
+    default:
+        // http://www.w3.org/TR/SVG/coords.html#TransformMatrixDefined
+        //    | a c e |
+        //    | b d f |
+        //    | 0 0 1 |
+        tstr.printf("matrix(%g %g %g %g %g %g)",
+                    t.getScaleX(),     t.getSkewY(),
+                    t.getSkewX(),      t.getScaleY(),
+                    t.getTranslateX(), t.getTranslateY());
+        break;
+    }
+
+    return tstr;
+}
+
+struct Resources {
+    Resources(const SkPaint& paint)
+        : fPaintServer(svg_color(paint.getColor())) {}
+
+    SkString fPaintServer;
+    SkString fClip;
+};
+
+class SVGTextBuilder : SkNoncopyable {
+public:
+    SVGTextBuilder(const void* text, size_t byteLen, const SkPaint& paint, const SkPoint& offset,
+                   unsigned scalarsPerPos, const SkScalar pos[] = nullptr)
+        : fOffset(offset)
+        , fScalarsPerPos(scalarsPerPos)
+        , fPos(pos)
+        , fLastCharWasWhitespace(true) // start off in whitespace mode to strip all leading space
+    {
+        SkASSERT(scalarsPerPos <= 2);
+        SkASSERT(scalarsPerPos == 0 || SkToBool(pos));
+
+        int count = paint.countText(text, byteLen);
+
+        switch(paint.getTextEncoding()) {
+        case SkPaint::kGlyphID_TextEncoding: {
+            SkASSERT(count * sizeof(uint16_t) == byteLen);
+            SkAutoSTArray<64, SkUnichar> unichars(count);
+            paint.glyphsToUnichars((const uint16_t*)text, count, unichars.get());
+            for (int i = 0; i < count; ++i) {
+                this->appendUnichar(unichars[i]);
+            }
+        } break;
+        case SkPaint::kUTF8_TextEncoding: {
+            const char* c8 = reinterpret_cast<const char*>(text);
+            for (int i = 0; i < count; ++i) {
+                this->appendUnichar(SkUTF8_NextUnichar(&c8));
+            }
+            SkASSERT(reinterpret_cast<const char*>(text) + byteLen == c8);
+        } break;
+        case SkPaint::kUTF16_TextEncoding: {
+            const uint16_t* c16 = reinterpret_cast<const uint16_t*>(text);
+            for (int i = 0; i < count; ++i) {
+                this->appendUnichar(SkUTF16_NextUnichar(&c16));
+            }
+            SkASSERT(SkIsAlign2(byteLen));
+            SkASSERT(reinterpret_cast<const uint16_t*>(text) + (byteLen / 2) == c16);
+        } break;
+        case SkPaint::kUTF32_TextEncoding: {
+            SkASSERT(count * sizeof(uint32_t) == byteLen);
+            const uint32_t* c32 = reinterpret_cast<const uint32_t*>(text);
+            for (int i = 0; i < count; ++i) {
+                this->appendUnichar(c32[i]);
+            }
+        } break;
+        default:
+            SkFAIL("unknown text encoding");
+        }
+
+        if (scalarsPerPos < 2) {
+            SkASSERT(fPosY.isEmpty());
+            fPosY.appendScalar(offset.y()); // DrawText or DrawPosTextH (fixed Y).
+        }
+
+        if (scalarsPerPos < 1) {
+            SkASSERT(fPosX.isEmpty());
+            fPosX.appendScalar(offset.x()); // DrawText (X also fixed).
+        }
+    }
+
+    const SkString& text() const { return fText; }
+    const SkString& posX() const { return fPosX; }
+    const SkString& posY() const { return fPosY; }
+
+private:
+    void appendUnichar(SkUnichar c) {
+        bool discardPos = false;
+        bool isWhitespace = false;
+
+        switch(c) {
+        case ' ':
+        case '\t':
+            // consolidate whitespace to match SVG's xml:space=default munging
+            // (http://www.w3.org/TR/SVG/text.html#WhiteSpace)
+            if (fLastCharWasWhitespace) {
+                discardPos = true;
+            } else {
+                fText.appendUnichar(c);
+            }
+            isWhitespace = true;
+            break;
+        case '\0':
+            // SkPaint::glyphsToUnichars() returns \0 for inconvertible glyphs, but these
+            // are not legal XML characters (http://www.w3.org/TR/REC-xml/#charsets)
+            discardPos = true;
+            isWhitespace = fLastCharWasWhitespace; // preserve whitespace consolidation
+            break;
+        case '&':
+            fText.append("&amp;");
+            break;
+        case '"':
+            fText.append("&quot;");
+            break;
+        case '\'':
+            fText.append("&apos;");
+            break;
+        case '<':
+            fText.append("&lt;");
+            break;
+        case '>':
+            fText.append("&gt;");
+            break;
+        default:
+            fText.appendUnichar(c);
+            break;
+        }
+
+        this->advancePos(discardPos);
+        fLastCharWasWhitespace = isWhitespace;
+    }
+
+    void advancePos(bool discard) {
+        if (!discard && fScalarsPerPos > 0) {
+            fPosX.appendf("%.8g, ", fOffset.x() + fPos[0]);
+            if (fScalarsPerPos > 1) {
+                SkASSERT(fScalarsPerPos == 2);
+                fPosY.appendf("%.8g, ", fOffset.y() + fPos[1]);
+            }
+        }
+        fPos += fScalarsPerPos;
+    }
+
+    const SkPoint&  fOffset;
+    const unsigned  fScalarsPerPos;
+    const SkScalar* fPos;
+
+    SkString fText, fPosX, fPosY;
+    bool     fLastCharWasWhitespace;
+};
+
+}
+
+// For now all this does is serve unique serial IDs, but it will eventually evolve to track
+// and deduplicate resources.
+class SkSVGDevice::ResourceBucket : ::SkNoncopyable {
+public:
+    ResourceBucket() : fGradientCount(0), fClipCount(0), fPathCount(0), fImageCount(0) {}
+
+    SkString addLinearGradient() {
+        return SkStringPrintf("gradient_%d", fGradientCount++);
+    }
+
+    SkString addClip() {
+        return SkStringPrintf("clip_%d", fClipCount++);
+    }
+
+    SkString addPath() {
+        return SkStringPrintf("path_%d", fPathCount++);
+    }
+
+    SkString addImage() {
+        return SkStringPrintf("img_%d", fImageCount++);
+    }
+
+private:
+    uint32_t fGradientCount;
+    uint32_t fClipCount;
+    uint32_t fPathCount;
+    uint32_t fImageCount;
+};
+
+class SkSVGDevice::AutoElement : ::SkNoncopyable {
+public:
+    AutoElement(const char name[], SkXMLWriter* writer)
+        : fWriter(writer)
+        , fResourceBucket(nullptr) {
+        fWriter->startElement(name);
+    }
+
+    AutoElement(const char name[], SkXMLWriter* writer, ResourceBucket* bucket,
+                const SkDraw& draw, const SkPaint& paint)
+        : fWriter(writer)
+        , fResourceBucket(bucket) {
+
+        Resources res = this->addResources(draw, paint);
+        if (!res.fClip.isEmpty()) {
+            // The clip is in device space. Apply it via a <g> wrapper to avoid local transform
+            // interference.
+            fClipGroup.reset(new AutoElement("g", fWriter));
+            fClipGroup->addAttribute("clip-path",res.fClip);
+        }
+
+        fWriter->startElement(name);
+
+        this->addPaint(paint, res);
+
+        if (!draw.fMatrix->isIdentity()) {
+            this->addAttribute("transform", svg_transform(*draw.fMatrix));
+        }
+    }
+
+    ~AutoElement() {
+        fWriter->endElement();
+    }
+
+    void addAttribute(const char name[], const char val[]) {
+        fWriter->addAttribute(name, val);
+    }
+
+    void addAttribute(const char name[], const SkString& val) {
+        fWriter->addAttribute(name, val.c_str());
+    }
+
+    void addAttribute(const char name[], int32_t val) {
+        fWriter->addS32Attribute(name, val);
+    }
+
+    void addAttribute(const char name[], SkScalar val) {
+        fWriter->addScalarAttribute(name, val);
+    }
+
+    void addText(const SkString& text) {
+        fWriter->addText(text.c_str(), text.size());
+    }
+
+    void addRectAttributes(const SkRect&);
+    void addPathAttributes(const SkPath&);
+    void addTextAttributes(const SkPaint&);
+
+private:
+    Resources addResources(const SkDraw& draw, const SkPaint& paint);
+    void addClipResources(const SkDraw& draw, Resources* resources);
+    void addShaderResources(const SkPaint& paint, Resources* resources);
+
+    void addPaint(const SkPaint& paint, const Resources& resources);
+
+    SkString addLinearGradientDef(const SkShader::GradientInfo& info, const SkShader* shader);
+
+    SkXMLWriter*               fWriter;
+    ResourceBucket*            fResourceBucket;
+    SkAutoTDelete<AutoElement> fClipGroup;
+};
+
+void SkSVGDevice::AutoElement::addPaint(const SkPaint& paint, const Resources& resources) {
+    SkPaint::Style style = paint.getStyle();
+    if (style == SkPaint::kFill_Style || style == SkPaint::kStrokeAndFill_Style) {
+        this->addAttribute("fill", resources.fPaintServer);
+
+        if (SK_AlphaOPAQUE != SkColorGetA(paint.getColor())) {
+            this->addAttribute("fill-opacity", svg_opacity(paint.getColor()));
+        }
+    } else {
+        SkASSERT(style == SkPaint::kStroke_Style);
+        this->addAttribute("fill", "none");
+    }
+
+    if (style == SkPaint::kStroke_Style || style == SkPaint::kStrokeAndFill_Style) {
+        this->addAttribute("stroke", resources.fPaintServer);
+
+        SkScalar strokeWidth = paint.getStrokeWidth();
+        if (strokeWidth == 0) {
+            // Hairline stroke
+            strokeWidth = 1;
+            this->addAttribute("vector-effect", "non-scaling-stroke");
+        }
+        this->addAttribute("stroke-width", strokeWidth);
+
+        if (const char* cap = svg_cap(paint.getStrokeCap())) {
+            this->addAttribute("stroke-linecap", cap);
+        }
+
+        if (const char* join = svg_join(paint.getStrokeJoin())) {
+            this->addAttribute("stroke-linejoin", join);
+        }
+
+        if (paint.getStrokeJoin() == SkPaint::kMiter_Join) {
+            this->addAttribute("stroke-miterlimit", paint.getStrokeMiter());
+        }
+
+        if (SK_AlphaOPAQUE != SkColorGetA(paint.getColor())) {
+            this->addAttribute("stroke-opacity", svg_opacity(paint.getColor()));
+        }
+    } else {
+        SkASSERT(style == SkPaint::kFill_Style);
+        this->addAttribute("stroke", "none");
+    }
+}
+
+Resources SkSVGDevice::AutoElement::addResources(const SkDraw& draw, const SkPaint& paint) {
+    Resources resources(paint);
+
+    // FIXME: this is a weak heuristic and we end up with LOTS of redundant clips.
+    bool hasClip   = !draw.fClipStack->isWideOpen();
+    bool hasShader = SkToBool(paint.getShader());
+
+    if (hasClip || hasShader) {
+        AutoElement defs("defs", fWriter);
+
+        if (hasClip) {
+            this->addClipResources(draw, &resources);
+        }
+
+        if (hasShader) {
+            this->addShaderResources(paint, &resources);
+        }
+    }
+
+    return resources;
+}
+
+void SkSVGDevice::AutoElement::addShaderResources(const SkPaint& paint, Resources* resources) {
+    const SkShader* shader = paint.getShader();
+    SkASSERT(SkToBool(shader));
+
+    SkShader::GradientInfo grInfo;
+    grInfo.fColorCount = 0;
+    if (SkShader::kLinear_GradientType != shader->asAGradient(&grInfo)) {
+        // TODO: non-linear gradient support
+        SkDebugf("unsupported shader type\n");
+        return;
+    }
+
+    SkAutoSTArray<16, SkColor>  grColors(grInfo.fColorCount);
+    SkAutoSTArray<16, SkScalar> grOffsets(grInfo.fColorCount);
+    grInfo.fColors = grColors.get();
+    grInfo.fColorOffsets = grOffsets.get();
+
+    // One more call to get the actual colors/offsets.
+    shader->asAGradient(&grInfo);
+    SkASSERT(grInfo.fColorCount <= grColors.count());
+    SkASSERT(grInfo.fColorCount <= grOffsets.count());
+
+    resources->fPaintServer.printf("url(#%s)", addLinearGradientDef(grInfo, shader).c_str());
+}
+
+void SkSVGDevice::AutoElement::addClipResources(const SkDraw& draw, Resources* resources) {
+    SkASSERT(!draw.fClipStack->isWideOpen());
+
+    SkPath clipPath;
+    (void) draw.fClipStack->asPath(&clipPath);
+
+    SkString clipID = fResourceBucket->addClip();
+    const char* clipRule = clipPath.getFillType() == SkPath::kEvenOdd_FillType ?
+                           "evenodd" : "nonzero";
+    {
+        // clipPath is in device space, but since we're only pushing transform attributes
+        // to the leaf nodes, so are all our elements => SVG userSpaceOnUse == device space.
+        AutoElement clipPathElement("clipPath", fWriter);
+        clipPathElement.addAttribute("id", clipID);
+
+        SkRect clipRect = SkRect::MakeEmpty();
+        if (clipPath.isEmpty() || clipPath.isRect(&clipRect)) {
+            AutoElement rectElement("rect", fWriter);
+            rectElement.addRectAttributes(clipRect);
+            rectElement.addAttribute("clip-rule", clipRule);
+        } else {
+            AutoElement pathElement("path", fWriter);
+            pathElement.addPathAttributes(clipPath);
+            pathElement.addAttribute("clip-rule", clipRule);
+        }
+    }
+
+    resources->fClip.printf("url(#%s)", clipID.c_str());
+}
+
+SkString SkSVGDevice::AutoElement::addLinearGradientDef(const SkShader::GradientInfo& info,
+                                                        const SkShader* shader) {
+    SkASSERT(fResourceBucket);
+    SkString id = fResourceBucket->addLinearGradient();
+
+    {
+        AutoElement gradient("linearGradient", fWriter);
+
+        gradient.addAttribute("id", id);
+        gradient.addAttribute("gradientUnits", "userSpaceOnUse");
+        gradient.addAttribute("x1", info.fPoint[0].x());
+        gradient.addAttribute("y1", info.fPoint[0].y());
+        gradient.addAttribute("x2", info.fPoint[1].x());
+        gradient.addAttribute("y2", info.fPoint[1].y());
+
+        if (!shader->getLocalMatrix().isIdentity()) {
+            this->addAttribute("gradientTransform", svg_transform(shader->getLocalMatrix()));
+        }
+
+        SkASSERT(info.fColorCount >= 2);
+        for (int i = 0; i < info.fColorCount; ++i) {
+            SkColor color = info.fColors[i];
+            SkString colorStr(svg_color(color));
+
+            {
+                AutoElement stop("stop", fWriter);
+                stop.addAttribute("offset", info.fColorOffsets[i]);
+                stop.addAttribute("stop-color", colorStr.c_str());
+
+                if (SK_AlphaOPAQUE != SkColorGetA(color)) {
+                    stop.addAttribute("stop-opacity", svg_opacity(color));
+                }
+            }
+        }
+    }
+
+    return id;
+}
+
+void SkSVGDevice::AutoElement::addRectAttributes(const SkRect& rect) {
+    // x, y default to 0
+    if (rect.x() != 0) {
+        this->addAttribute("x", rect.x());
+    }
+    if (rect.y() != 0) {
+        this->addAttribute("y", rect.y());
+    }
+
+    this->addAttribute("width", rect.width());
+    this->addAttribute("height", rect.height());
+}
+
+void SkSVGDevice::AutoElement::addPathAttributes(const SkPath& path) {
+    SkString pathData;
+    SkParsePath::ToSVGString(path, &pathData);
+    this->addAttribute("d", pathData);
+}
+
+void SkSVGDevice::AutoElement::addTextAttributes(const SkPaint& paint) {
+    this->addAttribute("font-size", paint.getTextSize());
+
+    if (const char* textAlign = svg_text_align(paint.getTextAlign())) {
+        this->addAttribute("text-anchor", textAlign);
+    }
+
+    SkString familyName;
+    SkTHashSet<SkString> familySet;
+    SkAutoTUnref<const SkTypeface> tface(paint.getTypeface() ?
+        SkRef(paint.getTypeface()) : SkTypeface::RefDefault());
+
+    SkASSERT(tface);
+    SkTypeface::Style style = tface->style();
+    if (style & SkTypeface::kItalic) {
+        this->addAttribute("font-style", "italic");
+    }
+    if (style & SkTypeface::kBold) {
+        this->addAttribute("font-weight", "bold");
+    }
+
+    SkAutoTUnref<SkTypeface::LocalizedStrings> familyNameIter(tface->createFamilyNameIterator());
+    SkTypeface::LocalizedString familyString;
+    while (familyNameIter->next(&familyString)) {
+        if (familySet.contains(familyString.fString)) {
+            continue;
+        }
+        familySet.add(familyString.fString);
+        familyName.appendf((familyName.isEmpty() ? "%s" : ", %s"), familyString.fString.c_str());
+    }
+
+    if (!familyName.isEmpty()) {
+        this->addAttribute("font-family", familyName);
+    }
+}
+
+SkBaseDevice* SkSVGDevice::Create(const SkISize& size, SkXMLWriter* writer) {
+    if (!writer) {
+        return nullptr;
+    }
+
+    return new SkSVGDevice(size, writer);
+}
+
+SkSVGDevice::SkSVGDevice(const SkISize& size, SkXMLWriter* writer)
+    : INHERITED(SkSurfaceProps(0, kUnknown_SkPixelGeometry))
+    , fWriter(writer)
+    , fResourceBucket(new ResourceBucket) {
+    SkASSERT(writer);
+
+    fLegacyBitmap.setInfo(SkImageInfo::MakeUnknown(size.width(), size.height()));
+
+    fWriter->writeHeader();
+
+    // The root <svg> tag gets closed by the destructor.
+    fRootElement.reset(new AutoElement("svg", fWriter));
+
+    fRootElement->addAttribute("xmlns", "http://www.w3.org/2000/svg");
+    fRootElement->addAttribute("xmlns:xlink", "http://www.w3.org/1999/xlink");
+    fRootElement->addAttribute("width", size.width());
+    fRootElement->addAttribute("height", size.height());
+}
+
+SkSVGDevice::~SkSVGDevice() {
+}
+
+SkImageInfo SkSVGDevice::imageInfo() const {
+    return fLegacyBitmap.info();
+}
+
+const SkBitmap& SkSVGDevice::onAccessBitmap() {
+    return fLegacyBitmap;
+}
+
+void SkSVGDevice::drawPaint(const SkDraw& draw, const SkPaint& paint) {
+    AutoElement rect("rect", fWriter, fResourceBucket, draw, paint);
+    rect.addRectAttributes(SkRect::MakeWH(SkIntToScalar(this->width()),
+                                          SkIntToScalar(this->height())));
+}
+
+void SkSVGDevice::drawPoints(const SkDraw& draw, SkCanvas::PointMode mode, size_t count,
+                             const SkPoint pts[], const SkPaint& paint) {
+    SkPath path;
+
+    switch (mode) {
+            // todo
+        case SkCanvas::kPoints_PointMode:
+            SkDebugf("unsupported operation: drawPoints(kPoints_PointMode)\n");
+            break;
+        case SkCanvas::kLines_PointMode:
+            count -= 1;
+            for (size_t i = 0; i < count; i += 2) {
+                path.rewind();
+                path.moveTo(pts[i]);
+                path.lineTo(pts[i+1]);
+                AutoElement elem("path", fWriter, fResourceBucket, draw, paint);
+                elem.addPathAttributes(path);
+            }
+            break;
+        case SkCanvas::kPolygon_PointMode:
+            if (count > 1) {
+                path.addPoly(pts, SkToInt(count), false);
+                path.moveTo(pts[0]);
+                AutoElement elem("path", fWriter, fResourceBucket, draw, paint);
+                elem.addPathAttributes(path);
+            }
+            break;
+    }
+}
+
+void SkSVGDevice::drawRect(const SkDraw& draw, const SkRect& r, const SkPaint& paint) {
+    AutoElement rect("rect", fWriter, fResourceBucket, draw, paint);
+    rect.addRectAttributes(r);
+}
+
+void SkSVGDevice::drawOval(const SkDraw& draw, const SkRect& oval, const SkPaint& paint) {
+    AutoElement ellipse("ellipse", fWriter, fResourceBucket, draw, paint);
+    ellipse.addAttribute("cx", oval.centerX());
+    ellipse.addAttribute("cy", oval.centerY());
+    ellipse.addAttribute("rx", oval.width() / 2);
+    ellipse.addAttribute("ry", oval.height() / 2);
+}
+
+void SkSVGDevice::drawRRect(const SkDraw& draw, const SkRRect& rr, const SkPaint& paint) {
+    SkPath path;
+    path.addRRect(rr);
+
+    AutoElement elem("path", fWriter, fResourceBucket, draw, paint);
+    elem.addPathAttributes(path);
+}
+
+void SkSVGDevice::drawPath(const SkDraw& draw, const SkPath& path, const SkPaint& paint,
+                           const SkMatrix* prePathMatrix, bool pathIsMutable) {
+    AutoElement elem("path", fWriter, fResourceBucket, draw, paint);
+    elem.addPathAttributes(path);
+}
+
+void SkSVGDevice::drawBitmapCommon(const SkDraw& draw, const SkBitmap& bm,
+                                   const SkPaint& paint) {
+    SkAutoTUnref<const SkData> pngData(
+        SkImageEncoder::EncodeData(bm, SkImageEncoder::kPNG_Type, SkImageEncoder::kDefaultQuality));
+    if (!pngData) {
+        return;
+    }
+
+    size_t b64Size = SkBase64::Encode(pngData->data(), pngData->size(), nullptr);
+    SkAutoTMalloc<char> b64Data(b64Size);
+    SkBase64::Encode(pngData->data(), pngData->size(), b64Data.get());
+
+    SkString svgImageData("data:image/png;base64,");
+    svgImageData.append(b64Data.get(), b64Size);
+
+    SkString imageID = fResourceBucket->addImage();
+    {
+        AutoElement defs("defs", fWriter);
+        {
+            AutoElement image("image", fWriter);
+            image.addAttribute("id", imageID);
+            image.addAttribute("width", bm.width());
+            image.addAttribute("height", bm.height());
+            image.addAttribute("xlink:href", svgImageData);
+        }
+    }
+
+    {
+        AutoElement imageUse("use", fWriter, fResourceBucket, draw, paint);
+        imageUse.addAttribute("xlink:href", SkStringPrintf("#%s", imageID.c_str()));
+    }
+}
+
+void SkSVGDevice::drawBitmap(const SkDraw& draw, const SkBitmap& bitmap,
+                             const SkMatrix& matrix, const SkPaint& paint) {
+    SkMatrix adjustedMatrix = *draw.fMatrix;
+    adjustedMatrix.preConcat(matrix);
+    SkDraw adjustedDraw(draw);
+    adjustedDraw.fMatrix = &adjustedMatrix;
+
+    drawBitmapCommon(adjustedDraw, bitmap, paint);
+}
+
+void SkSVGDevice::drawSprite(const SkDraw& draw, const SkBitmap& bitmap,
+                             int x, int y, const SkPaint& paint) {
+    SkMatrix adjustedMatrix = *draw.fMatrix;
+    adjustedMatrix.preTranslate(SkIntToScalar(x), SkIntToScalar(y));
+    SkDraw adjustedDraw(draw);
+    adjustedDraw.fMatrix = &adjustedMatrix;
+
+    drawBitmapCommon(adjustedDraw, bitmap, paint);
+}
+
+void SkSVGDevice::drawBitmapRect(const SkDraw& draw, const SkBitmap& bm, const SkRect* srcOrNull,
+                                 const SkRect& dst, const SkPaint& paint,
+                                 SkCanvas::SrcRectConstraint) {
+    SkMatrix adjustedMatrix;
+    adjustedMatrix.setRectToRect(srcOrNull ? *srcOrNull : SkRect::Make(bm.bounds()),
+                                 dst,
+                                 SkMatrix::kFill_ScaleToFit);
+    adjustedMatrix.postConcat(*draw.fMatrix);
+
+    SkDraw adjustedDraw(draw);
+    adjustedDraw.fMatrix = &adjustedMatrix;
+
+    SkClipStack adjustedClipStack;
+    if (srcOrNull && *srcOrNull != SkRect::Make(bm.bounds())) {
+        SkRect devClipRect;
+        draw.fMatrix->mapRect(&devClipRect, dst);
+
+        adjustedClipStack = *draw.fClipStack;
+        adjustedClipStack.clipDevRect(devClipRect, SkRegion::kIntersect_Op, paint.isAntiAlias());
+        adjustedDraw.fClipStack = &adjustedClipStack;
+    }
+
+    drawBitmapCommon(adjustedDraw, bm, paint);
+}
+
+void SkSVGDevice::drawText(const SkDraw& draw, const void* text, size_t len,
+                           SkScalar x, SkScalar y, const SkPaint& paint) {
+    AutoElement elem("text", fWriter, fResourceBucket, draw, paint);
+    elem.addTextAttributes(paint);
+
+    SVGTextBuilder builder(text, len, paint, SkPoint::Make(x, y), 0);
+    elem.addAttribute("x", builder.posX());
+    elem.addAttribute("y", builder.posY());
+    elem.addText(builder.text());
+}
+
+void SkSVGDevice::drawPosText(const SkDraw& draw, const void* text, size_t len,
+                              const SkScalar pos[], int scalarsPerPos, const SkPoint& offset,
+                              const SkPaint& paint) {
+    SkASSERT(scalarsPerPos == 1 || scalarsPerPos == 2);
+
+    AutoElement elem("text", fWriter, fResourceBucket, draw, paint);
+    elem.addTextAttributes(paint);
+
+    SVGTextBuilder builder(text, len, paint, offset, scalarsPerPos, pos);
+    elem.addAttribute("x", builder.posX());
+    elem.addAttribute("y", builder.posY());
+    elem.addText(builder.text());
+}
+
+void SkSVGDevice::drawTextOnPath(const SkDraw&, const void* text, size_t len, const SkPath& path,
+                                 const SkMatrix* matrix, const SkPaint& paint) {
+    SkString pathID = fResourceBucket->addPath();
+
+    {
+        AutoElement defs("defs", fWriter);
+        AutoElement pathElement("path", fWriter);
+        pathElement.addAttribute("id", pathID);
+        pathElement.addPathAttributes(path);
+
+    }
+
+    {
+        AutoElement textElement("text", fWriter);
+        textElement.addTextAttributes(paint);
+
+        if (matrix && !matrix->isIdentity()) {
+            textElement.addAttribute("transform", svg_transform(*matrix));
+        }
+
+        {
+            AutoElement textPathElement("textPath", fWriter);
+            textPathElement.addAttribute("xlink:href", SkStringPrintf("#%s", pathID.c_str()));
+
+            if (paint.getTextAlign() != SkPaint::kLeft_Align) {
+                SkASSERT(paint.getTextAlign() == SkPaint::kCenter_Align ||
+                         paint.getTextAlign() == SkPaint::kRight_Align);
+                textPathElement.addAttribute("startOffset",
+                    paint.getTextAlign() == SkPaint::kCenter_Align ? "50%" : "100%");
+            }
+
+            SVGTextBuilder builder(text, len, paint, SkPoint::Make(0, 0), 0);
+            textPathElement.addText(builder.text());
+        }
+    }
+}
+
+void SkSVGDevice::drawVertices(const SkDraw&, SkCanvas::VertexMode, int vertexCount,
+                               const SkPoint verts[], const SkPoint texs[],
+                               const SkColor colors[], SkXfermode* xmode,
+                               const uint16_t indices[], int indexCount,
+                               const SkPaint& paint) {
+    // todo
+    SkDebugf("unsupported operation: drawVertices()\n");
+}
+
+void SkSVGDevice::drawDevice(const SkDraw&, SkBaseDevice*, int x, int y,
+                             const SkPaint&) {
+    // todo
+    SkDebugf("unsupported operation: drawDevice()\n");
+}
diff --git a/gfx/skia/skia/src/svg/SkSVGDevice.h b/gfx/skia/skia/src/svg/SkSVGDevice.h
new file mode 100644
index 000000000000..8426ad5e109f
--- /dev/null
+++ b/gfx/skia/skia/src/svg/SkSVGDevice.h
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkSVGDevice_DEFINED
+#define SkSVGDevice_DEFINED
+
+#include "SkDevice.h"
+
+class SkXMLWriter;
+
+class SkSVGDevice : public SkBaseDevice {
+public:
+    static SkBaseDevice* Create(const SkISize& size, SkXMLWriter* writer);
+
+    SkImageInfo imageInfo() const override;
+
+protected:
+    void drawPaint(const SkDraw&, const SkPaint& paint) override;
+    void drawPoints(const SkDraw&, SkCanvas::PointMode mode, size_t count,
+                    const SkPoint[], const SkPaint& paint) override;
+    void drawRect(const SkDraw&, const SkRect& r, const SkPaint& paint) override;
+    void drawOval(const SkDraw&, const SkRect& oval, const SkPaint& paint) override;
+    void drawRRect(const SkDraw&, const SkRRect& rr, const SkPaint& paint) override;
+    void drawPath(const SkDraw&, const SkPath& path,
+                  const SkPaint& paint,
+                  const SkMatrix* prePathMatrix = nullptr,
+                  bool pathIsMutable = false) override;
+
+    void drawBitmap(const SkDraw&, const SkBitmap& bitmap,
+                    const SkMatrix& matrix, const SkPaint& paint) override;
+    void drawSprite(const SkDraw&, const SkBitmap& bitmap,
+                    int x, int y, const SkPaint& paint) override;
+    void drawBitmapRect(const SkDraw&, const SkBitmap&,
+                        const SkRect* srcOrNull, const SkRect& dst,
+                        const SkPaint& paint, SkCanvas::SrcRectConstraint) override;
+
+    void drawText(const SkDraw&, const void* text, size_t len,
+                  SkScalar x, SkScalar y, const SkPaint& paint) override;
+    void drawPosText(const SkDraw&, const void* text, size_t len,
+                     const SkScalar pos[], int scalarsPerPos,
+                     const SkPoint& offset, const SkPaint& paint) override;
+    void drawTextOnPath(const SkDraw&, const void* text, size_t len,
+                        const SkPath& path, const SkMatrix* matrix,
+                        const SkPaint& paint) override;
+    void drawVertices(const SkDraw&, SkCanvas::VertexMode, int vertexCount,
+                      const SkPoint verts[], const SkPoint texs[],
+                      const SkColor colors[], SkXfermode* xmode,
+                      const uint16_t indices[], int indexCount,
+                      const SkPaint& paint) override;
+
+    void drawDevice(const SkDraw&, SkBaseDevice*, int x, int y,
+                    const SkPaint&) override;
+    const SkBitmap& onAccessBitmap() override;
+
+private:
+    SkSVGDevice(const SkISize& size, SkXMLWriter* writer);
+    virtual ~SkSVGDevice();
+
+    void drawBitmapCommon(const SkDraw& draw, const SkBitmap& bm, const SkPaint& paint);
+
+    class AutoElement;
+    class ResourceBucket;
+
+    SkXMLWriter*                  fWriter;
+    SkAutoTDelete<AutoElement>    fRootElement;
+    SkAutoTDelete<ResourceBucket> fResourceBucket;
+    SkBitmap                      fLegacyBitmap;
+
+    typedef SkBaseDevice INHERITED;
+};
+
+#endif // SkSVGDevice_DEFINED
diff --git a/gfx/skia/skia/src/svg/SkSVG.cpp b/gfx/skia/skia/src/svg/parser/SkSVG.cpp
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVG.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVG.cpp
diff --git a/gfx/skia/skia/src/svg/SkSVGCircle.cpp b/gfx/skia/skia/src/svg/parser/SkSVGCircle.cpp
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGCircle.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGCircle.cpp
diff --git a/gfx/skia/skia/src/svg/SkSVGCircle.h b/gfx/skia/skia/src/svg/parser/SkSVGCircle.h
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGCircle.h
rename to gfx/skia/skia/src/svg/parser/SkSVGCircle.h
diff --git a/gfx/skia/skia/src/svg/SkSVGClipPath.cpp b/gfx/skia/skia/src/svg/parser/SkSVGClipPath.cpp
similarity index 96%
rename from gfx/skia/skia/src/svg/SkSVGClipPath.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGClipPath.cpp
index fa3a79918de9..86dc2df7f152 100644
--- a/gfx/skia/skia/src/svg/SkSVGClipPath.cpp
+++ b/gfx/skia/skia/src/svg/parser/SkSVGClipPath.cpp
@@ -28,7 +28,7 @@ void SkSVGClipPath::translate(SkSVGParser& parser, bool defState) {
     SkSVGElement* child = *fChildren.begin();
     SkASSERT(child->getType() == SkSVGType_Use);
     SkSVGUse* use = (SkSVGUse*) child;
-    SkSVGElement* ref = NULL;
+    SkSVGElement* ref = nullptr;
     const char* refStr = &use->f_xlink_href.c_str()[1];
     SkASSERT(parser.getIDs().find(refStr, &ref));
     SkASSERT(ref);
diff --git a/gfx/skia/skia/src/svg/SkSVGClipPath.h b/gfx/skia/skia/src/svg/parser/SkSVGClipPath.h
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGClipPath.h
rename to gfx/skia/skia/src/svg/parser/SkSVGClipPath.h
diff --git a/gfx/skia/skia/src/svg/SkSVGDefs.cpp b/gfx/skia/skia/src/svg/parser/SkSVGDefs.cpp
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGDefs.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGDefs.cpp
diff --git a/gfx/skia/skia/src/svg/SkSVGDefs.h b/gfx/skia/skia/src/svg/parser/SkSVGDefs.h
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGDefs.h
rename to gfx/skia/skia/src/svg/parser/SkSVGDefs.h
diff --git a/gfx/skia/skia/src/svg/SkSVGElements.cpp b/gfx/skia/skia/src/svg/parser/SkSVGElements.cpp
similarity index 94%
rename from gfx/skia/skia/src/svg/SkSVGElements.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGElements.cpp
index a1bd1005717d..dc8ec940c516 100644
--- a/gfx/skia/skia/src/svg/SkSVGElements.cpp
+++ b/gfx/skia/skia/src/svg/parser/SkSVGElements.cpp
@@ -21,14 +21,14 @@ void SkSVGBase::addAttribute(SkSVGParser& parser, int attrIndex,
 }
 
 
-SkSVGElement::SkSVGElement() : fParent(NULL), fIsDef(false), fIsNotDef(true) {
+SkSVGElement::SkSVGElement() : fParent(nullptr), fIsDef(false), fIsNotDef(true) {
 }
 
 SkSVGElement::~SkSVGElement() {
 }
 
 SkSVGElement* SkSVGElement::getGradient() {
-    return NULL;
+    return nullptr;
 }
 
 bool SkSVGElement::isGroupParent() {
diff --git a/gfx/skia/skia/src/svg/SkSVGElements.h b/gfx/skia/skia/src/svg/parser/SkSVGElements.h
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGElements.h
rename to gfx/skia/skia/src/svg/parser/SkSVGElements.h
diff --git a/gfx/skia/skia/src/svg/SkSVGEllipse.cpp b/gfx/skia/skia/src/svg/parser/SkSVGEllipse.cpp
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGEllipse.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGEllipse.cpp
diff --git a/gfx/skia/skia/src/svg/SkSVGEllipse.h b/gfx/skia/skia/src/svg/parser/SkSVGEllipse.h
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGEllipse.h
rename to gfx/skia/skia/src/svg/parser/SkSVGEllipse.h
diff --git a/gfx/skia/skia/src/svg/SkSVGFeColorMatrix.cpp b/gfx/skia/skia/src/svg/parser/SkSVGFeColorMatrix.cpp
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGFeColorMatrix.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGFeColorMatrix.cpp
diff --git a/gfx/skia/skia/src/svg/SkSVGFeColorMatrix.h b/gfx/skia/skia/src/svg/parser/SkSVGFeColorMatrix.h
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGFeColorMatrix.h
rename to gfx/skia/skia/src/svg/parser/SkSVGFeColorMatrix.h
diff --git a/gfx/skia/skia/src/svg/SkSVGFilter.cpp b/gfx/skia/skia/src/svg/parser/SkSVGFilter.cpp
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGFilter.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGFilter.cpp
diff --git a/gfx/skia/skia/src/svg/SkSVGFilter.h b/gfx/skia/skia/src/svg/parser/SkSVGFilter.h
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGFilter.h
rename to gfx/skia/skia/src/svg/parser/SkSVGFilter.h
diff --git a/gfx/skia/skia/src/svg/SkSVGG.cpp b/gfx/skia/skia/src/svg/parser/SkSVGG.cpp
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGG.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGG.cpp
diff --git a/gfx/skia/skia/src/svg/SkSVGG.h b/gfx/skia/skia/src/svg/parser/SkSVGG.h
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGG.h
rename to gfx/skia/skia/src/svg/parser/SkSVGG.h
diff --git a/gfx/skia/skia/src/svg/SkSVGGradient.cpp b/gfx/skia/skia/src/svg/parser/SkSVGGradient.cpp
similarity index 99%
rename from gfx/skia/skia/src/svg/SkSVGGradient.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGGradient.cpp
index bbcca18f398a..0f7c6bab7e41 100644
--- a/gfx/skia/skia/src/svg/SkSVGGradient.cpp
+++ b/gfx/skia/skia/src/svg/parser/SkSVGGradient.cpp
@@ -33,7 +33,7 @@ void SkSVGGradient::translate(SkSVGParser& parser, bool defState) {
     bool addedFirst = false;
     bool addedLast = false;
     SkString offsets("[");
-    SkString* lastOffset = NULL;
+    SkString* lastOffset = nullptr;
     for (SkSVGElement** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
         SkASSERT((*ptr)->getType() == SkSVGType_Stop);
         SkSVGStop* stop = (SkSVGStop*) *ptr;
diff --git a/gfx/skia/skia/src/svg/SkSVGGradient.h b/gfx/skia/skia/src/svg/parser/SkSVGGradient.h
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGGradient.h
rename to gfx/skia/skia/src/svg/parser/SkSVGGradient.h
diff --git a/gfx/skia/skia/src/svg/SkSVGGroup.cpp b/gfx/skia/skia/src/svg/parser/SkSVGGroup.cpp
similarity index 94%
rename from gfx/skia/skia/src/svg/SkSVGGroup.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGGroup.cpp
index 420179d8717a..cbd8c4ea7195 100644
--- a/gfx/skia/skia/src/svg/SkSVGGroup.cpp
+++ b/gfx/skia/skia/src/svg/parser/SkSVGGroup.cpp
@@ -17,10 +17,10 @@ SkSVGGroup::SkSVGGroup() {
 SkSVGElement* SkSVGGroup::getGradient() {
     for (SkSVGElement** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
         SkSVGElement* result = (*ptr)->getGradient();
-        if (result != NULL)
+        if (result != nullptr)
             return result;
     }
-    return NULL;
+    return nullptr;
 }
 
 bool SkSVGGroup::isDef() {
diff --git a/gfx/skia/skia/src/svg/SkSVGGroup.h b/gfx/skia/skia/src/svg/parser/SkSVGGroup.h
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGGroup.h
rename to gfx/skia/skia/src/svg/parser/SkSVGGroup.h
diff --git a/gfx/skia/skia/src/svg/SkSVGImage.cpp b/gfx/skia/skia/src/svg/parser/SkSVGImage.cpp
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGImage.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGImage.cpp
diff --git a/gfx/skia/skia/src/svg/SkSVGImage.h b/gfx/skia/skia/src/svg/parser/SkSVGImage.h
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGImage.h
rename to gfx/skia/skia/src/svg/parser/SkSVGImage.h
diff --git a/gfx/skia/skia/src/svg/SkSVGLine.cpp b/gfx/skia/skia/src/svg/parser/SkSVGLine.cpp
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGLine.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGLine.cpp
diff --git a/gfx/skia/skia/src/svg/SkSVGLine.h b/gfx/skia/skia/src/svg/parser/SkSVGLine.h
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGLine.h
rename to gfx/skia/skia/src/svg/parser/SkSVGLine.h
diff --git a/gfx/skia/skia/src/svg/SkSVGLinearGradient.cpp b/gfx/skia/skia/src/svg/parser/SkSVGLinearGradient.cpp
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGLinearGradient.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGLinearGradient.cpp
diff --git a/gfx/skia/skia/src/svg/SkSVGLinearGradient.h b/gfx/skia/skia/src/svg/parser/SkSVGLinearGradient.h
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGLinearGradient.h
rename to gfx/skia/skia/src/svg/parser/SkSVGLinearGradient.h
diff --git a/gfx/skia/skia/src/svg/SkSVGMask.cpp b/gfx/skia/skia/src/svg/parser/SkSVGMask.cpp
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGMask.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGMask.cpp
diff --git a/gfx/skia/skia/src/svg/SkSVGMask.h b/gfx/skia/skia/src/svg/parser/SkSVGMask.h
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGMask.h
rename to gfx/skia/skia/src/svg/parser/SkSVGMask.h
diff --git a/gfx/skia/skia/src/svg/SkSVGMetadata.cpp b/gfx/skia/skia/src/svg/parser/SkSVGMetadata.cpp
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGMetadata.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGMetadata.cpp
diff --git a/gfx/skia/skia/src/svg/SkSVGMetadata.h b/gfx/skia/skia/src/svg/parser/SkSVGMetadata.h
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGMetadata.h
rename to gfx/skia/skia/src/svg/parser/SkSVGMetadata.h
diff --git a/gfx/skia/skia/src/svg/SkSVGPaintState.cpp b/gfx/skia/skia/src/svg/parser/SkSVGPaintState.cpp
similarity index 98%
rename from gfx/skia/skia/src/svg/SkSVGPaintState.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGPaintState.cpp
index 5db624d02e9d..df8ba2823f4f 100644
--- a/gfx/skia/skia/src/svg/SkSVGPaintState.cpp
+++ b/gfx/skia/skia/src/svg/parser/SkSVGPaintState.cpp
@@ -38,7 +38,7 @@ SkSVGAttribute SkSVGPaint::gAttributes[] = {
 
 const int SkSVGPaint::kAttributesSize = SK_ARRAY_COUNT(SkSVGPaint::gAttributes);
 
-SkSVGPaint::SkSVGPaint() : fNext(NULL) {
+SkSVGPaint::SkSVGPaint() : fNext(nullptr) {
 }
 
 SkString* SkSVGPaint::operator[](int index) {
@@ -81,7 +81,7 @@ void SkSVGPaint::addAttribute(SkSVGParser& parser, int attrIndex,
             const char* attrEnd = attrValue + attrLength;
             do {
                 const char* end = strchr(attrValue, ';');
-                if (end == NULL)
+                if (end == nullptr)
                     end = attrEnd;
                 const char* delimiter = strchr(attrValue, ':');
                 SkASSERT(delimiter != 0 && delimiter < end);
@@ -102,7 +102,7 @@ bool SkSVGPaint::flush(SkSVGParser& parser, bool isFlushable, bool isDef) {
     SkSVGPaint current;
     SkSVGPaint* walking = parser.fHead;
     int index;
-    while (walking != NULL) {
+    while (walking != nullptr) {
         for (index = kInitial + 1; index < kTerminal; index++) {
             SkString* lastAttr = (*walking)[index];
             if (lastAttr->size() == 0)
@@ -195,7 +195,7 @@ void SkSVGPaint::setSave(SkSVGParser& parser) {
     int index;
     SkMatrix sum;
     sum.reset();
-    while (walking != NULL) {
+    while (walking != nullptr) {
         for (index = kInitial + 1; index < kTerminal; index++) {
             SkString* lastAttr = (*walking)[index];
             if (lastAttr->size() == 0)
@@ -205,7 +205,7 @@ void SkSVGPaint::setSave(SkSVGParser& parser) {
                 SkASSERT(strncmp(str, "matrix(", 7) == 0);
                 str += 6;
                 const char* strEnd = strrchr(str, ')');
-                SkASSERT(strEnd != NULL);
+                SkASSERT(strEnd != nullptr);
                 SkString mat(str, strEnd - str);
                 SkSVGParser::ConvertToArray(mat);
                 SkScalar values[6];
diff --git a/gfx/skia/skia/src/svg/SkSVGParser.cpp b/gfx/skia/skia/src/svg/parser/SkSVGParser.cpp
similarity index 96%
rename from gfx/skia/skia/src/svg/SkSVGParser.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGParser.cpp
index 74ea0236e097..854716b6c59f 100644
--- a/gfx/skia/skia/src/svg/SkSVGParser.cpp
+++ b/gfx/skia/skia/src/svg/parser/SkSVGParser.cpp
@@ -38,14 +38,14 @@ static int gGeneratedMatrixID = 0;
 SkSVGParser::SkSVGParser(SkXMLParserError* errHandler) :
     SkXMLParser(errHandler),
     fHead(&fEmptyPaint), fIDs(256),
-        fXMLWriter(&fStream), fCurrElement(NULL), fInSVG(false), fSuppressPaint(false) {
+        fXMLWriter(&fStream), fCurrElement(nullptr), fInSVG(false), fSuppressPaint(false) {
     fLastTransform.reset();
     fEmptyPaint.f_fill.set("black");
     fEmptyPaint.f_stroke.set("none");
     fEmptyPaint.f_strokeMiterlimit.set("4");
     fEmptyPaint.f_fillRule.set("winding");
     fEmptyPaint.f_opacity.set("1");
-    fEmptyPaint.fNext = NULL;
+    fEmptyPaint.fNext = nullptr;
     for (int index = SkSVGPaint::kInitial + 1; index < SkSVGPaint::kTerminal; index++) {
         SkString* initial = fEmptyPaint[index];
         if (initial->size() == 0)
@@ -129,7 +129,7 @@ bool SkSVGParser::isStrokeAndFill(  SkSVGPaint** strokeState, SkSVGPaint** fillS
     bool fill = false;
     bool strokeSet = false;
     bool fillSet = false;
-    while (walking != NULL) {
+    while (walking != nullptr) {
         if (strokeSet == false && walking->f_stroke.size() > 0) {
             stroke = walking->f_stroke.equals("none") == false;
             *strokeState = walking;
@@ -150,7 +150,7 @@ bool SkSVGParser::onAddAttribute(const char name[], const char value[]) {
 }
 
 bool SkSVGParser::onAddAttributeLen(const char name[], const char value[], size_t len) {
-    if (fCurrElement == NULL)    // this signals we should ignore attributes for this element
+    if (fCurrElement == nullptr)    // this signals we should ignore attributes for this element
         return true;
     if (fCurrElement->fIsDef == false && fCurrElement->fIsNotDef == false)
         return false; // also an ignored element
@@ -202,7 +202,7 @@ bool SkSVGParser::onStartElementLen(const char name[], size_t len) {
         type = SkSVGType_G;
 //        return true;
     }
-    SkSVGElement* parent = fParents.count() > 0 ? fParents.top() : NULL;
+    SkSVGElement* parent = fParents.count() > 0 ? fParents.top() : nullptr;
     SkSVGElement* element = CreateElement(type, parent);
     bool result = false;
     if (parent) {
@@ -237,7 +237,7 @@ void SkSVGParser::translate(SkSVGElement* element, bool isDef) {
         (element->fIsDef == false && isDef && element->fIsNotDef)) {
         isFlushable = false;
     }
-    SkSVGPaint* strokeState = NULL, * fillState = NULL;
+    SkSVGPaint* strokeState = nullptr, * fillState = nullptr;
     if (isFlushable)
         element->fPaintState.setSave(*this);
     if (isFlushable && isStrokeAndFill(&strokeState, &fillState)) {
@@ -288,7 +288,7 @@ void SkSVGParser::translateMatrix(SkString& string, SkString* stringID) {
     SkASSERT(strncmp(str, "matrix(", 7) == 0);
     str += 6;
     const char* strEnd = strrchr(str, ')');
-    SkASSERT(strEnd != NULL);
+    SkASSERT(strEnd != nullptr);
     SkString mat(str, strEnd - str);
     ConvertToArray(mat);
     const char* elems[6];
@@ -305,7 +305,7 @@ void SkSVGParser::translateMatrix(SkString& string, SkString* stringID) {
     string.reset();
     for (int index = 0; index < 6; index++) {
         const char* end = strchr(elems[index], ',');
-        if (end == NULL)
+        if (end == nullptr)
             end= strchr(elems[index], ']');
         string.append(elems[index], end - elems[index] + 1);
     }
@@ -356,7 +356,7 @@ undoLastComma:
 #define CASE_NEW(type) case SkSVGType_##type : created = new SkSVG##type(); break
 
 SkSVGElement* SkSVGParser::CreateElement(SkSVGTypes type, SkSVGElement* parent) {
-    SkSVGElement* created = NULL;
+    SkSVGElement* created = nullptr;
     switch (type) {
         CASE_NEW(Circle);
         CASE_NEW(ClipPath);
@@ -383,7 +383,7 @@ SkSVGElement* SkSVGParser::CreateElement(SkSVGTypes type, SkSVGElement* parent)
         CASE_NEW(Use);
         default:
             SkASSERT(0);
-            return NULL;
+            return nullptr;
     }
     created->fParent = parent;
     bool isDef = created->fIsDef = created->isDef();
diff --git a/gfx/skia/skia/src/svg/SkSVGPath.cpp b/gfx/skia/skia/src/svg/parser/SkSVGPath.cpp
similarity index 97%
rename from gfx/skia/skia/src/svg/SkSVGPath.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGPath.cpp
index ab18a65a7bae..c9917c7b52f8 100644
--- a/gfx/skia/skia/src/svg/SkSVGPath.cpp
+++ b/gfx/skia/skia/src/svg/parser/SkSVGPath.cpp
@@ -21,7 +21,7 @@ void SkSVGPath::translate(SkSVGParser& parser, bool defState) {
     INHERITED::translate(parser, defState);
     bool hasMultiplePaths = false;
     const char* firstZ = strchr(f_d.c_str(), 'z');
-    if (firstZ != NULL) {
+    if (firstZ != nullptr) {
         firstZ++; // skip over 'z'
         while (*firstZ == ' ')
             firstZ++;
diff --git a/gfx/skia/skia/src/svg/SkSVGPath.h b/gfx/skia/skia/src/svg/parser/SkSVGPath.h
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGPath.h
rename to gfx/skia/skia/src/svg/parser/SkSVGPath.h
diff --git a/gfx/skia/skia/src/svg/SkSVGPolygon.cpp b/gfx/skia/skia/src/svg/parser/SkSVGPolygon.cpp
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGPolygon.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGPolygon.cpp
diff --git a/gfx/skia/skia/src/svg/SkSVGPolygon.h b/gfx/skia/skia/src/svg/parser/SkSVGPolygon.h
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGPolygon.h
rename to gfx/skia/skia/src/svg/parser/SkSVGPolygon.h
diff --git a/gfx/skia/skia/src/svg/SkSVGPolyline.cpp b/gfx/skia/skia/src/svg/parser/SkSVGPolyline.cpp
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGPolyline.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGPolyline.cpp
diff --git a/gfx/skia/skia/src/svg/SkSVGPolyline.h b/gfx/skia/skia/src/svg/parser/SkSVGPolyline.h
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGPolyline.h
rename to gfx/skia/skia/src/svg/parser/SkSVGPolyline.h
diff --git a/gfx/skia/skia/src/svg/SkSVGRadialGradient.cpp b/gfx/skia/skia/src/svg/parser/SkSVGRadialGradient.cpp
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGRadialGradient.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGRadialGradient.cpp
diff --git a/gfx/skia/skia/src/svg/SkSVGRadialGradient.h b/gfx/skia/skia/src/svg/parser/SkSVGRadialGradient.h
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGRadialGradient.h
rename to gfx/skia/skia/src/svg/parser/SkSVGRadialGradient.h
diff --git a/gfx/skia/skia/src/svg/SkSVGRect.cpp b/gfx/skia/skia/src/svg/parser/SkSVGRect.cpp
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGRect.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGRect.cpp
diff --git a/gfx/skia/skia/src/svg/SkSVGRect.h b/gfx/skia/skia/src/svg/parser/SkSVGRect.h
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGRect.h
rename to gfx/skia/skia/src/svg/parser/SkSVGRect.h
diff --git a/gfx/skia/skia/src/svg/SkSVGSVG.cpp b/gfx/skia/skia/src/svg/parser/SkSVGSVG.cpp
similarity index 90%
rename from gfx/skia/skia/src/svg/SkSVGSVG.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGSVG.cpp
index fcce62de9e83..61ccb3c81962 100644
--- a/gfx/skia/skia/src/svg/SkSVGSVG.cpp
+++ b/gfx/skia/skia/src/svg/parser/SkSVGSVG.cpp
@@ -43,11 +43,8 @@ void SkSVGSVG::translate(SkSVGParser& parser, bool defState) {
     if (strcmp(wSuffix, "pt") == 0)
         width = SkScalarMulDiv(width, SK_Scalar1 * 72, SK_Scalar1 * 96);
     SkParse::FindScalars(f_viewBox.c_str(), viewBox, 4);
-    SkRect box;
-    box.fLeft = SkScalarDiv(viewBox[0], width);
-    box.fTop = SkScalarDiv(viewBox[1], height);
-    box.fRight = SkScalarDiv(viewBox[2], width);
-    box.fBottom = SkScalarDiv(viewBox[3], height);
+    SkRect box = SkRect::MakeLTRB(viewBox[0] / width, viewBox[1] / height,
+                                  viewBox[2] / width, viewBox[3] / height);
     if (box.fLeft == 0 && box.fTop == 0 &&
         box.fRight == SK_Scalar1 && box.fBottom == SK_Scalar1)
             return;
diff --git a/gfx/skia/skia/src/svg/SkSVGSVG.h b/gfx/skia/skia/src/svg/parser/SkSVGSVG.h
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGSVG.h
rename to gfx/skia/skia/src/svg/parser/SkSVGSVG.h
diff --git a/gfx/skia/skia/src/svg/SkSVGStop.cpp b/gfx/skia/skia/src/svg/parser/SkSVGStop.cpp
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGStop.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGStop.cpp
diff --git a/gfx/skia/skia/src/svg/SkSVGStop.h b/gfx/skia/skia/src/svg/parser/SkSVGStop.h
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGStop.h
rename to gfx/skia/skia/src/svg/parser/SkSVGStop.h
diff --git a/gfx/skia/skia/src/svg/SkSVGSymbol.cpp b/gfx/skia/skia/src/svg/parser/SkSVGSymbol.cpp
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGSymbol.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGSymbol.cpp
diff --git a/gfx/skia/skia/src/svg/SkSVGSymbol.h b/gfx/skia/skia/src/svg/parser/SkSVGSymbol.h
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGSymbol.h
rename to gfx/skia/skia/src/svg/parser/SkSVGSymbol.h
diff --git a/gfx/skia/skia/src/svg/SkSVGText.cpp b/gfx/skia/skia/src/svg/parser/SkSVGText.cpp
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGText.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGText.cpp
diff --git a/gfx/skia/skia/src/svg/SkSVGText.h b/gfx/skia/skia/src/svg/parser/SkSVGText.h
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGText.h
rename to gfx/skia/skia/src/svg/parser/SkSVGText.h
diff --git a/gfx/skia/skia/src/svg/SkSVGUse.cpp b/gfx/skia/skia/src/svg/parser/SkSVGUse.cpp
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGUse.cpp
rename to gfx/skia/skia/src/svg/parser/SkSVGUse.cpp
diff --git a/gfx/skia/skia/src/svg/SkSVGUse.h b/gfx/skia/skia/src/svg/parser/SkSVGUse.h
similarity index 100%
rename from gfx/skia/skia/src/svg/SkSVGUse.h
rename to gfx/skia/skia/src/svg/parser/SkSVGUse.h
diff --git a/gfx/skia/skia/src/utils/SkBase64.cpp b/gfx/skia/skia/src/utils/SkBase64.cpp
index 545a8ebb216a..4c3078f25514 100644
--- a/gfx/skia/skia/src/utils/SkBase64.cpp
+++ b/gfx/skia/skia/src/utils/SkBase64.cpp
@@ -26,7 +26,7 @@ static const signed char decodeData[] = {
     41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51
 };
 
-SkBase64::SkBase64() : fLength((size_t) -1), fData(NULL) {
+SkBase64::SkBase64() : fLength((size_t) -1), fData(nullptr) {
 }
 
 #if defined _WIN32 && _MSC_VER >= 1300  // disable 'two', etc. may be used without having been initialized
@@ -111,7 +111,7 @@ goHome:
 
 size_t SkBase64::Encode(const void* srcPtr, size_t length, void* dstPtr, const char* encodeMap) {
     const char* encode;
-    if (NULL == encodeMap) {
+    if (nullptr == encodeMap) {
         encode = default_encode;
     } else {
         encode = encodeMap;
diff --git a/gfx/skia/skia/src/utils/SkBase64.h b/gfx/skia/skia/src/utils/SkBase64.h
index ba66dd2f4779..13350b7b682c 100644
--- a/gfx/skia/skia/src/utils/SkBase64.h
+++ b/gfx/skia/skia/src/utils/SkBase64.h
@@ -26,7 +26,7 @@ public:
        encode[64] will be used as the pad character. Encodings other than the
        default encoding cannot be decoded.
     */
-    static size_t Encode(const void* src, size_t length, void* dest, const char* encode = NULL);
+    static size_t Encode(const void* src, size_t length, void* dest, const char* encode = nullptr);
 
 private:
     Error decode(const void* srcPtr, size_t length, bool writeDestination);
diff --git a/gfx/skia/skia/src/utils/SkBitSet.cpp b/gfx/skia/skia/src/utils/SkBitSet.cpp
index 36ff6cbb01c8..3ace15de8044 100755
--- a/gfx/skia/skia/src/utils/SkBitSet.cpp
+++ b/gfx/skia/skia/src/utils/SkBitSet.cpp
@@ -10,16 +10,15 @@
 #include "SkBitSet.h"
 
 SkBitSet::SkBitSet(int numberOfBits)
-    : fBitData(NULL), fDwordCount(0), fBitCount(numberOfBits) {
+    : fBitData(nullptr), fDwordCount(0), fBitCount(numberOfBits) {
     SkASSERT(numberOfBits > 0);
     // Round up size to 32-bit boundary.
     fDwordCount = (numberOfBits + 31) / 32;
-    fBitData.set(malloc(fDwordCount * sizeof(uint32_t)));
-    clearAll();
+    fBitData.set(sk_calloc_throw(fDwordCount * sizeof(uint32_t)));
 }
 
 SkBitSet::SkBitSet(const SkBitSet& source)
-    : fBitData(NULL), fDwordCount(0), fBitCount(0) {
+    : fBitData(nullptr), fDwordCount(0), fBitCount(0) {
     *this = source;
 }
 
@@ -30,14 +29,14 @@ SkBitSet& SkBitSet::operator=(const SkBitSet& rhs) {
     fBitCount = rhs.fBitCount;
     fBitData.free();
     fDwordCount = rhs.fDwordCount;
-    fBitData.set(malloc(fDwordCount * sizeof(uint32_t)));
+    fBitData.set(sk_malloc_throw(fDwordCount * sizeof(uint32_t)));
     memcpy(fBitData.get(), rhs.fBitData.get(), fDwordCount * sizeof(uint32_t));
     return *this;
 }
 
 bool SkBitSet::operator==(const SkBitSet& rhs) {
     if (fBitCount == rhs.fBitCount) {
-        if (fBitData.get() != NULL) {
+        if (fBitData.get() != nullptr) {
             return (memcmp(fBitData.get(), rhs.fBitData.get(),
                            fDwordCount * sizeof(uint32_t)) == 0);
         }
@@ -51,30 +50,16 @@ bool SkBitSet::operator!=(const SkBitSet& rhs) {
 }
 
 void SkBitSet::clearAll() {
-    if (fBitData.get() != NULL) {
+    if (fBitData.get() != nullptr) {
         sk_bzero(fBitData.get(), fDwordCount * sizeof(uint32_t));
     }
 }
 
-void SkBitSet::setBit(int index, bool value) {
-    uint32_t mask = 1 << (index % 32);
-    if (value) {
-        *(internalGet(index)) |= mask;
-    } else {
-        *(internalGet(index)) &= ~mask;
-    }
-}
-
-bool SkBitSet::isBitSet(int index) const {
-    uint32_t mask = 1 << (index % 32);
-    return 0 != (*internalGet(index) & mask);
-}
-
 bool SkBitSet::orBits(const SkBitSet& source) {
     if (fBitCount != source.fBitCount) {
         return false;
     }
-    uint32_t* targetBitmap = internalGet(0);
+    uint32_t* targetBitmap = this->internalGet(0);
     uint32_t* sourceBitmap = source.internalGet(0);
     for (size_t i = 0; i < fDwordCount; ++i) {
         targetBitmap[i] |= sourceBitmap[i];
diff --git a/gfx/skia/skia/src/utils/SkBitSet.h b/gfx/skia/skia/src/utils/SkBitSet.h
index e113fd70044e..266fd8749625 100644
--- a/gfx/skia/skia/src/utils/SkBitSet.h
+++ b/gfx/skia/skia/src/utils/SkBitSet.h
@@ -30,11 +30,22 @@ public:
 
     /** Set the value of the index-th bit.
      */
-    void setBit(int index, bool value);
+    void setBit(int index, bool value) {
+        uint32_t mask = 1 << (index & 31);
+        uint32_t* chunk = this->internalGet(index);
+        if (value) {
+            *chunk |= mask;
+        } else {
+            *chunk &= ~mask;
+        }
+    }
 
     /** Test if bit index is set.
      */
-    bool isBitSet(int index) const;
+    bool isBitSet(int index) const {
+        uint32_t mask = 1 << (index & 31);
+        return SkToBool(*this->internalGet(index) & mask);
+    }
 
     /** Or bits from source.  false is returned if this doesn't have the same
      *  bit count as source.
diff --git a/gfx/skia/skia/src/utils/SkBitmapSourceDeserializer.cpp b/gfx/skia/skia/src/utils/SkBitmapSourceDeserializer.cpp
new file mode 100644
index 000000000000..bb783bfeef2b
--- /dev/null
+++ b/gfx/skia/skia/src/utils/SkBitmapSourceDeserializer.cpp
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkBitmapSourceDeserializer.h"
+
+#include "SkBitmap.h"
+#include "SkFilterQuality.h"
+#include "SkImage.h"
+#include "SkImageSource.h"
+#include "SkReadBuffer.h"
+
+SkFlattenable* SkBitmapSourceDeserializer::CreateProc(SkReadBuffer& buffer) {
+    SkFilterQuality filterQuality;
+    if (buffer.isVersionLT(SkReadBuffer::kBitmapSourceFilterQuality_Version)) {
+        filterQuality = kHigh_SkFilterQuality;
+    } else {
+        filterQuality = (SkFilterQuality)buffer.readInt();
+    }
+    SkRect src, dst;
+    buffer.readRect(&src);
+    buffer.readRect(&dst);
+    SkBitmap bitmap;
+    if (!buffer.readBitmap(&bitmap)) {
+        return nullptr;
+    }
+    bitmap.setImmutable();
+
+    SkAutoTUnref<SkImage> image(SkImage::NewFromBitmap(bitmap));
+    return SkImageSource::Create(image, src, dst, filterQuality);
+}
diff --git a/gfx/skia/skia/src/utils/SkBitmapSourceDeserializer.h b/gfx/skia/skia/src/utils/SkBitmapSourceDeserializer.h
new file mode 100644
index 000000000000..e0175999184f
--- /dev/null
+++ b/gfx/skia/skia/src/utils/SkBitmapSourceDeserializer.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkBitmapSourceDeserializer_DEFINED
+#define SkBitmapSourceDeserializer_DEFINED
+
+#include "SkFlattenable.h"
+
+// A temporary utility class to support deserializing legacy SkBitmapSource as SkImageSource.
+// Should be removed when SKP versions which may contain SkBitmapSource records are phased out.
+class SkBitmapSourceDeserializer : public SkFlattenable {
+public:
+    SK_DEFINE_FLATTENABLE_TYPE(SkImageFilter)
+    SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBitmapSource)
+};
+
+#endif
diff --git a/gfx/skia/skia/src/utils/SkBoundaryPatch.cpp b/gfx/skia/skia/src/utils/SkBoundaryPatch.cpp
index e5fcc4051bad..7ef11ee245aa 100644
--- a/gfx/skia/skia/src/utils/SkBoundaryPatch.cpp
+++ b/gfx/skia/skia/src/utils/SkBoundaryPatch.cpp
@@ -7,7 +7,7 @@
  */
 #include "SkBoundaryPatch.h"
 
-SkBoundaryPatch::SkBoundaryPatch() : fBoundary(NULL) {}
+SkBoundaryPatch::SkBoundaryPatch() : fBoundary(nullptr) {}
 
 SkBoundaryPatch::~SkBoundaryPatch() {
     SkSafeUnref(fBoundary);
@@ -74,6 +74,6 @@ SkPoint SkCubicBoundary::eval(Edge e, SkScalar t) {
     fPts[12] = fPts[0];
 
     SkPoint loc;
-    SkEvalCubicAt(&fPts[e * 3], t, &loc, NULL, NULL);
+    SkEvalCubicAt(&fPts[e * 3], t, &loc, nullptr, nullptr);
     return loc;
 }
diff --git a/gfx/skia/skia/src/utils/SkCamera.cpp b/gfx/skia/skia/src/utils/SkCamera.cpp
index d9f9cf545038..c8c462a5f71a 100644
--- a/gfx/skia/skia/src/utils/SkCamera.cpp
+++ b/gfx/skia/skia/src/utils/SkCamera.cpp
@@ -74,7 +74,7 @@ void SkPatch3D::reset() {
 }
 
 void SkPatch3D::transform(const SkMatrix3D& m, SkPatch3D* dst) const {
-    if (dst == NULL) {
+    if (dst == nullptr) {
         dst = (SkPatch3D*)this;
     }
     m.mapVector(fU, &dst->fU);
@@ -291,13 +291,13 @@ Sk3DView::~Sk3DView() {
     Rec* rec = fRec;
     while (rec != &fInitialRec) {
         Rec* next = rec->fNext;
-        SkDELETE(rec);
+        delete rec;
         rec = next;
     }
 }
 
 void Sk3DView::save() {
-    Rec* rec = SkNEW(Rec);
+    Rec* rec = new Rec;
     rec->fNext = fRec;
     rec->fMatrix = fRec->fMatrix;
     fRec = rec;
@@ -306,7 +306,7 @@ void Sk3DView::save() {
 void Sk3DView::restore() {
     SkASSERT(fRec != &fInitialRec);
     Rec* next = fRec->fNext;
-    SkDELETE(fRec);
+    delete fRec;
     fRec = next;
 }
 
@@ -356,7 +356,7 @@ SkScalar Sk3DView::dotWithNormal(SkScalar x, SkScalar y, SkScalar z) const {
 }
 
 void Sk3DView::getMatrix(SkMatrix* matrix) const {
-    if (matrix != NULL) {
+    if (matrix != nullptr) {
         SkPatch3D   patch;
         patch.transform(fRec->fMatrix);
         fCamera.patchToMatrix(patch, matrix);
diff --git a/gfx/skia/skia/src/utils/SkCanvasStack.h b/gfx/skia/skia/src/utils/SkCanvasStack.h
index 028e52604864..6602110e31d6 100644
--- a/gfx/skia/skia/src/utils/SkCanvasStack.h
+++ b/gfx/skia/skia/src/utils/SkCanvasStack.h
@@ -18,7 +18,7 @@ public:
     virtual ~SkCanvasStack();
 
     void pushCanvas(SkCanvas* canvas, const SkIPoint& origin);
-    virtual void removeAll() SK_OVERRIDE;
+    void removeAll() override;
 
     /*
      * The following add/remove canvas methods are overrides from SkNWayCanvas
@@ -26,16 +26,16 @@ public:
      * can share most of the other implementation of NWay we override those
      * methods to be no-ops.
      */
-    virtual void addCanvas(SkCanvas*) SK_OVERRIDE { SkDEBUGFAIL("Invalid Op"); }
-    virtual void removeCanvas(SkCanvas*) SK_OVERRIDE { SkDEBUGFAIL("Invalid Op"); }
+    void addCanvas(SkCanvas*) override { SkDEBUGFAIL("Invalid Op"); }
+    void removeCanvas(SkCanvas*) override { SkDEBUGFAIL("Invalid Op"); }
 
 protected:
-    virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE;
+    void didSetMatrix(const SkMatrix&) override;
 
-    virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE;
+    void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) override;
+    void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) override;
+    void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) override;
+    void onClipRegion(const SkRegion&, SkRegion::Op) override;
 
 private:
     void clipToZOrderedBounds();
diff --git a/gfx/skia/skia/src/utils/SkCanvasStateUtils.cpp b/gfx/skia/skia/src/utils/SkCanvasStateUtils.cpp
index a6806ddc7c00..8b7a10a1247d 100644
--- a/gfx/skia/skia/src/utils/SkCanvasStateUtils.cpp
+++ b/gfx/skia/skia/src/utils/SkCanvasStateUtils.cpp
@@ -7,9 +7,9 @@
 
 #include "SkCanvasStateUtils.h"
 
-#include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkCanvasStack.h"
+#include "SkDevice.h"
 #include "SkErrorInternals.h"
 #include "SkWriter32.h"
 
@@ -104,9 +104,9 @@ public:
     : INHERITED(kVersion, canvas)
     {
         layerCount = 0;
-        layers = NULL;
+        layers = nullptr;
         mcState.clipRectCount = 0;
-        mcState.clipRects = NULL;
+        mcState.clipRects = nullptr;
         originalCanvas = SkRef(canvas);
     }
 
@@ -141,15 +141,15 @@ public:
     bool failed() { return fFailed; }
 
     // ClipVisitor
-    virtual void clipRect(const SkRect& rect, SkRegion::Op op, bool antialias) SK_OVERRIDE {
+    void clipRect(const SkRect& rect, SkRegion::Op op, bool antialias) override {
         fFailed |= antialias;
     }
 
-    virtual void clipRRect(const SkRRect& rrect, SkRegion::Op op, bool antialias) SK_OVERRIDE {
+    void clipRRect(const SkRRect& rrect, SkRegion::Op op, bool antialias) override {
         fFailed |= antialias;
     }
 
-    virtual void clipPath(const SkPath&, SkRegion::Op, bool antialias) SK_OVERRIDE {
+    void clipPath(const SkPath&, SkRegion::Op, bool antialias) override {
         fFailed |= antialias;
     }
 
@@ -203,10 +203,10 @@ SkCanvasState* SkCanvasStateUtils::CaptureCanvasState(SkCanvas* canvas) {
     if (validator.failed()) {
         SkErrorInternals::SetError(kInvalidOperation_SkError,
                 "CaptureCanvasState does not support canvases with antialiased clips.\n");
-        return NULL;
+        return nullptr;
     }
 
-    SkAutoTDelete<SkCanvasState_v1> canvasState(SkNEW_ARGS(SkCanvasState_v1, (canvas)));
+    SkAutoTDelete<SkCanvasState_v1> canvasState(new SkCanvasState_v1(canvas));
 
     // decompose the total matrix and clip
     setup_MC_state(&canvasState->mcState, canvas->getTotalMatrix(),
@@ -224,9 +224,9 @@ SkCanvasState* SkCanvasStateUtils::CaptureCanvasState(SkCanvas* canvas) {
     for (SkCanvas::LayerIter layer(canvas, true/*skipEmptyClips*/); !layer.done(); layer.next()) {
 
         // we currently only work for bitmap backed devices
-        const SkBitmap& bitmap = layer.device()->accessBitmap(true/*changePixels*/);
-        if (bitmap.empty() || bitmap.isNull() || !bitmap.lockPixelsAreWritable()) {
-            return NULL;
+        SkPixmap pmap;
+        if (!layer.device()->accessPixels(&pmap) || 0 == pmap.width() || 0 == pmap.height()) {
+            return nullptr;
         }
 
         SkCanvasLayerState* layerState =
@@ -234,10 +234,10 @@ SkCanvasState* SkCanvasStateUtils::CaptureCanvasState(SkCanvas* canvas) {
         layerState->type = kRaster_CanvasBackend;
         layerState->x = layer.x();
         layerState->y = layer.y();
-        layerState->width = bitmap.width();
-        layerState->height = bitmap.height();
+        layerState->width = pmap.width();
+        layerState->height = pmap.height();
 
-        switch (bitmap.colorType()) {
+        switch (pmap.colorType()) {
             case kN32_SkColorType:
                 layerState->raster.config = kARGB_8888_RasterConfig;
                 break;
@@ -245,10 +245,10 @@ SkCanvasState* SkCanvasStateUtils::CaptureCanvasState(SkCanvas* canvas) {
                 layerState->raster.config = kRGB_565_RasterConfig;
                 break;
             default:
-                return NULL;
+                return nullptr;
         }
-        layerState->raster.rowBytes = bitmap.rowBytes();
-        layerState->raster.pixels = bitmap.getPixels();
+        layerState->raster.rowBytes = pmap.rowBytes();
+        layerState->raster.pixels = pmap.writable_addr();
 
         setup_MC_state(&layerState->mcState, layer.matrix(), layer.clip());
         layerCount++;
@@ -301,7 +301,7 @@ static SkCanvas* create_canvas_from_canvas_layer(const SkCanvasLayerState& layer
         kUnknown_SkColorType;
 
     if (colorType == kUnknown_SkColorType) {
-        return NULL;
+        return nullptr;
     }
 
     bitmap.installPixels(SkImageInfo::Make(layerState.width, layerState.height,
@@ -311,7 +311,7 @@ static SkCanvas* create_canvas_from_canvas_layer(const SkCanvasLayerState& layer
     SkASSERT(!bitmap.empty());
     SkASSERT(!bitmap.isNull());
 
-    SkAutoTUnref<SkCanvas> canvas(SkNEW_ARGS(SkCanvas, (bitmap)));
+    SkAutoTUnref<SkCanvas> canvas(new SkCanvas(bitmap));
 
     // setup the matrix and clip
     setup_canvas_from_MC_state(layerState.mcState, canvas.get());
@@ -327,10 +327,10 @@ SkCanvas* SkCanvasStateUtils::CreateFromCanvasState(const SkCanvasState* state)
     const SkCanvasState_v1* state_v1 = static_cast<const SkCanvasState_v1*>(state);
 
     if (state_v1->layerCount < 1) {
-        return NULL;
+        return nullptr;
     }
 
-    SkAutoTUnref<SkCanvasStack> canvas(SkNEW_ARGS(SkCanvasStack, (state->width, state->height)));
+    SkAutoTUnref<SkCanvasStack> canvas(new SkCanvasStack(state->width, state->height));
 
     // setup the matrix and clip on the n-way canvas
     setup_canvas_from_MC_state(state_v1->mcState, canvas);
@@ -339,7 +339,7 @@ SkCanvas* SkCanvasStateUtils::CreateFromCanvasState(const SkCanvasState* state)
     for (int i = state_v1->layerCount - 1; i >= 0; --i) {
         SkAutoTUnref<SkCanvas> canvasLayer(create_canvas_from_canvas_layer(state_v1->layers[i]));
         if (!canvasLayer.get()) {
-            return NULL;
+            return nullptr;
         }
         canvas->pushCanvas(canvasLayer.get(), SkIPoint::Make(state_v1->layers[i].x,
                                                              state_v1->layers[i].y));
@@ -355,5 +355,5 @@ void SkCanvasStateUtils::ReleaseCanvasState(SkCanvasState* state) {
     // Upcast to the correct version of SkCanvasState. This avoids having a virtual destructor on
     // SkCanvasState. That would be strange since SkCanvasState has no other virtual functions, and
     // instead uses the field "version" to determine how to behave.
-    SkDELETE(static_cast<SkCanvasState_v1*>(state));
+    delete static_cast<SkCanvasState_v1*>(state);
 }
diff --git a/gfx/skia/skia/src/utils/SkCondVar.cpp b/gfx/skia/skia/src/utils/SkCondVar.cpp
deleted file mode 100644
index 5d001c0eddbf..000000000000
--- a/gfx/skia/skia/src/utils/SkCondVar.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkCondVar.h"
-
-SkCondVar::SkCondVar() {
-#ifdef SK_USE_POSIX_THREADS
-    pthread_mutex_init(&fMutex, NULL /* default mutex attr */);
-    pthread_cond_init(&fCond, NULL /* default cond attr */);
-#elif defined(SK_BUILD_FOR_WIN32)
-    InitializeCriticalSection(&fCriticalSection);
-    InitializeConditionVariable(&fCondition);
-#endif
-}
-
-SkCondVar::~SkCondVar() {
-#ifdef SK_USE_POSIX_THREADS
-    pthread_mutex_destroy(&fMutex);
-    pthread_cond_destroy(&fCond);
-#elif defined(SK_BUILD_FOR_WIN32)
-    DeleteCriticalSection(&fCriticalSection);
-    // No need to clean up fCondition.
-#endif
-}
-
-void SkCondVar::lock() {
-#ifdef SK_USE_POSIX_THREADS
-    pthread_mutex_lock(&fMutex);
-#elif defined(SK_BUILD_FOR_WIN32)
-    EnterCriticalSection(&fCriticalSection);
-#endif
-}
-
-void SkCondVar::unlock() {
-#ifdef SK_USE_POSIX_THREADS
-    pthread_mutex_unlock(&fMutex);
-#elif defined(SK_BUILD_FOR_WIN32)
-    LeaveCriticalSection(&fCriticalSection);
-#endif
-}
-
-void SkCondVar::wait() {
-#ifdef SK_USE_POSIX_THREADS
-    pthread_cond_wait(&fCond, &fMutex);
-#elif defined(SK_BUILD_FOR_WIN32)
-    SleepConditionVariableCS(&fCondition, &fCriticalSection, INFINITE);
-#endif
-}
-
-void SkCondVar::signal() {
-#ifdef SK_USE_POSIX_THREADS
-    pthread_cond_signal(&fCond);
-#elif defined(SK_BUILD_FOR_WIN32)
-    WakeConditionVariable(&fCondition);
-#endif
-}
-
-void SkCondVar::broadcast() {
-#ifdef SK_USE_POSIX_THREADS
-    pthread_cond_broadcast(&fCond);
-#elif defined(SK_BUILD_FOR_WIN32)
-    WakeAllConditionVariable(&fCondition);
-#endif
-}
diff --git a/gfx/skia/skia/src/utils/SkCullPoints.cpp b/gfx/skia/skia/src/utils/SkCullPoints.cpp
index 76e63c71a9c6..f77acf102383 100644
--- a/gfx/skia/skia/src/utils/SkCullPoints.cpp
+++ b/gfx/skia/skia/src/utils/SkCullPoints.cpp
@@ -76,7 +76,7 @@ void SkCullPoints::moveTo(int x, int y) {
 }
 
 SkCullPoints::LineToResult SkCullPoints::lineTo(int x, int y, SkIPoint line[]) {
-    SkASSERT(line != NULL);
+    SkASSERT(line != nullptr);
 
     LineToResult result = kNo_Result;
     int x0 = fPrevPt.fX;
@@ -107,7 +107,7 @@ SkCullPoints::LineToResult SkCullPoints::lineTo(int x, int y, SkIPoint line[]) {
 #include "SkPath.h"
 
 SkCullPointsPath::SkCullPointsPath()
-    : fCP(), fPath(NULL) {
+    : fCP(), fPath(nullptr) {
 }
 
 SkCullPointsPath::SkCullPointsPath(const SkIRect& r, SkPath* dst)
diff --git a/gfx/skia/skia/src/utils/SkDashPath.cpp b/gfx/skia/skia/src/utils/SkDashPath.cpp
index 3c4aef343d33..e0cbe9732d24 100644
--- a/gfx/skia/skia/src/utils/SkDashPath.cpp
+++ b/gfx/skia/skia/src/utils/SkDashPath.cpp
@@ -7,6 +7,7 @@
 
 #include "SkDashPathPriv.h"
 #include "SkPathMeasure.h"
+#include "SkStrokeRec.h"
 
 static inline int is_even(int x) {
     return (~x) << 31;
@@ -92,7 +93,7 @@ static void outset_for_stroke(SkRect* rect, const SkStrokeRec& rec) {
 static bool cull_path(const SkPath& srcPath, const SkStrokeRec& rec,
                       const SkRect* cullRect, SkScalar intervalLength,
                       SkPath* dstPath) {
-    if (NULL == cullRect) {
+    if (nullptr == cullRect) {
         return false;
     }
 
@@ -115,14 +116,15 @@ static bool cull_path(const SkPath& srcPath, const SkStrokeRec& rec,
     SkScalar minX = pts[0].fX;
     SkScalar maxX = pts[1].fX;
 
-    if (maxX < bounds.fLeft || minX > bounds.fRight) {
-        return false;
-    }
-
     if (dx < 0) {
         SkTSwap(minX, maxX);
     }
 
+    SkASSERT(minX <= maxX);
+    if (maxX < bounds.fLeft || minX > bounds.fRight) {
+        return false;
+    }
+
     // Now we actually perform the chop, removing the excess to the left and
     // right of the bounds (keeping our new line "in phase" with the dash,
     // hence the (mod intervalLength).
@@ -271,7 +273,7 @@ bool SkDashPath::FilterDashPath(SkPath* dst, const SkPath& src, SkStrokeRec* rec
         while (distance < length) {
             SkASSERT(dlen >= 0);
             addedSegment = false;
-            if (is_even(index) && dlen > 0 && !skipFirstSegment) {
+            if (is_even(index) && !skipFirstSegment) {
                 addedSegment = true;
                 ++segCount;
 
diff --git a/gfx/skia/skia/src/utils/SkDashPathPriv.h b/gfx/skia/skia/src/utils/SkDashPathPriv.h
index 94222a271a66..7453dcec82e3 100644
--- a/gfx/skia/skia/src/utils/SkDashPathPriv.h
+++ b/gfx/skia/skia/src/utils/SkDashPathPriv.h
@@ -15,11 +15,11 @@ namespace SkDashPath {
      * Calculates the initialDashLength, initialDashIndex, and intervalLength based on the
      * inputed phase and intervals. If adjustedPhase is passed in, then the phase will be
      * adjusted to be between 0 and intervalLength. The result will be stored in adjustedPhase.
-     * If adjustedPhase is NULL then it is assumed phase is already between 0 and intervalLength
+     * If adjustedPhase is nullptr then it is assumed phase is already between 0 and intervalLength
      */
     void CalcDashParameters(SkScalar phase, const SkScalar intervals[], int32_t count,
                             SkScalar* initialDashLength, int32_t* initialDashIndex,
-                            SkScalar* intervalLength, SkScalar* adjustedPhase = NULL);
+                            SkScalar* intervalLength, SkScalar* adjustedPhase = nullptr);
 
     bool FilterDashPath(SkPath* dst, const SkPath& src, SkStrokeRec*, const SkRect*,
                         const SkScalar aIntervals[], int32_t count, SkScalar initialDashLength,
diff --git a/gfx/skia/skia/src/utils/SkDeferredCanvas.cpp b/gfx/skia/skia/src/utils/SkDeferredCanvas.cpp
deleted file mode 100644
index 19957fd81dea..000000000000
--- a/gfx/skia/skia/src/utils/SkDeferredCanvas.cpp
+++ /dev/null
@@ -1,926 +0,0 @@
-
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkDeferredCanvas.h"
-
-#include "SkBitmapDevice.h"
-#include "SkChunkAlloc.h"
-#include "SkColorFilter.h"
-#include "SkDrawFilter.h"
-#include "SkGPipe.h"
-#include "SkPaint.h"
-#include "SkPaintPriv.h"
-#include "SkRRect.h"
-#include "SkShader.h"
-#include "SkSurface.h"
-
-enum {
-    // Deferred canvas will auto-flush when recording reaches this limit
-    kDefaultMaxRecordingStorageBytes = 64*1024*1024,
-    kDeferredCanvasBitmapSizeThreshold = ~0U, // Disables this feature
-};
-
-enum PlaybackMode {
-    kNormal_PlaybackMode,
-    kSilent_PlaybackMode,
-};
-
-static bool should_draw_immediately(const SkBitmap* bitmap, const SkPaint* paint,
-                                    size_t bitmapSizeThreshold) {
-    if (bitmap && ((bitmap->getTexture() && !bitmap->isImmutable()) ||
-        (bitmap->getSize() > bitmapSizeThreshold))) {
-        return true;
-    }
-    if (paint) {
-        SkShader* shader = paint->getShader();
-        // Here we detect the case where the shader is an SkBitmapProcShader
-        // with a gpu texture attached.  Checking this without RTTI
-        // requires making the assumption that only gradient shaders
-        // and SkBitmapProcShader implement asABitmap().  The following
-        // code may need to be revised if that assumption is ever broken.
-        if (shader && !shader->asAGradient(NULL)) {
-            SkBitmap bm;
-            if (shader->asABitmap(&bm, NULL, NULL) &&
-                NULL != bm.getTexture()) {
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-//-----------------------------------------------------------------------------
-// DeferredPipeController
-//-----------------------------------------------------------------------------
-
-class DeferredPipeController : public SkGPipeController {
-public:
-    DeferredPipeController();
-    void setPlaybackCanvas(SkCanvas*);
-    virtual ~DeferredPipeController();
-    virtual void* requestBlock(size_t minRequest, size_t* actual) SK_OVERRIDE;
-    virtual void notifyWritten(size_t bytes) SK_OVERRIDE;
-    void playback(bool silent);
-    bool hasPendingCommands() const { return fAllocator.blockCount() != 0; }
-    size_t storageAllocatedForRecording() const { return fAllocator.totalCapacity(); }
-private:
-    enum {
-        kMinBlockSize = 4096
-    };
-    struct PipeBlock {
-        PipeBlock(void* block, size_t size) { fBlock = block, fSize = size; }
-        void* fBlock;
-        size_t fSize;
-    };
-    void* fBlock;
-    size_t fBytesWritten;
-    SkChunkAlloc fAllocator;
-    SkTDArray<PipeBlock> fBlockList;
-    SkGPipeReader fReader;
-};
-
-DeferredPipeController::DeferredPipeController() :
-    fAllocator(kMinBlockSize) {
-    fBlock = NULL;
-    fBytesWritten = 0;
-}
-
-DeferredPipeController::~DeferredPipeController() {
-    fAllocator.reset();
-}
-
-void DeferredPipeController::setPlaybackCanvas(SkCanvas* canvas) {
-    fReader.setCanvas(canvas);
-}
-
-void* DeferredPipeController::requestBlock(size_t minRequest, size_t *actual) {
-    if (fBlock) {
-        // Save the previous block for later
-        PipeBlock previousBloc(fBlock, fBytesWritten);
-        fBlockList.push(previousBloc);
-    }
-    size_t blockSize = SkTMax<size_t>(minRequest, kMinBlockSize);
-    fBlock = fAllocator.allocThrow(blockSize);
-    fBytesWritten = 0;
-    *actual = blockSize;
-    return fBlock;
-}
-
-void DeferredPipeController::notifyWritten(size_t bytes) {
-    fBytesWritten += bytes;
-}
-
-void DeferredPipeController::playback(bool silent) {
-    uint32_t flags = silent ? SkGPipeReader::kSilent_PlaybackFlag : 0;
-    for (int currentBlock = 0; currentBlock < fBlockList.count(); currentBlock++ ) {
-        fReader.playback(fBlockList[currentBlock].fBlock, fBlockList[currentBlock].fSize,
-                         flags);
-    }
-    fBlockList.reset();
-
-    if (fBlock) {
-        fReader.playback(fBlock, fBytesWritten, flags);
-        fBlock = NULL;
-    }
-
-    // Release all allocated blocks
-    fAllocator.reset();
-}
-
-//-----------------------------------------------------------------------------
-// SkDeferredDevice
-//-----------------------------------------------------------------------------
-class SkDeferredDevice : public SkBaseDevice {
-public:
-    explicit SkDeferredDevice(SkSurface* surface);
-    ~SkDeferredDevice();
-
-    void setNotificationClient(SkDeferredCanvas::NotificationClient* notificationClient);
-    SkCanvas* recordingCanvas();
-    SkCanvas* immediateCanvas() const {return fImmediateCanvas;}
-    SkBaseDevice* immediateDevice() const {return fImmediateCanvas->getTopDevice();}
-    SkImage* newImageSnapshot();
-    void setSurface(SkSurface* surface);
-    bool isFreshFrame();
-    bool hasPendingCommands();
-    size_t storageAllocatedForRecording() const;
-    size_t freeMemoryIfPossible(size_t bytesToFree);
-    void flushPendingCommands(PlaybackMode);
-    void skipPendingCommands();
-    void setMaxRecordingStorage(size_t);
-    void recordedDrawCommand();
-
-    virtual SkImageInfo imageInfo() const SK_OVERRIDE;
-
-    virtual GrRenderTarget* accessRenderTarget() SK_OVERRIDE;
-
-    virtual SkBaseDevice* onCreateDevice(const SkImageInfo&, Usage) SK_OVERRIDE;
-
-    virtual SkSurface* newSurface(const SkImageInfo&) SK_OVERRIDE;
-
-protected:
-    virtual const SkBitmap& onAccessBitmap() SK_OVERRIDE;
-    virtual bool onReadPixels(const SkImageInfo&, void*, size_t, int x, int y) SK_OVERRIDE;
-    virtual bool onWritePixels(const SkImageInfo&, const void*, size_t, int x, int y) SK_OVERRIDE;
-
-    // The following methods are no-ops on a deferred device
-    virtual bool filterTextFlags(const SkPaint& paint, TextFlags*) SK_OVERRIDE {
-        return false;
-    }
-
-    // None of the following drawing methods should ever get called on the
-    // deferred device
-    virtual void clear(SkColor color) SK_OVERRIDE
-        {SkASSERT(0);}
-    virtual void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE
-        {SkASSERT(0);}
-    virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode,
-                            size_t count, const SkPoint[],
-                            const SkPaint& paint) SK_OVERRIDE
-        {SkASSERT(0);}
-    virtual void drawRect(const SkDraw&, const SkRect& r,
-                            const SkPaint& paint) SK_OVERRIDE
-        {SkASSERT(0);}
-    virtual void drawOval(const SkDraw&, const SkRect&, const SkPaint&) SK_OVERRIDE
-        {SkASSERT(0);}
-    virtual void drawRRect(const SkDraw&, const SkRRect& rr,
-                           const SkPaint& paint) SK_OVERRIDE
-    {SkASSERT(0);}
-    virtual void drawPath(const SkDraw&, const SkPath& path,
-                            const SkPaint& paint,
-                            const SkMatrix* prePathMatrix = NULL,
-                            bool pathIsMutable = false) SK_OVERRIDE
-        {SkASSERT(0);}
-    virtual void drawBitmap(const SkDraw&, const SkBitmap& bitmap,
-                            const SkMatrix& matrix, const SkPaint& paint) SK_OVERRIDE
-        {SkASSERT(0);}
-    virtual void drawBitmapRect(const SkDraw&, const SkBitmap&, const SkRect*,
-                                const SkRect&, const SkPaint&,
-                                SkCanvas::DrawBitmapRectFlags) SK_OVERRIDE
-        {SkASSERT(0);}
-    virtual void drawSprite(const SkDraw&, const SkBitmap& bitmap,
-                            int x, int y, const SkPaint& paint) SK_OVERRIDE
-        {SkASSERT(0);}
-    virtual void drawText(const SkDraw&, const void* text, size_t len,
-                            SkScalar x, SkScalar y, const SkPaint& paint) SK_OVERRIDE
-        {SkASSERT(0);}
-    virtual void drawPosText(const SkDraw&, const void* text, size_t len,
-                                const SkScalar pos[], SkScalar constY,
-                                int scalarsPerPos, const SkPaint& paint) SK_OVERRIDE
-        {SkASSERT(0);}
-    virtual void drawTextOnPath(const SkDraw&, const void* text,
-                                size_t len, const SkPath& path,
-                                const SkMatrix* matrix,
-                                const SkPaint& paint) SK_OVERRIDE
-        {SkASSERT(0);}
-    virtual void drawVertices(const SkDraw&, SkCanvas::VertexMode,
-                                int vertexCount, const SkPoint verts[],
-                                const SkPoint texs[], const SkColor colors[],
-                                SkXfermode* xmode, const uint16_t indices[],
-                                int indexCount, const SkPaint& paint) SK_OVERRIDE
-        {SkASSERT(0);}
-    virtual void drawDevice(const SkDraw&, SkBaseDevice*, int x, int y,
-                            const SkPaint&) SK_OVERRIDE
-        {SkASSERT(0);}
-
-    virtual void lockPixels() SK_OVERRIDE {}
-    virtual void unlockPixels() SK_OVERRIDE {}
-
-    virtual bool allowImageFilter(const SkImageFilter*) SK_OVERRIDE {
-        return false;
-    }
-    virtual bool canHandleImageFilter(const SkImageFilter*) SK_OVERRIDE {
-        return false;
-    }
-    virtual bool filterImage(const SkImageFilter*, const SkBitmap&,
-                             const SkImageFilter::Context&, SkBitmap*, SkIPoint*) SK_OVERRIDE {
-        return false;
-    }
-
-private:
-    virtual void flush() SK_OVERRIDE;
-    virtual void replaceBitmapBackendForRasterSurface(const SkBitmap&) SK_OVERRIDE {}
-
-    void beginRecording();
-    void init();
-    void aboutToDraw();
-    void prepareForImmediatePixelWrite();
-
-    DeferredPipeController fPipeController;
-    SkGPipeWriter  fPipeWriter;
-    SkCanvas* fImmediateCanvas;
-    SkCanvas* fRecordingCanvas;
-    SkSurface* fSurface;
-    SkDeferredCanvas::NotificationClient* fNotificationClient;
-    bool fFreshFrame;
-    bool fCanDiscardCanvasContents;
-    size_t fMaxRecordingStorageBytes;
-    size_t fPreviousStorageAllocated;
-};
-
-SkDeferredDevice::SkDeferredDevice(SkSurface* surface) {
-    fMaxRecordingStorageBytes = kDefaultMaxRecordingStorageBytes;
-    fNotificationClient = NULL;
-    fImmediateCanvas = NULL;
-    fSurface = NULL;
-    this->setSurface(surface);
-    this->init();
-}
-
-void SkDeferredDevice::setSurface(SkSurface* surface) {
-    SkRefCnt_SafeAssign(fImmediateCanvas, surface->getCanvas());
-    SkRefCnt_SafeAssign(fSurface, surface);
-    fPipeController.setPlaybackCanvas(fImmediateCanvas);
-}
-
-void SkDeferredDevice::init() {
-    fRecordingCanvas = NULL;
-    fFreshFrame = true;
-    fCanDiscardCanvasContents = false;
-    fPreviousStorageAllocated = 0;
-    fMaxRecordingStorageBytes = kDefaultMaxRecordingStorageBytes;
-    fNotificationClient = NULL;
-    this->beginRecording();
-}
-
-SkDeferredDevice::~SkDeferredDevice() {
-    this->flushPendingCommands(kSilent_PlaybackMode);
-    SkSafeUnref(fImmediateCanvas);
-    SkSafeUnref(fSurface);
-}
-
-void SkDeferredDevice::setMaxRecordingStorage(size_t maxStorage) {
-    fMaxRecordingStorageBytes = maxStorage;
-    this->recordingCanvas(); // Accessing the recording canvas applies the new limit.
-}
-
-void SkDeferredDevice::beginRecording() {
-    SkASSERT(NULL == fRecordingCanvas);
-    fRecordingCanvas = fPipeWriter.startRecording(&fPipeController, 0,
-        immediateDevice()->width(), immediateDevice()->height());
-}
-
-void SkDeferredDevice::setNotificationClient(
-    SkDeferredCanvas::NotificationClient* notificationClient) {
-    fNotificationClient = notificationClient;
-}
-
-void SkDeferredDevice::skipPendingCommands() {
-    if (!fRecordingCanvas->isDrawingToLayer()) {
-        fCanDiscardCanvasContents = true;
-        if (fPipeController.hasPendingCommands()) {
-            fFreshFrame = true;
-            flushPendingCommands(kSilent_PlaybackMode);
-        }
-    }
-}
-
-bool SkDeferredDevice::isFreshFrame() {
-    bool ret = fFreshFrame;
-    fFreshFrame = false;
-    return ret;
-}
-
-bool SkDeferredDevice::hasPendingCommands() {
-    return fPipeController.hasPendingCommands();
-}
-
-void SkDeferredDevice::aboutToDraw()
-{
-    if (NULL != fNotificationClient) {
-        fNotificationClient->prepareForDraw();
-    }
-    if (fCanDiscardCanvasContents) {
-        if (NULL != fSurface) {
-            fSurface->notifyContentWillChange(SkSurface::kDiscard_ContentChangeMode);
-        }
-        fCanDiscardCanvasContents = false;
-    }
-}
-
-void SkDeferredDevice::flushPendingCommands(PlaybackMode playbackMode) {
-    if (!fPipeController.hasPendingCommands()) {
-        return;
-    }
-    if (playbackMode == kNormal_PlaybackMode) {
-        aboutToDraw();
-    }
-    fPipeWriter.flushRecording(true);
-    fPipeController.playback(kSilent_PlaybackMode == playbackMode);
-    if (fNotificationClient) {
-        if (playbackMode == kSilent_PlaybackMode) {
-            fNotificationClient->skippedPendingDrawCommands();
-        } else {
-            fNotificationClient->flushedDrawCommands();
-        }
-    }
-
-    fPreviousStorageAllocated = storageAllocatedForRecording();
-}
-
-void SkDeferredDevice::flush() {
-    this->flushPendingCommands(kNormal_PlaybackMode);
-    fImmediateCanvas->flush();
-}
-
-size_t SkDeferredDevice::freeMemoryIfPossible(size_t bytesToFree) {
-    size_t val = fPipeWriter.freeMemoryIfPossible(bytesToFree);
-    fPreviousStorageAllocated = storageAllocatedForRecording();
-    return val;
-}
-
-size_t SkDeferredDevice::storageAllocatedForRecording() const {
-    return (fPipeController.storageAllocatedForRecording()
-            + fPipeWriter.storageAllocatedForRecording());
-}
-
-void SkDeferredDevice::recordedDrawCommand() {
-    size_t storageAllocated = this->storageAllocatedForRecording();
-
-    if (storageAllocated > fMaxRecordingStorageBytes) {
-        // First, attempt to reduce cache without flushing
-        size_t tryFree = storageAllocated - fMaxRecordingStorageBytes;
-        if (this->freeMemoryIfPossible(tryFree) < tryFree) {
-            // Flush is necessary to free more space.
-            this->flushPendingCommands(kNormal_PlaybackMode);
-            // Free as much as possible to avoid oscillating around fMaxRecordingStorageBytes
-            // which could cause a high flushing frequency.
-            this->freeMemoryIfPossible(~0U);
-        }
-        storageAllocated = this->storageAllocatedForRecording();
-    }
-
-    if (fNotificationClient &&
-        storageAllocated != fPreviousStorageAllocated) {
-        fPreviousStorageAllocated = storageAllocated;
-        fNotificationClient->storageAllocatedForRecordingChanged(storageAllocated);
-    }
-}
-
-SkCanvas* SkDeferredDevice::recordingCanvas() {
-    return fRecordingCanvas;
-}
-
-SkImage* SkDeferredDevice::newImageSnapshot() {
-    this->flush();
-    return fSurface ? fSurface->newImageSnapshot() : NULL;
-}
-
-SkImageInfo SkDeferredDevice::imageInfo() const {
-    return immediateDevice()->imageInfo();
-}
-
-GrRenderTarget* SkDeferredDevice::accessRenderTarget() {
-    this->flushPendingCommands(kNormal_PlaybackMode);
-    return immediateDevice()->accessRenderTarget();
-}
-
-void SkDeferredDevice::prepareForImmediatePixelWrite() {
-    // The purpose of the following code is to make sure commands are flushed, that
-    // aboutToDraw() is called and that notifyContentWillChange is called, without
-    // calling anything redundantly.
-    if (fPipeController.hasPendingCommands()) {
-        this->flushPendingCommands(kNormal_PlaybackMode);
-    } else {
-        bool mustNotifyDirectly = !fCanDiscardCanvasContents;
-        this->aboutToDraw();
-        if (mustNotifyDirectly) {
-            fSurface->notifyContentWillChange(SkSurface::kRetain_ContentChangeMode);
-        }
-    }
-
-    fImmediateCanvas->flush();
-}
-
-bool SkDeferredDevice::onWritePixels(const SkImageInfo& info, const void* pixels, size_t rowBytes,
-                                   int x, int y) {
-    SkASSERT(x >= 0 && y >= 0);
-    SkASSERT(x + info.width() <= width());
-    SkASSERT(y + info.height() <= height());
-
-    this->flushPendingCommands(kNormal_PlaybackMode);
-
-    const SkImageInfo deviceInfo = this->imageInfo();
-    if (info.width() == deviceInfo.width() && info.height() == deviceInfo.height()) {
-        this->skipPendingCommands();
-    }
-
-    this->prepareForImmediatePixelWrite();
-    return immediateDevice()->onWritePixels(info, pixels, rowBytes, x, y);
-}
-
-const SkBitmap& SkDeferredDevice::onAccessBitmap() {
-    this->flushPendingCommands(kNormal_PlaybackMode);
-    return immediateDevice()->accessBitmap(false);
-}
-
-SkBaseDevice* SkDeferredDevice::onCreateDevice(const SkImageInfo& info, Usage usage) {
-    // Save layer usage not supported, and not required by SkDeferredCanvas.
-    SkASSERT(usage != kSaveLayer_Usage);
-    // Create a compatible non-deferred device.
-    // We do not create a deferred device because we know the new device
-    // will not be used with a deferred canvas (there is no API for that).
-    // And connecting a SkDeferredDevice to non-deferred canvas can result
-    // in unpredictable behavior.
-    return immediateDevice()->createCompatibleDevice(info);
-}
-
-SkSurface* SkDeferredDevice::newSurface(const SkImageInfo& info) {
-    return this->immediateDevice()->newSurface(info);
-}
-
-bool SkDeferredDevice::onReadPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
-                                    int x, int y) {
-    this->flushPendingCommands(kNormal_PlaybackMode);
-    return fImmediateCanvas->readPixels(info, pixels, rowBytes, x, y);
-}
-
-class AutoImmediateDrawIfNeeded {
-public:
-    AutoImmediateDrawIfNeeded(SkDeferredCanvas& canvas, const SkBitmap* bitmap,
-                              const SkPaint* paint) {
-        this->init(canvas, bitmap, paint);
-    }
-
-    AutoImmediateDrawIfNeeded(SkDeferredCanvas& canvas, const SkPaint* paint) {
-        this->init(canvas, NULL, paint);
-    }
-
-    ~AutoImmediateDrawIfNeeded() {
-        if (fCanvas) {
-            fCanvas->setDeferredDrawing(true);
-        }
-    }
-private:
-    void init(SkDeferredCanvas& canvas, const SkBitmap* bitmap, const SkPaint* paint) {
-        if (canvas.isDeferredDrawing() &&
-            should_draw_immediately(bitmap, paint, canvas.getBitmapSizeThreshold())) {
-            canvas.setDeferredDrawing(false);
-            fCanvas = &canvas;
-        } else {
-            fCanvas = NULL;
-        }
-    }
-
-    SkDeferredCanvas* fCanvas;
-};
-
-SkDeferredCanvas* SkDeferredCanvas::Create(SkSurface* surface) {
-    SkAutoTUnref<SkDeferredDevice> deferredDevice(SkNEW_ARGS(SkDeferredDevice, (surface)));
-    return SkNEW_ARGS(SkDeferredCanvas, (deferredDevice));
-}
-
-SkDeferredCanvas::SkDeferredCanvas(SkDeferredDevice* device) : SkCanvas (device) {
-    this->init();
-}
-
-void SkDeferredCanvas::init() {
-    fBitmapSizeThreshold = kDeferredCanvasBitmapSizeThreshold;
-    fDeferredDrawing = true; // On by default
-}
-
-void SkDeferredCanvas::setMaxRecordingStorage(size_t maxStorage) {
-    this->validate();
-    this->getDeferredDevice()->setMaxRecordingStorage(maxStorage);
-}
-
-size_t SkDeferredCanvas::storageAllocatedForRecording() const {
-    return this->getDeferredDevice()->storageAllocatedForRecording();
-}
-
-size_t SkDeferredCanvas::freeMemoryIfPossible(size_t bytesToFree) {
-    return this->getDeferredDevice()->freeMemoryIfPossible(bytesToFree);
-}
-
-void SkDeferredCanvas::setBitmapSizeThreshold(size_t sizeThreshold) {
-    fBitmapSizeThreshold = sizeThreshold;
-}
-
-void SkDeferredCanvas::recordedDrawCommand() {
-    if (fDeferredDrawing) {
-        this->getDeferredDevice()->recordedDrawCommand();
-    }
-}
-
-void SkDeferredCanvas::validate() const {
-    SkASSERT(this->getDevice());
-}
-
-SkCanvas* SkDeferredCanvas::drawingCanvas() const {
-    this->validate();
-    return fDeferredDrawing ? this->getDeferredDevice()->recordingCanvas() :
-        this->getDeferredDevice()->immediateCanvas();
-}
-
-SkCanvas* SkDeferredCanvas::immediateCanvas() const {
-    this->validate();
-    return this->getDeferredDevice()->immediateCanvas();
-}
-
-SkDeferredDevice* SkDeferredCanvas::getDeferredDevice() const {
-    return static_cast<SkDeferredDevice*>(this->getDevice());
-}
-
-void SkDeferredCanvas::setDeferredDrawing(bool val) {
-    this->validate(); // Must set device before calling this method
-    if (val != fDeferredDrawing) {
-        if (fDeferredDrawing) {
-            // Going live.
-            this->getDeferredDevice()->flushPendingCommands(kNormal_PlaybackMode);
-        }
-        fDeferredDrawing = val;
-    }
-}
-
-bool SkDeferredCanvas::isDeferredDrawing() const {
-    return fDeferredDrawing;
-}
-
-bool SkDeferredCanvas::isFreshFrame() const {
-    return this->getDeferredDevice()->isFreshFrame();
-}
-
-bool SkDeferredCanvas::hasPendingCommands() const {
-    return this->getDeferredDevice()->hasPendingCommands();
-}
-
-void SkDeferredCanvas::silentFlush() {
-    if (fDeferredDrawing) {
-        this->getDeferredDevice()->flushPendingCommands(kSilent_PlaybackMode);
-    }
-}
-
-SkDeferredCanvas::~SkDeferredCanvas() {
-}
-
-SkSurface* SkDeferredCanvas::setSurface(SkSurface* surface) {
-    SkDeferredDevice* deferredDevice = this->getDeferredDevice();
-    SkASSERT(NULL != deferredDevice);
-    // By swapping the surface into the existing device, we preserve
-    // all pending commands, which can help to seamlessly recover from
-    // a lost accelerated graphics context.
-    deferredDevice->setSurface(surface);
-    return surface;
-}
-
-SkDeferredCanvas::NotificationClient* SkDeferredCanvas::setNotificationClient(
-    NotificationClient* notificationClient) {
-
-    SkDeferredDevice* deferredDevice = this->getDeferredDevice();
-    SkASSERT(deferredDevice);
-    if (deferredDevice) {
-        deferredDevice->setNotificationClient(notificationClient);
-    }
-    return notificationClient;
-}
-
-SkImage* SkDeferredCanvas::newImageSnapshot() {
-    SkDeferredDevice* deferredDevice = this->getDeferredDevice();
-    SkASSERT(deferredDevice);
-    return deferredDevice ? deferredDevice->newImageSnapshot() : NULL;
-}
-
-bool SkDeferredCanvas::isFullFrame(const SkRect* rect,
-                                   const SkPaint* paint) const {
-    SkCanvas* canvas = this->drawingCanvas();
-    SkISize canvasSize = this->getDeviceSize();
-    if (rect) {
-        if (!canvas->getTotalMatrix().rectStaysRect()) {
-            return false; // conservative
-        }
-
-        SkRect transformedRect;
-        canvas->getTotalMatrix().mapRect(&transformedRect, *rect);
-
-        if (paint) {
-            SkPaint::Style paintStyle = paint->getStyle();
-            if (!(paintStyle == SkPaint::kFill_Style ||
-                paintStyle == SkPaint::kStrokeAndFill_Style)) {
-                return false;
-            }
-            if (paint->getMaskFilter() || paint->getLooper()
-                || paint->getPathEffect() || paint->getImageFilter()) {
-                return false; // conservative
-            }
-        }
-
-        // The following test holds with AA enabled, and is conservative
-        // by a 0.5 pixel margin with AA disabled
-        if (transformedRect.fLeft > SkIntToScalar(0) ||
-            transformedRect.fTop > SkIntToScalar(0) ||
-            transformedRect.fRight < SkIntToScalar(canvasSize.fWidth) ||
-            transformedRect.fBottom < SkIntToScalar(canvasSize.fHeight)) {
-            return false;
-        }
-    }
-
-    return this->getClipStack()->quickContains(SkRect::MakeXYWH(0, 0,
-        SkIntToScalar(canvasSize.fWidth), SkIntToScalar(canvasSize.fHeight)));
-}
-
-void SkDeferredCanvas::willSave() {
-    this->drawingCanvas()->save();
-    this->recordedDrawCommand();
-    this->INHERITED::willSave();
-}
-
-SkCanvas::SaveLayerStrategy SkDeferredCanvas::willSaveLayer(const SkRect* bounds,
-                                                            const SkPaint* paint, SaveFlags flags) {
-    this->drawingCanvas()->saveLayer(bounds, paint, flags);
-    this->recordedDrawCommand();
-    this->INHERITED::willSaveLayer(bounds, paint, flags);
-    // No need for a full layer.
-    return kNoLayer_SaveLayerStrategy;
-}
-
-void SkDeferredCanvas::willRestore() {
-    this->drawingCanvas()->restore();
-    this->recordedDrawCommand();
-    this->INHERITED::willRestore();
-}
-
-bool SkDeferredCanvas::isDrawingToLayer() const {
-    return this->drawingCanvas()->isDrawingToLayer();
-}
-
-void SkDeferredCanvas::didConcat(const SkMatrix& matrix) {
-    this->drawingCanvas()->concat(matrix);
-    this->recordedDrawCommand();
-    this->INHERITED::didConcat(matrix);
-}
-
-void SkDeferredCanvas::didSetMatrix(const SkMatrix& matrix) {
-    this->drawingCanvas()->setMatrix(matrix);
-    this->recordedDrawCommand();
-    this->INHERITED::didSetMatrix(matrix);
-}
-
-void SkDeferredCanvas::onClipRect(const SkRect& rect,
-                                  SkRegion::Op op,
-                                  ClipEdgeStyle edgeStyle) {
-    this->drawingCanvas()->clipRect(rect, op, kSoft_ClipEdgeStyle == edgeStyle);
-    this->INHERITED::onClipRect(rect, op, edgeStyle);
-    this->recordedDrawCommand();
-}
-
-void SkDeferredCanvas::onClipRRect(const SkRRect& rrect,
-                                   SkRegion::Op op,
-                                   ClipEdgeStyle edgeStyle) {
-    this->drawingCanvas()->clipRRect(rrect, op, kSoft_ClipEdgeStyle == edgeStyle);
-    this->INHERITED::onClipRRect(rrect, op, edgeStyle);
-    this->recordedDrawCommand();
-}
-
-void SkDeferredCanvas::onClipPath(const SkPath& path,
-                                  SkRegion::Op op,
-                                  ClipEdgeStyle edgeStyle) {
-    this->drawingCanvas()->clipPath(path, op, kSoft_ClipEdgeStyle == edgeStyle);
-    this->INHERITED::onClipPath(path, op, edgeStyle);
-    this->recordedDrawCommand();
-}
-
-void SkDeferredCanvas::onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) {
-    this->drawingCanvas()->clipRegion(deviceRgn, op);
-    this->INHERITED::onClipRegion(deviceRgn, op);
-    this->recordedDrawCommand();
-}
-
-void SkDeferredCanvas::clear(SkColor color) {
-    // purge pending commands
-    if (fDeferredDrawing) {
-        this->getDeferredDevice()->skipPendingCommands();
-    }
-
-    this->drawingCanvas()->clear(color);
-    this->recordedDrawCommand();
-}
-
-void SkDeferredCanvas::drawPaint(const SkPaint& paint) {
-    if (fDeferredDrawing && this->isFullFrame(NULL, &paint) &&
-        isPaintOpaque(&paint)) {
-        this->getDeferredDevice()->skipPendingCommands();
-    }
-    AutoImmediateDrawIfNeeded autoDraw(*this, &paint);
-    this->drawingCanvas()->drawPaint(paint);
-    this->recordedDrawCommand();
-}
-
-void SkDeferredCanvas::drawPoints(PointMode mode, size_t count,
-                                  const SkPoint pts[], const SkPaint& paint) {
-    AutoImmediateDrawIfNeeded autoDraw(*this, &paint);
-    this->drawingCanvas()->drawPoints(mode, count, pts, paint);
-    this->recordedDrawCommand();
-}
-
-void SkDeferredCanvas::drawOval(const SkRect& rect, const SkPaint& paint) {
-    AutoImmediateDrawIfNeeded autoDraw(*this, &paint);
-    this->drawingCanvas()->drawOval(rect, paint);
-    this->recordedDrawCommand();
-}
-
-void SkDeferredCanvas::drawRect(const SkRect& rect, const SkPaint& paint) {
-    if (fDeferredDrawing && this->isFullFrame(&rect, &paint) &&
-        isPaintOpaque(&paint)) {
-        this->getDeferredDevice()->skipPendingCommands();
-    }
-
-    AutoImmediateDrawIfNeeded autoDraw(*this, &paint);
-    this->drawingCanvas()->drawRect(rect, paint);
-    this->recordedDrawCommand();
-}
-
-void SkDeferredCanvas::drawRRect(const SkRRect& rrect, const SkPaint& paint) {
-    if (rrect.isRect()) {
-        this->SkDeferredCanvas::drawRect(rrect.getBounds(), paint);
-    } else if (rrect.isOval()) {
-        this->SkDeferredCanvas::drawOval(rrect.getBounds(), paint);
-    } else {
-        AutoImmediateDrawIfNeeded autoDraw(*this, &paint);
-        this->drawingCanvas()->drawRRect(rrect, paint);
-        this->recordedDrawCommand();
-    }
-}
-
-void SkDeferredCanvas::onDrawDRRect(const SkRRect& outer, const SkRRect& inner,
-                                    const SkPaint& paint) {
-    AutoImmediateDrawIfNeeded autoDraw(*this, &paint);
-    this->drawingCanvas()->drawDRRect(outer, inner, paint);
-    this->recordedDrawCommand();
-}
-
-void SkDeferredCanvas::drawPath(const SkPath& path, const SkPaint& paint) {
-    AutoImmediateDrawIfNeeded autoDraw(*this, &paint);
-    this->drawingCanvas()->drawPath(path, paint);
-    this->recordedDrawCommand();
-}
-
-void SkDeferredCanvas::drawBitmap(const SkBitmap& bitmap, SkScalar left,
-                                  SkScalar top, const SkPaint* paint) {
-    SkRect bitmapRect = SkRect::MakeXYWH(left, top,
-        SkIntToScalar(bitmap.width()), SkIntToScalar(bitmap.height()));
-    if (fDeferredDrawing &&
-        this->isFullFrame(&bitmapRect, paint) &&
-        isPaintOpaque(paint, &bitmap)) {
-        this->getDeferredDevice()->skipPendingCommands();
-    }
-
-    AutoImmediateDrawIfNeeded autoDraw(*this, &bitmap, paint);
-    this->drawingCanvas()->drawBitmap(bitmap, left, top, paint);
-    this->recordedDrawCommand();
-}
-
-void SkDeferredCanvas::drawBitmapRectToRect(const SkBitmap& bitmap,
-                                            const SkRect* src,
-                                            const SkRect& dst,
-                                            const SkPaint* paint,
-                                            DrawBitmapRectFlags flags) {
-    if (fDeferredDrawing &&
-        this->isFullFrame(&dst, paint) &&
-        isPaintOpaque(paint, &bitmap)) {
-        this->getDeferredDevice()->skipPendingCommands();
-    }
-
-    AutoImmediateDrawIfNeeded autoDraw(*this, &bitmap, paint);
-    this->drawingCanvas()->drawBitmapRectToRect(bitmap, src, dst, paint, flags);
-    this->recordedDrawCommand();
-}
-
-
-void SkDeferredCanvas::drawBitmapMatrix(const SkBitmap& bitmap,
-                                        const SkMatrix& m,
-                                        const SkPaint* paint) {
-    // TODO: reset recording canvas if paint+bitmap is opaque and clip rect
-    // covers canvas entirely and transformed bitmap covers canvas entirely
-    AutoImmediateDrawIfNeeded autoDraw(*this, &bitmap, paint);
-    this->drawingCanvas()->drawBitmapMatrix(bitmap, m, paint);
-    this->recordedDrawCommand();
-}
-
-void SkDeferredCanvas::drawBitmapNine(const SkBitmap& bitmap,
-                                      const SkIRect& center, const SkRect& dst,
-                                      const SkPaint* paint) {
-    // TODO: reset recording canvas if paint+bitmap is opaque and clip rect
-    // covers canvas entirely and dst covers canvas entirely
-    AutoImmediateDrawIfNeeded autoDraw(*this, &bitmap, paint);
-    this->drawingCanvas()->drawBitmapNine(bitmap, center, dst, paint);
-    this->recordedDrawCommand();
-}
-
-void SkDeferredCanvas::drawSprite(const SkBitmap& bitmap, int left, int top,
-                                  const SkPaint* paint) {
-    SkRect bitmapRect = SkRect::MakeXYWH(
-        SkIntToScalar(left),
-        SkIntToScalar(top),
-        SkIntToScalar(bitmap.width()),
-        SkIntToScalar(bitmap.height()));
-    if (fDeferredDrawing &&
-        this->isFullFrame(&bitmapRect, paint) &&
-        isPaintOpaque(paint, &bitmap)) {
-        this->getDeferredDevice()->skipPendingCommands();
-    }
-
-    AutoImmediateDrawIfNeeded autoDraw(*this, &bitmap, paint);
-    this->drawingCanvas()->drawSprite(bitmap, left, top, paint);
-    this->recordedDrawCommand();
-}
-
-void SkDeferredCanvas::onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
-                                  const SkPaint& paint) {
-    AutoImmediateDrawIfNeeded autoDraw(*this, &paint);
-    this->drawingCanvas()->drawText(text, byteLength, x, y, paint);
-    this->recordedDrawCommand();
-}
-
-void SkDeferredCanvas::onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
-                                     const SkPaint& paint) {
-    AutoImmediateDrawIfNeeded autoDraw(*this, &paint);
-    this->drawingCanvas()->drawPosText(text, byteLength, pos, paint);
-    this->recordedDrawCommand();
-}
-
-void SkDeferredCanvas::onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
-                                      SkScalar constY, const SkPaint& paint) {
-    AutoImmediateDrawIfNeeded autoDraw(*this, &paint);
-    this->drawingCanvas()->drawPosTextH(text, byteLength, xpos, constY, paint);
-    this->recordedDrawCommand();
-}
-
-void SkDeferredCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
-                                        const SkMatrix* matrix, const SkPaint& paint) {
-    AutoImmediateDrawIfNeeded autoDraw(*this, &paint);
-    this->drawingCanvas()->drawTextOnPath(text, byteLength, path, matrix, paint);
-    this->recordedDrawCommand();
-}
-
-void SkDeferredCanvas::onDrawPicture(const SkPicture* picture) {
-    this->drawingCanvas()->drawPicture(picture);
-    this->recordedDrawCommand();
-}
-
-void SkDeferredCanvas::drawVertices(VertexMode vmode, int vertexCount,
-                                    const SkPoint vertices[],
-                                    const SkPoint texs[],
-                                    const SkColor colors[], SkXfermode* xmode,
-                                    const uint16_t indices[], int indexCount,
-                                    const SkPaint& paint) {
-    AutoImmediateDrawIfNeeded autoDraw(*this, &paint);
-    this->drawingCanvas()->drawVertices(vmode, vertexCount, vertices, texs, colors, xmode,
-                                        indices, indexCount, paint);
-    this->recordedDrawCommand();
-}
-
-SkDrawFilter* SkDeferredCanvas::setDrawFilter(SkDrawFilter* filter) {
-    this->drawingCanvas()->setDrawFilter(filter);
-    this->INHERITED::setDrawFilter(filter);
-    this->recordedDrawCommand();
-    return filter;
-}
-
-SkCanvas* SkDeferredCanvas::canvasForDrawIter() {
-    return this->drawingCanvas();
-}
diff --git a/gfx/skia/skia/src/utils/SkDumpCanvas.cpp b/gfx/skia/skia/src/utils/SkDumpCanvas.cpp
index b12928fbbb9e..8d0209d96422 100644
--- a/gfx/skia/skia/src/utils/SkDumpCanvas.cpp
+++ b/gfx/skia/skia/src/utils/SkDumpCanvas.cpp
@@ -9,10 +9,12 @@
 #include "SkDumpCanvas.h"
 
 #ifdef SK_DEVELOPER
+#include "SkPatchUtils.h"
 #include "SkPicture.h"
 #include "SkPixelRef.h"
 #include "SkRRect.h"
 #include "SkString.h"
+#include "SkTextBlob.h"
 #include <stdarg.h>
 #include <stdio.h>
 
@@ -193,7 +195,7 @@ void SkDumpCanvas::dump(Verb verb, const SkPaint* paint,
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkDumpCanvas::willSave() {
-    this->dump(kSave_Verb, NULL, "save()");
+    this->dump(kSave_Verb, nullptr, "save()");
     this->INHERITED::willSave();
 }
 
@@ -218,7 +220,7 @@ SkCanvas::SaveLayerStrategy SkDumpCanvas::willSaveLayer(const SkRect* bounds, co
 }
 
 void SkDumpCanvas::willRestore() {
-    this->dump(kRestore_Verb, NULL, "restore");
+    this->dump(kRestore_Verb, nullptr, "restore");
     this->INHERITED::willRestore();
 }
 
@@ -227,18 +229,18 @@ void SkDumpCanvas::didConcat(const SkMatrix& matrix) {
 
     switch (matrix.getType()) {
         case SkMatrix::kTranslate_Mask:
-            this->dump(kMatrix_Verb, NULL, "translate(%g %g)",
+            this->dump(kMatrix_Verb, nullptr, "translate(%g %g)",
                        SkScalarToFloat(matrix.getTranslateX()),
                        SkScalarToFloat(matrix.getTranslateY()));
             break;
         case SkMatrix::kScale_Mask:
-            this->dump(kMatrix_Verb, NULL, "scale(%g %g)",
+            this->dump(kMatrix_Verb, nullptr, "scale(%g %g)",
                        SkScalarToFloat(matrix.getScaleX()),
                        SkScalarToFloat(matrix.getScaleY()));
             break;
         default:
             matrix.toString(&str);
-            this->dump(kMatrix_Verb, NULL, "concat(%s)", str.c_str());
+            this->dump(kMatrix_Verb, nullptr, "concat(%s)", str.c_str());
             break;
     }
 
@@ -248,7 +250,7 @@ void SkDumpCanvas::didConcat(const SkMatrix& matrix) {
 void SkDumpCanvas::didSetMatrix(const SkMatrix& matrix) {
     SkString str;
     matrix.toString(&str);
-    this->dump(kMatrix_Verb, NULL, "setMatrix(%s)", str.c_str());
+    this->dump(kMatrix_Verb, nullptr, "setMatrix(%s)", str.c_str());
     this->INHERITED::didSetMatrix(matrix);
 }
 
@@ -261,7 +263,7 @@ const char* SkDumpCanvas::EdgeStyleToAAString(ClipEdgeStyle edgeStyle) {
 void SkDumpCanvas::onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
     SkString str;
     toString(rect, &str);
-    this->dump(kClip_Verb, NULL, "clipRect(%s %s %s)", str.c_str(), toString(op),
+    this->dump(kClip_Verb, nullptr, "clipRect(%s %s %s)", str.c_str(), toString(op),
                EdgeStyleToAAString(edgeStyle));
     this->INHERITED::onClipRect(rect, op, edgeStyle);
 }
@@ -269,7 +271,7 @@ void SkDumpCanvas::onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle
 void SkDumpCanvas::onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
     SkString str;
     toString(rrect, &str);
-    this->dump(kClip_Verb, NULL, "clipRRect(%s %s %s)", str.c_str(), toString(op),
+    this->dump(kClip_Verb, nullptr, "clipRRect(%s %s %s)", str.c_str(), toString(op),
                EdgeStyleToAAString(edgeStyle));
     this->INHERITED::onClipRRect(rrect, op, edgeStyle);
 }
@@ -277,7 +279,7 @@ void SkDumpCanvas::onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeSt
 void SkDumpCanvas::onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
     SkString str;
     toString(path, &str);
-    this->dump(kClip_Verb, NULL, "clipPath(%s %s %s)", str.c_str(), toString(op),
+    this->dump(kClip_Verb, nullptr, "clipPath(%s %s %s)", str.c_str(), toString(op),
                EdgeStyleToAAString(edgeStyle));
     this->INHERITED::onClipPath(path, op, edgeStyle);
 }
@@ -285,45 +287,36 @@ void SkDumpCanvas::onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle
 void SkDumpCanvas::onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) {
     SkString str;
     toString(deviceRgn, &str);
-    this->dump(kClip_Verb, NULL, "clipRegion(%s %s)", str.c_str(),
+    this->dump(kClip_Verb, nullptr, "clipRegion(%s %s)", str.c_str(),
                toString(op));
     this->INHERITED::onClipRegion(deviceRgn, op);
 }
 
-void SkDumpCanvas::onPushCull(const SkRect& cullRect) {
-    SkString str;
-    toString(cullRect, &str);
-    this->dump(kCull_Verb, NULL, "pushCull(%s)", str.c_str());
-}
-
-void SkDumpCanvas::onPopCull() {
-    this->dump(kCull_Verb, NULL, "popCull()");
-}
 ///////////////////////////////////////////////////////////////////////////////
 
-void SkDumpCanvas::drawPaint(const SkPaint& paint) {
+void SkDumpCanvas::onDrawPaint(const SkPaint& paint) {
     this->dump(kDrawPaint_Verb, &paint, "drawPaint()");
 }
 
-void SkDumpCanvas::drawPoints(PointMode mode, size_t count,
+void SkDumpCanvas::onDrawPoints(PointMode mode, size_t count,
                                const SkPoint pts[], const SkPaint& paint) {
     this->dump(kDrawPoints_Verb, &paint, "drawPoints(%s, %d)", toString(mode),
                count);
 }
 
-void SkDumpCanvas::drawOval(const SkRect& rect, const SkPaint& paint) {
+void SkDumpCanvas::onDrawOval(const SkRect& rect, const SkPaint& paint) {
     SkString str;
     toString(rect, &str);
     this->dump(kDrawOval_Verb, &paint, "drawOval(%s)", str.c_str());
 }
 
-void SkDumpCanvas::drawRect(const SkRect& rect, const SkPaint& paint) {
+void SkDumpCanvas::onDrawRect(const SkRect& rect, const SkPaint& paint) {
     SkString str;
     toString(rect, &str);
     this->dump(kDrawRect_Verb, &paint, "drawRect(%s)", str.c_str());
 }
 
-void SkDumpCanvas::drawRRect(const SkRRect& rrect, const SkPaint& paint) {
+void SkDumpCanvas::onDrawRRect(const SkRRect& rrect, const SkPaint& paint) {
     SkString str;
     toString(rrect, &str);
     this->dump(kDrawDRRect_Verb, &paint, "drawRRect(%s)", str.c_str());
@@ -338,23 +331,22 @@ void SkDumpCanvas::onDrawDRRect(const SkRRect& outer, const SkRRect& inner,
                str0.c_str(), str1.c_str());
 }
 
-void SkDumpCanvas::drawPath(const SkPath& path, const SkPaint& paint) {
+void SkDumpCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) {
     SkString str;
     toString(path, &str);
     this->dump(kDrawPath_Verb, &paint, "drawPath(%s)", str.c_str());
 }
 
-void SkDumpCanvas::drawBitmap(const SkBitmap& bitmap, SkScalar x, SkScalar y,
-                               const SkPaint* paint) {
+void SkDumpCanvas::onDrawBitmap(const SkBitmap& bitmap, SkScalar x, SkScalar y,
+                                const SkPaint* paint) {
     SkString str;
     bitmap.toString(&str);
     this->dump(kDrawBitmap_Verb, paint, "drawBitmap(%s %g %g)", str.c_str(),
                SkScalarToFloat(x), SkScalarToFloat(y));
 }
 
-void SkDumpCanvas::drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src,
-                                        const SkRect& dst, const SkPaint* paint,
-                                        DrawBitmapRectFlags flags) {
+void SkDumpCanvas::onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst,
+                                    const SkPaint* paint, SrcRectConstraint) {
     SkString bs, rs;
     bitmap.toString(&bs);
     toString(dst, &rs);
@@ -367,21 +359,45 @@ void SkDumpCanvas::drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* sr
         rs.prependf("%s ", ss.c_str());
     }
 
-    this->dump(kDrawBitmap_Verb, paint, "drawBitmapRectToRect(%s %s)",
+    this->dump(kDrawBitmap_Verb, paint, "drawBitmapRect(%s %s)", bs.c_str(), rs.c_str());
+}
+
+void SkDumpCanvas::onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
+                                    const SkRect& dst, const SkPaint* paint) {
+    SkString str, centerStr, dstStr;
+    bitmap.toString(&str);
+    toString(center, &centerStr);
+    toString(dst, &dstStr);
+    this->dump(kDrawBitmap_Verb, paint, "drawBitmapNine(%s %s %s)", str.c_str(),
+               centerStr.c_str(), dstStr.c_str());
+}
+
+void SkDumpCanvas::onDrawImage(const SkImage* image, SkScalar x, SkScalar y, const SkPaint* paint) {
+    SkString str;
+    image->toString(&str);
+    this->dump(kDrawBitmap_Verb, paint, "drawImage(%s %g %g)", str.c_str(),
+               SkScalarToFloat(x), SkScalarToFloat(y));
+}
+
+void SkDumpCanvas::onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
+                                   const SkPaint* paint, SrcRectConstraint) {
+    SkString bs, rs;
+    image->toString(&bs);
+    toString(dst, &rs);
+    // show the src-rect only if its not everything
+    if (src && (src->fLeft > 0 || src->fTop > 0 ||
+                src->fRight < SkIntToScalar(image->width()) ||
+                src->fBottom < SkIntToScalar(image->height()))) {
+        SkString ss;
+        toString(*src, &ss);
+        rs.prependf("%s ", ss.c_str());
+    }
+    
+    this->dump(kDrawBitmap_Verb, paint, "drawImageRectToRect(%s %s)",
                bs.c_str(), rs.c_str());
 }
 
-void SkDumpCanvas::drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m,
-                                     const SkPaint* paint) {
-    SkString bs, ms;
-    bitmap.toString(&bs);
-    m.toString(&ms);
-    this->dump(kDrawBitmap_Verb, paint, "drawBitmapMatrix(%s %s)",
-               bs.c_str(), ms.c_str());
-}
-
-void SkDumpCanvas::drawSprite(const SkBitmap& bitmap, int x, int y,
-                               const SkPaint* paint) {
+void SkDumpCanvas::onDrawSprite(const SkBitmap& bitmap, int x, int y, const SkPaint* paint) {
     SkString str;
     bitmap.toString(&str);
     this->dump(kDrawBitmap_Verb, paint, "drawSprite(%s %d %d)", str.c_str(),
@@ -422,42 +438,55 @@ void SkDumpCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const S
                str.c_str(), byteLength);
 }
 
-void SkDumpCanvas::onDrawPicture(const SkPicture* picture) {
-    this->dump(kDrawPicture_Verb, NULL, "drawPicture(%p) %d:%d", picture,
-               picture->width(), picture->height());
-    fNestLevel += 1;
-    this->INHERITED::onDrawPicture(picture);
-    fNestLevel -= 1;
-    this->dump(kDrawPicture_Verb, NULL, "endPicture(%p) %d:%d", &picture,
-               picture->width(), picture->height());
+void SkDumpCanvas::onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
+                                  const SkPaint& paint) {
+    SkString str;
+    toString(blob->bounds(), &str);
+    this->dump(kDrawText_Verb, &paint, "drawTextBlob(%p) [%s]", blob, str.c_str());
+    // FIXME: dump the actual blob content?
 }
 
-void SkDumpCanvas::drawVertices(VertexMode vmode, int vertexCount,
-                                 const SkPoint vertices[], const SkPoint texs[],
-                                 const SkColor colors[], SkXfermode* xmode,
-                                 const uint16_t indices[], int indexCount,
-                                 const SkPaint& paint) {
+void SkDumpCanvas::onDrawPicture(const SkPicture* picture, const SkMatrix* matrix,
+                                 const SkPaint* paint) {
+    this->dump(kDrawPicture_Verb, nullptr, "drawPicture(%p) %f:%f:%f:%f", picture,
+               picture->cullRect().fLeft, picture->cullRect().fTop,
+               picture->cullRect().fRight, picture->cullRect().fBottom);
+    fNestLevel += 1;
+    this->INHERITED::onDrawPicture(picture, matrix, paint);
+    fNestLevel -= 1;
+    this->dump(kDrawPicture_Verb, nullptr, "endPicture(%p) %f:%f:%f:%f", &picture,
+               picture->cullRect().fLeft, picture->cullRect().fTop,
+               picture->cullRect().fRight, picture->cullRect().fBottom);
+}
+
+void SkDumpCanvas::onDrawVertices(VertexMode vmode, int vertexCount,
+                                  const SkPoint vertices[], const SkPoint texs[],
+                                  const SkColor colors[], SkXfermode* xmode,
+                                  const uint16_t indices[], int indexCount,
+                                  const SkPaint& paint) {
     this->dump(kDrawVertices_Verb, &paint, "drawVertices(%s [%d] %g %g ...)",
                toString(vmode), vertexCount, SkScalarToFloat(vertices[0].fX),
                SkScalarToFloat(vertices[0].fY));
 }
 
-void SkDumpCanvas::drawData(const void* data, size_t length) {
-//    this->dump(kDrawData_Verb, NULL, "drawData(%d)", length);
-    this->dump(kDrawData_Verb, NULL, "drawData(%d) %.*s", length,
-               SkTMin<size_t>(length, 64), data);
-}
-
-void SkDumpCanvas::beginCommentGroup(const char* description) {
-    this->dump(kBeginCommentGroup_Verb, NULL, "beginCommentGroup(%s)", description);
-}
-
-void SkDumpCanvas::addComment(const char* kywd, const char* value) {
-    this->dump(kAddComment_Verb, NULL, "addComment(%s, %s)", kywd, value);
-}
-
-void SkDumpCanvas::endCommentGroup() {
-    this->dump(kEndCommentGroup_Verb, NULL, "endCommentGroup()");
+void SkDumpCanvas::onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
+                               const SkPoint texCoords[4], SkXfermode* xmode,
+                               const SkPaint& paint) {
+    //dumps corner points and colors in clockwise order starting on upper-left corner
+    this->dump(kDrawPatch_Verb, &paint, "drawPatch(Vertices{[%f, %f], [%f, %f], [%f, %f], [%f, %f]}\
+              | Colors{[0x%x], [0x%x], [0x%x], [0x%x]} | TexCoords{[%f,%f], [%f,%f], [%f,%f], \
+               [%f,%f]})",
+              cubics[SkPatchUtils::kTopP0_CubicCtrlPts].fX,
+              cubics[SkPatchUtils::kTopP0_CubicCtrlPts].fY,
+              cubics[SkPatchUtils::kTopP3_CubicCtrlPts].fX,
+              cubics[SkPatchUtils::kTopP3_CubicCtrlPts].fY,
+              cubics[SkPatchUtils::kBottomP3_CubicCtrlPts].fX,
+              cubics[SkPatchUtils::kBottomP3_CubicCtrlPts].fY,
+              cubics[SkPatchUtils::kBottomP0_CubicCtrlPts].fX,
+              cubics[SkPatchUtils::kBottomP0_CubicCtrlPts].fY,
+              colors[0], colors[1], colors[2], colors[3],
+              texCoords[0].x(), texCoords[0].y(), texCoords[1].x(), texCoords[1].y(),
+              texCoords[2].x(), texCoords[2].y(), texCoords[3].x(), texCoords[3].y());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -523,6 +552,6 @@ static void dumpToDebugf(const char text[], void*) {
     SkDebugf("%s\n", text);
 }
 
-SkDebugfDumper::SkDebugfDumper() : INHERITED(dumpToDebugf, NULL) {}
+SkDebugfDumper::SkDebugfDumper() : INHERITED(dumpToDebugf, nullptr) {}
 
 #endif
diff --git a/gfx/skia/skia/src/utils/SkEventTracer.cpp b/gfx/skia/skia/src/utils/SkEventTracer.cpp
index 65e837239595..32a0207c23eb 100644
--- a/gfx/skia/skia/src/utils/SkEventTracer.cpp
+++ b/gfx/skia/skia/src/utils/SkEventTracer.cpp
@@ -5,11 +5,14 @@
  * found in the LICENSE file.
  */
 
+#include "SkAtomics.h"
 #include "SkEventTracer.h"
-#include "SkOnce.h"
+#include "SkOncePtr.h"
 
-class SkDefaultEventTracer: public SkEventTracer {
-    virtual SkEventTracer::Handle
+#include <stdlib.h>
+
+class SkDefaultEventTracer : public SkEventTracer {
+    SkEventTracer::Handle
         addTraceEvent(char phase,
                       const uint8_t* categoryEnabledFlag,
                       const char* name,
@@ -18,42 +21,38 @@ class SkDefaultEventTracer: public SkEventTracer {
                       const char** argNames,
                       const uint8_t* argTypes,
                       const uint64_t* argValues,
-                      uint8_t flags) SK_OVERRIDE { return 0; }
+                      uint8_t flags) override { return 0; }
 
-    virtual void
+    void
         updateTraceEventDuration(const uint8_t* categoryEnabledFlag,
                                  const char* name,
-                                 SkEventTracer::Handle handle) SK_OVERRIDE {};
+                                 SkEventTracer::Handle handle) override {}
 
-    virtual const uint8_t* getCategoryGroupEnabled(const char* name) SK_OVERRIDE {
+    const uint8_t* getCategoryGroupEnabled(const char* name) override {
         static uint8_t no = 0;
         return &no;
-    };
-    virtual const char* getCategoryGroupName(
-      const uint8_t* categoryEnabledFlag) SK_OVERRIDE {
+    }
+    const char* getCategoryGroupName(
+      const uint8_t* categoryEnabledFlag) override {
         static const char* dummy = "dummy";
         return dummy;
-    };
+    }
 };
 
-SkEventTracer* SkEventTracer::gInstance;
+// We prefer gUserTracer if it's been set, otherwise we fall back on gDefaultTracer.
+static SkEventTracer* gUserTracer = nullptr;
+SK_DECLARE_STATIC_ONCE_PTR(SkDefaultEventTracer, gDefaultTracer);
 
-static void cleanup_tracer() {
-    // calling SetInstance will delete the existing instance.
-    SkEventTracer::SetInstance(NULL);
+void SkEventTracer::SetInstance(SkEventTracer* tracer) {
+    SkASSERT(nullptr == sk_atomic_load(&gUserTracer, sk_memory_order_acquire));
+    sk_atomic_store(&gUserTracer, tracer, sk_memory_order_release);
+    // An atomic load during process shutdown is probably overkill, but safe overkill.
+    atexit([]() { delete sk_atomic_load(&gUserTracer, sk_memory_order_acquire); });
 }
 
-static void intialize_default_tracer(SkEventTracer* current_instance) {
-    if (NULL == current_instance) {
-        SkEventTracer::SetInstance(SkNEW(SkDefaultEventTracer));
-    }
-    atexit(cleanup_tracer);
-}
-
-
 SkEventTracer* SkEventTracer::GetInstance() {
-    SK_DECLARE_STATIC_ONCE(once);
-    SkOnce(&once, intialize_default_tracer, SkEventTracer::gInstance);
-    SkASSERT(NULL != SkEventTracer::gInstance);
-    return SkEventTracer::gInstance;
+    if (SkEventTracer* tracer = sk_atomic_load(&gUserTracer, sk_memory_order_acquire)) {
+        return tracer;
+    }
+    return gDefaultTracer.get([]{ return new SkDefaultEventTracer; });
 }
diff --git a/gfx/skia/skia/src/utils/SkFrontBufferedStream.cpp b/gfx/skia/skia/src/utils/SkFrontBufferedStream.cpp
index 8cb3931082c7..0955cfaf712b 100644
--- a/gfx/skia/skia/src/utils/SkFrontBufferedStream.cpp
+++ b/gfx/skia/skia/src/utils/SkFrontBufferedStream.cpp
@@ -14,24 +14,26 @@ public:
     // Called by Create.
     FrontBufferedStream(SkStream*, size_t bufferSize);
 
-    virtual size_t read(void* buffer, size_t size) SK_OVERRIDE;
+    size_t read(void* buffer, size_t size) override;
 
-    virtual bool isAtEnd() const SK_OVERRIDE;
+    bool peek(void* buffer, size_t size) const override;
 
-    virtual bool rewind() SK_OVERRIDE;
+    bool isAtEnd() const override;
 
-    virtual bool hasPosition() const SK_OVERRIDE { return true; }
+    bool rewind() override;
 
-    virtual size_t getPosition() const SK_OVERRIDE { return fOffset; }
+    bool hasPosition() const override { return true; }
 
-    virtual bool hasLength() const SK_OVERRIDE { return fHasLength; }
+    size_t getPosition() const override { return fOffset; }
 
-    virtual size_t getLength() const SK_OVERRIDE { return fLength; }
+    bool hasLength() const override { return fHasLength; }
 
-    virtual SkStreamRewindable* duplicate() const SK_OVERRIDE { return NULL; }
+    size_t getLength() const override { return fLength; }
+
+    SkStreamRewindable* duplicate() const override { return nullptr; }
 
 private:
-    SkAutoTUnref<SkStream>  fStream;
+    SkAutoTDelete<SkStream> fStream;
     const bool              fHasLength;
     const size_t            fLength;
     // Current offset into the stream. Always >= 0.
@@ -42,21 +44,21 @@ private:
     // Total size of the buffer.
     const size_t            fBufferSize;
     // FIXME: SkAutoTMalloc throws on failure. Instead, Create should return a
-    // NULL stream.
+    // nullptr stream.
     SkAutoTMalloc<char>     fBuffer;
 
     // Read up to size bytes from already buffered data, and copy to
-    // dst, if non-NULL. Updates fOffset. Assumes that fOffset is less
+    // dst, if non-nullptr. Updates fOffset. Assumes that fOffset is less
     // than fBufferedSoFar.
     size_t readFromBuffer(char* dst, size_t size);
 
     // Buffer up to size bytes from the stream, and copy to dst if non-
-    // NULL. Updates fOffset and fBufferedSoFar. Assumes that fOffset is
+    // nullptr. Updates fOffset and fBufferedSoFar. Assumes that fOffset is
     // less than fBufferedSoFar, and size is greater than 0.
     size_t bufferAndWriteTo(char* dst, size_t size);
 
     // Read up to size bytes directly from the stream and into dst if non-
-    // NULL. Updates fOffset. Assumes fOffset is at or beyond the buffered
+    // nullptr. Updates fOffset. Assumes fOffset is at or beyond the buffered
     // data, and size is greater than 0.
     size_t readDirectlyFromStream(char* dst, size_t size);
 
@@ -64,14 +66,14 @@ private:
 };
 
 SkStreamRewindable* SkFrontBufferedStream::Create(SkStream* stream, size_t bufferSize) {
-    if (NULL == stream) {
-        return NULL;
+    if (nullptr == stream) {
+        return nullptr;
     }
-    return SkNEW_ARGS(FrontBufferedStream, (stream, bufferSize));
+    return new FrontBufferedStream(stream, bufferSize);
 }
 
 FrontBufferedStream::FrontBufferedStream(SkStream* stream, size_t bufferSize)
-    : fStream(SkRef(stream))
+    : fStream(stream)
     , fHasLength(stream->hasPosition() && stream->hasLength())
     , fLength(stream->getLength() - stream->getPosition())
     , fOffset(0)
@@ -104,7 +106,7 @@ size_t FrontBufferedStream::readFromBuffer(char* dst, size_t size) {
     // lesser of the size requested and the remainder of the buffered
     // data.
     const size_t bytesToCopy = SkTMin(size, fBufferedSoFar - fOffset);
-    if (dst != NULL) {
+    if (dst != nullptr) {
         memcpy(dst, fBuffer + fOffset, bytesToCopy);
     }
 
@@ -119,6 +121,7 @@ size_t FrontBufferedStream::readFromBuffer(char* dst, size_t size) {
 size_t FrontBufferedStream::bufferAndWriteTo(char* dst, size_t size) {
     SkASSERT(size > 0);
     SkASSERT(fOffset >= fBufferedSoFar);
+    SkASSERT(fBuffer);
     // Data needs to be buffered. Buffer up to the lesser of the size requested
     // and the remainder of the max buffer size.
     const size_t bytesToBuffer = SkTMin(size, fBufferSize - fBufferedSoFar);
@@ -130,7 +133,7 @@ size_t FrontBufferedStream::bufferAndWriteTo(char* dst, size_t size) {
     SkASSERT(fBufferedSoFar <= fBufferSize);
 
     // Copy the buffer to the destination buffer and update the amount read.
-    if (dst != NULL) {
+    if (dst != nullptr) {
         memcpy(dst, buffer, buffered);
     }
 
@@ -148,12 +151,26 @@ size_t FrontBufferedStream::readDirectlyFromStream(char* dst, size_t size) {
     // If we have read past the end of the buffer, rewinding is no longer
     // supported, so we can go ahead and free the memory.
     if (bytesReadDirectly > 0) {
-        fBuffer.reset(0);
+        sk_free(fBuffer.detach());
     }
 
     return bytesReadDirectly;
 }
 
+bool FrontBufferedStream::peek(void* dst, size_t size) const {
+    // Keep track of the offset so we can return to it.
+    const size_t start = fOffset;
+    if (start + size > fBufferSize) {
+        // This stream is not able to buffer enough.
+        return false;
+    }
+    FrontBufferedStream* nonConstThis = const_cast<FrontBufferedStream*>(this);
+    SkDEBUGCODE(const size_t bytesRead =) nonConstThis->read(dst, size);
+    SkASSERT(bytesRead == size);
+    nonConstThis->fOffset = start;
+    return true;
+}
+
 size_t FrontBufferedStream::read(void* voidDst, size_t size) {
     // Cast voidDst to a char* for easy addition.
     char* dst = reinterpret_cast<char*>(voidDst);
@@ -168,21 +185,21 @@ size_t FrontBufferedStream::read(void* voidDst, size_t size) {
         // and the destination buffer.
         size -= bytesCopied;
         SkASSERT(size + (fOffset - start) == totalSize);
-        if (dst != NULL) {
+        if (dst != nullptr) {
             dst += bytesCopied;
         }
     }
 
     // Buffer any more data that should be buffered, and copy it to the
     // destination.
-    if (size > 0 && fBufferedSoFar < fBufferSize) {
+    if (size > 0 && fBufferedSoFar < fBufferSize && !fStream->isAtEnd()) {
         const size_t buffered = this->bufferAndWriteTo(dst, size);
 
         // Update the remaining number of bytes needed to read
         // and the destination buffer.
         size -= buffered;
         SkASSERT(size + (fOffset - start) == totalSize);
-        if (dst != NULL) {
+        if (dst != nullptr) {
             dst += buffered;
         }
     }
diff --git a/gfx/skia/skia/src/utils/SkGatherPixelRefsAndRects.cpp b/gfx/skia/skia/src/utils/SkGatherPixelRefsAndRects.cpp
deleted file mode 100644
index f46fe8ed42f0..000000000000
--- a/gfx/skia/skia/src/utils/SkGatherPixelRefsAndRects.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkGatherPixelRefsAndRects.h"
-#include "SkNoSaveLayerCanvas.h"
-#include "SkPictureUtils.h"
-
-void SkPictureUtils::GatherPixelRefsAndRects(SkPicture* pict,
-                                             SkPictureUtils::SkPixelRefContainer* prCont) {
-    if (0 == pict->width() || 0 == pict->height()) {
-        return ;
-    }
-
-    SkGatherPixelRefsAndRectsDevice device(pict->width(), pict->height(), prCont);
-    SkNoSaveLayerCanvas canvas(&device);
-
-    canvas.clipRect(SkRect::MakeWH(SkIntToScalar(pict->width()),
-                                   SkIntToScalar(pict->height())),
-                    SkRegion::kIntersect_Op, false);
-    canvas.drawPicture(pict);
-}
diff --git a/gfx/skia/skia/src/utils/SkGatherPixelRefsAndRects.h b/gfx/skia/skia/src/utils/SkGatherPixelRefsAndRects.h
deleted file mode 100644
index 5d980aaf5fd4..000000000000
--- a/gfx/skia/skia/src/utils/SkGatherPixelRefsAndRects.h
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkGatherPixelRefsAndRects_DEFINED
-#define SkGatherPixelRefsAndRects_DEFINED
-
-#include "SkBitmap.h"
-#include "SkDevice.h"
-#include "SkDraw.h"
-#include "SkPictureUtils.h"
-#include "SkRasterClip.h"
-#include "SkRefCnt.h"
-#include "SkRRect.h"
-#include "SkTypes.h"
-
-// This GatherPixelRefs device passes all discovered pixel refs and their
-// device bounds to the user provided SkPixelRefContainer-derived object
-class SkGatherPixelRefsAndRectsDevice : public SkBaseDevice {
-public:
-    SK_DECLARE_INST_COUNT(SkGatherPixelRefsAndRectsDevice)
-
-    SkGatherPixelRefsAndRectsDevice(int width, int height,
-                                    SkPictureUtils::SkPixelRefContainer* prCont) {
-        fSize.set(width, height);
-        fPRCont = prCont;
-        SkSafeRef(fPRCont);
-        fEmptyBitmap.setInfo(SkImageInfo::MakeUnknown(width, height));
-    }
-
-    virtual ~SkGatherPixelRefsAndRectsDevice() {
-        SkSafeUnref(fPRCont);
-    }
-
-    virtual SkImageInfo imageInfo() const SK_OVERRIDE {
-        return fEmptyBitmap.info();
-    }
-
-protected:
-    virtual void clear(SkColor color) SK_OVERRIDE {
-        NothingToDo();
-    }
-    virtual void drawPaint(const SkDraw& draw, const SkPaint& paint) SK_OVERRIDE {
-        SkBitmap bm;
-
-        if (GetBitmapFromPaint(paint, &bm)) {
-            SkRect clipRect = SkRect::Make(draw.fRC->getBounds());
-            fPRCont->add(bm.pixelRef(), clipRect);
-        }
-    }
-    virtual void drawPoints(const SkDraw& draw, SkCanvas::PointMode mode, size_t count,
-                            const SkPoint points[], const SkPaint& paint) SK_OVERRIDE {
-        SkBitmap bm;
-        if (!GetBitmapFromPaint(paint, &bm)) {
-            return;
-        }
-
-        if (0 == count) {
-            return;
-        }
-
-        SkPoint min = points[0];
-        SkPoint max = points[0];
-        for (size_t i = 1; i < count; ++i) {
-            const SkPoint& point = points[i];
-
-            min.set(SkMinScalar(min.x(), point.x()), SkMinScalar(min.y(), point.y()));
-            max.set(SkMaxScalar(max.x(), point.x()), SkMaxScalar(max.y(), point.y()));
-        }
-
-        SkRect bounds = SkRect::MakeLTRB(min.x(), min.y(), max.x()+1, max.y()+1);
-
-        this->drawRect(draw, bounds, paint);
-    }
-    virtual void drawRect(const SkDraw& draw, const SkRect& rect,
-                          const SkPaint& paint) SK_OVERRIDE {
-        SkBitmap bm;
-        if (GetBitmapFromPaint(paint, &bm)) {
-            SkRect mappedRect;
-            draw.fMatrix->mapRect(&mappedRect, rect);
-            SkRect clipRect = SkRect::Make(draw.fRC->getBounds());
-            mappedRect.intersect(clipRect);
-            fPRCont->add(bm.pixelRef(), mappedRect);
-        }
-    }
-    virtual void drawOval(const SkDraw& draw, const SkRect& rect,
-                          const SkPaint& paint) SK_OVERRIDE {
-        this->drawRect(draw, rect, paint);
-    }
-    virtual void drawRRect(const SkDraw& draw, const SkRRect& rrect,
-                           const SkPaint& paint) SK_OVERRIDE {
-        this->drawRect(draw, rrect.rect(), paint);
-    }
-    virtual void drawPath(const SkDraw& draw, const SkPath& path,
-                          const SkPaint& paint, const SkMatrix* prePathMatrix,
-                          bool pathIsMutable) SK_OVERRIDE {
-        SkBitmap bm;
-        if (!GetBitmapFromPaint(paint, &bm)) {
-            return;
-        }
-
-        SkRect pathBounds = path.getBounds();
-        if (NULL != prePathMatrix) {
-            prePathMatrix->mapRect(&pathBounds);
-        }
-
-        this->drawRect(draw, pathBounds, paint);
-    }
-    virtual void drawBitmap(const SkDraw& draw, const SkBitmap& bitmap,
-                            const SkMatrix& matrix, const SkPaint& paint) SK_OVERRIDE {
-        SkMatrix totMatrix;
-        totMatrix.setConcat(*draw.fMatrix, matrix);
-
-        SkRect bitmapRect = SkRect::MakeWH(SkIntToScalar(bitmap.width()),
-                                           SkIntToScalar(bitmap.height()));
-        SkRect mappedRect;
-        totMatrix.mapRect(&mappedRect, bitmapRect);
-        fPRCont->add(bitmap.pixelRef(), mappedRect);
-
-        SkBitmap paintBitmap;
-        if (GetBitmapFromPaint(paint, &paintBitmap)) {
-            fPRCont->add(paintBitmap.pixelRef(), mappedRect);
-        }
-    }
-    virtual void drawSprite(const SkDraw&, const SkBitmap& bitmap,
-                            int x, int y, const SkPaint& paint) SK_OVERRIDE {
-        // Sprites aren't affected by current matrix, so we can't reuse drawRect.
-        SkMatrix matrix;
-        matrix.setTranslate(SkIntToScalar(x), SkIntToScalar(y));
-
-        SkRect bitmapRect = SkRect::MakeWH(SkIntToScalar(bitmap.width()),
-                                           SkIntToScalar(bitmap.height()));
-        SkRect mappedRect;
-        matrix.mapRect(&mappedRect, bitmapRect);
-        fPRCont->add(bitmap.pixelRef(), mappedRect);
-
-        SkBitmap paintBitmap;
-        if (GetBitmapFromPaint(paint, &paintBitmap)) {
-            fPRCont->add(paintBitmap.pixelRef(), mappedRect);
-        }
-    }
-    virtual void drawBitmapRect(const SkDraw& draw, const SkBitmap& bitmap,
-                                const SkRect* srcOrNull, const SkRect& dst,
-                                const SkPaint& paint,
-                                SkCanvas::DrawBitmapRectFlags flags) SK_OVERRIDE {
-        SkRect bitmapRect = SkRect::MakeWH(SkIntToScalar(bitmap.width()),
-                                           SkIntToScalar(bitmap.height()));
-        SkMatrix matrix;
-        matrix.setRectToRect(bitmapRect, dst, SkMatrix::kFill_ScaleToFit);
-        this->drawBitmap(draw, bitmap, matrix, paint);
-    }
-    virtual void drawText(const SkDraw& draw, const void* text, size_t len,
-                          SkScalar x, SkScalar y,
-                          const SkPaint& paint) SK_OVERRIDE {
-        SkBitmap bitmap;
-        if (!GetBitmapFromPaint(paint, &bitmap)) {
-            return;
-        }
-
-        // Math is borrowed from SkBBoxRecord
-        SkRect bounds;
-        paint.measureText(text, len, &bounds);
-        SkPaint::FontMetrics metrics;
-        paint.getFontMetrics(&metrics);
-
-        if (paint.isVerticalText()) {
-            SkScalar h = bounds.fBottom - bounds.fTop;
-            if (paint.getTextAlign() == SkPaint::kCenter_Align) {
-                bounds.fTop -= h / 2;
-                bounds.fBottom -= h / 2;
-            }
-            bounds.fBottom += metrics.fBottom;
-            bounds.fTop += metrics.fTop;
-        } else {
-            SkScalar w = bounds.fRight - bounds.fLeft;
-            if (paint.getTextAlign() == SkPaint::kCenter_Align) {
-                bounds.fLeft -= w / 2;
-                bounds.fRight -= w / 2;
-            } else if (paint.getTextAlign() == SkPaint::kRight_Align) {
-                bounds.fLeft -= w;
-                bounds.fRight -= w;
-            }
-            bounds.fTop = metrics.fTop;
-            bounds.fBottom = metrics.fBottom;
-        }
-
-        SkScalar pad = (metrics.fBottom - metrics.fTop) / 2;
-        bounds.fLeft -= pad;
-        bounds.fRight += pad;
-        bounds.offset(x, y);
-
-        this->drawRect(draw, bounds, paint);
-    }
-    virtual void drawPosText(const SkDraw& draw, const void* text, size_t len,
-                             const SkScalar pos[], SkScalar constY,
-                             int scalarsPerPos, const SkPaint& paint) SK_OVERRIDE {
-        SkBitmap bitmap;
-        if (!GetBitmapFromPaint(paint, &bitmap)) {
-            return;
-        }
-
-        if (0 == len) {
-            return;
-        }
-
-        // Similar to SkDraw asserts.
-        SkASSERT(scalarsPerPos == 1 || scalarsPerPos == 2);
-
-        SkScalar y = scalarsPerPos == 1 ? constY : constY + pos[1];
-
-        SkPoint min, max;
-        min.set(pos[0], y);
-        max.set(pos[0], y);
-
-        for (size_t i = 1; i < len; ++i) {
-            SkScalar x = pos[i * scalarsPerPos];
-            SkScalar y = constY;
-            if (2 == scalarsPerPos) {
-                y += pos[i * scalarsPerPos + 1];
-            }
-
-            min.set(SkMinScalar(x, min.x()), SkMinScalar(y, min.y()));
-            max.set(SkMaxScalar(x, max.x()), SkMaxScalar(y, max.y()));
-        }
-
-        SkRect bounds = SkRect::MakeLTRB(min.x(), min.y(), max.x(), max.y());
-
-        // Math is borrowed from SkBBoxRecord
-        SkPaint::FontMetrics metrics;
-        paint.getFontMetrics(&metrics);
-
-        bounds.fTop += metrics.fTop;
-        bounds.fBottom += metrics.fBottom;
-
-        SkScalar pad = (metrics.fTop - metrics.fBottom) / 2;
-        bounds.fLeft -= pad;
-        bounds.fRight += pad;
-
-        this->drawRect(draw, bounds, paint);
-    }
-    virtual void drawTextOnPath(const SkDraw& draw, const void* text, size_t len,
-                                const SkPath& path, const SkMatrix* matrix,
-                                const SkPaint& paint) SK_OVERRIDE {
-        SkBitmap bitmap;
-        if (!GetBitmapFromPaint(paint, &bitmap)) {
-            return;
-        }
-
-        // Math is borrowed from SkBBoxRecord
-        SkRect bounds = path.getBounds();
-        SkPaint::FontMetrics metrics;
-        paint.getFontMetrics(&metrics);
-
-        SkScalar pad = metrics.fTop;
-        // TODO: inset?!
-        bounds.fLeft += pad;
-        bounds.fRight -= pad;
-        bounds.fTop += pad;
-        bounds.fBottom -= pad;
-
-        this->drawRect(draw, bounds, paint);
-    }
-    virtual void drawVertices(const SkDraw& draw, SkCanvas::VertexMode, int vertexCount,
-                              const SkPoint verts[], const SkPoint texs[],
-                              const SkColor colors[], SkXfermode* xmode,
-                              const uint16_t indices[], int indexCount,
-                              const SkPaint& paint) SK_OVERRIDE {
-        this->drawPoints(draw, SkCanvas::kPolygon_PointMode, vertexCount, verts, paint);
-    }
-    virtual void drawDevice(const SkDraw&, SkBaseDevice*, int x, int y,
-                            const SkPaint&) SK_OVERRIDE {
-        NothingToDo();
-    }
-    // TODO: allow this call to return failure, or move to SkBitmapDevice only.
-    virtual const SkBitmap& onAccessBitmap() SK_OVERRIDE {
-        return fEmptyBitmap;
-    }
-    virtual void lockPixels() SK_OVERRIDE { NothingToDo(); }
-    virtual void unlockPixels() SK_OVERRIDE { NothingToDo(); }
-    virtual bool allowImageFilter(const SkImageFilter*) SK_OVERRIDE { return false; }
-    virtual bool canHandleImageFilter(const SkImageFilter*) SK_OVERRIDE { return false; }
-    virtual bool filterImage(const SkImageFilter*, const SkBitmap&, const SkImageFilter::Context&,
-                             SkBitmap* result, SkIPoint* offset) SK_OVERRIDE {
-        return false;
-    }
-
-private:
-    SkPictureUtils::SkPixelRefContainer* fPRCont;
-    SkISize                              fSize;
-
-    SkBitmap                             fEmptyBitmap; // legacy -- need to remove
-
-    static bool GetBitmapFromPaint(const SkPaint &paint, SkBitmap* bitmap) {
-        SkShader* shader = paint.getShader();
-        if (NULL != shader) {
-            if (SkShader::kNone_GradientType == shader->asAGradient(NULL)) {
-                return SkShader::kNone_BitmapType != shader->asABitmap(bitmap, NULL, NULL);
-            }
-        }
-        return false;
-    }
-
-    virtual void replaceBitmapBackendForRasterSurface(const SkBitmap&) SK_OVERRIDE {
-        NotSupported();
-    }
-
-    virtual SkBaseDevice* onCreateDevice(const SkImageInfo& info, Usage usage) SK_OVERRIDE {
-        // we expect to only get called via savelayer, in which case it is fine.
-        SkASSERT(kSaveLayer_Usage == usage);
-        return SkNEW_ARGS(SkGatherPixelRefsAndRectsDevice,
-                          (info.width(), info.height(), fPRCont));
-    }
-
-    static void NotSupported() {
-        SkDEBUGFAIL("this method should never be called");
-    }
-
-    static void NothingToDo() {}
-
-    typedef SkBaseDevice INHERITED;
-};
-
-#endif // SkGatherPixelRefsAndRects_DEFINED
diff --git a/gfx/skia/skia/src/utils/SkImageGeneratorUtils.cpp b/gfx/skia/skia/src/utils/SkImageGeneratorUtils.cpp
new file mode 100644
index 000000000000..928d052ec651
--- /dev/null
+++ b/gfx/skia/skia/src/utils/SkImageGeneratorUtils.cpp
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkImageGeneratorUtils.h"
+#include "SkBitmap.h"
+
+class GeneratorFromEmpty : public SkImageGenerator {
+public:
+    GeneratorFromEmpty(const SkImageInfo& info) : SkImageGenerator(info) {}
+};
+
+SkImageGenerator* SkImageGeneratorUtils::NewEmpty(const SkImageInfo& info) {
+    return new GeneratorFromEmpty(info);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+class GeneratorFromBitmap : public SkImageGenerator {
+public:
+    GeneratorFromBitmap(const SkBitmap& bm) : SkImageGenerator(bm.info()), fBM(bm) {
+        if (!bm.isImmutable()) {
+            bm.copyTo(&fBM);
+        }
+    }
+
+protected:
+    bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
+                     SkPMColor*, int*) override {
+        return fBM.readPixels(info, pixels, rowBytes, 0, 0);
+    }
+
+private:
+    SkBitmap fBM;
+};
+
+SkImageGenerator* SkImageGeneratorUtils::NewFromBitmap(const SkBitmap& bm) {
+    return new GeneratorFromBitmap(bm);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#if SK_SUPPORT_GPU
+
+#include "GrContext.h"
+#include "GrTexture.h"
+#include "SkGrPriv.h"
+
+class GeneratorFromTexture : public SkImageGenerator {
+public:
+    GeneratorFromTexture(GrContext* ctx, GrTexture* tex, const SkImageInfo& info)
+        : SkImageGenerator(info), fCtx(ctx), fTexture(tex)
+    {}
+
+protected:
+    GrTexture* onGenerateTexture(GrContext* ctx, const SkIRect* subset) override {
+        if (ctx) {
+            SkASSERT(ctx == fCtx.get());
+        }
+
+        if (!subset) {
+            return SkRef(fTexture.get());
+        }
+        // need to copy the subset into a new texture
+        GrSurfaceDesc desc = fTexture->desc();
+        desc.fWidth = subset->width();
+        desc.fHeight = subset->height();
+
+        GrTexture* dst = fCtx->textureProvider()->createTexture(desc, false);
+        fCtx->copySurface(dst, fTexture, *subset, SkIPoint::Make(0, 0));
+        return dst;
+    }
+private:
+    SkAutoTUnref<GrContext> fCtx;
+    SkAutoTUnref<GrTexture> fTexture;
+};
+#endif
+
+SkImageGenerator* SkImageGeneratorUtils::NewFromTexture(GrContext* ctx, GrTexture* tex) {
+#if SK_SUPPORT_GPU
+    if (ctx && tex) {
+        const GrSurfaceDesc desc = tex->desc();
+
+        SkColorType ct;
+        SkColorProfileType cpt;
+        if (!GrPixelConfig2ColorAndProfileType(desc.fConfig, &ct, &cpt)) {
+            return nullptr;
+        }
+        const SkAlphaType at = kPremul_SkAlphaType; // take isOpaque from caller?
+        SkImageInfo info = SkImageInfo::Make(desc.fWidth, desc.fHeight, ct, at, cpt);
+        return new GeneratorFromTexture(ctx, tex, info);
+    }
+#endif
+    return nullptr;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#include "SkImage.h"
+
+class GeneratorFromImage : public SkImageGenerator {
+public:
+    GeneratorFromImage(const SkImage* image, const SkImageInfo& info)
+        : SkImageGenerator(info), fImage(image) {}
+
+protected:
+    bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
+                     SkPMColor*, int*) override {
+        return fImage->readPixels(info, pixels, rowBytes, 0, 0);
+    }
+
+    GrTexture* onGenerateTexture(GrContext* ctx, const SkIRect* subset) override {
+        // waiting on https://code.google.com/p/skia/issues/detail?id=4233
+        return nullptr;
+    }
+
+private:
+    SkAutoTUnref<const SkImage> fImage;
+};
+
+SkImageGenerator* SkImageGeneratorUtils::NewFromImage(const SkImage* image) {
+    if (image) {
+        const SkColorType ct = kN32_SkColorType;
+        const SkAlphaType at = image->isOpaque() ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
+        const SkImageInfo info = SkImageInfo::Make(image->width(), image->height(), ct, at);
+        return new GeneratorFromImage(image, info);
+    }
+    return nullptr;
+}
+
+
diff --git a/gfx/skia/skia/src/utils/SkImageGeneratorUtils.h b/gfx/skia/skia/src/utils/SkImageGeneratorUtils.h
new file mode 100644
index 000000000000..940d12da0fd8
--- /dev/null
+++ b/gfx/skia/skia/src/utils/SkImageGeneratorUtils.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkImageGeneratorUtils_DEFINED
+#define SkImageGeneratorUtils_DEFINED
+
+#include "SkImageGenerator.h"
+
+class SkImage;
+
+class SkImageGeneratorUtils {
+public:
+    // Returns a generator of the specified dimensions, but will always fail to return anything
+    static SkImageGenerator* NewEmpty(const SkImageInfo&);
+
+    // If the bitmap is mutable, it will make a copy first
+    static SkImageGenerator* NewFromBitmap(const SkBitmap&);
+
+    // Ref's the provided texture, so it had better be const!
+    static SkImageGenerator* NewFromTexture(GrContext*, GrTexture*);
+
+    static SkImageGenerator* NewFromImage(const SkImage*);
+};
+
+#endif
diff --git a/gfx/skia/skia/src/utils/SkInterpolator.cpp b/gfx/skia/skia/src/utils/SkInterpolator.cpp
index 97574e475b4e..cd9ad3a2db44 100644
--- a/gfx/skia/skia/src/utils/SkInterpolator.cpp
+++ b/gfx/skia/skia/src/utils/SkInterpolator.cpp
@@ -12,9 +12,9 @@
 #include "SkTSearch.h"
 
 SkInterpolatorBase::SkInterpolatorBase() {
-    fStorage    = NULL;
-    fTimes      = NULL;
-    SkDEBUGCODE(fTimesArray = NULL;)
+    fStorage    = nullptr;
+    fTimes      = nullptr;
+    SkDEBUGCODE(fTimesArray = nullptr;)
 }
 
 SkInterpolatorBase::~SkInterpolatorBase() {
@@ -30,9 +30,9 @@ void SkInterpolatorBase::reset(int elemCount, int frameCount) {
     fRepeat = SK_Scalar1;
     if (fStorage) {
         sk_free(fStorage);
-        fStorage = NULL;
-        fTimes = NULL;
-        SkDEBUGCODE(fTimesArray = NULL);
+        fStorage = nullptr;
+        fTimes = nullptr;
+        SkDEBUGCODE(fTimesArray = nullptr);
     }
 }
 
@@ -62,8 +62,7 @@ SkScalar SkInterpolatorBase::ComputeRelativeT(SkMSec time, SkMSec prevTime,
                                   SkMSec nextTime, const SkScalar blend[4]) {
     SkASSERT(time > prevTime && time < nextTime);
 
-    SkScalar t = SkScalarDiv((SkScalar)(time - prevTime),
-                             (SkScalar)(nextTime - prevTime));
+    SkScalar t = (SkScalar)(time - prevTime) / (SkScalar)(nextTime - prevTime);
     return blend ?
             SkUnitCubicInterp(t, blend[0], blend[1], blend[2], blend[3]) : t;
 }
@@ -130,8 +129,8 @@ SkInterpolatorBase::Result SkInterpolatorBase::timeToT(SkMSec time, SkScalar* T,
 
 SkInterpolator::SkInterpolator() {
     INHERITED::reset(0, 0);
-    fValues = NULL;
-    SkDEBUGCODE(fScalarsArray = NULL;)
+    fValues = nullptr;
+    SkDEBUGCODE(fScalarsArray = nullptr;)
 }
 
 SkInterpolator::SkInterpolator(int elemCount, int frameCount) {
@@ -160,9 +159,9 @@ static const SkScalar gIdentityBlend[4] = {
 
 bool SkInterpolator::setKeyFrame(int index, SkMSec time,
                             const SkScalar values[], const SkScalar blend[4]) {
-    SkASSERT(values != NULL);
+    SkASSERT(values != nullptr);
 
-    if (blend == NULL) {
+    if (blend == nullptr) {
         blend = gIdentityBlend;
     }
 
diff --git a/gfx/skia/skia/src/utils/SkLayer.cpp b/gfx/skia/skia/src/utils/SkLayer.cpp
index 525917ff66d2..39032b616e09 100644
--- a/gfx/skia/skia/src/utils/SkLayer.cpp
+++ b/gfx/skia/skia/src/utils/SkLayer.cpp
@@ -18,7 +18,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 SkLayer::SkLayer() {
-    fParent = NULL;
+    fParent = nullptr;
     m_opacity = SK_Scalar1;
     m_size.set(0, 0);
     m_position.set(0, 0);
@@ -35,7 +35,7 @@ SkLayer::SkLayer() {
 }
 
 SkLayer::SkLayer(const SkLayer& src) : INHERITED() {
-    fParent = NULL;
+    fParent = nullptr;
     m_opacity = src.m_opacity;
     m_size = src.m_size;
     m_position = src.m_position;
@@ -93,14 +93,14 @@ SkLayer* SkLayer::getChild(int index) const {
         SkASSERT(m_children[index]->fParent == this);
         return m_children[index];
     }
-    return NULL;
+    return nullptr;
 }
 
 SkLayer* SkLayer::addChild(SkLayer* child) {
     SkASSERT(this != child);
     child->ref();
     child->detachFromParent();
-    SkASSERT(child->fParent == NULL);
+    SkASSERT(child->fParent == nullptr);
     child->fParent = this;
 
     *m_children.append() = child;
@@ -112,7 +112,7 @@ void SkLayer::detachFromParent() {
         int index = fParent->m_children.find(this);
         SkASSERT(index >= 0);
         fParent->m_children.remove(index);
-        fParent = NULL;
+        fParent = nullptr;
         this->unref();  // this call might delete us
     }
 }
@@ -122,7 +122,7 @@ void SkLayer::removeChildren() {
     for (int i = 0; i < count; i++) {
         SkLayer* child = m_children[i];
         SkASSERT(child->fParent == this);
-        child->fParent = NULL;  // in case it has more than one owner
+        child->fParent = nullptr;  // in case it has more than one owner
         child->unref();
     }
     m_children.reset();
@@ -130,7 +130,7 @@ void SkLayer::removeChildren() {
 
 SkLayer* SkLayer::getRootLayer() const {
     const SkLayer* root = this;
-    while (root->fParent != NULL) {
+    while (root->fParent != nullptr) {
         root = root->fParent;
     }
     return const_cast<SkLayer*>(root);
@@ -157,7 +157,7 @@ void SkLayer::localToGlobal(SkMatrix* matrix) const {
     }
 
     const SkLayer* layer = this;
-    while (layer->fParent != NULL) {
+    while (layer->fParent != nullptr) {
         layer = layer->fParent;
 
         SkMatrix tmp;
diff --git a/gfx/skia/skia/src/utils/SkLua.cpp b/gfx/skia/skia/src/utils/SkLua.cpp
index 50478773240e..307e5f6152d0 100644
--- a/gfx/skia/skia/src/utils/SkLua.cpp
+++ b/gfx/skia/skia/src/utils/SkLua.cpp
@@ -11,16 +11,21 @@
 #include "GrReducedClip.h"
 #endif
 
+#include "SkBlurImageFilter.h"
 #include "SkCanvas.h"
 #include "SkData.h"
 #include "SkDocument.h"
+#include "SkGradientShader.h"
 #include "SkImage.h"
 #include "SkMatrix.h"
 #include "SkPaint.h"
 #include "SkPath.h"
+#include "SkPictureRecorder.h"
 #include "SkPixelRef.h"
 #include "SkRRect.h"
 #include "SkString.h"
+#include "SkSurface.h"
+#include "SkTextBlob.h"
 #include "SkTypeface.h"
 
 extern "C" {
@@ -39,12 +44,17 @@ template <typename T> const char* get_mtname();
 DEF_MTNAME(SkCanvas)
 DEF_MTNAME(SkDocument)
 DEF_MTNAME(SkImage)
+DEF_MTNAME(SkImageFilter)
 DEF_MTNAME(SkMatrix)
 DEF_MTNAME(SkRRect)
 DEF_MTNAME(SkPath)
 DEF_MTNAME(SkPaint)
 DEF_MTNAME(SkPathEffect)
+DEF_MTNAME(SkPicture)
+DEF_MTNAME(SkPictureRecorder)
 DEF_MTNAME(SkShader)
+DEF_MTNAME(SkSurface)
+DEF_MTNAME(SkTextBlob)
 DEF_MTNAME(SkTypeface)
 
 template <typename T> T* push_new(lua_State* L) {
@@ -61,10 +71,11 @@ template <typename T> void push_obj(lua_State* L, const T& obj) {
     lua_setmetatable(L, -2);
 }
 
-template <typename T> void push_ref(lua_State* L, T* ref) {
+template <typename T> T* push_ref(lua_State* L, T* ref) {
     *(T**)lua_newuserdata(L, sizeof(T*)) = SkSafeRef(ref);
     luaL_getmetatable(L, get_mtname<T>());
     lua_setmetatable(L, -2);
+    return ref;
 }
 
 template <typename T> T* get_ref(lua_State* L, int index) {
@@ -151,6 +162,46 @@ static void setfield_function(lua_State* L,
     lua_setfield(L, -2, key);
 }
 
+static int lua2int_def(lua_State* L, int index, int defaultValue) {
+    if (lua_isnumber(L, index)) {
+        return (int)lua_tonumber(L, index);
+    } else {
+        return defaultValue;
+    }
+}
+
+static SkScalar lua2scalar(lua_State* L, int index) {
+    SkASSERT(lua_isnumber(L, index));
+    return SkLuaToScalar(lua_tonumber(L, index));
+}
+
+static SkScalar lua2scalar_def(lua_State* L, int index, SkScalar defaultValue) {
+    if (lua_isnumber(L, index)) {
+        return SkLuaToScalar(lua_tonumber(L, index));
+    } else {
+        return defaultValue;
+    }
+}
+
+static SkScalar getarray_scalar(lua_State* L, int stackIndex, int arrayIndex) {
+    SkASSERT(lua_istable(L, stackIndex));
+    lua_rawgeti(L, stackIndex, arrayIndex);
+
+    SkScalar value = lua2scalar(L, -1);
+    lua_pop(L, 1);
+    return value;
+}
+
+static void getarray_scalars(lua_State* L, int stackIndex, SkScalar dst[], int count) {
+    for (int i = 0; i < count; ++i) {
+        dst[i] = getarray_scalar(L, stackIndex, i + 1);
+    }
+}
+
+static void getarray_points(lua_State* L, int stackIndex, SkPoint pts[], int count) {
+    getarray_scalars(L, stackIndex, &pts[0].fX, count * 2);
+}
+
 static void setarray_number(lua_State* L, int index, double value) {
     lua_pushnumber(L, value);
     lua_rawseti(L, -2, index);
@@ -273,6 +324,11 @@ void SkLua::pushCanvas(SkCanvas* canvas, const char key[]) {
     CHECK_SETFIELD(key);
 }
 
+void SkLua::pushTextBlob(const SkTextBlob* blob, const char key[]) {
+    push_ref(fL, const_cast<SkTextBlob*>(blob));
+    CHECK_SETFIELD(key);
+}
+
 static const char* element_type(SkClipStack::Element::Type type) {
     switch (type) {
         case SkClipStack::Element::kEmpty_Type:
@@ -310,7 +366,7 @@ void SkLua::pushClipStack(const SkClipStack& stack, const char* key) {
     SkClipStack::B2TIter iter(stack);
     const SkClipStack::Element* element;
     int i = 0;
-    while (NULL != (element = iter.next())) {
+    while ((element = iter.next())) {
         this->pushClipStackElement(*element);
         lua_rawseti(fL, -2, ++i);
     }
@@ -343,19 +399,6 @@ void SkLua::pushClipStackElement(const SkClipStack::Element& element, const char
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
-static SkScalar lua2scalar(lua_State* L, int index) {
-    SkASSERT(lua_isnumber(L, index));
-    return SkLuaToScalar(lua_tonumber(L, index));
-}
-
-static SkScalar lua2scalar_def(lua_State* L, int index, SkScalar defaultValue) {
-    if (lua_isnumber(L, index)) {
-        return SkLuaToScalar(lua_tonumber(L, index));
-    } else {
-        return defaultValue;
-    }
-}
-
 static SkScalar getfield_scalar(lua_State* L, int index, const char key[]) {
     SkASSERT(lua_istable(L, index));
     lua_pushstring(L, key);
@@ -381,6 +424,10 @@ static SkScalar getfield_scalar_default(lua_State* L, int index, const char key[
     return value;
 }
 
+static SkScalar byte2unit(U8CPU byte) {
+    return byte / 255.0f;
+}
+
 static U8CPU unit2byte(SkScalar x) {
     if (x <= 0) {
         return 0;
@@ -392,10 +439,10 @@ static U8CPU unit2byte(SkScalar x) {
 }
 
 static SkColor lua2color(lua_State* L, int index) {
-    return SkColorSetARGB(unit2byte(getfield_scalar(L, index, "a")),
-                          unit2byte(getfield_scalar(L, index, "r")),
-                          unit2byte(getfield_scalar(L, index, "g")),
-                          unit2byte(getfield_scalar(L, index, "b")));
+    return SkColorSetARGB(unit2byte(getfield_scalar_default(L, index, "a", 1)),
+                          unit2byte(getfield_scalar_default(L, index, "r", 0)),
+                          unit2byte(getfield_scalar_default(L, index, "g", 0)),
+                          unit2byte(getfield_scalar_default(L, index, "b", 0)));
 }
 
 static SkRect* lua2rect(lua_State* L, int index, SkRect* rect) {
@@ -406,15 +453,26 @@ static SkRect* lua2rect(lua_State* L, int index, SkRect* rect) {
     return rect;
 }
 
+static int lcanvas_clear(lua_State* L) {
+    get_ref<SkCanvas>(L, 1)->clear(0);
+    return 0;
+}
+
 static int lcanvas_drawColor(lua_State* L) {
     get_ref<SkCanvas>(L, 1)->drawColor(lua2color(L, 2));
     return 0;
 }
 
+static int lcanvas_drawPaint(lua_State* L) {
+    get_ref<SkCanvas>(L, 1)->drawPaint(*get_obj<SkPaint>(L, 2));
+    return 0;
+}
+
 static int lcanvas_drawRect(lua_State* L) {
     SkRect rect;
-    get_ref<SkCanvas>(L, 1)->drawRect(*lua2rect(L, 2, &rect),
-                                      *get_obj<SkPaint>(L, 3));
+    lua2rect(L, 2, &rect);
+    const SkPaint* paint = get_obj<SkPaint>(L, 3);
+    get_ref<SkCanvas>(L, 1)->drawRect(rect, *paint);
     return 0;
 }
 
@@ -433,22 +491,76 @@ static int lcanvas_drawCircle(lua_State* L) {
     return 0;
 }
 
+static SkPaint* lua2OptionalPaint(lua_State* L, int index, SkPaint* paint) {
+    if (lua_isnumber(L, index)) {
+        paint->setAlpha(SkScalarRoundToInt(lua2scalar(L, index) * 255));
+        return paint;
+    } else if (lua_isuserdata(L, index)) {
+        const SkPaint* ptr = get_obj<SkPaint>(L, index);
+        if (ptr) {
+            *paint = *ptr;
+            return paint;
+        }
+    }
+    return nullptr;
+}
+
 static int lcanvas_drawImage(lua_State* L) {
     SkCanvas* canvas = get_ref<SkCanvas>(L, 1);
     SkImage* image = get_ref<SkImage>(L, 2);
-    if (NULL == image) {
+    if (nullptr == image) {
         return 0;
     }
     SkScalar x = lua2scalar(L, 3);
     SkScalar y = lua2scalar(L, 4);
 
     SkPaint paint;
-    const SkPaint* paintPtr = NULL;
-    if (lua_isnumber(L, 5)) {
-        paint.setAlpha(SkScalarRoundToInt(lua2scalar(L, 5) * 255));
-        paintPtr = &paint;
+    canvas->drawImage(image, x, y, lua2OptionalPaint(L, 5, &paint));
+    return 0;
+}
+
+static int lcanvas_drawImageRect(lua_State* L) {
+    SkCanvas* canvas = get_ref<SkCanvas>(L, 1);
+    SkImage* image = get_ref<SkImage>(L, 2);
+    if (nullptr == image) {
+        return 0;
     }
-    image->draw(canvas, x, y, paintPtr);
+
+    SkRect srcR, dstR;
+    SkRect* srcRPtr = nullptr;
+    if (!lua_isnil(L, 3)) {
+        srcRPtr = lua2rect(L, 3, &srcR);
+    }
+    lua2rect(L, 4, &dstR);
+
+    SkPaint paint;
+    canvas->legacy_drawImageRect(image, srcRPtr, dstR, lua2OptionalPaint(L, 5, &paint));
+    return 0;
+}
+
+static int lcanvas_drawPatch(lua_State* L) {
+    SkPoint cubics[12];
+    SkColor colorStorage[4];
+    SkPoint texStorage[4];
+
+    const SkColor* colors = nullptr;
+    const SkPoint* texs = nullptr;
+
+    getarray_points(L, 2, cubics, 12);
+
+    colorStorage[0] = SK_ColorRED;
+    colorStorage[1] = SK_ColorGREEN;
+    colorStorage[2] = SK_ColorBLUE;
+    colorStorage[3] = SK_ColorGRAY;
+
+    if (lua_isnil(L, 4)) {
+        colors = colorStorage;
+    } else {
+        getarray_points(L, 4, texStorage, 4);
+        texs = texStorage;
+    }
+
+    get_ref<SkCanvas>(L, 1)->drawPatch(cubics, colors, texs, nullptr, *get_obj<SkPaint>(L, 5));
     return 0;
 }
 
@@ -458,6 +570,22 @@ static int lcanvas_drawPath(lua_State* L) {
     return 0;
 }
 
+// drawPicture(pic, x, y, paint)
+static int lcanvas_drawPicture(lua_State* L) {
+    SkCanvas* canvas = get_ref<SkCanvas>(L, 1);
+    SkPicture* picture = get_ref<SkPicture>(L, 2);
+    SkScalar x = lua2scalar_def(L, 3, 0);
+    SkScalar y = lua2scalar_def(L, 4, 0);
+    SkMatrix matrix, *matrixPtr = nullptr;
+    if (x || y) {
+        matrix.setTranslate(x, y);
+        matrixPtr = &matrix;
+    }
+    SkPaint paint;
+    canvas->drawPicture(picture, matrixPtr, lua2OptionalPaint(L, 5, &paint));
+    return 0;
+}
+
 static int lcanvas_drawText(lua_State* L) {
     if (lua_gettop(L) < 5) {
         return 0;
@@ -473,6 +601,15 @@ static int lcanvas_drawText(lua_State* L) {
     return 0;
 }
 
+static int lcanvas_drawTextBlob(lua_State* L) {
+    const SkTextBlob* blob = get_ref<SkTextBlob>(L, 2);
+    SkScalar x = lua2scalar(L, 3);
+    SkScalar y = lua2scalar(L, 4);
+    const SkPaint& paint = *get_obj<SkPaint>(L, 5);
+    get_ref<SkCanvas>(L, 1)->drawTextBlob(blob, x, y, paint);
+    return 0;
+}
+
 static int lcanvas_getSaveCount(lua_State* L) {
     lua_pushnumber(L, get_ref<SkCanvas>(L, 1)->getSaveCount());
     return 1;
@@ -509,12 +646,12 @@ int SkLua::lcanvas_getReducedClipStack(lua_State* L) {
                                    &genID,
                                    &initialState,
                                    &resultBounds,
-                                   NULL);
+                                   nullptr);
 
     GrReducedClip::ElementList::Iter iter(elements);
     int i = 0;
     lua_newtable(L);
-    while(NULL != iter.get()) {
+    while(iter.get()) {
         SkLua(L).pushClipStackElement(*iter.get());
         iter.next();
         lua_rawseti(L, -2, ++i);
@@ -532,6 +669,12 @@ static int lcanvas_save(lua_State* L) {
     return 1;
 }
 
+static int lcanvas_saveLayer(lua_State* L) {
+    SkPaint paint;
+    lua_pushinteger(L, get_ref<SkCanvas>(L, 1)->saveLayer(nullptr, lua2OptionalPaint(L, 2, &paint)));
+    return 1;
+}
+
 static int lcanvas_restore(lua_State* L) {
     get_ref<SkCanvas>(L, 1)->restore();
     return 0;
@@ -557,19 +700,43 @@ static int lcanvas_rotate(lua_State* L) {
     return 0;
 }
 
+static int lcanvas_concat(lua_State* L) {
+    get_ref<SkCanvas>(L, 1)->concat(*get_obj<SkMatrix>(L, 2));
+    return 0;
+}
+
+static int lcanvas_newSurface(lua_State* L) {
+    int width = lua2int_def(L, 2, 0);
+    int height = lua2int_def(L, 3, 0);
+    SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
+    SkSurface* surface = get_ref<SkCanvas>(L, 1)->newSurface(info);
+    if (nullptr == surface) {
+        lua_pushnil(L);
+    } else {
+        push_ref(L, surface)->unref();
+    }
+    return 1;
+}
+
 static int lcanvas_gc(lua_State* L) {
     get_ref<SkCanvas>(L, 1)->unref();
     return 0;
 }
 
 const struct luaL_Reg gSkCanvas_Methods[] = {
+    { "clear", lcanvas_clear },
     { "drawColor", lcanvas_drawColor },
+    { "drawPaint", lcanvas_drawPaint },
     { "drawRect", lcanvas_drawRect },
     { "drawOval", lcanvas_drawOval },
     { "drawCircle", lcanvas_drawCircle },
     { "drawImage", lcanvas_drawImage },
+    { "drawImageRect", lcanvas_drawImageRect },
+    { "drawPatch", lcanvas_drawPatch },
     { "drawPath", lcanvas_drawPath },
+    { "drawPicture", lcanvas_drawPicture },
     { "drawText", lcanvas_drawText },
+    { "drawTextBlob", lcanvas_drawTextBlob },
     { "getSaveCount", lcanvas_getSaveCount },
     { "getTotalMatrix", lcanvas_getTotalMatrix },
     { "getClipStack", lcanvas_getClipStack },
@@ -577,18 +744,23 @@ const struct luaL_Reg gSkCanvas_Methods[] = {
     { "getReducedClipStack", SkLua::lcanvas_getReducedClipStack },
 #endif
     { "save", lcanvas_save },
+    { "saveLayer", lcanvas_saveLayer },
     { "restore", lcanvas_restore },
     { "scale", lcanvas_scale },
     { "translate", lcanvas_translate },
     { "rotate", lcanvas_rotate },
+    { "concat", lcanvas_concat },
+
+    { "newSurface", lcanvas_newSurface },
+
     { "__gc", lcanvas_gc },
-    { NULL, NULL }
+    { nullptr, nullptr }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static int ldocument_beginPage(lua_State* L) {
-    const SkRect* contentPtr = NULL;
+    const SkRect* contentPtr = nullptr;
     push_ref(L, get_ref<SkDocument>(L, 1)->beginPage(lua2scalar(L, 2),
                                                      lua2scalar(L, 3),
                                                      contentPtr));
@@ -615,7 +787,7 @@ static const struct luaL_Reg gSkDocument_Methods[] = {
     { "endPage", ldocument_endPage },
     { "close", ldocument_close },
     { "__gc", ldocument_gc },
-    { NULL, NULL }
+    { nullptr, nullptr }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -635,6 +807,11 @@ static int lpaint_isDither(lua_State* L) {
     return 1;
 }
 
+static int lpaint_setDither(lua_State* L) {
+    get_obj<SkPaint>(L, 1)->setDither(lua2bool(L, 2));
+    return 0;
+}
+
 static int lpaint_isUnderlineText(lua_State* L) {
     lua_pushboolean(L, get_obj<SkPaint>(L, 1)->isUnderlineText());
     return 1;
@@ -660,6 +837,11 @@ static int lpaint_isSubpixelText(lua_State* L) {
     return 1;
 }
 
+static int lpaint_setSubpixelText(lua_State* L) {
+    get_obj<SkPaint>(L, 1)->setSubpixelText(lua2bool(L, 2));
+    return 1;
+}
+
 static int lpaint_isDevKernText(lua_State* L) {
     lua_pushboolean(L, get_obj<SkPaint>(L, 1)->isDevKernText());
     return 1;
@@ -670,6 +852,11 @@ static int lpaint_isLCDRenderText(lua_State* L) {
     return 1;
 }
 
+static int lpaint_setLCDRenderText(lua_State* L) {
+    get_obj<SkPaint>(L, 1)->setLCDRenderText(lua2bool(L, 2));
+    return 1;
+}
+
 static int lpaint_isEmbeddedBitmapText(lua_State* L) {
     lua_pushboolean(L, get_obj<SkPaint>(L, 1)->isEmbeddedBitmapText());
     return 1;
@@ -685,6 +872,16 @@ static int lpaint_isVerticalText(lua_State* L) {
     return 1;
 }
 
+static int lpaint_getAlpha(lua_State* L) {
+    SkLua(L).pushScalar(byte2unit(get_obj<SkPaint>(L, 1)->getAlpha()));
+    return 1;
+}
+
+static int lpaint_setAlpha(lua_State* L) {
+    get_obj<SkPaint>(L, 1)->setAlpha(unit2byte(lua2scalar(L, 2)));
+    return 0;
+}
+
 static int lpaint_getColor(lua_State* L) {
     SkLua(L).pushColor(get_obj<SkPaint>(L, 1)->getColor());
     return 1;
@@ -730,6 +927,19 @@ static int lpaint_getHinting(lua_State* L) {
     return 1;
 }
 
+static int lpaint_getFilterQuality(lua_State* L) {
+    SkLua(L).pushU32(get_obj<SkPaint>(L, 1)->getFilterQuality());
+    return 1;
+}
+
+static int lpaint_setFilterQuality(lua_State* L) {
+    int level = lua2int_def(L, 2, -1);
+    if (level >= 0 && level <= 3) {
+        get_obj<SkPaint>(L, 1)->setFilterQuality((SkFilterQuality)level);
+    }
+    return 0;
+}
+
 static int lpaint_getFontID(lua_State* L) {
     SkTypeface* face = get_obj<SkPaint>(L, 1)->getTypeface();
     SkLua(L).pushU32(SkTypeface::UniqueID(face));
@@ -858,17 +1068,33 @@ static int lpaint_getEffects(lua_State* L) {
     const SkPaint* paint = get_obj<SkPaint>(L, 1);
 
     lua_newtable(L);
-    setfield_bool_if(L, "looper", !!paint->getLooper());
-    setfield_bool_if(L, "pathEffect", !!paint->getPathEffect());
-    setfield_bool_if(L, "rasterizer", !!paint->getRasterizer());
-    setfield_bool_if(L, "maskFilter", !!paint->getMaskFilter());
-    setfield_bool_if(L, "shader", !!paint->getShader());
+    setfield_bool_if(L, "looper",      !!paint->getLooper());
+    setfield_bool_if(L, "pathEffect",  !!paint->getPathEffect());
+    setfield_bool_if(L, "rasterizer",  !!paint->getRasterizer());
+    setfield_bool_if(L, "maskFilter",  !!paint->getMaskFilter());
+    setfield_bool_if(L, "shader",      !!paint->getShader());
     setfield_bool_if(L, "colorFilter", !!paint->getColorFilter());
     setfield_bool_if(L, "imageFilter", !!paint->getImageFilter());
-    setfield_bool_if(L, "xfermode", !!paint->getXfermode());
+    setfield_bool_if(L, "xfermode",    !!paint->getXfermode());
     return 1;
 }
 
+static int lpaint_getImageFilter(lua_State* L) {
+    const SkPaint* paint = get_obj<SkPaint>(L, 1);
+    SkImageFilter* imf = paint->getImageFilter();
+    if (imf) {
+        push_ref(L, imf);
+        return 1;
+    }
+    return 0;
+}
+
+static int lpaint_setImageFilter(lua_State* L) {
+    SkPaint* paint = get_obj<SkPaint>(L, 1);
+    paint->setImageFilter(get_ref<SkImageFilter>(L, 2));
+    return 0;
+}
+
 static int lpaint_getShader(lua_State* L) {
     const SkPaint* paint = get_obj<SkPaint>(L, 1);
     SkShader* shader = paint->getShader();
@@ -879,6 +1105,12 @@ static int lpaint_getShader(lua_State* L) {
     return 0;
 }
 
+static int lpaint_setShader(lua_State* L) {
+    SkPaint* paint = get_obj<SkPaint>(L, 1);
+    paint->setShader(get_ref<SkShader>(L, 2));
+    return 0;
+}
+
 static int lpaint_getPathEffect(lua_State* L) {
     const SkPaint* paint = get_obj<SkPaint>(L, 1);
     SkPathEffect* pe = paint->getPathEffect();
@@ -898,16 +1130,23 @@ static const struct luaL_Reg gSkPaint_Methods[] = {
     { "isAntiAlias", lpaint_isAntiAlias },
     { "setAntiAlias", lpaint_setAntiAlias },
     { "isDither", lpaint_isDither },
+    { "setDither", lpaint_setDither },
+    { "getFilterQuality", lpaint_getFilterQuality },
+    { "setFilterQuality", lpaint_setFilterQuality },
     { "isUnderlineText", lpaint_isUnderlineText },
     { "isStrikeThruText", lpaint_isStrikeThruText },
     { "isFakeBoldText", lpaint_isFakeBoldText },
     { "isLinearText", lpaint_isLinearText },
     { "isSubpixelText", lpaint_isSubpixelText },
+    { "setSubpixelText", lpaint_setSubpixelText },
     { "isDevKernText", lpaint_isDevKernText },
     { "isLCDRenderText", lpaint_isLCDRenderText },
+    { "setLCDRenderText", lpaint_setLCDRenderText },
     { "isEmbeddedBitmapText", lpaint_isEmbeddedBitmapText },
     { "isAutohinted", lpaint_isAutohinted },
     { "isVerticalText", lpaint_isVerticalText },
+    { "getAlpha", lpaint_getAlpha },
+    { "setAlpha", lpaint_setAlpha },
     { "getColor", lpaint_getColor },
     { "setColor", lpaint_setColor },
     { "getTextSize", lpaint_getTextSize },
@@ -931,10 +1170,13 @@ static const struct luaL_Reg gSkPaint_Methods[] = {
     { "measureText", lpaint_measureText },
     { "getFontMetrics", lpaint_getFontMetrics },
     { "getEffects", lpaint_getEffects },
+    { "getImageFilter", lpaint_getImageFilter },
+    { "setImageFilter", lpaint_setImageFilter },
     { "getShader", lpaint_getShader },
+    { "setShader", lpaint_setShader },
     { "getPathEffect", lpaint_getPathEffect },
     { "__gc", lpaint_gc },
-    { NULL, NULL }
+    { nullptr, nullptr }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -958,23 +1200,20 @@ static int lshader_isOpaque(lua_State* L) {
     return shader && shader->isOpaque();
 }
 
-static int lshader_asABitmap(lua_State* L) {
+static int lshader_isABitmap(lua_State* L) {
     SkShader* shader = get_ref<SkShader>(L, 1);
     if (shader) {
         SkBitmap bm;
         SkMatrix matrix;
         SkShader::TileMode modes[2];
-        switch (shader->asABitmap(&bm, &matrix, modes)) {
-            case SkShader::kDefault_BitmapType:
-                lua_newtable(L);
-                setfield_number(L, "genID", bm.pixelRef() ? bm.pixelRef()->getGenerationID() : 0);
-                setfield_number(L, "width", bm.width());
-                setfield_number(L, "height", bm.height());
-                setfield_string(L, "tileX", mode2string(modes[0]));
-                setfield_string(L, "tileY", mode2string(modes[1]));
-                return 1;
-            default:
-                break;
+        if (shader->isABitmap(&bm, &matrix, modes)) {
+            lua_newtable(L);
+            setfield_number(L, "genID", bm.pixelRef() ? bm.pixelRef()->getGenerationID() : 0);
+            setfield_number(L, "width", bm.width());
+            setfield_number(L, "height", bm.height());
+            setfield_string(L, "tileX", mode2string(modes[0]));
+            setfield_string(L, "tileY", mode2string(modes[1]));
+            return 1;
         }
     }
     return 0;
@@ -1018,10 +1257,10 @@ static int lshader_gc(lua_State* L) {
 
 static const struct luaL_Reg gSkShader_Methods[] = {
     { "isOpaque",       lshader_isOpaque },
-    { "asABitmap",      lshader_asABitmap },
+    { "isABitmap",      lshader_isABitmap },
     { "asAGradient",    lshader_asAGradient },
     { "__gc",           lshader_gc },
-    { NULL, NULL }
+    { nullptr, nullptr }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1050,7 +1289,19 @@ static int lpatheffect_gc(lua_State* L) {
 static const struct luaL_Reg gSkPathEffect_Methods[] = {
     { "asADash",        lpatheffect_asADash },
     { "__gc",           lpatheffect_gc },
-    { NULL, NULL }
+    { nullptr, nullptr }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+static int lpimagefilter_gc(lua_State* L) {
+    get_ref<SkImageFilter>(L, 1)->unref();
+    return 0;
+}
+
+static const struct luaL_Reg gSkImageFilter_Methods[] = {
+    { "__gc",       lpimagefilter_gc },
+    { nullptr, nullptr }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1086,13 +1337,60 @@ static int lmatrix_getTranslateY(lua_State* L) {
     return 1;
 }
 
+static int lmatrix_invert(lua_State* L) {
+    lua_pushboolean(L, get_obj<SkMatrix>(L, 1)->invert(get_obj<SkMatrix>(L, 2)));
+    return 1;
+}
+
+static int lmatrix_mapXY(lua_State* L) {
+    SkPoint pt = { lua2scalar(L, 2), lua2scalar(L, 3) };
+    get_obj<SkMatrix>(L, 1)->mapPoints(&pt, &pt, 1);
+    lua_pushnumber(L, pt.x());
+    lua_pushnumber(L, pt.y());
+    return 2;
+}
+
+static int lmatrix_setRectToRect(lua_State* L) {
+    SkMatrix* matrix = get_obj<SkMatrix>(L, 1);
+    SkRect srcR, dstR;
+    lua2rect(L, 2, &srcR);
+    lua2rect(L, 3, &dstR);
+    const char* scaleToFitStr = lua_tostring(L, 4);
+    SkMatrix::ScaleToFit scaleToFit = SkMatrix::kFill_ScaleToFit;
+
+    if (scaleToFitStr) {
+        const struct {
+            const char* fName;
+            SkMatrix::ScaleToFit fScaleToFit;
+        } rec[] = {
+            { "fill",   SkMatrix::kFill_ScaleToFit },
+            { "start",  SkMatrix::kStart_ScaleToFit },
+            { "center", SkMatrix::kCenter_ScaleToFit },
+            { "end",    SkMatrix::kEnd_ScaleToFit },
+        };
+
+        for (size_t i = 0; i < SK_ARRAY_COUNT(rec); ++i) {
+            if (strcmp(rec[i].fName, scaleToFitStr) == 0) {
+                scaleToFit = rec[i].fScaleToFit;
+                break;
+            }
+        }
+    }
+
+    matrix->setRectToRect(srcR, dstR, scaleToFit);
+    return 0;
+}
+
 static const struct luaL_Reg gSkMatrix_Methods[] = {
     { "getType", lmatrix_getType },
     { "getScaleX", lmatrix_getScaleX },
     { "getScaleY", lmatrix_getScaleY },
     { "getTranslateX", lmatrix_getTranslateX },
     { "getTranslateY", lmatrix_getTranslateY },
-    { NULL, NULL }
+    { "setRectToRect", lmatrix_setRectToRect },
+    { "invert", lmatrix_invert },
+    { "mapXY", lmatrix_mapXY },
+    { nullptr, nullptr }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1157,7 +1455,7 @@ static SkString segment_masks_to_str(uint32_t segmentMasks) {
     return result;
 }
 
-static int lpath_getSegementTypes(lua_State* L) {
+static int lpath_getSegmentTypes(lua_State* L) {
     uint32_t segMasks = get_obj<SkPath>(L, 1)->getSegmentMasks();
     SkLua(L).pushString(segment_masks_to_str(segMasks));
     return 1;
@@ -1194,10 +1492,10 @@ static const char* dir2string(SkPath::Direction dir) {
     return gStr[dir];
 }
 
-static int lpath_isNestedRects(lua_State* L) {
+static int lpath_isNestedFillRects(lua_State* L) {
     SkRect rects[2];
     SkPath::Direction dirs[2];
-    bool pred = get_obj<SkPath>(L, 1)->isNestedRects(rects, dirs);
+    bool pred = get_obj<SkPath>(L, 1)->isNestedFillRects(rects, dirs);
     int ret_count = 1;
     lua_pushboolean(L, pred);
     if (pred) {
@@ -1257,11 +1555,11 @@ static int lpath_gc(lua_State* L) {
 static const struct luaL_Reg gSkPath_Methods[] = {
     { "getBounds", lpath_getBounds },
     { "getFillType", lpath_getFillType },
-    { "getSegmentTypes", lpath_getSegementTypes },
+    { "getSegmentTypes", lpath_getSegmentTypes },
     { "isConvex", lpath_isConvex },
     { "isEmpty", lpath_isEmpty },
     { "isRect", lpath_isRect },
-    { "isNestedRects", lpath_isNestedRects },
+    { "isNestedFillRects", lpath_isNestedFillRects },
     { "countPoints", lpath_countPoints },
     { "reset", lpath_reset },
     { "moveTo", lpath_moveTo },
@@ -1270,14 +1568,13 @@ static const struct luaL_Reg gSkPath_Methods[] = {
     { "cubicTo", lpath_cubicTo },
     { "close", lpath_close },
     { "__gc", lpath_gc },
-    { NULL, NULL }
+    { nullptr, nullptr }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static const char* rrect_type(const SkRRect& rr) {
     switch (rr.getType()) {
-        case SkRRect::kUnknown_Type: return "unknown";
         case SkRRect::kEmpty_Type: return "empty";
         case SkRRect::kRect_Type: return "rect";
         case SkRRect::kOval_Type: return "oval";
@@ -1323,7 +1620,7 @@ static const struct luaL_Reg gSkRRect_Methods[] = {
     { "type", lrrect_type },
     { "radii", lrrect_radii },
     { "__gc", lrrect_gc },
-    { NULL, NULL }
+    { nullptr, nullptr }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1338,6 +1635,14 @@ static int limage_height(lua_State* L) {
     return 1;
 }
 
+static int limage_newShader(lua_State* L) {
+    SkShader::TileMode tmode = SkShader::kClamp_TileMode;
+    const SkMatrix* localM = nullptr;
+    SkAutoTUnref<SkShader> shader(get_ref<SkImage>(L, 1)->newShader(tmode, tmode, localM));
+    push_ref(L, shader.get());
+    return 1;
+}
+
 static int limage_gc(lua_State* L) {
     get_ref<SkImage>(L, 1)->unref();
     return 0;
@@ -1346,20 +1651,195 @@ static int limage_gc(lua_State* L) {
 static const struct luaL_Reg gSkImage_Methods[] = {
     { "width", limage_width },
     { "height", limage_height },
+    { "newShader", limage_newShader },
     { "__gc", limage_gc },
-    { NULL, NULL }
+    { nullptr, nullptr }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
+static int lsurface_width(lua_State* L) {
+    lua_pushinteger(L, get_ref<SkSurface>(L, 1)->width());
+    return 1;
+}
+
+static int lsurface_height(lua_State* L) {
+    lua_pushinteger(L, get_ref<SkSurface>(L, 1)->height());
+    return 1;
+}
+
+static int lsurface_getCanvas(lua_State* L) {
+    SkCanvas* canvas = get_ref<SkSurface>(L, 1)->getCanvas();
+    if (nullptr == canvas) {
+        lua_pushnil(L);
+    } else {
+        push_ref(L, canvas);
+        // note: we don't unref canvas, since getCanvas did not ref it.
+        // warning: this is weird: now Lua owns a ref on this canvas, but what if they let
+        // the real owner (the surface) go away, but still hold onto the canvas?
+        // *really* we want to sort of ref the surface again, but have the native object
+        // know that it is supposed to be treated as a canvas...
+    }
+    return 1;
+}
+
+static int lsurface_newImageSnapshot(lua_State* L) {
+    SkImage* image = get_ref<SkSurface>(L, 1)->newImageSnapshot();
+    if (nullptr == image) {
+        lua_pushnil(L);
+    } else {
+        push_ref(L, image)->unref();
+    }
+    return 1;
+}
+
+static int lsurface_newSurface(lua_State* L) {
+    int width = lua2int_def(L, 2, 0);
+    int height = lua2int_def(L, 3, 0);
+    SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
+    SkSurface* surface = get_ref<SkSurface>(L, 1)->newSurface(info);
+    if (nullptr == surface) {
+        lua_pushnil(L);
+    } else {
+        push_ref(L, surface)->unref();
+    }
+    return 1;
+}
+
+static int lsurface_gc(lua_State* L) {
+    get_ref<SkSurface>(L, 1)->unref();
+    return 0;
+}
+
+static const struct luaL_Reg gSkSurface_Methods[] = {
+    { "width", lsurface_width },
+    { "height", lsurface_height },
+    { "getCanvas", lsurface_getCanvas },
+    { "newImageSnapshot", lsurface_newImageSnapshot },
+    { "newSurface", lsurface_newSurface },
+    { "__gc", lsurface_gc },
+    { nullptr, nullptr }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+static int lpicturerecorder_beginRecording(lua_State* L) {
+    const SkScalar w = lua2scalar_def(L, 2, -1);
+    const SkScalar h = lua2scalar_def(L, 3, -1);
+    if (w <= 0 || h <= 0) {
+        lua_pushnil(L);
+        return 1;
+    }
+
+    SkCanvas* canvas = get_obj<SkPictureRecorder>(L, 1)->beginRecording(w, h);
+    if (nullptr == canvas) {
+        lua_pushnil(L);
+        return 1;
+    }
+
+    push_ref(L, canvas);
+    return 1;
+}
+
+static int lpicturerecorder_getCanvas(lua_State* L) {
+    SkCanvas* canvas = get_obj<SkPictureRecorder>(L, 1)->getRecordingCanvas();
+    if (nullptr == canvas) {
+        lua_pushnil(L);
+        return 1;
+    }
+    push_ref(L, canvas);
+    return 1;
+}
+
+static int lpicturerecorder_endRecording(lua_State* L) {
+    SkPicture* pic = get_obj<SkPictureRecorder>(L, 1)->endRecording();
+    if (nullptr == pic) {
+        lua_pushnil(L);
+        return 1;
+    }
+    push_ref(L, pic)->unref();
+    return 1;
+}
+
+static int lpicturerecorder_gc(lua_State* L) {
+    get_obj<SkPictureRecorder>(L, 1)->~SkPictureRecorder();
+    return 0;
+}
+
+static const struct luaL_Reg gSkPictureRecorder_Methods[] = {
+    { "beginRecording", lpicturerecorder_beginRecording },
+    { "getCanvas", lpicturerecorder_getCanvas },
+    { "endRecording", lpicturerecorder_endRecording },
+    { "__gc", lpicturerecorder_gc },
+    { nullptr, nullptr }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+static int lpicture_width(lua_State* L) {
+    lua_pushnumber(L, get_ref<SkPicture>(L, 1)->cullRect().width());
+    return 1;
+}
+
+static int lpicture_height(lua_State* L) {
+    lua_pushnumber(L, get_ref<SkPicture>(L, 1)->cullRect().height());
+    return 1;
+}
+
+static int lpicture_gc(lua_State* L) {
+    get_ref<SkPicture>(L, 1)->unref();
+    return 0;
+}
+
+static const struct luaL_Reg gSkPicture_Methods[] = {
+    { "width", lpicture_width },
+    { "height", lpicture_height },
+    { "__gc", lpicture_gc },
+    { nullptr, nullptr }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+static int ltextblob_bounds(lua_State* L) {
+    SkLua(L).pushRect(get_ref<SkTextBlob>(L, 1)->bounds());
+    return 1;
+}
+
+static int ltextblob_gc(lua_State* L) {
+    SkSafeUnref(get_ref<SkTextBlob>(L, 1));
+    return 0;
+}
+
+static const struct luaL_Reg gSkTextBlob_Methods[] = {
+    { "bounds", ltextblob_bounds },
+    { "__gc", ltextblob_gc },
+    { nullptr, nullptr }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+static int ltypeface_getFamilyName(lua_State* L) {
+    SkString str;
+    get_ref<SkTypeface>(L, 1)->getFamilyName(&str);
+    lua_pushstring(L, str.c_str());
+    return 1;
+}
+
+static int ltypeface_getStyle(lua_State* L) {
+    lua_pushnumber(L, (double)get_ref<SkTypeface>(L, 1)->style());
+    return 1;
+}
+
 static int ltypeface_gc(lua_State* L) {
     SkSafeUnref(get_ref<SkTypeface>(L, 1));
     return 0;
 }
 
 static const struct luaL_Reg gSkTypeface_Methods[] = {
+    { "getFamilyName", ltypeface_getFamilyName },
+    { "getStyle", ltypeface_getStyle },
     { "__gc", ltypeface_gc },
-    { NULL, NULL }
+    { nullptr, nullptr }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1393,22 +1873,57 @@ private:
 ///////////////////////////////////////////////////////////////////////////////
 
 static int lsk_newDocumentPDF(lua_State* L) {
-    const char* file = NULL;
+    const char* file = nullptr;
     if (lua_gettop(L) > 0 && lua_isstring(L, 1)) {
-        file = lua_tolstring(L, 1, NULL);
+        file = lua_tolstring(L, 1, nullptr);
     }
 
     SkDocument* doc = SkDocument::CreatePDF(file);
-    if (NULL == doc) {
+    if (nullptr == doc) {
         // do I need to push a nil on the stack and return 1?
         return 0;
     } else {
-        push_ref(L, doc);
-        doc->unref();
+        push_ref(L, doc)->unref();
         return 1;
     }
 }
 
+static int lsk_newBlurImageFilter(lua_State* L) {
+    SkScalar sigmaX = lua2scalar_def(L, 1, 0);
+    SkScalar sigmaY = lua2scalar_def(L, 2, 0);
+    SkImageFilter* imf = SkBlurImageFilter::Create(sigmaX, sigmaY);
+    if (nullptr == imf) {
+        lua_pushnil(L);
+    } else {
+        push_ref(L, imf)->unref();
+    }
+    return 1;
+}
+
+static int lsk_newLinearGradient(lua_State* L) {
+    SkScalar x0 = lua2scalar_def(L, 1, 0);
+    SkScalar y0 = lua2scalar_def(L, 2, 0);
+    SkColor  c0 = lua2color(L, 3);
+    SkScalar x1 = lua2scalar_def(L, 4, 0);
+    SkScalar y1 = lua2scalar_def(L, 5, 0);
+    SkColor  c1 = lua2color(L, 6);
+
+    SkPoint pts[] = { { x0, y0 }, { x1, y1 } };
+    SkColor colors[] = { c0, c1 };
+    SkShader* s = SkGradientShader::CreateLinear(pts, colors, nullptr, 2, SkShader::kClamp_TileMode);
+    if (nullptr == s) {
+        lua_pushnil(L);
+    } else {
+        push_ref(L, s)->unref();
+    }
+    return 1;
+}
+
+static int lsk_newMatrix(lua_State* L) {
+    push_new<SkMatrix>(L)->reset();
+    return 1;
+}
+
 static int lsk_newPaint(lua_State* L) {
     push_new<SkPaint>(L);
     return 1;
@@ -1419,44 +1934,80 @@ static int lsk_newPath(lua_State* L) {
     return 1;
 }
 
-static int lsk_newRRect(lua_State* L) {
-    SkRRect* rr = push_new<SkRRect>(L);
-    rr->setEmpty();
+static int lsk_newPictureRecorder(lua_State* L) {
+    push_new<SkPictureRecorder>(L);
     return 1;
 }
 
+static int lsk_newRRect(lua_State* L) {
+    push_new<SkRRect>(L)->setEmpty();
+    return 1;
+}
+
+#include "SkTextBox.h"
+// Sk.newTextBlob(text, rect, paint)
+static int lsk_newTextBlob(lua_State* L) {
+    const char* text = lua_tolstring(L, 1, nullptr);
+    SkRect bounds;
+    lua2rect(L, 2, &bounds);
+    const SkPaint& paint = *get_obj<SkPaint>(L, 3);
+
+    SkTextBox box;
+    box.setMode(SkTextBox::kLineBreak_Mode);
+    box.setBox(bounds);
+    box.setText(text, strlen(text), paint);
+
+    SkScalar newBottom;
+    SkAutoTUnref<SkTextBlob> blob(box.snapshotTextBlob(&newBottom));
+    push_ref<SkTextBlob>(L, blob);
+    SkLua(L).pushScalar(newBottom);
+    return 2;
+}
+
 static int lsk_newTypeface(lua_State* L) {
-    const char* name = NULL;
+    const char* name = nullptr;
     int style = SkTypeface::kNormal;
 
     int count = lua_gettop(L);
     if (count > 0 && lua_isstring(L, 1)) {
-        name = lua_tolstring(L, 1, NULL);
+        name = lua_tolstring(L, 1, nullptr);
         if (count > 1 && lua_isnumber(L, 2)) {
-            style = lua_tointegerx(L, 2, NULL) & SkTypeface::kBoldItalic;
+            style = lua_tointegerx(L, 2, nullptr) & SkTypeface::kBoldItalic;
         }
     }
 
     SkTypeface* face = SkTypeface::CreateFromName(name,
                                                   (SkTypeface::Style)style);
 //    SkDebugf("---- name <%s> style=%d, face=%p ref=%d\n", name, style, face, face->getRefCnt());
-    if (NULL == face) {
+    if (nullptr == face) {
         face = SkTypeface::RefDefault();
     }
-    push_ref(L, face);
-    face->unref();
+    push_ref(L, face)->unref();
+    return 1;
+}
+
+static int lsk_newRasterSurface(lua_State* L) {
+    int width = lua2int_def(L, 1, 0);
+    int height = lua2int_def(L, 2, 0);
+    SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
+    SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
+    SkSurface* surface = SkSurface::NewRaster(info, &props);
+    if (nullptr == surface) {
+        lua_pushnil(L);
+    } else {
+        push_ref(L, surface)->unref();
+    }
     return 1;
 }
 
 static int lsk_loadImage(lua_State* L) {
     if (lua_gettop(L) > 0 && lua_isstring(L, 1)) {
-        const char* name = lua_tolstring(L, 1, NULL);
+        const char* name = lua_tolstring(L, 1, nullptr);
         SkAutoDataUnref data(SkData::NewFromFileName(name));
         if (data.get()) {
-            SkImage* image = SkImage::NewEncodedData(data.get());
+            SkImage* image = SkImage::NewFromEncoded(data);
             if (image) {
-                push_ref(L, image);
-                image->unref();
+                push_ref(L, image)->unref();
                 return 1;
             }
         }
@@ -1472,9 +2023,15 @@ static void register_Sk(lua_State* L) {
 
     setfield_function(L, "newDocumentPDF", lsk_newDocumentPDF);
     setfield_function(L, "loadImage", lsk_loadImage);
+    setfield_function(L, "newBlurImageFilter", lsk_newBlurImageFilter);
+    setfield_function(L, "newLinearGradient", lsk_newLinearGradient);
+    setfield_function(L, "newMatrix", lsk_newMatrix);
     setfield_function(L, "newPaint", lsk_newPaint);
     setfield_function(L, "newPath", lsk_newPath);
+    setfield_function(L, "newPictureRecorder", lsk_newPictureRecorder);
     setfield_function(L, "newRRect", lsk_newRRect);
+    setfield_function(L, "newRasterSurface", lsk_newRasterSurface);
+    setfield_function(L, "newTextBlob", lsk_newTextBlob);
     setfield_function(L, "newTypeface", lsk_newTypeface);
     lua_pop(L, 1);  // pop off the Sk table
 }
@@ -1493,13 +2050,18 @@ void SkLua::Load(lua_State* L) {
     REG_CLASS(L, SkCanvas);
     REG_CLASS(L, SkDocument);
     REG_CLASS(L, SkImage);
+    REG_CLASS(L, SkImageFilter);
+    REG_CLASS(L, SkMatrix);
     REG_CLASS(L, SkPaint);
     REG_CLASS(L, SkPath);
     REG_CLASS(L, SkPathEffect);
+    REG_CLASS(L, SkPicture);
+    REG_CLASS(L, SkPictureRecorder);
     REG_CLASS(L, SkRRect);
     REG_CLASS(L, SkShader);
+    REG_CLASS(L, SkSurface);
+    REG_CLASS(L, SkTextBlob);
     REG_CLASS(L, SkTypeface);
-    REG_CLASS(L, SkMatrix);
 }
 
 extern "C" int luaopen_skia(lua_State* L);
diff --git a/gfx/skia/skia/src/utils/SkLuaCanvas.cpp b/gfx/skia/skia/src/utils/SkLuaCanvas.cpp
index b0b912827f74..ada76666fe50 100644
--- a/gfx/skia/skia/src/utils/SkLuaCanvas.cpp
+++ b/gfx/skia/skia/src/utils/SkLuaCanvas.cpp
@@ -162,31 +162,31 @@ void SkLuaCanvas::onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) {
     this->INHERITED::onClipRegion(deviceRgn, op);
 }
 
-void SkLuaCanvas::drawPaint(const SkPaint& paint) {
+void SkLuaCanvas::onDrawPaint(const SkPaint& paint) {
     AUTO_LUA("drawPaint");
     lua.pushPaint(paint, "paint");
 }
 
-void SkLuaCanvas::drawPoints(PointMode mode, size_t count,
+void SkLuaCanvas::onDrawPoints(PointMode mode, size_t count,
                                const SkPoint pts[], const SkPaint& paint) {
     AUTO_LUA("drawPoints");
     lua.pushArrayPoint(pts, SkToInt(count), "points");
     lua.pushPaint(paint, "paint");
 }
 
-void SkLuaCanvas::drawOval(const SkRect& rect, const SkPaint& paint) {
+void SkLuaCanvas::onDrawOval(const SkRect& rect, const SkPaint& paint) {
     AUTO_LUA("drawOval");
     lua.pushRect(rect, "rect");
     lua.pushPaint(paint, "paint");
 }
 
-void SkLuaCanvas::drawRect(const SkRect& rect, const SkPaint& paint) {
+void SkLuaCanvas::onDrawRect(const SkRect& rect, const SkPaint& paint) {
     AUTO_LUA("drawRect");
     lua.pushRect(rect, "rect");
     lua.pushPaint(paint, "paint");
 }
 
-void SkLuaCanvas::drawRRect(const SkRRect& rrect, const SkPaint& paint) {
+void SkLuaCanvas::onDrawRRect(const SkRRect& rrect, const SkPaint& paint) {
     AUTO_LUA("drawRRect");
     lua.pushRRect(rrect, "rrect");
     lua.pushPaint(paint, "paint");
@@ -200,39 +200,52 @@ void SkLuaCanvas::onDrawDRRect(const SkRRect& outer, const SkRRect& inner,
     lua.pushPaint(paint, "paint");
 }
 
-void SkLuaCanvas::drawPath(const SkPath& path, const SkPaint& paint) {
+void SkLuaCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) {
     AUTO_LUA("drawPath");
     lua.pushPath(path, "path");
     lua.pushPaint(paint, "paint");
 }
 
-void SkLuaCanvas::drawBitmap(const SkBitmap& bitmap, SkScalar x, SkScalar y,
-                             const SkPaint* paint) {
+void SkLuaCanvas::onDrawBitmap(const SkBitmap& bitmap, SkScalar x, SkScalar y,
+                               const SkPaint* paint) {
     AUTO_LUA("drawBitmap");
     if (paint) {
         lua.pushPaint(*paint, "paint");
     }
 }
 
-void SkLuaCanvas::drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src,
-                                       const SkRect& dst, const SkPaint* paint,
-                                       DrawBitmapRectFlags flags) {
-    AUTO_LUA("drawBitmapRectToRect");
+void SkLuaCanvas::onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst,
+                                   const SkPaint* paint, SrcRectConstraint) {
+    AUTO_LUA("drawBitmapRect");
     if (paint) {
         lua.pushPaint(*paint, "paint");
     }
 }
 
-void SkLuaCanvas::drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m,
+void SkLuaCanvas::onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center, const SkRect& dst,
                                    const SkPaint* paint) {
-    AUTO_LUA("drawBitmapMatrix");
+    AUTO_LUA("drawBitmapNine");
     if (paint) {
         lua.pushPaint(*paint, "paint");
     }
 }
 
-void SkLuaCanvas::drawSprite(const SkBitmap& bitmap, int x, int y,
-                               const SkPaint* paint) {
+void SkLuaCanvas::onDrawImage(const SkImage* image, SkScalar x, SkScalar y, const SkPaint* paint) {
+    AUTO_LUA("drawImage");
+    if (paint) {
+        lua.pushPaint(*paint, "paint");
+    }
+}
+
+void SkLuaCanvas::onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
+                                  const SkPaint* paint, SrcRectConstraint) {
+    AUTO_LUA("drawImageRect");
+    if (paint) {
+        lua.pushPaint(*paint, "paint");
+    }
+}
+
+void SkLuaCanvas::onDrawSprite(const SkBitmap& bitmap, int x, int y, const SkPaint* paint) {
     AUTO_LUA("drawSprite");
     if (paint) {
         lua.pushPaint(*paint, "paint");
@@ -268,13 +281,23 @@ void SkLuaCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const Sk
     lua.pushPaint(paint, "paint");
 }
 
-void SkLuaCanvas::onDrawPicture(const SkPicture* picture) {
-    AUTO_LUA("drawPicture");
-    // call through so we can see the nested picture ops
-    this->INHERITED::onDrawPicture(picture);
+void SkLuaCanvas::onDrawTextBlob(const SkTextBlob *blob, SkScalar x, SkScalar y,
+                                 const SkPaint &paint) {
+    AUTO_LUA("drawTextBlob");
+    lua.pushTextBlob(blob, "blob");
+    lua.pushScalar(x, "x");
+    lua.pushScalar(y, "y");
+    lua.pushPaint(paint, "paint");
 }
 
-void SkLuaCanvas::drawVertices(VertexMode vmode, int vertexCount,
+void SkLuaCanvas::onDrawPicture(const SkPicture* picture, const SkMatrix* matrix,
+                                const SkPaint* paint) {
+    AUTO_LUA("drawPicture");
+    // call through so we can see the nested picture ops
+    this->INHERITED::onDrawPicture(picture, matrix, paint);
+}
+
+void SkLuaCanvas::onDrawVertices(VertexMode vmode, int vertexCount,
                                  const SkPoint vertices[], const SkPoint texs[],
                                  const SkColor colors[], SkXfermode* xmode,
                                  const uint16_t indices[], int indexCount,
@@ -282,7 +305,3 @@ void SkLuaCanvas::drawVertices(VertexMode vmode, int vertexCount,
     AUTO_LUA("drawVertices");
     lua.pushPaint(paint, "paint");
 }
-
-void SkLuaCanvas::drawData(const void* data, size_t length) {
-    AUTO_LUA("drawData");
-}
diff --git a/gfx/skia/skia/src/utils/SkMD5.h b/gfx/skia/skia/src/utils/SkMD5.h
index 4f504782b6b8..ed557931c242 100644
--- a/gfx/skia/skia/src/utils/SkMD5.h
+++ b/gfx/skia/skia/src/utils/SkMD5.h
@@ -24,18 +24,24 @@ public:
     /** Processes input, adding it to the digest.
      *  Note that this treats the buffer as a series of uint8_t values.
      */
-    virtual bool write(const void* buffer, size_t size) SK_OVERRIDE {
+    bool write(const void* buffer, size_t size) override {
         this->update(reinterpret_cast<const uint8_t*>(buffer), size);
         return true;
     }
 
-    virtual size_t bytesWritten() const SK_OVERRIDE { return SkToSizeT(this->byteCount); }
+    size_t bytesWritten() const override { return SkToSizeT(this->byteCount); }
 
     /** Processes input, adding it to the digest. Calling this after finish is undefined. */
     void update(const uint8_t* input, size_t length);
 
     struct Digest {
         uint8_t data[16];
+        bool operator ==(Digest const& other) const {
+            return 0 == memcmp(data, other.data, sizeof(data));
+        }
+        bool operator !=(Digest const& other) const {
+            return 0 != memcmp(data, other.data, sizeof(data));
+        }
     };
 
     /** Computes and returns the digest. */
diff --git a/gfx/skia/skia/src/utils/SkMatrix44.cpp b/gfx/skia/skia/src/utils/SkMatrix44.cpp
index a7133ec1a75f..71cd74002b87 100644
--- a/gfx/skia/skia/src/utils/SkMatrix44.cpp
+++ b/gfx/skia/skia/src/utils/SkMatrix44.cpp
@@ -448,54 +448,71 @@ double SkMatrix44::determinant() const {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-bool SkMatrix44::invert(SkMatrix44* inverse) const {
+static bool is_matrix_finite(const SkMatrix44& matrix) {
+    SkMScalar accumulator = 0;
+    for (int row = 0; row < 4; ++row) {
+        for (int col = 0; col < 4; ++col) {
+            accumulator *= matrix.get(row, col);
+        }
+    }
+    return accumulator == 0;
+}
+
+bool SkMatrix44::invert(SkMatrix44* storage) const {
     if (this->isIdentity()) {
-        if (inverse) {
-            inverse->setIdentity();
+        if (storage) {
+            storage->setIdentity();
         }
         return true;
     }
 
     if (this->isTranslate()) {
-        if (inverse) {
-            inverse->setTranslate(-fMat[3][0], -fMat[3][1], -fMat[3][2]);
+        if (storage) {
+            storage->setTranslate(-fMat[3][0], -fMat[3][1], -fMat[3][2]);
         }
         return true;
     }
 
+    SkMatrix44 tmp(kUninitialized_Constructor);
+    // Use storage if it's available and distinct from this matrix.
+    SkMatrix44* inverse = (storage && storage != this) ? storage : &tmp;
     if (this->isScaleTranslate()) {
         if (0 == fMat[0][0] * fMat[1][1] * fMat[2][2]) {
             return false;
         }
 
-        if (inverse) {
-            double invXScale = 1 / fMat[0][0];
-            double invYScale = 1 / fMat[1][1];
-            double invZScale = 1 / fMat[2][2];
+        double invXScale = 1 / fMat[0][0];
+        double invYScale = 1 / fMat[1][1];
+        double invZScale = 1 / fMat[2][2];
 
-            inverse->fMat[0][0] = invXScale;
-            inverse->fMat[0][1] = 0;
-            inverse->fMat[0][2] = 0;
-            inverse->fMat[0][3] = 0;
+        inverse->fMat[0][0] = SkDoubleToMScalar(invXScale);
+        inverse->fMat[0][1] = 0;
+        inverse->fMat[0][2] = 0;
+        inverse->fMat[0][3] = 0;
 
-            inverse->fMat[1][0] = 0;
-            inverse->fMat[1][1] = invYScale;
-            inverse->fMat[1][2] = 0;
-            inverse->fMat[1][3] = 0;
+        inverse->fMat[1][0] = 0;
+        inverse->fMat[1][1] = SkDoubleToMScalar(invYScale);
+        inverse->fMat[1][2] = 0;
+        inverse->fMat[1][3] = 0;
 
-            inverse->fMat[2][0] = 0;
-            inverse->fMat[2][1] = 0;
-            inverse->fMat[2][2] = invZScale;
-            inverse->fMat[2][3] = 0;
+        inverse->fMat[2][0] = 0;
+        inverse->fMat[2][1] = 0;
+        inverse->fMat[2][2] = SkDoubleToMScalar(invZScale);
+        inverse->fMat[2][3] = 0;
 
-            inverse->fMat[3][0] = -fMat[3][0] * invXScale;
-            inverse->fMat[3][1] = -fMat[3][1] * invYScale;
-            inverse->fMat[3][2] = -fMat[3][2] * invZScale;
-            inverse->fMat[3][3] = 1;
+        inverse->fMat[3][0] = SkDoubleToMScalar(-fMat[3][0] * invXScale);
+        inverse->fMat[3][1] = SkDoubleToMScalar(-fMat[3][1] * invYScale);
+        inverse->fMat[3][2] = SkDoubleToMScalar(-fMat[3][2] * invZScale);
+        inverse->fMat[3][3] = 1;
 
-            inverse->setTypeMask(this->getType());
+        inverse->setTypeMask(this->getType());
+
+        if (!is_matrix_finite(*inverse)) {
+            return false;
+        }
+        if (storage && inverse != storage) {
+            *storage = *inverse;
         }
-
         return true;
     }
 
@@ -547,9 +564,6 @@ bool SkMatrix44::invert(SkMatrix44* inverse) const {
         if (!sk_float_isfinite(invdet)) {
             return false;
         }
-        if (NULL == inverse) {
-            return true;
-        }
 
         b00 *= invdet;
         b01 *= invdet;
@@ -579,6 +593,12 @@ bool SkMatrix44::invert(SkMatrix44* inverse) const {
         inverse->fMat[3][3] = 1;
 
         inverse->setTypeMask(this->getType());
+        if (!is_matrix_finite(*inverse)) {
+            return false;
+        }
+        if (storage && inverse != storage) {
+            *storage = *inverse;
+        }
         return true;
     }
 
@@ -605,9 +625,6 @@ bool SkMatrix44::invert(SkMatrix44* inverse) const {
     if (!sk_float_isfinite(invdet)) {
         return false;
     }
-    if (NULL == inverse) {
-        return true;
-    }
 
     b00 *= invdet;
     b01 *= invdet;
@@ -640,6 +657,13 @@ bool SkMatrix44::invert(SkMatrix44* inverse) const {
     inverse->fMat[3][3] = SkDoubleToMScalar(a20 * b03 - a21 * b01 + a22 * b00);
     inverse->dirtyTypeMask();
 
+    inverse->setTypeMask(this->getType());
+    if (!is_matrix_finite(*inverse)) {
+        return false;
+    }
+    if (storage && inverse != storage) {
+        *storage = *inverse;
+    }
     return true;
 }
 
@@ -857,6 +881,46 @@ void SkMatrix44::map2(const double src2[], int count, double dst4[]) const {
     proc(fMat, src2, count, dst4);
 }
 
+bool SkMatrix44::preserves2dAxisAlignment (SkMScalar epsilon) const {
+
+    // Can't check (mask & kPerspective_Mask) because Z isn't relevant here.
+    if (0 != perspX() || 0 != perspY()) return false;
+
+    // A matrix with two non-zeroish values in any of the upper right
+    // rows or columns will skew.  If only one value in each row or
+    // column is non-zeroish, we get a scale plus perhaps a 90-degree
+    // rotation.
+    int col0 = 0;
+    int col1 = 0;
+    int row0 = 0;
+    int row1 = 0;
+
+    // Must test against epsilon, not 0, because we can get values
+    // around 6e-17 in the matrix that "should" be 0.
+
+    if (SkMScalarAbs(fMat[0][0]) > epsilon) {
+        col0++;
+        row0++;
+    }
+    if (SkMScalarAbs(fMat[0][1]) > epsilon) {
+        col1++;
+        row0++;
+    }
+    if (SkMScalarAbs(fMat[1][0]) > epsilon) {
+        col0++;
+        row1++;
+    }
+    if (SkMScalarAbs(fMat[1][1]) > epsilon) {
+        col1++;
+        row1++;
+    }
+    if (col0 > 1 || col1 > 1 || row0 > 1 || row1 > 1) {
+        return false;
+    }
+
+    return true;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkMatrix44::dump() const {
@@ -899,7 +963,7 @@ static void initFromMatrix(SkMScalar dst[4][4], const SkMatrix& src) {
 }
 
 SkMatrix44::SkMatrix44(const SkMatrix& src) {
-    initFromMatrix(fMat, src);
+    this->operator=(src);
 }
 
 SkMatrix44& SkMatrix44::operator=(const SkMatrix& src) {
diff --git a/gfx/skia/skia/src/utils/SkMeshUtils.cpp b/gfx/skia/skia/src/utils/SkMeshUtils.cpp
index 3857dc954f41..cf4e5099b37b 100644
--- a/gfx/skia/skia/src/utils/SkMeshUtils.cpp
+++ b/gfx/skia/skia/src/utils/SkMeshUtils.cpp
@@ -21,15 +21,15 @@ bool SkMeshIndices::init(SkPoint tex[], uint16_t indices[],
                          int texW, int texH, int rows, int cols) {
     if (rows < 2 || cols < 2) {
         sk_free(fStorage);
-        fStorage = NULL;
-        fTex = NULL;
-        fIndices = NULL;
+        fStorage = nullptr;
+        fTex = nullptr;
+        fIndices = nullptr;
         fTexCount = fIndexCount = 0;
         return false;
     }
 
     sk_free(fStorage);
-    fStorage = NULL;
+    fStorage = nullptr;
 
     fTexCount = rows * cols;
     rows -= 1;
@@ -96,7 +96,7 @@ void SkMeshUtils::Draw(SkCanvas* canvas, const SkBitmap& bitmap,
                                          SkShader::kClamp_TileMode,
                                          SkShader::kClamp_TileMode))->unref();
         canvas->drawVertices(SkCanvas::kTriangles_VertexMode,
-                             rows * cols, verts, idx.tex(), colors, NULL,
+                             rows * cols, verts, idx.tex(), colors, nullptr,
                              idx.indices(), idx.indexCount(), p);
     }
 }
diff --git a/gfx/skia/skia/src/utils/SkNWayCanvas.cpp b/gfx/skia/skia/src/utils/SkNWayCanvas.cpp
index 11e4a65349bf..fb8d0ee13eb7 100644
--- a/gfx/skia/skia/src/utils/SkNWayCanvas.cpp
+++ b/gfx/skia/skia/src/utils/SkNWayCanvas.cpp
@@ -134,99 +134,97 @@ void SkNWayCanvas::onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) {
     this->INHERITED::onClipRegion(deviceRgn, op);
 }
 
-void SkNWayCanvas::clear(SkColor color) {
-    Iter iter(fList);
-    while (iter.next()) {
-        iter->clear(color);
-    }
-}
-
-void SkNWayCanvas::drawPaint(const SkPaint& paint) {
+void SkNWayCanvas::onDrawPaint(const SkPaint& paint) {
     Iter iter(fList);
     while (iter.next()) {
         iter->drawPaint(paint);
     }
 }
 
-void SkNWayCanvas::drawPoints(PointMode mode, size_t count, const SkPoint pts[],
-                        const SkPaint& paint) {
+void SkNWayCanvas::onDrawPoints(PointMode mode, size_t count, const SkPoint pts[],
+                                const SkPaint& paint) {
     Iter iter(fList);
     while (iter.next()) {
         iter->drawPoints(mode, count, pts, paint);
     }
 }
 
-void SkNWayCanvas::drawRect(const SkRect& rect, const SkPaint& paint) {
+void SkNWayCanvas::onDrawRect(const SkRect& rect, const SkPaint& paint) {
     Iter iter(fList);
     while (iter.next()) {
         iter->drawRect(rect, paint);
     }
 }
 
-void SkNWayCanvas::drawOval(const SkRect& rect, const SkPaint& paint) {
+void SkNWayCanvas::onDrawOval(const SkRect& rect, const SkPaint& paint) {
     Iter iter(fList);
     while (iter.next()) {
         iter->drawOval(rect, paint);
     }
 }
 
-void SkNWayCanvas::drawRRect(const SkRRect& rrect, const SkPaint& paint) {
+void SkNWayCanvas::onDrawRRect(const SkRRect& rrect, const SkPaint& paint) {
     Iter iter(fList);
     while (iter.next()) {
         iter->drawRRect(rrect, paint);
     }
 }
 
-void SkNWayCanvas::onDrawDRRect(const SkRRect& outer, const SkRRect& inner,
-                                const SkPaint& paint) {
+void SkNWayCanvas::onDrawDRRect(const SkRRect& outer, const SkRRect& inner, const SkPaint& paint) {
     Iter iter(fList);
     while (iter.next()) {
         iter->drawDRRect(outer, inner, paint);
     }
 }
 
-void SkNWayCanvas::drawPath(const SkPath& path, const SkPaint& paint) {
+void SkNWayCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) {
     Iter iter(fList);
     while (iter.next()) {
         iter->drawPath(path, paint);
     }
 }
 
-void SkNWayCanvas::drawBitmap(const SkBitmap& bitmap, SkScalar x, SkScalar y,
-                              const SkPaint* paint) {
+void SkNWayCanvas::onDrawBitmap(const SkBitmap& bitmap, SkScalar x, SkScalar y,
+                                const SkPaint* paint) {
     Iter iter(fList);
     while (iter.next()) {
         iter->drawBitmap(bitmap, x, y, paint);
     }
 }
 
-void SkNWayCanvas::drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src,
-                                  const SkRect& dst, const SkPaint* paint,
-                                  DrawBitmapRectFlags flags) {
+void SkNWayCanvas::onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst,
+                                    const SkPaint* paint, SrcRectConstraint constraint) {
     Iter iter(fList);
     while (iter.next()) {
-        iter->drawBitmapRectToRect(bitmap, src, dst, paint, flags);
+        iter->legacy_drawBitmapRect(bitmap, src, dst, paint, (SrcRectConstraint)constraint);
     }
 }
 
-void SkNWayCanvas::drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m,
-                                    const SkPaint* paint) {
-    Iter iter(fList);
-    while (iter.next()) {
-        iter->drawBitmapMatrix(bitmap, m, paint);
-    }
-}
-
-void SkNWayCanvas::drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
-                                  const SkRect& dst, const SkPaint* paint) {
+void SkNWayCanvas::onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
+                                    const SkRect& dst, const SkPaint* paint) {
     Iter iter(fList);
     while (iter.next()) {
         iter->drawBitmapNine(bitmap, center, dst, paint);
     }
 }
 
-void SkNWayCanvas::drawSprite(const SkBitmap& bitmap, int x, int y,
-                              const SkPaint* paint) {
+void SkNWayCanvas::onDrawImage(const SkImage* image, SkScalar left, SkScalar top,
+                               const SkPaint* paint) {
+    Iter iter(fList);
+    while (iter.next()) {
+        iter->drawImage(image, left, top, paint);
+    }
+}
+
+void SkNWayCanvas::onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
+                                   const SkPaint* paint, SrcRectConstraint constraint) {
+    Iter iter(fList);
+    while (iter.next()) {
+        iter->legacy_drawImageRect(image, src, dst, paint, constraint);
+    }
+}
+
+void SkNWayCanvas::onDrawSprite(const SkBitmap& bitmap, int x, int y, const SkPaint* paint) {
     Iter iter(fList);
     while (iter.next()) {
         iter->drawSprite(bitmap, x, y, paint);
@@ -265,18 +263,27 @@ void SkNWayCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const S
     }
 }
 
-void SkNWayCanvas::onDrawPicture(const SkPicture* picture) {
+void SkNWayCanvas::onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
+                                  const SkPaint &paint) {
     Iter iter(fList);
     while (iter.next()) {
-        iter->drawPicture(picture);
+        iter->drawTextBlob(blob, x, y, paint);
     }
 }
 
-void SkNWayCanvas::drawVertices(VertexMode vmode, int vertexCount,
-                          const SkPoint vertices[], const SkPoint texs[],
-                          const SkColor colors[], SkXfermode* xmode,
-                          const uint16_t indices[], int indexCount,
-                          const SkPaint& paint) {
+void SkNWayCanvas::onDrawPicture(const SkPicture* picture, const SkMatrix* matrix,
+                                 const SkPaint* paint) {
+    Iter iter(fList);
+    while (iter.next()) {
+        iter->drawPicture(picture, matrix, paint);
+    }
+}
+
+void SkNWayCanvas::onDrawVertices(VertexMode vmode, int vertexCount,
+                                  const SkPoint vertices[], const SkPoint texs[],
+                                  const SkColor colors[], SkXfermode* xmode,
+                                  const uint16_t indices[], int indexCount,
+                                  const SkPaint& paint) {
     Iter iter(fList);
     while (iter.next()) {
         iter->drawVertices(vmode, vertexCount, vertices, texs, colors, xmode,
@@ -284,10 +291,12 @@ void SkNWayCanvas::drawVertices(VertexMode vmode, int vertexCount,
     }
 }
 
-void SkNWayCanvas::drawData(const void* data, size_t length) {
+void SkNWayCanvas::onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
+                               const SkPoint texCoords[4], SkXfermode* xmode,
+                               const SkPaint& paint) {
     Iter iter(fList);
     while (iter.next()) {
-        iter->drawData(data, length);
+        iter->drawPatch(cubics, colors, texCoords, xmode, paint);
     }
 }
 
@@ -298,24 +307,3 @@ SkDrawFilter* SkNWayCanvas::setDrawFilter(SkDrawFilter* filter) {
     }
     return this->INHERITED::setDrawFilter(filter);
 }
-
-void SkNWayCanvas::beginCommentGroup(const char* description) {
-    Iter iter(fList);
-    while (iter.next()) {
-        iter->beginCommentGroup(description);
-    }
-}
-
-void SkNWayCanvas::addComment(const char* kywd, const char* value) {
-    Iter iter(fList);
-    while (iter.next()) {
-        iter->addComment(kywd, value);
-    }
-}
-
-void SkNWayCanvas::endCommentGroup() {
-    Iter iter(fList);
-    while (iter.next()) {
-        iter->endCommentGroup();
-    }
-}
diff --git a/gfx/skia/skia/src/utils/SkNinePatch.cpp b/gfx/skia/skia/src/utils/SkNinePatch.cpp
index 4e0d1d1a39b3..5ee488e44b6a 100644
--- a/gfx/skia/skia/src/utils/SkNinePatch.cpp
+++ b/gfx/skia/skia/src/utils/SkNinePatch.cpp
@@ -136,7 +136,7 @@ void SkNinePatch::DrawMesh(SkCanvas* canvas, const SkRect& bounds,
     const int numYStretch = (numYDivs + 1) >> 1;
 
     if (numXStretch < 1 && numYStretch < 1) {
-        canvas->drawBitmapRect(bitmap, NULL, bounds, paint);
+        canvas->drawBitmapRect(bitmap, bounds, paint);
         return;
     }
 
@@ -161,7 +161,7 @@ void SkNinePatch::DrawMesh(SkCanvas* canvas, const SkRect& bounds,
         if (bounds.width() >= fixed)
             stretchX = (bounds.width() - fixed) / stretchSize;
         else // reuse stretchX, but keep it negative as a signal
-            stretchX = SkScalarDiv(-bounds.width(), fixed);
+            stretchX = -bounds.width() / fixed;
     }
 
     if (numYStretch > 0) {
@@ -173,7 +173,7 @@ void SkNinePatch::DrawMesh(SkCanvas* canvas, const SkRect& bounds,
         if (bounds.height() >= fixed)
             stretchY = (bounds.height() - fixed) / stretchSize;
         else // reuse stretchX, but keep it negative as a signal
-            stretchY = SkScalarDiv(-bounds.height(), fixed);
+            stretchY = -bounds.height() / fixed;
     }
 
 #if 0
@@ -196,8 +196,8 @@ void SkNinePatch::DrawMesh(SkCanvas* canvas, const SkRect& bounds,
 
     mesh.fVerts = verts;
     mesh.fTexs = texs;
-    mesh.fColors = NULL;
-    mesh.fIndices = NULL;
+    mesh.fColors = nullptr;
+    mesh.fIndices = nullptr;
 
     // we use <= for YDivs, since the prebuild indices work for 3x2 and 3x1 too
     if (numXDivs == 2 && numYDivs <= 2) {
@@ -245,7 +245,7 @@ void SkNinePatch::DrawMesh(SkCanvas* canvas, const SkRect& bounds,
     }
     p.setShader(shader)->unref();
     canvas->drawVertices(SkCanvas::kTriangles_VertexMode, vCount,
-                         mesh.fVerts, mesh.fTexs, mesh.fColors, NULL,
+                         mesh.fVerts, mesh.fTexs, mesh.fColors, nullptr,
                          mesh.fIndices, indexCount, p);
 }
 
@@ -293,7 +293,7 @@ static void drawNineViaRects(SkCanvas* canvas, const SkRect& dst,
             s.fRight = srcX[x+1];
             d.fLeft = dstX[x];
             d.fRight = dstX[x+1];
-            canvas->drawBitmapRect(bitmap, &s, d, paint);
+            canvas->drawBitmapRect(bitmap, s, d, paint);
         }
     }
 }
diff --git a/gfx/skia/skia/src/utils/SkNullCanvas.cpp b/gfx/skia/skia/src/utils/SkNullCanvas.cpp
index 866a3614975d..b5ee8d30a183 100644
--- a/gfx/skia/skia/src/utils/SkNullCanvas.cpp
+++ b/gfx/skia/skia/src/utils/SkNullCanvas.cpp
@@ -14,5 +14,5 @@
 SkCanvas* SkCreateNullCanvas() {
     // An N-Way canvas forwards calls to N canvas's. When N == 0 it's
     // effectively a null canvas.
-    return SkNEW_ARGS(SkNWayCanvas, (0,0));
+    return new SkNWayCanvas(0, 0);
 }
diff --git a/gfx/skia/skia/src/utils/SkOSFile.cpp b/gfx/skia/skia/src/utils/SkOSFile.cpp
index 20ee3a4aad29..a0c003ba8d1c 100644
--- a/gfx/skia/skia/src/utils/SkOSFile.cpp
+++ b/gfx/skia/skia/src/utils/SkOSFile.cpp
@@ -6,21 +6,21 @@
  */
 #include "SkOSFile.h"
 
-SkString SkOSPath::SkPathJoin(const char *rootPath, const char *relativePath) {
+SkString SkOSPath::Join(const char *rootPath, const char *relativePath) {
     SkString result(rootPath);
-    if (!result.endsWith(SkPATH_SEPARATOR)) {
+    if (!result.endsWith(SkPATH_SEPARATOR) && !result.isEmpty()) {
         result.appendUnichar(SkPATH_SEPARATOR);
     }
     result.append(relativePath);
     return result;
 }
 
-SkString SkOSPath::SkBasename(const char* fullPath) {
+SkString SkOSPath::Basename(const char* fullPath) {
     if (!fullPath) {
         return SkString();
     }
     const char* filename = strrchr(fullPath, SkPATH_SEPARATOR);
-    if (NULL == filename) {
+    if (nullptr == filename) {
         filename = fullPath;
     } else {
         ++filename;
@@ -28,211 +28,17 @@ SkString SkOSPath::SkBasename(const char* fullPath) {
     return SkString(filename);
 }
 
-#ifdef SK_BUILD_FOR_WIN
-
-static uint16_t* concat_to_16(const char src[], const char suffix[])
-{
-    size_t  i, len = strlen(src);
-    size_t  len2 = 3 + (suffix ? strlen(suffix) : 0);
-    uint16_t* dst = (uint16_t*)sk_malloc_throw((len + len2) * sizeof(uint16_t));
-
-    for (i = 0; i < len; i++)
-        dst[i] = src[i];
-
-    if (i > 0 && dst[i-1] != '/')
-        dst[i++] = '/';
-    dst[i++] = '*';
-
-    if (suffix)
-    {
-        while (*suffix)
-            dst[i++] = *suffix++;
+SkString SkOSPath::Dirname(const char* fullPath) {
+    if (!fullPath) {
+        return SkString();
     }
-    dst[i] = 0;
-    SkASSERT(i + 1 <= len + len2);
-
-    return dst;
-}
-
-////////////////////////////////////////////////////////////////////////////
-
-SkOSFile::Iter::Iter() : fHandle(0), fPath16(NULL)
-{
-}
-
-SkOSFile::Iter::Iter(const char path[], const char suffix[]) : fHandle(0), fPath16(NULL)
-{
-    this->reset(path, suffix);
-}
-
-SkOSFile::Iter::~Iter()
-{
-    sk_free(fPath16);
-    if (fHandle)
-        ::FindClose(fHandle);
-}
-
-void SkOSFile::Iter::reset(const char path[], const char suffix[])
-{
-    if (fHandle)
-    {
-        ::FindClose(fHandle);
-        fHandle = 0;
+    const char* end = strrchr(fullPath, SkPATH_SEPARATOR);
+    if (nullptr == end) {
+        return SkString();
     }
-    if (NULL == path)
-        path = "";
-
-    sk_free(fPath16);
-    fPath16 = concat_to_16(path, suffix);
-}
-
-static bool is_magic_dir(const uint16_t dir[])
-{
-    // return true for "." and ".."
-    return dir[0] == '.' && (dir[1] == 0 || dir[1] == '.' && dir[2] == 0);
-}
-
-static bool get_the_file(HANDLE handle, SkString* name, WIN32_FIND_DATAW* dataPtr, bool getDir)
-{
-    WIN32_FIND_DATAW    data;
-
-    if (NULL == dataPtr)
-    {
-        if (::FindNextFileW(handle, &data))
-            dataPtr = &data;
-        else
-            return false;
+    if (end == fullPath) {
+        SkASSERT(fullPath[0] == SkPATH_SEPARATOR);
+        ++end;
     }
-
-    for (;;)
-    {
-        if (getDir)
-        {
-            if ((dataPtr->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && !is_magic_dir((uint16_t*)dataPtr->cFileName))
-                break;
-        }
-        else
-        {
-            if (!(dataPtr->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
-                break;
-        }
-        if (!::FindNextFileW(handle, dataPtr))
-            return false;
-    }
-    // if we get here, we've found a file/dir
-    if (name)
-        name->setUTF16((uint16_t*)dataPtr->cFileName);
-    return true;
+    return SkString(fullPath, end - fullPath);
 }
-
-bool SkOSFile::Iter::next(SkString* name, bool getDir)
-{
-    WIN32_FIND_DATAW    data;
-    WIN32_FIND_DATAW*   dataPtr = NULL;
-
-    if (fHandle == 0)   // our first time
-    {
-        if (fPath16 == NULL || *fPath16 == 0)    // check for no path
-            return false;
-
-        fHandle = ::FindFirstFileW((LPCWSTR)fPath16, &data);
-        if (fHandle != 0 && fHandle != (HANDLE)~0)
-            dataPtr = &data;
-    }
-    return fHandle != (HANDLE)~0 && get_the_file(fHandle, name, dataPtr, getDir);
-}
-
-#elif defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_IOS)
-
-#if 0
-OSStatus FSPathMakeRef (
-   const UInt8 * path,
-   FSRef * ref,
-   Boolean * isDirectory
-);
-#endif
-
-SkOSFile::Iter::Iter() : fDIR(0)
-{
-}
-
-SkOSFile::Iter::Iter(const char path[], const char suffix[]) : fDIR(0)
-{
-    this->reset(path, suffix);
-}
-
-SkOSFile::Iter::~Iter()
-{
-    if (fDIR)
-        ::closedir(fDIR);
-}
-
-void SkOSFile::Iter::reset(const char path[], const char suffix[])
-{
-    if (fDIR)
-    {
-        ::closedir(fDIR);
-        fDIR = 0;
-    }
-
-    fPath.set(path);
-    if (path)
-    {
-        fDIR = ::opendir(path);
-        fSuffix.set(suffix);
-    }
-    else
-        fSuffix.reset();
-}
-
-// returns true if suffix is empty, or if str ends with suffix
-static bool issuffixfor(const SkString& suffix, const char str[])
-{
-    size_t  suffixLen = suffix.size();
-    size_t  strLen = strlen(str);
-
-    return  strLen >= suffixLen &&
-            memcmp(suffix.c_str(), str + strLen - suffixLen, suffixLen) == 0;
-}
-
-#include <sys/stat.h>
-
-bool SkOSFile::Iter::next(SkString* name, bool getDir)
-{
-    if (fDIR)
-    {
-        dirent* entry;
-
-        while ((entry = ::readdir(fDIR)) != NULL)
-        {
-            struct stat s;
-            SkString    str(fPath);
-
-            if (!str.endsWith("/") && !str.endsWith("\\"))
-                str.append("/");
-            str.append(entry->d_name);
-
-            if (0 == stat(str.c_str(), &s))
-            {
-                if (getDir)
-                {
-                    if (s.st_mode & S_IFDIR)
-                        break;
-                }
-                else
-                {
-                    if (!(s.st_mode & S_IFDIR) && issuffixfor(fSuffix, entry->d_name))
-                        break;
-                }
-            }
-        }
-        if (entry)  // we broke out with a file
-        {
-            if (name)
-                name->set(entry->d_name);
-            return true;
-        }
-    }
-    return false;
-}
-#endif // if one of:SK_BUILD_FOR_MAC, SK_BUILD_FOR_UNIX, SK_BUILD_FOR_ANDROID,SK_BUILD_FOR_IOS
diff --git a/gfx/skia/skia/src/utils/SkPDFRasterizer.cpp b/gfx/skia/skia/src/utils/SkPDFRasterizer.cpp
deleted file mode 100644
index 66634804bc6a..000000000000
--- a/gfx/skia/skia/src/utils/SkPDFRasterizer.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifdef SK_BUILD_FOR_WIN32
-#pragma warning(push)
-#pragma warning(disable : 4530)
-#endif
-
-#include "SkPDFRasterizer.h"
-#include "SkColorPriv.h"
-
-#ifdef SK_BUILD_NATIVE_PDF_RENDERER
-#include "SkPdfRenderer.h"
-#endif  // SK_BUILD_NATIVE_PDF_RENDERER
-
-#ifdef SK_BUILD_POPPLER
-#include <poppler-document.h>
-#include <poppler-image.h>
-#include <poppler-page.h>
-#include <poppler-page-renderer.h>
-#endif  // SK_BUILD_POPPLER
-
-#ifdef SK_BUILD_POPPLER
-bool SkPopplerRasterizePDF(SkStream* pdf, SkBitmap* output) {
-  size_t size = pdf->getLength();
-  SkAutoFree buffer(sk_malloc_throw(size));
-  pdf->read(buffer.get(), size);
-
-  SkAutoTDelete<poppler::document> doc(
-      poppler::document::load_from_raw_data((const char*)buffer.get(), size));
-  if (!doc.get() || doc->is_locked()) {
-    return false;
-  }
-
-  SkAutoTDelete<poppler::page> page(doc->create_page(0));
-  poppler::page_renderer renderer;
-  poppler::image image = renderer.render_page(page.get());
-
-  if (!image.is_valid() || image.format() != poppler::image::format_argb32) {
-    return false;
-  }
-
-  int width = image.width(), height = image.height();
-  size_t rowSize = image.bytes_per_row();
-  char *imgData = image.data();
-
-  SkBitmap bitmap;
-  if (!bitmap.allocPixels(SkImageInfo::MakeN32Premul(width, height))) {
-    return false;
-  }
-  bitmap.eraseColor(SK_ColorWHITE);
-  SkPMColor* bitmapPixels = (SkPMColor*)bitmap.getPixels();
-
-  // do pixel-by-pixel copy to deal with RGBA ordering conversions
-  for (int y = 0; y < height; y++) {
-    char *rowData = imgData;
-    for (int x = 0; x < width; x++) {
-      uint8_t a = rowData[3];
-      uint8_t r = rowData[2];
-      uint8_t g = rowData[1];
-      uint8_t b = rowData[0];
-
-      *bitmapPixels = SkPreMultiplyARGB(a, r, g, b);
-
-      bitmapPixels++;
-      rowData += 4;
-    }
-    imgData += rowSize;
-  }
-
-  output->swap(bitmap);
-
-  return true;
-}
-#endif  // SK_BUILD_POPPLER
-
-#ifdef SK_BUILD_NATIVE_PDF_RENDERER
-bool SkNativeRasterizePDF(SkStream* pdf, SkBitmap* output) {
-    return SkPDFNativeRenderToBitmap(pdf, output);
-}
-#endif  // SK_BUILD_NATIVE_PDF_RENDERER
diff --git a/gfx/skia/skia/src/utils/SkPDFRasterizer.h b/gfx/skia/skia/src/utils/SkPDFRasterizer.h
deleted file mode 100644
index 82ec09233ff8..000000000000
--- a/gfx/skia/skia/src/utils/SkPDFRasterizer.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#ifndef SkPDFRasterizer_DEFINED
-#define SkPDFRasterizer_DEFINED
-
-#include "SkBitmap.h"
-#include "SkStream.h"
-
-#ifdef SK_BUILD_POPPLER
-bool SkPopplerRasterizePDF(SkStream* pdf, SkBitmap* output);
-#endif  // SK_BUILD_POPPLER
-
-#ifdef SK_BUILD_NATIVE_PDF_RENDERER
-bool SkNativeRasterizePDF(SkStream* pdf, SkBitmap* output);
-#endif  // SK_BUILD_NATIVE_PDF_RENDERER
-
-#endif
diff --git a/gfx/skia/skia/src/utils/SkPaintFilterCanvas.cpp b/gfx/skia/skia/src/utils/SkPaintFilterCanvas.cpp
new file mode 100644
index 000000000000..dff1514acbfc
--- /dev/null
+++ b/gfx/skia/skia/src/utils/SkPaintFilterCanvas.cpp
@@ -0,0 +1,170 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkPaintFilterCanvas.h"
+
+#include "SkPaint.h"
+#include "SkTLazy.h"
+
+class SkPaintFilterCanvas::AutoPaintFilter {
+public:
+    AutoPaintFilter(const SkPaintFilterCanvas* canvas, Type type, const SkPaint* paint) {
+        if (paint) {
+            canvas->onFilterPaint(fLazyPaint.set(*paint), type);
+        }
+    }
+
+    AutoPaintFilter(const SkPaintFilterCanvas* canvas, Type type, const SkPaint& paint) {
+        canvas->onFilterPaint(fLazyPaint.set(paint), type);
+    }
+
+    const SkPaint* paint() const { return fLazyPaint.getMaybeNull(); }
+
+private:
+    SkTLazy<SkPaint> fLazyPaint;
+};
+
+SkPaintFilterCanvas::SkPaintFilterCanvas(int width, int height) : INHERITED(width, height) { }
+
+SkPaintFilterCanvas::SkPaintFilterCanvas(SkCanvas *canvas)
+    : INHERITED(canvas->imageInfo().width(), canvas->imageInfo().height()) {
+
+    // Transfer matrix & clip state before adding the target canvas.
+    SkIRect devClip;
+    canvas->getClipDeviceBounds(&devClip);
+    this->clipRect(SkRect::Make(devClip));
+    this->setMatrix(canvas->getTotalMatrix());
+
+    this->addCanvas(canvas);
+}
+
+void SkPaintFilterCanvas::onDrawPaint(const SkPaint& paint) {
+    AutoPaintFilter apf(this, kPaint_Type, paint);
+    this->INHERITED::onDrawPaint(*apf.paint());
+}
+
+void SkPaintFilterCanvas::onDrawPoints(PointMode mode, size_t count, const SkPoint pts[],
+                                       const SkPaint& paint) {
+    AutoPaintFilter apf(this, kPoint_Type, paint);
+    this->INHERITED::onDrawPoints(mode, count, pts, *apf.paint());
+}
+
+void SkPaintFilterCanvas::onDrawRect(const SkRect& rect, const SkPaint& paint) {
+    AutoPaintFilter apf(this, kRect_Type, paint);
+    this->INHERITED::onDrawRect(rect, *apf.paint());
+}
+
+void SkPaintFilterCanvas::onDrawRRect(const SkRRect& rrect, const SkPaint& paint) {
+    AutoPaintFilter apf(this, kRRect_Type, paint);
+    this->INHERITED::onDrawRRect(rrect, *apf.paint());
+}
+
+void SkPaintFilterCanvas::onDrawDRRect(const SkRRect& outer, const SkRRect& inner,
+                                       const SkPaint& paint) {
+    AutoPaintFilter apf(this, kDRRect_Type, paint);
+    this->INHERITED::onDrawDRRect(outer, inner, *apf.paint());
+}
+
+void SkPaintFilterCanvas::onDrawOval(const SkRect& rect, const SkPaint& paint) {
+    AutoPaintFilter apf(this, kOval_Type, paint);
+    this->INHERITED::onDrawOval(rect, *apf.paint());
+}
+
+void SkPaintFilterCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) {
+    AutoPaintFilter apf(this, kPath_Type, paint);
+    this->INHERITED::onDrawPath(path, *apf.paint());
+}
+
+void SkPaintFilterCanvas::onDrawBitmap(const SkBitmap& bm, SkScalar left, SkScalar top,
+                                       const SkPaint* paint) {
+    AutoPaintFilter apf(this, kBitmap_Type, paint);
+    this->INHERITED::onDrawBitmap(bm, left, top, apf.paint());
+}
+
+void SkPaintFilterCanvas::onDrawBitmapRect(const SkBitmap& bm, const SkRect* src, const SkRect& dst,
+                                           const SkPaint* paint, SrcRectConstraint constraint) {
+    AutoPaintFilter apf(this, kBitmap_Type, paint);
+    this->INHERITED::onDrawBitmapRect(bm, src, dst, apf.paint(), constraint);
+}
+
+void SkPaintFilterCanvas::onDrawImage(const SkImage* image, SkScalar left, SkScalar top,
+                                      const SkPaint* paint) {
+    AutoPaintFilter apf(this, kBitmap_Type, paint);
+    this->INHERITED::onDrawImage(image, left, top, apf.paint());
+}
+
+void SkPaintFilterCanvas::onDrawImageRect(const SkImage* image, const SkRect* src,
+                                          const SkRect& dst, const SkPaint* paint,
+                                          SrcRectConstraint constraint) {
+    AutoPaintFilter apf(this, kBitmap_Type, paint);
+    this->INHERITED::onDrawImageRect(image, src, dst, apf.paint(), constraint);
+}
+
+void SkPaintFilterCanvas::onDrawBitmapNine(const SkBitmap& bm, const SkIRect& center,
+                                           const SkRect& dst, const SkPaint* paint) {
+    AutoPaintFilter apf(this, kBitmap_Type, paint);
+    this->INHERITED::onDrawBitmapNine(bm, center, dst, apf.paint());
+}
+
+void SkPaintFilterCanvas::onDrawSprite(const SkBitmap& bm, int left, int top,
+                                       const SkPaint* paint) {
+    AutoPaintFilter apf(this, kBitmap_Type, paint);
+    this->INHERITED::onDrawSprite(bm, left, top, apf.paint());
+}
+
+void SkPaintFilterCanvas::onDrawVertices(VertexMode vmode, int vertexCount,
+                                         const SkPoint vertices[], const SkPoint texs[],
+                                         const SkColor colors[], SkXfermode* xmode,
+                                         const uint16_t indices[], int indexCount,
+                                         const SkPaint& paint) {
+    AutoPaintFilter apf(this, kVertices_Type, paint);
+    this->INHERITED::onDrawVertices(vmode, vertexCount, vertices, texs, colors, xmode, indices,
+                                    indexCount, *apf.paint());
+}
+
+void SkPaintFilterCanvas::onDrawPatch(const SkPoint cubics[], const SkColor colors[],
+                                      const SkPoint texCoords[], SkXfermode* xmode,
+                                      const SkPaint& paint) {
+    AutoPaintFilter apf(this, kPatch_Type, paint);
+    this->INHERITED::onDrawPatch(cubics, colors, texCoords, xmode, *apf.paint());
+}
+
+void SkPaintFilterCanvas::onDrawPicture(const SkPicture* picture, const SkMatrix* m,
+                                        const SkPaint* paint) {
+    AutoPaintFilter apf(this, kPicture_Type, paint);
+    this->INHERITED::onDrawPicture(picture, m, apf.paint());
+}
+
+void SkPaintFilterCanvas::onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
+                                     const SkPaint& paint) {
+    AutoPaintFilter apf(this, kText_Type, paint);
+    this->INHERITED::onDrawText(text, byteLength, x, y, *apf.paint());
+}
+
+void SkPaintFilterCanvas::onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
+                                        const SkPaint& paint) {
+    AutoPaintFilter apf(this, kText_Type, paint);
+    this->INHERITED::onDrawPosText(text, byteLength, pos, *apf.paint());
+}
+
+void SkPaintFilterCanvas::onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
+                                         SkScalar constY, const SkPaint& paint) {
+    AutoPaintFilter apf(this, kText_Type, paint);
+    this->INHERITED::onDrawPosTextH(text, byteLength, xpos, constY, *apf.paint());
+}
+
+void SkPaintFilterCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
+                                           const SkMatrix* matrix, const SkPaint& paint) {
+    AutoPaintFilter apf(this, kText_Type, paint);
+    this->INHERITED::onDrawTextOnPath(text, byteLength, path, matrix, *apf.paint());
+}
+
+void SkPaintFilterCanvas::onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
+                                         const SkPaint& paint) {
+    AutoPaintFilter apf(this, kTextBlob_Type, paint);
+    this->INHERITED::onDrawTextBlob(blob, x, y, *apf.paint());
+}
diff --git a/gfx/skia/skia/src/utils/SkParse.cpp b/gfx/skia/skia/src/utils/SkParse.cpp
index f6e2a438e85b..b5a108e2cb36 100644
--- a/gfx/skia/skia/src/utils/SkParse.cpp
+++ b/gfx/skia/skia/src/utils/SkParse.cpp
@@ -9,6 +9,8 @@
 
 #include "SkParse.h"
 
+#include <stdlib.h>
+
 static inline bool is_between(int c, int min, int max)
 {
     return (unsigned)(c - min) <= (unsigned)(max - min);
@@ -110,7 +112,7 @@ const char* SkParse::FindHex(const char str[], uint32_t* value)
     str = skip_ws(str);
 
     if (!is_hex(*str))
-        return NULL;
+        return nullptr;
 
     uint32_t n = 0;
     int max_digits = 8;
@@ -119,7 +121,7 @@ const char* SkParse::FindHex(const char str[], uint32_t* value)
     while ((digit = to_hex(*str)) >= 0)
     {
         if (--max_digits < 0)
-            return NULL;
+            return nullptr;
         n = (n << 4) | digit;
         str += 1;
     }
@@ -130,7 +132,7 @@ const char* SkParse::FindHex(const char str[], uint32_t* value)
             *value = n;
         return str;
     }
-    return NULL;
+    return nullptr;
 }
 
 const char* SkParse::FindS32(const char str[], int32_t* value)
@@ -146,7 +148,7 @@ const char* SkParse::FindS32(const char str[], int32_t* value)
     }
 
     if (!is_digit(*str))
-        return NULL;
+        return nullptr;
 
     int n = 0;
     while (is_digit(*str))
@@ -172,7 +174,7 @@ const char* SkParse::FindMSec(const char str[], SkMSec* value)
     }
 
     if (!is_digit(*str))
-        return NULL;
+        return nullptr;
 
     int n = 0;
     while (is_digit(*str))
@@ -205,7 +207,7 @@ const char* SkParse::FindScalar(const char str[], SkScalar* value) {
     char* stop;
     float v = (float)strtod(str, &stop);
     if (str == stop) {
-        return NULL;
+        return nullptr;
     }
     if (value) {
         *value = v;
@@ -222,7 +224,7 @@ const char* SkParse::FindScalars(const char str[], SkScalar value[], int count)
         for (;;)
         {
             str = SkParse::FindScalar(str, value);
-            if (--count == 0 || str == NULL)
+            if (--count == 0 || str == nullptr)
                 break;
 
             // keep going
@@ -270,14 +272,14 @@ int SkParse::FindList(const char target[], const char list[])
         const char* end = strchr(list, ',');
         size_t      entryLen;
 
-        if (end == NULL) // last entry
+        if (end == nullptr) // last entry
             entryLen = strlen(list);
         else
             entryLen = end - list;
 
         if (entryLen == len && memcmp(target, list, len) == 0)
             return index;
-        if (end == NULL)
+        if (end == nullptr)
             break;
 
         list = end + 1; // skip the ','
diff --git a/gfx/skia/skia/src/utils/SkParseColor.cpp b/gfx/skia/skia/src/utils/SkParseColor.cpp
index 989a6091ef81..329b304ac469 100644
--- a/gfx/skia/skia/src/utils/SkParseColor.cpp
+++ b/gfx/skia/skia/src/utils/SkParseColor.cpp
@@ -423,11 +423,11 @@ const char* SkParse::FindNamedColor(const char* name, size_t len, SkColor* color
             while ((int) gColorNames[lo] >= 0)
                 ++lo;
         } else if (hi == mid)
-            return NULL;
+            return nullptr;
         else
             hi = mid;
     }
-    return NULL;
+    return nullptr;
 }
 
 // !!! move to char utilities
@@ -435,12 +435,12 @@ const char* SkParse::FindNamedColor(const char* name, size_t len, SkColor* color
 //  char c;
 //  int separators = 0;
 //  while ((c = *str++) != '\0') {
-//      if (strchr(sep, c) == NULL)
+//      if (strchr(sep, c) == nullptr)
 //          continue;
 //      do {
 //          if ((c = *str++) == '\0')
 //              goto goHome;
-//      } while (strchr(sep, c) != NULL);
+//      } while (strchr(sep, c) != nullptr);
 //      separators++;
 //  }
 //goHome:
@@ -459,7 +459,7 @@ const char* SkParse::FindColor(const char* value, SkColor* colorPtr) {
         uint32_t    hex;
         const char* end = SkParse::FindHex(value + 1, &hex);
 //      SkASSERT(end);
-        if (end == NULL)
+        if (end == nullptr)
             return end;
         size_t len = end - value - 1;
         if (len == 3 || len == 4) {
@@ -476,7 +476,7 @@ const char* SkParse::FindColor(const char* value, SkColor* colorPtr) {
             return end;
         } else {
 //          SkASSERT(0);
-            return NULL;
+            return nullptr;
         }
 //  } else if (strchr(value, ',')) {
 //      SkScalar array[4];
@@ -484,8 +484,8 @@ const char* SkParse::FindColor(const char* value, SkColor* colorPtr) {
 //      SkASSERT(count == 3 || count == 4);
 //      array[0] = SK_Scalar1 * 255;
 //      const char* end = SkParse::FindScalars(value, &array[4 - count], count);
-//      if (end == NULL)
-//          return NULL;
+//      if (end == nullptr)
+//          return nullptr;
         // !!! range check for errors?
 //      *colorPtr = SkColorSetARGB(SkScalarRoundToInt(array[0]), SkScalarRoundToInt(array[1]),
 //          SkScalarRoundToInt(array[2]), SkScalarRoundToInt(array[3]));
@@ -503,7 +503,7 @@ void SkParse::TestColor() {
     for (index = 0; index < colorNamesSize; index++) {
         result = SK_ColorBLACK;
         SkNameRGB nameRGB = colorNames[index];
-        SkASSERT(FindColor(nameRGB.name, &result) != NULL);
+        SkASSERT(FindColor(nameRGB.name, &result) != nullptr);
         SkASSERT(result == (SkColor) (nameRGB.rgb | 0xFF000000));
     }
     for (index = 0; index < colorNamesSize; index++) {
@@ -513,9 +513,9 @@ void SkParse::TestColor() {
         size_t len = strlen(nameRGB.name);
         memcpy(bad, nameRGB.name, len);
         bad[len - 1] -= 1;
-        SkASSERT(FindColor(bad, &result) == NULL);
+        SkASSERT(FindColor(bad, &result) == nullptr);
         bad[len - 1] += 2;
-        SkASSERT(FindColor(bad, &result) == NULL);
+        SkASSERT(FindColor(bad, &result) == nullptr);
     }
     result = SK_ColorBLACK;
     SkASSERT(FindColor("lightGrey", &result));
diff --git a/gfx/skia/skia/src/utils/SkParsePath.cpp b/gfx/skia/skia/src/utils/SkParsePath.cpp
index 1a3c87f31d91..3fecb46fe60d 100644
--- a/gfx/skia/skia/src/utils/SkParsePath.cpp
+++ b/gfx/skia/skia/src/utils/SkParsePath.cpp
@@ -86,6 +86,8 @@ bool SkParsePath::FromSVGString(const char data[], SkPath* result) {
             if (op == '\0') {
                 return false;
             }
+        } else if (is_sep(ch)) {
+            data = skip_sep(data);
         } else {
             op = ch;
             relative = false;
@@ -165,7 +167,7 @@ bool SkParsePath::FromSVGString(const char data[], SkPath* result) {
                 break;
             case '~': {
                 SkPoint args[2];
-                data = find_points(data, args, 2, false, NULL);
+                data = find_points(data, args, 2, false, nullptr);
                 path.moveTo(args[0].fX, args[0].fY);
                 path.lineTo(args[1].fX, args[1].fY);
             } break;
@@ -184,6 +186,7 @@ bool SkParsePath::FromSVGString(const char data[], SkPath* result) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
+#include "SkGeometry.h"
 #include "SkString.h"
 #include "SkStream.h"
 
@@ -216,9 +219,14 @@ void SkParsePath::ToSVGString(const SkPath& path, SkString* str) {
 
     for (;;) {
         switch (iter.next(pts, false)) {
-             case SkPath::kConic_Verb:
-                SkASSERT(0);
-                break;
+            case SkPath::kConic_Verb: {
+                const SkScalar tol = SK_Scalar1 / 1024; // how close to a quad
+                SkAutoConicToQuads quadder;
+                const SkPoint* quadPts = quadder.computeQuads(pts, iter.conicWeight(), tol);
+                for (int i = 0; i < quadder.countQuads(); ++i) {
+                    append_scalars(&stream, 'Q', &quadPts[i*2 + 1].fX, 4);
+                }
+            } break;
            case SkPath::kMove_Verb:
                 append_scalars(&stream, 'M', &pts[0].fX, 2);
                 break;
diff --git a/gfx/skia/skia/src/utils/SkPatchGrid.cpp b/gfx/skia/skia/src/utils/SkPatchGrid.cpp
new file mode 100644
index 000000000000..b7aaa82b9b8b
--- /dev/null
+++ b/gfx/skia/skia/src/utils/SkPatchGrid.cpp
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkPatchGrid.h"
+#include "SkPatchUtils.h"
+
+SkPatchGrid::SkPatchGrid(int rows, int cols, VertexType flags, SkXfermode* xfer)
+    : fRows(0)
+    , fCols(0)
+    , fModeFlags(kNone_VertexType)
+    , fCornerPts(nullptr)
+    , fCornerColors(nullptr)
+    , fTexCoords(nullptr)
+    , fHrzCtrlPts(nullptr)
+    , fVrtCtrlPts(nullptr)
+    , fXferMode(nullptr) {
+        this->reset(rows, cols, flags, xfer);
+}
+
+SkPatchGrid::~SkPatchGrid() {
+    delete[] fCornerPts;
+    delete[] fCornerColors;
+    delete[] fTexCoords;
+    delete[] fHrzCtrlPts;
+    delete[] fVrtCtrlPts;
+}
+
+bool SkPatchGrid::setPatch(int x, int y, const SkPoint cubics[12], const SkColor colors[4],
+                           const SkPoint texCoords[4]) {
+    // Check for the passed paramaters to be within the range of the grid dimensions and a valid
+    // pointer for the cubics' control points.
+    if (x < 0 || y < 0 || x > fCols - 1 || y > fRows - 1 || nullptr == cubics) {
+        return false;
+    }
+    
+    // setup corners and colors
+    int cornerPos = y * (fCols + 1) + x;
+    fCornerPts[cornerPos] = cubics[SkPatchUtils::kTopP0_CubicCtrlPts];
+    fCornerPts[cornerPos + 1] = cubics[SkPatchUtils::kTopP3_CubicCtrlPts];
+    fCornerPts[cornerPos + (fCols + 1)] = cubics[SkPatchUtils::kBottomP0_CubicCtrlPts];
+    fCornerPts[cornerPos + (fCols + 1) + 1] = cubics[SkPatchUtils::kBottomP3_CubicCtrlPts];
+    
+    // set horizontal control points
+    int hrzPos = y * (fCols * 2) + (x * 2);
+    fHrzCtrlPts[hrzPos] = cubics[SkPatchUtils::kTopP1_CubicCtrlPts];
+    fHrzCtrlPts[hrzPos + 1] = cubics[SkPatchUtils::kTopP2_CubicCtrlPts];
+    fHrzCtrlPts[hrzPos + (fCols * 2)] = cubics[SkPatchUtils::kBottomP1_CubicCtrlPts];
+    fHrzCtrlPts[hrzPos + (fCols * 2) + 1] = cubics[SkPatchUtils::kBottomP2_CubicCtrlPts];
+    
+    // set vertical control points
+    int vrtPos = (y*2) * (fCols + 1) + x;
+    fVrtCtrlPts[vrtPos] = cubics[SkPatchUtils::kLeftP1_CubicCtrlPts];
+    fVrtCtrlPts[vrtPos + 1] = cubics[SkPatchUtils::kRightP1_CubicCtrlPts];
+    fVrtCtrlPts[vrtPos + (fCols + 1)] = cubics[SkPatchUtils::kLeftP2_CubicCtrlPts];
+    fVrtCtrlPts[vrtPos + (fCols + 1) + 1] = cubics[SkPatchUtils::kRightP2_CubicCtrlPts];
+    
+    // set optional values (colors and texture coordinates)
+    if ((fModeFlags & kColors_VertexType)  && colors) {
+        fCornerColors[cornerPos] = colors[0];
+        fCornerColors[cornerPos + 1] = colors[1];
+        fCornerColors[cornerPos + (fCols + 1)] = colors[3];
+        fCornerColors[cornerPos + (fCols + 1) + 1] = colors[2];
+    }
+    
+    if ((fModeFlags & kTexs_VertexType) && texCoords) {
+        fTexCoords[cornerPos] = texCoords[0];
+        fTexCoords[cornerPos + 1] = texCoords[1];
+        fTexCoords[cornerPos + (fCols + 1)] = texCoords[3];
+        fTexCoords[cornerPos + (fCols + 1) + 1] = texCoords[2];
+    }
+    
+    return true;
+}
+
+bool SkPatchGrid::getPatch(int x, int y, SkPoint cubics[12], SkColor colors[4],
+                           SkPoint texCoords[4]) const {
+    
+    if (x < 0 || y < 0 || x > fCols - 1 || y > fRows - 1 || nullptr == cubics) {
+        return false;
+    }
+    
+    // set the patch by building the array of points and colors with the corresponding values.
+    int cornerPos = y * (fCols + 1) + x;
+    cubics[SkPatchUtils::kTopP0_CubicCtrlPts] = fCornerPts[cornerPos];
+    cubics[SkPatchUtils::kTopP3_CubicCtrlPts] = fCornerPts[cornerPos + 1];
+    cubics[SkPatchUtils::kBottomP0_CubicCtrlPts] = fCornerPts[cornerPos + (fCols + 1)];
+    cubics[SkPatchUtils::kBottomP3_CubicCtrlPts] = fCornerPts[cornerPos + (fCols + 1) + 1];
+    
+    int hrzPos = y * (fCols * 2) + (x * 2);
+    cubics[SkPatchUtils::kTopP1_CubicCtrlPts] = fHrzCtrlPts[hrzPos];
+    cubics[SkPatchUtils::kTopP2_CubicCtrlPts] = fHrzCtrlPts[hrzPos + 1];
+    cubics[SkPatchUtils::kBottomP1_CubicCtrlPts] = fHrzCtrlPts[hrzPos + (fCols * 2)];
+    cubics[SkPatchUtils::kBottomP2_CubicCtrlPts] = fHrzCtrlPts[hrzPos + (fCols * 2) + 1];
+    
+    int vrtPos = (y*2) * (fCols + 1) + x;
+    cubics[SkPatchUtils::kLeftP1_CubicCtrlPts] = fVrtCtrlPts[vrtPos];
+    cubics[SkPatchUtils::kRightP1_CubicCtrlPts] = fVrtCtrlPts[vrtPos + 1];
+    cubics[SkPatchUtils::kLeftP2_CubicCtrlPts] = fVrtCtrlPts[vrtPos + (fCols + 1)];
+    cubics[SkPatchUtils::kRightP2_CubicCtrlPts] = fVrtCtrlPts[vrtPos + (fCols + 1) + 1];
+    
+    if ((fModeFlags & kColors_VertexType)  && colors) {
+        colors[0] = fCornerColors[cornerPos];
+        colors[1] = fCornerColors[cornerPos + 1];
+        colors[3] = fCornerColors[cornerPos + (fCols + 1)];
+        colors[2] = fCornerColors[cornerPos + (fCols + 1) + 1];
+    }
+    
+    if ((fModeFlags & kTexs_VertexType)  && texCoords) {
+        texCoords[0] = fTexCoords[cornerPos];
+        texCoords[1] = fTexCoords[cornerPos + 1];
+        texCoords[3] = fTexCoords[cornerPos + (fCols + 1)];
+        texCoords[2] = fTexCoords[cornerPos + (fCols + 1) + 1];
+    }
+    
+    return true;
+}
+
+void SkPatchGrid::reset(int rows, int cols, VertexType flags, SkXfermode* xMode) {
+    delete[] fCornerPts;
+    delete[] fCornerColors;
+    delete[] fTexCoords;
+    delete[] fHrzCtrlPts;
+    delete[] fVrtCtrlPts;
+
+    fCols = cols;
+    fRows = rows;
+    fModeFlags = flags;
+    fXferMode = xMode;
+
+    fCornerPts = new SkPoint[(fRows + 1) * (fCols + 1)];
+    fHrzCtrlPts = new SkPoint[(fRows + 1) * fCols * 2];
+    fVrtCtrlPts = new SkPoint[fRows * 2 * (fCols + 1)];
+    memset(fCornerPts, 0, (fRows + 1) * (fCols + 1) * sizeof(SkPoint));
+    memset(fHrzCtrlPts, 0, (fRows + 1) * fCols * 2 * sizeof(SkPoint));
+    memset(fVrtCtrlPts, 0, fRows * 2 * (fCols + 1) * sizeof(SkPoint));
+    
+    if (fModeFlags & kColors_VertexType) {
+        fCornerColors = new SkColor[(fRows + 1) * (fCols + 1)];
+        memset(fCornerColors, 0, (fRows + 1) * (fCols + 1) * sizeof(SkColor));
+    }
+    
+    if (fModeFlags & kTexs_VertexType) {
+        fTexCoords = new SkPoint[(fRows + 1) * (fCols + 1)];
+        memset(fTexCoords, 0, (fRows + 1) * (fCols + 1) * sizeof(SkPoint));
+    }
+}
+
+void SkPatchGrid::draw(SkCanvas* canvas, SkPaint& paint) {
+    int* maxCols = new int[fCols];
+    int* maxRows = new int[fRows];
+    memset(maxCols, 0, fCols * sizeof(int));
+    memset(maxRows, 0, fRows * sizeof(int));
+    
+    // Get the maximum level of detail per axis for each row and column
+    for (int y = 0; y < fRows; y++) {
+        for (int x = 0; x < fCols; x++) {
+            SkPoint cubics[12];
+            this->getPatch(x, y, cubics, nullptr, nullptr);
+            SkMatrix matrix = canvas->getTotalMatrix();
+            SkISize lod = SkPatchUtils::GetLevelOfDetail(cubics, &matrix);
+            maxCols[x] = SkMax32(maxCols[x], lod.width());
+            maxRows[y] = SkMax32(maxRows[y], lod.height());
+        }
+    }
+    // Draw the patches by generating their geometry with the maximum level of detail per axis.
+    for (int x = 0; x < fCols; x++) {
+        for (int y = 0; y < fRows; y++) {
+            SkPoint cubics[12];
+            SkPoint texCoords[4];
+            SkColor colors[4];
+            this->getPatch(x, y, cubics, colors, texCoords);
+            SkPatchUtils::VertexData data;
+            if (SkPatchUtils::getVertexData(&data, cubics,
+                                            fModeFlags & kColors_VertexType ? colors : nullptr,
+                                            fModeFlags & kTexs_VertexType ? texCoords : nullptr,
+                                            maxCols[x], maxRows[y])) {
+                canvas->drawVertices(SkCanvas::kTriangles_VertexMode, data.fVertexCount,
+                                     data.fPoints, data.fTexCoords, data.fColors, fXferMode,
+                                     data.fIndices, data.fIndexCount, paint);
+            }
+        }
+    }
+    delete[] maxCols;
+    delete[] maxRows;
+}
diff --git a/gfx/skia/skia/src/utils/SkPatchGrid.h b/gfx/skia/skia/src/utils/SkPatchGrid.h
new file mode 100644
index 000000000000..5bc2e65df011
--- /dev/null
+++ b/gfx/skia/skia/src/utils/SkPatchGrid.h
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPatchGrid_DEFINED
+#define SkPatchGrid_DEFINED
+
+#include "SkCanvas.h"
+#include "SkPatchUtils.h"
+#include "SkXfermode.h"
+
+/**
+ * Class that represents a grid of patches. Adjacent patches share their corners and a color is 
+ * specified at each one of them. The colors are bilinearly interpolated across the patch.
+ *
+ * This implementation defines a bidimensional array of patches. There are 3 arrays to store the 
+ * control points of the patches to avoid storing repeated data since there are several points
+ * shared between adjacent patches. 
+ *
+ * The array fCornerPts stores the corner control points of the patches.
+ * The array fHrzPts holds the intermidiate control points of the top and bottom curves of a patch.
+ * The array fVrtPts holds the intermidiate control points of the left and right curves of a patch.
+ * The array fCornerColors holds the corner colors in the same format as fCornerPts.
+ * The array fTexCoords holds the texture coordinates in the same format as fCornerpts.
+ *
+ *               fCornerPts               fHrzPts                  fVrtPts
+ *             --------------       -------------------         --------------
+ *            | C0 | C1 | C2 |     | H0 | H1 | H2 | H3 |       | V0 | V1 | V2 |
+ *             --------------       ------------------         ---------------
+ *            | C3 | C4 | C5 |     | H4 | H5 | H6 | H7 |       | V4 | V5 | V6 |
+ *             --------------       -------------------         --------------
+ *            | C6 | C7 | C8 |     | H8 | H9 | H10| H11|       | V6 | V7 | V8 |
+ *             --------------       -------------------         --------------
+ *                                                             | V9 | V10| V11|
+ *                                                              --------------
+ *
+ * With the above configuration we would have a 2x2 grid of patches:
+ *               H0     H1 H2   H3
+ *              /        \/      \
+ *              C0-------C1-------C2
+ *             /|        |        |\
+ *           v0 |        v1       | v2
+ *           v3 |        V4       | v5
+ *             \|        |        |/
+ *              C3-H4-H5-C4-H6-H7-C5
+ *             /|        |        |\
+ *           v6 |        v7       | v8
+ *           v9 |        v10      | v11
+ *             \|        |        |/
+ *              C6-------C7-------C8
+ *               \      / \      /
+ *                H8   H9  H10  H11
+ *
+ * When trying to get a patch at a certain position it justs builds it with the corresponding 
+ * points.
+ * When adding a patch it tries to add the points at their corresponding position trying to comply
+ * with the adjacent points or overwriting them.
+ * 
+ * Based the idea on the SVG2 spec for mesh gradients in which a grid of patches is build as in the
+ * the following example:
+ * <meshGradient x="100" y="100">
+ *      <meshRow>
+ *          <meshPatch>
+ *              <stop .../>
+ *              Up to four stops in first patch. See details below.
+ *          </meshPatch>
+ *          <meshPatch>
+ *              Any number of meshPatches in row.
+ *          </meshPatch>
+ *      </meshRow>
+ *      <meshRow>
+ *          Any number of meshRows, each with the same number of meshPatches as in the first row.
+ *      </meshRow>
+ * </meshGradient>
+ */
+class SkPatchGrid {
+    
+public:
+    
+    enum VertexType {
+        kNone_VertexType = 0X00,
+        kColors_VertexType = 0x01,
+        kTexs_VertexType = 0x02,
+        kColorsAndTexs_VertexType = 0x03
+    };
+    
+    SkPatchGrid(int rows = 0, int cols = 0, VertexType flags = kNone_VertexType,
+                SkXfermode* xfer = nullptr);
+    
+    ~SkPatchGrid();
+    
+    /**
+     * Add a patch at location (x,y) overwriting the previous patch and shared points so they 
+     * mantain C0 connectivity.
+     * The control points must be passed in a clockwise order starting at the top left corner.
+     * The colors and texCoords are the values at the corners of the patch which will be bilerp 
+     * across it, they must also be in counterclockwise order starting at the top left corner.
+     */
+    bool setPatch(int x, int y, const SkPoint cubics[12], const SkColor colors[4],
+                  const SkPoint texCoords[4]);
+    
+    /**
+     * Get patch at location (x,y). If cubics, colors or texCoords is not nullptr it sets patch's
+     * array with its corresponding values.
+     * The function returns false if the cubics parameter is nullptr or if the (x,y) coordinates are 
+     * not within the range of the grid.
+     */
+    bool getPatch(int x, int y, SkPoint cubics[12], SkColor colors[4], SkPoint texCoords[4]) const;
+    
+    /**
+     * Resets the grid of patches to contain rows and cols of patches.
+     */
+    void reset(int rows, int cols, VertexType flags, SkXfermode* xMode);
+    
+    /**
+     * Draws the grid of patches. The patches are drawn starting at patch (0,0) drawing columns, so 
+     * for a 2x2 grid the order would be (0,0)->(0,1)->(1,0)->(1,1). The order follows the order 
+     * of the parametric coordinates of the coons patch.
+     */
+    void draw(SkCanvas* canvas, SkPaint& paint);
+    
+    /**
+     * Get the dimensions of the grid of patches.
+     */
+    SkISize getDimensions() const {
+        return SkISize::Make(fCols, fRows);
+    }
+    
+private:
+    int fRows, fCols;
+    VertexType fModeFlags;
+    SkPoint* fCornerPts;
+    SkColor* fCornerColors;
+    SkPoint* fTexCoords;
+    SkPoint* fHrzCtrlPts;
+    SkPoint* fVrtCtrlPts;
+    SkXfermode* fXferMode;
+};
+
+
+#endif
diff --git a/gfx/skia/skia/src/utils/SkPatchUtils.cpp b/gfx/skia/skia/src/utils/SkPatchUtils.cpp
new file mode 100644
index 000000000000..ad846f7ba20d
--- /dev/null
+++ b/gfx/skia/skia/src/utils/SkPatchUtils.cpp
@@ -0,0 +1,331 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkPatchUtils.h"
+
+#include "SkColorPriv.h"
+#include "SkGeometry.h"
+
+/**
+ * Evaluator to sample the values of a cubic bezier using forward differences.
+ * Forward differences is a method for evaluating a nth degree polynomial at a uniform step by only
+ * adding precalculated values.
+ * For a linear example we have the function f(t) = m*t+b, then the value of that function at t+h
+ * would be f(t+h) = m*(t+h)+b. If we want to know the uniform step that we must add to the first
+ * evaluation f(t) then we need to substract f(t+h) - f(t) = m*t + m*h + b - m*t + b = mh. After
+ * obtaining this value (mh) we could just add this constant step to our first sampled point
+ * to compute the next one.
+ *
+ * For the cubic case the first difference gives as a result a quadratic polynomial to which we can
+ * apply again forward differences and get linear function to which we can apply again forward
+ * differences to get a constant difference. This is why we keep an array of size 4, the 0th
+ * position keeps the sampled value while the next ones keep the quadratic, linear and constant
+ * difference values.
+ */
+
+class FwDCubicEvaluator {
+    
+public:
+    FwDCubicEvaluator()
+    : fMax(0)
+    , fCurrent(0)
+    , fDivisions(0) {
+        memset(fPoints, 0, 4 * sizeof(SkPoint));
+        memset(fPoints, 0, 4 * sizeof(SkPoint));
+        memset(fPoints, 0, 4 * sizeof(SkPoint));
+    }
+    
+    /**
+     * Receives the 4 control points of the cubic bezier.
+     */
+    FwDCubicEvaluator(SkPoint a, SkPoint b, SkPoint c, SkPoint d) {
+        fPoints[0] = a;
+        fPoints[1] = b;
+        fPoints[2] = c;
+        fPoints[3] = d;
+        
+        SkCubicToCoeff(fPoints, fCoefs);
+        
+        this->restart(1);
+    }
+    
+    explicit FwDCubicEvaluator(const SkPoint points[4])  {
+        memcpy(fPoints, points, 4 * sizeof(SkPoint));
+        
+        SkCubicToCoeff(fPoints, fCoefs);
+        
+        this->restart(1);
+    }
+    
+    /**
+     * Restarts the forward differences evaluator to the first value of t = 0.
+     */
+    void restart(int divisions)  {
+        fDivisions = divisions;
+        SkScalar h  = 1.f / fDivisions;
+        fCurrent    = 0;
+        fMax        = fDivisions + 1;
+        fFwDiff[0]  = fCoefs[3];
+        SkScalar h2 = h * h;
+        SkScalar h3 = h2 * h;
+        
+        fFwDiff[3].set(6.f * fCoefs[0].x() * h3, 6.f * fCoefs[0].y() * h3); //6ah^3
+        fFwDiff[2].set(fFwDiff[3].x() + 2.f * fCoefs[1].x() * h2, //6ah^3 + 2bh^2
+                       fFwDiff[3].y() + 2.f * fCoefs[1].y() * h2);
+        fFwDiff[1].set(fCoefs[0].x() * h3 + fCoefs[1].x() * h2 + fCoefs[2].x() * h,//ah^3 + bh^2 +ch
+                       fCoefs[0].y() * h3 + fCoefs[1].y() * h2 + fCoefs[2].y() * h);
+    }
+    
+    /**
+     * Check if the evaluator is still within the range of 0<=t<=1
+     */
+    bool done() const {
+        return fCurrent > fMax;
+    }
+    
+    /**
+     * Call next to obtain the SkPoint sampled and move to the next one.
+     */
+    SkPoint next() {
+        SkPoint point = fFwDiff[0];
+        fFwDiff[0]    += fFwDiff[1];
+        fFwDiff[1]    += fFwDiff[2];
+        fFwDiff[2]    += fFwDiff[3];
+        fCurrent++;
+        return point;
+    }
+    
+    const SkPoint* getCtrlPoints() const {
+        return fPoints;
+    }
+    
+private:
+    int fMax, fCurrent, fDivisions;
+    SkPoint fFwDiff[4], fCoefs[4], fPoints[4];
+};
+
+////////////////////////////////////////////////////////////////////////////////
+
+// size in pixels of each partition per axis, adjust this knob
+static const int kPartitionSize = 10;
+
+/**
+ * Calculate the approximate arc length given a bezier curve's control points.
+ */
+static SkScalar approx_arc_length(SkPoint* points, int count) {
+    if (count < 2) {
+        return 0;
+    }
+    SkScalar arcLength = 0;
+    for (int i = 0; i < count - 1; i++) {
+        arcLength += SkPoint::Distance(points[i], points[i + 1]);
+    }
+    return arcLength;
+}
+
+static SkScalar bilerp(SkScalar tx, SkScalar ty, SkScalar c00, SkScalar c10, SkScalar c01,
+                      SkScalar c11) {
+    SkScalar a = c00 * (1.f - tx) + c10 * tx;
+    SkScalar b = c01 * (1.f - tx) + c11 * tx;
+    return a * (1.f - ty) + b * ty;
+}
+
+SkISize SkPatchUtils::GetLevelOfDetail(const SkPoint cubics[12], const SkMatrix* matrix) {
+    
+    // Approximate length of each cubic.
+    SkPoint pts[kNumPtsCubic];
+    SkPatchUtils::getTopCubic(cubics, pts);
+    matrix->mapPoints(pts, kNumPtsCubic);
+    SkScalar topLength = approx_arc_length(pts, kNumPtsCubic);
+    
+    SkPatchUtils::getBottomCubic(cubics, pts);
+    matrix->mapPoints(pts, kNumPtsCubic);
+    SkScalar bottomLength = approx_arc_length(pts, kNumPtsCubic);
+    
+    SkPatchUtils::getLeftCubic(cubics, pts);
+    matrix->mapPoints(pts, kNumPtsCubic);
+    SkScalar leftLength = approx_arc_length(pts, kNumPtsCubic);
+    
+    SkPatchUtils::getRightCubic(cubics, pts);
+    matrix->mapPoints(pts, kNumPtsCubic);
+    SkScalar rightLength = approx_arc_length(pts, kNumPtsCubic);
+    
+    // Level of detail per axis, based on the larger side between top and bottom or left and right
+    int lodX = static_cast<int>(SkMaxScalar(topLength, bottomLength) / kPartitionSize);
+    int lodY = static_cast<int>(SkMaxScalar(leftLength, rightLength) / kPartitionSize);
+    
+    return SkISize::Make(SkMax32(8, lodX), SkMax32(8, lodY));
+}
+
+void SkPatchUtils::getTopCubic(const SkPoint cubics[12], SkPoint points[4]) {
+    points[0] = cubics[kTopP0_CubicCtrlPts];
+    points[1] = cubics[kTopP1_CubicCtrlPts];
+    points[2] = cubics[kTopP2_CubicCtrlPts];
+    points[3] = cubics[kTopP3_CubicCtrlPts];
+}
+
+void SkPatchUtils::getBottomCubic(const SkPoint cubics[12], SkPoint points[4]) {
+    points[0] = cubics[kBottomP0_CubicCtrlPts];
+    points[1] = cubics[kBottomP1_CubicCtrlPts];
+    points[2] = cubics[kBottomP2_CubicCtrlPts];
+    points[3] = cubics[kBottomP3_CubicCtrlPts];
+}
+
+void SkPatchUtils::getLeftCubic(const SkPoint cubics[12], SkPoint points[4]) {
+    points[0] = cubics[kLeftP0_CubicCtrlPts];
+    points[1] = cubics[kLeftP1_CubicCtrlPts];
+    points[2] = cubics[kLeftP2_CubicCtrlPts];
+    points[3] = cubics[kLeftP3_CubicCtrlPts];
+}
+
+void SkPatchUtils::getRightCubic(const SkPoint cubics[12], SkPoint points[4]) {
+    points[0] = cubics[kRightP0_CubicCtrlPts];
+    points[1] = cubics[kRightP1_CubicCtrlPts];
+    points[2] = cubics[kRightP2_CubicCtrlPts];
+    points[3] = cubics[kRightP3_CubicCtrlPts];
+}
+
+bool SkPatchUtils::getVertexData(SkPatchUtils::VertexData* data, const SkPoint cubics[12],
+                   const SkColor colors[4], const SkPoint texCoords[4], int lodX, int lodY) {
+    if (lodX < 1 || lodY < 1 || nullptr == cubics || nullptr == data) {
+        return false;
+    }
+
+    // check for overflow in multiplication
+    const int64_t lodX64 = (lodX + 1),
+                   lodY64 = (lodY + 1),
+                   mult64 = lodX64 * lodY64;
+    if (mult64 > SK_MaxS32) {
+        return false;
+    }
+    data->fVertexCount = SkToS32(mult64);
+
+    // it is recommended to generate draw calls of no more than 65536 indices, so we never generate
+    // more than 60000 indices. To accomplish that we resize the LOD and vertex count
+    if (data->fVertexCount > 10000 || lodX > 200 || lodY > 200) {
+        SkScalar weightX = static_cast<SkScalar>(lodX) / (lodX + lodY);
+        SkScalar weightY = static_cast<SkScalar>(lodY) / (lodX + lodY);
+
+        // 200 comes from the 100 * 2 which is the max value of vertices because of the limit of
+        // 60000 indices ( sqrt(60000 / 6) that comes from data->fIndexCount = lodX * lodY * 6)
+        lodX = static_cast<int>(weightX * 200);
+        lodY = static_cast<int>(weightY * 200);
+        data->fVertexCount = (lodX + 1) * (lodY + 1);
+    }
+    data->fIndexCount = lodX * lodY * 6;
+
+    data->fPoints = new SkPoint[data->fVertexCount];
+    data->fIndices = new uint16_t[data->fIndexCount];
+
+    // if colors is not null then create array for colors
+    SkPMColor colorsPM[kNumCorners];
+    if (colors) {
+        // premultiply colors to avoid color bleeding.
+        for (int i = 0; i < kNumCorners; i++) {
+            colorsPM[i] = SkPreMultiplyColor(colors[i]);
+        }
+        data->fColors = new uint32_t[data->fVertexCount];
+    }
+    
+    // if texture coordinates are not null then create array for them
+    if (texCoords) {
+        data->fTexCoords = new SkPoint[data->fVertexCount];
+    }
+    
+    SkPoint pts[kNumPtsCubic];
+    SkPatchUtils::getBottomCubic(cubics, pts);
+    FwDCubicEvaluator fBottom(pts);
+    SkPatchUtils::getTopCubic(cubics, pts);
+    FwDCubicEvaluator fTop(pts);
+    SkPatchUtils::getLeftCubic(cubics, pts);
+    FwDCubicEvaluator fLeft(pts);
+    SkPatchUtils::getRightCubic(cubics, pts);
+    FwDCubicEvaluator fRight(pts);
+    
+    fBottom.restart(lodX);
+    fTop.restart(lodX);
+    
+    SkScalar u = 0.0f;
+    int stride = lodY + 1;
+    for (int x = 0; x <= lodX; x++) {
+        SkPoint bottom = fBottom.next(), top = fTop.next();
+        fLeft.restart(lodY);
+        fRight.restart(lodY);
+        SkScalar v = 0.f;
+        for (int y = 0; y <= lodY; y++) {
+            int dataIndex = x * (lodY + 1) + y;
+            
+            SkPoint left = fLeft.next(), right = fRight.next();
+            
+            SkPoint s0 = SkPoint::Make((1.0f - v) * top.x() + v * bottom.x(),
+                                       (1.0f - v) * top.y() + v * bottom.y());
+            SkPoint s1 = SkPoint::Make((1.0f - u) * left.x() + u * right.x(),
+                                       (1.0f - u) * left.y() + u * right.y());
+            SkPoint s2 = SkPoint::Make(
+                                       (1.0f - v) * ((1.0f - u) * fTop.getCtrlPoints()[0].x()
+                                                     + u * fTop.getCtrlPoints()[3].x())
+                                       + v * ((1.0f - u) * fBottom.getCtrlPoints()[0].x()
+                                              + u * fBottom.getCtrlPoints()[3].x()),
+                                       (1.0f - v) * ((1.0f - u) * fTop.getCtrlPoints()[0].y()
+                                                     + u * fTop.getCtrlPoints()[3].y())
+                                       + v * ((1.0f - u) * fBottom.getCtrlPoints()[0].y()
+                                              + u * fBottom.getCtrlPoints()[3].y()));
+            data->fPoints[dataIndex] = s0 + s1 - s2;
+            
+            if (colors) {
+                uint8_t a = uint8_t(bilerp(u, v,
+                                   SkScalar(SkColorGetA(colorsPM[kTopLeft_Corner])),
+                                   SkScalar(SkColorGetA(colorsPM[kTopRight_Corner])),
+                                   SkScalar(SkColorGetA(colorsPM[kBottomLeft_Corner])),
+                                   SkScalar(SkColorGetA(colorsPM[kBottomRight_Corner]))));
+                uint8_t r = uint8_t(bilerp(u, v,
+                                   SkScalar(SkColorGetR(colorsPM[kTopLeft_Corner])),
+                                   SkScalar(SkColorGetR(colorsPM[kTopRight_Corner])),
+                                   SkScalar(SkColorGetR(colorsPM[kBottomLeft_Corner])),
+                                   SkScalar(SkColorGetR(colorsPM[kBottomRight_Corner]))));
+                uint8_t g = uint8_t(bilerp(u, v,
+                                   SkScalar(SkColorGetG(colorsPM[kTopLeft_Corner])),
+                                   SkScalar(SkColorGetG(colorsPM[kTopRight_Corner])),
+                                   SkScalar(SkColorGetG(colorsPM[kBottomLeft_Corner])),
+                                   SkScalar(SkColorGetG(colorsPM[kBottomRight_Corner]))));
+                uint8_t b = uint8_t(bilerp(u, v,
+                                   SkScalar(SkColorGetB(colorsPM[kTopLeft_Corner])),
+                                   SkScalar(SkColorGetB(colorsPM[kTopRight_Corner])),
+                                   SkScalar(SkColorGetB(colorsPM[kBottomLeft_Corner])),
+                                   SkScalar(SkColorGetB(colorsPM[kBottomRight_Corner]))));
+                data->fColors[dataIndex] = SkPackARGB32(a,r,g,b);
+            }
+            
+            if (texCoords) {
+                data->fTexCoords[dataIndex] = SkPoint::Make(
+                                            bilerp(u, v, texCoords[kTopLeft_Corner].x(),
+                                                   texCoords[kTopRight_Corner].x(),
+                                                   texCoords[kBottomLeft_Corner].x(),
+                                                   texCoords[kBottomRight_Corner].x()),
+                                            bilerp(u, v, texCoords[kTopLeft_Corner].y(),
+                                                   texCoords[kTopRight_Corner].y(),
+                                                   texCoords[kBottomLeft_Corner].y(),
+                                                   texCoords[kBottomRight_Corner].y()));
+                
+            }
+            
+            if(x < lodX && y < lodY) {
+                int i = 6 * (x * lodY + y);
+                data->fIndices[i] = x * stride + y;
+                data->fIndices[i + 1] = x * stride + 1 + y;
+                data->fIndices[i + 2] = (x + 1) * stride + 1 + y;
+                data->fIndices[i + 3] = data->fIndices[i];
+                data->fIndices[i + 4] = data->fIndices[i + 2];
+                data->fIndices[i + 5] = (x + 1) * stride + y;
+            }
+            v = SkScalarClampMax(v + 1.f / lodY, 1);
+        }
+        u = SkScalarClampMax(u + 1.f / lodX, 1);
+    }
+    return true;
+
+}
diff --git a/gfx/skia/skia/src/utils/SkPatchUtils.h b/gfx/skia/skia/src/utils/SkPatchUtils.h
new file mode 100644
index 000000000000..7c231f1a3bd1
--- /dev/null
+++ b/gfx/skia/skia/src/utils/SkPatchUtils.h
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPatchUtils_DEFINED
+#define SkPatchUtils_DEFINED
+
+#include "SkColorPriv.h"
+#include "SkMatrix.h"
+
+class SK_API SkPatchUtils {
+    
+public:
+    /**
+     * Structure that holds the vertex data related to the tessellation of a patch. It is passed
+     * as a parameter to the function getVertexData which sets the points, colors and texture
+     * coordinates of the vertices and the indices for them to be drawn as triangles.
+     */
+    struct VertexData {
+        int fVertexCount, fIndexCount;
+        SkPoint* fPoints;
+        SkPoint* fTexCoords;
+        uint32_t* fColors;
+        uint16_t* fIndices;
+        
+        VertexData()
+        : fVertexCount(0)
+        , fIndexCount(0)
+        , fPoints(nullptr)
+        , fTexCoords(nullptr)
+        , fColors(nullptr)
+        , fIndices(nullptr) { }
+        
+        ~VertexData() {
+            delete[] fPoints;
+            delete[] fTexCoords;
+            delete[] fColors;
+            delete[] fIndices;
+        }
+    };
+    
+    // Enums for control points based on the order specified in the constructor (clockwise).
+    enum CubicCtrlPts {
+        kTopP0_CubicCtrlPts = 0,
+        kTopP1_CubicCtrlPts = 1,
+        kTopP2_CubicCtrlPts = 2,
+        kTopP3_CubicCtrlPts = 3,
+        
+        kRightP0_CubicCtrlPts = 3,
+        kRightP1_CubicCtrlPts = 4,
+        kRightP2_CubicCtrlPts = 5,
+        kRightP3_CubicCtrlPts = 6,
+        
+        kBottomP0_CubicCtrlPts = 9,
+        kBottomP1_CubicCtrlPts = 8,
+        kBottomP2_CubicCtrlPts = 7,
+        kBottomP3_CubicCtrlPts = 6,
+        
+        kLeftP0_CubicCtrlPts = 0,
+        kLeftP1_CubicCtrlPts = 11,
+        kLeftP2_CubicCtrlPts = 10,
+        kLeftP3_CubicCtrlPts = 9,
+    };
+    
+    // Enum for corner also clockwise.
+    enum Corner {
+        kTopLeft_Corner = 0,
+        kTopRight_Corner,
+        kBottomRight_Corner,
+        kBottomLeft_Corner
+    };
+    
+    enum {
+        kNumCtrlPts = 12,
+        kNumCorners = 4,
+        kNumPtsCubic = 4
+    };
+    
+    /**
+     * Method that calculates a level of detail (number of subdivisions) for a patch in both axis. 
+     */
+    static SkISize GetLevelOfDetail(const SkPoint cubics[12], const SkMatrix* matrix);
+    
+    /**
+     * Get the points corresponding to the top cubic of cubics.
+     */
+    static void getTopCubic(const SkPoint cubics[12], SkPoint points[4]);
+    
+    /**
+     * Get the points corresponding to the bottom cubic of cubics.
+     */
+    static void getBottomCubic(const SkPoint cubics[12], SkPoint points[4]);
+    
+    /**
+     * Get the points corresponding to the left cubic of cubics.
+     */
+    static void getLeftCubic(const SkPoint cubics[12], SkPoint points[4]);
+    
+    /**
+     * Get the points corresponding to the right cubic of cubics.
+     */
+    static void getRightCubic(const SkPoint cubics[12], SkPoint points[4]);
+    
+    /**
+     * Function that evaluates the coons patch interpolation.
+     * data refers to the pointer of the PatchData struct in which the tessellation data is set.
+     * cubics refers to the points of the cubics.
+     * lod refers the level of detail for each axis.
+     * colors refers to the corner colors that will be bilerp across the patch (optional parameter)
+     * texCoords refers to the corner texture coordinates that will be bilerp across the patch 
+        (optional parameter)
+     */
+    static bool getVertexData(SkPatchUtils::VertexData* data, const SkPoint cubics[12],
+                              const SkColor colors[4], const SkPoint texCoords[4],
+                              int lodX, int lodY);
+};
+
+#endif
diff --git a/gfx/skia/skia/src/utils/SkPathUtils.cpp b/gfx/skia/skia/src/utils/SkPathUtils.cpp
deleted file mode 100644
index fdca09aa6307..000000000000
--- a/gfx/skia/skia/src/utils/SkPathUtils.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- *  CAUTION: EXPERIMENTAL CODE
- *
- *  This code is not to be used and will not be supported
- *  if it fails on you. DO NOT USE!
- *
- */
-
-#include "SkPathUtils.h"
-
-#include "SkPath.h"
-#include "SkPathOps.h" // this can't be found, how do I link it?
-#include "SkRegion.h"
-
-typedef void (*line2path)(SkPath*, const char*, int, int);
-#define SQRT_2 1.41421356237f
-#define ON  0xFF000000 // black pixel
-#define OFF 0x00000000 // transparent pixel
-
-// assumes stride is in bytes
-/*
-static void FillRandomBits( int chars, char* bits ){
-    SkTime time;
-    SkRandom rand = SkRandom( time.GetMSecs() );
-
-    for (int i = 0; i < chars; ++i){
-        bits[i] = rand.nextU();
-    }
-}OA
-*/
-
-static int GetBit( const char* buffer, int x ) {
-    int byte = x >> 3;
-    int bit = x & 7;
-
-    return buffer[byte] & (128 >> bit);
-}
-
-/*
-static void Line2path_pixel(SkPath* path, const char* line,
-                            int lineIdx, int width) {
-    for (int i = 0; i < width; ++i) {
-        // simply makes every ON pixel into a rect path
-        if (GetBit(line,i)) {
-            path->addRect(SkRect::MakeXYWH(i, lineIdx, 1, 1),
-                          SkPath::kCW_Direction);
-        }
-    }
-}
-
-static void Line2path_pixelCircle(SkPath* path, const char* line,
-                                  int lineIdx, int width) {
-    for (int i = 0; i < width; ++i) {
-        // simply makes every ON pixel into a circle path
-        if (GetBit(line,i)) {
-            path->addCircle(i + SK_ScalarHalf,
-                            lineIdx + SK_ScalarHalf,
-                            SQRT_2 / 2.0f);
-        }
-    }
-}
-*/
-
-static void Line2path_span(SkPath* path, const char* line,
-                           int lineIdx, int width) {
-    bool inRun = 0;
-    int start = 1;
-
-    for (int i = 0; i < width; ++i) {
-        int curPixel = GetBit(line,i);
-
-        if ( (curPixel!=0) != inRun ) { // if transition
-            if (curPixel) { // if transition on
-                inRun = 1;
-                start = i; // mark beginning of span
-            }else { // if transition off add the span as a path
-                inRun = 0;
-                path->addRect(SkRect::MakeXYWH(SkIntToScalar(start), SkIntToScalar(lineIdx),
-                                               SkIntToScalar(i-start), SK_Scalar1),
-                              SkPath::kCW_Direction);
-            }
-        }
-    }
-
-    if (inRun==1) { // close any open spans
-        int end = 0;
-        if ( GetBit(line,width-1) ) ++end;
-        path->addRect(SkRect::MakeXYWH(SkIntToScalar(start), SkIntToScalar(lineIdx),
-                                       SkIntToScalar(width - 1 + end - start), SK_Scalar1),
-                      SkPath::kCW_Direction);
-    } else if ( GetBit(line, width - 1) ) { // if last pixel on add
-        path->addRect(SkRect::MakeXYWH(width - SK_Scalar1, SkIntToScalar(lineIdx),
-                                       SK_Scalar1, SK_Scalar1),
-                      SkPath::kCW_Direction);
-    }
-}
-
-void SkPathUtils::BitsToPath_Path(SkPath* path,
-                        const char* bitmap,
-                        int w, int h, int stride) {
-    // loop for every line in bitmap
-    for (int i = 0; i < h; ++i) {
-        // fn ptr handles each line separately
-        //l2p_fn(path, &bitmap[i*stride], i, w);
-        Line2path_span(path, &bitmap[i*stride], i, w);
-    }
-    Simplify(*path, path); // simplify resulting path.
-}
-
-void SkPathUtils::BitsToPath_Region(SkPath* path,
-                               const char* bitmap,
-                               int w, int h, int stride) {
-    SkRegion region;
-
-    // loop for each line
-    for (int y = 0; y < h; ++y){
-        bool inRun = 0;
-        int start = 1;
-        const char* line = &bitmap[y * stride];
-
-        // loop for each pixel
-        for (int i = 0; i < w; ++i) {
-            int curPixel = GetBit(line,i);
-
-            if ( (curPixel!=0) != inRun ) { // if transition
-                if (curPixel) { // if transition on
-                    inRun = 1;
-                    start = i; // mark beginning of span
-                }else { // if transition off add the span as a path
-                    inRun = 0;
-                    //add here
-                    region.op(SkIRect::MakeXYWH(start, y, i-start, 1),
-                              SkRegion::kUnion_Op );
-                }
-            }
-        }
-        if (inRun==1) { // close any open spans
-            int end = 0;
-            if ( GetBit(line,w-1) ) ++end;
-            // add the thing here
-            region.op(SkIRect::MakeXYWH(start, y, w-1-start+end, 1),
-                      SkRegion::kUnion_Op );
-
-        } else if ( GetBit(line,w-1) ) { // if last pixel on add rect
-            // add the thing here
-            region.op(SkIRect::MakeXYWH(w-1, y, 1, 1),
-                      SkRegion::kUnion_Op );
-        }
-    }
-    // convert region to path
-    region.getBoundaryPath(path);
-}
diff --git a/gfx/skia/skia/src/utils/SkPictureUtils.cpp b/gfx/skia/skia/src/utils/SkPictureUtils.cpp
deleted file mode 100644
index 85d523f46c56..000000000000
--- a/gfx/skia/skia/src/utils/SkPictureUtils.cpp
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkBitmapDevice.h"
-#include "SkCanvas.h"
-#include "SkData.h"
-#include "SkNoSaveLayerCanvas.h"
-#include "SkPictureUtils.h"
-#include "SkPixelRef.h"
-#include "SkRRect.h"
-#include "SkShader.h"
-
-class PixelRefSet {
-public:
-    PixelRefSet(SkTDArray<SkPixelRef*>* array) : fArray(array) {}
-
-    // This does a linear search on existing pixelrefs, so if this list gets big
-    // we should use a more complex sorted/hashy thing.
-    //
-    void add(SkPixelRef* pr) {
-        uint32_t genID = pr->getGenerationID();
-        if (fGenID.find(genID) < 0) {
-            *fArray->append() = pr;
-            *fGenID.append() = genID;
-//            SkDebugf("--- adding [%d] %x %d\n", fArray->count() - 1, pr, genID);
-        } else {
-//            SkDebugf("--- already have %x %d\n", pr, genID);
-        }
-    }
-
-private:
-    SkTDArray<SkPixelRef*>* fArray;
-    SkTDArray<uint32_t>     fGenID;
-};
-
-static void not_supported() {
-    SkDEBUGFAIL("this method should never be called");
-}
-
-static void nothing_to_do() {}
-
-/**
- *  This device will route all bitmaps (primitives and in shaders) to its PRSet.
- *  It should never actually draw anything, so there need not be any pixels
- *  behind its device.
- */
-class GatherPixelRefDevice : public SkBaseDevice {
-public:
-    SK_DECLARE_INST_COUNT(GatherPixelRefDevice)
-
-    GatherPixelRefDevice(int width, int height, PixelRefSet* prset) {
-        fSize.set(width, height);
-        fEmptyBitmap.setInfo(SkImageInfo::MakeUnknown(width, height));
-        fPRSet = prset;
-    }
-
-    virtual SkImageInfo imageInfo() const SK_OVERRIDE {
-        return SkImageInfo::MakeUnknown(fSize.width(), fSize.height());
-    }
-    virtual GrRenderTarget* accessRenderTarget() SK_OVERRIDE { return NULL; }
-    virtual bool filterTextFlags(const SkPaint& paint, TextFlags*) SK_OVERRIDE {
-        return false;
-    }
-    // TODO: allow this call to return failure, or move to SkBitmapDevice only.
-    virtual const SkBitmap& onAccessBitmap() SK_OVERRIDE {
-        return fEmptyBitmap;
-    }
-    virtual void lockPixels() SK_OVERRIDE { nothing_to_do(); }
-    virtual void unlockPixels() SK_OVERRIDE { nothing_to_do(); }
-    virtual bool allowImageFilter(const SkImageFilter*) SK_OVERRIDE { return false; }
-    virtual bool canHandleImageFilter(const SkImageFilter*) SK_OVERRIDE { return false; }
-    virtual bool filterImage(const SkImageFilter*, const SkBitmap&, const SkImageFilter::Context&,
-                             SkBitmap* result, SkIPoint* offset) SK_OVERRIDE {
-        return false;
-    }
-
-    virtual void clear(SkColor color) SK_OVERRIDE {
-        nothing_to_do();
-    }
-
-    virtual void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE {
-        this->addBitmapFromPaint(paint);
-    }
-    virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode, size_t count,
-                            const SkPoint[], const SkPaint& paint) SK_OVERRIDE {
-        this->addBitmapFromPaint(paint);
-    }
-    virtual void drawRect(const SkDraw&, const SkRect&,
-                          const SkPaint& paint) SK_OVERRIDE {
-        this->addBitmapFromPaint(paint);
-    }
-    virtual void drawRRect(const SkDraw&, const SkRRect&,
-                           const SkPaint& paint) SK_OVERRIDE {
-        this->addBitmapFromPaint(paint);
-    }
-    virtual void drawOval(const SkDraw&, const SkRect&,
-                          const SkPaint& paint) SK_OVERRIDE {
-        this->addBitmapFromPaint(paint);
-    }
-    virtual void drawPath(const SkDraw&, const SkPath& path,
-                          const SkPaint& paint, const SkMatrix* prePathMatrix,
-                          bool pathIsMutable) SK_OVERRIDE {
-        this->addBitmapFromPaint(paint);
-    }
-    virtual void drawBitmap(const SkDraw&, const SkBitmap& bitmap,
-                            const SkMatrix&, const SkPaint& paint) SK_OVERRIDE {
-        this->addBitmap(bitmap);
-        if (kAlpha_8_SkColorType == bitmap.colorType()) {
-            this->addBitmapFromPaint(paint);
-        }
-    }
-    virtual void drawBitmapRect(const SkDraw&, const SkBitmap& bitmap,
-                                const SkRect* srcOrNull, const SkRect& dst,
-                                const SkPaint& paint,
-                                SkCanvas::DrawBitmapRectFlags flags) SK_OVERRIDE {
-        this->addBitmap(bitmap);
-        if (kAlpha_8_SkColorType == bitmap.colorType()) {
-            this->addBitmapFromPaint(paint);
-        }
-    }
-    virtual void drawSprite(const SkDraw&, const SkBitmap& bitmap,
-                            int x, int y, const SkPaint& paint) SK_OVERRIDE {
-        this->addBitmap(bitmap);
-    }
-    virtual void drawText(const SkDraw&, const void* text, size_t len,
-                          SkScalar x, SkScalar y,
-                          const SkPaint& paint) SK_OVERRIDE {
-        this->addBitmapFromPaint(paint);
-    }
-    virtual void drawPosText(const SkDraw&, const void* text, size_t len,
-                             const SkScalar pos[], SkScalar constY,
-                             int, const SkPaint& paint) SK_OVERRIDE {
-        this->addBitmapFromPaint(paint);
-    }
-    virtual void drawTextOnPath(const SkDraw&, const void* text, size_t len,
-                                const SkPath& path, const SkMatrix* matrix,
-                                const SkPaint& paint) SK_OVERRIDE {
-        this->addBitmapFromPaint(paint);
-    }
-    virtual void drawVertices(const SkDraw&, SkCanvas::VertexMode, int vertexCount,
-                              const SkPoint verts[], const SkPoint texs[],
-                              const SkColor colors[], SkXfermode* xmode,
-                              const uint16_t indices[], int indexCount,
-                              const SkPaint& paint) SK_OVERRIDE {
-        this->addBitmapFromPaint(paint);
-    }
-    virtual void drawDevice(const SkDraw&, SkBaseDevice*, int x, int y,
-                            const SkPaint&) SK_OVERRIDE {
-        nothing_to_do();
-    }
-
-protected:
-    virtual void replaceBitmapBackendForRasterSurface(const SkBitmap&) SK_OVERRIDE {
-        not_supported();
-    }
-    virtual SkBaseDevice* onCreateDevice(const SkImageInfo& info, Usage usage) SK_OVERRIDE {
-        // we expect to only get called via savelayer, in which case it is fine.
-        SkASSERT(kSaveLayer_Usage == usage);
-        return SkNEW_ARGS(GatherPixelRefDevice, (info.width(), info.height(), fPRSet));
-    }
-    virtual void flush() SK_OVERRIDE {}
-
-private:
-    PixelRefSet*  fPRSet;
-    SkBitmap fEmptyBitmap;  // legacy -- need to remove the need for this guy
-    SkISize fSize;
-
-    void addBitmap(const SkBitmap& bm) {
-      fPRSet->add(bm.pixelRef());
-    }
-
-    void addBitmapFromPaint(const SkPaint& paint) {
-      SkShader* shader = paint.getShader();
-      if (shader) {
-          SkBitmap bm;
-          // Check whether the shader is a gradient in order to short-circuit
-          // call to asABitmap to prevent generation of bitmaps from
-          // gradient shaders, which implement asABitmap.
-          if (SkShader::kNone_GradientType == shader->asAGradient(NULL) &&
-              shader->asABitmap(&bm, NULL, NULL)) {
-              fPRSet->add(bm.pixelRef());
-          }
-      }
-    }
-
-    typedef SkBaseDevice INHERITED;
-};
-
-SkData* SkPictureUtils::GatherPixelRefs(const SkPicture* pict, const SkRect& area) {
-    if (NULL == pict) {
-        return NULL;
-    }
-
-    // this test also handles if either area or pict's width/height are empty
-    if (!SkRect::Intersects(area,
-                            SkRect::MakeWH(SkIntToScalar(pict->width()),
-                                           SkIntToScalar(pict->height())))) {
-        return NULL;
-    }
-
-    SkTDArray<SkPixelRef*> array;
-    PixelRefSet prset(&array);
-
-    GatherPixelRefDevice device(pict->width(), pict->height(), &prset);
-    SkNoSaveLayerCanvas canvas(&device);
-
-    canvas.clipRect(area, SkRegion::kIntersect_Op, false);
-    canvas.drawPicture(pict);
-
-    SkData* data = NULL;
-    int count = array.count();
-    if (count > 0) {
-        data = SkData::NewFromMalloc(array.detach(), count * sizeof(SkPixelRef*));
-    }
-    return data;
-}
diff --git a/gfx/skia/skia/src/utils/SkProxyCanvas.cpp b/gfx/skia/skia/src/utils/SkProxyCanvas.cpp
deleted file mode 100644
index 3aa459cdfab0..000000000000
--- a/gfx/skia/skia/src/utils/SkProxyCanvas.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#include "SkProxyCanvas.h"
-
-SkProxyCanvas::SkProxyCanvas(SkCanvas* proxy) : fProxy(proxy) {
-    SkSafeRef(fProxy);
-}
-
-SkProxyCanvas::~SkProxyCanvas() {
-    SkSafeUnref(fProxy);
-}
-
-void SkProxyCanvas::setProxy(SkCanvas* proxy) {
-    SkRefCnt_SafeAssign(fProxy, proxy);
-}
-
-///////////////////////////////// Overrides ///////////
-
-void SkProxyCanvas::willSave() {
-    fProxy->save();
-    this->INHERITED::willSave();
-}
-
-SkCanvas::SaveLayerStrategy SkProxyCanvas::willSaveLayer(const SkRect* bounds, const SkPaint* paint,
-                                                         SaveFlags flags) {
-    fProxy->saveLayer(bounds, paint, flags);
-    this->INHERITED::willSaveLayer(bounds, paint, flags);
-    // No need for a layer.
-    return kNoLayer_SaveLayerStrategy;
-}
-
-void SkProxyCanvas::willRestore() {
-    fProxy->restore();
-    this->INHERITED::willRestore();
-}
-
-void SkProxyCanvas::didConcat(const SkMatrix& matrix) {
-    fProxy->concat(matrix);
-    this->INHERITED::didConcat(matrix);
-}
-
-void SkProxyCanvas::didSetMatrix(const SkMatrix& matrix) {
-    fProxy->setMatrix(matrix);
-    this->INHERITED::didSetMatrix(matrix);
-}
-
-void SkProxyCanvas::onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
-    fProxy->clipRect(rect, op, kSoft_ClipEdgeStyle == edgeStyle);
-}
-
-void SkProxyCanvas::onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
-    fProxy->clipRRect(rrect, op, kSoft_ClipEdgeStyle == edgeStyle);
-}
-
-void SkProxyCanvas::onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
-    fProxy->clipPath(path, op, kSoft_ClipEdgeStyle == edgeStyle);
-}
-
-void SkProxyCanvas::onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) {
-    fProxy->clipRegion(deviceRgn, op);
-}
-
-void SkProxyCanvas::drawPaint(const SkPaint& paint) {
-    fProxy->drawPaint(paint);
-}
-
-void SkProxyCanvas::drawPoints(PointMode mode, size_t count,
-                               const SkPoint pts[], const SkPaint& paint) {
-    fProxy->drawPoints(mode, count, pts, paint);
-}
-
-void SkProxyCanvas::drawOval(const SkRect& rect, const SkPaint& paint) {
-    fProxy->drawOval(rect, paint);
-}
-
-void SkProxyCanvas::drawRect(const SkRect& rect, const SkPaint& paint) {
-    fProxy->drawRect(rect, paint);
-}
-
-void SkProxyCanvas::drawRRect(const SkRRect& rrect, const SkPaint& paint) {
-    fProxy->drawRRect(rrect, paint);
-}
-
-void SkProxyCanvas::onDrawDRRect(const SkRRect& outer, const SkRRect& inner,
-                                 const SkPaint& paint) {
-    fProxy->drawDRRect(outer, inner, paint);
-}
-
-void SkProxyCanvas::drawPath(const SkPath& path, const SkPaint& paint) {
-    fProxy->drawPath(path, paint);
-}
-
-void SkProxyCanvas::drawBitmap(const SkBitmap& bitmap, SkScalar x, SkScalar y,
-                               const SkPaint* paint) {
-    fProxy->drawBitmap(bitmap, x, y, paint);
-}
-
-void SkProxyCanvas::drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src,
-                                   const SkRect& dst, const SkPaint* paint,
-                                   DrawBitmapRectFlags flags) {
-    fProxy->drawBitmapRectToRect(bitmap, src, dst, paint, flags);
-}
-
-void SkProxyCanvas::drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m,
-                                     const SkPaint* paint) {
-    fProxy->drawBitmapMatrix(bitmap, m, paint);
-}
-
-void SkProxyCanvas::drawSprite(const SkBitmap& bitmap, int x, int y,
-                               const SkPaint* paint) {
-    fProxy->drawSprite(bitmap, x, y, paint);
-}
-
-void SkProxyCanvas::onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
-                               const SkPaint& paint) {
-    fProxy->drawText(text, byteLength, x, y, paint);
-}
-
-void SkProxyCanvas::onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
-                                  const SkPaint& paint) {
-    fProxy->drawPosText(text, byteLength, pos, paint);
-}
-
-void SkProxyCanvas::onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
-                                   SkScalar constY, const SkPaint& paint) {
-    fProxy->drawPosTextH(text, byteLength, xpos, constY, paint);
-}
-
-void SkProxyCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
-                                     const SkMatrix* matrix, const SkPaint& paint) {
-    fProxy->drawTextOnPath(text, byteLength, path, matrix, paint);
-}
-
-void SkProxyCanvas::onDrawPicture(const SkPicture* picture) {
-    fProxy->drawPicture(picture);
-}
-
-void SkProxyCanvas::drawVertices(VertexMode vmode, int vertexCount,
-                                 const SkPoint vertices[], const SkPoint texs[],
-                                 const SkColor colors[], SkXfermode* xmode,
-                                 const uint16_t indices[], int indexCount,
-                                 const SkPaint& paint) {
-    fProxy->drawVertices(vmode, vertexCount, vertices, texs, colors,
-                                     xmode, indices, indexCount, paint);
-}
-
-void SkProxyCanvas::drawData(const void* data, size_t length) {
-    fProxy->drawData(data, length);
-}
-
-void SkProxyCanvas::beginCommentGroup(const char* description) {
-    fProxy->beginCommentGroup(description);
-}
-
-void SkProxyCanvas::addComment(const char* kywd, const char* value) {
-    fProxy->addComment(kywd, value);
-}
-
-void SkProxyCanvas::endCommentGroup() {
-    fProxy->endCommentGroup();
-}
-
-SkDrawFilter* SkProxyCanvas::setDrawFilter(SkDrawFilter* filter) {
-    return fProxy->setDrawFilter(filter);
-}
diff --git a/gfx/skia/skia/src/utils/SkRTConf.cpp b/gfx/skia/skia/src/utils/SkRTConf.cpp
index bb6cb23cb93c..2dfa47efc710 100644
--- a/gfx/skia/skia/src/utils/SkRTConf.cpp
+++ b/gfx/skia/skia/src/utils/SkRTConf.cpp
@@ -8,9 +8,11 @@
 #include "SkRTConf.h"
 #include "SkOSFile.h"
 
+#include <stdlib.h>
+
 SkRTConfRegistry::SkRTConfRegistry(): fConfs(100) {
 
-    SkFILE *fp = sk_fopen(configFileLocation(), kRead_SkFILE_Flag);
+    FILE *fp = sk_fopen(configFileLocation(), kRead_SkFILE_Flag);
 
     if (!fp) {
         return;
@@ -28,7 +30,7 @@ SkRTConfRegistry::SkRTConfRegistry(): fConfs(100) {
         if (commentptr == line) {
             continue;
         }
-        if (NULL != commentptr) {
+        if (commentptr) {
             *commentptr = '\0';
         }
 
@@ -39,13 +41,13 @@ SkRTConfRegistry::SkRTConfRegistry(): fConfs(100) {
             continue;
         }
 
-        char *valptr = strtok(NULL, sep);
+        char *valptr = strtok(nullptr, sep);
         if (!valptr) {
             continue;
         }
 
-        SkString* key = SkNEW_ARGS(SkString,(keyptr));
-        SkString* val = SkNEW_ARGS(SkString,(valptr));
+        SkString *key = new SkString(keyptr);
+        SkString *val = new SkString(valptr);
 
         fConfigFileKeys.append(1, &key);
         fConfigFileValues.append(1, &val);
@@ -62,8 +64,8 @@ SkRTConfRegistry::~SkRTConfRegistry() {
     }
 
     for (int i = 0 ; i < fConfigFileKeys.count() ; i++) {
-        SkDELETE(fConfigFileKeys[i]);
-        SkDELETE(fConfigFileValues[i]);
+        delete fConfigFileKeys[i];
+        delete fConfigFileValues[i];
     }
 }
 
@@ -75,7 +77,7 @@ const char *SkRTConfRegistry::configFileLocation() const {
 // to trigger this, make a config file of zero size.
 void SkRTConfRegistry::possiblyDumpFile() const {
     const char *path = configFileLocation();
-    SkFILE *fp = sk_fopen(path, kRead_SkFILE_Flag);
+    FILE *fp = sk_fopen(path, kRead_SkFILE_Flag);
     if (!fp) {
         return;
     }
@@ -99,7 +101,7 @@ void SkRTConfRegistry::validate() const {
 void SkRTConfRegistry::printAll(const char *fname) const {
     SkWStream *o;
 
-    if (NULL != fname) {
+    if (fname) {
         o = new SkFILEWStream(fname);
     } else {
         o = new SkDebugWStream();
@@ -133,7 +135,7 @@ bool SkRTConfRegistry::hasNonDefault() const {
 void SkRTConfRegistry::printNonDefault(const char *fname) const {
     SkWStream *o;
 
-    if (NULL != fname) {
+    if (fname) {
         o = new SkFILEWStream(fname);
     } else {
         o = new SkDebugWStream();
@@ -238,7 +240,7 @@ static inline void str_replace(char *s, char search, char replace) {
 }
 
 template<typename T> bool SkRTConfRegistry::parse(const char *name, T* value) {
-    const char *str = NULL;
+    const char *str = nullptr;
 
     for (int i = fConfigFileKeys.count() - 1 ; i >= 0; i--) {
         if (fConfigFileKeys[i]->equals(name)) {
@@ -299,7 +301,7 @@ template <typename T> void SkRTConfRegistry::set(const char *name,
         }
         return;
     }
-    SkASSERT(confArray != NULL);
+    SkASSERT(confArray != nullptr);
     for (SkRTConfBase **confBase = confArray->begin(); confBase != confArray->end(); confBase++) {
         // static_cast here is okay because there's only one kind of child class.
         SkRTConf<T> *concrete = static_cast<SkRTConf<T> *>(*confBase);
@@ -321,30 +323,3 @@ SkRTConfRegistry &skRTConfRegistry() {
     static SkRTConfRegistry r;
     return r;
 }
-
-
-#ifdef SK_SUPPORT_UNITTEST
-
-#ifdef SK_BUILD_FOR_WIN32
-static void sk_setenv(const char* key, const char* value) {
-    _putenv_s(key, value);
-}
-#else
-static void sk_setenv(const char* key, const char* value) {
-    setenv(key, value, 1);
-}
-#endif
-
-void SkRTConfRegistry::UnitTest() {
-    SkRTConfRegistry registryWithoutContents(true);
-
-    sk_setenv("skia_nonexistent_item", "132");
-    int result = 0;
-    registryWithoutContents.parse("nonexistent.item", &result);
-    SkASSERT(result == 132);
-}
-
-SkRTConfRegistry::SkRTConfRegistry(bool)
-    : fConfs(100) {
-}
-#endif
diff --git a/gfx/skia/skia/src/core/SkInstCnt.cpp b/gfx/skia/skia/src/utils/SkRunnable.h
similarity index 52%
rename from gfx/skia/skia/src/core/SkInstCnt.cpp
rename to gfx/skia/skia/src/utils/SkRunnable.h
index 2f9a57dc2b63..7a93b60c8980 100644
--- a/gfx/skia/skia/src/core/SkInstCnt.cpp
+++ b/gfx/skia/skia/src/utils/SkRunnable.h
@@ -5,8 +5,12 @@
  * found in the LICENSE file.
  */
 
-#include "SkInstCnt.h"
+#ifndef SkRunnable_DEFINED
+#define SkRunnable_DEFINED
+
+struct SkRunnable {
+    virtual ~SkRunnable() {};
+    virtual void run() = 0;
+};
 
-#if SK_ENABLE_INST_COUNT
-bool gPrintInstCount = false;
 #endif
diff --git a/gfx/skia/skia/src/utils/SkSHA1.h b/gfx/skia/skia/src/utils/SkSHA1.h
index df8b9bf1b68c..aa0867fed39a 100644
--- a/gfx/skia/skia/src/utils/SkSHA1.h
+++ b/gfx/skia/skia/src/utils/SkSHA1.h
@@ -24,12 +24,12 @@ public:
     /** Processes input, adding it to the digest.
      *  Note that this treats the buffer as a series of uint8_t values.
      */
-    virtual bool write(const void* buffer, size_t size) SK_OVERRIDE {
+    bool write(const void* buffer, size_t size) override {
         update(reinterpret_cast<const uint8_t*>(buffer), size);
         return true;
     }
 
-    virtual size_t bytesWritten() const SK_OVERRIDE { return SkToSizeT(this->byteCount); }
+    size_t bytesWritten() const override { return SkToSizeT(this->byteCount); }
 
     /** Processes input, adding it to the digest. Calling this after finish is undefined. */
     void update(const uint8_t* input, size_t length);
diff --git a/gfx/skia/skia/src/utils/SkTFitsIn.h b/gfx/skia/skia/src/utils/SkTFitsIn.h
index 1d04981c06f6..cf92822d8fe7 100644
--- a/gfx/skia/skia/src/utils/SkTFitsIn.h
+++ b/gfx/skia/skia/src/utils/SkTFitsIn.h
@@ -15,16 +15,23 @@
 namespace sktfitsin {
 namespace Private {
 
-/** SkTHasMoreDigits::type = (digits(A) >= digits(B)) ? SkTrue : SkFalse. */
-template<typename A, typename B> struct SkTHasMoreDigits {
-    typedef SkTBool<std::numeric_limits<A>::digits >= std::numeric_limits<B>::digits> type;
+/** SkTMux::type = (a && b) ? Both : (a) ? A : (b) ? B : Neither; */
+template <bool a, bool b, typename Both, typename A, typename B, typename Neither>
+struct SkTMux {
+    using type = skstd::conditional_t<a, skstd::conditional_t<b, Both, A>,
+                                         skstd::conditional_t<b, B, Neither>>;
 };
 
+/** SkTHasMoreDigits = (digits(A) >= digits(B)) ? true_type : false_type. */
+template<typename A, typename B> struct SkTHasMoreDigits
+    : skstd::bool_constant<std::numeric_limits<A>::digits >= std::numeric_limits<B>::digits>
+{ };
+
 /** A high or low side predicate which is used when it is statically known
  *  that source values are in the range of the Destination.
  */
 template <typename S> struct SkTOutOfRange_False {
-    typedef SkFalse can_be_true;
+    typedef skstd::false_type can_be_true;
     typedef S source_type;
     static bool apply(S s) {
         return false;
@@ -35,11 +42,11 @@ template <typename S> struct SkTOutOfRange_False {
  *  Assumes that Min(S) <= Min(D).
  */
 template <typename D, typename S> struct SkTOutOfRange_LT_MinD {
-    typedef SkTrue can_be_true;
+    typedef skstd::true_type can_be_true;
     typedef S source_type;
     static bool apply(S s) {
-        typedef typename SkTHasMoreDigits<S, D>::type precondition;
-        SK_COMPILE_ASSERT(precondition::value, SkTOutOfRange_LT_MinD__minS_gt_minD);
+        typedef SkTHasMoreDigits<S, D> precondition;
+        static_assert(precondition::value, "SkTOutOfRange_LT_MinD__minS_gt_minD");
 
         return s < static_cast<S>((std::numeric_limits<D>::min)());
     }
@@ -47,7 +54,7 @@ template <typename D, typename S> struct SkTOutOfRange_LT_MinD {
 
 /** A low side predicate which tests if the source value is less than 0. */
 template <typename D, typename S> struct SkTOutOfRange_LT_Zero {
-    typedef SkTrue can_be_true;
+    typedef skstd::true_type can_be_true;
     typedef S source_type;
     static bool apply(S s) {
         return s < static_cast<S>(0);
@@ -58,11 +65,11 @@ template <typename D, typename S> struct SkTOutOfRange_LT_Zero {
  *  Assumes that Max(S) >= Max(D).
  */
 template <typename D, typename S> struct SkTOutOfRange_GT_MaxD {
-    typedef SkTrue can_be_true;
+    typedef skstd::true_type can_be_true;
     typedef S source_type;
     static bool apply(S s) {
-        typedef typename SkTHasMoreDigits<S, D>::type precondition;
-        SK_COMPILE_ASSERT(precondition::value, SkTOutOfRange_GT_MaxD__maxS_lt_maxD);
+        typedef SkTHasMoreDigits<S, D> precondition;
+        static_assert(precondition::value, "SkTOutOfRange_GT_MaxD__maxS_lt_maxD");
 
         return s > static_cast<S>((std::numeric_limits<D>::max)());
     }
@@ -72,7 +79,7 @@ template <typename D, typename S> struct SkTOutOfRange_GT_MaxD {
  *  First checks OutOfRange_Low then, if in range, OutOfRange_High.
  */
 template<class OutOfRange_Low, class OutOfRange_High> struct SkTOutOfRange_Either {
-    typedef SkTrue can_be_true;
+    typedef skstd::true_type can_be_true;
     typedef typename OutOfRange_Low::source_type source_type;
     static bool apply(source_type s) {
         bool outOfRange = OutOfRange_Low::apply(s);
@@ -93,7 +100,7 @@ template<class OutOfRange_Low, class OutOfRange_High> struct SkTCombineOutOfRang
     typedef typename OutOfRange_Low::can_be_true apply_low;
     typedef typename OutOfRange_High::can_be_true apply_high;
 
-    typedef typename SkTMux<apply_low, apply_high,
+    typedef typename SkTMux<apply_low::value, apply_high::value,
                             Both, OutOfRange_Low, OutOfRange_High, Neither>::type type;
 };
 
@@ -119,8 +126,8 @@ template<typename D, typename S> struct SkTFitsIn_Unsigned2Unsiged {
 
     // If std::numeric_limits<D>::digits >= std::numeric_limits<S>::digits, nothing to check.
     // This also protects the precondition of SkTOutOfRange_GT_MaxD.
-    typedef typename SkTHasMoreDigits<D, S>::type sourceFitsInDesitination;
-    typedef typename SkTIf<sourceFitsInDesitination, NoCheck, HighSideOnlyCheck>::type type;
+    typedef SkTHasMoreDigits<D, S> sourceFitsInDesitination;
+    typedef skstd::conditional_t<sourceFitsInDesitination::value, NoCheck, HighSideOnlyCheck> type;
 };
 
 /** SkTFitsIn_Signed2Signed::type is an SkTRangeChecker with an OutOfRange(S s) method
@@ -136,8 +143,8 @@ template<typename D, typename S> struct SkTFitsIn_Signed2Signed {
 
     // If std::numeric_limits<D>::digits >= std::numeric_limits<S>::digits, nothing to check.
     // This also protects the precondition of SkTOutOfRange_LT_MinD and SkTOutOfRange_GT_MaxD.
-    typedef typename SkTHasMoreDigits<D, S>::type sourceFitsInDesitination;
-    typedef typename SkTIf<sourceFitsInDesitination, NoCheck, FullCheck>::type type;
+    typedef SkTHasMoreDigits<D, S> sourceFitsInDesitination;
+    typedef skstd::conditional_t<sourceFitsInDesitination::value, NoCheck, FullCheck> type;
 };
 
 /** SkTFitsIn_Signed2Unsigned::type is an SkTRangeChecker with an OutOfRange(S s) method
@@ -154,8 +161,8 @@ template<typename D, typename S> struct SkTFitsIn_Signed2Unsigned {
     // If std::numeric_limits<D>::max() >= std::numeric_limits<S>::max(),
     // no need to check the high side. (Until C++11, assume more digits means greater max.)
     // This also protects the precondition of SkTOutOfRange_GT_MaxD.
-    typedef typename SkTHasMoreDigits<D, S>::type sourceCannotExceedDesitination;
-    typedef typename SkTIf<sourceCannotExceedDesitination, LowSideOnlyCheck, FullCheck>::type type;
+    typedef SkTHasMoreDigits<D, S> sourceCannotExceedDest;
+    typedef skstd::conditional_t<sourceCannotExceedDest::value, LowSideOnlyCheck, FullCheck> type;
 };
 
 /** SkTFitsIn_Unsigned2Signed::type is an SkTRangeChecker with an OutOfRange(S s) method
@@ -172,8 +179,8 @@ template<typename D, typename S> struct SkTFitsIn_Unsigned2Signed {
     // If std::numeric_limits<D>::max() >= std::numeric_limits<S>::max(), nothing to check.
     // (Until C++11, assume more digits means greater max.)
     // This also protects the precondition of SkTOutOfRange_GT_MaxD.
-    typedef typename SkTHasMoreDigits<D, S>::type sourceCannotExceedDesitination;
-    typedef typename SkTIf<sourceCannotExceedDesitination, NoCheck, HighSideOnlyCheck>::type type;
+    typedef SkTHasMoreDigits<D, S> sourceCannotExceedDest;
+    typedef skstd::conditional_t<sourceCannotExceedDest::value, NoCheck, HighSideOnlyCheck> type;
 };
 
 /** SkTFitsIn::type is an SkTRangeChecker with an OutOfRange(S s) method
@@ -187,10 +194,11 @@ template<typename D, typename S> struct SkTFitsIn {
     typedef SkTFitsIn_Unsigned2Signed<D, S> U2S;
     typedef SkTFitsIn_Unsigned2Unsiged<D, S> U2U;
 
-    typedef SkTBool<std::numeric_limits<S>::is_signed> S_is_signed;
-    typedef SkTBool<std::numeric_limits<D>::is_signed> D_is_signed;
+    typedef skstd::bool_constant<std::numeric_limits<S>::is_signed> S_is_signed;
+    typedef skstd::bool_constant<std::numeric_limits<D>::is_signed> D_is_signed;
 
-    typedef typename SkTMux<S_is_signed, D_is_signed, S2S, S2U, U2S, U2U>::type selector;
+    typedef typename SkTMux<S_is_signed::value, D_is_signed::value,
+                            S2S, S2U, U2S, U2U>::type selector;
     // This type is an SkTRangeChecker.
     typedef typename selector::type type;
 };
@@ -200,8 +208,8 @@ template<typename D, typename S> struct SkTFitsIn {
 
 /** Returns true if the integer source value 's' will fit in the integer destination type 'D'. */
 template <typename D, typename S> inline bool SkTFitsIn(S s) {
-    SK_COMPILE_ASSERT(std::numeric_limits<S>::is_integer, SkTFitsIn_source_must_be_integer);
-    SK_COMPILE_ASSERT(std::numeric_limits<D>::is_integer, SkTFitsIn_destination_must_be_integer);
+    static_assert(std::numeric_limits<S>::is_integer, "SkTFitsIn_source_must_be_integer");
+    static_assert(std::numeric_limits<D>::is_integer, "SkTFitsIn_destination_must_be_integer");
 
     return !sktfitsin::Private::SkTFitsIn<D, S>::type::OutOfRange(s);
 }
diff --git a/gfx/skia/skia/src/utils/SkTLogic.h b/gfx/skia/skia/src/utils/SkTLogic.h
deleted file mode 100644
index 2b5df0b16fe8..000000000000
--- a/gfx/skia/skia/src/utils/SkTLogic.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- *
- * This header provides some of the helpers (std::integral_constant) and
- * type transformations (std::conditional) which will become available with
- * C++11 in the type_traits header.
- *
- * Because we lack constexpr, we cannot mimic
- * std::integral_constant::'constexpr operator T()'.
- * As a result we introduce SkTBool and SkTIf similar to Boost in order to
- * minimize the visual noise of many uses of '::value'.
- */
-
-#ifndef SkTLogic_DEFINED
-#define SkTLogic_DEFINED
-
-/** Represents a templated integer constant.
- *  Pre-C++11 version of std::integral_constant.
- */
-template <typename T, T v> struct SkTIntegralConstant {
-    static const T value = v;
-    typedef T value_type;
-    typedef SkTIntegralConstant<T, v> type;
-};
-
-/** Convenience specialization of SkTIntegralConstant. */
-template <bool b> struct SkTBool : SkTIntegralConstant<bool, b> { };
-
-/** Pre-C++11 version of std::is_empty<T>. */
-template <typename T>
-class SkTIsEmpty {
-    struct Derived : public T { char unused; };
-public:
-    static const bool value = sizeof(Derived) == sizeof(char);
-};
-
-/** Pre-C++11 version of std::true_type. */
-typedef SkTBool<true> SkTrue;
-
-/** Pre-C++11 version of std::false_type. */
-typedef SkTBool<false> SkFalse;
-
-/** SkTIf_c::type = (condition) ? T : F;
- *  Pre-C++11 version of std::conditional.
- */
-template <bool condition, typename T, typename F> struct SkTIf_c {
-    typedef F type;
-};
-template <typename T, typename F> struct SkTIf_c<true, T, F> {
-    typedef T type;
-};
-
-/** SkTIf::type = (Condition::value) ? T : F; */
-template <typename Condition, typename T, typename F> struct SkTIf {
-    typedef typename SkTIf_c<static_cast<bool>(Condition::value), T, F>::type type;
-};
-
-/** SkTMux::type = (a && b) ? Both : (a) ? A : (b) ? B : Neither; */
-template <typename a, typename b, typename Both, typename A, typename B, typename Neither>
-struct SkTMux {
-    typedef typename SkTIf<a, typename SkTIf<b, Both, A>::type,
-                              typename SkTIf<b, B, Neither>::type>::type type;
-};
-
-/** SkTEnableIf_c::type = (condition) ? T : [does not exist]; */
-template <bool condition, class T = void> struct SkTEnableIf_c { };
-template <class T> struct SkTEnableIf_c<true, T> {
-    typedef T type;
-};
-
-/** SkTEnableIf::type = (Condition::value) ? T : [does not exist]; */
-template <class Condition, class T = void> struct SkTEnableIf
-    : public SkTEnableIf_c<static_cast<bool>(Condition::value), T> { };
-
-/** Use as a return type to enable a function only when cond_type::value is true,
- *  like C++14's std::enable_if_t.  E.g.  (N.B. this is a dumb example.)
- *  SK_WHEN(SkTrue, int) f(void* ptr) { return 1; }
- *  SK_WHEN(!SkTrue, int) f(void* ptr) { return 2; }
- */
-#define SK_WHEN(cond_prefix, T) typename SkTEnableIf_c<cond_prefix::value, T>::type
-
-// See http://en.wikibooks.org/wiki/More_C++_Idioms/Member_Detector
-#define SK_CREATE_MEMBER_DETECTOR(member)                                           \
-template <typename T>                                                               \
-class HasMember_##member {                                                          \
-    struct Fallback { int member; };                                                \
-    struct Derived : T, Fallback {};                                                \
-    template <typename U, U> struct Check;                                          \
-    template <typename U> static uint8_t func(Check<int Fallback::*, &U::member>*); \
-    template <typename U> static uint16_t func(...);                                \
-public:                                                                             \
-    typedef HasMember_##member type;                                                \
-    static const bool value = sizeof(func<Derived>(NULL)) == sizeof(uint16_t);      \
-}
-
-// Same sort of thing as SK_CREATE_MEMBER_DETECTOR, but checks for the existence of a nested type.
-#define SK_CREATE_TYPE_DETECTOR(type)                                   \
-template <typename T>                                                   \
-class HasType_##type {                                                  \
-    template <typename U> static uint8_t func(typename U::type*);       \
-    template <typename U> static uint16_t func(...);                    \
-public:                                                                 \
-    static const bool value = sizeof(func<T>(NULL)) == sizeof(uint8_t); \
-}
-
-#endif
diff --git a/gfx/skia/skia/src/views/SkTextBox.cpp b/gfx/skia/skia/src/utils/SkTextBox.cpp
similarity index 77%
rename from gfx/skia/skia/src/views/SkTextBox.cpp
rename to gfx/skia/skia/src/utils/SkTextBox.cpp
index 55d75a64dac7..ba6ef53debc7 100644
--- a/gfx/skia/skia/src/views/SkTextBox.cpp
+++ b/gfx/skia/skia/src/utils/SkTextBox.cpp
@@ -15,7 +15,7 @@ static inline int is_ws(int c)
 
 static size_t linebreak(const char text[], const char stop[],
                         const SkPaint& paint, SkScalar margin,
-                        size_t* trailing = NULL)
+                        size_t* trailing = nullptr)
 {
     size_t lengthBreak = paint.breakText(text, stop - text, margin);
 
@@ -165,14 +165,13 @@ void SkTextBox::setSpacing(SkScalar mul, SkScalar add)
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 
-void SkTextBox::draw(SkCanvas* canvas, const char text[], size_t len, const SkPaint& paint)
-{
-    SkASSERT(canvas && (text || len == 0));
-
+SkScalar SkTextBox::visit(Visitor& visitor, const char text[], size_t len,
+                          const SkPaint& paint) const {
     SkScalar marginWidth = fBox.width();
 
-    if (marginWidth <= 0 || len == 0)
-        return;
+    if (marginWidth <= 0 || len == 0) {
+        return fBox.top();
+    }
 
     const char* textStop = text + len;
 
@@ -200,8 +199,7 @@ void SkTextBox::draw(SkCanvas* canvas, const char text[], size_t len, const SkPa
     {
         SkScalar textHeight = fontHeight;
 
-        if (fMode == kLineBreak_Mode && fSpacingAlign != kStart_SpacingAlign)
-        {
+        if (fMode == kLineBreak_Mode && fSpacingAlign != kStart_SpacingAlign) {
             int count = SkTextLineBreaker::CountLines(text, textStop - text, paint, marginWidth);
             SkASSERT(count > 0);
             textHeight += scaledSpacing * (count - 1);
@@ -222,29 +220,48 @@ void SkTextBox::draw(SkCanvas* canvas, const char text[], size_t len, const SkPa
         y += fBox.fTop - metrics.fAscent;
     }
 
-    for (;;)
-    {
+    for (;;) {
         size_t trailing;
         len = linebreak(text, textStop, paint, marginWidth, &trailing);
-        if (y + metrics.fDescent + metrics.fLeading > 0)
-            canvas->drawText(text, len - trailing, x, y, paint);
+        if (y + metrics.fDescent + metrics.fLeading > 0) {
+            visitor(text, len - trailing, x, y, paint);
+        }
         text += len;
-        if (text >= textStop)
+        if (text >= textStop) {
             break;
+        }
         y += scaledSpacing;
-        if (y + metrics.fAscent >= fBox.fBottom)
+        if (y + metrics.fAscent >= fBox.fBottom) {
             break;
+        }
     }
+    return y + metrics.fDescent + metrics.fLeading;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
+class CanvasVisitor : public SkTextBox::Visitor {
+    SkCanvas* fCanvas;
+public:
+    CanvasVisitor(SkCanvas* canvas) : fCanvas(canvas) {}
+
+    void operator()(const char text[], size_t length, SkScalar x, SkScalar y,
+                    const SkPaint& paint) override {
+        fCanvas->drawText(text, length, x, y, paint);
+    }
+};
+
 void SkTextBox::setText(const char text[], size_t len, const SkPaint& paint) {
     fText = text;
     fLen = len;
     fPaint = &paint;
 }
 
+void SkTextBox::draw(SkCanvas* canvas, const char text[], size_t len, const SkPaint& paint) {
+    CanvasVisitor sink(canvas);
+    this->visit(sink, text, len, paint);
+}
+
 void SkTextBox::draw(SkCanvas* canvas) {
     this->draw(canvas, fText, fLen, *fPaint);
 }
@@ -257,3 +274,30 @@ SkScalar SkTextBox::getTextHeight() const {
     SkScalar spacing = SkScalarMul(fPaint->getTextSize(), fSpacingMul) + fSpacingAdd;
     return this->countLines() * spacing;
 }
+
+///////////////////////////////////////////////////////////////////////////////
+
+#include "SkTextBlob.h"
+
+class TextBlobVisitor : public SkTextBox::Visitor {
+public:
+    SkTextBlobBuilder fBuilder;
+
+    void operator()(const char text[], size_t length, SkScalar x, SkScalar y,
+                    const SkPaint& paint) override {
+        SkPaint p(paint);
+        p.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
+        const int count = paint.countText(text, length);
+        paint.textToGlyphs(text, length, fBuilder.allocRun(p, count, x, y).glyphs);
+    }
+};
+
+SkTextBlob* SkTextBox::snapshotTextBlob(SkScalar* computedBottom) const {
+    TextBlobVisitor visitor;
+    SkScalar newB = this->visit(visitor, fText, fLen, *fPaint);
+    if (computedBottom) {
+        *computedBottom = newB;
+    }
+    return (SkTextBlob*)visitor.fBuilder.build();
+}
+
diff --git a/gfx/skia/skia/src/utils/SkTextureCompressor.cpp b/gfx/skia/skia/src/utils/SkTextureCompressor.cpp
index 40c0d3e5e887..e308f6e480ca 100644
--- a/gfx/skia/skia/src/utils/SkTextureCompressor.cpp
+++ b/gfx/skia/skia/src/utils/SkTextureCompressor.cpp
@@ -11,30 +11,95 @@
 #include "SkTextureCompressor_R11EAC.h"
 
 #include "SkBitmap.h"
+#include "SkBitmapProcShader.h"
 #include "SkData.h"
 #include "SkEndian.h"
+#include "SkOpts.h"
 
-#include "SkTextureCompression_opts.h"
+#ifndef SK_IGNORE_ETC1_SUPPORT
+#  include "etc1.h"
+#endif
+
+// Convert ETC1 functions to our function signatures
+static bool compress_etc1_565(uint8_t* dst, const uint8_t* src,
+                              int width, int height, size_t rowBytes) {
+#ifndef SK_IGNORE_ETC1_SUPPORT
+    return 0 == etc1_encode_image(src, width, height, 2, SkToInt(rowBytes), dst);
+#else
+    return false;
+#endif
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 
 namespace SkTextureCompressor {
 
+void GetBlockDimensions(Format format, int* dimX, int* dimY, bool matchSpec) {
+    if (nullptr == dimX || nullptr == dimY) {
+        return;
+    }
+
+    if (!matchSpec && SkOpts::fill_block_dimensions(format, dimX, dimY)) {
+        return;
+    }
+
+    // No specialized arguments, return the dimensions as they are in the spec.
+    static const struct FormatDimensions {
+        const int fBlockSizeX;
+        const int fBlockSizeY;
+    } kFormatDimensions[kFormatCnt] = {
+        { 4, 4 }, // kLATC_Format
+        { 4, 4 }, // kR11_EAC_Format
+        { 4, 4 }, // kETC1_Format
+        { 4, 4 }, // kASTC_4x4_Format
+        { 5, 4 }, // kASTC_5x4_Format
+        { 5, 5 }, // kASTC_5x5_Format
+        { 6, 5 }, // kASTC_6x5_Format
+        { 6, 6 }, // kASTC_6x6_Format
+        { 8, 5 }, // kASTC_8x5_Format
+        { 8, 6 }, // kASTC_8x6_Format
+        { 8, 8 }, // kASTC_8x8_Format
+        { 10, 5 }, // kASTC_10x5_Format
+        { 10, 6 }, // kASTC_10x6_Format
+        { 10, 8 }, // kASTC_10x8_Format
+        { 10, 10 }, // kASTC_10x10_Format
+        { 12, 10 }, // kASTC_12x10_Format
+        { 12, 12 }, // kASTC_12x12_Format
+    };
+
+    *dimX = kFormatDimensions[format].fBlockSizeX;
+    *dimY = kFormatDimensions[format].fBlockSizeY;
+}
+
 int GetCompressedDataSize(Format fmt, int width, int height) {
-    int blockDimension = 0;
+    int dimX, dimY;
+    GetBlockDimensions(fmt, &dimX, &dimY, true);
+
     int encodedBlockSize = 0;
-            
+
     switch (fmt) {
         // These formats are 64 bits per 4x4 block.
-        case kR11_EAC_Format:
         case kLATC_Format:
-            blockDimension = 4;
+        case kR11_EAC_Format:
+        case kETC1_Format:
             encodedBlockSize = 8;
             break;
 
-        // This format is 12x12 blocks to 128 bits.
+        // This format is 128 bits.
+        case kASTC_4x4_Format:
+        case kASTC_5x4_Format:
+        case kASTC_5x5_Format:
+        case kASTC_6x5_Format:
+        case kASTC_6x6_Format:
+        case kASTC_8x5_Format:
+        case kASTC_8x6_Format:
+        case kASTC_8x8_Format:
+        case kASTC_10x5_Format:
+        case kASTC_10x6_Format:
+        case kASTC_10x8_Format:
+        case kASTC_10x10_Format:
+        case kASTC_12x10_Format:
         case kASTC_12x12_Format:
-            blockDimension = 12;
             encodedBlockSize = 16;
             break;
 
@@ -43,9 +108,9 @@ int GetCompressedDataSize(Format fmt, int width, int height) {
             return -1;
     }
 
-    if(((width % blockDimension) == 0) && ((height % blockDimension) == 0)) {
-        const int blocksX = width / blockDimension;
-        const int blocksY = height / blockDimension;
+    if(((width % dimX) == 0) && ((height % dimY) == 0)) {
+        const int blocksX = width / dimX;
+        const int blocksY = height / dimY;
 
         return blocksX * blocksY * encodedBlockSize;
     }
@@ -54,79 +119,113 @@ int GetCompressedDataSize(Format fmt, int width, int height) {
 }
 
 bool CompressBufferToFormat(uint8_t* dst, const uint8_t* src, SkColorType srcColorType,
-                            int width, int height, int rowBytes, Format format, bool opt) {
-    CompressionProc proc = NULL;
-    if (opt) {
-        proc = SkTextureCompressorGetPlatformProc(srcColorType, format);
+                            int width, int height, size_t rowBytes, Format format) {
+    SkOpts::TextureCompressor proc = SkOpts::texture_compressor(srcColorType, format);
+    if (proc && proc(dst, src, width, height, rowBytes)) {
+        return true;
     }
 
-    if (NULL == proc) {
-        switch (srcColorType) {
-            case kAlpha_8_SkColorType:
-            {
-                switch (format) {
-                    case kLATC_Format:
-                        proc = CompressA8ToLATC;
-                        break;
-                    case kR11_EAC_Format:
-                        proc = CompressA8ToR11EAC;
-                        break;
-                    case kASTC_12x12_Format:
-                        proc = CompressA8To12x12ASTC;
-                        break;
-                    default:
-                        // Do nothing...
-                        break;
-                }
-            }
+    switch (srcColorType) {
+        case kAlpha_8_SkColorType:
+            if (format == kLATC_Format)       { proc = CompressA8ToLATC;      }
+            if (format == kR11_EAC_Format)    { proc = CompressA8ToR11EAC;    }
+            if (format == kASTC_12x12_Format) { proc = CompressA8To12x12ASTC; }
+            break;
+        case kRGB_565_SkColorType:
+            if (format == kETC1_Format) { proc = compress_etc1_565; }
+            break;
+        default:
             break;
-
-            default:
-                // Do nothing...
-                break;
-        }
     }
-
-    if (NULL != proc) {
-        return proc(dst, src, width, height, rowBytes);
+    if (proc && proc(dst, src, width, height, rowBytes)) {
+        return true;
     }
 
     return false;
 }
 
-SkData *CompressBitmapToFormat(const SkBitmap &bitmap, Format format) {
-    SkAutoLockPixels alp(bitmap);
-
-    int compressedDataSize = GetCompressedDataSize(format, bitmap.width(), bitmap.height());
+SkData* CompressBitmapToFormat(const SkPixmap& pixmap, Format format) {
+    int compressedDataSize = GetCompressedDataSize(format, pixmap.width(), pixmap.height());
     if (compressedDataSize < 0) {
-        return NULL;
+        return nullptr;
     }
 
-    const uint8_t* src = reinterpret_cast<const uint8_t*>(bitmap.getPixels());
-    uint8_t* dst = reinterpret_cast<uint8_t*>(sk_malloc_throw(compressedDataSize));
+    const uint8_t* src = reinterpret_cast<const uint8_t*>(pixmap.addr());
+    SkData* dst = SkData::NewUninitialized(compressedDataSize);
 
-    if (CompressBufferToFormat(dst, src, bitmap.colorType(), bitmap.width(), bitmap.height(),
-                               bitmap.rowBytes(), format)) {
-        return SkData::NewFromMalloc(dst, compressedDataSize);
+    if (!CompressBufferToFormat((uint8_t*)dst->writable_data(), src, pixmap.colorType(),
+                                pixmap.width(), pixmap.height(), pixmap.rowBytes(), format)) {
+        dst->unref();
+        dst = nullptr;
     }
-
-    sk_free(dst);
-    return NULL;
+    return dst;
 }
 
-SkBlitter* CreateBlitterForFormat(int width, int height, void* compressedBuffer, Format format) {
+SkBlitter* CreateBlitterForFormat(int width, int height, void* compressedBuffer,
+                                  SkTBlitterAllocator *allocator, Format format) {
     switch(format) {
         case kLATC_Format:
-            return CreateLATCBlitter(width, height, compressedBuffer);
+            return CreateLATCBlitter(width, height, compressedBuffer, allocator);
 
         case kR11_EAC_Format:
-            return CreateR11EACBlitter(width, height, compressedBuffer);
+            return CreateR11EACBlitter(width, height, compressedBuffer, allocator);
+
+        case kASTC_12x12_Format:
+            return CreateASTCBlitter(width, height, compressedBuffer, allocator);
 
         default:
-            return NULL;
+            return nullptr;
     }
 
-    return NULL;
+    return nullptr;
+}
+
+bool DecompressBufferFromFormat(uint8_t* dst, int dstRowBytes, const uint8_t* src,
+                                int width, int height, Format format) {
+    int dimX, dimY;
+    GetBlockDimensions(format, &dimX, &dimY, true);
+
+    if (width < 0 || ((width % dimX) != 0) || height < 0 || ((height % dimY) != 0)) {
+        return false;
+    }
+
+    switch(format) {
+        case kLATC_Format:
+            DecompressLATC(dst, dstRowBytes, src, width, height);
+            return true;
+
+        case kR11_EAC_Format:
+            DecompressR11EAC(dst, dstRowBytes, src, width, height);
+            return true;
+
+#ifndef SK_IGNORE_ETC1_SUPPORT
+        case kETC1_Format:
+            return 0 == etc1_decode_image(src, dst, width, height, 3, dstRowBytes);
+#endif
+
+        case kASTC_4x4_Format:
+        case kASTC_5x4_Format:
+        case kASTC_5x5_Format:
+        case kASTC_6x5_Format:
+        case kASTC_6x6_Format:
+        case kASTC_8x5_Format:
+        case kASTC_8x6_Format:
+        case kASTC_8x8_Format:
+        case kASTC_10x5_Format:
+        case kASTC_10x6_Format:
+        case kASTC_10x8_Format:
+        case kASTC_10x10_Format:
+        case kASTC_12x10_Format:
+        case kASTC_12x12_Format:
+            DecompressASTC(dst, dstRowBytes, src, width, height, dimX, dimY);
+            return true;
+
+        default:
+            // Do nothing...
+            break;
+    }
+
+    return false;
 }
 
 }  // namespace SkTextureCompressor
diff --git a/gfx/skia/skia/src/utils/SkTextureCompressor.h b/gfx/skia/skia/src/utils/SkTextureCompressor.h
index 5238ba221be0..d4d48967a3dd 100644
--- a/gfx/skia/skia/src/utils/SkTextureCompressor.h
+++ b/gfx/skia/skia/src/utils/SkTextureCompressor.h
@@ -8,19 +8,42 @@
 #ifndef SkTextureCompressor_DEFINED
 #define SkTextureCompressor_DEFINED
 
+#include "SkBitmapProcShader.h"
 #include "SkImageInfo.h"
-#include "SkBlitter.h"
 
 class SkBitmap;
+class SkBlitter;
 class SkData;
 
 namespace SkTextureCompressor {
     // Various texture compression formats that we support.
     enum Format {
         // Alpha only formats.
-        kLATC_Format,       // 4x4 blocks, compresses A8
-        kR11_EAC_Format,    // 4x4 blocks, compresses A8
-        kASTC_12x12_Format, // 12x12 blocks, compresses A8
+        kLATC_Format,       // 4x4 blocks, (de)compresses A8
+        kR11_EAC_Format,    // 4x4 blocks, (de)compresses A8
+
+        // RGB only formats
+        kETC1_Format,       // 4x4 blocks, compresses RGB 565, decompresses 8-bit RGB
+                            //    NOTE: ETC1 supports 8-bit RGB compression, but we
+                            //    currently don't have any RGB8 SkColorTypes. We could
+                            //    support 8-bit RGBA but we would have to preprocess the
+                            //    bitmap to insert alphas.
+
+        // Multi-purpose formats
+        kASTC_4x4_Format,   // 4x4 blocks, no compression, decompresses RGBA
+        kASTC_5x4_Format,   // 5x4 blocks, no compression, decompresses RGBA
+        kASTC_5x5_Format,   // 5x5 blocks, no compression, decompresses RGBA
+        kASTC_6x5_Format,   // 6x5 blocks, no compression, decompresses RGBA
+        kASTC_6x6_Format,   // 6x6 blocks, no compression, decompresses RGBA
+        kASTC_8x5_Format,   // 8x5 blocks, no compression, decompresses RGBA
+        kASTC_8x6_Format,   // 8x6 blocks, no compression, decompresses RGBA
+        kASTC_8x8_Format,   // 8x8 blocks, no compression, decompresses RGBA
+        kASTC_10x5_Format,  // 10x5 blocks, no compression, decompresses RGBA
+        kASTC_10x6_Format,  // 10x6 blocks, no compression, decompresses RGBA
+        kASTC_10x8_Format,  // 10x8 blocks, no compression, decompresses RGBA
+        kASTC_10x10_Format, // 10x10 blocks, no compression, decompresses RGBA
+        kASTC_12x10_Format, // 12x10 blocks, no compression, decompresses RGBA
+        kASTC_12x12_Format, // 12x12 blocks, compresses A8, decompresses RGBA
 
         kLast_Format = kASTC_12x12_Format
     };
@@ -32,29 +55,57 @@ namespace SkTextureCompressor {
     int GetCompressedDataSize(Format fmt, int width, int height);
 
     // Returns an SkData holding a blob of compressed data that corresponds
-    // to the bitmap. If the bitmap colorType cannot be compressed using the 
-    // associated format, then we return NULL. The caller is responsible for
+    // to the pixmap. If the pixmap colorType cannot be compressed using the
+    // associated format, then we return nullptr. The caller is responsible for
     // calling unref() on the returned data.
-    SkData* CompressBitmapToFormat(const SkBitmap& bitmap, Format format);
+    SkData* CompressBitmapToFormat(const SkPixmap&, Format format);
 
     // Compresses the given src data into dst. The src data is assumed to be
     // large enough to hold width*height pixels. The dst data is expected to
     // be large enough to hold the compressed data according to the format.
     bool CompressBufferToFormat(uint8_t* dst, const uint8_t* src, SkColorType srcColorType,
-                                int width, int height, int rowBytes, Format format,
-                                bool opt = true /* Use optimization if available */);
+                                int width, int height, size_t rowBytes, Format format);
 
-    // This typedef defines what the nominal aspects of a compression function
-    // are. The typedef is not meant to be used by clients of the API, but rather
-    // allows SIMD optimized compression functions to be implemented.
-    typedef bool (*CompressionProc)(uint8_t* dst, const uint8_t* src,
-                                    int width, int height, int rowBytes);
+    // Decompresses the given src data from the format specified into the
+    // destination buffer. The width and height of the data passed corresponds
+    // to the width and height of the uncompressed image. The destination buffer (dst)
+    // is assumed to be large enough to hold the entire decompressed image. The
+    // decompressed image colors are determined based on the passed format.
+    //
+    // Note, CompressBufferToFormat compresses A8 data into ASTC. However,
+    // general ASTC data encodes RGBA data, so that is what the decompressor
+    // operates on.
+    //
+    // Returns true if successfully decompresses the src data.
+    bool DecompressBufferFromFormat(uint8_t* dst, int dstRowBytes, const uint8_t* src,
+                                    int width, int height, Format format);
+
+    // Returns true if there exists a blitter for the specified format.
+    inline bool ExistsBlitterForFormat(Format format) {
+        switch (format) {
+            case kLATC_Format:
+            case kR11_EAC_Format:
+            case kASTC_12x12_Format:
+                return true;
+
+            default:
+                return false;
+        }
+    }
 
     // Returns the blitter for the given compression format. Note, the blitter
     // is intended to be used with the proper input. I.e. if you try to blit
     // RGB source data into an R11 EAC texture, you're gonna have a bad time.
     SkBlitter* CreateBlitterForFormat(int width, int height, void* compressedBuffer,
-                                      Format format);
+                                      SkTBlitterAllocator *allocator, Format format);
+
+    // Returns the desired dimensions of the block size for the given format. These dimensions
+    // don't necessarily correspond to the specification's dimensions, since there may
+    // be specialized algorithms that operate on multiple blocks at once. If the
+    // flag 'matchSpec' is true, then the actual dimensions from the specification are
+    // returned. If the flag is false, then these dimensions reflect the appropriate operable
+    // dimensions of the compression functions.
+    void GetBlockDimensions(Format format, int* dimX, int* dimY, bool matchSpec = false);
 }
 
 #endif
diff --git a/gfx/skia/skia/src/utils/SkTextureCompressor_ASTC.cpp b/gfx/skia/skia/src/utils/SkTextureCompressor_ASTC.cpp
index 774fd157feda..a6e91d66b8e8 100644
--- a/gfx/skia/skia/src/utils/SkTextureCompressor_ASTC.cpp
+++ b/gfx/skia/skia/src/utils/SkTextureCompressor_ASTC.cpp
@@ -6,9 +6,11 @@
  */
 
 #include "SkTextureCompressor_ASTC.h"
+#include "SkTextureCompressor_Blitter.h"
 
 #include "SkBlitter.h"
 #include "SkEndian.h"
+#include "SkMath.h"
 
 // This table contains the weight values for each texel. This is used in determining
 // how to convert a 12x12 grid of alpha values into a 6x5 grid of index values. Since
@@ -132,13 +134,17 @@ static const int8_t k6x5To12x12Table[30][60] = {
 
 // Returns the alpha value of a texel at position (x, y) from src.
 // (x, y) are assumed to be in the range [0, 12).
-static inline uint8_t get_alpha(const uint8_t *src, int rowBytes, int x, int y) {
+inline uint8_t GetAlpha(const uint8_t *src, size_t rowBytes, int x, int y) {
     SkASSERT(x >= 0 && x < 12);
     SkASSERT(y >= 0 && y < 12);
     SkASSERT(rowBytes >= 12);
     return *(src + y*rowBytes + x);
 }
 
+inline uint8_t GetAlphaTranspose(const uint8_t *src, size_t rowBytes, int x, int y) {
+    return GetAlpha(src, rowBytes, y, x);
+}
+
 // Output the 16 bytes stored in top and bottom and advance the pointer. The bytes
 // are stored as the integers are represented in memory, so they should be swapped
 // if necessary.
@@ -151,7 +157,10 @@ static inline void send_packing(uint8_t** dst, const uint64_t top, const uint64_
 
 // Compresses an ASTC block, by looking up the proper contributions from
 // k6x5To12x12Table and computing an index from the associated values.
-static void compress_a8_astc_block(uint8_t** dst, const uint8_t* src, int rowBytes) {
+typedef uint8_t (*GetAlphaProc)(const uint8_t* src, size_t rowBytes, int x, int y);
+
+template<GetAlphaProc getAlphaProc>
+static void compress_a8_astc_block(uint8_t** dst, const uint8_t* src, size_t rowBytes) {
     // Check for single color
     bool constant = true;
     const uint32_t firstInt = *(reinterpret_cast<const uint32_t*>(src));
@@ -186,7 +195,7 @@ static void compress_a8_astc_block(uint8_t** dst, const uint8_t* src, int rowByt
                 const int x = k6x5To12x12Table[idx][w*3 + 1];
                 const int y = k6x5To12x12Table[idx][w*3 + 2];
                 weightTot += weight;
-                alphaTot += weight * get_alpha(src, rowBytes, x, y);
+                alphaTot += weight * getAlphaProc(src, rowBytes, x, y);
             } else {
                 // In our table, not every entry has 20 weights, and all
                 // of them are nonzero. Once we hit a negative weight, we
@@ -248,28 +257,1845 @@ static void compress_a8_astc_block(uint8_t** dst, const uint8_t* src, int rowByt
     send_packing(dst, SkEndian_SwapLE64(top), SkEndian_SwapLE64(bottom));
 }
 
+inline void CompressA8ASTCBlockVertical(uint8_t* dst, const uint8_t* src) {
+    compress_a8_astc_block<GetAlphaTranspose>(&dst, src, 12);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// ASTC Decoder
+//
+// Full details available in the spec:
+// http://www.khronos.org/registry/gles/extensions/OES/OES_texture_compression_astc.txt
+//
 ////////////////////////////////////////////////////////////////////////////////
 
-namespace SkTextureCompressor {
+// Enable this to assert whenever a decoded block has invalid ASTC values. Otherwise, 
+// each invalid block will result in a disgusting magenta color.
+#define ASSERT_ASTC_DECODE_ERROR 0
 
-bool CompressA8To12x12ASTC(uint8_t* dst, const uint8_t* src, int width, int height, int rowBytes) {
-    if (width < 0 || ((width % 12) != 0) || height < 0 || ((height % 12) != 0)) {
+// Reverse 64-bit integer taken from TAOCP 4a, although it's better
+// documented at this site:
+// http://matthewarcus.wordpress.com/2012/11/18/reversing-a-64-bit-word/
+
+template <typename T, T m, int k>
+static inline T swap_bits(T p) {
+    T q = ((p>>k)^p) & m;
+    return p^q^(q<<k);
+}
+
+static inline uint64_t reverse64(uint64_t n) {
+    static const uint64_t m0 = 0x5555555555555555ULL;
+    static const uint64_t m1 = 0x0300c0303030c303ULL;
+    static const uint64_t m2 = 0x00c0300c03f0003fULL;
+    static const uint64_t m3 = 0x00000ffc00003fffULL;
+    n = ((n>>1)&m0) | (n&m0)<<1;
+    n = swap_bits<uint64_t, m1, 4>(n);
+    n = swap_bits<uint64_t, m2, 8>(n);
+    n = swap_bits<uint64_t, m3, 20>(n);
+    n = (n >> 34) | (n << 30);
+    return n;
+}
+
+// An ASTC block is 128 bits. We represent it as two 64-bit integers in order
+// to efficiently operate on the block using bitwise operations.
+struct ASTCBlock {
+    uint64_t fLow;
+    uint64_t fHigh;
+
+    // Reverses the bits of an ASTC block, making the LSB of the
+    // 128 bit block the MSB.
+    inline void reverse() {
+        const uint64_t newLow = reverse64(this->fHigh);
+        this->fHigh = reverse64(this->fLow);
+        this->fLow = newLow;
+    }
+};
+
+// Writes the given color to every pixel in the block. This is used by void-extent
+// blocks (a special constant-color encoding of a block) and by the error function.
+static inline void write_constant_color(uint8_t* dst, int blockDimX, int blockDimY,
+                                        int dstRowBytes, SkColor color) {
+    for (int y = 0; y < blockDimY; ++y) {
+        SkColor *dstColors = reinterpret_cast<SkColor*>(dst);
+        for (int x = 0; x < blockDimX; ++x) {
+            dstColors[x] = color;
+        }
+        dst += dstRowBytes;
+    }
+}
+
+// Sets the entire block to the ASTC "error" color, a disgusting magenta
+// that's not supposed to appear in natural images.
+static inline void write_error_color(uint8_t* dst, int blockDimX, int blockDimY,
+                                     int dstRowBytes) {
+    static const SkColor kASTCErrorColor = SkColorSetRGB(0xFF, 0, 0xFF);
+
+#if ASSERT_ASTC_DECODE_ERROR
+    SkDEBUGFAIL("ASTC decoding error!\n");
+#endif
+
+    write_constant_color(dst, blockDimX, blockDimY, dstRowBytes, kASTCErrorColor);
+}
+
+// Reads up to 64 bits of the ASTC block starting from bit
+// 'from' and going up to but not including bit 'to'. 'from' starts
+// counting from the LSB, counting up to the MSB. Returns -1 on
+// error.
+static uint64_t read_astc_bits(const ASTCBlock &block, int from, int to) {
+    SkASSERT(0 <= from && from <= 128);
+    SkASSERT(0 <= to && to <= 128);
+
+    const int nBits = to - from;
+    if (0 == nBits) {
+        return 0;
+    }
+
+    if (nBits < 0 || 64 <= nBits) {
+        SkDEBUGFAIL("ASTC -- shouldn't read more than 64 bits");
+        return -1;
+    }
+
+    // Remember, the 'to' bit isn't read.
+    uint64_t result = 0;
+    if (to <= 64) {
+        // All desired bits are in the low 64-bits.
+        result = (block.fLow >> from) & ((1ULL << nBits) - 1);
+    } else if (from >= 64) {
+        // All desired bits are in the high 64-bits.
+        result = (block.fHigh >> (from - 64)) & ((1ULL << nBits) - 1);
+    } else {
+        // from < 64 && to > 64
+        SkASSERT(nBits > (64 - from));
+        const int nLow = 64 - from;
+        const int nHigh = nBits - nLow;
+        result = 
+            ((block.fLow >> from) & ((1ULL << nLow) - 1)) |
+            ((block.fHigh & ((1ULL << nHigh) - 1)) << nLow);
+    }
+
+    return result;
+}
+
+// Returns the number of bits needed to represent a number
+// in the given power-of-two range (excluding the power of two itself).
+static inline int bits_for_range(int x) {
+    SkASSERT(SkIsPow2(x));
+    SkASSERT(0 != x);
+    // Since we know it's a power of two, there should only be one bit set,
+    // meaning the number of trailing zeros is 31 minus the number of leading
+    // zeros.
+    return 31 - SkCLZ(x);
+}
+
+// Clamps an integer to the range [0, 255]
+static inline int clamp_byte(int x) {
+    return SkClampMax(x, 255);
+}
+
+// Helper function defined in the ASTC spec, section C.2.14
+// It transfers a few bits of precision from one value to another.
+static inline void bit_transfer_signed(int *a, int *b) {
+    *b >>= 1;
+    *b |= *a & 0x80;
+    *a >>= 1;
+    *a &= 0x3F;
+    if ( (*a & 0x20) != 0 ) {
+        *a -= 0x40;
+    }
+}
+
+// Helper function defined in the ASTC spec, section C.2.14
+// It uses the value in the blue channel to tint the red and green
+static inline SkColor blue_contract(int a, int r, int g, int b) {
+    return SkColorSetARGB(a, (r + b) >> 1, (g + b) >> 1, b);
+}
+
+// Helper function that decodes two colors from eight values. If isRGB is true,
+// then the pointer 'v' contains six values and the last two are considered to be
+// 0xFF. If isRGB is false, then all eight values come from the pointer 'v'. This
+// corresponds to the decode procedure for the following endpoint modes:
+//   kLDR_RGB_Direct_ColorEndpointMode
+//   kLDR_RGBA_Direct_ColorEndpointMode
+static inline void decode_rgba_direct(const int *v, SkColor *endpoints, bool isRGB) {
+
+    int v6 = 0xFF;
+    int v7 = 0xFF;
+    if (!isRGB) {
+        v6 = v[6];
+        v7 = v[7];
+    }
+
+    const int s0 = v[0] + v[2] + v[4];
+    const int s1 = v[1] + v[3] + v[5];
+
+    if (s1 >= s0) {
+        endpoints[0] = SkColorSetARGB(v6, v[0], v[2], v[4]);
+        endpoints[1] = SkColorSetARGB(v7, v[1], v[3], v[5]);
+    } else {
+        endpoints[0] = blue_contract(v7, v[1], v[3], v[5]);
+        endpoints[1] = blue_contract(v6, v[0], v[2], v[4]);
+    }
+}
+
+// Helper function that decodes two colors from six values. If isRGB is true,
+// then the pointer 'v' contains four values and the last two are considered to be
+// 0xFF. If isRGB is false, then all six values come from the pointer 'v'. This
+// corresponds to the decode procedure for the following endpoint modes:
+//   kLDR_RGB_BaseScale_ColorEndpointMode
+//   kLDR_RGB_BaseScaleWithAlpha_ColorEndpointMode
+static inline void decode_rgba_basescale(const int *v, SkColor *endpoints, bool isRGB) {
+
+    int v4 = 0xFF;
+    int v5 = 0xFF;
+    if (!isRGB) {
+        v4 = v[4];
+        v5 = v[5];
+    }
+                  
+    endpoints[0] = SkColorSetARGB(v4,
+                                  (v[0]*v[3]) >> 8,
+                                  (v[1]*v[3]) >> 8,
+                                  (v[2]*v[3]) >> 8);
+    endpoints[1] = SkColorSetARGB(v5, v[0], v[1], v[2]);
+}
+
+// Helper function that decodes two colors from eight values. If isRGB is true,
+// then the pointer 'v' contains six values and the last two are considered to be
+// 0xFF. If isRGB is false, then all eight values come from the pointer 'v'. This
+// corresponds to the decode procedure for the following endpoint modes:
+//   kLDR_RGB_BaseOffset_ColorEndpointMode
+//   kLDR_RGBA_BaseOffset_ColorEndpointMode
+//
+// If isRGB is true, then treat this as if v6 and v7 are meant to encode full alpha values.
+static inline void decode_rgba_baseoffset(const int *v, SkColor *endpoints, bool isRGB) {
+    int v0 = v[0];
+    int v1 = v[1];
+    int v2 = v[2];
+    int v3 = v[3];
+    int v4 = v[4];
+    int v5 = v[5];
+    int v6 = isRGB ? 0xFF : v[6];
+    // The 0 is here because this is an offset, not a direct value
+    int v7 = isRGB ? 0 : v[7];
+
+    bit_transfer_signed(&v1, &v0);
+    bit_transfer_signed(&v3, &v2);
+    bit_transfer_signed(&v5, &v4);
+    if (!isRGB) {
+        bit_transfer_signed(&v7, &v6);
+    }
+
+    int c[2][4];
+    if ((v1 + v3 + v5) >= 0) {
+        c[0][0] = v6;
+        c[0][1] = v0;
+        c[0][2] = v2;
+        c[0][3] = v4;
+
+        c[1][0] = v6 + v7;
+        c[1][1] = v0 + v1;
+        c[1][2] = v2 + v3;
+        c[1][3] = v4 + v5;
+    } else {
+        c[0][0] = v6 + v7;
+        c[0][1] = (v0 + v1 + v4 + v5) >> 1;
+        c[0][2] = (v2 + v3 + v4 + v5) >> 1;
+        c[0][3] = v4 + v5;
+
+        c[1][0] = v6;
+        c[1][1] = (v0 + v4) >> 1;
+        c[1][2] = (v2 + v4) >> 1;
+        c[1][3] = v4;
+    }
+
+    endpoints[0] = SkColorSetARGB(clamp_byte(c[0][0]),
+                                  clamp_byte(c[0][1]),
+                                  clamp_byte(c[0][2]),
+                                  clamp_byte(c[0][3]));
+
+    endpoints[1] = SkColorSetARGB(clamp_byte(c[1][0]),
+                                  clamp_byte(c[1][1]),
+                                  clamp_byte(c[1][2]),
+                                  clamp_byte(c[1][3]));
+}
+
+
+// A helper class used to decode bit values from standard integer values.
+// We can't use this class with ASTCBlock because then it would need to
+// handle multi-value ranges, and it's non-trivial to lookup a range of bits
+// that splits across two different ints.
+template <typename T>
+class SkTBits {
+public:
+    SkTBits(const T val) : fVal(val) { }
+
+    // Returns the bit at the given position
+    T operator [](const int idx) const {
+        return (fVal >> idx) & 1;
+    }
+
+    // Returns the bits in the given range, inclusive
+    T operator ()(const int end, const int start) const {
+        SkASSERT(end >= start);
+        return (fVal >> start) & ((1ULL << ((end - start) + 1)) - 1);
+    }
+
+private:
+    const T fVal;
+};
+
+// This algorithm matches the trit block decoding in the spec (Table C.2.14)
+static void decode_trit_block(int* dst, int nBits, const uint64_t &block) {
+
+    SkTBits<uint64_t> blockBits(block);
+
+    // According to the spec, a trit block, which contains five values,
+    // has the following layout:
+    //
+    // 27  26  25  24  23  22  21  20  19  18  17  16
+    //  -----------------------------------------------
+    // |T7 |     m4        |T6  T5 |     m3        |T4 |
+    //  -----------------------------------------------
+    //
+    // 15  14  13  12  11  10  9   8   7   6   5   4   3   2   1   0
+    //  --------------------------------------------------------------
+    // |    m2        |T3  T2 |      m1       |T1  T0 |      m0       |
+    //  --------------------------------------------------------------
+    //
+    // Where the m's are variable width depending on the number of bits used
+    // to encode the values (anywhere from 0 to 6). Since 3^5 = 243, the extra
+    // byte labeled T (whose bits are interleaved where 0 is the LSB and 7 is
+    // the MSB), contains five trit values. To decode the trit values, the spec
+    // says that we need to follow the following algorithm:
+    //
+    // if T[4:2] = 111
+    //     C = { T[7:5], T[1:0] }; t4 = t3 = 2
+    // else
+    //     C = T[4:0]
+    //
+    // if T[6:5] = 11
+    //     t4 = 2; t3 = T[7]
+    // else
+    //     t4 = T[7]; t3 = T[6:5]
+    //
+    // if C[1:0] = 11
+    //     t2 = 2; t1 = C[4]; t0 = { C[3], C[2]&~C[3] }
+    // else if C[3:2] = 11
+    //     t2 = 2; t1 = 2; t0 = C[1:0]
+    // else
+    //     t2 = C[4]; t1 = C[3:2]; t0 = { C[1], C[0]&~C[1] }
+    //
+    // The following C++ code is meant to mirror this layout and algorithm as
+    // closely as possible.
+
+    int m[5];
+    if (0 == nBits) {
+        memset(m, 0, sizeof(m));
+    } else {
+        SkASSERT(nBits < 8);
+        m[0] = static_cast<int>(blockBits(nBits - 1, 0));
+        m[1] = static_cast<int>(blockBits(2*nBits - 1 + 2, nBits + 2));
+        m[2] = static_cast<int>(blockBits(3*nBits - 1 + 4, 2*nBits + 4));
+        m[3] = static_cast<int>(blockBits(4*nBits - 1 + 5, 3*nBits + 5));
+        m[4] = static_cast<int>(blockBits(5*nBits - 1 + 7, 4*nBits + 7));
+    }
+
+    int T =
+        static_cast<int>(blockBits(nBits + 1, nBits)) |
+        (static_cast<int>(blockBits(2*nBits + 2 + 1, 2*nBits + 2)) << 2) |
+        (static_cast<int>(blockBits[3*nBits + 4] << 4)) |
+        (static_cast<int>(blockBits(4*nBits + 5 + 1, 4*nBits + 5)) << 5) |
+        (static_cast<int>(blockBits[5*nBits + 7] << 7));
+
+    int t[5];
+
+    int C;
+    SkTBits<int> Tbits(T);
+    if (0x7 == Tbits(4, 2)) {
+        C = (Tbits(7, 5) << 2) | Tbits(1, 0);
+        t[3] = t[4] = 2;
+    } else {
+        C = Tbits(4, 0);
+        if (Tbits(6, 5) == 0x3) {
+            t[4] = 2; t[3] = Tbits[7];
+        } else {
+            t[4] = Tbits[7]; t[3] = Tbits(6, 5);
+        }
+    }
+
+    SkTBits<int> Cbits(C);
+    if (Cbits(1, 0) == 0x3) {
+        t[2] = 2;
+        t[1] = Cbits[4];
+        t[0] = (Cbits[3] << 1) | (Cbits[2] & (0x1 & ~(Cbits[3])));
+    } else if (Cbits(3, 2) == 0x3) {
+        t[2] = 2;
+        t[1] = 2;
+        t[0] = Cbits(1, 0);
+    } else {
+        t[2] = Cbits[4];
+        t[1] = Cbits(3, 2);
+        t[0] = (Cbits[1] << 1) | (Cbits[0] & (0x1 & ~(Cbits[1])));
+    }
+
+#ifdef SK_DEBUG
+    // Make sure all of the decoded values have a trit less than three
+    // and a bit value within the range of the allocated bits.
+    for (int i = 0; i < 5; ++i) {
+        SkASSERT(t[i] < 3);
+        SkASSERT(m[i] < (1 << nBits));
+    }
+#endif
+
+    for (int i = 0; i < 5; ++i) {
+        *dst = (t[i] << nBits) + m[i];
+        ++dst;
+    }
+}
+
+// This algorithm matches the quint block decoding in the spec (Table C.2.15)
+static void decode_quint_block(int* dst, int nBits, const uint64_t &block) {
+    SkTBits<uint64_t> blockBits(block);
+
+    // According to the spec, a quint block, which contains three values,
+    // has the following layout:
+    //
+    //
+    // 18  17  16  15  14  13  12  11  10  9   8   7   6   5   4   3   2   1   0
+    //  --------------------------------------------------------------------------
+    // |Q6  Q5 |     m2       |Q4  Q3 |     m1        |Q2  Q1  Q0 |      m0       |
+    //  --------------------------------------------------------------------------
+    //
+    // Where the m's are variable width depending on the number of bits used
+    // to encode the values (anywhere from 0 to 4). Since 5^3 = 125, the extra
+    // 7-bit value labeled Q (whose bits are interleaved where 0 is the LSB and 6 is
+    // the MSB), contains three quint values. To decode the quint values, the spec
+    // says that we need to follow the following algorithm:
+    //
+    // if Q[2:1] = 11 and Q[6:5] = 00
+    //     q2 = { Q[0], Q[4]&~Q[0], Q[3]&~Q[0] }; q1 = q0 = 4
+    // else
+    //     if Q[2:1] = 11
+    //         q2 = 4; C = { Q[4:3], ~Q[6:5], Q[0] }
+    //     else
+    //         q2 = T[6:5]; C = Q[4:0]
+    //
+    //     if C[2:0] = 101
+    //         q1 = 4; q0 = C[4:3]
+    //     else
+    //         q1 = C[4:3]; q0 = C[2:0]
+    //
+    // The following C++ code is meant to mirror this layout and algorithm as
+    // closely as possible.
+
+    int m[3];
+    if (0 == nBits) {
+        memset(m, 0, sizeof(m));
+    } else {
+        SkASSERT(nBits < 8);
+        m[0] = static_cast<int>(blockBits(nBits - 1, 0));
+        m[1] = static_cast<int>(blockBits(2*nBits - 1 + 3, nBits + 3));
+        m[2] = static_cast<int>(blockBits(3*nBits - 1 + 5, 2*nBits + 5));
+    }
+
+    int Q =
+        static_cast<int>(blockBits(nBits + 2, nBits)) |
+        (static_cast<int>(blockBits(2*nBits + 3 + 1, 2*nBits + 3)) << 3) |
+        (static_cast<int>(blockBits(3*nBits + 5 + 1, 3*nBits + 5)) << 5);
+
+    int q[3];
+    SkTBits<int> Qbits(Q); // quantum?
+
+    if (Qbits(2, 1) == 0x3 && Qbits(6, 5) == 0) {
+        const int notBitZero = (0x1 & ~(Qbits[0]));
+        q[2] = (Qbits[0] << 2) | ((Qbits[4] & notBitZero) << 1) | (Qbits[3] & notBitZero);
+        q[1] = 4;
+        q[0] = 4;
+    } else {
+        int C;
+        if (Qbits(2, 1) == 0x3) {
+            q[2] = 4;
+            C = (Qbits(4, 3) << 3) | ((0x3 & ~(Qbits(6, 5))) << 1) | Qbits[0];
+        } else {
+            q[2] = Qbits(6, 5);
+            C = Qbits(4, 0);
+        }
+
+        SkTBits<int> Cbits(C);
+        if (Cbits(2, 0) == 0x5) {
+            q[1] = 4;
+            q[0] = Cbits(4, 3);
+        } else {
+            q[1] = Cbits(4, 3);
+            q[0] = Cbits(2, 0);
+        }
+    }
+
+#ifdef SK_DEBUG
+    for (int i = 0; i < 3; ++i) {
+        SkASSERT(q[i] < 5);
+        SkASSERT(m[i] < (1 << nBits));
+    }
+#endif
+
+    for (int i = 0; i < 3; ++i) {
+        *dst = (q[i] << nBits) + m[i];
+        ++dst;
+    }
+}
+
+// Function that decodes a sequence of integers stored as an ISE (Integer
+// Sequence Encoding) bit stream. The full details of this function are outlined
+// in section C.2.12 of the ASTC spec. A brief overview is as follows:
+//
+// - Each integer in the sequence is bounded by a specific range r.
+// - The range of each value determines the way the bit stream is interpreted,
+// - If the range is a power of two, then the sequence is a sequence of bits
+// - If the range is of the form 3*2^n, then the sequence is stored as a
+//   sequence of blocks, each block contains 5 trits and 5 bit sequences, which
+//   decodes into 5 values.
+// - Similarly, if the range is of the form 5*2^n, then the sequence is stored as a
+//   sequence of blocks, each block contains 3 quints and 3 bit sequences, which
+//   decodes into 3 values.
+static bool decode_integer_sequence(
+    int* dst,                 // The array holding the destination bits
+    int dstSize,              // The maximum size of the array
+    int nVals,                // The number of values that we'd like to decode
+    const ASTCBlock &block,   // The block that we're decoding from
+    int startBit,             // The bit from which we're going to do the reading
+    int endBit,               // The bit at which we stop reading (not inclusive)
+    bool bReadForward,        // If true, then read LSB -> MSB, else read MSB -> LSB
+    int nBits,                // The number of bits representing this encoding
+    int nTrits,               // The number of trits representing this encoding
+    int nQuints               // The number of quints representing this encoding
+) {
+    // If we want more values than we have, then fail.
+    if (nVals > dstSize) {
         return false;
     }
 
-    uint8_t** dstPtr = &dst;
-    for (int y = 0; y < height; y+=12) {
-        for (int x = 0; x < width; x+=12) {
-            compress_a8_astc_block(dstPtr, src + y*rowBytes + x, rowBytes);
+    ASTCBlock src = block;
+
+    if (!bReadForward) {
+        src.reverse();
+        startBit = 128 - startBit;
+        endBit = 128 - endBit;
+    }
+
+    while (nVals > 0) {
+
+        if (nTrits > 0) {
+            SkASSERT(0 == nQuints);
+
+            int endBlockBit = startBit + 8 + 5*nBits;
+            if (endBlockBit > endBit) {
+                endBlockBit = endBit;
+            }
+
+            // Trit blocks are three values large.
+            int trits[5];
+            decode_trit_block(trits, nBits, read_astc_bits(src, startBit, endBlockBit));
+            memcpy(dst, trits, SkMin32(nVals, 5)*sizeof(int));
+
+            dst += 5;
+            nVals -= 5;
+            startBit = endBlockBit;
+
+        } else if (nQuints > 0) {
+            SkASSERT(0 == nTrits);
+
+            int endBlockBit = startBit + 7 + 3*nBits;
+            if (endBlockBit > endBit) {
+                endBlockBit = endBit;
+            }
+
+            // Quint blocks are three values large
+            int quints[3];
+            decode_quint_block(quints, nBits, read_astc_bits(src, startBit, endBlockBit));
+            memcpy(dst, quints, SkMin32(nVals, 3)*sizeof(int));
+
+            dst += 3;
+            nVals -= 3;
+            startBit = endBlockBit;
+
+        } else {
+            // Just read the bits, but don't read more than we have...
+            int endValBit = startBit + nBits;
+            if (endValBit > endBit) {
+                endValBit = endBit;
+            }
+
+            SkASSERT(endValBit - startBit < 31);
+            *dst = static_cast<int>(read_astc_bits(src, startBit, endValBit));
+            ++dst;
+            --nVals;
+            startBit = endValBit;
         }
     }
 
     return true;
 }
 
-SkBlitter* CreateASTCBlitter(int width, int height, void* outputBuffer) {
-    // TODO (krajcevski)
-    return NULL;
+// Helper function that unquantizes some (seemingly random) generated
+// numbers... meant to match the ASTC hardware. This function is used
+// to unquantize both colors (Table C.2.16) and weights (Table C.2.26)
+static inline int unquantize_value(unsigned mask, int A, int B, int C, int D) {
+    int T = D * C + B;
+    T = T ^ A;
+    T = (A & mask) | (T >> 2);
+    SkASSERT(T < 256);
+    return T;
+}
+
+// Helper function to replicate the bits in x that represents an oldPrec
+// precision integer into a prec precision integer. For example:
+//   255 == replicate_bits(7, 3, 8);
+static inline int replicate_bits(int x, int oldPrec, int prec) {
+    while (oldPrec < prec) {
+        const int toShift = SkMin32(prec-oldPrec, oldPrec);
+        x = (x << toShift) | (x >> (oldPrec - toShift));
+        oldPrec += toShift;
+    }
+
+    // Make sure that no bits are set outside the desired precision.
+    SkASSERT((-(1 << prec) & x) == 0);
+    return x;
+}
+
+// Returns the unquantized value of a color that's represented only as
+// a set of bits.
+static inline int unquantize_bits_color(int val, int nBits) {
+    return replicate_bits(val, nBits, 8);
+}
+
+// Returns the unquantized value of a color that's represented as a
+// trit followed by nBits bits. This algorithm follows the sequence
+// defined in section C.2.13 of the ASTC spec.
+static inline int unquantize_trit_color(int val, int nBits) {
+    SkASSERT(nBits > 0);
+    SkASSERT(nBits < 7);
+
+    const int D = (val >> nBits) & 0x3;
+    SkASSERT(D < 3);
+
+    const int A = -(val & 0x1) & 0x1FF;
+
+    static const int Cvals[6] = { 204, 93, 44, 22, 11, 5 };
+    const int C = Cvals[nBits - 1];
+
+    int B = 0;
+    const SkTBits<int> valBits(val);
+    switch (nBits) {
+        case 1:
+            B = 0;
+            break;
+
+        case 2: {
+            const int b = valBits[1];
+            B = (b << 1) | (b << 2) | (b << 4) | (b << 8);
+        }
+        break;
+
+        case 3: {
+            const int cb = valBits(2, 1);
+            B = cb | (cb << 2) | (cb << 7);
+        }
+        break;
+
+        case 4: {
+            const int dcb = valBits(3, 1);
+            B = dcb | (dcb << 6);
+        }
+        break;
+
+        case 5: {
+            const int edcb = valBits(4, 1);
+            B = (edcb << 5) | (edcb >> 2);
+        }
+        break;
+
+        case 6: {
+            const int fedcb = valBits(5, 1);
+            B = (fedcb << 4) | (fedcb >> 4);
+        }
+        break;
+    }
+
+    return unquantize_value(0x80, A, B, C, D);
+}
+
+// Returns the unquantized value of a color that's represented as a
+// quint followed by nBits bits. This algorithm follows the sequence
+// defined in section C.2.13 of the ASTC spec.
+static inline int unquantize_quint_color(int val, int nBits) {
+    const int D = (val >> nBits) & 0x7;
+    SkASSERT(D < 5);
+
+    const int A = -(val & 0x1) & 0x1FF;
+
+    static const int Cvals[5] = { 113, 54, 26, 13, 6 };
+    SkASSERT(nBits > 0);
+    SkASSERT(nBits < 6);
+
+    const int C = Cvals[nBits - 1];
+
+    int B = 0;
+    const SkTBits<int> valBits(val);
+    switch (nBits) {
+        case 1:
+            B = 0;
+            break;
+
+        case 2: {
+            const int b = valBits[1];
+            B = (b << 2) | (b << 3) | (b << 8);
+        }
+        break;
+
+        case 3: {
+            const int cb = valBits(2, 1);
+            B = (cb >> 1) | (cb << 1) | (cb << 7);
+        }
+        break;
+
+        case 4: {
+            const int dcb = valBits(3, 1);
+            B = (dcb >> 1) | (dcb << 6);
+        }
+        break;
+
+        case 5: {
+            const int edcb = valBits(4, 1);
+            B = (edcb << 5) | (edcb >> 3);
+        }
+        break;
+    }
+
+    return unquantize_value(0x80, A, B, C, D);
+}
+
+// This algorithm takes a list of integers, stored in vals, and unquantizes them
+// in place. This follows the algorithm laid out in section C.2.13 of the ASTC spec.
+static void unquantize_colors(int *vals, int nVals, int nBits, int nTrits, int nQuints) {
+    for (int i = 0; i < nVals; ++i) {
+        if (nTrits > 0) {
+            SkASSERT(nQuints == 0);
+            vals[i] = unquantize_trit_color(vals[i], nBits);
+        } else if (nQuints > 0) {
+            SkASSERT(nTrits == 0);
+            vals[i] = unquantize_quint_color(vals[i], nBits);
+        } else {
+            SkASSERT(nQuints == 0 && nTrits == 0);
+            vals[i] = unquantize_bits_color(vals[i], nBits);
+        }
+    }
+}
+
+// Returns an interpolated value between c0 and c1 based on the weight. This
+// follows the algorithm laid out in section C.2.19 of the ASTC spec.
+static int interpolate_channel(int c0, int c1, int weight) {
+    SkASSERT(0 <= c0 && c0 < 256);
+    SkASSERT(0 <= c1 && c1 < 256);
+
+    c0 = (c0 << 8) | c0;
+    c1 = (c1 << 8) | c1;
+
+    const int result = ((c0*(64 - weight) + c1*weight + 32) / 64) >> 8;
+
+    if (result > 255) {
+        return 255;
+    }
+
+    SkASSERT(result >= 0);
+    return result;
+}
+
+// Returns an interpolated color between the two endpoints based on the weight.
+static SkColor interpolate_endpoints(const SkColor endpoints[2], int weight) {
+    return SkColorSetARGB(
+        interpolate_channel(SkColorGetA(endpoints[0]), SkColorGetA(endpoints[1]), weight),
+        interpolate_channel(SkColorGetR(endpoints[0]), SkColorGetR(endpoints[1]), weight),
+        interpolate_channel(SkColorGetG(endpoints[0]), SkColorGetG(endpoints[1]), weight),
+        interpolate_channel(SkColorGetB(endpoints[0]), SkColorGetB(endpoints[1]), weight));
+}
+
+// Returns an interpolated color between the two endpoints based on the weight.
+// It uses separate weights for the channel depending on the value of the 'plane'
+// variable. By default, all channels will use weight 0, and the value of plane
+// means that weight1 will be used for:
+// 0: red
+// 1: green
+// 2: blue
+// 3: alpha
+static SkColor interpolate_dual_endpoints(
+    const SkColor endpoints[2], int weight0, int weight1, int plane) {
+    int a = interpolate_channel(SkColorGetA(endpoints[0]), SkColorGetA(endpoints[1]), weight0);
+    int r = interpolate_channel(SkColorGetR(endpoints[0]), SkColorGetR(endpoints[1]), weight0);
+    int g = interpolate_channel(SkColorGetG(endpoints[0]), SkColorGetG(endpoints[1]), weight0);
+    int b = interpolate_channel(SkColorGetB(endpoints[0]), SkColorGetB(endpoints[1]), weight0);
+
+    switch (plane) {
+
+        case 0:
+            r = interpolate_channel(
+                SkColorGetR(endpoints[0]), SkColorGetR(endpoints[1]), weight1);
+            break;
+
+        case 1:
+            g = interpolate_channel(
+                SkColorGetG(endpoints[0]), SkColorGetG(endpoints[1]), weight1);
+            break;
+
+        case 2:
+            b = interpolate_channel(
+                SkColorGetB(endpoints[0]), SkColorGetB(endpoints[1]), weight1);
+            break;
+
+        case 3:
+            a = interpolate_channel(
+                SkColorGetA(endpoints[0]), SkColorGetA(endpoints[1]), weight1);
+            break;
+
+        default:
+            SkDEBUGFAIL("Plane should be 0-3");
+            break;
+    }
+
+    return SkColorSetARGB(a, r, g, b);
+}
+
+// A struct of decoded values that we use to carry around information
+// about the block. dimX and dimY are the dimension in texels of the block,
+// for which there is only a limited subset of valid values:
+//
+// 4x4, 5x4, 5x5, 6x5, 6x6, 8x5, 8x6, 8x8, 10x5, 10x6, 10x8, 10x10, 12x10, 12x12
+
+struct ASTCDecompressionData {
+    ASTCDecompressionData(int dimX, int dimY) : fDimX(dimX), fDimY(dimY) { }
+    const int   fDimX;      // the X dimension of the decompressed block
+    const int   fDimY;      // the Y dimension of the decompressed block
+    ASTCBlock   fBlock;     // the block data
+    int         fBlockMode; // the block header that contains the block mode.
+
+    bool fDualPlaneEnabled; // is this block compressing dual weight planes?
+    int  fDualPlane;        // the independent plane in dual plane mode.
+
+    bool fVoidExtent;       // is this block a single color?
+    bool fError;            // does this block have an error encoding?
+
+    int  fWeightDimX;       // the x dimension of the weight grid
+    int  fWeightDimY;       // the y dimension of the weight grid
+
+    int  fWeightBits;       // the number of bits used for each weight value
+    int  fWeightTrits;      // the number of trits used for each weight value
+    int  fWeightQuints;     // the number of quints used for each weight value
+
+    int  fPartCount;        // the number of partitions in this block
+    int  fPartIndex;        // the partition index: only relevant if fPartCount > 0
+
+    // CEM values can be anything in the range 0-15, and each corresponds to a different
+    // mode that represents the color data. We only support LDR modes.
+    enum ColorEndpointMode {
+        kLDR_Luminance_Direct_ColorEndpointMode          = 0,
+        kLDR_Luminance_BaseOffset_ColorEndpointMode      = 1,
+        kHDR_Luminance_LargeRange_ColorEndpointMode      = 2,
+        kHDR_Luminance_SmallRange_ColorEndpointMode      = 3,
+        kLDR_LuminanceAlpha_Direct_ColorEndpointMode     = 4,
+        kLDR_LuminanceAlpha_BaseOffset_ColorEndpointMode = 5,
+        kLDR_RGB_BaseScale_ColorEndpointMode             = 6,
+        kHDR_RGB_BaseScale_ColorEndpointMode             = 7,
+        kLDR_RGB_Direct_ColorEndpointMode                = 8,
+        kLDR_RGB_BaseOffset_ColorEndpointMode            = 9,
+        kLDR_RGB_BaseScaleWithAlpha_ColorEndpointMode    = 10,
+        kHDR_RGB_ColorEndpointMode                       = 11,
+        kLDR_RGBA_Direct_ColorEndpointMode               = 12,
+        kLDR_RGBA_BaseOffset_ColorEndpointMode           = 13,
+        kHDR_RGB_LDRAlpha_ColorEndpointMode              = 14,
+        kHDR_RGB_HDRAlpha_ColorEndpointMode              = 15
+    };
+    static const int kMaxColorEndpointModes = 16;
+
+    // the color endpoint modes for this block.
+    static const int kMaxPartitions = 4;
+    ColorEndpointMode fCEM[kMaxPartitions];
+
+    int  fColorStartBit;    // The bit position of the first bit of the color data
+    int  fColorEndBit;      // The bit position of the last *possible* bit of the color data
+
+    // Returns the number of partitions for this block.
+    int numPartitions() const {
+        return fPartCount;
+    }
+
+    // Returns the total number of weight values that are stored in this block
+    int numWeights() const {
+        return fWeightDimX * fWeightDimY * (fDualPlaneEnabled ? 2 : 1);
+    }
+
+#ifdef SK_DEBUG
+    // Returns the maximum value that any weight can take. We really only use
+    // this function for debugging.
+    int maxWeightValue() const {
+        int maxVal = (1 << fWeightBits);
+        if (fWeightTrits > 0) {
+            SkASSERT(0 == fWeightQuints);
+            maxVal *= 3;
+        } else if (fWeightQuints > 0) {
+            SkASSERT(0 == fWeightTrits);
+            maxVal *= 5;
+        }
+        return maxVal - 1;
+    }
+#endif
+
+    // The number of bits needed to represent the texel weight data. This
+    // comes from the 'data size determination' section of the ASTC spec (C.2.22)
+    int numWeightBits() const {
+        const int nWeights = this->numWeights();
+        return
+            ((nWeights*8*fWeightTrits + 4) / 5) +
+            ((nWeights*7*fWeightQuints + 2) / 3) +
+            (nWeights*fWeightBits);
+    }
+
+    // Returns the number of color values stored in this block. The number of
+    // values stored is directly a function of the color endpoint modes.
+    int numColorValues() const {
+        int numValues = 0;
+        for (int i = 0; i < this->numPartitions(); ++i) {
+            int cemInt = static_cast<int>(fCEM[i]);
+            numValues += ((cemInt >> 2) + 1) * 2;
+        }
+
+        return numValues;
+    }
+
+    // Figures out the number of bits available for color values, and fills
+    // in the maximum encoding that will fit the number of color values that
+    // we need. Returns false on error. (See section C.2.22 of the spec)
+    bool getColorValueEncoding(int *nBits, int *nTrits, int *nQuints) const {
+        if (nullptr == nBits || nullptr == nTrits || nullptr == nQuints) {
+            return false;
+        }
+
+        const int nColorVals = this->numColorValues();
+        if (nColorVals <= 0) {
+            return false;
+        }
+
+        const int colorBits = fColorEndBit - fColorStartBit;
+        SkASSERT(colorBits > 0);
+
+        // This is the minimum amount of accuracy required by the spec.
+        if (colorBits < ((13 * nColorVals + 4) / 5)) {
+            return false;
+        }
+
+        // Values can be represented as at most 8-bit values.
+        // !SPEED! place this in a lookup table based on colorBits and nColorVals
+        for (int i = 255; i > 0; --i) {
+            int range = i + 1;
+            int bits = 0, trits = 0, quints = 0;
+            bool valid = false;
+            if (SkIsPow2(range)) {
+                bits = bits_for_range(range);
+                valid = true;
+            } else if ((range % 3) == 0 && SkIsPow2(range/3)) {
+                trits = 1;
+                bits = bits_for_range(range/3);
+                valid = true;
+            } else if ((range % 5) == 0 && SkIsPow2(range/5)) {
+                quints = 1;
+                bits = bits_for_range(range/5);
+                valid = true;
+            }
+
+            if (valid) {
+                const int actualColorBits =
+                    ((nColorVals*8*trits + 4) / 5) +
+                    ((nColorVals*7*quints + 2) / 3) +
+                    (nColorVals*bits);
+                if (actualColorBits <= colorBits) {
+                    *nTrits = trits;
+                    *nQuints = quints;
+                    *nBits = bits;
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    // Converts the sequence of color values into endpoints. The algorithm here
+    // corresponds to the values determined by section C.2.14 of the ASTC spec
+    void colorEndpoints(SkColor endpoints[4][2], const int* colorValues) const {
+        for (int i = 0; i < this->numPartitions(); ++i) {
+            switch (fCEM[i]) {
+                case kLDR_Luminance_Direct_ColorEndpointMode: {
+                    const int* v = colorValues;
+                    endpoints[i][0] = SkColorSetARGB(0xFF, v[0], v[0], v[0]);
+                    endpoints[i][1] = SkColorSetARGB(0xFF, v[1], v[1], v[1]);
+
+                    colorValues += 2;
+                }
+                break;
+
+                case kLDR_Luminance_BaseOffset_ColorEndpointMode: {
+                    const int* v = colorValues;
+                    const int L0 = (v[0] >> 2) | (v[1] & 0xC0);
+                    const int L1 = clamp_byte(L0 + (v[1] & 0x3F));
+
+                    endpoints[i][0] = SkColorSetARGB(0xFF, L0, L0, L0);
+                    endpoints[i][1] = SkColorSetARGB(0xFF, L1, L1, L1);
+
+                    colorValues += 2;
+                }
+                break;
+
+                case kLDR_LuminanceAlpha_Direct_ColorEndpointMode: {
+                    const int* v = colorValues;
+                    
+                    endpoints[i][0] = SkColorSetARGB(v[2], v[0], v[0], v[0]);
+                    endpoints[i][1] = SkColorSetARGB(v[3], v[1], v[1], v[1]);
+
+                    colorValues += 4;
+                }
+                break;
+
+                case kLDR_LuminanceAlpha_BaseOffset_ColorEndpointMode: {
+                    int v0 = colorValues[0];
+                    int v1 = colorValues[1];
+                    int v2 = colorValues[2];
+                    int v3 = colorValues[3];
+
+                    bit_transfer_signed(&v1, &v0);
+                    bit_transfer_signed(&v3, &v2);
+                    
+                    endpoints[i][0] = SkColorSetARGB(v2, v0, v0, v0);
+                    endpoints[i][1] = SkColorSetARGB(
+                        clamp_byte(v3+v2),
+                        clamp_byte(v1+v0),
+                        clamp_byte(v1+v0),
+                        clamp_byte(v1+v0));
+
+                    colorValues += 4;
+                }
+                break;
+
+                case kLDR_RGB_BaseScale_ColorEndpointMode: {
+                    decode_rgba_basescale(colorValues, endpoints[i], true);
+                    colorValues += 4;
+                }
+                break;
+
+                case kLDR_RGB_Direct_ColorEndpointMode: {
+                    decode_rgba_direct(colorValues, endpoints[i], true);
+                    colorValues += 6;
+                }
+                break;
+
+                case kLDR_RGB_BaseOffset_ColorEndpointMode: {
+                    decode_rgba_baseoffset(colorValues, endpoints[i], true);
+                    colorValues += 6;
+                }
+                break;
+
+                case kLDR_RGB_BaseScaleWithAlpha_ColorEndpointMode: {
+                    decode_rgba_basescale(colorValues, endpoints[i], false);
+                    colorValues += 6;
+                }
+                break;
+
+                case kLDR_RGBA_Direct_ColorEndpointMode: {
+                    decode_rgba_direct(colorValues, endpoints[i], false);
+                    colorValues += 8;
+                }
+                break;
+
+                case kLDR_RGBA_BaseOffset_ColorEndpointMode: {
+                    decode_rgba_baseoffset(colorValues, endpoints[i], false);
+                    colorValues += 8;
+                }
+                break;
+
+                default:
+                    SkDEBUGFAIL("HDR mode unsupported! This should be caught sooner.");
+                    break;
+            }
+        }
+    }
+
+    // Follows the procedure from section C.2.17 of the ASTC specification
+    int unquantizeWeight(int x) const {
+        SkASSERT(x <= this->maxWeightValue());
+
+        const int D = (x >> fWeightBits) & 0x7;
+        const int A = -(x & 0x1) & 0x7F;
+
+        SkTBits<int> xbits(x);
+
+        int T = 0;
+        if (fWeightTrits > 0) {
+            SkASSERT(0 == fWeightQuints);
+            switch (fWeightBits) {
+                case 0: {
+                    // x is a single trit
+                    SkASSERT(x < 3);
+
+                    static const int kUnquantizationTable[3] = { 0, 32, 63 };
+                    T = kUnquantizationTable[x];
+                }
+                break;
+
+                case 1: {
+                    const int B = 0;
+                    const int C = 50;
+                    T = unquantize_value(0x20, A, B, C, D);
+                }
+                break;
+
+                case 2: {
+                    const int b = xbits[1];
+                    const int B = b | (b << 2) | (b << 6);
+                    const int C = 23;
+                    T = unquantize_value(0x20, A, B, C, D);
+                }
+                break;
+
+                case 3: {
+                    const int cb = xbits(2, 1);
+                    const int B = cb | (cb << 5);
+                    const int C = 11;
+                    T = unquantize_value(0x20, A, B, C, D);
+                }
+                break;
+
+                default:
+                    SkDEBUGFAIL("Too many bits for trit encoding");
+                    break;
+            }
+
+        } else if (fWeightQuints > 0) {
+            SkASSERT(0 == fWeightTrits);
+            switch (fWeightBits) {
+                case 0: {
+                    // x is a single quint
+                    SkASSERT(x < 5);
+
+                    static const int kUnquantizationTable[5] = { 0, 16, 32, 47, 63 };
+                    T = kUnquantizationTable[x];
+                }
+                break;
+
+                case 1: {
+                    const int B = 0;
+                    const int C = 28;
+                    T = unquantize_value(0x20, A, B, C, D);
+                }
+                break;
+
+                case 2: {
+                    const int b = xbits[1];
+                    const int B = (b << 1) | (b << 6);
+                    const int C = 13;
+                    T = unquantize_value(0x20, A, B, C, D);
+                }
+                break;
+
+                default:
+                    SkDEBUGFAIL("Too many bits for quint encoding");
+                    break;
+            }
+        } else {
+            SkASSERT(0 == fWeightTrits);
+            SkASSERT(0 == fWeightQuints);
+
+            T = replicate_bits(x, fWeightBits, 6);
+        }
+
+        // This should bring the value within [0, 63]..
+        SkASSERT(T <= 63);
+
+        if (T > 32) {
+            T += 1;
+        }
+
+        SkASSERT(T <= 64);
+
+        return T;
+    }
+
+    // Returns the weight at the associated index. If the index is out of bounds, it
+    // returns zero. It also chooses the weight appropriately based on the given dual
+    // plane.
+    int getWeight(const int* unquantizedWeights, int idx, bool dualPlane) const {
+        const int maxIdx = (fDualPlaneEnabled ? 2 : 1) * fWeightDimX * fWeightDimY - 1;
+        if (fDualPlaneEnabled) {
+            const int effectiveIdx = 2*idx + (dualPlane ? 1 : 0);
+            if (effectiveIdx > maxIdx) {
+                return 0;
+            }
+            return unquantizedWeights[effectiveIdx];
+        }
+
+        SkASSERT(!dualPlane);
+
+        if (idx > maxIdx) {
+            return 0;
+        } else {
+            return unquantizedWeights[idx];
+        }
+    }
+
+    // This computes the effective weight at location (s, t) of the block. This
+    // weight is computed by sampling the texel weight grid (it's usually not 1-1), and
+    // then applying a bilerp. The algorithm outlined here follows the algorithm
+    // defined in section C.2.18 of the ASTC spec.
+    int infillWeight(const int* unquantizedValues, int s, int t, bool dualPlane) const {
+        const int Ds = (1024 + fDimX/2) / (fDimX - 1);
+        const int Dt = (1024 + fDimY/2) / (fDimY - 1);
+
+        const int cs = Ds * s;
+        const int ct = Dt * t;
+
+        const int gs = (cs*(fWeightDimX - 1) + 32) >> 6;
+        const int gt = (ct*(fWeightDimY - 1) + 32) >> 6;
+
+        const int js = gs >> 4;
+        const int jt = gt >> 4;
+
+        const int fs = gs & 0xF;
+        const int ft = gt & 0xF;
+
+        const int idx = js + jt*fWeightDimX;
+        const int p00 = this->getWeight(unquantizedValues, idx, dualPlane);
+        const int p01 = this->getWeight(unquantizedValues, idx + 1, dualPlane);
+        const int p10 = this->getWeight(unquantizedValues, idx + fWeightDimX, dualPlane);
+        const int p11 = this->getWeight(unquantizedValues, idx + fWeightDimX + 1, dualPlane);
+
+        const int w11 = (fs*ft + 8) >> 4;
+        const int w10 = ft - w11;
+        const int w01 = fs - w11;
+        const int w00 = 16 - fs - ft + w11;
+
+        const int weight = (p00*w00 + p01*w01 + p10*w10 + p11*w11 + 8) >> 4;
+        SkASSERT(weight <= 64);
+        return weight;
+    }
+
+    // Unquantizes the decoded texel weights as described in section C.2.17 of
+    // the ASTC specification. Additionally, it populates texelWeights with
+    // the expanded weight grid, which is computed according to section C.2.18
+    void texelWeights(int texelWeights[2][12][12], const int* texelValues) const {
+        // Unquantized texel weights...
+        int unquantizedValues[144*2]; // 12x12 blocks with dual plane decoding...
+        SkASSERT(this->numWeights() <= 144*2);
+
+        // Unquantize the weights and cache them
+        for (int j = 0; j < this->numWeights(); ++j) {
+            unquantizedValues[j] = this->unquantizeWeight(texelValues[j]);
+        }
+
+        // Do weight infill...
+        for (int y = 0; y < fDimY; ++y) {
+            for (int x = 0; x < fDimX; ++x) {
+                texelWeights[0][x][y] = this->infillWeight(unquantizedValues, x, y, false);
+                if (fDualPlaneEnabled) {
+                    texelWeights[1][x][y] = this->infillWeight(unquantizedValues, x, y, true);
+                }
+            }
+        }
+    }
+
+    // Returns the partition for the texel located at position (x, y).
+    // Adapted from C.2.21 of the ASTC specification
+    int getPartition(int x, int y) const {
+        const int partitionCount = this->numPartitions();
+        int seed = fPartIndex;
+        if ((fDimX * fDimY) < 31) {
+            x <<= 1;
+            y <<= 1;
+        }
+
+        seed += (partitionCount - 1) * 1024;
+
+        uint32_t p = seed;
+        p ^= p >> 15;  p -= p << 17;  p += p << 7; p += p <<  4;
+        p ^= p >>  5;  p += p << 16;  p ^= p >> 7; p ^= p >> 3;
+        p ^= p <<  6;  p ^= p >> 17;
+
+        uint32_t rnum = p;
+        uint8_t seed1  =  rnum        & 0xF;
+        uint8_t seed2  = (rnum >>  4) & 0xF;
+        uint8_t seed3  = (rnum >>  8) & 0xF;
+        uint8_t seed4  = (rnum >> 12) & 0xF;
+        uint8_t seed5  = (rnum >> 16) & 0xF;
+        uint8_t seed6  = (rnum >> 20) & 0xF;
+        uint8_t seed7  = (rnum >> 24) & 0xF;
+        uint8_t seed8  = (rnum >> 28) & 0xF;
+        uint8_t seed9  = (rnum >> 18) & 0xF;
+        uint8_t seed10 = (rnum >> 22) & 0xF;
+        uint8_t seed11 = (rnum >> 26) & 0xF;
+        uint8_t seed12 = ((rnum >> 30) | (rnum << 2)) & 0xF;
+
+        seed1 *= seed1;     seed2 *= seed2;
+        seed3 *= seed3;     seed4 *= seed4;
+        seed5 *= seed5;     seed6 *= seed6;
+        seed7 *= seed7;     seed8 *= seed8;
+        seed9 *= seed9;     seed10 *= seed10;
+        seed11 *= seed11;   seed12 *= seed12;
+
+        int sh1, sh2, sh3;
+        if (0 != (seed & 1)) {
+            sh1 = (0 != (seed & 2))? 4 : 5;
+            sh2 = (partitionCount == 3)? 6 : 5;
+        } else {
+            sh1 = (partitionCount==3)? 6 : 5;
+            sh2 = (0 != (seed & 2))? 4 : 5;
+        }
+        sh3 = (0 != (seed & 0x10))? sh1 : sh2;
+
+        seed1 >>= sh1; seed2  >>= sh2; seed3  >>= sh1; seed4  >>= sh2;
+        seed5 >>= sh1; seed6  >>= sh2; seed7  >>= sh1; seed8  >>= sh2;
+        seed9 >>= sh3; seed10 >>= sh3; seed11 >>= sh3; seed12 >>= sh3;
+
+        const int z = 0;
+        int a = seed1*x + seed2*y + seed11*z + (rnum >> 14);
+        int b = seed3*x + seed4*y + seed12*z + (rnum >> 10);
+        int c = seed5*x + seed6*y + seed9 *z + (rnum >>  6);
+        int d = seed7*x + seed8*y + seed10*z + (rnum >>  2);
+
+        a &= 0x3F;
+        b &= 0x3F;
+        c &= 0x3F;
+        d &= 0x3F;
+
+        if (partitionCount < 4) {
+            d = 0;
+        }
+
+        if (partitionCount < 3) {
+            c = 0;
+        }
+
+        if (a >= b && a >= c && a >= d) {
+            return 0;
+        } else if (b >= c && b >= d) {
+            return 1;
+        } else if (c >= d) {
+            return 2;
+        } else {
+            return 3;
+        }
+    }
+
+    // Performs the proper interpolation of the texel based on the
+    // endpoints and weights.
+    SkColor getTexel(const SkColor endpoints[4][2],
+                     const int weights[2][12][12],
+                     int x, int y) const {
+        int part = 0;
+        if (this->numPartitions() > 1) {
+            part = this->getPartition(x, y);
+        }
+
+        SkColor result;
+        if (fDualPlaneEnabled) {
+            result = interpolate_dual_endpoints(
+                endpoints[part], weights[0][x][y], weights[1][x][y], fDualPlane);
+        } else {
+            result = interpolate_endpoints(endpoints[part], weights[0][x][y]);
+        }
+
+#if 1
+        // !FIXME! if we're writing directly to a bitmap, then we don't need
+        // to swap the red and blue channels, but since we're usually being used
+        // by the SkImageDecoder_astc module, the results are expected to be in RGBA.
+        result = SkColorSetARGB(
+            SkColorGetA(result), SkColorGetB(result), SkColorGetG(result), SkColorGetR(result));
+#endif
+
+        return result;
+    }
+
+    void decode() {
+        // First decode the block mode.
+        this->decodeBlockMode();
+
+        // Now we can decode the partition information.
+        fPartIndex = static_cast<int>(read_astc_bits(fBlock, 11, 23));
+        fPartCount = (fPartIndex & 0x3) + 1;
+        fPartIndex >>= 2;
+
+        // This is illegal
+        if (fDualPlaneEnabled && this->numPartitions() == 4) {
+            fError = true;
+            return;
+        }
+
+        // Based on the partition info, we can decode the color information.
+        this->decodeColorData();
+    }
+
+    // Decodes the dual plane based on the given bit location. The final
+    // location, if the dual plane is enabled, is also the end of our color data.
+    // This function is only meant to be used from this->decodeColorData()
+    void decodeDualPlane(int bitLoc) {
+        if (fDualPlaneEnabled) {
+            fDualPlane = static_cast<int>(read_astc_bits(fBlock, bitLoc - 2, bitLoc));
+            fColorEndBit = bitLoc - 2;
+        } else {
+            fColorEndBit = bitLoc;
+        }
+    }
+
+    // Decodes the color information based on the ASTC spec.
+    void decodeColorData() {
+
+        // By default, the last color bit is at the end of the texel weights
+        const int lastWeight = 128 - this->numWeightBits();
+
+        // If we have a dual plane then it will be at this location, too.
+        int dualPlaneBitLoc = lastWeight;
+
+        // If there's only one partition, then our job is (relatively) easy.
+        if (this->numPartitions() == 1) {
+            fCEM[0] = static_cast<ColorEndpointMode>(read_astc_bits(fBlock, 13, 17));
+            fColorStartBit = 17;
+
+            // Handle dual plane mode...
+            this->decodeDualPlane(dualPlaneBitLoc);
+
+            return;
+        } 
+
+        // If we have more than one partition, then we need to make
+        // room for the partition index.
+        fColorStartBit = 29;
+
+        // Read the base CEM. If it's zero, then we have no additional
+        // CEM data and the endpoints for each partition share the same CEM.
+        const int baseCEM = static_cast<int>(read_astc_bits(fBlock, 23, 25));
+        if (0 == baseCEM) {
+
+            const ColorEndpointMode sameCEM =
+                static_cast<ColorEndpointMode>(read_astc_bits(fBlock, 25, 29));
+
+            for (int i = 0; i < kMaxPartitions; ++i) {
+                fCEM[i] = sameCEM;
+            }
+
+            // Handle dual plane mode...
+            this->decodeDualPlane(dualPlaneBitLoc);
+
+            return;
+        } 
+
+        // Move the dual plane selector bits down based on how many
+        // partitions the block contains.
+        switch (this->numPartitions()) {
+            case 2:
+                dualPlaneBitLoc -= 2;
+                break;
+
+            case 3:
+                dualPlaneBitLoc -= 5;
+                break;
+
+            case 4:
+                dualPlaneBitLoc -= 8;
+                break;
+
+            default:
+                SkDEBUGFAIL("Internal ASTC decoding error.");
+                break;
+        }
+
+        // The rest of the CEM config will be between the dual plane bit selector
+        // and the texel weight grid.
+        const int lowCEM = static_cast<int>(read_astc_bits(fBlock, 23, 29));
+        SkASSERT(lastWeight >= dualPlaneBitLoc);
+        SkASSERT(lastWeight - dualPlaneBitLoc < 31);
+        int fullCEM = static_cast<int>(read_astc_bits(fBlock, dualPlaneBitLoc, lastWeight));
+
+        // Attach the config at the end of the weight grid to the CEM values
+        // in the beginning of the block.
+        fullCEM = (fullCEM << 6) | lowCEM;
+
+        // Ignore the two least significant bits, since those are our baseCEM above.
+        fullCEM = fullCEM >> 2;
+
+        int C[kMaxPartitions]; // Next, decode C and M from the spec (Table C.2.12)
+        for (int i = 0; i < this->numPartitions(); ++i) {
+            C[i] = fullCEM & 1;
+            fullCEM = fullCEM >> 1;
+        }
+
+        int M[kMaxPartitions];
+        for (int i = 0; i < this->numPartitions(); ++i) {
+            M[i] = fullCEM & 0x3;
+            fullCEM = fullCEM >> 2;
+        }
+
+        // Construct our CEMs..
+        SkASSERT(baseCEM > 0);
+        for (int i = 0; i < this->numPartitions(); ++i) {
+            int cem = (baseCEM - 1) * 4;
+            cem += (0 == C[i])? 0 : 4;
+            cem += M[i];
+
+            SkASSERT(cem < 16);
+            fCEM[i] = static_cast<ColorEndpointMode>(cem);
+        }
+
+        // Finally, if we have dual plane mode, then read the plane selector.
+        this->decodeDualPlane(dualPlaneBitLoc);
+    }
+
+    // Decodes the block mode. This function determines whether or not we use
+    // dual plane encoding, the size of the texel weight grid, and the number of
+    // bits, trits and quints that are used to encode it. For more information, 
+    // see section C.2.10 of the ASTC spec.
+    //
+    // For 2D blocks, the Block Mode field is laid out as follows:
+    //
+    // -------------------------------------------------------------------------
+    // 10  9   8   7   6   5   4   3   2   1   0   Width Height Notes
+    // -------------------------------------------------------------------------
+    // D   H     B       A     R0  0   0   R2  R1  B+4   A+2
+    // D   H     B       A     R0  0   1   R2  R1  B+8   A+2
+    // D   H     B       A     R0  1   0   R2  R1  A+2   B+8
+    // D   H   0   B     A     R0  1   1   R2  R1  A+2   B+6
+    // D   H   1   B     A     R0  1   1   R2  R1  B+2   A+2
+    // D   H   0   0     A     R0  R2  R1  0   0   12    A+2
+    // D   H   0   1     A     R0  R2  R1  0   0   A+2   12
+    // D   H   1   1   0   0   R0  R2  R1  0   0   6     10
+    // D   H   1   1   0   1   R0  R2  R1  0   0   10    6
+    //   B     1   0     A     R0  R2  R1  0   0   A+6   B+6   D=0, H=0
+    // x   x   1   1   1   1   1   1   1   0   0   -     -     Void-extent
+    // x   x   1   1   1   x   x   x   x   0   0   -     -     Reserved*
+    // x   x   x   x   x   x   x   0   0   0   0   -     -     Reserved
+    // -------------------------------------------------------------------------
+    //
+    // D - dual plane enabled
+    // H, R - used to determine the number of bits/trits/quints in texel weight encoding
+    //        R is a three bit value whose LSB is R0 and MSB is R1
+    // Width, Height - dimensions of the texel weight grid (determined by A and B)
+
+    void decodeBlockMode() {
+        const int blockMode = static_cast<int>(read_astc_bits(fBlock, 0, 11));
+
+        // Check for special void extent encoding
+        fVoidExtent = (blockMode & 0x1FF) == 0x1FC;
+
+        // Check for reserved block modes
+        fError = ((blockMode & 0x1C3) == 0x1C0) || ((blockMode & 0xF) == 0);
+
+        // Neither reserved nor void-extent, decode as usual
+        // This code corresponds to table C.2.8 of the ASTC spec
+        bool highPrecision = false;
+        int R = 0;
+        if ((blockMode & 0x3) == 0) {
+            R = ((0xC & blockMode) >> 1) | ((0x10 & blockMode) >> 4);
+            const int bitsSevenAndEight = (blockMode & 0x180) >> 7;
+            SkASSERT(0 <= bitsSevenAndEight && bitsSevenAndEight < 4);
+
+            const int A = (blockMode >> 5) & 0x3;
+            const int B = (blockMode >> 9) & 0x3;
+
+            fDualPlaneEnabled = (blockMode >> 10) & 0x1;
+            highPrecision = (blockMode >> 9) & 0x1;
+
+            switch (bitsSevenAndEight) {
+                default:
+                case 0:
+                    fWeightDimX = 12;
+                    fWeightDimY = A + 2;
+                    break;
+
+                case 1:
+                    fWeightDimX = A + 2;
+                    fWeightDimY = 12;
+                    break;
+
+                case 2:
+                    fWeightDimX = A + 6;
+                    fWeightDimY = B + 6;
+                    fDualPlaneEnabled = false;
+                    highPrecision = false;
+                    break;
+
+                case 3:
+                    if (0 == A) {
+                        fWeightDimX = 6;
+                        fWeightDimY = 10;
+                    } else {
+                        fWeightDimX = 10;
+                        fWeightDimY = 6;
+                    }
+                    break;
+            }
+        } else { // (blockMode & 0x3) != 0
+            R = ((blockMode & 0x3) << 1) | ((blockMode & 0x10) >> 4);
+
+            const int bitsTwoAndThree = (blockMode >> 2) & 0x3;
+            SkASSERT(0 <= bitsTwoAndThree && bitsTwoAndThree < 4);
+
+            const int A = (blockMode >> 5) & 0x3;
+            const int B = (blockMode >> 7) & 0x3;
+
+            fDualPlaneEnabled = (blockMode >> 10) & 0x1;
+            highPrecision = (blockMode >> 9) & 0x1;
+
+            switch (bitsTwoAndThree) {
+                case 0:
+                    fWeightDimX = B + 4;
+                    fWeightDimY = A + 2;
+                    break;
+                case 1:
+                    fWeightDimX = B + 8;
+                    fWeightDimY = A + 2;
+                    break;
+                case 2:
+                    fWeightDimX = A + 2;
+                    fWeightDimY = B + 8;
+                    break;
+                case 3:
+                    if ((B & 0x2) == 0) {
+                        fWeightDimX = A + 2;
+                        fWeightDimY = (B & 1) + 6;
+                    } else {
+                        fWeightDimX = (B & 1) + 2;
+                        fWeightDimY = A + 2;
+                    }
+                    break;
+            }
+        }
+
+        // We should have set the values of R and highPrecision
+        // from decoding the block mode, these are used to determine
+        // the proper dimensions of our weight grid.
+        if ((R & 0x6) == 0) {
+            fError = true;
+        } else {
+            static const int kBitAllocationTable[2][6][3] = {
+                {
+                    {  1, 0, 0 },
+                    {  0, 1, 0 },
+                    {  2, 0, 0 },
+                    {  0, 0, 1 },
+                    {  1, 1, 0 },
+                    {  3, 0, 0 }
+                },
+                {
+                    {  1, 0, 1 },
+                    {  2, 1, 0 },
+                    {  4, 0, 0 },
+                    {  2, 0, 1 },
+                    {  3, 1, 0 },
+                    {  5, 0, 0 }
+                }
+            };
+
+            fWeightBits = kBitAllocationTable[highPrecision][R - 2][0];
+            fWeightTrits = kBitAllocationTable[highPrecision][R - 2][1];
+            fWeightQuints = kBitAllocationTable[highPrecision][R - 2][2];
+        }
+    }
+};
+
+// Reads an ASTC block from the given pointer.
+static inline void read_astc_block(ASTCDecompressionData *dst, const uint8_t* src) {
+    const uint64_t* qword = reinterpret_cast<const uint64_t*>(src);
+    dst->fBlock.fLow = SkEndian_SwapLE64(qword[0]);
+    dst->fBlock.fHigh = SkEndian_SwapLE64(qword[1]);
+    dst->decode();
+}
+
+// Take a known void-extent block, and write out the values as a constant color.
+static void decompress_void_extent(uint8_t* dst, int dstRowBytes,
+                                   const ASTCDecompressionData &data) {
+    // The top 64 bits contain 4 16-bit RGBA values.
+    int a = (static_cast<int>(read_astc_bits(data.fBlock, 112, 128)) + 255) >> 8;
+    int b = (static_cast<int>(read_astc_bits(data.fBlock, 96, 112)) + 255) >> 8;
+    int g = (static_cast<int>(read_astc_bits(data.fBlock, 80, 96)) + 255) >> 8;
+    int r = (static_cast<int>(read_astc_bits(data.fBlock, 64, 80)) + 255) >> 8;
+
+    write_constant_color(dst, data.fDimX, data.fDimY, dstRowBytes, SkColorSetARGB(a, r, g, b));
+}
+
+// Decompresses a single ASTC block. It's assumed that data.fDimX and data.fDimY are
+// set and that the block has already been decoded (i.e. data.decode() has been called)
+static void decompress_astc_block(uint8_t* dst, int dstRowBytes,
+                                  const ASTCDecompressionData &data) {
+    if (data.fError) {
+        write_error_color(dst, data.fDimX, data.fDimY, dstRowBytes);
+        return;
+    }
+
+    if (data.fVoidExtent) {
+        decompress_void_extent(dst, dstRowBytes, data);
+        return;
+    }
+
+    // According to the spec, any more than 64 values is illegal. (C.2.24)
+    static const int kMaxTexelValues = 64;
+
+    // Decode the texel weights.
+    int texelValues[kMaxTexelValues];
+    bool success = decode_integer_sequence(
+        texelValues, kMaxTexelValues, data.numWeights(),
+        // texel data goes to the end of the 128 bit block.
+        data.fBlock, 128, 128 - data.numWeightBits(), false,
+        data.fWeightBits, data.fWeightTrits, data.fWeightQuints);
+
+    if (!success) {
+        write_error_color(dst, data.fDimX, data.fDimY, dstRowBytes);
+        return;
+    }
+
+    // Decode the color endpoints
+    int colorBits, colorTrits, colorQuints;
+    if (!data.getColorValueEncoding(&colorBits, &colorTrits, &colorQuints)) {
+        write_error_color(dst, data.fDimX, data.fDimY, dstRowBytes);
+        return;
+    }
+
+    // According to the spec, any more than 18 color values is illegal. (C.2.24)
+    static const int kMaxColorValues = 18;
+
+    int colorValues[kMaxColorValues];
+    success = decode_integer_sequence(
+        colorValues, kMaxColorValues, data.numColorValues(),
+        data.fBlock, data.fColorStartBit, data.fColorEndBit, true,
+        colorBits, colorTrits, colorQuints);
+
+    if (!success) {
+        write_error_color(dst, data.fDimX, data.fDimY, dstRowBytes);
+        return;
+    }
+
+    // Unquantize the color values after they've been decoded.
+    unquantize_colors(colorValues, data.numColorValues(), colorBits, colorTrits, colorQuints);
+
+    // Decode the colors into the appropriate endpoints.
+    SkColor endpoints[4][2];
+    data.colorEndpoints(endpoints, colorValues);
+
+    // Do texel infill and decode the texel values.
+    int texelWeights[2][12][12];
+    data.texelWeights(texelWeights, texelValues);
+
+    // Write the texels by interpolating them based on the information
+    // stored in the block.
+    dst += data.fDimY * dstRowBytes;
+    for (int y = 0; y < data.fDimY; ++y) {
+        dst -= dstRowBytes;
+        SkColor* colorPtr = reinterpret_cast<SkColor*>(dst);
+        for (int x = 0; x < data.fDimX; ++x) {
+            colorPtr[x] = data.getTexel(endpoints, texelWeights, x, y);
+        }
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// ASTC Comrpession Struct
+//
+////////////////////////////////////////////////////////////////////////////////
+
+// This is the type passed as the CompressorType argument of the compressed
+// blitter for the ASTC format. The static functions required to be in this
+// struct are documented in SkTextureCompressor_Blitter.h
+struct CompressorASTC {
+    static inline void CompressA8Vertical(uint8_t* dst, const uint8_t* src) {
+        compress_a8_astc_block<GetAlphaTranspose>(&dst, src, 12);
+    }
+
+    static inline void CompressA8Horizontal(uint8_t* dst, const uint8_t* src,
+                                            int srcRowBytes) {
+        compress_a8_astc_block<GetAlpha>(&dst, src, srcRowBytes);
+    }
+
+#if PEDANTIC_BLIT_RECT
+    static inline void UpdateBlock(uint8_t* dst, const uint8_t* src, int srcRowBytes,
+                                   const uint8_t* mask) {
+        // TODO: krajcevski
+        // This is kind of difficult for ASTC because the weight values are calculated
+        // as an average of the actual weights. The best we can do is decompress the
+        // weights and recalculate them based on the new texel values. This should
+        // be "not too bad" since we know that anytime we hit this function, we're
+        // compressing 12x12 block dimension alpha-only, and we know the layout
+        // of the block
+        SkFAIL("Implement me!");
+    }
+#endif
+};
+
+////////////////////////////////////////////////////////////////////////////////
+
+namespace SkTextureCompressor {
+
+bool CompressA8To12x12ASTC(uint8_t* dst, const uint8_t* src,
+                           int width, int height, size_t rowBytes) {
+    if (width < 0 || ((width % 12) != 0) || height < 0 || ((height % 12) != 0)) {
+        return false;
+    }
+
+    uint8_t** dstPtr = &dst;
+    for (int y = 0; y < height; y += 12) {
+        for (int x = 0; x < width; x += 12) {
+            compress_a8_astc_block<GetAlpha>(dstPtr, src + y*rowBytes + x, rowBytes);
+        }
+    }
+
+    return true;
+}
+
+SkBlitter* CreateASTCBlitter(int width, int height, void* outputBuffer,
+                             SkTBlitterAllocator* allocator) {
+    if ((width % 12) != 0 || (height % 12) != 0) {
+        return nullptr;
+    }
+
+    // Memset the output buffer to an encoding that decodes to zero. We must do this
+    // in order to avoid having uninitialized values in the buffer if the blitter
+    // decides not to write certain scanlines (and skip entire rows of blocks).
+    // In the case of ASTC, if everything index is zero, then the interpolated value
+    // will decode to zero provided we have the right header. We use the encoding
+    // from recognizing all zero blocks from above.
+    const int nBlocks = (width * height / 144);
+    uint8_t *dst = reinterpret_cast<uint8_t *>(outputBuffer);
+    for (int i = 0; i < nBlocks; ++i) {
+        send_packing(&dst, SkTEndian_SwapLE64(0x0000000001FE000173ULL), 0);
+    }
+
+    return allocator->createT<
+        SkTCompressedAlphaBlitter<12, 16, CompressorASTC>, int, int, void* >
+        (width, height, outputBuffer);
+}
+
+void DecompressASTC(uint8_t* dst, int dstRowBytes, const uint8_t* src,
+                    int width, int height, int blockDimX, int blockDimY) {
+    // ASTC is encoded in what they call "raster order", so that the first
+    // block is the bottom-left block in the image, and the first pixel
+    // is the bottom-left pixel of the image
+    dst += height * dstRowBytes;
+
+    ASTCDecompressionData data(blockDimX, blockDimY);
+    for (int y = 0; y < height; y += blockDimY) {
+        dst -= blockDimY * dstRowBytes;
+        SkColor *colorPtr = reinterpret_cast<SkColor*>(dst);
+        for (int x = 0; x < width; x += blockDimX) {
+            read_astc_block(&data, src);
+            decompress_astc_block(reinterpret_cast<uint8_t*>(colorPtr + x), dstRowBytes, data);
+
+            // ASTC encoded blocks are 16 bytes (128 bits) large.
+            src += 16;
+        }
+    }
 }
 
 }  // SkTextureCompressor
diff --git a/gfx/skia/skia/src/utils/SkTextureCompressor_ASTC.h b/gfx/skia/skia/src/utils/SkTextureCompressor_ASTC.h
index 152fc62f16e2..1312ee9c741b 100644
--- a/gfx/skia/skia/src/utils/SkTextureCompressor_ASTC.h
+++ b/gfx/skia/skia/src/utils/SkTextureCompressor_ASTC.h
@@ -8,17 +8,20 @@
 #ifndef SkTextureCompressor_ASTC_DEFINED
 #define SkTextureCompressor_ASTC_DEFINED
 
-#include <stdint.h>
+#include "SkBitmapProcShader.h"
 
-// Forward declare
 class SkBlitter;
 
 namespace SkTextureCompressor {
 
     bool CompressA8To12x12ASTC(uint8_t* dst, const uint8_t* src,
-                               int width, int height, int rowBytes);
+                               int width, int height, size_t rowBytes);
 
-    SkBlitter* CreateASTCBlitter(int width, int height, void* outputBuffer);
+    SkBlitter* CreateASTCBlitter(int width, int height, void* outputBuffer,
+                                 SkTBlitterAllocator *allocator);
+
+    void DecompressASTC(uint8_t* dst, int dstRowBytes, const uint8_t* src,
+                        int width, int height, int blockDimX, int blockDimY);
 }
 
 #endif  // SkTextureCompressor_ASTC_DEFINED
diff --git a/gfx/skia/skia/src/utils/SkTextureCompressor_Blitter.h b/gfx/skia/skia/src/utils/SkTextureCompressor_Blitter.h
new file mode 100644
index 000000000000..0c259d692aa9
--- /dev/null
+++ b/gfx/skia/skia/src/utils/SkTextureCompressor_Blitter.h
@@ -0,0 +1,733 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkTextureCompressor_Blitter_DEFINED
+#define SkTextureCompressor_Blitter_DEFINED
+
+#include "SkTypes.h"
+#include "SkBlitter.h"
+
+namespace SkTextureCompressor {
+
+// Ostensibly, SkBlitter::BlitRect is supposed to set a rect of pixels to full
+// alpha. This becomes problematic when using compressed texture blitters, since
+// the rect rarely falls along block boundaries. The proper way to handle this is
+// to update the compressed encoding of a block by resetting the proper parameters
+// (and even recompressing the block) where a rect falls inbetween block boundaries.
+// PEDANTIC_BLIT_RECT attempts to do this by requiring the struct passed to
+// SkTCompressedAlphaBlitter to implement an UpdateBlock function call.
+//
+// However, the way that BlitRect gets used almost exclusively is to bracket inverse
+// fills for paths. In other words, the top few rows and bottom few rows of a path
+// that's getting inverse filled are called using blitRect. The rest are called using
+// the standard blitAntiH. As a result, we can just call  blitAntiH with a faux RLE
+// of full alpha values, and then check in our flush() call that we don't run off the
+// edge of the buffer. This is why we do not need this flag to be turned on.
+//
+// NOTE: This code is unfinished, but is inteded as a starting point if an when
+// bugs are introduced from the existing code.
+#define PEDANTIC_BLIT_RECT 0
+
+// This class implements a blitter that blits directly into a buffer that will
+// be used as an compressed alpha texture. We compute this buffer by
+// buffering scan lines and then outputting them all at once. The number of
+// scan lines buffered is controlled by kBlockSize
+//
+// The CompressorType is a struct with a bunch of static methods that provides
+// the specialized compression functionality of the blitter. A complete CompressorType
+// will implement the following static functions;
+//
+// struct CompressorType {
+//     // The function used to compress an A8 block. The layout of the
+//     // block is also expected to be in column-major order.
+//     static void CompressA8Vertical(uint8_t* dst, const uint8_t block[]);
+//
+//     // The function used to compress an A8 block. The layout of the
+//     // block is also expected to be in row-major order.
+//     static void CompressA8Horizontal(uint8_t* dst, const uint8_t* src, int srcRowBytes);
+//
+#if PEDANTIC_BLIT_RECT
+//     // The function used to update an already compressed block. This will
+//     // most likely be implementation dependent. The mask variable will have
+//     // 0xFF in positions where the block should be updated and 0 in positions
+//     // where it shouldn't. src contains an uncompressed buffer of pixels.
+//     static void UpdateBlock(uint8_t* dst, const uint8_t* src, int srcRowBytes, 
+//                             const uint8_t* mask);
+#endif
+// };
+template<int BlockDim, int EncodedBlockSize, typename CompressorType>
+class SkTCompressedAlphaBlitter : public SkBlitter {
+public:
+    SkTCompressedAlphaBlitter(int width, int height, void *compressedBuffer)
+        // 0x7FFE is one minus the largest positive 16-bit int. We use it for
+        // debugging to make sure that we're properly setting the nextX distance
+        // in flushRuns(). 
+#ifdef SK_DEBUG
+        : fCalledOnceWithNonzeroY(false)
+        , fBlitMaskCalled(false),
+#else
+        :
+#endif
+        kLongestRun(0x7FFE), kZeroAlpha(0)
+        , fNextRun(0)
+        , fWidth(width)
+        , fHeight(height)
+        , fBuffer(compressedBuffer)
+        {
+            SkASSERT((width % BlockDim) == 0);
+            SkASSERT((height % BlockDim) == 0);
+        }
+
+    virtual ~SkTCompressedAlphaBlitter() { this->flushRuns(); }
+
+    // Blit a horizontal run of one or more pixels.
+    void blitH(int x, int y, int width) override {
+        // This function is intended to be called from any standard RGB
+        // buffer, so we should never encounter it. However, if some code
+        // path does end up here, then this needs to be investigated.
+        SkFAIL("Not implemented!");
+    }
+
+    // Blit a horizontal run of antialiased pixels; runs[] is a *sparse*
+    // zero-terminated run-length encoding of spans of constant alpha values.
+    void blitAntiH(int x, int y,
+                   const SkAlpha antialias[],
+                   const int16_t runs[]) override {
+        SkASSERT(0 == x);
+
+        // Make sure that the new row to blit is either the first
+        // row that we're blitting, or it's exactly the next scan row
+        // since the last row that we blit. This is to ensure that when
+        // we go to flush the runs, that they are all the same four
+        // runs.
+        if (fNextRun > 0 &&
+            ((x != fBufferedRuns[fNextRun-1].fX) ||
+             (y-1 != fBufferedRuns[fNextRun-1].fY))) {
+            this->flushRuns();
+        }
+
+        // Align the rows to a block boundary. If we receive rows that
+        // are not on a block boundary, then fill in the preceding runs
+        // with zeros. We do this by producing a single RLE that says
+        // that we have 0x7FFE pixels of zero (0x7FFE = 32766).
+        const int row = BlockDim * (y / BlockDim);
+        while ((row + fNextRun) < y) {
+            fBufferedRuns[fNextRun].fAlphas = &kZeroAlpha;
+            fBufferedRuns[fNextRun].fRuns = &kLongestRun;
+            fBufferedRuns[fNextRun].fX = 0;
+            fBufferedRuns[fNextRun].fY = row + fNextRun;
+            ++fNextRun;
+        }
+
+        // Make sure that our assumptions aren't violated...
+        SkASSERT(fNextRun == (y % BlockDim));
+        SkASSERT(fNextRun == 0 || fBufferedRuns[fNextRun - 1].fY < y);
+
+        // Set the values of the next run
+        fBufferedRuns[fNextRun].fAlphas = antialias;
+        fBufferedRuns[fNextRun].fRuns = runs;
+        fBufferedRuns[fNextRun].fX = x;
+        fBufferedRuns[fNextRun].fY = y;
+
+        // If we've output a block of scanlines in a row that don't violate our
+        // assumptions, then it's time to flush them...
+        if (BlockDim == ++fNextRun) {
+            this->flushRuns();
+        }
+    }
+    
+    // Blit a vertical run of pixels with a constant alpha value.
+    void blitV(int x, int y, int height, SkAlpha alpha) override {
+        // This function is currently not implemented. It is not explicitly
+        // required by the contract, but if at some time a code path runs into
+        // this function (which is entirely possible), it needs to be implemented.
+        //
+        // TODO (krajcevski):
+        // This function will be most easily implemented in one of two ways:
+        // 1. Buffer each vertical column value and then construct a list
+        //    of alpha values and output all of the blocks at once. This only
+        //    requires a write to the compressed buffer
+        // 2. Replace the indices of each block with the proper indices based
+        //    on the alpha value. This requires a read and write of the compressed
+        //    buffer, but much less overhead.
+        SkFAIL("Not implemented!");
+    }
+
+    // Blit a solid rectangle one or more pixels wide. It's assumed that blitRect
+    // is called as a way to bracket blitAntiH where above and below the path the
+    // called path just needs a solid rectangle to fill in the mask.
+#ifdef SK_DEBUG
+    bool fCalledOnceWithNonzeroY;
+#endif
+    void blitRect(int x, int y, int width, int height) override {
+
+        // Assumptions:
+        SkASSERT(0 == x);
+        SkASSERT(width <= fWidth);
+
+        // Make sure that we're only ever bracketing calls to blitAntiH.
+        SkASSERT((0 == y) || (!fCalledOnceWithNonzeroY && (fCalledOnceWithNonzeroY = true)));
+        
+#if !(PEDANTIC_BLIT_RECT)
+        for (int i = 0; i < height; ++i) {
+            const SkAlpha kFullAlpha = 0xFF;
+            this->blitAntiH(x, y+i, &kFullAlpha, &kLongestRun);
+        }
+#else
+        const int startBlockX = (x / BlockDim) * BlockDim;
+        const int startBlockY = (y / BlockDim) * BlockDim;
+
+        const int endBlockX = ((x + width) / BlockDim) * BlockDim;
+        const int endBlockY = ((y + height) / BlockDim) * BlockDim;
+
+        // If start and end are the same, then we only need to update a single block...
+        if (startBlockY == endBlockY && startBlockX == endBlockX) {
+            uint8_t mask[BlockDim*BlockDim];
+            memset(mask, 0, sizeof(mask));
+
+            const int xoff = x - startBlockX;
+            SkASSERT((xoff + width) <= BlockDim);
+
+            const int yoff = y - startBlockY;
+            SkASSERT((yoff + height) <= BlockDim);
+            
+            for (int j = 0; j < height; ++j) {
+                memset(mask + (j + yoff)*BlockDim + xoff, 0xFF, width);
+            }
+
+            uint8_t* dst = this->getBlock(startBlockX, startBlockY);
+            CompressorType::UpdateBlock(dst, mask, BlockDim, mask);
+
+        // If start and end are the same in the y dimension, then we can freely update an
+        // entire row of blocks...
+        } else if (startBlockY == endBlockY) {
+
+            this->updateBlockRow(x, y, width, height, startBlockY, startBlockX, endBlockX);
+
+        // Similarly, if the start and end are in the same column, then we can just update
+        // an entire column of blocks...
+        } else if (startBlockX == endBlockX) {
+
+            this->updateBlockCol(x, y, width, height, startBlockX, startBlockY, endBlockY);
+
+        // Otherwise, the rect spans a non-trivial region of blocks, and we have to construct
+        // a kind of 9-patch to update each of the pieces of the rect. The top and bottom
+        // rows are updated using updateBlockRow, and the left and right columns are updated
+        // using updateBlockColumn. Anything in the middle is simply memset to an opaque block
+        // encoding.
+        } else {
+
+            const int innerStartBlockX = startBlockX + BlockDim;
+            const int innerStartBlockY = startBlockY + BlockDim;
+
+            // Blit top row
+            const int topRowHeight = innerStartBlockY - y;
+            this->updateBlockRow(x, y, width, topRowHeight, startBlockY,
+                                 startBlockX, endBlockX);
+
+            // Advance y
+            y += topRowHeight;
+            height -= topRowHeight;
+
+            // Blit middle
+            if (endBlockY > innerStartBlockY) {
+
+                // Update left row
+                this->updateBlockCol(x, y, innerStartBlockX - x, endBlockY, startBlockY,
+                                     startBlockX, innerStartBlockX);
+
+                // Update the middle with an opaque encoding...
+                uint8_t mask[BlockDim*BlockDim];
+                memset(mask, 0xFF, sizeof(mask));
+
+                uint8_t opaqueEncoding[EncodedBlockSize];
+                CompressorType::CompressA8Horizontal(opaqueEncoding, mask, BlockDim);
+
+                for (int j = innerStartBlockY; j < endBlockY; j += BlockDim) {
+                    uint8_t* opaqueDst = this->getBlock(innerStartBlockX, j);
+                    for (int i = innerStartBlockX; i < endBlockX; i += BlockDim) {
+                        memcpy(opaqueDst, opaqueEncoding, EncodedBlockSize);
+                        opaqueDst += EncodedBlockSize;
+                    }
+                }
+
+                // If we need to update the right column, do that too
+                if (x + width > endBlockX) {
+                    this->updateBlockCol(endBlockX, y, x + width - endBlockX, endBlockY,
+                                         endBlockX, innerStartBlockY, endBlockY);
+                }
+
+                // Advance y
+                height = y + height - endBlockY;
+                y = endBlockY;
+            }
+
+            // If we need to update the last row, then do that, too.
+            if (height > 0) {
+                this->updateBlockRow(x, y, width, height, endBlockY,
+                                     startBlockX, endBlockX);
+            }
+        }
+#endif
+    }
+
+    // Blit a rectangle with one alpha-blended column on the left,
+    // width (zero or more) opaque pixels, and one alpha-blended column
+    // on the right. The result will always be at least two pixels wide.
+    void blitAntiRect(int x, int y, int width, int height,
+                      SkAlpha leftAlpha, SkAlpha rightAlpha) override {
+        // This function is currently not implemented. It is not explicitly
+        // required by the contract, but if at some time a code path runs into
+        // this function (which is entirely possible), it needs to be implemented.
+        //
+        // TODO (krajcevski):
+        // This function will be most easily implemented as follows:
+        // 1. If width/height are smaller than a block, then update the
+        //    indices of the affected blocks.
+        // 2. If width/height are larger than a block, then construct a 9-patch
+        //    of block encodings that represent the rectangle, and write them
+        //    to the compressed buffer as necessary. Whether or not the blocks
+        //    are overwritten by zeros or just their indices are updated is up
+        //    to debate.
+        SkFAIL("Not implemented!");
+    }
+
+    // Blit a pattern of pixels defined by a rectangle-clipped mask; We make an
+    // assumption here that if this function gets called, then it will replace all
+    // of the compressed texture blocks that it touches. Hence, two separate calls
+    // to blitMask that have clips next to one another will cause artifacts. Most
+    // of the time, however, this function gets called because constructing the mask
+    // was faster than constructing the RLE for blitAntiH, and this function will
+    // only be called once.
+#ifdef SK_DEBUG
+    bool fBlitMaskCalled;
+#endif
+    void blitMask(const SkMask& mask, const SkIRect& clip) override {
+
+        // Assumptions:
+        SkASSERT(!fBlitMaskCalled);
+        SkDEBUGCODE(fBlitMaskCalled = true);
+        SkASSERT(SkMask::kA8_Format == mask.fFormat);
+        SkASSERT(mask.fBounds.contains(clip));
+
+        // Start from largest block boundary less than the clip boundaries.
+        const int startI = BlockDim * (clip.left() / BlockDim);
+        const int startJ = BlockDim * (clip.top() / BlockDim);
+
+        for (int j = startJ; j < clip.bottom(); j += BlockDim) {
+
+            // Get the destination for this block row
+            uint8_t* dst = this->getBlock(startI, j);
+            for (int i = startI; i < clip.right(); i += BlockDim) {
+
+                // At this point, the block should intersect the clip.
+                SkASSERT(SkIRect::IntersectsNoEmptyCheck(
+                             SkIRect::MakeXYWH(i, j, BlockDim, BlockDim), clip));
+
+                // Do we need to pad it?
+                if (i < clip.left() || j < clip.top() ||
+                    i + BlockDim > clip.right() || j + BlockDim > clip.bottom()) {
+
+                    uint8_t block[BlockDim*BlockDim];
+                    memset(block, 0, sizeof(block));
+
+                    const int startX = SkMax32(i, clip.left());
+                    const int startY = SkMax32(j, clip.top());
+
+                    const int endX = SkMin32(i + BlockDim, clip.right());
+                    const int endY = SkMin32(j + BlockDim, clip.bottom());
+
+                    for (int y = startY; y < endY; ++y) {
+                        const int col = startX - i;
+                        const int row = y - j;
+                        const int valsWide = endX - startX;
+                        SkASSERT(valsWide <= BlockDim);
+                        SkASSERT(0 <= col && col < BlockDim);
+                        SkASSERT(0 <= row && row < BlockDim);
+                        memcpy(block + row*BlockDim + col,
+                               mask.getAddr8(startX, j + row), valsWide);
+                    }
+
+                    CompressorType::CompressA8Horizontal(dst, block, BlockDim);
+                } else {
+                    // Otherwise, just compress it.
+                    uint8_t*const src = mask.getAddr8(i, j);
+                    const uint32_t rb = mask.fRowBytes;
+                    CompressorType::CompressA8Horizontal(dst, src, rb);
+                }
+
+                dst += EncodedBlockSize;
+            }
+        }
+    }
+
+    // If the blitter just sets a single value for each pixel, return the
+    // bitmap it draws into, and assign value. If not, return nullptr and ignore
+    // the value parameter.
+    const SkPixmap* justAnOpaqueColor(uint32_t* value) override {
+        return nullptr;
+    }
+
+    /**
+     * Compressed texture blitters only really work correctly if they get
+     * BlockDim rows at a time. That being said, this blitter tries it's best
+     * to preserve semantics if blitAntiH doesn't get called in too many
+     * weird ways...
+     */
+    int requestRowsPreserved() const override { return BlockDim; }
+
+private:
+    static const int kPixelsPerBlock = BlockDim * BlockDim;
+
+    // The longest possible run of pixels that this blitter will receive.
+    // This is initialized in the constructor to 0x7FFE, which is one less
+    // than the largest positive 16-bit integer. We make sure that it's one
+    // less for debugging purposes. We also don't make this variable static
+    // in order to make sure that we can construct a valid pointer to it.
+    const int16_t kLongestRun;
+
+    // Usually used in conjunction with kLongestRun. This is initialized to
+    // zero.
+    const SkAlpha kZeroAlpha;
+
+    // This is the information that we buffer whenever we're asked to blit
+    // a row with this blitter.
+    struct BufferedRun {
+        const SkAlpha* fAlphas;
+        const int16_t* fRuns;
+        int fX, fY;
+    } fBufferedRuns[BlockDim];
+
+    // The next row [0, BlockDim) that we need to blit.
+    int fNextRun;
+
+    // The width and height of the image that we're blitting
+    const int fWidth;
+    const int fHeight;
+
+    // The compressed buffer that we're blitting into. It is assumed that the buffer
+    // is large enough to store a compressed image of size fWidth*fHeight.
+    void* const fBuffer;
+
+    // Various utility functions
+    int blocksWide() const { return fWidth / BlockDim; }
+    int blocksTall() const { return fHeight / BlockDim; }
+    int totalBlocks() const { return (fWidth * fHeight) / kPixelsPerBlock; }
+
+    // Returns the block index for the block containing pixel (x, y). Block
+    // indices start at zero and proceed in raster order.
+    int getBlockOffset(int x, int y) const {
+        SkASSERT(x < fWidth);
+        SkASSERT(y < fHeight);
+        const int blockCol = x / BlockDim;
+        const int blockRow = y / BlockDim;
+        return blockRow * this->blocksWide() + blockCol;
+    }
+
+    // Returns a pointer to the block containing pixel (x, y)
+    uint8_t *getBlock(int x, int y) const {
+        uint8_t* ptr = reinterpret_cast<uint8_t*>(fBuffer);
+        return ptr + EncodedBlockSize*this->getBlockOffset(x, y);
+    }
+
+    // Updates the block whose columns are stored in block. curAlphai is expected
+    // to store the alpha values that will be placed within each of the columns in
+    // the range [col, col+colsLeft).
+    typedef uint32_t Column[BlockDim/4];
+    typedef uint32_t Block[BlockDim][BlockDim/4];
+    inline void updateBlockColumns(Block block, const int col,
+                                   const int colsLeft, const Column curAlphai) {
+        SkASSERT(block);
+        SkASSERT(col + colsLeft <= BlockDim);
+
+        for (int i = col; i < (col + colsLeft); ++i) {
+            memcpy(block[i], curAlphai, sizeof(Column));
+        }
+    }
+
+    // The following function writes the buffered runs to compressed blocks.
+    // If fNextRun < BlockDim, then we fill the runs that we haven't buffered with
+    // the constant zero buffer.
+    void flushRuns() {
+        // If we don't have any runs, then just return.
+        if (0 == fNextRun) {
+            return;
+        }
+
+#ifndef NDEBUG
+        // Make sure that if we have any runs, they all match
+        for (int i = 1; i < fNextRun; ++i) {
+            SkASSERT(fBufferedRuns[i].fY == fBufferedRuns[i-1].fY + 1);
+            SkASSERT(fBufferedRuns[i].fX == fBufferedRuns[i-1].fX);
+        }
+#endif
+
+        // If we don't have as many runs as we have rows, fill in the remaining
+        // runs with constant zeros.
+        for (int i = fNextRun; i < BlockDim; ++i) {
+            fBufferedRuns[i].fY = fBufferedRuns[0].fY + i;
+            fBufferedRuns[i].fX = fBufferedRuns[0].fX;
+            fBufferedRuns[i].fAlphas = &kZeroAlpha;
+            fBufferedRuns[i].fRuns = &kLongestRun;
+        }
+
+        // Make sure that our assumptions aren't violated.
+        SkASSERT(fNextRun > 0 && fNextRun <= BlockDim);
+        SkASSERT((fBufferedRuns[0].fY % BlockDim) == 0);
+
+        // The following logic walks BlockDim rows at a time and outputs compressed
+        // blocks to the buffer passed into the constructor.
+        // We do the following:
+        //
+        //      c1 c2 c3 c4
+        // -----------------------------------------------------------------------
+        // ... |  |  |  |  |  ----> fBufferedRuns[0]
+        // -----------------------------------------------------------------------
+        // ... |  |  |  |  |  ----> fBufferedRuns[1]
+        // -----------------------------------------------------------------------
+        // ... |  |  |  |  |  ----> fBufferedRuns[2]
+        // -----------------------------------------------------------------------
+        // ... |  |  |  |  |  ----> fBufferedRuns[3]
+        // -----------------------------------------------------------------------
+        // 
+        // curX -- the macro X value that we've gotten to.
+        // c[BlockDim] -- the buffers that represent the columns of the current block
+        //                  that we're operating on
+        // curAlphaColumn -- buffer containing the column of alpha values from fBufferedRuns.
+        // nextX -- for each run, the next point at which we need to update curAlphaColumn
+        //          after the value of curX.
+        // finalX -- the minimum of all the nextX values.
+        //
+        // curX advances to finalX outputting any blocks that it passes along
+        // the way. Since finalX will not change when we reach the end of a
+        // run, the termination criteria will be whenever curX == finalX at the
+        // end of a loop.
+
+        // Setup:
+        Block block;
+        sk_bzero(block, sizeof(block));
+
+        Column curAlphaColumn;
+        sk_bzero(curAlphaColumn, sizeof(curAlphaColumn));
+
+        SkAlpha *curAlpha = reinterpret_cast<SkAlpha*>(&curAlphaColumn);
+
+        int nextX[BlockDim];
+        for (int i = 0; i < BlockDim; ++i) {
+            nextX[i] = 0x7FFFFF;
+        }
+
+        uint8_t* outPtr = this->getBlock(fBufferedRuns[0].fX, fBufferedRuns[0].fY);
+
+        // Populate the first set of runs and figure out how far we need to
+        // advance on the first step
+        int curX = 0;
+        int finalX = 0xFFFFF;
+        for (int i = 0; i < BlockDim; ++i) {
+            nextX[i] = *(fBufferedRuns[i].fRuns);
+            curAlpha[i] = *(fBufferedRuns[i].fAlphas);
+
+            finalX = SkMin32(nextX[i], finalX);
+        }
+
+        // Make sure that we have a valid right-bound X value
+        SkASSERT(finalX < 0xFFFFF);
+
+        // If the finalX is the longest run, then just blit until we have
+        // width...
+        if (kLongestRun == finalX) {
+            finalX = fWidth;
+        }
+
+        // Run the blitter...
+        while (curX != finalX) {
+            SkASSERT(finalX >= curX);
+
+            // Do we need to populate the rest of the block?
+            if ((finalX - (BlockDim*(curX / BlockDim))) >= BlockDim) {
+                const int col = curX % BlockDim;
+                const int colsLeft = BlockDim - col;
+                SkASSERT(curX + colsLeft <= finalX);
+
+                this->updateBlockColumns(block, col, colsLeft, curAlphaColumn);
+
+                // Write this block
+                CompressorType::CompressA8Vertical(outPtr, reinterpret_cast<uint8_t*>(block));
+                outPtr += EncodedBlockSize;
+                curX += colsLeft;
+            }
+
+            // If we can advance even further, then just keep memsetting the block
+            if ((finalX - curX) >= BlockDim) {
+                SkASSERT((curX % BlockDim) == 0);
+
+                const int col = 0;
+                const int colsLeft = BlockDim;
+
+                this->updateBlockColumns(block, col, colsLeft, curAlphaColumn);
+
+                // While we can keep advancing, just keep writing the block.
+                uint8_t lastBlock[EncodedBlockSize];
+                CompressorType::CompressA8Vertical(lastBlock, reinterpret_cast<uint8_t*>(block));
+                while((finalX - curX) >= BlockDim) {
+                    memcpy(outPtr, lastBlock, EncodedBlockSize);
+                    outPtr += EncodedBlockSize;
+                    curX += BlockDim;
+                }
+            }
+
+            // If we haven't advanced within the block then do so.
+            if (curX < finalX) {
+                const int col = curX % BlockDim;
+                const int colsLeft = finalX - curX;
+
+                this->updateBlockColumns(block, col, colsLeft, curAlphaColumn);
+                curX += colsLeft;
+            }
+
+            SkASSERT(curX == finalX);
+
+            // Figure out what the next advancement is...
+            if (finalX < fWidth) {
+                for (int i = 0; i < BlockDim; ++i) {
+                    if (nextX[i] == finalX) {
+                        const int16_t run = *(fBufferedRuns[i].fRuns);
+                        fBufferedRuns[i].fRuns += run;
+                        fBufferedRuns[i].fAlphas += run;
+                        curAlpha[i] = *(fBufferedRuns[i].fAlphas);
+                        nextX[i] += *(fBufferedRuns[i].fRuns);
+                    }
+                }
+
+                finalX = 0xFFFFF;
+                for (int i = 0; i < BlockDim; ++i) {
+                    finalX = SkMin32(nextX[i], finalX);
+                }
+            } else {
+                curX = finalX;
+            }
+        }
+
+        // If we didn't land on a block boundary, output the block...
+        if ((curX % BlockDim) > 0) {
+#ifdef SK_DEBUG
+            for (int i = 0; i < BlockDim; ++i) {
+                SkASSERT(nextX[i] == kLongestRun || nextX[i] == curX);
+            }
+#endif
+            const int col = curX % BlockDim;
+            const int colsLeft = BlockDim - col;
+
+            memset(curAlphaColumn, 0, sizeof(curAlphaColumn));
+            this->updateBlockColumns(block, col, colsLeft, curAlphaColumn);
+
+            CompressorType::CompressA8Vertical(outPtr, reinterpret_cast<uint8_t*>(block));
+        }
+
+        fNextRun = 0;
+    }
+
+#if PEDANTIC_BLIT_RECT
+    void updateBlockRow(int x, int y, int width, int height,
+                        int blockRow, int startBlockX, int endBlockX) {
+        if (0 == width || 0 == height || startBlockX == endBlockX) {
+            return;
+        }
+
+        uint8_t* dst = this->getBlock(startBlockX, BlockDim * (y / BlockDim));
+
+        // One horizontal strip to update
+        uint8_t mask[BlockDim*BlockDim];
+        memset(mask, 0, sizeof(mask));
+
+        // Update the left cap
+        int blockX = startBlockX;
+        const int yoff = y - blockRow;
+        for (int j = 0; j < height; ++j) {
+            const int xoff = x - blockX;
+            memset(mask + (j + yoff)*BlockDim + xoff, 0xFF, BlockDim - xoff);
+        }
+        CompressorType::UpdateBlock(dst, mask, BlockDim, mask);
+        dst += EncodedBlockSize;
+        blockX += BlockDim;
+
+        // Update the middle
+        if (blockX < endBlockX) {
+            for (int j = 0; j < height; ++j) {
+                memset(mask + (j + yoff)*BlockDim, 0xFF, BlockDim);
+            }
+            while (blockX < endBlockX) {
+                CompressorType::UpdateBlock(dst, mask, BlockDim, mask);
+                dst += EncodedBlockSize;
+                blockX += BlockDim;
+            }
+        }
+
+        SkASSERT(endBlockX == blockX);
+
+        // Update the right cap (if we need to)
+        if (x + width > endBlockX) {
+            memset(mask, 0, sizeof(mask));
+            for (int j = 0; j < height; ++j) {
+                const int xoff = (x+width-blockX);
+                memset(mask + (j+yoff)*BlockDim, 0xFF, xoff);
+            }
+            CompressorType::UpdateBlock(dst, mask, BlockDim, mask);
+        }
+    }
+
+    void updateBlockCol(int x, int y, int width, int height,
+                        int blockCol, int startBlockY, int endBlockY) {
+        if (0 == width || 0 == height || startBlockY == endBlockY) {
+            return;
+        }
+
+        // One vertical strip to update
+        uint8_t mask[BlockDim*BlockDim];
+        memset(mask, 0, sizeof(mask));
+        const int maskX0 = x - blockCol;
+        const int maskWidth = maskX0 + width;
+        SkASSERT(maskWidth <= BlockDim);
+
+        // Update the top cap
+        int blockY = startBlockY;
+        for (int j = (y - blockY); j < BlockDim; ++j) {
+            memset(mask + maskX0 + j*BlockDim, 0xFF, maskWidth);
+        }
+        CompressorType::UpdateBlock(this->getBlock(blockCol, blockY), mask, BlockDim, mask);
+        blockY += BlockDim;
+
+        // Update middle
+        if (blockY < endBlockY) {
+            for (int j = 0; j < BlockDim; ++j) {
+                memset(mask + maskX0 + j*BlockDim, 0xFF, maskWidth);
+            }
+            while (blockY < endBlockY) {
+                CompressorType::UpdateBlock(this->getBlock(blockCol, blockY),
+                                            mask, BlockDim, mask);
+                blockY += BlockDim;
+            }
+        }
+
+        SkASSERT(endBlockY == blockY);
+
+        // Update bottom
+        if (y + height > endBlockY) {
+            for (int j = y+height; j < endBlockY + BlockDim; ++j) {
+                memset(mask + (j-endBlockY)*BlockDim, 0, BlockDim);
+            }
+            CompressorType::UpdateBlock(this->getBlock(blockCol, blockY),
+                                        mask, BlockDim, mask);
+        }
+    }
+#endif  // PEDANTIC_BLIT_RECT
+
+};
+
+}  // namespace SkTextureCompressor
+
+#endif  // SkTextureCompressor_Blitter_DEFINED
diff --git a/gfx/skia/skia/src/utils/SkTextureCompressor_LATC.cpp b/gfx/skia/skia/src/utils/SkTextureCompressor_LATC.cpp
index d042a840cf29..3ee6b2787bc8 100644
--- a/gfx/skia/skia/src/utils/SkTextureCompressor_LATC.cpp
+++ b/gfx/skia/skia/src/utils/SkTextureCompressor_LATC.cpp
@@ -6,9 +6,61 @@
  */
 
 #include "SkTextureCompressor_LATC.h"
+#include "SkTextureCompressor_Blitter.h"
+#include "SkTextureCompressor_Utils.h"
 
+#include "SkBlitter.h"
 #include "SkEndian.h"
 
+// Compression options. In general, the slow version is much more accurate, but
+// much slower. The fast option is much faster, but much less accurate. YMMV.
+#define COMPRESS_LATC_SLOW 0
+#define COMPRESS_LATC_FAST 1
+
+////////////////////////////////////////////////////////////////////////////////
+
+// Generates an LATC palette. LATC constructs
+// a palette of eight colors from LUM0 and LUM1 using the algorithm:
+//
+// LUM0,              if lum0 > lum1 and code(x,y) == 0
+// LUM1,              if lum0 > lum1 and code(x,y) == 1
+// (6*LUM0+  LUM1)/7, if lum0 > lum1 and code(x,y) == 2
+// (5*LUM0+2*LUM1)/7, if lum0 > lum1 and code(x,y) == 3
+// (4*LUM0+3*LUM1)/7, if lum0 > lum1 and code(x,y) == 4
+// (3*LUM0+4*LUM1)/7, if lum0 > lum1 and code(x,y) == 5
+// (2*LUM0+5*LUM1)/7, if lum0 > lum1 and code(x,y) == 6
+// (  LUM0+6*LUM1)/7, if lum0 > lum1 and code(x,y) == 7
+//
+// LUM0,              if lum0 <= lum1 and code(x,y) == 0
+// LUM1,              if lum0 <= lum1 and code(x,y) == 1
+// (4*LUM0+  LUM1)/5, if lum0 <= lum1 and code(x,y) == 2
+// (3*LUM0+2*LUM1)/5, if lum0 <= lum1 and code(x,y) == 3
+// (2*LUM0+3*LUM1)/5, if lum0 <= lum1 and code(x,y) == 4
+// (  LUM0+4*LUM1)/5, if lum0 <= lum1 and code(x,y) == 5
+// 0,                 if lum0 <= lum1 and code(x,y) == 6
+// 255,               if lum0 <= lum1 and code(x,y) == 7
+
+static const int kLATCPaletteSize = 8;
+static void generate_latc_palette(uint8_t palette[], uint8_t lum0, uint8_t lum1) {
+    palette[0] = lum0;
+    palette[1] = lum1;
+    if (lum0 > lum1) {
+        for (int i = 1; i < 7; i++) {
+            palette[i+1] = ((7-i)*lum0 + i*lum1) / 7;
+        }
+    } else {
+        for (int i = 1; i < 5; i++) {
+            palette[i+1] = ((5-i)*lum0 + i*lum1) / 5;
+        }
+        palette[6] = 0;
+        palette[7] = 255;
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+#if COMPRESS_LATC_SLOW
+
 ////////////////////////////////////////////////////////////////////////////////
 //
 // Utility Functions
@@ -33,7 +85,7 @@ typedef uint64_t (*A84x4To64BitProc)(const uint8_t block[]);
 // src pixels are divisible by 4, and copy 4x4 blocks one at a time
 // for compression.
 static bool compress_4x4_a8_to_64bit(uint8_t* dst, const uint8_t* src,
-                                     int width, int height, int rowBytes,
+                                     int width, int height, size_t rowBytes,
                                      A84x4To64BitProc proc) {
     // Make sure that our data is well-formed enough to be considered for compression
     if (0 == width || 0 == height || (width % 4) != 0 || (height % 4) != 0) {
@@ -69,47 +121,9 @@ static bool compress_4x4_a8_to_64bit(uint8_t* dst, const uint8_t* src,
 ////////////////////////////////////////////////////////////////////////////////
 
 // LATC compressed texels down into square 4x4 blocks
-static const int kLATCPaletteSize = 8;
 static const int kLATCBlockSize = 4;
 static const int kLATCPixelsPerBlock = kLATCBlockSize * kLATCBlockSize;
 
-// Generates an LATC palette. LATC constructs
-// a palette of eight colors from LUM0 and LUM1 using the algorithm:
-//
-// LUM0,              if lum0 > lum1 and code(x,y) == 0
-// LUM1,              if lum0 > lum1 and code(x,y) == 1
-// (6*LUM0+  LUM1)/7, if lum0 > lum1 and code(x,y) == 2
-// (5*LUM0+2*LUM1)/7, if lum0 > lum1 and code(x,y) == 3
-// (4*LUM0+3*LUM1)/7, if lum0 > lum1 and code(x,y) == 4
-// (3*LUM0+4*LUM1)/7, if lum0 > lum1 and code(x,y) == 5
-// (2*LUM0+5*LUM1)/7, if lum0 > lum1 and code(x,y) == 6
-// (  LUM0+6*LUM1)/7, if lum0 > lum1 and code(x,y) == 7
-//
-// LUM0,              if lum0 <= lum1 and code(x,y) == 0
-// LUM1,              if lum0 <= lum1 and code(x,y) == 1
-// (4*LUM0+  LUM1)/5, if lum0 <= lum1 and code(x,y) == 2
-// (3*LUM0+2*LUM1)/5, if lum0 <= lum1 and code(x,y) == 3
-// (2*LUM0+3*LUM1)/5, if lum0 <= lum1 and code(x,y) == 4
-// (  LUM0+4*LUM1)/5, if lum0 <= lum1 and code(x,y) == 5
-// 0,                 if lum0 <= lum1 and code(x,y) == 6
-// 255,               if lum0 <= lum1 and code(x,y) == 7
-
-static void generate_latc_palette(uint8_t palette[], uint8_t lum0, uint8_t lum1) {
-    palette[0] = lum0;
-    palette[1] = lum1;
-    if (lum0 > lum1) {
-        for (int i = 1; i < 7; i++) {
-            palette[i+1] = ((7-i)*lum0 + i*lum1) / 7;
-        }
-    } else {
-        for (int i = 1; i < 5; i++) {
-            palette[i+1] = ((5-i)*lum0 + i*lum1) / 5;
-        }
-        palette[6] = 0;
-        palette[7] = 255;
-    }
-}
-
 // Compress a block by using the bounding box of the pixels. It is assumed that
 // there are no extremal pixels in this block otherwise we would have used
 // compressBlockBBIgnoreExtremal.
@@ -278,17 +292,228 @@ static uint64_t compress_latc_block(const uint8_t pixels[]) {
     }
 }
 
+#endif  // COMPRESS_LATC_SLOW
+
+////////////////////////////////////////////////////////////////////////////////
+
+#if COMPRESS_LATC_FAST
+
+// Take the top three bits of each index and pack them into the low 12
+// bits of the integer.
+static inline uint32_t pack_index(uint32_t x) {
+    // Pack it in...
+#if defined (SK_CPU_BENDIAN)
+    return
+        (x >> 24) |
+        ((x >> 13) & 0x38) |
+        ((x >> 2) & 0x1C0) |
+        ((x << 9) & 0xE00);
+#else
+    return
+        (x & 0x7) |
+        ((x >> 5) & 0x38) |
+        ((x >> 10) & 0x1C0) |
+        ((x >> 15) & 0xE00);
+#endif
+}
+
+// Converts each 8-bit byte in the integer into an LATC index, and then packs
+// the indices into the low 12 bits of the integer.
+static inline uint32_t convert_index(uint32_t x) {
+    // Since the palette is 
+    // 255, 0, 219, 182, 146, 109, 73, 36
+    // we need to map the high three bits of each byte in the integer
+    // from
+    // 0 1 2 3 4 5 6 7
+    // to
+    // 1 7 6 5 4 3 2 0
+    //
+    // This first operation takes the mapping from
+    // 0 1 2 3 4 5 6 7  -->  7 6 5 4 3 2 1 0
+    x = 0x07070707 - SkTextureCompressor::ConvertToThreeBitIndex(x);
+
+    // mask is 1 if index is non-zero
+    const uint32_t mask = (x | (x >> 1) | (x >> 2)) & 0x01010101;
+
+    // add mask:
+    // 7 6 5 4 3 2 1 0 --> 8 7 6 5 4 3 2 0
+    x = (x + mask);
+
+    // Handle overflow:
+    // 8 7 6 5 4 3 2 0 --> 9 7 6 5 4 3 2 0
+    x |= (x >> 3) & 0x01010101;
+
+    // Mask out high bits:
+    // 9 7 6 5 4 3 2 0 --> 1 7 6 5 4 3 2 0
+    x &= 0x07070707;
+    
+    return pack_index(x);
+}
+
+typedef uint64_t (*PackIndicesProc)(const uint8_t* alpha, size_t rowBytes);
+template<PackIndicesProc packIndicesProc>
+static void compress_a8_latc_block(uint8_t** dstPtr, const uint8_t* src, size_t rowBytes) {
+    *(reinterpret_cast<uint64_t*>(*dstPtr)) =
+        SkEndian_SwapLE64(0xFF | (packIndicesProc(src, rowBytes) << 16));
+    *dstPtr += 8;
+}
+
+inline uint64_t PackRowMajor(const uint8_t *indices, size_t rowBytes) {
+    uint64_t result = 0;
+    for (int i = 0; i < 4; ++i) {
+        const uint32_t idx = *(reinterpret_cast<const uint32_t*>(indices + i*rowBytes));
+        result |= static_cast<uint64_t>(convert_index(idx)) << 12*i;
+    }
+    return result;
+}
+
+inline uint64_t PackColumnMajor(const uint8_t *indices, size_t rowBytes) {
+    // !SPEED! Blarg, this is kind of annoying. SSE4 can make this
+    // a LOT faster.
+    uint8_t transposed[16];
+    for (int i = 0; i < 4; ++i) {
+        for (int j = 0; j < 4; ++j) {
+            transposed[j*4+i] = indices[i*rowBytes + j];
+        }
+    }
+
+    return PackRowMajor(transposed, 4);
+}
+
+static bool compress_4x4_a8_latc(uint8_t* dst, const uint8_t* src,
+                                 int width, int height, size_t rowBytes) {
+
+    if (width < 0 || ((width % 4) != 0) || height < 0 || ((height % 4) != 0)) {
+        return false;
+    }
+
+    uint8_t** dstPtr = &dst;
+    for (int y = 0; y < height; y += 4) {
+        for (int x = 0; x < width; x += 4) {
+            compress_a8_latc_block<PackRowMajor>(dstPtr, src + y*rowBytes + x, rowBytes);
+        }
+    }
+
+    return true;
+}
+
+void CompressA8LATCBlockVertical(uint8_t* dst, const uint8_t block[]) {
+    compress_a8_latc_block<PackColumnMajor>(&dst, block, 4);
+}
+
+#endif  // COMPRESS_LATC_FAST
+
+void decompress_latc_block(uint8_t* dst, int dstRowBytes, const uint8_t* src) {
+    uint64_t block = SkEndian_SwapLE64(*(reinterpret_cast<const uint64_t *>(src)));
+    uint8_t lum0 = block & 0xFF;
+    uint8_t lum1 = (block >> 8) & 0xFF;
+
+    uint8_t palette[kLATCPaletteSize];
+    generate_latc_palette(palette, lum0, lum1);
+
+    block >>= 16;
+    for (int j = 0; j < 4; ++j) {
+        for (int i = 0; i < 4; ++i) {
+            dst[i] = palette[block & 0x7];
+            block >>= 3;
+        }
+        dst += dstRowBytes;
+    }
+}
+
+// This is the type passed as the CompressorType argument of the compressed
+// blitter for the LATC format. The static functions required to be in this
+// struct are documented in SkTextureCompressor_Blitter.h
+struct CompressorLATC {
+    static inline void CompressA8Vertical(uint8_t* dst, const uint8_t block[]) {
+        compress_a8_latc_block<PackColumnMajor>(&dst, block, 4);
+    }
+
+    static inline void CompressA8Horizontal(uint8_t* dst, const uint8_t* src,
+                                            int srcRowBytes) {
+        compress_a8_latc_block<PackRowMajor>(&dst, src, srcRowBytes);
+    }
+
+#if PEDANTIC_BLIT_RECT
+    static inline void UpdateBlock(uint8_t* dst, const uint8_t* src, int srcRowBytes,
+                                   const uint8_t* mask) {
+        // Pack the mask
+        uint64_t cmpMask = 0;
+        for (int i = 0; i < 4; ++i) {
+            const uint32_t idx = *(reinterpret_cast<const uint32_t*>(src + i*srcRowBytes));
+            cmpMask |= static_cast<uint64_t>(pack_index(idx)) << 12*i;
+        }
+        cmpMask = SkEndian_SwapLE64(cmpMask << 16); // avoid header
+
+        uint64_t cmpSrc;
+        uint8_t *cmpSrcPtr = reinterpret_cast<uint8_t*>(&cmpSrc);
+        compress_a8_latc_block<PackRowMajor>(&cmpSrcPtr, src, srcRowBytes);
+
+        // Mask out header
+        cmpSrc = cmpSrc & cmpMask;
+
+        // Read destination encoding
+        uint64_t *cmpDst = reinterpret_cast<uint64_t*>(dst);
+
+        // If the destination is the encoding for a blank block, then we need
+        // to properly set the header
+        if (0 == cmpDst) {
+            *cmpDst = SkTEndian_SwapLE64(0x24924924924900FFULL);
+        }
+
+        // Set the new indices
+        *cmpDst &= ~cmpMask;
+        *cmpDst |= cmpSrc;
+    }
+#endif  // PEDANTIC_BLIT_RECT
+};
+
 ////////////////////////////////////////////////////////////////////////////////
 
 namespace SkTextureCompressor {
 
-bool CompressA8ToLATC(uint8_t* dst, const uint8_t* src, int width, int height, int rowBytes) {
+bool CompressA8ToLATC(uint8_t* dst, const uint8_t* src, int width, int height, size_t rowBytes) {
+#if COMPRESS_LATC_FAST
+    return compress_4x4_a8_latc(dst, src, width, height, rowBytes);
+#elif COMPRESS_LATC_SLOW
     return compress_4x4_a8_to_64bit(dst, src, width, height, rowBytes, compress_latc_block);
+#else
+#error "Must choose either fast or slow LATC compression"
+#endif
 }
 
-SkBlitter* CreateLATCBlitter(int width, int height, void* outputBuffer) {
+SkBlitter* CreateLATCBlitter(int width, int height, void* outputBuffer,
+                             SkTBlitterAllocator* allocator) {
+    if ((width % 4) != 0 || (height % 4) != 0) {
+        return nullptr;
+    }
+
+#if COMPRESS_LATC_FAST
+    // Memset the output buffer to an encoding that decodes to zero. We must do this
+    // in order to avoid having uninitialized values in the buffer if the blitter
+    // decides not to write certain scanlines (and skip entire rows of blocks).
+    // In the case of LATC, if everything is zero, then LUM0 and LUM1 are also zero,
+    // and they will only be non-zero (0xFF) if the index is 7. So bzero will do just fine.
+    // (8 bytes per block) * (w * h / 16 blocks) = w * h / 2
+    sk_bzero(outputBuffer, width * height / 2);
+
+    return allocator->createT<
+        SkTCompressedAlphaBlitter<4, 8, CompressorLATC>, int, int, void* >
+        (width, height, outputBuffer);
+#elif COMPRESS_LATC_SLOW
     // TODO (krajcevski)
-    return NULL;
+    return nullptr;
+#endif
+}
+
+void DecompressLATC(uint8_t* dst, int dstRowBytes, const uint8_t* src, int width, int height) {
+    for (int j = 0; j < height; j += 4) {
+        for (int i = 0; i < width; i += 4) {
+            decompress_latc_block(dst + i, dstRowBytes, src);
+            src += 8;
+        }
+        dst += 4 * dstRowBytes;
+    }
 }
 
 }  // SkTextureCompressor
diff --git a/gfx/skia/skia/src/utils/SkTextureCompressor_LATC.h b/gfx/skia/skia/src/utils/SkTextureCompressor_LATC.h
index e3446b546dca..85647eafcc42 100644
--- a/gfx/skia/skia/src/utils/SkTextureCompressor_LATC.h
+++ b/gfx/skia/skia/src/utils/SkTextureCompressor_LATC.h
@@ -8,14 +8,19 @@
 #ifndef SkTextureCompressor_LATC_DEFINED
 #define SkTextureCompressor_LATC_DEFINED
 
-#include "SkBlitter.h"
+#include "SkBitmapProcShader.h"
+
+class SkBlitter;
 
 namespace SkTextureCompressor {
 
     bool CompressA8ToLATC(uint8_t* dst, const uint8_t* src,
-                          int width, int height, int rowBytes);
+                          int width, int height, size_t rowBytes);
 
-    SkBlitter* CreateLATCBlitter(int width, int height, void* outputBuffer);
+    SkBlitter* CreateLATCBlitter(int width, int height, void* outputBuffer,
+                                 SkTBlitterAllocator *allocator);
+
+    void DecompressLATC(uint8_t* dst, int dstRowBytes, const uint8_t* src, int width, int height);
 }
 
 #endif  // SkTextureCompressor_LATC_DEFINED
diff --git a/gfx/skia/skia/src/utils/SkTextureCompressor_R11EAC.cpp b/gfx/skia/skia/src/utils/SkTextureCompressor_R11EAC.cpp
index 3ce0120ec5fa..291820b4d74f 100644
--- a/gfx/skia/skia/src/utils/SkTextureCompressor_R11EAC.cpp
+++ b/gfx/skia/skia/src/utils/SkTextureCompressor_R11EAC.cpp
@@ -6,7 +6,10 @@
  */
 
 #include "SkTextureCompressor.h"
+#include "SkTextureCompressor_Blitter.h"
+#include "SkTextureCompressor_Utils.h"
 
+#include "SkBlitter.h"
 #include "SkEndian.h"
 
 // #define COMPRESS_R11_EAC_SLOW 1
@@ -28,8 +31,6 @@
 // If mul is zero, then we set mul = 1/8, so that the formula becomes
 // clamp[0, 2047](base_cw * 8 + 4 + mod_val)
 
-#if COMPRESS_R11_EAC_SLOW
-
 static const int kNumR11EACPalettes = 16;
 static const int kR11EACPaletteSize = 8;
 static const int kR11EACModifierPalettes[kNumR11EACPalettes][kR11EACPaletteSize] = {
@@ -51,6 +52,8 @@ static const int kR11EACModifierPalettes[kNumR11EACPalettes][kR11EACPaletteSize]
     {-3, -5, -7, -9, 2, 4, 6, 8}
 };
 
+#if COMPRESS_R11_EAC_SLOW
+
 // Pack the base codeword, palette, and multiplier into the 64 bits necessary
 // to decode it.
 static uint64_t pack_r11eac_block(uint16_t base_cw, uint16_t palette, uint16_t multiplier,
@@ -272,7 +275,7 @@ static uint64_t compress_r11eac_block(const uint8_t block[16]) {
 typedef uint64_t (*A84x4To64BitProc)(const uint8_t block[]);
 
 static bool compress_4x4_a8_to_64bit(uint8_t* dst, const uint8_t* src,
-                                     int width, int height, int rowBytes,
+                                     int width, int height, size_t rowBytes,
                                      A84x4To64BitProc proc) {
     // Make sure that our data is well-formed enough to be considered for compression
     if (0 == width || 0 == height || (width % 4) != 0 || (height % 4) != 0) {
@@ -302,6 +305,45 @@ static bool compress_4x4_a8_to_64bit(uint8_t* dst, const uint8_t* src,
 }
 #endif  // (COMPRESS_R11_EAC_SLOW) || (COMPRESS_R11_EAC_FAST)
 
+// This function converts an integer containing four bytes of alpha
+// values into an integer containing four bytes of indices into R11 EAC.
+// Note, there needs to be a mapping of indices:
+// 0 1 2 3 4 5 6 7
+// 3 2 1 0 4 5 6 7
+//
+// To compute this, we first negate each byte, and then add three, which
+// gives the mapping
+// 3 2 1 0 -1 -2 -3 -4
+//
+// Then we mask out the negative values, take their absolute value, and
+// add three.
+//
+// Most of the voodoo in this function comes from Hacker's Delight, section 2-18
+static inline uint32_t convert_indices(uint32_t x) {
+    // Take the top three bits...
+    x = SkTextureCompressor::ConvertToThreeBitIndex(x);
+
+    // Negate...
+    x = ~((0x80808080 - x) ^ 0x7F7F7F7F);
+
+    // Add three
+    const uint32_t s = (x & 0x7F7F7F7F) + 0x03030303;
+    x = ((x ^ 0x03030303) & 0x80808080) ^ s;
+
+    // Absolute value
+    const uint32_t a = x & 0x80808080;
+    const uint32_t b = a >> 7;
+
+    // Aside: mask negatives (m is three if the byte was negative)
+    const uint32_t m = (a >> 6) | b;
+
+    // .. continue absolute value
+    x = (x ^ ((a - b) | a)) + b;
+
+    // Add three
+    return x + m;
+}
+
 #if COMPRESS_R11_EAC_FASTEST
 template<unsigned shift>
 static inline uint64_t swap_shift(uint64_t x, uint64_t mask) {
@@ -376,49 +418,10 @@ static inline uint64_t interleave6(uint64_t topRows, uint64_t bottomRows) {
     return x;
 }
 
-// This function converts an integer containing four bytes of alpha
-// values into an integer containing four bytes of indices into R11 EAC.
-// Note, there needs to be a mapping of indices:
-// 0 1 2 3 4 5 6 7
-// 3 2 1 0 4 5 6 7
-//
-// To compute this, we first negate each byte, and then add three, which
-// gives the mapping
-// 3 2 1 0 -1 -2 -3 -4
-//
-// Then we mask out the negative values, take their absolute value, and
-// add three.
-//
-// Most of the voodoo in this function comes from Hacker's Delight, section 2-18
-static inline uint32_t convert_indices(uint32_t x) {
-    // Take the top three bits...
-    x = (x & 0xE0E0E0E0) >> 5;
-
-    // Negate...
-    x = ~((0x80808080 - x) ^ 0x7F7F7F7F);
-
-    // Add three
-    const uint32_t s = (x & 0x7F7F7F7F) + 0x03030303;
-    x = ((x ^ 0x03030303) & 0x80808080) ^ s;
-
-    // Absolute value
-    const uint32_t a = x & 0x80808080;
-    const uint32_t b = a >> 7;
-
-    // Aside: mask negatives (m is three if the byte was negative)
-    const uint32_t m = (a >> 6) | b;
-
-    // .. continue absolute value
-    x = (x ^ ((a - b) | a)) + b;
-
-    // Add three
-    return x + m;
-}
-
 // This function follows the same basic procedure as compress_heterogeneous_r11eac_block
 // above when COMPRESS_R11_EAC_FAST is defined, but it avoids a few loads/stores and
 // tries to optimize where it can using SIMD.
-static uint64_t compress_r11eac_block_fast(const uint8_t* src, int rowBytes) {
+static uint64_t compress_r11eac_block_fast(const uint8_t* src, size_t rowBytes) {
     // Store each row of alpha values in an integer
     const uint32_t alphaRow1 = *(reinterpret_cast<const uint32_t*>(src));
     const uint32_t alphaRow2 = *(reinterpret_cast<const uint32_t*>(src + rowBytes));
@@ -459,7 +462,7 @@ static uint64_t compress_r11eac_block_fast(const uint8_t* src, int rowBytes) {
 }
 
 static bool compress_a8_to_r11eac_fast(uint8_t* dst, const uint8_t* src,
-                                       int width, int height, int rowBytes) {
+                                       int width, int height, size_t rowBytes) {
     // Make sure that our data is well-formed enough to be considered for compression
     if (0 == width || 0 == height || (width % 4) != 0 || (height % 4) != 0) {
         return false;
@@ -513,10 +516,15 @@ static inline uint32_t pack_indices_vertical(uint32_t x) {
 // alpha values. Each column is assumed to be loaded from top to bottom, and hence
 // must first be converted to indices and then packed into the resulting 64-bit
 // integer.
-static inline uint64_t compress_block_vertical(const uint32_t alphaColumn0,
-                                               const uint32_t alphaColumn1,
-                                               const uint32_t alphaColumn2,
-                                               const uint32_t alphaColumn3) {
+inline void compress_block_vertical(uint8_t* dstPtr, const uint8_t *block) {
+
+    const uint32_t* src = reinterpret_cast<const uint32_t*>(block);
+    uint64_t* dst = reinterpret_cast<uint64_t*>(dstPtr);
+
+    const uint32_t alphaColumn0 = src[0];
+    const uint32_t alphaColumn1 = src[1];
+    const uint32_t alphaColumn2 = src[2];
+    const uint32_t alphaColumn3 = src[3];
 
     if (alphaColumn0 == alphaColumn1 &&
         alphaColumn2 == alphaColumn3 &&
@@ -524,11 +532,13 @@ static inline uint64_t compress_block_vertical(const uint32_t alphaColumn0,
 
         if (0 == alphaColumn0) {
             // Transparent
-            return 0x0020000000002000ULL;
+            *dst = 0x0020000000002000ULL;
+            return;
         }
         else if (0xFFFFFFFF == alphaColumn0) {
             // Opaque
-            return 0xFFFFFFFFFFFFFFFFULL;
+            *dst = 0xFFFFFFFFFFFFFFFFULL;
+            return;
         }
     }
 
@@ -542,32 +552,74 @@ static inline uint64_t compress_block_vertical(const uint32_t alphaColumn0,
     const uint32_t packedIndexColumn2 = pack_indices_vertical(indexColumn2);
     const uint32_t packedIndexColumn3 = pack_indices_vertical(indexColumn3);
 
-    return SkEndian_SwapBE64(0x8490000000000000ULL |
+    *dst = SkEndian_SwapBE64(0x8490000000000000ULL |
                              (static_cast<uint64_t>(packedIndexColumn0) << 36) |
                              (static_cast<uint64_t>(packedIndexColumn1) << 24) |
                              static_cast<uint64_t>(packedIndexColumn2 << 12) |
                              static_cast<uint64_t>(packedIndexColumn3));
-        
 }
 
-// Updates the block whose columns are stored in blockColN. curAlphai is expected
-// to store, as an integer, the four alpha values that will be placed within each
-// of the columns in the range [col, col+colsLeft).
-static inline void update_block_columns(uint32_t* block, const int col,
-                                        const int colsLeft, const uint32_t curAlphai) {
-    SkASSERT(NULL != block);
-    SkASSERT(col + colsLeft <= 4);
+static inline int get_r11_eac_index(uint64_t block, int x, int y) {
+    SkASSERT(x >= 0 && x < 4);
+    SkASSERT(y >= 0 && y < 4);
+    const int idx = x*4 + y;
+    return (block >> ((15-idx)*3)) & 0x7;
+}
 
-    for (int i = col; i < (col + colsLeft); ++i) {
-        block[i] = curAlphai;
+static void decompress_r11_eac_block(uint8_t* dst, int dstRowBytes, const uint8_t* src) {
+    const uint64_t block = SkEndian_SwapBE64(*(reinterpret_cast<const uint64_t *>(src)));
+
+    const int base_cw = (block >> 56) & 0xFF;
+    const int mod = (block >> 52) & 0xF;
+    const int palette_idx = (block >> 48) & 0xF;
+
+    const int* palette = kR11EACModifierPalettes[palette_idx];
+
+    for (int j = 0; j < 4; ++j) {
+        for (int i = 0; i < 4; ++i) {
+            const int idx = get_r11_eac_index(block, i, j);
+            const int val = base_cw*8 + 4 + palette[idx]*mod*8;
+            if (val < 0) {
+                dst[i] = 0;
+            } else if (val > 2047) {
+                dst[i] = 0xFF;
+            } else {
+                dst[i] = (val >> 3) & 0xFF;
+            }
+        }
+        dst += dstRowBytes;
     }
 }
 
+// This is the type passed as the CompressorType argument of the compressed
+// blitter for the R11 EAC format. The static functions required to be in this
+// struct are documented in SkTextureCompressor_Blitter.h
+struct CompressorR11EAC {
+    static inline void CompressA8Vertical(uint8_t* dst, const uint8_t* src) {
+        compress_block_vertical(dst, src);
+    }
+
+    static inline void CompressA8Horizontal(uint8_t* dst, const uint8_t* src,
+                                            int srcRowBytes) {
+        *(reinterpret_cast<uint64_t*>(dst)) = compress_r11eac_block_fast(src, srcRowBytes);
+    }
+
+#if PEDANTIC_BLIT_RECT
+    static inline void UpdateBlock(uint8_t* dst, const uint8_t* src, int srcRowBytes,
+                                   const uint8_t* mask) {
+        // TODO: krajcevski
+        // The implementation of this function should be similar to that of LATC, since
+        // the R11EAC indices directly correspond to pixel values.
+        SkFAIL("Implement me!");
+    }
+#endif
+};
+
 ////////////////////////////////////////////////////////////////////////////////
 
 namespace SkTextureCompressor {
 
-bool CompressA8ToR11EAC(uint8_t* dst, const uint8_t* src, int width, int height, int rowBytes) {
+bool CompressA8ToR11EAC(uint8_t* dst, const uint8_t* src, int width, int height, size_t rowBytes) {
 
 #if (COMPRESS_R11_EAC_SLOW) || (COMPRESS_R11_EAC_FAST)
 
@@ -582,383 +634,37 @@ bool CompressA8ToR11EAC(uint8_t* dst, const uint8_t* src, int width, int height,
 #endif
 }
 
-// This class implements a blitter that blits directly into a buffer that will
-// be used as an R11 EAC compressed texture. We compute this buffer by
-// buffering four scan lines and then outputting them all at once. This blitter
-// is only expected to be used with alpha masks, i.e. kAlpha8_SkColorType.
-class R11_EACBlitter : public SkBlitter {
-public:
-    R11_EACBlitter(int width, int height, void *compressedBuffer);
-    virtual ~R11_EACBlitter() { this->flushRuns(); }
+SkBlitter* CreateR11EACBlitter(int width, int height, void* outputBuffer,
+                               SkTBlitterAllocator* allocator) {
 
-    // Blit a horizontal run of one or more pixels.
-    virtual void blitH(int x, int y, int width) SK_OVERRIDE {
-        // This function is intended to be called from any standard RGB
-        // buffer, so we should never encounter it. However, if some code
-        // path does end up here, then this needs to be investigated.
-        SkFAIL("Not implemented!");
-    }
-    
-    // Blit a horizontal run of antialiased pixels; runs[] is a *sparse*
-    // zero-terminated run-length encoding of spans of constant alpha values.
-    virtual void blitAntiH(int x, int y,
-                           const SkAlpha antialias[],
-                           const int16_t runs[]) SK_OVERRIDE;
-    
-    // Blit a vertical run of pixels with a constant alpha value.
-    virtual void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE {
-        // This function is currently not implemented. It is not explicitly
-        // required by the contract, but if at some time a code path runs into
-        // this function (which is entirely possible), it needs to be implemented.
-        //
-        // TODO (krajcevski):
-        // This function will be most easily implemented in one of two ways:
-        // 1. Buffer each vertical column value and then construct a list
-        //    of alpha values and output all of the blocks at once. This only
-        //    requires a write to the compressed buffer
-        // 2. Replace the indices of each block with the proper indices based
-        //    on the alpha value. This requires a read and write of the compressed
-        //    buffer, but much less overhead.
-        SkFAIL("Not implemented!");
+    if ((width % 4) != 0 || (height % 4) != 0) {
+        return nullptr;
     }
 
-    // Blit a solid rectangle one or more pixels wide.
-    virtual void blitRect(int x, int y, int width, int height) SK_OVERRIDE {
-        // Analogous to blitRow, this function is intended for RGB targets
-        // and should never be called by this blitter. Any calls to this function
-        // are probably a bug and should be investigated.
-        SkFAIL("Not implemented!");
+    // Memset the output buffer to an encoding that decodes to zero. We must do this
+    // in order to avoid having uninitialized values in the buffer if the blitter
+    // decides not to write certain scanlines (and skip entire rows of blocks).
+    // In the case of R11, we use the encoding from recognizing all zero pixels from above.
+    const int nBlocks = (width * height / 16);  // 4x4 pixel blocks.
+    uint64_t *dst = reinterpret_cast<uint64_t *>(outputBuffer);
+    for (int i = 0; i < nBlocks; ++i) {
+        *dst = 0x0020000000002000ULL;
+        ++dst;
     }
 
-    // Blit a rectangle with one alpha-blended column on the left,
-    // width (zero or more) opaque pixels, and one alpha-blended column
-    // on the right. The result will always be at least two pixels wide.
-    virtual void blitAntiRect(int x, int y, int width, int height,
-                              SkAlpha leftAlpha, SkAlpha rightAlpha) SK_OVERRIDE {
-        // This function is currently not implemented. It is not explicitly
-        // required by the contract, but if at some time a code path runs into
-        // this function (which is entirely possible), it needs to be implemented.
-        //
-        // TODO (krajcevski):
-        // This function will be most easily implemented as follows:
-        // 1. If width/height are smaller than a block, then update the
-        //    indices of the affected blocks.
-        // 2. If width/height are larger than a block, then construct a 9-patch
-        //    of block encodings that represent the rectangle, and write them
-        //    to the compressed buffer as necessary. Whether or not the blocks
-        //    are overwritten by zeros or just their indices are updated is up
-        //    to debate.
-        SkFAIL("Not implemented!");
-    }
-
-    // Blit a pattern of pixels defined by a rectangle-clipped mask;
-    // typically used for text.
-    virtual void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE {
-        // This function is currently not implemented. It is not explicitly
-        // required by the contract, but if at some time a code path runs into
-        // this function (which is entirely possible), it needs to be implemented.
-        //
-        // TODO (krajcevski):
-        // This function will be most easily implemented in the same way as
-        // blitAntiRect above.
-        SkFAIL("Not implemented!");
-    }
-
-    // If the blitter just sets a single value for each pixel, return the
-    // bitmap it draws into, and assign value. If not, return NULL and ignore
-    // the value parameter.
-    virtual const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE {
-        return NULL;
-    }
-
-    /**
-     * Compressed texture blitters only really work correctly if they get
-     * four blocks at a time. That being said, this blitter tries it's best
-     * to preserve semantics if blitAntiH doesn't get called in too many
-     * weird ways...
-     */
-    virtual int requestRowsPreserved() const { return kR11_EACBlockSz; }
-
-protected:
-    virtual void onNotifyFinished() { this->flushRuns(); }
-
-private:
-    static const int kR11_EACBlockSz = 4;
-    static const int kPixelsPerBlock = kR11_EACBlockSz * kR11_EACBlockSz;
-
-    // The longest possible run of pixels that this blitter will receive.
-    // This is initialized in the constructor to 0x7FFE, which is one less
-    // than the largest positive 16-bit integer. We make sure that it's one
-    // less for debugging purposes. We also don't make this variable static
-    // in order to make sure that we can construct a valid pointer to it.
-    const int16_t kLongestRun;
-
-    // Usually used in conjunction with kLongestRun. This is initialized to
-    // zero.
-    const SkAlpha kZeroAlpha;
-
-    // This is the information that we buffer whenever we're asked to blit
-    // a row with this blitter.
-    struct BufferedRun {
-        const SkAlpha* fAlphas;
-        const int16_t* fRuns;
-        int fX, fY;
-    } fBufferedRuns[kR11_EACBlockSz];
-
-    // The next row (0-3) that we need to blit. This value should never exceed
-    // the number of rows that we have (kR11_EACBlockSz)
-    int fNextRun;
-
-    // The width and height of the image that we're blitting
-    const int fWidth;
-    const int fHeight;
-
-    // The R11 EAC buffer that we're blitting into. It is assumed that the buffer
-    // is large enough to store a compressed image of size fWidth*fHeight.
-    uint64_t* const fBuffer;
-
-    // Various utility functions
-    int blocksWide() const { return fWidth / kR11_EACBlockSz; }
-    int blocksTall() const { return fHeight / kR11_EACBlockSz; }
-    int totalBlocks() const { return (fWidth * fHeight) / kPixelsPerBlock; }
-
-    // Returns the block index for the block containing pixel (x, y). Block
-    // indices start at zero and proceed in raster order.
-    int getBlockOffset(int x, int y) const {
-        SkASSERT(x < fWidth);
-        SkASSERT(y < fHeight);
-        const int blockCol = x / kR11_EACBlockSz;
-        const int blockRow = y / kR11_EACBlockSz;
-        return blockRow * this->blocksWide() + blockCol;
-    }
-
-    // Returns a pointer to the block containing pixel (x, y)
-    uint64_t *getBlock(int x, int y) const {
-        return fBuffer + this->getBlockOffset(x, y);
-    }
-
-    // The following function writes the buffered runs to compressed blocks.
-    // If fNextRun < 4, then we fill the runs that we haven't buffered with
-    // the constant zero buffer.
-    void flushRuns();
-};
-
-
-R11_EACBlitter::R11_EACBlitter(int width, int height, void *latcBuffer)
-    // 0x7FFE is one minus the largest positive 16-bit int. We use it for
-    // debugging to make sure that we're properly setting the nextX distance
-    // in flushRuns(). 
-    : kLongestRun(0x7FFE), kZeroAlpha(0)
-    , fNextRun(0)
-    , fWidth(width)
-    , fHeight(height)
-    , fBuffer(reinterpret_cast<uint64_t*const>(latcBuffer))
-{
-    SkASSERT((width % kR11_EACBlockSz) == 0);
-    SkASSERT((height % kR11_EACBlockSz) == 0);
+    return allocator->createT<
+        SkTCompressedAlphaBlitter<4, 8, CompressorR11EAC>, int, int, void*>
+        (width, height, outputBuffer);
 }
 
-void R11_EACBlitter::blitAntiH(int x, int y,
-                               const SkAlpha* antialias,
-                               const int16_t* runs) {
-    // Make sure that the new row to blit is either the first
-    // row that we're blitting, or it's exactly the next scan row
-    // since the last row that we blit. This is to ensure that when
-    // we go to flush the runs, that they are all the same four
-    // runs.
-    if (fNextRun > 0 &&
-        ((x != fBufferedRuns[fNextRun-1].fX) ||
-         (y-1 != fBufferedRuns[fNextRun-1].fY))) {
-        this->flushRuns();
-    }
-
-    // Align the rows to a block boundary. If we receive rows that
-    // are not on a block boundary, then fill in the preceding runs
-    // with zeros. We do this by producing a single RLE that says
-    // that we have 0x7FFE pixels of zero (0x7FFE = 32766).
-    const int row = y & ~3;
-    while ((row + fNextRun) < y) {
-        fBufferedRuns[fNextRun].fAlphas = &kZeroAlpha;
-        fBufferedRuns[fNextRun].fRuns = &kLongestRun;
-        fBufferedRuns[fNextRun].fX = 0;
-        fBufferedRuns[fNextRun].fY = row + fNextRun;
-        ++fNextRun;
-    }
-
-    // Make sure that our assumptions aren't violated...
-    SkASSERT(fNextRun == (y & 3));
-    SkASSERT(fNextRun == 0 || fBufferedRuns[fNextRun - 1].fY < y);
-
-    // Set the values of the next run
-    fBufferedRuns[fNextRun].fAlphas = antialias;
-    fBufferedRuns[fNextRun].fRuns = runs;
-    fBufferedRuns[fNextRun].fX = x;
-    fBufferedRuns[fNextRun].fY = y;
-
-    // If we've output four scanlines in a row that don't violate our
-    // assumptions, then it's time to flush them...
-    if (4 == ++fNextRun) {
-        this->flushRuns();
-    }
-}
-
-void R11_EACBlitter::flushRuns() {
-
-    // If we don't have any runs, then just return.
-    if (0 == fNextRun) {
-        return;
-    }
-
-#ifndef NDEBUG
-    // Make sure that if we have any runs, they all match
-    for (int i = 1; i < fNextRun; ++i) {
-        SkASSERT(fBufferedRuns[i].fY == fBufferedRuns[i-1].fY + 1);
-        SkASSERT(fBufferedRuns[i].fX == fBufferedRuns[i-1].fX);
-    }
-#endif
-
-    // If we dont have as many runs as we have rows, fill in the remaining
-    // runs with constant zeros.
-    for (int i = fNextRun; i < kR11_EACBlockSz; ++i) {
-        fBufferedRuns[i].fY = fBufferedRuns[0].fY + i;
-        fBufferedRuns[i].fX = fBufferedRuns[0].fX;
-        fBufferedRuns[i].fAlphas = &kZeroAlpha;
-        fBufferedRuns[i].fRuns = &kLongestRun;
-    }
-
-    // Make sure that our assumptions aren't violated.
-    SkASSERT(fNextRun > 0 && fNextRun <= 4);
-    SkASSERT((fBufferedRuns[0].fY & 3) == 0);
-
-    // The following logic walks four rows at a time and outputs compressed
-    // blocks to the buffer passed into the constructor.
-    // We do the following:
-    //
-    //      c1 c2 c3 c4
-    // -----------------------------------------------------------------------
-    // ... |  |  |  |  |  ----> fBufferedRuns[0]
-    // -----------------------------------------------------------------------
-    // ... |  |  |  |  |  ----> fBufferedRuns[1]
-    // -----------------------------------------------------------------------
-    // ... |  |  |  |  |  ----> fBufferedRuns[2]
-    // -----------------------------------------------------------------------
-    // ... |  |  |  |  |  ----> fBufferedRuns[3]
-    // -----------------------------------------------------------------------
-    // 
-    // curX -- the macro X value that we've gotten to.
-    // c1, c2, c3, c4 -- the integers that represent the columns of the current block
-    //                   that we're operating on
-    // curAlphaColumn -- integer containing the column of alpha values from fBufferedRuns.
-    // nextX -- for each run, the next point at which we need to update curAlphaColumn
-    //          after the value of curX.
-    // finalX -- the minimum of all the nextX values.
-    //
-    // curX advances to finalX outputting any blocks that it passes along
-    // the way. Since finalX will not change when we reach the end of a
-    // run, the termination criteria will be whenever curX == finalX at the
-    // end of a loop.
-
-    // Setup:
-    uint32_t c[4] = { 0, 0, 0, 0 };
-    uint32_t curAlphaColumn = 0;
-    SkAlpha *curAlpha = reinterpret_cast<SkAlpha*>(&curAlphaColumn);
-
-    int nextX[kR11_EACBlockSz];
-    for (int i = 0; i < kR11_EACBlockSz; ++i) {
-        nextX[i] = 0x7FFFFF;
-    }
-
-    uint64_t* outPtr = this->getBlock(fBufferedRuns[0].fX, fBufferedRuns[0].fY);
-
-    // Populate the first set of runs and figure out how far we need to
-    // advance on the first step
-    int curX = 0;
-    int finalX = 0xFFFFF;
-    for (int i = 0; i < kR11_EACBlockSz; ++i) {
-        nextX[i] = *(fBufferedRuns[i].fRuns);
-        curAlpha[i] = *(fBufferedRuns[i].fAlphas);
-
-        finalX = SkMin32(nextX[i], finalX);
-    }
-
-    // Make sure that we have a valid right-bound X value
-    SkASSERT(finalX < 0xFFFFF);
-
-    // Run the blitter...
-    while (curX != finalX) {
-        SkASSERT(finalX >= curX);
-
-        // Do we need to populate the rest of the block?
-        if ((finalX - (curX & ~3)) >= kR11_EACBlockSz) {
-            const int col = curX & 3;
-            const int colsLeft = 4 - col;
-            SkASSERT(curX + colsLeft <= finalX);
-
-            update_block_columns(c, col, colsLeft, curAlphaColumn);
-
-            // Write this block
-            *outPtr = compress_block_vertical(c[0], c[1], c[2], c[3]);
-            ++outPtr;
-            curX += colsLeft;
+void DecompressR11EAC(uint8_t* dst, int dstRowBytes, const uint8_t* src, int width, int height) {
+    for (int j = 0; j < height; j += 4) {
+        for (int i = 0; i < width; i += 4) {
+            decompress_r11_eac_block(dst + i, dstRowBytes, src);
+            src += 8;
         }
-
-        // If we can advance even further, then just keep memsetting the block
-        if ((finalX - curX) >= kR11_EACBlockSz) {
-            SkASSERT((curX & 3) == 0);
-
-            const int col = 0;
-            const int colsLeft = kR11_EACBlockSz;
-
-            update_block_columns(c, col, colsLeft, curAlphaColumn);
-
-            // While we can keep advancing, just keep writing the block.
-            uint64_t lastBlock = compress_block_vertical(c[0], c[1], c[2], c[3]);
-            while((finalX - curX) >= kR11_EACBlockSz) {
-                *outPtr = lastBlock;
-                ++outPtr;
-                curX += kR11_EACBlockSz;
-            }
-        }
-
-        // If we haven't advanced within the block then do so.
-        if (curX < finalX) {
-            const int col = curX & 3;
-            const int colsLeft = finalX - curX;
-
-            update_block_columns(c, col, colsLeft, curAlphaColumn);
-
-            curX += colsLeft;
-        }
-
-        SkASSERT(curX == finalX);
-
-        // Figure out what the next advancement is...
-        for (int i = 0; i < kR11_EACBlockSz; ++i) {
-            if (nextX[i] == finalX) {
-                const int16_t run = *(fBufferedRuns[i].fRuns);
-                fBufferedRuns[i].fRuns += run;
-                fBufferedRuns[i].fAlphas += run;
-                curAlpha[i] = *(fBufferedRuns[i].fAlphas);
-                nextX[i] += *(fBufferedRuns[i].fRuns);
-            }
-        }
-
-        finalX = 0xFFFFF;
-        for (int i = 0; i < kR11_EACBlockSz; ++i) {
-            finalX = SkMin32(nextX[i], finalX);
-        }
-    }
-
-    // If we didn't land on a block boundary, output the block...
-    if ((curX & 3) > 1) {
-        *outPtr = compress_block_vertical(c[0], c[1], c[2], c[3]);
-    }
-
-    fNextRun = 0;
-}
-
-SkBlitter* CreateR11EACBlitter(int width, int height, void* outputBuffer) {
-    return new R11_EACBlitter(width, height, outputBuffer);
+        dst += 4 * dstRowBytes;
+    }    
 }
 
 }  // namespace SkTextureCompressor
diff --git a/gfx/skia/skia/src/utils/SkTextureCompressor_R11EAC.h b/gfx/skia/skia/src/utils/SkTextureCompressor_R11EAC.h
index 5f981ef46f40..abaabfb363ad 100644
--- a/gfx/skia/skia/src/utils/SkTextureCompressor_R11EAC.h
+++ b/gfx/skia/skia/src/utils/SkTextureCompressor_R11EAC.h
@@ -8,14 +8,19 @@
 #ifndef SkTextureCompressor_R11EAC_DEFINED
 #define SkTextureCompressor_R11EAC_DEFINED
 
-#include "SkBlitter.h"
+#include "SkBitmapProcShader.h"
+
+class SkBlitter;
 
 namespace SkTextureCompressor {
 
     bool CompressA8ToR11EAC(uint8_t* dst, const uint8_t* src,
-                            int width, int height, int rowBytes);
+                            int width, int height, size_t rowBytes);
 
-    SkBlitter* CreateR11EACBlitter(int width, int height, void* outputBuffer);
+    SkBlitter* CreateR11EACBlitter(int width, int height, void* outputBuffer,
+                                   SkTBlitterAllocator* allocator);
+
+    void DecompressR11EAC(uint8_t* dst, int dstRB, const uint8_t* src, int width, int height);
 }
 
 #endif  // SkTextureCompressor_R11EAC_DEFINED
diff --git a/gfx/skia/skia/src/utils/SkTextureCompressor_Utils.h b/gfx/skia/skia/src/utils/SkTextureCompressor_Utils.h
new file mode 100755
index 000000000000..9b115a29647b
--- /dev/null
+++ b/gfx/skia/skia/src/utils/SkTextureCompressor_Utils.h
@@ -0,0 +1,68 @@
+/*
+* Copyright 2014 Google Inc.
+*
+* Use of this source code is governed by a BSD-style license that can be
+* found in the LICENSE file.
+*/
+
+#ifndef SkTextureCompressorUtils_DEFINED
+#define SkTextureCompressorUtils_DEFINED
+
+namespace SkTextureCompressor {
+
+    // In some compression formats used for grayscale alpha, i.e. coverage masks, three
+    // bit indices are used to represent each pixel. A compression scheme must therefore
+    // quantize the full eight bits of grayscale to three bits. The simplest way to do
+    // this is to take the top three bits of the grayscale value. However, this does not
+    // provide an accurate quantization: 192 will be quantized to 219 instead of 185. In
+    // our compression schemes, we let these three-bit indices represent the full range
+    // of grayscale values, and so when we go from three bits to eight bits, we replicate
+    // the three bits into the lower bits of the eight bit value. Below are two different
+    // techniques that offer a quality versus speed tradeoff in terms of quantization.
+#if 1
+    // Divides each byte in the 32-bit argument by three.
+    static inline uint32_t MultibyteDiv3(uint32_t x) {
+        const uint32_t a = (x >> 2) & 0x3F3F3F3F;
+        const uint32_t ar = (x & 0x03030303) << 4;
+
+        const uint32_t b = (x >> 4) & 0x0F0F0F0F;
+        const uint32_t br = (x & 0x0F0F0F0F) << 2;
+
+        const uint32_t c = (x >> 6) & 0x03030303;
+        const uint32_t cr = x & 0x3F3F3F3F;
+
+        return a + b + c + (((ar + br + cr) >> 6) & 0x03030303);
+    }
+
+    // Takes a loaded 32-bit integer of four 8-bit greyscale values and returns their
+    // quantization into 3-bit values, used by LATC and R11 EAC. Instead of taking the
+    // top three bits, the function computes the best three-bit value such that its
+    // reconstruction into an eight bit value via bit replication will yield the best
+    // results. In a 32-bit integer taking the range of values from 0-255 we would add
+    // 18 and divide by 36 (255 / 36 ~= 7). However, since we are working in constrained
+    // 8-bit space, our algorithm is the following:
+    // 1. Shift right by one to give room for overflow
+    // 2. Add 9 (18/2)
+    // 3. Divide by 18 (divide by two, then by three twice)
+    static inline uint32_t ConvertToThreeBitIndex(uint32_t x) {
+        x = (x >> 1) & 0x7F7F7F7F; // 1
+        x = x + 0x09090909;        // 2
+
+        // Need to divide by 18... so first divide by two
+        x = (x >> 1) & 0x7F7F7F7F;
+
+        // Now divide by three twice
+        x = MultibyteDiv3(x);
+        x = MultibyteDiv3(x);
+        return x;
+    }
+#else
+    // Moves the top three bits of each byte in the 32-bit argument to the least
+    // significant bits of their respective byte.
+    static inline uint32_t ConvertToThreeBitIndex(uint32_t x) {
+        return (x >> 5) & 0x07070707;
+    }
+#endif
+}
+
+#endif // SkTextureCompressorUtils_DEFINED
diff --git a/gfx/skia/skia/src/utils/SkThreadUtils.h b/gfx/skia/skia/src/utils/SkThreadUtils.h
index 896398159675..d9fc99d397a6 100644
--- a/gfx/skia/skia/src/utils/SkThreadUtils.h
+++ b/gfx/skia/skia/src/utils/SkThreadUtils.h
@@ -14,7 +14,7 @@ class SkThread : SkNoncopyable {
 public:
     typedef void (*entryPointProc)(void*);
 
-    SkThread(entryPointProc entryPoint, void* data = NULL);
+    SkThread(entryPointProc entryPoint, void* data = nullptr);
 
     /**
      * Non-virtual, do not subclass.
@@ -32,13 +32,6 @@ public:
      */
     void join();
 
-    /**
-     * SkThreads with an affinity for the same processor will attempt to run cache
-     * locally with each other. SkThreads with an affinity for different processors
-     * will attempt to run on different cores. Returns false if the request failed.
-     */
-    bool setProcessorAffinity(unsigned int processor);
-
 private:
     void* fData;
 };
diff --git a/gfx/skia/skia/src/utils/SkThreadUtils_pthread.cpp b/gfx/skia/skia/src/utils/SkThreadUtils_pthread.cpp
index 7dec907df107..0bd804d43a51 100644
--- a/gfx/skia/skia/src/utils/SkThreadUtils_pthread.cpp
+++ b/gfx/skia/skia/src/utils/SkThreadUtils_pthread.cpp
@@ -14,8 +14,8 @@
 #include <signal.h>
 
 PThreadEvent::PThreadEvent() : fConditionFlag(false) {
-    pthread_cond_init(&fCondition, NULL);
-    pthread_mutex_init(&fConditionMutex, NULL);
+    pthread_cond_init(&fCondition, nullptr);
+    pthread_mutex_init(&fConditionMutex, nullptr);
 }
 PThreadEvent::~PThreadEvent() {
     pthread_mutex_destroy(&fConditionMutex);
@@ -65,7 +65,7 @@ static void* thread_start(void* arg) {
     if (!pthreadData->fCanceled.isTriggered()) {
         pthreadData->fEntryPoint(pthreadData->fParam);
     }
-    return NULL;
+    return nullptr;
 }
 
 SkThread::SkThread(entryPointProc entryPoint, void* data) {
@@ -81,7 +81,7 @@ SkThread::SkThread(entryPointProc entryPoint, void* data) {
 }
 
 SkThread::~SkThread() {
-    if (fData != NULL) {
+    if (fData != nullptr) {
         SkThread_PThreadData* pthreadData = static_cast<SkThread_PThreadData*>(fData);
         // If created thread but start was never called, kill the thread.
         if (pthreadData->fValidPThread && !pthreadData->fStarted.isTriggered()) {
@@ -113,5 +113,5 @@ void SkThread::join() {
         return;
     }
 
-    pthread_join(pthreadData->fPThread, NULL);
+    pthread_join(pthreadData->fPThread, nullptr);
 }
diff --git a/gfx/skia/skia/src/utils/SkThreadUtils_pthread_linux.cpp b/gfx/skia/skia/src/utils/SkThreadUtils_pthread_linux.cpp
deleted file mode 100644
index 4a03cb8276d9..000000000000
--- a/gfx/skia/skia/src/utils/SkThreadUtils_pthread_linux.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE //for pthread_setaffinity_np
-#endif
-
-#include "SkThreadUtils.h"
-#include "SkThreadUtils_pthread.h"
-
-#include <pthread.h>
-
-static int nth_set_cpu(unsigned int n, cpu_set_t* cpuSet) {
-    n %= CPU_COUNT(cpuSet);
-    for (unsigned int setCpusSeen = 0, currentCpu = 0; true; ++currentCpu) {
-        if (CPU_ISSET(currentCpu, cpuSet)) {
-            ++setCpusSeen;
-            if (setCpusSeen > n) {
-                return currentCpu;
-            }
-        }
-    }
-}
-
-bool SkThread::setProcessorAffinity(unsigned int processor) {
-    SkThread_PThreadData* pthreadData = static_cast<SkThread_PThreadData*>(fData);
-    if (!pthreadData->fValidPThread) {
-        return false;
-    }
-
-    cpu_set_t parentCpuset;
-    if (0 != pthread_getaffinity_np(pthread_self(), sizeof(cpu_set_t), &parentCpuset)) {
-        return false;
-    }
-
-    cpu_set_t cpuset;
-    CPU_ZERO(&cpuset);
-    CPU_SET(nth_set_cpu(processor, &parentCpuset), &cpuset);
-    return 0 == pthread_setaffinity_np(pthreadData->fPThread,
-                                       sizeof(cpu_set_t),
-                                       &cpuset);
-}
diff --git a/gfx/skia/skia/src/utils/SkThreadUtils_pthread_mach.cpp b/gfx/skia/skia/src/utils/SkThreadUtils_pthread_mach.cpp
deleted file mode 100644
index 0f6e263906dd..000000000000
--- a/gfx/skia/skia/src/utils/SkThreadUtils_pthread_mach.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkThreadUtils.h"
-#include "SkThreadUtils_pthread.h"
-
-#include <mach/mach.h>
-#include <mach/thread_policy.h>
-#include <pthread.h>
-
-bool SkThread::setProcessorAffinity(unsigned int processor) {
-    SkThread_PThreadData* pthreadData = static_cast<SkThread_PThreadData*>(fData);
-    if (!pthreadData->fValidPThread) {
-        return false;
-    }
-
-    mach_port_t tid = pthread_mach_thread_np(pthreadData->fPThread);
-
-    thread_affinity_policy_data_t policy;
-    policy.affinity_tag = processor;
-
-    return 0 == thread_policy_set(tid,
-                                  THREAD_AFFINITY_POLICY,
-                                  (thread_policy_t) &policy,
-                                  THREAD_AFFINITY_POLICY_COUNT);
-}
diff --git a/gfx/skia/skia/src/utils/SkThreadUtils_win.cpp b/gfx/skia/skia/src/utils/SkThreadUtils_win.cpp
index a064d3b6b310..0da339aa8499 100644
--- a/gfx/skia/skia/src/utils/SkThreadUtils_win.cpp
+++ b/gfx/skia/skia/src/utils/SkThreadUtils_win.cpp
@@ -6,22 +6,23 @@
  */
 
 #include "SkTypes.h"
+#if defined(SK_BUILD_FOR_WIN32)
 
 #include "SkThreadUtils.h"
 #include "SkThreadUtils_win.h"
 
 SkThread_WinData::SkThread_WinData(SkThread::entryPointProc entryPoint, void* data)
-    : fHandle(NULL)
+    : fHandle(nullptr)
     , fParam(data)
     , fThreadId(0)
     , fEntryPoint(entryPoint)
     , fStarted(false)
 {
     fCancelEvent = CreateEvent(
-        NULL,  // default security attributes
+        nullptr,  // default security attributes
         false, //auto reset
         false, //not signaled
-        NULL); //no name
+        nullptr); //no name
 }
 
 SkThread_WinData::~SkThread_WinData() {
@@ -44,24 +45,24 @@ SkThread::SkThread(entryPointProc entryPoint, void* data) {
     SkThread_WinData* winData = new SkThread_WinData(entryPoint, data);
     fData = winData;
 
-    if (NULL == winData->fCancelEvent) {
+    if (nullptr == winData->fCancelEvent) {
         return;
     }
 
     winData->fHandle = CreateThread(
-        NULL,                   // default security attributes
+        nullptr,                   // default security attributes
         0,                      // use default stack size
         thread_start,           // thread function name (proxy)
         winData,                // argument to thread function (proxy args)
-        CREATE_SUSPENDED,       // create suspended so affinity can be set
+        CREATE_SUSPENDED,       // we used to set processor affinity, which needed this
         &winData->fThreadId);   // returns the thread identifier
 }
 
 SkThread::~SkThread() {
-    if (fData != NULL) {
+    if (fData != nullptr) {
         SkThread_WinData* winData = static_cast<SkThread_WinData*>(fData);
         // If created thread but start was never called, kill the thread.
-        if (winData->fHandle != NULL && !winData->fStarted) {
+        if (winData->fHandle != nullptr && !winData->fStarted) {
             if (SetEvent(winData->fCancelEvent) != 0) {
                 if (this->start()) {
                     this->join();
@@ -77,7 +78,7 @@ SkThread::~SkThread() {
 
 bool SkThread::start() {
     SkThread_WinData* winData = static_cast<SkThread_WinData*>(fData);
-    if (NULL == winData->fHandle) {
+    if (nullptr == winData->fHandle) {
         return false;
     }
 
@@ -90,47 +91,11 @@ bool SkThread::start() {
 
 void SkThread::join() {
     SkThread_WinData* winData = static_cast<SkThread_WinData*>(fData);
-    if (NULL == winData->fHandle || !winData->fStarted) {
+    if (nullptr == winData->fHandle || !winData->fStarted) {
         return;
     }
 
     WaitForSingleObject(winData->fHandle, INFINITE);
 }
 
-static unsigned int num_bits_set(DWORD_PTR mask) {
-    unsigned int count;
-    for (count = 0; mask; ++count) {
-        mask &= mask - 1;
-    }
-    return count;
-}
-
-static unsigned int nth_set_bit(unsigned int n, DWORD_PTR mask) {
-    n %= num_bits_set(mask);
-    for (unsigned int setBitsSeen = 0, currentBit = 0; true; ++currentBit) {
-        if (mask & (static_cast<DWORD_PTR>(1) << currentBit)) {
-            ++setBitsSeen;
-            if (setBitsSeen > n) {
-                return currentBit;
-            }
-        }
-    }
-}
-
-bool SkThread::setProcessorAffinity(unsigned int processor) {
-    SkThread_WinData* winData = static_cast<SkThread_WinData*>(fData);
-    if (NULL == winData->fHandle) {
-        return false;
-    }
-
-    DWORD_PTR processAffinityMask;
-    DWORD_PTR systemAffinityMask;
-    if (0 == GetProcessAffinityMask(GetCurrentProcess(),
-                                    &processAffinityMask,
-                                    &systemAffinityMask)) {
-        return false;
-    }
-
-    DWORD_PTR threadAffinityMask = 1 << nth_set_bit(processor, processAffinityMask);
-    return 0 != SetThreadAffinityMask(winData->fHandle, threadAffinityMask);
-}
+#endif//defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/src/utils/SkWhitelistChecksums.cpp b/gfx/skia/skia/src/utils/SkWhitelistChecksums.cpp
new file mode 100644
index 000000000000..5fba2074dfb5
--- /dev/null
+++ b/gfx/skia/skia/src/utils/SkWhitelistChecksums.cpp
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ *
+ * GenerateChecksums() in ../../src/utils/SkWhitelistTypefaces.cpp generated SkWhitelistChecksums.cpp.
+ * Run 'whitelist_typefaces --generate' to create anew.
+ */
+
+#include "SkTDArray.h"
+
+struct Whitelist {
+    const char* fFontName;
+    uint32_t fChecksum;
+    bool fSerializedNameOnly;
+    bool fSerializedSub;
+};
+
+static Whitelist whitelist[] = {
+    { "Aegean", 0x639a35c7, false, false },
+    { "Analecta", 0x639a35c7, false, false },
+    { "Arial", 0xbc28cb14, false, false },
+    { "DejaVu Sans", 0x639a35c7, false, false },
+    { "DejaVu Sans Mono", 0xbc29a5d9, false, false },
+    { "DejaVu Serif", 0x9db67efe, false, false },
+    { "FreeMono", 0x724884f4, false, false },
+    { "FreeSans", 0x7dfc48a3, false, false },
+    { "FreeSerif", 0xa1ae8c77, false, false },
+    { "Khmer OS", 0x917c40aa, false, false },
+    { "Kochi Gothic", 0x962132dd, false, false },
+    { "Lohit Kannada", 0x0b6ce863, false, false },
+    { "Lohit Marathi", 0x0eb0a941, false, false },
+    { "Lohit Oriya", 0xf3e9d313, false, false },
+    { "Lohit Punjabi", 0xfd8b26e0, false, false },
+    { "Lohit Tamil", 0xa8111d99, false, false },
+    { "Lohit Telugu", 0xd34299e0, false, false },
+    { "Meera", 0xe3e16220, false, false },
+    { "Mukti Narrow", 0x53f7d053, false, false },
+    { "NanumBarunGothic", 0x639a35c7, false, false },
+    { "NanumGothic", 0xff8d773d, false, false },
+    { "OpenSymbol", 0x4fcaf331, false, false },
+    { "Symbola", 0x639a35c7, false, false },
+    { "TakaoPGothic", 0x068c405a, false, false },
+    { "Waree", 0x6a2bfca8, false, false },
+    { "WenQuanYi Micro Hei", 0xcdec08a3, false, false },
+    { "padmaa", 0x09eb1865, false, false },
+};
+
+static const int whitelistCount = (int) SK_ARRAY_COUNT(whitelist);
diff --git a/gfx/skia/skia/src/utils/SkWhitelistTypefaces.cpp b/gfx/skia/skia/src/utils/SkWhitelistTypefaces.cpp
new file mode 100644
index 000000000000..d3ffe98d16c0
--- /dev/null
+++ b/gfx/skia/skia/src/utils/SkWhitelistTypefaces.cpp
@@ -0,0 +1,268 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkChecksum.h"
+#include "SkFontDescriptor.h"
+#include "SkStream.h"
+#include "SkString.h"
+#include "SkTypeface.h"
+#include "SkUtils.h"
+#include "../sfnt/SkOTUtils.h"
+
+#include "SkWhitelistChecksums.cpp"
+
+#define WHITELIST_DEBUG 0
+
+extern void WhitelistSerializeTypeface(const SkTypeface*, SkWStream* );
+extern SkTypeface* WhitelistDeserializeTypeface(SkStream* );
+extern bool CheckChecksums();
+extern bool GenerateChecksums();
+
+#if WHITELIST_DEBUG
+static bool timesNewRomanSerializedNameOnly = false;
+#endif
+
+#define SUBNAME_PREFIX "sk_"
+
+static bool font_name_is_local(const char* fontName, SkTypeface::Style style) {
+    if (!strcmp(fontName, "DejaVu Sans")) {
+        return true;
+    }
+    SkTypeface* defaultFace = SkTypeface::CreateFromName(nullptr, style);
+    SkTypeface* foundFace = SkTypeface::CreateFromName(fontName, style);
+    return defaultFace != foundFace;
+}
+
+static int whitelist_name_index(const SkTypeface* tf) {
+
+    SkString fontNameStr;
+    SkAutoTUnref<SkTypeface::LocalizedStrings> nameIter(
+        SkOTUtils::LocalizedStrings_NameTable::CreateForFamilyNames(*tf));
+    SkTypeface::LocalizedString familyNameLocalized;
+    while (nameIter->next(&familyNameLocalized)) {
+        fontNameStr = familyNameLocalized.fString;
+        // check against permissible list of names
+        for (int i = 0; i < whitelistCount; ++i) {
+            if (fontNameStr.equals(whitelist[i].fFontName)) {
+                return i;
+            }
+        }
+    }
+#if WHITELIST_DEBUG
+    SkAutoTUnref<SkTypeface::LocalizedStrings> debugIter(
+        SkOTUtils::LocalizedStrings_NameTable::CreateForFamilyNames(*tf));
+    while (debugIter->next(&familyNameLocalized)) {
+        SkDebugf("no match fontName=\"%s\"\n", familyNameLocalized.fString.c_str());
+    }
+#endif
+    return -1;
+}
+
+static uint32_t compute_checksum(const SkTypeface* tf) {
+    SkFontData* fontData = tf->createFontData();
+    if (!fontData) {
+        return 0;
+    }
+    SkStreamAsset* fontStream = fontData->getStream();
+    if (!fontStream) {
+        return 0;
+    }
+    SkTDArray<char> data;
+    size_t length = fontStream->getLength();
+    if (!length) {
+        return 0;
+    }
+    data.setCount((int) length);
+    if (!fontStream->peek(data.begin(), length)) {
+        return 0;
+    }
+    return SkChecksum::Murmur3(data.begin(), length);
+}
+
+static void serialize_sub(const char* fontName, SkTypeface::Style style, SkWStream* wstream) {
+    SkFontDescriptor desc(style);
+    SkString subName(SUBNAME_PREFIX);
+    subName.append(fontName);
+    const char* familyName = subName.c_str();
+    desc.setFamilyName(familyName);
+    desc.serialize(wstream);
+#if WHITELIST_DEBUG
+    for (int i = 0; i < whitelistCount; ++i) {
+        if (!strcmp(fontName, whitelist[i].fFontName)) {
+            if (!whitelist[i].fSerializedSub) {
+                whitelist[i].fSerializedSub = true;
+                SkDebugf("%s %s\n", __FUNCTION__, familyName);
+            }
+            break;
+        }
+    }
+#endif
+}
+
+static bool is_local(const SkTypeface* tf) {
+    bool isLocal = false;
+    SkFontDescriptor desc(tf->style());
+    tf->getFontDescriptor(&desc, &isLocal);
+    return isLocal;
+}
+
+static void serialize_full(const SkTypeface* tf, SkWStream* wstream) {
+    bool isLocal = false;
+    SkFontDescriptor desc(tf->style());
+    tf->getFontDescriptor(&desc, &isLocal);
+
+    // Embed font data if it's a local font.
+    if (isLocal && !desc.hasFontData()) {
+        desc.setFontData(tf->createFontData());
+    }
+    desc.serialize(wstream);
+}
+
+static void serialize_name_only(const SkTypeface* tf, SkWStream* wstream) {
+    bool isLocal = false;
+    SkFontDescriptor desc(tf->style());
+    tf->getFontDescriptor(&desc, &isLocal);
+    SkASSERT(!isLocal);
+#if WHITELIST_DEBUG
+    const char* familyName = desc.getFamilyName();
+    if (familyName) {
+        if (!strcmp(familyName, "Times New Roman")) {
+            if (!timesNewRomanSerializedNameOnly) {
+                timesNewRomanSerializedNameOnly = true;
+                SkDebugf("%s %s\n", __FUNCTION__, familyName);
+            }
+        } else {
+            for (int i = 0; i < whitelistCount; ++i) {
+                if (!strcmp(familyName, whitelist[i].fFontName)) {
+                    if (!whitelist[i].fSerializedNameOnly) {
+                        whitelist[i].fSerializedNameOnly = true;
+                        SkDebugf("%s %s\n", __FUNCTION__, familyName);
+                    }
+                    break;
+                }
+            }
+        }
+    }
+#endif
+    desc.serialize(wstream);
+}
+
+void WhitelistSerializeTypeface(const SkTypeface* tf, SkWStream* wstream) {
+    if (!is_local(tf)) {
+        serialize_name_only(tf, wstream);
+        return;
+    }
+    int whitelistIndex = whitelist_name_index(tf);
+    if (whitelistIndex < 0) {
+        serialize_full(tf, wstream);
+        return;
+    }
+    const char* fontName = whitelist[whitelistIndex].fFontName;
+    if (!font_name_is_local(fontName, tf->style())) {
+#if WHITELIST_DEBUG
+        SkDebugf("name not found locally \"%s\" style=%d\n", fontName, tf->style());
+#endif
+        serialize_full(tf, wstream);
+        return;
+    }
+    uint32_t checksum = compute_checksum(tf);
+    if (whitelist[whitelistIndex].fChecksum != checksum) {
+#if WHITELIST_DEBUG
+        if (whitelist[whitelistIndex].fChecksum) {
+            SkDebugf("!!! checksum changed !!!\n");
+        }
+        SkDebugf("checksum updated\n");
+        SkDebugf("    { \"%s\", 0x%08x },\n", fontName, checksum);
+#endif
+        whitelist[whitelistIndex].fChecksum = checksum;
+    }
+    serialize_sub(fontName, tf->style(), wstream);
+}
+
+SkTypeface* WhitelistDeserializeTypeface(SkStream* stream) {
+    SkFontDescriptor desc(stream);
+    SkFontData* data = desc.detachFontData();
+    if (data) {
+        SkTypeface* typeface = SkTypeface::CreateFromFontData(data);
+        if (typeface) {
+            return typeface;
+        }
+    }
+    const char* familyName = desc.getFamilyName();
+    if (!strncmp(SUBNAME_PREFIX, familyName, sizeof(SUBNAME_PREFIX) - 1)) {
+        familyName += sizeof(SUBNAME_PREFIX) - 1;
+    }
+    return SkTypeface::CreateFromName(familyName, desc.getStyle());
+}
+
+bool CheckChecksums() {
+    for (int i = 0; i < whitelistCount; ++i) {
+        const char* fontName = whitelist[i].fFontName;
+        SkTypeface* tf = SkTypeface::CreateFromName(fontName, SkTypeface::kNormal);
+        uint32_t checksum = compute_checksum(tf);
+        if (whitelist[i].fChecksum != checksum) {
+            return false;
+        }
+    }
+    return true;
+}
+
+const char checksumFileName[] = "SkWhitelistChecksums.cpp";
+
+const char checksumHeader[] =
+"/*"                                                                        "\n"
+" * Copyright 2015 Google Inc."                                             "\n"
+" *"                                                                        "\n"
+" * Use of this source code is governed by a BSD-style license that can be" "\n"
+" * found in the LICENSE file."                                             "\n"
+" *"                                                                        "\n"
+" * %s() in %s generated %s."                                               "\n"
+" * Run 'whitelist_typefaces --generate' to create anew."                   "\n"
+" */"                                                                       "\n"
+""                                                                          "\n"
+"#include \"SkTDArray.h\""                                                  "\n"
+""                                                                          "\n"
+"struct Whitelist {"                                                        "\n"
+"    const char* fFontName;"                                                "\n"
+"    uint32_t fChecksum;"                                                   "\n"
+"    bool fSerializedNameOnly;"                                             "\n"
+"    bool fSerializedSub;"                                                  "\n"
+"};"                                                                        "\n"
+""                                                                          "\n"
+"static Whitelist whitelist[] = {"                                          "\n";
+
+const char checksumEntry[] =
+"    { \"%s\", 0x%08x, false, false },"                                     "\n";
+
+const char checksumTrailer[] =
+"};"                                                                        "\n"
+""                                                                          "\n"
+"static const int whitelistCount = (int) SK_ARRAY_COUNT(whitelist);"        "\n";
+
+
+#include "SkOSFile.h"
+
+bool GenerateChecksums() {
+    FILE* file = sk_fopen(checksumFileName, kWrite_SkFILE_Flag);
+    if (!file) {
+        SkDebugf("Can't open %s for writing.\n", checksumFileName);
+        return false;
+    }
+    SkString line;
+    line.printf(checksumHeader, __FUNCTION__, __FILE__, checksumFileName);
+    sk_fwrite(line.c_str(), line.size(), file);
+    for (int i = 0; i < whitelistCount; ++i) {
+        const char* fontName = whitelist[i].fFontName;
+        SkTypeface* tf = SkTypeface::CreateFromName(fontName, SkTypeface::kNormal);
+        uint32_t checksum = compute_checksum(tf);
+        line.printf(checksumEntry, fontName, checksum);
+        sk_fwrite(line.c_str(), line.size(), file);
+    }
+    sk_fwrite(checksumTrailer, sizeof(checksumTrailer) - 1, file);
+    sk_fclose(file);
+    return true;
+}
diff --git a/gfx/skia/skia/src/utils/android/SkAndroidSDKCanvas.cpp b/gfx/skia/skia/src/utils/android/SkAndroidSDKCanvas.cpp
new file mode 100644
index 000000000000..e6f802fc5ba6
--- /dev/null
+++ b/gfx/skia/skia/src/utils/android/SkAndroidSDKCanvas.cpp
@@ -0,0 +1,374 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkAndroidSDKCanvas.h"
+
+#include "SkColorFilter.h"
+#include "SkPaint.h"
+#include "SkPathEffect.h"
+#include "SkShader.h"
+#include "SkTLazy.h"
+
+namespace {
+
+/** Discard SkShaders not exposed by the Android Java API. */
+
+void CheckShader(SkPaint* paint) {
+    SkShader* shader = paint->getShader();
+    if (!shader) {
+        return;
+    }
+
+    if (shader->isABitmap()) {
+        return;
+    }
+    if (shader->asACompose(nullptr)) {
+        return;
+    }
+    SkShader::GradientType gtype = shader->asAGradient(nullptr);
+    if (gtype == SkShader::kLinear_GradientType ||
+        gtype == SkShader::kRadial_GradientType ||
+        gtype == SkShader::kSweep_GradientType) {
+        return;
+    }
+    paint->setShader(nullptr);
+}
+
+void Filter(SkPaint* paint) {
+
+    uint32_t flags = paint->getFlags();
+    flags &= ~SkPaint::kLCDRenderText_Flag;
+    paint->setFlags(flags);
+
+    // Android doesn't support Xfermodes above kLighten_Mode
+    SkXfermode::Mode mode;
+    SkXfermode::AsMode(paint->getXfermode(), &mode);
+    if (mode > SkXfermode::kLighten_Mode) {
+        paint->setXfermode(nullptr);
+    }
+
+    // Force bilinear scaling or none
+    if (paint->getFilterQuality() != kNone_SkFilterQuality) {
+        paint->setFilterQuality(kLow_SkFilterQuality);
+    }
+
+    CheckShader(paint);
+
+    // Android SDK only supports mode & matrix color filters
+    // (and, again, no modes above kLighten_Mode).
+    SkColorFilter* cf = paint->getColorFilter();
+    if (cf) {
+        SkColor color;
+        SkXfermode::Mode mode;
+        SkScalar srcColorMatrix[20];
+        bool isMode = cf->asColorMode(&color, &mode);
+        if (isMode && mode > SkXfermode::kLighten_Mode) {
+            paint->setColorFilter(
+                SkColorFilter::CreateModeFilter(color, SkXfermode::kSrcOver_Mode));
+        } else if (!isMode && !cf->asColorMatrix(srcColorMatrix)) {
+            paint->setColorFilter(nullptr);
+        }
+    }
+
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+    SkPathEffect* pe = paint->getPathEffect();
+    if (pe && !pe->exposedInAndroidJavaAPI()) {
+        paint->setPathEffect(nullptr);
+    }
+#endif
+
+    // TODO: Android doesn't support all the flags that can be passed to
+    // blur filters; we need plumbing to get them out.
+
+    paint->setImageFilter(nullptr);
+    paint->setLooper(nullptr);
+};
+
+}  // namespace
+
+#define FILTER(p)             \
+    SkPaint filteredPaint(p); \
+    Filter(&filteredPaint);
+
+#define FILTER_PTR(p)                          \
+    SkTLazy<SkPaint> lazyPaint;                \
+    SkPaint* filteredPaint = (SkPaint*) p;     \
+    if (p) {                                   \
+        filteredPaint = lazyPaint.set(*p);     \
+        Filter(filteredPaint);                 \
+    }
+
+
+SkAndroidSDKCanvas::SkAndroidSDKCanvas() : fProxyTarget(nullptr) { }
+
+void SkAndroidSDKCanvas::reset(SkCanvas* newTarget) { fProxyTarget = newTarget; }
+
+void SkAndroidSDKCanvas::onDrawPaint(const SkPaint& paint) {
+    FILTER(paint);
+    fProxyTarget->drawPaint(filteredPaint);
+}
+void SkAndroidSDKCanvas::onDrawPoints(PointMode pMode,
+                                               size_t count,
+                                               const SkPoint pts[],
+                                               const SkPaint& paint) {
+    FILTER(paint);
+    fProxyTarget->drawPoints(pMode, count, pts, filteredPaint);
+}
+void SkAndroidSDKCanvas::onDrawOval(const SkRect& r, const SkPaint& paint) {
+    FILTER(paint);
+    fProxyTarget->drawOval(r, filteredPaint);
+}
+void SkAndroidSDKCanvas::onDrawRect(const SkRect& r, const SkPaint& paint) {
+    FILTER(paint);
+    fProxyTarget->drawRect(r, filteredPaint);
+}
+void SkAndroidSDKCanvas::onDrawRRect(const SkRRect& r, const SkPaint& paint) {
+    FILTER(paint);
+    fProxyTarget->drawRRect(r, filteredPaint);
+}
+void SkAndroidSDKCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) {
+    FILTER(paint);
+    fProxyTarget->drawPath(path, filteredPaint);
+}
+void SkAndroidSDKCanvas::onDrawBitmap(const SkBitmap& bitmap,
+                                               SkScalar left,
+                                               SkScalar top,
+                                               const SkPaint* paint) {
+    FILTER_PTR(paint);
+    fProxyTarget->drawBitmap(bitmap, left, top, filteredPaint);
+}
+void SkAndroidSDKCanvas::onDrawBitmapRect(const SkBitmap& bitmap,
+                                                   const SkRect* src,
+                                                   const SkRect& dst,
+                                                   const SkPaint* paint,
+                                                   SkCanvas::SrcRectConstraint constraint) {
+    FILTER_PTR(paint);
+    fProxyTarget->legacy_drawBitmapRect(bitmap, src, dst, filteredPaint, constraint);
+}
+void SkAndroidSDKCanvas::onDrawBitmapNine(const SkBitmap& bitmap,
+                                                   const SkIRect& center,
+                                                   const SkRect& dst,
+                                                   const SkPaint* paint) {
+    FILTER_PTR(paint);
+    fProxyTarget->drawBitmapNine(bitmap, center, dst, filteredPaint);
+}
+void SkAndroidSDKCanvas::onDrawSprite(const SkBitmap& bitmap,
+                                               int left,
+                                               int top,
+                                               const SkPaint* paint) {
+    FILTER_PTR(paint);
+    fProxyTarget->drawSprite(bitmap, left, top, filteredPaint);
+}
+void SkAndroidSDKCanvas::onDrawVertices(VertexMode vMode,
+                                                 int vertexCount,
+                                                 const SkPoint vertices[],
+                    const SkPoint texs[], const SkColor colors[], SkXfermode* xMode,
+                    const uint16_t indices[], int indexCount,
+                    const SkPaint& paint) {
+    FILTER(paint);
+    fProxyTarget->drawVertices(vMode, vertexCount, vertices, texs, colors,
+                               xMode, indices, indexCount, filteredPaint);
+}
+
+void SkAndroidSDKCanvas::onDrawDRRect(const SkRRect& outer,
+                                               const SkRRect& inner,
+                                               const SkPaint& paint) {
+    FILTER(paint);
+    fProxyTarget->drawDRRect(outer, inner, filteredPaint);
+}
+
+void SkAndroidSDKCanvas::onDrawText(const void* text,
+                                             size_t byteLength,
+                                             SkScalar x,
+                                             SkScalar y,
+                                             const SkPaint& paint) {
+    FILTER(paint);
+    fProxyTarget->drawText(text, byteLength, x, y, filteredPaint);
+}
+void SkAndroidSDKCanvas::onDrawPosText(const void* text,
+                                                size_t byteLength,
+                                                const SkPoint pos[],
+                                                const SkPaint& paint) {
+    FILTER(paint);
+    fProxyTarget->drawPosText(text, byteLength, pos, filteredPaint);
+}
+void SkAndroidSDKCanvas::onDrawPosTextH(const void* text,
+                                                 size_t byteLength,
+                                                 const SkScalar xpos[],
+                                                 SkScalar constY,
+                                                 const SkPaint& paint) {
+    FILTER(paint);
+    fProxyTarget->drawPosTextH(text, byteLength, xpos, constY, filteredPaint);
+}
+void SkAndroidSDKCanvas::onDrawTextOnPath(const void* text,
+                                                   size_t byteLength,
+                                                   const SkPath& path,
+                                                   const SkMatrix* matrix,
+                                                   const SkPaint& paint) {
+    FILTER(paint);
+    fProxyTarget->drawTextOnPath(text, byteLength, path, matrix, filteredPaint);
+}
+void SkAndroidSDKCanvas::onDrawTextBlob(const SkTextBlob* blob,
+                                                 SkScalar x,
+                                                 SkScalar y,
+                                                 const SkPaint& paint) {
+    FILTER(paint);
+    fProxyTarget->drawTextBlob(blob, x, y, filteredPaint);
+}
+
+void SkAndroidSDKCanvas::onDrawPatch(const SkPoint cubics[12],
+                                              const SkColor colors[4],
+                                              const SkPoint texCoords[4],
+                                              SkXfermode* xmode,
+                                              const SkPaint& paint) {
+    FILTER(paint);
+    fProxyTarget->drawPatch(cubics, colors, texCoords, xmode, filteredPaint);
+}
+
+
+void SkAndroidSDKCanvas::onDrawImage(const SkImage* image,
+                                              SkScalar x,
+                                              SkScalar y,
+                                              const SkPaint* paint) {
+    FILTER_PTR(paint);
+    fProxyTarget->drawImage(image, x, y, filteredPaint);
+}
+
+void SkAndroidSDKCanvas::onDrawImageRect(const SkImage* image,
+                                         const SkRect* in,
+                                         const SkRect& out,
+                                         const SkPaint* paint,
+                                         SrcRectConstraint constraint) {
+    FILTER_PTR(paint);
+    fProxyTarget->legacy_drawImageRect(image, in, out, filteredPaint, constraint);
+}
+
+void SkAndroidSDKCanvas::onDrawPicture(const SkPicture* picture,
+                                       const SkMatrix* matrix,
+                                       const SkPaint* paint) {
+    FILTER_PTR(paint);
+    fProxyTarget->drawPicture(picture, matrix, filteredPaint);
+}
+
+void SkAndroidSDKCanvas::onDrawAtlas(const SkImage* atlas,
+                                     const SkRSXform xform[],
+                                     const SkRect tex[],
+                                     const SkColor colors[],
+                                     int count,
+                                     SkXfermode::Mode mode,
+                                     const SkRect* cullRect,
+                                     const SkPaint* paint) {
+    FILTER_PTR(paint);
+    fProxyTarget->drawAtlas(atlas, xform, tex, colors, count, mode, cullRect,
+                            filteredPaint);
+}
+
+void SkAndroidSDKCanvas::onDrawImageNine(const SkImage* image,
+                                         const SkIRect& center,
+                                         const SkRect& dst,
+                                         const SkPaint* paint) {
+    FILTER_PTR(paint);
+    fProxyTarget->drawImageNine(image, center, dst, filteredPaint);
+}
+
+
+void SkAndroidSDKCanvas::onDrawDrawable(SkDrawable* drawable, const SkMatrix* matrix) {
+    fProxyTarget->drawDrawable(drawable, matrix);
+}
+
+SkISize SkAndroidSDKCanvas::getBaseLayerSize() const {
+    return fProxyTarget->getBaseLayerSize();
+}
+bool SkAndroidSDKCanvas::getClipBounds(SkRect* rect) const {
+    return fProxyTarget->getClipBounds(rect);
+}
+bool SkAndroidSDKCanvas::getClipDeviceBounds(SkIRect* rect) const {
+    return fProxyTarget->getClipDeviceBounds(rect);
+}
+
+bool SkAndroidSDKCanvas::isClipEmpty() const { return fProxyTarget->isClipEmpty(); }
+bool SkAndroidSDKCanvas::isClipRect() const { return fProxyTarget->isClipRect(); }
+
+SkSurface* SkAndroidSDKCanvas::onNewSurface(const SkImageInfo& info,
+                                                     const SkSurfaceProps& props) {
+    return fProxyTarget->newSurface(info, &props);
+}
+
+bool SkAndroidSDKCanvas::onPeekPixels(SkPixmap* pmap) {
+    SkASSERT(pmap);
+    SkImageInfo info;
+    size_t rowBytes;
+    const void* addr = fProxyTarget->peekPixels(&info, &rowBytes);
+    if (addr) {
+        pmap->reset(info, addr, rowBytes);
+        return true;
+    }
+    return false;
+}
+
+bool SkAndroidSDKCanvas::onAccessTopLayerPixels(SkPixmap* pmap) {
+    SkASSERT(pmap);
+    SkImageInfo info;
+    size_t rowBytes; 
+    const void* addr = fProxyTarget->accessTopLayerPixels(&info, &rowBytes, nullptr);
+    if (addr) {
+        pmap->reset(info, addr, rowBytes);
+        return true;
+    }
+    return false;
+}
+
+void SkAndroidSDKCanvas::willSave() {
+    fProxyTarget->save();
+}
+
+SkCanvas::SaveLayerStrategy SkAndroidSDKCanvas::willSaveLayer(const SkRect* rect,
+                                                              const SkPaint* paint,
+                                                              SaveFlags flags) {
+    fProxyTarget->saveLayer(rect, paint, flags);
+    return SkCanvas::kNoLayer_SaveLayerStrategy;
+}
+
+void SkAndroidSDKCanvas::willRestore() {
+    fProxyTarget->restore();
+}
+
+void SkAndroidSDKCanvas::didRestore() { }
+
+void SkAndroidSDKCanvas::didConcat(const SkMatrix& m) {
+    fProxyTarget->concat(m);
+}
+
+void SkAndroidSDKCanvas::didSetMatrix(const SkMatrix& m) {
+    fProxyTarget->setMatrix(m);
+}
+
+void SkAndroidSDKCanvas::onClipRect(const SkRect& rect,
+                                             SkRegion::Op op,
+                                             ClipEdgeStyle style) {
+    fProxyTarget->clipRect(rect, op, style);
+}
+
+void SkAndroidSDKCanvas::onClipRRect(const SkRRect& rrect,
+                                              SkRegion::Op op,
+                                              ClipEdgeStyle style) {
+    fProxyTarget->clipRRect(rrect, op, style);
+}
+
+void SkAndroidSDKCanvas::onClipPath(const SkPath& path,
+                                             SkRegion::Op op,
+                                             ClipEdgeStyle style) {
+    fProxyTarget->clipPath(path, op, style);
+}
+
+void SkAndroidSDKCanvas::onClipRegion(const SkRegion& region, SkRegion::Op op) {
+    fProxyTarget->clipRegion(region, op);
+}
+
+void SkAndroidSDKCanvas::onDiscard() { fProxyTarget->discard(); }
+
+
diff --git a/gfx/skia/skia/src/utils/android/SkAndroidSDKCanvas.h b/gfx/skia/skia/src/utils/android/SkAndroidSDKCanvas.h
new file mode 100644
index 000000000000..08b73f144cdf
--- /dev/null
+++ b/gfx/skia/skia/src/utils/android/SkAndroidSDKCanvas.h
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkAndroidSDKCanvas_DEFINED
+#define SkAndroidSDKCanvas_DEFINED
+
+#include "SkBitmap.h"
+#include "SkCanvas.h"
+#include "SkPaint.h"
+#include "SkPath.h"
+#include "SkRect.h"
+
+/** SkDrawFilter is likely to be deprecated; this is a proxy
+    canvas that does the same thing: alter SkPaint fields.
+
+    onDraw*() functions may have their SkPaint modified, and are then
+    passed on to the same function on proxyTarget. THIS BREAKS CONSTNESS!
+
+    This still suffers one of the same architectural flaws as SkDrawFilter:
+    TextBlob paints are incomplete when filter is called.
+*/
+
+class SkAndroidSDKCanvas : public SkCanvas {
+public:
+    SkAndroidSDKCanvas();
+    void reset(SkCanvas* newTarget);
+
+protected:
+
+    // FILTERING
+
+    void onDrawPaint(const SkPaint& paint) override;
+    void onDrawPoints(PointMode pMode, size_t count, const SkPoint pts[],
+                      const SkPaint& paint) override;
+    void onDrawOval(const SkRect& r, const SkPaint& paint) override;
+    void onDrawRect(const SkRect& r, const SkPaint& paint) override;
+    void onDrawRRect(const SkRRect& r, const SkPaint& paint) override;
+    void onDrawPath(const SkPath& path, const SkPaint& paint) override;
+    void onDrawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top,
+                      const SkPaint* paint) override;
+    void onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst,
+                          const SkPaint* paint, SkCanvas::SrcRectConstraint) override;
+    void onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
+                          const SkRect& dst, const SkPaint* paint) override;
+    void onDrawSprite(const SkBitmap& bitmap, int left, int top,
+                      const SkPaint* paint) override;
+    void onDrawVertices(VertexMode vMode, int vertexCount, const SkPoint vertices[],
+                        const SkPoint texs[], const SkColor colors[], SkXfermode* xMode,
+                        const uint16_t indices[], int indexCount,
+                        const SkPaint& paint) override;
+
+    void onDrawDRRect(const SkRRect& outer, const SkRRect& inner,
+                      const SkPaint& paint) override;
+
+    void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
+                    const SkPaint& paint) override;
+    void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
+                       const SkPaint& paint) override;
+    void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
+                        SkScalar constY, const SkPaint& paint) override;
+    void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
+                          const SkMatrix* matrix, const SkPaint& paint) override;
+    void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
+                        const SkPaint& paint) override;
+
+    void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
+                     const SkPoint texCoords[4], SkXfermode* xmode,
+                     const SkPaint& paint) override;
+
+    void onDrawImage(const SkImage*, SkScalar, SkScalar, const SkPaint*) override;
+    void onDrawImageRect(const SkImage*, const SkRect*, const SkRect&, const SkPaint*,
+                         SrcRectConstraint) override;
+    void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*);
+    void onDrawAtlas(const SkImage*, const SkRSXform[], const SkRect[],
+                     const SkColor[], int count, SkXfermode::Mode,
+                     const SkRect* cull, const SkPaint*) override;
+    void onDrawImageNine(const SkImage*, const SkIRect& center,
+                         const SkRect& dst, const SkPaint*) override;
+
+    // PASS THROUGH
+
+    void onDrawDrawable(SkDrawable*, const SkMatrix*) override;
+    SkISize getBaseLayerSize() const override;
+    bool getClipBounds(SkRect*) const override;
+    bool getClipDeviceBounds(SkIRect*) const override;
+    bool isClipEmpty() const override;
+    bool isClipRect() const override;
+    SkSurface* onNewSurface(const SkImageInfo&, const SkSurfaceProps&) override;
+    bool onPeekPixels(SkPixmap*) override;
+    bool onAccessTopLayerPixels(SkPixmap*) override;
+    void willSave() override;
+    SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) override;
+    void willRestore() override;
+    void didRestore() override;
+    void didConcat(const SkMatrix&) override;
+    void didSetMatrix(const SkMatrix&) override;
+    void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) override;
+    void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) override;
+    void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) override;
+    void onClipRegion(const SkRegion&, SkRegion::Op) override;
+    void onDiscard() override;
+
+protected:
+    SkCanvas* fProxyTarget;
+};
+
+#endif  // SkAndroidSDKCanvas_DEFINED
+
diff --git a/gfx/skia/skia/src/utils/debugger/SkDebugCanvas.cpp b/gfx/skia/skia/src/utils/debugger/SkDebugCanvas.cpp
index 277e86d84ddb..f163cc5470be 100644
--- a/gfx/skia/skia/src/utils/debugger/SkDebugCanvas.cpp
+++ b/gfx/skia/skia/src/utils/debugger/SkDebugCanvas.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2012 Google Inc.
  *
@@ -6,27 +5,107 @@
  * found in the LICENSE file.
  */
 
-
+#include "SkClipStack.h"
 #include "SkColorPriv.h"
 #include "SkDebugCanvas.h"
 #include "SkDrawCommand.h"
-#include "SkDrawFilter.h"
 #include "SkDevice.h"
+#include "SkPaintFilterCanvas.h"
 #include "SkXfermode.h"
 
+namespace {
+
+class OverdrawXfermode : public SkXfermode {
+public:
+    SkPMColor xferColor(SkPMColor src, SkPMColor dst) const override {
+        // This table encodes the color progression of the overdraw visualization
+        static const SkPMColor gTable[] = {
+            SkPackARGB32(0x00, 0x00, 0x00, 0x00),
+            SkPackARGB32(0xFF, 128, 158, 255),
+            SkPackARGB32(0xFF, 170, 185, 212),
+            SkPackARGB32(0xFF, 213, 195, 170),
+            SkPackARGB32(0xFF, 255, 192, 127),
+            SkPackARGB32(0xFF, 255, 185, 85),
+            SkPackARGB32(0xFF, 255, 165, 42),
+            SkPackARGB32(0xFF, 255, 135, 0),
+            SkPackARGB32(0xFF, 255,  95, 0),
+            SkPackARGB32(0xFF, 255,  50, 0),
+            SkPackARGB32(0xFF, 255,  0, 0)
+        };
+
+
+        int idx;
+        if (SkColorGetR(dst) < 64) { // 0
+            idx = 0;
+        } else if (SkColorGetG(dst) < 25) { // 10
+            idx = 9;  // cap at 9 for upcoming increment
+        } else if ((SkColorGetB(dst)+21)/42 > 0) { // 1-6
+            idx = 7 - (SkColorGetB(dst)+21)/42;
+        } else { // 7-9
+            idx = 10 - (SkColorGetG(dst)+22)/45;
+        }
+        ++idx;
+        SkASSERT(idx < (int)SK_ARRAY_COUNT(gTable));
+
+        return gTable[idx];
+    }
+
+    Factory getFactory() const override { return nullptr; }
+#ifndef SK_IGNORE_TO_STRING
+    void toString(SkString* str) const override { str->set("OverdrawXfermode"); }
+#endif
+};
+
+class DebugPaintFilterCanvas : public SkPaintFilterCanvas {
+public:
+    DebugPaintFilterCanvas(int width,
+                           int height,
+                           bool overdrawViz,
+                           bool overrideFilterQuality,
+                           SkFilterQuality quality)
+        : INHERITED(width, height)
+        , fOverdrawXfermode(overdrawViz ? new OverdrawXfermode : nullptr)
+        , fOverrideFilterQuality(overrideFilterQuality)
+        , fFilterQuality(quality) {}
+
+protected:
+    void onFilterPaint(SkPaint* paint, Type) const override {
+        if (nullptr != fOverdrawXfermode.get()) {
+            paint->setAntiAlias(false);
+            paint->setXfermode(fOverdrawXfermode.get());
+        }
+
+        if (fOverrideFilterQuality) {
+            paint->setFilterQuality(fFilterQuality);
+        }
+    }
+
+    void onDrawPicture(const SkPicture* picture,
+                       const SkMatrix* matrix,
+                       const SkPaint* paint) override {
+        // We need to replay the picture onto this canvas in order to filter its internal paints.
+        this->SkCanvas::onDrawPicture(picture, matrix, paint);
+    }
+
+private:
+    SkAutoTUnref<SkXfermode> fOverdrawXfermode;
+
+    bool fOverrideFilterQuality;
+    SkFilterQuality fFilterQuality;
+
+    typedef SkPaintFilterCanvas INHERITED;
+};
+
+}
+
 SkDebugCanvas::SkDebugCanvas(int width, int height)
         : INHERITED(width, height)
-        , fPicture(NULL)
-        , fWidth(width)
-        , fHeight(height)
+        , fPicture(nullptr)
         , fFilter(false)
         , fMegaVizMode(false)
-        , fIndex(0)
         , fOverdrawViz(false)
-        , fOverdrawFilter(NULL)
-        , fOverrideTexFiltering(false)
-        , fTexOverrideFilter(NULL)
-        , fOutstandingSaveCount(0) {
+        , fOverrideFilterQuality(false)
+        , fFilterQuality(kNone_SkFilterQuality) {
     fUserMatrix.reset();
 
     // SkPicturePlayback uses the base-class' quickReject calls to cull clipped
@@ -42,8 +121,7 @@ SkDebugCanvas::SkDebugCanvas(int width, int height)
     largeIRect.inset(1024, 1024);
     SkRect large = SkRect::Make(largeIRect);
 #ifdef SK_DEBUG
-    large.roundOut(&largeIRect);
-    SkASSERT(!largeIRect.isEmpty());
+    SkASSERT(!large.roundOut().isEmpty());
 #endif
     // call the base class' version to avoid adding a draw command
     this->INHERITED::onClipRect(large, SkRegion::kReplace_Op, kHard_ClipEdgeStyle);
@@ -51,12 +129,9 @@ SkDebugCanvas::SkDebugCanvas(int width, int height)
 
 SkDebugCanvas::~SkDebugCanvas() {
     fCommandVector.deleteAll();
-    SkSafeUnref(fOverdrawFilter);
-    SkSafeUnref(fTexOverrideFilter);
 }
 
 void SkDebugCanvas::addDrawCommand(SkDrawCommand* command) {
-    command->setOffset(this->getOpID());
     fCommandVector.push(command);
 }
 
@@ -76,12 +151,13 @@ int SkDebugCanvas::getCommandAtPoint(int x, int y, int index) {
 
     SkCanvas canvas(bitmap);
     canvas.translate(SkIntToScalar(-x), SkIntToScalar(-y));
-    applyUserTransform(&canvas);
+    this->applyUserTransform(&canvas);
 
     int layer = 0;
     SkColor prev = bitmap.getColor(0,0);
     for (int i = 0; i < index; i++) {
         if (fCommandVector[i]->isVisible()) {
+            fCommandVector[i]->setUserMatrix(fUserMatrix);
             fCommandVector[i]->execute(&canvas);
         }
         if (prev != bitmap.getColor(0,0)) {
@@ -92,103 +168,25 @@ int SkDebugCanvas::getCommandAtPoint(int x, int y, int index) {
     return layer;
 }
 
-class OverdrawXfermode : public SkXfermode {
-public:
-    virtual SkPMColor xferColor(SkPMColor src, SkPMColor dst) const SK_OVERRIDE {
-        // This table encodes the color progression of the overdraw visualization
-        static const SkPMColor gTable[] = {
-            SkPackARGB32(0x00, 0x00, 0x00, 0x00),
-            SkPackARGB32(0xFF, 128, 158, 255),
-            SkPackARGB32(0xFF, 170, 185, 212),
-            SkPackARGB32(0xFF, 213, 195, 170),
-            SkPackARGB32(0xFF, 255, 192, 127),
-            SkPackARGB32(0xFF, 255, 185, 85),
-            SkPackARGB32(0xFF, 255, 165, 42),
-            SkPackARGB32(0xFF, 255, 135, 0),
-            SkPackARGB32(0xFF, 255,  95, 0),
-            SkPackARGB32(0xFF, 255,  50, 0),
-            SkPackARGB32(0xFF, 255,  0, 0)
-        };
-
-        for (size_t i = 0; i < SK_ARRAY_COUNT(gTable)-1; ++i) {
-            if (gTable[i] == dst) {
-                return gTable[i+1];
-            }
-        }
-
-        return gTable[SK_ARRAY_COUNT(gTable)-1];
-    }
-
-    virtual Factory getFactory() const SK_OVERRIDE { return NULL; }
-#ifndef SK_IGNORE_TO_STRING
-    virtual void toString(SkString* str) const { str->set("OverdrawXfermode"); }
-#endif
-};
-
-class SkOverdrawFilter : public SkDrawFilter {
-public:
-    SkOverdrawFilter() {
-        fXferMode = SkNEW(OverdrawXfermode);
-    }
-
-    virtual ~SkOverdrawFilter() {
-        delete fXferMode;
-    }
-
-    virtual bool filter(SkPaint* p, Type) SK_OVERRIDE {
-        p->setXfermode(fXferMode);
-        return true;
-    }
-
-protected:
-    SkXfermode* fXferMode;
-
-private:
-    typedef SkDrawFilter INHERITED;
-};
-
-// SkTexOverrideFilter modifies every paint to use the specified
-// texture filtering mode
-class SkTexOverrideFilter : public SkDrawFilter {
-public:
-    SkTexOverrideFilter() : fFilterLevel(SkPaint::kNone_FilterLevel) {
-    }
-
-    void setFilterLevel(SkPaint::FilterLevel filterLevel) {
-        fFilterLevel = filterLevel;
-    }
-
-    virtual bool filter(SkPaint* p, Type) SK_OVERRIDE {
-        p->setFilterLevel(fFilterLevel);
-        return true;
-    }
-
-protected:
-    SkPaint::FilterLevel fFilterLevel;
-
-private:
-    typedef SkDrawFilter INHERITED;
-};
-
 class SkDebugClipVisitor : public SkCanvas::ClipVisitor {
 public:
     SkDebugClipVisitor(SkCanvas* canvas) : fCanvas(canvas) {}
 
-    virtual void clipRect(const SkRect& r, SkRegion::Op, bool doAA) SK_OVERRIDE {
+    void clipRect(const SkRect& r, SkRegion::Op, bool doAA) override {
         SkPaint p;
         p.setColor(SK_ColorRED);
         p.setStyle(SkPaint::kStroke_Style);
         p.setAntiAlias(doAA);
         fCanvas->drawRect(r, p);
     }
-    virtual void clipRRect(const SkRRect& rr, SkRegion::Op, bool doAA) SK_OVERRIDE {
+    void clipRRect(const SkRRect& rr, SkRegion::Op, bool doAA) override {
         SkPaint p;
         p.setColor(SK_ColorGREEN);
         p.setStyle(SkPaint::kStroke_Style);
         p.setAntiAlias(doAA);
         fCanvas->drawRRect(rr, p);
     }
-    virtual void clipPath(const SkPath& path, SkRegion::Op, bool doAA) SK_OVERRIDE {
+    void clipPath(const SkPath& path, SkRegion::Op, bool doAA) override {
         SkPaint p;
         p.setColor(SK_ColorBLUE);
         p.setStyle(SkPaint::kStroke_Style);
@@ -207,7 +205,6 @@ private:
 // return true in their 'active' method
 void SkDebugCanvas::markActiveCommands(int index) {
     fActiveLayers.rewind();
-    fActiveCulls.rewind();
 
     for (int i = 0; i < fCommandVector.count(); ++i) {
         fCommandVector[i]->setActive(false);
@@ -219,10 +216,6 @@ void SkDebugCanvas::markActiveCommands(int index) {
             fActiveLayers.push(fCommandVector[i]);
         } else if (SkDrawCommand::kPopLayer_Action == result) {
             fActiveLayers.pop();
-        } else if (SkDrawCommand::kPushCull_Action == result) {
-            fActiveCulls.push(fCommandVector[i]);
-        } else if (SkDrawCommand::kPopCull_Action == result) {
-            fActiveCulls.pop();
         }
     }
 
@@ -230,79 +223,38 @@ void SkDebugCanvas::markActiveCommands(int index) {
         fActiveLayers[i]->setActive(true);
     }
 
-    for (int i = 0; i < fActiveCulls.count(); ++i) {
-        fActiveCulls[i]->setActive(true);
-    }
 }
 
 void SkDebugCanvas::drawTo(SkCanvas* canvas, int index) {
     SkASSERT(!fCommandVector.isEmpty());
     SkASSERT(index < fCommandVector.count());
-    int i = 0;
+
+    int saveCount = canvas->save();
+
+    SkRect windowRect = SkRect::MakeWH(SkIntToScalar(canvas->getBaseLayerSize().width()),
+                                       SkIntToScalar(canvas->getBaseLayerSize().height()));
 
     bool pathOpsMode = getAllowSimplifyClip();
     canvas->setAllowSimplifyClip(pathOpsMode);
-    // This only works assuming the canvas and device are the same ones that
-    // were previously drawn into because they need to preserve all saves
-    // and restores.
-    // The visibility filter also requires a full re-draw - otherwise we can
-    // end up drawing the filter repeatedly.
-    if (fIndex < index && !fFilter && !fMegaVizMode && !pathOpsMode) {
-        i = fIndex + 1;
-    } else {
-        for (int j = 0; j < fOutstandingSaveCount; j++) {
-            canvas->restore();
-        }
-        canvas->clear(SK_ColorTRANSPARENT);
-        canvas->resetMatrix();
-        SkRect rect = SkRect::MakeWH(SkIntToScalar(fWidth),
-                                     SkIntToScalar(fHeight));
-        canvas->clipRect(rect, SkRegion::kReplace_Op );
-        applyUserTransform(canvas);
-        fOutstandingSaveCount = 0;
+    canvas->clear(SK_ColorTRANSPARENT);
+    canvas->resetMatrix();
+    if (!windowRect.isEmpty()) {
+        canvas->clipRect(windowRect, SkRegion::kReplace_Op);
     }
+    this->applyUserTransform(canvas);
 
-    // The setting of the draw filter has to go here (rather than in
-    // SkRasterWidget) due to the canvas restores this class performs.
-    // Since the draw filter is stored in the layer stack if we
-    // call setDrawFilter on anything but the root layer odd things happen.
-    if (fOverdrawViz) {
-        if (NULL == fOverdrawFilter) {
-            fOverdrawFilter = new SkOverdrawFilter;
-        }
-
-        if (fOverdrawFilter != canvas->getDrawFilter()) {
-            canvas->setDrawFilter(fOverdrawFilter);
-        }
-    } else if (fOverrideTexFiltering) {
-        if (NULL == fTexOverrideFilter) {
-            fTexOverrideFilter = new SkTexOverrideFilter;
-        }
-
-        if (fTexOverrideFilter != canvas->getDrawFilter()) {
-            canvas->setDrawFilter(fTexOverrideFilter);
-        }
-    } else {
-        canvas->setDrawFilter(NULL);
+    if (fPaintFilterCanvas) {
+        fPaintFilterCanvas->addCanvas(canvas);
+        canvas = fPaintFilterCanvas.get();
     }
 
     if (fMegaVizMode) {
         this->markActiveCommands(index);
     }
 
-    for (; i <= index; i++) {
+    for (int i = 0; i <= index; i++) {
         if (i == index && fFilter) {
-            SkPaint p;
-            p.setColor(0xAAFFFFFF);
-            canvas->save();
-            canvas->resetMatrix();
-            SkRect mask;
-            mask.set(SkIntToScalar(0), SkIntToScalar(0),
-                    SkIntToScalar(fWidth), SkIntToScalar(fHeight));
-            canvas->clipRect(mask, SkRegion::kReplace_Op, false);
-            canvas->drawRectCoords(SkIntToScalar(0), SkIntToScalar(0),
-                    SkIntToScalar(fWidth), SkIntToScalar(fHeight), p);
-            canvas->restore();
+            canvas->clear(0xAAFFFFFF);
         }
 
         if (fCommandVector[i]->isVisible()) {
@@ -313,23 +265,22 @@ void SkDebugCanvas::drawTo(SkCanvas* canvas, int index) {
                 //     All active culls draw their cull box
                 fCommandVector[i]->vizExecute(canvas);
             } else {
+                fCommandVector[i]->setUserMatrix(fUserMatrix);
                 fCommandVector[i]->execute(canvas);
             }
-
-            fCommandVector[i]->trackSaveState(&fOutstandingSaveCount);
         }
     }
 
     if (fMegaVizMode) {
-        SkRect r = SkRect::MakeWH(SkIntToScalar(fWidth), SkIntToScalar(fHeight));
-        r.outset(SK_Scalar1, SK_Scalar1);
-
         canvas->save();
         // nuke the CTM
-        canvas->setMatrix(SkMatrix::I());
+        canvas->resetMatrix();
         // turn off clipping
-        canvas->clipRect(r, SkRegion::kReplace_Op);
-
+        if (!windowRect.isEmpty()) {
+            SkRect r = windowRect;
+            r.outset(SK_Scalar1, SK_Scalar1);
+            canvas->clipRect(r, SkRegion::kReplace_Op);
+        }
         // visualize existing clips
         SkDebugClipVisitor visitor(canvas);
 
@@ -363,7 +314,12 @@ void SkDebugCanvas::drawTo(SkCanvas* canvas, int index) {
     if (!canvas->getClipDeviceBounds(&fClip)) {
         fClip.setEmpty();
     }
-    fIndex = index;
+
+    canvas->restoreToCount(saveCount);
+
+    if (fPaintFilterCanvas) {
+        fPaintFilterCanvas->removeAll();
+    }
 }
 
 void SkDebugCanvas::deleteDrawCommandAt(int index) {
@@ -383,7 +339,7 @@ void SkDebugCanvas::setDrawCommandAt(int index, SkDrawCommand* command) {
     fCommandVector[index] = command;
 }
 
-SkTDArray<SkString*>* SkDebugCanvas::getCommandInfo(int index) {
+const SkTDArray<SkString*>* SkDebugCanvas::getCommandInfo(int index) const {
     SkASSERT(index < fCommandVector.count());
     return fCommandVector[index]->Info();
 }
@@ -401,38 +357,34 @@ SkTDArray <SkDrawCommand*>& SkDebugCanvas::getDrawCommands() {
     return fCommandVector;
 }
 
-// TODO(chudy): Free command string memory.
-SkTArray<SkString>* SkDebugCanvas::getDrawCommandsAsStrings() const {
-    SkTArray<SkString>* commandString = new SkTArray<SkString>(fCommandVector.count());
-    if (!fCommandVector.isEmpty()) {
-        for (int i = 0; i < fCommandVector.count(); i ++) {
-            commandString->push_back() = fCommandVector[i]->toString();
-        }
-    }
-    return commandString;
-}
-
-SkTDArray<size_t>* SkDebugCanvas::getDrawCommandOffsets() const {
-    SkTDArray<size_t>* commandOffsets = new SkTDArray<size_t>;
-    if (!fCommandVector.isEmpty()) {
-        for (int i = 0; i < fCommandVector.count(); i ++) {
-            *commandOffsets->push() = fCommandVector[i]->offset();
-        }
-    }
-    return commandOffsets;
-}
-
-void SkDebugCanvas::overrideTexFiltering(bool overrideTexFiltering, SkPaint::FilterLevel level) {
-    if (NULL == fTexOverrideFilter) {
-        fTexOverrideFilter = new SkTexOverrideFilter;
+void SkDebugCanvas::updatePaintFilterCanvas() {
+    if (!fOverdrawViz && !fOverrideFilterQuality) {
+        fPaintFilterCanvas.reset(nullptr);
+        return;
     }
 
-    fOverrideTexFiltering = overrideTexFiltering;
-    fTexOverrideFilter->setFilterLevel(level);
+    const SkImageInfo info = this->imageInfo();
+    fPaintFilterCanvas.reset(new DebugPaintFilterCanvas(info.width(), info.height(), fOverdrawViz,
+                                                        fOverrideFilterQuality, fFilterQuality));
 }
 
-void SkDebugCanvas::clear(SkColor color) {
-    this->addDrawCommand(new SkClearCommand(color));
+void SkDebugCanvas::setOverdrawViz(bool overdrawViz) {
+    if (fOverdrawViz == overdrawViz) {
+        return;
+    }
+
+    fOverdrawViz = overdrawViz;
+    this->updatePaintFilterCanvas();
+}
+
+void SkDebugCanvas::overrideTexFiltering(bool overrideTexFiltering, SkFilterQuality quality) {
+    if (fOverrideFilterQuality == overrideTexFiltering && fFilterQuality == quality) {
+        return;
+    }
+
+    fOverrideFilterQuality = overrideTexFiltering;
+    fFilterQuality = quality;
+    this->updatePaintFilterCanvas();
 }
 
 void SkDebugCanvas::onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
@@ -452,79 +404,58 @@ void SkDebugCanvas::onClipRegion(const SkRegion& region, SkRegion::Op op) {
 }
 
 void SkDebugCanvas::didConcat(const SkMatrix& matrix) {
-    switch (matrix.getType()) {
-        case SkMatrix::kTranslate_Mask:
-            this->addDrawCommand(new SkTranslateCommand(matrix.getTranslateX(),
-                                                        matrix.getTranslateY()));
-            break;
-        case SkMatrix::kScale_Mask:
-            this->addDrawCommand(new SkScaleCommand(matrix.getScaleX(),
-                                                    matrix.getScaleY()));
-            break;
-        default:
-            this->addDrawCommand(new SkConcatCommand(matrix));
-            break;
-    }
-
+    this->addDrawCommand(new SkConcatCommand(matrix));
     this->INHERITED::didConcat(matrix);
 }
 
-void SkDebugCanvas::drawBitmap(const SkBitmap& bitmap, SkScalar left,
-                               SkScalar top, const SkPaint* paint = NULL) {
+void SkDebugCanvas::onDrawBitmap(const SkBitmap& bitmap, SkScalar left,
+                                 SkScalar top, const SkPaint* paint) {
     this->addDrawCommand(new SkDrawBitmapCommand(bitmap, left, top, paint));
 }
 
-void SkDebugCanvas::drawBitmapRectToRect(const SkBitmap& bitmap,
-                                         const SkRect* src, const SkRect& dst,
-                                         const SkPaint* paint,
-                                         SkCanvas::DrawBitmapRectFlags flags) {
-    this->addDrawCommand(new SkDrawBitmapRectCommand(bitmap, src, dst, paint, flags));
+void SkDebugCanvas::onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst,
+                                     const SkPaint* paint, SrcRectConstraint constraint) {
+    this->addDrawCommand(new SkDrawBitmapRectCommand(bitmap, src, dst, paint,
+                                                     (SrcRectConstraint)constraint));
 }
 
-void SkDebugCanvas::drawBitmapMatrix(const SkBitmap& bitmap,
-                                     const SkMatrix& matrix, const SkPaint* paint) {
-    this->addDrawCommand(new SkDrawBitmapMatrixCommand(bitmap, matrix, paint));
-}
-
-void SkDebugCanvas::drawBitmapNine(const SkBitmap& bitmap,
-        const SkIRect& center, const SkRect& dst, const SkPaint* paint) {
+void SkDebugCanvas::onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
+                                     const SkRect& dst, const SkPaint* paint) {
     this->addDrawCommand(new SkDrawBitmapNineCommand(bitmap, center, dst, paint));
 }
 
-void SkDebugCanvas::drawData(const void* data, size_t length) {
-    this->addDrawCommand(new SkDrawDataCommand(data, length));
+void SkDebugCanvas::onDrawImage(const SkImage* image, SkScalar left, SkScalar top,
+                                const SkPaint* paint) {
+    this->addDrawCommand(new SkDrawImageCommand(image, left, top, paint));
 }
 
-void SkDebugCanvas::beginCommentGroup(const char* description) {
-    this->addDrawCommand(new SkBeginCommentGroupCommand(description));
+void SkDebugCanvas::onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
+                                    const SkPaint* paint, SrcRectConstraint constraint) {
+    this->addDrawCommand(new SkDrawImageRectCommand(image, src, dst, paint, constraint));
 }
 
-void SkDebugCanvas::addComment(const char* kywd, const char* value) {
-    this->addDrawCommand(new SkCommentCommand(kywd, value));
-}
-
-void SkDebugCanvas::endCommentGroup() {
-    this->addDrawCommand(new SkEndCommentGroupCommand());
-}
-
-void SkDebugCanvas::drawOval(const SkRect& oval, const SkPaint& paint) {
+void SkDebugCanvas::onDrawOval(const SkRect& oval, const SkPaint& paint) {
     this->addDrawCommand(new SkDrawOvalCommand(oval, paint));
 }
 
-void SkDebugCanvas::drawPaint(const SkPaint& paint) {
+void SkDebugCanvas::onDrawPaint(const SkPaint& paint) {
     this->addDrawCommand(new SkDrawPaintCommand(paint));
 }
 
-void SkDebugCanvas::drawPath(const SkPath& path, const SkPaint& paint) {
+void SkDebugCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) {
     this->addDrawCommand(new SkDrawPathCommand(path, paint));
 }
 
-void SkDebugCanvas::onDrawPicture(const SkPicture* picture) {
-    this->addDrawCommand(new SkDrawPictureCommand(picture));
+void SkDebugCanvas::onDrawPicture(const SkPicture* picture,
+                                  const SkMatrix* matrix,
+                                  const SkPaint* paint) {
+    this->addDrawCommand(new SkBeginDrawPictureCommand(picture, matrix, paint));
+    this->INHERITED::onDrawPicture(picture, matrix, paint);
+    this->addDrawCommand(new SkEndDrawPictureCommand(SkToBool(matrix) || SkToBool(paint)));
 }
 
-void SkDebugCanvas::drawPoints(PointMode mode, size_t count,
-                               const SkPoint pts[], const SkPaint& paint) {
+void SkDebugCanvas::onDrawPoints(PointMode mode, size_t count,
+                                 const SkPoint pts[], const SkPaint& paint) {
     this->addDrawCommand(new SkDrawPointsCommand(mode, count, pts, paint));
 }
 
@@ -539,12 +470,12 @@ void SkDebugCanvas::onDrawPosTextH(const void* text, size_t byteLength, const Sk
         new SkDrawPosTextHCommand(text, byteLength, xpos, constY, paint));
 }
 
-void SkDebugCanvas::drawRect(const SkRect& rect, const SkPaint& paint) {
+void SkDebugCanvas::onDrawRect(const SkRect& rect, const SkPaint& paint) {
     // NOTE(chudy): Messing up when renamed to DrawRect... Why?
     addDrawCommand(new SkDrawRectCommand(rect, paint));
 }
 
-void SkDebugCanvas::drawRRect(const SkRRect& rrect, const SkPaint& paint) {
+void SkDebugCanvas::onDrawRRect(const SkRRect& rrect, const SkPaint& paint) {
     this->addDrawCommand(new SkDrawRRectCommand(rrect, paint));
 }
 
@@ -553,8 +484,7 @@ void SkDebugCanvas::onDrawDRRect(const SkRRect& outer, const SkRRect& inner,
     this->addDrawCommand(new SkDrawDRRectCommand(outer, inner, paint));
 }
 
-void SkDebugCanvas::drawSprite(const SkBitmap& bitmap, int left, int top,
-                               const SkPaint* paint = NULL) {
+void SkDebugCanvas::onDrawSprite(const SkBitmap& bitmap, int left, int top, const SkPaint* paint) {
     this->addDrawCommand(new SkDrawSpriteCommand(bitmap, left, top, paint));
 }
 
@@ -569,20 +499,23 @@ void SkDebugCanvas::onDrawTextOnPath(const void* text, size_t byteLength, const
         new SkDrawTextOnPathCommand(text, byteLength, path, matrix, paint));
 }
 
-void SkDebugCanvas::drawVertices(VertexMode vmode, int vertexCount,
-        const SkPoint vertices[], const SkPoint texs[], const SkColor colors[],
-        SkXfermode*, const uint16_t indices[], int indexCount,
-        const SkPaint& paint) {
+void SkDebugCanvas::onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
+                                   const SkPaint& paint) {
+    this->addDrawCommand(new SkDrawTextBlobCommand(blob, x, y, paint));
+}
+
+void SkDebugCanvas::onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
+                                const SkPoint texCoords[4], SkXfermode* xmode,
+                                const SkPaint& paint) {
+    this->addDrawCommand(new SkDrawPatchCommand(cubics, colors, texCoords, xmode, paint));
+}
+
+void SkDebugCanvas::onDrawVertices(VertexMode vmode, int vertexCount, const SkPoint vertices[],
+                                   const SkPoint texs[], const SkColor colors[],
+                                   SkXfermode*, const uint16_t indices[], int indexCount,
+                                   const SkPaint& paint) {
     this->addDrawCommand(new SkDrawVerticesCommand(vmode, vertexCount, vertices,
-                         texs, colors, NULL, indices, indexCount, paint));
-}
-
-void SkDebugCanvas::onPushCull(const SkRect& cullRect) {
-    this->addDrawCommand(new SkPushCullCommand(cullRect));
-}
-
-void SkDebugCanvas::onPopCull() {
-    this->addDrawCommand(new SkPopCullCommand());
+                         texs, colors, nullptr, indices, indexCount, paint));
 }
 
 void SkDebugCanvas::willRestore() {
diff --git a/gfx/skia/skia/src/utils/debugger/SkDebugCanvas.h b/gfx/skia/skia/src/utils/debugger/SkDebugCanvas.h
index 50a9152239e5..612ee5756f98 100644
--- a/gfx/skia/skia/src/utils/debugger/SkDebugCanvas.h
+++ b/gfx/skia/skia/src/utils/debugger/SkDebugCanvas.h
@@ -12,12 +12,13 @@
 
 #include "SkCanvas.h"
 #include "SkDrawCommand.h"
+#include "SkPath.h"
 #include "SkPathOps.h"
 #include "SkPicture.h"
-#include "SkTArray.h"
 #include "SkString.h"
+#include "SkTArray.h"
 
-class SkTexOverrideFilter;
+class SkNWayCanvas;
 
 class SK_API SkDebugCanvas : public SkCanvas {
 public:
@@ -32,12 +33,9 @@ public:
     /**
      * Enable or disable overdraw visualization
      */
-    void setOverdrawViz(bool overdrawViz) { fOverdrawViz = overdrawViz; }
+    void setOverdrawViz(bool overdrawViz);
     bool getOverdrawViz() const { return fOverdrawViz; }
 
-    void setOutstandingSaveCount(int saveCount) { fOutstandingSaveCount = saveCount; }
-    int getOutstandingSaveCount() const { return fOutstandingSaveCount; }
-
     bool getAllowSimplifyClip() const { return fAllowSimplifyClip; }
 
     void setPicture(SkPicture* picture) { fPicture = picture; }
@@ -45,7 +43,7 @@ public:
     /**
      * Enable or disable texure filtering override
      */
-    void overrideTexFiltering(bool overrideTexFiltering, SkPaint::FilterLevel level);
+    void overrideTexFiltering(bool overrideTexFiltering, SkFilterQuality);
 
     /**
         Executes all draw calls to the canvas.
@@ -102,7 +100,7 @@ public:
         Returns information about the command at the given index.
         @param index  The index of the command
      */
-    SkTDArray<SkString*>* getCommandInfo(int index);
+    const SkTDArray<SkString*>* getCommandInfo(int index) const;
 
     /**
         Returns the visibility of the command at the given index.
@@ -122,16 +120,6 @@ public:
      */
     SkTDArray<SkDrawCommand*>& getDrawCommands();
 
-    /**
-     * Returns the string vector of draw commands
-     */
-    SkTArray<SkString>* getDrawCommandsAsStrings() const;
-
-    /**
-     * Returns an array containing an offset (in the SkPicture) for each command
-     */
-    SkTDArray<size_t>* getDrawCommandOffsets() const;
-
     /**
         Returns length of draw command vector.
      */
@@ -145,11 +133,6 @@ public:
      */
     void toggleCommand(int index, bool toggle);
 
-    void setBounds(int width, int height) {
-        fWidth = width;
-        fHeight = height;
-    }
-
     void setUserMatrix(SkMatrix matrix) {
         fUserMatrix = matrix;
     }
@@ -160,113 +143,83 @@ public:
 // Inherited from SkCanvas
 ////////////////////////////////////////////////////////////////////////////////
 
-    virtual void clear(SkColor) SK_OVERRIDE;
-
-    virtual void drawBitmap(const SkBitmap&, SkScalar left, SkScalar top,
-                            const SkPaint*) SK_OVERRIDE;
-
-    virtual void drawBitmapRectToRect(const SkBitmap&, const SkRect* src,
-                                      const SkRect& dst, const SkPaint* paint,
-                                      DrawBitmapRectFlags flags) SK_OVERRIDE;
-
-    virtual void drawBitmapMatrix(const SkBitmap&, const SkMatrix&,
-                                  const SkPaint*) SK_OVERRIDE;
-
-    virtual void drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
-                                const SkRect& dst, const SkPaint*) SK_OVERRIDE;
-
-    virtual void drawData(const void*, size_t) SK_OVERRIDE;
-
-    virtual void beginCommentGroup(const char* description) SK_OVERRIDE;
-
-    virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE;
-
-    virtual void endCommentGroup() SK_OVERRIDE;
-
-    virtual void drawOval(const SkRect& oval, const SkPaint&) SK_OVERRIDE;
-
-    virtual void drawPaint(const SkPaint& paint) SK_OVERRIDE;
-
-    virtual void drawPath(const SkPath& path, const SkPaint&) SK_OVERRIDE;
-
-    virtual void drawPoints(PointMode, size_t count, const SkPoint pts[],
-                            const SkPaint&) SK_OVERRIDE;
-
-    virtual void drawRect(const SkRect& rect, const SkPaint&) SK_OVERRIDE;
-
-    virtual void drawRRect(const SkRRect& rrect, const SkPaint& paint) SK_OVERRIDE;
-
-    virtual void drawSprite(const SkBitmap&, int left, int top,
-                            const SkPaint*) SK_OVERRIDE;
-
-    virtual void drawVertices(VertexMode, int vertexCount,
-                              const SkPoint vertices[], const SkPoint texs[],
-                              const SkColor colors[], SkXfermode*,
-                              const uint16_t indices[], int indexCount,
-                              const SkPaint&) SK_OVERRIDE;
-
     static const int kVizImageHeight = 256;
     static const int kVizImageWidth = 256;
 
-    virtual bool isClipEmpty() const SK_OVERRIDE { return false; }
-    virtual bool isClipRect() const SK_OVERRIDE { return true; }
-#ifdef SK_SUPPORT_LEGACY_GETCLIPTYPE
-    virtual ClipType getClipType() const SK_OVERRIDE {
-        return kRect_ClipType;
-    }
-#endif
-    virtual bool getClipBounds(SkRect* bounds) const SK_OVERRIDE {
-        if (NULL != bounds) {
+    bool isClipEmpty() const override { return false; }
+    bool isClipRect() const override { return true; }
+    bool getClipBounds(SkRect* bounds) const override {
+        if (bounds) {
             bounds->setXYWH(0, 0,
-                            SkIntToScalar(this->imageInfo().fWidth),
-                            SkIntToScalar(this->imageInfo().fHeight));
+                            SkIntToScalar(this->imageInfo().width()),
+                            SkIntToScalar(this->imageInfo().height()));
         }
         return true;
     }
-    virtual bool getClipDeviceBounds(SkIRect* bounds) const SK_OVERRIDE {
-        if (NULL != bounds) {
+    bool getClipDeviceBounds(SkIRect* bounds) const override {
+        if (bounds) {
             bounds->setLargest();
         }
         return true;
     }
 
 protected:
-    virtual void willSave() SK_OVERRIDE;
-    virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE;
-    virtual void willRestore() SK_OVERRIDE;
+    void willSave() override;
+    SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) override;
+    void willRestore() override;
 
-    virtual void didConcat(const SkMatrix&) SK_OVERRIDE;
-    virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE;
+    void didConcat(const SkMatrix&) override;
+    void didSetMatrix(const SkMatrix&) override;
 
-    virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE;
-    virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
-                            const SkPaint&) SK_OVERRIDE;
-    virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
-                               const SkPaint&) SK_OVERRIDE;
-    virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
-                                SkScalar constY, const SkPaint&) SK_OVERRIDE;
-    virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
-                                  const SkMatrix* matrix, const SkPaint&) SK_OVERRIDE;
-    virtual void onPushCull(const SkRect& cullRect) SK_OVERRIDE;
-    virtual void onPopCull() SK_OVERRIDE;
+    void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override;
+    void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
+                    const SkPaint&) override;
+    void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
+                       const SkPaint&) override;
+    void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
+                        SkScalar constY, const SkPaint&) override;
+    void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
+                          const SkMatrix* matrix, const SkPaint&) override;
+    void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
+                        const SkPaint& paint) override;
 
-    virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
-    virtual void onClipRegion(const SkRegion& region, SkRegion::Op) SK_OVERRIDE;
+    void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
+                     const SkPoint texCoords[4], SkXfermode* xmode, const SkPaint& paint) override;
+    void onDrawPaint(const SkPaint&) override;
 
-    virtual void onDrawPicture(const SkPicture* picture) SK_OVERRIDE;
+    void onDrawRect(const SkRect&, const SkPaint&) override;
+    void onDrawOval(const SkRect&, const SkPaint&) override;
+    void onDrawRRect(const SkRRect&, const SkPaint&) override;
+    void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override;
+    void onDrawVertices(VertexMode vmode, int vertexCount,
+                        const SkPoint vertices[], const SkPoint texs[],
+                        const SkColor colors[], SkXfermode* xmode,
+                        const uint16_t indices[], int indexCount,
+                        const SkPaint&) override;
+    void onDrawPath(const SkPath&, const SkPaint&) override;
+    void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) override;
+    void onDrawBitmapRect(const SkBitmap&, const SkRect* src, const SkRect& dst, const SkPaint*,
+                          SrcRectConstraint) override;
+    void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) override;
+    void onDrawImageRect(const SkImage*, const SkRect* src, const SkRect& dst,
+                         const SkPaint*, SrcRectConstraint) override;
+    void onDrawBitmapNine(const SkBitmap&, const SkIRect& center, const SkRect& dst,
+                          const SkPaint*) override;
+    void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) override;
+    void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) override;
+    void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) override;
+    void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) override;
+    void onClipRegion(const SkRegion& region, SkRegion::Op) override;
+
+    void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
 
     void markActiveCommands(int index);
 
 private:
     SkTDArray<SkDrawCommand*> fCommandVector;
     SkPicture* fPicture;
-    int fWidth;
-    int fHeight;
     bool fFilter;
     bool fMegaVizMode;
-    int fIndex;
     SkMatrix fUserMatrix;
     SkMatrix fMatrix;
     SkIRect fClip;
@@ -276,18 +229,10 @@ private:
     SkPath fSaveDevPath;
 
     bool fOverdrawViz;
-    SkDrawFilter* fOverdrawFilter;
+    bool fOverrideFilterQuality;
+    SkFilterQuality fFilterQuality;
 
-    bool fOverrideTexFiltering;
-    SkTexOverrideFilter* fTexOverrideFilter;
-
-    /**
-        Number of unmatched save() calls at any point during a draw.
-        If there are any saveLayer() calls outstanding, we need to resolve
-        all of them, which in practice means resolving all save() calls,
-        to avoid corruption of our canvas.
-    */
-    int fOutstandingSaveCount;
+    SkAutoTUnref<SkNWayCanvas> fPaintFilterCanvas;
 
     /**
         The active saveLayer commands at a given point in the renderering.
@@ -295,12 +240,6 @@ private:
     */
     SkTDArray<SkDrawCommand*> fActiveLayers;
 
-    /**
-        The active cull commands at a given point in the rendering.
-        Only used when "mega" visualization is enabled.
-    */
-    SkTDArray<SkDrawCommand*> fActiveCulls;
-
     /**
         Adds the command to the classes vector of commands.
         @param command  The draw command for execution
@@ -313,15 +252,6 @@ private:
      */
     void applyUserTransform(SkCanvas* canvas);
 
-    size_t getOpID() const {
-#if 0
-        if (NULL != fPicture) {
-            return fPicture->EXPERIMENTAL_curOpID();
-        }
-#endif
-        return 0;
-    }
-
     void resetClipStackData() { fClipStackData.reset(); fCalledAddStackData = false; }
 
     void addClipStackData(const SkPath& devPath, const SkPath& operand, SkRegion::Op elementOp);
@@ -332,6 +262,8 @@ private:
     void outputPointsCommon(const SkPoint* pts, int count);
     void outputScalar(SkScalar num);
 
+    void updatePaintFilterCanvas();
+
     typedef SkCanvas INHERITED;
 };
 
diff --git a/gfx/skia/skia/src/utils/debugger/SkDrawCommand.cpp b/gfx/skia/skia/src/utils/debugger/SkDrawCommand.cpp
index c50fa2d3f58a..66f0c14f2d2e 100644
--- a/gfx/skia/skia/src/utils/debugger/SkDrawCommand.cpp
+++ b/gfx/skia/skia/src/utils/debugger/SkDrawCommand.cpp
@@ -9,85 +9,73 @@
 
 #include "SkDrawCommand.h"
 #include "SkObjectParser.h"
+#include "SkPicture.h"
+#include "SkTextBlob.h"
 
 // TODO(chudy): Refactor into non subclass model.
 
-SkDrawCommand::SkDrawCommand(DrawType type)
-    : fDrawType(type)
-    , fOffset(0)
+SkDrawCommand::SkDrawCommand(OpType type)
+    : fOpType(type)
     , fVisible(true) {
 }
 
-SkDrawCommand::SkDrawCommand() {
-    fOffset = 0;
-    fVisible = true;
-}
-
 SkDrawCommand::~SkDrawCommand() {
     fInfo.deleteAll();
 }
 
-const char* SkDrawCommand::GetCommandString(DrawType type) {
+const char* SkDrawCommand::GetCommandString(OpType type) {
     switch (type) {
-        case UNUSED: SkDEBUGFAIL("DrawType UNUSED\n"); break;
-        case DRAW_CLEAR: return "Clear";
-        case CLIP_PATH: return "Clip Path";
-        case CLIP_REGION: return "Clip Region";
-        case CLIP_RECT: return "Clip Rect";
-        case CLIP_RRECT: return "Clip RRect";
-        case CONCAT: return "Concat";
-        case DRAW_BITMAP: return "Draw Bitmap";
-        case DRAW_BITMAP_MATRIX: return "Draw Bitmap Matrix";
-        case DRAW_BITMAP_NINE: return "Draw Bitmap Nine";
-        case DRAW_BITMAP_RECT_TO_RECT: return "Draw Bitmap Rect";
-        case DRAW_DATA: return "Draw Data";
-        case DRAW_OVAL: return "Draw Oval";
-        case DRAW_PAINT: return "Draw Paint";
-        case DRAW_PATH: return "Draw Path";
-        case DRAW_PICTURE: return "Draw Picture";
-        case DRAW_POINTS: return "Draw Points";
-        case DRAW_POS_TEXT: return "Draw Pos Text";
-        case DRAW_POS_TEXT_H: return "Draw Pos Text H";
-        case DRAW_RECT: return "Draw Rect";
-        case DRAW_RRECT: return "Draw RRect";
-        case DRAW_SPRITE: return "Draw Sprite";
-        case DRAW_TEXT: return "Draw Text";
-        case DRAW_TEXT_ON_PATH: return "Draw Text On Path";
-        case DRAW_VERTICES: return "Draw Vertices";
-        case RESTORE: return "Restore";
-        case ROTATE: return "Rotate";
-        case SAVE: return "Save";
-        case SAVE_LAYER: return "Save Layer";
-        case SCALE: return "Scale";
-        case SET_MATRIX: return "Set Matrix";
-        case SKEW: return "Skew";
-        case TRANSLATE: return "Translate";
-        case NOOP: return "NoOp";
-        case BEGIN_COMMENT_GROUP: return "BeginCommentGroup";
-        case COMMENT: return "Comment";
-        case END_COMMENT_GROUP: return "EndCommentGroup";
-        case DRAW_DRRECT: return "Draw DRRect";
-        case PUSH_CULL: return "PushCull";
-        case POP_CULL: return "PopCull";
+        case kBeginDrawPicture_OpType: return "BeginDrawPicture";
+        case kClipPath_OpType: return "ClipPath";
+        case kClipRegion_OpType: return "ClipRegion";
+        case kClipRect_OpType: return "ClipRect";
+        case kClipRRect_OpType: return "ClipRRect";
+        case kConcat_OpType: return "Concat";
+        case kDrawBitmap_OpType: return "DrawBitmap";
+        case kDrawBitmapNine_OpType: return "DrawBitmapNine";
+        case kDrawBitmapRect_OpType: return "DrawBitmapRect";
+        case kDrawClear_OpType: return "DrawClear";
+        case kDrawDRRect_OpType: return "DrawDRRect";
+        case kDrawImage_OpType: return "DrawImage";
+        case kDrawImageRect_OpType: return "DrawImageRect";
+        case kDrawOval_OpType: return "DrawOval";
+        case kDrawPaint_OpType: return "DrawPaint";
+        case kDrawPatch_OpType: return "DrawPatch";
+        case kDrawPath_OpType: return "DrawPath";
+        case kDrawPoints_OpType: return "DrawPoints";
+        case kDrawPosText_OpType: return "DrawPosText";
+        case kDrawPosTextH_OpType: return "DrawPosTextH";
+        case kDrawRect_OpType: return "DrawRect";
+        case kDrawRRect_OpType: return "DrawRRect";
+        case kDrawSprite_OpType: return "DrawSprite";
+        case kDrawText_OpType: return "DrawText";
+        case kDrawTextBlob_OpType: return "DrawTextBlob";
+        case kDrawTextOnPath_OpType: return "DrawTextOnPath";
+        case kDrawVertices_OpType: return "DrawVertices";
+        case kEndDrawPicture_OpType: return "EndDrawPicture";
+        case kRestore_OpType: return "Restore";
+        case kSave_OpType: return "Save";
+        case kSaveLayer_OpType: return "SaveLayer";
+        case kSetMatrix_OpType: return "SetMatrix";
         default:
-            SkDebugf("DrawType error 0x%08x\n", type);
+            SkDebugf("OpType error 0x%08x\n", type);
             SkASSERT(0);
             break;
     }
     SkDEBUGFAIL("DrawType UNUSED\n");
-    return NULL;
+    return nullptr;
 }
 
-SkString SkDrawCommand::toString() {
-    return SkString(GetCommandString(fDrawType));
+SkString SkDrawCommand::toString() const {
+    return SkString(GetCommandString(fOpType));
 }
 
-SkClearCommand::SkClearCommand(SkColor color) : INHERITED(DRAW_CLEAR) {
+SkClearCommand::SkClearCommand(SkColor color) : INHERITED(kDrawClear_OpType) {
     fColor = color;
     fInfo.push(SkObjectParser::CustomTextToString("No Parameters"));
 }
 
-void SkClearCommand::execute(SkCanvas* canvas) {
+void SkClearCommand::execute(SkCanvas* canvas) const {
     canvas->clear(fColor);
 }
 
@@ -112,10 +100,13 @@ void xlate_and_scale_to_bounds(SkCanvas* canvas, const SkRect& bounds) {
 
 void render_path(SkCanvas* canvas, const SkPath& path) {
     canvas->clear(0xFFFFFFFF);
-    canvas->save();
 
     const SkRect& bounds = path.getBounds();
+    if (bounds.isEmpty()) {
+        return;
+    }
 
+    SkAutoCanvasRestore acr(canvas, true);
     xlate_and_scale_to_bounds(canvas, bounds);
 
     SkPaint p;
@@ -123,10 +114,9 @@ void render_path(SkCanvas* canvas, const SkPath& path) {
     p.setStyle(SkPaint::kStroke_Style);
 
     canvas->drawPath(path, p);
-    canvas->restore();
 }
 
-void render_bitmap(SkCanvas* canvas, const SkBitmap& input, const SkRect* srcRect = NULL) {
+void render_bitmap(SkCanvas* canvas, const SkBitmap& input, const SkRect* srcRect = nullptr) {
     const SkISize& size = canvas->getDeviceSize();
 
     SkScalar xScale = SkIntToScalar(size.fWidth-2) / input.width();
@@ -142,10 +132,28 @@ void render_bitmap(SkCanvas* canvas, const SkBitmap& input, const SkRect* srcRec
                                   xScale * input.width(),
                                   yScale * input.height());
 
-    canvas->clear(0xFFFFFFFF);
-    canvas->drawBitmapRect(input, NULL, dst);
+    static const int kNumBlocks = 8;
 
-    if (NULL != srcRect) {
+    canvas->clear(0xFFFFFFFF);
+    SkISize block = {
+        canvas->imageInfo().width()/kNumBlocks,
+        canvas->imageInfo().height()/kNumBlocks
+    };
+    for (int y = 0; y < kNumBlocks; ++y) {
+        for (int x = 0; x < kNumBlocks; ++x) {
+            SkPaint paint;
+            paint.setColor((x+y)%2 ? SK_ColorLTGRAY : SK_ColorDKGRAY);
+            SkRect r = SkRect::MakeXYWH(SkIntToScalar(x*block.width()),
+                                        SkIntToScalar(y*block.height()),
+                                        SkIntToScalar(block.width()),
+                                        SkIntToScalar(block.height()));
+            canvas->drawRect(r, paint);
+        }
+    }
+
+    canvas->drawBitmapRect(input, dst, nullptr);
+
+    if (srcRect) {
         SkRect r = SkRect::MakeLTRB(srcRect->fLeft * xScale + SK_Scalar1,
                                     srcRect->fTop * yScale + SK_Scalar1,
                                     srcRect->fRight * xScale + SK_Scalar1,
@@ -194,7 +202,7 @@ void render_drrect(SkCanvas* canvas, const SkRRect& outer, const SkRRect& inner)
 
 
 SkClipPathCommand::SkClipPathCommand(const SkPath& path, SkRegion::Op op, bool doAA)
-    : INHERITED(CLIP_PATH) {
+    : INHERITED(kClipPath_OpType) {
     fPath = path;
     fOp = op;
     fDoAA = doAA;
@@ -204,7 +212,7 @@ SkClipPathCommand::SkClipPathCommand(const SkPath& path, SkRegion::Op op, bool d
     fInfo.push(SkObjectParser::BoolToString(doAA));
 }
 
-void SkClipPathCommand::execute(SkCanvas* canvas) {
+void SkClipPathCommand::execute(SkCanvas* canvas) const {
     canvas->clipPath(fPath, fOp, fDoAA);
 }
 
@@ -214,7 +222,7 @@ bool SkClipPathCommand::render(SkCanvas* canvas) const {
 }
 
 SkClipRegionCommand::SkClipRegionCommand(const SkRegion& region, SkRegion::Op op)
-    : INHERITED(CLIP_REGION) {
+    : INHERITED(kClipRegion_OpType) {
     fRegion = region;
     fOp = op;
 
@@ -222,12 +230,12 @@ SkClipRegionCommand::SkClipRegionCommand(const SkRegion& region, SkRegion::Op op
     fInfo.push(SkObjectParser::RegionOpToString(op));
 }
 
-void SkClipRegionCommand::execute(SkCanvas* canvas) {
+void SkClipRegionCommand::execute(SkCanvas* canvas) const {
     canvas->clipRegion(fRegion, fOp);
 }
 
 SkClipRectCommand::SkClipRectCommand(const SkRect& rect, SkRegion::Op op, bool doAA)
-    : INHERITED(CLIP_RECT) {
+    : INHERITED(kClipRect_OpType) {
     fRect = rect;
     fOp = op;
     fDoAA = doAA;
@@ -237,12 +245,12 @@ SkClipRectCommand::SkClipRectCommand(const SkRect& rect, SkRegion::Op op, bool d
     fInfo.push(SkObjectParser::BoolToString(doAA));
 }
 
-void SkClipRectCommand::execute(SkCanvas* canvas) {
+void SkClipRectCommand::execute(SkCanvas* canvas) const {
     canvas->clipRect(fRect, fOp, fDoAA);
 }
 
 SkClipRRectCommand::SkClipRRectCommand(const SkRRect& rrect, SkRegion::Op op, bool doAA)
-    : INHERITED(CLIP_RRECT) {
+    : INHERITED(kClipRRect_OpType) {
     fRRect = rrect;
     fOp = op;
     fDoAA = doAA;
@@ -252,7 +260,7 @@ SkClipRRectCommand::SkClipRRectCommand(const SkRRect& rrect, SkRegion::Op op, bo
     fInfo.push(SkObjectParser::BoolToString(doAA));
 }
 
-void SkClipRRectCommand::execute(SkCanvas* canvas) {
+void SkClipRRectCommand::execute(SkCanvas* canvas) const {
     canvas->clipRRect(fRRect, fOp, fDoAA);
 }
 
@@ -262,38 +270,38 @@ bool SkClipRRectCommand::render(SkCanvas* canvas) const {
 }
 
 SkConcatCommand::SkConcatCommand(const SkMatrix& matrix)
-    : INHERITED(CONCAT) {
+    : INHERITED(kConcat_OpType) {
     fMatrix = matrix;
 
     fInfo.push(SkObjectParser::MatrixToString(matrix));
 }
 
-void SkConcatCommand::execute(SkCanvas* canvas) {
+void SkConcatCommand::execute(SkCanvas* canvas) const {
     canvas->concat(fMatrix);
 }
 
 SkDrawBitmapCommand::SkDrawBitmapCommand(const SkBitmap& bitmap, SkScalar left, SkScalar top,
-                       const SkPaint* paint)
-    : INHERITED(DRAW_BITMAP) {
+                                         const SkPaint* paint)
+    : INHERITED(kDrawBitmap_OpType) {
     fBitmap = bitmap;
     fLeft = left;
     fTop = top;
-    if (NULL != paint) {
+    if (paint) {
         fPaint = *paint;
         fPaintPtr = &fPaint;
     } else {
-        fPaintPtr = NULL;
+        fPaintPtr = nullptr;
     }
 
     fInfo.push(SkObjectParser::BitmapToString(bitmap));
     fInfo.push(SkObjectParser::ScalarToString(left, "SkScalar left: "));
     fInfo.push(SkObjectParser::ScalarToString(top, "SkScalar top: "));
-    if (NULL != paint) {
+    if (paint) {
         fInfo.push(SkObjectParser::PaintToString(*paint));
     }
 }
 
-void SkDrawBitmapCommand::execute(SkCanvas* canvas) {
+void SkDrawBitmapCommand::execute(SkCanvas* canvas) const {
     canvas->drawBitmap(fBitmap, fLeft, fTop, fPaintPtr);
 }
 
@@ -302,98 +310,70 @@ bool SkDrawBitmapCommand::render(SkCanvas* canvas) const {
     return true;
 }
 
-SkDrawBitmapMatrixCommand::SkDrawBitmapMatrixCommand(const SkBitmap& bitmap,
-                                                     const SkMatrix& matrix,
-                                                     const SkPaint* paint)
-    : INHERITED(DRAW_BITMAP_MATRIX) {
-    fBitmap = bitmap;
-    fMatrix = matrix;
-    if (NULL != paint) {
-        fPaint = *paint;
-        fPaintPtr = &fPaint;
-    } else {
-        fPaintPtr = NULL;
-    }
-
-    fInfo.push(SkObjectParser::BitmapToString(bitmap));
-    fInfo.push(SkObjectParser::MatrixToString(matrix));
-    if (NULL != paint) {
-        fInfo.push(SkObjectParser::PaintToString(*paint));
-    }
-}
-
-void SkDrawBitmapMatrixCommand::execute(SkCanvas* canvas) {
-    canvas->drawBitmapMatrix(fBitmap, fMatrix, fPaintPtr);
-}
-
-bool SkDrawBitmapMatrixCommand::render(SkCanvas* canvas) const {
-    render_bitmap(canvas, fBitmap);
-    return true;
-}
-
 SkDrawBitmapNineCommand::SkDrawBitmapNineCommand(const SkBitmap& bitmap, const SkIRect& center,
                                                  const SkRect& dst, const SkPaint* paint)
-    : INHERITED(DRAW_BITMAP_NINE) {
+    : INHERITED(kDrawBitmapNine_OpType) {
     fBitmap = bitmap;
     fCenter = center;
     fDst = dst;
-    if (NULL != paint) {
+    if (paint) {
         fPaint = *paint;
         fPaintPtr = &fPaint;
     } else {
-        fPaintPtr = NULL;
+        fPaintPtr = nullptr;
     }
 
     fInfo.push(SkObjectParser::BitmapToString(bitmap));
     fInfo.push(SkObjectParser::IRectToString(center));
     fInfo.push(SkObjectParser::RectToString(dst, "Dst: "));
-    if (NULL != paint) {
+    if (paint) {
         fInfo.push(SkObjectParser::PaintToString(*paint));
     }
 }
 
-void SkDrawBitmapNineCommand::execute(SkCanvas* canvas) {
+void SkDrawBitmapNineCommand::execute(SkCanvas* canvas) const {
     canvas->drawBitmapNine(fBitmap, fCenter, fDst, fPaintPtr);
 }
 
 bool SkDrawBitmapNineCommand::render(SkCanvas* canvas) const {
-    render_bitmap(canvas, fBitmap);
+    SkRect tmp = SkRect::Make(fCenter);
+    render_bitmap(canvas, fBitmap, &tmp);
     return true;
 }
 
 SkDrawBitmapRectCommand::SkDrawBitmapRectCommand(const SkBitmap& bitmap, const SkRect* src,
                                                  const SkRect& dst, const SkPaint* paint,
-                                                 SkCanvas::DrawBitmapRectFlags flags)
-    : INHERITED(DRAW_BITMAP_RECT_TO_RECT) {
+                                                 SkCanvas::SrcRectConstraint constraint)
+    : INHERITED(kDrawBitmapRect_OpType) {
     fBitmap = bitmap;
-    if (NULL != src) {
+    if (src) {
         fSrc = *src;
     } else {
         fSrc.setEmpty();
     }
     fDst = dst;
 
-    if (NULL != paint) {
+    if (paint) {
         fPaint = *paint;
         fPaintPtr = &fPaint;
     } else {
-        fPaintPtr = NULL;
+        fPaintPtr = nullptr;
     }
-    fFlags = flags;
+    fConstraint = constraint;
 
     fInfo.push(SkObjectParser::BitmapToString(bitmap));
-    if (NULL != src) {
+    if (src) {
         fInfo.push(SkObjectParser::RectToString(*src, "Src: "));
     }
     fInfo.push(SkObjectParser::RectToString(dst, "Dst: "));
-    if (NULL != paint) {
+    if (paint) {
         fInfo.push(SkObjectParser::PaintToString(*paint));
     }
-    fInfo.push(SkObjectParser::IntToString(fFlags, "Flags: "));
+    fInfo.push(SkObjectParser::IntToString(fConstraint, "Constraint: "));
 }
 
-void SkDrawBitmapRectCommand::execute(SkCanvas* canvas) {
-    canvas->drawBitmapRectToRect(fBitmap, this->srcRect(), fDst, fPaintPtr, fFlags);
+void SkDrawBitmapRectCommand::execute(SkCanvas* canvas) const {
+    canvas->legacy_drawBitmapRect(fBitmap, this->srcRect(), fDst, fPaintPtr, fConstraint);
 }
 
 bool SkDrawBitmapRectCommand::render(SkCanvas* canvas) const {
@@ -401,45 +381,81 @@ bool SkDrawBitmapRectCommand::render(SkCanvas* canvas) const {
     return true;
 }
 
-SkDrawDataCommand::SkDrawDataCommand(const void* data, size_t length)
-    : INHERITED(DRAW_DATA) {
-    fData = new char[length];
-    memcpy(fData, data, length);
-    fLength = length;
+SkDrawImageCommand::SkDrawImageCommand(const SkImage* image, SkScalar left, SkScalar top,
+                                       const SkPaint* paint)
+    : INHERITED(kDrawImage_OpType)
+    , fImage(SkRef(image))
+    , fLeft(left)
+    , fTop(top) {
 
-    // TODO: add display of actual data?
-    SkString* str = new SkString;
-    str->appendf("length: %d", (int) length);
-    fInfo.push(str);
+    fInfo.push(SkObjectParser::ImageToString(image));
+    fInfo.push(SkObjectParser::ScalarToString(left, "Left: "));
+    fInfo.push(SkObjectParser::ScalarToString(top, "Top: "));
+
+    if (paint) {
+        fPaint.set(*paint);
+        fInfo.push(SkObjectParser::PaintToString(*paint));
+    }
 }
 
-void SkDrawDataCommand::execute(SkCanvas* canvas) {
-    canvas->drawData(fData, fLength);
+void SkDrawImageCommand::execute(SkCanvas* canvas) const {
+    canvas->drawImage(fImage, fLeft, fTop, fPaint.getMaybeNull());
 }
 
-SkBeginCommentGroupCommand::SkBeginCommentGroupCommand(const char* description)
-    : INHERITED(BEGIN_COMMENT_GROUP)
-    , fDescription(description) {
-    SkString* temp = new SkString;
-    temp->appendf("Description: %s", description);
-    fInfo.push(temp);
+bool SkDrawImageCommand::render(SkCanvas* canvas) const {
+    SkAutoCanvasRestore acr(canvas, true);
+    canvas->clear(0xFFFFFFFF);
+
+    xlate_and_scale_to_bounds(canvas, SkRect::MakeXYWH(fLeft, fTop,
+                                                       SkIntToScalar(fImage->width()),
+                                                       SkIntToScalar(fImage->height())));
+    this->execute(canvas);
+    return true;
 }
 
-SkCommentCommand::SkCommentCommand(const char* kywd, const char* value)
-    : INHERITED(COMMENT)
-    , fKywd(kywd)
-    , fValue(value) {
-    SkString* temp = new SkString;
-    temp->appendf("%s: %s", kywd, value);
-    fInfo.push(temp);
+SkDrawImageRectCommand::SkDrawImageRectCommand(const SkImage* image, const SkRect* src,
+                                               const SkRect& dst, const SkPaint* paint,
+                                               SkCanvas::SrcRectConstraint constraint)
+    : INHERITED(kDrawImageRect_OpType)
+    , fImage(SkRef(image))
+    , fDst(dst)
+    , fConstraint(constraint) {
+
+    if (src) {
+        fSrc.set(*src);
+    }
+
+    if (paint) {
+        fPaint.set(*paint);
+    }
+
+    fInfo.push(SkObjectParser::ImageToString(image));
+    if (src) {
+        fInfo.push(SkObjectParser::RectToString(*src, "Src: "));
+    }
+    fInfo.push(SkObjectParser::RectToString(dst, "Dst: "));
+    if (paint) {
+        fInfo.push(SkObjectParser::PaintToString(*paint));
+    }
+    fInfo.push(SkObjectParser::IntToString(fConstraint, "Constraint: "));
 }
 
-SkEndCommentGroupCommand::SkEndCommentGroupCommand()
-    : INHERITED(END_COMMENT_GROUP) {
+void SkDrawImageRectCommand::execute(SkCanvas* canvas) const {
+    canvas->legacy_drawImageRect(fImage, fSrc.getMaybeNull(), fDst, fPaint.getMaybeNull(), fConstraint);
+}
+
+bool SkDrawImageRectCommand::render(SkCanvas* canvas) const {
+    SkAutoCanvasRestore acr(canvas, true);
+    canvas->clear(0xFFFFFFFF);
+
+    xlate_and_scale_to_bounds(canvas, fDst);
+
+    this->execute(canvas);
+    return true;
 }
 
 SkDrawOvalCommand::SkDrawOvalCommand(const SkRect& oval, const SkPaint& paint)
-    : INHERITED(DRAW_OVAL) {
+    : INHERITED(kDrawOval_OpType) {
     fOval = oval;
     fPaint = paint;
 
@@ -447,7 +463,7 @@ SkDrawOvalCommand::SkDrawOvalCommand(const SkRect& oval, const SkPaint& paint)
     fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
-void SkDrawOvalCommand::execute(SkCanvas* canvas) {
+void SkDrawOvalCommand::execute(SkCanvas* canvas) const {
     canvas->drawOval(fOval, fPaint);
 }
 
@@ -468,13 +484,13 @@ bool SkDrawOvalCommand::render(SkCanvas* canvas) const {
 }
 
 SkDrawPaintCommand::SkDrawPaintCommand(const SkPaint& paint)
-    : INHERITED(DRAW_PAINT) {
+    : INHERITED(kDrawPaint_OpType) {
     fPaint = paint;
 
     fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
-void SkDrawPaintCommand::execute(SkCanvas* canvas) {
+void SkDrawPaintCommand::execute(SkCanvas* canvas) const {
     canvas->drawPaint(fPaint);
 }
 
@@ -485,7 +501,7 @@ bool SkDrawPaintCommand::render(SkCanvas* canvas) const {
 }
 
 SkDrawPathCommand::SkDrawPathCommand(const SkPath& path, const SkPaint& paint)
-    : INHERITED(DRAW_PATH) {
+    : INHERITED(kDrawPath_OpType) {
     fPath = path;
     fPaint = paint;
 
@@ -493,7 +509,7 @@ SkDrawPathCommand::SkDrawPathCommand(const SkPath& path, const SkPaint& paint)
     fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
-void SkDrawPathCommand::execute(SkCanvas* canvas) {
+void SkDrawPathCommand::execute(SkCanvas* canvas) const {
     canvas->drawPath(fPath, fPaint);
 }
 
@@ -502,25 +518,52 @@ bool SkDrawPathCommand::render(SkCanvas* canvas) const {
     return true;
 }
 
-SkDrawPictureCommand::SkDrawPictureCommand(const SkPicture* picture)
-    : INHERITED(DRAW_PICTURE)
+SkBeginDrawPictureCommand::SkBeginDrawPictureCommand(const SkPicture* picture,
+                                                     const SkMatrix* matrix,
+                                                     const SkPaint* paint)
+    : INHERITED(kBeginDrawPicture_OpType)
     , fPicture(SkRef(picture)) {
-    SkString* temp = new SkString;
-    temp->appendf("SkPicture: W: %d H: %d", picture->width(), picture->height());
-    fInfo.push(temp);
+
+    SkString* str = new SkString;
+    str->appendf("SkPicture: L: %f T: %f R: %f B: %f",
+                 picture->cullRect().fLeft, picture->cullRect().fTop,
+                 picture->cullRect().fRight, picture->cullRect().fBottom);
+    fInfo.push(str);
+
+    if (matrix) {
+        fMatrix.set(*matrix);
+        fInfo.push(SkObjectParser::MatrixToString(*matrix));
+    }
+
+    if (paint) {
+        fPaint.set(*paint);
+        fInfo.push(SkObjectParser::PaintToString(*paint));
+    }
+
 }
 
-void SkDrawPictureCommand::execute(SkCanvas* canvas) {
-    canvas->drawPicture(fPicture);
+void SkBeginDrawPictureCommand::execute(SkCanvas* canvas) const {
+    if (fPaint.isValid()) {
+        SkRect bounds = fPicture->cullRect();
+        if (fMatrix.isValid()) {
+            fMatrix.get()->mapRect(&bounds);
+        }
+        canvas->saveLayer(&bounds, fPaint.get());
+    }
+
+    if (fMatrix.isValid()) {
+        if (!fPaint.isValid()) {
+            canvas->save();
+        }
+        canvas->concat(*fMatrix.get());
+    }
 }
 
-bool SkDrawPictureCommand::render(SkCanvas* canvas) const {
+bool SkBeginDrawPictureCommand::render(SkCanvas* canvas) const {
     canvas->clear(0xFFFFFFFF);
     canvas->save();
 
-    SkRect bounds = SkRect::MakeWH(SkIntToScalar(fPicture->width()),
-                                   SkIntToScalar(fPicture->height()));
-    xlate_and_scale_to_bounds(canvas, bounds);
+    xlate_and_scale_to_bounds(canvas, fPicture->cullRect());
 
     canvas->drawPicture(fPicture.get());
 
@@ -529,9 +572,18 @@ bool SkDrawPictureCommand::render(SkCanvas* canvas) const {
     return true;
 }
 
+SkEndDrawPictureCommand::SkEndDrawPictureCommand(bool restore)
+    : INHERITED(kEndDrawPicture_OpType) , fRestore(restore) { }
+
+void SkEndDrawPictureCommand::execute(SkCanvas* canvas) const {
+    if (fRestore) {
+        canvas->restore();
+    }
+}
+
 SkDrawPointsCommand::SkDrawPointsCommand(SkCanvas::PointMode mode, size_t count,
                                          const SkPoint pts[], const SkPaint& paint)
-    : INHERITED(DRAW_POINTS) {
+    : INHERITED(kDrawPoints_OpType) {
     fMode = mode;
     fCount = count;
     fPts = new SkPoint[count];
@@ -545,7 +597,7 @@ SkDrawPointsCommand::SkDrawPointsCommand(SkCanvas::PointMode mode, size_t count,
     fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
-void SkDrawPointsCommand::execute(SkCanvas* canvas) {
+void SkDrawPointsCommand::execute(SkCanvas* canvas) const {
     canvas->drawPoints(fMode, fCount, fPts, fPaint);
 }
 
@@ -574,7 +626,7 @@ bool SkDrawPointsCommand::render(SkCanvas* canvas) const {
 
 SkDrawPosTextCommand::SkDrawPosTextCommand(const void* text, size_t byteLength,
                                            const SkPoint pos[], const SkPaint& paint)
-    : INHERITED(DRAW_POS_TEXT) {
+    : INHERITED(kDrawPosText_OpType) {
     size_t numPts = paint.countText(text, byteLength);
 
     fText = new char[byteLength];
@@ -592,7 +644,7 @@ SkDrawPosTextCommand::SkDrawPosTextCommand(const void* text, size_t byteLength,
     fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
-void SkDrawPosTextCommand::execute(SkCanvas* canvas) {
+void SkDrawPosTextCommand::execute(SkCanvas* canvas) const {
     canvas->drawPosText(fText, fByteLength, fPos, fPaint);
 }
 
@@ -600,7 +652,7 @@ void SkDrawPosTextCommand::execute(SkCanvas* canvas) {
 SkDrawPosTextHCommand::SkDrawPosTextHCommand(const void* text, size_t byteLength,
                                              const SkScalar xpos[], SkScalar constY,
                                              const SkPaint& paint)
-    : INHERITED(DRAW_POS_TEXT_H) {
+    : INHERITED(kDrawPosTextH_OpType) {
     size_t numPts = paint.countText(text, byteLength);
 
     fText = new char[byteLength];
@@ -619,12 +671,64 @@ SkDrawPosTextHCommand::SkDrawPosTextHCommand(const void* text, size_t byteLength
     fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
-void SkDrawPosTextHCommand::execute(SkCanvas* canvas) {
+void SkDrawPosTextHCommand::execute(SkCanvas* canvas) const {
     canvas->drawPosTextH(fText, fByteLength, fXpos, fConstY, fPaint);
 }
 
+SkDrawTextBlobCommand::SkDrawTextBlobCommand(const SkTextBlob* blob, SkScalar x, SkScalar y,
+                                             const SkPaint& paint)
+    : INHERITED(kDrawTextBlob_OpType)
+    , fBlob(blob)
+    , fXPos(x)
+    , fYPos(y)
+    , fPaint(paint) {
+
+    blob->ref();
+
+    // FIXME: push blob info
+    fInfo.push(SkObjectParser::ScalarToString(x, "XPOS: "));
+    fInfo.push(SkObjectParser::ScalarToString(y, "YPOS: "));
+    fInfo.push(SkObjectParser::RectToString(fBlob->bounds(), "Bounds: "));
+    fInfo.push(SkObjectParser::PaintToString(paint));
+}
+
+void SkDrawTextBlobCommand::execute(SkCanvas* canvas) const {
+    canvas->drawTextBlob(fBlob, fXPos, fYPos, fPaint);
+}
+
+bool SkDrawTextBlobCommand::render(SkCanvas* canvas) const {
+    canvas->clear(SK_ColorWHITE);
+    canvas->save();
+
+    SkRect bounds = fBlob->bounds().makeOffset(fXPos, fYPos);
+    xlate_and_scale_to_bounds(canvas, bounds);
+
+    canvas->drawTextBlob(fBlob.get(), fXPos, fYPos, fPaint);
+
+    canvas->restore();
+
+    return true;
+}
+
+SkDrawPatchCommand::SkDrawPatchCommand(const SkPoint cubics[12], const SkColor colors[4],
+                                       const SkPoint texCoords[4], SkXfermode* xfermode,
+                                       const SkPaint& paint)
+    : INHERITED(kDrawPatch_OpType) {
+    memcpy(fCubics, cubics, sizeof(fCubics));
+    memcpy(fColors, colors, sizeof(fColors));
+    memcpy(fTexCoords, texCoords, sizeof(fTexCoords));
+    fXfermode.reset(xfermode);
+    fPaint = paint;
+
+    fInfo.push(SkObjectParser::PaintToString(paint));
+}
+
+void SkDrawPatchCommand::execute(SkCanvas* canvas) const {
+    canvas->drawPatch(fCubics, fColors, fTexCoords, fXfermode, fPaint);
+}
+
 SkDrawRectCommand::SkDrawRectCommand(const SkRect& rect, const SkPaint& paint)
-    : INHERITED(DRAW_RECT) {
+    : INHERITED(kDrawRect_OpType) {
     fRect = rect;
     fPaint = paint;
 
@@ -632,12 +736,12 @@ SkDrawRectCommand::SkDrawRectCommand(const SkRect& rect, const SkPaint& paint)
     fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
-void SkDrawRectCommand::execute(SkCanvas* canvas) {
+void SkDrawRectCommand::execute(SkCanvas* canvas) const {
     canvas->drawRect(fRect, fPaint);
 }
 
 SkDrawRRectCommand::SkDrawRRectCommand(const SkRRect& rrect, const SkPaint& paint)
-    : INHERITED(DRAW_RRECT) {
+    : INHERITED(kDrawRRect_OpType) {
     fRRect = rrect;
     fPaint = paint;
 
@@ -645,7 +749,7 @@ SkDrawRRectCommand::SkDrawRRectCommand(const SkRRect& rrect, const SkPaint& pain
     fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
-void SkDrawRRectCommand::execute(SkCanvas* canvas) {
+void SkDrawRRectCommand::execute(SkCanvas* canvas) const {
     canvas->drawRRect(fRRect, fPaint);
 }
 
@@ -657,7 +761,7 @@ bool SkDrawRRectCommand::render(SkCanvas* canvas) const {
 SkDrawDRRectCommand::SkDrawDRRectCommand(const SkRRect& outer,
                                          const SkRRect& inner,
                                          const SkPaint& paint)
-    : INHERITED(DRAW_DRRECT) {
+    : INHERITED(kDrawDRRect_OpType) {
     fOuter = outer;
     fInner = inner;
     fPaint = paint;
@@ -667,7 +771,7 @@ SkDrawDRRectCommand::SkDrawDRRectCommand(const SkRRect& outer,
     fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
-void SkDrawDRRectCommand::execute(SkCanvas* canvas) {
+void SkDrawDRRectCommand::execute(SkCanvas* canvas) const {
     canvas->drawDRRect(fOuter, fInner, fPaint);
 }
 
@@ -678,26 +782,26 @@ bool SkDrawDRRectCommand::render(SkCanvas* canvas) const {
 
 SkDrawSpriteCommand::SkDrawSpriteCommand(const SkBitmap& bitmap, int left, int top,
                                          const SkPaint* paint)
-    : INHERITED(DRAW_SPRITE) {
+    : INHERITED(kDrawSprite_OpType) {
     fBitmap = bitmap;
     fLeft = left;
     fTop = top;
-    if (NULL != paint) {
+    if (paint) {
         fPaint = *paint;
         fPaintPtr = &fPaint;
     } else {
-        fPaintPtr = NULL;
+        fPaintPtr = nullptr;
     }
 
     fInfo.push(SkObjectParser::BitmapToString(bitmap));
     fInfo.push(SkObjectParser::IntToString(left, "Left: "));
     fInfo.push(SkObjectParser::IntToString(top, "Top: "));
-    if (NULL != paint) {
+    if (paint) {
         fInfo.push(SkObjectParser::PaintToString(*paint));
     }
 }
 
-void SkDrawSpriteCommand::execute(SkCanvas* canvas) {
+void SkDrawSpriteCommand::execute(SkCanvas* canvas) const {
     canvas->drawSprite(fBitmap, fLeft, fTop, fPaintPtr);
 }
 
@@ -708,7 +812,7 @@ bool SkDrawSpriteCommand::render(SkCanvas* canvas) const {
 
 SkDrawTextCommand::SkDrawTextCommand(const void* text, size_t byteLength, SkScalar x, SkScalar y,
                                      const SkPaint& paint)
-    : INHERITED(DRAW_TEXT) {
+    : INHERITED(kDrawText_OpType) {
     fText = new char[byteLength];
     memcpy(fText, text, byteLength);
     fByteLength = byteLength;
@@ -722,19 +826,19 @@ SkDrawTextCommand::SkDrawTextCommand(const void* text, size_t byteLength, SkScal
     fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
-void SkDrawTextCommand::execute(SkCanvas* canvas) {
+void SkDrawTextCommand::execute(SkCanvas* canvas) const {
     canvas->drawText(fText, fByteLength, fX, fY, fPaint);
 }
 
 SkDrawTextOnPathCommand::SkDrawTextOnPathCommand(const void* text, size_t byteLength,
                                                  const SkPath& path, const SkMatrix* matrix,
                                                  const SkPaint& paint)
-    : INHERITED(DRAW_TEXT_ON_PATH) {
+    : INHERITED(kDrawTextOnPath_OpType) {
     fText = new char[byteLength];
     memcpy(fText, text, byteLength);
     fByteLength = byteLength;
     fPath = path;
-    if (NULL != matrix) {
+    if (matrix) {
         fMatrix = *matrix;
     } else {
         fMatrix.setIdentity();
@@ -743,15 +847,15 @@ SkDrawTextOnPathCommand::SkDrawTextOnPathCommand(const void* text, size_t byteLe
 
     fInfo.push(SkObjectParser::TextToString(text, byteLength, paint.getTextEncoding()));
     fInfo.push(SkObjectParser::PathToString(path));
-    if (NULL != matrix) {
+    if (matrix) {
         fInfo.push(SkObjectParser::MatrixToString(*matrix));
     }
     fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
-void SkDrawTextOnPathCommand::execute(SkCanvas* canvas) {
+void SkDrawTextOnPathCommand::execute(SkCanvas* canvas) const {
     canvas->drawTextOnPath(fText, fByteLength, fPath,
-                           fMatrix.isIdentity() ? NULL : &fMatrix,
+                           fMatrix.isIdentity() ? nullptr : &fMatrix,
                            fPaint);
 }
 
@@ -760,7 +864,7 @@ SkDrawVerticesCommand::SkDrawVerticesCommand(SkCanvas::VertexMode vmode, int ver
                                              const SkColor colors[], SkXfermode* xfermode,
                                              const uint16_t indices[], int indexCount,
                                              const SkPaint& paint)
-    : INHERITED(DRAW_VERTICES) {
+    : INHERITED(kDrawVertices_OpType) {
     fVmode = vmode;
 
     fVertexCount = vertexCount;
@@ -768,22 +872,22 @@ SkDrawVerticesCommand::SkDrawVerticesCommand(SkCanvas::VertexMode vmode, int ver
     fVertices = new SkPoint[vertexCount];
     memcpy(fVertices, vertices, vertexCount * sizeof(SkPoint));
 
-    if (NULL != texs) {
+    if (texs) {
         fTexs = new SkPoint[vertexCount];
         memcpy(fTexs, texs, vertexCount * sizeof(SkPoint));
     } else {
-        fTexs = NULL;
+        fTexs = nullptr;
     }
 
-    if (NULL != colors) {
+    if (colors) {
         fColors = new SkColor[vertexCount];
         memcpy(fColors, colors, vertexCount * sizeof(SkColor));
     } else {
-        fColors = NULL;
+        fColors = nullptr;
     }
 
     fXfermode = xfermode;
-    if (NULL != fXfermode) {
+    if (fXfermode) {
         fXfermode->ref();
     }
 
@@ -791,7 +895,7 @@ SkDrawVerticesCommand::SkDrawVerticesCommand(SkCanvas::VertexMode vmode, int ver
         fIndices = new uint16_t[indexCount];
         memcpy(fIndices, indices, indexCount * sizeof(uint16_t));
     } else {
-        fIndices = NULL;
+        fIndices = nullptr;
     }
 
     fIndexCount = indexCount;
@@ -810,159 +914,79 @@ SkDrawVerticesCommand::~SkDrawVerticesCommand() {
     delete [] fIndices;
 }
 
-void SkDrawVerticesCommand::execute(SkCanvas* canvas) {
+void SkDrawVerticesCommand::execute(SkCanvas* canvas) const {
     canvas->drawVertices(fVmode, fVertexCount, fVertices,
                          fTexs, fColors, fXfermode, fIndices,
                          fIndexCount, fPaint);
 }
 
 SkRestoreCommand::SkRestoreCommand()
-    : INHERITED(RESTORE) {
+    : INHERITED(kRestore_OpType) {
     fInfo.push(SkObjectParser::CustomTextToString("No Parameters"));
 }
 
-void SkRestoreCommand::execute(SkCanvas* canvas) {
+void SkRestoreCommand::execute(SkCanvas* canvas) const {
     canvas->restore();
 }
 
-void SkRestoreCommand::trackSaveState(int* state) {
-    (*state)--;
-}
-
-SkRotateCommand::SkRotateCommand(SkScalar degrees)
-    : INHERITED(ROTATE) {
-    fDegrees = degrees;
-
-    fInfo.push(SkObjectParser::ScalarToString(degrees, "SkScalar degrees: "));
-}
-
-void SkRotateCommand::execute(SkCanvas* canvas) {
-    canvas->rotate(fDegrees);
-}
-
 SkSaveCommand::SkSaveCommand()
-    : INHERITED(SAVE) {
+    : INHERITED(kSave_OpType) {
 }
 
-void SkSaveCommand::execute(SkCanvas* canvas) {
+void SkSaveCommand::execute(SkCanvas* canvas) const {
     canvas->save();
 }
 
-void SkSaveCommand::trackSaveState(int* state) {
-    (*state)++;
-}
-
 SkSaveLayerCommand::SkSaveLayerCommand(const SkRect* bounds, const SkPaint* paint,
                                        SkCanvas::SaveFlags flags)
-    : INHERITED(SAVE_LAYER) {
-    if (NULL != bounds) {
+    : INHERITED(kSaveLayer_OpType) {
+    if (bounds) {
         fBounds = *bounds;
     } else {
         fBounds.setEmpty();
     }
 
-    if (NULL != paint) {
+    if (paint) {
         fPaint = *paint;
         fPaintPtr = &fPaint;
     } else {
-        fPaintPtr = NULL;
+        fPaintPtr = nullptr;
     }
     fFlags = flags;
 
-    if (NULL != bounds) {
+    if (bounds) {
         fInfo.push(SkObjectParser::RectToString(*bounds, "Bounds: "));
     }
-    if (NULL != paint) {
+    if (paint) {
         fInfo.push(SkObjectParser::PaintToString(*paint));
     }
     fInfo.push(SkObjectParser::SaveFlagsToString(flags));
 }
 
-void SkSaveLayerCommand::execute(SkCanvas* canvas) {
-    canvas->saveLayer(fBounds.isEmpty() ? NULL : &fBounds,
+void SkSaveLayerCommand::execute(SkCanvas* canvas) const {
+    canvas->saveLayer(fBounds.isEmpty() ? nullptr : &fBounds,
                       fPaintPtr,
                       fFlags);
 }
 
-void SkSaveLayerCommand::vizExecute(SkCanvas* canvas) {
+void SkSaveLayerCommand::vizExecute(SkCanvas* canvas) const {
     canvas->save();
 }
 
-void SkSaveLayerCommand::trackSaveState(int* state) {
-    (*state)++;
-}
-
-SkScaleCommand::SkScaleCommand(SkScalar sx, SkScalar sy)
-    : INHERITED(SCALE) {
-    fSx = sx;
-    fSy = sy;
-
-    fInfo.push(SkObjectParser::ScalarToString(sx, "SkScalar sx: "));
-    fInfo.push(SkObjectParser::ScalarToString(sy, "SkScalar sy: "));
-}
-
-void SkScaleCommand::execute(SkCanvas* canvas) {
-    canvas->scale(fSx, fSy);
-}
-
 SkSetMatrixCommand::SkSetMatrixCommand(const SkMatrix& matrix)
-    : INHERITED(SET_MATRIX) {
+    : INHERITED(kSetMatrix_OpType) {
+    fUserMatrix.reset();
     fMatrix = matrix;
 
     fInfo.push(SkObjectParser::MatrixToString(matrix));
 }
 
-void SkSetMatrixCommand::execute(SkCanvas* canvas) {
-    canvas->setMatrix(fMatrix);
+void SkSetMatrixCommand::setUserMatrix(const SkMatrix& userMatrix) {
+    fUserMatrix = userMatrix;
 }
 
-SkSkewCommand::SkSkewCommand(SkScalar sx, SkScalar sy)
-    : INHERITED(SKEW) {
-    fSx = sx;
-    fSy = sy;
-
-    fInfo.push(SkObjectParser::ScalarToString(sx, "SkScalar sx: "));
-    fInfo.push(SkObjectParser::ScalarToString(sy, "SkScalar sy: "));
+void SkSetMatrixCommand::execute(SkCanvas* canvas) const {
+    SkMatrix temp = SkMatrix::Concat(fUserMatrix, fMatrix);
+    canvas->setMatrix(temp);
 }
 
-void SkSkewCommand::execute(SkCanvas* canvas) {
-    canvas->skew(fSx, fSy);
-}
-
-SkTranslateCommand::SkTranslateCommand(SkScalar dx, SkScalar dy)
-    : INHERITED(TRANSLATE) {
-    fDx = dx;
-    fDy = dy;
-
-    fInfo.push(SkObjectParser::ScalarToString(dx, "SkScalar dx: "));
-    fInfo.push(SkObjectParser::ScalarToString(dy, "SkScalar dy: "));
-}
-
-void SkTranslateCommand::execute(SkCanvas* canvas) {
-    canvas->translate(fDx, fDy);
-}
-
-SkPushCullCommand::SkPushCullCommand(const SkRect& cullRect)
-    : INHERITED(PUSH_CULL)
-    , fCullRect(cullRect) {
-    fInfo.push(SkObjectParser::RectToString(cullRect));
-}
-
-void SkPushCullCommand::execute(SkCanvas* canvas) {
-    canvas->pushCull(fCullRect);
-}
-
-void SkPushCullCommand::vizExecute(SkCanvas* canvas) {
-    canvas->pushCull(fCullRect);
-
-    SkPaint p;
-    p.setColor(SK_ColorCYAN);
-    p.setStyle(SkPaint::kStroke_Style);
-    canvas->drawRect(fCullRect, p);
-}
-
-SkPopCullCommand::SkPopCullCommand() : INHERITED(POP_CULL) { }
-
-void SkPopCullCommand::execute(SkCanvas* canvas) {
-    canvas->popCull();
-}
diff --git a/gfx/skia/skia/src/utils/debugger/SkDrawCommand.h b/gfx/skia/skia/src/utils/debugger/SkDrawCommand.h
index f4569931a18b..c7e5f008a423 100644
--- a/gfx/skia/skia/src/utils/debugger/SkDrawCommand.h
+++ b/gfx/skia/skia/src/utils/debugger/SkDrawCommand.h
@@ -9,25 +9,62 @@
 #ifndef SKDRAWCOMMAND_H_
 #define SKDRAWCOMMAND_H_
 
-#include "SkPictureFlat.h"
 #include "SkCanvas.h"
+#include "SkTLazy.h"
+#include "SkPath.h"
+#include "SkRRect.h"
 #include "SkString.h"
+#include "SkTDArray.h"
 
 class SK_API SkDrawCommand {
 public:
-    /* TODO(chudy): Remove subclasses. */
-    SkDrawCommand(DrawType drawType);
-    SkDrawCommand();
+    enum OpType {
+        kBeginDrawPicture_OpType,
+        kClipPath_OpType,
+        kClipRegion_OpType,
+        kClipRect_OpType,
+        kClipRRect_OpType,
+        kConcat_OpType,
+        kDrawBitmap_OpType,
+        kDrawBitmapNine_OpType,
+        kDrawBitmapRect_OpType,
+        kDrawClear_OpType,
+        kDrawDRRect_OpType,
+        kDrawImage_OpType,
+        kDrawImageRect_OpType,
+        kDrawOval_OpType,
+        kDrawPaint_OpType,
+        kDrawPatch_OpType,
+        kDrawPath_OpType,
+        kDrawPoints_OpType,
+        kDrawPosText_OpType,
+        kDrawPosTextH_OpType,
+        kDrawRect_OpType,
+        kDrawRRect_OpType,
+        kDrawSprite_OpType,
+        kDrawText_OpType,
+        kDrawTextBlob_OpType,
+        kDrawTextOnPath_OpType,
+        kDrawVertices_OpType,
+        kEndDrawPicture_OpType,
+        kRestore_OpType,
+        kSave_OpType,
+        kSaveLayer_OpType,
+        kSetMatrix_OpType,
+
+        kLast_OpType = kSetMatrix_OpType
+    };
+
+    static const int kOpTypeCount = kLast_OpType + 1;
+
+    SkDrawCommand(OpType opType);
 
     virtual ~SkDrawCommand();
 
-    virtual SkString toString();
+    virtual SkString toString() const;
 
-    void setOffset(size_t offset) { fOffset = offset; }
-    virtual size_t offset() { return fOffset; }
-
-    virtual const char* toCString() {
-        return GetCommandString(fDrawType);
+    virtual const char* toCString() const {
+        return GetCommandString(fOpType);
     }
 
     bool isVisible() const {
@@ -38,56 +75,46 @@ public:
         fVisible = toggle;
     }
 
-    SkTDArray<SkString*>* Info() {return &fInfo; };
-    virtual void execute(SkCanvas* canvas) = 0;
-    virtual void vizExecute(SkCanvas* canvas) { };
-    /** Does nothing by default, but used by save() and restore()-type
-        subclasses to track unresolved save() calls. */
-    virtual void trackSaveState(int* state) { };
+    const SkTDArray<SkString*>* Info() const { return &fInfo; }
+    virtual void execute(SkCanvas*) const = 0;
+    virtual void vizExecute(SkCanvas*) const {}
 
-    // The next "active" system is only used by save, saveLayer, restore,
-    // pushCull and popCull. It is used in two ways:
-    // To determine which saveLayers are currently active (at a
+    virtual void setUserMatrix(const SkMatrix&) {}
+
+    // The next "active" system is only used by save, saveLayer, and restore.
+    // It is used to determine which saveLayers are currently active (at a
     // given point in the rendering).
     //      saves just return a kPushLayer action but don't track active state
     //      restores just return a kPopLayer action
     //      saveLayers return kPushLayer but also track the active state
-    // To determine which culls are currently active (at a given point)
-    // in the rendering).
-    //      pushCulls return a kPushCull action
-    //      popCulls  return a kPopCull action
     enum Action {
         kNone_Action,
         kPopLayer_Action,
         kPushLayer_Action,
-        kPopCull_Action,
-        kPushCull_Action
     };
     virtual Action action() const { return kNone_Action; }
     virtual void setActive(bool active) {}
     virtual bool active() const { return false; }
 
-    DrawType getType() { return fDrawType; };
+    OpType getType() const { return fOpType; }
 
     virtual bool render(SkCanvas* canvas) const { return false; }
 
-    static const char* GetCommandString(DrawType type);
+    static const char* GetCommandString(OpType type);
 
 protected:
     SkTDArray<SkString*> fInfo;
 
 private:
-    DrawType fDrawType;
-    size_t fOffset;
+    OpType fOpType;
     bool   fVisible;
 };
 
 class SkRestoreCommand : public SkDrawCommand {
 public:
     SkRestoreCommand();
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
-    virtual void trackSaveState(int* state) SK_OVERRIDE;
-    virtual Action action() const SK_OVERRIDE { return kPopLayer_Action; }
+    void execute(SkCanvas* canvas) const override;
+    Action action() const override { return kPopLayer_Action; }
 
 private:
     typedef SkDrawCommand INHERITED;
@@ -96,7 +123,7 @@ private:
 class SkClearCommand : public SkDrawCommand {
 public:
     SkClearCommand(SkColor color);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
+    void execute(SkCanvas* canvas) const override;
 private:
     SkColor fColor;
 
@@ -106,8 +133,8 @@ private:
 class SkClipPathCommand : public SkDrawCommand {
 public:
     SkClipPathCommand(const SkPath& path, SkRegion::Op op, bool doAA);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
-    virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
+    void execute(SkCanvas* canvas) const override;
+    bool render(SkCanvas* canvas) const override;
 private:
     SkPath       fPath;
     SkRegion::Op fOp;
@@ -119,7 +146,7 @@ private:
 class SkClipRegionCommand : public SkDrawCommand {
 public:
     SkClipRegionCommand(const SkRegion& region, SkRegion::Op op);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
+    void execute(SkCanvas* canvas) const override;
 private:
     SkRegion     fRegion;
     SkRegion::Op fOp;
@@ -130,7 +157,7 @@ private:
 class SkClipRectCommand : public SkDrawCommand {
 public:
     SkClipRectCommand(const SkRect& rect, SkRegion::Op op, bool doAA);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
+    void execute(SkCanvas* canvas) const override;
 
     const SkRect& rect() const { return fRect; }
     SkRegion::Op op() const { return fOp; }
@@ -147,8 +174,8 @@ private:
 class SkClipRRectCommand : public SkDrawCommand {
 public:
     SkClipRRectCommand(const SkRRect& rrect, SkRegion::Op op, bool doAA);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
-    virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
+    void execute(SkCanvas* canvas) const override;
+    bool render(SkCanvas* canvas) const override;
 
     const SkRRect& rrect() const { return fRRect; }
     SkRegion::Op op() const { return fOp; }
@@ -165,7 +192,7 @@ private:
 class SkConcatCommand : public SkDrawCommand {
 public:
     SkConcatCommand(const SkMatrix& matrix);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
+    void execute(SkCanvas* canvas) const override;
 private:
     SkMatrix fMatrix;
 
@@ -176,8 +203,8 @@ class SkDrawBitmapCommand : public SkDrawCommand {
 public:
     SkDrawBitmapCommand(const SkBitmap& bitmap, SkScalar left, SkScalar top,
                         const SkPaint* paint);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
-    virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
+    void execute(SkCanvas* canvas) const override;
+    bool render(SkCanvas* canvas) const override;
 private:
     SkBitmap fBitmap;
     SkScalar fLeft;
@@ -188,27 +215,12 @@ private:
     typedef SkDrawCommand INHERITED;
 };
 
-class SkDrawBitmapMatrixCommand : public SkDrawCommand {
-public:
-    SkDrawBitmapMatrixCommand(const SkBitmap& bitmap, const SkMatrix& matrix,
-                              const SkPaint* paint);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
-    virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
-private:
-    SkBitmap fBitmap;
-    SkMatrix fMatrix;
-    SkPaint  fPaint;
-    SkPaint* fPaintPtr;
-
-    typedef SkDrawCommand INHERITED;
-};
-
 class SkDrawBitmapNineCommand : public SkDrawCommand {
 public:
     SkDrawBitmapNineCommand(const SkBitmap& bitmap, const SkIRect& center,
                             const SkRect& dst, const SkPaint* paint);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
-    virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
+    void execute(SkCanvas* canvas) const override;
+    bool render(SkCanvas* canvas) const override;
 private:
     SkBitmap fBitmap;
     SkIRect  fCenter;
@@ -223,9 +235,9 @@ class SkDrawBitmapRectCommand : public SkDrawCommand {
 public:
     SkDrawBitmapRectCommand(const SkBitmap& bitmap, const SkRect* src,
                             const SkRect& dst, const SkPaint* paint,
-                            SkCanvas::DrawBitmapRectFlags flags);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
-    virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
+                            SkCanvas::SrcRectConstraint);
+    void execute(SkCanvas* canvas) const override;
+    bool render(SkCanvas* canvas) const override;
 
     const SkBitmap& bitmap() const { return fBitmap; }
 
@@ -238,14 +250,14 @@ public:
 
     void setPaint(const SkPaint& paint) { fPaint = paint; fPaintPtr = &fPaint; }
 
-    const SkRect* srcRect() const { return fSrc.isEmpty() ? NULL : &fSrc; }
+    const SkRect* srcRect() const { return fSrc.isEmpty() ? nullptr : &fSrc; }
     void setSrcRect(const SkRect& src) { fSrc = src; }
 
     const SkRect& dstRect() const { return fDst; }
     void setDstRect(const SkRect& dst) { fDst = dst; }
 
-    SkCanvas::DrawBitmapRectFlags flags() const { return fFlags; }
-    void setFlags(SkCanvas::DrawBitmapRectFlags flags) { fFlags = flags; }
+    SkCanvas::SrcRectConstraint constraint() const { return fConstraint; }
+    void setConstraint(SkCanvas::SrcRectConstraint constraint) { fConstraint = constraint; }
 
 private:
     SkBitmap                      fBitmap;
@@ -253,63 +265,46 @@ private:
     SkRect                        fDst;
     SkPaint                       fPaint;
     SkPaint*                      fPaintPtr;
-    SkCanvas::DrawBitmapRectFlags fFlags;
+    SkCanvas::SrcRectConstraint   fConstraint;
 
     typedef SkDrawCommand INHERITED;
 };
 
-class SkDrawDataCommand : public SkDrawCommand {
+class SkDrawImageCommand : public SkDrawCommand {
 public:
-    SkDrawDataCommand(const void* data, size_t length);
-    virtual ~SkDrawDataCommand() { delete [] fData; }
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
+    SkDrawImageCommand(const SkImage* image, SkScalar left, SkScalar top, const SkPaint* paint);
+    void execute(SkCanvas* canvas) const override;
+    bool render(SkCanvas* canvas) const override;
 private:
-    char*  fData;
-    size_t fLength;
+    SkAutoTUnref<const SkImage> fImage;
+    SkScalar                    fLeft;
+    SkScalar                    fTop;
+    SkTLazy<SkPaint>            fPaint;
 
     typedef SkDrawCommand INHERITED;
 };
 
-class SkBeginCommentGroupCommand : public SkDrawCommand {
+class SkDrawImageRectCommand : public SkDrawCommand {
 public:
-    SkBeginCommentGroupCommand(const char* description);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE {
-        canvas->beginCommentGroup(fDescription.c_str());
-    };
+    SkDrawImageRectCommand(const SkImage* image, const SkRect* src, const SkRect& dst,
+                           const SkPaint* paint, SkCanvas::SrcRectConstraint constraint);
+    void execute(SkCanvas* canvas) const override;
+    bool render(SkCanvas* canvas) const override;
 private:
-    SkString fDescription;
+    SkAutoTUnref<const SkImage> fImage;
+    SkTLazy<SkRect>             fSrc;
+    SkRect                      fDst;
+    SkTLazy<SkPaint>            fPaint;
+    SkCanvas::SrcRectConstraint fConstraint;
 
     typedef SkDrawCommand INHERITED;
 };
 
-class SkCommentCommand : public SkDrawCommand {
-public:
-    SkCommentCommand(const char* kywd, const char* value);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE {
-        canvas->addComment(fKywd.c_str(), fValue.c_str());
-    };
-private:
-    SkString fKywd;
-    SkString fValue;
-
-    typedef SkDrawCommand INHERITED;
-};
-
-class SkEndCommentGroupCommand : public SkDrawCommand {
-public:
-    SkEndCommentGroupCommand();
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE {
-        canvas->endCommentGroup();
-    };
-private:
-    typedef SkDrawCommand INHERITED;
-};
-
 class SkDrawOvalCommand : public SkDrawCommand {
 public:
     SkDrawOvalCommand(const SkRect& oval, const SkPaint& paint);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
-    virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
+    void execute(SkCanvas* canvas) const override;
+    bool render(SkCanvas* canvas) const override;
 private:
     SkRect  fOval;
     SkPaint fPaint;
@@ -320,8 +315,8 @@ private:
 class SkDrawPaintCommand : public SkDrawCommand {
 public:
     SkDrawPaintCommand(const SkPaint& paint);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
-    virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
+    void execute(SkCanvas* canvas) const override;
+    bool render(SkCanvas* canvas) const override;
 private:
     SkPaint fPaint;
 
@@ -331,8 +326,8 @@ private:
 class SkDrawPathCommand : public SkDrawCommand {
 public:
     SkDrawPathCommand(const SkPath& path, const SkPaint& paint);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
-    virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
+    void execute(SkCanvas* canvas) const override;
+    bool render(SkCanvas* canvas) const override;
 
 private:
     SkPath   fPath;
@@ -341,14 +336,31 @@ private:
     typedef SkDrawCommand INHERITED;
 };
 
-class SkDrawPictureCommand : public SkDrawCommand {
+class SkBeginDrawPictureCommand : public SkDrawCommand {
 public:
-    SkDrawPictureCommand(const SkPicture* picture);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
-    virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
+    SkBeginDrawPictureCommand(const SkPicture* picture,
+                              const SkMatrix* matrix,
+                              const SkPaint* paint);
+
+    void execute(SkCanvas* canvas) const override;
+    bool render(SkCanvas* canvas) const override;
 
 private:
     SkAutoTUnref<const SkPicture> fPicture;
+    SkTLazy<SkMatrix>             fMatrix;
+    SkTLazy<SkPaint>              fPaint;
+
+    typedef SkDrawCommand INHERITED;
+};
+
+class SkEndDrawPictureCommand : public SkDrawCommand {
+public:
+    SkEndDrawPictureCommand(bool restore);
+
+    void execute(SkCanvas* canvas) const override;
+
+private:
+    bool fRestore;
 
     typedef SkDrawCommand INHERITED;
 };
@@ -358,8 +370,8 @@ public:
     SkDrawPointsCommand(SkCanvas::PointMode mode, size_t count, const SkPoint pts[],
                         const SkPaint& paint);
     virtual ~SkDrawPointsCommand() { delete [] fPts; }
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
-    virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
+    void execute(SkCanvas* canvas) const override;
+    bool render(SkCanvas* canvas) const override;
 private:
     SkCanvas::PointMode fMode;
     size_t              fCount;
@@ -374,7 +386,7 @@ public:
     SkDrawTextCommand(const void* text, size_t byteLength, SkScalar x, SkScalar y,
                       const SkPaint& paint);
     virtual ~SkDrawTextCommand() { delete [] fText; }
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
+    void execute(SkCanvas* canvas) const override;
 private:
     char*    fText;
     size_t   fByteLength;
@@ -390,7 +402,7 @@ public:
     SkDrawPosTextCommand(const void* text, size_t byteLength, const SkPoint pos[],
                          const SkPaint& paint);
     virtual ~SkDrawPosTextCommand() { delete [] fPos; delete [] fText; }
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
+    void execute(SkCanvas* canvas) const override;
 private:
     char*    fText;
     size_t   fByteLength;
@@ -405,7 +417,7 @@ public:
     SkDrawTextOnPathCommand(const void* text, size_t byteLength, const SkPath& path,
                             const SkMatrix* matrix, const SkPaint& paint);
     virtual ~SkDrawTextOnPathCommand() { delete [] fText; }
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
+    void execute(SkCanvas* canvas) const override;
 private:
     char*    fText;
     size_t   fByteLength;
@@ -421,7 +433,7 @@ public:
     SkDrawPosTextHCommand(const void* text, size_t byteLength, const SkScalar xpos[],
                           SkScalar constY, const SkPaint& paint);
     virtual ~SkDrawPosTextHCommand() { delete [] fXpos; delete [] fText; }
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
+    void execute(SkCanvas* canvas) const override;
 private:
     SkScalar* fXpos;
     char*     fText;
@@ -432,10 +444,44 @@ private:
     typedef SkDrawCommand INHERITED;
 };
 
+class SkDrawTextBlobCommand : public SkDrawCommand {
+public:
+    SkDrawTextBlobCommand(const SkTextBlob* blob, SkScalar x, SkScalar y, const SkPaint& paint);
+
+    void execute(SkCanvas* canvas) const override;
+    bool render(SkCanvas* canvas) const override;
+
+private:
+    SkAutoTUnref<const SkTextBlob> fBlob;
+    SkScalar                       fXPos;
+    SkScalar                       fYPos;
+    SkPaint                        fPaint;
+
+    typedef SkDrawCommand INHERITED;
+};
+
+class SkDrawPatchCommand : public SkDrawCommand {
+public:
+    SkDrawPatchCommand(const SkPoint cubics[12], const SkColor colors[4],
+                       const SkPoint texCoords[4], SkXfermode* xmode,
+                       const SkPaint& paint);
+    void execute(SkCanvas* canvas) const override;
+
+private:
+    SkPoint fCubics[12];
+    SkColor fColors[4];
+    SkPoint fTexCoords[4];
+    SkAutoTUnref<SkXfermode> fXfermode;
+    SkPaint fPaint;
+
+    typedef SkDrawCommand INHERITED;
+};
+
+
 class SkDrawRectCommand : public SkDrawCommand {
 public:
     SkDrawRectCommand(const SkRect& rect, const SkPaint& paint);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
+    void execute(SkCanvas* canvas) const override;
 
     const SkRect& rect() const   { return fRect; }
     const SkPaint& paint() const { return fPaint; }
@@ -449,8 +495,8 @@ private:
 class SkDrawRRectCommand : public SkDrawCommand {
 public:
     SkDrawRRectCommand(const SkRRect& rrect, const SkPaint& paint);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
-    virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
+    void execute(SkCanvas* canvas) const override;
+    bool render(SkCanvas* canvas) const override;
 private:
     SkRRect fRRect;
     SkPaint fPaint;
@@ -462,8 +508,8 @@ class SkDrawDRRectCommand : public SkDrawCommand {
 public:
     SkDrawDRRectCommand(const SkRRect& outer, const SkRRect& inner,
                         const SkPaint& paint);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
-    virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
+    void execute(SkCanvas* canvas) const override;
+    bool render(SkCanvas* canvas) const override;
 private:
     SkRRect fOuter;
     SkRRect fInner;
@@ -475,8 +521,8 @@ private:
 class SkDrawSpriteCommand : public SkDrawCommand {
 public:
     SkDrawSpriteCommand(const SkBitmap& bitmap, int left, int top, const SkPaint* paint);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
-    virtual bool render(SkCanvas* canvas) const SK_OVERRIDE;
+    void execute(SkCanvas* canvas) const override;
+    bool render(SkCanvas* canvas) const override;
 private:
     SkBitmap fBitmap;
     int      fLeft;
@@ -495,7 +541,7 @@ public:
                           const uint16_t indices[], int indexCount,
                           const SkPaint& paint);
     virtual ~SkDrawVerticesCommand();
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
+    void execute(SkCanvas* canvas) const override;
 private:
     SkCanvas::VertexMode fVmode;
     int         fVertexCount;
@@ -510,22 +556,11 @@ private:
     typedef SkDrawCommand INHERITED;
 };
 
-class SkRotateCommand : public SkDrawCommand {
-public:
-    SkRotateCommand(SkScalar degrees);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
-private:
-    SkScalar fDegrees;
-
-    typedef SkDrawCommand INHERITED;
-};
-
 class SkSaveCommand : public SkDrawCommand {
 public:
     SkSaveCommand();
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
-    virtual void trackSaveState(int* state) SK_OVERRIDE;
-    virtual Action action() const SK_OVERRIDE { return kPushLayer_Action; }
+    void execute(SkCanvas* canvas) const override;
+    Action action() const override { return kPushLayer_Action; }
 private:
     typedef SkDrawCommand INHERITED;
 };
@@ -534,12 +569,11 @@ class SkSaveLayerCommand : public SkDrawCommand {
 public:
     SkSaveLayerCommand(const SkRect* bounds, const SkPaint* paint,
                        SkCanvas::SaveFlags flags);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
-    virtual void vizExecute(SkCanvas* canvas) SK_OVERRIDE;
-    virtual void trackSaveState(int* state) SK_OVERRIDE;
-    virtual Action action() const SK_OVERRIDE{ return kPushLayer_Action; }
-    virtual void setActive(bool active) SK_OVERRIDE { fActive = active; }
-    virtual bool active() const SK_OVERRIDE { return fActive; }
+    void execute(SkCanvas* canvas) const override;
+    void vizExecute(SkCanvas* canvas) const override;
+    Action action() const override{ return kPushLayer_Action; }
+    void setActive(bool active) override { fActive = active; }
+    bool active() const override { return fActive; }
 
     const SkPaint* paint() const { return fPaintPtr; }
 
@@ -554,79 +588,16 @@ private:
     typedef SkDrawCommand INHERITED;
 };
 
-class SkScaleCommand : public SkDrawCommand {
-public:
-    SkScaleCommand(SkScalar sx, SkScalar sy);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
-
-    SkScalar x() const { return fSx; }
-    SkScalar y() const { return fSy; }
-
-private:
-    SkScalar fSx;
-    SkScalar fSy;
-
-    typedef SkDrawCommand INHERITED;
-};
-
 class SkSetMatrixCommand : public SkDrawCommand {
 public:
     SkSetMatrixCommand(const SkMatrix& matrix);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
+    void setUserMatrix(const SkMatrix&) override;
+    void execute(SkCanvas* canvas) const override;
 private:
+    SkMatrix fUserMatrix;
     SkMatrix fMatrix;
 
     typedef SkDrawCommand INHERITED;
 };
 
-class SkSkewCommand : public SkDrawCommand {
-public:
-    SkSkewCommand(SkScalar sx, SkScalar sy);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
-private:
-    SkScalar fSx;
-    SkScalar fSy;
-
-    typedef SkDrawCommand INHERITED;
-};
-
-class SkTranslateCommand : public SkDrawCommand {
-public:
-    SkTranslateCommand(SkScalar dx, SkScalar dy);
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
-
-    SkScalar x() const { return fDx; }
-    SkScalar y() const { return fDy; }
-
-private:
-    SkScalar fDx;
-    SkScalar fDy;
-
-    typedef SkDrawCommand INHERITED;
-};
-
-class SkPushCullCommand : public SkDrawCommand {
-public:
-    SkPushCullCommand(const SkRect&);
-    virtual void execute(SkCanvas*) SK_OVERRIDE;
-    virtual void vizExecute(SkCanvas* canvas) SK_OVERRIDE;
-    virtual Action action() const { return kPushCull_Action; }
-    virtual void setActive(bool active) { fActive = active; }
-    virtual bool active() const { return fActive; }
-private:
-    SkRect fCullRect;
-    bool   fActive;
-
-    typedef SkDrawCommand INHERITED;
-};
-
-class SkPopCullCommand : public SkDrawCommand {
-public:
-    SkPopCullCommand();
-    virtual void execute(SkCanvas* canvas) SK_OVERRIDE;
-    virtual Action action() const { return kPopCull_Action; }
-private:
-    typedef SkDrawCommand INHERITED;
-};
-
 #endif
diff --git a/gfx/skia/skia/src/utils/debugger/SkObjectParser.cpp b/gfx/skia/skia/src/utils/debugger/SkObjectParser.cpp
index a9bad40f7195..3dbc03901fbb 100644
--- a/gfx/skia/skia/src/utils/debugger/SkObjectParser.cpp
+++ b/gfx/skia/skia/src/utils/debugger/SkObjectParser.cpp
@@ -9,6 +9,8 @@
 #include "SkObjectParser.h"
 #include "SkData.h"
 #include "SkFontDescriptor.h"
+#include "SkImage.h"
+#include "SkPath.h"
 #include "SkRRect.h"
 #include "SkShader.h"
 #include "SkStream.h"
@@ -26,7 +28,7 @@ SkString* SkObjectParser::BitmapToString(const SkBitmap& bitmap) {
     mBitmap->appendS32(bitmap.height());
 
     const char* gColorTypeStrings[] = {
-        "None", "A8", "565", "4444", "RGBA", "BGRA", "Index8"
+        "None", "A8", "565", "4444", "RGBA", "BGRA", "Index8", "G8"
     };
     SkASSERT(kLastEnum_SkColorType + 1 == SK_ARRAY_COUNT(gColorTypeStrings));
 
@@ -57,6 +59,29 @@ SkString* SkObjectParser::BitmapToString(const SkBitmap& bitmap) {
     return mBitmap;
 }
 
+SkString* SkObjectParser::ImageToString(const SkImage* image) {
+    SkString* str = new SkString("SkImage: ");
+    if (!image) {
+        return str;
+    }
+
+    str->append("W: ");
+    str->appendS32(image->width());
+    str->append(" H: ");
+    str->appendS32(image->height());
+
+    if (image->isOpaque()) {
+        str->append(" opaque");
+    } else {
+        str->append(" not-opaque");
+    }
+
+    str->append(" uniqueID: ");
+    str->appendS32(image->uniqueID());
+
+    return str;
+}
+
 SkString* SkObjectParser::BoolToString(bool doAA) {
     SkString* mBool = new SkString("Bool doAA: ");
     if (doAA) {
@@ -109,7 +134,9 @@ SkString* SkObjectParser::PaintToString(const SkPaint& paint) {
 }
 
 SkString* SkObjectParser::PathToString(const SkPath& path) {
-    SkString* mPath = new SkString("Path (");
+    SkString* mPath = new SkString;
+    
+    mPath->appendf("Path (%d) (", path.getGenerationID());
 
     static const char* gFillStrings[] = {
         "Winding", "EvenOdd", "InverseWinding", "InverseEvenOdd"
@@ -126,12 +153,25 @@ SkString* SkObjectParser::PathToString(const SkPath& path) {
     mPath->append(gConvexityStrings[path.getConvexity()]);
     mPath->append(", ");
 
-    if (path.isRect(NULL)) {
+    if (path.isRect(nullptr)) {
         mPath->append("isRect, ");
     } else {
         mPath->append("isNotRect, ");
     }
 
+    if (path.isOval(nullptr)) {
+        mPath->append("isOval, ");
+    } else {
+        mPath->append("isNotOval, ");
+    }
+
+    SkRRect rrect;
+    if (path.isRRect(&rrect)) {
+        mPath->append("isRRect, ");
+    } else {
+        mPath->append("isNotRRect, ");
+    }
+
     mPath->appendS32(path.countVerbs());
     mPath->append("V, ");
     mPath->appendS32(path.countPoints());
@@ -174,9 +214,9 @@ SkString* SkObjectParser::PathToString(const SkPath& path) {
 
     SkString* boundStr = SkObjectParser::RectToString(path.getBounds(), "    Bound: ");
 
-    if (NULL != boundStr) {
+    if (boundStr) {
         mPath->append(*boundStr);
-        SkDELETE(boundStr);
+        delete boundStr;
     }
 
     return mPath;
@@ -210,7 +250,7 @@ SkString* SkObjectParser::RectToString(const SkRect& rect, const char* title) {
 
     SkString* mRect = new SkString;
 
-    if (NULL == title) {
+    if (nullptr == title) {
         mRect->append("SkRect: ");
     } else {
         mRect->append(title);
@@ -231,7 +271,7 @@ SkString* SkObjectParser::RRectToString(const SkRRect& rrect, const char* title)
 
     SkString* mRRect = new SkString;
 
-    if (NULL == title) {
+    if (nullptr == title) {
         mRRect->append("SkRRect (");
         if (rrect.isEmpty()) {
             mRRect->append("empty");
@@ -333,7 +373,7 @@ SkString* SkObjectParser::TextToString(const void* text, size_t byteLength,
             decodedText->append("UTF-16: ");
             size_t sizeNeeded = SkUTF16_ToUTF8((uint16_t*)text,
                                                 SkToS32(byteLength / 2),
-                                                NULL);
+                                                nullptr);
             SkAutoSTMalloc<0x100, char> utf8(sizeNeeded);
             SkUTF16_ToUTF8((uint16_t*)text, SkToS32(byteLength / 2), utf8);
             decodedText->append(utf8, sizeNeeded);
diff --git a/gfx/skia/skia/src/utils/debugger/SkObjectParser.h b/gfx/skia/skia/src/utils/debugger/SkObjectParser.h
index da842653ffc6..4c04935257d8 100644
--- a/gfx/skia/skia/src/utils/debugger/SkObjectParser.h
+++ b/gfx/skia/skia/src/utils/debugger/SkObjectParser.h
@@ -20,11 +20,17 @@ class SkObjectParser {
 public:
 
     /**
-        Returns a string about a bitmaps bounds and colortype.
+        Returns a string about a bitmap's bounds and colortype.
         @param bitmap  SkBitmap
     */
     static SkString* BitmapToString(const SkBitmap& bitmap);
 
+    /**
+        Returns a string about a image
+        @param image   SkImage
+    */
+    static SkString* ImageToString(const SkImage* image);
+
     /**
         Returns a string representation of a boolean.
         @param doAA  boolean
@@ -83,13 +89,13 @@ public:
         Returns a string representation of the SkRects coordinates.
         @param rect  SkRect
      */
-    static SkString* RectToString(const SkRect& rect, const char* title = NULL);
+    static SkString* RectToString(const SkRect& rect, const char* title = nullptr);
 
     /**
         Returns a string representation of an SkRRect.
         @param rrect  SkRRect
      */
-    static SkString* RRectToString(const SkRRect& rrect, const char* title = NULL);
+    static SkString* RRectToString(const SkRRect& rrect, const char* title = nullptr);
 
     /**
         Returns a string representation of the SkRegion enum.
diff --git a/gfx/skia/skia/src/utils/ios/SkFontHost_iOS.mm b/gfx/skia/skia/src/utils/ios/SkFontHost_iOS.mm
deleted file mode 100755
index ae75165a4e0f..000000000000
--- a/gfx/skia/skia/src/utils/ios/SkFontHost_iOS.mm
+++ /dev/null
@@ -1,262 +0,0 @@
-#import <UIKit/UIKit.h>
-
-#include "SkStream_NSData.h"
-#include "SkTypeface.h"
-#include "SkFontHost.h"
-#include "SkThread.h"
-#include "SkTemplates.h"
-
-enum FontDesign {
-    kUnknown_Design,
-    kSans_FontDesign,
-    kSerif_FontDesign,
-
-    kIllegal_FontDesign,    // never use with a real font
-};
-
-// returns kIllegal_FontDesign if not found
-static FontDesign find_design_from_name(const char name[]) {
-    static const struct {
-        const char* fName;
-        FontDesign  fDesign;
-    } gRec[] = {
-        { "sans-serif", kSans_FontDesign },
-        { "serif",      kSerif_FontDesign },
-    };
-
-    for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); i++) {
-        if (!strcasecmp(name, gRec[i].fName)) {
-            return gRec[i].fDesign;
-        }
-    }
-    return kIllegal_FontDesign;
-}
-
-struct FontRes {
-    const char*         fName;
-    SkTypeface::Style   fStyle;
-    FontDesign          fDesign;
-};
-
-static const FontRes gFontRes[] = {
-    { "DroidSans",          SkTypeface::kNormal,    kSans_FontDesign    },
-    { "DroidSans",          SkTypeface::kBold,      kSans_FontDesign    },
-    { "DroidSerif-Regular", SkTypeface::kNormal,    kSerif_FontDesign    },
-    { "DroidSerif-Bold",    SkTypeface::kBold,      kSerif_FontDesign    },
-//    { "PescaderoPro",       SkTypeface::kNormal,    kSerif_FontDesign   },
-//    { "PescaderoPro-Bold",  SkTypeface::kBold,      kSerif_FontDesign   },
-};
-#define FONTRES_COUNT SK_ARRAY_COUNT(gFontRes)
-
-#define DEFAULT_INDEX_REGULAR   1
-#define DEFAULT_INDEX_BOLD      2
-
-///////////////////////////////////////////////////////////////////////////////
-
-class SkTypeface_Stream : public SkTypeface {
-public:
-    SkTypeface_Stream(SkStream* stream, Style style);
-    virtual ~SkTypeface_Stream();
-
-    SkStream* refStream() {
-        fStream->ref();
-        return fStream;
-    }
-
-private:
-    SkStream*   fStream;
-};
-
-static int32_t gUniqueFontID;
-
-SkTypeface_Stream::SkTypeface_Stream(SkStream* stream, Style style)
-: SkTypeface(style, sk_atomic_inc(&gUniqueFontID) + 1) {
-    fStream = stream;
-    fStream->ref();
-}
-
-SkTypeface_Stream::~SkTypeface_Stream() {
-    fStream->unref();
-}
-
-static SkTypeface_Stream* create_from_fontres(const FontRes& res) {
-    SkStream* stream = SkStream_NSData::CreateFromResource(res.fName, "ttf");
-    SkAutoUnref aur(stream);
-
-    return SkNEW_ARGS(SkTypeface_Stream, (stream, res.fStyle));
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-static int compute_style_distance(SkTypeface::Style a, SkTypeface::Style b) {
-    int dist = 0;
-    int diff = a ^ b;
-    if (diff & SkTypeface::kBold) {
-        dist += 2;
-    }
-    if (diff & SkTypeface::kItalic) {
-        dist += 1;
-    }
-    return dist;
-}
-
-static SkTypeface_Stream* gFonts[FONTRES_COUNT];
-
-static void assure_init_fonts() {
-    static bool gOnce;
-    if (!gOnce) {
-        for (size_t i = 0; i < FONTRES_COUNT; i++) {
-            gFonts[i] = create_from_fontres(gFontRes[i]);
-            gOnce = true;
-        }
-    }
-}
-
-static SkTypeface_Stream* get_default_font(SkTypeface::Style style) {
-    assure_init_fonts();
-
-    if (style & SkTypeface::kBold) {
-        return gFonts[DEFAULT_INDEX_BOLD];
-    } else {
-        return gFonts[DEFAULT_INDEX_REGULAR];
-    }
-}
-
-static SkTypeface_Stream* find_by_id(SkFontID fontID) {
-    assure_init_fonts();
-    
-    for (size_t i = 0; i < FONTRES_COUNT; i++) {
-        if (gFonts[i]->uniqueID() == fontID) {
-            return gFonts[i];
-        }
-    }
-    return NULL;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-template <typename T> T* ref_and_return(T* obj) {
-    obj->ref();
-    return obj;
-}
-
-SkTypeface* SkFontHost::CreateTypeface(const SkTypeface* familyFace,
-                                     const char familyName[],
-                                     const void* data, size_t bytelength,
-                                     SkTypeface::Style style) {
-    assure_init_fonts();
-
-    if (familyName) {
-        FontDesign design = find_design_from_name(familyName);
-        if (kIllegal_FontDesign != design) {
-            familyName = "$#@*&%*#$@ never match any name";
-        }
-
-        int bestDistance = 999;
-        int bestIndex = -1;
-        for (size_t i = 0; i < FONTRES_COUNT; i++) {
-            if (design == gFontRes[i].fDesign || !strcmp(gFontRes[i].fName, familyName)) {
-                int dist = compute_style_distance(style, gFontRes[i].fStyle);
-                if (dist < bestDistance) {
-                    bestDistance = dist;
-                    bestIndex = i;
-                }
-            }
-        }
-        if (bestIndex >= 0) {
-            return ref_and_return(gFonts[bestIndex]);
-        }
-    }
-
-    return ref_and_return(get_default_font(style));
-}
-
-SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) {
-    SkDEBUGFAIL("SkFontHost::CreateTypeface unimplemented");
-    return NULL;
-}
-
-SkTypeface* SkFontHost::CreateTypefaceFromFile(char const*) {
-//    SkDEBUGFAIL("SkFontHost::CreateTypefaceFromFile unimplemented");
-    return NULL;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-SkStream* SkFontHost::OpenStream(uint32_t uniqueID) {
-    SkTypeface_Stream* tf = find_by_id(uniqueID);
-    SkASSERT(tf);
-    return tf->refStream();
-}
-
-size_t SkFontHost::GetFileName(SkFontID fontID, char path[], size_t length,
-                               int32_t* index) {
-    SkDebugf("SkFontHost::GetFileName unimplemented\n");
-    return 0;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-void SkFontHost::Serialize(const SkTypeface* face, SkWStream* stream) {
-    SkDEBUGFAIL("SkFontHost::Serialize unimplemented");
-}
-
-SkTypeface* SkFontHost::Deserialize(SkStream* stream) {
-    int style = stream->readU8();
-    int len = stream->readPackedUInt();
-    const char* name = NULL;
-    if (len > 0) {
-        SkString str;
-        str.resize(len);
-        stream->read(str.writable_str(), len);
-        
-        if (str.startsWith("DroidSans")) {
-            name = "sans-serif";
-        } else if (str.startsWith("DroidSerif")) {
-            name = "serif";
-        }
-        SkDebugf("---- deserialize typeface <%s> %d %s\n", str.c_str(), style, name);
-    }
-//    name = NULL; style = 0;
-    return SkFontHost::CreateTypeface(NULL, name, NULL, NULL,
-                                      (SkTypeface::Style)style);
-}
-
-SkFontID SkFontHost::NextLogicalFont(SkFontID currFontID, SkFontID origFontID) {
-    return 0;
-}
-
-#define FONT_CACHE_MEMORY_BUDGET    1 * 1024 * 1024
-
-size_t SkFontHost::ShouldPurgeFontCache(size_t sizeAllocatedSoFar) {
-    if (sizeAllocatedSoFar > FONT_CACHE_MEMORY_BUDGET)
-        return sizeAllocatedSoFar - FONT_CACHE_MEMORY_BUDGET;
-    else
-        return 0;   // nothing to do
-}
-
-///////////////////////////////////////////////////////////////////////////////
-int SkFontHost::ComputeGammaFlag(const SkPaint& paint) {
-    return 0;
-}
-
-void SkFontHost::GetGammaTables(const uint8_t* tables[2]) {
-    tables[0] = NULL;   // black gamma (e.g. exp=1.4)
-    tables[1] = NULL;   // white gamma (e.g. exp= 1/1.4)
-}
-
-// static
-SkAdvancedTypefaceMetrics* SkFontHost::GetAdvancedTypefaceMetrics(
-                                                                  uint32_t fontID,
-                                                                  SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo) {
-    SkDEBUGFAIL("SkFontHost::GetAdvancedTypefaceMetrics unimplemented");
-    return NULL;
-}
-
-void SkFontHost::FilterRec(SkScalerContext::Rec* rec, SkTypeface*) {
-}
-
-SkScalerContext* SkFontHost::CreateScalerContext(const SkDescriptor* desc) {
-    SkDEBUGFAIL("SkFontHost::CreateScalarContext unimplemented");
-    return NULL;
-}
\ No newline at end of file
diff --git a/gfx/skia/skia/src/utils/ios/SkImageDecoder_iOS.mm b/gfx/skia/skia/src/utils/ios/SkImageDecoder_iOS.mm
deleted file mode 100755
index f3db65e03552..000000000000
--- a/gfx/skia/skia/src/utils/ios/SkImageDecoder_iOS.mm
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#import <CoreGraphics/CoreGraphics.h>
-#include <CoreGraphics/CGColorSpace.h>
-#import <UIKit/UIKit.h>
-
-#include "SkImageDecoder.h"
-#include "SkImageEncoder.h"
-#include "SkMovie.h"
-#include "SkStream_NSData.h"
-
-class SkImageDecoder_iOS : public SkImageDecoder {
-protected:
-    virtual bool onDecode(SkStream* stream, SkBitmap* bm, Mode);
-};
-
-#define BITMAP_INFO (kCGBitmapByteOrder32Big | kCGImageAlphaPremultipliedLast)
-
-bool SkImageDecoder_iOS::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
-
-    NSData* data = NSData_dataWithStream(stream);
-
-    UIImage* uimage = [UIImage imageWithData:data];
-    
-    const int width = uimage.size.width;
-    const int height = uimage.size.height;
-    bm->setInfo(SkImageInfo::MakeN32(width, height, kPremul_SkAlphaType), 0);
-    if (SkImageDecoder::kDecodeBounds_Mode == mode) {
-        return true;
-    }
-    
-    if (!this->allocPixelRef(bm, NULL)) {
-        return false;
-    }
-    
-    bm->lockPixels();
-    bm->eraseColor(0);
-    
-    CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
-    CGContextRef cg = CGBitmapContextCreate(bm->getPixels(), width, height,
-                                            8, bm->rowBytes(), cs, BITMAP_INFO);
-    CGContextDrawImage(cg, CGRectMake(0, 0, width, height), uimage.CGImage);
-    CGContextRelease(cg);
-    CGColorSpaceRelease(cs);
-    
-    bm->unlockPixels();
-    return true;
-}
-
-/////////////////////////////////////////////////////////////////////////
-
-SkImageDecoder* SkImageDecoder::Factory(SkStreamRewindable* stream) {
-    return new SkImageDecoder_iOS;
-}
-
-SkMovie* SkMovie::DecodeStream(SkStreamRewindable* stream) {
-    return NULL;
-}
-
-
diff --git a/gfx/skia/skia/src/utils/ios/SkOSFile_iOS.mm b/gfx/skia/skia/src/utils/ios/SkOSFile_iOS.mm
deleted file mode 100755
index e38ecfdab4de..000000000000
--- a/gfx/skia/skia/src/utils/ios/SkOSFile_iOS.mm
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <Foundation/Foundation.h>
-#include "SkOSFile.h"
-#include "SkString.h"
-
-struct SkFILE {
-    NSData* fData;
-    size_t  fOffset;
-    size_t  fLength;
-};
-
-SkFILE* sk_fopen(const char cpath[], SkFILE_Flags flags) {
-    if (flags & kWrite_SkFILE_Flag) {
-        return NULL;
-    }
-
-    SkString cname, csuffix;
-
-    const char* start = strrchr(cpath, '/');
-    if (NULL == start) {
-        start = cpath;
-    } else {
-        start += 1;
-    }
-    const char* stop = strrchr(cpath, '.');
-    if (NULL == stop) {
-        return NULL;
-    } else {
-        stop += 1;
-    }
-
-    cname.set(start, stop - start - 1);
-    csuffix.set(stop);
-
-    NSBundle* bundle = [NSBundle mainBundle];
-    NSString* name = [NSString stringWithUTF8String:cname.c_str()];
-    NSString* suffix = [NSString stringWithUTF8String:csuffix.c_str()];
-    NSString* path = [bundle pathForResource:name ofType:suffix];
-    NSData* data = [NSData dataWithContentsOfMappedFile:path];
-
-    if (data) {
-        [data retain];
-        SkFILE* rec = new SkFILE;
-        rec->fData = data;
-        rec->fOffset = 0;
-        rec->fLength = [data length];
-        return reinterpret_cast<SkFILE*>(rec);
-    }
-    return NULL;
-}
-
-size_t sk_fgetsize(SkFILE* rec) {
-    SkASSERT(rec);
-    return rec->fLength;
-}
-
-bool sk_frewind(SkFILE* rec) {
-    SkASSERT(rec);
-    rec->fOffset = 0;
-    return true;
-}
-
-size_t sk_fread(void* buffer, size_t byteCount, SkFILE* rec) {
-    if (NULL == buffer) {
-        return rec->fLength;
-    } else {
-        size_t remaining = rec->fLength - rec->fOffset;
-        if (byteCount > remaining) {
-            byteCount = remaining;
-        }
-        memcpy(buffer, (char*)[rec->fData bytes] + rec->fOffset, byteCount);
-        rec->fOffset += byteCount;
-        SkASSERT(rec->fOffset <= rec->fLength);
-        return byteCount;
-    }
-}
-
-size_t sk_fwrite(const void* buffer, size_t byteCount, SkFILE* f) {
-    SkDEBUGFAIL("Not supported yet");
-    return 0;
-}
-
-void sk_fflush(SkFILE* f) {
-    SkDEBUGFAIL("Not supported yet");
-}
-
-void sk_fclose(SkFILE* rec) {
-    SkASSERT(rec);
-    [rec->fData release];
-    delete rec;
-}
-
diff --git a/gfx/skia/skia/src/utils/ios/SkStream_NSData.mm b/gfx/skia/skia/src/utils/ios/SkStream_NSData.mm
deleted file mode 100755
index ef20f63e1326..000000000000
--- a/gfx/skia/skia/src/utils/ios/SkStream_NSData.mm
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkStream_NSData.h"
-
-NSData* NSData_dataWithStream(SkStream* stream) {
-    size_t length = stream->getLength();
-    void* src = malloc(length);
-    size_t bytes = stream->read(src, length);
-    SkASSERT(bytes == length);
-    return [NSData dataWithBytesNoCopy:src length:length freeWhenDone:YES];
-}
-
-NSData* NSData_dataFromResource(const char cname[], const char csuffix[]) {
-    NSBundle* bundle = [NSBundle mainBundle];
-    NSString* name = [NSString stringWithUTF8String:cname];
-    NSString* suffix = [NSString stringWithUTF8String:csuffix];
-    NSString* path = [bundle pathForResource:name ofType:suffix];
-    return [NSData dataWithContentsOfMappedFile:path];
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-SkStream_NSData::SkStream_NSData(NSData* data) {
-    fNSData = data;
-    [fNSData retain];
-
-    this->setMemory([fNSData bytes], [fNSData length], false);
-}
-
-SkStream_NSData::~SkStream_NSData() {
-    [fNSData release];
-}
-
-SkStream_NSData* SkStream_NSData::CreateFromResource(const char name[],
-                                                     const char suffix[]) {
-    NSData* data = NSData_dataFromResource(name, suffix);
-    return SkNEW_ARGS(SkStream_NSData, (data));
-}
-
diff --git a/gfx/skia/skia/src/utils/mac/SkCreateCGImageRef.cpp b/gfx/skia/skia/src/utils/mac/SkCreateCGImageRef.cpp
index 01b774df09f4..3fd9057c3551 100644
--- a/gfx/skia/skia/src/utils/mac/SkCreateCGImageRef.cpp
+++ b/gfx/skia/skia/src/utils/mac/SkCreateCGImageRef.cpp
@@ -5,6 +5,10 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
+
 #include "SkCGUtils.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
@@ -12,8 +16,9 @@
 static CGBitmapInfo ComputeCGAlphaInfo_RGBA(SkAlphaType at) {
     CGBitmapInfo info = kCGBitmapByteOrder32Big;
     switch (at) {
+        case kUnknown_SkAlphaType:
+            break;
         case kOpaque_SkAlphaType:
-        case kIgnore_SkAlphaType:
             info |= kCGImageAlphaNoneSkipLast;
             break;
         case kPremul_SkAlphaType:
@@ -29,8 +34,9 @@ static CGBitmapInfo ComputeCGAlphaInfo_RGBA(SkAlphaType at) {
 static CGBitmapInfo ComputeCGAlphaInfo_BGRA(SkAlphaType at) {
     CGBitmapInfo info = kCGBitmapByteOrder32Little;
     switch (at) {
+        case kUnknown_SkAlphaType:
+            break;
         case kOpaque_SkAlphaType:
-        case kIgnore_SkAlphaType:
             info |= kCGImageAlphaNoneSkipFirst;
             break;
         case kPremul_SkAlphaType:
@@ -99,7 +105,7 @@ static SkBitmap* prepareForImageRef(const SkBitmap& bm,
                                     CGBitmapInfo* info) {
     bool upscaleTo32;
     if (!getBitmapInfo(bm, bitsPerComponent, info, &upscaleTo32)) {
-        return NULL;
+        return nullptr;
     }
 
     SkBitmap* copy;
@@ -120,8 +126,8 @@ CGImageRef SkCreateCGImageRefWithColorspace(const SkBitmap& bm,
     CGBitmapInfo info       SK_INIT_TO_AVOID_WARNING;
 
     SkBitmap* bitmap = prepareForImageRef(bm, &bitsPerComponent, &info);
-    if (NULL == bitmap) {
-        return NULL;
+    if (nullptr == bitmap) {
+        return nullptr;
     }
 
     const int w = bitmap->width();
@@ -136,7 +142,7 @@ CGImageRef SkCreateCGImageRefWithColorspace(const SkBitmap& bm,
                                                              SkBitmap_ReleaseInfo);
 
     bool releaseColorSpace = false;
-    if (NULL == colorSpace) {
+    if (nullptr == colorSpace) {
         colorSpace = CGColorSpaceCreateDeviceRGB();
         releaseColorSpace = true;
     }
@@ -144,7 +150,7 @@ CGImageRef SkCreateCGImageRefWithColorspace(const SkBitmap& bm,
     CGImageRef ref = CGImageCreate(w, h, bitsPerComponent,
                                    bitmap->bytesPerPixel() * 8,
                                    bitmap->rowBytes(), colorSpace, info, dataRef,
-                                   NULL, false, kCGRenderingIntentDefault);
+                                   nullptr, false, kCGRenderingIntentDefault);
 
     if (releaseColorSpace) {
         CGColorSpaceRelease(colorSpace);
@@ -188,30 +194,21 @@ private:
 };
 #define SkAutoPDFRelease(...) SK_REQUIRE_LOCAL_VAR(SkAutoPDFRelease)
 
-static void CGDataProviderReleaseData_FromMalloc(void*, const void* data,
-                                                 size_t size) {
-    sk_free((void*)data);
-}
-
 bool SkPDFDocumentToBitmap(SkStream* stream, SkBitmap* output) {
-    size_t size = stream->getLength();
-    void* ptr = sk_malloc_throw(size);
-    stream->read(ptr, size);
-    CGDataProviderRef data = CGDataProviderCreateWithData(NULL, ptr, size,
-                                          CGDataProviderReleaseData_FromMalloc);
-    if (NULL == data) {
+    CGDataProviderRef data = SkCreateDataProviderFromStream(stream);
+    if (nullptr == data) {
         return false;
     }
 
     CGPDFDocumentRef pdf = CGPDFDocumentCreateWithProvider(data);
     CGDataProviderRelease(data);
-    if (NULL == pdf) {
+    if (nullptr == pdf) {
         return false;
     }
     SkAutoPDFRelease releaseMe(pdf);
 
     CGPDFPageRef page = CGPDFDocumentGetPage(pdf, 1);
-    if (NULL == page) {
+    if (nullptr == page) {
         return false;
     }
 
@@ -221,14 +218,14 @@ bool SkPDFDocumentToBitmap(SkStream* stream, SkBitmap* output) {
     int h = (int)CGRectGetHeight(bounds);
 
     SkBitmap bitmap;
-    if (!bitmap.allocPixels(SkImageInfo::MakeN32Premul(w, h))) {
+    if (!bitmap.tryAllocN32Pixels(w, h)) {
         return false;
     }
     bitmap.eraseColor(SK_ColorWHITE);
 
     size_t bitsPerComponent;
     CGBitmapInfo info;
-    getBitmapInfo(bitmap, &bitsPerComponent, &info, NULL);
+    getBitmapInfo(bitmap, &bitsPerComponent, &info, nullptr);
 
     CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
     CGContextRef ctx = CGBitmapContextCreate(bitmap.getPixels(), w, h,
@@ -268,7 +265,7 @@ SK_API bool SkCopyPixelsFromCGImage(const SkImageInfo& info, size_t rowBytes, vo
     CGContextRef cg = CGBitmapContextCreate(pixels, info.width(), info.height(), bitsPerComponent,
                                             rowBytes, cs, cg_bitmap_info);
     CFRelease(cs);
-    if (NULL == cg) {
+    if (nullptr == cg) {
         return false;
     }
 
@@ -287,7 +284,7 @@ bool SkCreateBitmapFromCGImage(SkBitmap* dst, CGImageRef image, SkISize* scaleTo
     SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
 
     SkBitmap tmp;
-    if (!tmp.allocPixels(info)) {
+    if (!tmp.tryAllocPixels(info)) {
         return false;
     }
 
@@ -313,3 +310,5 @@ bool SkCreateBitmapFromCGImage(SkBitmap* dst, CGImageRef image, SkISize* scaleTo
     *dst = tmp;
     return true;
 }
+
+#endif//defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
diff --git a/gfx/skia/skia/src/utils/mac/SkStream_mac.cpp b/gfx/skia/skia/src/utils/mac/SkStream_mac.cpp
index 64d2dbb2cae1..36e5194a1990 100644
--- a/gfx/skia/skia/src/utils/mac/SkStream_mac.cpp
+++ b/gfx/skia/skia/src/utils/mac/SkStream_mac.cpp
@@ -5,16 +5,27 @@
  * found in the LICENSE file.
  */
 
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
+
 #include "SkCGUtils.h"
 #include "SkStream.h"
 
-// This is used by CGDataProviderCreateWithData
+// These are used by CGDataProviderCreateWithData
 
 static void unref_proc(void* info, const void* addr, size_t size) {
     SkASSERT(info);
     ((SkRefCnt*)info)->unref();
 }
 
+static void delete_stream_proc(void* info, const void* addr, size_t size) {
+    SkASSERT(info);
+    SkStream* stream = (SkStream*)info;
+    SkASSERT(stream->getMemoryBase() == addr);
+    SkASSERT(stream->getLength() == size);
+    delete stream;
+}
+
 // These are used by CGDataProviderSequentialCallbacks
 
 static size_t get_bytes_proc(void* info, void* buffer, size_t bytes) {
@@ -31,19 +42,20 @@ static void rewind_proc(void* info) {
     ((SkStream*)info)->rewind();
 }
 
+// Used when info is an SkStream.
 static void release_info_proc(void* info) {
     SkASSERT(info);
-    ((SkStream*)info)->unref();
+    delete (SkStream*)info;
 }
 
 CGDataProviderRef SkCreateDataProviderFromStream(SkStream* stream) {
-    stream->ref();  // unref will be called when the provider is deleted
-
+    // TODO: Replace with SkStream::getData() when that is added. Then we only
+    // have one version of CGDataProviderCreateWithData (i.e. same release proc)
     const void* addr = stream->getMemoryBase();
     if (addr) {
         // special-case when the stream is just a block of ram
         return CGDataProviderCreateWithData(stream, addr, stream->getLength(),
-                                            unref_proc);
+                                            delete_stream_proc);
     }
 
     CGDataProviderSequentialCallbacks rec;
@@ -65,3 +77,5 @@ CGDataProviderRef SkCreateDataProviderFromData(SkData* data) {
     return CGDataProviderCreateWithData(data, data->data(), data->size(),
                                             unref_proc);
 }
+
+#endif//defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
diff --git a/gfx/skia/skia/src/utils/win/SkAutoCoInitialize.cpp b/gfx/skia/skia/src/utils/win/SkAutoCoInitialize.cpp
index 89115bfe416c..83f23bda0bd0 100644
--- a/gfx/skia/skia/src/utils/win/SkAutoCoInitialize.cpp
+++ b/gfx/skia/skia/src/utils/win/SkAutoCoInitialize.cpp
@@ -6,6 +6,9 @@
  * found in the LICENSE file.
  */
 
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_WIN32)
+
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -14,7 +17,7 @@
 
 SkAutoCoInitialize::SkAutoCoInitialize() :
     fHR(
-        CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE)
+        CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE)
     )
 { }
 
@@ -27,3 +30,5 @@ SkAutoCoInitialize::~SkAutoCoInitialize() {
 bool SkAutoCoInitialize::succeeded() {
     return SUCCEEDED(this->fHR) || RPC_E_CHANGED_MODE == this->fHR;
 }
+
+#endif//defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/src/utils/win/SkDWrite.cpp b/gfx/skia/skia/src/utils/win/SkDWrite.cpp
index 87826b5194e4..2fdd6115b00d 100644
--- a/gfx/skia/skia/src/utils/win/SkDWrite.cpp
+++ b/gfx/skia/skia/src/utils/win/SkDWrite.cpp
@@ -4,6 +4,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_WIN32)
 
 #include "SkDWrite.h"
 #include "SkHRESULT.h"
@@ -12,7 +14,7 @@
 
 #include <dwrite.h>
 
-static IDWriteFactory* gDWriteFactory = NULL;
+static IDWriteFactory* gDWriteFactory = nullptr;
 
 static void release_dwrite_factory() {
     if (gDWriteFactory) {
@@ -41,10 +43,9 @@ static void create_dwrite_factory(IDWriteFactory** factory) {
 }
 
 
+SK_DECLARE_STATIC_ONCE(once);
 IDWriteFactory* sk_get_dwrite_factory() {
-    SK_DECLARE_STATIC_ONCE(once);
     SkOnce(&once, create_dwrite_factory, &gDWriteFactory);
-
     return gDWriteFactory;
 }
 
@@ -53,7 +54,7 @@ IDWriteFactory* sk_get_dwrite_factory() {
 
 /** Converts a utf8 string to a WCHAR string. */
 HRESULT sk_cstring_to_wchar(const char* skname, SkSMallocWCHAR* name) {
-    int wlen = MultiByteToWideChar(CP_UTF8, 0, skname, -1, NULL, 0);
+    int wlen = MultiByteToWideChar(CP_UTF8, 0, skname, -1, nullptr, 0);
     if (0 == wlen) {
         HRM(HRESULT_FROM_WIN32(GetLastError()),
             "Could not get length for wchar to utf-8 conversion.");
@@ -67,23 +68,19 @@ HRESULT sk_cstring_to_wchar(const char* skname, SkSMallocWCHAR* name) {
 }
 
 /** Converts a WCHAR string to a utf8 string. */
-HRESULT sk_wchar_to_skstring(WCHAR* name, SkString* skname) {
-    int len = WideCharToMultiByte(CP_UTF8, 0, name, -1, NULL, 0, NULL, NULL);
+HRESULT sk_wchar_to_skstring(WCHAR* name, int nameLen, SkString* skname) {
+    int len = WideCharToMultiByte(CP_UTF8, 0, name, nameLen, nullptr, 0, nullptr, nullptr);
     if (0 == len) {
+        if (nameLen <= 0) {
+            skname->reset();
+            return S_OK;
+        }
         HRM(HRESULT_FROM_WIN32(GetLastError()),
             "Could not get length for utf-8 to wchar conversion.");
     }
-    skname->resize(len - 1);
+    skname->resize(len);
 
-    // TODO: remove after https://code.google.com/p/skia/issues/detail?id=1989 is fixed.
-    // If we resize to 0 then the skname points to gEmptyRec (the unique empty SkString::Rec).
-    // gEmptyRec is static const and on Windows this means the value is in a read only page.
-    // Writing to it in the following call to WideCharToMultiByte will cause an access violation.
-    if (1 == len) {
-        return S_OK;
-    }
-
-    len = WideCharToMultiByte(CP_UTF8, 0, name, -1, skname->writable_str(), len, NULL, NULL);
+    len = WideCharToMultiByte(CP_UTF8, 0, name, nameLen, skname->writable_str(), len, nullptr, nullptr);
     if (0 == len) {
         HRM(HRESULT_FROM_WIN32(GetLastError()), "Could not convert utf-8 to wchar.");
     }
@@ -105,14 +102,13 @@ void sk_get_locale_string(IDWriteLocalizedStrings* names, const WCHAR* preferedL
         }
     }
 
-    UINT32 nameLength;
-    HRVM(names->GetStringLength(nameIndex, &nameLength), "Could not get name length.");
-    nameLength += 1;
+    UINT32 nameLen;
+    HRVM(names->GetStringLength(nameIndex, &nameLen), "Could not get name length.");
 
-    SkSMallocWCHAR name(nameLength);
-    HRVM(names->GetString(nameIndex, name.get(), nameLength), "Could not get string.");
+    SkSMallocWCHAR name(nameLen+1);
+    HRVM(names->GetString(nameIndex, name.get(), nameLen+1), "Could not get string.");
 
-    HRV(sk_wchar_to_skstring(name.get(), skname));
+    HRV(sk_wchar_to_skstring(name.get(), nameLen, skname));
 }
 
 HRESULT SkGetGetUserDefaultLocaleNameProc(SkGetUserDefaultLocaleNameProc* proc) {
@@ -128,3 +124,5 @@ HRESULT SkGetGetUserDefaultLocaleNameProc(SkGetUserDefaultLocaleNameProc* proc)
     }
     return S_OK;
 }
+
+#endif//defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/src/utils/win/SkDWrite.h b/gfx/skia/skia/src/utils/win/SkDWrite.h
index fb81fef5605b..60e6a11984c3 100644
--- a/gfx/skia/skia/src/utils/win/SkDWrite.h
+++ b/gfx/skia/skia/src/utils/win/SkDWrite.h
@@ -8,6 +8,7 @@
 #ifndef SkDWrite_DEFINED
 #define SkDWrite_DEFINED
 
+#include "SkFontStyle.h"
 #include "SkTemplates.h"
 
 #include <dwrite.h>
@@ -22,6 +23,10 @@ class SkString;
 #define SK_HAS_DWRITE_1_H (WINVER_MAXVER >= 0x0602)
 #endif
 
+#ifndef SK_HAS_DWRITE_2_H
+#define SK_HAS_DWRITE_2_H (WINVER_MAXVER >= 0x0603)
+#endif
+
 IDWriteFactory* sk_get_dwrite_factory();
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -33,8 +38,10 @@ typedef SkAutoSTMalloc<16, WCHAR> SkSMallocWCHAR;
 /** Converts a utf8 string to a WCHAR string. */
 HRESULT sk_cstring_to_wchar(const char* skname, SkSMallocWCHAR* name);
 
-/** Converts a WCHAR string to a utf8 string. */
-HRESULT sk_wchar_to_skstring(WCHAR* name, SkString* skname);
+/** Converts a WCHAR string to a utf8 string.
+ *  @param nameLen the number of WCHARs in the name.
+ */
+HRESULT sk_wchar_to_skstring(WCHAR* name, int nameLen, SkString* skname);
 
 ////////////////////////////////////////////////////////////////////////////////
 // Locale
@@ -50,7 +57,7 @@ HRESULT SkGetGetUserDefaultLocaleNameProc(SkGetUserDefaultLocaleNameProc* proc);
 
 class AutoDWriteTable {
 public:
-    AutoDWriteTable(IDWriteFontFace* fontFace, UINT32 beTag) : fFontFace(fontFace), fExists(FALSE) {
+    AutoDWriteTable(IDWriteFontFace* fontFace, UINT32 beTag) : fExists(FALSE), fFontFace(fontFace) {
         // Any errors are ignored, user must check fExists anyway.
         fontFace->TryGetFontTable(beTag,
             reinterpret_cast<const void **>(&fData), &fSize, &fLock, &fExists);
@@ -78,4 +85,28 @@ public:
     const T* operator->() const { return reinterpret_cast<const T*>(fData); }
 };
 
+////////////////////////////////////////////////////////////////////////////////
+// Style conversion
+
+struct DWriteStyle {
+    explicit DWriteStyle(const SkFontStyle& pattern) {
+        switch (pattern.slant()) {
+        case SkFontStyle::kUpright_Slant:
+            fSlant = DWRITE_FONT_STYLE_NORMAL;
+            break;
+        case SkFontStyle::kItalic_Slant:
+            fSlant = DWRITE_FONT_STYLE_ITALIC;
+            break;
+        default:
+            SkASSERT(false);
+        }
+
+        fWeight = (DWRITE_FONT_WEIGHT)pattern.weight();
+        fWidth = (DWRITE_FONT_STRETCH)pattern.width();
+    }
+    DWRITE_FONT_STYLE fSlant;
+    DWRITE_FONT_WEIGHT fWeight;
+    DWRITE_FONT_STRETCH fWidth;
+};
+
 #endif
diff --git a/gfx/skia/skia/src/utils/win/SkDWriteFontFileStream.cpp b/gfx/skia/skia/src/utils/win/SkDWriteFontFileStream.cpp
index c7dc3b212814..d4bf8a2023c4 100644
--- a/gfx/skia/skia/src/utils/win/SkDWriteFontFileStream.cpp
+++ b/gfx/skia/skia/src/utils/win/SkDWriteFontFileStream.cpp
@@ -4,6 +4,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_WIN32)
 
 #include "SkTypes.h"
 #include "SkDWriteFontFileStream.h"
@@ -20,8 +22,8 @@
 SkDWriteFontFileStream::SkDWriteFontFileStream(IDWriteFontFileStream* fontFileStream)
     : fFontFileStream(SkRefComPtr(fontFileStream))
     , fPos(0)
-    , fLockedMemory(NULL)
-    , fFragmentLock(NULL) {
+    , fLockedMemory(nullptr)
+    , fFragmentLock(nullptr) {
 }
 
 SkDWriteFontFileStream::~SkDWriteFontFileStream() {
@@ -33,7 +35,7 @@ SkDWriteFontFileStream::~SkDWriteFontFileStream() {
 size_t SkDWriteFontFileStream::read(void* buffer, size_t size) {
     HRESULT hr = S_OK;
 
-    if (NULL == buffer) {
+    if (nullptr == buffer) {
         size_t fileSize = this->getLength();
 
         if (fPos + size > fileSize) {
@@ -85,7 +87,7 @@ bool SkDWriteFontFileStream::rewind() {
 }
 
 SkDWriteFontFileStream* SkDWriteFontFileStream::duplicate() const {
-    return SkNEW_ARGS(SkDWriteFontFileStream, (fFontFileStream.get()));
+    return new SkDWriteFontFileStream(fFontFileStream.get());
 }
 
 size_t SkDWriteFontFileStream::getPosition() const {
@@ -103,7 +105,7 @@ bool SkDWriteFontFileStream::move(long offset) {
 }
 
 SkDWriteFontFileStream* SkDWriteFontFileStream::fork() const {
-    SkAutoTUnref<SkDWriteFontFileStream> that(this->duplicate());
+    SkAutoTDelete<SkDWriteFontFileStream> that(this->duplicate());
     that->seek(fPos);
     return that.detach();
 }
@@ -133,16 +135,18 @@ const void* SkDWriteFontFileStream::getMemoryBase() {
 ///////////////////////////////////////////////////////////////////////////////
 //  SkIDWriteFontFileStreamWrapper
 
-HRESULT SkDWriteFontFileStreamWrapper::Create(SkStream* stream, SkDWriteFontFileStreamWrapper** streamFontFileStream) {
+HRESULT SkDWriteFontFileStreamWrapper::Create(SkStreamAsset* stream,
+                                              SkDWriteFontFileStreamWrapper** streamFontFileStream)
+{
     *streamFontFileStream = new SkDWriteFontFileStreamWrapper(stream);
-    if (NULL == streamFontFileStream) {
+    if (nullptr == streamFontFileStream) {
         return E_OUTOFMEMORY;
     }
     return S_OK;
 }
 
-SkDWriteFontFileStreamWrapper::SkDWriteFontFileStreamWrapper(SkStream* stream)
-    : fRefCount(1), fStream(SkRef(stream)) {
+SkDWriteFontFileStreamWrapper::SkDWriteFontFileStreamWrapper(SkStreamAsset* stream)
+    : fRefCount(1), fStream(stream) {
 }
 
 HRESULT STDMETHODCALLTYPE SkDWriteFontFileStreamWrapper::QueryInterface(REFIID iid, void** ppvObject) {
@@ -151,7 +155,7 @@ HRESULT STDMETHODCALLTYPE SkDWriteFontFileStreamWrapper::QueryInterface(REFIID i
         AddRef();
         return S_OK;
     } else {
-        *ppvObject = NULL;
+        *ppvObject = nullptr;
         return E_NOINTERFACE;
     }
 }
@@ -178,8 +182,8 @@ HRESULT STDMETHODCALLTYPE SkDWriteFontFileStreamWrapper::ReadFileFragment(
     UINT64 fileSize;
     this->GetFileSize(&fileSize);
     if (fileOffset > fileSize || fragmentSize > fileSize - fileOffset) {
-        *fragmentStart = NULL;
-        *fragmentContext = NULL;
+        *fragmentStart = nullptr;
+        *fragmentContext = nullptr;
         return E_FAIL;
     }
 
@@ -188,21 +192,18 @@ HRESULT STDMETHODCALLTYPE SkDWriteFontFileStreamWrapper::ReadFileFragment(
     }
 
     const void* data = fStream->getMemoryBase();
-    if (NULL != data) {
+    if (data) {
         *fragmentStart = static_cast<BYTE const*>(data) + static_cast<size_t>(fileOffset);
-        *fragmentContext = NULL;
+        *fragmentContext = nullptr;
 
     } else {
-        //May be called from multiple threads.
+        // May be called from multiple threads.
         SkAutoMutexAcquire ama(fStreamMutex);
 
-        *fragmentStart = NULL;
-        *fragmentContext = NULL;
+        *fragmentStart = nullptr;
+        *fragmentContext = nullptr;
 
-        if (!fStream->rewind()) {
-            return E_FAIL;
-        }
-        if (fStream->skip(static_cast<size_t>(fileOffset)) != fileOffset) {
+        if (!fStream->seek(static_cast<size_t>(fileOffset))) {
             return E_FAIL;
         }
         SkAutoTMalloc<uint8_t> streamData(static_cast<size_t>(fragmentSize));
@@ -230,3 +231,5 @@ HRESULT STDMETHODCALLTYPE SkDWriteFontFileStreamWrapper::GetLastWriteTime(UINT64
     *lastWriteTime = 0;
     return E_NOTIMPL;
 }
+
+#endif//defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/src/utils/win/SkDWriteFontFileStream.h b/gfx/skia/skia/src/utils/win/SkDWriteFontFileStream.h
index ac98be6142a4..e78b621c0230 100644
--- a/gfx/skia/skia/src/utils/win/SkDWriteFontFileStream.h
+++ b/gfx/skia/skia/src/utils/win/SkDWriteFontFileStream.h
@@ -10,6 +10,7 @@
 
 #include "SkTypes.h"
 
+#include "SkMutex.h"
 #include "SkStream.h"
 #include "SkTScopedComPtr.h"
 
@@ -24,16 +25,16 @@ public:
     explicit SkDWriteFontFileStream(IDWriteFontFileStream* fontFileStream);
     virtual ~SkDWriteFontFileStream();
 
-    virtual size_t read(void* buffer, size_t size) SK_OVERRIDE;
-    virtual bool isAtEnd() const SK_OVERRIDE;
-    virtual bool rewind() SK_OVERRIDE;
-    virtual SkDWriteFontFileStream* duplicate() const SK_OVERRIDE;
-    virtual size_t getPosition() const SK_OVERRIDE;
-    virtual bool seek(size_t position) SK_OVERRIDE;
-    virtual bool move(long offset) SK_OVERRIDE;
-    virtual SkDWriteFontFileStream* fork() const SK_OVERRIDE;
-    virtual size_t getLength() const SK_OVERRIDE;
-    virtual const void* getMemoryBase() SK_OVERRIDE;
+    size_t read(void* buffer, size_t size) override;
+    bool isAtEnd() const override;
+    bool rewind() override;
+    SkDWriteFontFileStream* duplicate() const override;
+    size_t getPosition() const override;
+    bool seek(size_t position) override;
+    bool move(long offset) override;
+    SkDWriteFontFileStream* fork() const override;
+    size_t getLength() const override;
+    const void* getMemoryBase() override;
 
 private:
     SkTScopedComPtr<IDWriteFontFileStream> fFontFileStream;
@@ -64,14 +65,15 @@ public:
     virtual HRESULT STDMETHODCALLTYPE GetFileSize(UINT64* fileSize);
     virtual HRESULT STDMETHODCALLTYPE GetLastWriteTime(UINT64* lastWriteTime);
 
-    static HRESULT Create(SkStream* stream, SkDWriteFontFileStreamWrapper** streamFontFileStream);
+    static HRESULT Create(SkStreamAsset* stream,
+                          SkDWriteFontFileStreamWrapper** streamFontFileStream);
 
 private:
-    explicit SkDWriteFontFileStreamWrapper(SkStream* stream);
+    explicit SkDWriteFontFileStreamWrapper(SkStreamAsset* stream);
     virtual ~SkDWriteFontFileStreamWrapper() { }
 
     ULONG fRefCount;
-    SkAutoTUnref<SkStream> fStream;
+    SkAutoTDelete<SkStreamAsset> fStream;
     SkMutex fStreamMutex;
 };
 #endif
diff --git a/gfx/skia/skia/src/utils/win/SkDWriteGeometrySink.cpp b/gfx/skia/skia/src/utils/win/SkDWriteGeometrySink.cpp
index b7ef88ba3b65..9f6a97caf14b 100644
--- a/gfx/skia/skia/src/utils/win/SkDWriteGeometrySink.cpp
+++ b/gfx/skia/skia/src/utils/win/SkDWriteGeometrySink.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "SkTypes.h"
+#if defined(SK_BUILD_FOR_WIN32)
 
 #include "SkDWriteGeometrySink.h"
 #include "SkFloatUtils.h"
@@ -19,7 +20,7 @@ SkDWriteGeometrySink::SkDWriteGeometrySink(SkPath* path) : fRefCount(1), fPath(p
 SkDWriteGeometrySink::~SkDWriteGeometrySink() { }
 
 HRESULT STDMETHODCALLTYPE SkDWriteGeometrySink::QueryInterface(REFIID iid, void **object) {
-    if (NULL == object) {
+    if (nullptr == object) {
         return E_INVALIDARG;
     }
     if (iid == __uuidof(IUnknown) || iid == __uuidof(IDWriteGeometrySink)) {
@@ -27,7 +28,7 @@ HRESULT STDMETHODCALLTYPE SkDWriteGeometrySink::QueryInterface(REFIID iid, void
         this->AddRef();
         return S_OK;
     } else {
-        *object = NULL;
+        *object = nullptr;
         return E_NOINTERFACE;
     }
 }
@@ -144,3 +145,5 @@ HRESULT SkDWriteGeometrySink::Create(SkPath* path, IDWriteGeometrySink** geometr
     *geometryToPath = new SkDWriteGeometrySink(path);
     return S_OK;
 }
+
+#endif//defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/src/utils/win/SkDWriteGeometrySink.h b/gfx/skia/skia/src/utils/win/SkDWriteGeometrySink.h
index 99a3262718bb..417c7f0d07c4 100644
--- a/gfx/skia/skia/src/utils/win/SkDWriteGeometrySink.h
+++ b/gfx/skia/skia/src/utils/win/SkDWriteGeometrySink.h
@@ -28,17 +28,17 @@ protected:
     virtual ~SkDWriteGeometrySink();
 
 public:
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **object) SK_OVERRIDE;
-    virtual ULONG STDMETHODCALLTYPE AddRef(void) SK_OVERRIDE;
-    virtual ULONG STDMETHODCALLTYPE Release(void) SK_OVERRIDE;
+    HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **object) override;
+    ULONG STDMETHODCALLTYPE AddRef(void) override;
+    ULONG STDMETHODCALLTYPE Release(void) override;
 
-    virtual void STDMETHODCALLTYPE SetFillMode(D2D1_FILL_MODE fillMode) SK_OVERRIDE;
-    virtual void STDMETHODCALLTYPE SetSegmentFlags(D2D1_PATH_SEGMENT vertexFlags) SK_OVERRIDE;
-    virtual void STDMETHODCALLTYPE BeginFigure(D2D1_POINT_2F startPoint, D2D1_FIGURE_BEGIN figureBegin) SK_OVERRIDE;
-    virtual void STDMETHODCALLTYPE AddLines(const D2D1_POINT_2F *points, UINT pointsCount) SK_OVERRIDE;
-    virtual void STDMETHODCALLTYPE AddBeziers(const D2D1_BEZIER_SEGMENT *beziers, UINT beziersCount) SK_OVERRIDE;
-    virtual void STDMETHODCALLTYPE EndFigure(D2D1_FIGURE_END figureEnd) SK_OVERRIDE;
-    virtual HRESULT STDMETHODCALLTYPE Close() SK_OVERRIDE;
+    void STDMETHODCALLTYPE SetFillMode(D2D1_FILL_MODE fillMode) override;
+    void STDMETHODCALLTYPE SetSegmentFlags(D2D1_PATH_SEGMENT vertexFlags) override;
+    void STDMETHODCALLTYPE BeginFigure(D2D1_POINT_2F startPoint, D2D1_FIGURE_BEGIN figureBegin) override;
+    void STDMETHODCALLTYPE AddLines(const D2D1_POINT_2F *points, UINT pointsCount) override;
+    void STDMETHODCALLTYPE AddBeziers(const D2D1_BEZIER_SEGMENT *beziers, UINT beziersCount) override;
+    void STDMETHODCALLTYPE EndFigure(D2D1_FIGURE_END figureEnd) override;
+    HRESULT STDMETHODCALLTYPE Close() override;
 
     static HRESULT Create(SkPath* path, IDWriteGeometrySink** geometryToPath);
 };
diff --git a/gfx/skia/skia/src/utils/win/SkHRESULT.cpp b/gfx/skia/skia/src/utils/win/SkHRESULT.cpp
index 495f074eb258..d95629961b94 100644
--- a/gfx/skia/skia/src/utils/win/SkHRESULT.cpp
+++ b/gfx/skia/skia/src/utils/win/SkHRESULT.cpp
@@ -6,32 +6,35 @@
  */
 
 #include "SkTypes.h"
+#if defined(SK_BUILD_FOR_WIN32)
 
 #include "SkHRESULT.h"
 
 void SkTraceHR(const char* file, unsigned long line, HRESULT hr, const char* msg) {
-    if (NULL != msg) {
+    if (msg) {
         SkDebugf("%s\n", msg);
     }
     SkDebugf("%s(%lu) : error 0x%x: ", file, line, hr);
 
-    LPSTR errorText = NULL;
+    LPSTR errorText = nullptr;
     FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER |
                    FORMAT_MESSAGE_FROM_SYSTEM |
                    FORMAT_MESSAGE_IGNORE_INSERTS,
-                   NULL,
+                   nullptr,
                    hr,
                    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
                    (LPSTR) &errorText,
                    0,
-                   NULL
+                   nullptr
     );
 
-    if (NULL == errorText) {
+    if (nullptr == errorText) {
         SkDebugf("<unknown>\n");
     } else {
         SkDebugf("%s", errorText);
         LocalFree(errorText);
-        errorText = NULL;
+        errorText = nullptr;
     }
 }
+
+#endif//defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/src/utils/win/SkIStream.cpp b/gfx/skia/skia/src/utils/win/SkIStream.cpp
index 74d814ccb1c4..fdb6ce6eff26 100644
--- a/gfx/skia/skia/src/utils/win/SkIStream.cpp
+++ b/gfx/skia/skia/src/utils/win/SkIStream.cpp
@@ -6,6 +6,8 @@
  * found in the LICENSE file.
  */
 
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_WIN32)
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -22,7 +24,7 @@ SkBaseIStream::~SkBaseIStream() { }
 HRESULT STDMETHODCALLTYPE SkBaseIStream::QueryInterface(REFIID iid
                                                       , void ** ppvObject)
 {
-    if (NULL == ppvObject) {
+    if (nullptr == ppvObject) {
         return E_INVALIDARG;
     }
     if (iid == __uuidof(IUnknown)
@@ -33,7 +35,7 @@ HRESULT STDMETHODCALLTYPE SkBaseIStream::QueryInterface(REFIID iid
         AddRef();
         return S_OK;
     } else {
-        *ppvObject = NULL;
+        *ppvObject = nullptr;
         return E_NOINTERFACE;
     }
 }
@@ -103,29 +105,29 @@ HRESULT STDMETHODCALLTYPE SkBaseIStream::Stat(STATSTG* pStatstg
 /**
  * SkIStream
  */
-SkIStream::SkIStream(SkStream* stream, bool unrefOnRelease)
+SkIStream::SkIStream(SkStream* stream, bool deleteOnRelease)
     : SkBaseIStream()
     , fSkStream(stream)
-    , fUnrefOnRelease(unrefOnRelease)
+    , fDeleteOnRelease(deleteOnRelease)
     , fLocation()
 {
     this->fSkStream->rewind();
 }
 
 SkIStream::~SkIStream() {
-    if (NULL != this->fSkStream && fUnrefOnRelease) {
-        this->fSkStream->unref();
+    if (fDeleteOnRelease) {
+        delete this->fSkStream;
     }
 }
 
 HRESULT SkIStream::CreateFromSkStream(SkStream* stream
-                                    , bool unrefOnRelease
+                                    , bool deleteOnRelease
                                     , IStream ** ppStream)
 {
-    if (NULL == stream) {
+    if (nullptr == stream) {
         return E_INVALIDARG;
     }
-    *ppStream = new SkIStream(stream, unrefOnRelease);
+    *ppStream = new SkIStream(stream, deleteOnRelease);
     return S_OK;
 }
 
@@ -196,7 +198,7 @@ HRESULT STDMETHODCALLTYPE SkIStream::Seek(LARGE_INTEGER liDistanceToMove
         break;
     }
 
-    if (NULL != lpNewFilePointer) {
+    if (lpNewFilePointer) {
         lpNewFilePointer->QuadPart = this->fLocation.QuadPart;
     }
     return hr;
@@ -208,7 +210,7 @@ HRESULT STDMETHODCALLTYPE SkIStream::Stat(STATSTG* pStatstg
     if (0 == (grfStatFlag & STATFLAG_NONAME)) {
         return STG_E_INVALIDFLAG;
     }
-    pStatstg->pwcsName = NULL;
+    pStatstg->pwcsName = nullptr;
     // FIXME: Should not depend on getLength
     // See https://code.google.com/p/skia/issues/detail?id=1570
     pStatstg->cbSize.QuadPart = this->fSkStream->getLength();
@@ -228,7 +230,7 @@ SkWIStream::SkWIStream(SkWStream* stream)
 { }
 
 SkWIStream::~SkWIStream() {
-    if (NULL != this->fSkWStream) {
+    if (this->fSkWStream) {
         this->fSkWStream->flush();
     }
 }
@@ -268,10 +270,11 @@ HRESULT STDMETHODCALLTYPE SkWIStream::Stat(STATSTG* pStatstg
     if (0 == (grfStatFlag & STATFLAG_NONAME)) {
         return STG_E_INVALIDFLAG;
     }
-    pStatstg->pwcsName = NULL;
+    pStatstg->pwcsName = nullptr;
     pStatstg->cbSize.QuadPart = 0;
     pStatstg->clsid = CLSID_NULL;
     pStatstg->type = STGTY_STREAM;
     pStatstg->grfMode = STGM_WRITE;
     return S_OK;
 }
+#endif//defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/include/utils/SkWGL.h b/gfx/skia/skia/src/utils/win/SkWGL.h
similarity index 100%
rename from gfx/skia/skia/include/utils/SkWGL.h
rename to gfx/skia/skia/src/utils/win/SkWGL.h
diff --git a/gfx/skia/skia/src/utils/win/SkWGL_win.cpp b/gfx/skia/skia/src/utils/win/SkWGL_win.cpp
index 9c0c2d4bbb7e..5afcae94cec4 100644
--- a/gfx/skia/skia/src/utils/win/SkWGL_win.cpp
+++ b/gfx/skia/skia/src/utils/win/SkWGL_win.cpp
@@ -6,6 +6,9 @@
  * found in the LICENSE file.
  */
 
+#include "SkTypes.h"
+#if defined(SK_BUILD_FOR_WIN32)
+
 #include "SkWGL.h"
 
 #include "SkTDArray.h"
@@ -13,7 +16,7 @@
 #include "SkTSort.h"
 
 bool SkWGLExtensions::hasExtension(HDC dc, const char* ext) const {
-    if (NULL == this->fGetExtensionsString) {
+    if (nullptr == this->fGetExtensionsString) {
         return false;
     }
     if (!strcmp("WGL_ARB_extensions_string", ext)) {
@@ -123,6 +126,9 @@ int SkWGLExtensions::selectFormat(const int formats[],
                                   int formatCount,
                                   HDC dc,
                                   int desiredSampleCount) const {
+    if (formatCount <= 0) {
+        return -1;
+    }
     PixelFormat desiredFormat = {
         0,
         desiredSampleCount,
@@ -168,7 +174,7 @@ namespace {
 #define DUMMY_CLASS STR_LIT("DummyClass")
 
 HWND create_dummy_window() {
-    HMODULE module = GetModuleHandle(NULL);
+    HMODULE module = GetModuleHandle(nullptr);
     HWND dummy;
     RECT windowRect;
     windowRect.left = 0;
@@ -183,10 +189,10 @@ HWND create_dummy_window() {
     wc.cbClsExtra = 0;
     wc.cbWndExtra = 0;
     wc.hInstance = module;
-    wc.hIcon = LoadIcon(NULL, IDI_WINLOGO);
-    wc.hCursor = LoadCursor(NULL, IDC_ARROW);
-    wc.hbrBackground = NULL;
-    wc.lpszMenuName = NULL;
+    wc.hIcon = LoadIcon(nullptr, IDI_WINLOGO);
+    wc.hCursor = LoadCursor(nullptr, IDC_ARROW);
+    wc.hbrBackground = nullptr;
+    wc.lpszMenuName = nullptr;
     wc.lpszClassName = DUMMY_CLASS;
 
     if(!RegisterClass(&wc)) {
@@ -205,11 +211,11 @@ HWND create_dummy_window() {
                                 0, 0,
                                 windowRect.right-windowRect.left,
                                 windowRect.bottom-windowRect.top,
-                                NULL, NULL,
+                                nullptr, nullptr,
                                 module,
-                                NULL))) {
+                                nullptr))) {
         UnregisterClass(DUMMY_CLASS, module);
-        return NULL;
+        return nullptr;
     }
     ShowWindow(dummy, SW_HIDE);
 
@@ -218,7 +224,7 @@ HWND create_dummy_window() {
 
 void destroy_dummy_window(HWND dummy) {
     DestroyWindow(dummy);
-    HMODULE module = GetModuleHandle(NULL);
+    HMODULE module = GetModuleHandle(nullptr);
     UnregisterClass(DUMMY_CLASS, module);
 }
 }
@@ -227,16 +233,16 @@ void destroy_dummy_window(HWND dummy) {
                      (##NAME##Proc) wglGetProcAddress("wgl" #NAME #SUFFIX)
 
 SkWGLExtensions::SkWGLExtensions()
-    : fGetExtensionsString(NULL)
-    , fChoosePixelFormat(NULL)
-    , fGetPixelFormatAttribfv(NULL)
-    , fGetPixelFormatAttribiv(NULL)
-    , fCreateContextAttribs(NULL)
-    , fSwapInterval(NULL)
-    , fCreatePbuffer(NULL)
-    , fGetPbufferDC(NULL)
-    , fReleasePbufferDC(NULL)
-    , fDestroyPbuffer(NULL)
+    : fGetExtensionsString(nullptr)
+    , fChoosePixelFormat(nullptr)
+    , fGetPixelFormatAttribfv(nullptr)
+    , fGetPixelFormatAttribiv(nullptr)
+    , fCreateContextAttribs(nullptr)
+    , fSwapInterval(nullptr)
+    , fCreatePbuffer(nullptr)
+    , fGetPbufferDC(nullptr)
+    , fReleasePbufferDC(nullptr)
+    , fDestroyPbuffer(nullptr)
  {
     HDC prevDC = wglGetCurrentDC();
     HGLRC prevGLRC = wglGetCurrentContext();
@@ -272,7 +278,7 @@ SkWGLExtensions::SkWGLExtensions()
         GET_PROC(ReleasePbufferDC, ARB);
         GET_PROC(DestroyPbuffer, ARB);
 
-        wglMakeCurrent(dummyDC, NULL);
+        wglMakeCurrent(dummyDC, nullptr);
         wglDeleteContext(dummyGLRC);
         destroy_dummy_window(dummyWND);
     }
@@ -329,11 +335,11 @@ static HGLRC create_gl_context(HDC dc, SkWGLExtensions extensions, SkWGLContextR
     HDC prevDC = wglGetCurrentDC();
     HGLRC prevGLRC = wglGetCurrentContext();
 
-    HGLRC glrc = NULL;
+    HGLRC glrc = nullptr;
     if (kGLES_SkWGLContextRequest == contextType) {
         if (!extensions.hasExtension(dc, "WGL_EXT_create_context_es2_profile")) {
             wglMakeCurrent(prevDC, prevGLRC);
-            return NULL;
+            return nullptr;
         }
         static const int glesAttribs[] = {
             SK_WGL_CONTEXT_MAJOR_VERSION, 3,
@@ -341,10 +347,10 @@ static HGLRC create_gl_context(HDC dc, SkWGLExtensions extensions, SkWGLContextR
             SK_WGL_CONTEXT_PROFILE_MASK,  SK_WGL_CONTEXT_ES2_PROFILE_BIT,
             0,
         };
-        glrc = extensions.createContextAttribs(dc, NULL, glesAttribs);
-        if (NULL == glrc) {
+        glrc = extensions.createContextAttribs(dc, nullptr, glesAttribs);
+        if (nullptr == glrc) {
             wglMakeCurrent(prevDC, prevGLRC);
-            return NULL;
+            return nullptr;
         }
     } else {
         if (kGLPreferCoreProfile_SkWGLContextRequest == contextType &&
@@ -366,15 +372,15 @@ static HGLRC create_gl_context(HDC dc, SkWGLExtensions extensions, SkWGLContextR
             for (int v = 0; v < SK_ARRAY_COUNT(kCoreGLVersions) / 2; ++v) {
                 coreProfileAttribs[1] = kCoreGLVersions[2 * v];
                 coreProfileAttribs[3] = kCoreGLVersions[2 * v + 1];
-                glrc = extensions.createContextAttribs(dc, NULL, coreProfileAttribs);
-                if (NULL != glrc) {
+                glrc = extensions.createContextAttribs(dc, nullptr, coreProfileAttribs);
+                if (glrc) {
                     break;
                 }
             }
         }
     }
 
-    if (NULL == glrc) {
+    if (nullptr == glrc) {
         glrc = wglCreateContext(dc);
     }
     SkASSERT(glrc);
@@ -391,7 +397,7 @@ static HGLRC create_gl_context(HDC dc, SkWGLExtensions extensions, SkWGLContextR
 HGLRC SkCreateWGLContext(HDC dc, int msaaSampleCount, SkWGLContextRequest contextType) {
     SkWGLExtensions extensions;
     if (!extensions.hasExtension(dc, "WGL_ARB_pixel_format")) {
-        return NULL;
+        return nullptr;
     }
 
     BOOL set = FALSE;
@@ -407,7 +413,7 @@ HGLRC SkCreateWGLContext(HDC dc, int msaaSampleCount, SkWGLContextRequest contex
     }
 
     if (!set) {
-        return NULL;
+        return nullptr;
     }
 
     return create_gl_context(dc, extensions, contextType);}
@@ -417,7 +423,7 @@ SkWGLPbufferContext* SkWGLPbufferContext::Create(HDC parentDC, int msaaSampleCou
     SkWGLExtensions extensions;
     if (!extensions.hasExtension(parentDC, "WGL_ARB_pixel_format") ||
         !extensions.hasExtension(parentDC, "WGL_ARB_pbuffer")) {
-        return NULL;
+        return nullptr;
     }
 
     // try for single buffer first
@@ -426,13 +432,13 @@ SkWGLPbufferContext* SkWGLPbufferContext::Create(HDC parentDC, int msaaSampleCou
         get_pixel_formats_to_try(parentDC, extensions, (0 != dblBuffer), msaaSampleCount,
                                  pixelFormatsToTry);
         for (int f = 0; -1 != pixelFormatsToTry[f] && f < SK_ARRAY_COUNT(pixelFormatsToTry); ++f) {
-            HPBUFFER pbuf = extensions.createPbuffer(parentDC, pixelFormatsToTry[f], 1, 1, NULL);
+            HPBUFFER pbuf = extensions.createPbuffer(parentDC, pixelFormatsToTry[f], 1, 1, nullptr);
             if (0 != pbuf) {
                 HDC dc = extensions.getPbufferDC(pbuf);
-                if (NULL != dc) {
+                if (dc) {
                     HGLRC glrc = create_gl_context(dc, extensions, contextType);
-                    if (NULL != glrc) {
-                        return SkNEW_ARGS(SkWGLPbufferContext, (pbuf, dc, glrc));
+                    if (glrc) {
+                        return new SkWGLPbufferContext(pbuf, dc, glrc);
                     }
                     extensions.releasePbufferDC(pbuf, dc);
                 }
@@ -440,7 +446,7 @@ SkWGLPbufferContext* SkWGLPbufferContext::Create(HDC parentDC, int msaaSampleCou
             }
         }
     }
-    return NULL;
+    return nullptr;
 }
 
 SkWGLPbufferContext::~SkWGLPbufferContext() {
@@ -455,3 +461,5 @@ SkWGLPbufferContext::SkWGLPbufferContext(HPBUFFER pbuffer, HDC dc, HGLRC glrc)
     , fDC(dc)
     , fGLRC(glrc) {
 }
+
+#endif//defined(SK_BUILD_FOR_WIN32)
diff --git a/gfx/skia/skia/src/views/SkEvent.cpp b/gfx/skia/skia/src/views/SkEvent.cpp
index 52a0c4dd7ff5..5316b49a1d4d 100644
--- a/gfx/skia/skia/src/views/SkEvent.cpp
+++ b/gfx/skia/skia/src/views/SkEvent.cpp
@@ -11,14 +11,14 @@
 
 void SkEvent::initialize(const char* type, size_t typeLen,
                          SkEventSinkID targetID) {
-    fType = NULL;
+    fType = nullptr;
     setType(type, typeLen);
     f32 = 0;
     fTargetID = targetID;
-    fTargetProc = NULL;
+    fTargetProc = nullptr;
 #ifdef SK_DEBUG
     fTime = 0;
-    fNextEvent = NULL;
+    fNextEvent = nullptr;
 #endif
 }
 
@@ -128,7 +128,7 @@ void SkEvent::inflate(const SkDOM& dom, const SkDOM::Node* node)
         this->setType(name);
 
     const char* value;
-    if ((value = dom.findAttr(node, "fast32")) != NULL)
+    if ((value = dom.findAttr(node, "fast32")) != nullptr)
     {
         int32_t n;
         if (SkParse::FindS32(value, &n))
@@ -144,25 +144,25 @@ void SkEvent::inflate(const SkDOM& dom, const SkDOM::Node* node)
         }
 
         name = dom.findAttr(node, "name");
-        if (name == NULL)
+        if (name == nullptr)
         {
             SkDEBUGCODE(SkDebugf("SkEvent::inflate missing required \"name\" attribute in <data> subelement\n");)
             continue;
         }
 
-        if ((value = dom.findAttr(node, "s32")) != NULL)
+        if ((value = dom.findAttr(node, "s32")) != nullptr)
         {
             int32_t n;
             if (SkParse::FindS32(value, &n))
                 this->setS32(name, n);
         }
-        else if ((value = dom.findAttr(node, "scalar")) != NULL)
+        else if ((value = dom.findAttr(node, "scalar")) != nullptr)
         {
             SkScalar x;
             if (SkParse::FindScalar(value, &x))
                 this->setScalar(name, x);
         }
-        else if ((value = dom.findAttr(node, "string")) != NULL)
+        else if ((value = dom.findAttr(node, "string")) != nullptr)
             this->setString(name, value);
 #ifdef SK_DEBUG
         else
@@ -194,7 +194,7 @@ void SkEvent::inflate(const SkDOM& dom, const SkDOM::Node* node)
         int                 count;
         const char*         name;
 
-        while ((name = iter.next(&mtype, &count)) != NULL)
+        while ((name = iter.next(&mtype, &count)) != nullptr)
         {
             SkASSERT(count > 0);
 
@@ -209,7 +209,7 @@ void SkEvent::inflate(const SkDOM& dom, const SkDOM::Node* node)
                 break;
             case SkMetaData::kScalar_Type:
                 {
-                    const SkScalar* values = md.findScalars(name, &count, NULL);
+                    const SkScalar* values = md.findScalars(name, &count, nullptr);
                     SkDebugf("%f", SkScalarToFloat(values[0]));
                     for (int i = 1; i < count; i++)
                         SkDebugf(", %f", SkScalarToFloat(values[i]));
@@ -265,15 +265,15 @@ void SkEvent::inflate(const SkDOM& dom, const SkDOM::Node* node)
     #define EVENT_LOGN(s, n)
 #endif
 
-#include "SkThread.h"
+#include "SkMutex.h"
 #include "SkTime.h"
 
 class SkEvent_Globals {
 public:
     SkEvent_Globals() {
-        fEventQHead = NULL;
-        fEventQTail = NULL;
-        fDelayQHead = NULL;
+        fEventQHead = nullptr;
+        fEventQTail = nullptr;
+        fDelayQHead = nullptr;
         SkDEBUGCODE(fEventCounter = 0;)
     }
 
@@ -338,14 +338,14 @@ bool SkEvent::Enqueue(SkEvent* evt) {
 
     SkASSERT(evt);
 
-    bool wasEmpty = globals.fEventQHead == NULL;
+    bool wasEmpty = globals.fEventQHead == nullptr;
 
     if (globals.fEventQTail)
         globals.fEventQTail->fNextEvent = evt;
     globals.fEventQTail = evt;
-    if (globals.fEventQHead == NULL)
+    if (globals.fEventQHead == nullptr)
         globals.fEventQHead = evt;
-    evt->fNextEvent = NULL;
+    evt->fNextEvent = nullptr;
 
     SkDEBUGCODE(++globals.fEventCounter);
 
@@ -361,8 +361,8 @@ SkEvent* SkEvent::Dequeue() {
         SkDEBUGCODE(--globals.fEventCounter);
 
         globals.fEventQHead = evt->fNextEvent;
-        if (globals.fEventQHead == NULL) {
-            globals.fEventQTail = NULL;
+        if (globals.fEventQHead == nullptr) {
+            globals.fEventQTail = nullptr;
         }
     }
     globals.fEventMutex.release();
@@ -374,7 +374,7 @@ bool SkEvent::QHasEvents() {
     SkEvent_Globals& globals = getGlobals();
 
     // this is not thread accurate, need a semaphore for that
-    return globals.fEventQHead != NULL;
+    return globals.fEventQHead != nullptr;
 }
 
 #ifdef SK_TRACE_EVENTS
@@ -386,7 +386,7 @@ SkMSec SkEvent::EnqueueTime(SkEvent* evt, SkMSec time) {
     //  gEventMutex acquired by caller
 
     SkEvent* curr = globals.fDelayQHead;
-    SkEvent* prev = NULL;
+    SkEvent* prev = nullptr;
 
     while (curr) {
         if (SkMSec_LT(time, curr->fTime)) {
@@ -398,7 +398,7 @@ SkMSec SkEvent::EnqueueTime(SkEvent* evt, SkMSec time) {
 
     evt->fTime = time;
     evt->fNextEvent = curr;
-    if (prev == NULL) {
+    if (prev == nullptr) {
         globals.fDelayQHead = evt;
     } else {
         prev->fNextEvent = evt;
diff --git a/gfx/skia/skia/src/views/SkEventSink.cpp b/gfx/skia/skia/src/views/SkEventSink.cpp
index 7763adef54b2..003bf8c4fe24 100644
--- a/gfx/skia/skia/src/views/SkEventSink.cpp
+++ b/gfx/skia/skia/src/views/SkEventSink.cpp
@@ -8,17 +8,15 @@
 
 
 #include "SkEventSink.h"
+#include "SkMutex.h"
 #include "SkTagList.h"
-#include "SkThread.h"
-
-#include "SkThread.h"
 #include "SkTime.h"
 
 class SkEventSink_Globals {
 public:
     SkEventSink_Globals() {
         fNextSinkID = 0;
-        fSinkHead = NULL;
+        fSinkHead = nullptr;
     }
 
     SkMutex         fSinkMutex;
@@ -32,7 +30,7 @@ static SkEventSink_Globals& getGlobals() {
     return *gGlobals;
 }
 
-SkEventSink::SkEventSink() : fTagHead(NULL) {
+SkEventSink::SkEventSink() : fTagHead(nullptr) {
     SkEventSink_Globals& globals = getGlobals();
 
     globals.fSinkMutex.acquire();
@@ -53,7 +51,7 @@ SkEventSink::~SkEventSink() {
     globals.fSinkMutex.acquire();
 
     SkEventSink* sink = globals.fSinkHead;
-    SkEventSink* prev = NULL;
+    SkEventSink* prev = nullptr;
 
     for (;;) {
         SkEventSink* next = sink->fNextSink;
@@ -91,12 +89,12 @@ bool SkEventSink::onQuery(SkEvent*) {
 ///////////////////////////////////////////////////////////////////////////////
 
 SkTagList* SkEventSink::findTagList(U8CPU tag) const {
-    return fTagHead ? SkTagList::Find(fTagHead, tag) : NULL;
+    return fTagHead ? SkTagList::Find(fTagHead, tag) : nullptr;
 }
 
 void SkEventSink::addTagList(SkTagList* rec) {
     SkASSERT(rec);
-    SkASSERT(fTagHead == NULL || SkTagList::Find(fTagHead, rec->fTag) == NULL);
+    SkASSERT(fTagHead == nullptr || SkTagList::Find(fTagHead, rec->fTag) == nullptr);
 
     rec->fNext = fTagHead;
     fTagHead = rec;
@@ -150,7 +148,7 @@ void SkEventSink::addListenerID(SkEventSinkID id)
         count = prev->countListners();
     }
 
-    SkListenersTagList* next = SkNEW_ARGS(SkListenersTagList, (count + 1));
+    SkListenersTagList* next = new SkListenersTagList(count + 1);
 
     if (prev)
     {
@@ -164,7 +162,7 @@ void SkEventSink::addListenerID(SkEventSinkID id)
 void SkEventSink::copyListeners(const SkEventSink& sink)
 {
     SkListenersTagList* sinkList = (SkListenersTagList*)sink.findTagList(kListeners_SkTagList);
-    if (sinkList == NULL)
+    if (sinkList == nullptr)
         return;
     SkASSERT(sinkList->countListners() > 0);
     const SkEventSinkID* iter = sinkList->fIDs;
@@ -180,7 +178,7 @@ void SkEventSink::removeListenerID(SkEventSinkID id)
 
     SkListenersTagList* list = (SkListenersTagList*)this->findTagList(kListeners_SkTagList);
 
-    if (list == NULL)
+    if (list == nullptr)
         return;
 
     int index = list->find(id);
@@ -201,7 +199,7 @@ void SkEventSink::removeListenerID(SkEventSinkID id)
 
 bool SkEventSink::hasListeners() const
 {
-    return this->findTagList(kListeners_SkTagList) != NULL;
+    return this->findTagList(kListeners_SkTagList) != nullptr;
 }
 
 void SkEventSink::postToListeners(const SkEvent& evt, SkMSec delay) {
@@ -211,7 +209,7 @@ void SkEventSink::postToListeners(const SkEvent& evt, SkMSec delay) {
         const SkEventSinkID* iter = list->fIDs;
         const SkEventSinkID* stop = iter + list->countListners();
         while (iter < stop) {
-            SkEvent* copy = SkNEW_ARGS(SkEvent, (evt));
+            SkEvent* copy = new SkEvent(evt);
             copy->setTargetID(*iter++)->postDelay(delay);
         }
     }
@@ -248,7 +246,7 @@ SkEventSink* SkEventSink::FindSink(SkEventSinkID sinkID)
             return sink;
         sink = sink->fNextSink;
     }
-    return NULL;
+    return nullptr;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////
@@ -256,7 +254,7 @@ SkEventSink* SkEventSink::FindSink(SkEventSinkID sinkID)
 
 #if 0   // experimental, not tested
 
-#include "SkThread.h"
+#include "SkMutex.h"
 #include "SkTDict.h"
 
 #define kMinStringBufferSize    128
diff --git a/gfx/skia/skia/src/views/SkOSMenu.cpp b/gfx/skia/skia/src/views/SkOSMenu.cpp
index 3de0a9eb770b..ec92a7b4a5f4 100644
--- a/gfx/skia/skia/src/views/SkOSMenu.cpp
+++ b/gfx/skia/skia/src/views/SkOSMenu.cpp
@@ -4,9 +4,9 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include <stdarg.h>
+#include "SkAtomics.h"
 #include "SkOSMenu.h"
-#include "SkThread.h"
+#include <stdarg.h>
 
 static int gOSMenuCmd = 7000;
 
@@ -28,11 +28,11 @@ const SkOSMenu::Item* SkOSMenu::getItemByID(int itemID) const {
         if (itemID == fItems[i]->getID())
             return fItems[i];
     }
-    return NULL;
+    return nullptr;
 }
 
 void SkOSMenu::getItems(const SkOSMenu::Item* items[]) const {
-    if (NULL != items) {
+    if (items) {
         for (int i = 0; i < fItems.count(); ++i) {
             items[i] = fItems[i];
         }
@@ -155,7 +155,7 @@ int SkOSMenu::appendList(const char label[], const char slotName[],
         SkString str(option);
         va_start(args, option);
         int count = 1;
-        for (const char* arg = va_arg(args, const char*); arg != NULL; arg = va_arg(args, const char*)) {
+        for (const char* arg = va_arg(args, const char*); arg != nullptr; arg = va_arg(args, const char*)) {
             str += gDelimiter;
             str += arg;
             ++count;
@@ -204,15 +204,15 @@ bool SkOSMenu::FindListItemCount(const SkEvent& evt, int* count) {
 }
 
 bool SkOSMenu::FindListItems(const SkEvent& evt, SkString items[]) {
-    if (evt.isType(gMenuEventType) && NULL != items) {
+    if (evt.isType(gMenuEventType) && items) {
         const char* text = evt.findString(gList_Items_Str);
-        if (text != NULL) {
+        if (text != nullptr) {
             SkString temp(text);
             char* token = strtok((char*)temp.c_str(), gDelimiter);
             int index = 0;
-            while (token != NULL) {
+            while (token != nullptr) {
                 items[index].set(token, strlen(token));
-                token = strtok (NULL, gDelimiter);
+                token = strtok (nullptr, gDelimiter);
                 ++index;
             }
         }
diff --git a/gfx/skia/skia/src/views/SkParsePaint.cpp b/gfx/skia/skia/src/views/SkParsePaint.cpp
index 5b4476423e88..1a1b7067bad8 100644
--- a/gfx/skia/skia/src/views/SkParsePaint.cpp
+++ b/gfx/skia/skia/src/views/SkParsePaint.cpp
@@ -13,8 +13,8 @@
 
 static SkShader* inflate_shader(const SkDOM& dom, const SkDOM::Node* node)
 {
-    if ((node = dom.getFirstChild(node, "shader")) == NULL)
-        return NULL;
+    if ((node = dom.getFirstChild(node, "shader")) == nullptr)
+        return nullptr;
 
     const char* str;
 
@@ -24,9 +24,9 @@ static SkShader* inflate_shader(const SkDOM& dom, const SkDOM::Node* node)
         SkPoint        pts[2];
 
         colors[0] = colors[1] = SK_ColorBLACK;    // need to initialized the alpha to opaque, since FindColor doesn't set it
-        if ((str = dom.findAttr(node, "c0")) != NULL &&
+        if ((str = dom.findAttr(node, "c0")) != nullptr &&
             SkParse::FindColor(str, &colors[0]) &&
-            (str = dom.findAttr(node, "c1")) != NULL &&
+            (str = dom.findAttr(node, "c1")) != nullptr &&
             SkParse::FindColor(str, &colors[1]) &&
             dom.findScalars(node, "p0", &pts[0].fX, 2) &&
             dom.findScalars(node, "p1", &pts[1].fX, 2))
@@ -36,13 +36,13 @@ static SkShader* inflate_shader(const SkDOM& dom, const SkDOM::Node* node)
 
             if ((index = dom.findList(node, "tile-mode", "clamp,repeat,mirror")) >= 0)
                 mode = (SkShader::TileMode)index;
-            return SkGradientShader::CreateLinear(pts, colors, NULL, 2, mode);
+            return SkGradientShader::CreateLinear(pts, colors, nullptr, 2, mode);
         }
     }
     else if (dom.hasAttr(node, "type", "bitmap"))
     {
-        if ((str = dom.findAttr(node, "src")) == NULL)
-            return NULL;
+        if ((str = dom.findAttr(node, "src")) == nullptr)
+            return nullptr;
 
         SkBitmap    bm;
 
@@ -57,7 +57,7 @@ static SkShader* inflate_shader(const SkDOM& dom, const SkDOM::Node* node)
             return SkShader::CreateBitmapShader(bm, mode, mode);
         }
     }
-    return NULL;
+    return nullptr;
 }
 
 void SkPaint_Inflate(SkPaint* paint, const SkDOM& dom, const SkDOM::Node* node)
diff --git a/gfx/skia/skia/src/views/SkProgressView.cpp b/gfx/skia/skia/src/views/SkProgressView.cpp
index 03e28eb2089c..7ce022dd7333 100644
--- a/gfx/skia/skia/src/views/SkProgressView.cpp
+++ b/gfx/skia/skia/src/views/SkProgressView.cpp
@@ -12,11 +12,11 @@
 #include "SkInterpolator.h"
 #include "SkTime.h"
 
-SkProgressView::SkProgressView(uint32_t flags) : SkView(flags), fOnShader(NULL), fOffShader(NULL)
+SkProgressView::SkProgressView(uint32_t flags) : SkView(flags), fOnShader(nullptr), fOffShader(nullptr)
 {
     fValue = 0;
     fMax = 0;
-    fInterp = NULL;
+    fInterp = nullptr;
     fDoInterp = false;
 }
 
@@ -33,7 +33,7 @@ void SkProgressView::setMax(U16CPU max)
     {
         fMax = SkToU16(max);
         if (fValue > 0)
-            this->inval(NULL);
+            this->inval(nullptr);
     }
 }
 
@@ -52,7 +52,7 @@ void SkProgressView::setValue(U16CPU value)
             fInterp->setKeyFrame(1, SkTime::GetMSecs() + 333, &x);
         }
         fValue = SkToU16(value);
-        this->inval(NULL);
+        this->inval(nullptr);
     }
 }
 
@@ -69,12 +69,12 @@ void SkProgressView::onDraw(SkCanvas* canvas)
         if (fInterp->timeToValues(SkTime::GetMSecs(), &x) == SkInterpolator::kFreezeEnd_Result)
         {
             delete fInterp;
-            fInterp = NULL;
+            fInterp = nullptr;
         }
         percent = (SkFixed)x;    // now its 16.8
         percent = SkMax32(0, SkMin32(percent, fMax << 8));    // now its pinned
         percent = SkFixedDiv(percent, fMax << 8);    // now its 0.16
-        this->inval(NULL);
+        this->inval(nullptr);
     }
     else
     {
@@ -112,7 +112,7 @@ static SkShader* inflate_shader(const char file[])
 
     return SkImageDecoder::DecodeFile(file, &bm) ?
             SkShader::CreateBitmapShader(bm, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode) :
-            NULL;
+            nullptr;
 }
 
 void SkProgressView::onInflate(const SkDOM& dom, const SkDOM::Node* node)
@@ -121,12 +121,12 @@ void SkProgressView::onInflate(const SkDOM& dom, const SkDOM::Node* node)
 
     const char* s;
 
-    SkASSERT(fOnShader == NULL);
-    SkASSERT(fOffShader == NULL);
+    SkASSERT(fOnShader == nullptr);
+    SkASSERT(fOffShader == nullptr);
 
-    if ((s = dom.findAttr(node, "src-on")) != NULL)
+    if ((s = dom.findAttr(node, "src-on")) != nullptr)
         fOnShader = inflate_shader(s);
-    if ((s = dom.findAttr(node, "src-off")) != NULL)
+    if ((s = dom.findAttr(node, "src-off")) != nullptr)
         fOffShader = inflate_shader(s);
     (void)dom.findBool(node, "do-interp", &fDoInterp);
 }
diff --git a/gfx/skia/skia/src/views/SkStackViewLayout.cpp b/gfx/skia/skia/src/views/SkStackViewLayout.cpp
index aba6f2e93a25..b0c8c8ce0233 100644
--- a/gfx/skia/skia/src/views/SkStackViewLayout.cpp
+++ b/gfx/skia/skia/src/views/SkStackViewLayout.cpp
@@ -79,7 +79,7 @@ static SkScalar compute_children_limit(SkView* parent, GetSizeProc sizeProc, int
     SkScalar        limit = 0;
     int                n = 0, flex = 0;
 
-    while ((child = iter.next()) != NULL)
+    while ((child = iter.next()) != nullptr)
     {
         n += 1;
         if (child->getFlags() & flexMask)
@@ -145,7 +145,7 @@ void SkStackViewLayout::onLayoutChildren(SkView* parent)
     }
     crossLimit += (parent->*crossGetSizeP)();
     if (fAlign != kStretch_Align)
-        crossSetSizeP = NULL;
+        crossSetSizeP = nullptr;
 
     int            childCount, flexCount;
     SkScalar    childLimit = compute_children_limit(parent, mainGetSizeP, &childCount, flexMask, &flexCount);
@@ -164,7 +164,7 @@ void SkStackViewLayout::onLayoutChildren(SkView* parent)
     if (flexCount > 0 && parentLimit > childLimit)
         flexAmount = (parentLimit - childLimit) / flexCount;
 
-    while ((child = iter.next()) != NULL)
+    while ((child = iter.next()) != nullptr)
     {
         if (fRound)
             pos = SkScalarRoundToScalar(pos);
@@ -258,7 +258,7 @@ void SkFillViewLayout::onLayoutChildren(SkView* parent)
     SkView::B2FIter    iter(parent);
     SkView*            child;
 
-    while ((child = iter.next()) != NULL)
+    while ((child = iter.next()) != nullptr)
     {
         child->setLoc(fMargin.fLeft, fMargin.fTop);
         child->setSize(    parent->width() - fMargin.fRight - fMargin.fLeft,
diff --git a/gfx/skia/skia/src/views/SkTagList.cpp b/gfx/skia/skia/src/views/SkTagList.cpp
index 8ede870febc8..b1d6ff64d3ff 100644
--- a/gfx/skia/skia/src/views/SkTagList.cpp
+++ b/gfx/skia/skia/src/views/SkTagList.cpp
@@ -17,7 +17,7 @@ SkTagList* SkTagList::Find(SkTagList* rec, U8CPU tag)
 {
     SkASSERT(tag < kSkTagListCount);
 
-    while (rec != NULL)
+    while (rec != nullptr)
     {
         if (rec->fTag == tag)
             break;
@@ -31,9 +31,9 @@ void SkTagList::DeleteTag(SkTagList** head, U8CPU tag)
     SkASSERT(tag < kSkTagListCount);
 
     SkTagList* rec = *head;
-    SkTagList* prev = NULL;
+    SkTagList* prev = nullptr;
 
-    while (rec != NULL)
+    while (rec != nullptr)
     {
         SkTagList* next = rec->fNext;
 
diff --git a/gfx/skia/skia/src/views/SkTagList.h b/gfx/skia/skia/src/views/SkTagList.h
index 47294e324220..1cff9cabe209 100644
--- a/gfx/skia/skia/src/views/SkTagList.h
+++ b/gfx/skia/skia/src/views/SkTagList.h
@@ -29,7 +29,7 @@ struct SkTagList {
     SkTagList(U8CPU tag) : fTag(SkToU8(tag))
     {
         SkASSERT(tag < kSkTagListCount);
-        fNext       = NULL;
+        fNext       = nullptr;
         fExtra16    = 0;
         fExtra8     = 0;
     }
diff --git a/gfx/skia/skia/src/views/SkTouchGesture.cpp b/gfx/skia/skia/src/views/SkTouchGesture.cpp
index e6a8eaeec66a..22c9434216bf 100644
--- a/gfx/skia/skia/src/views/SkTouchGesture.cpp
+++ b/gfx/skia/skia/src/views/SkTouchGesture.cpp
@@ -142,7 +142,7 @@ void SkTouchGesture::appendNewRec(void* owner, float x, float y) {
 }
 
 void SkTouchGesture::touchBegin(void* owner, float x, float y) {
-//    GrPrintf("--- %d touchBegin %p %g %g\n", fTouches.count(), owner, x, y);
+//    SkDebugf("--- %d touchBegin %p %g %g\n", fTouches.count(), owner, x, y);
 
     int index = this->findRec(owner);
     if (index >= 0) {
@@ -201,7 +201,7 @@ float SkTouchGesture::limitTotalZoom(float scale) const {
 }
 
 void SkTouchGesture::touchMoved(void* owner, float x, float y) {
-//    GrPrintf("--- %d touchMoved %p %g %g\n", fTouches.count(), owner, x, y);
+//    SkDebugf("--- %d touchMoved %p %g %g\n", fTouches.count(), owner, x, y);
 
     if (kEmpty_State == fState) {
         return;
@@ -220,7 +220,7 @@ void SkTouchGesture::touchMoved(void* owner, float x, float y) {
     // not sure how valuable this is
     if (fTouches.count() == 2) {
         if (close_enough_for_jitter(rec.fLastX, rec.fLastY, x, y)) {
-//            GrPrintf("--- drop touchMove, withing jitter tolerance %g %g\n", rec.fLastX - x, rec.fLastY - y);
+//            SkDebugf("--- drop touchMove, withing jitter tolerance %g %g\n", rec.fLastX - x, rec.fLastY - y);
             return;
         }
     }
@@ -257,7 +257,7 @@ void SkTouchGesture::touchMoved(void* owner, float x, float y) {
 }
 
 void SkTouchGesture::touchEnd(void* owner) {
-//    GrPrintf("--- %d touchEnd   %p\n", fTouches.count(), owner);
+//    SkDebugf("--- %d touchEnd   %p\n", fTouches.count(), owner);
 
     int index = this->findRec(owner);
     if (index < 0) {
diff --git a/gfx/skia/skia/src/views/SkView.cpp b/gfx/skia/skia/src/views/SkView.cpp
index f211ad96937a..ec75d610aaf6 100644
--- a/gfx/skia/skia/src/views/SkView.cpp
+++ b/gfx/skia/skia/src/views/SkView.cpp
@@ -14,7 +14,7 @@ SkView::SkView(uint32_t flags) : fFlags(SkToU8(flags))
 {
     fWidth = fHeight = 0;
     fLoc.set(0, 0);
-    fParent = fFirstChild = fNextSibling = fPrevSibling = NULL;
+    fParent = fFirstChild = fNextSibling = fPrevSibling = nullptr;
     fMatrix.setIdentity();
     fContainsFocus = 0;
 }
@@ -31,13 +31,13 @@ void SkView::setFlags(uint32_t flags)
     uint32_t diff = fFlags ^ flags;
 
     if (diff & kVisible_Mask)
-        this->inval(NULL);
+        this->inval(nullptr);
 
     fFlags = SkToU8(flags);
 
     if (diff & kVisible_Mask)
     {
-        this->inval(NULL);
+        this->inval(nullptr);
     }
 }
 
@@ -67,10 +67,10 @@ void SkView::setSize(SkScalar width, SkScalar height)
 
     if (fWidth != width || fHeight != height)
     {
-        this->inval(NULL);
+        this->inval(nullptr);
         fWidth = width;
         fHeight = height;
-        this->inval(NULL);
+        this->inval(nullptr);
         this->onSizeChange();
         this->invokeLayout();
     }
@@ -80,9 +80,9 @@ void SkView::setLoc(SkScalar x, SkScalar y)
 {
     if (fLoc.fX != x || fLoc.fY != y)
     {
-        this->inval(NULL);
+        this->inval(nullptr);
         fLoc.set(x, y);
-        this->inval(NULL);
+        this->inval(nullptr);
     }
 }
 
@@ -94,9 +94,9 @@ void SkView::offset(SkScalar dx, SkScalar dy)
 
 void SkView::setLocalMatrix(const SkMatrix& matrix)
 {
-    this->inval(NULL);
+    this->inval(nullptr);
     fMatrix = matrix;
-    this->inval(NULL);
+    this->inval(nullptr);
 }
 
 void SkView::draw(SkCanvas* canvas)
@@ -136,7 +136,7 @@ void SkView::draw(SkCanvas* canvas)
 
         SkCanvas* childCanvas = this->beforeChildren(canvas);
 
-        while ((child = iter.next()) != NULL)
+        while ((child = iter.next()) != nullptr)
             child->draw(childCanvas);
 
         this->afterChildren(canvas);
@@ -165,7 +165,7 @@ void SkView::inval(SkRect* rect) {
         }
 
         SkView* parent = view->fParent;
-        if (parent == NULL) {
+        if (parent == nullptr) {
             return;
         }
 
@@ -185,18 +185,18 @@ bool SkView::setFocusView(SkView* fv)
     do {
         if (view->onSetFocusView(fv))
             return true;
-    } while ((view = view->fParent) != NULL);
+    } while ((view = view->fParent) != nullptr);
     return false;
 }
 
 SkView* SkView::getFocusView() const
 {
-    SkView*            focus = NULL;
+    SkView*            focus = nullptr;
     const SkView*    view = this;
     do {
         if (view->onGetFocusView(&focus))
             break;
-    } while ((view = view->fParent) != NULL);
+    } while ((view = view->fParent) != nullptr);
     return focus;
 }
 
@@ -222,30 +222,30 @@ SkView* SkView::acceptFocus(FocusDirection dir)
 
         B2FIter    iter(this);
         SkView*    child, *focus;
-        while ((child = iter.next()) != NULL)
-            if ((focus = child->acceptFocus(dir)) != NULL)
+        while ((child = iter.next()) != nullptr)
+            if ((focus = child->acceptFocus(dir)) != nullptr)
                 return focus;
     }
     else // prev
     {
         F2BIter    iter(this);
         SkView*    child, *focus;
-        while ((child = iter.next()) != NULL)
-            if ((focus = child->acceptFocus(dir)) != NULL)
+        while ((child = iter.next()) != nullptr)
+            if ((focus = child->acceptFocus(dir)) != nullptr)
                 return focus;
 
         if (this->acceptFocus())
             return this;
     }
 
-    return NULL;
+    return nullptr;
 }
 
 SkView* SkView::moveFocus(FocusDirection dir)
 {
     SkView* focus = this->getFocusView();
 
-    if (focus == NULL)
+    if (focus == nullptr)
     {    // start with the root
         focus = this;
         while (focus->fParent)
@@ -267,19 +267,19 @@ SkView* SkView::moveFocus(FocusDirection dir)
             while (child != parent->fFirstChild)
             {
     FIRST_CHILD:
-                if ((focus = child->acceptFocus(dir)) != NULL)
+                if ((focus = child->acceptFocus(dir)) != nullptr)
                     return focus;
                 child = child->fNextSibling;
             }
     NEXT_SIB:
             child = parent->fNextSibling;
             parent = parent->fParent;
-        } while (parent != NULL);
+        } while (parent != nullptr);
     }
     else    // prevfocus
     {
         parent = focus->fParent;
-        if (parent == NULL)    // we're the root
+        if (parent == nullptr)    // we're the root
             return focus->acceptFocus(dir);
         else
         {
@@ -289,7 +289,7 @@ SkView* SkView::moveFocus(FocusDirection dir)
                 while (child != parent->fFirstChild)
                 {
                     child = child->fPrevSibling;
-                    if ((focus = child->acceptFocus(dir)) != NULL)
+                    if ((focus = child->acceptFocus(dir)) != nullptr)
                         return focus;
                 }
                 if (parent->acceptFocus())
@@ -300,12 +300,12 @@ SkView* SkView::moveFocus(FocusDirection dir)
             }
         }
     }
-    return NULL;
+    return nullptr;
 }
 
 void SkView::onFocusChange(bool gainFocusP)
 {
-    this->inval(NULL);
+    this->inval(nullptr);
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -314,9 +314,9 @@ SkView::Click::Click(SkView* target)
 {
     SkASSERT(target);
     fTargetID = target->getSinkID();
-    fType = NULL;
+    fType = nullptr;
     fWeOwnTheType = false;
-    fOwner = NULL;
+    fOwner = nullptr;
 }
 
 SkView::Click::~Click()
@@ -331,7 +331,7 @@ void SkView::Click::resetType()
         sk_free(fType);
         fWeOwnTheType = false;
     }
-    fType = NULL;
+    fType = nullptr;
 }
 
 bool SkView::Click::isType(const char type[]) const
@@ -341,9 +341,9 @@ bool SkView::Click::isType(const char type[]) const
     if (type == t)
         return true;
 
-    if (type == NULL)
+    if (type == nullptr)
         type = "";
-    if (t == NULL)
+    if (t == nullptr)
         t = "";
     return !strcmp(t, type);
 }
@@ -371,19 +371,23 @@ void SkView::Click::copyType(const char type[])
 
 SkView::Click* SkView::findClickHandler(SkScalar x, SkScalar y, unsigned modi) {
     if (x < 0 || y < 0 || x >= fWidth || y >= fHeight) {
-        return NULL;
+        return nullptr;
     }
 
     if (this->onSendClickToChildren(x, y, modi)) {
         F2BIter    iter(this);
         SkView*    child;
 
-        while ((child = iter.next()) != NULL)
-        {
+        while ((child = iter.next()) != nullptr) {
             SkPoint p;
+#if 0
             if (!child->globalToLocal(x, y, &p)) {
                 continue;
             }
+#else
+            // the above seems broken, so just respecting fLoc for now <reed>
+            p.set(x - child->fLoc.x(), y - child->fLoc.y());
+#endif
 
             Click* click = child->findClickHandler(p.fX, p.fY, modi);
 
@@ -401,7 +405,7 @@ void SkView::DoClickDown(Click* click, int x, int y, unsigned modi)
     SkASSERT(click);
 
     SkView* target = (SkView*)SkEventSink::FindSink(click->fTargetID);
-    if (NULL == target) {
+    if (nullptr == target) {
         return;
     }
 
@@ -425,7 +429,7 @@ void SkView::DoClickMoved(Click* click, int x, int y, unsigned modi)
     SkASSERT(click);
 
     SkView* target = (SkView*)SkEventSink::FindSink(click->fTargetID);
-    if (NULL == target) {
+    if (nullptr == target) {
         return;
     }
 
@@ -449,7 +453,7 @@ void SkView::DoClickUp(Click* click, int x, int y, unsigned modi)
     SkASSERT(click);
 
     SkView* target = (SkView*)SkEventSink::FindSink(click->fTargetID);
-    if (NULL == target) {
+    if (nullptr == target) {
         return;
     }
 
@@ -493,7 +497,7 @@ bool SkView::onSendClickToChildren(SkScalar x, SkScalar y, unsigned modi) {
 }
 
 SkView::Click* SkView::onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) {
-    return NULL;
+    return nullptr;
 }
 
 bool SkView::onClick(Click*) {
@@ -517,17 +521,17 @@ void SkView::getLocalBounds(SkRect* bounds) const {
 
 void SkView::detachFromParent_NoLayout() {
     this->validate();
-    if (fParent == NULL) {
+    if (fParent == nullptr) {
         return;
     }
 
     if (fContainsFocus) {
-        (void)this->setFocusView(NULL);
+        (void)this->setFocusView(nullptr);
     }
 
-    this->inval(NULL);
+    this->inval(nullptr);
 
-    SkView* next = NULL;
+    SkView* next = nullptr;
 
     if (fNextSibling != this) {   // do we have any siblings
         fNextSibling->fPrevSibling = fPrevSibling;
@@ -539,7 +543,7 @@ void SkView::detachFromParent_NoLayout() {
         fParent->fFirstChild = next;
     }
 
-    fParent = fNextSibling = fPrevSibling = NULL;
+    fParent = fNextSibling = fPrevSibling = nullptr;
 
     this->validate();
     this->unref();
@@ -559,13 +563,13 @@ SkView* SkView::attachChildToBack(SkView* child) {
     this->validate();
     SkASSERT(child != this);
 
-    if (child == NULL || fFirstChild == child)
+    if (child == nullptr || fFirstChild == child)
         goto DONE;
 
     child->ref();
     child->detachFromParent_NoLayout();
 
-    if (fFirstChild == NULL) {
+    if (fFirstChild == nullptr) {
         child->fNextSibling = child;
         child->fPrevSibling = child;
     } else {
@@ -577,7 +581,7 @@ SkView* SkView::attachChildToBack(SkView* child) {
 
     fFirstChild = child;
     child->fParent = this;
-    child->inval(NULL);
+    child->inval(nullptr);
 
     this->validate();
     this->invokeLayout();
@@ -589,13 +593,13 @@ SkView* SkView::attachChildToFront(SkView* child) {
     this->validate();
     SkASSERT(child != this);
 
-    if (child == NULL || (fFirstChild && fFirstChild->fPrevSibling == child))
+    if (child == nullptr || (fFirstChild && fFirstChild->fPrevSibling == child))
         goto DONE;
 
     child->ref();
     child->detachFromParent_NoLayout();
 
-    if (fFirstChild == NULL) {
+    if (fFirstChild == nullptr) {
         fFirstChild = child;
         child->fNextSibling = child;
         child->fPrevSibling = child;
@@ -607,7 +611,7 @@ SkView* SkView::attachChildToFront(SkView* child) {
     }
 
     child->fParent = this;
-    child->inval(NULL);
+    child->inval(nullptr);
 
     this->validate();
     this->invokeLayout();
@@ -637,7 +641,7 @@ bool SkView::globalToLocal(SkScalar x, SkScalar y, SkPoint* local) const
 {
     SkASSERT(this);
 
-    if (NULL != local) {
+    if (local) {
         SkMatrix m;
         this->localToGlobal(&m);
         if (!m.invert(&m)) {
@@ -699,7 +703,7 @@ void SkView::postInflate(const SkTDict<SkView*>& dict) {
 
     B2FIter    iter(this);
     SkView*    child;
-    while ((child = iter.next()) != NULL)
+    while ((child = iter.next()) != nullptr)
         child->postInflate(dict);
 }
 
@@ -714,7 +718,7 @@ SkView* SkView::sendEventToParents(const SkEvent& evt) {
         }
         parent = parent->fParent;
     }
-    return NULL;
+    return nullptr;
 }
 
 SkView* SkView::sendQueryToParents(SkEvent* evt) {
@@ -726,15 +730,15 @@ SkView* SkView::sendQueryToParents(SkEvent* evt) {
         }
         parent = parent->fParent;
     }
-    return NULL;
+    return nullptr;
 }
 
 //////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////
 
 SkView::F2BIter::F2BIter(const SkView* parent) {
-    fFirstChild = parent ? parent->fFirstChild : NULL;
-    fChild = fFirstChild ? fFirstChild->fPrevSibling : NULL;
+    fFirstChild = parent ? parent->fFirstChild : nullptr;
+    fChild = fFirstChild ? fFirstChild->fPrevSibling : nullptr;
 }
 
 SkView* SkView::F2BIter::next() {
@@ -742,7 +746,7 @@ SkView* SkView::F2BIter::next() {
 
     if (fChild) {
         if (fChild == fFirstChild) {
-            fChild = NULL;
+            fChild = nullptr;
         } else {
             fChild = fChild->fPrevSibling;
         }
@@ -751,7 +755,7 @@ SkView* SkView::F2BIter::next() {
 }
 
 SkView::B2FIter::B2FIter(const SkView* parent) {
-    fFirstChild = parent ? parent->fFirstChild : NULL;
+    fFirstChild = parent ? parent->fFirstChild : nullptr;
     fChild = fFirstChild;
 }
 
@@ -761,7 +765,7 @@ SkView* SkView::B2FIter::next() {
     if (fChild) {
         SkView* next = fChild->fNextSibling;
         if (next == fFirstChild)
-            next = NULL;
+            next = nullptr;
         fChild = next;
     }
     return curr;
@@ -778,8 +782,8 @@ void SkView::validate() const {
         SkASSERT(fNextSibling);
         SkASSERT(fPrevSibling);
     } else {
-        bool nextNull = NULL == fNextSibling;
-        bool prevNull = NULL == fNextSibling;
+        bool nextNull = nullptr == fNextSibling;
+        bool prevNull = nullptr == fNextSibling;
         SkASSERT(nextNull == prevNull);
     }
 }
@@ -812,7 +816,7 @@ static void dumpview(const SkView* view, int level, bool recurse)
         SkView*            child;
         bool            noChildren = true;
 
-        while ((child = iter.next()) != NULL)
+        while ((child = iter.next()) != nullptr)
         {
             if (noChildren)
                 SkDebugf(">\n");
diff --git a/gfx/skia/skia/src/views/SkViewInflate.cpp b/gfx/skia/skia/src/views/SkViewInflate.cpp
index 59cc4813fa52..8418fb0e7205 100644
--- a/gfx/skia/skia/src/views/SkViewInflate.cpp
+++ b/gfx/skia/skia/src/views/SkViewInflate.cpp
@@ -37,10 +37,10 @@ void SkViewInflate::rInflate(const SkDOM& dom, const SkDOM::Node* node, SkView*
             const char* name = dom.getName(child);
             const char* target;
 
-            if (!strcmp(name, "listenTo") && (target = dom.findAttr(child, "target")) != NULL)
+            if (!strcmp(name, "listenTo") && (target = dom.findAttr(child, "target")) != nullptr)
                 this->addIDStr(&fListenTo, parent, target);
 
-            if (!strcmp(name, "broadcastTo") && (target = dom.findAttr(child, "target")) != NULL)
+            if (!strcmp(name, "broadcastTo") && (target = dom.findAttr(child, "target")) != nullptr)
                 this->addIDStr(&fBroadcastTo, parent, target);
         }
         child = dom.getNextSibling(child);
@@ -62,13 +62,13 @@ SkView* SkViewInflate::inflate(const SkDOM& dom, const SkDOM::Node* node, SkView
 {
     fIDs.reset();
 
-    if (root == NULL)
+    if (root == nullptr)
     {
         root = this->createView(dom, node);
-        if (root == NULL)
+        if (root == nullptr)
         {
-            printf("createView returned NULL on <%s>\n", dom.getName(node));
-            return NULL;
+            printf("createView returned nullptr on <%s>\n", dom.getName(node));
+            return nullptr;
         }
     }
     this->rInflate(dom, node, root);
@@ -103,21 +103,21 @@ SkView* SkViewInflate::inflate(const char xml[], size_t len, SkView* root)
     SkDOM                dom;
     const SkDOM::Node*    node = dom.build(xml, len);
 
-    return node ? this->inflate(dom, node, root) : NULL;
+    return node ? this->inflate(dom, node, root) : nullptr;
 }
 
 SkView* SkViewInflate::findViewByID(const char id[]) const
 {
     SkASSERT(id);
     SkView* view;
-    return fIDs.find(id, &view) ? view : NULL;
+    return fIDs.find(id, &view) ? view : nullptr;
 }
 
 SkView* SkViewInflate::createView(const SkDOM& dom, const SkDOM::Node* node)
 {
     if (!strcmp(dom.getName(node), "view"))
         return new SkView;
-    return NULL;
+    return nullptr;
 }
 
 void SkViewInflate::addIDStr(SkTDArray<IDStr>* list, SkView* view, const char* str)
diff --git a/gfx/skia/skia/src/views/SkViewPriv.cpp b/gfx/skia/skia/src/views/SkViewPriv.cpp
index 6d908145742f..03541fd7ad29 100644
--- a/gfx/skia/skia/src/views/SkViewPriv.cpp
+++ b/gfx/skia/skia/src/views/SkViewPriv.cpp
@@ -29,14 +29,14 @@ void SkView::Artist::onInflate(const SkDOM&, const SkDOM::Node*)
 SkView::Artist* SkView::getArtist() const
 {
     Artist_SkTagList* rec = (Artist_SkTagList*)this->findTagList(kViewArtist_SkTagList);
-    SkASSERT(rec == NULL || rec->fArtist != NULL);
+    SkASSERT(rec == nullptr || rec->fArtist != nullptr);
 
-    return rec ? rec->fArtist : NULL;
+    return rec ? rec->fArtist : nullptr;
 }
 
 SkView::Artist* SkView::setArtist(Artist* obj)
 {
-    if (obj == NULL)
+    if (obj == nullptr)
     {
         this->removeTagList(kViewArtist_SkTagList);
     }
@@ -75,14 +75,14 @@ void SkView::Layout::onInflate(const SkDOM&, const SkDOM::Node*)
 SkView::Layout* SkView::getLayout() const
 {
     Layout_SkTagList* rec = (Layout_SkTagList*)this->findTagList(kViewLayout_SkTagList);
-    SkASSERT(rec == NULL || rec->fLayout != NULL);
+    SkASSERT(rec == nullptr || rec->fLayout != nullptr);
 
-    return rec ? rec->fLayout : NULL;
+    return rec ? rec->fLayout : nullptr;
 }
 
 SkView::Layout* SkView::setLayout(Layout* obj, bool invokeLayoutNow)
 {
-    if (obj == NULL)
+    if (obj == nullptr)
     {
         this->removeTagList(kViewLayout_SkTagList);
     }
diff --git a/gfx/skia/skia/src/views/SkWidgets.cpp b/gfx/skia/skia/src/views/SkWidgets.cpp
index cde2b427389f..fc0ffb82b6dc 100644
--- a/gfx/skia/skia/src/views/SkWidgets.cpp
+++ b/gfx/skia/skia/src/views/SkWidgets.cpp
@@ -72,7 +72,7 @@ SkinSuite::SkinSuite()
         if (!fAnimators[i]->decodeURI(path.c_str()))
         {
             delete fAnimators[i];
-            fAnimators[i] = NULL;
+            fAnimators[i] = nullptr;
         }
     }
 }
@@ -88,11 +88,11 @@ static SkinSuite* gSkinSuite;
 static SkAnimator* get_skin_animator(SkinType st)
 {
 #if 0
-    if (gSkinSuite == NULL)
+    if (gSkinSuite == nullptr)
         gSkinSuite = new SkinSuite;
     return gSkinSuite->get(st);
 #else
-    return NULL;
+    return nullptr;
 #endif
 }
 
@@ -109,7 +109,7 @@ void SkWidget::Term()
 
 void SkWidget::onEnabledChange()
 {
-    this->inval(NULL);
+    this->inval(nullptr);
 }
 
 void SkWidget::postWidgetEvent()
@@ -130,7 +130,7 @@ void SkWidget::onInflate(const SkDOM& dom, const SkDOM::Node* node)
 {
     this->INHERITED::onInflate(dom, node);
 
-    if ((node = dom.getFirstChild(node, "event")) != NULL)
+    if ((node = dom.getFirstChild(node, "event")) != nullptr)
         fEvent.inflate(dom, node);
 }
 
@@ -196,7 +196,7 @@ void SkButtonWidget::setButtonState(State state)
 
 void SkButtonWidget::onButtonStateChange()
 {
-    this->inval(NULL);
+    this->inval(nullptr);
 }
 
 void SkButtonWidget::onInflate(const SkDOM& dom, const SkDOM::Node* node)
@@ -293,7 +293,7 @@ void SkPushButtonWidget::onDraw(SkCanvas* canvas)
         p.setColor(SK_ColorBLUE);
         create_emboss(&p, SkIntToScalar(12)/5, this->hasFocus(), this->getButtonState() == kOn_State);
         canvas->drawRoundRect(r, SkScalarHalf(this->height()), SkScalarHalf(this->height()), p);
-        p.setMaskFilter(NULL);
+        p.setMaskFilter(nullptr);
 
         p.setTextAlign(SkPaint::kCenter_Align);
 
@@ -351,7 +351,7 @@ void SkStaticTextView::computeSize()
 {
     if (fMode == kAutoWidth_Mode)
     {
-        SkScalar width = fPaint.measureText(fText.c_str(), fText.size(), NULL, NULL);
+        SkScalar width = fPaint.measureText(fText.c_str(), fText.size(), nullptr, nullptr);
         this->setWidth(width + fMargin.fX * 2);
     }
     else if (fMode == kAutoHeight_Mode)
@@ -360,7 +360,7 @@ void SkStaticTextView::computeSize()
         int lines = width > 0 ? SkTextLineBreaker::CountLines(fText.c_str(), fText.size(), fPaint, width) : 0;
 
         SkScalar    before, after;
-        (void)fPaint.measureText(0, NULL, &before, &after);
+        (void)fPaint.measureText(0, nullptr, &before, &after);
 
         this->setHeight(lines * (after - before) + fMargin.fY * 2);
     }
@@ -380,7 +380,7 @@ void SkStaticTextView::setMode(Mode mode)
 void SkStaticTextView::setSpacingAlign(SkTextBox::SpacingAlign align)
 {
     fSpacingAlign = SkToU8(align);
-    this->inval(NULL);
+    this->inval(nullptr);
 }
 
 void SkStaticTextView::getMargin(SkPoint* margin) const
@@ -395,7 +395,7 @@ void SkStaticTextView::setMargin(SkScalar dx, SkScalar dy)
     {
         fMargin.set(dx, dy);
         this->computeSize();
-        this->inval(NULL);
+        this->inval(nullptr);
     }
 }
 
@@ -429,7 +429,7 @@ void SkStaticTextView::setText(const char text[], size_t len)
     {
         fText.set(text, len);
         this->computeSize();
-        this->inval(NULL);
+        this->inval(nullptr);
     }
 }
 
@@ -445,7 +445,7 @@ void SkStaticTextView::setPaint(const SkPaint& paint)
     {
         fPaint = paint;
         this->computeSize();
-        this->inval(NULL);
+        this->inval(nullptr);
     }
 }
 
@@ -489,7 +489,7 @@ void SkStaticTextView::onInflate(const SkDOM& dom, const SkDOM::Node* node)
     if (text)
         this->setText(text);
 
-    if ((node = dom.getFirstChild(node, "paint")) != NULL)
+    if ((node = dom.getFirstChild(node, "paint")) != nullptr)
         SkPaint_Inflate(&fPaint, dom, node);
 }
 
diff --git a/gfx/skia/skia/src/views/SkWindow.cpp b/gfx/skia/skia/src/views/SkWindow.cpp
index 99c2d30e8a6a..d93bc96a66ae 100644
--- a/gfx/skia/skia/src/views/SkWindow.cpp
+++ b/gfx/skia/skia/src/views/SkWindow.cpp
@@ -1,29 +1,26 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 #include "SkWindow.h"
 #include "SkCanvas.h"
-#include "SkDevice.h"
 #include "SkOSMenu.h"
+#include "SkSurface.h"
 #include "SkSystemEventTypes.h"
 #include "SkTime.h"
 
 #define SK_EventDelayInval "\xd" "n" "\xa" "l"
 
-SkWindow::SkWindow() : fFocusView(NULL) {
+SkWindow::SkWindow()
+    : fSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType)
+    , fFocusView(nullptr)
+{
     fClicks.reset();
     fWaitingOnInval = false;
-
-#ifdef SK_BUILD_FOR_WINCE
-    fColorType = kRGB_565_SkColorType;
-#else
     fColorType = kN32_SkColorType;
-#endif
-
     fMatrix.reset();
 }
 
@@ -32,14 +29,15 @@ SkWindow::~SkWindow() {
     fMenus.deleteAll();
 }
 
-SkCanvas* SkWindow::createCanvas() {
-    return new SkCanvas(this->getBitmap());
+SkSurface* SkWindow::createSurface() {
+    const SkBitmap& bm = this->getBitmap();
+    return SkSurface::NewRasterDirect(bm.info(), bm.getPixels(), bm.rowBytes(), &fSurfaceProps);
 }
 
 void SkWindow::setMatrix(const SkMatrix& matrix) {
     if (fMatrix != matrix) {
         fMatrix = matrix;
-        this->inval(NULL);
+        this->inval(nullptr);
     }
 }
 
@@ -69,7 +67,7 @@ void SkWindow::resize(int width, int height, SkColorType ct) {
                                               ct, kPremul_SkAlphaType));
 
         this->setSize(SkIntToScalar(width), SkIntToScalar(height));
-        this->inval(NULL);
+        this->inval(nullptr);
     }
 }
 
@@ -101,36 +99,19 @@ void SkWindow::forceInvalAll() {
                       SkScalarCeilToInt(this->height()));
 }
 
-#if defined(SK_BUILD_FOR_WINCE) && defined(USE_GX_SCREEN)
-    #include <windows.h>
-    #include <gx.h>
-    extern GXDisplayProperties gDisplayProps;
-#endif
-
 #ifdef SK_SIMULATE_FAILED_MALLOC
 extern bool gEnableControlledThrow;
 #endif
 
 bool SkWindow::update(SkIRect* updateArea) {
     if (!fDirtyRgn.isEmpty()) {
-        SkBitmap bm = this->getBitmap();
-
-#if defined(SK_BUILD_FOR_WINCE) && defined(USE_GX_SCREEN)
-        char* buffer = (char*)GXBeginDraw();
-        SkASSERT(buffer);
-
-        RECT    rect;
-        GetWindowRect((HWND)((SkOSWindow*)this)->getHWND(), &rect);
-        buffer += rect.top * gDisplayProps.cbyPitch + rect.left * gDisplayProps.cbxPitch;
-
-        bm.setPixels(buffer);
-#endif
-
-        SkAutoTUnref<SkCanvas> canvas(this->createCanvas());
+        SkAutoTUnref<SkSurface> surface(this->createSurface());
+        SkCanvas* canvas = surface->getCanvas();
 
         canvas->clipRegion(fDirtyRgn);
-        if (updateArea)
+        if (updateArea) {
             *updateArea = fDirtyRgn.getBounds();
+        }
 
         SkAutoCanvasRestore acr(canvas, true);
         canvas->concat(fMatrix);
@@ -155,10 +136,6 @@ bool SkWindow::update(SkIRect* updateArea) {
         gEnableControlledThrow = false;
 #endif
 
-#if defined(SK_BUILD_FOR_WINCE) && defined(USE_GX_SCREEN)
-        GXEndDraw();
-#endif
-
         return true;
     }
     return false;
@@ -169,7 +146,7 @@ bool SkWindow::handleChar(SkUnichar uni) {
         return true;
 
     SkView* focus = this->getFocusView();
-    if (focus == NULL)
+    if (focus == nullptr)
         focus = this;
 
     SkEvent evt(SK_EventType_Unichar);
@@ -187,7 +164,7 @@ bool SkWindow::handleKey(SkKey key) {
     // send an event to the focus-view
     {
         SkView* focus = this->getFocusView();
-        if (focus == NULL)
+        if (focus == nullptr)
             focus = this;
 
         SkEvent evt(SK_EventType_Key);
@@ -197,8 +174,8 @@ bool SkWindow::handleKey(SkKey key) {
     }
 
     if (key == kUp_SkKey || key == kDown_SkKey) {
-        if (this->moveFocus(key == kUp_SkKey ? kPrev_FocusDirection : kNext_FocusDirection) == NULL)
-            this->onSetFocusView(NULL);
+        if (this->moveFocus(key == kUp_SkKey ? kPrev_FocusDirection : kNext_FocusDirection) == nullptr)
+            this->onSetFocusView(nullptr);
         return true;
     }
     return false;
@@ -214,7 +191,7 @@ bool SkWindow::handleKeyUp(SkKey key) {
     //send an event to the focus-view
     {
         SkView* focus = this->getFocusView();
-        if (focus == NULL)
+        if (focus == nullptr)
             focus = this;
 
         //should this one be the same?
@@ -232,7 +209,7 @@ void SkWindow::addMenu(SkOSMenu* menu) {
 }
 
 void SkWindow::setTitle(const char title[]) {
-    if (NULL == title) {
+    if (nullptr == title) {
         title = "";
     }
     fTitle.set(title);
@@ -336,3 +313,27 @@ bool SkWindow::onDispatchClick(int x, int y, Click::State state,
     }
     return handled;
 }
+
+#if SK_SUPPORT_GPU
+
+#include "GrContext.h"
+#include "gl/GrGLInterface.h"
+#include "gl/GrGLUtil.h"
+#include "SkGr.h"
+
+GrRenderTarget* SkWindow::renderTarget(const AttachmentInfo& attachmentInfo,
+        const GrGLInterface* interface, GrContext* grContext) {
+    GrBackendRenderTargetDesc desc;
+    desc.fWidth = SkScalarRoundToInt(this->width());
+    desc.fHeight = SkScalarRoundToInt(this->height());
+    desc.fConfig = kSkia8888_GrPixelConfig;
+    desc.fOrigin = kBottomLeft_GrSurfaceOrigin;
+    desc.fSampleCnt = attachmentInfo.fSampleCount;
+    desc.fStencilBits = attachmentInfo.fStencilBits;
+    GrGLint buffer;
+    GR_GL_GetIntegerv(interface, GR_GL_FRAMEBUFFER_BINDING, &buffer);
+    desc.fRenderTargetHandle = buffer;
+    return grContext->textureProvider()->wrapBackendRenderTarget(desc);
+}
+
+#endif
diff --git a/gfx/skia/skia/src/views/animated/SkBorderView.cpp b/gfx/skia/skia/src/views/animated/SkBorderView.cpp
index 3eff6056f939..88bff696c98c 100644
--- a/gfx/skia/skia/src/views/animated/SkBorderView.cpp
+++ b/gfx/skia/skia/src/views/animated/SkBorderView.cpp
@@ -52,7 +52,7 @@ void SkBorderView::setSkin(const char skin[])
     SkAnimator::DifferenceType    diff = fAnim.draw(canvas, &paint, SkTime::GetMSecs());
 
     if (diff == SkAnimator::kDifferent)
-        this->inval(NULL);
+        this->inval(nullptr);
     else if (diff == SkAnimator::kPartiallyDifferent)
     {
         SkRect    bounds;
@@ -65,7 +65,7 @@ void SkBorderView::setSkin(const char skin[])
 {
     if (evt.isType(SK_EventType_Inval))
     {
-        this->inval(NULL);
+        this->inval(nullptr);
         return true;
     }
     if (evt.isType("recommendDim"))
diff --git a/gfx/skia/skia/src/views/animated/SkImageView.cpp b/gfx/skia/skia/src/views/animated/SkImageView.cpp
index 2956729fefe3..04b82586518d 100644
--- a/gfx/skia/skia/src/views/animated/SkImageView.cpp
+++ b/gfx/skia/skia/src/views/animated/SkImageView.cpp
@@ -16,10 +16,10 @@
 
 SkImageView::SkImageView()
 {
-    fMatrix        = NULL;
+    fMatrix        = nullptr;
     fScaleType    = kMatrix_ScaleType;
 
-    fData.fAnim    = NULL;        // handles initializing the other union values
+    fData.fAnim    = nullptr;        // handles initializing the other union values
     fDataIsAnim    = true;
 
     fUriIsValid    = false;    // an empty string is not valid
@@ -65,7 +65,7 @@ void SkImageView::setScaleType(ScaleType st)
     {
         fScaleType = SkToU8(st);
         if (fUriIsValid)
-            this->inval(NULL);
+            this->inval(nullptr);
     }
 }
 
@@ -92,7 +92,7 @@ void SkImageView::setImageMatrix(const SkMatrix* matrix)
 
     if (matrix && !matrix->isIdentity())
     {
-        if (fMatrix == NULL)
+        if (fMatrix == nullptr)
             fMatrix = (SkMatrix*)sk_malloc_throw(sizeof(SkMatrix));
         *fMatrix = *matrix;
         changed = true;
@@ -103,14 +103,14 @@ void SkImageView::setImageMatrix(const SkMatrix* matrix)
         {
             SkASSERT(!fMatrix->isIdentity());
             sk_free(fMatrix);
-            fMatrix = NULL;
+            fMatrix = nullptr;
             changed = true;
         }
     }
 
     // only redraw if we changed our matrix and we're not in scaleToFit mode
     if (changed && this->getScaleType() == kMatrix_ScaleType && fUriIsValid)
-        this->inval(NULL);
+        this->inval(nullptr);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////
@@ -120,7 +120,7 @@ bool SkImageView::onEvent(const SkEvent& evt)
     if (evt.isType(SK_EventType_Inval))
     {
         if (fUriIsValid)
-            this->inval(NULL);
+            this->inval(nullptr);
         return true;
     }
     return this->INHERITED::onEvent(evt);
@@ -174,7 +174,7 @@ void SkImageView::onDraw(SkCanvas* canvas)
 SkDEBUGF(("SkImageView : now = %X[%12.3f], diff = %d\n", now, now/1000., diff));
 
         if (diff == SkAnimator::kDifferent)
-            this->inval(NULL);
+            this->inval(nullptr);
         else if (diff == SkAnimator::kPartiallyDifferent)
         {
             SkRect    bounds;
@@ -207,7 +207,7 @@ void SkImageView::onInflate(const SkDOM& dom, const SkDOMNode* node)
 void SkImageView::onUriChange()
 {
     if (this->freeData())
-        this->inval(NULL);
+        this->inval(nullptr);
     fUriIsValid = true;        // give ensureUriIsLoaded() a shot at the new uri
 }
 
@@ -220,7 +220,7 @@ bool SkImageView::freeData()
         else
             delete fData.fBitmap;
 
-        fData.fAnim = NULL;    // valid for all union values
+        fData.fAnim = nullptr;    // valid for all union values
         return true;
     }
     return false;
diff --git a/gfx/skia/skia/src/views/animated/SkProgressBarView.cpp b/gfx/skia/skia/src/views/animated/SkProgressBarView.cpp
index e7754eb61253..5ce944fb0712 100644
--- a/gfx/skia/skia/src/views/animated/SkProgressBarView.cpp
+++ b/gfx/skia/skia/src/views/animated/SkProgressBarView.cpp
@@ -35,7 +35,7 @@ void SkProgressBarView::changeProgress(int diff)
     SkAnimator::DifferenceType    diff = fAnim.draw(canvas, &paint, SkTime::GetMSecs());
 
     if (diff == SkAnimator::kDifferent)
-        this->inval(NULL);
+        this->inval(nullptr);
     else if (diff == SkAnimator::kPartiallyDifferent)
     {
         SkRect    bounds;
@@ -48,7 +48,7 @@ void SkProgressBarView::changeProgress(int diff)
 {
     if (evt.isType(SK_EventType_Inval))
     {
-        this->inval(NULL);
+        this->inval(nullptr);
         return true;
     }
     if (evt.isType("recommendDim"))
diff --git a/gfx/skia/skia/src/views/animated/SkScrollBarView.cpp b/gfx/skia/skia/src/views/animated/SkScrollBarView.cpp
index d78cafafd792..9ba523e65807 100644
--- a/gfx/skia/skia/src/views/animated/SkScrollBarView.cpp
+++ b/gfx/skia/skia/src/views/animated/SkScrollBarView.cpp
@@ -89,7 +89,7 @@ void SkScrollBarView::setTotal(unsigned total)
     SkAnimator::DifferenceType    diff = fAnim.draw(canvas, &paint, SkTime::GetMSecs());
 
     if (diff == SkAnimator::kDifferent)
-        this->inval(NULL);
+        this->inval(nullptr);
     else if (diff == SkAnimator::kPartiallyDifferent)
     {
         SkRect    bounds;
@@ -102,7 +102,7 @@ void SkScrollBarView::setTotal(unsigned total)
 {
     if (evt.isType(SK_EventType_Inval))
     {
-        this->inval(NULL);
+        this->inval(nullptr);
         return true;
     }
     if (evt.isType("recommendDim"))
diff --git a/gfx/skia/skia/src/views/animated/SkStaticTextView.cpp b/gfx/skia/skia/src/views/animated/SkStaticTextView.cpp
index 0e4cad63e553..4bec5106a415 100644
--- a/gfx/skia/skia/src/views/animated/SkStaticTextView.cpp
+++ b/gfx/skia/skia/src/views/animated/SkStaticTextView.cpp
@@ -62,7 +62,7 @@ void SkStaticTextView::setMode(Mode mode)
 void SkStaticTextView::setSpacingAlign(SkTextBox::SpacingAlign align)
 {
     fSpacingAlign = SkToU8(align);
-    this->inval(NULL);
+    this->inval(nullptr);
 }
 
 void SkStaticTextView::getMargin(SkPoint* margin) const
@@ -77,7 +77,7 @@ void SkStaticTextView::setMargin(SkScalar dx, SkScalar dy)
     {
         fMargin.set(dx, dy);
         this->computeSize();
-        this->inval(NULL);
+        this->inval(nullptr);
     }
 }
 
@@ -102,7 +102,7 @@ void SkStaticTextView::setText(const SkString& text)
 
 void SkStaticTextView::setText(const char text[])
 {
-    if (text == NULL)
+    if (text == nullptr)
         text = "";
     this->setText(text, strlen(text));
 }
@@ -113,7 +113,7 @@ void SkStaticTextView::setText(const char text[], size_t len)
     {
         fText.set(text, len);
         this->computeSize();
-        this->inval(NULL);
+        this->inval(nullptr);
     }
 }
 
@@ -129,7 +129,7 @@ void SkStaticTextView::setPaint(const SkPaint& paint)
     {
         fPaint = paint;
         this->computeSize();
-        this->inval(NULL);
+        this->inval(nullptr);
     }
 }
 
@@ -178,8 +178,8 @@ if (false) { // avoid bit rot, suppress warning
         this->setText(text);
     }
 
-    if ((node = dom.getFirstChild(node, "paint")) != NULL &&
-        (node = dom.getFirstChild(node, "screenplay")) != NULL)
+    if ((node = dom.getFirstChild(node, "paint")) != nullptr &&
+        (node = dom.getFirstChild(node, "screenplay")) != nullptr)
     {
 // FIXME: Including inflate_paint causes Windows build to fail -- it complains
 //  that SKListView::SkListView is undefined.
diff --git a/gfx/skia/skia/src/views/animated/SkWidgetViews.cpp b/gfx/skia/skia/src/views/animated/SkWidgetViews.cpp
index 8e7f5175c950..9d3c936523ef 100644
--- a/gfx/skia/skia/src/views/animated/SkWidgetViews.cpp
+++ b/gfx/skia/skia/src/views/animated/SkWidgetViews.cpp
@@ -42,7 +42,7 @@ const char* get_skin_enum_path(SkinEnum se)
 void init_skin_anim(const char path[], SkAnimator* anim) {
     SkASSERT(path && anim);
 
-    SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path));
+    SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(path));
     if (!stream.get()) {
         SkDEBUGF(("init_skin_anim: loading skin failed <%s>\n", path));
         sk_throw();
@@ -110,7 +110,7 @@ void SkWidgetView::setLabel(const char label[])
 
 void SkWidgetView::setLabel(const char label[], size_t len)
 {
-    if ((label == NULL && fLabel.size() != 0) || !fLabel.equals(label, len))
+    if ((label == nullptr && fLabel.size() != 0) || !fLabel.equals(label, len))
     {
         SkString    tmp(label, len);
 
@@ -153,13 +153,13 @@ bool SkWidgetView::postWidgetEvent()
     if (label)
         this->setLabel(label);
 
-    if ((node = dom.getFirstChild(node, "event")) != NULL)
+    if ((node = dom.getFirstChild(node, "event")) != nullptr)
         fEvent.inflate(dom, node);
 }
 
 /*virtual*/ void SkWidgetView::onLabelChange(const char oldLabel[], const char newLabel[])
 {
-    this->inval(NULL);
+    this->inval(nullptr);
 }
 
 static const char gWidgetEventSinkIDSlotName[] = "sk-widget-sinkid-slot";
@@ -208,7 +208,7 @@ void SkCheckButtonView::setCheckState(CheckState state)
 
 /*virtual*/ void SkCheckButtonView::onCheckStateChange(CheckState oldState, CheckState newState)
 {
-    this->inval(NULL);
+    this->inval(nullptr);
 }
 
 /*virtual*/ void SkCheckButtonView::onInflate(const SkDOM& dom, const SkDOM::Node* node)
@@ -296,7 +296,7 @@ protected:
         SkAnimator::DifferenceType    diff = fAnim.draw(canvas, &paint, SkTime::GetMSecs());
 
         if (diff == SkAnimator::kDifferent)
-            this->inval(NULL);
+            this->inval(nullptr);
         else if (diff == SkAnimator::kPartiallyDifferent)
         {
             SkRect    bounds;
@@ -309,7 +309,7 @@ protected:
     {
         if (evt.isType(SK_EventType_Inval))
         {
-            this->inval(NULL);
+            this->inval(nullptr);
             return true;
         }
         if (evt.isType("recommendDim"))
@@ -346,8 +346,8 @@ private:
 
 SkView* SkWidgetFactory(const char name[])
 {
-    if (name == NULL)
-        return NULL;
+    if (name == nullptr)
+        return nullptr;
 
     // must be in the same order as the SkSkinWidgetEnum is declared
     static const char* gNames[] = {
@@ -365,7 +365,7 @@ SkView* SkWidgetFactory(const char name[])
         if (!strcmp(gNames[i], name))
             return SkWidgetFactory((SkWidgetEnum)i);
 
-    return NULL;
+    return nullptr;
 }
 
 #include "SkImageView.h"
@@ -394,5 +394,5 @@ SkView* SkWidgetFactory(SkWidgetEnum sw)
         SkDEBUGFAIL("unknown enum passed to SkWidgetFactory");
         break;
     }
-    return NULL;
+    return nullptr;
 }
diff --git a/gfx/skia/skia/src/views/mac/SampleApp-Info.plist b/gfx/skia/skia/src/views/mac/SampleApp-Info.plist
deleted file mode 100644
index 6b42c2a465a9..000000000000
--- a/gfx/skia/skia/src/views/mac/SampleApp-Info.plist
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIconFile</key>
-	<string></string>
-	<key>CFBundleIdentifier</key>
-	<string>com.googlecode.skia.${PRODUCT_NAME:rfc1034identifier}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
-	<key>NSMainNibFile</key>
-	<string>SampleApp</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-	<key>NSHighResolutionCapable</key>
-	<true/>
-</dict>
-</plist>
diff --git a/gfx/skia/skia/src/views/mac/SampleApp.xib b/gfx/skia/skia/src/views/mac/SampleApp.xib
deleted file mode 100644
index 9549e4e473b8..000000000000
--- a/gfx/skia/skia/src/views/mac/SampleApp.xib
+++ /dev/null
@@ -1,3962 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">10K540</string>
-		<string key="IBDocument.InterfaceBuilderVersion">851</string>
-		<string key="IBDocument.AppKitVersion">1038.36</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">851</string>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.EditedObjectIDs">
-			<integer value="24"/>
-			<integer value="372"/>
-			<integer value="634"/>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
-			<object class="NSCustomObject" id="1021">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSCustomObject" id="1014">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1050">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSCustomObject" id="976324537">
-				<string key="NSClassName">SampleAppDelegate</string>
-			</object>
-			<object class="NSCustomObject" id="76290771">
-				<string key="NSClassName">NSWindowController</string>
-			</object>
-			<object class="NSWindowTemplate" id="972006081">
-				<int key="NSWindowStyleMask">15</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{335, 288}, {640, 480}}</string>
-				<int key="NSWTFlags">1417150464</int>
-				<string key="NSWindowTitle">Sample App</string>
-				<string key="NSWindowClass">NSWindow</string>
-				<nil key="NSViewClass"/>
-				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
-				<object class="NSView" key="NSWindowView" id="439893737">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<string key="NSFrameSize">{640, 480}</string>
-					<reference key="NSSuperview"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
-				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
-			</object>
-			<object class="NSCustomView" id="758604943">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">4352</int>
-				<array class="NSMutableArray" key="NSSubviews">
-					<object class="NSScrollView" id="1038370525">
-						<reference key="NSNextResponder" ref="758604943"/>
-						<int key="NSvFlags">274</int>
-						<array class="NSMutableArray" key="NSSubviews">
-							<object class="NSClipView" id="250930136">
-								<reference key="NSNextResponder" ref="1038370525"/>
-								<int key="NSvFlags">2304</int>
-								<array class="NSMutableArray" key="NSSubviews">
-									<object class="NSTableView" id="429436769">
-										<reference key="NSNextResponder" ref="250930136"/>
-										<int key="NSvFlags">256</int>
-										<string key="NSFrameSize">{339, 319}</string>
-										<reference key="NSSuperview" ref="250930136"/>
-										<bool key="NSEnabled">YES</bool>
-										<object class="_NSCornerView" key="NSCornerView">
-											<nil key="NSNextResponder"/>
-											<int key="NSvFlags">-2147483392</int>
-											<string key="NSFrame">{{224, 0}, {16, 17}}</string>
-										</object>
-										<array class="NSMutableArray" key="NSTableColumns">
-											<object class="NSTableColumn" id="691918008">
-												<string key="NSIdentifier">Labels</string>
-												<double key="NSWidth">100</double>
-												<double key="NSMinWidth">40</double>
-												<double key="NSMaxWidth">1000</double>
-												<object class="NSTableHeaderCell" key="NSHeaderCell">
-													<int key="NSCellFlags">75628096</int>
-													<int key="NSCellFlags2">2048</int>
-													<string key="NSContents"/>
-													<object class="NSFont" key="NSSupport" id="26">
-														<string key="NSName">LucidaGrande</string>
-														<double key="NSSize">11</double>
-														<int key="NSfFlags">3100</int>
-													</object>
-													<object class="NSColor" key="NSBackgroundColor" id="805714581">
-														<int key="NSColorSpace">3</int>
-														<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
-													</object>
-													<object class="NSColor" key="NSTextColor" id="372600372">
-														<int key="NSColorSpace">6</int>
-														<string key="NSCatalogName">System</string>
-														<string key="NSColorName">headerTextColor</string>
-														<object class="NSColor" key="NSColor" id="1032326875">
-															<int key="NSColorSpace">3</int>
-															<bytes key="NSWhite">MAA</bytes>
-														</object>
-													</object>
-												</object>
-												<object class="NSTextFieldCell" key="NSDataCell" id="241301801">
-													<int key="NSCellFlags">68288064</int>
-													<int key="NSCellFlags2">67241216</int>
-													<string key="NSContents">Text Cell</string>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSControlView" ref="429436769"/>
-													<object class="NSColor" key="NSBackgroundColor" id="598476436">
-														<int key="NSColorSpace">6</int>
-														<string key="NSCatalogName">System</string>
-														<string key="NSColorName">controlBackgroundColor</string>
-														<object class="NSColor" key="NSColor" id="319525538">
-															<int key="NSColorSpace">3</int>
-															<bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
-														</object>
-													</object>
-													<object class="NSColor" key="NSTextColor" id="1055469070">
-														<int key="NSColorSpace">6</int>
-														<string key="NSCatalogName">System</string>
-														<string key="NSColorName">controlTextColor</string>
-														<reference key="NSColor" ref="1032326875"/>
-													</object>
-												</object>
-												<int key="NSResizingMask">3</int>
-												<bool key="NSIsResizeable">YES</bool>
-												<bool key="NSIsEditable">YES</bool>
-												<reference key="NSTableView" ref="429436769"/>
-											</object>
-											<object class="NSTableColumn" id="394988372">
-												<string key="NSIdentifier">Controls</string>
-												<double key="NSWidth">233</double>
-												<double key="NSMinWidth">40</double>
-												<double key="NSMaxWidth">1000</double>
-												<object class="NSTableHeaderCell" key="NSHeaderCell">
-													<int key="NSCellFlags">75628096</int>
-													<int key="NSCellFlags2">2048</int>
-													<string key="NSContents"/>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSBackgroundColor" ref="805714581"/>
-													<reference key="NSTextColor" ref="372600372"/>
-												</object>
-												<object class="NSTextFieldCell" key="NSDataCell" id="88358594">
-													<int key="NSCellFlags">67239488</int>
-													<int key="NSCellFlags2">272630784</int>
-													<string key="NSContents">Text</string>
-													<object class="NSFont" key="NSSupport">
-														<string key="NSName">LucidaGrande</string>
-														<double key="NSSize">13</double>
-														<int key="NSfFlags">1044</int>
-													</object>
-													<reference key="NSControlView" ref="429436769"/>
-													<object class="NSColor" key="NSBackgroundColor">
-														<int key="NSColorSpace">6</int>
-														<string key="NSCatalogName">System</string>
-														<string key="NSColorName">controlColor</string>
-														<reference key="NSColor" ref="319525538"/>
-													</object>
-													<reference key="NSTextColor" ref="1055469070"/>
-												</object>
-												<int key="NSResizingMask">3</int>
-												<bool key="NSIsResizeable">YES</bool>
-												<bool key="NSIsEditable">YES</bool>
-												<reference key="NSTableView" ref="429436769"/>
-											</object>
-										</array>
-										<double key="NSIntercellSpacingWidth">3</double>
-										<double key="NSIntercellSpacingHeight">2</double>
-										<object class="NSColor" key="NSBackgroundColor">
-											<int key="NSColorSpace">6</int>
-											<string key="NSCatalogName">System</string>
-											<string key="NSColorName">_sourceListBackgroundColor</string>
-											<object class="NSColor" key="NSColor">
-												<int key="NSColorSpace">1</int>
-												<bytes key="NSRGB">MC44MzkyMTU2OTU5IDAuODY2NjY2Njc0NiAwLjg5ODAzOTIyMTgAA</bytes>
-											</object>
-										</object>
-										<object class="NSColor" key="NSGridColor">
-											<int key="NSColorSpace">6</int>
-											<string key="NSCatalogName">System</string>
-											<string key="NSColorName">gridColor</string>
-											<object class="NSColor" key="NSColor">
-												<int key="NSColorSpace">3</int>
-												<bytes key="NSWhite">MC41AA</bytes>
-											</object>
-										</object>
-										<double key="NSRowHeight">35</double>
-										<int key="NSTvFlags">1128267776</int>
-										<reference key="NSDelegate"/>
-										<reference key="NSDataSource"/>
-										<int key="NSGridStyleMask">2</int>
-										<int key="NSColumnAutoresizingStyle">4</int>
-										<int key="NSDraggingSourceMaskForLocal">15</int>
-										<int key="NSDraggingSourceMaskForNonLocal">0</int>
-										<bool key="NSAllowsTypeSelect">NO</bool>
-										<int key="NSTableViewSelectionHighlightStyle">1</int>
-										<int key="NSTableViewDraggingDestinationStyle">1</int>
-									</object>
-								</array>
-								<string key="NSFrame">{{1, 1}, {339, 319}}</string>
-								<reference key="NSSuperview" ref="1038370525"/>
-								<reference key="NSNextKeyView" ref="429436769"/>
-								<reference key="NSDocView" ref="429436769"/>
-								<reference key="NSBGColor" ref="598476436"/>
-								<int key="NScvFlags">4</int>
-							</object>
-							<object class="NSScroller" id="617550661">
-								<reference key="NSNextResponder" ref="1038370525"/>
-								<int key="NSvFlags">-2147483392</int>
-								<string key="NSFrame">{{317, 1}, {15, 574}}</string>
-								<reference key="NSSuperview" ref="1038370525"/>
-								<reference key="NSTarget" ref="1038370525"/>
-								<string key="NSAction">_doScroller:</string>
-								<double key="NSPercent">0.99687498807907104</double>
-							</object>
-							<object class="NSScroller" id="977018641">
-								<reference key="NSNextResponder" ref="1038370525"/>
-								<int key="NSvFlags">-2147483392</int>
-								<string key="NSFrame">{{1, 263}, {157, 15}}</string>
-								<reference key="NSSuperview" ref="1038370525"/>
-								<int key="NSsFlags">1</int>
-								<reference key="NSTarget" ref="1038370525"/>
-								<string key="NSAction">_doScroller:</string>
-								<double key="NSPercent">0.99705880880355835</double>
-							</object>
-						</array>
-						<string key="NSFrameSize">{341, 321}</string>
-						<reference key="NSSuperview" ref="758604943"/>
-						<reference key="NSNextKeyView" ref="250930136"/>
-						<int key="NSsFlags">562</int>
-						<reference key="NSVScroller" ref="617550661"/>
-						<reference key="NSHScroller" ref="977018641"/>
-						<reference key="NSContentView" ref="250930136"/>
-						<bytes key="NSScrollAmts">QSAAAEEgAABCFAAAQhQAAA</bytes>
-					</object>
-				</array>
-				<string key="NSFrameSize">{341, 321}</string>
-				<reference key="NSSuperview"/>
-				<bool key="NSViewCanDrawConcurrently">YES</bool>
-				<string key="NSClassName">NSView</string>
-			</object>
-			<object class="NSDrawer" id="764451088">
-				<nil key="NSNextResponder"/>
-				<string key="NSContentSize">{300, 100}</string>
-				<string key="NSMinContentSize">{0, 0}</string>
-				<string key="NSMaxContentSize">{10000, 10000}</string>
-				<int key="NSPreferredEdge">2</int>
-				<double key="NSLeadingOffset">0.0</double>
-				<double key="NSTrailingOffset">15</double>
-				<nil key="NSParentWindow"/>
-				<nil key="NSDelegate"/>
-			</object>
-			<object class="NSMenu" id="649796088">
-				<string key="NSTitle">AMainMenu</string>
-				<array class="NSMutableArray" key="NSMenuItems">
-					<object class="NSMenuItem" id="694149608">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">SimpleCocoaApp</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<object class="NSCustomResource" key="NSOnImage" id="35465992">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuCheckmark</string>
-						</object>
-						<object class="NSCustomResource" key="NSMixedImage" id="502551668">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuMixedState</string>
-						</object>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="110575045">
-							<string key="NSTitle">SimpleCocoaApp</string>
-							<array class="NSMutableArray" key="NSMenuItems">
-								<object class="NSMenuItem" id="238522557">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">About SimpleCocoaApp</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="24092627">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="622903446">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Show Options</string>
-									<string key="NSKeyEquiv"></string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="304266470">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="609285721">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Preferences…</string>
-									<string key="NSKeyEquiv">,</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="481834944">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1046388886">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Services</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="752062318">
-										<string key="NSTitle">Services</string>
-										<array class="NSMutableArray" key="NSMenuItems"/>
-										<string key="NSName">_NSServicesMenu</string>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="646227648">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="755159360">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Hide SimpleCocoaApp</string>
-									<string key="NSKeyEquiv">h</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="342932134">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Hide Others</string>
-									<string key="NSKeyEquiv">h</string>
-									<int key="NSKeyEquivModMask">1572864</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="908899353">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Show All</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1056857174">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="632727374">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Quit SimpleCocoaApp</string>
-									<string key="NSKeyEquiv">q</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</array>
-							<string key="NSName">_NSAppleMenu</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="379814623">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">File</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="720053764">
-							<string key="NSTitle">File</string>
-							<array class="NSMutableArray" key="NSMenuItems">
-								<object class="NSMenuItem" id="705341025">
-									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">New</string>
-									<string key="NSKeyEquiv">n</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="722745758">
-									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">Open…</string>
-									<string key="NSKeyEquiv">o</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1025936716">
-									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">Open Recent</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="1065607017">
-										<string key="NSTitle">Open Recent</string>
-										<array class="NSMutableArray" key="NSMenuItems">
-											<object class="NSMenuItem" id="759406840">
-												<reference key="NSMenu" ref="1065607017"/>
-												<string key="NSTitle">Clear Menu</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-										</array>
-										<string key="NSName">_NSRecentDocumentsMenu</string>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="425164168">
-									<reference key="NSMenu" ref="720053764"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="776162233">
-									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">Close</string>
-									<string key="NSKeyEquiv">w</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1023925487">
-									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">Save</string>
-									<string key="NSKeyEquiv">s</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="117038363">
-									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">Save As…</string>
-									<string key="NSKeyEquiv">S</string>
-									<int key="NSKeyEquivModMask">1179648</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="579971712">
-									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">Revert to Saved</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1010469920">
-									<reference key="NSMenu" ref="720053764"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="294629803">
-									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">Page Setup...</string>
-									<string key="NSKeyEquiv">P</string>
-									<int key="NSKeyEquivModMask">1179648</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSToolTip"/>
-								</object>
-								<object class="NSMenuItem" id="49223823">
-									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">Print…</string>
-									<string key="NSKeyEquiv">p</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</array>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="952259628">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Edit</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="789758025">
-							<string key="NSTitle">Edit</string>
-							<array class="NSMutableArray" key="NSMenuItems">
-								<object class="NSMenuItem" id="1058277027">
-									<reference key="NSMenu" ref="789758025"/>
-									<string key="NSTitle">Undo</string>
-									<string key="NSKeyEquiv">z</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="790794224">
-									<reference key="NSMenu" ref="789758025"/>
-									<string key="NSTitle">Redo</string>
-									<string key="NSKeyEquiv">Z</string>
-									<int key="NSKeyEquivModMask">1179648</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1040322652">
-									<reference key="NSMenu" ref="789758025"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="296257095">
-									<reference key="NSMenu" ref="789758025"/>
-									<string key="NSTitle">Cut</string>
-									<string key="NSKeyEquiv">x</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="860595796">
-									<reference key="NSMenu" ref="789758025"/>
-									<string key="NSTitle">Copy</string>
-									<string key="NSKeyEquiv">c</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="29853731">
-									<reference key="NSMenu" ref="789758025"/>
-									<string key="NSTitle">Paste</string>
-									<string key="NSKeyEquiv">v</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="82994268">
-									<reference key="NSMenu" ref="789758025"/>
-									<string key="NSTitle">Paste and Match Style</string>
-									<string key="NSKeyEquiv">V</string>
-									<int key="NSKeyEquivModMask">1572864</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="437104165">
-									<reference key="NSMenu" ref="789758025"/>
-									<string key="NSTitle">Delete</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="583158037">
-									<reference key="NSMenu" ref="789758025"/>
-									<string key="NSTitle">Select All</string>
-									<string key="NSKeyEquiv">a</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="212016141">
-									<reference key="NSMenu" ref="789758025"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="892235320">
-									<reference key="NSMenu" ref="789758025"/>
-									<string key="NSTitle">Find</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="963351320">
-										<string key="NSTitle">Find</string>
-										<array class="NSMutableArray" key="NSMenuItems">
-											<object class="NSMenuItem" id="447796847">
-												<reference key="NSMenu" ref="963351320"/>
-												<string key="NSTitle">Find…</string>
-												<string key="NSKeyEquiv">f</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">1</int>
-											</object>
-											<object class="NSMenuItem" id="326711663">
-												<reference key="NSMenu" ref="963351320"/>
-												<string key="NSTitle">Find Next</string>
-												<string key="NSKeyEquiv">g</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">2</int>
-											</object>
-											<object class="NSMenuItem" id="270902937">
-												<reference key="NSMenu" ref="963351320"/>
-												<string key="NSTitle">Find Previous</string>
-												<string key="NSKeyEquiv">G</string>
-												<int key="NSKeyEquivModMask">1179648</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">3</int>
-											</object>
-											<object class="NSMenuItem" id="159080638">
-												<reference key="NSMenu" ref="963351320"/>
-												<string key="NSTitle">Use Selection for Find</string>
-												<string key="NSKeyEquiv">e</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">7</int>
-											</object>
-											<object class="NSMenuItem" id="88285865">
-												<reference key="NSMenu" ref="963351320"/>
-												<string key="NSTitle">Jump to Selection</string>
-												<string key="NSKeyEquiv">j</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-										</array>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="972420730">
-									<reference key="NSMenu" ref="789758025"/>
-									<string key="NSTitle">Spelling and Grammar</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="769623530">
-										<string key="NSTitle">Spelling and Grammar</string>
-										<array class="NSMutableArray" key="NSMenuItems">
-											<object class="NSMenuItem" id="679648819">
-												<reference key="NSMenu" ref="769623530"/>
-												<string key="NSTitle">Show Spelling and Grammar</string>
-												<string key="NSKeyEquiv">:</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="96193923">
-												<reference key="NSMenu" ref="769623530"/>
-												<string key="NSTitle">Check Document Now</string>
-												<string key="NSKeyEquiv">;</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="859480356">
-												<reference key="NSMenu" ref="769623530"/>
-												<bool key="NSIsDisabled">YES</bool>
-												<bool key="NSIsSeparator">YES</bool>
-												<string key="NSTitle"/>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="948374510">
-												<reference key="NSMenu" ref="769623530"/>
-												<string key="NSTitle">Check Spelling While Typing</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="967646866">
-												<reference key="NSMenu" ref="769623530"/>
-												<string key="NSTitle">Check Grammar With Spelling</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="795346622">
-												<reference key="NSMenu" ref="769623530"/>
-												<string key="NSTitle">Correct Spelling Automatically</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-										</array>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="507821607">
-									<reference key="NSMenu" ref="789758025"/>
-									<string key="NSTitle">Substitutions</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="698887838">
-										<string key="NSTitle">Substitutions</string>
-										<array class="NSMutableArray" key="NSMenuItems">
-											<object class="NSMenuItem" id="65139061">
-												<reference key="NSMenu" ref="698887838"/>
-												<string key="NSTitle">Show Substitutions</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="19036812">
-												<reference key="NSMenu" ref="698887838"/>
-												<bool key="NSIsDisabled">YES</bool>
-												<bool key="NSIsSeparator">YES</bool>
-												<string key="NSTitle"/>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="605118523">
-												<reference key="NSMenu" ref="698887838"/>
-												<string key="NSTitle">Smart Copy/Paste</string>
-												<string key="NSKeyEquiv">f</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">1</int>
-											</object>
-											<object class="NSMenuItem" id="197661976">
-												<reference key="NSMenu" ref="698887838"/>
-												<string key="NSTitle">Smart Quotes</string>
-												<string key="NSKeyEquiv">g</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">2</int>
-											</object>
-											<object class="NSMenuItem" id="672708820">
-												<reference key="NSMenu" ref="698887838"/>
-												<string key="NSTitle">Smart Dashes</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="708854459">
-												<reference key="NSMenu" ref="698887838"/>
-												<string key="NSTitle">Smart Links</string>
-												<string key="NSKeyEquiv">G</string>
-												<int key="NSKeyEquivModMask">1179648</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">3</int>
-											</object>
-											<object class="NSMenuItem" id="537092702">
-												<reference key="NSMenu" ref="698887838"/>
-												<string key="NSTitle">Text Replacement</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-										</array>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="288088188">
-									<reference key="NSMenu" ref="789758025"/>
-									<string key="NSTitle">Transformations</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="579392910">
-										<string key="NSTitle">Transformations</string>
-										<array class="NSMutableArray" key="NSMenuItems">
-											<object class="NSMenuItem" id="1060694897">
-												<reference key="NSMenu" ref="579392910"/>
-												<string key="NSTitle">Make Upper Case</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="879586729">
-												<reference key="NSMenu" ref="579392910"/>
-												<string key="NSTitle">Make Lower Case</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="56570060">
-												<reference key="NSMenu" ref="579392910"/>
-												<string key="NSTitle">Capitalize</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-										</array>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="676164635">
-									<reference key="NSMenu" ref="789758025"/>
-									<string key="NSTitle">Speech</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="785027613">
-										<string key="NSTitle">Speech</string>
-										<array class="NSMutableArray" key="NSMenuItems">
-											<object class="NSMenuItem" id="731782645">
-												<reference key="NSMenu" ref="785027613"/>
-												<string key="NSTitle">Start Speaking</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="680220178">
-												<reference key="NSMenu" ref="785027613"/>
-												<string key="NSTitle">Stop Speaking</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-										</array>
-									</object>
-								</object>
-							</array>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="586577488">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">View</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="466310130">
-							<string key="NSTitle">View</string>
-							<array class="NSMutableArray" key="NSMenuItems">
-								<object class="NSMenuItem" id="87708234">
-									<reference key="NSMenu" ref="466310130"/>
-									<string key="NSTitle">Show Menu Key Equivalents</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<int key="NSState">1</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="102151532">
-									<reference key="NSMenu" ref="466310130"/>
-									<string key="NSTitle">Show Toolbar</string>
-									<string key="NSKeyEquiv">t</string>
-									<int key="NSKeyEquivModMask">1572864</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="237841660">
-									<reference key="NSMenu" ref="466310130"/>
-									<string key="NSTitle">Customize Toolbar…</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</array>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="302598603">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Format</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="941447902">
-							<string key="NSTitle">Format</string>
-							<array class="NSMutableArray" key="NSMenuItems">
-								<object class="NSMenuItem" id="792887677">
-									<reference key="NSMenu" ref="941447902"/>
-									<string key="NSTitle">Font</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="786677654">
-										<string key="NSTitle">Font</string>
-										<array class="NSMutableArray" key="NSMenuItems">
-											<object class="NSMenuItem" id="159677712">
-												<reference key="NSMenu" ref="786677654"/>
-												<string key="NSTitle">Show Fonts</string>
-												<string key="NSKeyEquiv">t</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="305399458">
-												<reference key="NSMenu" ref="786677654"/>
-												<string key="NSTitle">Bold</string>
-												<string key="NSKeyEquiv">b</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">2</int>
-											</object>
-											<object class="NSMenuItem" id="814362025">
-												<reference key="NSMenu" ref="786677654"/>
-												<string key="NSTitle">Italic</string>
-												<string key="NSKeyEquiv">i</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">1</int>
-											</object>
-											<object class="NSMenuItem" id="330926929">
-												<reference key="NSMenu" ref="786677654"/>
-												<string key="NSTitle">Underline</string>
-												<string key="NSKeyEquiv">u</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="533507878">
-												<reference key="NSMenu" ref="786677654"/>
-												<bool key="NSIsDisabled">YES</bool>
-												<bool key="NSIsSeparator">YES</bool>
-												<string key="NSTitle"/>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="158063935">
-												<reference key="NSMenu" ref="786677654"/>
-												<string key="NSTitle">Bigger</string>
-												<string key="NSKeyEquiv">+</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">3</int>
-											</object>
-											<object class="NSMenuItem" id="885547335">
-												<reference key="NSMenu" ref="786677654"/>
-												<string key="NSTitle">Smaller</string>
-												<string key="NSKeyEquiv">-</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">4</int>
-											</object>
-											<object class="NSMenuItem" id="901062459">
-												<reference key="NSMenu" ref="786677654"/>
-												<bool key="NSIsDisabled">YES</bool>
-												<bool key="NSIsSeparator">YES</bool>
-												<string key="NSTitle"/>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="767671776">
-												<reference key="NSMenu" ref="786677654"/>
-												<string key="NSTitle">Kern</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<string key="NSAction">submenuAction:</string>
-												<object class="NSMenu" key="NSSubmenu" id="175441468">
-													<string key="NSTitle">Kern</string>
-													<array class="NSMutableArray" key="NSMenuItems">
-														<object class="NSMenuItem" id="252969304">
-															<reference key="NSMenu" ref="175441468"/>
-															<string key="NSTitle">Use Default</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="766922938">
-															<reference key="NSMenu" ref="175441468"/>
-															<string key="NSTitle">Use None</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="677519740">
-															<reference key="NSMenu" ref="175441468"/>
-															<string key="NSTitle">Tighten</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="238351151">
-															<reference key="NSMenu" ref="175441468"/>
-															<string key="NSTitle">Loosen</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-													</array>
-												</object>
-											</object>
-											<object class="NSMenuItem" id="691570813">
-												<reference key="NSMenu" ref="786677654"/>
-												<string key="NSTitle">Ligature</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<string key="NSAction">submenuAction:</string>
-												<object class="NSMenu" key="NSSubmenu" id="1058217995">
-													<string key="NSTitle">Ligature</string>
-													<array class="NSMutableArray" key="NSMenuItems">
-														<object class="NSMenuItem" id="706297211">
-															<reference key="NSMenu" ref="1058217995"/>
-															<string key="NSTitle">Use Default</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="568384683">
-															<reference key="NSMenu" ref="1058217995"/>
-															<string key="NSTitle">Use None</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="663508465">
-															<reference key="NSMenu" ref="1058217995"/>
-															<string key="NSTitle">Use All</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-													</array>
-												</object>
-											</object>
-											<object class="NSMenuItem" id="769124883">
-												<reference key="NSMenu" ref="786677654"/>
-												<string key="NSTitle">Baseline</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<string key="NSAction">submenuAction:</string>
-												<object class="NSMenu" key="NSSubmenu" id="18263474">
-													<string key="NSTitle">Baseline</string>
-													<array class="NSMutableArray" key="NSMenuItems">
-														<object class="NSMenuItem" id="257962622">
-															<reference key="NSMenu" ref="18263474"/>
-															<string key="NSTitle">Use Default</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="644725453">
-															<reference key="NSMenu" ref="18263474"/>
-															<string key="NSTitle">Superscript</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="1037576581">
-															<reference key="NSMenu" ref="18263474"/>
-															<string key="NSTitle">Subscript</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="941806246">
-															<reference key="NSMenu" ref="18263474"/>
-															<string key="NSTitle">Raise</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="1045724900">
-															<reference key="NSMenu" ref="18263474"/>
-															<string key="NSTitle">Lower</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-													</array>
-												</object>
-											</object>
-											<object class="NSMenuItem" id="739652853">
-												<reference key="NSMenu" ref="786677654"/>
-												<bool key="NSIsDisabled">YES</bool>
-												<bool key="NSIsSeparator">YES</bool>
-												<string key="NSTitle"/>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="1012600125">
-												<reference key="NSMenu" ref="786677654"/>
-												<string key="NSTitle">Show Colors</string>
-												<string key="NSKeyEquiv">C</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="214559597">
-												<reference key="NSMenu" ref="786677654"/>
-												<bool key="NSIsDisabled">YES</bool>
-												<bool key="NSIsSeparator">YES</bool>
-												<string key="NSTitle"/>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="596732606">
-												<reference key="NSMenu" ref="786677654"/>
-												<string key="NSTitle">Copy Style</string>
-												<string key="NSKeyEquiv">c</string>
-												<int key="NSKeyEquivModMask">1572864</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="393423671">
-												<reference key="NSMenu" ref="786677654"/>
-												<string key="NSTitle">Paste Style</string>
-												<string key="NSKeyEquiv">v</string>
-												<int key="NSKeyEquivModMask">1572864</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-										</array>
-										<string key="NSName">_NSFontMenu</string>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="215659978">
-									<reference key="NSMenu" ref="941447902"/>
-									<string key="NSTitle">Text</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="446991534">
-										<string key="NSTitle">Text</string>
-										<array class="NSMutableArray" key="NSMenuItems">
-											<object class="NSMenuItem" id="875092757">
-												<reference key="NSMenu" ref="446991534"/>
-												<string key="NSTitle">Align Left</string>
-												<string key="NSKeyEquiv">{</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="630155264">
-												<reference key="NSMenu" ref="446991534"/>
-												<string key="NSTitle">Center</string>
-												<string key="NSKeyEquiv">|</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="945678886">
-												<reference key="NSMenu" ref="446991534"/>
-												<string key="NSTitle">Justify</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="512868991">
-												<reference key="NSMenu" ref="446991534"/>
-												<string key="NSTitle">Align Right</string>
-												<string key="NSKeyEquiv">}</string>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="163117631">
-												<reference key="NSMenu" ref="446991534"/>
-												<bool key="NSIsDisabled">YES</bool>
-												<bool key="NSIsSeparator">YES</bool>
-												<string key="NSTitle"/>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="31516759">
-												<reference key="NSMenu" ref="446991534"/>
-												<string key="NSTitle">Writing Direction</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<string key="NSAction">submenuAction:</string>
-												<object class="NSMenu" key="NSSubmenu" id="956096989">
-													<string key="NSTitle">Writing Direction</string>
-													<array class="NSMutableArray" key="NSMenuItems">
-														<object class="NSMenuItem" id="257099033">
-															<reference key="NSMenu" ref="956096989"/>
-															<bool key="NSIsDisabled">YES</bool>
-															<string key="NSTitle">Paragraph</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="551969625">
-															<reference key="NSMenu" ref="956096989"/>
-															<string type="base64-UTF8" key="NSTitle">CURlZmF1bHQ</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="249532473">
-															<reference key="NSMenu" ref="956096989"/>
-															<string type="base64-UTF8" key="NSTitle">CUxlZnQgdG8gUmlnaHQ</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="607364498">
-															<reference key="NSMenu" ref="956096989"/>
-															<string type="base64-UTF8" key="NSTitle">CVJpZ2h0IHRvIExlZnQ</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="508151438">
-															<reference key="NSMenu" ref="956096989"/>
-															<bool key="NSIsDisabled">YES</bool>
-															<bool key="NSIsSeparator">YES</bool>
-															<string key="NSTitle"/>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="981751889">
-															<reference key="NSMenu" ref="956096989"/>
-															<bool key="NSIsDisabled">YES</bool>
-															<string key="NSTitle">Selection</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="380031999">
-															<reference key="NSMenu" ref="956096989"/>
-															<string type="base64-UTF8" key="NSTitle">CURlZmF1bHQ</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="825984362">
-															<reference key="NSMenu" ref="956096989"/>
-															<string type="base64-UTF8" key="NSTitle">CUxlZnQgdG8gUmlnaHQ</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-														<object class="NSMenuItem" id="560145579">
-															<reference key="NSMenu" ref="956096989"/>
-															<string type="base64-UTF8" key="NSTitle">CVJpZ2h0IHRvIExlZnQ</string>
-															<string key="NSKeyEquiv"/>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="35465992"/>
-															<reference key="NSMixedImage" ref="502551668"/>
-														</object>
-													</array>
-												</object>
-											</object>
-											<object class="NSMenuItem" id="908105787">
-												<reference key="NSMenu" ref="446991534"/>
-												<bool key="NSIsDisabled">YES</bool>
-												<bool key="NSIsSeparator">YES</bool>
-												<string key="NSTitle"/>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="644046920">
-												<reference key="NSMenu" ref="446991534"/>
-												<string key="NSTitle">Show Ruler</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="231811626">
-												<reference key="NSMenu" ref="446991534"/>
-												<string key="NSTitle">Copy Ruler</string>
-												<string key="NSKeyEquiv">c</string>
-												<int key="NSKeyEquivModMask">1310720</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-											<object class="NSMenuItem" id="883618387">
-												<reference key="NSMenu" ref="446991534"/>
-												<string key="NSTitle">Paste Ruler</string>
-												<string key="NSKeyEquiv">v</string>
-												<int key="NSKeyEquivModMask">1310720</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-										</array>
-									</object>
-								</object>
-							</array>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="713487014">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Window</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="835318025">
-							<string key="NSTitle">Window</string>
-							<array class="NSMutableArray" key="NSMenuItems">
-								<object class="NSMenuItem" id="1011231497">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Minimize</string>
-									<string key="NSKeyEquiv">m</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="575023229">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Zoom</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="92029792">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">768 x 1024</string>
-									<string key="NSKeyEquiv">=</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="299356726">
-									<reference key="NSMenu" ref="835318025"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="625202149">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Bring All to Front</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</array>
-							<string key="NSName">_NSWindowsMenu</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="448692316">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Help</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="992780483">
-							<string key="NSTitle">Help</string>
-							<array class="NSMutableArray" key="NSMenuItems">
-								<object class="NSMenuItem" id="105068016">
-									<reference key="NSMenu" ref="992780483"/>
-									<string key="NSTitle">SimpleCocoaApp Help</string>
-									<string key="NSKeyEquiv">?</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</array>
-							<string key="NSName">_NSHelpMenu</string>
-						</object>
-					</object>
-				</array>
-				<string key="NSName">_NSMainMenu</string>
-			</object>
-			<object class="NSCustomObject" id="755631768">
-				<string key="NSClassName">NSFontManager</string>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performMiniaturize:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="1011231497"/>
-					</object>
-					<int key="connectionID">37</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">arrangeInFront:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="625202149"/>
-					</object>
-					<int key="connectionID">39</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">print:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="49223823"/>
-					</object>
-					<int key="connectionID">86</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">runPageLayout:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="294629803"/>
-					</object>
-					<int key="connectionID">87</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">clearRecentDocuments:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="759406840"/>
-					</object>
-					<int key="connectionID">127</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">orderFrontStandardAboutPanel:</string>
-						<reference key="source" ref="1021"/>
-						<reference key="destination" ref="238522557"/>
-					</object>
-					<int key="connectionID">142</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performClose:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="776162233"/>
-					</object>
-					<int key="connectionID">193</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleContinuousSpellChecking:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="948374510"/>
-					</object>
-					<int key="connectionID">222</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">undo:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="1058277027"/>
-					</object>
-					<int key="connectionID">223</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">copy:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="860595796"/>
-					</object>
-					<int key="connectionID">224</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">checkSpelling:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="96193923"/>
-					</object>
-					<int key="connectionID">225</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">paste:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="29853731"/>
-					</object>
-					<int key="connectionID">226</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">stopSpeaking:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="680220178"/>
-					</object>
-					<int key="connectionID">227</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">cut:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="296257095"/>
-					</object>
-					<int key="connectionID">228</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showGuessPanel:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="679648819"/>
-					</object>
-					<int key="connectionID">230</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">redo:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="790794224"/>
-					</object>
-					<int key="connectionID">231</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">selectAll:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="583158037"/>
-					</object>
-					<int key="connectionID">232</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">startSpeaking:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="731782645"/>
-					</object>
-					<int key="connectionID">233</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">delete:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="437104165"/>
-					</object>
-					<int key="connectionID">235</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performZoom:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="575023229"/>
-					</object>
-					<int key="connectionID">240</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performFindPanelAction:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="447796847"/>
-					</object>
-					<int key="connectionID">241</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">centerSelectionInVisibleArea:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="88285865"/>
-					</object>
-					<int key="connectionID">245</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleGrammarChecking:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="967646866"/>
-					</object>
-					<int key="connectionID">347</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleSmartInsertDelete:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="605118523"/>
-					</object>
-					<int key="connectionID">355</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleAutomaticQuoteSubstitution:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="197661976"/>
-					</object>
-					<int key="connectionID">356</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleAutomaticLinkDetection:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="708854459"/>
-					</object>
-					<int key="connectionID">357</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">saveDocument:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="1023925487"/>
-					</object>
-					<int key="connectionID">362</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">saveDocumentAs:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="117038363"/>
-					</object>
-					<int key="connectionID">363</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">revertDocumentToSaved:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="579971712"/>
-					</object>
-					<int key="connectionID">364</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">runToolbarCustomizationPalette:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="237841660"/>
-					</object>
-					<int key="connectionID">365</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleToolbarShown:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="102151532"/>
-					</object>
-					<int key="connectionID">366</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hide:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="755159360"/>
-					</object>
-					<int key="connectionID">367</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hideOtherApplications:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="342932134"/>
-					</object>
-					<int key="connectionID">368</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">unhideAllApplications:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="908899353"/>
-					</object>
-					<int key="connectionID">370</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">newDocument:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="705341025"/>
-					</object>
-					<int key="connectionID">373</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">openDocument:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="722745758"/>
-					</object>
-					<int key="connectionID">374</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">addFontTrait:</string>
-						<reference key="source" ref="755631768"/>
-						<reference key="destination" ref="305399458"/>
-					</object>
-					<int key="connectionID">421</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">addFontTrait:</string>
-						<reference key="source" ref="755631768"/>
-						<reference key="destination" ref="814362025"/>
-					</object>
-					<int key="connectionID">422</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">modifyFont:</string>
-						<reference key="source" ref="755631768"/>
-						<reference key="destination" ref="885547335"/>
-					</object>
-					<int key="connectionID">423</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">orderFrontFontPanel:</string>
-						<reference key="source" ref="755631768"/>
-						<reference key="destination" ref="159677712"/>
-					</object>
-					<int key="connectionID">424</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">modifyFont:</string>
-						<reference key="source" ref="755631768"/>
-						<reference key="destination" ref="158063935"/>
-					</object>
-					<int key="connectionID">425</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">raiseBaseline:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="941806246"/>
-					</object>
-					<int key="connectionID">426</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">lowerBaseline:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="1045724900"/>
-					</object>
-					<int key="connectionID">427</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">copyFont:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="596732606"/>
-					</object>
-					<int key="connectionID">428</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">subscript:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="1037576581"/>
-					</object>
-					<int key="connectionID">429</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">superscript:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="644725453"/>
-					</object>
-					<int key="connectionID">430</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">tightenKerning:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="677519740"/>
-					</object>
-					<int key="connectionID">431</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">underline:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="330926929"/>
-					</object>
-					<int key="connectionID">432</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">orderFrontColorPanel:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="1012600125"/>
-					</object>
-					<int key="connectionID">433</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">useAllLigatures:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="663508465"/>
-					</object>
-					<int key="connectionID">434</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">loosenKerning:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="238351151"/>
-					</object>
-					<int key="connectionID">435</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">pasteFont:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="393423671"/>
-					</object>
-					<int key="connectionID">436</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">unscript:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="257962622"/>
-					</object>
-					<int key="connectionID">437</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">useStandardKerning:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="252969304"/>
-					</object>
-					<int key="connectionID">438</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">useStandardLigatures:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="706297211"/>
-					</object>
-					<int key="connectionID">439</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">turnOffLigatures:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="568384683"/>
-					</object>
-					<int key="connectionID">440</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">turnOffKerning:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="766922938"/>
-					</object>
-					<int key="connectionID">441</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">terminate:</string>
-						<reference key="source" ref="1050"/>
-						<reference key="destination" ref="632727374"/>
-					</object>
-					<int key="connectionID">449</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleAutomaticSpellingCorrection:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="795346622"/>
-					</object>
-					<int key="connectionID">456</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">orderFrontSubstitutionsPanel:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="65139061"/>
-					</object>
-					<int key="connectionID">458</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleAutomaticDashSubstitution:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="672708820"/>
-					</object>
-					<int key="connectionID">461</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleAutomaticTextReplacement:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="537092702"/>
-					</object>
-					<int key="connectionID">463</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">uppercaseWord:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="1060694897"/>
-					</object>
-					<int key="connectionID">464</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">capitalizeWord:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="56570060"/>
-					</object>
-					<int key="connectionID">467</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">lowercaseWord:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="879586729"/>
-					</object>
-					<int key="connectionID">468</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">pasteAsPlainText:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="82994268"/>
-					</object>
-					<int key="connectionID">486</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performFindPanelAction:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="326711663"/>
-					</object>
-					<int key="connectionID">487</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performFindPanelAction:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="270902937"/>
-					</object>
-					<int key="connectionID">488</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performFindPanelAction:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="159080638"/>
-					</object>
-					<int key="connectionID">489</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showHelp:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="105068016"/>
-					</object>
-					<int key="connectionID">493</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">alignCenter:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="630155264"/>
-					</object>
-					<int key="connectionID">518</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">pasteRuler:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="883618387"/>
-					</object>
-					<int key="connectionID">519</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleRuler:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="644046920"/>
-					</object>
-					<int key="connectionID">520</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">alignRight:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="512868991"/>
-					</object>
-					<int key="connectionID">521</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">copyRuler:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="231811626"/>
-					</object>
-					<int key="connectionID">522</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">alignJustified:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="945678886"/>
-					</object>
-					<int key="connectionID">523</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">alignLeft:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="875092757"/>
-					</object>
-					<int key="connectionID">524</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">makeBaseWritingDirectionNatural:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="551969625"/>
-					</object>
-					<int key="connectionID">525</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">makeBaseWritingDirectionLeftToRight:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="249532473"/>
-					</object>
-					<int key="connectionID">526</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">makeBaseWritingDirectionRightToLeft:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="607364498"/>
-					</object>
-					<int key="connectionID">527</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">makeTextWritingDirectionNatural:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="380031999"/>
-					</object>
-					<int key="connectionID">528</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">makeTextWritingDirectionLeftToRight:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="825984362"/>
-					</object>
-					<int key="connectionID">529</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">makeTextWritingDirectionRightToLeft:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="560145579"/>
-					</object>
-					<int key="connectionID">530</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">contentView</string>
-						<reference key="source" ref="764451088"/>
-						<reference key="destination" ref="758604943"/>
-					</object>
-					<int key="connectionID">542</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">parentWindow</string>
-						<reference key="source" ref="764451088"/>
-						<reference key="destination" ref="972006081"/>
-					</object>
-					<int key="connectionID">651</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="1021"/>
-						<reference key="destination" ref="976324537"/>
-					</object>
-					<int key="connectionID">656</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fOptionsDelegate</string>
-						<reference key="source" ref="439893737"/>
-						<reference key="destination" ref="429436769"/>
-					</object>
-					<int key="connectionID">667</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fWindow</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="972006081"/>
-					</object>
-					<int key="connectionID">673</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fOptions</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="429436769"/>
-					</object>
-					<int key="connectionID">674</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fView</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="439893737"/>
-					</object>
-					<int key="connectionID">682</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggle:</string>
-						<reference key="source" ref="764451088"/>
-						<reference key="destination" ref="622903446"/>
-					</object>
-					<int key="connectionID">707</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleKeyEquivalents:</string>
-						<reference key="source" ref="429436769"/>
-						<reference key="destination" ref="87708234"/>
-					</object>
-					<int key="connectionID">719</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toiPadSize:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="92029792"/>
-					</object>
-					<int key="connectionID">721</int>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<array key="object" id="0"/>
-						<reference key="children" ref="1048"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1021"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1014"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1050"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">29</int>
-						<reference key="object" ref="649796088"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="713487014"/>
-							<reference ref="694149608"/>
-							<reference ref="952259628"/>
-							<reference ref="379814623"/>
-							<reference ref="586577488"/>
-							<reference ref="448692316"/>
-							<reference ref="302598603"/>
-						</array>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">19</int>
-						<reference key="object" ref="713487014"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="835318025"/>
-						</array>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">56</int>
-						<reference key="object" ref="694149608"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="110575045"/>
-						</array>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">217</int>
-						<reference key="object" ref="952259628"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="789758025"/>
-						</array>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">83</int>
-						<reference key="object" ref="379814623"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="720053764"/>
-						</array>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">81</int>
-						<reference key="object" ref="720053764"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="1023925487"/>
-							<reference ref="117038363"/>
-							<reference ref="49223823"/>
-							<reference ref="722745758"/>
-							<reference ref="705341025"/>
-							<reference ref="1025936716"/>
-							<reference ref="294629803"/>
-							<reference ref="776162233"/>
-							<reference ref="425164168"/>
-							<reference ref="579971712"/>
-							<reference ref="1010469920"/>
-						</array>
-						<reference key="parent" ref="379814623"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">75</int>
-						<reference key="object" ref="1023925487"/>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">80</int>
-						<reference key="object" ref="117038363"/>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">78</int>
-						<reference key="object" ref="49223823"/>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">72</int>
-						<reference key="object" ref="722745758"/>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">82</int>
-						<reference key="object" ref="705341025"/>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">124</int>
-						<reference key="object" ref="1025936716"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="1065607017"/>
-						</array>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">77</int>
-						<reference key="object" ref="294629803"/>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">73</int>
-						<reference key="object" ref="776162233"/>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">79</int>
-						<reference key="object" ref="425164168"/>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">112</int>
-						<reference key="object" ref="579971712"/>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">74</int>
-						<reference key="object" ref="1010469920"/>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">125</int>
-						<reference key="object" ref="1065607017"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="759406840"/>
-						</array>
-						<reference key="parent" ref="1025936716"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">126</int>
-						<reference key="object" ref="759406840"/>
-						<reference key="parent" ref="1065607017"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">205</int>
-						<reference key="object" ref="789758025"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="437104165"/>
-							<reference ref="583158037"/>
-							<reference ref="1058277027"/>
-							<reference ref="212016141"/>
-							<reference ref="296257095"/>
-							<reference ref="29853731"/>
-							<reference ref="860595796"/>
-							<reference ref="1040322652"/>
-							<reference ref="790794224"/>
-							<reference ref="892235320"/>
-							<reference ref="972420730"/>
-							<reference ref="676164635"/>
-							<reference ref="507821607"/>
-							<reference ref="288088188"/>
-							<reference ref="82994268"/>
-						</array>
-						<reference key="parent" ref="952259628"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">202</int>
-						<reference key="object" ref="437104165"/>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">198</int>
-						<reference key="object" ref="583158037"/>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">207</int>
-						<reference key="object" ref="1058277027"/>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">214</int>
-						<reference key="object" ref="212016141"/>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">199</int>
-						<reference key="object" ref="296257095"/>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">203</int>
-						<reference key="object" ref="29853731"/>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">197</int>
-						<reference key="object" ref="860595796"/>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">206</int>
-						<reference key="object" ref="1040322652"/>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">215</int>
-						<reference key="object" ref="790794224"/>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">218</int>
-						<reference key="object" ref="892235320"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="963351320"/>
-						</array>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">216</int>
-						<reference key="object" ref="972420730"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="769623530"/>
-						</array>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">200</int>
-						<reference key="object" ref="769623530"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="948374510"/>
-							<reference ref="96193923"/>
-							<reference ref="679648819"/>
-							<reference ref="967646866"/>
-							<reference ref="859480356"/>
-							<reference ref="795346622"/>
-						</array>
-						<reference key="parent" ref="972420730"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">219</int>
-						<reference key="object" ref="948374510"/>
-						<reference key="parent" ref="769623530"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">201</int>
-						<reference key="object" ref="96193923"/>
-						<reference key="parent" ref="769623530"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">204</int>
-						<reference key="object" ref="679648819"/>
-						<reference key="parent" ref="769623530"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">220</int>
-						<reference key="object" ref="963351320"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="270902937"/>
-							<reference ref="88285865"/>
-							<reference ref="159080638"/>
-							<reference ref="326711663"/>
-							<reference ref="447796847"/>
-						</array>
-						<reference key="parent" ref="892235320"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">213</int>
-						<reference key="object" ref="270902937"/>
-						<reference key="parent" ref="963351320"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">210</int>
-						<reference key="object" ref="88285865"/>
-						<reference key="parent" ref="963351320"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">221</int>
-						<reference key="object" ref="159080638"/>
-						<reference key="parent" ref="963351320"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">208</int>
-						<reference key="object" ref="326711663"/>
-						<reference key="parent" ref="963351320"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">209</int>
-						<reference key="object" ref="447796847"/>
-						<reference key="parent" ref="963351320"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">57</int>
-						<reference key="object" ref="110575045"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="238522557"/>
-							<reference ref="755159360"/>
-							<reference ref="908899353"/>
-							<reference ref="632727374"/>
-							<reference ref="646227648"/>
-							<reference ref="609285721"/>
-							<reference ref="481834944"/>
-							<reference ref="304266470"/>
-							<reference ref="1046388886"/>
-							<reference ref="1056857174"/>
-							<reference ref="342932134"/>
-							<reference ref="622903446"/>
-							<reference ref="24092627"/>
-						</array>
-						<reference key="parent" ref="694149608"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">58</int>
-						<reference key="object" ref="238522557"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">134</int>
-						<reference key="object" ref="755159360"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">150</int>
-						<reference key="object" ref="908899353"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">136</int>
-						<reference key="object" ref="632727374"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">144</int>
-						<reference key="object" ref="646227648"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">129</int>
-						<reference key="object" ref="609285721"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">143</int>
-						<reference key="object" ref="481834944"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">236</int>
-						<reference key="object" ref="304266470"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">131</int>
-						<reference key="object" ref="1046388886"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="752062318"/>
-						</array>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">149</int>
-						<reference key="object" ref="1056857174"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">145</int>
-						<reference key="object" ref="342932134"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">130</int>
-						<reference key="object" ref="752062318"/>
-						<reference key="parent" ref="1046388886"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">24</int>
-						<reference key="object" ref="835318025"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="299356726"/>
-							<reference ref="625202149"/>
-							<reference ref="575023229"/>
-							<reference ref="1011231497"/>
-							<reference ref="92029792"/>
-						</array>
-						<reference key="parent" ref="713487014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">92</int>
-						<reference key="object" ref="299356726"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="625202149"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">239</int>
-						<reference key="object" ref="575023229"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">23</int>
-						<reference key="object" ref="1011231497"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">295</int>
-						<reference key="object" ref="586577488"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="466310130"/>
-						</array>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">296</int>
-						<reference key="object" ref="466310130"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="102151532"/>
-							<reference ref="237841660"/>
-							<reference ref="87708234"/>
-						</array>
-						<reference key="parent" ref="586577488"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">297</int>
-						<reference key="object" ref="102151532"/>
-						<reference key="parent" ref="466310130"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">298</int>
-						<reference key="object" ref="237841660"/>
-						<reference key="parent" ref="466310130"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">211</int>
-						<reference key="object" ref="676164635"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="785027613"/>
-						</array>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">212</int>
-						<reference key="object" ref="785027613"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="680220178"/>
-							<reference ref="731782645"/>
-						</array>
-						<reference key="parent" ref="676164635"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">195</int>
-						<reference key="object" ref="680220178"/>
-						<reference key="parent" ref="785027613"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">196</int>
-						<reference key="object" ref="731782645"/>
-						<reference key="parent" ref="785027613"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">346</int>
-						<reference key="object" ref="967646866"/>
-						<reference key="parent" ref="769623530"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">348</int>
-						<reference key="object" ref="507821607"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="698887838"/>
-						</array>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">349</int>
-						<reference key="object" ref="698887838"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="605118523"/>
-							<reference ref="197661976"/>
-							<reference ref="708854459"/>
-							<reference ref="65139061"/>
-							<reference ref="19036812"/>
-							<reference ref="672708820"/>
-							<reference ref="537092702"/>
-						</array>
-						<reference key="parent" ref="507821607"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">350</int>
-						<reference key="object" ref="605118523"/>
-						<reference key="parent" ref="698887838"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">351</int>
-						<reference key="object" ref="197661976"/>
-						<reference key="parent" ref="698887838"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">354</int>
-						<reference key="object" ref="708854459"/>
-						<reference key="parent" ref="698887838"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">371</int>
-						<reference key="object" ref="972006081"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="439893737"/>
-						</array>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">372</int>
-						<reference key="object" ref="439893737"/>
-						<array class="NSMutableArray" key="children"/>
-						<reference key="parent" ref="972006081"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">375</int>
-						<reference key="object" ref="302598603"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="941447902"/>
-						</array>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">376</int>
-						<reference key="object" ref="941447902"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="792887677"/>
-							<reference ref="215659978"/>
-						</array>
-						<reference key="parent" ref="302598603"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">377</int>
-						<reference key="object" ref="792887677"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="786677654"/>
-						</array>
-						<reference key="parent" ref="941447902"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">388</int>
-						<reference key="object" ref="786677654"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="159677712"/>
-							<reference ref="305399458"/>
-							<reference ref="814362025"/>
-							<reference ref="330926929"/>
-							<reference ref="533507878"/>
-							<reference ref="158063935"/>
-							<reference ref="885547335"/>
-							<reference ref="901062459"/>
-							<reference ref="767671776"/>
-							<reference ref="691570813"/>
-							<reference ref="769124883"/>
-							<reference ref="739652853"/>
-							<reference ref="1012600125"/>
-							<reference ref="214559597"/>
-							<reference ref="596732606"/>
-							<reference ref="393423671"/>
-						</array>
-						<reference key="parent" ref="792887677"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">389</int>
-						<reference key="object" ref="159677712"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">390</int>
-						<reference key="object" ref="305399458"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">391</int>
-						<reference key="object" ref="814362025"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">392</int>
-						<reference key="object" ref="330926929"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">393</int>
-						<reference key="object" ref="533507878"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">394</int>
-						<reference key="object" ref="158063935"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">395</int>
-						<reference key="object" ref="885547335"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">396</int>
-						<reference key="object" ref="901062459"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">397</int>
-						<reference key="object" ref="767671776"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="175441468"/>
-						</array>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">398</int>
-						<reference key="object" ref="691570813"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="1058217995"/>
-						</array>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">399</int>
-						<reference key="object" ref="769124883"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="18263474"/>
-						</array>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">400</int>
-						<reference key="object" ref="739652853"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">401</int>
-						<reference key="object" ref="1012600125"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">402</int>
-						<reference key="object" ref="214559597"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">403</int>
-						<reference key="object" ref="596732606"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">404</int>
-						<reference key="object" ref="393423671"/>
-						<reference key="parent" ref="786677654"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">405</int>
-						<reference key="object" ref="18263474"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="257962622"/>
-							<reference ref="644725453"/>
-							<reference ref="1037576581"/>
-							<reference ref="941806246"/>
-							<reference ref="1045724900"/>
-						</array>
-						<reference key="parent" ref="769124883"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">406</int>
-						<reference key="object" ref="257962622"/>
-						<reference key="parent" ref="18263474"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">407</int>
-						<reference key="object" ref="644725453"/>
-						<reference key="parent" ref="18263474"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">408</int>
-						<reference key="object" ref="1037576581"/>
-						<reference key="parent" ref="18263474"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">409</int>
-						<reference key="object" ref="941806246"/>
-						<reference key="parent" ref="18263474"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">410</int>
-						<reference key="object" ref="1045724900"/>
-						<reference key="parent" ref="18263474"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">411</int>
-						<reference key="object" ref="1058217995"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="706297211"/>
-							<reference ref="568384683"/>
-							<reference ref="663508465"/>
-						</array>
-						<reference key="parent" ref="691570813"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">412</int>
-						<reference key="object" ref="706297211"/>
-						<reference key="parent" ref="1058217995"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">413</int>
-						<reference key="object" ref="568384683"/>
-						<reference key="parent" ref="1058217995"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">414</int>
-						<reference key="object" ref="663508465"/>
-						<reference key="parent" ref="1058217995"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">415</int>
-						<reference key="object" ref="175441468"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="252969304"/>
-							<reference ref="766922938"/>
-							<reference ref="677519740"/>
-							<reference ref="238351151"/>
-						</array>
-						<reference key="parent" ref="767671776"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">416</int>
-						<reference key="object" ref="252969304"/>
-						<reference key="parent" ref="175441468"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">417</int>
-						<reference key="object" ref="766922938"/>
-						<reference key="parent" ref="175441468"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">418</int>
-						<reference key="object" ref="677519740"/>
-						<reference key="parent" ref="175441468"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">419</int>
-						<reference key="object" ref="238351151"/>
-						<reference key="parent" ref="175441468"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">420</int>
-						<reference key="object" ref="755631768"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">450</int>
-						<reference key="object" ref="288088188"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="579392910"/>
-						</array>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">451</int>
-						<reference key="object" ref="579392910"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="1060694897"/>
-							<reference ref="879586729"/>
-							<reference ref="56570060"/>
-						</array>
-						<reference key="parent" ref="288088188"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">452</int>
-						<reference key="object" ref="1060694897"/>
-						<reference key="parent" ref="579392910"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">453</int>
-						<reference key="object" ref="859480356"/>
-						<reference key="parent" ref="769623530"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">454</int>
-						<reference key="object" ref="795346622"/>
-						<reference key="parent" ref="769623530"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">457</int>
-						<reference key="object" ref="65139061"/>
-						<reference key="parent" ref="698887838"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">459</int>
-						<reference key="object" ref="19036812"/>
-						<reference key="parent" ref="698887838"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">460</int>
-						<reference key="object" ref="672708820"/>
-						<reference key="parent" ref="698887838"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">462</int>
-						<reference key="object" ref="537092702"/>
-						<reference key="parent" ref="698887838"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">465</int>
-						<reference key="object" ref="879586729"/>
-						<reference key="parent" ref="579392910"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">466</int>
-						<reference key="object" ref="56570060"/>
-						<reference key="parent" ref="579392910"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">485</int>
-						<reference key="object" ref="82994268"/>
-						<reference key="parent" ref="789758025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">490</int>
-						<reference key="object" ref="448692316"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="992780483"/>
-						</array>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">491</int>
-						<reference key="object" ref="992780483"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="105068016"/>
-						</array>
-						<reference key="parent" ref="448692316"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">492</int>
-						<reference key="object" ref="105068016"/>
-						<reference key="parent" ref="992780483"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">496</int>
-						<reference key="object" ref="215659978"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="446991534"/>
-						</array>
-						<reference key="parent" ref="941447902"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">497</int>
-						<reference key="object" ref="446991534"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="875092757"/>
-							<reference ref="630155264"/>
-							<reference ref="945678886"/>
-							<reference ref="512868991"/>
-							<reference ref="163117631"/>
-							<reference ref="31516759"/>
-							<reference ref="908105787"/>
-							<reference ref="644046920"/>
-							<reference ref="231811626"/>
-							<reference ref="883618387"/>
-						</array>
-						<reference key="parent" ref="215659978"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">498</int>
-						<reference key="object" ref="875092757"/>
-						<reference key="parent" ref="446991534"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">499</int>
-						<reference key="object" ref="630155264"/>
-						<reference key="parent" ref="446991534"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">500</int>
-						<reference key="object" ref="945678886"/>
-						<reference key="parent" ref="446991534"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">501</int>
-						<reference key="object" ref="512868991"/>
-						<reference key="parent" ref="446991534"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">502</int>
-						<reference key="object" ref="163117631"/>
-						<reference key="parent" ref="446991534"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">503</int>
-						<reference key="object" ref="31516759"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="956096989"/>
-						</array>
-						<reference key="parent" ref="446991534"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">504</int>
-						<reference key="object" ref="908105787"/>
-						<reference key="parent" ref="446991534"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">505</int>
-						<reference key="object" ref="644046920"/>
-						<reference key="parent" ref="446991534"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">506</int>
-						<reference key="object" ref="231811626"/>
-						<reference key="parent" ref="446991534"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">507</int>
-						<reference key="object" ref="883618387"/>
-						<reference key="parent" ref="446991534"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">508</int>
-						<reference key="object" ref="956096989"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="257099033"/>
-							<reference ref="551969625"/>
-							<reference ref="249532473"/>
-							<reference ref="607364498"/>
-							<reference ref="508151438"/>
-							<reference ref="981751889"/>
-							<reference ref="380031999"/>
-							<reference ref="825984362"/>
-							<reference ref="560145579"/>
-						</array>
-						<reference key="parent" ref="31516759"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">509</int>
-						<reference key="object" ref="257099033"/>
-						<reference key="parent" ref="956096989"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">510</int>
-						<reference key="object" ref="551969625"/>
-						<reference key="parent" ref="956096989"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">511</int>
-						<reference key="object" ref="249532473"/>
-						<reference key="parent" ref="956096989"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">512</int>
-						<reference key="object" ref="607364498"/>
-						<reference key="parent" ref="956096989"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">513</int>
-						<reference key="object" ref="508151438"/>
-						<reference key="parent" ref="956096989"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">514</int>
-						<reference key="object" ref="981751889"/>
-						<reference key="parent" ref="956096989"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">515</int>
-						<reference key="object" ref="380031999"/>
-						<reference key="parent" ref="956096989"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">516</int>
-						<reference key="object" ref="825984362"/>
-						<reference key="parent" ref="956096989"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">517</int>
-						<reference key="object" ref="560145579"/>
-						<reference key="parent" ref="956096989"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">538</int>
-						<reference key="object" ref="758604943"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="1038370525"/>
-						</array>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Drawer Content View</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">539</int>
-						<reference key="object" ref="764451088"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">629</int>
-						<reference key="object" ref="1038370525"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="617550661"/>
-							<reference ref="977018641"/>
-							<reference ref="429436769"/>
-						</array>
-						<reference key="parent" ref="758604943"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">630</int>
-						<reference key="object" ref="617550661"/>
-						<reference key="parent" ref="1038370525"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">631</int>
-						<reference key="object" ref="977018641"/>
-						<reference key="parent" ref="1038370525"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">632</int>
-						<reference key="object" ref="429436769"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="691918008"/>
-							<reference ref="394988372"/>
-						</array>
-						<reference key="parent" ref="1038370525"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">634</int>
-						<reference key="object" ref="691918008"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="241301801"/>
-						</array>
-						<reference key="parent" ref="429436769"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">637</int>
-						<reference key="object" ref="241301801"/>
-						<reference key="parent" ref="691918008"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">494</int>
-						<reference key="object" ref="976324537"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">661</int>
-						<reference key="object" ref="76290771"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">635</int>
-						<reference key="object" ref="394988372"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="88358594"/>
-						</array>
-						<reference key="parent" ref="429436769"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">698</int>
-						<reference key="object" ref="88358594"/>
-						<reference key="parent" ref="394988372"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">705</int>
-						<reference key="object" ref="622903446"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">706</int>
-						<reference key="object" ref="24092627"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">718</int>
-						<reference key="object" ref="87708234"/>
-						<reference key="parent" ref="466310130"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">720</int>
-						<reference key="object" ref="92029792"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="112.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="112.ImportedFromIB2"/>
-				<string key="124.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="124.ImportedFromIB2"/>
-				<string key="125.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="125.ImportedFromIB2"/>
-				<string key="125.editorWindowContentRectSynchronizationRect">{{522, 812}, {146, 23}}</string>
-				<string key="126.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="126.ImportedFromIB2"/>
-				<string key="129.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="129.ImportedFromIB2"/>
-				<string key="130.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="130.ImportedFromIB2"/>
-				<string key="130.editorWindowContentRectSynchronizationRect">{{436, 809}, {64, 6}}</string>
-				<string key="131.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="131.ImportedFromIB2"/>
-				<string key="134.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="134.ImportedFromIB2"/>
-				<string key="136.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="136.ImportedFromIB2"/>
-				<string key="143.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="143.ImportedFromIB2"/>
-				<string key="144.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="144.ImportedFromIB2"/>
-				<string key="145.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="145.ImportedFromIB2"/>
-				<string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="149.ImportedFromIB2"/>
-				<string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="150.ImportedFromIB2"/>
-				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="19.ImportedFromIB2"/>
-				<string key="195.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="195.ImportedFromIB2"/>
-				<string key="196.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="196.ImportedFromIB2"/>
-				<string key="197.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="197.ImportedFromIB2"/>
-				<string key="198.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="198.ImportedFromIB2"/>
-				<string key="199.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="199.ImportedFromIB2"/>
-				<string key="200.IBEditorWindowLastContentRect">{{753, 187}, {275, 113}}</string>
-				<string key="200.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="200.ImportedFromIB2"/>
-				<string key="200.editorWindowContentRectSynchronizationRect">{{608, 612}, {275, 83}}</string>
-				<string key="201.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="201.ImportedFromIB2"/>
-				<string key="202.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="202.ImportedFromIB2"/>
-				<string key="203.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="203.ImportedFromIB2"/>
-				<string key="204.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="204.ImportedFromIB2"/>
-				<string key="205.IBEditorWindowLastContentRect">{{547, 216}, {254, 283}}</string>
-				<string key="205.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="205.ImportedFromIB2"/>
-				<string key="205.editorWindowContentRectSynchronizationRect">{{187, 434}, {243, 243}}</string>
-				<string key="206.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="206.ImportedFromIB2"/>
-				<string key="207.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="207.ImportedFromIB2"/>
-				<string key="208.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="208.ImportedFromIB2"/>
-				<string key="209.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="209.ImportedFromIB2"/>
-				<string key="210.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="210.ImportedFromIB2"/>
-				<string key="211.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="211.ImportedFromIB2"/>
-				<string key="212.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="212.ImportedFromIB2"/>
-				<string key="212.editorWindowContentRectSynchronizationRect">{{608, 612}, {167, 43}}</string>
-				<string key="213.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="213.ImportedFromIB2"/>
-				<string key="214.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="214.ImportedFromIB2"/>
-				<string key="215.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="215.ImportedFromIB2"/>
-				<string key="216.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="216.ImportedFromIB2"/>
-				<string key="217.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="217.ImportedFromIB2"/>
-				<string key="218.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="218.ImportedFromIB2"/>
-				<string key="219.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="219.ImportedFromIB2"/>
-				<string key="220.IBEditorWindowLastContentRect">{{753, 217}, {238, 103}}</string>
-				<string key="220.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="220.ImportedFromIB2"/>
-				<string key="220.editorWindowContentRectSynchronizationRect">{{608, 612}, {241, 103}}</string>
-				<string key="221.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="221.ImportedFromIB2"/>
-				<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="23.ImportedFromIB2"/>
-				<string key="236.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="236.ImportedFromIB2"/>
-				<string key="239.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="239.ImportedFromIB2"/>
-				<string key="24.IBEditorWindowLastContentRect">{{707, 406}, {194, 93}}</string>
-				<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="24.ImportedFromIB2"/>
-				<string key="24.editorWindowContentRectSynchronizationRect">{{525, 802}, {197, 73}}</string>
-				<string key="29.IBEditorWindowLastContentRect">{{354, 499}, {485, 20}}</string>
-				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="29.ImportedFromIB2"/>
-				<string key="29.WindowOrigin">{74, 862}</string>
-				<string key="29.editorWindowContentRectSynchronizationRect">{{6, 978}, {478, 20}}</string>
-				<string key="295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="296.IBEditorWindowLastContentRect">{{591, 436}, {276, 63}}</string>
-				<string key="296.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="296.editorWindowContentRectSynchronizationRect">{{475, 832}, {234, 43}}</string>
-				<string key="297.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="298.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="346.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="346.ImportedFromIB2"/>
-				<string key="348.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="348.ImportedFromIB2"/>
-				<string key="349.IBEditorWindowLastContentRect">{{746, 287}, {220, 133}}</string>
-				<string key="349.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="349.ImportedFromIB2"/>
-				<string key="349.editorWindowContentRectSynchronizationRect">{{608, 612}, {215, 63}}</string>
-				<string key="350.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="350.ImportedFromIB2"/>
-				<string key="351.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="351.ImportedFromIB2"/>
-				<string key="354.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="354.ImportedFromIB2"/>
-				<string key="371.IBEditorWindowLastContentRect">{{254, 23}, {640, 480}}</string>
-				<string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="371.IBWindowTemplateEditedContentRect">{{254, 23}, {640, 480}}</string>
-				<integer value="1" key="371.NSWindowTemplate.visibleAtLaunch"/>
-				<string key="371.editorWindowContentRectSynchronizationRect">{{33, 99}, {480, 360}}</string>
-				<string key="371.windowTemplate.maxSize">{3.40282e+38, 3.40282e+38}</string>
-				<string key="371.windowTemplate.minSize">{0, 0}</string>
-				<string key="372.CustomClassName">SkSampleNSView</string>
-				<string key="372.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSAffineTransform" key="372.IBViewBoundsToFrameTransform"/>
-				<string key="375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="376.IBEditorWindowLastContentRect">{{591, 456}, {83, 43}}</string>
-				<string key="376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="377.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="388.IBEditorWindowLastContentRect">{{523, 2}, {178, 283}}</string>
-				<string key="388.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="389.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="390.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="391.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="392.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="393.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="394.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="395.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="396.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="397.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="398.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="399.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="400.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="401.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="402.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="403.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="404.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="405.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="406.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="407.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="408.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="409.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="410.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="411.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="412.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="413.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="414.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="415.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="416.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="417.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="418.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="419.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="450.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="451.IBEditorWindowLastContentRect">{{753, 197}, {170, 63}}</string>
-				<string key="451.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="452.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="453.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="454.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="457.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="459.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="460.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="462.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="465.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="466.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="485.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="490.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="491.IBEditorWindowLastContentRect">{{778, 476}, {221, 23}}</string>
-				<string key="491.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="492.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="496.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="497.IBEditorWindowLastContentRect">{{674, 260}, {204, 183}}</string>
-				<string key="497.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="498.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="499.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="5.ImportedFromIB2"/>
-				<string key="500.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="501.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="502.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="503.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="504.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="505.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="506.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="507.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="508.IBEditorWindowLastContentRect">{{878, 180}, {164, 173}}</string>
-				<string key="508.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="509.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="510.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="511.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="512.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="513.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="514.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="515.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="516.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="517.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="538.IBEditorWindowLastContentRect">{{136, 685}, {341, 321}}</string>
-				<string key="538.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="539.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="56.ImportedFromIB2"/>
-				<string key="57.IBEditorWindowLastContentRect">{{366, 286}, {254, 213}}</string>
-				<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="57.ImportedFromIB2"/>
-				<string key="57.editorWindowContentRectSynchronizationRect">{{23, 794}, {245, 183}}</string>
-				<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="58.ImportedFromIB2"/>
-				<string key="629.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSAffineTransform" key="629.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAw5+AAA</bytes>
-				</object>
-				<string key="630.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="631.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="632.CustomClassName">SkOptionsTableView</string>
-				<string key="632.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSAffineTransform" key="632.IBViewBoundsToFrameTransform"/>
-				<string key="634.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="635.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="637.CustomClassName">SkTextFieldCell</string>
-				<string key="637.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="661.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="698.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="705.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="706.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="718.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="72.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="72.ImportedFromIB2"/>
-				<string key="720.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="73.ImportedFromIB2"/>
-				<string key="74.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="74.ImportedFromIB2"/>
-				<string key="75.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="75.ImportedFromIB2"/>
-				<string key="77.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="77.ImportedFromIB2"/>
-				<string key="78.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="78.ImportedFromIB2"/>
-				<string key="79.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="79.ImportedFromIB2"/>
-				<string key="80.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="80.ImportedFromIB2"/>
-				<string key="81.IBEditorWindowLastContentRect">{{505, 296}, {196, 203}}</string>
-				<string key="81.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="81.ImportedFromIB2"/>
-				<string key="81.editorWindowContentRectSynchronizationRect">{{145, 474}, {199, 203}}</string>
-				<string key="82.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="82.ImportedFromIB2"/>
-				<string key="83.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="83.ImportedFromIB2"/>
-				<string key="92.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="1" key="92.ImportedFromIB2"/>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">721</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">SampleAppDelegate</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">toiPadSize:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">toiPadSize:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">toiPadSize:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="fOptions">SkOptionsTableView</string>
-						<string key="fView">SkNSView</string>
-						<string key="fWindow">NSWindow</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="fOptions">
-							<string key="name">fOptions</string>
-							<string key="candidateClassName">SkOptionsTableView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="fView">
-							<string key="name">fView</string>
-							<string key="candidateClassName">SkNSView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="fWindow">
-							<string key="name">fWindow</string>
-							<string key="candidateClassName">NSWindow</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">../../src/utils/mac/SampleAppDelegate.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">SkNSView</string>
-					<string key="superclassName">NSView</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">fOptionsDelegate</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">fOptionsDelegate</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">fOptionsDelegate</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">../../src/utils/mac/SkNSView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">SkOptionsTableView</string>
-					<string key="superclassName">NSTableView</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">toggleKeyEquivalents:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">toggleKeyEquivalents:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">toggleKeyEquivalents:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">../../src/utils/mac/SkOptionsTableView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">SkSampleNSView</string>
-					<string key="superclassName">SkNSView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">../../src/utils/mac/SkSampleNSView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">SkTextFieldCell</string>
-					<string key="superclassName">NSTextFieldCell</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">../../src/utils/mac/SkTextFieldCell.h</string>
-					</object>
-				</object>
-			</array>
-			<array class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
-				<object class="IBPartialClassDescription">
-					<string key="className">NSFormatter</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSFormatter.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSArchiver.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSClassDescription.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSError.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSObjectScripting.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSPortCoder.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSScriptClassDescription.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSScriptKeyValueCoding.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSScriptObjectSpecifiers.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSScriptWhoseTests.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">Foundation.framework/Headers/NSURLDownload.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">PrintCore.framework/Headers/PDEPluginInterface.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">QuartzCore.framework/Headers/CIImageProvider.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<string key="IBDocument.LastKnownRelativeProjectPath">../../../out/gyp/SampleApp.xcodeproj</string>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="NSMenuCheckmark">{9, 8}</string>
-			<string key="NSMenuMixedState">{7, 2}</string>
-		</dictionary>
-	</data>
-</archive>
diff --git a/gfx/skia/skia/src/views/mac/SampleAppDelegate.h b/gfx/skia/skia/src/views/mac/SampleAppDelegate.h
deleted file mode 100644
index 8f2bead7bd6c..000000000000
--- a/gfx/skia/skia/src/views/mac/SampleAppDelegate.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#import <Cocoa/Cocoa.h>
-#import "SkSampleNSView.h"
-#import "SkOptionsTableView.h"
-@interface SampleAppDelegate : NSObject <NSApplicationDelegate> {
-    NSWindow* fWindow;
-    SkSampleNSView* fView;
-    SkOptionsTableView* fOptions;
-}
-
-@property (assign) IBOutlet NSWindow* fWindow;
-@property (assign) IBOutlet SkSampleNSView* fView;
-@property (assign) IBOutlet SkOptionsTableView* fOptions;
-
-- (IBAction)toiPadSize:(id)sender;
-@end
diff --git a/gfx/skia/skia/src/views/mac/SampleAppDelegate.mm b/gfx/skia/skia/src/views/mac/SampleAppDelegate.mm
deleted file mode 100644
index 91dcada8880d..000000000000
--- a/gfx/skia/skia/src/views/mac/SampleAppDelegate.mm
+++ /dev/null
@@ -1,16 +0,0 @@
-#import "SampleAppDelegate.h"
-@implementation SampleAppDelegate
-@synthesize fWindow, fView, fOptions;
-
--(void) applicationDidFinishLaunching:(NSNotification *)aNotification {
-    //Load specified skia views after launching
-    fView.fOptionsDelegate = fOptions;
-    [fWindow setAcceptsMouseMovedEvents:YES];
-    [fOptions registerMenus:fView.fWind->getMenus()];
-}
-
-- (IBAction)toiPadSize:(id)sender {
-    NSRect frame = NSMakeRect(fWindow.frame.origin.x, fWindow.frame.origin.y, 768, 1024);
-    [fWindow setFrame:frame display:YES animate:YES];
-}
-@end
diff --git a/gfx/skia/skia/src/views/mac/SkNSView.h b/gfx/skia/skia/src/views/mac/SkNSView.h
index dfc81ea5bd0d..4befaeea7e3f 100644
--- a/gfx/skia/skia/src/views/mac/SkNSView.h
+++ b/gfx/skia/skia/src/views/mac/SkNSView.h
@@ -49,4 +49,9 @@ class SkEvent;
 - (bool)attach:(SkOSWindow::SkBackEndTypes)attachType withMSAASampleCount:(int) sampleCount andGetInfo:(SkOSWindow::AttachmentInfo*) info;
 - (void)detach;
 - (void)present;
+
+- (void)setVSync:(bool)enable;
+
+- (void)freeNativeWind;
+
 @end
diff --git a/gfx/skia/skia/src/views/mac/SkNSView.mm b/gfx/skia/skia/src/views/mac/SkNSView.mm
index 80bfd670ef4f..a8376e62c96f 100644
--- a/gfx/skia/skia/src/views/mac/SkNSView.mm
+++ b/gfx/skia/skia/src/views/mac/SkNSView.mm
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
@@ -8,9 +7,10 @@
 
 #import "SkNSView.h"
 #include "SkCanvas.h"
+#include "SkSurface.h"
 #include "SkCGUtils.h"
 #include "SkEvent.h"
-SK_COMPILE_ASSERT(SK_SUPPORT_GPU, not_implemented_for_non_gpu_build);
+static_assert(SK_SUPPORT_GPU, "not_implemented_for_non_gpu_build");
 #include <OpenGL/gl.h>
 
 //#define FORCE_REDRAW
@@ -50,7 +50,7 @@ SK_COMPILE_ASSERT(SK_SUPPORT_GPU, not_implemented_for_non_gpu_build);
                                           selector:@selector(backingPropertiesChanged:)
                                           name:@"NSWindowDidChangeBackingPropertiesNotification"
                                           object:[self window]];
-    if (NULL != fWind) {
+    if (fWind) {
         fWind->setVisibleP(true);
         NSSize size = self.frame.size;
 #if RETINA_API_AVAILABLE
@@ -58,6 +58,7 @@ SK_COMPILE_ASSERT(SK_SUPPORT_GPU, not_implemented_for_non_gpu_build);
 #endif
         fWind->resize((int) size.width, (int) size.height,
                       kN32_SkColorType);
+        [[self window] setAcceptsMouseMovedEvents:YES];
     }
 }
 
@@ -103,12 +104,9 @@ SK_COMPILE_ASSERT(SK_SUPPORT_GPU, not_implemented_for_non_gpu_build);
 #if RETINA_API_AVAILABLE
     newSize = [self convertSizeToBacking:newSize];
 #endif
-    if (NULL != fWind &&
-            (fWind->width()  != newSize.width ||
-             fWind->height() != newSize.height))
-    {
+    if (fWind && (fWind->width()  != newSize.width || fWind->height() != newSize.height)) {
         fWind->resize((int) newSize.width, (int) newSize.height);
-        if (NULL != fGLContext) {
+        if (fGLContext) {
             glClear(GL_STENCIL_BUFFER_BIT);
             [fGLContext update];
         }
@@ -121,19 +119,24 @@ SK_COMPILE_ASSERT(SK_SUPPORT_GPU, not_implemented_for_non_gpu_build);
 }
 
 - (void)dealloc {
-    delete fWind;
+    [self freeNativeWind];
     self.fGLContext = nil;
     self.fTitle = nil;
     [super dealloc];
 }
 
+- (void)freeNativeWind {
+    delete fWind;
+    fWind = nil;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 - (void)drawSkia {
     fRedrawRequestPending = false;
-    if (NULL != fWind) {
-        SkAutoTUnref<SkCanvas> canvas(fWind->createCanvas());
-        fWind->draw(canvas);
+    if (fWind) {
+        SkAutoTUnref<SkSurface> surface(fWind->createSurface());
+        fWind->draw(surface->getCanvas());
 #ifdef FORCE_REDRAW
         fWind->inval(NULL);
 #endif
@@ -268,7 +271,7 @@ static unsigned convertNSModifiersToSk(NSUInteger nsModi) {
     NSPoint p = [event locationInWindow];
     unsigned modi = convertNSModifiersToSk([event modifierFlags]);
 
-    if ([self mouse:p inRect:[self bounds]] && NULL != fWind) {
+    if ([self mouse:p inRect:[self bounds]] && fWind) {
         NSPoint loc = [self convertPoint:p fromView:nil];
 #if RETINA_API_AVAILABLE
         loc = [self convertPointToBacking:loc]; //y-up
@@ -283,7 +286,7 @@ static unsigned convertNSModifiersToSk(NSUInteger nsModi) {
     NSPoint p = [event locationInWindow];
     unsigned modi = convertNSModifiersToSk([event modifierFlags]);
 
-    if ([self mouse:p inRect:[self bounds]] && NULL != fWind) {
+    if ([self mouse:p inRect:[self bounds]] && fWind) {
         NSPoint loc = [self convertPoint:p fromView:nil];
 #if RETINA_API_AVAILABLE
         loc = [self convertPointToBacking:loc]; //y-up
@@ -298,7 +301,7 @@ static unsigned convertNSModifiersToSk(NSUInteger nsModi) {
     NSPoint p = [event locationInWindow];
     unsigned modi = convertNSModifiersToSk([event modifierFlags]);
     
-    if ([self mouse:p inRect:[self bounds]] && NULL != fWind) {
+    if ([self mouse:p inRect:[self bounds]] && fWind) {
         NSPoint loc = [self convertPoint:p fromView:nil];
 #if RETINA_API_AVAILABLE
         loc = [self convertPointToBacking:loc]; //y-up
@@ -313,7 +316,7 @@ static unsigned convertNSModifiersToSk(NSUInteger nsModi) {
     NSPoint p = [event locationInWindow];
     unsigned modi = convertNSModifiersToSk([event modifierFlags]);
     
-    if ([self mouse:p inRect:[self bounds]] && NULL != fWind) {
+    if ([self mouse:p inRect:[self bounds]] && fWind) {
         NSPoint loc = [self convertPoint:p fromView:nil];
 #if RETINA_API_AVAILABLE
         loc = [self convertPointToBacking:loc]; //y-up
@@ -327,8 +330,7 @@ static unsigned convertNSModifiersToSk(NSUInteger nsModi) {
 ///////////////////////////////////////////////////////////////////////////////
 #include <OpenGL/OpenGL.h>
 
-namespace { 
-CGLContextObj createGLContext(int msaaSampleCount) {
+static CGLContextObj createGLContext(int msaaSampleCount) {
     GLint major, minor;
     CGLGetVersion(&major, &minor);
     
@@ -367,7 +369,6 @@ CGLContextObj createGLContext(int msaaSampleCount) {
     CGLSetCurrentContext(ctx);
     return ctx;
 }
-}
 
 - (void)viewDidMoveToWindow {
     [super viewDidMoveToWindow];
@@ -384,6 +385,7 @@ CGLContextObj createGLContext(int msaaSampleCount) {
         andGetInfo:(SkOSWindow::AttachmentInfo*) info {
     if (nil == fGLContext) {
         CGLContextObj ctx = createGLContext(sampleCount);
+        SkASSERT(ctx);
         fGLContext = [[NSOpenGLContext alloc] initWithCGLContextObj:ctx];
         CGLReleaseContext(ctx);
         if (NULL == fGLContext) {
@@ -417,4 +419,12 @@ CGLContextObj createGLContext(int msaaSampleCount) {
         [fGLContext flushBuffer];
     }
 }
+
+- (void)setVSync:(bool)enable {
+    if (fGLContext) {
+        GLint interval = enable ? 1 : 0;
+        CGLContextObj ctx = (CGLContextObj)[fGLContext CGLContextObj];
+        CGLSetParameter(ctx, kCGLCPSwapInterval, &interval);
+    }
+}
 @end
diff --git a/gfx/skia/skia/src/views/mac/SkOSWindow_Mac.cpp b/gfx/skia/skia/src/views/mac/SkOSWindow_Mac.cpp
deleted file mode 100644
index e6f358032584..000000000000
--- a/gfx/skia/skia/src/views/mac/SkOSWindow_Mac.cpp
+++ /dev/null
@@ -1,542 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkTypes.h"
-
-#if defined(SK_BUILD_FOR_MAC)
-
-#include <AGL/agl.h>
-
-#include <Carbon/Carbon.h>
-#include "SkCGUtils.h"
-
-#include "SkWindow.h"
-#include "SkCanvas.h"
-#include "SkOSMenu.h"
-#include "SkTime.h"
-
-#include "SkGraphics.h"
-#include <new.h>
-
-static void (*gPrevNewHandler)();
-
-extern "C" {
-    static void sk_new_handler()
-    {
-        if (SkGraphics::SetFontCacheUsed(0))
-            return;
-        if (gPrevNewHandler)
-            gPrevNewHandler();
-        else
-            sk_throw();
-    }
-}
-
-static SkOSWindow* gCurrOSWin;
-static EventTargetRef gEventTarget;
-static EventQueueRef gCurrEventQ;
-
-static OSStatus MyDrawEventHandler(EventHandlerCallRef myHandler,
-                                   EventRef event, void *userData) {
-    // NOTE: GState is save/restored by the HIView system doing the callback,
-    // so the draw handler doesn't need to do it
-
-    OSStatus status = noErr;
-    CGContextRef context;
-    HIRect        bounds;
-
-    // Get the CGContextRef
-    status = GetEventParameter (event, kEventParamCGContextRef,
-                                typeCGContextRef, NULL,
-                                sizeof (CGContextRef),
-                                NULL,
-                                &context);
-
-    if (status != noErr) {
-        SkDebugf("Got error %d getting the context!\n", status);
-        return status;
-    }
-
-    // Get the bounding rectangle
-    HIViewGetBounds ((HIViewRef) userData, &bounds);
-
-    gCurrOSWin->doPaint(context);
-    return status;
-}
-
-#define SK_MacEventClass            FOUR_CHAR_CODE('SKec')
-#define SK_MacEventKind                FOUR_CHAR_CODE('SKek')
-#define SK_MacEventParamName        FOUR_CHAR_CODE('SKev')
-#define SK_MacEventSinkIDParamName    FOUR_CHAR_CODE('SKes')
-
-static void set_bindingside(HISideBinding* side, HIViewRef parent, HIBindingKind kind) {
-    side->toView = parent;
-    side->kind = kind;
-    side->offset = 0;
-}
-
-static void set_axisscale(HIAxisScale* axis, HIViewRef parent) {
-    axis->toView = parent;
-    axis->kind = kHILayoutScaleAbsolute;
-    axis->ratio = 1;
-}
-
-static void set_axisposition(HIAxisPosition* pos, HIViewRef parent, HIPositionKind kind) {
-    pos->toView = parent;
-    pos->kind = kind;
-    pos->offset = 0;
-}
-
-SkOSWindow::SkOSWindow(void* hWnd) : fHWND(hWnd), fAGLCtx(NULL)
-{
-    OSStatus    result;
-    WindowRef   wr = (WindowRef)hWnd;
-
-    HIViewRef imageView, parent;
-    HIViewRef rootView = HIViewGetRoot(wr);
-    HIViewFindByID(rootView, kHIViewWindowContentID, &parent);
-    result = HIImageViewCreate(NULL, &imageView);
-    SkASSERT(result == noErr);
-
-    result = HIViewAddSubview(parent, imageView);
-    SkASSERT(result == noErr);
-
-    fHVIEW = imageView;
-
-    HIViewSetVisible(imageView, true);
-    HIViewPlaceInSuperviewAt(imageView, 0, 0);
-
-    if (true) {
-        HILayoutInfo layout;
-        layout.version = kHILayoutInfoVersionZero;
-        set_bindingside(&layout.binding.left, parent, kHILayoutBindLeft);
-        set_bindingside(&layout.binding.top, parent, kHILayoutBindTop);
-        set_bindingside(&layout.binding.right, parent, kHILayoutBindRight);
-        set_bindingside(&layout.binding.bottom, parent, kHILayoutBindBottom);
-        set_axisscale(&layout.scale.x, parent);
-        set_axisscale(&layout.scale.y, parent);
-        set_axisposition(&layout.position.x, parent, kHILayoutPositionLeft);
-        set_axisposition(&layout.position.y, rootView, kHILayoutPositionTop);
-        HIViewSetLayoutInfo(imageView, &layout);
-    }
-
-    HIImageViewSetOpaque(imageView, true);
-    HIImageViewSetScaleToFit(imageView, false);
-
-    static const EventTypeSpec  gTypes[] = {
-        { kEventClassKeyboard,  kEventRawKeyDown            },
-        { kEventClassKeyboard,  kEventRawKeyUp              },
-        { kEventClassMouse,        kEventMouseDown                },
-        { kEventClassMouse,        kEventMouseDragged            },
-        { kEventClassMouse,        kEventMouseMoved            },
-        { kEventClassMouse,        kEventMouseUp                },
-        { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent   },
-        { kEventClassWindow,    kEventWindowBoundsChanged    },
-//        { kEventClassWindow,    kEventWindowDrawContent        },
-        { SK_MacEventClass,        SK_MacEventKind                }
-    };
-
-    EventHandlerUPP handlerUPP = NewEventHandlerUPP(SkOSWindow::EventHandler);
-    int                count = SK_ARRAY_COUNT(gTypes);
-
-    result = InstallEventHandler(GetWindowEventTarget(wr), handlerUPP,
-                        count, gTypes, this, nil);
-    SkASSERT(result == noErr);
-
-    gCurrOSWin = this;
-    gCurrEventQ = GetCurrentEventQueue();
-    gEventTarget = GetWindowEventTarget(wr);
-
-    static bool gOnce = true;
-    if (gOnce) {
-        gOnce = false;
-        gPrevNewHandler = set_new_handler(sk_new_handler);
-    }
-}
-
-void SkOSWindow::doPaint(void* ctx)
-{
-#if 0
-    this->update(NULL);
-
-    const SkBitmap& bm = this->getBitmap();
-    CGImageRef img = SkCreateCGImageRef(bm);
-
-    if (img) {
-        CGRect r = CGRectMake(0, 0, bm.width(), bm.height());
-
-        CGContextRef cg = reinterpret_cast<CGContextRef>(ctx);
-
-        CGContextSaveGState(cg);
-        CGContextTranslateCTM(cg, 0, r.size.height);
-        CGContextScaleCTM(cg, 1, -1);
-
-        CGContextDrawImage(cg, r, img);
-
-        CGContextRestoreGState(cg);
-
-        CGImageRelease(img);
-    }
-#endif
-}
-
-void SkOSWindow::updateSize()
-{
-    Rect    r;
-
-    GetWindowBounds((WindowRef)fHWND, kWindowContentRgn, &r);
-    this->resize(r.right - r.left, r.bottom - r.top);
-
-#if 0
-    HIRect    frame;
-    HIViewRef imageView = (HIViewRef)getHVIEW();
-    HIViewRef parent = HIViewGetSuperview(imageView);
-
-    HIViewGetBounds(imageView, &frame);
-    SkDebugf("------ %d bounds %g %g %g %g\n", r.right - r.left,
-             frame.origin.x, frame.origin.y, frame.size.width, frame.size.height);
-#endif
-}
-
-void SkOSWindow::onHandleInval(const SkIRect& r)
-{
-    (new SkEvent("inval-imageview", this->getSinkID()))->post();
-}
-
-bool SkOSWindow::onEvent(const SkEvent& evt) {
-    if (evt.isType("inval-imageview")) {
-        this->update(NULL);
-
-        SkEvent query("ignore-window-bitmap");
-        if (!this->doQuery(&query) || !query.getFast32()) {
-            const SkBitmap& bm = this->getBitmap();
-
-            CGImageRef img = SkCreateCGImageRef(bm);
-            HIImageViewSetImage((HIViewRef)getHVIEW(), img);
-            CGImageRelease(img);
-        }
-        return true;
-    }
-    return INHERITED::onEvent(evt);
-}
-
-void SkOSWindow::onSetTitle(const char title[])
-{
-    CFStringRef str = CFStringCreateWithCString(NULL, title, kCFStringEncodingUTF8);
-    SetWindowTitleWithCFString((WindowRef)fHWND, str);
-    CFRelease(str);
-}
-
-void SkOSWindow::onAddMenu(const SkOSMenu* sk_menu)
-{
-}
-
-static void getparam(EventRef inEvent, OSType name, OSType type, UInt32 size, void* data)
-{
-    EventParamType  actualType;
-    UInt32            actualSize;
-    OSStatus        status;
-
-    status = GetEventParameter(inEvent, name, type, &actualType, size, &actualSize, data);
-    SkASSERT(status == noErr);
-    SkASSERT(actualType == type);
-    SkASSERT(actualSize == size);
-}
-
-enum {
-    SK_MacReturnKey        = 36,
-    SK_MacDeleteKey        = 51,
-    SK_MacEndKey        = 119,
-    SK_MacLeftKey        = 123,
-    SK_MacRightKey        = 124,
-    SK_MacDownKey        = 125,
-    SK_MacUpKey            = 126,
-
-    SK_Mac0Key          = 0x52,
-    SK_Mac1Key          = 0x53,
-    SK_Mac2Key          = 0x54,
-    SK_Mac3Key          = 0x55,
-    SK_Mac4Key          = 0x56,
-    SK_Mac5Key          = 0x57,
-    SK_Mac6Key          = 0x58,
-    SK_Mac7Key          = 0x59,
-    SK_Mac8Key          = 0x5b,
-    SK_Mac9Key          = 0x5c
-};
-
-static SkKey raw2key(UInt32 raw)
-{
-    static const struct {
-        UInt32  fRaw;
-        SkKey   fKey;
-    } gKeys[] = {
-        { SK_MacUpKey,        kUp_SkKey        },
-        { SK_MacDownKey,    kDown_SkKey        },
-        { SK_MacLeftKey,    kLeft_SkKey        },
-        { SK_MacRightKey,   kRight_SkKey    },
-        { SK_MacReturnKey,  kOK_SkKey        },
-        { SK_MacDeleteKey,  kBack_SkKey        },
-        { SK_MacEndKey,        kEnd_SkKey        },
-        { SK_Mac0Key,       k0_SkKey        },
-        { SK_Mac1Key,       k1_SkKey        },
-        { SK_Mac2Key,       k2_SkKey        },
-        { SK_Mac3Key,       k3_SkKey        },
-        { SK_Mac4Key,       k4_SkKey        },
-        { SK_Mac5Key,       k5_SkKey        },
-        { SK_Mac6Key,       k6_SkKey        },
-        { SK_Mac7Key,       k7_SkKey        },
-        { SK_Mac8Key,       k8_SkKey        },
-        { SK_Mac9Key,       k9_SkKey        }
-    };
-
-    for (unsigned i = 0; i < SK_ARRAY_COUNT(gKeys); i++)
-        if (gKeys[i].fRaw == raw)
-            return gKeys[i].fKey;
-    return kNONE_SkKey;
-}
-
-static void post_skmacevent()
-{
-    EventRef    ref;
-    OSStatus    status = CreateEvent(nil, SK_MacEventClass, SK_MacEventKind, 0, 0, &ref);
-    SkASSERT(status == noErr);
-
-#if 0
-    status = SetEventParameter(ref, SK_MacEventParamName, SK_MacEventParamName, sizeof(evt), &evt);
-    SkASSERT(status == noErr);
-    status = SetEventParameter(ref, SK_MacEventSinkIDParamName, SK_MacEventSinkIDParamName, sizeof(sinkID), &sinkID);
-    SkASSERT(status == noErr);
-#endif
-
-    EventTargetRef target = gEventTarget;
-    SetEventParameter(ref, kEventParamPostTarget, typeEventTargetRef, sizeof(target), &target);
-    SkASSERT(status == noErr);
-
-    status = PostEventToQueue(gCurrEventQ, ref, kEventPriorityStandard);
-    SkASSERT(status == noErr);
-
-    ReleaseEvent(ref);
-}
-
-pascal OSStatus SkOSWindow::EventHandler( EventHandlerCallRef inHandler, EventRef inEvent, void* userData )
-{
-    SkOSWindow* win = (SkOSWindow*)userData;
-    OSStatus    result = eventNotHandledErr;
-    UInt32        wClass = GetEventClass(inEvent);
-    UInt32        wKind = GetEventKind(inEvent);
-
-    gCurrOSWin = win;    // will need to be in TLS. Set this so PostEvent will work
-
-    switch (wClass) {
-        case kEventClassMouse: {
-            Point   pt;
-            getparam(inEvent, kEventParamMouseLocation, typeQDPoint, sizeof(pt), &pt);
-            SetPortWindowPort((WindowRef)win->getHWND());
-            GlobalToLocal(&pt);
-
-            switch (wKind) {
-                case kEventMouseDown:
-                    if (win->handleClick(pt.h, pt.v, Click::kDown_State)) {
-                        result = noErr;
-                    }
-                    break;
-                case kEventMouseMoved:
-                    // fall through
-                case kEventMouseDragged:
-                    (void)win->handleClick(pt.h, pt.v, Click::kMoved_State);
-                  //  result = noErr;
-                    break;
-                case kEventMouseUp:
-                    (void)win->handleClick(pt.h, pt.v, Click::kUp_State);
-                  //  result = noErr;
-                    break;
-                default:
-                    break;
-            }
-            break;
-        }
-        case kEventClassKeyboard:
-            if (wKind == kEventRawKeyDown) {
-                UInt32  raw;
-                getparam(inEvent, kEventParamKeyCode, typeUInt32, sizeof(raw), &raw);
-                SkKey key = raw2key(raw);
-                if (key != kNONE_SkKey)
-                    (void)win->handleKey(key);
-            } else if (wKind == kEventRawKeyUp) {
-                UInt32 raw;
-                getparam(inEvent, kEventParamKeyCode, typeUInt32, sizeof(raw), &raw);
-                SkKey key = raw2key(raw);
-                if (key != kNONE_SkKey)
-                    (void)win->handleKeyUp(key);
-            }
-            break;
-        case kEventClassTextInput:
-            if (wKind == kEventTextInputUnicodeForKeyEvent) {
-                UInt16  uni;
-                getparam(inEvent, kEventParamTextInputSendText, typeUnicodeText, sizeof(uni), &uni);
-                win->handleChar(uni);
-            }
-            break;
-        case kEventClassWindow:
-            switch (wKind) {
-                case kEventWindowBoundsChanged:
-                    win->updateSize();
-                    break;
-                case kEventWindowDrawContent: {
-                    CGContextRef cg;
-                    result = GetEventParameter(inEvent,
-                                               kEventParamCGContextRef,
-                                               typeCGContextRef,
-                                               NULL,
-                                               sizeof (CGContextRef),
-                                               NULL,
-                                               &cg);
-                    if (result != 0) {
-                        cg = NULL;
-                    }
-                    win->doPaint(cg);
-                    break;
-                }
-                default:
-                    break;
-            }
-            break;
-        case SK_MacEventClass: {
-            SkASSERT(wKind == SK_MacEventKind);
-            if (SkEvent::ProcessEvent()) {
-                    post_skmacevent();
-            }
-    #if 0
-            SkEvent*        evt;
-            SkEventSinkID    sinkID;
-            getparam(inEvent, SK_MacEventParamName, SK_MacEventParamName, sizeof(evt), &evt);
-            getparam(inEvent, SK_MacEventSinkIDParamName, SK_MacEventSinkIDParamName, sizeof(sinkID), &sinkID);
-    #endif
-            result = noErr;
-            break;
-        }
-        default:
-            break;
-    }
-    if (result == eventNotHandledErr) {
-        result = CallNextEventHandler(inHandler, inEvent);
-    }
-    return result;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-void SkEvent::SignalNonEmptyQueue()
-{
-    post_skmacevent();
-//    SkDebugf("signal nonempty\n");
-}
-
-static TMTask    gTMTaskRec;
-static TMTask*    gTMTaskPtr;
-
-static void sk_timer_proc(TMTask* rec)
-{
-    SkEvent::ServiceQueueTimer();
-//    SkDebugf("timer task fired\n");
-}
-
-void SkEvent::SignalQueueTimer(SkMSec delay)
-{
-    if (gTMTaskPtr)
-    {
-        RemoveTimeTask((QElem*)gTMTaskPtr);
-        DisposeTimerUPP(gTMTaskPtr->tmAddr);
-        gTMTaskPtr = nil;
-    }
-    if (delay)
-    {
-        gTMTaskPtr = &gTMTaskRec;
-        memset(gTMTaskPtr, 0, sizeof(gTMTaskRec));
-        gTMTaskPtr->tmAddr = NewTimerUPP(sk_timer_proc);
-        OSErr err = InstallTimeTask((QElem*)gTMTaskPtr);
-//        SkDebugf("installtimetask of %d returned %d\n", delay, err);
-        PrimeTimeTask((QElem*)gTMTaskPtr, delay);
-    }
-}
-
-#define USE_MSAA 0
-
-AGLContext create_gl(WindowRef wref)
-{
-    GLint major, minor;
-    AGLContext ctx;
-
-    aglGetVersion(&major, &minor);
-    SkDebugf("---- agl version %d %d\n", major, minor);
-
-    const GLint pixelAttrs[] = {
-        AGL_RGBA,
-        AGL_STENCIL_SIZE, 8,
-#if USE_MSAA
-        AGL_SAMPLE_BUFFERS_ARB, 1,
-        AGL_MULTISAMPLE,
-        AGL_SAMPLES_ARB, 8,
-#endif
-        AGL_ACCELERATED,
-        AGL_DOUBLEBUFFER,
-        AGL_NONE
-    };
-    AGLPixelFormat format = aglChoosePixelFormat(NULL, 0, pixelAttrs);
-    //AGLPixelFormat format = aglCreatePixelFormat(pixelAttrs);
-    SkDebugf("----- agl format %p\n", format);
-    ctx = aglCreateContext(format, NULL);
-    SkDebugf("----- agl context %p\n", ctx);
-    aglDestroyPixelFormat(format);
-
-    static const GLint interval = 1;
-    aglSetInteger(ctx, AGL_SWAP_INTERVAL, &interval);
-    aglSetCurrentContext(ctx);
-    return ctx;
-}
-
-bool SkOSWindow::attach(SkBackEndTypes /* attachType */)
-{
-    if (NULL == fAGLCtx) {
-        fAGLCtx = create_gl((WindowRef)fHWND);
-        if (NULL == fAGLCtx) {
-            return false;
-        }
-    }
-
-    GLboolean success = true;
-
-    int width, height;
-
-    success = aglSetWindowRef((AGLContext)fAGLCtx, (WindowRef)fHWND);
-    width = this->width();
-    height = this->height();
-
-    GLenum err = aglGetError();
-    if (err) {
-        SkDebugf("---- aglSetWindowRef %d %d %s [%d %d]\n", success, err,
-                 aglErrorString(err), width, height);
-    }
-
-    if (success) {
-        glViewport(0, 0, width, height);
-        glClearColor(0, 0, 0, 0);
-        glClearStencil(0);
-        glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-    }
-    return success;
-}
-
-void SkOSWindow::detach() {
-    aglSetWindowRef((AGLContext)fAGLCtx, NULL);
-}
-
-void SkOSWindow::present() {
-    aglSwapBuffers((AGLContext)fAGLCtx);
-}
-
-#endif
diff --git a/gfx/skia/skia/src/views/mac/SkOSWindow_Mac.mm b/gfx/skia/skia/src/views/mac/SkOSWindow_Mac.mm
index b0f006a8847e..9dbbe5bfc294 100644
--- a/gfx/skia/skia/src/views/mac/SkOSWindow_Mac.mm
+++ b/gfx/skia/skia/src/views/mac/SkOSWindow_Mac.mm
@@ -16,7 +16,7 @@
 #import  "SkEventNotifier.h"
 #define  kINVAL_NSVIEW_EventType "inval-nsview"
 
-SK_COMPILE_ASSERT(SK_SUPPORT_GPU, not_implemented_for_non_gpu_build);
+static_assert(SK_SUPPORT_GPU, "not_implemented_for_non_gpu_build");
 
 SkOSWindow::SkOSWindow(void* hWnd) : fHWND(hWnd) {
     fInvalEventIsPending = false;
@@ -77,4 +77,18 @@ void SkOSWindow::present() {
     [(SkNSView*)fHWND present];
 }
 
+void SkOSWindow::closeWindow() {
+    [[(SkNSView*)fHWND window] close];
+}
+
+void SkOSWindow::setVsync(bool enable) {
+    [(SkNSView*)fHWND setVSync:enable];
+}
+
+bool SkOSWindow::makeFullscreen() {
+    [(SkNSView*)fHWND enterFullScreenMode:[NSScreen mainScreen] withOptions:nil];
+    return true;
+}
+
+
 #endif
diff --git a/gfx/skia/skia/src/views/mac/SkSampleNSView.mm b/gfx/skia/skia/src/views/mac/SkSampleNSView.mm
index ce5f8aab0a0b..7c0fc5907be9 100644
--- a/gfx/skia/skia/src/views/mac/SkSampleNSView.mm
+++ b/gfx/skia/skia/src/views/mac/SkSampleNSView.mm
@@ -18,11 +18,6 @@
     return self;
 }
 
-- (void)dealloc {
-    delete fWind;
-    [super dealloc];
-}
-
 - (void)swipeWithEvent:(NSEvent *)event {
     CGFloat x = [event deltaX];
     if (x < 0)
diff --git a/gfx/skia/skia/src/views/mac/skia_mac.mm b/gfx/skia/skia/src/views/mac/skia_mac.mm
index e3c31c40f608..ea3b75c87afc 100644
--- a/gfx/skia/skia/src/views/mac/skia_mac.mm
+++ b/gfx/skia/skia/src/views/mac/skia_mac.mm
@@ -6,15 +6,119 @@
  * found in the LICENSE file.
  */
 
+#include <crt_externs.h>
 #import <Cocoa/Cocoa.h>
 #include "SkApplication.h"
+#include "SkNSView.h"
+
+@interface MainView : SkNSView {
+}
+- (id)initWithFrame: (NSRect)frame ;
+- (void)dealloc;
+- (void)begin;
+@end
+
+@implementation MainView : SkNSView
+
+- (id)initWithFrame: (NSRect)frame {
+    self = [super initWithFrame:frame];
+    return self;
+}
+
+- (void)dealloc {
+    delete fWind;
+    [super dealloc];
+}
+
+- (void)begin {
+    fWind = create_sk_window(self, *_NSGetArgc(), *_NSGetArgv());
+    [self setUpWindow];
+}
+@end
+
+@interface AppDelegate : NSObject<NSApplicationDelegate, NSWindowDelegate> {
+}
+- (id)init;
+- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication;
+@end
+
+#
+@implementation AppDelegate : NSObject
+- (id)init {
+    self = [super init];
+    return self;
+}
+
+- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication {
+    return TRUE;
+}
+@end
 
 int main(int argc, char *argv[]) {
     signal(SIGPIPE, SIG_IGN);
-    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
-    application_init();
-    int retVal =  NSApplicationMain(argc, (const char **)argv);
-    application_term();
+    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+    
+    NSApplication* app = [NSApplication sharedApplication];
+
+    NSUInteger windowStyle = (NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask | NSMiniaturizableWindowMask);
+    
+    NSRect windowRect = NSMakeRect(100, 100, 1000, 1000);
+    NSWindow* window = [[NSWindow alloc] initWithContentRect:windowRect styleMask:windowStyle backing:NSBackingStoreBuffered defer:NO];
+   
+    NSRect rect = [NSWindow contentRectForFrameRect:windowRect styleMask:windowStyle];
+    MainView* customView = [[MainView alloc] initWithFrame:rect];
+    [customView setTranslatesAutoresizingMaskIntoConstraints:NO];
+    NSView* contentView = window.contentView;
+    [contentView addSubview:customView];
+    NSDictionary *views = NSDictionaryOfVariableBindings(customView);
+    
+    [contentView addConstraints:
+     [NSLayoutConstraint constraintsWithVisualFormat:@"H:|[customView]|"
+                                             options:0
+                                             metrics:nil
+                                               views:views]];
+    
+    [contentView addConstraints:
+     [NSLayoutConstraint constraintsWithVisualFormat:@"V:|[customView]|"
+                                             options:0
+                                             metrics:nil
+                                               views:views]];
+    
+    [customView begin];
+    [customView release];
+    
+    [window makeKeyAndOrderFront:NSApp];
+
+    AppDelegate * appDelegate = [[[AppDelegate alloc] init] autorelease];
+    
+    app.delegate = appDelegate;
+    
+    NSMenu* menu=[[NSMenu alloc] initWithTitle:@"AMainMenu"];
+    NSMenuItem* item;
+    NSMenu* subMenu;
+    
+    //Create the application menu.
+    item=[[NSMenuItem alloc] initWithTitle:@"Apple" action:NULL keyEquivalent:@""];
+    [menu addItem:item];
+    subMenu=[[NSMenu alloc] initWithTitle:@"Apple"];
+    [menu setSubmenu:subMenu forItem:item];
+    [item release];
+    item=[[NSMenuItem alloc] initWithTitle:@"Quit" action:@selector(terminate:) keyEquivalent:@"q"];
+    [subMenu addItem:item];
+    [item release];
+    [subMenu release];
+    
+    //Add the menu to the app.
+    [app setMenu:menu];
+    
+    [app setActivationPolicy:NSApplicationActivationPolicyRegular];
+    
+    [app run];
+
+    [menu release];
+    [appDelegate release];
+    [window release];
     [pool release];
-    return retVal;
+    
+    return EXIT_SUCCESS;
 }
diff --git a/gfx/skia/skia/src/views/sdl/SkOSWindow_SDL.cpp b/gfx/skia/skia/src/views/sdl/SkOSWindow_SDL.cpp
index 27783d41fc73..45beaee53e8d 100644
--- a/gfx/skia/skia/src/views/sdl/SkOSWindow_SDL.cpp
+++ b/gfx/skia/skia/src/views/sdl/SkOSWindow_SDL.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
@@ -7,221 +6,286 @@
  */
 #include "SkOSWindow_SDL.h"
 #include "SkCanvas.h"
-#include "SkColorPriv.h"
-#include "SkGLCanvas.h"
-#include "SkOSMenu.h"
-#include "SkTime.h"
 
-static void post_SkEvent_event() {
-    SDL_Event evt;
-    evt.type = SDL_USEREVENT;
-    evt.user.type = SDL_USEREVENT;
-    evt.user.code = 0;
-    evt.user.data1 = NULL;
-    evt.user.data2 = NULL;
-    SDL_PushEvent(&evt);
+#if defined(SK_BUILD_FOR_ANDROID)
+#include <GLES/gl.h>
+#elif defined(SK_BUILD_FOR_UNIX)
+#include <GL/gl.h>
+#elif defined(SK_BUILD_FOR_MAC)
+#include <gl.h>
+#endif
+
+const int SCREEN_WIDTH = 640;
+const int SCREEN_HEIGHT = 480;
+
+static void handle_error() {
+    const char* error = SDL_GetError();
+    SkDebugf("SDL Error: %s\n", error);
+    SDL_ClearError();
 }
 
-static bool skia_setBitmapFromSurface(SkBitmap* dst, SDL_Surface* src) {
-    SkColorType ct;
-    SkAlphaType at;
+SkOSWindow::SkOSWindow(void* screen) : fQuit(false) , fGLContext(nullptr) {
+#if defined(SK_BUILD_FOR_ANDROID)
+    // TODO we should try and get a 3.0 context first
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
+    fWindowFlags = SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE |
+                   SDL_WINDOW_BORDERLESS | SDL_WINDOW_FULLSCREEN_DESKTOP |
+                   SDL_WINDOW_ALLOW_HIGHDPI;
+#else
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
+    SDL_StartTextInput();
 
-    switch (src->format->BytesPerPixel) {
-        case 2:
-            ct = kRGB_565_SkColorType;
-            at = kOpaque_SkAlphaType;
-            break;
-        case 4:
-            ct = kN32_SkColorType;
-            at = kPremul_SkAlphaType;
-            break;
-        default:
-            return false;
+    fWindowFlags = SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE;
+#endif
+    SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5);
+    SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5);
+    SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5);
+    SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+    SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
+    SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8);
+
+    SDL_GL_SetAttribute(SDL_GL_ACCELERATED_VISUAL, 1);
+
+    if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS) != 0) {
+        handle_error();
+        return;
     }
 
-    return dst->installPixels(SkImageInfo::Make(src->w, src->h, ct, at), src->pixels, src->pitch);
-}
-
-SkOSWindow::SkOSWindow(void* screen) {
-    fScreen = reinterpret_cast<SDL_Surface*>(screen);
-    this->resize(fScreen->w, fScreen->h);
-
-    uint32_t rmask = SK_R32_MASK << SK_R32_SHIFT;
-    uint32_t gmask = SK_G32_MASK << SK_G32_SHIFT;
-    uint32_t bmask = SK_B32_MASK << SK_B32_SHIFT;
-    uint32_t amask = SK_A32_MASK << SK_A32_SHIFT;
-
-    if (fScreen->flags & SDL_OPENGL) {
-        fSurface = NULL;
-        fGLCanvas = new SkGLCanvas;
-        fGLCanvas->setViewport(fScreen->w, fScreen->h);
-    } else {
-        fGLCanvas = NULL;
-        fSurface = SDL_CreateRGBSurface(SDL_SWSURFACE, fScreen->w, fScreen->h,
-                                        32, rmask, gmask, bmask, amask);
+    SDL_DisplayMode dm;
+    if (SDL_GetDesktopDisplayMode(0, &dm) != 0) {
+        handle_error();
+        return;
     }
+
+    fWindow = SDL_CreateWindow("SDL Window", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
+                               dm.w, dm.h, fWindowFlags);
+
+    if (!fWindow) {
+        handle_error();
+        return;
+    }
+    this->resize(dm.w, dm.h);
 }
 
 SkOSWindow::~SkOSWindow() {
-    delete fGLCanvas;
-    if (fSurface) {
-        SDL_FreeSurface(fSurface);
+    if (fGLContext) {
+        SDL_GL_DeleteContext(fGLContext);
+    }
+
+    //Destroy window
+    SDL_DestroyWindow(fWindow);
+
+    //Quit SDL subsystems
+    SDL_Quit();
+}
+
+void SkOSWindow::detach() {
+    if (fGLContext) {
+        SDL_GL_DeleteContext(fGLContext);
+        fGLContext = nullptr;
+    }
+
+#if defined(SK_BUILD_FOR_ANDROID)
+    if (fWindow) {
+        // Destroy window
+        // Not totally sure why, but we have to do this or swapbuffers will hang
+        SDL_DestroyWindow(fWindow);
+        fWindow = nullptr;
+    }
+#endif
+}
+
+bool SkOSWindow::attach(SkBackEndTypes attachType, int msaaSampleCount, AttachmentInfo* info) {
+    if (!fWindow) {
+        fWindow = SDL_CreateWindow("SDL Window", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
+                                   SCREEN_WIDTH, SCREEN_HEIGHT,
+                                   fWindowFlags);
+    }
+
+    if (msaaSampleCount > 0) {
+        SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1);
+        SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, msaaSampleCount);
+    }
+
+    info->fSampleCount = msaaSampleCount;
+    info->fStencilBits = 8;
+
+    fGLContext = SDL_GL_CreateContext(fWindow);
+    if (!fGLContext) {
+        handle_error();
+        return false;
+    }
+
+    int success =  SDL_GL_MakeCurrent(fWindow, fGLContext);
+    if (success != 0) {
+        handle_error();
+        return false;
+    }
+
+    glViewport(0, 0, SkScalarFloorToInt(this->width()), SkScalarFloorToInt(this->height()));
+    glClearColor(1, 1, 1, 1);
+    glClearStencil(0);
+    glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+
+    return true;
+}
+
+void SkOSWindow::present() {
+    SDL_GL_SwapWindow(fWindow);
+}
+
+bool SkOSWindow::makeFullscreen() {
+    SDL_SetWindowFullscreen(fWindow, SDL_WINDOW_FULLSCREEN);
+    return true;
+}
+
+void SkOSWindow::setVsync(bool vsync) {
+    SDL_GL_SetSwapInterval(vsync ? 1 : 0);
+}
+
+void SkOSWindow::closeWindow() {
+    fQuit = true;
+}
+
+static SkKey convert_sdlkey_to_skkey(SDL_Keycode src) {
+    switch (src) {
+        case SDLK_UP:
+            return kUp_SkKey;
+        case SDLK_DOWN:
+            return kDown_SkKey;
+        case SDLK_LEFT:
+            return kLeft_SkKey;
+        case SDLK_RIGHT:
+            return kRight_SkKey;
+        case SDLK_HOME:
+            return kHome_SkKey;
+        case SDLK_END:
+            return kEnd_SkKey;
+        case SDLK_ASTERISK:
+            return kStar_SkKey;
+        case SDLK_HASH:
+            return kHash_SkKey;
+        case SDLK_0:
+            return k0_SkKey;
+        case SDLK_1:
+            return k1_SkKey;
+        case SDLK_2:
+            return k2_SkKey;
+        case SDLK_3:
+            return k3_SkKey;
+        case SDLK_4:
+            return k4_SkKey;
+        case SDLK_5:
+            return k5_SkKey;
+        case SDLK_6:
+            return k6_SkKey;
+        case SDLK_7:
+            return k7_SkKey;
+        case SDLK_8:
+            return k8_SkKey;
+        case SDLK_9:
+            return k9_SkKey;
+        default:
+            return kNONE_SkKey;
     }
 }
 
-#include <OpenGL/gl.h>
+void SkOSWindow::handleEvents() {
+    SkEvent::ServiceQueueTimer();
+    SkEvent::ProcessEvent();
 
-void SkOSWindow::doDraw() {
-    if (fGLCanvas) {
-        glEnable(GL_BLEND);
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-        glHint(GL_LINE_SMOOTH_HINT, GL_DONT_CARE);
-        glEnable(GL_TEXTURE_2D);
-        glClearColor(0, 0, 0, 0);
-        glClear(GL_COLOR_BUFFER_BIT);
-
-        int count = fGLCanvas->save();
-        this->draw(fGLCanvas);
-        fGLCanvas->restoreToCount(count);
-        SDL_GL_SwapBuffers( );
-    } else {
-        if ( SDL_MUSTLOCK(fSurface) ) {
-            if ( SDL_LockSurface(fSurface) < 0 ) {
-                return;
-            }
-        }
-
-        SkBitmap bitmap;
-
-        if (skia_setBitmapFromSurface(&bitmap, fSurface)) {
-            SkCanvas canvas(bitmap);
-            this->draw(&canvas);
-        }
-
-        if ( SDL_MUSTLOCK(fSurface) ) {
-            SDL_UnlockSurface(fSurface);
-        }
-
-        int result = SDL_BlitSurface(fSurface, NULL, fScreen, NULL);
-        if (result) {
-            SkDebugf("------- SDL_BlitSurface returned %d\n", result);
-        }
-        SDL_UpdateRect(fScreen, 0, 0, fScreen->w, fScreen->h);
-    }
-}
-
-static SkKey find_skkey(SDLKey src) {
-    // this array must match the enum order in SkKey.h
-    static const SDLKey gKeys[] = {
-        SDLK_UNKNOWN,
-        SDLK_UNKNOWN,   // left softkey
-        SDLK_UNKNOWN,   // right softkey
-        SDLK_UNKNOWN,   // home
-        SDLK_UNKNOWN,   // back
-        SDLK_UNKNOWN,   // send
-        SDLK_UNKNOWN,   // end
-        SDLK_0,
-        SDLK_1,
-        SDLK_2,
-        SDLK_3,
-        SDLK_4,
-        SDLK_5,
-        SDLK_6,
-        SDLK_7,
-        SDLK_8,
-        SDLK_9,
-        SDLK_ASTERISK,
-        SDLK_HASH,
-        SDLK_UP,
-        SDLK_DOWN,
-        SDLK_LEFT,
-        SDLK_RIGHT,
-        SDLK_RETURN,    // OK
-        SDLK_UNKNOWN,   // volume up
-        SDLK_UNKNOWN,   // volume down
-        SDLK_UNKNOWN,   // power
-        SDLK_UNKNOWN,   // camera
-    };
-
-    const SDLKey* array = gKeys;
-    for (size_t i = 0; i < SK_ARRAY_COUNT(gKeys); i++) {
-        if (array[i] == src) {
-            return static_cast<SkKey>(i);
-        }
-    }
-    return kNONE_SkKey;
-}
-
-void SkOSWindow::handleSDLEvent(const SDL_Event& event) {
-    switch (event.type) {
-        case SDL_VIDEORESIZE:
-            this->resize(event.resize.w, event.resize.h);
-            break;
-        case SDL_VIDEOEXPOSE:
-            this->doDraw();
-            break;
-        case SDL_MOUSEMOTION:
-            if (event.motion.state == SDL_PRESSED) {
-                this->handleClick(event.motion.x, event.motion.y,
-                                   SkView::Click::kMoved_State);
-            }
-            break;
-        case SDL_MOUSEBUTTONDOWN:
-        case SDL_MOUSEBUTTONUP:
-            this->handleClick(event.button.x, event.button.y,
-                               event.button.state == SDL_PRESSED ?
-                               SkView::Click::kDown_State :
-                               SkView::Click::kUp_State);
-            break;
-        case SDL_KEYDOWN: {
-            SkKey sk = find_skkey(event.key.keysym.sym);
-            if (kNONE_SkKey != sk) {
-                if (event.key.state == SDL_PRESSED) {
-                    this->handleKey(sk);
-                } else {
-                    this->handleKeyUp(sk);
+    SDL_Event event;
+    while(SDL_PollEvent(&event)) {
+        switch (event.type) {
+            case SDL_MOUSEMOTION:
+                if (event.motion.state == SDL_PRESSED) {
+                    this->handleClick(event.motion.x, event.motion.y,
+                                     SkView::Click::kMoved_State, nullptr);
                 }
+                break;
+            case SDL_MOUSEBUTTONDOWN:
+            case SDL_MOUSEBUTTONUP:
+                this->handleClick(event.button.x, event.button.y,
+                                  event.button.state == SDL_PRESSED ?
+                                  SkView::Click::kDown_State :
+                                  SkView::Click::kUp_State, nullptr);
+                break;
+            case SDL_KEYDOWN: {
+                SDL_Keycode key = event.key.keysym.sym;
+                SkKey sk = convert_sdlkey_to_skkey(key);
+                if (kNONE_SkKey != sk) {
+                    if (event.key.state == SDL_PRESSED) {
+                        this->handleKey(sk);
+                    } else {
+                        this->handleKeyUp(sk);
+                    }
+                } else if (key == SDLK_ESCAPE) {
+                    fQuit = true;
+                }
+                break;
             }
-            break;
+            case SDL_TEXTINPUT: {
+                size_t len = strlen(event.text.text);
+                for (size_t i = 0; i < len; i++) {
+                    this->handleChar((SkUnichar)event.text.text[i]);
+                }
+                break;
+            }
+            case SDL_QUIT:
+                fQuit = true;
+                break;
+            default:
+                break;
         }
-        case SDL_USEREVENT:
-            if (SkEvent::ProcessEvent()) {
-                post_SkEvent_event();
-            }
-            break;
     }
 }
 
-void SkOSWindow::onHandleInval(const SkIRect& r) {
-    SDL_Event evt;
-    evt.type = SDL_VIDEOEXPOSE;
-    evt.expose.type = SDL_VIDEOEXPOSE;
-    SDL_PushEvent(&evt);
-}
 
 void SkOSWindow::onSetTitle(const char title[]) {
-    SDL_WM_SetCaption(title, NULL);
+    SDL_SetWindowTitle(fWindow, title);
 }
-
-void SkOSWindow::onAddMenu(const SkOSMenu* sk_menu) {}
-
 ///////////////////////////////////////////////////////////////////////////////////////
 
 void SkEvent::SignalNonEmptyQueue() {
-    SkDebugf("-------- signal nonempty\n");
-    post_SkEvent_event();
+    // nothing to do, since we spin on our event-queue
 }
 
-static Uint32 timer_callback(Uint32 interval) {
-//    SkDebugf("-------- timercallback %d\n", interval);
-    SkEvent::ServiceQueueTimer();
+void SkEvent::SignalQueueTimer(SkMSec delay) {
+    // just need to record the delay time. We handle waking up for it in
+}
+
+void SkOSWindow::onHandleInval(const SkIRect& rect) {
+}
+
+void SkOSWindow::onPDFSaved(const char title[], const char desc[], const char path[]) {
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+#include "SkApplication.h"
+#include "SkEvent.h"
+#include "SkWindow.h"
+
+#if defined(SK_BUILD_FOR_ANDROID)
+int SDL_main(int argc, char** argv) {
+#else
+int main(int argc, char** argv) {
+#endif
+    SkOSWindow* window = create_sk_window(nullptr, argc, argv);
+
+    // drain any events that occurred before |window| was assigned.
+    while (SkEvent::ProcessEvent());
+
+    // Start normal Skia sequence
+    application_init();
+
+    window->loop();
+
+    delete window;
+    application_term();
     return 0;
 }
-
-void SkEvent::SignalQueueTimer(SkMSec delay)
-{
-    SDL_SetTimer(0, NULL);
-    if (delay) {
-        SDL_SetTimer(delay, timer_callback);
-    }
-}
diff --git a/gfx/skia/skia/src/views/unix/SkOSWindow_Unix.cpp b/gfx/skia/skia/src/views/unix/SkOSWindow_Unix.cpp
index fad592251777..1c288f4be824 100644
--- a/gfx/skia/skia/src/views/unix/SkOSWindow_Unix.cpp
+++ b/gfx/skia/skia/src/views/unix/SkOSWindow_Unix.cpp
@@ -33,40 +33,40 @@ const long EVENT_MASK = StructureNotifyMask|ButtonPressMask|ButtonReleaseMask
         |ExposureMask|PointerMotionMask|KeyPressMask|KeyReleaseMask;
 
 SkOSWindow::SkOSWindow(void*)
-    : fVi(NULL)
+    : fVi(nullptr)
     , fMSAASampleCount(0) {
-    fUnixWindow.fDisplay = NULL;
-    fUnixWindow.fGLContext = NULL;
-    this->initWindow(0, NULL);
+    fUnixWindow.fDisplay = nullptr;
+    fUnixWindow.fGLContext = nullptr;
+    this->initWindow(0, nullptr);
     this->resize(WIDTH, HEIGHT);
 }
 
 SkOSWindow::~SkOSWindow() {
-    this->closeWindow();
+    this->internalCloseWindow();
 }
 
-void SkOSWindow::closeWindow() {
-    if (NULL != fUnixWindow.fDisplay) {
+void SkOSWindow::internalCloseWindow() {
+    if (fUnixWindow.fDisplay) {
         this->detach();
-        SkASSERT(NULL != fUnixWindow.fGc);
+        SkASSERT(fUnixWindow.fGc);
         XFreeGC(fUnixWindow.fDisplay, fUnixWindow.fGc);
-        fUnixWindow.fGc = NULL;
+        fUnixWindow.fGc = nullptr;
         XDestroyWindow(fUnixWindow.fDisplay, fUnixWindow.fWin);
-        fVi = NULL;
+        fVi = nullptr;
         XCloseDisplay(fUnixWindow.fDisplay);
-        fUnixWindow.fDisplay = NULL;
+        fUnixWindow.fDisplay = nullptr;
         fMSAASampleCount = 0;
     }
 }
 
 void SkOSWindow::initWindow(int requestedMSAASampleCount, AttachmentInfo* info) {
     if (fMSAASampleCount != requestedMSAASampleCount) {
-        this->closeWindow();
+        this->internalCloseWindow();
     }
     // presence of fDisplay means we already have a window
-    if (NULL != fUnixWindow.fDisplay) {
-        if (NULL != info) {
-            if (NULL != fVi) {
+    if (fUnixWindow.fDisplay) {
+        if (info) {
+            if (fVi) {
                 glXGetConfig(fUnixWindow.fDisplay, fVi, GLX_SAMPLES_ARB, &info->fSampleCount);
                 glXGetConfig(fUnixWindow.fDisplay, fVi, GLX_STENCIL_SIZE, &info->fStencilBits);
             } else {
@@ -76,9 +76,9 @@ void SkOSWindow::initWindow(int requestedMSAASampleCount, AttachmentInfo* info)
         }
         return;
     }
-    fUnixWindow.fDisplay = XOpenDisplay(NULL);
+    fUnixWindow.fDisplay = XOpenDisplay(nullptr);
     Display* dsp = fUnixWindow.fDisplay;
-    if (NULL == dsp) {
+    if (nullptr == dsp) {
         SkDebugf("Could not open an X Display");
         return;
     }
@@ -90,7 +90,7 @@ void SkOSWindow::initWindow(int requestedMSAASampleCount, AttachmentInfo* info)
         GLX_STENCIL_SIZE, 8,
         None
     };
-    SkASSERT(NULL == fVi);
+    SkASSERT(nullptr == fVi);
     if (requestedMSAASampleCount > 0) {
         static const GLint kAttCount = SK_ARRAY_COUNT(att);
         GLint msaaAtt[kAttCount + 4];
@@ -104,13 +104,13 @@ void SkOSWindow::initWindow(int requestedMSAASampleCount, AttachmentInfo* info)
         fVi = glXChooseVisual(dsp, DefaultScreen(dsp), msaaAtt);
         fMSAASampleCount = requestedMSAASampleCount;
     }
-    if (NULL == fVi) {
+    if (nullptr == fVi) {
         fVi = glXChooseVisual(dsp, DefaultScreen(dsp), att);
         fMSAASampleCount = 0;
     }
 
     if (fVi) {
-        if (NULL != info) {
+        if (info) {
             glXGetConfig(dsp, fVi, GLX_SAMPLES_ARB, &info->fSampleCount);
             glXGetConfig(dsp, fVi, GLX_STENCIL_SIZE, &info->fStencilBits);
         }
@@ -132,7 +132,7 @@ void SkOSWindow::initWindow(int requestedMSAASampleCount, AttachmentInfo* info)
                                          CWEventMask | CWColormap,
                                          &swa);
     } else {
-        if (NULL != info) {
+        if (info) {
             info->fSampleCount = 0;
             info->fStencilBits = 0;
         }
@@ -146,7 +146,7 @@ void SkOSWindow::initWindow(int requestedMSAASampleCount, AttachmentInfo* info)
                                                0);    // background value
     }
     this->mapWindowAndWait();
-    fUnixWindow.fGc = XCreateGC(dsp, fUnixWindow.fWin, 0, NULL);
+    fUnixWindow.fGc = XCreateGC(dsp, fUnixWindow.fWin, 0, nullptr);
 }
 
 static unsigned getModi(const XEvent& evt) {
@@ -190,7 +190,7 @@ static bool MyXNextEventWithDelay(Display* dsp, XEvent* evt) {
         tv.tv_sec = ms / 1000;              // seconds
         tv.tv_usec = (ms % 1000) * 1000;    // microseconds
 
-        if (!select(x11_fd + 1, &input_fds, NULL, NULL, &tv)) {
+        if (!select(x11_fd + 1, &input_fds, nullptr, nullptr, &tv)) {
             if (!XPending(dsp)) {
                 return false;
             }
@@ -222,16 +222,16 @@ SkOSWindow::NextXEventResult SkOSWindow::nextXEvent() {
         case ButtonPress:
             if (evt.xbutton.button == Button1)
                 this->handleClick(evt.xbutton.x, evt.xbutton.y,
-                            SkView::Click::kDown_State, NULL, getModi(evt));
+                            SkView::Click::kDown_State, nullptr, getModi(evt));
             break;
         case ButtonRelease:
             if (evt.xbutton.button == Button1)
                 this->handleClick(evt.xbutton.x, evt.xbutton.y,
-                              SkView::Click::kUp_State, NULL, getModi(evt));
+                              SkView::Click::kUp_State, nullptr, getModi(evt));
             break;
         case MotionNotify:
             this->handleClick(evt.xmotion.x, evt.xmotion.y,
-                           SkView::Click::kMoved_State, NULL, getModi(evt));
+                           SkView::Click::kMoved_State, nullptr, getModi(evt));
             break;
         case KeyPress: {
             int shiftLevel = (evt.xkey.state & ShiftMask) ? 1 : 0;
@@ -264,7 +264,7 @@ SkOSWindow::NextXEventResult SkOSWindow::nextXEvent() {
 
 void SkOSWindow::loop() {
     Display* dsp = fUnixWindow.fDisplay;
-    if (NULL == dsp) {
+    if (nullptr == dsp) {
         return;
     }
     Window win = fUnixWindow.fWin;
@@ -298,7 +298,7 @@ void SkOSWindow::loop() {
                 case kPaintRequest_NextXEventResult:
                     sentExposeEvent = false;
                     if (this->isDirty()) {
-                        this->update(NULL);
+                        this->update(nullptr);
                     }
                     this->doPaint();
                     break;
@@ -310,7 +310,7 @@ void SkOSWindow::loop() {
 }
 
 void SkOSWindow::mapWindowAndWait() {
-    SkASSERT(NULL != fUnixWindow.fDisplay);
+    SkASSERT(fUnixWindow.fDisplay);
     Display* dsp = fUnixWindow.fDisplay;
     Window win = fUnixWindow.fWin;
     XMapWindow(dsp, win);
@@ -326,20 +326,43 @@ void SkOSWindow::mapWindowAndWait() {
 
 }
 
+////////////////////////////////////////////////
+
+// Some helper code to load the correct version of glXSwapInterval
+#define GLX_GET_PROC_ADDR(name) glXGetProcAddress(reinterpret_cast<const GLubyte*>((name)))
+#define EXT_WRANGLE(name, type, ...) \
+    if (GLX_GET_PROC_ADDR(#name)) { \
+        static type k##name; \
+        if (!k##name) { \
+            k##name = (type) GLX_GET_PROC_ADDR(#name); \
+        } \
+        k##name(__VA_ARGS__); \
+        /*SkDebugf("using %s\n", #name);*/ \
+        return; \
+    }
+
+static void glXSwapInterval(Display* dsp, GLXDrawable drawable, int interval) {
+    EXT_WRANGLE(glXSwapIntervalEXT, PFNGLXSWAPINTERVALEXTPROC, dsp, drawable, interval);
+    EXT_WRANGLE(glXSwapIntervalMESA, PFNGLXSWAPINTERVALMESAPROC, interval);
+    EXT_WRANGLE(glXSwapIntervalSGI, PFNGLXSWAPINTERVALSGIPROC, interval);
+}
+
+/////////////////////////////////////////////////////////////////////////
+
 bool SkOSWindow::attach(SkBackEndTypes, int msaaSampleCount, AttachmentInfo* info) {
     this->initWindow(msaaSampleCount, info);
 
-    if (NULL == fUnixWindow.fDisplay) {
+    if (nullptr == fUnixWindow.fDisplay) {
         return false;
     }
-    if (NULL == fUnixWindow.fGLContext) {
-        SkASSERT(NULL != fVi);
+    if (nullptr == fUnixWindow.fGLContext) {
+        SkASSERT(fVi);
 
         fUnixWindow.fGLContext = glXCreateContext(fUnixWindow.fDisplay,
                                                   fVi,
-                                                  NULL,
+                                                  nullptr,
                                                   GL_TRUE);
-        if (NULL == fUnixWindow.fGLContext) {
+        if (nullptr == fUnixWindow.fGLContext) {
             return false;
         }
     }
@@ -356,22 +379,22 @@ bool SkOSWindow::attach(SkBackEndTypes, int msaaSampleCount, AttachmentInfo* inf
 }
 
 void SkOSWindow::detach() {
-    if (NULL == fUnixWindow.fDisplay || NULL == fUnixWindow.fGLContext) {
+    if (nullptr == fUnixWindow.fDisplay || nullptr == fUnixWindow.fGLContext) {
         return;
     }
-    glXMakeCurrent(fUnixWindow.fDisplay, None, NULL);
+    glXMakeCurrent(fUnixWindow.fDisplay, None, nullptr);
     glXDestroyContext(fUnixWindow.fDisplay, fUnixWindow.fGLContext);
-    fUnixWindow.fGLContext = NULL;
+    fUnixWindow.fGLContext = nullptr;
 }
 
 void SkOSWindow::present() {
-    if (NULL != fUnixWindow.fDisplay && NULL != fUnixWindow.fGLContext) {
+    if (fUnixWindow.fDisplay && fUnixWindow.fGLContext) {
         glXSwapBuffers(fUnixWindow.fDisplay, fUnixWindow.fWin);
     }
 }
 
 void SkOSWindow::onSetTitle(const char title[]) {
-    if (NULL == fUnixWindow.fDisplay) {
+    if (nullptr == fUnixWindow.fDisplay) {
         return;
     }
     XTextProperty textProp;
@@ -401,11 +424,11 @@ static bool convertBitmapToXImage(XImage& image, const SkBitmap& bitmap) {
 }
 
 void SkOSWindow::doPaint() {
-    if (NULL == fUnixWindow.fDisplay) {
+    if (nullptr == fUnixWindow.fDisplay) {
         return;
     }
     // If we are drawing with GL, we don't need XPutImage.
-    if (NULL != fUnixWindow.fGLContext) {
+    if (fUnixWindow.fGLContext) {
         return;
     }
     // Draw the bitmap to the screen.
@@ -427,6 +450,62 @@ void SkOSWindow::doPaint() {
               width, height);
 }
 
+enum {
+    _NET_WM_STATE_REMOVE =0,
+    _NET_WM_STATE_ADD = 1,
+    _NET_WM_STATE_TOGGLE =2
+};
+
+bool SkOSWindow::makeFullscreen() {
+    Display* dsp = fUnixWindow.fDisplay;
+    if (nullptr == dsp) {
+        return false;
+    }
+
+    // Full screen
+    Atom wm_state = XInternAtom(dsp, "_NET_WM_STATE", False);
+    Atom fullscreen = XInternAtom(dsp, "_NET_WM_STATE_FULLSCREEN", False);
+
+    XEvent evt;
+    sk_bzero(&evt, sizeof(evt));
+    evt.type = ClientMessage;
+    evt.xclient.window = fUnixWindow.fWin;
+    evt.xclient.message_type = wm_state;
+    evt.xclient.format = 32;
+    evt.xclient.data.l[0] = _NET_WM_STATE_ADD;
+    evt.xclient.data.l[1] = fullscreen;
+    evt.xclient.data.l[2] = 0;
+
+    XSendEvent(dsp, DefaultRootWindow(dsp), False,
+               SubstructureRedirectMask | SubstructureNotifyMask, &evt);
+    return true;
+}
+
+void SkOSWindow::setVsync(bool vsync) {
+    if (fUnixWindow.fDisplay && fUnixWindow.fGLContext && fUnixWindow.fWin) {
+        int swapInterval = vsync ? 1 : 0;
+        glXSwapInterval(fUnixWindow.fDisplay, fUnixWindow.fWin, swapInterval);
+    }
+}
+
+void SkOSWindow::closeWindow() {
+    Display* dsp = fUnixWindow.fDisplay;
+    if (nullptr == dsp) {
+        return;
+    }
+
+    XEvent evt;
+    sk_bzero(&evt, sizeof(evt));
+    evt.type = ClientMessage;
+    evt.xclient.message_type = XInternAtom(dsp, "WM_PROTOCOLS", true);
+    evt.xclient.window = fUnixWindow.fWin;
+    evt.xclient.format = 32;
+    evt.xclient.data.l[0] = XInternAtom(dsp, "WM_DELETE_WINDOW", false);
+    evt.xclient.data.l[1] = CurrentTime;
+
+    XSendEvent(dsp, fUnixWindow.fWin, false, NoEventMask, &evt);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkEvent::SignalNonEmptyQueue() {
diff --git a/gfx/skia/skia/include/views/unix/XkeysToSkKeys.h b/gfx/skia/skia/src/views/unix/XkeysToSkKeys.h
similarity index 100%
rename from gfx/skia/skia/include/views/unix/XkeysToSkKeys.h
rename to gfx/skia/skia/src/views/unix/XkeysToSkKeys.h
diff --git a/gfx/skia/skia/include/views/unix/keysym2ucs.h b/gfx/skia/skia/src/views/unix/keysym2ucs.h
similarity index 100%
rename from gfx/skia/skia/include/views/unix/keysym2ucs.h
rename to gfx/skia/skia/src/views/unix/keysym2ucs.h
diff --git a/gfx/skia/skia/src/views/unix/skia_unix.cpp b/gfx/skia/skia/src/views/unix/skia_unix.cpp
index 03a2915adb31..58cc040c1ec2 100644
--- a/gfx/skia/skia/src/views/unix/skia_unix.cpp
+++ b/gfx/skia/skia/src/views/unix/skia_unix.cpp
@@ -10,7 +10,7 @@
 #include "SkWindow.h"
 
 int main(int argc, char** argv){
-    SkOSWindow* window = create_sk_window(NULL, argc, argv);
+    SkOSWindow* window = create_sk_window(nullptr, argc, argv);
 
     // drain any events that occurred before |window| was assigned.
     while (SkEvent::ProcessEvent());
diff --git a/gfx/skia/skia/src/views/win/SkOSWindow_win.cpp b/gfx/skia/skia/src/views/win/SkOSWindow_win.cpp
index 1b47dea3298d..4b7abb1e9668 100644
--- a/gfx/skia/skia/src/views/win/SkOSWindow_win.cpp
+++ b/gfx/skia/skia/src/views/win/SkOSWindow_win.cpp
@@ -11,7 +11,7 @@
 
 #include <GL/gl.h>
 #include <WindowsX.h>
-#include "SkWGL.h"
+#include "win/SkWGL.h"
 #include "SkWindow.h"
 #include "SkCanvas.h"
 #include "SkOSMenu.h"
@@ -21,8 +21,8 @@
 #include "SkGraphics.h"
 
 #if SK_ANGLE
+#include "gl/angle/SkANGLEGLContext.h"
 #include "gl/GrGLInterface.h"
-
 #include "GLES2/gl2.h"
 
 #define ANGLE_GL_CALL(IFACE, X)                                 \
@@ -30,37 +30,52 @@
         (IFACE)->fFunctions.f##X;                               \
     } while (false)
 
-#endif
+#endif // SK_ANGLE
 
-#define INVALIDATE_DELAY_MS 200
+#if SK_COMMAND_BUFFER
+#include "gl/command_buffer/SkCommandBufferGLContext.h"
 
-static SkOSWindow* gCurrOSWin;
-static HWND gEventTarget;
+#define COMMAND_BUFFER_GL_CALL(IFACE, X)                                 \
+    do {                                                        \
+        (IFACE)->fFunctions.f##X;                               \
+    } while (false)
+
+#endif // SK_COMMAND_BUFFER
 
 #define WM_EVENT_CALLBACK (WM_USER+0)
 
-void post_skwinevent()
+void post_skwinevent(HWND hwnd)
 {
-    PostMessage(gEventTarget, WM_EVENT_CALLBACK, 0, 0);
+    PostMessage(hwnd, WM_EVENT_CALLBACK, 0, 0);
 }
 
-SkOSWindow::SkOSWindow(void* hWnd) {
-    fHWND = hWnd;
+SkTHashMap<void*, SkOSWindow*> SkOSWindow::gHwndToOSWindowMap;
+
+SkOSWindow::SkOSWindow(const void* winInit) {
+    fWinInit = *(const WindowInit*)winInit;
+
+    fHWND = CreateWindow(fWinInit.fClass, NULL, WS_OVERLAPPEDWINDOW,
+                         CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, NULL, NULL, fWinInit.fInstance, NULL);
+    gHwndToOSWindowMap.set(fHWND, this);
 #if SK_SUPPORT_GPU
 #if SK_ANGLE
     fDisplay = EGL_NO_DISPLAY;
     fContext = EGL_NO_CONTEXT;
     fSurface = EGL_NO_SURFACE;
 #endif
+#if SK_COMMAND_BUFFER
+    fCommandBuffer = nullptr;
+#endif // SK_COMMAND_BUFFER
+
     fHGLRC = NULL;
 #endif
     fAttached = kNone_BackEndType;
-    gEventTarget = (HWND)hWnd;
+    fFullscreen = false;
 }
 
 SkOSWindow::~SkOSWindow() {
 #if SK_SUPPORT_GPU
-    if (NULL != fHGLRC) {
+    if (fHGLRC) {
         wglDeleteContext((HGLRC)fHGLRC);
     }
 #if SK_ANGLE
@@ -79,7 +94,12 @@ SkOSWindow::~SkOSWindow() {
         fDisplay = EGL_NO_DISPLAY;
     }
 #endif // SK_ANGLE
+#if SK_COMMAND_BUFFER
+    delete fCommandBuffer;
+#endif // SK_COMMAND_BUFFER
+
 #endif // SK_SUPPORT_GPU
+    this->closeWindow();
 }
 
 static SkKey winToskKey(WPARAM vk) {
@@ -144,14 +164,6 @@ bool SkOSWindow::wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
             return true;
             } break;
 
-        case WM_TIMER: {
-            RECT* rect = (RECT*)wParam;
-            InvalidateRect(hWnd, rect, FALSE);
-            KillTimer(hWnd, (UINT_PTR)rect);
-            delete rect;
-            return true;
-        } break;
-
         case WM_LBUTTONDOWN:
             this->handleClick(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam),
                               Click::kDown_State, NULL, getModifiers(message));
@@ -169,7 +181,7 @@ bool SkOSWindow::wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 
         case WM_EVENT_CALLBACK:
             if (SkEvent::ProcessEvent()) {
-                post_skwinevent();
+                post_skwinevent(hWnd);
             }
             return true;
     }
@@ -218,22 +230,20 @@ void SkOSWindow::doPaint(void* ctx) {
     }
 }
 
-#if 0
 void SkOSWindow::updateSize()
 {
     RECT    r;
-    GetWindowRect((HWND)this->getHWND(), &r);
+    GetWindowRect((HWND)fHWND, &r);
     this->resize(r.right - r.left, r.bottom - r.top);
 }
-#endif
 
 void SkOSWindow::onHandleInval(const SkIRect& r) {
-    RECT* rect = new RECT;
-    rect->left    = r.fLeft;
-    rect->top     = r.fTop;
-    rect->right   = r.fRight;
-    rect->bottom  = r.fBottom;
-    SetTimer((HWND)fHWND, (UINT_PTR)rect, INVALIDATE_DELAY_MS, NULL);
+    RECT rect;
+    rect.left    = r.fLeft;
+    rect.top     = r.fTop;
+    rect.right   = r.fRight;
+    rect.bottom  = r.fBottom;
+    InvalidateRect((HWND)fHWND, &rect, FALSE);
 }
 
 void SkOSWindow::onAddMenu(const SkOSMenu* sk_menu)
@@ -300,8 +310,9 @@ static SkKey raw2key(uint32_t raw)
 
 void SkEvent::SignalNonEmptyQueue()
 {
-    post_skwinevent();
-    //SkDebugf("signal nonempty\n");
+    SkOSWindow::ForAllWindows([](void* hWND, SkOSWindow**) {
+        post_skwinevent((HWND)hWND);
+    });
 }
 
 static UINT_PTR gTimer;
@@ -377,13 +388,13 @@ void SkOSWindow::detachGL() {
 }
 
 void SkOSWindow::presentGL() {
-    glFlush();
     HDC dc = GetDC((HWND)fHWND);
     SwapBuffers(dc);
     ReleaseDC((HWND)fHWND, dc);
 }
 
 #if SK_ANGLE
+
 bool create_ANGLE(EGLNativeWindowType hWnd,
                   int msaaSampleCount,
                   EGLDisplay* eglDisplay,
@@ -407,9 +418,11 @@ bool create_ANGLE(EGLNativeWindowType hWnd,
         EGL_NONE, EGL_NONE
     };
 
-    EGLDisplay display = eglGetDisplay(GetDC(hWnd));
-    if (display == EGL_NO_DISPLAY ) {
-       return false;
+    EGLDisplay display = SkANGLEGLContext::GetD3DEGLDisplay(GetDC(hWnd), false);
+
+    if (EGL_NO_DISPLAY == display) {
+        SkDebugf("Could not create ANGLE egl display!\n");
+        return false;
     }
 
     // Initialize EGL
@@ -438,7 +451,7 @@ bool create_ANGLE(EGLNativeWindowType hWnd,
         msaaConfigAttribList[kConfigAttribListCnt + 1] = EGL_SAMPLES;
         msaaConfigAttribList[kConfigAttribListCnt + 2] = msaaSampleCount;
         msaaConfigAttribList[kConfigAttribListCnt + 3] = EGL_NONE;
-        if (eglChooseConfig(display, configAttribList, eglConfig, 1, &numConfigs)) {
+        if (eglChooseConfig(display, msaaConfigAttribList, eglConfig, 1, &numConfigs)) {
             SkASSERT(numConfigs > 0);
             foundConfig = true;
         }
@@ -535,6 +548,50 @@ void SkOSWindow::presentANGLE() {
     eglSwapBuffers(fDisplay, fSurface);
 }
 #endif // SK_ANGLE
+
+#if SK_COMMAND_BUFFER
+
+bool SkOSWindow::attachCommandBuffer(int msaaSampleCount, AttachmentInfo* info) {
+    if (!fCommandBuffer) {
+        fCommandBuffer = SkCommandBufferGLContext::Create((HWND)fHWND, msaaSampleCount);
+        if (!fCommandBuffer)
+            return false;
+    
+        SkAutoTUnref<const GrGLInterface> intf(GrGLCreateCommandBufferInterface());
+        if (intf) {
+            COMMAND_BUFFER_GL_CALL(intf, ClearStencil(0));
+            COMMAND_BUFFER_GL_CALL(intf, ClearColor(0, 0, 0, 0));
+            COMMAND_BUFFER_GL_CALL(intf, StencilMask(0xffffffff));
+            COMMAND_BUFFER_GL_CALL(intf, Clear(GL_STENCIL_BUFFER_BIT |GL_COLOR_BUFFER_BIT));
+        }
+    }
+
+    if (fCommandBuffer->makeCurrent()) {
+        info->fStencilBits = fCommandBuffer->getStencilBits();
+        info->fSampleCount = fCommandBuffer->getSampleCount();
+
+        SkAutoTUnref<const GrGLInterface> intf(GrGLCreateCommandBufferInterface());
+
+        if (intf ) {
+            COMMAND_BUFFER_GL_CALL(intf, Viewport(0, 0,
+                                         SkScalarRoundToInt(this->width()),
+                                         SkScalarRoundToInt(this->height())));
+        }
+        return true;
+    }
+    return false;
+}
+
+void SkOSWindow::detachCommandBuffer() {
+    delete fCommandBuffer;
+    fCommandBuffer = nullptr;
+}
+
+void SkOSWindow::presentCommandBuffer() {
+    fCommandBuffer->presentCommandBuffer();
+}
+#endif // SK_COMMAND_BUFFER
+
 #endif // SK_SUPPORT_GPU
 
 // return true on success
@@ -559,6 +616,11 @@ bool SkOSWindow::attach(SkBackEndTypes attachType, int msaaSampleCount, Attachme
         result = attachANGLE(msaaSampleCount, info);
         break;
 #endif // SK_ANGLE
+#if SK_COMMAND_BUFFER
+    case kCommandBuffer_BackEndType:
+        result = attachCommandBuffer(msaaSampleCount, info);
+        break;
+#endif // SK_COMMAND_BUFFER
 #endif // SK_SUPPORT_GPU
     default:
         SkASSERT(false);
@@ -587,6 +649,11 @@ void SkOSWindow::detach() {
         detachANGLE();
         break;
 #endif // SK_ANGLE
+#if SK_COMMAND_BUFFER
+    case kCommandBuffer_BackEndType:
+        detachCommandBuffer();
+        break;
+#endif // SK_COMMAND_BUFFER
 #endif // SK_SUPPORT_GPU
     default:
         SkASSERT(false);
@@ -609,6 +676,11 @@ void SkOSWindow::present() {
         presentANGLE();
         break;
 #endif // SK_ANGLE
+#if SK_COMMAND_BUFFER
+    case kCommandBuffer_BackEndType:
+        presentCommandBuffer();
+        break;
+#endif // SK_COMMAND_BUFFER
 #endif // SK_SUPPORT_GPU
     default:
         SkASSERT(false);
@@ -616,4 +688,92 @@ void SkOSWindow::present() {
     }
 }
 
+bool SkOSWindow::makeFullscreen() {
+    if (fFullscreen) {
+        return true;
+    }
+#if SK_SUPPORT_GPU
+    if (fHGLRC) {
+        this->detachGL();
+    }
+#endif // SK_SUPPORT_GPU
+    // This is hacked together from various sources on the web. It can certainly be improved and be
+    // made more robust.
+
+    // Save current window/resolution information. We do this in case we ever implement switching
+    // back to windowed mode.
+    fSavedWindowState.fZoomed = SkToBool(IsZoomed((HWND)fHWND));
+    if (fSavedWindowState.fZoomed) {
+        SendMessage((HWND)fHWND, WM_SYSCOMMAND, SC_RESTORE, 0);
+    }
+    fSavedWindowState.fStyle = GetWindowLong((HWND)fHWND, GWL_STYLE);
+    fSavedWindowState.fExStyle = GetWindowLong((HWND)fHWND, GWL_EXSTYLE);
+    GetWindowRect((HWND)fHWND, &fSavedWindowState.fRect);
+    DEVMODE currScreenSettings;
+    memset(&currScreenSettings,0,sizeof(currScreenSettings));
+    currScreenSettings.dmSize = sizeof(currScreenSettings);
+    EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &currScreenSettings);
+    fSavedWindowState.fScreenWidth = currScreenSettings.dmPelsWidth;
+    fSavedWindowState.fScreenHeight = currScreenSettings.dmPelsHeight;
+    fSavedWindowState.fScreenBits = currScreenSettings.dmBitsPerPel;
+    fSavedWindowState.fHWND = fHWND;
+
+    // Try different sizes to find an allowed setting? Use ChangeDisplaySettingsEx?
+    static const int kWidth = 1280;
+    static const int kHeight = 1024;
+    DEVMODE newScreenSettings;
+    memset(&newScreenSettings, 0, sizeof(newScreenSettings));
+    newScreenSettings.dmSize = sizeof(newScreenSettings);
+    newScreenSettings.dmPelsWidth    = kWidth;
+    newScreenSettings.dmPelsHeight   = kHeight;
+    newScreenSettings.dmBitsPerPel   = 32;
+    newScreenSettings.dmFields = DM_BITSPERPEL|DM_PELSWIDTH|DM_PELSHEIGHT;
+    if (ChangeDisplaySettings(&newScreenSettings, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL) {
+        return false;
+    }
+    RECT WindowRect;
+    WindowRect.left = 0;
+    WindowRect.right = kWidth;
+    WindowRect.top = 0;
+    WindowRect.bottom = kHeight;     
+    ShowCursor(FALSE);
+    AdjustWindowRectEx(&WindowRect, WS_POPUP, FALSE, WS_EX_APPWINDOW);
+    HWND fsHWND = CreateWindowEx(
+        WS_EX_APPWINDOW,
+        fWinInit.fClass,
+        NULL,
+        WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_POPUP,
+        0, 0, WindowRect.right-WindowRect.left, WindowRect.bottom-WindowRect.top,
+        NULL,
+        NULL,
+        fWinInit.fInstance,
+        NULL
+    );
+    if (!fsHWND) {
+        return false;
+    }
+    // Hide the old window and set the entry in the global mapping for this SkOSWindow to the
+    // new HWND.
+    ShowWindow((HWND)fHWND, SW_HIDE);
+    gHwndToOSWindowMap.remove(fHWND);
+    fHWND = fsHWND;
+    gHwndToOSWindowMap.set(fHWND, this);
+    this->updateSize();
+
+    fFullscreen = true;
+    return true;
+}
+
+void SkOSWindow::setVsync(bool enable) {
+    SkWGLExtensions wgl;
+    wgl.swapInterval(enable ? 1 : 0);
+}
+
+void SkOSWindow::closeWindow() {
+    DestroyWindow((HWND)fHWND);
+    if (fFullscreen) {
+        DestroyWindow((HWND)fSavedWindowState.fHWND);
+    }
+    gHwndToOSWindowMap.remove(fHWND);
+}
 #endif
diff --git a/gfx/skia/skia/src/views/win/skia_win.cpp b/gfx/skia/skia/src/views/win/skia_win.cpp
index 72ff54fedd26..c15846da7aa2 100644
--- a/gfx/skia/skia/src/views/win/skia_win.cpp
+++ b/gfx/skia/skia/src/views/win/skia_win.cpp
@@ -8,44 +8,99 @@
 #include <windows.h>
 #include <tchar.h>
 
+#include "SkTypes.h"
 #include "SkApplication.h"
+#include "SkOSWindow_Win.h"
 
-#define MAX_LOADSTRING 100
+LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
 
-// Global Variables:
-HINSTANCE hInst;                            // current instance
-TCHAR szTitle[] = _T("SampleApp");          // The title bar text
-TCHAR szWindowClass[] = _T("SAMPLEAPP");    // the main window class name
+// Returns the main window Win32 class name.
+static const TCHAR* register_class(HINSTANCE hInstance) {
+    WNDCLASSEX wcex;
+    // The main window class name
+    static const TCHAR gSZWindowClass[] = _T("SkiaApp");
 
-// Forward declarations of functions included in this code module:
-ATOM                MyRegisterClass(HINSTANCE hInstance);
-BOOL                InitInstance(HINSTANCE, int, LPTSTR);
-LRESULT CALLBACK    WndProc(HWND, UINT, WPARAM, LPARAM);
-INT_PTR CALLBACK    About(HWND, UINT, WPARAM, LPARAM);
+    wcex.cbSize = sizeof(WNDCLASSEX);
 
-int APIENTRY _tWinMain(HINSTANCE hInstance,
-                     HINSTANCE hPrevInstance,
-                     LPTSTR    lpCmdLine,
-                     int       nCmdShow)
-{
-    UNREFERENCED_PARAMETER(hPrevInstance);
+    wcex.style          = CS_HREDRAW | CS_VREDRAW | CS_OWNDC;
+    wcex.lpfnWndProc    = WndProc;
+    wcex.cbClsExtra     = 0;
+    wcex.cbWndExtra     = 0;
+    wcex.hInstance      = hInstance;
+    wcex.hIcon          = NULL;
+    wcex.hCursor        = NULL;
+    wcex.hbrBackground  = (HBRUSH)(COLOR_WINDOW+1);
+    wcex.lpszMenuName   = NULL;
+    wcex.lpszClassName  = gSZWindowClass;
+    wcex.hIconSm        = NULL;
+
+    RegisterClassEx(&wcex);
+
+    return gSZWindowClass;
+}
+
+static char* tchar_to_utf8(const TCHAR* str) {
+#ifdef _UNICODE
+    int size = WideCharToMultiByte(CP_UTF8, 0, str, wcslen(str), NULL, 0, NULL, NULL);
+    char* str8 = (char*) sk_malloc_throw(size+1);
+    WideCharToMultiByte(CP_UTF8, 0, str, wcslen(str), str8, size, NULL, NULL);
+    str8[size] = '\0';
+    return str8;
+#else
+    return _strdup(str);
+#endif
+}
+
+// This file can work with GUI or CONSOLE subsystem types since we define _tWinMain and main().
+
+static int main_common(HINSTANCE hInstance, int show, int argc, char**argv);
+
+int APIENTRY _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine,
+                       int nCmdShow) {
+
+    // convert from lpCmdLine to argc, argv.
+    char* argv[4096];
+    int argc = 0;
+    TCHAR exename[1024], *next;
+    int exenameLen = GetModuleFileName(NULL, exename, SK_ARRAY_COUNT(exename));
+    // we're ignoring the possibility that the exe name exceeds the exename buffer
+    (void) exenameLen;
+    argv[argc++] = tchar_to_utf8(exename);
+    TCHAR* arg = _tcstok_s(lpCmdLine, _T(" "), &next);
+    while (arg != NULL) {
+       argv[argc++] = tchar_to_utf8(arg);
+       arg = _tcstok_s(NULL, _T(" "), &next);
+    }
+    int result = main_common(hInstance, nCmdShow, argc, argv);
+    for (int i = 0; i < argc; ++i) {
+       sk_free(argv[i]);
+    }
+    return result;
+}
+
+int main(int argc, char**argv) {
+    return main_common(GetModuleHandle(NULL), SW_SHOW, argc, argv);
+}
+
+static int main_common(HINSTANCE hInstance, int show, int argc, char**argv) {
+    const TCHAR* windowClass = register_class(hInstance);
+
+    application_init();
+
+    SkOSWindow::WindowInit winInit;
+    winInit.fInstance = hInstance;
+    winInit.fClass = windowClass;
+
+    create_sk_window(&winInit, argc, argv);
+    SkOSWindow::ForAllWindows([show](void* hWnd, SkOSWindow**) {
+        ShowWindow((HWND)hWnd, show);
+        UpdateWindow((HWND)hWnd); }
+    );
 
     MSG msg;
-
-    // Initialize global strings
-    MyRegisterClass(hInstance);
-
-    // Perform application initialization:
-    if (!InitInstance (hInstance, nCmdShow, lpCmdLine))
-    {
-        return FALSE;
-    }
-
-    // Main message loop:
-    while (GetMessage(&msg, NULL, 0, 0))
-    {
-        if (true)
-        {
+    // Main message loop
+    while (GetMessage(&msg, NULL, 0, 0)) {
+        if (true) {
             TranslateMessage(&msg);
             DispatchMessage(&msg);
         }
@@ -56,152 +111,24 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
     return (int) msg.wParam;
 }
 
-
-
-//
-//  FUNCTION: MyRegisterClass()
-//
-//  PURPOSE: Registers the window class.
-//
-//  COMMENTS:
-//
-//    This function and its usage are only necessary if you want this code
-//    to be compatible with Win32 systems prior to the 'RegisterClassEx'
-//    function that was added to Windows 95. It is important to call this function
-//    so that the application will get 'well formed' small icons associated
-//    with it.
-//
-ATOM MyRegisterClass(HINSTANCE hInstance)
-{
-    WNDCLASSEX wcex;
-
-    wcex.cbSize = sizeof(WNDCLASSEX);
-
-    wcex.style            = CS_HREDRAW | CS_VREDRAW;
-    wcex.lpfnWndProc    = WndProc;
-    wcex.cbClsExtra        = 0;
-    wcex.cbWndExtra        = 0;
-    wcex.hInstance        = hInstance;
-    wcex.hIcon            = NULL;
-    wcex.hCursor        = NULL;
-    wcex.hbrBackground    = (HBRUSH)(COLOR_WINDOW+1);
-    wcex.lpszMenuName    = NULL;
-    wcex.lpszClassName    = szWindowClass;
-    wcex.hIconSm        = NULL;
-
-    return RegisterClassEx(&wcex);
-}
-
-#include "SkOSWindow_Win.h"
 extern SkOSWindow* create_sk_window(void* hwnd, int argc, char** argv);
 
-static SkOSWindow* gSkWind;
-
-char* tchar_to_utf8(const TCHAR* str) {
-#ifdef _UNICODE
-    int size = WideCharToMultiByte(CP_UTF8, 0, str, wcslen(str), NULL, 0, NULL, NULL);
-    char* str8 = (char*) malloc(size+1);
-    WideCharToMultiByte(CP_UTF8, 0, str, wcslen(str), str8, size, NULL, NULL);
-    str8[size] = '\0';
-    return str8;
-#else
-    return _strdup(str);
-#endif
-}
-
-//
-//   FUNCTION: InitInstance(HINSTANCE, int, LPTSTR)
-//
-//   PURPOSE: Saves instance handle and creates main window
-//
-//   COMMENTS:
-//
-//        In this function, we save the instance handle in a global variable and
-//        create and display the main program window.
-//
-
-
-BOOL InitInstance(HINSTANCE hInstance, int nCmdShow, LPTSTR lpCmdLine)
-{
-   application_init();
-
-   hInst = hInstance; // Store instance handle in our global variable
-
-   HWND hWnd = CreateWindow(szWindowClass, szTitle, WS_OVERLAPPEDWINDOW,
-                            CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, NULL, NULL, hInstance, NULL);
-
-   if (!hWnd)
-   {
-      return FALSE;
-   }
-
-   char* argv[4096];
-   int argc = 0;
-   TCHAR exename[1024], *next;
-   int exenameLen = GetModuleFileName(NULL, exename, SK_ARRAY_COUNT(exename));
-   // we're ignoring the possibility that the exe name exceeds the exename buffer
-   (void) exenameLen;
-   argv[argc++] = tchar_to_utf8(exename);
-   TCHAR* arg = _tcstok_s(lpCmdLine, _T(" "), &next);
-   while (arg != NULL) {
-      argv[argc++] = tchar_to_utf8(arg);
-      arg = _tcstok_s(NULL, _T(" "), &next);
-   }
-
-   gSkWind = create_sk_window(hWnd, argc, argv);
-   for (int i = 0; i < argc; ++i) {
-      free(argv[i]);
-   }
-   ShowWindow(hWnd, nCmdShow);
-   UpdateWindow(hWnd);
-
-   return TRUE;
-}
-
-//
-//  FUNCTION: WndProc(HWND, UINT, WPARAM, LPARAM)
-//
-//  PURPOSE:  Processes messages for the main window.
-//
-//  WM_COMMAND    - process the application menu
-//  WM_PAINT    - Paint the main window
-//  WM_DESTROY    - post a quit message and return
-//
-//
-LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
+LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
     switch (message) {
-    case WM_COMMAND:
-        return DefWindowProc(hWnd, message, wParam, lParam);
-    case WM_DESTROY:
-        PostQuitMessage(0);
-        break;
-    default:
-        if (gSkWind->wndProc(hWnd, message, wParam, lParam)) {
-            return 0;
-        } else {
+        case WM_COMMAND:
             return DefWindowProc(hWnd, message, wParam, lParam);
+        case WM_DESTROY:
+            PostQuitMessage(0);
+            break;
+        default: {
+            SkOSWindow* window = SkOSWindow::GetOSWindowForHWND(hWnd);
+            if (window && window->wndProc(hWnd, message, wParam, lParam)) {
+                return 0;
+            } else {
+                return DefWindowProc(hWnd, message, wParam, lParam);
+            }
         }
     }
     return 0;
 }
 
-// Message handler for about box.
-INT_PTR CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    UNREFERENCED_PARAMETER(lParam);
-    switch (message)
-    {
-    case WM_INITDIALOG:
-        return (INT_PTR)TRUE;
-
-    case WM_COMMAND:
-        if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL)
-        {
-            EndDialog(hDlg, LOWORD(wParam));
-            return (INT_PTR)TRUE;
-        }
-        break;
-    }
-    return (INT_PTR)FALSE;
-}
diff --git a/gfx/skia/skia/src/xml/SkBML_XMLParser.cpp b/gfx/skia/skia/src/xml/SkBML_XMLParser.cpp
index c0a5af55e568..1314608137bb 100644
--- a/gfx/skia/skia/src/xml/SkBML_XMLParser.cpp
+++ b/gfx/skia/skia/src/xml/SkBML_XMLParser.cpp
@@ -41,7 +41,7 @@ static void set(char* array[256], int index, SkStream& s, int data)
 
     size_t size = rdata(s, data);
 
-    if (array[index] == NULL)
+    if (array[index] == nullptr)
         array[index] = (char*)sk_malloc_throw(size + 1);
     else
     {
diff --git a/gfx/skia/skia/src/xml/SkDOM.cpp b/gfx/skia/skia/src/xml/SkDOM.cpp
index 98546089fa28..68e2938d9a34 100644
--- a/gfx/skia/skia/src/xml/SkDOM.cpp
+++ b/gfx/skia/skia/src/xml/SkDOM.cpp
@@ -8,11 +8,12 @@
 
 
 #include "SkDOM.h"
+#include "SkStream.h"
+#include "SkXMLWriter.h"
 
 /////////////////////////////////////////////////////////////////////////
 
 #include "SkXMLParser.h"
-
 bool SkXMLParser::parse(const SkDOM& dom, const SkDOMNode* node)
 {
     const char* elemName = dom.getName(node);
@@ -23,15 +24,15 @@ bool SkXMLParser::parse(const SkDOM& dom, const SkDOMNode* node)
     SkDOM::AttrIter iter(dom, node);
     const char*     name, *value;
 
-    while ((name = iter.next(&value)) != NULL)
+    while ((name = iter.next(&value)) != nullptr)
         if (this->addAttribute(name, value))
             return false;
 
-    if ((node = dom.getFirstChild(node)) != NULL)
+    if ((node = dom.getFirstChild(node)) != nullptr)
         do {
             if (!this->parse(dom, node))
                 return false;
-        } while ((node = dom.getNextSibling(node)) != NULL);
+        } while ((node = dom.getNextSibling(node)) != nullptr);
 
     return !this->endElement(elemName);
 }
@@ -65,7 +66,7 @@ struct SkDOMNode {
 
 #define kMinChunkSize   512
 
-SkDOM::SkDOM() : fAlloc(kMinChunkSize), fRoot(NULL)
+SkDOM::SkDOM() : fAlloc(kMinChunkSize), fRoot(nullptr)
 {
 }
 
@@ -85,7 +86,7 @@ const SkDOM::Node* SkDOM::getFirstChild(const Node* node, const char name[]) con
 
     if (name)
     {
-        for (; child != NULL; child = child->fNextSibling)
+        for (; child != nullptr; child = child->fNextSibling)
             if (!strcmp(name, child->fName))
                 break;
     }
@@ -98,7 +99,7 @@ const SkDOM::Node* SkDOM::getNextSibling(const Node* node, const char name[]) co
     const Node* sibling = node->fNextSibling;
     if (name)
     {
-        for (; sibling != NULL; sibling = sibling->fNextSibling)
+        for (; sibling != nullptr; sibling = sibling->fNextSibling)
             if (!strcmp(name, sibling->fName))
                 break;
     }
@@ -129,22 +130,22 @@ const char* SkDOM::findAttr(const Node* node, const char name[]) const
             return attr->fValue;
         attr += 1;
     }
-    return NULL;
+    return nullptr;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////
 
 const SkDOM::Attr* SkDOM::getFirstAttr(const Node* node) const
 {
-    return node->fAttrCount ? node->attrs() : NULL;
+    return node->fAttrCount ? node->attrs() : nullptr;
 }
 
 const SkDOM::Attr* SkDOM::getNextAttr(const Node* node, const Attr* attr) const
 {
     SkASSERT(node);
-    if (attr == NULL)
-        return NULL;
-    return (attr - node->attrs() + 1) < node->fAttrCount ? attr + 1 : NULL;
+    if (attr == nullptr)
+        return nullptr;
+    return (attr - node->attrs() + 1) < node->fAttrCount ? attr + 1 : nullptr;
 }
 
 const char* SkDOM::getAttrName(const Node* node, const Attr* attr) const
@@ -172,7 +173,7 @@ SkDOM::AttrIter::AttrIter(const SkDOM&, const SkDOM::Node* node)
 
 const char* SkDOM::AttrIter::next(const char** value)
 {
-    const char* name = NULL;
+    const char* name = nullptr;
 
     if (fAttr < fStop)
     {
@@ -199,32 +200,35 @@ static char* dupstr(SkChunkAlloc* chunk, const char src[])
 }
 
 class SkDOMParser : public SkXMLParser {
-    bool fNeedToFlush;
 public:
     SkDOMParser(SkChunkAlloc* chunk) : SkXMLParser(&fParserError), fAlloc(chunk)
     {
-        fRoot = NULL;
+        fAlloc->reset();
+        fRoot = nullptr;
         fLevel = 0;
         fNeedToFlush = true;
     }
     SkDOM::Node* getRoot() const { return fRoot; }
     SkXMLParserError fParserError;
+
 protected:
     void flushAttributes()
     {
+        SkASSERT(fLevel > 0);
+
         int attrCount = fAttrs.count();
 
         SkDOM::Node* node = (SkDOM::Node*)fAlloc->alloc(sizeof(SkDOM::Node) + attrCount * sizeof(SkDOM::Attr),
                                                         SkChunkAlloc::kThrow_AllocFailType);
 
         node->fName = fElemName;
-        node->fFirstChild = NULL;
+        node->fFirstChild = nullptr;
         node->fAttrCount = SkToU16(attrCount);
-        node->fType = SkDOM::kElement_Type;
+        node->fType = fElemType;
 
-        if (fRoot == NULL)
+        if (fRoot == nullptr)
         {
-            node->fNextSibling = NULL;
+            node->fNextSibling = nullptr;
             fRoot = node;
         }
         else    // this adds siblings in reverse order. gets corrected in onEndElement()
@@ -240,24 +244,20 @@ protected:
         fAttrs.reset();
 
     }
-    virtual bool onStartElement(const char elem[])
-    {
-        if (fLevel > 0 && fNeedToFlush)
-            this->flushAttributes();
-        fNeedToFlush = true;
-        fElemName = dupstr(fAlloc, elem);
-        ++fLevel;
+
+    bool onStartElement(const char elem[]) override {
+        this->startCommon(elem, SkDOM::kElement_Type);
         return false;
     }
-    virtual bool onAddAttribute(const char name[], const char value[])
-    {
+
+    bool onAddAttribute(const char name[], const char value[]) override {
         SkDOM::Attr* attr = fAttrs.append();
         attr->fName = dupstr(fAlloc, name);
         attr->fValue = dupstr(fAlloc, value);
         return false;
     }
-    virtual bool onEndElement(const char elem[])
-    {
+
+    bool onEndElement(const char elem[]) override {
         --fLevel;
         if (fNeedToFlush)
             this->flushAttributes();
@@ -268,7 +268,7 @@ protected:
         fParentStack.pop(&parent);
 
         SkDOM::Node* child = parent->fFirstChild;
-        SkDOM::Node* prev = NULL;
+        SkDOM::Node* prev = nullptr;
         while (child)
         {
             SkDOM::Node* next = child->fNextSibling;
@@ -279,27 +279,47 @@ protected:
         parent->fFirstChild = prev;
         return false;
     }
+
+    bool onText(const char text[], int len) override {
+        SkString str(text, len);
+        this->startCommon(str.c_str(), SkDOM::kText_Type);
+        this->SkDOMParser::onEndElement(str.c_str());
+
+        return false;
+    }
+
 private:
+    void startCommon(const char elem[], SkDOM::Type type) {
+        if (fLevel > 0 && fNeedToFlush)
+            this->flushAttributes();
+
+        fNeedToFlush = true;
+        fElemName = dupstr(fAlloc, elem);
+        fElemType = type;
+        ++fLevel;
+    }
+
     SkTDArray<SkDOM::Node*> fParentStack;
-    SkChunkAlloc*   fAlloc;
-    SkDOM::Node*    fRoot;
+    SkChunkAlloc*           fAlloc;
+    SkDOM::Node*            fRoot;
+    bool                    fNeedToFlush;
 
     // state needed for flushAttributes()
     SkTDArray<SkDOM::Attr>  fAttrs;
     char*                   fElemName;
+    SkDOM::Type             fElemType;
     int                     fLevel;
 };
 
 const SkDOM::Node* SkDOM::build(const char doc[], size_t len)
 {
-    fAlloc.reset();
     SkDOMParser parser(&fAlloc);
     if (!parser.parse(doc, len))
     {
         SkDEBUGCODE(SkDebugf("xml parse error, line %d\n", parser.fParserError.getLineNumber());)
-        fRoot = NULL;
+        fRoot = nullptr;
         fAlloc.reset();
-        return NULL;
+        return nullptr;
     }
     fRoot = parser.getRoot();
     return fRoot;
@@ -310,20 +330,25 @@ const SkDOM::Node* SkDOM::build(const char doc[], size_t len)
 static void walk_dom(const SkDOM& dom, const SkDOM::Node* node, SkXMLParser* parser)
 {
     const char* elem = dom.getName(node);
+    if (dom.getType(node) == SkDOM::kText_Type) {
+        SkASSERT(dom.countChildren(node) == 0);
+        parser->text(elem, SkToInt(strlen(elem)));
+        return;
+    }
 
     parser->startElement(elem);
 
     SkDOM::AttrIter iter(dom, node);
     const char*     name;
     const char*     value;
-    while ((name = iter.next(&value)) != NULL)
+    while ((name = iter.next(&value)) != nullptr)
         parser->addAttribute(name, value);
 
-    node = dom.getFirstChild(node, NULL);
+    node = dom.getFirstChild(node, nullptr);
     while (node)
     {
         walk_dom(dom, node, parser);
-        node = dom.getNextSibling(node, NULL);
+        node = dom.getNextSibling(node, nullptr);
     }
 
     parser->endElement(elem);
@@ -331,7 +356,6 @@ static void walk_dom(const SkDOM& dom, const SkDOM::Node* node, SkXMLParser* par
 
 const SkDOM::Node* SkDOM::copy(const SkDOM& dom, const SkDOM::Node* node)
 {
-    fAlloc.reset();
     SkDOMParser parser(&fAlloc);
 
     walk_dom(dom, node, &parser);
@@ -340,6 +364,21 @@ const SkDOM::Node* SkDOM::copy(const SkDOM& dom, const SkDOM::Node* node)
     return fRoot;
 }
 
+SkXMLParser* SkDOM::beginParsing() {
+    SkASSERT(!fParser);
+    fParser.reset(new SkDOMParser(&fAlloc));
+
+    return fParser.get();
+}
+
+const SkDOM::Node* SkDOM::finishParsing() {
+    SkASSERT(fParser);
+    fRoot = fParser->getRoot();
+    fParser.free();
+
+    return fRoot;
+}
+
 //////////////////////////////////////////////////////////////////////////
 
 int SkDOM::countChildren(const Node* node, const char elem[]) const
@@ -427,41 +466,14 @@ bool SkDOM::hasBool(const Node* node, const char name[], bool target) const
 
 #ifdef SK_DEBUG
 
-static void tab(int level)
-{
-    while (--level >= 0)
-        SkDebugf("\t");
-}
-
 void SkDOM::dump(const Node* node, int level) const
 {
-    if (node == NULL)
+    if (node == nullptr)
         node = this->getRootNode();
-    if (node)
-    {
-        tab(level);
-        SkDebugf("<%s", this->getName(node));
 
-        const Attr* attr = node->attrs();
-        const Attr* stop = attr + node->fAttrCount;
-        for (; attr < stop; attr++)
-            SkDebugf(" %s=\"%s\"", attr->fName, attr->fValue);
-
-        const Node* child = this->getFirstChild(node);
-        if (child)
-        {
-            SkDebugf(">\n");
-            while (child)
-            {
-                this->dump(child, level+1);
-                child = this->getNextSibling(child);
-            }
-            tab(level);
-            SkDebugf("</%s>\n", node->fName);
-        }
-        else
-            SkDebugf("/>\n");
-    }
+    SkDebugWStream debugStream;
+    SkXMLStreamWriter xmlWriter(&debugStream);
+    xmlWriter.writeDOM(*this, node, false);
 }
 
 void SkDOM::UnitTest()
@@ -481,7 +493,7 @@ void SkDOM::UnitTest()
 
     SkDOM   dom;
 
-    SkASSERT(dom.getRootNode() == NULL);
+    SkASSERT(dom.getRootNode() == nullptr);
 
     const Node* root = dom.build(gDoc, sizeof(gDoc) - 1);
     SkASSERT(root && dom.getRootNode() == root);
@@ -491,7 +503,7 @@ void SkDOM::UnitTest()
     v = dom.findAttr(root, "b");
     SkASSERT(v && !strcmp(v, "2"));
     v = dom.findAttr(root, "c");
-    SkASSERT(v == NULL);
+    SkASSERT(v == nullptr);
 
     SkASSERT(dom.getFirstChild(root, "elem1"));
     SkASSERT(!dom.getFirstChild(root, "subelem1"));
diff --git a/gfx/skia/skia/src/xml/SkJS.cpp b/gfx/skia/skia/src/xml/SkJS.cpp
deleted file mode 100644
index 8167c9c1eaf6..000000000000
--- a/gfx/skia/skia/src/xml/SkJS.cpp
+++ /dev/null
@@ -1,228 +0,0 @@
-
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#include <jsapi.h>
-
-#include "SkJS.h"
-#include "SkString.h"
-
-#ifdef _WIN32_WCE
-extern "C" {
-    void abort() {
-        SkASSERT(0);
-    }
-
-    unsigned int _control87(unsigned int _new, unsigned int mask ) {
-        SkASSERT(0);
-        return 0;
-    }
-
-    time_t mktime(struct tm *timeptr ) {
-        SkASSERT(0);
-        return 0;
-    }
-
-//  int errno;
-
-    char *strdup(const char *) {
-        SkASSERT(0);
-        return 0;
-    }
-
-    char *strerror(int errnum) {
-        SkASSERT(0);
-        return 0;
-    }
-
-    int isatty(void* fd) {
-        SkASSERT(0);
-        return 0;
-    }
-
-    int putenv(const char *envstring) {
-        SkASSERT(0);
-        return 0;
-    }
-
-    char *getenv(const char *varname) {
-        SkASSERT(0);
-        return 0;
-    }
-
-    void GetSystemTimeAsFileTime(LPFILETIME lpSystemTimeAsFileTime) {
-        SkASSERT(0);
-    }
-
-    struct tm * localtime(const time_t *timer) {
-        SkASSERT(0);
-        return 0;
-    }
-
-    size_t strftime(char *strDest, size_t maxsize, const char *format,
-        const struct tm *timeptr ) {
-        SkASSERT(0);
-        return 0;
-    }
-
-}
-#endif
-
-static JSBool
-global_enumerate(JSContext *cx, JSObject *obj)
-{
-#ifdef LAZY_STANDARD_CLASSES
-    return JS_EnumerateStandardClasses(cx, obj);
-#else
-    return JS_TRUE;
-#endif
-}
-
-static JSBool
-global_resolve(JSContext *cx, JSObject *obj, jsval id, uintN flags, JSObject **objp)
-{
-#ifdef LAZY_STANDARD_CLASSES
-    if ((flags & JSRESOLVE_ASSIGNING) == 0) {
-        JSBool resolved;
-
-        if (!JS_ResolveStandardClass(cx, obj, id, &resolved))
-            return JS_FALSE;
-        if (resolved) {
-            *objp = obj;
-            return JS_TRUE;
-        }
-    }
-#endif
-
-#if defined(SHELL_HACK) && defined(DEBUG) && defined(XP_UNIX)
-    if ((flags & (JSRESOLVE_QUALIFIED | JSRESOLVE_ASSIGNING)) == 0) {
-        /*
-         * Do this expensive hack only for unoptimized Unix builds, which are
-         * not used for benchmarking.
-         */
-        char *path, *comp, *full;
-        const char *name;
-        JSBool ok, found;
-        JSFunction *fun;
-
-        if (!JSVAL_IS_STRING(id))
-            return JS_TRUE;
-        path = getenv("PATH");
-        if (!path)
-            return JS_TRUE;
-        path = JS_strdup(cx, path);
-        if (!path)
-            return JS_FALSE;
-        name = JS_GetStringBytes(JSVAL_TO_STRING(id));
-        ok = JS_TRUE;
-        for (comp = strtok(path, ":"); comp; comp = strtok(NULL, ":")) {
-            if (*comp != '\0') {
-                full = JS_smprintf("%s/%s", comp, name);
-                if (!full) {
-                    JS_ReportOutOfMemory(cx);
-                    ok = JS_FALSE;
-                    break;
-                }
-            } else {
-                full = (char *)name;
-            }
-            found = (access(full, X_OK) == 0);
-            if (*comp != '\0')
-                free(full);
-            if (found) {
-                fun = JS_DefineFunction(cx, obj, name, Exec, 0, JSPROP_ENUMERATE);
-                ok = (fun != NULL);
-                if (ok)
-                    *objp = obj;
-                break;
-            }
-        }
-        JS_free(cx, path);
-        return ok;
-    }
-#else
-    return JS_TRUE;
-#endif
-}
-
-JSClass global_class = {
-    "global", JSCLASS_NEW_RESOLVE,
-    JS_PropertyStub,  JS_PropertyStub,
-    JS_PropertyStub,  JS_PropertyStub,
-    global_enumerate, (JSResolveOp) global_resolve,
-    JS_ConvertStub,   JS_FinalizeStub
-};
-
-SkJS::SkJS(void* hwnd) : SkOSWindow(hwnd) {
-    if ((fRuntime = JS_NewRuntime(0x100000)) == NULL) {
-        SkASSERT(0);
-        return;
-    }
-    if ((fContext = JS_NewContext(fRuntime, 0x1000)) == NULL) {
-        SkASSERT(0);
-        return;
-    }
-    ;
-    if ((fGlobal = JS_NewObject(fContext, &global_class, NULL, NULL)) == NULL) {
-        SkASSERT(0);
-        return;
-    }
-    if (JS_InitStandardClasses(fContext, fGlobal) == NULL) {
-        SkASSERT(0);
-        return;
-    }
-    setConfig(SkBitmap::kARGB32_Config);
-    updateSize();
-    setVisibleP(true);
-    InitializeDisplayables(getBitmap(), fContext, fGlobal, NULL);
-}
-
-SkJS::~SkJS() {
-    DisposeDisplayables();
-    JS_DestroyContext(fContext);
-    JS_DestroyRuntime(fRuntime);
-    JS_ShutDown();
-}
-
-SkBool SkJS::EvaluateScript(const char* script, jsval* rVal) {
-    return JS_EvaluateScript(fContext, fGlobal, script, strlen(script),
-        "memory" /* no file name */, 0 /* no line number */, rVal);
-}
-
-SkBool SkJS::ValueToString(jsval value, SkString* string) {
-     JSString* str = JS_ValueToString(fContext, value);
-     if (str == NULL)
-         return false;
-     string->set(JS_GetStringBytes(str));
-     return true;
-}
-
-#ifdef SK_DEBUG
-void SkJS::Test(void* hwnd) {
-    SkJS js(hwnd);
-    jsval val;
-    SkBool success = js.EvaluateScript("22/7", &val);
-    SkASSERT(success);
-    SkString string;
-    success = js.ValueToString(val, &string);
-    SkASSERT(success);
-    SkASSERT(strcmp(string.c_str(), "3.142857142857143") == 0);
-    success = js.EvaluateScript(
-        "var rect = new rectangle();"
-        "rect.left = 4;"
-        "rect.top = 10;"
-        "rect.right = 20;"
-        "rect.bottom = 30;"
-        "rect.width = rect.height + 20;"
-        "rect.draw();"
-        , &val);
-    SkASSERT(success);
-    success = js.ValueToString(val, &string);
-    SkASSERT(success);
-}
-#endifASSERT(success);
diff --git a/gfx/skia/skia/src/xml/SkJSDisplayable.cpp b/gfx/skia/skia/src/xml/SkJSDisplayable.cpp
deleted file mode 100644
index 02a05016727c..000000000000
--- a/gfx/skia/skia/src/xml/SkJSDisplayable.cpp
+++ /dev/null
@@ -1,452 +0,0 @@
-
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#include <jsapi.h>
-#include "SkJS.h"
-#include "SkDisplayType.h"
-//#include "SkAnimateColor.h"
-#include "SkAnimateMaker.h"
-#include "SkAnimateSet.h"
-//#include "SkAnimateTransform.h"
-#include "SkCanvas.h"
-//#include "SkDimensions.h"
-#include "SkDisplayAdd.h"
-#include "SkDisplayApply.h"
-//#include "SkDisplayBefore.h"
-#include "SkDisplayEvent.h"
-//#include "SkDisplayFocus.h"
-#include "SkDisplayInclude.h"
-#include "SkDisplayPost.h"
-#include "SkDisplayRandom.h"
-#include "SkDraw3D.h"
-#include "SkDrawBitmap.h"
-#include "SkDrawClip.h"
-#include "SkDrawDash.h"
-#include "SkDrawDiscrete.h"
-#include "SkDrawEmboss.h"
-//#include "SkDrawFont.h"
-#include "SkDrawFull.h"
-#include "SkDrawGradient.h"
-#include "SkDrawLine.h"
-//#include "SkDrawMaskFilter.h"
-#include "SkDrawMatrix.h"
-#include "SkDrawOval.h"
-#include "SkDrawPaint.h"
-#include "SkDrawPath.h"
-#include "SkDrawPoint.h"
-// #include "SkDrawStroke.h"
-#include "SkDrawText.h"
-#include "SkDrawTo.h"
-//#include "SkDrawTransferMode.h"
-#include "SkDrawTransparentShader.h"
-//#include "SkDrawUse.h"
-#include "SkMatrixParts.h"
-#include "SkPathParts.h"
-#include "SkPostParts.h"
-#include "SkScript.h"
-#include "SkSnapshot.h"
-#include "SkTextOnPath.h"
-#include "SkTextToPath.h"
-
-
-class SkJSDisplayable {
-public:
-    SkJSDisplayable() : fDisplayable(NULL) {}
-    ~SkJSDisplayable() { delete fDisplayable; }
-    static void Destructor(JSContext *cx, JSObject *obj);
-    static JSBool GetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
-    static JSBool SetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
-    static SkCanvas* gCanvas;
-    static SkPaint* gPaint;
-    static JSBool Draw(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-    SkDisplayable* fDisplayable;
-};
-
-SkCanvas* SkJSDisplayable::gCanvas;
-SkPaint* SkJSDisplayable::gPaint;
-
-JSBool SkJSDisplayable::Draw(JSContext *cx, JSObject *obj, uintN argc,
-                                    jsval *argv, jsval *rval)
-{
-    SkJSDisplayable *p = (SkJSDisplayable*) JS_GetPrivate(cx, obj);
-    SkASSERT(p->fDisplayable->isDrawable());
-    SkDrawable* drawable = (SkDrawable*) p->fDisplayable;
-    SkAnimateMaker maker(NULL, gCanvas, gPaint);
-    drawable->draw(maker);
-    return JS_TRUE;
-}
-
-
-JSFunctionSpec SkJSDisplayable_methods[] =
-{
-    { "draw", SkJSDisplayable::Draw, 1, 0, 0 },
-    { 0 }
-};
-
-static JSPropertySpec* gDisplayableProperties[kNumberOfTypes];
-static JSClass gDisplayableClasses[kNumberOfTypes];
-
-#define JS_INIT(_prefix, _class) \
-static JSBool _class##Constructor(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { \
-    SkJSDisplayable* jsDisplayable = new SkJSDisplayable(); \
-    jsDisplayable->fDisplayable = new _prefix##_class(); \
-    JS_SetPrivate(cx, obj, (void*) jsDisplayable); \
-    return JS_TRUE; \
-} \
-    \
-static JSObject* _class##Init(JSContext *cx, JSObject *obj, JSObject *proto) { \
-    JSObject *newProtoObj = JS_InitClass(cx, obj, proto, &gDisplayableClasses[SkType_##_class], \
-        _class##Constructor, 0, \
-        NULL, SkJSDisplayable_methods , \
-        NULL, NULL); \
-    JS_DefineProperties(cx, newProtoObj, gDisplayableProperties[SkType_##_class]); \
-    return newProtoObj; \
-}
-
-JS_INIT(Sk, Add)
-JS_INIT(Sk, AddCircle)
-JS_INIT(Sk, AddOval)
-JS_INIT(Sk, AddPath)
-JS_INIT(Sk, AddRectangle)
-JS_INIT(Sk, AddRoundRect)
-//JS_INIT(Sk, After)
-JS_INIT(Sk, Apply)
-// JS_INIT(Sk, Animate)
-//JS_INIT(Sk, AnimateColor)
-JS_INIT(Sk, AnimateField)
-//JS_INIT(Sk, AnimateRotate)
-//JS_INIT(Sk, AnimateScale)
-//JS_INIT(Sk, AnimateTranslate)
-JS_INIT(SkDraw, Bitmap)
-JS_INIT(Sk, BaseBitmap)
-//JS_INIT(Sk, Before)
-JS_INIT(SkDraw, BitmapShader)
-JS_INIT(SkDraw, Blur)
-JS_INIT(SkDraw, Clip)
-JS_INIT(SkDraw, Color)
-JS_INIT(Sk, CubicTo)
-JS_INIT(Sk, Dash)
-JS_INIT(Sk, Data)
-//JS_INIT(Sk, Dimensions)
-JS_INIT(Sk, Discrete)
-JS_INIT(Sk, DrawTo)
-JS_INIT(SkDraw, Emboss)
-JS_INIT(SkDisplay, Event)
-// JS_INIT(SkDraw, Font)
-// JS_INIT(Sk, Focus)
-JS_INIT(Sk, Image)
-JS_INIT(Sk, Include)
-// JS_INIT(Sk, Input)
-JS_INIT(Sk, Line)
-JS_INIT(Sk, LinearGradient)
-JS_INIT(Sk, LineTo)
-JS_INIT(SkDraw, Matrix)
-JS_INIT(Sk, Move)
-JS_INIT(Sk, MoveTo)
-JS_INIT(Sk, Oval)
-JS_INIT(SkDraw, Path)
-JS_INIT(SkDraw, Paint)
-JS_INIT(Sk, DrawPoint)
-JS_INIT(Sk, PolyToPoly)
-JS_INIT(Sk, Polygon)
-JS_INIT(Sk, Polyline)
-JS_INIT(Sk, Post)
-JS_INIT(Sk, QuadTo)
-JS_INIT(Sk, RadialGradient)
-JS_INIT(SkDisplay, Random)
-JS_INIT(Sk, RectToRect)
-JS_INIT(Sk, Rectangle)
-JS_INIT(Sk, Remove)
-JS_INIT(Sk, Replace)
-JS_INIT(Sk, Rotate)
-JS_INIT(Sk, RoundRect)
-JS_INIT(Sk, Scale)
-JS_INIT(Sk, Set)
-JS_INIT(Sk, Skew)
-// JS_INIT(Sk, 3D_Camera)
-// JS_INIT(Sk, 3D_Patch)
-JS_INIT(Sk, Snapshot)
-// JS_INIT(SkDraw, Stroke)
-JS_INIT(Sk, Text)
-JS_INIT(Sk, TextOnPath)
-JS_INIT(Sk, TextToPath)
-JS_INIT(Sk, Translate)
-//JS_INIT(Sk, Use)
-
-#if SK_USE_CONDENSED_INFO == 0
-static void GenerateTables() {
-    for (int index = 0; index < kTypeNamesSize; index++) {
-        int infoCount;
-        SkDisplayTypes type = gTypeNames[index].fType;
-        const SkMemberInfo* info = SkDisplayType::GetMembers(NULL /* fMaker */, type, &infoCount);
-        if (info == NULL)
-            continue;
-        gDisplayableProperties[type] = new JSPropertySpec[infoCount + 1];
-        JSPropertySpec* propertySpec = gDisplayableProperties[type];
-        memset(propertySpec, 0, sizeof (JSPropertySpec) * (infoCount + 1));
-        for (int inner = 0; inner < infoCount; inner++) {
-            if (info[inner].fType == SkType_BaseClassInfo)
-                continue;
-            propertySpec[inner].name = info[inner].fName;
-            propertySpec[inner].tinyid = inner;
-            propertySpec[inner].flags = JSPROP_ENUMERATE;
-        }
-        gDisplayableClasses[type].name = gTypeNames[index].fName;
-        gDisplayableClasses[type].flags = JSCLASS_HAS_PRIVATE;
-        gDisplayableClasses[type].addProperty = JS_PropertyStub;
-        gDisplayableClasses[type].delProperty = JS_PropertyStub;
-        gDisplayableClasses[type].getProperty = SkJSDisplayable::GetProperty;
-        gDisplayableClasses[type].setProperty = SkJSDisplayable::SetProperty;
-        gDisplayableClasses[type].enumerate = JS_EnumerateStub;
-        gDisplayableClasses[type].resolve = JS_ResolveStub;
-        gDisplayableClasses[type].convert = JS_ConvertStub;
-        gDisplayableClasses[type].finalize = SkJSDisplayable::Destructor;
-    }
-}
-#endif
-
-void SkJSDisplayable::Destructor(JSContext *cx, JSObject *obj) {
-    delete (SkJSDisplayable*) JS_GetPrivate(cx, obj);
-}
-
-JSBool SkJSDisplayable::GetProperty(JSContext *cx, JSObject *obj, jsval id,
-                                 jsval *vp)
-{
-    if (JSVAL_IS_INT(id) == 0)
-        return JS_TRUE;
-    SkJSDisplayable *p = (SkJSDisplayable *) JS_GetPrivate(cx, obj);
-    SkDisplayable* displayable = p->fDisplayable;
-    SkDisplayTypes displayableType = displayable->getType();
-    int members;
-    const SkMemberInfo* info = SkDisplayType::GetMembers(NULL /* fMaker */, displayableType, &members);
-    int idIndex = JSVAL_TO_INT(id);
-    SkASSERT(idIndex >= 0 && idIndex < members);
-    info = &info[idIndex];
-    SkDisplayTypes infoType = (SkDisplayTypes) info->fType;
-    SkScalar scalar = 0;
-    S32 s32 = 0;
-    SkString* string= NULL;
-    JSString *str;
-    if (infoType == SkType_MemberProperty) {
-        infoType = info->propertyType();
-        switch (infoType) {
-            case SkType_Scalar: {
-                SkScriptValue scriptValue;
-                bool success = displayable->getProperty(info->propertyIndex(), &scriptValue);
-                SkASSERT(scriptValue.fType == SkType_Scalar);
-                scalar = scriptValue.fOperand.fScalar;
-                } break;
-            default:
-                SkASSERT(0); // !!! unimplemented
-        }
-    } else {
-        SkASSERT(info->fCount == 1);
-        switch (infoType) {
-            case SkType_Boolean:
-            case SkType_Color:
-            case SkType_S32:
-                s32 = *(S32*) info->memberData(displayable);
-                break;
-            case SkType_String:
-                info->getString(displayable, &string);
-                break;
-            case SkType_Scalar:
-                SkOperand operand;
-                info->getValue(displayable, &operand, 1);
-                scalar = operand.fScalar;
-                break;
-            default:
-                SkASSERT(0); // !!! unimplemented
-        }
-    }
-    switch (infoType) {
-        case SkType_Boolean:
-            *vp = BOOLEAN_TO_JSVAL(s32);
-            break;
-        case SkType_Color:
-        case SkType_S32:
-            *vp = INT_TO_JSVAL(s32);
-            break;
-        case SkType_Scalar:
-            if (SkScalarFraction(scalar) == 0)
-                *vp = INT_TO_JSVAL(SkScalarFloor(scalar));
-            else
-            *vp = DOUBLE_TO_JSVAL(scalar);
-            break;
-        case SkType_String:
-            str = JS_NewStringCopyN(cx, string->c_str(), string->size());
-            *vp = STRING_TO_JSVAL(str);
-            break;
-        default:
-            SkASSERT(0); // !!! unimplemented
-    }
-    return JS_TRUE;
-}
-
-JSBool SkJSDisplayable::SetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) {
-    if (JSVAL_IS_INT(id) == 0)
-        return JS_TRUE;
-    SkJSDisplayable *p = (SkJSDisplayable *) JS_GetPrivate(cx, obj);
-    SkDisplayable* displayable = p->fDisplayable;
-    SkDisplayTypes displayableType = displayable->getType();
-    int members;
-    const SkMemberInfo* info = SkDisplayType::GetMembers(NULL /* fMaker */, displayableType, &members);
-    int idIndex = JSVAL_TO_INT(id);
-    SkASSERT(idIndex >= 0 && idIndex < members);
-    info = &info[idIndex];
-    SkDisplayTypes infoType = info->getType();
-    SkScalar scalar = 0;
-    S32 s32 = 0;
-    SkString string;
-    JSString* str;
-    jsval value = *vp;
-    switch (infoType) {
-        case SkType_Boolean:
-            s32 = JSVAL_TO_BOOLEAN(value);
-            break;
-        case SkType_Color:
-        case SkType_S32:
-            s32 = JSVAL_TO_INT(value);
-            break;
-        case SkType_Scalar:
-            if (JSVAL_IS_INT(value))
-                scalar = SkIntToScalar(JSVAL_TO_INT(value));
-            else {
-                SkASSERT(JSVAL_IS_DOUBLE(value));
-                scalar = (float) *(double*) JSVAL_TO_DOUBLE(value);
-            }
-            break;
-        case SkType_String:
-            str = JS_ValueToString(cx, value);
-            string.set(JS_GetStringBytes(str));
-            break;
-        default:
-            SkASSERT(0); // !!! unimplemented
-    }
-    if (info->fType == SkType_MemberProperty) {
-        switch (infoType) {
-            case SkType_Scalar: {
-                SkScriptValue scriptValue;
-                scriptValue.fType = SkType_Scalar;
-                scriptValue.fOperand.fScalar = scalar;
-                displayable->setProperty(-1 - (int) info->fOffset, scriptValue);
-                } break;
-            default:
-                SkASSERT(0); // !!! unimplemented
-        }
-    } else {
-        SkASSERT(info->fCount == 1);
-        switch (infoType) {
-            case SkType_Boolean:
-            case SkType_Color:
-            case SkType_S32:
-                s32 = *(S32*) ((const char*) displayable + info->fOffset);
-                break;
-            case SkType_String:
-                info->setString(displayable, &string);
-                break;
-            case SkType_Scalar:
-                SkOperand operand;
-                operand.fScalar = scalar;
-                info->setValue(displayable, &operand, 1);
-                break;
-            default:
-                SkASSERT(0); // !!! unimplemented
-        }
-    }
-    return JS_TRUE;
-}
-
-void SkJS::InitializeDisplayables(const SkBitmap& bitmap, JSContext *cx, JSObject *obj, JSObject *proto) {
-    SkJSDisplayable::gCanvas = new SkCanvas(bitmap);
-    SkJSDisplayable::gPaint = new SkPaint();
-#if SK_USE_CONDENSED_INFO == 0
-    GenerateTables();
-#else
-    SkASSERT(0); // !!! compressed version hasn't been implemented
-#endif
-    AddInit(cx, obj, proto);
-    AddCircleInit(cx, obj, proto);
-    AddOvalInit(cx, obj, proto);
-    AddPathInit(cx, obj, proto);
-    AddRectangleInit(cx, obj, proto);
-    AddRoundRectInit(cx, obj, proto);
-//  AfterInit(cx, obj, proto);
-    ApplyInit(cx, obj, proto);
-    // AnimateInit(cx, obj, proto);
-//  AnimateColorInit(cx, obj, proto);
-    AnimateFieldInit(cx, obj, proto);
-//  AnimateRotateInit(cx, obj, proto);
-//  AnimateScaleInit(cx, obj, proto);
-//  AnimateTranslateInit(cx, obj, proto);
-    BitmapInit(cx, obj, proto);
-//  BaseBitmapInit(cx, obj, proto);
-//  BeforeInit(cx, obj, proto);
-    BitmapShaderInit(cx, obj, proto);
-    BlurInit(cx, obj, proto);
-    ClipInit(cx, obj, proto);
-    ColorInit(cx, obj, proto);
-    CubicToInit(cx, obj, proto);
-    DashInit(cx, obj, proto);
-    DataInit(cx, obj, proto);
-//  DimensionsInit(cx, obj, proto);
-    DiscreteInit(cx, obj, proto);
-    DrawToInit(cx, obj, proto);
-    EmbossInit(cx, obj, proto);
-    EventInit(cx, obj, proto);
-//  FontInit(cx, obj, proto);
-//  FocusInit(cx, obj, proto);
-    ImageInit(cx, obj, proto);
-    IncludeInit(cx, obj, proto);
-//  InputInit(cx, obj, proto);
-    LineInit(cx, obj, proto);
-    LinearGradientInit(cx, obj, proto);
-    LineToInit(cx, obj, proto);
-    MatrixInit(cx, obj, proto);
-    MoveInit(cx, obj, proto);
-    MoveToInit(cx, obj, proto);
-    OvalInit(cx, obj, proto);
-    PathInit(cx, obj, proto);
-    PaintInit(cx, obj, proto);
-    DrawPointInit(cx, obj, proto);
-    PolyToPolyInit(cx, obj, proto);
-    PolygonInit(cx, obj, proto);
-    PolylineInit(cx, obj, proto);
-    PostInit(cx, obj, proto);
-    QuadToInit(cx, obj, proto);
-    RadialGradientInit(cx, obj, proto);
-    RandomInit(cx, obj, proto);
-    RectToRectInit(cx, obj, proto);
-    RectangleInit(cx, obj, proto);
-    RemoveInit(cx, obj, proto);
-    ReplaceInit(cx, obj, proto);
-    RotateInit(cx, obj, proto);
-    RoundRectInit(cx, obj, proto);
-    ScaleInit(cx, obj, proto);
-    SetInit(cx, obj, proto);
-    SkewInit(cx, obj, proto);
-    // 3D_CameraInit(cx, obj, proto);
-    // 3D_PatchInit(cx, obj, proto);
-    SnapshotInit(cx, obj, proto);
-//  StrokeInit(cx, obj, proto);
-    TextInit(cx, obj, proto);
-    TextOnPathInit(cx, obj, proto);
-    TextToPathInit(cx, obj, proto);
-    TranslateInit(cx, obj, proto);
-//  UseInit(cx, obj, proto);
-}
-
-void SkJS::DisposeDisplayables() {
-    delete SkJSDisplayable::gPaint;
-    delete SkJSDisplayable::gCanvas;
-    for (int index = 0; index < kTypeNamesSize; index++) {
-        SkDisplayTypes type = gTypeNames[index].fType;
-        delete[] gDisplayableProperties[type];
-    }
-}
diff --git a/gfx/skia/skia/src/xml/SkXMLParser.cpp b/gfx/skia/skia/src/xml/SkXMLParser.cpp
index 63929a94e2f2..e28365634ed9 100644
--- a/gfx/skia/skia/src/xml/SkXMLParser.cpp
+++ b/gfx/skia/skia/src/xml/SkXMLParser.cpp
@@ -51,7 +51,7 @@ void SkXMLParserError::reset() {
 
 ////////////////
 
-SkXMLParser::SkXMLParser(SkXMLParserError* parserError) : fParser(NULL), fError(parserError)
+SkXMLParser::SkXMLParser(SkXMLParserError* parserError) : fParser(nullptr), fError(parserError)
 {
 }
 
@@ -59,6 +59,21 @@ SkXMLParser::~SkXMLParser()
 {
 }
 
+bool SkXMLParser::parse(SkStream& docStream)
+{
+    return false;
+}
+
+bool SkXMLParser::parse(const char doc[], size_t len)
+{
+    return false;
+}
+
+void SkXMLParser::GetNativeErrorString(int error, SkString* str)
+{
+
+}
+
 bool SkXMLParser::startElement(const char elem[])
 {
     return this->onStartElement(elem);
diff --git a/gfx/skia/skia/src/xml/SkXMLPullParser.cpp b/gfx/skia/skia/src/xml/SkXMLPullParser.cpp
index ed042281a73f..34ad282cc7a1 100644
--- a/gfx/skia/skia/src/xml/SkXMLPullParser.cpp
+++ b/gfx/skia/skia/src/xml/SkXMLPullParser.cpp
@@ -16,13 +16,13 @@ static void reset(SkXMLPullParser::Curr* curr)
     curr->fIsWhitespace = false;
 }
 
-SkXMLPullParser::SkXMLPullParser() : fStream(NULL)
+SkXMLPullParser::SkXMLPullParser() : fStream(nullptr)
 {
     fCurr.fEventType = ERROR;
     fDepth = -1;
 }
 
-SkXMLPullParser::SkXMLPullParser(SkStream* stream) : fStream(NULL)
+SkXMLPullParser::SkXMLPullParser(SkStream* stream) : fStream(nullptr)
 {
     fCurr.fEventType = ERROR;
     fDepth = 0;
@@ -32,7 +32,7 @@ SkXMLPullParser::SkXMLPullParser(SkStream* stream) : fStream(NULL)
 
 SkXMLPullParser::~SkXMLPullParser()
 {
-    this->setStream(NULL);
+    this->setStream(nullptr);
 }
 
 SkStream* SkXMLPullParser::setStream(SkStream* stream)
@@ -89,7 +89,7 @@ const char* SkXMLPullParser::getName()
     case END_TAG:
         return fCurr.fName;
     default:
-        return NULL;
+        return nullptr;
     }
 }
 
@@ -100,7 +100,7 @@ const char* SkXMLPullParser::getText()
     case IGNORABLE_WHITESPACE:
         return fCurr.fName;
     default:
-        return NULL;
+        return nullptr;
     }
 }
 
diff --git a/gfx/skia/skia/src/xml/SkXMLWriter.cpp b/gfx/skia/skia/src/xml/SkXMLWriter.cpp
index ec351b728b84..5ee237ff68b4 100644
--- a/gfx/skia/skia/src/xml/SkXMLWriter.cpp
+++ b/gfx/skia/skia/src/xml/SkXMLWriter.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-
 #include "SkXMLWriter.h"
 #include "SkStream.h"
 
@@ -51,6 +49,16 @@ void SkXMLWriter::addScalarAttribute(const char name[], SkScalar value)
     this->addAttribute(name, tmp.c_str());
 }
 
+void SkXMLWriter::addText(const char text[], size_t length) {
+    if (fElems.isEmpty()) {
+        return;
+    }
+    
+    this->onAddText(text, length);
+    
+    fElems.top()->fHasText = true;
+}
+
 void SkXMLWriter::doEnd(Elem* elem)
 {
     delete elem;
@@ -63,9 +71,7 @@ bool SkXMLWriter::doStart(const char name[], size_t length)
     if (firstChild)
         fElems[level-1]->fHasChildren = true;
     Elem** elem = fElems.push();
-    *elem = new Elem;
-    (*elem)->fName.set(name, length);
-    (*elem)->fHasChildren = 0;
+    *elem = new Elem(name, length);
     return firstChild;
 }
 
@@ -140,7 +146,7 @@ void SkXMLWriter::addAttributeLen(const char name[], const char value[], size_t
 
     if (fDoEscapeMarkup)
     {
-        size_t   extra = escape_markup(NULL, value, length);
+        size_t   extra = escape_markup(nullptr, value, length);
         if (extra)
         {
             valueStr.resize(length + extra);
@@ -163,20 +169,27 @@ static void write_dom(const SkDOM& dom, const SkDOM::Node* node, SkXMLWriter* w,
 {
     if (!skipRoot)
     {
-        w->startElement(dom.getName(node));
+        const char* elem = dom.getName(node);
+        if (dom.getType(node) == SkDOM::kText_Type) {
+            SkASSERT(dom.countChildren(node) == 0);
+            w->addText(elem, strlen(elem));
+            return;
+        }
+
+        w->startElement(elem);
 
         SkDOM::AttrIter iter(dom, node);
         const char* name;
         const char* value;
-        while ((name = iter.next(&value)) != NULL)
+        while ((name = iter.next(&value)) != nullptr)
             w->addAttribute(name, value);
     }
 
-    node = dom.getFirstChild(node, NULL);
+    node = dom.getFirstChild(node, nullptr);
     while (node)
     {
         write_dom(dom, node, w, false);
-        node = dom.getNextSibling(node, NULL);
+        node = dom.getNextSibling(node, nullptr);
     }
 
     if (!skipRoot)
@@ -212,7 +225,7 @@ SkXMLStreamWriter::~SkXMLStreamWriter()
 
 void SkXMLStreamWriter::onAddAttributeLen(const char name[], const char value[], size_t length)
 {
-    SkASSERT(!fElems.top()->fHasChildren);
+    SkASSERT(!fElems.top()->fHasChildren && !fElems.top()->fHasText);
     fStream.writeText(" ");
     fStream.writeText(name);
     fStream.writeText("=\"");
@@ -220,18 +233,31 @@ void SkXMLStreamWriter::onAddAttributeLen(const char name[], const char value[],
     fStream.writeText("\"");
 }
 
+void SkXMLStreamWriter::onAddText(const char text[], size_t length) {
+    Elem* elem = fElems.top();
+
+    if (!elem->fHasChildren && !elem->fHasText) {
+        fStream.writeText(">");
+        fStream.newline();
+    }
+
+    tab(fStream, fElems.count() + 1);
+    fStream.write(text, length);
+    fStream.newline();
+}
+
 void SkXMLStreamWriter::onEndElement()
 {
     Elem* elem = getEnd();
-    if (elem->fHasChildren)
+    if (elem->fHasChildren || elem->fHasText)
     {
         tab(fStream, fElems.count());
         fStream.writeText("</");
         fStream.writeText(elem->fName.c_str());
         fStream.writeText(">");
-    }
-    else
+    } else {
         fStream.writeText("/>");
+    }
     fStream.newline();
     doEnd(elem);
 }
@@ -274,11 +300,15 @@ SkXMLParserWriter::~SkXMLParserWriter()
 
 void SkXMLParserWriter::onAddAttributeLen(const char name[], const char value[], size_t length)
 {
-    SkASSERT(fElems.count() == 0 || !fElems.top()->fHasChildren);
+    SkASSERT(fElems.count() == 0 || (!fElems.top()->fHasChildren && !fElems.top()->fHasText));
     SkString str(value, length);
     fParser.addAttribute(name, str.c_str());
 }
 
+void SkXMLParserWriter::onAddText(const char text[], size_t length) {
+    fParser.text(text, SkToInt(length));
+}
+
 void SkXMLParserWriter::onEndElement()
 {
     Elem* elem = this->getEnd();

From f9d4573bec8f5dc965db3a08ebbd69c07f01430a Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@mozilla.com>
Date: Fri, 18 Dec 2015 13:53:25 -0500
Subject: [PATCH 039/101] Bug 1082598 - Part 2: Fix Moz2D Skia usage for Skia
 update. r=jrmuizel

---
 gfx/2d/DrawTargetSkia.cpp    | 65 ++++++++++++++++++------------------
 gfx/2d/DrawTargetSkia.h      |  2 +-
 gfx/2d/ScaledFontCairo.cpp   | 16 ++++-----
 gfx/2d/SourceSurfaceSkia.cpp | 21 ++++++------
 4 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/gfx/2d/DrawTargetSkia.cpp b/gfx/2d/DrawTargetSkia.cpp
index 1b68c40ba22f..0f752b25e9eb 100644
--- a/gfx/2d/DrawTargetSkia.cpp
+++ b/gfx/2d/DrawTargetSkia.cpp
@@ -12,11 +12,7 @@
 #include "FilterNodeSoftware.h"
 #include "HelpersSkia.h"
 
-#ifdef USE_SKIA_GPU
-#include "skia/include/gpu/SkGpuDevice.h"
-#include "skia/include/gpu/gl/GrGLInterface.h"
-#endif
-
+#include "skia/include/core/SkSurface.h"
 #include "skia/include/core/SkTypeface.h"
 #include "skia/include/effects/SkGradientShader.h"
 #include "skia/include/core/SkColorFilter.h"
@@ -149,29 +145,32 @@ bool
 DrawTargetSkia::LockBits(uint8_t** aData, IntSize* aSize,
                           int32_t* aStride, SurfaceFormat* aFormat)
 {
-  const SkBitmap &bitmap = mCanvas->getDevice()->accessBitmap(false);
-  if (!bitmap.lockPixelsAreWritable()) {
+  /* Test if the canvas' device has accessible pixels first, as actually
+   * accessing the pixels may trigger side-effects, even if it fails.
+   */
+  if (!mCanvas->peekPixels(nullptr, nullptr)) {
+    return false;
+  }
+
+  SkImageInfo info;
+  size_t rowBytes;
+  void* pixels = mCanvas->accessTopLayerPixels(&info, &rowBytes);
+  if (!pixels) {
     return false;
   }
 
   MarkChanged();
 
-  bitmap.lockPixels();
-  *aData = reinterpret_cast<uint8_t*>(bitmap.getPixels());
-  *aSize = IntSize(bitmap.width(), bitmap.height());
-  *aStride = int32_t(bitmap.rowBytes());
-  *aFormat = SkiaColorTypeToGfxFormat(bitmap.colorType());
+  *aData = reinterpret_cast<uint8_t*>(pixels);
+  *aSize = IntSize(info.width(), info.height());
+  *aStride = int32_t(rowBytes);
+  *aFormat = SkiaColorTypeToGfxFormat(info.colorType());
   return true;
 }
 
 void
 DrawTargetSkia::ReleaseBits(uint8_t* aData)
 {
-  const SkBitmap &bitmap = mCanvas->getDevice()->accessBitmap(false);
-  MOZ_ASSERT(bitmap.lockPixelsAreWritable());
-
-  bitmap.unlockPixels();
-  bitmap.notifyPixelsChanged();
 }
 
 static void
@@ -266,7 +265,7 @@ SetPaintPattern(SkPaint& aPaint, const Pattern& aPattern, TempBitmap& aTmpBitmap
       SkSafeUnref(shader);
       SkSafeUnref(aPaint.setShader(matrixShader));
       if (pat.mFilter == Filter::POINT) {
-        aPaint.setFilterLevel(SkPaint::kNone_FilterLevel);
+        aPaint.setFilterQuality(kNone_SkFilterQuality);
       }
       break;
     }
@@ -333,7 +332,7 @@ struct AutoPaintSetup {
       mPaint.setAlpha(ColorFloatToByte(aOptions.mAlpha));
       mAlpha = aOptions.mAlpha;
     }
-    mPaint.setFilterLevel(SkPaint::kLow_FilterLevel);
+    mPaint.setFilterQuality(kLow_SkFilterQuality);
   }
 
   // TODO: Maybe add an operator overload to access this easier?
@@ -381,10 +380,10 @@ DrawTargetSkia::DrawSurface(SourceSurface *aSurface,
 
   AutoPaintSetup paint(mCanvas.get(), aOptions, &aDest);
   if (aSurfOptions.mFilter == Filter::POINT) {
-    paint.mPaint.setFilterLevel(SkPaint::kNone_FilterLevel);
+    paint.mPaint.setFilterQuality(kNone_SkFilterQuality);
   }
 
-  mCanvas->drawBitmapRectToRect(bitmap.mBitmap, &sourceRect, destRect, &paint.mPaint);
+  mCanvas->drawBitmapRect(bitmap.mBitmap, sourceRect, destRect, &paint.mPaint);
 }
 
 DrawTargetType
@@ -797,9 +796,7 @@ DrawTargetSkia::CopySurface(SourceSurface *aSurface,
     SkBitmap bm(bitmap.mBitmap);
     bm.lockPixels();
     if (bm.getPixels()) {
-      SkImageInfo info = bm.info();
-      info.fWidth = aSourceRect.width;
-      info.fHeight = aSourceRect.height;
+      SkImageInfo info = bm.info().makeWH(aSourceRect.width, aSourceRect.height);
       uint8_t* pixels = static_cast<uint8_t*>(bm.getPixels());
       // adjust pixels for the source offset
       pixels += aSourceRect.x + aSourceRect.y*bm.rowBytes();
@@ -831,7 +828,7 @@ DrawTargetSkia::CopySurface(SourceSurface *aSurface,
     clearPaint.setXfermodeMode(SkXfermode::kSrc_Mode);
     mCanvas->drawPaint(clearPaint);
   }
-  mCanvas->drawBitmapRect(bitmap.mBitmap, &source, dest, &paint);
+  mCanvas->drawBitmapRect(bitmap.mBitmap, source, dest, &paint);
   mCanvas->restore();
 }
 
@@ -854,7 +851,7 @@ DrawTargetSkia::Init(const IntSize &aSize, SurfaceFormat aFormat)
 
   SkBitmap bitmap;
   bitmap.setInfo(skiInfo, stride);
-  if (!bitmap.allocPixels()) {
+  if (!bitmap.tryAllocPixels()) {
     return false;
   }
 
@@ -883,24 +880,28 @@ DrawTargetSkia::InitWithGrContext(GrContext* aGrContext,
   mSize = aSize;
   mFormat = aFormat;
 
-  GrTextureDesc targetDescriptor;
+  GrSurfaceDesc targetDescriptor;
 
-  targetDescriptor.fFlags = kRenderTarget_GrTextureFlagBit;
+  targetDescriptor.fFlags = kRenderTarget_GrSurfaceFlag;
   targetDescriptor.fWidth = mSize.width;
   targetDescriptor.fHeight = mSize.height;
   targetDescriptor.fConfig = GfxFormatToGrConfig(mFormat);
   targetDescriptor.fOrigin = kBottomLeft_GrSurfaceOrigin;
   targetDescriptor.fSampleCnt = 0;
 
-  SkAutoTUnref<GrTexture> skiaTexture(mGrContext->createUncachedTexture(targetDescriptor, NULL, 0));
+  SkAutoTUnref<GrTexture> skiaTexture(mGrContext->textureProvider()->createTexture(targetDescriptor, SkSurface::kNo_Budgeted, nullptr, 0));
   if (!skiaTexture) {
     return false;
   }
 
-  mTexture = (uint32_t)skiaTexture->getTextureHandle();
+  SkAutoTUnref<SkSurface> gpuSurface(SkSurface::NewRenderTargetDirect(skiaTexture->asRenderTarget()));
+  if (!gpuSurface) {
+    return false;
+  }
 
-  SkAutoTUnref<SkBaseDevice> device(new SkGpuDevice(mGrContext.get(), skiaTexture->asRenderTarget()));
-  mCanvas.adopt(new SkCanvas(device.get()));
+  mTexture = reinterpret_cast<GrGLTextureInfo *>(skiaTexture->getTextureHandle())->fID;
+
+  mCanvas = gpuSurface->getCanvas();
 
   return true;
 }
diff --git a/gfx/2d/DrawTargetSkia.h b/gfx/2d/DrawTargetSkia.h
index 979559adca21..e28a20411b59 100644
--- a/gfx/2d/DrawTargetSkia.h
+++ b/gfx/2d/DrawTargetSkia.h
@@ -142,7 +142,7 @@ private:
 
 #ifdef USE_SKIA_GPU
   RefPtrSkia<GrContext> mGrContext;
-  uint32_t mTexture;
+  GrGLuint mTexture;
 #endif
 
   IntSize mSize;
diff --git a/gfx/2d/ScaledFontCairo.cpp b/gfx/2d/ScaledFontCairo.cpp
index d64e02de500d..250787729383 100644
--- a/gfx/2d/ScaledFontCairo.cpp
+++ b/gfx/2d/ScaledFontCairo.cpp
@@ -41,20 +41,20 @@ SkTypeface* ScaledFontCairo::GetSkTypeface()
 {
   if (!mTypeface) {
     cairo_font_face_t* fontFace = cairo_scaled_font_get_font_face(mScaledFont);
+    MOZ_ASSERT(cairo_font_face_status(fontFace) == CAIRO_STATUS_SUCCESS);
+
     FT_Face face = cairo_ft_scaled_font_lock_face(mScaledFont);
 
-    int style = SkTypeface::kNormal;
-
-    if (face->style_flags & FT_STYLE_FLAG_ITALIC)
-    style |= SkTypeface::kItalic;
-
-    if (face->style_flags & FT_STYLE_FLAG_BOLD)
-      style |= SkTypeface::kBold;
+    SkFontStyle style(face->style_flags & FT_STYLE_FLAG_BOLD ?
+                        SkFontStyle::kBold_Weight : SkFontStyle::kNormal_Weight,
+                      SkFontStyle::kNormal_Width,
+                      face->style_flags & FT_STYLE_FLAG_ITALIC ?
+                        SkFontStyle::kItalic_Slant : SkFontStyle::kUpright_Slant);
 
     bool isFixedWidth = face->face_flags & FT_FACE_FLAG_FIXED_WIDTH;
     cairo_ft_scaled_font_unlock_face(mScaledFont);
 
-    mTypeface = SkCreateTypefaceFromCairoFont(fontFace, (SkTypeface::Style)style, isFixedWidth);
+    mTypeface = SkCreateTypefaceFromCairoFont(fontFace, style, isFixedWidth);
   }
 
   return mTypeface;
diff --git a/gfx/2d/SourceSurfaceSkia.cpp b/gfx/2d/SourceSurfaceSkia.cpp
index 2de51f681c9b..9b905462f2be 100644
--- a/gfx/2d/SourceSurfaceSkia.cpp
+++ b/gfx/2d/SourceSurfaceSkia.cpp
@@ -13,6 +13,7 @@
 #include "DataSurfaceHelpers.h"
 
 #ifdef USE_SKIA_GPU
+#include "GLDefs.h"
 #include "skia/include/gpu/SkGrPixelRef.h"
 #endif
 
@@ -50,13 +51,11 @@ SourceSurfaceSkia::InitFromCanvas(SkCanvas* aCanvas,
                                   SurfaceFormat aFormat,
                                   DrawTargetSkia* aOwner)
 {
-  SkISize size = aCanvas->getDeviceSize();
-
-  mBitmap = (SkBitmap)aCanvas->getDevice()->accessBitmap(false);
+  mBitmap = aCanvas->getDevice()->accessBitmap(false);
 
   mFormat = aFormat;
 
-  mSize = IntSize(size.fWidth, size.fHeight);
+  mSize = IntSize(mBitmap.width(), mBitmap.height());
   mStride = mBitmap.rowBytes();
   mDrawTarget = aOwner;
 
@@ -84,10 +83,6 @@ SourceSurfaceSkia::InitFromData(unsigned char* aData,
     return false;
   }
 
-  if (aFormat == SurfaceFormat::B8G8R8X8) {
-    mBitmap.setAlphaType(kIgnore_SkAlphaType);
-  }
-
   mSize = aSize;
   mFormat = aFormat;
   mStride = mBitmap.rowBytes();
@@ -109,11 +104,15 @@ SourceSurfaceSkia::InitFromTexture(DrawTargetSkia* aOwner,
   skiaTexGlue.fOrigin = kTopLeft_GrSurfaceOrigin;
   skiaTexGlue.fConfig = GfxFormatToGrConfig(aFormat);
   skiaTexGlue.fSampleCnt = 0;
-  skiaTexGlue.fTextureHandle = aTexture;
 
-  GrTexture *skiaTexture = aOwner->mGrContext->wrapBackendTexture(skiaTexGlue);
+  GrGLTextureInfo texInfo;
+  texInfo.fTarget = LOCAL_GL_TEXTURE_2D;
+  texInfo.fID = aTexture;
+  skiaTexGlue.fTextureHandle = reinterpret_cast<GrBackendObject>(&texInfo);
+
+  GrTexture *skiaTexture = aOwner->mGrContext->textureProvider()->wrapBackendTexture(skiaTexGlue);
   SkImageInfo imgInfo = SkImageInfo::Make(aSize.width, aSize.height, GfxFormatToSkiaColorType(aFormat), kOpaque_SkAlphaType);
-  SkGrPixelRef *texRef = new SkGrPixelRef(imgInfo, skiaTexture, false);
+  SkGrPixelRef *texRef = new SkGrPixelRef(imgInfo, skiaTexture);
   mBitmap.setInfo(imgInfo);
   mBitmap.setPixelRef(texRef);
   mFormat = aFormat;

From 2e90fd5bee3211ae4853248f0587e6336adddb19 Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@mozilla.com>
Date: Fri, 18 Dec 2015 13:53:25 -0500
Subject: [PATCH 040/101] Bug 1082598 - Part 3: Fix thebes gfxPlatform shutdown
 for Skia. r=jrmuizel

---
 gfx/thebes/gfxPlatform.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp
index 2b1bffcb1ece..20635b98ae1e 100644
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -777,7 +777,7 @@ gfxPlatform::~gfxPlatform()
 #ifdef USE_SKIA
     // must do Skia cleanup before Cairo cleanup, because Skia may be referencing
     // Cairo objects e.g. through SkCairoFTTypeface
-    SkGraphics::Term();
+    SkGraphics::PurgeFontCache();
 #endif
 
 #if MOZ_TREE_CAIRO

From 9692cfae0ade6009b55e0887c6a8812b34afecd0 Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@mozilla.com>
Date: Fri, 18 Dec 2015 13:53:25 -0500
Subject: [PATCH 041/101] Bug 1082598 - Part 4: Workaround for naming conflict
 in unified sources for Skia and thebes DWrite fonts. r=jrmuizel

---
 gfx/thebes/gfxDWriteFontList.cpp | 4 ++--
 gfx/thebes/gfxDWriteFontList.h   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gfx/thebes/gfxDWriteFontList.cpp b/gfx/thebes/gfxDWriteFontList.cpp
index 123947607242..ee54e9d12e77 100644
--- a/gfx/thebes/gfxDWriteFontList.cpp
+++ b/gfx/thebes/gfxDWriteFontList.cpp
@@ -1357,7 +1357,7 @@ static HRESULT GetFamilyName(IDWriteFont *aFont, nsString& aFamilyName)
 // used to invoke the DirectWrite layout engine to determine the fallback font
 // for a given character.
 
-IFACEMETHODIMP FontFallbackRenderer::DrawGlyphRun(
+IFACEMETHODIMP DWriteFontFallbackRenderer::DrawGlyphRun(
     void* clientDrawingContext,
     FLOAT baselineOriginX,
     FLOAT baselineOriginY,
@@ -1422,7 +1422,7 @@ gfxDWriteFontList::GlobalFontFallback(const uint32_t aCh,
 
     // initialize fallback renderer
     if (!mFallbackRenderer) {
-        mFallbackRenderer = new FontFallbackRenderer(dwFactory);
+        mFallbackRenderer = new DWriteFontFallbackRenderer(dwFactory);
     }
 
     // initialize text format
diff --git a/gfx/thebes/gfxDWriteFontList.h b/gfx/thebes/gfxDWriteFontList.h
index 08c8004ebc35..63a27794db96 100644
--- a/gfx/thebes/gfxDWriteFontList.h
+++ b/gfx/thebes/gfxDWriteFontList.h
@@ -197,10 +197,10 @@ protected:
 };
 
 // custom text renderer used to determine the fallback font for a given char
-class FontFallbackRenderer final : public IDWriteTextRenderer
+class DWriteFontFallbackRenderer final : public IDWriteTextRenderer
 {
 public:
-    FontFallbackRenderer(IDWriteFactory *aFactory)
+    DWriteFontFallbackRenderer(IDWriteFactory *aFactory)
         : mRefCount(0)
     {
         HRESULT hr = S_OK;
@@ -209,7 +209,7 @@ public:
         NS_ASSERTION(SUCCEEDED(hr), "GetSystemFontCollection failed!");
     }
 
-    ~FontFallbackRenderer()
+    ~DWriteFontFallbackRenderer()
     {}
 
     // IDWriteTextRenderer methods
@@ -421,7 +421,7 @@ private:
     bool mGDIFontTableAccess;
     RefPtr<IDWriteGdiInterop> mGDIInterop;
 
-    RefPtr<FontFallbackRenderer> mFallbackRenderer;
+    RefPtr<DWriteFontFallbackRenderer> mFallbackRenderer;
     RefPtr<IDWriteTextFormat>    mFallbackFormat;
 
     RefPtr<IDWriteFontCollection> mSystemFonts;

From b0b9f05f7adb8d75330d97d5b1701a08e8b64571 Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@mozilla.com>
Date: Fri, 18 Dec 2015 13:53:25 -0500
Subject: [PATCH 042/101] Bug 1082598 - Part 5: Fix NPAPI for Skia update.
 r=jrmuizel

---
 other-licenses/skia-npapi/ANPCanvas.cpp   | 13 +++++++++----
 other-licenses/skia-npapi/ANPTypeface.cpp |  1 +
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/other-licenses/skia-npapi/ANPCanvas.cpp b/other-licenses/skia-npapi/ANPCanvas.cpp
index 0b842c558267..dd227eca8dfe 100644
--- a/other-licenses/skia-npapi/ANPCanvas.cpp
+++ b/other-licenses/skia-npapi/ANPCanvas.cpp
@@ -153,13 +153,18 @@ static void anp_drawBitmapRect(ANPCanvas* canvas, const ANPBitmap* bitmap,
                                const ANPPaint* paint) {
     SkBitmap    bm;
     SkRect      dstR;
-    SkIRect     srcR, *srcPtr = NULL;
+    SkIRect     srcR;
 
     if (src) {
-        srcPtr = SkANP::SetRect(&srcR, *src);
+        canvas->skcanvas->drawBitmapRect(*SkANP::SetBitmap(&bm, *bitmap),
+                                         *SkANP::SetRect(&srcR, *src),
+                                         *SkANP::SetRect(&dstR, *dst),
+                                         paint);
+    } else {
+        canvas->skcanvas->drawBitmapRect(*SkANP::SetBitmap(&bm, *bitmap),
+                                         *SkANP::SetRect(&dstR, *dst),
+                                         paint);
     }
-    canvas->skcanvas->drawBitmapRect(*SkANP::SetBitmap(&bm, *bitmap), srcPtr,
-                           *SkANP::SetRect(&dstR, *dst), paint);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/other-licenses/skia-npapi/ANPTypeface.cpp b/other-licenses/skia-npapi/ANPTypeface.cpp
index 26251bc994f4..ccbaf41c66c6 100644
--- a/other-licenses/skia-npapi/ANPTypeface.cpp
+++ b/other-licenses/skia-npapi/ANPTypeface.cpp
@@ -27,6 +27,7 @@
 #include "SkANP.h"
 #include "SkFontHost.h"
 #include "SkStream.h"
+#include <stdlib.h>
 
 static ANPTypeface* anp_createFromName(const char name[], ANPTypefaceStyle s) {
     SkTypeface* tf = SkTypeface::CreateFromName(name,

From b842645aabccedb4626e0b16441ec505ad368b91 Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@mozilla.com>
Date: Fri, 18 Dec 2015 13:53:25 -0500
Subject: [PATCH 043/101] Bug 1082598 - Part 6: Fix layers for Skia update.
 r=jrmuizel

---
 gfx/layers/basic/BasicCompositor.cpp   | 4 ++--
 gfx/layers/basic/BasicLayerManager.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gfx/layers/basic/BasicCompositor.cpp b/gfx/layers/basic/BasicCompositor.cpp
index c18d7f9c24a8..3cec256efd88 100644
--- a/gfx/layers/basic/BasicCompositor.cpp
+++ b/gfx/layers/basic/BasicCompositor.cpp
@@ -254,9 +254,9 @@ Transform(DataSourceSurface* aDest,
   SkPaint paint;
   paint.setXfermodeMode(SkXfermode::kSrc_Mode);
   paint.setAntiAlias(true);
-  paint.setFilterLevel(SkPaint::kLow_FilterLevel);
+  paint.setFilterQuality(kLow_SkFilterQuality);
   SkRect destRect = SkRect::MakeXYWH(0, 0, srcSize.width, srcSize.height);
-  destCanvas.drawBitmapRectToRect(src, nullptr, destRect, &paint);
+  destCanvas.drawBitmapRect(src, destRect, &paint);
 }
 #else
 static pixman_transform
diff --git a/gfx/layers/basic/BasicLayerManager.cpp b/gfx/layers/basic/BasicLayerManager.cpp
index 4dd00f77af59..94007abd4984 100644
--- a/gfx/layers/basic/BasicLayerManager.cpp
+++ b/gfx/layers/basic/BasicLayerManager.cpp
@@ -742,9 +742,9 @@ Transform(const gfxImageSurface* aDest,
   SkPaint paint;
   paint.setXfermodeMode(SkXfermode::kSrc_Mode);
   paint.setAntiAlias(true);
-  paint.setFilterLevel(SkPaint::kLow_FilterLevel);
+  paint.setFilterQuality(kLow_SkFilterQuality);
   SkRect destRect = SkRect::MakeXYWH(0, 0, srcSize.width, srcSize.height);
-  destCanvas.drawBitmapRectToRect(src, nullptr, destRect, &paint);
+  destCanvas.drawBitmapRect(src, destRect, &paint);
 }
 #else
 static pixman_transform

From 0f49d90f686dd1214bb010aab2e2f51b710d9d79 Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@mozilla.com>
Date: Fri, 18 Dec 2015 13:53:25 -0500
Subject: [PATCH 044/101] Bug 1082598 - Part 7: Update moz.build for Skia
 update. r=jrmuizel

---
 gfx/skia/generate_mozbuild.py | 129 ++++-------
 gfx/skia/moz.build            | 411 +++++++++++++++++++---------------
 2 files changed, 277 insertions(+), 263 deletions(-)

diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
index 7573b7432d86..440e405fe9c3 100755
--- a/gfx/skia/generate_mozbuild.py
+++ b/gfx/skia/generate_mozbuild.py
@@ -25,34 +25,12 @@ header = """
 
 footer = """
 
-# can we find a better way of dealing with asm sources?
-
-# left out of UNIFIED_SOURCES for now; that's not C++ anyway, nothing else to unify it with
-#XXX: doesn't build with Apple's assembler
-if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC'] and CONFIG['OS_TARGET'] != 'Darwin':
-    SOURCES += [
-        'skia/src/opts/memset.arm.S',
-    ]
-    if CONFIG['BUILD_ARM_NEON']:
-        SOURCES += [
-            'skia/src/opts/memset16_neon.S',
-            'skia/src/opts/memset32_neon.S',
-        ]
-
-if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['GNU_CC'] and CONFIG['OS_ARCH'] != 'WINNT':
-    if CONFIG['CPU_ARCH'] == 'x86_64':
-        SOURCES += [
-            'skia/src/opts/SkBlitRow_opts_SSE4_x64_asm.S',
-        ]
-    else:
-        SOURCES += [
-            'skia/src/opts/SkBlitRow_opts_SSE4_asm.S',
-        ]
-
+# We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
 
 FINAL_LIBRARY = 'gkmedias'
 LOCAL_INCLUDES += [
+    'skia/include/c',
     'skia/include/config',
     'skia/include/core',
     'skia/include/effects',
@@ -61,6 +39,7 @@ LOCAL_INCLUDES += [
     'skia/include/pathops',
     'skia/include/pipe',
     'skia/include/ports',
+    'skia/include/private',
     'skia/include/utils',
     'skia/include/utils/mac',
     'skia/include/utils/win',
@@ -78,12 +57,6 @@ LOCAL_INCLUDES += [
     'skia/src/utils/win',
 ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in {'android', 'gtk2', 'gtk3', 'qt', 'gonk', 'cocoa', 'uikit'}:
-    DEFINES['SK_USE_POSIX_THREADS'] = 1
-
-if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSSE3']:
-    DEFINES['SK_BUILD_SSSE3'] = 1
-
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
     DEFINES['SK_FONTHOST_CAIRO_STANDALONE'] = 0
 
@@ -101,37 +74,33 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in {
 if CONFIG['_MSC_VER']:
     # MSVC doesn't need special compiler flags, but Skia needs to be told that these files should
     # be built with the required SSE level or it will simply compile in stubs and cause runtime crashes
-    SOURCES['skia/src/opts/SkBitmapFilter_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['skia/src/opts/SkBitmapProcState_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=31']
-    SOURCES['skia/src/opts/SkBlitRect_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['skia/src/opts/SkBlitRow_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['skia/src/opts/SkBlurImage_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['skia/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=41']
-    SOURCES['skia/src/opts/SkMorphology_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['skia/src/opts/SkUtils_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['skia/src/opts/SkXfermode_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-
+    SOURCES['skia/src/opts/SkBitmapFilter_opts_SSE2.cpp'].flags += ['/arch:SSE2 -DSK_CPU_SSE_LEVEL=20']
+    SOURCES['skia/src/opts/SkBitmapProcState_opts_SSE2.cpp'].flags += ['/arch:SSE2 -DSK_CPU_SSE_LEVEL=20']
+    SOURCES['skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['/arch:SSE2 -DSK_CPU_SSE_LEVEL=31']
+    SOURCES['skia/src/opts/SkBlitRow_opts_SSE2.cpp'].flags += ['/arch:SSE2 -DSK_CPU_SSE_LEVEL=20']
+    SOURCES['skia/src/opts/SkBlitRow_opts_SSE4.cpp'].flags += ['/arch:SSE2 -DSK_CPU_SSE_LEVEL=41']
+    SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += ['/arch:SSE2 -DSK_CPU_SSE_LEVEL=31']
+    SOURCES['skia/src/opts/SkOpts_sse41.cpp'].flags += ['/arch:SSE2 -DSK_CPU_SSE_LEVEL=41']
+    SOURCES['skia/src/opts/SkOpts_avx.cpp'].flags += ['/arch:AVX -DSK_CPU_SSE_LEVEL=51']
 if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['GNU_CC']:
     SOURCES['skia/src/opts/SkBitmapFilter_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
     SOURCES['skia/src/opts/SkBitmapProcState_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
     SOURCES['skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-mssse3']
-    SOURCES['skia/src/opts/SkBlitRect_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
     SOURCES['skia/src/opts/SkBlitRow_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-    SOURCES['skia/src/opts/SkBlurImage_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-    SOURCES['skia/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-msse4.1']
-    SOURCES['skia/src/opts/SkMorphology_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-    SOURCES['skia/src/opts/SkUtils_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-    SOURCES['skia/src/opts/SkXfermode_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+    SOURCES['skia/src/opts/SkBlitRow_opts_SSE4.cpp'].flags += ['-msse4.1']
+    SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += ['-mssse3']
+    SOURCES['skia/src/opts/SkOpts_sse41.cpp'].flags += ['-msse4.1']
+    SOURCES['skia/src/opts/SkOpts_avx.cpp'].flags += ['-mavx']
 elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC'] and CONFIG['BUILD_ARM_NEON']:
-    DEFINES['__ARM_HAVE_OPTIONAL_NEON_SUPPORT'] = 1
-    DEFINES['USE_ANDROID_NDK_CPU_FEATURES'] = 0
+    DEFINES['SK_ARM_HAS_OPTIONAL_NEON'] = 1
 elif CONFIG['CLANG_CL']:
     SOURCES['skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-mssse3']
-    SOURCES['skia/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-msse4.1']
+    SOURCES['skia/src/opts/SkBlitRow_opts_SSE4.cpp'].flags += ['-msse4.1']
+    SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += ['-mssse3']
+    SOURCES['skia/src/opts/SkOpts_sse41.cpp'].flags += ['-msse4.1']
+    SOURCES['skia/src/opts/SkOpts_avx.cpp'].flags += ['-mavx']
 
 DEFINES['SKIA_IMPLEMENTATION'] = 1
-DEFINES['GR_IMPLEMENTATION'] = 1
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += [
@@ -147,6 +116,8 @@ if CONFIG['GNU_CXX']:
             '-Wno-macro-redefined',
             '-Wno-unused-private-field',
         ]
+        # work around inline function linking bug with template arguments
+        SOURCES['skia/src/gpu/GrResourceCache.cpp'].flags += ['-fkeep-inline-functions']
     else:
         CXXFLAGS += [
             '-Wno-logical-op',
@@ -180,7 +151,7 @@ def generate_platform_sources():
   sources = {}
 
   for plat in platforms:
-    if os.system("cd skia && GYP_GENERATORS=dump_mozbuild ./gyp_skia -D OS=%s gyp/skia_lib.gyp" % plat) != 0:
+    if os.system("cd skia && GYP_GENERATORS=dump_mozbuild ./gyp_skia -D OS=%s -D host_os=linux gyp/skia_lib.gyp" % plat) != 0:
       print 'Failed to generate sources for ' + plat
       continue
 
@@ -195,31 +166,26 @@ def generate_platform_sources():
 def generate_separated_sources(platform_sources):
   blacklist = [
     'ChromeUtils',
-    'SkImageDecoder_',
-    '_gif',
-    'SkFontConfigParser_android',
     'SkJpeg',
     'SkXML',
-    'SkCity',
     'GrGLCreateNativeInterface',
+    'SkCreatePlatformGLContext',
     'fontconfig',
-    'SkCondVar',
     'SkThreadUtils_pthread_',
-    'SkImage_Codec',
-    'SkBitmapChecksummer',
-    'SkNativeGLContext',
     'SkFontConfig',
-    'SkFontHost_win_dw',
     'SkFontMgr_android',
+    'SkFontMgr_custom',
+    'SkFontHost_FreeType.cpp',
     'SkForceLinking',
     'SkMovie',
     'SkImageDecoder',
     'SkImageEncoder',
     'SkBitmapHasher',
+    'SkBitmapRegion',
+    'codec',
     'SkWGL',
-    'SkImages',
-    'SkDiscardableMemory_ashmem',
     'SkMemory_malloc',
+    'SkOpts_',
     'opts_check_x86',
     'third_party',
   ]
@@ -233,30 +199,18 @@ def generate_separated_sources(platform_sources):
 
   separated = defaultdict(set, {
     'common': {
-      #'skia/src/effects/gradients/SkGradientTileProc.cpp',
       'skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
       'skia/src/ports/SkDiscardableMemory_none.cpp',
       'skia/src/ports/SkImageDecoder_empty.cpp',
       'skia/src/ports/SkMemory_mozalloc.cpp',
-      # 'skia/src/images/SkImages.cpp',
-      # 'skia/src/images/SkImageRef.cpp',
-      # 'skia/src/images/SkImageRef_GlobalPool.cpp',
-      # 'skia/src/images/SkImageRefPool.cpp',
-      # 'skia/src/images/SkImageDecoder.cpp',
-      # 'skia/src/images/SkImageDecoder_Factory.cpp',
     },
     'android': {
       # 'skia/src/ports/SkDebug_android.cpp',
-      'skia/src/ports/SkFontHost_android_old.cpp',
       'skia/src/ports/SkFontHost_cairo.cpp',
       # 'skia/src/ports/SkFontHost_FreeType.cpp',
       # 'skia/src/ports/SkFontHost_FreeType_common.cpp',
-      # 'skia/src/ports/SkThread_pthread.cpp',
-      # 'skia/src/ports/SkPurgeableMemoryBlock_android.cpp',
       # 'skia/src/ports/SkTime_Unix.cpp',
       # 'skia/src/utils/SkThreadUtils_pthread.cpp',
-      # 'skia/src/images/SkImageRef_ashmem.cpp',
-      # 'skia/src/utils/android/ashmem.cpp',
     },
     'linux': {
       'skia/src/ports/SkFontHost_cairo.cpp',
@@ -264,18 +218,18 @@ def generate_separated_sources(platform_sources):
     'intel': {
       # There is currently no x86-specific opt for SkTextureCompression
       'skia/src/opts/opts_check_x86.cpp',
-      'skia/src/opts/SkTextureCompression_opts_none.cpp',
+      'skia/src/opts/SkOpts_ssse3.cpp',
+      'skia/src/opts/SkOpts_sse41.cpp',
+      'skia/src/opts/SkOpts_avx.cpp',
     },
     'arm': {
-      'skia/src/opts/SkUtils_opts_arm.cpp',
       'skia/src/core/SkUtilsArm.cpp',
     },
     'neon': {
+      'skia/src/opts/SkOpts_neon.cpp',
       'skia/src/opts/SkBitmapProcState_arm_neon.cpp',
     },
-    'none': {
-      'skia/src/opts/SkUtils_opts_none.cpp',
-    }
+    'none': set()
   })
 
   for plat in platform_sources.keys():
@@ -341,15 +295,22 @@ def write_sources(f, values, indent):
     'SkBlitter_Sprite.cpp',
     'SkBlitRow_opts_arm.cpp',
     'SkScan_Antihair.cpp',
-    'SkCondVar.cpp',
     'SkParse.cpp',
-    'GrAddPathRenderers_default.cpp',
-    'GrDistanceFieldTextContext.cpp',
     'SkSHA1.cpp',
     'SkMD5.cpp',
     'SkPictureData.cpp',
-    'SkScaledImageCache.cpp',
     'opts_check_x86.cpp',
+    'GrDrawContext',
+    'GrResourceCache',
+    'GrAA',
+    'GrGL',
+    'GrBatchAtlas.cpp',
+    'SkArithmeticMode_gpu.cpp',
+    'SkImage_Gpu.cpp',
+    'SkPathOpsDebug.cpp',
+    'SkParsePath.cpp',
+    'SkOpts',
+    'SkRecorder.cpp',
   ]
 
   def isblacklisted(value):
diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
index e63504d697ae..8b5f660cf2f2 100644
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -14,26 +14,31 @@
 # DO NOT MODIFY THIS FILE IT IS AUTOGENERATED.
 #
 UNIFIED_SOURCES += [
+    'skia/src/c/sk_paint.cpp',
+    'skia/src/c/sk_surface.cpp',
     'skia/src/core/SkAAClip.cpp',
     'skia/src/core/SkAlphaRuns.cpp',
     'skia/src/core/SkAnnotation.cpp',
     'skia/src/core/SkBBHFactory.cpp',
-    'skia/src/core/SkBBoxHierarchyRecord.cpp',
-    'skia/src/core/SkBBoxRecord.cpp',
+    'skia/src/core/SkBigPicture.cpp',
     'skia/src/core/SkBitmap.cpp',
-    'skia/src/core/SkBitmap_scroll.cpp',
+    'skia/src/core/SkBitmapCache.cpp',
+    'skia/src/core/SkBitmapController.cpp',
     'skia/src/core/SkBitmapDevice.cpp',
     'skia/src/core/SkBitmapFilter.cpp',
     'skia/src/core/SkBitmapHeap.cpp',
     'skia/src/core/SkBitmapProcShader.cpp',
     'skia/src/core/SkBitmapProcState.cpp',
+    'skia/src/core/SkBitmapProvider.cpp',
     'skia/src/core/SkBitmapScaler.cpp',
     'skia/src/core/SkBlitMask_D32.cpp',
     'skia/src/core/SkBlitRow_D16.cpp',
     'skia/src/core/SkBlitRow_D32.cpp',
     'skia/src/core/SkBlitter.cpp',
     'skia/src/core/SkBuffer.cpp',
+    'skia/src/core/SkCachedData.cpp',
     'skia/src/core/SkCanvas.cpp',
+    'skia/src/core/SkChecksum.cpp',
     'skia/src/core/SkChunkAlloc.cpp',
     'skia/src/core/SkClipStack.cpp',
     'skia/src/core/SkColor.cpp',
@@ -53,6 +58,7 @@ UNIFIED_SOURCES += [
     'skia/src/core/SkDistanceFieldGen.cpp',
     'skia/src/core/SkDither.cpp',
     'skia/src/core/SkDraw.cpp',
+    'skia/src/core/SkDrawable.cpp',
     'skia/src/core/SkDrawLooper.cpp',
     'skia/src/core/SkEdge.cpp',
     'skia/src/core/SkEdgeBuilder.cpp',
@@ -62,75 +68,85 @@ UNIFIED_SOURCES += [
     'skia/src/core/SkFilterShader.cpp',
     'skia/src/core/SkFlattenable.cpp',
     'skia/src/core/SkFlattenableSerialization.cpp',
-    'skia/src/core/SkFloat.cpp',
     'skia/src/core/SkFloatBits.cpp',
     'skia/src/core/SkFont.cpp',
     'skia/src/core/SkFontDescriptor.cpp',
+    'skia/src/core/SkFontMgr.cpp',
     'skia/src/core/SkFontStream.cpp',
+    'skia/src/core/SkFontStyle.cpp',
+    'skia/src/core/SkForceCPlusPlusLinking.cpp',
     'skia/src/core/SkGeometry.cpp',
     'skia/src/core/SkGlyphCache.cpp',
     'skia/src/core/SkGraphics.cpp',
+    'skia/src/core/SkHalf.cpp',
+    'skia/src/core/SkImageCacherator.cpp',
     'skia/src/core/SkImageFilter.cpp',
     'skia/src/core/SkImageGenerator.cpp',
     'skia/src/core/SkImageInfo.cpp',
-    'skia/src/core/SkInstCnt.cpp',
+    'skia/src/core/SkLightingShader.cpp',
     'skia/src/core/SkLineClipper.cpp',
+    'skia/src/core/SkLocalMatrixImageFilter.cpp',
     'skia/src/core/SkLocalMatrixShader.cpp',
     'skia/src/core/SkMallocPixelRef.cpp',
     'skia/src/core/SkMask.cpp',
+    'skia/src/core/SkMaskCache.cpp',
     'skia/src/core/SkMaskFilter.cpp',
     'skia/src/core/SkMaskGamma.cpp',
     'skia/src/core/SkMath.cpp',
     'skia/src/core/SkMatrix.cpp',
-    'skia/src/core/SkMatrixClipStateMgr.cpp',
+    'skia/src/core/SkMatrixImageFilter.cpp',
     'skia/src/core/SkMetaData.cpp',
+    'skia/src/core/SkMiniRecorder.cpp',
     'skia/src/core/SkMipMap.cpp',
+    'skia/src/core/SkMultiPictureDraw.cpp',
+    'skia/src/core/SkNinePatchIter.cpp',
     'skia/src/core/SkPackBits.cpp',
     'skia/src/core/SkPaint.cpp',
-    'skia/src/core/SkPaintOptionsAndroid.cpp',
     'skia/src/core/SkPaintPriv.cpp',
-    'skia/src/core/SkPatch.cpp',
     'skia/src/core/SkPath.cpp',
     'skia/src/core/SkPathEffect.cpp',
-    'skia/src/core/SkPathHeap.cpp',
     'skia/src/core/SkPathMeasure.cpp',
     'skia/src/core/SkPathRef.cpp',
     'skia/src/core/SkPicture.cpp',
+    'skia/src/core/SkPictureContentInfo.cpp',
     'skia/src/core/SkPictureFlat.cpp',
+    'skia/src/core/SkPictureImageGenerator.cpp',
     'skia/src/core/SkPicturePlayback.cpp',
-    'skia/src/core/SkPictureRangePlayback.cpp',
     'skia/src/core/SkPictureRecord.cpp',
     'skia/src/core/SkPictureRecorder.cpp',
-    'skia/src/core/SkPictureReplacementPlayback.cpp',
     'skia/src/core/SkPictureShader.cpp',
-    'skia/src/core/SkPictureStateTree.cpp',
     'skia/src/core/SkPixelRef.cpp',
+    'skia/src/core/SkPixmap.cpp',
     'skia/src/core/SkPoint.cpp',
-    'skia/src/core/SkProcSpriteBlitter.cpp',
+    'skia/src/core/SkPoint3.cpp',
     'skia/src/core/SkPtrRecorder.cpp',
     'skia/src/core/SkQuadClipper.cpp',
-    'skia/src/core/SkQuadTree.cpp',
     'skia/src/core/SkRasterClip.cpp',
     'skia/src/core/SkRasterizer.cpp',
     'skia/src/core/SkReadBuffer.cpp',
-    'skia/src/core/SkRecordAnalysis.cpp',
+    'skia/src/core/SkRecord.cpp',
     'skia/src/core/SkRecordDraw.cpp',
-    'skia/src/core/SkRecorder.cpp',
-    'skia/src/core/SkRecording.cpp',
     'skia/src/core/SkRecordOpts.cpp',
+    'skia/src/core/SkRecords.cpp',
     'skia/src/core/SkRect.cpp',
     'skia/src/core/SkRefDict.cpp',
     'skia/src/core/SkRegion.cpp',
     'skia/src/core/SkRegion_path.cpp',
+    'skia/src/core/SkRemote.cpp',
+    'skia/src/core/SkResourceCache.cpp',
     'skia/src/core/SkRRect.cpp',
     'skia/src/core/SkRTree.cpp',
+    'skia/src/core/SkRWBuffer.cpp',
     'skia/src/core/SkScalar.cpp',
     'skia/src/core/SkScalerContext.cpp',
     'skia/src/core/SkScan.cpp',
     'skia/src/core/SkScan_AntiPath.cpp',
     'skia/src/core/SkScan_Hairline.cpp',
     'skia/src/core/SkScan_Path.cpp',
+    'skia/src/core/SkSemaphore.cpp',
     'skia/src/core/SkShader.cpp',
+    'skia/src/core/SkSharedMutex.cpp',
+    'skia/src/core/SkSpinlock.cpp',
     'skia/src/core/SkSpriteBlitter_ARGB32.cpp',
     'skia/src/core/SkSpriteBlitter_RGB16.cpp',
     'skia/src/core/SkStream.cpp',
@@ -139,7 +155,10 @@ UNIFIED_SOURCES += [
     'skia/src/core/SkStroke.cpp',
     'skia/src/core/SkStrokeRec.cpp',
     'skia/src/core/SkStrokerPriv.cpp',
-    'skia/src/core/SkTileGrid.cpp',
+    'skia/src/core/SkTaskGroup.cpp',
+    'skia/src/core/SkTextBlob.cpp',
+    'skia/src/core/SkThreadID.cpp',
+    'skia/src/core/SkTime.cpp',
     'skia/src/core/SkTLS.cpp',
     'skia/src/core/SkTSearch.cpp',
     'skia/src/core/SkTypeface.cpp',
@@ -147,30 +166,33 @@ UNIFIED_SOURCES += [
     'skia/src/core/SkUnPreMultiply.cpp',
     'skia/src/core/SkUtils.cpp',
     'skia/src/core/SkValidatingReadBuffer.cpp',
+    'skia/src/core/SkVarAlloc.cpp',
     'skia/src/core/SkVertState.cpp',
     'skia/src/core/SkWriteBuffer.cpp',
     'skia/src/core/SkWriter32.cpp',
     'skia/src/core/SkXfermode.cpp',
+    'skia/src/core/SkXfermodeInterpretation.cpp',
+    'skia/src/core/SkYUVPlanesCache.cpp',
     'skia/src/doc/SkDocument.cpp',
-    'skia/src/effects/gradients/SkBitmapCache.cpp',
     'skia/src/effects/gradients/SkClampRange.cpp',
+    'skia/src/effects/gradients/SkGradientBitmapCache.cpp',
     'skia/src/effects/gradients/SkGradientShader.cpp',
     'skia/src/effects/gradients/SkLinearGradient.cpp',
     'skia/src/effects/gradients/SkRadialGradient.cpp',
     'skia/src/effects/gradients/SkSweepGradient.cpp',
     'skia/src/effects/gradients/SkTwoPointConicalGradient.cpp',
     'skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp',
-    'skia/src/effects/gradients/SkTwoPointRadialGradient.cpp',
+    'skia/src/effects/GrCircleBlurFragmentProcessor.cpp',
     'skia/src/effects/Sk1DPathEffect.cpp',
     'skia/src/effects/Sk2DPathEffect.cpp',
     'skia/src/effects/SkAlphaThresholdFilter.cpp',
+    'skia/src/effects/SkArcToPathEffect.cpp',
     'skia/src/effects/SkArithmeticMode.cpp',
-    'skia/src/effects/SkAvoidXfermode.cpp',
-    'skia/src/effects/SkBitmapSource.cpp',
     'skia/src/effects/SkBlurDrawLooper.cpp',
     'skia/src/effects/SkBlurImageFilter.cpp',
     'skia/src/effects/SkBlurMask.cpp',
     'skia/src/effects/SkBlurMaskFilter.cpp',
+    'skia/src/effects/SkColorCubeFilter.cpp',
     'skia/src/effects/SkColorFilterImageFilter.cpp',
     'skia/src/effects/SkColorFilters.cpp',
     'skia/src/effects/SkColorMatrix.cpp',
@@ -184,6 +206,7 @@ UNIFIED_SOURCES += [
     'skia/src/effects/SkEmbossMask.cpp',
     'skia/src/effects/SkEmbossMaskFilter.cpp',
     'skia/src/effects/SkGpuBlurUtils.cpp',
+    'skia/src/effects/SkImageSource.cpp',
     'skia/src/effects/SkLayerDrawLooper.cpp',
     'skia/src/effects/SkLayerRasterizer.cpp',
     'skia/src/effects/SkLerpXfermode.cpp',
@@ -191,7 +214,6 @@ UNIFIED_SOURCES += [
     'skia/src/effects/SkLumaColorFilter.cpp',
     'skia/src/effects/SkMagnifierImageFilter.cpp',
     'skia/src/effects/SkMatrixConvolutionImageFilter.cpp',
-    'skia/src/effects/SkMatrixImageFilter.cpp',
     'skia/src/effects/SkMergeImageFilter.cpp',
     'skia/src/effects/SkMorphologyImageFilter.cpp',
     'skia/src/effects/SkOffsetImageFilter.cpp',
@@ -199,131 +221,142 @@ UNIFIED_SOURCES += [
     'skia/src/effects/SkPerlinNoiseShader.cpp',
     'skia/src/effects/SkPictureImageFilter.cpp',
     'skia/src/effects/SkPixelXorXfermode.cpp',
-    'skia/src/effects/SkPorterDuff.cpp',
     'skia/src/effects/SkRectShaderImageFilter.cpp',
-    'skia/src/effects/SkStippleMaskFilter.cpp',
     'skia/src/effects/SkTableColorFilter.cpp',
     'skia/src/effects/SkTableMaskFilter.cpp',
     'skia/src/effects/SkTestImageFilters.cpp',
     'skia/src/effects/SkTileImageFilter.cpp',
-    'skia/src/effects/SkTransparentShader.cpp',
     'skia/src/effects/SkXfermodeImageFilter.cpp',
     'skia/src/fonts/SkFontMgr_indirect.cpp',
     'skia/src/fonts/SkGScalerContext.cpp',
+    'skia/src/fonts/SkRandomScalerContext.cpp',
     'skia/src/fonts/SkRemotableFontMgr.cpp',
     'skia/src/fonts/SkTestScalerContext.cpp',
+    'skia/src/gpu/batches/GrAtlasTextBatch.cpp',
+    'skia/src/gpu/batches/GrBatch.cpp',
+    'skia/src/gpu/batches/GrCopySurfaceBatch.cpp',
+    'skia/src/gpu/batches/GrDashLinePathRenderer.cpp',
+    'skia/src/gpu/batches/GrDefaultPathRenderer.cpp',
+    'skia/src/gpu/batches/GrDrawAtlasBatch.cpp',
+    'skia/src/gpu/batches/GrDrawBatch.cpp',
+    'skia/src/gpu/batches/GrDrawPathBatch.cpp',
+    'skia/src/gpu/batches/GrDrawVerticesBatch.cpp',
+    'skia/src/gpu/batches/GrNinePatch.cpp',
+    'skia/src/gpu/batches/GrNonAAFillRectBatch.cpp',
+    'skia/src/gpu/batches/GrNonAAStrokeRectBatch.cpp',
+    'skia/src/gpu/batches/GrRectBatchFactory.cpp',
+    'skia/src/gpu/batches/GrStencilAndCoverPathRenderer.cpp',
+    'skia/src/gpu/batches/GrTessellatingPathRenderer.cpp',
+    'skia/src/gpu/batches/GrVertexBatch.cpp',
     'skia/src/gpu/effects/GrBezierEffect.cpp',
     'skia/src/gpu/effects/GrBicubicEffect.cpp',
+    'skia/src/gpu/effects/GrBitmapTextGeoProc.cpp',
     'skia/src/gpu/effects/GrConfigConversionEffect.cpp',
+    'skia/src/gpu/effects/GrConstColorProcessor.cpp',
     'skia/src/gpu/effects/GrConvexPolyEffect.cpp',
     'skia/src/gpu/effects/GrConvolutionEffect.cpp',
-    'skia/src/gpu/effects/GrCustomCoordsTextureEffect.cpp',
+    'skia/src/gpu/effects/GrCoverageSetOpXP.cpp',
+    'skia/src/gpu/effects/GrCustomXfermode.cpp',
     'skia/src/gpu/effects/GrDashingEffect.cpp',
-    'skia/src/gpu/effects/GrDistanceFieldTextureEffect.cpp',
+    'skia/src/gpu/effects/GrDisableColorXP.cpp',
+    'skia/src/gpu/effects/GrDistanceFieldGeoProc.cpp',
     'skia/src/gpu/effects/GrDitherEffect.cpp',
     'skia/src/gpu/effects/GrMatrixConvolutionEffect.cpp',
     'skia/src/gpu/effects/GrOvalEffect.cpp',
+    'skia/src/gpu/effects/GrPorterDuffXferProcessor.cpp',
     'skia/src/gpu/effects/GrRRectEffect.cpp',
     'skia/src/gpu/effects/GrSimpleTextureEffect.cpp',
     'skia/src/gpu/effects/GrSingleTextureEffect.cpp',
     'skia/src/gpu/effects/GrTextureDomain.cpp',
     'skia/src/gpu/effects/GrTextureStripAtlas.cpp',
+    'skia/src/gpu/effects/GrXfermodeFragmentProcessor.cpp',
     'skia/src/gpu/effects/GrYUVtoRGBEffect.cpp',
     'skia/src/gpu/gl/debug/GrBufferObj.cpp',
     'skia/src/gpu/gl/debug/GrDebugGL.cpp',
     'skia/src/gpu/gl/debug/GrFrameBufferObj.cpp',
-    'skia/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp',
     'skia/src/gpu/gl/debug/GrProgramObj.cpp',
     'skia/src/gpu/gl/debug/GrShaderObj.cpp',
     'skia/src/gpu/gl/debug/GrTextureObj.cpp',
     'skia/src/gpu/gl/debug/GrTextureUnitObj.cpp',
     'skia/src/gpu/gl/debug/SkDebugGLContext.cpp',
-    'skia/src/gpu/gl/GrGLAssembleInterface.cpp',
-    'skia/src/gpu/gl/GrGLBufferImpl.cpp',
-    'skia/src/gpu/gl/GrGLCaps.cpp',
-    'skia/src/gpu/gl/GrGLContext.cpp',
-    'skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
-    'skia/src/gpu/gl/GrGLCreateNullInterface.cpp',
-    'skia/src/gpu/gl/GrGLDefaultInterface_native.cpp',
-    'skia/src/gpu/gl/GrGLExtensions.cpp',
-    'skia/src/gpu/gl/GrGLIndexBuffer.cpp',
-    'skia/src/gpu/gl/GrGLInterface.cpp',
-    'skia/src/gpu/gl/GrGLNameAllocator.cpp',
-    'skia/src/gpu/gl/GrGLNoOpInterface.cpp',
-    'skia/src/gpu/gl/GrGLPath.cpp',
-    'skia/src/gpu/gl/GrGLPathRange.cpp',
-    'skia/src/gpu/gl/GrGLProgram.cpp',
-    'skia/src/gpu/gl/GrGLProgramDesc.cpp',
-    'skia/src/gpu/gl/GrGLProgramEffects.cpp',
-    'skia/src/gpu/gl/GrGLRenderTarget.cpp',
-    'skia/src/gpu/gl/GrGLShaderBuilder.cpp',
-    'skia/src/gpu/gl/GrGLSL.cpp',
-    'skia/src/gpu/gl/GrGLStencilBuffer.cpp',
-    'skia/src/gpu/gl/GrGLTexture.cpp',
-    'skia/src/gpu/gl/GrGLUniformManager.cpp',
-    'skia/src/gpu/gl/GrGLUtil.cpp',
-    'skia/src/gpu/gl/GrGLVertexArray.cpp',
-    'skia/src/gpu/gl/GrGLVertexBuffer.cpp',
-    'skia/src/gpu/gl/GrGpuGL.cpp',
-    'skia/src/gpu/gl/GrGpuGL_program.cpp',
-    'skia/src/gpu/gl/SkGLContextHelper.cpp',
+    'skia/src/gpu/gl/SkGLContext.cpp',
     'skia/src/gpu/gl/SkNullGLContext.cpp',
-    'skia/src/gpu/GrAAConvexPathRenderer.cpp',
-    'skia/src/gpu/GrAAHairLinePathRenderer.cpp',
-    'skia/src/gpu/GrAARectRenderer.cpp',
-    'skia/src/gpu/GrAllocPool.cpp',
-    'skia/src/gpu/GrAtlas.cpp',
-    'skia/src/gpu/GrBitmapTextContext.cpp',
+    'skia/src/gpu/GrAtlasTextBlob.cpp',
+    'skia/src/gpu/GrAtlasTextContext.cpp',
+    'skia/src/gpu/GrBatchFlushState.cpp',
+    'skia/src/gpu/GrBatchFontCache.cpp',
+    'skia/src/gpu/GrBatchTest.cpp',
     'skia/src/gpu/GrBlend.cpp',
+    'skia/src/gpu/GrBlurUtils.cpp',
     'skia/src/gpu/GrBufferAllocPool.cpp',
-    'skia/src/gpu/GrCacheID.cpp',
-    'skia/src/gpu/GrClipData.cpp',
-    'skia/src/gpu/GrClipMaskCache.cpp',
+    'skia/src/gpu/GrCaps.cpp',
+    'skia/src/gpu/GrClip.cpp',
     'skia/src/gpu/GrClipMaskManager.cpp',
     'skia/src/gpu/GrContext.cpp',
-    'skia/src/gpu/GrDefaultPathRenderer.cpp',
-    'skia/src/gpu/GrDrawState.cpp',
+    'skia/src/gpu/GrCoordTransform.cpp',
+    'skia/src/gpu/GrDefaultGeoProcFactory.cpp',
+    'skia/src/gpu/GrDrawingManager.cpp',
     'skia/src/gpu/GrDrawTarget.cpp',
-    'skia/src/gpu/GrEffect.cpp',
     'skia/src/gpu/GrFontScaler.cpp',
+    'skia/src/gpu/GrFragmentProcessor.cpp',
     'skia/src/gpu/GrGpu.cpp',
     'skia/src/gpu/GrGpuFactory.cpp',
     'skia/src/gpu/GrGpuResource.cpp',
-    'skia/src/gpu/GrInOrderDrawBuffer.cpp',
+    'skia/src/gpu/GrGpuResourceRef.cpp',
+    'skia/src/gpu/GrImageIDTextureAdjuster.cpp',
+    'skia/src/gpu/GrInvariantOutput.cpp',
+    'skia/src/gpu/GrLayerAtlas.cpp',
     'skia/src/gpu/GrLayerCache.cpp',
+    'skia/src/gpu/GrLayerHoister.cpp',
     'skia/src/gpu/GrMemoryPool.cpp',
     'skia/src/gpu/GrOvalRenderer.cpp',
     'skia/src/gpu/GrPaint.cpp',
     'skia/src/gpu/GrPath.cpp',
+    'skia/src/gpu/GrPathProcessor.cpp',
+    'skia/src/gpu/GrPathRange.cpp',
     'skia/src/gpu/GrPathRenderer.cpp',
     'skia/src/gpu/GrPathRendererChain.cpp',
+    'skia/src/gpu/GrPathRendering.cpp',
     'skia/src/gpu/GrPathUtils.cpp',
-    'skia/src/gpu/GrPictureUtils.cpp',
+    'skia/src/gpu/GrPipeline.cpp',
+    'skia/src/gpu/GrPipelineBuilder.cpp',
+    'skia/src/gpu/GrPrimitiveProcessor.cpp',
+    'skia/src/gpu/GrProcessor.cpp',
+    'skia/src/gpu/GrProcessorUnitTest.cpp',
+    'skia/src/gpu/GrProcOptInfo.cpp',
+    'skia/src/gpu/GrProgramElement.cpp',
+    'skia/src/gpu/GrRecordReplaceDraw.cpp',
     'skia/src/gpu/GrRectanizer_pow2.cpp',
     'skia/src/gpu/GrRectanizer_skyline.cpp',
     'skia/src/gpu/GrReducedClip.cpp',
     'skia/src/gpu/GrRenderTarget.cpp',
-    'skia/src/gpu/GrResourceCache.cpp',
+    'skia/src/gpu/GrResourceProvider.cpp',
     'skia/src/gpu/GrSoftwarePathRenderer.cpp',
     'skia/src/gpu/GrStencil.cpp',
-    'skia/src/gpu/GrStencilAndCoverPathRenderer.cpp',
     'skia/src/gpu/GrStencilAndCoverTextContext.cpp',
-    'skia/src/gpu/GrStencilBuffer.cpp',
+    'skia/src/gpu/GrStencilAttachment.cpp',
+    'skia/src/gpu/GrStrokeInfo.cpp',
     'skia/src/gpu/GrSurface.cpp',
     'skia/src/gpu/GrSWMaskHelper.cpp',
+    'skia/src/gpu/GrTestUtils.cpp',
+    'skia/src/gpu/GrTextBlobCache.cpp',
     'skia/src/gpu/GrTextContext.cpp',
-    'skia/src/gpu/GrTextStrike.cpp',
     'skia/src/gpu/GrTexture.cpp',
     'skia/src/gpu/GrTextureAccess.cpp',
+    'skia/src/gpu/GrTextureParamsAdjuster.cpp',
+    'skia/src/gpu/GrTextureProvider.cpp',
     'skia/src/gpu/GrTraceMarker.cpp',
+    'skia/src/gpu/GrXferProcessor.cpp',
+    'skia/src/gpu/GrYUVProvider.cpp',
     'skia/src/gpu/SkGpuDevice.cpp',
+    'skia/src/gpu/SkGpuDevice_drawTexture.cpp',
     'skia/src/gpu/SkGr.cpp',
     'skia/src/gpu/SkGrPixelRef.cpp',
     'skia/src/gpu/SkGrTexturePixelRef.cpp',
     'skia/src/image/SkImage.cpp',
-    'skia/src/image/SkImage_Gpu.cpp',
+    'skia/src/image/SkImage_Generator.cpp',
     'skia/src/image/SkImage_Raster.cpp',
-    'skia/src/image/SkImagePriv.cpp',
+    'skia/src/image/SkImageShader.cpp',
     'skia/src/image/SkSurface.cpp',
     'skia/src/image/SkSurface_Gpu.cpp',
     'skia/src/image/SkSurface_Raster.cpp',
@@ -331,26 +364,27 @@ UNIFIED_SOURCES += [
     'skia/src/images/SkDecodingImageGenerator.cpp',
     'skia/src/images/SkPageFlipper.cpp',
     'skia/src/images/SkScaledBitmapSampler.cpp',
-    'skia/src/lazy/SkCachingPixelRef.cpp',
     'skia/src/lazy/SkDiscardableMemoryPool.cpp',
     'skia/src/lazy/SkDiscardablePixelRef.cpp',
     'skia/src/pathops/SkAddIntersections.cpp',
-    'skia/src/pathops/SkDCubicIntersection.cpp',
+    'skia/src/pathops/SkDConicLineIntersection.cpp',
     'skia/src/pathops/SkDCubicLineIntersection.cpp',
     'skia/src/pathops/SkDCubicToQuads.cpp',
     'skia/src/pathops/SkDLineIntersection.cpp',
-    'skia/src/pathops/SkDQuadImplicit.cpp',
-    'skia/src/pathops/SkDQuadIntersection.cpp',
     'skia/src/pathops/SkDQuadLineIntersection.cpp',
     'skia/src/pathops/SkIntersections.cpp',
     'skia/src/pathops/SkOpAngle.cpp',
+    'skia/src/pathops/SkOpBuilder.cpp',
+    'skia/src/pathops/SkOpCoincidence.cpp',
     'skia/src/pathops/SkOpContour.cpp',
+    'skia/src/pathops/SkOpCubicHull.cpp',
     'skia/src/pathops/SkOpEdgeBuilder.cpp',
     'skia/src/pathops/SkOpSegment.cpp',
-    'skia/src/pathops/SkPathOpsBounds.cpp',
+    'skia/src/pathops/SkOpSpan.cpp',
     'skia/src/pathops/SkPathOpsCommon.cpp',
+    'skia/src/pathops/SkPathOpsConic.cpp',
     'skia/src/pathops/SkPathOpsCubic.cpp',
-    'skia/src/pathops/SkPathOpsDebug.cpp',
+    'skia/src/pathops/SkPathOpsCurve.cpp',
     'skia/src/pathops/SkPathOpsLine.cpp',
     'skia/src/pathops/SkPathOpsOp.cpp',
     'skia/src/pathops/SkPathOpsPoint.cpp',
@@ -358,21 +392,24 @@ UNIFIED_SOURCES += [
     'skia/src/pathops/SkPathOpsRect.cpp',
     'skia/src/pathops/SkPathOpsSimplify.cpp',
     'skia/src/pathops/SkPathOpsTightBounds.cpp',
-    'skia/src/pathops/SkPathOpsTriangle.cpp',
+    'skia/src/pathops/SkPathOpsTSect.cpp',
     'skia/src/pathops/SkPathOpsTypes.cpp',
+    'skia/src/pathops/SkPathOpsWinding.cpp',
     'skia/src/pathops/SkPathWriter.cpp',
-    'skia/src/pathops/SkQuarticRoot.cpp',
     'skia/src/pathops/SkReduceOrder.cpp',
     'skia/src/pipe/SkGPipeRead.cpp',
     'skia/src/pipe/SkGPipeWrite.cpp',
     'skia/src/ports/SkDiscardableMemory_none.cpp',
     'skia/src/ports/SkGlobalInitialization_default.cpp',
     'skia/src/ports/SkImageDecoder_empty.cpp',
+    'skia/src/ports/SkImageGenerator_skia.cpp',
     'skia/src/ports/SkMemory_mozalloc.cpp',
     'skia/src/ports/SkOSFile_stdio.cpp',
     'skia/src/sfnt/SkOTTable_name.cpp',
     'skia/src/sfnt/SkOTUtils.cpp',
+    'skia/src/utils/android/SkAndroidSDKCanvas.cpp',
     'skia/src/utils/SkBase64.cpp',
+    'skia/src/utils/SkBitmapSourceDeserializer.cpp',
     'skia/src/utils/SkBitSet.cpp',
     'skia/src/utils/SkBoundaryPatch.cpp',
     'skia/src/utils/SkCamera.cpp',
@@ -381,11 +418,10 @@ UNIFIED_SOURCES += [
     'skia/src/utils/SkCubicInterval.cpp',
     'skia/src/utils/SkCullPoints.cpp',
     'skia/src/utils/SkDashPath.cpp',
-    'skia/src/utils/SkDeferredCanvas.cpp',
     'skia/src/utils/SkDumpCanvas.cpp',
     'skia/src/utils/SkEventTracer.cpp',
     'skia/src/utils/SkFrontBufferedStream.cpp',
-    'skia/src/utils/SkGatherPixelRefsAndRects.cpp',
+    'skia/src/utils/SkImageGeneratorUtils.cpp',
     'skia/src/utils/SkInterpolator.cpp',
     'skia/src/utils/SkLayer.cpp',
     'skia/src/utils/SkMatrix22.cpp',
@@ -395,16 +431,17 @@ UNIFIED_SOURCES += [
     'skia/src/utils/SkNullCanvas.cpp',
     'skia/src/utils/SkNWayCanvas.cpp',
     'skia/src/utils/SkOSFile.cpp',
+    'skia/src/utils/SkPaintFilterCanvas.cpp',
     'skia/src/utils/SkParseColor.cpp',
-    'skia/src/utils/SkParsePath.cpp',
-    'skia/src/utils/SkPathUtils.cpp',
-    'skia/src/utils/SkPictureUtils.cpp',
-    'skia/src/utils/SkProxyCanvas.cpp',
+    'skia/src/utils/SkPatchGrid.cpp',
+    'skia/src/utils/SkPatchUtils.cpp',
     'skia/src/utils/SkRTConf.cpp',
+    'skia/src/utils/SkTextBox.cpp',
     'skia/src/utils/SkTextureCompressor.cpp',
     'skia/src/utils/SkTextureCompressor_ASTC.cpp',
     'skia/src/utils/SkTextureCompressor_LATC.cpp',
     'skia/src/utils/SkTextureCompressor_R11EAC.cpp',
+    'skia/src/utils/SkWhitelistTypefaces.cpp',
 ]
 SOURCES += [
     'skia/src/core/SkAdvancedTypefaceMetrics.cpp',
@@ -414,33 +451,93 @@ SOURCES += [
     'skia/src/core/SkBlitter_RGB16.cpp',
     'skia/src/core/SkBlitter_Sprite.cpp',
     'skia/src/core/SkFontHost.cpp',
+    'skia/src/core/SkOpts.cpp',
     'skia/src/core/SkPictureData.cpp',
-    'skia/src/core/SkScaledImageCache.cpp',
+    'skia/src/core/SkRecorder.cpp',
     'skia/src/core/SkScan_Antihair.cpp',
-    'skia/src/gpu/GrAddPathRenderers_default.cpp',
-    'skia/src/gpu/GrDistanceFieldTextContext.cpp',
+    'skia/src/effects/SkArithmeticMode_gpu.cpp',
+    'skia/src/gpu/batches/GrAAConvexPathRenderer.cpp',
+    'skia/src/gpu/batches/GrAAConvexTessellator.cpp',
+    'skia/src/gpu/batches/GrAADistanceFieldPathRenderer.cpp',
+    'skia/src/gpu/batches/GrAAFillRectBatch.cpp',
+    'skia/src/gpu/batches/GrAAHairLinePathRenderer.cpp',
+    'skia/src/gpu/batches/GrAALinearizingConvexPathRenderer.cpp',
+    'skia/src/gpu/batches/GrAAStrokeRectBatch.cpp',
+    'skia/src/gpu/gl/builders/GrGLProgramBuilder.cpp',
+    'skia/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp',
+    'skia/src/gpu/gl/builders/GrGLSLPrettyPrint.cpp',
+    'skia/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp',
+    'skia/src/gpu/gl/GrGLAssembleInterface.cpp',
+    'skia/src/gpu/gl/GrGLBufferImpl.cpp',
+    'skia/src/gpu/gl/GrGLCaps.cpp',
+    'skia/src/gpu/gl/GrGLContext.cpp',
+    'skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
+    'skia/src/gpu/gl/GrGLCreateNullInterface.cpp',
+    'skia/src/gpu/gl/GrGLDefaultInterface_native.cpp',
+    'skia/src/gpu/gl/GrGLExtensions.cpp',
+    'skia/src/gpu/gl/GrGLGLSL.cpp',
+    'skia/src/gpu/gl/GrGLGpu.cpp',
+    'skia/src/gpu/gl/GrGLGpuProgramCache.cpp',
+    'skia/src/gpu/gl/GrGLIndexBuffer.cpp',
+    'skia/src/gpu/gl/GrGLInterface.cpp',
+    'skia/src/gpu/gl/GrGLNameAllocator.cpp',
+    'skia/src/gpu/gl/GrGLNoOpInterface.cpp',
+    'skia/src/gpu/gl/GrGLPath.cpp',
+    'skia/src/gpu/gl/GrGLPathRange.cpp',
+    'skia/src/gpu/gl/GrGLPathRendering.cpp',
+    'skia/src/gpu/gl/GrGLProgram.cpp',
+    'skia/src/gpu/gl/GrGLProgramDataManager.cpp',
+    'skia/src/gpu/gl/GrGLProgramDesc.cpp',
+    'skia/src/gpu/gl/GrGLRenderTarget.cpp',
+    'skia/src/gpu/gl/GrGLStencilAttachment.cpp',
+    'skia/src/gpu/gl/GrGLTexture.cpp',
+    'skia/src/gpu/gl/GrGLTextureRenderTarget.cpp',
+    'skia/src/gpu/gl/GrGLUtil.cpp',
+    'skia/src/gpu/gl/GrGLVaryingHandler.cpp',
+    'skia/src/gpu/gl/GrGLVertexArray.cpp',
+    'skia/src/gpu/gl/GrGLVertexBuffer.cpp',
+    'skia/src/gpu/glsl/GrGLSL.cpp',
+    'skia/src/gpu/glsl/GrGLSLBlend.cpp',
+    'skia/src/gpu/glsl/GrGLSLCaps.cpp',
+    'skia/src/gpu/glsl/GrGLSLFragmentProcessor.cpp',
+    'skia/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp',
+    'skia/src/gpu/glsl/GrGLSLGeometryProcessor.cpp',
+    'skia/src/gpu/glsl/GrGLSLGeometryShaderBuilder.cpp',
+    'skia/src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp',
+    'skia/src/gpu/glsl/GrGLSLProgramBuilder.cpp',
+    'skia/src/gpu/glsl/GrGLSLShaderBuilder.cpp',
+    'skia/src/gpu/glsl/GrGLSLUtil.cpp',
+    'skia/src/gpu/glsl/GrGLSLVarying.cpp',
+    'skia/src/gpu/glsl/GrGLSLVertexShaderBuilder.cpp',
+    'skia/src/gpu/glsl/GrGLSLXferProcessor.cpp',
+    'skia/src/gpu/GrBatchAtlas.cpp',
+    'skia/src/gpu/GrDrawContext.cpp',
+    'skia/src/gpu/GrResourceCache.cpp',
+    'skia/src/image/SkImage_Gpu.cpp',
+    'skia/src/pathops/SkPathOpsDebug.cpp',
     'skia/src/utils/SkMD5.cpp',
     'skia/src/utils/SkParse.cpp',
+    'skia/src/utils/SkParsePath.cpp',
     'skia/src/utils/SkSHA1.cpp',
 ]
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
     UNIFIED_SOURCES += [
         'skia/src/ports/SkDebug_android.cpp',
         'skia/src/ports/SkOSFile_posix.cpp',
+        'skia/src/ports/SkOSLibrary_posix.cpp',
         'skia/src/ports/SkTime_Unix.cpp',
         'skia/src/ports/SkTLS_pthread.cpp',
         'skia/src/utils/SkThreadUtils_pthread.cpp',
     ]
     SOURCES += [
-        'skia/src/ports/SkFontHost_android_old.cpp',
         'skia/src/ports/SkFontHost_cairo.cpp',
-        'skia/src/ports/SkFontHost_FreeType.cpp',
         'skia/src/ports/SkFontHost_FreeType_common.cpp',
     ]
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in {'cocoa', 'uikit'}:
     UNIFIED_SOURCES += [
         'skia/src/ports/SkDebug_stdio.cpp',
         'skia/src/ports/SkOSFile_posix.cpp',
+        'skia/src/ports/SkOSLibrary_posix.cpp',
         'skia/src/ports/SkTime_Unix.cpp',
         'skia/src/ports/SkTLS_pthread.cpp',
         'skia/src/utils/mac/SkCreateCGImageRef.cpp',
@@ -454,35 +551,36 @@ if CONFIG['MOZ_WIDGET_GTK']:
     UNIFIED_SOURCES += [
         'skia/src/ports/SkDebug_stdio.cpp',
         'skia/src/ports/SkOSFile_posix.cpp',
+        'skia/src/ports/SkOSLibrary_posix.cpp',
         'skia/src/ports/SkTime_Unix.cpp',
         'skia/src/ports/SkTLS_pthread.cpp',
         'skia/src/utils/SkThreadUtils_pthread.cpp',
     ]
     SOURCES += [
         'skia/src/ports/SkFontHost_cairo.cpp',
-        'skia/src/ports/SkFontHost_FreeType.cpp',
         'skia/src/ports/SkFontHost_FreeType_common.cpp',
     ]
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
     UNIFIED_SOURCES += [
         'skia/src/ports/SkDebug_stdio.cpp',
         'skia/src/ports/SkOSFile_posix.cpp',
+        'skia/src/ports/SkOSLibrary_posix.cpp',
         'skia/src/ports/SkTime_Unix.cpp',
         'skia/src/ports/SkTLS_pthread.cpp',
         'skia/src/utils/SkThreadUtils_pthread.cpp',
     ]
     SOURCES += [
         'skia/src/ports/SkFontHost_cairo.cpp',
-        'skia/src/ports/SkFontHost_FreeType.cpp',
         'skia/src/ports/SkFontHost_FreeType_common.cpp',
     ]
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     SOURCES += [
         'skia/src/ports/SkDebug_win.cpp',
         'skia/src/ports/SkFontHost_win.cpp',
-        'skia/src/ports/SkFontMgr_default_dw.cpp',
         'skia/src/ports/SkFontMgr_win_dw.cpp',
+        'skia/src/ports/SkFontMgr_win_dw_factory.cpp',
         'skia/src/ports/SkOSFile_win.cpp',
+        'skia/src/ports/SkOSLibrary_win.cpp',
         'skia/src/ports/SkRemotableFontMgr_win_dw.cpp',
         'skia/src/ports/SkScalerContext_win_dw.cpp',
         'skia/src/ports/SkTime_win.cpp',
@@ -497,32 +595,22 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
         'skia/src/utils/win/SkIStream.cpp',
     ]
 if CONFIG['INTEL_ARCHITECTURE']:
-    UNIFIED_SOURCES += [
-        'skia/src/opts/SkTextureCompression_opts_none.cpp',
-    ]
     SOURCES += [
         'skia/src/opts/opts_check_x86.cpp',
         'skia/src/opts/SkBitmapFilter_opts_SSE2.cpp',
         'skia/src/opts/SkBitmapProcState_opts_SSE2.cpp',
         'skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp',
-        'skia/src/opts/SkBlitRect_opts_SSE2.cpp',
         'skia/src/opts/SkBlitRow_opts_SSE2.cpp',
-        'skia/src/opts/SkBlurImage_opts_SSE2.cpp',
-        'skia/src/opts/SkBlurImage_opts_SSE4.cpp',
-        'skia/src/opts/SkMorphology_opts_SSE2.cpp',
-        'skia/src/opts/SkUtils_opts_SSE2.cpp',
-        'skia/src/opts/SkXfermode_opts_SSE2.cpp',
+        'skia/src/opts/SkBlitRow_opts_SSE4.cpp',
+        'skia/src/opts/SkOpts_avx.cpp',
+        'skia/src/opts/SkOpts_sse41.cpp',
+        'skia/src/opts/SkOpts_ssse3.cpp',
     ]
 elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
     UNIFIED_SOURCES += [
         'skia/src/core/SkUtilsArm.cpp',
         'skia/src/opts/SkBitmapProcState_opts_arm.cpp',
         'skia/src/opts/SkBlitMask_opts_arm.cpp',
-        'skia/src/opts/SkBlurImage_opts_arm.cpp',
-        'skia/src/opts/SkMorphology_opts_arm.cpp',
-        'skia/src/opts/SkTextureCompression_opts_arm.cpp',
-        'skia/src/opts/SkUtils_opts_arm.cpp',
-        'skia/src/opts/SkXfermode_opts_arm.cpp',
     ]
     SOURCES += [
         'skia/src/opts/SkBlitRow_opts_arm.cpp',
@@ -533,61 +621,27 @@ elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
             'skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp',
             'skia/src/opts/SkBlitMask_opts_arm_neon.cpp',
             'skia/src/opts/SkBlitRow_opts_arm_neon.cpp',
-            'skia/src/opts/SkBlurImage_opts_neon.cpp',
-            'skia/src/opts/SkMorphology_opts_neon.cpp',
-            'skia/src/opts/SkTextureCompression_opts_neon.cpp',
-            'skia/src/opts/SkXfermode_opts_arm_neon.cpp',
+            'skia/src/opts/SkOpts_neon.cpp',
         ]
         SOURCES['skia/src/opts/SkBitmapProcState_arm_neon.cpp'].flags += ['-mfpu=neon']
         SOURCES['skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp'].flags += ['-mfpu=neon']
         SOURCES['skia/src/opts/SkBlitMask_opts_arm_neon.cpp'].flags += ['-mfpu=neon']
         SOURCES['skia/src/opts/SkBlitRow_opts_arm_neon.cpp'].flags += ['-mfpu=neon']
-        SOURCES['skia/src/opts/SkBlurImage_opts_neon.cpp'].flags += ['-mfpu=neon']
-        SOURCES['skia/src/opts/SkMorphology_opts_neon.cpp'].flags += ['-mfpu=neon']
-        SOURCES['skia/src/opts/SkTextureCompression_opts_neon.cpp'].flags += ['-mfpu=neon']
-        SOURCES['skia/src/opts/SkXfermode_opts_arm_neon.cpp'].flags += ['-mfpu=neon']
+        SOURCES['skia/src/opts/SkOpts_neon.cpp'].flags += ['-mfpu=neon']
 else:
     UNIFIED_SOURCES += [
         'skia/src/opts/SkBitmapProcState_opts_none.cpp',
         'skia/src/opts/SkBlitMask_opts_none.cpp',
         'skia/src/opts/SkBlitRow_opts_none.cpp',
-        'skia/src/opts/SkBlurImage_opts_none.cpp',
-        'skia/src/opts/SkMorphology_opts_none.cpp',
-        'skia/src/opts/SkTextureCompression_opts_none.cpp',
-        'skia/src/opts/SkUtils_opts_none.cpp',
-        'skia/src/opts/SkXfermode_opts_none.cpp',
     ]
 
 
-# can we find a better way of dealing with asm sources?
-
-# left out of UNIFIED_SOURCES for now; that's not C++ anyway, nothing else to unify it with
-#XXX: doesn't build with Apple's assembler
-if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC'] and CONFIG['OS_TARGET'] != 'Darwin':
-    SOURCES += [
-        'skia/src/opts/memset.arm.S',
-    ]
-    if CONFIG['BUILD_ARM_NEON']:
-        SOURCES += [
-            'skia/src/opts/memset16_neon.S',
-            'skia/src/opts/memset32_neon.S',
-        ]
-
-if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['GNU_CC'] and CONFIG['OS_ARCH'] != 'WINNT':
-    if CONFIG['CPU_ARCH'] == 'x86_64':
-        SOURCES += [
-            'skia/src/opts/SkBlitRow_opts_SSE4_x64_asm.S',
-        ]
-    else:
-        SOURCES += [
-            'skia/src/opts/SkBlitRow_opts_SSE4_asm.S',
-        ]
-
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
 
 FINAL_LIBRARY = 'gkmedias'
 LOCAL_INCLUDES += [
+    'skia/include/c',
     'skia/include/config',
     'skia/include/core',
     'skia/include/effects',
@@ -596,6 +650,7 @@ LOCAL_INCLUDES += [
     'skia/include/pathops',
     'skia/include/pipe',
     'skia/include/ports',
+    'skia/include/private',
     'skia/include/utils',
     'skia/include/utils/mac',
     'skia/include/utils/win',
@@ -613,16 +668,16 @@ LOCAL_INCLUDES += [
     'skia/src/utils/win',
 ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'qt', 'gonk', 'cocoa', 'uikit'):
-    DEFINES['SK_USE_POSIX_THREADS'] = 1
-
-if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSSE3']:
-    DEFINES['SK_BUILD_SSSE3'] = 1
-
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
     DEFINES['SK_FONTHOST_CAIRO_STANDALONE'] = 0
 
-if (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android') or    (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa') or (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit') or    (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk') or    (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt') or    CONFIG['MOZ_WIDGET_GTK']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in {
+    'android',
+    'cocoa',
+    'uikit',
+    'gonk',
+    'qt',
+  } or CONFIG['MOZ_WIDGET_GTK']:
     DEFINES['SK_FONTHOST_DOES_NOT_USE_FONTMGR'] = 1
 
 # We should autogenerate these SSE related flags.
@@ -630,37 +685,33 @@ if (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android') or    (CONFIG['MOZ_WIDGET_TOOLKIT
 if CONFIG['_MSC_VER']:
     # MSVC doesn't need special compiler flags, but Skia needs to be told that these files should
     # be built with the required SSE level or it will simply compile in stubs and cause runtime crashes
-    SOURCES['skia/src/opts/SkBitmapFilter_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['skia/src/opts/SkBitmapProcState_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=31']
-    SOURCES['skia/src/opts/SkBlitRect_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['skia/src/opts/SkBlitRow_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['skia/src/opts/SkBlurImage_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['skia/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=41']
-    SOURCES['skia/src/opts/SkMorphology_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['skia/src/opts/SkUtils_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['skia/src/opts/SkXfermode_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-
+    SOURCES['skia/src/opts/SkBitmapFilter_opts_SSE2.cpp'].flags += ['/arch:SSE2 -DSK_CPU_SSE_LEVEL=20']
+    SOURCES['skia/src/opts/SkBitmapProcState_opts_SSE2.cpp'].flags += ['/arch:SSE2 -DSK_CPU_SSE_LEVEL=20']
+    SOURCES['skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['/arch:SSE2 -DSK_CPU_SSE_LEVEL=31']
+    SOURCES['skia/src/opts/SkBlitRow_opts_SSE2.cpp'].flags += ['/arch:SSE2 -DSK_CPU_SSE_LEVEL=20']
+    SOURCES['skia/src/opts/SkBlitRow_opts_SSE4.cpp'].flags += ['/arch:SSE2 -DSK_CPU_SSE_LEVEL=41']
+    SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += ['/arch:SSE2 -DSK_CPU_SSE_LEVEL=31']
+    SOURCES['skia/src/opts/SkOpts_sse41.cpp'].flags += ['/arch:SSE2 -DSK_CPU_SSE_LEVEL=41']
+    SOURCES['skia/src/opts/SkOpts_avx.cpp'].flags += ['/arch:AVX -DSK_CPU_SSE_LEVEL=51']
 if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['GNU_CC']:
     SOURCES['skia/src/opts/SkBitmapFilter_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
     SOURCES['skia/src/opts/SkBitmapProcState_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
     SOURCES['skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-mssse3']
-    SOURCES['skia/src/opts/SkBlitRect_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
     SOURCES['skia/src/opts/SkBlitRow_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-    SOURCES['skia/src/opts/SkBlurImage_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-    SOURCES['skia/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-msse4.1']
-    SOURCES['skia/src/opts/SkMorphology_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-    SOURCES['skia/src/opts/SkUtils_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-    SOURCES['skia/src/opts/SkXfermode_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+    SOURCES['skia/src/opts/SkBlitRow_opts_SSE4.cpp'].flags += ['-msse4.1']
+    SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += ['-mssse3']
+    SOURCES['skia/src/opts/SkOpts_sse41.cpp'].flags += ['-msse4.1']
+    SOURCES['skia/src/opts/SkOpts_avx.cpp'].flags += ['-mavx']
 elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC'] and CONFIG['BUILD_ARM_NEON']:
-    DEFINES['__ARM_HAVE_OPTIONAL_NEON_SUPPORT'] = 1
-    DEFINES['USE_ANDROID_NDK_CPU_FEATURES'] = 0
+    DEFINES['SK_ARM_HAS_OPTIONAL_NEON'] = 1
 elif CONFIG['CLANG_CL']:
     SOURCES['skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-mssse3']
-    SOURCES['skia/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-msse4.1']
+    SOURCES['skia/src/opts/SkBlitRow_opts_SSE4.cpp'].flags += ['-msse4.1']
+    SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += ['-mssse3']
+    SOURCES['skia/src/opts/SkOpts_sse41.cpp'].flags += ['-msse4.1']
+    SOURCES['skia/src/opts/SkOpts_avx.cpp'].flags += ['-mavx']
 
 DEFINES['SKIA_IMPLEMENTATION'] = 1
-DEFINES['GR_IMPLEMENTATION'] = 1
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += [
@@ -676,6 +727,8 @@ if CONFIG['GNU_CXX']:
             '-Wno-macro-redefined',
             '-Wno-unused-private-field',
         ]
+        # work around inline function linking bug with template arguments
+        SOURCES['skia/src/gpu/GrResourceCache.cpp'].flags += ['-fkeep-inline-functions']
     else:
         CXXFLAGS += [
             '-Wno-logical-op',

From 8f5cdef8ad445a3038fa62762a5ac0569e488b9f Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@mozilla.com>
Date: Fri, 18 Dec 2015 13:53:25 -0500
Subject: [PATCH 045/101] Bug 1082598 - Part 8: Fix OpenGL interface glue for
 Skia update. r=jrmuizel

---
 gfx/gl/SkiaGLGlue.cpp | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gfx/gl/SkiaGLGlue.cpp b/gfx/gl/SkiaGLGlue.cpp
index 1868ed4ea32a..7ffcab1c73ce 100755
--- a/gfx/gl/SkiaGLGlue.cpp
+++ b/gfx/gl/SkiaGLGlue.cpp
@@ -89,6 +89,11 @@ GrGLvoid glBlendColor_mozilla(GrGLclampf red, GrGLclampf green, GrGLclampf blue,
     return sGLContext.get()->fBlendColor(red, green, blue, alpha);
 }
 
+GrGLvoid glBlendEquation_mozilla(GrGLenum mode)
+{
+    return sGLContext.get()->fBlendEquation(mode);
+}
+
 GrGLvoid glBlendFunc_mozilla(GrGLenum sfactor, GrGLenum dfactor)
 {
     return sGLContext.get()->fBlendFunc(sfactor, dfactor);
@@ -315,6 +320,11 @@ GrGLvoid glGetShaderiv_mozilla(GrGLuint shader, GrGLenum pname, GrGLint* params)
     return sGLContext.get()->fGetShaderiv(shader, pname, params);
 }
 
+GrGLvoid glGetShaderPrecisionFormat_mozilla(GrGLenum shadertype, GrGLenum precisiontype, GLint *range, GLint *precision)
+{
+    return sGLContext.get()->fGetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
+}
+
 const GLubyte* glGetString_mozilla(GrGLenum name)
 {
     // GLContext only exposes a OpenGL 2.0 style API, so we have to intercept a bunch
@@ -357,6 +367,12 @@ const GLubyte* glGetString_mozilla(GrGLenum name)
                 if (sGLContext.get()->IsSupported(GLFeature::standard_derivatives)) {
                     strcat(extensionsString, "GL_OES_standard_derivatives ");
                 }
+            } else {
+                if (sGLContext.get()->IsSupported(GLFeature::framebuffer_object)) {
+                    strcat(extensionsString, "GL_ARB_framebuffer_object ");
+                } else if (sGLContext.get()->IsExtensionSupported(GLContext::EXT_framebuffer_object)) {
+                    strcat(extensionsString, "GL_EXT_framebuffer_object ");
+                }
             }
 
             if (sGLContext.get()->IsExtensionSupported(GLContext::EXT_texture_format_BGRA8888)) {
@@ -581,6 +597,21 @@ GrGLvoid glUseProgram_mozilla(GrGLuint program)
     return sGLContext.get()->fUseProgram(program);
 }
 
+GrGLvoid glVertexAttrib1f_mozilla(GrGLuint index, GrGLfloat value)
+{
+    return sGLContext.get()->fVertexAttrib1f(index, value);
+}
+
+GrGLvoid glVertexAttrib2fv_mozilla(GrGLuint index, const GrGLfloat* values)
+{
+    return sGLContext.get()->fVertexAttrib2fv(index, values);
+}
+
+GrGLvoid glVertexAttrib3fv_mozilla(GrGLuint index, const GrGLfloat* values)
+{
+    return sGLContext.get()->fVertexAttrib3fv(index, values);
+}
+
 GrGLvoid glVertexAttrib4fv_mozilla(GrGLuint index, const GrGLfloat* values)
 {
     return sGLContext.get()->fVertexAttrib4fv(index, values);
@@ -767,6 +798,7 @@ static GrGLInterface* CreateGrGLInterfaceFromGLContext(GLContext* context)
     i->fFunctions.fBindTexture = glBindTexture_mozilla;
     i->fFunctions.fBlendFunc = glBlendFunc_mozilla;
     i->fFunctions.fBlendColor = glBlendColor_mozilla;
+    i->fFunctions.fBlendEquation = glBlendEquation_mozilla;
     i->fFunctions.fBufferData = glBufferData_mozilla;
     i->fFunctions.fBufferSubData = glBufferSubData_mozilla;
     i->fFunctions.fCheckFramebufferStatus = glCheckFramebufferStatus_mozilla;
@@ -811,6 +843,7 @@ static GrGLInterface* CreateGrGLInterfaceFromGLContext(GLContext* context)
     i->fFunctions.fGetRenderbufferParameteriv = glGetRenderbufferParameteriv_mozilla;
     i->fFunctions.fGetShaderInfoLog = glGetShaderInfoLog_mozilla;
     i->fFunctions.fGetShaderiv = glGetShaderiv_mozilla;
+    i->fFunctions.fGetShaderPrecisionFormat = glGetShaderPrecisionFormat_mozilla;
     i->fFunctions.fGetString = glGetString_mozilla;
     i->fFunctions.fGetUniformLocation = glGetUniformLocation_mozilla;
     i->fFunctions.fLineWidth = glLineWidth_mozilla;
@@ -847,6 +880,9 @@ static GrGLInterface* CreateGrGLInterfaceFromGLContext(GLContext* context)
     i->fFunctions.fUniformMatrix3fv = glUniformMatrix3fv_mozilla;
     i->fFunctions.fUniformMatrix4fv = glUniformMatrix4fv_mozilla;
     i->fFunctions.fUseProgram = glUseProgram_mozilla;
+    i->fFunctions.fVertexAttrib1f = glVertexAttrib1f_mozilla;
+    i->fFunctions.fVertexAttrib2fv = glVertexAttrib2fv_mozilla;
+    i->fFunctions.fVertexAttrib3fv = glVertexAttrib3fv_mozilla;
     i->fFunctions.fVertexAttrib4fv = glVertexAttrib4fv_mozilla;
     i->fFunctions.fVertexAttribPointer = glVertexAttribPointer_mozilla;
     i->fFunctions.fViewport = glViewport_mozilla;

From 54897f1c6a2706ede494bba0fbc0ce85ca625ddd Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@mozilla.com>
Date: Fri, 18 Dec 2015 13:53:26 -0500
Subject: [PATCH 046/101] Bug 1082598 - Part 9: Fix test failures for Skia
 update. r=jrmuizel

---
 dom/canvas/test/test_canvas.html                    | 13 ++-----------
 layout/reftests/canvas/reftest.list                 |  2 +-
 layout/reftests/css-gradients/reftest.list          |  2 +-
 layout/reftests/writing-mode/reftest.list           |  6 +++---
 .../2d.path.arcTo.shape.curve1.html.ini             |  9 ---------
 .../2d.path.arcTo.shape.curve2.html.ini             |  9 ---------
 .../path-objects/2d.path.stroke.prune.arc.html.ini  |  3 +++
 .../2d.path.stroke.prune.curve.html.ini             |  3 +++
 .../path-objects/2d.path.stroke.prune.line.html.ini |  3 +++
 9 files changed, 16 insertions(+), 34 deletions(-)
 delete mode 100644 testing/web-platform/meta/2dcontext/path-objects/2d.path.arcTo.shape.curve1.html.ini
 delete mode 100644 testing/web-platform/meta/2dcontext/path-objects/2d.path.arcTo.shape.curve2.html.ini

diff --git a/dom/canvas/test/test_canvas.html b/dom/canvas/test/test_canvas.html
index a84a54d661f3..a8b67b3e2097 100644
--- a/dom/canvas/test/test_canvas.html
+++ b/dom/canvas/test/test_canvas.html
@@ -14401,12 +14401,7 @@ ctx.moveTo(50, 25);
 ctx.bezierCurveTo(50, 25, 50, 25, 50, 25);
 ctx.stroke();
 
-if (IsAzureSkia()) {
-  isPixel(ctx, 50,25, 0,255,0,255, 0);
-} else {
-  todo_isPixel(ctx, 50,25, 0,255,0,255, 0);
-}
-
+todo_isPixel(ctx, 50,25, 0,255,0,255, 0);
 
 }
 </script>
@@ -14438,11 +14433,7 @@ ctx.moveTo(50, 25);
 ctx.lineTo(50, 25);
 ctx.stroke();
 
-if (IsAzureSkia()) {
-  isPixel(ctx, 50,25, 0,255,0,255, 0);
-} else {
-  todo_isPixel(ctx, 50,25, 0,255,0,255, 0);
-}
+todo_isPixel(ctx, 50,25, 0,255,0,255, 0);
 
 }
 </script>
diff --git a/layout/reftests/canvas/reftest.list b/layout/reftests/canvas/reftest.list
index 62c3ada7149b..74f438a09db2 100644
--- a/layout/reftests/canvas/reftest.list
+++ b/layout/reftests/canvas/reftest.list
@@ -94,7 +94,7 @@ fails-if(azureQuartz&&OSX==1006) == 672646-alpha-radial-gradient.html 672646-alp
 == 726951-shadow-clips.html 726951-shadow-clips-ref.html
 
 == transformed-clip.html transformed-clip-ref.html
-== transformed-gradient.html transformed-gradient-ref.html
+fuzzy-if(azureSkia,1,15) == transformed-gradient.html transformed-gradient-ref.html
 == transformed-path.html transformed-path.html
 
 == 749467-1.html 749467-1-ref.html
diff --git a/layout/reftests/css-gradients/reftest.list b/layout/reftests/css-gradients/reftest.list
index 19c45747ea7b..1d8629e2c1d5 100644
--- a/layout/reftests/css-gradients/reftest.list
+++ b/layout/reftests/css-gradients/reftest.list
@@ -130,7 +130,7 @@ fuzzy-if(!contentSameGfxBackendAsCanvas,2,19999) fuzzy-if(azureSkiaGL,8,20000) f
 fuzzy-if(!contentSameGfxBackendAsCanvas,4,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,8655) == aja-linear-4a.html aja-linear-4-ref.html 
 fuzzy-if(!contentSameGfxBackendAsCanvas,4,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,8655) == aja-linear-4b.html aja-linear-4-ref.html 
 fuzzy-if(!contentSameGfxBackendAsCanvas,4,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,2,7878) == aja-linear-5a.html aja-linear-5-ref.html 
-fuzzy-if(!contentSameGfxBackendAsCanvas,2,16477) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz,2,10163) == aja-linear-6a.html aja-linear-6-ref.html # bug 526708 
+fuzzy-if(!contentSameGfxBackendAsCanvas,2,16500) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz,2,10163) == aja-linear-6a.html aja-linear-6-ref.html # bug 526708 
 fails == aja-linear-6b.html aja-linear-6-ref.html # bug 522607
 skip-if(B2G||Mulet) fuzzy-if(Android,6,10576) == height-dependence-1.html height-dependence-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 skip-if(B2G||Mulet) fuzzy-if(cocoaWidget,1,40000) fuzzy-if(Android,6,10576) == height-dependence-2.html height-dependence-2-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
diff --git a/layout/reftests/writing-mode/reftest.list b/layout/reftests/writing-mode/reftest.list
index 61a533bc1e3e..05464d7ae4cd 100644
--- a/layout/reftests/writing-mode/reftest.list
+++ b/layout/reftests/writing-mode/reftest.list
@@ -16,10 +16,10 @@ fuzzy-if(gtkWidget,255,2) fuzzy-if(winWidget||Android||B2G,4,8704) HTTP(..) == 1
 == 1089388-2.html 1089388-2-ref.html
 == 1090159-1.html 1090159-1-ref.html
 # bug 1230357 fuzz on b2g for subpixel text positioning on skia.
-fuzzy-if(B2G&&azureSkia,128,166) == 1090168-1.html 1090168-1-ref.html
+fuzzy-if(B2G&&azureSkia,130,200) == 1090168-1.html 1090168-1-ref.html
 != 1090168-1.html 1090168-1-notref.html
-fuzzy-if(B2G&&azureSkia,128,166) == 1090168-2.html 1090168-2-ref.html
-fuzzy-if(B2G,244,173) fuzzy-if(Mulet,255,165) fuzzy-if(azureSkia,255,2649) == 1090168-3.html 1090168-3-ref.html # bug 1142928: mark fuzzy on Mulet as on B2G, bug 1230357 for skia.
+fuzzy-if(B2G&&azureSkia,130,200) == 1090168-2.html 1090168-2-ref.html
+fuzzy-if(B2G,244,173) fuzzy-if(Mulet,255,165) fuzzy-if(azureSkia,255,2700) == 1090168-3.html 1090168-3-ref.html # bug 1142928: mark fuzzy on Mulet as on B2G, bug 1230357 for skia.
 == 1091058-1.html 1091058-1-ref.html
 random-if(gtkWidget) == 1094434-1.html 1094434-1-ref.html # bug 1094845
 random-if(gtkWidget) == 1094434-2.html 1094434-2-ref.html # bug 1094845
diff --git a/testing/web-platform/meta/2dcontext/path-objects/2d.path.arcTo.shape.curve1.html.ini b/testing/web-platform/meta/2dcontext/path-objects/2d.path.arcTo.shape.curve1.html.ini
deleted file mode 100644
index f93da15c73a4..000000000000
--- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.arcTo.shape.curve1.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[2d.path.arcTo.shape.curve1.html]
-  type: testharness
-  [arcTo() curves in the right kind of shape]
-    expected:
-      if not debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if os == "mac": FAIL
-
diff --git a/testing/web-platform/meta/2dcontext/path-objects/2d.path.arcTo.shape.curve2.html.ini b/testing/web-platform/meta/2dcontext/path-objects/2d.path.arcTo.shape.curve2.html.ini
deleted file mode 100644
index 95953d2800d0..000000000000
--- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.arcTo.shape.curve2.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[2d.path.arcTo.shape.curve2.html]
-  type: testharness
-  [arcTo() curves in the right kind of shape]
-    expected:
-      if not debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if os == "mac": FAIL
-
diff --git a/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.arc.html.ini b/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.arc.html.ini
index 897bedd03f51..bbb5469d2340 100644
--- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.arc.html.ini
+++ b/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.arc.html.ini
@@ -10,4 +10,7 @@
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL
       if not debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL
+      if (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
+      if (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+      if os == "mac": FAIL
 
diff --git a/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.curve.html.ini b/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.curve.html.ini
index bff057ced1d0..44de284abc2a 100644
--- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.curve.html.ini
+++ b/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.curve.html.ini
@@ -10,4 +10,7 @@
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL
       if not debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL
+      if (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
+      if (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+      if os == "mac": FAIL
 
diff --git a/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.line.html.ini b/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.line.html.ini
index 1168046348fe..7447828f10ce 100644
--- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.line.html.ini
+++ b/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.line.html.ini
@@ -10,4 +10,7 @@
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL
       if not debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL
+      if (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
+      if (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+      if os == "mac": FAIL
 

From 359ac79a09a6333b7c1ae0f5868c816012947259 Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@mozilla.com>
Date: Fri, 18 Dec 2015 13:53:26 -0500
Subject: [PATCH 047/101] Bug 1082598 - clobber for Skia update

---
 CLOBBER | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CLOBBER b/CLOBBER
index 33b2f3c738e1..40fdfc62174d 100644
--- a/CLOBBER
+++ b/CLOBBER
@@ -22,4 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug  1186934  followup needed to clear bustage
+Bug 1082598 - updating Skia

From 31425909032cd24fe122efe4e79e7c7900af1c19 Mon Sep 17 00:00:00 2001
From: Chris Manchester <cmanchester@mozilla.com>
Date: Thu, 17 Dec 2015 12:38:32 -0800
Subject: [PATCH 048/101] Bug 1233506 - Only accept positional arguments to
 mach try that are directories. r=jgraham

--HG--
extra : rebase_source : ef3640736bb3426e01beff81faa97a8a617de6f6
---
 testing/mach_commands.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/testing/mach_commands.py b/testing/mach_commands.py
index f1cabf0d4e69..013c2dc41613 100644
--- a/testing/mach_commands.py
+++ b/testing/mach_commands.py
@@ -533,9 +533,9 @@ class PushToTry(MachCommandBase):
         paths = []
         for p in kwargs["paths"]:
             p = os.path.normpath(os.path.abspath(p))
-            if not p.startswith(self.topsrcdir):
-                print('Specified path "%s" is outside of the srcdir, unable to'
-                      ' specify tests outside of the srcdir' % p)
+            if not (os.path.isdir(p) and p.startswith(self.topsrcdir)):
+                print('Specified path "%s" is not a directory under the srcdir,'
+                      ' unable to specify tests outside of the srcdir' % p)
                 sys.exit(1)
             if len(p) <= len(self.topsrcdir):
                 print('Specified path "%s" is at the top of the srcdir and would'

From 9d3f18e1e368a9870372296526f2ad97cd5de273 Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Fri, 18 Dec 2015 12:17:06 -0700
Subject: [PATCH 049/101] Bug 1233454 - Guard against ps timeout in
 devicemanagerADB.getProcessList; r=jmaher

---
 testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py b/testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py
index 3ea496256147..1d01fd31b7aa 100644
--- a/testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py
+++ b/testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py
@@ -323,10 +323,12 @@ class DeviceManagerADB(DeviceManager):
         return data
 
     def getProcessList(self):
+        ret = []
         p = self._runCmd(["shell", "ps"], timeout=self.short_timeout)
+        if not p or not p.output or len(p.output) < 1:
+            return ret
         # first line is the headers
         p.output.pop(0)
-        ret = []
         for proc in p.output:
             els = proc.split()
             # We need to figure out if this is "user pid name" or

From d447a96b271cb848f63e3787f33add0361e18cfc Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Fri, 18 Dec 2015 12:17:07 -0700
Subject: [PATCH 050/101] Bug 1233311 - Avoid python exception on Android
 cppunit time-out; r=jmaher

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

diff --git a/testing/remotecppunittests.py b/testing/remotecppunittests.py
index 7886a741ef98..a22f02abe30b 100644
--- a/testing/remotecppunittests.py
+++ b/testing/remotecppunittests.py
@@ -171,7 +171,7 @@ class RemoteCPPUnitTests(cppunittests.CPPUnitTests):
         result = returncode == 0
         if not result:
             self.log.test_end(basename, status='FAIL', expected='PASS',
-                              message=("test failed with return code %d" %
+                              message=("test failed with return code %s" %
                                        returncode))
         else:
             self.log.test_end(basename, status='PASS', expected='PASS')

From 62b6b77c10045b179e0cd191819d350a05f5712c Mon Sep 17 00:00:00 2001
From: Jeff Muizelaar <jmuizelaar@mozilla.com>
Date: Tue, 15 Dec 2015 23:02:01 -0500
Subject: [PATCH 051/101] Bug 1218881. Enforce queries' new availability
 semantics. r=jgilbert

This adds a Runnable that we dispatch to the event loop so that we can make
sure queries don't become available before they are supposed to.
---
 dom/canvas/WebGL2ContextQueries.cpp |  8 ++++++++
 dom/canvas/WebGLQuery.cpp           |  1 +
 dom/canvas/WebGLQuery.h             | 16 ++++++++++++++++
 gfx/thebes/gfxPrefs.h               |  1 +
 4 files changed, 26 insertions(+)

diff --git a/dom/canvas/WebGL2ContextQueries.cpp b/dom/canvas/WebGL2ContextQueries.cpp
index b3ffe264e6e6..1fec22d70e3d 100644
--- a/dom/canvas/WebGL2ContextQueries.cpp
+++ b/dom/canvas/WebGL2ContextQueries.cpp
@@ -6,6 +6,8 @@
 #include "WebGL2Context.h"
 #include "GLContext.h"
 #include "WebGLQuery.h"
+#include "gfxPrefs.h"
+#include "nsThreadUtils.h"
 
 namespace mozilla {
 
@@ -255,6 +257,7 @@ WebGL2Context::EndQuery(GLenum target)
     }
 
     UpdateBoundQuery(target, nullptr);
+    NS_DispatchToCurrentThread(new WebGLQuery::AvailableRunnable(activeQuery));
 }
 
 already_AddRefed<WebGLQuery>
@@ -325,6 +328,11 @@ WebGL2Context::GetQueryParameter(JSContext*, WebGLQuery* query, GLenum pname,
         return;
     }
 
+    // We must wait for an event loop before the query can be available
+    if (!query->mCanBeAvailable && !gfxPrefs::WebGLImmediateQueries()) {
+        return;
+    }
+
     MakeContextCurrent();
     GLuint returned = 0;
     switch (pname) {
diff --git a/dom/canvas/WebGLQuery.cpp b/dom/canvas/WebGLQuery.cpp
index 016aa198d194..e557b8b4505c 100644
--- a/dom/canvas/WebGLQuery.cpp
+++ b/dom/canvas/WebGLQuery.cpp
@@ -20,6 +20,7 @@ WebGLQuery::WrapObject(JSContext* cx, JS::Handle<JSObject*> givenProto)
 
 WebGLQuery::WebGLQuery(WebGLContext* webgl)
     : WebGLContextBoundObject(webgl)
+    , mCanBeAvailable(false)
     , mGLName(0)
     , mType(0)
 {
diff --git a/dom/canvas/WebGLQuery.h b/dom/canvas/WebGLQuery.h
index 5886a75ed8a5..7f02fb35d7e2 100644
--- a/dom/canvas/WebGLQuery.h
+++ b/dom/canvas/WebGLQuery.h
@@ -10,6 +10,7 @@
 #include "nsWrapperCache.h"
 
 #include "WebGLObjectModel.h"
+#include "nsThreadUtils.h"
 
 namespace mozilla {
 
@@ -22,6 +23,19 @@ class WebGLQuery final
 public:
     explicit WebGLQuery(WebGLContext* webgl);
 
+    class AvailableRunnable final : public nsRunnable
+    {
+    public:
+        AvailableRunnable(WebGLQuery* query) : mQuery(query) { }
+
+        NS_IMETHOD Run() override {
+            mQuery->mCanBeAvailable = true;
+            return NS_OK;
+        }
+    private:
+        const RefPtr<WebGLQuery> mQuery;
+    };
+
     bool IsActive() const;
 
     bool HasEverBeenActive() const {
@@ -42,6 +56,8 @@ public:
     NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(WebGLQuery)
     NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(WebGLQuery)
 
+    // Track whether the event loop has spun
+    bool mCanBeAvailable;
 
 private:
     ~WebGLQuery() {
diff --git a/gfx/thebes/gfxPrefs.h b/gfx/thebes/gfxPrefs.h
index 7bb41fdc8eb9..bde9f242fae0 100644
--- a/gfx/thebes/gfxPrefs.h
+++ b/gfx/thebes/gfxPrefs.h
@@ -437,6 +437,7 @@ private:
   DECL_GFX_PREF(Live, "webgl.msaa-force",                      WebGLForceMSAA, bool, false);
   DECL_GFX_PREF(Live, "webgl.prefer-16bpp",                    WebGLPrefer16bpp, bool, false);
   DECL_GFX_PREF(Live, "webgl.restore-context-when-visible",    WebGLRestoreWhenVisible, bool, true);
+  DECL_GFX_PREF(Live, "webgl.allow-immediate-queries",         WebGLImmediateQueries, bool, false);
 
   DECL_GFX_PREF(Live, "webgl.webgl2-compat-mode",              WebGL2CompatMode, bool, false);
 

From 97e5df801fa222391ab99a7cabcd13f994650f33 Mon Sep 17 00:00:00 2001
From: James Willcox <snorp@snorp.net>
Date: Thu, 3 Dec 2015 09:15:25 -0600
Subject: [PATCH 052/101] Bug 1214810 - Print a timestamp when Fennec is
 started r=esawin

---
 .../android/base/java/org/mozilla/gecko/GeckoApplication.java  | 3 +++
 mobile/android/base/java/org/mozilla/gecko/GeckoThread.java    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
index 218c9057b68a..2d9acf778921 100644
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
@@ -21,6 +21,7 @@ import android.app.Application;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
+import android.os.SystemClock;
 import android.util.Log;
 
 import java.io.File;
@@ -124,6 +125,8 @@ public class GeckoApplication extends Application
 
     @Override
     public void onCreate() {
+        Log.i(LOG_TAG, "zerdatime " + SystemClock.uptimeMillis() + " - Fennec application start");
+
         final Context context = getApplicationContext();
         HardwareUtils.init(context);
         Clipboard.init(context);
diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoThread.java b/mobile/android/base/java/org/mozilla/gecko/GeckoThread.java
index a488fe8bbef1..1267f433ce79 100644
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoThread.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoThread.java
@@ -486,7 +486,7 @@ public class GeckoThread extends Thread implements GeckoEventListener {
         if ("Gecko:Ready".equals(event)) {
             EventDispatcher.getInstance().unregisterGeckoThreadListener(this, event);
             setState(State.RUNNING);
-            Log.w(LOGTAG, "zerdatime " + SystemClock.uptimeMillis() + " - Gecko ready");
+            Log.i(LOGTAG, "zerdatime " + SystemClock.uptimeMillis() + " - Gecko ready");
         }
     }
 

From 6dac2af6b116b4daea316af90c59874449883eec Mon Sep 17 00:00:00 2001
From: Tooru Fujisawa <arai_a@mac.com>
Date: Fri, 7 Aug 2015 08:10:05 +0900
Subject: [PATCH 053/101] Bug 1135377 - Part 1: Implement RegExp unicode flag.
 r=till, f=anba

---
 js/src/builtin/RegExp.cpp                    | 24 +++++++++++++++++-
 js/src/builtin/RegExp.js                     |  5 ++--
 js/src/frontend/TokenStream.cpp              |  2 ++
 js/src/irregexp/RegExpParser.cpp             | 26 +++++++++++---------
 js/src/irregexp/RegExpParser.h               |  8 +++---
 js/src/jsapi.h                               |  1 +
 js/src/tests/ecma_6/RegExp/descriptor.js     |  6 +----
 js/src/tests/ecma_6/RegExp/flag-accessors.js |  7 ++----
 js/src/tests/ecma_6/RegExp/flags.js          | 10 +++-----
 js/src/vm/RegExpObject.cpp                   | 12 +++++++--
 js/src/vm/RegExpObject.h                     | 13 ++++++++--
 js/xpconnect/tests/chrome/test_xrayToJS.xul  |  4 +--
 12 files changed, 77 insertions(+), 41 deletions(-)

diff --git a/js/src/builtin/RegExp.cpp b/js/src/builtin/RegExp.cpp
index 1758a149c90e..db0dc31e3dd5 100644
--- a/js/src/builtin/RegExp.cpp
+++ b/js/src/builtin/RegExp.cpp
@@ -174,8 +174,11 @@ RegExpInitialize(JSContext* cx, Handle<RegExpObject*> obj, HandleValue patternVa
     /* Steps 9-10. */
     CompileOptions options(cx);
     frontend::TokenStream dummyTokenStream(cx, options, nullptr, 0, nullptr);
-    if (!irregexp::ParsePatternSyntax(dummyTokenStream, cx->tempLifoAlloc(), pattern))
+    if (!irregexp::ParsePatternSyntax(dummyTokenStream, cx->tempLifoAlloc(), pattern,
+                                      flags & UnicodeFlag))
+    {
         return false;
+    }
 
     if (staticsUse == UseRegExpStatics) {
         RegExpStatics* res = cx->global()->getRegExpStatics(cx);
@@ -557,6 +560,24 @@ regexp_sticky(JSContext* cx, unsigned argc, JS::Value* vp)
     return CallNonGenericMethod<IsRegExpObject, regexp_sticky_impl>(cx, args);
 }
 
+/* ES6 21.2.5.15. */
+MOZ_ALWAYS_INLINE bool
+regexp_unicode_impl(JSContext* cx, const CallArgs& args)
+{
+    MOZ_ASSERT(IsRegExpObject(args.thisv()));
+    /* Steps 4-6. */
+    args.rval().setBoolean(args.thisv().toObject().as<RegExpObject>().unicode());
+    return true;
+}
+
+static bool
+regexp_unicode(JSContext* cx, unsigned argc, JS::Value* vp)
+{
+    /* Steps 1-3. */
+    CallArgs args = CallArgsFromVp(argc, vp);
+    return CallNonGenericMethod<IsRegExpObject, regexp_unicode_impl>(cx, args);
+}
+
 const JSPropertySpec js::regexp_properties[] = {
     JS_SELF_HOSTED_GET("flags", "RegExpFlagsGetter", 0),
     JS_PSG("global", regexp_global, 0),
@@ -564,6 +585,7 @@ const JSPropertySpec js::regexp_properties[] = {
     JS_PSG("multiline", regexp_multiline, 0),
     JS_PSG("source", regexp_source, 0),
     JS_PSG("sticky", regexp_sticky, 0),
+    JS_PSG("unicode", regexp_unicode, 0),
     JS_PS_END
 };
 
diff --git a/js/src/builtin/RegExp.js b/js/src/builtin/RegExp.js
index 13cc5ba894d8..7b002dd47f47 100644
--- a/js/src/builtin/RegExp.js
+++ b/js/src/builtin/RegExp.js
@@ -25,9 +25,8 @@ function RegExpFlagsGetter() {
         result += "m";
 
     // Steps 13-15.
-    // TODO: Uncomment these steps when bug 1135377 is fixed.
-    // if (R.unicode)
-    //     result += "u";
+    if (R.unicode)
+         result += "u";
 
     // Steps 16-18.
     if (R.sticky)
diff --git a/js/src/frontend/TokenStream.cpp b/js/src/frontend/TokenStream.cpp
index 9998144f34a8..c29fd5044904 100644
--- a/js/src/frontend/TokenStream.cpp
+++ b/js/src/frontend/TokenStream.cpp
@@ -1588,6 +1588,8 @@ TokenStream::getTokenInternal(TokenKind* ttp, Modifier modifier)
                     reflags = RegExpFlag(reflags | MultilineFlag);
                 else if (c == 'y' && !(reflags & StickyFlag))
                     reflags = RegExpFlag(reflags | StickyFlag);
+                else if (c == 'u' && !(reflags & UnicodeFlag))
+                    reflags = RegExpFlag(reflags | UnicodeFlag);
                 else
                     break;
                 getChar();
diff --git a/js/src/irregexp/RegExpParser.cpp b/js/src/irregexp/RegExpParser.cpp
index e63092349d13..6ab53c59fd39 100644
--- a/js/src/irregexp/RegExpParser.cpp
+++ b/js/src/irregexp/RegExpParser.cpp
@@ -205,7 +205,8 @@ RegExpBuilder::AddQuantifierToAtom(int min, int max,
 
 template <typename CharT>
 RegExpParser<CharT>::RegExpParser(frontend::TokenStream& ts, LifoAlloc* alloc,
-                                  const CharT* chars, const CharT* end, bool multiline_mode)
+                                  const CharT* chars, const CharT* end, bool multiline_mode,
+                                  bool unicode)
   : ts(ts),
     alloc(alloc),
     captures_(nullptr),
@@ -215,6 +216,7 @@ RegExpParser<CharT>::RegExpParser(frontend::TokenStream& ts, LifoAlloc* alloc,
     capture_count_(0),
     has_more_(true),
     multiline_(multiline_mode),
+    unicode_(unicode),
     simple_(false),
     contains_anchor_(false),
     is_scanned_for_captures_(false)
@@ -1002,7 +1004,7 @@ template class irregexp::RegExpParser<char16_t>;
 template <typename CharT>
 static bool
 ParsePattern(frontend::TokenStream& ts, LifoAlloc& alloc, const CharT* chars, size_t length,
-             bool multiline, bool match_only, RegExpCompileData* data)
+             bool multiline, bool match_only, bool unicode, RegExpCompileData* data)
 {
     if (match_only) {
         // Try to strip a leading '.*' from the RegExp, but only if it is not
@@ -1025,7 +1027,7 @@ ParsePattern(frontend::TokenStream& ts, LifoAlloc& alloc, const CharT* chars, si
         }
     }
 
-    RegExpParser<CharT> parser(ts, &alloc, chars, chars + length, multiline);
+    RegExpParser<CharT> parser(ts, &alloc, chars, chars + length, multiline, unicode);
     data->tree = parser.ParsePattern();
     if (!data->tree)
         return false;
@@ -1038,32 +1040,34 @@ ParsePattern(frontend::TokenStream& ts, LifoAlloc& alloc, const CharT* chars, si
 
 bool
 irregexp::ParsePattern(frontend::TokenStream& ts, LifoAlloc& alloc, JSAtom* str,
-                       bool multiline, bool match_only,
+                       bool multiline, bool match_only, bool unicode,
                        RegExpCompileData* data)
 {
     JS::AutoCheckCannotGC nogc;
     return str->hasLatin1Chars()
            ? ::ParsePattern(ts, alloc, str->latin1Chars(nogc), str->length(),
-                            multiline, match_only, data)
+                            multiline, match_only, unicode, data)
            : ::ParsePattern(ts, alloc, str->twoByteChars(nogc), str->length(),
-                            multiline, match_only, data);
+                            multiline, match_only, unicode, data);
 }
 
 template <typename CharT>
 static bool
-ParsePatternSyntax(frontend::TokenStream& ts, LifoAlloc& alloc, const CharT* chars, size_t length)
+ParsePatternSyntax(frontend::TokenStream& ts, LifoAlloc& alloc, const CharT* chars, size_t length,
+                   bool unicode)
 {
     LifoAllocScope scope(&alloc);
 
-    RegExpParser<CharT> parser(ts, &alloc, chars, chars + length, false);
+    RegExpParser<CharT> parser(ts, &alloc, chars, chars + length, false, unicode);
     return parser.ParsePattern() != nullptr;
 }
 
 bool
-irregexp::ParsePatternSyntax(frontend::TokenStream& ts, LifoAlloc& alloc, JSAtom* str)
+irregexp::ParsePatternSyntax(frontend::TokenStream& ts, LifoAlloc& alloc, JSAtom* str,
+                             bool unicode)
 {
     JS::AutoCheckCannotGC nogc;
     return str->hasLatin1Chars()
-           ? ::ParsePatternSyntax(ts, alloc, str->latin1Chars(nogc), str->length())
-           : ::ParsePatternSyntax(ts, alloc, str->twoByteChars(nogc), str->length());
+           ? ::ParsePatternSyntax(ts, alloc, str->latin1Chars(nogc), str->length(), unicode)
+           : ::ParsePatternSyntax(ts, alloc, str->twoByteChars(nogc), str->length(), unicode);
 }
diff --git a/js/src/irregexp/RegExpParser.h b/js/src/irregexp/RegExpParser.h
index e36a47f7503f..740bff9276d6 100644
--- a/js/src/irregexp/RegExpParser.h
+++ b/js/src/irregexp/RegExpParser.h
@@ -43,11 +43,12 @@ namespace irregexp {
 
 bool
 ParsePattern(frontend::TokenStream& ts, LifoAlloc& alloc, JSAtom* str,
-             bool multiline, bool match_only,
+             bool multiline, bool match_only, bool unicode,
              RegExpCompileData* data);
 
 bool
-ParsePatternSyntax(frontend::TokenStream& ts, LifoAlloc& alloc, JSAtom* str);
+ParsePatternSyntax(frontend::TokenStream& ts, LifoAlloc& alloc, JSAtom* str,
+                   bool unicode);
 
 // A BufferedVector is an automatically growing list, just like (and backed
 // by) a Vector, that is optimized for the case of adding and removing
@@ -174,7 +175,7 @@ class RegExpParser
 {
   public:
     RegExpParser(frontend::TokenStream& ts, LifoAlloc* alloc,
-                 const CharT* chars, const CharT* end, bool multiline_mode);
+                 const CharT* chars, const CharT* end, bool multiline_mode, bool unicode);
 
     RegExpTree* ParsePattern();
     RegExpTree* ParseDisjunction();
@@ -288,6 +289,7 @@ class RegExpParser
     int capture_count_;
     bool has_more_;
     bool multiline_;
+    bool unicode_;
     bool simple_;
     bool contains_anchor_;
     bool is_scanned_for_captures_;
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 2fa1b9f370c1..f56e62a6b751 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -4950,6 +4950,7 @@ JS_ObjectIsDate(JSContext* cx, JS::HandleObject obj, bool* isDate);
 #define JSREG_GLOB      0x02u   /* global exec, creates array of matches */
 #define JSREG_MULTILINE 0x04u   /* treat ^ and $ as begin and end of line */
 #define JSREG_STICKY    0x08u   /* only match starting at lastIndex */
+#define JSREG_UNICODE   0x10u   /* unicode */
 
 extern JS_PUBLIC_API(JSObject*)
 JS_NewRegExpObject(JSContext* cx, JS::HandleObject obj, const char* bytes, size_t length,
diff --git a/js/src/tests/ecma_6/RegExp/descriptor.js b/js/src/tests/ecma_6/RegExp/descriptor.js
index 62dda8521fb4..cc545b3a6ae2 100644
--- a/js/src/tests/ecma_6/RegExp/descriptor.js
+++ b/js/src/tests/ecma_6/RegExp/descriptor.js
@@ -10,7 +10,7 @@ var getters = [
   "multiline",
   "source",
   "sticky",
-  //"unicode",
+  "unicode",
 ];
 
 for (var name of getters) {
@@ -21,9 +21,5 @@ for (var name of getters) {
   assertEq("get" in desc, true);
 }
 
-// When the /u flag is supported, remove this comment and the next line, and
-// uncomment "unicode" in |props| above.
-assertThrowsInstanceOf(() => RegExp("", "mygui").flags, SyntaxError);
-
 if (typeof reportCompare === "function")
     reportCompare(true, true);
diff --git a/js/src/tests/ecma_6/RegExp/flag-accessors.js b/js/src/tests/ecma_6/RegExp/flag-accessors.js
index 4f169c8a4b2c..848b916c50d5 100644
--- a/js/src/tests/ecma_6/RegExp/flag-accessors.js
+++ b/js/src/tests/ecma_6/RegExp/flag-accessors.js
@@ -8,17 +8,14 @@ var props = [
   "ignoreCase",
   "multiline",
   "sticky",
-  //"unicode",
+  "unicode",
 ];
 
 testThrows(RegExp.prototype);
 test(/foo/iymg, [true, true, true, true, false]);
 test(RegExp(""), [false, false, false, false, false]);
 test(RegExp("", "mygi"), [true, true, true, true, false]);
-// When the /u flag is supported, remove the following line, uncomment the
-// next line, and uncomment "unicode" in |props| above.
-assertThrowsInstanceOf(() => RegExp("", "mygui").flags, SyntaxError);
-// test(RegExp("", "mygiu"), [true, true, true, true, true]);
+test(RegExp("", "mygiu"), [true, true, true, true, true]);
 
 testThrowsGeneric();
 testThrowsGeneric(1);
diff --git a/js/src/tests/ecma_6/RegExp/flags.js b/js/src/tests/ecma_6/RegExp/flags.js
index 5a0245d99170..292fa4f3f595 100644
--- a/js/src/tests/ecma_6/RegExp/flags.js
+++ b/js/src/tests/ecma_6/RegExp/flags.js
@@ -7,16 +7,12 @@ assertEq(RegExp.prototype.flags, "");
 assertEq(/foo/iymg.flags, "gimy");
 assertEq(RegExp("").flags, "");
 assertEq(RegExp("", "mygi").flags, "gimy");
-// TODO: Uncomment lines 12, 16, 19 and remove lines 11, 15, 18 when bug 1135377 is fixed.
-assertThrowsInstanceOf(() => RegExp("", "mygui").flags, SyntaxError);
-// assertEq(RegExp("", "mygui").flags, "gimuy");
+assertEq(RegExp("", "mygui").flags, "gimuy");
 assertEq(genericFlags({}), "");
 assertEq(genericFlags({ignoreCase: true}), "i");
-assertEq(genericFlags({sticky:1, unicode:1, global: 0}), "y");
-// assertEq(genericFlags({sticky:1, unicode:1, global: 0}), "uy");
+assertEq(genericFlags({sticky:1, unicode:1, global: 0}), "uy");
 assertEq(genericFlags({__proto__: {multiline: true}}), "m");
-assertEq(genericFlags(new Proxy({}, {get(){return true}})), "gimy");
-// assertEq(genericFlags(new Proxy({}, {get(){return true}})), "gimuy");
+assertEq(genericFlags(new Proxy({}, {get(){return true}})), "gimuy");
 
 assertThrowsInstanceOf(() => genericFlags(), TypeError);
 assertThrowsInstanceOf(() => genericFlags(1), TypeError);
diff --git a/js/src/vm/RegExpObject.cpp b/js/src/vm/RegExpObject.cpp
index 89b3bf6ac345..5ed4ad270162 100644
--- a/js/src/vm/RegExpObject.cpp
+++ b/js/src/vm/RegExpObject.cpp
@@ -39,6 +39,7 @@ JS_STATIC_ASSERT(IgnoreCaseFlag == JSREG_FOLD);
 JS_STATIC_ASSERT(GlobalFlag == JSREG_GLOB);
 JS_STATIC_ASSERT(MultilineFlag == JSREG_MULTILINE);
 JS_STATIC_ASSERT(StickyFlag == JSREG_STICKY);
+JS_STATIC_ASSERT(UnicodeFlag == JSREG_UNICODE);
 
 RegExpObject*
 js::RegExpAlloc(ExclusiveContext* cx, HandleObject proto /* = nullptr */)
@@ -216,7 +217,7 @@ RegExpObject::createNoStatics(ExclusiveContext* cx, HandleAtom source, RegExpFla
         tokenStream = dummyTokenStream.ptr();
     }
 
-    if (!irregexp::ParsePatternSyntax(*tokenStream, alloc, source))
+    if (!irregexp::ParsePatternSyntax(*tokenStream, alloc, source, flags & UnicodeFlag))
         return nullptr;
 
     Rooted<RegExpObject*> regexp(cx, RegExpAlloc(cx));
@@ -276,6 +277,7 @@ RegExpObject::init(ExclusiveContext* cx, HandleAtom source, RegExpFlag flags)
     self->setIgnoreCase(flags & IgnoreCaseFlag);
     self->setMultiline(flags & MultilineFlag);
     self->setSticky(flags & StickyFlag);
+    self->setUnicode(flags & UnicodeFlag);
     return true;
 }
 
@@ -458,6 +460,8 @@ RegExpObject::toString(JSContext* cx) const
         return nullptr;
     if (multiline() && !sb.append('m'))
         return nullptr;
+    if (unicode() && !sb.append('u'))
+        return nullptr;
     if (sticky() && !sb.append('y'))
         return nullptr;
 
@@ -518,7 +522,7 @@ RegExpShared::compile(JSContext* cx, HandleAtom pattern, HandleLinearString inpu
     /* Parse the pattern. */
     irregexp::RegExpCompileData data;
     if (!irregexp::ParsePattern(dummyTokenStream, cx->tempLifoAlloc(), pattern,
-                                multiline(), mode == MatchOnly, &data))
+                                multiline(), mode == MatchOnly, unicode(), &data))
     {
         return false;
     }
@@ -957,6 +961,10 @@ ParseRegExpFlags(const CharT* chars, size_t length, RegExpFlag* flagsOut, char16
             if (!HandleRegExpFlag(StickyFlag, flagsOut))
                 return false;
             break;
+          case 'u':
+            if (!HandleRegExpFlag(UnicodeFlag, flagsOut))
+                return false;
+            break;
           default:
             return false;
         }
diff --git a/js/src/vm/RegExpObject.h b/js/src/vm/RegExpObject.h
index ad118914d9d0..8fd042084503 100644
--- a/js/src/vm/RegExpObject.h
+++ b/js/src/vm/RegExpObject.h
@@ -51,9 +51,10 @@ enum RegExpFlag
     GlobalFlag      = 0x02,
     MultilineFlag   = 0x04,
     StickyFlag      = 0x08,
+    UnicodeFlag     = 0x10,
 
     NoFlags         = 0x00,
-    AllFlags        = 0x0f
+    AllFlags        = 0x1f
 };
 
 enum RegExpRunStatus
@@ -186,6 +187,7 @@ class RegExpShared
     bool global() const                 { return flags & GlobalFlag; }
     bool multiline() const              { return flags & MultilineFlag; }
     bool sticky() const                 { return flags & StickyFlag; }
+    bool unicode() const                { return flags & UnicodeFlag; }
 
     bool isCompiled(CompilationMode mode, bool latin1,
                     ForceByteCodeEnum force = DontForceByteCode) const {
@@ -340,9 +342,10 @@ class RegExpObject : public NativeObject
     static const unsigned IGNORE_CASE_FLAG_SLOT    = 3;
     static const unsigned MULTILINE_FLAG_SLOT      = 4;
     static const unsigned STICKY_FLAG_SLOT         = 5;
+    static const unsigned UNICODE_FLAG_SLOT        = 6;
 
   public:
-    static const unsigned RESERVED_SLOTS = 6;
+    static const unsigned RESERVED_SLOTS = 7;
     static const unsigned PRIVATE_SLOT = 7;
 
     static const Class class_;
@@ -404,6 +407,7 @@ class RegExpObject : public NativeObject
         flags |= ignoreCase() ? IgnoreCaseFlag : 0;
         flags |= multiline() ? MultilineFlag : 0;
         flags |= sticky() ? StickyFlag : 0;
+        flags |= unicode() ? UnicodeFlag : 0;
         return RegExpFlag(flags);
     }
 
@@ -429,10 +433,15 @@ class RegExpObject : public NativeObject
         setSlot(STICKY_FLAG_SLOT, BooleanValue(enabled));
     }
 
+    void setUnicode(bool enabled) {
+        setSlot(UNICODE_FLAG_SLOT, BooleanValue(enabled));
+    }
+
     bool ignoreCase() const { return getFixedSlot(IGNORE_CASE_FLAG_SLOT).toBoolean(); }
     bool global() const     { return getFixedSlot(GLOBAL_FLAG_SLOT).toBoolean(); }
     bool multiline() const  { return getFixedSlot(MULTILINE_FLAG_SLOT).toBoolean(); }
     bool sticky() const     { return getFixedSlot(STICKY_FLAG_SLOT).toBoolean(); }
+    bool unicode() const    { return getFixedSlot(UNICODE_FLAG_SLOT).toBoolean(); }
 
     bool getShared(JSContext* cx, RegExpGuard* g);
 
diff --git a/js/xpconnect/tests/chrome/test_xrayToJS.xul b/js/xpconnect/tests/chrome/test_xrayToJS.xul
index f600dd0ee526..cbcd427d2358 100644
--- a/js/xpconnect/tests/chrome/test_xrayToJS.xul
+++ b/js/xpconnect/tests/chrome/test_xrayToJS.xul
@@ -198,7 +198,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=933681
 
   gPrototypeProperties['RegExp'] =
     ["constructor", "toSource", "toString", "compile", "exec", "test",
-     "flags", "global", "ignoreCase", "multiline", "source", "sticky",
+     "flags", "global", "ignoreCase", "multiline", "source", "sticky", "unicode",
      "lastIndex"];
 
   // Sort an array that may contain symbols as well as strings.
@@ -612,7 +612,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=933681
 
       // Test with modified flags accessors
       iwin.eval(`
-var props = ["global", "ignoreCase", "multiline", "sticky", "source"];
+var props = ["global", "ignoreCase", "multiline", "sticky", "source", "unicode"];
 var origDescs = {};
 for (var prop of props) {
   origDescs[prop] = Object.getOwnPropertyDescriptor(RegExp.prototype, prop);

From e2993e29723ecc589718ca8f25a291fe334f0700 Mon Sep 17 00:00:00 2001
From: Tooru Fujisawa <arai_a@mac.com>
Date: Fri, 7 Aug 2015 08:11:07 +0900
Subject: [PATCH 054/101] Bug 1135377 - Part 2: Parse RegExp unicode character
 in non-CharacterClass. r=till, f=anba

---
 js/src/irregexp/RegExpAST.h                   |   3 +-
 js/src/irregexp/RegExpEngine.cpp              |  30 +++
 js/src/irregexp/RegExpEngine.h                |   7 +-
 js/src/irregexp/RegExpParser.cpp              | 179 ++++++++++++++
 js/src/irregexp/RegExpParser.h                |   4 +
 js/src/js.msg                                 |   3 +
 js/src/tests/ecma_6/RegExp/unicode-braced.js  | 166 +++++++++++++
 .../tests/ecma_6/RegExp/unicode-lead-trail.js | 218 ++++++++++++++++++
 js/src/tests/ecma_6/RegExp/unicode-raw.js     | 139 +++++++++++
 js/src/vm/Unicode.h                           |  38 +++
 js/src/vm/Xdr.h                               |   4 +-
 11 files changed, 787 insertions(+), 4 deletions(-)
 create mode 100644 js/src/tests/ecma_6/RegExp/unicode-braced.js
 create mode 100644 js/src/tests/ecma_6/RegExp/unicode-lead-trail.js
 create mode 100644 js/src/tests/ecma_6/RegExp/unicode-raw.js

diff --git a/js/src/irregexp/RegExpAST.h b/js/src/irregexp/RegExpAST.h
index b7e27a4f3d00..1bafe91d155f 100644
--- a/js/src/irregexp/RegExpAST.h
+++ b/js/src/irregexp/RegExpAST.h
@@ -138,7 +138,8 @@ class RegExpAssertion : public RegExpTree {
     END_OF_LINE,
     END_OF_INPUT,
     BOUNDARY,
-    NON_BOUNDARY
+    NON_BOUNDARY,
+    NOT_AFTER_LEAD_SURROGATE
   };
   explicit RegExpAssertion(AssertionType type) : assertion_type_(type) { }
   virtual void* Accept(RegExpVisitor* visitor, void* data);
diff --git a/js/src/irregexp/RegExpEngine.cpp b/js/src/irregexp/RegExpEngine.cpp
index ba30fc7a72d0..6f06692937fc 100644
--- a/js/src/irregexp/RegExpEngine.cpp
+++ b/js/src/irregexp/RegExpEngine.cpp
@@ -2056,6 +2056,8 @@ RegExpAssertion::ToNode(RegExpCompiler* compiler,
         result->AddAlternative(end_alternative);
         return result;
       }
+      case NOT_AFTER_LEAD_SURROGATE:
+        return AssertionNode::NotAfterLeadSurrogate(on_success);
       default:
         MOZ_CRASH("Bad assertion type");
     }
@@ -2843,6 +2845,31 @@ EmitHat(RegExpCompiler* compiler, RegExpNode* on_success, Trace* trace)
     on_success->Emit(compiler, &new_trace);
 }
 
+// Assert that the next character cannot be a part of a surrogate pair.
+static void
+EmitNotAfterLeadSurrogate(RegExpCompiler* compiler, RegExpNode* on_success, Trace* trace)
+{
+    RegExpMacroAssembler* assembler = compiler->macro_assembler();
+
+    // We will be loading the previous character into the current character
+    // register.
+    Trace new_trace(*trace);
+    new_trace.InvalidateCurrentCharacter();
+
+    jit::Label ok;
+    if (new_trace.cp_offset() == 0)
+        assembler->CheckAtStart(&ok);
+
+    // We already checked that we are not at the start of input so it must be
+    // OK to load the previous character.
+    assembler->LoadCurrentCharacter(new_trace.cp_offset() - 1, new_trace.backtrack(), false);
+    assembler->CheckCharacterInRange(unicode::LeadSurrogateMin, unicode::LeadSurrogateMax,
+                                     new_trace.backtrack());
+
+    assembler->Bind(&ok);
+    on_success->Emit(compiler, &new_trace);
+}
+
 // Check for [0-9A-Z_a-z].
 static void
 EmitWordCheck(RegExpMacroAssembler* assembler,
@@ -2996,6 +3023,9 @@ AssertionNode::Emit(RegExpCompiler* compiler, Trace* trace)
         EmitBoundaryCheck(compiler, trace);
         return;
       }
+      case NOT_AFTER_LEAD_SURROGATE:
+        EmitNotAfterLeadSurrogate(compiler, on_success(), trace);
+        return;
     }
     on_success()->Emit(compiler, trace);
 }
diff --git a/js/src/irregexp/RegExpEngine.h b/js/src/irregexp/RegExpEngine.h
index b687c6c52daa..bf57660866e6 100644
--- a/js/src/irregexp/RegExpEngine.h
+++ b/js/src/irregexp/RegExpEngine.h
@@ -788,7 +788,8 @@ class AssertionNode : public SeqRegExpNode
         AT_START,
         AT_BOUNDARY,
         AT_NON_BOUNDARY,
-        AFTER_NEWLINE
+        AFTER_NEWLINE,
+        NOT_AFTER_LEAD_SURROGATE
     };
     AssertionNode(AssertionType t, RegExpNode* on_success)
       : SeqRegExpNode(on_success), assertion_type_(t)
@@ -809,6 +810,10 @@ class AssertionNode : public SeqRegExpNode
     static AssertionNode* AfterNewline(RegExpNode* on_success) {
         return on_success->alloc()->newInfallible<AssertionNode>(AFTER_NEWLINE, on_success);
     }
+    static AssertionNode* NotAfterLeadSurrogate(RegExpNode* on_success) {
+        return on_success->alloc()->newInfallible<AssertionNode>(NOT_AFTER_LEAD_SURROGATE,
+                                                                 on_success);
+    }
     virtual void Accept(NodeVisitor* visitor);
     virtual void Emit(RegExpCompiler* compiler, Trace* trace);
     virtual int EatsAtLeast(int still_to_find, int budget, bool not_at_start);
diff --git a/js/src/irregexp/RegExpParser.cpp b/js/src/irregexp/RegExpParser.cpp
index 6ab53c59fd39..f444e3cde077 100644
--- a/js/src/irregexp/RegExpParser.cpp
+++ b/js/src/irregexp/RegExpParser.cpp
@@ -302,6 +302,108 @@ RegExpParser<CharT>::ParseHexEscape(int length, size_t* value)
     return true;
 }
 
+template <typename CharT>
+bool
+RegExpParser<CharT>::ParseBracedHexEscape(size_t* value)
+{
+    MOZ_ASSERT(current() == '{');
+    Advance();
+
+    bool first = true;
+    uint32_t code = 0;
+    while (true) {
+        widechar c = current();
+        if (c == kEndMarker) {
+            ReportError(JSMSG_INVALID_UNICODE_ESCAPE);
+            return false;
+        }
+        if (c == '}') {
+            if (first) {
+                ReportError(JSMSG_INVALID_UNICODE_ESCAPE);
+                return false;
+            }
+            Advance();
+            break;
+        }
+
+        int d = HexValue(c);
+        if (d < 0) {
+            ReportError(JSMSG_INVALID_UNICODE_ESCAPE);
+            return false;
+        }
+        code = (code << 4) | d;
+        if (code > unicode::NonBMPMax) {
+            ReportError(JSMSG_UNICODE_OVERFLOW);
+            return false;
+        }
+        Advance();
+        first = false;
+    }
+
+    *value = code;
+    return true;
+}
+
+template <typename CharT>
+bool
+RegExpParser<CharT>::ParseTrailSurrogate(size_t* value)
+{
+    if (current() != '\\')
+        return false;
+
+    const CharT* start = position();
+    Advance();
+    if (current() != 'u') {
+        Reset(start);
+        return false;
+    }
+    Advance();
+    if (!ParseHexEscape(4, value)) {
+        Reset(start);
+        return false;
+    }
+    if (!unicode::IsTrailSurrogate(*value)) {
+        Reset(start);
+        return false;
+    }
+    return true;
+}
+
+template <typename CharT>
+bool
+RegExpParser<CharT>::ParseRawSurrogatePair(char16_t* lead, char16_t* trail)
+{
+    widechar c1 = current();
+    if (!unicode::IsLeadSurrogate(c1))
+        return false;
+
+    const CharT* start = position();
+    Advance();
+    widechar c2 = current();
+    if (!unicode::IsTrailSurrogate(c2)) {
+        Reset(start);
+        return false;
+    }
+    Advance();
+    *lead = c1;
+    *trail = c2;
+    return true;
+}
+
+static inline RegExpTree*
+RangeAtom(LifoAlloc* alloc, char16_t from, char16_t to)
+{
+    CharacterRangeVector* ranges = alloc->newInfallible<CharacterRangeVector>(*alloc);
+    ranges->append(CharacterRange::Range(from, to));
+    return alloc->newInfallible<RegExpCharacterClass>(ranges, false);
+}
+
+static inline RegExpTree*
+NegativeLookahead(LifoAlloc* alloc, char16_t from, char16_t to)
+{
+    return alloc->newInfallible<RegExpLookahead>(RangeAtom(alloc, from, to), false, 0, 0);
+}
+
 #ifdef DEBUG
 // Currently only used in an assert.kASSERT.
 static bool
@@ -675,6 +777,35 @@ RegExpParser<CharT>::ParsePattern()
     return result;
 }
 
+static inline RegExpTree*
+SurrogatePairAtom(LifoAlloc* alloc, char16_t lead, char16_t trail)
+{
+    RegExpBuilder* builder = alloc->newInfallible<RegExpBuilder>(alloc);
+    builder->AddCharacter(lead);
+    builder->AddCharacter(trail);
+    return builder->ToRegExp();
+}
+
+static inline RegExpTree*
+LeadSurrogateAtom(LifoAlloc* alloc, char16_t value)
+{
+    RegExpBuilder* builder = alloc->newInfallible<RegExpBuilder>(alloc);
+    builder->AddCharacter(value);
+    builder->AddAtom(NegativeLookahead(alloc, unicode::TrailSurrogateMin,
+                                       unicode::TrailSurrogateMax));
+    return builder->ToRegExp();
+}
+
+static inline RegExpTree*
+TrailSurrogateAtom(LifoAlloc* alloc, char16_t value)
+{
+    RegExpBuilder* builder = alloc->newInfallible<RegExpBuilder>(alloc);
+    builder->AddAssertion(alloc->newInfallible<RegExpAssertion>(
+        RegExpAssertion::NOT_AFTER_LEAD_SURROGATE));
+    builder->AddCharacter(value);
+    return builder->ToRegExp();
+}
+
 // Disjunction ::
 //   Alternative
 //   Alternative | Disjunction
@@ -929,6 +1060,38 @@ RegExpParser<CharT>::ParseDisjunction()
               case 'u': {
                 Advance(2);
                 size_t value;
+                if (unicode_) {
+                    if (current() == '{') {
+                        if (!ParseBracedHexEscape(&value))
+                            return nullptr;
+                        if (unicode::IsLeadSurrogate(value)) {
+                            builder->AddAtom(LeadSurrogateAtom(alloc, value));
+                        } else if (unicode::IsTrailSurrogate(value)) {
+                            builder->AddAtom(TrailSurrogateAtom(alloc, value));
+                        } else if (value >= unicode::NonBMPMin) {
+                            size_t lead, trail;
+                            unicode::UTF16Encode(value, &lead, &trail);
+                            builder->AddAtom(SurrogatePairAtom(alloc, lead, trail));
+                        } else {
+                            builder->AddCharacter(value);
+                        }
+                    } else if (ParseHexEscape(4, &value)) {
+                        if (unicode::IsLeadSurrogate(value)) {
+                            size_t trail;
+                            if (ParseTrailSurrogate(&trail))
+                                builder->AddAtom(SurrogatePairAtom(alloc, value, trail));
+                            else
+                                builder->AddAtom(LeadSurrogateAtom(alloc, value));
+                        } else if (unicode::IsTrailSurrogate(value)) {
+                            builder->AddAtom(TrailSurrogateAtom(alloc, value));
+                        } else {
+                            builder->AddCharacter(value);
+                        }
+                    } else {
+                        return ReportError(JSMSG_INVALID_UNICODE_ESCAPE);
+                    }
+                    break;
+                }
                 if (ParseHexEscape(4, &value)) {
                     builder->AddCharacter(value);
                 } else {
@@ -950,6 +1113,22 @@ RegExpParser<CharT>::ParseDisjunction()
             // fallthrough
           }
           default:
+            if (unicode_) {
+                char16_t lead, trail;
+                if (ParseRawSurrogatePair(&lead, &trail)) {
+                    builder->AddAtom(SurrogatePairAtom(alloc, lead, trail));
+                } else {
+                    widechar c = current();
+                    if (unicode::IsLeadSurrogate(c))
+                        builder->AddAtom(LeadSurrogateAtom(alloc, c));
+                    else if (unicode::IsTrailSurrogate(c))
+                        builder->AddAtom(TrailSurrogateAtom(alloc, c));
+                    else
+                        builder->AddCharacter(c);
+                    Advance();
+                }
+                break;
+            }
             builder->AddCharacter(current());
             Advance();
             break;
diff --git a/js/src/irregexp/RegExpParser.h b/js/src/irregexp/RegExpParser.h
index 740bff9276d6..352c1d5fa4e8 100644
--- a/js/src/irregexp/RegExpParser.h
+++ b/js/src/irregexp/RegExpParser.h
@@ -193,6 +193,10 @@ class RegExpParser
     // and sets the value if it is.
     bool ParseHexEscape(int length, size_t* value);
 
+    bool ParseBracedHexEscape(size_t* value);
+    bool ParseTrailSurrogate(size_t* value);
+    bool ParseRawSurrogatePair(char16_t* lead, char16_t* trail);
+
     size_t ParseOctalLiteral();
 
     // Tries to parse the input as a back reference.  If successful it
diff --git a/js/src/js.msg b/js/src/js.msg
index 6fbe70d416b6..faa6a0e019e5 100644
--- a/js/src/js.msg
+++ b/js/src/js.msg
@@ -447,11 +447,14 @@ MSG_DEF(JSMSG_BAD_CLASS_RANGE,         0, JSEXN_SYNTAXERR, "invalid range in cha
 MSG_DEF(JSMSG_DEPRECATED_REGEXP_MULTILINE, 0, JSEXN_SYNTAXERR, "RegExp.multiline is deprecated. Use m flag instead")
 MSG_DEF(JSMSG_ESCAPE_AT_END_OF_REGEXP, 0, JSEXN_SYNTAXERR, "\\ at end of pattern")
 MSG_DEF(JSMSG_INVALID_GROUP,           0, JSEXN_SYNTAXERR, "invalid regexp group")
+MSG_DEF(JSMSG_INVALID_IDENTITY_ESCAPE, 0, JSEXN_SYNTAXERR, "invalid identity escape in regular expression")
+MSG_DEF(JSMSG_INVALID_UNICODE_ESCAPE,  0, JSEXN_SYNTAXERR, "invalid unicode escape in regular expression")
 MSG_DEF(JSMSG_MISSING_PAREN,           0, JSEXN_SYNTAXERR, "unterminated parenthetical")
 MSG_DEF(JSMSG_NEWREGEXP_FLAGGED,       0, JSEXN_TYPEERR, "can't supply flags when constructing one RegExp from another")
 MSG_DEF(JSMSG_NOTHING_TO_REPEAT,       0, JSEXN_SYNTAXERR, "nothing to repeat")
 MSG_DEF(JSMSG_NUMBERS_OUT_OF_ORDER,    0, JSEXN_SYNTAXERR, "numbers out of order in {} quantifier.")
 MSG_DEF(JSMSG_TOO_MANY_PARENS,         0, JSEXN_INTERNALERR, "too many parentheses in regular expression")
+MSG_DEF(JSMSG_UNICODE_OVERFLOW,        0, JSEXN_SYNTAXERR, "unicode codepoint should not be greater than 0x10FFFF in regular expression")
 MSG_DEF(JSMSG_UNMATCHED_RIGHT_PAREN,   0, JSEXN_SYNTAXERR, "unmatched ) in regular expression")
 MSG_DEF(JSMSG_UNTERM_CLASS,            0, JSEXN_SYNTAXERR, "unterminated character class")
 
diff --git a/js/src/tests/ecma_6/RegExp/unicode-braced.js b/js/src/tests/ecma_6/RegExp/unicode-braced.js
new file mode 100644
index 000000000000..97df7acabf4d
--- /dev/null
+++ b/js/src/tests/ecma_6/RegExp/unicode-braced.js
@@ -0,0 +1,166 @@
+var BUGNUMBER = 1135377;
+var summary = "Implement RegExp unicode flag -- braced pattern in RegExpUnicodeEscapeSequence.";
+
+print(BUGNUMBER + ": " + summary);
+
+// ==== standalone ====
+
+assertEqArray(/\u{41}/u.exec("ABC"),
+              ["A"]);
+assertEqArray(/\u{41}/.exec("ABC" + "u".repeat(41)),
+              ["u".repeat(41)]);
+
+assertEqArray(/\u{4A}/u.exec("JKL"),
+              ["J"]);
+assertEqArray(/\u{4A}/.exec("JKLu{4A}"),
+              ["u{4A}"]);
+
+assertEqArray(/\u{1F438}/u.exec("\u{1F438}"),
+              ["\u{1F438}"]);
+assertEqArray(/\u{1F438}/.exec("u{1F438}"),
+              ["u{1F438}"]);
+
+assertEqArray(/\u{0}/u.exec("\u{0}"),
+              ["\u{0}"]);
+assertEqArray(/\u{10FFFF}/u.exec("\u{10FFFF}"),
+              ["\u{10FFFF}"]);
+assertEqArray(/\u{10ffff}/u.exec("\u{10FFFF}"),
+              ["\u{10FFFF}"]);
+
+// leading 0
+assertEqArray(/\u{0000000000000000000000}/u.exec("\u{0}"),
+              ["\u{0}"]);
+assertEqArray(/\u{000000000000000010FFFF}/u.exec("\u{10FFFF}"),
+              ["\u{10FFFF}"]);
+
+// RegExp constructor
+assertEqArray(new RegExp("\\u{0}", "u").exec("\u{0}"),
+              ["\u{0}"]);
+assertEqArray(new RegExp("\\u{41}", "u").exec("ABC"),
+              ["A"]);
+assertEqArray(new RegExp("\\u{1F438}", "u").exec("\u{1F438}"),
+              ["\u{1F438}"]);
+assertEqArray(new RegExp("\\u{10FFFF}", "u").exec("\u{10FFFF}"),
+              ["\u{10FFFF}"]);
+
+assertEqArray(new RegExp("\\u{0000000000000000}", "u").exec("\u{0}"),
+              ["\u{0}"]);
+
+assertEqArray(eval(`/\\u{${"0".repeat(Math.pow(2, 24)) + "1234"}}/u`).exec("\u{1234}"),
+              ["\u{1234}"]);
+assertEqArray(new RegExp(`\\u{${"0".repeat(Math.pow(2, 24)) + "1234"}}`, "u").exec("\u{1234}"),
+              ["\u{1234}"]);
+
+// ==== ? ====
+
+assertEqArray(/\u{1F438}?/u.exec("\u{1F438}"),
+              ["\u{1F438}"]);
+assertEqArray(/\u{1F438}?/u.exec(""),
+              [""]);
+
+// lead-only target
+assertEqArray(/\u{1F438}?/u.exec("\uD83D"),
+              [""]);
+
+// RegExp constructor
+assertEqArray(new RegExp("\\u{1F438}?", "u").exec("\u{1F438}"),
+              ["\u{1F438}"]);
+assertEqArray(new RegExp("\\u{1F438}?", "u").exec(""),
+              [""]);
+assertEqArray(new RegExp("\\u{1F438}?", "u").exec("\uD83D"),
+              [""]);
+
+// ==== + ====
+
+assertEqArray(/\u{1F438}+/u.exec("\u{1F438}"),
+              ["\u{1F438}"]);
+assertEqArray(/\u{1F438}+/u.exec("\u{1F438}\u{1F438}"),
+              ["\u{1F438}\u{1F438}"]);
+assertEq(/\u{1F438}+/u.exec(""),
+         null);
+
+// lead-only target
+assertEq(/\u{1F438}+/u.exec("\uD83D"),
+         null);
+assertEqArray(/\u{1F438}+/u.exec("\uD83D\uDC38\uDC38"),
+              ["\uD83D\uDC38"]);
+
+// ==== * ====
+
+assertEqArray(/\u{1F438}*/u.exec("\u{1F438}"),
+              ["\u{1F438}"]);
+assertEqArray(/\u{1F438}*/u.exec("\u{1F438}\u{1F438}"),
+              ["\u{1F438}\u{1F438}"]);
+assertEqArray(/\u{1F438}*/u.exec(""),
+              [""]);
+
+// lead-only target
+assertEqArray(/\u{1F438}*/u.exec("\uD83D"),
+              [""]);
+assertEqArray(/\u{1F438}*/u.exec("\uD83D\uDC38\uDC38"),
+              ["\uD83D\uDC38"]);
+
+// ==== lead-only ====
+
+// match only non-surrogate pair
+assertEqArray(/\u{D83D}/u.exec("\uD83D\uDBFF"),
+              ["\uD83D"]);
+assertEq(/\u{D83D}/u.exec("\uD83D\uDC00"),
+         null);
+assertEq(/\u{D83D}/u.exec("\uD83D\uDFFF"),
+         null);
+assertEqArray(/\u{D83D}/u.exec("\uD83D\uE000"),
+              ["\uD83D"]);
+
+// match before non-tail char
+assertEqArray(/\u{D83D}/u.exec("\uD83D"),
+              ["\uD83D"]);
+assertEqArray(/\u{D83D}/u.exec("\uD83DA"),
+              ["\uD83D"]);
+
+// ==== trail-only ====
+
+// match only non-surrogate pair
+assertEqArray(/\u{DC38}/u.exec("\uD7FF\uDC38"),
+              ["\uDC38"]);
+assertEq(/\u{DC38}/u.exec("\uD800\uDC38"),
+         null);
+assertEq(/\u{DC38}/u.exec("\uDBFF\uDC38"),
+         null);
+assertEqArray(/\u{DC38}/u.exec("\uDC00\uDC38"),
+              ["\uDC38"]);
+
+// match after non-lead char
+assertEqArray(/\u{DC38}/u.exec("\uDC38"),
+              ["\uDC38"]);
+assertEqArray(/\u{DC38}/u.exec("A\uDC38"),
+              ["\uDC38"]);
+
+// ==== wrong patterns ====
+
+assertThrowsInstanceOf(() => eval(`/\\u{-1}/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\u{0.0}/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\u{G}/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\u{}/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\u{{/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\u{/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\u{110000}/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\u{00110000}/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\u{100000000000000000000000000000}/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\u{FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF}/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\u{   FFFF}/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\u{FFFF   }/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\u{FF   FF}/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\u{F F F F}/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\u{100000001}/u`), SyntaxError);
+
+// surrogate pair with braced
+assertEq(/\u{D83D}\u{DC38}+/u.exec("\uD83D\uDC38\uDC38"),
+         null);
+assertEq(/\uD83D\u{DC38}+/u.exec("\uD83D\uDC38\uDC38"),
+         null);
+assertEq(/\u{D83D}\uDC38+/u.exec("\uD83D\uDC38\uDC38"),
+         null);
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff --git a/js/src/tests/ecma_6/RegExp/unicode-lead-trail.js b/js/src/tests/ecma_6/RegExp/unicode-lead-trail.js
new file mode 100644
index 000000000000..7ecdb9ace424
--- /dev/null
+++ b/js/src/tests/ecma_6/RegExp/unicode-lead-trail.js
@@ -0,0 +1,218 @@
+var BUGNUMBER = 1135377;
+var summary = "Implement RegExp unicode flag -- lead and trail patterns in RegExpUnicodeEscapeSequence.";
+
+print(BUGNUMBER + ": " + summary);
+
+// ==== standalone ====
+
+assertEqArray(/\uD83D\uDC38/u.exec("\u{1F438}"),
+              ["\u{1F438}"]);
+
+// no unicode flag
+assertEqArray(/\uD83D\uDC38/.exec("\u{1F438}"),
+              ["\u{1F438}"]);
+
+// RegExp constructor
+assertEqArray(new RegExp("\\uD83D\\uDC38", "u").exec("\u{1F438}"),
+              ["\u{1F438}"]);
+
+// RegExp constructor, no unicode flag
+assertEqArray(new RegExp("\\uD83D\\uDC38", "").exec("\u{1F438}"),
+              ["\u{1F438}"]);
+
+// ==== ? ====
+
+assertEqArray(/\uD83D\uDC38?/u.exec("\u{1F438}"),
+              ["\u{1F438}"]);
+assertEqArray(/\uD83D\uDC38?/u.exec(""),
+              [""]);
+
+// lead-only target
+assertEqArray(/\uD83D\uDC38?/u.exec("\uD83D"),
+              [""]);
+
+// no unicode flag
+assertEqArray(/\uD83D\uDC38?/.exec("\u{1F438}"),
+              ["\u{1F438}"]);
+assertEq(/\uD83D\uDC38?/.exec(""),
+         null);
+
+assertEqArray(/\uD83D\uDC38?/.exec("\uD83D"),
+              ["\uD83D"]);
+
+// RegExp constructor
+assertEqArray(new RegExp("\\uD83D\\uDC38?", "u").exec("\u{1F438}"),
+              ["\u{1F438}"]);
+assertEqArray(new RegExp("\\uD83D\\uDC38?", "u").exec(""),
+              [""]);
+
+assertEqArray(new RegExp("\\uD83D\\uDC38?", "u").exec("\uD83D"),
+              [""]);
+
+// RegExp constructor, no unicode flag
+assertEqArray(new RegExp("\\uD83D\\uDC38?", "").exec("\u{1F438}"),
+              ["\u{1F438}"]);
+assertEq(new RegExp("\\uD83D\\uDC38?", "").exec(""),
+         null);
+
+assertEqArray(new RegExp("\\uD83D\\uDC38?", "").exec("\uD83D"),
+              ["\uD83D"]);
+
+// ==== + ====
+
+assertEqArray(/\uD83D\uDC38+/u.exec("\u{1F438}"),
+              ["\u{1F438}"]);
+assertEqArray(/\uD83D\uDC38+/u.exec("\u{1F438}\u{1F438}"),
+              ["\u{1F438}\u{1F438}"]);
+assertEq(/\uD83D\uDC38+/u.exec(""),
+         null);
+
+// lead-only target
+assertEq(/\uD83D\uDC38+/u.exec("\uD83D"),
+         null);
+assertEqArray(/\uD83D\uDC38+/u.exec("\uD83D\uDC38\uDC38"),
+              ["\uD83D\uDC38"]);
+
+// no unicode flag
+assertEqArray(/\uD83D\uDC38+/.exec("\u{1F438}"),
+              ["\u{1F438}"]);
+assertEqArray(/\uD83D\uDC38+/.exec("\u{1F438}\u{1F438}"),
+              ["\u{1F438}"]);
+assertEq(/\uD83D\uDC38+/.exec("\uD83D"),
+         null);
+assertEqArray(/\uD83D\uDC38+/.exec("\uD83D\uDC38\uDC38"),
+              ["\uD83D\uDC38\uDC38"]);
+assertEq(/\uD83D\uDC38+/.exec(""),
+         null);
+
+// ==== * ====
+
+assertEqArray(/\uD83D\uDC38*/u.exec("\u{1F438}"),
+              ["\u{1F438}"]);
+assertEqArray(/\uD83D\uDC38*/u.exec("\u{1F438}\u{1F438}"),
+              ["\u{1F438}\u{1F438}"]);
+assertEqArray(/\uD83D\uDC38*/u.exec(""),
+              [""]);
+
+// lead-only target
+assertEqArray(/\uD83D\uDC38*/u.exec("\uD83D"),
+              [""]);
+assertEqArray(/\uD83D\uDC38*/u.exec("\uD83D\uDC38\uDC38"),
+              ["\uD83D\uDC38"]);
+
+// no unicode flag
+assertEqArray(/\uD83D\uDC38*/.exec("\u{1F438}"),
+              ["\u{1F438}"]);
+assertEqArray(/\uD83D\uDC38*/.exec("\u{1F438}\u{1F438}"),
+              ["\u{1F438}"]);
+assertEqArray(/\uD83D\uDC38*/.exec("\uD83D"),
+              ["\uD83D"]);
+assertEqArray(/\uD83D\uDC38*/.exec("\uD83D\uDC38\uDC38"),
+              ["\uD83D\uDC38\uDC38"]);
+assertEq(/\uD83D\uDC38*/.exec(""),
+         null);
+
+// ==== lead-only ====
+
+// match only non-surrogate pair
+assertEqArray(/\uD83D/u.exec("\uD83D\uDBFF"),
+              ["\uD83D"]);
+assertEq(/\uD83D/u.exec("\uD83D\uDC00"),
+         null);
+assertEq(/\uD83D/u.exec("\uD83D\uDFFF"),
+         null);
+assertEqArray(/\uD83D/u.exec("\uD83D\uE000"),
+              ["\uD83D"]);
+
+// match before non-tail char
+assertEqArray(/\uD83D/u.exec("\uD83D"),
+              ["\uD83D"]);
+assertEqArray(/\uD83D/u.exec("\uD83DA"),
+              ["\uD83D"]);
+
+// no unicode flag
+assertEqArray(/\uD83D/.exec("\uD83D\uDBFF"),
+              ["\uD83D"]);
+assertEqArray(/\uD83D/.exec("\uD83D\uDC00"),
+              ["\uD83D"]);
+assertEqArray(/\uD83D/.exec("\uD83D\uDFFF"),
+              ["\uD83D"]);
+assertEqArray(/\uD83D/.exec("\uD83D\uE000"),
+              ["\uD83D"]);
+assertEqArray(/\uD83D/.exec("\uD83D"),
+              ["\uD83D"]);
+assertEqArray(/\uD83D/.exec("\uD83DA"),
+              ["\uD83D"]);
+
+// ==== trail-only ====
+
+// match only non-surrogate pair
+assertEqArray(/\uDC38/u.exec("\uD7FF\uDC38"),
+              ["\uDC38"]);
+assertEq(/\uDC38/u.exec("\uD800\uDC38"),
+         null);
+assertEq(/\uDC38/u.exec("\uDBFF\uDC38"),
+         null);
+assertEqArray(/\uDC38/u.exec("\uDC00\uDC38"),
+              ["\uDC38"]);
+
+// match after non-lead char
+assertEqArray(/\uDC38/u.exec("\uDC38"),
+              ["\uDC38"]);
+assertEqArray(/\uDC38/u.exec("A\uDC38"),
+              ["\uDC38"]);
+
+// no unicode flag
+assertEqArray(/\uDC38/.exec("\uD7FF\uDC38"),
+              ["\uDC38"]);
+assertEqArray(/\uDC38/.exec("\uD800\uDC38"),
+              ["\uDC38"]);
+assertEqArray(/\uDC38/.exec("\uDBFF\uDC38"),
+              ["\uDC38"]);
+assertEqArray(/\uDC38/.exec("\uDC00\uDC38"),
+              ["\uDC38"]);
+assertEqArray(/\uDC38/.exec("\uDC38"),
+              ["\uDC38"]);
+assertEqArray(/\uDC38/.exec("A\uDC38"),
+              ["\uDC38"]);
+
+// ==== invalid trail ====
+
+assertEqArray(/\uD83D\u3042*/u.exec("\uD83D"),
+              ["\uD83D"]);
+assertEqArray(/\uD83D\u3042*/u.exec("\uD83D\u3042"),
+              ["\uD83D\u3042"]);
+assertEqArray(/\uD83D\u3042*/u.exec("\uD83D\u3042\u3042"),
+              ["\uD83D\u3042\u3042"]);
+
+assertEqArray(/\uD83D\u{3042}*/u.exec("\uD83D"),
+              ["\uD83D"]);
+assertEqArray(/\uD83D\u{3042}*/u.exec("\uD83D\u3042"),
+              ["\uD83D\u3042"]);
+assertEqArray(/\uD83D\u{3042}*/u.exec("\uD83D\u3042\u3042"),
+              ["\uD83D\u3042\u3042"]);
+
+assertEqArray(/\uD83DA*/u.exec("\uD83D"),
+              ["\uD83D"]);
+assertEqArray(/\uD83DA*/u.exec("\uD83DA"),
+              ["\uD83DA"]);
+assertEqArray(/\uD83DA*/u.exec("\uD83DAA"),
+              ["\uD83DAA"]);
+
+// ==== wrong patterns ====
+
+assertThrowsInstanceOf(() => eval(`/\\u/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\u0/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\u00/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\u000/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\u000G/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\u0.00/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\uD83D\\u/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\uD83D\\u0/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\uD83D\\u00/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\uD83D\\u000/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\uD83D\\u000G/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\uD83D\\u0.00/u`), SyntaxError);
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff --git a/js/src/tests/ecma_6/RegExp/unicode-raw.js b/js/src/tests/ecma_6/RegExp/unicode-raw.js
new file mode 100644
index 000000000000..37b572cd8264
--- /dev/null
+++ b/js/src/tests/ecma_6/RegExp/unicode-raw.js
@@ -0,0 +1,139 @@
+var BUGNUMBER = 1135377;
+var summary = "Implement RegExp unicode flag -- raw unicode.";
+
+print(BUGNUMBER + ": " + summary);
+
+// ==== standalone ====
+
+assertEqArray(eval(`/\uD83D\uDC38/u`).exec("\u{1F438}"),
+              ["\u{1F438}"]);
+
+// no unicode flag
+assertEqArray(eval(`/\uD83D\uDC38/`).exec("\u{1F438}"),
+              ["\u{1F438}"]);
+
+// escaped (lead)
+assertEq(eval(`/\\uD83D\uDC38/u`).exec("\u{1F438}"),
+         null);
+assertEq(eval(`/\\u{D83D}\uDC38/u`).exec("\u{1F438}"),
+         null);
+
+// escaped (trail)
+assertEq(eval(`/\uD83D\\uDC38/u`).exec("\u{1F438}"),
+         null);
+assertEq(eval(`/\uD83D\\u{DC38}/u`).exec("\u{1F438}"),
+         null);
+
+// escaped (lead), no unicode flag
+assertEqArray(eval(`/\\uD83D\uDC38/`).exec("\u{1F438}"),
+              ["\u{1F438}"]);
+
+// escaped (trail), no unicode flag
+assertEqArray(eval(`/\uD83D\\uDC38/`).exec("\u{1F438}"),
+              ["\u{1F438}"]);
+
+// ==== RegExp constructor ====
+
+assertEqArray(new RegExp("\uD83D\uDC38", "u").exec("\u{1F438}"),
+              ["\u{1F438}"]);
+
+// no unicode flag
+assertEqArray(new RegExp("\uD83D\uDC38", "").exec("\u{1F438}"),
+              ["\u{1F438}"]);
+
+// escaped(lead)
+assertEq(new RegExp("\\uD83D\uDC38", "u").exec("\u{1F438}"),
+         null);
+assertEq(new RegExp("\\u{D83D}\uDC38", "u").exec("\u{1F438}"),
+         null);
+
+// escaped(trail)
+assertEq(new RegExp("\uD83D\\uDC38", "u").exec("\u{1F438}"),
+         null);
+assertEq(new RegExp("\uD83D\\u{DC38}", "u").exec("\u{1F438}"),
+         null);
+
+// escaped(lead), no unicode flag
+assertEqArray(new RegExp("\\uD83D\uDC38", "").exec("\u{1F438}"),
+              ["\u{1F438}"]);
+
+// escaped(trail), no unicode flag
+assertEqArray(new RegExp("\uD83D\\uDC38", "").exec("\u{1F438}"),
+              ["\u{1F438}"]);
+
+// ==== ? ====
+
+assertEqArray(eval(`/\uD83D\uDC38?/u`).exec("\u{1F438}"),
+              ["\u{1F438}"]);
+assertEqArray(eval(`/\uD83D\uDC38?/u`).exec(""),
+              [""]);
+
+assertEqArray(eval(`/\uD83D\uDC38?/u`).exec("\uD83D"),
+              [""]);
+
+// no unicode flag
+assertEqArray(eval(`/\uD83D\uDC38?/`).exec("\u{1F438}"),
+              ["\u{1F438}"]);
+assertEq(eval(`/\uD83D\uDC38?/`).exec(""),
+         null);
+
+assertEqArray(eval(`/\uD83D\uDC38?/`).exec("\uD83D"),
+              ["\uD83D"]);
+
+// escaped (lead)
+assertEq(eval(`/\\uD83D\uDC38?/u`).exec("\u{1F438}"),
+         null);
+assertEq(eval(`/\\uD83D\uDC38?/u`).exec(""),
+         null);
+
+assertEqArray(eval(`/\\uD83D\uDC38?/u`).exec("\uD83D"),
+              ["\uD83D"]);
+
+// escaped (trail)
+assertEq(eval(`/\uD83D\\uDC38?/u`).exec("\u{1F438}"),
+         null);
+assertEq(eval(`/\uD83D\\uDC38?/u`).exec(""),
+         null);
+
+assertEqArray(eval(`/\uD83D\\uDC38?/u`).exec("\uD83D"),
+              ["\uD83D"]);
+
+// escaped (lead), no unicode flag
+assertEqArray(eval(`/\\uD83D\uDC38?/`).exec("\u{1F438}"),
+              ["\u{1F438}"]);
+assertEq(eval(`/\\uD83D\uDC38?/`).exec(""),
+         null);
+
+assertEqArray(eval(`/\\uD83D\uDC38?/`).exec("\uD83D"),
+              ["\uD83D"]);
+
+// escaped (trail), no unicode flag
+assertEqArray(eval(`/\uD83D\\uDC38?/`).exec("\u{1F438}"),
+              ["\u{1F438}"]);
+assertEq(eval(`/\uD83D\\uDC38?/`).exec(""),
+         null);
+
+assertEqArray(eval(`/\uD83D\\uDC38?/`).exec("\uD83D"),
+              ["\uD83D"]);
+
+// ==== RegExp constructor, ? ====
+
+assertEqArray(new RegExp("\uD83D\uDC38?", "u").exec("\u{1F438}"),
+              ["\u{1F438}"]);
+assertEqArray(new RegExp("\uD83D\uDC38?", "u").exec(""),
+              [""]);
+
+assertEqArray(new RegExp("\uD83D\uDC38?", "u").exec("\uD83D"),
+              [""]);
+
+// no unicode flag
+assertEqArray(new RegExp("\uD83D\uDC38?", "").exec("\u{1F438}"),
+              ["\u{1F438}"]);
+assertEq(new RegExp("\uD83D\uDC38?", "").exec(""),
+         null);
+
+assertEqArray(new RegExp("\uD83D\uDC38?", "").exec("\uD83D"),
+              ["\uD83D"]);
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff --git a/js/src/vm/Unicode.h b/js/src/vm/Unicode.h
index ea853442c7f9..1276e915af6e 100644
--- a/js/src/vm/Unicode.h
+++ b/js/src/vm/Unicode.h
@@ -234,6 +234,44 @@ CanLowerCase(char16_t ch)
     return CharInfo(ch).lowerCase != 0;
 }
 
+const size_t LeadSurrogateMin = 0xD800;
+const size_t LeadSurrogateMax = 0xDBFF;
+const size_t TrailSurrogateMin = 0xDC00;
+const size_t TrailSurrogateMax = 0xDFFF;
+const size_t UTF16Max = 0xFFFF;
+const size_t NonBMPMin = 0x10000;
+const size_t NonBMPMax = 0x10FFFF;
+
+inline bool
+IsLeadSurrogate(size_t value)
+{
+    return value >= LeadSurrogateMin && value <= LeadSurrogateMax;
+}
+
+inline bool
+IsTrailSurrogate(size_t value)
+{
+    return value >= TrailSurrogateMin && value <= TrailSurrogateMax;
+}
+
+inline void
+UTF16Encode(size_t cp, size_t* lead, size_t* trail)
+{
+    MOZ_ASSERT(cp >= NonBMPMin && cp <= NonBMPMax);
+
+    *lead = (cp - NonBMPMin) / 1024 + LeadSurrogateMin;
+    *trail = ((cp - NonBMPMin) % 1024) + TrailSurrogateMin;
+}
+
+inline size_t
+UTF16Decode(size_t lead, size_t trail)
+{
+    MOZ_ASSERT(IsLeadSurrogate(lead));
+    MOZ_ASSERT(IsTrailSurrogate(trail));
+
+    return (lead - LeadSurrogateMin) * 1024 + (trail - TrailSurrogateMin) + NonBMPMin;
+}
+
 } /* namespace unicode */
 } /* namespace js */
 
diff --git a/js/src/vm/Xdr.h b/js/src/vm/Xdr.h
index b034d7928b85..1139e1d37f91 100644
--- a/js/src/vm/Xdr.h
+++ b/js/src/vm/Xdr.h
@@ -29,11 +29,11 @@ namespace js {
  *
  *  https://developer.mozilla.org/en-US/docs/SpiderMonkey/Internals/Bytecode
  */
-static const uint32_t XDR_BYTECODE_VERSION_SUBTRAHEND = 334;
+static const uint32_t XDR_BYTECODE_VERSION_SUBTRAHEND = 335;
 static const uint32_t XDR_BYTECODE_VERSION =
     uint32_t(0xb973c0de - XDR_BYTECODE_VERSION_SUBTRAHEND);
 
-static_assert(JSErr_Limit == 421,
+static_assert(JSErr_Limit == 424,
               "GREETINGS, POTENTIAL SUBTRAHEND INCREMENTER! If you added or "
               "removed MSG_DEFs from js.msg, you should increment "
               "XDR_BYTECODE_VERSION_SUBTRAHEND and update this assertion's "

From fec1e26e0ba1429bc5fe7a0cb96f98ccbb0da14a Mon Sep 17 00:00:00 2001
From: Tooru Fujisawa <arai_a@mac.com>
Date: Fri, 7 Aug 2015 08:11:46 +0900
Subject: [PATCH 055/101] Bug 1135377 - Part 3: Parse RegExp unicode character
 in CharacterClass. r=till, f=anba

---
 js/src/irregexp/RegExpParser.cpp              | 456 ++++++++++++++++--
 js/src/irregexp/RegExpParser.h                |  10 +-
 js/src/js.msg                                 |   1 +
 .../ecma_6/RegExp/unicode-class-braced.js     | 236 +++++++++
 .../ecma_6/RegExp/unicode-class-empty.js      |  25 +
 .../ecma_6/RegExp/unicode-class-lead-trail.js | 142 ++++++
 .../ecma_6/RegExp/unicode-class-negated.js    |  64 +++
 .../ecma_6/RegExp/unicode-class-range.js      |  28 ++
 .../tests/ecma_6/RegExp/unicode-class-raw.js  |  65 +++
 js/src/vm/Xdr.h                               |   4 +-
 10 files changed, 983 insertions(+), 48 deletions(-)
 create mode 100644 js/src/tests/ecma_6/RegExp/unicode-class-braced.js
 create mode 100644 js/src/tests/ecma_6/RegExp/unicode-class-empty.js
 create mode 100644 js/src/tests/ecma_6/RegExp/unicode-class-lead-trail.js
 create mode 100644 js/src/tests/ecma_6/RegExp/unicode-class-negated.js
 create mode 100644 js/src/tests/ecma_6/RegExp/unicode-class-range.js
 create mode 100644 js/src/tests/ecma_6/RegExp/unicode-class-raw.js

diff --git a/js/src/irregexp/RegExpParser.cpp b/js/src/irregexp/RegExpParser.cpp
index f444e3cde077..bbb07f1c3046 100644
--- a/js/src/irregexp/RegExpParser.cpp
+++ b/js/src/irregexp/RegExpParser.cpp
@@ -421,8 +421,8 @@ IsSpecialClassEscape(widechar c)
 #endif
 
 template <typename CharT>
-widechar
-RegExpParser<CharT>::ParseClassCharacterEscape()
+bool
+RegExpParser<CharT>::ParseClassCharacterEscape(widechar* code)
 {
     MOZ_ASSERT(current() == '\\');
     MOZ_ASSERT(has_next() && !IsSpecialClassEscape(Next()));
@@ -430,24 +430,30 @@ RegExpParser<CharT>::ParseClassCharacterEscape()
     switch (current()) {
       case 'b':
         Advance();
-        return '\b';
+        *code = '\b';
+        return true;
       // ControlEscape :: one of
       //   f n r t v
       case 'f':
         Advance();
-        return '\f';
+        *code = '\f';
+        return true;
       case 'n':
         Advance();
-        return '\n';
+        *code = '\n';
+        return true;
       case 'r':
         Advance();
-        return '\r';
+        *code = '\r';
+        return true;
       case 't':
         Advance();
-        return '\t';
+        *code = '\t';
+        return true;
       case 'v':
         Advance();
-        return '\v';
+        *code = '\v';
+        return true;
       case 'c': {
         widechar controlLetter = Next();
         widechar letter = controlLetter & ~('A' ^ 'a');
@@ -459,35 +465,65 @@ RegExpParser<CharT>::ParseClassCharacterEscape()
             Advance(2);
             // Control letters mapped to ASCII control characters in the range
             // 0x00-0x1f.
-            return controlLetter & 0x1f;
+            *code = controlLetter & 0x1f;
+            return true;
         }
         // We match JSC in reading the backslash as a literal
         // character instead of as starting an escape.
-        return '\\';
+        *code = '\\';
+        return true;
       }
       case '0': case '1': case '2': case '3': case '4': case '5':
       case '6': case '7':
         // For compatibility, we interpret a decimal escape that isn't
         // a back reference (and therefore either \0 or not valid according
         // to the specification) as a 1..3 digit octal character code.
-        return ParseOctalLiteral();
+        *code = ParseOctalLiteral();
+        return true;
       case 'x': {
         Advance();
         size_t value;
-        if (ParseHexEscape(2, &value))
-            return value;
+        if (ParseHexEscape(2, &value)) {
+            *code = value;
+            return true;
+        }
         // If \x is not followed by a two-digit hexadecimal, treat it
         // as an identity escape.
-        return 'x';
+        *code = 'x';
+        return true;
       }
       case 'u': {
         Advance();
         size_t value;
-        if (ParseHexEscape(4, &value))
-            return value;
-        // If \u is not followed by a four-digit hexadecimal, treat it
+        if (unicode_) {
+            if (current() == '{') {
+                if (!ParseBracedHexEscape(&value))
+                    return false;
+                *code = value;
+                return true;
+            }
+            if (ParseHexEscape(4, &value)) {
+                if (unicode::IsLeadSurrogate(value)) {
+                    size_t trail;
+                    if (ParseTrailSurrogate(&trail)) {
+                        *code = unicode::UTF16Decode(value, trail);
+                        return true;
+                    }
+                }
+                *code = value;
+                return true;
+            }
+            ReportError(JSMSG_INVALID_UNICODE_ESCAPE);
+            return false;
+        }
+        if (ParseHexEscape(4, &value)) {
+            *code = value;
+            return true;
+        }
+        // If \u is not followed by a four-digit or braced hexadecimal, treat it
         // as an identity escape.
-        return 'u';
+        *code = 'u';
+        return true;
       }
       default: {
         // Extended identity escape. We accept any character that hasn't
@@ -495,27 +531,319 @@ RegExpParser<CharT>::ParseClassCharacterEscape()
         // by the ECMAScript specification.
         widechar result = current();
         Advance();
-        return result;
+        *code = result;
+        return true;
       }
     }
-    return 0;
+    return true;
+}
+
+class WideCharRange
+{
+  public:
+    WideCharRange()
+      : from_(0), to_(0)
+    {}
+
+    WideCharRange(widechar from, widechar to)
+      : from_(from), to_(to)
+    {}
+
+    static inline WideCharRange Singleton(widechar value) {
+        return WideCharRange(value, value);
+    }
+    static inline WideCharRange Range(widechar from, widechar to) {
+        MOZ_ASSERT(from <= to);
+        return WideCharRange(from, to);
+    }
+
+    widechar from() const { return from_; }
+    widechar to() const { return to_; }
+
+  private:
+    widechar from_;
+    widechar to_;
+};
+
+typedef Vector<WideCharRange, 1, LifoAllocPolicy<Infallible> > WideCharRangeVector;
+
+static inline CharacterRange
+LeadSurrogateRange()
+{
+    return CharacterRange::Range(unicode::LeadSurrogateMin, unicode::LeadSurrogateMax);
+}
+
+static inline CharacterRange
+TrailSurrogateRange()
+{
+    return CharacterRange::Range(unicode::TrailSurrogateMin, unicode::TrailSurrogateMax);
+}
+
+static inline WideCharRange
+NonBMPRange()
+{
+    return WideCharRange::Range(unicode::NonBMPMin, unicode::NonBMPMax);
 }
 
 static const char16_t kNoCharClass = 0;
 
-// Adds range or pre-defined character class to character ranges.
+// Adds a character or pre-defined character class to character ranges.
 // If char_class is not kInvalidClass, it's interpreted as a class
 // escape (i.e., 's' means whitespace, from '\s').
 static inline void
-AddRangeOrEscape(LifoAlloc* alloc,
-                 CharacterRangeVector* ranges,
-                 char16_t char_class,
-                 CharacterRange range)
+AddCharOrEscape(LifoAlloc* alloc,
+                CharacterRangeVector* ranges,
+                char16_t char_class,
+                widechar c)
 {
     if (char_class != kNoCharClass)
         CharacterRange::AddClassEscape(alloc, char_class, ranges);
     else
-        ranges->append(range);
+        ranges->append(CharacterRange::Singleton(c));
+}
+
+static inline void
+AddCharOrEscapeUnicode(LifoAlloc* alloc,
+                       CharacterRangeVector* ranges,
+                       CharacterRangeVector* lead_ranges,
+                       CharacterRangeVector* trail_ranges,
+                       WideCharRangeVector* wide_ranges,
+                       char16_t char_class,
+                       widechar c)
+{
+    if (char_class != kNoCharClass)
+        CharacterRange::AddClassEscape(alloc, char_class, ranges);
+    else if (unicode::IsLeadSurrogate(c))
+        lead_ranges->append(CharacterRange::Singleton(c));
+    else if (unicode::IsTrailSurrogate(c))
+        trail_ranges->append(CharacterRange::Singleton(c));
+    else if (c >= unicode::NonBMPMin)
+        wide_ranges->append(WideCharRange::Singleton(c));
+    else
+        ranges->append(CharacterRange::Singleton(c));
+}
+
+static inline void
+AddUnicodeRange(LifoAlloc* alloc,
+                CharacterRangeVector* ranges,
+                CharacterRangeVector* lead_ranges,
+                CharacterRangeVector* trail_ranges,
+                WideCharRangeVector* wide_ranges,
+                widechar first,
+                widechar next)
+{
+    MOZ_ASSERT(first <= next);
+    if (first < unicode::LeadSurrogateMin) {
+        if (next < unicode::LeadSurrogateMin) {
+            ranges->append(CharacterRange::Range(first, next));
+            return;
+        }
+        ranges->append(CharacterRange::Range(first, unicode::LeadSurrogateMin - 1));
+        first = unicode::LeadSurrogateMin;
+    }
+    if (first <= unicode::LeadSurrogateMax) {
+        if (next <= unicode::LeadSurrogateMax) {
+            lead_ranges->append(CharacterRange::Range(first, next));
+            return;
+        }
+        lead_ranges->append(CharacterRange::Range(first, unicode::LeadSurrogateMax));
+        first = unicode::LeadSurrogateMax + 1;
+    }
+    MOZ_ASSERT(unicode::LeadSurrogateMax + 1 == unicode::TrailSurrogateMin);
+    if (first <= unicode::TrailSurrogateMax) {
+        if (next <= unicode::TrailSurrogateMax) {
+            trail_ranges->append(CharacterRange::Range(first, next));
+            return;
+        }
+        trail_ranges->append(CharacterRange::Range(first, unicode::TrailSurrogateMax));
+        first = unicode::TrailSurrogateMax + 1;
+    }
+    if (first <= unicode::UTF16Max) {
+        if (next <= unicode::UTF16Max) {
+            ranges->append(CharacterRange::Range(first, next));
+            return;
+        }
+        ranges->append(CharacterRange::Range(first, unicode::UTF16Max));
+        first = unicode::NonBMPMin;
+    }
+    MOZ_ASSERT(unicode::UTF16Max + 1 == unicode::NonBMPMin);
+    wide_ranges->append(WideCharRange::Range(first, next));
+}
+
+// Negate a vector of ranges by subtracting its ranges from a range
+// encompassing the full range of possible values.
+template <typename RangeType>
+static inline void
+NegateUnicodeRanges(LifoAlloc* alloc, Vector<RangeType, 1, LifoAllocPolicy<Infallible> >** ranges,
+                    RangeType full_range)
+{
+    typedef Vector<RangeType, 1, LifoAllocPolicy<Infallible> > RangeVector;
+    RangeVector* tmp_ranges = alloc->newInfallible<RangeVector>(*alloc);
+    tmp_ranges->append(full_range);
+    RangeVector* result_ranges = alloc->newInfallible<RangeVector>(*alloc);
+
+    // Perform the following calculation:
+    //   result_ranges = tmp_ranges - ranges
+    // with the following steps:
+    //   result_ranges = tmp_ranges - ranges[0]
+    //   SWAP(result_ranges, tmp_ranges)
+    //   result_ranges = tmp_ranges - ranges[1]
+    //   SWAP(result_ranges, tmp_ranges)
+    //   ...
+    //   result_ranges = tmp_ranges - ranges[N-1]
+    //   SWAP(result_ranges, tmp_ranges)
+    // The last SWAP is just for simplicity of the loop.
+    for (size_t i = 0; i < (*ranges)->length(); i++) {
+        result_ranges->clear();
+
+        const RangeType& range = (**ranges)[i];
+        for (size_t j = 0; j < tmp_ranges->length(); j++) {
+            const RangeType& tmpRange = (*tmp_ranges)[j];
+            size_t from1 = tmpRange.from();
+            size_t to1 = tmpRange.to();
+            size_t from2 = range.from();
+            size_t to2 = range.to();
+
+            if (from1 < from2) {
+                if (to1 < from2) {
+                    result_ranges->append(tmpRange);
+                } else if (to1 <= to2) {
+                    result_ranges->append(RangeType::Range(from1, from2 - 1));
+                } else {
+                    result_ranges->append(RangeType::Range(from1, from2 - 1));
+                    result_ranges->append(RangeType::Range(to2 + 1, to1));
+                }
+            } else if (from1 <= to2) {
+                if (to1 > to2)
+                    result_ranges->append(RangeType::Range(to2 + 1, to1));
+            } else {
+                result_ranges->append(tmpRange);
+            }
+        }
+
+        auto tmp = tmp_ranges;
+        tmp_ranges = result_ranges;
+        result_ranges = tmp;
+    }
+
+    // After the loop, result is pointed at by tmp_ranges, instead of
+    // result_ranges.
+    *ranges = tmp_ranges;
+}
+
+static RegExpTree*
+UnicodeRangesAtom(LifoAlloc* alloc,
+                  CharacterRangeVector* ranges,
+                  CharacterRangeVector* lead_ranges,
+                  CharacterRangeVector* trail_ranges,
+                  WideCharRangeVector* wide_ranges,
+                  bool is_negated)
+{
+    if (is_negated) {
+        NegateUnicodeRanges(alloc, &lead_ranges, LeadSurrogateRange());
+        NegateUnicodeRanges(alloc, &trail_ranges, TrailSurrogateRange());
+        NegateUnicodeRanges(alloc, &wide_ranges, NonBMPRange());
+    }
+
+    RegExpBuilder* builder = alloc->newInfallible<RegExpBuilder>(alloc);
+
+    bool added = false;
+
+    if (is_negated) {
+        ranges->append(LeadSurrogateRange());
+        ranges->append(TrailSurrogateRange());
+    }
+    if (ranges->length() > 0) {
+        builder->AddAtom(alloc->newInfallible<RegExpCharacterClass>(ranges, is_negated));
+        added = true;
+    }
+
+    if (lead_ranges->length() > 0) {
+        if (added)
+            builder->NewAlternative();
+        builder->AddAtom(alloc->newInfallible<RegExpCharacterClass>(lead_ranges, false));
+        builder->AddAtom(NegativeLookahead(alloc, unicode::TrailSurrogateMin,
+                                           unicode::TrailSurrogateMax));
+        added = true;
+    }
+
+    if (trail_ranges->length() > 0) {
+        if (added)
+            builder->NewAlternative();
+        builder->AddAssertion(alloc->newInfallible<RegExpAssertion>(
+            RegExpAssertion::NOT_AFTER_LEAD_SURROGATE));
+        builder->AddAtom(alloc->newInfallible<RegExpCharacterClass>(trail_ranges, false));
+        added = true;
+    }
+
+    for (size_t i = 0; i < wide_ranges->length(); i++) {
+        if (added)
+            builder->NewAlternative();
+
+        const WideCharRange& range = (*wide_ranges)[i];
+        widechar from = range.from();
+        widechar to = range.to();
+        size_t from_lead, from_trail;
+        size_t to_lead, to_trail;
+
+        unicode::UTF16Encode(from, &from_lead, &from_trail);
+        if (from == to) {
+            builder->AddCharacter(from_lead);
+            builder->AddCharacter(from_trail);
+        } else {
+            unicode::UTF16Encode(to, &to_lead, &to_trail);
+            if (from_lead == to_lead) {
+                MOZ_ASSERT(from_trail != to_trail);
+                builder->AddCharacter(from_lead);
+                builder->AddAtom(RangeAtom(alloc, from_trail, to_trail));
+            } else if (from_trail == unicode::TrailSurrogateMin &&
+                       to_trail == unicode::TrailSurrogateMax)
+            {
+                builder->AddAtom(RangeAtom(alloc, from_lead, to_lead));
+                builder->AddAtom(RangeAtom(alloc, unicode::TrailSurrogateMin,
+                                           unicode::TrailSurrogateMax));
+            } else if (from_lead + 1 == to_lead) {
+                builder->AddCharacter(from_lead);
+                builder->AddAtom(RangeAtom(alloc, from_trail, unicode::TrailSurrogateMax));
+
+                builder->NewAlternative();
+
+                builder->AddCharacter(to_lead);
+                builder->AddAtom(RangeAtom(alloc, unicode::TrailSurrogateMin, to_trail));
+            } else if (from_lead + 2 == to_lead) {
+                builder->AddCharacter(from_lead);
+                builder->AddAtom(RangeAtom(alloc, from_trail, unicode::TrailSurrogateMax));
+
+                builder->NewAlternative();
+
+                builder->AddCharacter(from_lead + 1);
+                builder->AddAtom(RangeAtom(alloc, unicode::TrailSurrogateMin,
+                                           unicode::TrailSurrogateMax));
+
+                builder->NewAlternative();
+
+                builder->AddCharacter(to_lead);
+                builder->AddAtom(RangeAtom(alloc, unicode::TrailSurrogateMin, to_trail));
+            } else {
+                builder->AddCharacter(from_lead);
+                builder->AddAtom(RangeAtom(alloc, from_trail, unicode::TrailSurrogateMax));
+
+                builder->NewAlternative();
+
+                builder->AddAtom(RangeAtom(alloc, from_lead + 1, to_lead - 1));
+                builder->AddAtom(RangeAtom(alloc, unicode::TrailSurrogateMin,
+                                           unicode::TrailSurrogateMax));
+
+                builder->NewAlternative();
+
+                builder->AddCharacter(to_lead);
+                builder->AddAtom(RangeAtom(alloc, unicode::TrailSurrogateMin, to_trail));
+            }
+        }
+        added = true;
+    }
+
+    return builder->ToRegExp();
 }
 
 template <typename CharT>
@@ -530,9 +858,19 @@ RegExpParser<CharT>::ParseCharacterClass()
         Advance();
     }
     CharacterRangeVector* ranges = alloc->newInfallible<CharacterRangeVector>(*alloc);
+    CharacterRangeVector* lead_ranges = nullptr;
+    CharacterRangeVector* trail_ranges = nullptr;
+    WideCharRangeVector* wide_ranges = nullptr;
+
+    if (unicode_) {
+        lead_ranges = alloc->newInfallible<CharacterRangeVector>(*alloc);
+        trail_ranges = alloc->newInfallible<CharacterRangeVector>(*alloc);
+        wide_ranges = alloc->newInfallible<WideCharRangeVector>(*alloc);
+    }
+
     while (has_more() && current() != ']') {
         char16_t char_class = kNoCharClass;
-        CharacterRange first;
+        widechar first = 0;
         if (!ParseClassAtom(&char_class, &first))
             return nullptr;
         if (current() == '-') {
@@ -542,41 +880,68 @@ RegExpParser<CharT>::ParseCharacterClass()
                 // following code report an error.
                 break;
             } else if (current() == ']') {
-                AddRangeOrEscape(alloc, ranges, char_class, first);
+                if (unicode_) {
+                    AddCharOrEscapeUnicode(alloc, ranges, lead_ranges, trail_ranges, wide_ranges,
+                                           char_class, first);
+                } else {
+                    AddCharOrEscape(alloc, ranges, char_class, first);
+                }
                 ranges->append(CharacterRange::Singleton('-'));
                 break;
             }
             char16_t char_class_2 = kNoCharClass;
-            CharacterRange next;
+            widechar next = 0;
             if (!ParseClassAtom(&char_class_2, &next))
                 return nullptr;
             if (char_class != kNoCharClass || char_class_2 != kNoCharClass) {
+                if (unicode_)
+                    return ReportError(JSMSG_RANGE_WITH_CLASS_ESCAPE);
+
                 // Either end is an escaped character class. Treat the '-' verbatim.
-                AddRangeOrEscape(alloc, ranges, char_class, first);
+                AddCharOrEscape(alloc, ranges, char_class, first);
                 ranges->append(CharacterRange::Singleton('-'));
-                AddRangeOrEscape(alloc, ranges, char_class_2, next);
+                AddCharOrEscape(alloc, ranges, char_class_2, next);
                 continue;
             }
-            if (first.from() > next.to())
+            if (first > next)
                 return ReportError(JSMSG_BAD_CLASS_RANGE);
-            ranges->append(CharacterRange::Range(first.from(), next.to()));
+            if (unicode_)
+                AddUnicodeRange(alloc, ranges, lead_ranges, trail_ranges,wide_ranges, first, next);
+            else
+                ranges->append(CharacterRange::Range(first, next));
         } else {
-            AddRangeOrEscape(alloc, ranges, char_class, first);
+            if (unicode_) {
+                AddCharOrEscapeUnicode(alloc, ranges, lead_ranges, trail_ranges, wide_ranges,
+                                       char_class, first);
+            } else {
+                AddCharOrEscape(alloc, ranges, char_class, first);
+            }
         }
     }
     if (!has_more())
         return ReportError(JSMSG_UNTERM_CLASS);
     Advance();
-    if (ranges->length() == 0) {
-        ranges->append(CharacterRange::Everything());
-        is_negated = !is_negated;
+    if (!unicode_) {
+        if (ranges->length() == 0) {
+            ranges->append(CharacterRange::Everything());
+            is_negated = !is_negated;
+        }
+        return alloc->newInfallible<RegExpCharacterClass>(ranges, is_negated);
     }
-    return alloc->newInfallible<RegExpCharacterClass>(ranges, is_negated);
+
+    if (!is_negated && ranges->length() == 0 && lead_ranges->length() == 0 &&
+        trail_ranges->length() == 0 && wide_ranges->length() == 0)
+    {
+        ranges->append(CharacterRange::Everything());
+        return alloc->newInfallible<RegExpCharacterClass>(ranges, true);
+    }
+
+    return UnicodeRangesAtom(alloc, ranges, lead_ranges, trail_ranges, wide_ranges, is_negated);
 }
 
 template <typename CharT>
 bool
-RegExpParser<CharT>::ParseClassAtom(char16_t* char_class, CharacterRange* char_range)
+RegExpParser<CharT>::ParseClassAtom(char16_t* char_class, widechar* value)
 {
     MOZ_ASSERT(*char_class == kNoCharClass);
     widechar first = current();
@@ -590,13 +955,20 @@ RegExpParser<CharT>::ParseClassAtom(char16_t* char_class, CharacterRange* char_r
           case kEndMarker:
             return ReportError(JSMSG_ESCAPE_AT_END_OF_REGEXP);
           default:
-            widechar c = ParseClassCharacterEscape();
-            *char_range = CharacterRange::Singleton(c);
+            if (!ParseClassCharacterEscape(value))
+                return false;
             return true;
         }
     } else {
+        if (unicode_) {
+            char16_t lead, trail;
+            if (ParseRawSurrogatePair(&lead, &trail)) {
+                *value = unicode::UTF16Decode(lead, trail);
+                return true;
+            }
+        }
         Advance();
-        *char_range = CharacterRange::Singleton(first);
+        *value = first;
         return true;
     }
 }
diff --git a/js/src/irregexp/RegExpParser.h b/js/src/irregexp/RegExpParser.h
index 352c1d5fa4e8..8f7cf6304cd1 100644
--- a/js/src/irregexp/RegExpParser.h
+++ b/js/src/irregexp/RegExpParser.h
@@ -185,9 +185,11 @@ class RegExpParser
     // out parameters.
     bool ParseIntervalQuantifier(int* min_out, int* max_out);
 
-    // Parses and returns a single escaped character.  The character
-    // must not be 'b' or 'B' since they are usually handled specially.
-    widechar ParseClassCharacterEscape();
+    // Tries to parse the input as a single escaped character.  If successful
+    // it stores the result in the output parameter and returns true.
+    // Otherwise it throws an error and returns false.  The character must not
+    // be 'b' or 'B' since they are usually handled specially.
+    bool ParseClassCharacterEscape(widechar* code);
 
     // Checks whether the following is a length-digit hexadecimal number,
     // and sets the value if it is.
@@ -205,7 +207,7 @@ class RegExpParser
     // can be reparsed.
     bool ParseBackReferenceIndex(int* index_out);
 
-    bool ParseClassAtom(char16_t* char_class, CharacterRange* char_range);
+    bool ParseClassAtom(char16_t* char_class, widechar *value);
     RegExpTree* ReportError(unsigned errorNumber);
     void Advance();
     void Advance(int dist) {
diff --git a/js/src/js.msg b/js/src/js.msg
index faa6a0e019e5..f8fb960e666a 100644
--- a/js/src/js.msg
+++ b/js/src/js.msg
@@ -453,6 +453,7 @@ MSG_DEF(JSMSG_MISSING_PAREN,           0, JSEXN_SYNTAXERR, "unterminated parenth
 MSG_DEF(JSMSG_NEWREGEXP_FLAGGED,       0, JSEXN_TYPEERR, "can't supply flags when constructing one RegExp from another")
 MSG_DEF(JSMSG_NOTHING_TO_REPEAT,       0, JSEXN_SYNTAXERR, "nothing to repeat")
 MSG_DEF(JSMSG_NUMBERS_OUT_OF_ORDER,    0, JSEXN_SYNTAXERR, "numbers out of order in {} quantifier.")
+MSG_DEF(JSMSG_RANGE_WITH_CLASS_ESCAPE, 0, JSEXN_SYNTAXERR, "character class escape cannot be used in class range in regular expression")
 MSG_DEF(JSMSG_TOO_MANY_PARENS,         0, JSEXN_INTERNALERR, "too many parentheses in regular expression")
 MSG_DEF(JSMSG_UNICODE_OVERFLOW,        0, JSEXN_SYNTAXERR, "unicode codepoint should not be greater than 0x10FFFF in regular expression")
 MSG_DEF(JSMSG_UNMATCHED_RIGHT_PAREN,   0, JSEXN_SYNTAXERR, "unmatched ) in regular expression")
diff --git a/js/src/tests/ecma_6/RegExp/unicode-class-braced.js b/js/src/tests/ecma_6/RegExp/unicode-class-braced.js
new file mode 100644
index 000000000000..4b5954012929
--- /dev/null
+++ b/js/src/tests/ecma_6/RegExp/unicode-class-braced.js
@@ -0,0 +1,236 @@
+var BUGNUMBER = 1135377;
+var summary = "Implement RegExp unicode flag -- braced pattern in RegExpUnicodeEscapeSequence in CharacterClass.";
+
+print(BUGNUMBER + ": " + summary);
+
+// ==== standalone ====
+
+assertEqArray(/[\u{41}]/u.exec("ABC"),
+              ["A"]);
+
+assertEqArray(/[\u{1F438}]/u.exec("\u{1F438}"),
+              ["\u{1F438}"]);
+assertEq(/[\u{1F438}]/u.exec("\uD83D"),
+         null);
+assertEq(/[\u{1F438}]/u.exec("\uDC38"),
+         null);
+
+assertEqArray(/[\u{0}]/u.exec("\u{0}"),
+              ["\u{0}"]);
+assertEqArray(/[\u{10FFFF}]/u.exec("\u{10FFFF}"),
+              ["\u{10FFFF}"]);
+assertEqArray(/[\u{10ffff}]/u.exec("\u{10FFFF}"),
+              ["\u{10FFFF}"]);
+
+// leading 0
+assertEqArray(/[\u{0000000000000000000000}]/u.exec("\u{0}"),
+              ["\u{0}"]);
+assertEqArray(/[\u{000000000000000010FFFF}]/u.exec("\u{10FFFF}"),
+              ["\u{10FFFF}"]);
+
+// RegExp constructor
+assertEqArray(new RegExp("[\\u{0}]", "u").exec("\u{0}"),
+              ["\u{0}"]);
+assertEqArray(new RegExp("[\\u{41}]", "u").exec("ABC"),
+              ["A"]);
+assertEqArray(new RegExp("[\\u{1F438}]", "u").exec("\u{1F438}"),
+              ["\u{1F438}"]);
+assertEqArray(new RegExp("[\\u{10FFFF}]", "u").exec("\u{10FFFF}"),
+              ["\u{10FFFF}"]);
+
+assertEqArray(new RegExp("[\\u{0000000000000000}]", "u").exec("\u{0}"),
+              ["\u{0}"]);
+
+assertEqArray(eval(`/[\\u{${"0".repeat(Math.pow(2, 24)) + "1234"}}]/u`).exec("\u{1234}"),
+              ["\u{1234}"]);
+assertEqArray(new RegExp(`[\\u{${"0".repeat(Math.pow(2, 24)) + "1234"}}]`, "u").exec("\u{1234}"),
+              ["\u{1234}"]);
+
+// ==== BMP + non-BMP ====
+
+assertEqArray(/[A\u{1F438}]/u.exec("A\u{1F438}"),
+              ["A"]);
+assertEqArray(/[A\u{1F438}]/u.exec("\u{1F438}A"),
+              ["\u{1F438}"]);
+
+// lead-only target
+assertEqArray(/[A\u{1F438}]/u.exec("\uD83DA"),
+              ["A"]);
+assertEq(/[A\u{1F438}]/u.exec("\uD83D"),
+         null);
+
+// +
+assertEqArray(/[A\u{1F438}]+/u.exec("\u{1F438}A\u{1F438}A"),
+              ["\u{1F438}A\u{1F438}A"]);
+
+// trail surrogate + lead surrogate
+assertEqArray(/[A\u{1F438}]+/u.exec("\uD83D\uDC38A\uDC38\uD83DA"),
+              ["\uD83D\uDC38A"]);
+
+// ==== non-BMP + non-BMP ====
+
+assertEqArray(/[\u{1F418}\u{1F438}]/u.exec("\u{1F418}\u{1F438}"),
+              ["\u{1F418}"]);
+
+assertEqArray(/[\u{1F418}\u{1F438}]+/u.exec("\u{1F418}\u{1F438}"),
+              ["\u{1F418}\u{1F438}"]);
+assertEqArray(/[\u{1F418}\u{1F438}]+/u.exec("\u{1F418}\uDC38\uD83D"),
+              ["\u{1F418}"]);
+assertEqArray(/[\u{1F418}\u{1F438}]+/u.exec("\uDC18\uD83D\u{1F438}"),
+              ["\u{1F438}"]);
+assertEqArray(/[\u{1F418}\u{1F438}]+/u.exec("\uDC18\u{1F438}\uD83D"),
+              ["\u{1F438}"]);
+
+// trail surrogate + lead surrogate
+assertEq(/[\u{1F418}\u{1F438}]+/u.exec("\uDC18\uDC38\uD83D\uD83D"),
+         null);
+
+// ==== non-BMP + non-BMP range (from_lead == to_lead) ====
+
+assertEqArray(/[\u{1F418}-\u{1F438}]/u.exec("\u{1F418}"),
+              ["\u{1F418}"]);
+assertEqArray(/[\u{1F418}-\u{1F438}]/u.exec("\u{1F438}"),
+              ["\u{1F438}"]);
+assertEqArray(/[\u{1F418}-\u{1F438}]/u.exec("\u{1F427}"),
+              ["\u{1F427}"]);
+
+assertEq(/[\u{1F418}-\u{1F438}]/u.exec("\u{1F417}"),
+         null);
+assertEq(/[\u{1F418}-\u{1F438}]/u.exec("\u{1F439}"),
+         null);
+
+// ==== non-BMP + non-BMP range (from_lead + 1 == to_lead) ====
+
+assertEqArray(/[\u{1F17C}-\u{1F438}]/u.exec("\uD83C\uDD7C"),
+              ["\uD83C\uDD7C"]);
+assertEqArray(/[\u{1F17C}-\u{1F438}]/u.exec("\u{1F438}"),
+              ["\u{1F438}"]);
+assertEqArray(/[\u{1F17C}-\u{1F438}]/u.exec("\uD83C\uDF99"),
+              ["\uD83C\uDF99"]);
+assertEqArray(/[\u{1F17C}-\u{1F438}]/u.exec("\uD83D\uDC00"),
+              ["\uD83D\uDC00"]);
+
+assertEq(/[\u{1F17C}-\u{1F438}]/u.exec("\uD83C\uDD7B"),
+         null);
+assertEq(/[\u{1F17C}-\u{1F438}]/u.exec("\uD83C\uE000"),
+         null);
+assertEq(/[\u{1F17C}-\u{1F438}]/u.exec("\uD83D\uDB99"),
+         null);
+assertEq(/[\u{1F17C}-\u{1F438}]/u.exec("\uD83D\uDC39"),
+         null);
+
+// ==== non-BMP + non-BMP range (from_lead + 2 == to_lead) ====
+
+assertEqArray(/[\u{1F17C}-\u{1F829}]/u.exec("\uD83C\uDD7C"),
+              ["\uD83C\uDD7C"]);
+assertEqArray(/[\u{1F17C}-\u{1F829}]/u.exec("\uD83E\uDC29"),
+              ["\uD83E\uDC29"]);
+
+assertEqArray(/[\u{1F17C}-\u{1F829}]/u.exec("\uD83C\uDF99"),
+              ["\uD83C\uDF99"]);
+assertEqArray(/[\u{1F17C}-\u{1F829}]/u.exec("\uD83D\uDC00"),
+              ["\uD83D\uDC00"]);
+assertEqArray(/[\u{1F17C}-\u{1F829}]/u.exec("\uD83D\uDF99"),
+              ["\uD83D\uDF99"]);
+assertEqArray(/[\u{1F17C}-\u{1F829}]/u.exec("\uD83E\uDC00"),
+              ["\uD83E\uDC00"]);
+
+assertEq(/[\u{1F17C}-\u{1F829}]/u.exec("\uD83C\uDD7B"),
+         null);
+assertEq(/[\u{1F17C}-\u{1F829}]/u.exec("\uD83C\uE000"),
+         null);
+assertEq(/[\u{1F17C}-\u{1F829}]/u.exec("\uD83D\uDB99"),
+         null);
+assertEq(/[\u{1F17C}-\u{1F829}]/u.exec("\uD83D\uE000"),
+         null);
+assertEq(/[\u{1F17C}-\u{1F829}]/u.exec("\uD83E\uDB99"),
+         null);
+assertEq(/[\u{1F17C}-\u{1F829}]/u.exec("\uD83E\uDC30"),
+         null);
+
+// ==== non-BMP + non-BMP range (other) ====
+
+assertEqArray(/[\u{1D164}-\u{1F438}]/u.exec("\uD834\uDD64"),
+              ["\uD834\uDD64"]);
+assertEqArray(/[\u{1D164}-\u{1F438}]/u.exec("\u{1F438}"),
+              ["\u{1F438}"]);
+assertEqArray(/[\u{1D164}-\u{1F438}]/u.exec("\uD836\uDF99"),
+              ["\uD836\uDF99"]);
+assertEqArray(/[\u{1D164}-\u{1F438}]/u.exec("\uD838\uDC00"),
+              ["\uD838\uDC00"]);
+
+assertEq(/[\u{1D164}-\u{1F438}]/u.exec("\uD834\uDD63"),
+         null);
+assertEq(/[\u{1D164}-\u{1F438}]/u.exec("\uD83D\uDC39"),
+         null);
+
+assertEq(/[\u{1D164}-\u{1F438}]/u.exec("\uD834\uE000"),
+         null);
+assertEq(/[\u{1D164}-\u{1F438}]/u.exec("\uD835\uDB99"),
+         null);
+assertEq(/[\u{1D164}-\u{1F438}]/u.exec("\uD83C\uE000"),
+         null);
+assertEq(/[\u{1D164}-\u{1F438}]/u.exec("\uD83D\uDB99"),
+         null);
+
+// ==== BMP + non-BMP range ====
+
+assertEqArray(/[\u{42}-\u{1F438}]/u.exec("B"),
+              ["B"]);
+assertEqArray(/[\u{42}-\u{1F438}]/u.exec("C"),
+              ["C"]);
+assertEqArray(/[\u{42}-\u{1F438}]/u.exec("\uFFFF"),
+              ["\uFFFF"]);
+assertEqArray(/[\u{42}-\u{1F438}]/u.exec("\uD800\uDC00"),
+              ["\uD800\uDC00"]);
+
+assertEqArray(/[\u{42}-\u{1F438}]/u.exec("\uD800"),
+              ["\uD800"]);
+assertEqArray(/[\u{42}-\u{1F438}]/u.exec("\uDBFF"),
+              ["\uDBFF"]);
+assertEqArray(/[\u{42}-\u{1F438}]/u.exec("\uDC00"),
+              ["\uDC00"]);
+assertEqArray(/[\u{42}-\u{1F438}]/u.exec("\uDFFF"),
+              ["\uDFFF"]);
+
+assertEqArray(/[\u{42}-\u{1F438}]/u.exec("\uD83D"),
+              ["\uD83D"]);
+assertEqArray(/[\u{42}-\u{1F438}]/u.exec("\uDC38"),
+              ["\uDC38"]);
+
+assertEqArray(/[\u{42}-\u{1F438}]/u.exec("\uD83D\uDBFF"),
+              ["\uD83D"]);
+assertEqArray(/[\u{42}-\u{1F438}]/u.exec("\uD83D\uDC00"),
+              ["\uD83D\uDC00"]);
+assertEqArray(/[\u{42}-\u{1F438}]/u.exec("\uD83D\uDC38"),
+              ["\uD83D\uDC38"]);
+assertEq(/[\u{42}-\u{1F438}]/u.exec("\uD83D\uDC39"),
+         null);
+assertEq(/[\u{42}-\u{1F438}]/u.exec("\uD83D\uDFFF"),
+         null);
+assertEqArray(/[\u{42}-\u{1F438}]/u.exec("\uD83D\uE000"),
+              ["\uD83D"]);
+
+assertEq(/[\u{42}-\u{1F438}]/u.exec("A"),
+         null);
+
+// ==== wrong patterns ====
+
+assertThrowsInstanceOf(() => eval(`/[\\u{-1}]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\u{0.0}]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\u{G}]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\u{}]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\u{{]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\u{]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\u{110000}]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\u{00110000}]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\u{100000000000000000000000000000}]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\u{FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF}]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\u{   FFFF}]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\u{FFFF   }]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\u{FF   FF}]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\u{F F F F}]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\u{100000001}]/u`), SyntaxError);
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff --git a/js/src/tests/ecma_6/RegExp/unicode-class-empty.js b/js/src/tests/ecma_6/RegExp/unicode-class-empty.js
new file mode 100644
index 000000000000..4d187551f634
--- /dev/null
+++ b/js/src/tests/ecma_6/RegExp/unicode-class-empty.js
@@ -0,0 +1,25 @@
+var BUGNUMBER = 1135377;
+var summary = "Implement RegExp unicode flag -- empty class should not match anything.";
+
+print(BUGNUMBER + ": " + summary);
+
+assertEq(/[]/u.exec("A"),
+         null);
+assertEq(/[]/u.exec("\uD83D"),
+         null);
+assertEq(/[]/u.exec("\uDC38"),
+         null);
+assertEq(/[]/u.exec("\uD83D\uDC38"),
+         null);
+
+assertEqArray(/[^]/u.exec("A"),
+              ["A"]);
+assertEqArray(/[^]/u.exec("\uD83D"),
+              ["\uD83D"]);
+assertEqArray(/[^]/u.exec("\uDC38"),
+              ["\uDC38"]);
+assertEqArray(/[^]/u.exec("\uD83D\uDC38"),
+              ["\uD83D\uDC38"]);
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff --git a/js/src/tests/ecma_6/RegExp/unicode-class-lead-trail.js b/js/src/tests/ecma_6/RegExp/unicode-class-lead-trail.js
new file mode 100644
index 000000000000..c83bf937d44c
--- /dev/null
+++ b/js/src/tests/ecma_6/RegExp/unicode-class-lead-trail.js
@@ -0,0 +1,142 @@
+var BUGNUMBER = 1135377;
+var summary = "Implement RegExp unicode flag -- lead and trail pattern in RegExpUnicodeEscapeSequence in CharacterClass.";
+
+print(BUGNUMBER + ": " + summary);
+
+// ==== standalone ====
+
+assertEqArray(/[\uD83D\uDC38]/u.exec("\uD83D\uDC38"),
+              ["\uD83D\uDC38"]);
+assertEq(/[\uD83D\uDC38]/u.exec("\uD83D"),
+         null);
+assertEq(/[\uD83D\uDC38]/u.exec("\uDC38"),
+         null);
+
+// no unicode flag
+assertEqArray(/[\uD83D\uDC38]/.exec("\uD83D\uDC38"),
+              ["\uD83D"]);
+assertEqArray(/[\uD83D\uDC38]/.exec("\uD83D"),
+              ["\uD83D"]);
+assertEqArray(/[\uD83D\uDC38]/.exec("\uDC38"),
+              ["\uDC38"]);
+
+// RegExp constructor
+assertEqArray(new RegExp("[\uD83D\uDC38]", "u").exec("\uD83D\uDC38"),
+              ["\uD83D\uDC38"]);
+assertEq(new RegExp("[\uD83D\uDC38]", "u").exec("\uD83D"),
+         null);
+assertEq(new RegExp("[\uD83D\uDC38]", "u").exec("\uDC38"),
+         null);
+
+// RegExp constructor, no unicode flag
+assertEqArray(new RegExp("[\uD83D\uDC38]", "").exec("\uD83D\uDC38"),
+              ["\uD83D"]);
+assertEqArray(new RegExp("[\uD83D\uDC38]", "").exec("\uD83D"),
+              ["\uD83D"]);
+assertEqArray(new RegExp("[\uD83D\uDC38]", "").exec("\uDC38"),
+              ["\uDC38"]);
+
+// ==== lead-only ====
+
+// match only non-surrogate pair
+assertEqArray(/[\uD83D]/u.exec("\uD83D\uDBFF"),
+              ["\uD83D"]);
+assertEq(/[\uD83D]/u.exec("\uD83D\uDC00"),
+         null);
+assertEq(/[\uD83D]/u.exec("\uD83D\uDFFF"),
+         null);
+assertEqArray(/[\uD83D]/u.exec("\uD83D\uE000"),
+              ["\uD83D"]);
+
+// match before non-tail char
+assertEqArray(/[\uD83D]/u.exec("\uD83D"),
+              ["\uD83D"]);
+assertEqArray(/[\uD83D]/u.exec("\uD83DA"),
+              ["\uD83D"]);
+
+// no unicode flag
+assertEqArray(/[\uD83D]/.exec("\uD83D\uDBFF"),
+              ["\uD83D"]);
+assertEqArray(/[\uD83D]/.exec("\uD83D\uDC00"),
+              ["\uD83D"]);
+assertEqArray(/[\uD83D]/.exec("\uD83D\uDFFF"),
+              ["\uD83D"]);
+assertEqArray(/[\uD83D]/.exec("\uD83D\uE000"),
+              ["\uD83D"]);
+assertEqArray(/[\uD83D]/.exec("\uD83D"),
+              ["\uD83D"]);
+assertEqArray(/[\uD83D]/.exec("\uD83DA"),
+              ["\uD83D"]);
+
+// ==== trail-only ====
+
+// match only non-surrogate pair
+assertEqArray(/[\uDC38]/u.exec("\uD7FF\uDC38"),
+              ["\uDC38"]);
+assertEq(/[\uDC38]/u.exec("\uD800\uDC38"),
+         null);
+assertEq(/[\uDC38]/u.exec("\uDBFF\uDC38"),
+         null);
+assertEqArray(/[\uDC38]/u.exec("\uDC00\uDC38"),
+              ["\uDC38"]);
+
+// match after non-lead char
+assertEqArray(/[\uDC38]/u.exec("\uDC38"),
+              ["\uDC38"]);
+assertEqArray(/[\uDC38]/u.exec("A\uDC38"),
+              ["\uDC38"]);
+
+// no unicode flag
+assertEqArray(/[\uDC38]/.exec("\uD7FF\uDC38"),
+              ["\uDC38"]);
+assertEqArray(/[\uDC38]/.exec("\uD800\uDC38"),
+              ["\uDC38"]);
+assertEqArray(/[\uDC38]/.exec("\uDBFF\uDC38"),
+              ["\uDC38"]);
+assertEqArray(/[\uDC38]/.exec("\uDC00\uDC38"),
+              ["\uDC38"]);
+assertEqArray(/[\uDC38]/.exec("\uDC38"),
+              ["\uDC38"]);
+assertEqArray(/[\uDC38]/.exec("A\uDC38"),
+              ["\uDC38"]);
+
+// ==== invalid trail ====
+
+assertEqArray(/[\uD83D\u3042]*/u.exec("\uD83D"),
+              ["\uD83D"]);
+assertEqArray(/[\uD83D\u3042]*/u.exec("\uD83D\u3042"),
+              ["\uD83D\u3042"]);
+assertEqArray(/[\uD83D\u3042]*/u.exec("\uD83D\u3042\u3042\uD83D"),
+              ["\uD83D\u3042\u3042\uD83D"]);
+
+assertEqArray(/[\uD83D\u{3042}]*/u.exec("\uD83D"),
+              ["\uD83D"]);
+assertEqArray(/[\uD83D\u{3042}]*/u.exec("\uD83D\u3042"),
+              ["\uD83D\u3042"]);
+assertEqArray(/[\uD83D\u{3042}]*/u.exec("\uD83D\u3042\u3042\uD83D"),
+              ["\uD83D\u3042\u3042\uD83D"]);
+
+assertEqArray(/[\uD83DA]*/u.exec("\uD83D"),
+              ["\uD83D"]);
+assertEqArray(/[\uD83DA]*/u.exec("\uD83DA"),
+              ["\uD83DA"]);
+assertEqArray(/[\uD83DA]*/u.exec("\uD83DAA\uD83D"),
+              ["\uD83DAA\uD83D"]);
+
+// ==== wrong patterns ====
+
+assertThrowsInstanceOf(() => eval(`/[\\u]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\u0]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\u00]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\u000]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\u000G]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\u0.00]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\uD83D\\u]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\uD83D\\u0]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\uD83D\\u00]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\uD83D\\u000]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\uD83D\\u000G]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\uD83D\\u0.00]/u`), SyntaxError);
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff --git a/js/src/tests/ecma_6/RegExp/unicode-class-negated.js b/js/src/tests/ecma_6/RegExp/unicode-class-negated.js
new file mode 100644
index 000000000000..0b573f6dcfc0
--- /dev/null
+++ b/js/src/tests/ecma_6/RegExp/unicode-class-negated.js
@@ -0,0 +1,64 @@
+var BUGNUMBER = 1135377;
+var summary = "Implement RegExp unicode flag -- negated CharacterClass.";
+
+print(BUGNUMBER + ": " + summary);
+
+// ==== BMP ====
+
+assertEqArray(/[^A]/u.exec("ABC"),
+              ["B"]);
+assertEqArray(/[^A]/u.exec("A\u{1F438}C"),
+              ["\u{1F438}"]);
+assertEqArray(/[^A]/u.exec("A\uD83DC"),
+              ["\uD83D"]);
+assertEqArray(/[^A]/u.exec("A\uDC38C"),
+              ["\uDC38"]);
+
+assertEqArray(/[^\uE000]/u.exec("\uE000\uE001"),
+              ["\uE001"]);
+assertEqArray(/[^\uE000]/u.exec("\uE000\u{1F438}"),
+              ["\u{1F438}"]);
+assertEqArray(/[^\uE000]/u.exec("\uE000\uD83D"),
+              ["\uD83D"]);
+assertEqArray(/[^\uE000]/u.exec("\uE000\uDC38"),
+              ["\uDC38"]);
+
+// ==== non-BMP ====
+
+assertEqArray(/[^\u{1F438}]/u.exec("\u{1F438}A"),
+              ["A"]);
+assertEqArray(/[^\u{1F438}]/u.exec("\u{1F438}\u{1F439}"),
+              ["\u{1F439}"]);
+assertEqArray(/[^\u{1F438}]/u.exec("\u{1F438}\uD83D"),
+              ["\uD83D"]);
+assertEqArray(/[^\u{1F438}]/u.exec("\u{1F438}\uDC38"),
+              ["\uDC38"]);
+
+// ==== lead-only ====
+
+assertEqArray(/[^\uD83D]/u.exec("\u{1F438}A"),
+              ["\u{1F438}"]);
+assertEqArray(/[^\uD83D]/u.exec("\uD83D\uDBFF"),
+              ["\uDBFF"]);
+assertEqArray(/[^\uD83D]/u.exec("\uD83D\uDC00"),
+              ["\uD83D\uDC00"]);
+assertEqArray(/[^\uD83D]/u.exec("\uD83D\uDFFF"),
+              ["\uD83D\uDFFF"]);
+assertEqArray(/[^\uD83D]/u.exec("\uD83D\uE000"),
+              ["\uE000"]);
+
+// ==== trail-only ====
+
+assertEqArray(/[^\uDC38]/u.exec("\u{1F438}A"),
+              ["\u{1F438}"]);
+assertEqArray(/[^\uDC38]/u.exec("\uD7FF\uDC38"),
+              ["\uD7FF"]);
+assertEqArray(/[^\uDC38]/u.exec("\uD800\uDC38"),
+              ["\uD800\uDC38"]);
+assertEqArray(/[^\uDC38]/u.exec("\uDBFF\uDC38"),
+              ["\uDBFF\uDC38"]);
+assertEqArray(/[^\uDC38]/u.exec("\uDC00\uDC38"),
+              ["\uDC00"]);
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff --git a/js/src/tests/ecma_6/RegExp/unicode-class-range.js b/js/src/tests/ecma_6/RegExp/unicode-class-range.js
new file mode 100644
index 000000000000..5bb7575601e2
--- /dev/null
+++ b/js/src/tests/ecma_6/RegExp/unicode-class-range.js
@@ -0,0 +1,28 @@
+var BUGNUMBER = 1135377;
+var summary = "Implement RegExp unicode flag -- disallow range with CharacterClassEscape.";
+
+print(BUGNUMBER + ": " + summary);
+
+assertThrowsInstanceOf(() => eval(`/[\\w-\\uFFFF]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\W-\\uFFFF]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\d-\\uFFFF]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\D-\\uFFFF]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\s-\\uFFFF]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\S-\\uFFFF]/u`), SyntaxError);
+
+assertThrowsInstanceOf(() => eval(`/[\\uFFFF-\\w]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\uFFFF-\\W]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\uFFFF-\\d]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\uFFFF-\\D]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\uFFFF-\\s]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\uFFFF-\\S]/u`), SyntaxError);
+
+assertThrowsInstanceOf(() => eval(`/[\\w-\\w]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\W-\\W]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\d-\\d]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\D-\\D]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\s-\\s]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\S-\\S]/u`), SyntaxError);
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff --git a/js/src/tests/ecma_6/RegExp/unicode-class-raw.js b/js/src/tests/ecma_6/RegExp/unicode-class-raw.js
new file mode 100644
index 000000000000..742fec2b4d34
--- /dev/null
+++ b/js/src/tests/ecma_6/RegExp/unicode-class-raw.js
@@ -0,0 +1,65 @@
+var BUGNUMBER = 1135377;
+var summary = "Implement RegExp unicode flag -- raw unicode.";
+
+print(BUGNUMBER + ": " + summary);
+
+// ==== standalone ====
+
+assertEqArray(eval(`/[\uD83D\uDC38]/u`).exec("\u{1F438}"),
+              ["\u{1F438}"]);
+
+// no unicode flag
+assertEqArray(eval(`/[\uD83D\uDC38]/`).exec("\u{1F438}"),
+              ["\uD83D"]);
+
+// escaped (lead)
+assertEq(eval(`/[\\uD83D\uDC38]/u`).exec("\u{1F438}"),
+         null);
+assertEq(eval(`/[\\u{D83D}\uDC38]/u`).exec("\u{1F438}"),
+         null);
+
+// escaped (trail)
+assertEq(eval(`/[\uD83D\\uDC38]/u`).exec("\u{1F438}"),
+         null);
+assertEq(eval(`/[\uD83D\\u{DC38}]/u`).exec("\u{1F438}"),
+         null);
+
+// escaped (lead), no unicode flag
+assertEqArray(eval(`/[\\uD83D\uDC38]/`).exec("\u{1F438}"),
+              ["\uD83D"]);
+
+// escaped (trail), no unicode flag
+assertEqArray(eval(`/[\uD83D\\uDC38]/`).exec("\u{1F438}"),
+              ["\uD83D"]);
+
+// ==== RegExp constructor ====
+
+assertEqArray(new RegExp("[\uD83D\uDC38]", "u").exec("\u{1F438}"),
+              ["\u{1F438}"]);
+
+// no unicode flag
+assertEqArray(new RegExp("[\uD83D\uDC38]", "").exec("\u{1F438}"),
+              ["\uD83D"]);
+
+// escaped(lead)
+assertEq(new RegExp("[\\uD83D\uDC38]", "u").exec("\u{1F438}"),
+         null);
+assertEq(new RegExp("[\\u{D83D}\uDC38]", "u").exec("\u{1F438}"),
+         null);
+
+// escaped(trail)
+assertEq(new RegExp("[\uD83D\\uDC38]", "u").exec("\u{1F438}"),
+         null);
+assertEq(new RegExp("[\uD83D\\u{DC38}]", "u").exec("\u{1F438}"),
+         null);
+
+// escaped(lead), no unicode flag
+assertEqArray(new RegExp("[\\uD83D\uDC38]", "").exec("\u{1F438}"),
+              ["\uD83D"]);
+
+// escaped(trail), no unicode flag
+assertEqArray(new RegExp("[\uD83D\\uDC38]", "").exec("\u{1F438}"),
+              ["\uD83D"]);
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff --git a/js/src/vm/Xdr.h b/js/src/vm/Xdr.h
index 1139e1d37f91..a4e2a2fab675 100644
--- a/js/src/vm/Xdr.h
+++ b/js/src/vm/Xdr.h
@@ -29,11 +29,11 @@ namespace js {
  *
  *  https://developer.mozilla.org/en-US/docs/SpiderMonkey/Internals/Bytecode
  */
-static const uint32_t XDR_BYTECODE_VERSION_SUBTRAHEND = 335;
+static const uint32_t XDR_BYTECODE_VERSION_SUBTRAHEND = 336;
 static const uint32_t XDR_BYTECODE_VERSION =
     uint32_t(0xb973c0de - XDR_BYTECODE_VERSION_SUBTRAHEND);
 
-static_assert(JSErr_Limit == 424,
+static_assert(JSErr_Limit == 425,
               "GREETINGS, POTENTIAL SUBTRAHEND INCREMENTER! If you added or "
               "removed MSG_DEFs from js.msg, you should increment "
               "XDR_BYTECODE_VERSION_SUBTRAHEND and update this assertion's "

From 304f09acaec8a2590382495b39aec41fb18ffab7 Mon Sep 17 00:00:00 2001
From: Tooru Fujisawa <arai_a@mac.com>
Date: Fri, 7 Aug 2015 08:11:52 +0900
Subject: [PATCH 056/101] Bug 1135377 - Part 4: Support everything Atom in
 RegExp with unicode flag. r=till, f=anba

---
 js/src/irregexp/RegExpParser.cpp              | 39 ++++++++++++
 .../tests/ecma_6/RegExp/unicode-everything.js | 59 +++++++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 js/src/tests/ecma_6/RegExp/unicode-everything.js

diff --git a/js/src/irregexp/RegExpParser.cpp b/js/src/irregexp/RegExpParser.cpp
index bbb07f1c3046..ad09996e4fbb 100644
--- a/js/src/irregexp/RegExpParser.cpp
+++ b/js/src/irregexp/RegExpParser.cpp
@@ -1178,6 +1178,41 @@ TrailSurrogateAtom(LifoAlloc* alloc, char16_t value)
     return builder->ToRegExp();
 }
 
+static inline RegExpTree*
+UnicodeEverythingAtom(LifoAlloc* alloc)
+{
+    RegExpBuilder* builder = alloc->newInfallible<RegExpBuilder>(alloc);
+
+    // everything except \x0a, \x0d, \u2028 and \u2029
+
+    CharacterRangeVector* ranges = alloc->newInfallible<CharacterRangeVector>(*alloc);
+    ranges->append(CharacterRange::Range(0x0, 0x09));
+    ranges->append(CharacterRange::Range(0x0b, 0x0c));
+    ranges->append(CharacterRange::Range(0x0e, 0x2027));
+    ranges->append(CharacterRange::Range(0x202A, unicode::LeadSurrogateMin - 1));
+    ranges->append(CharacterRange::Range(unicode::TrailSurrogateMax + 1, unicode::UTF16Max));
+    builder->AddAtom(alloc->newInfallible<RegExpCharacterClass>(ranges, false));
+
+    builder->NewAlternative();
+
+    builder->AddAtom(RangeAtom(alloc, unicode::LeadSurrogateMin, unicode::LeadSurrogateMax));
+    builder->AddAtom(NegativeLookahead(alloc, unicode::TrailSurrogateMin,
+                                       unicode::TrailSurrogateMax));
+
+    builder->NewAlternative();
+
+    builder->AddAssertion(alloc->newInfallible<RegExpAssertion>(
+        RegExpAssertion::NOT_AFTER_LEAD_SURROGATE));
+    builder->AddAtom(RangeAtom(alloc, unicode::TrailSurrogateMin, unicode::TrailSurrogateMax));
+
+    builder->NewAlternative();
+
+    builder->AddAtom(RangeAtom(alloc, unicode::LeadSurrogateMin, unicode::LeadSurrogateMax));
+    builder->AddAtom(RangeAtom(alloc, unicode::TrailSurrogateMin, unicode::TrailSurrogateMax));
+
+    return builder->ToRegExp();
+}
+
 // Disjunction ::
 //   Alternative
 //   Alternative | Disjunction
@@ -1275,6 +1310,10 @@ RegExpParser<CharT>::ParseDisjunction()
           case '.': {
             Advance();
             // everything except \x0a, \x0d, \u2028 and \u2029
+            if (unicode_) {
+                builder->AddAtom(UnicodeEverythingAtom(alloc));
+                break;
+            }
             CharacterRangeVector* ranges = alloc->newInfallible<CharacterRangeVector>(*alloc);
             CharacterRange::AddClassEscape(alloc, '.', ranges);
             RegExpTree* atom = alloc->newInfallible<RegExpCharacterClass>(ranges, false);
diff --git a/js/src/tests/ecma_6/RegExp/unicode-everything.js b/js/src/tests/ecma_6/RegExp/unicode-everything.js
new file mode 100644
index 000000000000..a18ac2867a73
--- /dev/null
+++ b/js/src/tests/ecma_6/RegExp/unicode-everything.js
@@ -0,0 +1,59 @@
+var BUGNUMBER = 1135377;
+var summary = "Implement RegExp unicode flag -- everything Atom.";
+
+print(BUGNUMBER + ": " + summary);
+
+// ==== standalone ====
+
+assertEqArray(/./u.exec("ABC"),
+              ["A"]);
+assertEqArray(/./u.exec("\u{1F438}BC"),
+              ["\u{1F438}"]);
+
+assertEqArray(/./u.exec("\uD83D\uDBFF"),
+              ["\uD83D"]);
+assertEqArray(/./u.exec("\uD83D\uDC00"),
+              ["\uD83D\uDC00"]);
+assertEqArray(/./u.exec("\uD83D\uDFFF"),
+              ["\uD83D\uDFFF"]);
+assertEqArray(/./u.exec("\uD83D\uE000"),
+              ["\uD83D"]);
+assertEqArray(/./u.exec("\uD83D"),
+              ["\uD83D"]);
+assertEqArray(/./u.exec("\uD83DA"),
+              ["\uD83D"]);
+
+assertEqArray(/./u.exec("\uD7FF\uDC38"),
+              ["\uD7FF"]);
+assertEqArray(/./u.exec("\uD800\uDC38"),
+              ["\uD800\uDC38"]);
+assertEqArray(/./u.exec("\uDBFF\uDC38"),
+              ["\uDBFF\uDC38"]);
+assertEqArray(/./u.exec("\uDC00\uDC38"),
+              ["\uDC00"]);
+assertEqArray(/./u.exec("\uDC38"),
+              ["\uDC38"]);
+assertEqArray(/./u.exec("A\uDC38"),
+              ["A"]);
+
+assertEqArray(/.A/u.exec("\uD7FF\uDC38A"),
+              ["\uDC38A"]);
+assertEqArray(/.A/u.exec("\uD800\uDC38A"),
+              ["\uD800\uDC38A"]);
+assertEqArray(/.A/u.exec("\uDBFF\uDC38A"),
+              ["\uDBFF\uDC38A"]);
+assertEqArray(/.A/u.exec("\uDC00\uDC38A"),
+              ["\uDC38A"]);
+
+// ==== leading multiple ====
+
+assertEqArray(/.*A/u.exec("\u{1F438}\u{1F438}\u{1F438}A"),
+              ["\u{1F438}\u{1F438}\u{1F438}A"]);
+
+// ==== trailing multiple ====
+
+assertEqArray(/A.*/u.exec("A\u{1F438}\u{1F438}\u{1F438}"),
+              ["A\u{1F438}\u{1F438}\u{1F438}"]);
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);

From 3a8b5be74be21368feb54e1d9650968146d34b0a Mon Sep 17 00:00:00 2001
From: Tooru Fujisawa <arai_a@mac.com>
Date: Fri, 7 Aug 2015 08:11:56 +0900
Subject: [PATCH 057/101] Bug 1135377 - Part 5: Support CharacterClassEscape in
 RegExp with unicode flag. r=till, f=anba

---
 js/src/irregexp/RegExpEngine.cpp              | 40 +++++++++-
 js/src/irregexp/RegExpEngine.h                |  2 +
 js/src/irregexp/RegExpParser.cpp              | 42 ++++++++++-
 .../RegExp/unicode-character-class-escape.js  | 75 +++++++++++++++++++
 4 files changed, 154 insertions(+), 5 deletions(-)
 create mode 100644 js/src/tests/ecma_6/RegExp/unicode-character-class-escape.js

diff --git a/js/src/irregexp/RegExpEngine.cpp b/js/src/irregexp/RegExpEngine.cpp
index 6f06692937fc..cb921a02b447 100644
--- a/js/src/irregexp/RegExpEngine.cpp
+++ b/js/src/irregexp/RegExpEngine.cpp
@@ -72,12 +72,30 @@ static const int kSpaceRanges[] = { '\t', '\r' + 1, ' ', ' ' + 1,
     0xFEFF, 0xFF00, 0x10000 };
 static const int kSpaceRangeCount = ArrayLength(kSpaceRanges);
 
+static const int kSpaceAndSurrogateRanges[] = { '\t', '\r' + 1, ' ', ' ' + 1,
+    0x00A0, 0x00A1, 0x1680, 0x1681, 0x180E, 0x180F, 0x2000, 0x200B,
+    0x2028, 0x202A, 0x202F, 0x2030, 0x205F, 0x2060, 0x3000, 0x3001,
+    unicode::LeadSurrogateMin, unicode::TrailSurrogateMax + 1,
+    0xFEFF, 0xFF00, 0x10000 };
+static const int kSpaceAndSurrogateRangeCount = ArrayLength(kSpaceAndSurrogateRanges);
 static const int kWordRanges[] = {
     '0', '9' + 1, 'A', 'Z' + 1, '_', '_' + 1, 'a', 'z' + 1, 0x10000 };
 static const int kWordRangeCount = ArrayLength(kWordRanges);
+static const int kWordAndSurrogateRanges[] = {
+    '0', '9' + 1, 'A', 'Z' + 1, '_', '_' + 1, 'a', 'z' + 1,
+    unicode::LeadSurrogateMin, unicode::TrailSurrogateMax + 1,
+    0x10000 };
+static const int kWordAndSurrogateRangeCount = ArrayLength(kWordAndSurrogateRanges);
 static const int kDigitRanges[] = { '0', '9' + 1, 0x10000 };
 static const int kDigitRangeCount = ArrayLength(kDigitRanges);
-static const int kSurrogateRanges[] = { 0xd800, 0xe000, 0x10000 };
+static const int kDigitAndSurrogateRanges[] = {
+    '0', '9' + 1,
+    unicode::LeadSurrogateMin, unicode::TrailSurrogateMax + 1,
+    0x10000 };
+static const int kDigitAndSurrogateRangeCount = ArrayLength(kDigitAndSurrogateRanges);
+static const int kSurrogateRanges[] = {
+    unicode::LeadSurrogateMin, unicode::TrailSurrogateMax + 1,
+    0x10000 };
 static const int kSurrogateRangeCount = ArrayLength(kSurrogateRanges);
 static const int kLineTerminatorRanges[] = { 0x000A, 0x000B, 0x000D, 0x000E,
     0x2028, 0x202A, 0x10000 };
@@ -164,6 +182,26 @@ CharacterRange::AddClassEscape(LifoAlloc* alloc, char16_t type,
     }
 }
 
+// Add class escape, excluding surrogate pair range.
+void
+CharacterRange::AddClassEscapeUnicode(LifoAlloc* alloc, char16_t type,
+                                      CharacterRangeVector* ranges)
+{
+    switch (type) {
+      case 'S':
+        AddClassNegated(kSpaceAndSurrogateRanges, kSpaceAndSurrogateRangeCount, ranges);
+        break;
+      case 'W':
+        AddClassNegated(kWordAndSurrogateRanges, kWordAndSurrogateRangeCount, ranges);
+        break;
+      case 'D':
+        AddClassNegated(kDigitAndSurrogateRanges, kDigitAndSurrogateRangeCount, ranges);
+        break;
+      default:
+        MOZ_CRASH("Bad type!");
+    }
+}
+
 // We need to check for the following characters: 0x39c 0x3bc 0x178.
 static inline bool
 RangeContainsLatin1Equivalents(CharacterRange range)
diff --git a/js/src/irregexp/RegExpEngine.h b/js/src/irregexp/RegExpEngine.h
index bf57660866e6..8b8821eaa414 100644
--- a/js/src/irregexp/RegExpEngine.h
+++ b/js/src/irregexp/RegExpEngine.h
@@ -144,6 +144,8 @@ class CharacterRange
     {}
 
     static void AddClassEscape(LifoAlloc* alloc, char16_t type, CharacterRangeVector* ranges);
+    static void AddClassEscapeUnicode(LifoAlloc* alloc, char16_t type,
+                                      CharacterRangeVector* ranges);
 
     static inline CharacterRange Singleton(char16_t value) {
         return CharacterRange(value, value);
diff --git a/js/src/irregexp/RegExpParser.cpp b/js/src/irregexp/RegExpParser.cpp
index ad09996e4fbb..976a87d8d0f6 100644
--- a/js/src/irregexp/RegExpParser.cpp
+++ b/js/src/irregexp/RegExpParser.cpp
@@ -611,9 +611,23 @@ AddCharOrEscapeUnicode(LifoAlloc* alloc,
                        char16_t char_class,
                        widechar c)
 {
-    if (char_class != kNoCharClass)
-        CharacterRange::AddClassEscape(alloc, char_class, ranges);
-    else if (unicode::IsLeadSurrogate(c))
+    if (char_class != kNoCharClass) {
+        CharacterRange::AddClassEscapeUnicode(alloc, char_class, ranges);
+        switch (char_class) {
+          case 'S':
+          case 'W':
+          case 'D':
+            lead_ranges->append(LeadSurrogateRange());
+            trail_ranges->append(TrailSurrogateRange());
+            wide_ranges->append(NonBMPRange());
+            break;
+          case '.':
+            MOZ_CRASH("Bad char_class!");
+        }
+        return;
+    }
+
+    if (unicode::IsLeadSurrogate(c))
         lead_ranges->append(CharacterRange::Singleton(c));
     else if (unicode::IsTrailSurrogate(c))
         trail_ranges->append(CharacterRange::Singleton(c));
@@ -1213,6 +1227,18 @@ UnicodeEverythingAtom(LifoAlloc* alloc)
     return builder->ToRegExp();
 }
 
+RegExpTree*
+UnicodeCharacterClassEscapeAtom(LifoAlloc* alloc, char16_t char_class)
+{
+    CharacterRangeVector* ranges = alloc->newInfallible<CharacterRangeVector>(*alloc);
+    CharacterRangeVector* lead_ranges = alloc->newInfallible<CharacterRangeVector>(*alloc);
+    CharacterRangeVector* trail_ranges = alloc->newInfallible<CharacterRangeVector>(*alloc);
+    WideCharRangeVector* wide_ranges = alloc->newInfallible<WideCharRangeVector>(*alloc);
+    AddCharOrEscapeUnicode(alloc, ranges, lead_ranges, trail_ranges, wide_ranges, char_class, 0);
+
+    return UnicodeRangesAtom(alloc, ranges, lead_ranges, trail_ranges, wide_ranges, false);
+}
+
 // Disjunction ::
 //   Alternative
 //   Alternative | Disjunction
@@ -1377,7 +1403,15 @@ RegExpParser<CharT>::ParseDisjunction()
                 //
                 // CharacterClassEscape :: one of
                 //   d D s S w W
-              case 'd': case 'D': case 's': case 'S': case 'w': case 'W': {
+              case 'D': case 'S': case 'W':
+                if (unicode_) {
+                    Advance();
+                    builder->AddAtom(UnicodeCharacterClassEscapeAtom(alloc, current()));
+                    Advance();
+                    break;
+                }
+                // Fall through
+              case 'd': case 's': case 'w': {
                 widechar c = Next();
                 Advance(2);
                 CharacterRangeVector* ranges =
diff --git a/js/src/tests/ecma_6/RegExp/unicode-character-class-escape.js b/js/src/tests/ecma_6/RegExp/unicode-character-class-escape.js
new file mode 100644
index 000000000000..175207d5ae95
--- /dev/null
+++ b/js/src/tests/ecma_6/RegExp/unicode-character-class-escape.js
@@ -0,0 +1,75 @@
+var BUGNUMBER = 1135377;
+var summary = "Implement RegExp unicode flag -- CharacterClassEscape.";
+
+print(BUGNUMBER + ": " + summary);
+
+// BMP
+
+assertEqArray(/\d+/u.exec("abcxyzABCXYZ0123456789_\t\r\n\v\x0c\xa0\uFEFF*"),
+              ["0123456789"]);
+assertEqArray(/\D+/u.exec("abcxyzABCXYZ0123456789_\t\r\n\v\x0c\xa0\uFEFF*"),
+              ["abcxyzABCXYZ"]);
+
+assertEqArray(/\s+/u.exec("abcxyzABCXYZ0123456789_\t\r\n\v\x0c\xa0\uFEFF*"),
+              ["\t\r\n\v\x0c\xa0\uFEFF"]);
+assertEqArray(/\S+/u.exec("abcxyzABCXYZ0123456789_\t\r\n\v\x0c\xa0\uFEFF*"),
+              ["abcxyzABCXYZ0123456789_"]);
+
+assertEqArray(/\w+/u.exec("abcxyzABCXYZ0123456789_\t\r\n\v\x0c\xa0\uFEFF*"),
+              ["abcxyzABCXYZ0123456789_"]);
+assertEqArray(/\W+/u.exec("abcxyzABCXYZ0123456789_\t\r\n\v\x0c\xa0\uFEFF*"),
+              ["\t\r\n\v\x0c\xa0\uFEFF*"]);
+
+assertEqArray(/\n+/u.exec("abcxyzABCXYZ0123456789_\t\r\n\v\x0c\xa0\uFEFF*"),
+              ["\n"]);
+
+assertEqArray(/[\d]+/u.exec("abcxyzABCXYZ0123456789_\t\r\n\v\x0c\xa0\uFEFF*"),
+              ["0123456789"]);
+assertEqArray(/[\D]+/u.exec("abcxyzABCXYZ0123456789_\t\r\n\v\x0c\xa0\uFEFF*"),
+              ["abcxyzABCXYZ"]);
+
+assertEqArray(/[\s]+/u.exec("abcxyzABCXYZ0123456789_\t\r\n\v\x0c\xa0\uFEFF*"),
+              ["\t\r\n\v\x0c\xa0\uFEFF"]);
+assertEqArray(/[\S]+/u.exec("abcxyzABCXYZ0123456789_\t\r\n\v\x0c\xa0\uFEFF*"),
+              ["abcxyzABCXYZ0123456789_"]);
+
+assertEqArray(/[\w]+/u.exec("abcxyzABCXYZ0123456789_\t\r\n\v\x0c\xa0\uFEFF*"),
+              ["abcxyzABCXYZ0123456789_"]);
+assertEqArray(/[\W]+/u.exec("abcxyzABCXYZ0123456789_\t\r\n\v\x0c\xa0\uFEFF*"),
+              ["\t\r\n\v\x0c\xa0\uFEFF*"]);
+
+assertEqArray(/[\n]+/u.exec("abcxyzABCXYZ0123456789_\t\r\n\v\x0c\xa0\uFEFF*"),
+              ["\n"]);
+
+// non-BMP
+
+function testNonBMP(re) {
+  assertEqArray(re.exec("\uD83D\uDBFF"),
+                ["\uD83D"]);
+  assertEqArray(re.exec("\uD83D\uDC00"),
+                ["\uD83D\uDC00"]);
+  assertEqArray(re.exec("\uD83D\uDFFF"),
+                ["\uD83D\uDFFF"]);
+  assertEqArray(re.exec("\uD83D\uE000"),
+                ["\uD83D"]);
+
+  assertEqArray(re.exec("\uD7FF\uDC38"),
+                ["\uD7FF"]);
+  assertEqArray(re.exec("\uD800\uDC38"),
+                ["\uD800\uDC38"]);
+  assertEqArray(re.exec("\uDBFF\uDC38"),
+                ["\uDBFF\uDC38"]);
+  assertEqArray(re.exec("\uDC00\uDC38"),
+                ["\uDC00"]);
+}
+
+testNonBMP(/\D/u);
+testNonBMP(/\S/u);
+testNonBMP(/\W/u);
+
+testNonBMP(/[\D]/u);
+testNonBMP(/[\S]/u);
+testNonBMP(/[\W]/u);
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);

From a5028a36935ec6a6c0b985524b78cd4fc5827fc3 Mon Sep 17 00:00:00 2001
From: Tooru Fujisawa <arai_a@mac.com>
Date: Fri, 7 Aug 2015 08:12:01 +0900
Subject: [PATCH 058/101] Bug 1135377 - Part 6: Support ignoreCase for BMP in
 RegExp with unicode flag. r=till, f=anba

---
 .../irregexp/NativeRegExpMacroAssembler.cpp   |   14 +-
 js/src/irregexp/NativeRegExpMacroAssembler.h  |    2 +-
 js/src/irregexp/RegExpBytecode.h              |    3 +-
 js/src/irregexp/RegExpEngine.cpp              |  191 +-
 js/src/irregexp/RegExpEngine.h                |   27 +-
 js/src/irregexp/RegExpInterpreter.cpp         |   21 +
 js/src/irregexp/RegExpMacroAssembler.cpp      |   41 +-
 js/src/irregexp/RegExpMacroAssembler.h        |   10 +-
 js/src/irregexp/RegExpParser.cpp              |   38 +-
 js/src/irregexp/RegExpParser.h                |    6 +-
 .../ecma_6/RegExp/unicode-ignoreCase-ascii.js |   45 +
 .../RegExp/unicode-ignoreCase-escape.js       |   39 +
 .../RegExp/unicode-ignoreCase-negated.js      |   19 +
 .../tests/ecma_6/RegExp/unicode-ignoreCase.js | 2245 +++++++++++++++++
 js/src/vm/CaseFolding.txt                     | 1414 +++++++++++
 js/src/vm/RegExpObject.cpp                    |    4 +-
 js/src/vm/Unicode.cpp                         |  435 ++++
 js/src/vm/Unicode.h                           |   49 +
 js/src/vm/make_unicode.py                     |  148 +-
 19 files changed, 4655 insertions(+), 96 deletions(-)
 create mode 100644 js/src/tests/ecma_6/RegExp/unicode-ignoreCase-ascii.js
 create mode 100644 js/src/tests/ecma_6/RegExp/unicode-ignoreCase-escape.js
 create mode 100644 js/src/tests/ecma_6/RegExp/unicode-ignoreCase-negated.js
 create mode 100644 js/src/tests/ecma_6/RegExp/unicode-ignoreCase.js
 create mode 100644 js/src/vm/CaseFolding.txt

diff --git a/js/src/irregexp/NativeRegExpMacroAssembler.cpp b/js/src/irregexp/NativeRegExpMacroAssembler.cpp
index a699f5bf11b5..d0b47f7fb820 100644
--- a/js/src/irregexp/NativeRegExpMacroAssembler.cpp
+++ b/js/src/irregexp/NativeRegExpMacroAssembler.cpp
@@ -719,9 +719,10 @@ NativeRegExpMacroAssembler::CheckNotBackReference(int start_reg, Label* on_no_ma
 }
 
 void
-NativeRegExpMacroAssembler::CheckNotBackReferenceIgnoreCase(int start_reg, Label* on_no_match)
+NativeRegExpMacroAssembler::CheckNotBackReferenceIgnoreCase(int start_reg, Label* on_no_match,
+                                                            bool unicode)
 {
-    JitSpew(SPEW_PREFIX "CheckNotBackReferenceIgnoreCase(%d)", start_reg);
+    JitSpew(SPEW_PREFIX "CheckNotBackReferenceIgnoreCase(%d, %d)", start_reg, unicode);
 
     Label fallthrough;
 
@@ -833,8 +834,13 @@ NativeRegExpMacroAssembler::CheckNotBackReferenceIgnoreCase(int start_reg, Label
         masm.passABIArg(current_character);
         masm.passABIArg(current_position);
         masm.passABIArg(temp1);
-        int (*fun)(const char16_t*, const char16_t*, size_t) = CaseInsensitiveCompareStrings;
-        masm.callWithABI(JS_FUNC_TO_DATA_PTR(void*, fun));
+        if (!unicode) {
+            int (*fun)(const char16_t*, const char16_t*, size_t) = CaseInsensitiveCompareStrings;
+            masm.callWithABI(JS_FUNC_TO_DATA_PTR(void*, fun));
+        } else {
+            int (*fun)(const char16_t*, const char16_t*, size_t) = CaseInsensitiveCompareUCStrings;
+            masm.callWithABI(JS_FUNC_TO_DATA_PTR(void*, fun));
+        }
         masm.storeCallResult(temp0);
 
         masm.PopRegsInMask(volatileRegs);
diff --git a/js/src/irregexp/NativeRegExpMacroAssembler.h b/js/src/irregexp/NativeRegExpMacroAssembler.h
index 996e4e6d2d9d..4b2674c4c4c2 100644
--- a/js/src/irregexp/NativeRegExpMacroAssembler.h
+++ b/js/src/irregexp/NativeRegExpMacroAssembler.h
@@ -104,7 +104,7 @@ class MOZ_STACK_CLASS NativeRegExpMacroAssembler : public RegExpMacroAssembler
     void CheckGreedyLoop(jit::Label* on_tos_equals_current_position);
     void CheckNotAtStart(jit::Label* on_not_at_start);
     void CheckNotBackReference(int start_reg, jit::Label* on_no_match);
-    void CheckNotBackReferenceIgnoreCase(int start_reg, jit::Label* on_no_match);
+    void CheckNotBackReferenceIgnoreCase(int start_reg, jit::Label* on_no_match, bool unicode);
     void CheckNotCharacter(unsigned c, jit::Label* on_not_equal);
     void CheckNotCharacterAfterAnd(unsigned c, unsigned and_with, jit::Label* on_not_equal);
     void CheckNotCharacterAfterMinusAnd(char16_t c, char16_t minus, char16_t and_with,
diff --git a/js/src/irregexp/RegExpBytecode.h b/js/src/irregexp/RegExpBytecode.h
index da035c7b52d9..f31b78c59346 100644
--- a/js/src/irregexp/RegExpBytecode.h
+++ b/js/src/irregexp/RegExpBytecode.h
@@ -90,7 +90,8 @@ V(CHECK_AT_START,    43, 8)   /* bc8 pad24 addr32                           */ \
 V(CHECK_NOT_AT_START, 44, 8)  /* bc8 pad24 addr32                           */ \
 V(CHECK_GREEDY,      45, 8)   /* bc8 pad24 addr32                           */ \
 V(ADVANCE_CP_AND_GOTO, 46, 8) /* bc8 offset24 addr32                        */ \
-V(SET_CURRENT_POSITION_FROM_END, 47, 4) /* bc8 idx24                        */
+V(SET_CURRENT_POSITION_FROM_END, 47, 4) /* bc8 idx24                        */ \
+V(CHECK_NOT_BACK_REF_NO_CASE_UNICODE, 48, 8) /* bc8 reg_idx24 addr32        */
 
 #define DECLARE_BYTECODES(name, code, length) \
   static const int BC_##name = code;
diff --git a/js/src/irregexp/RegExpEngine.cpp b/js/src/irregexp/RegExpEngine.cpp
index cb921a02b447..ebbafd952952 100644
--- a/js/src/irregexp/RegExpEngine.cpp
+++ b/js/src/irregexp/RegExpEngine.cpp
@@ -81,11 +81,26 @@ static const int kSpaceAndSurrogateRangeCount = ArrayLength(kSpaceAndSurrogateRa
 static const int kWordRanges[] = {
     '0', '9' + 1, 'A', 'Z' + 1, '_', '_' + 1, 'a', 'z' + 1, 0x10000 };
 static const int kWordRangeCount = ArrayLength(kWordRanges);
+static const int kIgnoreCaseWordRanges[] = {
+    '0', '9' + 1, 'A', 'Z' + 1, '_', '_' + 1, 'a', 'z' + 1,
+    0x017F, 0x017F + 1, 0x212A, 0x212A + 1,
+    0x10000 };
+static const int kIgnoreCaseWordCount = ArrayLength(kIgnoreCaseWordRanges);
 static const int kWordAndSurrogateRanges[] = {
     '0', '9' + 1, 'A', 'Z' + 1, '_', '_' + 1, 'a', 'z' + 1,
     unicode::LeadSurrogateMin, unicode::TrailSurrogateMax + 1,
     0x10000 };
 static const int kWordAndSurrogateRangeCount = ArrayLength(kWordAndSurrogateRanges);
+static const int kNegatedIgnoreCaseWordAndSurrogateRanges[] = {
+    0, '0', '9' + 1, 'A',
+    'K', 'K' + 1, 'S', 'S' + 1,
+    'Z' + 1, '_', '_' + 1, 'a',
+    'k', 'k' + 1, 's', 's' + 1,
+    'z' + 1, unicode::LeadSurrogateMin,
+    unicode::TrailSurrogateMax + 1, 0x10000,
+    0x10000 };
+static const int kNegatedIgnoreCaseWordAndSurrogateRangeCount =
+    ArrayLength(kNegatedIgnoreCaseWordAndSurrogateRanges);
 static const int kDigitRanges[] = { '0', '9' + 1, 0x10000 };
 static const int kDigitRangeCount = ArrayLength(kDigitRanges);
 static const int kDigitAndSurrogateRanges[] = {
@@ -185,14 +200,29 @@ CharacterRange::AddClassEscape(LifoAlloc* alloc, char16_t type,
 // Add class escape, excluding surrogate pair range.
 void
 CharacterRange::AddClassEscapeUnicode(LifoAlloc* alloc, char16_t type,
-                                      CharacterRangeVector* ranges)
+                                      CharacterRangeVector* ranges, bool ignore_case)
 {
     switch (type) {
+      case 's':
+      case 'd':
+        return AddClassEscape(alloc, type, ranges);
+        break;
       case 'S':
         AddClassNegated(kSpaceAndSurrogateRanges, kSpaceAndSurrogateRangeCount, ranges);
         break;
+      case 'w':
+        if (ignore_case)
+            AddClass(kIgnoreCaseWordRanges, kIgnoreCaseWordCount, ranges);
+        else
+            AddClassEscape(alloc, type, ranges);
+        break;
       case 'W':
-        AddClassNegated(kWordAndSurrogateRanges, kWordAndSurrogateRangeCount, ranges);
+        if (ignore_case) {
+            AddClass(kNegatedIgnoreCaseWordAndSurrogateRanges,
+                     kNegatedIgnoreCaseWordAndSurrogateRangeCount, ranges);
+        } else {
+            AddClassNegated(kWordAndSurrogateRanges, kWordAndSurrogateRangeCount, ranges);
+        }
         break;
       case 'D':
         AddClassNegated(kDigitAndSurrogateRanges, kDigitAndSurrogateRangeCount, ranges);
@@ -202,20 +232,39 @@ CharacterRange::AddClassEscapeUnicode(LifoAlloc* alloc, char16_t type,
     }
 }
 
+#define FOR_EACH_NON_ASCII_TO_ASCII_FOLDING(macro)      \
+    /* LATIN CAPITAL LETTER Y WITH DIAERESIS */         \
+    macro(0x0178, 0x00FF)                               \
+    /* LATIN SMALL LETTER LONG S */                     \
+    macro(0x017F, 0x0073)                               \
+    /* LATIN CAPITAL LETTER SHARP S */                  \
+    macro(0x1E9E, 0x00DF)                               \
+    /* KELVIN SIGN */                                   \
+    macro(0x212A, 0x006B)                               \
+    /* ANGSTROM SIGN */                                 \
+    macro(0x212B, 0x00E5)
+
 // We need to check for the following characters: 0x39c 0x3bc 0x178.
 static inline bool
-RangeContainsLatin1Equivalents(CharacterRange range)
+RangeContainsLatin1Equivalents(CharacterRange range, bool unicode)
 {
-    // TODO(dcarney): this could be a lot more efficient.
+    /* TODO(dcarney): this could be a lot more efficient. */
+    if (unicode) {
+#define CHECK_RANGE(C, F) \
+        if (range.Contains(C)) return true;
+FOR_EACH_NON_ASCII_TO_ASCII_FOLDING(CHECK_RANGE)
+#undef CHECK_RANGE
+    }
+
     return range.Contains(0x39c) || range.Contains(0x3bc) || range.Contains(0x178);
 }
 
 static bool
-RangesContainLatin1Equivalents(const CharacterRangeVector& ranges)
+RangesContainLatin1Equivalents(const CharacterRangeVector& ranges, bool unicode)
 {
     for (size_t i = 0; i < ranges.length(); i++) {
         // TODO(dcarney): this could be a lot more efficient.
-        if (RangeContainsLatin1Equivalents(ranges[i]))
+        if (RangeContainsLatin1Equivalents(ranges[i], unicode))
             return true;
     }
     return false;
@@ -228,27 +277,24 @@ static const size_t kEcma262UnCanonicalizeMaxWidth = 4;
 static int
 GetCaseIndependentLetters(char16_t character,
                           bool ascii_subject,
+                          bool unicode,
+                          const char16_t* choices,
+                          size_t choices_length,
                           char16_t* letters)
 {
-    const char16_t choices[] = {
-        character,
-        unicode::ToLowerCase(character),
-        unicode::ToUpperCase(character)
-    };
-
     size_t count = 0;
-    for (size_t i = 0; i < ArrayLength(choices); i++) {
+    for (size_t i = 0; i < choices_length; i++) {
         char16_t c = choices[i];
 
         // The standard requires that non-ASCII characters cannot have ASCII
         // character codes in their equivalence class, even though this
         // situation occurs multiple times in the unicode tables.
         static const unsigned kMaxAsciiCharCode = 127;
-        if (character > kMaxAsciiCharCode && c <= kMaxAsciiCharCode)
+        if (!unicode && character > kMaxAsciiCharCode && c <= kMaxAsciiCharCode)
             continue;
 
         // Skip characters that can't appear in one byte strings.
-        if (ascii_subject && c > kMaxOneByteCharCode)
+        if (!unicode && ascii_subject && c > kMaxOneByteCharCode)
             continue;
 
         // Watch for duplicates.
@@ -268,10 +314,45 @@ GetCaseIndependentLetters(char16_t character,
     return count;
 }
 
+static int
+GetCaseIndependentLetters(char16_t character,
+                          bool ascii_subject,
+                          bool unicode,
+                          char16_t* letters)
+{
+    if (unicode) {
+        const char16_t choices[] = {
+            character,
+            unicode::FoldCase(character),
+            unicode::ReverseFoldCase1(character),
+            unicode::ReverseFoldCase2(character),
+            unicode::ReverseFoldCase3(character),
+        };
+        return GetCaseIndependentLetters(character, ascii_subject, unicode,
+                                         choices, ArrayLength(choices), letters);
+    }
+
+    const char16_t choices[] = {
+        character,
+        unicode::ToLowerCase(character),
+        unicode::ToUpperCase(character)
+    };
+    return GetCaseIndependentLetters(character, ascii_subject, unicode,
+                                     choices, ArrayLength(choices), letters);
+}
+
 static char16_t
-ConvertNonLatin1ToLatin1(char16_t c)
+ConvertNonLatin1ToLatin1(char16_t c, bool unicode)
 {
     MOZ_ASSERT(c > kMaxOneByteCharCode);
+    if (unicode) {
+        switch (c) {
+#define CONVERT(C, F) case C: return F;
+FOR_EACH_NON_ASCII_TO_ASCII_FOLDING(CONVERT)
+#undef CONVERT
+        }
+    }
+
     switch (c) {
       // This are equivalent characters in unicode.
       case 0x39c:
@@ -286,12 +367,12 @@ ConvertNonLatin1ToLatin1(char16_t c)
 }
 
 void
-CharacterRange::AddCaseEquivalents(bool is_ascii, CharacterRangeVector* ranges)
+CharacterRange::AddCaseEquivalents(bool is_ascii, bool unicode, CharacterRangeVector* ranges)
 {
     char16_t bottom = from();
     char16_t top = to();
 
-    if (is_ascii && !RangeContainsLatin1Equivalents(*this)) {
+    if (is_ascii && !RangeContainsLatin1Equivalents(*this, unicode)) {
         if (bottom > kMaxOneByteCharCode)
             return;
         if (top > kMaxOneByteCharCode)
@@ -300,7 +381,7 @@ CharacterRange::AddCaseEquivalents(bool is_ascii, CharacterRangeVector* ranges)
 
     for (char16_t c = bottom;; c++) {
         char16_t chars[kEcma262UnCanonicalizeMaxWidth];
-        size_t length = GetCaseIndependentLetters(c, is_ascii, chars);
+        size_t length = GetCaseIndependentLetters(c, is_ascii, unicode, chars);
 
         for (size_t i = 0; i < length; i++) {
             char16_t other = chars[i];
@@ -580,7 +661,7 @@ SeqRegExpNode::FillInBMInfo(int offset,
 }
 
 RegExpNode*
-SeqRegExpNode::FilterASCII(int depth, bool ignore_case)
+SeqRegExpNode::FilterASCII(int depth, bool ignore_case, bool unicode)
 {
     if (info()->replacement_calculated)
         return replacement();
@@ -590,13 +671,13 @@ SeqRegExpNode::FilterASCII(int depth, bool ignore_case)
 
     MOZ_ASSERT(!info()->visited);
     VisitMarker marker(info());
-    return FilterSuccessor(depth - 1, ignore_case);
+    return FilterSuccessor(depth - 1, ignore_case, unicode);
 }
 
 RegExpNode*
-SeqRegExpNode::FilterSuccessor(int depth, bool ignore_case)
+SeqRegExpNode::FilterSuccessor(int depth, bool ignore_case, bool unicode)
 {
-    RegExpNode* next = on_success_->FilterASCII(depth - 1, ignore_case);
+    RegExpNode* next = on_success_->FilterASCII(depth - 1, ignore_case, unicode);
     if (next == nullptr)
         return set_replacement(nullptr);
 
@@ -739,7 +820,7 @@ TextNode::GreedyLoopTextLength()
 }
 
 RegExpNode*
-TextNode::FilterASCII(int depth, bool ignore_case)
+TextNode::FilterASCII(int depth, bool ignore_case, bool unicode)
 {
     if (info()->replacement_calculated)
         return replacement();
@@ -763,7 +844,7 @@ TextNode::FilterASCII(int depth, bool ignore_case)
 
                 // Here, we need to check for characters whose upper and lower cases
                 // are outside the Latin-1 range.
-                char16_t converted = ConvertNonLatin1ToLatin1(c);
+                char16_t converted = ConvertNonLatin1ToLatin1(c, unicode);
                 if (converted == 0) {
                     // Character is outside Latin-1 completely
                     return set_replacement(nullptr);
@@ -788,7 +869,7 @@ TextNode::FilterASCII(int depth, bool ignore_case)
                     ranges[0].to() >= kMaxOneByteCharCode)
                 {
                     // This will be handled in a later filter.
-                    if (ignore_case && RangesContainLatin1Equivalents(ranges))
+                    if (ignore_case && RangesContainLatin1Equivalents(ranges, unicode))
                         continue;
                     return set_replacement(nullptr);
                 }
@@ -797,14 +878,14 @@ TextNode::FilterASCII(int depth, bool ignore_case)
                     ranges[0].from() > kMaxOneByteCharCode)
                 {
                     // This will be handled in a later filter.
-                    if (ignore_case && RangesContainLatin1Equivalents(ranges))
+                    if (ignore_case && RangesContainLatin1Equivalents(ranges, unicode))
                         continue;
                     return set_replacement(nullptr);
                 }
             }
         }
     }
-    return FilterSuccessor(depth - 1, ignore_case);
+    return FilterSuccessor(depth - 1, ignore_case, unicode);
 }
 
 void
@@ -822,7 +903,7 @@ TextNode::CalculateOffsets()
     }
 }
 
-void TextNode::MakeCaseIndependent(bool is_ascii)
+void TextNode::MakeCaseIndependent(bool is_ascii, bool unicode)
 {
     int element_count = elements().length();
     for (int i = 0; i < element_count; i++) {
@@ -838,7 +919,7 @@ void TextNode::MakeCaseIndependent(bool is_ascii)
             CharacterRangeVector& ranges = cc->ranges(alloc());
             int range_count = ranges.length();
             for (int j = 0; j < range_count; j++)
-                ranges[j].AddCaseEquivalents(is_ascii, &ranges);
+                ranges[j].AddCaseEquivalents(is_ascii, unicode, &ranges);
         }
     }
 }
@@ -987,7 +1068,7 @@ ChoiceNode::FillInBMInfo(int offset,
 }
 
 RegExpNode*
-ChoiceNode::FilterASCII(int depth, bool ignore_case)
+ChoiceNode::FilterASCII(int depth, bool ignore_case, bool unicode)
 {
     if (info()->replacement_calculated)
         return replacement();
@@ -1011,7 +1092,7 @@ ChoiceNode::FilterASCII(int depth, bool ignore_case)
     for (int i = 0; i < choice_count; i++) {
         GuardedAlternative alternative = alternatives()[i];
         RegExpNode* replacement =
-            alternative.node()->FilterASCII(depth - 1, ignore_case);
+            alternative.node()->FilterASCII(depth - 1, ignore_case, unicode);
         MOZ_ASSERT(replacement != this);  // No missing EMPTY_MATCH_CHECK.
         if (replacement != nullptr) {
             alternatives()[i].set_node(replacement);
@@ -1032,7 +1113,7 @@ ChoiceNode::FilterASCII(int depth, bool ignore_case)
     new_alternatives.reserve(surviving);
     for (int i = 0; i < choice_count; i++) {
         RegExpNode* replacement =
-            alternatives()[i].node()->FilterASCII(depth - 1, ignore_case);
+            alternatives()[i].node()->FilterASCII(depth - 1, ignore_case, unicode);
         if (replacement != nullptr) {
             alternatives()[i].set_node(replacement);
             AutoEnterOOMUnsafeRegion oomUnsafe;
@@ -1089,7 +1170,7 @@ NegativeLookaheadChoiceNode::GetQuickCheckDetails(QuickCheckDetails* details,
 }
 
 RegExpNode*
-NegativeLookaheadChoiceNode::FilterASCII(int depth, bool ignore_case)
+NegativeLookaheadChoiceNode::FilterASCII(int depth, bool ignore_case, bool unicode)
 {
     if (info()->replacement_calculated)
         return replacement();
@@ -1103,14 +1184,14 @@ NegativeLookaheadChoiceNode::FilterASCII(int depth, bool ignore_case)
     // Alternative 0 is the negative lookahead, alternative 1 is what comes
     // afterwards.
     RegExpNode* node = alternatives()[1].node();
-    RegExpNode* replacement = node->FilterASCII(depth - 1, ignore_case);
+    RegExpNode* replacement = node->FilterASCII(depth - 1, ignore_case, unicode);
 
     if (replacement == nullptr)
         return set_replacement(nullptr);
     alternatives()[1].set_node(replacement);
 
     RegExpNode* neg_node = alternatives()[0].node();
-    RegExpNode* neg_replacement = neg_node->FilterASCII(depth - 1, ignore_case);
+    RegExpNode* neg_replacement = neg_node->FilterASCII(depth - 1, ignore_case, unicode);
 
     // If the negative lookahead is always going to fail then
     // we don't need to check it.
@@ -1191,7 +1272,7 @@ LoopChoiceNode::FillInBMInfo(int offset,
 }
 
 RegExpNode*
-LoopChoiceNode::FilterASCII(int depth, bool ignore_case)
+LoopChoiceNode::FilterASCII(int depth, bool ignore_case, bool unicode)
 {
     if (info()->replacement_calculated)
         return replacement();
@@ -1204,7 +1285,7 @@ LoopChoiceNode::FilterASCII(int depth, bool ignore_case)
         VisitMarker marker(info());
 
         RegExpNode* continue_replacement =
-            continue_node_->FilterASCII(depth - 1, ignore_case);
+            continue_node_->FilterASCII(depth - 1, ignore_case, unicode);
 
         // If we can't continue after the loop then there is no sense in doing the
         // loop.
@@ -1212,7 +1293,7 @@ LoopChoiceNode::FilterASCII(int depth, bool ignore_case)
             return set_replacement(nullptr);
     }
 
-    return ChoiceNode::FilterASCII(depth - 1, ignore_case);
+    return ChoiceNode::FilterASCII(depth - 1, ignore_case, unicode);
 }
 
 // -------------------------------------------------------------------
@@ -1241,7 +1322,7 @@ void
 Analysis::VisitText(TextNode* that)
 {
     if (ignore_case_)
-        that->MakeCaseIndependent(is_ascii_);
+        that->MakeCaseIndependent(is_ascii_, unicode_);
     EnsureAnalyzed(that->on_success());
     if (!has_failed()) {
         that->CalculateOffsets();
@@ -1533,7 +1614,7 @@ class irregexp::RegExpCompiler
 {
   public:
     RegExpCompiler(JSContext* cx, LifoAlloc* alloc, int capture_count,
-                   bool ignore_case, bool is_ascii, bool match_only);
+                   bool ignore_case, bool is_ascii, bool match_only, bool unicode);
 
     int AllocateRegister() {
         if (next_register_ >= RegExpMacroAssembler::kMaxRegister) {
@@ -1570,6 +1651,7 @@ class irregexp::RegExpCompiler
 
     inline bool ignore_case() { return ignore_case_; }
     inline bool ascii() { return ascii_; }
+    inline bool unicode() { return unicode_; }
     FrequencyCollator* frequency_collator() { return &frequency_collator_; }
 
     int current_expansion_factor() { return current_expansion_factor_; }
@@ -1591,6 +1673,7 @@ class irregexp::RegExpCompiler
     bool ignore_case_;
     bool ascii_;
     bool match_only_;
+    bool unicode_;
     bool reg_exp_too_big_;
     int current_expansion_factor_;
     FrequencyCollator frequency_collator_;
@@ -1613,12 +1696,13 @@ class RecursionCheck
 // Attempts to compile the regexp using an Irregexp code generator.  Returns
 // a fixed array or a null handle depending on whether it succeeded.
 RegExpCompiler::RegExpCompiler(JSContext* cx, LifoAlloc* alloc, int capture_count,
-                               bool ignore_case, bool ascii, bool match_only)
+                               bool ignore_case, bool ascii, bool match_only, bool unicode)
   : next_register_(2 * (capture_count + 1)),
     recursion_depth_(0),
     ignore_case_(ignore_case),
     ascii_(ascii),
     match_only_(match_only),
+    unicode_(unicode),
     reg_exp_too_big_(false),
     current_expansion_factor_(1),
     frequency_collator_(),
@@ -1691,7 +1775,8 @@ IsNativeRegExpEnabled(JSContext* cx)
 RegExpCode
 irregexp::CompilePattern(JSContext* cx, RegExpShared* shared, RegExpCompileData* data,
                          HandleLinearString sample, bool is_global, bool ignore_case,
-                         bool is_ascii, bool match_only, bool force_bytecode, bool sticky)
+                         bool is_ascii, bool match_only, bool force_bytecode, bool sticky,
+                         bool unicode)
 {
     if ((data->capture_count + 1) * 2 - 1 > RegExpMacroAssembler::kMaxRegister) {
         JS_ReportError(cx, "regexp too big");
@@ -1699,7 +1784,8 @@ irregexp::CompilePattern(JSContext* cx, RegExpShared* shared, RegExpCompileData*
     }
 
     LifoAlloc& alloc = cx->tempLifoAlloc();
-    RegExpCompiler compiler(cx, &alloc, data->capture_count, ignore_case, is_ascii, match_only);
+    RegExpCompiler compiler(cx, &alloc, data->capture_count, ignore_case, is_ascii, match_only,
+                            unicode);
 
     // Sample some characters from the middle of the string.
     if (sample->hasLatin1Chars()) {
@@ -1745,18 +1831,18 @@ irregexp::CompilePattern(JSContext* cx, RegExpShared* shared, RegExpCompileData*
         }
     }
     if (is_ascii) {
-        node = node->FilterASCII(RegExpCompiler::kMaxRecursion, ignore_case);
+        node = node->FilterASCII(RegExpCompiler::kMaxRecursion, ignore_case, unicode);
         // Do it again to propagate the new nodes to places where they were not
         // put because they had not been calculated yet.
         if (node != nullptr) {
-            node = node->FilterASCII(RegExpCompiler::kMaxRecursion, ignore_case);
+            node = node->FilterASCII(RegExpCompiler::kMaxRecursion, ignore_case, unicode);
         }
     }
 
     if (node == nullptr)
         node = alloc.newInfallible<EndNode>(&alloc, EndNode::BACKTRACK);
 
-    Analysis analysis(cx, ignore_case, is_ascii);
+    Analysis analysis(cx, ignore_case, is_ascii, unicode);
     analysis.EnsureAnalyzed(node);
     if (analysis.has_failed()) {
         JS_ReportError(cx, analysis.errorMessage());
@@ -3592,7 +3678,7 @@ EmitAtomNonLetter(RegExpCompiler* compiler,
     RegExpMacroAssembler* macro_assembler = compiler->macro_assembler();
     bool ascii = compiler->ascii();
     char16_t chars[kEcma262UnCanonicalizeMaxWidth];
-    int length = GetCaseIndependentLetters(c, ascii, chars);
+    int length = GetCaseIndependentLetters(c, ascii, compiler->unicode(), chars);
     if (length < 1) {
         // This can't match.  Must be an ASCII subject and a non-ASCII character.
         // We do not need to do anything since the ASCII pass already handled this.
@@ -3668,7 +3754,7 @@ EmitAtomLetter(RegExpCompiler* compiler,
     RegExpMacroAssembler* macro_assembler = compiler->macro_assembler();
     bool ascii = compiler->ascii();
     char16_t chars[kEcma262UnCanonicalizeMaxWidth];
-    int length = GetCaseIndependentLetters(c, ascii, chars);
+    int length = GetCaseIndependentLetters(c, ascii, compiler->unicode(), chars);
     if (length <= 1) return false;
     // We may not need to check against the end of the input string
     // if this character lies before a character that matched.
@@ -4533,7 +4619,8 @@ BackReferenceNode::Emit(RegExpCompiler* compiler, Trace* trace)
     MOZ_ASSERT(start_reg_ + 1 == end_reg_);
     if (compiler->ignore_case()) {
         assembler->CheckNotBackReferenceIgnoreCase(start_reg_,
-                                                   trace->backtrack());
+                                                   trace->backtrack(),
+                                                   compiler->unicode());
     } else {
         assembler->CheckNotBackReference(start_reg_, trace->backtrack());
     }
@@ -4679,6 +4766,7 @@ TextNode::FillInBMInfo(int initial_offset,
                     char16_t chars[kEcma262UnCanonicalizeMaxWidth];
                     int length = GetCaseIndependentLetters(character,
                                                            bm->max_char() == kMaxOneByteCharCode,
+                                                           bm->compiler()->unicode(),
                                                            chars);
                     for (int j = 0; j < length; j++)
                         bm->Set(offset, chars[j]);
@@ -4770,7 +4858,8 @@ TextNode::GetQuickCheckDetails(QuickCheckDetails* details,
                 }
                 if (compiler->ignore_case()) {
                     char16_t chars[kEcma262UnCanonicalizeMaxWidth];
-                    size_t length = GetCaseIndependentLetters(c, compiler->ascii(), chars);
+                    size_t length = GetCaseIndependentLetters(c, compiler->ascii(),
+                                                              compiler->unicode(), chars);
                     MOZ_ASSERT(length != 0);  // Can only happen if c > char_mask (see above).
                     if (length == 1) {
                         // This letter has no case equivalents, so it's nice and simple
diff --git a/js/src/irregexp/RegExpEngine.h b/js/src/irregexp/RegExpEngine.h
index 8b8821eaa414..356366f61739 100644
--- a/js/src/irregexp/RegExpEngine.h
+++ b/js/src/irregexp/RegExpEngine.h
@@ -88,7 +88,8 @@ struct RegExpCode
 RegExpCode
 CompilePattern(JSContext* cx, RegExpShared* shared, RegExpCompileData* data,
                HandleLinearString sample,  bool is_global, bool ignore_case,
-               bool is_ascii, bool match_only, bool force_bytecode, bool sticky);
+               bool is_ascii, bool match_only, bool force_bytecode, bool sticky,
+               bool unicode);
 
 // Note: this may return RegExpRunStatus_Error if an interrupt was requested
 // while the code was executing.
@@ -145,7 +146,7 @@ class CharacterRange
 
     static void AddClassEscape(LifoAlloc* alloc, char16_t type, CharacterRangeVector* ranges);
     static void AddClassEscapeUnicode(LifoAlloc* alloc, char16_t type,
-                                      CharacterRangeVector* ranges);
+                                      CharacterRangeVector* ranges, bool ignoreCase);
 
     static inline CharacterRange Singleton(char16_t value) {
         return CharacterRange(value, value);
@@ -165,7 +166,7 @@ class CharacterRange
     bool is_valid() { return from_ <= to_; }
     bool IsEverything(char16_t max) { return from_ == 0 && to_ >= max; }
     bool IsSingleton() { return (from_ == to_); }
-    void AddCaseEquivalents(bool is_ascii, CharacterRangeVector* ranges);
+    void AddCaseEquivalents(bool is_ascii, bool unicode, CharacterRangeVector* ranges);
 
     static void Split(const LifoAlloc* alloc,
                       CharacterRangeVector base,
@@ -518,7 +519,7 @@ class RegExpNode
     // If we know that the input is ASCII then there are some nodes that can
     // never match.  This method returns a node that can be substituted for
     // itself, or nullptr if the node can never match.
-    virtual RegExpNode* FilterASCII(int depth, bool ignore_case) { return this; }
+    virtual RegExpNode* FilterASCII(int depth, bool ignore_case, bool unicode) { return this; }
 
     // Helper for FilterASCII.
     RegExpNode* replacement() {
@@ -625,14 +626,14 @@ class SeqRegExpNode : public RegExpNode
 
     RegExpNode* on_success() { return on_success_; }
     void set_on_success(RegExpNode* node) { on_success_ = node; }
-    virtual RegExpNode* FilterASCII(int depth, bool ignore_case);
+    virtual RegExpNode* FilterASCII(int depth, bool ignore_case, bool unicode);
     virtual bool FillInBMInfo(int offset,
                               int budget,
                               BoyerMooreLookahead* bm,
                               bool not_at_start);
 
   protected:
-    RegExpNode* FilterSuccessor(int depth, bool ignore_case);
+    RegExpNode* FilterSuccessor(int depth, bool ignore_case, bool unicode);
 
   private:
     RegExpNode* on_success_;
@@ -750,7 +751,7 @@ class TextNode : public SeqRegExpNode
                                       int characters_filled_in,
                                       bool not_at_start);
     TextElementVector& elements() { return *elements_; }
-    void MakeCaseIndependent(bool is_ascii);
+    void MakeCaseIndependent(bool is_ascii, bool unicode);
     virtual int GreedyLoopTextLength();
     virtual RegExpNode* GetSuccessorOfOmnivorousTextNode(
                                                          RegExpCompiler* compiler);
@@ -759,7 +760,7 @@ class TextNode : public SeqRegExpNode
                               BoyerMooreLookahead* bm,
                               bool not_at_start);
     void CalculateOffsets();
-    virtual RegExpNode* FilterASCII(int depth, bool ignore_case);
+    virtual RegExpNode* FilterASCII(int depth, bool ignore_case, bool unicode);
 
   private:
     enum TextEmitPassType {
@@ -1013,7 +1014,7 @@ class ChoiceNode : public RegExpNode
     void set_not_at_start() { not_at_start_ = true; }
     void set_being_calculated(bool b) { being_calculated_ = b; }
     virtual bool try_to_emit_quick_check_for_alternative(int i) { return true; }
-    virtual RegExpNode* FilterASCII(int depth, bool ignore_case);
+    virtual RegExpNode* FilterASCII(int depth, bool ignore_case, bool unicode);
 
   protected:
     int GreedyLoopTextLengthForAlternative(GuardedAlternative* alternative);
@@ -1066,7 +1067,7 @@ class NegativeLookaheadChoiceNode : public ChoiceNode
     // characters, but on a negative lookahead the negative branch did not take
     // part in that calculation (EatsAtLeast) so the assumptions don't hold.
     virtual bool try_to_emit_quick_check_for_alternative(int i) { return i != 0; }
-    virtual RegExpNode* FilterASCII(int depth, bool ignore_case);
+    virtual RegExpNode* FilterASCII(int depth, bool ignore_case, bool unicode);
 };
 
 class LoopChoiceNode : public ChoiceNode
@@ -1095,7 +1096,7 @@ class LoopChoiceNode : public ChoiceNode
     RegExpNode* continue_node() { return continue_node_; }
     bool body_can_be_zero_length() { return body_can_be_zero_length_; }
     virtual void Accept(NodeVisitor* visitor);
-    virtual RegExpNode* FilterASCII(int depth, bool ignore_case);
+    virtual RegExpNode* FilterASCII(int depth, bool ignore_case, bool unicode);
 
   private:
     // AddAlternative is made private for loop nodes because alternatives
@@ -1466,10 +1467,11 @@ class NodeVisitor
 class Analysis : public NodeVisitor
 {
   public:
-    Analysis(JSContext* cx, bool ignore_case, bool is_ascii)
+    Analysis(JSContext* cx, bool ignore_case, bool is_ascii, bool unicode)
       : cx(cx),
         ignore_case_(ignore_case),
         is_ascii_(is_ascii),
+        unicode_(unicode),
         error_message_(nullptr)
     {}
 
@@ -1494,6 +1496,7 @@ class Analysis : public NodeVisitor
     JSContext* cx;
     bool ignore_case_;
     bool is_ascii_;
+    bool unicode_;
     const char* error_message_;
 
     Analysis(Analysis&) = delete;
diff --git a/js/src/irregexp/RegExpInterpreter.cpp b/js/src/irregexp/RegExpInterpreter.cpp
index 2a4bfb20a6af..1258c203dd9b 100644
--- a/js/src/irregexp/RegExpInterpreter.cpp
+++ b/js/src/irregexp/RegExpInterpreter.cpp
@@ -442,6 +442,27 @@ irregexp::InterpretCode(JSContext* cx, const uint8_t* byteCode, const CharT* cha
             }
             break;
           }
+          BYTECODE(CHECK_NOT_BACK_REF_NO_CASE_UNICODE) {
+            int from = registers[insn >> BYTECODE_SHIFT];
+            int len = registers[(insn >> BYTECODE_SHIFT) + 1] - from;
+            if (from < 0 || len <= 0) {
+                pc += BC_CHECK_NOT_BACK_REF_NO_CASE_UNICODE_LENGTH;
+                break;
+            }
+            if (current + len > length) {
+                pc = byteCode + Load32Aligned(pc + 4);
+                break;
+            }
+            if (CaseInsensitiveCompareUCStrings(chars + from, chars + current,
+                                                len * sizeof(CharT)))
+            {
+                current += len;
+                pc += BC_CHECK_NOT_BACK_REF_NO_CASE_UNICODE_LENGTH;
+            } else {
+                pc = byteCode + Load32Aligned(pc + 4);
+            }
+            break;
+          }
           BYTECODE(CHECK_AT_START)
             if (current == 0)
                 pc = byteCode + Load32Aligned(pc + 4);
diff --git a/js/src/irregexp/RegExpMacroAssembler.cpp b/js/src/irregexp/RegExpMacroAssembler.cpp
index 197c3f3b452d..d66d0d204a85 100644
--- a/js/src/irregexp/RegExpMacroAssembler.cpp
+++ b/js/src/irregexp/RegExpMacroAssembler.cpp
@@ -65,6 +65,38 @@ template int
 irregexp::CaseInsensitiveCompareStrings(const char16_t* substring1, const char16_t* substring2,
 					size_t byteLength);
 
+template <typename CharT>
+int
+irregexp::CaseInsensitiveCompareUCStrings(const CharT* substring1, const CharT* substring2,
+                                          size_t byteLength)
+{
+    MOZ_ASSERT(byteLength % sizeof(CharT) == 0);
+    size_t length = byteLength / sizeof(CharT);
+
+    for (size_t i = 0; i < length; i++) {
+        char16_t c1 = substring1[i];
+        char16_t c2 = substring2[i];
+        if (c1 != c2) {
+            c1 = unicode::FoldCase(c1);
+            c2 = unicode::FoldCase(c2);
+            if (c1 != c2)
+                return 0;
+        }
+    }
+
+    return 1;
+}
+
+template int
+irregexp::CaseInsensitiveCompareUCStrings(const Latin1Char* substring1,
+                                          const Latin1Char* substring2,
+                                          size_t byteLength);
+
+template int
+irregexp::CaseInsensitiveCompareUCStrings(const char16_t* substring1,
+                                          const char16_t* substring2,
+                                          size_t byteLength);
+
 InterpretedRegExpMacroAssembler::InterpretedRegExpMacroAssembler(LifoAlloc* alloc, RegExpShared* shared,
                                                                  size_t numSavedRegisters)
   : RegExpMacroAssembler(*alloc, shared, numSavedRegisters),
@@ -210,11 +242,16 @@ InterpretedRegExpMacroAssembler::CheckNotBackReference(int start_reg, jit::Label
 }
 
 void
-InterpretedRegExpMacroAssembler::CheckNotBackReferenceIgnoreCase(int start_reg, jit::Label* on_no_match)
+InterpretedRegExpMacroAssembler::CheckNotBackReferenceIgnoreCase(int start_reg,
+                                                                 jit::Label* on_no_match,
+                                                                 bool unicode)
 {
     MOZ_ASSERT(start_reg >= 0);
     MOZ_ASSERT(start_reg <= kMaxRegister);
-    Emit(BC_CHECK_NOT_BACK_REF_NO_CASE, start_reg);
+    if (unicode)
+        Emit(BC_CHECK_NOT_BACK_REF_NO_CASE_UNICODE, start_reg);
+    else
+        Emit(BC_CHECK_NOT_BACK_REF_NO_CASE, start_reg);
     EmitOrLink(on_no_match);
 }
 
diff --git a/js/src/irregexp/RegExpMacroAssembler.h b/js/src/irregexp/RegExpMacroAssembler.h
index 0111e37e0d6e..940033d312e5 100644
--- a/js/src/irregexp/RegExpMacroAssembler.h
+++ b/js/src/irregexp/RegExpMacroAssembler.h
@@ -112,7 +112,8 @@ class MOZ_STACK_CLASS RegExpMacroAssembler
     virtual void CheckGreedyLoop(jit::Label* on_tos_equals_current_position) = 0;
     virtual void CheckNotAtStart(jit::Label* on_not_at_start) = 0;
     virtual void CheckNotBackReference(int start_reg, jit::Label* on_no_match) = 0;
-    virtual void CheckNotBackReferenceIgnoreCase(int start_reg, jit::Label* on_no_match) = 0;
+    virtual void CheckNotBackReferenceIgnoreCase(int start_reg, jit::Label* on_no_match,
+                                                 bool unicode) = 0;
 
     // Check the current character for a match with a literal character.  If we
     // fail to match then goto the on_failure label.  End of input always
@@ -221,6 +222,11 @@ template <typename CharT>
 int
 CaseInsensitiveCompareStrings(const CharT* substring1, const CharT* substring2, size_t byteLength);
 
+template <typename CharT>
+int
+CaseInsensitiveCompareUCStrings(const CharT* substring1, const CharT* substring2,
+                                size_t byteLength);
+
 class MOZ_STACK_CLASS InterpretedRegExpMacroAssembler : public RegExpMacroAssembler
 {
   public:
@@ -241,7 +247,7 @@ class MOZ_STACK_CLASS InterpretedRegExpMacroAssembler : public RegExpMacroAssemb
     void CheckGreedyLoop(jit::Label* on_tos_equals_current_position);
     void CheckNotAtStart(jit::Label* on_not_at_start);
     void CheckNotBackReference(int start_reg, jit::Label* on_no_match);
-    void CheckNotBackReferenceIgnoreCase(int start_reg, jit::Label* on_no_match);
+    void CheckNotBackReferenceIgnoreCase(int start_reg, jit::Label* on_no_match, bool unicode);
     void CheckNotCharacter(unsigned c, jit::Label* on_not_equal);
     void CheckNotCharacterAfterAnd(unsigned c, unsigned and_with, jit::Label* on_not_equal);
     void CheckNotCharacterAfterMinusAnd(char16_t c, char16_t minus, char16_t and_with,
diff --git a/js/src/irregexp/RegExpParser.cpp b/js/src/irregexp/RegExpParser.cpp
index 976a87d8d0f6..1d582052ae9b 100644
--- a/js/src/irregexp/RegExpParser.cpp
+++ b/js/src/irregexp/RegExpParser.cpp
@@ -206,7 +206,7 @@ RegExpBuilder::AddQuantifierToAtom(int min, int max,
 template <typename CharT>
 RegExpParser<CharT>::RegExpParser(frontend::TokenStream& ts, LifoAlloc* alloc,
                                   const CharT* chars, const CharT* end, bool multiline_mode,
-                                  bool unicode)
+                                  bool unicode, bool ignore_case)
   : ts(ts),
     alloc(alloc),
     captures_(nullptr),
@@ -217,6 +217,7 @@ RegExpParser<CharT>::RegExpParser(frontend::TokenStream& ts, LifoAlloc* alloc,
     has_more_(true),
     multiline_(multiline_mode),
     unicode_(unicode),
+    ignore_case_(ignore_case),
     simple_(false),
     contains_anchor_(false),
     is_scanned_for_captures_(false)
@@ -609,10 +610,11 @@ AddCharOrEscapeUnicode(LifoAlloc* alloc,
                        CharacterRangeVector* trail_ranges,
                        WideCharRangeVector* wide_ranges,
                        char16_t char_class,
-                       widechar c)
+                       widechar c,
+                       bool ignore_case)
 {
     if (char_class != kNoCharClass) {
-        CharacterRange::AddClassEscapeUnicode(alloc, char_class, ranges);
+        CharacterRange::AddClassEscapeUnicode(alloc, char_class, ranges, ignore_case);
         switch (char_class) {
           case 'S':
           case 'W':
@@ -896,7 +898,7 @@ RegExpParser<CharT>::ParseCharacterClass()
             } else if (current() == ']') {
                 if (unicode_) {
                     AddCharOrEscapeUnicode(alloc, ranges, lead_ranges, trail_ranges, wide_ranges,
-                                           char_class, first);
+                                           char_class, first, ignore_case_);
                 } else {
                     AddCharOrEscape(alloc, ranges, char_class, first);
                 }
@@ -926,7 +928,7 @@ RegExpParser<CharT>::ParseCharacterClass()
         } else {
             if (unicode_) {
                 AddCharOrEscapeUnicode(alloc, ranges, lead_ranges, trail_ranges, wide_ranges,
-                                       char_class, first);
+                                       char_class, first, ignore_case_);
             } else {
                 AddCharOrEscape(alloc, ranges, char_class, first);
             }
@@ -1228,13 +1230,14 @@ UnicodeEverythingAtom(LifoAlloc* alloc)
 }
 
 RegExpTree*
-UnicodeCharacterClassEscapeAtom(LifoAlloc* alloc, char16_t char_class)
+UnicodeCharacterClassEscapeAtom(LifoAlloc* alloc, char16_t char_class, bool ignore_case)
 {
     CharacterRangeVector* ranges = alloc->newInfallible<CharacterRangeVector>(*alloc);
     CharacterRangeVector* lead_ranges = alloc->newInfallible<CharacterRangeVector>(*alloc);
     CharacterRangeVector* trail_ranges = alloc->newInfallible<CharacterRangeVector>(*alloc);
     WideCharRangeVector* wide_ranges = alloc->newInfallible<WideCharRangeVector>(*alloc);
-    AddCharOrEscapeUnicode(alloc, ranges, lead_ranges, trail_ranges, wide_ranges, char_class, 0);
+    AddCharOrEscapeUnicode(alloc, ranges, lead_ranges, trail_ranges, wide_ranges, char_class, 0,
+                           ignore_case);
 
     return UnicodeRangesAtom(alloc, ranges, lead_ranges, trail_ranges, wide_ranges, false);
 }
@@ -1406,7 +1409,8 @@ RegExpParser<CharT>::ParseDisjunction()
               case 'D': case 'S': case 'W':
                 if (unicode_) {
                     Advance();
-                    builder->AddAtom(UnicodeCharacterClassEscapeAtom(alloc, current()));
+                    builder->AddAtom(UnicodeCharacterClassEscapeAtom(alloc, current(),
+                                                                     ignore_case_));
                     Advance();
                     break;
                 }
@@ -1416,7 +1420,10 @@ RegExpParser<CharT>::ParseDisjunction()
                 Advance(2);
                 CharacterRangeVector* ranges =
                     alloc->newInfallible<CharacterRangeVector>(*alloc);
-                CharacterRange::AddClassEscape(alloc, c, ranges);
+                if (unicode_)
+                    CharacterRange::AddClassEscapeUnicode(alloc, c, ranges, ignore_case_);
+                else
+                    CharacterRange::AddClassEscape(alloc, c, ranges);
                 RegExpTree* atom = alloc->newInfallible<RegExpCharacterClass>(ranges, false);
                 builder->AddAtom(atom);
                 break;
@@ -1628,7 +1635,8 @@ template class irregexp::RegExpParser<char16_t>;
 template <typename CharT>
 static bool
 ParsePattern(frontend::TokenStream& ts, LifoAlloc& alloc, const CharT* chars, size_t length,
-             bool multiline, bool match_only, bool unicode, RegExpCompileData* data)
+             bool multiline, bool match_only, bool unicode, bool ignore_case,
+             RegExpCompileData* data)
 {
     if (match_only) {
         // Try to strip a leading '.*' from the RegExp, but only if it is not
@@ -1651,7 +1659,7 @@ ParsePattern(frontend::TokenStream& ts, LifoAlloc& alloc, const CharT* chars, si
         }
     }
 
-    RegExpParser<CharT> parser(ts, &alloc, chars, chars + length, multiline, unicode);
+    RegExpParser<CharT> parser(ts, &alloc, chars, chars + length, multiline, unicode, ignore_case);
     data->tree = parser.ParsePattern();
     if (!data->tree)
         return false;
@@ -1664,15 +1672,15 @@ ParsePattern(frontend::TokenStream& ts, LifoAlloc& alloc, const CharT* chars, si
 
 bool
 irregexp::ParsePattern(frontend::TokenStream& ts, LifoAlloc& alloc, JSAtom* str,
-                       bool multiline, bool match_only, bool unicode,
+                       bool multiline, bool match_only, bool unicode, bool ignore_case,
                        RegExpCompileData* data)
 {
     JS::AutoCheckCannotGC nogc;
     return str->hasLatin1Chars()
            ? ::ParsePattern(ts, alloc, str->latin1Chars(nogc), str->length(),
-                            multiline, match_only, unicode, data)
+                            multiline, match_only, unicode, ignore_case, data)
            : ::ParsePattern(ts, alloc, str->twoByteChars(nogc), str->length(),
-                            multiline, match_only, unicode, data);
+                            multiline, match_only, unicode, ignore_case, data);
 }
 
 template <typename CharT>
@@ -1682,7 +1690,7 @@ ParsePatternSyntax(frontend::TokenStream& ts, LifoAlloc& alloc, const CharT* cha
 {
     LifoAllocScope scope(&alloc);
 
-    RegExpParser<CharT> parser(ts, &alloc, chars, chars + length, false, unicode);
+    RegExpParser<CharT> parser(ts, &alloc, chars, chars + length, false, unicode, false);
     return parser.ParsePattern() != nullptr;
 }
 
diff --git a/js/src/irregexp/RegExpParser.h b/js/src/irregexp/RegExpParser.h
index 8f7cf6304cd1..34d0620d6ce5 100644
--- a/js/src/irregexp/RegExpParser.h
+++ b/js/src/irregexp/RegExpParser.h
@@ -43,7 +43,7 @@ namespace irregexp {
 
 bool
 ParsePattern(frontend::TokenStream& ts, LifoAlloc& alloc, JSAtom* str,
-             bool multiline, bool match_only, bool unicode,
+             bool multiline, bool match_only, bool unicode, bool ignore_case,
              RegExpCompileData* data);
 
 bool
@@ -175,7 +175,8 @@ class RegExpParser
 {
   public:
     RegExpParser(frontend::TokenStream& ts, LifoAlloc* alloc,
-                 const CharT* chars, const CharT* end, bool multiline_mode, bool unicode);
+                 const CharT* chars, const CharT* end, bool multiline_mode, bool unicode,
+                 bool ignore_case);
 
     RegExpTree* ParsePattern();
     RegExpTree* ParseDisjunction();
@@ -296,6 +297,7 @@ class RegExpParser
     bool has_more_;
     bool multiline_;
     bool unicode_;
+    bool ignore_case_;
     bool simple_;
     bool contains_anchor_;
     bool is_scanned_for_captures_;
diff --git a/js/src/tests/ecma_6/RegExp/unicode-ignoreCase-ascii.js b/js/src/tests/ecma_6/RegExp/unicode-ignoreCase-ascii.js
new file mode 100644
index 000000000000..6d453290e956
--- /dev/null
+++ b/js/src/tests/ecma_6/RegExp/unicode-ignoreCase-ascii.js
@@ -0,0 +1,45 @@
+var BUGNUMBER = 1135377;
+var summary = "Implement RegExp unicode flag -- ignoreCase flag with non-ascii to ascii map.";
+
+print(BUGNUMBER + ": " + summary);
+
+// LATIN CAPITAL LETTER Y WITH DIAERESIS
+assertEqArray(/\u0178/iu.exec("\u00FF"),
+              ["\u00FF"]);
+assertEqArray(/\u00FF/iu.exec("\u0178"),
+              ["\u0178"]);
+
+// LATIN SMALL LETTER LONG S
+assertEqArray(/\u017F/iu.exec("S"),
+              ["S"]);
+assertEqArray(/\u017F/iu.exec("s"),
+              ["s"]);
+assertEqArray(/S/iu.exec("\u017F"),
+              ["\u017F"]);
+assertEqArray(/s/iu.exec("\u017F"),
+              ["\u017F"]);
+
+// LATIN CAPITAL LETTER SHARP S
+assertEqArray(/\u1E9E/iu.exec("\u00DF"),
+              ["\u00DF"]);
+assertEqArray(/\u00DF/iu.exec("\u1E9E"),
+              ["\u1E9E"]);
+
+// KELVIN SIGN
+assertEqArray(/\u212A/iu.exec("K"),
+              ["K"]);
+assertEqArray(/\u212A/iu.exec("k"),
+              ["k"]);
+assertEqArray(/K/iu.exec("\u212A"),
+              ["\u212A"]);
+assertEqArray(/k/iu.exec("\u212A"),
+              ["\u212A"]);
+
+// ANGSTROM SIGN
+assertEqArray(/\u212B/iu.exec("\u00E5"),
+              ["\u00E5"]);
+assertEqArray(/\u00E5/iu.exec("\u212B"),
+              ["\u212B"]);
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff --git a/js/src/tests/ecma_6/RegExp/unicode-ignoreCase-escape.js b/js/src/tests/ecma_6/RegExp/unicode-ignoreCase-escape.js
new file mode 100644
index 000000000000..af5981be0896
--- /dev/null
+++ b/js/src/tests/ecma_6/RegExp/unicode-ignoreCase-escape.js
@@ -0,0 +1,39 @@
+var BUGNUMBER = 1135377;
+var summary = "Implement RegExp unicode flag -- ignoreCase flag with character class escape.";
+
+print(BUGNUMBER + ": " + summary);
+
+// LATIN SMALL LETTER LONG S
+
+assertEqArray(/\w/iu.exec("S"),
+              ["S"]);
+assertEqArray(/\w/iu.exec("s"),
+              ["s"]);
+assertEqArray(/\w/iu.exec("\u017F"),
+              ["\u017F"]);
+
+assertEqArray(/\W/iu.exec("S"),
+              ["S"]);
+assertEqArray(/\W/iu.exec("s"),
+              ["s"]);
+assertEqArray(/\W/iu.exec("\u017F"),
+              ["\u017F"]);
+
+// KELVIN SIGN
+
+assertEqArray(/\w/iu.exec("k"),
+              ["k"]);
+assertEqArray(/\w/iu.exec("k"),
+              ["k"]);
+assertEqArray(/\w/iu.exec("\u212A"),
+              ["\u212A"]);
+
+assertEqArray(/\W/iu.exec("k"),
+              ["k"]);
+assertEqArray(/\W/iu.exec("k"),
+              ["k"]);
+assertEqArray(/\W/iu.exec("\u212A"),
+              ["\u212A"]);
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff --git a/js/src/tests/ecma_6/RegExp/unicode-ignoreCase-negated.js b/js/src/tests/ecma_6/RegExp/unicode-ignoreCase-negated.js
new file mode 100644
index 000000000000..30909a515ac5
--- /dev/null
+++ b/js/src/tests/ecma_6/RegExp/unicode-ignoreCase-negated.js
@@ -0,0 +1,19 @@
+var BUGNUMBER = 1135377;
+var summary = "Implement RegExp unicode flag -- ignoreCase flag with negated character class.";
+
+print(BUGNUMBER + ": " + summary);
+
+assertEq(/[^A]/iu.exec("A"),
+         null);
+assertEq(/[^a]/iu.exec("A"),
+         null);
+assertEq(/[^A]/iu.exec("a"),
+         null);
+assertEq(/[^a]/iu.exec("a"),
+         null);
+
+assertEqArray(/[^A]/iu.exec("b"),
+              ["b"]);
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff --git a/js/src/tests/ecma_6/RegExp/unicode-ignoreCase.js b/js/src/tests/ecma_6/RegExp/unicode-ignoreCase.js
new file mode 100644
index 000000000000..1eb8a0889e5f
--- /dev/null
+++ b/js/src/tests/ecma_6/RegExp/unicode-ignoreCase.js
@@ -0,0 +1,2245 @@
+/* Generated by make_unicode.py DO NOT MODIFY */
+
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/
+ */
+
+var BUGNUMBER = 1135377;
+var summary = "Implement RegExp unicode flag -- ignoreCase flag.";
+
+print(BUGNUMBER + ": " + summary);
+
+function test(code, ...equivs) {
+  var codeRe = new RegExp(String.fromCodePoint(code) + "+", "iu");
+  var ans = String.fromCodePoint(code) + equivs.map(c => String.fromCodePoint(c)).join("");
+  assertEqArray(codeRe.exec("<" + ans + ">"), [ans]);
+  codeRe = new RegExp("[" + String.fromCodePoint(code) + "]+", "iu");
+  assertEqArray(codeRe.exec("<" + ans + ">"), [ans]);
+}
+test(0x41,0x61);
+test(0x42,0x62);
+test(0x43,0x63);
+test(0x44,0x64);
+test(0x45,0x65);
+test(0x46,0x66);
+test(0x47,0x67);
+test(0x48,0x68);
+test(0x49,0x69);
+test(0x4a,0x6a);
+test(0x4b,0x6b,0x212a);
+test(0x4c,0x6c);
+test(0x4d,0x6d);
+test(0x4e,0x6e);
+test(0x4f,0x6f);
+test(0x50,0x70);
+test(0x51,0x71);
+test(0x52,0x72);
+test(0x53,0x73,0x17f);
+test(0x54,0x74);
+test(0x55,0x75);
+test(0x56,0x76);
+test(0x57,0x77);
+test(0x58,0x78);
+test(0x59,0x79);
+test(0x5a,0x7a);
+test(0x61,0x41);
+test(0x62,0x42);
+test(0x63,0x43);
+test(0x64,0x44);
+test(0x65,0x45);
+test(0x66,0x46);
+test(0x67,0x47);
+test(0x68,0x48);
+test(0x69,0x49);
+test(0x6a,0x4a);
+test(0x6b,0x4b,0x212a);
+test(0x6c,0x4c);
+test(0x6d,0x4d);
+test(0x6e,0x4e);
+test(0x6f,0x4f);
+test(0x70,0x50);
+test(0x71,0x51);
+test(0x72,0x52);
+test(0x73,0x53,0x17f);
+test(0x74,0x54);
+test(0x75,0x55);
+test(0x76,0x56);
+test(0x77,0x57);
+test(0x78,0x58);
+test(0x79,0x59);
+test(0x7a,0x5a);
+test(0xb5,0x3bc,0x39c);
+test(0xc0,0xe0);
+test(0xc1,0xe1);
+test(0xc2,0xe2);
+test(0xc3,0xe3);
+test(0xc4,0xe4);
+test(0xc5,0xe5,0x212b);
+test(0xc6,0xe6);
+test(0xc7,0xe7);
+test(0xc8,0xe8);
+test(0xc9,0xe9);
+test(0xca,0xea);
+test(0xcb,0xeb);
+test(0xcc,0xec);
+test(0xcd,0xed);
+test(0xce,0xee);
+test(0xcf,0xef);
+test(0xd0,0xf0);
+test(0xd1,0xf1);
+test(0xd2,0xf2);
+test(0xd3,0xf3);
+test(0xd4,0xf4);
+test(0xd5,0xf5);
+test(0xd6,0xf6);
+test(0xd8,0xf8);
+test(0xd9,0xf9);
+test(0xda,0xfa);
+test(0xdb,0xfb);
+test(0xdc,0xfc);
+test(0xdd,0xfd);
+test(0xde,0xfe);
+test(0xdf,0x1e9e);
+test(0xe0,0xc0);
+test(0xe1,0xc1);
+test(0xe2,0xc2);
+test(0xe3,0xc3);
+test(0xe4,0xc4);
+test(0xe5,0xc5,0x212b);
+test(0xe6,0xc6);
+test(0xe7,0xc7);
+test(0xe8,0xc8);
+test(0xe9,0xc9);
+test(0xea,0xca);
+test(0xeb,0xcb);
+test(0xec,0xcc);
+test(0xed,0xcd);
+test(0xee,0xce);
+test(0xef,0xcf);
+test(0xf0,0xd0);
+test(0xf1,0xd1);
+test(0xf2,0xd2);
+test(0xf3,0xd3);
+test(0xf4,0xd4);
+test(0xf5,0xd5);
+test(0xf6,0xd6);
+test(0xf8,0xd8);
+test(0xf9,0xd9);
+test(0xfa,0xda);
+test(0xfb,0xdb);
+test(0xfc,0xdc);
+test(0xfd,0xdd);
+test(0xfe,0xde);
+test(0xff,0x178);
+test(0x100,0x101);
+test(0x101,0x100);
+test(0x102,0x103);
+test(0x103,0x102);
+test(0x104,0x105);
+test(0x105,0x104);
+test(0x106,0x107);
+test(0x107,0x106);
+test(0x108,0x109);
+test(0x109,0x108);
+test(0x10a,0x10b);
+test(0x10b,0x10a);
+test(0x10c,0x10d);
+test(0x10d,0x10c);
+test(0x10e,0x10f);
+test(0x10f,0x10e);
+test(0x110,0x111);
+test(0x111,0x110);
+test(0x112,0x113);
+test(0x113,0x112);
+test(0x114,0x115);
+test(0x115,0x114);
+test(0x116,0x117);
+test(0x117,0x116);
+test(0x118,0x119);
+test(0x119,0x118);
+test(0x11a,0x11b);
+test(0x11b,0x11a);
+test(0x11c,0x11d);
+test(0x11d,0x11c);
+test(0x11e,0x11f);
+test(0x11f,0x11e);
+test(0x120,0x121);
+test(0x121,0x120);
+test(0x122,0x123);
+test(0x123,0x122);
+test(0x124,0x125);
+test(0x125,0x124);
+test(0x126,0x127);
+test(0x127,0x126);
+test(0x128,0x129);
+test(0x129,0x128);
+test(0x12a,0x12b);
+test(0x12b,0x12a);
+test(0x12c,0x12d);
+test(0x12d,0x12c);
+test(0x12e,0x12f);
+test(0x12f,0x12e);
+test(0x132,0x133);
+test(0x133,0x132);
+test(0x134,0x135);
+test(0x135,0x134);
+test(0x136,0x137);
+test(0x137,0x136);
+test(0x139,0x13a);
+test(0x13a,0x139);
+test(0x13b,0x13c);
+test(0x13c,0x13b);
+test(0x13d,0x13e);
+test(0x13e,0x13d);
+test(0x13f,0x140);
+test(0x140,0x13f);
+test(0x141,0x142);
+test(0x142,0x141);
+test(0x143,0x144);
+test(0x144,0x143);
+test(0x145,0x146);
+test(0x146,0x145);
+test(0x147,0x148);
+test(0x148,0x147);
+test(0x14a,0x14b);
+test(0x14b,0x14a);
+test(0x14c,0x14d);
+test(0x14d,0x14c);
+test(0x14e,0x14f);
+test(0x14f,0x14e);
+test(0x150,0x151);
+test(0x151,0x150);
+test(0x152,0x153);
+test(0x153,0x152);
+test(0x154,0x155);
+test(0x155,0x154);
+test(0x156,0x157);
+test(0x157,0x156);
+test(0x158,0x159);
+test(0x159,0x158);
+test(0x15a,0x15b);
+test(0x15b,0x15a);
+test(0x15c,0x15d);
+test(0x15d,0x15c);
+test(0x15e,0x15f);
+test(0x15f,0x15e);
+test(0x160,0x161);
+test(0x161,0x160);
+test(0x162,0x163);
+test(0x163,0x162);
+test(0x164,0x165);
+test(0x165,0x164);
+test(0x166,0x167);
+test(0x167,0x166);
+test(0x168,0x169);
+test(0x169,0x168);
+test(0x16a,0x16b);
+test(0x16b,0x16a);
+test(0x16c,0x16d);
+test(0x16d,0x16c);
+test(0x16e,0x16f);
+test(0x16f,0x16e);
+test(0x170,0x171);
+test(0x171,0x170);
+test(0x172,0x173);
+test(0x173,0x172);
+test(0x174,0x175);
+test(0x175,0x174);
+test(0x176,0x177);
+test(0x177,0x176);
+test(0x178,0xff);
+test(0x179,0x17a);
+test(0x17a,0x179);
+test(0x17b,0x17c);
+test(0x17c,0x17b);
+test(0x17d,0x17e);
+test(0x17e,0x17d);
+test(0x17f,0x73,0x53);
+test(0x180,0x243);
+test(0x181,0x253);
+test(0x182,0x183);
+test(0x183,0x182);
+test(0x184,0x185);
+test(0x185,0x184);
+test(0x186,0x254);
+test(0x187,0x188);
+test(0x188,0x187);
+test(0x189,0x256);
+test(0x18a,0x257);
+test(0x18b,0x18c);
+test(0x18c,0x18b);
+test(0x18e,0x1dd);
+test(0x18f,0x259);
+test(0x190,0x25b);
+test(0x191,0x192);
+test(0x192,0x191);
+test(0x193,0x260);
+test(0x194,0x263);
+test(0x195,0x1f6);
+test(0x196,0x269);
+test(0x197,0x268);
+test(0x198,0x199);
+test(0x199,0x198);
+test(0x19a,0x23d);
+test(0x19c,0x26f);
+test(0x19d,0x272);
+test(0x19e,0x220);
+test(0x19f,0x275);
+test(0x1a0,0x1a1);
+test(0x1a1,0x1a0);
+test(0x1a2,0x1a3);
+test(0x1a3,0x1a2);
+test(0x1a4,0x1a5);
+test(0x1a5,0x1a4);
+test(0x1a6,0x280);
+test(0x1a7,0x1a8);
+test(0x1a8,0x1a7);
+test(0x1a9,0x283);
+test(0x1ac,0x1ad);
+test(0x1ad,0x1ac);
+test(0x1ae,0x288);
+test(0x1af,0x1b0);
+test(0x1b0,0x1af);
+test(0x1b1,0x28a);
+test(0x1b2,0x28b);
+test(0x1b3,0x1b4);
+test(0x1b4,0x1b3);
+test(0x1b5,0x1b6);
+test(0x1b6,0x1b5);
+test(0x1b7,0x292);
+test(0x1b8,0x1b9);
+test(0x1b9,0x1b8);
+test(0x1bc,0x1bd);
+test(0x1bd,0x1bc);
+test(0x1bf,0x1f7);
+test(0x1c4,0x1c6,0x1c5);
+test(0x1c5,0x1c6,0x1c4);
+test(0x1c6,0x1c4,0x1c5);
+test(0x1c7,0x1c9,0x1c8);
+test(0x1c8,0x1c9,0x1c7);
+test(0x1c9,0x1c7,0x1c8);
+test(0x1ca,0x1cc,0x1cb);
+test(0x1cb,0x1cc,0x1ca);
+test(0x1cc,0x1ca,0x1cb);
+test(0x1cd,0x1ce);
+test(0x1ce,0x1cd);
+test(0x1cf,0x1d0);
+test(0x1d0,0x1cf);
+test(0x1d1,0x1d2);
+test(0x1d2,0x1d1);
+test(0x1d3,0x1d4);
+test(0x1d4,0x1d3);
+test(0x1d5,0x1d6);
+test(0x1d6,0x1d5);
+test(0x1d7,0x1d8);
+test(0x1d8,0x1d7);
+test(0x1d9,0x1da);
+test(0x1da,0x1d9);
+test(0x1db,0x1dc);
+test(0x1dc,0x1db);
+test(0x1dd,0x18e);
+test(0x1de,0x1df);
+test(0x1df,0x1de);
+test(0x1e0,0x1e1);
+test(0x1e1,0x1e0);
+test(0x1e2,0x1e3);
+test(0x1e3,0x1e2);
+test(0x1e4,0x1e5);
+test(0x1e5,0x1e4);
+test(0x1e6,0x1e7);
+test(0x1e7,0x1e6);
+test(0x1e8,0x1e9);
+test(0x1e9,0x1e8);
+test(0x1ea,0x1eb);
+test(0x1eb,0x1ea);
+test(0x1ec,0x1ed);
+test(0x1ed,0x1ec);
+test(0x1ee,0x1ef);
+test(0x1ef,0x1ee);
+test(0x1f1,0x1f3,0x1f2);
+test(0x1f2,0x1f3,0x1f1);
+test(0x1f3,0x1f1,0x1f2);
+test(0x1f4,0x1f5);
+test(0x1f5,0x1f4);
+test(0x1f6,0x195);
+test(0x1f7,0x1bf);
+test(0x1f8,0x1f9);
+test(0x1f9,0x1f8);
+test(0x1fa,0x1fb);
+test(0x1fb,0x1fa);
+test(0x1fc,0x1fd);
+test(0x1fd,0x1fc);
+test(0x1fe,0x1ff);
+test(0x1ff,0x1fe);
+test(0x200,0x201);
+test(0x201,0x200);
+test(0x202,0x203);
+test(0x203,0x202);
+test(0x204,0x205);
+test(0x205,0x204);
+test(0x206,0x207);
+test(0x207,0x206);
+test(0x208,0x209);
+test(0x209,0x208);
+test(0x20a,0x20b);
+test(0x20b,0x20a);
+test(0x20c,0x20d);
+test(0x20d,0x20c);
+test(0x20e,0x20f);
+test(0x20f,0x20e);
+test(0x210,0x211);
+test(0x211,0x210);
+test(0x212,0x213);
+test(0x213,0x212);
+test(0x214,0x215);
+test(0x215,0x214);
+test(0x216,0x217);
+test(0x217,0x216);
+test(0x218,0x219);
+test(0x219,0x218);
+test(0x21a,0x21b);
+test(0x21b,0x21a);
+test(0x21c,0x21d);
+test(0x21d,0x21c);
+test(0x21e,0x21f);
+test(0x21f,0x21e);
+test(0x220,0x19e);
+test(0x222,0x223);
+test(0x223,0x222);
+test(0x224,0x225);
+test(0x225,0x224);
+test(0x226,0x227);
+test(0x227,0x226);
+test(0x228,0x229);
+test(0x229,0x228);
+test(0x22a,0x22b);
+test(0x22b,0x22a);
+test(0x22c,0x22d);
+test(0x22d,0x22c);
+test(0x22e,0x22f);
+test(0x22f,0x22e);
+test(0x230,0x231);
+test(0x231,0x230);
+test(0x232,0x233);
+test(0x233,0x232);
+test(0x23a,0x2c65);
+test(0x23b,0x23c);
+test(0x23c,0x23b);
+test(0x23d,0x19a);
+test(0x23e,0x2c66);
+test(0x23f,0x2c7e);
+test(0x240,0x2c7f);
+test(0x241,0x242);
+test(0x242,0x241);
+test(0x243,0x180);
+test(0x244,0x289);
+test(0x245,0x28c);
+test(0x246,0x247);
+test(0x247,0x246);
+test(0x248,0x249);
+test(0x249,0x248);
+test(0x24a,0x24b);
+test(0x24b,0x24a);
+test(0x24c,0x24d);
+test(0x24d,0x24c);
+test(0x24e,0x24f);
+test(0x24f,0x24e);
+test(0x250,0x2c6f);
+test(0x251,0x2c6d);
+test(0x252,0x2c70);
+test(0x253,0x181);
+test(0x254,0x186);
+test(0x256,0x189);
+test(0x257,0x18a);
+test(0x259,0x18f);
+test(0x25b,0x190);
+test(0x25c,0xa7ab);
+test(0x260,0x193);
+test(0x261,0xa7ac);
+test(0x263,0x194);
+test(0x265,0xa78d);
+test(0x266,0xa7aa);
+test(0x268,0x197);
+test(0x269,0x196);
+test(0x26b,0x2c62);
+test(0x26c,0xa7ad);
+test(0x26f,0x19c);
+test(0x271,0x2c6e);
+test(0x272,0x19d);
+test(0x275,0x19f);
+test(0x27d,0x2c64);
+test(0x280,0x1a6);
+test(0x283,0x1a9);
+test(0x287,0xa7b1);
+test(0x288,0x1ae);
+test(0x289,0x244);
+test(0x28a,0x1b1);
+test(0x28b,0x1b2);
+test(0x28c,0x245);
+test(0x292,0x1b7);
+test(0x29d,0xa7b2);
+test(0x29e,0xa7b0);
+test(0x345,0x3b9,0x399,0x1fbe);
+test(0x370,0x371);
+test(0x371,0x370);
+test(0x372,0x373);
+test(0x373,0x372);
+test(0x376,0x377);
+test(0x377,0x376);
+test(0x37b,0x3fd);
+test(0x37c,0x3fe);
+test(0x37d,0x3ff);
+test(0x37f,0x3f3);
+test(0x386,0x3ac);
+test(0x388,0x3ad);
+test(0x389,0x3ae);
+test(0x38a,0x3af);
+test(0x38c,0x3cc);
+test(0x38e,0x3cd);
+test(0x38f,0x3ce);
+test(0x391,0x3b1);
+test(0x392,0x3b2,0x3d0);
+test(0x393,0x3b3);
+test(0x394,0x3b4);
+test(0x395,0x3b5,0x3f5);
+test(0x396,0x3b6);
+test(0x397,0x3b7);
+test(0x398,0x3b8,0x3d1,0x3f4);
+test(0x399,0x3b9,0x345,0x1fbe);
+test(0x39a,0x3ba,0x3f0);
+test(0x39b,0x3bb);
+test(0x39c,0x3bc,0xb5);
+test(0x39d,0x3bd);
+test(0x39e,0x3be);
+test(0x39f,0x3bf);
+test(0x3a0,0x3c0,0x3d6);
+test(0x3a1,0x3c1,0x3f1);
+test(0x3a3,0x3c3,0x3c2);
+test(0x3a4,0x3c4);
+test(0x3a5,0x3c5);
+test(0x3a6,0x3c6,0x3d5);
+test(0x3a7,0x3c7);
+test(0x3a8,0x3c8);
+test(0x3a9,0x3c9,0x2126);
+test(0x3aa,0x3ca);
+test(0x3ab,0x3cb);
+test(0x3ac,0x386);
+test(0x3ad,0x388);
+test(0x3ae,0x389);
+test(0x3af,0x38a);
+test(0x3b1,0x391);
+test(0x3b2,0x392,0x3d0);
+test(0x3b3,0x393);
+test(0x3b4,0x394);
+test(0x3b5,0x395,0x3f5);
+test(0x3b6,0x396);
+test(0x3b7,0x397);
+test(0x3b8,0x398,0x3d1,0x3f4);
+test(0x3b9,0x345,0x399,0x1fbe);
+test(0x3ba,0x39a,0x3f0);
+test(0x3bb,0x39b);
+test(0x3bc,0xb5,0x39c);
+test(0x3bd,0x39d);
+test(0x3be,0x39e);
+test(0x3bf,0x39f);
+test(0x3c0,0x3a0,0x3d6);
+test(0x3c1,0x3a1,0x3f1);
+test(0x3c2,0x3c3,0x3a3);
+test(0x3c3,0x3a3,0x3c2);
+test(0x3c4,0x3a4);
+test(0x3c5,0x3a5);
+test(0x3c6,0x3a6,0x3d5);
+test(0x3c7,0x3a7);
+test(0x3c8,0x3a8);
+test(0x3c9,0x3a9,0x2126);
+test(0x3ca,0x3aa);
+test(0x3cb,0x3ab);
+test(0x3cc,0x38c);
+test(0x3cd,0x38e);
+test(0x3ce,0x38f);
+test(0x3cf,0x3d7);
+test(0x3d0,0x3b2,0x392);
+test(0x3d1,0x3b8,0x398,0x3f4);
+test(0x3d5,0x3c6,0x3a6);
+test(0x3d6,0x3c0,0x3a0);
+test(0x3d7,0x3cf);
+test(0x3d8,0x3d9);
+test(0x3d9,0x3d8);
+test(0x3da,0x3db);
+test(0x3db,0x3da);
+test(0x3dc,0x3dd);
+test(0x3dd,0x3dc);
+test(0x3de,0x3df);
+test(0x3df,0x3de);
+test(0x3e0,0x3e1);
+test(0x3e1,0x3e0);
+test(0x3e2,0x3e3);
+test(0x3e3,0x3e2);
+test(0x3e4,0x3e5);
+test(0x3e5,0x3e4);
+test(0x3e6,0x3e7);
+test(0x3e7,0x3e6);
+test(0x3e8,0x3e9);
+test(0x3e9,0x3e8);
+test(0x3ea,0x3eb);
+test(0x3eb,0x3ea);
+test(0x3ec,0x3ed);
+test(0x3ed,0x3ec);
+test(0x3ee,0x3ef);
+test(0x3ef,0x3ee);
+test(0x3f0,0x3ba,0x39a);
+test(0x3f1,0x3c1,0x3a1);
+test(0x3f2,0x3f9);
+test(0x3f3,0x37f);
+test(0x3f4,0x3b8,0x398,0x3d1);
+test(0x3f5,0x3b5,0x395);
+test(0x3f7,0x3f8);
+test(0x3f8,0x3f7);
+test(0x3f9,0x3f2);
+test(0x3fa,0x3fb);
+test(0x3fb,0x3fa);
+test(0x3fd,0x37b);
+test(0x3fe,0x37c);
+test(0x3ff,0x37d);
+test(0x400,0x450);
+test(0x401,0x451);
+test(0x402,0x452);
+test(0x403,0x453);
+test(0x404,0x454);
+test(0x405,0x455);
+test(0x406,0x456);
+test(0x407,0x457);
+test(0x408,0x458);
+test(0x409,0x459);
+test(0x40a,0x45a);
+test(0x40b,0x45b);
+test(0x40c,0x45c);
+test(0x40d,0x45d);
+test(0x40e,0x45e);
+test(0x40f,0x45f);
+test(0x410,0x430);
+test(0x411,0x431);
+test(0x412,0x432);
+test(0x413,0x433);
+test(0x414,0x434);
+test(0x415,0x435);
+test(0x416,0x436);
+test(0x417,0x437);
+test(0x418,0x438);
+test(0x419,0x439);
+test(0x41a,0x43a);
+test(0x41b,0x43b);
+test(0x41c,0x43c);
+test(0x41d,0x43d);
+test(0x41e,0x43e);
+test(0x41f,0x43f);
+test(0x420,0x440);
+test(0x421,0x441);
+test(0x422,0x442);
+test(0x423,0x443);
+test(0x424,0x444);
+test(0x425,0x445);
+test(0x426,0x446);
+test(0x427,0x447);
+test(0x428,0x448);
+test(0x429,0x449);
+test(0x42a,0x44a);
+test(0x42b,0x44b);
+test(0x42c,0x44c);
+test(0x42d,0x44d);
+test(0x42e,0x44e);
+test(0x42f,0x44f);
+test(0x430,0x410);
+test(0x431,0x411);
+test(0x432,0x412);
+test(0x433,0x413);
+test(0x434,0x414);
+test(0x435,0x415);
+test(0x436,0x416);
+test(0x437,0x417);
+test(0x438,0x418);
+test(0x439,0x419);
+test(0x43a,0x41a);
+test(0x43b,0x41b);
+test(0x43c,0x41c);
+test(0x43d,0x41d);
+test(0x43e,0x41e);
+test(0x43f,0x41f);
+test(0x440,0x420);
+test(0x441,0x421);
+test(0x442,0x422);
+test(0x443,0x423);
+test(0x444,0x424);
+test(0x445,0x425);
+test(0x446,0x426);
+test(0x447,0x427);
+test(0x448,0x428);
+test(0x449,0x429);
+test(0x44a,0x42a);
+test(0x44b,0x42b);
+test(0x44c,0x42c);
+test(0x44d,0x42d);
+test(0x44e,0x42e);
+test(0x44f,0x42f);
+test(0x450,0x400);
+test(0x451,0x401);
+test(0x452,0x402);
+test(0x453,0x403);
+test(0x454,0x404);
+test(0x455,0x405);
+test(0x456,0x406);
+test(0x457,0x407);
+test(0x458,0x408);
+test(0x459,0x409);
+test(0x45a,0x40a);
+test(0x45b,0x40b);
+test(0x45c,0x40c);
+test(0x45d,0x40d);
+test(0x45e,0x40e);
+test(0x45f,0x40f);
+test(0x460,0x461);
+test(0x461,0x460);
+test(0x462,0x463);
+test(0x463,0x462);
+test(0x464,0x465);
+test(0x465,0x464);
+test(0x466,0x467);
+test(0x467,0x466);
+test(0x468,0x469);
+test(0x469,0x468);
+test(0x46a,0x46b);
+test(0x46b,0x46a);
+test(0x46c,0x46d);
+test(0x46d,0x46c);
+test(0x46e,0x46f);
+test(0x46f,0x46e);
+test(0x470,0x471);
+test(0x471,0x470);
+test(0x472,0x473);
+test(0x473,0x472);
+test(0x474,0x475);
+test(0x475,0x474);
+test(0x476,0x477);
+test(0x477,0x476);
+test(0x478,0x479);
+test(0x479,0x478);
+test(0x47a,0x47b);
+test(0x47b,0x47a);
+test(0x47c,0x47d);
+test(0x47d,0x47c);
+test(0x47e,0x47f);
+test(0x47f,0x47e);
+test(0x480,0x481);
+test(0x481,0x480);
+test(0x48a,0x48b);
+test(0x48b,0x48a);
+test(0x48c,0x48d);
+test(0x48d,0x48c);
+test(0x48e,0x48f);
+test(0x48f,0x48e);
+test(0x490,0x491);
+test(0x491,0x490);
+test(0x492,0x493);
+test(0x493,0x492);
+test(0x494,0x495);
+test(0x495,0x494);
+test(0x496,0x497);
+test(0x497,0x496);
+test(0x498,0x499);
+test(0x499,0x498);
+test(0x49a,0x49b);
+test(0x49b,0x49a);
+test(0x49c,0x49d);
+test(0x49d,0x49c);
+test(0x49e,0x49f);
+test(0x49f,0x49e);
+test(0x4a0,0x4a1);
+test(0x4a1,0x4a0);
+test(0x4a2,0x4a3);
+test(0x4a3,0x4a2);
+test(0x4a4,0x4a5);
+test(0x4a5,0x4a4);
+test(0x4a6,0x4a7);
+test(0x4a7,0x4a6);
+test(0x4a8,0x4a9);
+test(0x4a9,0x4a8);
+test(0x4aa,0x4ab);
+test(0x4ab,0x4aa);
+test(0x4ac,0x4ad);
+test(0x4ad,0x4ac);
+test(0x4ae,0x4af);
+test(0x4af,0x4ae);
+test(0x4b0,0x4b1);
+test(0x4b1,0x4b0);
+test(0x4b2,0x4b3);
+test(0x4b3,0x4b2);
+test(0x4b4,0x4b5);
+test(0x4b5,0x4b4);
+test(0x4b6,0x4b7);
+test(0x4b7,0x4b6);
+test(0x4b8,0x4b9);
+test(0x4b9,0x4b8);
+test(0x4ba,0x4bb);
+test(0x4bb,0x4ba);
+test(0x4bc,0x4bd);
+test(0x4bd,0x4bc);
+test(0x4be,0x4bf);
+test(0x4bf,0x4be);
+test(0x4c0,0x4cf);
+test(0x4c1,0x4c2);
+test(0x4c2,0x4c1);
+test(0x4c3,0x4c4);
+test(0x4c4,0x4c3);
+test(0x4c5,0x4c6);
+test(0x4c6,0x4c5);
+test(0x4c7,0x4c8);
+test(0x4c8,0x4c7);
+test(0x4c9,0x4ca);
+test(0x4ca,0x4c9);
+test(0x4cb,0x4cc);
+test(0x4cc,0x4cb);
+test(0x4cd,0x4ce);
+test(0x4ce,0x4cd);
+test(0x4cf,0x4c0);
+test(0x4d0,0x4d1);
+test(0x4d1,0x4d0);
+test(0x4d2,0x4d3);
+test(0x4d3,0x4d2);
+test(0x4d4,0x4d5);
+test(0x4d5,0x4d4);
+test(0x4d6,0x4d7);
+test(0x4d7,0x4d6);
+test(0x4d8,0x4d9);
+test(0x4d9,0x4d8);
+test(0x4da,0x4db);
+test(0x4db,0x4da);
+test(0x4dc,0x4dd);
+test(0x4dd,0x4dc);
+test(0x4de,0x4df);
+test(0x4df,0x4de);
+test(0x4e0,0x4e1);
+test(0x4e1,0x4e0);
+test(0x4e2,0x4e3);
+test(0x4e3,0x4e2);
+test(0x4e4,0x4e5);
+test(0x4e5,0x4e4);
+test(0x4e6,0x4e7);
+test(0x4e7,0x4e6);
+test(0x4e8,0x4e9);
+test(0x4e9,0x4e8);
+test(0x4ea,0x4eb);
+test(0x4eb,0x4ea);
+test(0x4ec,0x4ed);
+test(0x4ed,0x4ec);
+test(0x4ee,0x4ef);
+test(0x4ef,0x4ee);
+test(0x4f0,0x4f1);
+test(0x4f1,0x4f0);
+test(0x4f2,0x4f3);
+test(0x4f3,0x4f2);
+test(0x4f4,0x4f5);
+test(0x4f5,0x4f4);
+test(0x4f6,0x4f7);
+test(0x4f7,0x4f6);
+test(0x4f8,0x4f9);
+test(0x4f9,0x4f8);
+test(0x4fa,0x4fb);
+test(0x4fb,0x4fa);
+test(0x4fc,0x4fd);
+test(0x4fd,0x4fc);
+test(0x4fe,0x4ff);
+test(0x4ff,0x4fe);
+test(0x500,0x501);
+test(0x501,0x500);
+test(0x502,0x503);
+test(0x503,0x502);
+test(0x504,0x505);
+test(0x505,0x504);
+test(0x506,0x507);
+test(0x507,0x506);
+test(0x508,0x509);
+test(0x509,0x508);
+test(0x50a,0x50b);
+test(0x50b,0x50a);
+test(0x50c,0x50d);
+test(0x50d,0x50c);
+test(0x50e,0x50f);
+test(0x50f,0x50e);
+test(0x510,0x511);
+test(0x511,0x510);
+test(0x512,0x513);
+test(0x513,0x512);
+test(0x514,0x515);
+test(0x515,0x514);
+test(0x516,0x517);
+test(0x517,0x516);
+test(0x518,0x519);
+test(0x519,0x518);
+test(0x51a,0x51b);
+test(0x51b,0x51a);
+test(0x51c,0x51d);
+test(0x51d,0x51c);
+test(0x51e,0x51f);
+test(0x51f,0x51e);
+test(0x520,0x521);
+test(0x521,0x520);
+test(0x522,0x523);
+test(0x523,0x522);
+test(0x524,0x525);
+test(0x525,0x524);
+test(0x526,0x527);
+test(0x527,0x526);
+test(0x528,0x529);
+test(0x529,0x528);
+test(0x52a,0x52b);
+test(0x52b,0x52a);
+test(0x52c,0x52d);
+test(0x52d,0x52c);
+test(0x52e,0x52f);
+test(0x52f,0x52e);
+test(0x531,0x561);
+test(0x532,0x562);
+test(0x533,0x563);
+test(0x534,0x564);
+test(0x535,0x565);
+test(0x536,0x566);
+test(0x537,0x567);
+test(0x538,0x568);
+test(0x539,0x569);
+test(0x53a,0x56a);
+test(0x53b,0x56b);
+test(0x53c,0x56c);
+test(0x53d,0x56d);
+test(0x53e,0x56e);
+test(0x53f,0x56f);
+test(0x540,0x570);
+test(0x541,0x571);
+test(0x542,0x572);
+test(0x543,0x573);
+test(0x544,0x574);
+test(0x545,0x575);
+test(0x546,0x576);
+test(0x547,0x577);
+test(0x548,0x578);
+test(0x549,0x579);
+test(0x54a,0x57a);
+test(0x54b,0x57b);
+test(0x54c,0x57c);
+test(0x54d,0x57d);
+test(0x54e,0x57e);
+test(0x54f,0x57f);
+test(0x550,0x580);
+test(0x551,0x581);
+test(0x552,0x582);
+test(0x553,0x583);
+test(0x554,0x584);
+test(0x555,0x585);
+test(0x556,0x586);
+test(0x561,0x531);
+test(0x562,0x532);
+test(0x563,0x533);
+test(0x564,0x534);
+test(0x565,0x535);
+test(0x566,0x536);
+test(0x567,0x537);
+test(0x568,0x538);
+test(0x569,0x539);
+test(0x56a,0x53a);
+test(0x56b,0x53b);
+test(0x56c,0x53c);
+test(0x56d,0x53d);
+test(0x56e,0x53e);
+test(0x56f,0x53f);
+test(0x570,0x540);
+test(0x571,0x541);
+test(0x572,0x542);
+test(0x573,0x543);
+test(0x574,0x544);
+test(0x575,0x545);
+test(0x576,0x546);
+test(0x577,0x547);
+test(0x578,0x548);
+test(0x579,0x549);
+test(0x57a,0x54a);
+test(0x57b,0x54b);
+test(0x57c,0x54c);
+test(0x57d,0x54d);
+test(0x57e,0x54e);
+test(0x57f,0x54f);
+test(0x580,0x550);
+test(0x581,0x551);
+test(0x582,0x552);
+test(0x583,0x553);
+test(0x584,0x554);
+test(0x585,0x555);
+test(0x586,0x556);
+test(0x10a0,0x2d00);
+test(0x10a1,0x2d01);
+test(0x10a2,0x2d02);
+test(0x10a3,0x2d03);
+test(0x10a4,0x2d04);
+test(0x10a5,0x2d05);
+test(0x10a6,0x2d06);
+test(0x10a7,0x2d07);
+test(0x10a8,0x2d08);
+test(0x10a9,0x2d09);
+test(0x10aa,0x2d0a);
+test(0x10ab,0x2d0b);
+test(0x10ac,0x2d0c);
+test(0x10ad,0x2d0d);
+test(0x10ae,0x2d0e);
+test(0x10af,0x2d0f);
+test(0x10b0,0x2d10);
+test(0x10b1,0x2d11);
+test(0x10b2,0x2d12);
+test(0x10b3,0x2d13);
+test(0x10b4,0x2d14);
+test(0x10b5,0x2d15);
+test(0x10b6,0x2d16);
+test(0x10b7,0x2d17);
+test(0x10b8,0x2d18);
+test(0x10b9,0x2d19);
+test(0x10ba,0x2d1a);
+test(0x10bb,0x2d1b);
+test(0x10bc,0x2d1c);
+test(0x10bd,0x2d1d);
+test(0x10be,0x2d1e);
+test(0x10bf,0x2d1f);
+test(0x10c0,0x2d20);
+test(0x10c1,0x2d21);
+test(0x10c2,0x2d22);
+test(0x10c3,0x2d23);
+test(0x10c4,0x2d24);
+test(0x10c5,0x2d25);
+test(0x10c7,0x2d27);
+test(0x10cd,0x2d2d);
+test(0x13a0,0xab70);
+test(0x13a1,0xab71);
+test(0x13a2,0xab72);
+test(0x13a3,0xab73);
+test(0x13a4,0xab74);
+test(0x13a5,0xab75);
+test(0x13a6,0xab76);
+test(0x13a7,0xab77);
+test(0x13a8,0xab78);
+test(0x13a9,0xab79);
+test(0x13aa,0xab7a);
+test(0x13ab,0xab7b);
+test(0x13ac,0xab7c);
+test(0x13ad,0xab7d);
+test(0x13ae,0xab7e);
+test(0x13af,0xab7f);
+test(0x13b0,0xab80);
+test(0x13b1,0xab81);
+test(0x13b2,0xab82);
+test(0x13b3,0xab83);
+test(0x13b4,0xab84);
+test(0x13b5,0xab85);
+test(0x13b6,0xab86);
+test(0x13b7,0xab87);
+test(0x13b8,0xab88);
+test(0x13b9,0xab89);
+test(0x13ba,0xab8a);
+test(0x13bb,0xab8b);
+test(0x13bc,0xab8c);
+test(0x13bd,0xab8d);
+test(0x13be,0xab8e);
+test(0x13bf,0xab8f);
+test(0x13c0,0xab90);
+test(0x13c1,0xab91);
+test(0x13c2,0xab92);
+test(0x13c3,0xab93);
+test(0x13c4,0xab94);
+test(0x13c5,0xab95);
+test(0x13c6,0xab96);
+test(0x13c7,0xab97);
+test(0x13c8,0xab98);
+test(0x13c9,0xab99);
+test(0x13ca,0xab9a);
+test(0x13cb,0xab9b);
+test(0x13cc,0xab9c);
+test(0x13cd,0xab9d);
+test(0x13ce,0xab9e);
+test(0x13cf,0xab9f);
+test(0x13d0,0xaba0);
+test(0x13d1,0xaba1);
+test(0x13d2,0xaba2);
+test(0x13d3,0xaba3);
+test(0x13d4,0xaba4);
+test(0x13d5,0xaba5);
+test(0x13d6,0xaba6);
+test(0x13d7,0xaba7);
+test(0x13d8,0xaba8);
+test(0x13d9,0xaba9);
+test(0x13da,0xabaa);
+test(0x13db,0xabab);
+test(0x13dc,0xabac);
+test(0x13dd,0xabad);
+test(0x13de,0xabae);
+test(0x13df,0xabaf);
+test(0x13e0,0xabb0);
+test(0x13e1,0xabb1);
+test(0x13e2,0xabb2);
+test(0x13e3,0xabb3);
+test(0x13e4,0xabb4);
+test(0x13e5,0xabb5);
+test(0x13e6,0xabb6);
+test(0x13e7,0xabb7);
+test(0x13e8,0xabb8);
+test(0x13e9,0xabb9);
+test(0x13ea,0xabba);
+test(0x13eb,0xabbb);
+test(0x13ec,0xabbc);
+test(0x13ed,0xabbd);
+test(0x13ee,0xabbe);
+test(0x13ef,0xabbf);
+test(0x13f0,0x13f8);
+test(0x13f1,0x13f9);
+test(0x13f2,0x13fa);
+test(0x13f3,0x13fb);
+test(0x13f4,0x13fc);
+test(0x13f5,0x13fd);
+test(0x13f8,0x13f0);
+test(0x13f9,0x13f1);
+test(0x13fa,0x13f2);
+test(0x13fb,0x13f3);
+test(0x13fc,0x13f4);
+test(0x13fd,0x13f5);
+test(0x1d79,0xa77d);
+test(0x1d7d,0x2c63);
+test(0x1e00,0x1e01);
+test(0x1e01,0x1e00);
+test(0x1e02,0x1e03);
+test(0x1e03,0x1e02);
+test(0x1e04,0x1e05);
+test(0x1e05,0x1e04);
+test(0x1e06,0x1e07);
+test(0x1e07,0x1e06);
+test(0x1e08,0x1e09);
+test(0x1e09,0x1e08);
+test(0x1e0a,0x1e0b);
+test(0x1e0b,0x1e0a);
+test(0x1e0c,0x1e0d);
+test(0x1e0d,0x1e0c);
+test(0x1e0e,0x1e0f);
+test(0x1e0f,0x1e0e);
+test(0x1e10,0x1e11);
+test(0x1e11,0x1e10);
+test(0x1e12,0x1e13);
+test(0x1e13,0x1e12);
+test(0x1e14,0x1e15);
+test(0x1e15,0x1e14);
+test(0x1e16,0x1e17);
+test(0x1e17,0x1e16);
+test(0x1e18,0x1e19);
+test(0x1e19,0x1e18);
+test(0x1e1a,0x1e1b);
+test(0x1e1b,0x1e1a);
+test(0x1e1c,0x1e1d);
+test(0x1e1d,0x1e1c);
+test(0x1e1e,0x1e1f);
+test(0x1e1f,0x1e1e);
+test(0x1e20,0x1e21);
+test(0x1e21,0x1e20);
+test(0x1e22,0x1e23);
+test(0x1e23,0x1e22);
+test(0x1e24,0x1e25);
+test(0x1e25,0x1e24);
+test(0x1e26,0x1e27);
+test(0x1e27,0x1e26);
+test(0x1e28,0x1e29);
+test(0x1e29,0x1e28);
+test(0x1e2a,0x1e2b);
+test(0x1e2b,0x1e2a);
+test(0x1e2c,0x1e2d);
+test(0x1e2d,0x1e2c);
+test(0x1e2e,0x1e2f);
+test(0x1e2f,0x1e2e);
+test(0x1e30,0x1e31);
+test(0x1e31,0x1e30);
+test(0x1e32,0x1e33);
+test(0x1e33,0x1e32);
+test(0x1e34,0x1e35);
+test(0x1e35,0x1e34);
+test(0x1e36,0x1e37);
+test(0x1e37,0x1e36);
+test(0x1e38,0x1e39);
+test(0x1e39,0x1e38);
+test(0x1e3a,0x1e3b);
+test(0x1e3b,0x1e3a);
+test(0x1e3c,0x1e3d);
+test(0x1e3d,0x1e3c);
+test(0x1e3e,0x1e3f);
+test(0x1e3f,0x1e3e);
+test(0x1e40,0x1e41);
+test(0x1e41,0x1e40);
+test(0x1e42,0x1e43);
+test(0x1e43,0x1e42);
+test(0x1e44,0x1e45);
+test(0x1e45,0x1e44);
+test(0x1e46,0x1e47);
+test(0x1e47,0x1e46);
+test(0x1e48,0x1e49);
+test(0x1e49,0x1e48);
+test(0x1e4a,0x1e4b);
+test(0x1e4b,0x1e4a);
+test(0x1e4c,0x1e4d);
+test(0x1e4d,0x1e4c);
+test(0x1e4e,0x1e4f);
+test(0x1e4f,0x1e4e);
+test(0x1e50,0x1e51);
+test(0x1e51,0x1e50);
+test(0x1e52,0x1e53);
+test(0x1e53,0x1e52);
+test(0x1e54,0x1e55);
+test(0x1e55,0x1e54);
+test(0x1e56,0x1e57);
+test(0x1e57,0x1e56);
+test(0x1e58,0x1e59);
+test(0x1e59,0x1e58);
+test(0x1e5a,0x1e5b);
+test(0x1e5b,0x1e5a);
+test(0x1e5c,0x1e5d);
+test(0x1e5d,0x1e5c);
+test(0x1e5e,0x1e5f);
+test(0x1e5f,0x1e5e);
+test(0x1e60,0x1e61,0x1e9b);
+test(0x1e61,0x1e60,0x1e9b);
+test(0x1e62,0x1e63);
+test(0x1e63,0x1e62);
+test(0x1e64,0x1e65);
+test(0x1e65,0x1e64);
+test(0x1e66,0x1e67);
+test(0x1e67,0x1e66);
+test(0x1e68,0x1e69);
+test(0x1e69,0x1e68);
+test(0x1e6a,0x1e6b);
+test(0x1e6b,0x1e6a);
+test(0x1e6c,0x1e6d);
+test(0x1e6d,0x1e6c);
+test(0x1e6e,0x1e6f);
+test(0x1e6f,0x1e6e);
+test(0x1e70,0x1e71);
+test(0x1e71,0x1e70);
+test(0x1e72,0x1e73);
+test(0x1e73,0x1e72);
+test(0x1e74,0x1e75);
+test(0x1e75,0x1e74);
+test(0x1e76,0x1e77);
+test(0x1e77,0x1e76);
+test(0x1e78,0x1e79);
+test(0x1e79,0x1e78);
+test(0x1e7a,0x1e7b);
+test(0x1e7b,0x1e7a);
+test(0x1e7c,0x1e7d);
+test(0x1e7d,0x1e7c);
+test(0x1e7e,0x1e7f);
+test(0x1e7f,0x1e7e);
+test(0x1e80,0x1e81);
+test(0x1e81,0x1e80);
+test(0x1e82,0x1e83);
+test(0x1e83,0x1e82);
+test(0x1e84,0x1e85);
+test(0x1e85,0x1e84);
+test(0x1e86,0x1e87);
+test(0x1e87,0x1e86);
+test(0x1e88,0x1e89);
+test(0x1e89,0x1e88);
+test(0x1e8a,0x1e8b);
+test(0x1e8b,0x1e8a);
+test(0x1e8c,0x1e8d);
+test(0x1e8d,0x1e8c);
+test(0x1e8e,0x1e8f);
+test(0x1e8f,0x1e8e);
+test(0x1e90,0x1e91);
+test(0x1e91,0x1e90);
+test(0x1e92,0x1e93);
+test(0x1e93,0x1e92);
+test(0x1e94,0x1e95);
+test(0x1e95,0x1e94);
+test(0x1e9b,0x1e61,0x1e60);
+test(0x1e9e,0xdf);
+test(0x1ea0,0x1ea1);
+test(0x1ea1,0x1ea0);
+test(0x1ea2,0x1ea3);
+test(0x1ea3,0x1ea2);
+test(0x1ea4,0x1ea5);
+test(0x1ea5,0x1ea4);
+test(0x1ea6,0x1ea7);
+test(0x1ea7,0x1ea6);
+test(0x1ea8,0x1ea9);
+test(0x1ea9,0x1ea8);
+test(0x1eaa,0x1eab);
+test(0x1eab,0x1eaa);
+test(0x1eac,0x1ead);
+test(0x1ead,0x1eac);
+test(0x1eae,0x1eaf);
+test(0x1eaf,0x1eae);
+test(0x1eb0,0x1eb1);
+test(0x1eb1,0x1eb0);
+test(0x1eb2,0x1eb3);
+test(0x1eb3,0x1eb2);
+test(0x1eb4,0x1eb5);
+test(0x1eb5,0x1eb4);
+test(0x1eb6,0x1eb7);
+test(0x1eb7,0x1eb6);
+test(0x1eb8,0x1eb9);
+test(0x1eb9,0x1eb8);
+test(0x1eba,0x1ebb);
+test(0x1ebb,0x1eba);
+test(0x1ebc,0x1ebd);
+test(0x1ebd,0x1ebc);
+test(0x1ebe,0x1ebf);
+test(0x1ebf,0x1ebe);
+test(0x1ec0,0x1ec1);
+test(0x1ec1,0x1ec0);
+test(0x1ec2,0x1ec3);
+test(0x1ec3,0x1ec2);
+test(0x1ec4,0x1ec5);
+test(0x1ec5,0x1ec4);
+test(0x1ec6,0x1ec7);
+test(0x1ec7,0x1ec6);
+test(0x1ec8,0x1ec9);
+test(0x1ec9,0x1ec8);
+test(0x1eca,0x1ecb);
+test(0x1ecb,0x1eca);
+test(0x1ecc,0x1ecd);
+test(0x1ecd,0x1ecc);
+test(0x1ece,0x1ecf);
+test(0x1ecf,0x1ece);
+test(0x1ed0,0x1ed1);
+test(0x1ed1,0x1ed0);
+test(0x1ed2,0x1ed3);
+test(0x1ed3,0x1ed2);
+test(0x1ed4,0x1ed5);
+test(0x1ed5,0x1ed4);
+test(0x1ed6,0x1ed7);
+test(0x1ed7,0x1ed6);
+test(0x1ed8,0x1ed9);
+test(0x1ed9,0x1ed8);
+test(0x1eda,0x1edb);
+test(0x1edb,0x1eda);
+test(0x1edc,0x1edd);
+test(0x1edd,0x1edc);
+test(0x1ede,0x1edf);
+test(0x1edf,0x1ede);
+test(0x1ee0,0x1ee1);
+test(0x1ee1,0x1ee0);
+test(0x1ee2,0x1ee3);
+test(0x1ee3,0x1ee2);
+test(0x1ee4,0x1ee5);
+test(0x1ee5,0x1ee4);
+test(0x1ee6,0x1ee7);
+test(0x1ee7,0x1ee6);
+test(0x1ee8,0x1ee9);
+test(0x1ee9,0x1ee8);
+test(0x1eea,0x1eeb);
+test(0x1eeb,0x1eea);
+test(0x1eec,0x1eed);
+test(0x1eed,0x1eec);
+test(0x1eee,0x1eef);
+test(0x1eef,0x1eee);
+test(0x1ef0,0x1ef1);
+test(0x1ef1,0x1ef0);
+test(0x1ef2,0x1ef3);
+test(0x1ef3,0x1ef2);
+test(0x1ef4,0x1ef5);
+test(0x1ef5,0x1ef4);
+test(0x1ef6,0x1ef7);
+test(0x1ef7,0x1ef6);
+test(0x1ef8,0x1ef9);
+test(0x1ef9,0x1ef8);
+test(0x1efa,0x1efb);
+test(0x1efb,0x1efa);
+test(0x1efc,0x1efd);
+test(0x1efd,0x1efc);
+test(0x1efe,0x1eff);
+test(0x1eff,0x1efe);
+test(0x1f00,0x1f08);
+test(0x1f01,0x1f09);
+test(0x1f02,0x1f0a);
+test(0x1f03,0x1f0b);
+test(0x1f04,0x1f0c);
+test(0x1f05,0x1f0d);
+test(0x1f06,0x1f0e);
+test(0x1f07,0x1f0f);
+test(0x1f08,0x1f00);
+test(0x1f09,0x1f01);
+test(0x1f0a,0x1f02);
+test(0x1f0b,0x1f03);
+test(0x1f0c,0x1f04);
+test(0x1f0d,0x1f05);
+test(0x1f0e,0x1f06);
+test(0x1f0f,0x1f07);
+test(0x1f10,0x1f18);
+test(0x1f11,0x1f19);
+test(0x1f12,0x1f1a);
+test(0x1f13,0x1f1b);
+test(0x1f14,0x1f1c);
+test(0x1f15,0x1f1d);
+test(0x1f18,0x1f10);
+test(0x1f19,0x1f11);
+test(0x1f1a,0x1f12);
+test(0x1f1b,0x1f13);
+test(0x1f1c,0x1f14);
+test(0x1f1d,0x1f15);
+test(0x1f20,0x1f28);
+test(0x1f21,0x1f29);
+test(0x1f22,0x1f2a);
+test(0x1f23,0x1f2b);
+test(0x1f24,0x1f2c);
+test(0x1f25,0x1f2d);
+test(0x1f26,0x1f2e);
+test(0x1f27,0x1f2f);
+test(0x1f28,0x1f20);
+test(0x1f29,0x1f21);
+test(0x1f2a,0x1f22);
+test(0x1f2b,0x1f23);
+test(0x1f2c,0x1f24);
+test(0x1f2d,0x1f25);
+test(0x1f2e,0x1f26);
+test(0x1f2f,0x1f27);
+test(0x1f30,0x1f38);
+test(0x1f31,0x1f39);
+test(0x1f32,0x1f3a);
+test(0x1f33,0x1f3b);
+test(0x1f34,0x1f3c);
+test(0x1f35,0x1f3d);
+test(0x1f36,0x1f3e);
+test(0x1f37,0x1f3f);
+test(0x1f38,0x1f30);
+test(0x1f39,0x1f31);
+test(0x1f3a,0x1f32);
+test(0x1f3b,0x1f33);
+test(0x1f3c,0x1f34);
+test(0x1f3d,0x1f35);
+test(0x1f3e,0x1f36);
+test(0x1f3f,0x1f37);
+test(0x1f40,0x1f48);
+test(0x1f41,0x1f49);
+test(0x1f42,0x1f4a);
+test(0x1f43,0x1f4b);
+test(0x1f44,0x1f4c);
+test(0x1f45,0x1f4d);
+test(0x1f48,0x1f40);
+test(0x1f49,0x1f41);
+test(0x1f4a,0x1f42);
+test(0x1f4b,0x1f43);
+test(0x1f4c,0x1f44);
+test(0x1f4d,0x1f45);
+test(0x1f51,0x1f59);
+test(0x1f53,0x1f5b);
+test(0x1f55,0x1f5d);
+test(0x1f57,0x1f5f);
+test(0x1f59,0x1f51);
+test(0x1f5b,0x1f53);
+test(0x1f5d,0x1f55);
+test(0x1f5f,0x1f57);
+test(0x1f60,0x1f68);
+test(0x1f61,0x1f69);
+test(0x1f62,0x1f6a);
+test(0x1f63,0x1f6b);
+test(0x1f64,0x1f6c);
+test(0x1f65,0x1f6d);
+test(0x1f66,0x1f6e);
+test(0x1f67,0x1f6f);
+test(0x1f68,0x1f60);
+test(0x1f69,0x1f61);
+test(0x1f6a,0x1f62);
+test(0x1f6b,0x1f63);
+test(0x1f6c,0x1f64);
+test(0x1f6d,0x1f65);
+test(0x1f6e,0x1f66);
+test(0x1f6f,0x1f67);
+test(0x1f70,0x1fba);
+test(0x1f71,0x1fbb);
+test(0x1f72,0x1fc8);
+test(0x1f73,0x1fc9);
+test(0x1f74,0x1fca);
+test(0x1f75,0x1fcb);
+test(0x1f76,0x1fda);
+test(0x1f77,0x1fdb);
+test(0x1f78,0x1ff8);
+test(0x1f79,0x1ff9);
+test(0x1f7a,0x1fea);
+test(0x1f7b,0x1feb);
+test(0x1f7c,0x1ffa);
+test(0x1f7d,0x1ffb);
+test(0x1f80,0x1f88);
+test(0x1f81,0x1f89);
+test(0x1f82,0x1f8a);
+test(0x1f83,0x1f8b);
+test(0x1f84,0x1f8c);
+test(0x1f85,0x1f8d);
+test(0x1f86,0x1f8e);
+test(0x1f87,0x1f8f);
+test(0x1f88,0x1f80);
+test(0x1f89,0x1f81);
+test(0x1f8a,0x1f82);
+test(0x1f8b,0x1f83);
+test(0x1f8c,0x1f84);
+test(0x1f8d,0x1f85);
+test(0x1f8e,0x1f86);
+test(0x1f8f,0x1f87);
+test(0x1f90,0x1f98);
+test(0x1f91,0x1f99);
+test(0x1f92,0x1f9a);
+test(0x1f93,0x1f9b);
+test(0x1f94,0x1f9c);
+test(0x1f95,0x1f9d);
+test(0x1f96,0x1f9e);
+test(0x1f97,0x1f9f);
+test(0x1f98,0x1f90);
+test(0x1f99,0x1f91);
+test(0x1f9a,0x1f92);
+test(0x1f9b,0x1f93);
+test(0x1f9c,0x1f94);
+test(0x1f9d,0x1f95);
+test(0x1f9e,0x1f96);
+test(0x1f9f,0x1f97);
+test(0x1fa0,0x1fa8);
+test(0x1fa1,0x1fa9);
+test(0x1fa2,0x1faa);
+test(0x1fa3,0x1fab);
+test(0x1fa4,0x1fac);
+test(0x1fa5,0x1fad);
+test(0x1fa6,0x1fae);
+test(0x1fa7,0x1faf);
+test(0x1fa8,0x1fa0);
+test(0x1fa9,0x1fa1);
+test(0x1faa,0x1fa2);
+test(0x1fab,0x1fa3);
+test(0x1fac,0x1fa4);
+test(0x1fad,0x1fa5);
+test(0x1fae,0x1fa6);
+test(0x1faf,0x1fa7);
+test(0x1fb0,0x1fb8);
+test(0x1fb1,0x1fb9);
+test(0x1fb3,0x1fbc);
+test(0x1fb8,0x1fb0);
+test(0x1fb9,0x1fb1);
+test(0x1fba,0x1f70);
+test(0x1fbb,0x1f71);
+test(0x1fbc,0x1fb3);
+test(0x1fbe,0x3b9,0x345,0x399);
+test(0x1fc3,0x1fcc);
+test(0x1fc8,0x1f72);
+test(0x1fc9,0x1f73);
+test(0x1fca,0x1f74);
+test(0x1fcb,0x1f75);
+test(0x1fcc,0x1fc3);
+test(0x1fd0,0x1fd8);
+test(0x1fd1,0x1fd9);
+test(0x1fd8,0x1fd0);
+test(0x1fd9,0x1fd1);
+test(0x1fda,0x1f76);
+test(0x1fdb,0x1f77);
+test(0x1fe0,0x1fe8);
+test(0x1fe1,0x1fe9);
+test(0x1fe5,0x1fec);
+test(0x1fe8,0x1fe0);
+test(0x1fe9,0x1fe1);
+test(0x1fea,0x1f7a);
+test(0x1feb,0x1f7b);
+test(0x1fec,0x1fe5);
+test(0x1ff3,0x1ffc);
+test(0x1ff8,0x1f78);
+test(0x1ff9,0x1f79);
+test(0x1ffa,0x1f7c);
+test(0x1ffb,0x1f7d);
+test(0x1ffc,0x1ff3);
+test(0x2126,0x3c9,0x3a9);
+test(0x212a,0x6b,0x4b);
+test(0x212b,0xe5,0xc5);
+test(0x2132,0x214e);
+test(0x214e,0x2132);
+test(0x2160,0x2170);
+test(0x2161,0x2171);
+test(0x2162,0x2172);
+test(0x2163,0x2173);
+test(0x2164,0x2174);
+test(0x2165,0x2175);
+test(0x2166,0x2176);
+test(0x2167,0x2177);
+test(0x2168,0x2178);
+test(0x2169,0x2179);
+test(0x216a,0x217a);
+test(0x216b,0x217b);
+test(0x216c,0x217c);
+test(0x216d,0x217d);
+test(0x216e,0x217e);
+test(0x216f,0x217f);
+test(0x2170,0x2160);
+test(0x2171,0x2161);
+test(0x2172,0x2162);
+test(0x2173,0x2163);
+test(0x2174,0x2164);
+test(0x2175,0x2165);
+test(0x2176,0x2166);
+test(0x2177,0x2167);
+test(0x2178,0x2168);
+test(0x2179,0x2169);
+test(0x217a,0x216a);
+test(0x217b,0x216b);
+test(0x217c,0x216c);
+test(0x217d,0x216d);
+test(0x217e,0x216e);
+test(0x217f,0x216f);
+test(0x2183,0x2184);
+test(0x2184,0x2183);
+test(0x24b6,0x24d0);
+test(0x24b7,0x24d1);
+test(0x24b8,0x24d2);
+test(0x24b9,0x24d3);
+test(0x24ba,0x24d4);
+test(0x24bb,0x24d5);
+test(0x24bc,0x24d6);
+test(0x24bd,0x24d7);
+test(0x24be,0x24d8);
+test(0x24bf,0x24d9);
+test(0x24c0,0x24da);
+test(0x24c1,0x24db);
+test(0x24c2,0x24dc);
+test(0x24c3,0x24dd);
+test(0x24c4,0x24de);
+test(0x24c5,0x24df);
+test(0x24c6,0x24e0);
+test(0x24c7,0x24e1);
+test(0x24c8,0x24e2);
+test(0x24c9,0x24e3);
+test(0x24ca,0x24e4);
+test(0x24cb,0x24e5);
+test(0x24cc,0x24e6);
+test(0x24cd,0x24e7);
+test(0x24ce,0x24e8);
+test(0x24cf,0x24e9);
+test(0x24d0,0x24b6);
+test(0x24d1,0x24b7);
+test(0x24d2,0x24b8);
+test(0x24d3,0x24b9);
+test(0x24d4,0x24ba);
+test(0x24d5,0x24bb);
+test(0x24d6,0x24bc);
+test(0x24d7,0x24bd);
+test(0x24d8,0x24be);
+test(0x24d9,0x24bf);
+test(0x24da,0x24c0);
+test(0x24db,0x24c1);
+test(0x24dc,0x24c2);
+test(0x24dd,0x24c3);
+test(0x24de,0x24c4);
+test(0x24df,0x24c5);
+test(0x24e0,0x24c6);
+test(0x24e1,0x24c7);
+test(0x24e2,0x24c8);
+test(0x24e3,0x24c9);
+test(0x24e4,0x24ca);
+test(0x24e5,0x24cb);
+test(0x24e6,0x24cc);
+test(0x24e7,0x24cd);
+test(0x24e8,0x24ce);
+test(0x24e9,0x24cf);
+test(0x2c00,0x2c30);
+test(0x2c01,0x2c31);
+test(0x2c02,0x2c32);
+test(0x2c03,0x2c33);
+test(0x2c04,0x2c34);
+test(0x2c05,0x2c35);
+test(0x2c06,0x2c36);
+test(0x2c07,0x2c37);
+test(0x2c08,0x2c38);
+test(0x2c09,0x2c39);
+test(0x2c0a,0x2c3a);
+test(0x2c0b,0x2c3b);
+test(0x2c0c,0x2c3c);
+test(0x2c0d,0x2c3d);
+test(0x2c0e,0x2c3e);
+test(0x2c0f,0x2c3f);
+test(0x2c10,0x2c40);
+test(0x2c11,0x2c41);
+test(0x2c12,0x2c42);
+test(0x2c13,0x2c43);
+test(0x2c14,0x2c44);
+test(0x2c15,0x2c45);
+test(0x2c16,0x2c46);
+test(0x2c17,0x2c47);
+test(0x2c18,0x2c48);
+test(0x2c19,0x2c49);
+test(0x2c1a,0x2c4a);
+test(0x2c1b,0x2c4b);
+test(0x2c1c,0x2c4c);
+test(0x2c1d,0x2c4d);
+test(0x2c1e,0x2c4e);
+test(0x2c1f,0x2c4f);
+test(0x2c20,0x2c50);
+test(0x2c21,0x2c51);
+test(0x2c22,0x2c52);
+test(0x2c23,0x2c53);
+test(0x2c24,0x2c54);
+test(0x2c25,0x2c55);
+test(0x2c26,0x2c56);
+test(0x2c27,0x2c57);
+test(0x2c28,0x2c58);
+test(0x2c29,0x2c59);
+test(0x2c2a,0x2c5a);
+test(0x2c2b,0x2c5b);
+test(0x2c2c,0x2c5c);
+test(0x2c2d,0x2c5d);
+test(0x2c2e,0x2c5e);
+test(0x2c30,0x2c00);
+test(0x2c31,0x2c01);
+test(0x2c32,0x2c02);
+test(0x2c33,0x2c03);
+test(0x2c34,0x2c04);
+test(0x2c35,0x2c05);
+test(0x2c36,0x2c06);
+test(0x2c37,0x2c07);
+test(0x2c38,0x2c08);
+test(0x2c39,0x2c09);
+test(0x2c3a,0x2c0a);
+test(0x2c3b,0x2c0b);
+test(0x2c3c,0x2c0c);
+test(0x2c3d,0x2c0d);
+test(0x2c3e,0x2c0e);
+test(0x2c3f,0x2c0f);
+test(0x2c40,0x2c10);
+test(0x2c41,0x2c11);
+test(0x2c42,0x2c12);
+test(0x2c43,0x2c13);
+test(0x2c44,0x2c14);
+test(0x2c45,0x2c15);
+test(0x2c46,0x2c16);
+test(0x2c47,0x2c17);
+test(0x2c48,0x2c18);
+test(0x2c49,0x2c19);
+test(0x2c4a,0x2c1a);
+test(0x2c4b,0x2c1b);
+test(0x2c4c,0x2c1c);
+test(0x2c4d,0x2c1d);
+test(0x2c4e,0x2c1e);
+test(0x2c4f,0x2c1f);
+test(0x2c50,0x2c20);
+test(0x2c51,0x2c21);
+test(0x2c52,0x2c22);
+test(0x2c53,0x2c23);
+test(0x2c54,0x2c24);
+test(0x2c55,0x2c25);
+test(0x2c56,0x2c26);
+test(0x2c57,0x2c27);
+test(0x2c58,0x2c28);
+test(0x2c59,0x2c29);
+test(0x2c5a,0x2c2a);
+test(0x2c5b,0x2c2b);
+test(0x2c5c,0x2c2c);
+test(0x2c5d,0x2c2d);
+test(0x2c5e,0x2c2e);
+test(0x2c60,0x2c61);
+test(0x2c61,0x2c60);
+test(0x2c62,0x26b);
+test(0x2c63,0x1d7d);
+test(0x2c64,0x27d);
+test(0x2c65,0x23a);
+test(0x2c66,0x23e);
+test(0x2c67,0x2c68);
+test(0x2c68,0x2c67);
+test(0x2c69,0x2c6a);
+test(0x2c6a,0x2c69);
+test(0x2c6b,0x2c6c);
+test(0x2c6c,0x2c6b);
+test(0x2c6d,0x251);
+test(0x2c6e,0x271);
+test(0x2c6f,0x250);
+test(0x2c70,0x252);
+test(0x2c72,0x2c73);
+test(0x2c73,0x2c72);
+test(0x2c75,0x2c76);
+test(0x2c76,0x2c75);
+test(0x2c7e,0x23f);
+test(0x2c7f,0x240);
+test(0x2c80,0x2c81);
+test(0x2c81,0x2c80);
+test(0x2c82,0x2c83);
+test(0x2c83,0x2c82);
+test(0x2c84,0x2c85);
+test(0x2c85,0x2c84);
+test(0x2c86,0x2c87);
+test(0x2c87,0x2c86);
+test(0x2c88,0x2c89);
+test(0x2c89,0x2c88);
+test(0x2c8a,0x2c8b);
+test(0x2c8b,0x2c8a);
+test(0x2c8c,0x2c8d);
+test(0x2c8d,0x2c8c);
+test(0x2c8e,0x2c8f);
+test(0x2c8f,0x2c8e);
+test(0x2c90,0x2c91);
+test(0x2c91,0x2c90);
+test(0x2c92,0x2c93);
+test(0x2c93,0x2c92);
+test(0x2c94,0x2c95);
+test(0x2c95,0x2c94);
+test(0x2c96,0x2c97);
+test(0x2c97,0x2c96);
+test(0x2c98,0x2c99);
+test(0x2c99,0x2c98);
+test(0x2c9a,0x2c9b);
+test(0x2c9b,0x2c9a);
+test(0x2c9c,0x2c9d);
+test(0x2c9d,0x2c9c);
+test(0x2c9e,0x2c9f);
+test(0x2c9f,0x2c9e);
+test(0x2ca0,0x2ca1);
+test(0x2ca1,0x2ca0);
+test(0x2ca2,0x2ca3);
+test(0x2ca3,0x2ca2);
+test(0x2ca4,0x2ca5);
+test(0x2ca5,0x2ca4);
+test(0x2ca6,0x2ca7);
+test(0x2ca7,0x2ca6);
+test(0x2ca8,0x2ca9);
+test(0x2ca9,0x2ca8);
+test(0x2caa,0x2cab);
+test(0x2cab,0x2caa);
+test(0x2cac,0x2cad);
+test(0x2cad,0x2cac);
+test(0x2cae,0x2caf);
+test(0x2caf,0x2cae);
+test(0x2cb0,0x2cb1);
+test(0x2cb1,0x2cb0);
+test(0x2cb2,0x2cb3);
+test(0x2cb3,0x2cb2);
+test(0x2cb4,0x2cb5);
+test(0x2cb5,0x2cb4);
+test(0x2cb6,0x2cb7);
+test(0x2cb7,0x2cb6);
+test(0x2cb8,0x2cb9);
+test(0x2cb9,0x2cb8);
+test(0x2cba,0x2cbb);
+test(0x2cbb,0x2cba);
+test(0x2cbc,0x2cbd);
+test(0x2cbd,0x2cbc);
+test(0x2cbe,0x2cbf);
+test(0x2cbf,0x2cbe);
+test(0x2cc0,0x2cc1);
+test(0x2cc1,0x2cc0);
+test(0x2cc2,0x2cc3);
+test(0x2cc3,0x2cc2);
+test(0x2cc4,0x2cc5);
+test(0x2cc5,0x2cc4);
+test(0x2cc6,0x2cc7);
+test(0x2cc7,0x2cc6);
+test(0x2cc8,0x2cc9);
+test(0x2cc9,0x2cc8);
+test(0x2cca,0x2ccb);
+test(0x2ccb,0x2cca);
+test(0x2ccc,0x2ccd);
+test(0x2ccd,0x2ccc);
+test(0x2cce,0x2ccf);
+test(0x2ccf,0x2cce);
+test(0x2cd0,0x2cd1);
+test(0x2cd1,0x2cd0);
+test(0x2cd2,0x2cd3);
+test(0x2cd3,0x2cd2);
+test(0x2cd4,0x2cd5);
+test(0x2cd5,0x2cd4);
+test(0x2cd6,0x2cd7);
+test(0x2cd7,0x2cd6);
+test(0x2cd8,0x2cd9);
+test(0x2cd9,0x2cd8);
+test(0x2cda,0x2cdb);
+test(0x2cdb,0x2cda);
+test(0x2cdc,0x2cdd);
+test(0x2cdd,0x2cdc);
+test(0x2cde,0x2cdf);
+test(0x2cdf,0x2cde);
+test(0x2ce0,0x2ce1);
+test(0x2ce1,0x2ce0);
+test(0x2ce2,0x2ce3);
+test(0x2ce3,0x2ce2);
+test(0x2ceb,0x2cec);
+test(0x2cec,0x2ceb);
+test(0x2ced,0x2cee);
+test(0x2cee,0x2ced);
+test(0x2cf2,0x2cf3);
+test(0x2cf3,0x2cf2);
+test(0x2d00,0x10a0);
+test(0x2d01,0x10a1);
+test(0x2d02,0x10a2);
+test(0x2d03,0x10a3);
+test(0x2d04,0x10a4);
+test(0x2d05,0x10a5);
+test(0x2d06,0x10a6);
+test(0x2d07,0x10a7);
+test(0x2d08,0x10a8);
+test(0x2d09,0x10a9);
+test(0x2d0a,0x10aa);
+test(0x2d0b,0x10ab);
+test(0x2d0c,0x10ac);
+test(0x2d0d,0x10ad);
+test(0x2d0e,0x10ae);
+test(0x2d0f,0x10af);
+test(0x2d10,0x10b0);
+test(0x2d11,0x10b1);
+test(0x2d12,0x10b2);
+test(0x2d13,0x10b3);
+test(0x2d14,0x10b4);
+test(0x2d15,0x10b5);
+test(0x2d16,0x10b6);
+test(0x2d17,0x10b7);
+test(0x2d18,0x10b8);
+test(0x2d19,0x10b9);
+test(0x2d1a,0x10ba);
+test(0x2d1b,0x10bb);
+test(0x2d1c,0x10bc);
+test(0x2d1d,0x10bd);
+test(0x2d1e,0x10be);
+test(0x2d1f,0x10bf);
+test(0x2d20,0x10c0);
+test(0x2d21,0x10c1);
+test(0x2d22,0x10c2);
+test(0x2d23,0x10c3);
+test(0x2d24,0x10c4);
+test(0x2d25,0x10c5);
+test(0x2d27,0x10c7);
+test(0x2d2d,0x10cd);
+test(0xa640,0xa641);
+test(0xa641,0xa640);
+test(0xa642,0xa643);
+test(0xa643,0xa642);
+test(0xa644,0xa645);
+test(0xa645,0xa644);
+test(0xa646,0xa647);
+test(0xa647,0xa646);
+test(0xa648,0xa649);
+test(0xa649,0xa648);
+test(0xa64a,0xa64b);
+test(0xa64b,0xa64a);
+test(0xa64c,0xa64d);
+test(0xa64d,0xa64c);
+test(0xa64e,0xa64f);
+test(0xa64f,0xa64e);
+test(0xa650,0xa651);
+test(0xa651,0xa650);
+test(0xa652,0xa653);
+test(0xa653,0xa652);
+test(0xa654,0xa655);
+test(0xa655,0xa654);
+test(0xa656,0xa657);
+test(0xa657,0xa656);
+test(0xa658,0xa659);
+test(0xa659,0xa658);
+test(0xa65a,0xa65b);
+test(0xa65b,0xa65a);
+test(0xa65c,0xa65d);
+test(0xa65d,0xa65c);
+test(0xa65e,0xa65f);
+test(0xa65f,0xa65e);
+test(0xa660,0xa661);
+test(0xa661,0xa660);
+test(0xa662,0xa663);
+test(0xa663,0xa662);
+test(0xa664,0xa665);
+test(0xa665,0xa664);
+test(0xa666,0xa667);
+test(0xa667,0xa666);
+test(0xa668,0xa669);
+test(0xa669,0xa668);
+test(0xa66a,0xa66b);
+test(0xa66b,0xa66a);
+test(0xa66c,0xa66d);
+test(0xa66d,0xa66c);
+test(0xa680,0xa681);
+test(0xa681,0xa680);
+test(0xa682,0xa683);
+test(0xa683,0xa682);
+test(0xa684,0xa685);
+test(0xa685,0xa684);
+test(0xa686,0xa687);
+test(0xa687,0xa686);
+test(0xa688,0xa689);
+test(0xa689,0xa688);
+test(0xa68a,0xa68b);
+test(0xa68b,0xa68a);
+test(0xa68c,0xa68d);
+test(0xa68d,0xa68c);
+test(0xa68e,0xa68f);
+test(0xa68f,0xa68e);
+test(0xa690,0xa691);
+test(0xa691,0xa690);
+test(0xa692,0xa693);
+test(0xa693,0xa692);
+test(0xa694,0xa695);
+test(0xa695,0xa694);
+test(0xa696,0xa697);
+test(0xa697,0xa696);
+test(0xa698,0xa699);
+test(0xa699,0xa698);
+test(0xa69a,0xa69b);
+test(0xa69b,0xa69a);
+test(0xa722,0xa723);
+test(0xa723,0xa722);
+test(0xa724,0xa725);
+test(0xa725,0xa724);
+test(0xa726,0xa727);
+test(0xa727,0xa726);
+test(0xa728,0xa729);
+test(0xa729,0xa728);
+test(0xa72a,0xa72b);
+test(0xa72b,0xa72a);
+test(0xa72c,0xa72d);
+test(0xa72d,0xa72c);
+test(0xa72e,0xa72f);
+test(0xa72f,0xa72e);
+test(0xa732,0xa733);
+test(0xa733,0xa732);
+test(0xa734,0xa735);
+test(0xa735,0xa734);
+test(0xa736,0xa737);
+test(0xa737,0xa736);
+test(0xa738,0xa739);
+test(0xa739,0xa738);
+test(0xa73a,0xa73b);
+test(0xa73b,0xa73a);
+test(0xa73c,0xa73d);
+test(0xa73d,0xa73c);
+test(0xa73e,0xa73f);
+test(0xa73f,0xa73e);
+test(0xa740,0xa741);
+test(0xa741,0xa740);
+test(0xa742,0xa743);
+test(0xa743,0xa742);
+test(0xa744,0xa745);
+test(0xa745,0xa744);
+test(0xa746,0xa747);
+test(0xa747,0xa746);
+test(0xa748,0xa749);
+test(0xa749,0xa748);
+test(0xa74a,0xa74b);
+test(0xa74b,0xa74a);
+test(0xa74c,0xa74d);
+test(0xa74d,0xa74c);
+test(0xa74e,0xa74f);
+test(0xa74f,0xa74e);
+test(0xa750,0xa751);
+test(0xa751,0xa750);
+test(0xa752,0xa753);
+test(0xa753,0xa752);
+test(0xa754,0xa755);
+test(0xa755,0xa754);
+test(0xa756,0xa757);
+test(0xa757,0xa756);
+test(0xa758,0xa759);
+test(0xa759,0xa758);
+test(0xa75a,0xa75b);
+test(0xa75b,0xa75a);
+test(0xa75c,0xa75d);
+test(0xa75d,0xa75c);
+test(0xa75e,0xa75f);
+test(0xa75f,0xa75e);
+test(0xa760,0xa761);
+test(0xa761,0xa760);
+test(0xa762,0xa763);
+test(0xa763,0xa762);
+test(0xa764,0xa765);
+test(0xa765,0xa764);
+test(0xa766,0xa767);
+test(0xa767,0xa766);
+test(0xa768,0xa769);
+test(0xa769,0xa768);
+test(0xa76a,0xa76b);
+test(0xa76b,0xa76a);
+test(0xa76c,0xa76d);
+test(0xa76d,0xa76c);
+test(0xa76e,0xa76f);
+test(0xa76f,0xa76e);
+test(0xa779,0xa77a);
+test(0xa77a,0xa779);
+test(0xa77b,0xa77c);
+test(0xa77c,0xa77b);
+test(0xa77d,0x1d79);
+test(0xa77e,0xa77f);
+test(0xa77f,0xa77e);
+test(0xa780,0xa781);
+test(0xa781,0xa780);
+test(0xa782,0xa783);
+test(0xa783,0xa782);
+test(0xa784,0xa785);
+test(0xa785,0xa784);
+test(0xa786,0xa787);
+test(0xa787,0xa786);
+test(0xa78b,0xa78c);
+test(0xa78c,0xa78b);
+test(0xa78d,0x265);
+test(0xa790,0xa791);
+test(0xa791,0xa790);
+test(0xa792,0xa793);
+test(0xa793,0xa792);
+test(0xa796,0xa797);
+test(0xa797,0xa796);
+test(0xa798,0xa799);
+test(0xa799,0xa798);
+test(0xa79a,0xa79b);
+test(0xa79b,0xa79a);
+test(0xa79c,0xa79d);
+test(0xa79d,0xa79c);
+test(0xa79e,0xa79f);
+test(0xa79f,0xa79e);
+test(0xa7a0,0xa7a1);
+test(0xa7a1,0xa7a0);
+test(0xa7a2,0xa7a3);
+test(0xa7a3,0xa7a2);
+test(0xa7a4,0xa7a5);
+test(0xa7a5,0xa7a4);
+test(0xa7a6,0xa7a7);
+test(0xa7a7,0xa7a6);
+test(0xa7a8,0xa7a9);
+test(0xa7a9,0xa7a8);
+test(0xa7aa,0x266);
+test(0xa7ab,0x25c);
+test(0xa7ac,0x261);
+test(0xa7ad,0x26c);
+test(0xa7b0,0x29e);
+test(0xa7b1,0x287);
+test(0xa7b2,0x29d);
+test(0xa7b3,0xab53);
+test(0xa7b4,0xa7b5);
+test(0xa7b5,0xa7b4);
+test(0xa7b6,0xa7b7);
+test(0xa7b7,0xa7b6);
+test(0xab53,0xa7b3);
+test(0xab70,0x13a0);
+test(0xab71,0x13a1);
+test(0xab72,0x13a2);
+test(0xab73,0x13a3);
+test(0xab74,0x13a4);
+test(0xab75,0x13a5);
+test(0xab76,0x13a6);
+test(0xab77,0x13a7);
+test(0xab78,0x13a8);
+test(0xab79,0x13a9);
+test(0xab7a,0x13aa);
+test(0xab7b,0x13ab);
+test(0xab7c,0x13ac);
+test(0xab7d,0x13ad);
+test(0xab7e,0x13ae);
+test(0xab7f,0x13af);
+test(0xab80,0x13b0);
+test(0xab81,0x13b1);
+test(0xab82,0x13b2);
+test(0xab83,0x13b3);
+test(0xab84,0x13b4);
+test(0xab85,0x13b5);
+test(0xab86,0x13b6);
+test(0xab87,0x13b7);
+test(0xab88,0x13b8);
+test(0xab89,0x13b9);
+test(0xab8a,0x13ba);
+test(0xab8b,0x13bb);
+test(0xab8c,0x13bc);
+test(0xab8d,0x13bd);
+test(0xab8e,0x13be);
+test(0xab8f,0x13bf);
+test(0xab90,0x13c0);
+test(0xab91,0x13c1);
+test(0xab92,0x13c2);
+test(0xab93,0x13c3);
+test(0xab94,0x13c4);
+test(0xab95,0x13c5);
+test(0xab96,0x13c6);
+test(0xab97,0x13c7);
+test(0xab98,0x13c8);
+test(0xab99,0x13c9);
+test(0xab9a,0x13ca);
+test(0xab9b,0x13cb);
+test(0xab9c,0x13cc);
+test(0xab9d,0x13cd);
+test(0xab9e,0x13ce);
+test(0xab9f,0x13cf);
+test(0xaba0,0x13d0);
+test(0xaba1,0x13d1);
+test(0xaba2,0x13d2);
+test(0xaba3,0x13d3);
+test(0xaba4,0x13d4);
+test(0xaba5,0x13d5);
+test(0xaba6,0x13d6);
+test(0xaba7,0x13d7);
+test(0xaba8,0x13d8);
+test(0xaba9,0x13d9);
+test(0xabaa,0x13da);
+test(0xabab,0x13db);
+test(0xabac,0x13dc);
+test(0xabad,0x13dd);
+test(0xabae,0x13de);
+test(0xabaf,0x13df);
+test(0xabb0,0x13e0);
+test(0xabb1,0x13e1);
+test(0xabb2,0x13e2);
+test(0xabb3,0x13e3);
+test(0xabb4,0x13e4);
+test(0xabb5,0x13e5);
+test(0xabb6,0x13e6);
+test(0xabb7,0x13e7);
+test(0xabb8,0x13e8);
+test(0xabb9,0x13e9);
+test(0xabba,0x13ea);
+test(0xabbb,0x13eb);
+test(0xabbc,0x13ec);
+test(0xabbd,0x13ed);
+test(0xabbe,0x13ee);
+test(0xabbf,0x13ef);
+test(0xff21,0xff41);
+test(0xff22,0xff42);
+test(0xff23,0xff43);
+test(0xff24,0xff44);
+test(0xff25,0xff45);
+test(0xff26,0xff46);
+test(0xff27,0xff47);
+test(0xff28,0xff48);
+test(0xff29,0xff49);
+test(0xff2a,0xff4a);
+test(0xff2b,0xff4b);
+test(0xff2c,0xff4c);
+test(0xff2d,0xff4d);
+test(0xff2e,0xff4e);
+test(0xff2f,0xff4f);
+test(0xff30,0xff50);
+test(0xff31,0xff51);
+test(0xff32,0xff52);
+test(0xff33,0xff53);
+test(0xff34,0xff54);
+test(0xff35,0xff55);
+test(0xff36,0xff56);
+test(0xff37,0xff57);
+test(0xff38,0xff58);
+test(0xff39,0xff59);
+test(0xff3a,0xff5a);
+test(0xff41,0xff21);
+test(0xff42,0xff22);
+test(0xff43,0xff23);
+test(0xff44,0xff24);
+test(0xff45,0xff25);
+test(0xff46,0xff26);
+test(0xff47,0xff27);
+test(0xff48,0xff28);
+test(0xff49,0xff29);
+test(0xff4a,0xff2a);
+test(0xff4b,0xff2b);
+test(0xff4c,0xff2c);
+test(0xff4d,0xff2d);
+test(0xff4e,0xff2e);
+test(0xff4f,0xff2f);
+test(0xff50,0xff30);
+test(0xff51,0xff31);
+test(0xff52,0xff32);
+test(0xff53,0xff33);
+test(0xff54,0xff34);
+test(0xff55,0xff35);
+test(0xff56,0xff36);
+test(0xff57,0xff37);
+test(0xff58,0xff38);
+test(0xff59,0xff39);
+test(0xff5a,0xff3a);
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff --git a/js/src/vm/CaseFolding.txt b/js/src/vm/CaseFolding.txt
new file mode 100644
index 000000000000..0197a6c40fb7
--- /dev/null
+++ b/js/src/vm/CaseFolding.txt
@@ -0,0 +1,1414 @@
+# CaseFolding-8.0.0.txt
+# Date: 2015-01-13, 18:16:36 GMT [MD]
+#
+# Unicode Character Database
+# Copyright (c) 1991-2015 Unicode, Inc.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
+# For documentation, see http://www.unicode.org/reports/tr44/
+#
+# Case Folding Properties
+#
+# This file is a supplement to the UnicodeData file.
+# It provides a case folding mapping generated from the Unicode Character Database.
+# If all characters are mapped according to the full mapping below, then
+# case differences (according to UnicodeData.txt and SpecialCasing.txt)
+# are eliminated.
+#
+# The data supports both implementations that require simple case foldings
+# (where string lengths don't change), and implementations that allow full case folding
+# (where string lengths may grow). Note that where they can be supported, the
+# full case foldings are superior: for example, they allow "MASSE" and "Maße" to match.
+#
+# All code points not listed in this file map to themselves.
+#
+# NOTE: case folding does not preserve normalization formats!
+#
+# For information on case folding, including how to have case folding 
+# preserve normalization formats, see Section 3.13 Default Case Algorithms in
+# The Unicode Standard.
+#
+# ================================================================================
+# Format
+# ================================================================================
+# The entries in this file are in the following machine-readable format:
+#
+# <code>; <status>; <mapping>; # <name>
+#
+# The status field is:
+# C: common case folding, common mappings shared by both simple and full mappings.
+# F: full case folding, mappings that cause strings to grow in length. Multiple characters are separated by spaces.
+# S: simple case folding, mappings to single characters where different from F.
+# T: special case for uppercase I and dotted uppercase I
+#    - For non-Turkic languages, this mapping is normally not used.
+#    - For Turkic languages (tr, az), this mapping can be used instead of the normal mapping for these characters.
+#      Note that the Turkic mappings do not maintain canonical equivalence without additional processing.
+#      See the discussions of case mapping in the Unicode Standard for more information.
+#
+# Usage:
+#  A. To do a simple case folding, use the mappings with status C + S.
+#  B. To do a full case folding, use the mappings with status C + F.
+#
+#    The mappings with status T can be used or omitted depending on the desired case-folding
+#    behavior. (The default option is to exclude them.)
+#
+# =================================================================
+
+# Property: Case_Folding
+
+#  All code points not explicitly listed for Case_Folding
+#  have the value C for the status field, and the code point itself for the mapping field.
+
+# =================================================================
+0041; C; 0061; # LATIN CAPITAL LETTER A
+0042; C; 0062; # LATIN CAPITAL LETTER B
+0043; C; 0063; # LATIN CAPITAL LETTER C
+0044; C; 0064; # LATIN CAPITAL LETTER D
+0045; C; 0065; # LATIN CAPITAL LETTER E
+0046; C; 0066; # LATIN CAPITAL LETTER F
+0047; C; 0067; # LATIN CAPITAL LETTER G
+0048; C; 0068; # LATIN CAPITAL LETTER H
+0049; C; 0069; # LATIN CAPITAL LETTER I
+0049; T; 0131; # LATIN CAPITAL LETTER I
+004A; C; 006A; # LATIN CAPITAL LETTER J
+004B; C; 006B; # LATIN CAPITAL LETTER K
+004C; C; 006C; # LATIN CAPITAL LETTER L
+004D; C; 006D; # LATIN CAPITAL LETTER M
+004E; C; 006E; # LATIN CAPITAL LETTER N
+004F; C; 006F; # LATIN CAPITAL LETTER O
+0050; C; 0070; # LATIN CAPITAL LETTER P
+0051; C; 0071; # LATIN CAPITAL LETTER Q
+0052; C; 0072; # LATIN CAPITAL LETTER R
+0053; C; 0073; # LATIN CAPITAL LETTER S
+0054; C; 0074; # LATIN CAPITAL LETTER T
+0055; C; 0075; # LATIN CAPITAL LETTER U
+0056; C; 0076; # LATIN CAPITAL LETTER V
+0057; C; 0077; # LATIN CAPITAL LETTER W
+0058; C; 0078; # LATIN CAPITAL LETTER X
+0059; C; 0079; # LATIN CAPITAL LETTER Y
+005A; C; 007A; # LATIN CAPITAL LETTER Z
+00B5; C; 03BC; # MICRO SIGN
+00C0; C; 00E0; # LATIN CAPITAL LETTER A WITH GRAVE
+00C1; C; 00E1; # LATIN CAPITAL LETTER A WITH ACUTE
+00C2; C; 00E2; # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+00C3; C; 00E3; # LATIN CAPITAL LETTER A WITH TILDE
+00C4; C; 00E4; # LATIN CAPITAL LETTER A WITH DIAERESIS
+00C5; C; 00E5; # LATIN CAPITAL LETTER A WITH RING ABOVE
+00C6; C; 00E6; # LATIN CAPITAL LETTER AE
+00C7; C; 00E7; # LATIN CAPITAL LETTER C WITH CEDILLA
+00C8; C; 00E8; # LATIN CAPITAL LETTER E WITH GRAVE
+00C9; C; 00E9; # LATIN CAPITAL LETTER E WITH ACUTE
+00CA; C; 00EA; # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+00CB; C; 00EB; # LATIN CAPITAL LETTER E WITH DIAERESIS
+00CC; C; 00EC; # LATIN CAPITAL LETTER I WITH GRAVE
+00CD; C; 00ED; # LATIN CAPITAL LETTER I WITH ACUTE
+00CE; C; 00EE; # LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+00CF; C; 00EF; # LATIN CAPITAL LETTER I WITH DIAERESIS
+00D0; C; 00F0; # LATIN CAPITAL LETTER ETH
+00D1; C; 00F1; # LATIN CAPITAL LETTER N WITH TILDE
+00D2; C; 00F2; # LATIN CAPITAL LETTER O WITH GRAVE
+00D3; C; 00F3; # LATIN CAPITAL LETTER O WITH ACUTE
+00D4; C; 00F4; # LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+00D5; C; 00F5; # LATIN CAPITAL LETTER O WITH TILDE
+00D6; C; 00F6; # LATIN CAPITAL LETTER O WITH DIAERESIS
+00D8; C; 00F8; # LATIN CAPITAL LETTER O WITH STROKE
+00D9; C; 00F9; # LATIN CAPITAL LETTER U WITH GRAVE
+00DA; C; 00FA; # LATIN CAPITAL LETTER U WITH ACUTE
+00DB; C; 00FB; # LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+00DC; C; 00FC; # LATIN CAPITAL LETTER U WITH DIAERESIS
+00DD; C; 00FD; # LATIN CAPITAL LETTER Y WITH ACUTE
+00DE; C; 00FE; # LATIN CAPITAL LETTER THORN
+00DF; F; 0073 0073; # LATIN SMALL LETTER SHARP S
+0100; C; 0101; # LATIN CAPITAL LETTER A WITH MACRON
+0102; C; 0103; # LATIN CAPITAL LETTER A WITH BREVE
+0104; C; 0105; # LATIN CAPITAL LETTER A WITH OGONEK
+0106; C; 0107; # LATIN CAPITAL LETTER C WITH ACUTE
+0108; C; 0109; # LATIN CAPITAL LETTER C WITH CIRCUMFLEX
+010A; C; 010B; # LATIN CAPITAL LETTER C WITH DOT ABOVE
+010C; C; 010D; # LATIN CAPITAL LETTER C WITH CARON
+010E; C; 010F; # LATIN CAPITAL LETTER D WITH CARON
+0110; C; 0111; # LATIN CAPITAL LETTER D WITH STROKE
+0112; C; 0113; # LATIN CAPITAL LETTER E WITH MACRON
+0114; C; 0115; # LATIN CAPITAL LETTER E WITH BREVE
+0116; C; 0117; # LATIN CAPITAL LETTER E WITH DOT ABOVE
+0118; C; 0119; # LATIN CAPITAL LETTER E WITH OGONEK
+011A; C; 011B; # LATIN CAPITAL LETTER E WITH CARON
+011C; C; 011D; # LATIN CAPITAL LETTER G WITH CIRCUMFLEX
+011E; C; 011F; # LATIN CAPITAL LETTER G WITH BREVE
+0120; C; 0121; # LATIN CAPITAL LETTER G WITH DOT ABOVE
+0122; C; 0123; # LATIN CAPITAL LETTER G WITH CEDILLA
+0124; C; 0125; # LATIN CAPITAL LETTER H WITH CIRCUMFLEX
+0126; C; 0127; # LATIN CAPITAL LETTER H WITH STROKE
+0128; C; 0129; # LATIN CAPITAL LETTER I WITH TILDE
+012A; C; 012B; # LATIN CAPITAL LETTER I WITH MACRON
+012C; C; 012D; # LATIN CAPITAL LETTER I WITH BREVE
+012E; C; 012F; # LATIN CAPITAL LETTER I WITH OGONEK
+0130; F; 0069 0307; # LATIN CAPITAL LETTER I WITH DOT ABOVE
+0130; T; 0069; # LATIN CAPITAL LETTER I WITH DOT ABOVE
+0132; C; 0133; # LATIN CAPITAL LIGATURE IJ
+0134; C; 0135; # LATIN CAPITAL LETTER J WITH CIRCUMFLEX
+0136; C; 0137; # LATIN CAPITAL LETTER K WITH CEDILLA
+0139; C; 013A; # LATIN CAPITAL LETTER L WITH ACUTE
+013B; C; 013C; # LATIN CAPITAL LETTER L WITH CEDILLA
+013D; C; 013E; # LATIN CAPITAL LETTER L WITH CARON
+013F; C; 0140; # LATIN CAPITAL LETTER L WITH MIDDLE DOT
+0141; C; 0142; # LATIN CAPITAL LETTER L WITH STROKE
+0143; C; 0144; # LATIN CAPITAL LETTER N WITH ACUTE
+0145; C; 0146; # LATIN CAPITAL LETTER N WITH CEDILLA
+0147; C; 0148; # LATIN CAPITAL LETTER N WITH CARON
+0149; F; 02BC 006E; # LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
+014A; C; 014B; # LATIN CAPITAL LETTER ENG
+014C; C; 014D; # LATIN CAPITAL LETTER O WITH MACRON
+014E; C; 014F; # LATIN CAPITAL LETTER O WITH BREVE
+0150; C; 0151; # LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
+0152; C; 0153; # LATIN CAPITAL LIGATURE OE
+0154; C; 0155; # LATIN CAPITAL LETTER R WITH ACUTE
+0156; C; 0157; # LATIN CAPITAL LETTER R WITH CEDILLA
+0158; C; 0159; # LATIN CAPITAL LETTER R WITH CARON
+015A; C; 015B; # LATIN CAPITAL LETTER S WITH ACUTE
+015C; C; 015D; # LATIN CAPITAL LETTER S WITH CIRCUMFLEX
+015E; C; 015F; # LATIN CAPITAL LETTER S WITH CEDILLA
+0160; C; 0161; # LATIN CAPITAL LETTER S WITH CARON
+0162; C; 0163; # LATIN CAPITAL LETTER T WITH CEDILLA
+0164; C; 0165; # LATIN CAPITAL LETTER T WITH CARON
+0166; C; 0167; # LATIN CAPITAL LETTER T WITH STROKE
+0168; C; 0169; # LATIN CAPITAL LETTER U WITH TILDE
+016A; C; 016B; # LATIN CAPITAL LETTER U WITH MACRON
+016C; C; 016D; # LATIN CAPITAL LETTER U WITH BREVE
+016E; C; 016F; # LATIN CAPITAL LETTER U WITH RING ABOVE
+0170; C; 0171; # LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
+0172; C; 0173; # LATIN CAPITAL LETTER U WITH OGONEK
+0174; C; 0175; # LATIN CAPITAL LETTER W WITH CIRCUMFLEX
+0176; C; 0177; # LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
+0178; C; 00FF; # LATIN CAPITAL LETTER Y WITH DIAERESIS
+0179; C; 017A; # LATIN CAPITAL LETTER Z WITH ACUTE
+017B; C; 017C; # LATIN CAPITAL LETTER Z WITH DOT ABOVE
+017D; C; 017E; # LATIN CAPITAL LETTER Z WITH CARON
+017F; C; 0073; # LATIN SMALL LETTER LONG S
+0181; C; 0253; # LATIN CAPITAL LETTER B WITH HOOK
+0182; C; 0183; # LATIN CAPITAL LETTER B WITH TOPBAR
+0184; C; 0185; # LATIN CAPITAL LETTER TONE SIX
+0186; C; 0254; # LATIN CAPITAL LETTER OPEN O
+0187; C; 0188; # LATIN CAPITAL LETTER C WITH HOOK
+0189; C; 0256; # LATIN CAPITAL LETTER AFRICAN D
+018A; C; 0257; # LATIN CAPITAL LETTER D WITH HOOK
+018B; C; 018C; # LATIN CAPITAL LETTER D WITH TOPBAR
+018E; C; 01DD; # LATIN CAPITAL LETTER REVERSED E
+018F; C; 0259; # LATIN CAPITAL LETTER SCHWA
+0190; C; 025B; # LATIN CAPITAL LETTER OPEN E
+0191; C; 0192; # LATIN CAPITAL LETTER F WITH HOOK
+0193; C; 0260; # LATIN CAPITAL LETTER G WITH HOOK
+0194; C; 0263; # LATIN CAPITAL LETTER GAMMA
+0196; C; 0269; # LATIN CAPITAL LETTER IOTA
+0197; C; 0268; # LATIN CAPITAL LETTER I WITH STROKE
+0198; C; 0199; # LATIN CAPITAL LETTER K WITH HOOK
+019C; C; 026F; # LATIN CAPITAL LETTER TURNED M
+019D; C; 0272; # LATIN CAPITAL LETTER N WITH LEFT HOOK
+019F; C; 0275; # LATIN CAPITAL LETTER O WITH MIDDLE TILDE
+01A0; C; 01A1; # LATIN CAPITAL LETTER O WITH HORN
+01A2; C; 01A3; # LATIN CAPITAL LETTER OI
+01A4; C; 01A5; # LATIN CAPITAL LETTER P WITH HOOK
+01A6; C; 0280; # LATIN LETTER YR
+01A7; C; 01A8; # LATIN CAPITAL LETTER TONE TWO
+01A9; C; 0283; # LATIN CAPITAL LETTER ESH
+01AC; C; 01AD; # LATIN CAPITAL LETTER T WITH HOOK
+01AE; C; 0288; # LATIN CAPITAL LETTER T WITH RETROFLEX HOOK
+01AF; C; 01B0; # LATIN CAPITAL LETTER U WITH HORN
+01B1; C; 028A; # LATIN CAPITAL LETTER UPSILON
+01B2; C; 028B; # LATIN CAPITAL LETTER V WITH HOOK
+01B3; C; 01B4; # LATIN CAPITAL LETTER Y WITH HOOK
+01B5; C; 01B6; # LATIN CAPITAL LETTER Z WITH STROKE
+01B7; C; 0292; # LATIN CAPITAL LETTER EZH
+01B8; C; 01B9; # LATIN CAPITAL LETTER EZH REVERSED
+01BC; C; 01BD; # LATIN CAPITAL LETTER TONE FIVE
+01C4; C; 01C6; # LATIN CAPITAL LETTER DZ WITH CARON
+01C5; C; 01C6; # LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON
+01C7; C; 01C9; # LATIN CAPITAL LETTER LJ
+01C8; C; 01C9; # LATIN CAPITAL LETTER L WITH SMALL LETTER J
+01CA; C; 01CC; # LATIN CAPITAL LETTER NJ
+01CB; C; 01CC; # LATIN CAPITAL LETTER N WITH SMALL LETTER J
+01CD; C; 01CE; # LATIN CAPITAL LETTER A WITH CARON
+01CF; C; 01D0; # LATIN CAPITAL LETTER I WITH CARON
+01D1; C; 01D2; # LATIN CAPITAL LETTER O WITH CARON
+01D3; C; 01D4; # LATIN CAPITAL LETTER U WITH CARON
+01D5; C; 01D6; # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
+01D7; C; 01D8; # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
+01D9; C; 01DA; # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
+01DB; C; 01DC; # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
+01DE; C; 01DF; # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
+01E0; C; 01E1; # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
+01E2; C; 01E3; # LATIN CAPITAL LETTER AE WITH MACRON
+01E4; C; 01E5; # LATIN CAPITAL LETTER G WITH STROKE
+01E6; C; 01E7; # LATIN CAPITAL LETTER G WITH CARON
+01E8; C; 01E9; # LATIN CAPITAL LETTER K WITH CARON
+01EA; C; 01EB; # LATIN CAPITAL LETTER O WITH OGONEK
+01EC; C; 01ED; # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
+01EE; C; 01EF; # LATIN CAPITAL LETTER EZH WITH CARON
+01F0; F; 006A 030C; # LATIN SMALL LETTER J WITH CARON
+01F1; C; 01F3; # LATIN CAPITAL LETTER DZ
+01F2; C; 01F3; # LATIN CAPITAL LETTER D WITH SMALL LETTER Z
+01F4; C; 01F5; # LATIN CAPITAL LETTER G WITH ACUTE
+01F6; C; 0195; # LATIN CAPITAL LETTER HWAIR
+01F7; C; 01BF; # LATIN CAPITAL LETTER WYNN
+01F8; C; 01F9; # LATIN CAPITAL LETTER N WITH GRAVE
+01FA; C; 01FB; # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
+01FC; C; 01FD; # LATIN CAPITAL LETTER AE WITH ACUTE
+01FE; C; 01FF; # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
+0200; C; 0201; # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
+0202; C; 0203; # LATIN CAPITAL LETTER A WITH INVERTED BREVE
+0204; C; 0205; # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
+0206; C; 0207; # LATIN CAPITAL LETTER E WITH INVERTED BREVE
+0208; C; 0209; # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
+020A; C; 020B; # LATIN CAPITAL LETTER I WITH INVERTED BREVE
+020C; C; 020D; # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
+020E; C; 020F; # LATIN CAPITAL LETTER O WITH INVERTED BREVE
+0210; C; 0211; # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
+0212; C; 0213; # LATIN CAPITAL LETTER R WITH INVERTED BREVE
+0214; C; 0215; # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
+0216; C; 0217; # LATIN CAPITAL LETTER U WITH INVERTED BREVE
+0218; C; 0219; # LATIN CAPITAL LETTER S WITH COMMA BELOW
+021A; C; 021B; # LATIN CAPITAL LETTER T WITH COMMA BELOW
+021C; C; 021D; # LATIN CAPITAL LETTER YOGH
+021E; C; 021F; # LATIN CAPITAL LETTER H WITH CARON
+0220; C; 019E; # LATIN CAPITAL LETTER N WITH LONG RIGHT LEG
+0222; C; 0223; # LATIN CAPITAL LETTER OU
+0224; C; 0225; # LATIN CAPITAL LETTER Z WITH HOOK
+0226; C; 0227; # LATIN CAPITAL LETTER A WITH DOT ABOVE
+0228; C; 0229; # LATIN CAPITAL LETTER E WITH CEDILLA
+022A; C; 022B; # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
+022C; C; 022D; # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
+022E; C; 022F; # LATIN CAPITAL LETTER O WITH DOT ABOVE
+0230; C; 0231; # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
+0232; C; 0233; # LATIN CAPITAL LETTER Y WITH MACRON
+023A; C; 2C65; # LATIN CAPITAL LETTER A WITH STROKE
+023B; C; 023C; # LATIN CAPITAL LETTER C WITH STROKE
+023D; C; 019A; # LATIN CAPITAL LETTER L WITH BAR
+023E; C; 2C66; # LATIN CAPITAL LETTER T WITH DIAGONAL STROKE
+0241; C; 0242; # LATIN CAPITAL LETTER GLOTTAL STOP
+0243; C; 0180; # LATIN CAPITAL LETTER B WITH STROKE
+0244; C; 0289; # LATIN CAPITAL LETTER U BAR
+0245; C; 028C; # LATIN CAPITAL LETTER TURNED V
+0246; C; 0247; # LATIN CAPITAL LETTER E WITH STROKE
+0248; C; 0249; # LATIN CAPITAL LETTER J WITH STROKE
+024A; C; 024B; # LATIN CAPITAL LETTER SMALL Q WITH HOOK TAIL
+024C; C; 024D; # LATIN CAPITAL LETTER R WITH STROKE
+024E; C; 024F; # LATIN CAPITAL LETTER Y WITH STROKE
+0345; C; 03B9; # COMBINING GREEK YPOGEGRAMMENI
+0370; C; 0371; # GREEK CAPITAL LETTER HETA
+0372; C; 0373; # GREEK CAPITAL LETTER ARCHAIC SAMPI
+0376; C; 0377; # GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA
+037F; C; 03F3; # GREEK CAPITAL LETTER YOT
+0386; C; 03AC; # GREEK CAPITAL LETTER ALPHA WITH TONOS
+0388; C; 03AD; # GREEK CAPITAL LETTER EPSILON WITH TONOS
+0389; C; 03AE; # GREEK CAPITAL LETTER ETA WITH TONOS
+038A; C; 03AF; # GREEK CAPITAL LETTER IOTA WITH TONOS
+038C; C; 03CC; # GREEK CAPITAL LETTER OMICRON WITH TONOS
+038E; C; 03CD; # GREEK CAPITAL LETTER UPSILON WITH TONOS
+038F; C; 03CE; # GREEK CAPITAL LETTER OMEGA WITH TONOS
+0390; F; 03B9 0308 0301; # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
+0391; C; 03B1; # GREEK CAPITAL LETTER ALPHA
+0392; C; 03B2; # GREEK CAPITAL LETTER BETA
+0393; C; 03B3; # GREEK CAPITAL LETTER GAMMA
+0394; C; 03B4; # GREEK CAPITAL LETTER DELTA
+0395; C; 03B5; # GREEK CAPITAL LETTER EPSILON
+0396; C; 03B6; # GREEK CAPITAL LETTER ZETA
+0397; C; 03B7; # GREEK CAPITAL LETTER ETA
+0398; C; 03B8; # GREEK CAPITAL LETTER THETA
+0399; C; 03B9; # GREEK CAPITAL LETTER IOTA
+039A; C; 03BA; # GREEK CAPITAL LETTER KAPPA
+039B; C; 03BB; # GREEK CAPITAL LETTER LAMDA
+039C; C; 03BC; # GREEK CAPITAL LETTER MU
+039D; C; 03BD; # GREEK CAPITAL LETTER NU
+039E; C; 03BE; # GREEK CAPITAL LETTER XI
+039F; C; 03BF; # GREEK CAPITAL LETTER OMICRON
+03A0; C; 03C0; # GREEK CAPITAL LETTER PI
+03A1; C; 03C1; # GREEK CAPITAL LETTER RHO
+03A3; C; 03C3; # GREEK CAPITAL LETTER SIGMA
+03A4; C; 03C4; # GREEK CAPITAL LETTER TAU
+03A5; C; 03C5; # GREEK CAPITAL LETTER UPSILON
+03A6; C; 03C6; # GREEK CAPITAL LETTER PHI
+03A7; C; 03C7; # GREEK CAPITAL LETTER CHI
+03A8; C; 03C8; # GREEK CAPITAL LETTER PSI
+03A9; C; 03C9; # GREEK CAPITAL LETTER OMEGA
+03AA; C; 03CA; # GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
+03AB; C; 03CB; # GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
+03B0; F; 03C5 0308 0301; # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
+03C2; C; 03C3; # GREEK SMALL LETTER FINAL SIGMA
+03CF; C; 03D7; # GREEK CAPITAL KAI SYMBOL
+03D0; C; 03B2; # GREEK BETA SYMBOL
+03D1; C; 03B8; # GREEK THETA SYMBOL
+03D5; C; 03C6; # GREEK PHI SYMBOL
+03D6; C; 03C0; # GREEK PI SYMBOL
+03D8; C; 03D9; # GREEK LETTER ARCHAIC KOPPA
+03DA; C; 03DB; # GREEK LETTER STIGMA
+03DC; C; 03DD; # GREEK LETTER DIGAMMA
+03DE; C; 03DF; # GREEK LETTER KOPPA
+03E0; C; 03E1; # GREEK LETTER SAMPI
+03E2; C; 03E3; # COPTIC CAPITAL LETTER SHEI
+03E4; C; 03E5; # COPTIC CAPITAL LETTER FEI
+03E6; C; 03E7; # COPTIC CAPITAL LETTER KHEI
+03E8; C; 03E9; # COPTIC CAPITAL LETTER HORI
+03EA; C; 03EB; # COPTIC CAPITAL LETTER GANGIA
+03EC; C; 03ED; # COPTIC CAPITAL LETTER SHIMA
+03EE; C; 03EF; # COPTIC CAPITAL LETTER DEI
+03F0; C; 03BA; # GREEK KAPPA SYMBOL
+03F1; C; 03C1; # GREEK RHO SYMBOL
+03F4; C; 03B8; # GREEK CAPITAL THETA SYMBOL
+03F5; C; 03B5; # GREEK LUNATE EPSILON SYMBOL
+03F7; C; 03F8; # GREEK CAPITAL LETTER SHO
+03F9; C; 03F2; # GREEK CAPITAL LUNATE SIGMA SYMBOL
+03FA; C; 03FB; # GREEK CAPITAL LETTER SAN
+03FD; C; 037B; # GREEK CAPITAL REVERSED LUNATE SIGMA SYMBOL
+03FE; C; 037C; # GREEK CAPITAL DOTTED LUNATE SIGMA SYMBOL
+03FF; C; 037D; # GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL
+0400; C; 0450; # CYRILLIC CAPITAL LETTER IE WITH GRAVE
+0401; C; 0451; # CYRILLIC CAPITAL LETTER IO
+0402; C; 0452; # CYRILLIC CAPITAL LETTER DJE
+0403; C; 0453; # CYRILLIC CAPITAL LETTER GJE
+0404; C; 0454; # CYRILLIC CAPITAL LETTER UKRAINIAN IE
+0405; C; 0455; # CYRILLIC CAPITAL LETTER DZE
+0406; C; 0456; # CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+0407; C; 0457; # CYRILLIC CAPITAL LETTER YI
+0408; C; 0458; # CYRILLIC CAPITAL LETTER JE
+0409; C; 0459; # CYRILLIC CAPITAL LETTER LJE
+040A; C; 045A; # CYRILLIC CAPITAL LETTER NJE
+040B; C; 045B; # CYRILLIC CAPITAL LETTER TSHE
+040C; C; 045C; # CYRILLIC CAPITAL LETTER KJE
+040D; C; 045D; # CYRILLIC CAPITAL LETTER I WITH GRAVE
+040E; C; 045E; # CYRILLIC CAPITAL LETTER SHORT U
+040F; C; 045F; # CYRILLIC CAPITAL LETTER DZHE
+0410; C; 0430; # CYRILLIC CAPITAL LETTER A
+0411; C; 0431; # CYRILLIC CAPITAL LETTER BE
+0412; C; 0432; # CYRILLIC CAPITAL LETTER VE
+0413; C; 0433; # CYRILLIC CAPITAL LETTER GHE
+0414; C; 0434; # CYRILLIC CAPITAL LETTER DE
+0415; C; 0435; # CYRILLIC CAPITAL LETTER IE
+0416; C; 0436; # CYRILLIC CAPITAL LETTER ZHE
+0417; C; 0437; # CYRILLIC CAPITAL LETTER ZE
+0418; C; 0438; # CYRILLIC CAPITAL LETTER I
+0419; C; 0439; # CYRILLIC CAPITAL LETTER SHORT I
+041A; C; 043A; # CYRILLIC CAPITAL LETTER KA
+041B; C; 043B; # CYRILLIC CAPITAL LETTER EL
+041C; C; 043C; # CYRILLIC CAPITAL LETTER EM
+041D; C; 043D; # CYRILLIC CAPITAL LETTER EN
+041E; C; 043E; # CYRILLIC CAPITAL LETTER O
+041F; C; 043F; # CYRILLIC CAPITAL LETTER PE
+0420; C; 0440; # CYRILLIC CAPITAL LETTER ER
+0421; C; 0441; # CYRILLIC CAPITAL LETTER ES
+0422; C; 0442; # CYRILLIC CAPITAL LETTER TE
+0423; C; 0443; # CYRILLIC CAPITAL LETTER U
+0424; C; 0444; # CYRILLIC CAPITAL LETTER EF
+0425; C; 0445; # CYRILLIC CAPITAL LETTER HA
+0426; C; 0446; # CYRILLIC CAPITAL LETTER TSE
+0427; C; 0447; # CYRILLIC CAPITAL LETTER CHE
+0428; C; 0448; # CYRILLIC CAPITAL LETTER SHA
+0429; C; 0449; # CYRILLIC CAPITAL LETTER SHCHA
+042A; C; 044A; # CYRILLIC CAPITAL LETTER HARD SIGN
+042B; C; 044B; # CYRILLIC CAPITAL LETTER YERU
+042C; C; 044C; # CYRILLIC CAPITAL LETTER SOFT SIGN
+042D; C; 044D; # CYRILLIC CAPITAL LETTER E
+042E; C; 044E; # CYRILLIC CAPITAL LETTER YU
+042F; C; 044F; # CYRILLIC CAPITAL LETTER YA
+0460; C; 0461; # CYRILLIC CAPITAL LETTER OMEGA
+0462; C; 0463; # CYRILLIC CAPITAL LETTER YAT
+0464; C; 0465; # CYRILLIC CAPITAL LETTER IOTIFIED E
+0466; C; 0467; # CYRILLIC CAPITAL LETTER LITTLE YUS
+0468; C; 0469; # CYRILLIC CAPITAL LETTER IOTIFIED LITTLE YUS
+046A; C; 046B; # CYRILLIC CAPITAL LETTER BIG YUS
+046C; C; 046D; # CYRILLIC CAPITAL LETTER IOTIFIED BIG YUS
+046E; C; 046F; # CYRILLIC CAPITAL LETTER KSI
+0470; C; 0471; # CYRILLIC CAPITAL LETTER PSI
+0472; C; 0473; # CYRILLIC CAPITAL LETTER FITA
+0474; C; 0475; # CYRILLIC CAPITAL LETTER IZHITSA
+0476; C; 0477; # CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+0478; C; 0479; # CYRILLIC CAPITAL LETTER UK
+047A; C; 047B; # CYRILLIC CAPITAL LETTER ROUND OMEGA
+047C; C; 047D; # CYRILLIC CAPITAL LETTER OMEGA WITH TITLO
+047E; C; 047F; # CYRILLIC CAPITAL LETTER OT
+0480; C; 0481; # CYRILLIC CAPITAL LETTER KOPPA
+048A; C; 048B; # CYRILLIC CAPITAL LETTER SHORT I WITH TAIL
+048C; C; 048D; # CYRILLIC CAPITAL LETTER SEMISOFT SIGN
+048E; C; 048F; # CYRILLIC CAPITAL LETTER ER WITH TICK
+0490; C; 0491; # CYRILLIC CAPITAL LETTER GHE WITH UPTURN
+0492; C; 0493; # CYRILLIC CAPITAL LETTER GHE WITH STROKE
+0494; C; 0495; # CYRILLIC CAPITAL LETTER GHE WITH MIDDLE HOOK
+0496; C; 0497; # CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER
+0498; C; 0499; # CYRILLIC CAPITAL LETTER ZE WITH DESCENDER
+049A; C; 049B; # CYRILLIC CAPITAL LETTER KA WITH DESCENDER
+049C; C; 049D; # CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE
+049E; C; 049F; # CYRILLIC CAPITAL LETTER KA WITH STROKE
+04A0; C; 04A1; # CYRILLIC CAPITAL LETTER BASHKIR KA
+04A2; C; 04A3; # CYRILLIC CAPITAL LETTER EN WITH DESCENDER
+04A4; C; 04A5; # CYRILLIC CAPITAL LIGATURE EN GHE
+04A6; C; 04A7; # CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK
+04A8; C; 04A9; # CYRILLIC CAPITAL LETTER ABKHASIAN HA
+04AA; C; 04AB; # CYRILLIC CAPITAL LETTER ES WITH DESCENDER
+04AC; C; 04AD; # CYRILLIC CAPITAL LETTER TE WITH DESCENDER
+04AE; C; 04AF; # CYRILLIC CAPITAL LETTER STRAIGHT U
+04B0; C; 04B1; # CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE
+04B2; C; 04B3; # CYRILLIC CAPITAL LETTER HA WITH DESCENDER
+04B4; C; 04B5; # CYRILLIC CAPITAL LIGATURE TE TSE
+04B6; C; 04B7; # CYRILLIC CAPITAL LETTER CHE WITH DESCENDER
+04B8; C; 04B9; # CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE
+04BA; C; 04BB; # CYRILLIC CAPITAL LETTER SHHA
+04BC; C; 04BD; # CYRILLIC CAPITAL LETTER ABKHASIAN CHE
+04BE; C; 04BF; # CYRILLIC CAPITAL LETTER ABKHASIAN CHE WITH DESCENDER
+04C0; C; 04CF; # CYRILLIC LETTER PALOCHKA
+04C1; C; 04C2; # CYRILLIC CAPITAL LETTER ZHE WITH BREVE
+04C3; C; 04C4; # CYRILLIC CAPITAL LETTER KA WITH HOOK
+04C5; C; 04C6; # CYRILLIC CAPITAL LETTER EL WITH TAIL
+04C7; C; 04C8; # CYRILLIC CAPITAL LETTER EN WITH HOOK
+04C9; C; 04CA; # CYRILLIC CAPITAL LETTER EN WITH TAIL
+04CB; C; 04CC; # CYRILLIC CAPITAL LETTER KHAKASSIAN CHE
+04CD; C; 04CE; # CYRILLIC CAPITAL LETTER EM WITH TAIL
+04D0; C; 04D1; # CYRILLIC CAPITAL LETTER A WITH BREVE
+04D2; C; 04D3; # CYRILLIC CAPITAL LETTER A WITH DIAERESIS
+04D4; C; 04D5; # CYRILLIC CAPITAL LIGATURE A IE
+04D6; C; 04D7; # CYRILLIC CAPITAL LETTER IE WITH BREVE
+04D8; C; 04D9; # CYRILLIC CAPITAL LETTER SCHWA
+04DA; C; 04DB; # CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS
+04DC; C; 04DD; # CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS
+04DE; C; 04DF; # CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS
+04E0; C; 04E1; # CYRILLIC CAPITAL LETTER ABKHASIAN DZE
+04E2; C; 04E3; # CYRILLIC CAPITAL LETTER I WITH MACRON
+04E4; C; 04E5; # CYRILLIC CAPITAL LETTER I WITH DIAERESIS
+04E6; C; 04E7; # CYRILLIC CAPITAL LETTER O WITH DIAERESIS
+04E8; C; 04E9; # CYRILLIC CAPITAL LETTER BARRED O
+04EA; C; 04EB; # CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS
+04EC; C; 04ED; # CYRILLIC CAPITAL LETTER E WITH DIAERESIS
+04EE; C; 04EF; # CYRILLIC CAPITAL LETTER U WITH MACRON
+04F0; C; 04F1; # CYRILLIC CAPITAL LETTER U WITH DIAERESIS
+04F2; C; 04F3; # CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE
+04F4; C; 04F5; # CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS
+04F6; C; 04F7; # CYRILLIC CAPITAL LETTER GHE WITH DESCENDER
+04F8; C; 04F9; # CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS
+04FA; C; 04FB; # CYRILLIC CAPITAL LETTER GHE WITH STROKE AND HOOK
+04FC; C; 04FD; # CYRILLIC CAPITAL LETTER HA WITH HOOK
+04FE; C; 04FF; # CYRILLIC CAPITAL LETTER HA WITH STROKE
+0500; C; 0501; # CYRILLIC CAPITAL LETTER KOMI DE
+0502; C; 0503; # CYRILLIC CAPITAL LETTER KOMI DJE
+0504; C; 0505; # CYRILLIC CAPITAL LETTER KOMI ZJE
+0506; C; 0507; # CYRILLIC CAPITAL LETTER KOMI DZJE
+0508; C; 0509; # CYRILLIC CAPITAL LETTER KOMI LJE
+050A; C; 050B; # CYRILLIC CAPITAL LETTER KOMI NJE
+050C; C; 050D; # CYRILLIC CAPITAL LETTER KOMI SJE
+050E; C; 050F; # CYRILLIC CAPITAL LETTER KOMI TJE
+0510; C; 0511; # CYRILLIC CAPITAL LETTER REVERSED ZE
+0512; C; 0513; # CYRILLIC CAPITAL LETTER EL WITH HOOK
+0514; C; 0515; # CYRILLIC CAPITAL LETTER LHA
+0516; C; 0517; # CYRILLIC CAPITAL LETTER RHA
+0518; C; 0519; # CYRILLIC CAPITAL LETTER YAE
+051A; C; 051B; # CYRILLIC CAPITAL LETTER QA
+051C; C; 051D; # CYRILLIC CAPITAL LETTER WE
+051E; C; 051F; # CYRILLIC CAPITAL LETTER ALEUT KA
+0520; C; 0521; # CYRILLIC CAPITAL LETTER EL WITH MIDDLE HOOK
+0522; C; 0523; # CYRILLIC CAPITAL LETTER EN WITH MIDDLE HOOK
+0524; C; 0525; # CYRILLIC CAPITAL LETTER PE WITH DESCENDER
+0526; C; 0527; # CYRILLIC CAPITAL LETTER SHHA WITH DESCENDER
+0528; C; 0529; # CYRILLIC CAPITAL LETTER EN WITH LEFT HOOK
+052A; C; 052B; # CYRILLIC CAPITAL LETTER DZZHE
+052C; C; 052D; # CYRILLIC CAPITAL LETTER DCHE
+052E; C; 052F; # CYRILLIC CAPITAL LETTER EL WITH DESCENDER
+0531; C; 0561; # ARMENIAN CAPITAL LETTER AYB
+0532; C; 0562; # ARMENIAN CAPITAL LETTER BEN
+0533; C; 0563; # ARMENIAN CAPITAL LETTER GIM
+0534; C; 0564; # ARMENIAN CAPITAL LETTER DA
+0535; C; 0565; # ARMENIAN CAPITAL LETTER ECH
+0536; C; 0566; # ARMENIAN CAPITAL LETTER ZA
+0537; C; 0567; # ARMENIAN CAPITAL LETTER EH
+0538; C; 0568; # ARMENIAN CAPITAL LETTER ET
+0539; C; 0569; # ARMENIAN CAPITAL LETTER TO
+053A; C; 056A; # ARMENIAN CAPITAL LETTER ZHE
+053B; C; 056B; # ARMENIAN CAPITAL LETTER INI
+053C; C; 056C; # ARMENIAN CAPITAL LETTER LIWN
+053D; C; 056D; # ARMENIAN CAPITAL LETTER XEH
+053E; C; 056E; # ARMENIAN CAPITAL LETTER CA
+053F; C; 056F; # ARMENIAN CAPITAL LETTER KEN
+0540; C; 0570; # ARMENIAN CAPITAL LETTER HO
+0541; C; 0571; # ARMENIAN CAPITAL LETTER JA
+0542; C; 0572; # ARMENIAN CAPITAL LETTER GHAD
+0543; C; 0573; # ARMENIAN CAPITAL LETTER CHEH
+0544; C; 0574; # ARMENIAN CAPITAL LETTER MEN
+0545; C; 0575; # ARMENIAN CAPITAL LETTER YI
+0546; C; 0576; # ARMENIAN CAPITAL LETTER NOW
+0547; C; 0577; # ARMENIAN CAPITAL LETTER SHA
+0548; C; 0578; # ARMENIAN CAPITAL LETTER VO
+0549; C; 0579; # ARMENIAN CAPITAL LETTER CHA
+054A; C; 057A; # ARMENIAN CAPITAL LETTER PEH
+054B; C; 057B; # ARMENIAN CAPITAL LETTER JHEH
+054C; C; 057C; # ARMENIAN CAPITAL LETTER RA
+054D; C; 057D; # ARMENIAN CAPITAL LETTER SEH
+054E; C; 057E; # ARMENIAN CAPITAL LETTER VEW
+054F; C; 057F; # ARMENIAN CAPITAL LETTER TIWN
+0550; C; 0580; # ARMENIAN CAPITAL LETTER REH
+0551; C; 0581; # ARMENIAN CAPITAL LETTER CO
+0552; C; 0582; # ARMENIAN CAPITAL LETTER YIWN
+0553; C; 0583; # ARMENIAN CAPITAL LETTER PIWR
+0554; C; 0584; # ARMENIAN CAPITAL LETTER KEH
+0555; C; 0585; # ARMENIAN CAPITAL LETTER OH
+0556; C; 0586; # ARMENIAN CAPITAL LETTER FEH
+0587; F; 0565 0582; # ARMENIAN SMALL LIGATURE ECH YIWN
+10A0; C; 2D00; # GEORGIAN CAPITAL LETTER AN
+10A1; C; 2D01; # GEORGIAN CAPITAL LETTER BAN
+10A2; C; 2D02; # GEORGIAN CAPITAL LETTER GAN
+10A3; C; 2D03; # GEORGIAN CAPITAL LETTER DON
+10A4; C; 2D04; # GEORGIAN CAPITAL LETTER EN
+10A5; C; 2D05; # GEORGIAN CAPITAL LETTER VIN
+10A6; C; 2D06; # GEORGIAN CAPITAL LETTER ZEN
+10A7; C; 2D07; # GEORGIAN CAPITAL LETTER TAN
+10A8; C; 2D08; # GEORGIAN CAPITAL LETTER IN
+10A9; C; 2D09; # GEORGIAN CAPITAL LETTER KAN
+10AA; C; 2D0A; # GEORGIAN CAPITAL LETTER LAS
+10AB; C; 2D0B; # GEORGIAN CAPITAL LETTER MAN
+10AC; C; 2D0C; # GEORGIAN CAPITAL LETTER NAR
+10AD; C; 2D0D; # GEORGIAN CAPITAL LETTER ON
+10AE; C; 2D0E; # GEORGIAN CAPITAL LETTER PAR
+10AF; C; 2D0F; # GEORGIAN CAPITAL LETTER ZHAR
+10B0; C; 2D10; # GEORGIAN CAPITAL LETTER RAE
+10B1; C; 2D11; # GEORGIAN CAPITAL LETTER SAN
+10B2; C; 2D12; # GEORGIAN CAPITAL LETTER TAR
+10B3; C; 2D13; # GEORGIAN CAPITAL LETTER UN
+10B4; C; 2D14; # GEORGIAN CAPITAL LETTER PHAR
+10B5; C; 2D15; # GEORGIAN CAPITAL LETTER KHAR
+10B6; C; 2D16; # GEORGIAN CAPITAL LETTER GHAN
+10B7; C; 2D17; # GEORGIAN CAPITAL LETTER QAR
+10B8; C; 2D18; # GEORGIAN CAPITAL LETTER SHIN
+10B9; C; 2D19; # GEORGIAN CAPITAL LETTER CHIN
+10BA; C; 2D1A; # GEORGIAN CAPITAL LETTER CAN
+10BB; C; 2D1B; # GEORGIAN CAPITAL LETTER JIL
+10BC; C; 2D1C; # GEORGIAN CAPITAL LETTER CIL
+10BD; C; 2D1D; # GEORGIAN CAPITAL LETTER CHAR
+10BE; C; 2D1E; # GEORGIAN CAPITAL LETTER XAN
+10BF; C; 2D1F; # GEORGIAN CAPITAL LETTER JHAN
+10C0; C; 2D20; # GEORGIAN CAPITAL LETTER HAE
+10C1; C; 2D21; # GEORGIAN CAPITAL LETTER HE
+10C2; C; 2D22; # GEORGIAN CAPITAL LETTER HIE
+10C3; C; 2D23; # GEORGIAN CAPITAL LETTER WE
+10C4; C; 2D24; # GEORGIAN CAPITAL LETTER HAR
+10C5; C; 2D25; # GEORGIAN CAPITAL LETTER HOE
+10C7; C; 2D27; # GEORGIAN CAPITAL LETTER YN
+10CD; C; 2D2D; # GEORGIAN CAPITAL LETTER AEN
+13F8; C; 13F0; # CHEROKEE SMALL LETTER YE
+13F9; C; 13F1; # CHEROKEE SMALL LETTER YI
+13FA; C; 13F2; # CHEROKEE SMALL LETTER YO
+13FB; C; 13F3; # CHEROKEE SMALL LETTER YU
+13FC; C; 13F4; # CHEROKEE SMALL LETTER YV
+13FD; C; 13F5; # CHEROKEE SMALL LETTER MV
+1E00; C; 1E01; # LATIN CAPITAL LETTER A WITH RING BELOW
+1E02; C; 1E03; # LATIN CAPITAL LETTER B WITH DOT ABOVE
+1E04; C; 1E05; # LATIN CAPITAL LETTER B WITH DOT BELOW
+1E06; C; 1E07; # LATIN CAPITAL LETTER B WITH LINE BELOW
+1E08; C; 1E09; # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
+1E0A; C; 1E0B; # LATIN CAPITAL LETTER D WITH DOT ABOVE
+1E0C; C; 1E0D; # LATIN CAPITAL LETTER D WITH DOT BELOW
+1E0E; C; 1E0F; # LATIN CAPITAL LETTER D WITH LINE BELOW
+1E10; C; 1E11; # LATIN CAPITAL LETTER D WITH CEDILLA
+1E12; C; 1E13; # LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW
+1E14; C; 1E15; # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
+1E16; C; 1E17; # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
+1E18; C; 1E19; # LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW
+1E1A; C; 1E1B; # LATIN CAPITAL LETTER E WITH TILDE BELOW
+1E1C; C; 1E1D; # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
+1E1E; C; 1E1F; # LATIN CAPITAL LETTER F WITH DOT ABOVE
+1E20; C; 1E21; # LATIN CAPITAL LETTER G WITH MACRON
+1E22; C; 1E23; # LATIN CAPITAL LETTER H WITH DOT ABOVE
+1E24; C; 1E25; # LATIN CAPITAL LETTER H WITH DOT BELOW
+1E26; C; 1E27; # LATIN CAPITAL LETTER H WITH DIAERESIS
+1E28; C; 1E29; # LATIN CAPITAL LETTER H WITH CEDILLA
+1E2A; C; 1E2B; # LATIN CAPITAL LETTER H WITH BREVE BELOW
+1E2C; C; 1E2D; # LATIN CAPITAL LETTER I WITH TILDE BELOW
+1E2E; C; 1E2F; # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
+1E30; C; 1E31; # LATIN CAPITAL LETTER K WITH ACUTE
+1E32; C; 1E33; # LATIN CAPITAL LETTER K WITH DOT BELOW
+1E34; C; 1E35; # LATIN CAPITAL LETTER K WITH LINE BELOW
+1E36; C; 1E37; # LATIN CAPITAL LETTER L WITH DOT BELOW
+1E38; C; 1E39; # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
+1E3A; C; 1E3B; # LATIN CAPITAL LETTER L WITH LINE BELOW
+1E3C; C; 1E3D; # LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW
+1E3E; C; 1E3F; # LATIN CAPITAL LETTER M WITH ACUTE
+1E40; C; 1E41; # LATIN CAPITAL LETTER M WITH DOT ABOVE
+1E42; C; 1E43; # LATIN CAPITAL LETTER M WITH DOT BELOW
+1E44; C; 1E45; # LATIN CAPITAL LETTER N WITH DOT ABOVE
+1E46; C; 1E47; # LATIN CAPITAL LETTER N WITH DOT BELOW
+1E48; C; 1E49; # LATIN CAPITAL LETTER N WITH LINE BELOW
+1E4A; C; 1E4B; # LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW
+1E4C; C; 1E4D; # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
+1E4E; C; 1E4F; # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
+1E50; C; 1E51; # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
+1E52; C; 1E53; # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
+1E54; C; 1E55; # LATIN CAPITAL LETTER P WITH ACUTE
+1E56; C; 1E57; # LATIN CAPITAL LETTER P WITH DOT ABOVE
+1E58; C; 1E59; # LATIN CAPITAL LETTER R WITH DOT ABOVE
+1E5A; C; 1E5B; # LATIN CAPITAL LETTER R WITH DOT BELOW
+1E5C; C; 1E5D; # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
+1E5E; C; 1E5F; # LATIN CAPITAL LETTER R WITH LINE BELOW
+1E60; C; 1E61; # LATIN CAPITAL LETTER S WITH DOT ABOVE
+1E62; C; 1E63; # LATIN CAPITAL LETTER S WITH DOT BELOW
+1E64; C; 1E65; # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
+1E66; C; 1E67; # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
+1E68; C; 1E69; # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
+1E6A; C; 1E6B; # LATIN CAPITAL LETTER T WITH DOT ABOVE
+1E6C; C; 1E6D; # LATIN CAPITAL LETTER T WITH DOT BELOW
+1E6E; C; 1E6F; # LATIN CAPITAL LETTER T WITH LINE BELOW
+1E70; C; 1E71; # LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW
+1E72; C; 1E73; # LATIN CAPITAL LETTER U WITH DIAERESIS BELOW
+1E74; C; 1E75; # LATIN CAPITAL LETTER U WITH TILDE BELOW
+1E76; C; 1E77; # LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW
+1E78; C; 1E79; # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
+1E7A; C; 1E7B; # LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS
+1E7C; C; 1E7D; # LATIN CAPITAL LETTER V WITH TILDE
+1E7E; C; 1E7F; # LATIN CAPITAL LETTER V WITH DOT BELOW
+1E80; C; 1E81; # LATIN CAPITAL LETTER W WITH GRAVE
+1E82; C; 1E83; # LATIN CAPITAL LETTER W WITH ACUTE
+1E84; C; 1E85; # LATIN CAPITAL LETTER W WITH DIAERESIS
+1E86; C; 1E87; # LATIN CAPITAL LETTER W WITH DOT ABOVE
+1E88; C; 1E89; # LATIN CAPITAL LETTER W WITH DOT BELOW
+1E8A; C; 1E8B; # LATIN CAPITAL LETTER X WITH DOT ABOVE
+1E8C; C; 1E8D; # LATIN CAPITAL LETTER X WITH DIAERESIS
+1E8E; C; 1E8F; # LATIN CAPITAL LETTER Y WITH DOT ABOVE
+1E90; C; 1E91; # LATIN CAPITAL LETTER Z WITH CIRCUMFLEX
+1E92; C; 1E93; # LATIN CAPITAL LETTER Z WITH DOT BELOW
+1E94; C; 1E95; # LATIN CAPITAL LETTER Z WITH LINE BELOW
+1E96; F; 0068 0331; # LATIN SMALL LETTER H WITH LINE BELOW
+1E97; F; 0074 0308; # LATIN SMALL LETTER T WITH DIAERESIS
+1E98; F; 0077 030A; # LATIN SMALL LETTER W WITH RING ABOVE
+1E99; F; 0079 030A; # LATIN SMALL LETTER Y WITH RING ABOVE
+1E9A; F; 0061 02BE; # LATIN SMALL LETTER A WITH RIGHT HALF RING
+1E9B; C; 1E61; # LATIN SMALL LETTER LONG S WITH DOT ABOVE
+1E9E; F; 0073 0073; # LATIN CAPITAL LETTER SHARP S
+1E9E; S; 00DF; # LATIN CAPITAL LETTER SHARP S
+1EA0; C; 1EA1; # LATIN CAPITAL LETTER A WITH DOT BELOW
+1EA2; C; 1EA3; # LATIN CAPITAL LETTER A WITH HOOK ABOVE
+1EA4; C; 1EA5; # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
+1EA6; C; 1EA7; # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
+1EA8; C; 1EA9; # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
+1EAA; C; 1EAB; # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
+1EAC; C; 1EAD; # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
+1EAE; C; 1EAF; # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
+1EB0; C; 1EB1; # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
+1EB2; C; 1EB3; # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
+1EB4; C; 1EB5; # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
+1EB6; C; 1EB7; # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
+1EB8; C; 1EB9; # LATIN CAPITAL LETTER E WITH DOT BELOW
+1EBA; C; 1EBB; # LATIN CAPITAL LETTER E WITH HOOK ABOVE
+1EBC; C; 1EBD; # LATIN CAPITAL LETTER E WITH TILDE
+1EBE; C; 1EBF; # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
+1EC0; C; 1EC1; # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
+1EC2; C; 1EC3; # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
+1EC4; C; 1EC5; # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
+1EC6; C; 1EC7; # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
+1EC8; C; 1EC9; # LATIN CAPITAL LETTER I WITH HOOK ABOVE
+1ECA; C; 1ECB; # LATIN CAPITAL LETTER I WITH DOT BELOW
+1ECC; C; 1ECD; # LATIN CAPITAL LETTER O WITH DOT BELOW
+1ECE; C; 1ECF; # LATIN CAPITAL LETTER O WITH HOOK ABOVE
+1ED0; C; 1ED1; # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
+1ED2; C; 1ED3; # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
+1ED4; C; 1ED5; # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
+1ED6; C; 1ED7; # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
+1ED8; C; 1ED9; # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
+1EDA; C; 1EDB; # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
+1EDC; C; 1EDD; # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
+1EDE; C; 1EDF; # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
+1EE0; C; 1EE1; # LATIN CAPITAL LETTER O WITH HORN AND TILDE
+1EE2; C; 1EE3; # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
+1EE4; C; 1EE5; # LATIN CAPITAL LETTER U WITH DOT BELOW
+1EE6; C; 1EE7; # LATIN CAPITAL LETTER U WITH HOOK ABOVE
+1EE8; C; 1EE9; # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
+1EEA; C; 1EEB; # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
+1EEC; C; 1EED; # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
+1EEE; C; 1EEF; # LATIN CAPITAL LETTER U WITH HORN AND TILDE
+1EF0; C; 1EF1; # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
+1EF2; C; 1EF3; # LATIN CAPITAL LETTER Y WITH GRAVE
+1EF4; C; 1EF5; # LATIN CAPITAL LETTER Y WITH DOT BELOW
+1EF6; C; 1EF7; # LATIN CAPITAL LETTER Y WITH HOOK ABOVE
+1EF8; C; 1EF9; # LATIN CAPITAL LETTER Y WITH TILDE
+1EFA; C; 1EFB; # LATIN CAPITAL LETTER MIDDLE-WELSH LL
+1EFC; C; 1EFD; # LATIN CAPITAL LETTER MIDDLE-WELSH V
+1EFE; C; 1EFF; # LATIN CAPITAL LETTER Y WITH LOOP
+1F08; C; 1F00; # GREEK CAPITAL LETTER ALPHA WITH PSILI
+1F09; C; 1F01; # GREEK CAPITAL LETTER ALPHA WITH DASIA
+1F0A; C; 1F02; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
+1F0B; C; 1F03; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
+1F0C; C; 1F04; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
+1F0D; C; 1F05; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
+1F0E; C; 1F06; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
+1F0F; C; 1F07; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
+1F18; C; 1F10; # GREEK CAPITAL LETTER EPSILON WITH PSILI
+1F19; C; 1F11; # GREEK CAPITAL LETTER EPSILON WITH DASIA
+1F1A; C; 1F12; # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
+1F1B; C; 1F13; # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
+1F1C; C; 1F14; # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
+1F1D; C; 1F15; # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
+1F28; C; 1F20; # GREEK CAPITAL LETTER ETA WITH PSILI
+1F29; C; 1F21; # GREEK CAPITAL LETTER ETA WITH DASIA
+1F2A; C; 1F22; # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
+1F2B; C; 1F23; # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
+1F2C; C; 1F24; # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
+1F2D; C; 1F25; # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
+1F2E; C; 1F26; # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
+1F2F; C; 1F27; # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
+1F38; C; 1F30; # GREEK CAPITAL LETTER IOTA WITH PSILI
+1F39; C; 1F31; # GREEK CAPITAL LETTER IOTA WITH DASIA
+1F3A; C; 1F32; # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
+1F3B; C; 1F33; # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
+1F3C; C; 1F34; # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
+1F3D; C; 1F35; # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
+1F3E; C; 1F36; # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
+1F3F; C; 1F37; # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
+1F48; C; 1F40; # GREEK CAPITAL LETTER OMICRON WITH PSILI
+1F49; C; 1F41; # GREEK CAPITAL LETTER OMICRON WITH DASIA
+1F4A; C; 1F42; # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
+1F4B; C; 1F43; # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
+1F4C; C; 1F44; # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
+1F4D; C; 1F45; # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
+1F50; F; 03C5 0313; # GREEK SMALL LETTER UPSILON WITH PSILI
+1F52; F; 03C5 0313 0300; # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
+1F54; F; 03C5 0313 0301; # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
+1F56; F; 03C5 0313 0342; # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
+1F59; C; 1F51; # GREEK CAPITAL LETTER UPSILON WITH DASIA
+1F5B; C; 1F53; # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
+1F5D; C; 1F55; # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
+1F5F; C; 1F57; # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
+1F68; C; 1F60; # GREEK CAPITAL LETTER OMEGA WITH PSILI
+1F69; C; 1F61; # GREEK CAPITAL LETTER OMEGA WITH DASIA
+1F6A; C; 1F62; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
+1F6B; C; 1F63; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
+1F6C; C; 1F64; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
+1F6D; C; 1F65; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
+1F6E; C; 1F66; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
+1F6F; C; 1F67; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
+1F80; F; 1F00 03B9; # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
+1F81; F; 1F01 03B9; # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
+1F82; F; 1F02 03B9; # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+1F83; F; 1F03 03B9; # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+1F84; F; 1F04 03B9; # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+1F85; F; 1F05 03B9; # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+1F86; F; 1F06 03B9; # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+1F87; F; 1F07 03B9; # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+1F88; F; 1F00 03B9; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
+1F88; S; 1F80; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
+1F89; F; 1F01 03B9; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
+1F89; S; 1F81; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
+1F8A; F; 1F02 03B9; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+1F8A; S; 1F82; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+1F8B; F; 1F03 03B9; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+1F8B; S; 1F83; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+1F8C; F; 1F04 03B9; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+1F8C; S; 1F84; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+1F8D; F; 1F05 03B9; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+1F8D; S; 1F85; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+1F8E; F; 1F06 03B9; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+1F8E; S; 1F86; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+1F8F; F; 1F07 03B9; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+1F8F; S; 1F87; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+1F90; F; 1F20 03B9; # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
+1F91; F; 1F21 03B9; # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
+1F92; F; 1F22 03B9; # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+1F93; F; 1F23 03B9; # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+1F94; F; 1F24 03B9; # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+1F95; F; 1F25 03B9; # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+1F96; F; 1F26 03B9; # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+1F97; F; 1F27 03B9; # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+1F98; F; 1F20 03B9; # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
+1F98; S; 1F90; # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
+1F99; F; 1F21 03B9; # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
+1F99; S; 1F91; # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
+1F9A; F; 1F22 03B9; # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+1F9A; S; 1F92; # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+1F9B; F; 1F23 03B9; # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+1F9B; S; 1F93; # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+1F9C; F; 1F24 03B9; # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+1F9C; S; 1F94; # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+1F9D; F; 1F25 03B9; # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+1F9D; S; 1F95; # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+1F9E; F; 1F26 03B9; # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+1F9E; S; 1F96; # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+1F9F; F; 1F27 03B9; # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+1F9F; S; 1F97; # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+1FA0; F; 1F60 03B9; # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
+1FA1; F; 1F61 03B9; # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
+1FA2; F; 1F62 03B9; # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+1FA3; F; 1F63 03B9; # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+1FA4; F; 1F64 03B9; # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+1FA5; F; 1F65 03B9; # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+1FA6; F; 1F66 03B9; # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+1FA7; F; 1F67 03B9; # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+1FA8; F; 1F60 03B9; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
+1FA8; S; 1FA0; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
+1FA9; F; 1F61 03B9; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
+1FA9; S; 1FA1; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
+1FAA; F; 1F62 03B9; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+1FAA; S; 1FA2; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+1FAB; F; 1F63 03B9; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+1FAB; S; 1FA3; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+1FAC; F; 1F64 03B9; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+1FAC; S; 1FA4; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+1FAD; F; 1F65 03B9; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+1FAD; S; 1FA5; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+1FAE; F; 1F66 03B9; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+1FAE; S; 1FA6; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+1FAF; F; 1F67 03B9; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+1FAF; S; 1FA7; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+1FB2; F; 1F70 03B9; # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
+1FB3; F; 03B1 03B9; # GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI
+1FB4; F; 03AC 03B9; # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
+1FB6; F; 03B1 0342; # GREEK SMALL LETTER ALPHA WITH PERISPOMENI
+1FB7; F; 03B1 0342 03B9; # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
+1FB8; C; 1FB0; # GREEK CAPITAL LETTER ALPHA WITH VRACHY
+1FB9; C; 1FB1; # GREEK CAPITAL LETTER ALPHA WITH MACRON
+1FBA; C; 1F70; # GREEK CAPITAL LETTER ALPHA WITH VARIA
+1FBB; C; 1F71; # GREEK CAPITAL LETTER ALPHA WITH OXIA
+1FBC; F; 03B1 03B9; # GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
+1FBC; S; 1FB3; # GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
+1FBE; C; 03B9; # GREEK PROSGEGRAMMENI
+1FC2; F; 1F74 03B9; # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
+1FC3; F; 03B7 03B9; # GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI
+1FC4; F; 03AE 03B9; # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
+1FC6; F; 03B7 0342; # GREEK SMALL LETTER ETA WITH PERISPOMENI
+1FC7; F; 03B7 0342 03B9; # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
+1FC8; C; 1F72; # GREEK CAPITAL LETTER EPSILON WITH VARIA
+1FC9; C; 1F73; # GREEK CAPITAL LETTER EPSILON WITH OXIA
+1FCA; C; 1F74; # GREEK CAPITAL LETTER ETA WITH VARIA
+1FCB; C; 1F75; # GREEK CAPITAL LETTER ETA WITH OXIA
+1FCC; F; 03B7 03B9; # GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI
+1FCC; S; 1FC3; # GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI
+1FD2; F; 03B9 0308 0300; # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
+1FD3; F; 03B9 0308 0301; # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA
+1FD6; F; 03B9 0342; # GREEK SMALL LETTER IOTA WITH PERISPOMENI
+1FD7; F; 03B9 0308 0342; # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
+1FD8; C; 1FD0; # GREEK CAPITAL LETTER IOTA WITH VRACHY
+1FD9; C; 1FD1; # GREEK CAPITAL LETTER IOTA WITH MACRON
+1FDA; C; 1F76; # GREEK CAPITAL LETTER IOTA WITH VARIA
+1FDB; C; 1F77; # GREEK CAPITAL LETTER IOTA WITH OXIA
+1FE2; F; 03C5 0308 0300; # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
+1FE3; F; 03C5 0308 0301; # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND OXIA
+1FE4; F; 03C1 0313; # GREEK SMALL LETTER RHO WITH PSILI
+1FE6; F; 03C5 0342; # GREEK SMALL LETTER UPSILON WITH PERISPOMENI
+1FE7; F; 03C5 0308 0342; # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
+1FE8; C; 1FE0; # GREEK CAPITAL LETTER UPSILON WITH VRACHY
+1FE9; C; 1FE1; # GREEK CAPITAL LETTER UPSILON WITH MACRON
+1FEA; C; 1F7A; # GREEK CAPITAL LETTER UPSILON WITH VARIA
+1FEB; C; 1F7B; # GREEK CAPITAL LETTER UPSILON WITH OXIA
+1FEC; C; 1FE5; # GREEK CAPITAL LETTER RHO WITH DASIA
+1FF2; F; 1F7C 03B9; # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
+1FF3; F; 03C9 03B9; # GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
+1FF4; F; 03CE 03B9; # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
+1FF6; F; 03C9 0342; # GREEK SMALL LETTER OMEGA WITH PERISPOMENI
+1FF7; F; 03C9 0342 03B9; # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
+1FF8; C; 1F78; # GREEK CAPITAL LETTER OMICRON WITH VARIA
+1FF9; C; 1F79; # GREEK CAPITAL LETTER OMICRON WITH OXIA
+1FFA; C; 1F7C; # GREEK CAPITAL LETTER OMEGA WITH VARIA
+1FFB; C; 1F7D; # GREEK CAPITAL LETTER OMEGA WITH OXIA
+1FFC; F; 03C9 03B9; # GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI
+1FFC; S; 1FF3; # GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI
+2126; C; 03C9; # OHM SIGN
+212A; C; 006B; # KELVIN SIGN
+212B; C; 00E5; # ANGSTROM SIGN
+2132; C; 214E; # TURNED CAPITAL F
+2160; C; 2170; # ROMAN NUMERAL ONE
+2161; C; 2171; # ROMAN NUMERAL TWO
+2162; C; 2172; # ROMAN NUMERAL THREE
+2163; C; 2173; # ROMAN NUMERAL FOUR
+2164; C; 2174; # ROMAN NUMERAL FIVE
+2165; C; 2175; # ROMAN NUMERAL SIX
+2166; C; 2176; # ROMAN NUMERAL SEVEN
+2167; C; 2177; # ROMAN NUMERAL EIGHT
+2168; C; 2178; # ROMAN NUMERAL NINE
+2169; C; 2179; # ROMAN NUMERAL TEN
+216A; C; 217A; # ROMAN NUMERAL ELEVEN
+216B; C; 217B; # ROMAN NUMERAL TWELVE
+216C; C; 217C; # ROMAN NUMERAL FIFTY
+216D; C; 217D; # ROMAN NUMERAL ONE HUNDRED
+216E; C; 217E; # ROMAN NUMERAL FIVE HUNDRED
+216F; C; 217F; # ROMAN NUMERAL ONE THOUSAND
+2183; C; 2184; # ROMAN NUMERAL REVERSED ONE HUNDRED
+24B6; C; 24D0; # CIRCLED LATIN CAPITAL LETTER A
+24B7; C; 24D1; # CIRCLED LATIN CAPITAL LETTER B
+24B8; C; 24D2; # CIRCLED LATIN CAPITAL LETTER C
+24B9; C; 24D3; # CIRCLED LATIN CAPITAL LETTER D
+24BA; C; 24D4; # CIRCLED LATIN CAPITAL LETTER E
+24BB; C; 24D5; # CIRCLED LATIN CAPITAL LETTER F
+24BC; C; 24D6; # CIRCLED LATIN CAPITAL LETTER G
+24BD; C; 24D7; # CIRCLED LATIN CAPITAL LETTER H
+24BE; C; 24D8; # CIRCLED LATIN CAPITAL LETTER I
+24BF; C; 24D9; # CIRCLED LATIN CAPITAL LETTER J
+24C0; C; 24DA; # CIRCLED LATIN CAPITAL LETTER K
+24C1; C; 24DB; # CIRCLED LATIN CAPITAL LETTER L
+24C2; C; 24DC; # CIRCLED LATIN CAPITAL LETTER M
+24C3; C; 24DD; # CIRCLED LATIN CAPITAL LETTER N
+24C4; C; 24DE; # CIRCLED LATIN CAPITAL LETTER O
+24C5; C; 24DF; # CIRCLED LATIN CAPITAL LETTER P
+24C6; C; 24E0; # CIRCLED LATIN CAPITAL LETTER Q
+24C7; C; 24E1; # CIRCLED LATIN CAPITAL LETTER R
+24C8; C; 24E2; # CIRCLED LATIN CAPITAL LETTER S
+24C9; C; 24E3; # CIRCLED LATIN CAPITAL LETTER T
+24CA; C; 24E4; # CIRCLED LATIN CAPITAL LETTER U
+24CB; C; 24E5; # CIRCLED LATIN CAPITAL LETTER V
+24CC; C; 24E6; # CIRCLED LATIN CAPITAL LETTER W
+24CD; C; 24E7; # CIRCLED LATIN CAPITAL LETTER X
+24CE; C; 24E8; # CIRCLED LATIN CAPITAL LETTER Y
+24CF; C; 24E9; # CIRCLED LATIN CAPITAL LETTER Z
+2C00; C; 2C30; # GLAGOLITIC CAPITAL LETTER AZU
+2C01; C; 2C31; # GLAGOLITIC CAPITAL LETTER BUKY
+2C02; C; 2C32; # GLAGOLITIC CAPITAL LETTER VEDE
+2C03; C; 2C33; # GLAGOLITIC CAPITAL LETTER GLAGOLI
+2C04; C; 2C34; # GLAGOLITIC CAPITAL LETTER DOBRO
+2C05; C; 2C35; # GLAGOLITIC CAPITAL LETTER YESTU
+2C06; C; 2C36; # GLAGOLITIC CAPITAL LETTER ZHIVETE
+2C07; C; 2C37; # GLAGOLITIC CAPITAL LETTER DZELO
+2C08; C; 2C38; # GLAGOLITIC CAPITAL LETTER ZEMLJA
+2C09; C; 2C39; # GLAGOLITIC CAPITAL LETTER IZHE
+2C0A; C; 2C3A; # GLAGOLITIC CAPITAL LETTER INITIAL IZHE
+2C0B; C; 2C3B; # GLAGOLITIC CAPITAL LETTER I
+2C0C; C; 2C3C; # GLAGOLITIC CAPITAL LETTER DJERVI
+2C0D; C; 2C3D; # GLAGOLITIC CAPITAL LETTER KAKO
+2C0E; C; 2C3E; # GLAGOLITIC CAPITAL LETTER LJUDIJE
+2C0F; C; 2C3F; # GLAGOLITIC CAPITAL LETTER MYSLITE
+2C10; C; 2C40; # GLAGOLITIC CAPITAL LETTER NASHI
+2C11; C; 2C41; # GLAGOLITIC CAPITAL LETTER ONU
+2C12; C; 2C42; # GLAGOLITIC CAPITAL LETTER POKOJI
+2C13; C; 2C43; # GLAGOLITIC CAPITAL LETTER RITSI
+2C14; C; 2C44; # GLAGOLITIC CAPITAL LETTER SLOVO
+2C15; C; 2C45; # GLAGOLITIC CAPITAL LETTER TVRIDO
+2C16; C; 2C46; # GLAGOLITIC CAPITAL LETTER UKU
+2C17; C; 2C47; # GLAGOLITIC CAPITAL LETTER FRITU
+2C18; C; 2C48; # GLAGOLITIC CAPITAL LETTER HERU
+2C19; C; 2C49; # GLAGOLITIC CAPITAL LETTER OTU
+2C1A; C; 2C4A; # GLAGOLITIC CAPITAL LETTER PE
+2C1B; C; 2C4B; # GLAGOLITIC CAPITAL LETTER SHTA
+2C1C; C; 2C4C; # GLAGOLITIC CAPITAL LETTER TSI
+2C1D; C; 2C4D; # GLAGOLITIC CAPITAL LETTER CHRIVI
+2C1E; C; 2C4E; # GLAGOLITIC CAPITAL LETTER SHA
+2C1F; C; 2C4F; # GLAGOLITIC CAPITAL LETTER YERU
+2C20; C; 2C50; # GLAGOLITIC CAPITAL LETTER YERI
+2C21; C; 2C51; # GLAGOLITIC CAPITAL LETTER YATI
+2C22; C; 2C52; # GLAGOLITIC CAPITAL LETTER SPIDERY HA
+2C23; C; 2C53; # GLAGOLITIC CAPITAL LETTER YU
+2C24; C; 2C54; # GLAGOLITIC CAPITAL LETTER SMALL YUS
+2C25; C; 2C55; # GLAGOLITIC CAPITAL LETTER SMALL YUS WITH TAIL
+2C26; C; 2C56; # GLAGOLITIC CAPITAL LETTER YO
+2C27; C; 2C57; # GLAGOLITIC CAPITAL LETTER IOTATED SMALL YUS
+2C28; C; 2C58; # GLAGOLITIC CAPITAL LETTER BIG YUS
+2C29; C; 2C59; # GLAGOLITIC CAPITAL LETTER IOTATED BIG YUS
+2C2A; C; 2C5A; # GLAGOLITIC CAPITAL LETTER FITA
+2C2B; C; 2C5B; # GLAGOLITIC CAPITAL LETTER IZHITSA
+2C2C; C; 2C5C; # GLAGOLITIC CAPITAL LETTER SHTAPIC
+2C2D; C; 2C5D; # GLAGOLITIC CAPITAL LETTER TROKUTASTI A
+2C2E; C; 2C5E; # GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE
+2C60; C; 2C61; # LATIN CAPITAL LETTER L WITH DOUBLE BAR
+2C62; C; 026B; # LATIN CAPITAL LETTER L WITH MIDDLE TILDE
+2C63; C; 1D7D; # LATIN CAPITAL LETTER P WITH STROKE
+2C64; C; 027D; # LATIN CAPITAL LETTER R WITH TAIL
+2C67; C; 2C68; # LATIN CAPITAL LETTER H WITH DESCENDER
+2C69; C; 2C6A; # LATIN CAPITAL LETTER K WITH DESCENDER
+2C6B; C; 2C6C; # LATIN CAPITAL LETTER Z WITH DESCENDER
+2C6D; C; 0251; # LATIN CAPITAL LETTER ALPHA
+2C6E; C; 0271; # LATIN CAPITAL LETTER M WITH HOOK
+2C6F; C; 0250; # LATIN CAPITAL LETTER TURNED A
+2C70; C; 0252; # LATIN CAPITAL LETTER TURNED ALPHA
+2C72; C; 2C73; # LATIN CAPITAL LETTER W WITH HOOK
+2C75; C; 2C76; # LATIN CAPITAL LETTER HALF H
+2C7E; C; 023F; # LATIN CAPITAL LETTER S WITH SWASH TAIL
+2C7F; C; 0240; # LATIN CAPITAL LETTER Z WITH SWASH TAIL
+2C80; C; 2C81; # COPTIC CAPITAL LETTER ALFA
+2C82; C; 2C83; # COPTIC CAPITAL LETTER VIDA
+2C84; C; 2C85; # COPTIC CAPITAL LETTER GAMMA
+2C86; C; 2C87; # COPTIC CAPITAL LETTER DALDA
+2C88; C; 2C89; # COPTIC CAPITAL LETTER EIE
+2C8A; C; 2C8B; # COPTIC CAPITAL LETTER SOU
+2C8C; C; 2C8D; # COPTIC CAPITAL LETTER ZATA
+2C8E; C; 2C8F; # COPTIC CAPITAL LETTER HATE
+2C90; C; 2C91; # COPTIC CAPITAL LETTER THETHE
+2C92; C; 2C93; # COPTIC CAPITAL LETTER IAUDA
+2C94; C; 2C95; # COPTIC CAPITAL LETTER KAPA
+2C96; C; 2C97; # COPTIC CAPITAL LETTER LAULA
+2C98; C; 2C99; # COPTIC CAPITAL LETTER MI
+2C9A; C; 2C9B; # COPTIC CAPITAL LETTER NI
+2C9C; C; 2C9D; # COPTIC CAPITAL LETTER KSI
+2C9E; C; 2C9F; # COPTIC CAPITAL LETTER O
+2CA0; C; 2CA1; # COPTIC CAPITAL LETTER PI
+2CA2; C; 2CA3; # COPTIC CAPITAL LETTER RO
+2CA4; C; 2CA5; # COPTIC CAPITAL LETTER SIMA
+2CA6; C; 2CA7; # COPTIC CAPITAL LETTER TAU
+2CA8; C; 2CA9; # COPTIC CAPITAL LETTER UA
+2CAA; C; 2CAB; # COPTIC CAPITAL LETTER FI
+2CAC; C; 2CAD; # COPTIC CAPITAL LETTER KHI
+2CAE; C; 2CAF; # COPTIC CAPITAL LETTER PSI
+2CB0; C; 2CB1; # COPTIC CAPITAL LETTER OOU
+2CB2; C; 2CB3; # COPTIC CAPITAL LETTER DIALECT-P ALEF
+2CB4; C; 2CB5; # COPTIC CAPITAL LETTER OLD COPTIC AIN
+2CB6; C; 2CB7; # COPTIC CAPITAL LETTER CRYPTOGRAMMIC EIE
+2CB8; C; 2CB9; # COPTIC CAPITAL LETTER DIALECT-P KAPA
+2CBA; C; 2CBB; # COPTIC CAPITAL LETTER DIALECT-P NI
+2CBC; C; 2CBD; # COPTIC CAPITAL LETTER CRYPTOGRAMMIC NI
+2CBE; C; 2CBF; # COPTIC CAPITAL LETTER OLD COPTIC OOU
+2CC0; C; 2CC1; # COPTIC CAPITAL LETTER SAMPI
+2CC2; C; 2CC3; # COPTIC CAPITAL LETTER CROSSED SHEI
+2CC4; C; 2CC5; # COPTIC CAPITAL LETTER OLD COPTIC SHEI
+2CC6; C; 2CC7; # COPTIC CAPITAL LETTER OLD COPTIC ESH
+2CC8; C; 2CC9; # COPTIC CAPITAL LETTER AKHMIMIC KHEI
+2CCA; C; 2CCB; # COPTIC CAPITAL LETTER DIALECT-P HORI
+2CCC; C; 2CCD; # COPTIC CAPITAL LETTER OLD COPTIC HORI
+2CCE; C; 2CCF; # COPTIC CAPITAL LETTER OLD COPTIC HA
+2CD0; C; 2CD1; # COPTIC CAPITAL LETTER L-SHAPED HA
+2CD2; C; 2CD3; # COPTIC CAPITAL LETTER OLD COPTIC HEI
+2CD4; C; 2CD5; # COPTIC CAPITAL LETTER OLD COPTIC HAT
+2CD6; C; 2CD7; # COPTIC CAPITAL LETTER OLD COPTIC GANGIA
+2CD8; C; 2CD9; # COPTIC CAPITAL LETTER OLD COPTIC DJA
+2CDA; C; 2CDB; # COPTIC CAPITAL LETTER OLD COPTIC SHIMA
+2CDC; C; 2CDD; # COPTIC CAPITAL LETTER OLD NUBIAN SHIMA
+2CDE; C; 2CDF; # COPTIC CAPITAL LETTER OLD NUBIAN NGI
+2CE0; C; 2CE1; # COPTIC CAPITAL LETTER OLD NUBIAN NYI
+2CE2; C; 2CE3; # COPTIC CAPITAL LETTER OLD NUBIAN WAU
+2CEB; C; 2CEC; # COPTIC CAPITAL LETTER CRYPTOGRAMMIC SHEI
+2CED; C; 2CEE; # COPTIC CAPITAL LETTER CRYPTOGRAMMIC GANGIA
+2CF2; C; 2CF3; # COPTIC CAPITAL LETTER BOHAIRIC KHEI
+A640; C; A641; # CYRILLIC CAPITAL LETTER ZEMLYA
+A642; C; A643; # CYRILLIC CAPITAL LETTER DZELO
+A644; C; A645; # CYRILLIC CAPITAL LETTER REVERSED DZE
+A646; C; A647; # CYRILLIC CAPITAL LETTER IOTA
+A648; C; A649; # CYRILLIC CAPITAL LETTER DJERV
+A64A; C; A64B; # CYRILLIC CAPITAL LETTER MONOGRAPH UK
+A64C; C; A64D; # CYRILLIC CAPITAL LETTER BROAD OMEGA
+A64E; C; A64F; # CYRILLIC CAPITAL LETTER NEUTRAL YER
+A650; C; A651; # CYRILLIC CAPITAL LETTER YERU WITH BACK YER
+A652; C; A653; # CYRILLIC CAPITAL LETTER IOTIFIED YAT
+A654; C; A655; # CYRILLIC CAPITAL LETTER REVERSED YU
+A656; C; A657; # CYRILLIC CAPITAL LETTER IOTIFIED A
+A658; C; A659; # CYRILLIC CAPITAL LETTER CLOSED LITTLE YUS
+A65A; C; A65B; # CYRILLIC CAPITAL LETTER BLENDED YUS
+A65C; C; A65D; # CYRILLIC CAPITAL LETTER IOTIFIED CLOSED LITTLE YUS
+A65E; C; A65F; # CYRILLIC CAPITAL LETTER YN
+A660; C; A661; # CYRILLIC CAPITAL LETTER REVERSED TSE
+A662; C; A663; # CYRILLIC CAPITAL LETTER SOFT DE
+A664; C; A665; # CYRILLIC CAPITAL LETTER SOFT EL
+A666; C; A667; # CYRILLIC CAPITAL LETTER SOFT EM
+A668; C; A669; # CYRILLIC CAPITAL LETTER MONOCULAR O
+A66A; C; A66B; # CYRILLIC CAPITAL LETTER BINOCULAR O
+A66C; C; A66D; # CYRILLIC CAPITAL LETTER DOUBLE MONOCULAR O
+A680; C; A681; # CYRILLIC CAPITAL LETTER DWE
+A682; C; A683; # CYRILLIC CAPITAL LETTER DZWE
+A684; C; A685; # CYRILLIC CAPITAL LETTER ZHWE
+A686; C; A687; # CYRILLIC CAPITAL LETTER CCHE
+A688; C; A689; # CYRILLIC CAPITAL LETTER DZZE
+A68A; C; A68B; # CYRILLIC CAPITAL LETTER TE WITH MIDDLE HOOK
+A68C; C; A68D; # CYRILLIC CAPITAL LETTER TWE
+A68E; C; A68F; # CYRILLIC CAPITAL LETTER TSWE
+A690; C; A691; # CYRILLIC CAPITAL LETTER TSSE
+A692; C; A693; # CYRILLIC CAPITAL LETTER TCHE
+A694; C; A695; # CYRILLIC CAPITAL LETTER HWE
+A696; C; A697; # CYRILLIC CAPITAL LETTER SHWE
+A698; C; A699; # CYRILLIC CAPITAL LETTER DOUBLE O
+A69A; C; A69B; # CYRILLIC CAPITAL LETTER CROSSED O
+A722; C; A723; # LATIN CAPITAL LETTER EGYPTOLOGICAL ALEF
+A724; C; A725; # LATIN CAPITAL LETTER EGYPTOLOGICAL AIN
+A726; C; A727; # LATIN CAPITAL LETTER HENG
+A728; C; A729; # LATIN CAPITAL LETTER TZ
+A72A; C; A72B; # LATIN CAPITAL LETTER TRESILLO
+A72C; C; A72D; # LATIN CAPITAL LETTER CUATRILLO
+A72E; C; A72F; # LATIN CAPITAL LETTER CUATRILLO WITH COMMA
+A732; C; A733; # LATIN CAPITAL LETTER AA
+A734; C; A735; # LATIN CAPITAL LETTER AO
+A736; C; A737; # LATIN CAPITAL LETTER AU
+A738; C; A739; # LATIN CAPITAL LETTER AV
+A73A; C; A73B; # LATIN CAPITAL LETTER AV WITH HORIZONTAL BAR
+A73C; C; A73D; # LATIN CAPITAL LETTER AY
+A73E; C; A73F; # LATIN CAPITAL LETTER REVERSED C WITH DOT
+A740; C; A741; # LATIN CAPITAL LETTER K WITH STROKE
+A742; C; A743; # LATIN CAPITAL LETTER K WITH DIAGONAL STROKE
+A744; C; A745; # LATIN CAPITAL LETTER K WITH STROKE AND DIAGONAL STROKE
+A746; C; A747; # LATIN CAPITAL LETTER BROKEN L
+A748; C; A749; # LATIN CAPITAL LETTER L WITH HIGH STROKE
+A74A; C; A74B; # LATIN CAPITAL LETTER O WITH LONG STROKE OVERLAY
+A74C; C; A74D; # LATIN CAPITAL LETTER O WITH LOOP
+A74E; C; A74F; # LATIN CAPITAL LETTER OO
+A750; C; A751; # LATIN CAPITAL LETTER P WITH STROKE THROUGH DESCENDER
+A752; C; A753; # LATIN CAPITAL LETTER P WITH FLOURISH
+A754; C; A755; # LATIN CAPITAL LETTER P WITH SQUIRREL TAIL
+A756; C; A757; # LATIN CAPITAL LETTER Q WITH STROKE THROUGH DESCENDER
+A758; C; A759; # LATIN CAPITAL LETTER Q WITH DIAGONAL STROKE
+A75A; C; A75B; # LATIN CAPITAL LETTER R ROTUNDA
+A75C; C; A75D; # LATIN CAPITAL LETTER RUM ROTUNDA
+A75E; C; A75F; # LATIN CAPITAL LETTER V WITH DIAGONAL STROKE
+A760; C; A761; # LATIN CAPITAL LETTER VY
+A762; C; A763; # LATIN CAPITAL LETTER VISIGOTHIC Z
+A764; C; A765; # LATIN CAPITAL LETTER THORN WITH STROKE
+A766; C; A767; # LATIN CAPITAL LETTER THORN WITH STROKE THROUGH DESCENDER
+A768; C; A769; # LATIN CAPITAL LETTER VEND
+A76A; C; A76B; # LATIN CAPITAL LETTER ET
+A76C; C; A76D; # LATIN CAPITAL LETTER IS
+A76E; C; A76F; # LATIN CAPITAL LETTER CON
+A779; C; A77A; # LATIN CAPITAL LETTER INSULAR D
+A77B; C; A77C; # LATIN CAPITAL LETTER INSULAR F
+A77D; C; 1D79; # LATIN CAPITAL LETTER INSULAR G
+A77E; C; A77F; # LATIN CAPITAL LETTER TURNED INSULAR G
+A780; C; A781; # LATIN CAPITAL LETTER TURNED L
+A782; C; A783; # LATIN CAPITAL LETTER INSULAR R
+A784; C; A785; # LATIN CAPITAL LETTER INSULAR S
+A786; C; A787; # LATIN CAPITAL LETTER INSULAR T
+A78B; C; A78C; # LATIN CAPITAL LETTER SALTILLO
+A78D; C; 0265; # LATIN CAPITAL LETTER TURNED H
+A790; C; A791; # LATIN CAPITAL LETTER N WITH DESCENDER
+A792; C; A793; # LATIN CAPITAL LETTER C WITH BAR
+A796; C; A797; # LATIN CAPITAL LETTER B WITH FLOURISH
+A798; C; A799; # LATIN CAPITAL LETTER F WITH STROKE
+A79A; C; A79B; # LATIN CAPITAL LETTER VOLAPUK AE
+A79C; C; A79D; # LATIN CAPITAL LETTER VOLAPUK OE
+A79E; C; A79F; # LATIN CAPITAL LETTER VOLAPUK UE
+A7A0; C; A7A1; # LATIN CAPITAL LETTER G WITH OBLIQUE STROKE
+A7A2; C; A7A3; # LATIN CAPITAL LETTER K WITH OBLIQUE STROKE
+A7A4; C; A7A5; # LATIN CAPITAL LETTER N WITH OBLIQUE STROKE
+A7A6; C; A7A7; # LATIN CAPITAL LETTER R WITH OBLIQUE STROKE
+A7A8; C; A7A9; # LATIN CAPITAL LETTER S WITH OBLIQUE STROKE
+A7AA; C; 0266; # LATIN CAPITAL LETTER H WITH HOOK
+A7AB; C; 025C; # LATIN CAPITAL LETTER REVERSED OPEN E
+A7AC; C; 0261; # LATIN CAPITAL LETTER SCRIPT G
+A7AD; C; 026C; # LATIN CAPITAL LETTER L WITH BELT
+A7B0; C; 029E; # LATIN CAPITAL LETTER TURNED K
+A7B1; C; 0287; # LATIN CAPITAL LETTER TURNED T
+A7B2; C; 029D; # LATIN CAPITAL LETTER J WITH CROSSED-TAIL
+A7B3; C; AB53; # LATIN CAPITAL LETTER CHI
+A7B4; C; A7B5; # LATIN CAPITAL LETTER BETA
+A7B6; C; A7B7; # LATIN CAPITAL LETTER OMEGA
+AB70; C; 13A0; # CHEROKEE SMALL LETTER A
+AB71; C; 13A1; # CHEROKEE SMALL LETTER E
+AB72; C; 13A2; # CHEROKEE SMALL LETTER I
+AB73; C; 13A3; # CHEROKEE SMALL LETTER O
+AB74; C; 13A4; # CHEROKEE SMALL LETTER U
+AB75; C; 13A5; # CHEROKEE SMALL LETTER V
+AB76; C; 13A6; # CHEROKEE SMALL LETTER GA
+AB77; C; 13A7; # CHEROKEE SMALL LETTER KA
+AB78; C; 13A8; # CHEROKEE SMALL LETTER GE
+AB79; C; 13A9; # CHEROKEE SMALL LETTER GI
+AB7A; C; 13AA; # CHEROKEE SMALL LETTER GO
+AB7B; C; 13AB; # CHEROKEE SMALL LETTER GU
+AB7C; C; 13AC; # CHEROKEE SMALL LETTER GV
+AB7D; C; 13AD; # CHEROKEE SMALL LETTER HA
+AB7E; C; 13AE; # CHEROKEE SMALL LETTER HE
+AB7F; C; 13AF; # CHEROKEE SMALL LETTER HI
+AB80; C; 13B0; # CHEROKEE SMALL LETTER HO
+AB81; C; 13B1; # CHEROKEE SMALL LETTER HU
+AB82; C; 13B2; # CHEROKEE SMALL LETTER HV
+AB83; C; 13B3; # CHEROKEE SMALL LETTER LA
+AB84; C; 13B4; # CHEROKEE SMALL LETTER LE
+AB85; C; 13B5; # CHEROKEE SMALL LETTER LI
+AB86; C; 13B6; # CHEROKEE SMALL LETTER LO
+AB87; C; 13B7; # CHEROKEE SMALL LETTER LU
+AB88; C; 13B8; # CHEROKEE SMALL LETTER LV
+AB89; C; 13B9; # CHEROKEE SMALL LETTER MA
+AB8A; C; 13BA; # CHEROKEE SMALL LETTER ME
+AB8B; C; 13BB; # CHEROKEE SMALL LETTER MI
+AB8C; C; 13BC; # CHEROKEE SMALL LETTER MO
+AB8D; C; 13BD; # CHEROKEE SMALL LETTER MU
+AB8E; C; 13BE; # CHEROKEE SMALL LETTER NA
+AB8F; C; 13BF; # CHEROKEE SMALL LETTER HNA
+AB90; C; 13C0; # CHEROKEE SMALL LETTER NAH
+AB91; C; 13C1; # CHEROKEE SMALL LETTER NE
+AB92; C; 13C2; # CHEROKEE SMALL LETTER NI
+AB93; C; 13C3; # CHEROKEE SMALL LETTER NO
+AB94; C; 13C4; # CHEROKEE SMALL LETTER NU
+AB95; C; 13C5; # CHEROKEE SMALL LETTER NV
+AB96; C; 13C6; # CHEROKEE SMALL LETTER QUA
+AB97; C; 13C7; # CHEROKEE SMALL LETTER QUE
+AB98; C; 13C8; # CHEROKEE SMALL LETTER QUI
+AB99; C; 13C9; # CHEROKEE SMALL LETTER QUO
+AB9A; C; 13CA; # CHEROKEE SMALL LETTER QUU
+AB9B; C; 13CB; # CHEROKEE SMALL LETTER QUV
+AB9C; C; 13CC; # CHEROKEE SMALL LETTER SA
+AB9D; C; 13CD; # CHEROKEE SMALL LETTER S
+AB9E; C; 13CE; # CHEROKEE SMALL LETTER SE
+AB9F; C; 13CF; # CHEROKEE SMALL LETTER SI
+ABA0; C; 13D0; # CHEROKEE SMALL LETTER SO
+ABA1; C; 13D1; # CHEROKEE SMALL LETTER SU
+ABA2; C; 13D2; # CHEROKEE SMALL LETTER SV
+ABA3; C; 13D3; # CHEROKEE SMALL LETTER DA
+ABA4; C; 13D4; # CHEROKEE SMALL LETTER TA
+ABA5; C; 13D5; # CHEROKEE SMALL LETTER DE
+ABA6; C; 13D6; # CHEROKEE SMALL LETTER TE
+ABA7; C; 13D7; # CHEROKEE SMALL LETTER DI
+ABA8; C; 13D8; # CHEROKEE SMALL LETTER TI
+ABA9; C; 13D9; # CHEROKEE SMALL LETTER DO
+ABAA; C; 13DA; # CHEROKEE SMALL LETTER DU
+ABAB; C; 13DB; # CHEROKEE SMALL LETTER DV
+ABAC; C; 13DC; # CHEROKEE SMALL LETTER DLA
+ABAD; C; 13DD; # CHEROKEE SMALL LETTER TLA
+ABAE; C; 13DE; # CHEROKEE SMALL LETTER TLE
+ABAF; C; 13DF; # CHEROKEE SMALL LETTER TLI
+ABB0; C; 13E0; # CHEROKEE SMALL LETTER TLO
+ABB1; C; 13E1; # CHEROKEE SMALL LETTER TLU
+ABB2; C; 13E2; # CHEROKEE SMALL LETTER TLV
+ABB3; C; 13E3; # CHEROKEE SMALL LETTER TSA
+ABB4; C; 13E4; # CHEROKEE SMALL LETTER TSE
+ABB5; C; 13E5; # CHEROKEE SMALL LETTER TSI
+ABB6; C; 13E6; # CHEROKEE SMALL LETTER TSO
+ABB7; C; 13E7; # CHEROKEE SMALL LETTER TSU
+ABB8; C; 13E8; # CHEROKEE SMALL LETTER TSV
+ABB9; C; 13E9; # CHEROKEE SMALL LETTER WA
+ABBA; C; 13EA; # CHEROKEE SMALL LETTER WE
+ABBB; C; 13EB; # CHEROKEE SMALL LETTER WI
+ABBC; C; 13EC; # CHEROKEE SMALL LETTER WO
+ABBD; C; 13ED; # CHEROKEE SMALL LETTER WU
+ABBE; C; 13EE; # CHEROKEE SMALL LETTER WV
+ABBF; C; 13EF; # CHEROKEE SMALL LETTER YA
+FB00; F; 0066 0066; # LATIN SMALL LIGATURE FF
+FB01; F; 0066 0069; # LATIN SMALL LIGATURE FI
+FB02; F; 0066 006C; # LATIN SMALL LIGATURE FL
+FB03; F; 0066 0066 0069; # LATIN SMALL LIGATURE FFI
+FB04; F; 0066 0066 006C; # LATIN SMALL LIGATURE FFL
+FB05; F; 0073 0074; # LATIN SMALL LIGATURE LONG S T
+FB06; F; 0073 0074; # LATIN SMALL LIGATURE ST
+FB13; F; 0574 0576; # ARMENIAN SMALL LIGATURE MEN NOW
+FB14; F; 0574 0565; # ARMENIAN SMALL LIGATURE MEN ECH
+FB15; F; 0574 056B; # ARMENIAN SMALL LIGATURE MEN INI
+FB16; F; 057E 0576; # ARMENIAN SMALL LIGATURE VEW NOW
+FB17; F; 0574 056D; # ARMENIAN SMALL LIGATURE MEN XEH
+FF21; C; FF41; # FULLWIDTH LATIN CAPITAL LETTER A
+FF22; C; FF42; # FULLWIDTH LATIN CAPITAL LETTER B
+FF23; C; FF43; # FULLWIDTH LATIN CAPITAL LETTER C
+FF24; C; FF44; # FULLWIDTH LATIN CAPITAL LETTER D
+FF25; C; FF45; # FULLWIDTH LATIN CAPITAL LETTER E
+FF26; C; FF46; # FULLWIDTH LATIN CAPITAL LETTER F
+FF27; C; FF47; # FULLWIDTH LATIN CAPITAL LETTER G
+FF28; C; FF48; # FULLWIDTH LATIN CAPITAL LETTER H
+FF29; C; FF49; # FULLWIDTH LATIN CAPITAL LETTER I
+FF2A; C; FF4A; # FULLWIDTH LATIN CAPITAL LETTER J
+FF2B; C; FF4B; # FULLWIDTH LATIN CAPITAL LETTER K
+FF2C; C; FF4C; # FULLWIDTH LATIN CAPITAL LETTER L
+FF2D; C; FF4D; # FULLWIDTH LATIN CAPITAL LETTER M
+FF2E; C; FF4E; # FULLWIDTH LATIN CAPITAL LETTER N
+FF2F; C; FF4F; # FULLWIDTH LATIN CAPITAL LETTER O
+FF30; C; FF50; # FULLWIDTH LATIN CAPITAL LETTER P
+FF31; C; FF51; # FULLWIDTH LATIN CAPITAL LETTER Q
+FF32; C; FF52; # FULLWIDTH LATIN CAPITAL LETTER R
+FF33; C; FF53; # FULLWIDTH LATIN CAPITAL LETTER S
+FF34; C; FF54; # FULLWIDTH LATIN CAPITAL LETTER T
+FF35; C; FF55; # FULLWIDTH LATIN CAPITAL LETTER U
+FF36; C; FF56; # FULLWIDTH LATIN CAPITAL LETTER V
+FF37; C; FF57; # FULLWIDTH LATIN CAPITAL LETTER W
+FF38; C; FF58; # FULLWIDTH LATIN CAPITAL LETTER X
+FF39; C; FF59; # FULLWIDTH LATIN CAPITAL LETTER Y
+FF3A; C; FF5A; # FULLWIDTH LATIN CAPITAL LETTER Z
+10400; C; 10428; # DESERET CAPITAL LETTER LONG I
+10401; C; 10429; # DESERET CAPITAL LETTER LONG E
+10402; C; 1042A; # DESERET CAPITAL LETTER LONG A
+10403; C; 1042B; # DESERET CAPITAL LETTER LONG AH
+10404; C; 1042C; # DESERET CAPITAL LETTER LONG O
+10405; C; 1042D; # DESERET CAPITAL LETTER LONG OO
+10406; C; 1042E; # DESERET CAPITAL LETTER SHORT I
+10407; C; 1042F; # DESERET CAPITAL LETTER SHORT E
+10408; C; 10430; # DESERET CAPITAL LETTER SHORT A
+10409; C; 10431; # DESERET CAPITAL LETTER SHORT AH
+1040A; C; 10432; # DESERET CAPITAL LETTER SHORT O
+1040B; C; 10433; # DESERET CAPITAL LETTER SHORT OO
+1040C; C; 10434; # DESERET CAPITAL LETTER AY
+1040D; C; 10435; # DESERET CAPITAL LETTER OW
+1040E; C; 10436; # DESERET CAPITAL LETTER WU
+1040F; C; 10437; # DESERET CAPITAL LETTER YEE
+10410; C; 10438; # DESERET CAPITAL LETTER H
+10411; C; 10439; # DESERET CAPITAL LETTER PEE
+10412; C; 1043A; # DESERET CAPITAL LETTER BEE
+10413; C; 1043B; # DESERET CAPITAL LETTER TEE
+10414; C; 1043C; # DESERET CAPITAL LETTER DEE
+10415; C; 1043D; # DESERET CAPITAL LETTER CHEE
+10416; C; 1043E; # DESERET CAPITAL LETTER JEE
+10417; C; 1043F; # DESERET CAPITAL LETTER KAY
+10418; C; 10440; # DESERET CAPITAL LETTER GAY
+10419; C; 10441; # DESERET CAPITAL LETTER EF
+1041A; C; 10442; # DESERET CAPITAL LETTER VEE
+1041B; C; 10443; # DESERET CAPITAL LETTER ETH
+1041C; C; 10444; # DESERET CAPITAL LETTER THEE
+1041D; C; 10445; # DESERET CAPITAL LETTER ES
+1041E; C; 10446; # DESERET CAPITAL LETTER ZEE
+1041F; C; 10447; # DESERET CAPITAL LETTER ESH
+10420; C; 10448; # DESERET CAPITAL LETTER ZHEE
+10421; C; 10449; # DESERET CAPITAL LETTER ER
+10422; C; 1044A; # DESERET CAPITAL LETTER EL
+10423; C; 1044B; # DESERET CAPITAL LETTER EM
+10424; C; 1044C; # DESERET CAPITAL LETTER EN
+10425; C; 1044D; # DESERET CAPITAL LETTER ENG
+10426; C; 1044E; # DESERET CAPITAL LETTER OI
+10427; C; 1044F; # DESERET CAPITAL LETTER EW
+10C80; C; 10CC0; # OLD HUNGARIAN CAPITAL LETTER A
+10C81; C; 10CC1; # OLD HUNGARIAN CAPITAL LETTER AA
+10C82; C; 10CC2; # OLD HUNGARIAN CAPITAL LETTER EB
+10C83; C; 10CC3; # OLD HUNGARIAN CAPITAL LETTER AMB
+10C84; C; 10CC4; # OLD HUNGARIAN CAPITAL LETTER EC
+10C85; C; 10CC5; # OLD HUNGARIAN CAPITAL LETTER ENC
+10C86; C; 10CC6; # OLD HUNGARIAN CAPITAL LETTER ECS
+10C87; C; 10CC7; # OLD HUNGARIAN CAPITAL LETTER ED
+10C88; C; 10CC8; # OLD HUNGARIAN CAPITAL LETTER AND
+10C89; C; 10CC9; # OLD HUNGARIAN CAPITAL LETTER E
+10C8A; C; 10CCA; # OLD HUNGARIAN CAPITAL LETTER CLOSE E
+10C8B; C; 10CCB; # OLD HUNGARIAN CAPITAL LETTER EE
+10C8C; C; 10CCC; # OLD HUNGARIAN CAPITAL LETTER EF
+10C8D; C; 10CCD; # OLD HUNGARIAN CAPITAL LETTER EG
+10C8E; C; 10CCE; # OLD HUNGARIAN CAPITAL LETTER EGY
+10C8F; C; 10CCF; # OLD HUNGARIAN CAPITAL LETTER EH
+10C90; C; 10CD0; # OLD HUNGARIAN CAPITAL LETTER I
+10C91; C; 10CD1; # OLD HUNGARIAN CAPITAL LETTER II
+10C92; C; 10CD2; # OLD HUNGARIAN CAPITAL LETTER EJ
+10C93; C; 10CD3; # OLD HUNGARIAN CAPITAL LETTER EK
+10C94; C; 10CD4; # OLD HUNGARIAN CAPITAL LETTER AK
+10C95; C; 10CD5; # OLD HUNGARIAN CAPITAL LETTER UNK
+10C96; C; 10CD6; # OLD HUNGARIAN CAPITAL LETTER EL
+10C97; C; 10CD7; # OLD HUNGARIAN CAPITAL LETTER ELY
+10C98; C; 10CD8; # OLD HUNGARIAN CAPITAL LETTER EM
+10C99; C; 10CD9; # OLD HUNGARIAN CAPITAL LETTER EN
+10C9A; C; 10CDA; # OLD HUNGARIAN CAPITAL LETTER ENY
+10C9B; C; 10CDB; # OLD HUNGARIAN CAPITAL LETTER O
+10C9C; C; 10CDC; # OLD HUNGARIAN CAPITAL LETTER OO
+10C9D; C; 10CDD; # OLD HUNGARIAN CAPITAL LETTER NIKOLSBURG OE
+10C9E; C; 10CDE; # OLD HUNGARIAN CAPITAL LETTER RUDIMENTA OE
+10C9F; C; 10CDF; # OLD HUNGARIAN CAPITAL LETTER OEE
+10CA0; C; 10CE0; # OLD HUNGARIAN CAPITAL LETTER EP
+10CA1; C; 10CE1; # OLD HUNGARIAN CAPITAL LETTER EMP
+10CA2; C; 10CE2; # OLD HUNGARIAN CAPITAL LETTER ER
+10CA3; C; 10CE3; # OLD HUNGARIAN CAPITAL LETTER SHORT ER
+10CA4; C; 10CE4; # OLD HUNGARIAN CAPITAL LETTER ES
+10CA5; C; 10CE5; # OLD HUNGARIAN CAPITAL LETTER ESZ
+10CA6; C; 10CE6; # OLD HUNGARIAN CAPITAL LETTER ET
+10CA7; C; 10CE7; # OLD HUNGARIAN CAPITAL LETTER ENT
+10CA8; C; 10CE8; # OLD HUNGARIAN CAPITAL LETTER ETY
+10CA9; C; 10CE9; # OLD HUNGARIAN CAPITAL LETTER ECH
+10CAA; C; 10CEA; # OLD HUNGARIAN CAPITAL LETTER U
+10CAB; C; 10CEB; # OLD HUNGARIAN CAPITAL LETTER UU
+10CAC; C; 10CEC; # OLD HUNGARIAN CAPITAL LETTER NIKOLSBURG UE
+10CAD; C; 10CED; # OLD HUNGARIAN CAPITAL LETTER RUDIMENTA UE
+10CAE; C; 10CEE; # OLD HUNGARIAN CAPITAL LETTER EV
+10CAF; C; 10CEF; # OLD HUNGARIAN CAPITAL LETTER EZ
+10CB0; C; 10CF0; # OLD HUNGARIAN CAPITAL LETTER EZS
+10CB1; C; 10CF1; # OLD HUNGARIAN CAPITAL LETTER ENT-SHAPED SIGN
+10CB2; C; 10CF2; # OLD HUNGARIAN CAPITAL LETTER US
+118A0; C; 118C0; # WARANG CITI CAPITAL LETTER NGAA
+118A1; C; 118C1; # WARANG CITI CAPITAL LETTER A
+118A2; C; 118C2; # WARANG CITI CAPITAL LETTER WI
+118A3; C; 118C3; # WARANG CITI CAPITAL LETTER YU
+118A4; C; 118C4; # WARANG CITI CAPITAL LETTER YA
+118A5; C; 118C5; # WARANG CITI CAPITAL LETTER YO
+118A6; C; 118C6; # WARANG CITI CAPITAL LETTER II
+118A7; C; 118C7; # WARANG CITI CAPITAL LETTER UU
+118A8; C; 118C8; # WARANG CITI CAPITAL LETTER E
+118A9; C; 118C9; # WARANG CITI CAPITAL LETTER O
+118AA; C; 118CA; # WARANG CITI CAPITAL LETTER ANG
+118AB; C; 118CB; # WARANG CITI CAPITAL LETTER GA
+118AC; C; 118CC; # WARANG CITI CAPITAL LETTER KO
+118AD; C; 118CD; # WARANG CITI CAPITAL LETTER ENY
+118AE; C; 118CE; # WARANG CITI CAPITAL LETTER YUJ
+118AF; C; 118CF; # WARANG CITI CAPITAL LETTER UC
+118B0; C; 118D0; # WARANG CITI CAPITAL LETTER ENN
+118B1; C; 118D1; # WARANG CITI CAPITAL LETTER ODD
+118B2; C; 118D2; # WARANG CITI CAPITAL LETTER TTE
+118B3; C; 118D3; # WARANG CITI CAPITAL LETTER NUNG
+118B4; C; 118D4; # WARANG CITI CAPITAL LETTER DA
+118B5; C; 118D5; # WARANG CITI CAPITAL LETTER AT
+118B6; C; 118D6; # WARANG CITI CAPITAL LETTER AM
+118B7; C; 118D7; # WARANG CITI CAPITAL LETTER BU
+118B8; C; 118D8; # WARANG CITI CAPITAL LETTER PU
+118B9; C; 118D9; # WARANG CITI CAPITAL LETTER HIYO
+118BA; C; 118DA; # WARANG CITI CAPITAL LETTER HOLO
+118BB; C; 118DB; # WARANG CITI CAPITAL LETTER HORR
+118BC; C; 118DC; # WARANG CITI CAPITAL LETTER HAR
+118BD; C; 118DD; # WARANG CITI CAPITAL LETTER SSUU
+118BE; C; 118DE; # WARANG CITI CAPITAL LETTER SII
+118BF; C; 118DF; # WARANG CITI CAPITAL LETTER VIYO
+#
+# EOF
diff --git a/js/src/vm/RegExpObject.cpp b/js/src/vm/RegExpObject.cpp
index 5ed4ad270162..bdfd02c92224 100644
--- a/js/src/vm/RegExpObject.cpp
+++ b/js/src/vm/RegExpObject.cpp
@@ -522,7 +522,7 @@ RegExpShared::compile(JSContext* cx, HandleAtom pattern, HandleLinearString inpu
     /* Parse the pattern. */
     irregexp::RegExpCompileData data;
     if (!irregexp::ParsePattern(dummyTokenStream, cx->tempLifoAlloc(), pattern,
-                                multiline(), mode == MatchOnly, unicode(), &data))
+                                multiline(), mode == MatchOnly, unicode(), ignoreCase(), &data))
     {
         return false;
     }
@@ -535,7 +535,7 @@ RegExpShared::compile(JSContext* cx, HandleAtom pattern, HandleLinearString inpu
                                                          input->hasLatin1Chars(),
                                                          mode == MatchOnly,
                                                          force == ForceByteCode,
-                                                         sticky());
+                                                         sticky(), unicode());
     if (code.empty())
         return false;
 
diff --git a/js/src/vm/Unicode.cpp b/js/src/vm/Unicode.cpp
index b110fbc5db87..9214450ac262 100644
--- a/js/src/vm/Unicode.cpp
+++ b/js/src/vm/Unicode.cpp
@@ -772,4 +772,439 @@ const uint8_t unicode::index2[] = {
       5,   5,   5,   0,   0,   0,
 };
 
+const FoldingInfo unicode::js_foldinfo[] = {
+    {0, 0, 0, 0},
+    {32, 0, 0, 0},
+    {32, 8415, 0, 0},
+    {32, 300, 0, 0},
+    {0, 65504, 0, 0},
+    {0, 65504, 8383, 0},
+    {0, 65504, 268, 0},
+    {775, 743, 0, 0},
+    {32, 8294, 0, 0},
+    {0, 7615, 0, 0},
+    {0, 65504, 8262, 0},
+    {0, 121, 0, 0},
+    {1, 0, 0, 0},
+    {0, 65535, 0, 0},
+    {65415, 0, 0, 0},
+    {65268, 65236, 0, 0},
+    {0, 195, 0, 0},
+    {210, 0, 0, 0},
+    {206, 0, 0, 0},
+    {205, 0, 0, 0},
+    {79, 0, 0, 0},
+    {202, 0, 0, 0},
+    {203, 0, 0, 0},
+    {207, 0, 0, 0},
+    {0, 97, 0, 0},
+    {211, 0, 0, 0},
+    {209, 0, 0, 0},
+    {0, 163, 0, 0},
+    {213, 0, 0, 0},
+    {0, 130, 0, 0},
+    {214, 0, 0, 0},
+    {218, 0, 0, 0},
+    {217, 0, 0, 0},
+    {219, 0, 0, 0},
+    {0, 56, 0, 0},
+    {2, 1, 0, 0},
+    {1, 65535, 0, 0},
+    {0, 65534, 65535, 0},
+    {0, 65457, 0, 0},
+    {65439, 0, 0, 0},
+    {65480, 0, 0, 0},
+    {65406, 0, 0, 0},
+    {10795, 0, 0, 0},
+    {65373, 0, 0, 0},
+    {10792, 0, 0, 0},
+    {0, 10815, 0, 0},
+    {65341, 0, 0, 0},
+    {69, 0, 0, 0},
+    {71, 0, 0, 0},
+    {0, 10783, 0, 0},
+    {0, 10780, 0, 0},
+    {0, 10782, 0, 0},
+    {0, 65326, 0, 0},
+    {0, 65330, 0, 0},
+    {0, 65331, 0, 0},
+    {0, 65334, 0, 0},
+    {0, 65333, 0, 0},
+    {0, 42319, 0, 0},
+    {0, 42315, 0, 0},
+    {0, 65329, 0, 0},
+    {0, 42280, 0, 0},
+    {0, 42308, 0, 0},
+    {0, 65327, 0, 0},
+    {0, 65325, 0, 0},
+    {0, 10743, 0, 0},
+    {0, 42305, 0, 0},
+    {0, 10749, 0, 0},
+    {0, 65323, 0, 0},
+    {0, 65322, 0, 0},
+    {0, 10727, 0, 0},
+    {0, 65318, 0, 0},
+    {0, 42282, 0, 0},
+    {0, 65467, 0, 0},
+    {0, 65319, 0, 0},
+    {0, 65465, 0, 0},
+    {0, 65317, 0, 0},
+    {0, 42261, 0, 0},
+    {0, 42258, 0, 0},
+    {116, 84, 7289, 0},
+    {116, 0, 0, 0},
+    {38, 0, 0, 0},
+    {37, 0, 0, 0},
+    {64, 0, 0, 0},
+    {63, 0, 0, 0},
+    {32, 62, 0, 0},
+    {32, 96, 0, 0},
+    {32, 57, 92, 0},
+    {32, 65452, 7205, 0},
+    {32, 86, 0, 0},
+    {32, 64793, 0, 0},
+    {32, 54, 0, 0},
+    {32, 80, 0, 0},
+    {32, 31, 0, 0},
+    {32, 47, 0, 0},
+    {32, 7549, 0, 0},
+    {0, 65498, 0, 0},
+    {0, 65499, 0, 0},
+    {0, 65504, 30, 0},
+    {0, 65504, 64, 0},
+    {0, 65504, 25, 60},
+    {0, 65420, 65504, 7173},
+    {0, 65504, 54, 0},
+    {0, 64761, 65504, 0},
+    {0, 65504, 22, 0},
+    {0, 65504, 48, 0},
+    {1, 65505, 0, 0},
+    {0, 65504, 65535, 0},
+    {0, 65504, 15, 0},
+    {0, 65504, 7517, 0},
+    {0, 65472, 0, 0},
+    {0, 65473, 0, 0},
+    {8, 0, 0, 0},
+    {65506, 65474, 0, 0},
+    {65511, 65479, 35, 0},
+    {65521, 65489, 0, 0},
+    {65514, 65482, 0, 0},
+    {0, 65528, 0, 0},
+    {65482, 65450, 0, 0},
+    {65488, 65456, 0, 0},
+    {0, 7, 0, 0},
+    {0, 65420, 0, 0},
+    {65476, 65444, 65501, 0},
+    {65472, 65440, 0, 0},
+    {65529, 0, 0, 0},
+    {80, 0, 0, 0},
+    {0, 65456, 0, 0},
+    {15, 0, 0, 0},
+    {0, 65521, 0, 0},
+    {48, 0, 0, 0},
+    {0, 65488, 0, 0},
+    {7264, 0, 0, 0},
+    {0, 38864, 0, 0},
+    {0, 8, 0, 0},
+    {65528, 0, 0, 0},
+    {0, 35332, 0, 0},
+    {0, 3814, 0, 0},
+    {1, 59, 0, 0},
+    {0, 65535, 58, 0},
+    {65478, 65477, 0, 0},
+    {57921, 0, 0, 0},
+    {0, 74, 0, 0},
+    {0, 86, 0, 0},
+    {0, 100, 0, 0},
+    {0, 128, 0, 0},
+    {0, 112, 0, 0},
+    {0, 126, 0, 0},
+    {0, 9, 0, 0},
+    {65462, 0, 0, 0},
+    {65527, 0, 0, 0},
+    {58363, 58247, 58331, 0},
+    {65450, 0, 0, 0},
+    {65436, 0, 0, 0},
+    {65424, 0, 0, 0},
+    {65408, 0, 0, 0},
+    {65410, 0, 0, 0},
+    {58019, 57987, 0, 0},
+    {57153, 57121, 0, 0},
+    {57274, 57242, 0, 0},
+    {28, 0, 0, 0},
+    {0, 65508, 0, 0},
+    {16, 0, 0, 0},
+    {0, 65520, 0, 0},
+    {26, 0, 0, 0},
+    {0, 65510, 0, 0},
+    {54793, 0, 0, 0},
+    {61722, 0, 0, 0},
+    {54809, 0, 0, 0},
+    {0, 54741, 0, 0},
+    {0, 54744, 0, 0},
+    {54756, 0, 0, 0},
+    {54787, 0, 0, 0},
+    {54753, 0, 0, 0},
+    {54754, 0, 0, 0},
+    {54721, 0, 0, 0},
+    {0, 58272, 0, 0},
+    {30204, 0, 0, 0},
+    {23256, 0, 0, 0},
+    {23228, 0, 0, 0},
+    {23217, 0, 0, 0},
+    {23221, 0, 0, 0},
+    {23231, 0, 0, 0},
+    {23278, 0, 0, 0},
+    {23254, 0, 0, 0},
+    {23275, 0, 0, 0},
+    {928, 0, 0, 0},
+    {0, 64608, 0, 0},
+    {26672, 0, 0, 0},
+};
+
+const uint8_t unicode::folding_index1[] = {
+      0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,   0,   0,  11,  12,  13,  14,  15,
+     16,  17,  18,  19,  20,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  21,  22,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,  23,  24,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,  25,   0,   0,  26,  27,  28,  26,  29,  30,
+     31,  32,   0,   0,   0,   0,  33,  34,  35,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,  36,  37,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  38,  39,  26,  40,
+     41,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  42,
+     43,   0,  44,  45,  46,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,  47,  48,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  49,  50,   0,   0,
+};
+
+const uint8_t unicode::folding_index2[] = {
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   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,   1,   1,   1,   1,   1,   1,
+      1,   1,   1,   2,   1,   1,   1,   1,   1,   1,   1,   3,   1,   1,   1,   1,   1,   1,
+      1,   0,   0,   0,   0,   0,   0,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   5,
+      4,   4,   4,   4,   4,   4,   4,   6,   4,   4,   4,   4,   4,   4,   4,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   7,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   1,   1,   1,   1,   8,
+      1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   0,
+      1,   1,   1,   1,   1,   1,   1,   9,   4,   4,   4,   4,   4,  10,   4,   4,   4,   4,
+      4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   0,   4,   4,   4,   4,
+      4,   4,   4,  11,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,   0,   0,
+     12,  13,  12,  13,  12,  13,   0,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,
+     13,  12,  13,  12,  13,   0,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  14,  12,
+     13,  12,  13,  12,  13,  15,  16,  17,  12,  13,  12,  13,  18,  12,  13,  19,  19,  12,
+     13,   0,  20,  21,  22,  12,  13,  19,  23,  24,  25,  26,  12,  13,  27,   0,  25,  28,
+     29,  30,  12,  13,  12,  13,  12,  13,  31,  12,  13,  31,   0,   0,  12,  13,  31,  12,
+     13,  32,  32,  12,  13,  12,  13,  33,  12,  13,   0,   0,  12,  13,   0,  34,   0,   0,
+      0,   0,  35,  36,  37,  35,  36,  37,  35,  36,  37,  12,  13,  12,  13,  12,  13,  12,
+     13,  12,  13,  12,  13,  12,  13,  12,  13,  38,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,   0,  35,  36,  37,  12,  13,  39,  40,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  41,   0,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,   0,   0,   0,   0,   0,   0,  42,  12,  13,  43,  44,  45,
+     45,  12,  13,  46,  47,  48,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  49,  50,
+     51,  52,  53,   0,  54,  54,   0,  55,   0,  56,  57,   0,   0,   0,  54,  58,   0,  59,
+      0,  60,  61,   0,  62,  63,   0,  64,  65,   0,   0,  63,   0,  66,  67,   0,   0,  68,
+      0,   0,   0,   0,   0,   0,   0,  69,   0,   0,  70,   0,   0,  70,   0,   0,   0,  71,
+     70,  72,  73,  73,  74,   0,   0,   0,   0,   0,  75,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,  76,  77,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,  78,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  12,  13,  12,  13,
+      0,   0,  12,  13,   0,   0,   0,  29,  29,  29,   0,  79,   0,   0,   0,   0,   0,   0,
+     80,   0,  81,  81,  81,   0,  82,   0,  83,  83,   0,   1,  84,   1,   1,  85,   1,   1,
+     86,  87,  88,   1,  89,   1,   1,   1,  90,  91,   0,  92,   1,   1,  93,   1,   1,  94,
+      1,   1,  95,  96,  96,  96,   0,   4,  97,   4,   4,  98,   4,   4,  99, 100, 101,   4,
+    102,   4,   4,   4, 103, 104, 105, 106,   4,   4, 107,   4,   4, 108,   4,   4, 109, 110,
+    110, 111, 112, 113,   0,   0,   0, 114, 115, 116,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13, 117, 118,
+    119, 120, 121, 122,   0,  12,  13, 123,  12,  13,   0,  41,  41,  41, 124, 124, 124, 124,
+    124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124,   1,   1,   1,   1,   1,   1,
+      1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
+      1,   1,   1,   1,   1,   1,   1,   1,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,
+      4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,
+      4,   4,   4,   4, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,
+    125, 125,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+      0,   0,   0,   0,   0,   0,   0,   0,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13, 126,  12,  13,  12,  13,  12,  13,  12,  13,  12,
+     13,  12,  13,  12,  13, 127,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,   0, 128, 128, 128, 128, 128,
+    128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+    128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129,
+    129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129,
+    129, 129, 129, 129, 129, 129, 129, 129, 129,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130,
+    130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130,
+    130, 130, 130, 130, 130, 130, 130, 130, 130, 130,   0, 130,   0,   0,   0,   0,   0, 130,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 131, 131, 131, 131, 131, 131, 131, 131,
+    131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131,
+    131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131,
+    131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131,
+    131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131,
+    132, 132, 132, 132, 132, 132,   0,   0, 133, 133, 133, 133, 133, 133,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0, 134,   0,   0,   0, 135,   0,   0,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13, 136, 137,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,   0,   0,   0,   0,
+      0, 138,   0,   0, 139,   0,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13, 132, 132, 132, 132, 132, 132, 132, 132, 133, 133, 133, 133, 133, 133, 133, 133,
+    132, 132, 132, 132, 132, 132,   0,   0, 133, 133, 133, 133, 133, 133,   0,   0, 132, 132,
+    132, 132, 132, 132, 132, 132, 133, 133, 133, 133, 133, 133, 133, 133, 132, 132, 132, 132,
+    132, 132, 132, 132, 133, 133, 133, 133, 133, 133, 133, 133, 132, 132, 132, 132, 132, 132,
+      0,   0, 133, 133, 133, 133, 133, 133,   0,   0,   0, 132,   0, 132,   0, 132,   0, 132,
+      0, 133,   0, 133,   0, 133,   0, 133, 132, 132, 132, 132, 132, 132, 132, 132, 133, 133,
+    133, 133, 133, 133, 133, 133, 140, 140, 141, 141, 141, 141, 142, 142, 143, 143, 144, 144,
+    145, 145,   0,   0, 132, 132, 132, 132, 132, 132, 132, 132, 133, 133, 133, 133, 133, 133,
+    133, 133, 132, 132, 132, 132, 132, 132, 132, 132, 133, 133, 133, 133, 133, 133, 133, 133,
+    132, 132, 132, 132, 132, 132, 132, 132, 133, 133, 133, 133, 133, 133, 133, 133, 132, 132,
+      0, 146,   0,   0,   0,   0, 133, 133, 147, 147, 148,   0, 149,   0,   0,   0,   0, 146,
+      0,   0,   0,   0, 150, 150, 150, 150, 148,   0,   0,   0, 132, 132,   0,   0,   0,   0,
+      0,   0, 133, 133, 151, 151,   0,   0,   0,   0, 132, 132,   0,   0,   0, 119,   0,   0,
+    133, 133, 152, 152, 123,   0,   0,   0,   0,   0,   0, 146,   0,   0,   0,   0, 153, 153,
+    154, 154, 148,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0, 155,   0,   0,   0, 156, 157,   0,   0,   0,   0,
+      0,   0, 158,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 159,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 160, 160, 160, 160, 160, 160,
+    160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 161, 161, 161, 161, 161, 161, 161, 161,
+    161, 161, 161, 161, 161, 161, 161, 161,   0,   0,   0,  12,  13,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+    162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162,
+    162, 162, 162, 162, 162, 162, 162, 162, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163,
+    163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, 163,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+    128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+    128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,   0, 129, 129, 129, 129,
+    129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129,
+    129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129,
+    129, 129, 129, 129, 129, 129, 129,   0,  12,  13, 164, 165, 166, 167, 168,  12,  13,  12,
+     13,  12,  13, 169, 170, 171, 172,   0,  12,  13,   0,  12,  13,   0,   0,   0,   0,   0,
+      0,   0, 173, 173,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,   0,   0,   0,   0,   0,   0,   0,  12,  13,  12,  13,   0,   0,   0,
+     12,  13,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 174, 174, 174, 174,
+    174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+    174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,   0, 174,
+      0,   0,   0,   0,   0, 174,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,   0,   0,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,  12,  13,  12,  13, 175,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,
+      0,   0,   0,  12,  13, 176,   0,   0,  12,  13,  12,  13,   0,   0,  12,  13,  12,  13,
+     12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13,  12,  13, 177, 178,
+    179, 180,   0,   0, 181, 182, 183, 184,  12,  13,  12,  13,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0, 185,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 186, 186, 186, 186,
+    186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186,
+    186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186,
+    186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186,
+    186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186,
+    186, 186, 186, 186,   0,   0,   0,   0,   0,   0,   0,   0,   0,   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,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
+      1,   1,   1,   1,   1,   1,   1,   1,   1,   0,   0,   0,   0,   0,   0,   4,   4,   4,
+      4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,
+      4,   4,   4,   4,   4,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+};
+
 
diff --git a/js/src/vm/Unicode.h b/js/src/vm/Unicode.h
index 1276e915af6e..3ab452c2aaa6 100644
--- a/js/src/vm/Unicode.h
+++ b/js/src/vm/Unicode.h
@@ -234,6 +234,55 @@ CanLowerCase(char16_t ch)
     return CharInfo(ch).lowerCase != 0;
 }
 
+class FoldingInfo {
+  public:
+    uint16_t folding;
+    uint16_t reverse1;
+    uint16_t reverse2;
+    uint16_t reverse3;
+};
+
+extern const uint8_t folding_index1[];
+extern const uint8_t folding_index2[];
+extern const FoldingInfo js_foldinfo[];
+
+inline const FoldingInfo&
+CaseFoldInfo(char16_t code)
+{
+    const size_t shift = 6;
+    size_t index = folding_index1[code >> shift];
+    index = folding_index2[(index << shift) + (code & ((1 << shift) - 1))];
+    return js_foldinfo[index];
+}
+
+inline char16_t
+FoldCase(char16_t ch)
+{
+    const FoldingInfo& info = CaseFoldInfo(ch);
+    return uint16_t(ch) + info.folding;
+}
+
+inline char16_t
+ReverseFoldCase1(char16_t ch)
+{
+    const FoldingInfo& info = CaseFoldInfo(ch);
+    return uint16_t(ch) + info.reverse1;
+}
+
+inline char16_t
+ReverseFoldCase2(char16_t ch)
+{
+    const FoldingInfo& info = CaseFoldInfo(ch);
+    return uint16_t(ch) + info.reverse2;
+}
+
+inline char16_t
+ReverseFoldCase3(char16_t ch)
+{
+    const FoldingInfo& info = CaseFoldInfo(ch);
+    return uint16_t(ch) + info.reverse3;
+}
+
 const size_t LeadSurrogateMin = 0xD800;
 const size_t LeadSurrogateMax = 0xDBFF;
 const size_t TrailSurrogateMin = 0xDC00;
diff --git a/js/src/vm/make_unicode.py b/js/src/vm/make_unicode.py
index 16e521da9345..19c0aab58274 100644
--- a/js/src/vm/make_unicode.py
+++ b/js/src/vm/make_unicode.py
@@ -84,13 +84,33 @@ def read_unicode_data(unicode_file):
             row[0] = int(row[0], 16)
             yield row
 
-def generate_unicode_stuff(unicode_data, data_file, test_mapping, test_space):
+def read_case_folding(case_folding):
+    for line in case_folding:
+        if line == '\n' or line.startswith('#'):
+            continue
+        row = line.split('; ')
+        if row[1] in ['F', 'T']:
+            continue
+        row[0] = int(row[0], 16)
+        row[2] = int(row[2], 16)
+        yield row
+
+def generate_unicode_stuff(unicode_data, case_folding,
+                           data_file, test_mapping, test_space, test_icase):
     dummy = (0, 0, 0)
     table = [dummy]
     cache = {dummy: 0}
     index = [0] * (MAX + 1)
+    folding_map = {}
+    rev_folding_map = {}
+    folding_dummy = (0, 0, 0, 0)
+    folding_table = [folding_dummy]
+    folding_cache = {folding_dummy: 0}
+    folding_index = [0] * (MAX + 1)
     test_table = {}
     test_space_table = []
+    folding_tests = []
+    folding_codes = set()
 
     for row in read_unicode_data(unicode_data):
         code = row[0]
@@ -143,6 +163,64 @@ def generate_unicode_stuff(unicode_data, data_file, test_mapping, test_space):
             table.append(item)
         index[code] = i
 
+    for row in read_case_folding(case_folding):
+        code = row[0]
+        mapping = row[2]
+        folding_map[code] = mapping
+
+        if mapping not in rev_folding_map:
+            rev_folding_map[mapping] = [code]
+        else:
+            rev_folding_map[mapping].append(code)
+
+        folding_codes.add(code)
+        folding_codes.add(mapping)
+
+    for code in sorted(folding_codes):
+        if code > MAX:
+            continue
+
+        if code in folding_map:
+            folding = folding_map[code]
+        else:
+            folding = code
+
+        if code in rev_folding_map:
+            rev_folding = rev_folding_map[code]
+        elif folding in rev_folding_map:
+            rev_folding = [c for c in rev_folding_map[folding] if c != code]
+        else:
+            rev_folding = []
+
+        assert len(rev_folding) <= 3
+
+        if folding != code or len(rev_folding):
+            item = [code]
+            if folding != code:
+                item.append(folding)
+            folding_tests.append(item + rev_folding)
+
+        folding_d = folding - code
+        rev_folding_ds = [v - code for v in rev_folding]
+
+        assert folding_d > -65535 and folding_d < 65535
+        assert all([v > -65535 and v < 65535 for v in rev_folding])
+
+        folding = folding_d & 0xffff
+        rev_folding = [v & 0xffff for v in rev_folding_ds]
+        rev_folding_0 = rev_folding[0] if len(rev_folding) >= 1 else 0
+        rev_folding_1 = rev_folding[1] if len(rev_folding) >= 2 else 0
+        rev_folding_2 = rev_folding[2] if len(rev_folding) >= 3 else 0
+
+        item = (folding, rev_folding_0, rev_folding_1, rev_folding_2)
+
+        i = folding_cache.get(item)
+        if i is None:
+            assert item not in folding_table
+            folding_cache[item] = i = len(folding_table)
+            folding_table.append(item)
+        folding_index[code] = i
+
     test_mapping.write('/* Generated by make_unicode.py DO NOT MODIFY */\n')
     test_mapping.write(public_domain)
     test_mapping.write('var mapping = [\n')
@@ -180,6 +258,29 @@ assertEq((onlySpace + 'aaaa').trim(), 'aaaa');
 assertEq(('aaaa' + onlySpace).trim(), 'aaaa');
 assertEq((onlySpace + 'aaaa' + onlySpace).trim(), 'aaaa');
 
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
+""")
+
+    test_icase.write('/* Generated by make_unicode.py DO NOT MODIFY */\n')
+    test_icase.write(public_domain)
+    test_icase.write("""
+var BUGNUMBER = 1135377;
+var summary = "Implement RegExp unicode flag -- ignoreCase flag.";
+
+print(BUGNUMBER + ": " + summary);
+
+function test(code, ...equivs) {
+  var codeRe = new RegExp(String.fromCodePoint(code) + "+", "iu");
+  var ans = String.fromCodePoint(code) + equivs.map(c => String.fromCodePoint(c)).join("");
+  assertEqArray(codeRe.exec("<" + ans + ">"), [ans]);
+  codeRe = new RegExp("[" + String.fromCodePoint(code) + "]+", "iu");
+  assertEqArray(codeRe.exec("<" + ans + ">"), [ans]);
+}
+""")
+    for args in folding_tests:
+        test_icase.write('test(' + ','.join([hex(c) for c in args]) + ');\n')
+    test_icase.write("""
 if (typeof reportCompare === "function")
     reportCompare(true, true);
 """)
@@ -189,6 +290,11 @@ if (typeof reportCompare === "function")
     # Don't forget to update CharInfo in Unicode.cpp if you need to change this
     assert shift == 5
 
+    folding_index1, folding_index2, folding_shift = splitbins(folding_index)
+
+    # Don't forget to update CharInfo in Unicode.cpp if you need to change this
+    assert folding_shift == 6
+
     # verify correctness
     for char in index:
         test = table[index[char]]
@@ -198,6 +304,14 @@ if (typeof reportCompare === "function")
 
         assert test == table[idx]
 
+    # verify correctness
+    for char in folding_index:
+        test = folding_table[folding_index[char]]
+
+        idx = folding_index1[char >> folding_shift]
+        idx = folding_index2[(idx << folding_shift) + (char & ((1 << folding_shift) - 1))]
+
+        assert test == folding_table[idx]
 
     comment = """
 /*
@@ -284,6 +398,19 @@ if (typeof reportCompare === "function")
     dump(index2, 'index2', data_file)
     data_file.write('\n')
 
+    data_file.write('const FoldingInfo unicode::js_foldinfo[] = {\n')
+    for d in folding_table:
+        data_file.write('    {')
+        data_file.write(', '.join((str(e) for e in d)))
+        data_file.write('},\n')
+    data_file.write('};\n')
+    data_file.write('\n')
+
+    dump(folding_index1, 'folding_index1', data_file)
+    data_file.write('\n')
+    dump(folding_index2, 'folding_index2', data_file)
+    data_file.write('\n')
+
     data_file.write('\n')
 
 def getsize(data):
@@ -362,7 +489,7 @@ if __name__ == '__main__':
         print('Always make sure you have the newest UnicodeData.txt!')
         unicode_data = open(sys.argv[1], 'r')
     else:
-        print('Downloading...')
+        print('Downloading UnicodeData.txt...')
         reader = urllib2.urlopen('http://unicode.org/Public/UNIDATA/UnicodeData.txt')
         data = reader.read()
         reader.close()
@@ -370,8 +497,21 @@ if __name__ == '__main__':
         unicode_data.write(data)
         unicode_data.seek(0)
 
+    if len(sys.argv) > 2:
+        print('Always make sure you have the newest CaseFolding.txt!')
+        case_folding = open(sys.argv[2], 'r')
+    else:
+        print('Downloading CaseFolding.txt...')
+        reader = urllib2.urlopen('http://unicode.org/Public/UNIDATA/CaseFolding.txt')
+        data = reader.read()
+        reader.close()
+        case_folding = open('CaseFolding.txt', 'w+')
+        case_folding.write(data)
+        case_folding.seek(0)
+
     print('Generating...')
-    generate_unicode_stuff(unicode_data,
+    generate_unicode_stuff(unicode_data, case_folding,
         open('Unicode.cpp', 'w'),
         open('../tests/ecma_5/String/string-upper-lower-mapping.js', 'w'),
-        open('../tests/ecma_5/String/string-space-trim.js', 'w'))
+        open('../tests/ecma_5/String/string-space-trim.js', 'w'),
+        open('../tests/ecma_6/RegExp/unicode-ignoreCase.js', 'w'))

From b850ab905395e83cb8d742bd30af58dcb7042989 Mon Sep 17 00:00:00 2001
From: Tooru Fujisawa <arai_a@mac.com>
Date: Fri, 7 Aug 2015 08:12:05 +0900
Subject: [PATCH 059/101] Bug 1135377 - Part 7: Support ignoreCase for non-BMP
 in RegExp with unicode flag. r=till, f=anba

---
 js/src/irregexp/RegExpParser.cpp              | 104 +++++++-
 .../ecma_6/RegExp/unicode-class-ignoreCase.js |  28 ++
 .../tests/ecma_6/RegExp/unicode-ignoreCase.js | 246 ++++++++++++++++++
 js/src/vm/Unicode.h                           |   8 +
 js/src/vm/make_unicode.py                     |   6 +-
 5 files changed, 380 insertions(+), 12 deletions(-)
 create mode 100644 js/src/tests/ecma_6/RegExp/unicode-class-ignoreCase.js

diff --git a/js/src/irregexp/RegExpParser.cpp b/js/src/irregexp/RegExpParser.cpp
index 1d582052ae9b..52ee9942cbe2 100644
--- a/js/src/irregexp/RegExpParser.cpp
+++ b/js/src/irregexp/RegExpParser.cpp
@@ -558,6 +558,7 @@ class WideCharRange
         return WideCharRange(from, to);
     }
 
+    bool Contains(widechar i) const { return from_ <= i && i <= to_; }
     widechar from() const { return from_; }
     widechar to() const { return to_; }
 
@@ -747,14 +748,73 @@ NegateUnicodeRanges(LifoAlloc* alloc, Vector<RangeType, 1, LifoAllocPolicy<Infal
     *ranges = tmp_ranges;
 }
 
+static bool
+WideCharRangesContain(WideCharRangeVector* wide_ranges, widechar c)
+{
+    for (size_t i = 0; i < wide_ranges->length(); i++) {
+        const WideCharRange& range = (*wide_ranges)[i];
+        if (range.Contains(c))
+            return true;
+    }
+    return false;
+}
+
+static void
+CalculateCaseInsensitiveRanges(LifoAlloc* alloc, widechar from, widechar to, int32_t diff,
+                               WideCharRangeVector* wide_ranges,
+                               WideCharRangeVector** tmp_wide_ranges)
+{
+    widechar contains_from = 0;
+    widechar contains_to = 0;
+    for (widechar c = from; c <= to; c++) {
+        if (WideCharRangesContain(wide_ranges, c) &&
+            !WideCharRangesContain(wide_ranges, c + diff))
+        {
+            if (contains_from == 0)
+                contains_from = c;
+            contains_to = c;
+        } else if (contains_from != 0) {
+            if (!*tmp_wide_ranges)
+                *tmp_wide_ranges = alloc->newInfallible<WideCharRangeVector>(*alloc);
+
+            (*tmp_wide_ranges)->append(WideCharRange::Range(contains_from + diff,
+                                                            contains_to + diff));
+            contains_from = 0;
+        }
+    }
+
+    if (contains_from != 0) {
+        if (!*tmp_wide_ranges)
+            *tmp_wide_ranges = alloc->newInfallible<WideCharRangeVector>(*alloc);
+
+        (*tmp_wide_ranges)->append(WideCharRange::Range(contains_from + diff,
+                                                        contains_to + diff));
+    }
+}
+
 static RegExpTree*
 UnicodeRangesAtom(LifoAlloc* alloc,
                   CharacterRangeVector* ranges,
                   CharacterRangeVector* lead_ranges,
                   CharacterRangeVector* trail_ranges,
                   WideCharRangeVector* wide_ranges,
-                  bool is_negated)
+                  bool is_negated,
+                  bool ignore_case)
 {
+    // Calculate case folding for non-BMP first and negate the range if needed.
+    if (ignore_case) {
+        WideCharRangeVector* tmp_wide_ranges = nullptr;
+#define CALL_CALC(FROM, TO, LEAD, TRAIL_FROM, TRAIL_TO, DIFF) \
+        CalculateCaseInsensitiveRanges(alloc, FROM, TO, DIFF, wide_ranges, &tmp_wide_ranges);
+        FOR_EACH_NON_BMP_CASE_FOLDING(CALL_CALC)
+#undef CALL_CALC
+
+        if (tmp_wide_ranges) {
+            for (size_t i = 0; i < tmp_wide_ranges->length(); i++)
+                wide_ranges->append((*tmp_wide_ranges)[i]);
+        }
+    }
+
     if (is_negated) {
         NegateUnicodeRanges(alloc, &lead_ranges, LeadSurrogateRange());
         NegateUnicodeRanges(alloc, &trail_ranges, TrailSurrogateRange());
@@ -952,7 +1012,8 @@ RegExpParser<CharT>::ParseCharacterClass()
         return alloc->newInfallible<RegExpCharacterClass>(ranges, true);
     }
 
-    return UnicodeRangesAtom(alloc, ranges, lead_ranges, trail_ranges, wide_ranges, is_negated);
+    return UnicodeRangesAtom(alloc, ranges, lead_ranges, trail_ranges, wide_ranges, is_negated,
+                             ignore_case_);
 }
 
 template <typename CharT>
@@ -1166,8 +1227,30 @@ RegExpParser<CharT>::ParsePattern()
 }
 
 static inline RegExpTree*
-SurrogatePairAtom(LifoAlloc* alloc, char16_t lead, char16_t trail)
+CaseFoldingSurrogatePairAtom(LifoAlloc* alloc, char16_t lead, char16_t trail, int32_t diff)
 {
+    RegExpBuilder* builder = alloc->newInfallible<RegExpBuilder>(alloc);
+
+    builder->AddCharacter(lead);
+    CharacterRangeVector* ranges = alloc->newInfallible<CharacterRangeVector>(*alloc);
+    ranges->append(CharacterRange::Range(trail, trail));
+    ranges->append(CharacterRange::Range(trail + diff, trail + diff));
+    builder->AddAtom(alloc->newInfallible<RegExpCharacterClass>(ranges, false));
+
+    return builder->ToRegExp();
+}
+
+static inline RegExpTree*
+SurrogatePairAtom(LifoAlloc* alloc, char16_t lead, char16_t trail, bool ignore_case)
+{
+    if (ignore_case) {
+#define CALL_ATOM(FROM, TO, LEAD, TRAIL_FROM, TRAIL_TO, DIFF) \
+        if (lead == LEAD &&trail >= TRAIL_FROM && trail <= TRAIL_TO) \
+            return CaseFoldingSurrogatePairAtom(alloc, lead, trail, DIFF);
+        FOR_EACH_NON_BMP_CASE_FOLDING(CALL_ATOM)
+#undef CALL_ATOM
+    }
+
     RegExpBuilder* builder = alloc->newInfallible<RegExpBuilder>(alloc);
     builder->AddCharacter(lead);
     builder->AddCharacter(trail);
@@ -1239,7 +1322,7 @@ UnicodeCharacterClassEscapeAtom(LifoAlloc* alloc, char16_t char_class, bool igno
     AddCharOrEscapeUnicode(alloc, ranges, lead_ranges, trail_ranges, wide_ranges, char_class, 0,
                            ignore_case);
 
-    return UnicodeRangesAtom(alloc, ranges, lead_ranges, trail_ranges, wide_ranges, false);
+    return UnicodeRangesAtom(alloc, ranges, lead_ranges, trail_ranges, wide_ranges, false, false);
 }
 
 // Disjunction ::
@@ -1523,17 +1606,20 @@ RegExpParser<CharT>::ParseDisjunction()
                         } else if (value >= unicode::NonBMPMin) {
                             size_t lead, trail;
                             unicode::UTF16Encode(value, &lead, &trail);
-                            builder->AddAtom(SurrogatePairAtom(alloc, lead, trail));
+                            builder->AddAtom(SurrogatePairAtom(alloc, lead, trail,
+                                                               ignore_case_));
                         } else {
                             builder->AddCharacter(value);
                         }
                     } else if (ParseHexEscape(4, &value)) {
                         if (unicode::IsLeadSurrogate(value)) {
                             size_t trail;
-                            if (ParseTrailSurrogate(&trail))
-                                builder->AddAtom(SurrogatePairAtom(alloc, value, trail));
-                            else
+                            if (ParseTrailSurrogate(&trail)) {
+                                builder->AddAtom(SurrogatePairAtom(alloc, value, trail,
+                                                                   ignore_case_));
+                            } else {
                                 builder->AddAtom(LeadSurrogateAtom(alloc, value));
+                            }
                         } else if (unicode::IsTrailSurrogate(value)) {
                             builder->AddAtom(TrailSurrogateAtom(alloc, value));
                         } else {
@@ -1568,7 +1654,7 @@ RegExpParser<CharT>::ParseDisjunction()
             if (unicode_) {
                 char16_t lead, trail;
                 if (ParseRawSurrogatePair(&lead, &trail)) {
-                    builder->AddAtom(SurrogatePairAtom(alloc, lead, trail));
+                    builder->AddAtom(SurrogatePairAtom(alloc, lead, trail, ignore_case_));
                 } else {
                     widechar c = current();
                     if (unicode::IsLeadSurrogate(c))
diff --git a/js/src/tests/ecma_6/RegExp/unicode-class-ignoreCase.js b/js/src/tests/ecma_6/RegExp/unicode-class-ignoreCase.js
new file mode 100644
index 000000000000..afa7705c727c
--- /dev/null
+++ b/js/src/tests/ecma_6/RegExp/unicode-class-ignoreCase.js
@@ -0,0 +1,28 @@
+var BUGNUMBER = 1135377;
+var summary = "Implement RegExp unicode flag -- ignoreCase flag for CharacterClass.";
+
+print(BUGNUMBER + ": " + summary);
+
+assertEqArray(/[ABC]+/iu.exec("DCBAabcd"),
+              ["CBAabc"]);
+
+assertEqArray(/[A\u{10401}]+/iu.exec("A\u{10401}a\u{10429}"),
+              ["A\u{10401}a\u{10429}"]);
+
+assertEqArray(/[\u{10401}-\u{10404}\u{10408}-\u{1040B}]+/iu.exec("\u{10400}\u{10401}\u{10402}\u{10403}\u{10404}\u{10408}\u{10409}\u{1040A}\u{1040B}\u{1040C}"),
+              ["\u{10401}\u{10402}\u{10403}\u{10404}\u{10408}\u{10409}\u{1040A}\u{1040B}"]);
+assertEqArray(/[\u{10401}-\u{10404}\u{10408}-\u{1040B}]+/iu.exec("\u{10428}\u{10429}\u{1042A}\u{1042B}\u{1042C}\u{10430}\u{10431}\u{10432}\u{10433}\u{10434}"),
+              ["\u{10429}\u{1042A}\u{1042B}\u{1042C}\u{10430}\u{10431}\u{10432}\u{10433}"]);
+
+assertEqArray(/[\u{10429}-\u{1042C}\u{10430}-\u{10433}]+/iu.exec("\u{10400}\u{10401}\u{10402}\u{10403}\u{10404}\u{10408}\u{10409}\u{1040A}\u{1040B}\u{1040C}"),
+              ["\u{10401}\u{10402}\u{10403}\u{10404}\u{10408}\u{10409}\u{1040A}\u{1040B}"]);
+assertEqArray(/[\u{10429}-\u{1042C}\u{10430}-\u{10433}]+/iu.exec("\u{10428}\u{10429}\u{1042A}\u{1042B}\u{1042C}\u{10430}\u{10431}\u{10432}\u{10433}\u{10434}"),
+              ["\u{10429}\u{1042A}\u{1042B}\u{1042C}\u{10430}\u{10431}\u{10432}\u{10433}"]);
+
+assertEqArray(/[\u{10401}-\u{10404}\u{10430}-\u{10433}]+/iu.exec("\u{10400}\u{10401}\u{10402}\u{10403}\u{10404}\u{10408}\u{10409}\u{1040A}\u{1040B}\u{1040C}"),
+              ["\u{10401}\u{10402}\u{10403}\u{10404}\u{10408}\u{10409}\u{1040A}\u{1040B}"]);
+assertEqArray(/[\u{10401}-\u{10404}\u{10430}-\u{10433}]+/iu.exec("\u{10428}\u{10429}\u{1042A}\u{1042B}\u{1042C}\u{10430}\u{10431}\u{10432}\u{10433}\u{10434}"),
+              ["\u{10429}\u{1042A}\u{1042B}\u{1042C}\u{10430}\u{10431}\u{10432}\u{10433}"]);
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff --git a/js/src/tests/ecma_6/RegExp/unicode-ignoreCase.js b/js/src/tests/ecma_6/RegExp/unicode-ignoreCase.js
index 1eb8a0889e5f..dac67abba861 100644
--- a/js/src/tests/ecma_6/RegExp/unicode-ignoreCase.js
+++ b/js/src/tests/ecma_6/RegExp/unicode-ignoreCase.js
@@ -2240,6 +2240,252 @@ test(0xff57,0xff37);
 test(0xff58,0xff38);
 test(0xff59,0xff39);
 test(0xff5a,0xff3a);
+test(0x10400,0x10428);
+test(0x10401,0x10429);
+test(0x10402,0x1042a);
+test(0x10403,0x1042b);
+test(0x10404,0x1042c);
+test(0x10405,0x1042d);
+test(0x10406,0x1042e);
+test(0x10407,0x1042f);
+test(0x10408,0x10430);
+test(0x10409,0x10431);
+test(0x1040a,0x10432);
+test(0x1040b,0x10433);
+test(0x1040c,0x10434);
+test(0x1040d,0x10435);
+test(0x1040e,0x10436);
+test(0x1040f,0x10437);
+test(0x10410,0x10438);
+test(0x10411,0x10439);
+test(0x10412,0x1043a);
+test(0x10413,0x1043b);
+test(0x10414,0x1043c);
+test(0x10415,0x1043d);
+test(0x10416,0x1043e);
+test(0x10417,0x1043f);
+test(0x10418,0x10440);
+test(0x10419,0x10441);
+test(0x1041a,0x10442);
+test(0x1041b,0x10443);
+test(0x1041c,0x10444);
+test(0x1041d,0x10445);
+test(0x1041e,0x10446);
+test(0x1041f,0x10447);
+test(0x10420,0x10448);
+test(0x10421,0x10449);
+test(0x10422,0x1044a);
+test(0x10423,0x1044b);
+test(0x10424,0x1044c);
+test(0x10425,0x1044d);
+test(0x10426,0x1044e);
+test(0x10427,0x1044f);
+test(0x10428,0x10400);
+test(0x10429,0x10401);
+test(0x1042a,0x10402);
+test(0x1042b,0x10403);
+test(0x1042c,0x10404);
+test(0x1042d,0x10405);
+test(0x1042e,0x10406);
+test(0x1042f,0x10407);
+test(0x10430,0x10408);
+test(0x10431,0x10409);
+test(0x10432,0x1040a);
+test(0x10433,0x1040b);
+test(0x10434,0x1040c);
+test(0x10435,0x1040d);
+test(0x10436,0x1040e);
+test(0x10437,0x1040f);
+test(0x10438,0x10410);
+test(0x10439,0x10411);
+test(0x1043a,0x10412);
+test(0x1043b,0x10413);
+test(0x1043c,0x10414);
+test(0x1043d,0x10415);
+test(0x1043e,0x10416);
+test(0x1043f,0x10417);
+test(0x10440,0x10418);
+test(0x10441,0x10419);
+test(0x10442,0x1041a);
+test(0x10443,0x1041b);
+test(0x10444,0x1041c);
+test(0x10445,0x1041d);
+test(0x10446,0x1041e);
+test(0x10447,0x1041f);
+test(0x10448,0x10420);
+test(0x10449,0x10421);
+test(0x1044a,0x10422);
+test(0x1044b,0x10423);
+test(0x1044c,0x10424);
+test(0x1044d,0x10425);
+test(0x1044e,0x10426);
+test(0x1044f,0x10427);
+test(0x10c80,0x10cc0);
+test(0x10c81,0x10cc1);
+test(0x10c82,0x10cc2);
+test(0x10c83,0x10cc3);
+test(0x10c84,0x10cc4);
+test(0x10c85,0x10cc5);
+test(0x10c86,0x10cc6);
+test(0x10c87,0x10cc7);
+test(0x10c88,0x10cc8);
+test(0x10c89,0x10cc9);
+test(0x10c8a,0x10cca);
+test(0x10c8b,0x10ccb);
+test(0x10c8c,0x10ccc);
+test(0x10c8d,0x10ccd);
+test(0x10c8e,0x10cce);
+test(0x10c8f,0x10ccf);
+test(0x10c90,0x10cd0);
+test(0x10c91,0x10cd1);
+test(0x10c92,0x10cd2);
+test(0x10c93,0x10cd3);
+test(0x10c94,0x10cd4);
+test(0x10c95,0x10cd5);
+test(0x10c96,0x10cd6);
+test(0x10c97,0x10cd7);
+test(0x10c98,0x10cd8);
+test(0x10c99,0x10cd9);
+test(0x10c9a,0x10cda);
+test(0x10c9b,0x10cdb);
+test(0x10c9c,0x10cdc);
+test(0x10c9d,0x10cdd);
+test(0x10c9e,0x10cde);
+test(0x10c9f,0x10cdf);
+test(0x10ca0,0x10ce0);
+test(0x10ca1,0x10ce1);
+test(0x10ca2,0x10ce2);
+test(0x10ca3,0x10ce3);
+test(0x10ca4,0x10ce4);
+test(0x10ca5,0x10ce5);
+test(0x10ca6,0x10ce6);
+test(0x10ca7,0x10ce7);
+test(0x10ca8,0x10ce8);
+test(0x10ca9,0x10ce9);
+test(0x10caa,0x10cea);
+test(0x10cab,0x10ceb);
+test(0x10cac,0x10cec);
+test(0x10cad,0x10ced);
+test(0x10cae,0x10cee);
+test(0x10caf,0x10cef);
+test(0x10cb0,0x10cf0);
+test(0x10cb1,0x10cf1);
+test(0x10cb2,0x10cf2);
+test(0x10cc0,0x10c80);
+test(0x10cc1,0x10c81);
+test(0x10cc2,0x10c82);
+test(0x10cc3,0x10c83);
+test(0x10cc4,0x10c84);
+test(0x10cc5,0x10c85);
+test(0x10cc6,0x10c86);
+test(0x10cc7,0x10c87);
+test(0x10cc8,0x10c88);
+test(0x10cc9,0x10c89);
+test(0x10cca,0x10c8a);
+test(0x10ccb,0x10c8b);
+test(0x10ccc,0x10c8c);
+test(0x10ccd,0x10c8d);
+test(0x10cce,0x10c8e);
+test(0x10ccf,0x10c8f);
+test(0x10cd0,0x10c90);
+test(0x10cd1,0x10c91);
+test(0x10cd2,0x10c92);
+test(0x10cd3,0x10c93);
+test(0x10cd4,0x10c94);
+test(0x10cd5,0x10c95);
+test(0x10cd6,0x10c96);
+test(0x10cd7,0x10c97);
+test(0x10cd8,0x10c98);
+test(0x10cd9,0x10c99);
+test(0x10cda,0x10c9a);
+test(0x10cdb,0x10c9b);
+test(0x10cdc,0x10c9c);
+test(0x10cdd,0x10c9d);
+test(0x10cde,0x10c9e);
+test(0x10cdf,0x10c9f);
+test(0x10ce0,0x10ca0);
+test(0x10ce1,0x10ca1);
+test(0x10ce2,0x10ca2);
+test(0x10ce3,0x10ca3);
+test(0x10ce4,0x10ca4);
+test(0x10ce5,0x10ca5);
+test(0x10ce6,0x10ca6);
+test(0x10ce7,0x10ca7);
+test(0x10ce8,0x10ca8);
+test(0x10ce9,0x10ca9);
+test(0x10cea,0x10caa);
+test(0x10ceb,0x10cab);
+test(0x10cec,0x10cac);
+test(0x10ced,0x10cad);
+test(0x10cee,0x10cae);
+test(0x10cef,0x10caf);
+test(0x10cf0,0x10cb0);
+test(0x10cf1,0x10cb1);
+test(0x10cf2,0x10cb2);
+test(0x118a0,0x118c0);
+test(0x118a1,0x118c1);
+test(0x118a2,0x118c2);
+test(0x118a3,0x118c3);
+test(0x118a4,0x118c4);
+test(0x118a5,0x118c5);
+test(0x118a6,0x118c6);
+test(0x118a7,0x118c7);
+test(0x118a8,0x118c8);
+test(0x118a9,0x118c9);
+test(0x118aa,0x118ca);
+test(0x118ab,0x118cb);
+test(0x118ac,0x118cc);
+test(0x118ad,0x118cd);
+test(0x118ae,0x118ce);
+test(0x118af,0x118cf);
+test(0x118b0,0x118d0);
+test(0x118b1,0x118d1);
+test(0x118b2,0x118d2);
+test(0x118b3,0x118d3);
+test(0x118b4,0x118d4);
+test(0x118b5,0x118d5);
+test(0x118b6,0x118d6);
+test(0x118b7,0x118d7);
+test(0x118b8,0x118d8);
+test(0x118b9,0x118d9);
+test(0x118ba,0x118da);
+test(0x118bb,0x118db);
+test(0x118bc,0x118dc);
+test(0x118bd,0x118dd);
+test(0x118be,0x118de);
+test(0x118bf,0x118df);
+test(0x118c0,0x118a0);
+test(0x118c1,0x118a1);
+test(0x118c2,0x118a2);
+test(0x118c3,0x118a3);
+test(0x118c4,0x118a4);
+test(0x118c5,0x118a5);
+test(0x118c6,0x118a6);
+test(0x118c7,0x118a7);
+test(0x118c8,0x118a8);
+test(0x118c9,0x118a9);
+test(0x118ca,0x118aa);
+test(0x118cb,0x118ab);
+test(0x118cc,0x118ac);
+test(0x118cd,0x118ad);
+test(0x118ce,0x118ae);
+test(0x118cf,0x118af);
+test(0x118d0,0x118b0);
+test(0x118d1,0x118b1);
+test(0x118d2,0x118b2);
+test(0x118d3,0x118b3);
+test(0x118d4,0x118b4);
+test(0x118d5,0x118b5);
+test(0x118d6,0x118b6);
+test(0x118d7,0x118b7);
+test(0x118d8,0x118b8);
+test(0x118d9,0x118b9);
+test(0x118da,0x118ba);
+test(0x118db,0x118bb);
+test(0x118dc,0x118bc);
+test(0x118dd,0x118bd);
+test(0x118de,0x118be);
+test(0x118df,0x118bf);
 
 if (typeof reportCompare === "function")
     reportCompare(true, true);
diff --git a/js/src/vm/Unicode.h b/js/src/vm/Unicode.h
index 3ab452c2aaa6..16ae39891874 100644
--- a/js/src/vm/Unicode.h
+++ b/js/src/vm/Unicode.h
@@ -324,4 +324,12 @@ UTF16Decode(size_t lead, size_t trail)
 } /* namespace unicode */
 } /* namespace js */
 
+#define FOR_EACH_NON_BMP_CASE_FOLDING(macro)                            \
+    macro(0x10400, 0x10427, 0xD801, 0xDC00, 0xDC27, 0x28)               \
+    macro(0x10428, 0x1044F, 0xD801, 0xDC28, 0xDC4F, -0x28)              \
+    macro(0x10C80, 0x10CB2, 0xD803, 0xDC80, 0xDCB2, 0x40)               \
+    macro(0x10CC0, 0x10CF2, 0xD803, 0xDCC0, 0xDCF2, -0x40)              \
+    macro(0x118A0, 0x118bf, 0xD806, 0xDCA0, 0xDCBF, 0x20)               \
+    macro(0x118C0, 0x118df, 0xD806, 0xDCC0, 0xDCDF, -0x20)
+
 #endif /* vm_Unicode_h */
diff --git a/js/src/vm/make_unicode.py b/js/src/vm/make_unicode.py
index 19c0aab58274..63d9f0654f01 100644
--- a/js/src/vm/make_unicode.py
+++ b/js/src/vm/make_unicode.py
@@ -177,9 +177,6 @@ def generate_unicode_stuff(unicode_data, case_folding,
         folding_codes.add(mapping)
 
     for code in sorted(folding_codes):
-        if code > MAX:
-            continue
-
         if code in folding_map:
             folding = folding_map[code]
         else:
@@ -200,6 +197,9 @@ def generate_unicode_stuff(unicode_data, case_folding,
                 item.append(folding)
             folding_tests.append(item + rev_folding)
 
+        if code > MAX:
+            continue
+
         folding_d = folding - code
         rev_folding_ds = [v - code for v in rev_folding]
 

From 84bd03637bf82d0a873f432d2944d0985f6b84e0 Mon Sep 17 00:00:00 2001
From: Tooru Fujisawa <arai_a@mac.com>
Date: Fri, 7 Aug 2015 08:12:51 +0900
Subject: [PATCH 060/101] Bug 1135377 - Part 8: Disallow extended pattern in
 RegExp with unicode flag. r=till, f=anba

---
 js/src/irregexp/RegExpParser.cpp              |  95 ++++++++++++--
 js/src/js.msg                                 |   4 +
 .../RegExp/unicode-disallow-extended.js       | 117 ++++++++++++++++++
 js/src/vm/Xdr.h                               |   4 +-
 4 files changed, 207 insertions(+), 13 deletions(-)
 create mode 100644 js/src/tests/ecma_6/RegExp/unicode-disallow-extended.js

diff --git a/js/src/irregexp/RegExpParser.cpp b/js/src/irregexp/RegExpParser.cpp
index 52ee9942cbe2..f5ecda2609bc 100644
--- a/js/src/irregexp/RegExpParser.cpp
+++ b/js/src/irregexp/RegExpParser.cpp
@@ -405,6 +405,31 @@ NegativeLookahead(LifoAlloc* alloc, char16_t from, char16_t to)
     return alloc->newInfallible<RegExpLookahead>(RangeAtom(alloc, from, to), false, 0, 0);
 }
 
+static bool
+IsSyntaxCharacter(widechar c)
+{
+  switch (c) {
+    case '^':
+    case '$':
+    case '\\':
+    case '.':
+    case '*':
+    case '+':
+    case '?':
+    case '(':
+    case ')':
+    case '[':
+    case ']':
+    case '{':
+    case '}':
+    case '|':
+    case '/':
+      return true;
+    default:
+      return false;
+  }
+}
+
 #ifdef DEBUG
 // Currently only used in an assert.kASSERT.
 static bool
@@ -459,16 +484,23 @@ RegExpParser<CharT>::ParseClassCharacterEscape(widechar* code)
         widechar controlLetter = Next();
         widechar letter = controlLetter & ~('A' ^ 'a');
         // For compatibility with JSC, inside a character class
-        // we also accept digits and underscore as control characters.
-        if ((controlLetter >= '0' && controlLetter <= '9') ||
-            controlLetter == '_' ||
-            (letter >= 'A' && letter <= 'Z')) {
+        // we also accept digits and underscore as control characters,
+        // but only in non-unicode mode
+        if ((!unicode_ &&
+             ((controlLetter >= '0' && controlLetter <= '9') ||
+              controlLetter == '_')) ||
+            (letter >= 'A' && letter <= 'Z'))
+        {
             Advance(2);
             // Control letters mapped to ASCII control characters in the range
             // 0x00-0x1f.
             *code = controlLetter & 0x1f;
             return true;
         }
+        if (unicode_) {
+            ReportError(JSMSG_INVALID_IDENTITY_ESCAPE);
+            return false;
+        }
         // We match JSC in reading the backslash as a literal
         // character instead of as starting an escape.
         *code = '\\';
@@ -476,9 +508,18 @@ RegExpParser<CharT>::ParseClassCharacterEscape(widechar* code)
       }
       case '0': case '1': case '2': case '3': case '4': case '5':
       case '6': case '7':
-        // For compatibility, we interpret a decimal escape that isn't
-        // a back reference (and therefore either \0 or not valid according
-        // to the specification) as a 1..3 digit octal character code.
+        if (unicode_) {
+            if (current() == '0') {
+                *code = 0;
+                return true;
+            }
+            ReportError(JSMSG_INVALID_IDENTITY_ESCAPE);
+            return false;
+        }
+        // For compatibility, outside of unicode mode, we interpret a decimal
+        // escape that isn't a back reference (and therefore either \0 or not
+        // valid according to the specification) as a 1..3 digit octal
+        // character code.
         *code = ParseOctalLiteral();
         return true;
       case 'x': {
@@ -488,8 +529,12 @@ RegExpParser<CharT>::ParseClassCharacterEscape(widechar* code)
             *code = value;
             return true;
         }
+        if (unicode_) {
+            ReportError(JSMSG_INVALID_IDENTITY_ESCAPE);
+            return false;
+        }
         // If \x is not followed by a two-digit hexadecimal, treat it
-        // as an identity escape.
+        // as an identity escape in non-unicode mode.
         *code = 'x';
         return true;
       }
@@ -527,10 +572,14 @@ RegExpParser<CharT>::ParseClassCharacterEscape(widechar* code)
         return true;
       }
       default: {
-        // Extended identity escape. We accept any character that hasn't
-        // been matched by a more specific case, not just the subset required
-        // by the ECMAScript specification.
+        // Extended identity escape (non-unicode only). We accept any character
+        // that hasn't been matched by a more specific case, not just the subset
+        // required by the ECMAScript specification.
         widechar result = current();
+        if (unicode_ && result != '-' && !IsSyntaxCharacter(result)) {
+            ReportError(JSMSG_INVALID_IDENTITY_ESCAPE);
+            return false;
+        }
         Advance();
         *code = result;
         return true;
@@ -1388,6 +1437,8 @@ RegExpParser<CharT>::ParseDisjunction()
                                                    capture_index);
             }
             builder->AddAtom(body);
+            if (unicode_ && (group_type == POSITIVE_LOOKAHEAD || group_type == NEGATIVE_LOOKAHEAD))
+                continue;
             // For compatability with JSC and ES3, we allow quantifiers after
             // lookaheads, and break in all cases.
             break;
@@ -1527,6 +1578,8 @@ RegExpParser<CharT>::ParseDisjunction()
                     builder->AddAtom(atom);
                     break;
                 }
+                if (unicode_)
+                    return ReportError(JSMSG_BACK_REF_OUT_OF_RANGE);
                 widechar first_digit = Next();
                 if (first_digit == '8' || first_digit == '9') {
                     // Treat as identity escape
@@ -1537,6 +1590,14 @@ RegExpParser<CharT>::ParseDisjunction()
               }
                 // FALLTHROUGH
               case '0': {
+                if (unicode_) {
+                    Advance(2);
+                    if (IsDecimalDigit(current()))
+                        return ReportError(JSMSG_INVALID_DECIMAL_ESCAPE);
+                    builder->AddCharacter(0);
+                    break;
+                }
+
                 Advance();
                 size_t octal = ParseOctalLiteral();
                 builder->AddCharacter(octal);
@@ -1571,6 +1632,8 @@ RegExpParser<CharT>::ParseDisjunction()
                 // Convert lower case letters to uppercase.
                 widechar letter = controlLetter & ~('a' ^ 'A');
                 if (letter < 'A' || 'Z' < letter) {
+                    if (unicode_)
+                        return ReportError(JSMSG_INVALID_IDENTITY_ESCAPE);
                     // controlLetter is not in range 'A'-'Z' or 'a'-'z'.
                     // This is outside the specification. We match JSC in
                     // reading the backslash as a literal character instead
@@ -1588,6 +1651,8 @@ RegExpParser<CharT>::ParseDisjunction()
                 if (ParseHexEscape(2, &value)) {
                     builder->AddCharacter(value);
                 } else {
+                    if (unicode_)
+                        return ReportError(JSMSG_INVALID_IDENTITY_ESCAPE);
                     builder->AddCharacter('x');
                 }
                 break;
@@ -1639,12 +1704,16 @@ RegExpParser<CharT>::ParseDisjunction()
               }
               default:
                 // Identity escape.
+                if (unicode_ && !IsSyntaxCharacter(Next()))
+                    return ReportError(JSMSG_INVALID_IDENTITY_ESCAPE);
                 builder->AddCharacter(Next());
                 Advance(2);
                 break;
             }
             break;
           case '{': {
+            if (unicode_)
+                return ReportError(JSMSG_RAW_BRACE_IN_REGEP);
             int dummy;
             if (ParseIntervalQuantifier(&dummy, &dummy))
                 return ReportError(JSMSG_NOTHING_TO_REPEAT);
@@ -1661,6 +1730,10 @@ RegExpParser<CharT>::ParseDisjunction()
                         builder->AddAtom(LeadSurrogateAtom(alloc, c));
                     else if (unicode::IsTrailSurrogate(c))
                         builder->AddAtom(TrailSurrogateAtom(alloc, c));
+                    else if (c == ']')
+                        return ReportError(JSMSG_RAW_BRACKET_IN_REGEP);
+                    else if (c == '}')
+                        return ReportError(JSMSG_RAW_BRACE_IN_REGEP);
                     else
                         builder->AddCharacter(c);
                     Advance();
diff --git a/js/src/js.msg b/js/src/js.msg
index f8fb960e666a..7c2d7263a107 100644
--- a/js/src/js.msg
+++ b/js/src/js.msg
@@ -443,9 +443,11 @@ MSG_DEF(JSMSG_INVALID_TIME_ZONE,       1, JSEXN_RANGEERR, "invalid time zone in
 MSG_DEF(JSMSG_UNDEFINED_CURRENCY,      0, JSEXN_TYPEERR, "undefined currency in NumberFormat() with currency style")
 
 // RegExp
+MSG_DEF(JSMSG_BACK_REF_OUT_OF_RANGE,   0, JSEXN_SYNTAXERR, "back reference out of range in regular expression")
 MSG_DEF(JSMSG_BAD_CLASS_RANGE,         0, JSEXN_SYNTAXERR, "invalid range in character class")
 MSG_DEF(JSMSG_DEPRECATED_REGEXP_MULTILINE, 0, JSEXN_SYNTAXERR, "RegExp.multiline is deprecated. Use m flag instead")
 MSG_DEF(JSMSG_ESCAPE_AT_END_OF_REGEXP, 0, JSEXN_SYNTAXERR, "\\ at end of pattern")
+MSG_DEF(JSMSG_INVALID_DECIMAL_ESCAPE, 0, JSEXN_SYNTAXERR, "invalid decimal escape in regular expression")
 MSG_DEF(JSMSG_INVALID_GROUP,           0, JSEXN_SYNTAXERR, "invalid regexp group")
 MSG_DEF(JSMSG_INVALID_IDENTITY_ESCAPE, 0, JSEXN_SYNTAXERR, "invalid identity escape in regular expression")
 MSG_DEF(JSMSG_INVALID_UNICODE_ESCAPE,  0, JSEXN_SYNTAXERR, "invalid unicode escape in regular expression")
@@ -454,6 +456,8 @@ MSG_DEF(JSMSG_NEWREGEXP_FLAGGED,       0, JSEXN_TYPEERR, "can't supply flags whe
 MSG_DEF(JSMSG_NOTHING_TO_REPEAT,       0, JSEXN_SYNTAXERR, "nothing to repeat")
 MSG_DEF(JSMSG_NUMBERS_OUT_OF_ORDER,    0, JSEXN_SYNTAXERR, "numbers out of order in {} quantifier.")
 MSG_DEF(JSMSG_RANGE_WITH_CLASS_ESCAPE, 0, JSEXN_SYNTAXERR, "character class escape cannot be used in class range in regular expression")
+MSG_DEF(JSMSG_RAW_BRACE_IN_REGEP,      0, JSEXN_SYNTAXERR, "raw brace is not allowed in regular expression with unicode flag")
+MSG_DEF(JSMSG_RAW_BRACKET_IN_REGEP,    0, JSEXN_SYNTAXERR, "raw bracket is not allowed in regular expression with unicode flag")
 MSG_DEF(JSMSG_TOO_MANY_PARENS,         0, JSEXN_INTERNALERR, "too many parentheses in regular expression")
 MSG_DEF(JSMSG_UNICODE_OVERFLOW,        0, JSEXN_SYNTAXERR, "unicode codepoint should not be greater than 0x10FFFF in regular expression")
 MSG_DEF(JSMSG_UNMATCHED_RIGHT_PAREN,   0, JSEXN_SYNTAXERR, "unmatched ) in regular expression")
diff --git a/js/src/tests/ecma_6/RegExp/unicode-disallow-extended.js b/js/src/tests/ecma_6/RegExp/unicode-disallow-extended.js
new file mode 100644
index 000000000000..d1f775fac2f6
--- /dev/null
+++ b/js/src/tests/ecma_6/RegExp/unicode-disallow-extended.js
@@ -0,0 +1,117 @@
+var BUGNUMBER = 1135377;
+var summary = "Implement RegExp unicode flag -- disallow extended patterns.";
+
+print(BUGNUMBER + ": " + summary);
+
+// IdentityEscape
+
+assertEqArray(/\^\$\\\.\*\+\?\(\)\[\]\{\}\|/u.exec("^$\\.*+?()[]{}|"),
+              ["^$\\.*+?()[]{}|"]);
+assertThrowsInstanceOf(() => eval(`/\\A/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\-/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\U{10}/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\U0000/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\uD83D\\U0000/u`), SyntaxError);
+
+assertEqArray(/[\^\$\\\.\*\+\?\(\)\[\]\{\}\|]+/u.exec("^$\\.*+?()[]{}|"),
+              ["^$\\.*+?()[]{}|"]);
+assertThrowsInstanceOf(() => eval(`/[\\A]/u`), SyntaxError);
+assertEqArray(/[A\-Z]+/u.exec("a-zABC"),
+              ["-"]);
+assertThrowsInstanceOf(() => eval(`/[\\U{10}]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\U0000]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\uD83D\\U0000]/u`), SyntaxError);
+
+// PatternCharacter
+assertThrowsInstanceOf(() => eval(`/{}/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/{/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/}/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/{0}/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/{1,}/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/{1,2}/u`), SyntaxError);
+
+// QuantifiableAssertion
+assertEqArray(/.B(?=A)/u.exec("cBaCBA"),
+              ["CB"]);
+assertEqArray(/.B(?!A)/u.exec("CBAcBa"),
+              ["cB"]);
+assertEqArray(/.B(?:A)/u.exec("cBaCBA"),
+              ["CBA"]);
+assertEqArray(/.B(A)/u.exec("cBaCBA"),
+              ["CBA", "A"]);
+
+assertThrowsInstanceOf(() => eval(`/.B(?=A)+/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/.B(?!A)+/u`), SyntaxError);
+assertEqArray(/.B(?:A)+/u.exec("cBaCBA"),
+              ["CBA"]);
+assertEqArray(/.B(A)+/u.exec("cBaCBA"),
+              ["CBA", "A"]);
+
+// ControlLetter
+assertEqArray(/\cA/u.exec("\u0001"),
+              ["\u0001"]);
+assertEqArray(/\cZ/u.exec("\u001a"),
+              ["\u001a"]);
+assertEqArray(/\ca/u.exec("\u0001"),
+              ["\u0001"]);
+assertEqArray(/\cz/u.exec("\u001a"),
+              ["\u001a"]);
+
+assertEqArray(/[\cA]/u.exec("\u0001"),
+              ["\u0001"]);
+assertEqArray(/[\cZ]/u.exec("\u001a"),
+              ["\u001a"]);
+assertEqArray(/[\ca]/u.exec("\u0001"),
+              ["\u0001"]);
+assertEqArray(/[\cz]/u.exec("\u001a"),
+              ["\u001a"]);
+
+assertThrowsInstanceOf(() => eval(`/\\c/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\c1/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\c_/u`), SyntaxError);
+
+assertThrowsInstanceOf(() => eval(`/[\\c]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\c1]/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/[\\c_]/u`), SyntaxError);
+
+// HexEscapeSequence
+assertThrowsInstanceOf(() => eval(`/\\x/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\x0/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\x1/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\x1G/u`), SyntaxError);
+
+// LegacyOctalEscapeSequence
+assertThrowsInstanceOf(() => eval(`/\\52/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\052/u`), SyntaxError);
+
+// DecimalEscape
+assertEqArray(/\0/u.exec("\0"),
+              ["\0"]);
+assertEqArray(/[\0]/u.exec("\0"),
+              ["\0"]);
+assertEqArray(/\0A/u.exec("\0A"),
+              ["\0A"]);
+assertEqArray(/\0G/u.exec("\0G"),
+              ["\0G"]);
+assertEqArray(/(A.)\1/u.exec("ABACABAB"),
+              ["ABAB", "AB"]);
+assertEqArray(/(A.)(B.)(C.)(D.)(E.)(F.)(G.)(H.)(I.)(J.)(K.)\10/u.exec("A1B2C3D4E5F6G7H8I9JaKbJa"),
+              ["A1B2C3D4E5F6G7H8I9JaKbJa", "A1", "B2", "C3", "D4", "E5", "F6", "G7", "H8", "I9", "Ja", "Kb"]);
+
+assertThrowsInstanceOf(() => eval(`/\\00/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\01/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\09/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\1/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\2/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\3/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\4/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\5/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\6/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\7/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\8/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\9/u`), SyntaxError);
+assertThrowsInstanceOf(() => eval(`/\\10/u`), SyntaxError);
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff --git a/js/src/vm/Xdr.h b/js/src/vm/Xdr.h
index a4e2a2fab675..4e13c3d0a854 100644
--- a/js/src/vm/Xdr.h
+++ b/js/src/vm/Xdr.h
@@ -29,11 +29,11 @@ namespace js {
  *
  *  https://developer.mozilla.org/en-US/docs/SpiderMonkey/Internals/Bytecode
  */
-static const uint32_t XDR_BYTECODE_VERSION_SUBTRAHEND = 336;
+static const uint32_t XDR_BYTECODE_VERSION_SUBTRAHEND = 337;
 static const uint32_t XDR_BYTECODE_VERSION =
     uint32_t(0xb973c0de - XDR_BYTECODE_VERSION_SUBTRAHEND);
 
-static_assert(JSErr_Limit == 425,
+static_assert(JSErr_Limit == 429,
               "GREETINGS, POTENTIAL SUBTRAHEND INCREMENTER! If you added or "
               "removed MSG_DEFs from js.msg, you should increment "
               "XDR_BYTECODE_VERSION_SUBTRAHEND and update this assertion's "

From 6685278427c4dc0d065f502c22ef6715f0327ffa Mon Sep 17 00:00:00 2001
From: Tooru Fujisawa <arai_a@mac.com>
Date: Fri, 7 Aug 2015 08:13:37 +0900
Subject: [PATCH 061/101] Bug 1135377 - Part 9: Use RegExp unicode flag in
 String.prototype.{match,replace,split}. r=till, f=anba

---
 js/src/jsstr.cpp                              | 60 ++++++++++++++++---
 .../tests/ecma_6/String/AdvanceStringIndex.js | 43 +++++++++++++
 2 files changed, 95 insertions(+), 8 deletions(-)
 create mode 100644 js/src/tests/ecma_6/String/AdvanceStringIndex.js

diff --git a/js/src/jsstr.cpp b/js/src/jsstr.cpp
index 5d434c685690..587de554b193 100644
--- a/js/src/jsstr.cpp
+++ b/js/src/jsstr.cpp
@@ -2276,6 +2276,41 @@ DoMatchLocal(JSContext* cx, const CallArgs& args, RegExpStatics* res, HandleLine
     return true;
 }
 
+/* ES6 21.2.5.2.3. */
+static size_t
+AdvanceStringIndex(HandleLinearString input, size_t length, size_t index, bool unicode)
+{
+    /* Steps 1-3 (implicit). */
+
+    /* Step 4: If input is latin1, there is no surrogate pair. */
+    if (!unicode || input->hasLatin1Chars())
+        return index + 1;
+
+    JS::AutoCheckCannotGC nogc;
+    const char16_t* S = input->twoByteChars(nogc);
+
+    /* Step 6. */
+    if (index + 1 >= length)
+        return index + 1;
+
+    /* Step 7. */
+    char16_t first = S[index];
+
+    /* Step 8. */
+    if (!unicode::IsLeadSurrogate(first))
+        return index + 1;
+
+    /* Step 9. */
+    char16_t second = S[index + 1];
+
+    /* Step 10. */
+    if (!unicode::IsTrailSurrogate(second))
+        return index + 1;
+
+    /* Step 11. */
+    return index + 2;
+}
+
 /* ES5 15.5.4.10 step 8. */
 static bool
 DoMatchGlobal(JSContext* cx, const CallArgs& args, RegExpStatics* res, HandleLinearString input,
@@ -2331,6 +2366,7 @@ DoMatchGlobal(JSContext* cx, const CallArgs& args, RegExpStatics* res, HandleLin
     ScopedMatchPairs matches(&cx->tempLifoAlloc());
     size_t charsLen = input->length();
     RegExpShared& re = g.regExp();
+    bool unicode = re.unicode();
     for (size_t searchIndex = 0; searchIndex <= charsLen; ) {
         if (!CheckForInterrupt(cx))
             return false;
@@ -2348,7 +2384,9 @@ DoMatchGlobal(JSContext* cx, const CallArgs& args, RegExpStatics* res, HandleLin
         MatchPair& match = matches[0];
 
         // Steps 8f(iii)(1-3).
-        searchIndex = match.isEmpty() ? match.limit + 1 : match.limit;
+        searchIndex = match.isEmpty()
+                      ? AdvanceStringIndex(input, charsLen, match.limit, unicode)
+                      : match.limit;
 
         // Step 8f(iii)(4-5).
         JSLinearString* str = NewDependentString(cx, input, match.start, match.length());
@@ -2614,6 +2652,7 @@ static bool
 DoMatchForReplaceGlobal(JSContext* cx, RegExpStatics* res, HandleLinearString linearStr,
                         RegExpShared& re, ReplaceData& rdata, size_t* rightContextOffset)
 {
+    bool unicode = re.unicode();
     size_t charsLen = linearStr->length();
     ScopedMatchPairs matches(&cx->tempLifoAlloc());
     for (size_t count = 0, searchIndex = 0; searchIndex <= charsLen; ++count) {
@@ -2628,7 +2667,9 @@ DoMatchForReplaceGlobal(JSContext* cx, RegExpStatics* res, HandleLinearString li
             break;
 
         MatchPair& match = matches[0];
-        searchIndex = match.isEmpty() ? match.limit + 1 : match.limit;
+        searchIndex = match.isEmpty()
+                      ? AdvanceStringIndex(linearStr, charsLen, match.limit, unicode)
+                      : match.limit;
         *rightContextOffset = match.limit;
 
         if (!res->updateFromMatchPairs(cx, linearStr, matches))
@@ -3228,6 +3269,7 @@ StrReplaceRegexpRemove(JSContext* cx, HandleString str, RegExpShared& re)
     size_t lazyIndex = 0;  /* Index before last successful match. */
 
     /* Accumulate StringRanges for unmatched substrings. */
+    bool unicode = re.unicode();
     while (startIndex <= charsLen) {
         if (!CheckForInterrupt(cx))
             return nullptr;
@@ -3248,7 +3290,9 @@ StrReplaceRegexpRemove(JSContext* cx, HandleString str, RegExpShared& re)
         lazyIndex = lastIndex;
         lastIndex = match.limit;
 
-        startIndex = match.isEmpty() ? match.limit + 1 : match.limit;
+        startIndex = match.isEmpty()
+                     ? AdvanceStringIndex(linearStr, charsLen, match.limit, unicode)
+                     : match.limit;
 
         /* Non-global removal executes at most once. */
         if (!re.global())
@@ -3631,7 +3675,7 @@ class SplitMatchResult {
 template<class Matcher>
 static JSObject*
 SplitHelper(JSContext* cx, HandleLinearString str, uint32_t limit, const Matcher& splitMatch,
-            HandleObjectGroup group)
+            HandleObjectGroup group, bool unicode)
 {
     size_t strLength = str->length();
     SplitMatchResult result;
@@ -3696,7 +3740,7 @@ SplitHelper(JSContext* cx, HandleLinearString str, uint32_t limit, const Matcher
 
         /* Step 13(c)(ii). */
         if (endIndex == lastEndIndex) {
-            index++;
+            index = AdvanceStringIndex(str, strLength, index, unicode);
             continue;
         }
 
@@ -3925,14 +3969,14 @@ js::str_split(JSContext* cx, unsigned argc, Value* vp)
             aobj = CharSplitHelper(cx, linearStr, limit, group);
         } else {
             SplitStringMatcher matcher(cx, sepstr);
-            aobj = SplitHelper(cx, linearStr, limit, matcher, group);
+            aobj = SplitHelper(cx, linearStr, limit, matcher, group, false);
         }
     } else {
         RegExpStatics* res = cx->global()->getRegExpStatics(cx);
         if (!res)
             return false;
         SplitRegExpMatcher matcher(*re, res);
-        aobj = SplitHelper(cx, linearStr, limit, matcher, group);
+        aobj = SplitHelper(cx, linearStr, limit, matcher, group, re->unicode());
     }
     if (!aobj)
         return false;
@@ -3960,7 +4004,7 @@ js::str_split_string(JSContext* cx, HandleObjectGroup group, HandleString str, H
         return CharSplitHelper(cx, linearStr, limit, group);
 
     SplitStringMatcher matcher(cx, linearSep);
-    return SplitHelper(cx, linearStr, limit, matcher, group);
+    return SplitHelper(cx, linearStr, limit, matcher, group, false);
 }
 
 /*
diff --git a/js/src/tests/ecma_6/String/AdvanceStringIndex.js b/js/src/tests/ecma_6/String/AdvanceStringIndex.js
new file mode 100644
index 000000000000..fc404660392c
--- /dev/null
+++ b/js/src/tests/ecma_6/String/AdvanceStringIndex.js
@@ -0,0 +1,43 @@
+var BUGNUMBER = 1135377;
+var summary = "Implement RegExp unicode flag -- AdvanceStringIndex in global match and replace.";
+
+print(BUGNUMBER + ": " + summary);
+
+// ==== String.prototype.match ====
+
+assertEqArray("\uD83D\uDC38\uD83D\uDC39X\uD83D\uDC3A".match(/\uD83D|X|/gu),
+              ["", "", "X", "", ""]);
+assertEqArray("\uD83D\uDC38\uD83D\uDC39X\uD83D\uDC3A".match(/\uDC38|X|/gu),
+              ["", "", "X", "", ""]);
+assertEqArray("\uD83D\uDC38\uD83D\uDC39X\uD83D\uDC3A".match(/\uD83D\uDC38|X|/gu),
+              ["\uD83D\uDC38", "", "X", "", ""]);
+
+// ==== String.prototype.replace ====
+
+// empty string replacement (optimized)
+assertEqArray("\uD83D\uDC38\uD83D\uDC39X\uD83D\uDC3A".replace(/\uD83D|X|/gu, ""),
+              "\uD83D\uDC38\uD83D\uDC39\uD83D\uDC3A");
+assertEqArray("\uD83D\uDC38\uD83D\uDC39X\uD83D\uDC3A".replace(/\uDC38|X|/gu, ""),
+              "\uD83D\uDC38\uD83D\uDC39\uD83D\uDC3A");
+assertEqArray("\uD83D\uDC38\uD83D\uDC39X\uD83D\uDC3A".replace(/\uD83D\uDC38|X|/gu, ""),
+              "\uD83D\uDC39\uD83D\uDC3A");
+
+// non-empty string replacement
+assertEqArray("\uD83D\uDC38\uD83D\uDC39X\uD83D\uDC3A".replace(/\uD83D|X|/gu, "x"),
+              "x\uD83D\uDC38x\uD83D\uDC39xx\uD83D\uDC3Ax");
+assertEqArray("\uD83D\uDC38\uD83D\uDC39X\uD83D\uDC3A".replace(/\uDC38|X|/gu, "x"),
+              "x\uD83D\uDC38x\uD83D\uDC39xx\uD83D\uDC3Ax");
+assertEqArray("\uD83D\uDC38\uD83D\uDC39X\uD83D\uDC3A".replace(/\uD83D\uDC38|X|/gu, "x"),
+              "xx\uD83D\uDC39xx\uD83D\uDC3Ax");
+
+// ==== String.prototype.split ====
+
+assertEqArray("\uD83D\uDC38\uD83D\uDC39X\uD83D\uDC3A".split(/\uD83D|X|/u),
+              ["\uD83D\uDC38", "\uD83D\uDC39", "\uD83D\uDC3A"]);
+assertEqArray("\uD83D\uDC38\uD83D\uDC39X\uD83D\uDC3A".split(/\uDC38|X|/u),
+              ["\uD83D\uDC38", "\uD83D\uDC39", "\uD83D\uDC3A"]);
+assertEqArray("\uD83D\uDC38\uD83D\uDC39X\uD83D\uDC3A".split(/\uD83D\uDC38|X|/u),
+              ["", "\uD83D\uDC39", "\uD83D\uDC3A"]);
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);

From 130cf6fbacf36f44d6c35fe54126e57ecf03ce63 Mon Sep 17 00:00:00 2001
From: Tooru Fujisawa <arai_a@mac.com>
Date: Sat, 19 Dec 2015 04:51:20 +0900
Subject: [PATCH 062/101] Bug 1135377 - Part 10: Decrement index when it points
 trail surrogate that has corresponding lead surrogate. r=till, f=anba

---
 js/src/builtin/RegExp.cpp                   | 52 +++++++++++++++++++++
 js/src/tests/ecma_6/RegExp/unicode-index.js | 17 +++++++
 2 files changed, 69 insertions(+)
 create mode 100644 js/src/tests/ecma_6/RegExp/unicode-index.js

diff --git a/js/src/builtin/RegExp.cpp b/js/src/builtin/RegExp.cpp
index db0dc31e3dd5..17b44c8d7f1d 100644
--- a/js/src/builtin/RegExp.cpp
+++ b/js/src/builtin/RegExp.cpp
@@ -14,12 +14,14 @@
 #include "jit/InlinableNatives.h"
 #include "vm/RegExpStatics.h"
 #include "vm/StringBuffer.h"
+#include "vm/Unicode.h"
 
 #include "jsobjinlines.h"
 
 #include "vm/NativeObject-inl.h"
 
 using namespace js;
+using namespace js::unicode;
 
 using mozilla::ArrayLength;
 using mozilla::Maybe;
@@ -782,6 +784,29 @@ SetLastIndex(JSContext* cx, Handle<RegExpObject*> reobj, double lastIndex)
     return true;
 }
 
+template <typename CharT>
+static bool
+IsTrailSurrogateWithLeadSurrogateImpl(JSContext* cx, HandleLinearString input, size_t index)
+{
+    JS::AutoCheckCannotGC nogc;
+    MOZ_ASSERT(index > 0 && index < input->length());
+    const CharT* inputChars = input->chars<CharT>(nogc);
+
+    return unicode::IsTrailSurrogate(inputChars[index]) &&
+           unicode::IsLeadSurrogate(inputChars[index - 1]);
+}
+
+static bool
+IsTrailSurrogateWithLeadSurrogate(JSContext* cx, HandleLinearString input, int32_t index)
+{
+    if (index <= 0 || size_t(index) >= input->length())
+        return false;
+
+    return input->hasLatin1Chars()
+           ? IsTrailSurrogateWithLeadSurrogateImpl<Latin1Char>(cx, input, index)
+           : IsTrailSurrogateWithLeadSurrogateImpl<char16_t>(cx, input, index);
+}
+
 /* ES6 final draft 21.2.5.2.2. */
 RegExpRunStatus
 js::ExecuteRegExp(JSContext* cx, HandleObject regexp, HandleString string,
@@ -864,6 +889,33 @@ js::ExecuteRegExp(JSContext* cx, HandleObject regexp, HandleString string,
         return RegExpRunStatus_Success_NotFound;
     }
 
+    /* Steps 12-13. */
+    if (reobj->unicode()) {
+        /*
+         * ES6 21.2.2.2 step 2.
+         *   Let listIndex be the index into Input of the character that was
+         *   obtained from element index of str.
+         *
+         * In the spec, pattern match is performed with decoded Unicode code
+         * points, but our implementation performs it with UTF-16 encoded
+         * string.  In step 2, we should decrement searchIndex (index) if it
+         * points the trail surrogate that has corresponding lead surrogate.
+         *
+         *   var r = /\uD83D\uDC38/ug;
+         *   r.lastIndex = 1;
+         *   var str = "\uD83D\uDC38";
+         *   var result = r.exec(str); // pattern match starts from index 0
+         *   print(result.index);      // prints 0
+         *
+         * Note: this doesn't match the current spec text and result in
+         * different values for `result.index` under certain conditions.
+         * However, the spec will change to match our implementation's
+         * behavior. See https://github.com/tc39/ecma262/issues/128.
+         */
+        if (IsTrailSurrogateWithLeadSurrogate(cx, input, searchIndex))
+            searchIndex--;
+    }
+
     /* Step 14-29. */
     RegExpRunStatus status = ExecuteRegExpImpl(cx, res, *re, input, searchIndex, matches);
     if (status == RegExpRunStatus_Error)
diff --git a/js/src/tests/ecma_6/RegExp/unicode-index.js b/js/src/tests/ecma_6/RegExp/unicode-index.js
new file mode 100644
index 000000000000..a4b2eb2030e2
--- /dev/null
+++ b/js/src/tests/ecma_6/RegExp/unicode-index.js
@@ -0,0 +1,17 @@
+var BUGNUMBER = 1135377;
+var summary = "Implement RegExp unicode flag -- Pattern match should start from lead surrogate when lastIndex points corresponding trail surrogate.";
+
+print(BUGNUMBER + ": " + summary);
+
+var r = /\uD83D\uDC38/ug;
+r.lastIndex = 1;
+var str = "\uD83D\uDC38";
+var result = r.exec(str);
+assertEq(result.length, 1);
+assertEq(result[0], "\uD83D\uDC38");
+
+// This does not match to ES6 spec, but the spec will be changed.
+assertEq(result.index, 0);
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);

From 33de61ee5d4cfa8bfc30e55559fda19c77003df5 Mon Sep 17 00:00:00 2001
From: Tooru Fujisawa <arai_a@mac.com>
Date: Sat, 19 Dec 2015 04:51:21 +0900
Subject: [PATCH 063/101] Bug 1135377 - Part 11: Support back reference with
 unicode flag. r=till, f=anba

---
 js/src/irregexp/RegExpAST.h                   |  3 +-
 js/src/irregexp/RegExpEngine.cpp              | 39 +++++++++++++++++++
 js/src/irregexp/RegExpEngine.h                |  7 +++-
 js/src/irregexp/RegExpParser.cpp              | 20 +++++++++-
 .../ecma_6/RegExp/unicode-back-reference.js   | 39 +++++++++++++++++++
 5 files changed, 105 insertions(+), 3 deletions(-)
 create mode 100644 js/src/tests/ecma_6/RegExp/unicode-back-reference.js

diff --git a/js/src/irregexp/RegExpAST.h b/js/src/irregexp/RegExpAST.h
index 1bafe91d155f..ae76f64d4b73 100644
--- a/js/src/irregexp/RegExpAST.h
+++ b/js/src/irregexp/RegExpAST.h
@@ -139,7 +139,8 @@ class RegExpAssertion : public RegExpTree {
     END_OF_INPUT,
     BOUNDARY,
     NON_BOUNDARY,
-    NOT_AFTER_LEAD_SURROGATE
+    NOT_AFTER_LEAD_SURROGATE,
+    NOT_IN_SURROGATE_PAIR
   };
   explicit RegExpAssertion(AssertionType type) : assertion_type_(type) { }
   virtual void* Accept(RegExpVisitor* visitor, void* data);
diff --git a/js/src/irregexp/RegExpEngine.cpp b/js/src/irregexp/RegExpEngine.cpp
index ebbafd952952..b3b1de60d6f7 100644
--- a/js/src/irregexp/RegExpEngine.cpp
+++ b/js/src/irregexp/RegExpEngine.cpp
@@ -2182,6 +2182,8 @@ RegExpAssertion::ToNode(RegExpCompiler* compiler,
       }
       case NOT_AFTER_LEAD_SURROGATE:
         return AssertionNode::NotAfterLeadSurrogate(on_success);
+      case NOT_IN_SURROGATE_PAIR:
+        return AssertionNode::NotInSurrogatePair(on_success);
       default:
         MOZ_CRASH("Bad assertion type");
     }
@@ -2994,6 +2996,40 @@ EmitNotAfterLeadSurrogate(RegExpCompiler* compiler, RegExpNode* on_success, Trac
     on_success->Emit(compiler, &new_trace);
 }
 
+// Assert that the next character is not a trail surrogate that has a
+// corresponding lead surrogate.
+static void
+EmitNotInSurrogatePair(RegExpCompiler* compiler, RegExpNode* on_success, Trace* trace)
+{
+    RegExpMacroAssembler* assembler = compiler->macro_assembler();
+
+    jit::Label ok;
+    assembler->CheckPosition(trace->cp_offset(), &ok);
+
+    // We will be loading the next and previous characters into the current
+    // character register.
+    Trace new_trace(*trace);
+    new_trace.InvalidateCurrentCharacter();
+
+    if (new_trace.cp_offset() == 0)
+        assembler->CheckAtStart(&ok);
+
+    // First check if next character is a trail surrogate.
+    assembler->LoadCurrentCharacter(new_trace.cp_offset(), new_trace.backtrack(), false);
+    assembler->CheckCharacterNotInRange(unicode::TrailSurrogateMin, unicode::TrailSurrogateMax,
+                                        &ok);
+
+    // Next check if previous character is a lead surrogate.
+    // We already checked that we are not at the start of input so it must be
+    // OK to load the previous character.
+    assembler->LoadCurrentCharacter(new_trace.cp_offset() - 1, new_trace.backtrack(), false);
+    assembler->CheckCharacterInRange(unicode::LeadSurrogateMin, unicode::LeadSurrogateMax,
+                                     new_trace.backtrack());
+
+    assembler->Bind(&ok);
+    on_success->Emit(compiler, &new_trace);
+}
+
 // Check for [0-9A-Z_a-z].
 static void
 EmitWordCheck(RegExpMacroAssembler* assembler,
@@ -3150,6 +3186,9 @@ AssertionNode::Emit(RegExpCompiler* compiler, Trace* trace)
       case NOT_AFTER_LEAD_SURROGATE:
         EmitNotAfterLeadSurrogate(compiler, on_success(), trace);
         return;
+      case NOT_IN_SURROGATE_PAIR:
+        EmitNotInSurrogatePair(compiler, on_success(), trace);
+        return;
     }
     on_success()->Emit(compiler, trace);
 }
diff --git a/js/src/irregexp/RegExpEngine.h b/js/src/irregexp/RegExpEngine.h
index 356366f61739..ca315c2adcd7 100644
--- a/js/src/irregexp/RegExpEngine.h
+++ b/js/src/irregexp/RegExpEngine.h
@@ -792,7 +792,8 @@ class AssertionNode : public SeqRegExpNode
         AT_BOUNDARY,
         AT_NON_BOUNDARY,
         AFTER_NEWLINE,
-        NOT_AFTER_LEAD_SURROGATE
+        NOT_AFTER_LEAD_SURROGATE,
+        NOT_IN_SURROGATE_PAIR
     };
     AssertionNode(AssertionType t, RegExpNode* on_success)
       : SeqRegExpNode(on_success), assertion_type_(t)
@@ -817,6 +818,10 @@ class AssertionNode : public SeqRegExpNode
         return on_success->alloc()->newInfallible<AssertionNode>(NOT_AFTER_LEAD_SURROGATE,
                                                                  on_success);
     }
+    static AssertionNode* NotInSurrogatePair(RegExpNode* on_success) {
+        return on_success->alloc()->newInfallible<AssertionNode>(NOT_IN_SURROGATE_PAIR,
+                                                                 on_success);
+    }
     virtual void Accept(NodeVisitor* visitor);
     virtual void Emit(RegExpCompiler* compiler, Trace* trace);
     virtual int EatsAtLeast(int still_to_find, int budget, bool not_at_start);
diff --git a/js/src/irregexp/RegExpParser.cpp b/js/src/irregexp/RegExpParser.cpp
index f5ecda2609bc..1874368a5b7b 100644
--- a/js/src/irregexp/RegExpParser.cpp
+++ b/js/src/irregexp/RegExpParser.cpp
@@ -1374,6 +1374,21 @@ UnicodeCharacterClassEscapeAtom(LifoAlloc* alloc, char16_t char_class, bool igno
     return UnicodeRangesAtom(alloc, ranges, lead_ranges, trail_ranges, wide_ranges, false, false);
 }
 
+static inline RegExpTree*
+UnicodeBackReferenceAtom(LifoAlloc* alloc, RegExpTree* atom)
+{
+    // If a back reference has a standalone lead surrogate as its last
+    // character, then that lead surrogate shouldn't match lead surrogates that
+    // are paired with a corresponding trail surrogate.
+    RegExpBuilder* builder = alloc->newInfallible<RegExpBuilder>(alloc);
+
+    builder->AddAtom(atom);
+    builder->AddAssertion(alloc->newInfallible<RegExpAssertion>(
+        RegExpAssertion::NOT_IN_SURROGATE_PAIR));
+
+    return builder->ToRegExp();
+}
+
 // Disjunction ::
 //   Alternative
 //   Alternative | Disjunction
@@ -1575,7 +1590,10 @@ RegExpParser<CharT>::ParseDisjunction()
                         break;
                     }
                     RegExpTree* atom = alloc->newInfallible<RegExpBackReference>(capture);
-                    builder->AddAtom(atom);
+                    if (unicode_)
+                        builder->AddAtom(UnicodeBackReferenceAtom(alloc, atom));
+                    else
+                        builder->AddAtom(atom);
                     break;
                 }
                 if (unicode_)
diff --git a/js/src/tests/ecma_6/RegExp/unicode-back-reference.js b/js/src/tests/ecma_6/RegExp/unicode-back-reference.js
new file mode 100644
index 000000000000..2a65432a1d6d
--- /dev/null
+++ b/js/src/tests/ecma_6/RegExp/unicode-back-reference.js
@@ -0,0 +1,39 @@
+var BUGNUMBER = 1135377;
+var summary = "Implement RegExp unicode flag -- back reference should not match lead surrogate that has corresponding trail surrogate.";
+
+print(BUGNUMBER + ": " + summary);
+
+// The last character of back reference is not a surrogate.
+assertEqArray(/foo(.+)bar\1/u.exec("fooAbarA\uDC00"),
+              ["fooAbarA", "A"]);
+assertEqArray(/foo(.+)bar\1/u.exec("fooAbarA\uD834"),
+              ["fooAbarA", "A"]);
+assertEqArray(/foo(.+)bar\1/u.exec("fooAbarAA"),
+              ["fooAbarA", "A"]);
+assertEqArray(/foo(.+)bar\1/u.exec("fooAbarA"),
+              ["fooAbarA", "A"]);
+
+// The last character of back reference is a lead surrogate.
+assertEq(/foo(.+)bar\1/u.exec("foo\uD834bar\uD834\uDC00"), null);
+assertEqArray(/foo(.+)bar\1/u.exec("foo\uD834bar\uD834\uD834"),
+              ["foo\uD834bar\uD834", "\uD834"]);
+assertEqArray(/foo(.+)bar\1/u.exec("foo\uD834bar\uD834A"),
+              ["foo\uD834bar\uD834", "\uD834"]);
+assertEqArray(/foo(.+)bar\1/u.exec("foo\uD834bar\uD834"),
+              ["foo\uD834bar\uD834", "\uD834"]);
+
+// The last character of back reference is a trail surrogate.
+assertEqArray(/foo(.+)bar\1/u.exec("foo\uDC00bar\uDC00\uDC00"),
+              ["foo\uDC00bar\uDC00", "\uDC00"]);
+assertEqArray(/foo(.+)bar\1/u.exec("foo\uDC00bar\uDC00\uD834"),
+              ["foo\uDC00bar\uDC00", "\uDC00"]);
+assertEqArray(/foo(.+)bar\1/u.exec("foo\uDC00bar\uDC00A"),
+              ["foo\uDC00bar\uDC00", "\uDC00"]);
+assertEqArray(/foo(.+)bar\1/u.exec("foo\uDC00bar\uDC00"),
+              ["foo\uDC00bar\uDC00", "\uDC00"]);
+
+// Pattern should not match to surrogate pair partially.
+assertEq(/^(.+)\1$/u.exec("\uDC00foobar\uD834\uDC00foobar\uD834"), null);
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);

From bc24ddcf02f675c84d1cfd88a23764427991e24b Mon Sep 17 00:00:00 2001
From: Nick Fitzgerald <fitzgen@gmail.com>
Date: Fri, 18 Dec 2015 12:05:14 -0800
Subject: [PATCH 064/101] Bug 1233101 - Use MOZ_LIKELY in js_new etc to help
 branch prediction; r=terrence

---
 js/public/Utility.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/public/Utility.h b/js/public/Utility.h
index d62e62e42ddc..fc7c42abb9e2 100644
--- a/js/public/Utility.h
+++ b/js/public/Utility.h
@@ -302,14 +302,14 @@ static inline char* js_strdup(const char* s)
  * Note: Do not add a ; at the end of a use of JS_DECLARE_NEW_METHODS,
  * or the build will break.
  */
-#define JS_DECLARE_NEW_METHODS(NEWNAME, ALLOCATOR, QUALIFIERS)\
+#define JS_DECLARE_NEW_METHODS(NEWNAME, ALLOCATOR, QUALIFIERS) \
     template <class T, typename... Args> \
     QUALIFIERS T * \
     NEWNAME(Args&&... args) MOZ_HEAP_ALLOCATOR { \
         void* memory = ALLOCATOR(sizeof(T)); \
-        return memory \
-               ? new(memory) T(mozilla::Forward<Args>(args)...) \
-               : nullptr; \
+        return MOZ_LIKELY(memory) \
+            ? new(memory) T(mozilla::Forward<Args>(args)...) \
+            : nullptr; \
     }
 
 /*

From 6d19d48472eade27f669c1646ce3ebb32f65ad83 Mon Sep 17 00:00:00 2001
From: Nick Fitzgerald <fitzgen@gmail.com>
Date: Fri, 18 Dec 2015 12:05:14 -0800
Subject: [PATCH 065/101] Bug 1231883 - Implement HeapSnapshot.describeNode;
 r=mrbkap

This commit implements the HeapSnapshot.describeNode method which allows chrome
JS code to request a description of a given node as specified by our existing
"breakdown" language. This description can be used to generate a human-readable
label for the node.
---
 devtools/shared/heapsnapshot/HeapSnapshot.cpp | 37 ++++++++++++++++
 devtools/shared/heapsnapshot/HeapSnapshot.h   |  3 ++
 .../unit/test_HeapSnapshot_describeNode_01.js | 42 +++++++++++++++++++
 .../heapsnapshot/tests/unit/xpcshell.ini      |  1 +
 dom/webidl/HeapSnapshot.webidl                | 11 +++++
 5 files changed, 94 insertions(+)
 create mode 100644 devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_describeNode_01.js

diff --git a/devtools/shared/heapsnapshot/HeapSnapshot.cpp b/devtools/shared/heapsnapshot/HeapSnapshot.cpp
index 9cae51a56ea9..b7167dcfe0d3 100644
--- a/devtools/shared/heapsnapshot/HeapSnapshot.cpp
+++ b/devtools/shared/heapsnapshot/HeapSnapshot.cpp
@@ -522,6 +522,43 @@ HeapSnapshot::TakeCensus(JSContext* cx, JS::HandleObject options,
   }
 }
 
+void
+HeapSnapshot::DescribeNode(JSContext* cx, JS::HandleObject breakdown, uint64_t nodeId,
+                           JS::MutableHandleValue rval, ErrorResult& rv) {
+  MOZ_ASSERT(breakdown);
+  JS::RootedValue breakdownVal(cx, JS::ObjectValue(*breakdown));
+  JS::ubi::CountTypePtr rootType = JS::ubi::ParseBreakdown(cx, breakdownVal);
+  if (NS_WARN_IF(!rootType)) {
+    rv.Throw(NS_ERROR_UNEXPECTED);
+    return;
+  }
+
+  JS::ubi::RootedCount rootCount(cx, rootType->makeCount());
+  if (NS_WARN_IF(!rootCount)) {
+    rv.Throw(NS_ERROR_OUT_OF_MEMORY);
+    return;
+  }
+
+  JS::ubi::Node::Id id(nodeId);
+  Maybe<JS::ubi::Node> node = getNodeById(id);
+  if (NS_WARN_IF(node.isNothing())) {
+    rv.Throw(NS_ERROR_INVALID_ARG);
+    return;
+  }
+
+  MallocSizeOf mallocSizeOf = GetCurrentThreadDebuggerMallocSizeOf();
+  if (NS_WARN_IF(!rootCount->count(mallocSizeOf, *node))) {
+    rv.Throw(NS_ERROR_OUT_OF_MEMORY);
+    return;
+  }
+
+  if (NS_WARN_IF(!rootCount->report(cx, rval))) {
+    rv.Throw(NS_ERROR_OUT_OF_MEMORY);
+    return;
+  }
+}
+
+
 already_AddRefed<DominatorTree>
 HeapSnapshot::ComputeDominatorTree(ErrorResult& rv)
 {
diff --git a/devtools/shared/heapsnapshot/HeapSnapshot.h b/devtools/shared/heapsnapshot/HeapSnapshot.h
index c8e4557c4790..efc80c25cc85 100644
--- a/devtools/shared/heapsnapshot/HeapSnapshot.h
+++ b/devtools/shared/heapsnapshot/HeapSnapshot.h
@@ -159,6 +159,9 @@ public:
   void TakeCensus(JSContext* cx, JS::HandleObject options,
                   JS::MutableHandleValue rval, ErrorResult& rv);
 
+  void DescribeNode(JSContext* cx, JS::HandleObject breakdown, uint64_t nodeId,
+                    JS::MutableHandleValue rval, ErrorResult& rv);
+
   already_AddRefed<DominatorTree> ComputeDominatorTree(ErrorResult& rv);
 
   dom::Nullable<uint64_t> GetCreationTime() {
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_describeNode_01.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_describeNode_01.js
new file mode 100644
index 000000000000..d79cb5a7b4e9
--- /dev/null
+++ b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_describeNode_01.js
@@ -0,0 +1,42 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Test that we can describe nodes with a breakdown.
+
+function run_test() {
+  const path = saveNewHeapSnapshot();
+  const snapshot = ChromeUtils.readHeapSnapshot(path);
+  ok(snapshot.describeNode);
+  equal(typeof snapshot.describeNode, "function");
+
+  const dt = snapshot.computeDominatorTree();
+
+  let threw = false;
+  try {
+    snapshot.describeNode(undefined, dt.root);
+  } catch (_) {
+    threw = true;
+  }
+  ok(threw, "Should require a breakdown");
+
+  const breakdown = {
+    by: "coarseType",
+    objects: { by: "objectClass" },
+    scripts: { by: "internalType" },
+    strings: { by: "internalType" },
+    other: { by: "internalType" }
+  };
+
+  threw = false;
+  try {
+    snapshot.describeNode(breakdown, 0);
+  } catch (_) {
+    threw = true;
+  }
+  ok(threw, "Should throw when given an invalid node id");
+
+  const description = snapshot.describeNode(breakdown, dt.root);
+  ok(description);
+  ok(description.other);
+  ok(description.other["JS::ubi::RootList"]);
+}
diff --git a/devtools/shared/heapsnapshot/tests/unit/xpcshell.ini b/devtools/shared/heapsnapshot/tests/unit/xpcshell.ini
index 3dff62c521a4..e45d5c55101b 100644
--- a/devtools/shared/heapsnapshot/tests/unit/xpcshell.ini
+++ b/devtools/shared/heapsnapshot/tests/unit/xpcshell.ini
@@ -51,6 +51,7 @@ support-files =
 [test_HeapAnalyses_takeCensus_07.js]
 [test_HeapSnapshot_creationTime_01.js]
 [test_HeapSnapshot_deepStack_01.js]
+[test_HeapSnapshot_describeNode_01.js]
 [test_HeapSnapshot_takeCensus_01.js]
 [test_HeapSnapshot_takeCensus_02.js]
 [test_HeapSnapshot_takeCensus_03.js]
diff --git a/dom/webidl/HeapSnapshot.webidl b/dom/webidl/HeapSnapshot.webidl
index a3ff1168304e..bec4503648b4 100644
--- a/dom/webidl/HeapSnapshot.webidl
+++ b/dom/webidl/HeapSnapshot.webidl
@@ -57,6 +57,17 @@ interface HeapSnapshot {
   [Throws]
   any takeCensus(object? options);
 
+  /**
+   * Describe `node` with the specified `breakdown`. See the comment above
+   * `takeCensus` or `js/src/doc/Debugger/Debugger.Memory.md` for detailed
+   * documentation on breakdowns.
+   *
+   * Throws an error when `node` is not the id of a node in the heap snapshot,
+   * or if the breakdown is invalid.
+   */
+  [Throws]
+  any describeNode(object breakdown, NodeId node);
+
   /**
    * Compute the dominator tree for this heap snapshot.
    *

From fe06b65df894d28c27e11a361a5b3c783de0a397 Mon Sep 17 00:00:00 2001
From: Nick Fitzgerald <fitzgen@gmail.com>
Date: Fri, 18 Dec 2015 12:05:14 -0800
Subject: [PATCH 066/101] Bug 1232390 - Use HeapSnapshot.describeNode to
 generate labels for nodes; r=jsantell

---
 .../shared/heapsnapshot/DominatorTreeNode.js  | 123 +++++++++++++++++-
 .../shared/heapsnapshot/HeapAnalysesClient.js |   4 +
 .../shared/heapsnapshot/HeapAnalysesWorker.js |  25 +++-
 .../tests/unit/head_heapsnapshot.js           |  29 +++++
 ...ominatorTreeNode_LabelAndShallowSize_01.js |  46 +++++++
 ...ominatorTreeNode_LabelAndShallowSize_02.js |  45 +++++++
 ...ominatorTreeNode_LabelAndShallowSize_03.js |  47 +++++++
 ...ominatorTreeNode_LabelAndShallowSize_04.js |  53 ++++++++
 .../test_HeapAnalyses_getDominatorTree_01.js  |  13 +-
 .../test_HeapAnalyses_getDominatorTree_02.js  |  10 +-
 ...HeapAnalyses_getImmediatelyDominated_01.js |  15 ++-
 .../heapsnapshot/tests/unit/xpcshell.ini      |   4 +
 12 files changed, 404 insertions(+), 10 deletions(-)
 create mode 100644 devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_01.js
 create mode 100644 devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_02.js
 create mode 100644 devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_03.js
 create mode 100644 devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_04.js

diff --git a/devtools/shared/heapsnapshot/DominatorTreeNode.js b/devtools/shared/heapsnapshot/DominatorTreeNode.js
index 5b13f7870a45..e8d11ab5de3c 100644
--- a/devtools/shared/heapsnapshot/DominatorTreeNode.js
+++ b/devtools/shared/heapsnapshot/DominatorTreeNode.js
@@ -3,7 +3,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const DEFAULT_MAX_DEPTH = 3;
+const { Visitor, walk } = require("resource://devtools/shared/heapsnapshot/CensusUtils.js");
+
+const DEFAULT_MAX_DEPTH = 4;
 const DEFAULT_MAX_SIBLINGS = 15;
 
 /**
@@ -12,10 +14,16 @@ const DEFAULT_MAX_SIBLINGS = 15;
  * @param {NodeId} nodeId
  * @param {NodeSize} retainedSize
  */
-function DominatorTreeNode(nodeId, retainedSize) {
+function DominatorTreeNode(nodeId, label, shallowSize, retainedSize) {
   // The id of this node.
   this.nodeId = nodeId;
 
+  // The label structure generated by describing the given node.
+  this.label = label;
+
+  // The shallow size of this node.
+  this.shallowSize = shallowSize;
+
   // The retained size of this node.
   this.retainedSize = retainedSize;
 
@@ -59,6 +67,109 @@ DominatorTreeNode.addChild = function (parent, child) {
   child.parentId = parent.nodeId;
 };
 
+/**
+ * A Visitor that is used to generate a label for a node in the heap snapshot
+ * and get its shallow size as well while we are at it.
+ */
+function LabelAndShallowSizeVisitor() {
+  // As we walk the description, we accumulate edges in this array.
+  this._labelPieces = [];
+
+  // Once we reach the non-zero count leaf node in the description, we move the
+  // labelPieces here to signify that we no longer need to accumulate edges.
+  this._label = undefined;
+
+  // Once we reach the non-zero count leaf node in the description, we grab the
+  // shallow size and place it here.
+  this._shallowSize = 0;
+}
+
+DominatorTreeNode.LabelAndShallowSizeVisitor = LabelAndShallowSizeVisitor;
+
+LabelAndShallowSizeVisitor.prototype = Object.create(Visitor);
+
+/**
+ * @overrides Visitor.prototype.enter
+ */
+LabelAndShallowSizeVisitor.prototype.enter = function (breakdown, report, edge) {
+  if (this._labelPieces && edge) {
+    this._labelPieces.push(edge);
+  }
+};
+
+/**
+ * @overrides Visitor.prototype.exit
+ */
+LabelAndShallowSizeVisitor.prototype.exit = function (breakdown, report, edge) {
+  if (this._labelPieces && edge) {
+    this._labelPieces.pop();
+  }
+};
+
+/**
+ * @overrides Visitor.prototype.count
+ */
+LabelAndShallowSizeVisitor.prototype.count = function (breakdown, report, edge) {
+  if (report.count === 0) {
+    return;
+  }
+
+  this._label = this._labelPieces;
+  this._labelPieces = undefined;
+
+  this._shallowSize = report.bytes;
+};
+
+/**
+ * Get the generated label structure accumulated by this visitor.
+ *
+ * @returns {Object}
+ */
+LabelAndShallowSizeVisitor.prototype.label = function () {
+  return this._label;
+};
+
+/**
+ * Get the shallow size of the node this visitor visited.
+ *
+ * @returns {Number}
+ */
+LabelAndShallowSizeVisitor.prototype.shallowSize = function () {
+  return this._shallowSize;
+};
+
+/**
+ * Generate a label structure for the node with the given id and grab its
+ * shallow size.
+ *
+ * What is a "label" structure? HeapSnapshot.describeNode essentially takes a
+ * census of a single node rather than the whole heap graph. The resulting
+ * report has only one count leaf that is non-zero. The label structure is the
+ * path in this report from the root to the non-zero count leaf.
+ *
+ * @param {Number} nodeId
+ * @param {HeapSnapshot} snapshot
+ * @param {Object} breakdown
+ *
+ * @returns {Object}
+ *          An object with the following properties:
+ *          - {Number} shallowSize
+ *          - {Object} label
+ */
+DominatorTreeNode.getLabelAndShallowSize = function (nodeId,
+                                                     snapshot,
+                                                     breakdown) {
+  const description = snapshot.describeNode(breakdown, nodeId);
+
+  const visitor = new LabelAndShallowSizeVisitor();
+  walk(breakdown, description, visitor);
+
+  return {
+    label: visitor.label(),
+    shallowSize: visitor.shallowSize(),
+  };
+};
+
 /**
  * Do a partial traversal of the given dominator tree and convert it into a tree
  * of `DominatorTreeNode`s. Dominator trees have a node for every node in the
@@ -75,11 +186,15 @@ DominatorTreeNode.addChild = function (parent, child) {
  * @returns {DominatorTreeNode}
  */
 DominatorTreeNode.partialTraversal = function (dominatorTree,
+                                               snapshot,
+                                               breakdown,
                                                maxDepth = DEFAULT_MAX_DEPTH,
                                                maxSiblings = DEFAULT_MAX_SIBLINGS) {
   function dfs(nodeId, depth) {
-    const size = dominatorTree.getRetainedSize(nodeId);
-    const node = new DominatorTreeNode(nodeId, size);
+    const { label, shallowSize } =
+      DominatorTreeNode.getLabelAndShallowSize(nodeId, snapshot, breakdown);
+    const retainedSize = dominatorTree.getRetainedSize(nodeId);
+    const node = new DominatorTreeNode(nodeId, label, shallowSize, retainedSize);
     const childNodeIds = dominatorTree.getImmediatelyDominated(nodeId);
 
     const newDepth = depth + 1;
diff --git a/devtools/shared/heapsnapshot/HeapAnalysesClient.js b/devtools/shared/heapsnapshot/HeapAnalysesClient.js
index d7e19acb4af5..c43cdc788675 100644
--- a/devtools/shared/heapsnapshot/HeapAnalysesClient.js
+++ b/devtools/shared/heapsnapshot/HeapAnalysesClient.js
@@ -173,6 +173,8 @@ HeapAnalysesClient.prototype.computeDominatorTree = function (snapshotFilePath)
  *        An object specifying options for this request.
  *        - {DominatorTreeId} dominatorTreeId
  *          The id of the dominator tree.
+ *        - {Object} breakdown
+ *          The breakdown used to generate node labels.
  *        - {Number} maxDepth
  *          The maximum depth to traverse down the tree to create this initial
  *          view.
@@ -195,6 +197,8 @@ HeapAnalysesClient.prototype.getDominatorTree = function (opts) {
  *          The id of the dominator tree.
  *        - {NodeId} nodeId
  *          The id of the node whose children are being found.
+ *        - {Object} breakdown
+ *          The breakdown used to generate node labels.
  *        - {Number} startIndex
  *          The starting index within the full set of immediately dominated
  *          children of the children being requested. Children are always sorted
diff --git a/devtools/shared/heapsnapshot/HeapAnalysesWorker.js b/devtools/shared/heapsnapshot/HeapAnalysesWorker.js
index 7b6a80056be0..10ccba33d7ee 100644
--- a/devtools/shared/heapsnapshot/HeapAnalysesWorker.js
+++ b/devtools/shared/heapsnapshot/HeapAnalysesWorker.js
@@ -103,6 +103,13 @@ workerHelper.createTask(self, "getCreationTime", snapshotFilePath => {
  */
 const dominatorTrees = [];
 
+/**
+ * The i^th HeapSnapshot in this array is the snapshot used to generate the i^th
+ * dominator tree in `dominatorTrees` above. This lets us map from a dominator
+ * tree id to the snapshot it came from.
+ */
+const dominatorTreeSnapshots = [];
+
 /**
  * @see HeapAnalysesClient.prototype.computeDominatorTree
  */
@@ -114,6 +121,7 @@ workerHelper.createTask(self, "computeDominatorTree", snapshotFilePath => {
 
   const id = dominatorTrees.length;
   dominatorTrees.push(snapshot.computeDominatorTree());
+  dominatorTreeSnapshots.push(snapshot);
   return id;
 });
 
@@ -123,6 +131,7 @@ workerHelper.createTask(self, "computeDominatorTree", snapshotFilePath => {
 workerHelper.createTask(self, "getDominatorTree", request => {
   const {
     dominatorTreeId,
+    breakdown,
     maxDepth,
     maxSiblings
   } = request;
@@ -132,7 +141,12 @@ workerHelper.createTask(self, "getDominatorTree", request => {
       `There does not exist a DominatorTree with the id ${dominatorTreeId}`);
   }
 
-  return DominatorTreeNode.partialTraversal(dominatorTrees[dominatorTreeId],
+  const dominatorTree = dominatorTrees[dominatorTreeId];
+  const snapshot = dominatorTreeSnapshots[dominatorTreeId];
+
+  return DominatorTreeNode.partialTraversal(dominatorTree,
+                                            snapshot,
+                                            breakdown,
                                             maxDepth,
                                             maxSiblings);
 });
@@ -144,6 +158,7 @@ workerHelper.createTask(self, "getImmediatelyDominated", request => {
   const {
     dominatorTreeId,
     nodeId,
+    breakdown,
     startIndex,
     maxCount
   } = request;
@@ -154,6 +169,8 @@ workerHelper.createTask(self, "getImmediatelyDominated", request => {
   }
 
   const dominatorTree = dominatorTrees[dominatorTreeId];
+  const snapshot = dominatorTreeSnapshots[dominatorTreeId];
+
   const childIds = dominatorTree.getImmediatelyDominated(nodeId);
   if (!childIds) {
     throw new Error(`${nodeId} is not a node id in the dominator tree`);
@@ -166,8 +183,10 @@ workerHelper.createTask(self, "getImmediatelyDominated", request => {
   const nodes = childIds
     .slice(start, end)
     .map(id => {
-      const size = dominatorTree.getRetainedSize(id);
-      const node = new DominatorTreeNode(id, size);
+      const { label, shallowSize } =
+        DominatorTreeNode.getLabelAndShallowSize(id, snapshot, breakdown);
+      const retainedSize = dominatorTree.getRetainedSize(id);
+      const node = new DominatorTreeNode(id, label, shallowSize, retainedSize);
       node.parentId = nodeId;
       // DominatorTree.getImmediatelyDominated will always return non-null here
       // because we got the id directly from the dominator tree.
diff --git a/devtools/shared/heapsnapshot/tests/unit/head_heapsnapshot.js b/devtools/shared/heapsnapshot/tests/unit/head_heapsnapshot.js
index cd980ed546a1..ac9ab12da034 100644
--- a/devtools/shared/heapsnapshot/tests/unit/head_heapsnapshot.js
+++ b/devtools/shared/heapsnapshot/tests/unit/head_heapsnapshot.js
@@ -22,6 +22,9 @@ const HeapAnalysesClient =
 const Services = require("Services");
 const { censusReportToCensusTreeNode } = require("devtools/shared/heapsnapshot/census-tree-node");
 const CensusUtils = require("devtools/shared/heapsnapshot/CensusUtils");
+const DominatorTreeNode = require("devtools/shared/heapsnapshot/DominatorTreeNode");
+const { LabelAndShallowSizeVisitor } = DominatorTreeNode;
+
 
 // Always log packets when running tests. runxpcshelltests.py will throw
 // the output away anyway, unless you give it the --verbose flag.
@@ -296,3 +299,29 @@ function assertDiff(breakdown, first, second, expected) {
 
   assertStructurallyEquivalent(actual, expected);
 }
+
+/**
+ * Assert that creating a label and getting a shallow size from the given node
+ * description with the specified breakdown is as expected.
+ *
+ * @param {Object} breakdown
+ * @param {Object} givenDescription
+ * @param {Number} expectedShallowSize
+ * @param {Object} expectedLabel
+ */
+function assertLabelAndShallowSize(breakdown, givenDescription, expectedShallowSize, expectedLabel) {
+  dumpn("Computing label and shallow size from node description:");
+  dumpn("Breakdown: " + JSON.stringify(breakdown, null, 4));
+  dumpn("Given description: " + JSON.stringify(givenDescription, null, 4));
+
+  const visitor = new LabelAndShallowSizeVisitor();
+  CensusUtils.walk(breakdown, description, visitor);
+
+  dumpn("Expected shallow size: " + expectedShallowSize);
+  dumpn("Actual shallow size: " + visitor.shallowSize());
+  equal(visitor.shallowSize(), expectedShallowSize, "Shallow size should be correct");
+
+  dumpn("Expected label: " + JSON.stringify(expectedLabel, null, 4));
+  dumpn("Actual label: " + JSON.stringify(visitor.label(), null, 4));
+  assertStructurallyEquivalent(visitor.label(), expectedLabel);
+}
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_01.js b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_01.js
new file mode 100644
index 000000000000..845a0d263bb6
--- /dev/null
+++ b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_01.js
@@ -0,0 +1,46 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Test that we can generate label structures from node description reports.
+
+const breakdown = {
+  by: "coarseType",
+  objects: {
+    by: "objectClass",
+    then: { by: "count", count: true, bytes: true },
+    other: { by: "count", count: true, bytes: true },
+  },
+  strings: {
+    by: "internalType",
+    then: { by: "count", count: true, bytes: true },
+  },
+  scripts: {
+    by: "internalType",
+    then: { by: "count", count: true, bytes: true },
+  },
+  other: {
+    by: "internalType",
+    then: { by: "count", count: true, bytes: true },
+  },
+};
+
+const description = {
+  objects: {
+    Function: { count: 1, bytes: 32 },
+    other: { count: 0, bytes: 0 }
+  },
+  strings: {},
+  scripts: {},
+  other: {}
+};
+
+const expected = [
+  "objects",
+  "Function"
+];
+
+const shallowSize = 32;
+
+function run_test() {
+  assertLabelAndShallowSize(breakdown, description, shallowSize, expected);
+}
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_02.js b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_02.js
new file mode 100644
index 000000000000..e1f32de58b3e
--- /dev/null
+++ b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_02.js
@@ -0,0 +1,45 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Test that we can generate label structures from node description reports.
+
+const breakdown = {
+  by: "coarseType",
+  objects: {
+    by: "objectClass",
+    then: { by: "count", count: true, bytes: true },
+    other: { by: "count", count: true, bytes: true },
+  },
+  strings: {
+    by: "internalType",
+    then: { by: "count", count: true, bytes: true },
+  },
+  scripts: {
+    by: "internalType",
+    then: { by: "count", count: true, bytes: true },
+  },
+  other: {
+    by: "internalType",
+    then: { by: "count", count: true, bytes: true },
+  },
+};
+
+const description = {
+  objects: {
+    other: { count: 1, bytes: 10 }
+  },
+  strings: {},
+  scripts: {},
+  other: {}
+};
+
+const expected = [
+  "objects",
+  "other"
+];
+
+const shallowSize = 10;
+
+function run_test() {
+  assertLabelAndShallowSize(breakdown, description, shallowSize, expected);
+}
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_03.js b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_03.js
new file mode 100644
index 000000000000..ad35dcec1700
--- /dev/null
+++ b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_03.js
@@ -0,0 +1,47 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Test that we can generate label structures from node description reports.
+
+const breakdown = {
+  by: "coarseType",
+  objects: {
+    by: "objectClass",
+    then: { by: "count", count: true, bytes: true },
+    other: { by: "count", count: true, bytes: true },
+  },
+  strings: {
+    by: "internalType",
+    then: { by: "count", count: true, bytes: true },
+  },
+  scripts: {
+    by: "internalType",
+    then: { by: "count", count: true, bytes: true },
+  },
+  other: {
+    by: "internalType",
+    then: { by: "count", count: true, bytes: true },
+  },
+};
+
+const description = {
+  objects: {
+    other: { count: 0, bytes: 0 }
+  },
+  strings: {
+    "JSString": { count: 1, bytes: 42 },
+  },
+  scripts: {},
+  other: {}
+};
+
+const expected = [
+  "strings",
+  "JSString"
+];
+
+const shallowSize = 42;
+
+function run_test() {
+  assertLabelAndShallowSize(breakdown, description, shallowSize, expected);
+}
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_04.js b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_04.js
new file mode 100644
index 000000000000..566ad0dab136
--- /dev/null
+++ b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_04.js
@@ -0,0 +1,53 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Test that we can generate label structures from node description reports.
+
+const breakdown = {
+  by: "coarseType",
+  objects: {
+    by: "objectClass",
+    then: {
+      by: "allocationStack",
+      then: { by: "count", count: true, bytes: true },
+      noStack: { by: "count", count: true, bytes: true },
+    },
+    other: { by: "count", count: true, bytes: true },
+  },
+  strings: {
+    by: "internalType",
+    then: { by: "count", count: true, bytes: true },
+  },
+  scripts: {
+    by: "internalType",
+    then: { by: "count", count: true, bytes: true },
+  },
+  other: {
+    by: "internalType",
+    then: { by: "count", count: true, bytes: true },
+  },
+};
+
+const stack = saveStack();
+
+const description = {
+  objects: {
+    Array: new Map([[stack, { count: 1, bytes: 512 }]]),
+    other: { count: 0, bytes: 0 }
+  },
+  strings: {},
+  scripts: {},
+  other: {}
+};
+
+const expected = [
+  "objects",
+  "Array",
+  stack
+];
+
+const shallowSize = 512;
+
+function run_test() {
+  assertLabelAndShallowSize(breakdown, description, shallowSize, expected);
+}
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getDominatorTree_01.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getDominatorTree_01.js
index 5db94c540b89..b41ef9a278b4 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getDominatorTree_01.js
+++ b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getDominatorTree_01.js
@@ -7,6 +7,14 @@ function run_test() {
   run_next_test();
 }
 
+const breakdown = {
+  by: "coarseType",
+  objects: { by: "count", count: true, bytes: true },
+  scripts: { by: "count", count: true, bytes: true },
+  strings: { by: "count", count: true, bytes: true },
+  other: { by: "count", count: true, bytes: true },
+};
+
 add_task(function* () {
   const client = new HeapAnalysesClient();
 
@@ -18,7 +26,10 @@ add_task(function* () {
   equal(typeof dominatorTreeId, "number",
         "should get a dominator tree id, and it should be a number");
 
-  const partialTree = yield client.getDominatorTree({ dominatorTreeId });
+  const partialTree = yield client.getDominatorTree({
+    dominatorTreeId,
+    breakdown
+  });
   ok(partialTree, "Should get a partial tree");
   equal(typeof partialTree, "object",
         "partialTree should be an object");
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getDominatorTree_02.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getDominatorTree_02.js
index aa7cb0af6b97..fd29beecee85 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getDominatorTree_02.js
+++ b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getDominatorTree_02.js
@@ -8,12 +8,20 @@ function run_test() {
   run_next_test();
 }
 
+const breakdown = {
+  by: "coarseType",
+  objects: { by: "count", count: true, bytes: true },
+  scripts: { by: "count", count: true, bytes: true },
+  strings: { by: "count", count: true, bytes: true },
+  other: { by: "count", count: true, bytes: true },
+};
+
 add_task(function* () {
   const client = new HeapAnalysesClient();
 
   let threw = false;
   try {
-    yield client.getDominatorTree({ dominatorTreeId: 42 });
+    yield client.getDominatorTree({ dominatorTreeId: 42, breakdown });
   } catch (_) {
     threw = true;
   }
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getImmediatelyDominated_01.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getImmediatelyDominated_01.js
index ae9f15b39adf..826beae6448a 100644
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getImmediatelyDominated_01.js
+++ b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getImmediatelyDominated_01.js
@@ -7,6 +7,14 @@ function run_test() {
   run_next_test();
 }
 
+const breakdown = {
+  by: "coarseType",
+  objects: { by: "count", count: true, bytes: true },
+  scripts: { by: "count", count: true, bytes: true },
+  strings: { by: "count", count: true, bytes: true },
+  other: { by: "count", count: true, bytes: true },
+};
+
 add_task(function* () {
   const client = new HeapAnalysesClient();
 
@@ -14,13 +22,17 @@ add_task(function* () {
   yield client.readHeapSnapshot(snapshotFilePath);
   const dominatorTreeId = yield client.computeDominatorTree(snapshotFilePath);
 
-  const partialTree = yield client.getDominatorTree({ dominatorTreeId });
+  const partialTree = yield client.getDominatorTree({
+    dominatorTreeId,
+    breakdown
+  });
   ok(partialTree.children.length > 0,
      "root should immediately dominate some nodes");
 
   // First, test getting a subset of children available.
   const response = yield client.getImmediatelyDominated({
     dominatorTreeId,
+    breakdown,
     nodeId: partialTree.nodeId,
     startIndex: 0,
     maxCount: partialTree.children.length - 1
@@ -33,6 +45,7 @@ add_task(function* () {
   // Next, test getting a subset of children available.
   const secondResponse = yield client.getImmediatelyDominated({
     dominatorTreeId,
+    breakdown,
     nodeId: partialTree.nodeId,
     startIndex: 0,
     maxCount: Infinity
diff --git a/devtools/shared/heapsnapshot/tests/unit/xpcshell.ini b/devtools/shared/heapsnapshot/tests/unit/xpcshell.ini
index e45d5c55101b..2c6d1004e0fa 100644
--- a/devtools/shared/heapsnapshot/tests/unit/xpcshell.ini
+++ b/devtools/shared/heapsnapshot/tests/unit/xpcshell.ini
@@ -33,6 +33,10 @@ support-files =
 [test_DominatorTree_03.js]
 [test_DominatorTree_04.js]
 [test_DominatorTree_05.js]
+[test_DominatorTreeNode_LabelAndShallowSize_01.js]
+[test_DominatorTreeNode_LabelAndShallowSize_02.js]
+[test_DominatorTreeNode_LabelAndShallowSize_03.js]
+[test_DominatorTreeNode_LabelAndShallowSize_04.js]
 [test_HeapAnalyses_computeDominatorTree_01.js]
 [test_HeapAnalyses_computeDominatorTree_02.js]
 [test_HeapAnalyses_getCreationTime_01.js]

From aacaab5baa2acff86e4691c49a46b89e96a37b3a Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Fri, 18 Dec 2015 12:43:42 -0800
Subject: [PATCH 067/101] Backed out changeset cdc2bfed4faa (bug 1218881) for
 static build bustage CLOSED TREE

---
 dom/canvas/WebGL2ContextQueries.cpp |  8 --------
 dom/canvas/WebGLQuery.cpp           |  1 -
 dom/canvas/WebGLQuery.h             | 16 ----------------
 gfx/thebes/gfxPrefs.h               |  1 -
 4 files changed, 26 deletions(-)

diff --git a/dom/canvas/WebGL2ContextQueries.cpp b/dom/canvas/WebGL2ContextQueries.cpp
index 1fec22d70e3d..b3ffe264e6e6 100644
--- a/dom/canvas/WebGL2ContextQueries.cpp
+++ b/dom/canvas/WebGL2ContextQueries.cpp
@@ -6,8 +6,6 @@
 #include "WebGL2Context.h"
 #include "GLContext.h"
 #include "WebGLQuery.h"
-#include "gfxPrefs.h"
-#include "nsThreadUtils.h"
 
 namespace mozilla {
 
@@ -257,7 +255,6 @@ WebGL2Context::EndQuery(GLenum target)
     }
 
     UpdateBoundQuery(target, nullptr);
-    NS_DispatchToCurrentThread(new WebGLQuery::AvailableRunnable(activeQuery));
 }
 
 already_AddRefed<WebGLQuery>
@@ -328,11 +325,6 @@ WebGL2Context::GetQueryParameter(JSContext*, WebGLQuery* query, GLenum pname,
         return;
     }
 
-    // We must wait for an event loop before the query can be available
-    if (!query->mCanBeAvailable && !gfxPrefs::WebGLImmediateQueries()) {
-        return;
-    }
-
     MakeContextCurrent();
     GLuint returned = 0;
     switch (pname) {
diff --git a/dom/canvas/WebGLQuery.cpp b/dom/canvas/WebGLQuery.cpp
index e557b8b4505c..016aa198d194 100644
--- a/dom/canvas/WebGLQuery.cpp
+++ b/dom/canvas/WebGLQuery.cpp
@@ -20,7 +20,6 @@ WebGLQuery::WrapObject(JSContext* cx, JS::Handle<JSObject*> givenProto)
 
 WebGLQuery::WebGLQuery(WebGLContext* webgl)
     : WebGLContextBoundObject(webgl)
-    , mCanBeAvailable(false)
     , mGLName(0)
     , mType(0)
 {
diff --git a/dom/canvas/WebGLQuery.h b/dom/canvas/WebGLQuery.h
index 7f02fb35d7e2..5886a75ed8a5 100644
--- a/dom/canvas/WebGLQuery.h
+++ b/dom/canvas/WebGLQuery.h
@@ -10,7 +10,6 @@
 #include "nsWrapperCache.h"
 
 #include "WebGLObjectModel.h"
-#include "nsThreadUtils.h"
 
 namespace mozilla {
 
@@ -23,19 +22,6 @@ class WebGLQuery final
 public:
     explicit WebGLQuery(WebGLContext* webgl);
 
-    class AvailableRunnable final : public nsRunnable
-    {
-    public:
-        AvailableRunnable(WebGLQuery* query) : mQuery(query) { }
-
-        NS_IMETHOD Run() override {
-            mQuery->mCanBeAvailable = true;
-            return NS_OK;
-        }
-    private:
-        const RefPtr<WebGLQuery> mQuery;
-    };
-
     bool IsActive() const;
 
     bool HasEverBeenActive() const {
@@ -56,8 +42,6 @@ public:
     NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(WebGLQuery)
     NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(WebGLQuery)
 
-    // Track whether the event loop has spun
-    bool mCanBeAvailable;
 
 private:
     ~WebGLQuery() {
diff --git a/gfx/thebes/gfxPrefs.h b/gfx/thebes/gfxPrefs.h
index bde9f242fae0..7bb41fdc8eb9 100644
--- a/gfx/thebes/gfxPrefs.h
+++ b/gfx/thebes/gfxPrefs.h
@@ -437,7 +437,6 @@ private:
   DECL_GFX_PREF(Live, "webgl.msaa-force",                      WebGLForceMSAA, bool, false);
   DECL_GFX_PREF(Live, "webgl.prefer-16bpp",                    WebGLPrefer16bpp, bool, false);
   DECL_GFX_PREF(Live, "webgl.restore-context-when-visible",    WebGLRestoreWhenVisible, bool, true);
-  DECL_GFX_PREF(Live, "webgl.allow-immediate-queries",         WebGLImmediateQueries, bool, false);
 
   DECL_GFX_PREF(Live, "webgl.webgl2-compat-mode",              WebGL2CompatMode, bool, false);
 

From 8456140b378f1794790e436359e9794689d69eac Mon Sep 17 00:00:00 2001
From: Shu-yu Guo <shu@rfrn.org>
Date: Fri, 18 Dec 2015 13:18:19 -0800
Subject: [PATCH 068/101] Bug 1071646 - Light refactoring of lexical binding
 helpers in Parser. (r=jorendorff)

---
 js/src/frontend/Parser.cpp | 50 +++++++++++++++++++++++++++-----------
 js/src/frontend/Parser.h   |  4 +++
 2 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp
index e1db8d057143..425d45bb5240 100644
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -3831,23 +3831,27 @@ Parser<ParseHandler>::noteNameUse(HandlePropertyName name, Node pn)
 
 template <>
 bool
-Parser<FullParseHandler>::bindUninitialized(BindData<FullParseHandler>* data, ParseNode* pn)
+Parser<FullParseHandler>::bindUninitialized(BindData<FullParseHandler>* data, HandlePropertyName name,
+                                            ParseNode* pn)
 {
-    MOZ_ASSERT(pn->isKind(PNK_NAME));
-
-    RootedPropertyName name(context, pn->pn_atom->asPropertyName());
-
     data->setNameNode(pn);
-    if (!data->bind(name, this))
-        return false;
-    return true;
+    return data->bind(name, this);
 }
 
 template <>
 bool
-Parser<FullParseHandler>::bindInitialized(BindData<FullParseHandler>* data, ParseNode* pn)
+Parser<FullParseHandler>::bindUninitialized(BindData<FullParseHandler>* data, ParseNode* pn)
 {
-    if (!bindUninitialized(data, pn))
+    RootedPropertyName name(context, pn->name());
+    return bindUninitialized(data, name, pn);
+}
+
+template <>
+bool
+Parser<FullParseHandler>::bindInitialized(BindData<FullParseHandler>* data, HandlePropertyName name,
+                                          ParseNode* pn)
+{
+    if (!bindUninitialized(data, name, pn))
         return false;
 
     /*
@@ -3868,6 +3872,14 @@ Parser<FullParseHandler>::bindInitialized(BindData<FullParseHandler>* data, Pars
     return true;
 }
 
+template <>
+bool
+Parser<FullParseHandler>::bindInitialized(BindData<FullParseHandler>* data, ParseNode* pn)
+{
+    RootedPropertyName name(context, pn->name());
+    return bindInitialized(data, name, pn);
+}
+
 template <>
 bool
 Parser<FullParseHandler>::checkDestructuringName(BindData<FullParseHandler>* data, ParseNode* expr)
@@ -4526,21 +4538,31 @@ CurrentLexicalStaticBlock(ParseContext<FullParseHandler>* pc)
 }
 
 template <>
-ParseNode*
-Parser<FullParseHandler>::makeInitializedLexicalBinding(HandlePropertyName name, bool isConst,
-                                                        const TokenPos& pos)
+bool
+Parser<FullParseHandler>::prepareAndBindInitializedLexicalWithNode(HandlePropertyName name,
+                                                                   bool isConst,
+                                                                   ParseNode* pn,
+                                                                   const TokenPos& pos)
 {
     BindData<FullParseHandler> data(context);
     if (!checkAndPrepareLexical(isConst, pos))
         return null();
     data.initLexical(HoistVars, isConst ? JSOP_DEFCONST : JSOP_DEFLET,
                      CurrentLexicalStaticBlock(pc), JSMSG_TOO_MANY_LOCALS);
+    return bindInitialized(&data, name, pn);
+}
+
+template <>
+ParseNode*
+Parser<FullParseHandler>::makeInitializedLexicalBinding(HandlePropertyName name, bool isConst,
+                                                        const TokenPos& pos)
+{
     ParseNode* dn = newBindingNode(name, false);
     if (!dn)
         return null();
     handler.setPosition(dn, pos);
 
-    if (!bindInitialized(&data, dn))
+    if (!prepareAndBindInitializedLexicalWithNode(name, isConst, dn, pos))
         return null();
 
     return dn;
diff --git a/js/src/frontend/Parser.h b/js/src/frontend/Parser.h
index b2036b59c322..ded624933f16 100644
--- a/js/src/frontend/Parser.h
+++ b/js/src/frontend/Parser.h
@@ -846,6 +846,8 @@ class Parser : private JS::AutoGCRooter, public StrictModeGetter
     Node objectLiteral(YieldHandling yieldHandling);
 
     bool checkAndPrepareLexical(bool isConst, const TokenPos& errorPos);
+    bool prepareAndBindInitializedLexicalWithNode(HandlePropertyName name, bool isConst,
+                                                  ParseNode* pn, const TokenPos& pos);
     Node makeInitializedLexicalBinding(HandlePropertyName name, bool isConst, const TokenPos& pos);
 
     Node newBindingNode(PropertyName* name, bool functionScope, VarContext varContext = HoistVars);
@@ -861,7 +863,9 @@ class Parser : private JS::AutoGCRooter, public StrictModeGetter
     bool checkDestructuringObject(BindData<ParseHandler>* data, Node objectPattern);
     bool checkDestructuringName(BindData<ParseHandler>* data, Node expr);
 
+    bool bindInitialized(BindData<ParseHandler>* data, HandlePropertyName name, Node pn);
     bool bindInitialized(BindData<ParseHandler>* data, Node pn);
+    bool bindUninitialized(BindData<ParseHandler>* data, HandlePropertyName name, Node pn);
     bool bindUninitialized(BindData<ParseHandler>* data, Node pn);
     bool makeSetCall(Node node, unsigned errnum);
     Node cloneDestructuringDefault(Node opn);

From 00a88f7e6eccbf5b7c2d090e264b43238ca6213e Mon Sep 17 00:00:00 2001
From: Shu-yu Guo <shu@rfrn.org>
Date: Fri, 18 Dec 2015 13:18:19 -0800
Subject: [PATCH 069/101] Bug 1071646 - Make functions block-scoped in JS and
 implement Annex B semantics for compatibility. (r=jorendorff)

---
 js/src/builtin/ReflectParse.cpp               |   6 +
 js/src/frontend/BytecodeEmitter.cpp           |  88 +++-
 js/src/frontend/BytecodeEmitter.h             |   2 +
 js/src/frontend/FoldConstants.cpp             |   8 +
 js/src/frontend/FullParseHandler.h            |  25 +-
 js/src/frontend/NameFunctions.cpp             |   6 +
 js/src/frontend/ParseNode.cpp                 |   3 +-
 js/src/frontend/ParseNode.h                   |   9 +-
 js/src/frontend/Parser.cpp                    | 441 +++++++++++-------
 js/src/frontend/Parser.h                      |  13 +-
 js/src/frontend/SyntaxParseHandler.h          |   3 +-
 .../jit-test/tests/auto-regress/bug771027.js  |   2 +-
 js/src/jit-test/tests/baseline/bug1081850.js  |  18 -
 .../jit-test/tests/basic/bug667504-syntax.js  |   3 +-
 js/src/jit-test/tests/ion/bug1148973-1.js     |   6 +-
 .../extensions/function-definition-with.js    |   9 +-
 .../extensions/strict-function-statements.js  |  30 +-
 ...claration-and-nested-function-statement.js |  12 +-
 js/src/tests/js1_5/Regress/regress-326453.js  |  21 -
 .../tests/js1_5/extensions/regress-245795.js  |  33 +-
 .../tests/js1_5/extensions/regress-406572.js  |   8 +-
 .../js1_8_5/reflect-parse/declarations.js     |  10 +-
 22 files changed, 461 insertions(+), 295 deletions(-)
 delete mode 100644 js/src/jit-test/tests/baseline/bug1081850.js
 delete mode 100644 js/src/tests/js1_5/Regress/regress-326453.js

diff --git a/js/src/builtin/ReflectParse.cpp b/js/src/builtin/ReflectParse.cpp
index abe869be44fa..53edb08d7f05 100644
--- a/js/src/builtin/ReflectParse.cpp
+++ b/js/src/builtin/ReflectParse.cpp
@@ -2040,6 +2040,9 @@ ASTSerializer::declaration(ParseNode* pn, MutableHandleValue dst)
       case PNK_FUNCTION:
         return function(pn, AST_FUNC_DECL, dst);
 
+      case PNK_ANNEXB_FUNCTION:
+        return function(pn->pn_left, AST_FUNC_DECL, dst);
+
       case PNK_VAR:
         return variableDeclaration(pn, false, dst);
 
@@ -2411,6 +2414,9 @@ ASTSerializer::statement(ParseNode* pn, MutableHandleValue dst)
       case PNK_VAR:
         return declaration(pn, dst);
 
+      case PNK_ANNEXB_FUNCTION:
+        return declaration(pn->pn_left, dst);
+
       case PNK_LETBLOCK:
         return letBlock(pn, dst);
 
diff --git a/js/src/frontend/BytecodeEmitter.cpp b/js/src/frontend/BytecodeEmitter.cpp
index bb15f826df97..18b11c0dfcc7 100644
--- a/js/src/frontend/BytecodeEmitter.cpp
+++ b/js/src/frontend/BytecodeEmitter.cpp
@@ -2344,6 +2344,10 @@ BytecodeEmitter::checkSideEffects(ParseNode* pn, bool* answer)
         MOZ_ASSERT(pn->pn_count == 1);
         return checkSideEffects(pn->pn_head, answer);
 
+      case PNK_ANNEXB_FUNCTION:
+        MOZ_ASSERT(pn->isArity(PN_BINARY));
+        return checkSideEffects(pn->pn_left, answer);
+
       case PNK_ARGSBODY:
         *answer = true;
         return true;
@@ -5326,6 +5330,23 @@ BytecodeEmitter::emitLetBlock(ParseNode* pnLet)
     return true;
 }
 
+bool
+BytecodeEmitter::emitHoistedFunctionsInList(ParseNode* list)
+{
+    MOZ_ASSERT(list->pn_xflags & PNX_FUNCDEFS);
+
+    for (ParseNode* pn = list->pn_head; pn; pn = pn->pn_next) {
+        if (pn->isKind(PNK_ANNEXB_FUNCTION) ||
+            (pn->isKind(PNK_FUNCTION) && pn->functionIsHoisted()))
+        {
+            if (!emitTree(pn))
+                return false;
+        }
+    }
+
+    return true;
+}
+
 // Using MOZ_NEVER_INLINE in here is a workaround for llvm.org/pr14047. See
 // the comment on emitSwitch.
 MOZ_NEVER_INLINE bool
@@ -5337,7 +5358,17 @@ BytecodeEmitter::emitLexicalScope(ParseNode* pn)
     if (!enterBlockScope(&stmtInfo, pn->pn_objbox, JSOP_UNINITIALIZED, 0))
         return false;
 
-    if (!emitTree(pn->pn_expr))
+    ParseNode* body = pn->pn_expr;
+
+    if (body->isKind(PNK_STATEMENTLIST) && body->pn_xflags & PNX_FUNCDEFS) {
+        // This block contains function statements whose definitions are
+        // hoisted to the top of the block. Emit these as a separate pass
+        // before the rest of the block.
+        if (!emitHoistedFunctionsInList(body))
+            return false;
+    }
+
+    if (!emitTree(body))
         return false;
 
     if (!leaveNestedScope(&stmtInfo))
@@ -6198,6 +6229,12 @@ BytecodeEmitter::emitComprehensionFor(ParseNode* compFor)
 MOZ_NEVER_INLINE bool
 BytecodeEmitter::emitFunction(ParseNode* pn, bool needsProto)
 {
+    ParseNode* assignmentForAnnexB = nullptr;
+    if (pn->isKind(PNK_ANNEXB_FUNCTION)) {
+        assignmentForAnnexB = pn->pn_right;
+        pn = pn->pn_left;
+    }
+
     FunctionBox* funbox = pn->pn_funbox;
     RootedFunction fun(cx, funbox->function());
     MOZ_ASSERT_IF(fun->isInterpretedLazy(), fun->lazyScript());
@@ -6208,9 +6245,24 @@ BytecodeEmitter::emitFunction(ParseNode* pn, bool needsProto)
      * function will be seen by emitFunction in two places.
      */
     if (funbox->wasEmitted) {
+        // Annex B block-scoped functions are hoisted like any other
+        // block-scoped function to the top of their scope. When their
+        // definitions are seen for the second time, we need to emit the
+        // assignment that assigns the function to the outer 'var' binding.
+        if (assignmentForAnnexB) {
+            if (!emitTree(assignmentForAnnexB))
+                return false;
+
+            // If we did not synthesize a new binding and only a simple
+            // assignment, manually pop the result.
+            if (assignmentForAnnexB->isKind(PNK_ASSIGN)) {
+                if (!emit1(JSOP_POP))
+                    return false;
+            }
+        }
+
         MOZ_ASSERT_IF(fun->hasScript(), fun->nonLazyScript());
         MOZ_ASSERT(pn->functionIsHoisted());
-        MOZ_ASSERT(sc->isFunctionBox());
         return true;
     }
 
@@ -6318,7 +6370,15 @@ BytecodeEmitter::emitFunction(ParseNode* pn, bool needsProto)
      * For modules, we record the function and instantiate the binding during
      * ModuleDeclarationInstantiation(), before the script is run.
      */
-    if (sc->isGlobalContext()) {
+    if (!atBodyLevel()) {
+        if (!emitIndexOp(JSOP_LAMBDA, index))
+            return false;
+        MOZ_ASSERT(pn->getOp() == JSOP_INITLEXICAL);
+        if (!emitVarOp(pn, pn->getOp()))
+            return false;
+        if (!emit1(JSOP_POP))
+            return false;
+    } else if (sc->isGlobalContext()) {
         MOZ_ASSERT(pn->pn_scopecoord.isFree());
         MOZ_ASSERT(pn->getOp() == JSOP_NOP);
         MOZ_ASSERT(atBodyLevel());
@@ -7999,7 +8059,6 @@ BytecodeEmitter::emitArgsBody(ParseNode *pn)
     // Carefully emit everything in the right order:
     // 1. Defaults and Destructuring for each argument
     // 2. Functions
-    ParseNode* pnchild = pnlast->pn_head;
     bool hasDefaults = sc->asFunctionBox()->hasDefaults();
     ParseNode* rest = nullptr;
     bool restIsDefn = false;
@@ -8060,21 +8119,11 @@ BytecodeEmitter::emitArgsBody(ParseNode *pn)
         }
     }
     if (pnlast->pn_xflags & PNX_FUNCDEFS) {
-        // This block contains top-level function definitions. To ensure
-        // that we emit the bytecode defining them before the rest of code
-        // in the block we use a separate pass over functions. During the
-        // main pass later the emitter will add JSOP_NOP with source notes
-        // for the function to preserve the original functions position
-        // when decompiling.
-        //
-        // Currently this is used only for functions, as compile-as-we go
-        // mode for scripts does not allow separate emitter passes.
-        for (ParseNode* pn2 = pnchild; pn2; pn2 = pn2->pn_next) {
-            if (pn2->isKind(PNK_FUNCTION) && pn2->functionIsHoisted()) {
-                if (!emitTree(pn2))
-                    return false;
-            }
-        }
+        // This function contains top-level inner function definitions. To
+        // ensure that we emit the bytecode defining them before the rest
+        // of code in the block we use a separate pass over functions.
+        if (!emitHoistedFunctionsInList(pnlast))
+            return false;
     }
     return emitTree(pnlast);
 }
@@ -8293,6 +8342,7 @@ BytecodeEmitter::emitTree(ParseNode* pn, EmitLineNumberNote emitLineNote)
 
     switch (pn->getKind()) {
       case PNK_FUNCTION:
+      case PNK_ANNEXB_FUNCTION:
         if (!emitFunction(pn))
             return false;
         break;
diff --git a/js/src/frontend/BytecodeEmitter.h b/js/src/frontend/BytecodeEmitter.h
index 89ab56783214..ae6f7491b67e 100644
--- a/js/src/frontend/BytecodeEmitter.h
+++ b/js/src/frontend/BytecodeEmitter.h
@@ -464,6 +464,8 @@ struct BytecodeEmitter
     MOZ_NEVER_INLINE bool emitFunction(ParseNode* pn, bool needsProto = false);
     MOZ_NEVER_INLINE bool emitObject(ParseNode* pn);
 
+    bool emitHoistedFunctionsInList(ParseNode* pn);
+
     bool emitPropertyList(ParseNode* pn, MutableHandlePlainObject objp, PropListType type);
 
     // To catch accidental misuse, emitUint16Operand/emit3 assert that they are
diff --git a/js/src/frontend/FoldConstants.cpp b/js/src/frontend/FoldConstants.cpp
index f226310c209a..1c80e99db7a6 100644
--- a/js/src/frontend/FoldConstants.cpp
+++ b/js/src/frontend/FoldConstants.cpp
@@ -100,6 +100,11 @@ ContainsHoistedDeclaration(ExclusiveContext* cx, ParseNode* node, bool* result)
         *result = false;
         return true;
 
+      case PNK_ANNEXB_FUNCTION:
+        MOZ_ASSERT(node->isArity(PN_BINARY));
+        *result = false;
+        return true;
+
       case PNK_MODULE:
         *result = false;
         return true;
@@ -1783,6 +1788,9 @@ Fold(ExclusiveContext* cx, ParseNode** pnp, Parser<FullParseHandler>& parser, bo
       case PNK_FUNCTION:
         return FoldFunction(cx, pn, parser, inGenexpLambda);
 
+      case PNK_ANNEXB_FUNCTION:
+        return FoldFunction(cx, pn->pn_left, parser, inGenexpLambda);
+
       case PNK_MODULE:
         return FoldModule(cx, pn, parser);
 
diff --git a/js/src/frontend/FullParseHandler.h b/js/src/frontend/FullParseHandler.h
index 031f78ec7836..4368f6dd0a1b 100644
--- a/js/src/frontend/FullParseHandler.h
+++ b/js/src/frontend/FullParseHandler.h
@@ -448,17 +448,11 @@ class FullParseHandler
     void addStatementToList(ParseNode* list, ParseNode* stmt, PC* pc) {
         MOZ_ASSERT(list->isKind(PNK_STATEMENTLIST));
 
-        if (stmt->isKind(PNK_FUNCTION)) {
-            if (pc->atBodyLevel()) {
-                // PNX_FUNCDEFS notifies the emitter that the block contains
-                // body-level function definitions that should be processed
-                // before the rest of nodes.
-                list->pn_xflags |= PNX_FUNCDEFS;
-            } else {
-                // General deoptimization was done in Parser::functionDef.
-                MOZ_ASSERT_IF(pc->sc->isFunctionBox(),
-                              pc->sc->asFunctionBox()->hasExtensibleScope());
-            }
+        if (stmt->isKind(PNK_FUNCTION) || stmt->isKind(PNK_ANNEXB_FUNCTION)) {
+            // PNX_FUNCDEFS notifies the emitter that the block contains
+            // body-level function definitions that should be processed
+            // before the rest of nodes.
+            list->pn_xflags |= PNX_FUNCDEFS;
         }
 
         list->append(stmt);
@@ -656,6 +650,11 @@ class FullParseHandler
         MOZ_ASSERT(pn->isKind(PNK_FUNCTION));
         pn->pn_funbox = funbox;
     }
+    ParseNode* newFunctionDefinitionForAnnexB(ParseNode* pn, ParseNode* assignment) {
+        MOZ_ASSERT(pn->isKind(PNK_FUNCTION));
+        MOZ_ASSERT(assignment->isKind(PNK_ASSIGN) || assignment->isKind(PNK_VAR));
+        return new_<BinaryNode>(PNK_ANNEXB_FUNCTION, JSOP_NOP, pos(), pn, assignment);
+    }
     void addFunctionArgument(ParseNode* pn, ParseNode* argpn) {
         pn->pn_body->append(argpn);
     }
@@ -727,7 +726,7 @@ class FullParseHandler
         return node->isKind(PNK_SUPERBASE);
     }
 
-    inline bool finishInitializerAssignment(ParseNode* pn, ParseNode* init, JSOp op);
+    inline bool finishInitializerAssignment(ParseNode* pn, ParseNode* init);
     inline void setLexicalDeclarationOp(ParseNode* pn, JSOp op);
 
     void setBeginPosition(ParseNode* pn, ParseNode* oth) {
@@ -990,7 +989,7 @@ FullParseHandler::setLastFunctionArgumentDestructuring(ParseNode* funcpn, ParseN
 }
 
 inline bool
-FullParseHandler::finishInitializerAssignment(ParseNode* pn, ParseNode* init, JSOp op)
+FullParseHandler::finishInitializerAssignment(ParseNode* pn, ParseNode* init)
 {
     if (pn->isUsed()) {
         pn = makeAssignment(pn, init);
diff --git a/js/src/frontend/NameFunctions.cpp b/js/src/frontend/NameFunctions.cpp
index cbc6578b1eb5..d9f97c1c5261 100644
--- a/js/src/frontend/NameFunctions.cpp
+++ b/js/src/frontend/NameFunctions.cpp
@@ -791,6 +791,12 @@ class NameResolver
                 return false;
             break;
 
+          case PNK_ANNEXB_FUNCTION:
+            MOZ_ASSERT(cur->isArity(PN_BINARY));
+            if (!resolve(cur->pn_left, prefix))
+                return false;
+            break;
+
           // Kinds that should be handled by parent node resolution.
 
           case PNK_IMPORT_SPEC: // by PNK_IMPORT_SPEC_LIST
diff --git a/js/src/frontend/ParseNode.cpp b/js/src/frontend/ParseNode.cpp
index 3a87e2db7fd9..243bfadb6a65 100644
--- a/js/src/frontend/ParseNode.cpp
+++ b/js/src/frontend/ParseNode.cpp
@@ -283,7 +283,8 @@ PushNodeChildren(ParseNode* pn, NodeStack* stack)
       case PNK_NEWTARGET:
       case PNK_SETTHIS:
       case PNK_FOR:
-      case PNK_COMPREHENSIONFOR: {
+      case PNK_COMPREHENSIONFOR:
+      case PNK_ANNEXB_FUNCTION: {
         MOZ_ASSERT(pn->isArity(PN_BINARY));
         stack->push(pn->pn_left);
         stack->push(pn->pn_right);
diff --git a/js/src/frontend/ParseNode.h b/js/src/frontend/ParseNode.h
index 471af411a8fc..61f6bf3a4281 100644
--- a/js/src/frontend/ParseNode.h
+++ b/js/src/frontend/ParseNode.h
@@ -165,6 +165,7 @@ class PackedScopeCoordinate
     F(FORIN) \
     F(FOROF) \
     F(FORHEAD) \
+    F(ANNEXB_FUNCTION) \
     F(ARGSBODY) \
     F(SPREAD) \
     F(MUTATEPROTO) \
@@ -271,6 +272,9 @@ IsDeleteKind(ParseNodeKind kind)
  *                          pn_scopecoord: hops and var index for function
  *                          pn_dflags: PND_* definition/use flags (see below)
  *                          pn_blockid: block id number
+ * PNK_ANNEXB_FUNCTION binary pn_left: PNK_FUNCTION
+ *                            pn_right: assignment for annex B semantics for
+ *                              block-scoped function
  * PNK_ARGSBODY list        list of formal parameters with
  *                              PNK_NAME node with non-empty name for
  *                                SingleNameBinding without Initializer
@@ -780,7 +784,8 @@ class ParseNode
                    isOp(JSOP_DEFFUN) ||        // non-body-level function statement
                    isOp(JSOP_NOP) ||           // body-level function stmt in global code
                    isOp(JSOP_GETLOCAL) ||      // body-level function stmt in function code
-                   isOp(JSOP_GETARG));         // body-level function redeclaring formal
+                   isOp(JSOP_GETARG) ||        // body-level function redeclaring formal
+                   isOp(JSOP_INITLEXICAL));    // block-level function stmt
         return !isOp(JSOP_LAMBDA) && !isOp(JSOP_LAMBDA_ARROW) && !isOp(JSOP_DEFFUN);
     }
 
@@ -1615,6 +1620,8 @@ struct Definition : public ParseNode
         if (getKind() == PNK_FUNCTION) {
             if (isOp(JSOP_GETARG))
                 return ARG;
+            if (isOp(JSOP_INITLEXICAL))
+                return LET;
             return VAR;
         }
         MOZ_ASSERT(getKind() == PNK_NAME);
diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp
index 425d45bb5240..40aa9096fbd6 100644
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -1199,18 +1199,6 @@ template <>
 bool
 Parser<FullParseHandler>::checkFunctionArguments()
 {
-    /*
-     * Non-top-level functions use JSOP_DEFFUN which is a dynamic scope
-     * operation which means it aliases any bindings with the same name.
-     */
-    if (FuncStmtSet* set = pc->funcStmts) {
-        for (FuncStmtSet::Range r = set->all(); !r.empty(); r.popFront()) {
-            PropertyName* name = r.front()->asPropertyName();
-            if (Definition* dn = pc->decls().lookupFirst(name))
-                dn->pn_dflags |= PND_CLOSED;
-        }
-    }
-
     /* Time to implement the odd semantics of 'arguments'. */
     HandlePropertyName arguments = context->names().arguments;
 
@@ -1491,18 +1479,22 @@ struct BindData
     void initLexical(VarContext varContext, JSOp op, StaticBlockObject* blockObj,
                      unsigned overflow)
     {
-        init(LexicalBinding, op, op == JSOP_DEFCONST);
+        init(LexicalBinding, op, op == JSOP_DEFCONST, false);
         letData_.varContext = varContext;
         letData_.blockObj = blockObj;
         letData_.overflow = overflow;
     }
 
     void initVar(JSOp op) {
-        init(VarBinding, op, false);
+        init(VarBinding, op, false, false);
+    }
+
+    void initAnnexBVar() {
+        init(VarBinding, JSOP_DEFVAR, false, true);
     }
 
     void initDestructuring(JSOp op) {
-        init(DestructuringBinding, op, false);
+        init(DestructuringBinding, op, false, false);
     }
 
     void setNameNode(typename ParseHandler::Node pn) {
@@ -1525,6 +1517,11 @@ struct BindData
         return isConst_;
     }
 
+    bool isAnnexB() {
+        MOZ_ASSERT(isInitialized());
+        return isAnnexB_;
+    }
+
     const LetData& letData() {
         MOZ_ASSERT(kind_ == LexicalBinding);
         return letData_;
@@ -1561,17 +1558,19 @@ struct BindData
 
     JSOp op_;         // Prologue bytecode or nop.
     bool isConst_;    // Whether this is a const binding.
+    bool isAnnexB_;   // Whether this is a synthesized 'var' binding for Annex B.3.
     LetData letData_;
 
     bool isInitialized() {
         return kind_ != Uninitialized;
     }
 
-    void init(BindingKind kind, JSOp op, bool isConst) {
+    void init(BindingKind kind, JSOp op, bool isConst, bool isAnnexB) {
         MOZ_ASSERT(!isInitialized());
         kind_ = kind;
         op_ = op;
         isConst_ = isConst;
+        isAnnexB_ = isAnnexB;
     }
 };
 
@@ -2235,138 +2234,193 @@ Parser<ParseHandler>::functionArguments(YieldHandling yieldHandling, FunctionSyn
     return true;
 }
 
+template <>
+bool
+Parser<FullParseHandler>::bindBodyLevelFunctionName(HandlePropertyName funName,
+                                                    ParseNode** pn_)
+{
+    MOZ_ASSERT(pc->atBodyLevel() || !pc->sc->strict());
+
+    ParseNode*& pn = *pn_;
+
+    /*
+     * Handle redeclaration and optimize cases where we can statically bind the
+     * function (thereby avoiding JSOP_DEFFUN and dynamic name lookup).
+     */
+    if (Definition* dn = pc->decls().lookupFirst(funName)) {
+        MOZ_ASSERT(!dn->isUsed());
+        MOZ_ASSERT(dn->isDefn());
+
+        if (dn->kind() == Definition::CONSTANT || dn->kind() == Definition::LET)
+            return reportRedeclaration(nullptr, Definition::VAR, funName);
+
+        /*
+         * Body-level function statements are effectively variable
+         * declarations where the initialization is hoisted to the
+         * beginning of the block. This means that any other variable
+         * declaration with the same name is really just an assignment to
+         * the function's binding (which is mutable), so turn any existing
+         * declaration into a use.
+         */
+        if (dn->kind() == Definition::ARG) {
+            // The exception to the above comment is when the function
+            // has the same name as an argument. Then the argument node
+            // remains a definition. But change the function node pn so
+            // that it knows where the argument is located.
+            pn->setOp(JSOP_GETARG);
+            pn->setDefn(true);
+            pn->pn_scopecoord = dn->pn_scopecoord;
+            pn->pn_blockid = dn->pn_blockid;
+            pn->pn_dflags |= PND_BOUND;
+            dn->markAsAssigned();
+        } else {
+            if (!makeDefIntoUse(dn, pn, funName))
+                return false;
+        }
+    } else {
+        /*
+         * If this function was used before it was defined, claim the
+         * pre-created definition node for this function that primaryExpr
+         * put in pc->lexdeps on first forward reference, and recycle pn.
+         */
+        if (Definition* fn = pc->lexdeps.lookupDefn<FullParseHandler>(funName)) {
+            MOZ_ASSERT(fn->isDefn());
+            fn->setKind(PNK_FUNCTION);
+            fn->setArity(PN_CODE);
+            fn->pn_pos.begin = pn->pn_pos.begin;
+            fn->pn_pos.end = pn->pn_pos.end;
+
+            fn->pn_body = nullptr;
+            fn->pn_scopecoord.makeFree();
+
+            pc->lexdeps->remove(funName);
+            handler.freeTree(pn);
+            pn = fn;
+        }
+
+        if (!pc->define(tokenStream, funName, pn, Definition::VAR))
+            return false;
+    }
+
+    /* No further binding (in BindNameToSlot) is needed for functions. */
+    pn->pn_dflags |= PND_BOUND;
+
+    MOZ_ASSERT(pn->functionIsHoisted());
+    MOZ_ASSERT(pc->sc->isGlobalContext() == pn->pn_scopecoord.isFree());
+
+    return true;
+}
+
+template <>
+bool
+Parser<FullParseHandler>::bindLexicalFunctionName(HandlePropertyName funName,
+                                                  ParseNode* pn);
+
 template <>
 bool
 Parser<FullParseHandler>::checkFunctionDefinition(HandlePropertyName funName,
                                                   ParseNode** pn_, FunctionSyntaxKind kind,
-                                                  bool* pbodyProcessed)
+                                                  bool* pbodyProcessed,
+                                                  ParseNode** assignmentForAnnexBOut)
 {
     ParseNode*& pn = *pn_;
     *pbodyProcessed = false;
 
-    /* Function statements add a binding to the enclosing scope. */
-    bool bodyLevel = pc->atBodyLevel();
-
     if (kind == Statement) {
-        /*
-         * Handle redeclaration and optimize cases where we can statically bind the
-         * function (thereby avoiding JSOP_DEFFUN and dynamic name lookup).
-         */
-        if (Definition* dn = pc->decls().lookupFirst(funName)) {
-            MOZ_ASSERT(!dn->isUsed());
-            MOZ_ASSERT(dn->isDefn());
+        MOZ_ASSERT(assignmentForAnnexBOut);
+        *assignmentForAnnexBOut = nullptr;
 
-            bool throwRedeclarationError = dn->kind() == Definition::CONSTANT ||
-                                           dn->kind() == Definition::LET;
-            if (options().extraWarningsOption || throwRedeclarationError) {
-                JSAutoByteString name;
-                ParseReportKind reporter = throwRedeclarationError
-                                           ? ParseError
-                                           : ParseExtraWarning;
-                if (!AtomToPrintableString(context, funName, &name) ||
-                    !report(reporter, false, nullptr, JSMSG_REDECLARED_VAR,
-                            Definition::kindString(dn->kind()), name.ptr()))
-                {
-                    return false;
-                }
-            }
-
-            /*
-             * Body-level function statements are effectively variable
-             * declarations where the initialization is hoisted to the
-             * beginning of the block. This means that any other variable
-             * declaration with the same name is really just an assignment to
-             * the function's binding (which is mutable), so turn any existing
-             * declaration into a use.
-             */
-            if (bodyLevel) {
-                if (dn->kind() == Definition::ARG) {
-                    // The exception to the above comment is when the function
-                    // has the same name as an argument. Then the argument node
-                    // remains a definition. But change the function node pn so
-                    // that it knows where the argument is located.
-                    pn->setOp(JSOP_GETARG);
-                    pn->setDefn(true);
-                    pn->pn_scopecoord = dn->pn_scopecoord;
-                    pn->pn_blockid = dn->pn_blockid;
-                    pn->pn_dflags |= PND_BOUND;
-                    dn->markAsAssigned();
-                } else {
-                    if (!makeDefIntoUse(dn, pn, funName))
-                        return false;
-                }
-            }
-        } else if (bodyLevel) {
-            /*
-             * If this function was used before it was defined, claim the
-             * pre-created definition node for this function that primaryExpr
-             * put in pc->lexdeps on first forward reference, and recycle pn.
-             */
-            if (Definition* fn = pc->lexdeps.lookupDefn<FullParseHandler>(funName)) {
-                MOZ_ASSERT(fn->isDefn());
-                fn->setKind(PNK_FUNCTION);
-                fn->setArity(PN_CODE);
-                fn->pn_pos.begin = pn->pn_pos.begin;
-                fn->pn_pos.end = pn->pn_pos.end;
-
-                fn->pn_body = nullptr;
-                fn->pn_scopecoord.makeFree();
-
-                pc->lexdeps->remove(funName);
-                handler.freeTree(pn);
-                pn = fn;
-            }
-
-            if (!pc->define(tokenStream, funName, pn, Definition::VAR))
+        if (pc->atBodyLevel()) {
+            if (!bindBodyLevelFunctionName(funName, pn_))
                 return false;
-        }
-
-        if (bodyLevel) {
-            MOZ_ASSERT(pn->functionIsHoisted());
-            MOZ_ASSERT(pc->sc->isGlobalContext() == pn->pn_scopecoord.isFree());
         } else {
-            /*
-             * As a SpiderMonkey-specific extension, non-body-level function
-             * statements (e.g., functions in an "if" or "while" block) are
-             * dynamically bound when control flow reaches the statement.
-             */
-            MOZ_ASSERT(!pc->sc->strict());
-            MOZ_ASSERT(pn->pn_scopecoord.isFree());
-            if (pc->sc->isFunctionBox()) {
-                FunctionBox* funbox = pc->sc->asFunctionBox();
-                funbox->setMightAliasLocals();
-                funbox->setHasExtensibleScope();
-            }
-            pn->setOp(JSOP_DEFFUN);
+            Definition* annexDef = nullptr;
+            Node synthesizedDeclarationList = null();
 
-            /*
-             * Instead of setting bindingsAccessedDynamically, which would be
-             * overly conservative, remember the names of all function
-             * statements and mark any bindings with the same as aliased at the
-             * end of functionBody.
-             */
-            if (!pc->funcStmts) {
-                pc->funcStmts = alloc.new_<FuncStmtSet>(alloc);
-                if (!pc->funcStmts || !pc->funcStmts->init()) {
-                    ReportOutOfMemory(context);
-                    return false;
+            if (!pc->sc->strict()) {
+                // Under non-strict mode, try Annex B.3.3 semantics. If making
+                // an additional 'var' binding of the same name does not throw
+                // an early error, do so. This 'var' binding would be assigned
+                // the function object in situ, e.g., when its declaration is
+                // reached, not at the start of the block.
+
+                annexDef = pc->decls().lookupFirst(funName);
+                if (annexDef) {
+                    if (annexDef->kind() == Definition::CONSTANT ||
+                        annexDef->kind() == Definition::LET)
+                    {
+                        // Do not emit Annex B assignment if we would've
+                        // thrown a redeclaration error.
+                        annexDef = nullptr;
+                    }
+                } else {
+                    // Synthesize a new 'var' binding if one does not exist.
+                    ParseNode* varNode = newBindingNode(funName, /* functionScope = */ true);
+                    if (!varNode)
+                        return false;
+
+                    // Treat the 'var' binding as body level. Otherwise the
+                    // lexical binding of the function name below would result
+                    // in a redeclaration. That is,
+                    // { var x; let x; } is an early error.
+                    // var x; { let x; } is not.
+                    varNode->pn_blockid = pc->bodyid;
+
+                    BindData<FullParseHandler> data(context);
+                    data.initAnnexBVar();
+                    data.setNameNode(varNode);
+                    if (!data.bind(funName, this))
+                        return false;
+
+                    MOZ_ASSERT(varNode->isDefn());
+                    annexDef = static_cast<Definition*>(varNode);
+
+                    synthesizedDeclarationList = handler.newDeclarationList(PNK_VAR, JSOP_DEFVAR);
+                    if (!synthesizedDeclarationList)
+                        return false;
+                    handler.addList(synthesizedDeclarationList, annexDef);
                 }
             }
-            if (!pc->funcStmts->put(funName))
+
+            if (!bindLexicalFunctionName(funName, pn))
                 return false;
 
-            /*
-             * Due to the implicit declaration mechanism, 'arguments' will not
-             * have decls and, even if it did, they will not be noted as closed
-             * in the emitter. Thus, in the corner case of function statements
-             * overridding arguments, flag the whole scope as dynamic.
-             */
-            if (funName == context->names().arguments)
-                pc->sc->setBindingsAccessedDynamically();
-        }
+            if (annexDef) {
+                MOZ_ASSERT(!pc->sc->strict());
 
-        /* No further binding (in BindNameToSlot) is needed for functions. */
-        pn->pn_dflags |= PND_BOUND;
+                // Synthesize an assignment assigning the lexical name to the
+                // 'var' name for Annex B.
+
+                ParseNode* rhs = newName(funName);
+                if (!rhs)
+                    return false;
+                if (!noteNameUse(funName, rhs))
+                    return false;
+
+                // If we synthesized a new definition, emit the declaration to
+                // ensure DEFVAR is correctly emitted in global scripts.
+                // Otherwise, synthesize a simple assignment and emit that.
+                if (synthesizedDeclarationList) {
+                    if (!handler.finishInitializerAssignment(annexDef, rhs))
+                        return false;
+                    *assignmentForAnnexBOut = synthesizedDeclarationList;
+                } else {
+                    ParseNode* lhs = newName(funName);
+                    if (!lhs)
+                        return false;
+                    lhs->setOp(JSOP_SETNAME);
+
+                    // Manually link up the LHS with the non-lexical definition.
+                    handler.linkUseToDef(lhs, annexDef);
+
+                    ParseNode* assign = handler.newAssignment(PNK_ASSIGN, lhs, rhs, pc, JSOP_NOP);
+                    if (!assign)
+                        return false;
+
+                    *assignmentForAnnexBOut = assign;
+                }
+            }
+        }
     } else {
         /* A function expression does not introduce any binding. */
         pn->setOp(kind == Arrow ? JSOP_LAMBDA_ARROW : JSOP_LAMBDA);
@@ -2475,7 +2529,8 @@ template <>
 bool
 Parser<SyntaxParseHandler>::checkFunctionDefinition(HandlePropertyName funName,
                                                     Node* pn, FunctionSyntaxKind kind,
-                                                    bool* pbodyProcessed)
+                                                    bool* pbodyProcessed,
+                                                    Node* assignmentForAnnexBOut)
 {
     *pbodyProcessed = false;
 
@@ -2483,10 +2538,18 @@ Parser<SyntaxParseHandler>::checkFunctionDefinition(HandlePropertyName funName,
     bool bodyLevel = pc->atBodyLevel();
 
     if (kind == Statement) {
+        *assignmentForAnnexBOut = null();
+
+        if (!bodyLevel) {
+            // Block-scoped functions cannot yet be parsed lazily.
+            return abortIfSyntaxParser();
+        }
+
         /*
          * Handle redeclaration and optimize cases where we can statically bind the
          * function (thereby avoiding JSOP_DEFFUN and dynamic name lookup).
          */
+
         if (DefinitionNode dn = pc->decls().lookupFirst(funName)) {
             if (dn == Definition::CONSTANT || dn == Definition::LET) {
                 JSAutoByteString name;
@@ -2497,16 +2560,13 @@ Parser<SyntaxParseHandler>::checkFunctionDefinition(HandlePropertyName funName,
                     return false;
                 }
             }
-        } else if (bodyLevel) {
+        } else {
             if (pc->lexdeps.lookupDefn<SyntaxParseHandler>(funName))
                 pc->lexdeps->remove(funName);
 
             if (!pc->define(tokenStream, funName, *pn, Definition::VAR))
                 return false;
         }
-
-        if (!bodyLevel && funName == context->names().arguments)
-            pc->sc->setBindingsAccessedDynamically();
     }
 
     if (kind == Arrow) {
@@ -2587,7 +2647,8 @@ template <typename ParseHandler>
 typename ParseHandler::Node
 Parser<ParseHandler>::functionDef(InHandling inHandling, YieldHandling yieldHandling,
                                   HandlePropertyName funName, FunctionSyntaxKind kind,
-                                  GeneratorKind generatorKind, InvokedPrediction invoked)
+                                  GeneratorKind generatorKind, InvokedPrediction invoked,
+                                  Node* assignmentForAnnexBOut)
 {
     MOZ_ASSERT_IF(kind == Statement, funName);
 
@@ -2595,12 +2656,13 @@ Parser<ParseHandler>::functionDef(InHandling inHandling, YieldHandling yieldHand
     Node pn = handler.newFunctionDefinition();
     if (!pn)
         return null();
+    handler.setBlockId(pn, pc->blockid());
 
     if (invoked)
         pn = handler.setLikelyIIFE(pn);
 
     bool bodyProcessed;
-    if (!checkFunctionDefinition(funName, &pn, kind, &bodyProcessed))
+    if (!checkFunctionDefinition(funName, &pn, kind, &bodyProcessed, assignmentForAnnexBOut))
         return null();
 
     if (bodyProcessed)
@@ -2787,7 +2849,6 @@ Parser<FullParseHandler>::functionArgsAndBody(InHandling inHandling, ParseNode*
         if (!addFreeVariablesFromLazyFunction(fun, pc))
             return false;
 
-        pn->pn_blockid = outerpc->blockid();
         PropagateTransitiveParseFlags(funbox, outerpc->sc);
         return true;
     } while (false);
@@ -2805,8 +2866,6 @@ Parser<FullParseHandler>::functionArgsAndBody(InHandling inHandling, ParseNode*
     if (!leaveFunction(pn, outerpc, kind))
         return false;
 
-    pn->pn_blockid = outerpc->blockid();
-
     /*
      * Fruit of the poisonous tree: if a closure contains a dynamic name access
      * (eval, with, etc), we consider the parent to do the same. The reason is
@@ -3048,6 +3107,24 @@ Parser<ParseHandler>::functionStmt(YieldHandling yieldHandling, DefaultHandling
 {
     MOZ_ASSERT(tokenStream.isCurrentTokenType(TOK_FUNCTION));
 
+    // ES6 Annex B.3.4 says we can parse function declarations unbraced under if or
+    // else as if it were braced. That is, |if (x) function f() {}| is parsed as
+    // |if (x) { function f() {} }|.
+    Maybe<AutoPushStmtInfoPC> synthesizedStmtInfoForAnnexB;
+    Node synthesizedBlockForAnnexB = null();
+    StmtInfoPC *stmt = pc->innermostStmt();
+    if (!pc->sc->strict() && stmt &&
+        (stmt->type == StmtType::IF || stmt->type == StmtType::ELSE))
+    {
+        if (!abortIfSyntaxParser())
+            return null();
+
+        synthesizedStmtInfoForAnnexB.emplace(*this, StmtType::BLOCK);
+        synthesizedBlockForAnnexB = pushLexicalScope(*synthesizedStmtInfoForAnnexB);
+        if (!synthesizedBlockForAnnexB)
+            return null();
+    }
+
     RootedPropertyName name(context);
     GeneratorKind generatorKind = NotGenerator;
     TokenKind tt;
@@ -3075,12 +3152,35 @@ Parser<ParseHandler>::functionStmt(YieldHandling yieldHandling, DefaultHandling
         return null();
     }
 
-    /* We forbid function statements in strict mode code. */
-    if (!pc->atBodyLevel() && pc->sc->needStrictChecks() &&
-        !report(ParseStrictError, pc->sc->strict(), null(), JSMSG_STRICT_FUNCTION_STATEMENT))
+    Node assignmentForAnnexB;
+    Node fun = functionDef(InAllowed, yieldHandling, name, Statement, generatorKind,
+                           PredictUninvoked, &assignmentForAnnexB);
+    if (!fun)
         return null();
 
-    return functionDef(InAllowed, yieldHandling, name, Statement, generatorKind);
+    if (assignmentForAnnexB) {
+        fun = handler.newFunctionDefinitionForAnnexB(fun, assignmentForAnnexB);
+        if (!fun)
+            return null();
+    }
+
+    // Note that we may have synthesized a block for Annex B.3.4 without
+    // having synthesized an assignment for Annex B.3.3, e.g.,
+    //
+    //   let f = 1;
+    //   {
+    //     if (1) function f() {}
+    //   }
+    if (synthesizedBlockForAnnexB) {
+        Node body = handler.newStatementList(pc->blockid(), handler.getPosition(fun));
+        if (!body)
+            return null();
+        handler.addStatementToList(body, fun, pc);
+        handler.setLexicalScopeBody(synthesizedBlockForAnnexB, body);
+        return synthesizedBlockForAnnexB;
+    }
+
+    return fun;
 }
 
 template <typename ParseHandler>
@@ -3684,19 +3784,24 @@ Parser<ParseHandler>::bindVar(BindData<ParseHandler>* data,
     StmtInfoPC* stmt = LexicalLookup(pc, name);
 
     if (stmt && stmt->type == StmtType::WITH) {
-        parser->handler.setFlag(pn, PND_DEOPTIMIZED);
-        if (pc->sc->isFunctionBox()) {
-            FunctionBox* funbox = pc->sc->asFunctionBox();
-            funbox->setMightAliasLocals();
-        }
+        // Do not deoptimize if we are binding a synthesized 'var' binding for
+        // Annex B.3.3, which states that the synthesized binding is to go on
+        // the nearest VariableEnvironment. Deoptimizing here would
+        // erroneously emit NAME ops when assigning to the Annex B 'var'.
+        if (!data->isAnnexB()) {
+            parser->handler.setFlag(pn, PND_DEOPTIMIZED);
+            if (pc->sc->isFunctionBox()) {
+                FunctionBox* funbox = pc->sc->asFunctionBox();
+                funbox->setMightAliasLocals();
+            }
 
-        /*
-         * Make sure to indicate the need to deoptimize the script's arguments
-         * object. Mark the function as if it contained a debugger statement,
-         * which will deoptimize arguments as much as possible.
-         */
-        if (name == cx->names().arguments)
-            pc->sc->setHasDebuggerStatement();
+            // Make sure to indicate the need to deoptimize the script's
+            // arguments object. Mark the function as if it contained a
+            // debugger statement, which will deoptimize arguments as much as
+            // possible.
+            if (name == cx->names().arguments)
+                pc->sc->setHasDebuggerStatement();
+        }
 
         // Find the nearest enclosing non-with scope that defined name, if
         // any, for redeclaration checks below.
@@ -4428,7 +4533,7 @@ Parser<ParseHandler>::variables(YieldHandling yieldHandling,
                     if (!bindBeforeInitializer && !data.bind(name, this))
                         return null();
 
-                    if (!handler.finishInitializerAssignment(pn2, init, data.op()))
+                    if (!handler.finishInitializerAssignment(pn2, init))
                         return null();
                 }
             }
@@ -4452,11 +4557,11 @@ bool
 Parser<FullParseHandler>::checkAndPrepareLexical(bool isConst, const TokenPos& errorPos)
 {
     /*
-     * This is a lexical declaration. We must be directly under a block per the
-     * proposed ES4 specs, but not an implicit block created due to
-     * 'for (let ...)'. If we pass this error test, make the enclosing
-     * StmtInfoPC be our scope. Further let declarations in this block will
-     * find this scope statement and use the same block object.
+     * This is a lexical declaration. We must be directly under a block, but
+     * not an implicit block created due to 'for (let ...)'. If we pass this
+     * error test, make the enclosing StmtInfoPC be our scope. Further let
+     * declarations in this block will find this scope statement and use the
+     * same block object.
      *
      * If we are the first let declaration in this block (i.e., when the
      * enclosing maybe-scope StmtInfoPC isn't yet a scope statement) then
@@ -4546,7 +4651,7 @@ Parser<FullParseHandler>::prepareAndBindInitializedLexicalWithNode(HandlePropert
 {
     BindData<FullParseHandler> data(context);
     if (!checkAndPrepareLexical(isConst, pos))
-        return null();
+        return false;
     data.initLexical(HoistVars, isConst ? JSOP_DEFCONST : JSOP_DEFLET,
                      CurrentLexicalStaticBlock(pc), JSMSG_TOO_MANY_LOCALS);
     return bindInitialized(&data, name, pn);
@@ -4568,6 +4673,16 @@ Parser<FullParseHandler>::makeInitializedLexicalBinding(HandlePropertyName name,
     return dn;
 }
 
+template <>
+bool
+Parser<FullParseHandler>::bindLexicalFunctionName(HandlePropertyName funName,
+                                                  ParseNode* pn)
+{
+    MOZ_ASSERT(!pc->atBodyLevel());
+    pn->pn_blockid = pc->blockid();
+    return prepareAndBindInitializedLexicalWithNode(funName, /* isConst = */ false, pn, pos());
+}
+
 template <>
 ParseNode*
 Parser<FullParseHandler>::lexicalDeclaration(YieldHandling yieldHandling, bool isConst)
diff --git a/js/src/frontend/Parser.h b/js/src/frontend/Parser.h
index ded624933f16..c9d9443f7fed 100644
--- a/js/src/frontend/Parser.h
+++ b/js/src/frontend/Parser.h
@@ -53,7 +53,6 @@ struct StmtInfoPC : public StmtInfoBase
     {}
 };
 
-typedef HashSet<JSAtom*, DefaultHasher<JSAtom*>, LifoAllocPolicy<Fallible>> FuncStmtSet;
 class SharedContext;
 
 typedef Vector<Definition*, 16> DeclVector;
@@ -236,10 +235,6 @@ struct MOZ_STACK_CLASS ParseContext : public GenericParseContext
   public:
     OwnedAtomDefnMapPtr lexdeps;    /* unresolved lexical name dependencies */
 
-    FuncStmtSet*    funcStmts;     /* Set of (non-top-level) function statements
-                                       that will alias any top-level bindings with
-                                       the same name. */
-
     // All inner functions in this context. Only filled in when parsing syntax.
     Rooted<TraceableVector<JSFunction*>> innerFunctions;
 
@@ -277,7 +272,6 @@ struct MOZ_STACK_CLASS ParseContext : public GenericParseContext
         parserPC(&prs->pc),
         oldpc(prs->pc),
         lexdeps(prs->context),
-        funcStmts(nullptr),
         innerFunctions(prs->context, TraceableVector<JSFunction*>(prs->context)),
         newDirectives(newDirectives),
         inDeclDestructuring(false)
@@ -728,7 +722,8 @@ class Parser : private JS::AutoGCRooter, public StrictModeGetter
 
     Node functionDef(InHandling inHandling, YieldHandling uieldHandling, HandlePropertyName name,
                      FunctionSyntaxKind kind, GeneratorKind generatorKind,
-                     InvokedPrediction invoked = PredictUninvoked);
+                     InvokedPrediction invoked = PredictUninvoked,
+                     Node* assignmentForAnnexBOut = nullptr);
     bool functionArgsAndBody(InHandling inHandling, Node pn, HandleFunction fun,
                              FunctionSyntaxKind kind, GeneratorKind generatorKind,
                              Directives inheritedDirectives, Directives* newDirectives);
@@ -795,8 +790,10 @@ class Parser : private JS::AutoGCRooter, public StrictModeGetter
     Node newThisName();
 
     bool makeDefIntoUse(Definition* dn, Node pn, HandleAtom atom);
+    bool bindLexicalFunctionName(HandlePropertyName funName, ParseNode* pn);
+    bool bindBodyLevelFunctionName(HandlePropertyName funName, ParseNode** pn);
     bool checkFunctionDefinition(HandlePropertyName funName, Node* pn, FunctionSyntaxKind kind,
-                                 bool* pbodyProcessed);
+                                 bool* pbodyProcessed, Node* assignmentForAnnexBOut);
     bool finishFunctionDefinition(Node pn, FunctionBox* funbox, Node body);
     bool addFreeVariablesFromLazyFunction(JSFunction* fun, ParseContext<ParseHandler>* pc);
 
diff --git a/js/src/frontend/SyntaxParseHandler.h b/js/src/frontend/SyntaxParseHandler.h
index 3785ffd181d1..2aea01e46edb 100644
--- a/js/src/frontend/SyntaxParseHandler.h
+++ b/js/src/frontend/SyntaxParseHandler.h
@@ -333,6 +333,7 @@ class SyntaxParseHandler
     Node newFunctionDefinition() { return NodeHoistableDeclaration; }
     void setFunctionBody(Node pn, Node kid) {}
     void setFunctionBox(Node pn, FunctionBox* funbox) {}
+    Node newFunctionDefinitionForAnnexB(Node pn, Node assignment) { return NodeHoistableDeclaration; }
     void addFunctionArgument(Node pn, Node argpn) {}
 
     Node newForStatement(uint32_t begin, Node forHead, Node body, unsigned iflags) {
@@ -354,7 +355,7 @@ class SyntaxParseHandler
         return NodeGeneric;
     }
 
-    bool finishInitializerAssignment(Node pn, Node init, JSOp op) { return true; }
+    bool finishInitializerAssignment(Node pn, Node init) { return true; }
     void setLexicalDeclarationOp(Node pn, JSOp op) {}
 
     void setBeginPosition(Node pn, Node oth) {}
diff --git a/js/src/jit-test/tests/auto-regress/bug771027.js b/js/src/jit-test/tests/auto-regress/bug771027.js
index 8c7b9a81a7e6..d9038ad85df5 100644
--- a/js/src/jit-test/tests/auto-regress/bug771027.js
+++ b/js/src/jit-test/tests/auto-regress/bug771027.js
@@ -4,6 +4,6 @@
 // Flags:
 //
 
-Array.prototype.iterator = (function() { { while(0) function Uint8ClampedArray() {  } } });
+Array.prototype.iterator = (function() { { while(0) { function Uint8ClampedArray() {  } } } });
 var s = new Set(["testing", "testing", 123]);
 assertEq(s.size(), 2);
diff --git a/js/src/jit-test/tests/baseline/bug1081850.js b/js/src/jit-test/tests/baseline/bug1081850.js
deleted file mode 100644
index e77158a1c220..000000000000
--- a/js/src/jit-test/tests/baseline/bug1081850.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// |jit-test| ion-eager
-
-var ARR = [];
-try {
-    function f() {
-        ARR.push(eval.prototype)
-    }
-    f()
-    function eval()(0)
-    f()
-} catch (e) {}
-
-if (ARR.length !== 2)
-    throw new Error("ERROR 1");
-if (typeof(ARR[0]) !== 'undefined')
-    throw new Error("ERROR 2");
-if (typeof(ARR[1]) !== 'object')
-    throw new Error("ERROR 3");
diff --git a/js/src/jit-test/tests/basic/bug667504-syntax.js b/js/src/jit-test/tests/basic/bug667504-syntax.js
index c2e926d9639c..606922020682 100644
--- a/js/src/jit-test/tests/basic/bug667504-syntax.js
+++ b/js/src/jit-test/tests/basic/bug667504-syntax.js
@@ -1,2 +1,3 @@
-for (var x in x)
+for (var x in x) {
 function x() {}
+}
diff --git a/js/src/jit-test/tests/ion/bug1148973-1.js b/js/src/jit-test/tests/ion/bug1148973-1.js
index b8fb3676806c..34d0671446af 100644
--- a/js/src/jit-test/tests/ion/bug1148973-1.js
+++ b/js/src/jit-test/tests/ion/bug1148973-1.js
@@ -8,7 +8,11 @@ try {
         }
     }(), function() {}))
 } catch (e) {};
+var log = "";
+evaluate(`
 try {
     function x() {}
     assertEq(String(b), "function () {}");
-} catch (e) { throw (e); }
+} catch (e) { log += "e"; }
+`);
+assertEq(log, "e");
diff --git a/js/src/tests/ecma_5/extensions/function-definition-with.js b/js/src/tests/ecma_5/extensions/function-definition-with.js
index df0ab9e0bd74..2277ad45fc36 100644
--- a/js/src/tests/ecma_5/extensions/function-definition-with.js
+++ b/js/src/tests/ecma_5/extensions/function-definition-with.js
@@ -19,8 +19,9 @@ var called, obj;
 function inFile1() { return "in file"; }
 called = false;
 obj = { set inFile1(v) { called = true; } };
-with (obj)
+with (obj) {
   function inFile1() { return "in file in with"; };
+}
 assertEq(inFile1(), "in file in with");
 assertEq("set" in Object.getOwnPropertyDescriptor(obj, "inFile1"), true);
 assertEq(called, false);
@@ -28,8 +29,9 @@ assertEq(called, false);
 evaluate("function notInFile1() { return 'not in file'; }");
 called = false;
 obj = { set notInFile1(v) { called = true; return "not in file 2"; } };
-with (obj)
+with (obj) {
   function notInFile1() { return "not in file in with"; };
+}
 assertEq(notInFile1(), "not in file in with");
 assertEq("set" in Object.getOwnPropertyDescriptor(obj, "notInFile1"), true);
 assertEq(called, false);
@@ -39,8 +41,9 @@ called = false;
 obj =
   Object.defineProperty({}, "inFile2",
                         { value: 42, configurable: false, enumerable: false });
-with (obj)
+with (obj) {
   function inFile2() { return "in file 2"; };
+}
 assertEq(inFile2(), "in file 2");
 assertEq(obj.inFile2, 42);
 
diff --git a/js/src/tests/ecma_5/extensions/strict-function-statements.js b/js/src/tests/ecma_5/extensions/strict-function-statements.js
index 95b872faf62c..e6dc1513948b 100644
--- a/js/src/tests/ecma_5/extensions/strict-function-statements.js
+++ b/js/src/tests/ecma_5/extensions/strict-function-statements.js
@@ -9,46 +9,41 @@ assertEq(testLenientAndStrict("function f() { }",
                               parsesSuccessfully),
          true);
 
-// Function statements within blocks are forbidden in strict mode code.
-assertEq(testLenientAndStrict("{ function f() { } }",
-                              parsesSuccessfully,
-                              parseRaisesException(SyntaxError)),
-         true);
-
 // Lambdas are always permitted within blocks.
 assertEq(testLenientAndStrict("{ (function f() { }) }",
                               parsesSuccessfully,
                               parsesSuccessfully),
          true);
 
-// Function statements within any sort of statement are forbidden in strict mode code.
+// Function statements within unbraced blocks are forbidden in strict mode code.
+// They are allowed only under if statements in sloppy mode.
 assertEq(testLenientAndStrict("if (true) function f() { }",
                               parsesSuccessfully,
                               parseRaisesException(SyntaxError)),
          true);
 assertEq(testLenientAndStrict("while (true) function f() { }",
-                              parsesSuccessfully,
+                              parseRaisesException(SyntaxError),
                               parseRaisesException(SyntaxError)),
          true);
 assertEq(testLenientAndStrict("do function f() { } while (true);",
-                              parsesSuccessfully,
+                              parseRaisesException(SyntaxError),
                               parseRaisesException(SyntaxError)),
          true);
 assertEq(testLenientAndStrict("for(;;) function f() { }",
-                              parsesSuccessfully,
+                              parseRaisesException(SyntaxError),
                               parseRaisesException(SyntaxError)),
          true);
 assertEq(testLenientAndStrict("for(x in []) function f() { }",
-                              parsesSuccessfully,
+                              parseRaisesException(SyntaxError),
                               parseRaisesException(SyntaxError)),
          true);
 assertEq(testLenientAndStrict("with(o) function f() { }",
-                              parsesSuccessfully,
+                              parseRaisesException(SyntaxError),
                               parseRaisesException(SyntaxError)),
          true);
 assertEq(testLenientAndStrict("switch(1) { case 1: function f() { } }",
                               parsesSuccessfully,
-                              parseRaisesException(SyntaxError)),
+                              parsesSuccessfully),
          true);
 assertEq(testLenientAndStrict("x: function f() { }",
                               parsesSuccessfully,
@@ -56,7 +51,7 @@ assertEq(testLenientAndStrict("x: function f() { }",
          true);
 assertEq(testLenientAndStrict("try { function f() { } } catch (x) { }",
                               parsesSuccessfully,
-                              parseRaisesException(SyntaxError)),
+                              parsesSuccessfully),
          true);
 
 // Lambdas are always permitted within any sort of statement.
@@ -69,7 +64,7 @@ assertEq(testLenientAndStrict("if (true) (function f() { })",
 assertEq(parsesSuccessfully("function f() { function g() { } }"),
          true);
 
-// Function statements are permitted in any statement within lenient functions.
+// Function statements are permitted in if statement within lenient functions.
 assertEq(parsesSuccessfully("function f() { if (true) function g() { } }"),
          true);
 
@@ -77,8 +72,7 @@ assertEq(parseRaisesException(SyntaxError)
          ("function f() { 'use strict'; if (true) function g() { } }"),
          true);
 
-assertEq(parseRaisesException(SyntaxError)
-         ("function f() { 'use strict'; { function g() { } } }"),
+assertEq(parsesSuccessfully("function f() { 'use strict'; { function g() { } } }"),
          true);
 
 assertEq(parsesSuccessfully("function f() { 'use strict'; if (true) (function g() { }) }"),
@@ -94,7 +88,7 @@ assertEq(testLenientAndStrict("function f() { }",
          true);
 assertEq(testLenientAndStrict("{ function f() { } }",
                               completesNormally,
-                              raisesException(SyntaxError)),
+                              completesNormally),
          true);
 
 reportCompare(true, true);
diff --git a/js/src/tests/ecma_6/extensions/for-loop-with-lexical-declaration-and-nested-function-statement.js b/js/src/tests/ecma_6/extensions/for-loop-with-lexical-declaration-and-nested-function-statement.js
index ea2494bdab91..9f6fd6467c0d 100644
--- a/js/src/tests/ecma_6/extensions/for-loop-with-lexical-declaration-and-nested-function-statement.js
+++ b/js/src/tests/ecma_6/extensions/for-loop-with-lexical-declaration-and-nested-function-statement.js
@@ -18,26 +18,30 @@ print(BUGNUMBER + ": " + summary);
  * BEGIN TEST *
  **************/
 
-for (let x = 0; x < 9; ++x)
+for (let x = 0; x < 9; ++x) {
   function q1() {}
+}
 
 {
-  for (let x = 0; x < 9; ++x)
+  for (let x = 0; x < 9; ++x) {
     function q2() {}
+  }
 }
 
 function f1()
 {
-  for (let x = 0; x < 9; ++x)
+  for (let x = 0; x < 9; ++x) {
     function q3() {}
+  }
 }
 f1();
 
 function f2()
 {
   {
-    for (let x = 0; x < 9; ++x)
+    for (let x = 0; x < 9; ++x) {
       function q4() {}
+    }
   }
 }
 f2();
diff --git a/js/src/tests/js1_5/Regress/regress-326453.js b/js/src/tests/js1_5/Regress/regress-326453.js
deleted file mode 100644
index c9e39f9d6cbc..000000000000
--- a/js/src/tests/js1_5/Regress/regress-326453.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/
- * Contributor: Blake Kaplan
- */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 326453;
-var summary = 'Do not assert: while decompiling';
-var actual = 'No Crash';
-var expect = 'No Crash';
-
-printBugNumber(BUGNUMBER);
-printStatus (summary);
-
-function f() { with({})function g() { }; printStatus(); }
-
-printStatus(f.toString());
-
-reportCompare(expect, actual, summary);
diff --git a/js/src/tests/js1_5/extensions/regress-245795.js b/js/src/tests/js1_5/extensions/regress-245795.js
index af77f5419222..a823fc2f6082 100644
--- a/js/src/tests/js1_5/extensions/regress-245795.js
+++ b/js/src/tests/js1_5/extensions/regress-245795.js
@@ -12,23 +12,20 @@ var expect = '';
 printBugNumber(BUGNUMBER);
 printStatus (summary);
 
-if (typeof uneval != 'undefined')
+function a()
 {
-  function a()
-  {
-    b = function() {};
-  }
-
-  var r = "function a() { b = function() {}; }";
-  eval(uneval(a));
-
-  var v = a.toString().replace(/[ \n]+/g, ' ');
-  print(v)
- 
-  printStatus("[" + v + "]");
-
-  expect = r;
-  actual = v;
-
-  reportCompare(expect, actual, summary);
+  b = function() {};
 }
+
+var r = "function a() { b = function() {}; }";
+eval(uneval(a));
+
+var v = a.toString().replace(/[ \n]+/g, ' ');
+print(v)
+
+printStatus("[" + v + "]");
+
+expect = r;
+actual = v;
+
+reportCompare(expect, actual, summary);
diff --git a/js/src/tests/js1_5/extensions/regress-406572.js b/js/src/tests/js1_5/extensions/regress-406572.js
index e93448c8d1a3..4911d05bc7b7 100644
--- a/js/src/tests/js1_5/extensions/regress-406572.js
+++ b/js/src/tests/js1_5/extensions/regress-406572.js
@@ -22,12 +22,14 @@ if (typeof window != 'undefined')
     window = 1;
     reportCompare(windowString, String(window), "window should be readonly");
 
-    actual = ""; // We should reach this line, and throw an exception after it
-
     if (1)
       function window() { return 1; }
 
-    actual = "FAIL: this line should never be reached";
+    // We should reach this line without throwing. Annex B means the
+    // block-scoped function above gets an assignment to 'window' in the
+    // nearest 'var' environment, but since 'window' is read-only, the
+    // assignment silently fails.
+    actual = "";
 
     // The test harness might rely on window having its original value:
     // restore it.
diff --git a/js/src/tests/js1_8_5/reflect-parse/declarations.js b/js/src/tests/js1_8_5/reflect-parse/declarations.js
index 86f524fd394f..480f58777bec 100644
--- a/js/src/tests/js1_8_5/reflect-parse/declarations.js
+++ b/js/src/tests/js1_8_5/reflect-parse/declarations.js
@@ -4,7 +4,7 @@ function test() {
 // Bug 632056: constant-folding
 program([exprStmt(ident("f")),
          ifStmt(lit(1),
-                funDecl(ident("f"), [], blockStmt([])),
+                blockStmt([funDecl(ident("f"), [], blockStmt([]))]),
                 null)]).assert(Reflect.parse("f; if (1) function f(){}"));
 // declarations
 
@@ -86,4 +86,12 @@ assertProg("f.p = 1; var f; f.p; function f(){}",
             funDecl(ident("f"), [], blockStmt([]))]);
 }
 
+assertBlockStmt("{ function f(x) {} }",
+                blockStmt([funDecl(ident("f"), [ident("x")], blockStmt([]))]));
+
+// Annex B semantics should not change parse tree.
+assertBlockStmt("{ let f; { function f(x) {} } }",
+                blockStmt([letDecl([{ id: ident("f"), init: null }]),
+                           blockStmt([funDecl(ident("f"), [ident("x")], blockStmt([]))])]));
+
 runtest(test);

From 394e48b09b9b2746fa4a1714bc8b54b146d9febf Mon Sep 17 00:00:00 2001
From: Shu-yu Guo <shu@rfrn.org>
Date: Fri, 18 Dec 2015 13:18:19 -0800
Subject: [PATCH 070/101] Bug 1071646 - Support labelled function declarations
 in sloppy mode per Annex B.3.2. (r=jorendorff)

---
 js/src/frontend/BytecodeEmitter.cpp  |  51 ++++++++---
 js/src/frontend/BytecodeEmitter.h    |   5 +-
 js/src/frontend/FullParseHandler.h   |  26 +++++-
 js/src/frontend/Parser.cpp           | 125 ++++++++++++++++++---------
 js/src/frontend/Parser.h             |  32 ++++---
 js/src/frontend/SharedContext.h      |   6 ++
 js/src/frontend/SyntaxParseHandler.h |   1 +
 js/src/js.msg                        |   3 +
 js/src/vm/Xdr.h                      |   4 +-
 9 files changed, 186 insertions(+), 67 deletions(-)

diff --git a/js/src/frontend/BytecodeEmitter.cpp b/js/src/frontend/BytecodeEmitter.cpp
index 18b11c0dfcc7..67ac01217a2b 100644
--- a/js/src/frontend/BytecodeEmitter.cpp
+++ b/js/src/frontend/BytecodeEmitter.cpp
@@ -1372,20 +1372,20 @@ BytecodeEmitter::emitVarIncDec(ParseNode* pn)
 }
 
 bool
-BytecodeEmitter::atBodyLevel() const
+BytecodeEmitter::atBodyLevel(StmtInfoBCE* stmt) const
 {
     // 'eval' and non-syntactic scripts are always under an invisible lexical
     // scope, but since it is not syntactic, it should still be considered at
     // body level.
     if (sc->staticScope()->is<StaticEvalObject>()) {
-        bool bl = !innermostStmt()->enclosing;
-        MOZ_ASSERT_IF(bl, innermostStmt()->type == StmtType::BLOCK);
-        MOZ_ASSERT_IF(bl, innermostStmt()->staticScope
-                                         ->as<StaticBlockObject>()
-                                         .enclosingStaticScope() == sc->staticScope());
+        bool bl = !stmt->enclosing;
+        MOZ_ASSERT_IF(bl, stmt->type == StmtType::BLOCK);
+        MOZ_ASSERT_IF(bl, stmt->staticScope
+                              ->as<StaticBlockObject>()
+                              .enclosingStaticScope() == sc->staticScope());
         return bl;
     }
-    return !innermostStmt() || sc->isModuleBox();
+    return !stmt || sc->isModuleBox();
 }
 
 uint32_t
@@ -3098,11 +3098,23 @@ BytecodeEmitter::emitSwitch(ParseNode* pn)
         if (!enterBlockScope(&stmtInfo, cases->pn_objbox, JSOP_UNINITIALIZED, 0))
             return false;
 
-        stmtInfo.type = StmtType::SWITCH;
-        stmtInfo.update = top = offset();
-
         // Advance |cases| to refer to the switch case list.
         cases = cases->expr();
+
+        // A switch statement may contain hoisted functions inside its
+        // cases. The PNX_FUNCDEFS flag is propagated from the STATEMENTLIST
+        // bodies of the cases to the case list.
+        if (cases->pn_xflags & PNX_FUNCDEFS) {
+            for (ParseNode* caseNode = cases->pn_head; caseNode; caseNode = caseNode->pn_next) {
+                if (caseNode->pn_right->pn_xflags & PNX_FUNCDEFS) {
+                    if (!emitHoistedFunctionsInList(caseNode->pn_right))
+                        return false;
+                }
+            }
+        }
+
+        stmtInfo.type = StmtType::SWITCH;
+        stmtInfo.update = top = offset();
     } else {
         MOZ_ASSERT(cases->isKind(PNK_STATEMENTLIST));
         top = offset();
@@ -5336,6 +5348,11 @@ BytecodeEmitter::emitHoistedFunctionsInList(ParseNode* list)
     MOZ_ASSERT(list->pn_xflags & PNX_FUNCDEFS);
 
     for (ParseNode* pn = list->pn_head; pn; pn = pn->pn_next) {
+        if (!sc->strict()) {
+            while (pn->isKind(PNK_LABEL))
+                pn = pn->as<LabeledStatement>().statement();
+        }
+
         if (pn->isKind(PNK_ANNEXB_FUNCTION) ||
             (pn->isKind(PNK_FUNCTION) && pn->functionIsHoisted()))
         {
@@ -6370,7 +6387,18 @@ BytecodeEmitter::emitFunction(ParseNode* pn, bool needsProto)
      * For modules, we record the function and instantiate the binding during
      * ModuleDeclarationInstantiation(), before the script is run.
      */
-    if (!atBodyLevel()) {
+
+    // Check for functions that were parsed under labeled statements per ES6
+    // Annex B.3.2.
+    bool blockScopedFunction = !atBodyLevel();
+    if (!sc->strict() && blockScopedFunction) {
+        StmtInfoBCE* stmt = innermostStmt();
+        while (stmt && stmt->type == StmtType::LABEL)
+            stmt = stmt->enclosing;
+        blockScopedFunction = !atBodyLevel(stmt);
+    }
+
+    if (blockScopedFunction) {
         if (!emitIndexOp(JSOP_LAMBDA, index))
             return false;
         MOZ_ASSERT(pn->getOp() == JSOP_INITLEXICAL);
@@ -6381,7 +6409,6 @@ BytecodeEmitter::emitFunction(ParseNode* pn, bool needsProto)
     } else if (sc->isGlobalContext()) {
         MOZ_ASSERT(pn->pn_scopecoord.isFree());
         MOZ_ASSERT(pn->getOp() == JSOP_NOP);
-        MOZ_ASSERT(atBodyLevel());
         switchToPrologue();
         if (!emitIndex32(JSOP_DEFFUN, index))
             return false;
diff --git a/js/src/frontend/BytecodeEmitter.h b/js/src/frontend/BytecodeEmitter.h
index ae6f7491b67e..5b4d65b85653 100644
--- a/js/src/frontend/BytecodeEmitter.h
+++ b/js/src/frontend/BytecodeEmitter.h
@@ -249,7 +249,10 @@ struct BytecodeEmitter
         return parser->blockScopes[dn->pn_blockid];
     }
 
-    bool atBodyLevel() const;
+    bool atBodyLevel(StmtInfoBCE* stmt) const;
+    bool atBodyLevel() const {
+        return atBodyLevel(innermostStmt());
+    }
     uint32_t computeHops(ParseNode* pn, BytecodeEmitter** bceOfDefOut);
     bool isAliasedName(BytecodeEmitter* bceOfDef, ParseNode* pn);
     bool computeDefinitionIsAliased(BytecodeEmitter* bceOfDef, Definition* dn, JSOp* op);
diff --git a/js/src/frontend/FullParseHandler.h b/js/src/frontend/FullParseHandler.h
index 4368f6dd0a1b..fd5590079796 100644
--- a/js/src/frontend/FullParseHandler.h
+++ b/js/src/frontend/FullParseHandler.h
@@ -444,18 +444,40 @@ class FullParseHandler
         return pn;
     }
 
+    template <typename PC>
+    bool isFunctionStmt(ParseNode* stmt, PC* pc) {
+        if (!pc->sc->strict()) {
+            while (stmt->isKind(PNK_LABEL))
+                stmt = stmt->as<LabeledStatement>().statement();
+        }
+
+        return stmt->isKind(PNK_FUNCTION) || stmt->isKind(PNK_ANNEXB_FUNCTION);
+    }
+
     template <typename PC>
     void addStatementToList(ParseNode* list, ParseNode* stmt, PC* pc) {
         MOZ_ASSERT(list->isKind(PNK_STATEMENTLIST));
 
-        if (stmt->isKind(PNK_FUNCTION) || stmt->isKind(PNK_ANNEXB_FUNCTION)) {
+        list->append(stmt);
+
+        if (isFunctionStmt(stmt, pc)) {
             // PNX_FUNCDEFS notifies the emitter that the block contains
             // body-level function definitions that should be processed
             // before the rest of nodes.
             list->pn_xflags |= PNX_FUNCDEFS;
         }
+    }
 
-        list->append(stmt);
+    template <typename PC>
+    void addCaseStatementToList(ParseNode* list, ParseNode* casepn, PC* pc) {
+        MOZ_ASSERT(list->isKind(PNK_STATEMENTLIST));
+        MOZ_ASSERT(casepn->isKind(PNK_CASE));
+        MOZ_ASSERT(casepn->pn_right->isKind(PNK_STATEMENTLIST));
+
+        list->append(casepn);
+
+        if (casepn->pn_right->pn_xflags & PNX_FUNCDEFS)
+            list->pn_xflags |= PNX_FUNCDEFS;
     }
 
     bool prependInitialYield(ParseNode* stmtList, ParseNode* genName) {
diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp
index 40aa9096fbd6..096b69ed66d2 100644
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -2330,7 +2330,30 @@ Parser<FullParseHandler>::checkFunctionDefinition(HandlePropertyName funName,
         MOZ_ASSERT(assignmentForAnnexBOut);
         *assignmentForAnnexBOut = nullptr;
 
-        if (pc->atBodyLevel()) {
+        // In sloppy mode, ES6 Annex B.3.2 allows labelled function
+        // declarations. Otherwise it is a parse error.
+        bool bodyLevelFunction = pc->atBodyLevel();
+        if (!bodyLevelFunction) {
+            StmtInfoPC* stmt = pc->innermostStmt();
+            if (stmt->type == StmtType::LABEL) {
+                if (pc->sc->strict()) {
+                    report(ParseError, false, null(), JSMSG_FUNCTION_LABEL);
+                    return false;
+                }
+
+                stmt = pc->innermostNonLabelStmt();
+                // A switch statement is always braced, so it's okay to label
+                // functions in sloppy mode under switch.
+                if (stmt && stmt->type != StmtType::BLOCK && stmt->type != StmtType::SWITCH) {
+                    report(ParseError, false, null(), JSMSG_SLOPPY_FUNCTION_LABEL);
+                    return false;
+                }
+
+                bodyLevelFunction = pc->atBodyLevel(stmt);
+            }
+        }
+
+        if (bodyLevelFunction) {
             if (!bindBodyLevelFunctionName(funName, pn_))
                 return false;
         } else {
@@ -2338,11 +2361,11 @@ Parser<FullParseHandler>::checkFunctionDefinition(HandlePropertyName funName,
             Node synthesizedDeclarationList = null();
 
             if (!pc->sc->strict()) {
-                // Under non-strict mode, try Annex B.3.3 semantics. If making
-                // an additional 'var' binding of the same name does not throw
-                // an early error, do so. This 'var' binding would be assigned
-                // the function object in situ, e.g., when its declaration is
-                // reached, not at the start of the block.
+                // Under non-strict mode, try ES6 Annex B.3.3 semantics. If
+                // making an additional 'var' binding of the same name does
+                // not throw an early error, do so. This 'var' binding would
+                // be assigned the function object in situ, e.g., when its
+                // declaration is reached, not at the start of the block.
 
                 annexDef = pc->decls().lookupFirst(funName);
                 if (annexDef) {
@@ -3113,16 +3136,16 @@ Parser<ParseHandler>::functionStmt(YieldHandling yieldHandling, DefaultHandling
     Maybe<AutoPushStmtInfoPC> synthesizedStmtInfoForAnnexB;
     Node synthesizedBlockForAnnexB = null();
     StmtInfoPC *stmt = pc->innermostStmt();
-    if (!pc->sc->strict() && stmt &&
-        (stmt->type == StmtType::IF || stmt->type == StmtType::ELSE))
-    {
-        if (!abortIfSyntaxParser())
-            return null();
+    if (!pc->sc->strict() && stmt) {
+        if (stmt->type == StmtType::IF || stmt->type == StmtType::ELSE) {
+            if (!abortIfSyntaxParser())
+                return null();
 
-        synthesizedStmtInfoForAnnexB.emplace(*this, StmtType::BLOCK);
-        synthesizedBlockForAnnexB = pushLexicalScope(*synthesizedStmtInfoForAnnexB);
-        if (!synthesizedBlockForAnnexB)
-            return null();
+            synthesizedStmtInfoForAnnexB.emplace(*this, StmtType::BLOCK);
+            synthesizedBlockForAnnexB = pushLexicalScope(*synthesizedStmtInfoForAnnexB);
+            if (!synthesizedBlockForAnnexB)
+                return null();
+        }
     }
 
     RootedPropertyName name(context);
@@ -4554,28 +4577,45 @@ Parser<ParseHandler>::variables(YieldHandling yieldHandling,
 
 template <>
 bool
-Parser<FullParseHandler>::checkAndPrepareLexical(bool isConst, const TokenPos& errorPos)
+Parser<FullParseHandler>::checkAndPrepareLexical(PrepareLexicalKind prepareWhat,
+                                                 const TokenPos& errorPos)
 {
     /*
-     * This is a lexical declaration. We must be directly under a block, but
-     * not an implicit block created due to 'for (let ...)'. If we pass this
-     * error test, make the enclosing StmtInfoPC be our scope. Further let
-     * declarations in this block will find this scope statement and use the
-     * same block object.
+     * This is a lexical declaration. We must be directly under a block for
+     * 'let' and 'const' declarations. If we pass this error test, make the
+     * enclosing StmtInfoPC be our scope. Further let declarations in this
+     * block will find this scope statement and use the same block object.
+     *
+     * Function declarations behave like 'let', except that they are allowed
+     * per ES6 Annex B.3.2 to be labeled, unlike plain 'let' and 'const'
+     * declarations.
      *
      * If we are the first let declaration in this block (i.e., when the
      * enclosing maybe-scope StmtInfoPC isn't yet a scope statement) then
      * we also need to set pc->blockNode to be our PNK_LEXICALSCOPE.
      */
-    StmtInfoPC* stmt = pc->innermostStmt();
+
+    // ES6 Annex B.3.2 does not apply in strict mode, and labeled functions in
+    // strict mode should have been rejected by checkFunctionDefinition.
+    MOZ_ASSERT_IF(pc->innermostStmt() &&
+                  pc->innermostStmt()->type == StmtType::LABEL &&
+                  prepareWhat == PrepareFunction,
+                  !pc->sc->strict());
+
+    StmtInfoPC* stmt = prepareWhat == PrepareFunction
+                       ? pc->innermostNonLabelStmt()
+                       : pc->innermostStmt();
     if (stmt && (!stmt->maybeScope() || stmt->isForLetBlock)) {
-        reportWithOffset(ParseError, false, errorPos.begin, JSMSG_LEXICAL_DECL_NOT_IN_BLOCK,
-                         isConst ? "const" : "lexical");
+        reportWithOffset(ParseError, false, errorPos.begin,
+                         stmt->type == StmtType::LABEL
+                         ? JSMSG_LEXICAL_DECL_LABEL
+                         : JSMSG_LEXICAL_DECL_NOT_IN_BLOCK,
+                         prepareWhat == PrepareConst ? "const" : "lexical");
         return false;
     }
 
     if (!stmt) {
-        MOZ_ASSERT(pc->atBodyLevel());
+        MOZ_ASSERT_IF(prepareWhat != PrepareFunction, pc->atBodyLevel());
 
         /*
          * Self-hosted code must be usable against *any* global object,
@@ -4586,7 +4626,7 @@ Parser<FullParseHandler>::checkAndPrepareLexical(bool isConst, const TokenPos& e
         bool isGlobal = !pc->sc->isFunctionBox() && stmt == pc->innermostScopeStmt();
         if (options().selfHostingMode && isGlobal) {
             report(ParseError, false, null(), JSMSG_SELFHOSTED_TOP_LEVEL_LEXICAL,
-                   isConst ? "'const'" : "'let'");
+                   prepareWhat == PrepareConst ? "'const'" : "'let'");
             return false;
         }
         return true;
@@ -4612,8 +4652,12 @@ Parser<FullParseHandler>::checkAndPrepareLexical(bool isConst, const TokenPos& e
          * catch block (catch is a lexical scope by definition).
          */
         MOZ_ASSERT(stmt->canBeBlockScope() && stmt->type != StmtType::CATCH);
-
-        pc->stmtStack.makeInnermostLexicalScope(*blockObj);
+        if (prepareWhat == PrepareFunction) {
+            stmt->isBlockScope = true;
+            pc->stmtStack.linkAsInnermostScopeStmt(stmt, *blockObj);
+        } else {
+            pc->stmtStack.makeInnermostLexicalScope(*blockObj);
+        }
         MOZ_ASSERT(!blockScopes[stmt->blockid]);
         blockScopes[stmt->blockid].set(blockObj);
 
@@ -4645,21 +4689,22 @@ CurrentLexicalStaticBlock(ParseContext<FullParseHandler>* pc)
 template <>
 bool
 Parser<FullParseHandler>::prepareAndBindInitializedLexicalWithNode(HandlePropertyName name,
-                                                                   bool isConst,
+                                                                   PrepareLexicalKind prepareWhat,
                                                                    ParseNode* pn,
                                                                    const TokenPos& pos)
 {
     BindData<FullParseHandler> data(context);
-    if (!checkAndPrepareLexical(isConst, pos))
+    if (!checkAndPrepareLexical(prepareWhat, pos))
         return false;
-    data.initLexical(HoistVars, isConst ? JSOP_DEFCONST : JSOP_DEFLET,
+    data.initLexical(HoistVars, prepareWhat == PrepareConst ? JSOP_DEFCONST : JSOP_DEFLET,
                      CurrentLexicalStaticBlock(pc), JSMSG_TOO_MANY_LOCALS);
     return bindInitialized(&data, name, pn);
 }
 
 template <>
 ParseNode*
-Parser<FullParseHandler>::makeInitializedLexicalBinding(HandlePropertyName name, bool isConst,
+Parser<FullParseHandler>::makeInitializedLexicalBinding(HandlePropertyName name,
+                                                        PrepareLexicalKind prepareWhat,
                                                         const TokenPos& pos)
 {
     ParseNode* dn = newBindingNode(name, false);
@@ -4667,7 +4712,7 @@ Parser<FullParseHandler>::makeInitializedLexicalBinding(HandlePropertyName name,
         return null();
     handler.setPosition(dn, pos);
 
-    if (!prepareAndBindInitializedLexicalWithNode(name, isConst, dn, pos))
+    if (!prepareAndBindInitializedLexicalWithNode(name, prepareWhat, dn, pos))
         return null();
 
     return dn;
@@ -4680,7 +4725,7 @@ Parser<FullParseHandler>::bindLexicalFunctionName(HandlePropertyName funName,
 {
     MOZ_ASSERT(!pc->atBodyLevel());
     pn->pn_blockid = pc->blockid();
-    return prepareAndBindInitializedLexicalWithNode(funName, /* isConst = */ false, pn, pos());
+    return prepareAndBindInitializedLexicalWithNode(funName, PrepareFunction, pn, pos());
 }
 
 template <>
@@ -4689,7 +4734,7 @@ Parser<FullParseHandler>::lexicalDeclaration(YieldHandling yieldHandling, bool i
 {
     handler.disableSyntaxParser();
 
-    if (!checkAndPrepareLexical(isConst, pos()))
+    if (!checkAndPrepareLexical(isConst ? PrepareConst : PrepareLet, pos()))
         return null();
 
     /*
@@ -5218,7 +5263,7 @@ Parser<FullParseHandler>::exportDeclaration()
           default:
             tokenStream.ungetToken();
             RootedPropertyName name(context, context->names().starDefaultStar);
-            binding = makeInitializedLexicalBinding(name, true, pos());
+            binding = makeInitializedLexicalBinding(name, PrepareConst, pos());
             if (!binding)
                 return null();
             kid = assignExpr(InAllowed, YieldIsKeyword, TripledotProhibited);
@@ -5967,7 +6012,7 @@ Parser<ParseHandler>::switchStatement(YieldHandling yieldHandling)
                     afterReturn = true;
                 }
             }
-            handler.addList(body, stmt);
+            handler.addStatementToList(body, stmt, pc);
         }
 
         // In ES6, lexical bindings cannot be accessed until initialized. If
@@ -5986,7 +6031,7 @@ Parser<ParseHandler>::switchStatement(YieldHandling yieldHandling)
         Node casepn = handler.newCaseOrDefault(caseBegin, caseExpr, body);
         if (!casepn)
             return null();
-        handler.addList(caseList, casepn);
+        handler.addCaseStatementToList(caseList, casepn, pc);
     }
 
     /*
@@ -6813,7 +6858,7 @@ Parser<FullParseHandler>::classDefinition(YieldHandling yieldHandling,
     ParseNode* nameNode = null();
     ParseNode* methodsOrBlock = classMethods;
     if (name) {
-        ParseNode* innerBinding = makeInitializedLexicalBinding(name, true, namePos);
+        ParseNode* innerBinding = makeInitializedLexicalBinding(name, PrepareConst, namePos);
         if (!innerBinding)
             return null();
 
@@ -6824,7 +6869,7 @@ Parser<FullParseHandler>::classDefinition(YieldHandling yieldHandling,
 
         ParseNode* outerBinding = null();
         if (classContext == ClassStatement) {
-            outerBinding = makeInitializedLexicalBinding(name, false, namePos);
+            outerBinding = makeInitializedLexicalBinding(name, PrepareLet, namePos);
             if (!outerBinding)
                 return null();
         }
diff --git a/js/src/frontend/Parser.h b/js/src/frontend/Parser.h
index c9d9443f7fed..7a2effb284a7 100644
--- a/js/src/frontend/Parser.h
+++ b/js/src/frontend/Parser.h
@@ -289,6 +289,7 @@ struct MOZ_STACK_CLASS ParseContext : public GenericParseContext
 
     StmtInfoPC* innermostStmt() const { return stmtStack.innermost(); }
     StmtInfoPC* innermostScopeStmt() const { return stmtStack.innermostScopeStmt(); }
+    StmtInfoPC* innermostNonLabelStmt() const { return stmtStack.innermostNonLabel(); }
     JSObject* innermostStaticScope() const {
         if (StmtInfoPC* stmt = innermostScopeStmt())
             return stmt->staticScope;
@@ -302,19 +303,23 @@ struct MOZ_STACK_CLASS ParseContext : public GenericParseContext
     //   function f1() { function f2() { } }
     //   if (cond) { function f3() { if (cond) { function f4() { } } } }
     //
-    bool atBodyLevel() {
+    bool atBodyLevel(StmtInfoPC* stmt) {
         // 'eval' and non-syntactic scripts are always under an invisible
         // lexical scope, but since it is not syntactic, it should still be
         // considered at body level.
         if (sc->staticScope()->is<StaticEvalObject>()) {
-            bool bl = !innermostStmt()->enclosing;
-            MOZ_ASSERT_IF(bl, innermostStmt()->type == StmtType::BLOCK);
-            MOZ_ASSERT_IF(bl, innermostStmt()->staticScope
-                                             ->template as<StaticBlockObject>()
-                                             .enclosingStaticScope() == sc->staticScope());
+            bool bl = !stmt->enclosing;
+            MOZ_ASSERT_IF(bl, stmt->type == StmtType::BLOCK);
+            MOZ_ASSERT_IF(bl, stmt->staticScope
+                                  ->template as<StaticBlockObject>()
+                                  .enclosingStaticScope() == sc->staticScope());
             return bl;
         }
-        return !innermostStmt();
+        return !stmt;
+    }
+
+    bool atBodyLevel() {
+        return atBodyLevel(innermostStmt());
     }
 
     bool atGlobalLevel() {
@@ -842,10 +847,17 @@ class Parser : private JS::AutoGCRooter, public StrictModeGetter
 
     Node objectLiteral(YieldHandling yieldHandling);
 
-    bool checkAndPrepareLexical(bool isConst, const TokenPos& errorPos);
-    bool prepareAndBindInitializedLexicalWithNode(HandlePropertyName name, bool isConst,
+    enum PrepareLexicalKind {
+        PrepareLet,
+        PrepareConst,
+        PrepareFunction
+    };
+    bool checkAndPrepareLexical(PrepareLexicalKind prepareWhat, const TokenPos& errorPos);
+    bool prepareAndBindInitializedLexicalWithNode(HandlePropertyName name,
+                                                  PrepareLexicalKind prepareWhat,
                                                   ParseNode* pn, const TokenPos& pos);
-    Node makeInitializedLexicalBinding(HandlePropertyName name, bool isConst, const TokenPos& pos);
+    Node makeInitializedLexicalBinding(HandlePropertyName name, PrepareLexicalKind prepareWhat,
+                                       const TokenPos& pos);
 
     Node newBindingNode(PropertyName* name, bool functionScope, VarContext varContext = HoistVars);
 
diff --git a/js/src/frontend/SharedContext.h b/js/src/frontend/SharedContext.h
index 177e7edb4b9e..68028c0711cc 100644
--- a/js/src/frontend/SharedContext.h
+++ b/js/src/frontend/SharedContext.h
@@ -587,6 +587,12 @@ class MOZ_STACK_CLASS StmtInfoStack
 
     StmtInfo* innermost() const { return innermostStmt_; }
     StmtInfo* innermostScopeStmt() const { return innermostScopeStmt_; }
+    StmtInfo* innermostNonLabel() const {
+        StmtInfo* stmt = innermost();
+        while (stmt && stmt->type == StmtType::LABEL)
+            stmt = stmt->enclosing;
+        return stmt;
+    }
 
     void push(StmtInfo* stmt, StmtType type) {
         stmt->type = type;
diff --git a/js/src/frontend/SyntaxParseHandler.h b/js/src/frontend/SyntaxParseHandler.h
index 2aea01e46edb..0af35febb50c 100644
--- a/js/src/frontend/SyntaxParseHandler.h
+++ b/js/src/frontend/SyntaxParseHandler.h
@@ -290,6 +290,7 @@ class SyntaxParseHandler
 
     Node newStatementList(unsigned blockid, const TokenPos& pos) { return NodeGeneric; }
     void addStatementToList(Node list, Node stmt, ParseContext<SyntaxParseHandler>* pc) {}
+    void addCaseStatementToList(Node list, Node stmt, ParseContext<SyntaxParseHandler>* pc) {}
     bool prependInitialYield(Node stmtList, Node gen) { return true; }
     Node newEmptyStatement(const TokenPos& pos) { return NodeEmptyStatement; }
 
diff --git a/js/src/js.msg b/js/src/js.msg
index 7c2d7263a107..babcfff881cb 100644
--- a/js/src/js.msg
+++ b/js/src/js.msg
@@ -270,6 +270,9 @@ MSG_DEF(JSMSG_LABEL_NOT_FOUND,         0, JSEXN_SYNTAXERR, "label not found")
 MSG_DEF(JSMSG_LET_CLASS_BINDING,       0, JSEXN_SYNTAXERR, "'let' is not a valid name for a class")
 MSG_DEF(JSMSG_LET_COMP_BINDING,        0, JSEXN_SYNTAXERR, "'let' is not a valid name for a comprehension variable")
 MSG_DEF(JSMSG_LEXICAL_DECL_NOT_IN_BLOCK,   1, JSEXN_SYNTAXERR, "{0} declaration not directly within block")
+MSG_DEF(JSMSG_LEXICAL_DECL_LABEL,      1, JSEXN_SYNTAXERR, "{0} declarations cannot be labelled")
+MSG_DEF(JSMSG_FUNCTION_LABEL,          0, JSEXN_SYNTAXERR, "functions cannot be labelled")
+MSG_DEF(JSMSG_SLOPPY_FUNCTION_LABEL,   0, JSEXN_SYNTAXERR, "functions can only be labelled inside blocks")
 MSG_DEF(JSMSG_LINE_BREAK_AFTER_THROW,  0, JSEXN_SYNTAXERR, "no line break is allowed between 'throw' and its expression")
 MSG_DEF(JSMSG_MALFORMED_ESCAPE,        1, JSEXN_SYNTAXERR, "malformed {0} character escape sequence")
 MSG_DEF(JSMSG_MISSING_BINARY_DIGITS,   0, JSEXN_SYNTAXERR, "missing binary digits after '0b'")
diff --git a/js/src/vm/Xdr.h b/js/src/vm/Xdr.h
index 4e13c3d0a854..7779b70c7ef8 100644
--- a/js/src/vm/Xdr.h
+++ b/js/src/vm/Xdr.h
@@ -29,11 +29,11 @@ namespace js {
  *
  *  https://developer.mozilla.org/en-US/docs/SpiderMonkey/Internals/Bytecode
  */
-static const uint32_t XDR_BYTECODE_VERSION_SUBTRAHEND = 337;
+static const uint32_t XDR_BYTECODE_VERSION_SUBTRAHEND = 338;
 static const uint32_t XDR_BYTECODE_VERSION =
     uint32_t(0xb973c0de - XDR_BYTECODE_VERSION_SUBTRAHEND);
 
-static_assert(JSErr_Limit == 429,
+static_assert(JSErr_Limit == 432,
               "GREETINGS, POTENTIAL SUBTRAHEND INCREMENTER! If you added or "
               "removed MSG_DEFs from js.msg, you should increment "
               "XDR_BYTECODE_VERSION_SUBTRAHEND and update this assertion's "

From 93ebdae69bb73eddafe708251b536c73efe1f354 Mon Sep 17 00:00:00 2001
From: Shu-yu Guo <shu@rfrn.org>
Date: Fri, 18 Dec 2015 13:18:19 -0800
Subject: [PATCH 071/101] Bug 1071646 - Introduce JSOP_BINDVAR to support Annex
 B.3.3.3. (r=jorendorff)

---
 js/src/frontend/BytecodeEmitter.cpp | 36 +++++++++++++++++------------
 js/src/frontend/BytecodeEmitter.h   |  7 +++++-
 js/src/frontend/Parser.cpp          |  4 ++--
 js/src/vm/Interpreter.cpp           |  7 +++++-
 js/src/vm/Opcodes.h                 | 10 +++++++-
 5 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/js/src/frontend/BytecodeEmitter.cpp b/js/src/frontend/BytecodeEmitter.cpp
index 67ac01217a2b..b2fb9c1f636a 100644
--- a/js/src/frontend/BytecodeEmitter.cpp
+++ b/js/src/frontend/BytecodeEmitter.cpp
@@ -4413,7 +4413,7 @@ BytecodeEmitter::emitVariables(ParseNode* pn, VarEmitOption emitOption)
              * i' to be hoisted out of the loop.
              */
             MOZ_ASSERT(binding->isOp(JSOP_NOP));
-            MOZ_ASSERT(emitOption != DefineVars);
+            MOZ_ASSERT(emitOption != DefineVars && emitOption != AnnexB);
 
             /*
              * To allow the front end to rewrite var f = x; as f = x; when a
@@ -4474,13 +4474,18 @@ BytecodeEmitter::emitSingleVariable(ParseNode* pn, ParseNode* binding, ParseNode
             op == JSOP_STRICTSETGNAME)
         {
             MOZ_ASSERT(emitOption != PushInitialValues);
-            JSOp bindOp;
-            if (op == JSOP_SETNAME || op == JSOP_STRICTSETNAME)
-                bindOp = JSOP_BINDNAME;
-            else
-                bindOp = JSOP_BINDGNAME;
-            if (!emitIndex32(bindOp, atomIndex))
-                return false;
+            if (op == JSOP_SETGNAME || op == JSOP_STRICTSETGNAME) {
+                if (!emitIndex32(JSOP_BINDGNAME, atomIndex))
+                    return false;
+            } else if (emitOption == AnnexB) {
+                // Annex B vars always go on the nearest variable environment,
+                // even if scopes on the chain contain same-named bindings.
+                if (!emit1(JSOP_BINDVAR))
+                    return false;
+            } else {
+                if (!emitIndex32(JSOP_BINDNAME, atomIndex))
+                    return false;
+            }
         }
 
         bool oldEmittingForInit = emittingForInit;
@@ -4504,7 +4509,7 @@ BytecodeEmitter::emitSingleVariable(ParseNode* pn, ParseNode* binding, ParseNode
 
     // If we are not initializing, nothing to pop. If we are initializing
     // lets, we must emit the pops.
-    if (emitOption == InitializeVars) {
+    if (emitOption == InitializeVars || emitOption == AnnexB) {
         MOZ_ASSERT_IF(binding->isDefn(), initializer == binding->pn_expr);
         if (!binding->pn_scopecoord.isFree()) {
             if (!emitVarOp(binding, op))
@@ -6267,12 +6272,13 @@ BytecodeEmitter::emitFunction(ParseNode* pn, bool needsProto)
         // definitions are seen for the second time, we need to emit the
         // assignment that assigns the function to the outer 'var' binding.
         if (assignmentForAnnexB) {
-            if (!emitTree(assignmentForAnnexB))
-                return false;
-
-            // If we did not synthesize a new binding and only a simple
-            // assignment, manually pop the result.
-            if (assignmentForAnnexB->isKind(PNK_ASSIGN)) {
+            if (assignmentForAnnexB->isKind(PNK_VAR)) {
+                if (!emitVariables(assignmentForAnnexB, AnnexB))
+                    return false;
+            } else {
+                MOZ_ASSERT(assignmentForAnnexB->isKind(PNK_ASSIGN));
+                if (!emitTree(assignmentForAnnexB))
+                    return false;
                 if (!emit1(JSOP_POP))
                     return false;
             }
diff --git a/js/src/frontend/BytecodeEmitter.h b/js/src/frontend/BytecodeEmitter.h
index 5b4d65b85653..bf9e9b89bbcc 100644
--- a/js/src/frontend/BytecodeEmitter.h
+++ b/js/src/frontend/BytecodeEmitter.h
@@ -121,7 +121,12 @@ enum VarEmitOption {
     // Emit code to evaluate initializer expressions and leave those values on
     // the stack. This is used to implement `for (let/const ...;;)` and
     // deprecated `let` blocks.
-    PushInitialValues
+    PushInitialValues,
+
+    // Like InitializeVars, but bind using BINDVAR instead of
+    // BINDNAME/BINDGNAME. Only used for emitting declarations synthesized for
+    // Annex B block-scoped function semantics.
+    AnnexB,
 };
 
 struct BytecodeEmitter
diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp
index 096b69ed66d2..229eb103a50a 100644
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -2364,8 +2364,8 @@ Parser<FullParseHandler>::checkFunctionDefinition(HandlePropertyName funName,
                 // Under non-strict mode, try ES6 Annex B.3.3 semantics. If
                 // making an additional 'var' binding of the same name does
                 // not throw an early error, do so. This 'var' binding would
-                // be assigned the function object in situ, e.g., when its
-                // declaration is reached, not at the start of the block.
+                // be assigned the function object when its declaration is
+                // reached, not at the start of the block.
 
                 annexDef = pc->decls().lookupFirst(funName);
                 if (annexDef) {
diff --git a/js/src/vm/Interpreter.cpp b/js/src/vm/Interpreter.cpp
index 6427a559e20d..503d7fe69983 100644
--- a/js/src/vm/Interpreter.cpp
+++ b/js/src/vm/Interpreter.cpp
@@ -1768,7 +1768,6 @@ CASE(JSOP_UNUSED209)
 CASE(JSOP_UNUSED210)
 CASE(JSOP_UNUSED211)
 CASE(JSOP_UNUSED212)
-CASE(JSOP_UNUSED213)
 CASE(JSOP_UNUSED219)
 CASE(JSOP_UNUSED220)
 CASE(JSOP_UNUSED221)
@@ -2104,6 +2103,12 @@ CASE(JSOP_BINDNAME)
 }
 END_CASE(JSOP_BINDNAME)
 
+CASE(JSOP_BINDVAR)
+{
+    PUSH_OBJECT(REGS.fp()->varObj());
+}
+END_CASE(JSOP_BINDVAR)
+
 #define BITWISE_OP(OP)                                                        \
     JS_BEGIN_MACRO                                                            \
         int32_t i, j;                                                         \
diff --git a/js/src/vm/Opcodes.h b/js/src/vm/Opcodes.h
index 198543b87340..12e2944b1990 100644
--- a/js/src/vm/Opcodes.h
+++ b/js/src/vm/Opcodes.h
@@ -2052,7 +2052,15 @@
     macro(JSOP_UNUSED210,     210, "unused210",    NULL,  1,  0,  0,  JOF_BYTE) \
     macro(JSOP_UNUSED211,     211, "unused211",    NULL,  1,  0,  0,  JOF_BYTE) \
     macro(JSOP_UNUSED212,     212, "unused212",    NULL,  1,  0,  0,  JOF_BYTE) \
-    macro(JSOP_UNUSED213,     213, "unused213",    NULL,  1,  0,  0,  JOF_BYTE) \
+    /*
+     * Pushes the nearest 'var' environment.
+     *
+     *   Category: Variables and Scopes
+     *   Type: Free Variables
+     *   Operands:
+     *   Stack: => scope
+     */ \
+    macro(JSOP_BINDVAR,       213, "bindvar",      NULL,  1,  0,  1,  JOF_BYTE) \
     /*
      * Pushes the global scope onto the stack if the script doesn't have a
      * non-syntactic global scope.  Otherwise will act like JSOP_BINDNAME.

From 75e7eccf989915f3d393a750a44655316a95d7e1 Mon Sep 17 00:00:00 2001
From: Shu-yu Guo <shu@rfrn.org>
Date: Fri, 18 Dec 2015 13:18:19 -0800
Subject: [PATCH 072/101] Bug 1071646 - Cast ParseNode to Definition using
 as<T>. (r=jorendorff)

---
 js/src/frontend/BytecodeEmitter.cpp |  2 +-
 js/src/frontend/ParseNode.h         |  2 ++
 js/src/frontend/Parser.cpp          | 22 ++++++++++------------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/js/src/frontend/BytecodeEmitter.cpp b/js/src/frontend/BytecodeEmitter.cpp
index b2fb9c1f636a..3b49b8fe312a 100644
--- a/js/src/frontend/BytecodeEmitter.cpp
+++ b/js/src/frontend/BytecodeEmitter.cpp
@@ -1738,7 +1738,7 @@ BytecodeEmitter::bindNameToSlotHelper(ParseNode* pn)
         MOZ_ASSERT(dn->isDefn());
         pn->pn_dflags |= (dn->pn_dflags & PND_CONST);
     } else if (pn->isDefn()) {
-        dn = (Definition*) pn;
+        dn = &pn->as<Definition>();
     } else {
         return true;
     }
diff --git a/js/src/frontend/ParseNode.h b/js/src/frontend/ParseNode.h
index 61f6bf3a4281..ebbb1e699535 100644
--- a/js/src/frontend/ParseNode.h
+++ b/js/src/frontend/ParseNode.h
@@ -1612,6 +1612,8 @@ struct Definition : public ParseNode
         IMPORT
     };
 
+    static bool test(const ParseNode& pn) { return pn.isDefn(); }
+
     bool canHaveInitializer() { return int(kind()) <= int(ARG); }
 
     static const char* kindString(Kind kind);
diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp
index 229eb103a50a..746a24af9b30 100644
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -103,9 +103,7 @@ ParseContext<FullParseHandler>::checkLocalsOverflow(TokenStream& ts)
 static void
 MarkUsesAsHoistedLexical(ParseNode* pn)
 {
-    MOZ_ASSERT(pn->isDefn());
-
-    Definition* dn = (Definition*)pn;
+    Definition* dn = &pn->as<Definition>();
     ParseNode** pnup = &dn->dn_uses;
     ParseNode* pnu;
     unsigned start = pn->pn_blockid;
@@ -222,6 +220,8 @@ ParseContext<FullParseHandler>::define(TokenStream& ts,
     MOZ_ASSERT(!pn->isUsed());
     MOZ_ASSERT_IF(pn->isDefn(), pn->isPlaceholder());
 
+    pn->setDefn(true);
+
     Definition* prevDef = nullptr;
     if (kind == Definition::LET || kind == Definition::CONSTANT)
         prevDef = decls_.lookupFirst(name);
@@ -240,7 +240,7 @@ ParseContext<FullParseHandler>::define(TokenStream& ts,
         while ((pnu = *pnup) != nullptr && pnu->pn_blockid >= start) {
             MOZ_ASSERT(pnu->pn_blockid >= bodyid);
             MOZ_ASSERT(pnu->isUsed());
-            pnu->pn_lexdef = (Definition*) pn;
+            pnu->pn_lexdef = &pn->as<Definition>();
             pn->pn_dflags |= pnu->pn_dflags & PND_USE2DEF_FLAGS;
             pnup = &pnu->pn_link;
         }
@@ -258,12 +258,11 @@ ParseContext<FullParseHandler>::define(TokenStream& ts,
     }
 
     MOZ_ASSERT_IF(kind != Definition::LET && kind != Definition::CONSTANT, !lexdeps->lookup(name));
-    pn->setDefn(true);
     pn->pn_dflags &= ~PND_PLACEHOLDER;
     if (kind == Definition::CONSTANT)
         pn->pn_dflags |= PND_CONST;
 
-    Definition* dn = (Definition*)pn;
+    Definition* dn = &pn->as<Definition>();
     switch (kind) {
       case Definition::ARG:
         MOZ_ASSERT(sc->isFunctionBox());
@@ -393,7 +392,7 @@ ParseContext<ParseHandler>::updateDecl(TokenStream& ts, JSAtom* atom, Node pn)
     Definition* oldDecl = decls_.lookupFirst(atom);
 
     pn->setDefn(true);
-    Definition* newDecl = (Definition*)pn;
+    Definition* newDecl = &pn->template as<Definition>();
     decls_.updateFirst(atom, newDecl);
 
     if (sc->isGlobalContext() || oldDecl->isDeoptimized()) {
@@ -1393,7 +1392,7 @@ Parser<FullParseHandler>::makeDefIntoUse(Definition* dn, ParseNode* pn, HandleAt
     for (ParseNode* pnu = dn->dn_uses; pnu; pnu = pnu->pn_link) {
         MOZ_ASSERT(pnu->isUsed());
         MOZ_ASSERT(!pnu->isDefn());
-        pnu->pn_lexdef = (Definition*) pn;
+        pnu->pn_lexdef = &pn->as<Definition>();
         pn->pn_dflags |= pnu->pn_dflags & PND_USE2DEF_FLAGS;
     }
     pn->pn_dflags |= dn->pn_dflags & PND_USE2DEF_FLAGS;
@@ -1436,7 +1435,7 @@ Parser<FullParseHandler>::makeDefIntoUse(Definition* dn, ParseNode* pn, HandleAt
                 return false;
             pn->dn_uses = lhs;
             dn->pn_link = nullptr;
-            dn = (Definition*) lhs;
+            dn = &lhs->as<Definition>();
         }
     }
 
@@ -1447,7 +1446,7 @@ Parser<FullParseHandler>::makeDefIntoUse(Definition* dn, ParseNode* pn, HandleAt
     dn->setOp((CodeSpec[dn->getOp()].format & JOF_SET) ? JSOP_SETNAME : JSOP_GETNAME);
     dn->setDefn(false);
     dn->setUsed(true);
-    dn->pn_lexdef = (Definition*) pn;
+    dn->pn_lexdef = &pn->as<Definition>();
     dn->pn_scopecoord.makeFree();
     dn->pn_dflags &= ~PND_BOUND;
     return true;
@@ -2395,8 +2394,7 @@ Parser<FullParseHandler>::checkFunctionDefinition(HandlePropertyName funName,
                     if (!data.bind(funName, this))
                         return false;
 
-                    MOZ_ASSERT(varNode->isDefn());
-                    annexDef = static_cast<Definition*>(varNode);
+                    annexDef = &varNode->as<Definition>();
 
                     synthesizedDeclarationList = handler.newDeclarationList(PNK_VAR, JSOP_DEFVAR);
                     if (!synthesizedDeclarationList)

From 8d32f46a317dc31d6dd0639e1a65fd6ae11f7b3a Mon Sep 17 00:00:00 2001
From: Shu-yu Guo <shu@rfrn.org>
Date: Fri, 18 Dec 2015 13:18:20 -0800
Subject: [PATCH 073/101] Bug 1071646 - Support JSOP_BINDVAR in Baseline.
 (r=jandem)

---
 js/src/jit/BaselineCompiler.cpp | 20 ++++++++++++++++++++
 js/src/jit/BaselineCompiler.h   |  1 +
 js/src/jit/VMFunctions.cpp      | 27 ++++++++++++++-------------
 js/src/jit/VMFunctions.h        |  1 +
 4 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/js/src/jit/BaselineCompiler.cpp b/js/src/jit/BaselineCompiler.cpp
index be68916253bc..9bd70a46a097 100644
--- a/js/src/jit/BaselineCompiler.cpp
+++ b/js/src/jit/BaselineCompiler.cpp
@@ -2260,6 +2260,26 @@ BaselineCompiler::emit_JSOP_BINDGNAME()
     return emit_JSOP_BINDNAME();
 }
 
+typedef JSObject* (*BindVarFn)(JSContext*, HandleObject);
+static const VMFunction BindVarInfo = FunctionInfo<BindVarFn>(jit::BindVar);
+
+bool
+BaselineCompiler::emit_JSOP_BINDVAR()
+{
+    frame.syncStack(0);
+    masm.loadPtr(frame.addressOfScopeChain(), R0.scratchReg());
+
+    prepareVMCall();
+    pushArg(R0.scratchReg());
+
+    if (!callVM(BindVarInfo))
+        return false;
+
+    masm.tagValue(JSVAL_TYPE_OBJECT, ReturnReg, R0);
+    frame.push(R0);
+    return true;
+}
+
 bool
 BaselineCompiler::emit_JSOP_SETPROP()
 {
diff --git a/js/src/jit/BaselineCompiler.h b/js/src/jit/BaselineCompiler.h
index f1ef9e2d8d9a..e1938ec2baad 100644
--- a/js/src/jit/BaselineCompiler.h
+++ b/js/src/jit/BaselineCompiler.h
@@ -141,6 +141,7 @@ namespace jit {
     _(JSOP_DELNAME)            \
     _(JSOP_GETIMPORT)          \
     _(JSOP_GETINTRINSIC)       \
+    _(JSOP_BINDVAR)            \
     _(JSOP_DEFVAR)             \
     _(JSOP_DEFCONST)           \
     _(JSOP_DEFLET)             \
diff --git a/js/src/jit/VMFunctions.cpp b/js/src/jit/VMFunctions.cpp
index 831a709cf44a..c46a3b003099 100644
--- a/js/src/jit/VMFunctions.cpp
+++ b/js/src/jit/VMFunctions.cpp
@@ -161,14 +161,20 @@ CheckOverRecursedWithExtra(JSContext* cx, BaselineFrame* frame,
     return cx->runtime()->handleInterrupt(cx);
 }
 
+JSObject*
+BindVar(JSContext* cx, HandleObject scopeChain)
+{
+    JSObject* obj = scopeChain;
+    while (!obj->isQualifiedVarObj())
+        obj = obj->enclosingScope();
+    return obj;
+}
+
 bool
 DefVar(JSContext* cx, HandlePropertyName dn, unsigned attrs, HandleObject scopeChain)
 {
     // Given the ScopeChain, extract the VarObj.
-    RootedObject obj(cx, scopeChain);
-    while (!obj->isQualifiedVarObj())
-        obj = obj->enclosingScope();
-
+    RootedObject obj(cx, BindVar(cx, scopeChain));
     return DefVarOperation(cx, obj, dn, attrs);
 }
 
@@ -179,10 +185,7 @@ DefLexical(JSContext* cx, HandlePropertyName dn, unsigned attrs, HandleObject sc
     Rooted<ClonedBlockObject*> lexical(cx, &NearestEnclosingExtensibleLexicalScope(scopeChain));
 
     // Find the variables object.
-    RootedObject varObj(cx, scopeChain);
-    while (!varObj->isQualifiedVarObj())
-        varObj = varObj->enclosingScope();
-
+    RootedObject varObj(cx, BindVar(cx, scopeChain));
     return DefLexicalOperation(cx, lexical, varObj, dn, attrs);
 }
 
@@ -847,9 +850,8 @@ bool
 InitGlobalOrEvalScopeObjects(JSContext* cx, BaselineFrame* frame)
 {
     RootedScript script(cx, frame->script());
-    RootedObject varObj(cx, frame->scopeChain());
-    while (!varObj->isQualifiedVarObj())
-        varObj = varObj->enclosingScope();
+    RootedObject scopeChain(cx, frame->scopeChain());
+    RootedObject varObj(cx, BindVar(cx, scopeChain));
 
     if (script->isForEval()) {
         // Strict eval needs its own call object.
@@ -860,13 +862,12 @@ InitGlobalOrEvalScopeObjects(JSContext* cx, BaselineFrame* frame)
             if (!frame->initStrictEvalScopeObjects(cx))
                 return false;
         } else {
-            RootedObject scopeChain(cx, frame->scopeChain());
             if (!CheckEvalDeclarationConflicts(cx, script, scopeChain, varObj))
                 return false;
         }
     } else {
         Rooted<ClonedBlockObject*> lexicalScope(cx,
-            &NearestEnclosingExtensibleLexicalScope(frame->scopeChain()));
+            &NearestEnclosingExtensibleLexicalScope(scopeChain));
         if (!CheckGlobalDeclarationConflicts(cx, script, lexicalScope, varObj))
             return false;
     }
diff --git a/js/src/jit/VMFunctions.h b/js/src/jit/VMFunctions.h
index 2ea3f8aab950..67177905d205 100644
--- a/js/src/jit/VMFunctions.h
+++ b/js/src/jit/VMFunctions.h
@@ -588,6 +588,7 @@ bool CheckOverRecursed(JSContext* cx);
 bool CheckOverRecursedWithExtra(JSContext* cx, BaselineFrame* frame,
                                 uint32_t extra, uint32_t earlyCheck);
 
+JSObject* BindVar(JSContext* cx, HandleObject scopeChain);
 bool DefVar(JSContext* cx, HandlePropertyName dn, unsigned attrs, HandleObject scopeChain);
 bool DefLexical(JSContext* cx, HandlePropertyName dn, unsigned attrs, HandleObject scopeChain);
 bool DefGlobalLexical(JSContext* cx, HandlePropertyName dn, unsigned attrs);

From 78c3851957a549103e1c0e3ca2f4cbf43c21a645 Mon Sep 17 00:00:00 2001
From: Shu-yu Guo <shu@rfrn.org>
Date: Fri, 18 Dec 2015 13:18:20 -0800
Subject: [PATCH 074/101] Bug 1071646 - Support JSOP_BINDVAR in Ion. (r=jandem)

---
 js/src/jit/BytecodeAnalysis.cpp     |  1 +
 js/src/jit/CodeGenerator.cpp        | 10 +++++++++
 js/src/jit/CodeGenerator.h          |  1 +
 js/src/jit/IonBuilder.cpp           | 13 ++++++++++++
 js/src/jit/IonBuilder.h             |  1 +
 js/src/jit/Lowering.cpp             | 10 +++++++++
 js/src/jit/Lowering.h               |  1 +
 js/src/jit/MIR.h                    | 33 +++++++++++++++++++++++++++++
 js/src/jit/MOpcodes.h               |  1 +
 js/src/jit/VMFunctions.cpp          |  1 +
 js/src/jit/shared/LIR-shared.h      | 16 ++++++++++++++
 js/src/jit/shared/LOpcodes-shared.h |  1 +
 12 files changed, 89 insertions(+)

diff --git a/js/src/jit/BytecodeAnalysis.cpp b/js/src/jit/BytecodeAnalysis.cpp
index ca4456e64835..19ce05e0c031 100644
--- a/js/src/jit/BytecodeAnalysis.cpp
+++ b/js/src/jit/BytecodeAnalysis.cpp
@@ -158,6 +158,7 @@ BytecodeAnalysis::init(TempAllocator& alloc, GSNCache& gsn)
 
           case JSOP_GETNAME:
           case JSOP_BINDNAME:
+          case JSOP_BINDVAR:
           case JSOP_SETNAME:
           case JSOP_STRICTSETNAME:
           case JSOP_DELNAME:
diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp
index 5999fa98d895..676fdcb2ef2f 100644
--- a/js/src/jit/CodeGenerator.cpp
+++ b/js/src/jit/CodeGenerator.cpp
@@ -8430,6 +8430,16 @@ CodeGenerator::visitOutOfLineUnboxFloatingPoint(OutOfLineUnboxFloatingPoint* ool
     masm.jump(ool->rejoin());
 }
 
+typedef JSObject* (*BindVarFn)(JSContext*, HandleObject);
+static const VMFunction BindVarInfo = FunctionInfo<BindVarFn>(jit::BindVar);
+
+void
+CodeGenerator::visitCallBindVar(LCallBindVar* lir)
+{
+    pushArg(ToRegister(lir->scopeChain()));
+    callVM(BindVarInfo, lir);
+}
+
 typedef bool (*GetPropertyFn)(JSContext*, HandleValue, HandlePropertyName, MutableHandleValue);
 static const VMFunction GetPropertyInfo = FunctionInfo<GetPropertyFn>(GetProperty);
 
diff --git a/js/src/jit/CodeGenerator.h b/js/src/jit/CodeGenerator.h
index 04e8d3e92769..0467cd935b49 100644
--- a/js/src/jit/CodeGenerator.h
+++ b/js/src/jit/CodeGenerator.h
@@ -329,6 +329,7 @@ class CodeGenerator : public CodeGeneratorSpecific
     void visitSetDOMProperty(LSetDOMProperty* lir);
     void visitCallDOMNative(LCallDOMNative* lir);
     void visitCallGetIntrinsicValue(LCallGetIntrinsicValue* lir);
+    void visitCallBindVar(LCallBindVar* lir);
     void visitIsCallable(LIsCallable* lir);
     void visitOutOfLineIsCallable(OutOfLineIsCallable* ool);
     void visitIsObject(LIsObject* lir);
diff --git a/js/src/jit/IonBuilder.cpp b/js/src/jit/IonBuilder.cpp
index 5606a9dcd988..d2461ea11a32 100644
--- a/js/src/jit/IonBuilder.cpp
+++ b/js/src/jit/IonBuilder.cpp
@@ -1943,6 +1943,9 @@ IonBuilder::inspectOpcode(JSOp op)
       case JSOP_BINDNAME:
         return jsop_bindname(info().getName(pc));
 
+      case JSOP_BINDVAR:
+        return jsop_bindvar();
+
       case JSOP_DUP:
         current->pushSlot(current->stackDepth() - 1);
         return true;
@@ -8447,6 +8450,16 @@ IonBuilder::jsop_bindname(PropertyName* name)
     return resumeAfter(ins);
 }
 
+bool
+IonBuilder::jsop_bindvar()
+{
+    MOZ_ASSERT(analysis().usesScopeChain());
+    MCallBindVar* ins = MCallBindVar::New(alloc(), current->scopeChain());
+    current->add(ins);
+    current->push(ins);
+    return true;
+}
+
 static MIRType
 GetElemKnownType(bool needsHoleCheck, TemporaryTypeSet* types)
 {
diff --git a/js/src/jit/IonBuilder.h b/js/src/jit/IonBuilder.h
index b18abe051967..2a50f2d619cf 100644
--- a/js/src/jit/IonBuilder.h
+++ b/js/src/jit/IonBuilder.h
@@ -691,6 +691,7 @@ class IonBuilder
     bool jsop_intrinsic(PropertyName* name);
     bool jsop_getimport(PropertyName* name);
     bool jsop_bindname(PropertyName* name);
+    bool jsop_bindvar();
     bool jsop_getelem();
     bool jsop_getelem_dense(MDefinition* obj, MDefinition* index, JSValueType unboxedType);
     bool jsop_getelem_typed(MDefinition* obj, MDefinition* index, ScalarTypeDescr::Type arrayType);
diff --git a/js/src/jit/Lowering.cpp b/js/src/jit/Lowering.cpp
index 7c8fea6b5088..f7a94d38b2fc 100644
--- a/js/src/jit/Lowering.cpp
+++ b/js/src/jit/Lowering.cpp
@@ -3361,6 +3361,16 @@ LIRGenerator::visitBindNameCache(MBindNameCache* ins)
     assignSafepoint(lir, ins);
 }
 
+void
+LIRGenerator::visitCallBindVar(MCallBindVar* ins)
+{
+    MOZ_ASSERT(ins->scopeChain()->type() == MIRType_Object);
+    MOZ_ASSERT(ins->type() == MIRType_Object);
+
+    LCallBindVar* lir = new(alloc()) LCallBindVar(useRegister(ins->scopeChain()));
+    define(lir, ins);
+}
+
 void
 LIRGenerator::visitGuardObjectIdentity(MGuardObjectIdentity* ins)
 {
diff --git a/js/src/jit/Lowering.h b/js/src/jit/Lowering.h
index 64050ea24633..dff0e6420383 100644
--- a/js/src/jit/Lowering.h
+++ b/js/src/jit/Lowering.h
@@ -230,6 +230,7 @@ class LIRGenerator : public LIRGeneratorSpecific
     void visitGetPropertyPolymorphic(MGetPropertyPolymorphic* ins);
     void visitSetPropertyPolymorphic(MSetPropertyPolymorphic* ins);
     void visitBindNameCache(MBindNameCache* ins);
+    void visitCallBindVar(MCallBindVar* ins);
     void visitGuardObjectIdentity(MGuardObjectIdentity* ins);
     void visitGuardClass(MGuardClass* ins);
     void visitGuardObject(MGuardObject* ins);
diff --git a/js/src/jit/MIR.h b/js/src/jit/MIR.h
index 3c75f5441a31..696a0c64b7c2 100644
--- a/js/src/jit/MIR.h
+++ b/js/src/jit/MIR.h
@@ -10758,6 +10758,39 @@ class MBindNameCache
     }
 };
 
+class MCallBindVar
+  : public MUnaryInstruction,
+    public SingleObjectPolicy::Data
+{
+    explicit MCallBindVar(MDefinition* scopeChain)
+      : MUnaryInstruction(scopeChain)
+    {
+        setResultType(MIRType_Object);
+        setMovable();
+    }
+
+  public:
+    INSTRUCTION_HEADER(CallBindVar)
+
+    static MCallBindVar* New(TempAllocator& alloc, MDefinition* scopeChain) {
+        return new(alloc) MCallBindVar(scopeChain);
+    }
+
+    MDefinition* scopeChain() const {
+        return getOperand(0);
+    }
+
+    bool congruentTo(const MDefinition* ins) const override {
+        if (!ins->isCallBindVar())
+            return false;
+        return congruentIfOperandsEqual(ins);
+    }
+
+    AliasSet getAliasSet() const override {
+        return AliasSet::None();
+    }
+};
+
 // Guard on an object's shape.
 class MGuardShape
   : public MUnaryInstruction,
diff --git a/js/src/jit/MOpcodes.h b/js/src/jit/MOpcodes.h
index 90dd1f988d9a..d1fcddbb5cf1 100644
--- a/js/src/jit/MOpcodes.h
+++ b/js/src/jit/MOpcodes.h
@@ -162,6 +162,7 @@ namespace jit {
     _(GetPropertyPolymorphic)                                               \
     _(SetPropertyPolymorphic)                                               \
     _(BindNameCache)                                                        \
+    _(CallBindVar)                                                          \
     _(GuardShape)                                                           \
     _(GuardReceiverPolymorphic)                                             \
     _(GuardObjectGroup)                                                     \
diff --git a/js/src/jit/VMFunctions.cpp b/js/src/jit/VMFunctions.cpp
index c46a3b003099..ad18be8c72ca 100644
--- a/js/src/jit/VMFunctions.cpp
+++ b/js/src/jit/VMFunctions.cpp
@@ -167,6 +167,7 @@ BindVar(JSContext* cx, HandleObject scopeChain)
     JSObject* obj = scopeChain;
     while (!obj->isQualifiedVarObj())
         obj = obj->enclosingScope();
+    MOZ_ASSERT(obj);
     return obj;
 }
 
diff --git a/js/src/jit/shared/LIR-shared.h b/js/src/jit/shared/LIR-shared.h
index 5fe22165f871..77564f5abcc6 100644
--- a/js/src/jit/shared/LIR-shared.h
+++ b/js/src/jit/shared/LIR-shared.h
@@ -5774,6 +5774,22 @@ class LBindNameCache : public LInstructionHelper<1, 1, 0>
     }
 };
 
+class LCallBindVar : public LInstructionHelper<1, 1, 0>
+{
+  public:
+    LIR_HEADER(CallBindVar)
+
+    explicit LCallBindVar(const LAllocation& scopeChain) {
+        setOperand(0, scopeChain);
+    }
+    const LAllocation* scopeChain() {
+        return getOperand(0);
+    }
+    const MCallBindVar* mir() const {
+        return mir_->toCallBindVar();
+    }
+};
+
 // Load a value from an object's dslots or a slots vector.
 class LLoadSlotV : public LInstructionHelper<BOX_PIECES, 1, 0>
 {
diff --git a/js/src/jit/shared/LOpcodes-shared.h b/js/src/jit/shared/LOpcodes-shared.h
index b3897eebdd80..48e91e579e6a 100644
--- a/js/src/jit/shared/LOpcodes-shared.h
+++ b/js/src/jit/shared/LOpcodes-shared.h
@@ -277,6 +277,7 @@
     _(GetPropertyPolymorphicV)      \
     _(GetPropertyPolymorphicT)      \
     _(BindNameCache)                \
+    _(CallBindVar)                  \
     _(CallGetProperty)              \
     _(GetNameCache)                 \
     _(CallGetIntrinsicValue)        \

From fba71f3b1c46e4e0a3abdbc8c43207bfeda65f02 Mon Sep 17 00:00:00 2001
From: Shu-yu Guo <shu@rfrn.org>
Date: Fri, 18 Dec 2015 13:18:20 -0800
Subject: [PATCH 075/101] Bug 1231758 - Fix bogus assertion in BCE for Annex B
 function assignment. (r=jorendorff)

---
 js/src/frontend/BytecodeEmitter.cpp | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/js/src/frontend/BytecodeEmitter.cpp b/js/src/frontend/BytecodeEmitter.cpp
index 3b49b8fe312a..e98fe037c656 100644
--- a/js/src/frontend/BytecodeEmitter.cpp
+++ b/js/src/frontend/BytecodeEmitter.cpp
@@ -4413,13 +4413,25 @@ BytecodeEmitter::emitVariables(ParseNode* pn, VarEmitOption emitOption)
              * i' to be hoisted out of the loop.
              */
             MOZ_ASSERT(binding->isOp(JSOP_NOP));
-            MOZ_ASSERT(emitOption != DefineVars && emitOption != AnnexB);
+            MOZ_ASSERT(emitOption != DefineVars);
+            MOZ_ASSERT_IF(emitOption == AnnexB, binding->pn_left->isKind(PNK_NAME));
 
-            /*
-             * To allow the front end to rewrite var f = x; as f = x; when a
-             * function f(){} precedes the var, detect simple name assignment
-             * here and initialize the name.
-             */
+            // To allow the front end to rewrite |var f = x;| as |f = x;| when a
+            // |function f(){}| precedes the var, detect simple name assignment
+            // here and initialize the name.
+            //
+            // There is a corner case where a function declaration synthesizes
+            // an Annex B declaration, which in turn gets rewritten later as a
+            // simple assignment due to hoisted function declaration of the
+            // same name. For example,
+            //
+            // {
+            //   // Synthesizes an Annex B declaration because no 'f' binding
+            //   // yet exists. This later gets rewritten as an assignment when
+            //   // the outer function 'f' gets hoisted.
+            //   function f() {}
+            // }
+            // function f() {}
             if (binding->pn_left->isKind(PNK_NAME)) {
                 if (!emitSingleVariable(pn, binding->pn_left, binding->pn_right, emitOption))
                     return false;

From 8caf284e45688da17811dc840b45948daa80a7fd Mon Sep 17 00:00:00 2001
From: Benoit Girard <b56girard@gmail.com>
Date: Fri, 18 Dec 2015 16:12:47 -0500
Subject: [PATCH 076/101] Bug 1233835 - Fix TaskTracer double init assert.
 r=mconley

--HG--
extra : rebase_source : 4e734a428bf22863e5ee6fa44191752c9a8cec77
---
 tools/profiler/core/platform.cpp          | 12 ++++++++++++
 tools/profiler/public/GeckoProfilerImpl.h | 10 ----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/tools/profiler/core/platform.cpp b/tools/profiler/core/platform.cpp
index af915a171172..7fb57d6ef8cb 100644
--- a/tools/profiler/core/platform.cpp
+++ b/tools/profiler/core/platform.cpp
@@ -31,6 +31,10 @@
 #endif
 #include "ProfilerMarkers.h"
 
+#ifdef MOZ_TASK_TRACER
+#include "GeckoTaskTracer.h"
+#endif
+
 #if defined(SPS_OS_android) && !defined(MOZ_WIDGET_GONK)
   #include "AndroidBridge.h"
 #endif
@@ -458,6 +462,10 @@ void mozilla_sampler_init(void* stackTop)
   if (stack_key_initialized)
     return;
 
+#ifdef MOZ_TASK_TRACER
+  mozilla::tasktracer::InitTaskTracer();
+#endif
+
 #ifdef SPS_STANDALONE
   mozilla::TimeStamp::Startup();
 #endif
@@ -564,6 +572,10 @@ void mozilla_sampler_shutdown()
   PseudoStack *stack = tlsPseudoStack.get();
   stack->deref();
   tlsPseudoStack.set(nullptr);
+
+#ifdef MOZ_TASK_TRACER
+  mozilla::tasktracer::ShutdownTaskTracer();
+#endif
 }
 
 void mozilla_sampler_save()
diff --git a/tools/profiler/public/GeckoProfilerImpl.h b/tools/profiler/public/GeckoProfilerImpl.h
index 3792bb17fcc3..6616df70748a 100644
--- a/tools/profiler/public/GeckoProfilerImpl.h
+++ b/tools/profiler/public/GeckoProfilerImpl.h
@@ -22,10 +22,6 @@
 #include "PseudoStack.h"
 #include "ProfilerBacktrace.h"
 
-#ifdef MOZ_TASK_TRACER
-#include "GeckoTaskTracer.h"
-#endif
-
 /* QT has a #define for the word "slots" and jsfriendapi.h has a struct with
  * this variable name, causing compilation problems. Alleviate this for now by
  * removing this #define */
@@ -62,18 +58,12 @@ extern bool stack_key_initialized;
 static inline
 void profiler_init(void* stackTop)
 {
-#ifdef MOZ_TASK_TRACER
-  mozilla::tasktracer::InitTaskTracer();
-#endif
   mozilla_sampler_init(stackTop);
 }
 
 static inline
 void profiler_shutdown()
 {
-#ifdef MOZ_TASK_TRACER
-  mozilla::tasktracer::ShutdownTaskTracer();
-#endif
   mozilla_sampler_shutdown();
 }
 

From c83699f25f9053dcf7c5a7eb9aa51e1afe81b8d4 Mon Sep 17 00:00:00 2001
From: Christoph Kerschbaumer <mozilla@christophkerschbaumer.com>
Date: Fri, 18 Dec 2015 13:31:16 -0800
Subject: [PATCH 077/101] Bug 1233760 - Convert 25 tests within netwerk/test to
 use AsyncOpen2 (r=mcmanus)

---
 netwerk/test/unit/test_307_redirect.js        | 19 +++-------
 netwerk/test/unit/test_bug331825.js           | 19 +++-------
 netwerk/test/unit/test_bug468426.js           | 19 +++-------
 netwerk/test/unit/test_bug510359.js           | 20 +++-------
 netwerk/test/unit/test_bug561042.js           | 18 ++-------
 netwerk/test/unit/test_bug586908.js           | 17 ++-------
 netwerk/test/unit/test_bug652761.js           | 19 +++-------
 netwerk/test/unit/test_bug659569.js           | 22 ++++-------
 netwerk/test/unit/test_bug667907.js           | 23 +++---------
 netwerk/test/unit/test_bug812167.js           | 25 ++++---------
 netwerk/test/unit/test_channel_close.js       | 24 ++++--------
 netwerk/test/unit/test_chunked_responses.js   | 20 ++++------
 .../test/unit/test_content_length_underrun.js | 22 ++++-------
 netwerk/test/unit/test_cookie_header.js       | 18 ++-------
 netwerk/test/unit/test_cookiejars.js          | 16 +++-----
 .../test/unit/test_cookiejars_safebrowsing.js | 20 ++++------
 netwerk/test/unit/test_file_protocol.js       | 18 ++++-----
 netwerk/test/unit/test_freshconnection.js     | 18 +++------
 .../unit/test_redirect-caching_failure.js     | 17 ++-------
 .../unit/test_redirect-caching_passing.js     | 17 ++-------
 netwerk/test/unit/test_redirect_baduri.js     | 16 ++------
 netwerk/test/unit/test_redirect_canceled.js   | 15 ++------
 netwerk/test/unit/test_redirect_failure.js    | 15 ++------
 .../test/unit/test_redirect_from_script.js    | 21 +++--------
 netwerk/test/unit/test_simple.js              | 19 +++-------
 netwerk/test/unit/test_spdy.js                | 37 +++++++------------
 26 files changed, 153 insertions(+), 361 deletions(-)

diff --git a/netwerk/test/unit/test_307_redirect.js b/netwerk/test/unit/test_307_redirect.js
index 0b6ad2fb23d0..fbbcdf000daa 100644
--- a/netwerk/test/unit/test_307_redirect.js
+++ b/netwerk/test/unit/test_307_redirect.js
@@ -1,5 +1,5 @@
 Cu.import("resource://testing-common/httpd.js");
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "URL", function() {
   return "http://localhost:" + httpserver.identity.primaryPort;
@@ -16,16 +16,7 @@ XPCOMUtils.defineLazyGetter(this, "noRedirectURI", function() {
 var httpserver = null;
 
 function make_channel(url) {
-  var ios = Cc["@mozilla.org/network/io-service;1"].
-            getService(Ci.nsIIOService);
-  return ios.newChannel2(url,
-                         "",
-                         null,
-                         null,      // aLoadingNode
-                         Services.scriptSecurityManager.getSystemPrincipal(),
-                         null,      // aTriggeringPrincipal
-                         Ci.nsILoadInfo.SEC_NORMAL,
-                         Ci.nsIContentPolicy.TYPE_OTHER);
+  return NetUtil.newChannel({uri: url, loadUsingSystemPrincipal: true});
 }
 
 const requestBody = "request body";
@@ -54,7 +45,7 @@ function noRedirectStreamObserver(request, buffer)
   chan.QueryInterface(Ci.nsIUploadChannel).setUploadStream(uploadStream,
                                                            "text/plain",
                                                            -1);
-  chan.asyncOpen(new ChannelListener(noHeaderStreamObserver, null), null);
+  chan.asyncOpen2(new ChannelListener(noHeaderStreamObserver, null));
 }
 
 function noHeaderStreamObserver(request, buffer)
@@ -68,7 +59,7 @@ function noHeaderStreamObserver(request, buffer)
       requestBody;
   uploadStream.setData(streamBody, streamBody.length);
   chan.QueryInterface(Ci.nsIUploadChannel).setUploadStream(uploadStream, "", -1);
-  chan.asyncOpen(new ChannelListener(headerStreamObserver, null), null);
+  chan.asyncOpen2(new ChannelListener(headerStreamObserver, null));
 }
 
 function headerStreamObserver(request, buffer)
@@ -95,6 +86,6 @@ function run_test()
   chan.QueryInterface(Ci.nsIUploadChannel).setUploadStream(uploadStream,
                                                            "text/plain",
                                                            -1);
-  chan.asyncOpen(new ChannelListener(noRedirectStreamObserver, null), null);
+  chan.asyncOpen2(new ChannelListener(noRedirectStreamObserver, null));
   do_test_pending();
 }
diff --git a/netwerk/test/unit/test_bug331825.js b/netwerk/test/unit/test_bug331825.js
index 3c90bc8cb299..0533e9bc5f5c 100644
--- a/netwerk/test/unit/test_bug331825.js
+++ b/netwerk/test/unit/test_bug331825.js
@@ -1,5 +1,5 @@
 Cu.import("resource://testing-common/httpd.js");
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
 
 var server;
 const BUGID = "331825";
@@ -24,21 +24,14 @@ function run_test() {
   server.start(-1);
 
   // make request
-  var channel =
-      Components.classes["@mozilla.org/network/io-service;1"].
-      getService(Components.interfaces.nsIIOService).
-      newChannel2("http://localhost:" + server.identity.primaryPort + "/bug" + BUGID,
-                  null,
-                  null,
-                  null,      // aLoadingNode
-                  Services.scriptSecurityManager.getSystemPrincipal(),
-                  null,      // aTriggeringPrincipal
-                  Ci.nsILoadInfo.SEC_NORMAL,
-                  Ci.nsIContentPolicy.TYPE_OTHER);
+  var channel = NetUtil.newChannel({
+    uri: "http://localhost:" + server.identity.primaryPort + "/bug" + BUGID,
+    loadUsingSystemPrincipal: true
+  });
 
   channel.QueryInterface(Components.interfaces.nsIHttpChannel);
   channel.setRequestHeader("If-None-Match", "foobar", false);
-  channel.asyncOpen(new TestListener(), null);
+  channel.asyncOpen2(new TestListener());
 
   do_test_pending();
 }
diff --git a/netwerk/test/unit/test_bug468426.js b/netwerk/test/unit/test_bug468426.js
index 3a24b99de820..95ce32674db5 100644
--- a/netwerk/test/unit/test_bug468426.js
+++ b/netwerk/test/unit/test_bug468426.js
@@ -1,5 +1,5 @@
 Cu.import("resource://testing-common/httpd.js");
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
 
 var httpserver = new HttpServer();
 var index = 0;
@@ -34,17 +34,10 @@ var tests = [
 ];
 
 function setupChannel(suffix, value, cookie) {
-    var ios = Components.classes["@mozilla.org/network/io-service;1"]
-            .getService(Ci.nsIIOService);
-    var chan = ios.newChannel2("http://localhost:" +
-                               httpserver.identity.primaryPort + suffix,
-                               "",
-                               null,
-                               null,      // aLoadingNode
-                               Services.scriptSecurityManager.getSystemPrincipal(),
-                               null,      // aTriggeringPrincipal
-                               Ci.nsILoadInfo.SEC_NORMAL,
-                               Ci.nsIContentPolicy.TYPE_OTHER);
+    var chan = NetUtil.newChannel({
+        uri: "http://localhost:" + httpserver.identity.primaryPort + suffix,
+        loadUsingSystemPrincipal: true
+    })
     var httpChan = chan.QueryInterface(Components.interfaces.nsIHttpChannel);
     httpChan.requestMethod = "GET";
     httpChan.setRequestHeader("x-request", value, false);
@@ -55,7 +48,7 @@ function setupChannel(suffix, value, cookie) {
 
 function triggerNextTest() {
     var channel = setupChannel(tests[index].url, tests[index].server, tests[index].cookie);
-    channel.asyncOpen(new ChannelListener(checkValueAndTrigger, null), null);
+    channel.asyncOpen2(new ChannelListener(checkValueAndTrigger, null));
 }
 
 function checkValueAndTrigger(request, data, ctx) {
diff --git a/netwerk/test/unit/test_bug510359.js b/netwerk/test/unit/test_bug510359.js
index a2b3f29d900a..176b5ed37837 100644
--- a/netwerk/test/unit/test_bug510359.js
+++ b/netwerk/test/unit/test_bug510359.js
@@ -1,5 +1,5 @@
 Cu.import("resource://testing-common/httpd.js");
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
 
 var httpserver = new HttpServer();
 var index = 0;
@@ -9,18 +9,10 @@ var tests = [
 ];
 
 function setupChannel(suffix, value) {
-    var ios = Components.classes["@mozilla.org/network/io-service;1"]
-            .getService(Ci.nsIIOService);
-    var chan = ios.newChannel2("http://localhost:" +
-                               httpserver.identity.primaryPort +
-                               suffix,
-                               "",
-                               null,
-                               null,      // aLoadingNode
-                               Services.scriptSecurityManager.getSystemPrincipal(),
-                               null,      // aTriggeringPrincipal
-                               Ci.nsILoadInfo.SEC_NORMAL,
-                               Ci.nsIContentPolicy.TYPE_OTHER);
+    var chan = NetUtil.newChannel({
+        uri: "http://localhost:" + httpserver.identity.primaryPort + suffix,
+        loadUsingSystemPrincipal: true
+    });
     var httpChan = chan.QueryInterface(Components.interfaces.nsIHttpChannel);
     httpChan.requestMethod = "GET";
     httpChan.setRequestHeader("x-request", value, false);
@@ -30,7 +22,7 @@ function setupChannel(suffix, value) {
 
 function triggerNextTest() {
     var channel = setupChannel(tests[index].url, tests[index].server);
-    channel.asyncOpen(new ChannelListener(checkValueAndTrigger, null), null);
+    channel.asyncOpen2(new ChannelListener(checkValueAndTrigger, null));
 }
 
 function checkValueAndTrigger(request, data, ctx) {
diff --git a/netwerk/test/unit/test_bug561042.js b/netwerk/test/unit/test_bug561042.js
index 733773134f2c..d794aeaf6da5 100644
--- a/netwerk/test/unit/test_bug561042.js
+++ b/netwerk/test/unit/test_bug561042.js
@@ -1,5 +1,5 @@
 Cu.import("resource://testing-common/httpd.js");
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
 
 const SERVER_PORT = 8080;
 const baseURL = "http://localhost:" + SERVER_PORT + "/";
@@ -31,18 +31,8 @@ function run_test() {
         response.setHeader("Set-Cookie", "BigCookie=" + cookie, false);
         response.write("Hello world");
     });
-
-    var ios = Components.classes["@mozilla.org/network/io-service;1"]
-                         .getService(Components.interfaces.nsIIOService);
-    var chan = ios.newChannel2(baseURL,
-                               null,
-                               null,
-                               null,      // aLoadingNode
-                               Services.scriptSecurityManager.getSystemPrincipal(),
-                               null,      // aTriggeringPrincipal
-                               Ci.nsILoadInfo.SEC_NORMAL,
-                               Ci.nsIContentPolicy.TYPE_OTHER)
-                  .QueryInterface(Components.interfaces.nsIHttpChannel);
-    chan.asyncOpen(listener, null);
+    var chan = NetUtil.newChannel({uri: baseURL, loadUsingSystemPrincipal: true})
+                      .QueryInterface(Components.interfaces.nsIHttpChannel);
+    chan.asyncOpen2(listener);
     do_test_pending();
 }
diff --git a/netwerk/test/unit/test_bug586908.js b/netwerk/test/unit/test_bug586908.js
index 34565d8fc086..008577da06df 100644
--- a/netwerk/test/unit/test_bug586908.js
+++ b/netwerk/test/unit/test_bug586908.js
@@ -1,5 +1,5 @@
 Cu.import("resource://testing-common/httpd.js");
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
 Cu.import("resource://testing-common/MockRegistrar.jsm");
 
 var httpserv = null;
@@ -29,19 +29,8 @@ function checkValue(request, data, ctx) {
 }
 
 function makeChan(url) {
-  var ios = Components.classes["@mozilla.org/network/io-service;1"]
-                      .getService(Components.interfaces.nsIIOService);
-  var chan = ios.newChannel2(url,
-                             null,
-                             null,
-                             null,      // aLoadingNode
-                             Services.scriptSecurityManager.getSystemPrincipal(),
-                             null,      // aTriggeringPrincipal
-                             Ci.nsILoadInfo.SEC_NORMAL,
-                             Ci.nsIContentPolicy.TYPE_OTHER)
+  return NetUtil.newChannel({uri: url, loadUsingSystemPrincipal: true})
                 .QueryInterface(Components.interfaces.nsIHttpChannel);
-
-  return chan;
 }
 
 function run_test() {
@@ -66,7 +55,7 @@ function run_test() {
 
   var chan = makeChan("http://localhost:" + httpserv.identity.primaryPort +
                       "/target");
-  chan.asyncOpen(new ChannelListener(checkValue, null), null);
+  chan.asyncOpen2(new ChannelListener(checkValue, null));
 
   do_test_pending();
 }
diff --git a/netwerk/test/unit/test_bug652761.js b/netwerk/test/unit/test_bug652761.js
index a9d8c1106557..fc5708a8b341 100644
--- a/netwerk/test/unit/test_bug652761.js
+++ b/netwerk/test/unit/test_bug652761.js
@@ -1,6 +1,6 @@
 // This is just a crashtest for a url that is rejected at parse time (port 80,000)
 
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
 
 function completeTest(request, data, ctx)
 {
@@ -9,19 +9,12 @@ function completeTest(request, data, ctx)
 
 function run_test()
 {
-    var ios = Components.classes["@mozilla.org/network/io-service;1"].
-                         getService(Components.interfaces.nsIIOService);
-    var chan = ios.newChannel2("http://localhost:80000/",
-                               "",
-                               null,
-                               null,      // aLoadingNode
-                               Services.scriptSecurityManager.getSystemPrincipal(),
-                               null,      // aTriggeringPrincipal
-                               Ci.nsILoadInfo.SEC_NORMAL,
-                               Ci.nsIContentPolicy.TYPE_OTHER);
+    var chan = NetUtil.newChannel({
+      uri: "http://localhost:80000/",
+      loadUsingSystemPrincipal: true
+    });
     var httpChan = chan.QueryInterface(Components.interfaces.nsIHttpChannel);
-    httpChan.asyncOpen(new ChannelListener(completeTest,
-                                           httpChan, CL_EXPECT_FAILURE), null);
+    httpChan.asyncOpen2(new ChannelListener(completeTest,httpChan, CL_EXPECT_FAILURE));
     do_test_pending();
 }
 
diff --git a/netwerk/test/unit/test_bug659569.js b/netwerk/test/unit/test_bug659569.js
index 6c71c12eefc2..b9b7d105f7e3 100644
--- a/netwerk/test/unit/test_bug659569.js
+++ b/netwerk/test/unit/test_bug659569.js
@@ -1,23 +1,15 @@
 Cu.import("resource://testing-common/httpd.js");
 Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
+
 var httpserver = new HttpServer();
 
 function setupChannel(suffix)
 {
-    var ios =
-        Components.classes["@mozilla.org/network/io-service;1"]
-        .getService(Ci.nsIIOService);
-    var chan = ios.newChannel2("http://localhost:" +
-			                         httpserver.identity.primaryPort +
-			                         suffix,
-                               "",
-                               null,
-                               null,      // aLoadingNode
-                               Services.scriptSecurityManager.getSystemPrincipal(),
-                               null,      // aTriggeringPrincipal
-                               Ci.nsILoadInfo.SEC_NORMAL,
-                               Ci.nsIContentPolicy.TYPE_OTHER);
-    return chan;
+  return NetUtil.newChannel({
+    uri: "http://localhost:" + httpserver.identity.primaryPort + suffix,
+    loadUsingSystemPrincipal: true
+  });
 }
 
 function checkValueAndTrigger(request, data, ctx)
@@ -40,7 +32,7 @@ function run_test()
 
     // load first time
     var channel = setupChannel("/redirect1");
-    channel.asyncOpen(new ChannelListener(checkValueAndTrigger, null), null);
+    channel.asyncOpen2(new ChannelListener(checkValueAndTrigger, null));
     do_test_pending();
 }
 
diff --git a/netwerk/test/unit/test_bug667907.js b/netwerk/test/unit/test_bug667907.js
index 05a8cfe753a5..8e33422740a2 100644
--- a/netwerk/test/unit/test_bug667907.js
+++ b/netwerk/test/unit/test_bug667907.js
@@ -1,5 +1,5 @@
 Cu.import("resource://testing-common/httpd.js");
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
 
 var httpserver = null;
 var simplePath = "/simple";
@@ -15,16 +15,7 @@ XPCOMUtils.defineLazyGetter(this, "uri2", function() {
 });
 
 function make_channel(url) {
-  var ios = Cc["@mozilla.org/network/io-service;1"].
-            getService(Ci.nsIIOService);
-  return ios.newChannel2(url,
-                         "",
-                         null,
-                         null,      // aLoadingNode
-                         Services.scriptSecurityManager.getSystemPrincipal(),
-                         null,      // aTriggeringPrincipal
-                         Ci.nsILoadInfo.SEC_NORMAL,
-                         Ci.nsIContentPolicy.TYPE_OTHER);
+  return NetUtil.newChannel({uri: url, loadUsingSystemPrincipal: true});
 }
 
 var listener_proto = {
@@ -66,9 +57,7 @@ function run_test()
   httpserver.start(-1);
 
   var channel = make_channel(uri1);
-  channel.asyncOpen(new listener("text/plain", function() {
-	run_test2();
-      }), null);
+  channel.asyncOpen2(new listener("text/plain", function() { run_test2();}));
 
   do_test_pending();
 }
@@ -76,9 +65,9 @@ function run_test()
 function run_test2()
 {
   var channel = make_channel(uri2);
-  channel.asyncOpen(new listener("text/html", function() {
-	httpserver.stop(do_test_finished);
-      }), null);
+  channel.asyncOpen2(new listener("text/html", function() {
+	  httpserver.stop(do_test_finished);
+  }));
 }
 
 function simpleHandler(metadata, response)
diff --git a/netwerk/test/unit/test_bug812167.js b/netwerk/test/unit/test_bug812167.js
index 8121b0155e04..ecda0780cda3 100644
--- a/netwerk/test/unit/test_bug812167.js
+++ b/netwerk/test/unit/test_bug812167.js
@@ -1,5 +1,5 @@
 Cu.import("resource://testing-common/httpd.js");
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
 
 /*
 - get 302 with Cache-control: no-store
@@ -23,16 +23,7 @@ XPCOMUtils.defineLazyGetter(this, "randomURI2", function() {
 });
 
 function make_channel(url, callback, ctx) {
-  var ios = Cc["@mozilla.org/network/io-service;1"].
-            getService(Ci.nsIIOService);
-  return ios.newChannel2(url,
-                         "",
-                         null,
-                         null,      // aLoadingNode
-                         Services.scriptSecurityManager.getSystemPrincipal(),
-                         null,      // aTriggeringPrincipal
-                         Ci.nsILoadInfo.SEC_NORMAL,
-                         Ci.nsIContentPolicy.TYPE_OTHER);
+  return NetUtil.newChannel({uri: url, loadUsingSystemPrincipal: true});
 }
 
 const responseBody = "response body";
@@ -79,7 +70,7 @@ function check_response(path, request, buffer, expectedExpiration, continuation)
 
     // Do the request again and check the server handler is called appropriately
     var chan = make_channel(path);
-    chan.asyncOpen(new ChannelListener(function(request, buffer) {
+    chan.asyncOpen2(new ChannelListener(function(request, buffer) {
       do_check_eq(buffer, responseBody);
 
       if (expectedExpiration) {
@@ -94,26 +85,26 @@ function check_response(path, request, buffer, expectedExpiration, continuation)
       }
 
       continuation();
-    }, null), null);
+    }, null));
   });
 }
 
 function run_test_no_store()
 {
   var chan = make_channel(randomURI1);
-  chan.asyncOpen(new ChannelListener(function(request, buffer) {
+  chan.asyncOpen2(new ChannelListener(function(request, buffer) {
     // Cache-control: no-store response should only be found in the memory cache.
     check_response(randomURI1, request, buffer, false, run_test_expires_past);
-  }, null), null);
+  }, null));
 }
 
 function run_test_expires_past()
 {
   var chan = make_channel(randomURI2);
-  chan.asyncOpen(new ChannelListener(function(request, buffer) {
+  chan.asyncOpen2(new ChannelListener(function(request, buffer) {
     // Expires: -1 response should not be found in any cache.
     check_response(randomURI2, request, buffer, true, finish_test);
-  }, null), null);
+  }, null));
 }
 
 function finish_test()
diff --git a/netwerk/test/unit/test_channel_close.js b/netwerk/test/unit/test_channel_close.js
index 2aa97b194fef..a7a90e04fd29 100644
--- a/netwerk/test/unit/test_channel_close.js
+++ b/netwerk/test/unit/test_channel_close.js
@@ -1,5 +1,5 @@
 Cu.import("resource://testing-common/httpd.js");
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "URL", function() {
   return "http://localhost:" + httpserver.identity.primaryPort;
@@ -19,34 +19,26 @@ function run_test() {
 
   // Opened channel that has no remaining references on shutdown
   local_channel = setupChannel(testpath);
-  local_channel.asyncOpen(
-      new ChannelListener(checkRequest, local_channel), null);
+  local_channel.asyncOpen2(new ChannelListener(checkRequest, local_channel));
 
   // Opened channel that has no remaining references after being opened
-  setupChannel(testpath).asyncOpen(
-      new ChannelListener(function() {}, null), null);
+  setupChannel(testpath).asyncOpen2(new ChannelListener(function() {}, null));
   
   // Unopened channel that has remaining references on shutdown
   live_channels.push(setupChannel(testpath));
 
   // Opened channel that has remaining references on shutdown
   live_channels.push(setupChannel(testpath));
-  live_channels[1].asyncOpen(
-      new ChannelListener(checkRequestFinish, live_channels[1]), null);
+  live_channels[1].asyncOpen2(new ChannelListener(checkRequestFinish, live_channels[1]));
 
   do_test_pending();
 }
 
 function setupChannel(path) {
-  var ios = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
-  var chan = ios.newChannel2(URL + path,
-                             "",
-                             null,
-                             null,      // aLoadingNode
-                             Services.scriptSecurityManager.getSystemPrincipal(),
-                             null,      // aTriggeringPrincipal
-                             Ci.nsILoadInfo.SEC_NORMAL,
-                             Ci.nsIContentPolicy.TYPE_OTHER);
+  var chan = NetUtil.newChannel({
+    uri: URL + path,
+    loadUsingSystemPrincipal: true
+  });
   chan.QueryInterface(Ci.nsIHttpChannel);
   chan.requestMethod = "GET";
   return chan;
diff --git a/netwerk/test/unit/test_chunked_responses.js b/netwerk/test/unit/test_chunked_responses.js
index 82487badf3ec..396e2661440a 100644
--- a/netwerk/test/unit/test_chunked_responses.js
+++ b/netwerk/test/unit/test_chunked_responses.js
@@ -6,7 +6,7 @@
 // Test infrastructure
 
 Cu.import("resource://testing-common/httpd.js");
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "URL", function() {
   return "http://localhost:" + httpserver.identity.primaryPort;
@@ -32,22 +32,16 @@ function run_test_number(num)
 
   var channel = setupChannel(testPath);
   flags = test_flags[num];   // OK if flags undefined for test
-  channel.asyncOpen(new ChannelListener(eval("completeTest" + num),
-                                        channel, flags), null);
+  channel.asyncOpen2(new ChannelListener(eval("completeTest" + num),
+                                        channel, flags));
 }
 
 function setupChannel(url)
 {
-  var ios = Components.classes["@mozilla.org/network/io-service;1"].
-                       getService(Ci.nsIIOService);
-  var chan = ios.newChannel2(URL + url,
-                             "",
-                             null,
-                             null,      // aLoadingNode
-                             Services.scriptSecurityManager.getSystemPrincipal(),
-                             null,      // aTriggeringPrincipal
-                             Ci.nsILoadInfo.SEC_NORMAL,
-                             Ci.nsIContentPolicy.TYPE_OTHER);
+  var chan = NetUtil.newChannel({
+    uri: URL + url,
+    loadUsingSystemPrincipal: true
+  });
   var httpChan = chan.QueryInterface(Components.interfaces.nsIHttpChannel);
   return httpChan;
 }
diff --git a/netwerk/test/unit/test_content_length_underrun.js b/netwerk/test/unit/test_content_length_underrun.js
index 1710f0dc282f..f9891a7d3dff 100644
--- a/netwerk/test/unit/test_content_length_underrun.js
+++ b/netwerk/test/unit/test_content_length_underrun.js
@@ -6,7 +6,7 @@
 // Test infrastructure
 
 Cu.import("resource://testing-common/httpd.js");
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "URL", function() {
   return "http://localhost:" + httpserver.identity.primaryPort;
@@ -41,8 +41,8 @@ function run_test_number(num)
 
   var channel = setupChannel(testPath);
   flags = test_flags[num];   // OK if flags undefined for test
-  channel.asyncOpen(new ChannelListener(eval("completeTest" + num),
-                                        channel, flags), null);
+  channel.asyncOpen2(new ChannelListener(eval("completeTest" + num),
+                                        channel, flags));
 }
 
 function run_gzip_test(num)
@@ -77,22 +77,16 @@ function run_gzip_test(num)
 
   let listener = new StreamListener();
  
-  channel.asyncOpen(listener, null);
+  channel.asyncOpen2(listener);
 
 }
 
 function setupChannel(url)
 {
-  var ios = Components.classes["@mozilla.org/network/io-service;1"].
-                       getService(Ci.nsIIOService);
-  var chan = ios.newChannel2(URL + url,
-                             "",
-                             null,
-                             null,      // aLoadingNode
-                             Services.scriptSecurityManager.getSystemPrincipal(),
-                             null,      // aTriggeringPrincipal
-                             Ci.nsILoadInfo.SEC_NORMAL,
-                             Ci.nsIContentPolicy.TYPE_OTHER);
+  var chan = NetUtil.newChannel({
+    uri: URL + url,
+    loadUsingSystemPrincipal: true
+  });
   var httpChan = chan.QueryInterface(Components.interfaces.nsIHttpChannel);
   return httpChan;
 }
diff --git a/netwerk/test/unit/test_cookie_header.js b/netwerk/test/unit/test_cookie_header.js
index 72031c17eecc..e3ac76d93c51 100644
--- a/netwerk/test/unit/test_cookie_header.js
+++ b/netwerk/test/unit/test_cookie_header.js
@@ -2,6 +2,7 @@
 
 Cu.import("resource://testing-common/httpd.js");
 Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "URL", function() {
   return "http://localhost:" + httpserv.identity.primaryPort + "/";
@@ -56,19 +57,8 @@ var listener = {
 };
 
 function makeChan() {
-  var ios = Components.classes["@mozilla.org/network/io-service;1"]
-                      .getService(Components.interfaces.nsIIOService);
-  var chan = ios.newChannel2(URL,
-                             null,
-                             null,
-                             null,      // aLoadingNode
-                             Services.scriptSecurityManager.getSystemPrincipal(),
-                             null,      // aTriggeringPrincipal
-                             Ci.nsILoadInfo.SEC_NORMAL,
-                             Ci.nsIContentPolicy.TYPE_OTHER)
+  return NetUtil.newChannel({uri: URL, loadUsingSystemPrincipal: true})
                 .QueryInterface(Components.interfaces.nsIHttpChannel);
-
-  return chan;
 }
 
 var httpserv = null;
@@ -85,7 +75,7 @@ function run_test() {
 
   chan.setRequestHeader("Cookie", cookieVal, false);
 
-  chan.asyncOpen(listener, null);
+  chan.asyncOpen2(listener);
 
   do_test_pending();
 }
@@ -104,7 +94,7 @@ function run_test_continued() {
   cookieVal = cookie2 + "; " + cookieVal;
 
   listener._iteration++;
-  chan.asyncOpen(listener, null);
+  chan.asyncOpen2(listener);
 
   do_test_pending();
 }
diff --git a/netwerk/test/unit/test_cookiejars.js b/netwerk/test/unit/test_cookiejars.js
index c9d6ee2a860d..12b734ed367b 100644
--- a/netwerk/test/unit/test_cookiejars.js
+++ b/netwerk/test/unit/test_cookiejars.js
@@ -14,6 +14,8 @@ XPCOMUtils.defineLazyGetter(this, "URL", function() {
 
 Cu.import("resource://testing-common/httpd.js");
 Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
+
 var httpserver = new HttpServer();
 
 var cookieSetPath = "/setcookie";
@@ -48,15 +50,7 @@ var i = 0;
 
 function setupChannel(path)
 {
-  var ios = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
-  var chan = ios.newChannel2(URL + path,
-                             "",
-                             null,
-                             null,      // aLoadingNode
-                             Services.scriptSecurityManager.getSystemPrincipal(),
-                             null,      // aTriggeringPrincipal
-                             Ci.nsILoadInfo.SEC_NORMAL,
-                             Ci.nsIContentPolicy.TYPE_OTHER);
+  var chan = NetUtil.newChannel({uri: URL + path, loadUsingSystemPrincipal: true});
   chan.notificationCallbacks = tests[i].loadContext;
   chan.QueryInterface(Ci.nsIHttpChannel);
   return chan;
@@ -65,7 +59,7 @@ function setupChannel(path)
 function setCookie() {
   var channel = setupChannel(cookieSetPath);
   channel.setRequestHeader("foo-set-cookie", tests[i].cookieName, false);
-  channel.asyncOpen(new ChannelListener(setNextCookie, null), null);
+  channel.asyncOpen2(new ChannelListener(setNextCookie, null));
 }
 
 function setNextCookie(request, data, context) 
@@ -85,7 +79,7 @@ function setNextCookie(request, data, context)
 function checkCookie()
 {
   var channel = setupChannel(cookieCheckPath);
-  channel.asyncOpen(new ChannelListener(completeCheckCookie, null), null);
+  channel.asyncOpen2(new ChannelListener(completeCheckCookie, null));
 }
 
 function completeCheckCookie(request, data, context) {
diff --git a/netwerk/test/unit/test_cookiejars_safebrowsing.js b/netwerk/test/unit/test_cookiejars_safebrowsing.js
index 6a4ac0a0f3a3..dc56d9beb6dd 100644
--- a/netwerk/test/unit/test_cookiejars_safebrowsing.js
+++ b/netwerk/test/unit/test_cookiejars_safebrowsing.js
@@ -25,6 +25,8 @@
 
 Cu.import("resource://testing-common/httpd.js");
 Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
+
 
 XPCOMUtils.defineLazyGetter(this, "URL", function() {
   return "http://localhost:" + httpserver.identity.primaryPort;
@@ -68,15 +70,7 @@ function safebrowsingUpdateHandler(metadata, response) {
 }
 
 function setupChannel(path, loadContext) {
-  var ios = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
-  var channel = ios.newChannel2(URL + path,
-                                "",
-                                null,
-                                null,      // aLoadingNode
-                                Services.scriptSecurityManager.getSystemPrincipal(),
-                                null,      // aTriggeringPrincipal
-                                Ci.nsILoadInfo.SEC_NORMAL,
-                                Ci.nsIContentPolicy.TYPE_OTHER);
+  var channel = NetUtil.newChannel({uri: URL + path, loadUsingSystemPrincipal: true});
   channel.loadInfo.originAttributes = loadContext.originAttributes;
   channel.notificationCallbacks = loadContext;
   channel.QueryInterface(Ci.nsIHttpChannel);
@@ -132,12 +126,12 @@ add_test(function test_non_safebrowsing_cookie() {
   function setNonSafeBrowsingCookie() {
     var channel = setupChannel(setCookiePath, loadContext);
     channel.setRequestHeader("set-cookie", cookieName, false);
-    channel.asyncOpen(new ChannelListener(checkNonSafeBrowsingCookie, null), null);
+    channel.asyncOpen2(new ChannelListener(checkNonSafeBrowsingCookie, null));
   }
 
   function checkNonSafeBrowsingCookie() {
     var channel = setupChannel(checkCookiePath, loadContext);
-    channel.asyncOpen(new ChannelListener(completeCheckNonSafeBrowsingCookie, null), null);
+    channel.asyncOpen2(new ChannelListener(completeCheckNonSafeBrowsingCookie, null));
   }
 
   function completeCheckNonSafeBrowsingCookie(request, data, context) {
@@ -160,12 +154,12 @@ add_test(function test_safebrowsing_cookie() {
   function setSafeBrowsingCookie() {
     var channel = setupChannel(setCookiePath, loadContext);
     channel.setRequestHeader("set-cookie", cookieName, false);
-    channel.asyncOpen(new ChannelListener(checkSafeBrowsingCookie, null), null);
+    channel.asyncOpen2(new ChannelListener(checkSafeBrowsingCookie, null));
   }
 
   function checkSafeBrowsingCookie() {
     var channel = setupChannel(checkCookiePath, loadContext);
-    channel.asyncOpen(new ChannelListener(completeCheckSafeBrowsingCookie, null), null);
+    channel.asyncOpen2(new ChannelListener(completeCheckSafeBrowsingCookie, null));
   }
 
   function completeCheckSafeBrowsingCookie(request, data, context) {
diff --git a/netwerk/test/unit/test_file_protocol.js b/netwerk/test/unit/test_file_protocol.js
index e95fa2e6943f..af3deb4eeeae 100644
--- a/netwerk/test/unit/test_file_protocol.js
+++ b/netwerk/test/unit/test_file_protocol.js
@@ -1,6 +1,6 @@
 /* run some tests on the file:// protocol handler */
 
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
 
 const PR_RDONLY = 0x1;  // see prio.h
 
@@ -40,12 +40,10 @@ function new_file_channel(file) {
   var ios =
       Cc["@mozilla.org/network/io-service;1"].
       getService(Ci.nsIIOService);
-  return ios.newChannelFromURI2(ios.newFileURI(file),
-                                null,      // aLoadingNode
-                                Services.scriptSecurityManager.getSystemPrincipal(),
-                                null,      // aTriggeringPrincipal
-                                Ci.nsILoadInfo.SEC_NORMAL,
-                                Ci.nsIContentPolicy.TYPE_OTHER);
+  return NetUtil.newChannel({
+    uri: ios.newFileURI(file),
+    loadUsingSystemPrincipal: true
+  });
 }
 
 /*
@@ -143,7 +141,7 @@ function test_read_file() {
   }
 
   chan.contentType = special_type;
-  chan.asyncOpen(new FileStreamListener(on_read_complete), null);
+  chan.asyncOpen2(new FileStreamListener(on_read_complete));
 }
 
 function do_test_read_dir(set_type, expected_type) {
@@ -165,7 +163,7 @@ function do_test_read_dir(set_type, expected_type) {
 
   if (set_type)
     chan.contentType = expected_type;
-  chan.asyncOpen(new FileStreamListener(on_read_complete), null);
+  chan.asyncOpen2(new FileStreamListener(on_read_complete));
 }
 
 function test_read_dir_1() {
@@ -224,7 +222,7 @@ function test_upload_file() {
   }
 
   chan.contentType = special_type;
-  chan.asyncOpen(new FileStreamListener(on_upload_complete), null);
+  chan.asyncOpen2(new FileStreamListener(on_upload_complete));
 }
 
 function test_load_replace() {
diff --git a/netwerk/test/unit/test_freshconnection.js b/netwerk/test/unit/test_freshconnection.js
index a9e26d93443c..c1403f517e82 100644
--- a/netwerk/test/unit/test_freshconnection.js
+++ b/netwerk/test/unit/test_freshconnection.js
@@ -1,7 +1,7 @@
 // This is essentially a debug mode crashtest to make sure everything
 // involved in a reload runs on the right thread. It relies on the
 // assertions in necko.
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
 
 var listener = {
   onStartRequest: function test_onStartR(request, ctx) {
@@ -17,20 +17,14 @@ var listener = {
 };
 
 function run_test() {
-  var ios = Cc["@mozilla.org/network/io-service;1"].
-                       getService(Ci.nsIIOService);
-  var chan = ios.newChannel2("http://localhost:4444",
-                             "",
-                             null,
-                             null,      // aLoadingNode
-                             Services.scriptSecurityManager.getSystemPrincipal(),
-                             null,      // aTriggeringPrincipal
-                             Ci.nsILoadInfo.SEC_NORMAL,
-                             Ci.nsIContentPolicy.TYPE_OTHER);
+  var chan = NetUtil.newChannel({
+    uri: "http://localhost:4444",
+    loadUsingSystemPrincipal: true
+  });
   chan.loadFlags = Ci.nsIRequest.LOAD_FRESH_CONNECTION |
 	           Ci.nsIChannel.LOAD_INITIAL_DOCUMENT_URI;
   chan.QueryInterface(Ci.nsIHttpChannel);
-  chan.asyncOpen(listener, null);
+  chan.asyncOpen2(listener);
   do_test_pending();
 }
 
diff --git a/netwerk/test/unit/test_redirect-caching_failure.js b/netwerk/test/unit/test_redirect-caching_failure.js
index dbcbd1ed27e9..0e88c0d09913 100644
--- a/netwerk/test/unit/test_redirect-caching_failure.js
+++ b/netwerk/test/unit/test_redirect-caching_failure.js
@@ -1,5 +1,5 @@
 Cu.import("resource://testing-common/httpd.js");
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "URL", function() {
   return "http://localhost:" + httpServer.identity.primaryPort;
@@ -14,16 +14,7 @@ XPCOMUtils.defineLazyGetter(this, "randomURI", function() {
 });
 
 function make_channel(url, callback, ctx) {
-  var ios = Cc["@mozilla.org/network/io-service;1"].
-            getService(Ci.nsIIOService);
-  return ios.newChannel2(url,
-                         "",
-                         null,
-                         null,      // aLoadingNode
-                         Services.scriptSecurityManager.getSystemPrincipal(),
-                         null,      // aTriggeringPrincipal
-                         Ci.nsILoadInfo.SEC_NORMAL,
-                         Ci.nsIContentPolicy.TYPE_OTHER);
+  return NetUtil.newChannel({uri: url, loadUsingSystemPrincipal: true});
 }
 
 function redirectHandler(metadata, response)
@@ -42,7 +33,7 @@ function makeSureNotInCache(request, buffer)
   // Can't hurt to test though.
   var chan = make_channel(randomURI);
   chan.loadFlags |= Ci.nsIRequest.LOAD_ONLY_FROM_CACHE;
-  chan.asyncOpen(new ChannelListener(finish_test, null, CL_EXPECT_FAILURE), null);
+  chan.asyncOpen2(new ChannelListener(finish_test, null, CL_EXPECT_FAILURE));
 }
 
 function finish_test(request, buffer)
@@ -59,6 +50,6 @@ function run_test()
   httpServer.start(-1);
 
   var chan = make_channel(randomURI);
-  chan.asyncOpen(new ChannelListener(makeSureNotInCache, null, CL_EXPECT_FAILURE), null);
+  chan.asyncOpen2(new ChannelListener(makeSureNotInCache, null, CL_EXPECT_FAILURE));
   do_test_pending();
 }
diff --git a/netwerk/test/unit/test_redirect-caching_passing.js b/netwerk/test/unit/test_redirect-caching_passing.js
index 5ab7ad840db2..e1d3ebe8fa93 100644
--- a/netwerk/test/unit/test_redirect-caching_passing.js
+++ b/netwerk/test/unit/test_redirect-caching_passing.js
@@ -1,5 +1,5 @@
 Cu.import("resource://testing-common/httpd.js");
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "URL", function() {
   return "http://localhost:" + httpserver.identity.primaryPort;
@@ -14,16 +14,7 @@ XPCOMUtils.defineLazyGetter(this, "randomURI", function() {
 });
 
 function make_channel(url, callback, ctx) {
-  var ios = Cc["@mozilla.org/network/io-service;1"].
-            getService(Ci.nsIIOService);
-  return ios.newChannel2(url,
-                         "",
-                         null,
-                         null,      // aLoadingNode
-                         Services.scriptSecurityManager.getSystemPrincipal(),
-                         null,      // aTriggeringPrincipal
-                         Ci.nsILoadInfo.SEC_NORMAL,
-                         Ci.nsIContentPolicy.TYPE_OTHER);
+  return NetUtil.newChannel({uri: url, loadUsingSystemPrincipal: true});
 }
 
 const responseBody = "response body";
@@ -46,7 +37,7 @@ function firstTimeThrough(request, buffer)
   do_check_eq(buffer, responseBody);
   var chan = make_channel(randomURI);
   chan.loadFlags |= Ci.nsIRequest.LOAD_FROM_CACHE;
-  chan.asyncOpen(new ChannelListener(finish_test, null), null);
+  chan.asyncOpen2(new ChannelListener(finish_test, null));
 }
 
 function finish_test(request, buffer)
@@ -63,6 +54,6 @@ function run_test()
   httpserver.start(-1);
 
   var chan = make_channel(randomURI);
-  chan.asyncOpen(new ChannelListener(firstTimeThrough, null), null);
+  chan.asyncOpen2(new ChannelListener(firstTimeThrough, null));
   do_test_pending();
 }
diff --git a/netwerk/test/unit/test_redirect_baduri.js b/netwerk/test/unit/test_redirect_baduri.js
index 51caf7be17ed..aa1ce7dc423c 100644
--- a/netwerk/test/unit/test_redirect_baduri.js
+++ b/netwerk/test/unit/test_redirect_baduri.js
@@ -1,5 +1,5 @@
 Cu.import("resource://testing-common/httpd.js");
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
 
 /*
  * Test whether we fail bad URIs in HTTP redirect as CORRUPTED_CONTENT.
@@ -13,16 +13,7 @@ XPCOMUtils.defineLazyGetter(this, "BadRedirectURI", function() {
 });
 
 function make_channel(url, callback, ctx) {
-  var ios = Cc["@mozilla.org/network/io-service;1"].
-            getService(Ci.nsIIOService);
-  return ios.newChannel2(url,
-                         "",
-                         null,
-                         null,      // aLoadingNode
-                         Services.scriptSecurityManager.getSystemPrincipal(),
-                         null,      // aTriggeringPrincipal
-                         Ci.nsILoadInfo.SEC_NORMAL,
-                         Ci.nsIContentPolicy.TYPE_OTHER);
+  return NetUtil.newChannel({uri: url, loadUsingSystemPrincipal: true});
 }
 
 function BadRedirectHandler(metadata, response)
@@ -46,7 +37,6 @@ function run_test()
   httpServer.start(-1);
 
   var chan = make_channel(BadRedirectURI);
-  chan.asyncOpen(new ChannelListener(checkFailed, null, CL_EXPECT_FAILURE),
-                 null);
+  chan.asyncOpen2(new ChannelListener(checkFailed, null, CL_EXPECT_FAILURE));
   do_test_pending();
 }
diff --git a/netwerk/test/unit/test_redirect_canceled.js b/netwerk/test/unit/test_redirect_canceled.js
index 145160acbf24..cd2a948eef54 100644
--- a/netwerk/test/unit/test_redirect_canceled.js
+++ b/netwerk/test/unit/test_redirect_canceled.js
@@ -1,5 +1,5 @@
 Cu.import("resource://testing-common/httpd.js");
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "URL", function() {
   return "http://localhost:" + httpServer.identity.primaryPort;
@@ -14,16 +14,7 @@ XPCOMUtils.defineLazyGetter(this, "randomURI", function() {
 });
 
 function make_channel(url, callback, ctx) {
-  var ios = Cc["@mozilla.org/network/io-service;1"].
-            getService(Ci.nsIIOService);
-  return ios.newChannel2(url,
-                         "",
-                         null,
-                         null,      // aLoadingNode
-                         Services.scriptSecurityManager.getSystemPrincipal(),
-                         null,      // aTriggeringPrincipal
-                         Ci.nsILoadInfo.SEC_NORMAL,
-                         Ci.nsIContentPolicy.TYPE_OTHER);
+  return NetUtil.newChannel({uri: url, loadUsingSystemPrincipal: true});
 }
 
 const responseBody = "response body";
@@ -55,6 +46,6 @@ function run_test()
 
   var chan = make_channel(randomURI);
   chan.notificationCallbacks = new ChannelEventSink(ES_ABORT_REDIRECT);
-  chan.asyncOpen(new ChannelListener(finish_test, null), null);
+  chan.asyncOpen2(new ChannelListener(finish_test, null));
   do_test_pending();
 }
diff --git a/netwerk/test/unit/test_redirect_failure.js b/netwerk/test/unit/test_redirect_failure.js
index b16a0621fea2..b74a9102f434 100644
--- a/netwerk/test/unit/test_redirect_failure.js
+++ b/netwerk/test/unit/test_redirect_failure.js
@@ -1,5 +1,5 @@
 Cu.import("resource://testing-common/httpd.js");
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "URL", function() {
   return "http://localhost:" + httpServer.identity.primaryPort;
@@ -14,16 +14,7 @@ XPCOMUtils.defineLazyGetter(this, "randomURI", function() {
 });
 
 function make_channel(url, callback, ctx) {
-  var ios = Cc["@mozilla.org/network/io-service;1"].
-            getService(Ci.nsIIOService);
-  return ios.newChannel2(url,
-                         "",
-                         null,
-                         null,      // aLoadingNode
-                         Services.scriptSecurityManager.getSystemPrincipal(),
-                         null,      // aTriggeringPrincipal
-                         Ci.nsILoadInfo.SEC_NORMAL,
-                         Ci.nsIContentPolicy.TYPE_OTHER);
+  return NetUtil.newChannel({uri: url, loadUsingSystemPrincipal: true});
 }
 
 function redirectHandler(metadata, response)
@@ -49,6 +40,6 @@ function run_test()
   httpServer.start(-1);
 
   var chan = make_channel(randomURI);
-  chan.asyncOpen(new ChannelListener(finish_test, null, CL_EXPECT_FAILURE), null);
+  chan.asyncOpen2(new ChannelListener(finish_test, null, CL_EXPECT_FAILURE));
   do_test_pending();
 }
diff --git a/netwerk/test/unit/test_redirect_from_script.js b/netwerk/test/unit/test_redirect_from_script.js
index c1b6f2b163cd..d296ab0d0b60 100644
--- a/netwerk/test/unit/test_redirect_from_script.js
+++ b/netwerk/test/unit/test_redirect_from_script.js
@@ -9,7 +9,7 @@
  * made with nsIXMLHttpRequest objects.
  *
  * testViaAsyncOpen() checks that internal redirects occur correctly when made
- * with nsIHTTPChannel.asyncOpen().
+ * with nsIHTTPChannel.asyncOpen2().
  *
  * Both of the above functions tests four requests:
  *
@@ -24,7 +24,7 @@
  */
 
 Cu.import("resource://testing-common/httpd.js");
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
 
 // the topic we observe to use the API.  http-on-opening-request might also
 // work for some purposes.
@@ -84,16 +84,7 @@ var testHeaderVal = "Success";
 var testHeaderVal2 = "Success on server 2";
 
 function make_channel(url, callback, ctx) {
-  var ios = Cc["@mozilla.org/network/io-service;1"].
-            getService(Ci.nsIIOService);
-  return ios.newChannel2(url,
-                         "",
-                         null,
-                         null,      // aLoadingNode
-                         Services.scriptSecurityManager.getSystemPrincipal(),
-                         null,      // aTriggeringPrincipal
-                         Ci.nsILoadInfo.SEC_NORMAL,
-                         Ci.nsIContentPolicy.TYPE_OTHER);
+  return NetUtil.newChannel({uri: url, loadUsingSystemPrincipal: true});
 }
 
 function baitHandler(metadata, response)
@@ -175,7 +166,7 @@ Redirector.prototype = {
 
 function makeAsyncTest(uri, headerValue, nextTask)
 {
-  // Make a test to check a redirect that is created with channel.asyncOpen()
+  // Make a test to check a redirect that is created with channel.asyncOpen2()
 
   // Produce a callback function which checks for the presence of headerValue,
   // and then continues to the next async test task
@@ -190,11 +181,11 @@ function makeAsyncTest(uri, headerValue, nextTask)
     nextTask();
   };
 
-  // Produce a function to run an asyncOpen test using the above verifier
+  // Produce a function to run an asyncOpen2 test using the above verifier
   var test = function()
   {
     var chan = make_channel(uri);
-    chan.asyncOpen(new ChannelListener(verifier), null);
+    chan.asyncOpen2(new ChannelListener(verifier));
   };
   return test;
 }
diff --git a/netwerk/test/unit/test_simple.js b/netwerk/test/unit/test_simple.js
index 5e1743d95f33..12ec717799b7 100644
--- a/netwerk/test/unit/test_simple.js
+++ b/netwerk/test/unit/test_simple.js
@@ -5,7 +5,7 @@
 // Note: sets Cc and Ci variables
 
 Cu.import("resource://testing-common/httpd.js");
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
 
 var httpserver = new HttpServer();
 var testpath = "/simple";
@@ -26,22 +26,15 @@ function setup_test() {
   httpserver.start(-1);
   var channel = setupChannel(testpath);
   // ChannelListener defined in head_channels.js
-  channel.asyncOpen(new ChannelListener(checkRequest, channel), null);
+  channel.asyncOpen2(new ChannelListener(checkRequest, channel));
   if (dbg) { print("============== setup_test: out"); }
 }
 
 function setupChannel(path) {
-  var ios = Cc["@mozilla.org/network/io-service;1"].
-                       getService(Ci.nsIIOService);
-  var chan = ios.newChannel2("http://localhost:" +
-                             httpserver.identity.primaryPort + path,
-                             "",
-                             null,
-                             null,      // aLoadingNode
-                             Services.scriptSecurityManager.getSystemPrincipal(),
-                             null,      // aTriggeringPrincipal
-                             Ci.nsILoadInfo.SEC_NORMAL,
-                             Ci.nsIContentPolicy.TYPE_OTHER);
+  var chan = NetUtil.newChannel({
+    uri: "http://localhost:" + httpserver.identity.primaryPort + path,
+    loadUsingSystemPrincipal: true
+  });
   chan.QueryInterface(Ci.nsIHttpChannel);
   chan.requestMethod = "GET";
   return chan;
diff --git a/netwerk/test/unit/test_spdy.js b/netwerk/test/unit/test_spdy.js
index 8e1aa8c2c049..c8a7eece4774 100644
--- a/netwerk/test/unit/test_spdy.js
+++ b/netwerk/test/unit/test_spdy.js
@@ -1,6 +1,6 @@
 // test spdy/3.1
 
-Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
 
 // Generate a small and a large post with known pre-calculated md5 sums
 function generateContent(size) {
@@ -184,24 +184,15 @@ SpdyPostListener.prototype.onDataAvailable = function(request, ctx, stream, off,
 };
 
 function makeChan(url) {
-  var ios = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
-  var chan = ios.newChannel2(url,
-                             null,
-                             null,
-                             null,      // aLoadingNode
-                             Services.scriptSecurityManager.getSystemPrincipal(),
-                             null,      // aTriggeringPrincipal
-                             Ci.nsILoadInfo.SEC_NORMAL,
-                             Ci.nsIContentPolicy.TYPE_OTHER).QueryInterface(Ci.nsIHttpChannel);
-
-  return chan;
+  return NetUtil.newChannel({uri: url, loadUsingSystemPrincipal: true})
+                .QueryInterface(Ci.nsIHttpChannel);
 }
 
 // Make sure we make a spdy connection and both us and the server mark it as such
 function test_spdy_basic() {
   var chan = makeChan("https://localhost:" + serverPort + "/");
   var listener = new SpdyCheckListener();
-  chan.asyncOpen(listener, null);
+  chan.asyncOpen2(listener);
 }
 
 // Support for making sure XHR works over SPDY
@@ -249,7 +240,7 @@ function test_spdy_concurrent() {
   for (var i = 0; i < concurrent_listener.target; i++) {
     concurrent_channels[i] = makeChan("https://localhost:" + serverPort + "/750ms");
     concurrent_channels[i].loadFlags = Ci.nsIRequest.LOAD_BYPASS_CACHE;
-    concurrent_channels[i].asyncOpen(concurrent_listener, null);
+    concurrent_channels[i].asyncOpen2(concurrent_listener);
   }
 }
 
@@ -259,8 +250,8 @@ function test_spdy_multiplex() {
   var chan2 = makeChan("https://localhost:" + serverPort + "/multiplex2");
   var listener1 = new SpdyMultiplexListener();
   var listener2 = new SpdyMultiplexListener();
-  chan1.asyncOpen(listener1, null);
-  chan2.asyncOpen(listener2, null);
+  chan1.asyncOpen2(listener1);
+  chan2.asyncOpen2(listener2);
 }
 
 // Test to make sure we gateway non-standard headers properly
@@ -269,42 +260,42 @@ function test_spdy_header() {
   var hvalue = "Headers are fun";
   var listener = new SpdyHeaderListener(hvalue);
   chan.setRequestHeader("X-Test-Header", hvalue, false);
-  chan.asyncOpen(listener, null);
+  chan.asyncOpen2(listener);
 }
 
 function test_spdy_push1() {
   var chan = makeChan("https://localhost:" + serverPort + "/push");
   chan.loadGroup = loadGroup;
   var listener = new SpdyPushListener();
-  chan.asyncOpen(listener, chan);
+  chan.asyncOpen2(listener);
 }
 
 function test_spdy_push2() {
   var chan = makeChan("https://localhost:" + serverPort + "/push.js");
   chan.loadGroup = loadGroup;
   var listener = new SpdyPushListener();
-  chan.asyncOpen(listener, chan);
+  chan.asyncOpen2(listener);
 }
 
 function test_spdy_push3() {
   var chan = makeChan("https://localhost:" + serverPort + "/push2");
   chan.loadGroup = loadGroup;
   var listener = new SpdyPushListener();
-  chan.asyncOpen(listener, chan);
+  chan.asyncOpen2(listener);
 }
 
 function test_spdy_push4() {
   var chan = makeChan("https://localhost:" + serverPort + "/push2.js");
   chan.loadGroup = loadGroup;
   var listener = new SpdyPushListener();
-  chan.asyncOpen(listener, chan);
+  chan.asyncOpen2(listener);
 }
 
 // Make sure we handle GETs that cover more than 2 frames properly
 function test_spdy_big() {
   var chan = makeChan("https://localhost:" + serverPort + "/big");
   var listener = new SpdyBigListener();
-  chan.asyncOpen(listener, null);
+  chan.asyncOpen2(listener);
 }
 
 // Support for doing a POST
@@ -318,7 +309,7 @@ function do_post(content, chan, listener) {
 
   chan.requestMethod = "POST";
 
-  chan.asyncOpen(listener, null);
+  chan.asyncOpen2(listener);
 }
 
 // Make sure we can do a simple POST

From aa909291c4c249d42ce023dedc8e0a52013c9245 Mon Sep 17 00:00:00 2001
From: Tooru Fujisawa <arai_a@mac.com>
Date: Sat, 19 Dec 2015 06:50:21 +0900
Subject: [PATCH 078/101] Bug 1233722 - Add a documentation comment for
 JSOP_DEBUGCHECKSELFHOSTED. DONTBUILD. r=efaust

---
 js/src/vm/Opcodes.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/js/src/vm/Opcodes.h b/js/src/vm/Opcodes.h
index 12e2944b1990..c77a17a9a319 100644
--- a/js/src/vm/Opcodes.h
+++ b/js/src/vm/Opcodes.h
@@ -1809,6 +1809,14 @@
      *   Stack: => val
      */ \
     macro(JSOP_GETIMPORT,     176,"getimport",  NULL,     5,  0,  1,  JOF_ATOM|JOF_NAME|JOF_TYPESET) \
+    /*
+     * Examines the top stack value, asserting that it's either a self-hosted
+     * function or a self-hosted intrinsic. This opcode does nothing in an
+     * optimized build.
+     *   Category: Other
+     *   Operands:
+     *   Stack: checkVal => checkVal
+     */ \
     macro(JSOP_DEBUGCHECKSELFHOSTED, 177,"debug-checkselfhosted",  NULL, 1,  1,  1,  JOF_BYTE) \
     macro(JSOP_UNUSED178,     178,"unused178",  NULL,     1,  0,  0,  JOF_BYTE) \
     macro(JSOP_UNUSED179,     179,"unused179",  NULL,     1,  0,  0,  JOF_BYTE) \

From 73c6637c6014503483c2e7cb4919a4cee9ea61f6 Mon Sep 17 00:00:00 2001
From: Sebastian Hengst <archaeopteryx@coole-files.de>
Date: Fri, 18 Dec 2015 23:02:34 +0100
Subject: [PATCH 079/101] Complete backout of bug 1233726 by restoring
 testing/web-platform/meta/url/a-element.xhtml.ini. r=backout

---
 .../web-platform/meta/url/a-element.xhtml.ini | 519 ++++++++++++++++++
 1 file changed, 519 insertions(+)
 create mode 100644 testing/web-platform/meta/url/a-element.xhtml.ini

diff --git a/testing/web-platform/meta/url/a-element.xhtml.ini b/testing/web-platform/meta/url/a-element.xhtml.ini
new file mode 100644
index 000000000000..1dcc41184ac6
--- /dev/null
+++ b/testing/web-platform/meta/url/a-element.xhtml.ini
@@ -0,0 +1,519 @@
+[a-element.xhtml]
+  type: testharness
+  [Parsing: <a:\t foo.com> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <http://f:b/c> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <http://f: /c> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <http://f:fifty-two/c> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <http://f: 21 / b ? d # e > against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <:foo.com\\> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <:\\> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <foo://> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <http::@c:29> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <http://&a:foo(b\]c@d:2/> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <http://::@c@d:2> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <http://foo.com:b@d/> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <http://foo.com/\\@> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <http:\\\\foo.com\\> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <http:\\\\a\\b:c\\d@foo.com\\> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <foo:/> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <foo:/bar.com/> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <foo://///////> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <foo://///////bar.com/> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <foo:////://///> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <c:/foo> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <http://[1::2\]:3:4> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <http://2001::1> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <http://2001::1\]> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <http://2001::1\]:80> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <madeupscheme:/example.com/> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <ftps:/example.com/> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <gopher:/example.com/> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <data:/example.com/> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <javascript:/example.com/> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <mailto:/example.com/> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <madeupscheme:example.com/> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <ftps:example.com/> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <gopher:example.com/> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <data:example.com/> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <javascript:example.com/> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <mailto:example.com/> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <data:text/html,test#test> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <file:c:\\foo\\bar.html> against <file:///tmp/mock/path>]
+    expected:
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
+      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): FAIL
+      if not debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
+      if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
+      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+      if not debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
+      if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+      if debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL
+      if not debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86") and (bits == 32): FAIL
+      if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86") and (bits == 32): FAIL
+      if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+      if debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+
+  [Parsing: <  File:c|////foo\\bar.html> against <file:///tmp/mock/path>]
+    expected: FAIL
+
+  [Parsing: <C|/foo/bar> against <file:///tmp/mock/path>]
+    expected: FAIL
+
+  [Parsing: </C|\\foo\\bar> against <file:///tmp/mock/path>]
+    expected: FAIL
+
+  [Parsing: <//C|/foo/bar> against <file:///tmp/mock/path>]
+    expected: FAIL
+
+  [Parsing: <//server/file> against <file:///tmp/mock/path>]
+    expected: FAIL
+
+  [Parsing: <\\\\server\\file> against <file:///tmp/mock/path>]
+    expected: FAIL
+
+  [Parsing: </\\server/file> against <file:///tmp/mock/path>]
+    expected: FAIL
+
+  [Parsing: <//> against <file:///tmp/mock/path>]
+    expected: FAIL
+
+  [Parsing: <///> against <file:///tmp/mock/path>]
+    expected: FAIL
+
+  [Parsing: <///test> against <file:///tmp/mock/path>]
+    expected: FAIL
+
+  [Parsing: <file://test> against <file:///tmp/mock/path>]
+    expected: FAIL
+
+  [Parsing: <file://localhost> against <file:///tmp/mock/path>]
+    expected: FAIL
+
+  [Parsing: <file://localhost/> against <file:///tmp/mock/path>]
+    expected: FAIL
+
+  [Parsing: <file://localhost/test> against <file:///tmp/mock/path>]
+    expected: FAIL
+
+  [Parsing: <test> against <file:///tmp/mock/path>]
+    expected: FAIL
+
+  [Parsing: <file:test> against <file:///tmp/mock/path>]
+    expected: FAIL
+
+  [Parsing: <http://example.com/foo/%2e> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http://example.com\\\\foo\\\\bar> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <data:test# »> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http://[www.google.com\]/> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http://192.0x00A80001> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http://user:pass@/> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http:\\\\www.google.com\\foo> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <httpa://foo:80/> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http://foo:-80/> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <gopher://foo:70/> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <gopher://foo:443/> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <madeupscheme:/example.com/> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <ftps:/example.com/> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <gopher:/example.com/> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <data:/example.com/> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <javascript:/example.com/> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <mailto:/example.com/> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <madeupscheme:example.com/> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <ftps:example.com/> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <gopher:example.com/> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <data:example.com/> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <javascript:example.com/> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <mailto:example.com/> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http::b@www.example.com> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http:/:b@www.example.com> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http://:b@www.example.com> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http:/:@/www.example.com> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http://user@/www.example.com> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http:@/www.example.com> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http:/@/www.example.com> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http://@/www.example.com> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <https:@/www.example.com> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http:a:b@/www.example.com> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http:/a:b@/www.example.com> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http://a:b@/www.example.com> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http::@/www.example.com> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http://www.@pple.com> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http:@:www.example.com> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http:/@:www.example.com> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http://@:www.example.com> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http://:@www.example.com> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http://example example.com> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <http://Goo%20 goo%7C|.com> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <http://GOO 　goo.com> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <http://﷐zyx.com> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <http://%ef%b7%90zyx.com> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <http://％４１.com> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <http://%ef%bc%85%ef%bc%94%ef%bc%91.com> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <http://％００.com> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <http://%ef%bc%85%ef%bc%90%ef%bc%90.com> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <http://你好你好> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <http://%zz%66%a.com> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <http://%25> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <http://hello%00> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <http://%30%78%63%30%2e%30%32%35%30.01> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <http://%30%78%63%30%2e%30%32%35%30.01%2e> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <http://192.168.0.257> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <http://%3g%78%63%30%2e%30%32%35%30%2E.01> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <http://192.168.0.1 hello> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <http://０Ｘｃ０．０２５０．０１> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <http://[google.com\]> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <x> against <test:test>]
+    expected: FAIL
+
+  [Parsing: <http://f:21/ b ? d # e > against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <#β> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <http://www.google.com/foo?bar=baz# »> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <#β> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <http://www.google.com/foo?bar=baz# »> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http://[\]> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <http://[:\]> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <file:/example.com/> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <file:///foo/bar.txt> against <file:///tmp/mock/path>]
+    expected: FAIL
+
+  [Parsing: <file:///home/me> against <file:///tmp/mock/path>]
+    expected: FAIL
+
+  [Parsing: <file:/example.com/> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <#> against <test:test>]
+    expected: FAIL
+
+  [Parsing: <#x> against <mailto:x@x.com>]
+    expected: FAIL
+
+  [Parsing: <#x> against <data:,>]
+    expected: FAIL
+
+  [Parsing: <#x> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <#> against <test:test?test>]
+    expected: FAIL
+
+  [Parsing: <i> against <sc:sd>]
+    expected: FAIL
+
+  [Parsing: <i> against <sc:sd/sd>]
+    expected: FAIL
+
+  [Parsing: <i> against <sc:/pa/pa>]
+    expected: FAIL
+
+  [Parsing: <i> against <sc://ho/pa>]
+    expected: FAIL
+
+  [Parsing: <i> against <sc:///pa/pa>]
+    expected: FAIL
+
+  [Parsing: <../i> against <sc:sd>]
+    expected: FAIL
+
+  [Parsing: <../i> against <sc:sd/sd>]
+    expected: FAIL
+
+  [Parsing: <../i> against <sc:/pa/pa>]
+    expected: FAIL
+
+  [Parsing: <../i> against <sc://ho/pa>]
+    expected: FAIL
+
+  [Parsing: <../i> against <sc:///pa/pa>]
+    expected: FAIL
+
+  [Parsing: </i> against <sc:sd>]
+    expected: FAIL
+
+  [Parsing: </i> against <sc:sd/sd>]
+    expected: FAIL
+
+  [Parsing: </i> against <sc:/pa/pa>]
+    expected: FAIL
+
+  [Parsing: </i> against <sc://ho/pa>]
+    expected: FAIL
+
+  [Parsing: </i> against <sc:///pa/pa>]
+    expected: FAIL
+
+  [Parsing: <?i> against <sc:sd>]
+    expected: FAIL
+
+  [Parsing: <?i> against <sc:sd/sd>]
+    expected: FAIL
+
+  [Parsing: <?i> against <sc:/pa/pa>]
+    expected: FAIL
+
+  [Parsing: <?i> against <sc://ho/pa>]
+    expected: FAIL
+
+  [Parsing: <?i> against <sc:///pa/pa>]
+    expected: FAIL
+
+  [Parsing: <#i> against <sc:sd>]
+    expected: FAIL
+
+  [Parsing: <#i> against <sc:sd/sd>]
+    expected: FAIL
+
+  [Parsing: <#i> against <sc:/pa/pa>]
+    expected: FAIL
+
+  [Parsing: <#i> against <sc://ho/pa>]
+    expected: FAIL
+
+  [Parsing: <#i> against <sc:///pa/pa>]
+    expected: FAIL
+
+  [Parsing: <about:/../> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <data:/../> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <javascript:/../> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <mailto:/../> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <sc://ñ.test/> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <sc:\\../> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <file:..> against <http://www.example.com/test>]
+    expected: FAIL
+

From da469b93914fca1ad808488ffe0e467e6dab2449 Mon Sep 17 00:00:00 2001
From: Jeff Muizelaar <jmuizelaar@mozilla.com>
Date: Fri, 18 Dec 2015 17:05:42 -0500
Subject: [PATCH 080/101] Bug 1218881. Enforce queries' new availability
 semantics. r=jgilbert

This adds a Runnable that we dispatch to the event loop so that we can make
sure queries don't become available before they are supposed to.
---
 dom/canvas/WebGL2ContextQueries.cpp |  8 ++++++++
 dom/canvas/WebGLQuery.cpp           |  1 +
 dom/canvas/WebGLQuery.h             | 16 ++++++++++++++++
 gfx/thebes/gfxPrefs.h               |  1 +
 4 files changed, 26 insertions(+)

diff --git a/dom/canvas/WebGL2ContextQueries.cpp b/dom/canvas/WebGL2ContextQueries.cpp
index b3ffe264e6e6..1fec22d70e3d 100644
--- a/dom/canvas/WebGL2ContextQueries.cpp
+++ b/dom/canvas/WebGL2ContextQueries.cpp
@@ -6,6 +6,8 @@
 #include "WebGL2Context.h"
 #include "GLContext.h"
 #include "WebGLQuery.h"
+#include "gfxPrefs.h"
+#include "nsThreadUtils.h"
 
 namespace mozilla {
 
@@ -255,6 +257,7 @@ WebGL2Context::EndQuery(GLenum target)
     }
 
     UpdateBoundQuery(target, nullptr);
+    NS_DispatchToCurrentThread(new WebGLQuery::AvailableRunnable(activeQuery));
 }
 
 already_AddRefed<WebGLQuery>
@@ -325,6 +328,11 @@ WebGL2Context::GetQueryParameter(JSContext*, WebGLQuery* query, GLenum pname,
         return;
     }
 
+    // We must wait for an event loop before the query can be available
+    if (!query->mCanBeAvailable && !gfxPrefs::WebGLImmediateQueries()) {
+        return;
+    }
+
     MakeContextCurrent();
     GLuint returned = 0;
     switch (pname) {
diff --git a/dom/canvas/WebGLQuery.cpp b/dom/canvas/WebGLQuery.cpp
index 016aa198d194..e557b8b4505c 100644
--- a/dom/canvas/WebGLQuery.cpp
+++ b/dom/canvas/WebGLQuery.cpp
@@ -20,6 +20,7 @@ WebGLQuery::WrapObject(JSContext* cx, JS::Handle<JSObject*> givenProto)
 
 WebGLQuery::WebGLQuery(WebGLContext* webgl)
     : WebGLContextBoundObject(webgl)
+    , mCanBeAvailable(false)
     , mGLName(0)
     , mType(0)
 {
diff --git a/dom/canvas/WebGLQuery.h b/dom/canvas/WebGLQuery.h
index 5886a75ed8a5..a9fbaabbbe78 100644
--- a/dom/canvas/WebGLQuery.h
+++ b/dom/canvas/WebGLQuery.h
@@ -10,6 +10,7 @@
 #include "nsWrapperCache.h"
 
 #include "WebGLObjectModel.h"
+#include "nsThreadUtils.h"
 
 namespace mozilla {
 
@@ -22,6 +23,19 @@ class WebGLQuery final
 public:
     explicit WebGLQuery(WebGLContext* webgl);
 
+    class AvailableRunnable final : public nsRunnable
+    {
+    public:
+        explicit AvailableRunnable(WebGLQuery* query) : mQuery(query) { }
+
+        NS_IMETHOD Run() override {
+            mQuery->mCanBeAvailable = true;
+            return NS_OK;
+        }
+    private:
+        const RefPtr<WebGLQuery> mQuery;
+    };
+
     bool IsActive() const;
 
     bool HasEverBeenActive() const {
@@ -42,6 +56,8 @@ public:
     NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(WebGLQuery)
     NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(WebGLQuery)
 
+    // Track whether the event loop has spun
+    bool mCanBeAvailable;
 
 private:
     ~WebGLQuery() {
diff --git a/gfx/thebes/gfxPrefs.h b/gfx/thebes/gfxPrefs.h
index 7bb41fdc8eb9..bde9f242fae0 100644
--- a/gfx/thebes/gfxPrefs.h
+++ b/gfx/thebes/gfxPrefs.h
@@ -437,6 +437,7 @@ private:
   DECL_GFX_PREF(Live, "webgl.msaa-force",                      WebGLForceMSAA, bool, false);
   DECL_GFX_PREF(Live, "webgl.prefer-16bpp",                    WebGLPrefer16bpp, bool, false);
   DECL_GFX_PREF(Live, "webgl.restore-context-when-visible",    WebGLRestoreWhenVisible, bool, true);
+  DECL_GFX_PREF(Live, "webgl.allow-immediate-queries",         WebGLImmediateQueries, bool, false);
 
   DECL_GFX_PREF(Live, "webgl.webgl2-compat-mode",              WebGL2CompatMode, bool, false);
 

From 84e0c59589ab4d44562e9840b976f7bf4d4d4d22 Mon Sep 17 00:00:00 2001
From: Andrew McCreight <continuation@gmail.com>
Date: Fri, 18 Dec 2015 14:22:01 -0800
Subject: [PATCH 081/101] Bug 1231964 - Move CC participant code that touches
 JS out of mozglue. r=smaug

The JS engine does not export symbols outside of XUL, so having these
defined inside mozglue apparently causes linking errors on some
platforms with the patches in bug 1120016.

This patch moves enough methods outside of mozglue that the patch in
that other bug will still link on all platforms, without moving so
much out that there are other linking errors.

--HG--
rename : xpcom/glue/nsCycleCollectionParticipant.cpp => xpcom/base/nsCycleCollectorTraceJSHelpers.cpp
---
 xpcom/base/moz.build                          |  1 +
 xpcom/base/nsCycleCollectorTraceJSHelpers.cpp | 90 +++++++++++++++++++
 xpcom/glue/nsCycleCollectionParticipant.cpp   | 90 -------------------
 xpcom/glue/nsCycleCollectionParticipant.h     |  3 +-
 4 files changed, 93 insertions(+), 91 deletions(-)
 create mode 100644 xpcom/base/nsCycleCollectorTraceJSHelpers.cpp

diff --git a/xpcom/base/moz.build b/xpcom/base/moz.build
index 7be101ced130..3efedf07b668 100644
--- a/xpcom/base/moz.build
+++ b/xpcom/base/moz.build
@@ -112,6 +112,7 @@ UNIFIED_SOURCES += [
     'nsConsoleMessage.cpp',
     'nsConsoleService.cpp',
     'nsCycleCollector.cpp',
+    'nsCycleCollectorTraceJSHelpers.cpp',
     'nsDumpUtils.cpp',
     'nsErrorService.cpp',
     'nsGZFileWriter.cpp',
diff --git a/xpcom/base/nsCycleCollectorTraceJSHelpers.cpp b/xpcom/base/nsCycleCollectorTraceJSHelpers.cpp
new file mode 100644
index 000000000000..7687be0ccebd
--- /dev/null
+++ b/xpcom/base/nsCycleCollectorTraceJSHelpers.cpp
@@ -0,0 +1,90 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsCycleCollectionParticipant.h"
+#include "jsapi.h"
+#include "jsfriendapi.h"
+
+void
+CycleCollectionNoteEdgeNameImpl(nsCycleCollectionTraversalCallback& aCallback,
+                                const char* aName,
+                                uint32_t aFlags)
+{
+  nsAutoCString arrayEdgeName(aName);
+  if (aFlags & CycleCollectionEdgeNameArrayFlag) {
+    arrayEdgeName.AppendLiteral("[i]");
+  }
+  aCallback.NoteNextEdgeName(arrayEdgeName.get());
+}
+
+void
+nsScriptObjectTracer::NoteJSChild(JS::GCCellPtr aGCThing, const char* aName,
+                                  void* aClosure)
+{
+  nsCycleCollectionTraversalCallback* cb =
+    static_cast<nsCycleCollectionTraversalCallback*>(aClosure);
+  NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(*cb, aName);
+  if (aGCThing.is<JSObject>()) {
+    cb->NoteJSObject(&aGCThing.as<JSObject>());
+  } else if (aGCThing.is<JSScript>()) {
+    cb->NoteJSScript(&aGCThing.as<JSScript>());
+  } else {
+    MOZ_ASSERT(!mozilla::AddToCCKind(aGCThing.kind()));
+  }
+}
+
+void
+TraceCallbackFunc::Trace(JS::Heap<JS::Value>* aPtr, const char* aName,
+                         void* aClosure) const
+{
+  if (aPtr->isMarkable()) {
+    mCallback(JS::GCCellPtr(*aPtr), aName, aClosure);
+  }
+}
+
+void
+TraceCallbackFunc::Trace(JS::Heap<jsid>* aPtr, const char* aName,
+                         void* aClosure) const
+{
+  if (JSID_IS_GCTHING(*aPtr)) {
+    mCallback(JSID_TO_GCTHING(*aPtr), aName, aClosure);
+  }
+}
+
+void
+TraceCallbackFunc::Trace(JS::Heap<JSObject*>* aPtr, const char* aName,
+                         void* aClosure) const
+{
+  mCallback(JS::GCCellPtr(aPtr->get()), aName, aClosure);
+}
+
+void
+TraceCallbackFunc::Trace(JS::TenuredHeap<JSObject*>* aPtr, const char* aName,
+                         void* aClosure) const
+{
+  mCallback(JS::GCCellPtr(aPtr->getPtr()), aName, aClosure);
+}
+
+void
+TraceCallbackFunc::Trace(JS::Heap<JSFunction*>* aPtr, const char* aName,
+                         void* aClosure) const
+{
+  mCallback(JS::GCCellPtr(aPtr->get()), aName, aClosure);
+}
+
+void
+TraceCallbackFunc::Trace(JS::Heap<JSString*>* aPtr, const char* aName,
+                         void* aClosure) const
+{
+  mCallback(JS::GCCellPtr(aPtr->get()), aName, aClosure);
+}
+
+void
+TraceCallbackFunc::Trace(JS::Heap<JSScript*>* aPtr, const char* aName,
+                         void* aClosure) const
+{
+  mCallback(JS::GCCellPtr(aPtr->get()), aName, aClosure);
+}
diff --git a/xpcom/glue/nsCycleCollectionParticipant.cpp b/xpcom/glue/nsCycleCollectionParticipant.cpp
index ec452e9b013d..973ef2ff5922 100644
--- a/xpcom/glue/nsCycleCollectionParticipant.cpp
+++ b/xpcom/glue/nsCycleCollectionParticipant.cpp
@@ -5,32 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsCycleCollectionParticipant.h"
-#include "mozilla/CycleCollectedJSRuntime.h"
 #include "nsCOMPtr.h"
-#include "jsapi.h"
-#include "jsfriendapi.h"
-
-#ifdef MOZILLA_INTERNAL_API
-#include "nsString.h"
-#else
-#include "nsStringAPI.h"
-#endif
-
-void
-nsScriptObjectTracer::NoteJSChild(JS::GCCellPtr aGCThing, const char* aName,
-                                  void* aClosure)
-{
-  nsCycleCollectionTraversalCallback* cb =
-    static_cast<nsCycleCollectionTraversalCallback*>(aClosure);
-  NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(*cb, aName);
-  if (aGCThing.is<JSObject>()) {
-    cb->NoteJSObject(&aGCThing.as<JSObject>());
-  } else if (aGCThing.is<JSScript>()) {
-    cb->NoteJSScript(&aGCThing.as<JSScript>());
-  } else {
-    MOZ_ASSERT(!mozilla::AddToCCKind(aGCThing.kind()));
-  }
-}
 
 NS_IMETHODIMP_(void)
 nsXPCOMCycleCollectionParticipant::Root(void* aPtr)
@@ -62,68 +37,3 @@ nsXPCOMCycleCollectionParticipant::CheckForRightISupports(nsISupports* aSupports
                             reinterpret_cast<void**>(&foo));
   return aSupports == foo;
 }
-
-void
-CycleCollectionNoteEdgeNameImpl(nsCycleCollectionTraversalCallback& aCallback,
-                                const char* aName,
-                                uint32_t aFlags)
-{
-  nsAutoCString arrayEdgeName(aName);
-  if (aFlags & CycleCollectionEdgeNameArrayFlag) {
-    arrayEdgeName.AppendLiteral("[i]");
-  }
-  aCallback.NoteNextEdgeName(arrayEdgeName.get());
-}
-
-void
-TraceCallbackFunc::Trace(JS::Heap<JS::Value>* aPtr, const char* aName,
-                         void* aClosure) const
-{
-  if (aPtr->isMarkable()) {
-    mCallback(JS::GCCellPtr(*aPtr), aName, aClosure);
-  }
-}
-
-void
-TraceCallbackFunc::Trace(JS::Heap<jsid>* aPtr, const char* aName,
-                         void* aClosure) const
-{
-  if (JSID_IS_GCTHING(*aPtr)) {
-    mCallback(JSID_TO_GCTHING(*aPtr), aName, aClosure);
-  }
-}
-
-void
-TraceCallbackFunc::Trace(JS::Heap<JSObject*>* aPtr, const char* aName,
-                         void* aClosure) const
-{
-  mCallback(JS::GCCellPtr(aPtr->get()), aName, aClosure);
-}
-
-void
-TraceCallbackFunc::Trace(JS::TenuredHeap<JSObject*>* aPtr, const char* aName,
-                         void* aClosure) const
-{
-  mCallback(JS::GCCellPtr(aPtr->getPtr()), aName, aClosure);
-}
-
-void
-TraceCallbackFunc::Trace(JS::Heap<JSFunction*>* aPtr, const char* aName,
-                         void* aClosure) const
-{
-  mCallback(JS::GCCellPtr(aPtr->get()), aName, aClosure);
-}
-
-void
-TraceCallbackFunc::Trace(JS::Heap<JSString*>* aPtr, const char* aName,
-                         void* aClosure) const
-{
-  mCallback(JS::GCCellPtr(aPtr->get()), aName, aClosure);
-}
-
-void
-TraceCallbackFunc::Trace(JS::Heap<JSScript*>* aPtr, const char* aName,
-                         void* aClosure) const
-{
-  mCallback(JS::GCCellPtr(aPtr->get()), aName, aClosure);
-}
diff --git a/xpcom/glue/nsCycleCollectionParticipant.h b/xpcom/glue/nsCycleCollectionParticipant.h
index e20094665860..5db54b3adc8b 100644
--- a/xpcom/glue/nsCycleCollectionParticipant.h
+++ b/xpcom/glue/nsCycleCollectionParticipant.h
@@ -76,7 +76,7 @@ struct TraceCallbacks
 
 /*
  * An implementation of TraceCallbacks that calls a single function for all JS
- * GC thing types encountered.
+ * GC thing types encountered. Implemented in nsCycleCollectorTraceJSHelpers.cpp.
  */
 struct TraceCallbackFunc : public TraceCallbacks
 {
@@ -184,6 +184,7 @@ public:
   NS_IMETHOD_(void) Trace(void* aPtr, const TraceCallbacks& aCb,
                           void* aClosure) override = 0;
 
+  // Implemented in nsCycleCollectorTraceJSHelpers.cpp.
   static void NoteJSChild(JS::GCCellPtr aGCThing, const char* aName,
                           void* aClosure);
 };

From b2983753d0b634235f1c9afe2d0ae2440c8ac1df Mon Sep 17 00:00:00 2001
From: Armen Zambrano Gasparnian <armenzg@mozilla.com>
Date: Fri, 18 Dec 2015 10:12:57 -0500
Subject: [PATCH 082/101] Bug 1233725 - Schedule TC Linux 64 debug crashtest
 jobs to run side by side. DONTBUILD. r=jmaher

--HG--
extra : rebase_source : f623b1a2f1708e5cec0b6e16aa7842805b16bf88
---
 testing/taskcluster/tasks/branches/base_jobs.yml     | 2 ++
 testing/taskcluster/tasks/branches/try/job_flags.yml | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/testing/taskcluster/tasks/branches/base_jobs.yml b/testing/taskcluster/tasks/branches/base_jobs.yml
index 7fae77d3fbc1..3e77cb376575 100644
--- a/testing/taskcluster/tasks/branches/base_jobs.yml
+++ b/testing/taskcluster/tasks/branches/base_jobs.yml
@@ -190,6 +190,8 @@ tests:
     allowed_build_tasks:
       tasks/builds/b2g_emulator_x86_kk_opt.yml:
         task: tasks/tests/b2g_emulator_crashtest.yml
+      tasks/builds/dbg_linux64.yml:
+        task: tasks/tests/fx_linux64_cppunit.yml
   gaia-build:
     allowed_build_tasks:
       tasks/builds/b2g_desktop_opt.yml:
diff --git a/testing/taskcluster/tasks/branches/try/job_flags.yml b/testing/taskcluster/tasks/branches/try/job_flags.yml
index b91d4bd17cf6..c358734ea84d 100644
--- a/testing/taskcluster/tasks/branches/try/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/try/job_flags.yml
@@ -148,6 +148,10 @@ tests:
     allowed_build_tasks:
       tasks/builds/dbg_linux64_clobber.yml:
         task: tasks/tests/fx_linux64_cppunit.yml
+  crashtest:
+    allowed_build_tasks:
+      tasks/builds/dbg_linux64_clobber.yml:
+        task: tasks/tests/fx_linux64_crashtest.yml
   jittests:
     allowed_build_tasks:
       tasks/builds/dbg_linux64_clobber.yml:

From cbf0bdd39b6300537bd0d247c2e7ed6b6e172ff0 Mon Sep 17 00:00:00 2001
From: Jim Blandy <jimb@mozilla.com>
Date: Thu, 17 Dec 2015 13:55:35 -0800
Subject: [PATCH 083/101] Bug 1233302: Don't crash if we can't open
 /dev/urandom; just fall back to PRMJ_Now.

--HG--
extra : rebase_source : 1b6096ade66f81e3a3e7517881b6c122df59e6ec
---
 js/src/jsmath.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/js/src/jsmath.cpp b/js/src/jsmath.cpp
index abb171fdc5a1..c1f1f2603b78 100644
--- a/js/src/jsmath.cpp
+++ b/js/src/jsmath.cpp
@@ -797,12 +797,10 @@ GenerateSeed(uint64_t* seedBuffer, size_t length)
 
 #elif defined(XP_UNIX)
     int fd = open("/dev/urandom", O_RDONLY);
-    MOZ_ASSERT(fd >= 0, "Can't open /dev/urandom?!");
     if (fd >= 0) {
         ssize_t size = length * sizeof(seedBuffer[0]);
         ssize_t nread = read(fd, (char *) seedBuffer, size);
         close(fd);
-        MOZ_ASSERT(nread == size, "Can't read /dev/urandom?!");
         if (nread == size)
             return;
     }

From f645b62a179663202ef663d2a048b622e62e7c5c Mon Sep 17 00:00:00 2001
From: James Graham <james@hoppipolla.co.uk>
Date: Thu, 17 Dec 2015 09:46:17 +0000
Subject: [PATCH 084/101] Bug 1233726 - Update web-platform-tests to revision
 05c55fbdc527eacdc7b875f298a8cb1b6db0dfcd, a=testonly

--HG--
rename : testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction.xhtml => testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Document-getElementsByTagName.xhtml => testing/web-platform/tests/dom/nodes/Document-getElementsByTagName-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/DocumentType-literal.xhtml => testing/web-platform/tests/dom/nodes/DocumentType-literal-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-childElement-null.svg => testing/web-platform/tests/dom/nodes/Element-childElement-null-svg.svg
rename : testing/web-platform/tests/dom/nodes/Element-childElement-null.xhtml => testing/web-platform/tests/dom/nodes/Element-childElement-null-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add.svg => testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add-svg.svg
rename : testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add.xhtml => testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove.svg => testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove-svg.svg
rename : testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove.xhtml => testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild.svg => testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild-svg.svg
rename : testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild.xhtml => testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-childElementCount.svg => testing/web-platform/tests/dom/nodes/Element-childElementCount-svg.svg
rename : testing/web-platform/tests/dom/nodes/Element-childElementCount.xhtml => testing/web-platform/tests/dom/nodes/Element-childElementCount-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-firstElementChild-entity.xhtml => testing/web-platform/tests/dom/nodes/Element-firstElementChild-entity-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace.svg => testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace-svg.svg
rename : testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace.xhtml => testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-firstElementChild.svg => testing/web-platform/tests/dom/nodes/Element-firstElementChild-svg.svg
rename : testing/web-platform/tests/dom/nodes/Element-firstElementChild.xhtml => testing/web-platform/tests/dom/nodes/Element-firstElementChild-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-lastElementChild.svg => testing/web-platform/tests/dom/nodes/Element-lastElementChild-svg.svg
rename : testing/web-platform/tests/dom/nodes/Element-lastElementChild.xhtml => testing/web-platform/tests/dom/nodes/Element-lastElementChild-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-nextElementSibling.svg => testing/web-platform/tests/dom/nodes/Element-nextElementSibling-svg.svg
rename : testing/web-platform/tests/dom/nodes/Element-nextElementSibling.xhtml => testing/web-platform/tests/dom/nodes/Element-nextElementSibling-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-previousElementSibling.svg => testing/web-platform/tests/dom/nodes/Element-previousElementSibling-svg.svg
rename : testing/web-platform/tests/dom/nodes/Element-previousElementSibling.xhtml => testing/web-platform/tests/dom/nodes/Element-previousElementSibling-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Element-siblingElement-null.svg => testing/web-platform/tests/dom/nodes/Element-siblingElement-null-svg.svg
rename : testing/web-platform/tests/dom/nodes/Element-siblingElement-null.xhtml => testing/web-platform/tests/dom/nodes/Element-siblingElement-null-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/Node-nodeName.xhtml => testing/web-platform/tests/dom/nodes/Node-nodeName-xhtml.xhtml
rename : testing/web-platform/tests/dom/nodes/ParentNode-querySelector-All.xht => testing/web-platform/tests/dom/nodes/ParentNode-querySelector-All-xht.xht
rename : testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.xhtml => testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case-xhtml.xhtml
rename : testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.xhtml => testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id-xhtml.xhtml
rename : testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.xhtml => testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace-xhtml.xhtml
rename : testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.xhtml => testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements-xhtml.xhtml
rename : testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.xhtml => testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef-xhtml.xhtml
rename : testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.xhtml => testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param-xhtml.xhtml
rename : testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-event.xhtml => testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-event-xhtml.xhtml
rename : testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text.xhtml => testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text-xhtml.xhtml
rename : testing/web-platform/tests/url/a-element.xhtml => testing/web-platform/tests/url/a-element-xhtml.xhtml
---
 testing/web-platform/meta/MANIFEST.json       |  277 +--
 testing/web-platform/meta/mozilla-sync        |    2 +-
 .../battery-created-manual.html               |   54 -
 .../tests/conformance-checkers/messages.json  | 1582 ++++++++---------
 .../media-src/media-src-redir-bug.sub.html    |   66 +
 .../media-src-redir-bug.sub.html.sub.headers  |    6 +
 ...t-createProcessingInstruction-xhtml.xhtml} |    0
 ...Document-getElementsByTagName-xhtml.xhtml} |    0
 ...xhtml => DocumentType-literal-xhtml.xhtml} |    0
 ....svg => Element-childElement-null-svg.svg} |    0
 ... => Element-childElement-null-xhtml.xhtml} |    0
 ...ent-childElementCount-dynamic-add-svg.svg} |    0
 ...childElementCount-dynamic-add-xhtml.xhtml} |    0
 ...-childElementCount-dynamic-remove-svg.svg} |    0
 ...ldElementCount-dynamic-remove-xhtml.xhtml} |    0
 ...Element-childElementCount-nochild-svg.svg} |    0
 ...ent-childElementCount-nochild-xhtml.xhtml} |    0
 ....svg => Element-childElementCount-svg.svg} |    0
 ... => Element-childElementCount-xhtml.xhtml} |    0
 ...ment-firstElementChild-entity-xhtml.xhtml} |    0
 ...ement-firstElementChild-namespace-svg.svg} |    0
 ...t-firstElementChild-namespace-xhtml.xhtml} |    0
 ....svg => Element-firstElementChild-svg.svg} |    0
 ... => Element-firstElementChild-xhtml.xhtml} |    0
 ...d.svg => Element-lastElementChild-svg.svg} |    0
 ...l => Element-lastElementChild-xhtml.xhtml} |    0
 ...svg => Element-nextElementSibling-svg.svg} |    0
 ...=> Element-nextElementSibling-xhtml.xhtml} |    0
 ...=> Element-previousElementSibling-svg.svg} |    0
 ...lement-previousElementSibling-xhtml.xhtml} |    0
 ...vg => Element-siblingElement-null-svg.svg} |    0
 ...> Element-siblingElement-null-xhtml.xhtml} |    0
 ...deName.xhtml => Node-nodeName-xhtml.xhtml} |    0
 ...t => ParentNode-querySelector-All-xht.xht} |    0
 ...cument.getElementsByName-case-xhtml.xhtml} |    0
 ...document.getElementsByName-id-xhtml.xhtml} |    0
 ...t.getElementsByName-namespace-xhtml.xhtml} |    0
 ...getElementsByName-newelements-xhtml.xhtml} |    0
 ....getElementsByName-null-undef-xhtml.xhtml} |    0
 ...ument.getElementsByName-param-xhtml.xhtml} |    0
 .../document-color-02.html                    |    6 +
 .../document-color-03.html                    |    6 +
 .../current-pixel-density/basic.html          |    8 +-
 .../the-input-element/maxlength-manual.html   |   37 +
 .../forms/the-input-element/maxlength.html    |   55 +
 ...ent.xhtml => script-for-event-xhtml.xhtml} |    0
 ...ipt-text.xhtml => script-text-xhtml.xhtml} |    0
 .../tests/html/syntax/parsing/README          |    2 +-
 .../tests/html/syntax/parsing/test.js         |   17 +-
 .../web-platform/tests/resources/docs/api.md  |    2 +-
 .../tests/resources/idlharness.js             |   24 +
 .../tests/resources/webidl2/README.md         |   39 +-
 .../tests/resources/webidl2/lib/webidl2.js    |   76 +-
 .../tests/resources/webidl2/package.json      |   10 +-
 .../test/invalid/idl/maplike-1type.widl       |    3 -
 .../test/invalid/idl/readonly-iterable.widl   |    3 -
 .../test/invalid/idl/setlike-2types.widl      |    3 -
 .../test/invalid/idl/typedef-nested.widl      |   22 -
 .../test/invalid/json/maplike-1type.json      |    4 -
 .../test/invalid/json/readonly-iterable.json  |    4 -
 .../test/invalid/json/setlike-2types.json     |    4 -
 .../test/invalid/json/typedef-nested.json     |    4 -
 .../tests/resources/webidl2/test/syntax.js    |    7 +-
 .../webidl2/test/syntax/idl/callback.widl     |    4 +-
 .../webidl2/test/syntax/idl/enum.widl         |    4 +-
 .../test/syntax/idl/extended-attributes.widl  |    6 -
 .../webidl2/test/syntax/idl/iterable.widl     |    7 -
 .../test/syntax/idl/legacyiterable.widl       |    3 -
 .../webidl2/test/syntax/idl/maplike.widl      |    7 -
 .../webidl2/test/syntax/idl/setlike.widl      |    7 -
 .../test/syntax/idl/typedef-nested.widl       |   22 -
 .../webidl2/test/syntax/json/callback.json    |   43 -
 .../webidl2/test/syntax/json/enum.json        |   10 -
 .../test/syntax/json/extended-attributes.json |   30 -
 .../webidl2/test/syntax/json/iterable.json    |   55 -
 .../test/syntax/json/legacyiterable.json      |   24 -
 .../webidl2/test/syntax/json/maplike.json     |   67 -
 .../webidl2/test/syntax/json/setlike.json     |   47 -
 .../test/syntax/json/typedef-nested.json      |  226 ---
 .../test/syntax/opt/typedef-nested.json       |    3 -
 .../attribute-case/semantics.html             |   22 +-
 .../attribute-case/syntax.html                |    2 +
 .../web-platform/tests/svg/interfaces.html    | 1568 ++++++++++++++++
 .../web-platform/tests/tools/manifest/item.py |   10 +-
 .../tests/tools/manifest/manifest.py          |   14 +-
 .../tests/tools/manifest/utils.py             |    6 +
 ...{a-element.xhtml => a-element-xhtml.xhtml} |    0
 .../tests/webgl/compressedTexSubImage2D.html  |    2 -
 88 files changed, 2769 insertions(+), 1743 deletions(-)
 delete mode 100644 testing/web-platform/tests/battery-status/battery-created-manual.html
 create mode 100644 testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html
 create mode 100644 testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html.sub.headers
 rename testing/web-platform/tests/dom/nodes/{Document-createProcessingInstruction.xhtml => Document-createProcessingInstruction-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Document-getElementsByTagName.xhtml => Document-getElementsByTagName-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{DocumentType-literal.xhtml => DocumentType-literal-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElement-null.svg => Element-childElement-null-svg.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElement-null.xhtml => Element-childElement-null-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElementCount-dynamic-add.svg => Element-childElementCount-dynamic-add-svg.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElementCount-dynamic-add.xhtml => Element-childElementCount-dynamic-add-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElementCount-dynamic-remove.svg => Element-childElementCount-dynamic-remove-svg.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElementCount-dynamic-remove.xhtml => Element-childElementCount-dynamic-remove-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElementCount-nochild.svg => Element-childElementCount-nochild-svg.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElementCount-nochild.xhtml => Element-childElementCount-nochild-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElementCount.svg => Element-childElementCount-svg.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-childElementCount.xhtml => Element-childElementCount-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-firstElementChild-entity.xhtml => Element-firstElementChild-entity-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-firstElementChild-namespace.svg => Element-firstElementChild-namespace-svg.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-firstElementChild-namespace.xhtml => Element-firstElementChild-namespace-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-firstElementChild.svg => Element-firstElementChild-svg.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-firstElementChild.xhtml => Element-firstElementChild-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-lastElementChild.svg => Element-lastElementChild-svg.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-lastElementChild.xhtml => Element-lastElementChild-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-nextElementSibling.svg => Element-nextElementSibling-svg.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-nextElementSibling.xhtml => Element-nextElementSibling-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-previousElementSibling.svg => Element-previousElementSibling-svg.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-previousElementSibling.xhtml => Element-previousElementSibling-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-siblingElement-null.svg => Element-siblingElement-null-svg.svg} (100%)
 rename testing/web-platform/tests/dom/nodes/{Element-siblingElement-null.xhtml => Element-siblingElement-null-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{Node-nodeName.xhtml => Node-nodeName-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/dom/nodes/{ParentNode-querySelector-All.xht => ParentNode-querySelector-All-xht.xht} (100%)
 rename testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/{document.getElementsByName-case.xhtml => document.getElementsByName-case-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/{document.getElementsByName-id.xhtml => document.getElementsByName-id-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/{document.getElementsByName-namespace.xhtml => document.getElementsByName-namespace-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/{document.getElementsByName-newelements.xhtml => document.getElementsByName-newelements-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/{document.getElementsByName-null-undef.xhtml => document.getElementsByName-null-undef-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/{document.getElementsByName-param.xhtml => document.getElementsByName-param-xhtml.xhtml} (100%)
 create mode 100644 testing/web-platform/tests/html/semantics/forms/the-input-element/maxlength-manual.html
 create mode 100644 testing/web-platform/tests/html/semantics/forms/the-input-element/maxlength.html
 rename testing/web-platform/tests/html/semantics/scripting-1/the-script-element/{script-for-event.xhtml => script-for-event-xhtml.xhtml} (100%)
 rename testing/web-platform/tests/html/semantics/scripting-1/the-script-element/{script-text.xhtml => script-text-xhtml.xhtml} (100%)
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/invalid/idl/maplike-1type.widl
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/invalid/idl/readonly-iterable.widl
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/invalid/idl/setlike-2types.widl
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/invalid/idl/typedef-nested.widl
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/invalid/json/maplike-1type.json
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/invalid/json/readonly-iterable.json
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/invalid/json/setlike-2types.json
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/invalid/json/typedef-nested.json
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/idl/extended-attributes.widl
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/idl/iterable.widl
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/idl/legacyiterable.widl
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/idl/maplike.widl
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/idl/setlike.widl
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/idl/typedef-nested.widl
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/json/extended-attributes.json
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/json/iterable.json
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/json/legacyiterable.json
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/json/maplike.json
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/json/setlike.json
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/json/typedef-nested.json
 delete mode 100644 testing/web-platform/tests/resources/webidl2/test/syntax/opt/typedef-nested.json
 create mode 100644 testing/web-platform/tests/svg/interfaces.html
 rename testing/web-platform/tests/url/{a-element.xhtml => a-element-xhtml.xhtml} (100%)

diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
index 4212224a2310..bfc10281dd9e 100644
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -101,10 +101,6 @@
         "path": "battery-status/battery-charging-manual.html",
         "url": "/battery-status/battery-charging-manual.html"
       },
-      {
-        "path": "battery-status/battery-created-manual.html",
-        "url": "/battery-status/battery-created-manual.html"
-      },
       {
         "path": "battery-status/battery-discharging-manual.html",
         "url": "/battery-status/battery-discharging-manual.html"
@@ -777,6 +773,10 @@
         "path": "html/semantics/forms/the-input-element/file-manual.html",
         "url": "/html/semantics/forms/the-input-element/file-manual.html"
       },
+      {
+        "path": "html/semantics/forms/the-input-element/maxlength-manual.html",
+        "url": "/html/semantics/forms/the-input-element/maxlength-manual.html"
+      },
       {
         "path": "html/semantics/forms/the-optgroup-element/optgroup-disabled-manual.html",
         "url": "/html/semantics/forms/the-optgroup-element/optgroup-disabled-manual.html"
@@ -13091,6 +13091,10 @@
         "path": "content-security-policy/media-src/media-src-7_3_2.html",
         "url": "/content-security-policy/media-src/media-src-7_3_2.html"
       },
+      {
+        "path": "content-security-policy/media-src/media-src-redir-bug.sub.html",
+        "url": "/content-security-policy/media-src/media-src-redir-bug.sub.html"
+      },
       {
         "path": "content-security-policy/meta/meta-img-src.html",
         "url": "/content-security-policy/meta/meta-img-src.html"
@@ -13267,10 +13271,6 @@
         "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-move-element-test.html",
         "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-move-element-test.html"
       },
-      {
-        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-test.html",
-        "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-test.html"
-      },
       {
         "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-change-attribute-test.html",
         "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-change-attribute-test.html"
@@ -13740,12 +13740,12 @@
         "url": "/dom/nodes/Document-createEvent.html"
       },
       {
-        "path": "dom/nodes/Document-createProcessingInstruction.html",
-        "url": "/dom/nodes/Document-createProcessingInstruction.html"
+        "path": "dom/nodes/Document-createProcessingInstruction-xhtml.xhtml",
+        "url": "/dom/nodes/Document-createProcessingInstruction-xhtml.xhtml"
       },
       {
-        "path": "dom/nodes/Document-createProcessingInstruction.xhtml",
-        "url": "/dom/nodes/Document-createProcessingInstruction.xhtml"
+        "path": "dom/nodes/Document-createProcessingInstruction.html",
+        "url": "/dom/nodes/Document-createProcessingInstruction.html"
       },
       {
         "path": "dom/nodes/Document-createTextNode.html",
@@ -13764,12 +13764,12 @@
         "url": "/dom/nodes/Document-getElementById.html"
       },
       {
-        "path": "dom/nodes/Document-getElementsByTagName.html",
-        "url": "/dom/nodes/Document-getElementsByTagName.html"
+        "path": "dom/nodes/Document-getElementsByTagName-xhtml.xhtml",
+        "url": "/dom/nodes/Document-getElementsByTagName-xhtml.xhtml"
       },
       {
-        "path": "dom/nodes/Document-getElementsByTagName.xhtml",
-        "url": "/dom/nodes/Document-getElementsByTagName.xhtml"
+        "path": "dom/nodes/Document-getElementsByTagName.html",
+        "url": "/dom/nodes/Document-getElementsByTagName.html"
       },
       {
         "path": "dom/nodes/Document-getElementsByTagNameNS.html",
@@ -13784,77 +13784,77 @@
         "url": "/dom/nodes/Document-importNode.html"
       },
       {
-        "path": "dom/nodes/DocumentType-literal.html",
-        "url": "/dom/nodes/DocumentType-literal.html"
+        "path": "dom/nodes/DocumentType-literal-xhtml.xhtml",
+        "url": "/dom/nodes/DocumentType-literal-xhtml.xhtml"
       },
       {
-        "path": "dom/nodes/DocumentType-literal.xhtml",
-        "url": "/dom/nodes/DocumentType-literal.xhtml"
+        "path": "dom/nodes/DocumentType-literal.html",
+        "url": "/dom/nodes/DocumentType-literal.html"
       },
       {
         "path": "dom/nodes/DocumentType-remove.html",
         "url": "/dom/nodes/DocumentType-remove.html"
       },
+      {
+        "path": "dom/nodes/Element-childElement-null-svg.svg",
+        "url": "/dom/nodes/Element-childElement-null-svg.svg"
+      },
+      {
+        "path": "dom/nodes/Element-childElement-null-xhtml.xhtml",
+        "url": "/dom/nodes/Element-childElement-null-xhtml.xhtml"
+      },
       {
         "path": "dom/nodes/Element-childElement-null.html",
         "url": "/dom/nodes/Element-childElement-null.html"
       },
       {
-        "path": "dom/nodes/Element-childElement-null.svg",
-        "url": "/dom/nodes/Element-childElement-null.svg"
+        "path": "dom/nodes/Element-childElementCount-dynamic-add-svg.svg",
+        "url": "/dom/nodes/Element-childElementCount-dynamic-add-svg.svg"
       },
       {
-        "path": "dom/nodes/Element-childElement-null.xhtml",
-        "url": "/dom/nodes/Element-childElement-null.xhtml"
+        "path": "dom/nodes/Element-childElementCount-dynamic-add-xhtml.xhtml",
+        "url": "/dom/nodes/Element-childElementCount-dynamic-add-xhtml.xhtml"
       },
       {
         "path": "dom/nodes/Element-childElementCount-dynamic-add.html",
         "url": "/dom/nodes/Element-childElementCount-dynamic-add.html"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-dynamic-add.svg",
-        "url": "/dom/nodes/Element-childElementCount-dynamic-add.svg"
+        "path": "dom/nodes/Element-childElementCount-dynamic-remove-svg.svg",
+        "url": "/dom/nodes/Element-childElementCount-dynamic-remove-svg.svg"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-dynamic-add.xhtml",
-        "url": "/dom/nodes/Element-childElementCount-dynamic-add.xhtml"
+        "path": "dom/nodes/Element-childElementCount-dynamic-remove-xhtml.xhtml",
+        "url": "/dom/nodes/Element-childElementCount-dynamic-remove-xhtml.xhtml"
       },
       {
         "path": "dom/nodes/Element-childElementCount-dynamic-remove.html",
         "url": "/dom/nodes/Element-childElementCount-dynamic-remove.html"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-dynamic-remove.svg",
-        "url": "/dom/nodes/Element-childElementCount-dynamic-remove.svg"
+        "path": "dom/nodes/Element-childElementCount-nochild-svg.svg",
+        "url": "/dom/nodes/Element-childElementCount-nochild-svg.svg"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-dynamic-remove.xhtml",
-        "url": "/dom/nodes/Element-childElementCount-dynamic-remove.xhtml"
+        "path": "dom/nodes/Element-childElementCount-nochild-xhtml.xhtml",
+        "url": "/dom/nodes/Element-childElementCount-nochild-xhtml.xhtml"
       },
       {
         "path": "dom/nodes/Element-childElementCount-nochild.html",
         "url": "/dom/nodes/Element-childElementCount-nochild.html"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-nochild.svg",
-        "url": "/dom/nodes/Element-childElementCount-nochild.svg"
+        "path": "dom/nodes/Element-childElementCount-svg.svg",
+        "url": "/dom/nodes/Element-childElementCount-svg.svg"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-nochild.xhtml",
-        "url": "/dom/nodes/Element-childElementCount-nochild.xhtml"
+        "path": "dom/nodes/Element-childElementCount-xhtml.xhtml",
+        "url": "/dom/nodes/Element-childElementCount-xhtml.xhtml"
       },
       {
         "path": "dom/nodes/Element-childElementCount.html",
         "url": "/dom/nodes/Element-childElementCount.html"
       },
-      {
-        "path": "dom/nodes/Element-childElementCount.svg",
-        "url": "/dom/nodes/Element-childElementCount.svg"
-      },
-      {
-        "path": "dom/nodes/Element-childElementCount.xhtml",
-        "url": "/dom/nodes/Element-childElementCount.xhtml"
-      },
       {
         "path": "dom/nodes/Element-children.html",
         "url": "/dom/nodes/Element-children.html"
@@ -13867,38 +13867,38 @@
         "path": "dom/nodes/Element-closest.html",
         "url": "/dom/nodes/Element-closest.html"
       },
+      {
+        "path": "dom/nodes/Element-firstElementChild-entity-xhtml.xhtml",
+        "url": "/dom/nodes/Element-firstElementChild-entity-xhtml.xhtml"
+      },
       {
         "path": "dom/nodes/Element-firstElementChild-entity.svg",
         "url": "/dom/nodes/Element-firstElementChild-entity.svg"
       },
       {
-        "path": "dom/nodes/Element-firstElementChild-entity.xhtml",
-        "url": "/dom/nodes/Element-firstElementChild-entity.xhtml"
+        "path": "dom/nodes/Element-firstElementChild-namespace-svg.svg",
+        "url": "/dom/nodes/Element-firstElementChild-namespace-svg.svg"
+      },
+      {
+        "path": "dom/nodes/Element-firstElementChild-namespace-xhtml.xhtml",
+        "url": "/dom/nodes/Element-firstElementChild-namespace-xhtml.xhtml"
       },
       {
         "path": "dom/nodes/Element-firstElementChild-namespace.html",
         "url": "/dom/nodes/Element-firstElementChild-namespace.html"
       },
       {
-        "path": "dom/nodes/Element-firstElementChild-namespace.svg",
-        "url": "/dom/nodes/Element-firstElementChild-namespace.svg"
+        "path": "dom/nodes/Element-firstElementChild-svg.svg",
+        "url": "/dom/nodes/Element-firstElementChild-svg.svg"
       },
       {
-        "path": "dom/nodes/Element-firstElementChild-namespace.xhtml",
-        "url": "/dom/nodes/Element-firstElementChild-namespace.xhtml"
+        "path": "dom/nodes/Element-firstElementChild-xhtml.xhtml",
+        "url": "/dom/nodes/Element-firstElementChild-xhtml.xhtml"
       },
       {
         "path": "dom/nodes/Element-firstElementChild.html",
         "url": "/dom/nodes/Element-firstElementChild.html"
       },
-      {
-        "path": "dom/nodes/Element-firstElementChild.svg",
-        "url": "/dom/nodes/Element-firstElementChild.svg"
-      },
-      {
-        "path": "dom/nodes/Element-firstElementChild.xhtml",
-        "url": "/dom/nodes/Element-firstElementChild.xhtml"
-      },
       {
         "path": "dom/nodes/Element-getElementsByClassName.html",
         "url": "/dom/nodes/Element-getElementsByClassName.html"
@@ -13915,46 +13915,46 @@
         "path": "dom/nodes/Element-getElementsByTagNameNS.html",
         "url": "/dom/nodes/Element-getElementsByTagNameNS.html"
       },
+      {
+        "path": "dom/nodes/Element-lastElementChild-svg.svg",
+        "url": "/dom/nodes/Element-lastElementChild-svg.svg"
+      },
+      {
+        "path": "dom/nodes/Element-lastElementChild-xhtml.xhtml",
+        "url": "/dom/nodes/Element-lastElementChild-xhtml.xhtml"
+      },
       {
         "path": "dom/nodes/Element-lastElementChild.html",
         "url": "/dom/nodes/Element-lastElementChild.html"
       },
-      {
-        "path": "dom/nodes/Element-lastElementChild.svg",
-        "url": "/dom/nodes/Element-lastElementChild.svg"
-      },
-      {
-        "path": "dom/nodes/Element-lastElementChild.xhtml",
-        "url": "/dom/nodes/Element-lastElementChild.xhtml"
-      },
       {
         "path": "dom/nodes/Element-matches.html",
         "url": "/dom/nodes/Element-matches.html"
       },
+      {
+        "path": "dom/nodes/Element-nextElementSibling-svg.svg",
+        "url": "/dom/nodes/Element-nextElementSibling-svg.svg"
+      },
+      {
+        "path": "dom/nodes/Element-nextElementSibling-xhtml.xhtml",
+        "url": "/dom/nodes/Element-nextElementSibling-xhtml.xhtml"
+      },
       {
         "path": "dom/nodes/Element-nextElementSibling.html",
         "url": "/dom/nodes/Element-nextElementSibling.html"
       },
       {
-        "path": "dom/nodes/Element-nextElementSibling.svg",
-        "url": "/dom/nodes/Element-nextElementSibling.svg"
+        "path": "dom/nodes/Element-previousElementSibling-svg.svg",
+        "url": "/dom/nodes/Element-previousElementSibling-svg.svg"
       },
       {
-        "path": "dom/nodes/Element-nextElementSibling.xhtml",
-        "url": "/dom/nodes/Element-nextElementSibling.xhtml"
+        "path": "dom/nodes/Element-previousElementSibling-xhtml.xhtml",
+        "url": "/dom/nodes/Element-previousElementSibling-xhtml.xhtml"
       },
       {
         "path": "dom/nodes/Element-previousElementSibling.html",
         "url": "/dom/nodes/Element-previousElementSibling.html"
       },
-      {
-        "path": "dom/nodes/Element-previousElementSibling.svg",
-        "url": "/dom/nodes/Element-previousElementSibling.svg"
-      },
-      {
-        "path": "dom/nodes/Element-previousElementSibling.xhtml",
-        "url": "/dom/nodes/Element-previousElementSibling.xhtml"
-      },
       {
         "path": "dom/nodes/Element-remove.html",
         "url": "/dom/nodes/Element-remove.html"
@@ -13963,18 +13963,18 @@
         "path": "dom/nodes/Element-removeAttributeNS.html",
         "url": "/dom/nodes/Element-removeAttributeNS.html"
       },
+      {
+        "path": "dom/nodes/Element-siblingElement-null-svg.svg",
+        "url": "/dom/nodes/Element-siblingElement-null-svg.svg"
+      },
+      {
+        "path": "dom/nodes/Element-siblingElement-null-xhtml.xhtml",
+        "url": "/dom/nodes/Element-siblingElement-null-xhtml.xhtml"
+      },
       {
         "path": "dom/nodes/Element-siblingElement-null.html",
         "url": "/dom/nodes/Element-siblingElement-null.html"
       },
-      {
-        "path": "dom/nodes/Element-siblingElement-null.svg",
-        "url": "/dom/nodes/Element-siblingElement-null.svg"
-      },
-      {
-        "path": "dom/nodes/Element-siblingElement-null.xhtml",
-        "url": "/dom/nodes/Element-siblingElement-null.xhtml"
-      },
       {
         "path": "dom/nodes/Element-tagName.html",
         "url": "/dom/nodes/Element-tagName.html"
@@ -14056,12 +14056,12 @@
         "url": "/dom/nodes/Node-lookupPrefix.xhtml"
       },
       {
-        "path": "dom/nodes/Node-nodeName.html",
-        "url": "/dom/nodes/Node-nodeName.html"
+        "path": "dom/nodes/Node-nodeName-xhtml.xhtml",
+        "url": "/dom/nodes/Node-nodeName-xhtml.xhtml"
       },
       {
-        "path": "dom/nodes/Node-nodeName.xhtml",
-        "url": "/dom/nodes/Node-nodeName.xhtml"
+        "path": "dom/nodes/Node-nodeName.html",
+        "url": "/dom/nodes/Node-nodeName.html"
       },
       {
         "path": "dom/nodes/Node-nodeValue.html",
@@ -14104,12 +14104,12 @@
         "url": "/dom/nodes/ParentNode-prepend.html"
       },
       {
-        "path": "dom/nodes/ParentNode-querySelector-All.html",
-        "url": "/dom/nodes/ParentNode-querySelector-All.html"
+        "path": "dom/nodes/ParentNode-querySelector-All-xht.xht",
+        "url": "/dom/nodes/ParentNode-querySelector-All-xht.xht"
       },
       {
-        "path": "dom/nodes/ParentNode-querySelector-All.xht",
-        "url": "/dom/nodes/ParentNode-querySelector-All.xht"
+        "path": "dom/nodes/ParentNode-querySelector-All.html",
+        "url": "/dom/nodes/ParentNode-querySelector-All.html"
       },
       {
         "path": "dom/nodes/ProcessingInstruction-literal-1.xhtml",
@@ -15047,10 +15047,6 @@
         "path": "html/browsers/browsing-the-web/scroll-to-fragid/006.html",
         "url": "/html/browsers/browsing-the-web/scroll-to-fragid/006.html"
       },
-      {
-        "path": "html/browsers/browsing-the-web/scroll-to-fragid/007.html",
-        "url": "/html/browsers/browsing-the-web/scroll-to-fragid/007.html"
-      },
       {
         "path": "html/browsers/browsing-the-web/unloading-documents/001.html",
         "url": "/html/browsers/browsing-the-web/unloading-documents/001.html"
@@ -15491,10 +15487,6 @@
         "path": "html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload.html",
         "url": "/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload.html"
       },
-      {
-        "path": "html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html",
-        "url": "/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html"
-      },
       {
         "path": "html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1.html",
         "url": "/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1.html"
@@ -15631,58 +15623,58 @@
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByClassName-same.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByClassName-same.html"
       },
+      {
+        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case-xhtml.xhtml",
+        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case-xhtml.xhtml"
+      },
       {
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.xhtml",
-        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.xhtml"
+        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id-xhtml.xhtml",
+        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id-xhtml.xhtml"
       },
       {
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.html"
       },
-      {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.xhtml",
-        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.xhtml"
-      },
       {
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-interface.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-interface.html"
       },
+      {
+        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace-xhtml.xhtml",
+        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace-xhtml.xhtml"
+      },
       {
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.xhtml",
-        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.xhtml"
+        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements-xhtml.xhtml",
+        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements-xhtml.xhtml"
       },
       {
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.xhtml",
-        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.xhtml"
+        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef-xhtml.xhtml",
+        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef-xhtml.xhtml"
       },
       {
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.xhtml",
-        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.xhtml"
+        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param-xhtml.xhtml",
+        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param-xhtml.xhtml"
       },
       {
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.html"
       },
-      {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.xhtml",
-        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.xhtml"
-      },
       {
         "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-same.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-same.html"
@@ -18015,6 +18007,10 @@
         "path": "html/semantics/forms/the-input-element/input-type-checkbox.html",
         "url": "/html/semantics/forms/the-input-element/input-type-checkbox.html"
       },
+      {
+        "path": "html/semantics/forms/the-input-element/maxlength.html",
+        "url": "/html/semantics/forms/the-input-element/maxlength.html"
+      },
       {
         "path": "html/semantics/forms/the-input-element/month.html",
         "url": "/html/semantics/forms/the-input-element/month.html"
@@ -18296,12 +18292,12 @@
         "url": "/html/semantics/scripting-1/the-script-element/script-before-after-events.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/script-for-event.html",
-        "url": "/html/semantics/scripting-1/the-script-element/script-for-event.html"
+        "path": "html/semantics/scripting-1/the-script-element/script-for-event-xhtml.xhtml",
+        "url": "/html/semantics/scripting-1/the-script-element/script-for-event-xhtml.xhtml"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/script-for-event.xhtml",
-        "url": "/html/semantics/scripting-1/the-script-element/script-for-event.xhtml"
+        "path": "html/semantics/scripting-1/the-script-element/script-for-event.html",
+        "url": "/html/semantics/scripting-1/the-script-element/script-for-event.html"
       },
       {
         "path": "html/semantics/scripting-1/the-script-element/script-language-type.html",
@@ -18324,12 +18320,12 @@
         "url": "/html/semantics/scripting-1/the-script-element/script-onload-string.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/script-text.html",
-        "url": "/html/semantics/scripting-1/the-script-element/script-text.html"
+        "path": "html/semantics/scripting-1/the-script-element/script-text-xhtml.xhtml",
+        "url": "/html/semantics/scripting-1/the-script-element/script-text-xhtml.xhtml"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/script-text.xhtml",
-        "url": "/html/semantics/scripting-1/the-script-element/script-text.xhtml"
+        "path": "html/semantics/scripting-1/the-script-element/script-text.html",
+        "url": "/html/semantics/scripting-1/the-script-element/script-text.html"
       },
       {
         "path": "html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/node-document.html",
@@ -26407,6 +26403,10 @@
         "path": "shadow-dom/untriaged/user-interaction/ranges-and-selections/test-002.html",
         "url": "/shadow-dom/untriaged/user-interaction/ranges-and-selections/test-002.html"
       },
+      {
+        "path": "svg/interfaces.html",
+        "url": "/svg/interfaces.html"
+      },
       {
         "path": "touch-events/create-touch-touchlist.html",
         "url": "/touch-events/create-touch-touchlist.html"
@@ -26440,12 +26440,12 @@
         "url": "/typedarrays/constructors.html"
       },
       {
-        "path": "url/a-element.html",
-        "url": "/url/a-element.html"
+        "path": "url/a-element-xhtml.xhtml",
+        "url": "/url/a-element-xhtml.xhtml"
       },
       {
-        "path": "url/a-element.xhtml",
-        "url": "/url/a-element.xhtml"
+        "path": "url/a-element.html",
+        "url": "/url/a-element.html"
       },
       {
         "path": "url/historical.html",
@@ -28797,6 +28797,11 @@
         "timeout": "long",
         "url": "/custom-elements/concepts/custom-elements-type-allowed-chars.html"
       },
+      {
+        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-test.html",
+        "timeout": "long",
+        "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-test.html"
+      },
       {
         "path": "dom/nodes/Document-characterSet-normalization.html",
         "timeout": "long",
@@ -28937,6 +28942,11 @@
         "timeout": "long",
         "url": "/eventsource/shared-worker/eventsource-constructor-non-same-origin.htm"
       },
+      {
+        "path": "html/browsers/browsing-the-web/scroll-to-fragid/007.html",
+        "timeout": "long",
+        "url": "/html/browsers/browsing-the-web/scroll-to-fragid/007.html"
+      },
       {
         "path": "html/browsers/history/the-history-interface/007.html",
         "timeout": "long",
@@ -28947,6 +28957,11 @@
         "timeout": "long",
         "url": "/html/browsers/origin/cross-origin-objects/cross-origin-objects.sub.html"
       },
+      {
+        "path": "html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html",
+        "timeout": "long",
+        "url": "/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html"
+      },
       {
         "path": "html/dom/interfaces.html",
         "timeout": "long",
@@ -35854,7 +35869,7 @@
       }
     ]
   },
-  "rev": "63bf7b5e1e12b308ba6ed20480ad7dc93afa1943",
+  "rev": "05c55fbdc527eacdc7b875f298a8cb1b6db0dfcd",
   "url_base": "/",
   "version": 2
 }
diff --git a/testing/web-platform/meta/mozilla-sync b/testing/web-platform/meta/mozilla-sync
index 4155cc4d71e9..d924ac6dc356 100644
--- a/testing/web-platform/meta/mozilla-sync
+++ b/testing/web-platform/meta/mozilla-sync
@@ -1 +1 @@
-42122dea7c41a71c8cb06a91b91e71afa2d6664c
\ No newline at end of file
+d5e5a44a8bbe62751a66677491623a41b766275d
\ No newline at end of file
diff --git a/testing/web-platform/tests/battery-status/battery-created-manual.html b/testing/web-platform/tests/battery-status/battery-created-manual.html
deleted file mode 100644
index e3b8d69cf4da..000000000000
--- a/testing/web-platform/tests/battery-status/battery-created-manual.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Battery Test: no backend implementation, charger unplugged in</title>
-<meta name="flags" content="interact">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<h2>Description</h2>
-<p>
-  <strong>
-    This test is only useful on devices that expose the BatteryManager interface,
-    but lack a backend implementation.
-  </strong>
-</p>
-<p>
-  This test validates that all of the BatteryManager attributes exist and are set to their default values.
-</p>
-
-<h2>Preconditions</h2>
-<ol>
-  <li>
-    The implementation is unable to report the battery's charging state,
-    charging time, level or remaining time respectively.
-  </li>
-  <li>
-    The device is unplugged from the charger before this test case is run.
-  </li>
-</ol>
-
-<div id="log"></div>
-
-<script>
-
-async_test(function (t) {
-  navigator.getBattery().then(function (battery) {
-    t.step(function () {
-      assert_true(battery.charging, 'charging must be set to true');
-      assert_equals(battery.chargingTime, 0, 'chargingTime must be set to 0');
-      assert_equals(battery.dischargingTime, Infinity, 'dischargingTime must be set to Infinity');
-      assert_equals(battery.level, 1.0, 'level must be set to 1.0');
-    });
-    t.done();
-  }, function (error) {
-    t.step(function () {
-      assert_unreached(error.message);
-    });
-    t.done();
-  });
-}, 'When a BatteryManager object is created, charging must be set to true, ' +
-   'chargingTime to 0, level to 1.0 and dischargingTime to the value positive ' +
-   'Infinity, if the implementation is unable to report the battery\'s charging ' +
-   'state, charging time, level or remaining time respectively.');
-
-</script>
diff --git a/testing/web-platform/tests/conformance-checkers/messages.json b/testing/web-platform/tests/conformance-checkers/messages.json
index 1b5daba1f65a..4a7959a4a3c5 100644
--- a/testing/web-platform/tests/conformance-checkers/messages.json
+++ b/testing/web-platform/tests/conformance-checkers/messages.json
@@ -51,12 +51,12 @@
     "html/attributes/lang/xmllang-only-novalid.html": "When the attribute \u201cxml:lang\u201d in no namespace is specified, the element must also have the attribute \u201clang\u201d present with the same value.",
     "html/attributes/role/unrecognized-role-name-novalid.html": "Discarding unrecognized tokens \u201cswitch\u201d, \u201cinput\u201d from value of attribute \u201crole\u201d. Browsers ignore any token that is not a defined ARIA non-abstract role.",
     "html/attributes/spellcheck/value-bad-novalid.html": "Bad value \u201cbadvalue\u201d for attribute \u201cspellcheck\u201d on element \u201cp\u201d.",
-    "html/elements/a/href/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/a/href/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/a/href/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/a/href/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/a/href/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/a/href/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/a/href/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/a/href/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/a/href/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/a/href/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/a/href/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/a/href/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/a/href/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/a/href/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: empty host.",
@@ -64,38 +64,38 @@
     "html/elements/a/href/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/a/href/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/a/href/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/a/href/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/a/href/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port.",
+    "html/elements/a/href/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/a/href/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/a/href/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/a/href/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/a/href/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/a/href/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/a/href/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/a/href/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/a/href/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/a/href/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/a/href/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/a/href/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/a/href/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/a/href/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/a/href/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/a/href/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/a/href/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/a/href/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/a/href/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/a/href/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/a/href/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/a/href/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/a/href/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/a/href/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port.",
-    "html/elements/a/href/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port.",
-    "html/elements/a/href/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port.",
-    "html/elements/a/href/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port.",
+    "html/elements/a/href/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/a/href/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/a/href/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/a/href/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/a/href/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/a/href/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port.",
-    "html/elements/a/href/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port.",
+    "html/elements/a/href/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/a/href/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/a/href/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/a/href/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/a/href/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/a/href/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/a/href/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/a/href/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/a/href/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/a/href/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/a/href/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/a/href/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/a/href/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/a/href/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/a/href/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/a/href/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/a/href/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Expected a slash (\"/\").",
@@ -106,26 +106,26 @@
     "html/elements/a/href/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/a/href/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/a/href/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: syntax error",
-    "html/elements/a/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/a/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/a/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/a/href/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/a/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/a/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/a/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/a/href/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/a/href/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/a/href/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/a/href/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/a/href/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/a/href/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/a/href/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/a/href/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/a/href/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201chref\u201d on element \u201ca\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/a/media-novalid.html": "Attribute \u201cmedia\u201d not allowed on element \u201ca\u201d in this context.",
     "html/elements/a/model-novalid.html": "Element \u201cp\u201d not allowed in this context. (The parent was element \u201ca\u201d.) Suppressing further errors from this subtree.",
     "html/elements/a/name-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201cname\u201d on element \u201ca\u201d: Bad id: An ID must not be the empty string.",
     "html/elements/abbr/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/address/model-novalid.html": "The element \u201caddress\u201d must not appear as a descendant of the \u201caddress\u201d element.",
-    "html/elements/area/href/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/area/href/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/area/href/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/area/href/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/area/href/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/area/href/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/area/href/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/area/href/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/area/href/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/area/href/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/area/href/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/area/href/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/area/href/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/area/href/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: empty host.",
@@ -133,38 +133,38 @@
     "html/elements/area/href/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/area/href/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/area/href/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/area/href/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/area/href/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port.",
+    "html/elements/area/href/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/area/href/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/area/href/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/area/href/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/area/href/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/area/href/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/area/href/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/area/href/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/area/href/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/area/href/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/area/href/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/area/href/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/area/href/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/area/href/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/area/href/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/area/href/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/area/href/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/area/href/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/area/href/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/area/href/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/area/href/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/area/href/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/area/href/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/area/href/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port.",
-    "html/elements/area/href/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port.",
-    "html/elements/area/href/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port.",
-    "html/elements/area/href/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port.",
+    "html/elements/area/href/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/area/href/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/area/href/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/area/href/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/area/href/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/area/href/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port.",
-    "html/elements/area/href/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port.",
+    "html/elements/area/href/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/area/href/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/area/href/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/area/href/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/area/href/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/area/href/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/area/href/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/area/href/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/area/href/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/area/href/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/area/href/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/area/href/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/area/href/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/area/href/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/area/href/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/area/href/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/area/href/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Expected a slash (\"/\").",
@@ -175,26 +175,26 @@
     "html/elements/area/href/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/area/href/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/area/href/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: syntax error",
-    "html/elements/area/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/area/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/area/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/area/href/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/area/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/area/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/area/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/area/href/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/area/href/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/area/href/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/area/href/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/area/href/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/area/href/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/area/href/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/area/href/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/area/href/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201chref\u201d on element \u201carea\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/area/media-novalid.html": "Attribute \u201cmedia\u201d not allowed on element \u201carea\u201d in this context.",
     "html/elements/area/model-novalid.html": "Attribute \u201ccoords\u201d not allowed on element \u201carea\u201d in this context.",
     "html/elements/audio/model-novalid.html": "Element \u201cp\u201d not allowed in this context. (The parent was element \u201caudio\u201d.) Suppressing further errors from this subtree.",
     "html/elements/audio/src-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Must be non-empty.",
     "html/elements/audio/src-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Must be non-empty.",
-    "html/elements/audio/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/audio/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/audio/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/audio/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/audio/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/audio/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/audio/src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/audio/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/audio/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/audio/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/audio/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/audio/src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/audio/src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/audio/src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: empty host.",
@@ -202,38 +202,38 @@
     "html/elements/audio/src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/audio/src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/audio/src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/audio/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/audio/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port.",
+    "html/elements/audio/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/audio/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/audio/src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/audio/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/audio/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/audio/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/audio/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/audio/src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/audio/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/audio/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/audio/src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/audio/src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/audio/src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/audio/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/audio/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/audio/src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/audio/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/audio/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/audio/src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/audio/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/audio/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/audio/src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/audio/src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/audio/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port.",
-    "html/elements/audio/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port.",
-    "html/elements/audio/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port.",
-    "html/elements/audio/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port.",
+    "html/elements/audio/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/audio/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/audio/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/audio/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/audio/src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/audio/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port.",
-    "html/elements/audio/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port.",
+    "html/elements/audio/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/audio/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/audio/src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/audio/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/audio/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/audio/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/audio/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/audio/src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/audio/src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/audio/src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/audio/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/audio/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/audio/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/audio/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/audio/src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/audio/src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/audio/src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Expected a slash (\"/\").",
@@ -244,22 +244,22 @@
     "html/elements/audio/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/audio/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/audio/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: syntax error",
-    "html/elements/audio/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/audio/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/audio/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/audio/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/audio/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/audio/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/audio/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/audio/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/audio/src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/audio/src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/audio/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/audio/src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/audio/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/audio/src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/audio/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/audio/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201caudio\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/base/href-and-target-missing-novalid.html": "Element \u201cbase\u201d is missing one or more of the following attributes: [href, target].",
-    "html/elements/base/href/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/base/href/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/base/href/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/base/href/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/base/href/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/base/href/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/base/href/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/base/href/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/base/href/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/base/href/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/base/href/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/base/href/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/base/href/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/base/href/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: empty host.",
@@ -267,38 +267,38 @@
     "html/elements/base/href/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/base/href/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/base/href/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/base/href/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/base/href/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port.",
+    "html/elements/base/href/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/base/href/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/base/href/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/base/href/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/base/href/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/base/href/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/base/href/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/base/href/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/base/href/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/base/href/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/base/href/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/base/href/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/base/href/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/base/href/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/base/href/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/base/href/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/base/href/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/base/href/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/base/href/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/base/href/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/base/href/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/base/href/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/base/href/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/base/href/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port.",
-    "html/elements/base/href/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port.",
-    "html/elements/base/href/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port.",
-    "html/elements/base/href/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port.",
+    "html/elements/base/href/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/base/href/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/base/href/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/base/href/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/base/href/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/base/href/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port.",
-    "html/elements/base/href/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port.",
+    "html/elements/base/href/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/base/href/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/base/href/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/base/href/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/base/href/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/base/href/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/base/href/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/base/href/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/base/href/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/base/href/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/base/href/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/base/href/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/base/href/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/base/href/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/base/href/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/base/href/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/base/href/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Expected a slash (\"/\").",
@@ -309,22 +309,22 @@
     "html/elements/base/href/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/base/href/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/base/href/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: syntax error",
-    "html/elements/base/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/base/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/base/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/base/href/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/base/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/base/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/base/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/base/href/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/base/href/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/base/href/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/base/href/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/base/href/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/base/href/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/base/href/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/base/href/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/base/href/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201chref\u201d on element \u201cbase\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/bdo/model-novalid.html": "Element \u201cbdo\u201d must have attribute \u201cdir\u201d.",
-    "html/elements/blockquote/cite/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/blockquote/cite/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/blockquote/cite/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/blockquote/cite/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/blockquote/cite/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/blockquote/cite/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/blockquote/cite/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/blockquote/cite/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/blockquote/cite/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/blockquote/cite/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/blockquote/cite/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/blockquote/cite/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/blockquote/cite/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/blockquote/cite/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: empty host.",
@@ -332,38 +332,38 @@
     "html/elements/blockquote/cite/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/blockquote/cite/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/blockquote/cite/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/blockquote/cite/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/blockquote/cite/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port.",
+    "html/elements/blockquote/cite/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/blockquote/cite/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/blockquote/cite/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/blockquote/cite/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/blockquote/cite/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/blockquote/cite/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/blockquote/cite/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/blockquote/cite/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/blockquote/cite/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/blockquote/cite/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/blockquote/cite/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/blockquote/cite/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/blockquote/cite/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/blockquote/cite/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/blockquote/cite/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/blockquote/cite/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/blockquote/cite/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/blockquote/cite/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/blockquote/cite/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/blockquote/cite/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/blockquote/cite/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/blockquote/cite/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/blockquote/cite/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/blockquote/cite/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port.",
-    "html/elements/blockquote/cite/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port.",
-    "html/elements/blockquote/cite/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port.",
-    "html/elements/blockquote/cite/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port.",
+    "html/elements/blockquote/cite/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/blockquote/cite/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/blockquote/cite/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/blockquote/cite/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/blockquote/cite/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/blockquote/cite/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port.",
-    "html/elements/blockquote/cite/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port.",
+    "html/elements/blockquote/cite/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/blockquote/cite/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/blockquote/cite/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/blockquote/cite/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/blockquote/cite/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/blockquote/cite/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/blockquote/cite/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/blockquote/cite/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/blockquote/cite/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/blockquote/cite/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/blockquote/cite/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/blockquote/cite/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/blockquote/cite/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/blockquote/cite/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/blockquote/cite/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/blockquote/cite/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/blockquote/cite/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Expected a slash (\"/\").",
@@ -374,25 +374,25 @@
     "html/elements/blockquote/cite/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/blockquote/cite/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/blockquote/cite/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: syntax error",
-    "html/elements/blockquote/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/blockquote/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/blockquote/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/blockquote/cite/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/blockquote/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/blockquote/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/blockquote/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/blockquote/cite/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/blockquote/cite/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/blockquote/cite/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/blockquote/cite/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/blockquote/cite/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/blockquote/cite/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/blockquote/cite/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/blockquote/cite/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/blockquote/cite/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201ccite\u201d on element \u201cblockquote\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/blockquote/model-novalid.html": "No \u201cp\u201d element in scope but a \u201cp\u201d end tag seen.",
     "html/elements/br/model-novalid.html": "End tag \u201cbr\u201d.",
     "html/elements/button/formaction-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Must be non-empty.",
     "html/elements/button/formaction-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Must be non-empty.",
-    "html/elements/button/formaction/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/button/formaction/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/button/formaction/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/button/formaction/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/button/formaction/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/button/formaction/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/button/formaction/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/button/formaction/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/button/formaction/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/button/formaction/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/button/formaction/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/button/formaction/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/button/formaction/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/button/formaction/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: empty host.",
@@ -400,38 +400,38 @@
     "html/elements/button/formaction/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/button/formaction/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/button/formaction/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/button/formaction/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/button/formaction/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port.",
+    "html/elements/button/formaction/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/button/formaction/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/button/formaction/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/button/formaction/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/button/formaction/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/button/formaction/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/button/formaction/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/button/formaction/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/button/formaction/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/button/formaction/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/button/formaction/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/button/formaction/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/button/formaction/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/button/formaction/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/button/formaction/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/button/formaction/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/button/formaction/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/button/formaction/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/button/formaction/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/button/formaction/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/button/formaction/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/button/formaction/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/button/formaction/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/button/formaction/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port.",
-    "html/elements/button/formaction/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port.",
-    "html/elements/button/formaction/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port.",
-    "html/elements/button/formaction/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port.",
+    "html/elements/button/formaction/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/button/formaction/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/button/formaction/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/button/formaction/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/button/formaction/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/button/formaction/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port.",
-    "html/elements/button/formaction/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port.",
+    "html/elements/button/formaction/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/button/formaction/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/button/formaction/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/button/formaction/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/button/formaction/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/button/formaction/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/button/formaction/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/button/formaction/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/button/formaction/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/button/formaction/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/button/formaction/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/button/formaction/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/button/formaction/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/button/formaction/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/button/formaction/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/button/formaction/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/button/formaction/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Expected a slash (\"/\").",
@@ -442,24 +442,24 @@
     "html/elements/button/formaction/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/button/formaction/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/button/formaction/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: syntax error",
-    "html/elements/button/formaction/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/button/formaction/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/button/formaction/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/button/formaction/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/button/formaction/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/button/formaction/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/button/formaction/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/button/formaction/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/button/formaction/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/button/formaction/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/button/formaction/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/button/formaction/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/button/formaction/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/button/formaction/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/button/formaction/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/button/formaction/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cformaction\u201d on element \u201cbutton\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/canvas/model-novalid.html": "Element \u201cp\u201d not allowed in this context. (The parent was element \u201ccanvas\u201d.) Suppressing further errors from this subtree.",
     "html/elements/cite/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/code/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
-    "html/elements/del/cite/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/del/cite/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/del/cite/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/del/cite/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/del/cite/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/del/cite/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/del/cite/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/del/cite/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/del/cite/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/del/cite/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/del/cite/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/del/cite/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/del/cite/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/del/cite/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: empty host.",
@@ -467,38 +467,38 @@
     "html/elements/del/cite/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/del/cite/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/del/cite/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/del/cite/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/del/cite/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port.",
+    "html/elements/del/cite/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/del/cite/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/del/cite/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/del/cite/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/del/cite/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/del/cite/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/del/cite/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/del/cite/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/del/cite/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/del/cite/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/del/cite/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/del/cite/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/del/cite/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/del/cite/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/del/cite/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/del/cite/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/del/cite/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/del/cite/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/del/cite/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/del/cite/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/del/cite/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/del/cite/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/del/cite/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/del/cite/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port.",
-    "html/elements/del/cite/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port.",
-    "html/elements/del/cite/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port.",
-    "html/elements/del/cite/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port.",
+    "html/elements/del/cite/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/del/cite/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/del/cite/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/del/cite/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/del/cite/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/del/cite/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port.",
-    "html/elements/del/cite/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port.",
+    "html/elements/del/cite/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/del/cite/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/del/cite/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/del/cite/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/del/cite/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/del/cite/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/del/cite/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/del/cite/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/del/cite/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/del/cite/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/del/cite/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/del/cite/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/del/cite/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/del/cite/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/del/cite/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/del/cite/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/del/cite/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Expected a slash (\"/\").",
@@ -509,15 +509,15 @@
     "html/elements/del/cite/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/del/cite/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/del/cite/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: syntax error",
-    "html/elements/del/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/del/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/del/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/del/cite/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/del/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/del/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/del/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/del/cite/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/del/cite/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/del/cite/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/del/cite/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/del/cite/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/del/cite/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/del/cite/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/del/cite/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/del/cite/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201ccite\u201d on element \u201cdel\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/del/date-0004-02-29-haswarn.html": "Bad value \u201c0004-02-29\u201d for attribute \u201cdatetime\u201d on element \u201cdel\u201d: Bad date: Year may be mistyped. Bad datetime with timezone: The literal did not satisfy the datetime with timezone format.",
     "html/elements/del/date-0005-02-29-novalid.html": "Bad value \u201c0005-02-29\u201d for attribute \u201cdatetime\u201d on element \u201cdel\u201d: Bad datetime with timezone: The literal did not satisfy the datetime with timezone format. Bad date: Day out of range.",
     "html/elements/del/date-0214-09-29-haswarn.html": "Bad value \u201c0214-09-29\u201d for attribute \u201cdatetime\u201d on element \u201cdel\u201d: Bad date: Year may be mistyped. Bad datetime with timezone: The literal did not satisfy the datetime with timezone format.",
@@ -616,12 +616,12 @@
     "html/elements/embed/height-novalid.html": "Bad value \u201c20%\u201d for attribute \u201cheight\u201d on element \u201cembed\u201d: Bad non-negative integer: Expected a digit but saw \u201c%\u201d instead.",
     "html/elements/embed/src-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Must be non-empty.",
     "html/elements/embed/src-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Must be non-empty.",
-    "html/elements/embed/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/embed/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/embed/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/embed/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/embed/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/embed/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/embed/src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/embed/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/embed/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/embed/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/embed/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/embed/src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/embed/src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/embed/src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: empty host.",
@@ -629,38 +629,38 @@
     "html/elements/embed/src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/embed/src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/embed/src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/embed/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/embed/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port.",
+    "html/elements/embed/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/embed/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/embed/src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/embed/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/embed/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/embed/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/embed/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/embed/src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/embed/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/embed/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/embed/src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/embed/src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/embed/src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/embed/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/embed/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/embed/src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/embed/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/embed/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/embed/src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/embed/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/embed/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/embed/src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/embed/src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/embed/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port.",
-    "html/elements/embed/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port.",
-    "html/elements/embed/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port.",
-    "html/elements/embed/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port.",
+    "html/elements/embed/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/embed/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/embed/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/embed/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/embed/src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/embed/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port.",
-    "html/elements/embed/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port.",
+    "html/elements/embed/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/embed/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/embed/src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/embed/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/embed/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/embed/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/embed/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/embed/src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/embed/src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/embed/src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/embed/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/embed/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/embed/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/embed/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/embed/src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/embed/src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/embed/src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Expected a slash (\"/\").",
@@ -671,27 +671,27 @@
     "html/elements/embed/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/embed/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/embed/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: syntax error",
-    "html/elements/embed/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/embed/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/embed/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/embed/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/embed/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/embed/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/embed/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/embed/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/embed/src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/embed/src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/embed/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/embed/src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/embed/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/embed/src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/embed/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/embed/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cembed\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/embed/type-novalid.html": "Bad value \u201cfoo\u201d for attribute \u201ctype\u201d on element \u201cembed\u201d: Bad MIME type: Subtype missing.",
     "html/elements/embed/width-novalid.html": "Bad value \u201c20%\u201d for attribute \u201cwidth\u201d on element \u201cembed\u201d: Bad non-negative integer: Expected a digit but saw \u201c%\u201d instead.",
     "html/elements/footer/nested-footer-novalid.html": "The element \u201cfooter\u201d must not appear as a descendant of the \u201cfooter\u201d element.",
     "html/elements/footer/nested-header-novalid.html": "The element \u201cheader\u201d must not appear as a descendant of the \u201cfooter\u201d element.",
     "html/elements/form/action-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Must be non-empty.",
     "html/elements/form/action-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Must be non-empty.",
-    "html/elements/form/action/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/form/action/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/form/action/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/form/action/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/form/action/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/form/action/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/form/action/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/form/action/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/form/action/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/form/action/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/form/action/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/form/action/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/form/action/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/form/action/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: empty host.",
@@ -699,38 +699,38 @@
     "html/elements/form/action/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/form/action/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/form/action/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/form/action/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/form/action/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port.",
+    "html/elements/form/action/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/form/action/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/form/action/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/form/action/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/form/action/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/form/action/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/form/action/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/form/action/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/form/action/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/form/action/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/form/action/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/form/action/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/form/action/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/form/action/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/form/action/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/form/action/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/form/action/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/form/action/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/form/action/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/form/action/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/form/action/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/form/action/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/form/action/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/form/action/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port.",
-    "html/elements/form/action/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port.",
-    "html/elements/form/action/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port.",
-    "html/elements/form/action/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port.",
+    "html/elements/form/action/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/form/action/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/form/action/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/form/action/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/form/action/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/form/action/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port.",
-    "html/elements/form/action/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port.",
+    "html/elements/form/action/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/form/action/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/form/action/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/form/action/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/form/action/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/form/action/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/form/action/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/form/action/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/form/action/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/form/action/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/form/action/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/form/action/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/form/action/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/form/action/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/form/action/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/form/action/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/form/action/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Expected a slash (\"/\").",
@@ -741,15 +741,15 @@
     "html/elements/form/action/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/form/action/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/form/action/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: syntax error",
-    "html/elements/form/action/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/form/action/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/form/action/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/form/action/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/form/action/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/form/action/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/form/action/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/form/action/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/form/action/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/form/action/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/form/action/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/form/action/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/form/action/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/form/action/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/form/action/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/form/action/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201caction\u201d on element \u201cform\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/h1/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/h2/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/h3/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
@@ -761,12 +761,12 @@
     "html/elements/hr/model-novalid.html": "No \u201cp\u201d element in scope but a \u201cp\u201d end tag seen.",
     "html/elements/html/manifest-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Must be non-empty.",
     "html/elements/html/manifest-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Must be non-empty.",
-    "html/elements/html/manifest/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/html/manifest/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/html/manifest/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/html/manifest/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/html/manifest/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/html/manifest/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/html/manifest/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/html/manifest/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/html/manifest/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/html/manifest/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/html/manifest/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/html/manifest/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/html/manifest/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/html/manifest/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: empty host.",
@@ -774,38 +774,38 @@
     "html/elements/html/manifest/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/html/manifest/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/html/manifest/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/html/manifest/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/html/manifest/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port.",
+    "html/elements/html/manifest/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/html/manifest/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/html/manifest/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/html/manifest/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/html/manifest/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/html/manifest/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/html/manifest/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/html/manifest/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/html/manifest/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/html/manifest/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/html/manifest/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/html/manifest/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/html/manifest/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/html/manifest/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/html/manifest/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/html/manifest/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/html/manifest/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/html/manifest/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/html/manifest/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/html/manifest/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/html/manifest/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/html/manifest/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/html/manifest/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/html/manifest/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port.",
-    "html/elements/html/manifest/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port.",
-    "html/elements/html/manifest/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port.",
-    "html/elements/html/manifest/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port.",
+    "html/elements/html/manifest/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/html/manifest/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/html/manifest/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/html/manifest/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/html/manifest/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/html/manifest/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port.",
-    "html/elements/html/manifest/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port.",
+    "html/elements/html/manifest/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/html/manifest/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/html/manifest/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/html/manifest/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/html/manifest/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/html/manifest/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/html/manifest/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/html/manifest/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/html/manifest/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/html/manifest/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/html/manifest/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/html/manifest/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/html/manifest/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/html/manifest/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/html/manifest/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/html/manifest/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/html/manifest/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Expected a slash (\"/\").",
@@ -816,25 +816,25 @@
     "html/elements/html/manifest/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/html/manifest/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/html/manifest/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: syntax error",
-    "html/elements/html/manifest/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/html/manifest/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/html/manifest/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/html/manifest/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/html/manifest/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/html/manifest/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/html/manifest/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/html/manifest/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/html/manifest/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/html/manifest/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/html/manifest/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/html/manifest/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/html/manifest/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/html/manifest/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/html/manifest/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/html/manifest/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cmanifest\u201d on element \u201chtml\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/i/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/iframe/model-novalid.html": "The \u201cframeborder\u201d attribute on the \u201ciframe\u201d element is obsolete. Use CSS instead.",
     "html/elements/iframe/src-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Must be non-empty.",
     "html/elements/iframe/src-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Must be non-empty.",
-    "html/elements/iframe/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/iframe/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/iframe/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/iframe/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/iframe/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/iframe/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/iframe/src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/iframe/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/iframe/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/iframe/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/iframe/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/iframe/src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/iframe/src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/iframe/src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: empty host.",
@@ -842,38 +842,38 @@
     "html/elements/iframe/src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/iframe/src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/iframe/src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/iframe/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/iframe/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port.",
+    "html/elements/iframe/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/iframe/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/iframe/src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/iframe/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/iframe/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/iframe/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/iframe/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/iframe/src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/iframe/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/iframe/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/iframe/src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/iframe/src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/iframe/src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/iframe/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/iframe/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/iframe/src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/iframe/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/iframe/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/iframe/src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/iframe/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/iframe/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/iframe/src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/iframe/src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/iframe/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port.",
-    "html/elements/iframe/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port.",
-    "html/elements/iframe/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port.",
-    "html/elements/iframe/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port.",
+    "html/elements/iframe/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/iframe/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/iframe/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/iframe/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/iframe/src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/iframe/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port.",
-    "html/elements/iframe/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port.",
+    "html/elements/iframe/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/iframe/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/iframe/src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/iframe/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/iframe/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/iframe/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/iframe/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/iframe/src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/iframe/src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/iframe/src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/iframe/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/iframe/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/iframe/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/iframe/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/iframe/src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/iframe/src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/iframe/src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Expected a slash (\"/\").",
@@ -884,24 +884,24 @@
     "html/elements/iframe/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/iframe/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/iframe/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: syntax error",
-    "html/elements/iframe/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/iframe/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/iframe/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/iframe/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/iframe/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/iframe/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/iframe/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/iframe/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/iframe/src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/iframe/src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/iframe/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/iframe/src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/iframe/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/iframe/src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/iframe/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/iframe/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201ciframe\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/img/model-novalid.html": "Bad value \u201curl\u201d for attribute \u201cusemap\u201d on element \u201cimg\u201d: Bad hash-name reference: A hash-name reference must start with \u201c#\u201d.",
     "html/elements/img/src-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Must be non-empty.",
     "html/elements/img/src-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Must be non-empty.",
-    "html/elements/img/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/img/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/img/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/img/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/img/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/img/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/img/src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/img/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/img/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/img/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/img/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/img/src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/img/src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/img/src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: empty host.",
@@ -909,38 +909,38 @@
     "html/elements/img/src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/img/src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/img/src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/img/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/img/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port.",
+    "html/elements/img/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/img/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/img/src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/img/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/img/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/img/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/img/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/img/src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/img/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/img/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/img/src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/img/src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/img/src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/img/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/img/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/img/src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/img/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/img/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/img/src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/img/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/img/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/img/src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/img/src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/img/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port.",
-    "html/elements/img/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port.",
-    "html/elements/img/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port.",
-    "html/elements/img/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port.",
+    "html/elements/img/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/img/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/img/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/img/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/img/src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/img/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port.",
-    "html/elements/img/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port.",
+    "html/elements/img/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/img/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/img/src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/img/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/img/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/img/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/img/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/img/src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/img/src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/img/src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/img/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/img/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/img/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/img/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/img/src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/img/src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/img/src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Expected a slash (\"/\").",
@@ -951,15 +951,15 @@
     "html/elements/img/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/img/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/img/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: syntax error",
-    "html/elements/img/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/img/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/img/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/img/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/img/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/img/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/img/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/img/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/img/src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/img/src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/img/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/img/src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/img/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/img/src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/img/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/img/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cimg\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/img/usemap-bad-value-novalid.html": "Bad value \u201c#\u201d for attribute \u201cusemap\u201d on element \u201cimg\u201d: Bad hash-name reference: A hash-name reference must have at least one character after \u201c#\u201d.",
     "html/elements/img/width-height-negative-novalid.html": "Bad value \u201c-1\u201d for attribute \u201cwidth\u201d on element \u201cimg\u201d: Bad non-negative integer: Expected a digit but saw \u201c-\u201d instead.",
     "html/elements/input/list-novalid.html": "The \u201clist\u201d attribute of the \u201cinput\u201d element must refer to a \u201cdatalist\u201d element.",
@@ -967,12 +967,12 @@
     "html/elements/input/pattern-paren-novalid.html": "Bad value \u201c(\u201d for attribute \u201cpattern\u201d on element \u201cinput\u201d: Bad pattern: Unterminated parenthetical ",
     "html/elements/input/type-image-formaction-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Must be non-empty.",
     "html/elements/input/type-image-formaction-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Must be non-empty.",
-    "html/elements/input/type-image-formaction/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/input/type-image-formaction/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/input/type-image-formaction/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/input/type-image-formaction/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/input/type-image-formaction/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-formaction/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/input/type-image-formaction/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/input/type-image-formaction/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/input/type-image-formaction/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/input/type-image-formaction/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/input/type-image-formaction/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
@@ -980,38 +980,38 @@
     "html/elements/input/type-image-formaction/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/input/type-image-formaction/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/input/type-image-formaction/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-formaction/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/input/type-image-formaction/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-image-formaction/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/input/type-image-formaction/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/input/type-image-formaction/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-formaction/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/input/type-image-formaction/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/input/type-image-formaction/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/input/type-image-formaction/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/input/type-image-formaction/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-image-formaction/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/input/type-image-formaction/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/input/type-image-formaction/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/input/type-image-formaction/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-image-formaction/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-image-formaction/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/input/type-image-formaction/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/input/type-image-formaction/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-image-formaction/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/input/type-image-formaction/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-formaction/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-image-formaction/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/input/type-image-formaction/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/input/type-image-formaction/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-formaction/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
-    "html/elements/input/type-image-formaction/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
-    "html/elements/input/type-image-formaction/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
-    "html/elements/input/type-image-formaction/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-image-formaction/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/input/type-image-formaction/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-formaction/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
-    "html/elements/input/type-image-formaction/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-image-formaction/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/input/type-image-formaction/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-formaction/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/input/type-image-formaction/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/input/type-image-formaction/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/input/type-image-formaction/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/input/type-image-formaction/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/input/type-image-formaction/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/input/type-image-formaction/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-image-formaction/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/input/type-image-formaction/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-image-formaction/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/input/type-image-formaction/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-formaction/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-formaction/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1022,23 +1022,23 @@
     "html/elements/input/type-image-formaction/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-formaction/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-formaction/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: syntax error",
-    "html/elements/input/type-image-formaction/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/input/type-image-formaction/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/input/type-image-formaction/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/input/type-image-formaction/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/input/type-image-formaction/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/input/type-image-formaction/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/input/type-image-formaction/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/input/type-image-formaction/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/input/type-image-formaction/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-image-formaction/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/input/type-image-formaction/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/input/type-image-formaction/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/input/type-image-formaction/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/input/type-image-formaction/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/input/type-image-formaction/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/input/type-image-formaction/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/input/type-image-src-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Must be non-empty.",
     "html/elements/input/type-image-src-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Must be non-empty.",
-    "html/elements/input/type-image-src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/input/type-image-src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/input/type-image-src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/input/type-image-src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/input/type-image-src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/input/type-image-src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/input/type-image-src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/input/type-image-src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/input/type-image-src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/input/type-image-src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/input/type-image-src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/input/type-image-src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/input/type-image-src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
@@ -1046,38 +1046,38 @@
     "html/elements/input/type-image-src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/input/type-image-src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/input/type-image-src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/input/type-image-src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-image-src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/input/type-image-src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/input/type-image-src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/input/type-image-src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/input/type-image-src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/input/type-image-src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/input/type-image-src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/input/type-image-src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-image-src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/input/type-image-src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/input/type-image-src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/input/type-image-src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-image-src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-image-src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/input/type-image-src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/input/type-image-src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-image-src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/input/type-image-src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-image-src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/input/type-image-src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/input/type-image-src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
-    "html/elements/input/type-image-src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
-    "html/elements/input/type-image-src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
-    "html/elements/input/type-image-src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-image-src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/input/type-image-src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/input/type-image-src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/input/type-image-src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/input/type-image-src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
-    "html/elements/input/type-image-src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-image-src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/input/type-image-src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/input/type-image-src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-image-src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/input/type-image-src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/input/type-image-src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/input/type-image-src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/input/type-image-src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/input/type-image-src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/input/type-image-src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-image-src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/input/type-image-src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-image-src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/input/type-image-src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/input/type-image-src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1088,23 +1088,23 @@
     "html/elements/input/type-image-src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-image-src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: syntax error",
-    "html/elements/input/type-image-src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/input/type-image-src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/input/type-image-src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/input/type-image-src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/input/type-image-src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/input/type-image-src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/input/type-image-src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/input/type-image-src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/input/type-image-src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-image-src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/input/type-image-src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/input/type-image-src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/input/type-image-src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/input/type-image-src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/input/type-image-src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/input/type-image-src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/input/type-submit-formaction-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Must be non-empty.",
     "html/elements/input/type-submit-formaction-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Must be non-empty.",
-    "html/elements/input/type-submit-formaction/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/input/type-submit-formaction/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/input/type-submit-formaction/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/input/type-submit-formaction/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/input/type-submit-formaction/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-submit-formaction/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/input/type-submit-formaction/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/input/type-submit-formaction/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/input/type-submit-formaction/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/input/type-submit-formaction/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/input/type-submit-formaction/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: empty host.",
@@ -1112,38 +1112,38 @@
     "html/elements/input/type-submit-formaction/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/input/type-submit-formaction/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/input/type-submit-formaction/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-submit-formaction/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/input/type-submit-formaction/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-submit-formaction/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/input/type-submit-formaction/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/input/type-submit-formaction/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-submit-formaction/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/input/type-submit-formaction/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/input/type-submit-formaction/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/input/type-submit-formaction/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/input/type-submit-formaction/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-submit-formaction/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/input/type-submit-formaction/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/input/type-submit-formaction/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/input/type-submit-formaction/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-submit-formaction/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-submit-formaction/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/input/type-submit-formaction/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/input/type-submit-formaction/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-submit-formaction/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/input/type-submit-formaction/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-submit-formaction/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-submit-formaction/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/input/type-submit-formaction/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/input/type-submit-formaction/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-submit-formaction/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
-    "html/elements/input/type-submit-formaction/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
-    "html/elements/input/type-submit-formaction/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
-    "html/elements/input/type-submit-formaction/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-submit-formaction/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/input/type-submit-formaction/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-submit-formaction/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
-    "html/elements/input/type-submit-formaction/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port.",
+    "html/elements/input/type-submit-formaction/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/input/type-submit-formaction/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-submit-formaction/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/input/type-submit-formaction/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/input/type-submit-formaction/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/input/type-submit-formaction/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/input/type-submit-formaction/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/input/type-submit-formaction/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/input/type-submit-formaction/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-submit-formaction/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/input/type-submit-formaction/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-submit-formaction/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/input/type-submit-formaction/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-submit-formaction/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-submit-formaction/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1154,25 +1154,25 @@
     "html/elements/input/type-submit-formaction/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-submit-formaction/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/input/type-submit-formaction/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: syntax error",
-    "html/elements/input/type-submit-formaction/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/input/type-submit-formaction/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/input/type-submit-formaction/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/input/type-submit-formaction/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/input/type-submit-formaction/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/input/type-submit-formaction/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/input/type-submit-formaction/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/input/type-submit-formaction/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/input/type-submit-formaction/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-submit-formaction/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/input/type-submit-formaction/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/input/type-submit-formaction/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/input/type-submit-formaction/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/input/type-submit-formaction/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/input/type-submit-formaction/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/input/type-submit-formaction/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cformaction\u201d on element \u201cinput\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/input/type-url-value/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c#\\\u201d is not an absolute URL.",
-    "html/elements/input/type-url-value/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/input/type-url-value/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
     "html/elements/input/type-url-value/fragment-empty-hash-only-no-path-relative-novalid.html": "Bad value \u201c#\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c#\u201d is not an absolute URL.",
-    "html/elements/input/type-url-value/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/input/type-url-value/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in fragment: space is not allowed.",
     "html/elements/input/type-url-value/fragment-non-ascii-relative-novalid.html": "Bad value \u201c#\u03b2\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c#\u03b2\u201d is not an absolute URL.",
     "html/elements/input/type-url-value/fragment-semicolon-question-mark-relative-novalid.html": "Bad value \u201c#;?\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c#;?\u201d is not an absolute URL.",
     "html/elements/input/type-url-value/fragment-slash-relative-novalid.html": "Bad value \u201c#/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c#/\u201d is not an absolute URL.",
     "html/elements/input/type-url-value/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-url-value/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/input/type-url-value/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/input/type-url-value/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/input/type-url-value/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/input/type-url-value/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: empty host.",
     "html/elements/input/type-url-value/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: empty host.",
     "html/elements/input/type-url-value/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: empty host.",
@@ -1180,17 +1180,17 @@
     "html/elements/input/type-url-value/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/input/type-url-value/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/input/type-url-value/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-url-value/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/input/type-url-value/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port.",
+    "html/elements/input/type-url-value/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/input/type-url-value/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/input/type-url-value/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-url-value/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/input/type-url-value/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/input/type-url-value/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/input/type-url-value/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/input/type-url-value/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
     "html/elements/input/type-url-value/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c/a/ /c\u201d is not an absolute URL.",
     "html/elements/input/type-url-value/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/input/type-url-value/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c:\\\u201d is not an absolute URL.",
     "html/elements/input/type-url-value/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c:foo.com\\\u201d is not an absolute URL.",
-    "html/elements/input/type-url-value/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-url-value/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in path segment: space is not allowed.",
     "html/elements/input/type-url-value/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
     "html/elements/input/type-url-value/path-percent-encoded-slash-plus-slashes-relative-novalid.html": "Bad value \u201c/a/%2f/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c/a/%2f/c\u201d is not an absolute URL.",
     "html/elements/input/type-url-value/path-percent-encoded-slash-relative-novalid.html": "Bad value \u201c/a%2fc\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c/a%2fc\u201d is not an absolute URL.",
@@ -1198,25 +1198,25 @@
     "html/elements/input/type-url-value/path-simple-relative-novalid.html": "Bad value \u201c/a/b/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c/a/b/c\u201d is not an absolute URL.",
     "html/elements/input/type-url-value/path-slash-only-relative-novalid.html": "Bad value \u201c/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c/\u201d is not an absolute URL.",
     "html/elements/input/type-url-value/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-url-value/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-url-value/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in path segment: space is not allowed.",
     "html/elements/input/type-url-value/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/input/type-url-value/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-url-value/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port.",
-    "html/elements/input/type-url-value/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port.",
-    "html/elements/input/type-url-value/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port.",
-    "html/elements/input/type-url-value/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port.",
+    "html/elements/input/type-url-value/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/input/type-url-value/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/input/type-url-value/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/input/type-url-value/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/input/type-url-value/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Tab, new line or carriage return found.",
-    "html/elements/input/type-url-value/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port.",
-    "html/elements/input/type-url-value/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port.",
+    "html/elements/input/type-url-value/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/input/type-url-value/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/input/type-url-value/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Tab, new line or carriage return found.",
     "html/elements/input/type-url-value/query-empty-no-path-relative-novalid.html": "Bad value \u201c?\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c?\u201d is not an absolute URL.",
-    "html/elements/input/type-url-value/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in query: not a URL code point.",
-    "html/elements/input/type-url-value/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in query: not a URL code point.",
+    "html/elements/input/type-url-value/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in query: space is not allowed.",
+    "html/elements/input/type-url-value/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in query: space is not allowed.",
     "html/elements/input/type-url-value/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/input/type-url-value/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/input/type-url-value/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-url-value/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/input/type-url-value/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/input/type-url-value/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/input/type-url-value/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/input/type-url-value/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Expected a slash (\"/\").",
     "html/elements/input/type-url-value/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Expected a slash (\"/\").",
     "html/elements/input/type-url-value/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Expected a slash (\"/\").",
@@ -1228,21 +1228,21 @@
     "html/elements/input/type-url-value/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Expected a slash (\"/\").",
     "html/elements/input/type-url-value/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: syntax error",
     "html/elements/input/type-url-value/scheme-schemeless-relative-novalid.html": "Bad value \u201c//foo/bar\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: The string \u201c//foo/bar\u201d is not an absolute URL.",
-    "html/elements/input/type-url-value/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/input/type-url-value/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/input/type-url-value/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/input/type-url-value/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/input/type-url-value/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/input/type-url-value/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/input/type-url-value/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/input/type-url-value/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/input/type-url-value/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/input/type-url-value/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/input/type-url-value/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/input/type-url-value/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/input/type-url-value/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/input/type-url-value/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/input/type-url-value/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in user or password: not a URL code point.",
-    "html/elements/ins/cite/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/ins/cite/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/ins/cite/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/input/type-url-value/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cvalue\u201d on element \u201cinput\u201d: Bad absolute URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/ins/cite/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/ins/cite/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/ins/cite/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/ins/cite/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/ins/cite/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/ins/cite/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/ins/cite/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/ins/cite/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/ins/cite/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/ins/cite/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/ins/cite/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: empty host.",
@@ -1250,38 +1250,38 @@
     "html/elements/ins/cite/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/ins/cite/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/ins/cite/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/ins/cite/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/ins/cite/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port.",
+    "html/elements/ins/cite/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/ins/cite/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/ins/cite/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/ins/cite/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/ins/cite/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/ins/cite/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/ins/cite/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/ins/cite/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/ins/cite/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/ins/cite/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/ins/cite/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/ins/cite/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/ins/cite/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/ins/cite/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/ins/cite/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/ins/cite/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/ins/cite/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/ins/cite/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/ins/cite/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/ins/cite/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/ins/cite/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/ins/cite/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/ins/cite/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/ins/cite/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port.",
-    "html/elements/ins/cite/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port.",
-    "html/elements/ins/cite/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port.",
-    "html/elements/ins/cite/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port.",
+    "html/elements/ins/cite/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/ins/cite/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/ins/cite/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/ins/cite/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/ins/cite/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/ins/cite/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port.",
-    "html/elements/ins/cite/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port.",
+    "html/elements/ins/cite/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/ins/cite/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/ins/cite/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/ins/cite/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/ins/cite/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/ins/cite/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/ins/cite/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/ins/cite/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/ins/cite/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/ins/cite/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/ins/cite/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/ins/cite/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/ins/cite/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/ins/cite/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/ins/cite/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/ins/cite/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/ins/cite/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1292,15 +1292,15 @@
     "html/elements/ins/cite/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/ins/cite/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/ins/cite/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: syntax error",
-    "html/elements/ins/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/ins/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/ins/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/ins/cite/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/ins/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/ins/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/ins/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/ins/cite/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/ins/cite/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/ins/cite/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/ins/cite/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/ins/cite/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/ins/cite/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/ins/cite/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/ins/cite/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/ins/cite/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201ccite\u201d on element \u201cins\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/ins/date-0004-02-29-haswarn.html": "Bad value \u201c0004-02-29\u201d for attribute \u201cdatetime\u201d on element \u201cins\u201d: Bad date: Year may be mistyped. Bad datetime with timezone: The literal did not satisfy the datetime with timezone format.",
     "html/elements/ins/date-0005-02-29-novalid.html": "Bad value \u201c0005-02-29\u201d for attribute \u201cdatetime\u201d on element \u201cins\u201d: Bad datetime with timezone: The literal did not satisfy the datetime with timezone format. Bad date: Day out of range.",
     "html/elements/ins/date-0214-09-29-haswarn.html": "Bad value \u201c0214-09-29\u201d for attribute \u201cdatetime\u201d on element \u201cins\u201d: Bad date: Year may be mistyped. Bad datetime with timezone: The literal did not satisfy the datetime with timezone format.",
@@ -1404,12 +1404,12 @@
     "html/elements/link/href-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Must be non-empty.",
     "html/elements/link/href-missing-novalid.html": "Element \u201clink\u201d is missing required attribute \u201chref\u201d.",
     "html/elements/link/href-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Must be non-empty.",
-    "html/elements/link/href/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/link/href/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/link/href/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/link/href/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/link/href/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/link/href/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/link/href/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/link/href/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/link/href/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/link/href/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/link/href/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/link/href/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/link/href/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/link/href/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: empty host.",
@@ -1417,38 +1417,38 @@
     "html/elements/link/href/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/link/href/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/link/href/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/link/href/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/link/href/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port.",
+    "html/elements/link/href/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/link/href/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/link/href/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/link/href/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/link/href/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/link/href/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/link/href/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/link/href/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/link/href/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/link/href/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/link/href/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/link/href/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/link/href/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/link/href/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/link/href/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/link/href/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/link/href/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/link/href/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/link/href/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/link/href/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/link/href/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/link/href/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/link/href/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/link/href/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port.",
-    "html/elements/link/href/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port.",
-    "html/elements/link/href/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port.",
-    "html/elements/link/href/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port.",
+    "html/elements/link/href/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/link/href/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/link/href/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/link/href/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/link/href/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/link/href/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port.",
-    "html/elements/link/href/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port.",
+    "html/elements/link/href/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/link/href/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/link/href/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/link/href/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/link/href/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/link/href/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/link/href/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/link/href/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/link/href/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/link/href/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/link/href/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/link/href/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/link/href/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/link/href/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/link/href/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/link/href/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/link/href/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1459,25 +1459,25 @@
     "html/elements/link/href/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/link/href/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/link/href/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: syntax error",
-    "html/elements/link/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/link/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/link/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/link/href/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/link/href/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/link/href/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/link/href/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/link/href/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/link/href/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/link/href/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/link/href/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/link/href/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/link/href/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/link/href/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/link/href/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/link/href/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201chref\u201d on element \u201clink\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/map/model-novalid.html": "The \u201cid\u201d attribute on a \u201cmap\u201d element must have an the same value as the \u201cname\u201d attribute.",
     "html/elements/object/data-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Must be non-empty.",
     "html/elements/object/data-type-missing-novalid.html": "Element \u201cobject\u201d is missing one or more of the following attributes: [data, type].",
     "html/elements/object/data-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Must be non-empty.",
-    "html/elements/object/data/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/object/data/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/object/data/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/object/data/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/object/data/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/object/data/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/object/data/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/object/data/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/object/data/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/object/data/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/object/data/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/object/data/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/object/data/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/object/data/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: empty host.",
@@ -1485,38 +1485,38 @@
     "html/elements/object/data/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/object/data/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/object/data/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/object/data/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/object/data/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port.",
+    "html/elements/object/data/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/object/data/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/object/data/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/object/data/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/object/data/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/object/data/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/object/data/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/object/data/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/object/data/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/object/data/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/object/data/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/object/data/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/object/data/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/object/data/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/object/data/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/object/data/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/object/data/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/object/data/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/object/data/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/object/data/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/object/data/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/object/data/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/object/data/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/object/data/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port.",
-    "html/elements/object/data/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port.",
-    "html/elements/object/data/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port.",
-    "html/elements/object/data/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port.",
+    "html/elements/object/data/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/object/data/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/object/data/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/object/data/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/object/data/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/object/data/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port.",
-    "html/elements/object/data/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port.",
+    "html/elements/object/data/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/object/data/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/object/data/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/object/data/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/object/data/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/object/data/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/object/data/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/object/data/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/object/data/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/object/data/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/object/data/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/object/data/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/object/data/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/object/data/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/object/data/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/object/data/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/object/data/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1527,15 +1527,15 @@
     "html/elements/object/data/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/object/data/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/object/data/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: syntax error",
-    "html/elements/object/data/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/object/data/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/object/data/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/object/data/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/object/data/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/object/data/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/object/data/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/object/data/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/object/data/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/object/data/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/object/data/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/object/data/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/object/data/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/object/data/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/object/data/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/object/data/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cdata\u201d on element \u201cobject\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/object/model-novalid.html": "Element \u201cobject\u201d is missing one or more of the following attributes: [data, type].",
     "html/elements/ol/model-novalid.html": "Duplicate ID \u201cid\u201d.",
     "html/elements/option/label-novalid.html": "Bad value \u201c\u201d for attribute \u201clabel\u201d on element \u201coption\u201d: Bad non-empty string: Must not be empty.",
@@ -1740,12 +1740,12 @@
     "html/elements/picture/video-source-srcset-src-novalid.html": "Attribute \u201csrcset\u201d not allowed on element \u201csource\u201d in this context.",
     "html/elements/picture/video-srcset-novalid.html": "Attribute \u201csrcset\u201d not allowed on element \u201cvideo\u201d in this context.",
     "html/elements/pre/model-novalid.html": "No \u201cp\u201d element in scope but a \u201cp\u201d end tag seen.",
-    "html/elements/q/cite/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/q/cite/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/q/cite/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/q/cite/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/q/cite/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/q/cite/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/q/cite/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/q/cite/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/q/cite/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/q/cite/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/q/cite/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/q/cite/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/q/cite/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/q/cite/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: empty host.",
@@ -1753,38 +1753,38 @@
     "html/elements/q/cite/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/q/cite/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/q/cite/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/q/cite/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/q/cite/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port.",
+    "html/elements/q/cite/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/q/cite/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/q/cite/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/q/cite/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/q/cite/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/q/cite/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/q/cite/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/q/cite/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/q/cite/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/q/cite/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/q/cite/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/q/cite/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/q/cite/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/q/cite/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/q/cite/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/q/cite/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/q/cite/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/q/cite/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/q/cite/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/q/cite/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/q/cite/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/q/cite/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/q/cite/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/q/cite/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port.",
-    "html/elements/q/cite/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port.",
-    "html/elements/q/cite/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port.",
-    "html/elements/q/cite/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port.",
+    "html/elements/q/cite/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/q/cite/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/q/cite/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/q/cite/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/q/cite/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/q/cite/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port.",
-    "html/elements/q/cite/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port.",
+    "html/elements/q/cite/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/q/cite/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/q/cite/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/q/cite/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/q/cite/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/q/cite/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/q/cite/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/q/cite/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/q/cite/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/q/cite/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/q/cite/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/q/cite/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/q/cite/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/q/cite/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/q/cite/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/q/cite/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/q/cite/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1795,15 +1795,15 @@
     "html/elements/q/cite/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/q/cite/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/q/cite/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: syntax error",
-    "html/elements/q/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/q/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/q/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/q/cite/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/q/cite/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/q/cite/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/q/cite/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/q/cite/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/q/cite/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/q/cite/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/q/cite/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/q/cite/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/q/cite/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/q/cite/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/q/cite/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/q/cite/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201ccite\u201d on element \u201cq\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/q/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/ruby/empty-novalid.html": "Element \u201cruby\u201d is missing one or more of the following child elements: [rp, rt, rtc].",
     "html/elements/ruby/missing-rt-novalid.html": "Element \u201cruby\u201d is missing one or more of the following child elements: [rt, rtc].",
@@ -1811,12 +1811,12 @@
     "html/elements/script/language-novalid.html": "The \u201clanguage\u201d attribute on the \u201cscript\u201d element is obsolete. Use the \u201ctype\u201d attribute instead.",
     "html/elements/script/src-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Must be non-empty.",
     "html/elements/script/src-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Must be non-empty.",
-    "html/elements/script/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/script/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/script/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/script/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/script/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/script/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/script/src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/script/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/script/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/script/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/script/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/script/src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/script/src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/script/src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: empty host.",
@@ -1824,38 +1824,38 @@
     "html/elements/script/src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/script/src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/script/src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/script/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/script/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port.",
+    "html/elements/script/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/script/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/script/src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/script/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/script/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/script/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/script/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/script/src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/script/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/script/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/script/src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/script/src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/script/src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/script/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/script/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/script/src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/script/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/script/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/script/src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/script/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/script/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/script/src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/script/src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/script/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port.",
-    "html/elements/script/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port.",
-    "html/elements/script/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port.",
-    "html/elements/script/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port.",
+    "html/elements/script/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/script/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/script/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/script/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/script/src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/script/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port.",
-    "html/elements/script/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port.",
+    "html/elements/script/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/script/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/script/src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/script/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/script/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/script/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/script/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/script/src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/script/src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/script/src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/script/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/script/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/script/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/script/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/script/src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/script/src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/script/src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1866,24 +1866,24 @@
     "html/elements/script/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/script/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/script/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: syntax error",
-    "html/elements/script/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/script/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/script/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/script/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/script/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/script/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/script/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/script/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/script/src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/script/src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/script/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/script/src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/script/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/script/src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/script/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/script/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cscript\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/small/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/source/src-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Must be non-empty.",
     "html/elements/source/src-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Must be non-empty.",
-    "html/elements/source/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/source/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/source/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/source/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/source/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/source/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/source/src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/source/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/source/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/source/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/source/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/source/src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/source/src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/source/src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: empty host.",
@@ -1891,38 +1891,38 @@
     "html/elements/source/src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/source/src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/source/src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/source/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/source/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port.",
+    "html/elements/source/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/source/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/source/src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/source/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/source/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/source/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/source/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/source/src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/source/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/source/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/source/src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/source/src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/source/src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/source/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/source/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/source/src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/source/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/source/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/source/src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/source/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/source/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/source/src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/source/src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/source/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port.",
-    "html/elements/source/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port.",
-    "html/elements/source/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port.",
-    "html/elements/source/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port.",
+    "html/elements/source/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/source/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/source/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/source/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/source/src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/source/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port.",
-    "html/elements/source/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port.",
+    "html/elements/source/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/source/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/source/src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/source/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/source/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/source/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/source/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/source/src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/source/src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/source/src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/source/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/source/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/source/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/source/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/source/src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/source/src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/source/src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Expected a slash (\"/\").",
@@ -1933,15 +1933,15 @@
     "html/elements/source/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/source/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/source/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: syntax error",
-    "html/elements/source/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/source/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/source/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/source/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/source/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/source/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/source/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/source/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/source/src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/source/src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/source/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/source/src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/source/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/source/src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/source/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/source/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201csource\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/span/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/strong/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/style/scoped-as-p-child-novalid.html": "Element \u201cstyle\u201d not allowed in this context. (The parent was element \u201cp\u201d.) Suppressing further errors from this subtree.",
@@ -1956,12 +1956,12 @@
     "html/elements/title/missing-novalid.html": "Element \u201chead\u201d is missing required child element \u201ctitle\u201d.",
     "html/elements/track/src-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Must be non-empty.",
     "html/elements/track/src-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Must be non-empty.",
-    "html/elements/track/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/track/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/track/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/track/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/track/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/track/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/track/src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/track/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/track/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/track/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/track/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/track/src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/track/src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/track/src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: empty host.",
@@ -1969,38 +1969,38 @@
     "html/elements/track/src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/track/src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/track/src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/track/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/track/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port.",
+    "html/elements/track/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/track/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/track/src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/track/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/track/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/track/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/track/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/track/src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/track/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/track/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/track/src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/track/src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/track/src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/track/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/track/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/track/src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/track/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/track/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/track/src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/track/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/track/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/track/src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/track/src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/track/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port.",
-    "html/elements/track/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port.",
-    "html/elements/track/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port.",
-    "html/elements/track/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port.",
+    "html/elements/track/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/track/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/track/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/track/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/track/src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/track/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port.",
-    "html/elements/track/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port.",
+    "html/elements/track/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/track/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/track/src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/track/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/track/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/track/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/track/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/track/src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/track/src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/track/src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/track/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/track/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/track/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/track/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/track/src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/track/src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/track/src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Expected a slash (\"/\").",
@@ -2011,26 +2011,26 @@
     "html/elements/track/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/track/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/track/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: syntax error",
-    "html/elements/track/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/track/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/track/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/track/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/track/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/track/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/track/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/track/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/track/src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/track/src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/track/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/track/src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/track/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/track/src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/track/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/track/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201ctrack\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/ul/model-novalid.html": "Duplicate ID \u201cid\u201d.",
     "html/elements/var/model-novalid.html": "End tag \u201cp\u201d implied, but there were open elements.",
     "html/elements/video/model-novalid.html": "Element \u201cp\u201d not allowed in this context. (The parent was element \u201cvideo\u201d.) Suppressing further errors from this subtree.",
     "html/elements/video/poster-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Must be non-empty.",
     "html/elements/video/poster-whitespace-only-novalid.html": "Bad value \u201c\t \n\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Must be non-empty.",
-    "html/elements/video/poster/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/video/poster/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/video/poster/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/video/poster/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/video/poster/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/video/poster/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/video/poster/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/poster/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/video/poster/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/video/poster/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/video/poster/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/video/poster/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/video/poster/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/video/poster/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: empty host.",
@@ -2038,38 +2038,38 @@
     "html/elements/video/poster/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/video/poster/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/video/poster/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/poster/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/video/poster/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
+    "html/elements/video/poster/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/video/poster/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/video/poster/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/poster/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/video/poster/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/video/poster/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/video/poster/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/video/poster/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/video/poster/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/video/poster/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/video/poster/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/video/poster/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/video/poster/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/video/poster/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/video/poster/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/video/poster/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/video/poster/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/video/poster/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/video/poster/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/poster/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/video/poster/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/video/poster/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/video/poster/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/poster/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
-    "html/elements/video/poster/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
-    "html/elements/video/poster/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
-    "html/elements/video/poster/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
+    "html/elements/video/poster/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/video/poster/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/video/poster/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/video/poster/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/video/poster/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/poster/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
-    "html/elements/video/poster/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
+    "html/elements/video/poster/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/video/poster/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/video/poster/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/poster/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/video/poster/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/video/poster/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/video/poster/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/video/poster/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/video/poster/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/video/poster/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/video/poster/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/video/poster/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/video/poster/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/video/poster/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/video/poster/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/poster/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/poster/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
@@ -2080,21 +2080,21 @@
     "html/elements/video/poster/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/poster/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/poster/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: syntax error",
-    "html/elements/video/poster/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/video/poster/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/video/poster/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/video/poster/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/video/poster/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/video/poster/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/video/poster/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/video/poster/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/video/poster/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/video/poster/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/video/poster/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/video/poster/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/video/poster/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/video/poster/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/video/poster/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
-    "html/elements/video/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/video/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/elements/video/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/elements/video/poster/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201cposter\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
+    "html/elements/video/src/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/elements/video/src/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/elements/video/src/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/elements/video/src/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/video/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/video/src/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/video/src/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/video/src/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/video/src/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: empty host.",
     "html/elements/video/src/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: empty host.",
@@ -2102,38 +2102,38 @@
     "html/elements/video/src/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/elements/video/src/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/elements/video/src/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/elements/video/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
+    "html/elements/video/src/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/elements/video/src/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/elements/video/src/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/elements/video/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/elements/video/src/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/elements/video/src/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/elements/video/src/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/video/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/video/src/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/video/src/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/video/src/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/elements/video/src/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/video/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/video/src/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/video/src/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/elements/video/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/video/src/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/elements/video/src/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/video/src/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/elements/video/src/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/elements/video/src/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
-    "html/elements/video/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
-    "html/elements/video/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
-    "html/elements/video/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
+    "html/elements/video/src/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/video/src/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/elements/video/src/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/elements/video/src/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/elements/video/src/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
-    "html/elements/video/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port.",
+    "html/elements/video/src/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/elements/video/src/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/elements/video/src/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/elements/video/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/elements/video/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/elements/video/src/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/elements/video/src/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/elements/video/src/scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/elements/video/src/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/elements/video/src/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/video/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/elements/video/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/elements/video/src/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/elements/video/src/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/elements/video/src/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/src/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/src/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
@@ -2144,15 +2144,15 @@
     "html/elements/video/src/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/src/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Expected a slash (\"/\").",
     "html/elements/video/src/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: syntax error",
-    "html/elements/video/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/video/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/video/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/elements/video/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/elements/video/src/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/video/src/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/elements/video/src/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/elements/video/src/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/elements/video/src/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/elements/video/src/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/elements/video/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/video/src/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/elements/video/src/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/elements/video/src/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/elements/video/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/elements/video/src/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201csrc\u201d on element \u201cvideo\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/media-queries/001-novalid.html": "Bad value \u201cscreen and\u201d for attribute \u201cmedia\u201d on element \u201clink\u201d: Bad media query: Media query ended prematurely.",
     "html/media-queries/002-novalid.html": "Bad value \u201calla\u201d for attribute \u201cmedia\u201d on element \u201clink\u201d: Bad media query: Expected a CSS media type but the query ended.",
     "html/media-queries/003-novalid.html": "Bad value \u201cPROJECT\u0130ON\u201d for attribute \u201cmedia\u201d on element \u201clink\u201d: Bad media query: Expected a letter, hyphen or whitespace but saw \u201c\u0130\u201d instead.",
@@ -2177,12 +2177,12 @@
     "html/media-queries/projection-novalid.html": "Bad value \u201cprojection\u201d for attribute \u201cmedia\u201d on element \u201clink\u201d: Bad media query: Deprecated media type \u201cprojection\u201d. For guidance, see the Media Types section in the current Media Queries specification.",
     "html/media-queries/tv-novalid.html": "Bad value \u201ctv and (scan: progressive)\u201d for attribute \u201cmedia\u201d on element \u201clink\u201d: Bad media query: Deprecated media type \u201ctv\u201d. For guidance, see the Media Types section in the current Media Queries specification.",
     "html/microdata/itemid-scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Fragment is not allowed for data: URIs according to RFC 2397.",
-    "html/microdata/itemid/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/microdata/itemid/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
-    "html/microdata/itemid/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in fragment: not a URL code point.",
+    "html/microdata/itemid/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in fragment: \u201c\\\u201d is not allowed.",
+    "html/microdata/itemid/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
+    "html/microdata/itemid/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in fragment: space is not allowed.",
     "html/microdata/itemid/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/microdata/itemid/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/microdata/itemid/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/microdata/itemid/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/microdata/itemid/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/microdata/itemid/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: empty host.",
     "html/microdata/itemid/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: empty host.",
     "html/microdata/itemid/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: empty host.",
@@ -2190,37 +2190,37 @@
     "html/microdata/itemid/host-invalid-unicode-novalid.html": "Forbidden code point U+fdd0.",
     "html/microdata/itemid/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/microdata/itemid/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/microdata/itemid/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Domain contains invalid character:  .",
-    "html/microdata/itemid/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port.",
+    "html/microdata/itemid/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Illegal character in domain: space is not allowed.",
+    "html/microdata/itemid/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/microdata/itemid/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/microdata/itemid/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
-    "html/microdata/itemid/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Domain contains invalid character: %.",
+    "html/microdata/itemid/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/microdata/itemid/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/microdata/itemid/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/microdata/itemid/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/microdata/itemid/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/microdata/itemid/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/microdata/itemid/path-leading-colon-backslash-novalid.html": "Bad value \u201c:\\\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
     "html/microdata/itemid/path-leading-colon-chars-backslash-novalid.html": "Bad value \u201c:foo.com\\\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/microdata/itemid/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/microdata/itemid/path-leading-space-novalid.html": "Bad value \u201chttp://f:21/ b\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/microdata/itemid/path-percent-encoded-malformed-novalid.html": "Bad value \u201chttp://example.com/foo/%2e%2\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
-    "html/microdata/itemid/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/microdata/itemid/path-relative-square-brackets-novalid.html": "Bad value \u201c[61:24:74]:98\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: \u201c[\u201d is not allowed.",
     "html/microdata/itemid/path-tab-novalid.html": "Bad value \u201chttp://example.com/foo\tbar\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/microdata/itemid/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/microdata/itemid/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: space is not allowed.",
     "html/microdata/itemid/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/microdata/itemid/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/microdata/itemid/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port.",
-    "html/microdata/itemid/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port.",
-    "html/microdata/itemid/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port.",
-    "html/microdata/itemid/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port.",
+    "html/microdata/itemid/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/microdata/itemid/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/microdata/itemid/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/microdata/itemid/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/microdata/itemid/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/microdata/itemid/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port.",
-    "html/microdata/itemid/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port.",
+    "html/microdata/itemid/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port: \u201cb\u201d is not allowed.",
+    "html/microdata/itemid/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in port: \u201c \u201d is not allowed.",
     "html/microdata/itemid/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Tab, new line or carriage return found.",
-    "html/microdata/itemid/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in query: not a URL code point.",
-    "html/microdata/itemid/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in query: not a URL code point.",
+    "html/microdata/itemid/query-leading-space-novalid.html": "Bad value \u201chttp://f:21/b? d\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in query: space is not allowed.",
+    "html/microdata/itemid/query-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b?d #\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in query: space is not allowed.",
     "html/microdata/itemid/scheme-data-single-slash-novalid.html": "Bad value \u201cdata:/example.com/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Expected a token character or a semicolon but saw \u201c/\u201d instead.",
     "html/microdata/itemid/scheme-file-backslash-novalid.html": "Bad value \u201cfile:c:\\foo\\bar.html\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/microdata/itemid/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
-    "html/microdata/itemid/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: not a URL code point.",
+    "html/microdata/itemid/scheme-file-single-slash-c-bar-novalid.html": "Bad value \u201cfile:/C|/foo/bar\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
+    "html/microdata/itemid/scheme-file-triple-slash-c-bar-novalid.html": "Bad value \u201cfile:///C|/foo/bar\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in path segment: \u201c|\u201d is not allowed.",
     "html/microdata/itemid/scheme-ftp-no-slash-novalid.html": "Bad value \u201cftp:example.com/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Expected a slash (\"/\").",
     "html/microdata/itemid/scheme-ftp-single-slash-novalid.html": "Bad value \u201cftp:/example.com/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Expected a slash (\"/\").",
     "html/microdata/itemid/scheme-http-backslash-novalid.html": "Bad value \u201chttp:\\\\foo.com\\\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Expected a slash (\"/\").",
@@ -2231,27 +2231,27 @@
     "html/microdata/itemid/scheme-https-no-slash-novalid.html": "Bad value \u201chttps:example.com/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Expected a slash (\"/\").",
     "html/microdata/itemid/scheme-https-single-slash-novalid.html": "Bad value \u201chttps:/example.com/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Expected a slash (\"/\").",
     "html/microdata/itemid/scheme-javascript-no-slash-malformed-novalid.html": "Bad value \u201cjavascript:example.com/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: syntax error",
-    "html/microdata/itemid/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/microdata/itemid/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/microdata/itemid/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
-    "html/microdata/itemid/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: not a URL code point.",
+    "html/microdata/itemid/scheme-trailing-cr-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/microdata/itemid/scheme-trailing-newline-novalid.html": "Bad value \u201ca:\nfoo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: line break is not allowed.",
+    "html/microdata/itemid/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: space is not allowed.",
+    "html/microdata/itemid/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in scheme data: tab is not allowed.",
     "html/microdata/itemid/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/microdata/itemid/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/microdata/itemid/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/microdata/itemid/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/microdata/itemid/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/microdata/itemid/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/microdata/itemid/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in user or password: not a URL code point.",
+    "html/microdata/itemid/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201citemid\u201d on element \u201cdiv\u201d: Bad URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/microdata/itemtype-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d.",
     "html/microdata/itemtype-scheme-data-contains-fragment-haswarn.html": "Bad value \u201cdata:text/html,test#test\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Fragment is not allowed for data: URIs according to RFC 2397.",
     "html/microdata/itemtype/fragment-backslash-novalid.html": "Bad value \u201c#\\\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c#\\\u201d is not an absolute URL.",
-    "html/microdata/itemtype/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in fragment: not a URL code point.",
+    "html/microdata/itemtype/fragment-contains-hash-novalid.html": "Bad value \u201chttp://foo/path#f#g\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in fragment: \u201c#\u201d is not allowed.",
     "html/microdata/itemtype/fragment-empty-hash-only-no-path-relative-novalid.html": "Bad value \u201c#\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c#\u201d is not an absolute URL.",
     "html/microdata/itemtype/fragment-leading-space-novalid.html": "Bad value \u201chttp://f:21/b# e\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201ce\u201d is not an absolute URL.",
     "html/microdata/itemtype/fragment-non-ascii-relative-novalid.html": "Bad value \u201c#\u03b2\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c#\u03b2\u201d is not an absolute URL.",
     "html/microdata/itemtype/fragment-semicolon-question-mark-relative-novalid.html": "Bad value \u201c#;?\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c#;?\u201d is not an absolute URL.",
     "html/microdata/itemtype/fragment-slash-relative-novalid.html": "Bad value \u201c#/\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c#/\u201d is not an absolute URL.",
     "html/microdata/itemtype/host-cr-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201corg\u201d is not an absolute URL.",
-    "html/microdata/itemtype/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: Domain contains invalid character: %.",
-    "html/microdata/itemtype/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: Domain contains invalid character: %.",
+    "html/microdata/itemtype/host-double-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff14\uff11.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/microdata/itemtype/host-double-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%94%ef%bc%91.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/microdata/itemtype/host-empty-novalid.html": "Bad value \u201chttp://\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: empty host.",
     "html/microdata/itemtype/host-empty-userinfo-empty-novalid.html": "Bad value \u201chttp://@/www.example.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: empty host.",
     "html/microdata/itemtype/host-empty-with-userinfo-novalid.html": "Bad value \u201chttp://user:pass@/\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: empty host.",
@@ -2260,10 +2260,10 @@
     "html/microdata/itemtype/host-invalid-unicode-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%b7%90zyx.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: A label or domain name contains disallowed characters..",
     "html/microdata/itemtype/host-newline-novalid.html": "Bad value \u201chttp://example.\norg\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201corg\u201d is not an absolute URL.",
     "html/microdata/itemtype/host-space-novalid.html": "Bad value \u201chttp://example .org\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c.org\u201d is not an absolute URL.",
-    "html/microdata/itemtype/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port.",
+    "html/microdata/itemtype/host-square-brackets-port-contains-colon-novalid.html": "Bad value \u201chttp://[1::2]:3:4\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port: \u201c:\u201d is not allowed.",
     "html/microdata/itemtype/host-tab-novalid.html": "Bad value \u201chttp://example\t.org\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c.org\u201d is not an absolute URL.",
-    "html/microdata/itemtype/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: Domain contains invalid character: %.",
-    "html/microdata/itemtype/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: Domain contains invalid character: %.",
+    "html/microdata/itemtype/host-u0000-percent-encoded-novalid.html": "Bad value \u201chttp://\uff05\uff10\uff10.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
+    "html/microdata/itemtype/host-u0000-percent-encoded-percent-encoded-novalid.html": "Bad value \u201chttp://%ef%bc%85%ef%bc%90%ef%bc%90.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Invalid host: Illegal character in domain: \u201c%\u201d is not allowed.",
     "html/microdata/itemtype/path-bare-percent-sign-novalid.html": "Bad value \u201chttp://example.com/foo%\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Percentage (\"%\") is not followed by two hexadecimal digits.",
     "html/microdata/itemtype/path-contains-space-novalid.html": "Bad value \u201c/a/ /c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c/a/\u201d is not an absolute URL.",
     "html/microdata/itemtype/path-leading-backslash-at-sign-novalid.html": "Bad value \u201chttp://foo.com/\\@\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Backslash (\"\\\") used as path segment delimiter.",
@@ -2280,12 +2280,12 @@
     "html/microdata/itemtype/path-trailing-space-novalid.html": "Bad value \u201chttp://f:21/b ?\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c?\u201d is not an absolute URL.",
     "html/microdata/itemtype/path-u0091-novalid.html": "Forbidden code point U+0091.",
     "html/microdata/itemtype/port-cr-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c/c\u201d is not an absolute URL.",
-    "html/microdata/itemtype/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port.",
-    "html/microdata/itemtype/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port.",
-    "html/microdata/itemtype/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port.",
-    "html/microdata/itemtype/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port.",
+    "html/microdata/itemtype/port-leading-colon-bracket-colon-novalid.html": "Bad value \u201chttp://2001::1]:80\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/microdata/itemtype/port-leading-colon-novalid.html": "Bad value \u201chttp://2001::1\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port: \u201c:\u201d is not allowed.",
+    "html/microdata/itemtype/port-leading-dash-novalid.html": "Bad value \u201chttp://foo:-80/\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port: \u201c-\u201d is not allowed.",
+    "html/microdata/itemtype/port-multiple-letters-novalid.html": "Bad value \u201chttp://f:fifty-two/c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port: \u201cf\u201d is not allowed.",
     "html/microdata/itemtype/port-newline-novalid.html": "Bad value \u201chttp://f:\n/c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c/c\u201d is not an absolute URL.",
-    "html/microdata/itemtype/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port.",
+    "html/microdata/itemtype/port-single-letter-novalid.html": "Bad value \u201chttp://f:b/c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in port: \u201cb\u201d is not allowed.",
     "html/microdata/itemtype/port-space-novalid.html": "Bad value \u201chttp://f: /c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c/c\u201d is not an absolute URL.",
     "html/microdata/itemtype/port-tab-novalid.html": "Bad value \u201chttp://f:\t/c\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c/c\u201d is not an absolute URL.",
     "html/microdata/itemtype/query-empty-no-path-relative-novalid.html": "Bad value \u201c?\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201c?\u201d is not an absolute URL.",
@@ -2308,10 +2308,10 @@
     "html/microdata/itemtype/scheme-trailing-space-novalid.html": "Bad value \u201ca: foo.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201cfoo.com\u201d is not an absolute URL.",
     "html/microdata/itemtype/scheme-trailing-tab-novalid.html": "Bad value \u201ca:\tfoo.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: The string \u201cfoo.com\u201d is not an absolute URL.",
     "html/microdata/itemtype/userinfo-backslash-novalid.html": "Bad value \u201chttp://a\\b:c\\d@foo.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Backslash (\"\\\") used as path segment delimiter.",
-    "html/microdata/itemtype/userinfo-password-bad-chars-novalid.html": "\u201c&\u201d did not start a character reference. (\u201c&\u201d probably should have been escaped as \u201c&amp;\u201d.)",
-    "html/microdata/itemtype/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in user or password: not a URL code point.",
+    "html/microdata/itemtype/userinfo-password-bad-chars-novalid.html": "Bad value \u201chttp://&afoo((b]c@d:2/\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in user or password: \u201c]\u201d is not allowed.",
+    "html/microdata/itemtype/userinfo-password-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://foo:\ud83d\udca9@example.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/microdata/itemtype/userinfo-username-contains-at-sign-novalid.html": "Bad value \u201chttp://::@c@d:2\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: User or password contains an at symbol (\"@\") not percent-encoded.",
-    "html/microdata/itemtype/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in user or password: not a URL code point.",
+    "html/microdata/itemtype/userinfo-username-contains-pile-of-poo-novalid.html": "Bad value \u201chttp://\ud83d\udca9:foo@example.com\u201d for attribute \u201citemtype\u201d on element \u201cdiv\u201d: Bad absolute URL: Illegal character in user or password: \u201c\ud83d\udca9\u201d is not allowed.",
     "html/mime-types/001-novalid.html": "Bad value \u201ctext/html \u201d for attribute \u201ctype\u201d on element \u201clink\u201d: Bad MIME type: Extraneous trailing whitespace.",
     "html/mime-types/002-novalid.html": "Bad value \u201c TEXT/HTML\u201d for attribute \u201ctype\u201d on element \u201clink\u201d: Bad MIME type: Expected a token character but saw \u201c \u201d instead.",
     "html/mime-types/003-novalid.html": "Bad value \u201ctext/html;charset=\u201d for attribute \u201ctype\u201d on element \u201clink\u201d: Bad MIME type: Parameter value missing.",
diff --git a/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html b/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html
new file mode 100644
index 000000000000..f12f8ffc56ff
--- /dev/null
+++ b/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html
@@ -0,0 +1,66 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <title>Video element src attribute must match src list - positive test</title>
+    <script src='/resources/testharness.js'></script>
+    <script src='/resources/testharnessreport.js'></script>
+</head>
+<body>
+    <h1>Video element in media-src list - redirect test</h1>
+    <div id='log'></div>
+    
+  <p>This test tests a buggy interaction in Chrome 46.  Two hosts (self and www2) are both allowed
+    as media-src, but only one (self) is allowed for connect-src.  If a video src starts on
+    an allowed host (self), and is redirected to another allowed media-src host, it should succeed. But a bug
+    causes the redirect to be done in a fetch context to which connect-src is being applied instead, so
+    the load is blocked. (This test passes in Firefox 45, modulo an event listener not firing.)</p>
+
+  <script>
+    var src_test = async_test("In-policy async video src");
+    var src_redir_test = async_test("in-policy async video src w/redir")
+    var source_test = async_test("In-policy async video source element");
+    var source_redir_test = async_test("In-policy async video source element w/redir");
+
+    function media_loaded(t) {
+      t.done();
+    }
+
+    function media_error_handler(t) {
+      t.step( function () {
+          assert_unreached("Media error handler shouldn't be triggered for allowed domain.");
+      });
+      t.done();
+    }
+  </script>
+
+    <video id="videoObject" width="320" height="240" controls
+           onloadeddata="media_loaded(source_test)">
+        <source id="videoSourceObject"
+                type="video/mp4"
+                onerror="media_error_handler(source_test)"
+                src="http://www2.{{host}}:{{ports[http][0]}}/media/white.mp4">
+    </video>
+    
+    <video id="videoObject2" width="320" height="240" controls
+           onerror="media_error_handler(src_test)"
+           onloadeddata="media_loaded(src_test)"
+           src="http://www2.{{host}}:{{ports[http][0]}}/media/white.mp4">
+
+    <video id="videoObject3" width="320" height="240" controls
+           onloadeddata="media_loaded(source_redir_test)">
+        <source id="videoSourceObject"
+                type="video/mp4"
+                onerror="media_error_handler(source_test)"
+                src="/common/redirect.py?location=http://www2.{{host}}:{{ports[http][0]}}/media/white.mp4">
+    </video>
+        
+    <video id="videoObject2" width="320" height="240" controls
+           onerror="media_error_handler(src_test)"
+           onloadeddata="media_loaded(src_test)"
+           src="/common/redirect.py?location=http://www2.{{host}}:{{ports[http][0]}}/media/white.mp4">
+        
+  <script async defer src="../support/checkReport.sub.js?reportExists=false">
+  </script>
+
+</body>
+</html>
diff --git a/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html.sub.headers b/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html.sub.headers
new file mode 100644
index 000000000000..4ce3e428a8ee
--- /dev/null
+++ b/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html.sub.headers
@@ -0,0 +1,6 @@
+Expires: Mon, 26 Jul 1997 05:00:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate
+Cache-Control: post-check=0, pre-check=0, false
+Pragma: no-cache
+Set-Cookie: media-src-redir-bug={{$id:uuid()}}; Path=/content-security-policy/media-src/
+Content-Security-Policy: script-src * 'unsafe-inline'; media-src http://www2.{{host}}:{{ports[http][0]}}/ 'self'; connect-src 'self'; report-uri  ../support/report.py?op=put&reportID={{$id}}
diff --git a/testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction.xhtml b/testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction.xhtml
rename to testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Document-getElementsByTagName.xhtml b/testing/web-platform/tests/dom/nodes/Document-getElementsByTagName-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Document-getElementsByTagName.xhtml
rename to testing/web-platform/tests/dom/nodes/Document-getElementsByTagName-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/DocumentType-literal.xhtml b/testing/web-platform/tests/dom/nodes/DocumentType-literal-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/DocumentType-literal.xhtml
rename to testing/web-platform/tests/dom/nodes/DocumentType-literal-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElement-null.svg b/testing/web-platform/tests/dom/nodes/Element-childElement-null-svg.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElement-null.svg
rename to testing/web-platform/tests/dom/nodes/Element-childElement-null-svg.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElement-null.xhtml b/testing/web-platform/tests/dom/nodes/Element-childElement-null-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElement-null.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-childElement-null-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add.svg b/testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add-svg.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add.svg
rename to testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add-svg.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add.xhtml b/testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-add-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove.svg b/testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove-svg.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove.svg
rename to testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove-svg.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove.xhtml b/testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-childElementCount-dynamic-remove-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild.svg b/testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild-svg.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild.svg
rename to testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild-svg.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild.xhtml b/testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-childElementCount-nochild-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElementCount.svg b/testing/web-platform/tests/dom/nodes/Element-childElementCount-svg.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElementCount.svg
rename to testing/web-platform/tests/dom/nodes/Element-childElementCount-svg.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-childElementCount.xhtml b/testing/web-platform/tests/dom/nodes/Element-childElementCount-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-childElementCount.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-childElementCount-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-firstElementChild-entity.xhtml b/testing/web-platform/tests/dom/nodes/Element-firstElementChild-entity-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-firstElementChild-entity.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-firstElementChild-entity-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace.svg b/testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace-svg.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace.svg
rename to testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace-svg.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace.xhtml b/testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-firstElementChild-namespace-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-firstElementChild.svg b/testing/web-platform/tests/dom/nodes/Element-firstElementChild-svg.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-firstElementChild.svg
rename to testing/web-platform/tests/dom/nodes/Element-firstElementChild-svg.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-firstElementChild.xhtml b/testing/web-platform/tests/dom/nodes/Element-firstElementChild-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-firstElementChild.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-firstElementChild-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-lastElementChild.svg b/testing/web-platform/tests/dom/nodes/Element-lastElementChild-svg.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-lastElementChild.svg
rename to testing/web-platform/tests/dom/nodes/Element-lastElementChild-svg.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-lastElementChild.xhtml b/testing/web-platform/tests/dom/nodes/Element-lastElementChild-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-lastElementChild.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-lastElementChild-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-nextElementSibling.svg b/testing/web-platform/tests/dom/nodes/Element-nextElementSibling-svg.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-nextElementSibling.svg
rename to testing/web-platform/tests/dom/nodes/Element-nextElementSibling-svg.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-nextElementSibling.xhtml b/testing/web-platform/tests/dom/nodes/Element-nextElementSibling-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-nextElementSibling.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-nextElementSibling-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-previousElementSibling.svg b/testing/web-platform/tests/dom/nodes/Element-previousElementSibling-svg.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-previousElementSibling.svg
rename to testing/web-platform/tests/dom/nodes/Element-previousElementSibling-svg.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-previousElementSibling.xhtml b/testing/web-platform/tests/dom/nodes/Element-previousElementSibling-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-previousElementSibling.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-previousElementSibling-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Element-siblingElement-null.svg b/testing/web-platform/tests/dom/nodes/Element-siblingElement-null-svg.svg
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-siblingElement-null.svg
rename to testing/web-platform/tests/dom/nodes/Element-siblingElement-null-svg.svg
diff --git a/testing/web-platform/tests/dom/nodes/Element-siblingElement-null.xhtml b/testing/web-platform/tests/dom/nodes/Element-siblingElement-null-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Element-siblingElement-null.xhtml
rename to testing/web-platform/tests/dom/nodes/Element-siblingElement-null-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/Node-nodeName.xhtml b/testing/web-platform/tests/dom/nodes/Node-nodeName-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/Node-nodeName.xhtml
rename to testing/web-platform/tests/dom/nodes/Node-nodeName-xhtml.xhtml
diff --git a/testing/web-platform/tests/dom/nodes/ParentNode-querySelector-All.xht b/testing/web-platform/tests/dom/nodes/ParentNode-querySelector-All-xht.xht
similarity index 100%
rename from testing/web-platform/tests/dom/nodes/ParentNode-querySelector-All.xht
rename to testing/web-platform/tests/dom/nodes/ParentNode-querySelector-All-xht.xht
diff --git a/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.xhtml b/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.xhtml
rename to testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case-xhtml.xhtml
diff --git a/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.xhtml b/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.xhtml
rename to testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id-xhtml.xhtml
diff --git a/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.xhtml b/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.xhtml
rename to testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace-xhtml.xhtml
diff --git a/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.xhtml b/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.xhtml
rename to testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements-xhtml.xhtml
diff --git a/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.xhtml b/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.xhtml
rename to testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef-xhtml.xhtml
diff --git a/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.xhtml b/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.xhtml
rename to testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param-xhtml.xhtml
diff --git a/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html b/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html
index daf74e1344e2..ebf15e79cd50 100644
--- a/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html
+++ b/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html
@@ -14,6 +14,12 @@ test(function() {
   assert_equals(document.vlinkColor, document.body.vLink);
   assert_equals(document.alinkColor, document.body.aLink);
 })
+test(function() {
+  document.fgColor = null;
+  assert_equals(document.fgColor, "");
+  assert_equals(document.body.text, "");
+  assert_equals(document.body.getAttribute("text"), "");
+})
 test(function() {
   document.fgColor = "blue";
   assert_equals(document.fgColor, "blue");
diff --git a/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html b/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html
index e020a3853da0..629c24627ce0 100644
--- a/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html
+++ b/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html
@@ -14,6 +14,12 @@ test(function() {
   assert_equals(document.vlinkColor, document.body.vLink);
   assert_equals(document.alinkColor, document.body.aLink);
 })
+test(function() {
+  document.body.text = null;
+  assert_equals(document.fgColor, "");
+  assert_equals(document.body.text, "");
+  assert_equals(document.body.getAttribute("text"), "");
+})
 test(function() {
   document.body.text = "blue";
   assert_equals(document.fgColor, "blue");
diff --git a/testing/web-platform/tests/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html b/testing/web-platform/tests/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html
index a7904bf0fe0d..f7d47b3640df 100644
--- a/testing/web-platform/tests/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html
+++ b/testing/web-platform/tests/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html
@@ -14,6 +14,10 @@
 <img srcset="/images/green-256x256.png 256w" sizes="512px" data-expect="512">
 <img srcset="/images/green-256x256.png 256w" sizes="1px" data-expect="1">
 <img srcset="/images/green-256x256.png 256w" sizes="0px" data-expect="0">
+<!-- SVG -->
+<img srcset="data:image/svg+xml,<svg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='-1%20-1%202%202'%20width='20'%20height='20'><circle%20r='1'/></svg> 2x" data-expect="10">
+<img srcset="data:image/svg+xml,<svg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='-1%20-1%202%202'%20width='20'><circle%20r='1'/></svg> 2x" data-expect="10">
+<img srcset="data:image/svg+xml,<svg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='-1%20-1%202%202'%20height='20'><circle%20r='1'/></svg> 2x" data-expect="10">
 <script>
 setup({explicit_done:true});
 onload = function() {
@@ -24,8 +28,8 @@ onload = function() {
       assert_equals(img.height, expected, 'height');
       assert_equals(img.clientWidth, expected, 'clientWidth');
       assert_equals(img.clientHeight, expected, 'clientHeight');
-      assert_equals(img.naturalWidth, 256, 'naturalWidth');
-      assert_equals(img.naturalHeight, 256, 'naturalHeight');
+      assert_equals(img.naturalWidth, expected, 'naturalWidth');
+      assert_equals(img.naturalHeight, expected, 'naturalHeight');
     }, img.outerHTML);
   });
   done();
diff --git a/testing/web-platform/tests/html/semantics/forms/the-input-element/maxlength-manual.html b/testing/web-platform/tests/html/semantics/forms/the-input-element/maxlength-manual.html
new file mode 100644
index 000000000000..fdf6c264410d
--- /dev/null
+++ b/testing/web-platform/tests/html/semantics/forms/the-input-element/maxlength-manual.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset=utf-8>
+    <title>input max length</title>
+    <link rel="author" title="Sam Gibson" href="mailto:sam@ifdown.net">
+    <link rel=help href="https://html.spec.whatwg.org/multipage/forms.html#the-maxlength-and-minlength-attributes">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+
+  <body>
+    <div id="log"></div>
+    <p>Type a letter anywhere into the input field (do not select any text, or otherwise manipulate the input)</p>
+    <input type=text maxlength=4 id=only-four value="inpu"></input>
+
+    <script>
+      var input;
+      setup(function() {
+        input = document.getElementById('only-four');
+      }, {explicit_done: true, explicit_timeout: true});
+
+
+      on_event(input, 'keyup', function(event) {
+          if  ((event.keyCode >= 65 && event.keyCode <= 90) ||
+                (event.keyCode >= 97 && event.keyCode <= 122)) {
+            test(function() {
+              assert_equals(input.value, "inpu");
+            }, 'input content should limit to maxlength')
+
+            done();
+          }
+      });
+    </script>
+  </body>
+</html>
+
diff --git a/testing/web-platform/tests/html/semantics/forms/the-input-element/maxlength.html b/testing/web-platform/tests/html/semantics/forms/the-input-element/maxlength.html
new file mode 100644
index 000000000000..8f0a2567d40e
--- /dev/null
+++ b/testing/web-platform/tests/html/semantics/forms/the-input-element/maxlength.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>input max length</title>
+    <link rel="author" title="Sam Gibson" href="mailto:sam@ifdown.net">
+    <link rel=help href="https://html.spec.whatwg.org/multipage/forms.html#the-maxlength-and-minlength-attributes">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+
+  <body>
+    <h1>Text input element</h1>
+
+    <div style="display: none">
+      <input id="none" />
+      <input id="negative" type="-5" />
+      <input id="non-numeric" type="not-a-number" />
+      <input id="assign-negative" />
+      <input id="assign-non-numeric" />
+    </div>
+
+    <div id="log"></div>
+
+    <script type="text/javascript">
+      test(
+        function() {
+          assert_equals(document.getElementById("none").maxLength, -1);
+        }, "Unset maxlength is -1");
+
+      test(
+        function() {
+          assert_equals(document.getElementById("negative").maxLength, -1);
+        }, "Negative maxlength is always -1");
+
+      test(
+        function() {
+          assert_equals(document.getElementById("non-numeric").maxLength, -1);
+        }, "Non-numeric maxlength is -1");
+
+      test(
+          function() {
+            assert_throws("INDEX_SIZE_ERR", function() {
+              document.getElementById("assign-negative").maxLength = -5;
+            });
+          }, "Assigning negative integer throws IndexSizeError");
+
+      test(
+          function() {
+            document.getElementById("assign-non-numeric").maxLength = "not-a-number";
+            assert_equals(document.getElementById("assign-non-numeric").maxLength, 0);
+          }, "Assigning non-numeric to maxlength sets maxlength to 0");
+    </script>
+  </body>
+</html>
+
diff --git a/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-event.xhtml b/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-event-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-event.xhtml
rename to testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-event-xhtml.xhtml
diff --git a/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text.xhtml b/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text.xhtml
rename to testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text-xhtml.xhtml
diff --git a/testing/web-platform/tests/html/syntax/parsing/README b/testing/web-platform/tests/html/syntax/parsing/README
index 8e4ae0808b6f..343ebaff746a 100644
--- a/testing/web-platform/tests/html/syntax/parsing/README
+++ b/testing/web-platform/tests/html/syntax/parsing/README
@@ -1,4 +1,4 @@
 Note: the html5lib_* files in this directory are autogenerated.
 
-To update them use the script /tools/scripts/update_html5lib_tests.py.
+To update them use the script /html/tools/update_html5lib_tests.py.
 Further instructions are provided in that file.
\ No newline at end of file
diff --git a/testing/web-platform/tests/html/syntax/parsing/test.js b/testing/web-platform/tests/html/syntax/parsing/test.js
index e2c1aabb39d5..362272a2f188 100644
--- a/testing/web-platform/tests/html/syntax/parsing/test.js
+++ b/testing/web-platform/tests/html/syntax/parsing/test.js
@@ -127,18 +127,23 @@ function get_type() {
   return run_type;
 };
 
-var test_in_data_uri = get_test_func(function (iframe, uri_encoded_input) {
-                                       iframe.src = "data:text/html;charset=utf8," + uri_encoded_input;
+var test_in_blob_uri = get_test_func(function (iframe, uri_encoded_input, t) {
+                                       var b = new Blob([decodeURIComponent(uri_encoded_input)], { type: "text/html" });
+                                       var blobURL = URL.createObjectURL(b);
+                                       iframe.src = blobURL;
+                                       t.add_cleanup(function() {
+                                         URL.revokeObjectURL(blobURL);
+                                       });
                                      });
 
-var test_document_write = get_test_func(function(iframe, uri_encoded_input) {
+var test_document_write = get_test_func(function(iframe, uri_encoded_input, t) {
                                           iframe.contentDocument.open();
                                           var input = decodeURIComponent(uri_encoded_input);
                                           iframe.contentDocument.write(input);
                                           iframe.contentDocument.close();
                                         });
 
-var test_document_write_single = get_test_func(function(iframe, uri_encoded_input) {
+var test_document_write_single = get_test_func(function(iframe, uri_encoded_input, t) {
                                                  iframe.contentDocument.open();
                                                  var input = decodeURIComponent(uri_encoded_input);
                                                  for (var i=0; i< input.length; i++) {
@@ -166,7 +171,7 @@ function get_test_func(inject_func) {
              }
             );
     };
-    inject_func(iframe, uri_encoded_input);
+    inject_func(iframe, uri_encoded_input, t);
   }
   return test_func;
 }
@@ -248,7 +253,7 @@ function init_tests(test_type) {
   var test_funcs = {
     "write":test_document_write,
     "write_single":test_document_write_single,
-    "uri":test_in_data_uri,
+    "uri":test_in_blob_uri,
     "innerHTML":test_fragment
   };
   var tests_started = 0;
diff --git a/testing/web-platform/tests/resources/docs/api.md b/testing/web-platform/tests/resources/docs/api.md
index d3ac4169d45e..accd18b8a423 100644
--- a/testing/web-platform/tests/resources/docs/api.md
+++ b/testing/web-platform/tests/resources/docs/api.md
@@ -203,7 +203,7 @@ eventWatcher.wait_for(t, 'animationstart').then(t.step_func(function() {
                                 'animationend']);
 })).then(t.step_func(function() {
   assertExpectedStateAtEndOfAnimation();
-  test.done();
+  t.done();
 }));
 ```
 
diff --git a/testing/web-platform/tests/resources/idlharness.js b/testing/web-platform/tests/resources/idlharness.js
index 9f324e089ebf..02304ca10600 100644
--- a/testing/web-platform/tests/resources/idlharness.js
+++ b/testing/web-platform/tests/resources/idlharness.js
@@ -772,6 +772,30 @@ IdlInterface.prototype.test_self = function()
         }.bind(this), this.name + " interface object length");
     }
 
+    if (!this.is_callback() || this.has_constants()) {
+        test(function() {
+            // This function tests WebIDL as of 2015-11-17.
+            // https://heycam.github.io/webidl/#interface-object
+
+            assert_own_property(self, this.name,
+                                "self does not have own property " + format_value(this.name));
+
+            // "All interface objects must have a property named “name” with
+            // attributes { [[Writable]]: false, [[Enumerable]]: false,
+            // [[Configurable]]: true } whose value is the identifier of the
+            // corresponding interface."
+
+            assert_own_property(self[this.name], "name");
+            var desc = Object.getOwnPropertyDescriptor(self[this.name], "name");
+            assert_false("get" in desc, this.name + ".name has getter");
+            assert_false("set" in desc, this.name + ".name has setter");
+            assert_false(desc.writable, this.name + ".name is writable");
+            assert_false(desc.enumerable, this.name + ".name is enumerable");
+            assert_true(desc.configurable, this.name + ".name is not configurable");
+            assert_equals(self[this.name].name, this.name, "wrong value for " + this.name + ".name");
+        }.bind(this), this.name + " interface object name");
+    }
+
     // TODO: Test named constructors if I find any interfaces that have them.
 
     test(function()
diff --git a/testing/web-platform/tests/resources/webidl2/README.md b/testing/web-platform/tests/resources/webidl2/README.md
index f7d03fcdef30..0243bdf51bf8 100644
--- a/testing/web-platform/tests/resources/webidl2/README.md
+++ b/testing/web-platform/tests/resources/webidl2/README.md
@@ -61,22 +61,6 @@ In the browser:
       var tree = WebIDL2.parse("string of WebIDL");
     </script>
 
-Advanced Parsing
-----------------
-
-`parse()` can optionally accept a second parameter, an options object, which can be used to
-modify parsing behavior.
-
-The following options are recognized:
-```javascript
-{
-    allowNestedTypedefs: false # 
-}
-```
-And their meanings are as follows:
-
-* `allowNestedTypedefs`: Boolean indicating whether the parser should accept `typedef`s as valid members of `interface`s. This is non-standard syntax and therefore the default is `false`.
-
 Errors
 ------
 When there is a syntax error in the WebIDL, it throws an exception object with the following
@@ -676,8 +660,9 @@ The fields are as follows:
   whereas the lack thereof will yield a `null`. If there is an `rhs` field then
   they are the right-hand side's arguments, otherwise they apply to the extended
   attribute directly.
-* `rhs`: If there is a right-hand side, this will capture its `type` (which can be
-  "identifier" or "identifier-list") and its `value`.
+* `rhs`: If there is a right-hand side, this will capture its `type` (always
+  "identifier" in practice, though it may be extended in the future) and its
+  `value`.
 * `typePair`: If the extended attribute is a `MapClass` this will capture the
   map's key type and value type respectively.
 
@@ -696,24 +681,6 @@ For Infinity:
 
 * `negative`: Boolean indicating whether this is negative Infinity or not.
 
-### `iterable<>`, `legacyiterable<>`, `maplike<>`, `setlike<>` declarations
-
-These appear as members of interfaces that look like this:
-
-        {
-            "type": "maplike", // or "legacyiterable" / "iterable" / "setlike"
-            "idlType": /* One or two types */,
-            "readonly": false, // only for maplike and setlike
-            "extAttrs": []
-        }
-
-The fields are as follows:
-
-* `type`: Always one of "iterable", "legacyiterable", "maplike" or "setlike".
-* `idlType`: An [IDL Type](#idl-type) (or an array of two types) representing the declared type arguments.
-* `readonly`: Whether the maplike or setlike is declared as read only.
-* `extAttrs`: A list of [extended attributes](#extended-attributes).
-
 
 Testing
 =======
diff --git a/testing/web-platform/tests/resources/webidl2/lib/webidl2.js b/testing/web-platform/tests/resources/webidl2/lib/webidl2.js
index 9e504fc6e1fd..50d3950dd70f 100644
--- a/testing/web-platform/tests/resources/webidl2/lib/webidl2.js
+++ b/testing/web-platform/tests/resources/webidl2/lib/webidl2.js
@@ -336,7 +336,6 @@
                   ret.rhs = rhs
                 }
                 else if (consume(OTHER, "(")) {
-                    // [Exposed=(Window,Worker)]
                     rhs = [];
                     var id = consume(ID);
                     if (id) {
@@ -344,10 +343,7 @@
                     }
                     identifiers(rhs);
                     consume(OTHER, ")") || error("Unexpected token in extended attribute argument list or type pair");
-                    ret.rhs = {
-                        type: "identifier-list",
-                        value: rhs
-                    };
+                    ret.rhs = rhs;
                 }
                 if (!ret.rhs) return error("No right hand side to extended attribute assignment");
             }
@@ -582,7 +578,7 @@
                 return ret;
             }
             else if (consume(ID, "stringifier")) {
-                ret.stringifier = true;-
+                ret.stringifier = true;
                 all_ws();
                 if (consume(OTHER, ";")) return ret;
                 ret.idlType = return_type();
@@ -687,69 +683,6 @@
             }
             return ret;
         };
-
-        var iterable_type = function() {
-            if (consume(ID, "iterable")) return "iterable";
-            else if (consume(ID, "legacyiterable")) return "legacyiterable";
-            else if (consume(ID, "maplike")) return "maplike";
-            else if (consume(ID, "setlike")) return "setlike";
-            else return;
-        }
-
-        var readonly_iterable_type = function() {
-            if (consume(ID, "maplike")) return "maplike";
-            else if (consume(ID, "setlike")) return "setlike";
-            else return;
-        }
-
-        var iterable = function (store) {
-            all_ws(store, "pea");
-            var grabbed = [],
-                ret = {type: null, idlType: null, readonly: false};
-            if (consume(ID, "readonly")) {
-                ret.readonly = true;
-                grabbed.push(last_token);
-                var w = all_ws();
-                if (w) grabbed.push(w);
-            }
-            var consumeItType = ret.readonly ? readonly_iterable_type : iterable_type;
-
-            var ittype = consumeItType();
-            if (!ittype) {
-                tokens = grabbed.concat(tokens);
-                return;
-            }
-
-            var secondTypeRequired = ittype === "maplike";
-            var secondTypeAllowed = secondTypeRequired || ittype === "iterable";
-            ret.type = ittype;
-            if (ret.type !== 'maplike' && ret.type !== 'setlike')
-                delete ret.readonly;
-            all_ws();
-            if (consume(OTHER, "<")) {
-                ret.idlType = type() || error("Error parsing " + ittype + " declaration");
-                all_ws();
-                if (secondTypeAllowed) {
-                    var type2 = null;
-                    if (consume(OTHER, ",")) {
-                        all_ws();
-                        type2 = type();
-                        all_ws();                        
-                    }
-                    if (type2)
-                        ret.idlType = [ret.idlType, type2];
-                    else if (secondTypeRequired)
-                        error("Missing second type argument in " + ittype + " declaration");
-                }
-                if (!consume(OTHER, ">")) error("Unterminated " + ittype + " declaration");
-                all_ws();
-                if (!consume(OTHER, ";")) error("Missing semicolon after " + ittype + " declaration");
-            }
-            else
-                error("Error parsing " + ittype + " declaration");
-
-            return ret;            
-        }        
         
         var interface_ = function (isPartial, store) {
             all_ws(isPartial ? null : store, "pea");
@@ -781,9 +714,7 @@
                     ret.members.push(cnt);
                     continue;
                 }
-                var mem = (opt.allowNestedTypedefs && typedef(store ? mems : null)) ||
-                          iterable(store ? mems : null) ||
-                          serialiser(store ? mems : null) ||
+                var mem = serialiser(store ? mems : null) ||
                           attribute(store ? mems : null) ||
                           operation(store ? mems : null) ||
                           error("Unknown member");
@@ -907,6 +838,7 @@
                 all_ws(store ? vals : null);
                 if (consume(OTHER, "}")) {
                     all_ws();
+                    if (saw_comma) error("Trailing comma in enum");
                     consume(OTHER, ";") || error("No semicolon after enum");
                     return ret;
                 }
diff --git a/testing/web-platform/tests/resources/webidl2/package.json b/testing/web-platform/tests/resources/webidl2/package.json
index c5ae7da2d593..e0e6ec4eac86 100644
--- a/testing/web-platform/tests/resources/webidl2/package.json
+++ b/testing/web-platform/tests/resources/webidl2/package.json
@@ -1,17 +1,17 @@
 {
   "name": "webidl2",
   "description": "A WebIDL Parser",
-  "version": "2.0.11",
+  "version": "2.0.10",
   "author": "Robin Berjon <robin@berjon.com>",
   "license": "MIT",
   "dependencies": {},
   "devDependencies": {
-    "mocha": "2.2.5",
+    "mocha": "2.1.0",
     "expect.js": "0.3.1",
-    "underscore": "1.8.3",
-    "jsondiffpatch": "0.1.31",
+    "underscore": "1.7.0",
+    "jsondiffpatch": "0.1.27",
     "benchmark": "*",
-    "microtime": "1.4.2"
+    "microtime": "1.1.0"
   },
   "scripts": {
     "test": "mocha"
diff --git a/testing/web-platform/tests/resources/webidl2/test/invalid/idl/maplike-1type.widl b/testing/web-platform/tests/resources/webidl2/test/invalid/idl/maplike-1type.widl
deleted file mode 100644
index 33c274b8b9a8..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/invalid/idl/maplike-1type.widl
+++ /dev/null
@@ -1,3 +0,0 @@
-interface MapLikeOneType {
-	maplike<long>;
-}
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/invalid/idl/readonly-iterable.widl b/testing/web-platform/tests/resources/webidl2/test/invalid/idl/readonly-iterable.widl
deleted file mode 100644
index fc4ae2be9084..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/invalid/idl/readonly-iterable.widl
+++ /dev/null
@@ -1,3 +0,0 @@
-interface ReadonlyIterable {
-	readonly iterable<long>;
-}
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/invalid/idl/setlike-2types.widl b/testing/web-platform/tests/resources/webidl2/test/invalid/idl/setlike-2types.widl
deleted file mode 100644
index 1ecae22c0106..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/invalid/idl/setlike-2types.widl
+++ /dev/null
@@ -1,3 +0,0 @@
-interface SetLikeTwoTypes {
-	setlike<long, long>;
-}
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/invalid/idl/typedef-nested.widl b/testing/web-platform/tests/resources/webidl2/test/invalid/idl/typedef-nested.widl
deleted file mode 100644
index 106f30b8f72e..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/invalid/idl/typedef-nested.widl
+++ /dev/null
@@ -1,22 +0,0 @@
-
-      interface Point {
-        attribute float x;
-        attribute float y;
-      };
-
-
-      interface Rect {
-        attribute Point topleft;
-        attribute Point bottomright;
-      };
-
-  interface Widget {
-    typedef sequence<Point> PointSequence;
-
-    readonly attribute Rect bounds;
-
-    boolean pointWithinBounds(Point p);
-    boolean allPointsWithinBounds(PointSequence ps);
-  };
-
-  typedef [Clamp] octet value; 
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/invalid/json/maplike-1type.json b/testing/web-platform/tests/resources/webidl2/test/invalid/json/maplike-1type.json
deleted file mode 100644
index 859a820a4910..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/invalid/json/maplike-1type.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "message": "Missing second type argument in maplike declaration",
-    "line": 2
-}
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/invalid/json/readonly-iterable.json b/testing/web-platform/tests/resources/webidl2/test/invalid/json/readonly-iterable.json
deleted file mode 100644
index c6f52a246158..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/invalid/json/readonly-iterable.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "message": "Invalid operation",
-    "line": 2
-}
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/invalid/json/setlike-2types.json b/testing/web-platform/tests/resources/webidl2/test/invalid/json/setlike-2types.json
deleted file mode 100644
index c9e49b6756d5..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/invalid/json/setlike-2types.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "message": "Unterminated setlike declaration",
-    "line": 2
-}
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/invalid/json/typedef-nested.json b/testing/web-platform/tests/resources/webidl2/test/invalid/json/typedef-nested.json
deleted file mode 100644
index d7fb9182f86e..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/invalid/json/typedef-nested.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "message":  "Invalid operation"
-,   "line":     14
-}
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax.js b/testing/web-platform/tests/resources/webidl2/test/syntax.js
index 712542a6be8e..6f9de3637d17 100644
--- a/testing/web-platform/tests/resources/webidl2/test/syntax.js
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax.js
@@ -17,16 +17,11 @@ describe("Parses all of the IDLs to produce the correct ASTs", function () {
     
     for (var i = 0, n = idls.length; i < n; i++) {
         var idl = idls[i], json = jsons[i];
-
         var func = (function (idl, json) {
             return function () {
                 try {
-                    var optFile = pth.join(__dirname, "syntax/opt", pth.basename(json));
-                    var opt = undefined;
-                    if (fs.existsSync(optFile))
-                        opt = JSON.parse(fs.readFileSync(optFile, "utf8"));
                     var diff = jdp.diff(JSON.parse(fs.readFileSync(json, "utf8")),
-                                        wp.parse(fs.readFileSync(idl, "utf8"), opt));
+                                        wp.parse(fs.readFileSync(idl, "utf8")));
                     if (diff && debug) console.log(JSON.stringify(diff, null, 4));
                     expect(diff).to.be(undefined);
                 }
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/callback.widl b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/callback.widl
index adaf75e049c9..d92f6a18c0a5 100644
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/callback.widl
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/callback.widl
@@ -2,6 +2,4 @@ callback AsyncOperationCallback = void (DOMString status);
 
 callback interface EventHandler {
   void eventOccurred(DOMString details);
-};
-
-callback SortCallback = boolean (any a, any b);
+};
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/enum.widl b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/enum.widl
index 37c4ffddee31..851fca2e6f61 100644
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/enum.widl
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/enum.widl
@@ -5,6 +5,4 @@ interface Meal {
   attribute float size;     // in grams
 
   void initialize(MealType type, float size);
-};
-
-enum AltMealType { "rice", "noodles", "other", };
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/extended-attributes.widl b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/extended-attributes.widl
deleted file mode 100644
index f769c2559cc7..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/extended-attributes.widl
+++ /dev/null
@@ -1,6 +0,0 @@
-// Extracted from http://www.w3.org/TR/2015/WD-service-workers-20150205/
-
-[Global=(Worker,ServiceWorker), Exposed=ServiceWorker]
-interface ServiceWorkerGlobalScope : WorkerGlobalScope {
-  
-};
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/iterable.widl b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/iterable.widl
deleted file mode 100644
index c7dfafa4daa8..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/iterable.widl
+++ /dev/null
@@ -1,7 +0,0 @@
-interface IterableOne {
-	iterable<long>;
-};
-
-interface IterableTwo {
-	iterable<short, double?>;
-};
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/legacyiterable.widl b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/legacyiterable.widl
deleted file mode 100644
index eafa7cf04459..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/legacyiterable.widl
+++ /dev/null
@@ -1,3 +0,0 @@
-interface LegacyIterable {
-	legacyiterable<long>;
-};
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/maplike.widl b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/maplike.widl
deleted file mode 100644
index 7b79b3888026..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/maplike.widl
+++ /dev/null
@@ -1,7 +0,0 @@
-interface MapLike {
-	maplike<long, float>;
-};
-
-interface ReadOnlyMapLike {
-	readonly maplike<long, float>;
-};
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/setlike.widl b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/setlike.widl
deleted file mode 100644
index 890e8e5a7597..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/setlike.widl
+++ /dev/null
@@ -1,7 +0,0 @@
-interface SetLike {
-	setlike<long>;
-};
-
-interface ReadOnlySetLike {
-	readonly setlike<long>;
-};
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/typedef-nested.widl b/testing/web-platform/tests/resources/webidl2/test/syntax/idl/typedef-nested.widl
deleted file mode 100644
index 106f30b8f72e..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/idl/typedef-nested.widl
+++ /dev/null
@@ -1,22 +0,0 @@
-
-      interface Point {
-        attribute float x;
-        attribute float y;
-      };
-
-
-      interface Rect {
-        attribute Point topleft;
-        attribute Point bottomright;
-      };
-
-  interface Widget {
-    typedef sequence<Point> PointSequence;
-
-    readonly attribute Rect bounds;
-
-    boolean pointWithinBounds(Point p);
-    boolean allPointsWithinBounds(PointSequence ps);
-  };
-
-  typedef [Clamp] octet value; 
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/json/callback.json b/testing/web-platform/tests/resources/webidl2/test/syntax/json/callback.json
index 43a517510467..19ef4a6fa4e2 100644
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/json/callback.json
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax/json/callback.json
@@ -72,48 +72,5 @@
         ],
         "inheritance": null,
         "extAttrs": []
-    },
-    {
-        "type": "callback",
-        "name": "SortCallback",
-        "idlType": {
-            "sequence": false,
-            "generic": null,
-            "nullable": false,
-            "array": false,
-            "union": false,
-            "idlType": "boolean"
-        },
-        "arguments": [
-            {
-                "optional": false,
-                "variadic": false,
-                "extAttrs": [],
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "any"
-                },
-                "name": "a"
-            },
-            {
-                "optional": false,
-                "variadic": false,
-                "extAttrs": [],
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "any"
-                },
-                "name": "b"
-            }
-        ],
-        "extAttrs": []
     }
 ]
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/json/enum.json b/testing/web-platform/tests/resources/webidl2/test/syntax/json/enum.json
index 196ee4e6405f..bd9058c594f6 100644
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/json/enum.json
+++ b/testing/web-platform/tests/resources/webidl2/test/syntax/json/enum.json
@@ -101,15 +101,5 @@
         ],
         "inheritance": null,
         "extAttrs": []
-    },
-    {
-        "type": "enum",
-        "name": "AltMealType",
-        "values": [
-            "rice",
-            "noodles",
-            "other"
-        ],
-        "extAttrs": []
     }
 ]
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/json/extended-attributes.json b/testing/web-platform/tests/resources/webidl2/test/syntax/json/extended-attributes.json
deleted file mode 100644
index 228c4b824be3..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/json/extended-attributes.json
+++ /dev/null
@@ -1,30 +0,0 @@
-[
-    {
-        "type": "interface",
-        "name": "ServiceWorkerGlobalScope",
-        "partial": false,
-        "members": [],
-        "inheritance": "WorkerGlobalScope",
-        "extAttrs": [
-            {
-                "name": "Global",
-                "arguments": null,
-                "rhs": {
-                    "type": "identifier-list",
-                    "value": [
-                        "Worker",
-                        "ServiceWorker"
-                    ]
-                }
-            },
-            {
-                "name": "Exposed",
-                "arguments": null,
-                "rhs": {
-                    "type": "identifier",
-                    "value": "ServiceWorker"
-                }
-            }
-        ]
-    }
-]
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/json/iterable.json b/testing/web-platform/tests/resources/webidl2/test/syntax/json/iterable.json
deleted file mode 100644
index 3e38991dd9db..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/json/iterable.json
+++ /dev/null
@@ -1,55 +0,0 @@
-[
-    {
-        "type": "interface",
-        "name": "IterableOne",
-        "partial": false,
-        "members": [
-            {
-                "type": "iterable",
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "long"
-                },
-                "extAttrs": []
-            }
-        ],
-        "inheritance": null,
-        "extAttrs": []
-    },
-    {
-        "type": "interface",
-        "name": "IterableTwo",
-        "partial": false,
-        "members": [
-            {
-                "type": "iterable",
-                "idlType": [
-                    {
-                        "sequence": false,
-                        "generic": null,
-                        "nullable": false,
-                        "array": false,
-                        "union": false,
-                        "idlType": "short"
-                    },
-                    {
-                        "sequence": false,
-                        "generic": null,
-                        "nullable": true,
-                        "array": false,
-                        "union": false,
-                        "idlType": "double"
-                    }
-                ],
-                "extAttrs": []
-            }
-        ],
-        "inheritance": null,
-        "extAttrs": []
-    }
-]
-
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/json/legacyiterable.json b/testing/web-platform/tests/resources/webidl2/test/syntax/json/legacyiterable.json
deleted file mode 100644
index e63f99de43f4..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/json/legacyiterable.json
+++ /dev/null
@@ -1,24 +0,0 @@
-[
-    {
-        "type": "interface",
-        "name": "LegacyIterable",
-        "partial": false,
-        "members": [
-            {
-                "type": "legacyiterable",
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "long"
-                },
-                "extAttrs": []
-            }
-        ],
-        "inheritance": null,
-        "extAttrs": []
-    }
-]
-
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/json/maplike.json b/testing/web-platform/tests/resources/webidl2/test/syntax/json/maplike.json
deleted file mode 100644
index 017d8b3f3ec2..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/json/maplike.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-    {
-        "type": "interface",
-        "name": "MapLike",
-        "partial": false,
-        "members": [
-            {
-                "type": "maplike",
-                "idlType": [
-                    {
-                        "sequence": false,
-                        "generic": null,
-                        "nullable": false,
-                        "array": false,
-                        "union": false,
-                        "idlType": "long"
-                    },
-                    {
-                        "sequence": false,
-                        "generic": null,
-                        "nullable": false,
-                        "array": false,
-                        "union": false,
-                        "idlType": "float"
-                    }
-                ],
-                "readonly": false,
-                "extAttrs": []
-            }
-        ],
-        "inheritance": null,
-        "extAttrs": []
-    },
-    {
-        "type": "interface",
-        "name": "ReadOnlyMapLike",
-        "partial": false,
-        "members": [
-            {
-                "type": "maplike",
-                "idlType": [
-                    {
-                        "sequence": false,
-                        "generic": null,
-                        "nullable": false,
-                        "array": false,
-                        "union": false,
-                        "idlType": "long"
-                    },
-                    {
-                        "sequence": false,
-                        "generic": null,
-                        "nullable": false,
-                        "array": false,
-                        "union": false,
-                        "idlType": "float"
-                    }
-                ],
-                "readonly": true,
-                "extAttrs": []
-            }
-        ],
-        "inheritance": null,
-        "extAttrs": []
-    }
-]
-
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/json/setlike.json b/testing/web-platform/tests/resources/webidl2/test/syntax/json/setlike.json
deleted file mode 100644
index d44043a944aa..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/json/setlike.json
+++ /dev/null
@@ -1,47 +0,0 @@
-[
-    {
-        "type": "interface",
-        "name": "SetLike",
-        "partial": false,
-        "members": [
-            {
-                "type": "setlike",
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "long"
-                },
-                "readonly": false,
-                "extAttrs": []
-            }
-        ],
-        "inheritance": null,
-        "extAttrs": []
-    },
-    {
-        "type": "interface",
-        "name": "ReadOnlySetLike",
-        "partial": false,
-        "members": [
-            {
-                "type": "setlike",
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "long"
-                },
-                "readonly": true,
-                "extAttrs": []
-            }
-        ],
-        "inheritance": null,
-        "extAttrs": []
-    }
-]
-
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/json/typedef-nested.json b/testing/web-platform/tests/resources/webidl2/test/syntax/json/typedef-nested.json
deleted file mode 100644
index 76d138408ddf..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/json/typedef-nested.json
+++ /dev/null
@@ -1,226 +0,0 @@
-[
-    {
-        "type": "interface",
-        "name": "Point",
-        "partial": false,
-        "members": [
-            {
-                "type": "attribute",
-                "static": false,
-                "stringifier": false,
-                "inherit": false,
-                "readonly": false,
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "float"
-                },
-                "name": "x",
-                "extAttrs": []
-            },
-            {
-                "type": "attribute",
-                "static": false,
-                "stringifier": false,
-                "inherit": false,
-                "readonly": false,
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "float"
-                },
-                "name": "y",
-                "extAttrs": []
-            }
-        ],
-        "inheritance": null,
-        "extAttrs": []
-    },
-    {
-        "type": "interface",
-        "name": "Rect",
-        "partial": false,
-        "members": [
-            {
-                "type": "attribute",
-                "static": false,
-                "stringifier": false,
-                "inherit": false,
-                "readonly": false,
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "Point"
-                },
-                "name": "topleft",
-                "extAttrs": []
-            },
-            {
-                "type": "attribute",
-                "static": false,
-                "stringifier": false,
-                "inherit": false,
-                "readonly": false,
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "Point"
-                },
-                "name": "bottomright",
-                "extAttrs": []
-            }
-        ],
-        "inheritance": null,
-        "extAttrs": []
-    },
-    {
-        "type": "interface",
-        "name": "Widget",
-        "partial": false,
-        "members": [
-            {
-                "type": "typedef",
-                "typeExtAttrs": [],
-                "idlType": {
-                    "sequence": true,
-                    "generic": "sequence",
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": {
-                        "sequence": false,
-                        "generic": null,
-                        "nullable": false,
-                        "array": false,
-                        "union": false,
-                        "idlType": "Point"
-                    }
-                },
-                "name": "PointSequence",
-                "extAttrs": []
-            },
-            {
-                "type": "attribute",
-                "static": false,
-                "stringifier": false,
-                "inherit": false,
-                "readonly": true,
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "Rect"
-                },
-                "name": "bounds",
-                "extAttrs": []
-            },
-            {
-                "type": "operation",
-                "getter": false,
-                "setter": false,
-                "creator": false,
-                "deleter": false,
-                "legacycaller": false,
-                "static": false,
-                "stringifier": false,
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "boolean"
-                },
-                "name": "pointWithinBounds",
-                "arguments": [
-                    {
-                        "optional": false,
-                        "variadic": false,
-                        "extAttrs": [],
-                        "idlType": {
-                            "sequence": false,
-                            "generic": null,
-                            "nullable": false,
-                            "array": false,
-                            "union": false,
-                            "idlType": "Point"
-                        },
-                        "name": "p"
-                    }
-                ],
-                "extAttrs": []
-            },
-            {
-                "type": "operation",
-                "getter": false,
-                "setter": false,
-                "creator": false,
-                "deleter": false,
-                "legacycaller": false,
-                "static": false,
-                "stringifier": false,
-                "idlType": {
-                    "sequence": false,
-                    "generic": null,
-                    "nullable": false,
-                    "array": false,
-                    "union": false,
-                    "idlType": "boolean"
-                },
-                "name": "allPointsWithinBounds",
-                "arguments": [
-                    {
-                        "optional": false,
-                        "variadic": false,
-                        "extAttrs": [],
-                        "idlType": {
-                            "sequence": false,
-                            "generic": null,
-                            "nullable": false,
-                            "array": false,
-                            "union": false,
-                            "idlType": "PointSequence"
-                        },
-                        "name": "ps"
-                    }
-                ],
-                "extAttrs": []
-            }
-        ],
-        "inheritance": null,
-        "extAttrs": []
-    },
-    {
-        "type": "typedef",
-        "typeExtAttrs": [
-            {
-                "name": "Clamp",
-                "arguments": null
-            }
-        ],
-        "idlType": {
-            "sequence": false,
-            "generic": null,
-            "nullable": false,
-            "array": false,
-            "union": false,
-            "idlType": "octet"
-        },
-        "name": "value",
-        "extAttrs": []
-    }
-]
\ No newline at end of file
diff --git a/testing/web-platform/tests/resources/webidl2/test/syntax/opt/typedef-nested.json b/testing/web-platform/tests/resources/webidl2/test/syntax/opt/typedef-nested.json
deleted file mode 100644
index f0794e74e07e..000000000000
--- a/testing/web-platform/tests/resources/webidl2/test/syntax/opt/typedef-nested.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "allowNestedTypedefs": true
-}
\ No newline at end of file
diff --git a/testing/web-platform/tests/selectors/attribute-selectors/attribute-case/semantics.html b/testing/web-platform/tests/selectors/attribute-selectors/attribute-case/semantics.html
index 7b6d7373af0b..c455e26686ef 100644
--- a/testing/web-platform/tests/selectors/attribute-selectors/attribute-case/semantics.html
+++ b/testing/web-platform/tests/selectors/attribute-selectors/attribute-case/semantics.html
@@ -19,12 +19,12 @@ var match = [
   ["[*|foo='bar' i]", ["", "foo", "BAR"], ["a", "foo", "x"], ["b", "foo", "x"], ["c", "foo", "x"]],
   ["[align='left' i]", ["", "align", "LEFT"]],
   ["[align='LEFT' i]", ["", "align", "left"]],
-  ["[class='a' i]", ["", "class", "A"]],
-  ["[class='A' i]", ["", "class", "a"]],
-  ["[id='a' i]", ["", "id", "A"]],
-  ["[id='A' i]", ["", "id", "a"]],
-  ["[lang='a' i]", ["", "lang", "A"]],
-  ["[lang='A' i]", ["", "lang", "a"]],
+  ["[class~='a' i]", ["", "class", "X A B"]],
+  ["[class~='A' i]", ["", "class", "x a b"]],
+  ["[id^='a' i]", ["", "id", "AB"]],
+  ["[id$='A' i]", ["", "id", "xa"]],
+  ["[lang|='a' i]", ["", "lang", "A-B"]],
+  ["[lang*='A' i]", ["", "lang", "xab"]],
   ["[*|lang='a' i]", ["http://www.w3.org/XML/1998/namespace", "lang", "A"]],
   ["[*|lang='A' i]", ["http://www.w3.org/XML/1998/namespace", "lang", "a"]],
   ["@namespace x 'http://www.w3.org/XML/1998/namespace'; [x|lang='A' i]", ["http://www.w3.org/XML/1998/namespace", "lang", "a"]],
@@ -40,11 +40,11 @@ var nomatch = [
   ["[foo='\u00E4' i]", ["", "foo", "\u00C4"]],
   ["[foo='\u00C4' i]", ["", "foo", "\u00E4"]],
   ["[foo='a\u0308' i] /* COMBINING in selector */", ["", "foo", "\u00C4"]],
-  ["[foo='a\u0308' i] /* COMBINING in selector */", ["", "foo", "\u00E4"]],
-  ["[foo='A\u0308' i] /* COMBINING in selector */", ["", "foo", "\u00C4"]],
-  ["[foo='A\u0308' i] /* COMBINING in selector */", ["", "foo", "\u00E4"]],
-  ["[foo='\u00E4' i] /* COMBINING in attribute */", ["", "foo", "a\u0308"]],
-  ["[foo='\u00E4' i] /* COMBINING in attribute */", ["", "foo", "A\u0308"]],
+  ["[foo~='a\u0308' i] /* COMBINING in selector */", ["", "foo", "\u00E4"]],
+  ["[foo^='A\u0308' i] /* COMBINING in selector */", ["", "foo", "\u00C4"]],
+  ["[foo$='A\u0308' i] /* COMBINING in selector */", ["", "foo", "\u00E4"]],
+  ["[foo*='\u00E4' i] /* COMBINING in attribute */", ["", "foo", "a\u0308"]],
+  ["[foo|='\u00E4' i] /* COMBINING in attribute */", ["", "foo", "A\u0308"]],
   ["[foo='\u00C4' i] /* COMBINING in attribute */", ["", "foo", "a\u0308"]],
   ["[foo='\u00C4' i] /* COMBINING in attribute */", ["", "foo", "A\u0308"]],
   ["[foo='a\u0308' i] /* COMBINING in selector */", ["", "foo", "a"]],
diff --git a/testing/web-platform/tests/selectors/attribute-selectors/attribute-case/syntax.html b/testing/web-platform/tests/selectors/attribute-selectors/attribute-case/syntax.html
index 754af95c9d01..1a6aa5b369db 100644
--- a/testing/web-platform/tests/selectors/attribute-selectors/attribute-case/syntax.html
+++ b/testing/web-platform/tests/selectors/attribute-selectors/attribute-case/syntax.html
@@ -29,6 +29,8 @@ var valid = [
   "[foo~='bar' i]",
   "[foo^='bar' i]",
   "[foo$='bar' i]",
+  "[foo*='bar' i]",
+  "[foo|='bar' i]",
   "[|foo='bar' i]",
   "[*|foo='bar' i]",
 ];
diff --git a/testing/web-platform/tests/svg/interfaces.html b/testing/web-platform/tests/svg/interfaces.html
new file mode 100644
index 000000000000..15c447734867
--- /dev/null
+++ b/testing/web-platform/tests/svg/interfaces.html
@@ -0,0 +1,1568 @@
+<!doctype html>
+<title>SVG interface tests</title>
+<div id=log></div>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/resources/WebIDLParser.js></script>
+<script src=/resources/idlharness.js></script>
+<script type=text/plain id=untested_idl>
+interface EventTarget {};
+interface Node : EventTarget {};
+interface Document : Node {};
+interface ProcessingInstruction : Node {};
+interface Element : Node {};
+interface HTMLElement : Element {};
+[PrimaryGlobal] interface Window {};
+
+[TreatNonObjectAsNull]
+callback EventHandlerNonNull = any (Event event);
+typedef EventHandlerNonNull? EventHandler;
+
+[TreatNonObjectAsNull]
+callback OnErrorEventHandlerNonNull = any ((Event or DOMString) event, optional DOMString source, optional unsigned long lineno, optional unsigned long column, optional any error);
+typedef OnErrorEventHandlerNonNull? OnErrorEventHandler;
+
+[TreatNonObjectAsNull]
+callback OnBeforeUnloadEventHandlerNonNull = DOMString? (Event event);
+typedef OnBeforeUnloadEventHandlerNonNull? OnBeforeUnloadEventHandler;
+
+[NoInterfaceObject]
+interface GlobalEventHandlers {
+  attribute EventHandler onabort;
+  attribute EventHandler onautocomplete;
+  attribute EventHandler onautocompleteerror;
+  attribute EventHandler onblur;
+  attribute EventHandler oncancel;
+  attribute EventHandler oncanplay;
+  attribute EventHandler oncanplaythrough;
+  attribute EventHandler onchange;
+  attribute EventHandler onclick;
+  attribute EventHandler onclose;
+  attribute EventHandler oncontextmenu;
+  attribute EventHandler oncuechange;
+  attribute EventHandler ondblclick;
+  attribute EventHandler ondrag;
+  attribute EventHandler ondragend;
+  attribute EventHandler ondragenter;
+  attribute EventHandler ondragexit;
+  attribute EventHandler ondragleave;
+  attribute EventHandler ondragover;
+  attribute EventHandler ondragstart;
+  attribute EventHandler ondrop;
+  attribute EventHandler ondurationchange;
+  attribute EventHandler onemptied;
+  attribute EventHandler onended;
+  attribute OnErrorEventHandler onerror;
+  attribute EventHandler onfocus;
+  attribute EventHandler oninput;
+  attribute EventHandler oninvalid;
+  attribute EventHandler onkeydown;
+  attribute EventHandler onkeypress;
+  attribute EventHandler onkeyup;
+  attribute EventHandler onload;
+  attribute EventHandler onloadeddata;
+  attribute EventHandler onloadedmetadata;
+  attribute EventHandler onloadstart;
+  attribute EventHandler onmousedown;
+  [LenientThis] attribute EventHandler onmouseenter;
+  [LenientThis] attribute EventHandler onmouseleave;
+  attribute EventHandler onmousemove;
+  attribute EventHandler onmouseout;
+  attribute EventHandler onmouseover;
+  attribute EventHandler onmouseup;
+  attribute EventHandler onwheel;
+  attribute EventHandler onpause;
+  attribute EventHandler onplay;
+  attribute EventHandler onplaying;
+  attribute EventHandler onprogress;
+  attribute EventHandler onratechange;
+  attribute EventHandler onreset;
+  attribute EventHandler onresize;
+  attribute EventHandler onscroll;
+  attribute EventHandler onseeked;
+  attribute EventHandler onseeking;
+  attribute EventHandler onselect;
+  attribute EventHandler onshow;
+  attribute EventHandler onsort;
+  attribute EventHandler onstalled;
+  attribute EventHandler onsubmit;
+  attribute EventHandler onsuspend;
+  attribute EventHandler ontimeupdate;
+  attribute EventHandler ontoggle;
+  attribute EventHandler onvolumechange;
+  attribute EventHandler onwaiting;
+};
+
+[NoInterfaceObject]
+interface WindowEventHandlers {
+  attribute EventHandler onafterprint;
+  attribute EventHandler onbeforeprint;
+  attribute OnBeforeUnloadEventHandler onbeforeunload;
+  attribute EventHandler onhashchange;
+  attribute EventHandler onlanguagechange;
+  attribute EventHandler onmessage;
+  attribute EventHandler onoffline;
+  attribute EventHandler ononline;
+  attribute EventHandler onpagehide;
+  attribute EventHandler onpageshow;
+  attribute EventHandler onpopstate;
+  attribute EventHandler onrejectionhandled;
+  attribute EventHandler onstorage;
+  attribute EventHandler onunhandledrejection;
+  attribute EventHandler onunload;
+};
+
+[NoInterfaceObject]interface LinkStyle {
+  readonly attribute StyleSheet? sheet;
+};
+
+
+[Constructor(optional unrestricted double x = 0, optional unrestricted double y = 0,
+             optional unrestricted double z = 0, optional unrestricted double w = 1),
+ Exposed=(Window,Worker)]
+interface DOMPointReadOnly {
+    [NewObject] static DOMPointReadOnly fromPoint(optional DOMPointInit point);
+
+    readonly attribute unrestricted double x;
+    readonly attribute unrestricted double y;
+    readonly attribute unrestricted double z;
+    readonly attribute unrestricted double w;
+
+    DOMPoint matrixTransform(optional DOMMatrixInit matrix);
+};
+
+[Constructor(optional unrestricted double x = 0, optional unrestricted double y = 0,
+             optional unrestricted double z = 0, optional unrestricted double w = 1),
+ Exposed=(Window,Worker)]
+interface DOMPoint : DOMPointReadOnly {
+    [NewObject] static DOMPoint fromPoint(optional DOMPointInit other);
+
+    inherit attribute unrestricted double x;
+    inherit attribute unrestricted double y;
+    inherit attribute unrestricted double z;
+    inherit attribute unrestricted double w;
+};
+
+dictionary DOMPointInit {
+    unrestricted double x = 0;
+    unrestricted double y = 0;
+    unrestricted double z = 0;
+    unrestricted double w = 1;
+};
+
+[Constructor(optional unrestricted double x = 0, optional unrestricted double y = 0,
+             optional unrestricted double width = 0, optional unrestricted double height = 0),
+ Exposed=(Window,Worker)]
+interface DOMRectReadOnly {
+    [NewObject] static DOMRectReadOnly fromRect(optional DOMRectInit other);
+
+    readonly attribute unrestricted double x;
+    readonly attribute unrestricted double y;
+    readonly attribute unrestricted double width;
+    readonly attribute unrestricted double height;
+    readonly attribute unrestricted double top;
+    readonly attribute unrestricted double right;
+    readonly attribute unrestricted double bottom;
+    readonly attribute unrestricted double left;
+};
+
+[Constructor(optional unrestricted double x = 0, optional unrestricted double y = 0,
+             optional unrestricted double width = 0, optional unrestricted double height = 0),
+ Exposed=(Window,Worker)]
+interface DOMRect : DOMRectReadOnly {
+    [NewObject] static DOMRect fromRect(optional DOMRectInit other);
+
+    inherit attribute unrestricted double x;
+    inherit attribute unrestricted double y;
+    inherit attribute unrestricted double width;
+    inherit attribute unrestricted double height;
+};
+
+dictionary DOMRectInit {
+    unrestricted double x = 0;
+    unrestricted double y = 0;
+    unrestricted double width = 0;
+    unrestricted double height = 0;
+};
+
+[Constructor(sequence<unrestricted double> numberSequence),
+ Exposed=(Window,Worker)]
+interface DOMMatrixReadOnly {
+    [NewObject] static DOMMatrixReadOnly fromMatrix(optional DOMMatrixInit other);
+    [NewObject] static DOMMatrixReadOnly fromString(DOMString transformList);
+    [NewObject] static DOMMatrixReadOnly fromFloat32Array(Float32Array array32);
+    [NewObject] static DOMMatrixReadOnly fromFloat64Array(Float64Array array64);
+
+    // These attributes are simple aliases for certain elements of the 4x4 matrix
+    readonly attribute unrestricted double a;
+    readonly attribute unrestricted double b;
+    readonly attribute unrestricted double c;
+    readonly attribute unrestricted double d;
+    readonly attribute unrestricted double e;
+    readonly attribute unrestricted double f;
+
+    readonly attribute unrestricted double m11;
+    readonly attribute unrestricted double m12;
+    readonly attribute unrestricted double m13;
+    readonly attribute unrestricted double m14;
+    readonly attribute unrestricted double m21;
+    readonly attribute unrestricted double m22;
+    readonly attribute unrestricted double m23;
+    readonly attribute unrestricted double m24;
+    readonly attribute unrestricted double m31;
+    readonly attribute unrestricted double m32;
+    readonly attribute unrestricted double m33;
+    readonly attribute unrestricted double m34;
+    readonly attribute unrestricted double m41;
+    readonly attribute unrestricted double m42;
+    readonly attribute unrestricted double m43;
+    readonly attribute unrestricted double m44;
+
+    readonly attribute boolean is2D;
+    readonly attribute boolean isIdentity;
+
+    // Immutable transform methods
+    DOMMatrix translate(unrestricted double tx,
+                        unrestricted double ty,
+                        optional unrestricted double tz = 0);
+    DOMMatrix scale(unrestricted double scale,
+                    optional unrestricted double originX = 0,
+                    optional unrestricted double originY = 0);
+    DOMMatrix scale3d(unrestricted double scale,
+                      optional unrestricted double originX = 0,
+                      optional unrestricted double originY = 0,
+                      optional unrestricted double originZ = 0);
+    DOMMatrix scaleNonUniform(unrestricted double scaleX,
+                              optional unrestricted double scaleY = 1,
+                              optional unrestricted double scaleZ = 1,
+                              optional unrestricted double originX = 0,
+                              optional unrestricted double originY = 0,
+                              optional unrestricted double originZ = 0);
+    DOMMatrix rotate(unrestricted double angle,
+                     optional unrestricted double originX = 0,
+                     optional unrestricted double originY = 0);
+    DOMMatrix rotateFromVector(unrestricted double x,
+                               unrestricted double y);
+    DOMMatrix rotateAxisAngle(unrestricted double x,
+                              unrestricted double y,
+                              unrestricted double z,
+                              unrestricted double angle);
+    DOMMatrix skewX(unrestricted double sx);
+    DOMMatrix skewY(unrestricted double sy);
+    DOMMatrix multiply(optional DOMMatrixInit other);
+    DOMMatrix flipX();
+    DOMMatrix flipY();
+    DOMMatrix inverse();
+
+    DOMPoint            transformPoint(optional DOMPointInit point);
+    Float32Array        toFloat32Array();
+    Float64Array        toFloat64Array();
+                        stringifier;
+};
+
+[Constructor(sequence<unrestricted double> numberSequence),
+ Exposed=(Window,Worker)]
+interface DOMMatrix : DOMMatrixReadOnly {
+    [NewObject] static DOMMatrix fromMatrix(optional DOMMatrixInit other);
+    [NewObject] static DOMMatrix fromString(DOMString transformList);
+    [NewObject] static DOMMatrix fromFloat32Array(Float32Array array32);
+    [NewObject] static DOMMatrix fromFloat64Array(Float64Array array64);
+
+    // These attributes are simple aliases for certain elements of the 4x4 matrix
+    inherit attribute unrestricted double a;
+    inherit attribute unrestricted double b;
+    inherit attribute unrestricted double c;
+    inherit attribute unrestricted double d;
+    inherit attribute unrestricted double e;
+    inherit attribute unrestricted double f;
+
+    inherit attribute unrestricted double m11;
+    inherit attribute unrestricted double m12;
+    inherit attribute unrestricted double m13;
+    inherit attribute unrestricted double m14;
+    inherit attribute unrestricted double m21;
+    inherit attribute unrestricted double m22;
+    inherit attribute unrestricted double m23;
+    inherit attribute unrestricted double m24;
+    inherit attribute unrestricted double m31;
+    inherit attribute unrestricted double m32;
+    inherit attribute unrestricted double m33;
+    inherit attribute unrestricted double m34;
+    inherit attribute unrestricted double m41;
+    inherit attribute unrestricted double m42;
+    inherit attribute unrestricted double m43;
+    inherit attribute unrestricted double m44;
+
+    // Mutable transform methods
+    DOMMatrix multiplySelf(optional DOMMatrixInit other);
+    DOMMatrix preMultiplySelf(optional DOMMatrixInit other);
+    DOMMatrix translateSelf(unrestricted double tx,
+                     unrestricted double ty,
+                     optional unrestricted double tz = 0);
+    DOMMatrix scaleSelf(unrestricted double scale,
+                 optional unrestricted double originX = 0,
+                 optional unrestricted double originY = 0);
+    DOMMatrix scale3dSelf(unrestricted double scale,
+                   optional unrestricted double originX = 0,
+                   optional unrestricted double originY = 0,
+                   optional unrestricted double originZ = 0);
+    DOMMatrix scaleNonUniformSelf(unrestricted double scaleX,
+                           optional unrestricted double scaleY = 1,
+                           optional unrestricted double scaleZ = 1,
+                           optional unrestricted double originX = 0,
+                           optional unrestricted double originY = 0,
+                           optional unrestricted double originZ = 0);
+    DOMMatrix rotateSelf(unrestricted double angle,
+                  optional unrestricted double originX = 0,
+                  optional unrestricted double originY = 0);
+    DOMMatrix rotateFromVectorSelf(unrestricted double x,
+                            unrestricted double y);
+    DOMMatrix rotateAxisAngleSelf(unrestricted double x,
+                           unrestricted double y,
+                           unrestricted double z,
+                           unrestricted double angle);
+    DOMMatrix skewXSelf(unrestricted double sx);
+    DOMMatrix skewYSelf(unrestricted double sy);
+    DOMMatrix invertSelf();
+
+    DOMMatrix setMatrixValue(DOMString transformList);
+};
+
+dictionary DOMMatrixInit {
+    unrestricted double a;
+    unrestricted double b;
+    unrestricted double c;
+    unrestricted double d;
+    unrestricted double e;
+    unrestricted double f;
+    unrestricted double m11;
+    unrestricted double m12;
+    unrestricted double m13 = 0;
+    unrestricted double m14 = 0;
+    unrestricted double m21;
+    unrestricted double m22;
+    unrestricted double m23 = 0;
+    unrestricted double m24 = 0;
+    unrestricted double m31 = 0;
+    unrestricted double m32 = 0;
+    unrestricted double m33 = 1;
+    unrestricted double m34 = 0;
+    unrestricted double m41;
+    unrestricted double m42;
+    unrestricted double m43 = 0;
+    unrestricted double m44 = 1;
+    boolean is2D;
+};
+</script>
+<script type=text/plain id=idl>
+interface SVGElement : Element {
+
+  [SameObject] readonly attribute SVGAnimatedString className;
+
+  readonly attribute SVGSVGElement? ownerSVGElement;
+  readonly attribute SVGElement? viewportElement;
+
+  attribute long tabIndex;
+  void focus();
+  void blur();
+};
+
+SVGElement implements GlobalEventHandlers;
+
+dictionary SVGBoundingBoxOptions {
+  boolean fill = true;
+  boolean stroke = false;
+  boolean markers = false;
+  boolean clipped = false;
+};
+
+interface SVGGraphicsElement : SVGElement {
+  [SameObject] readonly attribute SVGAnimatedTransformList transform;
+
+  DOMRect getBBox(optional SVGBoundingBoxOptions options);
+  DOMMatrix? getCTM();
+  DOMMatrix? getScreenCTM();
+};
+
+SVGGraphicsElement implements SVGTests;
+
+interface SVGGeometryElement : SVGGraphicsElement {
+  boolean isPointInFill(DOMPoint point);
+  boolean isPointInStroke(DOMPoint point);
+};
+
+interface SVGNumber {
+  attribute float value;
+};
+
+interface SVGLength {
+
+  // Length Unit Types
+  const unsigned short SVG_LENGTHTYPE_UNKNOWN = 0;
+  const unsigned short SVG_LENGTHTYPE_NUMBER = 1;
+  const unsigned short SVG_LENGTHTYPE_PERCENTAGE = 2;
+  const unsigned short SVG_LENGTHTYPE_EMS = 3;
+  const unsigned short SVG_LENGTHTYPE_EXS = 4;
+  const unsigned short SVG_LENGTHTYPE_PX = 5;
+  const unsigned short SVG_LENGTHTYPE_CM = 6;
+  const unsigned short SVG_LENGTHTYPE_MM = 7;
+  const unsigned short SVG_LENGTHTYPE_IN = 8;
+  const unsigned short SVG_LENGTHTYPE_PT = 9;
+  const unsigned short SVG_LENGTHTYPE_PC = 10;
+
+  readonly attribute unsigned short unitType;
+           attribute float value;
+           attribute float valueInSpecifiedUnits;
+           attribute DOMString valueAsString;
+
+  void newValueSpecifiedUnits(unsigned short unitType, float valueInSpecifiedUnits);
+  void convertToSpecifiedUnits(unsigned short unitType);
+};
+
+interface SVGAngle {
+
+  // Angle Unit Types
+  const unsigned short SVG_ANGLETYPE_UNKNOWN = 0;
+  const unsigned short SVG_ANGLETYPE_UNSPECIFIED = 1;
+  const unsigned short SVG_ANGLETYPE_DEG = 2;
+  const unsigned short SVG_ANGLETYPE_RAD = 3;
+  const unsigned short SVG_ANGLETYPE_GRAD = 4;
+
+  readonly attribute unsigned short unitType;
+           attribute float value;
+           attribute float valueInSpecifiedUnits;
+           attribute DOMString valueAsString;
+
+  void newValueSpecifiedUnits(unsigned short unitType, float valueInSpecifiedUnits);
+  void convertToSpecifiedUnits(unsigned short unitType);
+};
+
+interface SVGNumberList {
+
+  readonly attribute unsigned long length;
+  readonly attribute unsigned long numberOfItems;
+
+  void clear();
+  SVGNumber initialize(SVGNumber newItem);
+  getter SVGNumber getItem(unsigned long index);
+  SVGNumber insertItemBefore(SVGNumber newItem, unsigned long index);
+  SVGNumber replaceItem(SVGNumber newItem, unsigned long index);
+  SVGNumber removeItem(unsigned long index);
+  SVGNumber appendItem(SVGNumber newItem);
+  setter void (unsigned long index, SVGNumber newItem);
+};
+
+interface SVGLengthList {
+
+  readonly attribute unsigned long length;
+  readonly attribute unsigned long numberOfItems;
+
+  void clear();
+  SVGLength initialize(SVGLength newItem);
+  getter SVGLength getItem(unsigned long index);
+  SVGLength insertItemBefore(SVGLength newItem, unsigned long index);
+  SVGLength replaceItem(SVGLength newItem, unsigned long index);
+  SVGLength removeItem(unsigned long index);
+  SVGLength appendItem(SVGLength newItem);
+  setter void (unsigned long index, SVGLength newItem);
+};
+
+interface SVGAnimatedBoolean {
+           attribute boolean baseVal;
+  readonly attribute boolean animVal;
+};
+
+interface SVGAnimatedEnumeration {
+           attribute unsigned short baseVal;
+  readonly attribute unsigned short animVal;
+};
+
+interface SVGAnimatedInteger {
+           attribute long baseVal;
+  readonly attribute long animVal;
+};
+
+interface SVGAnimatedNumber {
+           attribute float baseVal;
+  readonly attribute float animVal;
+};
+
+interface SVGAnimatedLength {
+  [SameObject] readonly attribute SVGLength baseVal;
+  [SameObject] readonly attribute SVGLength animVal;
+};
+
+interface SVGAnimatedAngle {
+  [SameObject] readonly attribute SVGAngle baseVal;
+  [SameObject] readonly attribute SVGAngle animVal;
+};
+
+interface SVGAnimatedString {
+           attribute DOMString baseVal;
+  readonly attribute DOMString animVal;
+};
+
+interface SVGAnimatedRect {
+  [SameObject] readonly attribute DOMRect baseVal;
+  [SameObject] readonly attribute DOMRectReadOnly animVal;
+};
+
+interface SVGAnimatedNumberList {
+  [SameObject] readonly attribute SVGNumberList baseVal;
+  [SameObject] readonly attribute SVGNumberList animVal;
+};
+
+interface SVGAnimatedLengthList {
+  [SameObject] readonly attribute SVGLengthList baseVal;
+  [SameObject] readonly attribute SVGLengthList animVal;
+};
+
+interface SVGStringList {
+
+  readonly attribute unsigned long length;
+  readonly attribute unsigned long numberOfItems;
+
+  void clear();
+  DOMString initialize(DOMString newItem);
+  getter DOMString getItem(unsigned long index);
+  DOMString insertItemBefore(DOMString newItem, unsigned long index);
+  DOMString replaceItem(DOMString newItem, unsigned long index);
+  DOMString removeItem(unsigned long index);
+  DOMString appendItem(DOMString newItem);
+  setter void (unsigned long index, DOMString newItem);
+};
+
+[NoInterfaceObject]
+interface SVGUnitTypes {
+  // Unit Types
+  const unsigned short SVG_UNIT_TYPE_UNKNOWN = 0;
+  const unsigned short SVG_UNIT_TYPE_USERSPACEONUSE = 1;
+  const unsigned short SVG_UNIT_TYPE_OBJECTBOUNDINGBOX = 2;
+};
+
+[NoInterfaceObject]
+interface SVGTests {
+  [SameObject] readonly attribute SVGStringList requiredExtensions;
+  [SameObject] readonly attribute SVGStringList systemLanguage;
+};
+
+[NoInterfaceObject]
+interface SVGFitToViewBox {
+  [SameObject] readonly attribute SVGAnimatedRect viewBox;
+  [SameObject] readonly attribute SVGAnimatedPreserveAspectRatio preserveAspectRatio;
+};
+
+[NoInterfaceObject]
+interface SVGZoomAndPan {
+
+  // Zoom and Pan Types
+  const unsigned short SVG_ZOOMANDPAN_UNKNOWN = 0;
+  const unsigned short SVG_ZOOMANDPAN_DISABLE = 1;
+  const unsigned short SVG_ZOOMANDPAN_MAGNIFY = 2;
+
+  attribute unsigned short zoomAndPan;
+};
+
+[NoInterfaceObject]
+interface SVGURIReference {
+  [SameObject] readonly attribute SVGAnimatedString href;
+};
+
+partial interface Document {
+  readonly attribute SVGSVGElement rootElement;
+};
+
+interface SVGSVGElement : SVGGraphicsElement {
+
+  [SameObject] readonly attribute SVGAnimatedLength x;
+  [SameObject] readonly attribute SVGAnimatedLength y;
+  [SameObject] readonly attribute SVGAnimatedLength width;
+  [SameObject] readonly attribute SVGAnimatedLength height;
+
+  attribute float currentScale;
+  [SameObject] readonly attribute DOMPointReadOnly currentTranslate;
+
+  NodeList getIntersectionList(DOMRectReadOnly rect, SVGElement? referenceElement);
+  NodeList getEnclosureList(DOMRectReadOnly rect, SVGElement? referenceElement);
+  boolean checkIntersection(SVGElement element, DOMRectReadOnly rect);
+  boolean checkEnclosure(SVGElement element, DOMRectReadOnly rect);
+
+  void deselectAll();
+
+  SVGNumber createSVGNumber();
+  SVGLength createSVGLength();
+  SVGAngle createSVGAngle();
+  DOMPoint createSVGPoint();
+  DOMMatrix createSVGMatrix();
+  DOMRect createSVGRect();
+  SVGTransform createSVGTransform();
+  SVGTransform createSVGTransformFromMatrix(DOMMatrixReadOnly matrix);
+
+  // Deprecated methods that have no effect when called,
+  // but which are kept for compatibility reasons.
+  unsigned long suspendRedraw(unsigned long maxWaitMilliseconds);
+  void unsuspendRedraw(unsigned long suspendHandleID);
+  void unsuspendRedrawAll();
+  void forceRedraw();
+};
+
+SVGSVGElement implements SVGFitToViewBox;
+SVGSVGElement implements SVGZoomAndPan;
+SVGSVGElement implements WindowEventHandlers;
+
+interface SVGGElement : SVGGraphicsElement {
+};
+
+interface SVGUnknownElement : SVGGraphicsElement {
+};
+
+interface SVGDefsElement : SVGGraphicsElement {
+};
+
+interface SVGDescElement : SVGElement {
+};
+
+interface SVGMetadataElement : SVGElement {
+};
+
+interface SVGTitleElement : SVGElement {
+};
+
+interface SVGSymbolElement : SVGElement {
+};
+
+SVGSymbolElement implements SVGFitToViewBox;
+
+interface SVGUseElement : SVGGraphicsElement {
+  [SameObject] readonly attribute SVGAnimatedLength x;
+  [SameObject] readonly attribute SVGAnimatedLength y;
+  [SameObject] readonly attribute SVGAnimatedLength width;
+  [SameObject] readonly attribute SVGAnimatedLength height;
+};
+
+SVGUseElement implements SVGURIReference;
+
+interface SVGSwitchElement : SVGGraphicsElement {
+};
+
+[NoInterfaceObject]
+interface GetSVGDocument {
+  Document getSVGDocument();
+};
+
+interface SVGStyleElement : SVGElement {
+  attribute DOMString type;
+  attribute DOMString media;
+  attribute DOMString title;
+};
+
+SVGStyleElement implements LinkStyle;
+
+interface SVGTransform {
+
+  // Transform Types
+  const unsigned short SVG_TRANSFORM_UNKNOWN = 0;
+  const unsigned short SVG_TRANSFORM_MATRIX = 1;
+  const unsigned short SVG_TRANSFORM_TRANSLATE = 2;
+  const unsigned short SVG_TRANSFORM_SCALE = 3;
+  const unsigned short SVG_TRANSFORM_ROTATE = 4;
+  const unsigned short SVG_TRANSFORM_SKEWX = 5;
+  const unsigned short SVG_TRANSFORM_SKEWY = 6;
+
+  readonly attribute unsigned short type;
+  [SameObject] readonly attribute DOMMatrix matrix;
+  readonly attribute float angle;
+
+  void setMatrix(DOMMatrixReadOnly matrix);
+  void setTranslate(float tx, float ty);
+  void setScale(float sx, float sy);
+  void setRotate(float angle, float cx, float cy);
+  void setSkewX(float angle);
+  void setSkewY(float angle);
+};
+
+interface SVGTransformList {
+
+  readonly attribute unsigned long length;
+  readonly attribute unsigned long numberOfItems;
+
+  void clear();
+  SVGTransform initialize(SVGTransform newItem);
+  getter SVGTransform getItem(unsigned long index);
+  SVGTransform insertItemBefore(SVGTransform newItem, unsigned long index);
+  SVGTransform replaceItem(SVGTransform newItem, unsigned long index);
+  SVGTransform removeItem(unsigned long index);
+  SVGTransform appendItem(SVGTransform newItem);
+  setter void (unsigned long index, SVGTransform newItem);
+
+  // Additional methods not common to other list interfaces.
+  SVGTransform createSVGTransformFromMatrix(DOMMatrixReadOnly matrix);
+  SVGTransform? consolidate();
+};
+
+interface SVGAnimatedTransformList {
+  [SameObject] readonly attribute SVGTransformList baseVal;
+  [SameObject] readonly attribute SVGTransformList animVal;
+};
+
+interface SVGPreserveAspectRatio {
+
+  // Alignment Types
+  const unsigned short SVG_PRESERVEASPECTRATIO_UNKNOWN = 0;
+  const unsigned short SVG_PRESERVEASPECTRATIO_NONE = 1;
+  const unsigned short SVG_PRESERVEASPECTRATIO_XMINYMIN = 2;
+  const unsigned short SVG_PRESERVEASPECTRATIO_XMIDYMIN = 3;
+  const unsigned short SVG_PRESERVEASPECTRATIO_XMAXYMIN = 4;
+  const unsigned short SVG_PRESERVEASPECTRATIO_XMINYMID = 5;
+  const unsigned short SVG_PRESERVEASPECTRATIO_XMIDYMID = 6;
+  const unsigned short SVG_PRESERVEASPECTRATIO_XMAXYMID = 7;
+  const unsigned short SVG_PRESERVEASPECTRATIO_XMINYMAX = 8;
+  const unsigned short SVG_PRESERVEASPECTRATIO_XMIDYMAX = 9;
+  const unsigned short SVG_PRESERVEASPECTRATIO_XMAXYMAX = 10;
+
+  // Meet-or-slice Types
+  const unsigned short SVG_MEETORSLICE_UNKNOWN = 0;
+  const unsigned short SVG_MEETORSLICE_MEET = 1;
+  const unsigned short SVG_MEETORSLICE_SLICE = 2;
+
+  attribute unsigned short align;
+  attribute unsigned short meetOrSlice;
+};
+
+interface SVGAnimatedPreserveAspectRatio {
+  [SameObject] readonly attribute SVGPreserveAspectRatio baseVal;
+  [SameObject] readonly attribute SVGPreserveAspectRatio animVal;
+};
+
+interface SVGPathElement : SVGGeometryElement {
+
+  [SameObject] readonly attribute SVGAnimatedNumber pathLength;
+
+  float getTotalLength();
+  DOMPoint getPointAtLength(float distance);
+};
+
+interface SVGRectElement : SVGGeometryElement {
+  [SameObject] readonly attribute SVGAnimatedLength x;
+  [SameObject] readonly attribute SVGAnimatedLength y;
+  [SameObject] readonly attribute SVGAnimatedLength width;
+  [SameObject] readonly attribute SVGAnimatedLength height;
+  [SameObject] readonly attribute SVGAnimatedLength rx;
+  [SameObject] readonly attribute SVGAnimatedLength ry;
+};
+
+interface SVGCircleElement : SVGGeometryElement {
+  [SameObject] readonly attribute SVGAnimatedLength cx;
+  [SameObject] readonly attribute SVGAnimatedLength cy;
+  [SameObject] readonly attribute SVGAnimatedLength r;
+};
+
+interface SVGEllipseElement : SVGGeometryElement {
+  [SameObject] readonly attribute SVGAnimatedLength cx;
+  [SameObject] readonly attribute SVGAnimatedLength cy;
+  [SameObject] readonly attribute SVGAnimatedLength rx;
+  [SameObject] readonly attribute SVGAnimatedLength ry;
+};
+
+interface SVGLineElement : SVGGeometryElement {
+  [SameObject] readonly attribute SVGAnimatedLength x1;
+  [SameObject] readonly attribute SVGAnimatedLength y1;
+  [SameObject] readonly attribute SVGAnimatedLength x2;
+  [SameObject] readonly attribute SVGAnimatedLength y2;
+};
+
+[NoInterfaceObject]
+interface SVGAnimatedPoints {
+  [SameObject] readonly attribute SVGPointList points;
+  [SameObject] readonly attribute SVGPointList animatedPoints;
+};
+
+interface SVGPointList {
+
+  readonly attribute unsigned long length;
+  readonly attribute unsigned long numberOfItems;
+
+  void clear();
+  DOMPoint initialize(DOMPoint newItem);
+  getter DOMPoint getItem(unsigned long index);
+  DOMPoint insertItemBefore(DOMPoint newItem, unsigned long index);
+  DOMPoint replaceItem(DOMPoint newItem, unsigned long index);
+  DOMPoint removeItem(unsigned long index);
+  DOMPoint appendItem(DOMPoint newItem);
+  setter void (unsigned long index, DOMPoint newItem);
+};
+
+interface SVGPolylineElement : SVGGeometryElement {
+};
+
+SVGPolylineElement implements SVGAnimatedPoints;
+
+interface SVGPolygonElement : SVGGeometryElement {
+};
+
+SVGPolygonElement implements SVGAnimatedPoints;
+
+interface SVGTextContentElement : SVGGraphicsElement {
+
+  // lengthAdjust Types
+  const unsigned short LENGTHADJUST_UNKNOWN = 0;
+  const unsigned short LENGTHADJUST_SPACING = 1;
+  const unsigned short LENGTHADJUST_SPACINGANDGLYPHS = 2;
+
+  [SameObject] readonly attribute SVGAnimatedLength textLength;
+  [SameObject] readonly attribute SVGAnimatedEnumeration lengthAdjust;
+
+  long getNumberOfChars();
+  float getComputedTextLength();
+  float getSubStringLength(unsigned long charnum, unsigned long nchars);
+  DOMPoint getStartPositionOfChar(unsigned long charnum);
+  DOMPoint getEndPositionOfChar(unsigned long charnum);
+  DOMRect getExtentOfChar(unsigned long charnum);
+  float getRotationOfChar(unsigned long charnum);
+  long getCharNumAtPosition(DOMPoint point);
+  void selectSubString(unsigned long charnum, unsigned long nchars);
+};
+
+interface SVGTextPositioningElement : SVGTextContentElement {
+  [SameObject] readonly attribute SVGAnimatedLengthList x;
+  [SameObject] readonly attribute SVGAnimatedLengthList y;
+  [SameObject] readonly attribute SVGAnimatedLengthList dx;
+  [SameObject] readonly attribute SVGAnimatedLengthList dy;
+  [SameObject] readonly attribute SVGAnimatedNumberList rotate;
+};
+
+interface SVGTextElement : SVGTextPositioningElement {
+};
+
+interface SVGTSpanElement : SVGTextPositioningElement {
+};
+
+interface SVGTextPathElement : SVGTextContentElement {
+
+  // textPath Method Types
+  const unsigned short TEXTPATH_METHODTYPE_UNKNOWN = 0;
+  const unsigned short TEXTPATH_METHODTYPE_ALIGN = 1;
+  const unsigned short TEXTPATH_METHODTYPE_STRETCH = 2;
+
+  // textPath Spacing Types
+  const unsigned short TEXTPATH_SPACINGTYPE_UNKNOWN = 0;
+  const unsigned short TEXTPATH_SPACINGTYPE_AUTO = 1;
+  const unsigned short TEXTPATH_SPACINGTYPE_EXACT = 2;
+
+  [SameObject] readonly attribute SVGAnimatedLength startOffset;
+  [SameObject] readonly attribute SVGAnimatedEnumeration method;
+  [SameObject] readonly attribute SVGAnimatedEnumeration spacing;
+};
+
+SVGTextPathElement implements SVGURIReference;
+
+interface SVGImageElement : SVGGraphicsElement {
+  [SameObject] readonly attribute SVGAnimatedLength x;
+  [SameObject] readonly attribute SVGAnimatedLength y;
+  [SameObject] readonly attribute SVGAnimatedLength width;
+  [SameObject] readonly attribute SVGAnimatedLength height;
+  [SameObject] readonly attribute SVGAnimatedPreserveAspectRatio preserveAspectRatio;
+  attribute DOMString crossOrigin;
+};
+
+SVGImageElement implements SVGURIReference;
+
+interface SVGForeignObjectElement : SVGGraphicsElement {
+  [SameObject] readonly attribute SVGAnimatedLength x;
+  [SameObject] readonly attribute SVGAnimatedLength y;
+  [SameObject] readonly attribute SVGAnimatedLength width;
+  [SameObject] readonly attribute SVGAnimatedLength height;
+};
+
+interface SVGMarkerElement : SVGElement {
+
+  // Marker Unit Types
+  const unsigned short SVG_MARKERUNITS_UNKNOWN = 0;
+  const unsigned short SVG_MARKERUNITS_USERSPACEONUSE = 1;
+  const unsigned short SVG_MARKERUNITS_STROKEWIDTH = 2;
+
+  // Marker Orientation Types
+  const unsigned short SVG_MARKER_ORIENT_UNKNOWN = 0;
+  const unsigned short SVG_MARKER_ORIENT_AUTO = 1;
+  const unsigned short SVG_MARKER_ORIENT_ANGLE = 2;
+
+  [SameObject] readonly attribute SVGAnimatedLength refX;
+  [SameObject] readonly attribute SVGAnimatedLength refY;
+  [SameObject] readonly attribute SVGAnimatedEnumeration markerUnits;
+  [SameObject] readonly attribute SVGAnimatedLength markerWidth;
+  [SameObject] readonly attribute SVGAnimatedLength markerHeight;
+  [SameObject] readonly attribute SVGAnimatedEnumeration orientType;
+  [SameObject] readonly attribute SVGAnimatedAngle orientAngle;
+  attribute DOMString orient;
+
+  void setOrientToAuto();
+  void setOrientToAngle(SVGAngle angle);
+};
+
+SVGMarkerElement implements SVGFitToViewBox;
+
+interface SVGSolidcolorElement : SVGElement {
+};
+
+interface SVGGradientElement : SVGElement {
+
+  // Spread Method Types
+  const unsigned short SVG_SPREADMETHOD_UNKNOWN = 0;
+  const unsigned short SVG_SPREADMETHOD_PAD = 1;
+  const unsigned short SVG_SPREADMETHOD_REFLECT = 2;
+  const unsigned short SVG_SPREADMETHOD_REPEAT = 3;
+
+  [SameObject] readonly attribute SVGAnimatedEnumeration gradientUnits;
+  [SameObject] readonly attribute SVGAnimatedTransformList gradientTransform;
+  [SameObject] readonly attribute SVGAnimatedEnumeration spreadMethod;
+};
+
+SVGGradientElement implements SVGURIReference;
+SVGGradientElement implements SVGUnitTypes;
+
+interface SVGLinearGradientElement : SVGGradientElement {
+  [SameObject] readonly attribute SVGAnimatedLength x1;
+  [SameObject] readonly attribute SVGAnimatedLength y1;
+  [SameObject] readonly attribute SVGAnimatedLength x2;
+  [SameObject] readonly attribute SVGAnimatedLength y2;
+};
+
+interface SVGRadialGradientElement : SVGGradientElement {
+  [SameObject] readonly attribute SVGAnimatedLength cx;
+  [SameObject] readonly attribute SVGAnimatedLength cy;
+  [SameObject] readonly attribute SVGAnimatedLength r;
+  [SameObject] readonly attribute SVGAnimatedLength fx;
+  [SameObject] readonly attribute SVGAnimatedLength fy;
+  [SameObject] readonly attribute SVGAnimatedLength fr;
+};
+
+interface SVGMeshElement : SVGGradientElement {
+};
+
+interface SVGMeshrowElement : SVGElement {
+};
+
+interface SVGMeshpatchElement : SVGElement {
+};
+
+interface SVGStopElement : SVGElement {
+  [SameObject] readonly attribute SVGAnimatedNumber offset;
+};
+
+interface SVGPatternElement : SVGElement {
+  [SameObject] readonly attribute SVGAnimatedEnumeration patternUnits;
+  [SameObject] readonly attribute SVGAnimatedEnumeration patternContentUnits;
+  [SameObject] readonly attribute SVGAnimatedTransformList patternTransform;
+  [SameObject] readonly attribute SVGAnimatedLength x;
+  [SameObject] readonly attribute SVGAnimatedLength y;
+  [SameObject] readonly attribute SVGAnimatedLength width;
+  [SameObject] readonly attribute SVGAnimatedLength height;
+};
+
+SVGPatternElement implements SVGFitToViewBox;
+SVGPatternElement implements SVGURIReference;
+SVGPatternElement implements SVGUnitTypes;
+
+interface SVGHatchElement : SVGElement {
+};
+
+interface SVGHatchpathElement : SVGElement {
+};
+
+interface SVGCursorElement : SVGElement {
+  [SameObject] readonly attribute SVGAnimatedLength x;
+  [SameObject] readonly attribute SVGAnimatedLength y;
+};
+
+SVGCursorElement implements SVGURIReference;
+
+interface SVGScriptElement : SVGElement {
+  attribute DOMString type;
+  attribute DOMString crossOrigin;
+};
+
+SVGScriptElement implements SVGURIReference;
+
+interface SVGZoomEvent : UIEvent {
+  [SameObject] readonly attribute DOMRectReadOnly zoomRectScreen;
+  readonly attribute float previousScale;
+  [SameObject] readonly attribute DOMPointReadOnly previousTranslate;
+  readonly attribute float newScale;
+  [SameObject] readonly attribute DOMPointReadOnly newTranslate;
+};
+
+interface SVGAElement : SVGGraphicsElement {
+  [SameObject] readonly attribute SVGAnimatedString target;
+};
+
+SVGAElement implements SVGURIReference;
+
+interface SVGViewElement : SVGElement {};
+
+SVGViewElement implements SVGFitToViewBox;
+SVGViewElement implements SVGZoomAndPan;
+
+interface SVGFilterElement : SVGElement {
+  readonly attribute SVGAnimatedEnumeration filterUnits;
+  readonly attribute SVGAnimatedEnumeration primitiveUnits;
+  readonly attribute SVGAnimatedLength x;
+  readonly attribute SVGAnimatedLength y;
+  readonly attribute SVGAnimatedLength width;
+  readonly attribute SVGAnimatedLength height;
+};
+
+SVGFilterElement implements SVGURIReference;
+SVGFilterElement implements SVGUnitTypes;
+
+[NoInterfaceObject]
+interface SVGFilterPrimitiveStandardAttributes {
+  readonly attribute SVGAnimatedLength x;
+  readonly attribute SVGAnimatedLength y;
+  readonly attribute SVGAnimatedLength width;
+  readonly attribute SVGAnimatedLength height;
+  readonly attribute SVGAnimatedString result;
+};
+
+interface SVGFEBlendElement : SVGElement {
+
+  // Blend Mode Types
+  const unsigned short SVG_FEBLEND_MODE_UNKNOWN = 0;
+  const unsigned short SVG_FEBLEND_MODE_NORMAL = 1;
+  const unsigned short SVG_FEBLEND_MODE_MULTIPLY = 2;
+  const unsigned short SVG_FEBLEND_MODE_SCREEN = 3;
+  const unsigned short SVG_FEBLEND_MODE_DARKEN = 4;
+  const unsigned short SVG_FEBLEND_MODE_LIGHTEN = 5;
+
+  readonly attribute SVGAnimatedString in1;
+  readonly attribute SVGAnimatedString in2;
+  readonly attribute SVGAnimatedEnumeration mode;
+};
+
+SVGFEBlendElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFEColorMatrixElement : SVGElement {
+
+  // Color Matrix Types
+  const unsigned short SVG_FECOLORMATRIX_TYPE_UNKNOWN = 0;
+  const unsigned short SVG_FECOLORMATRIX_TYPE_MATRIX = 1;
+  const unsigned short SVG_FECOLORMATRIX_TYPE_SATURATE = 2;
+  const unsigned short SVG_FECOLORMATRIX_TYPE_HUEROTATE = 3;
+  const unsigned short SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA = 4;
+
+  readonly attribute SVGAnimatedString in1;
+  readonly attribute SVGAnimatedEnumeration type;
+  readonly attribute SVGAnimatedNumberList values;
+};
+
+SVGFEColorMatrixElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFEComponentTransferElement : SVGElement {
+  readonly attribute SVGAnimatedString in1;
+};
+
+SVGFEComponentTransferElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGComponentTransferFunctionElement : SVGElement {
+
+  // Component Transfer Types
+  const unsigned short SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN = 0;
+  const unsigned short SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY = 1;
+  const unsigned short SVG_FECOMPONENTTRANSFER_TYPE_TABLE = 2;
+  const unsigned short SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE = 3;
+  const unsigned short SVG_FECOMPONENTTRANSFER_TYPE_LINEAR = 4;
+  const unsigned short SVG_FECOMPONENTTRANSFER_TYPE_GAMMA = 5;
+
+  readonly attribute SVGAnimatedEnumeration type;
+  readonly attribute SVGAnimatedNumberList tableValues;
+  readonly attribute SVGAnimatedNumber slope;
+  readonly attribute SVGAnimatedNumber intercept;
+  readonly attribute SVGAnimatedNumber amplitude;
+  readonly attribute SVGAnimatedNumber exponent;
+  readonly attribute SVGAnimatedNumber offset;
+};
+
+interface SVGFEFuncRElement : SVGComponentTransferFunctionElement {
+};
+
+interface SVGFEFuncGElement : SVGComponentTransferFunctionElement {
+};
+
+interface SVGFEFuncBElement : SVGComponentTransferFunctionElement {
+};
+
+interface SVGFEFuncAElement : SVGComponentTransferFunctionElement {
+};
+
+interface SVGFECompositeElement : SVGElement {
+
+  // Composite Operators
+  const unsigned short SVG_FECOMPOSITE_OPERATOR_UNKNOWN = 0;
+  const unsigned short SVG_FECOMPOSITE_OPERATOR_OVER = 1;
+  const unsigned short SVG_FECOMPOSITE_OPERATOR_IN = 2;
+  const unsigned short SVG_FECOMPOSITE_OPERATOR_OUT = 3;
+  const unsigned short SVG_FECOMPOSITE_OPERATOR_ATOP = 4;
+  const unsigned short SVG_FECOMPOSITE_OPERATOR_XOR = 5;
+  const unsigned short SVG_FECOMPOSITE_OPERATOR_ARITHMETIC = 6;
+
+  readonly attribute SVGAnimatedString in1;
+  readonly attribute SVGAnimatedString in2;
+  readonly attribute SVGAnimatedEnumeration operator;
+  readonly attribute SVGAnimatedNumber k1;
+  readonly attribute SVGAnimatedNumber k2;
+  readonly attribute SVGAnimatedNumber k3;
+  readonly attribute SVGAnimatedNumber k4;
+};
+
+SVGFECompositeElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFEConvolveMatrixElement : SVGElement {
+
+  // Edge Mode Values
+  const unsigned short SVG_EDGEMODE_UNKNOWN = 0;
+  const unsigned short SVG_EDGEMODE_DUPLICATE = 1;
+  const unsigned short SVG_EDGEMODE_WRAP = 2;
+  const unsigned short SVG_EDGEMODE_NONE = 3;
+
+  readonly attribute SVGAnimatedString in1;
+  readonly attribute SVGAnimatedInteger orderX;
+  readonly attribute SVGAnimatedInteger orderY;
+  readonly attribute SVGAnimatedNumberList kernelMatrix;
+  readonly attribute SVGAnimatedNumber divisor;
+  readonly attribute SVGAnimatedNumber bias;
+  readonly attribute SVGAnimatedInteger targetX;
+  readonly attribute SVGAnimatedInteger targetY;
+  readonly attribute SVGAnimatedEnumeration edgeMode;
+  readonly attribute SVGAnimatedNumber kernelUnitLengthX;
+  readonly attribute SVGAnimatedNumber kernelUnitLengthY;
+};
+
+SVGFEConvolveMatrixElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFEDiffuseLightingElement : SVGElement {
+  readonly attribute SVGAnimatedString in1;
+  readonly attribute SVGAnimatedNumber surfaceScale;
+  readonly attribute SVGAnimatedNumber diffuseConstant;
+  readonly attribute SVGAnimatedNumber kernelUnitLengthX;
+  readonly attribute SVGAnimatedNumber kernelUnitLengthY;
+};
+
+SVGFEDiffuseLightingElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFEDistantLightElement : SVGElement {
+  readonly attribute SVGAnimatedNumber azimuth;
+  readonly attribute SVGAnimatedNumber elevation;
+};
+
+interface SVGFEPointLightElement : SVGElement {
+  readonly attribute SVGAnimatedNumber x;
+  readonly attribute SVGAnimatedNumber y;
+  readonly attribute SVGAnimatedNumber z;
+};
+
+interface SVGFESpotLightElement : SVGElement {
+  readonly attribute SVGAnimatedNumber x;
+  readonly attribute SVGAnimatedNumber y;
+  readonly attribute SVGAnimatedNumber z;
+  readonly attribute SVGAnimatedNumber pointsAtX;
+  readonly attribute SVGAnimatedNumber pointsAtY;
+  readonly attribute SVGAnimatedNumber pointsAtZ;
+  readonly attribute SVGAnimatedNumber specularExponent;
+  readonly attribute SVGAnimatedNumber limitingConeAngle;
+};
+
+interface SVGFEDisplacementMapElement : SVGElement {
+
+  // Channel Selectors
+  const unsigned short SVG_CHANNEL_UNKNOWN = 0;
+  const unsigned short SVG_CHANNEL_R = 1;
+  const unsigned short SVG_CHANNEL_G = 2;
+  const unsigned short SVG_CHANNEL_B = 3;
+  const unsigned short SVG_CHANNEL_A = 4;
+
+  readonly attribute SVGAnimatedString in1;
+  readonly attribute SVGAnimatedString in2;
+  readonly attribute SVGAnimatedNumber scale;
+  readonly attribute SVGAnimatedEnumeration xChannelSelector;
+  readonly attribute SVGAnimatedEnumeration yChannelSelector;
+};
+
+SVGFEDisplacementMapElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFEDropShadowElement : SVGElement {
+  readonly attribute SVGAnimatedString in1;
+  readonly attribute SVGAnimatedNumber dx;
+  readonly attribute SVGAnimatedNumber dy;
+  readonly attribute SVGAnimatedNumber stdDeviationX;
+  readonly attribute SVGAnimatedNumber stdDeviationY;
+
+  void setStdDeviation(float stdDeviationX, float stdDeviationY);
+};
+
+SVGFEDropShadowElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFEFloodElement : SVGElement {
+};
+
+SVGFEFloodElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFEGaussianBlurElement : SVGElement {
+
+  // Edge Mode Values
+  const unsigned short SVG_EDGEMODE_UNKNOWN = 0;
+  const unsigned short SVG_EDGEMODE_DUPLICATE = 1;
+  const unsigned short SVG_EDGEMODE_WRAP = 2;
+  const unsigned short SVG_EDGEMODE_NONE = 3;
+
+  readonly attribute SVGAnimatedString in1;
+  readonly attribute SVGAnimatedNumber stdDeviationX;
+  readonly attribute SVGAnimatedNumber stdDeviationY;
+  readonly attribute SVGAnimatedEnumeration edgeMode;
+
+  void setStdDeviation(float stdDeviationX, float stdDeviationY);
+};
+
+SVGFEGaussianBlurElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFEImageElement : SVGElement {
+  readonly attribute SVGAnimatedPreserveAspectRatio preserveAspectRatio;
+  readonly attribute SVGAnimatedString crossOrigin;
+};
+
+SVGFEImageElement implements SVGFilterPrimitiveStandardAttributes;
+SVGFEImageElement implements SVGURIReference;
+
+interface SVGFEMergeElement : SVGElement {
+};
+
+SVGFEMergeElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFEMergeNodeElement : SVGElement {
+  readonly attribute SVGAnimatedString in1;
+};
+
+interface SVGFEMorphologyElement : SVGElement {
+
+  // Morphology Operators
+  const unsigned short SVG_MORPHOLOGY_OPERATOR_UNKNOWN = 0;
+  const unsigned short SVG_MORPHOLOGY_OPERATOR_ERODE = 1;
+  const unsigned short SVG_MORPHOLOGY_OPERATOR_DILATE = 2;
+
+  readonly attribute SVGAnimatedString in1;
+  readonly attribute SVGAnimatedEnumeration operator;
+  readonly attribute SVGAnimatedNumber radiusX;
+  readonly attribute SVGAnimatedNumber radiusY;
+};
+
+SVGFEMorphologyElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFEOffsetElement : SVGElement {
+  readonly attribute SVGAnimatedString in1;
+  readonly attribute SVGAnimatedNumber dx;
+  readonly attribute SVGAnimatedNumber dy;
+};
+
+SVGFEOffsetElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFESpecularLightingElement : SVGElement {
+  readonly attribute SVGAnimatedString in1;
+  readonly attribute SVGAnimatedNumber surfaceScale;
+  readonly attribute SVGAnimatedNumber specularConstant;
+  readonly attribute SVGAnimatedNumber specularExponent;
+  readonly attribute SVGAnimatedNumber kernelUnitLengthX;
+  readonly attribute SVGAnimatedNumber kernelUnitLengthY;
+};
+
+SVGFESpecularLightingElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFETileElement : SVGElement {
+  readonly attribute SVGAnimatedString in1;
+};
+
+SVGFETileElement implements SVGFilterPrimitiveStandardAttributes;
+
+interface SVGFETurbulenceElement : SVGElement {
+
+  // Turbulence Types
+  const unsigned short SVG_TURBULENCE_TYPE_UNKNOWN = 0;
+  const unsigned short SVG_TURBULENCE_TYPE_FRACTALNOISE = 1;
+  const unsigned short SVG_TURBULENCE_TYPE_TURBULENCE = 2;
+
+  // Stitch Options
+  const unsigned short SVG_STITCHTYPE_UNKNOWN = 0;
+  const unsigned short SVG_STITCHTYPE_STITCH = 1;
+  const unsigned short SVG_STITCHTYPE_NOSTITCH = 2;
+
+  readonly attribute SVGAnimatedNumber baseFrequencyX;
+  readonly attribute SVGAnimatedNumber baseFrequencyY;
+  readonly attribute SVGAnimatedInteger numOctaves;
+  readonly attribute SVGAnimatedNumber seed;
+  readonly attribute SVGAnimatedEnumeration stitchTiles;
+  readonly attribute SVGAnimatedEnumeration type;
+};
+
+SVGFETurbulenceElement implements SVGFilterPrimitiveStandardAttributes;
+</script>
+<script>
+var svg = document.createElementNS("http://www.w3.org/2000/svg", "svg");
+var g = document.createElementNS("http://www.w3.org/2000/svg", "g");
+var defs = document.createElementNS("http://www.w3.org/2000/svg", "defs");
+var Desc = document.createElementNS("http://www.w3.org/2000/svg", "desc");
+var title = document.createElementNS("http://www.w3.org/2000/svg", "title");
+var symbol = document.createElementNS("http://www.w3.org/2000/svg", "symbol");
+var use = document.createElementNS("http://www.w3.org/2000/svg", "use");
+var image = document.createElementNS("http://www.w3.org/2000/svg", "image");
+var Switch = document.createElementNS("http://www.w3.org/2000/svg", "switch");
+var style = document.createElementNS("http://www.w3.org/2000/svg", "style");
+var path = document.createElementNS("http://www.w3.org/2000/svg", "path");
+var rect = document.createElementNS("http://www.w3.org/2000/svg", "rect");
+var circle = document.createElementNS("http://www.w3.org/2000/svg", "circle");
+var ellipse = document.createElementNS("http://www.w3.org/2000/svg", "ellipse");
+var line = document.createElementNS("http://www.w3.org/2000/svg", "line");
+var polyline = document.createElementNS("http://www.w3.org/2000/svg", "polyline");
+var polygon = document.createElementNS("http://www.w3.org/2000/svg", "polygon");
+var textContent = document.createElementNS("http://www.w3.org/2000/svg",
+                                           "textContent");
+var text = document.createElementNS("http://www.w3.org/2000/svg", "text");
+var tspan = document.createElementNS("http://www.w3.org/2000/svg", "tspan");
+var tref = document.createElementNS("http://www.w3.org/2000/svg", "tref");
+var textPath = document.createElementNS("http://www.w3.org/2000/svg", "textPath");
+var altGlyph = document.createElementNS("http://www.w3.org/2000/svg", "altGlyph");
+var altGlyphDef = document.createElementNS("http://www.w3.org/2000/svg",
+                                           "altGlyphDef");
+var altGlyphItem = document.createElementNS("http://www.w3.org/2000/svg",
+                                            "altGlyphItem");
+var glyphRef = document.createElementNS("http://www.w3.org/2000/svg",
+                                        "glyphRef");
+var glyphRef = document.createElementNS("http://www.w3.org/2000/svg",
+                                        "glyphRef");
+var marker = document.createElementNS("http://www.w3.org/2000/svg", "marker");
+var colorProfile = document.createElementNS("http://www.w3.org/2000/svg",
+                                            "color-profile");
+var linearGradient = document.createElementNS("http://www.w3.org/2000/svg",
+                                              "linearGradient");
+var radialGradient = document.createElementNS("http://www.w3.org/2000/svg",
+                                              "radialGradient");
+var meshGradient = document.createElementNS("http://www.w3.org/2000/svg",
+                                            "meshGradient");
+var stop = document.createElementNS("http://www.w3.org/2000/svg", "stop");
+var pattern = document.createElementNS("http://www.w3.org/2000/svg", "pattern");
+var clipPath = document.createElementNS("http://www.w3.org/2000/svg", "clipPath");
+var mask = document.createElementNS("http://www.w3.org/2000/svg", "mask");
+var cursor = document.createElementNS("http://www.w3.org/2000/svg", "cursor");
+var a = document.createElementNS("http://www.w3.org/2000/svg", "a");
+var view = document.createElementNS("http://www.w3.org/2000/svg", "view");
+var script = document.createElementNS("http://www.w3.org/2000/svg", "script");
+var animate = document.createElementNS("http://www.w3.org/2000/svg", "animate");
+var set = document.createElementNS("http://www.w3.org/2000/svg", "set");
+var animateMotion = document.createElementNS("http://www.w3.org/2000/svg",
+                                             "animateMotion");
+var mPath = document.createElementNS("http://www.w3.org/2000/svg", "mPath");
+var animateColor = document.createElementNS("http://www.w3.org/2000/svg",
+                                            "animateColor");
+var animateColor = document.createElementNS("http://www.w3.org/2000/svg",
+                                            "animateColor");
+var animateTransform = document.createElementNS("http://www.w3.org/2000/svg",
+                                                "animateTransform");
+var font = document.createElementNS("http://www.w3.org/2000/svg", "font");
+var glyph = document.createElementNS("http://www.w3.org/2000/svg", "glyph");
+var missingglyph = document.createElementNS("http://www.w3.org/2000/svg",
+                                            "missing-glyph");
+var khern = document.createElementNS("http://www.w3.org/2000/svg", "hkern");
+var vkern = document.createElementNS("http://www.w3.org/2000/svg", "vkern");
+var fontface = document.createElementNS("http://www.w3.org/2000/svg", "font-face");
+var fontfacesrc = document.createElementNS("http://www.w3.org/2000/svg",
+                                           "font-face-src");
+var fontfaceuri = document.createElementNS("http://www.w3.org/2000/svg",
+                                           "font-face-uri");
+var fontfaceformat = document.createElementNS("http://www.w3.org/2000/svg",
+                                              "font-face-format");
+var fontfacename = document.createElementNS("http://www.w3.org/2000/svg",
+                                            "font-face-name");
+var metadata = document.createElementNS("http://www.w3.org/2000/svg",
+                                        "metadata");
+var foreignObject = document.createElementNS("http://www.w3.org/2000/svg",
+                                             "foreignObject");
+var filter = document.createElementNS("http://www.w3.org/2000/svg", "filter");
+var feBlend = document.createElementNS("http://www.w3.org/2000/svg", "feBlend");
+var feColorMatrix = document.createElementNS("http://www.w3.org/2000/svg",
+                                             "feColorMatrix");
+var feColorMatrix = document.createElementNS("http://www.w3.org/2000/svg",
+                                             "feColorMatrix");
+var feComponentTransfer = document.createElementNS("http://www.w3.org/2000/svg",
+                                                   "feComponentTransfer");
+var feFuncR = document.createElementNS("http://www.w3.org/2000/svg", "feFuncR");
+var feFuncG = document.createElementNS("http://www.w3.org/2000/svg", "feFuncG");
+var feFuncB = document.createElementNS("http://www.w3.org/2000/svg", "feFuncB");
+var feFuncA = document.createElementNS("http://www.w3.org/2000/svg", "feFuncA");
+var feComposite = document.createElementNS("http://www.w3.org/2000/svg",
+                                           "feComposite");
+var feConvolveMatrix = document.createElementNS("http://www.w3.org/2000/svg",
+                                                "feConvolveMatrix");
+var feDiffuseLighting = document.createElementNS("http://www.w3.org/2000/svg",
+                                                 "feDiffuseLighting");
+var fePointLight = document.createElementNS("http://www.w3.org/2000/svg",
+                                            "fePointLight");
+var feSpotLight = document.createElementNS("http://www.w3.org/2000/svg",
+                                           "feSpotLight");
+var feDisplacementMap = document.createElementNS("http://www.w3.org/2000/svg",
+                                                 "feDisplacementMap");
+var feDropShadow = document.createElementNS("http://www.w3.org/2000/svg",
+                                            "feDropShadow");
+var feFlood = document.createElementNS("http://www.w3.org/2000/svg", "feFlood");
+var feGaussianBlur = document.createElementNS("http://www.w3.org/2000/svg",
+                                              "feGaussianBlur");
+var feDisplacementMap = document.createElementNS("http://www.w3.org/2000/svg",
+                                                 "feDisplacementMap");
+var feDropShadow = document.createElementNS("http://www.w3.org/2000/svg",
+                                            "feDropShadow");
+var feFlood = document.createElementNS("http://www.w3.org/2000/svg", "feFlood");
+var feGaussianBlur = document.createElementNS("http://www.w3.org/2000/svg",
+                                              "feGaussianBlue");
+var feImage = document.createElementNS("http://www.w3.org/2000/svg", "feImage");
+var feMerge = document.createElementNS("http://www.w3.org/2000/svg", "feMerge");
+var feMergeNode = document.createElementNS("http://www.w3.org/2000/svg",
+                                           "feMergeNode");
+var feMorphology = document.createElementNS("http://www.w3.org/2000/svg",
+                                            "feMorphology");
+var feSpecularLighting = document.createElementNS("http://www.w3.org/2000/svg",
+                                                  "feSpecularLighting");
+var feTile = document.createElementNS("http://www.w3.org/2000/svg",
+                                      "feTile");
+var feTurbulence = document.createElementNS("http://www.w3.org/2000/svg",
+                                            "feTurbulence");
+
+
+var idlArray = new IdlArray();
+var idls = document.getElementById("idl").textContent;
+var untestedIdls = document.getElementById("untested_idl").textContent;
+idlArray.add_untested_idls(untestedIdls);
+idlArray.add_idls(idls);
+idlArray.add_objects({
+  SVGAnimatedBoolean: ['feConvolveMatrix.preserveAlpha'],
+  SVGAnimatedString: ['a.target'],
+  SVGStringList: ['a.requiredFeatures'],
+  SVGAnimatedEnumeration: ['text.lengthAdjust'],
+  SVGAnimatedInteger: ['feConvolveMatrix.orderX'],
+  SVGNumber: ['svg.createSVGNumber()'],
+  SVGAnimatedNumber: ['stop.offset'],
+  SVGNumberList: ['text.rotate.baseVal'],
+  SVGAnimatedNumberList: ['text.rotate'],
+  SVGLength: ['svg.createSVGLength()'],
+  SVGAnimatedLength: ['svg.x'],
+  SVGAnimatedLengthList: ['text.x'],
+  SVGAngle: ['svg.createSVGAngle()'],
+  SVGAnimatedAngle: ['marker.orientAngle'],
+  SVGRect: ['svg.createSVGRect()'],
+  SVGAnimatedRect: ['svg.viewBox'],
+  SVGSVGElement: ['svg'],
+  SVGGElement: ['g'],
+  SVGDefsElement: ['defs'],
+  SVGDescElement: ['Desc'],
+  SVGTitleElement: ['title'],
+  SVGSymbolElement: ['symbol'],
+  SVGUseElement: ['use'],
+  SVGImageElement: ['image'],
+  SVGSwitchElement: ['Switch'],
+  SVGStyleElement: ['style'],
+  SVGPoint: ['svg.createSVGPoint()'],
+  SVGPointList: ['polygon.points'],
+  SVGMatrix: ['svg.createSVGMatrix()'],
+  SVGTransform: ['svg.createSVGTransform()'],
+  SVGTransformList: ['pattern.patternTransform.baseVal'],
+  SVGAnimatedTransformList: ['pattern.patternTransform'],
+  SVGPreserveAspectRatio: ['image.preserveAspectRatio.baseVal'],
+  SVGAnimatedPreserveAspectRatio: ['image.preserveAspectRatio'],
+  SVGPathSegClosePath: ['path.createSVGPathSegClosePath()'],
+  SVGPathSegMovetoAbs: ['path.createSVGPathSegMovetoAbs(0,0)'],
+  SVGPathSegMovetoRel: ['path.createSVGPathSegMovetoRel(0,0)'],
+  SVGPathSegLinetoAbs: ['path.createSVGPathSegLinetoAbs(0,0)'],
+  SVGPathSegLinetoRel: ['path.createSVGPathSegLinetoRel(0,0)'],
+  SVGPathSegCurvetoCubicAbs: ['path.createSVGPathSegCurvetoCubicAbs(0,0,0,0,0,0)'],
+  SVGPathSegCurvetoCubicRel: ['path.createSVGPathSegCurvetoCubicRel(0,0,0,0,0,0)'],
+  SVGPathSegCurvetoQuadraticAbs: ['path.createSVGPathSegCurvetoQuadraticAbs(0,0,0,0)'],
+  SVGPathSegCurvetoQuadraticRel: ['path.createSVGPathSegCurvetoQuadraticRel(0,0,0,0)'],
+  SVGPathSegArcAbs: ['path.createSVGPathSegArcAbs(0,0,0,0,0,true,true)'],
+  SVGPathSegArcRel: ['path.createSVGPathSegArcRel(0,0,0,0,0,true,true)'],
+  SVGPathSegLinetoHorizontalAbs: ['path.createSVGPathSegLinetoHorizontalAbs(0)'],
+  SVGPathSegLinetoHorizontalRel: ['path.createSVGPathSegLinetoHorizontalRel(0)'],
+  SVGPathSegLinetoVerticalAbs: ['path.createSVGPathSegLinetoVerticalAbs(0)'],
+  SVGPathSegLinetoVerticalRel: ['path.createSVGPathSegLinetoVerticalRel(0)'],
+  SVGPathSegCurvetoCubicSmoothAbs: ['path.createSVGPathSegCurvetoCubicSmoothAbs(0,0,0,0)'],
+  SVGPathSegCurvetoCubicSmoothRel: ['path.createSVGPathSegCurvetoCubicSmoothRel(0,0,0,0)'],
+  SVGPathSegCurvetoQuadraticSmoothAbs: ['path.createSVGPathSegCurvetoQuadraticSmoothAbs(0,0)'],
+  SVGPathSegCurvetoQuadraticSmoothRel: ['path.createSVGPathSegCurvetoQuadraticSmoothRel(0,0)'],
+  SVGPathSegList: ['path.pathSegList'],
+  SVGPathElement: ['path'],
+  SVGRectElement: ['rect'],
+  SVGCircleElement: ['circle'],
+  SVGEllipseElement: ['ellipse'],
+  SVGLineElement: ['line'],
+  SVGPolylineElement: ['polyline'],
+  SVGPolygonElement: ['polygon'],
+  SVGTextContentElement: ['textContent'],
+  SVGTextElement: ['text'],
+  SVGTSpanElement: ['tspan'],
+  SVGTRefElement: ['tref'],
+  SVGTextPathElement: ['textPath'],
+  SVGAltGlyphElement: ['altGlyph'],
+  SVGAltGlyphDefElement: ['altGlyphDef'],
+  SVGAltGlyphItemElement: ['altGlyphItem'],
+  SVGGlyphRefElement: ['glyphRef'],
+  SVGMarkerElement: ['marker'],
+  SVGColorProfileElement: ['colorProfile'],
+  SVGLinearGradientElement: ['linearGradient'],
+  SVGRadialGradientElement: ['radialGradient'],
+  SVGMeshGradientElement: ['meshGradient'],
+  SVGStopElement: ['stop'],
+  SVGPatternElement: ['pattern'],
+  SVGClipPathElement: ['clipPath'],
+  SVGMaskElement: ['mask'],
+  SVGCursorElement: ['cursor'],
+  SVGAElement: ['a'],
+  SVGViewElement: ['view'],
+  SVGScriptElement: ['script'],
+  SVGAnimateElement: ['animate'],
+  SVGSetElement: ['set'],
+  SVGAnimateMotionElement: ['animateMotion'],
+  SVGMPathElement: ['mPath'],
+  SVGAnimateColorElement: ['animateColor'],
+  SVGAnimateTransformElement: ['animateTransform'],
+  SVGFontElement: ['font'],
+  SVGGlyphElement: ['glyph'],
+  SVGMissingGlyphElement: ['missingglyph'],
+  SVGHKernElement: ['hkern'],
+  SVGVKernElement: ['vkern'],
+  SVGFontFaceElement: ['fontface'],
+  SVGFontFaceSrcElement: ['fontfacesrc'],
+  SVGFontFaceUriElement: ['fontfaceuri'],
+  SVGFontFaceFormatElement: ['fontfaceformat'],
+  SVGMetadataElement: ['metadata'],
+  SVGForeignObjectElement: ['foreignObject'],
+  SVGFilterElement: ['filter'],
+  SVGFEBlendElement: ['feBlend'],
+  SVGFEColorMatrixElement: ['feColorMatrix'],
+  SVGFEComponentTransferElement: ['feComponentTransfer'],
+  SVGFEFuncRElement: ['feFuncR'],
+  SVGFEFuncGElement: ['feFuncG'],
+  SVGFEFuncBElement: ['feFuncB'],
+  SVGFEFuncAElement: ['feFuncA'],
+  SVGFECompositeElement: ['feComposite'],
+  SVGFEConvolveMatrixElement: ['feConvolveMatrix'],
+  SVGFEDiffuseLightingElement: ['feDiffuseLighting'],
+  SVGFEPointLightElement: ['fePointLight'],
+  SVGFESpotLightElement: ['feSpotLight'],
+  SVGFEDisplacementMapElement: ['feDisplacementMap'],
+  SVGFEDropShadowElement: ['feDropShadow'],
+  SVGFEFloodElement: ['feFlood'],
+  SVGFEGaussianBlurElement: ['feGaussianBlur'],
+  SVGFEImageElement: ['feImage'],
+  SVGFEMergeElement: ['feMerge'],
+  SVGFEMergeNodeElement: ['feMergeNode'],
+  SVGFEMorphologyElement: ['feMorphology'],
+  SVGFESpecularLightingElement: ['feSpecularLighting'],
+  SVGFETileElement: ['feTile'],
+  SVGFETurbulenceElement: ['feTurbulence']
+});
+idlArray.test();
+</script>
+
diff --git a/testing/web-platform/tests/tools/manifest/item.py b/testing/web-platform/tests/tools/manifest/item.py
index 3dee3173bd0f..58ff22a3b0e8 100644
--- a/testing/web-platform/tests/tools/manifest/item.py
+++ b/testing/web-platform/tests/tools/manifest/item.py
@@ -2,17 +2,11 @@ import os
 import urlparse
 from abc import ABCMeta, abstractmethod, abstractproperty
 
+from utils import from_os_path, to_os_path
+
 item_types = ["testharness", "reftest", "manual", "stub", "wdspec"]
 
 
-def from_os_path(path):
-    return path.replace(os.path.sep, "/")
-
-
-def to_os_path(path):
-    return path.replace("/", os.path.sep)
-
-
 def get_source_file(source_files, tests_root, manifest, path):
     def make_new():
         from sourcefile import SourceFile
diff --git a/testing/web-platform/tests/tools/manifest/manifest.py b/testing/web-platform/tests/tools/manifest/manifest.py
index 75a7aef02980..1128f416ddb4 100644
--- a/testing/web-platform/tests/tools/manifest/manifest.py
+++ b/testing/web-platform/tests/tools/manifest/manifest.py
@@ -5,6 +5,7 @@ from collections import defaultdict
 from item import item_types, ManualTest, WebdriverSpecTest, Stub, RefTest, TestharnessTest
 from log import get_logger
 from sourcefile import SourceFile
+from utils import from_os_path, to_os_path
 
 
 CURRENT_VERSION = 2
@@ -207,7 +208,7 @@ class Manifest(object):
             for item_type, items in self._data.iteritems()
         }
 
-        reftest_nodes = {key:[v.to_json() for v in value]
+        reftest_nodes = {from_os_path(key): [v.to_json() for v in value]
                          for key, value in self.reftest_nodes.iteritems()}
 
         rv = {"url_base": self.url_base,
@@ -246,6 +247,7 @@ class Manifest(object):
                 self._add(manifest_item)
 
         for path, values in obj["reftest_nodes"].iteritems():
+            path = to_os_path(path)
             for v in values:
                 item = RefTest.from_json(self, tests_root, v,
                                          source_files=source_files)
@@ -306,17 +308,16 @@ class LocalChanges(object):
         return self._data[item_type]
 
     def to_json(self):
-        reftest_nodes = {key:[v.to_json() for v in value]
+        reftest_nodes = {from_os_path(key): [v.to_json() for v in value]
                          for key, value in self.reftest_nodes.iteritems()}
 
         rv = {"items": defaultdict(dict),
               "reftest_nodes": reftest_nodes,
-              "deleted": []}
-
-        rv["deleted"].extend(self._deleted)
+              "deleted": [from_os_path(path) for path in self._deleted]}
 
         for test_type, paths in self._data.iteritems():
             for path, tests in paths.iteritems():
+                path = from_os_path(path)
                 rv["items"][test_type][path] = [test.to_json() for test in tests]
 
         return rv
@@ -343,6 +344,7 @@ class LocalChanges(object):
                     self.add(manifest_item)
 
         for path, values in obj["reftest_nodes"].iteritems():
+            path = to_os_path(path)
             for v in values:
                 item = RefTest.from_json(self.manifest, tests_root, v,
                                          source_files=source_files)
@@ -350,7 +352,7 @@ class LocalChanges(object):
                 self.reftest_nodes_by_url[item.url] = item
 
         for item in obj["deleted"]:
-            self.add_deleted(item)
+            self.add_deleted(to_os_path(item))
 
         return self
 
diff --git a/testing/web-platform/tests/tools/manifest/utils.py b/testing/web-platform/tests/tools/manifest/utils.py
index 60e00ee74d34..668b14c05ba7 100644
--- a/testing/web-platform/tests/tools/manifest/utils.py
+++ b/testing/web-platform/tests/tools/manifest/utils.py
@@ -21,6 +21,12 @@ def is_blacklisted(url):
             return True
     return False
 
+def from_os_path(path):
+    return path.replace(os.path.sep, "/")
+
+def to_os_path(path):
+    return path.replace("/", os.path.sep)
+
 class ContextManagerStringIO(StringIO):
     def __enter__(self):
         return self
diff --git a/testing/web-platform/tests/url/a-element.xhtml b/testing/web-platform/tests/url/a-element-xhtml.xhtml
similarity index 100%
rename from testing/web-platform/tests/url/a-element.xhtml
rename to testing/web-platform/tests/url/a-element-xhtml.xhtml
diff --git a/testing/web-platform/tests/webgl/compressedTexSubImage2D.html b/testing/web-platform/tests/webgl/compressedTexSubImage2D.html
index dd26c4f193c4..539f9e17f8a8 100644
--- a/testing/web-platform/tests/webgl/compressedTexSubImage2D.html
+++ b/testing/web-platform/tests/webgl/compressedTexSubImage2D.html
@@ -15,7 +15,6 @@ test(function() {
   var tex = gl.createTexture();
   gl.bindTexture(gl.TEXTURE_2D, tex);
 
-  /* Bug 1226336
   shouldGenerateGLError(gl, gl.INVALID_ENUM, function() {
     gl.compressedTexSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 10, 10, COMPRESSED_RGB_S3TC_DXT1_EXT, new Uint8Array(8));
   });
@@ -27,6 +26,5 @@ test(function() {
       gl.compressedTexSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 10, 10, COMPRESSED_RGB_S3TC_DXT1_EXT);
     });
   }, "Should throw a TypeError when passing too few arguments.");
-  */
 });
 </script>

From 4653c555e0374f891ecf39726c23d492b9cd26b3 Mon Sep 17 00:00:00 2001
From: James Graham <james@hoppipolla.co.uk>
Date: Fri, 18 Dec 2015 09:26:21 +0000
Subject: [PATCH 085/101] Bug 1233726 - Update web-platform-tests expected data
 to revision 05c55fbdc527eacdc7b875f298a8cb1b6db0dfcd, a=testonly

---
 .../meta/FileAPI/idlharness.worker.js.ini     |    4 +
 .../media-src-redir-bug.sub.html.ini          |   21 +
 ...creating_browsing_context_test_01.html.ini |    2 +-
 .../unknown-element.html.ini                  |    1 -
 .../meta/html/dom/interfaces.html.ini         |   75 +
 .../current-pixel-density/basic.html.ini      |   22 +-
 .../bdi-neutral-number.html.ini               |    4 +
 .../attribute-case/semantics.html.ini         |  198 ++
 .../attribute-case/syntax.html.ini            |   36 +
 .../web-platform/meta/svg/interfaces.html.ini | 2450 +++++++++++++++++
 ...nt.xhtml.ini => a-element-xhtml.xhtml.ini} |   95 +-
 .../web-platform/meta/url/interfaces.html.ini |    1 +
 .../webgl/compressedTexSubImage2D.html.ini    |    6 +
 .../meta/webvtt/interfaces.html.ini           |    3 +
 .../underline_timestamp_past.html.ini         |    3 +-
 15 files changed, 2834 insertions(+), 87 deletions(-)
 create mode 100644 testing/web-platform/meta/content-security-policy/media-src/media-src-redir-bug.sub.html.ini
 create mode 100644 testing/web-platform/meta/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number.html.ini
 create mode 100644 testing/web-platform/meta/svg/interfaces.html.ini
 rename testing/web-platform/meta/url/{a-element.xhtml.ini => a-element-xhtml.xhtml.ini} (81%)

diff --git a/testing/web-platform/meta/FileAPI/idlharness.worker.js.ini b/testing/web-platform/meta/FileAPI/idlharness.worker.js.ini
index 37b8a3949920..d8ea5db26a19 100644
--- a/testing/web-platform/meta/FileAPI/idlharness.worker.js.ini
+++ b/testing/web-platform/meta/FileAPI/idlharness.worker.js.ini
@@ -41,3 +41,7 @@
 
   [FileList interface: attribute length]
     expected: FAIL
+
+  [FileList interface object name]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/media-src/media-src-redir-bug.sub.html.ini b/testing/web-platform/meta/content-security-policy/media-src/media-src-redir-bug.sub.html.ini
new file mode 100644
index 000000000000..0d2298df6641
--- /dev/null
+++ b/testing/web-platform/meta/content-security-policy/media-src/media-src-redir-bug.sub.html.ini
@@ -0,0 +1,21 @@
+[media-src-redir-bug.sub.html]
+  type: testharness
+  expected: TIMEOUT
+  [In-policy async video src]
+    expected:
+      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
+      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
+
+  [in-policy async video src w/redir]
+    expected: NOTRUN
+
+  [In-policy async video source element]
+    expected:
+      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
+      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
+
+  [In-policy async video source element w/redir]
+    expected:
+      if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): NOTRUN
+      if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): NOTRUN
+
diff --git a/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini b/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
index f1076887e18a..f2ff2e9813d7 100644
--- a/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
+++ b/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
@@ -1,4 +1,4 @@
 [creating_browsing_context_test_01.html]
   type: testharness
   disabled:
-    if (os == "linux"): https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
+    if os == "linux": https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
diff --git a/testing/web-platform/meta/html/dom/elements/elements-in-the-dom/unknown-element.html.ini b/testing/web-platform/meta/html/dom/elements/elements-in-the-dom/unknown-element.html.ini
index 541b6b2f715a..259477aab6c5 100644
--- a/testing/web-platform/meta/html/dom/elements/elements-in-the-dom/unknown-element.html.ini
+++ b/testing/web-platform/meta/html/dom/elements/elements-in-the-dom/unknown-element.html.ini
@@ -2,4 +2,3 @@
   type: testharness
   expected:
     if not debug and e10s and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86") and (bits == 32): TIMEOUT
diff --git a/testing/web-platform/meta/html/dom/interfaces.html.ini b/testing/web-platform/meta/html/dom/interfaces.html.ini
index 17f26f44db08..9c2a3a3a81cb 100644
--- a/testing/web-platform/meta/html/dom/interfaces.html.ini
+++ b/testing/web-platform/meta/html/dom/interfaces.html.ini
@@ -2749,3 +2749,78 @@
   [WorkerLocation interface: attribute hash]
     expected: FAIL
 
+  [DOMElementMap interface object name]
+    expected: FAIL
+
+  [AudioTrackList interface object name]
+    expected: FAIL
+
+  [AudioTrack interface object name]
+    expected: FAIL
+
+  [VideoTrackList interface object name]
+    expected: FAIL
+
+  [VideoTrack interface object name]
+    expected: FAIL
+
+  [MediaController interface object name]
+    expected: FAIL
+
+  [HTMLTableDataCellElement interface object name]
+    expected: FAIL
+
+  [HTMLTableHeaderCellElement interface object name]
+    expected: FAIL
+
+  [HTMLKeygenElement interface object name]
+    expected: FAIL
+
+  [AutocompleteErrorEvent interface object name]
+    expected: FAIL
+
+  [HTMLDetailsElement interface object name]
+    expected: FAIL
+
+  [RelatedEvent interface object name]
+    expected: FAIL
+
+  [HTMLDialogElement interface object name]
+    expected: FAIL
+
+  [CanvasProxy interface object name]
+    expected: FAIL
+
+  [DrawingStyle interface object name]
+    expected: FAIL
+
+  [DataTransferItemList interface object name]
+    expected: FAIL
+
+  [DataTransferItem interface object name]
+    expected: FAIL
+
+  [ApplicationCache interface object name]
+    expected: FAIL
+
+  [PortCollection interface object name]
+    expected: FAIL
+
+  [WorkerGlobalScope interface object name]
+    expected: FAIL
+
+  [DedicatedWorkerGlobalScope interface object name]
+    expected: FAIL
+
+  [SharedWorkerGlobalScope interface object name]
+    expected: FAIL
+
+  [WorkerNavigator interface object name]
+    expected: FAIL
+
+  [WorkerLocation interface object name]
+    expected: FAIL
+
+  [HTMLMarqueeElement interface object name]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html.ini
index 4c8bcf5137a1..32292c722ad7 100644
--- a/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html.ini
+++ b/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html.ini
@@ -1,26 +1,8 @@
 [basic.html]
   type: testharness
-  [<img srcset="/images/green-256x256.png 1.6x" data-expect="160">]
+  [<img srcset="data:image/svg+xml,<svg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='-1%20-1%202%202'%20width='20'><circle%20r='1'/></svg> 2x" data-expect="10">]
     expected: FAIL
 
-  [<img srcset="/images/green-256x256.png 2x" data-expect="128">]
-    expected: FAIL
-
-  [<img srcset="/images/green-256x256.png 10000x" data-expect="0">]
-    expected: FAIL
-
-  [<img srcset="/images/green-256x256.png 9e99999999999999999999999x" data-expect="0">]
-    expected: FAIL
-
-  [<img srcset="/images/green-256x256.png 512w" sizes="256px" data-expect="128">]
-    expected: FAIL
-
-  [<img srcset="/images/green-256x256.png 256w" sizes="512px" data-expect="512">]
-    expected: FAIL
-
-  [<img srcset="/images/green-256x256.png 256w" sizes="1px" data-expect="1">]
-    expected: FAIL
-
-  [<img srcset="/images/green-256x256.png 256w" sizes="0px" data-expect="0">]
+  [<img srcset="data:image/svg+xml,<svg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='-1%20-1%202%202'%20height='20'><circle%20r='1'/></svg> 2x" data-expect="10">]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number.html.ini b/testing/web-platform/meta/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number.html.ini
new file mode 100644
index 000000000000..e65fe96b0b49
--- /dev/null
+++ b/testing/web-platform/meta/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number.html.ini
@@ -0,0 +1,4 @@
+[bdi-neutral-number.html]
+  type: reftest
+  expected:
+    if debug and not e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): TIMEOUT
diff --git a/testing/web-platform/meta/selectors/attribute-selectors/attribute-case/semantics.html.ini b/testing/web-platform/meta/selectors/attribute-selectors/attribute-case/semantics.html.ini
index 4508ca5f03e8..3766611ecf82 100644
--- a/testing/web-platform/meta/selectors/attribute-selectors/attribute-case/semantics.html.ini
+++ b/testing/web-platform/meta/selectors/attribute-selectors/attribute-case/semantics.html.ini
@@ -1017,3 +1017,201 @@
   [[foo='bar' i\] <div baz="BAR"> with querySelector in XML]
     expected: FAIL
 
+  [[class~='a' i\] <div class="X A B"> in standards mode]
+    expected: FAIL
+
+  [[class~='a' i\] <div class="X A B"> with querySelector in standards mode]
+    expected: FAIL
+
+  [[class~='A' i\] <div class="x a b"> in standards mode]
+    expected: FAIL
+
+  [[class~='A' i\] <div class="x a b"> with querySelector in standards mode]
+    expected: FAIL
+
+  [[id^='a' i\] <div id="AB"> in standards mode]
+    expected: FAIL
+
+  [[id^='a' i\] <div id="AB"> with querySelector in standards mode]
+    expected: FAIL
+
+  [[id$='A' i\] <div id="xa"> in standards mode]
+    expected: FAIL
+
+  [[id$='A' i\] <div id="xa"> with querySelector in standards mode]
+    expected: FAIL
+
+  [[lang|='a' i\] <div lang="A-B"> in standards mode]
+    expected: FAIL
+
+  [[lang|='a' i\] <div lang="A-B"> with querySelector in standards mode]
+    expected: FAIL
+
+  [[lang*='A' i\] <div lang="xab"> in standards mode]
+    expected: FAIL
+
+  [[lang*='A' i\] <div lang="xab"> with querySelector in standards mode]
+    expected: FAIL
+
+  [[foo~='ä' i\] /* COMBINING in selector */ <div foo="ä"> in standards mode]
+    expected: FAIL
+
+  [[foo~='ä' i\] /* COMBINING in selector */ <div foo="ä"> with querySelector in standards mode]
+    expected: FAIL
+
+  [[foo^='Ä' i\] /* COMBINING in selector */ <div foo="Ä"> in standards mode]
+    expected: FAIL
+
+  [[foo^='Ä' i\] /* COMBINING in selector */ <div foo="Ä"> with querySelector in standards mode]
+    expected: FAIL
+
+  [[foo$='Ä' i\] /* COMBINING in selector */ <div foo="ä"> in standards mode]
+    expected: FAIL
+
+  [[foo$='Ä' i\] /* COMBINING in selector */ <div foo="ä"> with querySelector in standards mode]
+    expected: FAIL
+
+  [[foo*='ä' i\] /* COMBINING in attribute */ <div foo="ä"> in standards mode]
+    expected: FAIL
+
+  [[foo*='ä' i\] /* COMBINING in attribute */ <div foo="ä"> with querySelector in standards mode]
+    expected: FAIL
+
+  [[foo|='ä' i\] /* COMBINING in attribute */ <div foo="Ä"> in standards mode]
+    expected: FAIL
+
+  [[foo|='ä' i\] /* COMBINING in attribute */ <div foo="Ä"> with querySelector in standards mode]
+    expected: FAIL
+
+  [[class~='a' i\] <div class="X A B"> in quirks mode]
+    expected: FAIL
+
+  [[class~='a' i\] <div class="X A B"> with querySelector in quirks mode]
+    expected: FAIL
+
+  [[class~='A' i\] <div class="x a b"> in quirks mode]
+    expected: FAIL
+
+  [[class~='A' i\] <div class="x a b"> with querySelector in quirks mode]
+    expected: FAIL
+
+  [[id^='a' i\] <div id="AB"> in quirks mode]
+    expected: FAIL
+
+  [[id^='a' i\] <div id="AB"> with querySelector in quirks mode]
+    expected: FAIL
+
+  [[id$='A' i\] <div id="xa"> in quirks mode]
+    expected: FAIL
+
+  [[id$='A' i\] <div id="xa"> with querySelector in quirks mode]
+    expected: FAIL
+
+  [[lang|='a' i\] <div lang="A-B"> in quirks mode]
+    expected: FAIL
+
+  [[lang|='a' i\] <div lang="A-B"> with querySelector in quirks mode]
+    expected: FAIL
+
+  [[lang*='A' i\] <div lang="xab"> in quirks mode]
+    expected: FAIL
+
+  [[lang*='A' i\] <div lang="xab"> with querySelector in quirks mode]
+    expected: FAIL
+
+  [[foo~='ä' i\] /* COMBINING in selector */ <div foo="ä"> in quirks mode]
+    expected: FAIL
+
+  [[foo~='ä' i\] /* COMBINING in selector */ <div foo="ä"> with querySelector in quirks mode]
+    expected: FAIL
+
+  [[foo^='Ä' i\] /* COMBINING in selector */ <div foo="Ä"> in quirks mode]
+    expected: FAIL
+
+  [[foo^='Ä' i\] /* COMBINING in selector */ <div foo="Ä"> with querySelector in quirks mode]
+    expected: FAIL
+
+  [[foo$='Ä' i\] /* COMBINING in selector */ <div foo="ä"> in quirks mode]
+    expected: FAIL
+
+  [[foo$='Ä' i\] /* COMBINING in selector */ <div foo="ä"> with querySelector in quirks mode]
+    expected: FAIL
+
+  [[foo*='ä' i\] /* COMBINING in attribute */ <div foo="ä"> in quirks mode]
+    expected: FAIL
+
+  [[foo*='ä' i\] /* COMBINING in attribute */ <div foo="ä"> with querySelector in quirks mode]
+    expected: FAIL
+
+  [[foo|='ä' i\] /* COMBINING in attribute */ <div foo="Ä"> in quirks mode]
+    expected: FAIL
+
+  [[foo|='ä' i\] /* COMBINING in attribute */ <div foo="Ä"> with querySelector in quirks mode]
+    expected: FAIL
+
+  [[class~='a' i\] <div class="X A B"> in XML]
+    expected: FAIL
+
+  [[class~='a' i\] <div class="X A B"> with querySelector in XML]
+    expected: FAIL
+
+  [[class~='A' i\] <div class="x a b"> in XML]
+    expected: FAIL
+
+  [[class~='A' i\] <div class="x a b"> with querySelector in XML]
+    expected: FAIL
+
+  [[id^='a' i\] <div id="AB"> in XML]
+    expected: FAIL
+
+  [[id^='a' i\] <div id="AB"> with querySelector in XML]
+    expected: FAIL
+
+  [[id$='A' i\] <div id="xa"> in XML]
+    expected: FAIL
+
+  [[id$='A' i\] <div id="xa"> with querySelector in XML]
+    expected: FAIL
+
+  [[lang|='a' i\] <div lang="A-B"> in XML]
+    expected: FAIL
+
+  [[lang|='a' i\] <div lang="A-B"> with querySelector in XML]
+    expected: FAIL
+
+  [[lang*='A' i\] <div lang="xab"> in XML]
+    expected: FAIL
+
+  [[lang*='A' i\] <div lang="xab"> with querySelector in XML]
+    expected: FAIL
+
+  [[foo~='ä' i\] /* COMBINING in selector */ <div foo="ä"> in XML]
+    expected: FAIL
+
+  [[foo~='ä' i\] /* COMBINING in selector */ <div foo="ä"> with querySelector in XML]
+    expected: FAIL
+
+  [[foo^='Ä' i\] /* COMBINING in selector */ <div foo="Ä"> in XML]
+    expected: FAIL
+
+  [[foo^='Ä' i\] /* COMBINING in selector */ <div foo="Ä"> with querySelector in XML]
+    expected: FAIL
+
+  [[foo$='Ä' i\] /* COMBINING in selector */ <div foo="ä"> in XML]
+    expected: FAIL
+
+  [[foo$='Ä' i\] /* COMBINING in selector */ <div foo="ä"> with querySelector in XML]
+    expected: FAIL
+
+  [[foo*='ä' i\] /* COMBINING in attribute */ <div foo="ä"> in XML]
+    expected: FAIL
+
+  [[foo*='ä' i\] /* COMBINING in attribute */ <div foo="ä"> with querySelector in XML]
+    expected: FAIL
+
+  [[foo|='ä' i\] /* COMBINING in attribute */ <div foo="Ä"> in XML]
+    expected: FAIL
+
+  [[foo|='ä' i\] /* COMBINING in attribute */ <div foo="Ä"> with querySelector in XML]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/selectors/attribute-selectors/attribute-case/syntax.html.ini b/testing/web-platform/meta/selectors/attribute-selectors/attribute-case/syntax.html.ini
index 60b4facf43c7..459f3b1d2802 100644
--- a/testing/web-platform/meta/selectors/attribute-selectors/attribute-case/syntax.html.ini
+++ b/testing/web-platform/meta/selectors/attribute-selectors/attribute-case/syntax.html.ini
@@ -369,3 +369,39 @@
   [[foo /* sanity check (invalid) */ with querySelector in XML]
     expected: FAIL
 
+  [[foo*='bar' i\] in standards mode]
+    expected: FAIL
+
+  [[foo*='bar' i\] with querySelector in standards mode]
+    expected: FAIL
+
+  [[foo|='bar' i\] in standards mode]
+    expected: FAIL
+
+  [[foo|='bar' i\] with querySelector in standards mode]
+    expected: FAIL
+
+  [[foo*='bar' i\] in quirks mode]
+    expected: FAIL
+
+  [[foo*='bar' i\] with querySelector in quirks mode]
+    expected: FAIL
+
+  [[foo|='bar' i\] in quirks mode]
+    expected: FAIL
+
+  [[foo|='bar' i\] with querySelector in quirks mode]
+    expected: FAIL
+
+  [[foo*='bar' i\] in XML]
+    expected: FAIL
+
+  [[foo*='bar' i\] with querySelector in XML]
+    expected: FAIL
+
+  [[foo|='bar' i\] in XML]
+    expected: FAIL
+
+  [[foo|='bar' i\] with querySelector in XML]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/svg/interfaces.html.ini b/testing/web-platform/meta/svg/interfaces.html.ini
new file mode 100644
index 000000000000..b9049f887914
--- /dev/null
+++ b/testing/web-platform/meta/svg/interfaces.html.ini
@@ -0,0 +1,2450 @@
+[interfaces.html]
+  type: testharness
+  [Document interface: attribute rootElement]
+    expected: FAIL
+
+  [SVGElement interface: attribute tabIndex]
+    expected: FAIL
+
+  [SVGElement interface: operation focus()]
+    expected: FAIL
+
+  [SVGElement interface: operation blur()]
+    expected: FAIL
+
+  [SVGGeometryElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGGeometryElement interface object length]
+    expected: FAIL
+
+  [SVGGeometryElement interface object name]
+    expected: FAIL
+
+  [SVGGeometryElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGGeometryElement interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [SVGGeometryElement interface: operation isPointInFill(DOMPoint)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: operation isPointInStroke(DOMPoint)]
+    expected: FAIL
+
+  [SVGNumber interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGSVGElement interface: operation getIntersectionList(DOMRectReadOnly,SVGElement)]
+    expected: FAIL
+
+  [SVGSVGElement interface: operation getEnclosureList(DOMRectReadOnly,SVGElement)]
+    expected: FAIL
+
+  [SVGSVGElement interface: operation checkIntersection(SVGElement,DOMRectReadOnly)]
+    expected: FAIL
+
+  [SVGSVGElement interface: operation checkEnclosure(SVGElement,DOMRectReadOnly)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "currentTranslate" with the proper type (5)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "getIntersectionList" with the proper type (6)]
+    expected: FAIL
+
+  [SVGSVGElement interface: calling getIntersectionList(DOMRectReadOnly,SVGElement) on svg with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "getEnclosureList" with the proper type (7)]
+    expected: FAIL
+
+  [SVGSVGElement interface: calling getEnclosureList(DOMRectReadOnly,SVGElement) on svg with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "checkIntersection" with the proper type (8)]
+    expected: FAIL
+
+  [SVGSVGElement interface: calling checkIntersection(SVGElement,DOMRectReadOnly) on svg with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "checkEnclosure" with the proper type (9)]
+    expected: FAIL
+
+  [SVGSVGElement interface: calling checkEnclosure(SVGElement,DOMRectReadOnly) on svg with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onafterprint" with the proper type (29)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onbeforeprint" with the proper type (30)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onbeforeunload" with the proper type (31)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onhashchange" with the proper type (32)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onlanguagechange" with the proper type (33)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onmessage" with the proper type (34)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onoffline" with the proper type (35)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "ononline" with the proper type (36)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onpagehide" with the proper type (37)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onpageshow" with the proper type (38)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onpopstate" with the proper type (39)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onrejectionhandled" with the proper type (40)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onstorage" with the proper type (41)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onunhandledrejection" with the proper type (42)]
+    expected: FAIL
+
+  [SVGSVGElement interface: svg must inherit property "onunload" with the proper type (43)]
+    expected: FAIL
+
+  [SVGElement interface: svg must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: svg must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: svg must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: svg must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: svg must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: svg must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: svg must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: svg must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: svg must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: svg must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: svg must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: g must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: g must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: g must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: g must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: g must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: g must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: g must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: g must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: g must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: g must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: g must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGUnknownElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGUnknownElement interface object length]
+    expected: FAIL
+
+  [SVGUnknownElement interface object name]
+    expected: FAIL
+
+  [SVGUnknownElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGUnknownElement interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [SVGElement interface: defs must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: defs must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: defs must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: defs must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: defs must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: defs must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: defs must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: defs must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: defs must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: defs must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: defs must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: Desc must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: Desc must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: Desc must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: Desc must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: Desc must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: Desc must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: Desc must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: Desc must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: Desc must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: Desc must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: Desc must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: metadata must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: metadata must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: metadata must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: metadata must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: metadata must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: metadata must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: metadata must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: metadata must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: metadata must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: metadata must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: metadata must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: title must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: title must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: title must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: title must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: title must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: title must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: title must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: title must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: title must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: title must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: title must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: symbol must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: symbol must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: symbol must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: symbol must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: symbol must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: symbol must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: symbol must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: symbol must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: symbol must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: symbol must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: symbol must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: use must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: use must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: use must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: use must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: use must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: use must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: use must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: use must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: use must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: use must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: use must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: Switch must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: Switch must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: Switch must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: Switch must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: Switch must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: Switch must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: Switch must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: Switch must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: Switch must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: Switch must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: Switch must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGStyleElement interface: style must inherit property "sheet" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: style must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: style must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: style must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: style must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: style must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: style must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: style must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: style must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: style must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: style must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: style must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGTransform interface: svg.createSVGTransform() must inherit property "matrix" with the proper type (8)]
+    expected: FAIL
+
+  [SVGPathElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGPathElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGGeometryElement interface: path must inherit property "isPointInFill" with the proper type (0)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInFill(DOMPoint) on path with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGGeometryElement interface: path must inherit property "isPointInStroke" with the proper type (1)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on path with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGElement interface: path must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: path must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: path must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: path must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: path must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: path must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: path must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: path must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: path must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: path must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: path must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGRectElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGRectElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGGeometryElement interface: rect must inherit property "isPointInFill" with the proper type (0)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInFill(DOMPoint) on rect with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGGeometryElement interface: rect must inherit property "isPointInStroke" with the proper type (1)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on rect with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGElement interface: rect must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: rect must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: rect must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: rect must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: rect must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: rect must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: rect must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: rect must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: rect must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: rect must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: rect must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGCircleElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGCircleElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGGeometryElement interface: circle must inherit property "isPointInFill" with the proper type (0)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInFill(DOMPoint) on circle with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGGeometryElement interface: circle must inherit property "isPointInStroke" with the proper type (1)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on circle with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGElement interface: circle must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: circle must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: circle must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: circle must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: circle must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: circle must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: circle must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: circle must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: circle must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: circle must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: circle must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGEllipseElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGEllipseElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGGeometryElement interface: ellipse must inherit property "isPointInFill" with the proper type (0)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInFill(DOMPoint) on ellipse with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGGeometryElement interface: ellipse must inherit property "isPointInStroke" with the proper type (1)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on ellipse with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGElement interface: ellipse must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: ellipse must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: ellipse must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: ellipse must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: ellipse must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: ellipse must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: ellipse must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: ellipse must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: ellipse must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: ellipse must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: ellipse must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGLineElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGLineElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGGeometryElement interface: line must inherit property "isPointInFill" with the proper type (0)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInFill(DOMPoint) on line with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGGeometryElement interface: line must inherit property "isPointInStroke" with the proper type (1)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on line with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGElement interface: line must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: line must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: line must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: line must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: line must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: line must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: line must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: line must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: line must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: line must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: line must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGPolylineElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGPolylineElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGGeometryElement interface: polyline must inherit property "isPointInFill" with the proper type (0)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInFill(DOMPoint) on polyline with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGGeometryElement interface: polyline must inherit property "isPointInStroke" with the proper type (1)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on polyline with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGElement interface: polyline must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: polyline must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: polyline must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: polyline must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: polyline must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: polyline must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: polyline must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: polyline must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: polyline must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: polyline must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: polyline must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGPolygonElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGPolygonElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGGeometryElement interface: polygon must inherit property "isPointInFill" with the proper type (0)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInFill(DOMPoint) on polygon with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGGeometryElement interface: polygon must inherit property "isPointInStroke" with the proper type (1)]
+    expected: FAIL
+
+  [SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on polygon with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGElement interface: polygon must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: polygon must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: polygon must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: polygon must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: polygon must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: polygon must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: polygon must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: polygon must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: polygon must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: polygon must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: polygon must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGTextContentElement must be primary interface of textContent]
+    expected: FAIL
+
+  [Stringification of textContent]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "LENGTHADJUST_UNKNOWN" with the proper type (0)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "LENGTHADJUST_SPACING" with the proper type (1)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "LENGTHADJUST_SPACINGANDGLYPHS" with the proper type (2)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "textLength" with the proper type (3)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "lengthAdjust" with the proper type (4)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "getNumberOfChars" with the proper type (5)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "getComputedTextLength" with the proper type (6)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "getSubStringLength" with the proper type (7)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: calling getSubStringLength(unsigned long,unsigned long) on textContent with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "getStartPositionOfChar" with the proper type (8)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: calling getStartPositionOfChar(unsigned long) on textContent with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "getEndPositionOfChar" with the proper type (9)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: calling getEndPositionOfChar(unsigned long) on textContent with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "getExtentOfChar" with the proper type (10)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: calling getExtentOfChar(unsigned long) on textContent with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "getRotationOfChar" with the proper type (11)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: calling getRotationOfChar(unsigned long) on textContent with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "getCharNumAtPosition" with the proper type (12)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: calling getCharNumAtPosition(DOMPoint) on textContent with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGTextContentElement interface: textContent must inherit property "selectSubString" with the proper type (13)]
+    expected: FAIL
+
+  [SVGTextContentElement interface: calling selectSubString(unsigned long,unsigned long) on textContent with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGGraphicsElement interface: textContent must inherit property "transform" with the proper type (0)]
+    expected: FAIL
+
+  [SVGGraphicsElement interface: textContent must inherit property "getBBox" with the proper type (1)]
+    expected: FAIL
+
+  [SVGGraphicsElement interface: calling getBBox(SVGBoundingBoxOptions) on textContent with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGGraphicsElement interface: textContent must inherit property "getCTM" with the proper type (2)]
+    expected: FAIL
+
+  [SVGGraphicsElement interface: textContent must inherit property "getScreenCTM" with the proper type (3)]
+    expected: FAIL
+
+  [SVGGraphicsElement interface: textContent must inherit property "requiredExtensions" with the proper type (4)]
+    expected: FAIL
+
+  [SVGGraphicsElement interface: textContent must inherit property "systemLanguage" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: textContent must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: textContent must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: textContent must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: textContent must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: textContent must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: textContent must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: textContent must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: textContent must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: textContent must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: textContent must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: textContent must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: text must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: text must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: text must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: text must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: text must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: text must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: text must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: text must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: text must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: text must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: text must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: tspan must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: tspan must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: tspan must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: tspan must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: tspan must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: tspan must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: tspan must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: tspan must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: tspan must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: tspan must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: tspan must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: textPath must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: textPath must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: textPath must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: textPath must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: textPath must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: textPath must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: textPath must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: textPath must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: textPath must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: textPath must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: textPath must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGImageElement interface: attribute crossOrigin]
+    expected: FAIL
+
+  [SVGImageElement interface: image must inherit property "crossOrigin" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: image must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: image must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: image must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: image must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: image must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: image must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: image must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: image must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: image must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: image must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: image must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: foreignObject must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: foreignObject must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: foreignObject must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: foreignObject must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: foreignObject must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: foreignObject must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: foreignObject must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: foreignObject must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: foreignObject must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: foreignObject must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: foreignObject must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGMarkerElement interface: attribute orient]
+    expected: FAIL
+
+  [SVGMarkerElement interface: marker must inherit property "orient" with the proper type (13)]
+    expected: FAIL
+
+  [SVGElement interface: marker must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: marker must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: marker must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: marker must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: marker must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: marker must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: marker must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: marker must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: marker must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: marker must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: marker must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGSolidcolorElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGSolidcolorElement interface object length]
+    expected: FAIL
+
+  [SVGSolidcolorElement interface object name]
+    expected: FAIL
+
+  [SVGSolidcolorElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGSolidcolorElement interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [SVGElement interface: linearGradient must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: linearGradient must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: linearGradient must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: linearGradient must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: linearGradient must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: linearGradient must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: linearGradient must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: linearGradient must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: linearGradient must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: linearGradient must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: linearGradient must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGRadialGradientElement interface: attribute fr]
+    expected: FAIL
+
+  [SVGRadialGradientElement interface: radialGradient must inherit property "fr" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: radialGradient must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: radialGradient must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: radialGradient must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: radialGradient must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: radialGradient must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: radialGradient must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: radialGradient must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: radialGradient must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: radialGradient must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: radialGradient must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: radialGradient must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGMeshElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGMeshElement interface object length]
+    expected: FAIL
+
+  [SVGMeshElement interface object name]
+    expected: FAIL
+
+  [SVGMeshElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGMeshElement interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [SVGMeshrowElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGMeshrowElement interface object length]
+    expected: FAIL
+
+  [SVGMeshrowElement interface object name]
+    expected: FAIL
+
+  [SVGMeshrowElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGMeshrowElement interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [SVGMeshpatchElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGMeshpatchElement interface object length]
+    expected: FAIL
+
+  [SVGMeshpatchElement interface object name]
+    expected: FAIL
+
+  [SVGMeshpatchElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGMeshpatchElement interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [SVGElement interface: stop must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: stop must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: stop must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: stop must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: stop must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: stop must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: stop must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: stop must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: stop must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: stop must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: stop must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: pattern must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: pattern must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: pattern must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: pattern must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: pattern must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: pattern must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: pattern must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: pattern must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: pattern must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: pattern must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: pattern must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGHatchElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGHatchElement interface object length]
+    expected: FAIL
+
+  [SVGHatchElement interface object name]
+    expected: FAIL
+
+  [SVGHatchElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGHatchElement interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [SVGHatchpathElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGHatchpathElement interface object length]
+    expected: FAIL
+
+  [SVGHatchpathElement interface object name]
+    expected: FAIL
+
+  [SVGHatchpathElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGHatchpathElement interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [SVGCursorElement interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGCursorElement interface object length]
+    expected: FAIL
+
+  [SVGCursorElement interface object name]
+    expected: FAIL
+
+  [SVGCursorElement interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGCursorElement interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [SVGCursorElement interface: attribute x]
+    expected: FAIL
+
+  [SVGCursorElement interface: attribute y]
+    expected: FAIL
+
+  [SVGCursorElement interface: attribute href]
+    expected: FAIL
+
+  [SVGCursorElement must be primary interface of cursor]
+    expected: FAIL
+
+  [Stringification of cursor]
+    expected: FAIL
+
+  [SVGCursorElement interface: cursor must inherit property "x" with the proper type (0)]
+    expected: FAIL
+
+  [SVGCursorElement interface: cursor must inherit property "y" with the proper type (1)]
+    expected: FAIL
+
+  [SVGCursorElement interface: cursor must inherit property "href" with the proper type (2)]
+    expected: FAIL
+
+  [SVGElement interface: cursor must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: cursor must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: cursor must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: cursor must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: cursor must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: cursor must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: cursor must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: cursor must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: cursor must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: cursor must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: cursor must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGScriptElement interface: script must inherit property "crossOrigin" with the proper type (1)]
+    expected: FAIL
+
+  [SVGElement interface: script must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: script must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: script must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: script must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: script must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: script must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: script must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: script must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: script must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: script must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: script must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGZoomEvent interface: existence and properties of interface object]
+    expected: FAIL
+
+  [SVGZoomEvent interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [SVGZoomEvent interface: attribute zoomRectScreen]
+    expected: FAIL
+
+  [SVGElement interface: a must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: a must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: a must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: a must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: a must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: a must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: a must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: a must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: a must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: a must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: a must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: view must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: view must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: view must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: view must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: view must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: view must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: view must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: view must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: view must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: view must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: view must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: filter must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: filter must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: filter must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: filter must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: filter must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: filter must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: filter must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: filter must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: filter must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: filter must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: filter must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feBlend must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feBlend must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feBlend must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feBlend must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feBlend must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feBlend must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feBlend must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feBlend must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feBlend must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feBlend must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feBlend must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feColorMatrix must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feColorMatrix must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feColorMatrix must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feColorMatrix must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feColorMatrix must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feColorMatrix must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feColorMatrix must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feColorMatrix must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feColorMatrix must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feColorMatrix must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feColorMatrix must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feComponentTransfer must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feComponentTransfer must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feComponentTransfer must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feComponentTransfer must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feComponentTransfer must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feComponentTransfer must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feComponentTransfer must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feComponentTransfer must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feComponentTransfer must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feComponentTransfer must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feComponentTransfer must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncR must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncR must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncR must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncR must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncR must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncR must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncR must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncR must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncR must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncR must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncR must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncG must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncG must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncG must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncG must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncG must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncG must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncG must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncG must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncG must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncG must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncG must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncB must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncB must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncB must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncB must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncB must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncB must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncB must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncB must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncB must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncB must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncB must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncA must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncA must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncA must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncA must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncA must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncA must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncA must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncA must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncA must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncA must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feFuncA must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feComposite must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feComposite must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feComposite must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feComposite must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feComposite must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feComposite must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feComposite must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feComposite must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feComposite must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feComposite must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feComposite must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feConvolveMatrix must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feConvolveMatrix must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feConvolveMatrix must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feConvolveMatrix must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feConvolveMatrix must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feConvolveMatrix must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feConvolveMatrix must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feConvolveMatrix must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feConvolveMatrix must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feConvolveMatrix must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feConvolveMatrix must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feDiffuseLighting must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feDiffuseLighting must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feDiffuseLighting must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feDiffuseLighting must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feDiffuseLighting must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feDiffuseLighting must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feDiffuseLighting must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feDiffuseLighting must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feDiffuseLighting must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feDiffuseLighting must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feDiffuseLighting must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: fePointLight must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: fePointLight must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: fePointLight must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: fePointLight must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: fePointLight must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: fePointLight must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: fePointLight must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: fePointLight must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: fePointLight must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: fePointLight must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: fePointLight must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feSpotLight must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feSpotLight must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feSpotLight must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feSpotLight must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feSpotLight must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feSpotLight must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feSpotLight must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feSpotLight must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feSpotLight must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feSpotLight must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feSpotLight must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feDisplacementMap must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feDisplacementMap must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feDisplacementMap must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feDisplacementMap must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feDisplacementMap must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feDisplacementMap must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feDisplacementMap must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feDisplacementMap must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feDisplacementMap must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feDisplacementMap must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feDisplacementMap must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feDropShadow must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feDropShadow must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feDropShadow must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feDropShadow must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feDropShadow must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feDropShadow must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feDropShadow must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feDropShadow must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feDropShadow must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feDropShadow must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feDropShadow must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feFlood must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feFlood must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feFlood must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feFlood must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feFlood must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feFlood must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feFlood must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feFlood must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feFlood must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feFlood must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feFlood must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: constant SVG_EDGEMODE_UNKNOWN on interface object]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: constant SVG_EDGEMODE_UNKNOWN on interface prototype object]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: constant SVG_EDGEMODE_DUPLICATE on interface object]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: constant SVG_EDGEMODE_DUPLICATE on interface prototype object]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: constant SVG_EDGEMODE_WRAP on interface object]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: constant SVG_EDGEMODE_WRAP on interface prototype object]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: constant SVG_EDGEMODE_NONE on interface object]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: constant SVG_EDGEMODE_NONE on interface prototype object]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: attribute edgeMode]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement must be primary interface of feGaussianBlur]
+    expected: FAIL
+
+  [Stringification of feGaussianBlur]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "SVG_EDGEMODE_UNKNOWN" with the proper type (0)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "SVG_EDGEMODE_DUPLICATE" with the proper type (1)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "SVG_EDGEMODE_WRAP" with the proper type (2)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "SVG_EDGEMODE_NONE" with the proper type (3)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "in1" with the proper type (4)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "stdDeviationX" with the proper type (5)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "stdDeviationY" with the proper type (6)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "edgeMode" with the proper type (7)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "setStdDeviation" with the proper type (8)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: calling setStdDeviation(float,float) on feGaussianBlur with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "x" with the proper type (9)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "y" with the proper type (10)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "width" with the proper type (11)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "height" with the proper type (12)]
+    expected: FAIL
+
+  [SVGFEGaussianBlurElement interface: feGaussianBlur must inherit property "result" with the proper type (13)]
+    expected: FAIL
+
+  [SVGElement interface: feGaussianBlur must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feGaussianBlur must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feGaussianBlur must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feGaussianBlur must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feGaussianBlur must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feGaussianBlur must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feGaussianBlur must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feGaussianBlur must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feGaussianBlur must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feGaussianBlur must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feGaussianBlur must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGFEImageElement interface: attribute crossOrigin]
+    expected: FAIL
+
+  [SVGFEImageElement interface: feImage must inherit property "crossOrigin" with the proper type (1)]
+    expected: FAIL
+
+  [SVGElement interface: feImage must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feImage must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feImage must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feImage must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feImage must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feImage must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feImage must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feImage must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feImage must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feImage must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feImage must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feMerge must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feMerge must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feMerge must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feMerge must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feMerge must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feMerge must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feMerge must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feMerge must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feMerge must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feMerge must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feMerge must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feMergeNode must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feMergeNode must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feMergeNode must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feMergeNode must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feMergeNode must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feMergeNode must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feMergeNode must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feMergeNode must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feMergeNode must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feMergeNode must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feMergeNode must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feMorphology must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feMorphology must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feMorphology must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feMorphology must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feMorphology must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feMorphology must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feMorphology must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feMorphology must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feMorphology must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feMorphology must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feMorphology must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feSpecularLighting must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feSpecularLighting must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feSpecularLighting must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feSpecularLighting must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feSpecularLighting must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feSpecularLighting must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feSpecularLighting must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feSpecularLighting must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feSpecularLighting must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feSpecularLighting must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feSpecularLighting must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feTile must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feTile must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feTile must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feTile must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feTile must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feTile must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feTile must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feTile must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feTile must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feTile must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feTile must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
+  [SVGElement interface: feTurbulence must inherit property "tabIndex" with the proper type (3)]
+    expected: FAIL
+
+  [SVGElement interface: feTurbulence must inherit property "focus" with the proper type (4)]
+    expected: FAIL
+
+  [SVGElement interface: feTurbulence must inherit property "blur" with the proper type (5)]
+    expected: FAIL
+
+  [SVGElement interface: feTurbulence must inherit property "onautocomplete" with the proper type (7)]
+    expected: FAIL
+
+  [SVGElement interface: feTurbulence must inherit property "onautocompleteerror" with the proper type (8)]
+    expected: FAIL
+
+  [SVGElement interface: feTurbulence must inherit property "oncancel" with the proper type (10)]
+    expected: FAIL
+
+  [SVGElement interface: feTurbulence must inherit property "onclose" with the proper type (15)]
+    expected: FAIL
+
+  [SVGElement interface: feTurbulence must inherit property "oncuechange" with the proper type (17)]
+    expected: FAIL
+
+  [SVGElement interface: feTurbulence must inherit property "ondragexit" with the proper type (22)]
+    expected: FAIL
+
+  [SVGElement interface: feTurbulence must inherit property "onsort" with the proper type (61)]
+    expected: FAIL
+
+  [SVGElement interface: feTurbulence must inherit property "ontoggle" with the proper type (66)]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/url/a-element.xhtml.ini b/testing/web-platform/meta/url/a-element-xhtml.xhtml.ini
similarity index 81%
rename from testing/web-platform/meta/url/a-element.xhtml.ini
rename to testing/web-platform/meta/url/a-element-xhtml.xhtml.ini
index 1dcc41184ac6..97761ad3034a 100644
--- a/testing/web-platform/meta/url/a-element.xhtml.ini
+++ b/testing/web-platform/meta/url/a-element-xhtml.xhtml.ini
@@ -1,8 +1,11 @@
-[a-element.xhtml]
+[a-element-xhtml.xhtml]
   type: testharness
   [Parsing: <a:\t foo.com> against <http://example.org/foo/bar>]
     expected: FAIL
 
+  [Parsing: <http://f:21/ b ? d # e > against <http://example.org/foo/bar>]
+    expected: FAIL
+
   [Parsing: <http://f:b/c> against <http://example.org/foo/bar>]
     expected: FAIL
 
@@ -78,6 +81,9 @@
   [Parsing: <madeupscheme:/example.com/> against <http://example.org/foo/bar>]
     expected: FAIL
 
+  [Parsing: <file:/example.com/> against <http://example.org/foo/bar>]
+    expected: FAIL
+
   [Parsing: <ftps:/example.com/> against <http://example.org/foo/bar>]
     expected: FAIL
 
@@ -111,33 +117,14 @@
   [Parsing: <mailto:example.com/> against <http://example.org/foo/bar>]
     expected: FAIL
 
+  [Parsing: <#β> against <http://example.org/foo/bar>]
+    expected: FAIL
+
   [Parsing: <data:text/html,test#test> against <http://example.org/foo/bar>]
     expected: FAIL
 
   [Parsing: <file:c:\\foo\\bar.html> against <file:///tmp/mock/path>]
-    expected:
-      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and (os == "win") and (version == "10.0.10240") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    expected: FAIL
 
   [Parsing: <  File:c|////foo\\bar.html> against <file:///tmp/mock/path>]
     expected: FAIL
@@ -160,6 +147,12 @@
   [Parsing: </\\server/file> against <file:///tmp/mock/path>]
     expected: FAIL
 
+  [Parsing: <file:///foo/bar.txt> against <file:///tmp/mock/path>]
+    expected: FAIL
+
+  [Parsing: <file:///home/me> against <file:///tmp/mock/path>]
+    expected: FAIL
+
   [Parsing: <//> against <file:///tmp/mock/path>]
     expected: FAIL
 
@@ -193,6 +186,9 @@
   [Parsing: <http://example.com\\\\foo\\\\bar> against <about:blank>]
     expected: FAIL
 
+  [Parsing: <http://www.google.com/foo?bar=baz# »> against <about:blank>]
+    expected: FAIL
+
   [Parsing: <data:test# »> against <about:blank>]
     expected: FAIL
 
@@ -223,6 +219,9 @@
   [Parsing: <madeupscheme:/example.com/> against <about:blank>]
     expected: FAIL
 
+  [Parsing: <file:/example.com/> against <about:blank>]
+    expected: FAIL
+
   [Parsing: <ftps:/example.com/> against <about:blank>]
     expected: FAIL
 
@@ -310,12 +309,21 @@
   [Parsing: <http://:@www.example.com> against <about:blank>]
     expected: FAIL
 
+  [Parsing: <file:..> against <http://www.example.com/test>]
+    expected: FAIL
+
   [Parsing: <http://example example.com> against <http://other.com/>]
     expected: FAIL
 
   [Parsing: <http://Goo%20 goo%7C|.com> against <http://other.com/>]
     expected: FAIL
 
+  [Parsing: <http://[\]> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <http://[:\]> against <http://other.com/>]
+    expected: FAIL
+
   [Parsing: <http://GOO 　goo.com> against <http://other.com/>]
     expected: FAIL
 
@@ -370,42 +378,6 @@
   [Parsing: <http://[google.com\]> against <http://other.com/>]
     expected: FAIL
 
-  [Parsing: <x> against <test:test>]
-    expected: FAIL
-
-  [Parsing: <http://f:21/ b ? d # e > against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <#β> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <http://www.google.com/foo?bar=baz# »> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <#β> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <http://www.google.com/foo?bar=baz# »> against <about:blank>]
-    expected: FAIL
-
-  [Parsing: <http://[\]> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <http://[:\]> against <http://other.com/>]
-    expected: FAIL
-
-  [Parsing: <file:/example.com/> against <http://example.org/foo/bar>]
-    expected: FAIL
-
-  [Parsing: <file:///foo/bar.txt> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <file:///home/me> against <file:///tmp/mock/path>]
-    expected: FAIL
-
-  [Parsing: <file:/example.com/> against <about:blank>]
-    expected: FAIL
-
   [Parsing: <#> against <test:test>]
     expected: FAIL
 
@@ -514,6 +486,3 @@
   [Parsing: <sc:\\../> against <about:blank>]
     expected: FAIL
 
-  [Parsing: <file:..> against <http://www.example.com/test>]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/url/interfaces.html.ini b/testing/web-platform/meta/url/interfaces.html.ini
index 5797a138bf23..5c5d8df9270a 100644
--- a/testing/web-platform/meta/url/interfaces.html.ini
+++ b/testing/web-platform/meta/url/interfaces.html.ini
@@ -1,5 +1,6 @@
 [interfaces.html]
   type: testharness
+  expected: ERROR
   [URL interface: operation domainToASCII(ScalarValueString)]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/webgl/compressedTexSubImage2D.html.ini b/testing/web-platform/meta/webgl/compressedTexSubImage2D.html.ini
index 777d51687dca..5a4db990cafb 100644
--- a/testing/web-platform/meta/webgl/compressedTexSubImage2D.html.ini
+++ b/testing/web-platform/meta/webgl/compressedTexSubImage2D.html.ini
@@ -7,3 +7,9 @@
       if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
 
+  [Calling function () {\n    gl.compressedTexSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 10, 10, COMPRESSED_RGB_S3TC_DXT1_EXT, new Uint8Array(8));\n  } should generate a 1280 error.]
+    expected: FAIL
+
+  [Calling function () {\n    gl.compressedTexSubImage2D(gl.TEXTURE_2D, 0, 0, 0, 10, 10, COMPRESSED_RGB_S3TC_DXT1_EXT, new Uint8Array(8), null);\n  } should generate a 1280 error.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/webvtt/interfaces.html.ini b/testing/web-platform/meta/webvtt/interfaces.html.ini
index 8fed81605172..ceb09ef7ed95 100644
--- a/testing/web-platform/meta/webvtt/interfaces.html.ini
+++ b/testing/web-platform/meta/webvtt/interfaces.html.ini
@@ -78,3 +78,6 @@
   [VTTRegion interface: new VTTRegion() must inherit property "scroll" with the proper type (6)]
     expected: FAIL
 
+  [VTTRegion interface object name]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past.html.ini
index b0f53fb7b7fa..628f60bc5646 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past.html.ini
@@ -1,4 +1,3 @@
 [underline_timestamp_past.html]
   type: reftest
-  expected:
-    FAIL
+  expected: FAIL

From 16f9142afeca796f1f24d98f8ba3ae4126dc90c2 Mon Sep 17 00:00:00 2001
From: Christoph Kerschbaumer <mozilla@christophkerschbaumer.com>
Date: Fri, 18 Dec 2015 15:23:36 -0800
Subject: [PATCH 086/101] Bug 1233760 - Revert test_spdy.js to use AsyncOpen2
 (r=mcmanus)

---
 netwerk/test/unit/test_spdy.js | 37 +++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/netwerk/test/unit/test_spdy.js b/netwerk/test/unit/test_spdy.js
index c8a7eece4774..8e1aa8c2c049 100644
--- a/netwerk/test/unit/test_spdy.js
+++ b/netwerk/test/unit/test_spdy.js
@@ -1,6 +1,6 @@
 // test spdy/3.1
 
-Cu.import("resource://gre/modules/NetUtil.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
 
 // Generate a small and a large post with known pre-calculated md5 sums
 function generateContent(size) {
@@ -184,15 +184,24 @@ SpdyPostListener.prototype.onDataAvailable = function(request, ctx, stream, off,
 };
 
 function makeChan(url) {
-  return NetUtil.newChannel({uri: url, loadUsingSystemPrincipal: true})
-                .QueryInterface(Ci.nsIHttpChannel);
+  var ios = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
+  var chan = ios.newChannel2(url,
+                             null,
+                             null,
+                             null,      // aLoadingNode
+                             Services.scriptSecurityManager.getSystemPrincipal(),
+                             null,      // aTriggeringPrincipal
+                             Ci.nsILoadInfo.SEC_NORMAL,
+                             Ci.nsIContentPolicy.TYPE_OTHER).QueryInterface(Ci.nsIHttpChannel);
+
+  return chan;
 }
 
 // Make sure we make a spdy connection and both us and the server mark it as such
 function test_spdy_basic() {
   var chan = makeChan("https://localhost:" + serverPort + "/");
   var listener = new SpdyCheckListener();
-  chan.asyncOpen2(listener);
+  chan.asyncOpen(listener, null);
 }
 
 // Support for making sure XHR works over SPDY
@@ -240,7 +249,7 @@ function test_spdy_concurrent() {
   for (var i = 0; i < concurrent_listener.target; i++) {
     concurrent_channels[i] = makeChan("https://localhost:" + serverPort + "/750ms");
     concurrent_channels[i].loadFlags = Ci.nsIRequest.LOAD_BYPASS_CACHE;
-    concurrent_channels[i].asyncOpen2(concurrent_listener);
+    concurrent_channels[i].asyncOpen(concurrent_listener, null);
   }
 }
 
@@ -250,8 +259,8 @@ function test_spdy_multiplex() {
   var chan2 = makeChan("https://localhost:" + serverPort + "/multiplex2");
   var listener1 = new SpdyMultiplexListener();
   var listener2 = new SpdyMultiplexListener();
-  chan1.asyncOpen2(listener1);
-  chan2.asyncOpen2(listener2);
+  chan1.asyncOpen(listener1, null);
+  chan2.asyncOpen(listener2, null);
 }
 
 // Test to make sure we gateway non-standard headers properly
@@ -260,42 +269,42 @@ function test_spdy_header() {
   var hvalue = "Headers are fun";
   var listener = new SpdyHeaderListener(hvalue);
   chan.setRequestHeader("X-Test-Header", hvalue, false);
-  chan.asyncOpen2(listener);
+  chan.asyncOpen(listener, null);
 }
 
 function test_spdy_push1() {
   var chan = makeChan("https://localhost:" + serverPort + "/push");
   chan.loadGroup = loadGroup;
   var listener = new SpdyPushListener();
-  chan.asyncOpen2(listener);
+  chan.asyncOpen(listener, chan);
 }
 
 function test_spdy_push2() {
   var chan = makeChan("https://localhost:" + serverPort + "/push.js");
   chan.loadGroup = loadGroup;
   var listener = new SpdyPushListener();
-  chan.asyncOpen2(listener);
+  chan.asyncOpen(listener, chan);
 }
 
 function test_spdy_push3() {
   var chan = makeChan("https://localhost:" + serverPort + "/push2");
   chan.loadGroup = loadGroup;
   var listener = new SpdyPushListener();
-  chan.asyncOpen2(listener);
+  chan.asyncOpen(listener, chan);
 }
 
 function test_spdy_push4() {
   var chan = makeChan("https://localhost:" + serverPort + "/push2.js");
   chan.loadGroup = loadGroup;
   var listener = new SpdyPushListener();
-  chan.asyncOpen2(listener);
+  chan.asyncOpen(listener, chan);
 }
 
 // Make sure we handle GETs that cover more than 2 frames properly
 function test_spdy_big() {
   var chan = makeChan("https://localhost:" + serverPort + "/big");
   var listener = new SpdyBigListener();
-  chan.asyncOpen2(listener);
+  chan.asyncOpen(listener, null);
 }
 
 // Support for doing a POST
@@ -309,7 +318,7 @@ function do_post(content, chan, listener) {
 
   chan.requestMethod = "POST";
 
-  chan.asyncOpen2(listener);
+  chan.asyncOpen(listener, null);
 }
 
 // Make sure we can do a simple POST

From d3ff3353be23dfdfdb798dd8a8f7ee3daeaec7f5 Mon Sep 17 00:00:00 2001
From: Hannes Verschore <hv1989@gmail.com>
Date: Fri, 18 Dec 2015 18:32:24 -0500
Subject: [PATCH 087/101] Bug 1231170: TraceLogger - Use size in debugger
 instead of the current id to track last logged item, r=bbouvier

---
 .../jit-test/tests/tracelogger/bug1231170.js  |  3 +++
 js/src/vm/Debugger.cpp                        | 12 +++++-----
 js/src/vm/Debugger.h                          |  4 ++--
 js/src/vm/TraceLogging.h                      | 24 +++++++++----------
 4 files changed, 23 insertions(+), 20 deletions(-)
 create mode 100644 js/src/jit-test/tests/tracelogger/bug1231170.js

diff --git a/js/src/jit-test/tests/tracelogger/bug1231170.js b/js/src/jit-test/tests/tracelogger/bug1231170.js
new file mode 100644
index 000000000000..023e93eb6b91
--- /dev/null
+++ b/js/src/jit-test/tests/tracelogger/bug1231170.js
@@ -0,0 +1,3 @@
+var du = new Debugger();
+if (typeof du.drainTraceLogger === "function")
+    du.drainTraceLogger();
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index 0c5bdc8b60b9..57254de15498 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -377,10 +377,10 @@ Debugger::Debugger(JSContext* cx, NativeObject* dbg)
     objects(cx),
     environments(cx),
 #ifdef NIGHTLY_BUILD
-    traceLoggerLastDrainedId(0),
+    traceLoggerLastDrainedSize(0),
     traceLoggerLastDrainedIteration(0),
 #endif
-    traceLoggerScriptedCallsLastDrainedId(0),
+    traceLoggerScriptedCallsLastDrainedSize(0),
     traceLoggerScriptedCallsLastDrainedIteration(0)
 {
     assertSameCompartment(cx, dbg);
@@ -4402,9 +4402,9 @@ Debugger::drainTraceLogger(JSContext* cx, unsigned argc, Value* vp)
     size_t num;
     TraceLoggerThread* logger = TraceLoggerForMainThread(cx->runtime());
     bool lostEvents = logger->lostEvents(dbg->traceLoggerLastDrainedIteration,
-                                         dbg->traceLoggerLastDrainedId);
+                                         dbg->traceLoggerLastDrainedSize);
     EventEntry* events = logger->getEventsStartingAt(&dbg->traceLoggerLastDrainedIteration,
-                                                     &dbg->traceLoggerLastDrainedId,
+                                                     &dbg->traceLoggerLastDrainedSize,
                                                      &num);
 
     RootedObject array(cx, NewDenseEmptyArray(cx));
@@ -4497,10 +4497,10 @@ Debugger::drainTraceLoggerScriptCalls(JSContext* cx, unsigned argc, Value* vp)
     size_t num;
     TraceLoggerThread* logger = TraceLoggerForMainThread(cx->runtime());
     bool lostEvents = logger->lostEvents(dbg->traceLoggerScriptedCallsLastDrainedIteration,
-                                         dbg->traceLoggerScriptedCallsLastDrainedId);
+                                         dbg->traceLoggerScriptedCallsLastDrainedSize);
     EventEntry* events = logger->getEventsStartingAt(
                                          &dbg->traceLoggerScriptedCallsLastDrainedIteration,
-                                         &dbg->traceLoggerScriptedCallsLastDrainedId,
+                                         &dbg->traceLoggerScriptedCallsLastDrainedSize,
                                          &num);
 
     RootedObject array(cx, NewDenseEmptyArray(cx));
diff --git a/js/src/vm/Debugger.h b/js/src/vm/Debugger.h
index ff570c9be65c..a54458738599 100644
--- a/js/src/vm/Debugger.h
+++ b/js/src/vm/Debugger.h
@@ -448,10 +448,10 @@ class Debugger : private mozilla::LinkedListElement<Debugger>
      * lost events.
      */
 #ifdef NIGHTLY_BUILD
-    uint32_t traceLoggerLastDrainedId;
+    uint32_t traceLoggerLastDrainedSize;
     uint32_t traceLoggerLastDrainedIteration;
 #endif
-    uint32_t traceLoggerScriptedCallsLastDrainedId;
+    uint32_t traceLoggerScriptedCallsLastDrainedSize;
     uint32_t traceLoggerScriptedCallsLastDrainedIteration;
 
     class FrameRange;
diff --git a/js/src/vm/TraceLogging.h b/js/src/vm/TraceLogging.h
index 62cad44473db..270478c102d6 100644
--- a/js/src/vm/TraceLogging.h
+++ b/js/src/vm/TraceLogging.h
@@ -208,22 +208,22 @@ class TraceLoggerThread
     bool fail(JSContext* cx, const char* error);
 
   public:
-    // Given the previous iteration and lastEntryId, return an array of events
+    // Given the previous iteration and size, return an array of events
     // (there could be lost events). At the same time update the iteration and
-    // lastEntry and gives back how many events there are.
-    EventEntry* getEventsStartingAt(uint32_t* lastIteration, uint32_t* lastEntryId, size_t* num) {
+    // size and gives back how many events there are.
+    EventEntry* getEventsStartingAt(uint32_t* lastIteration, uint32_t* lastSize, size_t* num) {
         EventEntry* start;
         if (iteration_ == *lastIteration) {
-            MOZ_ASSERT(*lastEntryId < events.size());
-            *num = events.lastEntryId() - *lastEntryId;
-            start = events.data() + *lastEntryId + 1;
+            MOZ_ASSERT(*lastSize <= events.size());
+            *num = events.size() - *lastSize;
+            start = events.data() + *lastSize;
         } else {
             *num = events.size();
             start = events.data();
         }
 
         *lastIteration = iteration_;
-        *lastEntryId = events.lastEntryId();
+        *lastSize = events.size();
         return start;
     }
 
@@ -233,16 +233,16 @@ class TraceLoggerThread
                               const char** lineno, size_t* lineno_len, const char** colno,
                               size_t* colno_len);
 
-    bool lostEvents(uint32_t lastIteration, uint32_t lastEntryId) {
+    bool lostEvents(uint32_t lastIteration, uint32_t lastSize) {
         // If still logging in the same iteration, there are no lost events.
         if (lastIteration == iteration_) {
-            MOZ_ASSERT(lastEntryId < events.size());
+            MOZ_ASSERT(lastSize <= events.size());
             return false;
         }
 
-        // When proceeded to the next iteration and lastEntryId points to
-        // the maximum capacity there are no logs that are lost.
-        if (lastIteration + 1 == iteration_ && lastEntryId == events.capacity())
+        // If we are in a consecutive iteration we are only sure we didn't lose any events,
+        // when the lastSize equals the maximum size 'events' can get.
+        if (lastIteration == iteration_ - 1 && lastSize == CONTINUOUSSPACE_LIMIT)
             return false;
 
         return true;

From 921795f69864c7eb397b0b88fc31e27e88e815c6 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Fri, 18 Dec 2015 16:28:38 -0800
Subject: [PATCH 088/101] (no bug) Fix typo in grid style-struct comment:
 s/grid-columns-rows/grid-template-rows/. No review, DONTBUILD

---
 layout/style/nsStyleStruct.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
index e320a9907ebf..23a2e734dbbd 100644
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -1261,7 +1261,7 @@ public:
   nsRect        mImageRegion;           // [inherited] the rect to use within an image
 };
 
-// Computed value of the grid-template-columns or grid-columns-rows property
+// Computed value of the grid-template-columns or grid-template-rows property
 // (but *not* grid-template-areas.)
 // http://dev.w3.org/csswg/css-grid/#track-sizing
 //

From 3fd1ae8a411cb61c7fdf92a21d82bff1f98f5985 Mon Sep 17 00:00:00 2001
From: Blake Kaplan <mrbkap@gmail.com>
Date: Fri, 18 Dec 2015 17:16:13 -0800
Subject: [PATCH 089/101] Bug 1231695 - Enable this test. r=mccr8

---
 dom/base/test/browser.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dom/base/test/browser.ini b/dom/base/test/browser.ini
index c40cad9055e7..339a839117c2 100644
--- a/dom/base/test/browser.ini
+++ b/dom/base/test/browser.ini
@@ -12,7 +12,6 @@ support-files =
   file_use_counter_svg_fill_pattern_data.svg
 
 [browser_bug593387.js]
-skip-if = e10s # Bug ?????? - test directly touches content (contentWindow.iframe.addEventListener)
 [browser_bug902350.js]
 tags = mcb
 [browser_messagemanager_loadprocessscript.js]

From 1eabadf7aa834e2d7730ef0942b0ee48d22782f8 Mon Sep 17 00:00:00 2001
From: Dave Hylands <dhylands@mozilla.com>
Date: Fri, 18 Dec 2015 17:17:46 -0800
Subject: [PATCH 090/101] Bug 1232506: Make dom/devicestorage really work with
 e10s. r=alchen

---
 dom/devicestorage/DeviceStorageStatics.cpp | 62 +++++++++++++++++++++-
 dom/devicestorage/DeviceStorageStatics.h   |  9 ++++
 dom/ipc/ContentChild.cpp                   | 10 ++++
 dom/ipc/ContentChild.h                     |  1 +
 dom/ipc/ContentParent.cpp                  |  5 ++
 dom/ipc/PContent.ipdl                      | 11 ++++
 6 files changed, 96 insertions(+), 2 deletions(-)

diff --git a/dom/devicestorage/DeviceStorageStatics.cpp b/dom/devicestorage/DeviceStorageStatics.cpp
index d8fed46d4ad3..5289154b60c9 100644
--- a/dom/devicestorage/DeviceStorageStatics.cpp
+++ b/dom/devicestorage/DeviceStorageStatics.cpp
@@ -271,6 +271,13 @@ DeviceStorageStatics::DumpDirs()
     nullptr
   };
 
+  const char* ptStr;
+  if (XRE_IsParentProcess()) {
+    ptStr = "parent";
+  } else {
+    ptStr = "child";
+  }
+
   for (uint32_t i = 0; i < TYPE_COUNT; ++i) {
     MOZ_ASSERT(storageTypes[i]);
 
@@ -278,8 +285,8 @@ DeviceStorageStatics::DumpDirs()
     if (mDirs[i]) {
       mDirs[i]->GetPath(path);
     }
-    DS_LOG_INFO("%s: '%s'",
-      storageTypes[i], NS_LossyConvertUTF16toASCII(path).get());
+    DS_LOG_INFO("(%s) %s: '%s'",
+      ptStr, storageTypes[i], NS_LossyConvertUTF16toASCII(path).get());
   }
 #endif
 }
@@ -297,6 +304,47 @@ DeviceStorageStatics::Shutdown()
   Preferences::RemoveObserver(this, kPrefWritableName);
 }
 
+/* static */ void
+DeviceStorageStatics::GetDeviceStorageAreasForIPC(
+  DeviceStorageAreaInfo& aAreaInfo)
+{
+  MOZ_ASSERT(XRE_IsParentProcess());
+  MOZ_ASSERT(NS_IsMainThread());
+
+  InitializeDirs();
+
+  GetDirPath(TYPE_APPS,     aAreaInfo.apps());
+  GetDirPath(TYPE_CRASHES,  aAreaInfo.crashes());
+  GetDirPath(TYPE_PICTURES, aAreaInfo.pictures());
+  GetDirPath(TYPE_VIDEOS,   aAreaInfo.videos());
+  GetDirPath(TYPE_MUSIC,    aAreaInfo.music());
+  GetDirPath(TYPE_SDCARD,   aAreaInfo.sdcard());
+}
+
+/* static */ void
+DeviceStorageStatics::RecvDeviceStorageAreasFromParent(
+  const DeviceStorageAreaInfo& aAreaInfo)
+{
+  if (XRE_IsParentProcess()) {
+    // We are the parent. Therefore our info is already correct.
+    return;
+  }
+
+  StaticMutexAutoLock lock(sMutex);
+  if (NS_WARN_IF(!sInstance)) {
+    return;
+  }
+
+  NS_NewLocalFile(aAreaInfo.apps(),     true, getter_AddRefs(sInstance->mDirs[TYPE_APPS]));
+  NS_NewLocalFile(aAreaInfo.crashes(),  true, getter_AddRefs(sInstance->mDirs[TYPE_CRASHES]));
+  NS_NewLocalFile(aAreaInfo.pictures(), true, getter_AddRefs(sInstance->mDirs[TYPE_PICTURES]));
+  NS_NewLocalFile(aAreaInfo.videos(),   true, getter_AddRefs(sInstance->mDirs[TYPE_VIDEOS]));
+  NS_NewLocalFile(aAreaInfo.music(),    true, getter_AddRefs(sInstance->mDirs[TYPE_MUSIC]));
+  NS_NewLocalFile(aAreaInfo.sdcard(),   true, getter_AddRefs(sInstance->mDirs[TYPE_SDCARD]));
+
+  sInstance->mInitialized = true;
+}
+
 /* static */ already_AddRefed<nsIFile>
 DeviceStorageStatics::GetDir(DeviceStorageType aType)
 {
@@ -332,6 +380,16 @@ DeviceStorageStatics::GetDir(DeviceStorageType aType)
   return file.forget();
 }
 
+/* static */ void
+DeviceStorageStatics::GetDirPath(DeviceStorageType aType, nsString& aDirPath)
+{
+  aDirPath.Truncate();
+  nsCOMPtr<nsIFile> file = GetDir(aType);
+  if (file) {
+    file->GetPath(aDirPath);
+  }
+}
+
 /* static */ bool
 DeviceStorageStatics::HasOverrideRootDir()
 {
diff --git a/dom/devicestorage/DeviceStorageStatics.h b/dom/devicestorage/DeviceStorageStatics.h
index 5fa7d9b4164e..2c115ee011d0 100644
--- a/dom/devicestorage/DeviceStorageStatics.h
+++ b/dom/devicestorage/DeviceStorageStatics.h
@@ -8,7 +8,12 @@
 #define mozilla_dom_devicestorage_DeviceStorageStatics_h
 
 #include "mozilla/Mutex.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/StaticMutex.h"
+#include "mozilla/StaticPtr.h"
+#include "nsArrayUtils.h"
 
+class nsString;
 class nsDOMDeviceStorage;
 class DeviceStorageFile;
 #ifdef MOZ_WIDGET_GONK
@@ -35,6 +40,9 @@ public:
   static void GetWritableName(nsString& aName);
   static void SetWritableName(const nsAString& aName);
 
+  static void GetDeviceStorageAreasForIPC(DeviceStorageAreaInfo& aAreaInfo);
+  static void RecvDeviceStorageAreasFromParent(const DeviceStorageAreaInfo& aAreaInfo);
+
   static bool HasOverrideRootDir();
   static already_AddRefed<nsIFile> GetAppsDir();
   static already_AddRefed<nsIFile> GetCrashesDir();
@@ -56,6 +64,7 @@ private:
   };
 
   static already_AddRefed<nsIFile> GetDir(DeviceStorageType aType);
+  static void GetDirPath(DeviceStorageType aType, nsString& aString);
 
   DeviceStorageStatics();
   virtual ~DeviceStorageStatics();
diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
index 5f504dfd9676..76570bf941d0 100644
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -17,6 +17,7 @@
 #include "BlobChild.h"
 #include "CrashReporterChild.h"
 #include "GeckoProfiler.h"
+#include "DeviceStorageStatics.h"
 #include "TabChild.h"
 #include "HandlerServiceChild.h"
 
@@ -2594,6 +2595,15 @@ ContentChild::RecvVolumes(nsTArray<VolumeInfo>&& aVolumes)
     return true;
 }
 
+bool
+ContentChild::RecvDeviceStorageAreas(const DeviceStorageAreaInfo& areaInfo)
+{
+#if !defined(MOZ_WIDGET_GONK)
+    DeviceStorageStatics::RecvDeviceStorageAreasFromParent(areaInfo);
+#endif
+    return true;
+}
+
 bool
 ContentChild::RecvFilePathUpdate(const nsString& aStorageType,
                                  const nsString& aStorageName,
diff --git a/dom/ipc/ContentChild.h b/dom/ipc/ContentChild.h
index 05c16daf9c2f..180693ffc8d3 100644
--- a/dom/ipc/ContentChild.h
+++ b/dom/ipc/ContentChild.h
@@ -383,6 +383,7 @@ public:
     virtual bool RecvLastPrivateDocShellDestroyed() override;
 
     virtual bool RecvVolumes(InfallibleTArray<VolumeInfo>&& aVolumes) override;
+    virtual bool RecvDeviceStorageAreas(const DeviceStorageAreaInfo& areaInfo) override;
     virtual bool RecvFilePathUpdate(const nsString& aStorageType,
                                     const nsString& aStorageName,
                                     const nsString& aPath,
diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index dd7869147376..8f48c4a117ca 100755
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -30,6 +30,7 @@
 #include "AudioChannelService.h"
 #include "BlobParent.h"
 #include "CrashReporterParent.h"
+#include "DeviceStorageStatics.h"
 #include "GMPServiceParent.h"
 #include "HandlerServiceParent.h"
 #include "IHistory.h"
@@ -1606,6 +1607,10 @@ ContentParent::ForwardKnownInfo()
         vs->GetVolumesForIPC(&volumeInfo);
         Unused << SendVolumes(volumeInfo);
     }
+#else
+    DeviceStorageAreaInfo areaInfo;
+    DeviceStorageStatics::GetDeviceStorageAreasForIPC(areaInfo);
+    Unused << SendDeviceStorageAreas(areaInfo);
 #endif /* MOZ_WIDGET_GONK */
 
     nsCOMPtr<nsISystemMessagesInternal> systemMessenger =
diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl
index 077a020bc0cd..68ceb04c9e3a 100644
--- a/dom/ipc/PContent.ipdl
+++ b/dom/ipc/PContent.ipdl
@@ -364,6 +364,15 @@ struct VolumeInfo {
   bool isHotSwappable;
 };
 
+struct DeviceStorageAreaInfo {
+  nsString music;
+  nsString pictures;
+  nsString videos;
+  nsString sdcard;
+  nsString apps;
+  nsString crashes;
+};
+
 struct ClipboardCapabilities {
   bool supportsSelectionClipboard;
   bool supportsFindClipboard;
@@ -595,6 +604,8 @@ child:
 
     Volumes(VolumeInfo[] volumes);
 
+    DeviceStorageAreas(DeviceStorageAreaInfo areaInfo);
+
     FlushMemory(nsString reason);
 
     GarbageCollect();

From 1c0dc1a969ec71e14bc0ae3cc81d04b14f238f2a Mon Sep 17 00:00:00 2001
From: Kit Cambridge <kcambridge@mozilla.com>
Date: Mon, 14 Dec 2015 16:28:19 -0800
Subject: [PATCH 091/101] Bug 1205137 - Add a `PushSubscription` serializer.
 r=mt,smaug

--HG--
extra : commitid : F5xjqIFcach
extra : rebase_source : 61b0a0cbae318f7afc51752fc31a7133b8abd15c
---
 dom/push/PushManager.cpp           | 33 ++++++++++++++++++++
 dom/push/PushManager.h             |  6 ++++
 dom/push/test/test_data.html       | 41 +++++++++++++++++++++++++
 dom/webidl/PushSubscription.webidl | 16 +++++++++-
 xpcom/io/Base64.cpp                | 48 ++++++++++++++++++++++++++++++
 xpcom/io/Base64.h                  |  8 +++++
 6 files changed, 151 insertions(+), 1 deletion(-)

diff --git a/dom/push/PushManager.cpp b/dom/push/PushManager.cpp
index c4a50c952a7e..7a659df5e4fa 100644
--- a/dom/push/PushManager.cpp
+++ b/dom/push/PushManager.cpp
@@ -6,6 +6,7 @@
 
 #include "mozilla/dom/PushManager.h"
 
+#include "mozilla/Base64.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Services.h"
 #include "mozilla/unused.h"
@@ -65,6 +66,26 @@ GetPermissionState(nsIPrincipal* aPrincipal,
   return NS_OK;
 }
 
+void
+SubscriptionToJSON(PushSubscriptionJSON& aJSON, const nsString& aEndpoint,
+                   const nsTArray<uint8_t>& aRawP256dhKey,
+                   const nsTArray<uint8_t>& aAuthSecret)
+{
+  aJSON.mEndpoint.Construct();
+  aJSON.mEndpoint.Value() = aEndpoint;
+
+  aJSON.mKeys.mP256dh.Construct();
+  nsresult rv = Base64URLEncode(aRawP256dhKey.Length(),
+                                aRawP256dhKey.Elements(),
+                                aJSON.mKeys.mP256dh.Value());
+  Unused << NS_WARN_IF(NS_FAILED(rv));
+
+  aJSON.mKeys.mAuth.Construct();
+  rv = Base64URLEncode(aAuthSecret.Length(), aAuthSecret.Elements(),
+                       aJSON.mKeys.mAuth.Value());
+  Unused << NS_WARN_IF(NS_FAILED(rv));
+}
+
 } // anonymous namespace
 
 class UnsubscribeResultCallback final : public nsIUnsubscribeResultCallback
@@ -123,6 +144,12 @@ PushSubscription::Unsubscribe(ErrorResult& aRv)
   return p.forget();
 }
 
+void
+PushSubscription::ToJSON(PushSubscriptionJSON& aJSON)
+{
+  SubscriptionToJSON(aJSON, mEndpoint, mRawP256dhKey, mAuthSecret);
+}
+
 PushSubscription::PushSubscription(nsIGlobalObject* aGlobal,
                                    const nsAString& aEndpoint,
                                    const nsAString& aScope,
@@ -507,6 +534,12 @@ WorkerPushSubscription::Unsubscribe(ErrorResult &aRv)
   return p.forget();
 }
 
+void
+WorkerPushSubscription::ToJSON(PushSubscriptionJSON& aJSON)
+{
+  SubscriptionToJSON(aJSON, mEndpoint, mRawP256dhKey, mAuthSecret);
+}
+
 NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_0(WorkerPushSubscription)
 
 NS_IMPL_CYCLE_COLLECTING_ADDREF(WorkerPushSubscription)
diff --git a/dom/push/PushManager.h b/dom/push/PushManager.h
index 4f2c7bb6b77f..2870bca29711 100644
--- a/dom/push/PushManager.h
+++ b/dom/push/PushManager.h
@@ -104,6 +104,9 @@ public:
   already_AddRefed<Promise>
   Unsubscribe(ErrorResult& aRv);
 
+  void
+  ToJSON(PushSubscriptionJSON& aJSON);
+
 protected:
   ~PushSubscription();
 
@@ -197,6 +200,9 @@ public:
   already_AddRefed<Promise>
   Unsubscribe(ErrorResult& aRv);
 
+  void
+  ToJSON(PushSubscriptionJSON& aJSON);
+
 protected:
   ~WorkerPushSubscription();
 
diff --git a/dom/push/test/test_data.html b/dom/push/test/test_data.html
index 668389c24329..119f9586b6ca 100644
--- a/dom/push/test/test_data.html
+++ b/dom/push/test/test_data.html
@@ -77,6 +77,47 @@ http://creativecommons.org/licenses/publicdomain/
     });
   }
 
+  function base64UrlDecode(s) {
+    s = s.replace(/-/g, '+').replace(/_/g, '/');
+
+    // Replace padding if it was stripped by the sender.
+    // See http://tools.ietf.org/html/rfc4648#section-4
+    switch (s.length % 4) {
+      case 0:
+        break; // No pad chars in this case
+      case 2:
+        s += '==';
+        break; // Two pad chars
+      case 3:
+        s += '=';
+        break; // One pad char
+      default:
+        throw new Error('Illegal base64url string!');
+    }
+
+    // With correct padding restored, apply the standard base64 decoder
+    var decoded = atob(s);
+
+    var array = new Uint8Array(new ArrayBuffer(decoded.length));
+    for (var i = 0; i < decoded.length; i++) {
+      array[i] = decoded.charCodeAt(i);
+    }
+    return array;
+  }
+
+  add_task(function* compareJSONSubscription() {
+    var json = pushSubscription.toJSON();
+    is(json.endpoint, pushSubscription.endpoint, "Wrong endpoint");
+
+    ["p256dh", "auth"].forEach(keyName => {
+      isDeeply(
+        base64UrlDecode(json.keys[keyName]),
+        new Uint8Array(pushSubscription.getKey(keyName)),
+        "Mismatched Base64-encoded key: " + keyName
+      );
+    });
+  });
+
   add_task(function* comparePublicKey() {
     var data = yield sendRequestToWorker({ type: "publicKey" });
     var p256dhKey = new Uint8Array(pushSubscription.getKey("p256dh"));
diff --git a/dom/webidl/PushSubscription.webidl b/dom/webidl/PushSubscription.webidl
index 5d7803e685d2..e8536a58f188 100644
--- a/dom/webidl/PushSubscription.webidl
+++ b/dom/webidl/PushSubscription.webidl
@@ -15,6 +15,18 @@ enum PushEncryptionKeyName
   "auth"
 };
 
+dictionary PushSubscriptionKeys
+{
+  ByteString p256dh;
+  ByteString auth;
+};
+
+dictionary PushSubscriptionJSON
+{
+  USVString endpoint;
+  PushSubscriptionKeys keys;
+};
+
 [Exposed=(Window,Worker), Func="nsContentUtils::PushEnabled",
  ChromeConstructor(DOMString pushEndpoint, DOMString scope,
                    ArrayBuffer? key, ArrayBuffer? authSecret)]
@@ -24,7 +36,9 @@ interface PushSubscription
     ArrayBuffer? getKey(PushEncryptionKeyName name);
     [Throws, UseCounter]
     Promise<boolean> unsubscribe();
-    jsonifier;
+
+    // Implements the custom serializer specified in Push API, section 9.
+    PushSubscriptionJSON toJSON();
 
     // Used to set the principal from the JS implemented PushManager.
     [Exposed=Window,ChromeOnly]
diff --git a/xpcom/io/Base64.cpp b/xpcom/io/Base64.cpp
index 0f19b36b1397..cc1707187b04 100644
--- a/xpcom/io/Base64.cpp
+++ b/xpcom/io/Base64.cpp
@@ -225,6 +225,9 @@ EncodeInputStream(nsIInputStream* aInputStream,
   return NS_OK;
 }
 
+static const char kBase64URLAlphabet[] =
+  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
+
 } // namespace
 
 namespace mozilla {
@@ -355,4 +358,49 @@ Base64Decode(const nsAString& aBinaryData, nsAString& aString)
   return rv;
 }
 
+nsresult
+Base64URLEncode(uint32_t aLength, const uint8_t* aData, nsACString& aString)
+{
+  // Don't encode empty strings.
+  if (aLength == 0) {
+    aString.Truncate();
+    return NS_OK;
+  }
+
+  // Check for overflow.
+  if ((static_cast<uint64_t>(aLength) * 6 + 7) / 8 > UINT32_MAX) {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (!aString.SetLength((aLength * 8 + 5) / 6, fallible)) {
+    aString.Truncate();
+    return NS_ERROR_FAILURE;
+  }
+
+  char* rawBuffer = aString.BeginWriting();
+
+  uint32_t index = 0;
+  for (; index + 3 <= aLength; index += 3) {
+    *rawBuffer++ = kBase64URLAlphabet[aData[index] >> 2];
+    *rawBuffer++ = kBase64URLAlphabet[((aData[index] & 0x3) << 4) |
+                                      (aData[index + 1] >> 4)];
+    *rawBuffer++ = kBase64URLAlphabet[((aData[index + 1] & 0xf) << 2) |
+                                      (aData[index + 2] >> 6)];
+    *rawBuffer++ = kBase64URLAlphabet[aData[index + 2] & 0x3f];
+  }
+
+  uint32_t remaining = aLength - index;
+  if (remaining == 1) {
+    *rawBuffer++ = kBase64URLAlphabet[aData[index] >> 2];
+    *rawBuffer++ = kBase64URLAlphabet[((aData[index] & 0x3) << 4)];
+  } else if (remaining == 2) {
+    *rawBuffer++ = kBase64URLAlphabet[aData[index] >> 2];
+    *rawBuffer++ = kBase64URLAlphabet[((aData[index] & 0x3) << 4) |
+                                      (aData[index + 1] >> 4)];
+    *rawBuffer++ = kBase64URLAlphabet[((aData[index + 1] & 0xf) << 2)];
+  }
+
+  return NS_OK;
+}
+
 } // namespace mozilla
diff --git a/xpcom/io/Base64.h b/xpcom/io/Base64.h
index c9828b985933..0a15f6be04ff 100644
--- a/xpcom/io/Base64.h
+++ b/xpcom/io/Base64.h
@@ -34,6 +34,14 @@ Base64Decode(const nsACString& aBinaryData, nsACString& aString);
 nsresult
 Base64Decode(const nsAString& aBinaryData, nsAString& aString);
 
+/**
+ * Converts |aData| to an unpadded, Base64 URL-encoded string per RFC 4648.
+ * Aims to encode the data in constant time. The caller may free |aData| once
+ * this function returns.
+ */
+nsresult
+Base64URLEncode(uint32_t aLength, const uint8_t* aData, nsACString& aString);
+
 } // namespace mozilla
 
 #endif

From 8a84e958bfaa6bfbc0becceae995f2ee56100734 Mon Sep 17 00:00:00 2001
From: Jeff Muizelaar <jmuizelaar@mozilla.com>
Date: Fri, 18 Dec 2015 22:05:11 -0500
Subject: [PATCH 092/101] Bug 1233549. Disallow ES3 compressed texture formats.
 r=jgilbert

This fixes assertion failures on platforms that don't have
these formats. This is a temporary fix until we iron out
this issue in the spec. It's easier to add this later than
it is to take it away.
---
 dom/canvas/WebGLFormats.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dom/canvas/WebGLFormats.cpp b/dom/canvas/WebGLFormats.cpp
index 41e09c79bb07..1e1b4ede7548 100644
--- a/dom/canvas/WebGLFormats.cpp
+++ b/dom/canvas/WebGLFormats.cpp
@@ -785,7 +785,7 @@ FormatUsageAuthority::CreateForWebGL2(gl::GLContext* gl)
 
     // GLES 3.0.4, p147, table 3.19
     // GLES 3.0.4, p286+, $C.1 "ETC Compressed Texture Image Formats"
-
+#if ALLOW_ES3_FORMATS
     // Note that all compressed texture formats are filterable:
     // GLES 3.0.4 p161:
     // "[A] texture is complete unless any of the following conditions hold true:
@@ -805,7 +805,7 @@ FormatUsageAuthority::CreateForWebGL2(gl::GLContext* gl)
     fnAllowES3TexFormat(FOO(COMPRESSED_SIGNED_RG11_EAC               ), false, true);
     fnAllowES3TexFormat(FOO(COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 ), false, true);
     fnAllowES3TexFormat(FOO(COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2), false, true);
-
+#endif
 #undef FOO
 
     // GLES 3.0.4, p206, "Required Renderbuffer Formats":

From d2cef8692f79bd099b577b60432d2085f09fc484 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Sat, 19 Dec 2015 09:40:06 -0500
Subject: [PATCH 093/101] Bug 1233845 - Report an interception error and cancel
 the HTTP channel when encountering a known topcrash situation. r=ehsan

---
 netwerk/protocol/http/HttpChannelChild.cpp  | 28 +++++++++++++++++++++
 netwerk/protocol/http/HttpChannelChild.h    |  2 ++
 netwerk/protocol/http/HttpChannelParent.cpp |  6 +++++
 netwerk/protocol/http/PHttpChannel.ipdl     |  3 +++
 4 files changed, 39 insertions(+)

diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp
index 0481bb734f13..f79f2578fb0e 100644
--- a/netwerk/protocol/http/HttpChannelChild.cpp
+++ b/netwerk/protocol/http/HttpChannelChild.cpp
@@ -2569,5 +2569,33 @@ HttpChannelChild::RecvIssueDeprecationWarning(const uint32_t& warning,
   return true;
 }
 
+bool
+HttpChannelChild::RecvReportRedirectionError()
+{
+  nsCOMPtr<nsIURI> uri;
+  GetURI(getter_AddRefs(uri));
+  nsCString spec;
+  uri->GetSpec(spec);
+  nsString wideSpec = NS_ConvertUTF8toUTF16(spec);
+
+  nsCOMPtr<nsIDocument> doc;
+  GetCallback(doc);
+
+  nsString msg = NS_LITERAL_STRING("Failed to load '");
+  msg.Append(wideSpec);
+  msg.AppendLiteral("'. A Service Worker for a multiprocess window encountered a redirection ");
+  msg.AppendLiteral("response, which is currently unsupported and tracked in bug 1219469.");
+  nsContentUtils::ReportToConsoleNonLocalized(msg,
+                                              nsIScriptError::errorFlag,
+                                              NS_LITERAL_CSTRING("Service Worker Interception"),
+                                              doc,
+                                              uri,
+                                              EmptyString(),
+                                              0,
+                                              0);
+  Cancel(NS_ERROR_NOT_AVAILABLE);
+  return true;
+}
+
 } // namespace net
 } // namespace mozilla
diff --git a/netwerk/protocol/http/HttpChannelChild.h b/netwerk/protocol/http/HttpChannelChild.h
index 438c296af521..fdd2cd3b894a 100644
--- a/netwerk/protocol/http/HttpChannelChild.h
+++ b/netwerk/protocol/http/HttpChannelChild.h
@@ -154,6 +154,8 @@ protected:
   bool RecvIssueDeprecationWarning(const uint32_t& warning,
                                    const bool& asError) override;
 
+  bool RecvReportRedirectionError() override;
+
   bool GetAssociatedContentSecurity(nsIAssociatedContentSecurity** res = nullptr);
   virtual void DoNotifyListenerCleanup() override;
 
diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp
index 396a79a1fa03..f717bf0a7416 100644
--- a/netwerk/protocol/http/HttpChannelParent.cpp
+++ b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -259,6 +259,12 @@ HttpChannelParent::SynthesizeResponse(nsIInterceptedChannel* aChannel)
     return;
   }
 
+  if (!mSynthesizedResponseHead) {
+    // Near-term crash fix for bug 1219469.
+    mozilla::Unused << SendReportRedirectionError();
+    return;
+  }
+
   aChannel->SynthesizeStatus(mSynthesizedResponseHead->Status(),
                              mSynthesizedResponseHead->StatusText());
   nsCOMPtr<nsIHttpHeaderVisitor> visitor = new HeaderVisitor(aChannel);
diff --git a/netwerk/protocol/http/PHttpChannel.ipdl b/netwerk/protocol/http/PHttpChannel.ipdl
index 0002376bd41b..6d4febcd327d 100644
--- a/netwerk/protocol/http/PHttpChannel.ipdl
+++ b/netwerk/protocol/http/PHttpChannel.ipdl
@@ -156,6 +156,9 @@ child:
 
   // Tell the child to issue a deprecation warning.
   IssueDeprecationWarning(uint32_t warning, bool asError);
+
+  // Tell the child to report an error processing a redirection.
+  ReportRedirectionError();
 };
 
 

From c2d5cae2698a5da6d008d7dbe6a2f0aeecf135cb Mon Sep 17 00:00:00 2001
From: Dragana Damjanovic <dd.mozilla@gmail.com>
Date: Sat, 19 Dec 2015 16:11:39 -0500
Subject: [PATCH 094/101] Bug 664163 - Fix Get(Local|Remote)(Address|Port) in
 HttpChannelChild. r=jduell

---
 netwerk/protocol/http/HttpChannelChild.cpp  | 35 +---------
 netwerk/protocol/http/HttpChannelChild.h    |  4 --
 netwerk/test/unit/test_getHost.js           | 75 +++++++++++++++++++++
 netwerk/test/unit/test_traceable_channel.js |  2 -
 netwerk/test/unit/xpcshell.ini              |  1 +
 netwerk/test/unit_ipc/test_getHost_wrap.js  |  3 +
 netwerk/test/unit_ipc/xpcshell.ini          |  1 +
 7 files changed, 82 insertions(+), 39 deletions(-)
 create mode 100644 netwerk/test/unit/test_getHost.js
 create mode 100644 netwerk/test/unit_ipc/test_getHost_wrap.js

diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp
index f79f2578fb0e..93a8db0d6c6f 100644
--- a/netwerk/protocol/http/HttpChannelChild.cpp
+++ b/netwerk/protocol/http/HttpChannelChild.cpp
@@ -457,6 +457,8 @@ HttpChannelChild::OnStartRequest(const nsresult& channelStatus,
   mCacheEntryAvailable = cacheEntryAvailable;
   mCacheExpirationTime = cacheExpirationTime;
   mCachedCharset = cachedCharset;
+  mSelfAddr = selfAddr;
+  mPeerAddr = peerAddr;
 
   AutoEventEnqueuer ensureSerialDispatch(mEventQ);
 
@@ -486,9 +488,6 @@ HttpChannelChild::OnStartRequest(const nsresult& channelStatus,
   mTracingEnabled = false;
 
   DoOnStartRequest(this, mListenerContext);
-
-  mSelfAddr = selfAddr;
-  mPeerAddr = peerAddr;
 }
 
 void
@@ -1991,36 +1990,6 @@ HttpChannelChild::SetupFallbackChannel(const char *aFallbackKey)
   DROP_DEAD();
 }
 
-// The next four _should_ be implemented, but we need to figure out how
-// to transfer the data from the chrome process first.
-
-NS_IMETHODIMP
-HttpChannelChild::GetRemoteAddress(nsACString & _result)
-{
-  return NS_ERROR_NOT_AVAILABLE;
-}
-
-NS_IMETHODIMP
-HttpChannelChild::GetRemotePort(int32_t * _result)
-{
-  NS_ENSURE_ARG_POINTER(_result);
-  return NS_ERROR_NOT_AVAILABLE;
-}
-
-NS_IMETHODIMP
-HttpChannelChild::GetLocalAddress(nsACString & _result)
-{
-  return NS_ERROR_NOT_AVAILABLE;
-}
-
-NS_IMETHODIMP
-HttpChannelChild::GetLocalPort(int32_t * _result)
-{
-  NS_ENSURE_ARG_POINTER(_result);
-  return NS_ERROR_NOT_AVAILABLE;
-}
-
-
 //-----------------------------------------------------------------------------
 // HttpChannelChild::nsICacheInfoChannel
 //-----------------------------------------------------------------------------
diff --git a/netwerk/protocol/http/HttpChannelChild.h b/netwerk/protocol/http/HttpChannelChild.h
index fdd2cd3b894a..075ddb29c472 100644
--- a/netwerk/protocol/http/HttpChannelChild.h
+++ b/netwerk/protocol/http/HttpChannelChild.h
@@ -86,10 +86,6 @@ public:
   NS_IMETHOD GetProtocolVersion(nsACString& aProtocolVersion) override;
   // nsIHttpChannelInternal
   NS_IMETHOD SetupFallbackChannel(const char *aFallbackKey) override;
-  NS_IMETHOD GetLocalAddress(nsACString& addr) override;
-  NS_IMETHOD GetLocalPort(int32_t* port) override;
-  NS_IMETHOD GetRemoteAddress(nsACString& addr) override;
-  NS_IMETHOD GetRemotePort(int32_t* port) override;
   NS_IMETHOD ForceIntercepted(uint64_t aInterceptionID) override;
   // nsISupportsPriority
   NS_IMETHOD SetPriority(int32_t value) override;
diff --git a/netwerk/test/unit/test_getHost.js b/netwerk/test/unit/test_getHost.js
new file mode 100644
index 000000000000..163ee510f076
--- /dev/null
+++ b/netwerk/test/unit/test_getHost.js
@@ -0,0 +1,75 @@
+// Test getLocalHost/getLocalPort and getRemoteHost/getRemotePort.
+
+Cu.import("resource://testing-common/httpd.js");
+Cu.import("resource://gre/modules/Services.jsm");
+
+var httpserver = new HttpServer();
+httpserver.start(-1);
+const PORT = httpserver.identity.primaryPort;
+
+var gotOnStartRequest = false;
+
+function CheckGetHostListener() {}
+
+CheckGetHostListener.prototype = {
+  onStartRequest: function(request, context) {
+    dump("*** listener onStartRequest\n");
+
+    gotOnStartRequest = true;
+
+    request.QueryInterface(Components.interfaces.nsIHttpChannelInternal);
+    try {
+      do_check_eq(request.localAddress, "127.0.0.1");
+      do_check_eq(request.localPort > 0, true);
+      do_check_neq(request.localPort, PORT);
+      do_check_eq(request.remoteAddress, "127.0.0.1");
+      do_check_eq(request.remotePort, PORT);
+    } catch (e) {
+      do_check_true(0, "Get local/remote host/port throws an error!");
+    }
+  },
+
+  onStopRequest: function(request, context, statusCode) {
+    dump("*** listener onStopRequest\n");
+
+    do_check_eq(gotOnStartRequest, true);
+    httpserver.stop(do_test_finished);
+  },
+
+  QueryInterface: function(iid) {
+    if (iid.equals(Components.interfaces.nsIRequestObserver) ||
+        iid.equals(Components.interfaces.nsISupports)
+        )
+      return this;
+    throw Components.results.NS_NOINTERFACE;
+  },
+}
+
+function make_channel(url) {
+  var ios = Cc["@mozilla.org/network/io-service;1"].
+    getService(Ci.nsIIOService);
+  return ios.newChannel2(url,
+                         null,
+                         null,
+                         null,      // aLoadingNode
+                         Services.scriptSecurityManager.getSystemPrincipal(),
+                         null,      // aTriggeringPrincipal
+                         Ci.nsILoadInfo.SEC_NORMAL,
+                         Ci.nsIContentPolicy.TYPE_OTHER)
+            .QueryInterface(Components.interfaces.nsIHttpChannel);
+}
+
+function test_handler(metadata, response) {
+  response.setHeader("Content-Type", "text/html", false);
+  response.setStatusLine(metadata.httpVersion, 200, "OK");
+  var responseBody = "blah blah";
+  response.bodyOutputStream.write(responseBody, responseBody.length);
+}
+
+function run_test() {
+  httpserver.registerPathHandler("/testdir", test_handler);
+
+  var channel = make_channel("http://localhost:" + PORT + "/testdir");
+  channel.asyncOpen(new CheckGetHostListener(), null);
+  do_test_pending();
+}
diff --git a/netwerk/test/unit/test_traceable_channel.js b/netwerk/test/unit/test_traceable_channel.js
index 1687186c2b03..b9bf1fb022e3 100644
--- a/netwerk/test/unit/test_traceable_channel.js
+++ b/netwerk/test/unit/test_traceable_channel.js
@@ -27,13 +27,11 @@ TracingListener.prototype = {
     request.QueryInterface(Components.interfaces.nsIHttpChannelInternal);
 
 // local/remote addresses broken in e10s: disable for now
-/*
     do_check_eq(request.localAddress, "127.0.0.1");
     do_check_eq(request.localPort > 0, true);
     do_check_neq(request.localPort, PORT);
     do_check_eq(request.remoteAddress, "127.0.0.1");
     do_check_eq(request.remotePort, PORT);
-*/
 
     // Make sure listener can't be replaced after OnStartRequest was called.
     request.QueryInterface(Components.interfaces.nsITraceableChannel);
diff --git a/netwerk/test/unit/xpcshell.ini b/netwerk/test/unit/xpcshell.ini
index 75f283acf81e..dd25b7aff50d 100644
--- a/netwerk/test/unit/xpcshell.ini
+++ b/netwerk/test/unit/xpcshell.ini
@@ -342,6 +342,7 @@ firefox-appdir = browser
 [test_packaged_app_service_paths.js]
 [test_bug1195415.js]
 [test_cookie_blacklist.js]
+[test_getHost.js]
 [test_packaged_app_bug1214079.js]
 [test_bug412457.js]
 
diff --git a/netwerk/test/unit_ipc/test_getHost_wrap.js b/netwerk/test/unit_ipc/test_getHost_wrap.js
new file mode 100644
index 000000000000..f74ab7d15248
--- /dev/null
+++ b/netwerk/test/unit_ipc/test_getHost_wrap.js
@@ -0,0 +1,3 @@
+function run_test() {
+  run_test_in_child("../unit/test_getHost.js");
+}
diff --git a/netwerk/test/unit_ipc/xpcshell.ini b/netwerk/test/unit_ipc/xpcshell.ini
index 7b70f1316654..590544a538c7 100644
--- a/netwerk/test/unit_ipc/xpcshell.ini
+++ b/netwerk/test/unit_ipc/xpcshell.ini
@@ -41,3 +41,4 @@ skip-if = true
 [test_redirect_history_wrap.js]
 [test_reply_without_content_type_wrap.js]
 [test_app_offline_http.js]
+[test_getHost_wrap.js]

From 151ac6662605e120d9b47359895dfb7d7b883e16 Mon Sep 17 00:00:00 2001
From: Nicholas Hurley <hurley@todesschaf.org>
Date: Thu, 17 Dec 2015 14:41:38 -0800
Subject: [PATCH 095/101] Bug 1233784 - Disallow illegal characters in cookie
 names. r=jduell

---
 netwerk/cookie/nsCookieService.cpp         | 8 +++++++-
 netwerk/test/unit/test_cookie_blacklist.js | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/netwerk/cookie/nsCookieService.cpp b/netwerk/cookie/nsCookieService.cpp
index f759938e2da9..fa1b4fb78c9b 100644
--- a/netwerk/cookie/nsCookieService.cpp
+++ b/netwerk/cookie/nsCookieService.cpp
@@ -3171,7 +3171,13 @@ nsCookieService::SetCookieInternal(nsIURI                        *aHostURI,
     return newCookie;
   }
 
-  if (cookieAttributes.name.Contains('\t')) {
+  const char illegalNameCharacters[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,
+                                         0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C,
+                                         0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12,
+                                         0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
+                                         0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E,
+                                         0x1F, 0x20, 0x00 };
+  if (cookieAttributes.name.FindCharInSet(illegalNameCharacters, 0) != -1) {
     COOKIE_LOGFAILURE(SET_COOKIE, aHostURI, savedCookieHeader, "invalid name character");
     return newCookie;
   }
diff --git a/netwerk/test/unit/test_cookie_blacklist.js b/netwerk/test/unit/test_cookie_blacklist.js
index 09d581cfbdda..0830600f458a 100644
--- a/netwerk/test/unit/test_cookie_blacklist.js
+++ b/netwerk/test/unit/test_cookie_blacklist.js
@@ -9,6 +9,7 @@ function run_test() {
                         .getService(Ci.nsICookieService);
   cookieService.setCookieStringFromHttp(cookieURI, cookieURI, null, "BadCookie1=\x01", null, null);
   cookieService.setCookieStringFromHttp(cookieURI, cookieURI, null, "BadCookie2=\v", null, null);
+  cookieService.setCookieStringFromHttp(cookieURI, cookieURI, null, "Bad\x07Name=illegal", null, null);
   cookieService.setCookieStringFromHttp(cookieURI, cookieURI, null, GOOD_COOKIE, null, null);
 
   var storedCookie = cookieService.getCookieString(cookieURI, null);

From 7b6fe06dd60b6aa325475cb12a272fc7724f5b6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Pag=C3=A8s?= <j.parkouss@gmail.com>
Date: Fri, 18 Dec 2015 08:19:41 +0100
Subject: [PATCH 096/101] Bug 1233534 - [mozprofile] unable to use a profile
 generated with recent firefox. r=ahal

--HG--
extra : rebase_source : b9cad07a8d5e5e056704b5a8a6c31b02f66c42e6
---
 .../mozbase/mozprofile/mozprofile/prefs.py    |  4 +--
 .../mozprofile/tests/test_preferences.py      | 28 +++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/testing/mozbase/mozprofile/mozprofile/prefs.py b/testing/mozbase/mozprofile/mozprofile/prefs.py
index efce9f666522..a2d78fd0b547 100644
--- a/testing/mozbase/mozprofile/mozprofile/prefs.py
+++ b/testing/mozbase/mozprofile/mozprofile/prefs.py
@@ -165,10 +165,10 @@ class Preferences(object):
         """
 
         marker = '##//' # magical marker
-        lines = [i.strip() for i in mozfile.load(path).readlines() if i.strip()]
+        lines = [i.strip() for i in mozfile.load(path).readlines()]
         _lines = []
         for line in lines:
-            if line.startswith(('#', '//')):
+            if not line.startswith(pref_setter):
                 continue
             if '//' in line:
                 line = line.replace('//', marker)
diff --git a/testing/mozbase/mozprofile/tests/test_preferences.py b/testing/mozbase/mozprofile/tests/test_preferences.py
index 647d7e7cc933..53bd3917daab 100755
--- a/testing/mozbase/mozprofile/tests/test_preferences.py
+++ b/testing/mozbase/mozprofile/tests/test_preferences.py
@@ -259,6 +259,34 @@ user_pref("webgl.force-enabled", true);
         finally:
             shutil.rmtree(tempdir)
 
+    def test_can_read_prefs_with_multiline_comments(self):
+        """
+        Ensure that multiple comments in the file header do not break reading
+        the prefs (https://bugzilla.mozilla.org/show_bug.cgi?id=1233534).
+        """
+        user_js = tempfile.NamedTemporaryFile(suffix='.js', delete=False)
+        self.addCleanup(mozfile.remove, user_js.name)
+        with user_js:
+            user_js.write("""
+# Mozilla User Preferences
+
+/* Do not edit this file.
+ *
+ * If you make changes to this file while the application is running,
+ * the changes will be overwritten when the application exits.
+ *
+ * To make a manual change to preferences, you can visit the URL about:config
+ */
+
+user_pref("webgl.enabled_for_all_sites", true);
+user_pref("webgl.force-enabled", true);
+""")
+        self.assertEqual(
+            Preferences.read_prefs(user_js.name),
+            [('webgl.enabled_for_all_sites', True),
+             ('webgl.force-enabled', True)]
+        )
+
     def test_json(self):
         _prefs = {"browser.startup.homepage": "http://planet.mozilla.org/"}
         json = '{"browser.startup.homepage": "http://planet.mozilla.org/"}'

From 07f4451eece3b454167853a2d2b35337d4b7635f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Pag=C3=A8s?= <j.parkouss@gmail.com>
Date: Fri, 18 Dec 2015 08:20:26 +0100
Subject: [PATCH 097/101] Bug 1233534 - [mozprofile] bump version to 0.28.
 r=ahal

--HG--
extra : rebase_source : 63b96731c8f3e0f98f866ccb6d2fce94aa9449d0
---
 testing/mozbase/mozprofile/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/mozbase/mozprofile/setup.py b/testing/mozbase/mozprofile/setup.py
index b21c9dcf2700..dda07d962e6f 100644
--- a/testing/mozbase/mozprofile/setup.py
+++ b/testing/mozbase/mozprofile/setup.py
@@ -6,7 +6,7 @@ import sys
 from setuptools import setup
 
 PACKAGE_NAME = 'mozprofile'
-PACKAGE_VERSION = '0.27'
+PACKAGE_VERSION = '0.28'
 
 # we only support python 2 right now
 assert sys.version_info[0] == 2

From 52c16ccf40267f9baa958da050d99f343700478e Mon Sep 17 00:00:00 2001
From: Jean-Yves Avenard <jyavenard@mozilla.com>
Date: Mon, 21 Dec 2015 11:20:58 +1100
Subject: [PATCH 098/101] Bug 1233340: [ffmpeg] Support YUV420J pixel format.
 r=kentuckyfriedtakahe

YUV420J is 12bpp YUV420P.
---
 dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp
index fa3f828157d9..cc76ca19f4f3 100644
--- a/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp
+++ b/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp
@@ -57,7 +57,7 @@ ChoosePixelFormat(AVCodecContext* aCodecContext, const PixelFormat* aFormats)
 {
   FFMPEG_LOG("Choosing FFmpeg pixel format for video decoding.");
   for (; *aFormats > -1; aFormats++) {
-    if (*aFormats == PIX_FMT_YUV420P) {
+    if (*aFormats == PIX_FMT_YUV420P || *aFormats == PIX_FMT_YUVJ420P) {
       FFMPEG_LOG("Requesting pixel format YUV420P.");
       return PIX_FMT_YUV420P;
     }

From 503849e75cdd2d5398f992b54e7cca913df085b2 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Thu, 3 Dec 2015 14:07:46 +1300
Subject: [PATCH 099/101] bug 1230025 remove declaration of non-existant
 NS_NewThumbFrame r=dholbert

--HG--
extra : rebase_source : 4a9b29189fd57fae34e8b2c19eca5c353a18fcd2
---
 layout/base/nsCSSFrameConstructor.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index 381e2d6b966c..f2edf6dce98f 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -226,9 +226,6 @@ NS_NewRootBoxFrame (nsIPresShell* aPresShell, nsStyleContext* aContext);
 nsContainerFrame*
 NS_NewDocElementBoxFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
 
-nsIFrame*
-NS_NewThumbFrame (nsIPresShell* aPresShell, nsStyleContext* aContext);
-
 nsIFrame*
 NS_NewDeckFrame (nsIPresShell* aPresShell, nsStyleContext* aContext);
 

From 63528b5b3f7779e153e1788974cee2c87b69302e Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Fri, 4 Dec 2015 01:30:46 +1300
Subject: [PATCH 100/101] bug 1228484 throw instead of capturing a second
 stream to a different graph r=roc

--HG--
extra : rebase_source : d1795f2afc413612666a5eee62d27d68e2337407
---
 dom/html/HTMLMediaElement.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp
index a1f59cfc9c5e..fb89412185ad 100644
--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@@ -1883,6 +1883,11 @@ HTMLMediaElement::CaptureStreamInternal(bool aFinishWhenEnded,
     aGraph = MediaStreamGraph::GetInstance(graphDriverType, mAudioChannel);
   }
 
+  if (!mOutputStreams.IsEmpty() &&
+      aGraph != mOutputStreams[0].mStream->GetInputStream()->Graph()) {
+    return nullptr;
+  }
+
   OutputMediaStream* out = mOutputStreams.AppendElement();
   out->mStream = DOMMediaStream::CreateTrackUnionStream(window, aGraph);
   RefPtr<nsIPrincipal> principal = GetCurrentPrincipal();

From 554d619f84e278bddfe911795ba7c7d15d4d0d64 Mon Sep 17 00:00:00 2001
From: Jesse Ruderman <jruderman@gmail.com>
Date: Fri, 4 Dec 2015 12:45:47 +1300
Subject: [PATCH 101/101] crashtest for bug 1228484 r=karlt

--HG--
extra : rebase_source : 0721ac827d904e07d1c64145eaf7c36f545c54da
---
 dom/media/test/crashtests/1228484.html    | 13 +++++++++++++
 dom/media/test/crashtests/crashtests.list |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 dom/media/test/crashtests/1228484.html

diff --git a/dom/media/test/crashtests/1228484.html b/dom/media/test/crashtests/1228484.html
new file mode 100644
index 000000000000..2b2e9b0f9e89
--- /dev/null
+++ b/dom/media/test/crashtests/1228484.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script>
+
+var htmlAudio = new Audio(URL.createObjectURL(new window.MediaSource()));
+
+(new window.AudioContext("ringer")).createMediaElementSource(htmlAudio);
+(new window.AudioContext("alarm")).createMediaElementSource(htmlAudio);
+
+</script>
+</head>
+</html>
diff --git a/dom/media/test/crashtests/crashtests.list b/dom/media/test/crashtests/crashtests.list
index 86a4c6143a2b..48c3741005fb 100644
--- a/dom/media/test/crashtests/crashtests.list
+++ b/dom/media/test/crashtests/crashtests.list
@@ -81,6 +81,7 @@ load 1157994.html
 load 1158427.html
 load 1185176.html
 load 1185192.html
+load 1228484.html
 load analyser-channels-1.html
 load audiocontext-double-suspend.html
 load buffer-source-duration-1.html